From 6936e5aa693ccc4aabd26ef18a65fbb8132f6f74 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 25 Jan 2024 16:41:31 +0100
Subject: [PATCH 0001/2191] Change design of compose form in web UI (#28119)

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
---
 .eslintrc.js                                  |    2 +-
 app/javascript/images/warning-stripes.svg     |   25 +
 .../autosuggest_emoji-test.jsx.snap           |   12 +-
 .../mastodon/components/account.jsx           |    8 +-
 .../mastodon/components/autosuggest_emoji.jsx |    2 +-
 .../components/autosuggest_hashtag.tsx        |   37 +-
 .../mastodon/components/autosuggest_input.jsx |   61 +-
 .../components/autosuggest_textarea.jsx       |   69 +-
 .../mastodon/components/dropdown_menu.jsx     |    2 +-
 app/javascript/mastodon/components/status.jsx |    6 +-
 .../mastodon/components/visibility_icon.tsx   |   13 +-
 .../mastodon/containers/compose_container.jsx |   40 +-
 .../compose/components/action_bar.jsx         |   99 +-
 .../components/autosuggest_account.jsx        |    2 +-
 .../compose/components/character_counter.jsx  |   28 +-
 .../compose/components/compose_form.jsx       |  162 +--
 .../compose/components/edit_indicator.jsx     |   62 +
 .../components/emoji_picker_dropdown.jsx      |   24 +-
 .../compose/components/language_dropdown.jsx  |   37 +-
 .../compose/components/navigation_bar.jsx     |   68 +-
 .../compose/components/poll_button.jsx        |   12 +-
 .../features/compose/components/poll_form.jsx |  313 ++--
 .../compose/components/privacy_dropdown.jsx   |   76 +-
 .../compose/components/reply_indicator.jsx    |   94 +-
 .../features/compose/components/upload.jsx    |   28 +-
 .../compose/components/upload_button.jsx      |   14 +-
 .../compose/components/upload_form.jsx        |   19 +-
 .../compose/components/upload_progress.jsx    |    4 +-
 .../containers/navigation_container.js        |   36 -
 .../containers/poll_button_container.js       |    2 +-
 .../compose/containers/poll_form_container.js |   53 -
 .../containers/reply_indicator_container.js   |   36 -
 .../containers/sensitive_button_container.jsx |   73 -
 .../containers/spoiler_button_container.js    |   10 +-
 .../containers/upload_button_container.js     |    3 +-
 .../compose/containers/upload_container.js    |    1 +
 .../mastodon/features/compose/index.jsx       |    4 -
 .../features/getting_started/index.jsx        |    4 +-
 .../features/standalone/compose/index.jsx     |   36 +-
 .../features/ui/components/compose_panel.jsx  |    6 +-
 .../ui/components/focal_point_modal.jsx       |    2 +-
 .../features/ui/components/mute_modal.jsx     |    1 -
 .../ui/components/navigation_panel.jsx        |    1 -
 app/javascript/mastodon/locales/en.json       |   41 +-
 app/javascript/mastodon/reducers/compose.js   |   20 +-
 .../400-24px/bar_chart_4_bars-fill.svg        |    1 +
 .../400-24px/bar_chart_4_bars.svg             |    1 +
 .../material-icons/400-24px/mood-fill.svg     |    1 +
 .../material-icons/400-24px/mood.svg          |    1 +
 .../400-24px/photo_library-fill.svg           |    1 +
 .../material-icons/400-24px/photo_library.svg |    1 +
 .../400-24px/quiet_time-fill.svg              |    1 +
 .../material-icons/400-24px/quiet_time.svg    |    1 +
 .../400-24px/translate-fill.svg               |    1 +
 .../material-icons/400-24px/translate.svg     |    1 +
 .../material-icons/400-24px/warning-fill.svg  |    1 +
 .../material-icons/400-24px/warning.svg       |    1 +
 app/javascript/packs/share.jsx                |    4 +-
 app/javascript/styles/contrast/diff.scss      |   37 +-
 .../styles/mastodon-light/diff.scss           |  153 +-
 .../styles/mastodon-light/variables.scss      |    9 +-
 app/javascript/styles/mastodon/_mixins.scss   |    5 +-
 app/javascript/styles/mastodon/admin.scss     |    6 +
 app/javascript/styles/mastodon/basics.scss    |    2 +-
 .../styles/mastodon/components.scss           | 1281 ++++++++++-------
 .../styles/mastodon/containers.scss           |   26 +-
 .../styles/mastodon/emoji_picker.scss         |   30 +-
 app/javascript/styles/mastodon/modal.scss     |    2 +-
 app/javascript/styles/mastodon/polls.scss     |  125 +-
 spec/system/new_statuses_spec.rb              |    4 +-
 spec/system/share_entrypoint_spec.rb          |    4 +-
 71 files changed, 1566 insertions(+), 1782 deletions(-)
 create mode 100755 app/javascript/images/warning-stripes.svg
 create mode 100644 app/javascript/mastodon/features/compose/components/edit_indicator.jsx
 delete mode 100644 app/javascript/mastodon/features/compose/containers/navigation_container.js
 delete mode 100644 app/javascript/mastodon/features/compose/containers/poll_form_container.js
 delete mode 100644 app/javascript/mastodon/features/compose/containers/reply_indicator_container.js
 delete mode 100644 app/javascript/mastodon/features/compose/containers/sensitive_button_container.jsx
 create mode 100644 app/javascript/material-icons/400-24px/bar_chart_4_bars-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/bar_chart_4_bars.svg
 create mode 100644 app/javascript/material-icons/400-24px/mood-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/mood.svg
 create mode 100644 app/javascript/material-icons/400-24px/photo_library-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/photo_library.svg
 create mode 100644 app/javascript/material-icons/400-24px/quiet_time-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/quiet_time.svg
 create mode 100644 app/javascript/material-icons/400-24px/translate-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/translate.svg
 create mode 100644 app/javascript/material-icons/400-24px/warning-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/warning.svg

diff --git a/.eslintrc.js b/.eslintrc.js
index 1b36bcee2535b3..ebe07f6e79a25e 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -165,7 +165,7 @@ module.exports = defineConfig({
     //   },
     // ],
     'jsx-a11y/no-noninteractive-tabindex': 'off',
-    'jsx-a11y/no-onchange': 'warn',
+    'jsx-a11y/no-onchange': 'off',
     // recommended is full 'error'
     'jsx-a11y/no-static-element-interactions': [
       'warn',
diff --git a/app/javascript/images/warning-stripes.svg b/app/javascript/images/warning-stripes.svg
new file mode 100755
index 00000000000000..9d68acdada26d1
--- /dev/null
+++ b/app/javascript/images/warning-stripes.svg
@@ -0,0 +1,25 @@
+<svg width="5" height="80" viewBox="0 0 5 80" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_253_1286)">
+<rect width="5" height="80" fill="url(#paint0_linear_253_1286)"/>
+<line x1="-0.860365" y1="6.80136" x2="10.6078" y2="-1.22871" stroke="black" stroke-width="3"/>
+<line x1="-0.860365" y1="14.8314" x2="10.6078" y2="6.80132" stroke="black" stroke-width="3"/>
+<line x1="-0.860365" y1="22.8615" x2="10.6078" y2="14.8314" stroke="black" stroke-width="3"/>
+<line x1="-0.860365" y1="30.8916" x2="10.6078" y2="22.8615" stroke="black" stroke-width="3"/>
+<line x1="-0.860365" y1="38.9216" x2="10.6078" y2="30.8915" stroke="black" stroke-width="3"/>
+<line x1="-0.860365" y1="46.9517" x2="10.6078" y2="38.9216" stroke="black" stroke-width="3"/>
+<line x1="-0.860365" y1="54.9818" x2="10.6078" y2="46.9517" stroke="black" stroke-width="3"/>
+<line x1="-0.860365" y1="63.0118" x2="10.6078" y2="54.9817" stroke="black" stroke-width="3"/>
+<line x1="-0.860365" y1="71.0419" x2="10.6078" y2="63.0118" stroke="black" stroke-width="3"/>
+<line x1="-0.860365" y1="79.072" x2="10.6078" y2="71.0419" stroke="black" stroke-width="3"/>
+<line x1="-0.860365" y1="87.102" x2="10.6078" y2="79.072" stroke="black" stroke-width="3"/>
+</g>
+<defs>
+<linearGradient id="paint0_linear_253_1286" x1="2.5" y1="0" x2="2.5" y2="80" gradientUnits="userSpaceOnUse">
+<stop stop-color="#FEC84B"/>
+<stop offset="1" stop-color="#F79009"/>
+</linearGradient>
+<clipPath id="clip0_253_1286">
+<rect width="5" height="80" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/app/javascript/mastodon/components/__tests__/__snapshots__/autosuggest_emoji-test.jsx.snap b/app/javascript/mastodon/components/__tests__/__snapshots__/autosuggest_emoji-test.jsx.snap
index 1c37278483c579..dc955b7abeed6d 100644
--- a/app/javascript/mastodon/components/__tests__/__snapshots__/autosuggest_emoji-test.jsx.snap
+++ b/app/javascript/mastodon/components/__tests__/__snapshots__/autosuggest_emoji-test.jsx.snap
@@ -9,7 +9,11 @@ exports[`<AutosuggestEmoji /> renders emoji with custom url 1`] = `
     className="emojione"
     src="http://example.com/emoji.png"
   />
-  :foobar:
+  <div
+    className="autosuggest-emoji__name"
+  >
+    :foobar:
+  </div>
 </div>
 `;
 
@@ -22,6 +26,10 @@ exports[`<AutosuggestEmoji /> renders native emoji 1`] = `
     className="emojione"
     src="/emoji/1f499.svg"
   />
-  :foobar:
+  <div
+    className="autosuggest-emoji__name"
+  >
+    :foobar:
+  </div>
 </div>
 `;
diff --git a/app/javascript/mastodon/components/account.jsx b/app/javascript/mastodon/components/account.jsx
index f82dd9153a94bd..4a99dd0bbf1297 100644
--- a/app/javascript/mastodon/components/account.jsx
+++ b/app/javascript/mastodon/components/account.jsx
@@ -37,10 +37,10 @@ class Account extends ImmutablePureComponent {
   static propTypes = {
     size: PropTypes.number,
     account: ImmutablePropTypes.record,
-    onFollow: PropTypes.func.isRequired,
-    onBlock: PropTypes.func.isRequired,
-    onMute: PropTypes.func.isRequired,
-    onMuteNotifications: PropTypes.func.isRequired,
+    onFollow: PropTypes.func,
+    onBlock: PropTypes.func,
+    onMute: PropTypes.func,
+    onMuteNotifications: PropTypes.func,
     intl: PropTypes.object.isRequired,
     hidden: PropTypes.bool,
     minimal: PropTypes.bool,
diff --git a/app/javascript/mastodon/components/autosuggest_emoji.jsx b/app/javascript/mastodon/components/autosuggest_emoji.jsx
index 28f628b4ac91ac..adea1d9f4b0b63 100644
--- a/app/javascript/mastodon/components/autosuggest_emoji.jsx
+++ b/app/javascript/mastodon/components/autosuggest_emoji.jsx
@@ -35,7 +35,7 @@ export default class AutosuggestEmoji extends PureComponent {
           alt={emoji.native || emoji.colons}
         />
 
-        {emoji.colons}
+        <div className='autosuggest-emoji__name'>{emoji.colons}</div>
       </div>
     );
   }
diff --git a/app/javascript/mastodon/components/autosuggest_hashtag.tsx b/app/javascript/mastodon/components/autosuggest_hashtag.tsx
index e83d493c2cea3d..036946b0f1d633 100644
--- a/app/javascript/mastodon/components/autosuggest_hashtag.tsx
+++ b/app/javascript/mastodon/components/autosuggest_hashtag.tsx
@@ -1,5 +1,3 @@
-import { FormattedMessage } from 'react-intl';
-
 import { ShortNumber } from 'mastodon/components/short_number';
 
 interface Props {
@@ -16,27 +14,18 @@ interface Props {
   };
 }
 
-export const AutosuggestHashtag: React.FC<Props> = ({ tag }) => {
-  const weeklyUses = tag.history && (
-    <ShortNumber
-      value={tag.history.reduce((total, day) => total + day.uses * 1, 0)}
-    />
-  );
+export const AutosuggestHashtag: React.FC<Props> = ({ tag }) => (
+  <div className='autosuggest-hashtag'>
+    <div className='autosuggest-hashtag__name'>
+      #<strong>{tag.name}</strong>
+    </div>
 
-  return (
-    <div className='autosuggest-hashtag'>
-      <div className='autosuggest-hashtag__name'>
-        #<strong>{tag.name}</strong>
+    {tag.history !== undefined && (
+      <div className='autosuggest-hashtag__uses'>
+        <ShortNumber
+          value={tag.history.reduce((total, day) => total + day.uses * 1, 0)}
+        />
       </div>
-      {tag.history !== undefined && (
-        <div className='autosuggest-hashtag__uses'>
-          <FormattedMessage
-            id='autosuggest_hashtag.per_week'
-            defaultMessage='{count} per week'
-            values={{ count: weeklyUses }}
-          />
-        </div>
-      )}
-    </div>
-  );
-};
+    )}
+  </div>
+);
diff --git a/app/javascript/mastodon/components/autosuggest_input.jsx b/app/javascript/mastodon/components/autosuggest_input.jsx
index 06cbb5d75b5a65..f707a18e1d697f 100644
--- a/app/javascript/mastodon/components/autosuggest_input.jsx
+++ b/app/javascript/mastodon/components/autosuggest_input.jsx
@@ -5,6 +5,8 @@ import classNames from 'classnames';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
+import Overlay from 'react-overlays/Overlay';
+
 import AutosuggestAccountContainer from '../features/compose/containers/autosuggest_account_container';
 
 import AutosuggestEmoji from './autosuggest_emoji';
@@ -195,34 +197,37 @@ export default class AutosuggestInput extends ImmutablePureComponent {
 
     return (
       <div className='autosuggest-input'>
-        <label>
-          <span style={{ display: 'none' }}>{placeholder}</span>
-
-          <input
-            type='text'
-            ref={this.setInput}
-            disabled={disabled}
-            placeholder={placeholder}
-            autoFocus={autoFocus}
-            value={value}
-            onChange={this.onChange}
-            onKeyDown={this.onKeyDown}
-            onKeyUp={onKeyUp}
-            onFocus={this.onFocus}
-            onBlur={this.onBlur}
-            dir='auto'
-            aria-autocomplete='list'
-            id={id}
-            className={className}
-            maxLength={maxLength}
-            lang={lang}
-            spellCheck={spellCheck}
-          />
-        </label>
-
-        <div className={`autosuggest-textarea__suggestions ${suggestionsHidden || suggestions.isEmpty() ? '' : 'autosuggest-textarea__suggestions--visible'}`}>
-          {suggestions.map(this.renderSuggestion)}
-        </div>
+        <input
+          type='text'
+          ref={this.setInput}
+          disabled={disabled}
+          placeholder={placeholder}
+          autoFocus={autoFocus}
+          value={value}
+          onChange={this.onChange}
+          onKeyDown={this.onKeyDown}
+          onKeyUp={onKeyUp}
+          onFocus={this.onFocus}
+          onBlur={this.onBlur}
+          dir='auto'
+          aria-autocomplete='list'
+          aria-label={placeholder}
+          id={id}
+          className={className}
+          maxLength={maxLength}
+          lang={lang}
+          spellCheck={spellCheck}
+        />
+
+        <Overlay show={!(suggestionsHidden || suggestions.isEmpty())} offset={[0, 0]} placement='bottom' target={this.input} popperConfig={{ strategy: 'fixed' }}>
+          {({ props }) => (
+            <div {...props}>
+              <div className='autosuggest-textarea__suggestions' style={{ width: this.input?.clientWidth }}>
+                {suggestions.map(this.renderSuggestion)}
+              </div>
+            </div>
+          )}
+        </Overlay>
       </div>
     );
   }
diff --git a/app/javascript/mastodon/components/autosuggest_textarea.jsx b/app/javascript/mastodon/components/autosuggest_textarea.jsx
index 4d173af59d47c9..07fbccacc9c53b 100644
--- a/app/javascript/mastodon/components/autosuggest_textarea.jsx
+++ b/app/javascript/mastodon/components/autosuggest_textarea.jsx
@@ -5,6 +5,7 @@ import classNames from 'classnames';
 
 import ImmutablePropTypes from 'react-immutable-proptypes';
 
+import Overlay from 'react-overlays/Overlay';
 import Textarea from 'react-textarea-autosize';
 
 import AutosuggestAccountContainer from '../features/compose/containers/autosuggest_account_container';
@@ -52,7 +53,6 @@ const AutosuggestTextarea = forwardRef(({
   onFocus,
   autoFocus = true,
   lang,
-  children,
 }, textareaRef) => {
 
   const [suggestionsHidden, setSuggestionsHidden] = useState(true);
@@ -183,40 +183,38 @@ const AutosuggestTextarea = forwardRef(({
     );
   };
 
-  return [
-    <div className='compose-form__autosuggest-wrapper' key='autosuggest-wrapper'>
-      <div className='autosuggest-textarea'>
-        <label>
-          <span style={{ display: 'none' }}>{placeholder}</span>
-
-          <Textarea
-            ref={textareaRef}
-            className='autosuggest-textarea__textarea'
-            disabled={disabled}
-            placeholder={placeholder}
-            autoFocus={autoFocus}
-            value={value}
-            onChange={handleChange}
-            onKeyDown={handleKeyDown}
-            onKeyUp={onKeyUp}
-            onFocus={handleFocus}
-            onBlur={handleBlur}
-            onPaste={handlePaste}
-            dir='auto'
-            aria-autocomplete='list'
-            lang={lang}
-          />
-        </label>
-      </div>
-      {children}
-    </div>,
-
-    <div className='autosuggest-textarea__suggestions-wrapper' key='suggestions-wrapper'>
-      <div className={`autosuggest-textarea__suggestions ${suggestionsHidden || suggestions.isEmpty() ? '' : 'autosuggest-textarea__suggestions--visible'}`}>
-        {suggestions.map(renderSuggestion)}
-      </div>
-    </div>,
-  ];
+  return (
+    <div className='autosuggest-textarea'>
+      <Textarea
+        ref={textareaRef}
+        className='autosuggest-textarea__textarea'
+        disabled={disabled}
+        placeholder={placeholder}
+        autoFocus={autoFocus}
+        value={value}
+        onChange={handleChange}
+        onKeyDown={handleKeyDown}
+        onKeyUp={onKeyUp}
+        onFocus={handleFocus}
+        onBlur={handleBlur}
+        onPaste={handlePaste}
+        dir='auto'
+        aria-autocomplete='list'
+        aria-label={placeholder}
+        lang={lang}
+      />
+
+      <Overlay show={!(suggestionsHidden || suggestions.isEmpty())} offset={[0, 0]} placement='bottom' target={textareaRef} popperConfig={{ strategy: 'fixed' }}>
+        {({ props }) => (
+          <div {...props}>
+            <div className='autosuggest-textarea__suggestions' style={{ width: textareaRef.current?.clientWidth }}>
+              {suggestions.map(renderSuggestion)}
+            </div>
+          </div>
+        )}
+      </Overlay>
+    </div>
+  );
 });
 
 AutosuggestTextarea.propTypes = {
@@ -232,7 +230,6 @@ AutosuggestTextarea.propTypes = {
   onKeyDown: PropTypes.func,
   onPaste: PropTypes.func.isRequired,
   onFocus:PropTypes.func,
-  children: PropTypes.node,
   autoFocus: PropTypes.bool,
   lang: PropTypes.string,
 };
diff --git a/app/javascript/mastodon/components/dropdown_menu.jsx b/app/javascript/mastodon/components/dropdown_menu.jsx
index 04c8bb09800ffa..f6c08dd43b3c06 100644
--- a/app/javascript/mastodon/components/dropdown_menu.jsx
+++ b/app/javascript/mastodon/components/dropdown_menu.jsx
@@ -165,7 +165,7 @@ class Dropdown extends PureComponent {
     children: PropTypes.node,
     icon: PropTypes.string,
     iconComponent: PropTypes.func,
-    items: PropTypes.oneOfType([PropTypes.array, ImmutablePropTypes.list]).isRequired,
+    items: PropTypes.oneOfType([PropTypes.array, ImmutablePropTypes.list]),
     loading: PropTypes.bool,
     size: PropTypes.number,
     title: PropTypes.string,
diff --git a/app/javascript/mastodon/components/status.jsx b/app/javascript/mastodon/components/status.jsx
index ff4fe925257690..1171351c51a3e8 100644
--- a/app/javascript/mastodon/components/status.jsx
+++ b/app/javascript/mastodon/components/status.jsx
@@ -70,9 +70,9 @@ export const defaultMediaVisibility = (status) => {
 
 const messages = defineMessages({
   public_short: { id: 'privacy.public.short', defaultMessage: 'Public' },
-  unlisted_short: { id: 'privacy.unlisted.short', defaultMessage: 'Unlisted' },
-  private_short: { id: 'privacy.private.short', defaultMessage: 'Followers only' },
-  direct_short: { id: 'privacy.direct.short', defaultMessage: 'Mentioned people only' },
+  unlisted_short: { id: 'privacy.unlisted.short', defaultMessage: 'Quiet public' },
+  private_short: { id: 'privacy.private.short', defaultMessage: 'Followers' },
+  direct_short: { id: 'privacy.direct.short', defaultMessage: 'Specific people' },
   edited: { id: 'status.edited', defaultMessage: 'Edited {date}' },
 });
 
diff --git a/app/javascript/mastodon/components/visibility_icon.tsx b/app/javascript/mastodon/components/visibility_icon.tsx
index d6ad4095ebcd90..753dc0273723ce 100644
--- a/app/javascript/mastodon/components/visibility_icon.tsx
+++ b/app/javascript/mastodon/components/visibility_icon.tsx
@@ -2,8 +2,8 @@ import { defineMessages, useIntl } from 'react-intl';
 
 import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
 import LockIcon from '@/material-icons/400-24px/lock.svg?react';
-import LockOpenIcon from '@/material-icons/400-24px/lock_open.svg?react';
 import PublicIcon from '@/material-icons/400-24px/public.svg?react';
+import QuietTimeIcon from '@/material-icons/400-24px/quiet_time.svg?react';
 
 import { Icon } from './icon';
 
@@ -11,14 +11,17 @@ type Visibility = 'public' | 'unlisted' | 'private' | 'direct';
 
 const messages = defineMessages({
   public_short: { id: 'privacy.public.short', defaultMessage: 'Public' },
-  unlisted_short: { id: 'privacy.unlisted.short', defaultMessage: 'Unlisted' },
+  unlisted_short: {
+    id: 'privacy.unlisted.short',
+    defaultMessage: 'Quiet public',
+  },
   private_short: {
     id: 'privacy.private.short',
-    defaultMessage: 'Followers only',
+    defaultMessage: 'Followers',
   },
   direct_short: {
     id: 'privacy.direct.short',
-    defaultMessage: 'Mentioned people only',
+    defaultMessage: 'Specific people',
   },
 });
 
@@ -35,7 +38,7 @@ export const VisibilityIcon: React.FC<{ visibility: Visibility }> = ({
     },
     unlisted: {
       icon: 'unlock',
-      iconComponent: LockOpenIcon,
+      iconComponent: QuietTimeIcon,
       text: intl.formatMessage(messages.unlisted_short),
     },
     private: {
diff --git a/app/javascript/mastodon/containers/compose_container.jsx b/app/javascript/mastodon/containers/compose_container.jsx
index f76550678ed2e1..171f14d3b2c780 100644
--- a/app/javascript/mastodon/containers/compose_container.jsx
+++ b/app/javascript/mastodon/containers/compose_container.jsx
@@ -1,14 +1,12 @@
-import { PureComponent } from 'react';
-
 import { Provider } from 'react-redux';
 
-import { fetchCustomEmojis } from '../actions/custom_emojis';
-import { hydrateStore } from '../actions/store';
-import Compose from '../features/standalone/compose';
-import initialState from '../initial_state';
-import { IntlProvider } from '../locales';
-import { store } from '../store';
-
+import { fetchCustomEmojis } from 'mastodon/actions/custom_emojis';
+import { hydrateStore } from 'mastodon/actions/store';
+import { Router } from 'mastodon/components/router';
+import Compose from 'mastodon/features/standalone/compose';
+import initialState from 'mastodon/initial_state';
+import { IntlProvider } from 'mastodon/locales';
+import { store } from 'mastodon/store';
 
 if (initialState) {
   store.dispatch(hydrateStore(initialState));
@@ -16,16 +14,14 @@ if (initialState) {
 
 store.dispatch(fetchCustomEmojis());
 
-export default class ComposeContainer extends PureComponent {
-
-  render () {
-    return (
-      <IntlProvider>
-        <Provider store={store}>
-          <Compose />
-        </Provider>
-      </IntlProvider>
-    );
-  }
-
-}
+const ComposeContainer = () => (
+  <IntlProvider>
+    <Provider store={store}>
+      <Router>
+        <Compose />
+      </Router>
+    </Provider>
+  </IntlProvider>
+);
+
+export default ComposeContainer;
diff --git a/app/javascript/mastodon/features/compose/components/action_bar.jsx b/app/javascript/mastodon/features/compose/components/action_bar.jsx
index 411ad77c79c0be..be52eac11ea4f2 100644
--- a/app/javascript/mastodon/features/compose/components/action_bar.jsx
+++ b/app/javascript/mastodon/features/compose/components/action_bar.jsx
@@ -1,13 +1,13 @@
-import PropTypes from 'prop-types';
-import { PureComponent } from 'react';
+import { useCallback } from 'react';
 
-import { defineMessages, injectIntl } from 'react-intl';
+import { defineMessages, useIntl } from 'react-intl';
 
-import ImmutablePropTypes from 'react-immutable-proptypes';
+import { useDispatch } from 'react-redux';
 
-import MenuIcon from '@/material-icons/400-24px/menu.svg?react';
-
-import DropdownMenuContainer from '../../../containers/dropdown_menu_container';
+import MoreHorizIcon from '@/material-icons/400-24px/more_horiz.svg?react';
+import { openModal } from 'mastodon/actions/modal';
+import DropdownMenuContainer from 'mastodon/containers/dropdown_menu_container';
+import { logOut } from 'mastodon/utils/log_out';
 
 const messages = defineMessages({
   edit_profile: { id: 'account.edit_profile', defaultMessage: 'Edit profile' },
@@ -23,51 +23,52 @@ const messages = defineMessages({
   filters: { id: 'navigation_bar.filters', defaultMessage: 'Muted words' },
   logout: { id: 'navigation_bar.logout', defaultMessage: 'Logout' },
   bookmarks: { id: 'navigation_bar.bookmarks', defaultMessage: 'Bookmarks' },
+  logoutMessage: { id: 'confirmations.logout.message', defaultMessage: 'Are you sure you want to log out?' },
+  logoutConfirm: { id: 'confirmations.logout.confirm', defaultMessage: 'Log out' },
 });
 
-class ActionBar extends PureComponent {
-
-  static propTypes = {
-    account: ImmutablePropTypes.record.isRequired,
-    onLogout: PropTypes.func.isRequired,
-    intl: PropTypes.object.isRequired,
-  };
-
-  handleLogout = () => {
-    this.props.onLogout();
-  };
-
-  render () {
-    const { intl } = this.props;
-
-    let menu = [];
+export const ActionBar = () => {
+  const dispatch = useDispatch();
+  const intl = useIntl();
 
-    menu.push({ text: intl.formatMessage(messages.edit_profile), href: '/settings/profile' });
-    menu.push({ text: intl.formatMessage(messages.preferences), href: '/settings/preferences' });
-    menu.push({ text: intl.formatMessage(messages.pins), to: '/pinned' });
-    menu.push(null);
-    menu.push({ text: intl.formatMessage(messages.follow_requests), to: '/follow_requests' });
-    menu.push({ text: intl.formatMessage(messages.favourites), to: '/favourites' });
-    menu.push({ text: intl.formatMessage(messages.bookmarks), to: '/bookmarks' });
-    menu.push({ text: intl.formatMessage(messages.lists), to: '/lists' });
-    menu.push({ text: intl.formatMessage(messages.followed_tags), to: '/followed_tags' });
-    menu.push(null);
-    menu.push({ text: intl.formatMessage(messages.mutes), to: '/mutes' });
-    menu.push({ text: intl.formatMessage(messages.blocks), to: '/blocks' });
-    menu.push({ text: intl.formatMessage(messages.domain_blocks), to: '/domain_blocks' });
-    menu.push({ text: intl.formatMessage(messages.filters), href: '/filters' });
-    menu.push(null);
-    menu.push({ text: intl.formatMessage(messages.logout), action: this.handleLogout });
+  const handleLogoutClick = useCallback(() => {
+    dispatch(openModal({
+      modalType: 'CONFIRM',
+      modalProps: {
+        message: intl.formatMessage(messages.logoutMessage),
+        confirm: intl.formatMessage(messages.logoutConfirm),
+        closeWhenConfirm: false,
+        onConfirm: () => logOut(),
+      },
+    }));
+  }, [dispatch, intl]);
 
-    return (
-      <div className='compose__action-bar'>
-        <div className='compose__action-bar-dropdown'>
-          <DropdownMenuContainer items={menu} icon='bars' iconComponent={MenuIcon} size={24} direction='right' />
-        </div>
-      </div>
-    );
-  }
+  let menu = [];
 
-}
+  menu.push({ text: intl.formatMessage(messages.edit_profile), href: '/settings/profile' });
+  menu.push({ text: intl.formatMessage(messages.preferences), href: '/settings/preferences' });
+  menu.push({ text: intl.formatMessage(messages.pins), to: '/pinned' });
+  menu.push(null);
+  menu.push({ text: intl.formatMessage(messages.follow_requests), to: '/follow_requests' });
+  menu.push({ text: intl.formatMessage(messages.favourites), to: '/favourites' });
+  menu.push({ text: intl.formatMessage(messages.bookmarks), to: '/bookmarks' });
+  menu.push({ text: intl.formatMessage(messages.lists), to: '/lists' });
+  menu.push({ text: intl.formatMessage(messages.followed_tags), to: '/followed_tags' });
+  menu.push(null);
+  menu.push({ text: intl.formatMessage(messages.mutes), to: '/mutes' });
+  menu.push({ text: intl.formatMessage(messages.blocks), to: '/blocks' });
+  menu.push({ text: intl.formatMessage(messages.domain_blocks), to: '/domain_blocks' });
+  menu.push({ text: intl.formatMessage(messages.filters), href: '/filters' });
+  menu.push(null);
+  menu.push({ text: intl.formatMessage(messages.logout), action: handleLogoutClick });
 
-export default injectIntl(ActionBar);
+  return (
+    <DropdownMenuContainer
+      items={menu}
+      icon='bars'
+      iconComponent={MoreHorizIcon}
+      size={24}
+      direction='right'
+    />
+  );
+};
diff --git a/app/javascript/mastodon/features/compose/components/autosuggest_account.jsx b/app/javascript/mastodon/features/compose/components/autosuggest_account.jsx
index 0a73bc1020f4f6..fe684c1483ebe8 100644
--- a/app/javascript/mastodon/features/compose/components/autosuggest_account.jsx
+++ b/app/javascript/mastodon/features/compose/components/autosuggest_account.jsx
@@ -15,7 +15,7 @@ export default class AutosuggestAccount extends ImmutablePureComponent {
 
     return (
       <div className='autosuggest-account' title={account.get('acct')}>
-        <div className='autosuggest-account-icon'><Avatar account={account} size={18} /></div>
+        <Avatar account={account} size={24} />
         <DisplayName account={account} />
       </div>
     );
diff --git a/app/javascript/mastodon/features/compose/components/character_counter.jsx b/app/javascript/mastodon/features/compose/components/character_counter.jsx
index 42452b30f6af55..f400d1fe2fd15a 100644
--- a/app/javascript/mastodon/features/compose/components/character_counter.jsx
+++ b/app/javascript/mastodon/features/compose/components/character_counter.jsx
@@ -1,26 +1,18 @@
 import PropTypes from 'prop-types';
-import { PureComponent } from 'react';
 
 import { length } from 'stringz';
 
-export default class CharacterCounter extends PureComponent {
+export const CharacterCounter = ({ text, max }) => {
+  const diff = max - length(text);
 
-  static propTypes = {
-    text: PropTypes.string.isRequired,
-    max: PropTypes.number.isRequired,
-  };
-
-  checkRemainingText (diff) {
-    if (diff < 0) {
-      return <span className='character-counter character-counter--over'>{diff}</span>;
-    }
-
-    return <span className='character-counter'>{diff}</span>;
+  if (diff < 0) {
+    return <span className='character-counter character-counter--over'>{diff}</span>;
   }
 
-  render () {
-    const diff = this.props.max - length(this.props.text);
-    return this.checkRemainingText(diff);
-  }
+  return <span className='character-counter'>{diff}</span>;
+};
 
-}
+CharacterCounter.propTypes = {
+  text: PropTypes.string.isRequired,
+  max: PropTypes.number.isRequired,
+};
diff --git a/app/javascript/mastodon/features/compose/components/compose_form.jsx b/app/javascript/mastodon/features/compose/components/compose_form.jsx
index fd66874e71a852..c5ee894683366d 100644
--- a/app/javascript/mastodon/features/compose/components/compose_form.jsx
+++ b/app/javascript/mastodon/features/compose/components/compose_form.jsx
@@ -10,8 +10,6 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
 
 import { length } from 'stringz';
 
-import LockIcon from '@/material-icons/400-24px/lock.svg?react';
-import { Icon }  from 'mastodon/components/icon';
 import { WithOptionalRouterPropTypes, withOptionalRouter } from 'mastodon/utils/react_router';
 
 import AutosuggestInput from '../../../components/autosuggest_input';
@@ -20,25 +18,27 @@ import { Button } from '../../../components/button';
 import EmojiPickerDropdown from '../containers/emoji_picker_dropdown_container';
 import LanguageDropdown from '../containers/language_dropdown_container';
 import PollButtonContainer from '../containers/poll_button_container';
-import PollFormContainer from '../containers/poll_form_container';
 import PrivacyDropdownContainer from '../containers/privacy_dropdown_container';
-import ReplyIndicatorContainer from '../containers/reply_indicator_container';
 import SpoilerButtonContainer from '../containers/spoiler_button_container';
 import UploadButtonContainer from '../containers/upload_button_container';
 import UploadFormContainer from '../containers/upload_form_container';
 import WarningContainer from '../containers/warning_container';
 import { countableText } from '../util/counter';
 
-import CharacterCounter from './character_counter';
+import { CharacterCounter } from './character_counter';
+import { EditIndicator } from './edit_indicator';
+import { NavigationBar } from './navigation_bar';
+import { PollForm } from "./poll_form";
+import { ReplyIndicator } from './reply_indicator';
 
 const allowedAroundShortCode = '><\u0085\u0020\u00a0\u1680\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029\u0009\u000a\u000b\u000c\u000d';
 
 const messages = defineMessages({
   placeholder: { id: 'compose_form.placeholder', defaultMessage: 'What is on your mind?' },
-  spoiler_placeholder: { id: 'compose_form.spoiler_placeholder', defaultMessage: 'Write your warning here' },
-  publish: { id: 'compose_form.publish', defaultMessage: 'Publish' },
-  publishLoud: { id: 'compose_form.publish_loud', defaultMessage: '{publish}!' },
-  saveChanges: { id: 'compose_form.save_changes', defaultMessage: 'Save changes' },
+  spoiler_placeholder: { id: 'compose_form.spoiler_placeholder', defaultMessage: 'Content warning (optional)' },
+  publish: { id: 'compose_form.publish', defaultMessage: 'Post' },
+  saveChanges: { id: 'compose_form.save_changes', defaultMessage: 'Update' },
+  reply: { id: 'compose_form.reply', defaultMessage: 'Reply' },
 });
 
 class ComposeForm extends ImmutablePureComponent {
@@ -65,6 +65,7 @@ class ComposeForm extends ImmutablePureComponent {
     onPaste: PropTypes.func.isRequired,
     onPickEmoji: PropTypes.func.isRequired,
     autoFocus: PropTypes.bool,
+    withoutNavigation: PropTypes.bool,
     anyMedia: PropTypes.bool,
     isInReply: PropTypes.bool,
     singleColumn: PropTypes.bool,
@@ -223,95 +224,92 @@ class ComposeForm extends ImmutablePureComponent {
   };
 
   render () {
-    const { intl, onPaste, autoFocus } = this.props;
+    const { intl, onPaste, autoFocus, withoutNavigation } = this.props;
     const { highlighted } = this.state;
     const disabled = this.props.isSubmitting;
 
-    let publishText = '';
-
-    if (this.props.isEditing) {
-      publishText = intl.formatMessage(messages.saveChanges);
-    } else if (this.props.privacy === 'private' || this.props.privacy === 'direct') {
-      publishText = <><Icon id='lock' icon={LockIcon} /> {intl.formatMessage(messages.publish)}</>;
-    } else {
-      publishText = this.props.privacy !== 'unlisted' ? intl.formatMessage(messages.publishLoud, { publish: intl.formatMessage(messages.publish) }) : intl.formatMessage(messages.publish);
-    }
-
     return (
       <form className='compose-form' onSubmit={this.handleSubmit}>
+        <ReplyIndicator />
+        {!withoutNavigation && <NavigationBar />}
         <WarningContainer />
 
-        <ReplyIndicatorContainer />
-
-        <div className={`spoiler-input ${this.props.spoiler ? 'spoiler-input--visible' : ''}`} ref={this.setRef} aria-hidden={!this.props.spoiler}>
-          <AutosuggestInput
-            placeholder={intl.formatMessage(messages.spoiler_placeholder)}
-            value={this.props.spoilerText}
-            onChange={this.handleChangeSpoilerText}
-            onKeyDown={this.handleKeyDown}
-            disabled={!this.props.spoiler}
-            ref={this.setSpoilerText}
-            suggestions={this.props.suggestions}
-            onSuggestionsFetchRequested={this.onSuggestionsFetchRequested}
-            onSuggestionsClearRequested={this.onSuggestionsClearRequested}
-            onSuggestionSelected={this.onSpoilerSuggestionSelected}
-            searchTokens={[':']}
-            id='cw-spoiler-input'
-            className='spoiler-input__input'
-            lang={this.props.lang}
-            spellCheck
-          />
-        </div>
+        <div className={classNames('compose-form__highlightable', { active: highlighted })} ref={this.setRef}>
+          <div className='compose-form__scrollable'>
+            <EditIndicator />
+
+            {this.props.spoiler && (
+              <div className='spoiler-input'>
+                <div className='spoiler-input__border' />
+
+                <AutosuggestInput
+                  placeholder={intl.formatMessage(messages.spoiler_placeholder)}
+                  value={this.props.spoilerText}
+                  disabled={disabled}
+                  onChange={this.handleChangeSpoilerText}
+                  onKeyDown={this.handleKeyDown}
+                  ref={this.setSpoilerText}
+                  suggestions={this.props.suggestions}
+                  onSuggestionsFetchRequested={this.onSuggestionsFetchRequested}
+                  onSuggestionsClearRequested={this.onSuggestionsClearRequested}
+                  onSuggestionSelected={this.onSpoilerSuggestionSelected}
+                  searchTokens={[':']}
+                  id='cw-spoiler-input'
+                  className='spoiler-input__input'
+                  lang={this.props.lang}
+                  spellCheck
+                />
+
+                <div className='spoiler-input__border' />
+              </div>
+            )}
+
+            <AutosuggestTextarea
+              ref={this.textareaRef}
+              placeholder={intl.formatMessage(messages.placeholder)}
+              disabled={disabled}
+              value={this.props.text}
+              onChange={this.handleChange}
+              suggestions={this.props.suggestions}
+              onFocus={this.handleFocus}
+              onKeyDown={this.handleKeyDown}
+              onSuggestionsFetchRequested={this.onSuggestionsFetchRequested}
+              onSuggestionsClearRequested={this.onSuggestionsClearRequested}
+              onSuggestionSelected={this.onSuggestionSelected}
+              onPaste={onPaste}
+              autoFocus={autoFocus}
+              lang={this.props.lang}
+            />
+          </div>
 
-        <div className={classNames('compose-form__highlightable', { active: highlighted })}>
-          <AutosuggestTextarea
-            ref={this.textareaRef}
-            placeholder={intl.formatMessage(messages.placeholder)}
-            disabled={disabled}
-            value={this.props.text}
-            onChange={this.handleChange}
-            suggestions={this.props.suggestions}
-            onFocus={this.handleFocus}
-            onKeyDown={this.handleKeyDown}
-            onSuggestionsFetchRequested={this.onSuggestionsFetchRequested}
-            onSuggestionsClearRequested={this.onSuggestionsClearRequested}
-            onSuggestionSelected={this.onSuggestionSelected}
-            onPaste={onPaste}
-            autoFocus={autoFocus}
-            lang={this.props.lang}
-          >
-            <div className='compose-form__modifiers'>
-              <UploadFormContainer />
-              <PollFormContainer />
-            </div>
-          </AutosuggestTextarea>
-          <EmojiPickerDropdown onPickEmoji={this.handleEmojiPick} />
+          <UploadFormContainer />
+          <PollForm />
 
-          <div className='compose-form__buttons-wrapper'>
-            <div className='compose-form__buttons'>
-              <UploadButtonContainer />
-              <PollButtonContainer />
+          <div className='compose-form__footer'>
+            <div className='compose-form__dropdowns'>
               <PrivacyDropdownContainer disabled={this.props.isEditing} />
-              <SpoilerButtonContainer />
               <LanguageDropdown />
             </div>
 
-            <div className='character-counter__wrapper'>
-              <CharacterCounter max={500} text={this.getFulltextForCharacterCounting()} />
+            <div className='compose-form__actions'>
+              <div className='compose-form__buttons'>
+                <UploadButtonContainer />
+                <PollButtonContainer />
+                <SpoilerButtonContainer />
+                <EmojiPickerDropdown onPickEmoji={this.handleEmojiPick} />
+                <CharacterCounter max={500} text={this.getFulltextForCharacterCounting()} />
+              </div>
+
+              <div className='compose-form__submit'>
+                <Button
+                  type='submit'
+                  text={intl.formatMessage(this.props.isEditing ? messages.saveChanges : (this.props.isInReply ? messages.reply : messages.publish))}
+                  disabled={!this.canSubmit()}
+                />
+              </div>
             </div>
           </div>
         </div>
-
-        <div className='compose-form__publish'>
-          <div className='compose-form__publish-button-wrapper'>
-            <Button
-              type='submit'
-              text={publishText}
-              disabled={!this.canSubmit()}
-              block
-            />
-          </div>
-        </div>
       </form>
     );
   }
diff --git a/app/javascript/mastodon/features/compose/components/edit_indicator.jsx b/app/javascript/mastodon/features/compose/components/edit_indicator.jsx
new file mode 100644
index 00000000000000..6cdaaebea5f41a
--- /dev/null
+++ b/app/javascript/mastodon/features/compose/components/edit_indicator.jsx
@@ -0,0 +1,62 @@
+import { useCallback } from 'react';
+
+import { defineMessages, useIntl, FormattedMessage } from 'react-intl';
+
+import { Link } from 'react-router-dom';
+
+import { useDispatch, useSelector } from 'react-redux';
+
+import BarChart4BarsIcon from 'mastodon/../material-icons/400-24px/bar_chart_4_bars.svg?react';
+import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
+import PhotoLibraryIcon from 'mastodon/../material-icons/400-24px/photo_library.svg?react';
+import { cancelReplyCompose } from 'mastodon/actions/compose';
+import { Icon } from 'mastodon/components/icon';
+import { IconButton } from 'mastodon/components/icon_button';
+import { RelativeTimestamp } from 'mastodon/components/relative_timestamp';
+
+const messages = defineMessages({
+  cancel: { id: 'reply_indicator.cancel', defaultMessage: 'Cancel' },
+});
+
+export const EditIndicator = () => {
+  const intl = useIntl();
+  const dispatch = useDispatch();
+  const id = useSelector(state => state.getIn(['compose', 'id']));
+  const status = useSelector(state => state.getIn(['statuses', id]));
+  const account = useSelector(state => state.getIn(['accounts', status?.get('account')]));
+
+  const handleCancelClick = useCallback(() => {
+    dispatch(cancelReplyCompose());
+  }, [dispatch]);
+
+  if (!status) {
+    return null;
+  }
+
+  const content = { __html: status.get('contentHtml') };
+
+  return (
+    <div className='edit-indicator'>
+      <div className='edit-indicator__header'>
+        <div className='edit-indicator__display-name'>
+          <Link to={`/@${account.get('acct')}`}>@{account.get('acct')}</Link>
+          ·
+          <Link to={`/@${account.get('acct')}/${status.get('id')}`}><RelativeTimestamp timestamp={status.get('created_at')} /></Link>
+        </div>
+
+        <div className='edit-indicator__cancel'>
+          <IconButton title={intl.formatMessage(messages.cancel)} icon='times' iconComponent={CloseIcon} onClick={handleCancelClick} inverted />
+        </div>
+      </div>
+
+      <div className='edit-indicator__content translate' dangerouslySetInnerHTML={content} />
+
+      {(status.get('poll') || status.get('media_attachments').size > 0) && (
+        <div className='edit-indicator__attachments'>
+          {status.get('poll') && <><Icon icon={BarChart4BarsIcon} /><FormattedMessage id='reply_indicator.poll' defaultMessage='Poll' /></>}
+          {status.get('media_attachments').size > 0 && <><Icon icon={PhotoLibraryIcon} /><FormattedMessage id='reply_indicator.attachments' defaultMessage='{count, plural, one {# attachment} other {# attachments}}' values={{ count: status.get('media_attachments').size }} /></>}
+        </div>
+      )}
+    </div>
+  );
+};
diff --git a/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.jsx b/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.jsx
index 494b8d86243988..9949d2c001007b 100644
--- a/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.jsx
+++ b/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.jsx
@@ -10,6 +10,8 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import { supportsPassiveEvents } from 'detect-passive-events';
 import Overlay from 'react-overlays/Overlay';
 
+import MoodIcon from 'mastodon/../material-icons/400-24px/mood.svg?react';
+import { IconButton } from 'mastodon/components/icon_button';
 import { assetHost } from 'mastodon/utils/config';
 
 import { buildCustomEmojis, categoriesFromEmojis } from '../../emoji/emoji';
@@ -321,7 +323,6 @@ class EmojiPickerDropdown extends PureComponent {
     onPickEmoji: PropTypes.func.isRequired,
     onSkinTone: PropTypes.func.isRequired,
     skinTone: PropTypes.number.isRequired,
-    button: PropTypes.node,
   };
 
   state = {
@@ -379,23 +380,24 @@ class EmojiPickerDropdown extends PureComponent {
   };
 
   render () {
-    const { intl, onPickEmoji, onSkinTone, skinTone, frequentlyUsedEmojis, button } = this.props;
+    const { intl, onPickEmoji, onSkinTone, skinTone, frequentlyUsedEmojis } = this.props;
     const title = intl.formatMessage(messages.emoji);
     const { active, loading } = this.state;
 
     return (
-      <div className='emoji-picker-dropdown' onKeyDown={this.handleKeyDown}>
-        <div ref={this.setTargetRef} className='emoji-button' title={title} aria-label={title} aria-expanded={active} role='button' onClick={this.onToggle} onKeyDown={this.onToggle} tabIndex={0}>
-          {button || <img
-            className={classNames('emojione', { 'pulse-loading': active && loading })}
-            alt='🙂'
-            src={`${assetHost}/emoji/1f642.svg`}
-          />}
-        </div>
+      <div className='emoji-picker-dropdown' onKeyDown={this.handleKeyDown} ref={this.setTargetRef}>
+        <IconButton
+          title={title}
+          aria-expanded={active}
+          active={active}
+          iconComponent={MoodIcon}
+          onClick={this.onToggle}
+          inverted
+        />
 
         <Overlay show={active} placement={'bottom'} target={this.findTarget} popperConfig={{ strategy: 'fixed' }}>
           {({ props, placement })=> (
-            <div {...props} style={{ ...props.style, width: 299 }}>
+            <div {...props} style={{ ...props.style }}>
               <div className={`dropdown-animation ${placement}`}>
                 <EmojiPickerMenu
                   custom_emojis={this.props.custom_emojis}
diff --git a/app/javascript/mastodon/features/compose/components/language_dropdown.jsx b/app/javascript/mastodon/features/compose/components/language_dropdown.jsx
index 13d1c2e1a7cd97..2783ca8be2a831 100644
--- a/app/javascript/mastodon/features/compose/components/language_dropdown.jsx
+++ b/app/javascript/mastodon/features/compose/components/language_dropdown.jsx
@@ -9,10 +9,11 @@ import { supportsPassiveEvents } from 'detect-passive-events';
 import fuzzysort from 'fuzzysort';
 import Overlay from 'react-overlays/Overlay';
 
+import CancelIcon from 'mastodon/../material-icons/400-24px/cancel-fill.svg?react';
+import SearchIcon from 'mastodon/../material-icons/400-24px/search.svg?react';
+import TranslateIcon from 'mastodon/../material-icons/400-24px/translate.svg?react';
+import { Icon } from 'mastodon/components/icon';
 import { languages as preloadedLanguages } from 'mastodon/initial_state';
-import { loupeIcon, deleteIcon } from 'mastodon/utils/icons';
-
-import TextIconButton from './text_icon_button';
 
 const messages = defineMessages({
   changeLanguage: { id: 'compose.language.change', defaultMessage: 'Change language' },
@@ -231,7 +232,7 @@ class LanguageDropdownMenu extends PureComponent {
       <div ref={this.setRef}>
         <div className='emoji-mart-search'>
           <input type='search' value={searchValue} onChange={this.handleSearchChange} onKeyDown={this.handleSearchKeyDown} placeholder={intl.formatMessage(messages.search)} />
-          <button type='button' className='emoji-mart-search-icon' disabled={!isSearching} aria-label={intl.formatMessage(messages.clear)} onClick={this.handleClear}>{!isSearching ? loupeIcon : deleteIcon}</button>
+          <button type='button' className='emoji-mart-search-icon' disabled={!isSearching} aria-label={intl.formatMessage(messages.clear)} onClick={this.handleClear}><Icon icon={!isSearching ? SearchIcon : CancelIcon} /></button>
         </div>
 
         <div className='language-dropdown__dropdown__results emoji-mart-scroll' role='listbox' ref={this.setListRef}>
@@ -297,20 +298,24 @@ class LanguageDropdown extends PureComponent {
   render () {
     const { value, intl, frequentlyUsedLanguages } = this.props;
     const { open, placement } = this.state;
+    const current = preloadedLanguages.find(lang => lang[0] === value) ?? [];
 
     return (
-      <div className={classNames('privacy-dropdown', placement, { active: open })}>
-        <div className='privacy-dropdown__value' ref={this.setTargetRef} >
-          <TextIconButton
-            className='privacy-dropdown__value-icon'
-            label={value && value.toUpperCase()}
-            title={intl.formatMessage(messages.changeLanguage)}
-            active={open}
-            onClick={this.handleToggle}
-          />
-        </div>
-
-        <Overlay show={open} placement={'bottom'} flip target={this.findTarget} popperConfig={{ strategy: 'fixed', onFirstUpdate: this.handleOverlayEnter }}>
+      <div ref={this.setTargetRef} onKeyDown={this.handleKeyDown}>
+        <button
+          type='button'
+          title={intl.formatMessage(messages.changeLanguage)}
+          aria-expanded={open}
+          onClick={this.handleToggle}
+          onMouseDown={this.handleMouseDown}
+          onKeyDown={this.handleButtonKeyDown}
+          className={classNames('dropdown-button', { active: open })}
+        >
+          <Icon icon={TranslateIcon} />
+          <span className='dropdown-button__label'>{current[2] ?? value}</span>
+        </button>
+
+        <Overlay show={open} offset={[5, 5]} placement={placement} flip target={this.findTarget} popperConfig={{ strategy: 'fixed', onFirstUpdate: this.handleOverlayEnter }}>
           {({ props, placement }) => (
             <div {...props}>
               <div className={`dropdown-animation language-dropdown__dropdown ${placement}`} >
diff --git a/app/javascript/mastodon/features/compose/components/navigation_bar.jsx b/app/javascript/mastodon/features/compose/components/navigation_bar.jsx
index 2f0bb79f891827..ebf59e4c838c96 100644
--- a/app/javascript/mastodon/features/compose/components/navigation_bar.jsx
+++ b/app/javascript/mastodon/features/compose/components/navigation_bar.jsx
@@ -1,50 +1,36 @@
-import PropTypes from 'prop-types';
+import { useCallback } from 'react';
 
-import { FormattedMessage } from 'react-intl';
+import { useIntl, defineMessages } from 'react-intl';
 
-import { Link } from 'react-router-dom';
+import { useSelector, useDispatch } from 'react-redux';
 
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import ImmutablePureComponent from 'react-immutable-pure-component';
+import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
+import { cancelReplyCompose } from 'mastodon/actions/compose';
+import Account from 'mastodon/components/account';
+import { IconButton } from 'mastodon/components/icon_button';
+import { me } from 'mastodon/initial_state';
 
-import { Avatar } from '../../../components/avatar';
+import { ActionBar } from './action_bar';
 
-import ActionBar from './action_bar';
 
-export default class NavigationBar extends ImmutablePureComponent {
+const messages = defineMessages({
+  cancel: { id: 'reply_indicator.cancel', defaultMessage: 'Cancel' },
+});
 
-  static propTypes = {
-    account: ImmutablePropTypes.record.isRequired,
-    onLogout: PropTypes.func.isRequired,
-    onClose: PropTypes.func,
-  };
+export const NavigationBar = () => {
+  const dispatch = useDispatch();
+  const intl = useIntl();
+  const account = useSelector(state => state.getIn(['accounts', me]));
+  const isReplying = useSelector(state => !!state.getIn(['compose', 'in_reply_to']));
 
-  render () {
-    const username = this.props.account.get('acct');
-    return (
-      <div className='navigation-bar'>
-        <Link to={`/@${username}`}>
-          <span style={{ display: 'none' }}>{username}</span>
-          <Avatar account={this.props.account} size={46} />
-        </Link>
+  const handleCancelClick = useCallback(() => {
+    dispatch(cancelReplyCompose());
+  }, [dispatch]);
 
-        <div className='navigation-bar__profile'>
-          <span>
-            <Link to={`/@${username}`}>
-              <strong className='navigation-bar__profile-account'>@{username}</strong>
-            </Link>
-          </span>
-
-          <span>
-            <a href='/settings/profile' className='navigation-bar__profile-edit'><FormattedMessage id='navigation_bar.edit_profile' defaultMessage='Edit profile' /></a>
-          </span>
-        </div>
-
-        <div className='navigation-bar__actions'>
-          <ActionBar account={this.props.account} onLogout={this.props.onLogout} />
-        </div>
-      </div>
-    );
-  }
-
-}
+  return (
+    <div className='navigation-bar'>
+      <Account account={account} minimal />
+      {isReplying ? <IconButton title={intl.formatMessage(messages.cancel)} iconComponent={CloseIcon} onClick={handleCancelClick} /> : <ActionBar />}
+    </div>
+  );
+};
diff --git a/app/javascript/mastodon/features/compose/components/poll_button.jsx b/app/javascript/mastodon/features/compose/components/poll_button.jsx
index 4900d381192779..345497abd32b8c 100644
--- a/app/javascript/mastodon/features/compose/components/poll_button.jsx
+++ b/app/javascript/mastodon/features/compose/components/poll_button.jsx
@@ -3,11 +3,10 @@ import { PureComponent } from 'react';
 
 import { defineMessages, injectIntl } from 'react-intl';
 
-import InsertChartIcon from '@/material-icons/400-24px/insert_chart.svg?react';
+import BarChart4BarsIcon from '@/material-icons/400-24px/bar_chart_4_bars.svg?react';
 
 import { IconButton } from '../../../components/icon_button';
 
-
 const messages = defineMessages({
   add_poll: { id: 'poll_button.add_poll', defaultMessage: 'Add a poll' },
   remove_poll: { id: 'poll_button.remove_poll', defaultMessage: 'Remove poll' },
@@ -22,7 +21,6 @@ class PollButton extends PureComponent {
 
   static propTypes = {
     disabled: PropTypes.bool,
-    unavailable: PropTypes.bool,
     active: PropTypes.bool,
     onClick: PropTypes.func.isRequired,
     intl: PropTypes.object.isRequired,
@@ -33,17 +31,13 @@ class PollButton extends PureComponent {
   };
 
   render () {
-    const { intl, active, unavailable, disabled } = this.props;
-
-    if (unavailable) {
-      return null;
-    }
+    const { intl, active, disabled } = this.props;
 
     return (
       <div className='compose-form__poll-button'>
         <IconButton
           icon='tasks'
-          iconComponent={InsertChartIcon}
+          iconComponent={BarChart4BarsIcon}
           title={intl.formatMessage(active ? messages.remove_poll : messages.add_poll)}
           disabled={disabled}
           onClick={this.handleClick}
diff --git a/app/javascript/mastodon/features/compose/components/poll_form.jsx b/app/javascript/mastodon/features/compose/components/poll_form.jsx
index 929b2be57abd2c..3c02810e7a29f5 100644
--- a/app/javascript/mastodon/features/compose/components/poll_form.jsx
+++ b/app/javascript/mastodon/features/compose/components/poll_form.jsx
@@ -1,189 +1,162 @@
 import PropTypes from 'prop-types';
-import { PureComponent } from 'react';
+import { useCallback } from 'react';
 
-import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
+import { defineMessages, useIntl } from 'react-intl';
 
 import classNames from 'classnames';
 
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import ImmutablePureComponent from 'react-immutable-pure-component';
+import { useDispatch, useSelector } from 'react-redux';
 
-import AddIcon from '@/material-icons/400-24px/add.svg?react';
-import CloseIcon from '@/material-icons/400-24px/close.svg?react';
+import {
+  changePollSettings,
+  changePollOption,
+  clearComposeSuggestions,
+  fetchComposeSuggestions,
+  selectComposeSuggestion,
+} from 'mastodon/actions/compose';
 import AutosuggestInput from 'mastodon/components/autosuggest_input';
-import { Icon }  from 'mastodon/components/icon';
-import { IconButton } from 'mastodon/components/icon_button';
 
 const messages = defineMessages({
-  option_placeholder: { id: 'compose_form.poll.option_placeholder', defaultMessage: 'Choice {number}' },
-  add_option: { id: 'compose_form.poll.add_option', defaultMessage: 'Add a choice' },
-  remove_option: { id: 'compose_form.poll.remove_option', defaultMessage: 'Remove this choice' },
-  poll_duration: { id: 'compose_form.poll.duration', defaultMessage: 'Poll duration' },
+  option_placeholder: { id: 'compose_form.poll.option_placeholder', defaultMessage: 'Option {number}' },
+  add_option: { id: 'compose_form.poll.add_option', defaultMessage: 'Add option' },
+  remove_option: { id: 'compose_form.poll.remove_option', defaultMessage: 'Remove this option' },
+  duration: { id: 'compose_form.poll.duration', defaultMessage: 'Poll length' },
+  type: { id: 'compose_form.poll.type', defaultMessage: 'Style' },
   switchToMultiple: { id: 'compose_form.poll.switch_to_multiple', defaultMessage: 'Change poll to allow multiple choices' },
   switchToSingle: { id: 'compose_form.poll.switch_to_single', defaultMessage: 'Change poll to allow for a single choice' },
   minutes: { id: 'intervals.full.minutes', defaultMessage: '{number, plural, one {# minute} other {# minutes}}' },
   hours: { id: 'intervals.full.hours', defaultMessage: '{number, plural, one {# hour} other {# hours}}' },
   days: { id: 'intervals.full.days', defaultMessage: '{number, plural, one {# day} other {# days}}' },
+  singleChoice: { id: 'compose_form.poll.single', defaultMessage: 'Pick one' },
+  multipleChoice: { id: 'compose_form.poll.multiple', defaultMessage: 'Multiple choice' },
 });
 
-class OptionIntl extends PureComponent {
-
-  static propTypes = {
-    title: PropTypes.string.isRequired,
-    lang: PropTypes.string,
-    index: PropTypes.number.isRequired,
-    isPollMultiple: PropTypes.bool,
-    autoFocus: PropTypes.bool,
-    onChange: PropTypes.func.isRequired,
-    onRemove: PropTypes.func.isRequired,
-    onToggleMultiple: PropTypes.func.isRequired,
-    suggestions: ImmutablePropTypes.list,
-    onClearSuggestions: PropTypes.func.isRequired,
-    onFetchSuggestions: PropTypes.func.isRequired,
-    onSuggestionSelected: PropTypes.func.isRequired,
-    intl: PropTypes.object.isRequired,
-  };
-
-  handleOptionTitleChange = e => {
-    this.props.onChange(this.props.index, e.target.value);
-  };
-
-  handleOptionRemove = () => {
-    this.props.onRemove(this.props.index);
-  };
-
-
-  handleToggleMultiple = e => {
-    this.props.onToggleMultiple();
-    e.preventDefault();
-    e.stopPropagation();
-  };
-
-  handleCheckboxKeypress = e => {
-    if (e.key === 'Enter' || e.key === ' ') {
-      this.handleToggleMultiple(e);
-    }
-  };
-
-  onSuggestionsClearRequested = () => {
-    this.props.onClearSuggestions();
-  };
-
-  onSuggestionsFetchRequested = (token) => {
-    this.props.onFetchSuggestions(token);
-  };
-
-  onSuggestionSelected = (tokenStart, token, value) => {
-    this.props.onSuggestionSelected(tokenStart, token, value, ['poll', 'options', this.props.index]);
-  };
-
-  render () {
-    const { isPollMultiple, title, lang, index, autoFocus, intl } = this.props;
-
-    return (
-      <li>
-        <label className='poll__option editable'>
-          <span
-            className={classNames('poll__input', { checkbox: isPollMultiple })}
-            onClick={this.handleToggleMultiple}
-            onKeyPress={this.handleCheckboxKeypress}
-            role='button'
-            tabIndex={0}
-            title={intl.formatMessage(isPollMultiple ? messages.switchToSingle : messages.switchToMultiple)}
-            aria-label={intl.formatMessage(isPollMultiple ? messages.switchToSingle : messages.switchToMultiple)}
-          />
-
-          <AutosuggestInput
-            placeholder={intl.formatMessage(messages.option_placeholder, { number: index + 1 })}
-            maxLength={50}
-            value={title}
-            lang={lang}
-            spellCheck
-            onChange={this.handleOptionTitleChange}
-            suggestions={this.props.suggestions}
-            onSuggestionsFetchRequested={this.onSuggestionsFetchRequested}
-            onSuggestionsClearRequested={this.onSuggestionsClearRequested}
-            onSuggestionSelected={this.onSuggestionSelected}
-            searchTokens={[':']}
-            autoFocus={autoFocus}
-          />
-        </label>
-
-        <div className='poll__cancel'>
-          <IconButton disabled={index <= 1} title={intl.formatMessage(messages.remove_option)} icon='times' iconComponent={CloseIcon} onClick={this.handleOptionRemove} />
-        </div>
-      </li>
-    );
+const Select = ({ label, options, value, onChange }) => {
+  return (
+    <label className='compose-form__poll__select'>
+      <span className='compose-form__poll__select__label'>{label}</span>
+
+      <select className='compose-form__poll__select__value' value={value} onChange={onChange}>
+        {options.map((option, i) => (
+          <option key={i} value={option.value}>{option.label}</option>
+        ))}
+      </select>
+    </label>
+  );
+};
+
+Select.propTypes = {
+  label: PropTypes.node,
+  value: PropTypes.any,
+  onChange: PropTypes.func,
+  options: PropTypes.arrayOf(PropTypes.shape({
+    label: PropTypes.node,
+    value: PropTypes.any,
+  })),
+};
+
+const Option = ({ multipleChoice, index, title, autoFocus }) => {
+  const intl = useIntl();
+  const dispatch = useDispatch();
+  const suggestions = useSelector(state => state.getIn(['compose', 'suggestions']));
+  const lang = useSelector(state => state.getIn(['compose', 'language']));
+
+  const handleChange = useCallback(({ target: { value } }) => {
+    dispatch(changePollOption(index, value));
+  }, [dispatch, index]);
+
+  const handleSuggestionsFetchRequested = useCallback(token => {
+    dispatch(fetchComposeSuggestions(token));
+  }, [dispatch]);
+
+  const handleSuggestionsClearRequested = useCallback(() => {
+    dispatch(clearComposeSuggestions());
+  }, [dispatch]);
+
+  const handleSuggestionSelected = useCallback((tokenStart, token, value) => {
+    dispatch(selectComposeSuggestion(tokenStart, token, value, ['poll', 'options', index]));
+  }, [dispatch, index]);
+
+  return (
+    <label className={classNames('poll__option editable', { empty: index > 1 && title.length === 0 })}>
+      <span className={classNames('poll__input', { checkbox: multipleChoice })} />
+
+      <AutosuggestInput
+        placeholder={intl.formatMessage(messages.option_placeholder, { number: index + 1 })}
+        maxLength={50}
+        value={title}
+        lang={lang}
+        spellCheck
+        onChange={handleChange}
+        suggestions={suggestions}
+        onSuggestionsFetchRequested={handleSuggestionsFetchRequested}
+        onSuggestionsClearRequested={handleSuggestionsClearRequested}
+        onSuggestionSelected={handleSuggestionSelected}
+        searchTokens={[':']}
+        autoFocus={autoFocus}
+      />
+    </label>
+  );
+};
+
+Option.propTypes = {
+  title: PropTypes.string.isRequired,
+  index: PropTypes.number.isRequired,
+  multipleChoice: PropTypes.bool,
+  autoFocus: PropTypes.bool,
+};
+
+export const PollForm = () => {
+  const intl = useIntl();
+  const dispatch = useDispatch();
+  const poll = useSelector(state => state.getIn(['compose', 'poll']));
+  const options = poll?.get('options');
+  const expiresIn = poll?.get('expires_in');
+  const isMultiple = poll?.get('multiple');
+
+  const handleDurationChange = useCallback(({ target: { value } }) => {
+    dispatch(changePollSettings(value, isMultiple));
+  }, [dispatch, isMultiple]);
+
+  const handleTypeChange = useCallback(({ target: { value } }) => {
+    dispatch(changePollSettings(expiresIn, value === 'true'));
+  }, [dispatch, expiresIn]);
+
+  if (poll === null) {
+    return null;
   }
 
-}
-
-const Option = injectIntl(OptionIntl);
-
-class PollForm extends ImmutablePureComponent {
-
-  static propTypes = {
-    options: ImmutablePropTypes.list,
-    lang: PropTypes.string,
-    expiresIn: PropTypes.number,
-    isMultiple: PropTypes.bool,
-    onChangeOption: PropTypes.func.isRequired,
-    onAddOption: PropTypes.func.isRequired,
-    onRemoveOption: PropTypes.func.isRequired,
-    onChangeSettings: PropTypes.func.isRequired,
-    suggestions: ImmutablePropTypes.list,
-    onClearSuggestions: PropTypes.func.isRequired,
-    onFetchSuggestions: PropTypes.func.isRequired,
-    onSuggestionSelected: PropTypes.func.isRequired,
-    intl: PropTypes.object.isRequired,
-  };
-
-  handleAddOption = () => {
-    this.props.onAddOption('');
-  };
-
-  handleSelectDuration = e => {
-    this.props.onChangeSettings(e.target.value, this.props.isMultiple);
-  };
-
-  handleToggleMultiple = () => {
-    this.props.onChangeSettings(this.props.expiresIn, !this.props.isMultiple);
-  };
-
-  render () {
-    const { options, lang, expiresIn, isMultiple, onChangeOption, onRemoveOption, intl, ...other } = this.props;
-
-    if (!options) {
-      return null;
-    }
-
-    const autoFocusIndex = options.indexOf('');
-
-    return (
-      <div className='compose-form__poll-wrapper'>
-        <ul>
-          {options.map((title, i) => <Option title={title} lang={lang} key={i} index={i} onChange={onChangeOption} onRemove={onRemoveOption} isPollMultiple={isMultiple} onToggleMultiple={this.handleToggleMultiple} autoFocus={i === autoFocusIndex} {...other} />)}
-        </ul>
-
-        <div className='poll__footer'>
-          <button type='button' disabled={options.size >= 4} className='button button-secondary' onClick={this.handleAddOption}><Icon id='plus' icon={AddIcon} /> <FormattedMessage {...messages.add_option} /></button>
-
-          {/* eslint-disable-next-line jsx-a11y/no-onchange */}
-          <select value={expiresIn} onChange={this.handleSelectDuration}>
-            <option value={300}>{intl.formatMessage(messages.minutes, { number: 5 })}</option>
-            <option value={1800}>{intl.formatMessage(messages.minutes, { number: 30 })}</option>
-            <option value={3600}>{intl.formatMessage(messages.hours, { number: 1 })}</option>
-            <option value={21600}>{intl.formatMessage(messages.hours, { number: 6 })}</option>
-            <option value={43200}>{intl.formatMessage(messages.hours, { number: 12 })}</option>
-            <option value={86400}>{intl.formatMessage(messages.days, { number: 1 })}</option>
-            <option value={259200}>{intl.formatMessage(messages.days, { number: 3 })}</option>
-            <option value={604800}>{intl.formatMessage(messages.days, { number: 7 })}</option>
-          </select>
-        </div>
+  return (
+    <div className='compose-form__poll'>
+      {options.map((title, i) => (
+        <Option
+          title={title}
+          key={i}
+          index={i}
+          multipleChoice={isMultiple}
+          autoFocus={i === 0}
+        />
+      ))}
+
+      <div className='compose-form__poll__footer'>
+        <Select label={intl.formatMessage(messages.duration)} options={[
+          { value: 300, label: intl.formatMessage(messages.minutes, { number: 5 })},
+          { value: 1800, label: intl.formatMessage(messages.minutes, { number: 30 })},
+          { value: 3600, label: intl.formatMessage(messages.hours, { number: 1 })},
+          { value: 21600, label: intl.formatMessage(messages.hours, { number: 6 })},
+          { value: 43200, label: intl.formatMessage(messages.hours, { number: 12 })},
+          { value: 86400, label: intl.formatMessage(messages.days, { number: 1 })},
+          { value: 259200, label: intl.formatMessage(messages.days, { number: 3 })},
+          { value: 604800, label: intl.formatMessage(messages.days, { number: 7 })},
+        ]} value={expiresIn} onChange={handleDurationChange} />
+
+        <div className='compose-form__poll__footer__sep' />
+
+        <Select label={intl.formatMessage(messages.type)} options={[
+          { value: false, label: intl.formatMessage(messages.singleChoice) },
+          { value: true, label: intl.formatMessage(messages.multipleChoice) },
+        ]} value={isMultiple} onChange={handleTypeChange} />
       </div>
-    );
-  }
-
-}
-
-export default injectIntl(PollForm);
+    </div>
+  );
+};
diff --git a/app/javascript/mastodon/features/compose/components/privacy_dropdown.jsx b/app/javascript/mastodon/features/compose/components/privacy_dropdown.jsx
index c3446b8d6051bf..82f902738891d8 100644
--- a/app/javascript/mastodon/features/compose/components/privacy_dropdown.jsx
+++ b/app/javascript/mastodon/features/compose/components/privacy_dropdown.jsx
@@ -5,28 +5,27 @@ import { injectIntl, defineMessages } from 'react-intl';
 
 import classNames from 'classnames';
 
-
 import { supportsPassiveEvents } from 'detect-passive-events';
 import Overlay from 'react-overlays/Overlay';
 
 import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
+import InfoIcon from '@/material-icons/400-24px/info.svg?react';
 import LockIcon from '@/material-icons/400-24px/lock.svg?react';
-import LockOpenIcon from '@/material-icons/400-24px/lock_open.svg?react';
 import PublicIcon from '@/material-icons/400-24px/public.svg?react';
+import QuietTimeIcon from '@/material-icons/400-24px/quiet_time.svg?react';
 import { Icon }  from 'mastodon/components/icon';
 
-import { IconButton } from '../../../components/icon_button';
-
 const messages = defineMessages({
   public_short: { id: 'privacy.public.short', defaultMessage: 'Public' },
-  public_long: { id: 'privacy.public.long', defaultMessage: 'Visible for all' },
-  unlisted_short: { id: 'privacy.unlisted.short', defaultMessage: 'Unlisted' },
-  unlisted_long: { id: 'privacy.unlisted.long', defaultMessage: 'Visible for all, but opted-out of discovery features' },
-  private_short: { id: 'privacy.private.short', defaultMessage: 'Followers only' },
-  private_long: { id: 'privacy.private.long', defaultMessage: 'Visible for followers only' },
-  direct_short: { id: 'privacy.direct.short', defaultMessage: 'Mentioned people only' },
-  direct_long: { id: 'privacy.direct.long', defaultMessage: 'Visible for mentioned users only' },
-  change_privacy: { id: 'privacy.change', defaultMessage: 'Adjust status privacy' },
+  public_long: { id: 'privacy.public.long', defaultMessage: 'Anyone on and off Mastodon' },
+  unlisted_short: { id: 'privacy.unlisted.short', defaultMessage: 'Quiet public' },
+  unlisted_long: { id: 'privacy.unlisted.long', defaultMessage: 'Fewer algorithmic fanfares' },
+  private_short: { id: 'privacy.private.short', defaultMessage: 'Followers' },
+  private_long: { id: 'privacy.private.long', defaultMessage: 'Only your followers' },
+  direct_short: { id: 'privacy.direct.short', defaultMessage: 'Specific people' },
+  direct_long: { id: 'privacy.direct.long', defaultMessage: 'Everyone mentioned in the post' },
+  change_privacy: { id: 'privacy.change', defaultMessage: 'Change post privacy' },
+  unlisted_extra: { id: 'privacy.unlisted.additional', defaultMessage: 'This behaves exactly like public, except the post will not appear in live feeds or hashtags, explore, or Mastodon search, even if you are opted-in account-wide.' },
 });
 
 const listenerOptions = supportsPassiveEvents ? { passive: true, capture: true } : true;
@@ -135,6 +134,12 @@ class PrivacyDropdownMenu extends PureComponent {
               <strong>{item.text}</strong>
               {item.meta}
             </div>
+
+            {item.extra && (
+              <div className='privacy-dropdown__option__additional' title={item.extra}>
+                <Icon id='info-circle' icon={InfoIcon} />
+              </div>
+            )}
           </div>
         ))}
       </div>
@@ -163,30 +168,11 @@ class PrivacyDropdown extends PureComponent {
   };
 
   handleToggle = () => {
-    if (this.props.isUserTouching && this.props.isUserTouching()) {
-      if (this.state.open) {
-        this.props.onModalClose();
-      } else {
-        this.props.onModalOpen({
-          actions: this.options.map(option => ({ ...option, active: option.value === this.props.value })),
-          onClick: this.handleModalActionClick,
-        });
-      }
-    } else {
-      if (this.state.open && this.activeElement) {
-        this.activeElement.focus({ preventScroll: true });
-      }
-      this.setState({ open: !this.state.open });
+    if (this.state.open && this.activeElement) {
+      this.activeElement.focus({ preventScroll: true });
     }
-  };
 
-  handleModalActionClick = (e) => {
-    e.preventDefault();
-
-    const { value } = this.options[e.currentTarget.getAttribute('data-index')];
-
-    this.props.onModalClose();
-    this.props.onChange(value);
+    this.setState({ open: !this.state.open });
   };
 
   handleKeyDown = e => {
@@ -228,7 +214,7 @@ class PrivacyDropdown extends PureComponent {
 
     this.options = [
       { icon: 'globe', iconComponent: PublicIcon, value: 'public', text: formatMessage(messages.public_short), meta: formatMessage(messages.public_long) },
-      { icon: 'unlock', iconComponent: LockOpenIcon,  value: 'unlisted', text: formatMessage(messages.unlisted_short), meta: formatMessage(messages.unlisted_long) },
+      { icon: 'unlock', iconComponent: QuietTimeIcon,  value: 'unlisted', text: formatMessage(messages.unlisted_short), meta: formatMessage(messages.unlisted_long), extra: formatMessage(messages.unlisted_extra) },
       { icon: 'lock', iconComponent: LockIcon, value: 'private', text: formatMessage(messages.private_short), meta: formatMessage(messages.private_long) },
     ];
 
@@ -259,23 +245,21 @@ class PrivacyDropdown extends PureComponent {
 
     return (
       <div ref={this.setTargetRef} onKeyDown={this.handleKeyDown}>
-        <IconButton
-          className='privacy-dropdown__value-icon'
-          icon={valueOption.icon}
-          iconComponent={valueOption.iconComponent}
+        <button
+          type='button'
           title={intl.formatMessage(messages.change_privacy)}
-          size={18}
-          expanded={open}
-          active={open}
-          inverted
+          aria-expanded={open}
           onClick={this.handleToggle}
           onMouseDown={this.handleMouseDown}
           onKeyDown={this.handleButtonKeyDown}
-          style={{ height: null, lineHeight: '27px' }}
           disabled={disabled}
-        />
+          className={classNames('dropdown-button', { active: open })}
+        >
+          <Icon id={valueOption.icon} icon={valueOption.iconComponent} />
+          <span className='dropdown-button__label'>{valueOption.text}</span>
+        </button>
 
-        <Overlay show={open} placement={placement} flip target={this.findTarget} container={container} popperConfig={{ strategy: 'fixed', onFirstUpdate: this.handleOverlayEnter }}>
+        <Overlay show={open} offset={[5, 5]} placement={placement} flip target={this.findTarget} container={container} popperConfig={{ strategy: 'fixed', onFirstUpdate: this.handleOverlayEnter }}>
           {({ props, placement }) => (
             <div {...props}>
               <div className={`dropdown-animation privacy-dropdown__dropdown ${placement}`}>
diff --git a/app/javascript/mastodon/features/compose/components/reply_indicator.jsx b/app/javascript/mastodon/features/compose/components/reply_indicator.jsx
index 8051e01db4f92a..b7959e211d6e45 100644
--- a/app/javascript/mastodon/features/compose/components/reply_indicator.jsx
+++ b/app/javascript/mastodon/features/compose/components/reply_indicator.jsx
@@ -1,74 +1,48 @@
-import PropTypes from 'prop-types';
+import { FormattedMessage } from 'react-intl';
 
-import { defineMessages, injectIntl } from 'react-intl';
+import { Link } from 'react-router-dom';
 
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import ImmutablePureComponent from 'react-immutable-pure-component';
+import { useSelector } from 'react-redux';
 
-import CloseIcon from '@/material-icons/400-24px/close.svg?react';
-import AttachmentList from 'mastodon/components/attachment_list';
-import { WithOptionalRouterPropTypes, withOptionalRouter } from 'mastodon/utils/react_router';
+import BarChart4BarsIcon from '@/material-icons/400-24px/bar_chart_4_bars.svg?react';
+import PhotoLibraryIcon from '@/material-icons/400-24px/photo_library.svg?react';
+import { Avatar } from 'mastodon/components/avatar';
+import { DisplayName } from 'mastodon/components/display_name';
+import { Icon } from 'mastodon/components/icon';
 
-import { Avatar } from '../../../components/avatar';
-import { DisplayName } from '../../../components/display_name';
-import { IconButton } from '../../../components/icon_button';
+export const ReplyIndicator = () => {
+  const inReplyToId = useSelector(state => state.getIn(['compose', 'in_reply_to']));
+  const status = useSelector(state => state.getIn(['statuses', inReplyToId]));
+  const account = useSelector(state => state.getIn(['accounts', status?.get('account')]));
 
-const messages = defineMessages({
-  cancel: { id: 'reply_indicator.cancel', defaultMessage: 'Cancel' },
-});
-
-class ReplyIndicator extends ImmutablePureComponent {
-
-  static propTypes = {
-    status: ImmutablePropTypes.map,
-    onCancel: PropTypes.func.isRequired,
-    intl: PropTypes.object.isRequired,
-    ...WithOptionalRouterPropTypes,
-  };
-
-  handleClick = () => {
-    this.props.onCancel();
-  };
-
-  handleAccountClick = (e) => {
-    if (e.button === 0 && !(e.ctrlKey || e.metaKey)) {
-      e.preventDefault();
-      this.props.history?.push(`/@${this.props.status.getIn(['account', 'acct'])}`);
-    }
-  };
-
-  render () {
-    const { status, intl } = this.props;
+  if (!status) {
+    return null;
+  }
 
-    if (!status) {
-      return null;
-    }
+  const content = { __html: status.get('contentHtml') };
 
-    const content = { __html: status.get('contentHtml') };
+  return (
+    <div className='reply-indicator'>
+      <div className='reply-indicator__line' />
 
-    return (
-      <div className='reply-indicator'>
-        <div className='reply-indicator__header'>
-          <div className='reply-indicator__cancel'><IconButton title={intl.formatMessage(messages.cancel)} icon='times' iconComponent={CloseIcon} onClick={this.handleClick} inverted /></div>
+      <Link to={`/@${account.get('acct')}`} className='detailed-status__display-avatar'>
+        <Avatar account={account} size={46} />
+      </Link>
 
-          <a href={`/@${status.getIn(['account', 'acct'])}`} onClick={this.handleAccountClick} className='reply-indicator__display-name'>
-            <div className='reply-indicator__display-avatar'><Avatar account={status.get('account')} size={24} /></div>
-            <DisplayName account={status.get('account')} />
-          </a>
-        </div>
+      <div className='reply-indicator__main'>
+        <Link to={`/@${account.get('acct')}`} className='detailed-status__display-name'>
+          <DisplayName account={account} />
+        </Link>
 
         <div className='reply-indicator__content translate' dangerouslySetInnerHTML={content} />
 
-        {status.get('media_attachments').size > 0 && (
-          <AttachmentList
-            compact
-            media={status.get('media_attachments')}
-          />
+        {(status.get('poll') || status.get('media_attachments').size > 0) && (
+          <div className='reply-indicator__attachments'>
+            {status.get('poll') && <><Icon icon={BarChart4BarsIcon} /><FormattedMessage id='reply_indicator.poll' defaultMessage='Poll' /></>}
+            {status.get('media_attachments').size > 0 && <><Icon icon={PhotoLibraryIcon} /><FormattedMessage id='reply_indicator.attachments' defaultMessage='{count, plural, one {# attachment} other {# attachments}}' values={{ count: status.get('media_attachments').size }} /></>}
+          </div>
         )}
       </div>
-    );
-  }
-
-}
-
-export default withOptionalRouter(injectIntl(ReplyIndicator));
+    </div>
+  );
+};
diff --git a/app/javascript/mastodon/features/compose/components/upload.jsx b/app/javascript/mastodon/features/compose/components/upload.jsx
index 76d394af7a41cc..861232d0ecbe03 100644
--- a/app/javascript/mastodon/features/compose/components/upload.jsx
+++ b/app/javascript/mastodon/features/compose/components/upload.jsx
@@ -2,6 +2,8 @@ import PropTypes from 'prop-types';
 
 import { FormattedMessage } from 'react-intl';
 
+import classNames from 'classnames';
+
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
@@ -9,7 +11,8 @@ import spring from 'react-motion/lib/spring';
 
 import CloseIcon from '@/material-icons/400-24px/close.svg?react';
 import EditIcon from '@/material-icons/400-24px/edit.svg?react';
-import InfoIcon from '@/material-icons/400-24px/info.svg?react';
+import WarningIcon from '@/material-icons/400-24px/warning.svg?react';
+import { Blurhash } from 'mastodon/components/blurhash';
 import { Icon }  from 'mastodon/components/icon';
 
 import Motion from '../../ui/util/optional_motion';
@@ -18,6 +21,7 @@ export default class Upload extends ImmutablePureComponent {
 
   static propTypes = {
     media: ImmutablePropTypes.map.isRequired,
+    sensitive: PropTypes.bool,
     onUndo: PropTypes.func.isRequired,
     onOpenFocalPoint: PropTypes.func.isRequired,
   };
@@ -33,7 +37,7 @@ export default class Upload extends ImmutablePureComponent {
   };
 
   render () {
-    const { media } = this.props;
+    const { media, sensitive } = this.props;
 
     if (!media) {
       return null;
@@ -43,22 +47,26 @@ export default class Upload extends ImmutablePureComponent {
     const focusY = media.getIn(['meta', 'focus', 'y']);
     const x = ((focusX /  2) + .5) * 100;
     const y = ((focusY / -2) + .5) * 100;
+    const missingDescription = (media.get('description') || '').length === 0;
 
     return (
       <div className='compose-form__upload'>
         <Motion defaultStyle={{ scale: 0.8 }} style={{ scale: spring(1, { stiffness: 180, damping: 12 }) }}>
           {({ scale }) => (
-            <div className='compose-form__upload-thumbnail' style={{ transform: `scale(${scale})`, backgroundImage: `url(${media.get('preview_url')})`, backgroundPosition: `${x}% ${y}%` }}>
+            <div className='compose-form__upload__thumbnail' style={{ transform: `scale(${scale})`, backgroundImage: !sensitive ? `url(${media.get('preview_url')})` : null, backgroundPosition: `${x}% ${y}%` }}>
+              {sensitive && <Blurhash
+                hash={media.get('blurhash')}
+                className='compose-form__upload__preview'
+              />}
+
               <div className='compose-form__upload__actions'>
-                <button type='button' className='icon-button' onClick={this.handleUndoClick}><Icon id='times' icon={CloseIcon} /> <FormattedMessage id='upload_form.undo' defaultMessage='Delete' /></button>
-                <button type='button' className='icon-button' onClick={this.handleFocalPointClick}><Icon id='pencil' icon={EditIcon} /> <FormattedMessage id='upload_form.edit' defaultMessage='Edit' /></button>
+                <button type='button' className='icon-button compose-form__upload__delete' onClick={this.handleUndoClick}><Icon icon={CloseIcon} /></button>
+                <button type='button' className='icon-button' onClick={this.handleFocalPointClick}><Icon icon={EditIcon} /> <FormattedMessage id='upload_form.edit' defaultMessage='Edit' /></button>
               </div>
 
-              {(media.get('description') || '').length === 0 && (
-                <div className='compose-form__upload__warning'>
-                  <button type='button' className='icon-button' onClick={this.handleFocalPointClick}><Icon id='info-circle' icon={InfoIcon} /> <FormattedMessage id='upload_form.description_missing' defaultMessage='No description added' /></button>
-                </div>
-              )}
+              <div className='compose-form__upload__warning'>
+                <button type='button' className={classNames('icon-button', { active: missingDescription })} onClick={this.handleFocalPointClick}>{missingDescription && <Icon icon={WarningIcon} />} ALT</button>
+              </div>
             </div>
           )}
         </Motion>
diff --git a/app/javascript/mastodon/features/compose/components/upload_button.jsx b/app/javascript/mastodon/features/compose/components/upload_button.jsx
index 923d6a3c47e458..3866f239d7cbf8 100644
--- a/app/javascript/mastodon/features/compose/components/upload_button.jsx
+++ b/app/javascript/mastodon/features/compose/components/upload_button.jsx
@@ -6,9 +6,8 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-import AddPhotoAlternateIcon from '@/material-icons/400-24px/add_photo_alternate.svg?react';
-
-import { IconButton } from '../../../components/icon_button';
+import PhotoLibraryIcon from '@/material-icons/400-24px/photo_library.svg?react';
+import { IconButton } from 'mastodon/components/icon_button';
 
 const messages = defineMessages({
   upload: { id: 'upload_button.label', defaultMessage: 'Add images, a video or an audio file' },
@@ -31,7 +30,6 @@ class UploadButton extends ImmutablePureComponent {
 
   static propTypes = {
     disabled: PropTypes.bool,
-    unavailable: PropTypes.bool,
     onSelectFile: PropTypes.func.isRequired,
     style: PropTypes.object,
     resetFileKey: PropTypes.number,
@@ -54,17 +52,13 @@ class UploadButton extends ImmutablePureComponent {
   };
 
   render () {
-    const { intl, resetFileKey, unavailable, disabled, acceptContentTypes } = this.props;
-
-    if (unavailable) {
-      return null;
-    }
+    const { intl, resetFileKey, disabled, acceptContentTypes } = this.props;
 
     const message = intl.formatMessage(messages.upload);
 
     return (
       <div className='compose-form__upload-button'>
-        <IconButton icon='paperclip' iconComponent={AddPhotoAlternateIcon} title={message} disabled={disabled} onClick={this.handleClick} className='compose-form__upload-button-icon' size={18} inverted style={iconStyle} />
+        <IconButton icon='paperclip' iconComponent={PhotoLibraryIcon} title={message} disabled={disabled} onClick={this.handleClick} className='compose-form__upload-button-icon' size={18} inverted style={iconStyle} />
         <label>
           <span style={{ display: 'none' }}>{message}</span>
           <input
diff --git a/app/javascript/mastodon/features/compose/components/upload_form.jsx b/app/javascript/mastodon/features/compose/components/upload_form.jsx
index cf2e53ad905f0d..46bac7823b8d16 100644
--- a/app/javascript/mastodon/features/compose/components/upload_form.jsx
+++ b/app/javascript/mastodon/features/compose/components/upload_form.jsx
@@ -1,7 +1,6 @@
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-import SensitiveButtonContainer from '../containers/sensitive_button_container';
 import UploadContainer from '../containers/upload_container';
 import UploadProgressContainer from '../containers/upload_progress_container';
 
@@ -15,17 +14,17 @@ export default class UploadForm extends ImmutablePureComponent {
     const { mediaIds } = this.props;
 
     return (
-      <div className='compose-form__upload-wrapper'>
+      <>
         <UploadProgressContainer />
 
-        <div className='compose-form__uploads-wrapper'>
-          {mediaIds.map(id => (
-            <UploadContainer id={id} key={id} />
-          ))}
-        </div>
-
-        {!mediaIds.isEmpty() && <SensitiveButtonContainer />}
-      </div>
+        {mediaIds.size > 0 && (
+          <div className='compose-form__uploads'>
+            {mediaIds.map(id => (
+              <UploadContainer id={id} key={id} />
+            ))}
+          </div>
+        )}
+      </>
     );
   }
 
diff --git a/app/javascript/mastodon/features/compose/components/upload_progress.jsx b/app/javascript/mastodon/features/compose/components/upload_progress.jsx
index e4973b24fd604f..1276cded1ff2fd 100644
--- a/app/javascript/mastodon/features/compose/components/upload_progress.jsx
+++ b/app/javascript/mastodon/features/compose/components/upload_progress.jsx
@@ -35,9 +35,7 @@ export default class UploadProgress extends PureComponent {
 
     return (
       <div className='upload-progress'>
-        <div className='upload-progress__icon'>
-          <Icon id='upload' icon={UploadFileIcon} />
-        </div>
+        <Icon id='upload' icon={UploadFileIcon} />
 
         <div className='upload-progress__message'>
           {message}
diff --git a/app/javascript/mastodon/features/compose/containers/navigation_container.js b/app/javascript/mastodon/features/compose/containers/navigation_container.js
deleted file mode 100644
index 70b4026d140c1c..00000000000000
--- a/app/javascript/mastodon/features/compose/containers/navigation_container.js
+++ /dev/null
@@ -1,36 +0,0 @@
-import { defineMessages, injectIntl } from 'react-intl';
-
-import { connect }   from 'react-redux';
-
-import { openModal } from 'mastodon/actions/modal';
-import { logOut } from 'mastodon/utils/log_out';
-
-import { me } from '../../../initial_state';
-import NavigationBar from '../components/navigation_bar';
-
-const messages = defineMessages({
-  logoutMessage: { id: 'confirmations.logout.message', defaultMessage: 'Are you sure you want to log out?' },
-  logoutConfirm: { id: 'confirmations.logout.confirm', defaultMessage: 'Log out' },
-});
-
-const mapStateToProps = state => {
-  return {
-    account: state.getIn(['accounts', me]),
-  };
-};
-
-const mapDispatchToProps = (dispatch, { intl }) => ({
-  onLogout () {
-    dispatch(openModal({
-      modalType: 'CONFIRM',
-      modalProps: {
-        message: intl.formatMessage(messages.logoutMessage),
-        confirm: intl.formatMessage(messages.logoutConfirm),
-        closeWhenConfirm: false,
-        onConfirm: () => logOut(),
-      },
-    }));
-  },
-});
-
-export default injectIntl(connect(mapStateToProps, mapDispatchToProps)(NavigationBar));
diff --git a/app/javascript/mastodon/features/compose/containers/poll_button_container.js b/app/javascript/mastodon/features/compose/containers/poll_button_container.js
index b7785ecbb42865..9de388f64aab78 100644
--- a/app/javascript/mastodon/features/compose/containers/poll_button_container.js
+++ b/app/javascript/mastodon/features/compose/containers/poll_button_container.js
@@ -4,7 +4,7 @@ import { addPoll, removePoll } from '../../../actions/compose';
 import PollButton from '../components/poll_button';
 
 const mapStateToProps = state => ({
-  unavailable: state.getIn(['compose', 'is_uploading']) || (state.getIn(['compose', 'media_attachments']).size > 0),
+  disabled: state.getIn(['compose', 'is_uploading']) || (state.getIn(['compose', 'media_attachments']).size > 0),
   active: state.getIn(['compose', 'poll']) !== null,
 });
 
diff --git a/app/javascript/mastodon/features/compose/containers/poll_form_container.js b/app/javascript/mastodon/features/compose/containers/poll_form_container.js
deleted file mode 100644
index 177ffcea6acb4b..00000000000000
--- a/app/javascript/mastodon/features/compose/containers/poll_form_container.js
+++ /dev/null
@@ -1,53 +0,0 @@
-import { connect } from 'react-redux';
-
-import {
-  addPollOption,
-  removePollOption,
-  changePollOption,
-  changePollSettings,
-  clearComposeSuggestions,
-  fetchComposeSuggestions,
-  selectComposeSuggestion,
-} from '../../../actions/compose';
-import PollForm from '../components/poll_form';
-
-const mapStateToProps = state => ({
-  suggestions: state.getIn(['compose', 'suggestions']),
-  options: state.getIn(['compose', 'poll', 'options']),
-  lang: state.getIn(['compose', 'language']),
-  expiresIn: state.getIn(['compose', 'poll', 'expires_in']),
-  isMultiple: state.getIn(['compose', 'poll', 'multiple']),
-});
-
-const mapDispatchToProps = dispatch => ({
-  onAddOption(title) {
-    dispatch(addPollOption(title));
-  },
-
-  onRemoveOption(index) {
-    dispatch(removePollOption(index));
-  },
-
-  onChangeOption(index, title) {
-    dispatch(changePollOption(index, title));
-  },
-
-  onChangeSettings(expiresIn, isMultiple) {
-    dispatch(changePollSettings(expiresIn, isMultiple));
-  },
-
-  onClearSuggestions () {
-    dispatch(clearComposeSuggestions());
-  },
-
-  onFetchSuggestions (token) {
-    dispatch(fetchComposeSuggestions(token));
-  },
-
-  onSuggestionSelected (position, token, accountId, path) {
-    dispatch(selectComposeSuggestion(position, token, accountId, path));
-  },
-
-});
-
-export default connect(mapStateToProps, mapDispatchToProps)(PollForm);
diff --git a/app/javascript/mastodon/features/compose/containers/reply_indicator_container.js b/app/javascript/mastodon/features/compose/containers/reply_indicator_container.js
deleted file mode 100644
index 1147e448afef33..00000000000000
--- a/app/javascript/mastodon/features/compose/containers/reply_indicator_container.js
+++ /dev/null
@@ -1,36 +0,0 @@
-import { connect } from 'react-redux';
-
-import { cancelReplyCompose } from '../../../actions/compose';
-import { makeGetStatus } from '../../../selectors';
-import ReplyIndicator from '../components/reply_indicator';
-
-const makeMapStateToProps = () => {
-  const getStatus = makeGetStatus();
-
-  const mapStateToProps = state => {
-    let statusId = state.getIn(['compose', 'id'], null);
-    let editing  = true;
-
-    if (statusId === null) {
-      statusId = state.getIn(['compose', 'in_reply_to']);
-      editing  = false;
-    }
-
-    return {
-      status: getStatus(state, { id: statusId }),
-      editing,
-    };
-  };
-
-  return mapStateToProps;
-};
-
-const mapDispatchToProps = dispatch => ({
-
-  onCancel () {
-    dispatch(cancelReplyCompose());
-  },
-
-});
-
-export default connect(makeMapStateToProps, mapDispatchToProps)(ReplyIndicator);
diff --git a/app/javascript/mastodon/features/compose/containers/sensitive_button_container.jsx b/app/javascript/mastodon/features/compose/containers/sensitive_button_container.jsx
deleted file mode 100644
index 18283ee98d763e..00000000000000
--- a/app/javascript/mastodon/features/compose/containers/sensitive_button_container.jsx
+++ /dev/null
@@ -1,73 +0,0 @@
-import PropTypes from 'prop-types';
-import { PureComponent } from 'react';
-
-import { injectIntl, defineMessages, FormattedMessage } from 'react-intl';
-
-import classNames from 'classnames';
-
-import { connect } from 'react-redux';
-
-import { changeComposeSensitivity } from 'mastodon/actions/compose';
-
-const messages = defineMessages({
-  marked: {
-    id: 'compose_form.sensitive.marked',
-    defaultMessage: '{count, plural, one {Media is marked as sensitive} other {Media is marked as sensitive}}',
-  },
-  unmarked: {
-    id: 'compose_form.sensitive.unmarked',
-    defaultMessage: '{count, plural, one {Media is not marked as sensitive} other {Media is not marked as sensitive}}',
-  },
-});
-
-const mapStateToProps = state => ({
-  active: state.getIn(['compose', 'sensitive']),
-  disabled: state.getIn(['compose', 'spoiler']),
-  mediaCount: state.getIn(['compose', 'media_attachments']).size,
-});
-
-const mapDispatchToProps = dispatch => ({
-
-  onClick () {
-    dispatch(changeComposeSensitivity());
-  },
-
-});
-
-class SensitiveButton extends PureComponent {
-
-  static propTypes = {
-    active: PropTypes.bool,
-    disabled: PropTypes.bool,
-    mediaCount: PropTypes.number,
-    onClick: PropTypes.func.isRequired,
-    intl: PropTypes.object.isRequired,
-  };
-
-  render () {
-    const { active, disabled, mediaCount, onClick, intl } = this.props;
-
-    return (
-      <div className='compose-form__sensitive-button'>
-        <label className={classNames('icon-button', { active })} title={intl.formatMessage(active ? messages.marked : messages.unmarked, { count: mediaCount })}>
-          <input
-            name='mark-sensitive'
-            type='checkbox'
-            checked={active}
-            onChange={onClick}
-            disabled={disabled}
-          />
-
-          <FormattedMessage
-            id='compose_form.sensitive.hide'
-            defaultMessage='{count, plural, one {Mark media as sensitive} other {Mark media as sensitive}}'
-            values={{ count: mediaCount }}
-          />
-        </label>
-      </div>
-    );
-  }
-
-}
-
-export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(SensitiveButton));
diff --git a/app/javascript/mastodon/features/compose/containers/spoiler_button_container.js b/app/javascript/mastodon/features/compose/containers/spoiler_button_container.js
index b3d7a713355775..a2414177356864 100644
--- a/app/javascript/mastodon/features/compose/containers/spoiler_button_container.js
+++ b/app/javascript/mastodon/features/compose/containers/spoiler_button_container.js
@@ -2,8 +2,10 @@ import { injectIntl, defineMessages } from 'react-intl';
 
 import { connect } from 'react-redux';
 
+import WarningIcon from 'mastodon/../material-icons/400-24px/warning.svg?react';
+import { IconButton } from 'mastodon/components/icon_button';
+
 import { changeComposeSpoilerness } from '../../../actions/compose';
-import TextIconButton from '../components/text_icon_button';
 
 const messages = defineMessages({
   marked: { id: 'compose_form.spoiler.marked', defaultMessage: 'Text is hidden behind warning' },
@@ -11,10 +13,12 @@ const messages = defineMessages({
 });
 
 const mapStateToProps = (state, { intl }) => ({
-  label: 'CW',
+  iconComponent: WarningIcon,
   title: intl.formatMessage(state.getIn(['compose', 'spoiler']) ? messages.marked : messages.unmarked),
   active: state.getIn(['compose', 'spoiler']),
   ariaControls: 'cw-spoiler-input',
+  size: 18,
+  inverted: true,
 });
 
 const mapDispatchToProps = dispatch => ({
@@ -25,4 +29,4 @@ const mapDispatchToProps = dispatch => ({
 
 });
 
-export default injectIntl(connect(mapStateToProps, mapDispatchToProps)(TextIconButton));
+export default injectIntl(connect(mapStateToProps, mapDispatchToProps)(IconButton));
diff --git a/app/javascript/mastodon/features/compose/containers/upload_button_container.js b/app/javascript/mastodon/features/compose/containers/upload_button_container.js
index 42195da617b94f..7c4757b6c3da0d 100644
--- a/app/javascript/mastodon/features/compose/containers/upload_button_container.js
+++ b/app/javascript/mastodon/features/compose/containers/upload_button_container.js
@@ -4,8 +4,7 @@ import { uploadCompose } from '../../../actions/compose';
 import UploadButton from '../components/upload_button';
 
 const mapStateToProps = state => ({
-  disabled: state.getIn(['compose', 'is_uploading']) || (state.getIn(['compose', 'media_attachments']).size + state.getIn(['compose', 'pending_media_attachments']) > 3 || state.getIn(['compose', 'media_attachments']).some(m => ['video', 'audio'].includes(m.get('type')))),
-  unavailable: state.getIn(['compose', 'poll']) !== null,
+  disabled: state.getIn(['compose', 'poll']) !== null || state.getIn(['compose', 'is_uploading']) || (state.getIn(['compose', 'media_attachments']).size + state.getIn(['compose', 'pending_media_attachments']) > 3 || state.getIn(['compose', 'media_attachments']).some(m => ['video', 'audio'].includes(m.get('type')))),
   resetFileKey: state.getIn(['compose', 'resetFileKey']),
 });
 
diff --git a/app/javascript/mastodon/features/compose/containers/upload_container.js b/app/javascript/mastodon/features/compose/containers/upload_container.js
index 77bb90db87b91a..a17a6914448b8a 100644
--- a/app/javascript/mastodon/features/compose/containers/upload_container.js
+++ b/app/javascript/mastodon/features/compose/containers/upload_container.js
@@ -5,6 +5,7 @@ import Upload from '../components/upload';
 
 const mapStateToProps = (state, { id }) => ({
   media: state.getIn(['compose', 'media_attachments']).find(item => item.get('id') === id),
+  sensitive: state.getIn(['compose', 'spoiler']),
 });
 
 const mapDispatchToProps = dispatch => ({
diff --git a/app/javascript/mastodon/features/compose/index.jsx b/app/javascript/mastodon/features/compose/index.jsx
index ea3a14950126c9..ce8eb9e05dd475 100644
--- a/app/javascript/mastodon/features/compose/index.jsx
+++ b/app/javascript/mastodon/features/compose/index.jsx
@@ -30,7 +30,6 @@ import { isMobile } from '../../is_mobile';
 import Motion from '../ui/util/optional_motion';
 
 import ComposeFormContainer from './containers/compose_form_container';
-import NavigationContainer from './containers/navigation_container';
 import SearchContainer from './containers/search_container';
 import SearchResultsContainer from './containers/search_results_container';
 
@@ -129,8 +128,6 @@ class Compose extends PureComponent {
 
           <div className='drawer__pager'>
             <div className='drawer__inner' onFocus={this.onFocus}>
-              <NavigationContainer onClose={this.onBlur} />
-
               <ComposeFormContainer autoFocus={!isMobile(window.innerWidth)} />
 
               <div className='drawer__inner__mastodon'>
@@ -152,7 +149,6 @@ class Compose extends PureComponent {
 
     return (
       <Column onFocus={this.onFocus}>
-        <NavigationContainer onClose={this.onBlur} />
         <ComposeFormContainer />
 
         <Helmet>
diff --git a/app/javascript/mastodon/features/getting_started/index.jsx b/app/javascript/mastodon/features/getting_started/index.jsx
index 53bb22ddb26bf7..21a5c2a519f812 100644
--- a/app/javascript/mastodon/features/getting_started/index.jsx
+++ b/app/javascript/mastodon/features/getting_started/index.jsx
@@ -26,7 +26,7 @@ import ColumnHeader from 'mastodon/components/column_header';
 import LinkFooter from 'mastodon/features/ui/components/link_footer';
 
 import { me, showTrends } from '../../initial_state';
-import NavigationContainer from '../compose/containers/navigation_container';
+import { NavigationBar } from '../compose/components/navigation_bar';
 import ColumnLink from '../ui/components/column_link';
 import ColumnSubheading from '../ui/components/column_subheading';
 
@@ -143,7 +143,7 @@ class GettingStarted extends ImmutablePureComponent {
 
     return (
       <Column>
-        {(signedIn && !multiColumn) ? <NavigationContainer /> : <ColumnHeader title={intl.formatMessage(messages.menu)} icon='bars' iconComponent={MenuIcon} multiColumn={multiColumn} />}
+        {(signedIn && !multiColumn) ? <NavigationBar /> : <ColumnHeader title={intl.formatMessage(messages.menu)} icon='bars' iconComponent={MenuIcon} multiColumn={multiColumn} />}
 
         <div className='getting-started scrollable scrollable--flex'>
           <div className='getting-started__wrapper'>
diff --git a/app/javascript/mastodon/features/standalone/compose/index.jsx b/app/javascript/mastodon/features/standalone/compose/index.jsx
index c36e843f5ada65..241d9aadfd88fc 100644
--- a/app/javascript/mastodon/features/standalone/compose/index.jsx
+++ b/app/javascript/mastodon/features/standalone/compose/index.jsx
@@ -1,21 +1,15 @@
-import { PureComponent } from 'react';
-
-import ComposeFormContainer from '../../compose/containers/compose_form_container';
-import LoadingBarContainer from '../../ui/containers/loading_bar_container';
-import ModalContainer from '../../ui/containers/modal_container';
-import NotificationsContainer from '../../ui/containers/notifications_container';
-
-export default class Compose extends PureComponent {
-
-  render () {
-    return (
-      <div>
-        <ComposeFormContainer autoFocus />
-        <NotificationsContainer />
-        <ModalContainer />
-        <LoadingBarContainer className='loading-bar' />
-      </div>
-    );
-  }
-
-}
+import ComposeFormContainer from 'mastodon/features/compose/containers/compose_form_container';
+import LoadingBarContainer from 'mastodon/features/ui/containers/loading_bar_container';
+import ModalContainer from 'mastodon/features/ui/containers/modal_container';
+import NotificationsContainer from 'mastodon/features/ui/containers/notifications_container';
+
+const Compose = () => (
+  <>
+    <ComposeFormContainer autoFocus withoutNavigation />
+    <NotificationsContainer />
+    <ModalContainer />
+    <LoadingBarContainer className='loading-bar' />
+  </>
+);
+
+export default Compose;
diff --git a/app/javascript/mastodon/features/ui/components/compose_panel.jsx b/app/javascript/mastodon/features/ui/components/compose_panel.jsx
index 713ecb472b908d..e6ac79bdd93c7c 100644
--- a/app/javascript/mastodon/features/ui/components/compose_panel.jsx
+++ b/app/javascript/mastodon/features/ui/components/compose_panel.jsx
@@ -6,7 +6,6 @@ import { connect } from 'react-redux';
 import { changeComposing, mountCompose, unmountCompose } from 'mastodon/actions/compose';
 import ServerBanner from 'mastodon/components/server_banner';
 import ComposeFormContainer from 'mastodon/features/compose/containers/compose_form_container';
-import NavigationContainer from 'mastodon/features/compose/containers/navigation_container';
 import SearchContainer from 'mastodon/features/compose/containers/search_container';
 
 import LinkFooter from './link_footer';
@@ -56,10 +55,7 @@ class ComposePanel extends PureComponent {
         )}
 
         {signedIn && (
-          <>
-            <NavigationContainer onClose={this.onBlur} />
-            <ComposeFormContainer singleColumn />
-          </>
+          <ComposeFormContainer singleColumn />
         )}
 
         <LinkFooter />
diff --git a/app/javascript/mastodon/features/ui/components/focal_point_modal.jsx b/app/javascript/mastodon/features/ui/components/focal_point_modal.jsx
index 25ad1e2e9ff05c..5f430d53923b1b 100644
--- a/app/javascript/mastodon/features/ui/components/focal_point_modal.jsx
+++ b/app/javascript/mastodon/features/ui/components/focal_point_modal.jsx
@@ -21,7 +21,7 @@ import { Button } from 'mastodon/components/button';
 import { GIFV } from 'mastodon/components/gifv';
 import { IconButton } from 'mastodon/components/icon_button';
 import Audio from 'mastodon/features/audio';
-import CharacterCounter from 'mastodon/features/compose/components/character_counter';
+import { CharacterCounter } from 'mastodon/features/compose/components/character_counter';
 import UploadProgress from 'mastodon/features/compose/components/upload_progress';
 import { Tesseract as fetchTesseract } from 'mastodon/features/ui/util/async-components';
 import { me } from 'mastodon/initial_state';
diff --git a/app/javascript/mastodon/features/ui/components/mute_modal.jsx b/app/javascript/mastodon/features/ui/components/mute_modal.jsx
index 2d95cabef84db1..fa81ea81a31d53 100644
--- a/app/javascript/mastodon/features/ui/components/mute_modal.jsx
+++ b/app/javascript/mastodon/features/ui/components/mute_modal.jsx
@@ -108,7 +108,6 @@ class MuteModal extends PureComponent {
           <div>
             <span><FormattedMessage id='mute_modal.duration' defaultMessage='Duration' />: </span>
 
-            {/* eslint-disable-next-line jsx-a11y/no-onchange */}
             <select value={muteDuration} onChange={this.changeMuteDuration}>
               <option value={0}>{intl.formatMessage(messages.indefinite)}</option>
               <option value={300}>{intl.formatMessage(messages.minutes, { number: 5 })}</option>
diff --git a/app/javascript/mastodon/features/ui/components/navigation_panel.jsx b/app/javascript/mastodon/features/ui/components/navigation_panel.jsx
index d3f46c6d466317..bf5e2826bbf5e6 100644
--- a/app/javascript/mastodon/features/ui/components/navigation_panel.jsx
+++ b/app/javascript/mastodon/features/ui/components/navigation_panel.jsx
@@ -77,7 +77,6 @@ class NavigationPanel extends Component {
       <div className='navigation-panel'>
         <div className='navigation-panel__logo'>
           <Link to='/' className='column-link column-link--logo'><WordmarkLogo /></Link>
-          {!banner && <hr />}
         </div>
 
         {banner &&
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index be7209d04ad083..4befe779490189 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Announcement",
   "attachments_list.unprocessed": "(unprocessed)",
   "audio.hide": "Hide audio",
-  "autosuggest_hashtag.per_week": "{count} per week",
   "boost_modal.combo": "You can press {combo} to skip this next time",
   "bundle_column_error.copy_stacktrace": "Copy error report",
   "bundle_column_error.error.body": "The requested page could not be rendered. It could be due to a bug in our code, or a browser compatibility issue.",
@@ -146,22 +145,22 @@
   "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
   "compose_form.lock_disclaimer.lock": "locked",
   "compose_form.placeholder": "What's on your mind?",
-  "compose_form.poll.add_option": "Add a choice",
+  "compose_form.poll.add_option": "Add option",
   "compose_form.poll.duration": "Poll duration",
-  "compose_form.poll.option_placeholder": "Choice {number}",
-  "compose_form.poll.remove_option": "Remove this choice",
+  "compose_form.poll.multiple": "Multiple choice",
+  "compose_form.poll.option_placeholder": "Option {number}",
+  "compose_form.poll.remove_option": "Remove this option",
+  "compose_form.poll.single": "Pick one",
   "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
   "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
-  "compose_form.publish": "Publish",
+  "compose_form.poll.type": "Style",
+  "compose_form.publish": "Post",
   "compose_form.publish_form": "New post",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Save changes",
-  "compose_form.sensitive.hide": "{count, plural, one {Mark media as sensitive} other {Mark media as sensitive}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Media is marked as sensitive} other {Media is marked as sensitive}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Media is not marked as sensitive} other {Media is not marked as sensitive}}",
+  "compose_form.reply": "Reply",
+  "compose_form.save_changes": "Update",
   "compose_form.spoiler.marked": "Remove content warning",
   "compose_form.spoiler.unmarked": "Add content warning",
-  "compose_form.spoiler_placeholder": "Write your warning here",
+  "compose_form.spoiler_placeholder": "Content warning (optional)",
   "confirmation_modal.cancel": "Cancel",
   "confirmations.block.block_and_report": "Block & Report",
   "confirmations.block.confirm": "Block",
@@ -408,7 +407,6 @@
   "navigation_bar.direct": "Private mentions",
   "navigation_bar.discover": "Discover",
   "navigation_bar.domain_blocks": "Blocked domains",
-  "navigation_bar.edit_profile": "Edit profile",
   "navigation_bar.explore": "Explore",
   "navigation_bar.favourites": "Favorites",
   "navigation_bar.filters": "Muted words",
@@ -526,14 +524,15 @@
   "poll_button.add_poll": "Add a poll",
   "poll_button.remove_poll": "Remove poll",
   "privacy.change": "Change post privacy",
-  "privacy.direct.long": "Visible for mentioned users only",
-  "privacy.direct.short": "Mentioned people only",
-  "privacy.private.long": "Visible for followers only",
-  "privacy.private.short": "Followers only",
-  "privacy.public.long": "Visible for all",
+  "privacy.direct.long": "Everyone mentioned in the post",
+  "privacy.direct.short": "Specific people",
+  "privacy.private.long": "Only your followers",
+  "privacy.private.short": "Followers",
+  "privacy.public.long": "Anyone on and off Mastodon",
   "privacy.public.short": "Public",
-  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
-  "privacy.unlisted.short": "Unlisted",
+  "privacy.unlisted.additional": "This behaves exactly like public, except the post will not appear in live feeds or hashtags, explore, or Mastodon search, even if you are opted-in account-wide.",
+  "privacy.unlisted.long": "Fewer algorithmic fanfares",
+  "privacy.unlisted.short": "Quiet public",
   "privacy_policy.last_updated": "Last updated {date}",
   "privacy_policy.title": "Privacy Policy",
   "recommended": "Recommended",
@@ -551,7 +550,9 @@
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "today",
+  "reply_indicator.attachments": "{count, plural, one {# attachment} other {# attachments}}",
   "reply_indicator.cancel": "Cancel",
+  "reply_indicator.poll": "Poll",
   "report.block": "Block",
   "report.block_explanation": "You will not see their posts. They will not be able to see your posts or follow you. They will be able to tell that they are blocked.",
   "report.categories.legal": "Legal",
@@ -715,10 +716,8 @@
   "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.description_missing": "No description added",
   "upload_form.edit": "Edit",
   "upload_form.thumbnail": "Change thumbnail",
-  "upload_form.undo": "Delete",
   "upload_form.video_description": "Describe for people who are deaf, hard of hearing, blind or have low vision",
   "upload_modal.analyzing_picture": "Analyzing picture…",
   "upload_modal.apply": "Apply",
diff --git a/app/javascript/mastodon/reducers/compose.js b/app/javascript/mastodon/reducers/compose.js
index e6b2509f66d2e5..f57bbb77b870d4 100644
--- a/app/javascript/mastodon/reducers/compose.js
+++ b/app/javascript/mastodon/reducers/compose.js
@@ -40,9 +40,7 @@ import {
   COMPOSE_RESET,
   COMPOSE_POLL_ADD,
   COMPOSE_POLL_REMOVE,
-  COMPOSE_POLL_OPTION_ADD,
   COMPOSE_POLL_OPTION_CHANGE,
-  COMPOSE_POLL_OPTION_REMOVE,
   COMPOSE_POLL_SETTINGS_CHANGE,
   INIT_MEDIA_EDIT_MODAL,
   COMPOSE_CHANGE_MEDIA_DESCRIPTION,
@@ -282,6 +280,18 @@ const updateSuggestionTags = (state, token) => {
   });
 };
 
+const updatePoll = (state, index, value) => state.updateIn(['poll', 'options'], options => {
+  const tmp = options.set(index, value).filterNot(x => x.trim().length === 0);
+
+  if (tmp.size === 0) {
+    return tmp.push('').push('');
+  } else if (tmp.size < 4) {
+    return tmp.push('');
+  }
+
+  return tmp;
+});
+
 export default function compose(state = initialState, action) {
   switch(action.type) {
   case STORE_HYDRATE:
@@ -518,12 +528,8 @@ export default function compose(state = initialState, action) {
     return state.set('poll', initialPoll);
   case COMPOSE_POLL_REMOVE:
     return state.set('poll', null);
-  case COMPOSE_POLL_OPTION_ADD:
-    return state.updateIn(['poll', 'options'], options => options.push(action.title));
   case COMPOSE_POLL_OPTION_CHANGE:
-    return state.setIn(['poll', 'options', action.index], action.title);
-  case COMPOSE_POLL_OPTION_REMOVE:
-    return state.updateIn(['poll', 'options'], options => options.delete(action.index));
+    return updatePoll(state, action.index, action.title);
   case COMPOSE_POLL_SETTINGS_CHANGE:
     return state.update('poll', poll => poll.set('expires_in', action.expiresIn).set('multiple', action.isMultiple));
   case COMPOSE_LANGUAGE_CHANGE:
diff --git a/app/javascript/material-icons/400-24px/bar_chart_4_bars-fill.svg b/app/javascript/material-icons/400-24px/bar_chart_4_bars-fill.svg
new file mode 100644
index 00000000000000..63215a3e09424b
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/bar_chart_4_bars-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M80-120v-80h800v80H80Zm40-120v-280h120v280H120Zm200 0v-480h120v480H320Zm200 0v-360h120v360H520Zm200 0v-600h120v600H720Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/bar_chart_4_bars.svg b/app/javascript/material-icons/400-24px/bar_chart_4_bars.svg
new file mode 100644
index 00000000000000..63215a3e09424b
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/bar_chart_4_bars.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M80-120v-80h800v80H80Zm40-120v-280h120v280H120Zm200 0v-480h120v480H320Zm200 0v-360h120v360H520Zm200 0v-600h120v600H720Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/mood-fill.svg b/app/javascript/material-icons/400-24px/mood-fill.svg
new file mode 100644
index 00000000000000..9480d0fb92aaa3
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/mood-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M620-520q25 0 42.5-17.5T680-580q0-25-17.5-42.5T620-640q-25 0-42.5 17.5T560-580q0 25 17.5 42.5T620-520Zm-280 0q25 0 42.5-17.5T400-580q0-25-17.5-42.5T340-640q-25 0-42.5 17.5T280-580q0 25 17.5 42.5T340-520Zm140 260q68 0 123.5-38.5T684-400H276q25 63 80.5 101.5T480-260Zm0 180q-83 0-156-31.5T197-197q-54-54-85.5-127T80-480q0-83 31.5-156T197-763q54-54 127-85.5T480-880q83 0 156 31.5T763-763q54 54 85.5 127T880-480q0 83-31.5 156T763-197q-54 54-127 85.5T480-80Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/mood.svg b/app/javascript/material-icons/400-24px/mood.svg
new file mode 100644
index 00000000000000..46cafa76808008
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/mood.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M620-520q25 0 42.5-17.5T680-580q0-25-17.5-42.5T620-640q-25 0-42.5 17.5T560-580q0 25 17.5 42.5T620-520Zm-280 0q25 0 42.5-17.5T400-580q0-25-17.5-42.5T340-640q-25 0-42.5 17.5T280-580q0 25 17.5 42.5T340-520Zm140 260q68 0 123.5-38.5T684-400H276q25 63 80.5 101.5T480-260Zm0 180q-83 0-156-31.5T197-197q-54-54-85.5-127T80-480q0-83 31.5-156T197-763q54-54 127-85.5T480-880q83 0 156 31.5T763-763q54 54 85.5 127T880-480q0 83-31.5 156T763-197q-54 54-127 85.5T480-80Zm0-400Zm0 320q134 0 227-93t93-227q0-134-93-227t-227-93q-134 0-227 93t-93 227q0 134 93 227t227 93Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/photo_library-fill.svg b/app/javascript/material-icons/400-24px/photo_library-fill.svg
new file mode 100644
index 00000000000000..e68aec8321f1a9
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/photo_library-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M360-400h400L622-580l-92 120-62-80-108 140Zm-40 160q-33 0-56.5-23.5T240-320v-480q0-33 23.5-56.5T320-880h480q33 0 56.5 23.5T880-800v480q0 33-23.5 56.5T800-240H320ZM160-80q-33 0-56.5-23.5T80-160v-560h80v560h560v80H160Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/photo_library.svg b/app/javascript/material-icons/400-24px/photo_library.svg
new file mode 100644
index 00000000000000..3b22224b832259
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/photo_library.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M360-400h400L622-580l-92 120-62-80-108 140Zm-40 160q-33 0-56.5-23.5T240-320v-480q0-33 23.5-56.5T320-880h480q33 0 56.5 23.5T880-800v480q0 33-23.5 56.5T800-240H320Zm0-80h480v-480H320v480ZM160-80q-33 0-56.5-23.5T80-160v-560h80v560h560v80H160Zm160-720v480-480Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/quiet_time-fill.svg b/app/javascript/material-icons/400-24px/quiet_time-fill.svg
new file mode 100644
index 00000000000000..aed5740db3dc89
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/quiet_time-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M524-40q-84 0-157.5-32t-128-86.5Q184-213 152-286.5T120-444q0-146 93-257.5T450-840q-18 99 11 193.5T561-481q71 71 165.5 100T920-370q-26 144-138 237T524-40Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/quiet_time.svg b/app/javascript/material-icons/400-24px/quiet_time.svg
new file mode 100644
index 00000000000000..552da6658dfefa
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/quiet_time.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M524-40q-84 0-157.5-32t-128-86.5Q184-213 152-286.5T120-444q0-146 93-257.5T450-840q-18 99 11 193.5T561-481q71 71 165.5 100T920-370q-26 144-138 237T524-40Zm0-80q88 0 163-44t118-121q-86-8-163-43.5T504-425q-61-61-97-138t-43-163q-77 43-120.5 118.5T200-444q0 135 94.5 229.5T524-120Zm-20-305Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/translate-fill.svg b/app/javascript/material-icons/400-24px/translate-fill.svg
new file mode 100644
index 00000000000000..ecaaf37f1eefea
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/translate-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="m476-80 182-480h84L924-80h-84l-43-122H603L560-80h-84ZM160-200l-56-56 202-202q-35-35-63.5-80T190-640h84q20 39 40 68t48 58q33-33 68.5-92.5T484-720H40v-80h280v-80h80v80h280v80H564q-21 72-63 148t-83 116l96 98-30 82-122-125-202 201Zm468-72h144l-72-204-72 204Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/translate.svg b/app/javascript/material-icons/400-24px/translate.svg
new file mode 100644
index 00000000000000..ecaaf37f1eefea
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/translate.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="m476-80 182-480h84L924-80h-84l-43-122H603L560-80h-84ZM160-200l-56-56 202-202q-35-35-63.5-80T190-640h84q20 39 40 68t48 58q33-33 68.5-92.5T484-720H40v-80h280v-80h80v80h280v80H564q-21 72-63 148t-83 116l96 98-30 82-122-125-202 201Zm468-72h144l-72-204-72 204Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/warning-fill.svg b/app/javascript/material-icons/400-24px/warning-fill.svg
new file mode 100644
index 00000000000000..c3727d3f57a943
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/warning-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="m40-120 440-760 440 760H40Zm440-120q17 0 28.5-11.5T520-280q0-17-11.5-28.5T480-320q-17 0-28.5 11.5T440-280q0 17 11.5 28.5T480-240Zm-40-120h80v-200h-80v200Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/warning.svg b/app/javascript/material-icons/400-24px/warning.svg
new file mode 100644
index 00000000000000..238299e6064bc5
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/warning.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="m40-120 440-760 440 760H40Zm138-80h604L480-720 178-200Zm302-40q17 0 28.5-11.5T520-280q0-17-11.5-28.5T480-320q-17 0-28.5 11.5T440-280q0 17 11.5 28.5T480-240Zm-40-120h80v-200h-80v200Zm40-100Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/packs/share.jsx b/app/javascript/packs/share.jsx
index 0f3b84549dcacf..7b5723091c81e8 100644
--- a/app/javascript/packs/share.jsx
+++ b/app/javascript/packs/share.jsx
@@ -13,10 +13,12 @@ function loaded() {
 
   if (mountNode) {
     const attr = mountNode.getAttribute('data-props');
-    if(!attr) return;
+
+    if (!attr) return;
 
     const props = JSON.parse(attr);
     const root = createRoot(mountNode);
+
     root.render(<ComposeContainer {...props} />);
   }
 }
diff --git a/app/javascript/styles/contrast/diff.scss b/app/javascript/styles/contrast/diff.scss
index 1c2386f02d2df9..ae607f484a8c9b 100644
--- a/app/javascript/styles/contrast/diff.scss
+++ b/app/javascript/styles/contrast/diff.scss
@@ -1,20 +1,7 @@
-.compose-form {
-  .compose-form__modifiers {
-    .compose-form__upload {
-      &-description {
-        input {
-          &::placeholder {
-            opacity: 1;
-          }
-        }
-      }
-    }
-  }
-}
-
 .status__content a,
-.link-footer a,
 .reply-indicator__content a,
+.edit-indicator__content a,
+.link-footer a,
 .status__content__read-more-button,
 .status__content__translate-button {
   text-decoration: underline;
@@ -42,7 +29,9 @@
   }
 }
 
-.status__content a {
+.status__content a,
+.reply-indicator__content a,
+.edit-indicator__content a {
   color: $highlight-text-color;
 }
 
@@ -50,24 +39,10 @@
   color: $darker-text-color;
 }
 
-.compose-form__poll-wrapper .button.button-secondary,
-.compose-form .autosuggest-textarea__textarea::placeholder,
-.compose-form .spoiler-input__input::placeholder,
-.report-dialog-modal__textarea::placeholder,
-.language-dropdown__dropdown__results__item__common-name,
-.compose-form .icon-button {
+.report-dialog-modal__textarea::placeholder {
   color: $inverted-text-color;
 }
 
-.text-icon-button.active {
-  color: $ui-highlight-color;
-}
-
-.language-dropdown__dropdown__results__item.active {
-  background: $ui-highlight-color;
-  font-weight: 500;
-}
-
 .link-button:disabled {
   cursor: not-allowed;
 
diff --git a/app/javascript/styles/mastodon-light/diff.scss b/app/javascript/styles/mastodon-light/diff.scss
index 3a27c974ad8978..3c75854d9b0c52 100644
--- a/app/javascript/styles/mastodon-light/diff.scss
+++ b/app/javascript/styles/mastodon-light/diff.scss
@@ -145,10 +145,6 @@ html {
   }
 }
 
-.compose-form__autosuggest-wrapper,
-.poll__option input[type='text'],
-.compose-form .spoiler-input__input,
-.compose-form__poll-wrapper select,
 .search__input,
 .setting-text,
 .report-dialog-modal__textarea,
@@ -172,28 +168,11 @@ html {
   border-bottom: 0;
 }
 
-.compose-form__poll-wrapper select {
-  background: $simple-background-color
-    url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 14.933 18.467' height='19.698' width='15.929'><path d='M3.467 14.967l-3.393-3.5H14.86l-3.392 3.5c-1.866 1.925-3.666 3.5-4 3.5-.335 0-2.135-1.575-4-3.5zm.266-11.234L7.467 0 11.2 3.733l3.733 3.734H0l3.733-3.734z' fill='#{hex-color(lighten($ui-base-color, 8%))}'/></svg>")
-    no-repeat right 8px center / auto 16px;
-}
-
-.compose-form__poll-wrapper,
-.compose-form__poll-wrapper .poll__footer {
-  border-top-color: lighten($ui-base-color, 8%);
-}
-
 .notification__filter-bar {
   border: 1px solid lighten($ui-base-color, 8%);
   border-top: 0;
 }
 
-.compose-form .compose-form__buttons-wrapper {
-  background: $ui-base-color;
-  border: 1px solid lighten($ui-base-color, 8%);
-  border-top: 0;
-}
-
 .drawer__header,
 .drawer__inner {
   background: $white;
@@ -206,52 +185,6 @@ html {
     no-repeat bottom / 100% auto;
 }
 
-// Change the colors used in compose-form
-.compose-form {
-  .compose-form__modifiers {
-    .compose-form__upload__actions .icon-button,
-    .compose-form__upload__warning .icon-button {
-      color: lighten($white, 7%);
-
-      &:active,
-      &:focus,
-      &:hover {
-        color: $white;
-      }
-    }
-  }
-
-  .compose-form__buttons-wrapper {
-    background: darken($ui-base-color, 6%);
-  }
-
-  .autosuggest-textarea__suggestions {
-    background: darken($ui-base-color, 6%);
-  }
-
-  .autosuggest-textarea__suggestions__item {
-    &:hover,
-    &:focus,
-    &:active,
-    &.selected {
-      background: lighten($ui-base-color, 4%);
-    }
-  }
-}
-
-.emoji-mart-bar {
-  border-color: lighten($ui-base-color, 4%);
-
-  &:first-child {
-    background: darken($ui-base-color, 6%);
-  }
-}
-
-.emoji-mart-search input {
-  background: rgba($ui-base-color, 0.3);
-  border-color: $ui-base-color;
-}
-
 .upload-progress__backdrop {
   background: $ui-base-color;
 }
@@ -283,46 +216,11 @@ html {
   background: $ui-base-color;
 }
 
-.privacy-dropdown.active .privacy-dropdown__value.active .icon-button {
-  color: $white;
-}
-
 .account-gallery__item a {
   background-color: $ui-base-color;
 }
 
-// Change the colors used in the dropdown menu
-.dropdown-menu {
-  background: $white;
-
-  &__arrow::before {
-    background-color: $white;
-  }
-
-  &__item {
-    color: $darker-text-color;
-
-    &--dangerous {
-      color: $error-value-color;
-    }
-
-    a,
-    button {
-      background: $white;
-    }
-  }
-}
-
 // Change the text colors on inverted background
-.privacy-dropdown__option.active,
-.privacy-dropdown__option:hover,
-.privacy-dropdown__option.active .privacy-dropdown__option__content,
-.privacy-dropdown__option.active .privacy-dropdown__option__content strong,
-.privacy-dropdown__option:hover .privacy-dropdown__option__content,
-.privacy-dropdown__option:hover .privacy-dropdown__option__content strong,
-.dropdown-menu__item:not(.dropdown-menu__item--dangerous) a:active,
-.dropdown-menu__item:not(.dropdown-menu__item--dangerous) a:focus,
-.dropdown-menu__item:not(.dropdown-menu__item--dangerous) a:hover,
 .actions-modal ul li:not(:empty) a.active,
 .actions-modal ul li:not(:empty) a.active button,
 .actions-modal ul li:not(:empty) a:active,
@@ -331,7 +229,6 @@ html {
 .actions-modal ul li:not(:empty) a:focus button,
 .actions-modal ul li:not(:empty) a:hover,
 .actions-modal ul li:not(:empty) a:hover button,
-.language-dropdown__dropdown__results__item.active,
 .admin-wrapper .sidebar ul .simple-navigation-active-leaf a,
 .simple_form .block-button,
 .simple_form .button,
@@ -339,19 +236,6 @@ html {
   color: $white;
 }
 
-.language-dropdown__dropdown__results__item
-  .language-dropdown__dropdown__results__item__common-name {
-  color: lighten($ui-base-color, 8%);
-}
-
-.language-dropdown__dropdown__results__item.active
-  .language-dropdown__dropdown__results__item__common-name {
-  color: darken($ui-base-color, 12%);
-}
-
-.dropdown-menu__separator,
-.dropdown-menu__item.edited-timestamp__history__item,
-.dropdown-menu__container__header,
 .compare-history-modal .report-modal__target,
 .report-dialog-modal .poll__option.dialog-option {
   border-bottom-color: lighten($ui-base-color, 4%);
@@ -385,10 +269,7 @@ html {
 
 .reactions-bar__item:hover,
 .reactions-bar__item:focus,
-.reactions-bar__item:active,
-.language-dropdown__dropdown__results__item:hover,
-.language-dropdown__dropdown__results__item:focus,
-.language-dropdown__dropdown__results__item:active {
+.reactions-bar__item:active {
   background-color: $ui-base-color;
 }
 
@@ -631,11 +512,6 @@ html {
   }
 }
 
-.reply-indicator {
-  background: transparent;
-  border: 1px solid lighten($ui-base-color, 8%);
-}
-
 .status__content,
 .reply-indicator__content {
   a {
@@ -675,3 +551,30 @@ html {
     background-color: rgba($ui-highlight-color, 0.15);
   }
 }
+
+.compose-form__actions .icon-button.active,
+.dropdown-button.active,
+.privacy-dropdown__option.active,
+.privacy-dropdown__option:focus,
+.language-dropdown__dropdown__results__item:focus,
+.language-dropdown__dropdown__results__item.active,
+.privacy-dropdown__option:focus .privacy-dropdown__option__content,
+.privacy-dropdown__option:focus .privacy-dropdown__option__content strong,
+.privacy-dropdown__option.active .privacy-dropdown__option__content,
+.privacy-dropdown__option.active .privacy-dropdown__option__content strong,
+.language-dropdown__dropdown__results__item:focus
+  .language-dropdown__dropdown__results__item__common-name,
+.language-dropdown__dropdown__results__item.active
+  .language-dropdown__dropdown__results__item__common-name {
+  color: $white;
+}
+
+.compose-form .spoiler-input__input {
+  color: lighten($ui-highlight-color, 8%);
+}
+
+.compose-form .autosuggest-textarea__textarea,
+.compose-form__highlightable,
+.poll__option input[type='text'] {
+  background: darken($ui-base-color, 10%);
+}
diff --git a/app/javascript/styles/mastodon-light/variables.scss b/app/javascript/styles/mastodon-light/variables.scss
index ac8a8312154c29..3cf5561ca3b962 100644
--- a/app/javascript/styles/mastodon-light/variables.scss
+++ b/app/javascript/styles/mastodon-light/variables.scss
@@ -5,7 +5,7 @@ $white: #ffffff;
 $classic-base-color: #282c37;
 $classic-primary-color: #9baec8;
 $classic-secondary-color: #d9e1e8;
-$classic-highlight-color: #858afa;
+$classic-highlight-color: #6364ff;
 
 $blurple-600: #563acc; // Iris
 $blurple-500: #6364ff; // Brand purple
@@ -34,7 +34,7 @@ $ui-button-tertiary-border-color: $blurple-500 !default;
 
 $primary-text-color: $black !default;
 $darker-text-color: $classic-base-color !default;
-$highlight-text-color: darken($ui-highlight-color, 8%) !default;
+$highlight-text-color: $ui-highlight-color !default;
 $dark-text-color: #444b5d;
 $action-button-color: #606984;
 
@@ -55,3 +55,8 @@ $account-background-color: $white !default;
 }
 
 $emojis-requiring-inversion: 'chains';
+
+.theme-mastodon-light {
+  --dropdown-border-color: #d9e1e8;
+  --dropdown-background-color: #fff;
+}
diff --git a/app/javascript/styles/mastodon/_mixins.scss b/app/javascript/styles/mastodon/_mixins.scss
index dcfab6bd0157bc..d7f8586dd29623 100644
--- a/app/javascript/styles/mastodon/_mixins.scss
+++ b/app/javascript/styles/mastodon/_mixins.scss
@@ -15,13 +15,14 @@
   outline: 0;
   box-sizing: border-box;
   width: 100%;
-  border: 0;
   box-shadow: none;
   font-family: inherit;
   background: $ui-base-color;
   color: $darker-text-color;
   border-radius: 4px;
-  font-size: 14px;
+  border: 1px solid lighten($ui-base-color, 8%);
+  font-size: 17px;
+  line-height: normal;
   margin: 0;
 }
 
diff --git a/app/javascript/styles/mastodon/admin.scss b/app/javascript/styles/mastodon/admin.scss
index a65f35e7b135bb..3f538d08d6426e 100644
--- a/app/javascript/styles/mastodon/admin.scss
+++ b/app/javascript/styles/mastodon/admin.scss
@@ -1314,6 +1314,9 @@ a.sparkline {
 
     &__label {
       padding: 15px;
+      display: flex;
+      gap: 8px;
+      align-items: center;
     }
 
     &__rules {
@@ -1324,6 +1327,9 @@ a.sparkline {
   &__rule {
     cursor: pointer;
     padding: 15px;
+    display: flex;
+    gap: 8px;
+    align-items: center;
   }
 }
 
diff --git a/app/javascript/styles/mastodon/basics.scss b/app/javascript/styles/mastodon/basics.scss
index 6714b24268f46a..28dad81da5414b 100644
--- a/app/javascript/styles/mastodon/basics.scss
+++ b/app/javascript/styles/mastodon/basics.scss
@@ -8,7 +8,7 @@
 
 body {
   font-family: $font-sans-serif, sans-serif;
-  background: darken($ui-base-color, 7%);
+  background: darken($ui-base-color, 8%);
   font-size: 13px;
   line-height: 18px;
   font-weight: 400;
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 93cea5f76c70d4..5b89e7f25d843a 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -368,46 +368,155 @@ body > [data-popper-placement] {
   }
 }
 
-.compose-form {
-  padding: 15px;
-
-  &__sensitive-button {
-    padding: 10px;
-    padding-top: 0;
-    font-size: 14px;
-    font-weight: 500;
+.autosuggest-textarea {
+  &__textarea {
+    background: transparent;
+    min-height: 100px;
+    padding-bottom: 0;
+    resize: none;
+    scrollbar-color: initial;
 
-    &.active {
-      color: $highlight-text-color;
+    &::-webkit-scrollbar {
+      all: unset;
     }
+  }
 
-    input[type='checkbox'] {
-      appearance: none;
-      display: inline-block;
-      position: relative;
-      border: 1px solid $ui-primary-color;
+  &__suggestions {
+    box-shadow: var(--dropdown-shadow);
+    background: $ui-base-color;
+    border: 1px solid lighten($ui-base-color, 14%);
+    border-radius: 0 0 4px 4px;
+    color: $secondary-text-color;
+    font-size: 14px;
+    padding: 0;
+
+    &__item {
       box-sizing: border-box;
-      width: 18px;
-      height: 18px;
-      flex: 0 0 auto;
-      margin-inline-end: 10px;
-      top: -1px;
-      border-radius: 4px;
-      vertical-align: middle;
-      cursor: inherit;
+      display: flex;
+      align-items: center;
+      height: 48px;
+      cursor: pointer;
+      font-size: 14px;
+      line-height: 20px;
+      letter-spacing: 0.25px;
+      color: $secondary-text-color;
+
+      &:last-child {
+        border-radius: 0 0 4px 4px;
+      }
 
-      &:checked {
-        border-color: $highlight-text-color;
-        background: $highlight-text-color
-          url("data:image/svg+xml;utf8,<svg width='18' height='18' fill='none' xmlns='http://www.w3.org/2000/svg'><path d='M4.5 8.5L8 12l6-6' stroke='white' stroke-width='1.5'/></svg>")
-          center center no-repeat;
+      &:hover,
+      &:focus,
+      &:active,
+      &.selected {
+        background: $ui-highlight-color;
+        color: $primary-text-color;
+
+        .autosuggest-account .display-name__account {
+          color: inherit;
+        }
       }
     }
   }
+}
+
+.autosuggest-account,
+.autosuggest-emoji,
+.autosuggest-hashtag {
+  flex: 1 0 0;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: flex-start;
+  gap: 12px;
+  padding: 8px 12px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.autosuggest-account {
+  .display-name {
+    font-weight: 400;
+    display: flex;
+    flex-direction: column;
+    flex: 1 0 0;
+  }
+
+  .display-name__account {
+    display: block;
+    line-height: 16px;
+    font-size: 12px;
+    color: $dark-text-color;
+  }
+}
+
+.autosuggest-hashtag {
+  justify-content: space-between;
+
+  &__name {
+    flex: 1 1 auto;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+
+  &__uses {
+    flex: 0 0 auto;
+    text-align: end;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+}
+
+.autosuggest-emoji {
+  &__name {
+    flex: 1 0 0;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+}
+
+.autosuggest-account .account__avatar,
+.autosuggest-emoji img {
+  display: block;
+  width: 24px;
+  height: 24px;
+  flex: 0 0 auto;
+}
+
+.compose-form {
+  display: flex;
+  flex-direction: column;
+  gap: 32px;
+
+  .layout-multiple-columns &,
+  .column & {
+    padding: 15px;
+  }
+
+  &__highlightable {
+    display: flex;
+    flex-direction: column;
+    gap: 16px;
+    flex: 0 1 auto;
+    border-radius: 4px;
+    border: 1px solid lighten($ui-base-color, 8%);
+    transition: border-color 300ms linear;
+    min-height: 0;
+    position: relative;
+    background: $ui-base-color;
+    overflow-y: auto;
+
+    &.active {
+      transition: none;
+      border-color: $ui-highlight-color;
+    }
+  }
 
-  .compose-form__warning {
+  &__warning {
     color: $inverted-text-color;
-    margin-bottom: 10px;
     background: $ui-primary-color;
     box-shadow: 0 2px 6px rgba($base-shadow-color, 0.3);
     padding: 8px 10px;
@@ -439,32 +548,27 @@ body > [data-popper-placement] {
     }
   }
 
-  .emoji-picker-dropdown {
-    position: absolute;
-    top: 0;
-    inset-inline-end: 0;
-  }
+  .spoiler-input {
+    display: flex;
+    align-items: stretch;
 
-  .compose-form__autosuggest-wrapper {
-    position: relative;
-  }
+    &__border {
+      background: url('../images/warning-stripes.svg') repeat-y;
+      width: 5px;
+      flex: 0 0 auto;
 
-  .autosuggest-textarea,
-  .autosuggest-input,
-  .spoiler-input {
-    position: relative;
-    width: 100%;
-  }
+      &:first-child {
+        border-start-start-radius: 4px;
+      }
 
-  .spoiler-input {
-    height: 0;
-    transform-origin: bottom;
-    opacity: 0;
+      &:last-child {
+        border-start-end-radius: 4px;
+      }
+    }
 
-    &.spoiler-input--visible {
-      height: 36px;
-      margin-bottom: 11px;
-      opacity: 1;
+    .autosuggest-input {
+      flex: 1 1 auto;
+      border-bottom: 1px solid lighten($ui-base-color, 8%);
     }
   }
 
@@ -474,269 +578,303 @@ body > [data-popper-placement] {
     box-sizing: border-box;
     width: 100%;
     margin: 0;
-    color: $inverted-text-color;
-    background: $simple-background-color;
-    padding: 10px;
+    color: $secondary-text-color;
+    background: $ui-base-color;
     font-family: inherit;
     font-size: 14px;
-    resize: vertical;
+    padding: 12px;
+    line-height: normal;
     border: 0;
     outline: 0;
 
-    &::placeholder {
-      color: $dark-text-color;
-    }
-
     &:focus {
       outline: 0;
     }
-
-    @media screen and (width <= 600px) {
-      font-size: 16px;
-    }
   }
 
   .spoiler-input__input {
-    border-radius: 4px;
+    padding: 12px 12px - 5px;
+    background: mix($ui-base-color, $ui-highlight-color, 85%);
+    color: $highlight-text-color;
   }
 
-  .autosuggest-textarea__textarea {
-    min-height: 100px;
-    border-radius: 4px 4px 0 0;
-    padding-bottom: 0;
-    padding-right: 10px + 22px; // Cannot use inline-end because of dir=auto
-    resize: none;
-    scrollbar-color: initial;
-
-    &::-webkit-scrollbar {
-      all: unset;
-    }
+  &__dropdowns {
+    display: flex;
+    align-items: center;
+    gap: 8px;
 
-    @media screen and (width <= 600px) {
-      height: 100px !important; // Prevent auto-resize textarea
-      resize: vertical;
+    & > div {
+      overflow: hidden;
+      display: flex;
     }
   }
 
-  .autosuggest-textarea__suggestions-wrapper {
-    position: relative;
-    height: 0;
+  &__uploads {
+    display: flex;
+    gap: 8px;
+    padding: 0 12px;
+    flex-wrap: wrap;
+    align-self: stretch;
+    align-items: flex-start;
+    align-content: flex-start;
+    justify-content: center;
   }
 
-  .autosuggest-textarea__suggestions {
-    box-sizing: border-box;
-    display: none;
-    position: absolute;
-    top: 100%;
-    width: 100%;
-    z-index: 99;
-    box-shadow: 4px 4px 6px rgba($base-shadow-color, 0.4);
-    background: $ui-secondary-color;
-    border-radius: 0 0 4px 4px;
-    color: $inverted-text-color;
-    font-size: 14px;
-    padding: 6px;
+  &__upload {
+    flex: 1 1 0;
+    min-width: calc(50% - 8px);
 
-    &.autosuggest-textarea__suggestions--visible {
-      display: block;
+    &__actions {
+      display: flex;
+      align-items: flex-start;
+      justify-content: space-between;
+      padding: 8px;
     }
-  }
 
-  .autosuggest-textarea__suggestions__item {
-    padding: 10px;
-    cursor: pointer;
-    border-radius: 4px;
-
-    &:hover,
-    &:focus,
-    &:active,
-    &.selected {
-      background: darken($ui-secondary-color, 10%);
+    &__preview {
+      position: absolute;
+      width: 100%;
+      height: 100%;
+      border-radius: 6px;
+      z-index: -1;
+      top: 0;
+      inset-inline-start: 0;
     }
-  }
 
-  .autosuggest-account,
-  .autosuggest-emoji,
-  .autosuggest-hashtag {
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-    justify-content: flex-start;
-    line-height: 18px;
-    font-size: 14px;
-  }
-
-  .autosuggest-hashtag {
-    justify-content: space-between;
-
-    &__name {
-      flex: 1 1 auto;
+    &__thumbnail {
+      width: 100%;
+      height: 144px;
+      border-radius: 6px;
+      background-position: center;
+      background-size: cover;
+      background-repeat: no-repeat;
       overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
     }
 
-    strong {
+    .icon-button {
+      flex: 0 0 auto;
+      color: $white;
+      background: rgba(0, 0, 0, 75%);
+      border-radius: 6px;
+      font-size: 12px;
+      line-height: 16px;
       font-weight: 500;
+      padding: 4px 8px;
+      font-family: inherit;
+
+      .icon {
+        width: 15px;
+        height: 15px;
+      }
     }
 
-    &__uses {
-      flex: 0 0 auto;
-      text-align: end;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
+    .icon-button.compose-form__upload__delete {
+      padding: 3px;
+      border-radius: 50%;
+
+      .icon {
+        width: 18px;
+        height: 18px;
+      }
+    }
+
+    &__warning {
+      position: absolute;
+      z-index: 2;
+      bottom: 0;
+      inset-inline-start: 0;
+      inset-inline-end: 0;
+      padding: 8px;
+
+      .icon-button.active {
+        color: #ffbe2e;
+        background: rgba(0, 0, 0, 75%);
+      }
     }
   }
 
-  .autosuggest-account-icon,
-  .autosuggest-emoji img {
-    display: block;
-    margin-inline-end: 8px;
-    width: 16px;
-    height: 16px;
+  &__footer {
+    display: flex;
+    flex-direction: column;
+    gap: 12px;
+    padding: 12px;
+    padding-top: 0;
   }
 
-  .autosuggest-account .display-name__account {
-    color: $lighter-text-color;
+  &__submit {
+    display: flex;
+    align-items: center;
+    flex: 1 1 auto;
+    max-width: 100%;
+    overflow: hidden;
   }
 
-  .compose-form__modifiers {
-    color: $inverted-text-color;
-    font-family: inherit;
-    font-size: 14px;
-    background: $simple-background-color;
+  &__buttons {
+    display: flex;
+    gap: 8px;
+    align-items: center;
+    flex: 1 1 auto;
 
-    .compose-form__upload-wrapper {
-      overflow: hidden;
+    & > div {
+      display: flex;
     }
 
-    .compose-form__uploads-wrapper {
-      display: flex;
-      flex-direction: row;
-      padding: 5px;
-      flex-wrap: wrap;
+    .icon-button {
+      padding: 3px;
     }
 
-    .compose-form__upload {
-      flex: 1 1 0;
-      min-width: 40%;
-      margin: 5px;
+    .icon-button .icon {
+      width: 18px;
+      height: 18px;
+    }
+  }
 
-      &__actions {
-        background: linear-gradient(
-          180deg,
-          rgba($base-shadow-color, 0.8) 0,
-          rgba($base-shadow-color, 0.35) 80%,
-          transparent
-        );
-        display: flex;
-        align-items: flex-start;
-        justify-content: space-between;
-      }
+  &__actions {
+    display: flex;
+    align-items: center;
+    flex: 0 0 auto;
+    gap: 12px;
+    flex-wrap: wrap;
 
-      .icon-button {
-        flex: 0 1 auto;
-        color: $secondary-text-color;
-        font-size: 14px;
-        font-weight: 500;
-        padding: 10px;
-        font-family: inherit;
+    .button {
+      display: block; // Otherwise text-ellipsis doesn't work
+      font-size: 14px;
+      line-height: normal;
+      font-weight: 700;
+      flex: 1 1 auto;
+      padding: 5px 12px;
+      border-radius: 4px;
+    }
 
-        .icon {
-          width: 15px;
-          height: 15px;
-        }
+    .icon-button {
+      box-sizing: content-box;
+      color: $highlight-text-color;
 
-        &:hover,
-        &:focus,
-        &:active {
-          color: lighten($secondary-text-color, 7%);
-        }
+      &:hover,
+      &:focus,
+      &:active {
+        color: $highlight-text-color;
       }
 
-      &__warning {
-        position: absolute;
-        z-index: 2;
-        bottom: 0;
-        inset-inline-start: 0;
-        inset-inline-end: 0;
-        box-sizing: border-box;
-        background: linear-gradient(
-          0deg,
-          rgba($base-shadow-color, 0.8) 0,
-          rgba($base-shadow-color, 0.35) 80%,
-          transparent
-        );
+      &.disabled {
+        color: $highlight-text-color;
+        opacity: 0.5;
       }
-    }
 
-    .compose-form__upload-thumbnail {
-      border-radius: 4px;
-      background-color: $base-shadow-color;
-      background-position: center;
-      background-size: cover;
-      background-repeat: no-repeat;
-      height: 140px;
-      width: 100%;
-      overflow: hidden;
+      &.active {
+        background: $ui-highlight-color;
+        color: $primary-text-color;
+      }
     }
   }
 
-  .compose-form__buttons-wrapper {
-    padding: 10px;
-    background: darken($simple-background-color, 8%);
-    border-radius: 0 0 4px 4px;
+  &__poll {
     display: flex;
-    justify-content: space-between;
-    flex: 0 0 auto;
-
-    .compose-form__buttons {
-      display: flex;
-      gap: 2px;
+    flex-direction: column;
+    align-self: stretch;
+    gap: 8px;
 
-      .icon-button {
-        height: 100%;
-      }
+    .poll__option {
+      padding: 0 12px;
+      gap: 8px;
 
-      .compose-form__upload-button-icon {
-        line-height: 27px;
+      &.empty:not(:focus-within) {
+        opacity: 0.5;
       }
+    }
 
-      .compose-form__sensitive-button {
-        display: none;
+    .poll__input {
+      width: 17px;
+      height: 17px;
+      border-color: $darker-text-color;
+    }
 
-        &.compose-form__sensitive-button--visible {
-          display: block;
-        }
+    &__footer {
+      display: flex;
+      align-items: center;
+      gap: 16px;
+      padding-inline-start: 37px;
+      padding-inline-end: 40px;
 
-        .compose-form__sensitive-button__icon {
-          line-height: 27px;
-        }
+      &__sep {
+        width: 1px;
+        height: 22px;
+        background: lighten($ui-base-color, 8%);
+        flex: 0 0 auto;
       }
     }
 
-    .icon-button,
-    .text-icon-button {
-      box-sizing: content-box;
-      padding: 0 3px;
-    }
+    &__select {
+      display: flex;
+      flex-direction: column;
+      gap: 2px;
+      flex: 1 1 auto;
+      min-width: 0;
+
+      &__label {
+        flex: 0 0 auto;
+        font-size: 11px;
+        font-weight: 500;
+        line-height: 16px;
+        letter-spacing: 0.5px;
+        color: $darker-text-color;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+        overflow: hidden;
+      }
 
-    .character-counter__wrapper {
-      align-self: center;
-      margin-inline-end: 4px;
+      &__value {
+        flex: 0 0 auto;
+        appearance: none;
+        background: transparent;
+        border: none;
+        padding: 0;
+        font-size: 14px;
+        font-weight: 500;
+        line-height: 20px;
+        letter-spacing: 0.1px;
+        color: $highlight-text-color;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+        overflow: hidden;
+      }
     }
   }
+}
 
-  .compose-form__publish {
-    display: flex;
-    justify-content: flex-end;
-    min-width: 0;
+.dropdown-button {
+  display: flex;
+  align-items: center;
+  gap: 4px;
+  background: transparent;
+  color: $highlight-text-color;
+  border-radius: 6px;
+  border: 1px solid $highlight-text-color;
+  padding: 4px 8px;
+  font-size: 13px;
+  line-height: normal;
+  font-weight: 400;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+
+  .icon {
+    width: 15px;
+    height: 15px;
     flex: 0 0 auto;
+  }
 
-    .compose-form__publish-button-wrapper {
-      padding-top: 15px;
-    }
+  &__label {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    flex: 1 1 auto;
+  }
+
+  &.active {
+    background: $ui-highlight-color;
+    border-color: $ui-highlight-color;
+    color: $primary-text-color;
   }
 }
 
@@ -744,11 +882,14 @@ body > [data-popper-placement] {
   cursor: default;
   font-family: $font-sans-serif, sans-serif;
   font-size: 14px;
-  font-weight: 600;
-  color: $lighter-text-color;
+  font-weight: 400;
+  line-height: normal;
+  color: $darker-text-color;
+  flex: 1 0 auto;
+  text-align: end;
 
   &.character-counter--over {
-    color: $warning-red;
+    color: $error-red;
   }
 }
 
@@ -794,41 +935,6 @@ body > [data-popper-placement] {
   }
 }
 
-.reply-indicator {
-  border-radius: 4px;
-  margin-bottom: 10px;
-  background: $ui-primary-color;
-  padding: 10px;
-  min-height: 23px;
-  overflow-y: auto;
-  flex: 0 2 auto;
-}
-
-.reply-indicator__header {
-  margin-bottom: 5px;
-  overflow: hidden;
-}
-
-.reply-indicator__cancel {
-  float: right;
-  line-height: 24px;
-}
-
-.reply-indicator__display-name {
-  color: $inverted-text-color;
-  display: block;
-  max-width: 100%;
-  line-height: 24px;
-  overflow: hidden;
-  padding-inline-end: 25px;
-  text-decoration: none;
-}
-
-.reply-indicator__display-avatar {
-  float: left;
-  margin-inline-end: 5px;
-}
-
 .status__content--with-action {
   cursor: pointer;
 }
@@ -838,14 +944,15 @@ body > [data-popper-placement] {
 }
 
 .status__content,
+.edit-indicator__content,
 .reply-indicator__content {
   position: relative;
-  font-size: 15px;
-  line-height: 22px;
   word-wrap: break-word;
   font-weight: 400;
   overflow: hidden;
   text-overflow: ellipsis;
+  font-size: 15px;
+  line-height: 22px;
   padding-top: 2px;
   color: $primary-text-color;
 
@@ -930,6 +1037,174 @@ body > [data-popper-placement] {
   }
 }
 
+.reply-indicator {
+  display: grid;
+  grid-template-columns: 46px minmax(0, 1fr);
+  grid-template-rows: 46px max-content;
+  gap: 0 10px;
+
+  .detailed-status__display-name {
+    margin-bottom: 4px;
+  }
+
+  .detailed-status__display-avatar {
+    grid-column-start: 1;
+    grid-row-start: 1;
+    grid-row-end: span 1;
+  }
+
+  &__main {
+    grid-column-start: 2;
+    grid-row-start: 1;
+    grid-row-end: span 2;
+  }
+
+  .display-name {
+    font-size: 14px;
+    line-height: 16px;
+
+    &__account {
+      display: none;
+    }
+  }
+
+  &__line {
+    grid-column-start: 1;
+    grid-row-start: 2;
+    grid-row-end: span 1;
+    position: relative;
+
+    &::before {
+      display: block;
+      content: '';
+      position: absolute;
+      inset-inline-start: 50%;
+      top: 4px;
+      transform: translateX(-50%);
+      background: lighten($ui-base-color, 8%);
+      width: 2px;
+      height: calc(100% + 32px - 8px); // Account for gap to next element
+    }
+  }
+
+  &__content {
+    font-size: 14px;
+    line-height: 20px;
+    letter-spacing: 0.25px;
+    display: -webkit-box;
+    -webkit-line-clamp: 4;
+    -webkit-box-orient: vertical;
+    padding: 0;
+    max-height: 4 * 20px;
+    overflow: hidden;
+    color: $darker-text-color;
+  }
+
+  &__attachments {
+    margin-top: 4px;
+    color: $darker-text-color;
+    font-size: 12px;
+    line-height: 16px;
+    display: flex;
+    align-items: center;
+    gap: 4px;
+
+    .icon {
+      width: 18px;
+      height: 18px;
+    }
+  }
+}
+
+.edit-indicator {
+  border-radius: 4px 4px 0 0;
+  background: lighten($ui-base-color, 4%);
+  padding: 12px;
+  overflow-y: auto;
+  flex: 0 0 auto;
+  border-bottom: 0.5px solid lighten($ui-base-color, 8%);
+  display: flex;
+  flex-direction: column;
+  gap: 4px;
+
+  &__header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    color: $darker-text-color;
+    font-size: 12px;
+    line-height: 16px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  &__cancel {
+    display: flex;
+
+    .icon {
+      width: 18px;
+      height: 18px;
+    }
+  }
+
+  &__display-name {
+    display: flex;
+    gap: 4px;
+
+    a {
+      color: inherit;
+      text-decoration: none;
+
+      &:hover,
+      &:focus,
+      &:active {
+        text-decoration: underline;
+      }
+    }
+  }
+
+  &__content {
+    color: $secondary-text-color;
+    font-size: 14px;
+    line-height: 20px;
+    letter-spacing: 0.25px;
+    padding-top: 0 !important;
+    display: -webkit-box;
+    -webkit-line-clamp: 4;
+    -webkit-box-orient: vertical;
+    max-height: 4 * 20px;
+    overflow: hidden;
+
+    a {
+      color: $highlight-text-color;
+    }
+  }
+
+  &__attachments {
+    color: $darker-text-color;
+    font-size: 12px;
+    line-height: 16px;
+    opacity: 0.75;
+    display: flex;
+    align-items: center;
+    gap: 4px;
+
+    .icon {
+      width: 18px;
+      height: 18px;
+    }
+  }
+}
+
+.edit-indicator__content,
+.reply-indicator__content {
+  .emojione {
+    width: 18px;
+    height: 18px;
+    margin: -3px 0 0;
+  }
+}
+
 .announcements__item__content {
   word-wrap: break-word;
   overflow-y: auto;
@@ -1453,18 +1728,9 @@ body > [data-popper-placement] {
 
 .detailed-status__favorites,
 .detailed-status__reblogs {
-  font-weight: 500;
-  font-size: 12px;
-  line-height: 18px;
-}
-
-.reply-indicator__content {
-  color: $inverted-text-color;
-  font-size: 14px;
-
-  a {
-    color: $lighter-text-color;
-  }
+  font-weight: 500;
+  font-size: 12px;
+  line-height: 18px;
 }
 
 .domain {
@@ -1677,7 +1943,6 @@ a .account__avatar {
 }
 
 .status__display-name,
-.reply-indicator__display-name,
 .detailed-status__display-name,
 a.account__display-name {
   &:hover .display-name strong {
@@ -1935,57 +2200,45 @@ a.account__display-name {
 }
 
 .navigation-bar {
-  padding: 15px;
   display: flex;
   align-items: center;
   flex-shrink: 0;
   cursor: default;
   gap: 10px;
-  color: $darker-text-color;
-
-  strong {
-    color: $secondary-text-color;
-  }
 
-  a {
-    color: inherit;
-    text-decoration: none;
+  .column > & {
+    padding: 15px;
   }
 
-  .navigation-bar__actions {
-    position: relative;
+  .account {
+    border-bottom: 0;
+    padding: 0;
+    flex: 1 1 auto;
+    min-width: 0;
 
-    .compose__action-bar .icon-button {
-      pointer-events: auto;
-      transform: scale(1, 1) translate(0, 0);
-      opacity: 1;
+    &__display-name {
+      font-size: 16px;
+      line-height: 24px;
+      letter-spacing: 0.15px;
+      font-weight: 500;
 
-      .icon {
-        width: 24px;
-        height: 24px;
+      .display-name__account {
+        font-size: 14px;
+        line-height: 20px;
+        letter-spacing: 0.1px;
       }
     }
   }
-}
-
-.navigation-bar__profile {
-  display: flex;
-  flex-direction: column;
-  flex: 1 1 auto;
-  line-height: 20px;
-}
 
-.navigation-bar__profile-account {
-  display: inline;
-  font-weight: 500;
-  overflow: hidden;
-  text-overflow: ellipsis;
-}
+  .icon-button {
+    padding: 8px;
+    color: $secondary-text-color;
+  }
 
-.navigation-bar__profile-edit {
-  display: inline;
-  color: inherit;
-  text-decoration: none;
+  .icon-button .icon {
+    width: 24px;
+    height: 24px;
+  }
 }
 
 .dropdown-animation {
@@ -2163,6 +2416,7 @@ a.account__display-name {
   &__panels {
     display: flex;
     justify-content: center;
+    gap: 16px;
     width: 100%;
     height: 100%;
     min-height: 100vh;
@@ -2195,7 +2449,6 @@ a.account__display-name {
       flex-direction: column;
 
       @media screen and (min-width: $no-gap-breakpoint) {
-        padding: 0 10px;
         max-width: 600px;
       }
     }
@@ -2445,6 +2698,7 @@ $ui-header-height: 55px;
 
   .columns-area__panels {
     min-height: calc(100vh - $ui-header-height);
+    gap: 0;
   }
 
   .columns-area__panels__pane--navigational {
@@ -2844,21 +3098,6 @@ $ui-header-height: 55px;
   }
 }
 
-.compose-form__highlightable {
-  display: flex;
-  flex-direction: column;
-  flex: 0 1 auto;
-  border-radius: 4px;
-  transition: box-shadow 300ms linear;
-  min-height: 0;
-  position: relative;
-
-  &.active {
-    transition: none;
-    box-shadow: 0 0 0 6px rgba(lighten($highlight-text-color, 8%), 0.7);
-  }
-}
-
 .compose-panel {
   width: 285px;
   margin-top: 10px;
@@ -2887,32 +3126,9 @@ $ui-header-height: 55px;
     }
   }
 
-  .navigation-bar {
-    flex: 0 1 48px;
-  }
-
   .compose-form {
-    flex: 1;
-    display: flex;
-    flex-direction: column;
-    min-height: 310px;
-    padding-bottom: 71px;
-    margin-bottom: -71px;
-  }
-
-  .compose-form__autosuggest-wrapper {
-    overflow-y: auto;
-    background-color: $white;
-    border-radius: 4px 4px 0 0;
-    flex: 0 1 auto;
-  }
-
-  .autosuggest-textarea__textarea {
-    overflow-y: hidden;
-  }
-
-  .compose-form__upload-thumbnail {
-    height: 80px;
+    flex: 1 1 auto;
+    min-height: 0;
   }
 }
 
@@ -2932,6 +3148,10 @@ $ui-header-height: 55px;
     height: 30px;
     width: auto;
   }
+
+  &__logo {
+    margin-bottom: 12px;
+  }
 }
 
 .navigation-panel,
@@ -2963,7 +3183,7 @@ $ui-header-height: 55px;
   position: absolute;
   top: 0;
   inset-inline-start: 0;
-  background: $ui-base-color;
+  background: darken($ui-base-color, 4%);
   box-sizing: border-box;
   padding: 0;
   display: flex;
@@ -2979,7 +3199,7 @@ $ui-header-height: 55px;
 }
 
 .drawer__inner__mastodon {
-  background: $ui-base-color
+  background: darken($ui-base-color, 4%)
     url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 234.80078 31.757813" width="234.80078" height="31.757812"><path d="M19.599609 0c-1.05 0-2.10039.375-2.90039 1.125L0 16.925781v14.832031h234.80078V17.025391l-16.5-15.900391c-1.6-1.5-4.20078-1.5-5.80078 0l-13.80078 13.099609c-1.6 1.5-4.19883 1.5-5.79883 0L179.09961 1.125c-1.6-1.5-4.19883-1.5-5.79883 0L159.5 14.224609c-1.6 1.5-4.20078 1.5-5.80078 0L139.90039 1.125c-1.6-1.5-4.20078-1.5-5.80078 0l-13.79883 13.099609c-1.6 1.5-4.20078 1.5-5.80078 0L100.69922 1.125c-1.600001-1.5-4.198829-1.5-5.798829 0l-13.59961 13.099609c-1.6 1.5-4.200781 1.5-5.800781 0L61.699219 1.125c-1.6-1.5-4.198828-1.5-5.798828 0L42.099609 14.224609c-1.6 1.5-4.198828 1.5-5.798828 0L22.5 1.125C21.7.375 20.649609 0 19.599609 0z" fill="#{hex-color($ui-base-color)}"/></svg>')
     no-repeat bottom / 100% auto;
   flex: 1;
@@ -3001,24 +3221,20 @@ $ui-header-height: 55px;
   }
 }
 
-.pseudo-drawer {
-  background: lighten($ui-base-color, 13%);
-  font-size: 13px;
-  text-align: start;
-}
-
 .drawer__header {
   flex: 0 0 auto;
   font-size: 16px;
-  background: $ui-base-color;
+  background: darken($ui-base-color, 4%);
   margin-bottom: 10px;
   display: flex;
   flex-direction: row;
   border-radius: 4px;
   overflow: hidden;
 
-  a:hover {
-    background: lighten($ui-base-color, 3%);
+  a:hover,
+  a:focus,
+  a:active {
+    background: $ui-base-color;
   }
 }
 
@@ -3228,7 +3444,7 @@ $ui-header-height: 55px;
 
   &--transparent {
     background: transparent;
-    color: $ui-secondary-color;
+    color: $secondary-text-color;
 
     &:hover,
     &:focus,
@@ -4533,10 +4749,7 @@ a.status-card {
 }
 
 .emoji-picker-dropdown__menu {
-  background: $simple-background-color;
   position: relative;
-  box-shadow: var(--dropdown-shadow);
-  border-radius: 4px;
   margin-top: 5px;
   z-index: 2;
 
@@ -4559,11 +4772,12 @@ a.status-card {
 .emoji-picker-dropdown__modifiers__menu {
   position: absolute;
   z-index: 4;
-  top: -4px;
-  inset-inline-start: -8px;
-  background: $simple-background-color;
+  top: -5px;
+  inset-inline-start: -9px;
+  background: var(--dropdown-background-color);
+  border: 1px solid var(--dropdown-border-color);
   border-radius: 4px;
-  box-shadow: 1px 2px 6px rgba($base-shadow-color, 0.2);
+  box-shadow: var(--dropdown-shadow);
   overflow: hidden;
 
   button {
@@ -4576,7 +4790,7 @@ a.status-card {
     &:hover,
     &:focus,
     &:active {
-      background: rgba($ui-secondary-color, 0.4);
+      background: var(--dropdown-border-color);
     }
   }
 
@@ -4645,15 +4859,17 @@ a.status-card {
 }
 
 .upload-progress {
-  padding: 10px;
-  color: $lighter-text-color;
+  color: $darker-text-color;
   overflow: hidden;
   display: flex;
-  gap: 10px;
+  gap: 8px;
+  align-items: center;
+  padding: 0 12px;
 
   .icon {
     width: 24px;
     height: 24px;
+    color: $ui-highlight-color;
   }
 
   span {
@@ -4672,7 +4888,7 @@ a.status-card {
   width: 100%;
   height: 6px;
   border-radius: 6px;
-  background: darken($simple-background-color, 8%);
+  background: darken($ui-base-color, 8%);
   position: relative;
   margin-top: 5px;
 }
@@ -4726,12 +4942,16 @@ a.status-card {
   filter: none;
 }
 
-.privacy-dropdown__dropdown {
-  background: $simple-background-color;
+.privacy-dropdown__dropdown,
+.language-dropdown__dropdown {
   box-shadow: var(--dropdown-shadow);
+  background: var(--dropdown-background-color);
+  border: 1px solid var(--dropdown-border-color);
+  padding: 4px;
   border-radius: 4px;
   overflow: hidden;
   z-index: 2;
+  width: 300px;
 
   &.top {
     transform-origin: 50% 100%;
@@ -4752,28 +4972,41 @@ a.status-card {
 }
 
 .privacy-dropdown__option {
-  color: $inverted-text-color;
-  padding: 10px;
+  font-size: 14px;
+  line-height: 20px;
+  letter-spacing: 0.25px;
+  padding: 8px 12px;
   cursor: pointer;
   display: flex;
+  align-items: center;
+  gap: 12px;
+  border-radius: 4px;
+  color: $primary-text-color;
 
   &:hover,
+  &:active {
+    background: var(--dropdown-border-color);
+  }
+
+  &:focus,
   &.active {
     background: $ui-highlight-color;
     color: $primary-text-color;
     outline: 0;
 
-    .privacy-dropdown__option__content {
+    .privacy-dropdown__option__content,
+    .privacy-dropdown__option__content strong,
+    .privacy-dropdown__option__additional {
       color: $primary-text-color;
-
-      strong {
-        color: $primary-text-color;
-      }
     }
   }
 
-  &.active:hover {
-    background: lighten($ui-highlight-color, 4%);
+  &__additional {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    color: $darker-text-color;
+    cursor: help;
   }
 }
 
@@ -4781,17 +5014,16 @@ a.status-card {
   display: flex;
   align-items: center;
   justify-content: center;
-  margin-inline-end: 10px;
 }
 
 .privacy-dropdown__option__content {
   flex: 1 1 auto;
-  color: $lighter-text-color;
+  color: $darker-text-color;
 
   strong {
+    color: $primary-text-color;
     font-weight: 500;
     display: block;
-    color: $inverted-text-color;
 
     @each $lang in $cjk-langs {
       &:lang(#{$lang}) {
@@ -4803,64 +5035,78 @@ a.status-card {
 
 .language-dropdown {
   &__dropdown {
-    background: $simple-background-color;
-    box-shadow: var(--dropdown-shadow);
-    border-radius: 4px;
-    overflow: hidden;
-    z-index: 2;
+    padding: 0;
 
-    &.top {
-      transform-origin: 50% 100%;
-    }
+    .emoji-mart-search {
+      padding: 10px;
+      background: var(--dropdown-background-color);
 
-    &.bottom {
-      transform-origin: 50% 0;
-    }
+      input {
+        padding: 8px 12px;
+        background: $ui-base-color;
+        border: 1px solid lighten($ui-base-color, 8%);
+        color: $darker-text-color;
 
-    .emoji-mart-search {
-      padding-inline-end: 10px;
+        @media screen and (width <= 600px) {
+          font-size: 16px;
+          line-height: 24px;
+          letter-spacing: 0.5px;
+        }
+      }
     }
 
     .emoji-mart-search-icon {
-      inset-inline-end: 10px + 5px;
+      inset-inline-end: 15px;
+      opacity: 1;
+      color: $darker-text-color;
+
+      .icon {
+        width: 18px;
+        height: 18px;
+      }
+
+      &:disabled {
+        opacity: 0.38;
+      }
     }
 
     .emoji-mart-scroll {
       padding: 0 10px 10px;
+      background: var(--dropdown-background-color);
     }
 
     &__results {
       &__item {
         cursor: pointer;
-        color: $inverted-text-color;
+        color: $primary-text-color;
+        font-size: 14px;
+        line-height: 20px;
+        letter-spacing: 0.25px;
         font-weight: 500;
-        padding: 10px;
+        padding: 8px 12px;
         border-radius: 4px;
-        display: flex;
-        gap: 6px;
-        align-items: center;
-
-        &:focus,
-        &:active,
-        &:hover {
-          background: $ui-secondary-color;
-        }
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
 
         &__common-name {
           color: $darker-text-color;
+          font-weight: 400;
+        }
+
+        &:active,
+        &:hover {
+          background: var(--dropdown-border-color);
         }
 
+        &:focus,
         &.active {
           background: $ui-highlight-color;
           color: $primary-text-color;
           outline: 0;
 
           .language-dropdown__dropdown__results__item__common-name {
-            color: $secondary-text-color;
-          }
-
-          &:hover {
-            background: lighten($ui-highlight-color, 4%);
+            color: $primary-text-color;
           }
         }
       }
@@ -4869,9 +5115,13 @@ a.status-card {
 }
 
 .search {
-  margin-bottom: 10px;
+  margin-bottom: 32px;
   position: relative;
 
+  .layout-multiple-columns & {
+    margin-bottom: 10px;
+  }
+
   &__popout {
     box-sizing: border-box;
     display: none;
@@ -4880,6 +5130,7 @@ a.status-card {
     margin-top: -2px;
     width: 100%;
     background: $ui-base-color;
+    border: 1px solid lighten($ui-base-color, 8%);
     border-radius: 0 0 4px 4px;
     box-shadow: var(--dropdown-shadow);
     z-index: 99;
@@ -4888,7 +5139,7 @@ a.status-card {
 
     h4 {
       text-transform: uppercase;
-      color: $dark-text-color;
+      color: $darker-text-color;
       font-weight: 500;
       padding: 0 10px;
       margin-bottom: 10px;
@@ -4896,6 +5147,7 @@ a.status-card {
 
     .icon-button {
       padding: 0;
+      color: $darker-text-color;
     }
 
     .icon {
@@ -4911,7 +5163,7 @@ a.status-card {
       }
 
       &__message {
-        color: $dark-text-color;
+        color: $darker-text-color;
         padding: 0 10px;
       }
 
@@ -4967,6 +5219,10 @@ a.status-card {
   }
 
   &.active {
+    .search__input {
+      border-radius: 4px 4px 0 0;
+    }
+
     .search__popout {
       display: block;
     }
@@ -4977,14 +5233,9 @@ a.status-card {
   @include search-input;
 
   display: block;
-  padding: 15px;
-  padding-inline-end: 30px;
-  line-height: 18px;
-  font-size: 16px;
-
-  &::placeholder {
-    color: lighten($darker-text-color, 4%);
-  }
+  padding: 12px 16px;
+  padding-inline-start: 16px + 15px + 8px;
+  line-height: normal;
 
   &::-moz-focus-inner {
     border: 0;
@@ -4995,10 +5246,6 @@ a.status-card {
   &:active {
     outline: 0 !important;
   }
-
-  &:focus {
-    background: lighten($ui-base-color, 4%);
-  }
 }
 
 .search__icon {
@@ -5013,21 +5260,21 @@ a.status-card {
 
   .icon {
     position: absolute;
-    top: 13px;
-    inset-inline-end: 10px;
+    top: 12px + 2px;
+    inset-inline-start: 16px - 2px;
     display: inline-block;
     opacity: 0;
     transition: all 100ms linear;
     transition-property: transform, opacity;
-    width: 24px;
-    height: 24px;
-    color: $secondary-text-color;
+    width: 20px;
+    height: 20px;
+    color: $darker-text-color;
     cursor: default;
     pointer-events: none;
 
     &.active {
       pointer-events: auto;
-      opacity: 0.3;
+      opacity: 1;
     }
   }
 
@@ -5042,16 +5289,10 @@ a.status-card {
 
   .icon-times-circle {
     transform: rotate(0deg);
-    color: $action-button-color;
     cursor: pointer;
 
     &.active {
       transform: rotate(90deg);
-      opacity: 1;
-    }
-
-    &:hover {
-      color: lighten($action-button-color, 7%);
     }
   }
 }
@@ -5658,6 +5899,11 @@ a.status-card {
     }
   }
 
+  .dialog-option {
+    align-items: center;
+    gap: 12px;
+  }
+
   .dialog-option .poll__input {
     border-color: $inverted-text-color;
     color: $ui-secondary-color;
@@ -5666,8 +5912,8 @@ a.status-card {
     justify-content: center;
 
     svg {
-      width: 8px;
-      height: auto;
+      width: 15px;
+      height: 15px;
     }
 
     &:active,
@@ -6865,90 +7111,6 @@ noscript {
   }
 }
 
-@media screen and (width <= 630px) and (height <= 400px) {
-  $duration: 400ms;
-  $delay: 100ms;
-
-  .search {
-    will-change: margin-top;
-    transition: margin-top $duration $delay;
-  }
-
-  .navigation-bar {
-    will-change: padding-bottom;
-    transition: padding-bottom $duration $delay;
-  }
-
-  .navigation-bar {
-    & > a:first-child {
-      will-change: margin-top, margin-inline-start, margin-inline-end, width;
-      transition:
-        margin-top $duration $delay,
-        margin-inline-start $duration ($duration + $delay),
-        margin-inline-end $duration ($duration + $delay);
-    }
-
-    & > .navigation-bar__profile-edit {
-      will-change: margin-top;
-      transition: margin-top $duration $delay;
-    }
-
-    .navigation-bar__actions {
-      & > .icon-button.close {
-        will-change: opacity transform;
-        transition:
-          opacity $duration * 0.5 $delay,
-          transform $duration $delay;
-      }
-
-      & > .compose__action-bar .icon-button {
-        will-change: opacity transform;
-        transition:
-          opacity $duration * 0.5 $delay + $duration * 0.5,
-          transform $duration $delay;
-      }
-    }
-  }
-
-  .is-composing {
-    .search {
-      margin-top: -50px;
-    }
-
-    .navigation-bar {
-      padding-bottom: 0;
-
-      & > a:first-child {
-        margin: -100px 10px 0 -50px;
-      }
-
-      .navigation-bar__profile {
-        padding-top: 2px;
-      }
-
-      .navigation-bar__profile-edit {
-        position: absolute;
-        margin-top: -60px;
-      }
-
-      .navigation-bar__actions {
-        .icon-button.close {
-          pointer-events: auto;
-          opacity: 1;
-          transform: scale(1, 1) translate(0, 0);
-          bottom: 5px;
-        }
-
-        .compose__action-bar .icon-button {
-          pointer-events: none;
-          opacity: 0;
-          transform: scale(0, 1) translate(100%, 0);
-        }
-      }
-    }
-  }
-}
-
 .embed-modal {
   width: auto;
   max-width: 80vw;
@@ -8910,11 +9072,14 @@ noscript {
 
 .link-footer {
   flex: 0 0 auto;
-  padding: 10px;
   padding-top: 20px;
   z-index: 1;
   font-size: 13px;
 
+  .column & {
+    padding: 15px;
+  }
+
   p {
     color: $dark-text-color;
     margin-bottom: 20px;
diff --git a/app/javascript/styles/mastodon/containers.scss b/app/javascript/styles/mastodon/containers.scss
index b6e995787d2d48..8a472d75b13cf6 100644
--- a/app/javascript/styles/mastodon/containers.scss
+++ b/app/javascript/styles/mastodon/containers.scss
@@ -40,13 +40,12 @@
   .compose-form {
     width: 400px;
     margin: 0 auto;
-    padding: 20px 0;
-    margin-top: 40px;
+    padding: 10px 0;
+    padding-bottom: 20px;
     box-sizing: border-box;
 
     @media screen and (width <= 400px) {
       width: 100%;
-      margin-top: 0;
       padding: 20px;
     }
   }
@@ -56,13 +55,15 @@
   width: 400px;
   margin: 0 auto;
   display: flex;
-  font-size: 13px;
-  line-height: 18px;
+  align-items: center;
+  gap: 10px;
+  font-size: 14px;
+  line-height: 20px;
   box-sizing: border-box;
   padding: 20px 0;
   margin-top: 40px;
   margin-bottom: 10px;
-  border-bottom: 1px solid $ui-base-color;
+  border-bottom: 1px solid lighten($ui-base-color, 8%);
 
   @media screen and (width <= 440px) {
     width: 100%;
@@ -71,9 +72,9 @@
   }
 
   .avatar {
-    width: 40px;
-    height: 40px;
-    margin-inline-end: 10px;
+    width: 48px;
+    height: 48px;
+    flex: 0 0 auto;
 
     img {
       width: 100%;
@@ -87,13 +88,14 @@
   .name {
     flex: 1 1 auto;
     color: $secondary-text-color;
-    width: calc(100% - 90px);
 
     .username {
       display: block;
-      font-weight: 500;
+      font-size: 16px;
+      line-height: 24px;
       text-overflow: ellipsis;
       overflow: hidden;
+      color: $primary-text-color;
     }
   }
 
@@ -101,7 +103,7 @@
     display: block;
     font-size: 32px;
     line-height: 40px;
-    margin-inline-start: 10px;
+    flex: 0 0 auto;
   }
 }
 
diff --git a/app/javascript/styles/mastodon/emoji_picker.scss b/app/javascript/styles/mastodon/emoji_picker.scss
index c7247c3a5723cb..fec0c10ddb9db9 100644
--- a/app/javascript/styles/mastodon/emoji_picker.scss
+++ b/app/javascript/styles/mastodon/emoji_picker.scss
@@ -1,7 +1,6 @@
 .emoji-mart {
   font-size: 13px;
   display: inline-block;
-  color: $inverted-text-color;
 
   &,
   * {
@@ -15,13 +14,13 @@
 }
 
 .emoji-mart-bar {
-  border: 0 solid darken($ui-secondary-color, 8%);
+  border: 0 solid var(--dropdown-border-color);
 
   &:first-child {
     border-bottom-width: 1px;
     border-top-left-radius: 5px;
     border-top-right-radius: 5px;
-    background: $ui-secondary-color;
+    background: var(--dropdown-border-color);
   }
 
   &:last-child {
@@ -36,7 +35,6 @@
   display: flex;
   justify-content: space-between;
   padding: 0 6px;
-  color: $lighter-text-color;
   line-height: 0;
 }
 
@@ -50,9 +48,10 @@
   cursor: pointer;
   background: transparent;
   border: 0;
+  color: $darker-text-color;
 
   &:hover {
-    color: darken($lighter-text-color, 4%);
+    color: lighten($darker-text-color, 4%);
   }
 }
 
@@ -60,7 +59,7 @@
   color: $highlight-text-color;
 
   &:hover {
-    color: darken($highlight-text-color, 4%);
+    color: lighten($highlight-text-color, 4%);
   }
 
   .emoji-mart-anchor-bar {
@@ -95,7 +94,7 @@
   height: 270px;
   max-height: 35vh;
   padding: 0 6px 6px;
-  background: $simple-background-color;
+  background: var(--dropdown-background-color);
   will-change: transform;
 
   &::-webkit-scrollbar-track:hover,
@@ -107,7 +106,7 @@
 .emoji-mart-search {
   padding: 10px;
   padding-inline-end: 45px;
-  background: $simple-background-color;
+  background: var(--dropdown-background-color);
   position: relative;
 
   input {
@@ -118,9 +117,9 @@
     font-family: inherit;
     display: block;
     width: 100%;
-    background: rgba($ui-secondary-color, 0.3);
-    color: $inverted-text-color;
-    border: 1px solid $ui-secondary-color;
+    background: $ui-base-color;
+    color: $darker-text-color;
+    border: 1px solid lighten($ui-base-color, 8%);
     border-radius: 4px;
 
     &::-moz-focus-inner {
@@ -155,11 +154,10 @@
   &:disabled {
     cursor: default;
     pointer-events: none;
-    opacity: 0.3;
   }
 
   svg {
-    fill: $action-button-color;
+    fill: $darker-text-color;
   }
 }
 
@@ -180,7 +178,7 @@
     inset-inline-start: 0;
     width: 100%;
     height: 100%;
-    background-color: rgba($ui-secondary-color, 0.7);
+    background-color: var(--dropdown-border-color);
     border-radius: 100%;
   }
 }
@@ -197,7 +195,7 @@
     width: 100%;
     font-weight: 500;
     padding: 5px 6px;
-    background: $simple-background-color;
+    background: var(--dropdown-background-color);
   }
 }
 
@@ -241,7 +239,7 @@
 
 .emoji-mart-no-results {
   font-size: 14px;
-  color: $light-text-color;
+  color: $dark-text-color;
   text-align: center;
   padding: 5px 6px;
   padding-top: 70px;
diff --git a/app/javascript/styles/mastodon/modal.scss b/app/javascript/styles/mastodon/modal.scss
index 0b7220b21d1115..60e7d622458e20 100644
--- a/app/javascript/styles/mastodon/modal.scss
+++ b/app/javascript/styles/mastodon/modal.scss
@@ -1,5 +1,5 @@
 .modal-layout {
-  background: $ui-base-color
+  background: darken($ui-base-color, 4%)
     url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 234.80078 31.757813" width="234.80078" height="31.757812"><path d="M19.599609 0c-1.05 0-2.10039.375-2.90039 1.125L0 16.925781v14.832031h234.80078V17.025391l-16.5-15.900391c-1.6-1.5-4.20078-1.5-5.80078 0l-13.80078 13.099609c-1.6 1.5-4.19883 1.5-5.79883 0L179.09961 1.125c-1.6-1.5-4.19883-1.5-5.79883 0L159.5 14.224609c-1.6 1.5-4.20078 1.5-5.80078 0L139.90039 1.125c-1.6-1.5-4.20078-1.5-5.80078 0l-13.79883 13.099609c-1.6 1.5-4.20078 1.5-5.80078 0L100.69922 1.125c-1.600001-1.5-4.198829-1.5-5.798829 0l-13.59961 13.099609c-1.6 1.5-4.200781 1.5-5.800781 0L61.699219 1.125c-1.6-1.5-4.198828-1.5-5.798828 0L42.099609 14.224609c-1.6 1.5-4.198828 1.5-5.798828 0L22.5 1.125C21.7.375 20.649609 0 19.599609 0z" fill="#{hex-color($ui-base-lighter-color)}33"/></svg>')
     repeat-x bottom fixed;
   display: flex;
diff --git a/app/javascript/styles/mastodon/polls.scss b/app/javascript/styles/mastodon/polls.scss
index 8a26e611ca8a2d..939fca3364af8c 100644
--- a/app/javascript/styles/mastodon/polls.scss
+++ b/app/javascript/styles/mastodon/polls.scss
@@ -52,6 +52,8 @@
   &__option {
     position: relative;
     display: flex;
+    align-items: flex-start;
+    gap: 8px;
     padding: 6px 0;
     line-height: 18px;
     cursor: default;
@@ -78,16 +80,22 @@
       box-sizing: border-box;
       width: 100%;
       font-size: 14px;
-      color: $inverted-text-color;
+      color: $secondary-text-color;
       outline: 0;
       font-family: inherit;
-      background: $simple-background-color;
-      border: 1px solid darken($simple-background-color, 14%);
+      background: $ui-base-color;
+      border: 1px solid $darker-text-color;
       border-radius: 4px;
-      padding: 6px 10px;
+      padding: 8px 12px;
 
       &:focus {
-        border-color: $highlight-text-color;
+        border-color: $ui-highlight-color;
+      }
+
+      @media screen and (width <= 600px) {
+        font-size: 16px;
+        line-height: 24px;
+        letter-spacing: 0.5px;
       }
     }
 
@@ -96,26 +104,20 @@
     }
 
     &.editable {
-      display: flex;
       align-items: center;
       overflow: visible;
     }
   }
 
   &__input {
-    display: inline-block;
+    display: block;
     position: relative;
     border: 1px solid $ui-primary-color;
     box-sizing: border-box;
-    width: 18px;
-    height: 18px;
-    margin-inline-end: 10px;
-    top: -1px;
+    width: 17px;
+    height: 17px;
     border-radius: 50%;
-    vertical-align: middle;
-    margin-top: auto;
-    margin-bottom: auto;
-    flex: 0 0 18px;
+    flex: 0 0 auto;
 
     &.checkbox {
       border-radius: 4px;
@@ -159,6 +161,15 @@
     }
   }
 
+  &__option.editable &__input {
+    &:active,
+    &:focus,
+    &:hover {
+      border-color: $ui-primary-color;
+      border-width: 1px;
+    }
+  }
+
   &__number {
     display: inline-block;
     width: 45px;
@@ -209,90 +220,6 @@
   }
 }
 
-.compose-form__poll-wrapper {
-  border-top: 1px solid darken($simple-background-color, 8%);
-
-  ul {
-    padding: 10px;
-  }
-
-  .poll__input {
-    &:active,
-    &:focus,
-    &:hover {
-      border-color: $ui-button-focus-background-color;
-    }
-  }
-
-  .poll__footer {
-    border-top: 1px solid darken($simple-background-color, 8%);
-    padding: 10px;
-    display: flex;
-    align-items: center;
-
-    button,
-    select {
-      flex: 1 1 50%;
-
-      &:focus {
-        border-color: $highlight-text-color;
-      }
-    }
-  }
-
-  .button.button-secondary {
-    font-size: 14px;
-    font-weight: 400;
-    padding: 6px 10px;
-    height: auto;
-    line-height: inherit;
-    color: $action-button-color;
-    border-color: $action-button-color;
-    margin-inline-end: 5px;
-
-    &:hover,
-    &:focus,
-    &.active {
-      border-color: $action-button-color;
-      background-color: $action-button-color;
-      color: $ui-button-color;
-    }
-  }
-
-  li {
-    display: flex;
-    align-items: center;
-
-    .poll__option {
-      flex: 0 0 auto;
-      width: calc(100% - (23px + 6px));
-      margin-inline-end: 6px;
-    }
-  }
-
-  select {
-    appearance: none;
-    box-sizing: border-box;
-    font-size: 14px;
-    color: $inverted-text-color;
-    display: inline-block;
-    width: auto;
-    outline: 0;
-    font-family: inherit;
-    background: $simple-background-color
-      url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 14.933 18.467' height='19.698' width='15.929'><path d='M3.467 14.967l-3.393-3.5H14.86l-3.392 3.5c-1.866 1.925-3.666 3.5-4 3.5-.335 0-2.135-1.575-4-3.5zm.266-11.234L7.467 0 11.2 3.733l3.733 3.734H0l3.733-3.734z' fill='#{hex-color(darken($simple-background-color, 14%))}'/></svg>")
-      no-repeat right 8px center / auto 16px;
-    border: 1px solid darken($simple-background-color, 14%);
-    border-radius: 4px;
-    padding: 6px 10px;
-    padding-inline-end: 30px;
-  }
-
-  .icon-button.disabled {
-    color: darken($simple-background-color, 14%);
-  }
-}
-
 .muted .poll {
   color: $dark-text-color;
 
diff --git a/spec/system/new_statuses_spec.rb b/spec/system/new_statuses_spec.rb
index a3b816b4d59cfa..5a3f1b406bef29 100644
--- a/spec/system/new_statuses_spec.rb
+++ b/spec/system/new_statuses_spec.rb
@@ -24,7 +24,7 @@
 
     within('.compose-form') do
       fill_in "What's on your mind?", with: status_text
-      click_on 'Publish!'
+      click_on 'Post'
     end
 
     expect(subject).to have_css('.status__content__text', text: status_text)
@@ -37,7 +37,7 @@
 
     within('.compose-form') do
       fill_in "What's on your mind?", with: status_text
-      click_on 'Publish!'
+      click_on 'Post'
     end
 
     expect(subject).to have_css('.status__content__text', text: status_text)
diff --git a/spec/system/share_entrypoint_spec.rb b/spec/system/share_entrypoint_spec.rb
index fd02d1120c0e26..126a816bcc3cef 100644
--- a/spec/system/share_entrypoint_spec.rb
+++ b/spec/system/share_entrypoint_spec.rb
@@ -19,13 +19,13 @@
 
   it 'can be used to post a new status' do
     expect(subject).to have_css('div#mastodon-compose')
-    expect(subject).to have_css('.compose-form__publish-button-wrapper > button')
+    expect(subject).to have_css('.compose-form__submit')
 
     status_text = 'This is a new status!'
 
     within('.compose-form') do
       fill_in "What's on your mind?", with: status_text
-      click_on 'Publish!'
+      click_on 'Post'
     end
 
     expect(subject).to have_css('.notification-bar-message', text: 'Post published.')

From 881e8c113c4da503e73a953c8430f71f380cff63 Mon Sep 17 00:00:00 2001
From: Emelia Smith <ThisIsMissEm@users.noreply.github.com>
Date: Thu, 25 Jan 2024 17:46:02 +0100
Subject: [PATCH 0002/2191] Refactor: fix streaming postgresql and redis typing
 issues (#28747)

---
 streaming/index.js | 135 ++++++++++++++++++++++++++++++++++++---------
 1 file changed, 109 insertions(+), 26 deletions(-)

diff --git a/streaming/index.js b/streaming/index.js
index 78b049723f7e06..6945a9ae7da183 100644
--- a/streaming/index.js
+++ b/streaming/index.js
@@ -8,7 +8,7 @@ const url = require('url');
 const cors = require('cors');
 const dotenv = require('dotenv');
 const express = require('express');
-const Redis = require('ioredis');
+const { Redis } = require('ioredis');
 const { JSDOM } = require('jsdom');
 const pg = require('pg');
 const dbUrlToConfig = require('pg-connection-string').parse;
@@ -43,13 +43,18 @@ initializeLogLevel(process.env, environment);
  */
 
 /**
- * @param {Object.<string, any>} config
+ * @param {RedisConfiguration} config
+ * @returns {Promise<Redis>}
  */
-const createRedisClient = async (config) => {
-  const { redisParams, redisUrl } = config;
-  // @ts-ignore
-  const client = new Redis(redisUrl, redisParams);
-  // @ts-ignore
+const createRedisClient = async ({ redisParams, redisUrl }) => {
+  let client;
+
+  if (typeof redisUrl === 'string') {
+    client = new Redis(redisUrl, redisParams);
+  } else {
+    client = new Redis(redisParams);
+  }
+
   client.on('error', (err) => logger.error({ err }, 'Redis Client Error!'));
 
   return client;
@@ -87,39 +92,101 @@ const parseJSON = (json, req) => {
 };
 
 /**
- * @param {Object.<string, any>} env the `process.env` value to read configuration from
- * @returns {Object.<string, any>} the configuration for the PostgreSQL connection
+ * Takes an environment variable that should be an integer, attempts to parse
+ * it falling back to a default if not set, and handles errors parsing.
+ * @param {string|undefined} value
+ * @param {number} defaultValue
+ * @param {string} variableName
+ * @returns {number}
+ */
+const parseIntFromEnv = (value, defaultValue, variableName) => {
+  if (typeof value === 'string' && value.length > 0) {
+    const parsedValue = parseInt(value, 10);
+    if (isNaN(parsedValue)) {
+      throw new Error(`Invalid ${variableName} environment variable: ${value}`);
+    }
+    return parsedValue;
+  } else {
+    return defaultValue;
+  }
+};
+
+/**
+ * @param {NodeJS.ProcessEnv} env the `process.env` value to read configuration from
+ * @returns {pg.PoolConfig} the configuration for the PostgreSQL connection
  */
 const pgConfigFromEnv = (env) => {
+  /** @type {Record<string, pg.PoolConfig>} */
   const pgConfigs = {
     development: {
-      user:     env.DB_USER || pg.defaults.user,
+      user: env.DB_USER || pg.defaults.user,
       password: env.DB_PASS || pg.defaults.password,
       database: env.DB_NAME || 'mastodon_development',
-      host:     env.DB_HOST || pg.defaults.host,
-      port:     env.DB_PORT || pg.defaults.port,
+      host: env.DB_HOST || pg.defaults.host,
+      port: parseIntFromEnv(env.DB_PORT, pg.defaults.port ?? 5432, 'DB_PORT')
     },
 
     production: {
-      user:     env.DB_USER || 'mastodon',
+      user: env.DB_USER || 'mastodon',
       password: env.DB_PASS || '',
       database: env.DB_NAME || 'mastodon_production',
-      host:     env.DB_HOST || 'localhost',
-      port:     env.DB_PORT || 5432,
+      host: env.DB_HOST || 'localhost',
+      port: parseIntFromEnv(env.DB_PORT, 5432, 'DB_PORT')
     },
   };
 
-  let baseConfig;
+  /**
+   * @type {pg.PoolConfig}
+   */
+  let baseConfig = {};
 
   if (env.DATABASE_URL) {
-    baseConfig = dbUrlToConfig(env.DATABASE_URL);
+    const parsedUrl = dbUrlToConfig(env.DATABASE_URL);
+
+    // The result of dbUrlToConfig from pg-connection-string is not type
+    // compatible with pg.PoolConfig, since parts of the connection URL may be
+    // `null` when pg.PoolConfig expects `undefined`, as such we have to
+    // manually create the baseConfig object from the properties of the
+    // parsedUrl.
+    //
+    // For more information see:
+    // https://github.com/brianc/node-postgres/issues/2280
+    //
+    // FIXME: clean up once brianc/node-postgres#3128 lands
+    if (typeof parsedUrl.password === 'string') baseConfig.password = parsedUrl.password;
+    if (typeof parsedUrl.host === 'string') baseConfig.host = parsedUrl.host;
+    if (typeof parsedUrl.user === 'string') baseConfig.user = parsedUrl.user;
+    if (typeof parsedUrl.port === 'string') {
+      const parsedPort = parseInt(parsedUrl.port, 10);
+      if (isNaN(parsedPort)) {
+        throw new Error('Invalid port specified in DATABASE_URL environment variable');
+      }
+      baseConfig.port = parsedPort;
+    }
+    if (typeof parsedUrl.database === 'string') baseConfig.database = parsedUrl.database;
+    if (typeof parsedUrl.options === 'string') baseConfig.options = parsedUrl.options;
+
+    // The pg-connection-string type definition isn't correct, as parsedUrl.ssl
+    // can absolutely be an Object, this is to work around these incorrect
+    // types, including the casting of parsedUrl.ssl to Record<string, any>
+    if (typeof parsedUrl.ssl === 'boolean') {
+      baseConfig.ssl = parsedUrl.ssl;
+    } else if (typeof parsedUrl.ssl === 'object' && !Array.isArray(parsedUrl.ssl) && parsedUrl.ssl !== null) {
+      /** @type {Record<string, any>} */
+      const sslOptions = parsedUrl.ssl;
+      baseConfig.ssl = {};
+
+      baseConfig.ssl.cert = sslOptions.cert;
+      baseConfig.ssl.key = sslOptions.key;
+      baseConfig.ssl.ca = sslOptions.ca;
+      baseConfig.ssl.rejectUnauthorized = sslOptions.rejectUnauthorized;
+    }
 
     // Support overriding the database password in the connection URL
     if (!baseConfig.password && env.DB_PASS) {
       baseConfig.password = env.DB_PASS;
     }
-  } else {
-    // @ts-ignore
+  } else if (Object.hasOwnProperty.call(pgConfigs, environment)) {
     baseConfig = pgConfigs[environment];
 
     if (env.DB_SSLMODE) {
@@ -136,42 +203,58 @@ const pgConfigFromEnv = (env) => {
         break;
       }
     }
+  } else {
+    throw new Error('Unable to resolve postgresql database configuration.');
   }
 
   return {
     ...baseConfig,
-    max: env.DB_POOL || 10,
+    max: parseIntFromEnv(env.DB_POOL, 10, 'DB_POOL'),
     connectionTimeoutMillis: 15000,
+    // Deliberately set application_name to an empty string to prevent excessive
+    // CPU usage with PG Bouncer. See:
+    // - https://github.com/mastodon/mastodon/pull/23958
+    // - https://github.com/pgbouncer/pgbouncer/issues/349
     application_name: '',
   };
 };
 
 /**
- * @param {Object.<string, any>} env the `process.env` value to read configuration from
- * @returns {Object.<string, any>} configuration for the Redis connection
+ * @typedef RedisConfiguration
+ * @property {import('ioredis').RedisOptions} redisParams
+ * @property {string} redisPrefix
+ * @property {string|undefined} redisUrl
+ */
+
+/**
+ * @param {NodeJS.ProcessEnv} env the `process.env` value to read configuration from
+ * @returns {RedisConfiguration} configuration for the Redis connection
  */
 const redisConfigFromEnv = (env) => {
   // ioredis *can* transparently add prefixes for us, but it doesn't *in some cases*,
   // which means we can't use it. But this is something that should be looked into.
   const redisPrefix = env.REDIS_NAMESPACE ? `${env.REDIS_NAMESPACE}:` : '';
 
+  let redisPort = parseIntFromEnv(env.REDIS_PORT, 6379, 'REDIS_PORT');
+  let redisDatabase = parseIntFromEnv(env.REDIS_DB, 0, 'REDIS_DB');
+
+  /** @type {import('ioredis').RedisOptions} */
   const redisParams = {
     host: env.REDIS_HOST || '127.0.0.1',
-    port: env.REDIS_PORT || 6379,
-    db: env.REDIS_DB || 0,
+    port: redisPort,
+    db: redisDatabase,
     password: env.REDIS_PASSWORD || undefined,
   };
 
   // redisParams.path takes precedence over host and port.
   if (env.REDIS_URL && env.REDIS_URL.startsWith('unix://')) {
-    // @ts-ignore
     redisParams.path = env.REDIS_URL.slice(7);
   }
 
   return {
     redisParams,
     redisPrefix,
-    redisUrl: env.REDIS_URL,
+    redisUrl: typeof env.REDIS_URL === 'string' ? env.REDIS_URL : undefined,
   };
 };
 

From 0e0a94f4839322e6eaf805c06865bc4c89886388 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 26 Jan 2024 03:53:44 -0500
Subject: [PATCH 0003/2191] Handle CLI failure exit status at the top-level
 script (#28322)

---
 .rubocop.yml                                  |   3 +-
 bin/tootctl                                   |   7 +-
 lib/mastodon/cli/accounts.rb                  | 152 +++++-------------
 lib/mastodon/cli/base.rb                      |   4 +
 lib/mastodon/cli/cache.rb                     |   3 +-
 lib/mastodon/cli/domains.rb                   |   6 +-
 lib/mastodon/cli/email_domain_blocks.rb       |  10 +-
 lib/mastodon/cli/emoji.rb                     |  10 +-
 lib/mastodon/cli/federation.rb                |  16 +-
 lib/mastodon/cli/feeds.rb                     |   8 +-
 lib/mastodon/cli/ip_blocks.rb                 |  10 +-
 lib/mastodon/cli/maintenance.rb               |  16 +-
 lib/mastodon/cli/media.rb                     |  47 ++----
 lib/mastodon/cli/progress_helper.rb           |   5 +-
 lib/mastodon/cli/search.rb                    |  10 +-
 lib/mastodon/cli/statuses.rb                  |   5 +-
 lib/mastodon/cli/upgrade.rb                   |   6 +-
 spec/lib/mastodon/cli/accounts_spec.rb        |  90 ++++-------
 spec/lib/mastodon/cli/cache_spec.rb           |   3 +-
 .../mastodon/cli/email_domain_blocks_spec.rb  |   6 +-
 spec/lib/mastodon/cli/feeds_spec.rb           |   3 +-
 spec/lib/mastodon/cli/ip_blocks_spec.rb       |   6 +-
 spec/lib/mastodon/cli/main_spec.rb            |   6 +-
 spec/lib/mastodon/cli/maintenance_spec.rb     |   8 +-
 spec/lib/mastodon/cli/media_spec.rb           |  21 +--
 spec/lib/mastodon/cli/search_spec.rb          |   6 +-
 spec/lib/mastodon/cli/statuses_spec.rb        |   3 +-
 27 files changed, 150 insertions(+), 320 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 64021b4cec9dc4..69989411443558 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -96,12 +96,11 @@ Rails/FilePath:
 Rails/HttpStatus:
   EnforcedStyle: numeric
 
-# Reason: Allowed in `tootctl` CLI code and in boot ENV checker
+# Reason: Allowed in boot ENV checker
 # https://docs.rubocop.org/rubocop-rails/cops_rails.html#railsexit
 Rails/Exit:
   Exclude:
     - 'config/boot.rb'
-    - 'lib/mastodon/cli/*.rb'
 
 # Reason: Conflicts with `Lint/UselessMethodDefinition` for inherited controller actions
 # https://docs.rubocop.org/rubocop-rails/cops_rails.html#railslexicallyscopedactionfilter
diff --git a/bin/tootctl b/bin/tootctl
index b3311c6b2a391f..ff64eb2e42c6e4 100755
--- a/bin/tootctl
+++ b/bin/tootctl
@@ -6,8 +6,13 @@ require_relative '../lib/mastodon/cli/main'
 
 begin
   Chewy.strategy(:mastodon) do
-    Mastodon::CLI::Main.start(ARGV)
+    Mastodon::CLI::Main.start(ARGV, debug: true) # Enables the script to rescue `Thor::Error`
   end
+rescue Thor::Error => e
+  Thor::Shell::Color
+    .new
+    .say_error(e.message, :red)
+  exit(1)
 rescue Interrupt
   exit(130)
 end
diff --git a/lib/mastodon/cli/accounts.rb b/lib/mastodon/cli/accounts.rb
index 9dc65c1477d8fd..b5308e2b7625ac 100644
--- a/lib/mastodon/cli/accounts.rb
+++ b/lib/mastodon/cli/accounts.rb
@@ -39,8 +39,7 @@ def rotate(username = nil)
         rotate_keys_for_account(Account.find_local(username))
         say('OK', :green)
       else
-        say('No account(s) given', :red)
-        exit(1)
+        fail_with_message 'No account(s) given'
       end
     end
 
@@ -74,10 +73,7 @@ def create(username)
       if options[:role]
         role = UserRole.find_by(name: options[:role])
 
-        if role.nil?
-          say('Cannot find user role with that name', :red)
-          exit(1)
-        end
+        fail_with_message 'Cannot find user role with that name' if role.nil?
 
         role_id = role.id
       end
@@ -114,7 +110,6 @@ def create(username)
         say("New password: #{password}")
       else
         report_errors(user.errors)
-        exit(1)
       end
     end
 
@@ -152,18 +147,12 @@ def create(username)
     def modify(username)
       user = Account.find_local(username)&.user
 
-      if user.nil?
-        say('No user with such username', :red)
-        exit(1)
-      end
+      fail_with_message 'No user with such username' if user.nil?
 
       if options[:role]
         role = UserRole.find_by(name: options[:role])
 
-        if role.nil?
-          say('Cannot find user role with that name', :red)
-          exit(1)
-        end
+        fail_with_message 'Cannot find user role with that name' if role.nil?
 
         user.role_id = role.id
       elsif options[:remove_role]
@@ -185,7 +174,6 @@ def modify(username)
         say("New password: #{password}") if options[:reset_password]
       else
         report_errors(user.errors)
-        exit(1)
       end
     end
 
@@ -200,27 +188,19 @@ def modify(username)
     LONG_DESC
     def delete(username = nil)
       if username.present? && options[:email].present?
-        say('Use username or --email, not both', :red)
-        exit(1)
+        fail_with_message  'Use username or --email, not both'
       elsif username.blank? && options[:email].blank?
-        say('No username provided', :red)
-        exit(1)
+        fail_with_message 'No username provided'
       end
 
       account = nil
 
       if username.present?
         account = Account.find_local(username)
-        if account.nil?
-          say('No user with such username', :red)
-          exit(1)
-        end
+        fail_with_message 'No user with such username' if account.nil?
       else
         account = Account.left_joins(:user).find_by(user: { email: options[:email] })
-        if account.nil?
-          say('No user with such email', :red)
-          exit(1)
-        end
+        fail_with_message 'No user with such email' if account.nil?
       end
 
       say("Deleting user with #{account.statuses_count} statuses, this might take a while...#{dry_run_mode_suffix}")
@@ -243,23 +223,18 @@ def merge(from_acct, to_acct)
       username, domain = from_acct.split('@')
       from_account = Account.find_remote(username, domain)
 
-      if from_account.nil? || from_account.local?
-        say("No such account (#{from_acct})", :red)
-        exit(1)
-      end
+      fail_with_message "No such account (#{from_acct})" if from_account.nil? || from_account.local?
 
       username, domain = to_acct.split('@')
       to_account = Account.find_remote(username, domain)
 
-      if to_account.nil? || to_account.local?
-        say("No such account (#{to_acct})", :red)
-        exit(1)
-      end
+      fail_with_message "No such account (#{to_acct})" if to_account.nil? || to_account.local?
 
       if from_account.public_key != to_account.public_key && !options[:force]
-        say("Accounts don't have the same public key, might not be duplicates!", :red)
-        say('Override with --force', :red)
-        exit(1)
+        fail_with_message <<~ERROR
+          Accounts don't have the same public key, might not be duplicates!
+          Override with --force
+        ERROR
       end
 
       to_account.merge_with!(from_account)
@@ -298,10 +273,7 @@ def fix_duplicates
     def backup(username)
       account = Account.find_local(username)
 
-      if account.nil?
-        say('No user with such username', :red)
-        exit(1)
-      end
+      fail_with_message 'No user with such username' if account.nil?
 
       backup = account.user.backups.create!
       BackupWorker.perform_async(backup.id)
@@ -387,10 +359,7 @@ def refresh(*usernames)
           user, domain = user.split('@')
           account = Account.find_remote(user, domain)
 
-          if account.nil?
-            say('No such account', :red)
-            exit(1)
-          end
+          fail_with_message 'No such account' if account.nil?
 
           next if dry_run?
 
@@ -405,8 +374,7 @@ def refresh(*usernames)
 
         say("OK#{dry_run_mode_suffix}", :green)
       else
-        say('No account(s) given', :red)
-        exit(1)
+        fail_with_message 'No account(s) given'
       end
     end
 
@@ -416,10 +384,7 @@ def refresh(*usernames)
     def follow(username)
       target_account = Account.find_local(username)
 
-      if target_account.nil?
-        say('No such account', :red)
-        exit(1)
-      end
+      fail_with_message 'No such account' if target_account.nil?
 
       processed, = parallelize_with_progress(Account.local.without_suspended) do |account|
         FollowService.new.call(account, target_account, bypass_limit: true)
@@ -435,10 +400,7 @@ def unfollow(acct)
       username, domain = acct.split('@')
       target_account = Account.find_remote(username, domain)
 
-      if target_account.nil?
-        say('No such account', :red)
-        exit(1)
-      end
+      fail_with_message 'No such account' if target_account.nil?
 
       processed, = parallelize_with_progress(target_account.followers.local) do |account|
         UnfollowService.new.call(account, target_account)
@@ -459,17 +421,11 @@ def unfollow(acct)
       With the --followers option, the command removes all followers of the account.
     LONG_DESC
     def reset_relationships(username)
-      unless options[:follows] || options[:followers]
-        say('Please specify either --follows or --followers, or both', :red)
-        exit(1)
-      end
+      fail_with_message 'Please specify either --follows or --followers, or both' unless options[:follows] || options[:followers]
 
       account = Account.find_local(username)
 
-      if account.nil?
-        say('No such account', :red)
-        exit(1)
-      end
+      fail_with_message 'No such account' if account.nil?
 
       total     = 0
       total    += account.following.reorder(nil).count if options[:follows]
@@ -515,6 +471,8 @@ def reset_relationships(username)
       account identified by its username.
     LONG_DESC
     def approve(username = nil)
+      fail_with_message 'Number must be positive' if options[:number]&.negative?
+
       if options[:all]
         User.pending.find_each(&:approve!)
         say('OK', :green)
@@ -524,16 +482,10 @@ def approve(username = nil)
       elsif username.present?
         account = Account.find_local(username)
 
-        if account.nil?
-          say('No such account', :red)
-          exit(1)
-        end
+        fail_with_message 'No such account' if account.nil?
 
         account.user&.approve!
         say('OK', :green)
-      else
-        say('Number must be positive', :red) if options[:number]
-        exit(1)
       end
     end
 
@@ -587,56 +539,34 @@ def prune
       redirects to a different account that the one specified.
     LONG_DESC
     def migrate(username)
-      if options[:replay].present? && options[:target].present?
-        say('Use --replay or --target, not both', :red)
-        exit(1)
-      end
+      fail_with_message 'Use --replay or --target, not both' if options[:replay].present? && options[:target].present?
 
-      if options[:replay].blank? && options[:target].blank?
-        say('Use either --replay or --target', :red)
-        exit(1)
-      end
+      fail_with_message 'Use either --replay or --target' if options[:replay].blank? && options[:target].blank?
 
       account = Account.find_local(username)
 
-      if account.nil?
-        say("No such account: #{username}", :red)
-        exit(1)
-      end
+      fail_with_message "No such account: #{username}" if account.nil?
 
       migration = nil
 
       if options[:replay]
         migration = account.migrations.last
-        if migration.nil?
-          say('The specified account has not performed any migration', :red)
-          exit(1)
-        end
+        fail_with_message 'The specified account has not performed any migration' if migration.nil?
 
-        unless options[:force] || migration.target_account_id == account.moved_to_account_id
-          say('The specified account is not redirecting to its last migration target. Use --force if you want to replay the migration anyway', :red)
-          exit(1)
-        end
+        fail_with_message 'The specified account is not redirecting to its last migration target. Use --force if you want to replay the migration anyway' unless options[:force] || migration.target_account_id == account.moved_to_account_id
       end
 
       if options[:target]
         target_account = ResolveAccountService.new.call(options[:target])
 
-        if target_account.nil?
-          say("The specified target account could not be found: #{options[:target]}", :red)
-          exit(1)
-        end
+        fail_with_message "The specified target account could not be found: #{options[:target]}" if target_account.nil?
 
-        unless options[:force] || account.moved_to_account_id.nil? || account.moved_to_account_id == target_account.id
-          say('The specified account is redirecting to a different target account. Use --force if you want to change the migration target', :red)
-          exit(1)
-        end
+        fail_with_message 'The specified account is redirecting to a different target account. Use --force if you want to change the migration target' unless options[:force] || account.moved_to_account_id.nil? || account.moved_to_account_id == target_account.id
 
         begin
           migration = account.migrations.create!(acct: target_account.acct)
         rescue ActiveRecord::RecordInvalid => e
-          say("Error: #{e.message}", :red)
-          exit(1)
+          fail_with_message "Error: #{e.message}"
         end
       end
 
@@ -648,18 +578,18 @@ def migrate(username)
     private
 
     def report_errors(errors)
-      errors.each do |error|
-        say('Failure/Error: ', :red)
-        say(error.attribute)
-        say("    #{error.type}", :red)
-      end
+      message = errors.map do |error|
+        <<~STRING
+          Failure/Error: #{error.attribute}
+              #{error.type}
+        STRING
+      end.join
+
+      fail_with_message message
     end
 
     def rotate_keys_for_account(account, delay = 0)
-      if account.nil?
-        say('No such account', :red)
-        exit(1)
-      end
+      fail_with_message 'No such account' if account.nil?
 
       old_key = account.private_key
       new_key = OpenSSL::PKey::RSA.new(2048)
diff --git a/lib/mastodon/cli/base.rb b/lib/mastodon/cli/base.rb
index 8c222bbb2b3040..93dec1fb8fefc3 100644
--- a/lib/mastodon/cli/base.rb
+++ b/lib/mastodon/cli/base.rb
@@ -18,6 +18,10 @@ def self.exit_on_failure?
 
       private
 
+      def fail_with_message(message)
+        raise Thor::Error, message
+      end
+
       def pastel
         @pastel ||= Pastel.new
       end
diff --git a/lib/mastodon/cli/cache.rb b/lib/mastodon/cli/cache.rb
index e8a2ac1610aa47..f32ab292ee29b2 100644
--- a/lib/mastodon/cli/cache.rb
+++ b/lib/mastodon/cli/cache.rb
@@ -31,8 +31,7 @@ def recount(type)
           recount_status_stats(status)
         end
       else
-        say("Unknown type: #{type}", :red)
-        exit(1)
+        fail_with_message "Unknown type: #{type}"
       end
 
       say
diff --git a/lib/mastodon/cli/domains.rb b/lib/mastodon/cli/domains.rb
index e092497dc9edb6..c247463af52b13 100644
--- a/lib/mastodon/cli/domains.rb
+++ b/lib/mastodon/cli/domains.rb
@@ -41,11 +41,9 @@ def purge(*domains)
 
       # Sanity check on command arguments
       if options[:limited_federation_mode] && !domains.empty?
-        say('DOMAIN parameter not supported with --limited-federation-mode', :red)
-        exit(1)
+        fail_with_message 'DOMAIN parameter not supported with --limited-federation-mode'
       elsif domains.empty? && !options[:limited_federation_mode]
-        say('No domain(s) given', :red)
-        exit(1)
+        fail_with_message 'No domain(s) given'
       end
 
       # Build scopes from command arguments
diff --git a/lib/mastodon/cli/email_domain_blocks.rb b/lib/mastodon/cli/email_domain_blocks.rb
index 022b1dcbb17ec3..6b9107c8ade6a6 100644
--- a/lib/mastodon/cli/email_domain_blocks.rb
+++ b/lib/mastodon/cli/email_domain_blocks.rb
@@ -30,10 +30,7 @@ def list
       it at the root.
     LONG_DESC
     def add(*domains)
-      if domains.empty?
-        say('No domain(s) given', :red)
-        exit(1)
-      end
+      fail_with_message 'No domain(s) given' if domains.empty?
 
       skipped = 0
       processed = 0
@@ -76,10 +73,7 @@ def add(*domains)
 
     desc 'remove DOMAIN...', 'Remove e-mail domain blocks'
     def remove(*domains)
-      if domains.empty?
-        say('No domain(s) given', :red)
-        exit(1)
-      end
+      fail_with_message 'No domain(s) given' if domains.empty?
 
       skipped = 0
       processed = 0
diff --git a/lib/mastodon/cli/emoji.rb b/lib/mastodon/cli/emoji.rb
index 912c0991240374..4a8949de0e412c 100644
--- a/lib/mastodon/cli/emoji.rb
+++ b/lib/mastodon/cli/emoji.rb
@@ -86,14 +86,8 @@ def export(path)
       category         = CustomEmojiCategory.find_by(name: options[:category])
       export_file_name = File.join(path, 'export.tar.gz')
 
-      if File.file?(export_file_name) && !options[:overwrite]
-        say("Archive already exists! Use '--overwrite' to overwrite it!")
-        exit 1
-      end
-      if category.nil? && options[:category]
-        say("Unable to find category '#{options[:category]}'!")
-        exit 1
-      end
+      fail_with_message "Archive already exists! Use '--overwrite' to overwrite it!" if File.file?(export_file_name) && !options[:overwrite]
+      fail_with_message "Unable to find category '#{options[:category]}'!" if category.nil? && options[:category]
 
       File.open(export_file_name, 'wb') do |file|
         Zlib::GzipWriter.wrap(file) do |gzip|
diff --git a/lib/mastodon/cli/federation.rb b/lib/mastodon/cli/federation.rb
index 8bb46ecb1ae5af..c7387965573d3c 100644
--- a/lib/mastodon/cli/federation.rb
+++ b/lib/mastodon/cli/federation.rb
@@ -43,10 +43,10 @@ def self_destruct
             say('Every deletion notice has been sent! You can safely delete all data and decomission your servers!', :green)
           end
 
-          exit(0)
+          raise(SystemExit)
         end
 
-        exit(1) unless ask('Type in the domain of the server to confirm:') == Rails.configuration.x.local_domain
+        fail_with_message 'Domains do not match. Stopping self-destruct initiation.' unless domain_match_confirmed?
 
         say(<<~WARNING, :yellow)
           This operation WILL NOT be reversible.
@@ -54,19 +54,25 @@ def self_destruct
           The deletion process itself may take a long time, and will be handled by Sidekiq, so do not shut it down until it has finished (you will be able to re-run this command to see the state of the self-destruct process).
         WARNING
 
-        exit(1) if no?('Are you sure you want to proceed?')
+        fail_with_message 'Operation cancelled. Self-destruct will not begin.' if proceed_prompt_negative?
 
         say(<<~INSTRUCTIONS, :green)
           To switch Mastodon to self-destruct mode, add the following variable to your evironment (e.g. by adding a line to your `.env.production`) and restart all Mastodon processes:
             SELF_DESTRUCT=#{self_destruct_value}
           You can re-run this command to see the state of the self-destruct process.
         INSTRUCTIONS
-      rescue Interrupt
-        exit(1)
       end
 
       private
 
+      def domain_match_confirmed?
+        ask('Type in the domain of the server to confirm:') == Rails.configuration.x.local_domain
+      end
+
+      def proceed_prompt_negative?
+        no?('Are you sure you want to proceed?')
+      end
+
       def self_destruct_value
         Rails
           .application
diff --git a/lib/mastodon/cli/feeds.rb b/lib/mastodon/cli/feeds.rb
index 3467dd427cf7f6..39affd5e8ee9e7 100644
--- a/lib/mastodon/cli/feeds.rb
+++ b/lib/mastodon/cli/feeds.rb
@@ -27,17 +27,13 @@ def build(username = nil)
       elsif username.present?
         account = Account.find_local(username)
 
-        if account.nil?
-          say('No such account', :red)
-          exit(1)
-        end
+        fail_with_message 'No such account' if account.nil?
 
         PrecomputeFeedService.new.call(account) unless dry_run?
 
         say("OK #{dry_run_mode_suffix}", :green, true)
       else
-        say('No account(s) given', :red)
-        exit(1)
+        fail_with_message 'No account(s) given'
       end
     end
 
diff --git a/lib/mastodon/cli/ip_blocks.rb b/lib/mastodon/cli/ip_blocks.rb
index d12919c36015a7..100bf7bada587a 100644
--- a/lib/mastodon/cli/ip_blocks.rb
+++ b/lib/mastodon/cli/ip_blocks.rb
@@ -20,10 +20,7 @@ class IpBlocks < Base
       option to overwrite it.
     LONG_DESC
     def add(*addresses)
-      if addresses.empty?
-        say('No IP(s) given', :red)
-        exit(1)
-      end
+      fail_with_message 'No IP(s) given' if addresses.empty?
 
       skipped   = 0
       processed = 0
@@ -70,10 +67,7 @@ def add(*addresses)
       cover the given IP(s).
     LONG_DESC
     def remove(*addresses)
-      if addresses.empty?
-        say('No IP(s) given', :red)
-        exit(1)
-      end
+      fail_with_message 'No IP(s) given' if addresses.empty?
 
       processed = 0
       skipped   = 0
diff --git a/lib/mastodon/cli/maintenance.rb b/lib/mastodon/cli/maintenance.rb
index a64206065d518a..9f234e386030d4 100644
--- a/lib/mastodon/cli/maintenance.rb
+++ b/lib/mastodon/cli/maintenance.rb
@@ -199,26 +199,24 @@ def schema_has_instances_view?
 
     def verify_schema_version!
       if migrator_version < MIN_SUPPORTED_VERSION
-        say 'Your version of the database schema is too old and is not supported by this script.', :red
-        say 'Please update to at least Mastodon 3.0.0 before running this script.', :red
-        exit(1)
+        fail_with_message <<~ERROR
+          Your version of the database schema is too old and is not supported by this script.
+          Please update to at least Mastodon 3.0.0 before running this script.
+        ERROR
       elsif migrator_version > MAX_SUPPORTED_VERSION
         say 'Your version of the database schema is more recent than this script, this may cause unexpected errors.', :yellow
-        exit(1) unless yes?('Continue anyway? (Yes/No)')
+        fail_with_message 'Stopping maintenance script because data is more recent than script version.' unless yes?('Continue anyway? (Yes/No)')
       end
     end
 
     def verify_sidekiq_not_active!
-      if Sidekiq::ProcessSet.new.any?
-        say 'It seems Sidekiq is running. All Mastodon processes need to be stopped when using this script.', :red
-        exit(1)
-      end
+      fail_with_message 'It seems Sidekiq is running. All Mastodon processes need to be stopped when using this script.' if Sidekiq::ProcessSet.new.any?
     end
 
     def verify_backup_warning!
       say 'This task will take a long time to run and is potentially destructive.', :yellow
       say 'Please make sure to stop Mastodon and have a backup.', :yellow
-      exit(1) unless yes?('Continue? (Yes/No)')
+      fail_with_message 'Maintenance process stopped.' unless yes?('Continue? (Yes/No)')
     end
 
     def deduplicate_accounts!
diff --git a/lib/mastodon/cli/media.rb b/lib/mastodon/cli/media.rb
index a796bb729a73d6..87946e0262f35b 100644
--- a/lib/mastodon/cli/media.rb
+++ b/lib/mastodon/cli/media.rb
@@ -31,15 +31,9 @@ class Media < Base
       following anyone locally are pruned.
     DESC
     def remove
-      if options[:prune_profiles] && options[:remove_headers]
-        say('--prune-profiles and --remove-headers should not be specified simultaneously', :red, true)
-        exit(1)
-      end
+      fail_with_message '--prune-profiles and --remove-headers should not be specified simultaneously' if options[:prune_profiles] && options[:remove_headers]
 
-      if options[:include_follows] && !(options[:prune_profiles] || options[:remove_headers])
-        say('--include-follows can only be used with --prune-profiles or --remove-headers', :red, true)
-        exit(1)
-      end
+      fail_with_message '--include-follows can only be used with --prune-profiles or --remove-headers' if options[:include_follows] && !(options[:prune_profiles] || options[:remove_headers])
       time_ago = options[:days].days.ago
 
       if options[:prune_profiles] || options[:remove_headers]
@@ -156,11 +150,9 @@ def remove_orphans
           end
         end
       when :fog
-        say('The fog storage driver is not supported for this operation at this time', :red)
-        exit(1)
+        fail_with_message 'The fog storage driver is not supported for this operation at this time'
       when :azure
-        say('The azure storage driver is not supported for this operation at this time', :red)
-        exit(1)
+        fail_with_message 'The azure storage driver is not supported for this operation at this time'
       when :filesystem
         require 'find'
 
@@ -254,10 +246,7 @@ def refresh
         username, domain = options[:account].split('@')
         account = Account.find_remote(username, domain)
 
-        if account.nil?
-          say('No such account', :red)
-          exit(1)
-        end
+        fail_with_message 'No such account' if account.nil?
 
         scope = MediaAttachment.where(account_id: account.id)
       elsif options[:domain]
@@ -265,8 +254,7 @@ def refresh
       elsif options[:days].present?
         scope = MediaAttachment.remote
       else
-        say('Specify the source of media attachments', :red)
-        exit(1)
+        fail_with_message 'Specify the source of media attachments'
       end
 
       scope = scope.where('media_attachments.id > ?', Mastodon::Snowflake.id_at(options[:days].days.ago, with_random: false)) if options[:days].present?
@@ -306,38 +294,25 @@ def lookup(url)
       path_segments = path.split('/')[2..]
       path_segments.delete('cache')
 
-      unless VALID_PATH_SEGMENTS_SIZE.include?(path_segments.size)
-        say('Not a media URL', :red)
-        exit(1)
-      end
+      fail_with_message 'Not a media URL' unless VALID_PATH_SEGMENTS_SIZE.include?(path_segments.size)
 
       model_name = path_segments.first.classify
       record_id  = path_segments[2..-2].join.to_i
 
-      unless PRELOAD_MODEL_WHITELIST.include?(model_name)
-        say("Cannot find corresponding model: #{model_name}", :red)
-        exit(1)
-      end
+      fail_with_message "Cannot find corresponding model: #{model_name}" unless PRELOAD_MODEL_WHITELIST.include?(model_name)
 
       record = model_name.constantize.find_by(id: record_id)
       record = record.status if record.respond_to?(:status)
 
-      unless record
-        say('Cannot find corresponding record', :red)
-        exit(1)
-      end
+      fail_with_message 'Cannot find corresponding record' unless record
 
       display_url = ActivityPub::TagManager.instance.url_for(record)
 
-      if display_url.blank?
-        say('No public URL for this type of record', :red)
-        exit(1)
-      end
+      fail_with_message 'No public URL for this type of record' if display_url.blank?
 
       say(display_url, :blue)
     rescue Addressable::URI::InvalidURIError
-      say('Invalid URL', :red)
-      exit(1)
+      fail_with_message 'Invalid URL'
     end
 
     private
diff --git a/lib/mastodon/cli/progress_helper.rb b/lib/mastodon/cli/progress_helper.rb
index 1fa2745c180453..4fcc47a7f74b2f 100644
--- a/lib/mastodon/cli/progress_helper.rb
+++ b/lib/mastodon/cli/progress_helper.rb
@@ -25,10 +25,7 @@ def create_progress_bar(total = nil)
     end
 
     def parallelize_with_progress(scope)
-      if options[:concurrency] < 1
-        say('Cannot run with this concurrency setting, must be at least 1', :red)
-        exit(1)
-      end
+      fail_with_message 'Cannot run with this concurrency setting, must be at least 1' if options[:concurrency] < 1
 
       reset_connection_pools!
 
diff --git a/lib/mastodon/cli/search.rb b/lib/mastodon/cli/search.rb
index 77c455f0498bda..5901c07776b337 100644
--- a/lib/mastodon/cli/search.rb
+++ b/lib/mastodon/cli/search.rb
@@ -110,17 +110,11 @@ def verify_deploy_options!
     end
 
     def verify_deploy_concurrency!
-      return unless options[:concurrency] < 1
-
-      say('Cannot run with this concurrency setting, must be at least 1', :red)
-      exit(1)
+      fail_with_message 'Cannot run with this concurrency setting, must be at least 1' if options[:concurrency] < 1
     end
 
     def verify_deploy_batch_size!
-      return unless options[:batch_size] < 1
-
-      say('Cannot run with this batch_size setting, must be at least 1', :red)
-      exit(1)
+      fail_with_message 'Cannot run with this batch_size setting, must be at least 1' if options[:batch_size] < 1
     end
 
     def progress_output_options
diff --git a/lib/mastodon/cli/statuses.rb b/lib/mastodon/cli/statuses.rb
index 48d76e028850f1..57b03c941c4a87 100644
--- a/lib/mastodon/cli/statuses.rb
+++ b/lib/mastodon/cli/statuses.rb
@@ -26,10 +26,7 @@ class Statuses < Base
       indices before commencing, and removes them afterward.
     LONG_DESC
     def remove
-      if options[:batch_size] < 1
-        say('Cannot run with this batch_size setting, must be at least 1', :red)
-        exit(1)
-      end
+      fail_with_message 'Cannot run with this batch_size setting, must be at least 1' if options[:batch_size] < 1
 
       remove_statuses
       vacuum_and_analyze_statuses
diff --git a/lib/mastodon/cli/upgrade.rb b/lib/mastodon/cli/upgrade.rb
index cf839868448762..2cb510579484a5 100644
--- a/lib/mastodon/cli/upgrade.rb
+++ b/lib/mastodon/cli/upgrade.rb
@@ -103,13 +103,11 @@ def upgrade_storage_s3(progress, attachment, style)
     end
 
     def upgrade_storage_fog(_progress, _attachment, _style)
-      say('The fog storage driver is not supported for this operation at this time', :red)
-      exit(1)
+      fail_with_message 'The fog storage driver is not supported for this operation at this time'
     end
 
     def upgrade_storage_azure(_progress, _attachment, _style)
-      say('The azure storage driver is not supported for this operation at this time', :red)
-      exit(1)
+      fail_with_message 'The azure storage driver is not supported for this operation at this time'
     end
 
     def upgrade_storage_filesystem(progress, attachment, style)
diff --git a/spec/lib/mastodon/cli/accounts_spec.rb b/spec/lib/mastodon/cli/accounts_spec.rb
index 26ad983bbced97..98be2b2027d43e 100644
--- a/spec/lib/mastodon/cli/accounts_spec.rb
+++ b/spec/lib/mastodon/cli/accounts_spec.rb
@@ -65,8 +65,7 @@ def account_from_options
 
           it 'exits with an error message' do
             expect { subject }
-              .to output_results('Failure/Error: email')
-              .and raise_error(SystemExit)
+              .to raise_error(Thor::Error, %r{Failure/Error: email})
           end
         end
       end
@@ -127,8 +126,7 @@ def account_from_options
 
           it 'exits with an error message indicating the role name was not found' do
             expect { subject }
-              .to output_results('Cannot find user role with that name')
-              .and raise_error(SystemExit)
+              .to raise_error(Thor::Error, 'Cannot find user role with that name')
           end
         end
       end
@@ -191,8 +189,7 @@ def account_from_options
 
       it 'exits with an error message indicating the user was not found' do
         expect { subject }
-          .to output_results('No user with such username')
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, 'No user with such username')
       end
     end
 
@@ -214,8 +211,7 @@ def account_from_options
 
           it 'exits with an error message indicating the role was not found' do
             expect { subject }
-              .to output_results('Cannot find user role with that name')
-              .and raise_error(SystemExit)
+              .to raise_error(Thor::Error, 'Cannot find user role with that name')
           end
         end
 
@@ -364,8 +360,7 @@ def account_from_options
 
         it 'exits with an error message' do
           expect { subject }
-            .to output_results('Failure/Error: email')
-            .and raise_error(SystemExit)
+            .to raise_error(Thor::Error, %r{Failure/Error: email})
         end
       end
     end
@@ -387,16 +382,14 @@ def account_from_options
 
       it 'exits with an error message indicating that only one should be used' do
         expect { subject }
-          .to output_results('Use username or --email, not both')
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, 'Use username or --email, not both')
       end
     end
 
     context 'when neither username nor --email are provided' do
       it 'exits with an error message indicating that no username was provided' do
         expect { subject }
-          .to output_results('No username provided')
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, 'No username provided')
       end
     end
 
@@ -425,8 +418,7 @@ def account_from_options
 
         it 'exits with an error message indicating that no user was found' do
           expect { subject }
-            .to output_results('No user with such username')
-            .and raise_error(SystemExit)
+            .to raise_error(Thor::Error, 'No user with such username')
         end
       end
     end
@@ -458,8 +450,7 @@ def account_from_options
 
         it 'exits with an error message indicating that no user was found' do
           expect { subject }
-            .to output_results('No user with such email')
-            .and raise_error(SystemExit)
+            .to raise_error(Thor::Error, 'No user with such email')
         end
       end
     end
@@ -511,8 +502,7 @@ def pending_registrations
 
         it 'exits with an error message indicating that the number must be positive' do
           expect { subject }
-            .to output_results('Number must be positive')
-            .and raise_error(SystemExit)
+            .to raise_error(Thor::Error, 'Number must be positive')
         end
       end
 
@@ -545,8 +535,7 @@ def pending_registrations
 
         it 'exits with an error message indicating that no such account was found' do
           expect { subject }
-            .to output_results('No such account')
-            .and raise_error(SystemExit)
+            .to raise_error(Thor::Error, 'No such account')
         end
       end
     end
@@ -560,8 +549,7 @@ def pending_registrations
 
       it 'exits with an error message indicating that no account with the given username was found' do
         expect { subject }
-          .to output_results('No such account')
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, 'No such account')
       end
     end
 
@@ -596,8 +584,7 @@ def pending_registrations
 
       it 'exits with an error message indicating that no account with the given username was found' do
         expect { subject }
-          .to output_results('No such account')
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, 'No such account')
       end
     end
 
@@ -634,8 +621,7 @@ def pending_registrations
 
       it 'exits with an error message indicating that there is no such account' do
         expect { subject }
-          .to output_results('No user with such username')
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, 'No user with such username')
       end
     end
 
@@ -795,8 +781,7 @@ def latest_backup
           allow(Account).to receive(:find_remote).with(account_example_com_b.username, account_example_com_b.domain).and_return(nil)
 
           expect { subject }
-            .to output_results('No such account')
-            .and raise_error(SystemExit)
+            .to raise_error(Thor::Error, 'No such account')
         end
       end
 
@@ -892,8 +877,7 @@ def latest_backup
     context 'when neither a list of accts nor options are provided' do
       it 'exits with an error message' do
         expect { subject }
-          .to output_results('No account(s) given')
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, 'No account(s) given')
       end
     end
   end
@@ -904,8 +888,7 @@ def latest_backup
     context 'when neither username nor --all option are given' do
       it 'exits with an error message' do
         expect { subject }
-          .to output_results('No account(s) given')
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, 'No account(s) given')
       end
     end
 
@@ -940,8 +923,7 @@ def latest_backup
 
       it 'exits with an error message when the specified username is not found' do
         expect { subject }
-          .to output_results('No such account')
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, 'No such account')
       end
     end
 
@@ -980,8 +962,7 @@ def latest_backup
     shared_examples 'an account not found' do |acct|
       it 'exits with an error message indicating that there is no such account' do
         expect { subject }
-          .to output_results("No such account (#{acct})")
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, "No such account (#{acct})")
       end
     end
 
@@ -1031,8 +1012,7 @@ def latest_backup
 
       it 'exits with an error message indicating that the accounts do not have the same pub key' do
         expect { subject }
-          .to output_results("Accounts don't have the same public key, might not be duplicates!\nOverride with --force")
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, "Accounts don't have the same public key, might not be duplicates!\nOverride with --force\n")
       end
 
       context 'with --force option' do
@@ -1200,8 +1180,7 @@ def expect_skip_accounts_from_unavailable_domain
     context 'when no option is given' do
       it 'exits with an error message indicating that at least one option is required' do
         expect { subject }
-          .to output_results('Please specify either --follows or --followers, or both')
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, 'Please specify either --follows or --followers, or both')
       end
     end
 
@@ -1211,8 +1190,7 @@ def expect_skip_accounts_from_unavailable_domain
 
       it 'exits with an error message indicating that there is no such account' do
         expect { subject }
-          .to output_results('No such account')
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, 'No such account')
       end
     end
 
@@ -1368,16 +1346,14 @@ def expect_no_account_prunes
 
       it 'exits with an error message indicating that using both options is not possible' do
         expect { subject }
-          .to output_results('Use --replay or --target, not both')
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, 'Use --replay or --target, not both')
       end
     end
 
     context 'when no option is given' do
       it 'exits with an error message indicating that at least one option must be used' do
         expect { subject }
-          .to output_results('Use either --replay or --target')
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, 'Use either --replay or --target')
       end
     end
 
@@ -1387,8 +1363,7 @@ def expect_no_account_prunes
 
       it 'exits with an error message indicating that there is no such account' do
         expect { subject }
-          .to output_results("No such account: #{arguments.first}")
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, "No such account: #{arguments.first}")
       end
     end
 
@@ -1398,8 +1373,7 @@ def expect_no_account_prunes
       context 'when the specified account has no previous migrations' do
         it 'exits with an error message indicating that the given account has no previous migrations' do
           expect { subject }
-            .to output_results('The specified account has not performed any migration')
-            .and raise_error(SystemExit)
+            .to raise_error(Thor::Error, 'The specified account has not performed any migration')
         end
       end
 
@@ -1421,8 +1395,7 @@ def expect_no_account_prunes
 
           it 'exits with an error message' do
             expect { subject }
-              .to output_results('The specified account is not redirecting to its last migration target. Use --force if you want to replay the migration anyway')
-              .and raise_error(SystemExit)
+              .to raise_error(Thor::Error, 'The specified account is not redirecting to its last migration target. Use --force if you want to replay the migration anyway')
           end
         end
 
@@ -1449,8 +1422,7 @@ def expect_no_account_prunes
 
         it 'exits with an error message indicating that there is no such account' do
           expect { subject }
-            .to output_results("The specified target account could not be found: #{options[:target]}")
-            .and raise_error(SystemExit)
+            .to raise_error(Thor::Error, "The specified target account could not be found: #{options[:target]}")
         end
       end
 
@@ -1474,8 +1446,7 @@ def expect_no_account_prunes
       context 'when the migration record is invalid' do
         it 'exits with an error indicating that the validation failed' do
           expect { subject }
-            .to output_results('Error: Validation failed')
-            .and raise_error(SystemExit)
+            .to raise_error(Thor::Error, /Error: Validation failed/)
         end
       end
 
@@ -1486,8 +1457,7 @@ def expect_no_account_prunes
 
         it 'exits with an error message' do
           expect { subject }
-            .to output_results('The specified account is redirecting to a different target account. Use --force if you want to change the migration target')
-            .and raise_error(SystemExit)
+            .to raise_error(Thor::Error, 'The specified account is redirecting to a different target account. Use --force if you want to change the migration target')
         end
       end
 
diff --git a/spec/lib/mastodon/cli/cache_spec.rb b/spec/lib/mastodon/cli/cache_spec.rb
index b1515801eb5e7a..247a14f9e2713f 100644
--- a/spec/lib/mastodon/cli/cache_spec.rb
+++ b/spec/lib/mastodon/cli/cache_spec.rb
@@ -64,8 +64,7 @@
 
       it 'Exits with an error message' do
         expect { subject }
-          .to output_results('Unknown')
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, /Unknown/)
       end
     end
   end
diff --git a/spec/lib/mastodon/cli/email_domain_blocks_spec.rb b/spec/lib/mastodon/cli/email_domain_blocks_spec.rb
index 13deb05b6cf277..55e3da0bb89be7 100644
--- a/spec/lib/mastodon/cli/email_domain_blocks_spec.rb
+++ b/spec/lib/mastodon/cli/email_domain_blocks_spec.rb
@@ -35,8 +35,7 @@
     context 'without any options' do
       it 'warns about usage and exits' do
         expect { subject }
-          .to output_results('No domain(s) given')
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, 'No domain(s) given')
       end
     end
 
@@ -72,8 +71,7 @@
     context 'without any options' do
       it 'warns about usage and exits' do
         expect { subject }
-          .to output_results('No domain(s) given')
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, 'No domain(s) given')
       end
     end
 
diff --git a/spec/lib/mastodon/cli/feeds_spec.rb b/spec/lib/mastodon/cli/feeds_spec.rb
index 199798052705a6..420cb3d5872893 100644
--- a/spec/lib/mastodon/cli/feeds_spec.rb
+++ b/spec/lib/mastodon/cli/feeds_spec.rb
@@ -42,8 +42,7 @@
 
       it 'displays an error and exits' do
         expect { subject }
-          .to output_results('No such account')
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, 'No such account')
       end
     end
   end
diff --git a/spec/lib/mastodon/cli/ip_blocks_spec.rb b/spec/lib/mastodon/cli/ip_blocks_spec.rb
index 82be10813ed02a..d44b1b9fe44e3e 100644
--- a/spec/lib/mastodon/cli/ip_blocks_spec.rb
+++ b/spec/lib/mastodon/cli/ip_blocks_spec.rb
@@ -144,8 +144,7 @@ def blocked_ips_severity
 
       it 'exits with an error message' do
         expect { subject }
-          .to output_results('No IP(s) given')
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, 'No IP(s) given')
       end
     end
   end
@@ -235,8 +234,7 @@ def other_ranges
     context 'when no IP address is provided' do
       it 'exits with an error message' do
         expect { subject }
-          .to output_results('No IP(s) given')
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, 'No IP(s) given')
       end
     end
   end
diff --git a/spec/lib/mastodon/cli/main_spec.rb b/spec/lib/mastodon/cli/main_spec.rb
index 081cd2dd47df0a..99d770a81dd188 100644
--- a/spec/lib/mastodon/cli/main_spec.rb
+++ b/spec/lib/mastodon/cli/main_spec.rb
@@ -104,9 +104,9 @@
           answer_hostname_incorrectly
         end
 
-        it 'exits silently' do
+        it 'exits with mismatch error message' do
           expect { subject }
-            .to raise_error(SystemExit)
+            .to raise_error(Thor::Error, /Domains do not match/)
         end
       end
 
@@ -119,7 +119,7 @@
         it 'passes first step but stops before instructions' do
           expect { subject }
             .to output_results('operation WILL NOT')
-            .and raise_error(SystemExit)
+            .and raise_error(Thor::Error, /Self-destruct will not begin/)
         end
       end
 
diff --git a/spec/lib/mastodon/cli/maintenance_spec.rb b/spec/lib/mastodon/cli/maintenance_spec.rb
index ca492bbf69c8c9..cde25d39eda357 100644
--- a/spec/lib/mastodon/cli/maintenance_spec.rb
+++ b/spec/lib/mastodon/cli/maintenance_spec.rb
@@ -22,8 +22,7 @@
 
       it 'Exits with error message' do
         expect { subject }
-          .to output_results('is too old')
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, /is too old/)
       end
     end
 
@@ -36,7 +35,7 @@
       it 'Exits with error message' do
         expect { subject }
           .to output_results('more recent')
-          .and raise_error(SystemExit)
+          .and raise_error(Thor::Error, /more recent/)
       end
     end
 
@@ -48,8 +47,7 @@
 
       it 'Exits with error message' do
         expect { subject }
-          .to output_results('Sidekiq is running')
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, /Sidekiq is running/)
       end
     end
 
diff --git a/spec/lib/mastodon/cli/media_spec.rb b/spec/lib/mastodon/cli/media_spec.rb
index 10005107aa510a..ecc7101b6cf8c8 100644
--- a/spec/lib/mastodon/cli/media_spec.rb
+++ b/spec/lib/mastodon/cli/media_spec.rb
@@ -20,8 +20,7 @@
 
       it 'warns about usage and exits' do
         expect { subject }
-          .to output_results('--prune-profiles and --remove-headers should not be specified simultaneously')
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, '--prune-profiles and --remove-headers should not be specified simultaneously')
       end
     end
 
@@ -30,8 +29,7 @@
 
       it 'warns about usage and exits' do
         expect { subject }
-          .to output_results('--include-follows can only be used with --prune-profiles or --remove-headers')
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, '--include-follows can only be used with --prune-profiles or --remove-headers')
       end
     end
 
@@ -98,8 +96,7 @@
 
       it 'warns about url and exits' do
         expect { subject }
-          .to output_results('Not a media URL')
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, 'Not a media URL')
       end
     end
 
@@ -121,8 +118,7 @@
     context 'without any options' do
       it 'warns about usage and exits' do
         expect { subject }
-          .to output_results('Specify the source')
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, /Specify the source/)
       end
     end
 
@@ -147,8 +143,7 @@
 
         it 'warns about usage and exits' do
           expect { subject }
-            .to output_results('No such account')
-            .and raise_error(SystemExit)
+            .to raise_error(Thor::Error, 'No such account')
         end
       end
 
@@ -221,8 +216,7 @@
 
       it 'warns about usage and exits' do
         expect { subject }
-          .to output_results('azure storage driver is not supported')
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, /azure storage driver is not supported/)
       end
     end
 
@@ -233,8 +227,7 @@
 
       it 'warns about usage and exits' do
         expect { subject }
-          .to output_results('fog storage driver is not supported')
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, /fog storage driver is not supported/)
       end
     end
 
diff --git a/spec/lib/mastodon/cli/search_spec.rb b/spec/lib/mastodon/cli/search_spec.rb
index cb0c80c11dbfd7..8cce2c6ee22a96 100644
--- a/spec/lib/mastodon/cli/search_spec.rb
+++ b/spec/lib/mastodon/cli/search_spec.rb
@@ -20,8 +20,7 @@
 
       it 'Exits with error message' do
         expect { subject }
-          .to output_results('this concurrency setting')
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, /this concurrency setting/)
       end
     end
 
@@ -30,8 +29,7 @@
 
       it 'Exits with error message' do
         expect { subject }
-          .to output_results('this batch_size setting')
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, /this batch_size setting/)
       end
     end
 
diff --git a/spec/lib/mastodon/cli/statuses_spec.rb b/spec/lib/mastodon/cli/statuses_spec.rb
index 63d494bbb65203..161b7c02bbf64a 100644
--- a/spec/lib/mastodon/cli/statuses_spec.rb
+++ b/spec/lib/mastodon/cli/statuses_spec.rb
@@ -20,8 +20,7 @@
 
       it 'exits with error message' do
         expect { subject }
-          .to output_results('Cannot run')
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, /Cannot run/)
       end
     end
 

From 45287049abc0587ece709acc1d366f9e1acc3d71 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 26 Jan 2024 10:15:55 +0100
Subject: [PATCH 0004/2191] New Crowdin Translations (automated) (#28923)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/af.json      | 16 ------
 app/javascript/mastodon/locales/an.json      | 21 --------
 app/javascript/mastodon/locales/ar.json      | 21 --------
 app/javascript/mastodon/locales/ast.json     | 16 +-----
 app/javascript/mastodon/locales/be.json      | 21 --------
 app/javascript/mastodon/locales/bg.json      | 36 +++++++-------
 app/javascript/mastodon/locales/bn.json      | 18 -------
 app/javascript/mastodon/locales/br.json      | 21 --------
 app/javascript/mastodon/locales/bs.json      |  2 -
 app/javascript/mastodon/locales/ca.json      | 34 ++++++-------
 app/javascript/mastodon/locales/ckb.json     | 21 --------
 app/javascript/mastodon/locales/co.json      | 16 ------
 app/javascript/mastodon/locales/cs.json      | 21 --------
 app/javascript/mastodon/locales/cy.json      | 21 --------
 app/javascript/mastodon/locales/da.json      | 37 +++++++-------
 app/javascript/mastodon/locales/de.json      | 41 ++++++++--------
 app/javascript/mastodon/locales/el.json      | 51 +++++++++++++-------
 app/javascript/mastodon/locales/en-GB.json   | 21 --------
 app/javascript/mastodon/locales/eo.json      | 21 --------
 app/javascript/mastodon/locales/es-AR.json   | 27 ++++-------
 app/javascript/mastodon/locales/es-MX.json   | 39 ++++++++-------
 app/javascript/mastodon/locales/es.json      | 31 +++++-------
 app/javascript/mastodon/locales/et.json      | 32 ++++++------
 app/javascript/mastodon/locales/eu.json      | 37 +++++++-------
 app/javascript/mastodon/locales/fa.json      | 33 ++++++-------
 app/javascript/mastodon/locales/fi.json      | 37 +++++++-------
 app/javascript/mastodon/locales/fo.json      | 37 +++++++-------
 app/javascript/mastodon/locales/fr-CA.json   | 21 --------
 app/javascript/mastodon/locales/fr.json      | 21 --------
 app/javascript/mastodon/locales/fy.json      | 21 --------
 app/javascript/mastodon/locales/ga.json      | 15 ------
 app/javascript/mastodon/locales/gd.json      | 21 --------
 app/javascript/mastodon/locales/gl.json      | 21 --------
 app/javascript/mastodon/locales/he.json      | 38 +++++++--------
 app/javascript/mastodon/locales/hi.json      | 19 --------
 app/javascript/mastodon/locales/hr.json      | 20 --------
 app/javascript/mastodon/locales/hu.json      | 41 ++++++++--------
 app/javascript/mastodon/locales/hy.json      | 19 --------
 app/javascript/mastodon/locales/ia.json      | 11 -----
 app/javascript/mastodon/locales/id.json      | 21 --------
 app/javascript/mastodon/locales/ie.json      | 30 +++++-------
 app/javascript/mastodon/locales/ig.json      |  3 --
 app/javascript/mastodon/locales/io.json      | 21 --------
 app/javascript/mastodon/locales/is.json      | 33 ++++++-------
 app/javascript/mastodon/locales/it.json      | 39 ++++++++-------
 app/javascript/mastodon/locales/ja.json      | 21 --------
 app/javascript/mastodon/locales/ka.json      | 11 -----
 app/javascript/mastodon/locales/kab.json     | 18 -------
 app/javascript/mastodon/locales/kk.json      | 15 ------
 app/javascript/mastodon/locales/kn.json      |  4 --
 app/javascript/mastodon/locales/ko.json      | 37 +++++++-------
 app/javascript/mastodon/locales/ku.json      | 21 --------
 app/javascript/mastodon/locales/kw.json      | 16 ------
 app/javascript/mastodon/locales/la.json      |  6 ---
 app/javascript/mastodon/locales/lad.json     | 21 --------
 app/javascript/mastodon/locales/lt.json      | 34 ++++++-------
 app/javascript/mastodon/locales/lv.json      | 21 --------
 app/javascript/mastodon/locales/mk.json      | 13 -----
 app/javascript/mastodon/locales/ml.json      | 12 -----
 app/javascript/mastodon/locales/mr.json      |  8 ---
 app/javascript/mastodon/locales/ms.json      | 21 --------
 app/javascript/mastodon/locales/my.json      | 21 --------
 app/javascript/mastodon/locales/ne.json      |  9 +---
 app/javascript/mastodon/locales/nl.json      | 41 ++++++++--------
 app/javascript/mastodon/locales/nn.json      | 40 ++++++++-------
 app/javascript/mastodon/locales/no.json      | 34 ++++++-------
 app/javascript/mastodon/locales/oc.json      | 21 --------
 app/javascript/mastodon/locales/pa.json      |  6 ---
 app/javascript/mastodon/locales/pl.json      | 26 ++++------
 app/javascript/mastodon/locales/pt-BR.json   | 33 ++++++-------
 app/javascript/mastodon/locales/pt-PT.json   | 35 +++++++-------
 app/javascript/mastodon/locales/ro.json      | 21 --------
 app/javascript/mastodon/locales/ru.json      | 21 --------
 app/javascript/mastodon/locales/sa.json      | 20 --------
 app/javascript/mastodon/locales/sc.json      | 18 -------
 app/javascript/mastodon/locales/sco.json     | 21 --------
 app/javascript/mastodon/locales/si.json      | 16 ------
 app/javascript/mastodon/locales/sk.json      | 21 --------
 app/javascript/mastodon/locales/sl.json      | 21 --------
 app/javascript/mastodon/locales/sq.json      | 41 ++++++++--------
 app/javascript/mastodon/locales/sr-Latn.json | 21 --------
 app/javascript/mastodon/locales/sr.json      | 39 ++++++++-------
 app/javascript/mastodon/locales/sv.json      | 31 ++++--------
 app/javascript/mastodon/locales/szl.json     |  2 -
 app/javascript/mastodon/locales/ta.json      | 18 -------
 app/javascript/mastodon/locales/tai.json     |  2 -
 app/javascript/mastodon/locales/te.json      | 13 -----
 app/javascript/mastodon/locales/th.json      | 21 --------
 app/javascript/mastodon/locales/tr.json      | 21 --------
 app/javascript/mastodon/locales/tt.json      | 17 -------
 app/javascript/mastodon/locales/ug.json      |  2 -
 app/javascript/mastodon/locales/uk.json      | 22 +--------
 app/javascript/mastodon/locales/ur.json      | 16 ------
 app/javascript/mastodon/locales/uz.json      | 14 ------
 app/javascript/mastodon/locales/vi.json      | 21 --------
 app/javascript/mastodon/locales/zgh.json     |  7 ---
 app/javascript/mastodon/locales/zh-CN.json   | 35 +++++++-------
 app/javascript/mastodon/locales/zh-HK.json   | 39 ++++++++-------
 app/javascript/mastodon/locales/zh-TW.json   | 35 +++++++-------
 config/locales/bg.yml                        |  3 ++
 config/locales/eu.yml                        |  6 +--
 config/locales/fa.yml                        |  1 +
 config/locales/hi.yml                        |  9 ++++
 config/locales/hu.yml                        |  3 +-
 config/locales/ie.yml                        |  3 ++
 config/locales/ja.yml                        |  3 ++
 config/locales/zh-TW.yml                     |  2 +-
 107 files changed, 568 insertions(+), 1727 deletions(-)

diff --git a/app/javascript/mastodon/locales/af.json b/app/javascript/mastodon/locales/af.json
index d1873d6dce1e5d..d2ac2f8f27f45d 100644
--- a/app/javascript/mastodon/locales/af.json
+++ b/app/javascript/mastodon/locales/af.json
@@ -66,7 +66,6 @@
   "alert.unexpected.message": "Iets het skeefgeloop.",
   "alert.unexpected.title": "Oeps!",
   "announcement.announcement": "Aankondiging",
-  "autosuggest_hashtag.per_week": "{count} per week",
   "boost_modal.combo": "Druk {combo} om dit volgende keer oor te slaan",
   "bundle_column_error.error.title": "Ag nee!",
   "bundle_column_error.network.title": "Netwerkfout",
@@ -111,19 +110,12 @@
   "compose_form.lock_disclaimer": "Jou rekening is nie {locked} nie. Enigiemand kan jou volg en sien wat jy vir jou volgers plaas.",
   "compose_form.lock_disclaimer.lock": "gesluit",
   "compose_form.placeholder": "Wat wil jy deel?",
-  "compose_form.poll.add_option": "Voeg ’n keuse by",
   "compose_form.poll.duration": "Duur van peiling",
-  "compose_form.poll.option_placeholder": "Keuse {number}",
-  "compose_form.poll.remove_option": "Verwyder hierdie keuse",
   "compose_form.poll.switch_to_multiple": "Verander peiling om meer as een keuse toe te laat",
   "compose_form.poll.switch_to_single": "Verander die peiling om slegs een keuse toe te laat",
-  "compose_form.publish": "Publiseer",
   "compose_form.publish_form": "Publiseer",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Stoor veranderinge",
   "compose_form.spoiler.marked": "Verwyder inhoudswaarskuwing",
   "compose_form.spoiler.unmarked": "Voeg inhoudswaarskuwing by",
-  "compose_form.spoiler_placeholder": "Skryf jou waarskuwing hier",
   "confirmation_modal.cancel": "Kanselleer",
   "confirmations.block.block_and_report": "Blokkeer en rapporteer",
   "confirmations.block.confirm": "Blokkeer",
@@ -234,7 +226,6 @@
   "navigation_bar.community_timeline": "Plaaslike tydlyn",
   "navigation_bar.compose": "Skep nuwe plasing",
   "navigation_bar.domain_blocks": "Geblokkeerde domeine",
-  "navigation_bar.edit_profile": "Redigeer profiel",
   "navigation_bar.lists": "Lyste",
   "navigation_bar.logout": "Teken uit",
   "navigation_bar.personal": "Persoonlik",
@@ -267,14 +258,7 @@
   "onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
   "onboarding.steps.share_profile.title": "Share your profile",
   "privacy.change": "Verander privaatheid van plasing",
-  "privacy.direct.long": "Slegs sigbaar vir genoemde gebruikers",
-  "privacy.direct.short": "Slegs genoemde persone",
-  "privacy.private.long": "Slegs sigbaar vir volgelinge",
-  "privacy.private.short": "Slegs volgelinge",
-  "privacy.public.long": "Sigbaar vir almal",
   "privacy.public.short": "Publiek",
-  "privacy.unlisted.long": "Sigbaar vir almal, maar onttrek uit verkennings-kenmerke",
-  "privacy.unlisted.short": "Ongelys",
   "privacy_policy.last_updated": "Laaste bywerking op {date}",
   "privacy_policy.title": "Privaatheidsbeleid",
   "regeneration_indicator.sublabel": "Jou tuis-voer word voorberei!",
diff --git a/app/javascript/mastodon/locales/an.json b/app/javascript/mastodon/locales/an.json
index 23899b10072d4d..e9d609a1ce30ae 100644
--- a/app/javascript/mastodon/locales/an.json
+++ b/app/javascript/mastodon/locales/an.json
@@ -75,7 +75,6 @@
   "announcement.announcement": "Anuncio",
   "attachments_list.unprocessed": "(sin procesar)",
   "audio.hide": "Amagar audio",
-  "autosuggest_hashtag.per_week": "{count} per semana",
   "boost_modal.combo": "Puetz fer clic en {combo} pa blincar este aviso la proxima vegada",
   "bundle_column_error.copy_stacktrace": "Copiar informe d'error",
   "bundle_column_error.error.body": "La pachina solicitada no podió estar renderizada. Podría deber-se a una error en o nuestro codigo u a un problema de compatibilidat con o navegador.",
@@ -126,22 +125,12 @@
   "compose_form.lock_disclaimer": "La tuya cuenta no ye {locked}. Totz pueden seguir-te pa veyer las tuyas publicacions nomás pa seguidores.",
   "compose_form.lock_disclaimer.lock": "blocau",
   "compose_form.placeholder": "En qué yes pensando?",
-  "compose_form.poll.add_option": "Anyadir una opción",
   "compose_form.poll.duration": "Duración d'a enqüesta",
-  "compose_form.poll.option_placeholder": "Elección {number}",
-  "compose_form.poll.remove_option": "Eliminar esta opción",
   "compose_form.poll.switch_to_multiple": "Modificar enqüesta pa permitir multiples opcions",
   "compose_form.poll.switch_to_single": "Modificar enqüesta pa permitir una sola opción",
-  "compose_form.publish": "Publicar",
   "compose_form.publish_form": "Publicar",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Alzar cambios",
-  "compose_form.sensitive.hide": "{count, plural, one {Marcar material como sensible} other {Marcar material como sensible}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Material marcau como sensible} other {Material marcau como sensible}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Material no marcau como sensible} other {Material no marcau como sensible}}",
   "compose_form.spoiler.marked": "Texto amagau dimpués de l'alvertencia",
   "compose_form.spoiler.unmarked": "Texto no amagau",
-  "compose_form.spoiler_placeholder": "Alvertencia de conteniu",
   "confirmation_modal.cancel": "Cancelar",
   "confirmations.block.block_and_report": "Blocar y Denunciar",
   "confirmations.block.confirm": "Blocar",
@@ -345,7 +334,6 @@
   "navigation_bar.compose": "Escribir nueva publicación",
   "navigation_bar.discover": "Descubrir",
   "navigation_bar.domain_blocks": "Dominios amagaus",
-  "navigation_bar.edit_profile": "Editar perfil",
   "navigation_bar.explore": "Explorar",
   "navigation_bar.filters": "Parolas silenciadas",
   "navigation_bar.follow_requests": "Solicitutz pa seguir-te",
@@ -429,14 +417,7 @@
   "poll_button.add_poll": "Anyadir una enqüesta",
   "poll_button.remove_poll": "Eliminar enqüesta",
   "privacy.change": "Achustar privacidat",
-  "privacy.direct.long": "Nomás amostrar a los usuarios mencionaus",
-  "privacy.direct.short": "Nomás contas mencionadas",
-  "privacy.private.long": "Nomás amostrar a seguidores",
-  "privacy.private.short": "Solo seguidores",
-  "privacy.public.long": "Visible pa totz",
   "privacy.public.short": "Publico",
-  "privacy.unlisted.long": "Visible pa totz, pero excluyiu d'as funcions d'escubrimiento",
-  "privacy.unlisted.short": "No listau",
   "privacy_policy.last_updated": "Ultima vegada actualizau {date}",
   "privacy_policy.title": "Politica de Privacidat",
   "refresh": "Actualizar",
@@ -590,10 +571,8 @@
   "upload_error.poll": "Puyada de fichers no permitida con enqüestas.",
   "upload_form.audio_description": "Describir pa personas con problemas auditivos",
   "upload_form.description": "Describir pa los usuarios con dificultat visual",
-  "upload_form.description_missing": "Garra descripción anyadida",
   "upload_form.edit": "Editar",
   "upload_form.thumbnail": "Cambiar miniatura",
-  "upload_form.undo": "Borrar",
   "upload_form.video_description": "Describir pa personas con problemas auditivos u visuals",
   "upload_modal.analyzing_picture": "Analisando imachen…",
   "upload_modal.apply": "Aplicar",
diff --git a/app/javascript/mastodon/locales/ar.json b/app/javascript/mastodon/locales/ar.json
index c0d07cc6484a8f..5f2d151fae78f4 100644
--- a/app/javascript/mastodon/locales/ar.json
+++ b/app/javascript/mastodon/locales/ar.json
@@ -86,7 +86,6 @@
   "announcement.announcement": "إعلان",
   "attachments_list.unprocessed": "(غير معالَج)",
   "audio.hide": "إخفاء المقطع الصوتي",
-  "autosuggest_hashtag.per_week": "{count} في الأسبوع",
   "boost_modal.combo": "يُمكنك الضّغط على {combo} لتخطي هذا في المرة المُقبلة",
   "bundle_column_error.copy_stacktrace": "انسخ تقرير الخطأ",
   "bundle_column_error.error.body": "لا يمكن تقديم الصفحة المطلوبة. قد يكون بسبب خطأ في التعليمات البرمجية، أو مشكلة توافق المتصفح.",
@@ -143,22 +142,12 @@
   "compose_form.lock_disclaimer": "حسابُك غير {locked}. يُمكن لأي شخص مُتابعتك لرؤية (منشورات المتابعين فقط).",
   "compose_form.lock_disclaimer.lock": "مُقفَل",
   "compose_form.placeholder": "فِيمَ تُفكِّر؟",
-  "compose_form.poll.add_option": "إضافة خيار",
   "compose_form.poll.duration": "مُدَّة اِستطلاع الرأي",
-  "compose_form.poll.option_placeholder": "الخيار {number}",
-  "compose_form.poll.remove_option": "إزالة هذا الخيار",
   "compose_form.poll.switch_to_multiple": "تغيِير الاستطلاع للسماح باِخيارات مُتعدِّدة",
   "compose_form.poll.switch_to_single": "تغيِير الاستطلاع للسماح باِخيار واحد فقط",
-  "compose_form.publish": "نشر",
   "compose_form.publish_form": "منشور جديد",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "احفظ التعديلات",
-  "compose_form.sensitive.hide": "{count, plural, one {الإشارة إلى الوَسط كمُحتوى حسّاس} two{الإشارة إلى الوسطان كمُحتويان حسّاسان} other {الإشارة إلى الوسائط كمُحتويات حسّاسة}}",
-  "compose_form.sensitive.marked": "{count, plural, one {تمَّ الإشارة إلى الوسط كمُحتوى حسّاس} two{تمَّ الإشارة إلى الوسطان كمُحتويان حسّاسان} other {تمَّ الإشارة إلى الوسائط كمُحتويات حسّاسة}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {لم تَتِمّ الإشارة إلى الوسط كمُحتوى حسّاس} two{لم تَتِمّ الإشارة إلى الوسطان كمُحتويان حسّاسان} other {لم تَتِمّ الإشارة إلى الوسائط كمُحتويات حسّاسة}}",
   "compose_form.spoiler.marked": "إزالة تحذير المحتوى",
   "compose_form.spoiler.unmarked": "إضافة تحذير للمحتوى",
-  "compose_form.spoiler_placeholder": "اُكتُب تحذيركَ هُنا",
   "confirmation_modal.cancel": "إلغاء",
   "confirmations.block.block_and_report": "حظره والإبلاغ عنه",
   "confirmations.block.confirm": "حظر",
@@ -402,7 +391,6 @@
   "navigation_bar.direct": "الإشارات الخاصة",
   "navigation_bar.discover": "اكتشف",
   "navigation_bar.domain_blocks": "النطاقات المحظورة",
-  "navigation_bar.edit_profile": "عدّل الملف التعريفي",
   "navigation_bar.explore": "استكشف",
   "navigation_bar.favourites": "المفضلة",
   "navigation_bar.filters": "الكلمات المكتومة",
@@ -509,14 +497,7 @@
   "poll_button.add_poll": "إضافة استطلاع للرأي",
   "poll_button.remove_poll": "إزالة استطلاع الرأي",
   "privacy.change": "اضبط خصوصية المنشور",
-  "privacy.direct.long": "مرئي للمستخدمين المذكورين فقط",
-  "privacy.direct.short": "الأشخاص المشار إليهم فقط",
-  "privacy.private.long": "أنشر لمتابعيك فقط",
-  "privacy.private.short": "للمتابِعين فقط",
-  "privacy.public.long": "مرئي للكل",
   "privacy.public.short": "للعامة",
-  "privacy.unlisted.long": "مرئي للجميع، ولكن مِن دون ميزات الاكتشاف",
-  "privacy.unlisted.short": "غير مدرج",
   "privacy_policy.last_updated": "آخر تحديث {date}",
   "privacy_policy.title": "سياسة الخصوصية",
   "refresh": "أنعِش",
@@ -696,10 +677,8 @@
   "upload_error.poll": "لا يمكن إدراج ملفات في استطلاعات الرأي.",
   "upload_form.audio_description": "وصف للأشخاص ذي قِصر السمع",
   "upload_form.description": "وصف للمعاقين بصريا",
-  "upload_form.description_missing": "لم يُضف وصف",
   "upload_form.edit": "تعديل",
   "upload_form.thumbnail": "غيّر الصورة المصغرة",
-  "upload_form.undo": "حذف",
   "upload_form.video_description": "وصف للمعاقين بصريا أو لِذي قِصر السمع",
   "upload_modal.analyzing_picture": "جارٍ فحص الصورة…",
   "upload_modal.apply": "طبّق",
diff --git a/app/javascript/mastodon/locales/ast.json b/app/javascript/mastodon/locales/ast.json
index 1467f8891eb2c3..479c9c9243caf9 100644
--- a/app/javascript/mastodon/locales/ast.json
+++ b/app/javascript/mastodon/locales/ast.json
@@ -66,7 +66,6 @@
   "alert.unexpected.title": "¡Meca!",
   "announcement.announcement": "Anunciu",
   "attachments_list.unprocessed": "(ensin procesar)",
-  "autosuggest_hashtag.per_week": "{count} per selmana",
   "bundle_column_error.error.body": "La páxina solicitada nun se pudo renderizar. Ye posible que seya pola mor d'un fallu nel códigu o por un problema de compatibilidá del restolador.",
   "bundle_column_error.error.title": "¡Oh, non!",
   "bundle_column_error.network.body": "Hebo un error al tentar de cargar esta páxina. Esto pudo ser pola mor d'un problema temporal cola conexón a internet o con esti sirvidor.",
@@ -109,13 +108,9 @@
   "compose_form.lock_disclaimer": "La to cuenta nun ye {locked}. Cualesquier perfil pue siguite pa ver los artículos que son namás pa siguidores.",
   "compose_form.lock_disclaimer.lock": "privada",
   "compose_form.placeholder": "¿En qué pienses?",
-  "compose_form.poll.add_option": "Amestar una opción",
   "compose_form.poll.option_placeholder": "Opción {number}",
-  "compose_form.poll.remove_option": "Quitar esta opción",
-  "compose_form.publish": "Espublizar",
+  "compose_form.poll.type": "Estilu",
   "compose_form.publish_form": "Artículu nuevu",
-  "compose_form.publish_loud": "¡{publish}!",
-  "compose_form.save_changes": "Guardar los cambeos",
   "confirmation_modal.cancel": "Encaboxar",
   "confirmations.block.block_and_report": "Bloquiar ya informar",
   "confirmations.block.confirm": "Bloquiar",
@@ -286,7 +281,6 @@
   "navigation_bar.community_timeline": "Llinia de tiempu llocal",
   "navigation_bar.direct": "Menciones privaes",
   "navigation_bar.domain_blocks": "Dominios bloquiaos",
-  "navigation_bar.edit_profile": "Editar el perfil",
   "navigation_bar.explore": "Esploración",
   "navigation_bar.filters": "Pallabres desactivaes",
   "navigation_bar.follow_requests": "Solicitúes de siguimientu",
@@ -346,12 +340,7 @@
   "poll_button.add_poll": "Amestar una encuesta",
   "poll_button.remove_poll": "Quitar la encuesta",
   "privacy.change": "Configurar la privacidá del artículu",
-  "privacy.direct.long": "Artículu visible namás pa los perfiles mentaos",
-  "privacy.private.long": "Artículu visible namás pa los perfiles siguidores",
-  "privacy.private.short": "Namás pa siguidores",
-  "privacy.public.long": "Tol mundu pue ver l'artículu",
   "privacy.public.short": "Artículu públicu",
-  "privacy.unlisted.long": "Artículu visible pa tol mundu mas escluyíu de les funciones de descubrimientu",
   "privacy_policy.last_updated": "Data del últimu anovamientu: {date}",
   "privacy_policy.title": "Política de privacidá",
   "refresh": "Anovar",
@@ -368,6 +357,7 @@
   "relative_time.seconds": "{number} s",
   "relative_time.today": "güei",
   "reply_indicator.cancel": "Encaboxar",
+  "reply_indicator.poll": "Encuesta",
   "report.block": "Bloquiar",
   "report.categories.spam": "Spam",
   "report.categories.violation": "El conteníu incumple una o más normes del sirvidor",
@@ -492,9 +482,7 @@
   "upload_button.label": "Amestar ficheros multimedia",
   "upload_error.poll": "La xuba de ficheros nun ta permitida coles encuestes.",
   "upload_form.audio_description": "Describi'l conteníu pa persones sordes ya/o ciegues",
-  "upload_form.description_missing": "Nun s'amestó la descripción",
   "upload_form.edit": "Editar",
-  "upload_form.undo": "Desaniciar",
   "upload_modal.analyzing_picture": "Analizando la semeya…",
   "upload_modal.apply": "Aplicar",
   "upload_modal.applying": "Aplicando…",
diff --git a/app/javascript/mastodon/locales/be.json b/app/javascript/mastodon/locales/be.json
index 773af40343c6a9..e069515109fcb4 100644
--- a/app/javascript/mastodon/locales/be.json
+++ b/app/javascript/mastodon/locales/be.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Аб'ява",
   "attachments_list.unprocessed": "(неапрацаваны)",
   "audio.hide": "Схаваць аўдыя",
-  "autosuggest_hashtag.per_week": "{count} за тыдзень",
   "boost_modal.combo": "Націсніце {combo}, каб прапусціць наступным разам",
   "bundle_column_error.copy_stacktrace": "Скапіраваць справаздачу пра памылку",
   "bundle_column_error.error.body": "Запытаная старонка не можа быць адлюстраваная. Гэта магло стацца праз хібу ў нашым кодзе, або праз памылку сумяшчальнасці з браўзерам.",
@@ -146,22 +145,12 @@
   "compose_form.lock_disclaimer": "Ваш уліковы запіс не {locked}. Усе могуць падпісацца на вас, каб бачыць допісы толькі для падпісчыкаў.",
   "compose_form.lock_disclaimer.lock": "закрыты",
   "compose_form.placeholder": "Што здарылася?",
-  "compose_form.poll.add_option": "Дадаць варыянт",
   "compose_form.poll.duration": "Працягласць апытання",
-  "compose_form.poll.option_placeholder": "Варыянт {number}",
-  "compose_form.poll.remove_option": "Выдаліць гэты варыянт",
   "compose_form.poll.switch_to_multiple": "Змяніце апытанне, каб дазволіць некалькі варыянтаў адказу",
   "compose_form.poll.switch_to_single": "Змяніце апытанне, каб дазволіць адзіны варыянт адказу",
-  "compose_form.publish": "Апублікаваць",
   "compose_form.publish_form": "Апублікаваць",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Захаваць змены",
-  "compose_form.sensitive.hide": "{count, plural, one {Пазначыць кантэнт як далікатны} other {Пазначыць кантэнт як далікатны}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Кантэнт пазначаны як далікатны} other {Кантэнт пазначаны як далікатны}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Кантэнт не пазначаны як далікатны} other {Кантэнт не пазначаны як далікатны}}",
   "compose_form.spoiler.marked": "Выдаліць папярэджанне аб змесціве",
   "compose_form.spoiler.unmarked": "Дадаць папярэджанне аб змесціве",
-  "compose_form.spoiler_placeholder": "Напішыце сваё папярэджанне тут",
   "confirmation_modal.cancel": "Скасаваць",
   "confirmations.block.block_and_report": "Заблакіраваць і паскардзіцца",
   "confirmations.block.confirm": "Заблакіраваць",
@@ -408,7 +397,6 @@
   "navigation_bar.direct": "Асабістыя згадванні",
   "navigation_bar.discover": "Даведайцесь",
   "navigation_bar.domain_blocks": "Заблакіраваныя дамены",
-  "navigation_bar.edit_profile": "Рэдагаваць профіль",
   "navigation_bar.explore": "Агляд",
   "navigation_bar.favourites": "Упадабанае",
   "navigation_bar.filters": "Ігнараваныя словы",
@@ -526,14 +514,7 @@
   "poll_button.add_poll": "Дадаць апытанне",
   "poll_button.remove_poll": "Выдаліць апытанне",
   "privacy.change": "Змяніць прыватнасць допісу",
-  "privacy.direct.long": "Паказаць толькі згаданым карыстальнікам",
-  "privacy.direct.short": "Толькі згаданыя людзі",
-  "privacy.private.long": "Паказаць толькі падпісчыкам",
-  "privacy.private.short": "Толькі для падпісчыкаў",
-  "privacy.public.long": "Бачны для ўсіх",
   "privacy.public.short": "Публічны",
-  "privacy.unlisted.long": "Бачна для ўсіх, але не праз магчымасці агляду",
-  "privacy.unlisted.short": "Не ў стужках",
   "privacy_policy.last_updated": "Адноўлена {date}",
   "privacy_policy.title": "Палітыка канфідэнцыйнасці",
   "recommended": "Рэкамендуем",
@@ -715,10 +696,8 @@
   "upload_error.poll": "Немагчыма прымацаваць файл да апытання.",
   "upload_form.audio_description": "Апісанне для людзей з парушэннямі слыху",
   "upload_form.description": "Апісаць для людзей са слабым зрокам",
-  "upload_form.description_missing": "Апісанне адсутнічае",
   "upload_form.edit": "Рэдагаваць",
   "upload_form.thumbnail": "Змяніць мініяцюру",
-  "upload_form.undo": "Выдаліць",
   "upload_form.video_description": "Апісанне для людзей з парушэннямі зроку і слыху",
   "upload_modal.analyzing_picture": "Аналіз выявы…",
   "upload_modal.apply": "Ужыць",
diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json
index 7ee3c868ae1f16..213ac090a7cec2 100644
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Оповестяване",
   "attachments_list.unprocessed": "(необработено)",
   "audio.hide": "Скриване на звука",
-  "autosuggest_hashtag.per_week": "{count} на седмица",
   "boost_modal.combo": "Можете да натиснете {combo}, за да пропуснете това следващия път",
   "bundle_column_error.copy_stacktrace": "Копиране на доклада за грешката",
   "bundle_column_error.error.body": "Заявената страница не може да се изобрази. Това може да е заради грешка в кода ни или проблем със съвместимостта на браузъра.",
@@ -148,20 +147,20 @@
   "compose_form.placeholder": "Какво мислите?",
   "compose_form.poll.add_option": "Добавяне на избор",
   "compose_form.poll.duration": "Времетраене на анкетата",
+  "compose_form.poll.multiple": "Множествен избор",
   "compose_form.poll.option_placeholder": "Избор {number}",
-  "compose_form.poll.remove_option": "Премахване на този избор",
+  "compose_form.poll.remove_option": "Премахване на тази възможност",
+  "compose_form.poll.single": "Подберете нещо",
   "compose_form.poll.switch_to_multiple": "Промяна на анкетата, за да се позволят множество възможни избора",
   "compose_form.poll.switch_to_single": "Промяна на анкетата, за да се позволи един възможен избор",
-  "compose_form.publish": "Публикуване",
+  "compose_form.poll.type": "Стил",
+  "compose_form.publish": "Публикация",
   "compose_form.publish_form": "Публикуване",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Запазване на промените",
-  "compose_form.sensitive.hide": "{count, plural, one {Маркиране на мултимедията като деликатна} other {Маркиране на мултимедиите като деликатни}}",
-  "compose_form.sensitive.marked": "{count, plural, one {мултимедия е означена като деликатна} other {мултимедии са означени като деликатни}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Мултимедията не е маркирана като деликатна} other {Мултимедиите не са маркирани като деликатни}}",
+  "compose_form.reply": "Отговор",
+  "compose_form.save_changes": "Обновяване",
   "compose_form.spoiler.marked": "Отстраняване на предупреждение за съдържание",
   "compose_form.spoiler.unmarked": "Добавяне на предупреждение за съдържание",
-  "compose_form.spoiler_placeholder": "Тук напишете предупреждението си",
+  "compose_form.spoiler_placeholder": "Предупреждение за съдържание (по избор)",
   "confirmation_modal.cancel": "Отказ",
   "confirmations.block.block_and_report": "Блокиране и докладване",
   "confirmations.block.confirm": "Блокиране",
@@ -408,7 +407,6 @@
   "navigation_bar.direct": "Частни споменавания",
   "navigation_bar.discover": "Откриване",
   "navigation_bar.domain_blocks": "Блокирани домейни",
-  "navigation_bar.edit_profile": "Редактиране на профила",
   "navigation_bar.explore": "Изследване",
   "navigation_bar.favourites": "Любими",
   "navigation_bar.filters": "Заглушени думи",
@@ -526,14 +524,14 @@
   "poll_button.add_poll": "Анкетиране",
   "poll_button.remove_poll": "Премахване на анкета",
   "privacy.change": "Промяна на поверителността на публикация",
-  "privacy.direct.long": "Видимо само за споменатите потребители",
-  "privacy.direct.short": "Само споменатите хора",
-  "privacy.private.long": "Видимо само за последователите",
-  "privacy.private.short": "Само последователи",
-  "privacy.public.long": "Видимо за всички",
+  "privacy.direct.long": "Всеки споменат в публикацията",
+  "privacy.direct.short": "Определени хора",
+  "privacy.private.long": "Само последователите ви",
+  "privacy.private.short": "Последователи",
+  "privacy.public.long": "Всеки във и извън Mastodon",
   "privacy.public.short": "Публично",
-  "privacy.unlisted.long": "Видимо за всички, но не чрез възможността за откриване",
-  "privacy.unlisted.short": "Несписъчно",
+  "privacy.unlisted.long": "По-малко алгоритмични фанфари",
+  "privacy.unlisted.short": "Тиха публика",
   "privacy_policy.last_updated": "Последно осъвременяване на {date}",
   "privacy_policy.title": "Политика за поверителност",
   "recommended": "Препоръчано",
@@ -551,7 +549,9 @@
   "relative_time.minutes": "{number}м.",
   "relative_time.seconds": "{number}с.",
   "relative_time.today": "днес",
+  "reply_indicator.attachments": "{count, plural, one {# прикаване} other {# прикачвания}}",
   "reply_indicator.cancel": "Отказ",
+  "reply_indicator.poll": "Анкета",
   "report.block": "Блокиране",
   "report.block_explanation": "Няма да им виждате публикациите. Те няма да могат да виждат публикациите ви или да ви последват. Те ще могат да казват, че са били блокирани.",
   "report.categories.legal": "Правни въпроси",
@@ -715,10 +715,8 @@
   "upload_error.poll": "Качването на файлове не е позволено с анкети.",
   "upload_form.audio_description": "Опишете за хора, които са глухи или трудно чуват",
   "upload_form.description": "Опишете за хора, които са слепи или имат слабо зрение",
-  "upload_form.description_missing": "Няма добавен опис",
   "upload_form.edit": "Редактиране",
   "upload_form.thumbnail": "Промяна на миниобраза",
-  "upload_form.undo": "Изтриване",
   "upload_form.video_description": "Опишете за хора, които са глухи или трудно чуват, слепи или имат слабо зрение",
   "upload_modal.analyzing_picture": "Снимков анализ…",
   "upload_modal.apply": "Прилагане",
diff --git a/app/javascript/mastodon/locales/bn.json b/app/javascript/mastodon/locales/bn.json
index fe3d2a627c3f23..508caa2f42708d 100644
--- a/app/javascript/mastodon/locales/bn.json
+++ b/app/javascript/mastodon/locales/bn.json
@@ -85,7 +85,6 @@
   "announcement.announcement": "ঘোষণা",
   "attachments_list.unprocessed": "(প্রক্রিয়া করা যায়নি)",
   "audio.hide": "অডিও লুকান",
-  "autosuggest_hashtag.per_week": "প্রতি সপ্তাহে {count}",
   "boost_modal.combo": "পরেরবার আপনি {combo} টিপলে এটি আর আসবে না",
   "bundle_column_error.copy_stacktrace": "এরর রিপোর্ট কপি করুন",
   "bundle_column_error.error.body": "অনুরোধ করা পৃষ্ঠাটি রেন্ডার করা যায়নি। এটি আমাদের কোডে একটি বাগ বা ব্রাউজার সামঞ্জস্যের সমস্যার কারণে হতে পারে।",
@@ -142,22 +141,12 @@
   "compose_form.lock_disclaimer": "আপনার নিবন্ধনে তালা দেওয়া নেই, যে কেও আপনাকে অনুসরণ করতে পারবে এবং অনুশারকদের জন্য লেখা দেখতে পারবে।",
   "compose_form.lock_disclaimer.lock": "তালা দেওয়া",
   "compose_form.placeholder": "আপনি কি ভাবছেন ?",
-  "compose_form.poll.add_option": "আরেকটি বিকল্প যোগ করুন",
   "compose_form.poll.duration": "ভোটগ্রহনের সময়",
-  "compose_form.poll.option_placeholder": "বিকল্প {number}",
-  "compose_form.poll.remove_option": "এই বিকল্পটি মুছে ফেলুন",
   "compose_form.poll.switch_to_multiple": "একাধিক পছন্দ অনুমতি দেওয়ার জন্য পোল পরিবর্তন করুন",
   "compose_form.poll.switch_to_single": "একটি একক পছন্দের অনুমতি দেওয়ার জন্য পোল পরিবর্তন করুন",
-  "compose_form.publish": "প্রকাশ করুন",
   "compose_form.publish_form": "প্রকাশ করুন",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "পরিবর্তনগুলো প্রকাশ করুন",
-  "compose_form.sensitive.hide": "এই ছবি বা ভিডিওটি সংবেদনশীল হিসেবে চিহ্নিত করতে",
-  "compose_form.sensitive.marked": "এই ছবি বা ভিডিওটি সংবেদনশীল হিসেবে চিহ্নিত করা হয়েছে",
-  "compose_form.sensitive.unmarked": "এই ছবি বা ভিডিওটি সংবেদনশীল হিসেবে চিহ্নিত করা হয়নি",
   "compose_form.spoiler.marked": "সতর্কতার পিছনে লেখানটি লুকানো আছে",
   "compose_form.spoiler.unmarked": "লেখাটি লুকানো নেই",
-  "compose_form.spoiler_placeholder": "আপনার লেখা দেখার সাবধানবাণী লিখুন",
   "confirmation_modal.cancel": "বাতিল করুন",
   "confirmations.block.block_and_report": "ব্লক করুন এবং রিপোর্ট করুন",
   "confirmations.block.confirm": "ব্লক করুন",
@@ -324,7 +313,6 @@
   "navigation_bar.compose": "নতুন টুট লিখুন",
   "navigation_bar.discover": "ঘুরে দেখুন",
   "navigation_bar.domain_blocks": "লুকানো ডোমেনগুলি",
-  "navigation_bar.edit_profile": "নিজের পাতা সম্পাদনা করতে",
   "navigation_bar.explore": "পরিব্রাজন",
   "navigation_bar.favourites": "পছন্দসমূহ",
   "navigation_bar.filters": "বন্ধ করা শব্দ",
@@ -395,12 +383,7 @@
   "poll_button.add_poll": "একটা নির্বাচন যোগ করতে",
   "poll_button.remove_poll": "নির্বাচন বাদ দিতে",
   "privacy.change": "লেখার গোপনীয়তা অবস্থা ঠিক করতে",
-  "privacy.direct.long": "শুধুমাত্র উল্লেখিত ব্যবহারকারীদের কাছে লিখতে",
-  "privacy.direct.short": "Direct",
-  "privacy.private.long": "শুধুমাত্র আপনার অনুসরণকারীদের লিখতে",
-  "privacy.private.short": "Followers-only",
   "privacy.public.short": "সর্বজনীন প্রকাশ্য",
-  "privacy.unlisted.short": "প্রকাশ্য নয়",
   "refresh": "সতেজ করা",
   "regeneration_indicator.label": "আসছে…",
   "regeneration_indicator.sublabel": "আপনার বাড়ির-সময়রেখা প্রস্তূত করা হচ্ছে!",
@@ -506,7 +489,6 @@
   "upload_form.description": "যারা দেখতে পায়না তাদের জন্য এটা বর্ণনা করতে",
   "upload_form.edit": "সম্পাদন",
   "upload_form.thumbnail": "থাম্বনেল পরিবর্তন করুন",
-  "upload_form.undo": "মুছে ফেলতে",
   "upload_form.video_description": "শ্রবণশক্তি হ্রাস বা চাক্ষুষ প্রতিবন্ধী ব্যক্তিদের জন্য বর্ণনা করুন",
   "upload_modal.analyzing_picture": "চিত্র বিশ্লেষণ করা হচ্ছে…",
   "upload_modal.apply": "প্রয়োগ করুন",
diff --git a/app/javascript/mastodon/locales/br.json b/app/javascript/mastodon/locales/br.json
index ad6e55c5e1ed7f..5e83ab4e6dc8b4 100644
--- a/app/javascript/mastodon/locales/br.json
+++ b/app/javascript/mastodon/locales/br.json
@@ -87,7 +87,6 @@
   "announcement.announcement": "Kemennad",
   "attachments_list.unprocessed": "(ket meret)",
   "audio.hide": "Kuzhat ar c'hleved",
-  "autosuggest_hashtag.per_week": "{count} bep sizhun",
   "boost_modal.combo": "Ar wezh kentañ e c'halliot gwaskañ war {combo} evit tremen hebiou",
   "bundle_column_error.copy_stacktrace": "Eilañ an danevell fazi",
   "bundle_column_error.error.body": "N'haller ket skrammañ ar bajenn goulennet. Gallout a ra bezañ abalamour d'ur beug er c'hod pe d'ur gudenn keverlec'hded gant ar merdeer.",
@@ -143,22 +142,12 @@
   "compose_form.lock_disclaimer": "N'eo ket {locked} ho kont. An holl a c'hal ho heuliañ evit gwelet ho toudoù prevez.",
   "compose_form.lock_disclaimer.lock": "prennet",
   "compose_form.placeholder": "Petra emaoc'h o soñjal e-barzh ?",
-  "compose_form.poll.add_option": "Ouzhpenniñ un dibab",
   "compose_form.poll.duration": "Pad ar sontadeg",
-  "compose_form.poll.option_placeholder": "Dibab {number}",
-  "compose_form.poll.remove_option": "Lemel an dibab-mañ",
   "compose_form.poll.switch_to_multiple": "Kemmañ ar sontadeg evit aotren meur a zibab",
   "compose_form.poll.switch_to_single": "Kemmañ ar sontadeg evit aotren un dibab hepken",
-  "compose_form.publish": "Embann",
   "compose_form.publish_form": "Embann",
-  "compose_form.publish_loud": "{publish} !",
-  "compose_form.save_changes": "Enrollañ ar cheñchamantoù",
-  "compose_form.sensitive.hide": "Merkañ ar media evel kizidik",
-  "compose_form.sensitive.marked": "Merket eo ar media evel kizidik",
-  "compose_form.sensitive.unmarked": "N'eo ket merket ar media evel kizidik",
   "compose_form.spoiler.marked": "Kuzhet eo an destenn a-dreñv ur c'hemenn",
   "compose_form.spoiler.unmarked": "N'eo ket kuzhet an destenn",
-  "compose_form.spoiler_placeholder": "Skrivit ho kemenn diwall amañ",
   "confirmation_modal.cancel": "Nullañ",
   "confirmations.block.block_and_report": "Berzañ ha Disklêriañ",
   "confirmations.block.confirm": "Stankañ",
@@ -383,7 +372,6 @@
   "navigation_bar.direct": "Menegoù prevez",
   "navigation_bar.discover": "Dizoleiñ",
   "navigation_bar.domain_blocks": "Domanioù kuzhet",
-  "navigation_bar.edit_profile": "Kemmañ ar profil",
   "navigation_bar.explore": "Furchal",
   "navigation_bar.favourites": "Muiañ-karet",
   "navigation_bar.filters": "Gerioù kuzhet",
@@ -487,14 +475,7 @@
   "poll_button.add_poll": "Ouzhpennañ ur sontadeg",
   "poll_button.remove_poll": "Dilemel ar sontadeg",
   "privacy.change": "Cheñch prevezded an toud",
-  "privacy.direct.long": "Embann evit an implijer·ezed·ien meneget hepken",
-  "privacy.direct.short": "Tud meneget hepken",
-  "privacy.private.long": "Embann evit ar re a heuilh ac'hanon hepken",
-  "privacy.private.short": "Tud koumanantet hepken",
-  "privacy.public.long": "Gwelus d'an holl",
   "privacy.public.short": "Publik",
-  "privacy.unlisted.long": "Gwelus gant an holl, met hep arc'hweladur dizoleiñ",
-  "privacy.unlisted.short": "Anlistennet",
   "privacy_policy.last_updated": "Hizivadenn ziwezhañ {date}",
   "privacy_policy.title": "Reolennoù Prevezded",
   "recommended": "Erbedet",
@@ -667,10 +648,8 @@
   "upload_error.poll": "Pellgargañ restroù n'eo ket aotreet gant sontadegoù.",
   "upload_form.audio_description": "Diskrivañ evit tud a zo kollet o c'hlev",
   "upload_form.description": "Diskrivañ evit tud a zo kollet o gweled",
-  "upload_form.description_missing": "Deskrivadur diank",
   "upload_form.edit": "Kemmañ",
   "upload_form.thumbnail": "Kemmañ ar velvenn",
-  "upload_form.undo": "Dilemel",
   "upload_form.video_description": "Diskrivañ evit tud a zo kollet o gweled pe o c'hlev",
   "upload_modal.analyzing_picture": "O tielfennañ ar skeudenn…",
   "upload_modal.apply": "Arloañ",
diff --git a/app/javascript/mastodon/locales/bs.json b/app/javascript/mastodon/locales/bs.json
index 9b6b49c3d666f0..c978a8b01fcfb4 100644
--- a/app/javascript/mastodon/locales/bs.json
+++ b/app/javascript/mastodon/locales/bs.json
@@ -66,8 +66,6 @@
   "onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
   "onboarding.steps.share_profile.title": "Share your profile",
   "privacy.change": "Adjust status privacy",
-  "privacy.direct.short": "Direct",
-  "privacy.private.short": "Followers-only",
   "report.placeholder": "Type or paste additional comments",
   "report.submit": "Submit report",
   "report.target": "Report {target}",
diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index c763a32ba846dc..0d089bf8b895da 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Anunci",
   "attachments_list.unprocessed": "(sense processar)",
   "audio.hide": "Amaga l'àudio",
-  "autosuggest_hashtag.per_week": "{count} per setmana",
   "boost_modal.combo": "Pots prémer {combo} per a evitar-ho el pròxim cop",
   "bundle_column_error.copy_stacktrace": "Copia l'informe d'error",
   "bundle_column_error.error.body": "No s'ha pogut renderitzar la pàgina sol·licitada. Podria ser per un error en el nostre codi o per un problema de compatibilitat del navegador.",
@@ -146,22 +145,22 @@
   "compose_form.lock_disclaimer": "El teu compte no està {locked}. Tothom pot seguir-te i veure els tuts de només per a seguidors.",
   "compose_form.lock_disclaimer.lock": "blocat",
   "compose_form.placeholder": "Què tens al cap?",
-  "compose_form.poll.add_option": "Afegeix una opció",
+  "compose_form.poll.add_option": "Afegiu una opció",
   "compose_form.poll.duration": "Durada de l'enquesta",
+  "compose_form.poll.multiple": "Opcions múltiples",
   "compose_form.poll.option_placeholder": "Opció {number}",
-  "compose_form.poll.remove_option": "Elimina aquesta opció",
+  "compose_form.poll.remove_option": "Treu aquesta opció",
+  "compose_form.poll.single": "Trieu-ne una",
   "compose_form.poll.switch_to_multiple": "Canvia l’enquesta per a permetre múltiples opcions",
   "compose_form.poll.switch_to_single": "Canvia l’enquesta per a permetre una única opció",
-  "compose_form.publish": "Tut",
+  "compose_form.poll.type": "Estil",
+  "compose_form.publish": "Publica",
   "compose_form.publish_form": "Nou tut",
-  "compose_form.publish_loud": "Tut!",
-  "compose_form.save_changes": "Desa els canvis",
-  "compose_form.sensitive.hide": "{count, plural, one {Marca mèdia com a sensible} other {Marca mèdia com a sensible}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Contingut marcat com a sensible} other {Contingut marcat com a sensible}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Contingut no marcat com a sensible} other {Contingut no marcat com a sensible}}",
+  "compose_form.reply": "Responeu",
+  "compose_form.save_changes": "Actualitza",
   "compose_form.spoiler.marked": "Elimina l'avís de contingut",
   "compose_form.spoiler.unmarked": "Afegeix avís de contingut",
-  "compose_form.spoiler_placeholder": "Escriu l'avís aquí",
+  "compose_form.spoiler_placeholder": "Avís de contingut (opcional)",
   "confirmation_modal.cancel": "Cancel·la",
   "confirmations.block.block_and_report": "Bloca i denuncia",
   "confirmations.block.confirm": "Bloca",
@@ -408,7 +407,6 @@
   "navigation_bar.direct": "Mencions privades",
   "navigation_bar.discover": "Descobreix",
   "navigation_bar.domain_blocks": "Dominis blocats",
-  "navigation_bar.edit_profile": "Edita el perfil",
   "navigation_bar.explore": "Explora",
   "navigation_bar.favourites": "Favorits",
   "navigation_bar.filters": "Paraules silenciades",
@@ -526,14 +524,12 @@
   "poll_button.add_poll": "Afegeix una enquesta",
   "poll_button.remove_poll": "Elimina l'enquesta",
   "privacy.change": "Canvia la privacitat del tut",
-  "privacy.direct.long": "Visible només per als usuaris esmentats",
-  "privacy.direct.short": "Només gent mencionada",
-  "privacy.private.long": "Visible només per als seguidors",
-  "privacy.private.short": "Només seguidors",
-  "privacy.public.long": "Visible per a tothom",
+  "privacy.direct.long": "Tothom mencionat en aquesta publicació",
+  "privacy.direct.short": "Persones concretes",
+  "privacy.private.long": "Només els vostres seguidors",
+  "privacy.private.short": "Seguidors",
+  "privacy.public.long": "Tothom dins o fora Mastodon",
   "privacy.public.short": "Públic",
-  "privacy.unlisted.long": "Visible per a tothom però exclosa de les funcions de descobriment",
-  "privacy.unlisted.short": "No llistada",
   "privacy_policy.last_updated": "Darrera actualització {date}",
   "privacy_policy.title": "Política de Privacitat",
   "recommended": "Recomanat",
@@ -715,10 +711,8 @@
   "upload_error.poll": "No es permet carregar fitxers a les enquestes.",
   "upload_form.audio_description": "Descriu-ho per a persones amb problemes d'audició",
   "upload_form.description": "Descriu-ho per a persones amb problemes de visió",
-  "upload_form.description_missing": "No s'hi ha afegit cap descripció",
   "upload_form.edit": "Edita",
   "upload_form.thumbnail": "Canvia la miniatura",
-  "upload_form.undo": "Elimina",
   "upload_form.video_description": "Descriu-ho per a persones amb problemes de visió o audició",
   "upload_modal.analyzing_picture": "S'analitza la imatge…",
   "upload_modal.apply": "Aplica",
diff --git a/app/javascript/mastodon/locales/ckb.json b/app/javascript/mastodon/locales/ckb.json
index f1cafd1ac474e3..73910f9b7c7027 100644
--- a/app/javascript/mastodon/locales/ckb.json
+++ b/app/javascript/mastodon/locales/ckb.json
@@ -76,7 +76,6 @@
   "announcement.announcement": "بانگەواز",
   "attachments_list.unprocessed": "(unprocessed)",
   "audio.hide": "شاردنەوەی دەنگ",
-  "autosuggest_hashtag.per_week": "{count} هەرهەفتە",
   "boost_modal.combo": "دەتوانیت دەست بنێی بە سەر {combo} بۆ بازدان لە جاری داهاتوو",
   "bundle_column_error.copy_stacktrace": "ڕاپۆرتی هەڵەی کۆپی بکە",
   "bundle_column_error.error.body": "لاپەڕەی داواکراو نەتوانرا ڕەندەر بکرێت. دەکرێت بەهۆی هەڵەیەکی کۆدەکەمانەوە بێت، یان کێشەی گونجانی وێبگەڕ.",
@@ -128,22 +127,12 @@
   "compose_form.lock_disclaimer": "هەژمێرەکەی لە حاڵەتی {locked}. هەر کەسێک دەتوانێت شوێنت بکەوێت بۆ پیشاندانی بابەتەکانی تەنها دوایخۆی.",
   "compose_form.lock_disclaimer.lock": "قفڵ دراوە",
   "compose_form.placeholder": "چی لە مێشکتدایە?",
-  "compose_form.poll.add_option": "زیادکردنی هەڵبژاردەیەک",
   "compose_form.poll.duration": "ماوەی ڕاپرسی",
-  "compose_form.poll.option_placeholder": "هەڵبژاردن {number}",
-  "compose_form.poll.remove_option": "لابردنی ئەم هەڵبژاردەیە",
   "compose_form.poll.switch_to_multiple": "ڕاپرسی بگۆڕە بۆ ڕێگەدان بە چەند هەڵبژاردنێک",
   "compose_form.poll.switch_to_single": "گۆڕینی ڕاپرسی بۆ ڕێگەدان بە تاکە هەڵبژاردنێک",
-  "compose_form.publish": "بڵاوی بکەوە",
   "compose_form.publish_form": "بڵاوی بکەوە",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "پاشکەوتی گۆڕانکاریەکان",
-  "compose_form.sensitive.hide": "نیشانکردنی میدیا وەک هەستیار",
-  "compose_form.sensitive.marked": "وادەی کۆتایی",
-  "compose_form.sensitive.unmarked": "میدیا وەک هەستیار نیشان نەکراوە",
   "compose_form.spoiler.marked": "دەق لە پشت ئاگاداریدا شاراوەتەوە",
   "compose_form.spoiler.unmarked": "دەق شاراوە نییە",
-  "compose_form.spoiler_placeholder": "ئاگاداریەکەت لێرە بنووسە",
   "confirmation_modal.cancel": "هەڵوەشاندنەوه",
   "confirmations.block.block_and_report": "بلۆک & گوزارشت",
   "confirmations.block.confirm": "بلۆک",
@@ -354,7 +343,6 @@
   "navigation_bar.direct": "ئاماژەی تایبەت",
   "navigation_bar.discover": "دۆزینەوە",
   "navigation_bar.domain_blocks": "دۆمەینە بلۆک کراوەکان",
-  "navigation_bar.edit_profile": "دەستکاری پرۆفایل بکە",
   "navigation_bar.explore": "گەڕان",
   "navigation_bar.filters": "وشە کپەکان",
   "navigation_bar.follow_requests": "بەدواداچوی داواکاریەکان بکە",
@@ -439,14 +427,7 @@
   "poll_button.add_poll": "ڕاپرسییەک زیاد بکە",
   "poll_button.remove_poll": "ده‌نگدان بسڕه‌وه‌‌",
   "privacy.change": "ڕێکخستنی تایبەتمەندی توت",
-  "privacy.direct.long": "تەنیا بۆ بەکارهێنەرانی ناوبراو",
-  "privacy.direct.short": "تەنها کەسانی باس کراو",
-  "privacy.private.long": "بینراو تەنها بۆ شوێنکەوتوان",
-  "privacy.private.short": "تەنیا شوێنکەوتووان",
-  "privacy.public.long": "بۆ هەمووان دیارە",
   "privacy.public.short": "گشتی",
-  "privacy.unlisted.long": "بۆ هەمووان دیارە، بەڵام لە تایبەتمەندییەکانی دۆزینەوە دەرچووە",
-  "privacy.unlisted.short": "لە لیست نەکراو",
   "privacy_policy.last_updated": "دوایین نوێکردنەوە {date}",
   "privacy_policy.title": "سیاسەتی تایبەتێتی",
   "refresh": "نوێکردنەوە",
@@ -610,10 +591,8 @@
   "upload_error.poll": "فایل و ڕاپرسی پێکەوە ڕێپێنەدراون.",
   "upload_form.audio_description": "پەیامەکەت بۆ نابیستەکان",
   "upload_form.description": "پەیامەکەت بۆ نابیناکان",
-  "upload_form.description_missing": "هیچ وەسفێک زیاد نەکراوە",
   "upload_form.edit": "دەستکاری",
   "upload_form.thumbnail": "گۆڕانی وینۆچکە",
-  "upload_form.undo": "بیسڕەوە",
   "upload_form.video_description": "پەیامەکەت بۆ نابیست و نابیناکان",
   "upload_modal.analyzing_picture": "وێنەکە شی دەکرێتەوە…",
   "upload_modal.apply": "بیسەپێنە",
diff --git a/app/javascript/mastodon/locales/co.json b/app/javascript/mastodon/locales/co.json
index 9f90c3d211dffa..9d0b0306c8e5c4 100644
--- a/app/javascript/mastodon/locales/co.json
+++ b/app/javascript/mastodon/locales/co.json
@@ -45,7 +45,6 @@
   "alert.unexpected.title": "Uups!",
   "announcement.announcement": "Annunziu",
   "attachments_list.unprocessed": "(micca trattata)",
-  "autosuggest_hashtag.per_week": "{count} per settimana",
   "boost_modal.combo": "Pudete appughjà nant'à {combo} per saltà quessa a prussima volta",
   "bundle_column_error.retry": "Pruvà torna",
   "bundle_modal_error.close": "Chjudà",
@@ -80,20 +79,12 @@
   "compose_form.lock_disclaimer": "U vostru contu ùn hè micca {locked}. Tuttu u mondu pò seguitavi è vede i vostri statuti privati.",
   "compose_form.lock_disclaimer.lock": "privatu",
   "compose_form.placeholder": "À chè pensate?",
-  "compose_form.poll.add_option": "Aghjunghje scelta",
   "compose_form.poll.duration": "Durata di u scandagliu",
-  "compose_form.poll.option_placeholder": "Scelta {number}",
-  "compose_form.poll.remove_option": "Toglie sta scelta",
   "compose_form.poll.switch_to_multiple": "Cambià u scandagliu per accittà parechje scelte",
   "compose_form.poll.switch_to_single": "Cambià u scandagliu per ùn accittà ch'una scelta",
   "compose_form.publish_form": "Publish",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.sensitive.hide": "{count, plural, one {Indicà u media cum'è sensibile} other {Indicà i media cum'è sensibili}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Media indicatu cum'è sensibile} other {Media indicati cum'è sensibili}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Media micca indicatu cum'è sensibile} other {Media micca indicati cum'è sensibili}}",
   "compose_form.spoiler.marked": "Testu piattatu daret'à un'avertimentu",
   "compose_form.spoiler.unmarked": "Testu micca piattatu",
-  "compose_form.spoiler_placeholder": "Scrive u vostr'avertimentu quì",
   "confirmation_modal.cancel": "Annullà",
   "confirmations.block.block_and_report": "Bluccà è signalà",
   "confirmations.block.confirm": "Bluccà",
@@ -245,7 +236,6 @@
   "navigation_bar.compose": "Scrive un novu statutu",
   "navigation_bar.discover": "Scopre",
   "navigation_bar.domain_blocks": "Duminii piattati",
-  "navigation_bar.edit_profile": "Mudificà u prufile",
   "navigation_bar.filters": "Parolle silenzate",
   "navigation_bar.follow_requests": "Dumande d'abbunamentu",
   "navigation_bar.follows_and_followers": "Abbunati è abbunamenti",
@@ -318,12 +308,7 @@
   "poll_button.add_poll": "Aghjunghje",
   "poll_button.remove_poll": "Toglie u scandagliu",
   "privacy.change": "Mudificà a cunfidenzialità di u statutu",
-  "privacy.direct.long": "Mandà solu à quelli chì so mintuvati",
-  "privacy.direct.short": "Direct",
-  "privacy.private.long": "Mustrà solu à l'abbunati",
-  "privacy.private.short": "Followers-only",
   "privacy.public.short": "Pubblicu",
-  "privacy.unlisted.short": "Micca listatu",
   "refresh": "Attualizà",
   "regeneration_indicator.label": "Caricamentu…",
   "regeneration_indicator.sublabel": "Priparazione di a vostra pagina d'accolta!",
@@ -409,7 +394,6 @@
   "upload_form.description": "Discrizzione per i malvistosi",
   "upload_form.edit": "Mudificà",
   "upload_form.thumbnail": "Cambià vignetta",
-  "upload_form.undo": "Sguassà",
   "upload_form.video_description": "Discrizzione per i ciochi o cechi",
   "upload_modal.analyzing_picture": "Analisi di u ritrattu…",
   "upload_modal.apply": "Affettà",
diff --git a/app/javascript/mastodon/locales/cs.json b/app/javascript/mastodon/locales/cs.json
index e18cabcec1f194..7d91670de0629a 100644
--- a/app/javascript/mastodon/locales/cs.json
+++ b/app/javascript/mastodon/locales/cs.json
@@ -87,7 +87,6 @@
   "announcement.announcement": "Oznámení",
   "attachments_list.unprocessed": "(nezpracováno)",
   "audio.hide": "Skrýt zvuk",
-  "autosuggest_hashtag.per_week": "{count} za týden",
   "boost_modal.combo": "Příště můžete pro přeskočení stisknout {combo}",
   "bundle_column_error.copy_stacktrace": "Zkopírovat zprávu o chybě",
   "bundle_column_error.error.body": "Požadovanou stránku nelze vykreslit. Může to být způsobeno chybou v našem kódu nebo problémem s kompatibilitou prohlížeče.",
@@ -144,22 +143,12 @@
   "compose_form.lock_disclaimer": "Váš účet není {locked}. Kdokoliv vás může sledovat a vidět vaše příspěvky učené pouze pro sledující.",
   "compose_form.lock_disclaimer.lock": "zamčený",
   "compose_form.placeholder": "Co se vám honí hlavou?",
-  "compose_form.poll.add_option": "Přidat volbu",
   "compose_form.poll.duration": "Doba trvání ankety",
-  "compose_form.poll.option_placeholder": "Volba {number}",
-  "compose_form.poll.remove_option": "Odebrat tuto volbu",
   "compose_form.poll.switch_to_multiple": "Povolit u ankety výběr více voleb",
   "compose_form.poll.switch_to_single": "Povolit u ankety výběr pouze jedné volby",
-  "compose_form.publish": "Zveřejnit",
   "compose_form.publish_form": "Zveřejnit",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Uložit změny",
-  "compose_form.sensitive.hide": "{count, plural, one {Označit média za citlivá} few {Označit média za citlivá} many {Označit média za citlivá} other {Označit média za citlivá}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Média jsou označena za citlivá} few {Média jsou označena za citlivá} many {Média jsou označena za citlivá} other {Média jsou označena za citlivá}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Média nejsou označena za citlivá} few {Média nejsou označena za citlivá} many {Média nejsou označena za citlivá} other {Média nejsou označena za citlivá}}",
   "compose_form.spoiler.marked": "Odebrat varování o obsahu",
   "compose_form.spoiler.unmarked": "Přidat varování o obsahu",
-  "compose_form.spoiler_placeholder": "Sem napište vaše varování",
   "confirmation_modal.cancel": "Zrušit",
   "confirmations.block.block_and_report": "Blokovat a nahlásit",
   "confirmations.block.confirm": "Blokovat",
@@ -401,7 +390,6 @@
   "navigation_bar.direct": "Soukromé zmínky",
   "navigation_bar.discover": "Objevit",
   "navigation_bar.domain_blocks": "Blokované domény",
-  "navigation_bar.edit_profile": "Upravit profil",
   "navigation_bar.explore": "Prozkoumat",
   "navigation_bar.favourites": "Oblíbené",
   "navigation_bar.filters": "Skrytá slova",
@@ -508,14 +496,7 @@
   "poll_button.add_poll": "Přidat anketu",
   "poll_button.remove_poll": "Odebrat anketu",
   "privacy.change": "Změnit soukromí příspěvku",
-  "privacy.direct.long": "Viditelný pouze pro zmíněné uživatele",
-  "privacy.direct.short": "Pouze zmínění lidé",
-  "privacy.private.long": "Viditelný pouze pro sledující",
-  "privacy.private.short": "Pouze sledující",
-  "privacy.public.long": "Viditelný pro všechny",
   "privacy.public.short": "Veřejné",
-  "privacy.unlisted.long": "Viditelný pro všechny, ale vyňat z funkcí objevování",
-  "privacy.unlisted.short": "Neveřejný",
   "privacy_policy.last_updated": "Naposledy aktualizováno {date}",
   "privacy_policy.title": "Zásady ochrany osobních údajů",
   "refresh": "Obnovit",
@@ -695,10 +676,8 @@
   "upload_error.poll": "Nahrávání souborů není povoleno s anketami.",
   "upload_form.audio_description": "Popis pro sluchově postižené",
   "upload_form.description": "Popis pro zrakově postižené",
-  "upload_form.description_missing": "Nebyl přidán popis",
   "upload_form.edit": "Upravit",
   "upload_form.thumbnail": "Změnit miniaturu",
-  "upload_form.undo": "Smazat",
   "upload_form.video_description": "Popis pro sluchově či zrakově postižené",
   "upload_modal.analyzing_picture": "Analyzuji obrázek…",
   "upload_modal.apply": "Použít",
diff --git a/app/javascript/mastodon/locales/cy.json b/app/javascript/mastodon/locales/cy.json
index 04b39904e48136..3cd090e186155b 100644
--- a/app/javascript/mastodon/locales/cy.json
+++ b/app/javascript/mastodon/locales/cy.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Cyhoeddiad",
   "attachments_list.unprocessed": "(heb eu prosesu)",
   "audio.hide": "Cuddio sain",
-  "autosuggest_hashtag.per_week": "{count} yr wythnos",
   "boost_modal.combo": "Mae modd pwyso {combo} er mwyn hepgor hyn tro nesa",
   "bundle_column_error.copy_stacktrace": "Copïo'r adroddiad gwall",
   "bundle_column_error.error.body": "Nid oedd modd cynhyrchu'r dudalen honno. Gall fod oherwydd gwall yn ein cod neu fater cydnawsedd porwr.",
@@ -146,22 +145,12 @@
   "compose_form.lock_disclaimer": "Nid yw eich cyfri wedi'i {locked}. Gall unrhyw un eich dilyn i weld eich postiadau dilynwyr-yn-unig.",
   "compose_form.lock_disclaimer.lock": "wedi ei gloi",
   "compose_form.placeholder": "Beth sydd ar eich meddwl?",
-  "compose_form.poll.add_option": "Ychwanegu dewis",
   "compose_form.poll.duration": "Cyfnod pleidlais",
-  "compose_form.poll.option_placeholder": "Dewis {number}",
-  "compose_form.poll.remove_option": "Tynnu'r dewis",
   "compose_form.poll.switch_to_multiple": "Newid pleidlais i adael mwy nag un dewis",
   "compose_form.poll.switch_to_single": "Newid pleidlais i gyfyngu i un dewis",
-  "compose_form.publish": "Cyhoeddi",
   "compose_form.publish_form": "Cyhoeddi",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Cadw newidiadau",
-  "compose_form.sensitive.hide": "Marcio cyfryngau fel eu bod yn sensitif",
-  "compose_form.sensitive.marked": "Cyfryngau wedi'u marcio'n sensitif",
-  "compose_form.sensitive.unmarked": "Nid yw'r cyfryngau wedi'u marcio'n sensitif",
   "compose_form.spoiler.marked": "Dileu rhybudd cynnwys",
   "compose_form.spoiler.unmarked": "Ychwanegu rhybudd cynnwys",
-  "compose_form.spoiler_placeholder": "Ysgrifenwch eich rhybudd yma",
   "confirmation_modal.cancel": "Diddymu",
   "confirmations.block.block_and_report": "Rhwystro ac Adrodd",
   "confirmations.block.confirm": "Blocio",
@@ -408,7 +397,6 @@
   "navigation_bar.direct": "Crybwylliadau preifat",
   "navigation_bar.discover": "Darganfod",
   "navigation_bar.domain_blocks": "Parthau wedi'u blocio",
-  "navigation_bar.edit_profile": "Golygu proffil",
   "navigation_bar.explore": "Darganfod",
   "navigation_bar.favourites": "Ffefrynnau",
   "navigation_bar.filters": "Geiriau wedi'u tewi",
@@ -526,14 +514,7 @@
   "poll_button.add_poll": "Ychwanegu pleidlais",
   "poll_button.remove_poll": "Tynnu pleidlais",
   "privacy.change": "Addasu preifatrwdd y post",
-  "privacy.direct.long": "Dim ond yn weladwy i ddefnyddwyr a grybwyllwyd",
-  "privacy.direct.short": "Dim ond pobl sy wedi'u crybwyll",
-  "privacy.private.long": "Dim ond pobl sy'n ddilynwyr",
-  "privacy.private.short": "Dilynwyr yn unig",
-  "privacy.public.long": "Gweladwy i bawb",
   "privacy.public.short": "Cyhoeddus",
-  "privacy.unlisted.long": "Gweladwy i bawb, ond wedi optio allan o nodweddion darganfod",
-  "privacy.unlisted.short": "Heb ei restru",
   "privacy_policy.last_updated": "Diweddarwyd ddiwethaf ar {date}",
   "privacy_policy.title": "Polisi Preifatrwydd",
   "recommended": "Argymhellwyd",
@@ -715,10 +696,8 @@
   "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.description_missing": "Dim disgrifiad wedi'i ychwanegu",
   "upload_form.edit": "Golygu",
   "upload_form.thumbnail": "Newid llun bach",
-  "upload_form.undo": "Dileu",
   "upload_form.video_description": "Disgrifio ar gyfer pobl sydd â cholled clyw neu amhariad golwg",
   "upload_modal.analyzing_picture": "Yn dadansoddi llun…",
   "upload_modal.apply": "Gosod",
diff --git a/app/javascript/mastodon/locales/da.json b/app/javascript/mastodon/locales/da.json
index 3bc830ad27f2fe..5d6cac69d83108 100644
--- a/app/javascript/mastodon/locales/da.json
+++ b/app/javascript/mastodon/locales/da.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Bekendtgørelse",
   "attachments_list.unprocessed": "(ubehandlet)",
   "audio.hide": "Skjul lyd",
-  "autosuggest_hashtag.per_week": "{count} pr. uge",
   "boost_modal.combo": "Du kan trykke {combo} for at springe dette over næste gang",
   "bundle_column_error.copy_stacktrace": "Kopiér fejlrapport",
   "bundle_column_error.error.body": "Den anmodede side kunne ikke gengives. Dette kan skyldes flere typer fejl.",
@@ -146,22 +145,22 @@
   "compose_form.lock_disclaimer": "Din konto er ikke {locked}. Enhver kan følge dig og se indlæg kun beregnet for følgere.",
   "compose_form.lock_disclaimer.lock": "låst",
   "compose_form.placeholder": "Hvad tænker du på?",
-  "compose_form.poll.add_option": "Tilføj valgmulighed",
+  "compose_form.poll.add_option": "Tilføj mulighed",
   "compose_form.poll.duration": "Afstemningens varighed",
+  "compose_form.poll.multiple": "Multivalg",
   "compose_form.poll.option_placeholder": "Valgmulighed {number}",
   "compose_form.poll.remove_option": "Fjern denne valgmulighed",
+  "compose_form.poll.single": "Vælg én",
   "compose_form.poll.switch_to_multiple": "Ændr afstemning til flervalgstype",
   "compose_form.poll.switch_to_single": "Ændr afstemning til enkeltvalgstype",
-  "compose_form.publish": "Publicér",
+  "compose_form.poll.type": "Stil",
+  "compose_form.publish": "Indsend",
   "compose_form.publish_form": "Publicér",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Gem ændringer",
-  "compose_form.sensitive.hide": "{count, plural, one {Markér medie som følsomt} other {Markér medier som følsomme}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Medie er markeret som sensitivt} other {Medier er markerede som sensitive}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Medie er ikke market som sensitivt} other {Medier er ikke markerede som sensitive}}",
+  "compose_form.reply": "Svar",
+  "compose_form.save_changes": "Opdatér",
   "compose_form.spoiler.marked": "Fjern indholdsadvarsel",
   "compose_form.spoiler.unmarked": "Tilføj indholdsadvarsel",
-  "compose_form.spoiler_placeholder": "Skriv din advarsel hér",
+  "compose_form.spoiler_placeholder": "Indholdsadvarsel (valgfri)",
   "confirmation_modal.cancel": "Afbryd",
   "confirmations.block.block_and_report": "Blokér og Anmeld",
   "confirmations.block.confirm": "Blokér",
@@ -408,7 +407,6 @@
   "navigation_bar.direct": "Private omtaler",
   "navigation_bar.discover": "Opdag",
   "navigation_bar.domain_blocks": "Blokerede domæner",
-  "navigation_bar.edit_profile": "Redigér profil",
   "navigation_bar.explore": "Udforsk",
   "navigation_bar.favourites": "Favoritter",
   "navigation_bar.filters": "Skjulte ord (mutede)",
@@ -526,14 +524,15 @@
   "poll_button.add_poll": "Tilføj en afstemning",
   "poll_button.remove_poll": "Fjern afstemning",
   "privacy.change": "Tilpas indlægsfortrolighed",
-  "privacy.direct.long": "Kun synlig for nævnte brugere",
-  "privacy.direct.short": "Kun omtalte personer",
-  "privacy.private.long": "Kun synlig for følgere",
-  "privacy.private.short": "Kun følgere",
-  "privacy.public.long": "Synlig for alle",
+  "privacy.direct.long": "Alle nævnt i indlægget",
+  "privacy.direct.short": "Bestemte personer",
+  "privacy.private.long": "Kun dine følgere",
+  "privacy.private.short": "Følgere",
+  "privacy.public.long": "Alle på og udenfor Mastodon",
   "privacy.public.short": "Offentlig",
-  "privacy.unlisted.long": "Synlig for alle, men med fravalgt visning i opdagelsesfunktioner",
-  "privacy.unlisted.short": "Diskret",
+  "privacy.unlisted.additional": "Dette er præcis som offentlig adfærd, dog vises indlægget ikke i live feeds/hashtags, udforsk eller Mastodon-søgning, selv hvis valget gælder hele kontoen.",
+  "privacy.unlisted.long": "Færre algoritmiske fanfarer",
+  "privacy.unlisted.short": "Tavsgøre offentligt",
   "privacy_policy.last_updated": "Senest opdateret {date}",
   "privacy_policy.title": "Privatlivspolitik",
   "recommended": "Anbefalet",
@@ -551,7 +550,9 @@
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "i dag",
+  "reply_indicator.attachments": "{count, plural, one {# vedhæftning} other {# vedhæftninger}}",
   "reply_indicator.cancel": "Afbryd",
+  "reply_indicator.poll": "Afstemning",
   "report.block": "Blokér",
   "report.block_explanation": "Du vil ikke se vedkommendes indlæg. Vedkommende vil ikke kunne se dine indlæg eller følge dig. Vedkommende vil kunne se, at de er blokeret.",
   "report.categories.legal": "Juridisk",
@@ -715,10 +716,8 @@
   "upload_error.poll": "Filupload ikke tilladt for afstemninger.",
   "upload_form.audio_description": "Beskrivelse til hørehæmmede",
   "upload_form.description": "Beskrivelse til svagtseende",
-  "upload_form.description_missing": "Ingen beskrivelse tilføjet",
   "upload_form.edit": "Redigér",
   "upload_form.thumbnail": "Skift miniature",
-  "upload_form.undo": "Slet",
   "upload_form.video_description": "Beskrivelse for hørehæmmede eller synshandicappede personer",
   "upload_modal.analyzing_picture": "Analyserer billede…",
   "upload_modal.apply": "Anvend",
diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json
index 462352750c35c2..a6dd098bb20049 100644
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Ankündigung",
   "attachments_list.unprocessed": "(ausstehend)",
   "audio.hide": "Audio ausblenden",
-  "autosuggest_hashtag.per_week": "{count} pro Woche",
   "boost_modal.combo": "Mit {combo} wird dieses Fenster beim nächsten Mal nicht mehr angezeigt",
   "bundle_column_error.copy_stacktrace": "Fehlerbericht kopieren",
   "bundle_column_error.error.body": "Die angeforderte Seite konnte nicht dargestellt werden. Dies könnte auf einen Fehler in unserem Code oder auf ein Browser-Kompatibilitätsproblem zurückzuführen sein.",
@@ -146,22 +145,22 @@
   "compose_form.lock_disclaimer": "Dein Profil ist nicht {locked}. Andere können dir folgen und deine Beiträge sehen, die nur für Follower bestimmt sind.",
   "compose_form.lock_disclaimer.lock": "geschützt",
   "compose_form.placeholder": "Was gibt’s Neues?",
-  "compose_form.poll.add_option": "Auswahl",
+  "compose_form.poll.add_option": "Auswahl hinzufügen",
   "compose_form.poll.duration": "Umfragedauer",
-  "compose_form.poll.option_placeholder": "{number}. Auswahl",
-  "compose_form.poll.remove_option": "Auswahlfeld entfernen",
+  "compose_form.poll.multiple": "Mehrfachauswahl",
+  "compose_form.poll.option_placeholder": "{number}. Auswahlmöglichkeit",
+  "compose_form.poll.remove_option": "Dieses Auswahlfeld entfernen",
+  "compose_form.poll.single": "Einfachauswahl",
   "compose_form.poll.switch_to_multiple": "Mehrfachauswahl erlauben",
-  "compose_form.poll.switch_to_single": "Nur Einzelauswahl erlauben",
+  "compose_form.poll.switch_to_single": "Nur Einfachauswahl erlauben",
+  "compose_form.poll.type": "Art",
   "compose_form.publish": "Veröffentlichen",
   "compose_form.publish_form": "Neuer Beitrag",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Änderungen speichern",
-  "compose_form.sensitive.hide": "{count, plural, one {Mit einer Inhaltswarnung versehen} other {Mit einer Inhaltswarnung versehen}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Medien-Datei ist mit einer Inhaltswarnung versehen} other {Medien-Dateien sind mit einer Inhaltswarnung versehen}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Medien-Datei ist nicht mit einer Inhaltswarnung versehen} other {Medien-Dateien sind nicht mit einer Inhaltswarnung versehen}}",
+  "compose_form.reply": "Antworten",
+  "compose_form.save_changes": "Aktualisieren",
   "compose_form.spoiler.marked": "Inhaltswarnung entfernen",
   "compose_form.spoiler.unmarked": "Inhaltswarnung hinzufügen",
-  "compose_form.spoiler_placeholder": "Inhaltswarnung",
+  "compose_form.spoiler_placeholder": "Inhaltswarnung (optional)",
   "confirmation_modal.cancel": "Abbrechen",
   "confirmations.block.block_and_report": "Blockieren und melden",
   "confirmations.block.confirm": "Blockieren",
@@ -408,7 +407,6 @@
   "navigation_bar.direct": "Private Erwähnungen",
   "navigation_bar.discover": "Entdecken",
   "navigation_bar.domain_blocks": "Blockierte Domains",
-  "navigation_bar.edit_profile": "Profil bearbeiten",
   "navigation_bar.explore": "Entdecken",
   "navigation_bar.favourites": "Favoriten",
   "navigation_bar.filters": "Stummgeschaltete Wörter",
@@ -526,14 +524,15 @@
   "poll_button.add_poll": "Umfrage erstellen",
   "poll_button.remove_poll": "Umfrage entfernen",
   "privacy.change": "Sichtbarkeit anpassen",
-  "privacy.direct.long": "Nur für die erwähnten Profile sichtbar",
-  "privacy.direct.short": "Nur erwähnte Profile",
-  "privacy.private.long": "Nur für deine Follower sichtbar",
-  "privacy.private.short": "Nur Follower",
-  "privacy.public.long": "Für alle sichtbar",
+  "privacy.direct.long": "Alle in diesem Beitrag erwähnten Profile",
+  "privacy.direct.short": "Bestimmte Profile",
+  "privacy.private.long": "Nur deine Follower",
+  "privacy.private.short": "Follower",
+  "privacy.public.long": "Alle auf und außerhalb von Mastodon",
   "privacy.public.short": "Öffentlich",
-  "privacy.unlisted.long": "Für alle sichtbar, aber nicht über die Suche zu finden",
-  "privacy.unlisted.short": "Nicht gelistet",
+  "privacy.unlisted.additional": "Das Verhalten ist wie bei „Öffentlich“, jedoch erscheint dieser Beitrag nicht in „Live-Feeds“, „Erkunden“, Hashtags oder über die Mastodon-Suchfunktion – selbst wenn du das in den Einstellungen aktiviert hast.",
+  "privacy.unlisted.long": "Weniger im Algorithmus berücksichtigt",
+  "privacy.unlisted.short": "Öffentlich (eingeschränkt)",
   "privacy_policy.last_updated": "Stand: {date}",
   "privacy_policy.title": "Datenschutzerklärung",
   "recommended": "Empfohlen",
@@ -551,7 +550,9 @@
   "relative_time.minutes": "{number} Min.",
   "relative_time.seconds": "{number} Sek.",
   "relative_time.today": "heute",
+  "reply_indicator.attachments": "{count, plural, one {# Anhang} other {# Anhänge}}",
   "reply_indicator.cancel": "Abbrechen",
+  "reply_indicator.poll": "Umfrage",
   "report.block": "Blockieren",
   "report.block_explanation": "Du wirst keine Beiträge mehr von diesem Konto sehen. Das blockierte Konto wird deine Beiträge nicht mehr sehen oder dir folgen können. Die Person könnte mitbekommen, dass du sie blockiert hast.",
   "report.categories.legal": "Rechtlich",
@@ -715,10 +716,8 @@
   "upload_error.poll": "Medien-Anhänge sind zusammen mit Umfragen nicht erlaubt.",
   "upload_form.audio_description": "Beschreibe für Menschen mit Hörbehinderung",
   "upload_form.description": "Beschreibe für Menschen mit Sehbehinderung",
-  "upload_form.description_missing": "Keine Beschreibung hinzugefügt",
   "upload_form.edit": "Bearbeiten",
   "upload_form.thumbnail": "Vorschaubild ändern",
-  "upload_form.undo": "Löschen",
   "upload_form.video_description": "Beschreibe für Menschen mit einer Hör- oder Sehbehinderung",
   "upload_modal.analyzing_picture": "Bild wird analysiert …",
   "upload_modal.apply": "Übernehmen",
diff --git a/app/javascript/mastodon/locales/el.json b/app/javascript/mastodon/locales/el.json
index 53e55fa950ad00..068d2289066738 100644
--- a/app/javascript/mastodon/locales/el.json
+++ b/app/javascript/mastodon/locales/el.json
@@ -85,7 +85,6 @@
   "announcement.announcement": "Ανακοίνωση",
   "attachments_list.unprocessed": "(μη επεξεργασμένο)",
   "audio.hide": "Απόκρυψη αρχείου ήχου",
-  "autosuggest_hashtag.per_week": "{count} ανά εβδομάδα",
   "boost_modal.combo": "Μπορείς να πατήσεις {combo} για να το προσπεράσεις την επόμενη φορά",
   "bundle_column_error.copy_stacktrace": "Αντιγραφή αναφοράς σφάλματος",
   "bundle_column_error.error.body": "Δεν ήταν δυνατή η απόδοση της σελίδας που ζήτησες. Μπορεί να οφείλεται σε σφάλμα στον κώδικά μας ή σε πρόβλημα συμβατότητας του προγράμματος περιήγησης.",
@@ -111,6 +110,7 @@
   "column.direct": "Ιδιωτικές αναφορές",
   "column.directory": "Περιήγηση στα προφίλ",
   "column.domain_blocks": "Αποκλεισμένοι τομείς",
+  "column.favourites": "Αγαπημένα",
   "column.follow_requests": "Αιτήματα ακολούθησης",
   "column.home": "Αρχική",
   "column.lists": "Λίστες",
@@ -131,6 +131,9 @@
   "community.column_settings.remote_only": "Απομακρυσμένα μόνο",
   "compose.language.change": "Αλλαγή γλώσσας",
   "compose.language.search": "Αναζήτηση γλωσσών...",
+  "compose.published.body": "Η ανάρτηση δημοσιεύτηκε.",
+  "compose.published.open": "Άνοιγμα",
+  "compose.saved.body": "Η ανάρτηση αποθηκεύτηκε.",
   "compose_form.direct_message_warning_learn_more": "Μάθε περισσότερα",
   "compose_form.encryption_warning": "Οι δημοσιεύσεις στο Mastodon δεν είναι κρυπτογραφημένες από άκρο σε άκρο. Μη μοιράζεσαι ευαίσθητες πληροφορίες μέσω του Mastodon.",
   "compose_form.hashtag_warning": "Αυτή η δημοσίευση δεν θα εμφανίζεται κάτω από οποιαδήποτε ετικέτα καθώς δεν είναι δημόσια. Μόνο οι δημόσιες δημοσιεύσεις μπορούν να αναζητηθούν με ετικέτα.",
@@ -139,20 +142,19 @@
   "compose_form.placeholder": "Τι σκέφτεσαι;",
   "compose_form.poll.add_option": "Προσθήκη επιλογής",
   "compose_form.poll.duration": "Διάρκεια δημοσκόπησης",
+  "compose_form.poll.multiple": "Πολλαπλή επιλογή",
   "compose_form.poll.option_placeholder": "Επιλογή {number}",
   "compose_form.poll.remove_option": "Αφαίρεση επιλογής",
   "compose_form.poll.switch_to_multiple": "Ενημέρωση δημοσκόπησης με πολλαπλές επιλογές",
   "compose_form.poll.switch_to_single": "Ενημέρωση δημοσκόπησης με μοναδική επιλογή",
-  "compose_form.publish": "Δημοσίευση",
+  "compose_form.poll.type": "Στυλ",
+  "compose_form.publish": "Ανάρτηση",
   "compose_form.publish_form": "Δημοσίευση",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Αποθήκευση αλλαγών",
-  "compose_form.sensitive.hide": "{count, plural, one {Επισήμανση πολυμέσου ως ευαίσθητο} other {Επισήμανση πολυμέσων ως ευαίσθητα}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Το πολυμέσο έχει σημειωθεί ως ευαίσθητο} other {Τα πολυμέσα έχουν σημειωθεί ως ευαίσθητα}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Το πολυμέσο δεν έχει σημειωθεί ως ευαίσθητο} other {Τα πολυμέσα δεν έχουν σημειωθεί ως ευαίσθητα}}",
+  "compose_form.reply": "Απάντηση",
+  "compose_form.save_changes": "Ενημέρωση",
   "compose_form.spoiler.marked": "Αφαίρεση προειδοποίηση περιεχομένου",
   "compose_form.spoiler.unmarked": "Προσθήκη προειδοποίησης περιεχομένου",
-  "compose_form.spoiler_placeholder": "Γράψε την προειδοποίησή σου εδώ",
+  "compose_form.spoiler_placeholder": "Προειδοποίηση περιεχομένου (προαιρετική)",
   "confirmation_modal.cancel": "Άκυρο",
   "confirmations.block.block_and_report": "Αποκλεισμός & Αναφορά",
   "confirmations.block.confirm": "Αποκλεισμός",
@@ -184,6 +186,7 @@
   "conversation.mark_as_read": "Σήμανση ως αναγνωσμένο",
   "conversation.open": "Προβολή συνομιλίας",
   "conversation.with": "Με {names}",
+  "copy_icon_button.copied": "Αντιγράφηκε στο πρόχειρο",
   "copypaste.copied": "Αντιγράφηκε",
   "copypaste.copy_to_clipboard": "Αντιγραφή στο πρόχειρο",
   "directory.federated": "Από το γνωστό fediverse",
@@ -380,7 +383,6 @@
   "navigation_bar.direct": "Ιδιωτικές επισημάνσεις",
   "navigation_bar.discover": "Ανακάλυψη",
   "navigation_bar.domain_blocks": "Αποκλεισμένοι τομείς",
-  "navigation_bar.edit_profile": "Επεξεργασία προφίλ",
   "navigation_bar.explore": "Εξερεύνηση",
   "navigation_bar.filters": "Αποσιωπημένες λέξεις",
   "navigation_bar.follow_requests": "Αιτήματα ακολούθησης",
@@ -450,6 +452,12 @@
   "onboarding.actions.go_to_home": "Πηγαίνετε στην αρχική σας ροή",
   "onboarding.follows.lead": "You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!",
   "onboarding.follows.title": "Δημοφιλή στο Mastodon",
+  "onboarding.profile.note": "Βιογραφικό",
+  "onboarding.profile.note_hint": "Μπορείτε να @αναφέρετε άλλα άτομα ή #hashtags…",
+  "onboarding.profile.save_and_continue": "Αποθήκευση και συνέχεια",
+  "onboarding.profile.title": "Ρύθμιση προφίλ",
+  "onboarding.profile.upload_avatar": "Μεταφόρτωση εικόνας προφίλ",
+  "onboarding.profile.upload_header": "Μεταφόρτωση κεφαλίδας προφίλ",
   "onboarding.share.lead": "Let people know how they can find you on Mastodon!\nΕνημερώστε άλλα άτομα πώς μπορούν να σας βρουν στο Mastodon!",
   "onboarding.share.next_steps": "Πιθανά επόμενα βήματα:",
   "onboarding.start.lead": "Your new Mastodon account is ready to go. Here's how you can make the most of it:",
@@ -458,6 +466,7 @@
   "onboarding.steps.follow_people.body": "You curate your own feed. Lets fill it with interesting people.",
   "onboarding.steps.follow_people.title": "Follow {count, plural, one {one person} other {# people}}",
   "onboarding.steps.publish_status.body": "Say hello to the world.",
+  "onboarding.steps.publish_status.title": "Κάντε την πρώτη σας δημοσίευση",
   "onboarding.steps.setup_profile.body": "Others are more likely to interact with you with a filled out profile.",
   "onboarding.steps.setup_profile.title": "Customize your profile",
   "onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
@@ -467,6 +476,7 @@
   "picture_in_picture.restore": "Βάλε το πίσω",
   "poll.closed": "Κλειστή",
   "poll.refresh": "Ανανέωση",
+  "poll.reveal": "Δείτε τα αποτελέσματα",
   "poll.total_people": "{count, plural, one {# άτομο} other {# άτομα}}",
   "poll.total_votes": "{count, plural, one {# ψήφος} other {# ψήφοι}}",
   "poll.vote": "Ψήφισε",
@@ -475,16 +485,14 @@
   "poll_button.add_poll": "Προσθήκη δημοσκόπησης",
   "poll_button.remove_poll": "Αφαίρεση δημοσκόπησης",
   "privacy.change": "Προσαρμογή ιδιωτικότητας ανάρτησης",
-  "privacy.direct.long": "Δημοσίευση μόνο σε όσους επισημαίνονται",
-  "privacy.direct.short": "Αναφερόμενα άτομα μόνο",
-  "privacy.private.long": "Ορατό μόνο για τους ακολούθους",
-  "privacy.private.short": "Μόνο ακόλουθοι",
-  "privacy.public.long": "Ορατό σε όλους",
+  "privacy.direct.long": "Όλοι όσοι αναφέρθηκαν στη δημοσίευση",
+  "privacy.direct.short": "Συγκεκριμένα άτομα",
+  "privacy.private.long": "Μόνο οι ακόλουθοί σας",
+  "privacy.private.short": "Ακόλουθοι",
   "privacy.public.short": "Δημόσιο",
-  "privacy.unlisted.long": "Ορατό για όλους, εκτός αυτών που δεν συμμετέχουν σε δυνατότητες ανακάλυψης",
-  "privacy.unlisted.short": "Μη καταχωρημένα",
   "privacy_policy.last_updated": "Τελευταία ενημέρωση {date}",
   "privacy_policy.title": "Πολιτική Απορρήτου",
+  "recommended": "Προτεινόμενα",
   "refresh": "Ανανέωση",
   "regeneration_indicator.label": "Φορτώνει…",
   "regeneration_indicator.sublabel": "Η αρχική σου ροή ετοιμάζεται!",
@@ -500,8 +508,10 @@
   "relative_time.seconds": "{number}δ",
   "relative_time.today": "σήμερα",
   "reply_indicator.cancel": "Άκυρο",
+  "reply_indicator.poll": "Δημοσκόπηση",
   "report.block": "Αποκλεισμός",
   "report.block_explanation": "Δεν θα βλέπεις τις αναρτήσεις του. Δεν θα μπορεί να δει τις αναρτήσεις σου ή να σε ακολουθήσει. Θα μπορεί να δει ότι έχει αποκλειστεί.",
+  "report.categories.legal": "Νομικό περιεχόμενο",
   "report.categories.other": "Άλλες",
   "report.categories.spam": "Ανεπιθύμητα",
   "report.categories.violation": "Το περιεχόμενο παραβιάζει έναν ή περισσότερους κανόνες διακομιστή",
@@ -519,6 +529,8 @@
   "report.placeholder": "Επιπλέον σχόλια",
   "report.reasons.dislike": "Δεν μου αρέσει",
   "report.reasons.dislike_description": "Δεν είναι κάτι που θα ήθελες να δεις",
+  "report.reasons.legal": "Είναι παράνομο",
+  "report.reasons.legal_description": "Πιστεύετε ότι παραβιάζει το νόμο της χώρας σας ή της χώρας του διακομιστή",
   "report.reasons.other": "Είναι κάτι άλλο",
   "report.reasons.other_description": "Το ζήτημα δεν ταιριάζει σε άλλες κατηγορίες",
   "report.reasons.spam": "Είναι σπαμ",
@@ -552,10 +564,12 @@
   "search.search_or_paste": "Αναζήτηση ή εισαγωγή URL",
   "search_popout.quick_actions": "Γρήγορες ενέργειες",
   "search_popout.recent": "Πρόσφατες αναζητήσεις",
+  "search_popout.user": "χρήστης",
   "search_results.accounts": "Προφίλ",
   "search_results.all": "Όλα",
   "search_results.hashtags": "Ετικέτες",
   "search_results.nothing_found": "Δεν βρέθηκε τίποτα με αυτούς τους όρους αναζήτησης",
+  "search_results.see_all": "Δες τα όλα",
   "search_results.statuses": "Αναρτήσεις",
   "search_results.title": "Αναζήτηση για {q}",
   "server_banner.about_active_users": "Άτομα που χρησιμοποιούν αυτόν τον διακομιστή κατά τις τελευταίες 30 ημέρες (Μηνιαία Ενεργοί Χρήστες)",
@@ -566,6 +580,8 @@
   "server_banner.server_stats": "Στατιστικά διακομιστή:",
   "sign_in_banner.create_account": "Δημιουργία λογαριασμού",
   "sign_in_banner.sign_in": "Σύνδεση",
+  "sign_in_banner.sso_redirect": "Συνδεθείτε ή Εγγραφείτε",
+  "sign_in_banner.text": "Συνδεθείτε για να ακολουθήσετε προφίλ ή ετικέτες, αγαπήστε, μοιραστείτε και απαντήστε σε δημοσιεύσεις. Μπορείτε επίσης να αλληλεπιδράσετε από τον λογαριασμό σας σε διαφορετικό διακομιστή.",
   "status.admin_account": "Άνοιγμα διεπαφής συντονισμού για τον/την @{name}",
   "status.admin_domain": "Άνοιγμα λειτουργίας διαμεσολάβησης για {domain}",
   "status.admin_status": "Άνοιγμα αυτής της ανάρτησης σε διεπαφή συντονισμού",
@@ -582,6 +598,7 @@
   "status.edited": "Επεξεργάστηκε στις {date}",
   "status.edited_x_times": "Επεξεργάστηκε {count, plural, one {{count} φορά} other {{count} φορές}}",
   "status.embed": "Ενσωμάτωσε",
+  "status.favourite": "Αγαπημένα",
   "status.filter": "Φιλτράρισμα αυτής της ανάρτησης",
   "status.filtered": "Φιλτραρισμένα",
   "status.hide": "Απόκρυψη ανάρτησης",
@@ -646,10 +663,8 @@
   "upload_error.poll": "Στις δημοσκοπήσεις δεν επιτρέπεται η μεταφόρτωση αρχείου.",
   "upload_form.audio_description": "Περιγραφή για άτομα με προβλήματα ακοής",
   "upload_form.description": "Περιγραφή για άτομα με προβλήματα όρασης",
-  "upload_form.description_missing": "Δεν προστέθηκε περιγραφή",
   "upload_form.edit": "Επεξεργασία",
   "upload_form.thumbnail": "Αλλαγή μικρογραφίας",
-  "upload_form.undo": "Διαγραφή",
   "upload_form.video_description": "Περιγραφή για άτομα με προβλήματα ακοής ή όρασης",
   "upload_modal.analyzing_picture": "Ανάλυση εικόνας…",
   "upload_modal.apply": "Εφαρμογή",
diff --git a/app/javascript/mastodon/locales/en-GB.json b/app/javascript/mastodon/locales/en-GB.json
index 37e5efa5baddf6..2cf1b4dbaec4fb 100644
--- a/app/javascript/mastodon/locales/en-GB.json
+++ b/app/javascript/mastodon/locales/en-GB.json
@@ -87,7 +87,6 @@
   "announcement.announcement": "Announcement",
   "attachments_list.unprocessed": "(unprocessed)",
   "audio.hide": "Hide audio",
-  "autosuggest_hashtag.per_week": "{count} per week",
   "boost_modal.combo": "You can press {combo} to skip this next time",
   "bundle_column_error.copy_stacktrace": "Copy error report",
   "bundle_column_error.error.body": "The requested page could not be rendered. It could be due to a bug in our code, or a browser compatibility issue.",
@@ -144,22 +143,12 @@
   "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
   "compose_form.lock_disclaimer.lock": "locked",
   "compose_form.placeholder": "What's on your mind?",
-  "compose_form.poll.add_option": "Add a choice",
   "compose_form.poll.duration": "Poll duration",
-  "compose_form.poll.option_placeholder": "Choice {number}",
-  "compose_form.poll.remove_option": "Remove this choice",
   "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
   "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
-  "compose_form.publish": "Publish",
   "compose_form.publish_form": "New post",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Save changes",
-  "compose_form.sensitive.hide": "{count, plural, one {Mark media as sensitive} other {Mark media as sensitive}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Media is marked as sensitive} other {Media is marked as sensitive}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Media is not marked as sensitive} other {Media is not marked as sensitive}}",
   "compose_form.spoiler.marked": "Remove content warning",
   "compose_form.spoiler.unmarked": "Add content warning",
-  "compose_form.spoiler_placeholder": "Write your warning here",
   "confirmation_modal.cancel": "Cancel",
   "confirmations.block.block_and_report": "Block & Report",
   "confirmations.block.confirm": "Block",
@@ -406,7 +395,6 @@
   "navigation_bar.direct": "Private mentions",
   "navigation_bar.discover": "Discover",
   "navigation_bar.domain_blocks": "Blocked domains",
-  "navigation_bar.edit_profile": "Edit profile",
   "navigation_bar.explore": "Explore",
   "navigation_bar.favourites": "Favourites",
   "navigation_bar.filters": "Muted words",
@@ -524,14 +512,7 @@
   "poll_button.add_poll": "Add a poll",
   "poll_button.remove_poll": "Remove poll",
   "privacy.change": "Change post privacy",
-  "privacy.direct.long": "Visible for mentioned users only",
-  "privacy.direct.short": "Mentioned people only",
-  "privacy.private.long": "Visible for followers only",
-  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Visible for all",
   "privacy.public.short": "Public",
-  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
-  "privacy.unlisted.short": "Unlisted",
   "privacy_policy.last_updated": "Last updated {date}",
   "privacy_policy.title": "Privacy Policy",
   "recommended": "Recommended",
@@ -713,10 +694,8 @@
   "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.description_missing": "No description added",
   "upload_form.edit": "Edit",
   "upload_form.thumbnail": "Change thumbnail",
-  "upload_form.undo": "Delete",
   "upload_form.video_description": "Describe for people who are deaf, hard of hearing, blind or have low vision",
   "upload_modal.analyzing_picture": "Analysing picture…",
   "upload_modal.apply": "Apply",
diff --git a/app/javascript/mastodon/locales/eo.json b/app/javascript/mastodon/locales/eo.json
index 643329ba993215..907a918af08d53 100644
--- a/app/javascript/mastodon/locales/eo.json
+++ b/app/javascript/mastodon/locales/eo.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Anoncoj",
   "attachments_list.unprocessed": "(neprilaborita)",
   "audio.hide": "Kaŝi aŭdion",
-  "autosuggest_hashtag.per_week": "po {count} por semajno",
   "boost_modal.combo": "Vi povas premi {combo} por preterpasi sekvafoje",
   "bundle_column_error.copy_stacktrace": "Kopii la eraran raporton",
   "bundle_column_error.error.body": "La petita paĝo ne povas redonitis. Eble estas eraro.",
@@ -146,22 +145,12 @@
   "compose_form.lock_disclaimer": "Via konto ne estas {locked}. Iu ajn povas sekvi vin por vidi viajn afiŝojn nur al la sekvantoj.",
   "compose_form.lock_disclaimer.lock": "ŝlosita",
   "compose_form.placeholder": "Kion vi pensas?",
-  "compose_form.poll.add_option": "Aldoni elekteblon",
   "compose_form.poll.duration": "Daŭro de la balotenketo",
-  "compose_form.poll.option_placeholder": "Elekteblo {number}",
-  "compose_form.poll.remove_option": "Forigi ĉi tiu elekteblon",
   "compose_form.poll.switch_to_multiple": "Ŝanĝi la balotenketon por permesi multajn elektojn",
   "compose_form.poll.switch_to_single": "Ŝanĝi la balotenketon por permesi unu solan elekton",
-  "compose_form.publish": "Afiŝi",
   "compose_form.publish_form": "Afiŝi",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Konservi ŝanĝojn",
-  "compose_form.sensitive.hide": "{count, plural, one {Marki la plurmedio kiel tikla} other {Marki la plurmedioj kiel tiklaj}}",
-  "compose_form.sensitive.marked": "{count, plural, one {La plurmedio estas markita kiel tikla} other {La plurmedioj estas markitaj kiel tiklaj}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {La plurmedio ne estas markita kiel tikla} other {La plurmedioj ne estas markitaj kiel tiklaj}}",
   "compose_form.spoiler.marked": "Forigi la averton de enhavo",
   "compose_form.spoiler.unmarked": "Aldoni averton de enhavo",
-  "compose_form.spoiler_placeholder": "Skribu vian averton ĉi tie",
   "confirmation_modal.cancel": "Nuligi",
   "confirmations.block.block_and_report": "Bloki kaj raporti",
   "confirmations.block.confirm": "Bloki",
@@ -408,7 +397,6 @@
   "navigation_bar.direct": "Privataj mencioj",
   "navigation_bar.discover": "Esplori",
   "navigation_bar.domain_blocks": "Blokitaj domajnoj",
-  "navigation_bar.edit_profile": "Redakti profilon",
   "navigation_bar.explore": "Esplori",
   "navigation_bar.favourites": "Stelumoj",
   "navigation_bar.filters": "Silentigitaj vortoj",
@@ -526,14 +514,7 @@
   "poll_button.add_poll": "Aldoni balotenketon",
   "poll_button.remove_poll": "Forigi balotenketon",
   "privacy.change": "Agordi mesaĝan privatecon",
-  "privacy.direct.long": "Videbla nur al menciitaj uzantoj",
-  "privacy.direct.short": "Nur menciitaj personoj",
-  "privacy.private.long": "Videbla nur al viaj sekvantoj",
-  "privacy.private.short": "Nur abonantoj",
-  "privacy.public.long": "Videbla por ĉiuj",
   "privacy.public.short": "Publika",
-  "privacy.unlisted.long": "Videbla por ĉiuj, sed ekskluzive el la funkcio de esploro",
-  "privacy.unlisted.short": "Nelistigita",
   "privacy_policy.last_updated": "Laste ĝisdatigita en {date}",
   "privacy_policy.title": "Politiko de privateco",
   "recommended": "Rekomendita",
@@ -715,10 +696,8 @@
   "upload_error.poll": "Alŝuto de dosiero ne permesita kun balotenketo.",
   "upload_form.audio_description": "Priskribi por homoj kiuj malfacile aŭdi",
   "upload_form.description": "Priskribi por personoj, kiuj estas blindaj aŭ havas vidmalsufiĉon",
-  "upload_form.description_missing": "Neniu priskribo aldonita",
   "upload_form.edit": "Redakti",
   "upload_form.thumbnail": "Ŝanĝi etigita bildo",
-  "upload_form.undo": "Forigi",
   "upload_form.video_description": "Priskribi por homoj kiuj malfacile aŭdi aŭ vidi",
   "upload_modal.analyzing_picture": "Bilda analizado…",
   "upload_modal.apply": "Apliki",
diff --git a/app/javascript/mastodon/locales/es-AR.json b/app/javascript/mastodon/locales/es-AR.json
index 7c2e4f0d49894d..8816f18af64e1c 100644
--- a/app/javascript/mastodon/locales/es-AR.json
+++ b/app/javascript/mastodon/locales/es-AR.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Anuncio",
   "attachments_list.unprocessed": "[sin procesar]",
   "audio.hide": "Ocultar audio",
-  "autosuggest_hashtag.per_week": "{count} por semana",
   "boost_modal.combo": "Podés hacer clic en {combo} para saltar esto la próxima vez",
   "bundle_column_error.copy_stacktrace": "Copiar informe de error",
   "bundle_column_error.error.body": "La página solicitada no pudo ser cargada. Podría deberse a un error de programación en nuestro código o a un problema de compatibilidad con el navegador web.",
@@ -146,22 +145,21 @@
   "compose_form.lock_disclaimer": "Tu cuenta no es {locked}. Todos pueden seguirte para ver tus mensajes marcados como \"Sólo para seguidores\".",
   "compose_form.lock_disclaimer.lock": "privada",
   "compose_form.placeholder": "¿Qué onda?",
-  "compose_form.poll.add_option": "Agregá una opción",
   "compose_form.poll.duration": "Duración de la encuesta",
+  "compose_form.poll.multiple": "Selección múltiple",
   "compose_form.poll.option_placeholder": "Opción {number}",
   "compose_form.poll.remove_option": "Quitar esta opción",
+  "compose_form.poll.single": "Elige uno",
   "compose_form.poll.switch_to_multiple": "Cambiar encuesta para permitir opciones múltiples",
   "compose_form.poll.switch_to_single": "Cambiar encuesta para permitir una sola opción",
+  "compose_form.poll.type": "Estilo",
   "compose_form.publish": "Publicar",
   "compose_form.publish_form": "Nuevo mensaje",
-  "compose_form.publish_loud": "¡{publish}!",
-  "compose_form.save_changes": "Guardar cambios",
-  "compose_form.sensitive.hide": "Marcar medio como sensible",
-  "compose_form.sensitive.marked": "{count, plural, one {El medio está marcado como sensible} other {Los medios están marcados como sensibles}}",
-  "compose_form.sensitive.unmarked": "El medio no está marcado como sensible",
+  "compose_form.reply": "Responder",
+  "compose_form.save_changes": "Actualizar",
   "compose_form.spoiler.marked": "Quitar advertencia de contenido",
   "compose_form.spoiler.unmarked": "Agregar advertencia de contenido",
-  "compose_form.spoiler_placeholder": "Escribí tu advertencia acá",
+  "compose_form.spoiler_placeholder": "Advertencia de contenido (opcional)",
   "confirmation_modal.cancel": "Cancelar",
   "confirmations.block.block_and_report": "Bloquear y denunciar",
   "confirmations.block.confirm": "Bloquear",
@@ -408,7 +406,6 @@
   "navigation_bar.direct": "Menciones privadas",
   "navigation_bar.discover": "Descubrir",
   "navigation_bar.domain_blocks": "Dominios bloqueados",
-  "navigation_bar.edit_profile": "Editar perfil",
   "navigation_bar.explore": "Explorá",
   "navigation_bar.favourites": "Favoritos",
   "navigation_bar.filters": "Palabras silenciadas",
@@ -526,14 +523,10 @@
   "poll_button.add_poll": "Agregar encuesta",
   "poll_button.remove_poll": "Quitar encuesta",
   "privacy.change": "Configurar privacidad del mensaje",
-  "privacy.direct.long": "Visible sólo para los usuarios mencionados",
-  "privacy.direct.short": "Sólo cuentas mencionadas",
-  "privacy.private.long": "Visible sólo para los seguidores",
-  "privacy.private.short": "Sólo para seguidores",
-  "privacy.public.long": "Visible para todos",
+  "privacy.direct.short": "Personas específicas",
+  "privacy.private.long": "Solo tus seguidores",
+  "privacy.private.short": "Seguidores",
   "privacy.public.short": "Público",
-  "privacy.unlisted.long": "Visible para todos, pero excluido de las características de descubrimiento",
-  "privacy.unlisted.short": "No listado",
   "privacy_policy.last_updated": "Última actualización: {date}",
   "privacy_policy.title": "Política de privacidad",
   "recommended": "Opción recomendada",
@@ -715,10 +708,8 @@
   "upload_error.poll": "No se permite la subida de archivos en encuestas.",
   "upload_form.audio_description": "Agregá una descripción para personas con dificultades auditivas",
   "upload_form.description": "Agregá una descripción para personas con dificultades visuales",
-  "upload_form.description_missing": "No se agregó descripción",
   "upload_form.edit": "Editar",
   "upload_form.thumbnail": "Cambiar miniatura",
-  "upload_form.undo": "Eliminar",
   "upload_form.video_description": "Agregá una descripción para personas con dificultades auditivas o visuales",
   "upload_modal.analyzing_picture": "Analizando imagen…",
   "upload_modal.apply": "Aplicar",
diff --git a/app/javascript/mastodon/locales/es-MX.json b/app/javascript/mastodon/locales/es-MX.json
index fab5f6ec96e2bf..fdc57ac6d61aa3 100644
--- a/app/javascript/mastodon/locales/es-MX.json
+++ b/app/javascript/mastodon/locales/es-MX.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Anuncio",
   "attachments_list.unprocessed": "(sin procesar)",
   "audio.hide": "Ocultar audio",
-  "autosuggest_hashtag.per_week": "{count} por semana",
   "boost_modal.combo": "Puedes hacer clic en {combo} para saltar este aviso la próxima vez",
   "bundle_column_error.copy_stacktrace": "Copiar informe de error",
   "bundle_column_error.error.body": "La página solicitada no pudo ser renderizada. Podría deberse a un error en nuestro código o a un problema de compatibilidad con el navegador.",
@@ -146,22 +145,22 @@
   "compose_form.lock_disclaimer": "Tu cuenta no está bloqueada. Todos pueden seguirte para ver tus toots solo para seguidores.",
   "compose_form.lock_disclaimer.lock": "bloqueado",
   "compose_form.placeholder": "¿En qué estás pensando?",
-  "compose_form.poll.add_option": "Añadir una opción",
+  "compose_form.poll.add_option": "Agregar opción",
   "compose_form.poll.duration": "Duración de la encuesta",
-  "compose_form.poll.option_placeholder": "Elección {number}",
+  "compose_form.poll.multiple": "Selección múltiple",
+  "compose_form.poll.option_placeholder": "Opción {number}",
   "compose_form.poll.remove_option": "Eliminar esta opción",
+  "compose_form.poll.single": "Seleccione uno",
   "compose_form.poll.switch_to_multiple": "Modificar encuesta para permitir múltiples opciones",
   "compose_form.poll.switch_to_single": "Modificar encuesta para permitir una única opción",
-  "compose_form.publish": "Publicar",
+  "compose_form.poll.type": "Estilo",
+  "compose_form.publish": "Publicación",
   "compose_form.publish_form": "Publicar",
-  "compose_form.publish_loud": "¡{publish}!",
-  "compose_form.save_changes": "Guardar cambios",
-  "compose_form.sensitive.hide": "Marcar multimedia como sensible",
-  "compose_form.sensitive.marked": "Material marcado como sensible",
-  "compose_form.sensitive.unmarked": "Material no marcado como sensible",
+  "compose_form.reply": "Respuesta",
+  "compose_form.save_changes": "Actualización",
   "compose_form.spoiler.marked": "Texto oculto tras la advertencia",
   "compose_form.spoiler.unmarked": "Texto no oculto",
-  "compose_form.spoiler_placeholder": "Advertencia de contenido",
+  "compose_form.spoiler_placeholder": "Advertencia de contenido (opcional)",
   "confirmation_modal.cancel": "Cancelar",
   "confirmations.block.block_and_report": "Bloquear y Denunciar",
   "confirmations.block.confirm": "Bloquear",
@@ -408,7 +407,6 @@
   "navigation_bar.direct": "Menciones privadas",
   "navigation_bar.discover": "Descubrir",
   "navigation_bar.domain_blocks": "Dominios ocultos",
-  "navigation_bar.edit_profile": "Editar perfil",
   "navigation_bar.explore": "Explorar",
   "navigation_bar.favourites": "Favoritos",
   "navigation_bar.filters": "Palabras silenciadas",
@@ -526,14 +524,15 @@
   "poll_button.add_poll": "Añadir una encuesta",
   "poll_button.remove_poll": "Eliminar encuesta",
   "privacy.change": "Ajustar privacidad",
-  "privacy.direct.long": "Sólo mostrar a los usuarios mencionados",
-  "privacy.direct.short": "Solo personas mencionadas",
-  "privacy.private.long": "Sólo mostrar a seguidores",
-  "privacy.private.short": "Solo seguidores",
-  "privacy.public.long": "Visible para todos",
+  "privacy.direct.long": "Todos los mencionados en la publicación",
+  "privacy.direct.short": "Personas específicas",
+  "privacy.private.long": "Sólo tus seguidores",
+  "privacy.private.short": "Seguidores",
+  "privacy.public.long": "Cualquiera dentro y fuera de Mastodon",
   "privacy.public.short": "Público",
-  "privacy.unlisted.long": "Visible para todos, pero excluido de las funciones de descubrimiento",
-  "privacy.unlisted.short": "No listado",
+  "privacy.unlisted.additional": "Esto se comporta exactamente igual que el público, excepto que el post no aparecerá en las cronologías en directo o en los hashtags, la exploración o busquedas en Mastodon, incluso si está optado por activar la cuenta de usuario.",
+  "privacy.unlisted.long": "Menos fanfares algorítmicos",
+  "privacy.unlisted.short": "Público silencioso",
   "privacy_policy.last_updated": "Actualizado por última vez {date}",
   "privacy_policy.title": "Política de Privacidad",
   "recommended": "Recomendado",
@@ -551,7 +550,9 @@
   "relative_time.minutes": "{number} m",
   "relative_time.seconds": "{number} s",
   "relative_time.today": "hoy",
+  "reply_indicator.attachments": "{count, plural, one {# adjunto} other {# adjuntos}}",
   "reply_indicator.cancel": "Cancelar",
+  "reply_indicator.poll": "Encuesta",
   "report.block": "Bloquear",
   "report.block_explanation": "No veras sus publicaciones. No podrán ver tus publicaciones ni seguirte. Podrán saber que están bloqueados.",
   "report.categories.legal": "Legal",
@@ -715,10 +716,8 @@
   "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.description_missing": "Sin descripción añadida",
   "upload_form.edit": "Editar",
   "upload_form.thumbnail": "Cambiar miniatura",
-  "upload_form.undo": "Borrar",
   "upload_form.video_description": "Describir para personas con problemas auditivos o visuales",
   "upload_modal.analyzing_picture": "Analizando imagen…",
   "upload_modal.apply": "Aplicar",
diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json
index 0d6149f5f51a2c..2e4ea93177a6fc 100644
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Anuncio",
   "attachments_list.unprocessed": "(sin procesar)",
   "audio.hide": "Ocultar audio",
-  "autosuggest_hashtag.per_week": "{count} por semana",
   "boost_modal.combo": "Puedes hacer clic en {combo} para saltar este aviso la próxima vez",
   "bundle_column_error.copy_stacktrace": "Copiar informe de error",
   "bundle_column_error.error.body": "La página solicitada no pudo ser renderizada. Podría deberse a un error en nuestro código o a un problema de compatibilidad con el navegador.",
@@ -146,22 +145,21 @@
   "compose_form.lock_disclaimer": "Tu cuenta no está {locked}. Todos pueden seguirte para ver tus publicaciones solo para seguidores.",
   "compose_form.lock_disclaimer.lock": "bloqueado",
   "compose_form.placeholder": "¿En qué estás pensando?",
-  "compose_form.poll.add_option": "Añadir una opción",
   "compose_form.poll.duration": "Duración de la encuesta",
-  "compose_form.poll.option_placeholder": "Elección {number}",
-  "compose_form.poll.remove_option": "Eliminar esta opción",
+  "compose_form.poll.multiple": "Selección múltiple",
+  "compose_form.poll.option_placeholder": "Opción {number}",
+  "compose_form.poll.remove_option": "Quitar esta opción",
+  "compose_form.poll.single": "Elige uno",
   "compose_form.poll.switch_to_multiple": "Modificar encuesta para permitir múltiples opciones",
   "compose_form.poll.switch_to_single": "Modificar encuesta para permitir una única opción",
+  "compose_form.poll.type": "Estilo",
   "compose_form.publish": "Publicar",
   "compose_form.publish_form": "Publicar",
-  "compose_form.publish_loud": "¡{publish}!",
-  "compose_form.save_changes": "Guardar cambios",
-  "compose_form.sensitive.hide": "{count, plural, one {Marcar material como sensible} other {Marcar material como sensible}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Material marcado como sensible} other {Material marcado como sensible}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Material no marcado como sensible} other {Material no marcado como sensible}}",
+  "compose_form.reply": "Responder",
+  "compose_form.save_changes": "Actualizar",
   "compose_form.spoiler.marked": "Quitar advertencia de contenido",
   "compose_form.spoiler.unmarked": "Añadir advertencia de contenido",
-  "compose_form.spoiler_placeholder": "Escribe aquí tu advertencia",
+  "compose_form.spoiler_placeholder": "Advertencia de contenido (opcional)",
   "confirmation_modal.cancel": "Cancelar",
   "confirmations.block.block_and_report": "Bloquear y Reportar",
   "confirmations.block.confirm": "Bloquear",
@@ -408,7 +406,6 @@
   "navigation_bar.direct": "Menciones privadas",
   "navigation_bar.discover": "Descubrir",
   "navigation_bar.domain_blocks": "Dominios ocultos",
-  "navigation_bar.edit_profile": "Editar perfil",
   "navigation_bar.explore": "Explorar",
   "navigation_bar.favourites": "Favoritos",
   "navigation_bar.filters": "Palabras silenciadas",
@@ -526,14 +523,10 @@
   "poll_button.add_poll": "Añadir una encuesta",
   "poll_button.remove_poll": "Eliminar encuesta",
   "privacy.change": "Ajustar privacidad",
-  "privacy.direct.long": "Visible solo para usuarios mencionados",
-  "privacy.direct.short": "Sólo cuentas mencionadas",
-  "privacy.private.long": "Sólo mostrar a seguidores",
-  "privacy.private.short": "Solo seguidores",
-  "privacy.public.long": "Visible para todos",
+  "privacy.direct.short": "Personas específicas",
+  "privacy.private.long": "Solo tus seguidores",
+  "privacy.private.short": "Seguidores",
   "privacy.public.short": "Público",
-  "privacy.unlisted.long": "Visible para todos, pero excluido de las funciones de descubrimiento",
-  "privacy.unlisted.short": "No listado",
   "privacy_policy.last_updated": "Actualizado por última vez {date}",
   "privacy_policy.title": "Política de Privacidad",
   "recommended": "Recomendado",
@@ -715,10 +708,8 @@
   "upload_error.poll": "No se permite la subida de archivos con encuestas.",
   "upload_form.audio_description": "Describir para personas con problemas auditivos",
   "upload_form.description": "Describir para personas con discapacidad visual",
-  "upload_form.description_missing": "No se ha añadido ninguna descripción",
   "upload_form.edit": "Editar",
   "upload_form.thumbnail": "Cambiar miniatura",
-  "upload_form.undo": "Eliminar",
   "upload_form.video_description": "Describir para personas con problemas auditivos o visuales",
   "upload_modal.analyzing_picture": "Analizando imagen…",
   "upload_modal.apply": "Aplicar",
diff --git a/app/javascript/mastodon/locales/et.json b/app/javascript/mastodon/locales/et.json
index 26657d402e6dc3..5034c25541005e 100644
--- a/app/javascript/mastodon/locales/et.json
+++ b/app/javascript/mastodon/locales/et.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Teadaanne",
   "attachments_list.unprocessed": "(töötlemata)",
   "audio.hide": "Peida audio",
-  "autosuggest_hashtag.per_week": "{count} nädalas",
   "boost_modal.combo": "Vajutades {combo}, saab selle edaspidi vahele jätta",
   "bundle_column_error.copy_stacktrace": "Kopeeri veateade",
   "bundle_column_error.error.body": "Soovitud lehte ei õnnestunud esitada. See võib olla meie koodiviga või probleem brauseri ühilduvusega.",
@@ -148,20 +147,20 @@
   "compose_form.placeholder": "Millest mõtled?",
   "compose_form.poll.add_option": "Lisa valik",
   "compose_form.poll.duration": "Küsitluse kestus",
+  "compose_form.poll.multiple": "Valikvastustega",
   "compose_form.poll.option_placeholder": "Valik {number}",
   "compose_form.poll.remove_option": "Eemalda see valik",
+  "compose_form.poll.single": "Vali üks",
   "compose_form.poll.switch_to_multiple": "Muuda küsitlust mitmikvaliku lubamiseks",
   "compose_form.poll.switch_to_single": "Muuda küsitlust ainult ühe valiku lubamiseks",
+  "compose_form.poll.type": "Stiil",
   "compose_form.publish": "Postita",
   "compose_form.publish_form": "Postita",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Salvesta muudatused",
-  "compose_form.sensitive.hide": "{count, plural, one {Märgi meedia tundlikuks} other {Märgi meediad tundlikuks}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Meedia on märgitud tundlikuks} other {Meediad on märgitud tundlikuks}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Meedia ei ole tundlikuks märgitud} other {Meediad ei ole märgitud tundlikuks}}",
+  "compose_form.reply": "Vasta",
+  "compose_form.save_changes": "Uuenda",
   "compose_form.spoiler.marked": "Tekst on hoiatuse taha peidetud",
   "compose_form.spoiler.unmarked": "Märgi sisu tundlikuks",
-  "compose_form.spoiler_placeholder": "Kirjuta hoiatus siia",
+  "compose_form.spoiler_placeholder": "Sisuhoiatus (valikuline)",
   "confirmation_modal.cancel": "Katkesta",
   "confirmations.block.block_and_report": "Blokeeri ja teata",
   "confirmations.block.confirm": "Blokeeri",
@@ -408,7 +407,6 @@
   "navigation_bar.direct": "Privaatsed mainimised",
   "navigation_bar.discover": "Avasta",
   "navigation_bar.domain_blocks": "Peidetud domeenid",
-  "navigation_bar.edit_profile": "Muuda profiili",
   "navigation_bar.explore": "Avasta",
   "navigation_bar.favourites": "Lemmikud",
   "navigation_bar.filters": "Vaigistatud sõnad",
@@ -526,14 +524,14 @@
   "poll_button.add_poll": "Lisa küsitlus",
   "poll_button.remove_poll": "Eemalda küsitlus",
   "privacy.change": "Muuda postituse nähtavust",
-  "privacy.direct.long": "Postita ainult mainitud kasutajatele",
-  "privacy.direct.short": "Mainitud inimesed ainult",
-  "privacy.private.long": "Postita ainult jälgijatele",
-  "privacy.private.short": "Jälgijad ainult",
-  "privacy.public.long": "Kõigile nähtav",
+  "privacy.direct.long": "Kõik postituses mainitud",
+  "privacy.direct.short": "Määratud kasutajad",
+  "privacy.private.long": "Ainult jälgijad",
+  "privacy.private.short": "Jälgijad",
+  "privacy.public.long": "Nii kasutajad kui mittekasutajad",
   "privacy.public.short": "Avalik",
-  "privacy.unlisted.long": "Kõigile nähtav, aga ei ilmu avastamise vaadetes",
-  "privacy.unlisted.short": "Määramata",
+  "privacy.unlisted.long": "Vähem algoritmilisi teavitusi",
+  "privacy.unlisted.short": "Vaikselt avalik",
   "privacy_policy.last_updated": "Viimati uuendatud {date}",
   "privacy_policy.title": "Isikuandmete kaitse",
   "recommended": "Soovitatud",
@@ -551,7 +549,9 @@
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "täna",
+  "reply_indicator.attachments": "{count, plural, one {# lisa} other {# lisa}}",
   "reply_indicator.cancel": "Tühista",
+  "reply_indicator.poll": "Küsitlus",
   "report.block": "Blokeeri",
   "report.block_explanation": "Sa ei näe tema postitusi. Tema ei saa näha sinu postitusi ega sind jälgida. Talle on näha, et ta on blokeeritud.",
   "report.categories.legal": "Juriidiline",
@@ -715,10 +715,8 @@
   "upload_error.poll": "Küsitlustes pole faili üleslaadimine lubatud.",
   "upload_form.audio_description": "Kirjelda kuulmispuudega inimeste jaoks",
   "upload_form.description": "Kirjelda vaegnägijatele",
-  "upload_form.description_missing": "Kirjeldus puudub",
   "upload_form.edit": "Muuda",
   "upload_form.thumbnail": "Muuda pisipilti",
-  "upload_form.undo": "Kustuta",
   "upload_form.video_description": "Kirjelda kuulmis- või nägemispuudega inimeste jaoks",
   "upload_modal.analyzing_picture": "Analüüsime pilti…",
   "upload_modal.apply": "Rakenda",
diff --git a/app/javascript/mastodon/locales/eu.json b/app/javascript/mastodon/locales/eu.json
index c75f697e4c2ac7..cee18e7a513cc5 100644
--- a/app/javascript/mastodon/locales/eu.json
+++ b/app/javascript/mastodon/locales/eu.json
@@ -25,7 +25,7 @@
   "account.direct": "Aipatu pribatuki @{name}",
   "account.disable_notifications": "Utzi jakinarazteari @{name} erabiltzaileak argitaratzean",
   "account.domain_blocked": "Ezkutatutako domeinua",
-  "account.edit_profile": "Aldatu profila",
+  "account.edit_profile": "Editatu profila",
   "account.enable_notifications": "Jakinarazi @{name} erabiltzaileak argitaratzean",
   "account.endorse": "Nabarmendu profilean",
   "account.featured_tags.last_status_at": "Azken bidalketa {date} datan",
@@ -89,7 +89,6 @@
   "announcement.announcement": "Iragarpena",
   "attachments_list.unprocessed": "(prozesatu gabe)",
   "audio.hide": "Ezkutatu audioa",
-  "autosuggest_hashtag.per_week": "{count} asteko",
   "boost_modal.combo": "{combo} sakatu dezakezu hurrengoan hau saltatzeko",
   "bundle_column_error.copy_stacktrace": "Kopiatu errore-txostena",
   "bundle_column_error.error.body": "Eskatutako orria ezin izan da bistaratu. Kodeko errore bategatik izan daiteke edo nabigatzailearen bateragarritasun arazo bategatik.",
@@ -146,22 +145,22 @@
   "compose_form.lock_disclaimer": "Zure kontua ez dago {locked}. Edonork jarraitu zaitzake zure jarraitzaileentzako soilik diren bidalketak ikusteko.",
   "compose_form.lock_disclaimer.lock": "giltzapetuta",
   "compose_form.placeholder": "Zer duzu buruan?",
-  "compose_form.poll.add_option": "Gehitu aukera bat",
+  "compose_form.poll.add_option": "Gehitu aukera",
   "compose_form.poll.duration": "Inkestaren iraupena",
+  "compose_form.poll.multiple": "Aukera aniza",
   "compose_form.poll.option_placeholder": "{number}. aukera",
   "compose_form.poll.remove_option": "Kendu aukera hau",
+  "compose_form.poll.single": "Hautatu bat",
   "compose_form.poll.switch_to_multiple": "Aldatu inkesta hainbat aukera onartzeko",
   "compose_form.poll.switch_to_single": "Aldatu inkesta aukera bakarra onartzeko",
+  "compose_form.poll.type": "Estiloa",
   "compose_form.publish": "Argitaratu",
   "compose_form.publish_form": "Argitaratu",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Gorde aldaketak",
-  "compose_form.sensitive.hide": "Markatu multimedia hunkigarri gisa",
-  "compose_form.sensitive.marked": "Multimedia edukia hunkigarri gisa markatu da",
-  "compose_form.sensitive.unmarked": "Multimedia edukia ez da hunkigarri gisa markatu",
+  "compose_form.reply": "Erantzun",
+  "compose_form.save_changes": "Eguneratu",
   "compose_form.spoiler.marked": "Testua abisu batek ezkutatzen du",
   "compose_form.spoiler.unmarked": "Testua ez dago ezkutatuta",
-  "compose_form.spoiler_placeholder": "Idatzi zure abisua hemen",
+  "compose_form.spoiler_placeholder": "Edukiaren abisua (aukerakoa)",
   "confirmation_modal.cancel": "Utzi",
   "confirmations.block.block_and_report": "Blokeatu eta salatu",
   "confirmations.block.confirm": "Blokeatu",
@@ -408,7 +407,6 @@
   "navigation_bar.direct": "Aipamen pribatuak",
   "navigation_bar.discover": "Aurkitu",
   "navigation_bar.domain_blocks": "Ezkutatutako domeinuak",
-  "navigation_bar.edit_profile": "Aldatu profila",
   "navigation_bar.explore": "Arakatu",
   "navigation_bar.favourites": "Gogokoak",
   "navigation_bar.filters": "Mutututako hitzak",
@@ -526,14 +524,15 @@
   "poll_button.add_poll": "Gehitu inkesta bat",
   "poll_button.remove_poll": "Kendu inkesta",
   "privacy.change": "Aldatu bidalketaren pribatutasuna",
-  "privacy.direct.long": "Bidali aipatutako erabiltzaileei besterik ez",
-  "privacy.direct.short": "Aipatutako jendea soilik",
-  "privacy.private.long": "Bidali jarraitzaileei besterik ez",
-  "privacy.private.short": "Jarraitzaileak soilik",
-  "privacy.public.long": "Guztientzat ikusgai",
+  "privacy.direct.long": "Argitalpen honetan aipatutako denak",
+  "privacy.direct.short": "Jende jakina",
+  "privacy.private.long": "Soilik jarraitzaileak",
+  "privacy.private.short": "Jarraitzaileak",
+  "privacy.public.long": "Mastodonen dagoen edo ez dagoen edonor",
   "privacy.public.short": "Publikoa",
-  "privacy.unlisted.long": "Guztientzat ikusgai, baina ez aurkitzeko ezaugarrietan",
-  "privacy.unlisted.short": "Zerrendatu gabea",
+  "privacy.unlisted.additional": "Aukera honek publiko modua bezala funtzionatzen du, baina argitalpena ez da agertuko zuzeneko jarioetan edo traoletan, \"Arakatu\" atalean edo Mastodonen bilaketan, nahiz eta kontua zabaltzeko onartu duzun.",
+  "privacy.unlisted.long": "Tontakeria algoritmiko gutxiago",
+  "privacy.unlisted.short": "Deiadar urrikoa",
   "privacy_policy.last_updated": "Azkenengo eguneraketa {date}",
   "privacy_policy.title": "Pribatutasun politika",
   "recommended": "Gomendatua",
@@ -551,7 +550,9 @@
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "gaur",
+  "reply_indicator.attachments": "{count, plural, one {# eranskin} other {# eranskin}}",
   "reply_indicator.cancel": "Utzi",
+  "reply_indicator.poll": "Inkesta",
   "report.block": "Blokeatu",
   "report.block_explanation": "Ez dituzu bere bidalketak ikusiko. Ezingo dituzte zure bidalketak ikusi eta ez jarraitu. Blokeatu dituzula jakin dezakete.",
   "report.categories.legal": "Juridikoa",
@@ -715,10 +716,8 @@
   "upload_error.poll": "Ez da inkestetan fitxategiak igotzea onartzen.",
   "upload_form.audio_description": "Deskribatu entzumen galera duten pertsonentzat",
   "upload_form.description": "Deskribatu ikusmen arazoak dituztenentzat",
-  "upload_form.description_missing": "Ez da deskribapenik gehitu",
   "upload_form.edit": "Editatu",
   "upload_form.thumbnail": "Aldatu koadro txikia",
-  "upload_form.undo": "Ezabatu",
   "upload_form.video_description": "Deskribatu entzumen galera edo ikusmen urritasuna duten pertsonentzat",
   "upload_modal.analyzing_picture": "Irudia aztertzen…",
   "upload_modal.apply": "Aplikatu",
diff --git a/app/javascript/mastodon/locales/fa.json b/app/javascript/mastodon/locales/fa.json
index 9f3201ca786709..0b078d1ab3c676 100644
--- a/app/javascript/mastodon/locales/fa.json
+++ b/app/javascript/mastodon/locales/fa.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "اعلامیه",
   "attachments_list.unprocessed": "(پردازش نشده)",
   "audio.hide": "نهفتن صدا",
-  "autosuggest_hashtag.per_week": "{count} در هفته",
   "boost_modal.combo": "دکمهٔ {combo} را بزنید تا دیگر این را نبینید",
   "bundle_column_error.copy_stacktrace": "رونوشت از گزارش خطا",
   "bundle_column_error.error.body": "صفحهٔ درخواستی نتوانست پرداخت شود. ممکن است به خاطر اشکالی در کدمان یا مشکل سازگاری مرورگر باشد.",
@@ -148,20 +147,20 @@
   "compose_form.placeholder": "تازه چه خبر؟",
   "compose_form.poll.add_option": "افزودن گزینه",
   "compose_form.poll.duration": "مدت نظرسنجی",
+  "compose_form.poll.multiple": "چند گزینه‌ای",
   "compose_form.poll.option_placeholder": "گزینهٔ {number}",
   "compose_form.poll.remove_option": "برداشتن این گزینه",
+  "compose_form.poll.single": "گزینش یکی",
   "compose_form.poll.switch_to_multiple": "تغییر نظرسنجی برای اجازه به چندین گزینه",
   "compose_form.poll.switch_to_single": "تبدیل به نظرسنجی تک‌گزینه‌ای",
-  "compose_form.publish": "انتشار",
+  "compose_form.poll.type": "سبک",
+  "compose_form.publish": "فرستادن",
   "compose_form.publish_form": "انتشار",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "ذخیرهٔ تغییرات",
-  "compose_form.sensitive.hide": "{count, plural, one {علامت‌گذاری رسانه به عنوان حساس} other {علامت‌گذاری رسانه‌ها به عنوان حساس}}",
-  "compose_form.sensitive.marked": "{count, plural, one {رسانه به عنوان حساس علامت‌گذاری شد} other {رسانه‌ها به عنوان حساس علامت‌گذاری شدند}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {رسانه به عنوان حساس علامت‌گذاری نشد} other {رسانه‌ها به عنوان حساس علامت‌گذاری نشدند}}",
+  "compose_form.reply": "پاسخ",
+  "compose_form.save_changes": "به‌روز رسانی",
   "compose_form.spoiler.marked": "برداشتن هشدار محتوا",
   "compose_form.spoiler.unmarked": "افزودن هشدار محتوا",
-  "compose_form.spoiler_placeholder": "هشدارتان را این‌جا بنویسید",
+  "compose_form.spoiler_placeholder": "هشدار محتوا (اختیاری)",
   "confirmation_modal.cancel": "لغو",
   "confirmations.block.block_and_report": "انسداد و گزارش",
   "confirmations.block.confirm": "انسداد",
@@ -408,7 +407,6 @@
   "navigation_bar.direct": "اشاره‌های خصوصی",
   "navigation_bar.discover": "گشت و گذار",
   "navigation_bar.domain_blocks": "دامنه‌های مسدود شده",
-  "navigation_bar.edit_profile": "ویرایش نمایه",
   "navigation_bar.explore": "کاوش",
   "navigation_bar.favourites": "برگزیده‌ها",
   "navigation_bar.filters": "واژه‌های خموش",
@@ -524,14 +522,14 @@
   "poll_button.add_poll": "افزودن نظرسنجی",
   "poll_button.remove_poll": "برداشتن نظرسنجی",
   "privacy.change": "تغییر محرمانگی فرسته",
-  "privacy.direct.long": "نمایان فقط برای کاربران اشاره شده",
-  "privacy.direct.short": "فقط افراد اشاره شده",
-  "privacy.private.long": "نمایان فقط برای پی‌گیرندگان",
-  "privacy.private.short": "فقط پی‌گیرندگان",
-  "privacy.public.long": "نمایان برای همه",
+  "privacy.direct.long": "هرکسی که در فرسته نام برده شده",
+  "privacy.direct.short": "افراد مشخّص",
+  "privacy.private.long": "تنها پی‌گیرندگانتان",
+  "privacy.private.short": "پی‌گیرندگان",
+  "privacy.public.long": "هرکسی در و بیرون از ماستودون",
   "privacy.public.short": "عمومی",
-  "privacy.unlisted.long": "نمایان برای همه، ولی خارج از قابلیت‌های کشف",
-  "privacy.unlisted.short": "فهرست نشده",
+  "privacy.unlisted.long": "سروصدای الگوریتمی کم‌تر",
+  "privacy.unlisted.short": "عمومی ساکت",
   "privacy_policy.last_updated": "آخرین به‌روز رسانی در {date}",
   "privacy_policy.title": "سیاست محرمانگی",
   "recommended": "پیشنهادشده",
@@ -550,6 +548,7 @@
   "relative_time.seconds": "{number} ثانیه",
   "relative_time.today": "امروز",
   "reply_indicator.cancel": "لغو",
+  "reply_indicator.poll": "نظرسنجی",
   "report.block": "انسداد",
   "report.block_explanation": "شما فرسته‌هایشان را نخواهید دید. آن‌ها نمی‌توانند فرسته‌هایتان را ببینند یا شما را پی‌بگیرند. آنها می‌توانند بگویند که مسدود شده‌اند.",
   "report.categories.legal": "حقوقی",
@@ -713,10 +712,8 @@
   "upload_error.poll": "بارگذاری پرونده در نظرسنجی‌ها مجاز نیست.",
   "upload_form.audio_description": "برای ناشنوایان توصیفش کنید",
   "upload_form.description": "برای کم‌بینایان توصیفش کنید",
-  "upload_form.description_missing": "شرحی افزوده نشده",
   "upload_form.edit": "ویرایش",
   "upload_form.thumbnail": "تغییر بندانگشتی",
-  "upload_form.undo": "حذف",
   "upload_form.video_description": "برای کم‌بینایان یا ناشنوایان توصیفش کنید",
   "upload_modal.analyzing_picture": "در حال پردازش تصویر…",
   "upload_modal.apply": "اعمال",
diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index 00df0e537a3fcf..7b98f998363880 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Ilmoitus",
   "attachments_list.unprocessed": "(käsittelemätön)",
   "audio.hide": "Piilota ääni",
-  "autosuggest_hashtag.per_week": "{count} viikossa",
   "boost_modal.combo": "Ensi kerralla voit ohittaa tämän painamalla {combo}",
   "bundle_column_error.copy_stacktrace": "Kopioi virheraportti",
   "bundle_column_error.error.body": "Pyydettyä sivua ei voitu hahmontaa. Se voi johtua virheestä koodissamme tai selaimen yhteensopivuudessa.",
@@ -146,22 +145,22 @@
   "compose_form.lock_disclaimer": "Tilisi ei ole {locked}. Kuka tahansa voi seurata tiliäsi ja nähdä vain seuraajille rajaamasi julkaisut.",
   "compose_form.lock_disclaimer.lock": "lukittu",
   "compose_form.placeholder": "Mitä mietit?",
-  "compose_form.poll.add_option": "Lisää valinta",
+  "compose_form.poll.add_option": "Lisää vaihtoehto",
   "compose_form.poll.duration": "Äänestyksen kesto",
-  "compose_form.poll.option_placeholder": "Valinta {number}",
-  "compose_form.poll.remove_option": "Poista tämä valinta",
+  "compose_form.poll.multiple": "Monivalinta",
+  "compose_form.poll.option_placeholder": "Vaihtoehto {number}",
+  "compose_form.poll.remove_option": "Poista tämä vaihtoehto",
+  "compose_form.poll.single": "Valitse yksi",
   "compose_form.poll.switch_to_multiple": "Muuta äänestys monivalinnaksi",
   "compose_form.poll.switch_to_single": "Muuta äänestys sallimaan vain yksi valinta",
+  "compose_form.poll.type": "Tyyli",
   "compose_form.publish": "Julkaise",
   "compose_form.publish_form": "Uusi julkaisu",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Tallenna muutokset",
-  "compose_form.sensitive.hide": "{count, plural, one {Merkitse media arkaluonteiseksi} other {Merkitse mediat arkaluonteisiksi}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Media on merkitty arkaluonteiseksi} other {Mediat on merkitty arkaluonteisiksi}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Mediaa ei ole merkitty arkaluonteiseksi} other {Medioita ei ole merkitty arkaluonteisiksi}}",
+  "compose_form.reply": "Vastaa",
+  "compose_form.save_changes": "Päivitä",
   "compose_form.spoiler.marked": "Poista sisältövaroitus",
   "compose_form.spoiler.unmarked": "Lisää sisältövaroitus",
-  "compose_form.spoiler_placeholder": "Kirjoita varoituksesi tähän",
+  "compose_form.spoiler_placeholder": "Sisältövaroitus (valinnainen)",
   "confirmation_modal.cancel": "Peruuta",
   "confirmations.block.block_and_report": "Estä ja raportoi",
   "confirmations.block.confirm": "Estä",
@@ -408,7 +407,6 @@
   "navigation_bar.direct": "Yksityiset maininnat",
   "navigation_bar.discover": "Löydä uutta",
   "navigation_bar.domain_blocks": "Estetyt verkkotunnukset",
-  "navigation_bar.edit_profile": "Muokkaa profiilia",
   "navigation_bar.explore": "Selaa",
   "navigation_bar.favourites": "Suosikit",
   "navigation_bar.filters": "Mykistetyt sanat",
@@ -526,14 +524,13 @@
   "poll_button.add_poll": "Lisää äänestys",
   "poll_button.remove_poll": "Poista äänestys",
   "privacy.change": "Muuta julkaisun näkyvyyttä",
-  "privacy.direct.long": "Näkyy vain mainituille käyttäjille",
-  "privacy.direct.short": "Vain mainitut käyttäjät",
-  "privacy.private.long": "Näkyy vain seuraajille",
-  "privacy.private.short": "Vain seuraajat",
-  "privacy.public.long": "Näkyy kaikille",
+  "privacy.direct.long": "Kaikki tässä julkaisussa mainitut",
+  "privacy.direct.short": "Tietyt henkilöt",
+  "privacy.private.long": "Vain seuraajasi",
+  "privacy.private.short": "Seuraajat",
+  "privacy.public.long": "Kuka tahansa Mastodonissa ja sen ulkopuolella",
   "privacy.public.short": "Julkinen",
-  "privacy.unlisted.long": "Näkyy kaikille mutta jää pois löytämisominaisuuksista",
-  "privacy.unlisted.short": "Listaamaton",
+  "privacy.unlisted.additional": "Tämä toimii kuten julkinen, paitsi että julkaisu ei näy livesyötteissä, aihetunnisteissa, selaa-näkymässä tai Mastodon-haussa, vaikka olisit sallinut ne käyttäjätilin laajuisesti.",
   "privacy_policy.last_updated": "Viimeksi päivitetty {date}",
   "privacy_policy.title": "Tietosuojakäytäntö",
   "recommended": "Suositeltu",
@@ -551,7 +548,9 @@
   "relative_time.minutes": "{number} min",
   "relative_time.seconds": "{number} s",
   "relative_time.today": "tänään",
+  "reply_indicator.attachments": "{count, plural, one {# liite} other {# liitettä}}",
   "reply_indicator.cancel": "Peruuta",
+  "reply_indicator.poll": "Kysely",
   "report.block": "Estä",
   "report.block_explanation": "Et näe hänen viestejään, eikä hän voi nähdä viestejäsi tai seurata sinua. Hän näkee, että olet estänyt hänet.",
   "report.categories.legal": "Lakiasiat",
@@ -715,10 +714,8 @@
   "upload_error.poll": "Tiedoston lataaminen ei ole sallittua äänestyksissä.",
   "upload_form.audio_description": "Kuvaile sisältöä kuuroille ja kuulorajoitteisille",
   "upload_form.description": "Kuvaile sisältöä sokeille ja näkörajoitteisille",
-  "upload_form.description_missing": "Kuvausta ei ole lisätty",
   "upload_form.edit": "Muokkaa",
   "upload_form.thumbnail": "Vaihda pikkukuva",
-  "upload_form.undo": "Poista",
   "upload_form.video_description": "Kuvaile sisältöä kuuroille, kuulorajoitteisille, sokeille tai näkörajoitteisille",
   "upload_modal.analyzing_picture": "Analysoidaan kuvaa…",
   "upload_modal.apply": "Käytä",
diff --git a/app/javascript/mastodon/locales/fo.json b/app/javascript/mastodon/locales/fo.json
index 94d13e8d910a1e..a4c5296086f76a 100644
--- a/app/javascript/mastodon/locales/fo.json
+++ b/app/javascript/mastodon/locales/fo.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Kunngerð",
   "attachments_list.unprocessed": "(óviðgjørt)",
   "audio.hide": "Fjal ljóð",
-  "autosuggest_hashtag.per_week": "{count} um vikuna",
   "boost_modal.combo": "Tú kanst trýsta á {combo} fyri at loypa uppum hetta næstu ferð",
   "bundle_column_error.copy_stacktrace": "Avrita feilfráboðan",
   "bundle_column_error.error.body": "Umbidna síðan kann ikki vísast. Tað kann vera orsakað av einum feili í koduni hjá okkum ella tað kann vera orsakað av kaganum, sum tú brúkar.",
@@ -148,20 +147,20 @@
   "compose_form.placeholder": "Hvat hevur tú í huga?",
   "compose_form.poll.add_option": "Legg valmøguleika afturat",
   "compose_form.poll.duration": "Atkvøðugreiðslutíð",
+  "compose_form.poll.multiple": "Fleiri valmøguleikar",
   "compose_form.poll.option_placeholder": "Valmøguleiki {number}",
-  "compose_form.poll.remove_option": "Strika valmøguleikan",
+  "compose_form.poll.remove_option": "Strika hendan valmøguleikan",
+  "compose_form.poll.single": "Vel ein",
   "compose_form.poll.switch_to_multiple": "Broyt atkvøðugreiðslu til at loyva fleiri svarum",
   "compose_form.poll.switch_to_single": "Broyt atkvøðugreiðslu til einstakt svar",
-  "compose_form.publish": "Legg út",
+  "compose_form.poll.type": "Stílur",
+  "compose_form.publish": "Posta",
   "compose_form.publish_form": "Legg út",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Goym broytingar",
-  "compose_form.sensitive.hide": "{count, plural, one {Frámerk tilfar sum viðkvæmt} other {Frámerk tilfar sum viðkvæmt}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Tilfarið er frámerkt sum viðkvæmt} other {Tilfarið er frámerkt sum viðkvæmt}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Tilfarið er ikki merkt sum viðkvæmt} other {Tilfarið er ikki merkt sum viðkvæmt}}",
+  "compose_form.reply": "Svara",
+  "compose_form.save_changes": "Dagfør",
   "compose_form.spoiler.marked": "Ávaring um at strika innihald",
   "compose_form.spoiler.unmarked": "Skriva ávaring um innihald",
-  "compose_form.spoiler_placeholder": "Skriva tína ávaring her",
+  "compose_form.spoiler_placeholder": "Innihaldsávaring (valfrí)",
   "confirmation_modal.cancel": "Strika",
   "confirmations.block.block_and_report": "Banna og melda",
   "confirmations.block.confirm": "Banna",
@@ -408,7 +407,6 @@
   "navigation_bar.direct": "Privatar umrøður",
   "navigation_bar.discover": "Uppdaga",
   "navigation_bar.domain_blocks": "Bannað økisnøvn",
-  "navigation_bar.edit_profile": "Broyt vanga",
   "navigation_bar.explore": "Rannsaka",
   "navigation_bar.favourites": "Dámdir postar",
   "navigation_bar.filters": "Doyvd orð",
@@ -526,14 +524,15 @@
   "poll_button.add_poll": "Legg atkvøðugreiðslu afturat",
   "poll_button.remove_poll": "Strika atkvøðugreiðslu",
   "privacy.change": "Broyt privatverju av posti",
-  "privacy.direct.long": "Bert sjónligt hjá nevndum brúkarum",
-  "privacy.direct.short": "Bert nevnd fólk",
-  "privacy.private.long": "Bert sjónligt hjá fylgjarum",
-  "privacy.private.short": "Einans fylgjarar",
-  "privacy.public.long": "Sjónligt hjá øllum",
+  "privacy.direct.long": "Øll, sum eru nevnd í postinum",
+  "privacy.direct.short": "Ávís fólk",
+  "privacy.private.long": "Einans tey, ið fylgja tær",
+  "privacy.private.short": "Fylgjarar",
+  "privacy.public.long": "Øll í og uttanfyri Mastodon",
   "privacy.public.short": "Alment",
-  "privacy.unlisted.long": "Sjónligur fyri øll, men ikki gjøgnum uppdagingarhentleikarnar",
-  "privacy.unlisted.short": "Ikki listað",
+  "privacy.unlisted.additional": "Hetta er júst sum almenn, tó verður posturin ikki vístur í samtíðarrásum ella frámerkjum, rannsakan ella Mastodon leitingum, sjálvt um valið er galdandi fyri alla kontuna.",
+  "privacy.unlisted.long": "Færri algoritmiskar fanfarur",
+  "privacy.unlisted.short": "Stillur almenningur",
   "privacy_policy.last_updated": "Seinast dagført {date}",
   "privacy_policy.title": "Privatlívspolitikkur",
   "recommended": "Viðmælt",
@@ -551,7 +550,9 @@
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "í dag",
+  "reply_indicator.attachments": "{count, plural, one {# viðfesti} other {# viðfesti}}",
   "reply_indicator.cancel": "Ógilda",
+  "reply_indicator.poll": "Atkvøðugreiðsla",
   "report.block": "Blokera",
   "report.block_explanation": "Tú fer ikki at síggja postarnar hjá teimum. Tey kunnu ikki síggja tínar postar ella fylgja tær. Tey síggja, at tey eru blokeraði.",
   "report.categories.legal": "Løgfrøðisligt",
@@ -715,10 +716,8 @@
   "upload_error.poll": "Ikki loyvt at leggja fílur upp í spurnarkanningum.",
   "upload_form.audio_description": "Lýs fyri teimum, sum eru deyv ella hava ringa hoyrn",
   "upload_form.description": "Lýs fyri teimum, sum eru blind ella eru sjónveik",
-  "upload_form.description_missing": "Lýsing vantar",
   "upload_form.edit": "Rætta",
   "upload_form.thumbnail": "Broyt smámynd",
-  "upload_form.undo": "Strika",
   "upload_form.video_description": "Lýs fyri teimum, sum eru deyv, hava ringa hoyrn, eru blind ella eru sjónveik",
   "upload_modal.analyzing_picture": "Greini mynd…",
   "upload_modal.apply": "Ger virkið",
diff --git a/app/javascript/mastodon/locales/fr-CA.json b/app/javascript/mastodon/locales/fr-CA.json
index f2d99412d2cbee..66a7da6d151c11 100644
--- a/app/javascript/mastodon/locales/fr-CA.json
+++ b/app/javascript/mastodon/locales/fr-CA.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Annonce",
   "attachments_list.unprocessed": "(non traité)",
   "audio.hide": "Masquer l'audio",
-  "autosuggest_hashtag.per_week": "{count} par semaine",
   "boost_modal.combo": "Vous pouvez appuyer sur {combo} pour sauter ceci la prochaine fois",
   "bundle_column_error.copy_stacktrace": "Copier le rapport d'erreur",
   "bundle_column_error.error.body": "La page demandée n'a pas pu être affichée. Cela pourrait être dû à un bogue dans notre code, ou à un problème de compatibilité avec le navigateur.",
@@ -146,22 +145,12 @@
   "compose_form.lock_disclaimer": "Votre compte n’est pas {locked}. Tout le monde peut vous suivre et voir vos publications privés.",
   "compose_form.lock_disclaimer.lock": "verrouillé",
   "compose_form.placeholder": "À quoi pensez-vous?",
-  "compose_form.poll.add_option": "Ajouter un choix",
   "compose_form.poll.duration": "Durée du sondage",
-  "compose_form.poll.option_placeholder": "Choix {number}",
-  "compose_form.poll.remove_option": "Supprimer ce choix",
   "compose_form.poll.switch_to_multiple": "Changer le sondage pour autoriser plusieurs choix",
   "compose_form.poll.switch_to_single": "Changer le sondage pour n'autoriser qu'un seul choix",
-  "compose_form.publish": "Publier",
   "compose_form.publish_form": "Publier",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Enregistrer les modifications",
-  "compose_form.sensitive.hide": "{count, plural, one {Marquer média comme sensible} other {Marquer médias comme sensibles}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Le média est marqué comme sensible} other {Les médias sont marqués comme sensibles}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Le média n’est pas marqué comme sensible} other {Les médias ne sont pas marqués comme sensibles}}",
   "compose_form.spoiler.marked": "Enlever l'avertissement de contenu",
   "compose_form.spoiler.unmarked": "Ajouter un avertissement de contenu",
-  "compose_form.spoiler_placeholder": "Écrivez votre avertissement ici",
   "confirmation_modal.cancel": "Annuler",
   "confirmations.block.block_and_report": "Bloquer et signaler",
   "confirmations.block.confirm": "Bloquer",
@@ -408,7 +397,6 @@
   "navigation_bar.direct": "Mention privée",
   "navigation_bar.discover": "Découvrir",
   "navigation_bar.domain_blocks": "Domaines bloqués",
-  "navigation_bar.edit_profile": "Modifier le profil",
   "navigation_bar.explore": "Explorer",
   "navigation_bar.favourites": "Favoris",
   "navigation_bar.filters": "Mots masqués",
@@ -526,14 +514,7 @@
   "poll_button.add_poll": "Ajouter un sondage",
   "poll_button.remove_poll": "Supprimer le sondage",
   "privacy.change": "Changer la confidentialité des messages",
-  "privacy.direct.long": "Visible uniquement par les comptes mentionnés",
-  "privacy.direct.short": "Personnes mentionnées uniquement",
-  "privacy.private.long": "Visible uniquement pour vos abonné·e·s",
-  "privacy.private.short": "Abonné·e·s seulement",
-  "privacy.public.long": "Visible pour tous",
   "privacy.public.short": "Public",
-  "privacy.unlisted.long": "Visible pour tous, mais sans fonctionnalités de découverte",
-  "privacy.unlisted.short": "Non listé",
   "privacy_policy.last_updated": "Dernière mise à jour {date}",
   "privacy_policy.title": "Politique de confidentialité",
   "recommended": "Recommandé",
@@ -715,10 +696,8 @@
   "upload_error.poll": "L’envoi de fichiers n’est pas autorisé avec les sondages.",
   "upload_form.audio_description": "Décrire pour les personnes ayant des difficultés d’audition",
   "upload_form.description": "Décrire pour les malvoyants",
-  "upload_form.description_missing": "Description manquante",
   "upload_form.edit": "Modifier",
   "upload_form.thumbnail": "Changer la vignette",
-  "upload_form.undo": "Supprimer",
   "upload_form.video_description": "Décrire pour les personnes ayant des problèmes de vue ou d'audition",
   "upload_modal.analyzing_picture": "Analyse de l’image en cours…",
   "upload_modal.apply": "Appliquer",
diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json
index 774702f98cbb86..2d0fa3b7ddf127 100644
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Annonce",
   "attachments_list.unprocessed": "(non traité)",
   "audio.hide": "Masquer l'audio",
-  "autosuggest_hashtag.per_week": "{count} par semaine",
   "boost_modal.combo": "Vous pouvez appuyer sur {combo} pour passer ceci la prochaine fois",
   "bundle_column_error.copy_stacktrace": "Copier le rapport d'erreur",
   "bundle_column_error.error.body": "La page demandée n'a pas pu être affichée. Cela peut être dû à un bogue dans notre code, ou à un problème de compatibilité avec le navigateur.",
@@ -146,22 +145,12 @@
   "compose_form.lock_disclaimer": "Votre compte n’est pas {locked}. Tout le monde peut vous suivre pour voir vos messages réservés à vos abonné⋅e⋅s.",
   "compose_form.lock_disclaimer.lock": "verrouillé",
   "compose_form.placeholder": "Qu’avez-vous en tête ?",
-  "compose_form.poll.add_option": "Ajouter un choix",
   "compose_form.poll.duration": "Durée du sondage",
-  "compose_form.poll.option_placeholder": "Choix {number}",
-  "compose_form.poll.remove_option": "Supprimer ce choix",
   "compose_form.poll.switch_to_multiple": "Changer le sondage pour autoriser plusieurs choix",
   "compose_form.poll.switch_to_single": "Modifier le sondage pour autoriser qu'un seul choix",
-  "compose_form.publish": "Publier",
   "compose_form.publish_form": "Nouvelle publication",
-  "compose_form.publish_loud": "{publish} !",
-  "compose_form.save_changes": "Enregistrer les modifications",
-  "compose_form.sensitive.hide": "{count, plural, one {Marquer le média comme sensible} other {Marquer les médias comme sensibles}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Le média est marqué comme sensible} other {Les médias sont marqués comme sensibles}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Le média n’est pas marqué comme sensible} other {Les médias ne sont pas marqués comme sensibles}}",
   "compose_form.spoiler.marked": "Enlever l’avertissement de contenu",
   "compose_form.spoiler.unmarked": "Ajouter un avertissement de contenu",
-  "compose_form.spoiler_placeholder": "Écrivez votre avertissement ici",
   "confirmation_modal.cancel": "Annuler",
   "confirmations.block.block_and_report": "Bloquer et signaler",
   "confirmations.block.confirm": "Bloquer",
@@ -408,7 +397,6 @@
   "navigation_bar.direct": "Mention privée",
   "navigation_bar.discover": "Découvrir",
   "navigation_bar.domain_blocks": "Domaines bloqués",
-  "navigation_bar.edit_profile": "Modifier le profil",
   "navigation_bar.explore": "Explorer",
   "navigation_bar.favourites": "Favoris",
   "navigation_bar.filters": "Mots masqués",
@@ -526,14 +514,7 @@
   "poll_button.add_poll": "Ajouter un sondage",
   "poll_button.remove_poll": "Supprimer le sondage",
   "privacy.change": "Ajuster la confidentialité du message",
-  "privacy.direct.long": "Visible uniquement par les comptes mentionnés",
-  "privacy.direct.short": "Personnes mentionnées uniquement",
-  "privacy.private.long": "Visible uniquement par vos abonnés",
-  "privacy.private.short": "Abonnés uniquement",
-  "privacy.public.long": "Visible pour tous",
   "privacy.public.short": "Public",
-  "privacy.unlisted.long": "Visible pour tous, mais sans fonctionnalités de découverte",
-  "privacy.unlisted.short": "Non listé",
   "privacy_policy.last_updated": "Dernière mise à jour {date}",
   "privacy_policy.title": "Politique de confidentialité",
   "recommended": "Recommandé",
@@ -715,10 +696,8 @@
   "upload_error.poll": "L’envoi de fichiers n’est pas autorisé avec les sondages.",
   "upload_form.audio_description": "Décrire pour les personnes ayant des difficultés d’audition",
   "upload_form.description": "Décrire pour les malvoyant·e·s",
-  "upload_form.description_missing": "Description manquante",
   "upload_form.edit": "Modifier",
   "upload_form.thumbnail": "Changer la vignette",
-  "upload_form.undo": "Supprimer",
   "upload_form.video_description": "Décrire pour les personnes ayant des problèmes de vue ou d'audition",
   "upload_modal.analyzing_picture": "Analyse de l’image en cours…",
   "upload_modal.apply": "Appliquer",
diff --git a/app/javascript/mastodon/locales/fy.json b/app/javascript/mastodon/locales/fy.json
index ea42ef91c0962b..d5f22d2ee101d1 100644
--- a/app/javascript/mastodon/locales/fy.json
+++ b/app/javascript/mastodon/locales/fy.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Oankundiging",
   "attachments_list.unprocessed": "(net ferwurke)",
   "audio.hide": "Audio ferstopje",
-  "autosuggest_hashtag.per_week": "{count} yn ’e wike",
   "boost_modal.combo": "Jo kinne op {combo} drukke om dit de folgjende kear oer te slaan",
   "bundle_column_error.copy_stacktrace": "Flaterrapport kopiearje",
   "bundle_column_error.error.body": "De opfrege side koe net werjûn wurde. It kin wêze troch in flater yn ús koade, of in probleem mei browserkompatibiliteit.",
@@ -146,22 +145,12 @@
   "compose_form.lock_disclaimer": "Jo account is net {locked}. Elkenien kin jo folgje en kin de berjochten sjen dy’t jo allinnich oan jo folgers rjochte hawwe.",
   "compose_form.lock_disclaimer.lock": "beskoattele",
   "compose_form.placeholder": "Wat wolle jo kwyt?",
-  "compose_form.poll.add_option": "Kar tafoegje",
   "compose_form.poll.duration": "Doer fan de enkête",
-  "compose_form.poll.option_placeholder": "Kar {number}",
-  "compose_form.poll.remove_option": "Dizze kar fuortsmite",
   "compose_form.poll.switch_to_multiple": "Enkête wizigje om meardere karren ta te stean",
   "compose_form.poll.switch_to_single": "Enkête wizigje om in inkelde kar ta te stean",
-  "compose_form.publish": "Publisearje",
   "compose_form.publish_form": "Publisearje",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Wizigingen bewarje",
-  "compose_form.sensitive.hide": "{count, plural, one {Media as gefoelich markearje} other {Media as gefoelich markearje}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Media as gefoelich markearre} other {Media as gefoelich markearre}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Media is net as gefoelich markearre} other {Media is net as gefoelich markearre}}",
   "compose_form.spoiler.marked": "Ynhâldswarskôging fuortsmite",
   "compose_form.spoiler.unmarked": "Ynhâldswarskôging tafoegje",
-  "compose_form.spoiler_placeholder": "Warskôgingstekst",
   "confirmation_modal.cancel": "Annulearje",
   "confirmations.block.block_and_report": "Blokkearje en rapportearje",
   "confirmations.block.confirm": "Blokkearje",
@@ -408,7 +397,6 @@
   "navigation_bar.direct": "Priveefermeldingen",
   "navigation_bar.discover": "Untdekke",
   "navigation_bar.domain_blocks": "Blokkearre domeinen",
-  "navigation_bar.edit_profile": "Profyl bewurkje",
   "navigation_bar.explore": "Ferkenne",
   "navigation_bar.favourites": "Favoriten",
   "navigation_bar.filters": "Negearre wurden",
@@ -526,14 +514,7 @@
   "poll_button.add_poll": "Poll tafoegje",
   "poll_button.remove_poll": "Enkête fuortsmite",
   "privacy.change": "Sichtberheid fan berjocht oanpasse",
-  "privacy.direct.long": "Allinnich sichtber foar fermelde brûkers",
-  "privacy.direct.short": "Allinnich fermelde minsken",
-  "privacy.private.long": "Allinnich sichtber foar folgers",
-  "privacy.private.short": "Allinnich folgers",
-  "privacy.public.long": "Sichtber foar elkenien",
   "privacy.public.short": "Iepenbier",
-  "privacy.unlisted.long": "Foar elkenien sichtber, mar net ûnder trends, hashtags en op iepenbiere tiidlinen",
-  "privacy.unlisted.short": "Minder iepenbier",
   "privacy_policy.last_updated": "Lêst bywurke op {date}",
   "privacy_policy.title": "Privacybelied",
   "recommended": "Oanrekommandearre",
@@ -715,10 +696,8 @@
   "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.description_missing": "Gjin omskriuwing tafoege",
   "upload_form.edit": "Bewurkje",
   "upload_form.thumbnail": "Miniatuerôfbylding wizigje",
-  "upload_form.undo": "Fuortsmite",
   "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
   "upload_modal.analyzing_picture": "Ofbylding analysearje…",
   "upload_modal.apply": "Tapasse",
diff --git a/app/javascript/mastodon/locales/ga.json b/app/javascript/mastodon/locales/ga.json
index f0f9c55549664a..855a27d0579bf6 100644
--- a/app/javascript/mastodon/locales/ga.json
+++ b/app/javascript/mastodon/locales/ga.json
@@ -76,7 +76,6 @@
   "announcement.announcement": "Fógra",
   "attachments_list.unprocessed": "(neamhphróiseáilte)",
   "audio.hide": "Cuir fuaim i bhfolach",
-  "autosuggest_hashtag.per_week": "{count} sa seachtain",
   "boost_modal.combo": "Is féidir leat {combo} a bhrú chun é seo a scipeáil an chéad uair eile",
   "bundle_column_error.copy_stacktrace": "Cóipeáil tuairisc earráide",
   "bundle_column_error.error.body": "Ní féidir an leathanach a iarradh a sholáthar. Seans gurb amhlaidh mar gheall ar fhabht sa chód, nó mar gheall ar mhíréireacht leis an mbrabhsálaí.",
@@ -127,19 +126,12 @@
   "compose_form.lock_disclaimer": "Níl an cuntas seo {locked}. Féadfaidh duine ar bith tú a leanúint agus na postálacha atá dírithe agat ar do lucht leanúna amháin a fheiceáil.",
   "compose_form.lock_disclaimer.lock": "faoi ghlas",
   "compose_form.placeholder": "Cad atá ag tarlú?",
-  "compose_form.poll.add_option": "Cuir rogha isteach",
   "compose_form.poll.duration": "Achar suirbhéanna",
-  "compose_form.poll.option_placeholder": "Rogha {number}",
-  "compose_form.poll.remove_option": "Bain an rogha seo",
   "compose_form.poll.switch_to_multiple": "Athraigh suirbhé chun cead a thabhairt do ilrogha",
   "compose_form.poll.switch_to_single": "Athraigh suirbhé chun cead a thabhairt do rogha amháin",
-  "compose_form.publish": "Foilsigh",
   "compose_form.publish_form": "Foilsigh\n",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Sábháil",
   "compose_form.spoiler.marked": "Bain rabhadh ábhair",
   "compose_form.spoiler.unmarked": "Cuir rabhadh ábhair",
-  "compose_form.spoiler_placeholder": "Scríobh do rabhadh anseo",
   "confirmation_modal.cancel": "Cealaigh",
   "confirmations.block.block_and_report": "Bac ⁊ Tuairiscigh",
   "confirmations.block.confirm": "Bac",
@@ -325,7 +317,6 @@
   "navigation_bar.compose": "Cum postáil nua",
   "navigation_bar.discover": "Faigh amach",
   "navigation_bar.domain_blocks": "Fearainn bhactha",
-  "navigation_bar.edit_profile": "Cuir an phróifíl in eagar",
   "navigation_bar.explore": "Féach thart",
   "navigation_bar.filters": "Focail bhalbhaithe",
   "navigation_bar.follow_requests": "Iarratais leanúnaí",
@@ -401,12 +392,7 @@
   "poll_button.add_poll": "Cruthaigh suirbhé",
   "poll_button.remove_poll": "Bain suirbhé",
   "privacy.change": "Adjust status privacy",
-  "privacy.direct.short": "Direct",
-  "privacy.private.long": "Sofheicthe do Leantóirí amháin",
-  "privacy.private.short": "Leantóirí amháin",
-  "privacy.public.long": "Infheicthe do chách",
   "privacy.public.short": "Poiblí",
-  "privacy.unlisted.short": "Neamhliostaithe",
   "privacy_policy.title": "Polasaí príobháideachais",
   "refresh": "Athnuaigh",
   "regeneration_indicator.label": "Ag lódáil…",
@@ -529,7 +515,6 @@
   "upload_form.audio_description": "Describe for people with hearing loss",
   "upload_form.description": "Describe for the visually impaired",
   "upload_form.edit": "Cuir in eagar",
-  "upload_form.undo": "Scrios",
   "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
   "upload_modal.analyzing_picture": "Ag anailísiú íomhá…",
   "upload_modal.apply": "Cuir i bhFeidhm",
diff --git a/app/javascript/mastodon/locales/gd.json b/app/javascript/mastodon/locales/gd.json
index 11d83d6ceb14e8..0c7ef79cd8b861 100644
--- a/app/javascript/mastodon/locales/gd.json
+++ b/app/javascript/mastodon/locales/gd.json
@@ -86,7 +86,6 @@
   "announcement.announcement": "Brath-fios",
   "attachments_list.unprocessed": "(gun phròiseasadh)",
   "audio.hide": "Falaich an fhuaim",
-  "autosuggest_hashtag.per_week": "{count} san t-seachdain",
   "boost_modal.combo": "Brùth air {combo} nam b’ fheàrr leat leum a ghearradh thar seo an ath-thuras",
   "bundle_column_error.copy_stacktrace": "Dèan lethbhreac de aithris na mearachd",
   "bundle_column_error.error.body": "Cha b’ urrainn dhuinn an duilleag a dh’iarr thu a reandaradh. Dh’fhaoidte gu bheil buga sa chòd againn no duilgheadas co-chòrdalachd leis a’ bhrabhsair.",
@@ -143,22 +142,12 @@
   "compose_form.lock_disclaimer": "Chan eil an cunntas agad {locked}. ’S urrainn do dhuine sam bith ’gad leantainn is na postaichean agad a tha ag amas air an luchd-leantainn agad a-mhàin a shealltainn.",
   "compose_form.lock_disclaimer.lock": "glaiste",
   "compose_form.placeholder": "Dè tha air d’ aire?",
-  "compose_form.poll.add_option": "Cuir roghainn ris",
   "compose_form.poll.duration": "Faide a’ chunntais-bheachd",
-  "compose_form.poll.option_placeholder": "Roghainn {number}",
-  "compose_form.poll.remove_option": "Thoir an roghainn seo air falbh",
   "compose_form.poll.switch_to_multiple": "Atharraich an cunntas-bheachd ach an gabh iomadh roghainn a thaghadh",
   "compose_form.poll.switch_to_single": "Atharraich an cunntas-bheachd gus nach gabh ach aon roghainn a thaghadh",
-  "compose_form.publish": "Foillsich",
   "compose_form.publish_form": "Post ùr",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Sàbhail na h-atharraichean",
-  "compose_form.sensitive.hide": "{count, plural, one {Cuir comharra gu bheil am meadhan frionasach} two {Cuir comharra gu bheil na meadhanan frionasach} few {Cuir comharra gu bheil na meadhanan frionasach} other {Cuir comharra gu bheil na meadhanan frionasach}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Tha comharra ris a’ mheadhan gu bheil e frionasach} two {Tha comharra ris na meadhanan gu bheil iad frionasach} few {Tha comharra ris na meadhanan gu bheil iad frionasach} other {Tha comharra ris na meadhanan gu bheil iad frionasach}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Chan eil comharra ris a’ mheadhan gun robh e frionasach} two {Chan eil comharra ris na meadhanan gun robh iad frionasach} few {Chan eil comharra ris na meadhanan gun robh iad frionasach} other {Chan eil comharra ris na meadhanan gun robh iad frionasach}}",
   "compose_form.spoiler.marked": "Thoir air falbh an rabhadh susbainte",
   "compose_form.spoiler.unmarked": "Cuir rabhadh susbainte ris",
-  "compose_form.spoiler_placeholder": "Sgrìobh an rabhadh agad an-seo",
   "confirmation_modal.cancel": "Sguir dheth",
   "confirmations.block.block_and_report": "Bac ⁊ dèan gearan",
   "confirmations.block.confirm": "Bac",
@@ -402,7 +391,6 @@
   "navigation_bar.direct": "Iomraidhean prìobhaideach",
   "navigation_bar.discover": "Rùraich",
   "navigation_bar.domain_blocks": "Àrainnean bacte",
-  "navigation_bar.edit_profile": "Deasaich a’ phròifil",
   "navigation_bar.explore": "Rùraich",
   "navigation_bar.favourites": "Annsachdan",
   "navigation_bar.filters": "Faclan mùchte",
@@ -509,14 +497,7 @@
   "poll_button.add_poll": "Cuir cunntas-bheachd ris",
   "poll_button.remove_poll": "Thoir air falbh an cunntas-bheachd",
   "privacy.change": "Cuir gleus air prìobhaideachd a’ phuist",
-  "privacy.direct.long": "Chan fhaic ach na cleachdaichean le iomradh orra seo",
-  "privacy.direct.short": "An fheadhainn le iomradh orra a-mhàin",
-  "privacy.private.long": "Chan fhaic ach na daoine a tha ’gad leantainn seo",
-  "privacy.private.short": "Luchd-leantainn a-mhàin",
-  "privacy.public.long": "Chì a h-uile duine e",
   "privacy.public.short": "Poblach",
-  "privacy.unlisted.long": "Chì a h-uile duine e ach cha nochd e ann an gleusan rùrachaidh",
-  "privacy.unlisted.short": "Falaichte o liostaichean",
   "privacy_policy.last_updated": "An t-ùrachadh mu dheireadh {date}",
   "privacy_policy.title": "Poileasaidh prìobhaideachd",
   "refresh": "Ath-nuadhaich",
@@ -696,10 +677,8 @@
   "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.description_missing": "Cha deach tuairisgeul a chur ris",
   "upload_form.edit": "Deasaich",
   "upload_form.thumbnail": "Atharraich an dealbhag",
-  "upload_form.undo": "Sguab às",
   "upload_form.video_description": "Mìnich e dhan fheadhainn le èisteachd bheag no cion-lèirsinne",
   "upload_modal.analyzing_picture": "A’ sgrùdadh an deilbh…",
   "upload_modal.apply": "Cuir an sàs",
diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json
index e857b6955421b2..ffd01a547d7892 100644
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Anuncio",
   "attachments_list.unprocessed": "(sen procesar)",
   "audio.hide": "Agochar audio",
-  "autosuggest_hashtag.per_week": "{count} por semana",
   "boost_modal.combo": "Preme {combo} para ignorar isto na seguinte vez",
   "bundle_column_error.copy_stacktrace": "Copiar informe do erro",
   "bundle_column_error.error.body": "Non se puido mostrar a páxina solicitada. Podería deberse a un problema no código, ou incompatiblidade co navegador.",
@@ -146,22 +145,12 @@
   "compose_form.lock_disclaimer": "A túa conta non está {locked}. Todas poden seguirte para ollar os teus toots só para seguidoras.",
   "compose_form.lock_disclaimer.lock": "bloqueada",
   "compose_form.placeholder": "Que contas?",
-  "compose_form.poll.add_option": "Engadir unha opción",
   "compose_form.poll.duration": "Duración da enquisa",
-  "compose_form.poll.option_placeholder": "Opción {number}",
-  "compose_form.poll.remove_option": "Eliminar esta opción",
   "compose_form.poll.switch_to_multiple": "Mudar a enquisa para permitir múltiples escollas",
   "compose_form.poll.switch_to_single": "Mudar a enquisa para permitir unha soa opción",
-  "compose_form.publish": "Publicar",
   "compose_form.publish_form": "Publicar",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Gardar cambios",
-  "compose_form.sensitive.hide": "{count, plural, one {Marca multimedia como sensible} other {Marca multimedia como sensibles}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Multimedia marcado como sensible} other {Multimedia marcados como sensibles}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Multimedia non marcado como sensible} other {Multimedia non marcado como sensible}}",
   "compose_form.spoiler.marked": "Retirar o aviso sobre o contido",
   "compose_form.spoiler.unmarked": "Engadir aviso sobre o contido",
-  "compose_form.spoiler_placeholder": "Escribe o teu aviso aquí",
   "confirmation_modal.cancel": "Cancelar",
   "confirmations.block.block_and_report": "Bloquear e denunciar",
   "confirmations.block.confirm": "Bloquear",
@@ -408,7 +397,6 @@
   "navigation_bar.direct": "Mencións privadas",
   "navigation_bar.discover": "Descubrir",
   "navigation_bar.domain_blocks": "Dominios agochados",
-  "navigation_bar.edit_profile": "Editar perfil",
   "navigation_bar.explore": "Descubrir",
   "navigation_bar.favourites": "Favoritas",
   "navigation_bar.filters": "Palabras silenciadas",
@@ -526,14 +514,7 @@
   "poll_button.add_poll": "Engadir unha enquisa",
   "poll_button.remove_poll": "Eliminar enquisa",
   "privacy.change": "Axustar privacidade",
-  "privacy.direct.long": "Só para as usuarias mencionadas",
-  "privacy.direct.short": "Só persoas mencionadas",
-  "privacy.private.long": "Só para persoas que te seguen",
-  "privacy.private.short": "Só para seguidoras",
-  "privacy.public.long": "Visible por todas",
   "privacy.public.short": "Público",
-  "privacy.unlisted.long": "Visible por todas, pero excluída da sección descubrir",
-  "privacy.unlisted.short": "Sen listar",
   "privacy_policy.last_updated": "Actualizado por última vez no {date}",
   "privacy_policy.title": "Política de Privacidade",
   "recommended": "Aconsellable",
@@ -715,10 +696,8 @@
   "upload_error.poll": "Non se poden subir ficheiros nas enquisas.",
   "upload_form.audio_description": "Describir para persoas con problemas auditivos",
   "upload_form.description": "Describir para persoas cegas ou con problemas visuais",
-  "upload_form.description_missing": "Sen descrición",
   "upload_form.edit": "Editar",
   "upload_form.thumbnail": "Cambiar a miniatura",
-  "upload_form.undo": "Eliminar",
   "upload_form.video_description": "Describe para persoas con problemas visuais ou auditivos",
   "upload_modal.analyzing_picture": "Estase a analizar a imaxe…",
   "upload_modal.apply": "Aplicar",
diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json
index 67584572733f22..d88a8c49c3687d 100644
--- a/app/javascript/mastodon/locales/he.json
+++ b/app/javascript/mastodon/locales/he.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "הכרזה",
   "attachments_list.unprocessed": "(לא מעובד)",
   "audio.hide": "השתק",
-  "autosuggest_hashtag.per_week": "{count} לשבוע",
   "boost_modal.combo": "ניתן להקיש {combo} כדי לדלג בפעם הבאה",
   "bundle_column_error.copy_stacktrace": "העתקת הודעת שגיאה",
   "bundle_column_error.error.body": "הדף המבוקש אינו זמין. זה עשוי להיות באג בקוד או בעייה בתאימות הדפדפן.",
@@ -146,22 +145,22 @@
   "compose_form.lock_disclaimer": "חשבונך אינו {locked}. כל אחד יוכל לעקוב אחריך כדי לקרוא את הודעותיך המיועדות לעוקבים בלבד.",
   "compose_form.lock_disclaimer.lock": "נעול",
   "compose_form.placeholder": "על מה את.ה חושב.ת?",
-  "compose_form.poll.add_option": "הוסיפו בחירה",
+  "compose_form.poll.add_option": "הוספת אפשרות",
   "compose_form.poll.duration": "משך הסקר",
-  "compose_form.poll.option_placeholder": "אפשרות מספר {number}",
-  "compose_form.poll.remove_option": "הסר בחירה זו",
+  "compose_form.poll.multiple": "בחירה מרובה",
+  "compose_form.poll.option_placeholder": "אפשרות {number}",
+  "compose_form.poll.remove_option": "הסרת אפשרות זו",
+  "compose_form.poll.single": "נא לבחור",
   "compose_form.poll.switch_to_multiple": "אפשרו בחירה מרובה בסקר",
   "compose_form.poll.switch_to_single": "אפשרו בחירה בודדת בסקר",
-  "compose_form.publish": "פרסום",
+  "compose_form.poll.type": "סוג משאל",
+  "compose_form.publish": "הודעה",
   "compose_form.publish_form": "לפרסם",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "שמירת שינויים",
-  "compose_form.sensitive.hide": "{count, plural, one {סימון מידע כרגיש} other {סימון מידע כרגיש}}",
-  "compose_form.sensitive.marked": "{count, plural, one {מידע מסומן כרגיש} other {מידע מסומן כרגיש}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {מידע לא מסומן כרגיש} other {מידע לא מסומן כרגיש}}",
+  "compose_form.reply": "תגובה",
+  "compose_form.save_changes": "עדכון",
   "compose_form.spoiler.marked": "הסר אזהרת תוכן",
   "compose_form.spoiler.unmarked": "הוסף אזהרת תוכן",
-  "compose_form.spoiler_placeholder": "כתוב את האזהרה שלך כאן",
+  "compose_form.spoiler_placeholder": "אזהרת תוכן (לא חובה)",
   "confirmation_modal.cancel": "ביטול",
   "confirmations.block.block_and_report": "לחסום ולדווח",
   "confirmations.block.confirm": "לחסום",
@@ -408,7 +407,6 @@
   "navigation_bar.direct": "הודעות פרטיות",
   "navigation_bar.discover": "גלה",
   "navigation_bar.domain_blocks": "קהילות (שמות מתחם) חסומות",
-  "navigation_bar.edit_profile": "עריכת פרופיל",
   "navigation_bar.explore": "סיור",
   "navigation_bar.favourites": "חיבובים",
   "navigation_bar.filters": "מילים מושתקות",
@@ -526,14 +524,12 @@
   "poll_button.add_poll": "הוספת סקר",
   "poll_button.remove_poll": "הסרת סקר",
   "privacy.change": "שינוי פרטיות ההודעה",
-  "privacy.direct.long": "רק למשתמשים מאוזכרים (mentioned)",
-  "privacy.direct.short": "למאוזכרים בלבד",
-  "privacy.private.long": "הצג לעוקבים בלבד",
-  "privacy.private.short": "לעוקבים בלבד",
-  "privacy.public.long": "גלוי לכל",
+  "privacy.direct.long": "כל המוזכרים בהודעה",
+  "privacy.direct.short": "א.נשים מסוימים",
+  "privacy.private.long": "לעוקביך בלבד",
+  "privacy.private.short": "עוקבים",
+  "privacy.public.long": "כל הגולשים, מחוברים למסטודון או לא",
   "privacy.public.short": "פומבי",
-  "privacy.unlisted.long": "גלוי לכל, אבל מוסתר מאמצעי תגלית",
-  "privacy.unlisted.short": "לא רשום (לא לפיד הכללי)",
   "privacy_policy.last_updated": "עודכן לאחרונה {date}",
   "privacy_policy.title": "מדיניות פרטיות",
   "recommended": "מומלץ",
@@ -551,7 +547,9 @@
   "relative_time.minutes": "{number} דקות",
   "relative_time.seconds": "{number} שניות",
   "relative_time.today": "היום",
+  "reply_indicator.attachments": "{count, plural,one {# קובץ מצורף}other {# קבצים מצורפים}}",
   "reply_indicator.cancel": "ביטול",
+  "reply_indicator.poll": "משאל",
   "report.block": "לחסום",
   "report.block_explanation": "לא ניתן יהיה לראות את ההודעות שלהן. הן לא יוכלו לראות את ההודעות שלך או לעקוב אחריך. הם יוכלו לדעת שהם חסומים.",
   "report.categories.legal": "חוקי",
@@ -715,10 +713,8 @@
   "upload_error.poll": "לא ניתן להעלות קובץ עם סקר.",
   "upload_form.audio_description": "תאר/י עבור לקויי שמיעה",
   "upload_form.description": "תיאור לכבדי ראיה",
-  "upload_form.description_missing": "לא הוסף תיאור",
   "upload_form.edit": "עריכה",
   "upload_form.thumbnail": "שנה/י תמונה ממוזערת",
-  "upload_form.undo": "ביטול",
   "upload_form.video_description": "תאר/י עבור לקויי שמיעה ולקויי ראייה",
   "upload_modal.analyzing_picture": "מנתח תמונה…",
   "upload_modal.apply": "החל",
diff --git a/app/javascript/mastodon/locales/hi.json b/app/javascript/mastodon/locales/hi.json
index 412159bef9b7b7..42f4ca4efab233 100644
--- a/app/javascript/mastodon/locales/hi.json
+++ b/app/javascript/mastodon/locales/hi.json
@@ -83,7 +83,6 @@
   "announcement.announcement": "घोषणा",
   "attachments_list.unprocessed": "(असंसाधित)",
   "audio.hide": "हाईड ऑडियो",
-  "autosuggest_hashtag.per_week": "{count} हर सप्ताह",
   "boost_modal.combo": "अगली बार स्किप करने के लिए आप {combo} दबा सकते है",
   "bundle_column_error.copy_stacktrace": "कॉपी एरर रिपोर्ट",
   "bundle_column_error.error.body": "अनुरोधित पेज प्रस्तुत नहीं किया जा सका। यह हमारे कोड में बग या ब्राउज़र संगतता समस्या के कारण हो सकता है।",
@@ -138,22 +137,12 @@
   "compose_form.lock_disclaimer": "आपका खाता {locked} नहीं है। आपको केवल फॉलोवर्स को दिखाई दिए जाने वाले पोस्ट देखने के लिए कोई भी फॉलो कर सकता है।",
   "compose_form.lock_disclaimer.lock": "लॉक्ड",
   "compose_form.placeholder": "What is on your mind?",
-  "compose_form.poll.add_option": "विकल्प जोड़े",
   "compose_form.poll.duration": "चुनाव की अवधि",
-  "compose_form.poll.option_placeholder": "कुल विकल्प {number}",
-  "compose_form.poll.remove_option": "इस विकल्प को हटाएँ",
   "compose_form.poll.switch_to_multiple": "कई विकल्पों की अनुमति देने के लिए पोल बदलें",
   "compose_form.poll.switch_to_single": "एक ही विकल्प के लिए अनुमति देने के लिए पोल बदलें",
-  "compose_form.publish": "पब्लिश",
   "compose_form.publish_form": "पब्लिश",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "परिवर्तनों को सहेजें",
-  "compose_form.sensitive.hide": "मीडिया को संवेदनशील के रूप में चिह्नित करें",
-  "compose_form.sensitive.marked": "मीडिया संवेदनशील के रूप में चिह्नित है",
-  "compose_form.sensitive.unmarked": "मीडिया संवेदनशील के रूप में चिह्नित नहीं है",
   "compose_form.spoiler.marked": "चेतावनी के पीछे टेक्स्ट छिपा है",
   "compose_form.spoiler.unmarked": "टेक्स्ट छिपा नहीं है",
-  "compose_form.spoiler_placeholder": "अपनी चेतावनी यहाँ लिखें",
   "confirmation_modal.cancel": "रद्द करें",
   "confirmations.block.block_and_report": "ब्लॉक एवं रिपोर्ट",
   "confirmations.block.confirm": "ब्लॉक",
@@ -370,7 +359,6 @@
   "navigation_bar.direct": "निजी संदेश",
   "navigation_bar.discover": "खोजें",
   "navigation_bar.domain_blocks": "Hidden domains",
-  "navigation_bar.edit_profile": "प्रोफ़ाइल संपादित करें",
   "navigation_bar.explore": "अन्वेषण करें",
   "navigation_bar.favourites": "पसंदीदा",
   "navigation_bar.filters": "वारित शब्द",
@@ -440,13 +428,7 @@
   "poll.vote": "वोट",
   "poll.voted": "आपने इसी उत्तर का चुनाव किया है।",
   "privacy.change": "Adjust status privacy",
-  "privacy.direct.long": "Post to mentioned users only",
-  "privacy.direct.short": "Direct",
-  "privacy.private.long": "Post to followers only",
-  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "सब को दिखाई देगा",
   "privacy.public.short": "सार्वजनिक",
-  "privacy.unlisted.short": "अनलिस्टेड",
   "recommended": "अनुशंसित",
   "refresh": "रीफ्रेश करें",
   "regeneration_indicator.label": "लोड हो रहा है...",
@@ -531,7 +513,6 @@
   "upload_form.audio_description": "Describe for people with hearing loss",
   "upload_form.description": "Describe for the visually impaired",
   "upload_form.edit": "संशोधन करें",
-  "upload_form.undo": "मिटाए",
   "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
   "upload_modal.apply": "लागू करें",
   "upload_modal.edit_media": "मीडिया में संशोधन करें",
diff --git a/app/javascript/mastodon/locales/hr.json b/app/javascript/mastodon/locales/hr.json
index c535f1affc6bf4..cada365fc868c8 100644
--- a/app/javascript/mastodon/locales/hr.json
+++ b/app/javascript/mastodon/locales/hr.json
@@ -88,7 +88,6 @@
   "announcement.announcement": "Najava",
   "attachments_list.unprocessed": "(neobrađeno)",
   "audio.hide": "Sakrij audio",
-  "autosuggest_hashtag.per_week": "{count} tjedno",
   "boost_modal.combo": "Možete pritisnuti {combo} kako biste preskočili ovo sljedeći put",
   "bundle_column_error.copy_stacktrace": "Kopiraj izvješće o pogrešci",
   "bundle_column_error.error.body": "Zaraženu stranicu nije moguće prikazati. To bi moglo biti zbog pogreške u našem kodu ili problema s kompatibilnošću preglednika.",
@@ -140,22 +139,12 @@
   "compose_form.lock_disclaimer": "Vaš račun nije {locked}. Svatko Vas može pratiti kako bi vidjeli objave namijenjene Vašim pratiteljima.",
   "compose_form.lock_disclaimer.lock": "zaključan",
   "compose_form.placeholder": "Što ti je na umu?",
-  "compose_form.poll.add_option": "Dodaj opciju",
   "compose_form.poll.duration": "Trajanje ankete",
-  "compose_form.poll.option_placeholder": "Opcija {number}",
-  "compose_form.poll.remove_option": "Ukloni ovu opciju",
   "compose_form.poll.switch_to_multiple": "Omogući višestruki odabir opcija ankete",
   "compose_form.poll.switch_to_single": "Omogući odabir samo jedne opcije ankete",
-  "compose_form.publish": "Objavi",
   "compose_form.publish_form": "Objavi",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Spremi promjene",
-  "compose_form.sensitive.hide": "Označi medijski sadržaj kao osjetljiv",
-  "compose_form.sensitive.marked": "Medijski sadržaj označen je kao osjetljiv",
-  "compose_form.sensitive.unmarked": "Medijski sadržaj nije označen kao osjetljiv",
   "compose_form.spoiler.marked": "Tekst je skriven iza upozorenja",
   "compose_form.spoiler.unmarked": "Tekst nije skriven",
-  "compose_form.spoiler_placeholder": "Ovdje upišite upozorenje",
   "confirmation_modal.cancel": "Otkaži",
   "confirmations.block.block_and_report": "Blokiraj i prijavi",
   "confirmations.block.confirm": "Blokiraj",
@@ -346,7 +335,6 @@
   "navigation_bar.direct": "Privatna spominjanja",
   "navigation_bar.discover": "Istraživanje",
   "navigation_bar.domain_blocks": "Blokirane domene",
-  "navigation_bar.edit_profile": "Uredi profil",
   "navigation_bar.explore": "Istraži",
   "navigation_bar.favourites": "Favoriti",
   "navigation_bar.filters": "Utišane riječi",
@@ -415,13 +403,7 @@
   "poll_button.add_poll": "Dodaj anketu",
   "poll_button.remove_poll": "Ukloni anketu",
   "privacy.change": "Podesi privatnost toota",
-  "privacy.direct.long": "Vidljivo samo spomenutim korisnicima",
-  "privacy.direct.short": "Direct",
-  "privacy.private.long": "Vidljivo samo pratiteljima",
-  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Vidljivo svima",
   "privacy.public.short": "Javno",
-  "privacy.unlisted.short": "Neprikazano",
   "privacy_policy.last_updated": "Zadnje ažurirannje {date}",
   "privacy_policy.title": "Pravila o zaštiti privatnosti",
   "recommended": "Preporučeno",
@@ -561,10 +543,8 @@
   "upload_error.poll": "Prijenos datoteka nije dopušten kod anketa.",
   "upload_form.audio_description": "Opišite za ljude sa slabim sluhom",
   "upload_form.description": "Opišite za ljude sa slabim vidom",
-  "upload_form.description_missing": "Bez opisa",
   "upload_form.edit": "Uredi",
   "upload_form.thumbnail": "Promijeni pretpregled",
-  "upload_form.undo": "Obriši",
   "upload_form.video_description": "Opišite za ljude sa slabim sluhom ili vidom",
   "upload_modal.analyzing_picture": "Analiza slike…",
   "upload_modal.apply": "Primijeni",
diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json
index 0d50e36feb5b0d..31bca5652bcb66 100644
--- a/app/javascript/mastodon/locales/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Közlemény",
   "attachments_list.unprocessed": "(feldolgozatlan)",
   "audio.hide": "Hang elrejtése",
-  "autosuggest_hashtag.per_week": "{count} hetente",
   "boost_modal.combo": "Hogy átugord ezt következő alkalommal, használd {combo}",
   "bundle_column_error.copy_stacktrace": "Hibajelentés másolása",
   "bundle_column_error.error.body": "A kért lap nem jeleníthető meg. Ez lehet, hogy kódhiba, vagy böngészőkompatibitási hiba.",
@@ -146,22 +145,22 @@
   "compose_form.lock_disclaimer": "A fiókod nincs {locked}. Bárki követni tud, hogy megtekintse a kizárólag követőknek szánt bejegyzéseket.",
   "compose_form.lock_disclaimer.lock": "zárolva",
   "compose_form.placeholder": "Mi jár a fejedben?",
-  "compose_form.poll.add_option": "Lehetőség hozzáadása",
+  "compose_form.poll.add_option": "Opció hozzáadása",
   "compose_form.poll.duration": "Szavazás időtartama",
-  "compose_form.poll.option_placeholder": "{number}. lehetőség",
-  "compose_form.poll.remove_option": "Lehetőség eltávolítása",
+  "compose_form.poll.multiple": "Több választás",
+  "compose_form.poll.option_placeholder": "Opció {number}",
+  "compose_form.poll.remove_option": "Opció eltávolítása",
+  "compose_form.poll.single": "Egy választása",
   "compose_form.poll.switch_to_multiple": "Szavazás megváltoztatása több választásosra",
   "compose_form.poll.switch_to_single": "Szavazás megváltoztatása egyetlen választásosra",
-  "compose_form.publish": "Közzététel",
+  "compose_form.poll.type": "Stílus",
+  "compose_form.publish": "Bejegyzés",
   "compose_form.publish_form": "Új bejegyzés",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Módosítások mentése",
-  "compose_form.sensitive.hide": "{count, plural, one {Média kényesnek jelölése} other {Média kényesnek jelölése}}",
-  "compose_form.sensitive.marked": "{count, plural, one {A médiát kényesnek jelölték} other {A médiát kényesnek jelölték}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {A médiát nem jelölték kényesnek} other {A médiát nem jelölték kényesnek}}",
+  "compose_form.reply": "Válasz",
+  "compose_form.save_changes": "Frissítés",
   "compose_form.spoiler.marked": "Tartalmi figyelmeztetés eltávolítása",
   "compose_form.spoiler.unmarked": "Tartalmi figyelmeztetés hozzáadása",
-  "compose_form.spoiler_placeholder": "Írd ide a figyelmeztetést",
+  "compose_form.spoiler_placeholder": "Tartalom figyelmeztetés (opcionális)",
   "confirmation_modal.cancel": "Mégsem",
   "confirmations.block.block_and_report": "Letiltás és jelentés",
   "confirmations.block.confirm": "Letiltás",
@@ -408,7 +407,6 @@
   "navigation_bar.direct": "Személyes említések",
   "navigation_bar.discover": "Felfedezés",
   "navigation_bar.domain_blocks": "Letiltott tartományok",
-  "navigation_bar.edit_profile": "Profil szerkesztése",
   "navigation_bar.explore": "Felfedezés",
   "navigation_bar.favourites": "Kedvencek",
   "navigation_bar.filters": "Némított szavak",
@@ -526,14 +524,15 @@
   "poll_button.add_poll": "Új szavazás",
   "poll_button.remove_poll": "Szavazás eltávolítása",
   "privacy.change": "Bejegyzés láthatóságának módosítása",
-  "privacy.direct.long": "Csak a megemlített felhasználóknak látható",
-  "privacy.direct.short": "Csak megemlítetteknek",
-  "privacy.private.long": "Csak követőknek látható",
-  "privacy.private.short": "Csak követők",
-  "privacy.public.long": "Mindenki számára látható",
+  "privacy.direct.long": "Mindenki, akit a bejegyzésben említettek",
+  "privacy.direct.short": "Adott személyek",
+  "privacy.private.long": "Csak a követők",
+  "privacy.private.short": "Követők",
+  "privacy.public.long": "Bárki a Mastodonon és azon kívül",
   "privacy.public.short": "Nyilvános",
-  "privacy.unlisted.long": "Mindenki számára látható, de kimarad a felfedezős funkciókból",
-  "privacy.unlisted.short": "Listázatlan",
+  "privacy.unlisted.additional": "Ez pontosan úgy viselkedik, mint a nyilvános, kivéve, hogy a bejegyzés nem jelenik meg élő hírcsatornákban vagy hashtagokban, felfedezésben vagy a Mastodon keresésben, még akkor sem, ha az egész fiókra bejelentkezetünk.",
+  "privacy.unlisted.long": "Kevesebb algoritmikus fanfár",
+  "privacy.unlisted.short": "Csendes nyilvánosság",
   "privacy_policy.last_updated": "Utoljára frissítve: {date}",
   "privacy_policy.title": "Adatvédelmi szabályzat",
   "recommended": "Ajánlott",
@@ -551,7 +550,9 @@
   "relative_time.minutes": "{number}p",
   "relative_time.seconds": "{number}mp",
   "relative_time.today": "ma",
+  "reply_indicator.attachments": "{count, plural, one {# melléklet} other {# melléklet}}",
   "reply_indicator.cancel": "Mégsem",
+  "reply_indicator.poll": "Szavazás",
   "report.block": "Letiltás",
   "report.block_explanation": "Nem fogod látni a bejegyzéseit. Nem fogja tudni megnézni a bejegyzéseidet és nem fog tudni követni sem. Azt is meg fogja tudni mondani, hogy letiltottad.",
   "report.categories.legal": "Jogi információk",
@@ -715,10 +716,8 @@
   "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.description_missing": "Nincs leírás megadva",
   "upload_form.edit": "Szerkesztés",
   "upload_form.thumbnail": "Bélyegkép megváltoztatása",
-  "upload_form.undo": "Törlés",
   "upload_form.video_description": "Leírás siket, hallássérült, vak vagy gyengénlátó emberek számára",
   "upload_modal.analyzing_picture": "Kép elemzése…",
   "upload_modal.apply": "Alkalmaz",
diff --git a/app/javascript/mastodon/locales/hy.json b/app/javascript/mastodon/locales/hy.json
index 835105218d5218..6ddcfcdb2175da 100644
--- a/app/javascript/mastodon/locales/hy.json
+++ b/app/javascript/mastodon/locales/hy.json
@@ -70,7 +70,6 @@
   "alert.unexpected.title": "Վա՜յ",
   "announcement.announcement": "Յայտարարութիւններ",
   "audio.hide": "Թաքցնել աուդիոն",
-  "autosuggest_hashtag.per_week": "շաբաթը՝ {count}",
   "boost_modal.combo": "Կարող ես սեղմել {combo}՝ սա յաջորդ անգամ բաց թողնելու համար",
   "bundle_column_error.error.title": "Օ՜, ոչ։",
   "bundle_column_error.network.title": "Ցանցի սխալ",
@@ -117,22 +116,12 @@
   "compose_form.lock_disclaimer": "Քո հաշիւը {locked} չէ։ Իւրաքանչիւրութիւն ոք կարող է հետեւել քեզ եւ տեսնել միայն հետեւողների համար նախատեսուած գրառումները։",
   "compose_form.lock_disclaimer.lock": "փակ",
   "compose_form.placeholder": "Ի՞նչ կայ մտքիդ",
-  "compose_form.poll.add_option": "Աւելացնել տարբերակ",
   "compose_form.poll.duration": "Հարցման տեւողութիւնը",
-  "compose_form.poll.option_placeholder": "Տարբերակ {number}",
-  "compose_form.poll.remove_option": "Հեռացնել այս տարբերակը",
   "compose_form.poll.switch_to_multiple": "Հարցումը դարձնել բազմակի ընտրութեամբ",
   "compose_form.poll.switch_to_single": "Հարցումը դարձնել եզակի ընտրութեամբ",
-  "compose_form.publish": "Հրապարակել",
   "compose_form.publish_form": "Հրապարակել",
-  "compose_form.publish_loud": "Հրապարակե՜լ",
-  "compose_form.save_changes": "Պահպանել փոփոխութիւնները",
-  "compose_form.sensitive.hide": "Նշել մեդիան որպէս դիւրազգաց",
-  "compose_form.sensitive.marked": "Մեդիան նշուած է որպէս դիւրազգաց",
-  "compose_form.sensitive.unmarked": "Մեդիան նշուած չէ որպէս դիւրազգաց",
   "compose_form.spoiler.marked": "Տեքստը թաքցուած է զգուշացման ետեւում",
   "compose_form.spoiler.unmarked": "Տեքստը թաքցուած չէ",
-  "compose_form.spoiler_placeholder": "Գրիր նախազգուշացումդ այստեղ",
   "confirmation_modal.cancel": "Չեղարկել",
   "confirmations.block.block_and_report": "Արգելափակել եւ բողոքել",
   "confirmations.block.confirm": "Արգելափակել",
@@ -325,7 +314,6 @@
   "navigation_bar.direct": "Մասնաւոր յիշատակումներ",
   "navigation_bar.discover": "Բացայայտել",
   "navigation_bar.domain_blocks": "Թաքցուած տիրոյթներ",
-  "navigation_bar.edit_profile": "Խմբագրել հաշիւը",
   "navigation_bar.explore": "Բացայայտել",
   "navigation_bar.favourites": "Հաւանածներ",
   "navigation_bar.filters": "Լռեցուած բառեր",
@@ -414,13 +402,7 @@
   "poll_button.add_poll": "Աւելացնել հարցում",
   "poll_button.remove_poll": "Հեռացնել հարցումը",
   "privacy.change": "Կարգաւորել գրառման գաղտնիութիւնը",
-  "privacy.direct.long": "Կը տեսնեն միայն նշուած օգտատէրերը",
-  "privacy.direct.short": "Direct",
-  "privacy.private.long": "Կը տեսնեն միայն հետեւորդները",
-  "privacy.private.short": "Միայն հետեւողները",
-  "privacy.public.long": "Տեսանելի բոլորին",
   "privacy.public.short": "Հրապարակային",
-  "privacy.unlisted.short": "Ծածուկ",
   "privacy_policy.last_updated": "Վերջին անգամ թարմացուել է՝ {date}",
   "privacy_policy.title": "Գաղտնիութեան քաղաքականութիւն",
   "refresh": "Թարմացնել",
@@ -556,7 +538,6 @@
   "upload_form.description": "Նկարագիր՝ տեսողական խնդիրներ ունեցողների համար",
   "upload_form.edit": "Խմբագրել",
   "upload_form.thumbnail": "Փոխել պատկերակը",
-  "upload_form.undo": "Յետարկել",
   "upload_form.video_description": "Նկարագրիր տեսանիւթը լսողական կամ տեսողական խնդիրներով անձանց համար",
   "upload_modal.analyzing_picture": "Լուսանկարի վերլուծում…",
   "upload_modal.apply": "Կիրառել",
diff --git a/app/javascript/mastodon/locales/ia.json b/app/javascript/mastodon/locales/ia.json
index a660eb77ff592b..14b75a17f4351c 100644
--- a/app/javascript/mastodon/locales/ia.json
+++ b/app/javascript/mastodon/locales/ia.json
@@ -56,7 +56,6 @@
   "alert.unexpected.message": "Ocurreva un error inexpectate.",
   "announcement.announcement": "Annuncio",
   "audio.hide": "Celar audio",
-  "autosuggest_hashtag.per_week": "{count} per septimana",
   "bundle_column_error.network.title": "Error de rete",
   "bundle_column_error.retry": "Tentar novemente",
   "bundle_column_error.return": "Retornar al initio",
@@ -90,15 +89,9 @@
   "compose_form.direct_message_warning_learn_more": "Apprender plus",
   "compose_form.lock_disclaimer": "Tu conto non es {locked}. Quicunque pote sequer te pro vider tu messages solo pro sequitores.",
   "compose_form.lock_disclaimer.lock": "blocate",
-  "compose_form.poll.add_option": "Adder un option",
-  "compose_form.poll.remove_option": "Remover iste option",
-  "compose_form.publish": "Publicar",
   "compose_form.publish_form": "Nove message",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Salvar le cambiamentos",
   "compose_form.spoiler.marked": "Remover advertimento de contento",
   "compose_form.spoiler.unmarked": "Adder advertimento de contento",
-  "compose_form.spoiler_placeholder": "Scribe tu advertimento hic",
   "confirmation_modal.cancel": "Cancellar",
   "confirmations.block.confirm": "Blocar",
   "confirmations.delete.confirm": "Deler",
@@ -217,7 +210,6 @@
   "navigation_bar.direct": "Mentiones private",
   "navigation_bar.discover": "Discoperir",
   "navigation_bar.domain_blocks": "Dominios blocate",
-  "navigation_bar.edit_profile": "Modificar profilo",
   "navigation_bar.favourites": "Favoritos",
   "navigation_bar.filters": "Parolas silentiate",
   "navigation_bar.lists": "Listas",
@@ -252,8 +244,6 @@
   "poll.closed": "Claudite",
   "poll.reveal": "Vider le resultatos",
   "privacy.change": "Cambiar privacitate del message",
-  "privacy.private.long": "Visibile solmente pro sequitores",
-  "privacy.public.long": "Visibile pro totos",
   "privacy.public.short": "Public",
   "privacy_policy.last_updated": "Ultime actualisation {date}",
   "privacy_policy.title": "Politica de confidentialitate",
@@ -307,7 +297,6 @@
   "tabs_bar.notifications": "Notificationes",
   "timeline_hint.resources.statuses": "Messages ancian",
   "trends.trending_now": "Ora in tendentias",
-  "upload_form.undo": "Deler",
   "upload_modal.choose_image": "Seliger un imagine",
   "upload_modal.detect_text": "Deteger texto ab un pictura",
   "video.close": "Clauder le video",
diff --git a/app/javascript/mastodon/locales/id.json b/app/javascript/mastodon/locales/id.json
index 5af20a97f7bc8c..1670d616fb2ac1 100644
--- a/app/javascript/mastodon/locales/id.json
+++ b/app/javascript/mastodon/locales/id.json
@@ -82,7 +82,6 @@
   "announcement.announcement": "Pengumuman",
   "attachments_list.unprocessed": "(tidak diproses)",
   "audio.hide": "Sembunyikan audio",
-  "autosuggest_hashtag.per_week": "{count} per minggu",
   "boost_modal.combo": "Anda dapat menekan {combo} untuk melewati ini",
   "bundle_column_error.copy_stacktrace": "Salin laporan kesalahan",
   "bundle_column_error.error.body": "Laman yang diminta tidak dapat ditampilkan. Mungkin karena sebuah kutu dalam kode kami, atau masalah kompatibilitas peramban.",
@@ -134,22 +133,12 @@
   "compose_form.lock_disclaimer": "Akun Anda tidak {locked}. Semua orang dapat mengikuti Anda untuk melihat kiriman khusus untuk pengikut Anda.",
   "compose_form.lock_disclaimer.lock": "terkunci",
   "compose_form.placeholder": "Apa yang ada di pikiran Anda?",
-  "compose_form.poll.add_option": "Tambahkan pilihan",
   "compose_form.poll.duration": "Durasi japat",
-  "compose_form.poll.option_placeholder": "Pilihan {number}",
-  "compose_form.poll.remove_option": "Hapus opsi ini",
   "compose_form.poll.switch_to_multiple": "Ubah japat menjadi pilihan ganda",
   "compose_form.poll.switch_to_single": "Ubah japat menjadi pilihan tunggal",
-  "compose_form.publish": "Terbitkan",
   "compose_form.publish_form": "Terbitkan",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Simpan perubahan",
-  "compose_form.sensitive.hide": "{count, plural, other {Tandai media sebagai sensitif}}",
-  "compose_form.sensitive.marked": "{count, plural, other {Media ini ditandai sebagai sensitif}}",
-  "compose_form.sensitive.unmarked": "{count, plural, other {Media ini tidak ditandai sebagai sensitif}}",
   "compose_form.spoiler.marked": "Hapus peringatan tentang isi konten",
   "compose_form.spoiler.unmarked": "Tambahkan peringatan tentang isi konten",
-  "compose_form.spoiler_placeholder": "Peringatan konten",
   "confirmation_modal.cancel": "Batal",
   "confirmations.block.block_and_report": "Blokir & Laporkan",
   "confirmations.block.confirm": "Blokir",
@@ -364,7 +353,6 @@
   "navigation_bar.compose": "Tulis toot baru",
   "navigation_bar.discover": "Temukan",
   "navigation_bar.domain_blocks": "Domain tersembunyi",
-  "navigation_bar.edit_profile": "Ubah profil",
   "navigation_bar.explore": "Jelajahi",
   "navigation_bar.filters": "Kata yang dibisukan",
   "navigation_bar.follow_requests": "Permintaan mengikuti",
@@ -454,14 +442,7 @@
   "poll_button.add_poll": "Tambah japat",
   "poll_button.remove_poll": "Hapus japat",
   "privacy.change": "Ubah privasi kiriman",
-  "privacy.direct.long": "Kirim hanya ke pengguna yang disebut",
-  "privacy.direct.short": "Orang yang disebutkan saja",
-  "privacy.private.long": "Kirim kiriman hanya kepada pengikut",
-  "privacy.private.short": "Pengikut saja",
-  "privacy.public.long": "Terlihat oleh semua",
   "privacy.public.short": "Publik",
-  "privacy.unlisted.long": "Terlihat oleh semua, tapi jangan tampilkan di fitur jelajah",
-  "privacy.unlisted.short": "Tak Terdaftar",
   "privacy_policy.last_updated": "Terakhir diperbarui {date}",
   "privacy_policy.title": "Kebijakan Privasi",
   "refresh": "Segarkan",
@@ -615,10 +596,8 @@
   "upload_error.poll": "Unggah berkas tak diizinkan di japat ini.",
   "upload_form.audio_description": "Penjelasan untuk orang dengan gangguan pendengaran",
   "upload_form.description": "Deskripsikan untuk mereka yang tidak bisa melihat dengan jelas",
-  "upload_form.description_missing": "Tidak ada deskripsi yang ditambahkan",
   "upload_form.edit": "Sunting",
   "upload_form.thumbnail": "Ubah gambar kecil",
-  "upload_form.undo": "Undo",
   "upload_form.video_description": "Penjelasan untuk orang dengan gangguan pendengaran atau penglihatan",
   "upload_modal.analyzing_picture": "Analisis gambar…",
   "upload_modal.apply": "Terapkan",
diff --git a/app/javascript/mastodon/locales/ie.json b/app/javascript/mastodon/locales/ie.json
index 8579fc89c65604..5188d137e3bf59 100644
--- a/app/javascript/mastodon/locales/ie.json
+++ b/app/javascript/mastodon/locales/ie.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Proclamation",
   "attachments_list.unprocessed": "(íntractat)",
   "audio.hide": "Celar audio",
-  "autosuggest_hashtag.per_week": "{count} per semane",
   "boost_modal.combo": "Li proxim vez tu posse pressar {combo} por passar to-ci",
   "bundle_column_error.copy_stacktrace": "Copiar erra-raporte",
   "bundle_column_error.error.body": "Li demandat págine ne posset esser rendit. Fórsan it es un problema in nor code, o un problema de compatibilitá con li navigator.",
@@ -146,22 +145,21 @@
   "compose_form.lock_disclaimer": "Tui conto ne es {locked}. Quicunc posse sequer te por vider tui postas solmen por sequitores.",
   "compose_form.lock_disclaimer.lock": "cludet",
   "compose_form.placeholder": "Quo es in tui spiritu?",
-  "compose_form.poll.add_option": "Adjunter un option",
+  "compose_form.poll.add_option": "Adjunter option",
   "compose_form.poll.duration": "Duration del balotation",
+  "compose_form.poll.multiple": "Selection multiplic",
   "compose_form.poll.option_placeholder": "Option {number}",
   "compose_form.poll.remove_option": "Remover ti-ci option",
+  "compose_form.poll.single": "Selecter un",
   "compose_form.poll.switch_to_multiple": "Changea li balotation por permisser multiplic selectiones",
   "compose_form.poll.switch_to_single": "Changea li balotation por permisser un singul selection",
-  "compose_form.publish": "Publicar",
+  "compose_form.poll.type": "Stil",
+  "compose_form.publish": "Postar",
   "compose_form.publish_form": "Nov posta",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Conservar changes",
-  "compose_form.sensitive.hide": "{count, plural, one {Marcar medie quam sensitiv} other {Marcar medie quam sensitiv}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Medie es marcat quam sensitiv} other {Medie es marcat quam sensitiv}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Medie ne es marcat quam sensitiv} other {Medie ne es marcat quam sensitiv}}",
+  "compose_form.reply": "Responder",
+  "compose_form.save_changes": "Actualisar",
   "compose_form.spoiler.marked": "Remover avise pri li contenete",
   "compose_form.spoiler.unmarked": "Adjunter avise pri li contenete",
-  "compose_form.spoiler_placeholder": "Scri tui avise ci",
   "confirmation_modal.cancel": "Anullar",
   "confirmations.block.block_and_report": "Bloccar & Raportar",
   "confirmations.block.confirm": "Bloccar",
@@ -408,7 +406,6 @@
   "navigation_bar.direct": "Privat mentiones",
   "navigation_bar.discover": "Decovrir",
   "navigation_bar.domain_blocks": "Bloccat dominias",
-  "navigation_bar.edit_profile": "Redacter profil",
   "navigation_bar.explore": "Explorar",
   "navigation_bar.favourites": "Favorites",
   "navigation_bar.filters": "Silentiat paroles",
@@ -526,14 +523,11 @@
   "poll_button.add_poll": "Adjunter un balotation",
   "poll_button.remove_poll": "Remover balotation",
   "privacy.change": "Changear li privatie del posta",
-  "privacy.direct.long": "Visibil solmen a mentionat usatores",
-  "privacy.direct.short": "Solmen persones mentionat",
-  "privacy.private.long": "Visibil solmen por sequitores",
-  "privacy.private.short": "Solmen sequitores",
-  "privacy.public.long": "Visibil a omnes",
+  "privacy.direct.short": "Specific persones",
+  "privacy.private.long": "Solmen tui sequitores",
+  "privacy.private.short": "Sequitores",
+  "privacy.public.long": "Quicunc in e ex Mastodon",
   "privacy.public.short": "Public",
-  "privacy.unlisted.long": "Visibil por omnes, ma excludet de functiones de decovrition",
-  "privacy.unlisted.short": "Delistat",
   "privacy_policy.last_updated": "Ultimmen actualisat ye {date}",
   "privacy_policy.title": "Politica pri Privatie",
   "recommended": "Recomandat",
@@ -715,10 +709,8 @@
   "upload_error.poll": "On ne es permisset cargar medie con balotationes.",
   "upload_form.audio_description": "Descrir por persones qui es surd o ne audi bon",
   "upload_form.description": "Descrir por persones qui es ciec o have mal vision",
-  "upload_form.description_missing": "Null descrition adjuntet",
   "upload_form.edit": "Redacter",
   "upload_form.thumbnail": "Changear previsual image",
-  "upload_form.undo": "Deleter",
   "upload_form.video_description": "Descrir por persones qui es surd, ciec, ne audi bon, o have mal vision",
   "upload_modal.analyzing_picture": "Analisant image…",
   "upload_modal.apply": "Aplicar",
diff --git a/app/javascript/mastodon/locales/ig.json b/app/javascript/mastodon/locales/ig.json
index f163567f176035..a4f72684222375 100644
--- a/app/javascript/mastodon/locales/ig.json
+++ b/app/javascript/mastodon/locales/ig.json
@@ -107,8 +107,6 @@
   "onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
   "onboarding.steps.share_profile.title": "Share your profile",
   "privacy.change": "Adjust status privacy",
-  "privacy.direct.short": "Direct",
-  "privacy.private.short": "Followers-only",
   "relative_time.full.just_now": "kịta",
   "relative_time.just_now": "kịta",
   "relative_time.today": "taa",
@@ -142,7 +140,6 @@
   "trends.trending_now": "Na-ewu ewu kịta",
   "upload_form.audio_description": "Describe for people with hearing loss",
   "upload_form.description": "Describe for the visually impaired",
-  "upload_form.undo": "Hichapụ",
   "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
   "upload_modal.choose_image": "Họrọ onyonyo",
   "upload_progress.label": "Uploading…"
diff --git a/app/javascript/mastodon/locales/io.json b/app/javascript/mastodon/locales/io.json
index 233b7684573582..a9dd32c06caf16 100644
--- a/app/javascript/mastodon/locales/io.json
+++ b/app/javascript/mastodon/locales/io.json
@@ -86,7 +86,6 @@
   "announcement.announcement": "Anunco",
   "attachments_list.unprocessed": "(neprocedita)",
   "audio.hide": "Celez audio",
-  "autosuggest_hashtag.per_week": "{count} dum singla semano",
   "boost_modal.combo": "Vu povas pulsar {combo} por omisar co venontafoye",
   "bundle_column_error.copy_stacktrace": "Kopierorraporto",
   "bundle_column_error.error.body": "La demandita pagino ne povas strukturigesar. Forsan ol esas eroro en kodexo hike o vidilkoncilieblesproblemo.",
@@ -143,22 +142,12 @@
   "compose_form.lock_disclaimer": "Vua konto ne esas {locked}. Irgu povas sequar vu por vidar vua sequanto-nura posti.",
   "compose_form.lock_disclaimer.lock": "klefagesas",
   "compose_form.placeholder": "Quo esas en tua spirito?",
-  "compose_form.poll.add_option": "Insertez selekto",
   "compose_form.poll.duration": "Votpostoduro",
-  "compose_form.poll.option_placeholder": "Selektato {number}",
-  "compose_form.poll.remove_option": "Efacez ca selektajo",
   "compose_form.poll.switch_to_multiple": "Chanjez votposto por permisar multiselektaji",
   "compose_form.poll.switch_to_single": "Chanjez votposto por permisar una selektajo",
-  "compose_form.publish": "Publikigez",
   "compose_form.publish_form": "Publish",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Sparez chanji",
-  "compose_form.sensitive.hide": "{count, plural,one {Markizez medii quale privata} other {Markizez medii quale privata}}",
-  "compose_form.sensitive.marked": "{count, plural,one {Medii markizesis quale privata} other {Medii markizesis quale privata}}",
-  "compose_form.sensitive.unmarked": "{count, plural,one {Medii ne markizesis quale privata} other {Medii ne markizesis quale privata}}",
   "compose_form.spoiler.marked": "Text is hidden behind warning",
   "compose_form.spoiler.unmarked": "Text is not hidden",
-  "compose_form.spoiler_placeholder": "Averto di kontenajo",
   "confirmation_modal.cancel": "Anulez",
   "confirmations.block.block_and_report": "Restriktez e Raportizez",
   "confirmations.block.confirm": "Restriktez",
@@ -405,7 +394,6 @@
   "navigation_bar.direct": "Privata mencioni",
   "navigation_bar.discover": "Deskovrez",
   "navigation_bar.domain_blocks": "Hidden domains",
-  "navigation_bar.edit_profile": "Modifikar profilo",
   "navigation_bar.explore": "Explorez",
   "navigation_bar.favourites": "Favoriziti",
   "navigation_bar.filters": "Silencigita vorti",
@@ -519,14 +507,7 @@
   "poll_button.add_poll": "Insertez votposto",
   "poll_button.remove_poll": "Efacez votposto",
   "privacy.change": "Aranjar privateso di mesaji",
-  "privacy.direct.long": "Sendar nur a mencionata uzeri",
-  "privacy.direct.short": "Mencionita personi nur",
-  "privacy.private.long": "Sendar nur a sequanti",
-  "privacy.private.short": "Sequanti nur",
-  "privacy.public.long": "Videbla da omnu",
   "privacy.public.short": "Publike",
-  "privacy.unlisted.long": "Videbla da omnu ma voluntala ne inkluzas deskovrotraiti",
-  "privacy.unlisted.short": "Ne enlistigota",
   "privacy_policy.last_updated": "Antea novajo ye {date}",
   "privacy_policy.title": "Privatesguidilo",
   "recommended": "Rekomendata",
@@ -708,10 +689,8 @@
   "upload_error.poll": "Failadchargo ne permisesas kun votposti.",
   "upload_form.audio_description": "Deskriptez por personi kun audnekapableso",
   "upload_form.description": "Deskriptez por personi kun vidnekapableso",
-  "upload_form.description_missing": "Deskriptajo ne insertesis",
   "upload_form.edit": "Modifikez",
   "upload_form.thumbnail": "Chanjez imajeto",
-  "upload_form.undo": "Desfacar",
   "upload_form.video_description": "Deskriptez por personi kun audnekapableso o vidnekapableso",
   "upload_modal.analyzing_picture": "Analizas imajo…",
   "upload_modal.apply": "Aplikez",
diff --git a/app/javascript/mastodon/locales/is.json b/app/javascript/mastodon/locales/is.json
index fb839503e97e5c..dfece102bb2654 100644
--- a/app/javascript/mastodon/locales/is.json
+++ b/app/javascript/mastodon/locales/is.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Auglýsing",
   "attachments_list.unprocessed": "(óunnið)",
   "audio.hide": "Fela hljóð",
-  "autosuggest_hashtag.per_week": "{count} á viku",
   "boost_modal.combo": "Þú getur ýtt á {combo} til að sleppa þessu næst",
   "bundle_column_error.copy_stacktrace": "Afrita villuskýrslu",
   "bundle_column_error.error.body": "Umbeðna síðau var ekki hægt að myndgera. Það gæti verið vegna villu í kóðanum okkar eða vandamáls með samhæfni vafra.",
@@ -148,20 +147,20 @@
   "compose_form.placeholder": "Hvað liggur þér á hjarta?",
   "compose_form.poll.add_option": "Bæta við valkosti",
   "compose_form.poll.duration": "Tímalengd könnunar",
+  "compose_form.poll.multiple": "Margir valkostir",
   "compose_form.poll.option_placeholder": "Valkostur {number}",
   "compose_form.poll.remove_option": "Fjarlægja þennan valkost",
+  "compose_form.poll.single": "Veldu eitt",
   "compose_form.poll.switch_to_multiple": "Breyta könnun svo hægt sé að hafa marga valkosti",
   "compose_form.poll.switch_to_single": "Breyta könnun svo hægt sé að hafa einn stakan valkost",
+  "compose_form.poll.type": "Stíll",
   "compose_form.publish": "Birta",
   "compose_form.publish_form": "Birta",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Vista breytingar",
-  "compose_form.sensitive.hide": "{count, plural, one {Merkja mynd sem viðkvæma} other {Merkja myndir sem viðkvæmar}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Mynd er merkt sem viðkvæm} other {Myndir eru merktar sem viðkvæmar}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Mynd er ekki merkt sem viðkvæm} other {Myndir eru ekki merktar sem viðkvæmar}}",
+  "compose_form.reply": "Svara",
+  "compose_form.save_changes": "Uppfæra",
   "compose_form.spoiler.marked": "Fjarlægja aðvörun vegna efnis",
   "compose_form.spoiler.unmarked": "Bæta við aðvörun vegna efnis",
-  "compose_form.spoiler_placeholder": "Skrifaðu aðvörunina þína hér",
+  "compose_form.spoiler_placeholder": "Aðvörun vegna efnis (valkvætt)",
   "confirmation_modal.cancel": "Hætta við",
   "confirmations.block.block_and_report": "Útiloka og kæra",
   "confirmations.block.confirm": "Útiloka",
@@ -408,7 +407,6 @@
   "navigation_bar.direct": "Einkaspjall",
   "navigation_bar.discover": "Uppgötva",
   "navigation_bar.domain_blocks": "Útilokuð lén",
-  "navigation_bar.edit_profile": "Breyta notandasniði",
   "navigation_bar.explore": "Kanna",
   "navigation_bar.favourites": "Eftirlæti",
   "navigation_bar.filters": "Þögguð orð",
@@ -526,14 +524,15 @@
   "poll_button.add_poll": "Bæta við könnun",
   "poll_button.remove_poll": "Fjarlægja könnun",
   "privacy.change": "Aðlaga gagnaleynd færslu",
-  "privacy.direct.long": "Senda einungis á notendur sem minnst er á",
-  "privacy.direct.short": "Aðeins fólk sem minnst er á",
-  "privacy.private.long": "Senda einungis á fylgjendur",
-  "privacy.private.short": "Einungis fylgjendur",
-  "privacy.public.long": "Sýnilegt fyrir alla",
+  "privacy.direct.long": "Allir sem minnst er á í færslunni",
+  "privacy.direct.short": "Tilteknir aðilar",
+  "privacy.private.long": "Einungis þeir sem fylgjast með þér",
+  "privacy.private.short": "Fylgjendur",
+  "privacy.public.long": "Hver sem er, á og utan Mastodon",
   "privacy.public.short": "Opinbert",
-  "privacy.unlisted.long": "Sýnilegt öllum, en ekki tekið með í uppgötvunareiginleikum",
-  "privacy.unlisted.short": "Óskráð",
+  "privacy.unlisted.additional": "Þetta hegðar sér eins og opinber færsla, fyrir utan að færslan birtist ekki í beinum streymum eða myllumerkjum, né heldur í Mastodon-leitum jafnvel þótt þú hafir valið að falla undir slíkt í notandasniðinu þínu.",
+  "privacy.unlisted.long": "Minni stælar í reikniritum",
+  "privacy.unlisted.short": "Hljóðlátt opinbert",
   "privacy_policy.last_updated": "Síðast uppfært {date}",
   "privacy_policy.title": "Persónuverndarstefna",
   "recommended": "Mælt með",
@@ -551,7 +550,9 @@
   "relative_time.minutes": "{number}mín",
   "relative_time.seconds": "{number}sek",
   "relative_time.today": "í dag",
+  "reply_indicator.attachments": "{count, plural, one {# viðhengi} other {# viðhengi}}",
   "reply_indicator.cancel": "Hætta við",
+  "reply_indicator.poll": "Könnun",
   "report.block": "Útiloka",
   "report.block_explanation": "Þú munt ekki sjá færslurnar þeirra. Þeir munu ekki geta séð færslurnar þínar eða fylgst með þér. Þeir munu ekki geta séð að lokað sé á þá.",
   "report.categories.legal": "Lagalegt",
@@ -715,10 +716,8 @@
   "upload_error.poll": "Innsending skráa er ekki leyfð í könnunum.",
   "upload_form.audio_description": "Lýstu þessu fyrir heyrnarskerta",
   "upload_form.description": "Lýstu þessu fyrir sjónskerta",
-  "upload_form.description_missing": "Engri lýsingu bætt við",
   "upload_form.edit": "Breyta",
   "upload_form.thumbnail": "Skipta um smámynd",
-  "upload_form.undo": "Eyða",
   "upload_form.video_description": "Lýstu þessu fyrir fólk sem heyrir illa eða er með skerta sjón",
   "upload_modal.analyzing_picture": "Greini mynd…",
   "upload_modal.apply": "Virkja",
diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json
index 4fb4d88cbc8964..920b80d5a61200 100644
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Annuncio",
   "attachments_list.unprocessed": "(non elaborato)",
   "audio.hide": "Nascondi audio",
-  "autosuggest_hashtag.per_week": "{count} a settimana",
   "boost_modal.combo": "Puoi premere {combo} per saltare questo passaggio, la prossima volta",
   "bundle_column_error.copy_stacktrace": "Copia rapporto sull'errore",
   "bundle_column_error.error.body": "Impossibile rendedrizzare la pagina richiesta. Potrebbe dipendere da un bug nel nostro codice o da un problema di compatibilità di un browser.",
@@ -146,22 +145,22 @@
   "compose_form.lock_disclaimer": "Il tuo profilo non è {locked}. Chiunque può seguirti per visualizzare i tuoi post per soli seguaci.",
   "compose_form.lock_disclaimer.lock": "bloccato",
   "compose_form.placeholder": "Cos'hai in mente?",
-  "compose_form.poll.add_option": "Aggiungi una scelta",
+  "compose_form.poll.add_option": "Aggiungi opzione",
   "compose_form.poll.duration": "Durata del sondaggio",
-  "compose_form.poll.option_placeholder": "Scelta {number}",
-  "compose_form.poll.remove_option": "Rimuovi questa scelta",
+  "compose_form.poll.multiple": "Scelta multipla",
+  "compose_form.poll.option_placeholder": "Opzione {number}",
+  "compose_form.poll.remove_option": "Rimuovi questa opzione",
+  "compose_form.poll.single": "Scegli uno",
   "compose_form.poll.switch_to_multiple": "Modifica il sondaggio per consentire scelte multiple",
   "compose_form.poll.switch_to_single": "Modifica il sondaggio per consentire una singola scelta",
+  "compose_form.poll.type": "Stile",
   "compose_form.publish": "Pubblica",
   "compose_form.publish_form": "Nuovo post",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Salva le modifiche",
-  "compose_form.sensitive.hide": "{count, plural, one {Segna media come sensibile} other {Segna media come sensibili}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Il media è contrassegnato come sensibile} other {I media sono contrassegnati come sensibili}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Il media non è contrassegnato come sensibile} other {I media non sono contrassegnati come sensibili}}",
+  "compose_form.reply": "Rispondi",
+  "compose_form.save_changes": "Aggiorna",
   "compose_form.spoiler.marked": "Rimuovi l'avviso del contenuto",
   "compose_form.spoiler.unmarked": "Aggiungi l'avviso del contenuto",
-  "compose_form.spoiler_placeholder": "Scrivi qui il tuo avviso",
+  "compose_form.spoiler_placeholder": "Contenuto sensibile (facoltativo)",
   "confirmation_modal.cancel": "Annulla",
   "confirmations.block.block_and_report": "Blocca & Segnala",
   "confirmations.block.confirm": "Blocca",
@@ -408,7 +407,6 @@
   "navigation_bar.direct": "Menzioni private",
   "navigation_bar.discover": "Scopri",
   "navigation_bar.domain_blocks": "Domini bloccati",
-  "navigation_bar.edit_profile": "Modifica il profilo",
   "navigation_bar.explore": "Esplora",
   "navigation_bar.favourites": "Preferiti",
   "navigation_bar.filters": "Parole silenziate",
@@ -526,14 +524,15 @@
   "poll_button.add_poll": "Aggiungi un sondaggio",
   "poll_button.remove_poll": "Rimuovi il sondaggio",
   "privacy.change": "Modifica privacy del post",
-  "privacy.direct.long": "Visibile solo per gli utenti menzionati",
-  "privacy.direct.short": "Solo persone menzionate",
-  "privacy.private.long": "Visibile solo ai seguaci",
-  "privacy.private.short": "Solo seguaci",
-  "privacy.public.long": "Visibile a tutti",
+  "privacy.direct.long": "Tutti quelli menzioniati nel post",
+  "privacy.direct.short": "Persone specifiche",
+  "privacy.private.long": "Solo i tuoi follower",
+  "privacy.private.short": "Follower",
+  "privacy.public.long": "Chiunque dentro e fuori Mastodon",
   "privacy.public.short": "Pubblico",
-  "privacy.unlisted.long": "Visibile a tutti, ma escluso dalle funzioni di scoperta",
-  "privacy.unlisted.short": "Non elencato",
+  "privacy.unlisted.additional": "Si comporta esattamente come pubblico, tranne per il fatto che il post non verrà visualizzato nei feed live o negli hashtag, nell'esplorazione o nella ricerca Mastodon, anche se hai attivato l'attivazione a livello di account.",
+  "privacy.unlisted.long": "Meno fanfare algoritmiche",
+  "privacy.unlisted.short": "Pubblico silenzioso",
   "privacy_policy.last_updated": "Ultimo aggiornamento {date}",
   "privacy_policy.title": "Politica sulla Privacy",
   "recommended": "Consigliato",
@@ -551,7 +550,9 @@
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "oggi",
+  "reply_indicator.attachments": "{count, plural, one {# allegato} other {# allegati}}",
   "reply_indicator.cancel": "Annulla",
+  "reply_indicator.poll": "Sondaggio",
   "report.block": "Blocca",
   "report.block_explanation": "Non visualizzerai i suoi post. Non potrà vedere i tuoi post o seguirti. Potrà sapere di esser stato bloccato.",
   "report.categories.legal": "Informazioni legali",
@@ -715,10 +716,8 @@
   "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.description_missing": "Nessuna descrizione aggiunta",
   "upload_form.edit": "Modifica",
   "upload_form.thumbnail": "Cambia la miniatura",
-  "upload_form.undo": "Elimina",
   "upload_form.video_description": "Descrizione per persone con deficit uditivi o ipovedenti",
   "upload_modal.analyzing_picture": "Analizzando l'immagine…",
   "upload_modal.apply": "Applica",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index e7aafe852ab3d5..e0cc96d571cd9d 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "お知らせ",
   "attachments_list.unprocessed": "(未処理)",
   "audio.hide": "音声を閉じる",
-  "autosuggest_hashtag.per_week": "{count} 回 / 週",
   "boost_modal.combo": "次からは{combo}を押せばスキップできます",
   "bundle_column_error.copy_stacktrace": "エラーレポートをコピー",
   "bundle_column_error.error.body": "要求されたページをレンダリングできませんでした。コードのバグ、またはブラウザの互換性の問題が原因である可能性があります。",
@@ -146,22 +145,12 @@
   "compose_form.lock_disclaimer": "あなたのアカウントは{locked}になっていません。誰でもあなたをフォローすることができ、フォロワー限定の投稿を見ることができます。",
   "compose_form.lock_disclaimer.lock": "承認制",
   "compose_form.placeholder": "今なにしてる？",
-  "compose_form.poll.add_option": "追加",
   "compose_form.poll.duration": "アンケート期間",
-  "compose_form.poll.option_placeholder": "項目 {number}",
-  "compose_form.poll.remove_option": "この項目を削除",
   "compose_form.poll.switch_to_multiple": "複数選択に変更",
   "compose_form.poll.switch_to_single": "単一選択に変更",
-  "compose_form.publish": "投稿",
   "compose_form.publish_form": "投稿",
-  "compose_form.publish_loud": "{publish}！",
-  "compose_form.save_changes": "変更を保存",
-  "compose_form.sensitive.hide": "メディアを閲覧注意にする",
-  "compose_form.sensitive.marked": "メディアに閲覧注意が設定されています",
-  "compose_form.sensitive.unmarked": "メディアに閲覧注意が設定されていません",
   "compose_form.spoiler.marked": "本文は警告の後ろに隠されます",
   "compose_form.spoiler.unmarked": "本文は隠されていません",
-  "compose_form.spoiler_placeholder": "ここに警告を書いてください",
   "confirmation_modal.cancel": "キャンセル",
   "confirmations.block.block_and_report": "ブロックし通報",
   "confirmations.block.confirm": "ブロック",
@@ -408,7 +397,6 @@
   "navigation_bar.direct": "非公開の返信",
   "navigation_bar.discover": "見つける",
   "navigation_bar.domain_blocks": "ブロックしたドメイン",
-  "navigation_bar.edit_profile": "プロフィールを編集",
   "navigation_bar.explore": "探索する",
   "navigation_bar.favourites": "お気に入り",
   "navigation_bar.filters": "フィルター設定",
@@ -526,14 +514,7 @@
   "poll_button.add_poll": "アンケートを追加",
   "poll_button.remove_poll": "アンケートを削除",
   "privacy.change": "公開範囲を変更",
-  "privacy.direct.long": "指定された相手のみ閲覧可",
-  "privacy.direct.short": "指定された相手のみ",
-  "privacy.private.long": "フォロワーのみ閲覧可",
-  "privacy.private.short": "フォロワーのみ",
-  "privacy.public.long": "誰でも閲覧可",
   "privacy.public.short": "公開",
-  "privacy.unlisted.long": "誰でも閲覧可、サイレント",
-  "privacy.unlisted.short": "非収載",
   "privacy_policy.last_updated": "{date}に更新",
   "privacy_policy.title": "プライバシーポリシー",
   "recommended": "おすすめ",
@@ -715,10 +696,8 @@
   "upload_error.poll": "アンケートではファイルをアップロードできません。",
   "upload_form.audio_description": "聴き取りが難しいユーザーへの説明",
   "upload_form.description": "視覚的に閲覧が難しいユーザーへの説明",
-  "upload_form.description_missing": "説明を追加していません",
   "upload_form.edit": "編集",
   "upload_form.thumbnail": "サムネイルを変更",
-  "upload_form.undo": "削除",
   "upload_form.video_description": "聴き取りや視覚的に閲覧が難しいユーザーへの説明",
   "upload_modal.analyzing_picture": "画像を解析中…",
   "upload_modal.apply": "適用",
diff --git a/app/javascript/mastodon/locales/ka.json b/app/javascript/mastodon/locales/ka.json
index 9d977e93312076..8628cb38a227cd 100644
--- a/app/javascript/mastodon/locales/ka.json
+++ b/app/javascript/mastodon/locales/ka.json
@@ -36,7 +36,6 @@
   "admin.dashboard.retention.cohort_size": "ახალი მომხმარებელი",
   "alert.unexpected.message": "წარმოიშვა მოულოდნელი შეცდომა.",
   "alert.unexpected.title": "უპს!",
-  "autosuggest_hashtag.per_week": "კვირაში {count}",
   "boost_modal.combo": "შეგიძლიათ დააჭიროთ {combo}-ს რათა შემდეგ ჯერზე გამოტოვოთ ეს",
   "bundle_column_error.retry": "სცადეთ კიდევ ერთხელ",
   "bundle_modal_error.close": "დახურვა",
@@ -68,11 +67,8 @@
   "compose_form.lock_disclaimer.lock": "ჩაკეტილი",
   "compose_form.placeholder": "რაზე ფიქრობ?",
   "compose_form.publish_form": "Publish",
-  "compose_form.sensitive.marked": "მედია მონიშნულია მგრძნობიარედ",
-  "compose_form.sensitive.unmarked": "მედია არაა მონიშნული მგრძნობიარედ",
   "compose_form.spoiler.marked": "გაფრთხილების უკან ტექსტი დამალულია",
   "compose_form.spoiler.unmarked": "ტექსტი არაა დამალული",
-  "compose_form.spoiler_placeholder": "თქვენი გაფრთხილება დაწერეთ აქ",
   "confirmation_modal.cancel": "უარყოფა",
   "confirmations.block.confirm": "ბლოკი",
   "confirmations.block.message": "დარწმუნებული ხართ, გსურთ დაბლოკოთ {name}?",
@@ -171,7 +167,6 @@
   "navigation_bar.compose": "Compose new toot",
   "navigation_bar.discover": "აღმოაჩინე",
   "navigation_bar.domain_blocks": "დამალული დომენები",
-  "navigation_bar.edit_profile": "შეცვალე პროფილი",
   "navigation_bar.filters": "გაჩუმებული სიტყვები",
   "navigation_bar.follow_requests": "დადევნების მოთხოვნები",
   "navigation_bar.lists": "სიები",
@@ -211,12 +206,7 @@
   "onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
   "onboarding.steps.share_profile.title": "Share your profile",
   "privacy.change": "სტატუსის კონფიდენციალურობის მითითება",
-  "privacy.direct.long": "დაიპოსტოს მხოლოდ დასახელებულ მომხმარებლებთან",
-  "privacy.direct.short": "Direct",
-  "privacy.private.long": "დაიპოსტოს მხოლოდ მიმდევრებთან",
-  "privacy.private.short": "Followers-only",
   "privacy.public.short": "საჯარო",
-  "privacy.unlisted.short": "ჩამოუთვლელი",
   "regeneration_indicator.label": "იტვირთება…",
   "regeneration_indicator.sublabel": "თქვენი სახლის ლენტა მზადდება!",
   "relative_time.days": "{number}დღ",
@@ -279,7 +269,6 @@
   "upload_button.label": "მედიის დამატება",
   "upload_form.audio_description": "Describe for people with hearing loss",
   "upload_form.description": "აღწერილობა ვიზუალურად უფასურისთვის",
-  "upload_form.undo": "გაუქმება",
   "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
   "upload_progress.label": "იტვირთება...",
   "video.close": "ვიდეოს დახურვა",
diff --git a/app/javascript/mastodon/locales/kab.json b/app/javascript/mastodon/locales/kab.json
index 08c70a9405a658..d9388c7048043f 100644
--- a/app/javascript/mastodon/locales/kab.json
+++ b/app/javascript/mastodon/locales/kab.json
@@ -53,7 +53,6 @@
   "alert.unexpected.title": "Ayhuh!",
   "announcement.announcement": "Ulɣu",
   "audio.hide": "Ffer amesli",
-  "autosuggest_hashtag.per_week": "{count} i yimalas",
   "boost_modal.combo": "Tzemreḍ ad tetekkiḍ ɣef {combo} akken ad tessurfeḍ aya tikelt-nniḍen",
   "bundle_column_error.copy_stacktrace": "Nɣel tuccḍa n uneqqis",
   "bundle_column_error.error.title": "Uh, ala !",
@@ -99,20 +98,10 @@
   "compose_form.lock_disclaimer": "Amiḍan-ik·im ur yelli ara {locked}. Menwala yezmer ad k·kem-yeḍfeṛ akken ad iẓer acu tbeṭṭuḍ akked yimeḍfaṛen-ik·im.",
   "compose_form.lock_disclaimer.lock": "yettwacekkel",
   "compose_form.placeholder": "D acu i itezzin deg wallaɣ?",
-  "compose_form.poll.add_option": "Rnu afran",
   "compose_form.poll.duration": "Tanzagt n tefrant",
-  "compose_form.poll.option_placeholder": "Afran {number}",
-  "compose_form.poll.remove_option": "Sfeḍ afran-agi",
-  "compose_form.publish": "Suffeɣ",
   "compose_form.publish_form": "Suffeɣ",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Sekles ibeddilen",
-  "compose_form.sensitive.hide": "Creḍ allal n teywalt d anafri",
-  "compose_form.sensitive.marked": "Allal n teywalt yettwacreḍ d anafri",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Amidya ur yettwacreḍ ara d anafri} other {Imidyaten ur ttwacreḍen ara d inafriyen}}",
   "compose_form.spoiler.marked": "Kkes aḍris yettwaffren deffir n walɣu",
   "compose_form.spoiler.unmarked": "Rnu aḍris yettwaffren deffir n walɣu",
-  "compose_form.spoiler_placeholder": "Aru alɣu-inek·inem da",
   "confirmation_modal.cancel": "Sefsex",
   "confirmations.block.block_and_report": "Sewḥel & sewɛed",
   "confirmations.block.confirm": "Sewḥel",
@@ -284,7 +273,6 @@
   "navigation_bar.compose": "Aru tajewwiqt tamaynut",
   "navigation_bar.discover": "Ẓer",
   "navigation_bar.domain_blocks": "Tiɣula yeffren",
-  "navigation_bar.edit_profile": "Ẓreg amaɣnu",
   "navigation_bar.explore": "Snirem",
   "navigation_bar.favourites": "Imenyafen",
   "navigation_bar.filters": "Awalen i yettwasgugmen",
@@ -359,12 +347,7 @@
   "poll_button.add_poll": "Rnu asenqed",
   "poll_button.remove_poll": "Kkes asenqed",
   "privacy.change": "Seggem tabaḍnit n yizen",
-  "privacy.direct.long": "Bḍu gar yimseqdacen i tbedreḍ kan",
-  "privacy.direct.short": "Direct",
-  "privacy.private.long": "Bḍu i yimeḍfaṛen-ik kan",
-  "privacy.private.short": "Imeḍfaṛen kan",
   "privacy.public.short": "Azayez",
-  "privacy.unlisted.short": "War tabdert",
   "privacy_policy.title": "Tasertit tabaḍnit",
   "refresh": "Smiren",
   "regeneration_indicator.label": "Yessalay-d…",
@@ -472,7 +455,6 @@
   "upload_form.description": "Glem-d i yemdaneni yesɛan ugur deg yiẓri",
   "upload_form.edit": "Ẓreg",
   "upload_form.thumbnail": "Beddel tugna",
-  "upload_form.undo": "Kkes",
   "upload_form.video_description": "Glem-d i yemdanen i yesɛan ugur deg tmesliwt neɣ deg yiẓri",
   "upload_modal.analyzing_picture": "Tasleḍt n tugna tetteddu…",
   "upload_modal.apply": "Snes",
diff --git a/app/javascript/mastodon/locales/kk.json b/app/javascript/mastodon/locales/kk.json
index 97b1991803272c..1f6cc78a57efd2 100644
--- a/app/javascript/mastodon/locales/kk.json
+++ b/app/javascript/mastodon/locales/kk.json
@@ -64,7 +64,6 @@
   "alert.unexpected.message": "Бір нәрсе дұрыс болмады.",
   "alert.unexpected.title": "Өй!",
   "announcement.announcement": "Хабарландыру",
-  "autosuggest_hashtag.per_week": "{count} аптасына",
   "boost_modal.combo": "Келесіде өткізіп жіберу үшін басыңыз {combo}",
   "bundle_column_error.retry": "Қайтадан көріңіз",
   "bundle_modal_error.close": "Жабу",
@@ -99,19 +98,12 @@
   "compose_form.lock_disclaimer": "Аккаунтыңыз {locked} емес. Кез келген адам жазылып, сізді оқи алады.",
   "compose_form.lock_disclaimer.lock": "жабық",
   "compose_form.placeholder": "Не бөліскіңіз келеді?",
-  "compose_form.poll.add_option": "Жауап қос",
   "compose_form.poll.duration": "Сауалнама мерзімі",
-  "compose_form.poll.option_placeholder": "Жауап {number}",
-  "compose_form.poll.remove_option": "Бұл жауапты өшір",
   "compose_form.poll.switch_to_multiple": "Бірнеше жауап таңдайтындай қылу",
   "compose_form.poll.switch_to_single": "Тек бір жауап таңдайтындай қылу",
   "compose_form.publish_form": "Publish",
-  "compose_form.sensitive.hide": "Сезімтал ретінде белгіле",
-  "compose_form.sensitive.marked": "Медиа нәзік деп белгіленген",
-  "compose_form.sensitive.unmarked": "Медиа нәзік деп белгіленбеген",
   "compose_form.spoiler.marked": "Мәтін ескертумен жасырылған",
   "compose_form.spoiler.unmarked": "Мәтін жасырылмаған",
-  "compose_form.spoiler_placeholder": "Ескертуіңізді осында жазыңыз",
   "confirmation_modal.cancel": "Қайтып алу",
   "confirmations.block.block_and_report": "Блок және Шағым",
   "confirmations.block.confirm": "Бұғаттау",
@@ -250,7 +242,6 @@
   "navigation_bar.compose": "Жаңа жазба бастау",
   "navigation_bar.discover": "шарлау",
   "navigation_bar.domain_blocks": "Жабық домендер",
-  "navigation_bar.edit_profile": "Профиль түзету",
   "navigation_bar.filters": "Үнсіз сөздер",
   "navigation_bar.follow_requests": "Жазылуға сұранғандар",
   "navigation_bar.follows_and_followers": "Жазылымдар және оқырмандар",
@@ -311,12 +302,7 @@
   "poll_button.add_poll": "Сауалнама қосу",
   "poll_button.remove_poll": "Сауалнаманы өшіру",
   "privacy.change": "Құпиялылықты реттеу",
-  "privacy.direct.long": "Аталған адамдарға ғана көрінетін жазба",
-  "privacy.direct.short": "Direct",
-  "privacy.private.long": "Тек оқырмандарға арналған жазба",
-  "privacy.private.short": "Followers-only",
   "privacy.public.short": "Ашық",
-  "privacy.unlisted.short": "Тізімсіз",
   "refresh": "Жаңарту",
   "regeneration_indicator.label": "Жүктеу…",
   "regeneration_indicator.sublabel": "Жергілікті желі құрылуда!",
@@ -399,7 +385,6 @@
   "upload_form.description": "Көру қабілеті нашар адамдар үшін сипаттаңыз",
   "upload_form.edit": "Түзету",
   "upload_form.thumbnail": "Суретті өзгерту",
-  "upload_form.undo": "Өшіру",
   "upload_form.video_description": "Есту немесе көру қабілеті нашар адамдарға сипаттама беріңіз",
   "upload_modal.analyzing_picture": "Суретті анализ жасау…",
   "upload_modal.apply": "Қолдану",
diff --git a/app/javascript/mastodon/locales/kn.json b/app/javascript/mastodon/locales/kn.json
index 473690070fcbe2..396aebbdf223ee 100644
--- a/app/javascript/mastodon/locales/kn.json
+++ b/app/javascript/mastodon/locales/kn.json
@@ -91,10 +91,6 @@
   "onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
   "onboarding.steps.share_profile.title": "Share your profile",
   "privacy.change": "Adjust status privacy",
-  "privacy.direct.long": "Post to mentioned users only",
-  "privacy.direct.short": "Direct",
-  "privacy.private.long": "Post to followers only",
-  "privacy.private.short": "Followers-only",
   "report.placeholder": "Type or paste additional comments",
   "report.submit": "Submit report",
   "report.target": "Report {target}",
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index 70ce6611d62b83..eae7f8faea09eb 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -68,7 +68,7 @@
   "account.unblock_domain": "도메인 {domain} 차단 해제",
   "account.unblock_short": "차단 해제",
   "account.unendorse": "프로필에 추천하지 않기",
-  "account.unfollow": "팔로우 해제",
+  "account.unfollow": "언팔로우",
   "account.unmute": "@{name} 뮤트 해제",
   "account.unmute_notifications_short": "알림 뮤트 해제",
   "account.unmute_short": "뮤트 해제",
@@ -89,7 +89,6 @@
   "announcement.announcement": "공지사항",
   "attachments_list.unprocessed": "(처리 안 됨)",
   "audio.hide": "소리 숨기기",
-  "autosuggest_hashtag.per_week": "주간 {count}회",
   "boost_modal.combo": "다음엔 {combo}를 눌러서 이 과정을 건너뛸 수 있습니다",
   "bundle_column_error.copy_stacktrace": "에러 리포트 복사하기",
   "bundle_column_error.error.body": "요청한 페이지를 렌더링 할 수 없습니다. 저희의 코드에 버그가 있거나, 브라우저 호환성 문제일 수 있습니다.",
@@ -148,20 +147,20 @@
   "compose_form.placeholder": "지금 무슨 생각을 하고 있나요?",
   "compose_form.poll.add_option": "항목 추가",
   "compose_form.poll.duration": "투표 기간",
-  "compose_form.poll.option_placeholder": "{number}번 항목",
+  "compose_form.poll.multiple": "다중 선택",
+  "compose_form.poll.option_placeholder": "{option}번째 항목",
   "compose_form.poll.remove_option": "이 항목 삭제",
+  "compose_form.poll.single": "단일 선택",
   "compose_form.poll.switch_to_multiple": "다중 선택이 가능한 투표로 변경",
   "compose_form.poll.switch_to_single": "단일 선택 투표로 변경",
+  "compose_form.poll.type": "형식",
   "compose_form.publish": "게시",
   "compose_form.publish_form": "새 게시물",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "변경사항 저장",
-  "compose_form.sensitive.hide": "미디어를 민감함으로 설정하기",
-  "compose_form.sensitive.marked": "미디어가 열람주의로 설정되어 있습니다",
-  "compose_form.sensitive.unmarked": "미디어가 열람주의로 설정 되어 있지 않습니다",
+  "compose_form.reply": "답장",
+  "compose_form.save_changes": "수정",
   "compose_form.spoiler.marked": "열람주의 제거",
   "compose_form.spoiler.unmarked": "열람 주의 문구 추가",
-  "compose_form.spoiler_placeholder": "경고 문구를 여기에 작성하세요",
+  "compose_form.spoiler_placeholder": "열람 주의 (옵션)",
   "confirmation_modal.cancel": "취소",
   "confirmations.block.block_and_report": "차단하고 신고하기",
   "confirmations.block.confirm": "차단",
@@ -408,7 +407,6 @@
   "navigation_bar.direct": "개인적인 멘션",
   "navigation_bar.discover": "발견하기",
   "navigation_bar.domain_blocks": "차단한 도메인",
-  "navigation_bar.edit_profile": "프로필 수정",
   "navigation_bar.explore": "둘러보기",
   "navigation_bar.favourites": "좋아요",
   "navigation_bar.filters": "뮤트한 단어",
@@ -526,14 +524,15 @@
   "poll_button.add_poll": "설문 추가",
   "poll_button.remove_poll": "설문 제거",
   "privacy.change": "게시물의 프라이버시 설정을 변경",
-  "privacy.direct.long": "언급된 사용자만 볼 수 있음",
-  "privacy.direct.short": "멘션한 사람들만",
-  "privacy.private.long": "팔로워에게만 공개",
-  "privacy.private.short": "팔로워 전용",
-  "privacy.public.long": "모두가 볼 수 있음",
+  "privacy.direct.long": "이 게시물에서 언급된 모두",
+  "privacy.direct.short": "특정 인물",
+  "privacy.private.long": "내 팔로워들에게만",
+  "privacy.private.short": "팔로워",
+  "privacy.public.long": "마스토돈 내외 모두",
   "privacy.public.short": "공개",
-  "privacy.unlisted.long": "모두가 볼 수 있지만, 발견하기 기능에서는 제외됨",
-  "privacy.unlisted.short": "미등재",
+  "privacy.unlisted.additional": "공개와 똑같지만 게시물이 라이브 피드나 해시태그, 발견하기, (계정 설정에서 허용했더라도) 마스토돈 검색에서 제외됩니다.",
+  "privacy.unlisted.long": "더 적은 알고리즘 팡파레",
+  "privacy.unlisted.short": "조용한 공개",
   "privacy_policy.last_updated": "{date}에 마지막으로 업데이트됨",
   "privacy_policy.title": "개인정보처리방침",
   "recommended": "추천함",
@@ -551,7 +550,9 @@
   "relative_time.minutes": "{number}분 전",
   "relative_time.seconds": "{number}초 전",
   "relative_time.today": "오늘",
+  "reply_indicator.attachments": "{count, plural, one {#} other {#}}개의 첨부파일",
   "reply_indicator.cancel": "취소",
+  "reply_indicator.poll": "투표",
   "report.block": "차단",
   "report.block_explanation": "당신은 해당 계정의 게시물을 보지 않게 됩니다. 해당 계정은 당신의 게시물을 보거나 팔로우 할 수 없습니다. 해당 계정은 자신이 차단되었다는 사실을 알 수 있습니다.",
   "report.categories.legal": "법적인 문제",
@@ -715,10 +716,8 @@
   "upload_error.poll": "파일 업로드는 설문과 함께 쓸 수 없습니다.",
   "upload_form.audio_description": "청각 장애인을 위한 설명",
   "upload_form.description": "시각장애인을 위한 설명",
-  "upload_form.description_missing": "설명이 추가되지 않음",
   "upload_form.edit": "수정",
   "upload_form.thumbnail": "썸네일 변경",
-  "upload_form.undo": "삭제",
   "upload_form.video_description": "청각, 시각 장애인을 위한 설명",
   "upload_modal.analyzing_picture": "사진 분석 중…",
   "upload_modal.apply": "적용",
diff --git a/app/javascript/mastodon/locales/ku.json b/app/javascript/mastodon/locales/ku.json
index 7d8603cae178fc..4a0fd671db993c 100644
--- a/app/javascript/mastodon/locales/ku.json
+++ b/app/javascript/mastodon/locales/ku.json
@@ -77,7 +77,6 @@
   "announcement.announcement": "Daxuyanî",
   "attachments_list.unprocessed": "(bêpêvajo)",
   "audio.hide": "Dengê veşêre",
-  "autosuggest_hashtag.per_week": "Her hefte {count}",
   "boost_modal.combo": "Ji bo derbas bî carekî din de pêlê {combo} bike",
   "bundle_column_error.copy_stacktrace": "Rapora çewtiyê jê bigire",
   "bundle_column_error.error.body": "Rûpela xwestî nehate pêşkêşkirin. Dibe ku ew ji ber şaşetiyeke koda me, an jî pirsgirêkeke lihevhatina gerokê be.",
@@ -129,22 +128,12 @@
   "compose_form.lock_disclaimer": "Ajimêrê te ne {locked}. Herkes dikare te bişopîne da ku şandiyên te yên tenê ji şopînerên re têne xuyakirin bibînin.",
   "compose_form.lock_disclaimer.lock": "girtî ye",
   "compose_form.placeholder": "Çi di hişê te derbas dibe?",
-  "compose_form.poll.add_option": "Hilbijartinekî tevlî bike",
   "compose_form.poll.duration": "Dema rapirsî yê",
-  "compose_form.poll.option_placeholder": "{number} Hilbijêre",
-  "compose_form.poll.remove_option": "Vê hilbijarê rake",
   "compose_form.poll.switch_to_multiple": "Rapirsî yê biguherînin da ku destûr bidin vebijarkên pirjimar",
   "compose_form.poll.switch_to_single": "Rapirsîyê biguherîne da ku mafê bidî tenê vebijêrkek",
-  "compose_form.publish": "Biweşîne",
   "compose_form.publish_form": "Biweşîne",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Guhertinan tomar bike",
-  "compose_form.sensitive.hide": "{count, plural, one {Medya wekî hestiyar nîşan bide} other {Medya wekî hestiyar nîşan bide}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Medya wekî hestiyar hate nîşan} other {Medya wekî hestiyar nîşan}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Medya wekî hestiyar nehatiye nîşan} other {Medya wekî hestiyar nehatiye nîşan}}",
   "compose_form.spoiler.marked": "Hişyariya naverokê rake",
   "compose_form.spoiler.unmarked": "Hişyariya naverokê tevlî bike",
-  "compose_form.spoiler_placeholder": "Li vir hişyariya xwe binivîse",
   "confirmation_modal.cancel": "Dev jê berde",
   "confirmations.block.block_and_report": "Asteng bike & ragihîne",
   "confirmations.block.confirm": "Asteng bike",
@@ -351,7 +340,6 @@
   "navigation_bar.direct": "Qalkirinên taybet",
   "navigation_bar.discover": "Vekolê",
   "navigation_bar.domain_blocks": "Navperên astengkirî",
-  "navigation_bar.edit_profile": "Profîlê serrast bike",
   "navigation_bar.explore": "Vekole",
   "navigation_bar.filters": "Peyvên bêdengkirî",
   "navigation_bar.follow_requests": "Daxwazên şopandinê",
@@ -437,14 +425,7 @@
   "poll_button.add_poll": "Rapirsîyek zêde bike",
   "poll_button.remove_poll": "Rapirsî yê rake",
   "privacy.change": "Nepênîtiya şandiyan biguherîne",
-  "privacy.direct.long": "Tenê ji bo bikarhênerên qalkirî tê dîtin",
-  "privacy.direct.short": "Tenê kesên qalkirî",
-  "privacy.private.long": "Tenê bo şopîneran xuyabar e",
-  "privacy.private.short": "Tenê şopîneran",
-  "privacy.public.long": "Ji bo hemûyan xuyabar e",
   "privacy.public.short": "Gelemperî",
-  "privacy.unlisted.long": "Ji bo hemûyan xuyabar e, lê ji taybetmendiyên vekolînê veqetiya ye",
-  "privacy.unlisted.short": "Nelîstekirî",
   "privacy_policy.last_updated": "Rojanekirina dawî {date}",
   "privacy_policy.title": "Politîka taybetiyê",
   "refresh": "Nû bike",
@@ -608,10 +589,8 @@
   "upload_error.poll": "Di rapirsîyan de mafê barkirina pelan nayê dayîn.",
   "upload_form.audio_description": "Ji bona kesên kêm dibihîsin re pênase bike",
   "upload_form.description": "Ji bona astengdarên dîtinê re vebêje",
-  "upload_form.description_missing": "Ti danasîn nehatiye tevlîkirin",
   "upload_form.edit": "Serrast bike",
   "upload_form.thumbnail": "Wêneyê biçûk biguherîne",
-  "upload_form.undo": "Jê bibe",
   "upload_form.video_description": "Ji bo kesên kerr û lalan pênase bike",
   "upload_modal.analyzing_picture": "Wêne tê analîzkirin…",
   "upload_modal.apply": "Bisepîne",
diff --git a/app/javascript/mastodon/locales/kw.json b/app/javascript/mastodon/locales/kw.json
index 8f384fe1257ea2..e42f50aeffcb62 100644
--- a/app/javascript/mastodon/locales/kw.json
+++ b/app/javascript/mastodon/locales/kw.json
@@ -45,7 +45,6 @@
   "alert.unexpected.message": "Gwall anwaytyadow re dharva.",
   "alert.unexpected.title": "Oups!",
   "announcement.announcement": "Deklaryans",
-  "autosuggest_hashtag.per_week": "{count} an seythen",
   "boost_modal.combo": "Hwi a yll gwaska {combo} dhe woheles hemma an nessa tro",
   "bundle_column_error.retry": "Assayewgh arta",
   "bundle_modal_error.close": "Degea",
@@ -80,20 +79,12 @@
   "compose_form.lock_disclaimer": "Nyns yw agas akont {locked}. Piwpynag a yll agas holya dhe weles agas postow holyoryon-hepken.",
   "compose_form.lock_disclaimer.lock": "Alhwedhys",
   "compose_form.placeholder": "Pyth eus yn agas brys?",
-  "compose_form.poll.add_option": "Keworra dewis",
   "compose_form.poll.duration": "Duryans sondyans",
-  "compose_form.poll.option_placeholder": "Dewis {number}",
-  "compose_form.poll.remove_option": "Dilea'n dewis ma",
   "compose_form.poll.switch_to_multiple": "Chanjya sondyans dhe asa lies dewis",
   "compose_form.poll.switch_to_single": "Chanjya sondyans dhe asa unn dewis hepken",
   "compose_form.publish_form": "Publish",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.sensitive.hide": "{count, plural, one {Merkya myski vel tender} other {Merkya myski vel tender}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Myski merkys vel tender} other {Myski merkys vel tender}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Nyns yw myski merkys vel tender} other {Nyns yw myski merkys vel tender}}",
   "compose_form.spoiler.marked": "Dilea gwarnyans dalgh",
   "compose_form.spoiler.unmarked": "Keworra gwarnyans dalgh",
-  "compose_form.spoiler_placeholder": "Skrifewgh agas gwarnyans omma",
   "confirmation_modal.cancel": "Hedhi",
   "confirmations.block.block_and_report": "Lettya & Reportya",
   "confirmations.block.confirm": "Lettya",
@@ -244,7 +235,6 @@
   "navigation_bar.compose": "Komposya post nowydh",
   "navigation_bar.discover": "Diskudha",
   "navigation_bar.domain_blocks": "Gorfarthow lettys",
-  "navigation_bar.edit_profile": "Golegi profil",
   "navigation_bar.filters": "Geryow tawhes",
   "navigation_bar.follow_requests": "Govynnow holya",
   "navigation_bar.follows_and_followers": "Holyansow ha holyoryon",
@@ -316,12 +306,7 @@
   "poll_button.add_poll": "Keworra sondyans",
   "poll_button.remove_poll": "Dilea sondyans",
   "privacy.change": "Chanjya privetter an post",
-  "privacy.direct.long": "Gweladow dhe'n dhevnydhyoryon menegys hepken",
-  "privacy.direct.short": "Direct",
-  "privacy.private.long": "Gweladow dhe holyoryon hepken",
-  "privacy.private.short": "Followers-only",
   "privacy.public.short": "Poblek",
-  "privacy.unlisted.short": "Anrelys",
   "refresh": "Daskarga",
   "regeneration_indicator.label": "Ow karga…",
   "regeneration_indicator.sublabel": "Yma agas lin dre ow pos pareusys!",
@@ -407,7 +392,6 @@
   "upload_form.description": "Deskrifewgh rag tus dhallek",
   "upload_form.edit": "Golegi",
   "upload_form.thumbnail": "Chanjya avenik",
-  "upload_form.undo": "Dilea",
   "upload_form.video_description": "Deskrifa rag tus vodharek po dallek",
   "upload_modal.analyzing_picture": "Ow tytratya skeusen…",
   "upload_modal.apply": "Gweytha",
diff --git a/app/javascript/mastodon/locales/la.json b/app/javascript/mastodon/locales/la.json
index 3e5747ba8ba5a1..698b3da4c33cbf 100644
--- a/app/javascript/mastodon/locales/la.json
+++ b/app/javascript/mastodon/locales/la.json
@@ -34,9 +34,7 @@
   "compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.",
   "compose_form.lock_disclaimer.lock": "clausum",
   "compose_form.placeholder": "What is on your mind?",
-  "compose_form.publish": "Barrire",
   "compose_form.publish_form": "Barrire",
-  "compose_form.publish_loud": "{publish}!",
   "compose_form.spoiler.marked": "Text is hidden behind warning",
   "compose_form.spoiler.unmarked": "Text is not hidden",
   "confirmations.block.confirm": "Impedire",
@@ -116,9 +114,6 @@
   "poll_button.add_poll": "Addere electionem",
   "poll_button.remove_poll": "Auferre electionem",
   "privacy.change": "Adjust status privacy",
-  "privacy.direct.short": "Direct",
-  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Coram publico",
   "privacy.public.short": "Coram publico",
   "relative_time.full.just_now": "nunc",
   "relative_time.just_now": "nunc",
@@ -153,7 +148,6 @@
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {# days}}",
   "upload_form.audio_description": "Describe for people who are hard of hearing",
   "upload_form.edit": "Recolere",
-  "upload_form.undo": "Oblitterare",
   "upload_progress.label": "Uploading…",
   "video.mute": "Confutare soni"
 }
diff --git a/app/javascript/mastodon/locales/lad.json b/app/javascript/mastodon/locales/lad.json
index 8fde68742774a2..ba99f5cd30881d 100644
--- a/app/javascript/mastodon/locales/lad.json
+++ b/app/javascript/mastodon/locales/lad.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Pregon",
   "attachments_list.unprocessed": "(no prosesado)",
   "audio.hide": "Eskonder audio",
-  "autosuggest_hashtag.per_week": "{count} por semana",
   "boost_modal.combo": "Puedes klikar {combo} para ometer esto la proksima vez",
   "bundle_column_error.copy_stacktrace": "Kopia el raporto de yerro",
   "bundle_column_error.error.body": "La pajina solisitada no pudo ser renderada. Podria ser por un yerro en muestro kodiche o un problem de kompatibilita kon el navigador.",
@@ -146,22 +145,12 @@
   "compose_form.lock_disclaimer": "Tu kuento no esta {locked}. Todos pueden segirte para ver tus publikasyones solo para suivantes.",
   "compose_form.lock_disclaimer.lock": "serrado",
   "compose_form.placeholder": "Ke haber?",
-  "compose_form.poll.add_option": "Adjusta opsyon",
   "compose_form.poll.duration": "Durasion de anketa",
-  "compose_form.poll.option_placeholder": "Opsyon {number}",
-  "compose_form.poll.remove_option": "Kita esta opsyon",
   "compose_form.poll.switch_to_multiple": "Trokar anketa para permeter a eskojer mas ke una opsyon",
   "compose_form.poll.switch_to_single": "Trokar anketa para permeter a eskojer solo una opsyon",
-  "compose_form.publish": "Publika",
   "compose_form.publish_form": "Mueva publikasyon",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Guadra trokamientos",
-  "compose_form.sensitive.hide": "{count, plural, one {Marka material komo sensivle} other {Marka material komo sensivle}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Material markado komo sensivle} other {Material markado komo sensivle}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Material no markado komo sensivle} other {Material no markado komo sensivle}}",
   "compose_form.spoiler.marked": "Kita avertensya de kontenido",
   "compose_form.spoiler.unmarked": "Adjusta avertensya de kontenido",
-  "compose_form.spoiler_placeholder": "Eskrive tu avertensya aki",
   "confirmation_modal.cancel": "Anula",
   "confirmations.block.block_and_report": "Bloka i raporta",
   "confirmations.block.confirm": "Bloka",
@@ -408,7 +397,6 @@
   "navigation_bar.direct": "Enmentaduras privadas",
   "navigation_bar.discover": "Diskuvre",
   "navigation_bar.domain_blocks": "Domenos blokados",
-  "navigation_bar.edit_profile": "Edita profil",
   "navigation_bar.explore": "Eksplorar",
   "navigation_bar.favourites": "Te plazen",
   "navigation_bar.filters": "Biervos silensiados",
@@ -519,14 +507,7 @@
   "poll_button.add_poll": "Adjusta anketa",
   "poll_button.remove_poll": "Kita anketa",
   "privacy.change": "Troka privasita de publikasyon",
-  "privacy.direct.long": "Vizivle solo para utilizadores enmentados",
-  "privacy.direct.short": "Solo personas enmentadas",
-  "privacy.private.long": "Vizivle solo para suivantes",
-  "privacy.private.short": "Solo suivantes",
-  "privacy.public.long": "Vizivle para todos",
   "privacy.public.short": "Publiko",
-  "privacy.unlisted.long": "Vizivle para todos, ama eskluido de las fonksiones de diskuvrimyento",
-  "privacy.unlisted.short": "No listado",
   "privacy_policy.last_updated": "Ultima aktualizasyon: {date}",
   "privacy_policy.title": "Politika de privasita",
   "recommended": "Rekomendado",
@@ -708,10 +689,8 @@
   "upload_error.poll": "No se permite kargar dosyas kon anketas.",
   "upload_form.audio_description": "Deskrive para personas sodras o kon problemes auditivos",
   "upload_form.description": "Deskrive para personas siegas o kon problemes vizuales",
-  "upload_form.description_missing": "No adjustates deskripsion",
   "upload_form.edit": "Edita",
   "upload_form.thumbnail": "Troka minyatura",
-  "upload_form.undo": "Efasa",
   "upload_form.video_description": "Deskrive para personas sodras, kon problemes auditivos, siegas o kon problemes vizuales",
   "upload_modal.analyzing_picture": "Analizando imaje…",
   "upload_modal.apply": "Aplika",
diff --git a/app/javascript/mastodon/locales/lt.json b/app/javascript/mastodon/locales/lt.json
index 623ff2248f9ae5..14fa09e973bd8e 100644
--- a/app/javascript/mastodon/locales/lt.json
+++ b/app/javascript/mastodon/locales/lt.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Skelbimas",
   "attachments_list.unprocessed": "(neapdorotas)",
   "audio.hide": "Slėpti garsą",
-  "autosuggest_hashtag.per_week": "{count} per savaitę",
   "boost_modal.combo": "Gali paspausti {combo}, kad praleisti kitą kartą",
   "bundle_column_error.copy_stacktrace": "Kopijuoti klaidos ataskaitą",
   "bundle_column_error.error.body": "Užklausos puslapio nepavyko atvaizduoti. Tai gali būti dėl mūsų kodo klaidos arba naršyklės suderinamumo problemos.",
@@ -148,20 +147,20 @@
   "compose_form.placeholder": "Kas tavo mintyse?",
   "compose_form.poll.add_option": "Pridėti pasirinkimą",
   "compose_form.poll.duration": "Apklausos trukmė",
+  "compose_form.poll.multiple": "Keli pasirinkimai",
   "compose_form.poll.option_placeholder": "{number} pasirinkimas",
   "compose_form.poll.remove_option": "Pašalinti šį pasirinkimą",
+  "compose_form.poll.single": "Pasirinkti vieną",
   "compose_form.poll.switch_to_multiple": "Keisti apklausą, kad būtų galima pasirinkti kelis pasirinkimus",
   "compose_form.poll.switch_to_single": "Pakeisti apklausą, kad būtų galima pasirinkti vieną variantą",
+  "compose_form.poll.type": "Stilius",
   "compose_form.publish": "Skelbti",
   "compose_form.publish_form": "Naujas įrašas",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Išsaugoti pakeitimus",
-  "compose_form.sensitive.hide": "{count, plural, one {Žymėti mediją kaip jautrią} few {Žymėti medijas kaip jautrias} many {Žymėti medijo kaip jautrio} other {Žymėti medijų kaip jautrių}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Medija pažymėta kaip jautri} few {Medijos pažymėtos kaip jautrios} many {Medijo pažymėta kaip jautrio} other {Medijų pažymėtų kaip jautrių}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Medija nepažymėta kaip jautri} few {Medijos nepažymėtos kaip jautrios} many {Medijo nepažymėta kaip jautrio} other {Medijų nepažymėtų kaip jautrių}}",
+  "compose_form.reply": "Atsakyti",
+  "compose_form.save_changes": "Atnaujinti",
   "compose_form.spoiler.marked": "Pašalinti turinio įspėjimą",
   "compose_form.spoiler.unmarked": "Pridėti turinio įspėjimą",
-  "compose_form.spoiler_placeholder": "Rašyk savo įspėjimą čia",
+  "compose_form.spoiler_placeholder": "Turinio įspėjimas (pasirinktinis)",
   "confirmation_modal.cancel": "Atšaukti",
   "confirmations.block.block_and_report": "Blokuoti ir pranešti",
   "confirmations.block.confirm": "Blokuoti",
@@ -342,6 +341,7 @@
   "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
   "keyboard_shortcuts.up": "to move up in the list",
   "lightbox.close": "Uždaryti",
+  "lists.new.create": "Pridėti sąrašą",
   "loading_indicator.label": "Kraunama…",
   "media_gallery.toggle_visible": "{number, plural, one {Slėpti vaizdą} few {Slėpti vaizdus} many {Slėpti vaizdo} other {Slėpti vaizdų}}",
   "moved_to_account_banner.text": "Tavo paskyra {disabledAccount} šiuo metu yra išjungta, nes persikėlei į {movedToAccount}.",
@@ -356,7 +356,6 @@
   "navigation_bar.direct": "Privatūs paminėjimai",
   "navigation_bar.discover": "Atrasti",
   "navigation_bar.domain_blocks": "Hidden domains",
-  "navigation_bar.edit_profile": "Redaguoti profilį",
   "navigation_bar.explore": "Naršyti",
   "navigation_bar.favourites": "Mėgstamiausi",
   "navigation_bar.filters": "Nutylėti žodžiai",
@@ -466,14 +465,15 @@
   "poll_button.add_poll": "Pridėti apklausą",
   "poll_button.remove_poll": "Šalinti apklausą",
   "privacy.change": "Adjust status privacy",
-  "privacy.direct.long": "Post to mentioned users only",
-  "privacy.direct.short": "Direct",
-  "privacy.private.long": "Post to followers only",
-  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Visiems matomas",
+  "privacy.direct.long": "Visus, paminėtus įraše",
+  "privacy.direct.short": "Konkretūs žmonės",
+  "privacy.private.long": "Tik sekėjams",
+  "privacy.private.short": "Sekėjai",
+  "privacy.public.long": "Bet kas iš Mastodon ir ne Mastodon",
   "privacy.public.short": "Viešas",
-  "privacy.unlisted.long": "Matomas visiems, bet atsisakyta atradimo funkcijų",
-  "privacy.unlisted.short": "Neįtrauktas į sąrašą",
+  "privacy.unlisted.additional": "Tai veikia lygiai taip pat, kaip ir vieša, tik įrašas nebus rodomas tiesioginiuose srautuose, saitažodžiose, naršyme ar Mastodon paieškoje, net jei esi įtraukęs (-usi) visą paskyrą.",
+  "privacy.unlisted.long": "Mažiau algoritminių fanfarų",
+  "privacy.unlisted.short": "Tyliai vieša",
   "privacy_policy.last_updated": "Paskutinį kartą atnaujinta {date}",
   "privacy_policy.title": "Privatumo politika",
   "recommended": "Rekomenduojama",
@@ -485,7 +485,9 @@
   "relative_time.minutes": "{number} min.",
   "relative_time.seconds": "{number} sek.",
   "relative_time.today": "šiandien",
+  "reply_indicator.attachments": "{count, plural, one {# priedas} few {# priedai} many {# priedo} other {# priedų}}",
   "reply_indicator.cancel": "Atšaukti",
+  "reply_indicator.poll": "Apklausa",
   "report.block": "Blokuoti",
   "report.categories.legal": "Legalus",
   "report.categories.other": "Kita",
@@ -579,9 +581,7 @@
   "units.short.thousand": "{count} tūkst.",
   "upload_form.audio_description": "Describe for people with hearing loss",
   "upload_form.description": "Describe for the visually impaired",
-  "upload_form.description_missing": "Nėra pridėto aprašymo",
   "upload_form.edit": "Redaguoti",
-  "upload_form.undo": "Ištrinti",
   "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
   "upload_modal.choose_image": "Pasirinkti vaizdą",
   "upload_modal.description_placeholder": "Greita rudoji lapė peršoka tinginį šunį",
diff --git a/app/javascript/mastodon/locales/lv.json b/app/javascript/mastodon/locales/lv.json
index c06a1d936826fd..b4426b4c45b29f 100644
--- a/app/javascript/mastodon/locales/lv.json
+++ b/app/javascript/mastodon/locales/lv.json
@@ -86,7 +86,6 @@
   "announcement.announcement": "Paziņojums",
   "attachments_list.unprocessed": "(neapstrādāti)",
   "audio.hide": "Slēpt audio",
-  "autosuggest_hashtag.per_week": "{count} nedēļā",
   "boost_modal.combo": "Nospied {combo}, lai nākamreiz šo izlaistu",
   "bundle_column_error.copy_stacktrace": "Kopēt kļūdu ziņojumu",
   "bundle_column_error.error.body": "Pieprasīto lapu nevarēja atveidot. Tas varētu būt saistīts ar kļūdu mūsu kodā, vai tā ir pārlūkprogrammas saderības problēma.",
@@ -143,22 +142,12 @@
   "compose_form.lock_disclaimer": "Tavs konts nav {locked}. Ikviens var tev piesekot un redzēt tikai sekotājiem paredzētos ziņojumus.",
   "compose_form.lock_disclaimer.lock": "slēgts",
   "compose_form.placeholder": "Kas tev padomā?",
-  "compose_form.poll.add_option": "Pievienot izvēli",
   "compose_form.poll.duration": "Aptaujas ilgums",
-  "compose_form.poll.option_placeholder": "Izvēle Nr. {number}",
-  "compose_form.poll.remove_option": "Noņemt šo izvēli",
   "compose_form.poll.switch_to_multiple": "Mainīt aptaujas veidu, lai atļautu vairākas izvēles",
   "compose_form.poll.switch_to_single": "Mainīt aptaujas veidu, lai atļautu vienu izvēli",
-  "compose_form.publish": "Publicēt",
   "compose_form.publish_form": "Jauns ieraksts",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Saglabāt izmaiņas",
-  "compose_form.sensitive.hide": "{count, plural, one {Atzīmēt multividi kā sensitīvu} other {Atzīmēt multivides kā sensitīvas}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Multivide ir atzīmēta kā sensitīva} other {Multivides ir atzīmētas kā sensitīvas}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Multivide nav atzīmēta kā sensitīva} other {Multivides nav atzīmētas kā sensitīvas}}",
   "compose_form.spoiler.marked": "Noņemt satura brīdinājumu",
   "compose_form.spoiler.unmarked": "Pievienot satura brīdinājumu",
-  "compose_form.spoiler_placeholder": "Ieraksti savu brīdinājumu šeit",
   "confirmation_modal.cancel": "Atcelt",
   "confirmations.block.block_and_report": "Bloķēt un ziņot",
   "confirmations.block.confirm": "Bloķēt",
@@ -403,7 +392,6 @@
   "navigation_bar.direct": "Privāti pieminēti",
   "navigation_bar.discover": "Atklāt",
   "navigation_bar.domain_blocks": "Bloķētie domēni",
-  "navigation_bar.edit_profile": "Rediģēt profilu",
   "navigation_bar.explore": "Pārlūkot",
   "navigation_bar.favourites": "Izlase",
   "navigation_bar.filters": "Apklusinātie vārdi",
@@ -510,14 +498,7 @@
   "poll_button.add_poll": "Pievienot aptauju",
   "poll_button.remove_poll": "Noņemt aptauju",
   "privacy.change": "Mainīt ieraksta privātumu",
-  "privacy.direct.long": "Redzama tikai pieminētajiem lietotājiem",
-  "privacy.direct.short": "Tikai minētie cilvēki",
-  "privacy.private.long": "Redzama tikai sekotājiem",
-  "privacy.private.short": "Tikai sekotājiem",
-  "privacy.public.long": "Redzams visiem",
   "privacy.public.short": "Publiska",
-  "privacy.unlisted.long": "Redzams visiem, bet izslēgts no satura atklāšanas funkcijām",
-  "privacy.unlisted.short": "Neiekļautie",
   "privacy_policy.last_updated": "Pēdējo reizi atjaunināta {date}",
   "privacy_policy.title": "Privātuma politika",
   "refresh": "Atsvaidzināt",
@@ -697,10 +678,8 @@
   "upload_error.poll": "Datņu augšupielādes aptaujās nav atļautas.",
   "upload_form.audio_description": "Pievieno aprakstu cilvēkiem ar dzirdes zudumu",
   "upload_form.description": "Pievieno aprakstu vājredzīgajiem",
-  "upload_form.description_missing": "Apraksts nav pievienots",
   "upload_form.edit": "Rediģēt",
   "upload_form.thumbnail": "Nomainīt sīktēlu",
-  "upload_form.undo": "Dzēst",
   "upload_form.video_description": "Pievieno aprakstu cilvēkiem ar dzirdes vai redzes traucējumiem",
   "upload_modal.analyzing_picture": "Analizē attēlu…",
   "upload_modal.apply": "Pielietot",
diff --git a/app/javascript/mastodon/locales/mk.json b/app/javascript/mastodon/locales/mk.json
index bdef3f4a5feeb6..f7080842b710df 100644
--- a/app/javascript/mastodon/locales/mk.json
+++ b/app/javascript/mastodon/locales/mk.json
@@ -48,7 +48,6 @@
   "alert.rate_limited.message": "Обидете се повторно после {retry_time, time, medium}.",
   "alert.unexpected.message": "Неочекувана грешка.",
   "alert.unexpected.title": "Упс!",
-  "autosuggest_hashtag.per_week": "{count} неделно",
   "boost_modal.combo": "Кликни {combo} за да го прескокниш ова нареден пат",
   "bundle_column_error.retry": "Обидете се повторно",
   "bundle_modal_error.close": "Затвори",
@@ -76,14 +75,8 @@
   "compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.",
   "compose_form.lock_disclaimer.lock": "заклучен",
   "compose_form.placeholder": "Што имате на ум?",
-  "compose_form.poll.add_option": "Додај избор",
   "compose_form.poll.duration": "Времетрање на анкета",
-  "compose_form.poll.option_placeholder": "Избери {number}",
-  "compose_form.poll.remove_option": "Избриши избор",
   "compose_form.publish_form": "Publish",
-  "compose_form.sensitive.hide": "Обележи медиа како сензитивна",
-  "compose_form.sensitive.marked": "Медиата е обележана како сензитивна",
-  "compose_form.sensitive.unmarked": "Медиата не е обележана како сензитивна",
   "compose_form.spoiler.marked": "Текстот е сокриен зад предупредување",
   "compose_form.spoiler.unmarked": "Текстот не е сокриен",
   "confirmation_modal.cancel": "Откажи",
@@ -182,7 +175,6 @@
   "keyboard_shortcuts.up": "to move up in the list",
   "navigation_bar.compose": "Compose new toot",
   "navigation_bar.domain_blocks": "Hidden domains",
-  "navigation_bar.edit_profile": "Уреди профил",
   "navigation_bar.filters": "Замолќени зборови",
   "navigation_bar.follow_requests": "Следи покани",
   "navigation_bar.follows_and_followers": "Следења и следбеници",
@@ -229,12 +221,7 @@
   "poll_button.add_poll": "Додадете нова анкета",
   "poll_button.remove_poll": "Избришете анкета",
   "privacy.change": "Штеловај статус на приватност",
-  "privacy.direct.long": "Објави само на спомнати корисници",
-  "privacy.direct.short": "Direct",
-  "privacy.private.long": "Објави само на следбеници",
-  "privacy.private.short": "Followers-only",
   "privacy.public.short": "Јавно",
-  "privacy.unlisted.short": "Необјавено",
   "refresh": "Освежи",
   "regeneration_indicator.label": "Вчитување…",
   "regeneration_indicator.sublabel": "Вашиот новости се подготвуваат!",
diff --git a/app/javascript/mastodon/locales/ml.json b/app/javascript/mastodon/locales/ml.json
index 11636646b26c0a..0059dd333bbdb8 100644
--- a/app/javascript/mastodon/locales/ml.json
+++ b/app/javascript/mastodon/locales/ml.json
@@ -60,7 +60,6 @@
   "announcement.announcement": "അറിയിപ്പ്",
   "attachments_list.unprocessed": "(പ്രോസസ്സ് ചെയ്യാത്തത്)",
   "audio.hide": "ശബ്ദം ഒഴിവാക്കുക",
-  "autosuggest_hashtag.per_week": "ആഴ്ച തോറും {count}",
   "boost_modal.combo": "അടുത്ത തവണ ഇത് ഒഴിവാക്കുവാൻ {combo} ഞെക്കാവുന്നതാണ്",
   "bundle_column_error.network.title": "നെറ്റ്‍വർക്ക് പിശക്",
   "bundle_column_error.retry": "വീണ്ടും ശ്രമിക്കുക",
@@ -102,17 +101,12 @@
   "compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.",
   "compose_form.lock_disclaimer.lock": "ലോക്കുചെയ്തു",
   "compose_form.placeholder": "നിങ്ങളുടെ മനസ്സിൽ എന്താണ്?",
-  "compose_form.poll.add_option": "ഒരു ചോയ്‌സ് ചേർക്കുക",
   "compose_form.poll.duration": "തിരഞ്ഞെടുപ്പിന്റെ സമയദൈർഖ്യം",
-  "compose_form.poll.option_placeholder": "ചോയ്‌സ് {number}",
-  "compose_form.poll.remove_option": "ഈ ഡിവൈസ് മാറ്റുക",
   "compose_form.poll.switch_to_multiple": "വോട്ടെടുപ്പിൽ ഒന്നിലധികം ചോയ്‌സുകൾ ഉൾപ്പെടുതുക",
   "compose_form.poll.switch_to_single": "വോട്ടെടുപ്പിൽ ഒരൊറ്റ ചോയ്‌സ്‌ മാത്രം ആക്കുക",
   "compose_form.publish_form": "Publish",
-  "compose_form.publish_loud": "{പ്രസിദ്ധീകരിക്കുക}!",
   "compose_form.spoiler.marked": "എഴുത്ത് മുന്നറിയിപ്പിനാൽ മറച്ചിരിക്കുന്നു",
   "compose_form.spoiler.unmarked": "എഴുത്ത് മറയ്ക്കപ്പെട്ടിട്ടില്ല",
-  "compose_form.spoiler_placeholder": "നിങ്ങളുടെ മുന്നറിയിപ്പ് ഇവിടെ എഴുതുക",
   "confirmation_modal.cancel": "റദ്ദാക്കുക",
   "confirmations.block.block_and_report": "തടയുകയും റിപ്പോർട്ടും ചെയ്യുക",
   "confirmations.block.confirm": "തടയുക",
@@ -244,7 +238,6 @@
   "navigation_bar.compose": "പുതിയ ടൂട്ട് എഴുതുക",
   "navigation_bar.discover": "കണ്ടെത്തുക",
   "navigation_bar.domain_blocks": "Hidden domains",
-  "navigation_bar.edit_profile": "പ്രൊഫൈൽ തിരുത്തുക",
   "navigation_bar.follow_requests": "പിന്തുടരാനുള്ള അഭ്യർത്ഥനകൾ",
   "navigation_bar.lists": "ലിസ്റ്റുകൾ",
   "navigation_bar.logout": "ലോഗൗട്ട്",
@@ -302,10 +295,6 @@
   "poll_button.add_poll": "ഒരു പോൾ ചേർക്കുക",
   "poll_button.remove_poll": "പോൾ നീക്കംചെയ്യുക",
   "privacy.change": "ടൂട്ട് സ്വകാര്യത ക്രമീകരിക്കുക",
-  "privacy.direct.long": "Post to mentioned users only",
-  "privacy.direct.short": "Direct",
-  "privacy.private.long": "Post to followers only",
-  "privacy.private.short": "Followers-only",
   "privacy.public.short": "എല്ലാവര്‍ക്കും",
   "refresh": "പുതുക്കുക",
   "regeneration_indicator.label": "ലഭ്യമാക്കുന്നു…",
@@ -372,7 +361,6 @@
   "upload_form.description": "കാഴ്ചശക്തി ഇല്ലാത്തവർക്ക് വേണ്ടി വിവരണം നൽകൂ",
   "upload_form.edit": "തിരുത്തുക",
   "upload_form.thumbnail": "ലഘുചിത്രം മാറ്റുക",
-  "upload_form.undo": "ഇല്ലാതാക്കുക",
   "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
   "upload_modal.analyzing_picture": "ചിത്രം വിശകലനം ചെയ്യുന്നു…",
   "upload_modal.apply": "പ്രയോഗിക്കുക",
diff --git a/app/javascript/mastodon/locales/mr.json b/app/javascript/mastodon/locales/mr.json
index 7f5b7d65248ed5..20231f0bbfd6d4 100644
--- a/app/javascript/mastodon/locales/mr.json
+++ b/app/javascript/mastodon/locales/mr.json
@@ -73,7 +73,6 @@
   "alert.unexpected.message": "एक अनपेक्षित त्रुटी आली.",
   "alert.unexpected.title": "अरेरे!",
   "announcement.announcement": "घोषणा",
-  "autosuggest_hashtag.per_week": "{count} प्रतिसप्ताह",
   "bundle_column_error.retry": "पुन्हा प्रयत्न करा",
   "bundle_modal_error.close": "बंद करा",
   "bundle_modal_error.message": "हा घटक लोड करतांना काहीतरी चुकले आहे.",
@@ -99,9 +98,6 @@
   "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
   "compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.",
   "compose_form.placeholder": "आपल्या मनात काय आहे?",
-  "compose_form.poll.add_option": "नवीन पर्याय",
-  "compose_form.poll.option_placeholder": "निवड {number}",
-  "compose_form.poll.remove_option": "हा पर्याय काढा",
   "compose_form.publish_form": "Publish",
   "compose_form.spoiler.marked": "Text is hidden behind warning",
   "compose_form.spoiler.unmarked": "Text is not hidden",
@@ -228,10 +224,6 @@
   "onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
   "onboarding.steps.share_profile.title": "Share your profile",
   "privacy.change": "Adjust status privacy",
-  "privacy.direct.long": "Post to mentioned users only",
-  "privacy.direct.short": "Direct",
-  "privacy.private.long": "Post to followers only",
-  "privacy.private.short": "Followers-only",
   "report.placeholder": "Type or paste additional comments",
   "report.submit": "Submit report",
   "report.target": "Report {target}",
diff --git a/app/javascript/mastodon/locales/ms.json b/app/javascript/mastodon/locales/ms.json
index 50a48db1ea03d0..8c1ff633768b53 100644
--- a/app/javascript/mastodon/locales/ms.json
+++ b/app/javascript/mastodon/locales/ms.json
@@ -86,7 +86,6 @@
   "announcement.announcement": "Pengumuman",
   "attachments_list.unprocessed": "(belum diproses)",
   "audio.hide": "Sembunyikan audio",
-  "autosuggest_hashtag.per_week": "{count} seminggu",
   "boost_modal.combo": "Anda boleh tekan {combo} untuk melangkauinya pada waktu lain",
   "bundle_column_error.copy_stacktrace": "Salin laporan ralat",
   "bundle_column_error.error.body": "Halaman yang diminta gagal dipaparkan. Ini mungkin disebabkan oleh pepijat dalam kod kami, atau masalah keserasian pelayar.",
@@ -143,22 +142,12 @@
   "compose_form.lock_disclaimer": "Akaun anda tidak {locked}. Sesiapa pun boleh mengikuti anda untuk melihat hantaran pengikut-sahaja anda.",
   "compose_form.lock_disclaimer.lock": "dikunci",
   "compose_form.placeholder": "Apakah yang sedang anda fikirkan?",
-  "compose_form.poll.add_option": "Tambah pilihan",
   "compose_form.poll.duration": "Tempoh undian",
-  "compose_form.poll.option_placeholder": "Pilihan {number}",
-  "compose_form.poll.remove_option": "Buang pilihan ini",
   "compose_form.poll.switch_to_multiple": "Ubah kepada membenarkan aneka undian",
   "compose_form.poll.switch_to_single": "Ubah kepada undian pilihan tunggal",
-  "compose_form.publish": "Terbit",
   "compose_form.publish_form": "Terbit",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Simpan perubahan",
-  "compose_form.sensitive.hide": "{count, plural, one {Tandakan media sbg sensitif} other {Tandakan media sbg sensitif}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Media telah ditanda sbg sensitif} other {Media telah ditanda sbg sensitif}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Media tidak ditanda sbg sensitif} other {Media tidak ditanda sbg sensitif}}",
   "compose_form.spoiler.marked": "Buang amaran kandungan",
   "compose_form.spoiler.unmarked": "Tambah amaran kandungan",
-  "compose_form.spoiler_placeholder": "Tulis amaran anda di sini",
   "confirmation_modal.cancel": "Batal",
   "confirmations.block.block_and_report": "Sekat & Lapor",
   "confirmations.block.confirm": "Sekat",
@@ -399,7 +388,6 @@
   "navigation_bar.direct": "Sebutan peribadi",
   "navigation_bar.discover": "Teroka",
   "navigation_bar.domain_blocks": "Domain disekat",
-  "navigation_bar.edit_profile": "Sunting profil",
   "navigation_bar.explore": "Teroka",
   "navigation_bar.favourites": "Kegemaran",
   "navigation_bar.filters": "Perkataan yang dibisukan",
@@ -506,14 +494,7 @@
   "poll_button.add_poll": "Tambah undian",
   "poll_button.remove_poll": "Buang undian",
   "privacy.change": "Ubah privasi hantaran",
-  "privacy.direct.long": "Hanya boleh dilihat oleh pengguna disebut",
-  "privacy.direct.short": "Orang yang disebut sahaja",
-  "privacy.private.long": "Hanya boleh dilihat oleh pengikut",
-  "privacy.private.short": "Pengikut sahaja",
-  "privacy.public.long": "Kelihatan untuk semua",
   "privacy.public.short": "Awam",
-  "privacy.unlisted.long": "Terpapar untuk semua, tetapi menarik diri daripada ciri penemuan",
-  "privacy.unlisted.short": "Tidak tersenarai",
   "privacy_policy.last_updated": "Dikemaskini {date}",
   "privacy_policy.title": "Dasar Privasi",
   "refresh": "Muat semula",
@@ -693,10 +674,8 @@
   "upload_error.poll": "Tidak boleh memuat naik fail bersama undian.",
   "upload_form.audio_description": "Jelaskan untuk orang yang ada masalah pendengaran",
   "upload_form.description": "Jelaskan untuk orang yang ada masalah penglihatan",
-  "upload_form.description_missing": "Tiada keterangan ditambah",
   "upload_form.edit": "Sunting",
   "upload_form.thumbnail": "Ubah gambar kecil",
-  "upload_form.undo": "Padam",
   "upload_form.video_description": "Jelaskan untuk orang yang ada masalah pendengaran atau penglihatan",
   "upload_modal.analyzing_picture": "Menganalisis gambar…",
   "upload_modal.apply": "Guna",
diff --git a/app/javascript/mastodon/locales/my.json b/app/javascript/mastodon/locales/my.json
index 3ca03b616a9620..396a72ac450295 100644
--- a/app/javascript/mastodon/locales/my.json
+++ b/app/javascript/mastodon/locales/my.json
@@ -87,7 +87,6 @@
   "announcement.announcement": "ကြေငြာချက်",
   "attachments_list.unprocessed": "(မလုပ်ဆောင်ရသေး)",
   "audio.hide": "အသံပိတ်မည်",
-  "autosuggest_hashtag.per_week": "တစ်ပတ်လျှင် {count}\n",
   "boost_modal.combo": "ဤအရာကို နောက်တစ်ကြိမ်ကျော်ရန် {combo} ကိုနှိပ်နိုင်သည်။",
   "bundle_column_error.copy_stacktrace": "စာကူးရာတွင်ပြဿနာရှိသည်",
   "bundle_column_error.error.body": "ဤစာမျက်နှာကို ဖော်ပြရာတွင် ပြဿနာရှိနေသည်",
@@ -144,22 +143,12 @@
   "compose_form.lock_disclaimer": "သင့်အကောင့်ကို {သော့ခတ်မထားပါ}။ သင့်နောက်လိုက်-သီးသန့်ပို့စ်များကို ကြည့်ရှုရန် မည်သူမဆို သင့်အား လိုက်ကြည့်နိုင်ပါသည်။",
   "compose_form.lock_disclaimer.lock": "သော့ခတ်ထားမယ်",
   "compose_form.placeholder": "What is on your mind?",
-  "compose_form.poll.add_option": "ရွေးချယ်မှုထပ်မံပေါင်းထည့်ပါ",
   "compose_form.poll.duration": "စစ်တမ်းကြာချိန်",
-  "compose_form.poll.option_placeholder": "ရွေးချယ်မှု {number}\n",
-  "compose_form.poll.remove_option": "ဤရွေးချယ်မှုကို ဖယ်ထုတ်ပါ",
   "compose_form.poll.switch_to_multiple": "စစ်တမ်းတွင်တစ်ခုထပ်ပိုသောဆန္ဒပြုချက်လက်ခံမည်",
   "compose_form.poll.switch_to_single": "စစ်တမ်းတွင် တစ်ခုကိုသာရွေးချယ်ခွင့်ပြုမည်",
-  "compose_form.publish": "ပို့စ်တင်မည်",
   "compose_form.publish_form": "ပို့စ်တင်မည်",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "ပြောင်းလဲမှုများကို သိမ်းဆည်းပါ",
-  "compose_form.sensitive.hide": "{count, plural, one {Mark media as sensitive} other {Mark media as sensitive}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Media is marked as sensitive} other {Media is marked as sensitive}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Media is not marked as sensitive} other {Media is not marked as sensitive}}",
   "compose_form.spoiler.marked": "Text is hidden behind warning",
   "compose_form.spoiler.unmarked": "Text is not hidden",
-  "compose_form.spoiler_placeholder": "သတိပေးစာကိုဤနေရာတွင်ရေးပါ",
   "confirmation_modal.cancel": "ပယ်ဖျက်မည်",
   "confirmations.block.block_and_report": "ဘလော့ပြီး တိုင်ကြားမည်",
   "confirmations.block.confirm": "ဘလော့မည်",
@@ -405,7 +394,6 @@
   "navigation_bar.direct": "သီးသန့်ဖော်ပြချက်များ",
   "navigation_bar.discover": "ရှာဖွေပါ",
   "navigation_bar.domain_blocks": "Hidden domains",
-  "navigation_bar.edit_profile": "ကိုယ်ရေးမှတ်တမ်းပြင်ဆင်မည်",
   "navigation_bar.explore": "စူးစမ်းရန်",
   "navigation_bar.favourites": "Favorites",
   "navigation_bar.filters": "စကားလုံးများ ပိတ်ထားပါ",
@@ -519,14 +507,7 @@
   "poll_button.add_poll": "စစ်တမ်းကောက်မည်",
   "poll_button.remove_poll": "စစ်တမ်းပယ်ဖျက်မည်",
   "privacy.change": "Adjust status privacy",
-  "privacy.direct.long": "မန်းရှင်းခေါ်သူသီးသန့်",
-  "privacy.direct.short": "Direct",
-  "privacy.private.long": "ဖော်လိုးလုပ်သူသီးသန့်",
-  "privacy.private.short": "စောင့်ကြည့်သူများသာ",
-  "privacy.public.long": "အားလုံး မြင်နိုင်သည်",
   "privacy.public.short": "အများကိုပြမည်",
-  "privacy.unlisted.long": "အားလုံးမြင်နိုင်သော်လည်း ရှာဖွေမှုများမှ ဖယ်ထုတ်ထားသည်",
-  "privacy.unlisted.short": "စာရင်းမသွင်းထားပါ",
   "privacy_policy.last_updated": "နောက်ဆုံး ပြင်ဆင်ခဲ့သည့်ရက်စွဲ {date}",
   "privacy_policy.title": "ကိုယ်ရေးအချက်အလက်မူဝါဒ",
   "recommended": "အကြံပြုသည်",
@@ -708,10 +689,8 @@
   "upload_error.poll": "စစ်တမ်းနှင့်အတူဖိုင်များတင်ခွင့်မပြုပါ",
   "upload_form.audio_description": "အကြားအာရုံချို့ယွင်းသော ခက်ခဲသောသူများအတွက် ဖော်ပြထားသည်",
   "upload_form.description": "အမြင်အာရုံချို့ယွင်းသော ခက်ခဲသောသူများအတွက် ဖော်ပြထားသည်",
-  "upload_form.description_missing": "ဖော်ပြချက် မထည့်ပါ",
   "upload_form.edit": "ပြင်ရန်",
   "upload_form.thumbnail": "ပုံသေးကို ပြောင်းပါ",
-  "upload_form.undo": "ဖျက်ရန်",
   "upload_form.video_description": "အမြင်အာရုံနှင့်အကြားအာရုံ ချို့ယွင်းသော ခက်ခဲသောသူများအတွက် ဖော်ပြထားသည်",
   "upload_modal.analyzing_picture": "ပုံအား ပိုင်းခြားစိတ်ဖြာနေသည်...",
   "upload_modal.apply": "သုံးပါ",
diff --git a/app/javascript/mastodon/locales/ne.json b/app/javascript/mastodon/locales/ne.json
index 229d4f4718d40b..86e24a15fb1188 100644
--- a/app/javascript/mastodon/locales/ne.json
+++ b/app/javascript/mastodon/locales/ne.json
@@ -69,12 +69,5 @@
   "compose.language.change": "भाषा परिवर्तन गर्नुहोस्",
   "compose.language.search": "भाषाहरू खोज्नुहोस्...",
   "compose_form.direct_message_warning_learn_more": "थप जान्नुहोस्",
-  "compose_form.poll.add_option": "विकल्प थप्नुहोस्",
-  "compose_form.poll.remove_option": "यो विकल्प हटाउनुहोस्",
-  "compose_form.publish_form": "नयाँ पोस्ट",
-  "compose_form.save_changes": "परिवर्तनहरू सेभ गर्नुहोस",
-  "compose_form.sensitive.hide": "{count, plural, one {संवेदनशील मिडियाको रूपमा चिन्ह लगाउनुहोस्} other {संवेदनशील मिडियाहरूको रूपमा चिन्ह लगाउनुहोस्}}",
-  "compose_form.sensitive.marked": "{count, plural, one {मिडियालाई संवेदनशील रूपमा चिन्ह लगाइएको छ} other {मिडियाहरूलाई संवेदनशील रूपमा चिन्ह लगाइएको छ}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {मिडियालाई संवेदनशील रूपमा चिन्ह लगाइएको छैन} other {मिडियाहरूलाई संवेदनशील रूपमा चिन्ह लगाइएको छैन}}",
-  "compose_form.spoiler_placeholder": "यहाँ आफ्नो चेतावनी लेख्नुहोस्"
+  "compose_form.publish_form": "नयाँ पोस्ट"
 }
diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json
index 86617d4a54b90c..e38f8fd0ba18db 100644
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Mededeling",
   "attachments_list.unprocessed": "(niet verwerkt)",
   "audio.hide": "Audio verbergen",
-  "autosuggest_hashtag.per_week": "{count} per week",
   "boost_modal.combo": "Je kunt {combo} klikken om dit de volgende keer over te slaan",
   "bundle_column_error.copy_stacktrace": "Foutrapportage kopiëren",
   "bundle_column_error.error.body": "De opgevraagde pagina kon niet worden weergegeven. Dit kan het gevolg zijn van een fout in onze broncode, of van een compatibiliteitsprobleem met je webbrowser.",
@@ -146,22 +145,22 @@
   "compose_form.lock_disclaimer": "Jouw account is niet {locked}. Iedereen kan jou volgen en kan de berichten zien die je alleen aan jouw volgers hebt gericht.",
   "compose_form.lock_disclaimer.lock": "vergrendeld",
   "compose_form.placeholder": "Wat wil je kwijt?",
-  "compose_form.poll.add_option": "Keuze toevoegen",
+  "compose_form.poll.add_option": "Optie toevoegen",
   "compose_form.poll.duration": "Duur van de peiling",
-  "compose_form.poll.option_placeholder": "Keuze {number}",
-  "compose_form.poll.remove_option": "Deze keuze verwijderen",
+  "compose_form.poll.multiple": "Meerkeuze",
+  "compose_form.poll.option_placeholder": "Optie {number}",
+  "compose_form.poll.remove_option": "Deze optie verwijderen",
+  "compose_form.poll.single": "Kies een",
   "compose_form.poll.switch_to_multiple": "Peiling wijzigen om meerdere keuzes toe te staan",
   "compose_form.poll.switch_to_single": "Peiling wijzigen om een enkele keuze toe te staan",
-  "compose_form.publish": "Toot",
+  "compose_form.poll.type": "Stijl",
+  "compose_form.publish": "Plaatsen",
   "compose_form.publish_form": "Nieuw bericht",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Wijzigingen opslaan",
-  "compose_form.sensitive.hide": "{count, plural, one {Media als gevoelig markeren} other {Media als gevoelig markeren}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Media is als gevoelig gemarkeerd} other {Media is als gevoelig gemarkeerd}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Media is niet als gevoelig gemarkeerd} other {Media is niet als gevoelig gemarkeerd}}",
+  "compose_form.reply": "Reageren",
+  "compose_form.save_changes": "Bijwerken",
   "compose_form.spoiler.marked": "Inhoudswaarschuwing verwijderen",
   "compose_form.spoiler.unmarked": "Inhoudswaarschuwing toevoegen",
-  "compose_form.spoiler_placeholder": "Waarschuwingstekst",
+  "compose_form.spoiler_placeholder": "Waarschuwing inhoud (optioneel)",
   "confirmation_modal.cancel": "Annuleren",
   "confirmations.block.block_and_report": "Blokkeren en rapporteren",
   "confirmations.block.confirm": "Blokkeren",
@@ -408,7 +407,6 @@
   "navigation_bar.direct": "Privéberichten",
   "navigation_bar.discover": "Ontdekken",
   "navigation_bar.domain_blocks": "Geblokkeerde domeinen",
-  "navigation_bar.edit_profile": "Profiel bewerken",
   "navigation_bar.explore": "Verkennen",
   "navigation_bar.favourites": "Favorieten",
   "navigation_bar.filters": "Filters",
@@ -526,14 +524,15 @@
   "poll_button.add_poll": "Peiling toevoegen",
   "poll_button.remove_poll": "Peiling verwijderen",
   "privacy.change": "Zichtbaarheid van bericht aanpassen",
-  "privacy.direct.long": "Alleen aan vermelde gebruikers tonen",
-  "privacy.direct.short": "Privébericht",
-  "privacy.private.long": "Alleen aan volgers tonen",
-  "privacy.private.short": "Alleen volgers",
-  "privacy.public.long": "Voor iedereen zichtbaar",
+  "privacy.direct.long": "Iedereen genoemd in de post",
+  "privacy.direct.short": "Specifieke mensen",
+  "privacy.private.long": "Alleen jouw volgers",
+  "privacy.private.short": "Volgers",
+  "privacy.public.long": "Iedereen op Mastodon en daarbuiten",
   "privacy.public.short": "Openbaar",
-  "privacy.unlisted.long": "Voor iedereen zichtbaar, maar niet onder trends, hashtags en op openbare tijdlijnen",
-  "privacy.unlisted.short": "Minder openbaar",
+  "privacy.unlisted.additional": "Dit is vergelijkbaar met publiek, behalve dat de post niet zal verschijnen in live feeds of hashtags, verkennen of Mastodon zoeken, zelfs als je gekozen hebt voor account-breed.",
+  "privacy.unlisted.long": "Minder algoritmische fanfare",
+  "privacy.unlisted.short": "Stil publiek",
   "privacy_policy.last_updated": "Laatst bijgewerkt op {date}",
   "privacy_policy.title": "Privacybeleid",
   "recommended": "Aanbevolen",
@@ -551,7 +550,9 @@
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "vandaag",
+  "reply_indicator.attachments": "{count, plural, one {# bijlage} other {# bijlagen}}",
   "reply_indicator.cancel": "Annuleren",
+  "reply_indicator.poll": "Peiling",
   "report.block": "Blokkeren",
   "report.block_explanation": "Je kunt diens berichten niet zien. Je kunt door diegene niet gevolgd worden en jouw berichten zijn onzichtbaar. Diegene kan zien dat die door jou is geblokkeerd.",
   "report.categories.legal": "Juridisch",
@@ -715,10 +716,8 @@
   "upload_error.poll": "Het uploaden van bestanden is bij peilingen niet toegestaan.",
   "upload_form.audio_description": "Omschrijf dit voor dove of slechthorende mensen",
   "upload_form.description": "Omschrijf dit voor blinde of slechtziende mensen",
-  "upload_form.description_missing": "Geen omschrijving toegevoegd",
   "upload_form.edit": "Bewerken",
   "upload_form.thumbnail": "Miniatuurafbeelding wijzigen",
-  "upload_form.undo": "Verwijderen",
   "upload_form.video_description": "Omschrijf dit voor dove, slechthorende, blinde of slechtziende mensen",
   "upload_modal.analyzing_picture": "Afbeelding analyseren…",
   "upload_modal.apply": "Toepassen",
diff --git a/app/javascript/mastodon/locales/nn.json b/app/javascript/mastodon/locales/nn.json
index ec2ff8214457b7..9bb4f591971567 100644
--- a/app/javascript/mastodon/locales/nn.json
+++ b/app/javascript/mastodon/locales/nn.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Kunngjering",
   "attachments_list.unprocessed": "(ubehandla)",
   "audio.hide": "Gøym lyd",
-  "autosuggest_hashtag.per_week": "{count} per veke",
   "boost_modal.combo": "Du kan trykkja {combo} for å hoppa over dette neste gong",
   "bundle_column_error.copy_stacktrace": "Kopier feilrapport",
   "bundle_column_error.error.body": "Den etterspurde sida kan ikke hentast fram. Det kan skuldast ein feil i koden vår eller eit kompatibilitetsproblem.",
@@ -146,22 +145,22 @@
   "compose_form.lock_disclaimer": "Kontoen din er ikkje {locked}. Kven som helst kan fylgja deg for å sjå innlegga dine.",
   "compose_form.lock_disclaimer.lock": "låst",
   "compose_form.placeholder": "Kva har du på hjarta?",
-  "compose_form.poll.add_option": "Legg til eit val",
+  "compose_form.poll.add_option": "Legg til alternativ",
   "compose_form.poll.duration": "Varigheit for rundspørjing",
-  "compose_form.poll.option_placeholder": "Val {number}",
-  "compose_form.poll.remove_option": "Fjern dette valet",
+  "compose_form.poll.multiple": "Flervalg",
+  "compose_form.poll.option_placeholder": "Valg {number}",
+  "compose_form.poll.remove_option": "Fjern dette valget",
+  "compose_form.poll.single": "Velg en",
   "compose_form.poll.switch_to_multiple": "Endre rundspørjinga til å tillate fleire val",
   "compose_form.poll.switch_to_single": "Endre rundspørjinga til å tillate berre eitt val",
-  "compose_form.publish": "Legg ut",
+  "compose_form.poll.type": "Stil",
+  "compose_form.publish": "Publiser",
   "compose_form.publish_form": "Legg ut",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Lagre endringar",
-  "compose_form.sensitive.hide": "{count, plural, one {Marker mediet som ømtolig} other {Marker media som ømtolige}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Mediet er markert som ømtolig} other {Media er markerte som ømtolige}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Mediet er ikkje markert som ømtolig} other {Media er ikkje markerte som ømtolige}}",
+  "compose_form.reply": "Svar",
+  "compose_form.save_changes": "Oppdater",
   "compose_form.spoiler.marked": "Fjern innhaldsåtvaring",
   "compose_form.spoiler.unmarked": "Legg til innhaldsåtvaring",
-  "compose_form.spoiler_placeholder": "Skriv åtvaringa di her",
+  "compose_form.spoiler_placeholder": "Innholdsadvarsel (valgfritt)",
   "confirmation_modal.cancel": "Avbryt",
   "confirmations.block.block_and_report": "Blokker & rapporter",
   "confirmations.block.confirm": "Blokker",
@@ -408,7 +407,6 @@
   "navigation_bar.direct": "Private omtaler",
   "navigation_bar.discover": "Oppdag",
   "navigation_bar.domain_blocks": "Skjulte domene",
-  "navigation_bar.edit_profile": "Rediger profil",
   "navigation_bar.explore": "Utforsk",
   "navigation_bar.favourites": "Favorittar",
   "navigation_bar.filters": "Målbundne ord",
@@ -525,14 +523,14 @@
   "poll_button.add_poll": "Lag ei rundspørjing",
   "poll_button.remove_poll": "Fjern rundspørjing",
   "privacy.change": "Endre personvernet på innlegg",
-  "privacy.direct.long": "Synleg kun for omtala brukarar",
-  "privacy.direct.short": "Kun nemnde personar",
-  "privacy.private.long": "Kun synleg for fylgjarar",
-  "privacy.private.short": "Kun fylgjarar",
-  "privacy.public.long": "Synleg for alle",
+  "privacy.direct.long": "Alle nevnt i innlegget",
+  "privacy.direct.short": "Spesifikke folk",
+  "privacy.private.long": "Bare følgerne dine",
+  "privacy.private.short": "Følgere",
+  "privacy.public.long": "Alle på og utenfor Mastodon",
   "privacy.public.short": "Offentleg",
-  "privacy.unlisted.long": "Synleg for alle, men blir ikkje vist i oppdagsfunksjonar",
-  "privacy.unlisted.short": "Uoppført",
+  "privacy.unlisted.long": "Færre algoritmiske fanfarer",
+  "privacy.unlisted.short": "Stille offentlig",
   "privacy_policy.last_updated": "Sist oppdatert {date}",
   "privacy_policy.title": "Personvernsreglar",
   "recommended": "Anbefalt",
@@ -550,7 +548,9 @@
   "relative_time.minutes": "{number}min",
   "relative_time.seconds": "{number}sek",
   "relative_time.today": "i dag",
+  "reply_indicator.attachments": "{count, plural, one {# vedlegg} other {# vedlegg}}",
   "reply_indicator.cancel": "Avbryt",
+  "reply_indicator.poll": "Avstemming",
   "report.block": "Blokker",
   "report.block_explanation": "Du vil ikkje kunne sjå innlegga deira. Dei vil ikkje kunne sjå innlegga dine eller fylgje deg. Dei kan sjå at dei er blokkert.",
   "report.categories.legal": "Juridisk",
@@ -714,10 +714,8 @@
   "upload_error.poll": "Filopplasting er ikkje lov for rundspørjingar.",
   "upload_form.audio_description": "Skildre for dei med nedsett høyrsel",
   "upload_form.description": "Skildre for blinde og svaksynte",
-  "upload_form.description_missing": "Inga skildring er lagt til",
   "upload_form.edit": "Rediger",
   "upload_form.thumbnail": "Bytt miniatyrbilete",
-  "upload_form.undo": "Slett",
   "upload_form.video_description": "Skildre for dei med nedsett høyrsel eller redusert syn",
   "upload_modal.analyzing_picture": "Analyserer bilete…",
   "upload_modal.apply": "Bruk",
diff --git a/app/javascript/mastodon/locales/no.json b/app/javascript/mastodon/locales/no.json
index 50da3bb2be109b..8da9853bee8776 100644
--- a/app/javascript/mastodon/locales/no.json
+++ b/app/javascript/mastodon/locales/no.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Kunngjøring",
   "attachments_list.unprocessed": "(ubehandlet)",
   "audio.hide": "Skjul lyd",
-  "autosuggest_hashtag.per_week": "{count} per uke",
   "boost_modal.combo": "You kan trykke {combo} for å hoppe over dette neste gang",
   "bundle_column_error.copy_stacktrace": "Kopier feilrapport",
   "bundle_column_error.error.body": "Den forespurte siden kan ikke gjengis. Den kan skyldes en feil i vår kode eller et kompatibilitetsproblem med nettleseren.",
@@ -146,22 +145,22 @@
   "compose_form.lock_disclaimer": "Din konto er ikke {locked}. Hvem som helst kan følge deg og se dine private poster.",
   "compose_form.lock_disclaimer.lock": "låst",
   "compose_form.placeholder": "Hva har du på hjertet?",
-  "compose_form.poll.add_option": "Legg til et valg",
+  "compose_form.poll.add_option": "Legg til alternativ",
   "compose_form.poll.duration": "Avstemningens varighet",
+  "compose_form.poll.multiple": "Flervalg",
   "compose_form.poll.option_placeholder": "Valg {number}",
   "compose_form.poll.remove_option": "Fjern dette valget",
+  "compose_form.poll.single": "Velg en",
   "compose_form.poll.switch_to_multiple": "Endre avstemning til å tillate flere valg",
   "compose_form.poll.switch_to_single": "Endre avstemning til å tillate ett valg",
+  "compose_form.poll.type": "Stil",
   "compose_form.publish": "Publiser",
   "compose_form.publish_form": "Publiser",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Lagre endringer",
-  "compose_form.sensitive.hide": "{count, plural,one {Merk media som følsomt} other {Merk medier som følsomme}}",
-  "compose_form.sensitive.marked": "{count, plural,one {Mediet er merket som følsomt}other {Mediene er merket som følsomme}}",
-  "compose_form.sensitive.unmarked": "{count, plural,one {Mediet er ikke merket som følsomt}other {Mediene er ikke merket som følsomme}}",
+  "compose_form.reply": "Svar",
+  "compose_form.save_changes": "Oppdater",
   "compose_form.spoiler.marked": "Fjern innholdsvarsel",
   "compose_form.spoiler.unmarked": "Legg til innholdsvarsel",
-  "compose_form.spoiler_placeholder": "Skriv advarselen din her",
+  "compose_form.spoiler_placeholder": "Innholdsadvarsel (valgfritt)",
   "confirmation_modal.cancel": "Avbryt",
   "confirmations.block.block_and_report": "Blokker og rapporter",
   "confirmations.block.confirm": "Blokkèr",
@@ -408,7 +407,6 @@
   "navigation_bar.direct": "Private omtaler",
   "navigation_bar.discover": "Oppdag",
   "navigation_bar.domain_blocks": "Skjulte domener",
-  "navigation_bar.edit_profile": "Rediger profil",
   "navigation_bar.explore": "Utforsk",
   "navigation_bar.favourites": "Favoritter",
   "navigation_bar.filters": "Stilnede ord",
@@ -525,14 +523,14 @@
   "poll_button.add_poll": "Legg til en avstemning",
   "poll_button.remove_poll": "Fjern avstemningen",
   "privacy.change": "Juster synlighet",
-  "privacy.direct.long": "Post kun til nevnte brukere",
-  "privacy.direct.short": "Kun nevnte personer",
-  "privacy.private.long": "Post kun til følgere",
-  "privacy.private.short": "Kun følgere",
-  "privacy.public.long": "Synlig for alle",
+  "privacy.direct.long": "Alle nevnt i innlegget",
+  "privacy.direct.short": "Spesifikke folk",
+  "privacy.private.long": "Bare følgerne dine",
+  "privacy.private.short": "Følgere",
+  "privacy.public.long": "Alle på og utenfor Mastodon",
   "privacy.public.short": "Offentlig",
-  "privacy.unlisted.long": "Synlig for alle, men vises ikke i oppdagsfunksjoner",
-  "privacy.unlisted.short": "Uoppført",
+  "privacy.unlisted.long": "Færre algoritmiske fanfarer",
+  "privacy.unlisted.short": "Stille offentlig",
   "privacy_policy.last_updated": "Sist oppdatert {date}",
   "privacy_policy.title": "Personvernregler",
   "recommended": "Anbefalt",
@@ -550,7 +548,9 @@
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "i dag",
+  "reply_indicator.attachments": "{count, plural, one {# vedlegg} other {# vedlegg}}",
   "reply_indicator.cancel": "Avbryt",
+  "reply_indicator.poll": "Avstemming",
   "report.block": "Blokker",
   "report.block_explanation": "Du kommer ikke til å se innleggene deres. De vil ikke kunne se innleggene dine eller følge deg. De vil kunne se at de er blokkert.",
   "report.categories.legal": "Juridisk",
@@ -714,10 +714,8 @@
   "upload_error.poll": "Filopplasting er ikke tillatt for avstemninger.",
   "upload_form.audio_description": "Beskriv det for folk med hørselstap",
   "upload_form.description": "Beskriv for synshemmede",
-  "upload_form.description_missing": "Ingen beskrivelse lagt til",
   "upload_form.edit": "Rediger",
   "upload_form.thumbnail": "Endre miniatyrbilde",
-  "upload_form.undo": "Angre",
   "upload_form.video_description": "Beskriv det for folk med hørselstap eller synshemminger",
   "upload_modal.analyzing_picture": "Analyserer bildet …",
   "upload_modal.apply": "Bruk",
diff --git a/app/javascript/mastodon/locales/oc.json b/app/javascript/mastodon/locales/oc.json
index 1ecfbcaf065173..8660a3bc05a540 100644
--- a/app/javascript/mastodon/locales/oc.json
+++ b/app/javascript/mastodon/locales/oc.json
@@ -80,7 +80,6 @@
   "announcement.announcement": "Anóncia",
   "attachments_list.unprocessed": "(pas tractat)",
   "audio.hide": "Amagar àudio",
-  "autosuggest_hashtag.per_week": "{count} per setmana",
   "boost_modal.combo": "Podètz botar {combo} per passar aquò lo còp que ven",
   "bundle_column_error.copy_stacktrace": "Copiar senhalament d’avaria",
   "bundle_column_error.error.title": "Oh non !",
@@ -131,22 +130,12 @@
   "compose_form.lock_disclaimer": "Vòstre compte es pas {locked}. Tot lo mond pòt vos sègre e veire los estatuts reservats als seguidors.",
   "compose_form.lock_disclaimer.lock": "clavat",
   "compose_form.placeholder": "A de qué pensatz ?",
-  "compose_form.poll.add_option": "Ajustar una causida",
   "compose_form.poll.duration": "Durada del sondatge",
-  "compose_form.poll.option_placeholder": "Opcion {number}",
-  "compose_form.poll.remove_option": "Levar aquesta opcion",
   "compose_form.poll.switch_to_multiple": "Cambiar lo sondatge per permetre de causidas multiplas",
   "compose_form.poll.switch_to_single": "Cambiar lo sondatge per permetre una sola causida",
-  "compose_form.publish": "Publicar",
   "compose_form.publish_form": "Publicar",
-  "compose_form.publish_loud": "{publish} !",
-  "compose_form.save_changes": "Salvar los cambiaments",
-  "compose_form.sensitive.hide": "Marcar coma sensible",
-  "compose_form.sensitive.marked": "Lo mèdia es marcat coma sensible",
-  "compose_form.sensitive.unmarked": "Lo mèdia es pas marcat coma sensible",
   "compose_form.spoiler.marked": "Lo tèxte es rescondut jos l’avertiment",
   "compose_form.spoiler.unmarked": "Lo tèxte es pas rescondut",
-  "compose_form.spoiler_placeholder": "Escrivètz l’avertiment aquí",
   "confirmation_modal.cancel": "Anullar",
   "confirmations.block.block_and_report": "Blocar e senhalar",
   "confirmations.block.confirm": "Blocar",
@@ -359,7 +348,6 @@
   "navigation_bar.direct": "Mencions privadas",
   "navigation_bar.discover": "Trobar",
   "navigation_bar.domain_blocks": "Domenis resconduts",
-  "navigation_bar.edit_profile": "Modificar lo perfil",
   "navigation_bar.explore": "Explorar",
   "navigation_bar.favourites": "Favorits",
   "navigation_bar.filters": "Mots ignorats",
@@ -457,14 +445,7 @@
   "poll_button.add_poll": "Ajustar un sondatge",
   "poll_button.remove_poll": "Levar lo sondatge",
   "privacy.change": "Ajustar la confidencialitat del messatge",
-  "privacy.direct.long": "Mostrar pas qu’a las personas mencionadas",
-  "privacy.direct.short": "Sonque per las personas mencionadas",
-  "privacy.private.long": "Mostrar pas qu’a vòstres seguidors",
-  "privacy.private.short": "Sonque pels seguidors",
-  "privacy.public.long": "Visiblas per totes",
   "privacy.public.short": "Public",
-  "privacy.unlisted.long": "Visible per totes mas desactivat per las foncionalitats de descobèrta",
-  "privacy.unlisted.short": "Pas-listat",
   "privacy_policy.last_updated": "Darrièra actualizacion {date}",
   "privacy_policy.title": "Politica de confidencialitat",
   "refresh": "Actualizar",
@@ -621,10 +602,8 @@
   "upload_error.poll": "Lo mandadís de fichièr es pas autorizat pels sondatges.",
   "upload_form.audio_description": "Descriure per las personas amb pèrdas auditivas",
   "upload_form.description": "Descripcion pels mal vesents",
-  "upload_form.description_missing": "Cap de descripcion pas aponduda",
   "upload_form.edit": "Modificar",
   "upload_form.thumbnail": "Cambiar la vinheta",
-  "upload_form.undo": "Suprimir",
   "upload_form.video_description": "Descriure per las personas amb pèrdas auditivas o mal vesent",
   "upload_modal.analyzing_picture": "Analisi de l’imatge…",
   "upload_modal.apply": "Aplicar",
diff --git a/app/javascript/mastodon/locales/pa.json b/app/javascript/mastodon/locales/pa.json
index 132b695cda8478..de085cf9856b35 100644
--- a/app/javascript/mastodon/locales/pa.json
+++ b/app/javascript/mastodon/locales/pa.json
@@ -67,9 +67,7 @@
   "compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.",
   "compose_form.lock_disclaimer.lock": "ਲਾਕ ਹੈ",
   "compose_form.placeholder": "What is on your mind?",
-  "compose_form.publish": "ਪ੍ਰਕਾਸ਼ਨ ਕਰੋ",
   "compose_form.publish_form": "Publish",
-  "compose_form.save_changes": "ਤਬਦੀਲੀਆਂ ਸਾਂਭੋ",
   "compose_form.spoiler.marked": "ਸਮੱਗਰੀ ਚੇਤਾਵਨੀ ਨੂੰ ਹਟਾਓ",
   "compose_form.spoiler.unmarked": "ਸਮੱਗਰੀ ਬਾਰੇ ਚੇਤਾਵਨੀ ਜੋੜੋ",
   "confirmation_modal.cancel": "ਰੱਦ ਕਰੋ",
@@ -188,7 +186,6 @@
   "navigation_bar.direct": "ਨਿੱਜੀ ਜ਼ਿਕਰ",
   "navigation_bar.discover": "ਖੋਜ",
   "navigation_bar.domain_blocks": "ਪਾਬੰਦੀ ਲਾਏ ਡੋਮੇਨ",
-  "navigation_bar.edit_profile": "ਪਰੋਫਾਈਲ ਨੂੰ ਸੋਧੋ",
   "navigation_bar.explore": "ਪੜਚੋਲ ਕਰੋ",
   "navigation_bar.favourites": "ਮਨਪਸੰਦ",
   "navigation_bar.follow_requests": "ਫ਼ਾਲੋ ਦੀਆਂ ਬੇਨਤੀਆਂ",
@@ -238,8 +235,6 @@
   "poll.refresh": "ਤਾਜ਼ਾ ਕਰੋ",
   "poll.vote": "ਵੋਟ ਪਾਓ",
   "privacy.change": "ਪੋਸਟ ਦੀ ਪਰਦੇਦਾਰੀ ਨੂੰ ਬਦਲੋ",
-  "privacy.direct.short": "ਸਿੱਧਾ ਲੋਕਾਂ ਦਾ ਜ਼ਿਕਰ ਕਰੋ",
-  "privacy.private.short": "ਸਿਰਫ਼ ਫ਼ਾਲੋਅਰ",
   "privacy.public.short": "ਜਨਤਕ",
   "privacy_policy.title": "ਪਰਦੇਦਾਰੀ ਨੀਤੀ",
   "refresh": "ਤਾਜ਼ਾ ਕਰੋ",
@@ -327,7 +322,6 @@
   "upload_form.audio_description": "ਬੋਲ਼ੇ ਜਾਂ ਸੁਣਨ ਵਿੱਚ ਮੁਸ਼ਕਿਲ ਵਾਲੇ ਲੋਕਾਂ ਲਈ ਵੇਰਵੇ",
   "upload_form.description": "ਅੰਨ੍ਹੇ ਜਾਂ ਦੇਖਣ ਲਈ ਮੁਸ਼ਕਲ ਵਾਲੇ ਲੋਕਾਂ ਲਈ ਵੇਰਵੇ",
   "upload_form.edit": "ਸੋਧ",
-  "upload_form.undo": "ਹਟਾਓ",
   "upload_form.video_description": "ਬੋਲ਼ੇ, ਸੁਣਨ ਵਿੱਚ ਮੁਸ਼ਕਿਲ, ਅੰਨ੍ਹੇ ਜਾਂ ਘੱਟ ਨਿਗ੍ਹਾ ਵਾਲੇ ਲੋਕਾਂ ਲਈ ਵੇਰਵਾ",
   "upload_modal.apply": "ਲਾਗੂ ਕਰੋ",
   "upload_modal.applying": "ਲਾਗੂ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ…",
diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json
index 35dbc6661d857d..2eaeeaab55d529 100644
--- a/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Ogłoszenie",
   "attachments_list.unprocessed": "(nieprzetworzone)",
   "audio.hide": "Ukryj dźwięk",
-  "autosuggest_hashtag.per_week": "{count} co tydzień",
   "boost_modal.combo": "Naciśnij {combo}, aby pominąć to następnym razem",
   "bundle_column_error.copy_stacktrace": "Skopiuj raport o błędzie",
   "bundle_column_error.error.body": "Nie można zrenderować żądanej strony. Może to być spowodowane błędem w naszym kodzie lub problemami z kompatybilnością przeglądarki.",
@@ -148,20 +147,19 @@
   "compose_form.placeholder": "Co chodzi ci po głowie?",
   "compose_form.poll.add_option": "Dodaj opcję",
   "compose_form.poll.duration": "Czas trwania głosowania",
+  "compose_form.poll.multiple": "Wielokrotny wybór",
   "compose_form.poll.option_placeholder": "Opcja {number}",
   "compose_form.poll.remove_option": "Usuń tę opcję",
+  "compose_form.poll.single": "Wybierz jedną",
   "compose_form.poll.switch_to_multiple": "Pozwól na wybranie wielu opcji",
   "compose_form.poll.switch_to_single": "Pozwól na wybranie tylko jednej opcji",
+  "compose_form.poll.type": "Styl",
   "compose_form.publish": "Opublikuj",
   "compose_form.publish_form": "Opublikuj",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Zapisz zmiany",
-  "compose_form.sensitive.hide": "{count, plural, one {Oznacz treść multimedialną jako wrażliwą} other {Oznacz treści multimedialne jako wrażliwe}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Treść multimedialna jest oznaczona jako wrażliwa} other {Treści multimedialne są oznaczone jako wrażliwe}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Treść multimedialna nie jest oznaczona jako wrażliwa} other {Treści multimedialne nie są oznaczone jako wrażliwe}}",
+  "compose_form.reply": "Odpowiedz",
+  "compose_form.save_changes": "Aktualizuj",
   "compose_form.spoiler.marked": "Usuń ostrzeżenie o treści",
   "compose_form.spoiler.unmarked": "Dodaj ostrzeżenie o treści",
-  "compose_form.spoiler_placeholder": "Wpisz ostrzeżenie tutaj",
   "confirmation_modal.cancel": "Anuluj",
   "confirmations.block.block_and_report": "Zablokuj i zgłoś",
   "confirmations.block.confirm": "Zablokuj",
@@ -408,7 +406,6 @@
   "navigation_bar.direct": "Prywatne wzmianki",
   "navigation_bar.discover": "Odkrywaj",
   "navigation_bar.domain_blocks": "Ukryte domeny",
-  "navigation_bar.edit_profile": "Edytuj profil",
   "navigation_bar.explore": "Odkrywaj",
   "navigation_bar.favourites": "Ulubione",
   "navigation_bar.filters": "Wyciszone słowa",
@@ -526,14 +523,11 @@
   "poll_button.add_poll": "Dodaj głosowanie",
   "poll_button.remove_poll": "Usuń głosowanie",
   "privacy.change": "Dostosuj widoczność wpisów",
-  "privacy.direct.long": "Widoczny tylko dla wspomnianych",
-  "privacy.direct.short": "Tylko wspomniane osoby",
-  "privacy.private.long": "Widoczny tylko dla osób, które Cię obserwują",
-  "privacy.private.short": "Tylko obserwujący",
-  "privacy.public.long": "Widoczne dla każdego",
+  "privacy.direct.short": "Konkretni ludzie",
+  "privacy.private.long": "Tylko ci, którzy cię obserwują",
+  "privacy.private.short": "Obserwujący",
+  "privacy.public.long": "Ktokolwiek na i poza Mastodonem",
   "privacy.public.short": "Publiczny",
-  "privacy.unlisted.long": "Widoczne dla każdego, z wyłączeniem funkcji odkrywania",
-  "privacy.unlisted.short": "Niewidoczny",
   "privacy_policy.last_updated": "Data ostatniej aktualizacji: {date}",
   "privacy_policy.title": "Polityka prywatności",
   "recommended": "Zalecane",
@@ -715,10 +709,8 @@
   "upload_error.poll": "Dołączanie plików nie dozwolone z głosowaniami.",
   "upload_form.audio_description": "Opisz dla osób niesłyszących i niedosłyszących",
   "upload_form.description": "Wprowadź opis dla niewidomych i niedowidzących",
-  "upload_form.description_missing": "Nie dodano opisu",
   "upload_form.edit": "Edytuj",
   "upload_form.thumbnail": "Zmień miniaturę",
-  "upload_form.undo": "Usuń",
   "upload_form.video_description": "Opisz dla osób niesłyszących, niedosłyszących, niewidomych i niedowidzących",
   "upload_modal.analyzing_picture": "Analizowanie obrazu…",
   "upload_modal.apply": "Zastosuj",
diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json
index b8e18e1229a4b9..bb009239d42b97 100644
--- a/app/javascript/mastodon/locales/pt-BR.json
+++ b/app/javascript/mastodon/locales/pt-BR.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Comunicados",
   "attachments_list.unprocessed": "(não processado)",
   "audio.hide": "Ocultar áudio",
-  "autosuggest_hashtag.per_week": "{count} por semana",
   "boost_modal.combo": "Pressione {combo} para pular isso na próxima vez",
   "bundle_column_error.copy_stacktrace": "Copiar relatório do erro",
   "bundle_column_error.error.body": "A página solicitada não pôde ser renderizada. Pode ser devido a um erro no nosso código, ou um problema de compatibilidade do seu navegador.",
@@ -148,20 +147,20 @@
   "compose_form.placeholder": "No que você está pensando?",
   "compose_form.poll.add_option": "Adicionar opção",
   "compose_form.poll.duration": "Duração da enquete",
+  "compose_form.poll.multiple": "Múltipla escolha",
   "compose_form.poll.option_placeholder": "Opção {number}",
-  "compose_form.poll.remove_option": "Remover opção",
+  "compose_form.poll.remove_option": "Remover esta opção",
+  "compose_form.poll.single": "Escolha uma",
   "compose_form.poll.switch_to_multiple": "Permitir múltiplas escolhas",
   "compose_form.poll.switch_to_single": "Opção única",
-  "compose_form.publish": "Publicar",
+  "compose_form.poll.type": "Estilo",
+  "compose_form.publish": "Publicação",
   "compose_form.publish_form": "Publicar",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Salvar alterações",
-  "compose_form.sensitive.hide": "{count, plural, one {Marcar mídia como sensível} other {Marcar mídias como sensível}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Mídia marcada como sensível} other {Mídias marcadas como sensível}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Mídia não está marcada como sensível} other {Mídias não estão marcadas como sensível}}",
+  "compose_form.reply": "Resposta",
+  "compose_form.save_changes": "Atualização",
   "compose_form.spoiler.marked": "Com Aviso de Conteúdo",
   "compose_form.spoiler.unmarked": "Sem Aviso de Conteúdo",
-  "compose_form.spoiler_placeholder": "Aviso de Conteúdo aqui",
+  "compose_form.spoiler_placeholder": "Aviso de conteúdo (opcional)",
   "confirmation_modal.cancel": "Cancelar",
   "confirmations.block.block_and_report": "Bloquear e denunciar",
   "confirmations.block.confirm": "Bloquear",
@@ -408,7 +407,6 @@
   "navigation_bar.direct": "Menções privadas",
   "navigation_bar.discover": "Descobrir",
   "navigation_bar.domain_blocks": "Domínios bloqueados",
-  "navigation_bar.edit_profile": "Editar perfil",
   "navigation_bar.explore": "Explorar",
   "navigation_bar.favourites": "Favoritos",
   "navigation_bar.filters": "Palavras filtradas",
@@ -526,14 +524,12 @@
   "poll_button.add_poll": "Adicionar enquete",
   "poll_button.remove_poll": "Remover enquete",
   "privacy.change": "Alterar privacidade do toot",
-  "privacy.direct.long": "Postar só para usuários mencionados",
-  "privacy.direct.short": "Apenas pessoas mencionadas",
-  "privacy.private.long": "Postar só para seguidores",
-  "privacy.private.short": "Apenas seguidores",
-  "privacy.public.long": "Visível para todos",
+  "privacy.direct.long": "Todos mencionados na publicação",
+  "privacy.direct.short": "Pessoas específicas",
+  "privacy.private.long": "Apenas seus seguidores",
+  "privacy.private.short": "Seguidores",
+  "privacy.public.long": "Qualquer um dentro ou fora do Mastodon",
   "privacy.public.short": "Público",
-  "privacy.unlisted.long": "Visível para todos, mas desativou os recursos de descoberta",
-  "privacy.unlisted.short": "Não-listado",
   "privacy_policy.last_updated": "Atualizado {date}",
   "privacy_policy.title": "Política de privacidade",
   "recommended": "Recomendado",
@@ -552,6 +548,7 @@
   "relative_time.seconds": "{number}s",
   "relative_time.today": "hoje",
   "reply_indicator.cancel": "Cancelar",
+  "reply_indicator.poll": "Enquete",
   "report.block": "Bloquear",
   "report.block_explanation": "Você não verá suas publicações. Ele não poderá ver suas publicações ou segui-lo, e será capaz de perceber que está bloqueado.",
   "report.categories.legal": "Jurídico",
@@ -715,10 +712,8 @@
   "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.description_missing": "Sem descrição",
   "upload_form.edit": "Editar",
   "upload_form.thumbnail": "Alterar miniatura",
-  "upload_form.undo": "Excluir",
   "upload_form.video_description": "Descrever para deficientes auditivos ou visuais",
   "upload_modal.analyzing_picture": "Analisando imagem…",
   "upload_modal.apply": "Aplicar",
diff --git a/app/javascript/mastodon/locales/pt-PT.json b/app/javascript/mastodon/locales/pt-PT.json
index a6d0ffee9a5334..22bb1bbfd263a1 100644
--- a/app/javascript/mastodon/locales/pt-PT.json
+++ b/app/javascript/mastodon/locales/pt-PT.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Anúncio",
   "attachments_list.unprocessed": "(não processado)",
   "audio.hide": "Ocultar áudio",
-  "autosuggest_hashtag.per_week": "{count} por semana",
   "boost_modal.combo": "Pode clicar {combo} para não voltar a ver",
   "bundle_column_error.copy_stacktrace": "Copiar relatório de erros",
   "bundle_column_error.error.body": "A página solicitada não pôde ser sintetizada. Isto pode ser devido a uma falha no nosso código ou a um problema de compatibilidade com o navegador.",
@@ -146,22 +145,22 @@
   "compose_form.lock_disclaimer": "A sua conta não é {locked}. Qualquer pessoa pode segui-lo e ver as publicações direcionadas apenas a seguidores.",
   "compose_form.lock_disclaimer.lock": "fechada",
   "compose_form.placeholder": "Em que está a pensar?",
-  "compose_form.poll.add_option": "Adicionar uma opção",
+  "compose_form.poll.add_option": "Adicionar opção",
   "compose_form.poll.duration": "Duração do inquérito",
+  "compose_form.poll.multiple": "Escolha múltipla",
   "compose_form.poll.option_placeholder": "Opção {number}",
   "compose_form.poll.remove_option": "Eliminar esta opção",
+  "compose_form.poll.single": "Escolha uma",
   "compose_form.poll.switch_to_multiple": "Alterar o inquérito para permitir várias respostas",
   "compose_form.poll.switch_to_single": "Alterar o inquérito para permitir uma única resposta",
+  "compose_form.poll.type": "Estilo",
   "compose_form.publish": "Publicar",
   "compose_form.publish_form": "Publicar",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Guardar alterações",
-  "compose_form.sensitive.hide": "Marcar media como sensível",
-  "compose_form.sensitive.marked": "Media marcada como sensível",
-  "compose_form.sensitive.unmarked": "Media não está marcada como sensível",
+  "compose_form.reply": "Responder",
+  "compose_form.save_changes": "Atualizar",
   "compose_form.spoiler.marked": "Texto escondido atrás de aviso",
   "compose_form.spoiler.unmarked": "Juntar um aviso de conteúdo",
-  "compose_form.spoiler_placeholder": "Escreva o seu aviso aqui",
+  "compose_form.spoiler_placeholder": "Aviso de conteúdo (opcional)",
   "confirmation_modal.cancel": "Cancelar",
   "confirmations.block.block_and_report": "Bloquear e Denunciar",
   "confirmations.block.confirm": "Bloquear",
@@ -408,7 +407,6 @@
   "navigation_bar.direct": "Menções privadas",
   "navigation_bar.discover": "Descobrir",
   "navigation_bar.domain_blocks": "Domínios escondidos",
-  "navigation_bar.edit_profile": "Editar perfil",
   "navigation_bar.explore": "Explorar",
   "navigation_bar.favourites": "Favoritos",
   "navigation_bar.filters": "Palavras silenciadas",
@@ -526,14 +524,15 @@
   "poll_button.add_poll": "Adicionar votação",
   "poll_button.remove_poll": "Remover sondagem",
   "privacy.change": "Ajustar a privacidade da publicação",
-  "privacy.direct.long": "Apenas para utilizadores mencionados",
-  "privacy.direct.short": "Apenas pessoas mencionadas",
-  "privacy.private.long": "Apenas para os seguidores",
-  "privacy.private.short": "Apenas seguidores",
-  "privacy.public.long": "Visível para todos",
+  "privacy.direct.long": "Todos os mencionados na publicação",
+  "privacy.direct.short": "Pessoas específicas",
+  "privacy.private.long": "Apenas os seus seguidores",
+  "privacy.private.short": "Seguidores",
+  "privacy.public.long": "Qualquer pessoa no Mastodon ou não",
   "privacy.public.short": "Público",
-  "privacy.unlisted.long": "Visível para todos, mas não incluir em funcionalidades de divulgação",
-  "privacy.unlisted.short": "Não listar",
+  "privacy.unlisted.additional": "Isto comporta-se exatamente como público, exceto que a publicação não aparecerá em feeds nem em etiquetas, explorar ou pesquisa Mastodon, mesmo que tenha optado por isso na sua conta.",
+  "privacy.unlisted.long": "Menos fanfarras algorítmicas",
+  "privacy.unlisted.short": "Público silencioso",
   "privacy_policy.last_updated": "Última atualização em {date}",
   "privacy_policy.title": "Política de privacidade",
   "recommended": "Recomendado",
@@ -551,7 +550,9 @@
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "hoje",
+  "reply_indicator.attachments": "{count, plural, one {# anexo} other {# anexos}}",
   "reply_indicator.cancel": "Cancelar",
+  "reply_indicator.poll": "Sondagem",
   "report.block": "Bloquear",
   "report.block_explanation": "Não verá as publicações deles. Eles não serão capazes de ver suas publicações ou de o seguir. Eles vão conseguir saber que estão bloqueados.",
   "report.categories.legal": "Legal",
@@ -715,10 +716,8 @@
   "upload_error.poll": "O carregamento de ficheiros não é permitido em sondagens.",
   "upload_form.audio_description": "Descreva para pessoas com diminuição da acuidade auditiva",
   "upload_form.description": "Descreva para pessoas com diminuição da acuidade visual",
-  "upload_form.description_missing": "Nenhuma descrição adicionada",
   "upload_form.edit": "Editar",
   "upload_form.thumbnail": "Alterar miniatura",
-  "upload_form.undo": "Eliminar",
   "upload_form.video_description": "Descreva para pessoas com diminuição da acuidade auditiva ou visual",
   "upload_modal.analyzing_picture": "A analizar imagem…",
   "upload_modal.apply": "Aplicar",
diff --git a/app/javascript/mastodon/locales/ro.json b/app/javascript/mastodon/locales/ro.json
index 88dbfa4b8ec6ed..e6d881a986f318 100644
--- a/app/javascript/mastodon/locales/ro.json
+++ b/app/javascript/mastodon/locales/ro.json
@@ -76,7 +76,6 @@
   "announcement.announcement": "Anunț",
   "attachments_list.unprocessed": "(neprocesate)",
   "audio.hide": "Ascunde audio",
-  "autosuggest_hashtag.per_week": "{count} pe săptămână",
   "boost_modal.combo": "Poți apăsa {combo} pentru a sări peste asta data viitoare",
   "bundle_column_error.copy_stacktrace": "Copiază raportul de eroare",
   "bundle_column_error.error.body": "Pagina solicitată nu a putut fi randată. Ar putea fi cauzată de o eroare în codul nostru sau de o problemă de compatibilitate cu browser-ul.",
@@ -131,22 +130,12 @@
   "compose_form.lock_disclaimer": "Contul tău nu este {locked}. Oricine se poate abona la tine pentru a îți vedea postările numai pentru abonați.",
   "compose_form.lock_disclaimer.lock": "privat",
   "compose_form.placeholder": "La ce te gândești?",
-  "compose_form.poll.add_option": "Adaugă o opțiune",
   "compose_form.poll.duration": "Durata sondajului",
-  "compose_form.poll.option_placeholder": "Opțiunea {number}",
-  "compose_form.poll.remove_option": "Elimină acestă opțiune",
   "compose_form.poll.switch_to_multiple": "Modifică sondajul pentru a permite mai multe opțiuni",
   "compose_form.poll.switch_to_single": "Modifică sondajul pentru a permite o singură opțiune",
-  "compose_form.publish": "Publică",
   "compose_form.publish_form": "Publică",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Salvează modificările",
-  "compose_form.sensitive.hide": "{count, plural, one {Marchează conținutul media ca fiind sensibil} few {Marchează conținuturile media ca fiind sensibile} other {Marchează conținuturile media ca fiind sensibile}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Conținutul media este marcat ca fiind sensibil} other {Conținuturile media sunt marcate ca fiind sensibile}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Conținutul media nu este marcat ca fiind sensibil} other {Conținuturile media nu sunt marcate ca fiind sensibile}}",
   "compose_form.spoiler.marked": "Elimină avertismentul privind conținutul",
   "compose_form.spoiler.unmarked": "Adaugă un avertisment privind conținutul",
-  "compose_form.spoiler_placeholder": "Scrie avertismentul aici",
   "confirmation_modal.cancel": "Anulează",
   "confirmations.block.block_and_report": "Blochează și raportează",
   "confirmations.block.confirm": "Blochează",
@@ -365,7 +354,6 @@
   "navigation_bar.compose": "Compune o nouă postare",
   "navigation_bar.discover": "Descoperă",
   "navigation_bar.domain_blocks": "Domenii blocate",
-  "navigation_bar.edit_profile": "Modifică profilul",
   "navigation_bar.explore": "Explorează",
   "navigation_bar.filters": "Cuvinte ignorate",
   "navigation_bar.follow_requests": "Cereri de abonare",
@@ -461,14 +449,7 @@
   "poll_button.add_poll": "Adaugă un sondaj",
   "poll_button.remove_poll": "Elimină sondajul",
   "privacy.change": "Modifică confidențialitatea postării",
-  "privacy.direct.long": "Vizibil doar pentru utilizatorii menționați",
-  "privacy.direct.short": "Doar persoane menționate",
-  "privacy.private.long": "Vizibil doar pentru abonați",
-  "privacy.private.short": "Doar abonați",
-  "privacy.public.long": "Vizibil pentru toți",
   "privacy.public.short": "Public",
-  "privacy.unlisted.long": "Vizibil pentru toți dar fără funcții de descoperire",
-  "privacy.unlisted.short": "Nelistat",
   "privacy_policy.last_updated": "Ultima actualizare în data de {date}",
   "privacy_policy.title": "Politică de confidențialitate",
   "refresh": "Reîncarcă",
@@ -641,10 +622,8 @@
   "upload_error.poll": "Încărcarea fișierului nu este permisă cu sondaje.",
   "upload_form.audio_description": "Descrie pentru persoanele cu deficiență a auzului",
   "upload_form.description": "Adaugă o descriere pentru persoanele cu deficiențe de vedere",
-  "upload_form.description_missing": "Nicio descriere adăugată",
   "upload_form.edit": "Modifică",
   "upload_form.thumbnail": "Schimbă miniatura",
-  "upload_form.undo": "Șterge",
   "upload_form.video_description": "Adaugă o descriere pentru persoanele cu deficiențe vizuale sau auditive",
   "upload_modal.analyzing_picture": "Se analizează imaginea…",
   "upload_modal.apply": "Aplică",
diff --git a/app/javascript/mastodon/locales/ru.json b/app/javascript/mastodon/locales/ru.json
index a8ff90cc003b1b..eefa9c72987d7c 100644
--- a/app/javascript/mastodon/locales/ru.json
+++ b/app/javascript/mastodon/locales/ru.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Объявление",
   "attachments_list.unprocessed": "(не обработан)",
   "audio.hide": "Скрыть аудио",
-  "autosuggest_hashtag.per_week": "{count} / неделю",
   "boost_modal.combo": "{combo}, чтобы пропустить это в следующий раз",
   "bundle_column_error.copy_stacktrace": "Скопировать отчет об ошибке",
   "bundle_column_error.error.body": "Запрошенная страница не может быть отображена. Это может быть вызвано ошибкой в нашем коде или проблемой совместимости браузера.",
@@ -146,22 +145,12 @@
   "compose_form.lock_disclaimer": "Ваша учётная запись {locked}. Любой пользователь сможет подписаться на вас и просматривать посты для подписчиков.",
   "compose_form.lock_disclaimer.lock": "не закрыта",
   "compose_form.placeholder": "О чём думаете?",
-  "compose_form.poll.add_option": "Добавить вариант",
   "compose_form.poll.duration": "Продолжительность опроса",
-  "compose_form.poll.option_placeholder": "Вариант {number}",
-  "compose_form.poll.remove_option": "Убрать этот вариант",
   "compose_form.poll.switch_to_multiple": "Разрешить выбор нескольких вариантов",
   "compose_form.poll.switch_to_single": "Переключить в режим выбора одного ответа",
-  "compose_form.publish": "Опубликовать",
   "compose_form.publish_form": "Опубликовать",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Сохранить",
-  "compose_form.sensitive.hide": "{count, plural, one {Отметить медифайл как деликатный} other {Отметить медифайлы как деликатные}}",
-  "compose_form.sensitive.marked": "Медиа{count, plural, =1 {файл отмечен} other {файлы отмечены}} как «деликатного характера»",
-  "compose_form.sensitive.unmarked": "Медиа{count, plural, =1 {файл не отмечен} other {файлы не отмечены}} как «деликатного характера»",
   "compose_form.spoiler.marked": "Текст скрыт за предупреждением",
   "compose_form.spoiler.unmarked": "Текст не скрыт",
-  "compose_form.spoiler_placeholder": "Текст предупреждения",
   "confirmation_modal.cancel": "Отмена",
   "confirmations.block.block_and_report": "Заблокировать и пожаловаться",
   "confirmations.block.confirm": "Заблокировать",
@@ -408,7 +397,6 @@
   "navigation_bar.direct": "Личные упоминания",
   "navigation_bar.discover": "Изучайте",
   "navigation_bar.domain_blocks": "Скрытые домены",
-  "navigation_bar.edit_profile": "Изменить профиль",
   "navigation_bar.explore": "Обзор",
   "navigation_bar.favourites": "Избранные",
   "navigation_bar.filters": "Игнорируемые слова",
@@ -526,14 +514,7 @@
   "poll_button.add_poll": "Добавить опрос",
   "poll_button.remove_poll": "Удалить опрос",
   "privacy.change": "Изменить видимость поста",
-  "privacy.direct.long": "Показать только упомянутым",
-  "privacy.direct.short": "Только упомянутые",
-  "privacy.private.long": "Показать только подписчикам",
-  "privacy.private.short": "Для подписчиков",
-  "privacy.public.long": "Виден всем",
   "privacy.public.short": "Публичный",
-  "privacy.unlisted.long": "Виден всем, но не через функции обзора",
-  "privacy.unlisted.short": "Скрытый",
   "privacy_policy.last_updated": "Последнее обновление {date}",
   "privacy_policy.title": "Политика конфиденциальности",
   "recommended": "Рекомендуется",
@@ -715,10 +696,8 @@
   "upload_error.poll": "К опросам нельзя прикреплять файлы.",
   "upload_form.audio_description": "Опишите аудиофайл для людей с нарушением слуха",
   "upload_form.description": "Добавьте описание для людей с нарушениями зрения:",
-  "upload_form.description_missing": "Описание не добавлено",
   "upload_form.edit": "Изменить",
   "upload_form.thumbnail": "Изменить обложку",
-  "upload_form.undo": "Отменить",
   "upload_form.video_description": "Опишите видео для людей с нарушением слуха или зрения",
   "upload_modal.analyzing_picture": "Обработка изображения…",
   "upload_modal.apply": "Применить",
diff --git a/app/javascript/mastodon/locales/sa.json b/app/javascript/mastodon/locales/sa.json
index 051ec5d6f80f16..469930c3ed121d 100644
--- a/app/javascript/mastodon/locales/sa.json
+++ b/app/javascript/mastodon/locales/sa.json
@@ -77,7 +77,6 @@
   "announcement.announcement": "उद्घोषणा",
   "attachments_list.unprocessed": "(अप्रकृतम्)",
   "audio.hide": "ध्वनिं प्रच्छादय",
-  "autosuggest_hashtag.per_week": "{count} प्रतिसप्ताहे",
   "boost_modal.combo": "{combo} अत्र स्प्रष्टुं शक्यते, त्यक्तुमेतमन्यस्मिन् समये",
   "bundle_column_error.copy_stacktrace": "त्रुट्यावेदनं प्रतिलिपिङ्कुरु",
   "bundle_column_error.error.body": "अनुरोधितं पृष्ठं प्रतिपादयितुं न शक्यते। अस्माकं कोडि दोषस्य कारणेन, अथवा ब्राउजर् संगततायास्समस्यायाः कारणेन भवितुमर्हति।",
@@ -129,22 +128,12 @@
   "compose_form.lock_disclaimer": "तव लेखा न प्रवेष्टुमशक्या {locked} । कोऽप्यनुसर्ता ते केवलमनुसर्तृृणां कृते स्थितानि पत्राणि द्रष्टुं शक्नोति ।",
   "compose_form.lock_disclaimer.lock": "अवरुद्धः",
   "compose_form.placeholder": "मनसि ते किमस्ति?",
-  "compose_form.poll.add_option": "मतमपरं युज्यताम्",
   "compose_form.poll.duration": "मतदान-समयावधिः",
-  "compose_form.poll.option_placeholder": "मतम् {number}",
-  "compose_form.poll.remove_option": "मतमेतन्नश्यताम्",
   "compose_form.poll.switch_to_multiple": "मतदानं परिवर्तयित्वा बहुवैकल्पिकमतदानं क्रियताम्",
   "compose_form.poll.switch_to_single": "मतदानं परिवर्तयित्वा निर्विकल्पमतदानं क्रियताम्",
-  "compose_form.publish": "प्रकाशीकुरु",
   "compose_form.publish_form": "प्रकाशीकुरु",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "परिवर्तनानि रक्ष",
-  "compose_form.sensitive.hide": "संवेदनशीलसामग्रीत्यङ्यताम्",
-  "compose_form.sensitive.marked": "संवेदनशीलसामग्रीत्यङ्कितम्",
-  "compose_form.sensitive.unmarked": "संवेदनशीलसामग्रीति नाङ्कितम्",
   "compose_form.spoiler.marked": "प्रच्छान्नाक्षरं विद्यते",
   "compose_form.spoiler.unmarked": "अप्रच्छन्नाक्षरं विद्यते",
-  "compose_form.spoiler_placeholder": "प्रत्यादेशस्ते लिख्यताम्",
   "confirmation_modal.cancel": "नश्यताम्",
   "confirmations.block.block_and_report": "अवरुध्य आविद्यताम्",
   "confirmations.block.confirm": "निषेधः",
@@ -357,7 +346,6 @@
   "navigation_bar.direct": "गोपनीयरूपेण उल्लिखितानि",
   "navigation_bar.discover": "आविष्कुरु",
   "navigation_bar.domain_blocks": "Hidden domains",
-  "navigation_bar.edit_profile": "प्रोफैलं सम्पाद्यताम्",
   "navigation_bar.explore": "अन्विच्छ",
   "navigation_bar.filters": "मूकीकृतानि पदानि",
   "navigation_bar.follow_requests": "अनुसरणानुरोधाः",
@@ -453,14 +441,7 @@
   "poll_button.add_poll": "निर्वाचनं योजय",
   "poll_button.remove_poll": "निर्वाचनं मार्जय",
   "privacy.change": "पत्रस्य गोपनीयतां परिवर्तय",
-  "privacy.direct.long": "केवलमुल्लिखितोभोक्तृभ्यो दृश्यते",
-  "privacy.direct.short": "Direct",
-  "privacy.private.long": "केवलं येऽनुसरन्ति त्वां तेभ्यो दृश्यते",
-  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "सर्वेभ्यो दृश्यते",
   "privacy.public.short": "सार्वजनिकम्",
-  "privacy.unlisted.long": "सर्वेभ्यो दृश्यते किन्तु आविष्कारविशेषताभ्योऽन्तरभूतं नास्ति",
-  "privacy.unlisted.short": "असूचीकृतम्",
   "privacy_policy.last_updated": "अन्तिमवारं परिवर्तितम् {date}",
   "privacy_policy.title": "गोपनीयतानीतिः",
   "refresh": "नवीकुरु",
@@ -572,7 +553,6 @@
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {# days}}",
   "upload_form.audio_description": "Describe for people with hearing loss",
   "upload_form.description": "Describe for the visually impaired",
-  "upload_form.undo": "मार्जय",
   "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
   "upload_progress.label": "Uploading…"
 }
diff --git a/app/javascript/mastodon/locales/sc.json b/app/javascript/mastodon/locales/sc.json
index 89e951f77d37b0..90b663aea79fc6 100644
--- a/app/javascript/mastodon/locales/sc.json
+++ b/app/javascript/mastodon/locales/sc.json
@@ -60,7 +60,6 @@
   "alert.unexpected.title": "Oh!",
   "announcement.announcement": "Annùntziu",
   "audio.hide": "Cua s'àudio",
-  "autosuggest_hashtag.per_week": "{count} a sa chida",
   "boost_modal.combo": "Podes incarcare {combo} pro brincare custu sa borta chi benit",
   "bundle_column_error.error.title": "Oh, no!",
   "bundle_column_error.network.title": "Faddina de connessione",
@@ -100,22 +99,12 @@
   "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",
   "compose_form.placeholder": "A ite ses pensende?",
-  "compose_form.poll.add_option": "Agiunghe unu sèberu",
   "compose_form.poll.duration": "Longària de su sondàgiu",
-  "compose_form.poll.option_placeholder": "Optzione {number}",
-  "compose_form.poll.remove_option": "Boga custa optzione",
   "compose_form.poll.switch_to_multiple": "Muda su sondàgiu pro permìtere multi-optziones",
   "compose_form.poll.switch_to_single": "Muda su sondàgiu pro permìtere un'optzione isceti",
-  "compose_form.publish": "Pùblica",
   "compose_form.publish_form": "Publish",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Sarva is modìficas",
-  "compose_form.sensitive.hide": "{count, plural, one {Marca elementu multimediale comente a sensìbile} other {Marca elementos multimediales comente sensìbiles}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Elementu multimediale marcadu comente a sensìbile} other {Elementos multimediales marcados comente a sensìbiles}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Elementu multimediale non marcadu comente a sensìbile} other {Elementos multimediales non marcados comente a sensìbiles}}",
   "compose_form.spoiler.marked": "Boga avisu de cuntenutu",
   "compose_form.spoiler.unmarked": "Agiunghe avisu de cuntenutu",
-  "compose_form.spoiler_placeholder": "Iscrie s'avisu tuo inoghe",
   "confirmation_modal.cancel": "Annulla",
   "confirmations.block.block_and_report": "Bloca e signala",
   "confirmations.block.confirm": "Bloca",
@@ -287,7 +276,6 @@
   "navigation_bar.compose": "Cumpone una publicatzione noa",
   "navigation_bar.discover": "Iscoberi",
   "navigation_bar.domain_blocks": "Domìnios blocados",
-  "navigation_bar.edit_profile": "Modìfica profilu",
   "navigation_bar.filters": "Faeddos a sa muda",
   "navigation_bar.follow_requests": "Rechestas de sighidura",
   "navigation_bar.follows_and_followers": "Gente chi sighis e sighiduras",
@@ -364,12 +352,7 @@
   "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": "Visìbile isceti pro is persones mentovadas",
-  "privacy.direct.short": "Direct",
-  "privacy.private.long": "Visìbile isceti pro chie ti sighit",
-  "privacy.private.short": "Followers-only",
   "privacy.public.short": "Pùblicu",
-  "privacy.unlisted.short": "Esclùidu de sa lista",
   "recommended": "Cussigiadu",
   "refresh": "Atualiza",
   "regeneration_indicator.label": "Carrighende…",
@@ -473,7 +456,6 @@
   "upload_form.description": "Descritzione pro persones cun problemas visuales",
   "upload_form.edit": "Modìfica",
   "upload_form.thumbnail": "Càmbia sa miniadura",
-  "upload_form.undo": "Cantzella",
   "upload_form.video_description": "Descritzione pro persones cun pèrdida auditiva o problemas visuales",
   "upload_modal.analyzing_picture": "Analizende immàgine…",
   "upload_modal.apply": "Àplica",
diff --git a/app/javascript/mastodon/locales/sco.json b/app/javascript/mastodon/locales/sco.json
index 0378cd2926e938..b7563022a93594 100644
--- a/app/javascript/mastodon/locales/sco.json
+++ b/app/javascript/mastodon/locales/sco.json
@@ -74,7 +74,6 @@
   "announcement.announcement": "Annooncement",
   "attachments_list.unprocessed": "(No processed)",
   "audio.hide": "Stow audio",
-  "autosuggest_hashtag.per_week": "{count} a week",
   "boost_modal.combo": "Ye kin chap {combo} tae dingie this neist tim",
   "bundle_column_error.copy_stacktrace": "Copy error report",
   "bundle_column_error.error.body": "The requestit page cuidnae be rennert. Hit cuid be doon tae a bug in wir code, or a brooser compatability issue.",
@@ -125,22 +124,12 @@
   "compose_form.lock_disclaimer": "Yer accoont isnae {locked}. Awbody kin follae ye for tae luik at yer follaer-ainly posts.",
   "compose_form.lock_disclaimer.lock": "lockit",
   "compose_form.placeholder": "Whit's on yer mind?",
-  "compose_form.poll.add_option": "Pit in a chyce",
   "compose_form.poll.duration": "Poll lenth",
-  "compose_form.poll.option_placeholder": "Chyce {number}",
-  "compose_form.poll.remove_option": "Tak oot this chyce",
   "compose_form.poll.switch_to_multiple": "Chynge poll tae alloo multiple chyces",
   "compose_form.poll.switch_to_single": "Chynge poll tae alloo fir a single chyce",
-  "compose_form.publish": "Publish",
   "compose_form.publish_form": "Publish",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Save chynges",
-  "compose_form.sensitive.hide": "{count, plural, one {Mairk media as sensitive} other {Mairk media as sensitive}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Media is mairkit as sensitive} other {Media is mairkit as sensitive}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Media isnae mairkit as sensitive} other {Media isnae mairkit as sensitive}}",
   "compose_form.spoiler.marked": "Tak aff the content warnin",
   "compose_form.spoiler.unmarked": "Pit on a content warnin",
-  "compose_form.spoiler_placeholder": "Scrieve yer warnin in here",
   "confirmation_modal.cancel": "Stap",
   "confirmations.block.block_and_report": "Dingie & Clype",
   "confirmations.block.confirm": "Dingie",
@@ -341,7 +330,6 @@
   "navigation_bar.compose": "Scrieve new post",
   "navigation_bar.discover": "Fin",
   "navigation_bar.domain_blocks": "Dingied domains",
-  "navigation_bar.edit_profile": "Edit profile",
   "navigation_bar.explore": "Splore",
   "navigation_bar.filters": "Wheesht wirds",
   "navigation_bar.follow_requests": "Follae requests",
@@ -425,14 +413,7 @@
   "poll_button.add_poll": "Dae a poll",
   "poll_button.remove_poll": "Tak doon poll",
   "privacy.change": "Chynge post privacy",
-  "privacy.direct.long": "Ainly menshied uisers kin see this",
-  "privacy.direct.short": "Menshied fowk ainly",
-  "privacy.private.long": "Ainly follaers kin see this",
-  "privacy.private.short": "Ainly follaers",
-  "privacy.public.long": "Awbody kin see this",
   "privacy.public.short": "Public",
-  "privacy.unlisted.long": "Aw kin see this, but optit-oot o discovery features",
-  "privacy.unlisted.short": "No listit",
   "privacy_policy.last_updated": "Last updatit {date}",
   "privacy_policy.title": "Privacy Policy",
   "refresh": "Refresh",
@@ -583,10 +564,8 @@
   "upload_error.poll": "File upload isnae allooed wi polls.",
   "upload_form.audio_description": "Describe fir fowk wi hearin loss",
   "upload_form.description": "Describe fir thaim wi visual impairments",
-  "upload_form.description_missing": "Nae description addit",
   "upload_form.edit": "Edit",
   "upload_form.thumbnail": "Chynge thoomnail",
-  "upload_form.undo": "Delete",
   "upload_form.video_description": "Describe fir fowk wi hearin loss or wi visual impairment",
   "upload_modal.analyzing_picture": "Analyzin picture…",
   "upload_modal.apply": "Apply",
diff --git a/app/javascript/mastodon/locales/si.json b/app/javascript/mastodon/locales/si.json
index c2d2a41cc50808..1b2eb17633e601 100644
--- a/app/javascript/mastodon/locales/si.json
+++ b/app/javascript/mastodon/locales/si.json
@@ -53,7 +53,6 @@
   "alert.unexpected.title": "අපොයි!",
   "announcement.announcement": "නිවේදනය",
   "audio.hide": "හඬපටය සඟවන්න",
-  "autosuggest_hashtag.per_week": "සතියකට {count}",
   "boost_modal.combo": "ඊළඟ වතාවේ මෙය මඟ හැරීමට {combo} එබීමට හැකිය",
   "bundle_column_error.copy_stacktrace": "දෝෂ වාර්තාවේ පිටපතක්",
   "bundle_column_error.error.title": "අපොයි!",
@@ -102,19 +101,12 @@
   "compose_form.encryption_warning": "මාස්ටඩන් වෙත පළ කරන දෑ අන්ත සංකේතනයෙන් ආරක්‍ෂා නොවේ. මාස්ටඩන් හරහා කිසිදු සංවේදී තොරතුරක් බෙදා නොගන්න.",
   "compose_form.lock_disclaimer.lock": "අගුළු දමා ඇත",
   "compose_form.placeholder": "ඔබගේ සිතුවිලි මොනවාද?",
-  "compose_form.poll.add_option": "තේරීමක් යොදන්න",
   "compose_form.poll.duration": "මත විමසීමේ කාලය",
-  "compose_form.poll.option_placeholder": "තේරීම {number}",
-  "compose_form.poll.remove_option": "මෙම ඉවත් කරන්න",
   "compose_form.poll.switch_to_multiple": "තේරීම් කිහිපයකට මත විමසුම වෙනස් කරන්න",
   "compose_form.poll.switch_to_single": "තනි තේරීමකට මත විමසුම වෙනස් කරන්න",
-  "compose_form.publish": "ප්‍රකාශනය",
   "compose_form.publish_form": "නව ලිපිය",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "වෙනස්කම් සුරකින්න",
   "compose_form.spoiler.marked": "අන්තර්ගත අවවාදය ඉවත් කරන්න",
   "compose_form.spoiler.unmarked": "අන්තර්ගත අවවාදයක් එක් කරන්න",
-  "compose_form.spoiler_placeholder": "අවවාදය මෙහි ලියන්න",
   "confirmation_modal.cancel": "අවලංගු",
   "confirmations.block.block_and_report": "අවහිර කර වාර්තා කරන්න",
   "confirmations.block.confirm": "අවහිර",
@@ -269,7 +261,6 @@
   "navigation_bar.compose": "නව ලිපියක් ලියන්න",
   "navigation_bar.direct": "පෞද්ගලික සැඳහුම්",
   "navigation_bar.domain_blocks": "අවහිර කළ වසම්",
-  "navigation_bar.edit_profile": "පැතිකඩ සංස්කරණය",
   "navigation_bar.explore": "ගවේශනය",
   "navigation_bar.favourites": "ප්‍රියතමයන්",
   "navigation_bar.filters": "නිහඬ කළ වචන",
@@ -335,11 +326,6 @@
   "poll_button.add_poll": "මත විමසුමක් අරඹන්න",
   "poll_button.remove_poll": "මත විමසුම ඉවතලන්න",
   "privacy.change": "ලිපියේ රහස්‍යතාව සංශෝධනය",
-  "privacy.direct.long": "සඳහන් කළ අයට දිස්වෙයි",
-  "privacy.direct.short": "සඳහන් කළ අයට පමණි",
-  "privacy.private.long": "අනුගාමිකයින්ට දිස්වේ",
-  "privacy.private.short": "අනුගාමිකයින් පමණි",
-  "privacy.public.long": "සැමට දිස්වෙයි",
   "privacy.public.short": "ප්‍රසිද්ධ",
   "privacy_policy.title": "රහස්‍යතා ප්‍රතිපත්තිය",
   "refresh": "නැවුම් කරන්න",
@@ -481,10 +467,8 @@
   "upload_error.poll": "මත විමසුම් සමඟ ගොනු යෙදීමට ඉඩ නොදේ.",
   "upload_form.audio_description": "නොඇසෙන අය සඳහා විස්තර කරන්න",
   "upload_form.description": "දෘශ්‍යාබාධිතයන් සඳහා විස්තර කරන්න",
-  "upload_form.description_missing": "සවිස්තරයක් නැත",
   "upload_form.edit": "සංස්කරණය",
   "upload_form.thumbnail": "සිඟිති රුව වෙනස් කරන්න",
-  "upload_form.undo": "මකන්න",
   "upload_form.video_description": "ශ්‍රවණාබාධ හෝ දෘශ්‍යාබාධිත පුද්ගලයන් සඳහා විස්තර කරන්න",
   "upload_modal.analyzing_picture": "පින්තූරය විශ්ලේෂණය කරමින්…",
   "upload_modal.apply": "යොදන්න",
diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json
index 3e41a2035a0046..5b1203aeeaa98b 100644
--- a/app/javascript/mastodon/locales/sk.json
+++ b/app/javascript/mastodon/locales/sk.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Oznámenie",
   "attachments_list.unprocessed": "(nespracované)",
   "audio.hide": "Skry zvuk",
-  "autosuggest_hashtag.per_week": "{count} týždenne",
   "boost_modal.combo": "Nabudúce môžeš kliknúť {combo} pre preskočenie",
   "bundle_column_error.copy_stacktrace": "Kopírovať chybovú hlášku",
   "bundle_column_error.error.body": "Požadovanú stránku nebolo možné vykresliť. Môže to byť spôsobené chybou v našom kóde alebo problémom s kompatibilitou prehliadača.",
@@ -146,22 +145,12 @@
   "compose_form.lock_disclaimer": "Tvoj účet nie je {locked}. Ktokoľvek ťa môže nasledovať a vidieť tvoje správy pre sledujúcich.",
   "compose_form.lock_disclaimer.lock": "zamknutý",
   "compose_form.placeholder": "Čo máš na mysli?",
-  "compose_form.poll.add_option": "Pridaj voľbu",
   "compose_form.poll.duration": "Trvanie ankety",
-  "compose_form.poll.option_placeholder": "Voľba {number}",
-  "compose_form.poll.remove_option": "Odstráň túto voľbu",
   "compose_form.poll.switch_to_multiple": "Zmeň anketu pre povolenie viacerých možností",
   "compose_form.poll.switch_to_single": "Zmeň anketu na takú s jedinou voľbou",
-  "compose_form.publish": "Zverejni",
   "compose_form.publish_form": "Zverejniť",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Ulož zmeny",
-  "compose_form.sensitive.hide": "Označ médiá ako chúlostivé",
-  "compose_form.sensitive.marked": "Médiálny obsah je označený ako chúlostivý",
-  "compose_form.sensitive.unmarked": "Médiálny obsah nieje označený ako chúlostivý",
   "compose_form.spoiler.marked": "Text je ukrytý za varovaním",
   "compose_form.spoiler.unmarked": "Text nieje ukrytý",
-  "compose_form.spoiler_placeholder": "Sem napíš tvoje varovanie",
   "confirmation_modal.cancel": "Zruš",
   "confirmations.block.block_and_report": "Zablokuj a nahlás",
   "confirmations.block.confirm": "Blokuj",
@@ -408,7 +397,6 @@
   "navigation_bar.direct": "Súkromné spomenutia",
   "navigation_bar.discover": "Objavuj",
   "navigation_bar.domain_blocks": "Skryté domény",
-  "navigation_bar.edit_profile": "Uprav profil",
   "navigation_bar.explore": "Objavuj",
   "navigation_bar.favourites": "Obľúbené",
   "navigation_bar.filters": "Filtrované slová",
@@ -525,14 +513,7 @@
   "poll_button.add_poll": "Pridaj anketu",
   "poll_button.remove_poll": "Odstráň anketu",
   "privacy.change": "Uprav súkromie príspevku",
-  "privacy.direct.long": "Pošli iba spomenutým užívateľom",
-  "privacy.direct.short": "Iba spomenutým ľudom",
-  "privacy.private.long": "Pošli iba následovateľom",
-  "privacy.private.short": "Iba pre sledujúcich",
-  "privacy.public.long": "Viditeľné pre všetkých",
   "privacy.public.short": "Verejné",
-  "privacy.unlisted.long": "Viditeľné pre všetkých, ale odmietnuté funkcie zisťovania",
-  "privacy.unlisted.short": "Verejne, ale nezobraziť v osi",
   "privacy_policy.last_updated": "Posledná úprava {date}",
   "privacy_policy.title": "Zásady súkromia",
   "recommended": "Odporúčané",
@@ -714,10 +695,8 @@
   "upload_error.poll": "Nahrávanie súborov pri anketách nieje možné.",
   "upload_form.audio_description": "Popíš, pre ľudí so stratou sluchu",
   "upload_form.description": "Opis pre slabo vidiacich",
-  "upload_form.description_missing": "Nepridaný žiadny popis",
   "upload_form.edit": "Uprav",
   "upload_form.thumbnail": "Zmeniť miniatúru",
-  "upload_form.undo": "Vymaž",
   "upload_form.video_description": "Popíš, pre ľudí so stratou sluchu, alebo očným znevýhodnením",
   "upload_modal.analyzing_picture": "Analyzujem obrázok…",
   "upload_modal.apply": "Použi",
diff --git a/app/javascript/mastodon/locales/sl.json b/app/javascript/mastodon/locales/sl.json
index b3998b91104263..559b05db72ec2d 100644
--- a/app/javascript/mastodon/locales/sl.json
+++ b/app/javascript/mastodon/locales/sl.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Obvestilo",
   "attachments_list.unprocessed": "(neobdelano)",
   "audio.hide": "Skrij zvok",
-  "autosuggest_hashtag.per_week": "{count} na teden",
   "boost_modal.combo": "Če želite preskočiti to, lahko pritisnete {combo}",
   "bundle_column_error.copy_stacktrace": "Kopiraj poročilo o napaki",
   "bundle_column_error.error.body": "Zahtevane strani ni mogoče upodobiti. Vzrok težave je morda hrošč v naši kodi ali pa nezdružljivost z brskalnikom.",
@@ -146,22 +145,12 @@
   "compose_form.lock_disclaimer": "Vaš račun ni {locked}. Vsakdo vam lahko sledi in si ogleda objave, ki so namenjene samo sledilcem.",
   "compose_form.lock_disclaimer.lock": "zaklenjen",
   "compose_form.placeholder": "O čem razmišljate?",
-  "compose_form.poll.add_option": "Dodaj izbiro",
   "compose_form.poll.duration": "Trajanje ankete",
-  "compose_form.poll.option_placeholder": "Izbira {number}",
-  "compose_form.poll.remove_option": "Odstrani to izbiro",
   "compose_form.poll.switch_to_multiple": "Spremenite anketo, da omogočite več izbir",
   "compose_form.poll.switch_to_single": "Spremenite anketo, da omogočite eno izbiro",
-  "compose_form.publish": "Objavi",
   "compose_form.publish_form": "Objavi",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Shrani spremembe",
-  "compose_form.sensitive.hide": "{count, plural,one {Označi medij kot občutljiv} two {Označi medija kot občutljiva} other {Označi medije kot občutljive}}",
-  "compose_form.sensitive.marked": "{count, plural,one {Medij je označen kot občutljiv} two {Medija sta označena kot občutljiva} other {Mediji so označeni kot občutljivi}}",
-  "compose_form.sensitive.unmarked": "{count, plural,one {Medij ni označen kot občutljiv} two {Medija nista označena kot občutljiva} other {Mediji niso označeni kot občutljivi}}",
   "compose_form.spoiler.marked": "Odstrani opozorilo o vsebini",
   "compose_form.spoiler.unmarked": "Dodaj opozorilo o vsebini",
-  "compose_form.spoiler_placeholder": "Tukaj napišite opozorilo",
   "confirmation_modal.cancel": "Prekliči",
   "confirmations.block.block_and_report": "Blokiraj in prijavi",
   "confirmations.block.confirm": "Blokiraj",
@@ -408,7 +397,6 @@
   "navigation_bar.direct": "Zasebne omembe",
   "navigation_bar.discover": "Odkrijte",
   "navigation_bar.domain_blocks": "Blokirane domene",
-  "navigation_bar.edit_profile": "Uredi profil",
   "navigation_bar.explore": "Razišči",
   "navigation_bar.favourites": "Priljubljeni",
   "navigation_bar.filters": "Utišane besede",
@@ -526,14 +514,7 @@
   "poll_button.add_poll": "Dodaj anketo",
   "poll_button.remove_poll": "Odstrani anketo",
   "privacy.change": "Spremeni zasebnost objave",
-  "privacy.direct.long": "Objavi samo omenjenim uporabnikom",
-  "privacy.direct.short": "Samo omenjeni",
-  "privacy.private.long": "Vidno samo sledilcem",
-  "privacy.private.short": "Samo sledilci",
-  "privacy.public.long": "Vidno vsem",
   "privacy.public.short": "Javno",
-  "privacy.unlisted.long": "Vidno za vse, vendar izključeno iz funkcionalnosti odkrivanja",
-  "privacy.unlisted.short": "Ni prikazano",
   "privacy_policy.last_updated": "Zadnja posodobitev {date}",
   "privacy_policy.title": "Pravilnik o zasebnosti",
   "recommended": "Priporočeno",
@@ -715,10 +696,8 @@
   "upload_error.poll": "Prenos datoteke z anketami ni dovoljen.",
   "upload_form.audio_description": "Opiši za osebe z okvaro sluha",
   "upload_form.description": "Opišite za slabovidne",
-  "upload_form.description_missing": "Noben opis ni dodan",
   "upload_form.edit": "Uredi",
   "upload_form.thumbnail": "Spremeni sličico",
-  "upload_form.undo": "Izbriši",
   "upload_form.video_description": "Opišite za osebe z okvaro sluha in/ali vida",
   "upload_modal.analyzing_picture": "Analiziranje slike …",
   "upload_modal.apply": "Uveljavi",
diff --git a/app/javascript/mastodon/locales/sq.json b/app/javascript/mastodon/locales/sq.json
index f45266c845819b..bfc674248bde96 100644
--- a/app/javascript/mastodon/locales/sq.json
+++ b/app/javascript/mastodon/locales/sq.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Lajmërim",
   "attachments_list.unprocessed": "(e papërpunuar)",
   "audio.hide": "Fshihe audion",
-  "autosuggest_hashtag.per_week": "{count} për javë",
   "boost_modal.combo": "Që kjo të anashkalohet herës tjetër, mund të shtypni {combo}",
   "bundle_column_error.copy_stacktrace": "Kopjo raportim gabimi",
   "bundle_column_error.error.body": "Faqja e kërkuar s’u vizatua dot. Kjo mund të vijë nga një e metë në kodin tonë, ose nga një problem përputhshmërie i shfletuesit.",
@@ -146,22 +145,22 @@
   "compose_form.lock_disclaimer": "Llogaria juaj s’është {locked}. Mund ta ndjekë cilido, për të parë postimet tuaja vetëm për ndjekësit.",
   "compose_form.lock_disclaimer.lock": "e kyçur",
   "compose_form.placeholder": "Ç’bluani në mendje?",
-  "compose_form.poll.add_option": "Shtoni një zgjedhje",
+  "compose_form.poll.add_option": "Shtoni mundësi",
   "compose_form.poll.duration": "Kohëzgjatje pyetësori",
-  "compose_form.poll.option_placeholder": "Zgjedhja {number}",
-  "compose_form.poll.remove_option": "Hiqe këtë zgjedhje",
+  "compose_form.poll.multiple": "Shumë zgjedhje",
+  "compose_form.poll.option_placeholder": "Mundësia {number}",
+  "compose_form.poll.remove_option": "Hiqe këtë mundësi",
+  "compose_form.poll.single": "Zgjidhni një",
   "compose_form.poll.switch_to_multiple": "Ndrysho votimin për të lejuar shumë zgjedhje",
   "compose_form.poll.switch_to_single": "Ndrysho votimin për të lejuar vetëm një zgjedhje",
-  "compose_form.publish": "Botoje",
+  "compose_form.poll.type": "Stil",
+  "compose_form.publish": "Postim",
   "compose_form.publish_form": "Publikoje",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Ruaji ndryshimet",
-  "compose_form.sensitive.hide": "{count, plural, one {Vëri shenjë medias si rezervat} other {Vëru shenjë mediave si rezervat}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Medias i është vënë shenjë rezervat} other {Mediave u është vënë shenjë si rezervat}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Media s’ka shenjë si rezervat} other {Mediat s’kanë shenja si rezervat}}",
+  "compose_form.reply": "Përgjigjuni",
+  "compose_form.save_changes": "Përditësoje",
   "compose_form.spoiler.marked": "Hiq sinjalizim lënde",
   "compose_form.spoiler.unmarked": "Shtoni sinjalizim lënde",
-  "compose_form.spoiler_placeholder": "Shkruani këtu sinjalizimin tuaj",
+  "compose_form.spoiler_placeholder": "Sinjalizim lënde (opsional)",
   "confirmation_modal.cancel": "Anuloje",
   "confirmations.block.block_and_report": "Bllokojeni & Raportojeni",
   "confirmations.block.confirm": "Bllokoje",
@@ -408,7 +407,6 @@
   "navigation_bar.direct": "Përmendje private",
   "navigation_bar.discover": "Zbuloni",
   "navigation_bar.domain_blocks": "Përkatësi të bllokuara",
-  "navigation_bar.edit_profile": "Përpunoni profilin",
   "navigation_bar.explore": "Eksploroni",
   "navigation_bar.favourites": "Të parapëlqyer",
   "navigation_bar.filters": "Fjalë të heshtuara",
@@ -526,14 +524,15 @@
   "poll_button.add_poll": "Shtoni një pyetësor",
   "poll_button.remove_poll": "Hiqe pyetësorin",
   "privacy.change": "Rregulloni privatësi mesazhesh",
-  "privacy.direct.long": "I dukshëm vetëm për përdorues të përmendur",
-  "privacy.direct.short": "Vetëm për personat e përmendur",
-  "privacy.private.long": "I dukshëm vetëm për ndjekës",
-  "privacy.private.short": "Vetëm ndjekës",
-  "privacy.public.long": "I dukshëm për të tërë",
+  "privacy.direct.long": "Gjithkënd i përmendur te postimi",
+  "privacy.direct.short": "Persona të veçantë",
+  "privacy.private.long": "Vetëm ndjekësit tuaj",
+  "privacy.private.short": "Ndjekës",
+  "privacy.public.long": "Cilido që hyn e del në Mastodon",
   "privacy.public.short": "Publik",
-  "privacy.unlisted.long": "I dukshëm për të tërë, por lënë jashtë nga veçoritë e zbulimit",
-  "privacy.unlisted.short": "Jo në lista",
+  "privacy.unlisted.additional": "Ky sillet saktësisht si publik, vetëm se postimi s’do të shfaqet në prurje të drejtpërdrejta, ose në hashtag-ë, te eksploroni, apo kërkim në Mastodon, edhe kur keni zgjedhur të jetë për tërë llogarinë.",
+  "privacy.unlisted.long": "Më pak fanfara algoritmike",
+  "privacy.unlisted.short": "Publik i qetë",
   "privacy_policy.last_updated": "Përditësuar së fundi më {date}",
   "privacy_policy.title": "Rregulla Privatësie",
   "recommended": "E rekomanduar",
@@ -551,7 +550,9 @@
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "sot",
+  "reply_indicator.attachments": "{count, plural, one {# bashkëngjitje} other {# bashkëngjitje}}",
   "reply_indicator.cancel": "Anuloje",
+  "reply_indicator.poll": "Pyetësor",
   "report.block": "Bllokoje",
   "report.block_explanation": "S’do të shihni postime prej tyre. S’do të jenë në gjendje të shohin postimet tuaja, apo t’ju ndjekin. Do të jenë në gjendje të shohin se janë bllokuar.",
   "report.categories.legal": "Ligjore",
@@ -715,10 +716,8 @@
   "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.description_missing": "S’u shtua përshkrim",
   "upload_form.edit": "Përpunoni",
   "upload_form.thumbnail": "Ndryshoni miniaturën",
-  "upload_form.undo": "Fshije",
   "upload_form.video_description": "Përshkruajeni për persona me dëgjim të kufizuar ose probleme shikimi",
   "upload_modal.analyzing_picture": "Po analizohet fotoja…",
   "upload_modal.apply": "Aplikoje",
diff --git a/app/javascript/mastodon/locales/sr-Latn.json b/app/javascript/mastodon/locales/sr-Latn.json
index 77c262e9571293..b0348748a6762f 100644
--- a/app/javascript/mastodon/locales/sr-Latn.json
+++ b/app/javascript/mastodon/locales/sr-Latn.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Najava",
   "attachments_list.unprocessed": "(neobrađeno)",
   "audio.hide": "Sakrij audio",
-  "autosuggest_hashtag.per_week": "{count} nedeljno",
   "boost_modal.combo": "Možete pritisnuti {combo} da preskočite ovo sledeći put",
   "bundle_column_error.copy_stacktrace": "Kopiraj izveštaj o grešci",
   "bundle_column_error.error.body": "Nije moguće prikazati traženu stranicu. Razlog može biti greška u našem kodu ili problem sa kompatibilnošću pretraživača.",
@@ -146,22 +145,12 @@
   "compose_form.lock_disclaimer": "Vaš nalog nije {locked}. Svako može da vas prati i da vidi vaše objave namenjene samo za vaše pratioce.",
   "compose_form.lock_disclaimer.lock": "zaključan",
   "compose_form.placeholder": "O čemu razmišljate?",
-  "compose_form.poll.add_option": "Dodajte izbor",
   "compose_form.poll.duration": "Trajanje ankete",
-  "compose_form.poll.option_placeholder": "Izbor {number}",
-  "compose_form.poll.remove_option": "Ukloni ovaj izbor",
   "compose_form.poll.switch_to_multiple": "Promenite anketu da biste omogućili više izbora",
   "compose_form.poll.switch_to_single": "Promenite anketu da biste omogućili jedan izbor",
-  "compose_form.publish": "Objavi",
   "compose_form.publish_form": "Objavi",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Sačuvaj promene",
-  "compose_form.sensitive.hide": "{count, plural, one {Označi multimediju kao osetljivu} few {Označi multimediju kao osetljivu} other {Označi multimediju kao osetljivu}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Multimedija je označena kao osetljiva} few {Multimedija je označena kao osetljiva} other {Multimedija je označena kao osetljiva}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Multimedija nije označena kao osetljiva} few {Multimedija nije označena kao osetljiva} other {Multimedija nije označena kao osetljiva}}",
   "compose_form.spoiler.marked": "Ukloni upozorenje o sadržaju",
   "compose_form.spoiler.unmarked": "Dodaj upozorenje o sadržaju",
-  "compose_form.spoiler_placeholder": "Ovde napišite upozorenje",
   "confirmation_modal.cancel": "Otkaži",
   "confirmations.block.block_and_report": "Blokiraj i prijavi",
   "confirmations.block.confirm": "Blokiraj",
@@ -408,7 +397,6 @@
   "navigation_bar.direct": "Privatna pominjanja",
   "navigation_bar.discover": "Otkrij",
   "navigation_bar.domain_blocks": "Blokirani domeni",
-  "navigation_bar.edit_profile": "Uredi profil",
   "navigation_bar.explore": "Istraži",
   "navigation_bar.favourites": "Omiljeno",
   "navigation_bar.filters": "Ignorisane reči",
@@ -526,14 +514,7 @@
   "poll_button.add_poll": "Dodaj anketu",
   "poll_button.remove_poll": "Ukloni anketu",
   "privacy.change": "Promeni privatnost objave",
-  "privacy.direct.long": "Vidljivo samo pomenutim korisnicima",
-  "privacy.direct.short": "Samo pomenute osobe",
-  "privacy.private.long": "Vidljivo samo pratiocima",
-  "privacy.private.short": "Samo pratioci",
-  "privacy.public.long": "Vidljivo za sve",
   "privacy.public.short": "Javno",
-  "privacy.unlisted.long": "Vidljivo svima, ali isključeno iz funkcija otkrivanja",
-  "privacy.unlisted.short": "Neizlistano",
   "privacy_policy.last_updated": "Poslednje ažuriranje {date}",
   "privacy_policy.title": "Politika privatnosti",
   "recommended": "Preporučeno",
@@ -715,10 +696,8 @@
   "upload_error.poll": "Otpremanje datoteka nije dozvoljeno kod anketa.",
   "upload_form.audio_description": "Dodajte opis za osobe sa oštećenim sluhom",
   "upload_form.description": "Dodajte opis za osobe sa oštećenim vidom",
-  "upload_form.description_missing": "Nema dodatog opisa",
   "upload_form.edit": "Uredi",
   "upload_form.thumbnail": "Promeni sličicu",
-  "upload_form.undo": "Izbriši",
   "upload_form.video_description": "Opišite za osobe sa oštećenim sluhom ili vidom",
   "upload_modal.analyzing_picture": "Analiziranje slike…",
   "upload_modal.apply": "Primeni",
diff --git a/app/javascript/mastodon/locales/sr.json b/app/javascript/mastodon/locales/sr.json
index 85e7567bf42166..4e4956e1a2a055 100644
--- a/app/javascript/mastodon/locales/sr.json
+++ b/app/javascript/mastodon/locales/sr.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Најава",
   "attachments_list.unprocessed": "(необрађено)",
   "audio.hide": "Сакриј аудио",
-  "autosuggest_hashtag.per_week": "{count} недељно",
   "boost_modal.combo": "Можете притиснути {combo} да прескочите ово следећи пут",
   "bundle_column_error.copy_stacktrace": "Копирај извештај о грешци",
   "bundle_column_error.error.body": "Није могуће приказати тражену страницу. Разлог може бити грешка у нашем коду или проблем са компатибилношћу претраживача.",
@@ -146,22 +145,22 @@
   "compose_form.lock_disclaimer": "Ваш налог није {locked}. Свако може да Вас запрати и да види објаве намењене само Вашим пратиоцима.",
   "compose_form.lock_disclaimer.lock": "закључан",
   "compose_form.placeholder": "О чему размишљате?",
-  "compose_form.poll.add_option": "Додајте избор",
+  "compose_form.poll.add_option": "Додај опцију",
   "compose_form.poll.duration": "Трајање анкете",
-  "compose_form.poll.option_placeholder": "Избор {number}",
-  "compose_form.poll.remove_option": "Уклони овај избор",
+  "compose_form.poll.multiple": "Вишеструки избор",
+  "compose_form.poll.option_placeholder": "Опција {number}",
+  "compose_form.poll.remove_option": "Уклони ову опцију",
+  "compose_form.poll.single": "Одаберите једно",
   "compose_form.poll.switch_to_multiple": "Промените анкету да бисте омогућили више избора",
   "compose_form.poll.switch_to_single": "Промените анкету да бисте омогућили један избор",
+  "compose_form.poll.type": "Стил",
   "compose_form.publish": "Објави",
   "compose_form.publish_form": "Нова објава",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Сачувај промене",
-  "compose_form.sensitive.hide": "{count, plural, one {Означи мултимедију као осетљиву} few {Означи мултимедију као осетљиву} other {Означи мултимедију као осетљиву}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Мултимедија је означена као осетљива} few {Мултимедија је означена као осетљива} other {Мултимедија је означена као осетљива}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Мултимедија није означена као осетљива} few {Мултимедија није означена као осетљива} other {Мултимедија није означена као осетљива}}",
+  "compose_form.reply": "Одговори",
+  "compose_form.save_changes": "Ажурирај",
   "compose_form.spoiler.marked": "Уклони упозорење о садржају",
   "compose_form.spoiler.unmarked": "Додај упозорење о садржају",
-  "compose_form.spoiler_placeholder": "Овде напишите упозорење",
+  "compose_form.spoiler_placeholder": "Упозорење о садржају (опционо)",
   "confirmation_modal.cancel": "Откажи",
   "confirmations.block.block_and_report": "Блокирај и пријави",
   "confirmations.block.confirm": "Блокирај",
@@ -408,7 +407,6 @@
   "navigation_bar.direct": "Приватна помињања",
   "navigation_bar.discover": "Откриј",
   "navigation_bar.domain_blocks": "Блокирани домени",
-  "navigation_bar.edit_profile": "Уреди профил",
   "navigation_bar.explore": "Истражи",
   "navigation_bar.favourites": "Омиљено",
   "navigation_bar.filters": "Игнорисане речи",
@@ -526,14 +524,15 @@
   "poll_button.add_poll": "Додај анкету",
   "poll_button.remove_poll": "Уклони анкету",
   "privacy.change": "Промени приватност објаве",
-  "privacy.direct.long": "Видљиво само поменутим корисницима",
-  "privacy.direct.short": "Само поменуте особе",
-  "privacy.private.long": "Видљиво само пратиоцима",
-  "privacy.private.short": "Само пратиоци",
-  "privacy.public.long": "Видљиво за све",
+  "privacy.direct.long": "Сви поменути у објави",
+  "privacy.direct.short": "Одређени људи",
+  "privacy.private.long": "Само ваши пратиоци",
+  "privacy.private.short": "Пратиоци",
+  "privacy.public.long": "Било ко на Mastodon-у и ван њега",
   "privacy.public.short": "Јавно",
-  "privacy.unlisted.long": "Видљиво свима, али искључено из функција откривања",
-  "privacy.unlisted.short": "Неизлистано",
+  "privacy.unlisted.additional": "Ово се понаша потпуно као јавно, осим што се објава неће појављивати у изворима уживо или хеш ознакама, истраживањима или претрази Mastodon-а, чак и ако сте укључени у целом налогу.",
+  "privacy.unlisted.long": "Мање алгоритамских фанфара",
+  "privacy.unlisted.short": "Тиха јавност",
   "privacy_policy.last_updated": "Последње ажурирање {date}",
   "privacy_policy.title": "Политика приватности",
   "recommended": "Препоручено",
@@ -551,7 +550,9 @@
   "relative_time.minutes": "{number} мин.",
   "relative_time.seconds": "{number} сек.",
   "relative_time.today": "данас",
+  "reply_indicator.attachments": "{count, plural, one {# прилог} few {# прилога} other {# прилога}}",
   "reply_indicator.cancel": "Откажи",
+  "reply_indicator.poll": "Анкета",
   "report.block": "Блокирај",
   "report.block_explanation": "Нећете видети објаве корисника. Ни он неће видети Ваше објаве нити ће моћи да Вас прати. Такође ће моћи да сазна да је блокиран.",
   "report.categories.legal": "Правни",
@@ -715,10 +716,8 @@
   "upload_error.poll": "Отпремање датотека није дозвољено код анкета.",
   "upload_form.audio_description": "Додајте опис за особе са оштећеним слухом",
   "upload_form.description": "Додајте опис за особе са оштећеним видом",
-  "upload_form.description_missing": "Нема додатог описа",
   "upload_form.edit": "Уреди",
   "upload_form.thumbnail": "Промени сличицу",
-  "upload_form.undo": "Избриши",
   "upload_form.video_description": "Опишите за особе са оштећеним слухом или видом",
   "upload_modal.analyzing_picture": "Анализирање слике…",
   "upload_modal.apply": "Примени",
diff --git a/app/javascript/mastodon/locales/sv.json b/app/javascript/mastodon/locales/sv.json
index d3ca776bd9e5cb..d6e6555b530091 100644
--- a/app/javascript/mastodon/locales/sv.json
+++ b/app/javascript/mastodon/locales/sv.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Meddelande",
   "attachments_list.unprocessed": "(obehandlad)",
   "audio.hide": "Dölj audio",
-  "autosuggest_hashtag.per_week": "{count} per vecka",
   "boost_modal.combo": "Du kan trycka på {combo} för att hoppa över detta nästa gång",
   "bundle_column_error.copy_stacktrace": "Kopiera felrapport",
   "bundle_column_error.error.body": "Den begärda sidan kunde inte visas. Det kan bero på ett fel i vår kod eller ett problem med webbläsarens kompatibilitet.",
@@ -146,22 +145,18 @@
   "compose_form.lock_disclaimer": "Ditt konto är inte {locked}. Vem som helst kan följa dig för att se dina inlägg som endast är för följare.",
   "compose_form.lock_disclaimer.lock": "låst",
   "compose_form.placeholder": "Vad tänker du på?",
-  "compose_form.poll.add_option": "Lägg till ett val",
+  "compose_form.poll.add_option": "Lägg till alternativ",
   "compose_form.poll.duration": "Varaktighet för omröstning",
-  "compose_form.poll.option_placeholder": "Val {number}",
-  "compose_form.poll.remove_option": "Ta bort detta val",
+  "compose_form.poll.option_placeholder": "Alternativ {number}",
   "compose_form.poll.switch_to_multiple": "Ändra enkät för att tillåta flera val",
   "compose_form.poll.switch_to_single": "Ändra enkät för att tillåta ett enda val",
-  "compose_form.publish": "Publicera",
+  "compose_form.poll.type": "Stil",
   "compose_form.publish_form": "Publicera",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Spara ändringar",
-  "compose_form.sensitive.hide": "Markera media som känsligt",
-  "compose_form.sensitive.marked": "Media har markerats som känsligt",
-  "compose_form.sensitive.unmarked": "Media är inte markerat som känsligt",
+  "compose_form.reply": "Svara",
+  "compose_form.save_changes": "Uppdatera",
   "compose_form.spoiler.marked": "Texten är dold bakom en varning",
   "compose_form.spoiler.unmarked": "Texten är inte dold",
-  "compose_form.spoiler_placeholder": "Skriv din varning här",
+  "compose_form.spoiler_placeholder": "Innehållsvarning (valfritt)",
   "confirmation_modal.cancel": "Avbryt",
   "confirmations.block.block_and_report": "Blockera & rapportera",
   "confirmations.block.confirm": "Blockera",
@@ -408,7 +403,6 @@
   "navigation_bar.direct": "Privata nämningar",
   "navigation_bar.discover": "Upptäck",
   "navigation_bar.domain_blocks": "Dolda domäner",
-  "navigation_bar.edit_profile": "Redigera profil",
   "navigation_bar.explore": "Utforska",
   "navigation_bar.favourites": "Favoriter",
   "navigation_bar.filters": "Tystade ord",
@@ -524,14 +518,10 @@
   "poll_button.add_poll": "Lägg till en omröstning",
   "poll_button.remove_poll": "Ta bort omröstning",
   "privacy.change": "Ändra inläggsintegritet",
-  "privacy.direct.long": "Skicka endast till nämnda användare",
-  "privacy.direct.short": "Endast omnämnda personer",
-  "privacy.private.long": "Endast synligt för följare",
-  "privacy.private.short": "Endast följare",
-  "privacy.public.long": "Synlig för alla",
+  "privacy.private.long": "Endast dina följare",
+  "privacy.private.short": "Följare",
+  "privacy.public.long": "Alla på och utanför Mastodon",
   "privacy.public.short": "Publik",
-  "privacy.unlisted.long": "Synlig för alla, men visas inte i upptäcksfunktioner",
-  "privacy.unlisted.short": "Olistad",
   "privacy_policy.last_updated": "Senast uppdaterad {date}",
   "privacy_policy.title": "Integritetspolicy",
   "recommended": "Rekommenderas",
@@ -550,6 +540,7 @@
   "relative_time.seconds": "{number}sek",
   "relative_time.today": "idag",
   "reply_indicator.cancel": "Ångra",
+  "reply_indicator.poll": "Omröstning",
   "report.block": "Blockera",
   "report.block_explanation": "Du kommer inte se hens inlägg. Hen kommer inte kunna se dina inlägg eller följa dig. Hen kommer kunna se att hen är blockerad.",
   "report.categories.legal": "Juridisk",
@@ -713,10 +704,8 @@
   "upload_error.poll": "Filuppladdning tillåts inte med omröstningar.",
   "upload_form.audio_description": "Beskriv för personer med hörselnedsättning",
   "upload_form.description": "Beskriv för synskadade",
-  "upload_form.description_missing": "Beskrivning saknas",
   "upload_form.edit": "Redigera",
   "upload_form.thumbnail": "Ändra miniatyr",
-  "upload_form.undo": "Radera",
   "upload_form.video_description": "Beskriv för personer med hörsel- eller synnedsättning",
   "upload_modal.analyzing_picture": "Analyserar bild…",
   "upload_modal.apply": "Verkställ",
diff --git a/app/javascript/mastodon/locales/szl.json b/app/javascript/mastodon/locales/szl.json
index abbdf9b7daaf89..42164f656b10b7 100644
--- a/app/javascript/mastodon/locales/szl.json
+++ b/app/javascript/mastodon/locales/szl.json
@@ -93,8 +93,6 @@
   "onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
   "onboarding.steps.share_profile.title": "Share your profile",
   "privacy.change": "Adjust status privacy",
-  "privacy.direct.short": "Direct",
-  "privacy.private.short": "Followers-only",
   "report.placeholder": "Type or paste additional comments",
   "report.submit": "Submit report",
   "report.target": "Report {target}",
diff --git a/app/javascript/mastodon/locales/ta.json b/app/javascript/mastodon/locales/ta.json
index 5290e13ff4cdfa..6210c3d0b11e06 100644
--- a/app/javascript/mastodon/locales/ta.json
+++ b/app/javascript/mastodon/locales/ta.json
@@ -66,7 +66,6 @@
   "announcement.announcement": "அறிவிப்பு",
   "attachments_list.unprocessed": "(செயலாக்கப்படாதது)",
   "audio.hide": "ஆடியோவை மறை",
-  "autosuggest_hashtag.per_week": "ஒவ்வொரு வாரம் {count}",
   "boost_modal.combo": "நீங்கள் இதை அடுத்தமுறை தவிர்க்க {combo} வை அழுத்தவும்",
   "bundle_column_error.error.title": "அடடே!",
   "bundle_column_error.network.body": "இந்தப் பக்கத்தைத் திறக்கும்பொழுது ஒரு பிழை ஏற்பட்டுவிட்டது. இது உங்கள் இணைய தொடர்பில் அல்லது இப்பத்தின் வழங்க்கியில் ஏற்பட்டுள்ள ஒரு தற்காலிக பிரச்சணையாக இருக்கலாம்.",
@@ -120,22 +119,12 @@
   "compose_form.lock_disclaimer": "உங்கள் கணக்கு {locked} செய்யப்படவில்லை. உங்கள் பதிவுகளை யார் வேண்டுமானாலும் பின்தொடர்ந்து காணலாம்.",
   "compose_form.lock_disclaimer.lock": "பூட்டப்பட்டது",
   "compose_form.placeholder": "உங்கள் மனதில் என்ன இருக்கிறது?",
-  "compose_form.poll.add_option": "தேர்வை சேர்",
   "compose_form.poll.duration": "கருத்துக்கணிப்பின் கால அளவு",
-  "compose_form.poll.option_placeholder": "தேர்வு எண் {number}",
-  "compose_form.poll.remove_option": "இந்தத் தேர்வை அகற்று",
   "compose_form.poll.switch_to_multiple": "பல தேர்வுகளை அனுமதிக்குமாறு மாற்று",
   "compose_form.poll.switch_to_single": "ஒரே ஒரு தேர்வை மட்டும் அனுமதிக்குமாறு மாற்று",
-  "compose_form.publish": "வெளியிடு",
   "compose_form.publish_form": "Publish",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "மாற்றங்களை சேமி",
-  "compose_form.sensitive.hide": "அனைவருக்கும் ஏற்றப் படம் இல்லை எனக் குறியிடு",
-  "compose_form.sensitive.marked": "இப்படம் அனைவருக்கும் ஏற்றதல்ல எனக் குறியிடப்பட்டுள்ளது",
-  "compose_form.sensitive.unmarked": "இப்படம் அனைவருக்கும் ஏற்றதல்ல எனக் குறியிடப்படவில்லை",
   "compose_form.spoiler.marked": "எச்சரிக்கையின் பின்னால் பதிவு மறைக்கப்பட்டுள்ளது",
   "compose_form.spoiler.unmarked": "பதிவு மறைக்கப்படவில்லை",
-  "compose_form.spoiler_placeholder": "உங்கள் எச்சரிக்கையை இங்கு எழுதவும்",
   "confirmation_modal.cancel": "ரத்து",
   "confirmations.block.block_and_report": "தடுத்துப் புகாரளி",
   "confirmations.block.confirm": "தடு",
@@ -283,7 +272,6 @@
   "navigation_bar.compose": "புதியவற்றை எழுதுக toot",
   "navigation_bar.discover": "கண்டு பிடி",
   "navigation_bar.domain_blocks": "மறைந்த களங்கள்",
-  "navigation_bar.edit_profile": "சுயவிவரத்தைத் திருத்தவும்",
   "navigation_bar.filters": "முடக்கப்பட்ட வார்த்தைகள்",
   "navigation_bar.follow_requests": "கோரிக்கைகளை பின்பற்றவும்",
   "navigation_bar.follows_and_followers": "பின்பற்றல்கள் மற்றும் பின்பற்றுபவர்கள்",
@@ -344,12 +332,7 @@
   "poll_button.add_poll": "வாக்கெடுப்பைச் சேர்க்கவும்",
   "poll_button.remove_poll": "வாக்கெடுப்பை அகற்று",
   "privacy.change": "நிலை தனியுரிமை",
-  "privacy.direct.long": "குறிப்பிடப்பட்ட பயனர்களுக்கு மட்டுமே இடுகையிடவும்",
-  "privacy.direct.short": "Direct",
-  "privacy.private.long": "பின்தொடர்பவர்களுக்கு மட்டுமே இடுகை",
-  "privacy.private.short": "Followers-only",
   "privacy.public.short": "பொது",
-  "privacy.unlisted.short": "பட்டியலிடப்படாத",
   "refresh": "புதுப்பி",
   "regeneration_indicator.label": "சுமையேற்றம்…",
   "regeneration_indicator.sublabel": "உங்கள் வீட்டு ஊட்டம் தயார் செய்யப்படுகிறது!",
@@ -432,7 +415,6 @@
   "upload_form.description": "பார்வையற்ற விவரிக்கவும்",
   "upload_form.edit": "தொகு",
   "upload_form.thumbnail": "சிறுபடத்தை மாற்ற",
-  "upload_form.undo": "நீக்கு",
   "upload_form.video_description": "செவித்திறன் மற்றும் பார்வைக் குறைபாடு உள்ளவர்களுக்காக விளக்குக‌",
   "upload_modal.analyzing_picture": "படம் ஆராயப்படுகிறது…",
   "upload_modal.apply": "உபயோகி",
diff --git a/app/javascript/mastodon/locales/tai.json b/app/javascript/mastodon/locales/tai.json
index 7c1956d95b93c1..b1a242c751d00d 100644
--- a/app/javascript/mastodon/locales/tai.json
+++ b/app/javascript/mastodon/locales/tai.json
@@ -79,8 +79,6 @@
   "onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
   "onboarding.steps.share_profile.title": "Share your profile",
   "privacy.change": "Adjust status privacy",
-  "privacy.direct.short": "Direct",
-  "privacy.private.short": "Followers-only",
   "report.placeholder": "Type or paste additional comments",
   "report.submit": "Submit report",
   "report.target": "Report {target}",
diff --git a/app/javascript/mastodon/locales/te.json b/app/javascript/mastodon/locales/te.json
index 3c231871fa71aa..24a67247c03fce 100644
--- a/app/javascript/mastodon/locales/te.json
+++ b/app/javascript/mastodon/locales/te.json
@@ -64,16 +64,10 @@
   "compose_form.lock_disclaimer": "మీ ఖాతా {locked} చేయబడలేదు. ఎవరైనా మిమ్మల్ని అనుసరించి మీ అనుచరులకు-మాత్రమే పోస్ట్లను వీక్షించవచ్చు.",
   "compose_form.lock_disclaimer.lock": "బిగించబడినది",
   "compose_form.placeholder": "మీ మనస్సులో ఏముంది?",
-  "compose_form.poll.add_option": "ఒక ఎంపికను చేర్చండి",
   "compose_form.poll.duration": "ఎన్నిక వ్యవధి",
-  "compose_form.poll.option_placeholder": "ఎంపిక {number}",
-  "compose_form.poll.remove_option": "ఈ ఎంపికను తొలగించు",
   "compose_form.publish_form": "Publish",
-  "compose_form.sensitive.marked": "మీడియా సున్నితమైనదిగా గుర్తించబడింది",
-  "compose_form.sensitive.unmarked": "మీడియా సున్నితమైనదిగా గుర్తించబడలేదు",
   "compose_form.spoiler.marked": "హెచ్చరిక వెనుక పాఠ్యం దాచబడింది",
   "compose_form.spoiler.unmarked": "పాఠ్యం దాచబడలేదు",
-  "compose_form.spoiler_placeholder": "ఇక్కడ మీ హెచ్చరికను రాయండి",
   "confirmation_modal.cancel": "రద్దు చెయ్యి",
   "confirmations.block.confirm": "బ్లాక్ చేయి",
   "confirmations.block.message": "మీరు ఖచ్చితంగా {name}ని బ్లాక్ చేయాలనుకుంటున్నారా?",
@@ -186,7 +180,6 @@
   "navigation_bar.compose": "కొత్త టూట్ను రాయండి",
   "navigation_bar.discover": "కనుగొను",
   "navigation_bar.domain_blocks": "దాచిన డొమైన్లు",
-  "navigation_bar.edit_profile": "ప్రొఫైల్ని సవరించండి",
   "navigation_bar.filters": "మ్యూట్ చేయబడిన పదాలు",
   "navigation_bar.follow_requests": "అనుసరించడానికి అభ్యర్ధనలు",
   "navigation_bar.lists": "జాబితాలు",
@@ -240,12 +233,7 @@
   "poll_button.add_poll": "ఒక ఎన్నికను చేర్చు",
   "poll_button.remove_poll": "ఎన్నికను తొలగించు",
   "privacy.change": "స్టేటస్ గోప్యతను సర్దుబాటు చేయండి",
-  "privacy.direct.long": "పేర్కొన్న వినియోగదారులకు మాత్రమే పోస్ట్ చేయి",
-  "privacy.direct.short": "Direct",
-  "privacy.private.long": "అనుచరులకు మాత్రమే పోస్ట్ చేయి",
-  "privacy.private.short": "Followers-only",
   "privacy.public.short": "ప్రజా",
-  "privacy.unlisted.short": "జాబితా చేయబడనిది",
   "regeneration_indicator.label": "లోడ్ అవుతోంది…",
   "regeneration_indicator.sublabel": "మీ హోమ్ ఫీడ్ సిద్ధమవుతోంది!",
   "relative_time.just_now": "ఇప్పుడు",
@@ -308,7 +296,6 @@
   "upload_button.label": "మీడియాను జోడించండి (JPEG, PNG, GIF, WebM, MP4, MOV)",
   "upload_form.audio_description": "Describe for people with hearing loss",
   "upload_form.description": "దృష్టి లోపమున్న వారి కోసం వివరించండి",
-  "upload_form.undo": "తొలగించు",
   "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
   "upload_progress.label": "అప్లోడ్ అవుతోంది...",
   "video.close": "వీడియోని మూసివేయి",
diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json
index 65f27ef0618650..4437afa78c5c56 100644
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "ประกาศ",
   "attachments_list.unprocessed": "(ยังไม่ได้ประมวลผล)",
   "audio.hide": "ซ่อนเสียง",
-  "autosuggest_hashtag.per_week": "{count} ต่อสัปดาห์",
   "boost_modal.combo": "คุณสามารถกด {combo} เพื่อข้ามสิ่งนี้ในครั้งถัดไป",
   "bundle_column_error.copy_stacktrace": "คัดลอกรายงานข้อผิดพลาด",
   "bundle_column_error.error.body": "ไม่สามารถแสดงผลหน้าที่ขอ ข้อผิดพลาดอาจเป็นเพราะข้อบกพร่องในโค้ดของเรา หรือปัญหาความเข้ากันได้ของเบราว์เซอร์",
@@ -146,22 +145,12 @@
   "compose_form.lock_disclaimer": "บัญชีของคุณไม่ได้ {locked} ใครก็ตามสามารถติดตามคุณเพื่อดูโพสต์สำหรับผู้ติดตามเท่านั้นของคุณ",
   "compose_form.lock_disclaimer.lock": "ล็อคอยู่",
   "compose_form.placeholder": "คุณกำลังคิดอะไรอยู่?",
-  "compose_form.poll.add_option": "เพิ่มตัวเลือก",
   "compose_form.poll.duration": "ระยะเวลาการสำรวจความคิดเห็น",
-  "compose_form.poll.option_placeholder": "ตัวเลือก {number}",
-  "compose_form.poll.remove_option": "เอาตัวเลือกนี้ออก",
   "compose_form.poll.switch_to_multiple": "เปลี่ยนการสำรวจความคิดเห็นเป็นอนุญาตหลายตัวเลือก",
   "compose_form.poll.switch_to_single": "เปลี่ยนการสำรวจความคิดเห็นเป็นอนุญาตตัวเลือกเดี่ยว",
-  "compose_form.publish": "เผยแพร่",
   "compose_form.publish_form": "โพสต์ใหม่",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "บันทึกการเปลี่ยนแปลง",
-  "compose_form.sensitive.hide": "{count, plural, other {ทำเครื่องหมายสื่อว่าละเอียดอ่อน}}",
-  "compose_form.sensitive.marked": "{count, plural, other {มีการทำเครื่องหมายสื่อว่าละเอียดอ่อน}}",
-  "compose_form.sensitive.unmarked": "{count, plural, other {ไม่มีการทำเครื่องหมายสื่อว่าละเอียดอ่อน}}",
   "compose_form.spoiler.marked": "เอาคำเตือนเนื้อหาออก",
   "compose_form.spoiler.unmarked": "เพิ่มคำเตือนเนื้อหา",
-  "compose_form.spoiler_placeholder": "เขียนคำเตือนของคุณที่นี่",
   "confirmation_modal.cancel": "ยกเลิก",
   "confirmations.block.block_and_report": "ปิดกั้นแล้วรายงาน",
   "confirmations.block.confirm": "ปิดกั้น",
@@ -408,7 +397,6 @@
   "navigation_bar.direct": "การกล่าวถึงแบบส่วนตัว",
   "navigation_bar.discover": "ค้นพบ",
   "navigation_bar.domain_blocks": "โดเมนที่ปิดกั้นอยู่",
-  "navigation_bar.edit_profile": "แก้ไขโปรไฟล์",
   "navigation_bar.explore": "สำรวจ",
   "navigation_bar.favourites": "รายการโปรด",
   "navigation_bar.filters": "คำที่ซ่อนอยู่",
@@ -526,14 +514,7 @@
   "poll_button.add_poll": "เพิ่มการสำรวจความคิดเห็น",
   "poll_button.remove_poll": "เอาการสำรวจความคิดเห็นออก",
   "privacy.change": "เปลี่ยนความเป็นส่วนตัวของโพสต์",
-  "privacy.direct.long": "ปรากฏแก่ผู้ใช้ที่กล่าวถึงเท่านั้น",
-  "privacy.direct.short": "ผู้คนที่กล่าวถึงเท่านั้น",
-  "privacy.private.long": "ปรากฏแก่ผู้ติดตามเท่านั้น",
-  "privacy.private.short": "ผู้ติดตามเท่านั้น",
-  "privacy.public.long": "ปรากฏแก่ทั้งหมด",
   "privacy.public.short": "สาธารณะ",
-  "privacy.unlisted.long": "ปรากฏแก่ทั้งหมด แต่เลือกไม่รับคุณลักษณะการค้นพบ",
-  "privacy.unlisted.short": "ไม่อยู่ในรายการ",
   "privacy_policy.last_updated": "อัปเดตล่าสุดเมื่อ {date}",
   "privacy_policy.title": "นโยบายความเป็นส่วนตัว",
   "recommended": "แนะนำ",
@@ -715,10 +696,8 @@
   "upload_error.poll": "ไม่อนุญาตการอัปโหลดไฟล์โดยมีการสำรวจความคิดเห็น",
   "upload_form.audio_description": "อธิบายสำหรับผู้ที่สูญเสียการได้ยิน",
   "upload_form.description": "อธิบายสำหรับผู้คนที่พิการทางการมองเห็นหรือมีสายตาเลือนราง",
-  "upload_form.description_missing": "ไม่ได้เพิ่มคำอธิบาย",
   "upload_form.edit": "แก้ไข",
   "upload_form.thumbnail": "เปลี่ยนภาพขนาดย่อ",
-  "upload_form.undo": "ลบ",
   "upload_form.video_description": "อธิบายสำหรับผู้คนที่พิการทางการได้ยิน ได้ยินไม่ชัด พิการทางการมองเห็น หรือมีสายตาเลือนราง",
   "upload_modal.analyzing_picture": "กำลังวิเคราะห์รูปภาพ…",
   "upload_modal.apply": "นำไปใช้",
diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json
index e85db817b9fb95..6811c158d45a18 100644
--- a/app/javascript/mastodon/locales/tr.json
+++ b/app/javascript/mastodon/locales/tr.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Duyuru",
   "attachments_list.unprocessed": "(işlenmemiş)",
   "audio.hide": "Sesi gizle",
-  "autosuggest_hashtag.per_week": "Haftada {count}",
   "boost_modal.combo": "Bir daha ki sefere {combo} tuşuna basabilirsin",
   "bundle_column_error.copy_stacktrace": "Hata raporunu kopyala",
   "bundle_column_error.error.body": "İstenen sayfa gösterilemiyor. Bu durum kodumuzdaki bir hatadan veya tarayıcı uyum sorunundan kaynaklanıyor olabilir.",
@@ -146,22 +145,12 @@
   "compose_form.lock_disclaimer": "Hesabın {locked} değil. Yalnızca takipçilere özel gönderilerini görüntülemek için herkes seni takip edebilir.",
   "compose_form.lock_disclaimer.lock": "kilitli",
   "compose_form.placeholder": "Aklında ne var?",
-  "compose_form.poll.add_option": "Bir seçenek ekleyin",
   "compose_form.poll.duration": "Anket süresi",
-  "compose_form.poll.option_placeholder": "{number}.seçenek",
-  "compose_form.poll.remove_option": "Bu seçeneği kaldır",
   "compose_form.poll.switch_to_multiple": "Birden çok seçeneğe izin vermek için anketi değiştir",
   "compose_form.poll.switch_to_single": "Tek bir seçeneğe izin vermek için anketi değiştir",
-  "compose_form.publish": "Gönder",
   "compose_form.publish_form": "Gönder",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Değişiklikleri kaydet",
-  "compose_form.sensitive.hide": "{count, plural, one {Medyayı hassas olarak işaretle} other {Medyayı hassas olarak işaretle}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Medya hassas olarak işaretlendi} other {Medya hassas olarak işaretlendi}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Medya hassas olarak işaretlenmemiş} other {Medya hassas olarak işaretlenmemiş}}",
   "compose_form.spoiler.marked": "Metin uyarının arkasına gizlenir",
   "compose_form.spoiler.unmarked": "Metin gizli değil",
-  "compose_form.spoiler_placeholder": "Uyarınızı buraya yazın",
   "confirmation_modal.cancel": "İptal",
   "confirmations.block.block_and_report": "Engelle ve Bildir",
   "confirmations.block.confirm": "Engelle",
@@ -408,7 +397,6 @@
   "navigation_bar.direct": "Özel değinmeler",
   "navigation_bar.discover": "Keşfet",
   "navigation_bar.domain_blocks": "Engellenen alan adları",
-  "navigation_bar.edit_profile": "Profili düzenle",
   "navigation_bar.explore": "Keşfet",
   "navigation_bar.favourites": "Favorilerin",
   "navigation_bar.filters": "Sessize alınmış kelimeler",
@@ -526,14 +514,7 @@
   "poll_button.add_poll": "Bir anket ekleyin",
   "poll_button.remove_poll": "Anketi kaldır",
   "privacy.change": "Gönderi gizliliğini değiştir",
-  "privacy.direct.long": "Sadece bahsedilen kullanıcılar için görünür",
-  "privacy.direct.short": "Sadece bahsedilen kişiler",
-  "privacy.private.long": "Sadece takipçiler için görünür",
-  "privacy.private.short": "Sadece takipçiler",
-  "privacy.public.long": "Herkese açık",
   "privacy.public.short": "Herkese açık",
-  "privacy.unlisted.long": "Keşfet harici herkese açık",
-  "privacy.unlisted.short": "Listelenmemiş",
   "privacy_policy.last_updated": "Son güncelleme {date}",
   "privacy_policy.title": "Gizlilik Politikası",
   "recommended": "Önerilen",
@@ -715,10 +696,8 @@
   "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.description_missing": "Açıklama eklenmedi",
   "upload_form.edit": "Düzenle",
   "upload_form.thumbnail": "Küçük resmi değiştir",
-  "upload_form.undo": "Sil",
   "upload_form.video_description": "İşitme kaybı veya görme engeli olan kişiler için açıklama ekleyiniz",
   "upload_modal.analyzing_picture": "Resim analiz ediliyor…",
   "upload_modal.apply": "Uygula",
diff --git a/app/javascript/mastodon/locales/tt.json b/app/javascript/mastodon/locales/tt.json
index 47fe60bd252781..17de9884e79675 100644
--- a/app/javascript/mastodon/locales/tt.json
+++ b/app/javascript/mastodon/locales/tt.json
@@ -76,7 +76,6 @@
   "announcement.announcement": "Игълан",
   "attachments_list.unprocessed": "(чимал)",
   "audio.hide": "Аудионы яшерү",
-  "autosuggest_hashtag.per_week": "{count} атнага",
   "boost_modal.combo": "Сез баса аласыз {combo} киләсе тапкыр моны сагыну өчен",
   "bundle_column_error.copy_stacktrace": "Күчереп алу хата турында Отчет",
   "bundle_column_error.error.body": "Соралган бит күрсәтелә алмый. Бу безнең кодтагы хата яки браузерга туры килү проблемасы аркасында булырга мөмкин.",
@@ -128,22 +127,12 @@
   "compose_form.lock_disclaimer": "Сезнең хисап түгел {locked}. Апуәрбер теләгән кеше сезнең язма өчен иярә ала.",
   "compose_form.lock_disclaimer.lock": "бикле",
   "compose_form.placeholder": "What is on your mind?",
-  "compose_form.poll.add_option": "Сайлау өстәгез",
   "compose_form.poll.duration": "Сораштыру озынлыгы",
-  "compose_form.poll.option_placeholder": "Сайлау {number}",
-  "compose_form.poll.remove_option": "бетерү",
   "compose_form.poll.switch_to_multiple": "Берничә вариантны чишү өчен сораштыруны Үзгәртегез",
   "compose_form.poll.switch_to_single": "Бердәнбер сайлау өчен сораштыруны Үзгәртегез",
-  "compose_form.publish": "Бастыру",
   "compose_form.publish_form": "Бастыру",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Үзгәрешләрне саклау",
-  "compose_form.sensitive.hide": "{count, plural, one {Медианы сизгер итеп билгеләгез} other {Медианы сизгер итеп билгеләгез}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Ташучы сизгер дип язылган} other {Ташучы сизгер дип язылган}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Медиа сизгер буларак билгеле түгел} other {Медиа сизгер буларак билгеле түгел}}",
   "compose_form.spoiler.marked": "Text is hidden behind warning",
   "compose_form.spoiler.unmarked": "Text is not hidden",
-  "compose_form.spoiler_placeholder": "Кисәтүегезне монда языгыз",
   "confirmation_modal.cancel": "Баш тарту",
   "confirmations.block.block_and_report": "Блоклау һәм шикаять итү",
   "confirmations.block.confirm": "Блоклау",
@@ -322,7 +311,6 @@
   "navigation_bar.compose": "Compose new toot",
   "navigation_bar.direct": "Хосусый искә алулар",
   "navigation_bar.domain_blocks": "Hidden domains",
-  "navigation_bar.edit_profile": "Профильны үзгәртү",
   "navigation_bar.explore": "Күзәтү",
   "navigation_bar.lists": "Исемлекләр",
   "navigation_bar.logout": "Чыгу",
@@ -376,9 +364,6 @@
   "poll_button.add_poll": "Сораштыруны өстәү",
   "poll_button.remove_poll": "Сораштыруны бетерү",
   "privacy.change": "Adjust status privacy",
-  "privacy.direct.short": "Direct",
-  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Һәркемгә ачык",
   "privacy.public.short": "Һәркемгә ачык",
   "privacy_policy.last_updated": "Соңгы яңарту {date}",
   "privacy_policy.title": "Хосусыйлык Сәясәте",
@@ -478,9 +463,7 @@
   "units.short.thousand": "{count}М",
   "upload_form.audio_description": "Describe for people with hearing loss",
   "upload_form.description": "Describe for the visually impaired",
-  "upload_form.description_missing": "Тасвирлама өстәлмәде",
   "upload_form.edit": "Үзгәртү",
-  "upload_form.undo": "Бетерү",
   "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
   "upload_modal.analyzing_picture": "Рәсемгә анализ ясау…",
   "upload_modal.apply": "Куллан",
diff --git a/app/javascript/mastodon/locales/ug.json b/app/javascript/mastodon/locales/ug.json
index 6bb5ba0ebf95da..9dc3b5c1f985cf 100644
--- a/app/javascript/mastodon/locales/ug.json
+++ b/app/javascript/mastodon/locales/ug.json
@@ -76,8 +76,6 @@
   "onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
   "onboarding.steps.share_profile.title": "Share your profile",
   "privacy.change": "Adjust status privacy",
-  "privacy.direct.short": "Direct",
-  "privacy.private.short": "Followers-only",
   "report.placeholder": "Type or paste additional comments",
   "report.submit": "Submit report",
   "report.target": "Report {target}",
diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json
index 5ec0da599b28a9..38e5f9cfbdfa59 100644
--- a/app/javascript/mastodon/locales/uk.json
+++ b/app/javascript/mastodon/locales/uk.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Оголошення",
   "attachments_list.unprocessed": "(не оброблено)",
   "audio.hide": "Сховати аудіо",
-  "autosuggest_hashtag.per_week": "{count} на тиждень",
   "boost_modal.combo": "Ви можете натиснути {combo}, щоби пропустити це наступного разу",
   "bundle_column_error.copy_stacktrace": "Копіювати звіт про помилку",
   "bundle_column_error.error.body": "Неможливо показати запитану сторінку. Це може бути спричинено помилкою у нашому коді, або через проблему сумісності з браузером.",
@@ -146,22 +145,13 @@
   "compose_form.lock_disclaimer": "Ваш обліковий запис не {locked}. Будь-який користувач може підписатися на вас та переглядати ваші дописи для підписників.",
   "compose_form.lock_disclaimer.lock": "приватний",
   "compose_form.placeholder": "Що у вас на думці?",
-  "compose_form.poll.add_option": "Додати варіант",
+  "compose_form.poll.add_option": "Додати опцію",
   "compose_form.poll.duration": "Тривалість опитування",
-  "compose_form.poll.option_placeholder": "Варіант {number}",
-  "compose_form.poll.remove_option": "Видалити цей варіант",
   "compose_form.poll.switch_to_multiple": "Дозволити вибір декількох відповідей",
   "compose_form.poll.switch_to_single": "Перемкнути у режим вибору однієї відповіді",
-  "compose_form.publish": "Опублікувати",
   "compose_form.publish_form": "Новий допис",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Зберегти зміни",
-  "compose_form.sensitive.hide": "{count, plural, one {Позначити медіа делікатним} other {Позначити медіа делікатними}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Медіа позначене делікатним} other {Медіа позначені делікатними}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Медіа не позначене делікатним} other {Медіа не позначені делікатними}}",
   "compose_form.spoiler.marked": "Прибрати попередження про вміст",
   "compose_form.spoiler.unmarked": "Додати попередження про вміст",
-  "compose_form.spoiler_placeholder": "Напишіть своє попередження тут",
   "confirmation_modal.cancel": "Скасувати",
   "confirmations.block.block_and_report": "Заблокувати та поскаржитися",
   "confirmations.block.confirm": "Заблокувати",
@@ -408,7 +398,6 @@
   "navigation_bar.direct": "Особисті згадки",
   "navigation_bar.discover": "Дослідити",
   "navigation_bar.domain_blocks": "Заблоковані домени",
-  "navigation_bar.edit_profile": "Редагувати профіль",
   "navigation_bar.explore": "Огляд",
   "navigation_bar.favourites": "Уподобане",
   "navigation_bar.filters": "Приховані слова",
@@ -526,14 +515,7 @@
   "poll_button.add_poll": "Додати опитування",
   "poll_button.remove_poll": "Видалити опитування",
   "privacy.change": "Змінити видимість допису",
-  "privacy.direct.long": "Показати тільки згаданим користувачам",
-  "privacy.direct.short": "Лише згадані люди",
-  "privacy.private.long": "Показати тільки підписникам",
-  "privacy.private.short": "Тільки для підписників",
-  "privacy.public.long": "Видимий для всіх",
   "privacy.public.short": "Публічно",
-  "privacy.unlisted.long": "Видимий для всіх, але не через можливості виявлення",
-  "privacy.unlisted.short": "Прихований",
   "privacy_policy.last_updated": "Оновлено {date}",
   "privacy_policy.title": "Політика приватності",
   "recommended": "Рекомендовано",
@@ -715,10 +697,8 @@
   "upload_error.poll": "Не можна завантажувати файли до опитувань.",
   "upload_form.audio_description": "Опишіть для людей із вадами слуху",
   "upload_form.description": "Опишіть для людей з вадами зору",
-  "upload_form.description_missing": "Немає опису",
   "upload_form.edit": "Змінити",
   "upload_form.thumbnail": "Змінити мініатюру",
-  "upload_form.undo": "Видалити",
   "upload_form.video_description": "Опишіть для людей із вадами слуху або зору",
   "upload_modal.analyzing_picture": "Аналізуємо зображення…",
   "upload_modal.apply": "Застосувати",
diff --git a/app/javascript/mastodon/locales/ur.json b/app/javascript/mastodon/locales/ur.json
index 563b2dedf8e32b..fee2cc3a9817e2 100644
--- a/app/javascript/mastodon/locales/ur.json
+++ b/app/javascript/mastodon/locales/ur.json
@@ -72,7 +72,6 @@
   "alert.unexpected.message": "ایک غیر متوقع سہو ہوا ہے.",
   "alert.unexpected.title": "ا رے!",
   "announcement.announcement": "اعلان",
-  "autosuggest_hashtag.per_week": "{count} فی ہفتہ",
   "boost_modal.combo": "آئیندہ یہ نہ دیکھنے کیلئے آپ {combo} دبا سکتے ہیں",
   "bundle_column_error.error.title": "اوف، نہیں!",
   "bundle_column_error.network.title": "نیٹ ورک کی خرابی",
@@ -115,22 +114,12 @@
   "compose_form.lock_disclaimer": "آپ کا اکاؤنٹ {locked} نہیں ہے. کوئی بھی آپ کے مخصوص برائے پیروکار ٹوٹ دیکھنے کی خاطر آپ کی پیروی کر سکتا ہے.",
   "compose_form.lock_disclaimer.lock": "مقفل",
   "compose_form.placeholder": "آپ کیا سوچ رہے ہیں؟",
-  "compose_form.poll.add_option": "انتخاب شامل کریں",
   "compose_form.poll.duration": "مدتِ رائے",
-  "compose_form.poll.option_placeholder": "انتخاب {number}",
-  "compose_form.poll.remove_option": "یہ انتخاب ہٹا دیں",
   "compose_form.poll.switch_to_multiple": "متعدد انتخاب کی اجازت دینے کے لیے پول تبدیل کریں",
   "compose_form.poll.switch_to_single": "کسی ایک انتخاب کے لیے پول تبدیل کریں",
-  "compose_form.publish": "اشاعت کردہ",
   "compose_form.publish_form": "اشاعت کریں",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "تبدیلیاں محفوظ کریں",
-  "compose_form.sensitive.hide": "وسائل کو حساس نشاندہ کریں",
-  "compose_form.sensitive.marked": "وسائل حساس نشاندہ ہے",
-  "compose_form.sensitive.unmarked": "{count, plural, one {میڈیا کو حساس کے طور پر نشان زد نہیں کیا گیا ہے} other {میڈیا کو حساس کے طور پر نشان زد نہیں کیا گیا ہے}}",
   "compose_form.spoiler.marked": "Text is hidden behind warning",
   "compose_form.spoiler.unmarked": "Text is not hidden",
-  "compose_form.spoiler_placeholder": "اپنی وارننگ یہاں لکھیں",
   "confirmation_modal.cancel": "منسوخ",
   "confirmations.block.block_and_report": "شکایت کریں اور بلاک کریں",
   "confirmations.block.confirm": "بلاک",
@@ -242,7 +231,6 @@
   "navigation_bar.compose": "Compose new toot",
   "navigation_bar.discover": "دریافت کریں",
   "navigation_bar.domain_blocks": "Hidden domains",
-  "navigation_bar.edit_profile": "پروفائل میں ترمیم کریں",
   "navigation_bar.filters": "خاموش کردہ الفاظ",
   "navigation_bar.follow_requests": "پیروی کی درخواستیں",
   "navigation_bar.follows_and_followers": "پیروی کردہ اور پیروکار",
@@ -281,10 +269,6 @@
   "onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
   "onboarding.steps.share_profile.title": "Share your profile",
   "privacy.change": "Adjust status privacy",
-  "privacy.direct.long": "Post to mentioned users only",
-  "privacy.direct.short": "Direct",
-  "privacy.private.long": "Post to followers only",
-  "privacy.private.short": "Followers-only",
   "report.placeholder": "Type or paste additional comments",
   "report.submit": "Submit report",
   "report.target": "Report {target}",
diff --git a/app/javascript/mastodon/locales/uz.json b/app/javascript/mastodon/locales/uz.json
index 8eeee42a5e68c2..8f231c8c77ab9e 100644
--- a/app/javascript/mastodon/locales/uz.json
+++ b/app/javascript/mastodon/locales/uz.json
@@ -75,7 +75,6 @@
   "announcement.announcement": "E'lonlar",
   "attachments_list.unprocessed": "(qayta ishlanmagan)",
   "audio.hide": "Audioni yashirish",
-  "autosuggest_hashtag.per_week": "{count} haftasiga",
   "boost_modal.combo": "Keyingi safar buni oʻtkazib yuborish uchun {combo} tugmasini bosishingiz mumkin",
   "bundle_column_error.copy_stacktrace": "Xato hisobotini nusxalash",
   "bundle_column_error.error.body": "Soʻralgan sahifani koʻrsatib boʻlmadi. Buning sababi bizning kodimizdagi xato yoki brauzer mosligi muammosi bo'lishi mumkin.",
@@ -126,22 +125,12 @@
   "compose_form.lock_disclaimer": "Hisobingiz {locked}. Faqat obunachilarga moʻljallangan postlaringizni koʻrish uchun har kim sizni kuzatishi mumkin.",
   "compose_form.lock_disclaimer.lock": "yopilgan",
   "compose_form.placeholder": "Xalolizda nima?",
-  "compose_form.poll.add_option": "Tanlov qo'shing",
   "compose_form.poll.duration": "So‘rov muddati",
-  "compose_form.poll.option_placeholder": "Tanlov {number}",
-  "compose_form.poll.remove_option": "Olib tashlash",
   "compose_form.poll.switch_to_multiple": "Bir nechta tanlovga ruxsat berish uchun so'rovnomani o'zgartirish",
   "compose_form.poll.switch_to_single": "Yagona tanlovga ruxsat berish uchun so‘rovnomani o‘zgartirish",
-  "compose_form.publish": "Nashr qilish",
   "compose_form.publish_form": "Nashr qilish",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "O‘zgarishlarni saqlash",
-  "compose_form.sensitive.hide": "{count, plural, one {Mediani sezgir deb belgilang} other {Medialarni sezgir deb belgilang}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Mediani sezgir deb belgilang} other {Medialarni sezgir deb belgilang}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Mediani sezgir deb belgilang} other {Medialarni sezgir deb belgilang}}",
   "compose_form.spoiler.marked": "Kontent ogohlantirishini olib tashlang",
   "compose_form.spoiler.unmarked": "Kontent haqida ogohlantirish qo'shing",
-  "compose_form.spoiler_placeholder": "Sharhingizni bu erga yozing",
   "confirmation_modal.cancel": "Bekor qilish",
   "confirmations.block.block_and_report": "Bloklash va hisobot berish",
   "confirmations.block.confirm": "Bloklash",
@@ -336,7 +325,6 @@
   "navigation_bar.compose": "Yangi post yozing",
   "navigation_bar.discover": "Kashf qilish",
   "navigation_bar.domain_blocks": "Bloklangan domenlar",
-  "navigation_bar.edit_profile": "Profilni tahrirlash",
   "navigation_bar.explore": "O‘rganish",
   "navigation_bar.filters": "E'tiborga olinmagan so'zlar",
   "navigation_bar.followed_tags": "Kuzatilgan hashtaglar",
@@ -368,8 +356,6 @@
   "onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
   "onboarding.steps.share_profile.title": "Share your profile",
   "privacy.change": "Adjust status privacy",
-  "privacy.direct.short": "Direct",
-  "privacy.private.short": "Followers-only",
   "report.placeholder": "Type or paste additional comments",
   "report.submit": "Submit report",
   "report.target": "Report {target}",
diff --git a/app/javascript/mastodon/locales/vi.json b/app/javascript/mastodon/locales/vi.json
index c623caa3fb6424..73a11b9573673d 100644
--- a/app/javascript/mastodon/locales/vi.json
+++ b/app/javascript/mastodon/locales/vi.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Có gì mới?",
   "attachments_list.unprocessed": "(chưa xử lí)",
   "audio.hide": "Ẩn âm thanh",
-  "autosuggest_hashtag.per_week": "{count} mỗi tuần",
   "boost_modal.combo": "Nhấn {combo} để bỏ qua bước này",
   "bundle_column_error.copy_stacktrace": "Sao chép báo lỗi",
   "bundle_column_error.error.body": "Không thể hiện trang này. Đây có thể là một lỗi trong mã lập trình của chúng tôi, hoặc là vấn đề tương thích của trình duyệt.",
@@ -146,22 +145,12 @@
   "compose_form.lock_disclaimer": "Tài khoản của bạn không {locked}. Bất cứ ai cũng có thể theo dõi và xem tút riêng tư của bạn.",
   "compose_form.lock_disclaimer.lock": "khóa",
   "compose_form.placeholder": "Bạn đang nghĩ gì?",
-  "compose_form.poll.add_option": "Thêm lựa chọn",
   "compose_form.poll.duration": "Hết hạn vào",
-  "compose_form.poll.option_placeholder": "Lựa chọn {number}",
-  "compose_form.poll.remove_option": "Xóa lựa chọn này",
   "compose_form.poll.switch_to_multiple": "Có thể chọn nhiều lựa chọn",
   "compose_form.poll.switch_to_single": "Chỉ cho phép chọn duy nhất một lựa chọn",
-  "compose_form.publish": "Đăng",
   "compose_form.publish_form": "Đăng",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Lưu thay đổi",
-  "compose_form.sensitive.hide": "{count, plural, other {Đánh dấu nội dung nhạy cảm}}",
-  "compose_form.sensitive.marked": "{count, plural, other {Nội dung này nhạy cảm}}",
-  "compose_form.sensitive.unmarked": "{count, plural, other {Nội dung này bình thường}}",
   "compose_form.spoiler.marked": "Hủy nội dung ẩn",
   "compose_form.spoiler.unmarked": "Tạo nội dung ẩn",
-  "compose_form.spoiler_placeholder": "Lời dẫn cho nội dung ẩn",
   "confirmation_modal.cancel": "Hủy bỏ",
   "confirmations.block.block_and_report": "Chặn & Báo cáo",
   "confirmations.block.confirm": "Chặn",
@@ -408,7 +397,6 @@
   "navigation_bar.direct": "Nhắn riêng",
   "navigation_bar.discover": "Khám phá",
   "navigation_bar.domain_blocks": "Máy chủ đã ẩn",
-  "navigation_bar.edit_profile": "Sửa hồ sơ",
   "navigation_bar.explore": "Xu hướng",
   "navigation_bar.favourites": "Lượt thích",
   "navigation_bar.filters": "Bộ lọc từ ngữ",
@@ -526,14 +514,7 @@
   "poll_button.add_poll": "Tạo bình chọn",
   "poll_button.remove_poll": "Hủy cuộc bình chọn",
   "privacy.change": "Chọn kiểu tút",
-  "privacy.direct.long": "Chỉ người được nhắc đến mới thấy",
-  "privacy.direct.short": "Nhắn riêng",
-  "privacy.private.long": "Dành riêng cho người theo dõi",
-  "privacy.private.short": "Chỉ người theo dõi",
-  "privacy.public.long": "Hiển thị với mọi người",
   "privacy.public.short": "Công khai",
-  "privacy.unlisted.long": "Công khai nhưng ẩn trên bảng tin",
-  "privacy.unlisted.short": "Hạn chế",
   "privacy_policy.last_updated": "Cập nhật lần cuối {date}",
   "privacy_policy.title": "Chính sách bảo mật",
   "recommended": "Đề xuất",
@@ -715,10 +696,8 @@
   "upload_error.poll": "Không cho phép đính kèm tập tin.",
   "upload_form.audio_description": "Mô tả cho người mất thính giác",
   "upload_form.description": "Mô tả cho người khiếm thị",
-  "upload_form.description_missing": "Chưa thêm mô tả",
   "upload_form.edit": "Biên tập",
   "upload_form.thumbnail": "Đổi ảnh thumbnail",
-  "upload_form.undo": "Xóa bỏ",
   "upload_form.video_description": "Mô tả cho người mất thị lực hoặc không thể nghe",
   "upload_modal.analyzing_picture": "Phân tích hình ảnh",
   "upload_modal.apply": "Áp dụng",
diff --git a/app/javascript/mastodon/locales/zgh.json b/app/javascript/mastodon/locales/zgh.json
index 008a9636db42b4..a585838cd22af9 100644
--- a/app/javascript/mastodon/locales/zgh.json
+++ b/app/javascript/mastodon/locales/zgh.json
@@ -22,7 +22,6 @@
   "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
   "account.unfollow": "ⴽⴽⵙ ⴰⴹⴼⴼⵓⵕ",
   "account_note.placeholder": "Click to add a note",
-  "autosuggest_hashtag.per_week": "{count} ⵙ ⵉⵎⴰⵍⴰⵙⵙ",
   "bundle_column_error.retry": "ⴰⵍⵙ ⴰⵔⵎ",
   "bundle_modal_error.close": "ⵔⴳⵍ",
   "bundle_modal_error.retry": "ⴰⵍⵙ ⴰⵔⵎ",
@@ -44,9 +43,7 @@
   "compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.",
   "compose_form.lock_disclaimer.lock": "ⵉⵜⵜⵓⵔⴳⵍ",
   "compose_form.placeholder": "ⵎⴰⵢⴷ ⵉⵍⵍⴰⵏ ⴳ ⵉⵅⴼ ⵏⵏⴽ?",
-  "compose_form.poll.option_placeholder": "ⴰⵙⵜⵜⴰⵢ {number}",
   "compose_form.publish_form": "Publish",
-  "compose_form.publish_loud": "{publish}!",
   "compose_form.spoiler.marked": "Text is hidden behind warning",
   "compose_form.spoiler.unmarked": "Text is not hidden",
   "confirmation_modal.cancel": "ⵙⵔ",
@@ -129,7 +126,6 @@
   "media_gallery.toggle_visible": "ⴼⴼⵔ {number, plural, one {ⵜⴰⵡⵍⴰⴼⵜ} other {ⵜⵉⵡⵍⴰⴼⵉⵏ}}",
   "navigation_bar.compose": "Compose new toot",
   "navigation_bar.domain_blocks": "Hidden domains",
-  "navigation_bar.edit_profile": "ⵙⵏⴼⵍ ⵉⴼⵔⵙ",
   "navigation_bar.follow_requests": "ⵜⵓⵜⵔⴰⵡⵉⵏ ⵏ ⵓⴹⴼⴰⵕ",
   "navigation_bar.lists": "ⵜⵉⵍⴳⴰⵎⵉⵏ",
   "navigation_bar.logout": "ⴼⴼⵖ",
@@ -161,8 +157,6 @@
   "poll_button.add_poll": "ⵔⵏⵓ ⵢⴰⵏ ⵢⵉⴷⵣ",
   "poll_button.remove_poll": "ⵙⵙⵉⵜⵢ ⵉⴷⵣ",
   "privacy.change": "Adjust status privacy",
-  "privacy.direct.short": "Direct",
-  "privacy.private.short": "Followers-only",
   "privacy.public.short": "ⵜⴰⴳⴷⵓⴷⴰⵏⵜ",
   "regeneration_indicator.label": "ⴰⵣⴷⴰⵎ…",
   "relative_time.days": "{number}ⴰⵙ",
@@ -211,7 +205,6 @@
   "upload_form.audio_description": "Describe for people with hearing loss",
   "upload_form.description": "Describe for the visually impaired",
   "upload_form.edit": "ⵙⵏⴼⵍ",
-  "upload_form.undo": "ⴽⴽⵙ",
   "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
   "upload_modal.choose_image": "ⴷⵖⵔ ⵜⴰⵡⵍⴰⴼⵜ",
   "upload_progress.label": "Uploading…",
diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json
index 720e4331b3afa2..9b55e51b1f9b6f 100644
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "公告",
   "attachments_list.unprocessed": "(未处理)",
   "audio.hide": "隐藏音频",
-  "autosuggest_hashtag.per_week": "每星期 {count} 条",
   "boost_modal.combo": "下次按住 {combo} 即可跳过此提示",
   "bundle_column_error.copy_stacktrace": "复制错误报告",
   "bundle_column_error.error.body": "请求的页面无法渲染，可能是代码出现错误或浏览器存在兼容性问题。",
@@ -148,20 +147,20 @@
   "compose_form.placeholder": "想写什么？",
   "compose_form.poll.add_option": "添加选项",
   "compose_form.poll.duration": "投票期限",
+  "compose_form.poll.multiple": "多选",
   "compose_form.poll.option_placeholder": "选项 {number}",
-  "compose_form.poll.remove_option": "移除此选项",
+  "compose_form.poll.remove_option": "删除此选项",
+  "compose_form.poll.single": "单选",
   "compose_form.poll.switch_to_multiple": "将投票改为多选",
   "compose_form.poll.switch_to_single": "将投票改为单选",
+  "compose_form.poll.type": "样式",
   "compose_form.publish": "发布",
   "compose_form.publish_form": "发布",
-  "compose_form.publish_loud": "{publish}！",
-  "compose_form.save_changes": "保存更改",
-  "compose_form.sensitive.hide": "标记媒体为敏感内容",
-  "compose_form.sensitive.marked": "媒体已被标记为敏感内容",
-  "compose_form.sensitive.unmarked": "媒体未被标记为敏感内容",
+  "compose_form.reply": "回复",
+  "compose_form.save_changes": "更新",
   "compose_form.spoiler.marked": "移除内容警告",
   "compose_form.spoiler.unmarked": "添加内容警告",
-  "compose_form.spoiler_placeholder": "写下你的警告",
+  "compose_form.spoiler_placeholder": "内容警告 (可选)",
   "confirmation_modal.cancel": "取消",
   "confirmations.block.block_and_report": "屏蔽与举报",
   "confirmations.block.confirm": "屏蔽",
@@ -408,7 +407,6 @@
   "navigation_bar.direct": "私下提及",
   "navigation_bar.discover": "发现",
   "navigation_bar.domain_blocks": "已屏蔽的域名",
-  "navigation_bar.edit_profile": "修改个人资料",
   "navigation_bar.explore": "探索",
   "navigation_bar.favourites": "喜欢",
   "navigation_bar.filters": "忽略的关键词",
@@ -526,14 +524,15 @@
   "poll_button.add_poll": "发起投票",
   "poll_button.remove_poll": "移除投票",
   "privacy.change": "设置嘟文的可见范围",
-  "privacy.direct.long": "只有被提及的用户能看到",
-  "privacy.direct.short": "仅提到的人",
-  "privacy.private.long": "仅对关注者可见",
-  "privacy.private.short": "仅关注者可见",
-  "privacy.public.long": "所有人可见",
+  "privacy.direct.long": "帖子中提到的每个人",
+  "privacy.direct.short": "具体的人",
+  "privacy.private.long": "仅限您的关注者",
+  "privacy.private.short": "关注者",
+  "privacy.public.long": "所有Mastodon内外的人",
   "privacy.public.short": "公开",
-  "privacy.unlisted.long": "所有人可见，但不在探索功能出现",
-  "privacy.unlisted.short": "不公开",
+  "privacy.unlisted.additional": "该模式的行为与“公开”完全相同，只是帖子不会出现在实时动态、话题标签、探索或 Mastodon 搜索中，即使你已在账户级设置中选择加入。",
+  "privacy.unlisted.long": "减少算法影响",
+  "privacy.unlisted.short": "悄悄公开",
   "privacy_policy.last_updated": "最近更新于 {date}",
   "privacy_policy.title": "隐私政策",
   "recommended": "推荐",
@@ -551,7 +550,9 @@
   "relative_time.minutes": "{number} 分钟前",
   "relative_time.seconds": "{number} 秒前",
   "relative_time.today": "今天",
+  "reply_indicator.attachments": "{count, plural, other {# 个附件}}",
   "reply_indicator.cancel": "取消",
+  "reply_indicator.poll": "投票",
   "report.block": "屏蔽",
   "report.block_explanation": "你将无法看到他们的嘟文。他们也将无法看到你的嘟文或关注你。他们将能够判断出他们被屏蔽了。",
   "report.categories.legal": "法律义务",
@@ -715,10 +716,8 @@
   "upload_error.poll": "投票中不允许上传文件。",
   "upload_form.audio_description": "为听障人士添加文字描述",
   "upload_form.description": "为视觉障碍人士添加文字说明",
-  "upload_form.description_missing": "未添加描述",
   "upload_form.edit": "编辑",
   "upload_form.thumbnail": "更改缩略图",
-  "upload_form.undo": "删除",
   "upload_form.video_description": "为听障人士和视障人士添加文字描述",
   "upload_modal.analyzing_picture": "分析图片…",
   "upload_modal.apply": "应用",
diff --git a/app/javascript/mastodon/locales/zh-HK.json b/app/javascript/mastodon/locales/zh-HK.json
index cd0845b6e2e309..5890c4df4b5120 100644
--- a/app/javascript/mastodon/locales/zh-HK.json
+++ b/app/javascript/mastodon/locales/zh-HK.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "公告",
   "attachments_list.unprocessed": "（未處理）",
   "audio.hide": "隱藏音訊",
-  "autosuggest_hashtag.per_week": "每週 {count} 次",
   "boost_modal.combo": "你下次可以按 {combo} 來跳過",
   "bundle_column_error.copy_stacktrace": "複製錯誤報告",
   "bundle_column_error.error.body": "無法提供請求的頁面。這可能是因為代碼出現錯誤或瀏覽器出現兼容問題。",
@@ -146,22 +145,22 @@
   "compose_form.lock_disclaimer": "你的用戶狀態沒有{locked}，任何人都能立即關注你，然後看到「只有關注者能看」的文章。",
   "compose_form.lock_disclaimer.lock": "鎖定",
   "compose_form.placeholder": "你在想甚麼？",
-  "compose_form.poll.add_option": "新增選擇",
+  "compose_form.poll.add_option": "新增選項",
   "compose_form.poll.duration": "投票期限",
-  "compose_form.poll.option_placeholder": "第 {number} 個選擇",
-  "compose_form.poll.remove_option": "移除此選擇",
+  "compose_form.poll.multiple": "多選",
+  "compose_form.poll.option_placeholder": "選項 {number}",
+  "compose_form.poll.remove_option": "移除此選項",
+  "compose_form.poll.single": "選擇一個",
   "compose_form.poll.switch_to_multiple": "變更投票為允許多個選項",
   "compose_form.poll.switch_to_single": "變更投票為限定單一選項",
+  "compose_form.poll.type": "風格",
   "compose_form.publish": "發佈",
   "compose_form.publish_form": "發佈",
-  "compose_form.publish_loud": "{publish}！",
-  "compose_form.save_changes": "儲存變更",
-  "compose_form.sensitive.hide": "標記媒體為敏感內容",
-  "compose_form.sensitive.marked": "媒體被標示為敏感",
-  "compose_form.sensitive.unmarked": "媒體沒有被標示為敏感",
+  "compose_form.reply": "回覆",
+  "compose_form.save_changes": "更新",
   "compose_form.spoiler.marked": "文字被警告隱藏",
   "compose_form.spoiler.unmarked": "文字沒有被隱藏",
-  "compose_form.spoiler_placeholder": "敏感警告訊息",
+  "compose_form.spoiler_placeholder": "內容警告 (選用)",
   "confirmation_modal.cancel": "取消",
   "confirmations.block.block_and_report": "封鎖並檢舉",
   "confirmations.block.confirm": "封鎖",
@@ -408,7 +407,6 @@
   "navigation_bar.direct": "私人提及",
   "navigation_bar.discover": "探索",
   "navigation_bar.domain_blocks": "封鎖的服務站",
-  "navigation_bar.edit_profile": "修改個人資料",
   "navigation_bar.explore": "探索",
   "navigation_bar.favourites": "最愛",
   "navigation_bar.filters": "靜音詞彙",
@@ -526,14 +524,15 @@
   "poll_button.add_poll": "建立投票",
   "poll_button.remove_poll": "移除投票",
   "privacy.change": "調整私隱設定",
-  "privacy.direct.long": "只有提及的使用者能看到",
-  "privacy.direct.short": "僅限提及的人",
-  "privacy.private.long": "只有你的關注者能看到",
-  "privacy.private.short": "僅限追隨者",
-  "privacy.public.long": "對所有人可見",
+  "privacy.direct.long": "帖文提及的人",
+  "privacy.direct.short": "特定的人",
+  "privacy.private.long": "只有你的追蹤者",
+  "privacy.private.short": "追蹤者",
+  "privacy.public.long": "Mastodon 內外的任何人",
   "privacy.public.short": "公共",
-  "privacy.unlisted.long": "對所有人可見，但不包括探索功能",
-  "privacy.unlisted.short": "公開",
+  "privacy.unlisted.additional": "這與公開完全相同，但是你的帖文不會顯示在即時動態、標籤、探索和 Mastodon 的搜尋結果中，即使你的帳戶啟用了相關設定也好。",
+  "privacy.unlisted.long": "較少用演算法宣傳",
+  "privacy.unlisted.short": "半公開",
   "privacy_policy.last_updated": "最後更新 {date}",
   "privacy_policy.title": "私隱政策",
   "recommended": "推薦",
@@ -551,7 +550,9 @@
   "relative_time.minutes": "{number}分鐘前",
   "relative_time.seconds": "{number}秒前",
   "relative_time.today": "今天",
+  "reply_indicator.attachments": "{count, plural, one {# 附件} other {# 附件}}",
   "reply_indicator.cancel": "取消",
+  "reply_indicator.poll": "投票",
   "report.block": "封鎖",
   "report.block_explanation": "你將不會看到他們的帖文。他們將無法看到你的帖文或追隨你。他們將發現自己被封鎖了。",
   "report.categories.legal": "法律",
@@ -715,10 +716,8 @@
   "upload_error.poll": "不允許在投票上傳檔案。",
   "upload_form.audio_description": "簡單描述內容給聽障人士",
   "upload_form.description": "為視覺障礙人士添加文字說明",
-  "upload_form.description_missing": "沒有加入描述",
   "upload_form.edit": "編輯",
   "upload_form.thumbnail": "更改預覽圖",
-  "upload_form.undo": "刪除",
   "upload_form.video_description": "簡單描述給聽障或視障人士",
   "upload_modal.analyzing_picture": "正在分析圖片…",
   "upload_modal.apply": "套用",
diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json
index cc8b5831202927..c365e67e070d6d 100644
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "公告",
   "attachments_list.unprocessed": "（未經處理）",
   "audio.hide": "隱藏音訊",
-  "autosuggest_hashtag.per_week": "{count} / 週",
   "boost_modal.combo": "下次您可以按 {combo} 跳過",
   "bundle_column_error.copy_stacktrace": "複製錯誤報告",
   "bundle_column_error.error.body": "無法繪製請求的頁面。這可能是因為我們程式碼中的臭蟲或是瀏覽器的相容問題。",
@@ -148,20 +147,20 @@
   "compose_form.placeholder": "正在想些什麼嗎？",
   "compose_form.poll.add_option": "新增選項",
   "compose_form.poll.duration": "投票期限",
-  "compose_form.poll.option_placeholder": "第 {number} 個選項",
+  "compose_form.poll.multiple": "多選",
+  "compose_form.poll.option_placeholder": "選項 {number}",
   "compose_form.poll.remove_option": "移除此選項",
+  "compose_form.poll.single": "選擇一個",
   "compose_form.poll.switch_to_multiple": "變更投票為允許多個選項",
   "compose_form.poll.switch_to_single": "變更投票為允許單一選項",
-  "compose_form.publish": "嘟出去",
+  "compose_form.poll.type": "投票方式",
+  "compose_form.publish": "發嘟",
   "compose_form.publish_form": "嘟出去",
-  "compose_form.publish_loud": "{publish}！",
-  "compose_form.save_changes": "儲存變更",
-  "compose_form.sensitive.hide": "{count, plural, other {將媒體標記為敏感內容}}",
-  "compose_form.sensitive.marked": "此媒體被標記為敏感內容",
-  "compose_form.sensitive.unmarked": "此媒體未被標記為敏感內容",
+  "compose_form.reply": "回覆",
+  "compose_form.save_changes": "更新",
   "compose_form.spoiler.marked": "移除內容警告",
   "compose_form.spoiler.unmarked": "新增內容警告",
-  "compose_form.spoiler_placeholder": "請於此處填寫內容警告訊息",
+  "compose_form.spoiler_placeholder": "內容警告 (可選的)",
   "confirmation_modal.cancel": "取消",
   "confirmations.block.block_and_report": "封鎖並檢舉",
   "confirmations.block.confirm": "封鎖",
@@ -408,7 +407,6 @@
   "navigation_bar.direct": "私訊",
   "navigation_bar.discover": "探索",
   "navigation_bar.domain_blocks": "已封鎖網域",
-  "navigation_bar.edit_profile": "編輯個人檔案",
   "navigation_bar.explore": "探索",
   "navigation_bar.favourites": "最愛",
   "navigation_bar.filters": "已靜音的關鍵字",
@@ -526,13 +524,14 @@
   "poll_button.add_poll": "建立投票",
   "poll_button.remove_poll": "移除投票",
   "privacy.change": "調整嘟文隱私狀態",
-  "privacy.direct.long": "只有被提及的使用者能看到",
-  "privacy.direct.short": "僅限提及者",
-  "privacy.private.long": "只有跟隨您的使用者能看到",
-  "privacy.private.short": "僅限跟隨者",
-  "privacy.public.long": "對所有人可見",
+  "privacy.direct.long": "此嘟文提及之所有人",
+  "privacy.direct.short": "指定使用者",
+  "privacy.private.long": "只有跟隨您的人能看到",
+  "privacy.private.short": "跟隨者",
+  "privacy.public.long": "所有人 (無論在 Mastodon 上與否)",
   "privacy.public.short": "公開",
-  "privacy.unlisted.long": "對所有人可見，但選擇退出探索功能",
+  "privacy.unlisted.additional": "此與公開嘟文完全相同，但嘟文不會出現於即時內容或主題標籤、探索、及 Mastodon 搜尋中，即使您在帳戶設定中選擇加入。",
+  "privacy.unlisted.long": "悄然無聲",
   "privacy.unlisted.short": "不公開",
   "privacy_policy.last_updated": "最後更新：{date}",
   "privacy_policy.title": "隱私權政策",
@@ -551,7 +550,9 @@
   "relative_time.minutes": "{number} 分鐘前",
   "relative_time.seconds": "{number} 秒",
   "relative_time.today": "今天",
+  "reply_indicator.attachments": "{count, plural, other {# 個附加檔案}}",
   "reply_indicator.cancel": "取消",
+  "reply_indicator.poll": "投票",
   "report.block": "封鎖",
   "report.block_explanation": "您將不再看到他們的嘟文。他們將無法看到您的嘟文或是跟隨您。他們會發現他們已被封鎖。",
   "report.categories.legal": "合法性",
@@ -715,10 +716,8 @@
   "upload_error.poll": "不允許於投票時上傳檔案。",
   "upload_form.audio_description": "為聽障人士增加文字說明",
   "upload_form.description": "為視障人士增加文字說明",
-  "upload_form.description_missing": "沒有任何描述",
   "upload_form.edit": "編輯",
   "upload_form.thumbnail": "更改預覽圖",
-  "upload_form.undo": "刪除",
   "upload_form.video_description": "為聽障或視障人士增加文字說明",
   "upload_modal.analyzing_picture": "正在分析圖片…",
   "upload_modal.apply": "套用",
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index b9a313544872b6..9c8456a05fb305 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -1546,6 +1546,9 @@ bg:
     errors:
       limit_reached: Ограничението на различни реакции е достигнат
       unrecognized_emoji: не е разпознато емоджи
+  redirects:
+    prompt: Ако вярвате на тази връзка, то щракнете на нея, за да продължите.
+    title: Напускате %{instance}.
   relationships:
     activity: Дейност на акаунта
     confirm_follow_selected_followers: Наистина ли искате да последвате избраните последователи?
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index 44688577a9e94a..444d0e2c5fb8b4 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -1646,7 +1646,7 @@ eu:
     back: Itzuli Mastodon-era
     delete: Kontuaren ezabaketa
     development: Garapena
-    edit_profile: Aldatu profila
+    edit_profile: Editatu profila
     export: Datuen esportazioa
     featured_tags: Nabarmendutako traolak
     import: Inportazioa
@@ -1860,9 +1860,9 @@ eu:
     seamless_external_login: Kanpo zerbitzu baten bidez hasi duzu saioa, beraz pasahitza eta e-mail ezarpenak ez daude eskuragarri.
     signed_in_as: 'Saioa honela hasita:'
   verification:
-    extra_instructions_html: <strong>Aholkua:</strong> webguneko esteka ikusezina izan daiteke. Muina <code>rel="me"</code> da, erabiltzaileak sortutako edukia duten webguneetan beste inor zure burutzat aurkeztea eragozten duena. <code>a</code> beharrean <code>esteka</code>-etiketa bat ere erabil dezakezu orrialdearen goiburuan, baina HTMLak eskuragarri egon behar du JavaScript exekutatu gabe.
+    extra_instructions_html: <strong>Aholkua:</strong> webguneko esteka ikusezina izan daiteke. Muina <code>rel="me"</code> da, erabiltzaileak sortutako edukia duten webguneetan beste inor zure burutzat aurkeztea eragozten duena. <code>a</code> beharrean <code>esteka</code> motako etiketa bat ere erabil dezakezu orriaren goiburuan, baina HTMLak erabilgarri egon behar du JavaScript exekutatu gabe.
     here_is_how: Hemen duzu nola
-    hint_html: "<strong>Mastodonen nortasun-egiaztapena guztiontzat da.</strong> Web estandar irekietan oinarritua, orain eta betiko doan. Behar duzun guztia jendeak ezagutzen duen webgune pertsonal bat da. Mastodon profiletik webgune honetara estekatzen duzunean, webguneak mastodon profilera estekatzen duela egiaztatuko dugu eta adierazle bat erakutsiko du."
+    hint_html: "<strong>Mastodonen nortasun-egiaztapena guztiontzat da.</strong> Web estandar irekietan oinarritua, orain eta betiko doan. Behar duzun guztia jendeak ezagutzen duen webgune pertsonal bat da. Mastodon profiletik webgune honetara estekatzen duzunean, webguneak Mastodon profilera estekatzen duela egiaztatuko dugu eta adierazle bat erakutsiko du."
     instructions_html: Kopiatu eta itsatsi ondoko kodea zure webguneko HTMLan. Ondoren, gehitu zure webgunearen helbidea zure profileko eremu gehigarrietako batean, "Editatu profila" fitxatik eta gorde aldaketak.
     verification: Egiaztaketa
     verified_links: Zure lotura egiaztatuak
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 0514772c1dcc3d..bb3368dd9e54e1 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -406,6 +406,7 @@ fa:
           silence: محدود
           suspend: تعلیق
         title: مسدودسازی دامین تازه
+      no_domain_block_selected: هیچ انسداد دامنه‌ای تغییر نکرد زیرا هیچ‌کدامشان انتخاب نشده بودند
       not_permitted: شما مجاز به انجام این عملیات نیستید
       obfuscate: مبهم‌سازی نام دامنهٔ
       obfuscate_hint: در صورت به کار افتاده بودن اعلام فهرست محدودیت‌های دامنه، نام دامنه در فهرست را به صورت جزیی مبهم می‌کند
diff --git a/config/locales/hi.yml b/config/locales/hi.yml
index 9b505e5f92fbc0..b67de192f2563e 100644
--- a/config/locales/hi.yml
+++ b/config/locales/hi.yml
@@ -38,6 +38,9 @@ hi:
       upload_check_privacy_error_object_storage:
         action: अधिक जानकारी हेतु यहां क्लिक करें।
         message_html: "<strong> आपके वेब सर्वर का कन्फिगरेशन सही नहीं है। उपयोगकर्ताओं की निजता खतरे में है। </strong>"
+  redirects:
+    prompt: अगर आपको इस लिंक पर भरोसा है तो आगे बढ़ने के लिए इसे क्लिक करें
+    title: आप इस %{instance} को छोड़ने वाले हैं
   relationships:
     follow_failure: चुने हुए अकाउंट्स में से कुछ को फ़ॉलो नहीं किया जा सकता
   sessions:
@@ -50,3 +53,9 @@ hi:
   time:
     formats:
       with_time_zone: "%b %d, %Y, %H:%M %Z"
+  user_mailer:
+    failed_2fa:
+      details: 'आपके साइन इन प्रयासों के डिटेल ये रहे:'
+      explanation: किसी ने आपके अकाउंट पर साइन इन करने का प्रयास किया लेकिन दूसरा प्रमाणीकरण विकल्प गलत दिया।
+      further_actions_html: अगर ये आप नहीं थे, तो हम अनुरोध करते हैं कि आप तुरंत %{action} लें क्योंकि ये शायद खतरे में है।
+      subject: दूसरा फैक्टर सत्यापन नाकाम रहा
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 8cbbb64c97f59e..545da69d9cb201 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -1547,7 +1547,8 @@ hu:
       limit_reached: A különböző reakciók száma elérte a határértéket
       unrecognized_emoji: nem ismert emodzsi
   redirects:
-    prompt: Ha megbízunk ebben a hivatkozásban, kattintsunk rá a folytatáshoz.
+    prompt: Ha megbízol ebben a hivatkozásban, kattints rá a folytatáshoz.
+    title: Épp elhagyni készülöd a %{instance} kiszolgálót.
   relationships:
     activity: Fiók aktivitás
     confirm_follow_selected_followers: Biztos, hogy követni akarod a kiválasztott követőket?
diff --git a/config/locales/ie.yml b/config/locales/ie.yml
index c77a8f802d68c7..a8287da5338735 100644
--- a/config/locales/ie.yml
+++ b/config/locales/ie.yml
@@ -1546,6 +1546,9 @@ ie:
     errors:
       limit_reached: Límite de diferent reactiones atinget
       unrecognized_emoji: ne es un reconosset emoji
+  redirects:
+    prompt: Si tu fide ti ligament, clicca it por continuar.
+    title: Tu exea de %{instance}.
   relationships:
     activity: Activitá de conto
     confirm_follow_selected_followers: Esque tu vermen vole sequer selectet sequitores?
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 2051e30aeeaeff..6880f64c5e691d 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -1520,6 +1520,9 @@ ja:
     errors:
       limit_reached: リアクションの種類が上限に達しました
       unrecognized_emoji: は絵文字として認識されていません
+  redirects:
+    prompt: リンク先を確かめ、信用できる場合のみリンクをクリックしてください。
+    title: "%{instance} から別のサーバーに移動します。"
   relationships:
     activity: 活動
     confirm_follow_selected_followers: 選択したフォロワーをフォローしてもよろしいですか？
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 72e63e47d3aa9c..7fe60541e6bd48 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -1449,7 +1449,7 @@ zh-TW:
       title: 新的跟隨請求
     mention:
       action: 回覆
-      body: "%{name} 於嘟文中提及您:"
+      body: "%{name} 於嘟文中提及您："
       subject: "%{name} 於嘟文中提及您"
       title: 新的提及
     poll:

From 805dba7f8d2a2d5f910ec1396247b36417170345 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 26 Jan 2024 15:09:45 +0100
Subject: [PATCH 0005/2191] Change compose form to use server-provided post
 character limit (#28928)

---
 .../features/compose/components/compose_form.jsx         | 9 +++++----
 .../compose/containers/compose_form_container.js         | 1 +
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/javascript/mastodon/features/compose/components/compose_form.jsx b/app/javascript/mastodon/features/compose/components/compose_form.jsx
index c5ee894683366d..b93bac9d19bce9 100644
--- a/app/javascript/mastodon/features/compose/components/compose_form.jsx
+++ b/app/javascript/mastodon/features/compose/components/compose_form.jsx
@@ -70,6 +70,7 @@ class ComposeForm extends ImmutablePureComponent {
     isInReply: PropTypes.bool,
     singleColumn: PropTypes.bool,
     lang: PropTypes.string,
+    maxChars: PropTypes.number,
     ...WithOptionalRouterPropTypes
   };
 
@@ -101,11 +102,11 @@ class ComposeForm extends ImmutablePureComponent {
   };
 
   canSubmit = () => {
-    const { isSubmitting, isChangingUpload, isUploading, anyMedia } = this.props;
+    const { isSubmitting, isChangingUpload, isUploading, anyMedia, maxChars } = this.props;
     const fulltext = this.getFulltextForCharacterCounting();
     const isOnlyWhitespace = fulltext.length !== 0 && fulltext.trim().length === 0;
 
-    return !(isSubmitting || isUploading || isChangingUpload || length(fulltext) > 500 || (isOnlyWhitespace && !anyMedia));
+    return !(isSubmitting || isUploading || isChangingUpload || length(fulltext) > maxChars || (isOnlyWhitespace && !anyMedia));
   };
 
   handleSubmit = (e) => {
@@ -224,7 +225,7 @@ class ComposeForm extends ImmutablePureComponent {
   };
 
   render () {
-    const { intl, onPaste, autoFocus, withoutNavigation } = this.props;
+    const { intl, onPaste, autoFocus, withoutNavigation, maxChars } = this.props;
     const { highlighted } = this.state;
     const disabled = this.props.isSubmitting;
 
@@ -297,7 +298,7 @@ class ComposeForm extends ImmutablePureComponent {
                 <PollButtonContainer />
                 <SpoilerButtonContainer />
                 <EmojiPickerDropdown onPickEmoji={this.handleEmojiPick} />
-                <CharacterCounter max={500} text={this.getFulltextForCharacterCounting()} />
+                <CharacterCounter max={maxChars} text={this.getFulltextForCharacterCounting()} />
               </div>
 
               <div className='compose-form__submit'>
diff --git a/app/javascript/mastodon/features/compose/containers/compose_form_container.js b/app/javascript/mastodon/features/compose/containers/compose_form_container.js
index ba20698bac8c5c..b5e5300334dcbc 100644
--- a/app/javascript/mastodon/features/compose/containers/compose_form_container.js
+++ b/app/javascript/mastodon/features/compose/containers/compose_form_container.js
@@ -28,6 +28,7 @@ const mapStateToProps = state => ({
   anyMedia: state.getIn(['compose', 'media_attachments']).size > 0,
   isInReply: state.getIn(['compose', 'in_reply_to']) !== null,
   lang: state.getIn(['compose', 'language']),
+  maxChars: state.getIn(['server', 'server', 'configuration', 'statuses', 'max_characters'], 500),
 });
 
 const mapDispatchToProps = (dispatch) => ({

From 9cc1817bb493799b89d1171a1d632abb9791340c Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 26 Jan 2024 09:10:26 -0500
Subject: [PATCH 0006/2191] Fix intmermittent failure in
 `api/v1/accounts/statuses` controller spec (#28931)

---
 .../api/v1/accounts/statuses_controller_spec.rb     | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/spec/controllers/api/v1/accounts/statuses_controller_spec.rb b/spec/controllers/api/v1/accounts/statuses_controller_spec.rb
index df71e94ace71e2..9bf385c03dc1eb 100644
--- a/spec/controllers/api/v1/accounts/statuses_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/statuses_controller_spec.rb
@@ -39,11 +39,14 @@
       end
 
       it 'returns posts along with self replies', :aggregate_failures do
-        json = body_as_json
-        post_ids = json.map { |item| item[:id].to_i }.sort
-
-        expect(response).to have_http_status(200)
-        expect(post_ids).to eq [status.id, status_self_reply.id]
+        expect(response)
+          .to have_http_status(200)
+        expect(body_as_json)
+          .to have_attributes(size: 2)
+          .and contain_exactly(
+            include(id: status.id.to_s),
+            include(id: status_self_reply.id.to_s)
+          )
       end
     end
 

From 2f8656334d341839bc471d1850850d80f920f01c Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 26 Jan 2024 11:21:31 -0500
Subject: [PATCH 0007/2191] Combine double subjects in `admin/accounts`
 controller spec (#28936)

---
 .../admin/accounts_controller_spec.rb           | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/spec/controllers/admin/accounts_controller_spec.rb b/spec/controllers/admin/accounts_controller_spec.rb
index 1882ea83883898..ef3053b6b35776 100644
--- a/spec/controllers/admin/accounts_controller_spec.rb
+++ b/spec/controllers/admin/accounts_controller_spec.rb
@@ -153,13 +153,9 @@
     context 'when user is admin' do
       let(:role) { UserRole.find_by(name: 'Admin') }
 
-      it 'succeeds in approving account' do
+      it 'succeeds in approving account and logs action' do
         expect(subject).to redirect_to admin_accounts_path(status: 'pending')
         expect(user.reload).to be_approved
-      end
-
-      it 'logs action' do
-        expect(subject).to have_http_status 302
 
         expect(latest_admin_action_log)
           .to be_present
@@ -195,12 +191,8 @@
     context 'when user is admin' do
       let(:role) { UserRole.find_by(name: 'Admin') }
 
-      it 'succeeds in rejecting account' do
+      it 'succeeds in rejecting account and logs action' do
         expect(subject).to redirect_to admin_accounts_path(status: 'pending')
-      end
-
-      it 'logs action' do
-        expect(subject).to have_http_status 302
 
         expect(latest_admin_action_log)
           .to be_present
@@ -286,12 +278,9 @@
     context 'when user is admin' do
       let(:role) { UserRole.find_by(name: 'Admin') }
 
-      it 'succeeds in removing email blocks' do
+      it 'succeeds in removing email blocks and redirects to admin account path' do
         expect { subject }.to change { CanonicalEmailBlock.where(reference_account: account).count }.from(1).to(0)
-      end
 
-      it 'redirects to admin account path' do
-        subject
         expect(response).to redirect_to admin_account_path(account.id)
       end
     end

From 6d35a77c9226881c1d554566aca120e330004df1 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 26 Jan 2024 11:22:44 -0500
Subject: [PATCH 0008/2191] Combine repeated subjects in `models/user` spec
 (#28937)

---
 spec/models/user_spec.rb | 30 ++++++------------------------
 1 file changed, 6 insertions(+), 24 deletions(-)

diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 213022e8301b95..5ac41c0ff1dd94 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -187,12 +187,9 @@
     context 'when the user is already confirmed' do
       let!(:user) { Fabricate(:user, confirmed_at: Time.now.utc, approved: true, unconfirmed_email: new_email) }
 
-      it 'sets email to unconfirmed_email' do
+      it 'sets email to unconfirmed_email and does not trigger web hook' do
         expect { subject }.to change { user.reload.email }.to(new_email)
-      end
 
-      it 'does not trigger the account.approved Web Hook' do
-        subject
         expect(TriggerWebhookWorker).to_not have_received(:perform_async).with('account.approved', 'Account', user.account_id)
       end
     end
@@ -206,12 +203,9 @@
           user.approve!
         end
 
-        it 'sets email to unconfirmed_email' do
+        it 'sets email to unconfirmed_email and triggers `account.approved` web hook' do
           expect { subject }.to change { user.reload.email }.to(new_email)
-        end
 
-        it 'triggers the account.approved Web Hook' do
-          user.confirm
           expect(TriggerWebhookWorker).to have_received(:perform_async).with('account.approved', 'Account', user.account_id).once
         end
       end
@@ -221,12 +215,9 @@
           Setting.registrations_mode = 'open'
         end
 
-        it 'sets email to unconfirmed_email' do
+        it 'sets email to unconfirmed_email and triggers `account.approved` web hook' do
           expect { subject }.to change { user.reload.email }.to(new_email)
-        end
 
-        it 'triggers the account.approved Web Hook' do
-          user.confirm
           expect(TriggerWebhookWorker).to have_received(:perform_async).with('account.approved', 'Account', user.account_id).once
         end
       end
@@ -236,12 +227,9 @@
           Setting.registrations_mode = 'approved'
         end
 
-        it 'sets email to unconfirmed_email' do
+        it 'sets email to unconfirmed_email and does not trigger web hook' do
           expect { subject }.to change { user.reload.email }.to(new_email)
-        end
 
-        it 'does not trigger the account.approved Web Hook' do
-          subject
           expect(TriggerWebhookWorker).to_not have_received(:perform_async).with('account.approved', 'Account', user.account_id)
         end
       end
@@ -259,12 +247,9 @@
     context 'when the user is already confirmed' do
       let(:user) { Fabricate(:user, confirmed_at: Time.now.utc, approved: false) }
 
-      it 'sets the approved flag' do
+      it 'sets the approved flag and triggers `account.approved` web hook' do
         expect { subject }.to change { user.reload.approved? }.to(true)
-      end
 
-      it 'triggers the account.approved Web Hook' do
-        subject
         expect(TriggerWebhookWorker).to have_received(:perform_async).with('account.approved', 'Account', user.account_id).once
       end
     end
@@ -272,12 +257,9 @@
     context 'when the user is not confirmed' do
       let(:user) { Fabricate(:user, confirmed_at: nil, approved: false) }
 
-      it 'sets the approved flag' do
+      it 'sets the approved flag and does not trigger web hook' do
         expect { subject }.to change { user.reload.approved? }.to(true)
-      end
 
-      it 'does not trigger the account.approved Web Hook' do
-        subject
         expect(TriggerWebhookWorker).to_not have_received(:perform_async).with('account.approved', 'Account', user.account_id)
       end
     end

From beaef4b6723cc0ddd34a3139749e02e870178c2b Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 26 Jan 2024 11:23:12 -0500
Subject: [PATCH 0009/2191] Combine double subjects in application controller
 shared example (#28938)

---
 spec/controllers/application_controller_spec.rb | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/spec/controllers/application_controller_spec.rb b/spec/controllers/application_controller_spec.rb
index e9d47960353fdb..a309e933ee4c82 100644
--- a/spec/controllers/application_controller_spec.rb
+++ b/spec/controllers/application_controller_spec.rb
@@ -22,13 +22,10 @@ def invalid_authenticity_token
   end
 
   shared_examples 'respond_with_error' do |code|
-    it "returns http #{code} for http" do
-      subject
-      expect(response).to have_http_status(code)
-    end
-
-    it 'renders template for http' do
+    it "returns http #{code} for http and renders template" do
       expect(subject).to render_template("errors/#{code}", layout: 'error')
+
+      expect(response).to have_http_status(code)
     end
   end
 

From beb74fd71cba1c460c8ef3df016905aa063bdc7f Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 26 Jan 2024 11:28:50 -0500
Subject: [PATCH 0010/2191] Combine double subjects in instance actors
 controller shared example (#28939)

---
 .../instance_actors_controller_spec.rb           | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/spec/controllers/instance_actors_controller_spec.rb b/spec/controllers/instance_actors_controller_spec.rb
index 8406094311eaab..36b9049fbcf3c4 100644
--- a/spec/controllers/instance_actors_controller_spec.rb
+++ b/spec/controllers/instance_actors_controller_spec.rb
@@ -12,30 +12,20 @@
           get :show, params: { format: format }
         end
 
-        it 'returns http success' do
+        it 'returns http success with correct media type, headers, and session values' do
           expect(response).to have_http_status(200)
-        end
 
-        it 'returns application/activity+json' do
           expect(response.media_type).to eq 'application/activity+json'
-        end
 
-        it 'does not set cookies' do
           expect(response.cookies).to be_empty
           expect(response.headers['Set-Cookies']).to be_nil
-        end
 
-        it 'does not set sessions' do
           expect(session).to be_empty
-        end
 
-        it 'returns public Cache-Control header' do
           expect(response.headers['Cache-Control']).to include 'public'
-        end
 
-        it 'renders account' do
-          json = body_as_json
-          expect(json).to include(:id, :type, :preferredUsername, :inbox, :publicKey, :inbox, :outbox, :url)
+          expect(body_as_json)
+            .to include(:id, :type, :preferredUsername, :inbox, :publicKey, :inbox, :outbox, :url)
         end
       end
 

From 685eaa04d4037886e4d7f4e346183a04c292bf0a Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 26 Jan 2024 11:30:30 -0500
Subject: [PATCH 0011/2191] Combine double subject in admin/statuses controller
 shared example (#28940)

---
 spec/controllers/admin/statuses_controller_spec.rb | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/spec/controllers/admin/statuses_controller_spec.rb b/spec/controllers/admin/statuses_controller_spec.rb
index dc5e28e9727147..4e8bf9ead68d51 100644
--- a/spec/controllers/admin/statuses_controller_spec.rb
+++ b/spec/controllers/admin/statuses_controller_spec.rb
@@ -60,16 +60,14 @@
     shared_examples 'when action is report' do
       let(:action) { 'report' }
 
-      it 'creates a report' do
+      it 'creates a report and redirects to report page' do
         subject
 
-        report = Report.last
-        expect(report.target_account_id).to eq account.id
-        expect(report.status_ids).to eq status_ids
-      end
-
-      it 'redirects to report page' do
-        subject
+        expect(Report.last)
+          .to have_attributes(
+            target_account_id: eq(account.id),
+            status_ids: eq(status_ids)
+          )
 
         expect(response).to redirect_to(admin_report_path(Report.last.id))
       end

From 1a30a517d60148c518cb74d6c8fbbef21f6fae56 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 26 Jan 2024 11:31:07 -0500
Subject: [PATCH 0012/2191] Combine repeated subjects in link details extractor
 spec (#28941)

---
 spec/lib/link_details_extractor_spec.rb | 132 ++++++------------------
 1 file changed, 30 insertions(+), 102 deletions(-)

diff --git a/spec/lib/link_details_extractor_spec.rb b/spec/lib/link_details_extractor_spec.rb
index 8c485cef2afb5b..26d9d4e2659821 100644
--- a/spec/lib/link_details_extractor_spec.rb
+++ b/spec/lib/link_details_extractor_spec.rb
@@ -46,22 +46,13 @@
       </html>
     HTML
 
-    describe '#title' do
-      it 'returns the title from title tag' do
-        expect(subject.title).to eq 'Man bites dog'
-      end
-    end
-
-    describe '#description' do
-      it 'returns the description from meta tag' do
-        expect(subject.description).to eq "A dog's tale"
-      end
-    end
-
-    describe '#language' do
-      it 'returns the language from lang attribute' do
-        expect(subject.language).to eq 'en'
-      end
+    it 'extracts the expected values from html metadata' do
+      expect(subject)
+        .to have_attributes(
+          title: eq('Man bites dog'),
+          description: eq("A dog's tale"),
+          language: eq('en')
+        )
     end
   end
 
@@ -90,40 +81,16 @@
     end
 
     shared_examples 'structured data' do
-      describe '#title' do
-        it 'returns the title from structured data' do
-          expect(subject.title).to eq 'Man bites dog'
-        end
-      end
-
-      describe '#description' do
-        it 'returns the description from structured data' do
-          expect(subject.description).to eq "A dog's tale"
-        end
-      end
-
-      describe '#published_at' do
-        it 'returns the publicaton time from structured data' do
-          expect(subject.published_at).to eq '2022-01-31T19:53:00+00:00'
-        end
-      end
-
-      describe '#author_name' do
-        it 'returns the author name from structured data' do
-          expect(subject.author_name).to eq 'Charlie Brown'
-        end
-      end
-
-      describe '#provider_name' do
-        it 'returns the provider name from structured data' do
-          expect(subject.provider_name).to eq 'Pet News'
-        end
-      end
-
-      describe '#language' do
-        it 'returns the language from structured data' do
-          expect(subject.language).to eq 'en'
-        end
+      it 'extracts the expected values from structured data' do
+        expect(subject)
+          .to have_attributes(
+            title: eq('Man bites dog'),
+            description: eq("A dog's tale"),
+            published_at: eq('2022-01-31T19:53:00+00:00'),
+            author_name: eq('Charlie Brown'),
+            provider_name: eq('Pet News'),
+            language: eq('en')
+          )
       end
     end
 
@@ -245,58 +212,19 @@
       </html>
     HTML
 
-    describe '#canonical_url' do
-      it 'returns the URL from Open Graph protocol data' do
-        expect(subject.canonical_url).to eq 'https://example.com/dog.html'
-      end
-    end
-
-    describe '#title' do
-      it 'returns the title from Open Graph protocol data' do
-        expect(subject.title).to eq 'Man bites dog'
-      end
-    end
-
-    describe '#description' do
-      it 'returns the description from Open Graph protocol data' do
-        expect(subject.description).to eq "A dog's tale"
-      end
-    end
-
-    describe '#published_at' do
-      it 'returns the publicaton time from Open Graph protocol data' do
-        expect(subject.published_at).to eq '2022-01-31T19:53:00+00:00'
-      end
-    end
-
-    describe '#author_name' do
-      it 'returns the author name from Open Graph protocol data' do
-        expect(subject.author_name).to eq 'Charlie Brown'
-      end
-    end
-
-    describe '#language' do
-      it 'returns the language from Open Graph protocol data' do
-        expect(subject.language).to eq 'en'
-      end
-    end
-
-    describe '#image' do
-      it 'returns the image from Open Graph protocol data' do
-        expect(subject.image).to eq 'https://example.com/snoopy.jpg'
-      end
-    end
-
-    describe '#image:alt' do
-      it 'returns the image description from Open Graph protocol data' do
-        expect(subject.image_alt).to eq 'A good boy'
-      end
-    end
-
-    describe '#provider_name' do
-      it 'returns the provider name from Open Graph protocol data' do
-        expect(subject.provider_name).to eq 'Pet News'
-      end
+    it 'extracts the expected values from open graph data' do
+      expect(subject)
+        .to have_attributes(
+          canonical_url: eq('https://example.com/dog.html'),
+          title: eq('Man bites dog'),
+          description: eq("A dog's tale"),
+          published_at: eq('2022-01-31T19:53:00+00:00'),
+          author_name: eq('Charlie Brown'),
+          language: eq('en'),
+          image: eq('https://example.com/snoopy.jpg'),
+          image_alt: eq('A good boy'),
+          provider_name: eq('Pet News')
+        )
     end
   end
 end

From 5fbdb2055becdb4177ad8aa0b3891cb2617d223b Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 26 Jan 2024 11:35:19 -0500
Subject: [PATCH 0013/2191] Combine repeated `subject` in `cli/accounts` spec
 shared example (#28942)

---
 spec/lib/mastodon/cli/accounts_spec.rb | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/spec/lib/mastodon/cli/accounts_spec.rb b/spec/lib/mastodon/cli/accounts_spec.rb
index 98be2b2027d43e..137f85c6ca20f7 100644
--- a/spec/lib/mastodon/cli/accounts_spec.rb
+++ b/spec/lib/mastodon/cli/accounts_spec.rb
@@ -1326,18 +1326,16 @@ def expect_no_account_prunes
     end
 
     shared_examples 'a successful migration' do
-      it 'calls the MoveService for the last migration' do
+      it 'displays a success message and calls the MoveService for the last migration' do
         expect { subject }
-          .to output_results('OK')
-
-        last_migration = source_account.migrations.last
+          .to output_results("OK, migrated #{source_account.acct} to #{target_account.acct}")
 
-        expect(move_service).to have_received(:call).with(last_migration).once
+        expect(move_service)
+          .to have_received(:call).with(last_migration).once
       end
 
-      it 'displays a successful message' do
-        expect { subject }
-          .to output_results("OK, migrated #{source_account.acct} to #{target_account.acct}")
+      def last_migration
+        source_account.migrations.last
       end
     end
 

From 09a3493fcacf7ae4f190fceb3c22a0510eac022f Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 26 Jan 2024 11:35:49 -0500
Subject: [PATCH 0014/2191] Combine double subject in `api/v1/media` shared
 example (#28943)

---
 spec/requests/api/v1/media_spec.rb | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/spec/requests/api/v1/media_spec.rb b/spec/requests/api/v1/media_spec.rb
index 2c29328087cf3c..26c76b9c5b98f6 100644
--- a/spec/requests/api/v1/media_spec.rb
+++ b/spec/requests/api/v1/media_spec.rb
@@ -76,20 +76,14 @@
     let(:params) { {} }
 
     shared_examples 'a successful media upload' do |media_type|
-      it 'uploads the file successfully', :aggregate_failures do
+      it 'uploads the file successfully and returns correct media content', :aggregate_failures do
         subject
 
         expect(response).to have_http_status(200)
         expect(MediaAttachment.first).to be_present
         expect(MediaAttachment.first).to have_attached_file(:file)
-      end
-
-      it 'returns the correct media content' do
-        subject
-
-        body = body_as_json
 
-        expect(body).to match(
+        expect(body_as_json).to match(
           a_hash_including(id: MediaAttachment.first.id.to_s, description: params[:description], type: media_type)
         )
       end

From d791bca11b69f0599a000c8568885dc2ee14ef06 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 26 Jan 2024 11:36:21 -0500
Subject: [PATCH 0015/2191] Combine double subject in `well_known/webfinger`
 shared example (#28944)

---
 spec/requests/well_known/webfinger_spec.rb | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/spec/requests/well_known/webfinger_spec.rb b/spec/requests/well_known/webfinger_spec.rb
index 779f1bba598d02..0aafdf56244ec5 100644
--- a/spec/requests/well_known/webfinger_spec.rb
+++ b/spec/requests/well_known/webfinger_spec.rb
@@ -17,22 +17,18 @@
   end
 
   shared_examples 'a successful response' do
-    it 'returns http success' do
+    it 'returns http success with correct media type and headers and body json' do
       expect(response).to have_http_status(200)
-    end
 
-    it 'sets only a Vary Origin header' do
       expect(response.headers['Vary']).to eq('Origin')
-    end
 
-    it 'returns application/jrd+json' do
       expect(response.media_type).to eq 'application/jrd+json'
-    end
 
-    it 'returns links for the account' do
-      json = body_as_json
-      expect(json[:subject]).to eq 'acct:alice@cb6e6126.ngrok.io'
-      expect(json[:aliases]).to include('https://cb6e6126.ngrok.io/@alice', 'https://cb6e6126.ngrok.io/users/alice')
+      expect(body_as_json)
+        .to include(
+          subject: eq('acct:alice@cb6e6126.ngrok.io'),
+          aliases: include('https://cb6e6126.ngrok.io/@alice', 'https://cb6e6126.ngrok.io/users/alice')
+        )
     end
   end
 

From e519f113e8154dacd7fd1b67b35bd3f40d9768a2 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 26 Jan 2024 11:37:05 -0500
Subject: [PATCH 0016/2191] Combine repeated subject in `cacheable response`
 shared example (#28945)

---
 spec/support/examples/cache.rb | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/spec/support/examples/cache.rb b/spec/support/examples/cache.rb
index 43cfbade8242f9..afbee66b2d357a 100644
--- a/spec/support/examples/cache.rb
+++ b/spec/support/examples/cache.rb
@@ -1,22 +1,14 @@
 # frozen_string_literal: true
 
 shared_examples 'cacheable response' do |expects_vary: false|
-  it 'does not set cookies' do
+  it 'sets correct cache and vary headers and does not set cookies or session' do
     expect(response.cookies).to be_empty
     expect(response.headers['Set-Cookies']).to be_nil
-  end
 
-  it 'does not set sessions' do
     expect(session).to be_empty
-  end
 
-  if expects_vary
-    it 'returns Vary header' do
-      expect(response.headers['Vary']).to include(expects_vary)
-    end
-  end
+    expect(response.headers['Vary']).to include(expects_vary) if expects_vary
 
-  it 'returns public Cache-Control header' do
     expect(response.headers['Cache-Control']).to include('public')
   end
 end

From 160c8f492362abca1c97e0e63cef1cafdd3ba6ab Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 26 Jan 2024 17:49:03 +0100
Subject: [PATCH 0017/2191] Update babel monorepo to v7.23.9 (#28916)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 172 +++++++++++++++++++++++++++---------------------------
 1 file changed, 86 insertions(+), 86 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 78261b3b8427e1..759c43138b666e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -42,7 +42,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.10.4, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.22.13, @babel/code-frame@npm:^7.23.5":
+"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.10.4, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.23.5":
   version: 7.23.5
   resolution: "@babel/code-frame@npm:7.23.5"
   dependencies:
@@ -60,25 +60,25 @@ __metadata:
   linkType: hard
 
 "@babel/core@npm:^7.10.4, @babel/core@npm:^7.11.1, @babel/core@npm:^7.11.6, @babel/core@npm:^7.12.3, @babel/core@npm:^7.22.1":
-  version: 7.23.7
-  resolution: "@babel/core@npm:7.23.7"
+  version: 7.23.9
+  resolution: "@babel/core@npm:7.23.9"
   dependencies:
     "@ampproject/remapping": "npm:^2.2.0"
     "@babel/code-frame": "npm:^7.23.5"
     "@babel/generator": "npm:^7.23.6"
     "@babel/helper-compilation-targets": "npm:^7.23.6"
     "@babel/helper-module-transforms": "npm:^7.23.3"
-    "@babel/helpers": "npm:^7.23.7"
-    "@babel/parser": "npm:^7.23.6"
-    "@babel/template": "npm:^7.22.15"
-    "@babel/traverse": "npm:^7.23.7"
-    "@babel/types": "npm:^7.23.6"
+    "@babel/helpers": "npm:^7.23.9"
+    "@babel/parser": "npm:^7.23.9"
+    "@babel/template": "npm:^7.23.9"
+    "@babel/traverse": "npm:^7.23.9"
+    "@babel/types": "npm:^7.23.9"
     convert-source-map: "npm:^2.0.0"
     debug: "npm:^4.1.0"
     gensync: "npm:^1.0.0-beta.2"
     json5: "npm:^2.2.3"
     semver: "npm:^6.3.1"
-  checksum: 38c9934973d384ed83369712978453eac91dc3f22167404dbdb272b64f602e74728a6f37012c53ee57e521b8ae2da60097f050497d9b6a212d28b59cdfb2cd1d
+  checksum: 03883300bf1252ab4c9ba5b52f161232dd52873dbe5cde9289bb2bb26e935c42682493acbac9194a59a3b6cbd17f4c4c84030db8d6d482588afe64531532ff9b
   languageName: node
   linkType: hard
 
@@ -167,9 +167,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-define-polyfill-provider@npm:^0.4.4":
-  version: 0.4.4
-  resolution: "@babel/helper-define-polyfill-provider@npm:0.4.4"
+"@babel/helper-define-polyfill-provider@npm:^0.5.0":
+  version: 0.5.0
+  resolution: "@babel/helper-define-polyfill-provider@npm:0.5.0"
   dependencies:
     "@babel/helper-compilation-targets": "npm:^7.22.6"
     "@babel/helper-plugin-utils": "npm:^7.22.5"
@@ -178,7 +178,7 @@ __metadata:
     resolve: "npm:^1.14.2"
   peerDependencies:
     "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0
-  checksum: 60126f5f719b9e2114df62e3bf3ac0797b71d8dc733db60192eb169b004fde72ee309fa5848c5fdfe98b8e8863c46f55e16da5aa8a4e420b4d2670cd0c5dd708
+  checksum: 2b053b96a0c604a7e0f5c7d13a8a55f4451d938f7af42bd40f62a87df15e6c87a0b1dbd893a0f0bb51077b54dc3ba00a58b166531a5940ad286ab685dd8979ec
   languageName: node
   linkType: hard
 
@@ -342,14 +342,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helpers@npm:^7.23.7":
-  version: 7.23.7
-  resolution: "@babel/helpers@npm:7.23.7"
+"@babel/helpers@npm:^7.23.9":
+  version: 7.23.9
+  resolution: "@babel/helpers@npm:7.23.9"
   dependencies:
-    "@babel/template": "npm:^7.22.15"
-    "@babel/traverse": "npm:^7.23.7"
-    "@babel/types": "npm:^7.23.6"
-  checksum: f74a61ad28a1bc1fdd9133ad571c07787b66d6db017c707b87c203b0cd06879cea8b33e9c6a8585765a4949efa5df3cc9e19b710fe867f11be38ee29fd4a0488
+    "@babel/template": "npm:^7.23.9"
+    "@babel/traverse": "npm:^7.23.9"
+    "@babel/types": "npm:^7.23.9"
+  checksum: f69fd0aca96a6fb8bd6dd044cd8a5c0f1851072d4ce23355345b9493c4032e76d1217f86b70df795e127553cf7f3fcd1587ede9d1b03b95e8b62681ca2165b87
   languageName: node
   linkType: hard
 
@@ -364,12 +364,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.22.15, @babel/parser@npm:^7.23.6":
-  version: 7.23.6
-  resolution: "@babel/parser@npm:7.23.6"
+"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.23.9":
+  version: 7.23.9
+  resolution: "@babel/parser@npm:7.23.9"
   bin:
     parser: ./bin/babel-parser.js
-  checksum: 6f76cd5ccae1fa9bcab3525b0865c6222e9c1d22f87abc69f28c5c7b2c8816a13361f5bd06bddbd5faf903f7320a8feba02545c981468acec45d12a03db7755e
+  checksum: 7df97386431366d4810538db4b9ec538f4377096f720c0591c7587a16f6810e62747e9fbbfa1ff99257fd4330035e4fb1b5b77c7bd3b97ce0d2e3780a6618975
   languageName: node
   linkType: hard
 
@@ -661,9 +661,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-async-generator-functions@npm:^7.23.7":
-  version: 7.23.7
-  resolution: "@babel/plugin-transform-async-generator-functions@npm:7.23.7"
+"@babel/plugin-transform-async-generator-functions@npm:^7.23.9":
+  version: 7.23.9
+  resolution: "@babel/plugin-transform-async-generator-functions@npm:7.23.9"
   dependencies:
     "@babel/helper-environment-visitor": "npm:^7.22.20"
     "@babel/helper-plugin-utils": "npm:^7.22.5"
@@ -671,7 +671,7 @@ __metadata:
     "@babel/plugin-syntax-async-generators": "npm:^7.8.4"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 63d314edc9fbeaf2700745ca0e19bf9840e87f2d7d1f6c5638e06d2aec3e7418d0d7493ed09087e2fe369cc15e9d96c113fb2cd367cb5e3ff922e3712c27b7d4
+  checksum: 4ff75f9ce500e1de8c0236fa5122e6475a477d19cb9a4c2ae8651e78e717ebb2e2cecfeca69d420def779deaec78b945843b9ffd15f02ecd7de5072030b4469b
   languageName: node
   linkType: hard
 
@@ -931,9 +931,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-modules-systemjs@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-modules-systemjs@npm:7.23.3"
+"@babel/plugin-transform-modules-systemjs@npm:^7.23.9":
+  version: 7.23.9
+  resolution: "@babel/plugin-transform-modules-systemjs@npm:7.23.9"
   dependencies:
     "@babel/helper-hoist-variables": "npm:^7.22.5"
     "@babel/helper-module-transforms": "npm:^7.23.3"
@@ -941,7 +941,7 @@ __metadata:
     "@babel/helper-validator-identifier": "npm:^7.22.20"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 0d55280a276510222c8896bf4e581acb84824aa5b14c824f7102242ad6bc5104aaffe5ab22fe4d27518f4ae2811bd59c36d0c0bfa695157f9cfce33f0517a069
+  checksum: 1926631fe9d87c0c53427a3420ad49da62d53320d0016b6afab64e5417a672aa5bdff3ea1d24746ffa1e43319c28a80f5d8cef0ad214760d399c293b5850500f
   languageName: node
   linkType: hard
 
@@ -1200,18 +1200,18 @@ __metadata:
   linkType: hard
 
 "@babel/plugin-transform-runtime@npm:^7.22.4":
-  version: 7.23.7
-  resolution: "@babel/plugin-transform-runtime@npm:7.23.7"
+  version: 7.23.9
+  resolution: "@babel/plugin-transform-runtime@npm:7.23.9"
   dependencies:
     "@babel/helper-module-imports": "npm:^7.22.15"
     "@babel/helper-plugin-utils": "npm:^7.22.5"
-    babel-plugin-polyfill-corejs2: "npm:^0.4.7"
-    babel-plugin-polyfill-corejs3: "npm:^0.8.7"
-    babel-plugin-polyfill-regenerator: "npm:^0.5.4"
+    babel-plugin-polyfill-corejs2: "npm:^0.4.8"
+    babel-plugin-polyfill-corejs3: "npm:^0.9.0"
+    babel-plugin-polyfill-regenerator: "npm:^0.5.5"
     semver: "npm:^6.3.1"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 0d5038462a5762c3a88d820785f685ce1b659075527a3ad538647fd9ce486052777d5aea3d62e626639d60441a04dd0ded2ed32c86b92cf8afbdbd3d54460c13
+  checksum: 3b959c2b88ea0009c288fa190d9f69b0d26cb336b8a7cab54a5e54b844f33cce1996725c15305a40049c8f23ca30082ee27e1f6853ff35fad723543e3d2dba47
   languageName: node
   linkType: hard
 
@@ -1333,8 +1333,8 @@ __metadata:
   linkType: hard
 
 "@babel/preset-env@npm:^7.11.0, @babel/preset-env@npm:^7.12.1, @babel/preset-env@npm:^7.22.4":
-  version: 7.23.8
-  resolution: "@babel/preset-env@npm:7.23.8"
+  version: 7.23.9
+  resolution: "@babel/preset-env@npm:7.23.9"
   dependencies:
     "@babel/compat-data": "npm:^7.23.5"
     "@babel/helper-compilation-targets": "npm:^7.23.6"
@@ -1363,7 +1363,7 @@ __metadata:
     "@babel/plugin-syntax-top-level-await": "npm:^7.14.5"
     "@babel/plugin-syntax-unicode-sets-regex": "npm:^7.18.6"
     "@babel/plugin-transform-arrow-functions": "npm:^7.23.3"
-    "@babel/plugin-transform-async-generator-functions": "npm:^7.23.7"
+    "@babel/plugin-transform-async-generator-functions": "npm:^7.23.9"
     "@babel/plugin-transform-async-to-generator": "npm:^7.23.3"
     "@babel/plugin-transform-block-scoped-functions": "npm:^7.23.3"
     "@babel/plugin-transform-block-scoping": "npm:^7.23.4"
@@ -1385,7 +1385,7 @@ __metadata:
     "@babel/plugin-transform-member-expression-literals": "npm:^7.23.3"
     "@babel/plugin-transform-modules-amd": "npm:^7.23.3"
     "@babel/plugin-transform-modules-commonjs": "npm:^7.23.3"
-    "@babel/plugin-transform-modules-systemjs": "npm:^7.23.3"
+    "@babel/plugin-transform-modules-systemjs": "npm:^7.23.9"
     "@babel/plugin-transform-modules-umd": "npm:^7.23.3"
     "@babel/plugin-transform-named-capturing-groups-regex": "npm:^7.22.5"
     "@babel/plugin-transform-new-target": "npm:^7.23.3"
@@ -1411,14 +1411,14 @@ __metadata:
     "@babel/plugin-transform-unicode-regex": "npm:^7.23.3"
     "@babel/plugin-transform-unicode-sets-regex": "npm:^7.23.3"
     "@babel/preset-modules": "npm:0.1.6-no-external-plugins"
-    babel-plugin-polyfill-corejs2: "npm:^0.4.7"
-    babel-plugin-polyfill-corejs3: "npm:^0.8.7"
-    babel-plugin-polyfill-regenerator: "npm:^0.5.4"
+    babel-plugin-polyfill-corejs2: "npm:^0.4.8"
+    babel-plugin-polyfill-corejs3: "npm:^0.9.0"
+    babel-plugin-polyfill-regenerator: "npm:^0.5.5"
     core-js-compat: "npm:^3.31.0"
     semver: "npm:^6.3.1"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: e602ad954645f1a509644e3d2c72b3c63bdc2273c377e7a83b78f076eca215887ea3624ffc36aaad03deb9ac8acd89e247fd4562b96e0f2b679485e20d8ff25f
+  checksum: 2837a42089180e51bfd6864b6d197e01fc0abec1920422e71c0513c2fc8fb5f3bfe694ed778cc4e45856c546964945bc53bf8105e4b26f3580ce3685fa50cc0f
   languageName: node
   linkType: hard
 
@@ -1483,28 +1483,28 @@ __metadata:
   linkType: hard
 
 "@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.0, @babel/runtime@npm:^7.12.13, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.13.8, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.2.0, @babel/runtime@npm:^7.20.13, @babel/runtime@npm:^7.22.3, @babel/runtime@npm:^7.23.2, @babel/runtime@npm:^7.3.1, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.6.3, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.8.7, @babel/runtime@npm:^7.9.2":
-  version: 7.23.8
-  resolution: "@babel/runtime@npm:7.23.8"
+  version: 7.23.9
+  resolution: "@babel/runtime@npm:7.23.9"
   dependencies:
     regenerator-runtime: "npm:^0.14.0"
-  checksum: ba5e8fbb32ef04f6cab5e89c54a0497c2fde7b730595cc1af93496270314f13ff2c6a9360fdb2f0bdd4d6b376752ce3cf85642bd6b876969a6a62954934c2df8
+  checksum: e71205fdd7082b2656512cc98e647d9ea7e222e4fe5c36e9e5adc026446fcc3ba7b3cdff8b0b694a0b78bb85db83e7b1e3d4c56ef90726682b74f13249cf952d
   languageName: node
   linkType: hard
 
-"@babel/template@npm:^7.22.15, @babel/template@npm:^7.3.3":
-  version: 7.22.15
-  resolution: "@babel/template@npm:7.22.15"
+"@babel/template@npm:^7.22.15, @babel/template@npm:^7.23.9, @babel/template@npm:^7.3.3":
+  version: 7.23.9
+  resolution: "@babel/template@npm:7.23.9"
   dependencies:
-    "@babel/code-frame": "npm:^7.22.13"
-    "@babel/parser": "npm:^7.22.15"
-    "@babel/types": "npm:^7.22.15"
-  checksum: 9312edd37cf1311d738907003f2aa321a88a42ba223c69209abe4d7111db019d321805504f606c7fd75f21c6cf9d24d0a8223104cd21ebd207e241b6c551f454
+    "@babel/code-frame": "npm:^7.23.5"
+    "@babel/parser": "npm:^7.23.9"
+    "@babel/types": "npm:^7.23.9"
+  checksum: 0e8b60119433787742bc08ae762bbd8d6755611c4cabbcb7627b292ec901a55af65d93d1c88572326069efb64136ef151ec91ffb74b2df7689bbab237030833a
   languageName: node
   linkType: hard
 
-"@babel/traverse@npm:7, @babel/traverse@npm:^7.23.7":
-  version: 7.23.7
-  resolution: "@babel/traverse@npm:7.23.7"
+"@babel/traverse@npm:7, @babel/traverse@npm:^7.23.9":
+  version: 7.23.9
+  resolution: "@babel/traverse@npm:7.23.9"
   dependencies:
     "@babel/code-frame": "npm:^7.23.5"
     "@babel/generator": "npm:^7.23.6"
@@ -1512,22 +1512,22 @@ __metadata:
     "@babel/helper-function-name": "npm:^7.23.0"
     "@babel/helper-hoist-variables": "npm:^7.22.5"
     "@babel/helper-split-export-declaration": "npm:^7.22.6"
-    "@babel/parser": "npm:^7.23.6"
-    "@babel/types": "npm:^7.23.6"
+    "@babel/parser": "npm:^7.23.9"
+    "@babel/types": "npm:^7.23.9"
     debug: "npm:^4.3.1"
     globals: "npm:^11.1.0"
-  checksum: e32fceb4249beec2bde83968ddffe17444221c1ee5cd18c543a2feaf94e3ca83f2a4dfbc2dcca87cf226e0105973e0fe3717063a21e982a9de9945615ab3f3f5
+  checksum: d1615d1d02f04d47111a7ea4446a1a6275668ca39082f31d51f08380de9502e19862be434eaa34b022ce9a17dbb8f9e2b73a746c654d9575f3a680a7ffdf5630
   languageName: node
   linkType: hard
 
-"@babel/types@npm:^7.0.0, @babel/types@npm:^7.0.0-beta.49, @babel/types@npm:^7.12.11, @babel/types@npm:^7.12.6, @babel/types@npm:^7.20.7, @babel/types@npm:^7.22.10, @babel/types@npm:^7.22.15, @babel/types@npm:^7.22.19, @babel/types@npm:^7.22.5, @babel/types@npm:^7.23.0, @babel/types@npm:^7.23.6, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3":
-  version: 7.23.6
-  resolution: "@babel/types@npm:7.23.6"
+"@babel/types@npm:^7.0.0, @babel/types@npm:^7.0.0-beta.49, @babel/types@npm:^7.12.11, @babel/types@npm:^7.12.6, @babel/types@npm:^7.20.7, @babel/types@npm:^7.22.10, @babel/types@npm:^7.22.15, @babel/types@npm:^7.22.19, @babel/types@npm:^7.22.5, @babel/types@npm:^7.23.0, @babel/types@npm:^7.23.6, @babel/types@npm:^7.23.9, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3":
+  version: 7.23.9
+  resolution: "@babel/types@npm:7.23.9"
   dependencies:
     "@babel/helper-string-parser": "npm:^7.23.4"
     "@babel/helper-validator-identifier": "npm:^7.22.20"
     to-fast-properties: "npm:^2.0.0"
-  checksum: 42cefce8a68bd09bb5828b4764aa5586c53c60128ac2ac012e23858e1c179347a4aac9c66fc577994fbf57595227611c5ec8270bf0cfc94ff033bbfac0550b70
+  checksum: edc7bb180ce7e4d2aea10c6972fb10474341ac39ba8fdc4a27ffb328368dfdfbf40fca18e441bbe7c483774500d5c05e222cec276c242e952853dcaf4eb884f7
   languageName: node
   linkType: hard
 
@@ -4805,39 +4805,39 @@ __metadata:
   languageName: node
   linkType: hard
 
-"babel-plugin-polyfill-corejs2@npm:^0.4.7":
-  version: 0.4.7
-  resolution: "babel-plugin-polyfill-corejs2@npm:0.4.7"
+"babel-plugin-polyfill-corejs2@npm:^0.4.8":
+  version: 0.4.8
+  resolution: "babel-plugin-polyfill-corejs2@npm:0.4.8"
   dependencies:
     "@babel/compat-data": "npm:^7.22.6"
-    "@babel/helper-define-polyfill-provider": "npm:^0.4.4"
+    "@babel/helper-define-polyfill-provider": "npm:^0.5.0"
     semver: "npm:^6.3.1"
   peerDependencies:
     "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0
-  checksum: f80f7284ec72c63e7dd751e0bdf25e9978df195a79e0887470603bfdea13ee518d62573cf360bb1bc01b80819e54915dd5edce9cff14c52d0af5f984aa3d36a3
+  checksum: 843e7528de0e03a31a6f3837896a95f75b0b24b0294a077246282372279e974400b0bdd82399e8f9cbfe42c87ed56540fd71c33eafb7c8e8b9adac546ecc5fe5
   languageName: node
   linkType: hard
 
-"babel-plugin-polyfill-corejs3@npm:^0.8.7":
-  version: 0.8.7
-  resolution: "babel-plugin-polyfill-corejs3@npm:0.8.7"
+"babel-plugin-polyfill-corejs3@npm:^0.9.0":
+  version: 0.9.0
+  resolution: "babel-plugin-polyfill-corejs3@npm:0.9.0"
   dependencies:
-    "@babel/helper-define-polyfill-provider": "npm:^0.4.4"
-    core-js-compat: "npm:^3.33.1"
+    "@babel/helper-define-polyfill-provider": "npm:^0.5.0"
+    core-js-compat: "npm:^3.34.0"
   peerDependencies:
     "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0
-  checksum: 094e40f4ab9f131408202063964d63740609fd4fdb70a5b6332b371761921b540ffbcee7a434c0199b8317dfb2ba4675eef674867215fd3b85e24054607c1501
+  checksum: b857010736c5e42e20b683973dae862448a42082fcc95b3ef188305a6864a4f94b5cbd568e49e4cd7172c6b2eace7bc403c3ba0984fbe5479474ade01126d559
   languageName: node
   linkType: hard
 
-"babel-plugin-polyfill-regenerator@npm:^0.5.4":
-  version: 0.5.4
-  resolution: "babel-plugin-polyfill-regenerator@npm:0.5.4"
+"babel-plugin-polyfill-regenerator@npm:^0.5.5":
+  version: 0.5.5
+  resolution: "babel-plugin-polyfill-regenerator@npm:0.5.5"
   dependencies:
-    "@babel/helper-define-polyfill-provider": "npm:^0.4.4"
+    "@babel/helper-define-polyfill-provider": "npm:^0.5.0"
   peerDependencies:
     "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0
-  checksum: 0b903f5fe2f8c487b4260935dfe60bd9a95bcaee7ae63958f063045093b16d4e8288c232199d411261300aa21f6b106a3cb83c42cc996de013b337f5825a79fe
+  checksum: 2aab692582082d54e0df9f9373dca1b223e65b4e7e96440160f27ed8803d417a1fa08da550f08aa3820d2010329ca91b68e2b6e9bd7aed51c93d46dfe79629bb
   languageName: node
   linkType: hard
 
@@ -5922,12 +5922,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"core-js-compat@npm:^3.31.0, core-js-compat@npm:^3.33.1":
-  version: 3.35.0
-  resolution: "core-js-compat@npm:3.35.0"
+"core-js-compat@npm:^3.31.0, core-js-compat@npm:^3.34.0":
+  version: 3.35.1
+  resolution: "core-js-compat@npm:3.35.1"
   dependencies:
     browserslist: "npm:^4.22.2"
-  checksum: 8c4379240b8decb94b21e81d5ba6f768418721061923b28c9dfc97574680c35d778d39c010207402fc7c8308a68a4cf6d5e02bcbcb96e931c52e6e0dce29a68c
+  checksum: c3b872e1f9703aa9554cce816207d85730da4703f1776c540b4da11bbbef6d9a1e6041625b5c1f58d2ada3d05f4a2b92897b7de5315c5ecd5d33d50dec86cca7
   languageName: node
   linkType: hard
 

From f4a12adfb7f1706d82460c9e27a28101a87d35ac Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 26 Jan 2024 17:49:09 +0100
Subject: [PATCH 0018/2191] Update dependency axios to v1.6.7 (#28917)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 759c43138b666e..a2ea797d38916f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4673,13 +4673,13 @@ __metadata:
   linkType: hard
 
 "axios@npm:^1.4.0":
-  version: 1.6.6
-  resolution: "axios@npm:1.6.6"
+  version: 1.6.7
+  resolution: "axios@npm:1.6.7"
   dependencies:
     follow-redirects: "npm:^1.15.4"
     form-data: "npm:^4.0.0"
     proxy-from-env: "npm:^1.1.0"
-  checksum: 974f54cfade94fd4c0191309122a112c8d233089cecb0070cd8e0904e9bd9c364ac3a6fd0f981c978508077249788950427c565f54b7b2110e5c3426006ff343
+  checksum: 131bf8e62eee48ca4bd84e6101f211961bf6a21a33b95e5dfb3983d5a2fe50d9fffde0b57668d7ce6f65063d3dc10f2212cbcb554f75cfca99da1c73b210358d
   languageName: node
   linkType: hard
 

From 87ad398ddc78f2da5746774960690661e8e57335 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 26 Jan 2024 17:49:16 +0100
Subject: [PATCH 0019/2191] Update formatjs monorepo (#28925)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 72 +++++++++++++++++++++++++++----------------------------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index a2ea797d38916f..3f70a02e74803f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1830,14 +1830,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@formatjs/icu-messageformat-parser@npm:2.7.5":
-  version: 2.7.5
-  resolution: "@formatjs/icu-messageformat-parser@npm:2.7.5"
+"@formatjs/icu-messageformat-parser@npm:2.7.6":
+  version: 2.7.6
+  resolution: "@formatjs/icu-messageformat-parser@npm:2.7.6"
   dependencies:
     "@formatjs/ecma402-abstract": "npm:1.18.2"
-    "@formatjs/icu-skeleton-parser": "npm:1.7.2"
+    "@formatjs/icu-skeleton-parser": "npm:1.8.0"
     tslib: "npm:^2.4.0"
-  checksum: b1995ee0844c48d1b4bf184017a65600eb1d324107046c8b67d77e08d7da74bbbbf00dccbf2bc418480c8510443b3eb157646404fbacd71fa6e7d572d0ffc910
+  checksum: 9fc72c2075333a969601e2be4260638940b1abefd1a5fc15b93b0b10d2319c9df5778aa51fc2a173ce66ca5e8a47b4b64caca85a32d0eb6095e16e8d65cb4b00
   languageName: node
   linkType: hard
 
@@ -1851,13 +1851,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@formatjs/icu-skeleton-parser@npm:1.7.2":
-  version: 1.7.2
-  resolution: "@formatjs/icu-skeleton-parser@npm:1.7.2"
+"@formatjs/icu-skeleton-parser@npm:1.8.0":
+  version: 1.8.0
+  resolution: "@formatjs/icu-skeleton-parser@npm:1.8.0"
   dependencies:
     "@formatjs/ecma402-abstract": "npm:1.18.2"
     tslib: "npm:^2.4.0"
-  checksum: 7ca30ac360a5a971b5a06b4ae0263f0ddbde4751ff470486767f544f0399c5c85affab7170e5dd227c65afac4797e79a5e8abe65a70a335b96ab77b5d314abcb
+  checksum: 10956732d70cc67049d216410b5dc3ef048935d1ea2ae76f5755bb9d0243af37ddeabd5d140ddbf5f6c7047068c3d02a05f93c68a89cedfaf7488d5062885ea4
   languageName: node
   linkType: hard
 
@@ -1912,31 +1912,31 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@formatjs/intl@npm:2.9.11":
-  version: 2.9.11
-  resolution: "@formatjs/intl@npm:2.9.11"
+"@formatjs/intl@npm:2.10.0":
+  version: 2.10.0
+  resolution: "@formatjs/intl@npm:2.10.0"
   dependencies:
     "@formatjs/ecma402-abstract": "npm:1.18.2"
     "@formatjs/fast-memoize": "npm:2.2.0"
-    "@formatjs/icu-messageformat-parser": "npm:2.7.5"
+    "@formatjs/icu-messageformat-parser": "npm:2.7.6"
     "@formatjs/intl-displaynames": "npm:6.6.6"
     "@formatjs/intl-listformat": "npm:7.5.5"
-    intl-messageformat: "npm:10.5.10"
+    intl-messageformat: "npm:10.5.11"
     tslib: "npm:^2.4.0"
   peerDependencies:
     typescript: ^4.7 || 5
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 003a4356e698cf847aeb701565cad701f3afba2a31d8d3c2fe0d5790d90ef866bea30cf2cc20151b15085db10e436376d38c10b911b3fe5afdef5c32333d09f3
+  checksum: 7566038b011116cee7069165a25836b3fb687948e61b041809a9d978ac6c0882ae8d81a624a415cfb8e43852d097cd1cbc3c6707e717928e39b75c252491a712
   languageName: node
   linkType: hard
 
-"@formatjs/ts-transformer@npm:3.13.11":
-  version: 3.13.11
-  resolution: "@formatjs/ts-transformer@npm:3.13.11"
+"@formatjs/ts-transformer@npm:3.13.12":
+  version: 3.13.12
+  resolution: "@formatjs/ts-transformer@npm:3.13.12"
   dependencies:
-    "@formatjs/icu-messageformat-parser": "npm:2.7.5"
+    "@formatjs/icu-messageformat-parser": "npm:2.7.6"
     "@types/json-stable-stringify": "npm:^1.0.32"
     "@types/node": "npm:14 || 16 || 17"
     chalk: "npm:^4.0.0"
@@ -1948,7 +1948,7 @@ __metadata:
   peerDependenciesMeta:
     ts-jest:
       optional: true
-  checksum: 2f7c48e742a152d0499615d01113fab23089c3c56beaa3234f53bbe48393b6351c68eba1aa23d6dec57ebfd7b1d12b165215950eeb87dd90072519dcc0a2e022
+  checksum: 68f72ee6379b87b7ef6340e118a5370cb2fa18cbbae08f5f3d10893803a52f0533e644002e0b5e9ffeded5b2f0aa9daad6adf8b487b10f5d2b61f9fb3fed0dbd
   languageName: node
   linkType: hard
 
@@ -4725,21 +4725,21 @@ __metadata:
   linkType: hard
 
 "babel-plugin-formatjs@npm:^10.5.1":
-  version: 10.5.12
-  resolution: "babel-plugin-formatjs@npm:10.5.12"
+  version: 10.5.13
+  resolution: "babel-plugin-formatjs@npm:10.5.13"
   dependencies:
     "@babel/core": "npm:^7.10.4"
     "@babel/helper-plugin-utils": "npm:^7.10.4"
     "@babel/plugin-syntax-jsx": "npm:7"
     "@babel/traverse": "npm:7"
     "@babel/types": "npm:^7.12.11"
-    "@formatjs/icu-messageformat-parser": "npm:2.7.5"
-    "@formatjs/ts-transformer": "npm:3.13.11"
+    "@formatjs/icu-messageformat-parser": "npm:2.7.6"
+    "@formatjs/ts-transformer": "npm:3.13.12"
     "@types/babel__core": "npm:^7.1.7"
     "@types/babel__helper-plugin-utils": "npm:^7.10.0"
     "@types/babel__traverse": "npm:^7.1.7"
     tslib: "npm:^2.4.0"
-  checksum: 64fe3a38b283bb46e5528ad2f72287ca8a163227b0eea3bbe1bedff6d885b2be38c9fb8ed3843a72b723aeb2a7ad4d32b48e52030698631dc646aa15017f4208
+  checksum: 1ce0b69478dd3c92126a7e3440f1fad46feebebc9318e8bbb102dea91a60448da4a8511b3c8ffbf2c3675995fca6c8ce7f097c08907455b33a5f9185e39fb94e
   languageName: node
   linkType: hard
 
@@ -9271,15 +9271,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"intl-messageformat@npm:10.5.10, intl-messageformat@npm:^10.3.5":
-  version: 10.5.10
-  resolution: "intl-messageformat@npm:10.5.10"
+"intl-messageformat@npm:10.5.11, intl-messageformat@npm:^10.3.5":
+  version: 10.5.11
+  resolution: "intl-messageformat@npm:10.5.11"
   dependencies:
     "@formatjs/ecma402-abstract": "npm:1.18.2"
     "@formatjs/fast-memoize": "npm:2.2.0"
-    "@formatjs/icu-messageformat-parser": "npm:2.7.5"
+    "@formatjs/icu-messageformat-parser": "npm:2.7.6"
     tslib: "npm:^2.4.0"
-  checksum: 2016c0561e5172b28f180669e28992d04944752d61ebcb539232cc289e7627fd92fe64c73985bc32bddd5cc683f7b77863c1b58507d214ce3a87982d50571658
+  checksum: 423f1c879ce2d0e7b9e0b4c1787a81ead7fe4d1734e0366a20fef56b06c09146e7ca3618e2e78b4f8b8f2b59cafe6237ceed21530fe0c16cfb47d915fc80222d
   languageName: node
   linkType: hard
 
@@ -13669,18 +13669,18 @@ __metadata:
   linkType: hard
 
 "react-intl@npm:^6.4.2":
-  version: 6.6.1
-  resolution: "react-intl@npm:6.6.1"
+  version: 6.6.2
+  resolution: "react-intl@npm:6.6.2"
   dependencies:
     "@formatjs/ecma402-abstract": "npm:1.18.2"
-    "@formatjs/icu-messageformat-parser": "npm:2.7.5"
-    "@formatjs/intl": "npm:2.9.11"
+    "@formatjs/icu-messageformat-parser": "npm:2.7.6"
+    "@formatjs/intl": "npm:2.10.0"
     "@formatjs/intl-displaynames": "npm:6.6.6"
     "@formatjs/intl-listformat": "npm:7.5.5"
     "@types/hoist-non-react-statics": "npm:^3.3.1"
     "@types/react": "npm:16 || 17 || 18"
     hoist-non-react-statics: "npm:^3.3.2"
-    intl-messageformat: "npm:10.5.10"
+    intl-messageformat: "npm:10.5.11"
     tslib: "npm:^2.4.0"
   peerDependencies:
     react: ^16.6.0 || 17 || 18
@@ -13688,7 +13688,7 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 9277269eadbe432a9651af66402240b8a91a567c769ac9c1a774575999f63689a31dccf22a09a1d78d1b8fed4ecad103bdcc609e476ee7e60dabf0cbce6556d3
+  checksum: 78288a0fded816735812dca6dcfee3eaa8bb3af7e963ba47639b51cc700a102a526859ff647ca79a5ebcdc69d6d78da90daeeed15cc0b819c7a20a74b2e1469c
   languageName: node
   linkType: hard
 

From 0b0ca6f3b85c9d08e4642e49d743f8d060632293 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 26 Jan 2024 12:40:15 -0500
Subject: [PATCH 0020/2191] Move `api/v1/timelines/list` to request spec
 (#28948)

---
 .../api/v1/timelines/list_spec.rb}            | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)
 rename spec/{controllers/api/v1/timelines/list_controller_spec.rb => requests/api/v1/timelines/list_spec.rb} (73%)

diff --git a/spec/controllers/api/v1/timelines/list_controller_spec.rb b/spec/requests/api/v1/timelines/list_spec.rb
similarity index 73%
rename from spec/controllers/api/v1/timelines/list_controller_spec.rb
rename to spec/requests/api/v1/timelines/list_spec.rb
index 4ef5d41af83686..98d24567459c51 100644
--- a/spec/controllers/api/v1/timelines/list_controller_spec.rb
+++ b/spec/requests/api/v1/timelines/list_spec.rb
@@ -2,20 +2,17 @@
 
 require 'rails_helper'
 
-describe Api::V1::Timelines::ListController do
-  render_views
-
+describe 'API V1 Timelines List' do
   let(:user) { Fabricate(:user) }
+  let(:scopes)  { 'read:statuses' }
+  let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+  let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
   let(:list) { Fabricate(:list, account: user.account) }
 
-  before do
-    allow(controller).to receive(:doorkeeper_token) { token }
-  end
-
   context 'with a user context' do
     let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read:lists') }
 
-    describe 'GET #show' do
+    describe 'GET /api/v1/timelines/list/:id' do
       before do
         follow = Fabricate(:follow, account: user.account)
         list.accounts << follow.target_account
@@ -23,7 +20,8 @@
       end
 
       it 'returns http success' do
-        get :show, params: { id: list.id }
+        get "/api/v1/timelines/list/#{list.id}", headers: headers
+
         expect(response).to have_http_status(200)
       end
     end
@@ -35,7 +33,8 @@
 
     describe 'GET #show' do
       it 'returns http not found' do
-        get :show, params: { id: list.id }
+        get "/api/v1/timelines/list/#{list.id}", headers: headers
+
         expect(response).to have_http_status(404)
       end
     end
@@ -46,7 +45,7 @@
 
     describe 'GET #show' do
       it 'returns http unprocessable entity' do
-        get :show, params: { id: list.id }
+        get "/api/v1/timelines/list/#{list.id}", headers: headers
 
         expect(response).to have_http_status(422)
         expect(response.headers['Link']).to be_nil

From 7adcc0aae3cadf946411192e680be9e1b7af9d7a Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 26 Jan 2024 12:40:39 -0500
Subject: [PATCH 0021/2191] Move `api/v1/trends/*` to request specs (#28949)

---
 .../api/v1/trends/links_spec.rb}                       | 10 ++++------
 .../api/v1/trends/statuses_spec.rb}                    | 10 ++++------
 .../api/v1/trends/tags_spec.rb}                        | 10 ++++------
 3 files changed, 12 insertions(+), 18 deletions(-)
 rename spec/{controllers/api/v1/trends/links_controller_spec.rb => requests/api/v1/trends/links_spec.rb} (84%)
 rename spec/{controllers/api/v1/trends/statuses_controller_spec.rb => requests/api/v1/trends/statuses_spec.rb} (83%)
 rename spec/{controllers/api/v1/trends/tags_controller_spec.rb => requests/api/v1/trends/tags_spec.rb} (85%)

diff --git a/spec/controllers/api/v1/trends/links_controller_spec.rb b/spec/requests/api/v1/trends/links_spec.rb
similarity index 84%
rename from spec/controllers/api/v1/trends/links_controller_spec.rb
rename to spec/requests/api/v1/trends/links_spec.rb
index bcaf066f1602a0..012d0359072c74 100644
--- a/spec/controllers/api/v1/trends/links_controller_spec.rb
+++ b/spec/requests/api/v1/trends/links_spec.rb
@@ -2,15 +2,13 @@
 
 require 'rails_helper'
 
-RSpec.describe Api::V1::Trends::LinksController do
-  render_views
-
-  describe 'GET #index' do
+RSpec.describe 'API V1 Trends Links' do
+  describe 'GET /api/v1/trends/links' do
     context 'when trends are disabled' do
       before { Setting.trends = false }
 
       it 'returns http success' do
-        get :index
+        get '/api/v1/trends/links'
 
         expect(response).to have_http_status(200)
       end
@@ -22,7 +20,7 @@
       it 'returns http success' do
         prepare_trends
         stub_const('Api::V1::Trends::LinksController::DEFAULT_LINKS_LIMIT', 2)
-        get :index
+        get '/api/v1/trends/links'
 
         expect(response).to have_http_status(200)
         expect(response.headers).to include('Link')
diff --git a/spec/controllers/api/v1/trends/statuses_controller_spec.rb b/spec/requests/api/v1/trends/statuses_spec.rb
similarity index 83%
rename from spec/controllers/api/v1/trends/statuses_controller_spec.rb
rename to spec/requests/api/v1/trends/statuses_spec.rb
index 25ab5f228a094e..3b906e8f822b44 100644
--- a/spec/controllers/api/v1/trends/statuses_controller_spec.rb
+++ b/spec/requests/api/v1/trends/statuses_spec.rb
@@ -2,15 +2,13 @@
 
 require 'rails_helper'
 
-RSpec.describe Api::V1::Trends::StatusesController do
-  render_views
-
-  describe 'GET #index' do
+RSpec.describe 'API V1 Trends Statuses' do
+  describe 'GET /api/v1/trends/statuses' do
     context 'when trends are disabled' do
       before { Setting.trends = false }
 
       it 'returns http success' do
-        get :index
+        get '/api/v1/trends/statuses'
 
         expect(response).to have_http_status(200)
       end
@@ -22,7 +20,7 @@
       it 'returns http success' do
         prepare_trends
         stub_const('Api::BaseController::DEFAULT_STATUSES_LIMIT', 2)
-        get :index
+        get '/api/v1/trends/statuses'
 
         expect(response).to have_http_status(200)
         expect(response.headers).to include('Link')
diff --git a/spec/controllers/api/v1/trends/tags_controller_spec.rb b/spec/requests/api/v1/trends/tags_spec.rb
similarity index 85%
rename from spec/controllers/api/v1/trends/tags_controller_spec.rb
rename to spec/requests/api/v1/trends/tags_spec.rb
index c889f1c5b9ef45..598f4e7752714d 100644
--- a/spec/controllers/api/v1/trends/tags_controller_spec.rb
+++ b/spec/requests/api/v1/trends/tags_spec.rb
@@ -2,15 +2,13 @@
 
 require 'rails_helper'
 
-RSpec.describe Api::V1::Trends::TagsController do
-  render_views
-
-  describe 'GET #index' do
+RSpec.describe 'API V1 Trends Tags' do
+  describe 'GET /api/v1/trends/tags' do
     context 'when trends are disabled' do
       before { Setting.trends = false }
 
       it 'returns http success' do
-        get :index
+        get '/api/v1/trends/tags'
 
         expect(response).to have_http_status(200)
         expect(response.headers).to_not include('Link')
@@ -23,7 +21,7 @@
       it 'returns http success' do
         prepare_trends
         stub_const('Api::V1::Trends::TagsController::DEFAULT_TAGS_LIMIT', 2)
-        get :index
+        get '/api/v1/trends/tags'
 
         expect(response).to have_http_status(200)
         expect(response.headers).to include('Link')

From b6baab447de9c394d93d5d0b9800b4a4dab28cd7 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 26 Jan 2024 12:41:13 -0500
Subject: [PATCH 0022/2191] Move `api/v2/admin/accounts` to request spec
 (#28950)

---
 .../api/v2/admin/accounts_spec.rb}                   | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)
 rename spec/{controllers/api/v2/admin/accounts_controller_spec.rb => requests/api/v2/admin/accounts_spec.rb} (94%)

diff --git a/spec/controllers/api/v2/admin/accounts_controller_spec.rb b/spec/requests/api/v2/admin/accounts_spec.rb
similarity index 94%
rename from spec/controllers/api/v2/admin/accounts_controller_spec.rb
rename to spec/requests/api/v2/admin/accounts_spec.rb
index 349f4d2528bd09..fb04850bb7d2cb 100644
--- a/spec/controllers/api/v2/admin/accounts_controller_spec.rb
+++ b/spec/requests/api/v2/admin/accounts_spec.rb
@@ -2,19 +2,14 @@
 
 require 'rails_helper'
 
-RSpec.describe Api::V2::Admin::AccountsController do
-  render_views
-
+RSpec.describe 'API V2 Admin Accounts' do
   let(:role)   { UserRole.find_by(name: 'Moderator') }
   let(:user)   { Fabricate(:user, role: role) }
   let(:scopes) { 'admin:read admin:write' }
   let(:token)  { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+  let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
   let(:account) { Fabricate(:account) }
 
-  before do
-    allow(controller).to receive(:doorkeeper_token) { token }
-  end
-
   describe 'GET #index' do
     let!(:remote_account)       { Fabricate(:account, domain: 'example.org') }
     let!(:other_remote_account) { Fabricate(:account, domain: 'foo.bar') }
@@ -28,7 +23,8 @@
 
     before do
       pending_account.user.update(approved: false)
-      get :index, params: params
+
+      get '/api/v2/admin/accounts', params: params, headers: headers
     end
 
     it_behaves_like 'forbidden for wrong scope', 'write:statuses'

From 5119fbc9b7e576b95404d1ffe126c212c09c9754 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 26 Jan 2024 12:41:39 -0500
Subject: [PATCH 0023/2191] Move
 `api/v1/admin/trends/links/preview_card_providers` to request spec (#28951)

---
 .../links/preview_card_providers_spec.rb}     | 21 +++++++------------
 1 file changed, 8 insertions(+), 13 deletions(-)
 rename spec/{controllers/api/v1/admin/trends/links/preview_card_providers_controller_spec.rb => requests/api/v1/admin/trends/links/preview_card_providers_spec.rb} (60%)

diff --git a/spec/controllers/api/v1/admin/trends/links/preview_card_providers_controller_spec.rb b/spec/requests/api/v1/admin/trends/links/preview_card_providers_spec.rb
similarity index 60%
rename from spec/controllers/api/v1/admin/trends/links/preview_card_providers_controller_spec.rb
rename to spec/requests/api/v1/admin/trends/links/preview_card_providers_spec.rb
index 76e215440d44f8..384a305d4a0551 100644
--- a/spec/controllers/api/v1/admin/trends/links/preview_card_providers_controller_spec.rb
+++ b/spec/requests/api/v1/admin/trends/links/preview_card_providers_spec.rb
@@ -2,31 +2,26 @@
 
 require 'rails_helper'
 
-describe Api::V1::Admin::Trends::Links::PreviewCardProvidersController do
-  render_views
-
+describe 'API V1 Admin Trends Links Preview Card Providers' do
   let(:role)   { UserRole.find_by(name: 'Admin') }
   let(:user)   { Fabricate(:user, role: role) }
   let(:scopes) { 'admin:read admin:write' }
   let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+  let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
   let(:account) { Fabricate(:account) }
   let(:preview_card_provider) { Fabricate(:preview_card_provider) }
 
-  before do
-    allow(controller).to receive(:doorkeeper_token) { token }
-  end
-
-  describe 'GET #index' do
+  describe 'GET /api/v1/admin/trends/links/publishers' do
     it 'returns http success' do
-      get :index, params: { account_id: account.id, limit: 2 }
+      get '/api/v1/admin/trends/links/publishers', params: { account_id: account.id, limit: 2 }, headers: headers
 
       expect(response).to have_http_status(200)
     end
   end
 
-  describe 'POST #approve' do
+  describe 'POST /api/v1/admin/trends/links/publishers/:id/approve' do
     before do
-      post :approve, params: { id: preview_card_provider.id }
+      post "/api/v1/admin/trends/links/publishers/#{preview_card_provider.id}/approve", headers: headers
     end
 
     it_behaves_like 'forbidden for wrong scope', 'write:statuses'
@@ -37,9 +32,9 @@
     end
   end
 
-  describe 'POST #reject' do
+  describe 'POST /api/v1/admin/trends/links/publishers/:id/reject' do
     before do
-      post :reject, params: { id: preview_card_provider.id }
+      post "/api/v1/admin/trends/links/publishers/#{preview_card_provider.id}/reject", headers: headers
     end
 
     it_behaves_like 'forbidden for wrong scope', 'write:statuses'

From 239244e2ed577c12eda63f26735bf270dd0213b2 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 26 Jan 2024 12:43:08 -0500
Subject: [PATCH 0024/2191] Combine repeated subject in ap fetch remote account
 service spec (#28952)

---
 .../fetch_remote_account_service_spec.rb      | 87 +++++--------------
 1 file changed, 21 insertions(+), 66 deletions(-)

diff --git a/spec/services/activitypub/fetch_remote_account_service_spec.rb b/spec/services/activitypub/fetch_remote_account_service_spec.rb
index ac7484d96d1a44..4015723f6df9cf 100644
--- a/spec/services/activitypub/fetch_remote_account_service_spec.rb
+++ b/spec/services/activitypub/fetch_remote_account_service_spec.rb
@@ -21,20 +21,14 @@
     let(:account) { subject.call('https://example.com/alice', id: true) }
 
     shared_examples 'sets profile data' do
-      it 'returns an account' do
-        expect(account).to be_an Account
-      end
-
-      it 'sets display name' do
-        expect(account.display_name).to eq 'Alice'
-      end
-
-      it 'sets note' do
-        expect(account.note).to eq 'Foo bar'
-      end
-
-      it 'sets URL' do
-        expect(account.url).to eq 'https://example.com/alice'
+      it 'returns an account with expected details' do
+        expect(account)
+          .to be_an(Account)
+          .and have_attributes(
+            display_name: eq('Alice'),
+            note: eq('Foo bar'),
+            url: eq('https://example.com/alice')
+          )
       end
     end
 
@@ -48,19 +42,12 @@
         stub_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com').to_return(body: Oj.dump(webfinger), headers: { 'Content-Type': 'application/jrd+json' })
       end
 
-      it 'fetches resource' do
-        account
-        expect(a_request(:get, 'https://example.com/alice')).to have_been_made.once
-      end
+      it 'fetches resource and looks up webfinger and returns nil' do
+        expect(account).to be_nil
 
-      it 'looks up webfinger' do
-        account
+        expect(a_request(:get, 'https://example.com/alice')).to have_been_made.once
         expect(a_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com')).to have_been_made.once
       end
-
-      it 'returns nil' do
-        expect(account).to be_nil
-      end
     end
 
     context 'when URI and WebFinger share the same host' do
@@ -71,17 +58,12 @@
         stub_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com').to_return(body: Oj.dump(webfinger), headers: { 'Content-Type': 'application/jrd+json' })
       end
 
-      it 'fetches resource' do
+      it 'fetches resource and looks up webfinger and sets attributes' do
         account
-        expect(a_request(:get, 'https://example.com/alice')).to have_been_made.once
-      end
 
-      it 'looks up webfinger' do
-        account
+        expect(a_request(:get, 'https://example.com/alice')).to have_been_made.once
         expect(a_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com')).to have_been_made.once
-      end
 
-      it 'sets username and domain from webfinger' do
         expect(account.username).to eq 'alice'
         expect(account.domain).to eq 'example.com'
       end
@@ -98,22 +80,13 @@
         stub_request(:get, 'https://iscool.af/.well-known/webfinger?resource=acct:alice@iscool.af').to_return(body: Oj.dump(webfinger), headers: { 'Content-Type': 'application/jrd+json' })
       end
 
-      it 'fetches resource' do
+      it 'fetches resource and looks up webfinger and follows redirection and sets attributes' do
         account
-        expect(a_request(:get, 'https://example.com/alice')).to have_been_made.once
-      end
 
-      it 'looks up webfinger' do
-        account
+        expect(a_request(:get, 'https://example.com/alice')).to have_been_made.once
         expect(a_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com')).to have_been_made.once
-      end
-
-      it 'looks up "redirected" webfinger' do
-        account
         expect(a_request(:get, 'https://iscool.af/.well-known/webfinger?resource=acct:alice@iscool.af')).to have_been_made.once
-      end
 
-      it 'sets username and domain from final webfinger' do
         expect(account.username).to eq 'alice'
         expect(account.domain).to eq 'iscool.af'
       end
@@ -129,19 +102,12 @@
         stub_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com').to_return(body: Oj.dump(webfinger), headers: { 'Content-Type': 'application/jrd+json' })
       end
 
-      it 'fetches resource' do
-        account
-        expect(a_request(:get, 'https://example.com/alice')).to have_been_made.once
-      end
+      it 'fetches resource and looks up webfinger and does not create account' do
+        expect(account).to be_nil
 
-      it 'looks up webfinger' do
-        account
+        expect(a_request(:get, 'https://example.com/alice')).to have_been_made.once
         expect(a_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com')).to have_been_made.once
       end
-
-      it 'does not create account' do
-        expect(account).to be_nil
-      end
     end
 
     context 'when WebFinger returns a different URI after a redirection' do
@@ -153,24 +119,13 @@
         stub_request(:get, 'https://iscool.af/.well-known/webfinger?resource=acct:alice@iscool.af').to_return(body: Oj.dump(webfinger), headers: { 'Content-Type': 'application/jrd+json' })
       end
 
-      it 'fetches resource' do
-        account
-        expect(a_request(:get, 'https://example.com/alice')).to have_been_made.once
-      end
+      it 'fetches resource and looks up webfinger and follows redirect and does not create account' do
+        expect(account).to be_nil
 
-      it 'looks up webfinger' do
-        account
+        expect(a_request(:get, 'https://example.com/alice')).to have_been_made.once
         expect(a_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com')).to have_been_made.once
-      end
-
-      it 'looks up "redirected" webfinger' do
-        account
         expect(a_request(:get, 'https://iscool.af/.well-known/webfinger?resource=acct:alice@iscool.af')).to have_been_made.once
       end
-
-      it 'does not create account' do
-        expect(account).to be_nil
-      end
     end
 
     context 'with wrong id' do

From 44f6d285af45682b5ddb7225bfdc56b48cd27a91 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 26 Jan 2024 12:44:12 -0500
Subject: [PATCH 0025/2191] Combine repeated subject in ap fetch remote actor
 service spec (#28953)

---
 .../fetch_remote_actor_service_spec.rb        | 87 +++++--------------
 1 file changed, 21 insertions(+), 66 deletions(-)

diff --git a/spec/services/activitypub/fetch_remote_actor_service_spec.rb b/spec/services/activitypub/fetch_remote_actor_service_spec.rb
index 93d31b69d5190f..485ca81a11aaa9 100644
--- a/spec/services/activitypub/fetch_remote_actor_service_spec.rb
+++ b/spec/services/activitypub/fetch_remote_actor_service_spec.rb
@@ -21,20 +21,14 @@
     let(:account) { subject.call('https://example.com/alice', id: true) }
 
     shared_examples 'sets profile data' do
-      it 'returns an account' do
-        expect(account).to be_an Account
-      end
-
-      it 'sets display name' do
-        expect(account.display_name).to eq 'Alice'
-      end
-
-      it 'sets note' do
-        expect(account.note).to eq 'Foo bar'
-      end
-
-      it 'sets URL' do
-        expect(account.url).to eq 'https://example.com/alice'
+      it 'returns an account and sets attributes' do
+        expect(account)
+          .to be_an(Account)
+          .and have_attributes(
+            display_name: eq('Alice'),
+            note: eq('Foo bar'),
+            url: eq('https://example.com/alice')
+          )
       end
     end
 
@@ -48,19 +42,12 @@
         stub_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com').to_return(body: Oj.dump(webfinger), headers: { 'Content-Type': 'application/jrd+json' })
       end
 
-      it 'fetches resource' do
-        account
-        expect(a_request(:get, 'https://example.com/alice')).to have_been_made.once
-      end
+      it 'fetches resource and looks up webfinger and returns nil' do
+        expect(account).to be_nil
 
-      it 'looks up webfinger' do
-        account
+        expect(a_request(:get, 'https://example.com/alice')).to have_been_made.once
         expect(a_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com')).to have_been_made.once
       end
-
-      it 'returns nil' do
-        expect(account).to be_nil
-      end
     end
 
     context 'when URI and WebFinger share the same host' do
@@ -71,17 +58,12 @@
         stub_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com').to_return(body: Oj.dump(webfinger), headers: { 'Content-Type': 'application/jrd+json' })
       end
 
-      it 'fetches resource' do
+      it 'fetches resource and looks up webfinger and sets values' do
         account
-        expect(a_request(:get, 'https://example.com/alice')).to have_been_made.once
-      end
 
-      it 'looks up webfinger' do
-        account
+        expect(a_request(:get, 'https://example.com/alice')).to have_been_made.once
         expect(a_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com')).to have_been_made.once
-      end
 
-      it 'sets username and domain from webfinger' do
         expect(account.username).to eq 'alice'
         expect(account.domain).to eq 'example.com'
       end
@@ -98,22 +80,13 @@
         stub_request(:get, 'https://iscool.af/.well-known/webfinger?resource=acct:alice@iscool.af').to_return(body: Oj.dump(webfinger), headers: { 'Content-Type': 'application/jrd+json' })
       end
 
-      it 'fetches resource' do
+      it 'fetches resource and looks up webfinger and follows redirect and sets values' do
         account
-        expect(a_request(:get, 'https://example.com/alice')).to have_been_made.once
-      end
 
-      it 'looks up webfinger' do
-        account
+        expect(a_request(:get, 'https://example.com/alice')).to have_been_made.once
         expect(a_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com')).to have_been_made.once
-      end
-
-      it 'looks up "redirected" webfinger' do
-        account
         expect(a_request(:get, 'https://iscool.af/.well-known/webfinger?resource=acct:alice@iscool.af')).to have_been_made.once
-      end
 
-      it 'sets username and domain from final webfinger' do
         expect(account.username).to eq 'alice'
         expect(account.domain).to eq 'iscool.af'
       end
@@ -129,19 +102,12 @@
         stub_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com').to_return(body: Oj.dump(webfinger), headers: { 'Content-Type': 'application/jrd+json' })
       end
 
-      it 'fetches resource' do
-        account
-        expect(a_request(:get, 'https://example.com/alice')).to have_been_made.once
-      end
+      it 'fetches resource and looks up webfinger and does not create account' do
+        expect(account).to be_nil
 
-      it 'looks up webfinger' do
-        account
+        expect(a_request(:get, 'https://example.com/alice')).to have_been_made.once
         expect(a_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com')).to have_been_made.once
       end
-
-      it 'does not create account' do
-        expect(account).to be_nil
-      end
     end
 
     context 'when WebFinger returns a different URI after a redirection' do
@@ -153,24 +119,13 @@
         stub_request(:get, 'https://iscool.af/.well-known/webfinger?resource=acct:alice@iscool.af').to_return(body: Oj.dump(webfinger), headers: { 'Content-Type': 'application/jrd+json' })
       end
 
-      it 'fetches resource' do
-        account
-        expect(a_request(:get, 'https://example.com/alice')).to have_been_made.once
-      end
+      it 'fetches resource and looks up webfinger and follows redirect and does not create account' do
+        expect(account).to be_nil
 
-      it 'looks up webfinger' do
-        account
+        expect(a_request(:get, 'https://example.com/alice')).to have_been_made.once
         expect(a_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com')).to have_been_made.once
-      end
-
-      it 'looks up "redirected" webfinger' do
-        account
         expect(a_request(:get, 'https://iscool.af/.well-known/webfinger?resource=acct:alice@iscool.af')).to have_been_made.once
       end
-
-      it 'does not create account' do
-        expect(account).to be_nil
-      end
     end
 
     context 'with wrong id' do

From ff8937aa2c81c616cbe3b2d7ce7d0d11850f37b8 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 26 Jan 2024 12:45:54 -0500
Subject: [PATCH 0026/2191] Move `api/v1/statuses/*` to request spec (#28954)

---
 .../api/v1/statuses/histories_spec.rb}        | 17 +++++--------
 .../api/v1/statuses/mutes_spec.rb}            | 21 ++++++----------
 .../api/v1/statuses/reblogs_spec.rb}          | 25 ++++++++-----------
 .../api/v1/statuses/translations_spec.rb}     | 17 +++++--------
 4 files changed, 30 insertions(+), 50 deletions(-)
 rename spec/{controllers/api/v1/statuses/histories_controller_spec.rb => requests/api/v1/statuses/histories_spec.rb} (53%)
 rename spec/{controllers/api/v1/statuses/mutes_controller_spec.rb => requests/api/v1/statuses/mutes_spec.rb} (66%)
 rename spec/{controllers/api/v1/statuses/reblogs_controller_spec.rb => requests/api/v1/statuses/reblogs_spec.rb} (81%)
 rename spec/{controllers/api/v1/statuses/translations_controller_spec.rb => requests/api/v1/statuses/translations_spec.rb} (65%)

diff --git a/spec/controllers/api/v1/statuses/histories_controller_spec.rb b/spec/requests/api/v1/statuses/histories_spec.rb
similarity index 53%
rename from spec/controllers/api/v1/statuses/histories_controller_spec.rb
rename to spec/requests/api/v1/statuses/histories_spec.rb
index 99384c8ed5e914..b3761ca6882a44 100644
--- a/spec/controllers/api/v1/statuses/histories_controller_spec.rb
+++ b/spec/requests/api/v1/statuses/histories_spec.rb
@@ -2,23 +2,18 @@
 
 require 'rails_helper'
 
-describe Api::V1::Statuses::HistoriesController do
-  render_views
-
+describe 'API V1 Statuses Histories' do
   let(:user)  { Fabricate(:user) }
-  let(:app)   { Fabricate(:application, name: 'Test app', website: 'http://testapp.com') }
-  let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read:statuses', application: app) }
+  let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+  let(:scopes)  { 'read:statuses' }
+  let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
 
   context 'with an oauth token' do
-    before do
-      allow(controller).to receive(:doorkeeper_token) { token }
-    end
-
-    describe 'GET #show' do
+    describe 'GET /api/v1/statuses/:status_id/history' do
       let(:status) { Fabricate(:status, account: user.account) }
 
       before do
-        get :show, params: { status_id: status.id }
+        get "/api/v1/statuses/#{status.id}/history", headers: headers
       end
 
       it 'returns http success' do
diff --git a/spec/controllers/api/v1/statuses/mutes_controller_spec.rb b/spec/requests/api/v1/statuses/mutes_spec.rb
similarity index 66%
rename from spec/controllers/api/v1/statuses/mutes_controller_spec.rb
rename to spec/requests/api/v1/statuses/mutes_spec.rb
index 03274fe1cd2b5c..72fd7d9d11503d 100644
--- a/spec/controllers/api/v1/statuses/mutes_controller_spec.rb
+++ b/spec/requests/api/v1/statuses/mutes_spec.rb
@@ -2,23 +2,18 @@
 
 require 'rails_helper'
 
-describe Api::V1::Statuses::MutesController do
-  render_views
-
+describe 'API V1 Statuses Mutes' do
   let(:user)  { Fabricate(:user) }
-  let(:app)   { Fabricate(:application, name: 'Test app', website: 'http://testapp.com') }
-  let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'write:mutes', application: app) }
+  let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+  let(:scopes)  { 'write:mutes' }
+  let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
 
   context 'with an oauth token' do
-    before do
-      allow(controller).to receive(:doorkeeper_token) { token }
-    end
-
-    describe 'POST #create' do
+    describe 'POST /api/v1/statuses/:status_id/mute' do
       let(:status) { Fabricate(:status, account: user.account) }
 
       before do
-        post :create, params: { status_id: status.id }
+        post "/api/v1/statuses/#{status.id}/mute", headers: headers
       end
 
       it 'creates a conversation mute', :aggregate_failures do
@@ -27,12 +22,12 @@
       end
     end
 
-    describe 'POST #destroy' do
+    describe 'POST /api/v1/statuses/:status_id/unmute' do
       let(:status) { Fabricate(:status, account: user.account) }
 
       before do
         user.account.mute_conversation!(status.conversation)
-        post :destroy, params: { status_id: status.id }
+        post "/api/v1/statuses/#{status.id}/unmute", headers: headers
       end
 
       it 'destroys the conversation mute', :aggregate_failures do
diff --git a/spec/controllers/api/v1/statuses/reblogs_controller_spec.rb b/spec/requests/api/v1/statuses/reblogs_spec.rb
similarity index 81%
rename from spec/controllers/api/v1/statuses/reblogs_controller_spec.rb
rename to spec/requests/api/v1/statuses/reblogs_spec.rb
index 014a03c1a20698..cf0a1f861d9bde 100644
--- a/spec/controllers/api/v1/statuses/reblogs_controller_spec.rb
+++ b/spec/requests/api/v1/statuses/reblogs_spec.rb
@@ -2,23 +2,18 @@
 
 require 'rails_helper'
 
-describe Api::V1::Statuses::ReblogsController do
-  render_views
-
+describe 'API V1 Statuses Reblogs' do
   let(:user)  { Fabricate(:user) }
-  let(:app)   { Fabricate(:application, name: 'Test app', website: 'http://testapp.com') }
-  let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'write:statuses', application: app) }
+  let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+  let(:scopes)  { 'write:statuses' }
+  let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
 
   context 'with an oauth token' do
-    before do
-      allow(controller).to receive(:doorkeeper_token) { token }
-    end
-
-    describe 'POST #create' do
+    describe 'POST /api/v1/statuses/:status_id/reblog' do
       let(:status) { Fabricate(:status, account: user.account) }
 
       before do
-        post :create, params: { status_id: status.id }
+        post "/api/v1/statuses/#{status.id}/reblog", headers: headers
       end
 
       context 'with public status' do
@@ -46,13 +41,13 @@
       end
     end
 
-    describe 'POST #destroy', :sidekiq_inline do
+    describe 'POST /api/v1/statuses/:status_id/unreblog', :sidekiq_inline do
       context 'with public status' do
         let(:status) { Fabricate(:status, account: user.account) }
 
         before do
           ReblogService.new.call(user.account, status)
-          post :destroy, params: { status_id: status.id }
+          post "/api/v1/statuses/#{status.id}/unreblog", headers: headers
         end
 
         it 'destroys the reblog', :aggregate_failures do
@@ -76,7 +71,7 @@
         before do
           ReblogService.new.call(user.account, status)
           status.account.block!(user.account)
-          post :destroy, params: { status_id: status.id }
+          post "/api/v1/statuses/#{status.id}/unreblog", headers: headers
         end
 
         it 'destroys the reblog', :aggregate_failures do
@@ -98,7 +93,7 @@
         let(:status) { Fabricate(:status, visibility: :private) }
 
         before do
-          post :destroy, params: { status_id: status.id }
+          post "/api/v1/statuses/#{status.id}/unreblog", headers: headers
         end
 
         it 'returns http not found' do
diff --git a/spec/controllers/api/v1/statuses/translations_controller_spec.rb b/spec/requests/api/v1/statuses/translations_spec.rb
similarity index 65%
rename from spec/controllers/api/v1/statuses/translations_controller_spec.rb
rename to spec/requests/api/v1/statuses/translations_spec.rb
index 6257494ae18627..5b0a994561c184 100644
--- a/spec/controllers/api/v1/statuses/translations_controller_spec.rb
+++ b/spec/requests/api/v1/statuses/translations_spec.rb
@@ -2,19 +2,14 @@
 
 require 'rails_helper'
 
-describe Api::V1::Statuses::TranslationsController do
-  render_views
-
+describe 'API V1 Statuses Translations' do
   let(:user)  { Fabricate(:user) }
-  let(:app)   { Fabricate(:application, name: 'Test app', website: 'http://testapp.com') }
-  let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read:statuses', application: app) }
+  let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+  let(:scopes)  { 'read:statuses' }
+  let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
 
   context 'with an oauth token' do
-    before do
-      allow(controller).to receive(:doorkeeper_token) { token }
-    end
-
-    describe 'POST #create' do
+    describe 'POST /api/v1/statuses/:status_id/translate' do
       let(:status) { Fabricate(:status, account: user.account, text: 'Hola', language: 'es') }
 
       before do
@@ -22,7 +17,7 @@
         service = instance_double(TranslationService::DeepL, translate: [translation])
         allow(TranslationService).to receive_messages(configured?: true, configured: service)
         Rails.cache.write('translation_service/languages', { 'es' => ['en'] })
-        post :create, params: { status_id: status.id }
+        post "/api/v1/statuses/#{status.id}/translate", headers: headers
       end
 
       it 'returns http success' do

From 1467f1e1e1c18dc4b310862ff1f719165a24cfb6 Mon Sep 17 00:00:00 2001
From: J H <jh97uk@icloud.com>
Date: Tue, 30 Jan 2024 13:38:49 +0000
Subject: [PATCH 0027/2191] Fixed the toggle emoji dropdown bug  (#29012)

---
 .../features/compose/components/emoji_picker_dropdown.jsx    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.jsx b/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.jsx
index 9949d2c001007b..37017f4cc32021 100644
--- a/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.jsx
+++ b/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.jsx
@@ -164,6 +164,7 @@ class EmojiPickerMenuImpl extends PureComponent {
     intl: PropTypes.object.isRequired,
     skinTone: PropTypes.number.isRequired,
     onSkinTone: PropTypes.func.isRequired,
+    pickerButtonRef: PropTypes.func.isRequired
   };
 
   static defaultProps = {
@@ -178,7 +179,7 @@ class EmojiPickerMenuImpl extends PureComponent {
   };
 
   handleDocumentClick = e => {
-    if (this.node && !this.node.contains(e.target)) {
+    if (this.node && !this.node.contains(e.target) && !this.props.pickerButtonRef.contains(e.target)) {
       this.props.onClose();
     }
   };
@@ -233,6 +234,7 @@ class EmojiPickerMenuImpl extends PureComponent {
       emoji.native = emoji.colons;
     }
     if (!(event.ctrlKey || event.metaKey)) {
+
       this.props.onClose();
     }
     this.props.onPick(emoji);
@@ -407,6 +409,7 @@ class EmojiPickerDropdown extends PureComponent {
                   onSkinTone={onSkinTone}
                   skinTone={skinTone}
                   frequentlyUsedEmojis={frequentlyUsedEmojis}
+                  pickerButtonRef={this.target}
                 />
               </div>
             </div>

From adcd693b71805e703d04d1306c0ac2575cd8f383 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 30 Jan 2024 10:29:42 -0500
Subject: [PATCH 0028/2191] Use existing `MediaAttachment.remote` scope in
 media CLI (#28912)

---
 lib/mastodon/cli/media.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/mastodon/cli/media.rb b/lib/mastodon/cli/media.rb
index 87946e0262f35b..ac8f219807284c 100644
--- a/lib/mastodon/cli/media.rb
+++ b/lib/mastodon/cli/media.rb
@@ -58,7 +58,7 @@ def remove
       end
 
       unless options[:prune_profiles] || options[:remove_headers]
-        processed, aggregate = parallelize_with_progress(MediaAttachment.cached.where.not(remote_url: '').where(created_at: ..time_ago)) do |media_attachment|
+        processed, aggregate = parallelize_with_progress(MediaAttachment.cached.remote.where(created_at: ..time_ago)) do |media_attachment|
           next if media_attachment.file.blank?
 
           size = (media_attachment.file_file_size || 0) + (media_attachment.thumbnail_file_size || 0)

From 9d3830344fc01bf72a3d624b30c881bf1c90888a Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 30 Jan 2024 16:30:39 +0100
Subject: [PATCH 0029/2191] Update dependency immutable to v4.3.5 (#28933)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 3f70a02e74803f..c97667808a73c6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9123,9 +9123,9 @@ __metadata:
   linkType: hard
 
 "immutable@npm:^4.0.0, immutable@npm:^4.0.0-rc.1, immutable@npm:^4.3.0":
-  version: 4.3.4
-  resolution: "immutable@npm:4.3.4"
-  checksum: c15b9f0fa7b3c9315725cb00704fddad59f0e668a7379c39b9a528a8386140ee9effb015ae51a5b423e05c59d15fc0b38c970db6964ad6b3e05d0761db68441f
+  version: 4.3.5
+  resolution: "immutable@npm:4.3.5"
+  checksum: 63d2d7908241a955d18c7822fd2215b6e89ff5a1a33cc72cd475b013cbbdef7a705aa5170a51ce9f84a57f62fdddfaa34e7b5a14b33d8a43c65cc6a881d6e894
   languageName: node
   linkType: hard
 

From f91acba70ac455b1240616e61968a36f99176ce7 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 30 Jan 2024 10:32:20 -0500
Subject: [PATCH 0030/2191] Combine repeated requests in account controller
 concern spec (#28957)

---
 .../account_controller_concern_spec.rb        | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/spec/controllers/concerns/account_controller_concern_spec.rb b/spec/controllers/concerns/account_controller_concern_spec.rb
index e3295204aaf393..6eb970dedbba59 100644
--- a/spec/controllers/concerns/account_controller_concern_spec.rb
+++ b/spec/controllers/concerns/account_controller_concern_spec.rb
@@ -49,22 +49,21 @@ def success
   end
 
   context 'when account is not suspended' do
-    it 'assigns @account' do
-      account = Fabricate(:account)
+    let(:account) { Fabricate(:account, username: 'username') }
+
+    it 'assigns @account, returns success, and sets link headers' do
       get 'success', params: { account_username: account.username }
-      expect(assigns(:account)).to eq account
-    end
 
-    it 'sets link headers' do
-      Fabricate(:account, username: 'username')
-      get 'success', params: { account_username: 'username' }
-      expect(response.headers['Link'].to_s).to eq '<http://test.host/.well-known/webfinger?resource=acct%3Ausername%40cb6e6126.ngrok.io>; rel="lrdd"; type="application/jrd+json", <https://cb6e6126.ngrok.io/users/username>; rel="alternate"; type="application/activity+json"'
+      expect(assigns(:account)).to eq account
+      expect(response).to have_http_status(200)
+      expect(response.headers['Link'].to_s).to eq(expected_link_headers)
     end
 
-    it 'returns http success' do
-      account = Fabricate(:account)
-      get 'success', params: { account_username: account.username }
-      expect(response).to have_http_status(200)
+    def expected_link_headers
+      [
+        '<http://test.host/.well-known/webfinger?resource=acct%3Ausername%40cb6e6126.ngrok.io>; rel="lrdd"; type="application/jrd+json"',
+        '<https://cb6e6126.ngrok.io/users/username>; rel="alternate"; type="application/activity+json"',
+      ].join(', ')
     end
   end
 end

From b3075a9993bff1bfca18ada91fe5587e921781d5 Mon Sep 17 00:00:00 2001
From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Wed, 31 Jan 2024 00:34:07 +0900
Subject: [PATCH 0031/2191] Remove unused l18n messages (#28964)

---
 .../mastodon/features/compose/components/poll_form.jsx          | 2 --
 app/javascript/mastodon/locales/en.json                         | 2 --
 2 files changed, 4 deletions(-)

diff --git a/app/javascript/mastodon/features/compose/components/poll_form.jsx b/app/javascript/mastodon/features/compose/components/poll_form.jsx
index 3c02810e7a29f5..b3566fd6f5ad7f 100644
--- a/app/javascript/mastodon/features/compose/components/poll_form.jsx
+++ b/app/javascript/mastodon/features/compose/components/poll_form.jsx
@@ -18,8 +18,6 @@ import AutosuggestInput from 'mastodon/components/autosuggest_input';
 
 const messages = defineMessages({
   option_placeholder: { id: 'compose_form.poll.option_placeholder', defaultMessage: 'Option {number}' },
-  add_option: { id: 'compose_form.poll.add_option', defaultMessage: 'Add option' },
-  remove_option: { id: 'compose_form.poll.remove_option', defaultMessage: 'Remove this option' },
   duration: { id: 'compose_form.poll.duration', defaultMessage: 'Poll length' },
   type: { id: 'compose_form.poll.type', defaultMessage: 'Style' },
   switchToMultiple: { id: 'compose_form.poll.switch_to_multiple', defaultMessage: 'Change poll to allow multiple choices' },
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index 4befe779490189..22a831b09329f8 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -145,11 +145,9 @@
   "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
   "compose_form.lock_disclaimer.lock": "locked",
   "compose_form.placeholder": "What's on your mind?",
-  "compose_form.poll.add_option": "Add option",
   "compose_form.poll.duration": "Poll duration",
   "compose_form.poll.multiple": "Multiple choice",
   "compose_form.poll.option_placeholder": "Option {number}",
-  "compose_form.poll.remove_option": "Remove this option",
   "compose_form.poll.single": "Pick one",
   "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
   "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",

From 86fbde7b4615a1ac8209ca8886b4d7a3d8754063 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 30 Jan 2024 10:38:33 -0500
Subject: [PATCH 0032/2191] Fix `Style/NumericLiterals` cop in ProfileStories
 support module (#28971)

---
 spec/support/stories/profile_stories.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/support/stories/profile_stories.rb b/spec/support/stories/profile_stories.rb
index 2b345ddef10b31..74342c337d6688 100644
--- a/spec/support/stories/profile_stories.rb
+++ b/spec/support/stories/profile_stories.rb
@@ -10,7 +10,7 @@ def as_a_registered_user
       account: Fabricate(:account, username: 'bob')
     )
 
-    Web::Setting.where(user: bob).first_or_initialize(user: bob).update!(data: { introductionVersion: 201812160442020 }) if finished_onboarding # rubocop:disable Style/NumericLiterals
+    Web::Setting.where(user: bob).first_or_initialize(user: bob).update!(data: { introductionVersion: 2018_12_16_044202 }) if finished_onboarding
   end
 
   def as_a_logged_in_user

From ce0d134147707cf7037784fe703837ca1627ea21 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 30 Jan 2024 10:39:01 -0500
Subject: [PATCH 0033/2191] Add `redirect_with_vary` to `AllowedMethods` for
 `Style/FormatStringToken` cop (#28973)

---
 .rubocop.yml     |  9 +++++++++
 config/routes.rb | 12 ++++++------
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 69989411443558..330c40de1b67b0 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -174,6 +174,15 @@ Style/ClassAndModuleChildren:
 Style/Documentation:
   Enabled: false
 
+# Reason: Route redirects are not token-formatted and must be skipped
+# https://docs.rubocop.org/rubocop/cops_style.html#styleformatstringtoken
+Style/FormatStringToken:
+  inherit_mode:
+    merge:
+      - AllowedMethods # The rubocop-rails config adds `redirect`
+  AllowedMethods:
+    - redirect_with_vary
+
 # Reason: Enforce modern Ruby style
 # https://docs.rubocop.org/rubocop/cops_style.html#stylehashsyntax
 Style/HashSyntax:
diff --git a/config/routes.rb b/config/routes.rb
index c4f862acafa51f..bb088821fd7356 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -104,12 +104,12 @@ def redirect_with_vary(path)
     confirmations: 'auth/confirmations',
   }
 
-  # rubocop:disable Style/FormatStringToken - those do not go through the usual formatting functions and are not safe to correct
-  get '/users/:username', to: redirect_with_vary('/@%{username}'), constraints: ->(req) { req.format.nil? || req.format.html? }
-  get '/users/:username/following', to: redirect_with_vary('/@%{username}/following'), constraints: ->(req) { req.format.nil? || req.format.html? }
-  get '/users/:username/followers', to: redirect_with_vary('/@%{username}/followers'), constraints: ->(req) { req.format.nil? || req.format.html? }
-  get '/users/:username/statuses/:id', to: redirect_with_vary('/@%{username}/%{id}'), constraints: ->(req) { req.format.nil? || req.format.html? }
-  # rubocop:enable Style/FormatStringToken
+  with_options constraints: ->(req) { req.format.nil? || req.format.html? } do
+    get '/users/:username', to: redirect_with_vary('/@%{username}')
+    get '/users/:username/following', to: redirect_with_vary('/@%{username}/following')
+    get '/users/:username/followers', to: redirect_with_vary('/@%{username}/followers')
+    get '/users/:username/statuses/:id', to: redirect_with_vary('/@%{username}/%{id}')
+  end
 
   get '/authorize_follow', to: redirect { |_, request| "/authorize_interaction?#{request.params.to_query}" }
 

From 8c08e5cdb282bb5bc7229335b24e947c179498f8 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 30 Jan 2024 15:39:34 +0000
Subject: [PATCH 0034/2191] Update devDependencies (non-major) (#29000)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index c97667808a73c6..8ddbb0d0c0fb28 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1777,8 +1777,8 @@ __metadata:
   linkType: hard
 
 "@formatjs/cli@npm:^6.1.1":
-  version: 6.2.6
-  resolution: "@formatjs/cli@npm:6.2.6"
+  version: 6.2.7
+  resolution: "@formatjs/cli@npm:6.2.7"
   peerDependencies:
     vue: ^3.3.4
   peerDependenciesMeta:
@@ -1786,7 +1786,7 @@ __metadata:
       optional: true
   bin:
     formatjs: bin/formatjs
-  checksum: f8b0bc45c72b83437f0dc91a2d3ea513852c11bfd8eedbc2f255b19552f153bccb4d38fcd281f897ca60d0dfddf2b99de22e5a87cb1e173ca11df88c61cde2e4
+  checksum: ee7b0873a734e02721ce1ee107ee60845bb30855f4ca686bfb6c5e9862353249d5d20748b18db93200aabc7a59875ff062f485c64d41cb8e61f1d43e2bb5eceb
   languageName: node
   linkType: hard
 
@@ -2945,8 +2945,8 @@ __metadata:
   linkType: hard
 
 "@testing-library/jest-dom@npm:^6.0.0":
-  version: 6.2.0
-  resolution: "@testing-library/jest-dom@npm:6.2.0"
+  version: 6.4.0
+  resolution: "@testing-library/jest-dom@npm:6.4.0"
   dependencies:
     "@adobe/css-tools": "npm:^4.3.2"
     "@babel/runtime": "npm:^7.9.2"
@@ -2958,19 +2958,22 @@ __metadata:
     redent: "npm:^3.0.0"
   peerDependencies:
     "@jest/globals": ">= 28"
+    "@types/bun": "*"
     "@types/jest": ">= 28"
     jest: ">= 28"
     vitest: ">= 0.32"
   peerDependenciesMeta:
     "@jest/globals":
       optional: true
+    "@types/bun":
+      optional: true
     "@types/jest":
       optional: true
     jest:
       optional: true
     vitest:
       optional: true
-  checksum: 71421693e0ad6a46be7d16f00b58a45725c238693972b8b5b1fd9ab797902ccf1209cf259afe8da1bf59d7c958762c46ee85d1aa5b164a5ec330981ea2376b08
+  checksum: 6b7eba9ca388986a721fb12f84adf0f5534bf7ec5851982023a889c4a0afac6e9e91291bdac39e1f59a05adefd7727e30463d98b21c3da32fbfec229ccb11ef1
   languageName: node
   linkType: hard
 

From 0bc526a967f121cdee85bb529ec72bcd2244e2fd Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 30 Jan 2024 15:39:59 +0000
Subject: [PATCH 0035/2191] Update eslint (non-major) (#29001)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 178 ++++++++++++++++++------------------------------------
 1 file changed, 59 insertions(+), 119 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 8ddbb0d0c0fb28..4d1084c229bf91 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1790,16 +1790,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@formatjs/ecma402-abstract@npm:1.18.0":
-  version: 1.18.0
-  resolution: "@formatjs/ecma402-abstract@npm:1.18.0"
-  dependencies:
-    "@formatjs/intl-localematcher": "npm:0.5.2"
-    tslib: "npm:^2.4.0"
-  checksum: bbdad0aee8e48baad6bfe6b2c27caf3befe35e658b922ee2f84417a819f0bdc7e849a8c0c782db8b53f5666bf19669d2b10a1104257c08796d198c87766bfc92
-  languageName: node
-  linkType: hard
-
 "@formatjs/ecma402-abstract@npm:1.18.2":
   version: 1.18.2
   resolution: "@formatjs/ecma402-abstract@npm:1.18.2"
@@ -1819,17 +1809,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@formatjs/icu-messageformat-parser@npm:2.7.3":
-  version: 2.7.3
-  resolution: "@formatjs/icu-messageformat-parser@npm:2.7.3"
-  dependencies:
-    "@formatjs/ecma402-abstract": "npm:1.18.0"
-    "@formatjs/icu-skeleton-parser": "npm:1.7.0"
-    tslib: "npm:^2.4.0"
-  checksum: 2a51038813e5cff7e2df767e1227373d228e907adb7268fc3744b3d82c4fa69d4aa9f6020a62de2c468cf724600e9372ac07ae43a4480ed066fe34e224e80e4a
-  languageName: node
-  linkType: hard
-
 "@formatjs/icu-messageformat-parser@npm:2.7.6":
   version: 2.7.6
   resolution: "@formatjs/icu-messageformat-parser@npm:2.7.6"
@@ -1841,16 +1820,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@formatjs/icu-skeleton-parser@npm:1.7.0":
-  version: 1.7.0
-  resolution: "@formatjs/icu-skeleton-parser@npm:1.7.0"
-  dependencies:
-    "@formatjs/ecma402-abstract": "npm:1.18.0"
-    tslib: "npm:^2.4.0"
-  checksum: 2e4db815247ddb10f7990bbb501c85b854ee951ee45143673eb91b4392b11d0a8312327adb8b624c6a2fdafab12083904630d6d22475503d025f1612da4dcaee
-  languageName: node
-  linkType: hard
-
 "@formatjs/icu-skeleton-parser@npm:1.8.0":
   version: 1.8.0
   resolution: "@formatjs/icu-skeleton-parser@npm:1.8.0"
@@ -1883,15 +1852,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@formatjs/intl-localematcher@npm:0.5.2":
-  version: 0.5.2
-  resolution: "@formatjs/intl-localematcher@npm:0.5.2"
-  dependencies:
-    tslib: "npm:^2.4.0"
-  checksum: 4b3ae75470e3e53ffa39b2d46e65a2a4c9c4becbc0aac989b0694370e10c6687643660a045512d676509bc29b257fe5726fbb028de12f889be02c2d20b6527e6
-  languageName: node
-  linkType: hard
-
 "@formatjs/intl-localematcher@npm:0.5.4":
   version: 0.5.4
   resolution: "@formatjs/intl-localematcher@npm:0.5.4"
@@ -1952,26 +1912,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@formatjs/ts-transformer@npm:3.13.9":
-  version: 3.13.9
-  resolution: "@formatjs/ts-transformer@npm:3.13.9"
-  dependencies:
-    "@formatjs/icu-messageformat-parser": "npm:2.7.3"
-    "@types/json-stable-stringify": "npm:^1.0.32"
-    "@types/node": "npm:14 || 16 || 17"
-    chalk: "npm:^4.0.0"
-    json-stable-stringify: "npm:^1.0.1"
-    tslib: "npm:^2.4.0"
-    typescript: "npm:5"
-  peerDependencies:
-    ts-jest: ">=27"
-  peerDependenciesMeta:
-    ts-jest:
-      optional: true
-  checksum: 4e313b967e45aae79246174c3181d31cc7cd297380d3a880a98fc0be16d76b783868712151e840ea16d22e2fbec0388b1005f688b6d4cb74ee4411b43f6d33f4
-  languageName: node
-  linkType: hard
-
 "@gamestdio/websocket@npm:^0.3.2":
   version: 0.3.2
   resolution: "@gamestdio/websocket@npm:0.3.2"
@@ -3723,14 +3663,14 @@ __metadata:
   linkType: hard
 
 "@typescript-eslint/eslint-plugin@npm:^6.0.0":
-  version: 6.19.0
-  resolution: "@typescript-eslint/eslint-plugin@npm:6.19.0"
+  version: 6.20.0
+  resolution: "@typescript-eslint/eslint-plugin@npm:6.20.0"
   dependencies:
     "@eslint-community/regexpp": "npm:^4.5.1"
-    "@typescript-eslint/scope-manager": "npm:6.19.0"
-    "@typescript-eslint/type-utils": "npm:6.19.0"
-    "@typescript-eslint/utils": "npm:6.19.0"
-    "@typescript-eslint/visitor-keys": "npm:6.19.0"
+    "@typescript-eslint/scope-manager": "npm:6.20.0"
+    "@typescript-eslint/type-utils": "npm:6.20.0"
+    "@typescript-eslint/utils": "npm:6.20.0"
+    "@typescript-eslint/visitor-keys": "npm:6.20.0"
     debug: "npm:^4.3.4"
     graphemer: "npm:^1.4.0"
     ignore: "npm:^5.2.4"
@@ -3743,44 +3683,44 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: ab1a5ace6663b0c6d2418e321328fa28aa4bdc4b5fae257addec01346fb3a9c2d3a2960ade0f7114e6974c513a28632c9e8e602333cc0fab3135c445babdef59
+  checksum: 5020faac39be476de056342f58f2bf68bb788f230e2fa4a2e27ceab8a5187dc450beba7333b0aa741a43aeaff45a117558132953f9390b5eca4c2cc004fde716
   languageName: node
   linkType: hard
 
 "@typescript-eslint/parser@npm:^6.17.0":
-  version: 6.19.0
-  resolution: "@typescript-eslint/parser@npm:6.19.0"
+  version: 6.20.0
+  resolution: "@typescript-eslint/parser@npm:6.20.0"
   dependencies:
-    "@typescript-eslint/scope-manager": "npm:6.19.0"
-    "@typescript-eslint/types": "npm:6.19.0"
-    "@typescript-eslint/typescript-estree": "npm:6.19.0"
-    "@typescript-eslint/visitor-keys": "npm:6.19.0"
+    "@typescript-eslint/scope-manager": "npm:6.20.0"
+    "@typescript-eslint/types": "npm:6.20.0"
+    "@typescript-eslint/typescript-estree": "npm:6.20.0"
+    "@typescript-eslint/visitor-keys": "npm:6.20.0"
     debug: "npm:^4.3.4"
   peerDependencies:
     eslint: ^7.0.0 || ^8.0.0
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: d547bfb1aaed112cfc0f9f0be8506a280952ba3b61be42b749352139361bd94e4a47fa043d819e19c6a498cacbd8bb36a46e3628c436a7e2009e7ac27afc8861
+  checksum: d84ad5e2282b1096c80dedb903c83ecc31eaf7be1aafcb14c18d9ec2d4a319f2fd1e5a9038b944d9f42c36c1c57add5e4292d4026ca7d3d5441d41286700d402
   languageName: node
   linkType: hard
 
-"@typescript-eslint/scope-manager@npm:6.19.0":
-  version: 6.19.0
-  resolution: "@typescript-eslint/scope-manager@npm:6.19.0"
+"@typescript-eslint/scope-manager@npm:6.20.0":
+  version: 6.20.0
+  resolution: "@typescript-eslint/scope-manager@npm:6.20.0"
   dependencies:
-    "@typescript-eslint/types": "npm:6.19.0"
-    "@typescript-eslint/visitor-keys": "npm:6.19.0"
-  checksum: 1ec7b9dedca7975f0aa4543c1c382f7d6131411bd443a5f9b96f137acb6adb450888ed13c95f6d26546b682b2e0579ce8a1c883fdbe2255dc0b61052193b8243
+    "@typescript-eslint/types": "npm:6.20.0"
+    "@typescript-eslint/visitor-keys": "npm:6.20.0"
+  checksum: f6768ed2dcd2d1771d55ed567ff392a6569ffd683a26500067509dd41769f8838c43686460fe7337144f324fd063df33f5d5646d44e5df4998ceffb3ad1fb790
   languageName: node
   linkType: hard
 
-"@typescript-eslint/type-utils@npm:6.19.0":
-  version: 6.19.0
-  resolution: "@typescript-eslint/type-utils@npm:6.19.0"
+"@typescript-eslint/type-utils@npm:6.20.0":
+  version: 6.20.0
+  resolution: "@typescript-eslint/type-utils@npm:6.20.0"
   dependencies:
-    "@typescript-eslint/typescript-estree": "npm:6.19.0"
-    "@typescript-eslint/utils": "npm:6.19.0"
+    "@typescript-eslint/typescript-estree": "npm:6.20.0"
+    "@typescript-eslint/utils": "npm:6.20.0"
     debug: "npm:^4.3.4"
     ts-api-utils: "npm:^1.0.1"
   peerDependencies:
@@ -3788,23 +3728,23 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 5b146b985481e587122026c703ac9f537ad7e90eee1dca814971bca0d7e4a5d4ff9861fb4bf749014c28c6a4fbb4a01a4527355961315eb9501f3569f8e8dd38
+  checksum: 8f622fbb14268f1d00b2948f995b570f0ef82be02c12be41d90385290a56ea0dbd34d855d6a5aff100b57f3bdd300ff0c300f16c78f12d6064f7ae6e34fd71bf
   languageName: node
   linkType: hard
 
-"@typescript-eslint/types@npm:6.19.0":
-  version: 6.19.0
-  resolution: "@typescript-eslint/types@npm:6.19.0"
-  checksum: 6f81860a3c14df55232c2e6dec21fb166867b9f30b3c3369b325aef5ee1c7e41e827c0504654daa49c8ff1a3a9ca9d9bfe76786882b6212a7c1b58991a9c80b9
+"@typescript-eslint/types@npm:6.20.0":
+  version: 6.20.0
+  resolution: "@typescript-eslint/types@npm:6.20.0"
+  checksum: 37589003b0e06f83c1945e3748e91af85918cfd997766894642a08e6f355f611cfe11df4e7632dda96e3a9b3441406283fe834ab0906cf81ea97fd43ca2aebe3
   languageName: node
   linkType: hard
 
-"@typescript-eslint/typescript-estree@npm:6.19.0":
-  version: 6.19.0
-  resolution: "@typescript-eslint/typescript-estree@npm:6.19.0"
+"@typescript-eslint/typescript-estree@npm:6.20.0":
+  version: 6.20.0
+  resolution: "@typescript-eslint/typescript-estree@npm:6.20.0"
   dependencies:
-    "@typescript-eslint/types": "npm:6.19.0"
-    "@typescript-eslint/visitor-keys": "npm:6.19.0"
+    "@typescript-eslint/types": "npm:6.20.0"
+    "@typescript-eslint/visitor-keys": "npm:6.20.0"
     debug: "npm:^4.3.4"
     globby: "npm:^11.1.0"
     is-glob: "npm:^4.0.3"
@@ -3814,34 +3754,34 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 5b365f009e43c7beafdbb7d8ecad78ee1087b0a4338cd9ec695eed514b7b4c1089e56239761139ddae629ec0ce8d428840c6ebfeea3618d2efe00c84f8794da5
+  checksum: 551f13445a303882d9fc0fbe14ef8507eb8414253fd87a5f13d2e324b5280b626421a238b8ec038e628bc80128dc06c057757f668738e82e64d5b39a9083c27d
   languageName: node
   linkType: hard
 
-"@typescript-eslint/utils@npm:6.19.0, @typescript-eslint/utils@npm:^6.5.0":
-  version: 6.19.0
-  resolution: "@typescript-eslint/utils@npm:6.19.0"
+"@typescript-eslint/utils@npm:6.20.0, @typescript-eslint/utils@npm:^6.18.1":
+  version: 6.20.0
+  resolution: "@typescript-eslint/utils@npm:6.20.0"
   dependencies:
     "@eslint-community/eslint-utils": "npm:^4.4.0"
     "@types/json-schema": "npm:^7.0.12"
     "@types/semver": "npm:^7.5.0"
-    "@typescript-eslint/scope-manager": "npm:6.19.0"
-    "@typescript-eslint/types": "npm:6.19.0"
-    "@typescript-eslint/typescript-estree": "npm:6.19.0"
+    "@typescript-eslint/scope-manager": "npm:6.20.0"
+    "@typescript-eslint/types": "npm:6.20.0"
+    "@typescript-eslint/typescript-estree": "npm:6.20.0"
     semver: "npm:^7.5.4"
   peerDependencies:
     eslint: ^7.0.0 || ^8.0.0
-  checksum: 343ff4cd4f7e102df8c46b41254d017a33d95df76455531fda679fdb92aebb9c111df8ee9ab54972e73c1e8fad9dd7e421001233f0aee8115384462b0821852e
+  checksum: 0a8ede3d80a365b52ae96d88e4a9f6e6abf3569c6b60ff9f42ff900cd843ae7c5493cd95f8f2029d90bb0acbf31030980206af98e581d760d6d41e0f80e9fb86
   languageName: node
   linkType: hard
 
-"@typescript-eslint/visitor-keys@npm:6.19.0":
-  version: 6.19.0
-  resolution: "@typescript-eslint/visitor-keys@npm:6.19.0"
+"@typescript-eslint/visitor-keys@npm:6.20.0":
+  version: 6.20.0
+  resolution: "@typescript-eslint/visitor-keys@npm:6.20.0"
   dependencies:
-    "@typescript-eslint/types": "npm:6.19.0"
+    "@typescript-eslint/types": "npm:6.20.0"
     eslint-visitor-keys: "npm:^3.4.1"
-  checksum: bb34e922e018aadf34866995ea5949d6623f184cc4f6470ab05767dd208ffabb003b7dc3872199714574b7f10afe89d49c6f89a4e8d086edea82be73e189f1bb
+  checksum: 852d938f2e5d57200cf62733b42e73a369f797b097d17e8fd3fffd0f7315c3b9e1863eed60bb8d57d6535a3b7f1980f645f96ec6d513950f182bfa8107b33fab
   languageName: node
   linkType: hard
 
@@ -7359,23 +7299,23 @@ __metadata:
   linkType: hard
 
 "eslint-plugin-formatjs@npm:^4.10.1":
-  version: 4.11.3
-  resolution: "eslint-plugin-formatjs@npm:4.11.3"
+  version: 4.12.2
+  resolution: "eslint-plugin-formatjs@npm:4.12.2"
   dependencies:
-    "@formatjs/icu-messageformat-parser": "npm:2.7.3"
-    "@formatjs/ts-transformer": "npm:3.13.9"
+    "@formatjs/icu-messageformat-parser": "npm:2.7.6"
+    "@formatjs/ts-transformer": "npm:3.13.12"
     "@types/eslint": "npm:7 || 8"
     "@types/picomatch": "npm:^2.3.0"
-    "@typescript-eslint/utils": "npm:^6.5.0"
+    "@typescript-eslint/utils": "npm:^6.18.1"
     emoji-regex: "npm:^10.2.1"
     magic-string: "npm:^0.30.0"
     picomatch: "npm:^2.3.1"
     tslib: "npm:2.6.2"
     typescript: "npm:5"
-    unicode-emoji-utils: "npm:^1.1.1"
+    unicode-emoji-utils: "npm:^1.2.0"
   peerDependencies:
     eslint: 7 || 8
-  checksum: 66481e0b5af5738bdb2b164ac1c74216c5c26f7c7400456a58387e71424bb30554aef39da43ce29bfd551f7dad678818d9af029022edadc4e1024349339f6984
+  checksum: 77cc1a2959903fcb6639d9fec89e7dfc55cf1e4ea58fca7d3bd6d12fa540aa173cbf5f90fc629b6aaf2ea3b8e61ed0a3cfce940fd2bec6f0796353315e2dbeef
   languageName: node
   linkType: hard
 
@@ -7407,8 +7347,8 @@ __metadata:
   linkType: hard
 
 "eslint-plugin-jsdoc@npm:^48.0.0":
-  version: 48.0.2
-  resolution: "eslint-plugin-jsdoc@npm:48.0.2"
+  version: 48.0.4
+  resolution: "eslint-plugin-jsdoc@npm:48.0.4"
   dependencies:
     "@es-joy/jsdoccomment": "npm:~0.41.0"
     are-docs-informative: "npm:^0.0.2"
@@ -7421,7 +7361,7 @@ __metadata:
     spdx-expression-parse: "npm:^4.0.0"
   peerDependencies:
     eslint: ^7.0.0 || ^8.0.0 || ^9.0.0
-  checksum: 6e6062c22fa4039e4be898a62f8ca0edef8bcbdc8257abb18302471e9819ccd63941971cf8de0ccf4eb59b3508902aa06de56214d80bdfc9bde7cadb94906190
+  checksum: c73063d26ca70d37ea00eea9750d1f889e5bfda64ca46dbfc6bf4842b892551c320368220cb46acc9d3d96a89fd5391486650284b82dc722f700e3b5df5c78db
   languageName: node
   linkType: hard
 
@@ -16510,7 +16450,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"unicode-emoji-utils@npm:^1.1.1":
+"unicode-emoji-utils@npm:^1.2.0":
   version: 1.2.0
   resolution: "unicode-emoji-utils@npm:1.2.0"
   dependencies:

From 0c0d07727638ca795b7290e5918678450eec903c Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 30 Jan 2024 16:40:43 +0100
Subject: [PATCH 0036/2191] Update dependency chewy to v7.5.1 (#29018)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 57b25807222386..3891139dcedb05 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -180,7 +180,7 @@ GEM
       activesupport
     cbor (0.5.9.6)
     charlock_holmes (0.7.7)
-    chewy (7.5.0)
+    chewy (7.5.1)
       activesupport (>= 5.2)
       elasticsearch (>= 7.12.0, < 7.14.0)
       elasticsearch-dsl

From c4af668e5ccf0ba26b3abc83b9bc36c3aa57a549 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Tue, 30 Jan 2024 18:24:40 +0100
Subject: [PATCH 0037/2191] Fix follow recommendations for less used languages
 (#29017)

---
 app/models/account_summary.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/account_summary.rb b/app/models/account_summary.rb
index 2a21d09a8bac6e..f052816361d405 100644
--- a/app/models/account_summary.rb
+++ b/app/models/account_summary.rb
@@ -15,7 +15,7 @@ class AccountSummary < ApplicationRecord
   has_many :follow_recommendation_suppressions, primary_key: :account_id, foreign_key: :account_id, inverse_of: false
 
   scope :safe, -> { where(sensitive: false) }
-  scope :localized, ->(locale) { where(language: locale) }
+  scope :localized, ->(locale) { order(Arel::Nodes::Case.new.when(arel_table[:language].eq(locale)).then(1).else(0).desc) }
   scope :filtered, -> { where.missing(:follow_recommendation_suppressions) }
 
   def self.refresh

From fa0ba677538588086d83c97c0ea56f9cd1556590 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Tue, 30 Jan 2024 19:21:30 +0100
Subject: [PATCH 0038/2191] Change materialized views to be refreshed
 concurrently to avoid locks (#29015)

---
 app/models/account_summary.rb                               | 2 ++
 app/models/follow_recommendation.rb                         | 2 ++
 db/migrate/20210322164601_create_account_summaries.rb       | 2 +-
 ...0505174616_update_follow_recommendations_to_version_2.rb | 2 +-
 .../20211213040746_update_account_summaries_to_version_2.rb | 6 +++---
 .../20230818141056_create_global_follow_recommendations.rb  | 2 +-
 .../20230818142253_drop_follow_recommendations.rb           | 2 +-
 7 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/app/models/account_summary.rb b/app/models/account_summary.rb
index f052816361d405..30ada50cc02932 100644
--- a/app/models/account_summary.rb
+++ b/app/models/account_summary.rb
@@ -19,6 +19,8 @@ class AccountSummary < ApplicationRecord
   scope :filtered, -> { where.missing(:follow_recommendation_suppressions) }
 
   def self.refresh
+    Scenic.database.refresh_materialized_view(table_name, concurrently: true, cascade: false)
+  rescue ActiveRecord::StatementInvalid
     Scenic.database.refresh_materialized_view(table_name, concurrently: false, cascade: false)
   end
 
diff --git a/app/models/follow_recommendation.rb b/app/models/follow_recommendation.rb
index 9d2648394bc79f..6b49a3ca660170 100644
--- a/app/models/follow_recommendation.rb
+++ b/app/models/follow_recommendation.rb
@@ -19,6 +19,8 @@ class FollowRecommendation < ApplicationRecord
   scope :localized, ->(locale) { joins(:account_summary).merge(AccountSummary.localized(locale)) }
 
   def self.refresh
+    Scenic.database.refresh_materialized_view(table_name, concurrently: true, cascade: false)
+  rescue ActiveRecord::StatementInvalid
     Scenic.database.refresh_materialized_view(table_name, concurrently: false, cascade: false)
   end
 
diff --git a/db/migrate/20210322164601_create_account_summaries.rb b/db/migrate/20210322164601_create_account_summaries.rb
index 8d18e9eeb4bd34..5c93291e0a54ee 100644
--- a/db/migrate/20210322164601_create_account_summaries.rb
+++ b/db/migrate/20210322164601_create_account_summaries.rb
@@ -2,7 +2,7 @@
 
 class CreateAccountSummaries < ActiveRecord::Migration[5.2]
   def change
-    create_view :account_summaries, materialized: { no_data: true }
+    create_view :account_summaries, materialized: true
 
     # To be able to refresh the view concurrently,
     # at least one unique index is required
diff --git a/db/migrate/20210505174616_update_follow_recommendations_to_version_2.rb b/db/migrate/20210505174616_update_follow_recommendations_to_version_2.rb
index 22c27a0e7a8e84..3a9024ffcb1d12 100644
--- a/db/migrate/20210505174616_update_follow_recommendations_to_version_2.rb
+++ b/db/migrate/20210505174616_update_follow_recommendations_to_version_2.rb
@@ -6,7 +6,7 @@ class UpdateFollowRecommendationsToVersion2 < ActiveRecord::Migration[6.1]
 
   def up
     drop_view :follow_recommendations
-    create_view :follow_recommendations, version: 2, materialized: { no_data: true }
+    create_view :follow_recommendations, version: 2, materialized: true
 
     # To be able to refresh the view concurrently,
     # at least one unique index is required
diff --git a/db/migrate/20211213040746_update_account_summaries_to_version_2.rb b/db/migrate/20211213040746_update_account_summaries_to_version_2.rb
index e347a874ff5181..a82cf4afa2eef3 100644
--- a/db/migrate/20211213040746_update_account_summaries_to_version_2.rb
+++ b/db/migrate/20211213040746_update_account_summaries_to_version_2.rb
@@ -4,7 +4,7 @@ class UpdateAccountSummariesToVersion2 < ActiveRecord::Migration[6.1]
   def up
     reapplication_follow_recommendations_v2 do
       drop_view :account_summaries, materialized: true
-      create_view :account_summaries, version: 2, materialized: { no_data: true }
+      create_view :account_summaries, version: 2, materialized: true
       safety_assured { add_index :account_summaries, :account_id, unique: true }
     end
   end
@@ -12,7 +12,7 @@ def up
   def down
     reapplication_follow_recommendations_v2 do
       drop_view :account_summaries, materialized: true
-      create_view :account_summaries, version: 1, materialized: { no_data: true }
+      create_view :account_summaries, version: 1, materialized: true
       safety_assured { add_index :account_summaries, :account_id, unique: true }
     end
   end
@@ -20,7 +20,7 @@ def down
   def reapplication_follow_recommendations_v2
     drop_view :follow_recommendations, materialized: true
     yield
-    create_view :follow_recommendations, version: 2, materialized: { no_data: true }
+    create_view :follow_recommendations, version: 2, materialized: true
     safety_assured { add_index :follow_recommendations, :account_id, unique: true }
   end
 end
diff --git a/db/migrate/20230818141056_create_global_follow_recommendations.rb b/db/migrate/20230818141056_create_global_follow_recommendations.rb
index b88c71b9d7ab0d..1a3f23d228f76c 100644
--- a/db/migrate/20230818141056_create_global_follow_recommendations.rb
+++ b/db/migrate/20230818141056_create_global_follow_recommendations.rb
@@ -2,7 +2,7 @@
 
 class CreateGlobalFollowRecommendations < ActiveRecord::Migration[7.0]
   def change
-    create_view :global_follow_recommendations, materialized: { no_data: true }
+    create_view :global_follow_recommendations, materialized: true
     safety_assured { add_index :global_follow_recommendations, :account_id, unique: true }
   end
 end
diff --git a/db/post_migrate/20230818142253_drop_follow_recommendations.rb b/db/post_migrate/20230818142253_drop_follow_recommendations.rb
index 95913d6caa792f..e0a24753cad563 100644
--- a/db/post_migrate/20230818142253_drop_follow_recommendations.rb
+++ b/db/post_migrate/20230818142253_drop_follow_recommendations.rb
@@ -6,7 +6,7 @@ def up
   end
 
   def down
-    create_view :follow_recommendations, version: 2, materialized: { no_data: true }
+    create_view :follow_recommendations, version: 2, materialized: true
     safety_assured { add_index :follow_recommendations, :account_id, unique: true }
   end
 end

From 022d2a3793bf45631be938e9e803f81b5ff2b4b5 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 31 Jan 2024 07:52:51 -0500
Subject: [PATCH 0039/2191] Make factory gems available in test+development
 envs (#28969)

---
 Gemfile | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Gemfile b/Gemfile
index 4951304e39e244..906441ec67cb42 100644
--- a/Gemfile
+++ b/Gemfile
@@ -125,12 +125,6 @@ group :test do
   # Used to mock environment variables
   gem 'climate_control'
 
-  # Generating fake data for specs
-  gem 'faker', '~> 3.2'
-
-  # Generate test objects for specs
-  gem 'fabrication', '~> 2.30'
-
   # Add back helpers functions removed in Rails 5.1
   gem 'rails-controller-testing', '~> 1.0'
 
@@ -182,6 +176,12 @@ group :development, :test do
   # Interactive Debugging tools
   gem 'debug', '~> 1.8'
 
+  # Generate fake data values
+  gem 'faker', '~> 3.2'
+
+  # Generate factory objects
+  gem 'fabrication', '~> 2.30'
+
   # Profiling tools
   gem 'memory_profiler', require: false
   gem 'ruby-prof', require: false

From 738dba0cf7380c0392d2588deeddbdaa197a6331 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 31 Jan 2024 13:55:15 +0100
Subject: [PATCH 0040/2191] Update dependency capybara to v3.40.0 (#28966)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 3891139dcedb05..01f5b4592947dc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -167,11 +167,11 @@ GEM
     bundler-audit (0.9.1)
       bundler (>= 1.2.0, < 3)
       thor (~> 1.0)
-    capybara (3.39.2)
+    capybara (3.40.0)
       addressable
       matrix
       mini_mime (>= 0.1.3)
-      nokogiri (~> 1.8)
+      nokogiri (~> 1.11)
       rack (>= 1.6.0)
       rack-test (>= 0.6.3)
       regexp_parser (>= 1.5, < 3.0)

From dd934ebb07b1dc087fb782c025935de8e1107367 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 31 Jan 2024 11:55:50 -0500
Subject: [PATCH 0041/2191] Update `actions/cache` to v4 (updates node 16->20)
 (#29025)

---
 .github/actions/setup-javascript/action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/actions/setup-javascript/action.yml b/.github/actions/setup-javascript/action.yml
index 07fd4d08d37455..808adc7de64f96 100644
--- a/.github/actions/setup-javascript/action.yml
+++ b/.github/actions/setup-javascript/action.yml
@@ -23,7 +23,7 @@ runs:
       shell: bash
       run: echo "dir=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT
 
-    - uses: actions/cache@v3
+    - uses: actions/cache@v4
       id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
       with:
         path: ${{ steps.yarn-cache-dir-path.outputs.dir }}

From 812a13142371441fb4510a0d8862ee413f3b98c5 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 1 Feb 2024 10:33:12 +0100
Subject: [PATCH 0042/2191] Add github action workflow for manual security
 builds (#29040)

---
 .github/workflows/build-security.yml | 62 ++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)
 create mode 100644 .github/workflows/build-security.yml

diff --git a/.github/workflows/build-security.yml b/.github/workflows/build-security.yml
new file mode 100644
index 00000000000000..cc9bae922781a4
--- /dev/null
+++ b/.github/workflows/build-security.yml
@@ -0,0 +1,62 @@
+name: Build security nightly container image
+
+permissions:
+  contents: read
+  packages: write
+
+jobs:
+  compute-suffix:
+    runs-on: ubuntu-latest
+    if: github.repository == 'mastodon/mastodon'
+    steps:
+      - id: version_vars
+        env:
+          TZ: Etc/UTC
+        run: |
+          echo mastodon_version_prerelease=nightly.$(date --date='next day' +'%Y-%m-%d')-security>> $GITHUB_OUTPUT
+    outputs:
+      prerelease: ${{ steps.version_vars.outputs.mastodon_version_prerelease }}
+
+  build-image:
+    needs: compute-suffix
+    uses: ./.github/workflows/build-container-image.yml
+    with:
+      file_to_build: Dockerfile
+      platforms: linux/amd64,linux/arm64
+      use_native_arm64_builder: true
+      cache: false
+      push_to_images: |
+        tootsuite/mastodon
+        ghcr.io/mastodon/mastodon
+      version_prerelease: ${{ needs.compute-suffix.outputs.prerelease }}
+      labels: |
+        org.opencontainers.image.description=Nightly build image used for testing purposes
+      flavor: |
+        latest=auto
+      tags: |
+        type=raw,value=edge
+        type=raw,value=nightly
+        type=schedule,pattern=${{ needs.compute-suffix.outputs.prerelease }}
+    secrets: inherit
+
+  build-image-streaming:
+    needs: compute-suffix
+    uses: ./.github/workflows/build-container-image.yml
+    with:
+      file_to_build: streaming/Dockerfile
+      platforms: linux/amd64,linux/arm64
+      use_native_arm64_builder: true
+      cache: false
+      push_to_images: |
+        tootsuite/mastodon-streaming
+        ghcr.io/mastodon/mastodon-streaming
+      version_prerelease: ${{ needs.compute-suffix.outputs.prerelease }}
+      labels: |
+        org.opencontainers.image.description=Nightly build image used for testing purposes
+      flavor: |
+        latest=auto
+      tags: |
+        type=raw,value=edge
+        type=raw,value=nightly
+        type=schedule,pattern=${{ needs.compute-suffix.outputs.prerelease }}
+    secrets: inherit

From 8b7b0ee59873fcb6ad79daabd46eec07ae2c68ee Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 1 Feb 2024 04:46:31 -0500
Subject: [PATCH 0043/2191] Configure selenium to use Chrome version 120
 (#29038)

---
 spec/support/capybara.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spec/support/capybara.rb b/spec/support/capybara.rb
index d4f27e209e11a6..4aba65b4047a4f 100644
--- a/spec/support/capybara.rb
+++ b/spec/support/capybara.rb
@@ -14,6 +14,7 @@
   options = Selenium::WebDriver::Chrome::Options.new
   options.add_argument '--headless=new'
   options.add_argument '--window-size=1680,1050'
+  options.browser_version = '120'
 
   Capybara::Selenium::Driver.new(
     app,

From 7316a08380faed6c3553d0d24f51d206fe974e92 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 1 Feb 2024 10:52:01 +0100
Subject: [PATCH 0044/2191] Fix missing `workflow_dispatch` trigger for
 `build-security` (#29041)

---
 .github/workflows/build-security.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/build-security.yml b/.github/workflows/build-security.yml
index cc9bae922781a4..b03b787d5f73c6 100644
--- a/.github/workflows/build-security.yml
+++ b/.github/workflows/build-security.yml
@@ -1,4 +1,6 @@
 name: Build security nightly container image
+on:
+  workflow_dispatch:
 
 permissions:
   contents: read

From 9cdc60ecc6e5746b706bdcf19d0743d1c153105f Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 1 Feb 2024 14:37:04 +0100
Subject: [PATCH 0045/2191] Change onboarding prompt to follow suggestions
 carousel in web UI (#28878)

---
 .../mastodon/actions/suggestions.js           |   9 +-
 app/javascript/mastodon/actions/timelines.js  |  21 ++
 .../mastodon/components/status_list.jsx       |  53 +++--
 .../components/explore_prompt.tsx             |  46 ----
 .../components/inline_follow_suggestions.jsx  | 201 ++++++++++++++++++
 .../mastodon/features/home_timeline/index.jsx |  51 +----
 .../ui/containers/status_list_container.js    |   2 +-
 app/javascript/mastodon/locales/en.json       |  10 +-
 app/javascript/mastodon/reducers/settings.js  |   2 +-
 .../mastodon/reducers/suggestions.js          |   6 +-
 app/javascript/mastodon/reducers/timelines.js |  31 ++-
 .../400-24px/navigate_before-fill.svg         |   1 +
 .../400-24px/navigate_before.svg              |   1 +
 .../400-24px/navigate_next-fill.svg           |   1 +
 .../material-icons/400-24px/navigate_next.svg |   1 +
 .../styles/mastodon-light/diff.scss           |  13 ++
 .../styles/mastodon/components.scss           | 196 +++++++++++++++++
 17 files changed, 507 insertions(+), 138 deletions(-)
 delete mode 100644 app/javascript/mastodon/features/home_timeline/components/explore_prompt.tsx
 create mode 100644 app/javascript/mastodon/features/home_timeline/components/inline_follow_suggestions.jsx
 create mode 100644 app/javascript/material-icons/400-24px/navigate_before-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/navigate_before.svg
 create mode 100644 app/javascript/material-icons/400-24px/navigate_next-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/navigate_next.svg

diff --git a/app/javascript/mastodon/actions/suggestions.js b/app/javascript/mastodon/actions/suggestions.js
index 870a311024d12f..8eafe38b21ae0e 100644
--- a/app/javascript/mastodon/actions/suggestions.js
+++ b/app/javascript/mastodon/actions/suggestions.js
@@ -54,12 +54,5 @@ export const dismissSuggestion = accountId => (dispatch, getState) => {
     id: accountId,
   });
 
-  api(getState).delete(`/api/v1/suggestions/${accountId}`).then(() => {
-    dispatch(fetchSuggestionsRequest());
-
-    api(getState).get('/api/v2/suggestions').then(response => {
-      dispatch(importFetchedAccounts(response.data.map(x => x.account)));
-      dispatch(fetchSuggestionsSuccess(response.data));
-    }).catch(error => dispatch(fetchSuggestionsFail(error)));
-  }).catch(() => {});
+  api(getState).delete(`/api/v1/suggestions/${accountId}`).catch(() => {});
 };
diff --git a/app/javascript/mastodon/actions/timelines.js b/app/javascript/mastodon/actions/timelines.js
index 08561c71f49567..4ce7c3cf8414a3 100644
--- a/app/javascript/mastodon/actions/timelines.js
+++ b/app/javascript/mastodon/actions/timelines.js
@@ -21,6 +21,10 @@ export const TIMELINE_DISCONNECT   = 'TIMELINE_DISCONNECT';
 export const TIMELINE_CONNECT      = 'TIMELINE_CONNECT';
 
 export const TIMELINE_MARK_AS_PARTIAL = 'TIMELINE_MARK_AS_PARTIAL';
+export const TIMELINE_INSERT          = 'TIMELINE_INSERT';
+
+export const TIMELINE_SUGGESTIONS = 'inline-follow-suggestions';
+export const TIMELINE_GAP = null;
 
 export const loadPending = timeline => ({
   type: TIMELINE_LOAD_PENDING,
@@ -112,9 +116,19 @@ export function expandTimeline(timelineId, path, params = {}, done = noOp) {
 
     api(getState).get(path, { params }).then(response => {
       const next = getLinks(response).refs.find(link => link.rel === 'next');
+
       dispatch(importFetchedStatuses(response.data));
       dispatch(expandTimelineSuccess(timelineId, response.data, next ? next.uri : null, response.status === 206, isLoadingRecent, isLoadingMore, isLoadingRecent && preferPendingItems));
 
+      if (timelineId === 'home' && !isLoadingMore && !isLoadingRecent) {
+        const now = new Date();
+        const fittingIndex = response.data.findIndex(status => now - (new Date(status.created_at)) > 4 * 3600 * 1000);
+
+        if (fittingIndex !== -1) {
+          dispatch(insertIntoTimeline(timelineId, TIMELINE_SUGGESTIONS, Math.max(1, fittingIndex)));
+        }
+      }
+
       if (timelineId === 'home') {
         dispatch(submitMarkers());
       }
@@ -221,3 +235,10 @@ export const markAsPartial = timeline => ({
   type: TIMELINE_MARK_AS_PARTIAL,
   timeline,
 });
+
+export const insertIntoTimeline = (timeline, key, index) => ({
+  type: TIMELINE_INSERT,
+  timeline,
+  index,
+  key,
+});
diff --git a/app/javascript/mastodon/components/status_list.jsx b/app/javascript/mastodon/components/status_list.jsx
index e92dd233e150ec..3ed20f65eb3f2b 100644
--- a/app/javascript/mastodon/components/status_list.jsx
+++ b/app/javascript/mastodon/components/status_list.jsx
@@ -5,7 +5,9 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
 
 import { debounce } from 'lodash';
 
+import { TIMELINE_GAP, TIMELINE_SUGGESTIONS } from 'mastodon/actions/timelines';
 import RegenerationIndicator from 'mastodon/components/regeneration_indicator';
+import { InlineFollowSuggestions } from 'mastodon/features/home_timeline/components/inline_follow_suggestions';
 
 import StatusContainer from '../containers/status_container';
 
@@ -91,25 +93,38 @@ export default class StatusList extends ImmutablePureComponent {
     }
 
     let scrollableContent = (isLoading || statusIds.size > 0) ? (
-      statusIds.map((statusId, index) => statusId === null ? (
-        <LoadGap
-          key={'gap:' + statusIds.get(index + 1)}
-          disabled={isLoading}
-          maxId={index > 0 ? statusIds.get(index - 1) : null}
-          onClick={onLoadMore}
-        />
-      ) : (
-        <StatusContainer
-          key={statusId}
-          id={statusId}
-          onMoveUp={this.handleMoveUp}
-          onMoveDown={this.handleMoveDown}
-          contextType={timelineId}
-          scrollKey={this.props.scrollKey}
-          showThread
-          withCounters={this.props.withCounters}
-        />
-      ))
+      statusIds.map((statusId, index) => {
+        switch(statusId) {
+        case TIMELINE_SUGGESTIONS:
+          return (
+            <InlineFollowSuggestions
+              key='inline-follow-suggestions'
+            />
+          );
+        case TIMELINE_GAP:
+          return (
+            <LoadGap
+              key={'gap:' + statusIds.get(index + 1)}
+              disabled={isLoading}
+              maxId={index > 0 ? statusIds.get(index - 1) : null}
+              onClick={onLoadMore}
+            />
+          );
+        default:
+          return (
+            <StatusContainer
+              key={statusId}
+              id={statusId}
+              onMoveUp={this.handleMoveUp}
+              onMoveDown={this.handleMoveDown}
+              contextType={timelineId}
+              scrollKey={this.props.scrollKey}
+              showThread
+              withCounters={this.props.withCounters}
+            />
+          );
+        }
+      })
     ) : null;
 
     if (scrollableContent && featuredStatusIds) {
diff --git a/app/javascript/mastodon/features/home_timeline/components/explore_prompt.tsx b/app/javascript/mastodon/features/home_timeline/components/explore_prompt.tsx
deleted file mode 100644
index 960d30e2caea4a..00000000000000
--- a/app/javascript/mastodon/features/home_timeline/components/explore_prompt.tsx
+++ /dev/null
@@ -1,46 +0,0 @@
-import { FormattedMessage } from 'react-intl';
-
-import { Link } from 'react-router-dom';
-
-import background from '@/images/friends-cropped.png';
-import { DismissableBanner } from 'mastodon/components/dismissable_banner';
-
-export const ExplorePrompt = () => (
-  <DismissableBanner id='home.explore_prompt'>
-    <img
-      src={background}
-      alt=''
-      className='dismissable-banner__background-image'
-    />
-
-    <h1>
-      <FormattedMessage
-        id='home.explore_prompt.title'
-        defaultMessage='This is your home base within Mastodon.'
-      />
-    </h1>
-    <p>
-      <FormattedMessage
-        id='home.explore_prompt.body'
-        defaultMessage="Your home feed will have a mix of posts from the hashtags you've chosen to follow, the people you've chosen to follow, and the posts they boost. If that feels too quiet, you may want to:"
-      />
-    </p>
-
-    <div className='dismissable-banner__message__wrapper'>
-      <div className='dismissable-banner__message__actions'>
-        <Link to='/explore' className='button'>
-          <FormattedMessage
-            id='home.actions.go_to_explore'
-            defaultMessage="See what's trending"
-          />
-        </Link>
-        <Link to='/explore/suggestions' className='button button-tertiary'>
-          <FormattedMessage
-            id='home.actions.go_to_suggestions'
-            defaultMessage='Find people to follow'
-          />
-        </Link>
-      </div>
-    </div>
-  </DismissableBanner>
-);
diff --git a/app/javascript/mastodon/features/home_timeline/components/inline_follow_suggestions.jsx b/app/javascript/mastodon/features/home_timeline/components/inline_follow_suggestions.jsx
new file mode 100644
index 00000000000000..ac414d04d6a810
--- /dev/null
+++ b/app/javascript/mastodon/features/home_timeline/components/inline_follow_suggestions.jsx
@@ -0,0 +1,201 @@
+import PropTypes from 'prop-types';
+import { useEffect, useCallback, useRef, useState } from 'react';
+
+import { FormattedMessage, useIntl, defineMessages } from 'react-intl';
+
+import { Link } from 'react-router-dom';
+
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import { useDispatch, useSelector } from 'react-redux';
+
+import ChevronLeftIcon from '@/material-icons/400-24px/chevron_left.svg?react';
+import ChevronRightIcon from '@/material-icons/400-24px/chevron_right.svg?react';
+import CloseIcon from '@/material-icons/400-24px/close.svg?react';
+import InfoIcon from '@/material-icons/400-24px/info.svg?react';
+import { followAccount, unfollowAccount } from 'mastodon/actions/accounts';
+import { changeSetting } from 'mastodon/actions/settings';
+import { fetchSuggestions, dismissSuggestion } from 'mastodon/actions/suggestions';
+import { Avatar } from 'mastodon/components/avatar';
+import { Button } from 'mastodon/components/button';
+import { DisplayName } from 'mastodon/components/display_name';
+import { Icon } from 'mastodon/components/icon';
+import { IconButton } from 'mastodon/components/icon_button';
+import { VerifiedBadge } from 'mastodon/components/verified_badge';
+
+const messages = defineMessages({
+  follow: { id: 'account.follow', defaultMessage: 'Follow' },
+  unfollow: { id: 'account.unfollow', defaultMessage: 'Unfollow' },
+  previous: { id: 'lightbox.previous', defaultMessage: 'Previous' },
+  next: { id: 'lightbox.next', defaultMessage: 'Next' },
+  dismiss: { id: 'follow_suggestions.dismiss', defaultMessage: "Don't show again" },
+});
+
+const Source = ({ id }) => {
+  let label;
+
+  switch (id) {
+  case 'friends_of_friends':
+  case 'similar_to_recently_followed':
+    label = <FormattedMessage id='follow_suggestions.personalized_suggestion' defaultMessage='Personalized suggestion' />;
+    break;
+  case 'featured':
+    label = <FormattedMessage id='follow_suggestions.curated_suggestion' defaultMessage="Editors' Choice" />;
+    break;
+  case 'most_followed':
+  case 'most_interactions':
+    label = <FormattedMessage id='follow_suggestions.popular_suggestion' defaultMessage='Popular suggestion' />;
+    break;
+  }
+
+  return (
+    <div className='inline-follow-suggestions__body__scrollable__card__text-stack__source'>
+      <Icon icon={InfoIcon} />
+      {label}
+    </div>
+  );
+};
+
+Source.propTypes = {
+  id: PropTypes.oneOf(['friends_of_friends', 'similar_to_recently_followed', 'featured', 'most_followed', 'most_interactions']),
+};
+
+const Card = ({ id, source }) => {
+  const intl = useIntl();
+  const account = useSelector(state => state.getIn(['accounts', id]));
+  const relationship = useSelector(state => state.getIn(['relationships', id]));
+  const firstVerifiedField = account.get('fields').find(item => !!item.get('verified_at'));
+  const dispatch = useDispatch();
+  const following = relationship?.get('following') ?? relationship?.get('requested');
+
+  const handleFollow = useCallback(() => {
+    if (following) {
+      dispatch(unfollowAccount(id));
+    } else {
+      dispatch(followAccount(id));
+    }
+  }, [id, following, dispatch]);
+
+  const handleDismiss = useCallback(() => {
+    dispatch(dismissSuggestion(id));
+  }, [id, dispatch]);
+
+  return (
+    <div className='inline-follow-suggestions__body__scrollable__card'>
+      <IconButton iconComponent={CloseIcon} onClick={handleDismiss} title={intl.formatMessage(messages.dismiss)} />
+
+      <div className='inline-follow-suggestions__body__scrollable__card__avatar'>
+        <Link to={`/@${account.get('acct')}`}><Avatar account={account} size={72} /></Link>
+      </div>
+
+      <div className='inline-follow-suggestions__body__scrollable__card__text-stack'>
+        <Link to={`/@${account.get('acct')}`}><DisplayName account={account} /></Link>
+        {firstVerifiedField ? <VerifiedBadge link={firstVerifiedField.get('value')} /> : <Source id={source.get(0)} />}
+      </div>
+
+      <Button text={intl.formatMessage(following ? messages.unfollow : messages.follow)} onClick={handleFollow} />
+    </div>
+  );
+};
+
+Card.propTypes = {
+  id: PropTypes.string.isRequired,
+  source: ImmutablePropTypes.list,
+};
+
+const DISMISSIBLE_ID = 'home/follow-suggestions';
+
+export const InlineFollowSuggestions = ({ hidden }) => {
+  const intl = useIntl();
+  const dispatch = useDispatch();
+  const suggestions = useSelector(state => state.getIn(['suggestions', 'items']));
+  const isLoading = useSelector(state => state.getIn(['suggestions', 'isLoading']));
+  const dismissed = useSelector(state => state.getIn(['settings', 'dismissed_banners', DISMISSIBLE_ID]));
+  const bodyRef = useRef();
+  const [canScrollLeft, setCanScrollLeft] = useState(false);
+  const [canScrollRight, setCanScrollRight] = useState(true);
+
+  useEffect(() => {
+    dispatch(fetchSuggestions());
+  }, [dispatch]);
+
+  useEffect(() => {
+    if (!bodyRef.current) {
+      return;
+    }
+
+    setCanScrollLeft(bodyRef.current.scrollLeft > 0);
+    setCanScrollRight((bodyRef.current.scrollLeft + bodyRef.current.clientWidth) < bodyRef.current.scrollWidth);
+  }, [setCanScrollRight, setCanScrollLeft, bodyRef, suggestions]);
+
+  const handleLeftNav = useCallback(() => {
+    bodyRef.current.scrollLeft -= 200;
+  }, [bodyRef]);
+
+  const handleRightNav = useCallback(() => {
+    bodyRef.current.scrollLeft += 200;
+  }, [bodyRef]);
+
+  const handleScroll = useCallback(() => {
+    if (!bodyRef.current) {
+      return;
+    }
+
+    setCanScrollLeft(bodyRef.current.scrollLeft > 0);
+    setCanScrollRight((bodyRef.current.scrollLeft + bodyRef.current.clientWidth) < bodyRef.current.scrollWidth);
+  }, [setCanScrollRight, setCanScrollLeft, bodyRef]);
+
+  const handleDismiss = useCallback(() => {
+    dispatch(changeSetting(['dismissed_banners', DISMISSIBLE_ID], true));
+  }, [dispatch]);
+
+  if (dismissed || (!isLoading && suggestions.isEmpty())) {
+    return null;
+  }
+
+  if (hidden) {
+    return (
+      <div className='inline-follow-suggestions' />
+    );
+  }
+
+  return (
+    <div className='inline-follow-suggestions'>
+      <div className='inline-follow-suggestions__header'>
+        <h3><FormattedMessage id='follow_suggestions.who_to_follow' defaultMessage='Who to follow' /></h3>
+
+        <div className='inline-follow-suggestions__header__actions'>
+          <button className='link-button' onClick={handleDismiss}><FormattedMessage id='follow_suggestions.dismiss' defaultMessage="Don't show again" /></button>
+          <Link to='/explore/suggestions' className='link-button'><FormattedMessage id='follow_suggestions.view_all' defaultMessage='View all' /></Link>
+        </div>
+      </div>
+
+      <div className='inline-follow-suggestions__body'>
+        <div className='inline-follow-suggestions__body__scrollable' ref={bodyRef} onScroll={handleScroll}>
+          {suggestions.map(suggestion => (
+            <Card
+              key={suggestion.get('account')}
+              id={suggestion.get('account')}
+              source={suggestion.get('source')}
+            />
+          ))}
+        </div>
+
+        {canScrollLeft && (
+          <button className='inline-follow-suggestions__body__scroll-button left' onClick={handleLeftNav} aria-label={intl.formatMessage(messages.previous)}>
+            <div className='inline-follow-suggestions__body__scroll-button__icon'><Icon icon={ChevronLeftIcon} /></div>
+          </button>
+        )}
+
+        {canScrollRight && (
+          <button className='inline-follow-suggestions__body__scroll-button right' onClick={handleRightNav} aria-label={intl.formatMessage(messages.next)}>
+            <div className='inline-follow-suggestions__body__scroll-button__icon'><Icon icon={ChevronRightIcon} /></div>
+          </button>
+        )}
+      </div>
+    </div>
+  );
+};
+
+InlineFollowSuggestions.propTypes = {
+  hidden: PropTypes.bool,
+};
diff --git a/app/javascript/mastodon/features/home_timeline/index.jsx b/app/javascript/mastodon/features/home_timeline/index.jsx
index 069f52b0beaf2c..6e7dc2b6c8c8a7 100644
--- a/app/javascript/mastodon/features/home_timeline/index.jsx
+++ b/app/javascript/mastodon/features/home_timeline/index.jsx
@@ -6,8 +6,6 @@ import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
 import classNames from 'classnames';
 import { Helmet } from 'react-helmet';
 
-import { createSelector } from '@reduxjs/toolkit';
-import { List as ImmutableList } from 'immutable';
 import { connect } from 'react-redux';
 
 import CampaignIcon from '@/material-icons/400-24px/campaign.svg?react';
@@ -16,7 +14,7 @@ import { fetchAnnouncements, toggleShowAnnouncements } from 'mastodon/actions/an
 import { IconWithBadge } from 'mastodon/components/icon_with_badge';
 import { NotSignedInIndicator } from 'mastodon/components/not_signed_in_indicator';
 import AnnouncementsContainer from 'mastodon/features/getting_started/containers/announcements_container';
-import { me, criticalUpdatesPending } from 'mastodon/initial_state';
+import { criticalUpdatesPending } from 'mastodon/initial_state';
 
 import { addColumn, removeColumn, moveColumn } from '../../actions/columns';
 import { expandHomeTimeline } from '../../actions/timelines';
@@ -26,7 +24,6 @@ import StatusListContainer from '../ui/containers/status_list_container';
 
 import { ColumnSettings } from './components/column_settings';
 import { CriticalUpdateBanner } from './components/critical_update_banner';
-import { ExplorePrompt } from './components/explore_prompt';
 
 const messages = defineMessages({
   title: { id: 'column.home', defaultMessage: 'Home' },
@@ -34,51 +31,12 @@ const messages = defineMessages({
   hide_announcements: { id: 'home.hide_announcements', defaultMessage: 'Hide announcements' },
 });
 
-const getHomeFeedSpeed = createSelector([
-  state => state.getIn(['timelines', 'home', 'items'], ImmutableList()),
-  state => state.getIn(['timelines', 'home', 'pendingItems'], ImmutableList()),
-  state => state.get('statuses'),
-], (statusIds, pendingStatusIds, statusMap) => {
-  const recentStatusIds = pendingStatusIds.concat(statusIds);
-  const statuses = recentStatusIds.filter(id => id !== null).map(id => statusMap.get(id)).filter(status => status?.get('account') !== me).take(20);
-
-  if (statuses.isEmpty()) {
-    return {
-      gap: 0,
-      newest: new Date(0),
-    };
-  }
-
-  const datetimes = statuses.map(status => status.get('created_at', 0));
-  const oldest = new Date(datetimes.min());
-  const newest = new Date(datetimes.max());
-  const averageGap = (newest - oldest) / (1000 * (statuses.size + 1)); // Average gap between posts on first page in seconds
-
-  return {
-    gap: averageGap,
-    newest,
-  };
-});
-
-const homeTooSlow = createSelector([
-  state => state.getIn(['timelines', 'home', 'isLoading']),
-  state => state.getIn(['timelines', 'home', 'isPartial']),
-  getHomeFeedSpeed,
-], (isLoading, isPartial, speed) =>
-  !isLoading && !isPartial // Only if the home feed has finished loading
-  && (
-    (speed.gap > (30 * 60) // If the average gap between posts is more than 30 minutes
-    || (Date.now() - speed.newest) > (1000 * 3600)) // If the most recent post is from over an hour ago
-  )
-);
-
 const mapStateToProps = state => ({
   hasUnread: state.getIn(['timelines', 'home', 'unread']) > 0,
   isPartial: state.getIn(['timelines', 'home', 'isPartial']),
   hasAnnouncements: !state.getIn(['announcements', 'items']).isEmpty(),
   unreadAnnouncements: state.getIn(['announcements', 'items']).count(item => !item.get('read')),
   showAnnouncements: state.getIn(['announcements', 'show']),
-  tooSlow: homeTooSlow(state),
 });
 
 class HomeTimeline extends PureComponent {
@@ -97,7 +55,6 @@ class HomeTimeline extends PureComponent {
     hasAnnouncements: PropTypes.bool,
     unreadAnnouncements: PropTypes.number,
     showAnnouncements: PropTypes.bool,
-    tooSlow: PropTypes.bool,
   };
 
   handlePin = () => {
@@ -167,7 +124,7 @@ class HomeTimeline extends PureComponent {
   };
 
   render () {
-    const { intl, hasUnread, columnId, multiColumn, tooSlow, hasAnnouncements, unreadAnnouncements, showAnnouncements } = this.props;
+    const { intl, hasUnread, columnId, multiColumn, hasAnnouncements, unreadAnnouncements, showAnnouncements } = this.props;
     const pinned = !!columnId;
     const { signedIn } = this.context.identity;
     const banners = [];
@@ -192,10 +149,6 @@ class HomeTimeline extends PureComponent {
       banners.push(<CriticalUpdateBanner key='critical-update-banner' />);
     }
 
-    if (tooSlow) {
-      banners.push(<ExplorePrompt key='explore-prompt' />);
-    }
-
     return (
       <Column bindToDocument={!multiColumn} ref={this.setRef} label={intl.formatMessage(messages.title)}>
         <ColumnHeader
diff --git a/app/javascript/mastodon/features/ui/containers/status_list_container.js b/app/javascript/mastodon/features/ui/containers/status_list_container.js
index 3e7ae2add02d42..5ffa4353f13171 100644
--- a/app/javascript/mastodon/features/ui/containers/status_list_container.js
+++ b/app/javascript/mastodon/features/ui/containers/status_list_container.js
@@ -14,7 +14,7 @@ const makeGetStatusIds = (pending = false) => createSelector([
   (state)           => state.get('statuses'),
 ], (columnSettings, statusIds, statuses) => {
   return statusIds.filter(id => {
-    if (id === null) return true;
+    if (id === null || id === 'inline-follow-suggestions') return true;
 
     const statusForId = statuses.get(id);
     let showStatus    = true;
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index 22a831b09329f8..12d0068d69eafc 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -277,6 +277,12 @@
   "follow_request.authorize": "Authorize",
   "follow_request.reject": "Reject",
   "follow_requests.unlocked_explanation": "Even though your account is not locked, the {domain} staff thought you might want to review follow requests from these accounts manually.",
+  "follow_suggestions.curated_suggestion": "Editors' Choice",
+  "follow_suggestions.dismiss": "Don't show again",
+  "follow_suggestions.personalized_suggestion": "Personalized suggestion",
+  "follow_suggestions.popular_suggestion": "Popular suggestion",
+  "follow_suggestions.view_all": "View all",
+  "follow_suggestions.who_to_follow": "Who to follow",
   "followed_tags": "Followed hashtags",
   "footer.about": "About",
   "footer.directory": "Profiles directory",
@@ -303,13 +309,9 @@
   "hashtag.follow": "Follow hashtag",
   "hashtag.unfollow": "Unfollow hashtag",
   "hashtags.and_other": "…and {count, plural, other {# more}}",
-  "home.actions.go_to_explore": "See what's trending",
-  "home.actions.go_to_suggestions": "Find people to follow",
   "home.column_settings.basic": "Basic",
   "home.column_settings.show_reblogs": "Show boosts",
   "home.column_settings.show_replies": "Show replies",
-  "home.explore_prompt.body": "Your home feed will have a mix of posts from the hashtags you've chosen to follow, the people you've chosen to follow, and the posts they boost. If that feels too quiet, you may want to:",
-  "home.explore_prompt.title": "This is your home base within Mastodon.",
   "home.hide_announcements": "Hide announcements",
   "home.pending_critical_update.body": "Please update your Mastodon server as soon as possible!",
   "home.pending_critical_update.link": "See updates",
diff --git a/app/javascript/mastodon/reducers/settings.js b/app/javascript/mastodon/reducers/settings.js
index a605ecbb8bd62d..0e353e0d1b7c51 100644
--- a/app/javascript/mastodon/reducers/settings.js
+++ b/app/javascript/mastodon/reducers/settings.js
@@ -104,7 +104,7 @@ const initialState = ImmutableMap({
   dismissed_banners: ImmutableMap({
     'public_timeline': false,
     'community_timeline': false,
-    'home.explore_prompt': false,
+    'home/follow-suggestions': false,
     'explore/links': false,
     'explore/statuses': false,
     'explore/tags': false,
diff --git a/app/javascript/mastodon/reducers/suggestions.js b/app/javascript/mastodon/reducers/suggestions.js
index 0f224ff4b94f34..5b9d983dea4c73 100644
--- a/app/javascript/mastodon/reducers/suggestions.js
+++ b/app/javascript/mastodon/reducers/suggestions.js
@@ -28,12 +28,12 @@ export default function suggestionsReducer(state = initialState, action) {
   case SUGGESTIONS_FETCH_FAIL:
     return state.set('isLoading', false);
   case SUGGESTIONS_DISMISS:
-    return state.update('items', list => list.filterNot(x => x.account === action.id));
+    return state.update('items', list => list.filterNot(x => x.get('account') === action.id));
   case blockAccountSuccess.type:
   case muteAccountSuccess.type:
-    return state.update('items', list => list.filterNot(x => x.account === action.payload.relationship.id));
+    return state.update('items', list => list.filterNot(x => x.get('account') === action.payload.relationship.id));
   case blockDomainSuccess.type:
-    return state.update('items', list => list.filterNot(x => action.payload.accounts.includes(x.account)));
+    return state.update('items', list => list.filterNot(x => action.payload.accounts.includes(x.get('account'))));
   default:
     return state;
   }
diff --git a/app/javascript/mastodon/reducers/timelines.js b/app/javascript/mastodon/reducers/timelines.js
index 43dedd6e6d8cc8..4c9ab98a82ec65 100644
--- a/app/javascript/mastodon/reducers/timelines.js
+++ b/app/javascript/mastodon/reducers/timelines.js
@@ -17,6 +17,9 @@ import {
   TIMELINE_DISCONNECT,
   TIMELINE_LOAD_PENDING,
   TIMELINE_MARK_AS_PARTIAL,
+  TIMELINE_INSERT,
+  TIMELINE_GAP,
+  TIMELINE_SUGGESTIONS,
 } from '../actions/timelines';
 import { compareId } from '../compare_id';
 
@@ -32,6 +35,8 @@ const initialTimeline = ImmutableMap({
   items: ImmutableList(),
 });
 
+const isPlaceholder = value => value === TIMELINE_GAP || value === TIMELINE_SUGGESTIONS;
+
 const expandNormalizedTimeline = (state, timeline, statuses, next, isPartial, isLoadingRecent, usePendingItems) => {
   // This method is pretty tricky because:
   // - existing items in the timeline might be out of order
@@ -63,20 +68,20 @@ const expandNormalizedTimeline = (state, timeline, statuses, next, isPartial, is
         // First, find the furthest (if properly sorted, oldest) item in the timeline that is
         // newer than the oldest fetched one, as it's most likely that it delimits the gap.
         // Start the gap *after* that item.
-        const lastIndex = oldIds.findLastIndex(id => id !== null && compareId(id, newIds.last()) >= 0) + 1;
+        const lastIndex = oldIds.findLastIndex(id => !isPlaceholder(id) && compareId(id, newIds.last()) >= 0) + 1;
 
         // Then, try to find the furthest (if properly sorted, oldest) item in the timeline that
         // is newer than the most recent fetched one, as it delimits a section comprised of only
         // items older or within `newIds` (or that were deleted from the server, so should be removed
         // anyway).
         // Stop the gap *after* that item.
-        const firstIndex = oldIds.take(lastIndex).findLastIndex(id => id !== null && compareId(id, newIds.first()) > 0) + 1;
+        const firstIndex = oldIds.take(lastIndex).findLastIndex(id => !isPlaceholder(id) && compareId(id, newIds.first()) > 0) + 1;
 
         let insertedIds = ImmutableOrderedSet(newIds).withMutations(insertedIds => {
           // It is possible, though unlikely, that the slice we are replacing contains items older
           // than the elements we got from the API. Get them and add them back at the back of the
           // slice.
-          const olderIds = oldIds.slice(firstIndex, lastIndex).filter(id => id !== null && compareId(id, newIds.last()) < 0);
+          const olderIds = oldIds.slice(firstIndex, lastIndex).filter(id => !isPlaceholder(id) && compareId(id, newIds.last()) < 0);
           insertedIds.union(olderIds);
 
           // Make sure we aren't inserting duplicates
@@ -84,8 +89,8 @@ const expandNormalizedTimeline = (state, timeline, statuses, next, isPartial, is
         }).toList();
 
         // Finally, insert a gap marker if the data is marked as partial by the server
-        if (isPartial && (firstIndex === 0 || oldIds.get(firstIndex - 1) !== null)) {
-          insertedIds = insertedIds.unshift(null);
+        if (isPartial && (firstIndex === 0 || oldIds.get(firstIndex - 1) !== TIMELINE_GAP)) {
+          insertedIds = insertedIds.unshift(TIMELINE_GAP);
         }
 
         return oldIds.take(firstIndex).concat(
@@ -178,7 +183,7 @@ const reconnectTimeline = (state, usePendingItems) => {
   }
 
   return state.withMutations(mMap => {
-    mMap.update(usePendingItems ? 'pendingItems' : 'items', items => items.first() ? items.unshift(null) : items);
+    mMap.update(usePendingItems ? 'pendingItems' : 'items', items => items.first() ? items.unshift(TIMELINE_GAP) : items);
     mMap.set('online', true);
   });
 };
@@ -213,7 +218,7 @@ export default function timelines(state = initialState, action) {
     return state.update(
       action.timeline,
       initialTimeline,
-      map => map.set('online', false).update(action.usePendingItems ? 'pendingItems' : 'items', items => items.first() ? items.unshift(null) : items),
+      map => map.set('online', false).update(action.usePendingItems ? 'pendingItems' : 'items', items => items.first() ? items.unshift(TIMELINE_GAP) : items),
     );
   case TIMELINE_MARK_AS_PARTIAL:
     return state.update(
@@ -221,6 +226,18 @@ export default function timelines(state = initialState, action) {
       initialTimeline,
       map => map.set('isPartial', true).set('items', ImmutableList()).set('pendingItems', ImmutableList()).set('unread', 0),
     );
+  case TIMELINE_INSERT:
+    return state.update(
+      action.timeline,
+      initialTimeline,
+      map => map.update('items', ImmutableList(), list => {
+        if (!list.includes(action.key)) {
+          return list.insert(action.index, action.key);
+        }
+
+        return list;
+      })
+    );
   default:
     return state;
   }
diff --git a/app/javascript/material-icons/400-24px/navigate_before-fill.svg b/app/javascript/material-icons/400-24px/navigate_before-fill.svg
new file mode 100644
index 00000000000000..53783746ae6c81
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/navigate_before-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M560-240 320-480l240-240 56 56-184 184 184 184-56 56Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/navigate_before.svg b/app/javascript/material-icons/400-24px/navigate_before.svg
new file mode 100644
index 00000000000000..53783746ae6c81
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/navigate_before.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M560-240 320-480l240-240 56 56-184 184 184 184-56 56Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/navigate_next-fill.svg b/app/javascript/material-icons/400-24px/navigate_next-fill.svg
new file mode 100644
index 00000000000000..41004673651a63
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/navigate_next-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M504-480 320-664l56-56 240 240-240 240-56-56 184-184Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/navigate_next.svg b/app/javascript/material-icons/400-24px/navigate_next.svg
new file mode 100644
index 00000000000000..41004673651a63
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/navigate_next.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M504-480 320-664l56-56 240 240-240 240-56-56 184-184Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-light/diff.scss b/app/javascript/styles/mastodon-light/diff.scss
index 3c75854d9b0c52..520e91e28bbd67 100644
--- a/app/javascript/styles/mastodon-light/diff.scss
+++ b/app/javascript/styles/mastodon-light/diff.scss
@@ -578,3 +578,16 @@ html {
 .poll__option input[type='text'] {
   background: darken($ui-base-color, 10%);
 }
+
+.inline-follow-suggestions {
+  background-color: rgba($ui-highlight-color, 0.1);
+  border-bottom-color: rgba($ui-highlight-color, 0.3);
+}
+
+.inline-follow-suggestions__body__scrollable__card {
+  background: $white;
+}
+
+.inline-follow-suggestions__body__scroll-button__icon {
+  color: $white;
+}
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 5b89e7f25d843a..f70fa12a51abd4 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -9459,3 +9459,199 @@ noscript {
     padding: 0;
   }
 }
+
+.inline-follow-suggestions {
+  display: flex;
+  flex-direction: column;
+  gap: 12px;
+  padding: 16px 0;
+  border-bottom: 1px solid mix($ui-base-color, $ui-highlight-color, 75%);
+  background: mix($ui-base-color, $ui-highlight-color, 95%);
+
+  &__header {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 16px;
+
+    h3 {
+      font-size: 15px;
+      line-height: 22px;
+      font-weight: 500;
+    }
+
+    &__actions {
+      display: flex;
+      align-items: center;
+      gap: 24px;
+    }
+
+    .link-button {
+      font-size: 13px;
+      font-weight: 500;
+    }
+  }
+
+  &__body {
+    position: relative;
+
+    &__scroll-button {
+      position: absolute;
+      height: 100%;
+      background: transparent;
+      border: none;
+      cursor: pointer;
+      top: 0;
+      color: $primary-text-color;
+
+      &.left {
+        left: 0;
+      }
+
+      &.right {
+        right: 0;
+      }
+
+      &__icon {
+        border-radius: 50%;
+        background: $ui-highlight-color;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        aspect-ratio: 1;
+        padding: 8px;
+
+        .icon {
+          width: 24px;
+          height: 24px;
+        }
+      }
+
+      &:hover,
+      &:focus,
+      &:active {
+        .inline-follow-suggestions__body__scroll-button__icon {
+          background: lighten($ui-highlight-color, 4%);
+        }
+      }
+    }
+
+    &__scrollable {
+      display: flex;
+      flex-wrap: nowrap;
+      gap: 16px;
+      padding: 16px;
+      padding-bottom: 0;
+      scroll-snap-type: x mandatory;
+      scroll-padding: 16px;
+      scroll-behavior: smooth;
+      overflow-x: hidden;
+
+      &__card {
+        background: darken($ui-base-color, 4%);
+        border: 1px solid lighten($ui-base-color, 8%);
+        border-radius: 4px;
+        display: flex;
+        flex-direction: column;
+        gap: 12px;
+        align-items: center;
+        padding: 12px;
+        scroll-snap-align: start;
+        flex: 0 0 auto;
+        width: 200px;
+        box-sizing: border-box;
+        position: relative;
+
+        a {
+          text-decoration: none;
+        }
+
+        & > .icon-button {
+          position: absolute;
+          inset-inline-end: 8px;
+          top: 8px;
+        }
+
+        &__avatar {
+          height: 48px;
+          display: flex;
+
+          a {
+            display: flex;
+            text-decoration: none;
+          }
+        }
+
+        .account__avatar {
+          flex-shrink: 0;
+          align-self: flex-end;
+          border: 1px solid lighten($ui-base-color, 8%);
+          background-color: $ui-base-color;
+        }
+
+        &__text-stack {
+          display: flex;
+          flex-direction: column;
+          gap: 4px;
+          align-items: center;
+          max-width: 100%;
+
+          a {
+            max-width: 100%;
+          }
+
+          &__source {
+            display: inline-flex;
+            align-items: center;
+            color: $dark-text-color;
+            gap: 4px;
+            overflow: hidden;
+            white-space: nowrap;
+
+            > span {
+              overflow: hidden;
+              text-overflow: ellipsis;
+            }
+
+            .icon {
+              width: 16px;
+              height: 16px;
+            }
+          }
+        }
+
+        .display-name {
+          display: flex;
+          flex-direction: column;
+          gap: 4px;
+          align-items: center;
+
+          & > * {
+            max-width: 100%;
+          }
+
+          &__html {
+            font-size: 15px;
+            font-weight: 500;
+            color: $secondary-text-color;
+          }
+
+          &__account {
+            font-size: 14px;
+            color: $darker-text-color;
+          }
+        }
+
+        .verified-badge {
+          font-size: 14px;
+          max-width: 100%;
+        }
+
+        .button {
+          display: block;
+          width: 100%;
+        }
+      }
+    }
+  }
+}

From 1726085db5cd73dd30953da858f9887bcc90b958 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 1 Feb 2024 15:56:46 +0100
Subject: [PATCH 0046/2191] Merge pull request from GHSA-3fjr-858r-92rw

* Fix insufficient origin validation

* Bump version to 4.3.0-alpha.1
---
 .../concerns/signature_verification.rb          |  2 +-
 app/helpers/jsonld_helper.rb                    |  4 ++--
 app/lib/activitypub/activity.rb                 |  2 +-
 app/lib/activitypub/linked_data_signature.rb    |  2 +-
 .../activitypub/fetch_remote_account_service.rb |  2 +-
 .../activitypub/fetch_remote_actor_service.rb   |  6 +++---
 .../activitypub/fetch_remote_key_service.rb     | 17 ++---------------
 .../activitypub/fetch_remote_status_service.rb  |  8 ++++----
 .../activitypub/process_account_service.rb      |  2 +-
 app/services/fetch_resource_service.rb          | 10 +++++++++-
 lib/mastodon/version.rb                         |  2 +-
 .../activitypub/linked_data_signature_spec.rb   |  4 ++--
 .../fetch_remote_account_service_spec.rb        |  2 +-
 .../fetch_remote_actor_service_spec.rb          |  2 +-
 .../fetch_remote_key_service_spec.rb            |  2 +-
 spec/services/fetch_resource_service_spec.rb    | 10 +++++-----
 spec/services/resolve_url_service_spec.rb       |  1 +
 17 files changed, 37 insertions(+), 41 deletions(-)

diff --git a/app/controllers/concerns/signature_verification.rb b/app/controllers/concerns/signature_verification.rb
index 35391e64c44390..92f1eb5a168280 100644
--- a/app/controllers/concerns/signature_verification.rb
+++ b/app/controllers/concerns/signature_verification.rb
@@ -266,7 +266,7 @@ def actor_from_key_id(key_id)
       stoplight_wrap_request { ResolveAccountService.new.call(key_id.delete_prefix('acct:'), suppress_errors: false) }
     elsif !ActivityPub::TagManager.instance.local_uri?(key_id)
       account   = ActivityPub::TagManager.instance.uri_to_actor(key_id)
-      account ||= stoplight_wrap_request { ActivityPub::FetchRemoteKeyService.new.call(key_id, id: false, suppress_errors: false) }
+      account ||= stoplight_wrap_request { ActivityPub::FetchRemoteKeyService.new.call(key_id, suppress_errors: false) }
       account
     end
   rescue Mastodon::PrivateNetworkAddressError => e
diff --git a/app/helpers/jsonld_helper.rb b/app/helpers/jsonld_helper.rb
index b3d0d032c4d3ce..cc05b7a403483e 100644
--- a/app/helpers/jsonld_helper.rb
+++ b/app/helpers/jsonld_helper.rb
@@ -155,8 +155,8 @@ def safe_for_forwarding?(original, compacted)
     end
   end
 
-  def fetch_resource(uri, id, on_behalf_of = nil, request_options: {})
-    unless id
+  def fetch_resource(uri, id_is_known, on_behalf_of = nil, request_options: {})
+    unless id_is_known
       json = fetch_resource_without_id_validation(uri, on_behalf_of)
 
       return if !json.is_a?(Hash) || unsupported_uri_scheme?(json['id'])
diff --git a/app/lib/activitypub/activity.rb b/app/lib/activitypub/activity.rb
index 51384ef984657d..322f3e27adb604 100644
--- a/app/lib/activitypub/activity.rb
+++ b/app/lib/activitypub/activity.rb
@@ -154,7 +154,7 @@ def fetch_remote_original_status
     if object_uri.start_with?('http')
       return if ActivityPub::TagManager.instance.local_uri?(object_uri)
 
-      ActivityPub::FetchRemoteStatusService.new.call(object_uri, id: true, on_behalf_of: @account.followers.local.first, request_id: @options[:request_id])
+      ActivityPub::FetchRemoteStatusService.new.call(object_uri, on_behalf_of: @account.followers.local.first, request_id: @options[:request_id])
     elsif @object['url'].present?
       ::FetchRemoteStatusService.new.call(@object['url'], request_id: @options[:request_id])
     end
diff --git a/app/lib/activitypub/linked_data_signature.rb b/app/lib/activitypub/linked_data_signature.rb
index faea63e8f12c6e..9459fdd8b76972 100644
--- a/app/lib/activitypub/linked_data_signature.rb
+++ b/app/lib/activitypub/linked_data_signature.rb
@@ -19,7 +19,7 @@ def verify_actor!
     return unless type == 'RsaSignature2017'
 
     creator = ActivityPub::TagManager.instance.uri_to_actor(creator_uri)
-    creator = ActivityPub::FetchRemoteKeyService.new.call(creator_uri, id: false) if creator&.public_key.blank?
+    creator = ActivityPub::FetchRemoteKeyService.new.call(creator_uri) if creator&.public_key.blank?
 
     return if creator.nil?
 
diff --git a/app/services/activitypub/fetch_remote_account_service.rb b/app/services/activitypub/fetch_remote_account_service.rb
index 567dd8a14abc04..7b083d889b21fb 100644
--- a/app/services/activitypub/fetch_remote_account_service.rb
+++ b/app/services/activitypub/fetch_remote_account_service.rb
@@ -2,7 +2,7 @@
 
 class ActivityPub::FetchRemoteAccountService < ActivityPub::FetchRemoteActorService
   # Does a WebFinger roundtrip on each call, unless `only_key` is true
-  def call(uri, id: true, prefetched_body: nil, break_on_redirect: false, only_key: false, suppress_errors: true, request_id: nil)
+  def call(uri, prefetched_body: nil, break_on_redirect: false, only_key: false, suppress_errors: true, request_id: nil)
     actor = super
     return actor if actor.nil? || actor.is_a?(Account)
 
diff --git a/app/services/activitypub/fetch_remote_actor_service.rb b/app/services/activitypub/fetch_remote_actor_service.rb
index 8df8c75876644d..86a134bb4ed911 100644
--- a/app/services/activitypub/fetch_remote_actor_service.rb
+++ b/app/services/activitypub/fetch_remote_actor_service.rb
@@ -10,15 +10,15 @@ class Error < StandardError; end
   SUPPORTED_TYPES = %w(Application Group Organization Person Service).freeze
 
   # Does a WebFinger roundtrip on each call, unless `only_key` is true
-  def call(uri, id: true, prefetched_body: nil, break_on_redirect: false, only_key: false, suppress_errors: true, request_id: nil)
+  def call(uri, prefetched_body: nil, break_on_redirect: false, only_key: false, suppress_errors: true, request_id: nil)
     return if domain_not_allowed?(uri)
     return ActivityPub::TagManager.instance.uri_to_actor(uri) if ActivityPub::TagManager.instance.local_uri?(uri)
 
     @json = begin
       if prefetched_body.nil?
-        fetch_resource(uri, id)
+        fetch_resource(uri, true)
       else
-        body_to_json(prefetched_body, compare_id: id ? uri : nil)
+        body_to_json(prefetched_body, compare_id: uri)
       end
     rescue Oj::ParseError
       raise Error, "Error parsing JSON-LD document #{uri}"
diff --git a/app/services/activitypub/fetch_remote_key_service.rb b/app/services/activitypub/fetch_remote_key_service.rb
index 8eb97c1e66d188..e96b5ad3bb012c 100644
--- a/app/services/activitypub/fetch_remote_key_service.rb
+++ b/app/services/activitypub/fetch_remote_key_service.rb
@@ -6,23 +6,10 @@ class ActivityPub::FetchRemoteKeyService < BaseService
   class Error < StandardError; end
 
   # Returns actor that owns the key
-  def call(uri, id: true, prefetched_body: nil, suppress_errors: true)
+  def call(uri, suppress_errors: true)
     raise Error, 'No key URI given' if uri.blank?
 
-    if prefetched_body.nil?
-      if id
-        @json = fetch_resource_without_id_validation(uri)
-        if actor_type?
-          @json = fetch_resource(@json['id'], true)
-        elsif uri != @json['id']
-          raise Error, "Fetched URI #{uri} has wrong id #{@json['id']}"
-        end
-      else
-        @json = fetch_resource(uri, id)
-      end
-    else
-      @json = body_to_json(prefetched_body, compare_id: id ? uri : nil)
-    end
+    @json = fetch_resource(uri, false)
 
     raise Error, "Unable to fetch key JSON at #{uri}" if @json.nil?
     raise Error, "Unsupported JSON-LD context for document #{uri}" unless supported_context?(@json)
diff --git a/app/services/activitypub/fetch_remote_status_service.rb b/app/services/activitypub/fetch_remote_status_service.rb
index e3a9b60b5679f2..6f8882378f32ec 100644
--- a/app/services/activitypub/fetch_remote_status_service.rb
+++ b/app/services/activitypub/fetch_remote_status_service.rb
@@ -8,14 +8,14 @@ class ActivityPub::FetchRemoteStatusService < BaseService
   DISCOVERIES_PER_REQUEST = 1000
 
   # Should be called when uri has already been checked for locality
-  def call(uri, id: true, prefetched_body: nil, on_behalf_of: nil, expected_actor_uri: nil, request_id: nil)
+  def call(uri, prefetched_body: nil, on_behalf_of: nil, expected_actor_uri: nil, request_id: nil)
     return if domain_not_allowed?(uri)
 
     @request_id = request_id || "#{Time.now.utc.to_i}-status-#{uri}"
     @json = if prefetched_body.nil?
-              fetch_resource(uri, id, on_behalf_of)
+              fetch_resource(uri, true, on_behalf_of)
             else
-              body_to_json(prefetched_body, compare_id: id ? uri : nil)
+              body_to_json(prefetched_body, compare_id: uri)
             end
 
     return unless supported_context?
@@ -65,7 +65,7 @@ def trustworthy_attribution?(uri, attributed_to)
 
   def account_from_uri(uri)
     actor = ActivityPub::TagManager.instance.uri_to_resource(uri, Account)
-    actor = ActivityPub::FetchRemoteAccountService.new.call(uri, id: true, request_id: @request_id) if actor.nil? || actor.possibly_stale?
+    actor = ActivityPub::FetchRemoteAccountService.new.call(uri, request_id: @request_id) if actor.nil? || actor.possibly_stale?
     actor
   end
 
diff --git a/app/services/activitypub/process_account_service.rb b/app/services/activitypub/process_account_service.rb
index 8fc0989a3f7e91..9e787ace508a0d 100644
--- a/app/services/activitypub/process_account_service.rb
+++ b/app/services/activitypub/process_account_service.rb
@@ -277,7 +277,7 @@ def collection_info(type)
 
   def moved_account
     account   = ActivityPub::TagManager.instance.uri_to_resource(@json['movedTo'], Account)
-    account ||= ActivityPub::FetchRemoteAccountService.new.call(@json['movedTo'], id: true, break_on_redirect: true, request_id: @options[:request_id])
+    account ||= ActivityPub::FetchRemoteAccountService.new.call(@json['movedTo'], break_on_redirect: true, request_id: @options[:request_id])
     account
   end
 
diff --git a/app/services/fetch_resource_service.rb b/app/services/fetch_resource_service.rb
index a3406e5a579c57..71c6cca790c6ee 100644
--- a/app/services/fetch_resource_service.rb
+++ b/app/services/fetch_resource_service.rb
@@ -48,7 +48,15 @@ def process_response(response, terminal = false)
       body = response.body_with_limit
       json = body_to_json(body)
 
-      [json['id'], { prefetched_body: body, id: true }] if supported_context?(json) && (equals_or_includes_any?(json['type'], ActivityPub::FetchRemoteActorService::SUPPORTED_TYPES) || expected_type?(json))
+      return unless supported_context?(json) && (equals_or_includes_any?(json['type'], ActivityPub::FetchRemoteActorService::SUPPORTED_TYPES) || expected_type?(json))
+
+      if json['id'] != @url
+        return if terminal
+
+        return process(json['id'], terminal: true)
+      end
+
+      [@url, { prefetched_body: body }]
     elsif !terminal
       link_header = response['Link'] && parse_link_header(response)
 
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index 587e89303bd1f2..dd7c84207e0b1e 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -17,7 +17,7 @@ def patch
     end
 
     def default_prerelease
-      'alpha.0'
+      'alpha.1'
     end
 
     def prerelease
diff --git a/spec/lib/activitypub/linked_data_signature_spec.rb b/spec/lib/activitypub/linked_data_signature_spec.rb
index 97268eea6d04b2..1af45673c049bc 100644
--- a/spec/lib/activitypub/linked_data_signature_spec.rb
+++ b/spec/lib/activitypub/linked_data_signature_spec.rb
@@ -56,7 +56,7 @@
 
         allow(ActivityPub::FetchRemoteKeyService).to receive(:new).and_return(service_stub)
 
-        allow(service_stub).to receive(:call).with('http://example.com/alice', id: false) do
+        allow(service_stub).to receive(:call).with('http://example.com/alice') do
           sender.update!(public_key: old_key)
           sender
         end
@@ -64,7 +64,7 @@
 
       it 'fetches key and returns creator' do
         expect(subject.verify_actor!).to eq sender
-        expect(service_stub).to have_received(:call).with('http://example.com/alice', id: false).once
+        expect(service_stub).to have_received(:call).with('http://example.com/alice').once
       end
     end
 
diff --git a/spec/services/activitypub/fetch_remote_account_service_spec.rb b/spec/services/activitypub/fetch_remote_account_service_spec.rb
index 4015723f6df9cf..e7f6bb8dd83401 100644
--- a/spec/services/activitypub/fetch_remote_account_service_spec.rb
+++ b/spec/services/activitypub/fetch_remote_account_service_spec.rb
@@ -18,7 +18,7 @@
   end
 
   describe '#call' do
-    let(:account) { subject.call('https://example.com/alice', id: true) }
+    let(:account) { subject.call('https://example.com/alice') }
 
     shared_examples 'sets profile data' do
       it 'returns an account with expected details' do
diff --git a/spec/services/activitypub/fetch_remote_actor_service_spec.rb b/spec/services/activitypub/fetch_remote_actor_service_spec.rb
index 485ca81a11aaa9..e622c7d4c30d84 100644
--- a/spec/services/activitypub/fetch_remote_actor_service_spec.rb
+++ b/spec/services/activitypub/fetch_remote_actor_service_spec.rb
@@ -18,7 +18,7 @@
   end
 
   describe '#call' do
-    let(:account) { subject.call('https://example.com/alice', id: true) }
+    let(:account) { subject.call('https://example.com/alice') }
 
     shared_examples 'sets profile data' do
       it 'returns an account and sets attributes' do
diff --git a/spec/services/activitypub/fetch_remote_key_service_spec.rb b/spec/services/activitypub/fetch_remote_key_service_spec.rb
index e210d20ec77d40..0b14da4f446e5f 100644
--- a/spec/services/activitypub/fetch_remote_key_service_spec.rb
+++ b/spec/services/activitypub/fetch_remote_key_service_spec.rb
@@ -55,7 +55,7 @@
   end
 
   describe '#call' do
-    let(:account) { subject.call(public_key_id, id: false) }
+    let(:account) { subject.call(public_key_id) }
 
     context 'when the key is a sub-object from the actor' do
       before do
diff --git a/spec/services/fetch_resource_service_spec.rb b/spec/services/fetch_resource_service_spec.rb
index 0f1068471f8e38..78037a06ce4fdb 100644
--- a/spec/services/fetch_resource_service_spec.rb
+++ b/spec/services/fetch_resource_service_spec.rb
@@ -57,7 +57,7 @@
 
       let(:json) do
         {
-          id: 1,
+          id: 'http://example.com/foo',
           '@context': ActivityPub::TagManager::CONTEXT,
           type: 'Note',
         }.to_json
@@ -83,27 +83,27 @@
         let(:content_type) { 'application/activity+json; charset=utf-8' }
         let(:body) { json }
 
-        it { is_expected.to eq [1, { prefetched_body: body, id: true }] }
+        it { is_expected.to eq ['http://example.com/foo', { prefetched_body: body }] }
       end
 
       context 'when content type is ld+json with profile' do
         let(:content_type) { 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"' }
         let(:body) { json }
 
-        it { is_expected.to eq [1, { prefetched_body: body, id: true }] }
+        it { is_expected.to eq ['http://example.com/foo', { prefetched_body: body }] }
       end
 
       context 'when link header is present' do
         let(:headers) { { 'Link' => '<http://example.com/foo>; rel="alternate"; type="application/activity+json"' } }
 
-        it { is_expected.to eq [1, { prefetched_body: json, id: true }] }
+        it { is_expected.to eq ['http://example.com/foo', { prefetched_body: json }] }
       end
 
       context 'when content type is text/html' do
         let(:content_type) { 'text/html' }
         let(:body) { '<html><head><link rel="alternate" href="http://example.com/foo" type="application/activity+json"/></head></html>' }
 
-        it { is_expected.to eq [1, { prefetched_body: json, id: true }] }
+        it { is_expected.to eq ['http://example.com/foo', { prefetched_body: json }] }
       end
     end
   end
diff --git a/spec/services/resolve_url_service_spec.rb b/spec/services/resolve_url_service_spec.rb
index bcfb9dbfb0f893..5270cc10dd8f12 100644
--- a/spec/services/resolve_url_service_spec.rb
+++ b/spec/services/resolve_url_service_spec.rb
@@ -139,6 +139,7 @@
         stub_request(:get, url).to_return(status: 302, headers: { 'Location' => status_url })
         body = ActiveModelSerializers::SerializableResource.new(status, serializer: ActivityPub::NoteSerializer, adapter: ActivityPub::Adapter).to_json
         stub_request(:get, status_url).to_return(body: body, headers: { 'Content-Type' => 'application/activity+json' })
+        stub_request(:get, uri).to_return(body: body, headers: { 'Content-Type' => 'application/activity+json' })
       end
 
       it 'returns status by url' do

From 3c315a68afdb3b6ea1bc66b66bc7dcd49a335a08 Mon Sep 17 00:00:00 2001
From: "y.takahashi" <eai@mizle.net>
Date: Fri, 2 Feb 2024 15:33:53 +0900
Subject: [PATCH 0047/2191] Fix 'focus the compose textarea' shortcut is not
 working (#29059)

---
 app/javascript/mastodon/features/ui/index.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/features/ui/index.jsx b/app/javascript/mastodon/features/ui/index.jsx
index d3fee272f0d186..b17b59a0e663ff 100644
--- a/app/javascript/mastodon/features/ui/index.jsx
+++ b/app/javascript/mastodon/features/ui/index.jsx
@@ -438,7 +438,7 @@ class UI extends PureComponent {
   handleHotkeyNew = e => {
     e.preventDefault();
 
-    const element = this.node.querySelector('.compose-form__autosuggest-wrapper textarea');
+    const element = this.node.querySelector('.autosuggest-textarea__textarea');
 
     if (element) {
       element.focus();

From 1666b1955992e16f4605b414c6563ca25b3a3f18 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 2 Feb 2024 16:51:26 +0100
Subject: [PATCH 0048/2191] Fix confirmation e-mails when signing up through an
 app (#29064)

---
 app/views/user_mailer/confirmation_instructions.html.haml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/views/user_mailer/confirmation_instructions.html.haml b/app/views/user_mailer/confirmation_instructions.html.haml
index 74b2d49a4710fe..13e68c722b2fc8 100644
--- a/app/views/user_mailer/confirmation_instructions.html.haml
+++ b/app/views/user_mailer/confirmation_instructions.html.haml
@@ -8,9 +8,7 @@
           %td.email-inner-card-td.email-prose
             %p= t @resource.approved? ? 'devise.mailer.confirmation_instructions.explanation' : 'devise.mailer.confirmation_instructions.explanation_when_pending', host: site_hostname
             - if @resource.created_by_application
-              = render 'application/mailer/button', text: t('settings.account_settings'), url: edit_user_registration_url
-              = link_to confirmation_url(@resource, confirmation_token: @token, redirect_to_app: 'true') do
-                %span= t 'devise.mailer.confirmation_instructions.action_with_app', app: @resource.created_by_application.name
+              = render 'application/mailer/button', text: t('devise.mailer.confirmation_instructions.action_with_app', app: @resource.created_by_application.name), url: confirmation_url(@resource, confirmation_token: @token, redirect_to_app: 'true')
             - else
               = render 'application/mailer/button', text: t('devise.mailer.confirmation_instructions.action'), url: confirmation_url(@resource, confirmation_token: @token)
             %p= t 'devise.mailer.confirmation_instructions.extra_html', terms_path: about_more_url, policy_path: privacy_policy_url

From 86500e3312394de52413254e81bbc91f1a9333a0 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 6 Feb 2024 04:08:07 -0500
Subject: [PATCH 0049/2191] Extract scenic view model common methods to concern
 (#28111)

---
 app/models/account_summary.rb               | 14 +++---------
 app/models/concerns/database_view_record.rb | 25 +++++++++++++++++++++
 app/models/follow_recommendation.rb         | 12 ++--------
 app/models/instance.rb                      | 10 ++-------
 app/models/user_ip.rb                       |  6 ++---
 5 files changed, 34 insertions(+), 33 deletions(-)
 create mode 100644 app/models/concerns/database_view_record.rb

diff --git a/app/models/account_summary.rb b/app/models/account_summary.rb
index 30ada50cc02932..327c0ef305ab7c 100644
--- a/app/models/account_summary.rb
+++ b/app/models/account_summary.rb
@@ -10,21 +10,13 @@
 #
 
 class AccountSummary < ApplicationRecord
+  include DatabaseViewRecord
+
   self.primary_key = :account_id
 
-  has_many :follow_recommendation_suppressions, primary_key: :account_id, foreign_key: :account_id, inverse_of: false
+  has_many :follow_recommendation_suppressions, primary_key: :account_id, foreign_key: :account_id, inverse_of: false, dependent: nil
 
   scope :safe, -> { where(sensitive: false) }
   scope :localized, ->(locale) { order(Arel::Nodes::Case.new.when(arel_table[:language].eq(locale)).then(1).else(0).desc) }
   scope :filtered, -> { where.missing(:follow_recommendation_suppressions) }
-
-  def self.refresh
-    Scenic.database.refresh_materialized_view(table_name, concurrently: true, cascade: false)
-  rescue ActiveRecord::StatementInvalid
-    Scenic.database.refresh_materialized_view(table_name, concurrently: false, cascade: false)
-  end
-
-  def readonly?
-    true
-  end
 end
diff --git a/app/models/concerns/database_view_record.rb b/app/models/concerns/database_view_record.rb
new file mode 100644
index 00000000000000..8b6672e2991a4c
--- /dev/null
+++ b/app/models/concerns/database_view_record.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module DatabaseViewRecord
+  extend ActiveSupport::Concern
+
+  class_methods do
+    def refresh
+      Scenic.database.refresh_materialized_view(
+        table_name,
+        concurrently: true,
+        cascade: false
+      )
+    rescue ActiveRecord::StatementInvalid
+      Scenic.database.refresh_materialized_view(
+        table_name,
+        concurrently: false,
+        cascade: false
+      )
+    end
+  end
+
+  def readonly?
+    true
+  end
+end
diff --git a/app/models/follow_recommendation.rb b/app/models/follow_recommendation.rb
index 6b49a3ca660170..7ac9e6dfb95743 100644
--- a/app/models/follow_recommendation.rb
+++ b/app/models/follow_recommendation.rb
@@ -10,6 +10,8 @@
 #
 
 class FollowRecommendation < ApplicationRecord
+  include DatabaseViewRecord
+
   self.primary_key = :account_id
   self.table_name = :global_follow_recommendations
 
@@ -17,14 +19,4 @@ class FollowRecommendation < ApplicationRecord
   belongs_to :account
 
   scope :localized, ->(locale) { joins(:account_summary).merge(AccountSummary.localized(locale)) }
-
-  def self.refresh
-    Scenic.database.refresh_materialized_view(table_name, concurrently: true, cascade: false)
-  rescue ActiveRecord::StatementInvalid
-    Scenic.database.refresh_materialized_view(table_name, concurrently: false, cascade: false)
-  end
-
-  def readonly?
-    true
-  end
 end
diff --git a/app/models/instance.rb b/app/models/instance.rb
index 0fd31c8097cab6..3bd4b924ae73c3 100644
--- a/app/models/instance.rb
+++ b/app/models/instance.rb
@@ -9,6 +9,8 @@
 #
 
 class Instance < ApplicationRecord
+  include DatabaseViewRecord
+
   self.primary_key = :domain
 
   attr_accessor :failure_days
@@ -27,10 +29,6 @@ class Instance < ApplicationRecord
   scope :by_domain_and_subdomains, ->(domain) { where("reverse('.' || domain) LIKE reverse(?)", "%.#{domain}") }
   scope :with_domain_follows, ->(domains) { where(domain: domains).where(domain_account_follows) }
 
-  def self.refresh
-    Scenic.database.refresh_materialized_view(table_name, concurrently: true, cascade: false)
-  end
-
   def self.domain_account_follows
     Arel.sql(
       <<~SQL.squish
@@ -44,10 +42,6 @@ def self.domain_account_follows
     )
   end
 
-  def readonly?
-    true
-  end
-
   def delivery_failure_tracker
     @delivery_failure_tracker ||= DeliveryFailureTracker.new(domain)
   end
diff --git a/app/models/user_ip.rb b/app/models/user_ip.rb
index 38287c2a607a58..87b86a24d43f9a 100644
--- a/app/models/user_ip.rb
+++ b/app/models/user_ip.rb
@@ -10,11 +10,9 @@
 #
 
 class UserIp < ApplicationRecord
+  include DatabaseViewRecord
+
   self.primary_key = :user_id
 
   belongs_to :user
-
-  def readonly?
-    true
-  end
 end

From f00ba02653ef4e654571e8942b404fcd925662b1 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 6 Feb 2024 10:20:23 +0100
Subject: [PATCH 0050/2191] Update dependency nokogiri to v1.16.2 [SECURITY]
 (#29106)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 01f5b4592947dc..7c10a419ada8dc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -465,7 +465,7 @@ GEM
     net-smtp (0.4.0.1)
       net-protocol
     nio4r (2.5.9)
-    nokogiri (1.16.0)
+    nokogiri (1.16.2)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     oj (3.16.3)

From 916aeb574d24e2dce1cfefac4694066c7caf65ca Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 6 Feb 2024 10:23:55 +0100
Subject: [PATCH 0051/2191] Update DefinitelyTyped types (non-major) (#29088)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 4d1084c229bf91..8055554014b0de 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3179,12 +3179,12 @@ __metadata:
   linkType: hard
 
 "@types/jest@npm:^29.5.2":
-  version: 29.5.11
-  resolution: "@types/jest@npm:29.5.11"
+  version: 29.5.12
+  resolution: "@types/jest@npm:29.5.12"
   dependencies:
     expect: "npm:^29.0.0"
     pretty-format: "npm:^29.0.0"
-  checksum: 524a3394845214581278bf4d75055927261fbeac7e1a89cd621bd0636da37d265fe0a85eac58b5778758faad1cbd7c7c361dfc190c78ebde03a91cce33463261
+  checksum: 25fc8e4c611fa6c4421e631432e9f0a6865a8cb07c9815ec9ac90d630271cad773b2ee5fe08066f7b95bebd18bb967f8ce05d018ee9ab0430f9dfd1d84665b6f
   languageName: node
   linkType: hard
 
@@ -3286,13 +3286,13 @@ __metadata:
   linkType: hard
 
 "@types/pg@npm:^8.6.6":
-  version: 8.10.9
-  resolution: "@types/pg@npm:8.10.9"
+  version: 8.11.0
+  resolution: "@types/pg@npm:8.11.0"
   dependencies:
     "@types/node": "npm:*"
     pg-protocol: "npm:*"
     pg-types: "npm:^4.0.1"
-  checksum: 6b3bec7230d09da6459636a66dfd6fb538378e466ffff0a0bcd07d67aa4ddce49c73afc7442f53adec92a49dbf9e71d8d847e0075750d7545331735dfd92d22c
+  checksum: df2c2ac11fa5e8863a98aadce9a9168af5cfc38a226a228d8b1be513ef48d33ceb9bfaa64ef685a87e0611a4f8d94f2e0736bb2812fa00ed264f76679b86945d
   languageName: node
   linkType: hard
 
@@ -3476,13 +3476,13 @@ __metadata:
   linkType: hard
 
 "@types/react@npm:*, @types/react@npm:16 || 17 || 18, @types/react@npm:>=16.9.11, @types/react@npm:^18.2.7":
-  version: 18.2.48
-  resolution: "@types/react@npm:18.2.48"
+  version: 18.2.54
+  resolution: "@types/react@npm:18.2.54"
   dependencies:
     "@types/prop-types": "npm:*"
     "@types/scheduler": "npm:*"
     csstype: "npm:^3.0.2"
-  checksum: 7e89f18ea2928b1638f564b156d692894dcb9352a7e0a807873c97e858abe1f23dbd165a25dd088a991344e973fdeef88ba5724bfb64504b74072cbc9c220c3a
+  checksum: ad38193c30a063a481aeec2460de6396c80d8de2f1c7a8cbb80a4e8bc594f74c308ce93e165d743b38507c3ac0a491c24ce0efbd84c9ab21fd5fd38d2963d329
   languageName: node
   linkType: hard
 
@@ -3599,9 +3599,9 @@ __metadata:
   linkType: hard
 
 "@types/uuid@npm:^9.0.0":
-  version: 9.0.7
-  resolution: "@types/uuid@npm:9.0.7"
-  checksum: b329ebd4f9d1d8e08d4f2cc211be4922d70d1149f73d5772630e4a3acfb5170c6d37b3d7a39a0412f1a56e86e8a844c7f297c798b082f90380608bf766688787
+  version: 9.0.8
+  resolution: "@types/uuid@npm:9.0.8"
+  checksum: b411b93054cb1d4361919579ef3508a1f12bf15b5fdd97337d3d351bece6c921b52b6daeef89b62340fd73fd60da407878432a1af777f40648cbe53a01723489
   languageName: node
   linkType: hard
 

From 586b4faf61dac5156a79637b49ce07ca401077d4 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 6 Feb 2024 10:24:44 +0100
Subject: [PATCH 0052/2191] Update dependency haml_lint to v0.56.0 (#29082)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 7c10a419ada8dc..960bd48de439a8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -319,7 +319,7 @@ GEM
       activesupport (>= 5.1)
       haml (>= 4.0.6)
       railties (>= 5.1)
-    haml_lint (0.55.0)
+    haml_lint (0.56.0)
       haml (>= 5.0)
       parallel (~> 1.10)
       rainbow

From 5ca45403e24522257da4ed608c265078b558ab8a Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 6 Feb 2024 04:33:11 -0500
Subject: [PATCH 0053/2191] Update `nsa` gem to version 0.3.0 (#29065)

---
 Gemfile      |  2 +-
 Gemfile.lock | 18 ++++++------------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/Gemfile b/Gemfile
index 906441ec67cb42..5f09b4beb255fa 100644
--- a/Gemfile
+++ b/Gemfile
@@ -63,7 +63,7 @@ gem 'kaminari', '~> 1.2'
 gem 'link_header', '~> 0.0'
 gem 'mime-types', '~> 3.5.0', require: 'mime/types/columnar'
 gem 'nokogiri', '~> 1.15'
-gem 'nsa', github: 'jhawthorn/nsa', ref: 'e020fcc3a54d993ab45b7194d89ab720296c111b'
+gem 'nsa'
 gem 'oj', '~> 3.14'
 gem 'ox', '~> 2.14'
 gem 'parslet'
diff --git a/Gemfile.lock b/Gemfile.lock
index 960bd48de439a8..9de0af9a4bad55 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -7,17 +7,6 @@ GIT
       hkdf (~> 0.2)
       jwt (~> 2.0)
 
-GIT
-  remote: https://github.com/jhawthorn/nsa.git
-  revision: e020fcc3a54d993ab45b7194d89ab720296c111b
-  ref: e020fcc3a54d993ab45b7194d89ab720296c111b
-  specs:
-    nsa (0.2.8)
-      activesupport (>= 4.2, < 7.2)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      sidekiq (>= 3.5)
-      statsd-ruby (~> 1.4, >= 1.4.0)
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -468,6 +457,11 @@ GEM
     nokogiri (1.16.2)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
+    nsa (0.3.0)
+      activesupport (>= 4.2, < 7.2)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      sidekiq (>= 3.5)
+      statsd-ruby (~> 1.4, >= 1.4.0)
     oj (3.16.3)
       bigdecimal (>= 3.0)
     omniauth (2.1.1)
@@ -886,7 +880,7 @@ DEPENDENCIES
   net-http (~> 0.4.0)
   net-ldap (~> 0.18)
   nokogiri (~> 1.15)
-  nsa!
+  nsa
   oj (~> 3.14)
   omniauth (~> 2.0)
   omniauth-cas (~> 3.0.0.beta.1)

From a2d8aa1583545d52b4825a38dc1880f7dd81223d Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 6 Feb 2024 10:33:41 +0100
Subject: [PATCH 0054/2191] Update dependency tzinfo-data to v1.2024.1 (#29052)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 9de0af9a4bad55..d6a51e2f0ae875 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -765,7 +765,7 @@ GEM
       unf (~> 0.1.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    tzinfo-data (1.2023.4)
+    tzinfo-data (1.2024.1)
       tzinfo (>= 1.0.0)
     unf (0.1.4)
       unf_ext

From 779d987fbc42412f80cce93a8f5979525c894d5d Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 6 Feb 2024 04:34:28 -0500
Subject: [PATCH 0055/2191] Update `codedoc/codecov-action` to v4 (#29036)

---
 .github/workflows/test-ruby.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-ruby.yml b/.github/workflows/test-ruby.yml
index 346703ced4328c..4275f594206767 100644
--- a/.github/workflows/test-ruby.yml
+++ b/.github/workflows/test-ruby.yml
@@ -139,7 +139,7 @@ jobs:
 
       - name: Upload coverage reports to Codecov
         if: matrix.ruby-version == '.ruby-version'
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v4
         with:
           files: coverage/lcov/mastodon.lcov
 

From 66dda7c762d19c18dc1d7e3105a26377c5b6e932 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 6 Feb 2024 10:35:27 +0100
Subject: [PATCH 0056/2191] Fix already-invalid reports failing to resolve
 (#29027)

---
 app/models/report.rb       |  6 ++----
 spec/models/report_spec.rb | 13 +++++++++++++
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/app/models/report.rb b/app/models/report.rb
index 38da26d7b75408..1b132753b515f5 100644
--- a/app/models/report.rb
+++ b/app/models/report.rb
@@ -47,9 +47,9 @@ class Report < ApplicationRecord
   delegate :local?, to: :account
 
   validates :comment, length: { maximum: 1_000 }, if: :local?
-  validates :rule_ids, absence: true, unless: :violation?
+  validates :rule_ids, absence: true, if: -> { (category_changed? || rule_ids_changed?) && !violation? }
 
-  validate :validate_rule_ids
+  validate :validate_rule_ids, if: -> { (category_changed? || rule_ids_changed?) && violation? }
 
   # entries here need to be kept in sync with the front-end:
   # - app/javascript/mastodon/features/notifications/components/report.jsx
@@ -162,8 +162,6 @@ def set_uri
   end
 
   def validate_rule_ids
-    return unless violation?
-
     errors.add(:rule_ids, I18n.t('reports.errors.invalid_rules')) unless rules.size == rule_ids&.size
   end
 
diff --git a/spec/models/report_spec.rb b/spec/models/report_spec.rb
index c514c63b39226f..0168268bcb7723 100644
--- a/spec/models/report_spec.rb
+++ b/spec/models/report_spec.rb
@@ -133,5 +133,18 @@
       report = Fabricate.build(:report, account: remote_account, comment: Faker::Lorem.characters(number: 1001))
       expect(report.valid?).to be true
     end
+
+    it 'is invalid if it references invalid rules' do
+      report = Fabricate.build(:report, category: :violation, rule_ids: [-1])
+      expect(report.valid?).to be false
+      expect(report).to model_have_error_on_field(:rule_ids)
+    end
+
+    it 'is invalid if it references rules but category is not "violation"' do
+      rule = Fabricate(:rule)
+      report = Fabricate.build(:report, category: :spam, rule_ids: rule.id)
+      expect(report.valid?).to be false
+      expect(report).to model_have_error_on_field(:rule_ids)
+    end
   end
 end

From 9ce914cc897d2b1100cee8cb6d792a2283d877ec Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 6 Feb 2024 10:35:36 +0100
Subject: [PATCH 0057/2191] Fix report reason selector in moderation interface
 not unselecting rules when changing category (#29026)

---
 .../mastodon/components/admin/ReportReasonSelector.jsx          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/components/admin/ReportReasonSelector.jsx b/app/javascript/mastodon/components/admin/ReportReasonSelector.jsx
index ecce92b309429d..90f4334a6e1ad2 100644
--- a/app/javascript/mastodon/components/admin/ReportReasonSelector.jsx
+++ b/app/javascript/mastodon/components/admin/ReportReasonSelector.jsx
@@ -124,7 +124,7 @@ class ReportReasonSelector extends PureComponent {
 
     api().put(`/api/v1/admin/reports/${id}`, {
       category,
-      rule_ids,
+      rule_ids: category === 'violation' ? rule_ids : [],
     }).catch(err => {
       console.error(err);
     });

From 90f4b8d53a027e39049b5b6f4decfe605f925bda Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 6 Feb 2024 10:37:03 +0100
Subject: [PATCH 0058/2191] Update dependency postcss to v8.4.34 (#29103)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 8055554014b0de..8783c33f86e9b2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -13144,13 +13144,13 @@ __metadata:
   linkType: hard
 
 "postcss@npm:^8.2.15, postcss@npm:^8.4.24, postcss@npm:^8.4.33":
-  version: 8.4.33
-  resolution: "postcss@npm:8.4.33"
+  version: 8.4.34
+  resolution: "postcss@npm:8.4.34"
   dependencies:
     nanoid: "npm:^3.3.7"
     picocolors: "npm:^1.0.0"
     source-map-js: "npm:^1.0.2"
-  checksum: 16eda83458fcd8a91bece287b5920c7f57164c3ea293e6c80d0ea71ce7843007bcd8592260a5160b9a7f02693e6ac93e2495b02d8c7596d3f3f72c1447e3ba79
+  checksum: 4d6f072cdfdc1ced16b4336263d830f8b4397fc47b9b382e02f6448fda9386d881aa9d27fbe0dd124f59c76f3a5da4f360919d25dfc818eca50b48f042af35a8
   languageName: node
   linkType: hard
 

From 62028b1b1bf32623c13e2c5f3419c8ab03fc1db2 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 6 Feb 2024 10:38:32 +0100
Subject: [PATCH 0059/2191] Update libretranslate/libretranslate Docker tag to
 v1.5.5 (#29090)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .devcontainer/docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
index 88979723c338eb..ecdf9f5f53060c 100644
--- a/.devcontainer/docker-compose.yml
+++ b/.devcontainer/docker-compose.yml
@@ -70,7 +70,7 @@ services:
         hard: -1
 
   libretranslate:
-    image: libretranslate/libretranslate:v1.5.4
+    image: libretranslate/libretranslate:v1.5.5
     restart: unless-stopped
     volumes:
       - lt-data:/home/libretranslate/.local

From 0bec5c0755cfb270c692fd39b0f22e98ab1b4e0b Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 6 Feb 2024 04:56:24 -0500
Subject: [PATCH 0060/2191] Remove migration base class switcher from
 `RailsSettingsMigration` (#29047)

---
 db/migrate/20161006213403_rails_settings_migration.rb | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/db/migrate/20161006213403_rails_settings_migration.rb b/db/migrate/20161006213403_rails_settings_migration.rb
index 401b7a83b7c1dd..9764196fab453a 100644
--- a/db/migrate/20161006213403_rails_settings_migration.rb
+++ b/db/migrate/20161006213403_rails_settings_migration.rb
@@ -1,12 +1,6 @@
 # frozen_string_literal: true
 
-MIGRATION_BASE_CLASS = if ActiveRecord::VERSION::MAJOR >= 5
-                         ActiveRecord::Migration[5.0]
-                       else
-                         ActiveRecord::Migration[4.2]
-                       end
-
-class RailsSettingsMigration < MIGRATION_BASE_CLASS
+class RailsSettingsMigration < ActiveRecord::Migration[5.0]
   def self.up
     create_table :settings do |t|
       t.string     :var, null: false

From a31427a629df020a975276cbff157691e51d7456 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 6 Feb 2024 12:33:06 +0100
Subject: [PATCH 0061/2191] Update dependency pino to v8.18.0 (#29043)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 8783c33f86e9b2..75b4c355af97a5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -12667,8 +12667,8 @@ __metadata:
   linkType: hard
 
 "pino@npm:^8.17.1, pino@npm:^8.17.2":
-  version: 8.17.2
-  resolution: "pino@npm:8.17.2"
+  version: 8.18.0
+  resolution: "pino@npm:8.18.0"
   dependencies:
     atomic-sleep: "npm:^1.0.0"
     fast-redact: "npm:^3.1.1"
@@ -12683,7 +12683,7 @@ __metadata:
     thread-stream: "npm:^2.0.0"
   bin:
     pino: bin.js
-  checksum: 9e55af6cd9d1833a4dbe64924fc73163295acd3c988a9c7db88926669f2574ab7ec607e8487b6dd71dbdad2d7c1c1aac439f37e59233f37220b1a9d88fa2ce01
+  checksum: ca73bb31e4656954413b89f48c486b1680fec0c6bb12d4d796c5ccf8eca40f3ee12c9532a0fa61284ed9a800c14eaa0f496f520057ef70cdee0447114813e8eb
   languageName: node
   linkType: hard
 

From 4cf07ed78c0f4959160f22506e1f03dc5737a815 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 6 Feb 2024 06:34:11 -0500
Subject: [PATCH 0062/2191] Add missing action logging to
 `api/v1/admin/reports#update` (#29044)

---
 .../api/v1/admin/reports_controller.rb        |  1 +
 .../admin/reports_controller_spec.rb          | 10 +++++++
 spec/requests/api/v1/admin/reports_spec.rb    | 26 +++++++++++++++----
 3 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/app/controllers/api/v1/admin/reports_controller.rb b/app/controllers/api/v1/admin/reports_controller.rb
index 9dfb181a288e6b..7129a5f6ca30fc 100644
--- a/app/controllers/api/v1/admin/reports_controller.rb
+++ b/app/controllers/api/v1/admin/reports_controller.rb
@@ -35,6 +35,7 @@ def show
   def update
     authorize @report, :update?
     @report.update!(report_params)
+    log_action :update, @report
     render json: @report, serializer: REST::Admin::ReportSerializer
   end
 
diff --git a/spec/controllers/admin/reports_controller_spec.rb b/spec/controllers/admin/reports_controller_spec.rb
index 97daaf8da96401..02760154fbe5ff 100644
--- a/spec/controllers/admin/reports_controller_spec.rb
+++ b/spec/controllers/admin/reports_controller_spec.rb
@@ -58,6 +58,7 @@
       report.reload
       expect(report.action_taken_by_account).to eq user.account
       expect(report.action_taken?).to be true
+      expect(last_action_log.target).to eq(report)
     end
   end
 
@@ -70,6 +71,7 @@
       report.reload
       expect(report.action_taken_by_account).to be_nil
       expect(report.action_taken?).to be false
+      expect(last_action_log.target).to eq(report)
     end
   end
 
@@ -81,6 +83,7 @@
       expect(response).to redirect_to(admin_report_path(report))
       report.reload
       expect(report.assigned_account).to eq user.account
+      expect(last_action_log.target).to eq(report)
     end
   end
 
@@ -92,6 +95,13 @@
       expect(response).to redirect_to(admin_report_path(report))
       report.reload
       expect(report.assigned_account).to be_nil
+      expect(last_action_log.target).to eq(report)
     end
   end
+
+  private
+
+  def last_action_log
+    Admin::ActionLog.last
+  end
 end
diff --git a/spec/requests/api/v1/admin/reports_spec.rb b/spec/requests/api/v1/admin/reports_spec.rb
index 5403457db029ee..4b0b7e17134734 100644
--- a/spec/requests/api/v1/admin/reports_spec.rb
+++ b/spec/requests/api/v1/admin/reports_spec.rb
@@ -151,7 +151,9 @@
     let(:params)  { { category: 'spam' } }
 
     it 'updates the report category', :aggregate_failures do
-      expect { subject }.to change { report.reload.category }.from('other').to('spam')
+      expect { subject }
+        .to change { report.reload.category }.from('other').to('spam')
+        .and create_an_action_log
 
       expect(response).to have_http_status(200)
 
@@ -184,7 +186,9 @@
     it_behaves_like 'forbidden for wrong role', ''
 
     it 'marks report as resolved', :aggregate_failures do
-      expect { subject }.to change { report.reload.unresolved? }.from(true).to(false)
+      expect { subject }
+        .to change { report.reload.unresolved? }.from(true).to(false)
+        .and create_an_action_log
       expect(response).to have_http_status(200)
     end
   end
@@ -200,7 +204,9 @@
     it_behaves_like 'forbidden for wrong role', ''
 
     it 'marks report as unresolved', :aggregate_failures do
-      expect { subject }.to change { report.reload.unresolved? }.from(false).to(true)
+      expect { subject }
+        .to change { report.reload.unresolved? }.from(false).to(true)
+        .and create_an_action_log
       expect(response).to have_http_status(200)
     end
   end
@@ -216,7 +222,9 @@
     it_behaves_like 'forbidden for wrong role', ''
 
     it 'assigns report to the requesting user', :aggregate_failures do
-      expect { subject }.to change { report.reload.assigned_account_id }.from(nil).to(user.account.id)
+      expect { subject }
+        .to change { report.reload.assigned_account_id }.from(nil).to(user.account.id)
+        .and create_an_action_log
       expect(response).to have_http_status(200)
     end
   end
@@ -232,8 +240,16 @@
     it_behaves_like 'forbidden for wrong role', ''
 
     it 'unassigns report from assignee', :aggregate_failures do
-      expect { subject }.to change { report.reload.assigned_account_id }.from(user.account.id).to(nil)
+      expect { subject }
+        .to change { report.reload.assigned_account_id }.from(user.account.id).to(nil)
+        .and create_an_action_log
       expect(response).to have_http_status(200)
     end
   end
+
+  private
+
+  def create_an_action_log
+    change(Admin::ActionLog, :count).by(1)
+  end
 end

From dedefdc303a2438d9b9026797bb00a41930b91e2 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 6 Feb 2024 06:40:24 -0500
Subject: [PATCH 0063/2191] Move length value mapping to constant in ids to
 bigints migration (#29048)

---
 db/migrate/20170918125918_ids_to_bigints.rb | 152 +++++++++++---------
 1 file changed, 82 insertions(+), 70 deletions(-)

diff --git a/db/migrate/20170918125918_ids_to_bigints.rb b/db/migrate/20170918125918_ids_to_bigints.rb
index 83c5ab971b4763..64f1d0093a2a1e 100644
--- a/db/migrate/20170918125918_ids_to_bigints.rb
+++ b/db/migrate/20170918125918_ids_to_bigints.rb
@@ -7,80 +7,73 @@ class IdsToBigints < ActiveRecord::Migration[5.1]
   include Mastodon::MigrationHelpers
   include Mastodon::MigrationWarning
 
+  TABLE_COLUMN_MAPPING = [
+    [:account_domain_blocks, :account_id],
+    [:account_domain_blocks, :id],
+    [:accounts, :id],
+    [:blocks, :account_id],
+    [:blocks, :id],
+    [:blocks, :target_account_id],
+    [:conversation_mutes, :account_id],
+    [:conversation_mutes, :id],
+    [:domain_blocks, :id],
+    [:favourites, :account_id],
+    [:favourites, :id],
+    [:favourites, :status_id],
+    [:follow_requests, :account_id],
+    [:follow_requests, :id],
+    [:follow_requests, :target_account_id],
+    [:follows, :account_id],
+    [:follows, :id],
+    [:follows, :target_account_id],
+    [:imports, :account_id],
+    [:imports, :id],
+    [:media_attachments, :account_id],
+    [:media_attachments, :id],
+    [:mentions, :account_id],
+    [:mentions, :id],
+    [:mutes, :account_id],
+    [:mutes, :id],
+    [:mutes, :target_account_id],
+    [:notifications, :account_id],
+    [:notifications, :from_account_id],
+    [:notifications, :id],
+    [:oauth_access_grants, :application_id],
+    [:oauth_access_grants, :id],
+    [:oauth_access_grants, :resource_owner_id],
+    [:oauth_access_tokens, :application_id],
+    [:oauth_access_tokens, :id],
+    [:oauth_access_tokens, :resource_owner_id],
+    [:oauth_applications, :id],
+    [:oauth_applications, :owner_id],
+    [:reports, :account_id],
+    [:reports, :action_taken_by_account_id],
+    [:reports, :id],
+    [:reports, :target_account_id],
+    [:session_activations, :access_token_id],
+    [:session_activations, :user_id],
+    [:session_activations, :web_push_subscription_id],
+    [:settings, :id],
+    [:settings, :thing_id],
+    [:statuses, :account_id],
+    [:statuses, :application_id],
+    [:statuses, :in_reply_to_account_id],
+    [:stream_entries, :account_id],
+    [:stream_entries, :id],
+    [:subscriptions, :account_id],
+    [:subscriptions, :id],
+    [:tags, :id],
+    [:users, :account_id],
+    [:users, :id],
+    [:web_settings, :id],
+    [:web_settings, :user_id],
+  ].freeze
+
   disable_ddl_transaction!
 
   def migrate_columns(to_type)
-    included_columns = [
-      [:account_domain_blocks, :account_id],
-      [:account_domain_blocks, :id],
-      [:accounts, :id],
-      [:blocks, :account_id],
-      [:blocks, :id],
-      [:blocks, :target_account_id],
-      [:conversation_mutes, :account_id],
-      [:conversation_mutes, :id],
-      [:domain_blocks, :id],
-      [:favourites, :account_id],
-      [:favourites, :id],
-      [:favourites, :status_id],
-      [:follow_requests, :account_id],
-      [:follow_requests, :id],
-      [:follow_requests, :target_account_id],
-      [:follows, :account_id],
-      [:follows, :id],
-      [:follows, :target_account_id],
-      [:imports, :account_id],
-      [:imports, :id],
-      [:media_attachments, :account_id],
-      [:media_attachments, :id],
-      [:mentions, :account_id],
-      [:mentions, :id],
-      [:mutes, :account_id],
-      [:mutes, :id],
-      [:mutes, :target_account_id],
-      [:notifications, :account_id],
-      [:notifications, :from_account_id],
-      [:notifications, :id],
-      [:oauth_access_grants, :application_id],
-      [:oauth_access_grants, :id],
-      [:oauth_access_grants, :resource_owner_id],
-      [:oauth_access_tokens, :application_id],
-      [:oauth_access_tokens, :id],
-      [:oauth_access_tokens, :resource_owner_id],
-      [:oauth_applications, :id],
-      [:oauth_applications, :owner_id],
-      [:reports, :account_id],
-      [:reports, :action_taken_by_account_id],
-      [:reports, :id],
-      [:reports, :target_account_id],
-      [:session_activations, :access_token_id],
-      [:session_activations, :user_id],
-      [:session_activations, :web_push_subscription_id],
-      [:settings, :id],
-      [:settings, :thing_id],
-      [:statuses, :account_id],
-      [:statuses, :application_id],
-      [:statuses, :in_reply_to_account_id],
-      [:stream_entries, :account_id],
-      [:stream_entries, :id],
-      [:subscriptions, :account_id],
-      [:subscriptions, :id],
-      [:tags, :id],
-      [:users, :account_id],
-      [:users, :id],
-      [:web_settings, :id],
-      [:web_settings, :user_id],
-    ]
-    included_columns << [:deprecated_preview_cards, :id] if table_exists?(:deprecated_preview_cards)
-
-    migration_duration_warning(<<~EXPLANATION)
-      This migration has some sections that can be safely interrupted
-      and restarted later, and will tell you when those are occurring.
+    display_warning
 
-      For more information, see https://github.com/mastodon/mastodon/pull/5088
-    EXPLANATION
-
-    tables = included_columns.map(&:first).uniq
     table_sizes = {}
 
     # Sort tables by their size
@@ -103,6 +96,25 @@ def migrate_columns(to_type)
     end
   end
 
+  def display_warning
+    migration_duration_warning(<<~EXPLANATION)
+      This migration has some sections that can be safely interrupted
+      and restarted later, and will tell you when those are occurring.
+
+      For more information, see https://github.com/mastodon/mastodon/pull/5088
+    EXPLANATION
+  end
+
+  def tables
+    included_columns.map(&:first).uniq
+  end
+
+  def included_columns
+    TABLE_COLUMN_MAPPING.dup.tap do |included_columns|
+      included_columns << [:deprecated_preview_cards, :id] if table_exists?(:deprecated_preview_cards)
+    end
+  end
+
   def up
     migrate_columns(:bigint)
   end

From 4fb7f611de1cf33a74ff57f1c400e9cba7a24771 Mon Sep 17 00:00:00 2001
From: Emelia Smith <ThisIsMissEm@users.noreply.github.com>
Date: Tue, 6 Feb 2024 13:38:14 +0100
Subject: [PATCH 0064/2191] Return domain block digests from admin domain
 blocks API (#29092)

---
 app/serializers/rest/admin/domain_block_serializer.rb | 6 +++++-
 spec/requests/api/v1/admin/domain_blocks_spec.rb      | 3 +++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/serializers/rest/admin/domain_block_serializer.rb b/app/serializers/rest/admin/domain_block_serializer.rb
index b955d008a6e62b..e94a337cb8d9f9 100644
--- a/app/serializers/rest/admin/domain_block_serializer.rb
+++ b/app/serializers/rest/admin/domain_block_serializer.rb
@@ -1,11 +1,15 @@
 # frozen_string_literal: true
 
 class REST::Admin::DomainBlockSerializer < ActiveModel::Serializer
-  attributes :id, :domain, :created_at, :severity,
+  attributes :id, :domain, :digest, :created_at, :severity,
              :reject_media, :reject_reports,
              :private_comment, :public_comment, :obfuscate
 
   def id
     object.id.to_s
   end
+
+  def digest
+    object.domain_digest
+  end
 end
diff --git a/spec/requests/api/v1/admin/domain_blocks_spec.rb b/spec/requests/api/v1/admin/domain_blocks_spec.rb
index 1fb6fc8228b0b9..47aaf44d8054b3 100644
--- a/spec/requests/api/v1/admin/domain_blocks_spec.rb
+++ b/spec/requests/api/v1/admin/domain_blocks_spec.rb
@@ -49,6 +49,7 @@
           {
             id: domain_block.id.to_s,
             domain: domain_block.domain,
+            digest: domain_block.domain_digest,
             created_at: domain_block.created_at.strftime('%Y-%m-%dT%H:%M:%S.%LZ'),
             severity: domain_block.severity.to_s,
             reject_media: domain_block.reject_media,
@@ -97,6 +98,7 @@
         {
           id: domain_block.id.to_s,
           domain: domain_block.domain,
+          digest: domain_block.domain_digest,
           created_at: domain_block.created_at.strftime('%Y-%m-%dT%H:%M:%S.%LZ'),
           severity: domain_block.severity.to_s,
           reject_media: domain_block.reject_media,
@@ -188,6 +190,7 @@
         {
           id: domain_block.id.to_s,
           domain: domain_block.domain,
+          digest: domain_block.domain_digest,
           severity: 'suspend',
         }
       )

From df7acdcee516d6321a40c0f1cbc55c41b039e3c7 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 6 Feb 2024 07:47:04 -0500
Subject: [PATCH 0065/2191] Update markers API spec for error case (#29096)

---
 spec/requests/api/v1/markers_spec.rb | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/spec/requests/api/v1/markers_spec.rb b/spec/requests/api/v1/markers_spec.rb
index a1ca4ba7549ae7..b04adf25943e28 100644
--- a/spec/requests/api/v1/markers_spec.rb
+++ b/spec/requests/api/v1/markers_spec.rb
@@ -52,5 +52,19 @@
         expect(user.markers.first.last_read_id).to eq 70_120
       end
     end
+
+    context 'when database object becomes stale' do
+      before do
+        allow(Marker).to receive(:transaction).and_raise(ActiveRecord::StaleObjectError)
+        post '/api/v1/markers', headers: headers, params: { home: { last_read_id: '69420' } }
+      end
+
+      it 'returns error json' do
+        expect(response)
+          .to have_http_status(409)
+        expect(body_as_json)
+          .to include(error: /Conflict during update/)
+      end
+    end
   end
 end

From 577520b6376f5ad14aa343a2aba881e7e1ef1897 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 6 Feb 2024 07:49:48 -0500
Subject: [PATCH 0066/2191] Replace deprecated `Sidekiq::Testing` block style
 (#29097)

---
 spec/rails_helper.rb | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index aaf587f49b2f7b..51253390961a52 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -95,8 +95,13 @@ def sign_in(resource, _deprecated = nil, scope: nil)
     self.use_transactional_tests = true
   end
 
-  config.around(:each, :sidekiq_inline) do |example|
-    Sidekiq::Testing.inline!(&example)
+  config.around do |example|
+    if example.metadata[:sidekiq_inline] == true
+      Sidekiq::Testing.inline!
+    else
+      Sidekiq::Testing.fake!
+    end
+    example.run
   end
 
   config.before :each, type: :cli do

From e8cc98977d081898682e0ca25154be7fb2c358fb Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 6 Feb 2024 13:52:28 +0100
Subject: [PATCH 0067/2191] Update dependency bootsnap to '~> 1.18.0' (#29019)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 5f09b4beb255fa..355e69b0c467b3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -26,7 +26,7 @@ gem 'blurhash', '~> 0.1'
 
 gem 'active_model_serializers', '~> 0.10'
 gem 'addressable', '~> 2.8'
-gem 'bootsnap', '~> 1.17.0', require: false
+gem 'bootsnap', '~> 1.18.0', require: false
 gem 'browser'
 gem 'charlock_holmes', '~> 0.7.7'
 gem 'chewy', '~> 7.3'
diff --git a/Gemfile.lock b/Gemfile.lock
index d6a51e2f0ae875..57ad96437f0638 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -144,7 +144,7 @@ GEM
     binding_of_caller (1.0.0)
       debug_inspector (>= 0.0.1)
     blurhash (0.1.7)
-    bootsnap (1.17.1)
+    bootsnap (1.18.3)
       msgpack (~> 1.2)
     brakeman (6.1.1)
       racc
@@ -823,7 +823,7 @@ DEPENDENCIES
   better_errors (~> 2.9)
   binding_of_caller (~> 1.0)
   blurhash (~> 0.1)
-  bootsnap (~> 1.17.0)
+  bootsnap (~> 1.18.0)
   brakeman (~> 6.0)
   browser
   bundler-audit (~> 0.9)

From 0877f6fda417d27e7e6b9bd1d888dec1b97a7792 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 6 Feb 2024 07:56:22 -0500
Subject: [PATCH 0068/2191] Remove redundant `return` in `IntentsController`
 (#29099)

---
 app/controllers/intents_controller.rb | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/app/controllers/intents_controller.rb b/app/controllers/intents_controller.rb
index ea024e30e6bcf9..65c315208dfa93 100644
--- a/app/controllers/intents_controller.rb
+++ b/app/controllers/intents_controller.rb
@@ -1,27 +1,26 @@
 # frozen_string_literal: true
 
 class IntentsController < ApplicationController
-  before_action :check_uri
+  EXPECTED_SCHEME = 'web+mastodon'
 
+  before_action :handle_invalid_uri, unless: :valid_uri?
   rescue_from Addressable::URI::InvalidURIError, with: :handle_invalid_uri
 
   def show
-    if uri.scheme == 'web+mastodon'
-      case uri.host
-      when 'follow'
-        return redirect_to authorize_interaction_path(uri: uri.query_values['uri'].delete_prefix('acct:'))
-      when 'share'
-        return redirect_to share_path(text: uri.query_values['text'])
-      end
+    case uri.host
+    when 'follow'
+      redirect_to authorize_interaction_path(uri: uri.query_values['uri'].delete_prefix('acct:'))
+    when 'share'
+      redirect_to share_path(text: uri.query_values['text'])
+    else
+      handle_invalid_uri
     end
-
-    not_found
   end
 
   private
 
-  def check_uri
-    not_found if uri.blank?
+  def valid_uri?
+    uri.present? && uri.scheme == EXPECTED_SCHEME
   end
 
   def handle_invalid_uri

From 978fdc71cab327c98b3c03c05f3f716fbeedf6c9 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 6 Feb 2024 08:04:02 -0500
Subject: [PATCH 0069/2191] Reduce expectation count in example from
 `ProcessAccountService` spec (#29100)

---
 .rubocop_todo.yml                             |  2 +-
 .../process_account_service_spec.rb           | 24 ++++++++++++-------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index c8165c1edf6483..09e9fd73d8d27c 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -39,7 +39,7 @@ RSpec/ExampleLength:
   Max: 22
 
 RSpec/MultipleExpectations:
-  Max: 8
+  Max: 7
 
 # Configuration parameters: AllowSubject.
 RSpec/MultipleMemoizedHelpers:
diff --git a/spec/services/activitypub/process_account_service_spec.rb b/spec/services/activitypub/process_account_service_spec.rb
index 9abe03181e7373..824577d1b0505f 100644
--- a/spec/services/activitypub/process_account_service_spec.rb
+++ b/spec/services/activitypub/process_account_service_spec.rb
@@ -21,14 +21,22 @@
 
     it 'parses out of attachment' do
       account = subject.call('alice', 'example.com', payload)
-      expect(account.fields).to be_a Array
-      expect(account.fields.size).to eq 2
-      expect(account.fields[0]).to be_a Account::Field
-      expect(account.fields[0].name).to eq 'Pronouns'
-      expect(account.fields[0].value).to eq 'They/them'
-      expect(account.fields[1]).to be_a Account::Field
-      expect(account.fields[1].name).to eq 'Occupation'
-      expect(account.fields[1].value).to eq 'Unit test'
+
+      expect(account.fields)
+        .to be_an(Array)
+        .and have_attributes(size: 2)
+      expect(account.fields.first)
+        .to be_an(Account::Field)
+        .and have_attributes(
+          name: eq('Pronouns'),
+          value: eq('They/them')
+        )
+      expect(account.fields.last)
+        .to be_an(Account::Field)
+        .and have_attributes(
+          name: eq('Occupation'),
+          value: eq('Unit test')
+        )
     end
   end
 

From 2d6ab445562fd6c4d56d7aef5dd406c15de8bbf9 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 6 Feb 2024 08:10:00 -0500
Subject: [PATCH 0070/2191] Reduce request/response round-trips in
 ap/collections controller spec (#29102)

---
 .../collections_controller_spec.rb            | 90 ++++++-------------
 1 file changed, 28 insertions(+), 62 deletions(-)

diff --git a/spec/controllers/activitypub/collections_controller_spec.rb b/spec/controllers/activitypub/collections_controller_spec.rb
index cf484ff5a43ad9..11ef03c8425c1c 100644
--- a/spec/controllers/activitypub/collections_controller_spec.rb
+++ b/spec/controllers/activitypub/collections_controller_spec.rb
@@ -17,34 +17,27 @@
   end
 
   describe 'GET #show' do
+    subject(:response) { get :show, params: { id: id, account_username: account.username } }
+
     context 'when id is "featured"' do
-      context 'without signature' do
-        subject(:response) { get :show, params: { id: 'featured', account_username: account.username } }
+      let(:id) { 'featured' }
 
-        let(:body) { body_as_json }
+      context 'without signature' do
         let(:remote_account) { nil }
 
-        it 'returns http success' do
+        it 'returns http success and correct media type' do
           expect(response).to have_http_status(200)
-        end
-
-        it 'returns application/activity+json' do
           expect(response.media_type).to eq 'application/activity+json'
         end
 
         it_behaves_like 'cacheable response'
 
-        it 'returns orderedItems with pinned statuses' do
-          expect(body[:orderedItems]).to be_an Array
-          expect(body[:orderedItems].size).to eq 3
-        end
-
-        it 'includes URI of private pinned status' do
-          expect(body[:orderedItems]).to include(ActivityPub::TagManager.instance.uri_for(private_pinned))
-        end
-
-        it 'does not include contents of private pinned status' do
-          expect(response.body).to_not include(private_pinned.text)
+        it 'returns orderedItems with correct items' do
+          expect(body_as_json[:orderedItems])
+            .to be_an(Array)
+            .and have_attributes(size: 3)
+            .and include(ActivityPub::TagManager.instance.uri_for(private_pinned))
+            .and not_include(private_pinned.text)
         end
 
         context 'when account is permanently suspended' do
@@ -73,33 +66,19 @@
         let(:remote_account) { Fabricate(:account, domain: 'example.com') }
 
         context 'when getting a featured resource' do
-          before do
-            get :show, params: { id: 'featured', account_username: account.username }
-          end
-
-          it 'returns http success' do
+          it 'returns http success and correct media type' do
             expect(response).to have_http_status(200)
-          end
-
-          it 'returns application/activity+json' do
             expect(response.media_type).to eq 'application/activity+json'
           end
 
           it_behaves_like 'cacheable response'
 
-          it 'returns orderedItems with pinned statuses' do
-            json = body_as_json
-            expect(json[:orderedItems]).to be_an Array
-            expect(json[:orderedItems].size).to eq 3
-          end
-
-          it 'includes URI of private pinned status' do
-            json = body_as_json
-            expect(json[:orderedItems]).to include(ActivityPub::TagManager.instance.uri_for(private_pinned))
-          end
-
-          it 'does not include contents of private pinned status' do
-            expect(response.body).to_not include(private_pinned.text)
+          it 'returns orderedItems with expected items' do
+            expect(body_as_json[:orderedItems])
+              .to be_an(Array)
+              .and have_attributes(size: 3)
+              .and include(ActivityPub::TagManager.instance.uri_for(private_pinned))
+              .and not_include(private_pinned.text)
           end
         end
 
@@ -111,50 +90,36 @@
           context 'when signed request account is blocked' do
             before do
               account.block!(remote_account)
-              get :show, params: { id: 'featured', account_username: account.username }
             end
 
-            it 'returns http success' do
+            it 'returns http success and correct media type and cache headers' do
               expect(response).to have_http_status(200)
-            end
-
-            it 'returns application/activity+json' do
               expect(response.media_type).to eq 'application/activity+json'
-            end
-
-            it 'returns private Cache-Control header' do
               expect(response.headers['Cache-Control']).to include 'private'
             end
 
             it 'returns empty orderedItems' do
-              json = body_as_json
-              expect(json[:orderedItems]).to be_an Array
-              expect(json[:orderedItems].size).to eq 0
+              expect(body_as_json[:orderedItems])
+                .to be_an(Array)
+                .and have_attributes(size: 0)
             end
           end
 
           context 'when signed request account is domain blocked' do
             before do
               account.block_domain!(remote_account.domain)
-              get :show, params: { id: 'featured', account_username: account.username }
             end
 
-            it 'returns http success' do
+            it 'returns http success and correct media type and cache headers' do
               expect(response).to have_http_status(200)
-            end
-
-            it 'returns application/activity+json' do
               expect(response.media_type).to eq 'application/activity+json'
-            end
-
-            it 'returns private Cache-Control header' do
               expect(response.headers['Cache-Control']).to include 'private'
             end
 
             it 'returns empty orderedItems' do
-              json = body_as_json
-              expect(json[:orderedItems]).to be_an Array
-              expect(json[:orderedItems].size).to eq 0
+              expect(body_as_json[:orderedItems])
+                .to be_an(Array)
+                .and have_attributes(size: 0)
             end
           end
         end
@@ -162,8 +127,9 @@
     end
 
     context 'when id is not "featured"' do
+      let(:id) { 'hoge' }
+
       it 'returns http not found' do
-        get :show, params: { id: 'hoge', account_username: account.username }
         expect(response).to have_http_status(404)
       end
     end

From 69e61fff38b426109bd074ccf93f5d2874d430c2 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 6 Feb 2024 08:18:37 -0500
Subject: [PATCH 0071/2191] Move direct serializer usage out of admin view
 partial (#29028)

---
 app/helpers/react_component_helper.rb                | 11 +++++++++++
 app/views/admin/reports/_media_attachments.html.haml |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/app/helpers/react_component_helper.rb b/app/helpers/react_component_helper.rb
index ce616e830621b0..821a6f1e2d451d 100644
--- a/app/helpers/react_component_helper.rb
+++ b/app/helpers/react_component_helper.rb
@@ -15,9 +15,20 @@ def react_admin_component(name, props = {})
     div_tag_with_data(data)
   end
 
+  def serialized_media_attachments(media_attachments)
+    media_attachments.map { |attachment| serialized_attachment(attachment) }
+  end
+
   private
 
   def div_tag_with_data(data)
     content_tag(:div, nil, data: data)
   end
+
+  def serialized_attachment(attachment)
+    ActiveModelSerializers::SerializableResource.new(
+      attachment,
+      serializer: REST::MediaAttachmentSerializer
+    ).as_json
+  end
 end
diff --git a/app/views/admin/reports/_media_attachments.html.haml b/app/views/admin/reports/_media_attachments.html.haml
index 3c52d691781efe..45cc4c5aa31078 100644
--- a/app/views/admin/reports/_media_attachments.html.haml
+++ b/app/views/admin/reports/_media_attachments.html.haml
@@ -12,6 +12,6 @@
   = react_component :media_gallery,
                     height: 343,
                     lang: status.language,
-                    media: status.ordered_media_attachments.map { |a| ActiveModelSerializers::SerializableResource.new(a, serializer: REST::MediaAttachmentSerializer).as_json },
+                    media: serialized_media_attachments(status.ordered_media_attachments),
                     sensitive: status.sensitive?,
                     visible: false

From cf42eba0f997aa8065beac853b79d993e8a2495b Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 6 Feb 2024 14:31:54 +0100
Subject: [PATCH 0072/2191] Update dependency brakeman to v6.1.2 (#29062)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 57ad96437f0638..b76f449b26448a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -146,7 +146,7 @@ GEM
     blurhash (0.1.7)
     bootsnap (1.18.3)
       msgpack (~> 1.2)
-    brakeman (6.1.1)
+    brakeman (6.1.2)
       racc
     browser (5.3.1)
     brpoplpush-redis_script (0.1.3)

From 93a5b3f9df7dcf1965525ee2a1202e5f1e07bf05 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 6 Feb 2024 08:33:42 -0500
Subject: [PATCH 0073/2191] Move status serializer chooser to private method
 (#29030)

---
 app/controllers/api/v1/statuses_controller.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/controllers/api/v1/statuses_controller.rb b/app/controllers/api/v1/statuses_controller.rb
index 064e7632a8009a..702896db246d9c 100644
--- a/app/controllers/api/v1/statuses_controller.rb
+++ b/app/controllers/api/v1/statuses_controller.rb
@@ -71,7 +71,7 @@ def create
       with_rate_limit: true
     )
 
-    render json: @status, serializer: @status.is_a?(ScheduledStatus) ? REST::ScheduledStatusSerializer : REST::StatusSerializer
+    render json: @status, serializer: serializer_for_status
   rescue PostStatusService::UnexpectedMentionsError => e
     unexpected_accounts = ActiveModel::Serializer::CollectionSerializer.new(
       e.accounts,
@@ -155,6 +155,10 @@ def status_params
     )
   end
 
+  def serializer_for_status
+    @status.is_a?(ScheduledStatus) ? REST::ScheduledStatusSerializer : REST::StatusSerializer
+  end
+
   def pagination_params(core_params)
     params.slice(:limit).permit(:limit).merge(core_params)
   end

From 0df86d77fd5f57fc88cfd00a2cf2c265215a2839 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 6 Feb 2024 09:36:04 -0500
Subject: [PATCH 0074/2191] Reduce `RSpec/ExampleLength` in PostStatusService
 spec example (#29105)

---
 spec/services/post_status_service_spec.rb | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/spec/services/post_status_service_spec.rb b/spec/services/post_status_service_spec.rb
index 1e5c420a63b245..d10a82607e009b 100644
--- a/spec/services/post_status_service_spec.rb
+++ b/spec/services/post_status_service_spec.rb
@@ -228,13 +228,7 @@
       subject.call(
         account,
         text: 'test status update',
-        media_ids: [
-          Fabricate(:media_attachment, account: account),
-          Fabricate(:media_attachment, account: account),
-          Fabricate(:media_attachment, account: account),
-          Fabricate(:media_attachment, account: account),
-          Fabricate(:media_attachment, account: account),
-        ].map(&:id)
+        media_ids: Array.new(5) { Fabricate(:media_attachment, account: account) }.map(&:id)
       )
     end.to raise_error(
       Mastodon::ValidationError,

From 2f19ddd1fa1c14db1edaedc93f29bb4f66ab2cf0 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 6 Feb 2024 09:54:26 -0500
Subject: [PATCH 0075/2191] Move status serializer error handling to private
 method (#29031)

---
 app/controllers/api/v1/statuses_controller.rb | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/app/controllers/api/v1/statuses_controller.rb b/app/controllers/api/v1/statuses_controller.rb
index 702896db246d9c..01c3718763f824 100644
--- a/app/controllers/api/v1/statuses_controller.rb
+++ b/app/controllers/api/v1/statuses_controller.rb
@@ -73,11 +73,7 @@ def create
 
     render json: @status, serializer: serializer_for_status
   rescue PostStatusService::UnexpectedMentionsError => e
-    unexpected_accounts = ActiveModel::Serializer::CollectionSerializer.new(
-      e.accounts,
-      serializer: REST::AccountSerializer
-    )
-    render json: { error: e.message, unexpected_accounts: unexpected_accounts }, status: 422
+    render json: unexpected_accounts_error_json(e), status: 422
   end
 
   def update
@@ -159,6 +155,17 @@ def serializer_for_status
     @status.is_a?(ScheduledStatus) ? REST::ScheduledStatusSerializer : REST::StatusSerializer
   end
 
+  def unexpected_accounts_error_json(error)
+    {
+      error: error.message,
+      unexpected_accounts: serialized_accounts(error.accounts),
+    }
+  end
+
+  def serialized_accounts(accounts)
+    ActiveModel::Serializer::CollectionSerializer.new(accounts, serializer: REST::AccountSerializer)
+  end
+
   def pagination_params(core_params)
     params.slice(:limit).permit(:limit).merge(core_params)
   end

From 64300e0fe344b9dee015e65423c327742db246af Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 6 Feb 2024 16:32:09 +0100
Subject: [PATCH 0076/2191] Fix self-destruct schedule not actually replacing
 initial schedule (#29049)

---
 config/initializers/sidekiq.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb
index 9a2743ed5b0263..53b02edc40227e 100644
--- a/config/initializers/sidekiq.rb
+++ b/config/initializers/sidekiq.rb
@@ -26,6 +26,7 @@
           'queue' => 'scheduler',
         },
       }
+      SidekiqScheduler::Scheduler.instance.reload_schedule!
     end
   end
 

From 1e0b0a3486cf04666b7cbd67a4a72cf7f8068c97 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 6 Feb 2024 11:42:25 -0500
Subject: [PATCH 0077/2191] Use SQL heredoc on long statement lines in
 migrations (#29112)

---
 ...0317193015_add_search_index_to_accounts.rb | 12 +++++++-
 ...5042_add_case_insensitive_index_to_tags.rb | 29 +++++++++++++++++--
 ..._fix_canonical_email_blocks_foreign_key.rb | 17 +++++++++--
 .../20220309213005_fix_reblog_deleted_at.rb   | 11 ++++++-
 4 files changed, 62 insertions(+), 7 deletions(-)

diff --git a/db/migrate/20170317193015_add_search_index_to_accounts.rb b/db/migrate/20170317193015_add_search_index_to_accounts.rb
index e29da61b157ba2..0edc38154973ae 100644
--- a/db/migrate/20170317193015_add_search_index_to_accounts.rb
+++ b/db/migrate/20170317193015_add_search_index_to_accounts.rb
@@ -2,7 +2,17 @@
 
 class AddSearchIndexToAccounts < ActiveRecord::Migration[5.0]
   def up
-    execute 'CREATE INDEX search_index ON accounts USING gin((setweight(to_tsvector(\'simple\', accounts.display_name), \'A\') || setweight(to_tsvector(\'simple\', accounts.username), \'B\') || setweight(to_tsvector(\'simple\', coalesce(accounts.domain, \'\')), \'C\')));'
+    execute <<~SQL.squish
+      CREATE INDEX search_index
+      ON accounts
+      USING gin(
+        (
+          setweight(to_tsvector('simple', accounts.display_name), 'A') ||
+          setweight(to_tsvector('simple', accounts.username), 'B') ||
+          setweight(to_tsvector('simple', coalesce(accounts.domain, '')), 'C')
+        )
+      )
+    SQL
   end
 
   def down
diff --git a/db/migrate/20190726175042_add_case_insensitive_index_to_tags.rb b/db/migrate/20190726175042_add_case_insensitive_index_to_tags.rb
index f2d3aa8ee86077..02f073e14f505d 100644
--- a/db/migrate/20190726175042_add_case_insensitive_index_to_tags.rb
+++ b/db/migrate/20190726175042_add_case_insensitive_index_to_tags.rb
@@ -9,9 +9,32 @@ def up
       redundant_tag_ids = row['ids'].split(',')[1..]
 
       safety_assured do
-        execute "UPDATE accounts_tags AS t0 SET tag_id = #{canonical_tag_id} WHERE tag_id IN (#{redundant_tag_ids.join(', ')}) AND NOT EXISTS (SELECT t1.tag_id FROM accounts_tags AS t1 WHERE t1.tag_id = #{canonical_tag_id} AND t1.account_id = t0.account_id)"
-        execute "UPDATE statuses_tags AS t0 SET tag_id = #{canonical_tag_id} WHERE tag_id IN (#{redundant_tag_ids.join(', ')}) AND NOT EXISTS (SELECT t1.tag_id FROM statuses_tags AS t1 WHERE t1.tag_id = #{canonical_tag_id} AND t1.status_id = t0.status_id)"
-        execute "UPDATE featured_tags AS t0 SET tag_id = #{canonical_tag_id} WHERE tag_id IN (#{redundant_tag_ids.join(', ')})  AND NOT EXISTS (SELECT t1.tag_id FROM featured_tags AS t1 WHERE t1.tag_id = #{canonical_tag_id} AND t1.account_id = t0.account_id)"
+        execute <<~SQL.squish
+          UPDATE accounts_tags
+          AS t0
+          SET tag_id = #{canonical_tag_id}
+          WHERE
+            tag_id IN (#{redundant_tag_ids.join(', ')})
+            AND NOT EXISTS (SELECT t1.tag_id FROM accounts_tags AS t1 WHERE t1.tag_id = #{canonical_tag_id} AND t1.account_id = t0.account_id)
+        SQL
+
+        execute <<~SQL.squish
+          UPDATE statuses_tags
+          AS t0
+          SET tag_id = #{canonical_tag_id}
+          WHERE
+            tag_id IN (#{redundant_tag_ids.join(', ')})
+            AND NOT EXISTS (SELECT t1.tag_id FROM statuses_tags AS t1 WHERE t1.tag_id = #{canonical_tag_id} AND t1.status_id = t0.status_id)
+        SQL
+
+        execute <<~SQL.squish
+          UPDATE featured_tags
+            AS t0
+            SET tag_id = #{canonical_tag_id}
+            WHERE
+              tag_id IN (#{redundant_tag_ids.join(', ')})
+              AND NOT EXISTS (SELECT t1.tag_id FROM featured_tags AS t1 WHERE t1.tag_id = #{canonical_tag_id} AND t1.account_id = t0.account_id)
+        SQL
       end
 
       Tag.where(id: redundant_tag_ids).in_batches.delete_all
diff --git a/db/migrate/20210630000137_fix_canonical_email_blocks_foreign_key.rb b/db/migrate/20210630000137_fix_canonical_email_blocks_foreign_key.rb
index 9b475966bb617a..90a1b1a5cfe9cb 100644
--- a/db/migrate/20210630000137_fix_canonical_email_blocks_foreign_key.rb
+++ b/db/migrate/20210630000137_fix_canonical_email_blocks_foreign_key.rb
@@ -3,13 +3,26 @@
 class FixCanonicalEmailBlocksForeignKey < ActiveRecord::Migration[6.1]
   def up
     safety_assured do
-      execute 'ALTER TABLE canonical_email_blocks DROP CONSTRAINT fk_rails_1ecb262096, ADD CONSTRAINT fk_rails_1ecb262096 FOREIGN KEY (reference_account_id) REFERENCES accounts(id) ON DELETE CASCADE;'
+      execute <<~SQL.squish
+        ALTER TABLE canonical_email_blocks
+          DROP CONSTRAINT fk_rails_1ecb262096,
+          ADD CONSTRAINT fk_rails_1ecb262096
+            FOREIGN KEY (reference_account_id)
+            REFERENCES accounts(id)
+            ON DELETE CASCADE
+      SQL
     end
   end
 
   def down
     safety_assured do
-      execute 'ALTER TABLE canonical_email_blocks DROP CONSTRAINT fk_rails_1ecb262096, ADD CONSTRAINT fk_rails_1ecb262096 FOREIGN KEY (reference_account_id) REFERENCES accounts(id);'
+      execute <<~SQL.squish
+        ALTER TABLE canonical_email_blocks
+          DROP CONSTRAINT fk_rails_1ecb262096,
+          ADD CONSTRAINT fk_rails_1ecb262096
+            FOREIGN KEY (reference_account_id)
+            REFERENCES accounts(id)
+      SQL
     end
   end
 end
diff --git a/db/migrate/20220309213005_fix_reblog_deleted_at.rb b/db/migrate/20220309213005_fix_reblog_deleted_at.rb
index e3474beeb1eb31..7fb9bff26c625a 100644
--- a/db/migrate/20220309213005_fix_reblog_deleted_at.rb
+++ b/db/migrate/20220309213005_fix_reblog_deleted_at.rb
@@ -4,7 +4,16 @@ class FixReblogDeletedAt < ActiveRecord::Migration[6.1]
   disable_ddl_transaction!
 
   def up
-    safety_assured { execute 'UPDATE statuses s SET deleted_at = r.deleted_at FROM statuses r WHERE s.reblog_of_id = r.id AND r.deleted_at IS NOT NULL' }
+    safety_assured do
+      execute <<~SQL.squish
+        UPDATE statuses s
+        SET deleted_at = r.deleted_at
+        FROM statuses r
+        WHERE
+          s.reblog_of_id = r.id
+          AND r.deleted_at IS NOT NULL
+      SQL
+    end
   end
 
   def down; end

From 7ee93b74317c0b51516146fbe32e72cd9bbb151c Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 6 Feb 2024 18:10:17 +0100
Subject: [PATCH 0078/2191] Change `source` attribute of `Suggestion` entity in
 `/api/v2/suggestions` back to a string (#29108)

---
 .../components/inline_follow_suggestions.jsx  |  8 ++++----
 app/models/account_suggestions.rb             |  4 ++--
 app/models/account_suggestions/suggestion.rb  |  2 +-
 app/serializers/rest/suggestion_serializer.rb | 15 +++++++++++++-
 spec/requests/api/v2/suggestions_spec.rb      | 20 ++++++++++++++++++-
 .../rest/suggestion_serializer_spec.rb        |  2 +-
 6 files changed, 41 insertions(+), 10 deletions(-)

diff --git a/app/javascript/mastodon/features/home_timeline/components/inline_follow_suggestions.jsx b/app/javascript/mastodon/features/home_timeline/components/inline_follow_suggestions.jsx
index ac414d04d6a810..f76526e04502e2 100644
--- a/app/javascript/mastodon/features/home_timeline/components/inline_follow_suggestions.jsx
+++ b/app/javascript/mastodon/features/home_timeline/components/inline_follow_suggestions.jsx
@@ -59,7 +59,7 @@ Source.propTypes = {
   id: PropTypes.oneOf(['friends_of_friends', 'similar_to_recently_followed', 'featured', 'most_followed', 'most_interactions']),
 };
 
-const Card = ({ id, source }) => {
+const Card = ({ id, sources }) => {
   const intl = useIntl();
   const account = useSelector(state => state.getIn(['accounts', id]));
   const relationship = useSelector(state => state.getIn(['relationships', id]));
@@ -89,7 +89,7 @@ const Card = ({ id, source }) => {
 
       <div className='inline-follow-suggestions__body__scrollable__card__text-stack'>
         <Link to={`/@${account.get('acct')}`}><DisplayName account={account} /></Link>
-        {firstVerifiedField ? <VerifiedBadge link={firstVerifiedField.get('value')} /> : <Source id={source.get(0)} />}
+        {firstVerifiedField ? <VerifiedBadge link={firstVerifiedField.get('value')} /> : <Source id={sources.get(0)} />}
       </div>
 
       <Button text={intl.formatMessage(following ? messages.unfollow : messages.follow)} onClick={handleFollow} />
@@ -99,7 +99,7 @@ const Card = ({ id, source }) => {
 
 Card.propTypes = {
   id: PropTypes.string.isRequired,
-  source: ImmutablePropTypes.list,
+  sources: ImmutablePropTypes.list,
 };
 
 const DISMISSIBLE_ID = 'home/follow-suggestions';
@@ -175,7 +175,7 @@ export const InlineFollowSuggestions = ({ hidden }) => {
             <Card
               key={suggestion.get('account')}
               id={suggestion.get('account')}
-              source={suggestion.get('source')}
+              sources={suggestion.get('sources')}
             />
           ))}
         </div>
diff --git a/app/models/account_suggestions.rb b/app/models/account_suggestions.rb
index 25c8b04d50f9f3..98ccf4ad4fd5f4 100644
--- a/app/models/account_suggestions.rb
+++ b/app/models/account_suggestions.rb
@@ -31,12 +31,12 @@ def get(limit, offset = 0)
       account_ids  = account_ids_with_sources[offset, limit]
       accounts_map = Account.where(id: account_ids.map(&:first)).includes(:account_stat, :user).index_by(&:id)
 
-      account_ids.filter_map do |(account_id, source)|
+      account_ids.filter_map do |(account_id, sources)|
         next unless accounts_map.key?(account_id)
 
         AccountSuggestions::Suggestion.new(
           account: accounts_map[account_id],
-          source: source
+          sources: sources
         )
       end
     end
diff --git a/app/models/account_suggestions/suggestion.rb b/app/models/account_suggestions/suggestion.rb
index 2c6f4d27f5ce6e..8a5888069adb1b 100644
--- a/app/models/account_suggestions/suggestion.rb
+++ b/app/models/account_suggestions/suggestion.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class AccountSuggestions::Suggestion < ActiveModelSerializers::Model
-  attributes :account, :source
+  attributes :account, :sources
 
   delegate :id, to: :account, prefix: true
 end
diff --git a/app/serializers/rest/suggestion_serializer.rb b/app/serializers/rest/suggestion_serializer.rb
index 3d697fd9f1f81c..c60f343ba41e75 100644
--- a/app/serializers/rest/suggestion_serializer.rb
+++ b/app/serializers/rest/suggestion_serializer.rb
@@ -1,7 +1,20 @@
 # frozen_string_literal: true
 
 class REST::SuggestionSerializer < ActiveModel::Serializer
-  attributes :source
+  attributes :source, :sources
 
   has_one :account, serializer: REST::AccountSerializer
+
+  LEGACY_SOURCE_TYPE_MAP = {
+    featured: 'staff',
+    most_followed: 'global',
+    most_interactions: 'global',
+    # NOTE: Those are not completely accurate, but those are personalized interactions
+    similar_to_recently_followed: 'past_interactions',
+    friends_of_friends: 'past_interactions',
+  }.freeze
+
+  def source
+    LEGACY_SOURCE_TYPE_MAP[object.sources.first]
+  end
 end
diff --git a/spec/requests/api/v2/suggestions_spec.rb b/spec/requests/api/v2/suggestions_spec.rb
index 5f1c97b8ae3aba..a7d6a0864f542e 100644
--- a/spec/requests/api/v2/suggestions_spec.rb
+++ b/spec/requests/api/v2/suggestions_spec.rb
@@ -9,10 +9,28 @@
   let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
 
   describe 'GET /api/v2/suggestions' do
-    it 'returns http success' do
+    let(:bob) { Fabricate(:account) }
+    let(:jeff) { Fabricate(:account) }
+    let(:params) { {} }
+
+    before do
+      Setting.bootstrap_timeline_accounts = [bob, jeff].map(&:acct).join(',')
+    end
+
+    it 'returns the expected suggestions' do
       get '/api/v2/suggestions', headers: headers
 
       expect(response).to have_http_status(200)
+
+      expect(body_as_json).to match_array(
+        [bob, jeff].map do |account|
+          hash_including({
+            source: 'staff',
+            sources: ['featured'],
+            account: hash_including({ id: account.id.to_s }),
+          })
+        end
+      )
     end
   end
 end
diff --git a/spec/serializers/rest/suggestion_serializer_spec.rb b/spec/serializers/rest/suggestion_serializer_spec.rb
index 60420d80234f56..b5efba082defa0 100644
--- a/spec/serializers/rest/suggestion_serializer_spec.rb
+++ b/spec/serializers/rest/suggestion_serializer_spec.rb
@@ -7,7 +7,7 @@
   let(:record) do
     AccountSuggestions::Suggestion.new(
       account: account,
-      source: 'SuggestionSource'
+      sources: ['SuggestionSource']
     )
   end
   let(:account) { Fabricate(:account) }

From 90ccf7beb2d56f723014b9a05ed20f94c7875e58 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 6 Feb 2024 19:47:44 +0100
Subject: [PATCH 0079/2191] New Crowdin Translations (automated) (#28965)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/af.json      |  25 ++-
 app/javascript/mastodon/locales/ar.json      |  47 +++++-
 app/javascript/mastodon/locales/ast.json     |   6 +
 app/javascript/mastodon/locales/be.json      |  30 +++-
 app/javascript/mastodon/locales/bg.json      |  17 +-
 app/javascript/mastodon/locales/br.json      |  10 +-
 app/javascript/mastodon/locales/ca.json      |  21 ++-
 app/javascript/mastodon/locales/cs.json      |  39 ++++-
 app/javascript/mastodon/locales/cy.json      |  28 +++-
 app/javascript/mastodon/locales/da.json      |  11 +-
 app/javascript/mastodon/locales/de.json      |  12 +-
 app/javascript/mastodon/locales/el.json      |   5 -
 app/javascript/mastodon/locales/en-GB.json   |  30 +++-
 app/javascript/mastodon/locales/eo.json      |   4 -
 app/javascript/mastodon/locales/es-AR.json   |  30 ++--
 app/javascript/mastodon/locales/es-MX.json   |  12 +-
 app/javascript/mastodon/locales/es.json      |  15 +-
 app/javascript/mastodon/locales/et.json      |   6 -
 app/javascript/mastodon/locales/eu.json      |  16 +-
 app/javascript/mastodon/locales/fa.json      |   6 -
 app/javascript/mastodon/locales/fi.json      | 158 ++++++++++---------
 app/javascript/mastodon/locales/fil.json     |  84 +++++++++-
 app/javascript/mastodon/locales/fo.json      |  12 +-
 app/javascript/mastodon/locales/fr-CA.json   |  22 ++-
 app/javascript/mastodon/locales/fr.json      |  22 ++-
 app/javascript/mastodon/locales/fy.json      |  28 +++-
 app/javascript/mastodon/locales/ga.json      |   6 +
 app/javascript/mastodon/locales/gd.json      |  43 ++++-
 app/javascript/mastodon/locales/gl.json      |  28 +++-
 app/javascript/mastodon/locales/he.json      |  15 +-
 app/javascript/mastodon/locales/hi.json      |   2 -
 app/javascript/mastodon/locales/hr.json      |   1 -
 app/javascript/mastodon/locales/hu.json      |  30 ++--
 app/javascript/mastodon/locales/ia.json      |  60 +++++++
 app/javascript/mastodon/locales/id.json      |   2 -
 app/javascript/mastodon/locales/ie.json      |   6 -
 app/javascript/mastodon/locales/io.json      |   4 -
 app/javascript/mastodon/locales/is.json      |  16 +-
 app/javascript/mastodon/locales/it.json      |  12 +-
 app/javascript/mastodon/locales/ja.json      |  25 ++-
 app/javascript/mastodon/locales/kab.json     |   4 +
 app/javascript/mastodon/locales/ko.json      |  20 +--
 app/javascript/mastodon/locales/lad.json     | 149 ++++++++++-------
 app/javascript/mastodon/locales/lt.json      |  71 ++++++++-
 app/javascript/mastodon/locales/lv.json      |   4 -
 app/javascript/mastodon/locales/ms.json      |   4 -
 app/javascript/mastodon/locales/my.json      |   4 -
 app/javascript/mastodon/locales/nl.json      |  28 ++--
 app/javascript/mastodon/locales/nn.json      |  31 ++--
 app/javascript/mastodon/locales/no.json      |   6 -
 app/javascript/mastodon/locales/oc.json      |   2 -
 app/javascript/mastodon/locales/pa.json      |  30 ++++
 app/javascript/mastodon/locales/pl.json      |  19 ++-
 app/javascript/mastodon/locales/pt-BR.json   |  12 +-
 app/javascript/mastodon/locales/pt-PT.json   |  12 +-
 app/javascript/mastodon/locales/ro.json      |   1 -
 app/javascript/mastodon/locales/ru.json      |  30 +++-
 app/javascript/mastodon/locales/si.json      |   3 -
 app/javascript/mastodon/locales/sk.json      |  24 ++-
 app/javascript/mastodon/locales/sl.json      |  28 +++-
 app/javascript/mastodon/locales/sq.json      |  12 +-
 app/javascript/mastodon/locales/sr-Latn.json |  28 +++-
 app/javascript/mastodon/locales/sr.json      |  12 +-
 app/javascript/mastodon/locales/sv.json      |  13 +-
 app/javascript/mastodon/locales/th.json      |  28 +++-
 app/javascript/mastodon/locales/tr.json      |  28 +++-
 app/javascript/mastodon/locales/uk.json      |  29 +++-
 app/javascript/mastodon/locales/vi.json      |  28 +++-
 app/javascript/mastodon/locales/zh-CN.json   |  12 +-
 app/javascript/mastodon/locales/zh-HK.json   |  12 +-
 app/javascript/mastodon/locales/zh-TW.json   |  12 +-
 config/locales/activerecord.eu.yml           |   2 +-
 config/locales/activerecord.fi.yml           |   6 +-
 config/locales/activerecord.lad.yml          |   2 +-
 config/locales/af.yml                        |  10 +-
 config/locales/ar.yml                        | 102 ++++++++----
 config/locales/be.yml                        |  30 +++-
 config/locales/bg.yml                        |  68 ++++----
 config/locales/cy.yml                        |  12 +-
 config/locales/devise.ar.yml                 |  11 +-
 config/locales/devise.be.yml                 |   9 ++
 config/locales/devise.en-GB.yml              |   9 ++
 config/locales/devise.fi.yml                 |  48 +++---
 config/locales/devise.ga.yml                 |  14 ++
 config/locales/devise.ia.yml                 |  17 ++
 config/locales/devise.lad.yml                |  16 +-
 config/locales/devise.nl.yml                 |   2 +-
 config/locales/devise.uk.yml                 |   9 ++
 config/locales/doorkeeper.be.yml             |   2 +-
 config/locales/doorkeeper.ia.yml             |  10 ++
 config/locales/doorkeeper.lad.yml            |   2 +-
 config/locales/doorkeeper.tr.yml             |  10 +-
 config/locales/en-GB.yml                     |  17 ++
 config/locales/es-MX.yml                     |   2 +-
 config/locales/et.yml                        |   3 +
 config/locales/eu.yml                        |   6 +-
 config/locales/fi.yml                        |  20 +--
 config/locales/fy.yml                        |   3 +
 config/locales/gd.yml                        |   1 +
 config/locales/hu.yml                        |   2 +-
 config/locales/ia.yml                        | 139 ++++++++++++++++
 config/locales/ko.yml                        |   2 +-
 config/locales/lad.yml                       |  80 +++++++---
 config/locales/lt.yml                        |  21 +++
 config/locales/nl.yml                        |   4 +-
 config/locales/simple_form.af.yml            |   2 +
 config/locales/simple_form.eu.yml            |   4 +-
 config/locales/simple_form.fi.yml            |  68 ++++----
 config/locales/simple_form.gd.yml            |   6 +-
 config/locales/simple_form.ja.yml            |   2 +-
 config/locales/simple_form.lad.yml           |   2 +-
 config/locales/simple_form.sr-Latn.yml       |   2 +-
 config/locales/simple_form.sr.yml            |   2 +-
 config/locales/simple_form.tr.yml            |  12 +-
 config/locales/sk.yml                        |   1 +
 config/locales/sl.yml                        |   9 ++
 config/locales/sr.yml                        |   4 +-
 config/locales/th.yml                        |  11 +-
 config/locales/tr.yml                        |  50 +++---
 config/locales/uk.yml                        |  12 +-
 120 files changed, 1804 insertions(+), 716 deletions(-)

diff --git a/app/javascript/mastodon/locales/af.json b/app/javascript/mastodon/locales/af.json
index d2ac2f8f27f45d..baa7e7bf709460 100644
--- a/app/javascript/mastodon/locales/af.json
+++ b/app/javascript/mastodon/locales/af.json
@@ -33,6 +33,7 @@
   "account.follows.empty": "Die gebruiker volg nog niemand.",
   "account.go_to_profile": "Gaan na profiel",
   "account.hide_reblogs": "Versteek plasings wat deur @{name} aangestuur is",
+  "account.in_memoriam": "Ter nagedagtenis.",
   "account.joined_short": "Aangesluit",
   "account.link_verified_on": "Eienaarskap van hierdie skakel is nagegaan op {date}",
   "account.locked_info": "Die rekening se privaatheidstatus is gesluit. Die eienaar hersien handmatig wie hom/haar kan volg.",
@@ -71,6 +72,7 @@
   "bundle_column_error.network.title": "Netwerkfout",
   "bundle_column_error.retry": "Probeer weer",
   "bundle_column_error.return": "Keer terug na die tuisblad",
+  "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Sluit",
   "bundle_modal_error.message": "Die laai van die komponent het iewers skeefgeloop.",
   "bundle_modal_error.retry": "Probeer weer",
@@ -149,6 +151,8 @@
   "emoji_button.food": "Eet- en drinkgoed",
   "emoji_button.nature": "Natuur",
   "emoji_button.not_found": "Geen passende emoji gevind nie",
+  "emoji_button.objects": "Voorwerpe",
+  "emoji_button.people": "Mense",
   "emoji_button.search": "Soek...",
   "emoji_button.search_results": "Soekresultate",
   "empty_column.account_timeline": "Geen plasings hier nie!",
@@ -161,7 +165,12 @@
   "empty_column.lists": "Jy het nog geen lyste nie. Wanneer jy een skep, sal dit hier vertoon.",
   "empty_column.notifications": "Jy het nog geen kennisgewings nie. Interaksie van ander mense met jou, sal hier vertoon.",
   "explore.search_results": "Soekresultate",
+  "explore.suggested_follows": "Mense",
+  "explore.trending_links": "Nuus",
+  "filter_modal.added.settings_link": "instellings bladsy",
   "filter_modal.select_filter.search": "Soek of skep",
+  "firehose.local": "Hierdie bediener",
+  "firehose.remote": "Ander bedieners",
   "footer.about": "Oor",
   "footer.directory": "Profielgids",
   "footer.get_app": "Kry die app",
@@ -170,14 +179,21 @@
   "footer.privacy_policy": "Privaatheidsbeleid",
   "footer.source_code": "Wys bronkode",
   "getting_started.heading": "Kom aan die gang",
+  "hashtag.column_header.tag_mode.all": "en {additional}",
+  "hashtag.column_header.tag_mode.any": "of {additional}",
+  "hashtag.column_header.tag_mode.none": "sonder {additional}",
   "hashtag.column_settings.select.placeholder": "Voer hutsetikette in…",
   "hashtag.column_settings.tag_toggle": "Voeg meer etikette by hierdie kolom",
   "hashtag.follow": "Volg hutsetiket",
   "home.column_settings.show_reblogs": "Wys aangestuurde plasings",
   "interaction_modal.description.reblog": "Met 'n rekening op Mastodon kan jy hierdie plasing aanstuur om dit met jou volgers te deel.",
   "interaction_modal.description.reply": "Met 'n rekening op Mastodon kan jy op hierdie plasing reageer.",
+  "interaction_modal.title.follow": "Volg {name}",
   "interaction_modal.title.reblog": "Stuur {name} se plasing aan",
   "interaction_modal.title.reply": "Reageer op {name} se plasing",
+  "intervals.full.days": "{number, plural, one {# dag} other {# dae}}",
+  "intervals.full.hours": "{number, plural, one {# uur} other {# uur}}",
+  "intervals.full.minutes": "{number, plural, one {# minuut} other {# minute}}",
   "keyboard_shortcuts.back": "Navigeer terug",
   "keyboard_shortcuts.blocked": "Vertoon lys van geblokkeerde gebruikers",
   "keyboard_shortcuts.boost": "Stuur aan",
@@ -209,8 +225,11 @@
   "keyboard_shortcuts.toot": "Begin ’n nuwe plasing",
   "keyboard_shortcuts.unfocus": "Fokus uit van teksveld/soekveld",
   "keyboard_shortcuts.up": "Beweeg opwaarts in die lys",
+  "lightbox.next": "Volgende",
+  "lightbox.previous": "Vorige",
   "limited_account_hint.action": "Vertoon profiel in elk geval",
   "limited_account_hint.title": "Hierdie profiel is deur moderators van {domain} versteek.",
+  "link_preview.author": "Deur {name}",
   "lists.account.add": "Voeg by lys",
   "lists.account.remove": "Verwyder vanaf lys",
   "lists.delete": "Verwyder lys",
@@ -237,6 +256,7 @@
   "notification.reblog": "{name} het jou plasing aangestuur",
   "notifications.column_settings.push": "Stootkennisgewings",
   "notifications.column_settings.reblog": "Aangestuurde plasings:",
+  "notifications.column_settings.sound": "Speel klank",
   "notifications.column_settings.status": "Nuwe plasings:",
   "notifications.column_settings.unread_notifications.highlight": "Lig ongelese kennisgewings uit",
   "notifications.filter.boosts": "Aangestuurde plasings",
@@ -300,5 +320,8 @@
   "upload_form.audio_description": "Describe for people with hearing loss",
   "upload_form.description": "Describe for the visually impaired",
   "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
-  "upload_progress.label": "Uploading…"
+  "upload_progress.label": "Uploading…",
+  "video.fullscreen": "Volskerm",
+  "video.mute": "Klank afskakel",
+  "video.unmute": "Klank aanskakel"
 }
diff --git a/app/javascript/mastodon/locales/ar.json b/app/javascript/mastodon/locales/ar.json
index 5f2d151fae78f4..790a971cdfd543 100644
--- a/app/javascript/mastodon/locales/ar.json
+++ b/app/javascript/mastodon/locales/ar.json
@@ -21,6 +21,7 @@
   "account.blocked": "محظور",
   "account.browse_more_on_origin_server": "تصفح المزيد في الملف الشخصي الأصلي",
   "account.cancel_follow_request": "إلغاء طلب المتابعة",
+  "account.copy": "نسخ الرابط إلى الملف الشخصي",
   "account.direct": "إشارة خاصة لـ @{name}",
   "account.disable_notifications": "توقف عن إشعاري عندما ينشر @{name}",
   "account.domain_blocked": "اسم النِّطاق محظور",
@@ -31,6 +32,7 @@
   "account.featured_tags.last_status_never": "لا توجد رسائل",
   "account.featured_tags.title": "وسوم {name} المميَّزة",
   "account.follow": "متابعة",
+  "account.follow_back": "تابعه بدورك",
   "account.followers": "مُتابِعون",
   "account.followers.empty": "لا أحدَ يُتابع هذا المُستخدم إلى حد الآن.",
   "account.followers_counter": "{count, plural, zero{لا مُتابع} one {مُتابعٌ واحِد} two {مُتابعانِ اِثنان} few {{counter} مُتابِعين} many {{counter} مُتابِعًا} other {{counter} مُتابع}}",
@@ -51,6 +53,7 @@
   "account.mute_notifications_short": "كتم الإشعارات",
   "account.mute_short": "اكتم",
   "account.muted": "مَكتوم",
+  "account.mutual": "متبادل",
   "account.no_bio": "لم يتم تقديم وصف.",
   "account.open_original_page": "افتح الصفحة الأصلية",
   "account.posts": "منشورات",
@@ -143,11 +146,19 @@
   "compose_form.lock_disclaimer.lock": "مُقفَل",
   "compose_form.placeholder": "فِيمَ تُفكِّر؟",
   "compose_form.poll.duration": "مُدَّة اِستطلاع الرأي",
+  "compose_form.poll.multiple": "متعدد الخيارات",
+  "compose_form.poll.option_placeholder": "الخيار {number}",
+  "compose_form.poll.single": "اختر واحدا",
   "compose_form.poll.switch_to_multiple": "تغيِير الاستطلاع للسماح باِخيارات مُتعدِّدة",
   "compose_form.poll.switch_to_single": "تغيِير الاستطلاع للسماح باِخيار واحد فقط",
+  "compose_form.poll.type": "الأسلوب",
+  "compose_form.publish": "نشر",
   "compose_form.publish_form": "منشور جديد",
+  "compose_form.reply": "ردّ",
+  "compose_form.save_changes": "تحديث",
   "compose_form.spoiler.marked": "إزالة تحذير المحتوى",
   "compose_form.spoiler.unmarked": "إضافة تحذير للمحتوى",
+  "compose_form.spoiler_placeholder": "تحذير المحتوى (اختياري)",
   "confirmation_modal.cancel": "إلغاء",
   "confirmations.block.block_and_report": "حظره والإبلاغ عنه",
   "confirmations.block.confirm": "حظر",
@@ -179,6 +190,7 @@
   "conversation.mark_as_read": "اعتبرها كمقروءة",
   "conversation.open": "اعرض المحادثة",
   "conversation.with": "مع {names}",
+  "copy_icon_button.copied": "نُسِخ إلى الحافظة",
   "copypaste.copied": "تم نسخه",
   "copypaste.copy_to_clipboard": "نسخ إلى الحافظة",
   "directory.federated": "مِن الفديفرس المعروف",
@@ -210,6 +222,7 @@
   "emoji_button.search_results": "نتائج البحث",
   "emoji_button.symbols": "رموز",
   "emoji_button.travel": "الأماكن والسفر",
+  "empty_column.account_hides_collections": "اختار هذا المستخدم عدم إتاحة هذه المعلومات للعامة",
   "empty_column.account_suspended": "حساب معلق",
   "empty_column.account_timeline": "لا توجد منشورات هنا!",
   "empty_column.account_unavailable": "الملف التعريفي غير متوفر",
@@ -264,6 +277,12 @@
   "follow_request.authorize": "ترخيص",
   "follow_request.reject": "رفض",
   "follow_requests.unlocked_explanation": "حتى وإن كان حسابك غير مقفل، يعتقد فريق {domain} أنك قد ترغب في مراجعة طلبات المتابعة من هذه الحسابات يدوياً.",
+  "follow_suggestions.curated_suggestion": "خيار المحرر",
+  "follow_suggestions.dismiss": "لا تُظهرها مجدّدًا",
+  "follow_suggestions.personalized_suggestion": "توصية مخصصة",
+  "follow_suggestions.popular_suggestion": "توصية رائجة",
+  "follow_suggestions.view_all": "عرض الكل",
+  "follow_suggestions.who_to_follow": "حسابات للمُتابَعة",
   "followed_tags": "الوسوم المتابَعة",
   "footer.about": "عن",
   "footer.directory": "دليل الصفحات التعريفية",
@@ -290,13 +309,9 @@
   "hashtag.follow": "اتبع الوسم",
   "hashtag.unfollow": "ألغِ متابعة الوسم",
   "hashtags.and_other": "…و {count, plural, zero {} one {# واحد آخر} two {# اثنان آخران} few {# آخرون} many {# آخَرًا}other {# آخرون}}",
-  "home.actions.go_to_explore": "اطّلع على ما هو رائج حاليا",
-  "home.actions.go_to_suggestions": "ابحث عن أشخاص لِمُتابعتهم",
   "home.column_settings.basic": "الأساسية",
   "home.column_settings.show_reblogs": "اعرض المعاد نشرها",
   "home.column_settings.show_replies": "اعرض الردود",
-  "home.explore_prompt.body": "سوف يحتوي خيط أخبارك الرئيسي على مزيج من المنشورات مِنها التي تحتوي على وسوم اخترتَ متابعتها، وأشخاص اخترتَ متابعتهم والمنشورات التي أعادوا نشرها. ومع ذلك، إن لا زال خيط أخبارك يبدو هادئا جدا، ماذا لو:",
-  "home.explore_prompt.title": "هذه هي صفحتك الرئيسة في ماستدون.",
   "home.hide_announcements": "إخفاء الإعلانات",
   "home.pending_critical_update.body": "يرجى تحديث خادم ماستدون في أقرب وقت ممكن!",
   "home.pending_critical_update.link": "اطّلع على التحديثات",
@@ -377,6 +392,7 @@
   "lists.search": "إبحث في قائمة الحسابات التي تُتابِعها",
   "lists.subheading": "قوائمك",
   "load_pending": "{count, plural, one {# عنصر جديد} other {# عناصر جديدة}}",
+  "loading_indicator.label": "جاري التحميل…",
   "media_gallery.toggle_visible": "{number, plural, zero {} one {اخف الصورة} two {اخف الصورتين} few {اخف الصور} many {اخف الصور} other {اخف الصور}}",
   "moved_to_account_banner.text": "حسابك {disabledAccount} معطل حاليًا لأنك انتقلت إلى {movedToAccount}.",
   "mute_modal.duration": "المدة",
@@ -464,6 +480,17 @@
   "onboarding.follows.empty": "نأسف، لا يمكن عرض نتائج في الوقت الحالي. جرب البحث أو انتقل لصفحة الاستكشاف لإيجاد أشخاص للمتابعة، أو حاول مرة أخرى.",
   "onboarding.follows.lead": "مقتطفات خيطك الرئيس هي الطريقة الأساسية لتجربة ماستدون. كلما زاد عدد الأشخاص الذين تتبعهم، كلما زاد خيط أخبارك نشاطا وإثارة للاهتمام. بداية، إليك بعض الاقتراحات:",
   "onboarding.follows.title": "أضفِ طابعا شخصيا على موجزات خيطك الرئيس",
+  "onboarding.profile.discoverable": "اجعل ملفي الشخصي قابلاً للاكتشاف",
+  "onboarding.profile.discoverable_hint": "عندما تختار تفعيل إمكانية الاكتشاف على ماستدون، قد تظهر منشوراتك في نتائج البحث والمواضيع الرائجة، وقد يتم اقتراح ملفك الشخصي لأشخاص ذوي اهتمامات مماثلة معك.",
+  "onboarding.profile.display_name": "الاسم العلني",
+  "onboarding.profile.display_name_hint": "اسمك الكامل أو اسمك المرح…",
+  "onboarding.profile.lead": "يمكنك دائمًا إكمال ذلك لاحقًا في الإعدادات، حيث يتوفر المزيد من خيارات التخصيص.",
+  "onboarding.profile.note": "نبذة عنك",
+  "onboarding.profile.note_hint": "يمكنك @ذِكر أشخاص آخرين أو استعمال #الوسوم…",
+  "onboarding.profile.save_and_continue": "حفظ و إستمرار",
+  "onboarding.profile.title": "إعداد الملف الشخصي",
+  "onboarding.profile.upload_avatar": "تحميل صورة الملف الشخصي",
+  "onboarding.profile.upload_header": "تحميل رأسية الملف الشخصي",
   "onboarding.share.lead": "اسمح للأشخاص بمعرفة إمكانية الوصول إليك على ماستدون!",
   "onboarding.share.message": "أنا {username} في #Mastodon! تعال لمتابعتي على {url}",
   "onboarding.share.next_steps": "الخطوات المحتملة التالية:",
@@ -497,9 +524,18 @@
   "poll_button.add_poll": "إضافة استطلاع للرأي",
   "poll_button.remove_poll": "إزالة استطلاع الرأي",
   "privacy.change": "اضبط خصوصية المنشور",
+  "privacy.direct.long": "كل من ذُكر في المنشور",
+  "privacy.direct.short": "أشخاص محددون",
+  "privacy.private.long": "متابعيك فقط",
+  "privacy.private.short": "للمتابِعين",
+  "privacy.public.long": "أي شخص على أو خارج ماستدون",
   "privacy.public.short": "للعامة",
+  "privacy.unlisted.additional": "هذا يتصرف بالضبط مثل النشر للعامة، باستثناء أن المنشور لن يظهر في الموجزات الحية أو في الوسوم أو في الإستكشاف، أو في نتائج بحث ماستدون، حتى وإن قمت بتفعيله على مستوى الحساب.",
+  "privacy.unlisted.long": "خوارزميات أقل",
+  "privacy.unlisted.short": "للعامة دون صخب",
   "privacy_policy.last_updated": "آخر تحديث {date}",
   "privacy_policy.title": "سياسة الخصوصية",
+  "recommended": "موصى به",
   "refresh": "أنعِش",
   "regeneration_indicator.label": "جارٍ التحميل…",
   "regeneration_indicator.sublabel": "جارٍ تجهيز موجزات خيطك الرئيس!",
@@ -514,7 +550,9 @@
   "relative_time.minutes": "{number}د",
   "relative_time.seconds": "{number}ثا",
   "relative_time.today": "اليوم",
+  "reply_indicator.attachments": "{count, plural, zero {}one {# مرفق} two {# المرفقات} few {# مرفقات} many {# مرفقات} other {# مرفقًا}}",
   "reply_indicator.cancel": "إلغاء",
+  "reply_indicator.poll": "استطلاع رأي",
   "report.block": "حظر",
   "report.block_explanation": "لن ترى منشوراته ولن يمكنه متابعتك أو رؤية منشوراتك، سيكون بديهيا له أنه مكتوم.",
   "report.categories.legal": "إشعارات قانونية",
@@ -570,6 +608,7 @@
   "search.quick_action.status_search": "المنشورات المطابقة لـ {x}",
   "search.search_or_paste": "ابحث أو أدخل رابطا تشعبيا URL",
   "search_popout.full_text_search_disabled_message": "غير متوفر على {domain}.",
+  "search_popout.full_text_search_logged_out_message": "متاح فقط عند تسجيل الدخول.",
   "search_popout.language_code": "رمز لغة ISO",
   "search_popout.options": "خيارات البحث",
   "search_popout.quick_actions": "الإجراءات السريعة",
diff --git a/app/javascript/mastodon/locales/ast.json b/app/javascript/mastodon/locales/ast.json
index 479c9c9243caf9..18bba991174c8d 100644
--- a/app/javascript/mastodon/locales/ast.json
+++ b/app/javascript/mastodon/locales/ast.json
@@ -199,6 +199,12 @@
   "follow_request.authorize": "Autorizar",
   "follow_request.reject": "Refugar",
   "follow_requests.unlocked_explanation": "Magar que la to cuenta nun seya privada, el personal del dominiu «{domain}» pensó qu'a lo meyor quies revisar manualmente les solicitúes de siguimientu d'estes cuentes.",
+  "follow_suggestions.curated_suggestion": "Escoyeta del sirvidor",
+  "follow_suggestions.dismiss": "Nun volver amosar",
+  "follow_suggestions.personalized_suggestion": "Suxerencia personalizada",
+  "follow_suggestions.popular_suggestion": "Suxerencia popular",
+  "follow_suggestions.view_all": "Ver too",
+  "follow_suggestions.who_to_follow": "A quién siguir",
   "footer.about": "Tocante a",
   "footer.directory": "Direutoriu de perfiles",
   "footer.get_app": "Consiguir l'aplicación",
diff --git a/app/javascript/mastodon/locales/be.json b/app/javascript/mastodon/locales/be.json
index e069515109fcb4..daff6563e87bf0 100644
--- a/app/javascript/mastodon/locales/be.json
+++ b/app/javascript/mastodon/locales/be.json
@@ -146,11 +146,19 @@
   "compose_form.lock_disclaimer.lock": "закрыты",
   "compose_form.placeholder": "Што здарылася?",
   "compose_form.poll.duration": "Працягласць апытання",
+  "compose_form.poll.multiple": "Множны выбар",
+  "compose_form.poll.option_placeholder": "Варыянт {number}",
+  "compose_form.poll.single": "Адзін варыянт",
   "compose_form.poll.switch_to_multiple": "Змяніце апытанне, каб дазволіць некалькі варыянтаў адказу",
   "compose_form.poll.switch_to_single": "Змяніце апытанне, каб дазволіць адзіны варыянт адказу",
+  "compose_form.poll.type": "Стыль",
+  "compose_form.publish": "Допіс",
   "compose_form.publish_form": "Апублікаваць",
+  "compose_form.reply": "Адказаць",
+  "compose_form.save_changes": "Абнавіць",
   "compose_form.spoiler.marked": "Выдаліць папярэджанне аб змесціве",
   "compose_form.spoiler.unmarked": "Дадаць папярэджанне аб змесціве",
+  "compose_form.spoiler_placeholder": "Папярэджанне аб змесціве (неабавязкова)",
   "confirmation_modal.cancel": "Скасаваць",
   "confirmations.block.block_and_report": "Заблакіраваць і паскардзіцца",
   "confirmations.block.confirm": "Заблакіраваць",
@@ -269,6 +277,12 @@
   "follow_request.authorize": "Аўтарызацыя",
   "follow_request.reject": "Адхіліць",
   "follow_requests.unlocked_explanation": "Ваш акаўнт не схаваны, аднак прадстаўнікі {domain} палічылі, што вы можаце захацець праглядзець запыты на падпіску з гэтых профіляў уручную.",
+  "follow_suggestions.curated_suggestion": "Выбар сервера",
+  "follow_suggestions.dismiss": "Не паказваць зноў",
+  "follow_suggestions.personalized_suggestion": "Персаналізаваная прапанова",
+  "follow_suggestions.popular_suggestion": "Папулярная прапанова",
+  "follow_suggestions.view_all": "Праглядзець усё",
+  "follow_suggestions.who_to_follow": "На каго падпісацца",
   "followed_tags": "Падпіскі",
   "footer.about": "Пра нас",
   "footer.directory": "Дырэкторыя профіляў",
@@ -295,13 +309,9 @@
   "hashtag.follow": "Падпісацца на хэштэг",
   "hashtag.unfollow": "Адпісацца ад хэштэга",
   "hashtags.and_other": "…і яшчэ {count, plural,  other {#}}",
-  "home.actions.go_to_explore": "Паглядзіце, што ў трэндзе",
-  "home.actions.go_to_suggestions": "Знайсці людзей, каб падпісацца",
   "home.column_settings.basic": "Асноўныя",
   "home.column_settings.show_reblogs": "Паказаць пашырэнні",
   "home.column_settings.show_replies": "Паказваць адказы",
-  "home.explore_prompt.body": "Ваша галоўная стужка змяшчае сумесь допісаў з хэштэгамі, за якімі вы вырашылі сачыць, допісаў ад людзей, за якімі вы вырашылі сачыць, і допісаў, якія яны пашыраюць. Зараз усё выглядае даволі ціха, так што як наконт:",
-  "home.explore_prompt.title": "Гэта ваша апорная кропка ў Mastodon.",
   "home.hide_announcements": "Схаваць аб'явы",
   "home.pending_critical_update.body": "Калі ласка, абнавіце свой сервер Mastodon як мага хутчэй!",
   "home.pending_critical_update.link": "Прагледзець абнаўленні",
@@ -514,7 +524,15 @@
   "poll_button.add_poll": "Дадаць апытанне",
   "poll_button.remove_poll": "Выдаліць апытанне",
   "privacy.change": "Змяніць прыватнасць допісу",
+  "privacy.direct.long": "Усе згаданыя ў допісе",
+  "privacy.direct.short": "Канкрэтныя людзі",
+  "privacy.private.long": "Толькі вашыя падпісчыкі",
+  "privacy.private.short": "Падпісчыкі",
+  "privacy.public.long": "Усе, хто ёсць і каго няма ў Mastodon",
   "privacy.public.short": "Публічны",
+  "privacy.unlisted.additional": "Паводзіць сябе гэтак жа, як і публічны, за выключэннем таго, што пост не будзе адлюстроўвацца ў жывой стужцы, хэштэгах, аглядзе або ў пошуку Mastodon, нават калі вы ўключылі бачнасць у пошуку ў наладах.",
+  "privacy.unlisted.long": "Менш фанфар ад алгарытмаў",
+  "privacy.unlisted.short": "Ціхі публічны",
   "privacy_policy.last_updated": "Адноўлена {date}",
   "privacy_policy.title": "Палітыка канфідэнцыйнасці",
   "recommended": "Рэкамендуем",
@@ -532,7 +550,9 @@
   "relative_time.minutes": "{number} хв",
   "relative_time.seconds": "{number} с",
   "relative_time.today": "сёння",
+  "reply_indicator.attachments": "{count, plural, one {# далучэнне} few {# далучэнні} many {# далучэнняў} other {# далучэння}}",
   "reply_indicator.cancel": "Скасаваць",
+  "reply_indicator.poll": "Апытанне",
   "report.block": "Заблакіраваць",
   "report.block_explanation": "Вы перастанеце бачыць допісы гэтага карыстальніка. Ён не зможа сачыць за вамі і бачыць вашы допісы. Ён зможа зразумець, што яго заблакіравалі.",
   "report.categories.legal": "Права",
@@ -664,7 +684,7 @@
   "status.show_more": "Паказаць болей",
   "status.show_more_all": "Разгарнуць усё",
   "status.show_original": "Паказаць арыгінал",
-  "status.title.with_attachments": "{user} апублікаваў {attachmentCount, plural, one {укладанне} other {{attachmentCount} укладанні}}",
+  "status.title.with_attachments": "{user} апублікаваў {attachmentCount, plural, one {далучэнне} few {{attachmentCount} далучэнні} many {{attachmentCount} далучэнняў} other {{attachmentCount} далучэння}}",
   "status.translate": "Перакласці",
   "status.translated_from_with": "Перакладзена з {lang} з дапамогай {provider}",
   "status.uncached_media_warning": "Перадпрагляд недаступны",
diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json
index 213ac090a7cec2..99c0f8b1022f01 100644
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@@ -8,7 +8,7 @@
   "about.domain_blocks.silenced.title": "Ограничено",
   "about.domain_blocks.suspended.explanation": "Никакви данни от този сървър няма да се обработват, съхраняват или обменят, правещи невъзможно всяко взаимодействие или комуникация с потребители от тези сървъри.",
   "about.domain_blocks.suspended.title": "Спряно",
-  "about.not_available": "Тази информация не е била направена налична на този сървър.",
+  "about.not_available": "Тази информация не е публична на този сървър.",
   "about.powered_by": "Децентрализирана социална мрежа, захранвана от {mastodon}",
   "about.rules": "Правила на сървъра",
   "account.account_note_header": "Бележка",
@@ -145,11 +145,9 @@
   "compose_form.lock_disclaimer": "Вашият акаунт не е в положение {locked}. Всеки може да ви последва, за да разглежда публикациите ви само за последователи.",
   "compose_form.lock_disclaimer.lock": "заключено",
   "compose_form.placeholder": "Какво мислите?",
-  "compose_form.poll.add_option": "Добавяне на избор",
   "compose_form.poll.duration": "Времетраене на анкетата",
   "compose_form.poll.multiple": "Множествен избор",
   "compose_form.poll.option_placeholder": "Избор {number}",
-  "compose_form.poll.remove_option": "Премахване на тази възможност",
   "compose_form.poll.single": "Подберете нещо",
   "compose_form.poll.switch_to_multiple": "Промяна на анкетата, за да се позволят множество възможни избора",
   "compose_form.poll.switch_to_single": "Промяна на анкетата, за да се позволи един възможен избор",
@@ -224,7 +222,7 @@
   "emoji_button.search_results": "Резултати от търсене",
   "emoji_button.symbols": "Символи",
   "emoji_button.travel": "Пътуване и места",
-  "empty_column.account_hides_collections": "Този потребител е избрал да не прави това сведение достъпно",
+  "empty_column.account_hides_collections": "Този потребител е избрал да не дава тази информация",
   "empty_column.account_suspended": "Спрян акаунт",
   "empty_column.account_timeline": "Тук няма публикации!",
   "empty_column.account_unavailable": "Профилът не е наличен",
@@ -279,6 +277,12 @@
   "follow_request.authorize": "Упълномощаване",
   "follow_request.reject": "Отхвърляне",
   "follow_requests.unlocked_explanation": "Въпреки че акаунтът ви не е заключен, служителите на {domain} помислиха, че може да искате да преглеждате ръчно заявките за последване на тези профили.",
+  "follow_suggestions.curated_suggestion": "Избор от редакторите",
+  "follow_suggestions.dismiss": "Без ново показване",
+  "follow_suggestions.personalized_suggestion": "Персонализирано предложение",
+  "follow_suggestions.popular_suggestion": "Популярно предложение",
+  "follow_suggestions.view_all": "Преглед на всички",
+  "follow_suggestions.who_to_follow": "Кого да се следва",
   "followed_tags": "Последвани хаштагове",
   "footer.about": "Относно",
   "footer.directory": "Директория на профилите",
@@ -305,13 +309,9 @@
   "hashtag.follow": "Следване на хаштаг",
   "hashtag.unfollow": "Спиране на следване на хаштаг",
   "hashtags.and_other": "…и {count, plural, other {# още}}",
-  "home.actions.go_to_explore": "Вижте какво изгрява",
-  "home.actions.go_to_suggestions": "Намиране на хора за следване",
   "home.column_settings.basic": "Основно",
   "home.column_settings.show_reblogs": "Показване на подсилванията",
   "home.column_settings.show_replies": "Показване на отговорите",
-  "home.explore_prompt.body": "Вашият начален инфоканал ще е смес на публикации от хаштаговете, които сте избрали да следвате, избраните хора да следвате, а и публикациите, които са подсилили. Ако изглежда твърде тихо в момента, то може да искате да:",
-  "home.explore_prompt.title": "Това е началната ви база с Mastodon.",
   "home.hide_announcements": "Скриване на оповестяванията",
   "home.pending_critical_update.body": "Обновете сървъра си в Mastodon възможно най-скоро!",
   "home.pending_critical_update.link": "Преглед на обновяванията",
@@ -530,6 +530,7 @@
   "privacy.private.short": "Последователи",
   "privacy.public.long": "Всеки във и извън Mastodon",
   "privacy.public.short": "Публично",
+  "privacy.unlisted.additional": "Това поведение е точно като публичното, с изключение на това, че публикацията няма да се появява в каналите на живо, хаштаговете, проучването или търсенето в Mastodon, дори ако сте се включили в целия акаунт.",
   "privacy.unlisted.long": "По-малко алгоритмични фанфари",
   "privacy.unlisted.short": "Тиха публика",
   "privacy_policy.last_updated": "Последно осъвременяване на {date}",
diff --git a/app/javascript/mastodon/locales/br.json b/app/javascript/mastodon/locales/br.json
index 5e83ab4e6dc8b4..8cbe4591d59358 100644
--- a/app/javascript/mastodon/locales/br.json
+++ b/app/javascript/mastodon/locales/br.json
@@ -143,9 +143,14 @@
   "compose_form.lock_disclaimer.lock": "prennet",
   "compose_form.placeholder": "Petra emaoc'h o soñjal e-barzh ?",
   "compose_form.poll.duration": "Pad ar sontadeg",
+  "compose_form.poll.single": "Dibabit unan",
   "compose_form.poll.switch_to_multiple": "Kemmañ ar sontadeg evit aotren meur a zibab",
   "compose_form.poll.switch_to_single": "Kemmañ ar sontadeg evit aotren un dibab hepken",
+  "compose_form.poll.type": "Neuz",
+  "compose_form.publish": "Embann",
   "compose_form.publish_form": "Embann",
+  "compose_form.reply": "Respont",
+  "compose_form.save_changes": "Hizivadur",
   "compose_form.spoiler.marked": "Kuzhet eo an destenn a-dreñv ur c'hemenn",
   "compose_form.spoiler.unmarked": "N'eo ket kuzhet an destenn",
   "confirmation_modal.cancel": "Nullañ",
@@ -280,12 +285,9 @@
   "hashtag.follow": "Heuliañ ar ger-klik",
   "hashtag.unfollow": "Paouez heuliañ an hashtag",
   "hashtags.and_other": "…{count, plural, one {hag # all} other {ha # all}}",
-  "home.actions.go_to_explore": "Gwelet petra zo diouzh ar c'hiz",
-  "home.actions.go_to_suggestions": "Kavout tud da heuliañ",
   "home.column_settings.basic": "Diazez",
   "home.column_settings.show_reblogs": "Diskouez ar skignadennoù",
   "home.column_settings.show_replies": "Diskouez ar respontoù",
-  "home.explore_prompt.title": "Homañ eo ho pajenn degemer e-barzh Mastodon.",
   "home.hide_announcements": "Kuzhat ar c'hemennoù",
   "home.pending_critical_update.body": "Hizivait ho servijer Mastodon kerkent ha ma c'hallit mar plij!",
   "home.pending_critical_update.link": "Gwelet an hizivadennoù",
@@ -475,6 +477,7 @@
   "poll_button.add_poll": "Ouzhpennañ ur sontadeg",
   "poll_button.remove_poll": "Dilemel ar sontadeg",
   "privacy.change": "Cheñch prevezded an toud",
+  "privacy.private.short": "Heulierien",
   "privacy.public.short": "Publik",
   "privacy_policy.last_updated": "Hizivadenn ziwezhañ {date}",
   "privacy_policy.title": "Reolennoù Prevezded",
@@ -494,6 +497,7 @@
   "relative_time.seconds": "{number}eil",
   "relative_time.today": "hiziv",
   "reply_indicator.cancel": "Nullañ",
+  "reply_indicator.poll": "Sontadeg",
   "report.block": "Stankañ",
   "report.block_explanation": "Ne vo ket gwelet toudoù ar gont-se ken. Ne welo ket ho toudoù ha ne c'hello ket ho heuliañ ken. Gouzout a raio eo bet stanket ganeoc'h.",
   "report.categories.legal": "Lezennel",
diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index 0d089bf8b895da..0ae471e02370be 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -145,18 +145,16 @@
   "compose_form.lock_disclaimer": "El teu compte no està {locked}. Tothom pot seguir-te i veure els tuts de només per a seguidors.",
   "compose_form.lock_disclaimer.lock": "blocat",
   "compose_form.placeholder": "Què tens al cap?",
-  "compose_form.poll.add_option": "Afegiu una opció",
   "compose_form.poll.duration": "Durada de l'enquesta",
   "compose_form.poll.multiple": "Opcions múltiples",
   "compose_form.poll.option_placeholder": "Opció {number}",
-  "compose_form.poll.remove_option": "Treu aquesta opció",
   "compose_form.poll.single": "Trieu-ne una",
   "compose_form.poll.switch_to_multiple": "Canvia l’enquesta per a permetre múltiples opcions",
   "compose_form.poll.switch_to_single": "Canvia l’enquesta per a permetre una única opció",
   "compose_form.poll.type": "Estil",
   "compose_form.publish": "Publica",
   "compose_form.publish_form": "Nou tut",
-  "compose_form.reply": "Responeu",
+  "compose_form.reply": "Respon",
   "compose_form.save_changes": "Actualitza",
   "compose_form.spoiler.marked": "Elimina l'avís de contingut",
   "compose_form.spoiler.unmarked": "Afegeix avís de contingut",
@@ -279,6 +277,12 @@
   "follow_request.authorize": "Autoritza",
   "follow_request.reject": "Rebutja",
   "follow_requests.unlocked_explanation": "Tot i que el teu compte no està blocat, el personal de {domain} ha pensat que és possible que vulguis revisar manualment les sol·licituds de seguiment d’aquests comptes.",
+  "follow_suggestions.curated_suggestion": "Tria de l'editor",
+  "follow_suggestions.dismiss": "No ho tornis a mostrar",
+  "follow_suggestions.personalized_suggestion": "Suggeriment personalitzat",
+  "follow_suggestions.popular_suggestion": "Suggeriment popular",
+  "follow_suggestions.view_all": "Mostra-ho tot",
+  "follow_suggestions.who_to_follow": "A qui seguir",
   "followed_tags": "Etiquetes seguides",
   "footer.about": "Quant a",
   "footer.directory": "Directori de perfils",
@@ -305,13 +309,9 @@
   "hashtag.follow": "Segueix l'etiqueta",
   "hashtag.unfollow": "Deixa de seguir l'etiqueta",
   "hashtags.and_other": "…i {count, plural, other {# més}}",
-  "home.actions.go_to_explore": "Mira què és tendència",
-  "home.actions.go_to_suggestions": "Troba persones a seguir",
   "home.column_settings.basic": "Bàsic",
   "home.column_settings.show_reblogs": "Mostra els impulsos",
   "home.column_settings.show_replies": "Mostra les respostes",
-  "home.explore_prompt.body": "La teva línia de temps Inici tindrà una barreja dels tuts de les etiquetes que has triat seguir, de les persones que has triat seguir i dels tuts que s'impulsen. Ara mateix es veu força tranquil·la, què et sembla si:",
-  "home.explore_prompt.title": "Aquesta és la teva base inicial a Mastodon.",
   "home.hide_announcements": "Amaga els anuncis",
   "home.pending_critical_update.body": "Si us plau actualitza el teu servidor Mastodon tant aviat com sigui possible!",
   "home.pending_critical_update.link": "Veure actualitzacions",
@@ -524,12 +524,15 @@
   "poll_button.add_poll": "Afegeix una enquesta",
   "poll_button.remove_poll": "Elimina l'enquesta",
   "privacy.change": "Canvia la privacitat del tut",
-  "privacy.direct.long": "Tothom mencionat en aquesta publicació",
+  "privacy.direct.long": "Tothom mencionat a la publicació",
   "privacy.direct.short": "Persones concretes",
   "privacy.private.long": "Només els vostres seguidors",
   "privacy.private.short": "Seguidors",
   "privacy.public.long": "Tothom dins o fora Mastodon",
   "privacy.public.short": "Públic",
+  "privacy.unlisted.additional": "Es comporta igual que públic, excepte que la publicació no apareixerà als canals en directe o etiquetes, l'explora o a la cerca de Mastodon, fins i tot si ho heu activat a nivell de compte.",
+  "privacy.unlisted.long": "Menys fanfàrries algorísmiques",
+  "privacy.unlisted.short": "Públic tranquil",
   "privacy_policy.last_updated": "Darrera actualització {date}",
   "privacy_policy.title": "Política de Privacitat",
   "recommended": "Recomanat",
@@ -547,7 +550,9 @@
   "relative_time.minutes": "{number}min",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "avui",
+  "reply_indicator.attachments": "{count, plural, one {# adjunt} other {# adjunts}}",
   "reply_indicator.cancel": "Cancel·la",
+  "reply_indicator.poll": "Enquesta",
   "report.block": "Bloca",
   "report.block_explanation": "No veuràs els seus tuts. Ells no podran veure els teus tuts ni et podran seguir. Podran saber que estan blocats.",
   "report.categories.legal": "Legal",
diff --git a/app/javascript/mastodon/locales/cs.json b/app/javascript/mastodon/locales/cs.json
index 7d91670de0629a..24248db15cca81 100644
--- a/app/javascript/mastodon/locales/cs.json
+++ b/app/javascript/mastodon/locales/cs.json
@@ -32,6 +32,7 @@
   "account.featured_tags.last_status_never": "Žádné příspěvky",
   "account.featured_tags.title": "Hlavní hashtagy uživatele {name}",
   "account.follow": "Sledovat",
+  "account.follow_back": "Také sledovat",
   "account.followers": "Sledující",
   "account.followers.empty": "Tohoto uživatele zatím nikdo nesleduje.",
   "account.followers_counter": "{count, plural, one {{counter} Sledující} few {{counter} Sledující} many {{counter} Sledujících} other {{counter} Sledujících}}",
@@ -52,6 +53,7 @@
   "account.mute_notifications_short": "Ztlumit upozornění",
   "account.mute_short": "Ztlumit",
   "account.muted": "Skrytý",
+  "account.mutual": "Vzájemné",
   "account.no_bio": "Nebyl poskytnut žádný popis.",
   "account.open_original_page": "Otevřít původní stránku",
   "account.posts": "Příspěvky",
@@ -144,11 +146,19 @@
   "compose_form.lock_disclaimer.lock": "zamčený",
   "compose_form.placeholder": "Co se vám honí hlavou?",
   "compose_form.poll.duration": "Doba trvání ankety",
+  "compose_form.poll.multiple": "Výběr z více možností",
+  "compose_form.poll.option_placeholder": "Volba {number}",
+  "compose_form.poll.single": "Vyber jednu",
   "compose_form.poll.switch_to_multiple": "Povolit u ankety výběr více voleb",
   "compose_form.poll.switch_to_single": "Povolit u ankety výběr pouze jedné volby",
+  "compose_form.poll.type": "Styl",
+  "compose_form.publish": "Odeslat",
   "compose_form.publish_form": "Zveřejnit",
+  "compose_form.reply": "Odpovědět",
+  "compose_form.save_changes": "Aktualizovat",
   "compose_form.spoiler.marked": "Odebrat varování o obsahu",
   "compose_form.spoiler.unmarked": "Přidat varování o obsahu",
+  "compose_form.spoiler_placeholder": "Upozornění na obsah (nepovinné)",
   "confirmation_modal.cancel": "Zrušit",
   "confirmations.block.block_and_report": "Blokovat a nahlásit",
   "confirmations.block.confirm": "Blokovat",
@@ -267,6 +277,9 @@
   "follow_request.authorize": "Autorizovat",
   "follow_request.reject": "Zamítnout",
   "follow_requests.unlocked_explanation": "Přestože váš účet není zamčený, administrátor {domain} usoudil, že byste mohli chtít tyto žádosti o sledování zkontrolovat ručně.",
+  "follow_suggestions.dismiss": "Znovu nezobrazovat",
+  "follow_suggestions.popular_suggestion": "Populární návrh",
+  "follow_suggestions.who_to_follow": "Koho sledovat",
   "followed_tags": "Sledované hashtagy",
   "footer.about": "O aplikaci",
   "footer.directory": "Adresář profilů",
@@ -289,13 +302,9 @@
   "hashtag.column_settings.tag_toggle": "Zahrnout v tomto sloupci další štítky",
   "hashtag.follow": "Sledovat hashtag",
   "hashtag.unfollow": "Přestat sledovat hashtag",
-  "home.actions.go_to_explore": "Podívejte se, co frčí",
-  "home.actions.go_to_suggestions": "Najít lidi ke sledování",
   "home.column_settings.basic": "Základní",
   "home.column_settings.show_reblogs": "Zobrazit boosty",
   "home.column_settings.show_replies": "Zobrazit odpovědi",
-  "home.explore_prompt.body": "Váš domovský kanál bude obsahovat směs příspěvků z hashtagů, které jste se rozhodli sledovat, lidí, které jste se rozhodli sledovat, a příspěvků, které boostují. Pokud vám to připadá příliš klidné, možná budete chtít:",
-  "home.explore_prompt.title": "Toto je vaše domovská základna uvnitř Mastodonu.",
   "home.hide_announcements": "Skrýt oznámení",
   "home.pending_critical_update.body": "Aktualizujte, prosím, svůj Mastodon server co nejdříve!",
   "home.pending_critical_update.link": "Zobrazit aktualizace",
@@ -376,6 +385,7 @@
   "lists.search": "Hledejte mezi lidmi, které sledujete",
   "lists.subheading": "Vaše seznamy",
   "load_pending": "{count, plural, one {# nová položka} few {# nové položky} many {# nových položek} other {# nových položek}}",
+  "loading_indicator.label": "Načítání…",
   "media_gallery.toggle_visible": "{number, plural, one {Skrýt obrázek} few {Skrýt obrázky} many {Skrýt obrázky} other {Skrýt obrázky}}",
   "moved_to_account_banner.text": "Váš účet {disabledAccount} je momentálně deaktivován, protože jste se přesunul/a na {movedToAccount}.",
   "mute_modal.duration": "Trvání",
@@ -463,6 +473,17 @@
   "onboarding.follows.empty": "Bohužel, žádné výsledky nelze momentálně zobrazit. Můžete zkusit vyhledat nebo procházet stránku s průzkumem a najít lidi, kteří budou sledovat, nebo to zkuste znovu později.",
   "onboarding.follows.lead": "You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!",
   "onboarding.follows.title": "Populární na Mastodonu",
+  "onboarding.profile.discoverable": "Udělat svůj profil vyhledatelným",
+  "onboarding.profile.discoverable_hint": "Když se rozhodnete být vyhledatelný na Mastodonu, vaše příspěvky se mohou objevit ve výsledcích vyhledávání a v populárních, a váš profil může být navrhován lidem s podobnými zájmy.",
+  "onboarding.profile.display_name": "Zobrazované jméno",
+  "onboarding.profile.display_name_hint": "Vaše celé jméno nebo přezdívka…",
+  "onboarding.profile.lead": "Toto můžete vždy dokončit později v nastavení, kde je k dispozici ještě více možností přizpůsobení.",
+  "onboarding.profile.note": "O vás",
+  "onboarding.profile.note_hint": "Můžete @zmínit jiné osoby nebo #hashtagy…",
+  "onboarding.profile.save_and_continue": "Uložit a pokračovat",
+  "onboarding.profile.title": "Nastavení profilu",
+  "onboarding.profile.upload_avatar": "Nahrát profilový obrázek",
+  "onboarding.profile.upload_header": "Nahrát hlavičku profilu",
   "onboarding.share.lead": "Dejte lidem vědět, jak vás mohou najít na Mastodonu!",
   "onboarding.share.message": "Jsem {username} na #Mastodonu! Pojď mě sledovat na {url}",
   "onboarding.share.next_steps": "Možné další kroky:",
@@ -496,9 +517,17 @@
   "poll_button.add_poll": "Přidat anketu",
   "poll_button.remove_poll": "Odebrat anketu",
   "privacy.change": "Změnit soukromí příspěvku",
+  "privacy.direct.long": "Všichni zmínění v příspěvku",
+  "privacy.direct.short": "Vybraní lidé",
+  "privacy.private.long": "Jen vaši sledující",
+  "privacy.private.short": "Sledující",
+  "privacy.public.long": "Kdokoliv na Mastodonu i mimo něj",
   "privacy.public.short": "Veřejné",
+  "privacy.unlisted.additional": "Chová se stejně jako veřejný, až na to, že se příspěvek neobjeví v živých kanálech nebo hashtazích, v objevování nebo vyhledávání na Mastodonu, a to i když je účet nastaven tak, aby se zde všude tyto příspěvky zobrazovaly.",
+  "privacy.unlisted.long": "Méně algoritmických fanfár",
   "privacy_policy.last_updated": "Naposledy aktualizováno {date}",
   "privacy_policy.title": "Zásady ochrany osobních údajů",
+  "recommended": "Doporučeno",
   "refresh": "Obnovit",
   "regeneration_indicator.label": "Načítání…",
   "regeneration_indicator.sublabel": "Váš domovský kanál se připravuje!",
@@ -514,6 +543,7 @@
   "relative_time.seconds": "{number} s",
   "relative_time.today": "dnes",
   "reply_indicator.cancel": "Zrušit",
+  "reply_indicator.poll": "Anketa",
   "report.block": "Blokovat",
   "report.block_explanation": "Neuvidíte příspěvky tohoto uživatele. On neuvidí vaše příspěvky, ani vás nebude moci sledovat. Pozná, že je blokován.",
   "report.categories.legal": "Právní ustanovení",
@@ -569,6 +599,7 @@
   "search.quick_action.status_search": "Příspěvky odpovídající {x}",
   "search.search_or_paste": "Hledat nebo vložit URL",
   "search_popout.full_text_search_disabled_message": "Nedostupné na {domain}.",
+  "search_popout.full_text_search_logged_out_message": "Dostupné pouze po přihlášení.",
   "search_popout.language_code": "Kód jazyka podle ISO",
   "search_popout.options": "Možnosti hledání",
   "search_popout.quick_actions": "Rychlé akce",
diff --git a/app/javascript/mastodon/locales/cy.json b/app/javascript/mastodon/locales/cy.json
index 3cd090e186155b..f023c5a2a7720c 100644
--- a/app/javascript/mastodon/locales/cy.json
+++ b/app/javascript/mastodon/locales/cy.json
@@ -146,11 +146,19 @@
   "compose_form.lock_disclaimer.lock": "wedi ei gloi",
   "compose_form.placeholder": "Beth sydd ar eich meddwl?",
   "compose_form.poll.duration": "Cyfnod pleidlais",
+  "compose_form.poll.multiple": "Dewis lluosog",
+  "compose_form.poll.option_placeholder": "Dewis {number}",
+  "compose_form.poll.single": "Ddewis un",
   "compose_form.poll.switch_to_multiple": "Newid pleidlais i adael mwy nag un dewis",
   "compose_form.poll.switch_to_single": "Newid pleidlais i gyfyngu i un dewis",
+  "compose_form.poll.type": "Arddull",
+  "compose_form.publish": "Postiad",
   "compose_form.publish_form": "Cyhoeddi",
+  "compose_form.reply": "Ateb",
+  "compose_form.save_changes": "Diweddariad",
   "compose_form.spoiler.marked": "Dileu rhybudd cynnwys",
   "compose_form.spoiler.unmarked": "Ychwanegu rhybudd cynnwys",
+  "compose_form.spoiler_placeholder": "Rhybudd cynnwys (dewisol)",
   "confirmation_modal.cancel": "Diddymu",
   "confirmations.block.block_and_report": "Rhwystro ac Adrodd",
   "confirmations.block.confirm": "Blocio",
@@ -269,6 +277,12 @@
   "follow_request.authorize": "Awdurdodi",
   "follow_request.reject": "Gwrthod",
   "follow_requests.unlocked_explanation": "Er nid yw eich cyfrif wedi'i gloi, roedd y staff {domain} yn meddwl efallai hoffech adolygu ceisiadau dilyn o'r cyfrifau rhain wrth law.",
+  "follow_suggestions.curated_suggestion": "Dewis y Golygydd",
+  "follow_suggestions.dismiss": "Peidio â dangos hwn eto",
+  "follow_suggestions.personalized_suggestion": "Awgrym personol",
+  "follow_suggestions.popular_suggestion": "Awgrym poblogaidd",
+  "follow_suggestions.view_all": "Gweld y cyfan",
+  "follow_suggestions.who_to_follow": "Pwy i ddilyn",
   "followed_tags": "Hashnodau rydych yn eu dilyn",
   "footer.about": "Ynghylch",
   "footer.directory": "Cyfeiriadur proffiliau",
@@ -295,13 +309,9 @@
   "hashtag.follow": "Dilyn hashnod",
   "hashtag.unfollow": "Dad-ddilyn hashnod",
   "hashtags.and_other": "…a {count, plural, other {# more}}",
-  "home.actions.go_to_explore": "Gweld beth yw'r tuedd",
-  "home.actions.go_to_suggestions": "Ffeindio pobl i'w dilyn",
   "home.column_settings.basic": "Syml",
   "home.column_settings.show_reblogs": "Dangos hybiau",
   "home.column_settings.show_replies": "Dangos atebion",
-  "home.explore_prompt.body": "Bydd eich llif cartref yn cynnwys cymysgedd o bostiadau o'r hashnodau rydych chi wedi dewis eu dilyn, y bobl rydych chi wedi dewis eu dilyn, a'r postiadau maen nhw'n rhoi hwb iddyn nhw. Os yw hynny'n teimlo'n rhy dawel, efallai y byddwch eisiau:",
-  "home.explore_prompt.title": "Dyma'ch cartref o fewn Mastodon.",
   "home.hide_announcements": "Cuddio cyhoeddiadau",
   "home.pending_critical_update.body": "Diweddarwch eich gweinydd Mastodon cyn gynted â phosibl!",
   "home.pending_critical_update.link": "Gweld y diweddariadau",
@@ -514,7 +524,15 @@
   "poll_button.add_poll": "Ychwanegu pleidlais",
   "poll_button.remove_poll": "Tynnu pleidlais",
   "privacy.change": "Addasu preifatrwdd y post",
+  "privacy.direct.long": "Pawb sydd â son amdanyn nhw yn y postiad",
+  "privacy.direct.short": "Pobl benodol",
+  "privacy.private.long": "Eich dilynwyr yn unig",
+  "privacy.private.short": "Dilynwyr",
+  "privacy.public.long": "Unrhyw ar ac oddi ar Mastodon",
   "privacy.public.short": "Cyhoeddus",
+  "privacy.unlisted.additional": "Mae hwn yn ymddwyn yn union fel y cyhoeddus, ac eithrio na fydd y postiad yn ymddangos mewn ffrydiau byw neu hashnodau, archwilio, neu chwiliad Mastodon, hyd yn oed os ydych wedi eich cynnwys ar draws y cyfrif.",
+  "privacy.unlisted.long": "Llai o ddathliadau algorithmig",
+  "privacy.unlisted.short": "Tewi'r cyhoeddus",
   "privacy_policy.last_updated": "Diweddarwyd ddiwethaf ar {date}",
   "privacy_policy.title": "Polisi Preifatrwydd",
   "recommended": "Argymhellwyd",
@@ -532,7 +550,9 @@
   "relative_time.minutes": "{number} munud",
   "relative_time.seconds": "{number} eiliad",
   "relative_time.today": "heddiw",
+  "reply_indicator.attachments": "{count, plural, one {# attachment} arall {# attachments}}",
   "reply_indicator.cancel": "Canslo",
+  "reply_indicator.poll": "Arolwg",
   "report.block": "Blocio",
   "report.block_explanation": "Ni welwch chi eu postiadau. Ni allan nhw weld eich postiadau na'ch dilyn. Byddan nhw'n gallu gweld eu bod nhw wedi'u rhwystro.",
   "report.categories.legal": "Cyfreithiol",
diff --git a/app/javascript/mastodon/locales/da.json b/app/javascript/mastodon/locales/da.json
index 5d6cac69d83108..548421b3c03d3b 100644
--- a/app/javascript/mastodon/locales/da.json
+++ b/app/javascript/mastodon/locales/da.json
@@ -145,11 +145,9 @@
   "compose_form.lock_disclaimer": "Din konto er ikke {locked}. Enhver kan følge dig og se indlæg kun beregnet for følgere.",
   "compose_form.lock_disclaimer.lock": "låst",
   "compose_form.placeholder": "Hvad tænker du på?",
-  "compose_form.poll.add_option": "Tilføj mulighed",
   "compose_form.poll.duration": "Afstemningens varighed",
   "compose_form.poll.multiple": "Multivalg",
   "compose_form.poll.option_placeholder": "Valgmulighed {number}",
-  "compose_form.poll.remove_option": "Fjern denne valgmulighed",
   "compose_form.poll.single": "Vælg én",
   "compose_form.poll.switch_to_multiple": "Ændr afstemning til flervalgstype",
   "compose_form.poll.switch_to_single": "Ændr afstemning til enkeltvalgstype",
@@ -279,6 +277,11 @@
   "follow_request.authorize": "Godkend",
   "follow_request.reject": "Afvis",
   "follow_requests.unlocked_explanation": "Selvom din konto ikke er låst, synes {domain}-personalet, du måske bør gennemgå disse anmodninger manuelt.",
+  "follow_suggestions.dismiss": "Vis ikke igen",
+  "follow_suggestions.personalized_suggestion": "Personligt forslag",
+  "follow_suggestions.popular_suggestion": "Populært forslag",
+  "follow_suggestions.view_all": "Vis alle",
+  "follow_suggestions.who_to_follow": "Hvem, som skal følges",
   "followed_tags": "Hashtag, som følges",
   "footer.about": "Om",
   "footer.directory": "Profiloversigt",
@@ -305,13 +308,9 @@
   "hashtag.follow": "Følg hashtag",
   "hashtag.unfollow": "Stop med at følge hashtag",
   "hashtags.and_other": "…og {count, plural, one {}other {# flere}}",
-  "home.actions.go_to_explore": "Se, hvad som trender",
-  "home.actions.go_to_suggestions": "Find nogle personer at følge",
   "home.column_settings.basic": "Grundlæggende",
   "home.column_settings.show_reblogs": "Vis boosts",
   "home.column_settings.show_replies": "Vis svar",
-  "home.explore_prompt.body": "Dit hjemmefeed vil have en blanding af indlæg fra de hashtags, du har valgt at følge, de personer, du har valgt at følge, og de indlæg, de booster. Hvis her virker for stille, kan du prøve:",
-  "home.explore_prompt.title": "Dette er din hjemmebase i Mastodon.",
   "home.hide_announcements": "Skjul bekendtgørelser",
   "home.pending_critical_update.body": "Opdater din Mastodon-server snarest muligt!",
   "home.pending_critical_update.link": "Se opdateringer",
diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json
index a6dd098bb20049..cb90252c7f73e3 100644
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@@ -145,11 +145,9 @@
   "compose_form.lock_disclaimer": "Dein Profil ist nicht {locked}. Andere können dir folgen und deine Beiträge sehen, die nur für Follower bestimmt sind.",
   "compose_form.lock_disclaimer.lock": "geschützt",
   "compose_form.placeholder": "Was gibt’s Neues?",
-  "compose_form.poll.add_option": "Auswahl hinzufügen",
   "compose_form.poll.duration": "Umfragedauer",
   "compose_form.poll.multiple": "Mehrfachauswahl",
   "compose_form.poll.option_placeholder": "{number}. Auswahlmöglichkeit",
-  "compose_form.poll.remove_option": "Dieses Auswahlfeld entfernen",
   "compose_form.poll.single": "Einfachauswahl",
   "compose_form.poll.switch_to_multiple": "Mehrfachauswahl erlauben",
   "compose_form.poll.switch_to_single": "Nur Einfachauswahl erlauben",
@@ -279,6 +277,12 @@
   "follow_request.authorize": "Genehmigen",
   "follow_request.reject": "Ablehnen",
   "follow_requests.unlocked_explanation": "Auch wenn dein Konto öffentlich bzw. nicht geschützt ist, haben die Moderator*innen von {domain} gedacht, dass du diesen Follower lieber manuell bestätigen solltest.",
+  "follow_suggestions.curated_suggestion": "Vom Server empfohlen",
+  "follow_suggestions.dismiss": "Nicht mehr anzeigen",
+  "follow_suggestions.personalized_suggestion": "Personalisierte Empfehlung",
+  "follow_suggestions.popular_suggestion": "Beliebte Empfehlung",
+  "follow_suggestions.view_all": "Alle anzeigen",
+  "follow_suggestions.who_to_follow": "Empfohlene Profile",
   "followed_tags": "Gefolgte Hashtags",
   "footer.about": "Über",
   "footer.directory": "Profilverzeichnis",
@@ -305,13 +309,9 @@
   "hashtag.follow": "Hashtag folgen",
   "hashtag.unfollow": "Hashtag entfolgen",
   "hashtags.and_other": "… und {count, plural, one{# weiterer} other {# weitere}}",
-  "home.actions.go_to_explore": "Trends ansehen",
-  "home.actions.go_to_suggestions": "Profile zum Folgen finden",
   "home.column_settings.basic": "Allgemein",
   "home.column_settings.show_reblogs": "Geteilte Beiträge anzeigen",
   "home.column_settings.show_replies": "Antworten anzeigen",
-  "home.explore_prompt.body": "Deine Startseite wird eine Mischung aus Beiträgen mit Hashtags und den Profilen, denen du folgst sowie den Beiträgen, die sie teilen, enthalten. Sollte es sich zu still anfühlen:",
-  "home.explore_prompt.title": "Das ist dein Zuhause bei Mastodon.",
   "home.hide_announcements": "Ankündigungen ausblenden",
   "home.pending_critical_update.body": "Bitte aktualisiere deinen Mastodon-Server so schnell wie möglich!",
   "home.pending_critical_update.link": "Updates ansehen",
diff --git a/app/javascript/mastodon/locales/el.json b/app/javascript/mastodon/locales/el.json
index 068d2289066738..a5ed320831c7e7 100644
--- a/app/javascript/mastodon/locales/el.json
+++ b/app/javascript/mastodon/locales/el.json
@@ -140,11 +140,9 @@
   "compose_form.lock_disclaimer": "Ο λογαριασμός σου δεν είναι {locked}. Οποιοσδήποτε μπορεί να σε ακολουθήσει για να δει τις δημοσιεύσεις σου προς τους ακολούθους σου.",
   "compose_form.lock_disclaimer.lock": "κλειδωμένο",
   "compose_form.placeholder": "Τι σκέφτεσαι;",
-  "compose_form.poll.add_option": "Προσθήκη επιλογής",
   "compose_form.poll.duration": "Διάρκεια δημοσκόπησης",
   "compose_form.poll.multiple": "Πολλαπλή επιλογή",
   "compose_form.poll.option_placeholder": "Επιλογή {number}",
-  "compose_form.poll.remove_option": "Αφαίρεση επιλογής",
   "compose_form.poll.switch_to_multiple": "Ενημέρωση δημοσκόπησης με πολλαπλές επιλογές",
   "compose_form.poll.switch_to_single": "Ενημέρωση δημοσκόπησης με μοναδική επιλογή",
   "compose_form.poll.type": "Στυλ",
@@ -291,12 +289,9 @@
   "hashtag.column_settings.tag_toggle": "Προσθήκη επιπλέον ταμπελών για την κολώνα",
   "hashtag.follow": "Παρακολούθηση ετικέτας",
   "hashtag.unfollow": "Διακοπή παρακολούθησης ετικέτας",
-  "home.actions.go_to_suggestions": "Βρείτε άτομα για να ακολουθήσετε",
   "home.column_settings.basic": "Βασικές ρυθμίσεις",
   "home.column_settings.show_reblogs": "Εμφάνιση προωθήσεων",
   "home.column_settings.show_replies": "Εμφάνιση απαντήσεων",
-  "home.explore_prompt.body": "Your home feed will have a mix of posts from the hashtags you've chosen to follow, the people you've chosen to follow, and the posts they boost. If that feels too quiet, you may want to:\nΗ τροφοδοσία της αρχικής σελίδας σας είναι ένα μίγμα από αναρτήσεις με τις ετικέτες και τα άτομα που επιλέξατε να ακολουθείτε, και τις αναρτήσεις που προωθούν. Εάν αυτό σας φαίνεται πολύ ήσυχο, μπορεί να θέλετε:",
-  "home.explore_prompt.title": "Αυτό είναι το σπίτι σας στο Mastodon.",
   "home.hide_announcements": "Απόκρυψη ανακοινώσεων",
   "home.pending_critical_update.link": "Δείτε ενημερώσεις",
   "home.pending_critical_update.title": "Κρίσιμη ενημέρωση ασφαλείας διαθέσιμη!",
diff --git a/app/javascript/mastodon/locales/en-GB.json b/app/javascript/mastodon/locales/en-GB.json
index 2cf1b4dbaec4fb..3431d95cb6ec4f 100644
--- a/app/javascript/mastodon/locales/en-GB.json
+++ b/app/javascript/mastodon/locales/en-GB.json
@@ -32,6 +32,7 @@
   "account.featured_tags.last_status_never": "No posts",
   "account.featured_tags.title": "{name}'s featured hashtags",
   "account.follow": "Follow",
+  "account.follow_back": "Follow back",
   "account.followers": "Followers",
   "account.followers.empty": "No one follows this user yet.",
   "account.followers_counter": "{count, plural, one {{counter} Follower} other {{counter} Followers}}",
@@ -52,6 +53,7 @@
   "account.mute_notifications_short": "Mute notifications",
   "account.mute_short": "Mute",
   "account.muted": "Muted",
+  "account.mutual": "Mutual",
   "account.no_bio": "No description provided.",
   "account.open_original_page": "Open original page",
   "account.posts": "Posts",
@@ -144,11 +146,19 @@
   "compose_form.lock_disclaimer.lock": "locked",
   "compose_form.placeholder": "What's on your mind?",
   "compose_form.poll.duration": "Poll duration",
+  "compose_form.poll.multiple": "Multiple choice",
+  "compose_form.poll.option_placeholder": "Option {number}",
+  "compose_form.poll.single": "Pick one",
   "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
   "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
+  "compose_form.poll.type": "Style",
+  "compose_form.publish": "Post",
   "compose_form.publish_form": "New post",
+  "compose_form.reply": "Reply",
+  "compose_form.save_changes": "Update",
   "compose_form.spoiler.marked": "Remove content warning",
   "compose_form.spoiler.unmarked": "Add content warning",
+  "compose_form.spoiler_placeholder": "Content warning (optional)",
   "confirmation_modal.cancel": "Cancel",
   "confirmations.block.block_and_report": "Block & Report",
   "confirmations.block.confirm": "Block",
@@ -267,6 +277,12 @@
   "follow_request.authorize": "Authorise",
   "follow_request.reject": "Reject",
   "follow_requests.unlocked_explanation": "Even though your account is not locked, the {domain} staff thought you might want to review follow requests from these accounts manually.",
+  "follow_suggestions.curated_suggestion": "Editors' Choice",
+  "follow_suggestions.dismiss": "Don't show again",
+  "follow_suggestions.personalized_suggestion": "Personalised suggestion",
+  "follow_suggestions.popular_suggestion": "Popular suggestion",
+  "follow_suggestions.view_all": "View all",
+  "follow_suggestions.who_to_follow": "Who to follow",
   "followed_tags": "Followed hashtags",
   "footer.about": "About",
   "footer.directory": "Profiles directory",
@@ -293,13 +309,9 @@
   "hashtag.follow": "Follow hashtag",
   "hashtag.unfollow": "Unfollow hashtag",
   "hashtags.and_other": "…and {count, plural, one {}other {# more}}",
-  "home.actions.go_to_explore": "See what's trending",
-  "home.actions.go_to_suggestions": "Find people to follow",
   "home.column_settings.basic": "Basic",
   "home.column_settings.show_reblogs": "Show boosts",
   "home.column_settings.show_replies": "Show replies",
-  "home.explore_prompt.body": "Your home feed will have a mix of posts from the hashtags you've chosen to follow, the people you've chosen to follow, and the posts they boost. If that feels too quiet, you may want to:",
-  "home.explore_prompt.title": "This is your home base within Mastodon.",
   "home.hide_announcements": "Hide announcements",
   "home.pending_critical_update.body": "Please update your Mastodon server as soon as possible!",
   "home.pending_critical_update.link": "See updates",
@@ -512,7 +524,15 @@
   "poll_button.add_poll": "Add a poll",
   "poll_button.remove_poll": "Remove poll",
   "privacy.change": "Change post privacy",
+  "privacy.direct.long": "Everyone mentioned in the post",
+  "privacy.direct.short": "Specific people",
+  "privacy.private.long": "Only your followers",
+  "privacy.private.short": "Followers",
+  "privacy.public.long": "Anyone on and off Mastodon",
   "privacy.public.short": "Public",
+  "privacy.unlisted.additional": "This behaves exactly like public, except the post will not appear in live feeds or hashtags, explore, or Mastodon search, even if you are opted-in account-wide.",
+  "privacy.unlisted.long": "Fewer algorithmic fanfares",
+  "privacy.unlisted.short": "Quiet public",
   "privacy_policy.last_updated": "Last updated {date}",
   "privacy_policy.title": "Privacy Policy",
   "recommended": "Recommended",
@@ -530,7 +550,9 @@
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "today",
+  "reply_indicator.attachments": "{count, plural, one {# attachment} other {# attachments}}",
   "reply_indicator.cancel": "Cancel",
+  "reply_indicator.poll": "Poll",
   "report.block": "Block",
   "report.block_explanation": "You will not see their posts. They will not be able to see your posts or follow you. They will be able to tell that they are blocked.",
   "report.categories.legal": "Legal",
diff --git a/app/javascript/mastodon/locales/eo.json b/app/javascript/mastodon/locales/eo.json
index 907a918af08d53..887d754a4094a4 100644
--- a/app/javascript/mastodon/locales/eo.json
+++ b/app/javascript/mastodon/locales/eo.json
@@ -295,13 +295,9 @@
   "hashtag.follow": "Sekvi la kradvorton",
   "hashtag.unfollow": "Ne plu sekvi la kradvorton",
   "hashtags.and_other": "…kaj {count, plural,other {# pli}}",
-  "home.actions.go_to_explore": "Vidi kio populariĝas",
-  "home.actions.go_to_suggestions": "Trovi homojn por sekvi",
   "home.column_settings.basic": "Bazaj agordoj",
   "home.column_settings.show_reblogs": "Montri diskonigojn",
   "home.column_settings.show_replies": "Montri respondojn",
-  "home.explore_prompt.body": "Via hejmafiŝaro havos miksitajn afiŝojn de kradvortoj kiujn vi elektis sekvi, personoj kiujn vi elektis sekvi, kaj afiŝoj kiujn ili suprenigis.",
-  "home.explore_prompt.title": "Ĉi tio estas via hejma paĝo en Mastodon.",
   "home.hide_announcements": "Kaŝi la anoncojn",
   "home.pending_critical_update.body": "Ĝisdatigu vian servilon de Mastodon kiel eble plej baldau!",
   "home.pending_critical_update.link": "Vidi ĝisdatigojn",
diff --git a/app/javascript/mastodon/locales/es-AR.json b/app/javascript/mastodon/locales/es-AR.json
index 8816f18af64e1c..87ab62cda27f34 100644
--- a/app/javascript/mastodon/locales/es-AR.json
+++ b/app/javascript/mastodon/locales/es-AR.json
@@ -146,14 +146,13 @@
   "compose_form.lock_disclaimer.lock": "privada",
   "compose_form.placeholder": "¿Qué onda?",
   "compose_form.poll.duration": "Duración de la encuesta",
-  "compose_form.poll.multiple": "Selección múltiple",
+  "compose_form.poll.multiple": "Múltiples opciones",
   "compose_form.poll.option_placeholder": "Opción {number}",
-  "compose_form.poll.remove_option": "Quitar esta opción",
-  "compose_form.poll.single": "Elige uno",
+  "compose_form.poll.single": "Elegí una",
   "compose_form.poll.switch_to_multiple": "Cambiar encuesta para permitir opciones múltiples",
   "compose_form.poll.switch_to_single": "Cambiar encuesta para permitir una sola opción",
   "compose_form.poll.type": "Estilo",
-  "compose_form.publish": "Publicar",
+  "compose_form.publish": "Enviar",
   "compose_form.publish_form": "Nuevo mensaje",
   "compose_form.reply": "Responder",
   "compose_form.save_changes": "Actualizar",
@@ -278,6 +277,12 @@
   "follow_request.authorize": "Autorizar",
   "follow_request.reject": "Rechazar",
   "follow_requests.unlocked_explanation": "A pesar de que tu cuenta no es privada, el equipo de {domain} pensó que podrías querer revisar manualmente las solicitudes de seguimiento de estas cuentas.",
+  "follow_suggestions.curated_suggestion": "Cuentas elegidas del servidor",
+  "follow_suggestions.dismiss": "No mostrar de nuevo",
+  "follow_suggestions.personalized_suggestion": "Sugerencia personalizada",
+  "follow_suggestions.popular_suggestion": "Sugerencia popular",
+  "follow_suggestions.view_all": "Ver todo",
+  "follow_suggestions.who_to_follow": "A quién seguir",
   "followed_tags": "Etiquetas seguidas",
   "footer.about": "Información",
   "footer.directory": "Directorio de perfiles",
@@ -304,13 +309,9 @@
   "hashtag.follow": "Seguir etiqueta",
   "hashtag.unfollow": "Dejar de seguir etiqueta",
   "hashtags.and_other": "…y {count, plural, other {# más}}",
-  "home.actions.go_to_explore": "Ver qué está en tendencia",
-  "home.actions.go_to_suggestions": "Encontrar cuentas para seguir",
   "home.column_settings.basic": "Básico",
   "home.column_settings.show_reblogs": "Mostrar adhesiones",
   "home.column_settings.show_replies": "Mostrar respuestas",
-  "home.explore_prompt.body": "Tu línea temporal principal tendrá una mezcla de mensajes de etiquetas que hayás decidido seguir, cuentas que hayás seguido y mensajes a los que éstas adhieran. Si está muy tranquilo por acá, quizás quieras:",
-  "home.explore_prompt.title": "Este es tu inicio en Mastodon.",
   "home.hide_announcements": "Ocultar anuncios",
   "home.pending_critical_update.body": "Por favor, ¡actualizá tu servidor de Mastodon lo antes posible!",
   "home.pending_critical_update.link": "Ver actualizaciones",
@@ -523,10 +524,15 @@
   "poll_button.add_poll": "Agregar encuesta",
   "poll_button.remove_poll": "Quitar encuesta",
   "privacy.change": "Configurar privacidad del mensaje",
-  "privacy.direct.short": "Personas específicas",
+  "privacy.direct.long": "Todas las cuentas mencionadas en el mensaje",
+  "privacy.direct.short": "Cuentas específicas",
   "privacy.private.long": "Solo tus seguidores",
   "privacy.private.short": "Seguidores",
+  "privacy.public.long": "Cualquier persona dentro y fuera de Mastodon",
   "privacy.public.short": "Público",
+  "privacy.unlisted.additional": "Esto se comporta exactamente igual que con la configuración de privacidad de mensaje \"Público\", excepto que el mensaje no aparecerá en los líneas temporales en vivo, ni en las etiquetas, ni en la línea temporal \"Explorá\", ni en la búsqueda de Mastodon; incluso si optaste por hacer tu cuenta visible.",
+  "privacy.unlisted.long": "Menos fanfarrias algorítmicas",
+  "privacy.unlisted.short": "Público silencioso",
   "privacy_policy.last_updated": "Última actualización: {date}",
   "privacy_policy.title": "Política de privacidad",
   "recommended": "Opción recomendada",
@@ -544,7 +550,9 @@
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "hoy",
+  "reply_indicator.attachments": "{count, plural,one {# adjunto} other {# adjuntos}}",
   "reply_indicator.cancel": "Cancelar",
+  "reply_indicator.poll": "Encuesta",
   "report.block": "Bloquear",
   "report.block_explanation": "No verás sus mensajes. No podrán ver tus mensajes ni seguirte. Se van a dar cuentra de que están bloqueados.",
   "report.categories.legal": "Legales",
@@ -644,8 +652,8 @@
   "status.filter": "Filtrar este mensaje",
   "status.filtered": "Filtrado",
   "status.hide": "Ocultar mensaje",
-  "status.history.created": "Creado por {name} el {date}",
-  "status.history.edited": "Editado por {name} el {date}",
+  "status.history.created": "Creado por {name}, {date}",
+  "status.history.edited": "Editado por {name}, {date}",
   "status.load_more": "Cargar más",
   "status.media.open": "Clic para abrir",
   "status.media.show": "Clic para mostrar",
diff --git a/app/javascript/mastodon/locales/es-MX.json b/app/javascript/mastodon/locales/es-MX.json
index fdc57ac6d61aa3..95b87b26dd3cf7 100644
--- a/app/javascript/mastodon/locales/es-MX.json
+++ b/app/javascript/mastodon/locales/es-MX.json
@@ -145,11 +145,9 @@
   "compose_form.lock_disclaimer": "Tu cuenta no está bloqueada. Todos pueden seguirte para ver tus toots solo para seguidores.",
   "compose_form.lock_disclaimer.lock": "bloqueado",
   "compose_form.placeholder": "¿En qué estás pensando?",
-  "compose_form.poll.add_option": "Agregar opción",
   "compose_form.poll.duration": "Duración de la encuesta",
   "compose_form.poll.multiple": "Selección múltiple",
   "compose_form.poll.option_placeholder": "Opción {number}",
-  "compose_form.poll.remove_option": "Eliminar esta opción",
   "compose_form.poll.single": "Seleccione uno",
   "compose_form.poll.switch_to_multiple": "Modificar encuesta para permitir múltiples opciones",
   "compose_form.poll.switch_to_single": "Modificar encuesta para permitir una única opción",
@@ -279,6 +277,12 @@
   "follow_request.authorize": "Autorizar",
   "follow_request.reject": "Rechazar",
   "follow_requests.unlocked_explanation": "A pesar de que tu cuenta no es privada, el personal de {domain} ha pensado que quizás deberías revisar manualmente las solicitudes de seguimiento de estas cuentas.",
+  "follow_suggestions.curated_suggestion": "Recomendaciones del equipo",
+  "follow_suggestions.dismiss": "No mostrar de nuevo",
+  "follow_suggestions.personalized_suggestion": "Sugerencia personalizada",
+  "follow_suggestions.popular_suggestion": "Sugerencia popular",
+  "follow_suggestions.view_all": "Ver todo",
+  "follow_suggestions.who_to_follow": "A quién seguir",
   "followed_tags": "Hashtags seguidos",
   "footer.about": "Acerca de",
   "footer.directory": "Directorio de perfiles",
@@ -305,13 +309,9 @@
   "hashtag.follow": "Seguir etiqueta",
   "hashtag.unfollow": "Dejar de seguir etiqueta",
   "hashtags.and_other": "…y {count, plural, other {# más}}",
-  "home.actions.go_to_explore": "Ver tendencias",
-  "home.actions.go_to_suggestions": "Encuentra gente a la que seguir",
   "home.column_settings.basic": "Básico",
   "home.column_settings.show_reblogs": "Mostrar retoots",
   "home.column_settings.show_replies": "Mostrar respuestas",
-  "home.explore_prompt.body": "Tu cronología de inicio tendrá una mezcla de publicaciones de los hashtags que has escogido seguir, las personas que has decidido seguir y las publicaciones que impulsen. Si crees que está demasiado tranquila, quizás quieras:",
-  "home.explore_prompt.title": "Este es tu punto de partida en Mastodon.",
   "home.hide_announcements": "Ocultar anuncios",
   "home.pending_critical_update.body": "¡Por favor actualiza tu servidor Mastodon lo antes posible!",
   "home.pending_critical_update.link": "Ver actualizaciones",
diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json
index 2e4ea93177a6fc..d5e8f4239eeb4c 100644
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@@ -148,7 +148,6 @@
   "compose_form.poll.duration": "Duración de la encuesta",
   "compose_form.poll.multiple": "Selección múltiple",
   "compose_form.poll.option_placeholder": "Opción {number}",
-  "compose_form.poll.remove_option": "Quitar esta opción",
   "compose_form.poll.single": "Elige uno",
   "compose_form.poll.switch_to_multiple": "Modificar encuesta para permitir múltiples opciones",
   "compose_form.poll.switch_to_single": "Modificar encuesta para permitir una única opción",
@@ -278,6 +277,12 @@
   "follow_request.authorize": "Autorizar",
   "follow_request.reject": "Rechazar",
   "follow_requests.unlocked_explanation": "A pesar de que tu cuenta no es privada, el personal de {domain} ha pensado que quizás deberías revisar manualmente las solicitudes de seguimiento de estas cuentas.",
+  "follow_suggestions.curated_suggestion": "Recomendaciones del equipo",
+  "follow_suggestions.dismiss": "No mostrar de nuevo",
+  "follow_suggestions.personalized_suggestion": "Sugerencia personalizada",
+  "follow_suggestions.popular_suggestion": "Sugerencia popular",
+  "follow_suggestions.view_all": "Ver todo",
+  "follow_suggestions.who_to_follow": "A quién seguir",
   "followed_tags": "Etiquetas seguidas",
   "footer.about": "Acerca de",
   "footer.directory": "Directorio de perfiles",
@@ -304,13 +309,9 @@
   "hashtag.follow": "Seguir etiqueta",
   "hashtag.unfollow": "Dejar de seguir etiqueta",
   "hashtags.and_other": "…y {count, plural, other {# más}}",
-  "home.actions.go_to_explore": "Ver tendencias",
-  "home.actions.go_to_suggestions": "Encuentra personas a las que seguir",
   "home.column_settings.basic": "Básico",
   "home.column_settings.show_reblogs": "Mostrar impulsos",
   "home.column_settings.show_replies": "Mostrar respuestas",
-  "home.explore_prompt.body": "Tu cronología de inicio tendrá una mezcla de publicaciones de las etiquetas que has escogido seguir, las personas que has decidido seguir y las publicaciones que impulsen. Si crees que está demasiado tranquila, quizás quieras:",
-  "home.explore_prompt.title": "Este es tu punto de partida en Mastodon.",
   "home.hide_announcements": "Ocultar anuncios",
   "home.pending_critical_update.body": "Por favor, ¡actualiza tu servidor Mastodon lo antes posible!",
   "home.pending_critical_update.link": "Ver actualizaciones",
@@ -523,10 +524,13 @@
   "poll_button.add_poll": "Añadir una encuesta",
   "poll_button.remove_poll": "Eliminar encuesta",
   "privacy.change": "Ajustar privacidad",
+  "privacy.direct.long": "Todos los mencionados en el post",
   "privacy.direct.short": "Personas específicas",
   "privacy.private.long": "Solo tus seguidores",
   "privacy.private.short": "Seguidores",
+  "privacy.public.long": "Cualquiera dentro y fuera de Mastodon",
   "privacy.public.short": "Público",
+  "privacy.unlisted.short": "Público tranquilo",
   "privacy_policy.last_updated": "Actualizado por última vez {date}",
   "privacy_policy.title": "Política de Privacidad",
   "recommended": "Recomendado",
@@ -545,6 +549,7 @@
   "relative_time.seconds": "{number} s",
   "relative_time.today": "hoy",
   "reply_indicator.cancel": "Cancelar",
+  "reply_indicator.poll": "Encuesta",
   "report.block": "Bloquear",
   "report.block_explanation": "No verás sus publicaciones. No podrán ver tus publicaciones ni seguirte. Podrán saber que están bloqueados.",
   "report.categories.legal": "Legal",
diff --git a/app/javascript/mastodon/locales/et.json b/app/javascript/mastodon/locales/et.json
index 5034c25541005e..be8bec616d0c79 100644
--- a/app/javascript/mastodon/locales/et.json
+++ b/app/javascript/mastodon/locales/et.json
@@ -145,11 +145,9 @@
   "compose_form.lock_disclaimer": "Su konto ei ole {locked}. Igaüks saab sind jälgida, et näha su ainult-jälgijatele postitusi.",
   "compose_form.lock_disclaimer.lock": "lukus",
   "compose_form.placeholder": "Millest mõtled?",
-  "compose_form.poll.add_option": "Lisa valik",
   "compose_form.poll.duration": "Küsitluse kestus",
   "compose_form.poll.multiple": "Valikvastustega",
   "compose_form.poll.option_placeholder": "Valik {number}",
-  "compose_form.poll.remove_option": "Eemalda see valik",
   "compose_form.poll.single": "Vali üks",
   "compose_form.poll.switch_to_multiple": "Muuda küsitlust mitmikvaliku lubamiseks",
   "compose_form.poll.switch_to_single": "Muuda küsitlust ainult ühe valiku lubamiseks",
@@ -305,13 +303,9 @@
   "hashtag.follow": "Jälgi silti",
   "hashtag.unfollow": "Lõpeta sildi jälgimine",
   "hashtags.and_other": "…ja {count, plural, one {}other {# veel}}",
-  "home.actions.go_to_explore": "Vaata, mis on populaarne",
-  "home.actions.go_to_suggestions": "Leia inimesi, keda jälgida",
   "home.column_settings.basic": "Peamine",
   "home.column_settings.show_reblogs": "Näita jagamisi",
   "home.column_settings.show_replies": "Näita vastuseid",
-  "home.explore_prompt.body": "Sinu koduvoos on koos jälgimiseks valitud siltidega postitused, sinu jälgitavate inimeste postitused ja postitused, mida nad jagavad. Kui see tundub liiga vaikne, võid sa soovida:",
-  "home.explore_prompt.title": "See on sinu kodubaas Mastodonis.",
   "home.hide_announcements": "Peida teadaanded",
   "home.pending_critical_update.body": "Palun uuenda oma Mastodoni server nii ruttu kui võimalik!",
   "home.pending_critical_update.link": "Vaata uuendusi",
diff --git a/app/javascript/mastodon/locales/eu.json b/app/javascript/mastodon/locales/eu.json
index cee18e7a513cc5..e80e7fcf462592 100644
--- a/app/javascript/mastodon/locales/eu.json
+++ b/app/javascript/mastodon/locales/eu.json
@@ -132,7 +132,7 @@
   "column_header.unpin": "Desfinkatu",
   "column_subheading.settings": "Ezarpenak",
   "community.column_settings.local_only": "Lokala soilik",
-  "community.column_settings.media_only": "Multimedia besterik ez",
+  "community.column_settings.media_only": "Edukiak soilik",
   "community.column_settings.remote_only": "Urrunekoa soilik",
   "compose.language.change": "Aldatu hizkuntza",
   "compose.language.search": "Bilatu hizkuntzak...",
@@ -145,11 +145,9 @@
   "compose_form.lock_disclaimer": "Zure kontua ez dago {locked}. Edonork jarraitu zaitzake zure jarraitzaileentzako soilik diren bidalketak ikusteko.",
   "compose_form.lock_disclaimer.lock": "giltzapetuta",
   "compose_form.placeholder": "Zer duzu buruan?",
-  "compose_form.poll.add_option": "Gehitu aukera",
   "compose_form.poll.duration": "Inkestaren iraupena",
   "compose_form.poll.multiple": "Aukera aniza",
   "compose_form.poll.option_placeholder": "{number}. aukera",
-  "compose_form.poll.remove_option": "Kendu aukera hau",
   "compose_form.poll.single": "Hautatu bat",
   "compose_form.poll.switch_to_multiple": "Aldatu inkesta hainbat aukera onartzeko",
   "compose_form.poll.switch_to_single": "Aldatu inkesta aukera bakarra onartzeko",
@@ -279,6 +277,12 @@
   "follow_request.authorize": "Baimendu",
   "follow_request.reject": "Ukatu",
   "follow_requests.unlocked_explanation": "Zure kontua blokeatuta ez badago ere, {domain} domeinuko arduradunek uste dute kontu hauetako jarraipen eskaerak agian eskuz begiratu nahiko dituzula.",
+  "follow_suggestions.curated_suggestion": "Zerbitzariaren iradokizunak",
+  "follow_suggestions.dismiss": "Ez erakutsi berriro",
+  "follow_suggestions.personalized_suggestion": "Iradokizun pertsonalizatua",
+  "follow_suggestions.popular_suggestion": "Iradokizun ezaguna",
+  "follow_suggestions.view_all": "Ikusi denak",
+  "follow_suggestions.who_to_follow": "Zein jarraitu",
   "followed_tags": "Jarraitutako traolak",
   "footer.about": "Honi buruz",
   "footer.directory": "Profil-direktorioa",
@@ -305,13 +309,9 @@
   "hashtag.follow": "Jarraitu traolari",
   "hashtag.unfollow": "Utzi traola jarraitzeari",
   "hashtags.and_other": "…eta {count, plural, one {}other {# gehiago}}",
-  "home.actions.go_to_explore": "Ikusi zer dagoen pil-pilean",
-  "home.actions.go_to_suggestions": "Aurkitu jendea jarraitzeko",
   "home.column_settings.basic": "Oinarrizkoa",
   "home.column_settings.show_reblogs": "Erakutsi bultzadak",
   "home.column_settings.show_replies": "Erakutsi erantzunak",
-  "home.explore_prompt.body": "Zure hasierako jarioak jarraitzeko aukeratu dituzun traolen, jarraitzeko aukeratu duzun jendearen eta beraiek bultzatutako argitalpenen nahasketa bat edukiko du. Nahiko isila dirudi oraintxe, beraz, zergatik ez:",
-  "home.explore_prompt.title": "Hau zure hasiera da Mastodonen.",
   "home.hide_announcements": "Ezkutatu iragarpenak",
   "home.pending_critical_update.body": "Eguneratu zure Mastodoneko zerbitzaria leheinbailehen!",
   "home.pending_critical_update.link": "Ikusi eguneraketak",
@@ -356,7 +356,7 @@
   "keyboard_shortcuts.muted": "mutututako erabiltzaileen zerrenda irekitzeko",
   "keyboard_shortcuts.my_profile": "zure profila irekitzeko",
   "keyboard_shortcuts.notifications": "jakinarazpenen zutabea irekitzeko",
-  "keyboard_shortcuts.open_media": "media zabaltzeko",
+  "keyboard_shortcuts.open_media": "Ireki edukia",
   "keyboard_shortcuts.pinned": "Ireki finkatutako bidalketen zerrenda",
   "keyboard_shortcuts.profile": "egilearen profila irekitzeko",
   "keyboard_shortcuts.reply": "Erantzun bidalketari",
diff --git a/app/javascript/mastodon/locales/fa.json b/app/javascript/mastodon/locales/fa.json
index 0b078d1ab3c676..4050ca9f9f7b8f 100644
--- a/app/javascript/mastodon/locales/fa.json
+++ b/app/javascript/mastodon/locales/fa.json
@@ -145,11 +145,9 @@
   "compose_form.lock_disclaimer": "حسابتان {locked} نیست. هر کسی می‌تواند پی‌گیرتان شده و فرسته‌های ویژهٔ پی‌گیرانتان را ببیند.",
   "compose_form.lock_disclaimer.lock": "قفل‌شده",
   "compose_form.placeholder": "تازه چه خبر؟",
-  "compose_form.poll.add_option": "افزودن گزینه",
   "compose_form.poll.duration": "مدت نظرسنجی",
   "compose_form.poll.multiple": "چند گزینه‌ای",
   "compose_form.poll.option_placeholder": "گزینهٔ {number}",
-  "compose_form.poll.remove_option": "برداشتن این گزینه",
   "compose_form.poll.single": "گزینش یکی",
   "compose_form.poll.switch_to_multiple": "تغییر نظرسنجی برای اجازه به چندین گزینه",
   "compose_form.poll.switch_to_single": "تبدیل به نظرسنجی تک‌گزینه‌ای",
@@ -305,13 +303,9 @@
   "hashtag.follow": "پی‌گرفتن برچسب",
   "hashtag.unfollow": "پی‌نگرفتن برچسب",
   "hashtags.and_other": "…و {count, plural, other {# بیش‌تر}}",
-  "home.actions.go_to_explore": "ببینید چه داغ است",
-  "home.actions.go_to_suggestions": "یافتن افراد برای پی‌گیری",
   "home.column_settings.basic": "پایه‌ای",
   "home.column_settings.show_reblogs": "نمایش تقویت‌ها",
   "home.column_settings.show_replies": "نمایش پاسخ‌ها",
-  "home.explore_prompt.body": "خوراک خانگیتان ترکیبی از فرسته‌ها از برچسب‌هایی که برای پی‌گیری گزیده‌اید، افرادی که پی می‌گیرید و فرسته‌هایی که تقویت می‌کنند را خواهد داشت. اگر خیلی خلوت به نظر می‌رسد،‌ شاید بخواهید:",
-  "home.explore_prompt.title": "این پایگاه خانگیتان در ماستودون است.",
   "home.hide_announcements": "نهفتن اعلامیه‌ها",
   "home.pending_critical_update.body": "لطفاً کارساز ماستودونتان را در نخستین فرصت به‌روز کنید!",
   "home.pending_critical_update.link": "دیدن به‌روز رسانی‌ها",
diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index 7b98f998363880..277f0f2e721641 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -2,8 +2,8 @@
   "about.blocks": "Moderoidut palvelimet",
   "about.contact": "Ota yhteys:",
   "about.disclaimer": "Mastodon on vapaa avoimen lähdekoodin ohjelmisto ja Mastodon gGmbH:n tavaramerkki.",
-  "about.domain_blocks.no_reason_available": "Syytä ei ole ilmoitettu",
-  "about.domain_blocks.preamble": "Mastodonin avulla voidaan yleensä tarkastella minkä tahansa fediversumiin kuuluvan palvelimen sisältöä ja vuorovaikuttaa eri palvelinten käyttäjien kanssa. Nämä ovat tälle palvelimelle määritetyt poikkeukset.",
+  "about.domain_blocks.no_reason_available": "Syy ei ole tiedossa",
+  "about.domain_blocks.preamble": "Mastodonin avulla voidaan yleensä tarkastella minkä tahansa fediversumiin kuuluvan palvelimen sisältöä, ja olla yhteyksissä eri palvelinten käyttäjien kanssa. Nämä poikkeukset koskevat yksin tätä palvelinta.",
   "about.domain_blocks.silenced.explanation": "Et yleensä näe tämän palvelimen profiileja ja sisältöä, jollet erityisesti etsi juuri sitä tai liity siihen seuraamalla.",
   "about.domain_blocks.silenced.title": "Rajoitettu",
   "about.domain_blocks.suspended.explanation": "Mitään tämän palvelimen tietoja ei käsitellä, tallenneta tai vaihdeta, mikä tekee vuorovaikutuksesta ja viestinnästä sen käyttäjien kanssa mahdotonta.",
@@ -19,7 +19,7 @@
   "account.block_domain": "Estä verkkotunnus {domain}",
   "account.block_short": "Estä",
   "account.blocked": "Estetty",
-  "account.browse_more_on_origin_server": "Selaile lisää alkuperäisellä palvelimella",
+  "account.browse_more_on_origin_server": "Selaile kattavampaa alkuperäprofiilia",
   "account.cancel_follow_request": "Peruuta seurantapyyntö",
   "account.copy": "Kopioi linkki profiiliin",
   "account.direct": "Mainitse @{name} yksityisesti",
@@ -27,7 +27,7 @@
   "account.domain_blocked": "Verkkotunnus estetty",
   "account.edit_profile": "Muokkaa profiilia",
   "account.enable_notifications": "Ilmoita minulle, kun @{name} julkaisee",
-  "account.endorse": "Pidä esillä profiilissa",
+  "account.endorse": "Suosittele profiilissasi",
   "account.featured_tags.last_status_at": "Viimeisin julkaisu {date}",
   "account.featured_tags.last_status_never": "Ei julkaisuja",
   "account.featured_tags.title": "Käyttäjän {name} esillä pidettävät aihetunnisteet",
@@ -39,7 +39,7 @@
   "account.following": "Seuratut",
   "account.following_counter": "{count, plural, one {{counter} seurattu} other {{counter} seurattua}}",
   "account.follows.empty": "Tämä käyttäjä ei vielä seuraa ketään.",
-  "account.go_to_profile": "Avaa profiili",
+  "account.go_to_profile": "Mene profiiliin",
   "account.hide_reblogs": "Piilota käyttäjän @{name} tehostukset",
   "account.in_memoriam": "Muistoissamme.",
   "account.joined_short": "Liittynyt",
@@ -64,10 +64,10 @@
   "account.share": "Jaa käyttäjän @{name} profiili",
   "account.show_reblogs": "Näytä käyttäjän @{name} tehostukset",
   "account.statuses_counter": "{count, plural, one {{counter} julkaisu} other {{counter} julkaisua}}",
-  "account.unblock": "Poista käyttäjän @{name} esto",
-  "account.unblock_domain": "Poista verkkotunnuksen {domain} esto",
+  "account.unblock": "Kumoa käyttäjän @{name} esto",
+  "account.unblock_domain": "Kumoa verkkotunnuksen {domain} esto",
   "account.unblock_short": "Poista esto",
-  "account.unendorse": "Älä pidä esillä profiilissa",
+  "account.unendorse": "Kumoa suosittelu profiilissasi",
   "account.unfollow": "Lopeta seuraaminen",
   "account.unmute": "Poista käyttäjän @{name} mykistys",
   "account.unmute_notifications_short": "Poista ilmoitusten mykistys",
@@ -75,7 +75,7 @@
   "account_note.placeholder": "Lisää muistiinpano napsauttamalla",
   "admin.dashboard.daily_retention": "Käyttäjien pysyvyys rekisteröitymisen jälkeen päivittäin",
   "admin.dashboard.monthly_retention": "Käyttäjien pysyvyys rekisteröitymisen jälkeen kuukausittain",
-  "admin.dashboard.retention.average": "Keskimäärin",
+  "admin.dashboard.retention.average": "Keskiarvo",
   "admin.dashboard.retention.cohort": "Rekisteröitymis-kk.",
   "admin.dashboard.retention.cohort_size": "Uusia käyttäjiä",
   "admin.impact_report.instance_accounts": "Tilien profiilit, jotka tämä poistaisi",
@@ -86,7 +86,7 @@
   "alert.rate_limited.title": "Pyyntömäärää rajoitettu",
   "alert.unexpected.message": "Tapahtui odottamaton virhe.",
   "alert.unexpected.title": "Hups!",
-  "announcement.announcement": "Ilmoitus",
+  "announcement.announcement": "Tiedote",
   "attachments_list.unprocessed": "(käsittelemätön)",
   "audio.hide": "Piilota ääni",
   "boost_modal.combo": "Ensi kerralla voit ohittaa tämän painamalla {combo}",
@@ -145,14 +145,12 @@
   "compose_form.lock_disclaimer": "Tilisi ei ole {locked}. Kuka tahansa voi seurata tiliäsi ja nähdä vain seuraajille rajaamasi julkaisut.",
   "compose_form.lock_disclaimer.lock": "lukittu",
   "compose_form.placeholder": "Mitä mietit?",
-  "compose_form.poll.add_option": "Lisää vaihtoehto",
   "compose_form.poll.duration": "Äänestyksen kesto",
   "compose_form.poll.multiple": "Monivalinta",
   "compose_form.poll.option_placeholder": "Vaihtoehto {number}",
-  "compose_form.poll.remove_option": "Poista tämä vaihtoehto",
   "compose_form.poll.single": "Valitse yksi",
-  "compose_form.poll.switch_to_multiple": "Muuta äänestys monivalinnaksi",
-  "compose_form.poll.switch_to_single": "Muuta äänestys sallimaan vain yksi valinta",
+  "compose_form.poll.switch_to_multiple": "Muuta kysely monivalinnaksi",
+  "compose_form.poll.switch_to_single": "Muuta kysely sallimaan vain yksi valinta",
   "compose_form.poll.type": "Tyyli",
   "compose_form.publish": "Julkaise",
   "compose_form.publish_form": "Uusi julkaisu",
@@ -166,13 +164,13 @@
   "confirmations.block.confirm": "Estä",
   "confirmations.block.message": "Haluatko varmasti estää käyttäjän {name}?",
   "confirmations.cancel_follow_request.confirm": "Peruuta pyyntö",
-  "confirmations.cancel_follow_request.message": "Haluatko varmasti peruuttaa pyyntösi seurata profiilia {name}?",
+  "confirmations.cancel_follow_request.message": "Haluatko varmasti perua pyyntösi seurata käyttäjätiliä {name}?",
   "confirmations.delete.confirm": "Poista",
   "confirmations.delete.message": "Haluatko varmasti poistaa tämän julkaisun?",
   "confirmations.delete_list.confirm": "Poista",
   "confirmations.delete_list.message": "Haluatko varmasti poistaa tämän listan pysyvästi?",
   "confirmations.discard_edit_media.confirm": "Hylkää",
-  "confirmations.discard_edit_media.message": "Sinulla on tallentamattomia muutoksia median kuvaukseen tai esikatseluun, hylätäänkö ne silti?",
+  "confirmations.discard_edit_media.message": "Sinulla on tallentamattomia muutoksia median kuvaukseen tai esikatseluun. Hylätäänkö ne silti?",
   "confirmations.domain_block.confirm": "Estä koko verkkotunnus",
   "confirmations.domain_block.message": "Haluatko aivan varmasti estää koko verkkotunnuksen {domain}? Useimmiten muutama kohdistettu esto tai mykistys on riittävä ja suositeltava toimi. Et näe sisältöä tästä verkkotunnuksesta millään julkisilla aikajanoilla tai ilmoituksissa. Tähän verkkotunnukseen kuuluvat seuraajasi poistetaan.",
   "confirmations.edit.confirm": "Muokkaa",
@@ -182,12 +180,12 @@
   "confirmations.mute.confirm": "Mykistä",
   "confirmations.mute.explanation": "Tämä toiminto piilottaa heidän julkaisunsa sinulta – mukaan lukien ne, joissa heidät mainitaan – sallien heidän yhä nähdä julkaisusi ja seurata sinua.",
   "confirmations.mute.message": "Haluatko varmasti mykistää käyttäjän {name}?",
-  "confirmations.redraft.confirm": "Poista & palauta muokattavaksi",
+  "confirmations.redraft.confirm": "Poista ja palauta muokattavaksi",
   "confirmations.redraft.message": "Haluatko varmasti poistaa julkaisun ja tehdä siitä luonnoksen? Suosikit ja tehostukset menetetään, ja alkuperäisen julkaisun vastaukset jäävät orvoiksi.",
   "confirmations.reply.confirm": "Vastaa",
   "confirmations.reply.message": "Jos vastaat nyt, vastaus korvaa parhaillaan työstämäsi viestin. Haluatko varmasti jatkaa?",
   "confirmations.unfollow.confirm": "Lopeta seuraaminen",
-  "confirmations.unfollow.message": "Haluatko varmasti lakata seuraamasta profiilia {name}?",
+  "confirmations.unfollow.message": "Haluatko varmasti lopettaa profiilin {name} seuraamisen?",
   "conversation.delete": "Poista keskustelu",
   "conversation.mark_as_read": "Merkitse luetuksi",
   "conversation.open": "Näytä keskustelu",
@@ -201,10 +199,10 @@
   "directory.recently_active": "Hiljattain aktiiviset",
   "disabled_account_banner.account_settings": "Tilin asetukset",
   "disabled_account_banner.text": "Tilisi {disabledAccount} on tällä hetkellä poissa käytöstä.",
-  "dismissable_banner.community_timeline": "Nämä ovat viimeisimpiä julkaisuja käyttäjiltä, joiden tili sijaitsee palvelimella {domain}.",
+  "dismissable_banner.community_timeline": "Nämä ovat tuoreimpia julkaisuja käyttäjiltä, joiden tili on palvelimella {domain}.",
   "dismissable_banner.dismiss": "Hylkää",
   "dismissable_banner.explore_links": "Näitä uutisia jaetaan tänään sosiaalisessa verkossa eniten. Uusimmat ja eri käyttäjien eniten lähettämät uutiset nousevat listauksessa korkeimmalle.",
-  "dismissable_banner.explore_statuses": "Nämä sosiaalisen verkon julkaisut keräävät tänään eniten huomiota. Uusimmat, tehostetuimmat ja suosikiksi lisätyimmät nousevat listauksessa korkeimmalle.",
+  "dismissable_banner.explore_statuses": "Tänään nämä sosiaalisen verkon julkaisut keräävät eniten huomiota. Uusimmat, tehostetuimmat ja suosikeiksi lisätyimmät julkaisut nousevat listauksessa korkeammalle.",
   "dismissable_banner.explore_tags": "Nämä sosiaalisen verkon aihetunnisteet keräävät tänään eniten huomiota. Useimman käyttäjän käyttämät aihetunnisteet nousevat listauksessa korkeimmalle.",
   "dismissable_banner.public_timeline": "Nämä ovat viimeisimpiä julkaisuja sosiaalisen verkon käyttäjiltä, joita seurataan palvelimella {domain}.",
   "embed.instructions": "Upota julkaisu verkkosivullesi kopioimalla alla oleva koodi.",
@@ -216,18 +214,18 @@
   "emoji_button.food": "Ruoka ja juoma",
   "emoji_button.label": "Lisää emoji",
   "emoji_button.nature": "Luonto",
-  "emoji_button.not_found": "Vastaavia emojeja ei löytynyt",
+  "emoji_button.not_found": "Vastaavia emojeita ei löytynyt",
   "emoji_button.objects": "Esineet",
   "emoji_button.people": "Ihmiset",
   "emoji_button.recent": "Usein käytetyt",
-  "emoji_button.search": "Hae...",
+  "emoji_button.search": "Etsi...",
   "emoji_button.search_results": "Hakutulokset",
   "emoji_button.symbols": "Symbolit",
   "emoji_button.travel": "Matkailu ja paikat",
-  "empty_column.account_hides_collections": "Käyttäjä on päättänyt olla julkaisematta näitä tietoja",
+  "empty_column.account_hides_collections": "Käyttäjä on päättänyt pitää nämä tiedot yksityisinä",
   "empty_column.account_suspended": "Tili jäädytetty",
   "empty_column.account_timeline": "Ei viestejä täällä.",
-  "empty_column.account_unavailable": "Profiilia ei löydy",
+  "empty_column.account_unavailable": "Profiilia ei ole saatavilla",
   "empty_column.blocks": "Et ole vielä estänyt käyttäjiä.",
   "empty_column.bookmarked_statuses": "Et ole vielä lisännyt julkaisuja kirjanmerkkeihisi. Kun lisäät yhden, se näkyy tässä.",
   "empty_column.community": "Paikallinen aikajana on tyhjä. Kirjoita jotain julkista, niin homma lähtee käyntiin!",
@@ -238,17 +236,17 @@
   "empty_column.favourites": "Kukaan ei ole vielä lisännyt tätä julkaisua suosikkeihinsa. Kun joku tekee niin, tulee hän tähän näkyviin.",
   "empty_column.follow_requests": "Et ole vielä vastaanottanut seuraamispyyntöjä. Saamasi pyynnöt näkyvät täällä.",
   "empty_column.followed_tags": "Et seuraa vielä yhtäkään aihetunnistetta. Kun alat seurata, ne tulevat tähän näkyviin.",
-  "empty_column.hashtag": "Tällä aihetunnisteella ei ole vielä mitään.",
+  "empty_column.hashtag": "Tällä aihetunnisteella ei löydy vielä sisältöä.",
   "empty_column.home": "Kotiaikajanasi on tyhjä! Seuraa useampia henkilöjä, niin näet enemmän sisältöä.",
   "empty_column.list": "Tällä listalla ei ole vielä mitään. Kun tämän listan jäsenet lähettävät uusia julkaisuja, ne näkyvät tässä.",
   "empty_column.lists": "Sinulla ei ole vielä yhtään listaa. Kun luot sellaisen, näkyy se tässä.",
   "empty_column.mutes": "Et ole mykistänyt vielä yhtään käyttäjää.",
   "empty_column.notifications": "Sinulla ei ole vielä ilmoituksia. Kun keskustelet muille, näet sen täällä.",
   "empty_column.public": "Täällä ei ole mitään! Kirjoita jotain julkisesti. Voit myös seurata muiden palvelimien käyttäjiä",
-  "error.unexpected_crash.explanation": "Sivua ei voi näyttää oikein, johtuen bugista tai ongelmasta selaimen yhteensopivuudessa.",
+  "error.unexpected_crash.explanation": "Sivua ei voida näyttää oikein ohjelmointivirheen tai selaimen yhteensopivuusvajeen vuoksi.",
   "error.unexpected_crash.explanation_addons": "Sivua ei voitu näyttää oikein. Tämä virhe johtuu todennäköisesti selaimen lisäosasta tai automaattisista käännöstyökaluista.",
   "error.unexpected_crash.next_steps": "Kokeile päivittää sivu. Jos se ei auta, voi Mastodonin käyttö ehkä onnistua eri selaimella tai natiivisovelluksella.",
-  "error.unexpected_crash.next_steps_addons": "Yritä poistaa ne käytöstä ja päivittää sivu. Jos se ei auta, voit silti käyttää Mastodonia eri selaimen tai sovelluksen kautta.",
+  "error.unexpected_crash.next_steps_addons": "Yritä poistaa ne käytöstä, ja virkistä sitten sivunlataus. Mikäli ongelma jatkuu, voit mahdollisesti käyttää Mastodonia eri selaimella tai natiivilla sovelluksella.",
   "errors.unexpected_crash.copy_stacktrace": "Kopioi pinon jäljitys leikepöydälle",
   "errors.unexpected_crash.report_issue": "Ilmoita ongelmasta",
   "explore.search_results": "Hakutulokset",
@@ -257,13 +255,13 @@
   "explore.trending_links": "Uutiset",
   "explore.trending_statuses": "Julkaisut",
   "explore.trending_tags": "Aihetunnisteet",
-  "filter_modal.added.context_mismatch_explanation": "Tämä suodatinluokka ei koske kontekstia, jossa olet tarkastellut tätä julkaisua. Jos haluat, että julkaisu suodatetaan myös tässä kontekstissa, sinun pitää muokata suodatinta.",
-  "filter_modal.added.context_mismatch_title": "Konteksti ei täsmää!",
-  "filter_modal.added.expired_explanation": "Tämä suodatinluokka on vanhentunut, joten sinun on muutettava viimeistä voimassaolopäivää, jotta suodatin on voimassa.",
+  "filter_modal.added.context_mismatch_explanation": "Tämä suodatinluokka ei koske asiayhteyttä, jossa olet tarkastellut tätä julkaisua. Jos haluat julkaisun suodatettavan myös tässä asiayhteydessä, muokkaa suodatinta.",
+  "filter_modal.added.context_mismatch_title": "Asiayhteys ei täsmää!",
+  "filter_modal.added.expired_explanation": "Tämä suodatinluokka on vanhentunut, joten sinun on muutettava viimeistä voimassaolopäivää, jotta suodatusta käytettäisiin.",
   "filter_modal.added.expired_title": "Vanhentunut suodatin!",
-  "filter_modal.added.review_and_configure": "Voit tarkastella tätä suodatinluokkaa ja määrittää sen tarkemmin kohdassa {settings_link}.",
+  "filter_modal.added.review_and_configure": "Voit tarkastella tätä suodatinluokkaa ja määrittää sen tarkemmin {settings_link}.",
   "filter_modal.added.review_and_configure_title": "Suodattimen asetukset",
-  "filter_modal.added.settings_link": "asetukset-sivulle",
+  "filter_modal.added.settings_link": "asetussivulla",
   "filter_modal.added.short_explanation": "Tämä julkaisu on lisätty seuraavaan suodatinluokkaan: {title}.",
   "filter_modal.added.title": "Suodatin lisätty!",
   "filter_modal.select_filter.context_mismatch": "ei sovellu tähän kontekstiin",
@@ -279,6 +277,12 @@
   "follow_request.authorize": "Valtuuta",
   "follow_request.reject": "Hylkää",
   "follow_requests.unlocked_explanation": "Vaikkei tiliäsi ole lukittu, palvelimen {domain} ylläpito on arvioinut, että saatat olla halukas tarkistamaan nämä seuraamispyynnöt erikseen.",
+  "follow_suggestions.curated_suggestion": "Päätoimittajan valinta",
+  "follow_suggestions.dismiss": "Älä näytä uudelleen",
+  "follow_suggestions.personalized_suggestion": "Personoitu ehdotus",
+  "follow_suggestions.popular_suggestion": "Suosittu ehdotus",
+  "follow_suggestions.view_all": "Näytä kaikki",
+  "follow_suggestions.who_to_follow": "Ehdotuksia seurattavaksi",
   "followed_tags": "Seuratut aihetunnisteet",
   "footer.about": "Tietoja",
   "footer.directory": "Profiilihakemisto",
@@ -305,15 +309,11 @@
   "hashtag.follow": "Seuraa aihetunnistetta",
   "hashtag.unfollow": "Lopeta aihetunnisteen seuraaminen",
   "hashtags.and_other": "…ja {count, plural, other {# lisää}}",
-  "home.actions.go_to_explore": "Katso, mikä on suosittua",
-  "home.actions.go_to_suggestions": "Löydä seurattavia käyttäjiä",
   "home.column_settings.basic": "Perusasetukset",
   "home.column_settings.show_reblogs": "Näytä tehostukset",
   "home.column_settings.show_replies": "Näytä vastaukset",
-  "home.explore_prompt.body": "Kotisyötteesi on sekoitus seuraamiasi aihetunnisteita ja käyttäjiä sekä heidän tehostamiaan julkaisuja. Jos se tuntuu liian hiljaiselta, saatat haluta:",
-  "home.explore_prompt.title": "Tämä on tukikohtasi Mastodonissa.",
   "home.hide_announcements": "Piilota tiedotteet",
-  "home.pending_critical_update.body": "Päivitäthän Mastodon-palvelimen mahdollisimman pian!",
+  "home.pending_critical_update.body": "Päivitäthän Mastodon-palvelinohjelmistosi mahdollisimman pian!",
   "home.pending_critical_update.link": "Tutustu päivityssisältöihin",
   "home.pending_critical_update.title": "Kriittinen tietoturvapäivitys saatavilla!",
   "home.show_announcements": "Näytä tiedotteet",
@@ -352,7 +352,7 @@
   "keyboard_shortcuts.hotkey": "Pikanäppäin",
   "keyboard_shortcuts.legend": "Näytä tämä ohje",
   "keyboard_shortcuts.local": "Avaa paikallinen aikajana",
-  "keyboard_shortcuts.mention": "Mainitse kirjoittaja",
+  "keyboard_shortcuts.mention": "Mainitse julkaisija",
   "keyboard_shortcuts.muted": "Avaa mykistettyjen käyttäjien luettelo",
   "keyboard_shortcuts.my_profile": "Avaa profiilisi",
   "keyboard_shortcuts.notifications": "Avaa ilmoitussarake",
@@ -370,12 +370,12 @@
   "keyboard_shortcuts.unfocus": "Poistu teksti-/hakukentästä",
   "keyboard_shortcuts.up": "Siirry listassa ylöspäin",
   "lightbox.close": "Sulje",
-  "lightbox.compress": "Pakkaa kuvan näkymälaatikko",
-  "lightbox.expand": "Laajenna kuvan näkymälaatikko",
+  "lightbox.compress": "Tiivis kuvankatselunäkymä",
+  "lightbox.expand": "Laajennettu kuvankatselunäkymä",
   "lightbox.next": "Seuraava",
   "lightbox.previous": "Edellinen",
   "limited_account_hint.action": "Näytä profiili joka tapauksessa",
-  "limited_account_hint.title": "Palvelun {domain} valvojat ovat piilottaneet tämän profiilin.",
+  "limited_account_hint.title": "Palvelimen {domain} valvojat ovat piilottaneet tämän käyttäjätilin.",
   "link_preview.author": "Julkaissut {name}",
   "lists.account.add": "Lisää listalle",
   "lists.account.remove": "Poista listalta",
@@ -389,21 +389,21 @@
   "lists.replies_policy.list": "Listan jäsenille",
   "lists.replies_policy.none": "Ei kellekään",
   "lists.replies_policy.title": "Näytä vastaukset:",
-  "lists.search": "Etsi seuraamistasi henkilöistä",
+  "lists.search": "Etsi seuraamiesi henkilöiden keskuudesta",
   "lists.subheading": "Omat listasi",
   "load_pending": "{count, plural, one {# uusi kohde} other {# uutta kohdetta}}",
   "loading_indicator.label": "Ladataan…",
   "media_gallery.toggle_visible": "{number, plural, one {Piilota kuva} other {Piilota kuvat}}",
   "moved_to_account_banner.text": "Tilisi {disabledAccount} on tällä hetkellä poissa käytöstä, koska teit siirron tiliin {movedToAccount}.",
   "mute_modal.duration": "Kesto",
-  "mute_modal.hide_notifications": "Piilota tältä käyttäjältä tulevat ilmoitukset?",
+  "mute_modal.hide_notifications": "Piilotetaanko tältä käyttäjältä tulevat ilmoitukset?",
   "mute_modal.indefinite": "Ikuisesti",
   "navigation_bar.about": "Tietoja",
   "navigation_bar.advanced_interface": "Avaa edistyneessä selainkäyttöliittymässä",
   "navigation_bar.blocks": "Estetyt käyttäjät",
   "navigation_bar.bookmarks": "Kirjanmerkit",
   "navigation_bar.community_timeline": "Paikallinen aikajana",
-  "navigation_bar.compose": "Kirjoita uusi julkaisu",
+  "navigation_bar.compose": "Luo uusi julkaisu",
   "navigation_bar.direct": "Yksityiset maininnat",
   "navigation_bar.discover": "Löydä uutta",
   "navigation_bar.domain_blocks": "Estetyt verkkotunnukset",
@@ -428,10 +428,10 @@
   "notification.admin.sign_up": "{name} rekisteröityi",
   "notification.favourite": "{name} lisäsi julkaisusi suosikkeihinsa",
   "notification.follow": "{name} seurasi sinua",
-  "notification.follow_request": "{name} haluaa seurata sinua",
+  "notification.follow_request": "{name} on pyytänyt lupaa saada seurata sinua",
   "notification.mention": "{name} mainitsi sinut",
   "notification.own_poll": "Äänestyksesi on päättynyt",
-  "notification.poll": "Äänestys, johon osallistuit, on päättynyt",
+  "notification.poll": "Kysely, johon osallistuit, on päättynyt",
   "notification.reblog": "{name} tehosti julkaisuasi",
   "notification.status": "{name} julkaisi juuri",
   "notification.update": "{name} muokkasi julkaisua",
@@ -478,7 +478,7 @@
   "onboarding.actions.go_to_home": "Siirry kotisyötteeseeni",
   "onboarding.compose.template": "Tervehdys #Mastodon!",
   "onboarding.follows.empty": "Valitettavasti tuloksia ei voida näyttää juuri nyt. Voit kokeilla hakua tai selata tutustumissivua löytääksesi seurattavaa tai yrittää myöhemmin uudelleen.",
-  "onboarding.follows.lead": "Kokoat oman kotisyötteesi itse. Mitä enemmän ihmisiä seuraat, sitä aktiivisempi ja kiinnostavampi syöte on. Nämä profiilit voivat olla alkuun hyvä lähtökohta — voit aina lopettaa niiden seuraamisen myöhemmin!",
+  "onboarding.follows.lead": "Kokoat oman kotisyötteesi itse. Mitä enemmän ihmisiä seuraat, sitä aktiivisempi ja kiinnostavampi syöte on. Nämä profiilit voivat olla alkuun hyvä lähtökohta – voit milloin tahansa myös lopettaa niiden seuraamisen:",
   "onboarding.follows.title": "Mukauta kotisyötettäsi",
   "onboarding.profile.discoverable": "Aseta profiilini löydettäväksi",
   "onboarding.profile.discoverable_hint": "Kun olet määrittänyt itsesi löydettäväksi Mastodonista, julkaisusi voivat näkyä hakutuloksissa ja suosituissa kohteissa. Lisäksi profiiliasi voidaan ehdottaa käyttäjille, jotka ovat kiinnostuneita kanssasi samoista aiheista.",
@@ -506,7 +506,7 @@
   "onboarding.steps.setup_profile.title": "Mukauta profiiliasi",
   "onboarding.steps.share_profile.body": "Kerro kavereillesi, kuinka sinut löytää Mastodonista",
   "onboarding.steps.share_profile.title": "Jaa Mastodon-profiilisi",
-  "onboarding.tips.2fa": "<strong>Tiesitkö?</strong> Voit suojata tilisi ottamalla kaksivaiheisen todennuksen käyttöön tilisi asetuksista. Se toimii millä tahansa TOTP-sovelluksella, eikä sen käyttö edellytä puhelinnumeroa!",
+  "onboarding.tips.2fa": "<strong>Tiesitkö?</strong> Voit suojata tilisi ottamalla kaksivaiheisen todennuksen käyttöön tilisi asetuksista. Se toimii millä tahansa TOTP-sovelluksella, eikä sen käyttö edellytä puhelinnumeron antoa!",
   "onboarding.tips.accounts_from_other_servers": "<strong>Tiesitkö?</strong> Koska Mastodon on hajautettu, osa kohtaamistasi profiileista sijaitsee muilla kuin sinun palvelimellasi. Voit silti viestiä saumattomasti heidän kanssaan! Heidän palvelimensa mainitaan käyttäjänimen jälkiosassa!",
   "onboarding.tips.migration": "<strong>Tiesitkö?</strong> Jos koet, ettei {domain} ole jatkossa itsellesi hyvä palvelinvalinta, voit siirtyä toiselle Mastodon-palvelimelle menettämättä seuraajiasi. Voit jopa isännöidä omaa palvelintasi!",
   "onboarding.tips.verification": "<strong>Tiesitkö?</strong> Voit vahvistaa tilisi lisäämällä omalle verkkosivustollesi linkin Mastodon-profiiliisi ja lisäämällä sitten verkkosivustosi osoitteen Mastodon-profiilisi lisäkenttään. Tämä ei maksa mitään, eikä sinun tarvitse lähetellä asiakirjoja!",
@@ -521,8 +521,8 @@
   "poll.vote": "Äänestä",
   "poll.voted": "Äänestit tätä vastausta",
   "poll.votes": "{votes, plural, one {# ääni} other {# ääntä}}",
-  "poll_button.add_poll": "Lisää äänestys",
-  "poll_button.remove_poll": "Poista äänestys",
+  "poll_button.add_poll": "Lisää kysely",
+  "poll_button.remove_poll": "Poista kysely",
   "privacy.change": "Muuta julkaisun näkyvyyttä",
   "privacy.direct.long": "Kaikki tässä julkaisussa mainitut",
   "privacy.direct.short": "Tietyt henkilöt",
@@ -530,7 +530,9 @@
   "privacy.private.short": "Seuraajat",
   "privacy.public.long": "Kuka tahansa Mastodonissa ja sen ulkopuolella",
   "privacy.public.short": "Julkinen",
-  "privacy.unlisted.additional": "Tämä toimii kuten julkinen, paitsi että julkaisu ei näy livesyötteissä, aihetunnisteissa, selaa-näkymässä tai Mastodon-haussa, vaikka olisit sallinut ne käyttäjätilin laajuisesti.",
+  "privacy.unlisted.additional": "Tämä on muutoin kuin julkinen julkaisu, mutta sitä ei näytetä livesyöte-, aihetunniste- tai selailunäkymissä eikä Mastodon-hakutuloksissakaan, vaikka ne olisivat käyttäjätililläsi yleisesti sallittuina.",
+  "privacy.unlisted.long": "Vähemmän algoritmiperusteista sisältöä",
+  "privacy.unlisted.short": "Vaivihkaisesti julkinen",
   "privacy_policy.last_updated": "Viimeksi päivitetty {date}",
   "privacy_policy.title": "Tietosuojakäytäntö",
   "recommended": "Suositeltu",
@@ -553,16 +555,16 @@
   "reply_indicator.poll": "Kysely",
   "report.block": "Estä",
   "report.block_explanation": "Et näe hänen viestejään, eikä hän voi nähdä viestejäsi tai seurata sinua. Hän näkee, että olet estänyt hänet.",
-  "report.categories.legal": "Lakiasiat",
+  "report.categories.legal": "Juridiset tiedot",
   "report.categories.other": "Muu",
   "report.categories.spam": "Roskaposti",
-  "report.categories.violation": "Sisältö rikkoo yhtä tai useampaa palvelimen sääntöä",
+  "report.categories.violation": "Sisältö rikkoo yhtä tai useampaa palvelimen säännöistä",
   "report.category.subtitle": "Valitse sopivin",
   "report.category.title": "Kerro meille, miksi tämä {type} pitää raportoida",
-  "report.category.title_account": "profiili",
-  "report.category.title_status": "julkaisu",
+  "report.category.title_account": "profiilissa",
+  "report.category.title_status": "julkaisussa",
   "report.close": "Valmis",
-  "report.comment.title": "Olisiko jotain muuta, mitä meidän pitäisi tietää?",
+  "report.comment.title": "Onko vielä jotain muuta, mitä meidän pitäisi tietää?",
   "report.forward": "Välitä kohteeseen {target}",
   "report.forward_hint": "Tämä tili on toisella palvelimella. Haluatko lähettää nimettömän raportin myös sinne?",
   "report.mute": "Mykistä",
@@ -570,18 +572,18 @@
   "report.next": "Seuraava",
   "report.placeholder": "Lisäkommentit",
   "report.reasons.dislike": "En pidä siitä",
-  "report.reasons.dislike_description": "Et halua nähdä sitä",
+  "report.reasons.dislike_description": "Sisältö on sen tyyppistä, ettet halua nähdä sitä",
   "report.reasons.legal": "Se on laitonta",
   "report.reasons.legal_description": "Katsot sisällön rikkovan maasi tai palvelimen kotimaan lakeja",
   "report.reasons.other": "Jotain muuta",
-  "report.reasons.other_description": "Ongelma ei sovi muihin kategorioihin",
+  "report.reasons.other_description": "Muut raportointisyyt eivät kuvaa ongelmaa",
   "report.reasons.spam": "Se on roskapostia",
-  "report.reasons.spam_description": "Haitalliset linkit, väärennetyt sitoutumiset tai toistuvat vastaukset",
+  "report.reasons.spam_description": "Haitalliset linkit, henkilöväärennökset tai itseään toistavat vastaukset",
   "report.reasons.violation": "Se rikkoo palvelimen sääntöjä",
-  "report.reasons.violation_description": "Tiedät, että se rikkoo tiettyjä sääntöjä",
+  "report.reasons.violation_description": "Tiedät sisällön rikkovan tiettyjä sääntöjä",
   "report.rules.subtitle": "Valitse kaikki sopivat",
   "report.rules.title": "Mitä sääntöjä rikotaan?",
-  "report.statuses.subtitle": "Valitse kaikki sopivat",
+  "report.statuses.subtitle": "Valitse kaikki soveltuvat julkaisut",
   "report.statuses.title": "Onko julkaisuja, jotka tukevat tätä raporttia?",
   "report.submit": "Lähetä",
   "report.target": "Raportoidaan {target}",
@@ -595,14 +597,14 @@
   "report_notification.categories.legal": "Laillinen",
   "report_notification.categories.other": "Muu",
   "report_notification.categories.spam": "Roskaposti",
-  "report_notification.categories.violation": "Sääntöjen rikkominen",
+  "report_notification.categories.violation": "Sääntörikkomus",
   "report_notification.open": "Avaa raportti",
   "search.no_recent_searches": "Ei viimeaikaisia hakuja",
   "search.placeholder": "Hae",
   "search.quick_action.account_search": "Profiilit haulla {x}",
   "search.quick_action.go_to_account": "Siirry profiiliin {x}",
   "search.quick_action.go_to_hashtag": "Siirry aihetunnisteeseen {x}",
-  "search.quick_action.open_url": "Avaa URL-osoite Mastodonissa",
+  "search.quick_action.open_url": "Avaa verkko-osoite Mastodonissa",
   "search.quick_action.status_search": "Julkaisut haulla {x}",
   "search.search_or_paste": "Hae tai liitä URL-osoite",
   "search_popout.full_text_search_disabled_message": "Ei saatavilla palvelimella {domain}.",
@@ -611,16 +613,16 @@
   "search_popout.options": "Hakuvalinnat",
   "search_popout.quick_actions": "Pikatoiminnot",
   "search_popout.recent": "Viimeaikaiset haut",
-  "search_popout.specific_date": "tarkka päiväys",
+  "search_popout.specific_date": "tietty päivämäärä",
   "search_popout.user": "käyttäjä",
   "search_results.accounts": "Profiilit",
   "search_results.all": "Kaikki",
   "search_results.hashtags": "Aihetunnisteet",
-  "search_results.nothing_found": "Näille hakusanoille ei löytynyt mitään",
+  "search_results.nothing_found": "Hakusi ei tuottanut tuloksia",
   "search_results.see_all": "Näytä kaikki",
   "search_results.statuses": "Julkaisut",
   "search_results.title": "Hae {q}",
-  "server_banner.about_active_users": "Palvelinta käyttäneet ihmiset viimeisen 30 päivän aikana (kuukauden aktiiviset käyttäjät)",
+  "server_banner.about_active_users": "Palvelimen käyttäjät viimeisten 30 päivän ajalta (kuukauden aktiiviset käyttäjät)",
   "server_banner.active_users": "aktiivista käyttäjää",
   "server_banner.administered_by": "Ylläpitäjä:",
   "server_banner.introduction": "{domain} kuuluu hajautettuun sosiaaliseen verkostoon, jonka voimanlähde on {mastodon}.",
@@ -657,7 +659,7 @@
   "status.media.show": "Napsauta näyttääksesi",
   "status.media_hidden": "Media piilotettu",
   "status.mention": "Mainitse @{name}",
-  "status.more": "Lisää",
+  "status.more": "Enemmän",
   "status.mute": "Mykistä @{name}",
   "status.mute_conversation": "Mykistä keskustelu",
   "status.open": "Laajenna julkaisu",
@@ -679,14 +681,14 @@
   "status.show_filter_reason": "Näytä joka tapauksessa",
   "status.show_less": "Näytä vähemmän",
   "status.show_less_all": "Näytä kaikista vähemmän",
-  "status.show_more": "Näytä lisää",
+  "status.show_more": "Näytä enemmän",
   "status.show_more_all": "Näytä kaikista enemmän",
   "status.show_original": "Näytä alkuperäinen",
   "status.title.with_attachments": "{user} liitti {attachmentCount, plural, one {{attachmentCount} tiedoston} other {{attachmentCount} tiedostoa}}",
   "status.translate": "Käännä",
-  "status.translated_from_with": "Käännetty kielestä {lang} käyttäen {provider}",
+  "status.translated_from_with": "Käännetty kielestä {lang} käyttäen palvelua {provider}",
   "status.uncached_media_warning": "Esikatselu ei ole käytettävissä",
-  "status.unmute_conversation": "Poista keskustelun mykistys",
+  "status.unmute_conversation": "Kumoa keskustelun mykistys",
   "status.unpin": "Irrota profiilista",
   "subscribed_languages.lead": "Vain valituilla kielillä kirjoitetut julkaisut näkyvät koti- ja lista-aikajanoillasi muutoksen jälkeen. Älä valitse mitään, jos haluat nähdä julkaisuja kaikilla kielillä.",
   "subscribed_languages.save": "Tallenna muutokset",
@@ -696,9 +698,9 @@
   "time_remaining.days": "{number, plural, one {# päivä} other {# päivää}} jäljellä",
   "time_remaining.hours": "{number, plural, one {# tunti} other {# tuntia}} jäljellä",
   "time_remaining.minutes": "{number, plural, one {# minuutti} other {# minuuttia}} jäljellä",
-  "time_remaining.moments": "Hetki jäljellä",
+  "time_remaining.moments": "Hetkiä jäljellä",
   "time_remaining.seconds": "{number, plural, one {# sekunti} other {# sekuntia}} jäljellä",
-  "timeline_hint.remote_resource_not_displayed": "{resource} muilta palvelimilta ei näytetä.",
+  "timeline_hint.remote_resource_not_displayed": "Muiden palvelinten {resource}-tietoa ei näytetä täällä.",
   "timeline_hint.resources.followers": "Seuraajat",
   "timeline_hint.resources.follows": "seurattua",
   "timeline_hint.resources.statuses": "Vanhemmat julkaisut",
@@ -711,23 +713,23 @@
   "upload_area.title": "Lataa raahaamalla ja pudottamalla tähän",
   "upload_button.label": "Lisää kuvia, video tai äänitiedosto",
   "upload_error.limit": "Tiedostolatauksien rajoitus ylitetty.",
-  "upload_error.poll": "Tiedoston lataaminen ei ole sallittua äänestyksissä.",
+  "upload_error.poll": "Tiedostojen lisääminen ei ole sallittua kyselyjen ohessa.",
   "upload_form.audio_description": "Kuvaile sisältöä kuuroille ja kuulorajoitteisille",
   "upload_form.description": "Kuvaile sisältöä sokeille ja näkörajoitteisille",
   "upload_form.edit": "Muokkaa",
-  "upload_form.thumbnail": "Vaihda pikkukuva",
+  "upload_form.thumbnail": "Vaihda pienoiskuva",
   "upload_form.video_description": "Kuvaile sisältöä kuuroille, kuulorajoitteisille, sokeille tai näkörajoitteisille",
   "upload_modal.analyzing_picture": "Analysoidaan kuvaa…",
   "upload_modal.apply": "Käytä",
-  "upload_modal.applying": "Asetetaan…",
+  "upload_modal.applying": "Otetaan käyttöön…",
   "upload_modal.choose_image": "Valitse kuva",
   "upload_modal.description_placeholder": "Nopea ruskea kettu hyppää laiskan koiran yli",
   "upload_modal.detect_text": "Tunnista teksti kuvasta",
   "upload_modal.edit_media": "Muokkaa mediaa",
-  "upload_modal.hint": "Klikkaa tai vedä ympyrä esikatselussa valitaksesi keskipiste, joka näkyy aina pienoiskuvissa.",
+  "upload_modal.hint": "Napsauta tai vedä ympyrä esikatselussa valitaksesi keskipiste, joka näkyy aina pienoiskuvissa.",
   "upload_modal.preparing_ocr": "Valmistellaan tekstintunnistusta…",
   "upload_modal.preview_label": "Esikatselu ({ratio})",
-  "upload_progress.label": "Ladataan...",
+  "upload_progress.label": "Tallennetaan...",
   "upload_progress.processing": "Käsitellään…",
   "username.taken": "Käyttäjänimi on jo varattu. Kokeile toista",
   "video.close": "Sulje video",
@@ -737,7 +739,7 @@
   "video.fullscreen": "Koko näyttö",
   "video.hide": "Piilota video",
   "video.mute": "Mykistä ääni",
-  "video.pause": "Keskeytä",
+  "video.pause": "Tauko",
   "video.play": "Toista",
   "video.unmute": "Palauta ääni"
 }
diff --git a/app/javascript/mastodon/locales/fil.json b/app/javascript/mastodon/locales/fil.json
index ec27c8f60e2468..b677f9d197453b 100644
--- a/app/javascript/mastodon/locales/fil.json
+++ b/app/javascript/mastodon/locales/fil.json
@@ -27,6 +27,7 @@
   "account.featured_tags.last_status_never": "Walang mga post",
   "account.featured_tags.title": "Nakatampok na hashtag ni {name}",
   "account.follow": "Sundan",
+  "account.follow_back": "Sundan pabalik",
   "account.followers": "Mga tagasunod",
   "account.followers.empty": "Wala pang sumusunod sa tagagamit na ito.",
   "account.following": "Sinusundan",
@@ -41,6 +42,11 @@
   "account.media": "Medya",
   "account.mention": "Banggitin si @{name}",
   "account.moved_to": "Ipinahihiwatig ni {name} na ang kanilang bagong account ngayon ay:",
+  "account.open_original_page": "Buksan ang pinagmulang pahina",
+  "account.report": "I-ulat si/ang @{name}",
+  "account.requested_follow": "Hinihiling ni {name} na sundan ka",
+  "account.show_reblogs": "Ipakita ang mga pagpapalakas mula sa/kay {name}",
+  "admin.dashboard.retention.cohort_size": "Mga bagong tagagamit",
   "bundle_column_error.error.title": "Naku!",
   "bundle_column_error.network.body": "Nagkaroon ng kamalian habang sinusubukang i-karga ang pahinang ito. Maaaring dahil ito sa pansamantalang problema ng iyong koneksyon sa internet o ang server na ito.",
   "bundle_column_error.network.title": "Kamaliang network",
@@ -91,6 +97,19 @@
   "compose_form.direct_message_warning_learn_more": "Matuto pa",
   "compose_form.encryption_warning": "Ang mga post sa Mastodon ay hindi naka-encrypt nang dulo-dulo. Huwag magbahagi ng anumang sensitibong impormasyon sa Mastodon.",
   "compose_form.hashtag_warning": "Hindi maililista ang post na ito sa anumang hashtag dahil hindi ito nakapubliko. Mga nakapublikong post lamang ang mahahanap ayon sa hashtag.",
+  "compose_form.placeholder": "Anong nangyari?",
+  "compose_form.poll.single": "Piliin ang isa",
+  "compose_form.reply": "Tumugon",
+  "compose_form.spoiler.unmarked": "Idagdag ang babala sa nilalaman",
+  "confirmation_modal.cancel": "Pagpaliban",
+  "confirmations.block.block_and_report": "Harangan at i-ulat",
+  "confirmations.block.confirm": "Harangan",
+  "confirmations.block.message": "Sigurado ka bang gusto mong harangan si {name}?",
+  "confirmations.cancel_follow_request.confirm": "Bawiin ang kahilingan",
+  "confirmations.cancel_follow_request.message": "Sigurdo ka bang gusto mong bawiin ang kahilingang sundan si/ang {name}?",
+  "confirmations.domain_block.confirm": "Harangan ang buong domain",
+  "confirmations.edit.confirm": "Baguhin",
+  "confirmations.reply.confirm": "Tumugon",
   "copy_icon_button.copied": "Sinipi sa clipboard",
   "copypaste.copied": "Sinipi",
   "copypaste.copy_to_clipboard": "I-sipi sa clipboard",
@@ -140,5 +159,68 @@
   "empty_column.hashtag": "Wala pang laman ang hashtag na ito.",
   "empty_column.home": "Walang laman ang timeline ng tahanan mo! Sumunod sa marami pang tao para mapunan ito.",
   "empty_column.list": "Wala pang laman ang listahang ito. Kapag naglathala ng mga bagong post ang mga miyembro ng listahang ito, makikita iyon dito.",
-  "empty_column.lists": "Wala ka pang mga listahan. Kapag gumawa ka ng isa, makikita yun dito."
+  "empty_column.lists": "Wala ka pang mga listahan. Kapag gumawa ka ng isa, makikita yun dito.",
+  "explore.search_results": "Mga resulta ng paghahanap",
+  "firehose.all": "Lahat",
+  "firehose.local": "Itong serbiro",
+  "firehose.remote": "Ibang mga serbiro",
+  "follow_request.authorize": "Tanggapin",
+  "follow_request.reject": "Tanggihan",
+  "follow_suggestions.dismiss": "Huwag nang ipakita muli",
+  "follow_suggestions.view_all": "Tingnan lahat",
+  "follow_suggestions.who_to_follow": "Sinong maaaring sundan",
+  "footer.about": "Tungkol dito",
+  "footer.get_app": "Kunin ang app",
+  "generic.saved": "Nakaimbak",
+  "hashtag.column_header.tag_mode.all": "at {additional}",
+  "hashtag.column_header.tag_mode.any": "o {additional}",
+  "home.pending_critical_update.body": "Mangyaring i-update ang iyong serbiro ng Mastodon sa lalong madaling panahon!",
+  "interaction_modal.no_account_yet": "Wala sa Mastodon?",
+  "interaction_modal.on_another_server": "Sa ibang serbiro",
+  "interaction_modal.on_this_server": "Sa serbirong ito",
+  "interaction_modal.title.follow": "Sundan si {name}",
+  "keyboard_shortcuts.description": "Paglalarawan",
+  "keyboard_shortcuts.down": "Ilipat pababa sa talaan",
+  "keyboard_shortcuts.requests": "Buksan ang talaan ng mga kahilingan sa pagsunod",
+  "keyboard_shortcuts.up": "Ilipat pataas sa talaan",
+  "lightbox.close": "Isara",
+  "lightbox.next": "Susunod",
+  "lightbox.previous": "Nakaraan",
+  "lists.new.create": "Idagdag sa talaan",
+  "lists.new.title_placeholder": "Bagong pangalan ng talaan",
+  "lists.replies_policy.title": "Ipakita ang mga tugon sa:",
+  "lists.subheading": "Iyong mga talaan",
+  "navigation_bar.about": "Tungkol dito",
+  "navigation_bar.blocks": "Nakaharang na mga tagagamit",
+  "navigation_bar.favourites": "Mga paborito",
+  "navigation_bar.lists": "Mga listahan",
+  "notification.admin.report": "Iniulat ni {name} si {target}",
+  "notification.follow": "Sinundan ka ni {name}",
+  "notification.follow_request": "Hinihiling ni {name} na sundan ka",
+  "notifications.column_settings.admin.report": "Mga bagong ulat:",
+  "notifications.column_settings.favourite": "Mga paborito:",
+  "notifications.column_settings.follow": "Mga bagong tagasunod:",
+  "notifications.filter.all": "Lahat",
+  "onboarding.action.back": "Ibalik mo ako",
+  "onboarding.actions.back": "Ibalik mo ako",
+  "onboarding.share.next_steps": "Mga posibleng susunod na hakbang:",
+  "poll.voted": "Binoto mo para sa sagot na ito",
+  "relative_time.full.just_now": "ngayon lang",
+  "relative_time.just_now": "ngayon",
+  "reply_indicator.cancel": "Ipagpaliban",
+  "report.block": "Harangan",
+  "report.categories.other": "Iba pa",
+  "report.close": "Tapos na",
+  "report.next": "Sunod",
+  "server_banner.learn_more": "Matuto nang higit pa",
+  "status.more": "Higit pa",
+  "status.reply": "Tumugon",
+  "status.share": "Ibahagi",
+  "status.show_less": "Magpakita ng mas kaunti",
+  "status.show_less_all": "Magpakita ng mas kaunti para sa lahat",
+  "status.show_more": "Magpakita ng higit pa",
+  "status.show_more_all": "Magpakita ng higit pa para sa lahat",
+  "status.translate": "Isalin",
+  "status.translated_from_with": "Isalin mula sa {lang} gamit ang {provider}",
+  "status.uncached_media_warning": "Hindi makuha ang paunang tigin"
 }
diff --git a/app/javascript/mastodon/locales/fo.json b/app/javascript/mastodon/locales/fo.json
index a4c5296086f76a..abd2ab2681c94b 100644
--- a/app/javascript/mastodon/locales/fo.json
+++ b/app/javascript/mastodon/locales/fo.json
@@ -145,11 +145,9 @@
   "compose_form.lock_disclaimer": "Kontoin hjá tær er ikki {locked}. Øll kunnu fylgja tær og lesa tað, tú bert letur fyljgarar lesa.",
   "compose_form.lock_disclaimer.lock": "læst",
   "compose_form.placeholder": "Hvat hevur tú í huga?",
-  "compose_form.poll.add_option": "Legg valmøguleika afturat",
   "compose_form.poll.duration": "Atkvøðugreiðslutíð",
   "compose_form.poll.multiple": "Fleiri valmøguleikar",
   "compose_form.poll.option_placeholder": "Valmøguleiki {number}",
-  "compose_form.poll.remove_option": "Strika hendan valmøguleikan",
   "compose_form.poll.single": "Vel ein",
   "compose_form.poll.switch_to_multiple": "Broyt atkvøðugreiðslu til at loyva fleiri svarum",
   "compose_form.poll.switch_to_single": "Broyt atkvøðugreiðslu til einstakt svar",
@@ -279,6 +277,12 @@
   "follow_request.authorize": "Veit myndugleika",
   "follow_request.reject": "Nokta",
   "follow_requests.unlocked_explanation": "Sjálvt um konta tín ikki er læst, so hugsa {domain} starvsfólkini, at tú kanska hevur hug at kanna umbønir um at fylgja frá hesum kontum við hond.",
+  "follow_suggestions.curated_suggestion": "Val umsjónarfólksins",
+  "follow_suggestions.dismiss": "Lat vera við at vísa",
+  "follow_suggestions.personalized_suggestion": "Persónligt uppskot",
+  "follow_suggestions.popular_suggestion": "Vælumtókt uppskot",
+  "follow_suggestions.view_all": "Vís øll",
+  "follow_suggestions.who_to_follow": "Hvørji tú átti at fylgt",
   "followed_tags": "Fylgd frámerki",
   "footer.about": "Um",
   "footer.directory": "Vangaskrá",
@@ -305,13 +309,9 @@
   "hashtag.follow": "Fylg frámerki",
   "hashtag.unfollow": "Gevst at fylgja frámerki",
   "hashtags.and_other": "…og {count, plural, other {# afturat}}",
-  "home.actions.go_to_explore": "Sí rákið",
-  "home.actions.go_to_suggestions": "Finn fólk at fylgja",
   "home.column_settings.basic": "Grundleggjandi",
   "home.column_settings.show_reblogs": "Vís lyft",
   "home.column_settings.show_replies": "Vís svar",
-  "home.explore_prompt.body": "Heimarásin fer at hava eitt bland av postum frá frámerkjunum, sum tú hevur valt at fylgja, brúkarunum, tú hevur valt at fylgja, og postunum, sum tey stimbra. Um tað kennist ov friðarligt, so kanst tú:",
-  "home.explore_prompt.title": "Hetta er tín heimastøð í Mastodon.",
   "home.hide_announcements": "Fjal kunngerðir",
   "home.pending_critical_update.body": "Vinarliga dagfør Mastodon ambætaran hjá tær so skjótt sum møguligt!",
   "home.pending_critical_update.link": "Sí dagføringar",
diff --git a/app/javascript/mastodon/locales/fr-CA.json b/app/javascript/mastodon/locales/fr-CA.json
index 66a7da6d151c11..49db30d75ec7f9 100644
--- a/app/javascript/mastodon/locales/fr-CA.json
+++ b/app/javascript/mastodon/locales/fr-CA.json
@@ -146,11 +146,19 @@
   "compose_form.lock_disclaimer.lock": "verrouillé",
   "compose_form.placeholder": "À quoi pensez-vous?",
   "compose_form.poll.duration": "Durée du sondage",
+  "compose_form.poll.multiple": "Choix multiple",
+  "compose_form.poll.option_placeholder": "Option {number}",
+  "compose_form.poll.single": "Choisissez-en un",
   "compose_form.poll.switch_to_multiple": "Changer le sondage pour autoriser plusieurs choix",
   "compose_form.poll.switch_to_single": "Changer le sondage pour n'autoriser qu'un seul choix",
+  "compose_form.poll.type": "Style",
+  "compose_form.publish": "Publier",
   "compose_form.publish_form": "Publier",
+  "compose_form.reply": "Répondre",
+  "compose_form.save_changes": "Mis à jour",
   "compose_form.spoiler.marked": "Enlever l'avertissement de contenu",
   "compose_form.spoiler.unmarked": "Ajouter un avertissement de contenu",
+  "compose_form.spoiler_placeholder": "Avertissement de contenu (optionnel)",
   "confirmation_modal.cancel": "Annuler",
   "confirmations.block.block_and_report": "Bloquer et signaler",
   "confirmations.block.confirm": "Bloquer",
@@ -295,13 +303,9 @@
   "hashtag.follow": "Suivre ce hashtag",
   "hashtag.unfollow": "Ne plus suivre ce hashtag",
   "hashtags.and_other": "…et {count, plural, other {# de plus}}",
-  "home.actions.go_to_explore": "Voir les tendances",
-  "home.actions.go_to_suggestions": "Trouver des personnes à suivre",
   "home.column_settings.basic": "Basique",
   "home.column_settings.show_reblogs": "Afficher boosts",
   "home.column_settings.show_replies": "Afficher réponses",
-  "home.explore_prompt.body": "Votre fil d'actualité aura un mélange de messages depuis les hashtags que vous avez choisi de suivre, les personnes que vous avez choisi de suivre, et les messages qu'elles boostent. Si ça vous semble trop calme à votre goût, n’hésitez pas à :",
-  "home.explore_prompt.title": "C'est votre page d'accueil dans Mastodon.",
   "home.hide_announcements": "Masquer les annonces",
   "home.pending_critical_update.body": "Veuillez mettre à jour votre serveur Mastodon dès que possible !",
   "home.pending_critical_update.link": "Voir les mises à jour",
@@ -514,7 +518,15 @@
   "poll_button.add_poll": "Ajouter un sondage",
   "poll_button.remove_poll": "Supprimer le sondage",
   "privacy.change": "Changer la confidentialité des messages",
+  "privacy.direct.long": "Toutes les personnes mentionnées dans le post",
+  "privacy.direct.short": "Personnes spécifiques",
+  "privacy.private.long": "Seulement vos abonnés",
+  "privacy.private.short": "Abonnés",
+  "privacy.public.long": "Tout le monde sur et en dehors de Mastodon",
   "privacy.public.short": "Public",
+  "privacy.unlisted.additional": "Cette option se comporte exactement comme l'option publique, sauf que le message n'apparaîtra pas dans les flux en direct, les hashtags, l'exploration ou la recherche Mastodon, même si vous avez opté pour l'option publique pour l'ensemble de votre compte.",
+  "privacy.unlisted.long": "Moins de fanfares algorithmiques",
+  "privacy.unlisted.short": "Public calme",
   "privacy_policy.last_updated": "Dernière mise à jour {date}",
   "privacy_policy.title": "Politique de confidentialité",
   "recommended": "Recommandé",
@@ -532,7 +544,9 @@
   "relative_time.minutes": "{number} min",
   "relative_time.seconds": "{number} s",
   "relative_time.today": "aujourd’hui",
+  "reply_indicator.attachments": "{count, plural, one {# pièce jointe} other {# pièces jointes}}",
   "reply_indicator.cancel": "Annuler",
+  "reply_indicator.poll": "Sondage",
   "report.block": "Bloquer",
   "report.block_explanation": "Vous ne verrez plus les publications de ce compte. Il ne pourra ni vous suivre ni voir vos publications. Il pourra savoir qu'il a été bloqué.",
   "report.categories.legal": "Légal",
diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json
index 2d0fa3b7ddf127..1f657c81853ab4 100644
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@@ -146,11 +146,19 @@
   "compose_form.lock_disclaimer.lock": "verrouillé",
   "compose_form.placeholder": "Qu’avez-vous en tête ?",
   "compose_form.poll.duration": "Durée du sondage",
+  "compose_form.poll.multiple": "Choix multiple",
+  "compose_form.poll.option_placeholder": "Option {number}",
+  "compose_form.poll.single": "Choisissez-en un",
   "compose_form.poll.switch_to_multiple": "Changer le sondage pour autoriser plusieurs choix",
   "compose_form.poll.switch_to_single": "Modifier le sondage pour autoriser qu'un seul choix",
+  "compose_form.poll.type": "Style",
+  "compose_form.publish": "Publier",
   "compose_form.publish_form": "Nouvelle publication",
+  "compose_form.reply": "Répondre",
+  "compose_form.save_changes": "Mis à jour",
   "compose_form.spoiler.marked": "Enlever l’avertissement de contenu",
   "compose_form.spoiler.unmarked": "Ajouter un avertissement de contenu",
+  "compose_form.spoiler_placeholder": "Avertissement de contenu (optionnel)",
   "confirmation_modal.cancel": "Annuler",
   "confirmations.block.block_and_report": "Bloquer et signaler",
   "confirmations.block.confirm": "Bloquer",
@@ -295,13 +303,9 @@
   "hashtag.follow": "Suivre le hashtag",
   "hashtag.unfollow": "Ne plus suivre le hashtag",
   "hashtags.and_other": "…et {count, plural, other {# de plus}}",
-  "home.actions.go_to_explore": "Voir les tendances",
-  "home.actions.go_to_suggestions": "Trouver des personnes à suivre",
   "home.column_settings.basic": "Basique",
   "home.column_settings.show_reblogs": "Afficher les partages",
   "home.column_settings.show_replies": "Afficher les réponses",
-  "home.explore_prompt.body": "Votre fil d'actualité aura un mélange de messages depuis les hashtags que vous avez choisi de suivre, les personnes que vous avez choisi de suivre, et les messages qu'elles boostent. Si ça vous semble trop calme à votre goût, n’hésitez pas à :",
-  "home.explore_prompt.title": "C'est votre page d'accueil dans Mastodon.",
   "home.hide_announcements": "Masquer les annonces",
   "home.pending_critical_update.body": "Veuillez mettre à jour votre serveur Mastodon dès que possible !",
   "home.pending_critical_update.link": "Voir les mises à jour",
@@ -514,7 +518,15 @@
   "poll_button.add_poll": "Ajouter un sondage",
   "poll_button.remove_poll": "Supprimer le sondage",
   "privacy.change": "Ajuster la confidentialité du message",
+  "privacy.direct.long": "Toutes les personnes mentionnées dans le post",
+  "privacy.direct.short": "Personnes spécifiques",
+  "privacy.private.long": "Seulement vos abonnés",
+  "privacy.private.short": "Abonnés",
+  "privacy.public.long": "Tout le monde sur et en dehors de Mastodon",
   "privacy.public.short": "Public",
+  "privacy.unlisted.additional": "Cette option se comporte exactement comme l'option publique, sauf que le message n'apparaîtra pas dans les flux en direct, les hashtags, l'exploration ou la recherche Mastodon, même si vous avez opté pour l'option publique pour l'ensemble de votre compte.",
+  "privacy.unlisted.long": "Moins de fanfares algorithmiques",
+  "privacy.unlisted.short": "Public calme",
   "privacy_policy.last_updated": "Dernière mise à jour {date}",
   "privacy_policy.title": "Politique de confidentialité",
   "recommended": "Recommandé",
@@ -532,7 +544,9 @@
   "relative_time.minutes": "{number} min",
   "relative_time.seconds": "{number} s",
   "relative_time.today": "aujourd’hui",
+  "reply_indicator.attachments": "{count, plural, one {# pièce jointe} other {# pièces jointes}}",
   "reply_indicator.cancel": "Annuler",
+  "reply_indicator.poll": "Sondage",
   "report.block": "Bloquer",
   "report.block_explanation": "Vous ne verrez plus les messages de ce profil, et il ne pourra ni vous suivre ni voir vos messages. Il pourra savoir qu'il a été bloqué.",
   "report.categories.legal": "Légal",
diff --git a/app/javascript/mastodon/locales/fy.json b/app/javascript/mastodon/locales/fy.json
index d5f22d2ee101d1..9bd5327c8f6f34 100644
--- a/app/javascript/mastodon/locales/fy.json
+++ b/app/javascript/mastodon/locales/fy.json
@@ -146,11 +146,19 @@
   "compose_form.lock_disclaimer.lock": "beskoattele",
   "compose_form.placeholder": "Wat wolle jo kwyt?",
   "compose_form.poll.duration": "Doer fan de enkête",
+  "compose_form.poll.multiple": "Mearkar",
+  "compose_form.poll.option_placeholder": "Opsje {number}",
+  "compose_form.poll.single": "Kies ien",
   "compose_form.poll.switch_to_multiple": "Enkête wizigje om meardere karren ta te stean",
   "compose_form.poll.switch_to_single": "Enkête wizigje om in inkelde kar ta te stean",
+  "compose_form.poll.type": "Styl",
+  "compose_form.publish": "Toot",
   "compose_form.publish_form": "Publisearje",
+  "compose_form.reply": "Reagearje",
+  "compose_form.save_changes": "Bywurkje",
   "compose_form.spoiler.marked": "Ynhâldswarskôging fuortsmite",
   "compose_form.spoiler.unmarked": "Ynhâldswarskôging tafoegje",
+  "compose_form.spoiler_placeholder": "Ynhâldswarskôging (opsjoneel)",
   "confirmation_modal.cancel": "Annulearje",
   "confirmations.block.block_and_report": "Blokkearje en rapportearje",
   "confirmations.block.confirm": "Blokkearje",
@@ -269,6 +277,12 @@
   "follow_request.authorize": "Goedkarre",
   "follow_request.reject": "Wegerje",
   "follow_requests.unlocked_explanation": "Ek al is jo account net besletten, de meiwurkers fan {domain} tinke dat jo miskien de folgjende folchfersiken hânmjittich kontrolearje.",
+  "follow_suggestions.curated_suggestion": "Kar fan de moderator",
+  "follow_suggestions.dismiss": "Net mear werjaan",
+  "follow_suggestions.personalized_suggestion": "Personalisearre suggestje",
+  "follow_suggestions.popular_suggestion": "Populêre suggestje",
+  "follow_suggestions.view_all": "Alles werjaan",
+  "follow_suggestions.who_to_follow": "Wa te folgjen",
   "followed_tags": "Folge hashtags",
   "footer.about": "Oer",
   "footer.directory": "Profylmap",
@@ -295,13 +309,9 @@
   "hashtag.follow": "Hashtag folgje",
   "hashtag.unfollow": "Hashtag ûntfolgje",
   "hashtags.and_other": "…en {count, plural, one {}other {# mear}}",
-  "home.actions.go_to_explore": "De aktuele trends besjen",
-  "home.actions.go_to_suggestions": "Sykje minsken om te folgjen",
   "home.column_settings.basic": "Algemien",
   "home.column_settings.show_reblogs": "Boosts toane",
   "home.column_settings.show_replies": "Reaksjes toane",
-  "home.explore_prompt.body": "Jo starttiidline befettet in miks fan berjochten mei hashtags dy’t jo keazen hawwe om te folgjen, fan minsken dy’t jo keazen hawwe om te folgjen en berjochten dy’t se booste. As jo dit te rêstich fine, kinne jo:",
-  "home.explore_prompt.title": "Dit is jo thúsbasis op Mastodon.",
   "home.hide_announcements": "Meidielingen ferstopje",
   "home.pending_critical_update.body": "Fernij sa gau as mooglik jo Mastodon-server!",
   "home.pending_critical_update.link": "Fernijingen besjen",
@@ -514,7 +524,15 @@
   "poll_button.add_poll": "Poll tafoegje",
   "poll_button.remove_poll": "Enkête fuortsmite",
   "privacy.change": "Sichtberheid fan berjocht oanpasse",
+  "privacy.direct.long": "Elkenien dy’ yn it berjocht fermeld wurdt",
+  "privacy.direct.short": "Bepaalde minsken",
+  "privacy.private.long": "Allinnich jo folgers",
+  "privacy.private.short": "Folgers",
+  "privacy.public.long": "Elkenien op Mastodon en dêrbûten",
   "privacy.public.short": "Iepenbier",
+  "privacy.unlisted.additional": "Dit is fergelykber mei iepenbier, útsein dat it berjocht net ferskynt op iepenbiere tiidlijnen of hashtags, ûnder ferkenne of Mastodon sykje, sels as jo jo account dêrfoar ynsteld hawwe.",
+  "privacy.unlisted.long": "Minder algoritmyske fanfare",
+  "privacy.unlisted.short": "Minder iepenbier",
   "privacy_policy.last_updated": "Lêst bywurke op {date}",
   "privacy_policy.title": "Privacybelied",
   "recommended": "Oanrekommandearre",
@@ -532,7 +550,9 @@
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "hjoed",
+  "reply_indicator.attachments": "{count, plural, one {# bylage} other {# bylagen}}",
   "reply_indicator.cancel": "Annulearje",
+  "reply_indicator.poll": "Peiling",
   "report.block": "Blokkearje",
   "report.block_explanation": "Jo sille harren berjochten net sjen kinne. Se sille jo berjochten net sjen kinne en jo net folgje kinne. Se sille wol sjen kinne dat se blokkearre binne.",
   "report.categories.legal": "Juridysk",
diff --git a/app/javascript/mastodon/locales/ga.json b/app/javascript/mastodon/locales/ga.json
index 855a27d0579bf6..329286277d0a4b 100644
--- a/app/javascript/mastodon/locales/ga.json
+++ b/app/javascript/mastodon/locales/ga.json
@@ -226,6 +226,12 @@
   "follow_request.authorize": "Ceadaigh",
   "follow_request.reject": "Diúltaigh",
   "follow_requests.unlocked_explanation": "Cé nach bhfuil do chuntas faoi ghlas, cheap foireann {domain} gur mhaith leat súil siar ar iarratais leanúnaí as na cuntais seo.",
+  "follow_suggestions.curated_suggestion": "Rogha an eagarthóra",
+  "follow_suggestions.dismiss": "Ná taispeáin arís",
+  "follow_suggestions.personalized_suggestion": "Nod pearsantaithe",
+  "follow_suggestions.popular_suggestion": "Nod coiteann",
+  "follow_suggestions.view_all": "Féach uile",
+  "follow_suggestions.who_to_follow": "Cé le leanúint",
   "footer.about": "Maidir le",
   "footer.directory": "Eolaire próifílí",
   "footer.get_app": "Faigh an aip",
diff --git a/app/javascript/mastodon/locales/gd.json b/app/javascript/mastodon/locales/gd.json
index 0c7ef79cd8b861..47b1e231929acc 100644
--- a/app/javascript/mastodon/locales/gd.json
+++ b/app/javascript/mastodon/locales/gd.json
@@ -21,6 +21,7 @@
   "account.blocked": "’Ga bhacadh",
   "account.browse_more_on_origin_server": "Rùraich barrachd dheth air a’ phròifil thùsail",
   "account.cancel_follow_request": "Sguir dhen leantainn",
+  "account.copy": "Dèan lethbhreac dhen cheangal dhan phròifil",
   "account.direct": "Thoir iomradh air @{name} gu prìobhaideach",
   "account.disable_notifications": "Na cuir brath thugam tuilleadh nuair a chuireas @{name} post ris",
   "account.domain_blocked": "Chaidh an àrainn a bhacadh",
@@ -31,6 +32,7 @@
   "account.featured_tags.last_status_never": "Gun phost",
   "account.featured_tags.title": "Na tagaichean hais brosnaichte aig {name}",
   "account.follow": "Lean",
+  "account.follow_back": "Lean air ais",
   "account.followers": "Luchd-leantainn",
   "account.followers.empty": "Chan eil neach sam bith a’ leantainn air a’ chleachdaiche seo fhathast.",
   "account.followers_counter": "{count, plural, one {{counter} neach-leantainn} two {{counter} neach-leantainn} few {{counter} luchd-leantainn} other {{counter} luchd-leantainn}}",
@@ -51,6 +53,7 @@
   "account.mute_notifications_short": "Mùch na brathan",
   "account.mute_short": "Mùch",
   "account.muted": "’Ga mhùchadh",
+  "account.mutual": "Co-dhàimh",
   "account.no_bio": "Cha deach tuairisgeul a sholar.",
   "account.open_original_page": "Fosgail an duilleag thùsail",
   "account.posts": "Postaichean",
@@ -143,11 +146,19 @@
   "compose_form.lock_disclaimer.lock": "glaiste",
   "compose_form.placeholder": "Dè tha air d’ aire?",
   "compose_form.poll.duration": "Faide a’ chunntais-bheachd",
+  "compose_form.poll.multiple": "Iomadh roghainn",
+  "compose_form.poll.option_placeholder": "Roghainn {number}",
+  "compose_form.poll.single": "Tagh aonan",
   "compose_form.poll.switch_to_multiple": "Atharraich an cunntas-bheachd ach an gabh iomadh roghainn a thaghadh",
   "compose_form.poll.switch_to_single": "Atharraich an cunntas-bheachd gus nach gabh ach aon roghainn a thaghadh",
+  "compose_form.poll.type": "Stoidhle",
+  "compose_form.publish": "Postaich",
   "compose_form.publish_form": "Post ùr",
+  "compose_form.reply": "Freagair",
+  "compose_form.save_changes": "Ùraich",
   "compose_form.spoiler.marked": "Thoir air falbh an rabhadh susbainte",
   "compose_form.spoiler.unmarked": "Cuir rabhadh susbainte ris",
+  "compose_form.spoiler_placeholder": "Rabhadh susbainte (roghainneil)",
   "confirmation_modal.cancel": "Sguir dheth",
   "confirmations.block.block_and_report": "Bac ⁊ dèan gearan",
   "confirmations.block.confirm": "Bac",
@@ -179,6 +190,7 @@
   "conversation.mark_as_read": "Cuir comharra gun deach a leughadh",
   "conversation.open": "Seall an còmhradh",
   "conversation.with": "Còmhla ri {names}",
+  "copy_icon_button.copied": "Chaidh lethbhreac dheth a chur air an stòr-bhòrd",
   "copypaste.copied": "Chaidh lethbhreac dheth a dhèanamh",
   "copypaste.copy_to_clipboard": "Cuir lethbhreac dheth air an stòr-bhòrd",
   "directory.federated": "On cho-shaoghal aithnichte",
@@ -210,6 +222,7 @@
   "emoji_button.search_results": "Toraidhean an luirg",
   "emoji_button.symbols": "Samhlaidhean",
   "emoji_button.travel": "Siubhal ⁊ àitichean",
+  "empty_column.account_hides_collections": "Chuir an cleachdaiche seo roimhe nach eil am fiosrachadh seo ri fhaighinn",
   "empty_column.account_suspended": "Chaidh an cunntas a chur à rèim",
   "empty_column.account_timeline": "Chan eil post an-seo!",
   "empty_column.account_unavailable": "Chan eil a’ phròifil ri làimh",
@@ -264,6 +277,12 @@
   "follow_request.authorize": "Ùghdarraich",
   "follow_request.reject": "Diùlt",
   "follow_requests.unlocked_explanation": "Ged nach eil an cunntas agad glaiste, tha sgioba {domain} dhen bheachd gum b’ fheàirrde thu lèirmheas a dhèanamh air na h-iarrtasan leantainn o na cunntasan seo a làimh.",
+  "follow_suggestions.curated_suggestion": "Roghainn an deasaiche",
+  "follow_suggestions.dismiss": "Na seall seo a-rithist",
+  "follow_suggestions.personalized_suggestion": "Moladh pearsanaichte",
+  "follow_suggestions.popular_suggestion": "Moladh air a bheil fèill mhòr",
+  "follow_suggestions.view_all": "Seall na h-uile",
+  "follow_suggestions.who_to_follow": "Cò a leanas tu",
   "followed_tags": "Tagaichean hais ’gan leantainn",
   "footer.about": "Mu dhèidhinn",
   "footer.directory": "Eòlaire nam pròifil",
@@ -290,13 +309,9 @@
   "hashtag.follow": "Lean an taga hais",
   "hashtag.unfollow": "Na lean an taga hais tuilleadh",
   "hashtags.and_other": "…agus {count, plural, one {# eile} two {# eile} few {# eile} other {# eile}}",
-  "home.actions.go_to_explore": "Faic na tha a’ treandadh",
-  "home.actions.go_to_suggestions": "Lorg daoine gus an leantainn",
   "home.column_settings.basic": "Bunasach",
   "home.column_settings.show_reblogs": "Seall na brosnachaidhean",
   "home.column_settings.show_replies": "Seall na freagairtean",
-  "home.explore_prompt.body": "Bidh measgachadh de phostaichean o na tagaichean hais a leanas tu, na daoine a leanas tu is na postaichean a bhrosnaicheas iad air do dhachaigh. Ma tha cùisean ro shàmhach dhut, seo nas urrainn dhut a dhèanamh:",
-  "home.explore_prompt.title": "Seo do dhachaigh am broinn Mastodon.",
   "home.hide_announcements": "Falaich na brathan-fios",
   "home.pending_critical_update.body": "Ùraich am frithealaiche Mastodon agad cho luath ’s a ghabhas!",
   "home.pending_critical_update.link": "Faic na h-ùrachaidhean",
@@ -377,6 +392,7 @@
   "lists.search": "Lorg am measg nan daoine a leanas tu",
   "lists.subheading": "Na liostaichean agad",
   "load_pending": "{count, plural, one {# nì ùr} two {# nì ùr} few {# nithean ùra} other {# nì ùr}}",
+  "loading_indicator.label": "’Ga luchdadh…",
   "media_gallery.toggle_visible": "{number, plural, 1 {Falaich an dealbh} one {Falaich na dealbhan} two {Falaich na dealbhan} few {Falaich na dealbhan} other {Falaich na dealbhan}}",
   "moved_to_account_banner.text": "Tha an cunntas {disabledAccount} agad à comas on a rinn thu imrich gu {movedToAccount}.",
   "mute_modal.duration": "Faide",
@@ -464,6 +480,15 @@
   "onboarding.follows.empty": "Gu mì-fhortanach, chan urrainn dhuinn toradh a shealltainn an-dràsta. Feuch gleus an luirg no duilleag an rùrachaidh airson daoine ri leantainn a lorg no feuch ris a-rithist an ceann tamaill.",
   "onboarding.follows.lead": "’S e do prìomh-doras do Mhastodon a th’ ann san dachaigh. Mar as motha an t-uiread de dhaoine a leanas tu ’s ann nas beòthaile inntinniche a bhios i. Seo moladh no dhà dhut airson tòiseachadh:",
   "onboarding.follows.title": "Cuir dreach pearsanta air do dhachaigh",
+  "onboarding.profile.discoverable": "Bu mhath leam gun gabh a’ phròifil agam a lorg",
+  "onboarding.profile.display_name": "Ainm-taisbeanaidh",
+  "onboarding.profile.display_name_hint": "D’ ainm slàn no spòrsail…",
+  "onboarding.profile.note": "Cunntas-beatha",
+  "onboarding.profile.note_hint": "’S urrainn dhut @iomradh a thoirt air càch no air #tagaicheanHais…",
+  "onboarding.profile.save_and_continue": "Sàbhail ’s lean air adhart",
+  "onboarding.profile.title": "Suidheachadh na pròifile",
+  "onboarding.profile.upload_avatar": "Luchdaich suas dealbh na pròifil",
+  "onboarding.profile.upload_header": "Luchdaich suas bann-cinn na pròifil",
   "onboarding.share.lead": "Innis do dhaoine mar a gheibh iad grèim ort air Mastodon!",
   "onboarding.share.message": "Is mise {username} air #Mastodon! Thig ’gam leantainn air {url}",
   "onboarding.share.next_steps": "Ceuman eile as urrainn dhut gabhail:",
@@ -497,9 +522,16 @@
   "poll_button.add_poll": "Cuir cunntas-bheachd ris",
   "poll_button.remove_poll": "Thoir air falbh an cunntas-bheachd",
   "privacy.change": "Cuir gleus air prìobhaideachd a’ phuist",
+  "privacy.direct.long": "A h-uile duine air a bheil iomradh sa phost",
+  "privacy.direct.short": "Daoine àraidh",
+  "privacy.private.long": "An luchd-leantainn agad a-mhàin",
+  "privacy.private.short": "Luchd-leantainn",
+  "privacy.public.long": "Duine sam bith taobh a-staigh no a-muigh Mhastodon",
   "privacy.public.short": "Poblach",
+  "privacy.unlisted.short": "Poblach ach sàmhach",
   "privacy_policy.last_updated": "An t-ùrachadh mu dheireadh {date}",
   "privacy_policy.title": "Poileasaidh prìobhaideachd",
+  "recommended": "Molta",
   "refresh": "Ath-nuadhaich",
   "regeneration_indicator.label": "’Ga luchdadh…",
   "regeneration_indicator.sublabel": "Tha do dhachaigh ’ga ullachadh!",
@@ -514,7 +546,9 @@
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}d",
   "relative_time.today": "an-diugh",
+  "reply_indicator.attachments": "{count, plural, one {# cheanglachan} two {# cheanglachan} few {# ceanglachain} other {# ceanglachan}}",
   "reply_indicator.cancel": "Sguir dheth",
+  "reply_indicator.poll": "Cunntas-bheachd",
   "report.block": "Bac",
   "report.block_explanation": "Chan fhaic thu na postaichean aca. Chan fhaic iad na postaichean agad is chan urrainn dhaibh do leantainn. Bheir iad an aire gun deach am bacadh.",
   "report.categories.legal": "Laghail",
@@ -570,6 +604,7 @@
   "search.quick_action.status_search": "Postaichean a fhreagras ri {x}",
   "search.search_or_paste": "Dèan lorg no cuir a-steach URL",
   "search_popout.full_text_search_disabled_message": "Chan eil seo ri fhaighinn air {domain}.",
+  "search_popout.full_text_search_logged_out_message": "Chan eil seo ri fhaighinn ach nuair a bhios tu air do chlàradh a-steach.",
   "search_popout.language_code": "Còd cànain ISO",
   "search_popout.options": "Roghainnean luirg",
   "search_popout.quick_actions": "Grad-ghnìomhan",
diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json
index ffd01a547d7892..7512740c5e33ae 100644
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@@ -146,11 +146,19 @@
   "compose_form.lock_disclaimer.lock": "bloqueada",
   "compose_form.placeholder": "Que contas?",
   "compose_form.poll.duration": "Duración da enquisa",
+  "compose_form.poll.multiple": "Escolla múltiple",
+  "compose_form.poll.option_placeholder": "Opción {number}",
+  "compose_form.poll.single": "Elixe unha",
   "compose_form.poll.switch_to_multiple": "Mudar a enquisa para permitir múltiples escollas",
   "compose_form.poll.switch_to_single": "Mudar a enquisa para permitir unha soa opción",
+  "compose_form.poll.type": "Estilo",
+  "compose_form.publish": "Publicar",
   "compose_form.publish_form": "Publicar",
+  "compose_form.reply": "Responder",
+  "compose_form.save_changes": "Actualizar",
   "compose_form.spoiler.marked": "Retirar o aviso sobre o contido",
   "compose_form.spoiler.unmarked": "Engadir aviso sobre o contido",
+  "compose_form.spoiler_placeholder": "Aviso sobre o contido (optativo)",
   "confirmation_modal.cancel": "Cancelar",
   "confirmations.block.block_and_report": "Bloquear e denunciar",
   "confirmations.block.confirm": "Bloquear",
@@ -269,6 +277,12 @@
   "follow_request.authorize": "Autorizar",
   "follow_request.reject": "Rexeitar",
   "follow_requests.unlocked_explanation": "Malia que a túa conta non é privada, a administración de {domain} pensou que quizabes terías que revisar de xeito manual as solicitudes de seguiminto.",
+  "follow_suggestions.curated_suggestion": "O servidor suxíreche",
+  "follow_suggestions.dismiss": "Non mostrar máis",
+  "follow_suggestions.personalized_suggestion": "Suxestión personalizada",
+  "follow_suggestions.popular_suggestion": "Suxestión popular",
+  "follow_suggestions.view_all": "Ver todas",
+  "follow_suggestions.who_to_follow": "A quen seguir",
   "followed_tags": "Cancelos seguidos",
   "footer.about": "Acerca de",
   "footer.directory": "Directorio de perfís",
@@ -295,13 +309,9 @@
   "hashtag.follow": "Seguir cancelo",
   "hashtag.unfollow": "Deixar de seguir cancelo",
   "hashtags.and_other": "…e {count, plural, one {}other {# máis}}",
-  "home.actions.go_to_explore": "Mira do que se está a falar",
-  "home.actions.go_to_suggestions": "Atopa persoas ás que seguir",
   "home.column_settings.basic": "Básico",
   "home.column_settings.show_reblogs": "Amosar compartidos",
   "home.column_settings.show_replies": "Amosar respostas",
-  "home.explore_prompt.body": "A túa cronoloxía de inicio vai ter unha mistura de publicacións procedentes dos cancelos que segues, das persoas que elexiches seguir e das publicacións que elas promoven. Se non tes moito que ler, podes probar a:",
-  "home.explore_prompt.title": "Iste é o teu fogar en Mastodon.",
   "home.hide_announcements": "Agochar anuncios",
   "home.pending_critical_update.body": "Por favor actualiza o antes posible o teu servidor Mastodon!",
   "home.pending_critical_update.link": "Mira as actualizacións",
@@ -514,7 +524,15 @@
   "poll_button.add_poll": "Engadir unha enquisa",
   "poll_button.remove_poll": "Eliminar enquisa",
   "privacy.change": "Axustar privacidade",
+  "privacy.direct.long": "Todas as mencionadas na publicación",
+  "privacy.direct.short": "Persoas concretas",
+  "privacy.private.long": "Só para seguidoras",
+  "privacy.private.short": "Seguidoras",
+  "privacy.public.long": "Para todas dentro e fóra de Mastodon",
   "privacy.public.short": "Público",
+  "privacy.unlisted.additional": "Do mesmo xeito que público, menos que a publicación non aparecerá nas cronoloxías en directo ou nos cancelos, en descubrir ou nas buscas de Mastodon, incluso se estivese establecido nas opcións xerais da conta.",
+  "privacy.unlisted.long": "Menor implicación dos algoritmos",
+  "privacy.unlisted.short": "Público limitado",
   "privacy_policy.last_updated": "Actualizado por última vez no {date}",
   "privacy_policy.title": "Política de Privacidade",
   "recommended": "Aconsellable",
@@ -532,7 +550,9 @@
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "hoxe",
+  "reply_indicator.attachments": "{count, plural, one {# adxunto} other {# adxuntos}}",
   "reply_indicator.cancel": "Desbotar",
+  "reply_indicator.poll": "Enquisa",
   "report.block": "Bloquear",
   "report.block_explanation": "Non vas ver as súas publicacións. Nin verá as túas publicacións nin poderá seguirte. Poderá comprobar que as bloqueaches.",
   "report.categories.legal": "Legal",
diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json
index d88a8c49c3687d..bf182a1657f1a1 100644
--- a/app/javascript/mastodon/locales/he.json
+++ b/app/javascript/mastodon/locales/he.json
@@ -145,11 +145,9 @@
   "compose_form.lock_disclaimer": "חשבונך אינו {locked}. כל אחד יוכל לעקוב אחריך כדי לקרוא את הודעותיך המיועדות לעוקבים בלבד.",
   "compose_form.lock_disclaimer.lock": "נעול",
   "compose_form.placeholder": "על מה את.ה חושב.ת?",
-  "compose_form.poll.add_option": "הוספת אפשרות",
   "compose_form.poll.duration": "משך הסקר",
   "compose_form.poll.multiple": "בחירה מרובה",
   "compose_form.poll.option_placeholder": "אפשרות {number}",
-  "compose_form.poll.remove_option": "הסרת אפשרות זו",
   "compose_form.poll.single": "נא לבחור",
   "compose_form.poll.switch_to_multiple": "אפשרו בחירה מרובה בסקר",
   "compose_form.poll.switch_to_single": "אפשרו בחירה בודדת בסקר",
@@ -279,6 +277,12 @@
   "follow_request.authorize": "הרשאה",
   "follow_request.reject": "דחיה",
   "follow_requests.unlocked_explanation": "למרות שחשבונך אינו נעול, צוות {domain} חושב שאולי כדאי לוודא את בקשות המעקב האלה ידנית.",
+  "follow_suggestions.curated_suggestion": "בחירת העורכים",
+  "follow_suggestions.dismiss": "לא להציג שוב",
+  "follow_suggestions.personalized_suggestion": "הצעות מותאמות אישית",
+  "follow_suggestions.popular_suggestion": "הצעה פופולרית",
+  "follow_suggestions.view_all": "צפיה בכל",
+  "follow_suggestions.who_to_follow": "אחרי מי לעקוב",
   "followed_tags": "התגיות שהחשבון שלך עוקב אחריהן",
   "footer.about": "אודות",
   "footer.directory": "ספריית פרופילים",
@@ -305,13 +309,9 @@
   "hashtag.follow": "לעקוב אחרי תגית",
   "hashtag.unfollow": "להפסיק לעקוב אחרי תגית",
   "hashtags.and_other": "…{count, plural,other {ועוד #}}",
-  "home.actions.go_to_explore": "הצגת מגמות",
-  "home.actions.go_to_suggestions": "למצוא א.נשים לעקוב אחריהן.ם",
   "home.column_settings.basic": "למתחילים",
   "home.column_settings.show_reblogs": "הצגת הדהודים",
   "home.column_settings.show_replies": "הצגת תגובות",
-  "home.explore_prompt.body": "פיד הבית שלך יכיל תערובת של הודעות מהתגיות והאנשים שבחרת למעקב, וההודעות שהנעקבים בוחרים להדהד. אם זה נראה שקט מדי כרגע אז מה לגבי:",
-  "home.explore_prompt.title": "זהו בסיס הבית שלך בתוך מסטודון.",
   "home.hide_announcements": "הסתר הכרזות",
   "home.pending_critical_update.body": "יש לעדכן את תוכנת מסטודון בהקדם האפשרי!",
   "home.pending_critical_update.link": "צפיה בעדכונים",
@@ -530,6 +530,9 @@
   "privacy.private.short": "עוקבים",
   "privacy.public.long": "כל הגולשים, מחוברים למסטודון או לא",
   "privacy.public.short": "פומבי",
+  "privacy.unlisted.additional": "ההתנהגות דומה להודעה ציבורית, מלבד שההודעה לא תופיע בפיד החי המקומי או בתגיות, תגליות או חיפוש מסטודון, אפילו אם ביקשת שהחשבון כולו יהיה פומבי.",
+  "privacy.unlisted.long": "פחות חשיפה לאלגוריתמים",
+  "privacy.unlisted.short": "ציבורי שקט",
   "privacy_policy.last_updated": "עודכן לאחרונה {date}",
   "privacy_policy.title": "מדיניות פרטיות",
   "recommended": "מומלץ",
diff --git a/app/javascript/mastodon/locales/hi.json b/app/javascript/mastodon/locales/hi.json
index 42f4ca4efab233..f88fe195691374 100644
--- a/app/javascript/mastodon/locales/hi.json
+++ b/app/javascript/mastodon/locales/hi.json
@@ -277,8 +277,6 @@
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
   "hashtag.follow": "हैशटैग को फॉलो करें",
   "hashtag.unfollow": "हैशटैग को उनफ़ोल्लोव करें",
-  "home.actions.go_to_explore": "देखिए क्या पक रहा है",
-  "home.actions.go_to_suggestions": "अनुसरने के लिए लोगो को ढूंढे",
   "home.column_settings.basic": "बुनियादी",
   "home.column_settings.show_reblogs": "बूस्ट दिखाए",
   "home.column_settings.show_replies": "जवाबों को दिखाए",
diff --git a/app/javascript/mastodon/locales/hr.json b/app/javascript/mastodon/locales/hr.json
index cada365fc868c8..9fe15f5a2d497d 100644
--- a/app/javascript/mastodon/locales/hr.json
+++ b/app/javascript/mastodon/locales/hr.json
@@ -261,7 +261,6 @@
   "hashtag.column_settings.tag_toggle": "Uključi dodatne oznake za ovaj stupac",
   "hashtag.follow": "Prati hashtag",
   "hashtag.unfollow": "Prestani pratiti hashtag",
-  "home.actions.go_to_explore": "Vidi trendove",
   "home.column_settings.basic": "Osnovno",
   "home.column_settings.show_reblogs": "Pokaži boostove",
   "home.column_settings.show_replies": "Pokaži odgovore",
diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json
index 31bca5652bcb66..8f979e55581161 100644
--- a/app/javascript/mastodon/locales/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@@ -145,12 +145,10 @@
   "compose_form.lock_disclaimer": "A fiókod nincs {locked}. Bárki követni tud, hogy megtekintse a kizárólag követőknek szánt bejegyzéseket.",
   "compose_form.lock_disclaimer.lock": "zárolva",
   "compose_form.placeholder": "Mi jár a fejedben?",
-  "compose_form.poll.add_option": "Opció hozzáadása",
   "compose_form.poll.duration": "Szavazás időtartama",
-  "compose_form.poll.multiple": "Több választás",
-  "compose_form.poll.option_placeholder": "Opció {number}",
-  "compose_form.poll.remove_option": "Opció eltávolítása",
-  "compose_form.poll.single": "Egy választása",
+  "compose_form.poll.multiple": "Több lehetőség",
+  "compose_form.poll.option_placeholder": "Válasz {number}",
+  "compose_form.poll.single": "Egyetlen válasz",
   "compose_form.poll.switch_to_multiple": "Szavazás megváltoztatása több választásosra",
   "compose_form.poll.switch_to_single": "Szavazás megváltoztatása egyetlen választásosra",
   "compose_form.poll.type": "Stílus",
@@ -160,7 +158,7 @@
   "compose_form.save_changes": "Frissítés",
   "compose_form.spoiler.marked": "Tartalmi figyelmeztetés eltávolítása",
   "compose_form.spoiler.unmarked": "Tartalmi figyelmeztetés hozzáadása",
-  "compose_form.spoiler_placeholder": "Tartalom figyelmeztetés (opcionális)",
+  "compose_form.spoiler_placeholder": "Tartalmi figyelmeztetés (opcionális)",
   "confirmation_modal.cancel": "Mégsem",
   "confirmations.block.block_and_report": "Letiltás és jelentés",
   "confirmations.block.confirm": "Letiltás",
@@ -279,6 +277,12 @@
   "follow_request.authorize": "Hitelesítés",
   "follow_request.reject": "Elutasítás",
   "follow_requests.unlocked_explanation": "Bár a fiókod nincs zárolva, a(z) {domain} csapata úgy gondolta, hogy talán kézzel szeretnéd ellenőrizni ezen fiókok követési kéréseit.",
+  "follow_suggestions.curated_suggestion": "Szerkesztői ajánlat",
+  "follow_suggestions.dismiss": "Ne jelenjen meg újra",
+  "follow_suggestions.personalized_suggestion": "Személyre szabott javaslat",
+  "follow_suggestions.popular_suggestion": "Népszerű javaslat",
+  "follow_suggestions.view_all": "Összes megtekintése",
+  "follow_suggestions.who_to_follow": "Kit érdemes követni",
   "followed_tags": "Követett hashtagek",
   "footer.about": "Névjegy",
   "footer.directory": "Profiltár",
@@ -305,13 +309,9 @@
   "hashtag.follow": "Hashtag követése",
   "hashtag.unfollow": "Hashtag követésének megszüntetése",
   "hashtags.and_other": "…és {count, plural, other {# további}}",
-  "home.actions.go_to_explore": "Felkapottak megtekintése",
-  "home.actions.go_to_suggestions": "Követhetők keresése",
   "home.column_settings.basic": "Általános",
   "home.column_settings.show_reblogs": "Megtolások megjelenítése",
   "home.column_settings.show_replies": "Válaszok megjelenítése",
-  "home.explore_prompt.body": "A saját hírfolyam a követésre kiválasztott hashtagek, a követésre kiválasztott személyek és az általuk népszerűsített bejegyzések keverékét tartalmazza. Ha csendesnek tűnik, akkor megpróbálhatod ezeket:",
-  "home.explore_prompt.title": "Ez a kezdőpontod a Mastodonon belül.",
   "home.hide_announcements": "Közlemények elrejtése",
   "home.pending_critical_update.body": "A lehető leghamarabb frissítsd a Mastodon kiszolgálódat!",
   "home.pending_critical_update.link": "Frissítések megtekintése",
@@ -524,15 +524,15 @@
   "poll_button.add_poll": "Új szavazás",
   "poll_button.remove_poll": "Szavazás eltávolítása",
   "privacy.change": "Bejegyzés láthatóságának módosítása",
-  "privacy.direct.long": "Mindenki, akit a bejegyzésben említettek",
-  "privacy.direct.short": "Adott személyek",
-  "privacy.private.long": "Csak a követők",
+  "privacy.direct.long": "Mindenki, akit a bejegyzés említ",
+  "privacy.direct.short": "Megadott személyek",
+  "privacy.private.long": "Csak a követőid",
   "privacy.private.short": "Követők",
   "privacy.public.long": "Bárki a Mastodonon és azon kívül",
   "privacy.public.short": "Nyilvános",
-  "privacy.unlisted.additional": "Ez pontosan úgy viselkedik, mint a nyilvános, kivéve, hogy a bejegyzés nem jelenik meg élő hírcsatornákban vagy hashtagokban, felfedezésben vagy a Mastodon keresésben, még akkor sem, ha az egész fiókra bejelentkezetünk.",
+  "privacy.unlisted.additional": "Ez pontosan úgy viselkedik, mint a nyilvános, kivéve, hogy a bejegyzés nem jelenik meg élő hírfolyamokban, hashtagekben, felfedezésben vagy a Mastodonos keresésben, még akkor sem, ha ezt az egész fiókra engedélyezted.",
   "privacy.unlisted.long": "Kevesebb algoritmikus fanfár",
-  "privacy.unlisted.short": "Csendes nyilvánosság",
+  "privacy.unlisted.short": "Csendes nyilvános",
   "privacy_policy.last_updated": "Utoljára frissítve: {date}",
   "privacy_policy.title": "Adatvédelmi szabályzat",
   "recommended": "Ajánlott",
diff --git a/app/javascript/mastodon/locales/ia.json b/app/javascript/mastodon/locales/ia.json
index 14b75a17f4351c..7b9ab3742b6746 100644
--- a/app/javascript/mastodon/locales/ia.json
+++ b/app/javascript/mastodon/locales/ia.json
@@ -7,10 +7,12 @@
   "account.add_or_remove_from_list": "Adder o remover ab listas",
   "account.badges.group": "Gruppo",
   "account.block": "Blocar @{name}",
+  "account.block_domain": "Blocar dominio {domain}",
   "account.block_short": "Blocar",
   "account.blocked": "Blocate",
   "account.browse_more_on_origin_server": "Navigar plus sur le profilo original",
   "account.copy": "Copiar ligamine a profilo",
+  "account.disable_notifications": "Stoppar le notificationes quando @{name} publica",
   "account.domain_blocked": "Dominio blocate",
   "account.edit_profile": "Modificar profilo",
   "account.enable_notifications": "Notifica me quando @{name} publica",
@@ -24,8 +26,10 @@
   "account.followers.empty": "Iste usator ancora non ha sequitores.",
   "account.followers_counter": "{count, plural, one {{counter} sequitor} other {{counter} sequitores}}",
   "account.following": "Sequente",
+  "account.follows.empty": "Iste usator ancora non seque nemo.",
   "account.go_to_profile": "Vader al profilo",
   "account.hide_reblogs": "Celar boosts de @{name}",
+  "account.in_memoriam": "In Memoriam.",
   "account.languages": "Cambiar le linguas subscribite",
   "account.link_verified_on": "Le proprietate de iste ligamine esseva verificate le {date}",
   "account.locked_info": "Le stato de confidentialitate de iste conto es definite a blocate. Le proprietario revisa manualmente qui pote sequer lo.",
@@ -39,12 +43,16 @@
   "account.open_original_page": "Aperir le pagina original",
   "account.posts": "Messages",
   "account.posts_with_replies": "Messages e responsas",
+  "account.requested": "Attendente le approbation. Clicca pro cancellar le requesta de sequer",
+  "account.requested_follow": "{name} habeva requestate sequer te",
   "account.share": "Compartir profilo de @{name}",
   "account.show_reblogs": "Monstrar responsas de @{name}",
+  "account.statuses_counter": "{count, plural, one {{counter} message} other {{counter} messages}}",
   "account.unblock": "Disblocar @{name}",
   "account.unblock_domain": "Disblocar dominio {domain}",
   "account.unblock_short": "Disblocar",
   "account.unendorse": "Non evidentiar sur le profilo",
+  "account.unfollow": "Non plus sequer",
   "account.unmute": "Non plus silentiar @{name}",
   "account.unmute_notifications_short": "Non plus silentiar le notificationes",
   "account.unmute_short": "Non plus silentiar",
@@ -76,11 +84,14 @@
   "column.mutes": "Usatores silentiate",
   "column.notifications": "Notificationes",
   "column.public": "Chronologia federate",
+  "column_back_button.label": "Retro",
   "column_header.hide_settings": "Celar le parametros",
   "column_header.moveLeft_settings": "Mover columna al sinistra",
   "column_header.moveRight_settings": "Mover columna al dextra",
   "column_header.show_settings": "Monstrar le parametros",
   "column_subheading.settings": "Parametros",
+  "community.column_settings.local_only": "Solmente local",
+  "community.column_settings.media_only": "Solmente medios",
   "compose.language.change": "Cambiar le lingua",
   "compose.language.search": "Cercar linguas...",
   "compose.published.body": "Message publicate.",
@@ -89,11 +100,23 @@
   "compose_form.direct_message_warning_learn_more": "Apprender plus",
   "compose_form.lock_disclaimer": "Tu conto non es {locked}. Quicunque pote sequer te pro vider tu messages solo pro sequitores.",
   "compose_form.lock_disclaimer.lock": "blocate",
+  "compose_form.poll.duration": "Duration del inquesta",
+  "compose_form.poll.multiple": "Selection multiple",
+  "compose_form.poll.option_placeholder": "Option {number}",
+  "compose_form.poll.single": "Seliger un",
+  "compose_form.poll.switch_to_multiple": "Cambiar inquesta pro permitter selectiones multiple",
+  "compose_form.poll.type": "Stylo",
+  "compose_form.publish": "Publicar",
   "compose_form.publish_form": "Nove message",
+  "compose_form.reply": "Responder",
+  "compose_form.save_changes": "Actualisar",
   "compose_form.spoiler.marked": "Remover advertimento de contento",
   "compose_form.spoiler.unmarked": "Adder advertimento de contento",
+  "compose_form.spoiler_placeholder": "Advertimento de contento (optional)",
   "confirmation_modal.cancel": "Cancellar",
+  "confirmations.block.block_and_report": "Blocar e signalar",
   "confirmations.block.confirm": "Blocar",
+  "confirmations.block.message": "Es tu secur que tu vole blocar {name}?",
   "confirmations.delete.confirm": "Deler",
   "confirmations.delete.message": "Es tu secur que tu vole deler iste message?",
   "confirmations.delete_list.confirm": "Deler",
@@ -105,6 +128,8 @@
   "confirmations.mute.confirm": "Silentiar",
   "confirmations.mute.message": "Es tu secur que tu vole silentiar {name}?",
   "confirmations.reply.confirm": "Responder",
+  "confirmations.unfollow.confirm": "Non plus sequer",
+  "confirmations.unfollow.message": "Es tu secur que tu vole non plus sequer {name}?",
   "conversation.delete": "Deler conversation",
   "conversation.mark_as_read": "Marcar como legite",
   "conversation.open": "Vider conversation",
@@ -114,6 +139,7 @@
   "copypaste.copy_to_clipboard": "Copiar al area de transferentia",
   "directory.federated": "Ab le fediverso cognoscite",
   "directory.local": "Solmente ab {domain}",
+  "directory.new_arrivals": "Nove arrivatas",
   "directory.recently_active": "Recentemente active",
   "disabled_account_banner.account_settings": "Parametros de conto",
   "disabled_account_banner.text": "Tu conto {disabledAccount} es actualmente disactivate.",
@@ -121,15 +147,24 @@
   "emoji_button.activity": "Activitate",
   "emoji_button.clear": "Rader",
   "emoji_button.custom": "Personalisate",
+  "emoji_button.flags": "Bandieras",
+  "emoji_button.food": "Alimentos e bibitas",
+  "emoji_button.label": "Inserer emoji",
+  "emoji_button.nature": "Natura",
+  "emoji_button.people": "Personas",
   "emoji_button.recent": "Frequentemente usate",
   "emoji_button.search": "Cercar...",
   "emoji_button.search_results": "Resultatos de recerca",
+  "emoji_button.symbols": "Symbolos",
+  "emoji_button.travel": "Viages e locos",
+  "empty_column.account_hides_collections": "Le usator ha seligite non facer iste information disponibile",
   "empty_column.account_suspended": "Conto suspendite",
   "empty_column.account_timeline": "Nulle messages hic!",
   "empty_column.account_unavailable": "Profilo non disponibile",
   "empty_column.blocks": "Tu non ha blocate alcun usator ancora.",
   "errors.unexpected_crash.report_issue": "Signalar un defecto",
   "explore.search_results": "Resultatos de recerca",
+  "explore.suggested_follows": "Personas",
   "explore.title": "Explorar",
   "explore.trending_links": "Novas",
   "explore.trending_statuses": "Messages",
@@ -145,6 +180,11 @@
   "firehose.all": "Toto",
   "firehose.local": "Iste servitor",
   "firehose.remote": "Altere servitores",
+  "follow_suggestions.curated_suggestion": "Selection del editores",
+  "follow_suggestions.dismiss": "Non monstrar novemente",
+  "follow_suggestions.personalized_suggestion": "Suggestion personalisate",
+  "follow_suggestions.popular_suggestion": "Suggestion personalisate",
+  "follow_suggestions.view_all": "Vider toto",
   "footer.about": "A proposito de",
   "footer.directory": "Directorio de profilos",
   "footer.get_app": "Obtene le application",
@@ -156,15 +196,20 @@
   "getting_started.heading": "Prime passos",
   "hashtag.column_header.tag_mode.all": "e {additional}",
   "hashtag.column_header.tag_mode.any": "o {additional}",
+  "hashtag.column_header.tag_mode.none": "sin {additional}",
   "hashtag.column_settings.select.no_options_message": "Nulle suggestiones trovate",
   "hashtag.column_settings.select.placeholder": "Insere hashtags…",
   "hashtag.follow": "Sequer hashtag",
+  "hashtag.unfollow": "Non sequer plus le hashtag",
+  "hashtags.and_other": "…e {count, plural, one {}other {# plus}}",
   "home.column_settings.show_reblogs": "Monstrar boosts",
   "home.column_settings.show_replies": "Monstrar responsas",
   "home.hide_announcements": "Celar annuncios",
   "home.pending_critical_update.body": "Actualisa tu servitor de Mastodon le plus tosto possibile!",
   "home.pending_critical_update.link": "Vider actualisationes",
+  "home.pending_critical_update.title": "Actualisation de securitate critic disponibile!",
   "home.show_announcements": "Monstrar annuncios",
+  "interaction_modal.login.prompt": "Dominio de tu servitor, p.e. mastodon.social",
   "interaction_modal.no_account_yet": "Non sur Mstodon?",
   "interaction_modal.on_another_server": "In un servitor differente",
   "interaction_modal.on_this_server": "In iste servitor",
@@ -183,8 +228,10 @@
   "keyboard_shortcuts.muted": "Aperir lista de usatores silentiate",
   "keyboard_shortcuts.my_profile": "Aperir tu profilo",
   "keyboard_shortcuts.notifications": "Aperir columna de notificationes",
+  "keyboard_shortcuts.profile": "Aperir le profilo del autor",
   "keyboard_shortcuts.reply": "Responder al message",
   "keyboard_shortcuts.spoilers": "Monstrar/celar le campo CW",
+  "keyboard_shortcuts.toggle_sensitivity": "Monstrar/celar medios",
   "keyboard_shortcuts.toot": "Initiar un nove message",
   "lightbox.close": "Clauder",
   "lightbox.next": "Sequente",
@@ -198,8 +245,11 @@
   "lists.exclusive": "Celar iste messages ab le initio",
   "lists.new.create": "Adder lista",
   "lists.new.title_placeholder": "Nove titulo del lista",
+  "lists.replies_policy.none": "Nemo",
   "lists.replies_policy.title": "Monstrar responsas a:",
   "lists.subheading": "Tu listas",
+  "loading_indicator.label": "Cargante…",
+  "media_gallery.toggle_visible": "{number, plural, one {Celar imagine} other {Celar imagines}}",
   "mute_modal.duration": "Duration",
   "mute_modal.hide_notifications": "Celar notificationes de iste usator?",
   "navigation_bar.about": "A proposito de",
@@ -215,24 +265,34 @@
   "navigation_bar.lists": "Listas",
   "navigation_bar.logout": "Clauder le session",
   "navigation_bar.mutes": "Usatores silentiate",
+  "navigation_bar.opened_in_classic_interface": "Messages, contos e altere paginas specific es aperite per predefinition in le interfacie web classic.",
+  "navigation_bar.personal": "Personal",
   "navigation_bar.preferences": "Preferentias",
   "navigation_bar.public_timeline": "Chronologia federate",
   "navigation_bar.search": "Cercar",
   "navigation_bar.security": "Securitate",
+  "notification.own_poll": "Tu inquesta finiva",
   "notification.update": "{name} modificava un message",
   "notifications.clear": "Rader notificationes",
   "notifications.column_settings.alert": "Notificationes de scriptorio",
+  "notifications.column_settings.favourite": "Favoritos:",
   "notifications.column_settings.filter_bar.advanced": "Monstrar tote le categorias",
   "notifications.column_settings.follow": "Nove sequitores:",
   "notifications.column_settings.mention": "Mentiones:",
+  "notifications.column_settings.poll": "Resultatos del inquesta:",
   "notifications.column_settings.push": "Notificationes push",
+  "notifications.column_settings.show": "Monstrar in columna",
   "notifications.column_settings.sound": "Reproducer sono",
   "notifications.column_settings.status": "Nove messages:",
+  "notifications.column_settings.unread_notifications.category": "Notificationes non legite",
   "notifications.filter.all": "Toto",
   "notifications.filter.favourites": "Favoritos",
   "notifications.filter.mentions": "Mentiones",
+  "notifications.filter.polls": "Resultatos del inquesta",
+  "notifications.filter.statuses": "Actualisationes de personas que tu seque",
   "notifications.grant_permission": "Conceder permission.",
   "notifications.group": "{count} notificationes",
+  "notifications_permission_banner.enable": "Activar notificationes de scriptorio",
   "onboarding.compose.template": "Salute #Mastodon!",
   "onboarding.profile.save_and_continue": "Salvar e continuar",
   "onboarding.share.next_steps": "Sequente passos possibile:",
diff --git a/app/javascript/mastodon/locales/id.json b/app/javascript/mastodon/locales/id.json
index 1670d616fb2ac1..88e99a7086a757 100644
--- a/app/javascript/mastodon/locales/id.json
+++ b/app/javascript/mastodon/locales/id.json
@@ -270,8 +270,6 @@
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
   "hashtag.follow": "Ikuti tagar",
   "hashtag.unfollow": "Batalkan pengikutan tagar",
-  "home.actions.go_to_explore": "Lihat apa yang lagi tranding",
-  "home.actions.go_to_suggestions": "Temukan Orang untuk Diikuti",
   "home.column_settings.basic": "Dasar",
   "home.column_settings.show_reblogs": "Tampilkan boost",
   "home.column_settings.show_replies": "Tampilkan balasan",
diff --git a/app/javascript/mastodon/locales/ie.json b/app/javascript/mastodon/locales/ie.json
index 5188d137e3bf59..d39aa6cf61bcda 100644
--- a/app/javascript/mastodon/locales/ie.json
+++ b/app/javascript/mastodon/locales/ie.json
@@ -145,11 +145,9 @@
   "compose_form.lock_disclaimer": "Tui conto ne es {locked}. Quicunc posse sequer te por vider tui postas solmen por sequitores.",
   "compose_form.lock_disclaimer.lock": "cludet",
   "compose_form.placeholder": "Quo es in tui spiritu?",
-  "compose_form.poll.add_option": "Adjunter option",
   "compose_form.poll.duration": "Duration del balotation",
   "compose_form.poll.multiple": "Selection multiplic",
   "compose_form.poll.option_placeholder": "Option {number}",
-  "compose_form.poll.remove_option": "Remover ti-ci option",
   "compose_form.poll.single": "Selecter un",
   "compose_form.poll.switch_to_multiple": "Changea li balotation por permisser multiplic selectiones",
   "compose_form.poll.switch_to_single": "Changea li balotation por permisser un singul selection",
@@ -304,13 +302,9 @@
   "hashtag.follow": "Sequer hashtag",
   "hashtag.unfollow": "Dessequer hashtag",
   "hashtags.and_other": "…e {count, plural, other {# in plu}}",
-  "home.actions.go_to_explore": "Vider lu populari",
-  "home.actions.go_to_suggestions": "Trovar gente por sequer",
   "home.column_settings.basic": "Basic",
   "home.column_settings.show_reblogs": "Monstrar boosts",
   "home.column_settings.show_replies": "Monstrar responses",
-  "home.explore_prompt.body": "Tui hemal témpor-linea have un mixtura del hashtags queles tu selectet sequer, li gente quem tu selectet sequer, e li postas queles ili boosta. Si to sembla tro quiet, tu fórsan vole:",
-  "home.explore_prompt.title": "To-ci es tui hemal págine in Mastodon.",
   "home.hide_announcements": "Celar proclamationes",
   "home.pending_critical_update.body": "Ples actualisar tui Mastodon-servitor tam rapid quam es possibil!",
   "home.pending_critical_update.link": "Vider actualisationes",
diff --git a/app/javascript/mastodon/locales/io.json b/app/javascript/mastodon/locales/io.json
index a9dd32c06caf16..c468f689ab776e 100644
--- a/app/javascript/mastodon/locales/io.json
+++ b/app/javascript/mastodon/locales/io.json
@@ -292,13 +292,9 @@
   "hashtag.follow": "Sequez hashtago",
   "hashtag.unfollow": "Desequez hashtago",
   "hashtags.and_other": "…e {count, plural, one {# plusa}other {# plusa}}",
-  "home.actions.go_to_explore": "Videz quo es populara nun",
-  "home.actions.go_to_suggestions": "Trovez personi por sequar",
   "home.column_settings.basic": "Simpla",
   "home.column_settings.show_reblogs": "Montrar repeti",
   "home.column_settings.show_replies": "Montrar respondi",
-  "home.explore_prompt.body": "Vua hemala fluo havos mixuro de la hashtagi quin vu selektis sequar, la personi quin vu selektis sequar, e la posti quin ili repetis. Se to semblas tro tacanta, vu darfas volar:",
-  "home.explore_prompt.title": "Co es vua hemo en Mastodon.",
   "home.hide_announcements": "Celez anunci",
   "home.pending_critical_update.body": "Voluntez aktualigar vua Mastodon-servilo tam balde kam es posibla!",
   "home.pending_critical_update.link": "Vidar aktualigaji",
diff --git a/app/javascript/mastodon/locales/is.json b/app/javascript/mastodon/locales/is.json
index dfece102bb2654..3c2337efd2133a 100644
--- a/app/javascript/mastodon/locales/is.json
+++ b/app/javascript/mastodon/locales/is.json
@@ -145,11 +145,9 @@
   "compose_form.lock_disclaimer": "Aðgangurinn þinn er ekki {locked}. Hver sem er getur fylgst með þér til að sjá þær færslur sem einungis eru til fylgjenda þinna.",
   "compose_form.lock_disclaimer.lock": "læstur",
   "compose_form.placeholder": "Hvað liggur þér á hjarta?",
-  "compose_form.poll.add_option": "Bæta við valkosti",
   "compose_form.poll.duration": "Tímalengd könnunar",
   "compose_form.poll.multiple": "Margir valkostir",
   "compose_form.poll.option_placeholder": "Valkostur {number}",
-  "compose_form.poll.remove_option": "Fjarlægja þennan valkost",
   "compose_form.poll.single": "Veldu eitt",
   "compose_form.poll.switch_to_multiple": "Breyta könnun svo hægt sé að hafa marga valkosti",
   "compose_form.poll.switch_to_single": "Breyta könnun svo hægt sé að hafa einn stakan valkost",
@@ -279,13 +277,19 @@
   "follow_request.authorize": "Heimila",
   "follow_request.reject": "Hafna",
   "follow_requests.unlocked_explanation": "Jafnvel þótt aðgangurinn þinn sé ekki læstur, hafa umsjónarmenn {domain} ímyndað sér að þú gætir viljað yfirfara handvirkt fylgjendabeiðnir frá þessum notendum.",
+  "follow_suggestions.curated_suggestion": "Úrval umsjónarfólks",
+  "follow_suggestions.dismiss": "Ekki birta þetta aftur",
+  "follow_suggestions.personalized_suggestion": "Persónuaðlöguð tillaga",
+  "follow_suggestions.popular_suggestion": "Vinsæl tillaga",
+  "follow_suggestions.view_all": "Skoða allt",
+  "follow_suggestions.who_to_follow": "Hverjum á að fylgjast með",
   "followed_tags": "Myllumerki sem fylgst er með",
   "footer.about": "Nánari upplýsingar",
   "footer.directory": "Notandasniðamappa",
   "footer.get_app": "Ná í forritið",
   "footer.invite": "Bjóða fólki",
   "footer.keyboard_shortcuts": "Flýtileiðir á lyklaborði",
-  "footer.privacy_policy": "Persónuverndarstefna",
+  "footer.privacy_policy": "Meðferð persónuupplýsinga",
   "footer.source_code": "Skoða frumkóða",
   "footer.status": "Staða",
   "generic.saved": "Vistað",
@@ -305,13 +309,9 @@
   "hashtag.follow": "Fylgjast með myllumerki",
   "hashtag.unfollow": "Hætta að fylgjast með myllumerki",
   "hashtags.and_other": "…og {count, plural, other {# til viðbótar}}",
-  "home.actions.go_to_explore": "Sjá hvað er í umræðunni",
-  "home.actions.go_to_suggestions": "Finna fólk til að fylgjast með",
   "home.column_settings.basic": "Einfalt",
   "home.column_settings.show_reblogs": "Sýna endurbirtingar",
   "home.column_settings.show_replies": "Birta svör",
-  "home.explore_prompt.body": "Heimastreymið þitt verður með blöndu af færslum úr myllumerkjunum sem þú hefur valið að fylgja, færslum frá fólki sem þú hefur valið að fylgja og færslum sem þau endurbirta. Ef þér finnst þetta allt of kyrrlátt, gætirðu viljað:",
-  "home.explore_prompt.title": "Þetta er bækistöð þín innan samfélagsins.",
   "home.hide_announcements": "Fela auglýsingar",
   "home.pending_critical_update.body": "Uppfærðu Mastodon-þjóninn þinn eins fljótt og mögulegt er!",
   "home.pending_critical_update.link": "Skoða uppfærslur",
@@ -672,7 +672,7 @@
   "status.reblogs.empty": "Enginn hefur ennþá endurbirt þessa færslu. Þegar einhver gerir það, mun það birtast hér.",
   "status.redraft": "Eyða og endurvinna drög",
   "status.remove_bookmark": "Fjarlægja bókamerki",
-  "status.replied_to": "Svaraði {name}",
+  "status.replied_to": "Svaraði til {name}",
   "status.reply": "Svara",
   "status.replyAll": "Svara þræði",
   "status.report": "Kæra @{name}",
diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json
index 920b80d5a61200..db8e88bd2a1b34 100644
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@@ -145,11 +145,9 @@
   "compose_form.lock_disclaimer": "Il tuo profilo non è {locked}. Chiunque può seguirti per visualizzare i tuoi post per soli seguaci.",
   "compose_form.lock_disclaimer.lock": "bloccato",
   "compose_form.placeholder": "Cos'hai in mente?",
-  "compose_form.poll.add_option": "Aggiungi opzione",
   "compose_form.poll.duration": "Durata del sondaggio",
   "compose_form.poll.multiple": "Scelta multipla",
   "compose_form.poll.option_placeholder": "Opzione {number}",
-  "compose_form.poll.remove_option": "Rimuovi questa opzione",
   "compose_form.poll.single": "Scegli uno",
   "compose_form.poll.switch_to_multiple": "Modifica il sondaggio per consentire scelte multiple",
   "compose_form.poll.switch_to_single": "Modifica il sondaggio per consentire una singola scelta",
@@ -279,6 +277,12 @@
   "follow_request.authorize": "Autorizza",
   "follow_request.reject": "Rifiuta",
   "follow_requests.unlocked_explanation": "Anche se il tuo profilo non è privato, lo staff di {domain} ha pensato che potresti voler revisionare manualmente le richieste di seguirti da questi profili.",
+  "follow_suggestions.curated_suggestion": "Scelta dell'editore",
+  "follow_suggestions.dismiss": "Non visualizzare più",
+  "follow_suggestions.personalized_suggestion": "Suggerimenti personalizzati",
+  "follow_suggestions.popular_suggestion": "Suggerimento frequente",
+  "follow_suggestions.view_all": "Vedi tutto",
+  "follow_suggestions.who_to_follow": "Chi seguire",
   "followed_tags": "Hashtag seguiti",
   "footer.about": "Info",
   "footer.directory": "Cartella dei profili",
@@ -305,13 +309,9 @@
   "hashtag.follow": "Segui l'hashtag",
   "hashtag.unfollow": "Smetti di seguire l'hashtag",
   "hashtags.and_other": "…e {count, plural, other {# in più}}",
-  "home.actions.go_to_explore": "Scopri cosa sia di tendenza",
-  "home.actions.go_to_suggestions": "Trova persone da seguire",
   "home.column_settings.basic": "Base",
   "home.column_settings.show_reblogs": "Mostra reblog",
   "home.column_settings.show_replies": "Mostra risposte",
-  "home.explore_prompt.body": "La tua home feed conterrà un mix di post degli hashtag che hai scelto di seguire, delle persone che hai scelto di seguire e dei post che condividono. Sembra abbastanza tranquillo in questo momento, quindi che ne dici di:",
-  "home.explore_prompt.title": "Questa è la tua base all'interno di Mastodon.",
   "home.hide_announcements": "Nascondi annunci",
   "home.pending_critical_update.body": "Ti preghiamo di aggiornare il tuo server di Mastodon, il prima possibile!",
   "home.pending_critical_update.link": "Visualizza aggiornamenti",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index e0cc96d571cd9d..180963e9e6e523 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -146,11 +146,19 @@
   "compose_form.lock_disclaimer.lock": "承認制",
   "compose_form.placeholder": "今なにしてる？",
   "compose_form.poll.duration": "アンケート期間",
+  "compose_form.poll.multiple": "複数選択",
+  "compose_form.poll.option_placeholder": "項目{number}",
+  "compose_form.poll.single": "単一選択",
   "compose_form.poll.switch_to_multiple": "複数選択に変更",
   "compose_form.poll.switch_to_single": "単一選択に変更",
+  "compose_form.poll.type": "スタイル",
+  "compose_form.publish": "投稿",
   "compose_form.publish_form": "投稿",
+  "compose_form.reply": "返信",
+  "compose_form.save_changes": "更新",
   "compose_form.spoiler.marked": "本文は警告の後ろに隠されます",
   "compose_form.spoiler.unmarked": "本文は隠されていません",
+  "compose_form.spoiler_placeholder": "閲覧注意 (オプション)",
   "confirmation_modal.cancel": "キャンセル",
   "confirmations.block.block_and_report": "ブロックし通報",
   "confirmations.block.confirm": "ブロック",
@@ -269,6 +277,7 @@
   "follow_request.authorize": "許可",
   "follow_request.reject": "拒否",
   "follow_requests.unlocked_explanation": "あなたのアカウントは承認制ではありませんが、{domain}のスタッフはこれらのアカウントからのフォローリクエストの確認が必要であると判断しました。",
+  "follow_suggestions.view_all": "すべて表示",
   "followed_tags": "フォロー中のハッシュタグ",
   "footer.about": "概要",
   "footer.directory": "ディレクトリ",
@@ -291,17 +300,13 @@
   "hashtag.column_settings.tag_toggle": "このカラムに追加のタグを含める",
   "hashtag.counter_by_accounts": "{count, plural, other {{counter}人投稿}}",
   "hashtag.counter_by_uses": "{count, plural, other {{counter}件}}",
-  "hashtag.counter_by_uses_today": "今日{count, plural, other {{counter}件}}",
+  "hashtag.counter_by_uses_today": "本日{count, plural, other {#件}}",
   "hashtag.follow": "ハッシュタグをフォローする",
   "hashtag.unfollow": "ハッシュタグのフォローを解除",
   "hashtags.and_other": "ほか{count, plural, other {#個}}",
-  "home.actions.go_to_explore": "話題をさがす",
-  "home.actions.go_to_suggestions": "フォローするユーザーを検索",
   "home.column_settings.basic": "基本設定",
   "home.column_settings.show_reblogs": "ブースト表示",
   "home.column_settings.show_replies": "返信表示",
-  "home.explore_prompt.body": "ユーザーやハッシュタグをフォローすると、この「ホーム」タイムラインに投稿やブーストが流れるようになります。タイムラインをもう少しにぎやかにしてみませんか？",
-  "home.explore_prompt.title": "Mastodonのタイムラインへようこそ。",
   "home.hide_announcements": "お知らせを隠す",
   "home.pending_critical_update.body": "速やかにMastodonサーバーをアップデートしてください。",
   "home.pending_critical_update.link": "詳細",
@@ -514,7 +519,15 @@
   "poll_button.add_poll": "アンケートを追加",
   "poll_button.remove_poll": "アンケートを削除",
   "privacy.change": "公開範囲を変更",
+  "privacy.direct.long": "本文で指定した相手のみ",
+  "privacy.direct.short": "特定の人",
+  "privacy.private.long": "フォロワーのみ",
+  "privacy.private.short": "フォロワー",
+  "privacy.public.long": "すべての人 (Mastodon以外も含む)",
   "privacy.public.short": "公開",
+  "privacy.unlisted.additional": "「公開」とほとんど同じですが、リアルタイムフィードやハッシュタグ、探索機能、Mastodon検索などに投稿が表示されない点で「公開」と異なります。また、アカウント設定で投稿の検索や表示を許可している場合でも、この公開範囲を設定した投稿は前述の機能には表示されません。",
+  "privacy.unlisted.long": "より表示機会の少ない公開",
+  "privacy.unlisted.short": "ひかえめな公開",
   "privacy_policy.last_updated": "{date}に更新",
   "privacy_policy.title": "プライバシーポリシー",
   "recommended": "おすすめ",
@@ -532,7 +545,9 @@
   "relative_time.minutes": "{number}分前",
   "relative_time.seconds": "{number}秒前",
   "relative_time.today": "今日",
+  "reply_indicator.attachments": "{count, plural, other {#件のメディア}}",
   "reply_indicator.cancel": "キャンセル",
+  "reply_indicator.poll": "アンケート",
   "report.block": "ブロック",
   "report.block_explanation": "相手の投稿が表示されなくなります。相手はあなたの投稿を見ることやフォローすることができません。相手はブロックされていることがわかります。",
   "report.categories.legal": "法令違反",
diff --git a/app/javascript/mastodon/locales/kab.json b/app/javascript/mastodon/locales/kab.json
index d9388c7048043f..7fb617518ca0ef 100644
--- a/app/javascript/mastodon/locales/kab.json
+++ b/app/javascript/mastodon/locales/kab.json
@@ -22,6 +22,7 @@
   "account.followers_counter": "{count, plural, one {{count} n umeḍfar} other {{count} n imeḍfaren}}",
   "account.following_counter": "{count, plural, one {{counter} yettwaḍfaren} other {{counter} yettwaḍfaren}}",
   "account.follows.empty": "Ar tura, amseqdac-agi ur yeṭṭafaṛ yiwen.",
+  "account.go_to_profile": "Ddu ɣer umaɣnu",
   "account.hide_reblogs": "Ffer ayen i ibeṭṭu @{name}",
   "account.link_verified_on": "Taɣara n useɣwen-a tettwasenqed ass n {date}",
   "account.locked_info": "Amiḍan-agi uslig isekweṛ. D bab-is kan i izemren ad yeǧǧ, s ufus-is, win ara t-iḍefṛen.",
@@ -99,6 +100,7 @@
   "compose_form.lock_disclaimer.lock": "yettwacekkel",
   "compose_form.placeholder": "D acu i itezzin deg wallaɣ?",
   "compose_form.poll.duration": "Tanzagt n tefrant",
+  "compose_form.poll.single": "Fren yiwen",
   "compose_form.publish_form": "Suffeɣ",
   "compose_form.spoiler.marked": "Kkes aḍris yettwaffren deffir n walɣu",
   "compose_form.spoiler.unmarked": "Rnu aḍris yettwaffren deffir n walɣu",
@@ -368,7 +370,9 @@
   "report.close": "Immed",
   "report.forward": "Bren-it ɣeṛ {target}",
   "report.mute": "Sgugem",
+  "report.next": "Uḍfiṛ",
   "report.placeholder": "Iwenniten-nniḍen",
+  "report.reasons.dislike": "Ur t-ḥemmleɣ ara",
   "report.reasons.spam": "D aspam",
   "report.submit": "Azen",
   "report.target": "Mmel {target}",
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index eae7f8faea09eb..50d99599944e8c 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -145,11 +145,9 @@
   "compose_form.lock_disclaimer": "이 계정은 {locked}상태가 아닙니다. 누구나 이 계정을 팔로우 하여 팔로워 전용의 게시물을 볼 수 있습니다.",
   "compose_form.lock_disclaimer.lock": "비공개",
   "compose_form.placeholder": "지금 무슨 생각을 하고 있나요?",
-  "compose_form.poll.add_option": "항목 추가",
   "compose_form.poll.duration": "투표 기간",
   "compose_form.poll.multiple": "다중 선택",
   "compose_form.poll.option_placeholder": "{option}번째 항목",
-  "compose_form.poll.remove_option": "이 항목 삭제",
   "compose_form.poll.single": "단일 선택",
   "compose_form.poll.switch_to_multiple": "다중 선택이 가능한 투표로 변경",
   "compose_form.poll.switch_to_single": "단일 선택 투표로 변경",
@@ -160,7 +158,7 @@
   "compose_form.save_changes": "수정",
   "compose_form.spoiler.marked": "열람주의 제거",
   "compose_form.spoiler.unmarked": "열람 주의 문구 추가",
-  "compose_form.spoiler_placeholder": "열람 주의 (옵션)",
+  "compose_form.spoiler_placeholder": "내용 경고 (선택사항)",
   "confirmation_modal.cancel": "취소",
   "confirmations.block.block_and_report": "차단하고 신고하기",
   "confirmations.block.confirm": "차단",
@@ -279,6 +277,12 @@
   "follow_request.authorize": "허가",
   "follow_request.reject": "거부",
   "follow_requests.unlocked_explanation": "귀하의 계정이 잠긴 계정이 아닐지라도, {domain} 스태프는 이 계정들의 팔로우 요청을 수동으로 처리해 주시면 좋겠다고 생각했습니다.",
+  "follow_suggestions.curated_suggestion": "중재자의 추천",
+  "follow_suggestions.dismiss": "다시 보지 않기",
+  "follow_suggestions.personalized_suggestion": "개인화된 추천",
+  "follow_suggestions.popular_suggestion": "인기있는 추천",
+  "follow_suggestions.view_all": "모두 보기",
+  "follow_suggestions.who_to_follow": "팔로우할 만한 사람",
   "followed_tags": "팔로우 중인 해시태그",
   "footer.about": "정보",
   "footer.directory": "프로필 책자",
@@ -305,13 +309,9 @@
   "hashtag.follow": "팔로우",
   "hashtag.unfollow": "팔로우 해제",
   "hashtags.and_other": "…그리고 {count, plural,other {#개 더}}",
-  "home.actions.go_to_explore": "무엇이 유행인지 보기",
-  "home.actions.go_to_suggestions": "팔로우할 사람 찾기",
   "home.column_settings.basic": "기본",
   "home.column_settings.show_reblogs": "부스트 표시",
   "home.column_settings.show_replies": "답글 표시",
-  "home.explore_prompt.body": "홈 피드에는 내가 팔로우한 해시태그 그리고 팔로우한 사람과 부스트가 함께 나타납니다. 너무 고요하게 느껴진다면, 다음 것들을 살펴볼 수 있습니다.",
-  "home.explore_prompt.title": "이곳은 마스토돈의 내 본거지입니다.",
   "home.hide_announcements": "공지사항 숨기기",
   "home.pending_critical_update.body": "서둘러 마스토돈 서버를 업데이트 하세요!",
   "home.pending_critical_update.link": "업데이트 보기",
@@ -477,7 +477,7 @@
   "onboarding.actions.go_to_explore": "무엇이 유행인지 보러 가기",
   "onboarding.actions.go_to_home": "홈 피드로 가기",
   "onboarding.compose.template": "안녕 #마스토돈!",
-  "onboarding.follows.empty": "안타깝지만 아직은 아무 것도 보여드릴 수 없습니다. 검색을 이용하거나 발견하기 페이지에서 팔로우 할 사람을 찾을 수 있습니다. 아니면 잠시 후에 다시 시도하세요.",
+  "onboarding.follows.empty": "안타깝지만 아직은 아무 것도 보여드릴 수 없습니다. 검색을 이용하거나 둘러보기 페이지에서 팔로우 할 사람을 찾을 수 있습니다. 아니면 잠시 후에 다시 시도하세요.",
   "onboarding.follows.lead": "홈 피드는 마스토돈을 경험하는 주된 경로입니다. 더 많은 사람들을 팔로우 할수록 더 활발하고 흥미로워질 것입니다. 여기 시작을 위한 몇몇 추천을 드립니다:",
   "onboarding.follows.title": "내게 맞는 홈 피드 꾸미기",
   "onboarding.profile.discoverable": "내 프로필을 발견 가능하도록 설정",
@@ -526,11 +526,11 @@
   "privacy.change": "게시물의 프라이버시 설정을 변경",
   "privacy.direct.long": "이 게시물에서 언급된 모두",
   "privacy.direct.short": "특정 인물",
-  "privacy.private.long": "내 팔로워들에게만",
+  "privacy.private.long": "내 팔로워만",
   "privacy.private.short": "팔로워",
   "privacy.public.long": "마스토돈 내외 모두",
   "privacy.public.short": "공개",
-  "privacy.unlisted.additional": "공개와 똑같지만 게시물이 라이브 피드나 해시태그, 발견하기, (계정 설정에서 허용했더라도) 마스토돈 검색에서 제외됩니다.",
+  "privacy.unlisted.additional": "공개와 똑같지만 게시물이 실시간 피드나 해시태그, 둘러보기, (계정 설정에서 허용했더라도) 마스토돈 검색에서 제외됩니다.",
   "privacy.unlisted.long": "더 적은 알고리즘 팡파레",
   "privacy.unlisted.short": "조용한 공개",
   "privacy_policy.last_updated": "{date}에 마지막으로 업데이트됨",
diff --git a/app/javascript/mastodon/locales/lad.json b/app/javascript/mastodon/locales/lad.json
index ba99f5cd30881d..3ec3b6af1b5faf 100644
--- a/app/javascript/mastodon/locales/lad.json
+++ b/app/javascript/mastodon/locales/lad.json
@@ -4,16 +4,16 @@
   "about.disclaimer": "Mastodon es un programario libero, kon kodiche avierto i una marka komersiala de Mastodon gGmbH.",
   "about.domain_blocks.no_reason_available": "Razon no desponivle",
   "about.domain_blocks.preamble": "Mastodon djeneralmente te permete ver kontenido de i enteraktuar kon utilizadores de kualseker otro sirvidor en el fediverso. Estas son las eksepsiones en este sirvidor en partikolar.",
-  "about.domain_blocks.silenced.explanation": "\"Djeneralmente no veras profiles i kontenido de este sirvidor, salvo ke eksplisitamente lo bushkes o sigas algun kuento de el.",
+  "about.domain_blocks.silenced.explanation": "Djeneralmente no veras profiles i kontenido de este sirvidor, salvo ke eksplisitamente lo bushkes o sigas algun kuento de el.",
   "about.domain_blocks.silenced.title": "Limitado",
-  "about.domain_blocks.suspended.explanation": "Dingunos datos de este sirvidor sera prosesado, magazinado o enterkambiado kon este sirvidor. Enteraksyon o komunikasyon kon sus utilizadores sera imposivle.",
+  "about.domain_blocks.suspended.explanation": "Dingunos datos de este sirvidor seran prosesados, magazinados o enterkambiados. Enteraksyon o komunikasyon kon sus utilizadores sera imposivle.",
   "about.domain_blocks.suspended.title": "Suspendido",
   "about.not_available": "Esta enformasyon no esta desponivle en este sirvidor.",
   "about.powered_by": "Redes sosyalas desentralizadas kon uzo de {mastodon}",
   "about.rules": "Reglas del sirvidor",
   "account.account_note_header": "Nota",
   "account.add_or_remove_from_list": "Adjusta a o kita de listas",
-  "account.badges.bot": "Bot",
+  "account.badges.bot": "Otomatizado",
   "account.badges.group": "Grupo",
   "account.block": "Bloka @{name}",
   "account.block_domain": "Bloka el domeno {domain}",
@@ -23,13 +23,13 @@
   "account.cancel_follow_request": "Anula solisitud de segir",
   "account.copy": "Kopia atadijo de profil",
   "account.direct": "Enmenta a @{name} en privado",
-  "account.disable_notifications": "No me avizes mas sovre publikasyones de @{name}",
+  "account.disable_notifications": "Desha de avizarme sovre publikasyones de @{name}",
   "account.domain_blocked": "Domeno blokado",
   "account.edit_profile": "Edita profil",
   "account.enable_notifications": "Avizame kuando @{name} publike",
   "account.endorse": "Avalia en profil",
   "account.featured_tags.last_status_at": "Ultima publikasyon de {date}",
-  "account.featured_tags.last_status_never": "\"No ay publikasyones",
+  "account.featured_tags.last_status_never": "No ay publikasyones",
   "account.featured_tags.title": "Etiketas avaliadas de {name}",
   "account.follow": "Sige",
   "account.follow_back": "Sige tamyen",
@@ -38,19 +38,19 @@
   "account.followers_counter": "{count, plural, one {{counter} suivante} other {{counter} suivantes}}",
   "account.following": "Sigiendo",
   "account.following_counter": "{count, plural, other {Sigiendo a {counter}}}",
-  "account.follows.empty": "Este utilizador ainda no sige a ningun.",
+  "account.follows.empty": "Este utilizador ainda no sige a dingun.",
   "account.go_to_profile": "Va al profil",
   "account.hide_reblogs": "Eskonde repartajasyones de @{name}",
   "account.in_memoriam": "De bendicha memoria.",
   "account.joined_short": "Adjunto",
-  "account.languages": "Troka linguas suskrividas",
+  "account.languages": "Troka linguas abonadas",
   "account.link_verified_on": "La propriedad de este atadijo fue verifikada el {date}",
   "account.locked_info": "El estado de privasita de este konto esta konfigurado komo serado. El proprietario reviza manualmente kien le puede segir.",
   "account.media": "Multimedia",
   "account.mention": "Enmenta a @{name}",
   "account.moved_to": "{name} tiene endikado ke su muevo kuento agora es:",
   "account.mute": "Silensia a @{name}",
-  "account.mute_notifications_short": "Silensia avizos de @{name}",
+  "account.mute_notifications_short": "Silensia avizos",
   "account.mute_short": "Silensia",
   "account.muted": "Silensiado",
   "account.mutual": "Mutual",
@@ -64,7 +64,7 @@
   "account.share": "Partaja el profil de @{name}",
   "account.show_reblogs": "Amostra repartajasyones de @{name}",
   "account.statuses_counter": "{count, plural, one {{counter} publikasyon} other {{counter} publikasyones}}",
-  "account.unblock": "Dezbloka @{name}",
+  "account.unblock": "Dezbloka a @{name}",
   "account.unblock_domain": "Dezbloka domeno {domain}",
   "account.unblock_short": "Dezbloka",
   "account.unendorse": "No avalia en profil",
@@ -79,8 +79,8 @@
   "admin.dashboard.retention.cohort": "Mez de enrejistrasyon",
   "admin.dashboard.retention.cohort_size": "Muevos utilizadores",
   "admin.impact_report.instance_accounts": "Profiles de kuentos esto efasaria",
-  "admin.impact_report.instance_followers": "Suivantes a los kualos nuestros utilizadores perderian",
-  "admin.impact_report.instance_follows": "Suivantes a los kualos sus utilizadores perderian",
+  "admin.impact_report.instance_followers": "Suivantes a los kualos nuestros utilizadores pedrerian",
+  "admin.impact_report.instance_follows": "Suivantes a los kualos sus utilizadores pedrerian",
   "admin.impact_report.title": "Rezumen de impakto",
   "alert.rate_limited.message": "Por favor aprova dempues de {retry_time, time, medium}.",
   "alert.rate_limited.title": "Trafiko limitado",
@@ -88,7 +88,7 @@
   "alert.unexpected.title": "Atyo!",
   "announcement.announcement": "Pregon",
   "attachments_list.unprocessed": "(no prosesado)",
-  "audio.hide": "Eskonder audio",
+  "audio.hide": "Eskonde audio",
   "boost_modal.combo": "Puedes klikar {combo} para ometer esto la proksima vez",
   "bundle_column_error.copy_stacktrace": "Kopia el raporto de yerro",
   "bundle_column_error.error.body": "La pajina solisitada no pudo ser renderada. Podria ser por un yerro en muestro kodiche o un problem de kompatibilita kon el navigador.",
@@ -110,7 +110,7 @@
   "column.about": "Sovre mozotros",
   "column.blocks": "Utilizadores blokados",
   "column.bookmarks": "Markadores",
-  "column.community": "Linya de tiempo lokala",
+  "column.community": "Linya lokala",
   "column.direct": "Enmentaduras privadas",
   "column.directory": "Eksplora profiles",
   "column.domain_blocks": "Domenos blokados",
@@ -122,7 +122,7 @@
   "column.mutes": "Utilizadores silensiados",
   "column.notifications": "Avizos",
   "column.pins": "Publikasyones fiksadas",
-  "column.public": "Linya de tiempo federada",
+  "column.public": "Linya federada",
   "column_back_button.label": "Atras",
   "column_header.hide_settings": "Eskonde opsyones",
   "column_header.moveLeft_settings": "Move kolumna a la siedra",
@@ -146,11 +146,19 @@
   "compose_form.lock_disclaimer.lock": "serrado",
   "compose_form.placeholder": "Ke haber?",
   "compose_form.poll.duration": "Durasion de anketa",
-  "compose_form.poll.switch_to_multiple": "Trokar anketa para permeter a eskojer mas ke una opsyon",
-  "compose_form.poll.switch_to_single": "Trokar anketa para permeter a eskojer solo una opsyon",
+  "compose_form.poll.multiple": "Multiples opsyones",
+  "compose_form.poll.option_placeholder": "Opsyon {number}",
+  "compose_form.poll.single": "Eskoje uno",
+  "compose_form.poll.switch_to_multiple": "Troka anketa para permeter a eskojer mas ke una opsyon",
+  "compose_form.poll.switch_to_single": "Troka anketa para permeter a eskojer solo una opsyon",
+  "compose_form.poll.type": "Estilo",
+  "compose_form.publish": "Publika",
   "compose_form.publish_form": "Mueva publikasyon",
+  "compose_form.reply": "Arisponde",
+  "compose_form.save_changes": "Aktualiza",
   "compose_form.spoiler.marked": "Kita avertensya de kontenido",
   "compose_form.spoiler.unmarked": "Adjusta avertensya de kontenido",
+  "compose_form.spoiler_placeholder": "Avertensya de kontenido (opsyonal)",
   "confirmation_modal.cancel": "Anula",
   "confirmations.block.block_and_report": "Bloka i raporta",
   "confirmations.block.confirm": "Bloka",
@@ -166,16 +174,16 @@
   "confirmations.domain_block.confirm": "Bloka domeno entero",
   "confirmations.domain_block.message": "Estas totalmente siguro ke keres blokar todo el domeno {domain}? En djeneral unos kuantos blokos o silensiamientos son sufisientes i preferavles. No veras kontenido de akel domeno en dinguna linya de tiempo publika ni ent tus avizos. Tus suivantes de akel domeno seran kitados.",
   "confirmations.edit.confirm": "Edita",
-  "confirmations.edit.message": "Editar agora kitara el mesaj kualo estas eskriviendo aktualmente. Estas siguro ke keres fazerlo?",
+  "confirmations.edit.message": "Si edites agora, kitaras el mesaj kualo estas eskriviendo aktualmente. Estas siguro ke keres fazerlo?",
   "confirmations.logout.confirm": "Sal",
   "confirmations.logout.message": "Estas siguro ke keres salir de tu kuento?",
   "confirmations.mute.confirm": "Silensia",
   "confirmations.mute.explanation": "Esto eskondera las publikasyones de este kuento i publikasyones ke lo enmentan, pero ainda les permetera segirte.",
   "confirmations.mute.message": "Estas siguro ke keres silensiar a {name}?",
-  "confirmations.redraft.confirm": "Efasar i reeskrivir",
+  "confirmations.redraft.confirm": "Efasa i reeskrive",
   "confirmations.redraft.message": "Estas siguro ke keres efasar esta publikasyon i reeskrivirla? Pedreras todos los favoritos i repartajasyones asosiados kon esta publikasyon i repuestas a eya seran guerfanadas.",
   "confirmations.reply.confirm": "Arisponde",
-  "confirmations.reply.message": "Arispondir agora kitara el mesaj kualo estas eskriviendo aktualmente. Estas siguro ke keres fazerlo?",
+  "confirmations.reply.message": "Si arispondas agora, kitaras el mesaj kualo estas eskriviendo aktualmente. Estas siguro ke keres fazerlo?",
   "confirmations.unfollow.confirm": "Desige",
   "confirmations.unfollow.message": "Estas siguro ke keres deshar de segir a {name}?",
   "conversation.delete": "Efasa konversasyon",
@@ -198,13 +206,13 @@
   "dismissable_banner.explore_tags": "Estas etiketas estan agora popularas en la red sosyala. Etiketas uzadas por mas djente aparesen primero.",
   "dismissable_banner.public_timeline": "Estas son las publikasyones publikas mas resientes de personas en la red sosyala a las kualas la djente de {domain} sige.",
   "embed.instructions": "Enkrusta esta publikasyon en tu sitio internetiko kopiando este kodiche.",
-  "embed.preview": "Ansi paresera:",
+  "embed.preview": "Paresera ansina:",
   "emoji_button.activity": "Aktivita",
   "emoji_button.clear": "Alimpia",
   "emoji_button.custom": "Personalizado",
   "emoji_button.flags": "Bandieras",
   "emoji_button.food": "Kumidas i beverajes",
-  "emoji_button.label": "Adjustar emoji",
+  "emoji_button.label": "Adjusta emoji",
   "emoji_button.nature": "Natura",
   "emoji_button.not_found": "Emojis no topados",
   "emoji_button.objects": "Objektos",
@@ -214,7 +222,7 @@
   "emoji_button.search_results": "Rizultados de bushkeda",
   "emoji_button.symbols": "Simbolos",
   "emoji_button.travel": "Viajes i lugares",
-  "empty_column.account_hides_collections": "Este utilizador desidio no mostrar esta enformasyon",
+  "empty_column.account_hides_collections": "Este utilizador desidio no amostrar esta enformasyon",
   "empty_column.account_suspended": "Kuento suspendido",
   "empty_column.account_timeline": "No ay publikasyones aki!",
   "empty_column.account_unavailable": "Profil no desponivle",
@@ -225,9 +233,9 @@
   "empty_column.domain_blocks": "Ainda no ay domenos blokados.",
   "empty_column.explore_statuses": "No ay dingunos trendes agora. Mira mas tadre!",
   "empty_column.favourited_statuses": "Ainda no tienes publikasyones favoritas. Kuando indikes ke una te plaze, se amostrara aki.",
-  "empty_column.favourites": "Nadie tiene indikado ke le plaze una de tus publikasyones. Kuando algun lo aga, se amostrara aki.",
+  "empty_column.favourites": "Dingun no tiene indikado ke le plaze una de tus publikasyones. Kuando algun lo ayga, se amostrara aki.",
   "empty_column.follow_requests": "No tienes dinguna solisitud de suivante. Kuando risivas una, se amostrara aki.",
-  "empty_column.followed_tags": "Ainda no tienes segido dinguna etiketa. Kuando lo agas, se amostraran aki.",
+  "empty_column.followed_tags": "Ainda no tienes segido dinguna etiketa. Kuando lo aygas, se amostraran aki.",
   "empty_column.hashtag": "Ainda no ay niente en esta etiketa.",
   "empty_column.home": "Tu linya de tiempo esta vaziya! Sige a mas personas para inchirla.",
   "empty_column.list": "Ainda no ay niente en esta lista. Kuando miembros de esta lista publiken muevas publikasyones, se amostraran aki.",
@@ -236,14 +244,14 @@
   "empty_column.notifications": "Ainda no tienes dingun avizo. Kuando otras personas enteraktuen kontigo, se amostraran aki.",
   "empty_column.public": "No ay niente aki! Eskrive algo publikamente o manualmente sige utilizadores de otros sirvidores para inchirlo",
   "error.unexpected_crash.explanation": "Por un yerro en muestro kodiche o un problem de kompatibilita kon el navigador, no se puede amostrar esta pajina djustamente.",
-  "error.unexpected_crash.explanation_addons": "No se puede amostrar esta pajina djustamente. Este yerro probavlemente fue kauzado por un komplimento del navigador o por un enstrumento de traduksion.",
+  "error.unexpected_crash.explanation_addons": "No se puede amostrar esta pajina djustamente. Este yerro probavlemente fue kauzado por un komplimento del navigador o por un enstrumento de traduksyon.",
   "error.unexpected_crash.next_steps": "Aprova arefreskar la pajina. Si esto no ayuda, es posivle ke ainda puedas kulaenar Mastodon kon otro navigador u otra aplikasyon nativa.",
-  "error.unexpected_crash.next_steps_addons": "Aprova inkapasitarlos i arefreskar la pajina. Si esto no ayuda, es posivle ke ainda puedas kulanear Mastodon kon otro navigador u otra aplikasyon nativa.",
-  "errors.unexpected_crash.copy_stacktrace": "Kopiar stacktrace al portapapeles",
-  "errors.unexpected_crash.report_issue": "Raportar problema",
+  "error.unexpected_crash.next_steps_addons": "Aprova inkapasitarlos i arefreskar la pajina. Si esto no te ayuda, es posivle ke ainda puedas kulanear Mastodon kon otro navigador u otra aplikasyon nativa.",
+  "errors.unexpected_crash.copy_stacktrace": "Kopia stacktrace al portapapeles",
+  "errors.unexpected_crash.report_issue": "Raporta problema",
   "explore.search_results": "Rizultados de bushkeda",
   "explore.suggested_follows": "Djente",
-  "explore.title": "Eksplorar",
+  "explore.title": "Eksplora",
   "explore.trending_links": "Haberes",
   "explore.trending_statuses": "Publikasyones",
   "explore.trending_tags": "Etiketas",
@@ -259,22 +267,28 @@
   "filter_modal.select_filter.context_mismatch": "no se aplika a este konteksto",
   "filter_modal.select_filter.expired": "kadukado",
   "filter_modal.select_filter.prompt_new": "Mueva kategoria: {name}",
-  "filter_modal.select_filter.search": "Bushkar o kriyar",
-  "filter_modal.select_filter.subtitle": "Kulanear una kategoria egzistente o kriya mueva",
-  "filter_modal.select_filter.title": "Filtrar esta publikasyon",
-  "filter_modal.title.status": "Filtrar una publikasyon",
+  "filter_modal.select_filter.search": "Bushka o kriya",
+  "filter_modal.select_filter.subtitle": "Kulanea una kategoria egzistente o kriya mueva",
+  "filter_modal.select_filter.title": "Filtra esta publikasyon",
+  "filter_modal.title.status": "Filtra una publikasyon",
   "firehose.all": "Todo",
   "firehose.local": "Este sirvidor",
   "firehose.remote": "Otros sirvidores",
   "follow_request.authorize": "Autoriza",
   "follow_request.reject": "Refuza",
   "follow_requests.unlocked_explanation": "Aunke tu kuento no esta serrado, la taifa de {domain} kreye ke talvez keres revizar manualmente las solisitudes de segimento de estos kuentos.",
+  "follow_suggestions.curated_suggestion": "Sujestion del sirvidor",
+  "follow_suggestions.dismiss": "No amostra mas",
+  "follow_suggestions.personalized_suggestion": "Sujestion personalizada",
+  "follow_suggestions.popular_suggestion": "Sujestion populara",
+  "follow_suggestions.view_all": "Ve todos",
+  "follow_suggestions.who_to_follow": "A ken segir",
   "followed_tags": "Etiketas segidas",
   "footer.about": "Sovre mozotros",
   "footer.directory": "Katalogo de profiles",
   "footer.get_app": "Abasha aplikasyon",
-  "footer.invite": "Envitar a djente",
-  "footer.keyboard_shortcuts": "Akortamientos de klavye",
+  "footer.invite": "Envita a djente",
+  "footer.keyboard_shortcuts": "Akortamientos de klaviatura",
   "footer.privacy_policy": "Politika de privasita",
   "footer.source_code": "Ve kodiche fuente",
   "footer.status": "Estado",
@@ -284,24 +298,20 @@
   "hashtag.column_header.tag_mode.any": "o {additional}",
   "hashtag.column_header.tag_mode.none": "sin {additional}",
   "hashtag.column_settings.select.no_options_message": "Rekomendasyones no topadas",
-  "hashtag.column_settings.select.placeholder": "Meter etiketas…",
+  "hashtag.column_settings.select.placeholder": "Mete etiketas…",
   "hashtag.column_settings.tag_mode.all": "Todos estos",
   "hashtag.column_settings.tag_mode.any": "Kualsekera de estos",
   "hashtag.column_settings.tag_mode.none": "Dinguno de estos",
-  "hashtag.column_settings.tag_toggle": "Inkluir etiketas adisionalas en esta kolumna",
+  "hashtag.column_settings.tag_toggle": "Inkluye etiketas adisionalas en esta kolumna",
   "hashtag.counter_by_accounts": "{count, plural, one {{counter} partisipante} other {{counter} partisipantes}}",
   "hashtag.counter_by_uses": "{count, plural, one {{counter} publikasyon} other {{counter} publikasyones}}",
   "hashtag.counter_by_uses_today": "{count, plural, one {{counter} publikasyon} other {{counter} publikasyones}} oy",
-  "hashtag.follow": "Segir etiketa",
-  "hashtag.unfollow": "Desegir etiketa",
+  "hashtag.follow": "Sige etiketa",
+  "hashtag.unfollow": "Desige etiketa",
   "hashtags.and_other": "…i {count, plural, one {}other {# mas}}",
-  "home.actions.go_to_explore": "Ve los trendes",
-  "home.actions.go_to_suggestions": "Topa a djente para segir",
   "home.column_settings.basic": "Opsyones bazikas",
-  "home.column_settings.show_reblogs": "Amostrar repartajasyones",
-  "home.column_settings.show_replies": "Amostrar repuestas",
-  "home.explore_prompt.body": "Tu linya prinsipala es una mikstura de publikasyones kon etiketas a las kualas eskojites a segir, la djente a la kuala eskojites a segir i las publikasyones ke eyos repartajan. Si esta demaziado trankila, puedes:",
-  "home.explore_prompt.title": "Esta es tu baza prinsipala en Mastodon.",
+  "home.column_settings.show_reblogs": "Amostra repartajasyones",
+  "home.column_settings.show_replies": "Amostra repuestas",
   "home.hide_announcements": "Eskonde pregones",
   "home.pending_critical_update.body": "Por favor aktualiza tu sirvidor de Mastodon pishin!",
   "home.pending_critical_update.link": "Ve aktualizasyones",
@@ -337,7 +347,7 @@
   "keyboard_shortcuts.favourite": "Endika ke te plaze una publikasyon",
   "keyboard_shortcuts.favourites": "Avre lista de favoritos",
   "keyboard_shortcuts.federated": "Avre linya federada",
-  "keyboard_shortcuts.heading": "Akortamientos de klavye",
+  "keyboard_shortcuts.heading": "Akortamientos de klaviatura",
   "keyboard_shortcuts.home": "Avre linya prinsipala",
   "keyboard_shortcuts.hotkey": "Klave rapido",
   "keyboard_shortcuts.legend": "Amostra esta lejenda",
@@ -397,7 +407,7 @@
   "navigation_bar.direct": "Enmentaduras privadas",
   "navigation_bar.discover": "Diskuvre",
   "navigation_bar.domain_blocks": "Domenos blokados",
-  "navigation_bar.explore": "Eksplorar",
+  "navigation_bar.explore": "Eksplora",
   "navigation_bar.favourites": "Te plazen",
   "navigation_bar.filters": "Biervos silensiados",
   "navigation_bar.follow_requests": "Solisitudes de segimiento",
@@ -410,7 +420,7 @@
   "navigation_bar.personal": "Personal",
   "navigation_bar.pins": "Publikasyones fiksadas",
   "navigation_bar.preferences": "Preferensyas",
-  "navigation_bar.public_timeline": "Linya de tiempo federada",
+  "navigation_bar.public_timeline": "Linya federada",
   "navigation_bar.search": "Bushka",
   "navigation_bar.security": "Segurita",
   "not_signed_in_indicator.not_signed_in": "Nesesitas konektarse kon tu kuento para akseder este rekurso.",
@@ -425,7 +435,7 @@
   "notification.reblog": "{name} repartajo tu publikasyon",
   "notification.status": "{name} publiko algo",
   "notification.update": "{name} edito una publikasyon",
-  "notifications.clear": "Efasar avizos",
+  "notifications.clear": "Efasa avizos",
   "notifications.clear_confirmation": "Estas siguro ke keres permanentemente efasar todos tus avizos?",
   "notifications.column_settings.admin.report": "Muveos raportos:",
   "notifications.column_settings.admin.sign_up": "Muevas enrejistrasyones:",
@@ -441,10 +451,10 @@
   "notifications.column_settings.push": "Avizos arrepushados",
   "notifications.column_settings.reblog": "Repartajasyones:",
   "notifications.column_settings.show": "Amostra en kolumna",
-  "notifications.column_settings.sound": "Reproduzir son",
+  "notifications.column_settings.sound": "Reproduse son",
   "notifications.column_settings.status": "Publikasyones muevas:",
   "notifications.column_settings.unread_notifications.category": "Avizos no meldados",
-  "notifications.column_settings.unread_notifications.highlight": "Avaliar avizos no meldados",
+  "notifications.column_settings.unread_notifications.highlight": "Avalia avizos no meldados",
   "notifications.column_settings.update": "Edisyones:",
   "notifications.filter.all": "Todos",
   "notifications.filter.boosts": "Repartajasyones",
@@ -459,17 +469,19 @@
   "notifications.permission_denied": "Avizos de ensimameza no estan desponivles porke ya se tiene refuzado el permiso",
   "notifications.permission_denied_alert": "\"No se pueden kapasitar los avizos de ensimameza, porke ya se tiene refuzado el permiso de navigador",
   "notifications.permission_required": "Avizos de ensimameza no estan desponivles porke los nesesarios permisos no tienen sido risividos.",
-  "notifications_permission_banner.enable": "Kapasitar avizos de ensimameza",
+  "notifications_permission_banner.enable": "Kapasita avizos de ensimameza",
   "notifications_permission_banner.how_to_control": "Para risivir avizos kuando Mastodon no esta avierto, kapasita avizos de ensimameza. Puedes kontrolar presizamente kualos tipos de enteraksiones djeneren avizos de ensimameza kon el boton {icon} arriva kuando esten kapasitadas.",
-  "notifications_permission_banner.title": "Nunka te piedres niente",
+  "notifications_permission_banner.title": "Nunkua te piedres niente",
   "onboarding.action.back": "Va atras",
   "onboarding.actions.back": "Va atras",
   "onboarding.actions.go_to_explore": "Va a los trendes",
   "onboarding.actions.go_to_home": "Va a tu linya prinsipala",
   "onboarding.compose.template": "Ke haber, #Mastodon?",
   "onboarding.follows.empty": "Malorozamente, no se pueden amostrar rezultados en este momento. Puedes aprovar uzar la bushkeda o navigar por la pajina de eksplorasyon para topar personas a las que segir, o aprovarlo de muevo mas tadre.",
+  "onboarding.follows.lead": "Tu linya prinsipala es la forma prinsipala de eksperiensa de Mastodon. Kuantas mas personas sigas, sera mas aktiva o interesante. Para ampesar, aki ay algunas sujestyones:",
   "onboarding.follows.title": "Personaliza tu linya prinsipala",
   "onboarding.profile.discoverable": "Faz ke mi profil apareska en bushkedas",
+  "onboarding.profile.discoverable_hint": "Kuando permites ke tu profil sea diskuvriravle en Mastodon, tus publikasyones podran apareser en rezultados de bushkedas i trendes i tu profil podra ser sujerido a personas kon intereses similares a los tuyos.",
   "onboarding.profile.display_name": "Nombre amostrado",
   "onboarding.profile.display_name_hint": "Tu nombre para amostrar.",
   "onboarding.profile.lead": "Siempre puedes kompletar esto mas tadre en las preferensyas, ande tambien ay mas opsyones de personalizasyon.",
@@ -483,16 +495,21 @@
   "onboarding.share.message": "Soy {username} en #Mastodon! Segidme en {url}",
   "onboarding.share.next_steps": "Posivles sigientes pasos:",
   "onboarding.share.title": "Partaja tu profil",
+  "onboarding.start.lead": "Agora eres parte de Mastodon, una red sosyala unika y desentralizada ande tu, no un algoritmo, puedes personalizar tu propya eksperyensya. Te entrodiziramos a esta mueva frontera sosyala:",
   "onboarding.start.skip": "No nesesitas ayudo para ampesar?",
   "onboarding.start.title": "Lo logrates!",
   "onboarding.steps.follow_people.body": "El buto de Mastodon es segir a djente interesante.",
   "onboarding.steps.follow_people.title": "Personaliza tu linya prinsipala",
-  "onboarding.steps.publish_status.body": "Puedes introdusirte al mundo con teksto, fotos, videos o anketas {emoji}",
+  "onboarding.steps.publish_status.body": "Puedes introdusirte al mundo kon teksto, fotos, videos o anketas {emoji}",
   "onboarding.steps.publish_status.title": "Eskrive tu primera publikasyon",
   "onboarding.steps.setup_profile.body": "Kompleta tu profil para aumentar tus enteraksyones.",
   "onboarding.steps.setup_profile.title": "Personaliza tu profil",
-  "onboarding.steps.share_profile.body": "Informe a tus amigos komo toparte en Mastodon",
+  "onboarding.steps.share_profile.body": "Informa a tus amigos komo toparte en Mastodon",
   "onboarding.steps.share_profile.title": "Partaja tu profil de Mastodon",
+  "onboarding.tips.2fa": "<strong>Saviyas?</strong> Puedes protejar tu kuento konfigurando la autentifikasyon de dos pasos en la konfigurasyon de tu kuento. Funksyona kon kualsekera aplikasyon de TOTP ke eskojas. No ay menester de uzar tu numero de telefon!",
+  "onboarding.tips.accounts_from_other_servers": "<strong>Saviyas?</strong> komo Mastodon es desentralizado, algunos profiles que topas estan lokalizados en sirvidores distinktos del tuyo. I malgrado esto, puedes enteraktuar kon eyos! Sus sirvidor forma la sigunda mitad de sus nombres de utilizador!",
+  "onboarding.tips.migration": "<strong>Savias?</strong> Si en el avenir pensas ke {domain} no es el sirvidor adekuado para ti, puedes moverte a otruno sirvidor de Mastodon sir pedrer a tus suivantes. Inkluzo puedes ser el balabay de tu propyo sirvidor!",
+  "onboarding.tips.verification": "<strong>Savias?</strong> Puedes verifikar tu kuento ponyendo un atadijo a tu profil de Mastodon en tu propio sitio web i adjustando el sitio a tu profil. No ay menester de pagamyentos o dokumentos!",
   "password_confirmation.exceeds_maxlength": "La konfirmasyon de kod es demaziado lunga",
   "password_confirmation.mismatching": "Los dos kodes son desferentes",
   "picture_in_picture.restore": "Restora",
@@ -507,7 +524,15 @@
   "poll_button.add_poll": "Adjusta anketa",
   "poll_button.remove_poll": "Kita anketa",
   "privacy.change": "Troka privasita de publikasyon",
+  "privacy.direct.long": "Todos enmentados en la publikasyon",
+  "privacy.direct.short": "Djente espesifika",
+  "privacy.private.long": "Solo para tus suivantes",
+  "privacy.private.short": "Suivantes",
+  "privacy.public.long": "Todos en i afuera de Mastodon",
   "privacy.public.short": "Publiko",
+  "privacy.unlisted.additional": "Esto funksyona exaktamente komo publiko, eksepto ke la publikasyon no aparesera en linyas publikas o etiketas, la eksplorasyon o bushkedas de Mastodon, inkluzo si kapasites esto para tu kuento.",
+  "privacy.unlisted.long": "Vizivle para todos, ama no en trendes, etiketas o linyas publikas",
+  "privacy.unlisted.short": "Publiko i silensyozo",
   "privacy_policy.last_updated": "Ultima aktualizasyon: {date}",
   "privacy_policy.title": "Politika de privasita",
   "recommended": "Rekomendado",
@@ -525,7 +550,9 @@
   "relative_time.minutes": "{number} m",
   "relative_time.seconds": "{number} s",
   "relative_time.today": "oy",
+  "reply_indicator.attachments": "{count, plural, one {# anekso} other {# aneksos}}",
   "reply_indicator.cancel": "Anula",
+  "reply_indicator.poll": "Anketa",
   "report.block": "Bloka",
   "report.block_explanation": "No veras sus publikasyones. No podra ver tus publikasyones ni segirte. Podra saver ke le blokates.",
   "report.categories.legal": "Legal",
@@ -538,7 +565,7 @@
   "report.category.title_status": "publikasyon",
   "report.close": "Fecho",
   "report.comment.title": "Ay algo mas ke deveriamos saver?",
-  "report.forward": "Reembiar a {target}",
+  "report.forward": "Reembia a {target}",
   "report.forward_hint": "Este kuento es de otro sirvidor. Embiar una kopia anonimizada del raporto ayi tamyen?",
   "report.mute": "Silensia",
   "report.mute_explanation": "No veras sus publikasyones. Ainda pueden segirte i no va saver ke le silensiates.",
@@ -558,19 +585,19 @@
   "report.rules.title": "Kualas reglas estan violadas?",
   "report.statuses.subtitle": "Eskoje todas ke korespondan",
   "report.statuses.title": "Ay alguna publikasyon ke suporta este raporto?",
-  "report.submit": "Embiar",
+  "report.submit": "Embia",
   "report.target": "Raportando a {target}",
   "report.thanks.take_action": "Aki estan tus opsyones para kontrolar lo ke ves en Mastodon:",
   "report.thanks.take_action_actionable": "Mientres revizamos esto, puedes tomar aksyones kontra @{name}:",
   "report.thanks.title": "No keres ver esto?",
   "report.thanks.title_actionable": "Mersi por raportarlo, vamos revizarlo.",
-  "report.unfollow": "Desegir a @{name}",
+  "report.unfollow": "Desige a @{name}",
   "report.unfollow_explanation": "Estas sigiendo este kuento. Para no ver sus publikasyones en tu linya de tiempo, puedes deshar de segirlo.",
   "report_notification.attached_statuses": "{count, plural, one {{count} publikasyon} other {{count} publikasyones}} atadas",
   "report_notification.categories.legal": "Legal",
   "report_notification.categories.other": "Otros",
   "report_notification.categories.spam": "Spam",
-  "report_notification.categories.violation": "Violasion de reglas",
+  "report_notification.categories.violation": "Violasyon de reglas",
   "report_notification.open": "Avre raporto",
   "search.no_recent_searches": "No ay bushkedas resientes",
   "search.placeholder": "Bushka",
@@ -584,7 +611,7 @@
   "search_popout.full_text_search_logged_out_message": "Solo desponivle kuando estas konektado kon tu kuento.",
   "search_popout.language_code": "kodiche ISO de lingua",
   "search_popout.options": "Opsyones de bushkeda",
-  "search_popout.quick_actions": "Aksiones rapidas",
+  "search_popout.quick_actions": "Aksyones rapidas",
   "search_popout.recent": "Bushkedas resientes",
   "search_popout.specific_date": "dato espesifiko",
   "search_popout.user": "utilizador",
@@ -661,7 +688,7 @@
   "status.translate": "Trezlada",
   "status.translated_from_with": "Trezladado dizde {lang} kon {provider}",
   "status.uncached_media_warning": "Vista previa no desponivle",
-  "status.unmute_conversation": "Desilensiar konversasyon",
+  "status.unmute_conversation": "Desilensia konversasyon",
   "status.unpin": "Defiksar del profil",
   "subscribed_languages.lead": "Solo publikasyones en linguas eskojidas se amostraran en tus linya de tiempo prinsipala i listas dempues del trokamiento. Eskoje dinguna para risivir publikasyones en todas las linguas.",
   "subscribed_languages.save": "Guadra trokamientos",
diff --git a/app/javascript/mastodon/locales/lt.json b/app/javascript/mastodon/locales/lt.json
index 14fa09e973bd8e..0923a10065a68e 100644
--- a/app/javascript/mastodon/locales/lt.json
+++ b/app/javascript/mastodon/locales/lt.json
@@ -145,11 +145,9 @@
   "compose_form.lock_disclaimer": "Tavo paskyra nėra {locked}. Bet kas gali sekti tave ir peržiūrėti tik sekėjams skirtus įrašus.",
   "compose_form.lock_disclaimer.lock": "užrakinta",
   "compose_form.placeholder": "Kas tavo mintyse?",
-  "compose_form.poll.add_option": "Pridėti pasirinkimą",
   "compose_form.poll.duration": "Apklausos trukmė",
   "compose_form.poll.multiple": "Keli pasirinkimai",
   "compose_form.poll.option_placeholder": "{number} pasirinkimas",
-  "compose_form.poll.remove_option": "Pašalinti šį pasirinkimą",
   "compose_form.poll.single": "Pasirinkti vieną",
   "compose_form.poll.switch_to_multiple": "Keisti apklausą, kad būtų galima pasirinkti kelis pasirinkimus",
   "compose_form.poll.switch_to_single": "Pakeisti apklausą, kad būtų galima pasirinkti vieną variantą",
@@ -271,6 +269,12 @@
   "follow_request.authorize": "Autorizuoti",
   "follow_request.reject": "Atmesti",
   "follow_requests.unlocked_explanation": "Nors tavo paskyra neužrakinta, {domain} personalas mano, kad galbūt norėsi rankiniu būdu patikrinti šių paskyrų sekimo užklausas.",
+  "follow_suggestions.curated_suggestion": "Redaktorių pasirinkimas",
+  "follow_suggestions.dismiss": "Daugiau nerodyti",
+  "follow_suggestions.personalized_suggestion": "Suasmenintas pasiūlymas",
+  "follow_suggestions.popular_suggestion": "Populiarus pasiūlymas",
+  "follow_suggestions.view_all": "Peržiūrėti viską",
+  "follow_suggestions.who_to_follow": "Ką sekti",
   "followed_tags": "Sekamos saitažodžiai",
   "footer.about": "Apie",
   "footer.directory": "Profilių katalogas",
@@ -297,18 +301,19 @@
   "hashtag.follow": "Sekti grotažymę",
   "hashtag.unfollow": "Nesekti grotažymės",
   "hashtags.and_other": "…ir{count, plural,other {#daugiau}}",
-  "home.actions.go_to_explore": "Žiūrėti kas populiaru",
-  "home.actions.go_to_suggestions": "Rasti žmonių sekimui",
   "home.column_settings.basic": "Pagrindinis",
   "home.column_settings.show_reblogs": "Rodyti \"boosts\"",
   "home.column_settings.show_replies": "Rodyti atsakymus",
   "home.hide_announcements": "Slėpti skelbimus",
+  "home.pending_critical_update.link": "Žiūrėti atnaujinimus",
+  "home.pending_critical_update.title": "Galimas kritinis saugumo atnaujinimas!",
   "interaction_modal.no_account_yet": "Nesi Mastodon?",
   "interaction_modal.on_another_server": "Kitame serveryje",
   "interaction_modal.on_this_server": "Šiame serveryje",
   "interaction_modal.sign_in": "Nesi prisijungęs (-usi) prie šio serverio. Kur yra laikoma tavo paskyra?",
   "interaction_modal.sign_in_hint": "Patarimas: tai svetainė, kurioje užsiregistravai. Jei neprisimeni, ieškok sveikinimo el. laiško savo pašto dėžutėje. Taip pat gali įvesti visą savo naudotojo vardą (pvz., @Mastodon@mastodon.social).",
   "interaction_modal.title.favourite": "Mėgstamiausias {name} įrašas",
+  "interaction_modal.title.follow": "Sekti {name}",
   "keyboard_shortcuts.back": "to navigate back",
   "keyboard_shortcuts.blocked": "to open blocked users list",
   "keyboard_shortcuts.boost": "to boost",
@@ -341,7 +346,24 @@
   "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
   "keyboard_shortcuts.up": "to move up in the list",
   "lightbox.close": "Uždaryti",
+  "lightbox.next": "Kitas",
+  "lightbox.previous": "Ankstesnis",
+  "limited_account_hint.action": "Vis tiek rodyti profilį",
+  "limited_account_hint.title": "Šį profilį paslėpė {domain} moderatoriai.",
+  "link_preview.author": "Sukūrė {name}",
+  "lists.account.add": "Pridėti į sąrašą",
+  "lists.account.remove": "Pašalinti iš sąrašo",
+  "lists.delete": "Ištrinti sąrašą",
+  "lists.edit": "Redaguoti sąrašą",
+  "lists.edit.submit": "Prierašo pakeitimas",
   "lists.new.create": "Pridėti sąrašą",
+  "lists.new.title_placeholder": "Naujas sąrašo pavadinimas",
+  "lists.replies_policy.followed": "Bet kuris sekamas naudotojas",
+  "lists.replies_policy.list": "Sąrašo nariai",
+  "lists.replies_policy.none": "Nei vienas",
+  "lists.replies_policy.title": "Rodyti atsakymus:",
+  "lists.search": "Ieškoti tarp sekamų žmonių",
+  "lists.subheading": "Jūsų sąrašai",
   "loading_indicator.label": "Kraunama…",
   "media_gallery.toggle_visible": "{number, plural, one {Slėpti vaizdą} few {Slėpti vaizdus} many {Slėpti vaizdo} other {Slėpti vaizdų}}",
   "moved_to_account_banner.text": "Tavo paskyra {disabledAccount} šiuo metu yra išjungta, nes persikėlei į {movedToAccount}.",
@@ -506,6 +528,11 @@
   "report.reasons.legal": "Tai nelegalu",
   "report.reasons.legal_description": "Manai, kad tai pažeidžia tavo arba serverio šalies įstatymus",
   "report.reasons.other": "Tai kažkas kita",
+  "report.reasons.other_description": "Šis klausimas neatitinka kitų kategorijų",
+  "report.reasons.spam": "Tai šlamštas",
+  "report.reasons.spam_description": "Kenkėjiškos nuorodos, netikras įsitraukimas arba pasikartojantys atsakymai",
+  "report.reasons.violation": "Tai pažeidžia serverio taisykles",
+  "report.reasons.violation_description": "Žinai, kad tai pažeidžia konkrečias taisykles",
   "report.rules.subtitle": "Pasirink viską, kas tinka",
   "report.rules.title": "Kokios taisyklės pažeidžiamos?",
   "report.statuses.subtitle": "Pasirinkti viską, kas tinka",
@@ -519,35 +546,71 @@
   "report.unfollow": "Nebesekti @{name}",
   "report.unfollow_explanation": "Jūs sekate šią paskyrą. Norėdami nebematyti jų įrašų savo pagrindiniame kanale, panaikinkite jų sekimą.",
   "report_notification.attached_statuses": "{count, plural, one {# post} other {# posts}} attached",
+  "report_notification.categories.legal": "Legalus",
+  "report_notification.categories.other": "Kita",
+  "report_notification.categories.spam": "Šlamštas",
+  "report_notification.categories.violation": "Taisyklės pažeidimas",
+  "search.no_recent_searches": "Paieškos įrašų nėra",
   "search.placeholder": "Paieška",
+  "search.quick_action.account_search": "Profiliai, atitinkantys {x}",
+  "search.quick_action.go_to_account": "Eiti į profilį {x}",
+  "search.quick_action.go_to_hashtag": "Eiti į hashtag {x}",
+  "search.quick_action.open_url": "Atidaryti URL adresą Mastodon",
+  "search.quick_action.status_search": "Pranešimai, atitinkantys {x}",
   "search.search_or_paste": "Ieškok arba įklijuok URL",
   "search_popout.full_text_search_disabled_message": "Nepasiekima {domain}.",
   "search_popout.full_text_search_logged_out_message": "Pasiekiama tik prisijungus.",
   "search_popout.language_code": "ISO kalbos kodas",
+  "search_popout.options": "Paieškos nustatymai",
+  "search_popout.quick_actions": "Greiti veiksmai",
+  "search_popout.recent": "Naujausios paieškos",
   "search_popout.specific_date": "konkreti data",
   "search_popout.user": "naudotojas",
   "search_results.accounts": "Profiliai",
   "search_results.all": "Visi",
   "search_results.hashtags": "Saitažodžiai",
   "search_results.nothing_found": "Nepavyko rasti nieko pagal šiuos paieškos terminus.",
+  "search_results.see_all": "Žiūrėti viską",
   "search_results.statuses": "Toots",
+  "search_results.title": "Ieškoti {q}",
   "server_banner.about_active_users": "Žmonės, kurie naudojosi šiuo serveriu per pastarąsias 30 dienų (mėnesio aktyvūs naudotojai)",
   "server_banner.active_users": "aktyvūs naudotojai",
+  "server_banner.administered_by": "Administruoja:",
+  "server_banner.introduction": "{domain} yra decentralizuoto socialinio tinklo, kurį valdo {mastodon}, dalis.",
+  "server_banner.learn_more": "Sužinoti daugiau",
+  "server_banner.server_stats": "Serverio statistika:",
+  "sign_in_banner.create_account": "Sukurti paskyrą",
   "sign_in_banner.sign_in": "Prisijungimas",
+  "sign_in_banner.sso_redirect": "Prisijungti arba Registruotis",
   "sign_in_banner.text": "Prisijunk, kad galėtum sekti profilius arba saitažodžius, mėgsti, bendrinti ir atsakyti į įrašus. Taip pat gali bendrauti iš savo paskyros kitame serveryje.",
+  "status.admin_account": "Atvira moderavimo sąsaja @{name}",
+  "status.admin_domain": "Atvira moderavimo sąsaja {domain}",
   "status.admin_status": "Open this status in the moderation interface",
+  "status.block": "Blokuoti @{name}",
+  "status.bookmark": "Žymė",
   "status.copy": "Kopijuoti nuorodą į įrašą",
   "status.delete": "Ištrinti",
+  "status.detailed_status": "Išsami pokalbio peržiūra",
+  "status.direct": "Privačiai paminėti @{name}",
+  "status.direct_indicator": "Privatus paminėjimas",
   "status.edit": "Redaguoti",
   "status.edited": "Redaguota {date}",
   "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
+  "status.embed": "Įterptas",
+  "status.favourite": "Mėgstamiausias",
+  "status.filter": "Filtruoti šį įrašą",
+  "status.filtered": "Filtruota",
   "status.hide": "Slėpti įrašą",
+  "status.history.created": "{name} sukurtas {date}",
+  "status.history.edited": "{name} redaguotas {date}",
   "status.load_more": "Pakrauti daugiau",
   "status.media.open": "Spausk, kad atidaryti",
   "status.media.show": "Spausk, kad matyti",
   "status.media_hidden": "Paslėpta medija",
   "status.mention": "Paminėti @{name}",
   "status.more": "Daugiau",
+  "status.mute": "Nutildyti @{name}",
+  "status.mute_conversation": "Nutildyti pokalbį",
   "status.open": "Expand this status",
   "status.pin": "Prisegti prie profilio",
   "status.pinned": "Prisegtas įrašas",
diff --git a/app/javascript/mastodon/locales/lv.json b/app/javascript/mastodon/locales/lv.json
index b4426b4c45b29f..07a7b25a799bb5 100644
--- a/app/javascript/mastodon/locales/lv.json
+++ b/app/javascript/mastodon/locales/lv.json
@@ -291,13 +291,9 @@
   "hashtag.follow": "Sekot tēmturim",
   "hashtag.unfollow": "Pārstāt sekot tēmturim",
   "hashtags.and_other": "..un {count, plural, other {# vairāk}}",
-  "home.actions.go_to_explore": "Skatīt tendences",
-  "home.actions.go_to_suggestions": "Atrodi cilvēkus kam sekot",
   "home.column_settings.basic": "Pamata",
   "home.column_settings.show_reblogs": "Rādīt pastiprinātos ierakstus",
   "home.column_settings.show_replies": "Rādīt atbildes",
-  "home.explore_prompt.body": "Tavā mājas plūsmā būs dažādu ziņu sajaukums no atsaucēm, kurām esi izvēlējies sekot, personām, kurām esi izvēlējies sekot, un ziņām, kuras tās izceļ. Ja tas šķiet pārāk kluss, iespējams, vēlēsies:",
-  "home.explore_prompt.title": "Šī ir tava Mastodon mājvieta.",
   "home.hide_announcements": "Slēpt paziņojumus",
   "home.pending_critical_update.body": "Lūdzu, pēc iespējas ātrāk atjaunini savu Mastodon serveri!",
   "home.pending_critical_update.link": "Skatīt jauninājumus",
diff --git a/app/javascript/mastodon/locales/ms.json b/app/javascript/mastodon/locales/ms.json
index 8c1ff633768b53..2c3221cfddff61 100644
--- a/app/javascript/mastodon/locales/ms.json
+++ b/app/javascript/mastodon/locales/ms.json
@@ -287,13 +287,9 @@
   "hashtag.follow": "Ikuti hashtag",
   "hashtag.unfollow": "Nyahikut tanda pagar",
   "hashtags.and_other": "…dan {count, plural, other {# more}}",
-  "home.actions.go_to_explore": "Lihat apa yand sedang tren",
-  "home.actions.go_to_suggestions": "Cari orang untuk diikuti",
   "home.column_settings.basic": "Asas",
   "home.column_settings.show_reblogs": "Tunjukkan galakan",
   "home.column_settings.show_replies": "Tunjukkan balasan",
-  "home.explore_prompt.body": "Suapan rumah anda akan mempunyai gabungan pos daripada hashtag yang telah anda pilih untuk diikuti, orang yang telah anda pilih untuk diikuti dan pos yang mereka tingkatkan. Jika itu terasa terlalu senyap, anda mungkin mahu:",
-  "home.explore_prompt.title": "Ini adalah pusat operasi anda dalam Mastodon.",
   "home.hide_announcements": "Sembunyikan pengumuman",
   "home.pending_critical_update.body": "Sila kemas kini pelayan Mastodon anda secepat yang mungkin!",
   "home.pending_critical_update.link": "Lihat pengemaskinian",
diff --git a/app/javascript/mastodon/locales/my.json b/app/javascript/mastodon/locales/my.json
index 396a72ac450295..0d5985b1ce5a7b 100644
--- a/app/javascript/mastodon/locales/my.json
+++ b/app/javascript/mastodon/locales/my.json
@@ -292,13 +292,9 @@
   "hashtag.follow": "Hashtag ကို စောင့်ကြည့်မယ်",
   "hashtag.unfollow": "Hashtag ကို မစောင့်ကြည့်ပါ",
   "hashtags.and_other": "{count, plural, other {# more}} နှင့်",
-  "home.actions.go_to_explore": "ခေတ်စားနေသည်များကို ကြည့်ပါ",
-  "home.actions.go_to_suggestions": "စောင့်ကြည့်သူများရှာပါ",
   "home.column_settings.basic": "အခြေခံ",
   "home.column_settings.show_reblogs": "Boost များကို ပြပါ",
   "home.column_settings.show_replies": "ပြန်စာများကို ပြပါ",
-  "home.explore_prompt.body": "သင့်ရဲ့သတင်းစဥ် မှာ သင် စောင့်ကြည့်​နေတယ့် ခေါင်းစဥ်​တွေ၊သင်​စောင့်ကြည့်​နေတယ့်အ​ကောင့်​တွေ နဲ့ အဆိုပါ အ​ကောင့်​တွေပြန်မျှ​ဝေထားတယ့် ပိုစ့်​တွေကို မြင်ရမှာပါ။:",
-  "home.explore_prompt.title": "ဤသည်မှာ Mastodon ရှိ သင့်ပင်မစာမျက်နှာဖြစ်သည်။",
   "home.hide_announcements": "ကြေညာချက်များကို ဖျောက်ပါ",
   "home.pending_critical_update.body": "သင့် Mastodon ဆာဗာ အမြန်ဆုံး အပ်ဒိတ်လုပ်ပါ။",
   "home.pending_critical_update.link": "အပ်ဒိတ်များကြည့်ရန်",
diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json
index e38f8fd0ba18db..24099f2d339e8a 100644
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@@ -145,22 +145,20 @@
   "compose_form.lock_disclaimer": "Jouw account is niet {locked}. Iedereen kan jou volgen en kan de berichten zien die je alleen aan jouw volgers hebt gericht.",
   "compose_form.lock_disclaimer.lock": "vergrendeld",
   "compose_form.placeholder": "Wat wil je kwijt?",
-  "compose_form.poll.add_option": "Optie toevoegen",
   "compose_form.poll.duration": "Duur van de peiling",
   "compose_form.poll.multiple": "Meerkeuze",
   "compose_form.poll.option_placeholder": "Optie {number}",
-  "compose_form.poll.remove_option": "Deze optie verwijderen",
-  "compose_form.poll.single": "Kies een",
+  "compose_form.poll.single": "Enkele keuze",
   "compose_form.poll.switch_to_multiple": "Peiling wijzigen om meerdere keuzes toe te staan",
   "compose_form.poll.switch_to_single": "Peiling wijzigen om een enkele keuze toe te staan",
   "compose_form.poll.type": "Stijl",
-  "compose_form.publish": "Plaatsen",
+  "compose_form.publish": "Toot",
   "compose_form.publish_form": "Nieuw bericht",
   "compose_form.reply": "Reageren",
   "compose_form.save_changes": "Bijwerken",
   "compose_form.spoiler.marked": "Inhoudswaarschuwing verwijderen",
   "compose_form.spoiler.unmarked": "Inhoudswaarschuwing toevoegen",
-  "compose_form.spoiler_placeholder": "Waarschuwing inhoud (optioneel)",
+  "compose_form.spoiler_placeholder": "Inhoudswaarschuwing (optioneel)",
   "confirmation_modal.cancel": "Annuleren",
   "confirmations.block.block_and_report": "Blokkeren en rapporteren",
   "confirmations.block.confirm": "Blokkeren",
@@ -279,6 +277,12 @@
   "follow_request.authorize": "Goedkeuren",
   "follow_request.reject": "Afwijzen",
   "follow_requests.unlocked_explanation": "Ook al is jouw account niet besloten, de medewerkers van {domain} denken dat jij misschien de volgende volgverzoeken handmatig wil controleren.",
+  "follow_suggestions.curated_suggestion": "Keuze van de moderator(en)",
+  "follow_suggestions.dismiss": "Niet meer weergeven",
+  "follow_suggestions.personalized_suggestion": "Gepersonaliseerde aanbeveling",
+  "follow_suggestions.popular_suggestion": "Populaire aanbeveling",
+  "follow_suggestions.view_all": "Alles weergeven",
+  "follow_suggestions.who_to_follow": "Wie te volgen",
   "followed_tags": "Gevolgde hashtags",
   "footer.about": "Over",
   "footer.directory": "Gebruikersgids",
@@ -305,13 +309,9 @@
   "hashtag.follow": "Hashtag volgen",
   "hashtag.unfollow": "Hashtag ontvolgen",
   "hashtags.and_other": "…en {count, plural, one {}other {# meer}}",
-  "home.actions.go_to_explore": "De huidige trends bekijken",
-  "home.actions.go_to_suggestions": "Zoek mensen om te volgen",
   "home.column_settings.basic": "Algemeen",
   "home.column_settings.show_reblogs": "Boosts tonen",
   "home.column_settings.show_replies": "Reacties tonen",
-  "home.explore_prompt.body": "Jouw starttijdlijn bevat een mix van berichten met hashtags die je volgt, van accounts die je volgt en van berichten die deze accounts boosten. Wanneer je dit te stil vind, kun je:",
-  "home.explore_prompt.title": "Dit is jouw thuisbasis op Mastodon.",
   "home.hide_announcements": "Mededelingen verbergen",
   "home.pending_critical_update.body": "Update alstublieft zo snel mogelijk jouw Mastodon-server!",
   "home.pending_critical_update.link": "Bekijk updates",
@@ -524,15 +524,15 @@
   "poll_button.add_poll": "Peiling toevoegen",
   "poll_button.remove_poll": "Peiling verwijderen",
   "privacy.change": "Zichtbaarheid van bericht aanpassen",
-  "privacy.direct.long": "Iedereen genoemd in de post",
-  "privacy.direct.short": "Specifieke mensen",
+  "privacy.direct.long": "Iedereen die in het bericht wordt vermeld",
+  "privacy.direct.short": "Bepaalde mensen",
   "privacy.private.long": "Alleen jouw volgers",
   "privacy.private.short": "Volgers",
   "privacy.public.long": "Iedereen op Mastodon en daarbuiten",
   "privacy.public.short": "Openbaar",
-  "privacy.unlisted.additional": "Dit is vergelijkbaar met publiek, behalve dat de post niet zal verschijnen in live feeds of hashtags, verkennen of Mastodon zoeken, zelfs als je gekozen hebt voor account-breed.",
-  "privacy.unlisted.long": "Minder algoritmische fanfare",
-  "privacy.unlisted.short": "Stil publiek",
+  "privacy.unlisted.additional": "Dit is vergelijkbaar met openbaar, behalve dat het beticht niet verschijnt op openbare tijdlijnen of hashtags, onder verkennen of Mastodon zoeken, zelfs als je je account daarvoor hebt ingesteld.",
+  "privacy.unlisted.long": "Voor iedereen zichtbaar, maar niet onder trends, hashtags en op openbare tijdlijnen",
+  "privacy.unlisted.short": "Minder openbaar",
   "privacy_policy.last_updated": "Laatst bijgewerkt op {date}",
   "privacy_policy.title": "Privacybeleid",
   "recommended": "Aanbevolen",
diff --git a/app/javascript/mastodon/locales/nn.json b/app/javascript/mastodon/locales/nn.json
index 9bb4f591971567..2118eb57398f7c 100644
--- a/app/javascript/mastodon/locales/nn.json
+++ b/app/javascript/mastodon/locales/nn.json
@@ -145,12 +145,10 @@
   "compose_form.lock_disclaimer": "Kontoen din er ikkje {locked}. Kven som helst kan fylgja deg for å sjå innlegga dine.",
   "compose_form.lock_disclaimer.lock": "låst",
   "compose_form.placeholder": "Kva har du på hjarta?",
-  "compose_form.poll.add_option": "Legg til alternativ",
   "compose_form.poll.duration": "Varigheit for rundspørjing",
-  "compose_form.poll.multiple": "Flervalg",
-  "compose_form.poll.option_placeholder": "Valg {number}",
-  "compose_form.poll.remove_option": "Fjern dette valget",
-  "compose_form.poll.single": "Velg en",
+  "compose_form.poll.multiple": "Fleirval",
+  "compose_form.poll.option_placeholder": "Alternativ {number}",
+  "compose_form.poll.single": "Vel ein",
   "compose_form.poll.switch_to_multiple": "Endre rundspørjinga til å tillate fleire val",
   "compose_form.poll.switch_to_single": "Endre rundspørjinga til å tillate berre eitt val",
   "compose_form.poll.type": "Stil",
@@ -160,7 +158,7 @@
   "compose_form.save_changes": "Oppdater",
   "compose_form.spoiler.marked": "Fjern innhaldsåtvaring",
   "compose_form.spoiler.unmarked": "Legg til innhaldsåtvaring",
-  "compose_form.spoiler_placeholder": "Innholdsadvarsel (valgfritt)",
+  "compose_form.spoiler_placeholder": "Innhaldsåtvaring (valfritt)",
   "confirmation_modal.cancel": "Avbryt",
   "confirmations.block.block_and_report": "Blokker & rapporter",
   "confirmations.block.confirm": "Blokker",
@@ -279,6 +277,11 @@
   "follow_request.authorize": "Autoriser",
   "follow_request.reject": "Avvis",
   "follow_requests.unlocked_explanation": "Sjølv om kontoen din ikkje er låst tenkte dei som driv {domain} at du kanskje ville gå gjennom førespurnadar frå desse kontoane manuelt.",
+  "follow_suggestions.dismiss": "Ikkje vis igjen",
+  "follow_suggestions.personalized_suggestion": "Personleg forslag",
+  "follow_suggestions.popular_suggestion": "Populært forslag",
+  "follow_suggestions.view_all": "Vis alle",
+  "follow_suggestions.who_to_follow": "Kven som skal følgjast",
   "followed_tags": "Fylgde emneknaggar",
   "footer.about": "Om",
   "footer.directory": "Profilmappe",
@@ -305,13 +308,9 @@
   "hashtag.follow": "Fylg emneknagg",
   "hashtag.unfollow": "Slutt å fylgje emneknaggen",
   "hashtags.and_other": "…og {count, plural, one {}other {# fleire}}",
-  "home.actions.go_to_explore": "Sjå kva som er populært",
-  "home.actions.go_to_suggestions": "Finn folk å følgje",
   "home.column_settings.basic": "Grunnleggjande",
   "home.column_settings.show_reblogs": "Vis framhevingar",
   "home.column_settings.show_replies": "Vis svar",
-  "home.explore_prompt.body": "Tidslinja di vil ha ei blanding av innlegg frå emneknaggar du har vald å følgje, personane du har vald å følgje, og innlegga dei framhevar. Om det ser ganske stille ut akkurat no, så kan du:",
-  "home.explore_prompt.title": "Dette er heimen din i Mastodon.",
   "home.hide_announcements": "Skjul kunngjeringar",
   "home.pending_critical_update.body": "Oppdater mastodontenaren din så snart som mogleg!",
   "home.pending_critical_update.link": "Sjå oppdateringar",
@@ -523,14 +522,14 @@
   "poll_button.add_poll": "Lag ei rundspørjing",
   "poll_button.remove_poll": "Fjern rundspørjing",
   "privacy.change": "Endre personvernet på innlegg",
-  "privacy.direct.long": "Alle nevnt i innlegget",
+  "privacy.direct.long": "Alle nemnde i innlegget",
   "privacy.direct.short": "Spesifikke folk",
-  "privacy.private.long": "Bare følgerne dine",
-  "privacy.private.short": "Følgere",
-  "privacy.public.long": "Alle på og utenfor Mastodon",
+  "privacy.private.long": "Berre dine følgjarar",
+  "privacy.private.short": "Følgjarar",
+  "privacy.public.long": "Kven som helst på og av Mastodon",
   "privacy.public.short": "Offentleg",
-  "privacy.unlisted.long": "Færre algoritmiske fanfarer",
-  "privacy.unlisted.short": "Stille offentlig",
+  "privacy.unlisted.long": "Færre algoritmiske fanfarar",
+  "privacy.unlisted.short": "Stille offentleg",
   "privacy_policy.last_updated": "Sist oppdatert {date}",
   "privacy_policy.title": "Personvernsreglar",
   "recommended": "Anbefalt",
diff --git a/app/javascript/mastodon/locales/no.json b/app/javascript/mastodon/locales/no.json
index 8da9853bee8776..27ca6117225387 100644
--- a/app/javascript/mastodon/locales/no.json
+++ b/app/javascript/mastodon/locales/no.json
@@ -145,11 +145,9 @@
   "compose_form.lock_disclaimer": "Din konto er ikke {locked}. Hvem som helst kan følge deg og se dine private poster.",
   "compose_form.lock_disclaimer.lock": "låst",
   "compose_form.placeholder": "Hva har du på hjertet?",
-  "compose_form.poll.add_option": "Legg til alternativ",
   "compose_form.poll.duration": "Avstemningens varighet",
   "compose_form.poll.multiple": "Flervalg",
   "compose_form.poll.option_placeholder": "Valg {number}",
-  "compose_form.poll.remove_option": "Fjern dette valget",
   "compose_form.poll.single": "Velg en",
   "compose_form.poll.switch_to_multiple": "Endre avstemning til å tillate flere valg",
   "compose_form.poll.switch_to_single": "Endre avstemning til å tillate ett valg",
@@ -305,13 +303,9 @@
   "hashtag.follow": "Følg emneknagg",
   "hashtag.unfollow": "Slutt å følge emneknagg",
   "hashtags.and_other": "…og {count, plural, one{en til} other {# til}}",
-  "home.actions.go_to_explore": "Se hva som er populært",
-  "home.actions.go_to_suggestions": "Finn folk å følge",
   "home.column_settings.basic": "Enkelt",
   "home.column_settings.show_reblogs": "Vis fremhevinger",
   "home.column_settings.show_replies": "Vis svar",
-  "home.explore_prompt.body": "Tidslinjen din inneholder en blanding av innlegg fra emneknagger du har valgt å følge, personene du har valgt å følge, og innleggene de fremhever. Hvis det føles for stille, kan det være lurt å:",
-  "home.explore_prompt.title": "Dette er hjemmet ditt i Mastodon.",
   "home.hide_announcements": "Skjul kunngjøring",
   "home.pending_critical_update.body": "Vennligst oppdater Mastodon-serveren din så snart som mulig!",
   "home.pending_critical_update.link": "Se oppdateringer",
diff --git a/app/javascript/mastodon/locales/oc.json b/app/javascript/mastodon/locales/oc.json
index 8660a3bc05a540..5e122064fc747d 100644
--- a/app/javascript/mastodon/locales/oc.json
+++ b/app/javascript/mastodon/locales/oc.json
@@ -262,8 +262,6 @@
   "hashtag.follow": "Sègre l’etiqueta",
   "hashtag.unfollow": "Quitar de sègre l’etiqueta",
   "hashtags.and_other": "…e {count, plural, one {}other {# de mai}}",
-  "home.actions.go_to_explore": "Agachatz las tendéncias",
-  "home.actions.go_to_suggestions": "Trobatz de monde de sègre",
   "home.column_settings.basic": "Basic",
   "home.column_settings.show_reblogs": "Mostrar los partatges",
   "home.column_settings.show_replies": "Mostrar las responsas",
diff --git a/app/javascript/mastodon/locales/pa.json b/app/javascript/mastodon/locales/pa.json
index de085cf9856b35..ee47c1872db689 100644
--- a/app/javascript/mastodon/locales/pa.json
+++ b/app/javascript/mastodon/locales/pa.json
@@ -1,5 +1,6 @@
 {
   "about.contact": "ਸੰਪਰਕ:",
+  "about.domain_blocks.no_reason_available": "ਕਾਰਨ ਮੌਜੂਦ ਨਹੀਂ ਹੈ",
   "about.domain_blocks.silenced.title": "ਸੀਮਿਤ",
   "about.domain_blocks.suspended.title": "ਮੁਅੱਤਲ ਕੀਤੀ",
   "about.rules": "ਸਰਵਰ ਨਿਯਮ",
@@ -12,12 +13,17 @@
   "account.block_short": "ਪਾਬੰਦੀ",
   "account.blocked": "ਪਾਬੰਦੀਸ਼ੁਦਾ",
   "account.cancel_follow_request": "ਫ਼ਾਲੋ ਕਰਨ ਨੂੰ ਰੱਦ ਕਰੋ",
+  "account.copy": "ਪਰੋਫਾਇਲ ਲਈ ਲਿੰਕ ਕਾਪੀ ਕਰੋ",
+  "account.direct": "ਨਿੱਜੀ ਜ਼ਿਕਰ @{name}",
   "account.edit_profile": "ਪਰੋਫਾਈਲ ਨੂੰ ਸੋਧੋ",
+  "account.featured_tags.last_status_at": "{date} ਨੂੰ ਆਖਰੀ ਪੋਸਟ",
+  "account.featured_tags.last_status_never": "ਕੋਈ ਪੋਸਟ ਨਹੀਂ",
   "account.follow": "ਫ਼ਾਲੋ",
   "account.followers": "ਫ਼ਾਲੋਅਰ",
   "account.followers.empty": "ਇਸ ਵਰਤੋਂਕਾਰ ਨੂੰ ਹਾਲੇ ਕੋਈ ਫ਼ਾਲੋ ਨਹੀਂ ਕਰਦਾ ਹੈ।",
   "account.following": "ਫ਼ਾਲੋ ਕੀਤਾ",
   "account.follows.empty": "ਇਹ ਵਰਤੋਂਕਾਰ ਹਾਲੇ ਕਿਸੇ ਨੂੰ ਫ਼ਾਲੋ ਨਹੀਂ ਕਰਦਾ ਹੈ।",
+  "account.go_to_profile": "ਪਰੋਫਾਇਲ ਉੱਤੇ ਜਾਓ",
   "account.media": "ਮੀਡੀਆ",
   "account.muted": "ਮੌਨ ਕੀਤੀਆਂ",
   "account.posts": "ਪੋਸਟਾਂ",
@@ -35,9 +41,13 @@
   "admin.dashboard.retention.cohort_size": "ਨਵੇਂ ਵਰਤੋਂਕਾਰ",
   "alert.unexpected.title": "ਓਹੋ!",
   "announcement.announcement": "ਹੋਕਾ",
+  "bundle_column_error.error.title": "ਓਹ ਹੋ!",
   "bundle_column_error.network.title": "ਨੈੱਟਵਰਕ ਦੀ ਸਮੱਸਿਆ",
   "bundle_column_error.retry": "ਮੁੜ-ਕੋਸ਼ਿਸ਼ ਕਰੋ",
+  "bundle_column_error.return": "ਵਾਪਸ ਮੁੱਖ ਸਫ਼ੇ ਉੱਤੇ ਜਾਓ",
+  "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "ਬੰਦ ਕਰੋ",
+  "bundle_modal_error.message": "ਭਾਗ ਲੋਡ ਕਰਨ ਦੌਰਾਨ ਕੁਝ ਗਲਤ ਵਾਪਰਿਆ ਹੈ।",
   "bundle_modal_error.retry": "ਮੁੜ-ਕੋਸ਼ਿਸ਼ ਕਰੋ",
   "column.about": "ਸਾਡੇ ਬਾਰੇ",
   "column.blocks": "ਪਾਬੰਦੀ ਲਾਏ ਵਰਤੋਂਕਾਰ",
@@ -67,10 +77,16 @@
   "compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.",
   "compose_form.lock_disclaimer.lock": "ਲਾਕ ਹੈ",
   "compose_form.placeholder": "What is on your mind?",
+  "compose_form.poll.type": "ਸਟਾਈਲ",
+  "compose_form.publish": "ਪੋਸਟ",
   "compose_form.publish_form": "Publish",
+  "compose_form.reply": "ਜਵਾਬ ਦਿਓ",
+  "compose_form.save_changes": "ਅੱਪਡੇਟ",
   "compose_form.spoiler.marked": "ਸਮੱਗਰੀ ਚੇਤਾਵਨੀ ਨੂੰ ਹਟਾਓ",
   "compose_form.spoiler.unmarked": "ਸਮੱਗਰੀ ਬਾਰੇ ਚੇਤਾਵਨੀ ਜੋੜੋ",
+  "compose_form.spoiler_placeholder": "ਸਮੱਗਰੀ ਬਾਰੇ ਚੇਤਾਵਨੀ (ਚੋਣਵਾਂ)",
   "confirmation_modal.cancel": "ਰੱਦ ਕਰੋ",
+  "confirmations.block.block_and_report": "ਰੋਕ ਲਾਓ ਤੇ ਰਿਪੋਰਟ ਕਰੋ",
   "confirmations.block.confirm": "ਪਾਬੰਦੀ",
   "confirmations.delete.confirm": "ਹਟਾਓ",
   "confirmations.delete.message": "ਕੀ ਤੁਸੀਂ ਇਹ ਪੋਸਟ ਨੂੰ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?",
@@ -116,7 +132,10 @@
   "firehose.local": "ਇਹ ਸਰਵਰ",
   "firehose.remote": "ਹੋਰ ਸਰਵਰ",
   "follow_request.reject": "ਰੱਦ ਕਰੋ",
+  "follow_suggestions.dismiss": "ਮੁੜ ਨਾ ਵੇਖਾਓ",
+  "follow_suggestions.view_all": "ਸਭ ਵੇਖੋ",
   "footer.about": "ਸਾਡੇ ਬਾਰੇ",
+  "footer.directory": "ਪਰੋਫਾਇਲ ਡਾਇਰੈਕਟਰੀ",
   "footer.get_app": "ਐਪ ਲਵੋ",
   "footer.invite": "ਲੋਕਾਂ ਨੂੰ ਸੱਦਾ ਭੇਜੋ",
   "footer.keyboard_shortcuts": "ਕੀਬੋਰਡ ਸ਼ਾਰਟਕੱਟ",
@@ -128,12 +147,14 @@
   "hashtag.column_header.tag_mode.all": "ਅਤੇ {additional}",
   "hashtag.column_header.tag_mode.any": "ਜਾਂ {additional}",
   "hashtag.column_header.tag_mode.none": "{additional} ਬਿਨਾਂ",
+  "hashtag.column_settings.select.no_options_message": "ਕੋਈ ਸੁਝਾਅ ਨਹੀਂ ਲੱਭਾ",
   "hashtag.column_settings.tag_mode.any": "ਇਹਨਾਂ ਵਿੱਚੋਂ ਕੋਈ",
   "hashtag.column_settings.tag_mode.none": "ਇਹਨਾਂ ਵਿੱਚੋਂ ਕੋਈ ਨਹੀਂ",
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
   "hashtag.follow": "ਹੈਸ਼ਟੈਗ ਨੂੰ ਫ਼ਾਲੋ ਕਰੋ",
   "hashtag.unfollow": "ਹੈਸ਼ਟੈਗ ਨੂੰ ਅਣ-ਫ਼ਾਲੋ ਕਰੋ",
   "home.column_settings.basic": "ਆਮ",
+  "home.pending_critical_update.link": "ਅੱਪਡੇਟ ਵੇਖੋ",
   "interaction_modal.title.follow": "{name} ਨੂੰ ਫ਼ਾਲੋ ਕਰੋ",
   "keyboard_shortcuts.back": "ਪਿੱਛੇ ਜਾਓ",
   "keyboard_shortcuts.blocked": "ਪਾਬੰਦੀ ਲਾਏ ਵਰਤੋਂਕਾਰਾਂ ਦੀ ਸੂਚੀ ਖੋਲ੍ਹੋ",
@@ -188,11 +209,13 @@
   "navigation_bar.domain_blocks": "ਪਾਬੰਦੀ ਲਾਏ ਡੋਮੇਨ",
   "navigation_bar.explore": "ਪੜਚੋਲ ਕਰੋ",
   "navigation_bar.favourites": "ਮਨਪਸੰਦ",
+  "navigation_bar.filters": "ਮੌਨ ਕੀਤੇ ਸ਼ਬਦ",
   "navigation_bar.follow_requests": "ਫ਼ਾਲੋ ਦੀਆਂ ਬੇਨਤੀਆਂ",
   "navigation_bar.followed_tags": "ਫ਼ਾਲੋ ਕੀਤੇ ਹੈਸ਼ਟੈਗ",
   "navigation_bar.follows_and_followers": "ਫ਼ਾਲੋ ਅਤੇ ਫ਼ਾਲੋ ਕਰਨ ਵਾਲੇ",
   "navigation_bar.lists": "ਸੂਚੀਆਂ",
   "navigation_bar.logout": "ਲਾਗ ਆਉਟ",
+  "navigation_bar.mutes": "ਮੌਨ ਕੀਤੇ ਵਰਤੋਂਕਾਰ",
   "navigation_bar.personal": "ਨਿੱਜੀ",
   "navigation_bar.pins": "ਟੰਗੀਆਂ ਪੋਸਟਾਂ",
   "navigation_bar.preferences": "ਪਸੰਦਾਂ",
@@ -202,6 +225,8 @@
   "notification.follow": "{name} ਨੇ ਤੁਹਾਨੂੰ ਫ਼ਾਲੋ ਕੀਤਾ",
   "notification.follow_request": "{name} ਨੇ ਤੁਹਾਨੂੰ ਫ਼ਾਲੋ ਕਰਨ ਦੀ ਬੇਨਤੀ ਕੀਤੀ ਹੈ",
   "notification.reblog": "{name} boosted your status",
+  "notifications.column_settings.alert": "ਡੈਸਕਟਾਪ ਸੂਚਨਾਵਾਂ",
+  "notifications.column_settings.favourite": "ਮਨਪਸੰਦ:",
   "notifications.column_settings.follow": "ਨਵੇਂ ਫ਼ਾਲੋਅਰ:",
   "notifications.column_settings.follow_request": "ਨਵੀਆਂ ਫ਼ਾਲੋ ਬੇਨਤੀਆਂ:",
   "notifications.column_settings.status": "ਨਵੀਆਂ ਪੋਸਟਾਂ:",
@@ -261,9 +286,11 @@
   "report.target": "{target} ਰਿਪੋਰਟ",
   "report.unfollow": "@{name} ਨੂੰ ਅਣ-ਫ਼ਾਲੋ ਕਰੋ",
   "report_notification.attached_statuses": "{count, plural, one {# post} other {# posts}} attached",
+  "report_notification.categories.legal": "ਕਨੂੰਨੀ",
   "report_notification.categories.other": "ਬਾਕੀ",
   "report_notification.categories.spam": "ਸਪੈਮ",
   "report_notification.categories.violation": "ਨਿਯਮ ਦੀ ਉਲੰਘਣਾ",
+  "report_notification.open": "ਰਿਪੋਰਟ ਨੂੰ ਖੋਲ੍ਹੋ",
   "search.placeholder": "ਖੋਜੋ",
   "search_popout.quick_actions": "ਫੌਰੀ ਕਾਰਵਾਈਆਂ",
   "search_popout.specific_date": "ਖਾਸ ਤਾਰੀਖ",
@@ -271,10 +298,13 @@
   "search_results.accounts": "ਪਰੋਫਾਈਲ",
   "search_results.all": "ਸਭ",
   "search_results.hashtags": "ਹੈਸ਼ਟੈਗ",
+  "search_results.see_all": "ਸਭ ਵੇਖੋ",
   "search_results.statuses": "ਪੋਸਟਾਂ",
+  "search_results.title": "{q} ਲਈ ਖੋਜ",
   "server_banner.learn_more": "ਹੋਰ ਜਾਣੋ",
   "sign_in_banner.create_account": "ਖਾਤਾ ਬਣਾਓ",
   "sign_in_banner.sign_in": "ਲਾਗਇਨ",
+  "sign_in_banner.sso_redirect": "ਲਾਗਇਨ ਜਾਂ ਰਜਿਸਟਰ ਕਰੋ",
   "status.admin_status": "",
   "status.block": "@{name} ਉੱਤੇ ਪਾਬੰਦੀ ਲਾਓ",
   "status.bookmark": "ਬੁੱਕਮਾਰਕ",
diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json
index 2eaeeaab55d529..814d0f2de0dec0 100644
--- a/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@@ -145,11 +145,9 @@
   "compose_form.lock_disclaimer": "Twoje konto nie jest {locked}. Każdy, kto Cię obserwuje, może wyświetlać Twoje wpisy przeznaczone tylko dla obserwujących.",
   "compose_form.lock_disclaimer.lock": "zablokowane",
   "compose_form.placeholder": "Co chodzi ci po głowie?",
-  "compose_form.poll.add_option": "Dodaj opcję",
   "compose_form.poll.duration": "Czas trwania głosowania",
   "compose_form.poll.multiple": "Wielokrotny wybór",
   "compose_form.poll.option_placeholder": "Opcja {number}",
-  "compose_form.poll.remove_option": "Usuń tę opcję",
   "compose_form.poll.single": "Wybierz jedną",
   "compose_form.poll.switch_to_multiple": "Pozwól na wybranie wielu opcji",
   "compose_form.poll.switch_to_single": "Pozwól na wybranie tylko jednej opcji",
@@ -160,6 +158,7 @@
   "compose_form.save_changes": "Aktualizuj",
   "compose_form.spoiler.marked": "Usuń ostrzeżenie o treści",
   "compose_form.spoiler.unmarked": "Dodaj ostrzeżenie o treści",
+  "compose_form.spoiler_placeholder": "Ostrzeżenie o treści (opcjonalne)",
   "confirmation_modal.cancel": "Anuluj",
   "confirmations.block.block_and_report": "Zablokuj i zgłoś",
   "confirmations.block.confirm": "Zablokuj",
@@ -278,6 +277,12 @@
   "follow_request.authorize": "Autoryzuj",
   "follow_request.reject": "Odrzuć",
   "follow_requests.unlocked_explanation": "Mimo że Twoje konto nie jest zablokowane, zespół {domain} uznał że możesz chcieć ręcznie przejrzeć prośby o możliwość obserwacji.",
+  "follow_suggestions.curated_suggestion": "Wybór redakcji",
+  "follow_suggestions.dismiss": "Nie pokazuj ponownie",
+  "follow_suggestions.personalized_suggestion": "Sugestia spersonalizowana",
+  "follow_suggestions.popular_suggestion": "Sugestia popularna",
+  "follow_suggestions.view_all": "Pokaż wszystkie",
+  "follow_suggestions.who_to_follow": "Kogo obserwować",
   "followed_tags": "Obserwowane hasztagi",
   "footer.about": "O serwerze",
   "footer.directory": "Katalog profilów",
@@ -304,13 +309,9 @@
   "hashtag.follow": "Obserwuj hasztag",
   "hashtag.unfollow": "Przestań obserwować hashtag",
   "hashtags.and_other": "…i {count, plural, other {jeszcze #}}",
-  "home.actions.go_to_explore": "Zobacz, co jest teraz popularne",
-  "home.actions.go_to_suggestions": "Znajdź ludzi wartych obserwowania",
   "home.column_settings.basic": "Podstawowe",
   "home.column_settings.show_reblogs": "Pokazuj podbicia",
   "home.column_settings.show_replies": "Pokazuj odpowiedzi",
-  "home.explore_prompt.body": "Twój kanał główny będzie zawierał kombinację postów z tagów i osób które obserwujesz oraz wpisów przezeń podbitych. Jeżeli wydaje się to za spokojnym, spróbuj czegoś poniżej.",
-  "home.explore_prompt.title": "To twój punkt podparcia w Mastodonie.",
   "home.hide_announcements": "Ukryj ogłoszenia",
   "home.pending_critical_update.body": "Zaktualizuj serwer jak tylko będzie to możliwe!",
   "home.pending_critical_update.link": "Pokaż aktualizacje",
@@ -523,11 +524,15 @@
   "poll_button.add_poll": "Dodaj głosowanie",
   "poll_button.remove_poll": "Usuń głosowanie",
   "privacy.change": "Dostosuj widoczność wpisów",
+  "privacy.direct.long": "Wszyscy wspomnieni w tym wpisie",
   "privacy.direct.short": "Konkretni ludzie",
   "privacy.private.long": "Tylko ci, którzy cię obserwują",
   "privacy.private.short": "Obserwujący",
   "privacy.public.long": "Ktokolwiek na i poza Mastodonem",
   "privacy.public.short": "Publiczny",
+  "privacy.unlisted.additional": "Taki sam jak \"Publiczny\", ale wpis nie pojawi się w kanałach na żywo, hasztagach, odkrywaniu, ani w wyszukiwaniu w Mastodonie, nawet jeżeli jest to włączone w ustawieniach konta.",
+  "privacy.unlisted.long": "Widoczne dla każdego, z wyłączeniem funkcji odkrywania",
+  "privacy.unlisted.short": "Niewidoczny",
   "privacy_policy.last_updated": "Data ostatniej aktualizacji: {date}",
   "privacy_policy.title": "Polityka prywatności",
   "recommended": "Zalecane",
@@ -545,7 +550,9 @@
   "relative_time.minutes": "{number} min.",
   "relative_time.seconds": "{number} s.",
   "relative_time.today": "dzisiaj",
+  "reply_indicator.attachments": "{count, plural, one {# załącznik} few {# załączniki} many {# załączników} other {# załączniku}}",
   "reply_indicator.cancel": "Anuluj",
+  "reply_indicator.poll": "Ankieta",
   "report.block": "Zablokuj",
   "report.block_explanation": "Nie zobaczysz ich wpisów. Nie będą mogli zobaczyć Twoich postów ani cię obserwować. Będą mogli domyślić się, że są zablokowani.",
   "report.categories.legal": "Prawne",
diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json
index bb009239d42b97..eced6ca7adcdcb 100644
--- a/app/javascript/mastodon/locales/pt-BR.json
+++ b/app/javascript/mastodon/locales/pt-BR.json
@@ -145,11 +145,9 @@
   "compose_form.lock_disclaimer": "Seu perfil não está {locked}. Qualquer um pode te seguir e ver os toots privados.",
   "compose_form.lock_disclaimer.lock": "trancado",
   "compose_form.placeholder": "No que você está pensando?",
-  "compose_form.poll.add_option": "Adicionar opção",
   "compose_form.poll.duration": "Duração da enquete",
   "compose_form.poll.multiple": "Múltipla escolha",
   "compose_form.poll.option_placeholder": "Opção {number}",
-  "compose_form.poll.remove_option": "Remover esta opção",
   "compose_form.poll.single": "Escolha uma",
   "compose_form.poll.switch_to_multiple": "Permitir múltiplas escolhas",
   "compose_form.poll.switch_to_single": "Opção única",
@@ -279,6 +277,12 @@
   "follow_request.authorize": "Aprovar",
   "follow_request.reject": "Recusar",
   "follow_requests.unlocked_explanation": "Apesar de seu perfil não ser trancado, {domain} exige que você revise a solicitação para te seguir destes perfis manualmente.",
+  "follow_suggestions.curated_suggestion": "Escolha dos editores",
+  "follow_suggestions.dismiss": "Não mostrar novamente",
+  "follow_suggestions.personalized_suggestion": "Sugestão personalizada",
+  "follow_suggestions.popular_suggestion": "Sugestão popular",
+  "follow_suggestions.view_all": "Visualizar tudo",
+  "follow_suggestions.who_to_follow": "Quem seguir",
   "followed_tags": "Hashtags seguidas",
   "footer.about": "Sobre",
   "footer.directory": "Diretório de perfis",
@@ -305,13 +309,9 @@
   "hashtag.follow": "Seguir hashtag",
   "hashtag.unfollow": "Parar de seguir hashtag",
   "hashtags.and_other": "…e {count, plural, one {}other {outros #}}",
-  "home.actions.go_to_explore": "Veja o que está acontecendo",
-  "home.actions.go_to_suggestions": "Encontre pessoas para seguir",
   "home.column_settings.basic": "Básico",
   "home.column_settings.show_reblogs": "Mostrar boosts",
   "home.column_settings.show_replies": "Mostrar respostas",
-  "home.explore_prompt.body": "Seu feed inicial terá uma mistura de publicações das hashtags que você escolheu seguir, das pessoas que você escolheu seguir e das publicações que elas impulsionam. Se está parecendo tranquilo demais, então que tal:",
-  "home.explore_prompt.title": "Esta é a sua base principal dentro do Mastodon.",
   "home.hide_announcements": "Ocultar comunicados",
   "home.pending_critical_update.body": "Por favor, atualize o seu servidor Mastodon o mais rápido possível!",
   "home.pending_critical_update.link": "Ver atualizações",
diff --git a/app/javascript/mastodon/locales/pt-PT.json b/app/javascript/mastodon/locales/pt-PT.json
index 22bb1bbfd263a1..3674126144bdae 100644
--- a/app/javascript/mastodon/locales/pt-PT.json
+++ b/app/javascript/mastodon/locales/pt-PT.json
@@ -145,11 +145,9 @@
   "compose_form.lock_disclaimer": "A sua conta não é {locked}. Qualquer pessoa pode segui-lo e ver as publicações direcionadas apenas a seguidores.",
   "compose_form.lock_disclaimer.lock": "fechada",
   "compose_form.placeholder": "Em que está a pensar?",
-  "compose_form.poll.add_option": "Adicionar opção",
   "compose_form.poll.duration": "Duração do inquérito",
   "compose_form.poll.multiple": "Escolha múltipla",
   "compose_form.poll.option_placeholder": "Opção {number}",
-  "compose_form.poll.remove_option": "Eliminar esta opção",
   "compose_form.poll.single": "Escolha uma",
   "compose_form.poll.switch_to_multiple": "Alterar o inquérito para permitir várias respostas",
   "compose_form.poll.switch_to_single": "Alterar o inquérito para permitir uma única resposta",
@@ -279,6 +277,12 @@
   "follow_request.authorize": "Autorizar",
   "follow_request.reject": "Rejeitar",
   "follow_requests.unlocked_explanation": "Apesar de a sua não ser privada, a administração de {domain} pensa que poderá querer rever manualmente os pedidos de seguimento dessas contas.",
+  "follow_suggestions.curated_suggestion": "Escolha dos Editores",
+  "follow_suggestions.dismiss": "Não mostrar novamente",
+  "follow_suggestions.personalized_suggestion": "Sugestão personalizada",
+  "follow_suggestions.popular_suggestion": "Sugestão popular",
+  "follow_suggestions.view_all": "Ver tudo",
+  "follow_suggestions.who_to_follow": "Quem seguir",
   "followed_tags": "Hashtags seguidas",
   "footer.about": "Sobre",
   "footer.directory": "Diretório de perfis",
@@ -305,13 +309,9 @@
   "hashtag.follow": "Seguir #etiqueta",
   "hashtag.unfollow": "Deixar de seguir #etiqueta",
   "hashtags.and_other": "…e {count, plural, other {mais #}}",
-  "home.actions.go_to_explore": "Veja as tendências atuais",
-  "home.actions.go_to_suggestions": "Encontrar pessoas para seguir",
   "home.column_settings.basic": "Básico",
   "home.column_settings.show_reblogs": "Mostrar impulsos",
   "home.column_settings.show_replies": "Mostrar respostas",
-  "home.explore_prompt.body": "A sua página inicial terá uma mistura de publicações com as hashtags que escolheu seguir, das pessoas que escolheu seguir e as publicações que elas partilham. Parece bastante sossegado por agora, talvez queira:",
-  "home.explore_prompt.title": "Esta é a sua base principal dentro do Mastodon.",
   "home.hide_announcements": "Ocultar comunicações",
   "home.pending_critical_update.body": "Por favor, atualize o seu servidor Mastodon assim que possível!",
   "home.pending_critical_update.link": "Ver atualizações",
diff --git a/app/javascript/mastodon/locales/ro.json b/app/javascript/mastodon/locales/ro.json
index e6d881a986f318..d236ba49698158 100644
--- a/app/javascript/mastodon/locales/ro.json
+++ b/app/javascript/mastodon/locales/ro.json
@@ -266,7 +266,6 @@
   "hashtag.column_settings.tag_toggle": "Adaugă etichete suplimentare pentru această coloană",
   "hashtag.follow": "Urmărește haștagul",
   "hashtag.unfollow": "Nu mai urmări haștagul",
-  "home.actions.go_to_suggestions": "Găsește persoane de urmărit",
   "home.column_settings.basic": "De bază",
   "home.column_settings.show_reblogs": "Afișează distribuirile",
   "home.column_settings.show_replies": "Afișează răspunsurile",
diff --git a/app/javascript/mastodon/locales/ru.json b/app/javascript/mastodon/locales/ru.json
index eefa9c72987d7c..623b4038322375 100644
--- a/app/javascript/mastodon/locales/ru.json
+++ b/app/javascript/mastodon/locales/ru.json
@@ -146,11 +146,19 @@
   "compose_form.lock_disclaimer.lock": "не закрыта",
   "compose_form.placeholder": "О чём думаете?",
   "compose_form.poll.duration": "Продолжительность опроса",
+  "compose_form.poll.multiple": "Несколько вариантов ответа",
+  "compose_form.poll.option_placeholder": "Вариант {number}",
+  "compose_form.poll.single": "Выберите один",
   "compose_form.poll.switch_to_multiple": "Разрешить выбор нескольких вариантов",
   "compose_form.poll.switch_to_single": "Переключить в режим выбора одного ответа",
+  "compose_form.poll.type": "Стиль",
+  "compose_form.publish": "Опубликовать",
   "compose_form.publish_form": "Опубликовать",
+  "compose_form.reply": "Ответить",
+  "compose_form.save_changes": "Сохранить",
   "compose_form.spoiler.marked": "Текст скрыт за предупреждением",
   "compose_form.spoiler.unmarked": "Текст не скрыт",
+  "compose_form.spoiler_placeholder": "Предупреждение о контенте (опционально)",
   "confirmation_modal.cancel": "Отмена",
   "confirmations.block.block_and_report": "Заблокировать и пожаловаться",
   "confirmations.block.confirm": "Заблокировать",
@@ -229,7 +237,7 @@
   "empty_column.follow_requests": "Вам ещё не приходили запросы на подписку. Все новые запросы будут показаны здесь.",
   "empty_column.followed_tags": "Вы еще не подписались ни на один хэштег. Когда вы это сделаете, они появятся здесь.",
   "empty_column.hashtag": "С этим хэштегом пока ещё ничего не постили.",
-  "empty_column.home": "Ваша лента совсем пуста! Подпишитесь на других, чтобы заполнить её. {suggestions}",
+  "empty_column.home": "Ваша лента совсем пуста! Подписывайтесь на других, чтобы заполнить её.",
   "empty_column.list": "В этом списке пока ничего нет.",
   "empty_column.lists": "У вас ещё нет списков. Созданные вами списки будут показаны здесь.",
   "empty_column.mutes": "Вы ещё никого не добавляли в список игнорируемых.",
@@ -269,6 +277,12 @@
   "follow_request.authorize": "Авторизовать",
   "follow_request.reject": "Отказать",
   "follow_requests.unlocked_explanation": "Хотя ваша учетная запись не закрыта, команда {domain} подумала, что вы захотите просмотреть запросы от этих учетных записей вручную.",
+  "follow_suggestions.curated_suggestion": "Выбор редакции",
+  "follow_suggestions.dismiss": "Больше не показывать",
+  "follow_suggestions.personalized_suggestion": "Персонализированное предложение",
+  "follow_suggestions.popular_suggestion": "Популярное предложение",
+  "follow_suggestions.view_all": "Посмотреть все",
+  "follow_suggestions.who_to_follow": "На кого подписаться",
   "followed_tags": "Отслеживаемые хэштеги",
   "footer.about": "О проекте",
   "footer.directory": "Каталог профилей",
@@ -295,13 +309,9 @@
   "hashtag.follow": "Подписаться на новые посты",
   "hashtag.unfollow": "Отписаться",
   "hashtags.and_other": "...и {count, plural, other {# ещё}}",
-  "home.actions.go_to_explore": "Посмотреть, что актуально",
-  "home.actions.go_to_suggestions": "Подпишитесь на людей",
   "home.column_settings.basic": "Основные",
   "home.column_settings.show_reblogs": "Показывать продвижения",
   "home.column_settings.show_replies": "Показывать ответы",
-  "home.explore_prompt.body": "В вашем доме появятся сообщения из хэштегов, на которые вы хотите подписаться, люди, которых вы выбрали подписаться, и сообщения, которые они увеличили. Сейчас выглядит спокойно, так что:",
-  "home.explore_prompt.title": "Это ваша домашняя база в Мастодоне.",
   "home.hide_announcements": "Скрыть объявления",
   "home.pending_critical_update.body": "Пожалуйста, обновите свой сервер Mastodon как можно скорее!",
   "home.pending_critical_update.link": "Посмотреть обновления",
@@ -514,7 +524,15 @@
   "poll_button.add_poll": "Добавить опрос",
   "poll_button.remove_poll": "Удалить опрос",
   "privacy.change": "Изменить видимость поста",
+  "privacy.direct.long": "Все упомянутые в посте",
+  "privacy.direct.short": "Определённые люди",
+  "privacy.private.long": "Только ваши подписчики",
+  "privacy.private.short": "Подписчики",
+  "privacy.public.long": "Любой, находящийся на Mastodon и вне его",
   "privacy.public.short": "Публичный",
+  "privacy.unlisted.additional": "Работает точно так же, как public, за исключением того, что пост не будет отображаться в прямых лентах, хэштегах, исследованиях или поиске Mastodon, даже если ваш аккаунт подписан на это на уровне всего аккаунта.",
+  "privacy.unlisted.long": "Меньше алгоритмических фанфар",
+  "privacy.unlisted.short": "Тихий публичный",
   "privacy_policy.last_updated": "Последнее обновление {date}",
   "privacy_policy.title": "Политика конфиденциальности",
   "recommended": "Рекомендуется",
@@ -532,7 +550,9 @@
   "relative_time.minutes": "{number} мин",
   "relative_time.seconds": "{number} с",
   "relative_time.today": "сегодня",
+  "reply_indicator.attachments": "{count, plural, one {# вложение} other {# вложения}}",
   "reply_indicator.cancel": "Отмена",
+  "reply_indicator.poll": "Опрос",
   "report.block": "Заблокировать",
   "report.block_explanation": "Вы перестанете видеть посты этого пользователя, и он(а) больше не сможет подписаться на вас и читать ваши посты. Он(а) сможет понять, что вы заблокировали его/её.",
   "report.categories.legal": "Правовая информация",
diff --git a/app/javascript/mastodon/locales/si.json b/app/javascript/mastodon/locales/si.json
index 1b2eb17633e601..2058d1415be921 100644
--- a/app/javascript/mastodon/locales/si.json
+++ b/app/javascript/mastodon/locales/si.json
@@ -201,11 +201,8 @@
   "hashtag.column_settings.tag_mode.all": "මේ සියල්ලම",
   "hashtag.column_settings.tag_mode.none": "මේ කිසිවක් නැත",
   "hashtag.column_settings.tag_toggle": "මෙම තීරුවේ අමතර ටැග් ඇතුළත් කරන්න",
-  "home.actions.go_to_explore": "නැගී එන දෑ බලන්න",
-  "home.actions.go_to_suggestions": "පුද්ගලයින් සොයන්න",
   "home.column_settings.basic": "මූලික",
   "home.column_settings.show_replies": "පිළිතුරු පෙන්වන්න",
-  "home.explore_prompt.title": "මෙය ඔබගේ මාස්ටඩන් මුල් පිටුවයි.",
   "home.hide_announcements": "නිවේදන සඟවන්න",
   "home.pending_critical_update.link": "යාවත්කාල බලන්න",
   "home.show_announcements": "නිවේදන පෙන්වන්න",
diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json
index 5b1203aeeaa98b..b91c45bb297235 100644
--- a/app/javascript/mastodon/locales/sk.json
+++ b/app/javascript/mastodon/locales/sk.json
@@ -35,7 +35,7 @@
   "account.follow_back": "Nasleduj späť",
   "account.followers": "Sledovatelia",
   "account.followers.empty": "Tohto používateľa ešte nikto nenasleduje.",
-  "account.followers_counter": "{count, plural, one {{counter} Sledujúci} few {{counter} Sledujúci} many {{counter} Sledujúcich} other {{counter} Sledujúcich}}",
+  "account.followers_counter": "{count, plural, one {{counter} Sledujúci} other {{counter} Sledujúci}}",
   "account.following": "Sledujem",
   "account.following_counter": "{count, plural, one {{counter} Sledovaných} other {{counter} Sledujúcich}}",
   "account.follows.empty": "Tento používateľ ešte nikoho nesleduje.",
@@ -142,15 +142,23 @@
   "compose_form.direct_message_warning_learn_more": "Zisti viac",
   "compose_form.encryption_warning": "Príspevky na Mastodon nie sú end-to-end šifrované. Nezdieľajte cez Mastodon žiadne citlivé informácie.",
   "compose_form.hashtag_warning": "Tento príspevok nebude zobrazený pod žiadným haštagom, lebo nieje verejne listovaný. Iba verejné príspevky môžu byť nájdené podľa haštagu.",
-  "compose_form.lock_disclaimer": "Tvoj účet nie je {locked}. Ktokoľvek ťa môže nasledovať a vidieť tvoje správy pre sledujúcich.",
+  "compose_form.lock_disclaimer": "Tvoj účet nie je {locked}. Ktokoľvek ťa môže nasledovať a vidieť tvoje príspevky pre sledujúcich.",
   "compose_form.lock_disclaimer.lock": "zamknutý",
   "compose_form.placeholder": "Čo máš na mysli?",
   "compose_form.poll.duration": "Trvanie ankety",
+  "compose_form.poll.multiple": "Viacero možností",
+  "compose_form.poll.option_placeholder": "Voľba {number}",
+  "compose_form.poll.single": "Vyber jednu",
   "compose_form.poll.switch_to_multiple": "Zmeň anketu pre povolenie viacerých možností",
   "compose_form.poll.switch_to_single": "Zmeň anketu na takú s jedinou voľbou",
+  "compose_form.poll.type": "Typ",
+  "compose_form.publish": "Prispej",
   "compose_form.publish_form": "Zverejniť",
+  "compose_form.reply": "Odpovedz",
+  "compose_form.save_changes": "Aktualizácia",
   "compose_form.spoiler.marked": "Text je ukrytý za varovaním",
   "compose_form.spoiler.unmarked": "Text nieje ukrytý",
+  "compose_form.spoiler_placeholder": "Varovanie o obsahu (voliteľné)",
   "confirmation_modal.cancel": "Zruš",
   "confirmations.block.block_and_report": "Zablokuj a nahlás",
   "confirmations.block.confirm": "Blokuj",
@@ -269,6 +277,10 @@
   "follow_request.authorize": "Povoľ prístup",
   "follow_request.reject": "Odmietni",
   "follow_requests.unlocked_explanation": "Síce Váš učet nie je uzamknutý, ale {domain} tím si myslel že môžete chcieť skontrolovať žiadosti o sledovanie z týchto účtov manuálne.",
+  "follow_suggestions.dismiss": "Znovu nezobrazuj",
+  "follow_suggestions.personalized_suggestion": "Prispôsobené odporúčania",
+  "follow_suggestions.view_all": "Zobraz všetky",
+  "follow_suggestions.who_to_follow": "Koho nasledovať",
   "followed_tags": "Nasledované haštagy",
   "footer.about": "O",
   "footer.directory": "Adresár profilov",
@@ -289,19 +301,15 @@
   "hashtag.column_settings.tag_mode.any": "Hociktorý z týchto",
   "hashtag.column_settings.tag_mode.none": "Žiaden z týchto",
   "hashtag.column_settings.tag_toggle": "Vlož dodatočné haštagy pre tento stĺpec",
-  "hashtag.counter_by_accounts": "{count, plural, one {{counter} sledujúci} few {{counter} sledujúci} many {{counter} sledujúcich} other {{counter} sledujúcich}}",
+  "hashtag.counter_by_accounts": "{count, plural, one {{counter} účastník} other {{counter} účastníci}}",
   "hashtag.counter_by_uses": "{count, plural, one {{counter} príspevok} few {{counter} príspevky} many {{counter} príspevkov} other {{counter} príspevkov}}",
   "hashtag.counter_by_uses_today": "{count, plural, one {{counter} príspevok} few {{counter} príspevky} many {{counter} príspevkov} other {{counter} príspevkov}} dnes",
   "hashtag.follow": "Sleduj haštag",
   "hashtag.unfollow": "Nesleduj haštag",
   "hashtags.and_other": "…a {count, plural, one {} few {# ďalšie} many {# ďalších}other {# ďalších}}",
-  "home.actions.go_to_explore": "Pozrieť, čo je trendy",
-  "home.actions.go_to_suggestions": "Nájdi ľudí na sledovanie",
   "home.column_settings.basic": "Základné",
   "home.column_settings.show_reblogs": "Ukáž vyzdvihnuté",
   "home.column_settings.show_replies": "Ukáž odpovede",
-  "home.explore_prompt.body": "Váš domovský informačný kanál bude obsahovať mix príspevkov z mriežok, ktoré ste sa rozhodli sledovať, ľudí, ktorých ste sa rozhodli sledovať, a príspevkov, ktoré preferujú. Ak sa vám to zdá príliš málo, možno budete chcieť:",
-  "home.explore_prompt.title": "Toto je tvoja domovina v rámci Mastodonu.",
   "home.hide_announcements": "Skry oznámenia",
   "home.pending_critical_update.body": "Prosím aktualizuj si svoj Mastodon server, ako náhle to bude možné!",
   "home.pending_critical_update.link": "Pozri aktualizácie",
@@ -513,6 +521,7 @@
   "poll_button.add_poll": "Pridaj anketu",
   "poll_button.remove_poll": "Odstráň anketu",
   "privacy.change": "Uprav súkromie príspevku",
+  "privacy.private.short": "Sledovatelia",
   "privacy.public.short": "Verejné",
   "privacy_policy.last_updated": "Posledná úprava {date}",
   "privacy_policy.title": "Zásady súkromia",
@@ -532,6 +541,7 @@
   "relative_time.seconds": "{number}sek",
   "relative_time.today": "dnes",
   "reply_indicator.cancel": "Zrušiť",
+  "reply_indicator.poll": "Anketa",
   "report.block": "Blokuj",
   "report.block_explanation": "Ich príspevky neuvidíte. Nebudú môcť vidieť vaše príspevky ani vás sledovať. Budú môcť zistiť, že sú zablokovaní.",
   "report.categories.legal": "Právne ujednania",
diff --git a/app/javascript/mastodon/locales/sl.json b/app/javascript/mastodon/locales/sl.json
index 559b05db72ec2d..3aae75dc368595 100644
--- a/app/javascript/mastodon/locales/sl.json
+++ b/app/javascript/mastodon/locales/sl.json
@@ -146,11 +146,19 @@
   "compose_form.lock_disclaimer.lock": "zaklenjen",
   "compose_form.placeholder": "O čem razmišljate?",
   "compose_form.poll.duration": "Trajanje ankete",
+  "compose_form.poll.multiple": "Več možnosti",
+  "compose_form.poll.option_placeholder": "Možnost {number}",
+  "compose_form.poll.single": "Izberite eno možnost",
   "compose_form.poll.switch_to_multiple": "Spremenite anketo, da omogočite več izbir",
   "compose_form.poll.switch_to_single": "Spremenite anketo, da omogočite eno izbiro",
+  "compose_form.poll.type": "Slog",
+  "compose_form.publish": "Objavi",
   "compose_form.publish_form": "Objavi",
+  "compose_form.reply": "Odgovori",
+  "compose_form.save_changes": "Posodobi",
   "compose_form.spoiler.marked": "Odstrani opozorilo o vsebini",
   "compose_form.spoiler.unmarked": "Dodaj opozorilo o vsebini",
+  "compose_form.spoiler_placeholder": "Opozorilo o vsebini (ni obvezno)",
   "confirmation_modal.cancel": "Prekliči",
   "confirmations.block.block_and_report": "Blokiraj in prijavi",
   "confirmations.block.confirm": "Blokiraj",
@@ -269,6 +277,12 @@
   "follow_request.authorize": "Overi",
   "follow_request.reject": "Zavrni",
   "follow_requests.unlocked_explanation": "Čeprav vaš račun ni zaklenjen, zaposleni pri {domain} menijo, da bi morda želeli pregledati zahteve za sledenje teh računov ročno.",
+  "follow_suggestions.curated_suggestion": "Izbor urednikov",
+  "follow_suggestions.dismiss": "Ne pokaži več",
+  "follow_suggestions.personalized_suggestion": "Osebno prilagojen predlog",
+  "follow_suggestions.popular_suggestion": "Priljubljen predlog",
+  "follow_suggestions.view_all": "Pokaži vse",
+  "follow_suggestions.who_to_follow": "Komu slediti",
   "followed_tags": "Sledeni ključniki",
   "footer.about": "O Mastodonu",
   "footer.directory": "Imenik profilov",
@@ -295,13 +309,9 @@
   "hashtag.follow": "Sledi ključniku",
   "hashtag.unfollow": "Nehaj slediti ključniku",
   "hashtags.and_other": "…in še {count, plural, other {#}}",
-  "home.actions.go_to_explore": "Poglejte, kaj je v trendu",
-  "home.actions.go_to_suggestions": "Poiščite osebe, ki jim želite slediti",
   "home.column_settings.basic": "Osnovno",
   "home.column_settings.show_reblogs": "Pokaži izpostavitve",
   "home.column_settings.show_replies": "Pokaži odgovore",
-  "home.explore_prompt.body": "Vaš domači vir bo vseboval mešanico objav ključnikov, ki ste jih izbrali za sledenje, oseb, ki ste jih izbrali za sledenje, in objav, ki jih ti izpostavljajo. Če se vam to zdi preveč tiho, morda želite:",
-  "home.explore_prompt.title": "To je vaš dom v okviru Mastodona.",
   "home.hide_announcements": "Skrij obvestila",
   "home.pending_critical_update.body": "Čim prej posodobite svoj strežnik Mastodon!",
   "home.pending_critical_update.link": "Glejte posodobitve",
@@ -514,7 +524,15 @@
   "poll_button.add_poll": "Dodaj anketo",
   "poll_button.remove_poll": "Odstrani anketo",
   "privacy.change": "Spremeni zasebnost objave",
+  "privacy.direct.long": "Vsem omenjenim v objavi",
+  "privacy.direct.short": "Določenim ljudem",
+  "privacy.private.long": "Samo vašim sledilcem",
+  "privacy.private.short": "Sledilcem",
+  "privacy.public.long": "Vsem, ki so ali niso na Mastodonu",
   "privacy.public.short": "Javno",
+  "privacy.unlisted.additional": "Učinek je enak kot pri javni objavi, le da se ta ne bo prikazala v živih virih, med ključniki, raziskovanjem ali iskanjem, četudi ste to vključili na ravni računa.",
+  "privacy.unlisted.long": "Manj vsebine po izboru algoritma",
+  "privacy.unlisted.short": "Tiho javno",
   "privacy_policy.last_updated": "Zadnja posodobitev {date}",
   "privacy_policy.title": "Pravilnik o zasebnosti",
   "recommended": "Priporočeno",
@@ -532,7 +550,9 @@
   "relative_time.minutes": "{number} m",
   "relative_time.seconds": "{number} s",
   "relative_time.today": "danes",
+  "reply_indicator.attachments": "{count, plural, one {# priloga} two {# prilogi} few {# priloge} other {# prilog}}",
   "reply_indicator.cancel": "Prekliči",
+  "reply_indicator.poll": "Anketa",
   "report.block": "Blokiraj",
   "report.block_explanation": "Njihovih objav ne boste videli. Oni ne bodo videli vaših objav, niti vam ne morejo slediti. Lahko bodo ugotovili, da so blokirani.",
   "report.categories.legal": "Pravno obvestilo",
diff --git a/app/javascript/mastodon/locales/sq.json b/app/javascript/mastodon/locales/sq.json
index bfc674248bde96..496e35fe761f7c 100644
--- a/app/javascript/mastodon/locales/sq.json
+++ b/app/javascript/mastodon/locales/sq.json
@@ -145,11 +145,9 @@
   "compose_form.lock_disclaimer": "Llogaria juaj s’është {locked}. Mund ta ndjekë cilido, për të parë postimet tuaja vetëm për ndjekësit.",
   "compose_form.lock_disclaimer.lock": "e kyçur",
   "compose_form.placeholder": "Ç’bluani në mendje?",
-  "compose_form.poll.add_option": "Shtoni mundësi",
   "compose_form.poll.duration": "Kohëzgjatje pyetësori",
   "compose_form.poll.multiple": "Shumë zgjedhje",
   "compose_form.poll.option_placeholder": "Mundësia {number}",
-  "compose_form.poll.remove_option": "Hiqe këtë mundësi",
   "compose_form.poll.single": "Zgjidhni një",
   "compose_form.poll.switch_to_multiple": "Ndrysho votimin për të lejuar shumë zgjedhje",
   "compose_form.poll.switch_to_single": "Ndrysho votimin për të lejuar vetëm një zgjedhje",
@@ -279,6 +277,12 @@
   "follow_request.authorize": "Autorizoje",
   "follow_request.reject": "Hidhe tej",
   "follow_requests.unlocked_explanation": "Edhe pse llogaria juaj s’është e kyçur, ekipi i {domain} mendoi se mund të donit të shqyrtonit dorazi kërkesa ndjekjeje prej këtyre llogarive.",
+  "follow_suggestions.curated_suggestion": "Zgjedhur nga Ekipi",
+  "follow_suggestions.dismiss": "Mos shfaq më",
+  "follow_suggestions.personalized_suggestion": "Sugjerim i personalizuar",
+  "follow_suggestions.popular_suggestion": "Sugjerim popullor",
+  "follow_suggestions.view_all": "Shihni krejt",
+  "follow_suggestions.who_to_follow": "Cilët të ndiqen",
   "followed_tags": "Hashtag-ë të ndjekur",
   "footer.about": "Mbi",
   "footer.directory": "Drejtori profilesh",
@@ -305,13 +309,9 @@
   "hashtag.follow": "Ndiqe hashtag-un",
   "hashtag.unfollow": "Hiqe ndjekjen e hashtag-ut",
   "hashtags.and_other": "…dhe {count, plural, one {}other {# më tepër}}",
-  "home.actions.go_to_explore": "Shihni ç’është në modë",
-  "home.actions.go_to_suggestions": "Gjeni persona për ndjekje",
   "home.column_settings.basic": "Bazë",
   "home.column_settings.show_reblogs": "Shfaq përforcime",
   "home.column_settings.show_replies": "Shfaq përgjigje",
-  "home.explore_prompt.body": "Prurja juaj bazë do të ketë një përzierje postimesh nga hashtag-ë që keni zgjedhur të ndiqni, persona që keni zgjedhur të ndiqni dhe postime që ata përforcojnë. Nëse kjo duket si shumë qetësi, mund të doni të:",
-  "home.explore_prompt.title": "Kjo është baza juaj brenda Mastodon-it.",
   "home.hide_announcements": "Fshihi lajmërimet",
   "home.pending_critical_update.body": "Ju lutemi, përditësoni sa më shpejt të jetë e mundur shërbyesin tuaj Mastodon!",
   "home.pending_critical_update.link": "Shihni përditësime",
diff --git a/app/javascript/mastodon/locales/sr-Latn.json b/app/javascript/mastodon/locales/sr-Latn.json
index b0348748a6762f..d9490ef70d86cc 100644
--- a/app/javascript/mastodon/locales/sr-Latn.json
+++ b/app/javascript/mastodon/locales/sr-Latn.json
@@ -146,11 +146,19 @@
   "compose_form.lock_disclaimer.lock": "zaključan",
   "compose_form.placeholder": "O čemu razmišljate?",
   "compose_form.poll.duration": "Trajanje ankete",
+  "compose_form.poll.multiple": "Višestruki izbor",
+  "compose_form.poll.option_placeholder": "Opcija {number}",
+  "compose_form.poll.single": "Odaberite jedno",
   "compose_form.poll.switch_to_multiple": "Promenite anketu da biste omogućili više izbora",
   "compose_form.poll.switch_to_single": "Promenite anketu da biste omogućili jedan izbor",
+  "compose_form.poll.type": "Stil",
+  "compose_form.publish": "Objavi",
   "compose_form.publish_form": "Objavi",
+  "compose_form.reply": "Odgovori",
+  "compose_form.save_changes": "Ažuriraj",
   "compose_form.spoiler.marked": "Ukloni upozorenje o sadržaju",
   "compose_form.spoiler.unmarked": "Dodaj upozorenje o sadržaju",
+  "compose_form.spoiler_placeholder": "Upozorenje o sadržaju (opciono)",
   "confirmation_modal.cancel": "Otkaži",
   "confirmations.block.block_and_report": "Blokiraj i prijavi",
   "confirmations.block.confirm": "Blokiraj",
@@ -269,6 +277,12 @@
   "follow_request.authorize": "Odobri",
   "follow_request.reject": "Odbij",
   "follow_requests.unlocked_explanation": "Iako vaš nalog nije zaključan, osoblje {domain} smatra da biste možda želeli da ručno pregledate zahteve za praćenje sa ovih naloga.",
+  "follow_suggestions.curated_suggestion": "Izbor urednika",
+  "follow_suggestions.dismiss": "Ne prikazuj ponovo",
+  "follow_suggestions.personalized_suggestion": "Personalizovani predlog",
+  "follow_suggestions.popular_suggestion": "Popularni predlog",
+  "follow_suggestions.view_all": "Prikaži sve",
+  "follow_suggestions.who_to_follow": "Koga pratiti",
   "followed_tags": "Praćene heš oznake",
   "footer.about": "Osnovni podaci",
   "footer.directory": "Direktorijum profila",
@@ -295,13 +309,9 @@
   "hashtag.follow": "Zaprati heš oznaku",
   "hashtag.unfollow": "Otprati heš oznaku",
   "hashtags.and_other": "…i {count, plural, one {još #} few {još #}other {još #}}",
-  "home.actions.go_to_explore": "Pogledate šta je u trendu",
-  "home.actions.go_to_suggestions": "Pronađete ljude koje biste pratili",
   "home.column_settings.basic": "Osnovna",
   "home.column_settings.show_reblogs": "Prikaži podržavanja",
   "home.column_settings.show_replies": "Prikaži odgovore",
-  "home.explore_prompt.body": "Vaša početna stranica će imati mešavinu objava od heš oznaka koje ste izabrali da pratite, ljudi koje ste izabrali da pratite i objava koje su podržali. Ako izgleda previše tiho, možda ćete želeti da:",
-  "home.explore_prompt.title": "Ovo je vaša matična baza u Mastodon-u.",
   "home.hide_announcements": "Sakrij najave",
   "home.pending_critical_update.body": "Ažurirajte svoj Mastodon server što je pre moguće!",
   "home.pending_critical_update.link": "Pogledajte ažuriranja",
@@ -514,7 +524,15 @@
   "poll_button.add_poll": "Dodaj anketu",
   "poll_button.remove_poll": "Ukloni anketu",
   "privacy.change": "Promeni privatnost objave",
+  "privacy.direct.long": "Svi pomenuti u objavi",
+  "privacy.direct.short": "Određeni ljudi",
+  "privacy.private.long": "Samo vaši pratioci",
+  "privacy.private.short": "Pratioci",
+  "privacy.public.long": "Bilo ko na Mastodon-u i van njega",
   "privacy.public.short": "Javno",
+  "privacy.unlisted.additional": "Ovo se ponaša potpuno kao javno, osim što se objava neće pojavljivati u izvorima uživo ili heš oznakama, istraživanjima ili pretrazi Mastodon-a, čak i ako ste uključeni u celom nalogu.",
+  "privacy.unlisted.long": "Manje algoritamskih fanfara",
+  "privacy.unlisted.short": "Tiha javnost",
   "privacy_policy.last_updated": "Poslednje ažuriranje {date}",
   "privacy_policy.title": "Politika privatnosti",
   "recommended": "Preporučeno",
@@ -532,7 +550,9 @@
   "relative_time.minutes": "{number} min.",
   "relative_time.seconds": "{number} sek.",
   "relative_time.today": "danas",
+  "reply_indicator.attachments": "{count, plural, one {# prilog} few {# priloga} other {# priloga}}",
   "reply_indicator.cancel": "Otkaži",
+  "reply_indicator.poll": "Anketa",
   "report.block": "Blokiraj",
   "report.block_explanation": "Nećete videti objave korisnika. Ni on neće videti Vaše objave niti će moći da Vas prati. Takođe će moći da sazna da je blokiran.",
   "report.categories.legal": "Pravni",
diff --git a/app/javascript/mastodon/locales/sr.json b/app/javascript/mastodon/locales/sr.json
index 4e4956e1a2a055..fd09f5db493ab9 100644
--- a/app/javascript/mastodon/locales/sr.json
+++ b/app/javascript/mastodon/locales/sr.json
@@ -145,11 +145,9 @@
   "compose_form.lock_disclaimer": "Ваш налог није {locked}. Свако може да Вас запрати и да види објаве намењене само Вашим пратиоцима.",
   "compose_form.lock_disclaimer.lock": "закључан",
   "compose_form.placeholder": "О чему размишљате?",
-  "compose_form.poll.add_option": "Додај опцију",
   "compose_form.poll.duration": "Трајање анкете",
   "compose_form.poll.multiple": "Вишеструки избор",
   "compose_form.poll.option_placeholder": "Опција {number}",
-  "compose_form.poll.remove_option": "Уклони ову опцију",
   "compose_form.poll.single": "Одаберите једно",
   "compose_form.poll.switch_to_multiple": "Промените анкету да бисте омогућили више избора",
   "compose_form.poll.switch_to_single": "Промените анкету да бисте омогућили један избор",
@@ -279,6 +277,12 @@
   "follow_request.authorize": "Одобри",
   "follow_request.reject": "Одбиј",
   "follow_requests.unlocked_explanation": "Иако ваш налог није закључан, особље {domain} сматра да бисте можда желели да ручно прегледате захтеве за праћење са ових налога.",
+  "follow_suggestions.curated_suggestion": "Избор уредника",
+  "follow_suggestions.dismiss": "Не приказуј поново",
+  "follow_suggestions.personalized_suggestion": "Персонализовани предлог",
+  "follow_suggestions.popular_suggestion": "Популарни предлог",
+  "follow_suggestions.view_all": "Прикажи све",
+  "follow_suggestions.who_to_follow": "Кога пратити",
   "followed_tags": "Праћене хеш ознаке",
   "footer.about": "Основни подаци",
   "footer.directory": "Директоријум профила",
@@ -305,13 +309,9 @@
   "hashtag.follow": "Запрати хеш ознаку",
   "hashtag.unfollow": "Отпрати хеш ознаку",
   "hashtags.and_other": "…и {count, plural, one {још #} few {још #}other {још #}}",
-  "home.actions.go_to_explore": "Погледате шта је у тренду",
-  "home.actions.go_to_suggestions": "Пронађете људе које бисте пратили",
   "home.column_settings.basic": "Основна",
   "home.column_settings.show_reblogs": "Прикажи подржавања",
   "home.column_settings.show_replies": "Прикажи одговоре",
-  "home.explore_prompt.body": "Ваша почетна страница ће имати мешавину објава од хеш ознака које сте изабрали да пратите, људи које сте изабрали да пратите и објава које су подржали. Ако изгледа превише тихо, можда ћете желети да:",
-  "home.explore_prompt.title": "Ово је ваша матична база у Mastodon-у.",
   "home.hide_announcements": "Сакриј најаве",
   "home.pending_critical_update.body": "Ажурирајте свој Mastodon сервер што је пре могуће!",
   "home.pending_critical_update.link": "Погледајте ажурирања",
diff --git a/app/javascript/mastodon/locales/sv.json b/app/javascript/mastodon/locales/sv.json
index d6e6555b530091..f9356fd279cc21 100644
--- a/app/javascript/mastodon/locales/sv.json
+++ b/app/javascript/mastodon/locales/sv.json
@@ -145,12 +145,13 @@
   "compose_form.lock_disclaimer": "Ditt konto är inte {locked}. Vem som helst kan följa dig för att se dina inlägg som endast är för följare.",
   "compose_form.lock_disclaimer.lock": "låst",
   "compose_form.placeholder": "Vad tänker du på?",
-  "compose_form.poll.add_option": "Lägg till alternativ",
   "compose_form.poll.duration": "Varaktighet för omröstning",
+  "compose_form.poll.multiple": "Flera val",
   "compose_form.poll.option_placeholder": "Alternativ {number}",
   "compose_form.poll.switch_to_multiple": "Ändra enkät för att tillåta flera val",
   "compose_form.poll.switch_to_single": "Ändra enkät för att tillåta ett enda val",
   "compose_form.poll.type": "Stil",
+  "compose_form.publish": "Publicera",
   "compose_form.publish_form": "Publicera",
   "compose_form.reply": "Svara",
   "compose_form.save_changes": "Uppdatera",
@@ -275,6 +276,10 @@
   "follow_request.authorize": "Godkänn",
   "follow_request.reject": "Avvisa",
   "follow_requests.unlocked_explanation": "Även om ditt konto inte är låst tror {domain} personalen att du kanske vill granska dessa följares förfrågningar manuellt.",
+  "follow_suggestions.dismiss": "Visa inte igen",
+  "follow_suggestions.personalized_suggestion": "Personligt förslag",
+  "follow_suggestions.popular_suggestion": "Populärt förslag",
+  "follow_suggestions.view_all": "Visa alla",
   "followed_tags": "Följda hashtags",
   "footer.about": "Om",
   "footer.directory": "Profilkatalog",
@@ -301,13 +306,9 @@
   "hashtag.follow": "Följ hashtagg",
   "hashtag.unfollow": "Avfölj hashtagg",
   "hashtags.and_other": "…och {count, plural, one {}other {# mer}}",
-  "home.actions.go_to_explore": "Se vad som trendar",
-  "home.actions.go_to_suggestions": "Hitta personer att följa",
   "home.column_settings.basic": "Grundläggande",
   "home.column_settings.show_reblogs": "Visa boostar",
   "home.column_settings.show_replies": "Visa svar",
-  "home.explore_prompt.body": "Din hemflöde kommer att ha en blandning av inlägg från taggar du har valt att följa, de människor som du har valt att följa och de inlägg som de boostar. Om det känns för tyst kanske du vill:",
-  "home.explore_prompt.title": "Detta är din hembas inom Mastodon.",
   "home.hide_announcements": "Dölj notiser",
   "home.pending_critical_update.body": "Uppdatera din Mastodon-server så snart som möjligt!",
   "home.pending_critical_update.link": "Se uppdateringar",
@@ -518,6 +519,7 @@
   "poll_button.add_poll": "Lägg till en omröstning",
   "poll_button.remove_poll": "Ta bort omröstning",
   "privacy.change": "Ändra inläggsintegritet",
+  "privacy.direct.long": "Alla som nämns i inlägget",
   "privacy.private.long": "Endast dina följare",
   "privacy.private.short": "Följare",
   "privacy.public.long": "Alla på och utanför Mastodon",
@@ -539,6 +541,7 @@
   "relative_time.minutes": "{number}min",
   "relative_time.seconds": "{number}sek",
   "relative_time.today": "idag",
+  "reply_indicator.attachments": "{count, plural, one {# bilaga} other {# bilagor}}",
   "reply_indicator.cancel": "Ångra",
   "reply_indicator.poll": "Omröstning",
   "report.block": "Blockera",
diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json
index 4437afa78c5c56..72ecb11ed1ca05 100644
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@@ -146,11 +146,19 @@
   "compose_form.lock_disclaimer.lock": "ล็อคอยู่",
   "compose_form.placeholder": "คุณกำลังคิดอะไรอยู่?",
   "compose_form.poll.duration": "ระยะเวลาการสำรวจความคิดเห็น",
+  "compose_form.poll.multiple": "หลายตัวเลือก",
+  "compose_form.poll.option_placeholder": "ตัวเลือก {number}",
+  "compose_form.poll.single": "เลือกอย่างใดอย่างหนึ่ง",
   "compose_form.poll.switch_to_multiple": "เปลี่ยนการสำรวจความคิดเห็นเป็นอนุญาตหลายตัวเลือก",
   "compose_form.poll.switch_to_single": "เปลี่ยนการสำรวจความคิดเห็นเป็นอนุญาตตัวเลือกเดี่ยว",
+  "compose_form.poll.type": "ลักษณะ",
+  "compose_form.publish": "โพสต์",
   "compose_form.publish_form": "โพสต์ใหม่",
+  "compose_form.reply": "ตอบกลับ",
+  "compose_form.save_changes": "อัปเดต",
   "compose_form.spoiler.marked": "เอาคำเตือนเนื้อหาออก",
   "compose_form.spoiler.unmarked": "เพิ่มคำเตือนเนื้อหา",
+  "compose_form.spoiler_placeholder": "คำเตือนเนื้อหา (ไม่จำเป็น)",
   "confirmation_modal.cancel": "ยกเลิก",
   "confirmations.block.block_and_report": "ปิดกั้นแล้วรายงาน",
   "confirmations.block.confirm": "ปิดกั้น",
@@ -269,6 +277,12 @@
   "follow_request.authorize": "อนุญาต",
   "follow_request.reject": "ปฏิเสธ",
   "follow_requests.unlocked_explanation": "แม้ว่าไม่มีการล็อคบัญชีของคุณ พนักงานของ {domain} คิดว่าคุณอาจต้องการตรวจทานคำขอติดตามจากบัญชีเหล่านี้ด้วยตนเอง",
+  "follow_suggestions.curated_suggestion": "คัดสรรโดยบรรณาธิการ",
+  "follow_suggestions.dismiss": "ไม่ต้องแสดงอีก",
+  "follow_suggestions.personalized_suggestion": "คำแนะนำเฉพาะบุคคล",
+  "follow_suggestions.popular_suggestion": "คำแนะนำยอดนิยม",
+  "follow_suggestions.view_all": "ดูทั้งหมด",
+  "follow_suggestions.who_to_follow": "ติดตามใครดี",
   "followed_tags": "แฮชแท็กที่ติดตาม",
   "footer.about": "เกี่ยวกับ",
   "footer.directory": "ไดเรกทอรีโปรไฟล์",
@@ -295,13 +309,9 @@
   "hashtag.follow": "ติดตามแฮชแท็ก",
   "hashtag.unfollow": "เลิกติดตามแฮชแท็ก",
   "hashtags.and_other": "…และอีก {count, plural, other {# เพิ่มเติม}}",
-  "home.actions.go_to_explore": "ดูสิ่งที่กำลังนิยม",
-  "home.actions.go_to_suggestions": "ค้นหาผู้คนที่จะติดตาม",
   "home.column_settings.basic": "พื้นฐาน",
   "home.column_settings.show_reblogs": "แสดงการดัน",
   "home.column_settings.show_replies": "แสดงการตอบกลับ",
-  "home.explore_prompt.body": "ฟีดหน้าแรกของคุณจะมีการผสมผสานของโพสต์จากแฮชแท็กที่คุณได้เลือกติดตาม, ผู้คนที่คุณได้เลือกติดตาม และโพสต์ที่เขาดัน หากนั่นรู้สึกเงียบเกินไป คุณอาจต้องการ:",
-  "home.explore_prompt.title": "นี่คือฐานหน้าแรกของคุณภายใน Mastodon",
   "home.hide_announcements": "ซ่อนประกาศ",
   "home.pending_critical_update.body": "โปรดอัปเดตเซิร์ฟเวอร์ Mastodon ของคุณโดยเร็วที่สุดเท่าที่จะเป็นไปได้!",
   "home.pending_critical_update.link": "ดูการอัปเดต",
@@ -514,7 +524,15 @@
   "poll_button.add_poll": "เพิ่มการสำรวจความคิดเห็น",
   "poll_button.remove_poll": "เอาการสำรวจความคิดเห็นออก",
   "privacy.change": "เปลี่ยนความเป็นส่วนตัวของโพสต์",
+  "privacy.direct.long": "ทุกคนที่กล่าวถึงในโพสต์",
+  "privacy.direct.short": "ผู้คนที่เฉพาะเจาะจง",
+  "privacy.private.long": "เฉพาะผู้ติดตามของคุณเท่านั้น",
+  "privacy.private.short": "ผู้ติดตาม",
+  "privacy.public.long": "ใครก็ตามที่อยู่ในและนอก Mastodon",
   "privacy.public.short": "สาธารณะ",
+  "privacy.unlisted.additional": "สิ่งนี้ทำงานเหมือนกับสาธารณะทุกประการ ยกเว้นโพสต์จะไม่ปรากฏในฟีดสดหรือแฮชแท็ก, การสำรวจ หรือการค้นหา Mastodon แม้ว่าคุณได้เลือกรับทั่วทั้งบัญชีก็ตาม",
+  "privacy.unlisted.long": "การประโคมอัลกอริทึมที่น้อยลง",
+  "privacy.unlisted.short": "สาธารณะแบบเงียบ",
   "privacy_policy.last_updated": "อัปเดตล่าสุดเมื่อ {date}",
   "privacy_policy.title": "นโยบายความเป็นส่วนตัว",
   "recommended": "แนะนำ",
@@ -532,7 +550,9 @@
   "relative_time.minutes": "{number} นาที",
   "relative_time.seconds": "{number} วินาที",
   "relative_time.today": "วันนี้",
+  "reply_indicator.attachments": "{count, plural, other {# ไฟล์แนบ}}",
   "reply_indicator.cancel": "ยกเลิก",
+  "reply_indicator.poll": "การสำรวจความคิดเห็น",
   "report.block": "ปิดกั้น",
   "report.block_explanation": "คุณจะไม่เห็นโพสต์ของเขา เขาจะไม่สามารถเห็นโพสต์ของคุณหรือติดตามคุณ เขาจะสามารถบอกได้ว่ามีการปิดกั้นเขา",
   "report.categories.legal": "กฎหมาย",
diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json
index 6811c158d45a18..7ab370b8bcd088 100644
--- a/app/javascript/mastodon/locales/tr.json
+++ b/app/javascript/mastodon/locales/tr.json
@@ -146,11 +146,19 @@
   "compose_form.lock_disclaimer.lock": "kilitli",
   "compose_form.placeholder": "Aklında ne var?",
   "compose_form.poll.duration": "Anket süresi",
+  "compose_form.poll.multiple": "Çoktan seçmeli",
+  "compose_form.poll.option_placeholder": "Seçenek {number}",
+  "compose_form.poll.single": "Birini seç",
   "compose_form.poll.switch_to_multiple": "Birden çok seçeneğe izin vermek için anketi değiştir",
   "compose_form.poll.switch_to_single": "Tek bir seçeneğe izin vermek için anketi değiştir",
+  "compose_form.poll.type": "Stil",
+  "compose_form.publish": "Gönder",
   "compose_form.publish_form": "Gönder",
+  "compose_form.reply": "Yanıtla",
+  "compose_form.save_changes": "Güncelle",
   "compose_form.spoiler.marked": "Metin uyarının arkasına gizlenir",
   "compose_form.spoiler.unmarked": "Metin gizli değil",
+  "compose_form.spoiler_placeholder": "İçerik uyarısı (isteğe bağlı)",
   "confirmation_modal.cancel": "İptal",
   "confirmations.block.block_and_report": "Engelle ve Bildir",
   "confirmations.block.confirm": "Engelle",
@@ -269,6 +277,12 @@
   "follow_request.authorize": "İzin Ver",
   "follow_request.reject": "Reddet",
   "follow_requests.unlocked_explanation": "Hesabınız kilitli olmasa da, {domain} personeli bu hesaplardan gelen takip isteklerini gözden geçirmek isteyebileceğinizi düşündü.",
+  "follow_suggestions.curated_suggestion": "Editörün Seçimi",
+  "follow_suggestions.dismiss": "Tekrar gösterme",
+  "follow_suggestions.personalized_suggestion": "Kişiselleşmiş öneriler",
+  "follow_suggestions.popular_suggestion": "Popüler öneriler",
+  "follow_suggestions.view_all": "Tümünü gör",
+  "follow_suggestions.who_to_follow": "Takip edebileceklerin",
   "followed_tags": "Takip edilen etiketler",
   "footer.about": "Hakkında",
   "footer.directory": "Profil dizini",
@@ -295,13 +309,9 @@
   "hashtag.follow": "Etiketi takip et",
   "hashtag.unfollow": "Etiketi takibi bırak",
   "hashtags.and_other": "…ve {count, plural, one {}other {# fazlası}}",
-  "home.actions.go_to_explore": "Öne çıkanları gör",
-  "home.actions.go_to_suggestions": "Takip edecek kişileri bulun",
   "home.column_settings.basic": "Temel",
   "home.column_settings.show_reblogs": "Yeniden paylaşımları göster",
   "home.column_settings.show_replies": "Yanıtları göster",
-  "home.explore_prompt.body": "Ana sayfa akışınızda, takip etmeyi seçtiğiniz ETİKETlerden, takip etmeyi seçtiğiniz kişilerden ve öne çıkardıkları gönderilerden oluşan bir karışım bulunur. Şu anda oldukça sessiz görünüyor, gör ve takip et :",
-  "home.explore_prompt.title": "Burası Mastodon'daki Anasayfanız.",
   "home.hide_announcements": "Duyuruları gizle",
   "home.pending_critical_update.body": "Lütfen Mastodon sunucunuzu en kısa sürede güncelleyin!",
   "home.pending_critical_update.link": "Güncellemelerini görün",
@@ -514,7 +524,15 @@
   "poll_button.add_poll": "Bir anket ekleyin",
   "poll_button.remove_poll": "Anketi kaldır",
   "privacy.change": "Gönderi gizliliğini değiştir",
+  "privacy.direct.long": "Gönderide değinilen herkes",
+  "privacy.direct.short": "Belirli kişiler",
+  "privacy.private.long": "Sadece takipçileriniz",
+  "privacy.private.short": "Takipçiler",
+  "privacy.public.long": "Mastodon'da olan olmayan herkes",
   "privacy.public.short": "Herkese açık",
+  "privacy.unlisted.additional": "Bu neredeyse herkese açık gibi çalışır, tek farkı gönderi canlı akışlarda veya etiketlerde, keşfette, veya Mastodon aramasında gözükmez, hesap çapında öyle seçmiş olsanız bile.",
+  "privacy.unlisted.long": "Daha az algoritmik tantana",
+  "privacy.unlisted.short": "Sessizce herkese açık",
   "privacy_policy.last_updated": "Son güncelleme {date}",
   "privacy_policy.title": "Gizlilik Politikası",
   "recommended": "Önerilen",
@@ -532,7 +550,9 @@
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}sn",
   "relative_time.today": "bugün",
+  "reply_indicator.attachments": "{count, plural, one {# ek} other {# ek}}",
   "reply_indicator.cancel": "İptal",
+  "reply_indicator.poll": "Anket",
   "report.block": "Engelle",
   "report.block_explanation": "Gönderilerini göremeyeceksiniz. Gönderilerinizi göremezler veya sizi takip edemezler. Engelli olduklarını anlayabilecekler.",
   "report.categories.legal": "Yasal",
diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json
index 38e5f9cfbdfa59..0504ec60d87d25 100644
--- a/app/javascript/mastodon/locales/uk.json
+++ b/app/javascript/mastodon/locales/uk.json
@@ -145,13 +145,20 @@
   "compose_form.lock_disclaimer": "Ваш обліковий запис не {locked}. Будь-який користувач може підписатися на вас та переглядати ваші дописи для підписників.",
   "compose_form.lock_disclaimer.lock": "приватний",
   "compose_form.placeholder": "Що у вас на думці?",
-  "compose_form.poll.add_option": "Додати опцію",
   "compose_form.poll.duration": "Тривалість опитування",
+  "compose_form.poll.multiple": "Кілька варіантів",
+  "compose_form.poll.option_placeholder": "Варіант {number}",
+  "compose_form.poll.single": "Виберіть варіант",
   "compose_form.poll.switch_to_multiple": "Дозволити вибір декількох відповідей",
   "compose_form.poll.switch_to_single": "Перемкнути у режим вибору однієї відповіді",
+  "compose_form.poll.type": "Стиль",
+  "compose_form.publish": "Опублікувати",
   "compose_form.publish_form": "Новий допис",
+  "compose_form.reply": "Відповісти",
+  "compose_form.save_changes": "Оновити",
   "compose_form.spoiler.marked": "Прибрати попередження про вміст",
   "compose_form.spoiler.unmarked": "Додати попередження про вміст",
+  "compose_form.spoiler_placeholder": "Попередження про вміст (необов'язково)",
   "confirmation_modal.cancel": "Скасувати",
   "confirmations.block.block_and_report": "Заблокувати та поскаржитися",
   "confirmations.block.confirm": "Заблокувати",
@@ -270,6 +277,12 @@
   "follow_request.authorize": "Авторизувати",
   "follow_request.reject": "Відмовити",
   "follow_requests.unlocked_explanation": "Хоча ваш обліковий запис не заблоковано, персонал {domain} припускає, що, можливо, ви хотіли б переглянути ці запити на підписку.",
+  "follow_suggestions.curated_suggestion": "Вибір редакції",
+  "follow_suggestions.dismiss": "Більше не показувати",
+  "follow_suggestions.personalized_suggestion": "Персоналізована пропозиція",
+  "follow_suggestions.popular_suggestion": "Популярна пропозиція",
+  "follow_suggestions.view_all": "Переглянути все",
+  "follow_suggestions.who_to_follow": "На кого підписатися",
   "followed_tags": "Відстежувані хештеґи",
   "footer.about": "Про проєкт",
   "footer.directory": "Каталог профілів",
@@ -296,13 +309,9 @@
   "hashtag.follow": "Стежити за хештегом",
   "hashtag.unfollow": "Не стежити за хештегом",
   "hashtags.and_other": "…і {count, plural, other {ще #}}",
-  "home.actions.go_to_explore": "Переглянути тенденції",
-  "home.actions.go_to_suggestions": "Знайти людей, аби підписатися",
   "home.column_settings.basic": "Основні",
   "home.column_settings.show_reblogs": "Показувати поширення",
   "home.column_settings.show_replies": "Показувати відповіді",
-  "home.explore_prompt.body": "Ваша домашня стрічка буде сумішшю дописів з обраних для стеження хештегів, людей і поширених ними дописів. Якщо цього замало, ви також можете:",
-  "home.explore_prompt.title": "Це ваша домашня база у Mastodon.",
   "home.hide_announcements": "Приховати оголошення",
   "home.pending_critical_update.body": "Якнайшвидше оновіть свій сервер Mastodon!",
   "home.pending_critical_update.link": "Переглянути оновлення",
@@ -515,7 +524,15 @@
   "poll_button.add_poll": "Додати опитування",
   "poll_button.remove_poll": "Видалити опитування",
   "privacy.change": "Змінити видимість допису",
+  "privacy.direct.long": "Усі згадані в дописі",
+  "privacy.direct.short": "Певні люди",
+  "privacy.private.long": "Лише ваші підписники",
+  "privacy.private.short": "Підписники",
+  "privacy.public.long": "Усі з Mastodon",
   "privacy.public.short": "Публічно",
+  "privacy.unlisted.additional": "Має таку ж поведінку, як у людей, але повідомлення не з'являтимуться у стрічках або хештегах, оглядах, або пошуку Mastodon, навіть якщо ви використовуєте облікові записи.",
+  "privacy.unlisted.long": "Менше взаємодій з алгоритмами",
+  "privacy.unlisted.short": "Без додавання до стрічки",
   "privacy_policy.last_updated": "Оновлено {date}",
   "privacy_policy.title": "Політика приватності",
   "recommended": "Рекомендовано",
@@ -533,7 +550,9 @@
   "relative_time.minutes": "{number}х",
   "relative_time.seconds": "{number}с",
   "relative_time.today": "сьогодні",
+  "reply_indicator.attachments": "{count, plural, one {# вкладення} few {# вкладення} many {# вкладень} other {# вкладення}}",
   "reply_indicator.cancel": "Скасувати",
+  "reply_indicator.poll": "Опитування",
   "report.block": "Заблокувати",
   "report.block_explanation": "Ви не будете бачити дописи цього користувача, а вони не зможуть бачити ваші дописи або підписуватися на вас. Вони будуть бачити, що ви їх заблокували.",
   "report.categories.legal": "Правові положення",
diff --git a/app/javascript/mastodon/locales/vi.json b/app/javascript/mastodon/locales/vi.json
index 73a11b9573673d..626f40783c3be0 100644
--- a/app/javascript/mastodon/locales/vi.json
+++ b/app/javascript/mastodon/locales/vi.json
@@ -146,11 +146,19 @@
   "compose_form.lock_disclaimer.lock": "khóa",
   "compose_form.placeholder": "Bạn đang nghĩ gì?",
   "compose_form.poll.duration": "Hết hạn vào",
+  "compose_form.poll.multiple": "Nhiều lựa chọn",
+  "compose_form.poll.option_placeholder": "Lựa chọn {number}",
+  "compose_form.poll.single": "Chọn một",
   "compose_form.poll.switch_to_multiple": "Có thể chọn nhiều lựa chọn",
   "compose_form.poll.switch_to_single": "Chỉ cho phép chọn duy nhất một lựa chọn",
+  "compose_form.poll.type": "Loại",
+  "compose_form.publish": "Đăng",
   "compose_form.publish_form": "Đăng",
+  "compose_form.reply": "Trả lời",
+  "compose_form.save_changes": "Cập nhật",
   "compose_form.spoiler.marked": "Hủy nội dung ẩn",
   "compose_form.spoiler.unmarked": "Tạo nội dung ẩn",
+  "compose_form.spoiler_placeholder": "Nội dung ẩn (tùy chọn)",
   "confirmation_modal.cancel": "Hủy bỏ",
   "confirmations.block.block_and_report": "Chặn & Báo cáo",
   "confirmations.block.confirm": "Chặn",
@@ -269,6 +277,12 @@
   "follow_request.authorize": "Cho phép",
   "follow_request.reject": "Từ chối",
   "follow_requests.unlocked_explanation": "Mặc dù tài khoản của bạn đang ở chế độ công khai, quản trị viên của {domain} vẫn tin rằng bạn sẽ muốn xem lại yêu cầu theo dõi từ những người khác.",
+  "follow_suggestions.curated_suggestion": "Lựa chọn của máy chủ",
+  "follow_suggestions.dismiss": "Không hiện lại",
+  "follow_suggestions.personalized_suggestion": "Gợi ý cá nhân hóa",
+  "follow_suggestions.popular_suggestion": "Những người nổi tiếng",
+  "follow_suggestions.view_all": "Xem tất cả",
+  "follow_suggestions.who_to_follow": "Gợi ý theo dõi",
   "followed_tags": "Hashtag theo dõi",
   "footer.about": "Giới thiệu",
   "footer.directory": "Cộng đồng",
@@ -295,13 +309,9 @@
   "hashtag.follow": "Theo dõi hashtag",
   "hashtag.unfollow": "Bỏ theo dõi hashtag",
   "hashtags.and_other": "…và {count, plural, other {# nữa}}",
-  "home.actions.go_to_explore": "Khám phá xu hướng",
-  "home.actions.go_to_suggestions": "Tìm người theo dõi",
   "home.column_settings.basic": "Tùy chỉnh",
   "home.column_settings.show_reblogs": "Hiện những lượt đăng lại",
   "home.column_settings.show_replies": "Hiện những tút dạng trả lời",
-  "home.explore_prompt.body": "Bảng tin của bạn sẽ bao gồm các tút có hashtag bạn theo dõi, những người bạn theo dõi và các tút mà họ đăng lại. Lúc này có vẻ hơi trống, sao bạn không:",
-  "home.explore_prompt.title": "Đây là ngôi nhà Mastodon của bạn.",
   "home.hide_announcements": "Ẩn thông báo máy chủ",
   "home.pending_critical_update.body": "Vui lòng cập nhật máy chủ Mastodon của bạn càng sớm càng tốt!",
   "home.pending_critical_update.link": "Xem bản cập nhật",
@@ -514,7 +524,15 @@
   "poll_button.add_poll": "Tạo bình chọn",
   "poll_button.remove_poll": "Hủy cuộc bình chọn",
   "privacy.change": "Chọn kiểu tút",
+  "privacy.direct.long": "Những người được nhắc trong tút",
+  "privacy.direct.short": "Người cụ thể",
+  "privacy.private.long": "Chỉ người theo dõi",
+  "privacy.private.short": "Người theo dõi",
+  "privacy.public.long": "Bất cứ ai",
   "privacy.public.short": "Công khai",
+  "privacy.unlisted.additional": "Giống hệt như công khai, ngoại trừ tút sẽ không xuất hiện trong bảng tin hoặc hashtag, khám phá hoặc tìm kiếm Mastodon, ngay cả khi bạn chọn cho phép trong cài đặt tài khoản.",
+  "privacy.unlisted.long": "Ít hướng thuật toán hơn",
+  "privacy.unlisted.short": "Hạn chế",
   "privacy_policy.last_updated": "Cập nhật lần cuối {date}",
   "privacy_policy.title": "Chính sách bảo mật",
   "recommended": "Đề xuất",
@@ -532,7 +550,9 @@
   "relative_time.minutes": "{number} phút",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "hôm nay",
+  "reply_indicator.attachments": "{count, plural, other {# tập tin đính kèm}}",
   "reply_indicator.cancel": "Hủy bỏ",
+  "reply_indicator.poll": "Bình chọn",
   "report.block": "Chặn",
   "report.block_explanation": "Bạn sẽ không còn thấy tút của người này. Họ sẽ không thể thấy tút của bạn hoặc theo dõi bạn. Họ biết là bạn đã chặn họ.",
   "report.categories.legal": "Phạm pháp",
diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json
index 9b55e51b1f9b6f..9d0da95c819046 100644
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@@ -145,11 +145,9 @@
   "compose_form.lock_disclaimer": "你的账户没有{locked}。任何人都可以在关注你后立即查看仅关注者可见的嘟文。",
   "compose_form.lock_disclaimer.lock": "开启保护",
   "compose_form.placeholder": "想写什么？",
-  "compose_form.poll.add_option": "添加选项",
   "compose_form.poll.duration": "投票期限",
   "compose_form.poll.multiple": "多选",
   "compose_form.poll.option_placeholder": "选项 {number}",
-  "compose_form.poll.remove_option": "删除此选项",
   "compose_form.poll.single": "单选",
   "compose_form.poll.switch_to_multiple": "将投票改为多选",
   "compose_form.poll.switch_to_single": "将投票改为单选",
@@ -279,6 +277,12 @@
   "follow_request.authorize": "同意",
   "follow_request.reject": "拒绝",
   "follow_requests.unlocked_explanation": "尽管你没有锁嘟，但是 {domain} 的工作人员认为你也许会想手动审核审核这些账号的关注请求。",
+  "follow_suggestions.curated_suggestion": "主编推荐",
+  "follow_suggestions.dismiss": "不再显示",
+  "follow_suggestions.personalized_suggestion": "个性化建议",
+  "follow_suggestions.popular_suggestion": "热门建议",
+  "follow_suggestions.view_all": "查看全部",
+  "follow_suggestions.who_to_follow": "推荐关注",
   "followed_tags": "关注的话题标签",
   "footer.about": "关于",
   "footer.directory": "用户目录",
@@ -305,13 +309,9 @@
   "hashtag.follow": "关注话题标签",
   "hashtag.unfollow": "取消关注话题标签",
   "hashtags.and_other": "… 和另外 {count, plural, other {# 个话题}}",
-  "home.actions.go_to_explore": "查看热门话题",
-  "home.actions.go_to_suggestions": "寻找要关注的人",
   "home.column_settings.basic": "基本设置",
   "home.column_settings.show_reblogs": "显示转嘟",
   "home.column_settings.show_replies": "显示回复",
-  "home.explore_prompt.body": "你的主页动态会推送一系列关注的话题标签和用户，以及转发的嘟文。如果你觉得过于清净，不妨试一下：",
-  "home.explore_prompt.title": "这是你在 Mastodon 的主页。",
   "home.hide_announcements": "隐藏公告",
   "home.pending_critical_update.body": "请尽快更新您的 Mastodon 服务器！",
   "home.pending_critical_update.link": "查看更新",
diff --git a/app/javascript/mastodon/locales/zh-HK.json b/app/javascript/mastodon/locales/zh-HK.json
index 5890c4df4b5120..c1a69591ff7314 100644
--- a/app/javascript/mastodon/locales/zh-HK.json
+++ b/app/javascript/mastodon/locales/zh-HK.json
@@ -145,11 +145,9 @@
   "compose_form.lock_disclaimer": "你的用戶狀態沒有{locked}，任何人都能立即關注你，然後看到「只有關注者能看」的文章。",
   "compose_form.lock_disclaimer.lock": "鎖定",
   "compose_form.placeholder": "你在想甚麼？",
-  "compose_form.poll.add_option": "新增選項",
   "compose_form.poll.duration": "投票期限",
   "compose_form.poll.multiple": "多選",
   "compose_form.poll.option_placeholder": "選項 {number}",
-  "compose_form.poll.remove_option": "移除此選項",
   "compose_form.poll.single": "選擇一個",
   "compose_form.poll.switch_to_multiple": "變更投票為允許多個選項",
   "compose_form.poll.switch_to_single": "變更投票為限定單一選項",
@@ -279,6 +277,12 @@
   "follow_request.authorize": "批准",
   "follow_request.reject": "拒絕",
   "follow_requests.unlocked_explanation": "即使您的帳號未上鎖，{domain} 的工作人員認為您可能會想手動審核來自這些帳號的追蹤請求。",
+  "follow_suggestions.curated_suggestion": "編輯推薦",
+  "follow_suggestions.dismiss": "不再顯示",
+  "follow_suggestions.personalized_suggestion": "個人化推薦",
+  "follow_suggestions.popular_suggestion": "熱門推薦",
+  "follow_suggestions.view_all": "查看所有",
+  "follow_suggestions.who_to_follow": "追蹤對象",
   "followed_tags": "已追蹤標籤",
   "footer.about": "關於",
   "footer.directory": "個人檔案目錄",
@@ -305,13 +309,9 @@
   "hashtag.follow": "追蹤主題標籤",
   "hashtag.unfollow": "取消追蹤主題標籤",
   "hashtags.and_other": "…及{count, plural, other {其他 # 個}}",
-  "home.actions.go_to_explore": "即時熱門話題",
-  "home.actions.go_to_suggestions": "尋找追蹤對象",
   "home.column_settings.basic": "基本",
   "home.column_settings.show_reblogs": "顯示被轉推的文章",
   "home.column_settings.show_replies": "顯示回應文章",
-  "home.explore_prompt.body": "你的首頁時間軸將顯示來自你追蹤的標籤、使用者及他們轉推的帖文。如果時間軸感覺太安靜，你可以考慮：",
-  "home.explore_prompt.title": "這是你在 Mastodon 中的主頁。",
   "home.hide_announcements": "隱藏公告",
   "home.pending_critical_update.body": "請盡快更新你的 Mastodon 伺服器！",
   "home.pending_critical_update.link": "查看更新",
diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json
index c365e67e070d6d..d83b523d1eba53 100644
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@@ -145,11 +145,9 @@
   "compose_form.lock_disclaimer": "您的帳號尚未 {locked}。任何人皆能跟隨您並看到您設定成只對跟隨者顯示的嘟文。",
   "compose_form.lock_disclaimer.lock": "上鎖",
   "compose_form.placeholder": "正在想些什麼嗎？",
-  "compose_form.poll.add_option": "新增選項",
   "compose_form.poll.duration": "投票期限",
   "compose_form.poll.multiple": "多選",
   "compose_form.poll.option_placeholder": "選項 {number}",
-  "compose_form.poll.remove_option": "移除此選項",
   "compose_form.poll.single": "選擇一個",
   "compose_form.poll.switch_to_multiple": "變更投票為允許多個選項",
   "compose_form.poll.switch_to_single": "變更投票為允許單一選項",
@@ -279,6 +277,12 @@
   "follow_request.authorize": "授權",
   "follow_request.reject": "拒絕",
   "follow_requests.unlocked_explanation": "即便您的帳號未被鎖定，{domain} 的管理員認為您可能想要自己審核這些帳號的跟隨請求。",
+  "follow_suggestions.curated_suggestion": "精選內容",
+  "follow_suggestions.dismiss": "不再顯示",
+  "follow_suggestions.personalized_suggestion": "個人化推薦",
+  "follow_suggestions.popular_suggestion": "熱門推薦",
+  "follow_suggestions.view_all": "檢視全部",
+  "follow_suggestions.who_to_follow": "推薦跟隨帳號",
   "followed_tags": "已跟隨主題標籤",
   "footer.about": "關於",
   "footer.directory": "個人檔案目錄",
@@ -305,13 +309,9 @@
   "hashtag.follow": "跟隨主題標籤",
   "hashtag.unfollow": "取消跟隨主題標籤",
   "hashtags.and_other": "…及其他 {count, plural, other {# 個}}",
-  "home.actions.go_to_explore": "看看發生什麼新鮮事",
-  "home.actions.go_to_suggestions": "尋找一些人來跟隨",
   "home.column_settings.basic": "基本設定",
   "home.column_settings.show_reblogs": "顯示轉嘟",
   "home.column_settings.show_replies": "顯示回覆",
-  "home.explore_prompt.body": "您的首頁時間軸將由您所跟隨之主題標籤、帳號以及其轉嘟所組成。若目前流速有點慢，您可以考慮以下幾點：",
-  "home.explore_prompt.title": "這是您於 Mastodon 的基地",
   "home.hide_announcements": "隱藏公告",
   "home.pending_critical_update.body": "請立即升級您的 Mastodon 伺服器！",
   "home.pending_critical_update.link": "檢視更新內容",
diff --git a/config/locales/activerecord.eu.yml b/config/locales/activerecord.eu.yml
index 818dab939c92e3..a67c1403c5b1d0 100644
--- a/config/locales/activerecord.eu.yml
+++ b/config/locales/activerecord.eu.yml
@@ -19,7 +19,7 @@ eu:
         account:
           attributes:
             username:
-              invalid: letrak, zenbakiak eta gidoi baxuak besterik ez
+              invalid: letrak, zenbakiak eta azpimarrak soilik izan behar ditu
               reserved: erreserbatuta dago
         admin/webhook:
           attributes:
diff --git a/config/locales/activerecord.fi.yml b/config/locales/activerecord.fi.yml
index 93f338b5d5daef..feb4fbf4c58342 100644
--- a/config/locales/activerecord.fi.yml
+++ b/config/locales/activerecord.fi.yml
@@ -4,7 +4,7 @@ fi:
     attributes:
       poll:
         expires_at: Määräaika
-        options: Valinnat
+        options: Vaihtoehdot
       user:
         agreement: Palvelusopimus
         email: Sähköpostiosoite
@@ -36,7 +36,7 @@ fi:
         status:
           attributes:
             reblog:
-              taken: tila on jo olemassa
+              taken: tästä julkaisusta on jo tehty
         user:
           attributes:
             email:
@@ -47,7 +47,7 @@ fi:
         user_role:
           attributes:
             permissions_as_keys:
-              dangerous: sisältää oikeudet, jotka eivät ole turvallisia perusroolille
+              dangerous: sisältää oikeuksia, jotka eivät ole turvallisia perusroolille
               elevated: ei voi sisältää oikeuksia, joita nykyisellä roolillasi ei ole
               own_role: ei voi muuttaa nykyisellä roolillasi
             position:
diff --git a/config/locales/activerecord.lad.yml b/config/locales/activerecord.lad.yml
index 71a63d1cd198d4..31e0223ccac764 100644
--- a/config/locales/activerecord.lad.yml
+++ b/config/locales/activerecord.lad.yml
@@ -11,7 +11,7 @@ lad:
         locale: Lingua
         password: Kod
       user/account:
-        username: Nombre de uzador
+        username: Nombre de utilizador
       user/invite_request:
         text: Razon
     errors:
diff --git a/config/locales/af.yml b/config/locales/af.yml
index 74d3495914be55..62c52fa493b943 100644
--- a/config/locales/af.yml
+++ b/config/locales/af.yml
@@ -2,7 +2,7 @@
 af:
   about:
     contact_missing: Nie ingestel nie
-    contact_unavailable: NVT
+    contact_unavailable: n.v.t
     hosted_on: Mastodon gehuisves op %{domain}
     title: Aangaande
   accounts:
@@ -23,13 +23,18 @@ af:
     account_moderation_notes:
       create: Los nota
     accounts:
+      email: E-pos
+      ip: IP
       location:
         local: Plaaslik
       moderation:
         silenced: Beperk
+      reset_password: Herstel wagwoord
       search: Soek
       silenced: Beperk
     action_logs:
+      action_types:
+        reset_password_user: Herstel Wagwoord
       actions:
         silence_account_html: "%{name} het %{target} se rekening beperk"
       deleted_account: geskrapte rekening
@@ -97,6 +102,7 @@ af:
   auth:
     apply_for_account: Doen aansoek om ’n rekening
     logout: Teken uit
+    reset_password: Herstel wagwoord
   datetime:
     distance_in_words:
       about_x_hours: "%{count} uur"
@@ -121,6 +127,8 @@ af:
     invalid: Hierdie uitnodiging is nie geldig nie
     title: Nooi ander
   login_activities:
+    authentication_methods:
+      password: wagwoord
     description_html: Indien jy onbekende aktiwiteite gewaar, oorweeg dit om jou wagwoord te verander en tweefaktorverifikasie te aktiveer.
   navigation:
     toggle_menu: Wisselkieslys
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index e6d653c67419c7..0927fba0af0c44 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -42,7 +42,7 @@ ar:
       add_email_domain_block: حظر نطاق البريد الإلكتروني هذا
       approve: صادِق عليه
       approved_msg: تمت الموافقة على تسجيل %{username}
-      are_you_sure: متأكد ؟
+      are_you_sure: هل أنت متأكد؟
       avatar: الصورة الرمزية
       by_domain: النطاق
       change_email:
@@ -55,17 +55,17 @@ ar:
       change_role:
         changed_msg: تم تغيير بنجاح!
         label: تغيير الدور
-        no_role: لا رتب
-        title: تم تغيير الرتب ل %{username}
+        no_role: بلا دور
+        title: تغيير دور %{username}
       confirm: تأكيد
       confirmed: مؤكَّد
       confirming: التأكد
       custom: مخصص
       delete: حذف البيانات
-      deleted: تمت إزالته
-      demote: إنزال الرُتبة الوظيفية
+      deleted: محذوف
+      demote: إنزال الدور الوظيفي
       destroyed_msg: بيانات حساب %{username} الآن في قائمة الانتظار ليتم حذفها قريباً
-      disable: تعطيل
+      disable: تجميد
       disable_sign_in_token_auth: تعطيل مصادقة رمز البريد الإلكتروني
       disable_two_factor_authentication: تعطيل المصادقة بخطوتين
       disabled: معطَّل
@@ -91,7 +91,7 @@ ar:
         local: المحلي
         remote: عن بُعد
         title: الموقع
-      login_status: وضع الدخول
+      login_status: حالة الولوج
       media_attachments: الوسائط المرفقة
       memorialize: تحويل الحساب إلى صفحة ذكرى
       memorialized: تذكاري
@@ -203,10 +203,10 @@ ar:
         destroy_canonical_email_block: حذف نطاق للبريد
         destroy_custom_emoji: احذف الإيموجي المخصص
         destroy_domain_allow: حذف النطاق المسموح به
-        destroy_domain_block: حذف كتلة النطاق
-        destroy_email_domain_block: حذف نطاق بريد إلكتروني
+        destroy_domain_block: إزالة حظر النطاق
+        destroy_email_domain_block: حذف حظر نطاق بريد إلكتروني
         destroy_instance: تنظيف النطاق
-        destroy_ip_block: حذف قانون IP
+        destroy_ip_block: حذف قاعدة IP
         destroy_status: حذف المنشور
         destroy_unavailable_domain: حذف نطاق غير متوفر
         destroy_user_role: حذف الدور
@@ -225,7 +225,7 @@ ar:
         reopen_report: إعادة فتح التقرير
         resend_user: إعادة إرسال بريد التأكيد
         reset_password_user: إعادة تعيين كلمة المرور
-        resolve_report: حل الشكوى
+        resolve_report: معالجة الشكوى
         sensitive_account: وضع علامة على الوسائط في حسابك على أنها حساسة
         silence_account: كتم الحساب
         suspend_account: تعليق الحساب
@@ -236,14 +236,14 @@ ar:
         unsuspend_account: إلغاء تعليق الحساب
         update_announcement: تحديث الإعلان
         update_custom_emoji: تحديث الإيموجي المخصص
-        update_domain_block: تحديث كتلة النطاق
+        update_domain_block: تحديث حظر النطاق
         update_ip_block: تحديث قاعدة IP
         update_status: تحديث المنشور
         update_user_role: تحديث الدور
       actions:
-        approve_appeal_html: وافق %{name} على استئناف قرار الاعتدال من %{target}
-        approve_user_html: قبل %{name} تسجيل %{target}
-        assigned_to_self_report_html: قام %{name} بتعيين التقرير %{target} لأنفسهم
+        approve_appeal_html: وافق %{name} على استئناف الطعن بشأن قرار الإشراف من %{target}
+        approve_user_html: وافق %{name} على تسجيل %{target}
+        assigned_to_self_report_html: قام %{name} بإسناد التقرير %{target} لأنفسهم
         change_email_user_html: غيّر %{name} عنوان البريد الإلكتروني للمستخدم %{target}
         change_role_user_html: قام %{name} بإنشاء قاعدة للـIP %{target}
         confirm_user_html: "%{name} قد قام بتأكيد عنوان البريد الإلكتروني لـ %{target}"
@@ -284,7 +284,7 @@ ar:
         reopen_report_html: قام %{name} بإعادة فتح الشكوى %{target}
         resend_user_html: "%{name} إعادة إرسال البريد الإلكتروني للتأكيد لـ %{target}"
         reset_password_user_html: قام %{name} بإعادة تعيين كلمة مرور المستخدم %{target}
-        resolve_report_html: قام %{name} بحل الشكوى %{target}
+        resolve_report_html: قام %{name} بمعالجة الشكوى %{target}
         sensitive_account_html: قام %{name} بوضع علامة حساس على محتوى %{target}
         silence_account_html: قام %{name} بكتم حساب %{target}
         suspend_account_html: قام %{name} بتعليق حساب %{target}
@@ -299,7 +299,7 @@ ar:
         update_ip_block_html: قام %{name} بإنشاء قاعدة للـIP %{target}
         update_status_html: قام %{name} بتحديث منشور من %{target}
         update_user_role_html: "%{name} تغيير رتبه %{target}"
-      deleted_account: احذف الحساب
+      deleted_account: حذف الحساب
       empty: لم يتم العثور على سجلات.
       filter_by_action: تصفية بحسب الإجراء
       filter_by_user: تصفية حسب المستخدم
@@ -309,14 +309,14 @@ ar:
       edit:
         title: تعديل الإعلان
       empty: لم يتم العثور على أية إعلانات.
-      live: على المباشر
+      live: حي
       new:
         create: إنشاء إعلان
         title: إعلان جديد
       publish: نشر
       published_msg: تم نشر الإعلان بنجاح!
       scheduled_for: بُرمِج على %{time}
-      scheduled_msg: تمت جدولة نشر الإعلان!
+      scheduled_msg: تمت برمجة نشر الإعلان!
       title: الإعلانات
       unpublish: إلغاء النشر
       unpublished_msg: تم إلغاء نشر الإعلان بنجاح!
@@ -390,8 +390,8 @@ ar:
         other: "<strong>%{count}</strong> مستخدماً قيدَ الانتظار"
         two: "<strong>%{count}</strong> مستخدمان قيدَ الانتظار"
         zero: "<strong>%{count}</strong> مستخدمٍ قيدَ الانتظار"
-      resolved_reports: تقارير تم حلها
-      software: البرنامج
+      resolved_reports: تقارير تم معالجتها
+      software: البرمجيات
       sources: مصادر التسجيل
       space: المساحة المستخدَمة
       title: لوح المراقبة
@@ -453,6 +453,7 @@ ar:
       view: عرض كتلة النطاق
     email_domain_blocks:
       add_new: إضافة
+      allow_registrations_with_approval: السماح بالتسجيلات وإنشاء الحسابات بعد الموافقة
       attempts_over_week:
         few: "%{count} محاولات تسجيل في آخر أسبوع"
         many: "%{count} محاولات تسجيل في آخر أسبوع"
@@ -645,8 +646,8 @@ ar:
       actions_description_remote_html: حدّد الإجراءات التي يتعين اتخاذها لحل هذا التقرير. هذا سيؤثر فقط على كيفية اتصال <strong>خادمك</strong> بهذا الحساب البعيد والتعامل مع محتوياته.
       add_to_report: أضف المزيد إلى التقرير
       are_you_sure: هل أنت متأكد ؟
-      assign_to_self: عين لي
-      assigned: تعين رئيس
+      assign_to_self: اسنده لي
+      assigned: المشرف المُسنَد
       by_target_domain: نطاق الحساب المبلّغ عنه
       cancel: إلغاء
       category: الفئة
@@ -659,14 +660,15 @@ ar:
       created_at: ذكرت
       delete_and_resolve: احذف المنشورات
       forwarded: أُعيد توجيهه
+      forwarded_replies_explanation: هذا التقرير من مستخدم عن بُعد وحول محتوى عن بُعد. تم تحويله إليك لأن المحتوى المُبلَغ عنه هو ردّ على أحد مستخدميك.
       forwarded_to: أُعيد توجيهه إلى %{domain}
-      mark_as_resolved: اعتبار الشكوى كمحلولة
+      mark_as_resolved: اعتبار الشكوى كمعالَجة
       mark_as_sensitive: تعيينه كمنشور حساس
-      mark_as_unresolved: علم كغير محلولة
+      mark_as_unresolved: وضع علامة لم يتم معالجتها
       no_one_assigned: لا أحد
       notes:
         create: اضف ملاحظة
-        create_and_resolve: الحل مع ملاحظة
+        create_and_resolve: معالجة مرفوقة بملاحظة
         create_and_unresolve: إعادة فتح مع ملاحظة
         delete: حذف
         placeholder: قم بوصف الإجراءات التي تم اتخاذها أو أي تحديثات أخرى ذات علاقة...
@@ -680,7 +682,7 @@ ar:
       reported_account: حساب مُبلّغ عنه
       reported_by: أبلغ عنه من طرف
       resolved: معالجة
-      resolved_msg: تم حل تقرير بنجاح!
+      resolved_msg: تمت معالجة الشكوى بنجاح!
       skip_to_actions: تخطي إلى الإجراءات
       status: الحالة
       statuses: المحتوى المبلغ عنه
@@ -1116,6 +1118,9 @@ ar:
       clicking_this_link: اضغط على هذا الرابط
       login_link: تسجيل الدخول
       proceed_to_login_html: يمكنكَ الآن الاستمرار إلى %{login_link}.
+      redirect_to_app_html: كان من المفترض إعادة توجيهك إلى تطبيق <strong>%{app_name}</strong>. إن لم يحدث ذلك، حاول %{clicking_this_link} أو العودة يدويًا إلى التطبيق.
+      registration_complete: اكتمل تسجيل حسابك على %{domain} الآن!
+      welcome_title: أهلاً بك، %{name}!
       wrong_email_hint: إذا كان عنوان البريد الإلكتروني هذا غير صحيح، يمكنك تغييره في إعدادات الحساب.
     delete_account: احذف الحساب
     delete_account_html: إن كنت ترغب في حذف حسابك يُمكنك <a href="%{path}">المواصلة هنا</a>. سوف يُطلَبُ منك التأكيد قبل الحذف.
@@ -1177,6 +1182,7 @@ ar:
       functional: حسابك يعمل بشكل كامل.
       pending: إن طلبك قيد المراجعة من قبل فريقنا. قد يستغرق هذا بعض الوقت. سوف تتلقى بريدا إلكترونيا إذا تمت الموافقة على طلبك.
       redirecting_to: حسابك غير نشط لأنه تم تحويله حاليا إلى %{acct}.
+      self_destruct: نظرًا لإغلاق %{domain}، ستحصل فقط على وصول محدود إلى حسابك.
       view_strikes: عرض العقوبات السابقة المُطَبَّقة ضد حسابك
     too_fast: تم إرسال النموذج بسرعة كبيرة، حاول مرة أخرى.
     use_security_key: استخدام مفتاح الأمان
@@ -1354,6 +1360,20 @@ ar:
         title: الرسائل المصفّاة
   generic:
     all: الكل
+    all_items_on_page_selected_html:
+      few: تم تحديد كافة العناصر التي يبلغ عددها <strong>%{count}</strong> في هذه الصفحة.
+      many: تم تحديد كافة العناصر التي يبلغ عددها <strong>%{count}</strong> في هذه الصفحة.
+      one: تم تحديد كافة العناصر التي يبلغ عددها <strong>%{count}</strong> في هذه الصفحة.
+      other: تم تحديد كافة العناصر التي يبلغ عددها <strong>%{count}</strong> في هذه الصفحة.
+      two: تم تحديد كافة العناصر التي يبلغ عددها <strong>%{count}</strong> في هذه الصفحة.
+      zero: تم تحديد كافة العناصر التي يبلغ عددها <strong>%{count}</strong> في هذه الصفحة.
+    all_matching_items_selected_html:
+      few: تم تحديد كافة العناصر التي تشمل عددها <strong>%{count}</strong> في هذه الصفحة.
+      many: تم تحديد كافة العناصر التي تشمل عددها <strong>%{count}</strong> في هذه الصفحة.
+      one: تم تحديد كافة العناصر التي تشمل عددها <strong>%{count}</strong> في هذه الصفحة.
+      other: تم تحديد كافة العناصر التي تشمل عددها <strong>%{count}</strong> في هذه الصفحة.
+      two: تم تحديد كافة العناصر التي تشمل عددها <strong>%{count}</strong> في هذه الصفحة.
+      zero: تم تحديد كافة العناصر التي تشمل عددها <strong>%{count}</strong> في هذه الصفحة.
     cancel: إلغاء
     changes_saved_msg: تم حفظ التعديلات بنجاح!
     confirm: تأكيد
@@ -1363,6 +1383,13 @@ ar:
     none: لا شيء
     order_by: ترتيب بحسب
     save_changes: حفظ التغييرات
+    select_all_matching_items:
+      few: حدد كافة العناصر الـ %{count} المطابقة لبحثك.
+      many: حدد كافة العناصر الـ %{count} المطابقة لبحثك.
+      one: حدد العنصر المطابق لبحثك.
+      other: حدد كافة العناصر الـ %{count} المطابقة لبحثك.
+      two: حدد العنصران المطابقان لبحثك.
+      zero: حدد كافة العناصر الـ %{count} المطابقة لبحثك.
     today: اليوم
     validation_errors:
       few: هناك شيء ما ليس على ما يرام! يُرجى مراجعة الأخطاء الـ %{count} أدناه
@@ -1441,6 +1468,7 @@ ar:
       '86400': يوم واحد
     expires_in_prompt: أبدا
     generate: توليد
+    invalid: هذه الدعوة غير صالحة
     invited_by: 'تمت دعوتك من طرف:'
     max_uses:
       few: "%{count} استخدامات"
@@ -1622,6 +1650,9 @@ ar:
     errors:
       limit_reached: تم بلوغ الحد الأقصى لردود الفعل المختلفة
       unrecognized_emoji: لم يتم التعرف على أنه إيموجي
+  redirects:
+    prompt: إن كنت واثق من هذا الرابط، انقر عليه للمتابعة.
+    title: إنّك مغادر %{instance}.
   relationships:
     activity: نشاط الحساب
     confirm_follow_selected_followers: هل أنت متأكد من أنك تريد متابعة المتابِعين المحددين؟
@@ -1657,6 +1688,9 @@ ar:
     over_daily_limit: لقد تجاوزتَ حد الـ %{limit} منشورات مُبَرمَجة مسموح بها اليوم
     over_total_limit: لقد بلغت حد الـ %{limit} مِن المنشورات المبرمَجة
     too_soon: يجب أن يكون تاريخ البرمجة في المستقبَل
+  self_destruct:
+    lead_html: للأسف، سيتم إغلاق <strong>%{domain}</strong> بشكل دائم. إذا كان لديك حساب هناك، لن تكون قادرًا على الاستمرار في استخدامه، غير أنه يمكنك طلب نسخة احتياطية لبياناتك.
+    title: سيُغلق هذا الخادم أبوابه
   sessions:
     activity: آخر نشاط
     browser: المتصفح
@@ -1681,6 +1715,7 @@ ar:
       unknown_browser: متصفح غير معروف
       weibo: وايبو
     current_session: الجلسة الحالية
+    date: التاريخ
     description: "%{browser} على %{platform}"
     explanation: ها هي قائمة مُتصفِّحات الويب التي تستخدِم حاليًا حساب ماستدون الخاص بك.
     ip: عنوان الإيبي
@@ -1871,16 +1906,27 @@ ar:
     webauthn: مفاتيح الأمان
   user_mailer:
     appeal_approved:
+      action: إعدادات الحساب
       explanation: تمت الموافقة على استئناف السجل ضد حسابك في %{strike_date} الذي قدمته في %{appeal_date}. حسابك مرة أخرى في حالة جيدة.
       subject: تم قبول طعنك الذي قدمته بتاريخ %{date}
+      subtitle: حسابك في وضع جيد مجدّدا.
       title: تم قبول طعنك
     appeal_rejected:
       explanation: تم رفض استئناف السجل ضد حسابك في %{strike_date} الذي قدمته في %{appeal_date}.
       subject: تم رفض طعنك الذي قدمته بتاريخ %{date}
+      subtitle: تم رفض طعنك.
       title: رُفض الاستئناف
     backup_ready:
+      explanation: لقد قمت بطلب نسخة كاملة لحسابك على ماستدون.
+      extra: إنه الآن جاهز للتحميل!
       subject: نسخة بيانات حسابك جاهزة للتنزيل
       title: المغادرة بأرشيف الحساب
+    failed_2fa:
+      details: 'فيما يلي تفاصيل محاولة تسجيل الدخول:'
+      explanation: حاول شخص ما تسجيل الدخول إلى حسابك ولكنه قدم عامل مصادقة ثانٍ غير صالح.
+      further_actions_html: إن لم تكن أنت، نوصي بأن تقوم بـ %{action} على الفور، حيث قد يكون الحساب قد تعرض للاختراق.
+      subject: فشل المصادقة على العامل الثاني
+      title: فشل المصادقة على العامل الثاني
     suspicious_sign_in:
       change_password: غيّر كلمتك السرية
       details: 'فيما يلي تفاصيل تسجيل الدخول:'
@@ -1934,7 +1980,7 @@ ar:
     go_to_sso_account_settings: انتقل إلى إعدادات حساب مزود الهوية الخاص بك
     invalid_otp_token: رمز المصادقة بخطوتين غير صالح
     otp_lost_help_html: إن فقدتَهُما ، يمكنك الاتصال بـ %{email}
-    rate_limited: عدد محاولات التحقق كثير جدًا، يرجى المحاولة مرة أخرى لاحقًا.
+    rate_limited: عدد محاولات المصادقة كثير جداً، حاول مرة أخرى لاحقاً.
     seamless_external_login: لقد قمت بتسجيل الدخول عبر خدمة خارجية، إنّ إعدادات الكلمة السرية و البريد الإلكتروني غير متوفرة.
     signed_in_as: 'تم تسجيل دخولك بصفة:'
   verification:
diff --git a/config/locales/be.yml b/config/locales/be.yml
index c0ed043f8e0927..9bfc46e2a7b2cf 100644
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -88,7 +88,7 @@ be:
         remote: Адлеглы
         title: Месцазнаходжанне
       login_status: Стан уваходу
-      media_attachments: Медыя дадаткі
+      media_attachments: Медыя далучэнні
       memorialize: Даданае да памяці
       memorialized: Запомненае
       memorialized_msg: Уліковы запіс %{username} ператвораны ў мемарыяльны
@@ -522,7 +522,7 @@ be:
         instance_followers_measure: нашых падпісчыкаў там
         instance_follows_measure: іх падпісчыкаў тут
         instance_languages_dimension: Папулярныя мовы
-        instance_media_attachments_measure: захаваныя медыя-ўкладанні
+        instance_media_attachments_measure: захаваныя медыя-далучэнні
         instance_reports_measure: справаздач пра іх
         instance_statuses_measure: захаваных паведамленняў
       delivery:
@@ -555,7 +555,7 @@ be:
       total_followed_by_them: Іхнія падпіскі
       total_followed_by_us: Нашыя падпіскі
       total_reported: Скаргі на іх
-      total_storage: Медыя дадаткі
+      total_storage: Медыя далучэнні
       totals_time_period_hint_html: Паказаныя агульныя значэнні ніжэй уключаюць даныя за ўвесь час.
       unknown_instance: На дадзены момант няма запісаў аб гэтым дамене на гэтым серверы.
     invites:
@@ -1462,9 +1462,9 @@ be:
       title: Адпісацца
   media_attachments:
     validations:
-      images_and_video: Немагчыма прымацаваць відэа да допісу, які ўжо змяшчае выявы
-      not_ready: Няможна дадаць файлы, апрацоўка якіх яшчэ не скончылася. Паспрабуйце яшчэ раз праз хвілінку!
-      too_many: Няможна дадаць больш за 4 файлы
+      images_and_video: Немагчыма далучыць відэа да допісу, які ўжо змяшчае выявы
+      not_ready: Няможна далучыць файлы, апрацоўка якіх яшчэ не скончылася. Паспрабуйце яшчэ раз праз хвілінку!
+      too_many: Немагчыма далучыць больш за 4 файлы
   migrations:
     acct: Перамешчана ў
     cancel: Скасаваць перанакіраванне
@@ -1598,6 +1598,9 @@ be:
     errors:
       limit_reached: Дасягнуты ліміт розных рэакцый
       unrecognized_emoji: невядомае эмодзі
+  redirects:
+    prompt: Калі вы давяраеце гэтай спасылцы, націсніце на яе, каб працягнуць.
+    title: Вы пакідаеце %{instance}.
   relationships:
     activity: Актыўнасць ул. запісу
     confirm_follow_selected_followers: Вы ўпэўнены, што жадаеце падпісацца на выбраных падпісчыкаў?
@@ -1660,6 +1663,7 @@ be:
       unknown_browser: Невядомы браўзер
       weibo: Weibo
     current_session: Бягучая сесія
+    date: Дата
     description: "%{browser} на %{platform}"
     explanation: Гэта вэб-браўзэры, з якіх выкананы ўваход у ваш уліковы запіс Mastodon.
     ip: IP
@@ -1776,7 +1780,7 @@ be:
     interaction_exceptions_explanation: Звярніце ўвагу, што няма гарантыі выдалення пастоў, калі колькасць іх упадабанняў ці пашырэннняў упадзе ніжэй за ліміт, хаця некалі гэтая колькасць перавышала яго.
     keep_direct: Захаваць асабістыя паведамленні
     keep_direct_hint: Не выдаляць асабістыя паведамленні
-    keep_media: Захоўваць допісы з медыя дадаткамі
+    keep_media: Захоўваць допісы з далучаным медыя
     keep_media_hint: Не выдаляць вашыя допісы, якія ўтрымліваюць медыя
     keep_pinned: Захаваць замацаваныя допісы
     keep_pinned_hint: Не выдаляць вашыя замацаваныя допісы
@@ -1838,16 +1842,27 @@ be:
     webauthn: Ключы бяспекі
   user_mailer:
     appeal_approved:
+      action: Налады ўліковага запісу
       explanation: Апеляцыя на папярэджанне супраць вашага ўліковага запісу ад %{strike_date}, якую вы падалі %{appeal_date}, была ўхвалена. Ваш уліковы запіс зноў на добрым рахунку.
       subject: Вашая апеляцыя ад %{date} была ўхваленая
+      subtitle: Ваш уліковы запіс зноў знаходзіцца ў добрым стане.
       title: Абскарджанне ўхвалена
     appeal_rejected:
       explanation: Апеляцыя на папярэджанне супраць вашага ўліковага запісу ад %{strike_date}, якую вы падалі %{appeal_date}, была адхілена.
       subject: Вашая апеляцыя ад %{date} была адхіленая
+      subtitle: Ваша абскарджанне было адхілена.
       title: Абскарджанне адхілена
     backup_ready:
+      explanation: Вы запыталі поўную рэзервовую копію вашага ўліковага запісу Mastodon.
+      extra: Цяпер ён гатовы да загрузкі!
       subject: Ваш архіў гатовы да спампавання
       title: Ваш архіў можна спампаваць
+    failed_2fa:
+      details: 'Вось падрабязнасці ўваходу:'
+      explanation: Хтосьці спрабаваў увайсці ў ваш уліковы запіс, але ўвёў няправільны другі фактар аўтэнтыфікацыі.
+      further_actions_html: Калі гэта не вы, мы рэкамендуем неадкладна %{action}, бо ён можа быць скампраметаваны.
+      subject: Збой аўтэнтыфікацыі па другім фактары
+      title: Няўдалая аўтэнтыфікацыя па другім фактары
     suspicious_sign_in:
       change_password: змяніць свой пароль
       details: 'Вось падрабязнасці ўваходу:'
@@ -1901,6 +1916,7 @@ be:
     go_to_sso_account_settings: Перайдзіце ў налады ідэнтыфікацыі вашага ўліковага запісу
     invalid_otp_token: Няправільны код двухфактарнай аўтэнтыфікацыі
     otp_lost_help_html: Калі вы страцілі доступ да абодвух, вы можаце скарыстацца %{email}
+    rate_limited: Занадта шмат спробаў аўтэнтыфікацыі, паспрабуйце пазней.
     seamless_external_login: Вы ўвайшлі праз знешні сэрвіс, таму налады пароля і эл. пошты недаступныя.
     signed_in_as: 'Увайшлі як:'
   verification:
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 9c8456a05fb305..b1229ac906a838 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -7,7 +7,7 @@ bg:
     hosted_on: Mastodon е разположен на хост %{domain}
     title: Относно
   accounts:
-    follow: Последвай
+    follow: Последване
     followers:
       one: Последовател
       other: Последователи
@@ -28,7 +28,7 @@ bg:
       title: Извършване на модериращо действие за %{acct}
     account_moderation_notes:
       create: Оставяне на бележка
-      created_msg: Бележката за модерация е създадена успешно!
+      created_msg: Успешно създадена бележка за модерация!
       destroyed_msg: Успешно унищожена бележка за модериране!
     accounts:
       add_email_domain_block: Блокиране на домейн на имейл
@@ -757,7 +757,7 @@ bg:
         follow_recommendations: Препоръки за следване
         preamble: За потребители, които са нови и не познават никого в Mastodon, показването на интересно съдържание е ключово. Настройте начина, по който различни функции по откриване на съдържание работят на вашия сървър.
         profile_directory: Указател на профила
-        public_timelines: Публични часови оси
+        public_timelines: Публични хронологии
         publish_discovered_servers: Публикуване на откритите сървъри
         publish_statistics: Публикуване на статистиката
         title: Откриване
@@ -804,7 +804,7 @@ bg:
         remove_from_report: Премахване от доклада
         report: Докладване
       deleted: Изтрито
-      favourites: Любими
+      favourites: Харесвани
       history: История на версиите
       in_reply_to: Отговор до
       language: Език
@@ -840,7 +840,7 @@ bg:
       elasticsearch_health_yellow:
         message_html: Клъстерът Elasticsearch е нездрав (жълто състояние), може да искате да разследвате причината
       elasticsearch_index_mismatch:
-        message_html: Картографиранията на показатели в Elasticsearch са остарели. Пуснете <code>tootctl search deploy --only=%{value}</code>
+        message_html: Речниковите съответствия в Elasticsearch са с изтекла давност. Пуснете <code>tootctl search deploy --only=%{value}</code>
       elasticsearch_preset:
         action: Преглед на документацията
         message_html: Вашият клъстер в Elasticsearch има повече от един възел, но Mastodon не е настроен да ги употребява.
@@ -905,14 +905,14 @@ bg:
       statuses:
         allow: Позволяване на публикацията
         allow_account: Позволяване на автора
-        description_html: Има публикации, за които сървърът ви знае, че в момента са често споделяни или означавани като любими. Биха помогнали на вашите нови и завръщащи се потребители да открият повече хора за последване. Никоя от публикациите няма да бъде показана публично, докато не одобрите автора и докато авторът не позволи акаунтът му да бъде предлган на другите. Може още да позволявате или отхвърляте отделни публикации.
+        description_html: Това са публикации, за които сървърът ви знае, че са често споделяни или харесвани в момента. Това може да помогне на вашите нови и завръщащи се потребители да открият повече хора за следване. Никоя от публикациите няма да бъде показана публично, докато не одобрите автора и докато авторът не позволи акаунтът му да бъде предлган на другите. Също така можете да позволявате или отхвърляте отделни публикации.
         disallow: Забраняване на публикацията
         disallow_account: Забрана на автора
         no_status_selected: Няма промяна, тъй като няма избрана нашумяла публикация
         not_discoverable: Авторът не е избрал да е откриваем
         shared_by:
-          one: Споделено или сложено веднъж в любими
-          other: Споделено или сложено в любими %{friendly_count} пъти
+          one: Споделено или харесано веднъж
+          other: Споделено или харесано %{friendly_count} пъти
         title: Налагащи се публикации
       tags:
         current_score: Текущ резултат %{score}
@@ -1009,7 +1009,7 @@ bg:
     remove: Разкачвне на псевдонима
   appearance:
     advanced_web_interface: Разширен уеб интерфейс
-    advanced_web_interface_hint: 'Ако желаете да се възползвате от пълната ширина на своя екран, разширеният уеб интерфейс ще ви позволи да настроите най-различни колони, за да виждате едновременно множество информация: Начало, известия, федериран инфопоток, множество списъци и хаштагове.'
+    advanced_web_interface_hint: 'Ако желаете да се възползвате от цялата ширина на своя екран, разширеният уеб интерфейс ще ви позволи да настроите няколко различни колони, за да виждате едновременно различна информация: Начало, известия, федерирана хронология, множество списъци и хаштагове.'
     animations_and_accessibility: Анимация и достъпност
     confirmation_dialogs: Диалогов прозорец за потвърждение
     discovery: Откриване
@@ -1231,13 +1231,13 @@ bg:
     add_new: Добавяне на нов
     errors:
       limit: Вече достигнахте максималния брой хаштагове
-    hint_html: "<strong>Какво представляват актуалните хаштагове?</strong> Те се показват ясно на вашия публичен профил и позволяват на хората да преглеждат публичните ви публикации с тези хаштагове. Те са чудесен инструмент, с който може да се следи творческа работа или дългосрочни проекти."
+    hint_html: "<strong>Изтъкнете най-важните си хаштагове на профила?</strong> Чудесен инструмент за организиране на вашите творби и дългосрочни проекти, изтъкнатите хаштагове са отчетливо видими на вашия профил и позволяват лесен достъп до вашите собствени публикации."
   filters:
     contexts:
       account: Профили
       home: Начало и списъци
       notifications: Известия
-      public: Публични инфопотоци
+      public: Публични хронологии
       thread: Разговори
     edit:
       add_keyword: Добавяне на ключова дума
@@ -1400,11 +1400,11 @@ bg:
       confirmation_html: Наистина ли искате да спрете абонамента от получаването на %{type} за Mastodon в %{domain} към имейла си при %{email}? Може винаги пак да се абонирате от своите <a href="%{settings_path}">настройки за известяване по е-поща</a>.
       emails:
         notification_emails:
-          favourite: е-писма с любими известия
+          favourite: е-писма за харесани известия
           follow: е-писма с известия за последване
           follow_request: е-писма със заявки за следване
           mention: е-писма с известия за споменаване
-          reblog: е-писма с известия за подсилване
+          reblog: е-писма с известия за раздуване
       resubscribe_html: Ако погрешка сте спрели абонамента, то може пак да се абонирате от своите <a href="%{settings_path}">настройки за известия по е-поща</a>.
       success_html: Повече няма да получавате %{type} за Mastodon в %{domain} към имейла си при %{email}.
       title: Спиране на абонамента
@@ -1459,9 +1459,9 @@ bg:
       sign_up:
         subject: "%{name} се регистрира"
     favourite:
-      body: 'Вашата публикация беше добавена в любими от %{name}:'
+      body: 'Вашата публикация беше харесана от %{name}:'
       subject: "%{name} хареса вашата публикация"
-      title: Нова любима публикация
+      title: Нова харесана публикация
     follow:
       body: "%{name} те последва!"
       subject: "%{name} те последва"
@@ -1479,9 +1479,9 @@ bg:
     poll:
       subject: Анкетата от %{name} приключи
     reblog:
-      body: 'Ваша публикация беше подсилена от %{name}:'
-      subject: "%{name} подсили ваша публикация"
-      title: Ново подсилване
+      body: 'Ваша публикация беше раздута от %{name}:'
+      subject: "%{name} разду ваша публикация"
+      title: Ново раздуване
     status:
       subject: "%{name} току-що публикува"
     update:
@@ -1530,7 +1530,7 @@ bg:
   preferences:
     other: Друго
     posting_defaults: По подразбиране за публикации
-    public_timelines: Публични инфопотоци
+    public_timelines: Публични хронологии
   privacy:
     hint_html: "<strong>Персонализирайте как искате профилът ви и публикациите ви да се намират.</strong> Разнообразие от функции в Mastodon може да ви помогнат да достигнете по-широка публика, когато е включено. Отделете малко време, за да прегледате тези настройки, за да се уверите, че отговарят на вашия случай на употреба."
     privacy: Поверителност
@@ -1668,7 +1668,7 @@ bg:
       video:
         one: "%{count} видео"
         other: "%{count} видеозаписа"
-    boosted_from_html: Подсилено от %{acct_link}
+    boosted_from_html: Раздуто от %{acct_link}
     content_warning: 'Предупреждение за съдържание: %{warning}'
     default_language: Същият като езика на интерфейса
     disallowed_hashtags:
@@ -1680,10 +1680,10 @@ bg:
     open_in_web: Отвори в уеб
     over_character_limit: прехвърлен лимит от %{max} символа
     pin_errors:
-      direct: Публикациите, които са видими само за споменати потребители не може да се закачат
+      direct: Публикациите, които са видими само за потребители споменати в тях, не могат да бъдат закачани
       limit: Вече сте закачили максималния брой публикации
-      ownership: Публикация на някого другиго не може да се закачи
-      reblog: Подсилване не може да се закача
+      ownership: Публикация на някого другиго не може да бъде закачена
+      reblog: Раздуване не може да бъде закачано
     poll:
       total_people:
         one: "%{count} човек"
@@ -1704,27 +1704,27 @@ bg:
       public: Публично
       public_long: Всеки ги вижда
       unlisted: Публично, но не показвай в публичния канал
-      unlisted_long: Всеки ги вижда, но са скрити от публичните инфопотоци
+      unlisted_long: Всеки ги вижда, но са скрити от публичните хронологии
   statuses_cleanup:
     enabled: Автоматично изтриване на стари публикации
     enabled_hint: От само себе си трие публикациите ви, щом достигнат указания възрастов праг, освен ако не съвпаднат с някое от изключенията долу
     exceptions: Изключения
     explanation: Тъй като изтриването на публикации е скъпа операция, това се прави бавно във времето, когато сървърът иначе не е зает. Поради тази причина публикациите ви може да се изтрият известно време след като достигнат възрастовия праг.
     ignore_favs: Игнориране на харесвания
-    ignore_reblogs: Игнориране на подсилвания
+    ignore_reblogs: Игнориране на раздувания
     interaction_exceptions: Изключения въз основа на взаимодействия
-    interaction_exceptions_explanation: Забележете, че няма гаранция, че публикацията ще се изтрият, ако паднат под прага на брой маркирания като любими/подсилвания, след като са го надвишили.
+    interaction_exceptions_explanation: Забележете, че няма гаранция, че публикациите ще бъдат изтрити, ако паднат под прага на брой маркирания като харесвани или раздувани, след като са го надвишили.
     keep_direct: Запазване на директните съобщения
     keep_direct_hint: Директните ви съобщения не се изтриват
     keep_media: Задържане на публикации с прикачена мултимедия
     keep_media_hint: Не изтрива публикации, които съдържат мултимедийни прикачвания
-    keep_pinned: Запазване на закачените публикации
-    keep_pinned_hint: Не изтрива закачени публикации
+    keep_pinned: Задържане на закачените публикации
+    keep_pinned_hint: Не изтрива закачените ви публикации
     keep_polls: Запазване на запитванията
     keep_polls_hint: Не изтрива запитвания
     keep_self_bookmark: Запазване на публикации, добавени в отметки
     keep_self_bookmark_hint: Не се изтриват ваши публикации, ако сте ги добавили към отметки
-    keep_self_fav: Запазване на публикации, които сте маркирали като любими
+    keep_self_fav: Задържане на публикации, които сте харесали
     keep_self_fav_hint: Не се изтриват публикации, които сте харесали
     min_age:
       '1209600': 2 седмици
@@ -1736,10 +1736,10 @@ bg:
       '63113904': 2 години
       '7889238': 3 месеца
     min_age_label: Възрастов праг
-    min_favs: Запазване на публикации, маркирани като любими поне
-    min_favs_hint: Не се изтриват никоя от публикациите ви, маркирани като любими поне толкова пъти. Оставете празно, за да изтриете публикациите независимо от броя маркирания като любими
-    min_reblogs: Запазване на публикации с поне толкова споделяния
-    min_reblogs_hint: Не се изтриват ваши публикации, споделени поне толкова пъти. Оставете празно, за да изтриете публикациите независимо от техния брой споделяния
+    min_favs: Запазване на харесани публикации поне
+    min_favs_hint: Не се изтрива никоя от публикациите, които сте харесали поне толкова пъти. Оставете празно, за да изтриете публикациите независимо от броя харесвания
+    min_reblogs: Запазване на публикации с поне толкова раздувания
+    min_reblogs_hint: Не се изтриват ваши публикации, споделени поне толкова пъти. Оставете празно, за да изтриете публикациите независимо от броя на техния раздувания
   stream_entries:
     sensitive_content: Деликатно съдържание
   strikes:
@@ -1842,7 +1842,7 @@ bg:
       edit_profile_step: Може да настроите профила си, качвайки снимката на профила, променяйки показваното си име и други неща. Може да се включите за преглед на нови последователи преди да бъдат позволени да ви последват.
       explanation: Ето няколко стъпки за начало
       final_action: Начало на публикуване
-      final_step: 'Публикувайте! Дори без последователи, вашите публични публикации ще бъдат видени от други, например в местния инфопоток или под хаштагове. Не забравяйте да се представите с хаштаг #introductions.'
+      final_step: 'Публикувайте! Дори без да имате последователи, вашите публични публикации ще бъдат видени от други, например в местната хронология или под хаштагове. Не забравяйте да се представите с хаштаг #introductions.'
       full_handle: Пълното ви име
       full_handle_hint: Ето какво бихте казали на приятелите си, за да могат да ви изпращат съобщения или да ви последват от друг сървър.
       subject: Добре дошли в Mastodon
diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index 768dd3e0c8975e..5085942fb718ce 100644
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@@ -1650,6 +1650,9 @@ cy:
     errors:
       limit_reached: Cyrhaeddwyd terfyn y gwahanol adweithiau
       unrecognized_emoji: nid yw'n emoji cydnabyddedig
+  redirects:
+    prompt: Os ydych chi'n ymddiried yn y ddolen hon, cliciwch arni i barhau.
+    title: Rydych chi'n gadael %{instance}.
   relationships:
     activity: Gweithgareddau cyfrif
     confirm_follow_selected_followers: Ydych chi'n siŵr eich bod am ddilyn y dilynwyr a ddewiswyd?
@@ -1911,13 +1914,19 @@ cy:
     appeal_rejected:
       explanation: Mae apêl y rhybudd yn erbyn eich cyfrif ar %{strike_date} a gyflwynwyd gennych ar %{appeal_date} wedi'i gwrthod.
       subject: Mae eich apêl ar %{date} wedi'i gwrthod
-      subtitle: Mae eich apêl wedi'i gwrthod
+      subtitle: Mae eich apêl wedi'i gwrthod.
       title: Mae'r apêl wedi'i gwrthod
     backup_ready:
       explanation: Rydych wedi gofyn am gopi wrth gefn llawn o'ch cyfrif Mastodon.
       extra: Mae nawr yn barod i'w lwytho i lawr!
       subject: Mae eich archif yn barod i'w lawrlwytho
       title: Allfudo archif
+    failed_2fa:
+      details: 'Dyma fanylion yr ymgais i fewngofnodi:'
+      explanation: Mae rhywun wedi ceisio mewngofnodi i'ch cyfrif ond wedi darparu ail ffactor dilysu annilys.
+      further_actions_html: Os nad chi oedd hwn, rydym yn argymell eich bod yn %{action} ar unwaith oherwydd gall fod o dan fygythiad.
+      subject: Methiant dilysu ail ffactor
+      title: Wedi methu dilysu ail ffactor
     suspicious_sign_in:
       change_password: newidiwch eich cyfrinair
       details: 'Dyma fanylion y mewngofnodi:'
@@ -1971,6 +1980,7 @@ cy:
     go_to_sso_account_settings: Ewch i osodiadau cyfrif eich darparwr hunaniaeth
     invalid_otp_token: Côd dau-ffactor annilys
     otp_lost_help_html: Os colloch chi fynediad i'r ddau, mae modd i chi gysylltu a %{email}
+    rate_limited: Gormod o geisiadau dilysu, ceisiwch eto yn nes ymlaen.
     seamless_external_login: Yr ydych wedi'ch mewngofnodi drwy wasanaeth allanol, felly nid yw gosodiadau cyfrinair ac e-bost ar gael.
     signed_in_as: 'Wedi mewngofnodi fel:'
   verification:
diff --git a/config/locales/devise.ar.yml b/config/locales/devise.ar.yml
index 28e721e6672c43..4e6adf42e5a2a2 100644
--- a/config/locales/devise.ar.yml
+++ b/config/locales/devise.ar.yml
@@ -47,14 +47,19 @@ ar:
         subject: 'ماستدون: تعليمات استعادة كلمة المرور'
         title: إعادة تعيين كلمة السر
       two_factor_disabled:
+        explanation: أصبح الولوج الآن ممكنا باستخدام عنوان البريد الإلكتروني وكلمة المرور فقط.
         subject: 'ماستدون: نظام المصادقة بخطوتين مُعطّل'
+        subtitle: تم تعطيل المصادقة بعاملين لحسابك.
         title: إنّ 2FA معطّل
       two_factor_enabled:
+        explanation: سيتعين استخدام رمز يتم إنشاؤه بواسطة تطبيق TOTP المقترن لتسجيل الدخول.
         subject: 'ماستدون: تم تفعيل نظام المصادقة بخطوتين'
-        title: إنّ 2FA نشِط
+        subtitle: تم تفعيل المصادقة الثنائية لحسابك.
+        title: الاستيثاق الثنائي 2FA مُفعّل
       two_factor_recovery_codes_changed:
         explanation: لقد تم إلغاء رموز الاسترداد السابقة وأنشئت رموز جديدة.
         subject: 'ماستدون: تم إعادة توليد رموز استرجاع المصادقة بخطوتين'
+        subtitle: تم إبطال رموز الاسترداد السابقة وإنشاء رموز جديدة.
         title: تم استبدال رموز استرجاع 2FA
       unlock_instructions:
         subject: 'ماستدون: تعليمات فك القفل'
@@ -68,9 +73,13 @@ ar:
           subject: 'ماستدون: تم حذف مفتاح الأمان'
           title: تم حذف أحد مفاتيح الأمان الخاصة بك
       webauthn_disabled:
+        explanation: تم تعطيل المصادقة باستخدام مفاتيح الأمان لحسابك.
+        extra: يمكن الآن تسجيل الدخول باستخدام الرمز المميز الذي تم إنشاؤه بواسطة تطبيق TOTP المقترن فقط.
         subject: 'ماستدون: الاستيثاق مع مفاتيح الأمان معطلة'
         title: مفاتيح الأمان معطلة
       webauthn_enabled:
+        explanation: تم تمكين مصادقة مفتاح الأمان لحسابك.
+        extra: يمكن الآن استخدام مفتاح الأمان الخاص بك لتسجيل الدخول.
         subject: 'ماستدون: تم تفعيل نظام استيثاق مفتاح الأمان'
         title: مفاتيح الأمان مفعلة
     omniauth_callbacks:
diff --git a/config/locales/devise.be.yml b/config/locales/devise.be.yml
index 8679275c208d96..18785d16ab956b 100644
--- a/config/locales/devise.be.yml
+++ b/config/locales/devise.be.yml
@@ -47,14 +47,19 @@ be:
         subject: 'Mastodon: Інструкцыі па скіданню пароля'
         title: Скіданне пароля
       two_factor_disabled:
+        explanation: Уваход у сістэму цяпер магчымы толькі з выкарыстаннем адраса электроннай пошты і пароля.
         subject: 'Mastodon: двухфактарная аўтэнтыфікацыя адключана'
+        subtitle: Двухфактарная аўтэнтыфікацыя для вашага ўліковага запісу была адключаная.
         title: двухэтапнае спраўджанне адключана
       two_factor_enabled:
+        explanation: Для ўваходу ў сістэму патрабуецца токен, згенераваны спалучанай праграмай TOTP.
         subject: 'Mastodon: двухфактарная аўтэнтыфікацыя ўключана'
+        subtitle: Для вашага ўліковага запісу была ўключаная двухфактарная аўтэнтыфікацыя.
         title: двухэтапнае спраўджанне уключана
       two_factor_recovery_codes_changed:
         explanation: Папярэднія коды аднаўлення былі ануляваны і створаны новыя.
         subject: 'Mastodon: створаны новыя коды аднаўлення'
+        subtitle: Папярэднія коды аднаўлення былі ануляваны і замест іх створаны новыя.
         title: 2FA коды аднаўлення былі зменены
       unlock_instructions:
         subject: 'Mastodon: інструкцыя па разблакаванні'
@@ -68,9 +73,13 @@ be:
           subject: 'Mastodon: ключ бяспекі выдалены'
           title: Адзін з вашых ключоў бяспекі быў выдалены
       webauthn_disabled:
+        explanation: Аўтэнтыфікацыя з дапамогай ключоў бяспекі была адключаная для вашага ўліковага запісу.
+        extra: Зараз уваход у сістэму магчымы толькі з выкарыстаннем токена, згенераванага спалучанай праграмай TOTP.
         subject: 'Mastodon: Аўтэнтыфікацыя з дапамогай ключоў бяспекі адключана'
         title: Ключы бяспекі адключаны
       webauthn_enabled:
+        explanation: Для вашага ўліковага запісу ўключана аўтэнтыфікацыя па ключу бяспекі.
+        extra: Цяпер ваш ключ бяспекі можна выкарыстоўваць для ўваходу ў сістэму.
         subject: 'Mastodon: Аўтэнтыфікацыя праз ключ бяспекі была ўключана'
         title: Ключы бяспекі ўключаны
     omniauth_callbacks:
diff --git a/config/locales/devise.en-GB.yml b/config/locales/devise.en-GB.yml
index 8fa02bbd4a0e3e..823be9aa6c9fad 100644
--- a/config/locales/devise.en-GB.yml
+++ b/config/locales/devise.en-GB.yml
@@ -47,14 +47,19 @@ en-GB:
         subject: 'Mastodon: Reset password instructions'
         title: Password reset
       two_factor_disabled:
+        explanation: Login is now possible using only e-mail address and password.
         subject: 'Mastodon: Two-factor authentication disabled'
+        subtitle: Two-factor authentication for your account has been disabled.
         title: 2FA disabled
       two_factor_enabled:
+        explanation: A token generated by the paired TOTP app will be required for login.
         subject: 'Mastodon: Two-factor authentication enabled'
+        subtitle: Two-factor authentication has been enabled for your account.
         title: 2FA enabled
       two_factor_recovery_codes_changed:
         explanation: The previous recovery codes have been invalidated and new ones generated.
         subject: 'Mastodon: Two-factor recovery codes re-generated'
+        subtitle: The previous recovery codes have been invalidated and new ones generated.
         title: 2FA recovery codes changed
       unlock_instructions:
         subject: 'Mastodon: Unlock instructions'
@@ -68,9 +73,13 @@ en-GB:
           subject: 'Mastodon: Security key deleted'
           title: One of your security keys has been deleted
       webauthn_disabled:
+        explanation: Authentication with security keys has been disabled for your account.
+        extra: Login is now possible using only the token generated by the paired TOTP app.
         subject: 'Mastodon: Authentication with security keys disabled'
         title: Security keys disabled
       webauthn_enabled:
+        explanation: Security key authentication has been enabled for your account.
+        extra: Your security key can now be used for login.
         subject: 'Mastodon: Security key authentication enabled'
         title: Security keys enabled
     omniauth_callbacks:
diff --git a/config/locales/devise.fi.yml b/config/locales/devise.fi.yml
index 22fd7ff47beec6..66616d16b115fb 100644
--- a/config/locales/devise.fi.yml
+++ b/config/locales/devise.fi.yml
@@ -13,32 +13,32 @@ fi:
       locked: Tilisi on lukittu.
       not_found_in_database: Virheellinen %{authentication_keys} tai salasana.
       pending: Tilisi on vielä tarkistamatta.
-      timeout: Istuntosi on umpeutunut. Jatka kirjautumalla uudelleen sisään.
+      timeout: Istuntosi on vanhentunut. Jatkaaksesi käyttöä, kirjaudu uudelleen.
       unauthenticated: Sinun on kirjauduttava tai rekisteröidyttävä ennen kuin voit jatkaa.
       unconfirmed: Vahvista sähköpostiosoitteesi, ennen kuin jatkat.
     mailer:
       confirmation_instructions:
         action: Vahvista sähköpostiosoite
         action_with_app: Vahvista ja palaa %{app}
-        explanation: Olet luonut tilin palvelimelle %{host} käyttäen tätä sähköpostiosoitetta. Olet painalluksen päässä tilin aktivoinnista. Jos et luonut tiliä itse, voit jättää tämän viestin huomiotta.
+        explanation: Olet luonut käyttäjätilin palvelimelle %{host} tätä sähköpostiosoitetta käyttäen. Olet painalluksen päässä tilin aktivoinnista. Jos et luonut tiliä itse, voit jättää tämän viestin huomiotta.
         explanation_when_pending: Teit hakemuksen kutsusta palvelimelle %{host} tällä sähköpostiosoitteella. Kun olet vahvistanut sähköpostiosoitteesi, tarkistamme hakemuksesi. Voit kirjautua sisään muuttaaksesi hakemuksen sisältöä tai poistaaksesi tilin, mutta et voi käyttää suurinta osaa toiminnallisuudesta ennen kuin hakemuksesi on hyväksytty. Jos hakemuksesi hylätään, tietosi poistetaan eikä sinulta tarvita enempää toimia. Jos sinä et tehnyt hakemusta, voit jättää tämän viestin huomiotta.
         extra_html: Tutustu myös <a href="%{terms_path}">palvelimen sääntöihin</a> ja <a href="%{policy_path}">palveluehtoihimme</a>.
         subject: 'Mastodon: Vahvistusohjeet instanssille %{instance}'
         title: Vahvista sähköpostiosoite
       email_changed:
         explanation: 'Tilin sähköpostiosoitteeksi vaihdetaan:'
-        extra: Jos et vaihtanut sähköpostiosoitettasi, joku muu on todennäköisesti päässyt käyttämään tiliäsi. Vaihda salasanasi viipymättä, tai ota yhteys palvelimen ylläpitäjään, jos et pääse kirjautumaan tilillesi.
+        extra: Jos et vaihtanut sähköpostiosoitettasi, joku muu on todennäköisesti päässyt käyttämään tiliäsi. Vaihda salasanasi viipymättä, tai ota yhteys palvelimen ylläpitoon, ellet pääse sisään käyttäjätilillesi.
         subject: 'Mastodon: Sähköpostiosoite vaihdettu'
         title: Uusi sähköpostiosoite
       password_change:
         explanation: Tilisi salasana on vaihdettu.
-        extra: Jos et vaihtanut salasanaasi, joku muu on todennäköisesti päässyt käyttämään tiliäsi. Vaihda salasanasi viipymättä, tai ota yhteys palvelimen ylläpitäjään, jos et pääse kirjautumaan tilillesi.
+        extra: Ellet vaihtanut salasanaasi, joku muu on todennäköisesti päässyt käyttäjätilillesi. Vaihda salasanasi viipymättä, tai ota yhteys palvelimen ylläpitoon, jos kirjautuminen käyttäjätilillesi ei onnistu.
         subject: 'Mastodon: salasana vaihdettu'
         title: Salasana vaihdettu
       reconfirmation_instructions:
         explanation: Vahvista uusi sähköpostiosoite, niin muutos astuu voimaan.
         extra: Jos et tehnyt muutosta itse, voit jättää tämän viestin huomiotta. Mastodon-tilin sähköpostiosoitetta ei vaihdeta, ennen kuin klikkaat yllä olevaa linkkiä.
-        subject: 'Mastodon: vahvista sähköpostiosoite: %{instance}'
+        subject: 'Mastodon: Vahvista sähköpostiosoite palvelimelle %{instance}'
         title: Vahvista sähköpostiosoite
       reset_password_instructions:
         action: Vaihda salasana
@@ -55,27 +55,27 @@ fi:
         explanation: Sisäänkirjautuminen edellyttää liitetyn TOTP-sovelluksen luomaa aikarajattua kertatunnuslukua.
         subject: 'Mastodon: kaksivaiheinen todennus otettu käyttöön'
         subtitle: Kaksivaiheinen todennus on otettu käyttöön tilillesi.
-        title: 2-vaiheinen todennus käytössä
+        title: Kaksivaiheinen todennus käytössä
       two_factor_recovery_codes_changed:
-        explanation: Uudet palautuskoodit on nyt luotu ja vanhat on mitätöity.
-        subject: 'Mastodon: kaksivaiheisen todennuksen palautuskoodit luotiin uudelleen'
-        subtitle: Aiemmat palautuskoodit on mitätöity ja tilalle on luotu uudet.
+        explanation: Uudet palautuskoodit on nyt luotu, ja vanhat mitätöity.
+        subject: 'Mastodon: Kaksivaihetodennuksen palautuskoodit luotiin uudelleen'
+        subtitle: Aiemmat palautuskoodit on mitätöity, ja korvaavat uudet koodit on luotu.
         title: 2-vaiheisen todennuksen palautuskoodit vaihdettiin
       unlock_instructions:
         subject: 'Mastodon: lukituksen poistamisen ohjeet'
       webauthn_credential:
         added:
           explanation: Seuraava suojausavain on lisätty tilillesi
-          subject: 'Mastodon: uusi suojausavain'
+          subject: 'Mastodon: Uusi suojausavain'
           title: Uusi suojausavain on lisätty
         deleted:
           explanation: Seuraava suojausavain on poistettu tililtäsi
-          subject: 'Mastodon: suojausavain poistettu'
+          subject: 'Mastodon: Suojausavain poistettu'
           title: Yksi suojausavaimistasi on poistettu
       webauthn_disabled:
-        explanation: Turva-avaimin kirjautuminen on poistettu käytöstä tililtäsi.
-        extra: Sisäänkirjautuminen on nyt mahdollista pelkällä palveluun liitetyn TOTP-sovelluksen luomalla aikarajoitteisella kertatunnusluvulla.
-        subject: 'Mastodon: Todennus suojausavaimilla poistettu käytöstä'
+        explanation: Turva-avaimin kirjautuminen tilillesi on kytketty pois käytöstä.
+        extra: Olet nyt mahdollistanut sisäänkirjautumisen käyttäjätilillesi pelkästään palveluun liitetyn TOTP-sovelluksen luomalla aikarajoitteisella kertatunnusluvulla.
+        subject: 'Mastodon: Turva-avaintodennus on poistettu käytöstä'
         title: Suojausavaimet poistettu käytöstä
       webauthn_enabled:
         explanation: Turva-avaimella kirjautuminen on otettu käyttöön tilillesi.
@@ -86,20 +86,20 @@ fi:
       failure: Tunnistautuminen lähteestä %{kind} ei onnistunut, koska "%{reason}".
       success: Tunnistautuminen tililtä %{kind} onnistui.
     passwords:
-      no_token: Tälle sivulle pääsee vain salasananvaihtoviestin kautta. Jos tiedät tulevasi salasananvaihtoviestin kautta, varmista, että käytät koko viestissä mainittua URL-osoitetta.
-      send_instructions: Jos sähköpostiosoite on tietokannassamme, siihen lähetetään pian linkki salasanan vaihtoon. Jos et saa viestiä, tarkista roskapostikansio.
-      send_paranoid_instructions: Jos sähköpostiosoite on tietokannassamme, siihen lähetetään pian linkki salasanan vaihtoon. Jos et saa viestiä, tarkista roskapostikansio.
+      no_token: Tälle sivulle pääsee vain salasananvaihtoviestin kautta. Jos tiedät tulevasi sen kautta, varmista, että käytät viestissä mainittua URL-osoitetta kokonaisuudessaan.
+      send_instructions: Jos sähköpostiosoite on tietokannassamme, siihen lähetetään pian viesti, jossa on linkki salasanan vaihtamiseksi. Mikäli viestiä ei kuulu, tarkista myös roskapostisi.
+      send_paranoid_instructions: Jos sähköpostiosoite on tietokannassamme, siihen lähetetään pian viesti, jossa on linkki salasanan vaihtamiseksi. Mikäli viestiä ei kuulu, tarkista myös roskapostisi.
       updated: Salasanan vaihto onnistui. Olet nyt kirjautunut sisään.
       updated_not_active: Salasanan vaihto onnistui.
     registrations:
-      destroyed: Tilisi on poistettu. Näkemiin ja tervetuloa uudelleen!
+      destroyed: Tilisi on poistettu. Näkemiin ja tervetuloa uudelleen.
       signed_up: Tervetuloa! Rekisteröityminen onnistui.
-      signed_up_but_inactive: Rekisteröityminen onnistui. Emme kuitenkaan voi kirjata sinua sisään, sillä tiliäsi ei ole vielä aktivoitu.
-      signed_up_but_locked: Rekisteröityminen onnistui. Emme kuitenkaan voi kirjata sinua sisään, sillä tilisi on lukittu.
-      signed_up_but_pending: Sähköpostiosoitteeseesi on lähetetty vahvistuslinkki. Kun olet klikannut linkkiä, tarkistamme hakemuksesi. Sinulle tiedotetaan jos se hyväksytään.
-      signed_up_but_unconfirmed: Sähköpostiosoitteeseesi on lähetetty vahvistuslinkki. Aktivoi tili seuraamalla linkkiä. Jos et saanut viestiä, tarkista roskapostikansio.
-      update_needs_confirmation: Tilin päivitys onnistui, mutta uusi sähköpostiosoite on vahvistettava. Tarkista sähköpostisi ja vahvista uusi sähköpostiosoite seuraamalla vahvistuslinkkiä. Jos et saanut viestiä, tarkista roskapostikansio.
-      updated: Tilin päivitys onnistui.
+      signed_up_but_inactive: Rekisteröityminen onnistui. Emme kuitenkaan voi kirjata sinua sisään, sillä käyttäjätiliäsi ei ole vielä aktivoitu.
+      signed_up_but_locked: Rekisteröityminen onnistui. Emme kuitenkaan voi kirjata sinua sisään, sillä käyttäjätilisi on lukittuna.
+      signed_up_but_pending: Sähköpostiosoitteeseesi on lähetetty vahvistuslinkki. Sen avattuasi tarkistamme hakemuksesi, ja ilmoitamme hyväksynnästä.
+      signed_up_but_unconfirmed: Sähköpostiosoitteeseesi on lähetetty vahvistuslinkki. Aktivoi käyttäjätilisi seuraamalla linkkiä. Mikäli sitä ei kuulu, tarkista myös roskapostisi.
+      update_needs_confirmation: Tilin päivitys onnistui. Uusi sähköpostiosoite on kuitenkin vahvistettava. Tarkista saapuneet viestisi, ja vahvista uusi sähköpostiosoitteesi vahvistuslinkkiä seuraten. Mikäli viestiä ei kuulu, tarkista myös roskapostisi.
+      updated: Käyttäjätilisi tietojen päivittäminen onnistui.
     sessions:
       already_signed_out: Uloskirjautuminen onnistui.
       signed_in: Sisäänkirjautuminen onnistui.
diff --git a/config/locales/devise.ga.yml b/config/locales/devise.ga.yml
index 0949e140d1d53a..6e6bd0a01360b3 100644
--- a/config/locales/devise.ga.yml
+++ b/config/locales/devise.ga.yml
@@ -1,9 +1,23 @@
 ---
 ga:
   devise:
+    confirmations:
+      confirmed: D'éirigh le deimhniú do ríomhphost.
+      send_instructions: Gheobhaidh tú r-phost go gairid ina mbeidh treoracha faoi conas do sheoladh r-phost a dheimhniú. Féach i d'fhillteán turscair mura bhfuair tú an r-phost seo.
+      send_paranoid_instructions: Más ann do do r-phost inár mbonneagar, gheobhaidh tú r-phost i gceann cúpla nóiméad faoi conas do sheoladh r-phost a dheimhniú. Féach i d'fhillteán turscair mura bhfuair tú an r-phost seo.
     failure:
+      already_authenticated: Tá tú sínithe isteach cheana.
+      inactive: Níl do chuntas gníomhachtaithe fós.
+      invalid: "%{authentication_keys} nó pasfhocal neamhbhailí."
+      last_attempt: Tá iarracht amháin eile agat sula gcuirtear do chuntas faoi ghlas.
       locked: Tá do chuntas faoi ghlas.
+      pending: Tá do chuntas fós faoi athbhreithniú.
+      unauthenticated: Ní mór duit lógáil isteach nó síniú suas roimh leanúint leat.
+      unconfirmed: Caithfidh tú do r-phost a dheimhniú roimh leanúint leat.
     mailer:
+      confirmation_instructions:
+        action: Deimhnigh seoladh r-phost
+        action_with_app: Deimhnigh agus fill ar %{app}
       email_changed:
         title: Seoladh ríomhphoist nua
       password_change:
diff --git a/config/locales/devise.ia.yml b/config/locales/devise.ia.yml
index c45994160c1c31..c07e75fefff0e5 100644
--- a/config/locales/devise.ia.yml
+++ b/config/locales/devise.ia.yml
@@ -11,16 +11,33 @@ ia:
       email_changed:
         title: Nove adresse de e-mail
       password_change:
+        subject: 'Mastodon: Contrasigno cambiate'
         title: Contrasigno cambiate
       reconfirmation_instructions:
+        explanation: Confirma le nove adresse pro cambiar tu email.
         title: Verificar adresse de e-mail
       reset_password_instructions:
         action: Cambiar contrasigno
+        subject: 'Mastodon: Instructiones pro reinitialisar le contrasigno'
         title: Reinitialisar contrasigno
       two_factor_disabled:
         title: 2FA disactivate
       two_factor_enabled:
         title: 2FA activate
+      unlock_instructions:
+        subject: 'Mastodon: Instructiones pro disblocar'
+      webauthn_credential:
+        added:
+          explanation: Le sequente clave de securitate esseva addite a tu conto
+          subject: 'Mastodon: Nove clave de securitate'
+          title: Un nove clave de securitate esseva addite
+        deleted:
+          explanation: Le sequente clave de securitate esseva delite de tu conto
+          subject: 'Mastodon: Clave de securitate delite'
+      webauthn_disabled:
+        title: Claves de securitate disactivate
+      webauthn_enabled:
+        title: Claves de securitate activate
     registrations:
       updated: Tu conto ha essite actualisate con successo.
     unlocks:
diff --git a/config/locales/devise.lad.yml b/config/locales/devise.lad.yml
index 2b6b8aafb1daf1..88099f48c4e2dd 100644
--- a/config/locales/devise.lad.yml
+++ b/config/locales/devise.lad.yml
@@ -3,7 +3,7 @@ lad:
   devise:
     confirmations:
       confirmed: Tu adreso de posta elektronika tyene sido konfirmado korektamente.
-      send_instructions: Risiviras una posta elektronika kon instruksyones para konfirmar tu adreso de posta elektronika en unos minutos. Por favor, komprova tu kuti de spam si no risivites esta posta elektronika.
+      send_instructions: Risiviras una mesaj de posta elektronika kon instruksyones para konfirmar tu adreso de posta elektronika en unos minutos. Por favor, komprova tu kuti de spam si no risivites esta posta elektronika.
       send_paranoid_instructions: Si tu adreso de posta elektronika existe en muestra baza de datos, risiviras una posta elektronika kon instruksyones sobre komo konfirmar tu adreso de posta elektronika en pokos minutos.
     failure:
       already_authenticated: Ya te konektates kon tu kuento.
@@ -12,7 +12,7 @@ lad:
       last_attempt: Aprova una vez mas antes de ke tu kuento sea blokado.
       locked: Tu kuento esta blokado.
       not_found_in_database: Inkorekto %{authentication_keys} o kod.
-      pending: Tu ainda esta basho revizyon.
+      pending: Tu kuento ainda esta basho revizyon.
       timeout: Tu sesyon tiene kadukado. Por favor konektate kon tu kuento de muevo para kontinuar.
       unauthenticated: Kale konektarte kon tu kuento o enregistrarte antes de kontinuar.
       unconfirmed: Tyenes ke konfirmar tu adreso de posta elektronika antes de kontinuar.
@@ -45,17 +45,17 @@ lad:
         explanation: Solisitates un muevo kod para tu kuento.
         extra: Si no solisitates esto, por favor ignora esta posta. Tu kod no trokara asta ke tu aksedas al atadijo arriva i kriyes un muevo.
         subject: 'Mastodon: Instruksyones para reinisyar kod'
-        title: Reinisyar kod
+        title: Reinisya kod
       two_factor_disabled:
         explanation: Agora puedes konektarte kon tu kuento uzando solo tu adreso de posta i kod.
         subject: 'Mastodon: La autentifikasyon de dos pasos esta inkapasitada'
         subtitle: La autentifikasyon en dos pasos para tu kuento tiene sido inkapasitada.
-        title: Autentifikasyon 2FA inkapasitada
+        title: Autentifikasyon de dos pasos inkapasitada
       two_factor_enabled:
         explanation: Se rekierira un token djenerado por la aplikasyon TOTP konektada para entrar.
         subject: 'Mastodon: La autentifikasyon de dos pasos esta kapasitada'
         subtitle: La autentifikasyon de dos pasos para tu kuento tiene sido kapasitada.
-        title: Autentifikasyon 2FA aktivada
+        title: Autentifikasyon de dos pasos aktivada
       two_factor_recovery_codes_changed:
         explanation: Los kodiches de rekuperasyon previos tienen sido invalidados i se djeneraron kodiches muevos.
         subject: 'Mastodon: Los kodiches de rekuperasyon de dos pasos fueron rejenerados'
@@ -69,9 +69,9 @@ lad:
           subject: 'Mastodon: Mueva yave de sigurita'
           title: Se tiene adjustado una mueva yave de sigurita
         deleted:
-          explanation: La sigiente yave de sigurita a sido supremida de tu kuento
+          explanation: La sigiente yave de sigurita a sido suprimida de tu kuento
           subject: 'Mastodon: Yave de sigurita supremida'
-          title: Una de tus yaves de sigurita tiene sido supremida
+          title: Una de tus yaves de sigurita tiene sido suprimida
       webauthn_disabled:
         explanation: La autentifikasyon kon yaves de sigurita tiene sido inkapasitada para tu kuento.
         extra: Agora el inisyo de sesyon solo es posivle utilizando el token djeenerado por la aplikasyon TOTP konektada.
@@ -89,7 +89,7 @@ lad:
       no_token: No puedes akseder a esta pajina si no vienes dizde una posta elektronika de restablesimyento de kod. Si vienes dizde una posta elektronika de restablesimyento de kod, por favor asigurate de utilizar el URL kompleto embiado.
       send_instructions: Si tu adreso de posta elektronika existe en muestra baza de datos, risiviras un atadijo de rekuperasyon de kod en tu adreso de posta elektronika en pokos minutos. Por favor, komprova tu kuti de posta spam si no risives akeya posta elektronika.
       send_paranoid_instructions: Si tu adreso de posta elektronika existe en muestra baza de datos, risiviras un atadijo de rekuperasyon de kod en tu adreso de posta elektronika en pokos minutos. Por favor, komprova tu kuti de posta no deseado si no risives akeya posta elektronika.
-      updated: Tu kod a sido trokado kon reusho. Tinenes entrado en kuento.
+      updated: Tu kod a sido trokado kon reusho. Tyenes entrado en kuento.
       updated_not_active: Tu kod se tiene trokado kon reusho.
     registrations:
       destroyed: Tu kuento a sido efasado kon reusho. Asperamos verte de muevo pronto.
diff --git a/config/locales/devise.nl.yml b/config/locales/devise.nl.yml
index 33d777e2ccc512..0aaf376f7fca8d 100644
--- a/config/locales/devise.nl.yml
+++ b/config/locales/devise.nl.yml
@@ -74,7 +74,7 @@ nl:
           title: Een van jouw beveiligingssleutels is verwijderd
       webauthn_disabled:
         explanation: Verificatie met beveiligingssleutels is uitgeschakeld voor je account.
-        extra: Het is nu alleen mogelijk om te te loggen met een door de authenticatie-app gegeneerde toegangscode.
+        extra: Het is nu alleen mogelijk om in te loggen met een door de authenticatie-app gegeneerde toegangscode.
         subject: 'Mastodon: Verificatie met beveiligingssleutels is uitgeschakeld'
         title: Beveiligingssleutels uitgeschakeld
       webauthn_enabled:
diff --git a/config/locales/devise.uk.yml b/config/locales/devise.uk.yml
index 55429b3c760b7a..3b3883fa9c9d63 100644
--- a/config/locales/devise.uk.yml
+++ b/config/locales/devise.uk.yml
@@ -47,14 +47,19 @@ uk:
         subject: 'Mastodon: Інструкції для скидання паролю'
         title: Скидання пароля
       two_factor_disabled:
+        explanation: Вхід можливий лише за допомогою адреси електронної пошти та пароля.
         subject: 'Mastodon: двофакторну авторизацію вимкнено'
+        subtitle: Двоетапна перевірка для вашого облікового запису вимкнена.
         title: Двофакторна автентифікація вимкнена
       two_factor_enabled:
+        explanation: Для входу необхідний токен створений пов'язаним застосунком TOTP.
         subject: 'Mastodon: двофакторну авторизацію увімкнено'
+        subtitle: Двоетапна перевірка увімкнена для вашого облікового запису.
         title: Двофакторна автентифікація увімкнена
       two_factor_recovery_codes_changed:
         explanation: Попередні коди відновлення були анульовані і генеруються нові.
         subject: 'Mastodon: коди двофакторного відновлення повторно згенеровано'
+        subtitle: Попередні коди відновлення анульовані та генеруються нові.
         title: Коди двофакторного відновлення змінено
       unlock_instructions:
         subject: 'Mastodon: Інструкції для розблокування'
@@ -68,9 +73,13 @@ uk:
           subject: 'Mastodon: Ключ безпеки видалено'
           title: Один з ваших ключів безпеки було видалено
       webauthn_disabled:
+        explanation: Автентифікація з ключами безпеки була вимкнена для вашого облікового запису.
+        extra: Тепер можна ввійти використовуючи лише токен, згенерований застосунком TOTP.
         subject: 'Mastodon: Аутентифікація за допомогою ключів безпеки вимкнена'
         title: Ключі безпеки вимкнуто
       webauthn_enabled:
+        explanation: Вхід за допомогою ключів безпеки ввімкнено для вашого облікового запису.
+        extra: Тепер ви можете використовувати ваш ключ безпеки для входу.
         subject: 'Mastodon: Авторизація ключа безпеки увімкнена'
         title: Ключі безпеки увімкнено
     omniauth_callbacks:
diff --git a/config/locales/doorkeeper.be.yml b/config/locales/doorkeeper.be.yml
index 4524dd707e1bf4..748cbeafa122e5 100644
--- a/config/locales/doorkeeper.be.yml
+++ b/config/locales/doorkeeper.be.yml
@@ -132,7 +132,7 @@ be:
         follow: Падпіскі, ігнараванне і блакіроўка
         follows: Падпіскі
         lists: Спісы
-        media: Мультымедыйныя ўкладанні
+        media: Мультымедыйныя далучэнні
         mutes: Ігнараваныя
         notifications: Апавяшчэнні
         push: Push-апавяшчэнні
diff --git a/config/locales/doorkeeper.ia.yml b/config/locales/doorkeeper.ia.yml
index d689354f6106c2..e7e6f03cdbfbe3 100644
--- a/config/locales/doorkeeper.ia.yml
+++ b/config/locales/doorkeeper.ia.yml
@@ -34,6 +34,7 @@ ia:
       confirmations:
         revoke: Es tu secur?
       index:
+        never_used: Nunquam usate
         scopes: Permissiones
         title: Tu applicationes autorisate
     flash:
@@ -53,6 +54,7 @@ ia:
         conversations: Conversationes
         favourites: Favoritos
         lists: Listas
+        mutes: Silentiates
         notifications: Notificationes
         push: Notificationes push
         search: Cercar
@@ -63,15 +65,23 @@ ia:
           applications: Applicationes
           oauth2_provider: Fornitor OAuth2
     scopes:
+      admin:read: leger tote le datos in le servitor
+      read: leger tote le datos de tu conto
+      read:accounts: vider informationes de conto
       read:favourites: vider tu favoritos
+      read:filters: vider tu filtros
       read:lists: vider tu listas
       read:notifications: vider tu notificationes
+      read:reports: vider tu reportos
       read:statuses: vider tote le messages
       write:accounts: modificar tu profilo
       write:blocks: blocar contos e dominios
+      write:conversations: silentiar e deler conversationes
       write:favourites: messages favorite
       write:filters: crear filtros
+      write:follows: sequer personas
       write:lists: crear listas
       write:media: incargar files de medios
+      write:mutes: silentiar personas e conversationes
       write:notifications: rader tu notificationes
       write:statuses: publicar messages
diff --git a/config/locales/doorkeeper.lad.yml b/config/locales/doorkeeper.lad.yml
index f52bac39c29876..b2c140b9c23c54 100644
--- a/config/locales/doorkeeper.lad.yml
+++ b/config/locales/doorkeeper.lad.yml
@@ -130,7 +130,7 @@ lad:
         favourites: Favoritos
         filters: Filtros
         follow: Segimientos, silensiasyones i blokos
-        follows: Segimientos
+        follows: Segimyentos
         lists: Listas
         media: Aneksos de multimedia
         mutes: Silensiasyones
diff --git a/config/locales/doorkeeper.tr.yml b/config/locales/doorkeeper.tr.yml
index fce8c646e818c6..2dde5f63227619 100644
--- a/config/locales/doorkeeper.tr.yml
+++ b/config/locales/doorkeeper.tr.yml
@@ -15,7 +15,7 @@ tr:
               fragment_present: parça içeremez.
               invalid_uri: geçerli bir URL olmalıdır.
               relative_uri: mutlaka bir URL olmalıdır.
-              secured_uri: HTTPS/SSL URL olması gerekir.
+              secured_uri: HTTPS/SSL URI olması gerekir.
   doorkeeper:
     applications:
       buttons:
@@ -84,7 +84,7 @@ tr:
         credential_flow_not_configured: Kaynak Sahibi Parolası Kimlik Bilgileri akışı Doorkeeper.configure.resource_owner_from_credentials 'ın yapılandırılmamış olması nedeniyle başarısız oldu.
         invalid_client: İstemcinin kimlik doğrulaması bilinmeyen istemci, istemci kimlik doğrulamasının dahil olmaması veya desteklenmeyen kimlik doğrulama yöntemi nedeniyle başarısız oldu.
         invalid_grant: Sağlanan yetkilendirme izni geçersiz, süresi dolmuş, iptal edilmiş, yetkilendirme isteğinde kullanılan yönlendirme URL'siyle eşleşmiyor veya başka bir istemciye verilmiş.
-        invalid_redirect_uri: Dahil edilmiş yönlendirme URL'si geçersiz.
+        invalid_redirect_uri: Dahil edilmiş yönlendirme uri'si geçersiz.
         invalid_request:
           missing_param: 'Gerekli parametre eksik: %{value}.'
           request_not_authorized: İsteğin yetkilendirilmesi gerekiyor. İsteği yetkilendirmek için gereken parametre eksik veya geçersiz.
@@ -128,7 +128,7 @@ tr:
         conversations: Sohbetler
         crypto: Uçtan uca şifreleme
         favourites: Favoriler
-        filters: Filtreler
+        filters: Süzgeçler
         follow: Takipler, Sessizler ve Engeller
         follows: Takip edilenler
         lists: Listeler
@@ -161,7 +161,7 @@ tr:
       admin:write:domain_allows: alan adı izinleri için denetleme eylemleri gerçekleştirin
       admin:write:domain_blocks: alan adı engellemeleri için denetleme eylemleri gerçekleştirin
       admin:write:email_domain_blocks: e-posta alan adı engellemeleri için denetleme eylemleri gerçekleştirin
-      admin:write:ip_blocks: IP engellemeleri için denetleme eylemleri gerçekleştirin
+      admin:write:ip_blocks: IP blokları üzerinde moderasyon eylemleri gerçekleştir
       admin:write:reports: raporlarda denetleme eylemleri gerçekleştirin
       crypto: uçtan uca şifreleme kullan
       follow: hesap ilişkilerini değiştirin
@@ -171,7 +171,7 @@ tr:
       read:blocks: engellemelerinizi görün
       read:bookmarks: yer imlerinizi görün
       read:favourites: favorilerinizi görün
-      read:filters: filtrelerinizi görün
+      read:filters: süzgeçlerinizi görün
       read:follows: takip ettiklerinizi görün
       read:lists: listelerinizi görün
       read:mutes: sessize aldıklarınızı görün
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index b11c6de11f6d0f..d4840c84e99bb1 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -425,6 +425,7 @@ en-GB:
       view: View domain block
     email_domain_blocks:
       add_new: Add new
+      allow_registrations_with_approval: Allow registrations with approval
       attempts_over_week:
         one: "%{count} attempt over the last week"
         other: "%{count} sign-up attempts over the last week"
@@ -1545,6 +1546,9 @@ en-GB:
     errors:
       limit_reached: Limit of different reactions reached
       unrecognized_emoji: is not a recognised emoji
+  redirects:
+    prompt: If you trust this link, click it to continue.
+    title: You are leaving %{instance}.
   relationships:
     activity: Account activity
     confirm_follow_selected_followers: Are you sure you want to follow selected followers?
@@ -1607,6 +1611,7 @@ en-GB:
       unknown_browser: Unknown Browser
       weibo: Weibo
     current_session: Current session
+    date: Date
     description: "%{browser} on %{platform}"
     explanation: These are the web browsers currently logged in to your Mastodon account.
     ip: IP
@@ -1773,16 +1778,27 @@ en-GB:
     webauthn: Security keys
   user_mailer:
     appeal_approved:
+      action: Account Settings
       explanation: The appeal of the strike against your account on %{strike_date} that you submitted on %{appeal_date} has been approved. Your account is once again in good standing.
       subject: Your appeal from %{date} has been approved
+      subtitle: Your account is once again in good standing.
       title: Appeal approved
     appeal_rejected:
       explanation: The appeal of the strike against your account on %{strike_date} that you submitted on %{appeal_date} has been rejected.
       subject: Your appeal from %{date} has been rejected
+      subtitle: Your appeal has been rejected.
       title: Appeal rejected
     backup_ready:
+      explanation: You requested a full backup of your Mastodon account.
+      extra: It's now ready for download!
       subject: Your archive is ready for download
       title: Archive takeout
+    failed_2fa:
+      details: 'Here are details of the sign-in attempt:'
+      explanation: Someone has tried to sign in to your account but provided an invalid second authentication factor.
+      further_actions_html: If this wasn't you, we recommend that you %{action} immediately as it may be compromised.
+      subject: Second factor authentication failure
+      title: Failed second factor authentication
     suspicious_sign_in:
       change_password: change your password
       details: 'Here are details of the login:'
@@ -1836,6 +1852,7 @@ en-GB:
     go_to_sso_account_settings: Go to your identity provider's account settings
     invalid_otp_token: Invalid two-factor code
     otp_lost_help_html: If you lost access to both, you may get in touch with %{email}
+    rate_limited: Too many authentication attempts, try again later.
     seamless_external_login: You are logged in via an external service, so password and e-mail settings are not available.
     signed_in_as: 'Logged in as:'
   verification:
diff --git a/config/locales/es-MX.yml b/config/locales/es-MX.yml
index 4d228e98d477f4..a8b918a8fef911 100644
--- a/config/locales/es-MX.yml
+++ b/config/locales/es-MX.yml
@@ -1548,7 +1548,7 @@ es-MX:
       unrecognized_emoji: no es un emoji conocido
   redirects:
     prompt: Si confías en este enlace, púlsalo para continuar.
-    title: Vas a salir de %{instance}.
+    title: Estás saliendo de %{instance}.
   relationships:
     activity: Actividad de la cuenta
     confirm_follow_selected_followers: "¿Estás seguro de que quieres seguir a las cuentas seleccionadas?"
diff --git a/config/locales/et.yml b/config/locales/et.yml
index f82ee6cb8f6e95..c21ea0b971264a 100644
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -1546,6 +1546,9 @@ et:
     errors:
       limit_reached: Jõutud on erinevate reaktsioonide limiidini
       unrecognized_emoji: ei ole tuntud emotikoon
+  redirects:
+    prompt: Kui te usaldate seda linki, klõpsake sellele, et jätkata.
+    title: Te lahkute %{instance}.
   relationships:
     activity: Konto tegevus
     confirm_follow_selected_followers: Oled kindel, et soovid jälgida valitud jälgijaid?
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index 444d0e2c5fb8b4..7acccea006dd43 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -336,7 +336,7 @@ eu:
       not_permitted: Ez daukazu ekintza hau burutzeko baimenik
       overwrite: Gainidatzi
       shortcode: Laster-kodea
-      shortcode_hint: Gutxienez 2 karaktere, alfanumerikoak eta azpimarra  besterik ez
+      shortcode_hint: Gutxienez 2 karaktere, alfanumerikoak eta azpimarrak soilik
       title: Emoji pertsonalak
       uncategorized: Kategoriarik gabe
       unlist: Kendu zerrendatik
@@ -1703,8 +1703,8 @@ eu:
     title: '%{name}: "%{quote}"'
     visibilities:
       direct: Zuzena
-      private: Jarraitzaileak besterik ez
-      private_long: Erakutsi jarraitzaileei besterik ez
+      private: Jarraitzaileak soilik
+      private_long: Erakutsi jarraitzaileei soilik
       public: Publikoa
       public_long: Edonork ikusi dezake
       unlisted: Zerrendatu gabea
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 856532f8f13b7b..15f448bc91d6ae 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -387,7 +387,7 @@ fi:
         cancel: Peruuta
         confirm: Jäädytä
         permanent_action: Jäädytyksen kumoaminen ei palauta mitään tietoja tai suhteita.
-        preamble_html: Olet jäädyttämässä verkkotunnuksen <strong>%{domain}</strong> ja sen aliverkkotunnukset.
+        preamble_html: Olet jäädyttämässä verkkotunnuksen <strong>%{domain}</strong> aliverkkotunnuksineen.
         remove_all_data: Tämä toiminto poistaa palvelimeltasi kaiken sisällön, median ja profiilitiedot tämän palvelun tileiltä.
         stop_communication: Palvelimesi lopettaa viestinnän näiden palvelinten kanssa.
         title: Vahvista verkkotunnuksen %{domain} esto
@@ -831,7 +831,7 @@ fi:
         suspend: "%{name} jäädytti käyttäjän %{target} tilin"
       appeal_approved: Valitti
       appeal_pending: Valitus vireillä
-      appeal_rejected: Muutoksenhaku hylättiin
+      appeal_rejected: Vetoomus hylättiin
     system_checks:
       database_schema_check:
         message_html: Tietokannan siirto on vireillä. Suorita ne varmistaaksesi, että sovellus toimii odotetulla tavalla
@@ -1043,10 +1043,10 @@ fi:
     confirmations:
       awaiting_review: Sähköpostiosoitteesi on vahvistettu! Seuraavaksi palvelimen %{domain} ylläpito tarkistaa rekisteröitymisesi, ja saat lopuksi ilmoituksen sähköpostitse, jos tilisi hyväksytään!
       awaiting_review_title: Rekisteröitymisesi on tarkistettavana
-      clicking_this_link: tästä linkistä
+      clicking_this_link: napsauttaa tätä linkkiä
       login_link: kirjautumalla sisään
       proceed_to_login_html: Voit nyt jatkaa %{login_link}.
-      redirect_to_app_html: Sinun olisi pitänyt ohjautua sovellukseen <strong>%{app_name}</strong>. Jos näin ei tapahtunut, yritä avata se %{clicking_this_link} tai palaa sovellukseen manuaalisesti.
+      redirect_to_app_html: Sinun olisi pitänyt ohjautua sovellukseen <strong>%{app_name}</strong>. Jos näin ei tapahtunut, voit %{clicking_this_link} tai palata sovellukseen käsikäyttöisesti.
       registration_complete: Rekisteröitymisesi palvelimelle %{domain} on nyt valmis!
       welcome_title: Tervetuloa, %{name}!
       wrong_email_hint: Jos sähköpostiosoite ei ole oikein, voit muuttaa sen tilin asetuksista.
@@ -1547,7 +1547,7 @@ fi:
       limit_reached: Erilaisten reaktioiden raja saavutettu
       unrecognized_emoji: ei ole tunnistettu emoji
   redirects:
-    prompt: Jos luotat tähän linkkiin, jatka napsauttamalla.
+    prompt: Mikäli luotat linkkiin, jatka napsauttaen sitä.
     title: Olet poistumassa palvelimelta %{instance}.
   relationships:
     activity: Tilin aktiivisuus
@@ -1560,7 +1560,7 @@ fi:
     followers: Seuraajat
     following: Seuratut
     invited: Kutsutut
-    last_active: Viimeksi aktiivinen
+    last_active: Viimeksi aktiiviset
     most_recent: Viimeisimmät
     moved: Muuttaneet
     mutual: Seuraatte toisianne
@@ -1794,11 +1794,11 @@ fi:
       subject: Arkisto on valmiina ladattavaksi
       title: Arkiston tallennus
     failed_2fa:
-      details: 'Tässä on tietoja kirjautumisyrityksestä:'
-      explanation: Joku on yrittänyt kirjautua tilillesi mutta on antanut virheellisen toisen vaiheen todennustekijän.
+      details: 'Sisäänkirjautumispyrkimyksen yksityiskohtaiset tiedot:'
+      explanation: Joku on yrittänyt kirjautua tilillesi antaen väärän toisen todennustunnisteen.
       further_actions_html: Jos se et ollut sinä, suosittelemme, että %{action} välittömästi, sillä se on saattanut vaarantua.
       subject: Kaksivaiheisen todennuksen virhe
-      title: Epäonnistunut kaksivaiheinen todennus
+      title: Kaksivaihekirjautumisen toinen vaihe epäonnistui
     suspicious_sign_in:
       change_password: vaihda salasanasi
       details: 'Tässä on tiedot kirjautumisesta:'
@@ -1852,7 +1852,7 @@ fi:
     go_to_sso_account_settings: Avaa identiteettitarjoajasi tiliasetukset
     invalid_otp_token: Virheellinen kaksivaiheisen todentamisen koodi
     otp_lost_help_html: Jos sinulla ei ole pääsyä kumpaankaan, voit ottaa yhteyden osoitteeseen %{email}
-    rate_limited: Liian monta todennusyritystä. Yritä myöhemmin uudelleen.
+    rate_limited: Liian monta todennusyritystä – yritä uudelleen myöhemmin.
     seamless_external_login: Olet kirjautunut ulkoisen palvelun kautta, joten salasana- ja sähköpostiasetukset eivät ole käytettävissä.
     signed_in_as: 'Kirjautunut tilillä:'
   verification:
diff --git a/config/locales/fy.yml b/config/locales/fy.yml
index c59ad72725890f..2cbb69010d45d4 100644
--- a/config/locales/fy.yml
+++ b/config/locales/fy.yml
@@ -1546,6 +1546,9 @@ fy:
     errors:
       limit_reached: Limyt fan ferskate emoji-reaksjes berikt
       unrecognized_emoji: is gjin besteande emoji-reaksje
+  redirects:
+    prompt: As jo dizze keppeling fertrouwe, klik der dan op om troch te gean.
+    title: Jo ferlitte %{instance}.
   relationships:
     activity: Accountaktiviteit
     confirm_follow_selected_followers: Binne jo wis dat jo de selektearre folgers folgje wolle?
diff --git a/config/locales/gd.yml b/config/locales/gd.yml
index 521f4fd60d548a..d3dab8273da389 100644
--- a/config/locales/gd.yml
+++ b/config/locales/gd.yml
@@ -439,6 +439,7 @@ gd:
       view: Seall bacadh na h-àrainne
     email_domain_blocks:
       add_new: Cuir tè ùr ris
+      allow_registrations_with_approval: Ceadaich clàradh le aontachadh
       attempts_over_week:
         few: "%{count} oidhirpean clàraidh rè na seachdain seo chaidh"
         one: "%{count} oidhirp clàraidh rè na seachdain seo chaidh"
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 545da69d9cb201..34ae9a21c8d221 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -1548,7 +1548,7 @@ hu:
       unrecognized_emoji: nem ismert emodzsi
   redirects:
     prompt: Ha megbízol ebben a hivatkozásban, kattints rá a folytatáshoz.
-    title: Épp elhagyni készülöd a %{instance} kiszolgálót.
+    title: Elhagyod a(z) %{instance} kiszolgálót.
   relationships:
     activity: Fiók aktivitás
     confirm_follow_selected_followers: Biztos, hogy követni akarod a kiválasztott követőket?
diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index 48a802a2cd3025..bf7da9a314070a 100644
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -33,11 +33,27 @@ ia:
       username: Nomine de usator
     action_logs:
       action_types:
+        create_announcement: Crear annuncio
+        destroy_ip_block: Deler le regula IP
+        destroy_status: Deler le message
+        destroy_unavailable_domain: Deler le dominio non disponibile
+        disable_user: Disactivar le usator
+        enable_user: Activar le usator
         reset_password_user: Reinitialisar contrasigno
+        update_announcement: Actualisar annuncio
+        update_custom_emoji: Actualisar emoji personalisate
+      actions:
+        change_email_user_html: "%{name} cambiava le adresse de e-mail address del usator %{target}"
+        create_announcement_html: "%{name} creava un nove annuncio %{target}"
     announcements:
+      edit:
+        title: Modificar annuncio
+      empty: Necun annuncios trovate.
       new:
         create: Crear annuncio
         title: Nove annuncio
+      publish: Publicar
+      published_msg: Annuncio publicate con successo!
       title: Annuncios
     custom_emojis:
       by_domain: Dominio
@@ -46,9 +62,16 @@ ia:
       delete: Deler
       disable: Disactivar
       disabled: Disactivate
+      enable: Activar
+      enabled: Activate
+      enabled_msg: Emoji activate con successo
+      new:
+        title: Adder nove emoji personalisate
     dashboard:
       active_users: usatores active
+      media_storage: Immagazinage de medios
       new_users: nove usatores
+      opened_reports: reportos aperte
       website: Sito web
     domain_allows:
       add_new: Permitter federation con dominio
@@ -58,9 +81,14 @@ ia:
       domain: Dominio
       export: Exportar
       import: Importar
+      private_comment: Commento private
+      public_comment: Commento public
     email_domain_blocks:
       add_new: Adder nove
       delete: Deler
+      domain: Dominio
+      new:
+        create: Adder un dominio
     export_domain_allows:
       no_file: Necun file seligite
     follow_recommendations:
@@ -79,6 +107,7 @@ ia:
       filter:
         available: Disponibile
     ip_blocks:
+      add_new: Crear regula
       delete: Deler
       expires_in:
         '1209600': 2 septimanas
@@ -95,8 +124,118 @@ ia:
       enable: Activar
       enabled: Activate
     reports:
+      add_to_report: Adder plus al reporto
       are_you_sure: Es tu secur?
       cancel: Cancellar
+      delete_and_resolve: Deler le messages
+      notes:
+        delete: Deler
+      skip_to_actions: Saltar al actiones
+      status: Stato
+      updated_at: Actualisate
+      view_profile: Vider profilo
+    roles:
+      everyone: Permissiones predefinite
+      privileges:
+        manage_users: Gerer usatores
+    rules:
+      delete: Deler
+    settings:
+      about:
+        title: A proposito de
+      appearance:
+        preamble: Personalisar le interfacie web de Mastodon.
+        title: Apparentia
+      discovery:
+        profile_directory: Directorio de profilos
+        public_timelines: Chronologias public
+        trends: Tendentias
+      title: Parametros de servitor
+    site_uploads:
+      delete: Deler file incargate
+    statuses:
+      language: Lingua
+      metadata: Metadatos
+      open: Aperir message
+      original_status: Message original
+      title: Messages del conto
+      trending: Tendentias
+      visibility: Visibilitate
+    strikes:
+      actions:
+        none: "%{name} ha inviate un advertimento a %{target}"
+    system_checks:
+      rules_check:
+        action: Gerer le regulas del servitor
+      software_version_critical_check:
+        action: Vider le actualisationes disponibile
+      software_version_patch_check:
+        action: Vider le actualisationes disponibile
+      upload_check_privacy_error:
+        action: Verifica hic pro plus de information
+  edit_profile:
+    other: Alteres
+  existing_username_validator:
+    not_found_multiple: non poteva trovar %{usernames}
+  exports:
+    archive_takeout:
+      date: Data
+      download: Discargar tu archivo
+      size: Dimension
+    blocks: Tu ha blocate
+    bookmarks: Marcapaginas
+    csv: CSV
+    mutes: Tu ha silentiate
+    storage: Immagazinage de medios
+  featured_tags:
+    add_new: Adder nove
+  filters:
+    contexts:
+      account: Profilos
+      home: Pagina de initio e listas
+      notifications: Notificationes
+      public: Chronologias public
+      thread: Conversationes
+    edit:
+      add_keyword: Adder parola clave
+      keywords: Parolas clave
+      statuses: Messages individual
+      title: Modificar filtro
+    index:
+      delete: Deler
+  generic:
+    all: Toto
+    cancel: Cancellar
+    changes_saved_msg: Cambios salveguardate con successo!
+    confirm: Confirmar
+    copy: Copiar
+    delete: Deler
+    order_by: Ordinar per
+    save_changes: Salvar le cambios
+    today: hodie
+  imports:
+    errors:
+      empty: File CSV vacue
+      too_large: Le file es troppo longe
+    failures: Fallimentos
+    status: Stato
+    types:
+      lists: Listas
+  invites:
+    expires_in:
+      '1800': 30 minutas
+      '21600': 6 horas
+      '3600': 1 hora
+      '43200': 12 horas
+      '604800': 1 septimana
+      '86400': 1 die
+    expires_in_prompt: Nunquam
+  login_activities:
+    authentication_methods:
+      password: contrasigno
+  migrations:
+    errors:
+      not_found: non poterea esser trovate
   statuses_cleanup:
     min_age:
       '1209600': 2 septimanas
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 9f4f1343c7e40d..2e354828bd2875 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -525,7 +525,7 @@ ko:
       total_followed_by_us: 우리가 한 팔로우
       total_reported: 이들에 대한 신고
       total_storage: 미디어 첨부
-      totals_time_period_hint_html: 아래에 표시된 총계에는 모든 시간에 대한 데이터가 포함됩니다.
+      totals_time_period_hint_html: 아래에 표시된 총계는 역대 데이터에 대한 것입니다.
       unknown_instance: 현재 이 서버에서 해당 도메인에 대한 기록은 없습니다.
     invites:
       deactivate_all: 전부 비활성화
diff --git a/config/locales/lad.yml b/config/locales/lad.yml
index 02308cf2f0c582..d4f772095e096e 100644
--- a/config/locales/lad.yml
+++ b/config/locales/lad.yml
@@ -18,6 +18,9 @@ lad:
     nothing_here: No ay niente aki!
     pin_errors:
       following: Deves estar sigiendo a la persona a la ke keres achetar
+    posts:
+      one: Publikasyon
+      other: Publikasyones
     posts_tab_heading: Publikasyones
   admin:
     account_actions:
@@ -82,7 +85,7 @@ lad:
         title: Lokalizasyon
       login_status: Estado de koneksyon kon kuento
       media_attachments: Aneksos de multimedia
-      memorialize: Konvirtir en memorial
+      memorialize: Konvirte en memorial
       memorialized: Kuento komemorativo
       memorialized_msg: "%{username} se konvirtido kon sukseso en un kuento komemorativo"
       moderation:
@@ -106,14 +109,14 @@ lad:
       previous_strikes_description_html:
         one: Este kuento tiene <strong>un</strong> amonestamiento.
         other: Este kuento tiene <strong>%{count}</strong> amonestamientos.
-      promote: Promosyonar
+      promote: Promosyona
       protocol: Protokol
       public: Publiko
       push_subscription_expires: Ekspirasyon del abonamiento PuSH
-      redownload: Arefreskar profil
+      redownload: Arefreska profil
       redownloaded_msg: Se aktualizo djustamente el profil de %{username} dizde el orijin
       reject: Refuza
-      rejected_msg: La solisitasyon de enrejistrasyon de %{username} a sido refuzada kon sukseso
+      rejected_msg: La solisitasyon de enrejistrasyon de %{username} tyene sido refuzada kon sukseso
       remote_suspension_irreversible: Los datos de este kuento fueron irreversivlemente supremidos.
       remote_suspension_reversible_hint_html: El kuento fue suspendido en este sirvidor i los datos seran totalmente supremidos el %{date}. Asta estonses el sirvidor remoto puede restaurar este kuento sin dingun efekto negativo. Si keres supremir todos los datos del kuento pishin, puedes fazerlo a kontinuasyon.
       remove_avatar: Efasa imaje de profil
@@ -288,7 +291,7 @@ lad:
       empty: No se toparon rejistros.
       filter_by_action: Filtra por aksion
       filter_by_user: Filtra por utilizador
-      title: Log de revizyon
+      title: Defter de revizyon
     announcements:
       destroyed_msg: Pregon supremido kon sukseso!
       edit:
@@ -303,12 +306,12 @@ lad:
       scheduled_for: Programado para %{time}
       scheduled_msg: Pregon programado para su publikasyon!
       title: Pregones
-      unpublish: Retirar publikasyon
+      unpublish: Retira publikasyon
       unpublished_msg: Pregon retirado kon sukseso!
       updated_msg: Pregon aktualizado kon sukseso!
     critical_update_pending: Aktualizasyon kritika esta asperando
     custom_emojis:
-      assign_category: Asinyar kategoria
+      assign_category: Asinya kategoria
       by_domain: Domeno
       copied_msg: Kopia lokala del emoji kriyada kon sukseso
       copy: Kopia
@@ -328,7 +331,7 @@ lad:
       list: Lista
       listed: Listados
       new:
-        title: Adjustar muevo emoji personalizado
+        title: Adjusta muevo emoji personalizado
       no_emoji_selected: No se troko dingun emoji porke no eskojites dinguno
       not_permitted: No tienes permiso para realizar esta aksyon
       overwrite: Sobreskrive
@@ -506,8 +509,8 @@ lad:
         all: Todos
         clear: Alimpiar yerros de entrega
         failing: Fayando
-        restart: Reinisyar entrega
-        stop: Detener entrega
+        restart: Reinisya entrega
+        stop: Deten entrega
         unavailable: No desponivle
       delivery_available: Entrega desponivle
       delivery_error_days: Diyas de yerro de entrega
@@ -632,7 +635,7 @@ lad:
       reported_by: Raportado por
       resolved: Rezolvido
       resolved_msg: Tienes rezolvido la denunsia djustamente!
-      skip_to_actions: Ir direktamente a las aksyones
+      skip_to_actions: Va direktamente a las aksyones
       status: Estado
       statuses: Kontenido raportado
       statuses_description_html: El kontenido ofensivo se sitara en la komunikasyon kon el kuento raportado
@@ -643,12 +646,12 @@ lad:
           silence_html: 'Vas <strong>limitar</strong> el kuento de <strong>@%{acct}</strong>''''. Esto va:'
           suspend_html: 'Vas <strong>suspender</strong> el kuento de <strong>@%{acct}</strong>''''. Esto va:'
         actions:
-          delete_html: Kitar las publikasyones ofensivas
-          mark_as_sensitive_html: Markar los multimedios de la publikasyon komo sensivles
-          silence_html: Severamente limitar la vizivilita de <strong>@%{acct}</strong>, fazendo su profil i kontenido vizivles solo para las personas ke ya lo sigen o manualmente bushkan su profil
-          suspend_html: Suspender <strong>@%{acct}</strong>, faziendo su profil i kontenido inaksesivle i no disponivle para interaksiones
-        close_report: 'Markar raporto #%{id} komo rezolvido'
-        close_reports_html: Markar <strong>todos</strong> los raportos kontra <strong>@%{acct}</strong> komo rezolvidos
+          delete_html: Kita las publikasyones ofensivas
+          mark_as_sensitive_html: Marka los multimedios de la publikasyon komo sensivles
+          silence_html: Severamente limita la vizivilita de <strong>@%{acct}</strong>, fazendo su profil i kontenido vizivles solo para las personas ke ya lo sigen o manualmente bushkan su profil
+          suspend_html: Suspende <strong>@%{acct}</strong>, faziendo su profil i kontenido inaksesivle i no disponivle para interaksiones
+        close_report: 'Marka raporto #%{id} komo rezolvido'
+        close_reports_html: Marka <strong>todos</strong> los raportos kontra <strong>@%{acct}</strong> komo rezolvidos
         delete_data_html: Efasa el profil i kontenido de <strong>@%{acct}</strong> en 30 dias si no sea desuspendido en akel tiempo
         preview_preamble_html: "<strong>@%{acct}</strong> resivira una avertensya komo esta:"
         record_strike_html: Enrejistra un amonestamiento kontra <strong>@%{acct}</strong> para ke te ayude eskalar las violasyones de reglas de este kuento en el avenir
@@ -656,7 +659,7 @@ lad:
         warning_placeholder: Adisionalas, opsionalas razones la aksyon de moderasyon.
       target_origin: Orijin del kuento raportado
       title: Raportos
-      unassign: Dezasinyar
+      unassign: Dezasinya
       unknown_action_msg: 'Aksyon no konesida: %{action}'
       unresolved: No rezolvido
       updated_at: Aktualizado
@@ -742,6 +745,7 @@ lad:
         preamble: La marka de tu sirvidor lo desferensia de otros sirvidores de la red. Esta enformasyon puede amostrarse por una varieta de entornos, komo en la enterfaz web de Mastodon, en aplikasyones nativas, en previsualizasiones de atadijos en otros sitios internetikos i en aplikasyones de mesajes, etc. Por esta razon, es mijor mantener esta enformasyon klara, breve i konsiza.
         title: Marka
       captcha_enabled:
+        desc_html: Esto se baza en eskriptos eksternos de hCaptcha, ke pueden ser una influensya negra a la sigurita i privasita. Ademas, <strong>esto puede rezultar en un proseso de enrejistrasyon signifikativamente manko aksesivle para algunas personas (espesyalmente diskapasitadas)</strong>. Por estas razones, por favor, konsidera otras alternativas komo rejistrasyon por aprovasyon manuala o kon envitasyon.
         title: Solisita ke los muevos utilizadores rezolven un CAPTCHA para konfirmar su konto
       content_retention:
         preamble: Kontrola komo el kontenido jenerado por el utilizador se magazina en Mastodon.
@@ -771,6 +775,8 @@ lad:
           none: Permete a los utilizadores trokar la konfigurasyon del sitio
           open: Kualkiera puede enrejistrarse
       security:
+        authorized_fetch: Rekere autentifikasyon de sirvidores federados
+        authorized_fetch_hint: Rekerir autentifikasyon de sirvidores federados permite un forsamyento mas estrikto de los blokos a nivel de utilizador i a nivel de sirvidor. Malgrado esto, el koste de esto es una penalizasyon de efisyensya, reduksyon del alkanse de tus repuestas i puede introduzir problemas de kompatibilita kon algunos sirvisyos federados. Ademas, esto no impidira ke aktores dedikados obtengan tus kuentos publikos i publikasyones publikas.
         authorized_fetch_overridden_hint: Agora no puedes trokar esta konfigurasyon dkee esta sovreeskrita por una variable de entorno.
         federation_authentication: Forzamyento de autentifikasyon para la federasyon
       title: Konfigurasyon del sirvidor
@@ -779,6 +785,7 @@ lad:
       destroyed_msg: Dosya supremida kon sukseso!
     software_updates:
       critical_update: Kritiko – por favor aktualiza pishin
+      description: Rekomendamos ke mantengas aktualizada tu enstalasyon de Mastodon para benefisyar de las muevas koreksyones y funksyones. Ademas, a vezes es kritiko aktualizar Mastodon punktualmente para evitar problemas de sigurita. Por estas razones, Mastodon komprova si ay aktualizasyones kada 30 minutos, i te avizara de akodro a tus preferensyas de avizos por posta elektronika.
       documentation_link: Ambezate mas
       release_notes: Notas sovre la versyon
       title: Aktualizasyones desponivles
@@ -832,11 +839,16 @@ lad:
         message_html: El klaster de Elasticsearch no es sano (estado kolorado), funksyones de bushkeda no estan disponivles
       elasticsearch_health_yellow:
         message_html: El klaster de Elasticsearch no es sano (estado amariyo), es posivle ke keras investigar la razon
+      elasticsearch_index_mismatch:
+        message_html: Las mapas de indeksos Elasticsearch estan dezaktualizadas. Por favor, uza <code>tootctl search deploy --only=%{value}</code>
       elasticsearch_preset:
         action: Ve dokumentasyon
         message_html: Tu klaster de Elasticsearch tiene mas ke un nodo, ama Mastodon no esta konfigurado para uzarlos.
       elasticsearch_preset_single_node:
         action: Ve dokumentasyon
+        message_html: Tu klaster de Elasticsearch solo tyene un nodo, <code>ES_PRESET</code> deve estableserse a <code>single_node_cluster</code>.
+      elasticsearch_reset_chewy:
+        message_html: Tu indekso del sistema Elasticsearch esta dezaktualizado por un trokamyento de konfigurasyon. Por favor uza <code>tootctl search deploy --reset-chewy</code> para aktualizarlo.
       elasticsearch_running_check:
         message_html: No se pudo konektar a Elasticsearch. Por favor, averigua ke esta egzekutandose, o dezaktiva la bushkeda de teksto kompleto
       elasticsearch_version_check:
@@ -1089,6 +1101,7 @@ lad:
       preamble_html: Konektate kon tus kredensiales de <strong>%{domain}</strong>. Si tu kuento esta balabayado en otruno servidor, no puedras konektarte aki.
       title: Konektate kon %{domain}
     sign_up:
+      manual_review: Las enrejistrasyones en %{domain} pasan por la revizyon manuala de muestros moderadores. Para ayudarmos a prosesar tu enrejistrasyon, eskrive un poko sovre ti i por ke keres un kuento en %{domain}.
       preamble: Kon un kuento en este sirvidor de Mastodon, podras segir a kualkier otra persona en la red, endependientemente del sirvidor en el ke se tope.
       title: Kriya kuento de Mastodon en %{domain}.
     status:
@@ -1103,7 +1116,7 @@ lad:
     use_security_key: Uza la yave de sigurita
   challenge:
     confirm: Kontinua
-    hint_html: "<strong>Tip:</strong> No retornaremos a demandarte por el kod durante la sigiente ora."
+    hint_html: "<strong>Konsejo:</strong> No retornaremos a demandarte por el kod durante la sigiente ora."
     invalid_password: Kod inkorekto
     prompt: Konfirma kod para segir
   crypto:
@@ -1179,6 +1192,7 @@ lad:
     invalid_domain: no es un nombre de domeno valido
   edit_profile:
     basic_information: Enformasyon bazika
+    hint_html: "<strong>Personaliza lo ke la djente ve en tu profil publiko i kon tus publikasyones.</strong> Es mas probavle ke otras personas te sigan i enteraktuen kontigo kuando kompletas tu profil i foto."
     other: Otros
   errors:
     '400': La solisitasyon ke enviates no fue valida o fue malformada.
@@ -1258,9 +1272,16 @@ lad:
       batch:
         remove: Kita del filtro
       index:
+        hint: Este filtro se aplika a la seleksyon de publikasyones individualas independentemente de otros kriteryos. Puedes adjustar mas publikasyones a este filtro dizde la enterfaz de web.
         title: Publikasyones filtradas
   generic:
     all: Todos
+    all_items_on_page_selected_html:
+      one: "<strong>%{count}</strong> elemento en esta pajina esta eskojido."
+      other: Todos los <strong>%{count}</strong> elementos en esta pajina estan eskojidos.
+    all_matching_items_selected_html:
+      one: "<strong>%{count}</strong> elemento ke koenside con tu bushkeda esta eskojido."
+      other: Todos los <strong>%{count}</strong> elementos ke koensiden con tu bushkeda estan eskojidos.
     cancel: Anula
     changes_saved_msg: Trokamientos guadrados kon reusho!
     confirm: Konfirma
@@ -1286,6 +1307,7 @@ lad:
       too_large: Dosya es mas grande
     failures: Yerros
     imported: Importado
+    mismatched_types_warning: Parese ke podrias eskojer el tipo inkorekto para este importo, por favor verifikalo de muevo.
     modes:
       merge: Une
       merge_long: Manten rejistros egzistentes i adjusta muevos
@@ -1303,6 +1325,7 @@ lad:
       bookmarks_html: Estas a punto de adjustar asta <strong>%{total_items} publikasyones</strong> de <strong>%{filename}</strong> a tus <strong>markadores</strong>.
       domain_blocking_html: Estas a punto de <strong>blokar</strong> asta <strong>%{total_items} domenos </strong> de <strong>%{filename}</strong>.
       following_html: Estas a punto de <strong>segir</strong> asta <strong>%{total_items} kuentos </strong> de <strong>%{filename}</strong>.
+      lists_html: Estas a punto de adjustar <strong>%{total_items} kuentos</strong> dizde <strong>%{filename}</strong> a tus <strong>listas</strong>. Se kriyaran muevas listas si no ay listas para adjustarlas.
       muting_html: Estas a punto de <strong>silensyar</strong> asta <strong>%{total_items} kuentos </strong> de <strong>%{filename}</strong>.
     preface: Puedes importar siertos datos, komo todas las personas a las kualas estas sigiendo o blokando en tu kuento en esta instansya, dizde dosyas eksportadas de otra instansya.
     recent_imports: Importasyones resyentes
@@ -1374,6 +1397,7 @@ lad:
     unsubscribe:
       action: Si, dezabona
       complete: Dezabonado
+      confirmation_html: Estas siguro de ke ya no keres risivir %{type} de Mastodon en %{domain} a tu posta elektronika %{email}? Syempre podras reabonarte dizde las <a href="%{settings_path}"> opsyones de avizos por posta.</a>.
       emails:
         notification_emails:
           favourite: avizos de favoritos por posta
@@ -1381,6 +1405,8 @@ lad:
           follow_request: avizos de solisitasyones de segimyento por posta
           mention: avizos de enmentaduras por posta
           reblog: avizos de repartajasyones por posta
+      resubscribe_html: Si tyenes deabonado por yerro, puedes reabonar en tus <a href="%{settings_path}">opsyones de avizos por posta elektronika</a>.
+      success_html: Ya no risiviras %{type} de Mastodon en %{domain} a tu posta en %{email}.
       title: Dezabona
   media_attachments:
     validations:
@@ -1506,9 +1532,13 @@ lad:
     posting_defaults: Konfigurasyon predeterminada de publikasyones
     public_timelines: Linyas de tiempo publikas
   privacy:
+    hint_html: "<strong>Personaliza el diskuvrimyento de tu profil y tus publikasyones.</strong> En Mastodon tyenes distinktas funksyones ke te ayudaran a alkansar una audiensya mas ancha si las aktivas. Reviza estas opsyones por un momento para estar siguro ke kaven tus nesesidades."
     privacy: Privasita
+    privacy_hint_html: Kontrola kuanto keres revelar a otros. Las personas diskuvren profiles i aplikasyones interesantes navigando por los suivantes de otras personas i vyendo dizde ke aplikasyones publikan, ama puede ke preferas mantenerlo eskondido.
     reach: Alkanse
+    reach_hint_html: Kontrola si keres ke te diskuvren i sigen muevas personas. Keres ke tus publikasyones se amostren en la seksyon de Eksplorasyon? Keres que tu kuento este rekomendado a otras personas? Keres achetar otomatikamente a todos los muevos suivantes o tener kontrol sovre kada uno de eyos?
     search: Bushkeda
+    search_hint_html: Kontrola komo keres ke te topen. Keres ke otras personas te topan por lo ke tyenes publikado publikamente? Keres ke las personas de fuera de Mastodon topen tu profil al bushkar en la web? Por favor, akodrate de ke la ekskluzyon totala de todos los bushkadores no puede ser garantizada para enformasyon publika.
     title: Privasita i alkanse
   privacy_policy:
     title: Politika de privasita
@@ -1555,6 +1585,7 @@ lad:
     over_total_limit: Tienes superado el limito de %{limit} publikasyones programadas
     too_soon: La data programada deve estar en el avenir
   self_destruct:
+    lead_html: Malorozamente, <strong>%{domain}</strong> va serrar permanentemente. Si teniyas un kuento ayi, ya no podras utilizarlo, ama ainda puedes solisitar una kopya de tus datos.
     title: Este sirvidor esta serrando
   sessions:
     activity: Ultima aktivita
@@ -1728,6 +1759,7 @@ lad:
       with_time_zone: "%d de %b del %Y, %H:%M %Z"
   translation:
     errors:
+      quota_exceeded: La kuota de uzo del sirvisyo de traduksyon para todo el sirvidor tiene sido sovrepasada.
       too_many_requests: Ay demaziadas solisitudes de servisyo de traduksyon.
   two_factor_authentication:
     add: Adjusta
@@ -1740,7 +1772,7 @@ lad:
     lost_recovery_codes: Los kodiches de rekuperasyon te permeten obtener akseso a tu kuento si piedres tu telefon. Si tienes pedrido tus kodiches de rekuperasyon, puedes redjenerarlos aki. Tus viejos kodiches de rekuperasyon se aran malatos.
     methods: Metodos de autentifikasyon de dos pasos
     otp: Aplikasyon de autentifikasyon
-    recovery_codes: Fazer kopias de sigurita de tus kodiches de rekuperasyon
+    recovery_codes: Faz kopias de sigurita de tus kodiches de rekuperasyon
     recovery_codes_regenerated: Kodiches de rekupersayon redjenerados kon sukseso
     recovery_instructions_html: Si piedres akseso a tu telefon, puedes uzar uno de los sigientes kodiches de rekuperasyon para obtener akseso a tu kuento. <strong>Mantenlos a salvo</strong>. Por enshemplo, puedes imprimirlos i guadrarlos kon otros dokumentos emportantes.
     webauthn: Yaves de sigurita
@@ -1757,11 +1789,16 @@ lad:
       subtitle: Tu apelasyon fue refuzada.
       title: Apelasyon refuzada
     backup_ready:
+      explanation: Tienes solisitado una kopia de sigurita de tu kuento de Mastodon.
       extra: Agora esta pronto para abashar!
       subject: Tu dosya esta pronta para abashar
       title: Abasha dosya
     failed_2fa:
       details: 'Aki estan los peratim de las provas de koneksyon kon tu kuento:'
+      explanation: Algun ha intentado konektarte kon tu cuenta ama prokuro un sigundo paso de autentifikasyon invalido.
+      further_actions_html: Si no fuites tu, rekomendamos %{action} inmediatamente deke puede estar komprometido.
+      subject: Autentikasyon del sigundo paso sin sukseso
+      title: Autentifikasyon del sigundo paso no reushida
     suspicious_sign_in:
       change_password: troka tu kod
       details: 'Aki estan los peratim de la koneksyon kon tu kuento:'
@@ -1819,7 +1856,10 @@ lad:
     seamless_external_login: Estas konektado por un servisyo eksterno i estonses la konfigurasyon de kod i konto de posta no estan disponivles.
     signed_in_as: 'Konektado komo:'
   verification:
+    extra_instructions_html: <strong>Konsejo:</strong> El atadijo en tu web puede ser invizivle. La parte importante es <code>rel="me"</code>, ke evita la suplantasyon de identita en sitios kon kontenido jenerado por el utilizador. Puedes inkluzo uzar una etiketa <code>atadijo</code> en la kavesera de la pajina en vez de <code>a</code>, ama el HTML deve ser aksesivle sin exekutar JavaScript.
     here_is_how: Ansina es komo
+    hint_html: "<strong>La verifikasyon de identita en Mastodon es para todos.</strong> Bazado en estandardes abiertos, agora i para syempre. Todo lo ke nesesitas es un sitio web propio ke la gente rekonozka. Kuando adjustas un atadijo a este sitio web dizde tu profil, komprovaremos ke el sitio web se ata a tu profil i lo amostraremos vizualmente."
+    instructions_html: Kopia i apega este kodiche en el HTML de tu sitio web. Estonses, adjusta el adreso de tu sitio web en uno de los kutis adisyonales de tu profil dizde la seksyon "Edita profil" i guadra los trokamyentos.
     verification: Verifikasyon
     verified_links: Tus atadijos verifikados
   webauthn_credentials:
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 1d159bf45aedeb..f00cc97fbb9283 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -102,14 +102,27 @@ lt:
       public: Viešas
       push_subscription_expires: PuSH prenumeramivas pasibaigė
       redownload: Perkrauti profilį
+      rejected_msg: Sėkmingai patvirtinta %{username} registracijos paraiška
+      remote_suspension_irreversible: Šios paskyros duomenys negrįžtamai ištrinti.
+      remote_suspension_reversible_hint_html: Paskyra jų serveryje buvo sustabdyta, o duomenys bus visiškai pašalinti %{date}. Iki to laiko nuotolinis serveris gali atkurti šią paskyrą be jokių neigiamų pasekmių. Jei norite iš karto pašalinti visus paskyros duomenis, galite tai padaryti toliau.
       remove_avatar: Panaikinti profilio nuotrauką
       remove_header: Panaikinti antraštę
+      removed_header_msg: Sėkmingai pašalintas %{username} antraštės paveikslėlis
       resend_confirmation:
         already_confirmed: Šis vartotojas jau patvirtintas
+        send: Dar kartą išsiųsti patvirtinimo nuorodą
+        success: Patvirtinimo laiškas sėkmingai išsiųstas!
       reset: Iš naujo
       reset_password: Atkurti slaptažodį
       resubscribe: Per prenumeruoti
+      role: Vaidmuo
       search: Ieškoti
+      search_same_email_domain: Kiti tą patį el. pašto domeną turintys naudotojai
+      search_same_ip: Kiti tą patį IP turintys naudotojai
+      security: Apsauga
+      security_measures:
+        only_password: Tik slaptažodis
+        password_and_2fa: Slaptažodis ir 2FA
       sensitized: Pažymėti kaip jautrią informaciją
       shared_inbox_url: Bendroji gautųjų URL
       show:
@@ -120,13 +133,21 @@ lt:
       statuses: Statusai
       subscribe: Prenumeruoti
       suspended: Užrakintas
+      suspension_irreversible: Šios paskyros duomenys negrįžtamai ištrinti. Galite atšaukti paskyros sustabdymą, kad ja būtų galima naudotis, tačiau nebus atkurti jokie anksčiau turėti duomenys.
+      suspension_reversible_hint_html: Paskyra sustabdyta, o duomenys bus visiškai pašalinti %{date}. Iki to laiko paskyrą galima atkurti be jokių neigiamų pasekmių. Jei norite iš karto pašalinti visus paskyros duomenis, galite tai padaryti toliau.
       title: Vartotojai
+      unblock_email: El. pašto adreso atblokavimas
+      unblocked_email_msg: Sėkmingai atblokuotas %{username} el. pašto adresas
       unconfirmed_email: Nepatvirtintas el pašto adresas
       undo_silenced: Atšaukti užtildymą
       undo_suspension: Atšaukti užrakinimą
+      unsilenced_msg: Sėkmingai panaikintas %{username} paskyros apribojimas
       unsubscribe: Nebeprenumeruoti
+      unsuspended_msg: Sėkmingai panaikintas %{username} paskyros apribojimas
       username: Slapyvardis
+      view_domain: Peržiūrėti domeno santrauką
       warn: Įspėti
+      whitelisted: Leidžiama federacijai
     action_logs:
       title: Audito žurnalas
     custom_emojis:
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index a3657890daeaf1..1c31ed9e2bcd8e 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -1794,10 +1794,10 @@ nl:
       subject: Jouw archief staat klaar om te worden gedownload
       title: Archief ophalen
     failed_2fa:
-      details: 'Hier zijn details van de aanmeldpoging:'
+      details: 'Hier zijn details van de inlogpoging:'
       explanation: Iemand heeft geprobeerd om in te loggen op jouw account maar heeft een ongeldige tweede verificatiefactor opgegeven.
       further_actions_html: Als jij dit niet was, raden we je aan om onmiddellijk %{action} aangezien het in gevaar kan zijn.
-      subject: Tweede factor authenticatiefout
+      subject: Tweestapsverificatiefout
       title: Tweestapsverificatie mislukt
     suspicious_sign_in:
       change_password: je wachtwoord te wijzigen
diff --git a/config/locales/simple_form.af.yml b/config/locales/simple_form.af.yml
index 6c87a7a636bf7a..a7c449f86d678a 100644
--- a/config/locales/simple_form.af.yml
+++ b/config/locales/simple_form.af.yml
@@ -14,6 +14,8 @@ af:
     labels:
       defaults:
         locale: Koppelvlaktaal
+        new_password: Newe wagwoord
+        password: Wagwoord
       featured_tag:
         name: Hutsetiket
       form_admin_settings:
diff --git a/config/locales/simple_form.eu.yml b/config/locales/simple_form.eu.yml
index 6f2bbfd9695df2..ffd3081c937f7e 100644
--- a/config/locales/simple_form.eu.yml
+++ b/config/locales/simple_form.eu.yml
@@ -44,7 +44,7 @@ eu:
         context: Iragazkia aplikatzeko testuinguru bat edo batzuk
         current_password: Segurtasunagatik sartu uneko kontuaren pasahitza
         current_username: Berresteko sartu uneko kontuaren erabiltzaile-izena
-        digest: Jarduerarik gabeko epe luze bat eta gero mezu pertsonalen bat jaso baduzu, besterik ez
+        digest: Jarduerarik gabeko epe luze bat eta gero mezu pertsonalen bat jaso baduzu soilik
         email: Baieztapen e-mail bat bidaliko zaizu
         header: PNG, GIF edo JPG. Gehienez %{size}. %{dimensions}px eskalara txikituko da
         inbox_url: Kopiatu erabili nahi duzun errelearen hasiera orriaren URLa
@@ -126,7 +126,7 @@ eu:
       tag:
         name: Letrak maiuskula/minuskulara aldatu ditzakezu besterik ez, adibidez irakurterrazago egiteko
       user:
-        chosen_languages: Ezer markatzekotan, hautatutako hizkuntzetan dauden tootak besterik ez dira erakutsiko
+        chosen_languages: Markatzean, hautatutako hizkuntzetan dauden tutak besterik ez dira erakutsiko.
         role: Rolak erabiltzaileak dituen baimenak kontrolatzen ditu
       user_role:
         color: Rolarentzat erabiltzaile interfazean erabiliko den kolorea, formatu hamaseitarreko RGB bezala
diff --git a/config/locales/simple_form.fi.yml b/config/locales/simple_form.fi.yml
index 29f2398a90d66c..d208feed6c5721 100644
--- a/config/locales/simple_form.fi.yml
+++ b/config/locales/simple_form.fi.yml
@@ -5,7 +5,7 @@ fi:
       account:
         discoverable: Julkisia julkaisujasi ja profiiliasi voidaan pitää esillä tai suositella Mastodonin eri alueilla ja profiiliasi voidaan ehdottaa toisille käyttäjille.
         display_name: Koko nimesi tai lempinimesi.
-        fields: Kotisivusi, pronominit, ikä, mitä ikinä haluat.
+        fields: Verkkosivustosi, pronominisi, ikäsi ja mitä ikinä haluatkaan ilmoittaa.
         indexable: Julkiset julkaisusi voivat näkyä hakutuloksissa Mastodonissa. Ihmiset, jotka ovat olleet vuorovaikutuksessa julkaisujesi kanssa, voivat etsiä niitä asetuksesta riippumatta.
         note: 'Voit @mainita muita käyttäjiä tai #aihetunnisteita.'
         show_collections: Käyttäjät voivat selata seurattujasi ja seuraajiasi. Käyttäjät, joita seuraat, näkevät joka tapauksessa, että seuraat heitä.
@@ -55,14 +55,14 @@ fi:
         scopes: Mihin sovellusliittymiin sovellus pääsee käsiksi. Jos valitset ylätason laajuuden, sinun ei tarvitse valita yksittäisiä.
         setting_aggregate_reblogs: Älä näytä uusia tehostuksia julkaisuille, joita on äskettäin tehostettu (koskee vain juuri vastaanotettuja tehostuksia)
         setting_always_send_emails: Yleensä sähköposti-ilmoituksia ei lähetetä, kun käytät Mastodonia aktiivisesti
-        setting_default_sensitive: Arkaluonteinen media on oletuksena piilotettu, ja se voidaan näyttää yhdellä napsautuksella
+        setting_default_sensitive: Arkaluonteinen media piilotetaan oletusarvoisesti, ja se voidaan näyttää yhdellä napsautuksella
         setting_display_media_default: Piilota arkaluonteiseksi merkitty media
-        setting_display_media_hide_all: Piilota media aina
-        setting_display_media_show_all: Näytä media aina
+        setting_display_media_hide_all: Piilota mediasisältö aina
+        setting_display_media_show_all: Näytä mediasisältö aina
         setting_use_blurhash: Liukuvärit perustuvat piilotettujen kuvien väreihin mutta sumentavat yksityiskohdat
         setting_use_pending_items: Piilota aikajanan päivitykset napsautuksen taakse syötteen automaattisen vierityksen sijaan
         username: Voit käyttää kirjaimia, numeroita ja alaviivoja
-        whole_word: Kun avainsana tai -fraasi on kokonaan aakkosnumeerinen, se on voimassa vain, jos se vastaa koko sanaa
+        whole_word: Kun avainsana tai -fraasi on täysin aakkosnumeerinen, suodatin aktivoituu vain sen täysvastineille
       domain_allow:
         domain: Tämä verkkotunnus voi noutaa tietoja tältä palvelimelta ja sieltä saapuvat tiedot käsitellään ja tallennetaan
       email_domain_block:
@@ -78,7 +78,7 @@ fi:
       form_admin_settings:
         activity_api_enabled: Paikallisesti julkaistujen julkaisujen, aktiivisten käyttäjien ja rekisteröitymisten viikoittainen määrä
         backups_retention_period: Säilytä luodut arkistot määritetyn määrän päiviä.
-        bootstrap_timeline_accounts: Nämä tilit kiinnitetään uusien käyttäjien seuraamissuositusten yläpuolelle.
+        bootstrap_timeline_accounts: Nämä tilit kiinnitetään uusien käyttäjien seuraamissuosituslistojen alkuun.
         closed_registrations_message: Näkyy, kun rekisteröityminen on suljettu
         content_cache_retention_period: Kaikki julkaisut ja tehostukset muilta palvelimilta poistetaan, kun määritelty määrä päiviä on kulunut. Osaa julkaisuista voi olla mahdoton palauttaa. Kaikki julkaisuihin liittyvät kirjanmerkit, suosikit ja tehostukset menetetään, eikä niitä voi palauttaa.
         custom_css: Voit käyttää mukautettuja tyylejä Mastodonin verkkoversiossa.
@@ -108,26 +108,26 @@ fi:
         text: Tämä auttaa meitä arvioimaan hakemustasi
       ip_block:
         comment: Valinnainen. Muista miksi lisäsit tämän säännön.
-        expires_in: IP-osoitteet ovat rajallinen resurssi, joskus niitä jaetaan ja vaihtavat usein omistajaa. Tästä syystä epämääräisiä IP-lohkoja ei suositella.
-        ip: Kirjoita IPv4- tai IPv6-osoite. Voit estää kokonaisia alueita käyttämällä CIDR-syntaksia. Varo, että et lukitse itseäsi ulos!
+        expires_in: IP-osoitteet ovat rajallinen resurssi – joskus niitä jaetaan, ja ne vaihtavat usein omistajaa. Niinpä epämääräisiä IP-lohkoja ei suositella.
+        ip: Kirjoita IPv4- tai IPv6-osoite. Voit estää kokonaisia IP-osoitealueita CIDR-syntaksin avulla. Varo lukitsemasta itseäsi ulos!
         severities:
           no_access: Estä pääsy kaikkiin resursseihin
           sign_up_block: Uudet rekisteröitymiset eivät ole mahdollisia
           sign_up_requires_approval: Uudet rekisteröitymiset edellyttävät hyväksyntääsi
         severity: Valitse, mitä tapahtuu tämän IP-osoitteen pyynnöille
       rule:
-        text: Kuvaile sääntöä tai vaatimusta tämän palvelimen käyttäjille. Yritä pitää se lyhyenä ja yksinkertaisena
+        text: Kuvaile sääntöä tai edellytystä palvelimesi käyttäjille. Suosi tiivistä, yksinkertaista ilmaisua
       sessions:
-        otp: Syötä puhelimeen saamasi kaksivaiheisen tunnistautumisen koodi tai käytä palautuskoodia.
+        otp: 'Näppäile mobiilisovelluksessa näkyvä kaksivaiheisen todennuksen tunnusluku, tai käytä tarvittaessa palautuskoodia:'
         webauthn: Jos kyseessä on USB-avain, muista laittaa se paikalleen ja tarvittaessa napauttaa sitä.
       settings:
         indexable: Profiilisi voi näkyä Googlen, Bingin ja muiden hakukoneiden hakutuloksissa.
         show_application: Voit silti aina nähdä, mistä sovelluksesta julkaisusi lähetettiin.
       tag:
-        name: Voit muuttaa esimerkiksi kirjaimia paremmin luettavaksi
+        name: Voit esimerkiksi vaihtaa suur- ja pienaakkosten kesken helppolukuistaaksesi tekstiäsi
       user:
-        chosen_languages: Kun valittu, vain valituilla kielillä kirjoitetut julkaisut näkyvät julkisilla aikajanoilla
-        role: Rooli määrää, mitkä käyttöoikeudet käyttäjällä on
+        chosen_languages: Jos valitset kieliä oheisesta listauksesta, vain niidenkieliset julkaisut näkyvät julkisilla aikajanoilla sinulle
+        role: Rooli vaikuttaa käyttäjän käyttöoikeuksiin
       user_role:
         color: Väri, jota käytetään roolille kaikkialla käyttöliittymässä, RGB-heksadesimaalimuodossa
         highlighted: Tämä tekee roolista julkisesti näkyvän
@@ -152,22 +152,22 @@ fi:
       account_migration:
         acct: Uuden tilin käyttäjänimi
       account_warning_preset:
-        text: Esiasetettu teksti
+        text: Esimääritetty teksti
         title: Nimi
       admin_account_action:
-        include_statuses: Sisällytä raportoidut viestit sähköpostiin
+        include_statuses: Sisällytä raportoidut viestit sähköposti-ilmoitukseen
         send_email_notification: Ilmoita käyttäjälle sähköpostitse
         text: Mukautettu varoitus
         type: Toimi
         types:
-          disable: Poista kirjautuminen käytöstä
-          none: Älä tee mitään
+          disable: Jäädytä
+          none: Lähetä varoitus
           sensitive: Arkaluonteinen
           silence: Rajoita
           suspend: Jäädytä
-        warning_preset_id: Käytä varoitusmallia
+        warning_preset_id: Käytä varoituspohjaa
       announcement:
-        all_day: Koko päivän kestävä tapahtuma
+        all_day: Koko päivän tapahtuma
         ends_at: Tapahtuman loppu
         scheduled_at: Ajoita julkaisu
         starts_at: Tapahtuman alku
@@ -196,7 +196,7 @@ fi:
         max_uses: Käyttökertoja enintään
         new_password: Uusi salasana
         note: Elämäkerta
-        otp_attempt: Kaksivaiheisen tunnistuksen koodi
+        otp_attempt: Kaksivaiheisen todennuksen tunnusluku
         password: Salasana
         phrase: Avainsana tai -fraasi
         setting_advanced_layout: Ota edistynyt selainkäyttöliittymä käyttöön
@@ -208,19 +208,19 @@ fi:
         setting_default_privacy: Julkaisun näkyvyys
         setting_default_sensitive: Merkitse media aina arkaluonteiseksi
         setting_delete_modal: Kysy vahvistusta ennen julkaisun poistamista
-        setting_disable_swiping: Poista pyyhkäisyt käytöstä
+        setting_disable_swiping: Poista pyyhkäisyeleet käytöstä
         setting_display_media: Median näyttäminen
         setting_display_media_default: Oletus
         setting_display_media_hide_all: Piilota kaikki
         setting_display_media_show_all: Näytä kaikki
         setting_expand_spoilers: Laajenna aina sisältövaroituksilla merkityt julkaisut
-        setting_hide_network: Piilota verkkosi
+        setting_hide_network: Piilota verkostotietosi
         setting_reduce_motion: Vähennä animaatioiden liikettä
         setting_system_font_ui: Käytä järjestelmän oletusfonttia
         setting_theme: Sivuston teema
         setting_trends: Näytä päivän trendit
         setting_unfollow_modal: Kysy vahvistusta ennen seuraamisen lopettamista
-        setting_use_blurhash: Näytä värikkäät liukuvärit piilotetulle medialle
+        setting_use_blurhash: Käytä värikästä liukusävytystä piilotetulle medialle
         setting_use_pending_items: Hidas tila
         severity: Vakavuus
         sign_in_token_attempt: Turvakoodi
@@ -230,13 +230,13 @@ fi:
         username_or_email: Käyttäjänimi tai sähköpostiosoite
         whole_word: Koko sana
       email_domain_block:
-        with_dns_records: Sisällytä toimialueen MX tietueet ja IP-osoite
+        with_dns_records: Sisällytä toimialueen MX-tietueet ja IP-osoitteet
       featured_tag:
         name: Aihetunniste
       filters:
         actions:
           hide: Piilota kokonaan
-          warn: Piilota ja näytä varoitus
+          warn: Piilota varoittaen
       form_admin_settings:
         activity_api_enabled: Julkaise yhteenlasketut tilastot käyttäjätoiminnasta ohjelmointirajapinnassa
         backups_retention_period: Käyttäjän arkiston säilytysaika
@@ -244,9 +244,9 @@ fi:
         closed_registrations_message: Mukautettu viesti, kun rekisteröityminen ei ole saatavilla
         content_cache_retention_period: Sisällön välimuistin säilytysaika
         custom_css: Mukautettu CSS
-        mascot: Mukautettu maskotti (legacy)
-        media_cache_retention_period: Median välimuistin säilytysaika
-        peers_api_enabled: Julkaise löydettyjen instanssien luettelo ohjelmointirajapinnassa
+        mascot: Mukautettu maskotti (vanhentunut ominaisuus)
+        media_cache_retention_period: Mediasisältövälimuistin säilytysaika
+        peers_api_enabled: Julkaise löydettyjen palvelinten luettelo ohjelmointirajapinnassa
         profile_directory: Ota profiilihakemisto käyttöön
         registrations_mode: Kuka voi rekisteröityä
         require_invite_text: Vaadi syy liittyä
@@ -260,11 +260,11 @@ fi:
         site_title: Palvelimen nimi
         status_page_url: Tilasivun URL-osoite
         theme: Oletusteema
-        thumbnail: Palvelimen pikkukuva
+        thumbnail: Palvelimen pienoiskuva
         timeline_preview: Salli todentamaton pääsy julkisille aikajanoille
-        trendable_by_default: Salli trendit ilman ennakkotarkastusta
+        trendable_by_default: Salli suositun sisällön koonti ilman ennakkotarkastusta
         trends: Ota trendit käyttöön
-        trends_as_landing_page: Käytä trendejä aloitussivuna
+        trends_as_landing_page: Käytä suosittua sisältöä aloitussivuna
       interactions:
         must_be_follower: Estä ilmoitukset käyttäjiltä, jotka eivät seuraa sinua
         must_be_following: Estä ilmoitukset käyttäjiltä, joita et seuraa
@@ -318,7 +318,7 @@ fi:
         permissions_as_keys: Oikeudet
         position: Prioriteetti
       webhook:
-        events: Tapahtumat käytössä
+        events: Käytössä olevat tapahtumat
         template: Hyötykuormapohja
         url: Päätepisteen URL
     'no': Ei
@@ -327,8 +327,8 @@ fi:
     recommended: Suositeltu
     required:
       mark: "*"
-      text: pakollinen tieto
+      text: vaadittu tieto
     title:
       sessions:
-        webauthn: Käytä jotakin suojausavainta kirjautuaksesi sisään
+        webauthn: Käytä yhtä turva-avaimistasi kirjautuaksesi sisään
     'yes': Kyllä
diff --git a/config/locales/simple_form.gd.yml b/config/locales/simple_form.gd.yml
index f567866c3e783a..a38dd43ad6fd58 100644
--- a/config/locales/simple_form.gd.yml
+++ b/config/locales/simple_form.gd.yml
@@ -304,10 +304,10 @@ gd:
         indexable: Gabh a-staigh duilleag na pròifil sna h-einnseanan-luirg
         show_application: Seall dè an aplacaid a chuir thu post leatha
       tag:
-        listable: Leig leis an taga hais seo gun nochd e ann an toraidhean luirg ’s am measg nam molaidhean
+        listable: Faodaidh an taga hais seo nochdadh ann an toraidhean luirg ’s am measg nam molaidhean
         name: Taga hais
-        trendable: Leig leis an taga hais seo gun nochd e am measg nan treandaichean
-        usable: Leig le postaichean an taga hais seo a chleachdadh
+        trendable: Faodaidh an taga hais seo nochdadh am measg nan treandaichean
+        usable: Faodaidh postaichean an taga hais seo a chleachdadh
       user:
         role: Dreuchd
         time_zone: Roinn-tìde
diff --git a/config/locales/simple_form.ja.yml b/config/locales/simple_form.ja.yml
index 08e866b55e3424..e9fb3da9fa164b 100644
--- a/config/locales/simple_form.ja.yml
+++ b/config/locales/simple_form.ja.yml
@@ -294,7 +294,7 @@ ja:
         software_updates:
           all: すべてのアップデートを通知する
           critical: 緊急のアップデートのみ通知する
-          label: 新しいMastodonバージョンが利用可能です
+          label: 新しいMastodonバージョンが利用可能になった時
           none: 通知しない (非推奨)
           patch: 緊急のアップデートとバグ修正アップデートを通知する
         trending_tag: 新しいトレンドのレビューをする必要がある時
diff --git a/config/locales/simple_form.lad.yml b/config/locales/simple_form.lad.yml
index c23960e07d120e..afa26b7873d6ae 100644
--- a/config/locales/simple_form.lad.yml
+++ b/config/locales/simple_form.lad.yml
@@ -32,7 +32,7 @@ lad:
       announcement:
         all_day: Kuando esta eskojido solo se amostraran las datas del rango de tiempo
         ends_at: Opsyonal. El pregon dezaparesera otomatikamente en este momento
-        scheduled_at: Deshar en blanko para publikar el pregon pishin
+        scheduled_at: Desha en blanko para publikar el pregon pishin
         starts_at: Opsyonal. En caso de ke tu pregon este atado a un intervalo de tiempo espesifiko
         text: Puedes kulanear la sintaksa de publikasyones. Por favor nota el espasyo ke okupara el pregon en el ekran del utilizador
       appeal:
diff --git a/config/locales/simple_form.sr-Latn.yml b/config/locales/simple_form.sr-Latn.yml
index 6405ee338a0e50..6e6b6ce8b8eb33 100644
--- a/config/locales/simple_form.sr-Latn.yml
+++ b/config/locales/simple_form.sr-Latn.yml
@@ -192,7 +192,7 @@ sr-Latn:
         honeypot: "%{label} (ne popunjavaj)"
         inbox_url: URL od relejnog prijemnog sandučeta
         irreversible: Ispustiti umesto sakriti
-        locale: Jezik
+        locale: Jezik okruženja
         max_uses: Maksimalni broj korišćenja
         new_password: Nova lozinka
         note: Biografija
diff --git a/config/locales/simple_form.sr.yml b/config/locales/simple_form.sr.yml
index da1ac81233e656..71fbe299ecebd4 100644
--- a/config/locales/simple_form.sr.yml
+++ b/config/locales/simple_form.sr.yml
@@ -192,7 +192,7 @@ sr:
         honeypot: "%{label} (не попуњавај)"
         inbox_url: URL од релејног пријемног сандучета
         irreversible: Испустити уместо сакрити
-        locale: Језик
+        locale: Језик окружења
         max_uses: Максимални број коришћења
         new_password: Нова лозинка
         note: Биографија
diff --git a/config/locales/simple_form.tr.yml b/config/locales/simple_form.tr.yml
index 7d16531eaebc51..3053c044314590 100644
--- a/config/locales/simple_form.tr.yml
+++ b/config/locales/simple_form.tr.yml
@@ -48,7 +48,7 @@ tr:
         email: Onay e-postası gönderilir
         header: PNG, GIF ya da JPG. En fazla %{size}. %{dimensions}px boyutuna küçültülecek
         inbox_url: Kullanmak istediğiniz aktarıcının ön sayfasından URL'yi kopyalayın
-        irreversible: Filtrelenmiş gönderiler, filtre daha sonra kaldırılsa bile, geri dönüşümsüz biçimde kaybolur
+        irreversible: Süzgeçlenmiş gönderiler, filtre daha sonra kaldırılsa bile, geri dönüşümsüz biçimde kaybolur
         locale: Kullanıcı arayüzünün dili, e-postalar ve push bildirimleri
         password: En az 8 karakter kullanın
         phrase: Metnin büyük/küçük harf durumundan veya gönderinin içerik uyarısından bağımsız olarak eşleştirilecek
@@ -74,7 +74,7 @@ tr:
         action: Bir gönderi filtreyle eşleştiğinde hangi eylemin yapılacağını seçin
         actions:
           hide: Filtrelenmiş içeriği tamamen gizle, sanki varolmamış gibi
-          warn: Filtrelenmiş içeriği, filtrenin başlığından söz eden bir uyarının arkasında gizle
+          warn: Süzgeçlenmiş içeriği, süzgecinin başlığından söz eden bir uyarının arkasında gizle
       form_admin_settings:
         activity_api_enabled: Yerel olarak yayınlanan gönderi, etkin kullanıcı ve yeni kayıtların haftalık sayıları
         backups_retention_period: Üretilen kullanıcı arşivlerini belirli gün sayısı kadar sakla.
@@ -118,7 +118,7 @@ tr:
       rule:
         text: Bu sunucu üzerindeki kullanıcılar için bir kural veya gereksinimi tanımlayın. Kuralı kısa ve yalın tutmaya çalışın
       sessions:
-        otp: Telefonunuzdaki two-factor kodunuzu giriniz veya kurtarma kodlarınızdan birini giriniz.
+        otp: 'Telefonunuzdaki two-factor kodunuzu giriniz veya kurtarma kodlarınızdan birini giriniz:'
         webauthn: Bir USB anahtarıysa, taktığınızdan ve gerekirse üzerine tıkladığınızdan emin olun.
       settings:
         indexable: Profil sayfanız Google, Bing ve diğerlerindeki arama sonuçlarında görüntülenebilir.
@@ -178,10 +178,10 @@ tr:
         autofollow: Hesabınızı takip etmeye davet edin
         avatar: Profil resmi
         bot: Bu bir bot hesabı
-        chosen_languages: Dilleri filtrele
+        chosen_languages: Dilleri süzgeçle
         confirm_new_password: Yeni parolayı onayla
         confirm_password: Parolayı doğrula
-        context: İçeriği filtrele
+        context: İçeriği süzgeçle
         current_password: Güncel parola
         data: Veri
         display_name: Görünen isim
@@ -203,7 +203,7 @@ tr:
         setting_aggregate_reblogs: Zaman çizelgesindeki boostları grupla
         setting_always_send_emails: Her zaman e-posta bildirimleri gönder
         setting_auto_play_gif: Hareketli GIF'leri otomatik oynat
-        setting_boost_modal: Boostlamadan önce onay iletişim kutusu göster
+        setting_boost_modal: Paylaşmadan önce onay iletişim kutusu göster
         setting_default_language: Gönderi dili
         setting_default_privacy: Gönderi gizliliği
         setting_default_sensitive: Medyayı her zaman hassas olarak işaretle
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 20df763463b70b..5ffbf45bdedf33 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -363,6 +363,7 @@ sk:
           silence: Obmedz
           suspend: Pozastav
         title: Nové blokovanie domény
+      no_domain_block_selected: Žiadne blokovanie domén nebolo zmenené, keďže žiadne neboli vybrané
       not_permitted: Nemáš povolenie na vykonanie tohto kroku
       obfuscate: Zatemniť názov domény
       private_comment: Súkromný komentár
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index ba707f49ebe607..54a4da3ea2d9ae 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -1598,6 +1598,9 @@ sl:
     errors:
       limit_reached: Dosežena omejitev različnih reakcij/odzivov
       unrecognized_emoji: ni prepoznan emotikon
+  redirects:
+    prompt: Če zaupate tej povezavi, jo kliknite za nadaljevanje.
+    title: Zapuščate %{instance}.
   relationships:
     activity: Dejavnost računa
     confirm_follow_selected_followers: Ali ste prepričani, da želite slediti izbranim sledilcem?
@@ -1854,6 +1857,12 @@ sl:
       extra: Zdaj je na voljo za prenos!
       subject: Vaš arhiv je pripravljen za prenos
       title: Prevzem arhiva
+    failed_2fa:
+      details: 'Tukaj so podrobnosti poskusa prijave:'
+      explanation: Nekdo se je poskusil prijaviti v vaš račun, vendar ni podal veljavnega drugega faktorja preverjanja pristnosti.
+      further_actions_html: Če to niste bili vi, priporočamo, da takoj %{action}, ker je lahko ogrožena varnost.
+      subject: Napaka preverjanja pristnosti z drugim faktorjem
+      title: Preverjanje pristnosti z drugim faktorjem je spodletelo
     suspicious_sign_in:
       change_password: spremenite svoje geslo
       details: 'Tukaj so podrobnosti prijave:'
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 8de7c90e73b594..9e67e9692d3c3c 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -1781,8 +1781,8 @@ sr:
     does_not_match_previous_name: не поклапа се са претходним именом
   themes:
     contrast: Велики контраст
-    default: Mastodon (тамно)
-    mastodon-light: Mastodon (светло)
+    default: Mastodon (тамна)
+    mastodon-light: Mastodon (светла)
   time:
     formats:
       default: "%d %b %Y, %H:%M"
diff --git a/config/locales/th.yml b/config/locales/th.yml
index ac5cfbacf54394..74fc1b26b72c94 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -1364,7 +1364,7 @@ th:
       webauthn: กุญแจความปลอดภัย
     description_html: หากคุณเห็นกิจกรรมที่คุณไม่รู้จัก พิจารณาเปลี่ยนรหัสผ่านของคุณและเปิดใช้งานการรับรองความถูกต้องด้วยสองปัจจัย
     empty: ไม่มีประวัติการรับรองความถูกต้อง
-    failed_sign_in_html: ความพยายามลงชื่อเข้าด้วย %{method} จาก %{ip} (%{browser}) ล้มเหลว
+    failed_sign_in_html: ความพยายามในการลงชื่อเข้าด้วย %{method} จาก %{ip} (%{browser}) ล้มเหลว
     successful_sign_in_html: ลงชื่อเข้าด้วย %{method} จาก %{ip} (%{browser}) สำเร็จ
     title: ประวัติการรับรองความถูกต้อง
   mail_subscriptions:
@@ -1520,6 +1520,9 @@ th:
     errors:
       limit_reached: ถึงขีดจำกัดของการตอบสนองต่าง ๆ แล้ว
       unrecognized_emoji: ไม่ใช่อีโมจิที่รู้จัก
+  redirects:
+    prompt: หากคุณเชื่อถือลิงก์นี้ ให้คลิกลิงก์เพื่อดำเนินการต่อ
+    title: คุณกำลังจะออกจาก %{instance}
   relationships:
     activity: กิจกรรมบัญชี
     confirm_follow_selected_followers: คุณแน่ใจหรือไม่ว่าต้องการติดตามผู้ติดตามที่เลือก?
@@ -1758,6 +1761,12 @@ th:
       extra: ตอนนี้ข้อมูลสำรองพร้อมสำหรับการดาวน์โหลดแล้ว!
       subject: การเก็บถาวรของคุณพร้อมสำหรับการดาวน์โหลดแล้ว
       title: การส่งออกการเก็บถาวร
+    failed_2fa:
+      details: 'นี่คือรายละเอียดของความพยายามในการลงชื่อเข้า:'
+      explanation: ใครสักคนได้ลองลงชื่อเข้าบัญชีของคุณแต่ให้การรับรองความถูกต้องด้วยปัจจัยที่สองที่ไม่ถูกต้อง
+      further_actions_html: หากนี่ไม่ใช่คุณ เราแนะนำให้คุณ %{action} ทันทีเนื่องจากอาจมีการบุกรุกบัญชี
+      subject: ความล้มเหลวการรับรองความถูกต้องด้วยปัจจัยที่สอง
+      title: การรับรองความถูกต้องด้วยปัจจัยที่สองล้มเหลว
     suspicious_sign_in:
       change_password: เปลี่ยนรหัสผ่านของคุณ
       details: 'นี่คือรายละเอียดของการลงชื่อเข้า:'
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index b3a52715b7f06c..2b605e5073ed51 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -1201,8 +1201,8 @@ tr:
     '406': Bu sayfa istenen formatta mevcut değil.
     '410': Aradığınız sayfa artık yok.
     '422':
-      content: Güvenlik doğrulaması başarısız oldu. Site cookie'lerini engellemiş olabilirsiniz.
-      title: Güvenlik doğrulamasu başarısız
+      content: Güvenlik doğrulaması başarısız oldu. Site çerezlerini engellemiş olabilirmisiniz?
+      title: Güvenlik doğrulaması başarısız
     '429': Kısıtlandı
     '500':
       content: Üzgünüz, ancak bir şey ters gitti.
@@ -1243,15 +1243,15 @@ tr:
       add_keyword: Anahtar sözcük ekle
       keywords: Anahtar Sözcükler
       statuses: Tekil gönderiler
-      statuses_hint_html: Bu filtre, aşağıdaki anahtar kelimelerle eşleşip eşleşmediklerinden bağımsız olarak tekil gönderileri seçmek için uygulanıyor. <a href="%{path}">Filtredeki gönderileri inceleyin veya kaldırın</a>.
-      title: Filtreyi düzenle
+      statuses_hint_html: Bu süzgeçlere, aşağıdaki anahtar kelimelerle eşleşip eşleşmediklerinden bağımsız olarak tekil gönderileri seçmek için uygulanıyor. <a href="%{path}">Süzgeçlerdeki gönderileri inceleyin veya kaldırın</a>.
+      title: Süzgeci düzenle
     errors:
-      deprecated_api_multiple_keywords: Bu parametreler, birden fazla filtre anahtar sözcüğü için geçerli olduğundan dolayı bu uygulama içerisinden değiştirilemezler. Daha yeni bir uygulama veya web arayüzünü kullanın.
+      deprecated_api_multiple_keywords: Bu parametreler, birden fazla süzgeç anahtar sözcüğü için geçerli olduğundan dolayı bu uygulama içerisinden değiştirilemezler. Daha yeni bir uygulama veya web arayüzünü kullanın.
       invalid_context: Sıfır ya da geçersiz içerik sağlandı
     index:
       contexts: "%{contexts} içindeki filtreler"
       delete: Sil
-      empty: Hiç filtreniz yok.
+      empty: Hiç süzgeciniz yok.
       expires_in: "%{distance} sürede sona eriyor"
       expires_on: "%{date} tarihinde sona eriyor"
       keywords:
@@ -1263,16 +1263,16 @@ tr:
       statuses_long:
         one: "%{count} tekil gönderi gizli"
         other: "%{count} tekil gönderi gizli"
-      title: Filtreler
+      title: Süzgeçler
     new:
-      save: Yeni filtre kaydet
-      title: Yeni filtre ekle
+      save: Yeni süzgeç kaydet
+      title: Yeni süzgeç ekle
     statuses:
-      back_to_filter: Filtreye dön
+      back_to_filter: Süzgeçe dön
       batch:
-        remove: Filtreden kaldır
+        remove: Süzgeçden kaldır
       index:
-        hint: Bu filtre diğer ölçütlerden bağımsız olarak tekil gönderileri seçmek için uygulanıyor. Web arayüzünü kullanarak bu filtreye daha fazla gönderi ekleyebilirsiniz.
+        hint: Bu süzgece diğer ölçütlerden bağımsız olarak tekil gönderileri seçmek için uygulanıyor. Web arayüzünü kullanarak bu süzgece daha fazla gönderi ekleyebilirsiniz.
         title: Süzgeçlenmiş gönderiler
   generic:
     all: Tümü
@@ -1480,8 +1480,8 @@ tr:
       subject: Anket %{name} tarafından sonlandırıldı
     reblog:
       body: "%{name} durumunuzu boostladı:"
-      subject: "%{name} durumunuzu boostladı"
-      title: Yeni boost
+      subject: "%{name} durumunuzu paylaştı"
+      title: Yeni paylaşım
     status:
       subject: "%{name} az önce gönderdi"
     update:
@@ -1544,7 +1544,7 @@ tr:
     title: Gizlilik Politikası
   reactions:
     errors:
-      limit_reached: Farklı reaksiyonların sınırına ulaşıldı
+      limit_reached: Farklı tepkilerin sınırına ulaşıldı
       unrecognized_emoji: tanınan bir emoji değil
   redirects:
     prompt: Eğer bu bağlantıya güveniyorsanız, tıklayıp devam edebilirsiniz.
@@ -1663,17 +1663,17 @@ tr:
         other: "%{count} ses"
       description: 'Ekli: %{attached}'
       image:
-        one: "%{count} resim"
-        other: "%{count} resim"
+        one: "%{count} görsel"
+        other: "%{count} görseller"
       video:
         one: "%{count} video"
-        other: "%{count} video"
-    boosted_from_html: "%{acct_link} kişisinden boostladı"
+        other: "%{count} videolar"
+    boosted_from_html: "%{acct_link} kişisinden paylaştı"
     content_warning: 'İçerik uyarısı: %{warning}'
     default_language: Arayüz diliyle aynı
     disallowed_hashtags:
       one: 'izin verilmeyen bir etiket içeriyordu: %{tags}'
-      other: 'izin verilmeyen hashtag''leri içeriyordu: %{tags}'
+      other: 'izin verilmeyen etiketler içeriyordu: %{tags}'
     edited_at_html: "%{date} tarihinde düzenlendi"
     errors:
       in_reply_not_found: Yanıtlamaya çalıştığınız durum yok gibi görünüyor.
@@ -1683,14 +1683,14 @@ tr:
       direct: Sadece değinilen kullanıcıların görebileceği gönderiler üstte tutulamaz
       limit: Halihazırda maksimum sayıda gönderi sabitlediniz
       ownership: Başkasının gönderisi sabitlenemez
-      reblog: Bir boost sabitlenemez
+      reblog: Bir gönderi sabitlenemez
     poll:
       total_people:
         one: "%{count} kişi"
-        other: "%{count} kişi"
+        other: "%{count} kişiler"
       total_votes:
         one: "%{count} oy"
-        other: "%{count} oy"
+        other: "%{count} oylar"
       vote: Oy Ver
     show_more: Daha fazlasını göster
     show_newer: Yenileri göster
@@ -1756,7 +1756,7 @@ tr:
       default: "%d %b %Y %H:%M"
       month: "%b %Y"
       time: "%H:%M"
-      with_time_zone: "%d.%m.%Y %H:%M %Z"
+      with_time_zone: "%b %d, %Y, %H:%M %Z"
   translation:
     errors:
       quota_exceeded: Çeviri hizmetinin sunucu kapsamındaki kullanım kotası aşıldı.
@@ -1774,7 +1774,7 @@ tr:
     otp: Authenticator uygulaması
     recovery_codes: Kurtarma kodlarını yedekle
     recovery_codes_regenerated: Kurtarma kodları başarıyla yeniden oluşturuldu
-    recovery_instructions_html: 'Eğer telefonunuza erişiminizi kaybederseniz, aşağıdaki kurtarma kodlarından birini kullanarak hesabınıza giriş yapabilirsiniz. Kurtarma kodlarınızı güvenli halde tutunuz. Örneğin: kodların çıktısını alıp diğer önemli belgeleriniz ile birlikte saklayabilirsiniz.'
+    recovery_instructions_html: 'Eğer telefonunuza erişiminizi kaybederseniz, aşağıdaki kurtarma kodlarından birini kullanarak hesabınıza giriş yapabilirsiniz. <strong>Kurtarma kodlarınızı güvenli halde tutunuz.</strong> Örneğin: kodların çıktısını alıp diğer önemli belgeleriniz ile birlikte saklayabilirsiniz.'
     webauthn: Güvenlik anahtarları
   user_mailer:
     appeal_approved:
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 531bdb3d592341..237305c0e94be9 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -1845,14 +1845,24 @@ uk:
       action: Налаштування облікового запису
       explanation: Оскарження попередження вашому обліковому запису %{strike_date}, яке ви надіслали %{appeal_date} було схвалено. Ваш обліковий запис знову вважається добропорядним.
       subject: Вашу апеляцію від %{date} було схвалено
+      subtitle: Ваш обліковий запис знову готовий до користування.
       title: Апеляцію схвалено
     appeal_rejected:
       explanation: Оскарження попередження вашому обліковому запису %{strike_date}, яке ви надіслали %{appeal_date} було відхилено.
       subject: Вашу апеляцію від %{date} було відхилено
+      subtitle: Вашу апеляцію відхилено.
       title: Апеляцію відхилено
     backup_ready:
+      explanation: Ви просили про створення резервної копії вашого облікового запису Mastodon.
+      extra: Вона готова до завантаження!
       subject: Ваш архів готовий до завантаження
       title: Винесення архіву
+    failed_2fa:
+      details: 'Подробиці спроби входу:'
+      explanation: Хтось намагався ввійти у ваш обліковий запис, але надав недійсний другий фактор автентифікації.
+      further_actions_html: Якщо це не ви, ми радимо вам негайно %{action}, оскільки обліковий запис може бути скомпрометованим.
+      subject: Помилка другого фактору автентифікації
+      title: Помилка другого фактора автентифікації
     suspicious_sign_in:
       change_password: змінити свій пароль
       details: 'Відомості про вхід:'
@@ -1906,7 +1916,7 @@ uk:
     go_to_sso_account_settings: Перейдіть до налаштувань облікового запису постачальника ідентифікації
     invalid_otp_token: Введено неправильний код
     otp_lost_help_html: Якщо ви втратили доступ до обох, ви можете отримати доступ з %{email}
-    rate_limited: Занадто багато спроб з'єднання. Спробуйте ще раз пізніше.
+    rate_limited: Забагато спроб з'єднання. Спробуйте ще раз пізніше.
     seamless_external_login: Ви увійшли за допомогою зовнішнього сервісу, тому налаштування паролю та електронної пошти недоступні.
     signed_in_as: 'Ви увійшли як:'
   verification:

From aaa58d4807377e04649499ebee91757b16b9a007 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 6 Feb 2024 21:48:11 +0100
Subject: [PATCH 0080/2191] Fix tagging of manual security nightly builds
 (#29061)

---
 .github/workflows/build-security.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-security.yml b/.github/workflows/build-security.yml
index b03b787d5f73c6..1e2455d3d96adf 100644
--- a/.github/workflows/build-security.yml
+++ b/.github/workflows/build-security.yml
@@ -38,7 +38,7 @@ jobs:
       tags: |
         type=raw,value=edge
         type=raw,value=nightly
-        type=schedule,pattern=${{ needs.compute-suffix.outputs.prerelease }}
+        type=raw,value=${{ needs.compute-suffix.outputs.prerelease }}
     secrets: inherit
 
   build-image-streaming:
@@ -60,5 +60,5 @@ jobs:
       tags: |
         type=raw,value=edge
         type=raw,value=nightly
-        type=schedule,pattern=${{ needs.compute-suffix.outputs.prerelease }}
+        type=raw,value=${{ needs.compute-suffix.outputs.prerelease }}
     secrets: inherit

From 492e25da0651195873e0c2e9632a7f183ea6b2ef Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 7 Feb 2024 11:56:52 +0100
Subject: [PATCH 0081/2191] Update dependency webmock to v3.20.0 (#29120)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index b76f449b26448a..d60def5222acc2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -182,7 +182,8 @@ GEM
     cose (1.3.0)
       cbor (~> 0.5.9)
       openssl-signature_algorithm (~> 1.0)
-    crack (0.4.5)
+    crack (0.4.6)
+      bigdecimal
       rexml
     crass (1.0.6)
     css_parser (1.14.0)
@@ -314,7 +315,7 @@ GEM
       rainbow
       rubocop (>= 1.0)
       sysexits (~> 1.1)
-    hashdiff (1.0.1)
+    hashdiff (1.1.0)
     hashie (5.0.0)
     hcaptcha (7.1.0)
       json
@@ -792,7 +793,7 @@ GEM
     webfinger (1.2.0)
       activesupport
       httpclient (>= 2.4)
-    webmock (3.19.1)
+    webmock (3.20.0)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)

From da50217b8899f36137c5405423a41b8520dfdfb2 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 7 Feb 2024 05:59:32 -0500
Subject: [PATCH 0082/2191] Combine repeated requests in `admin/accounts`
 controller spec (#29119)

---
 .../admin/accounts_controller_spec.rb         | 48 +++++++++----------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/spec/controllers/admin/accounts_controller_spec.rb b/spec/controllers/admin/accounts_controller_spec.rb
index ef3053b6b35776..b90bb414b06a84 100644
--- a/spec/controllers/admin/accounts_controller_spec.rb
+++ b/spec/controllers/admin/accounts_controller_spec.rb
@@ -9,18 +9,8 @@
 
   describe 'GET #index' do
     let(:current_user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
-
-    around do |example|
-      default_per_page = Account.default_per_page
-      Account.paginates_per 1
-      example.run
-      Account.paginates_per default_per_page
-    end
-
-    it 'filters with parameters' do
-      account_filter = instance_double(AccountFilter, results: Account.all)
-      allow(AccountFilter).to receive(:new).and_return(account_filter)
-      params = {
+    let(:params) do
+      {
         origin: 'local',
         by_domain: 'domain',
         status: 'active',
@@ -29,25 +19,35 @@
         email: 'local-part@domain',
         ip: '0.0.0.42',
       }
+    end
 
-      get :index, params: params
-
-      expect(AccountFilter).to have_received(:new).with(hash_including(params))
+    around do |example|
+      default_per_page = Account.default_per_page
+      Account.paginates_per 1
+      example.run
+      Account.paginates_per default_per_page
     end
 
-    it 'paginates accounts' do
+    before do
       Fabricate(:account)
 
-      get :index, params: { page: 2 }
-
-      accounts = assigns(:accounts)
-      expect(accounts.count).to eq 1
-      expect(accounts.klass).to be Account
+      account_filter = instance_double(AccountFilter, results: Account.all)
+      allow(AccountFilter).to receive(:new).and_return(account_filter)
     end
 
-    it 'returns http success' do
-      get :index
-      expect(response).to have_http_status(200)
+    it 'returns success and paginates and filters with parameters' do
+      get :index, params: params.merge(page: 2)
+
+      expect(response)
+        .to have_http_status(200)
+      expect(assigns(:accounts))
+        .to have_attributes(
+          count: eq(1),
+          klass: be(Account)
+        )
+      expect(AccountFilter)
+        .to have_received(:new)
+        .with(hash_including(params))
     end
   end
 

From eeabf9af72bf27dbc7e997b73737ac3bf1122813 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 7 Feb 2024 12:52:38 +0100
Subject: [PATCH 0083/2191] Fix compatibility with Redis <6.2 (#29123)

---
 app/controllers/auth/sessions_controller.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/controllers/auth/sessions_controller.rb b/app/controllers/auth/sessions_controller.rb
index 962b78de65f026..6ed7b2baacc7c4 100644
--- a/app/controllers/auth/sessions_controller.rb
+++ b/app/controllers/auth/sessions_controller.rb
@@ -183,7 +183,9 @@ def on_authentication_failure(user, security_measure, failure_reason)
     )
 
     # Only send a notification email every hour at most
-    return if redis.set("2fa_failure_notification:#{user.id}", '1', ex: 1.hour, get: true).present?
+    return if redis.get("2fa_failure_notification:#{user.id}").present?
+
+    redis.set("2fa_failure_notification:#{user.id}", '1', ex: 1.hour)
 
     UserMailer.failed_2fa(user, request.remote_ip, request.user_agent, Time.now.utc).deliver_later!
   end

From 2912829411867d221c13b35f37ab6aa0aac2edd7 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 7 Feb 2024 13:09:43 +0100
Subject: [PATCH 0084/2191] Add support for specifying custom CA cert for
 Elasticsearch (#29122)

---
 config/initializers/chewy.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/config/initializers/chewy.rb b/config/initializers/chewy.rb
index 076f38332479e7..0fb311dbb37bc8 100644
--- a/config/initializers/chewy.rb
+++ b/config/initializers/chewy.rb
@@ -7,6 +7,9 @@
 password        = ENV.fetch('ES_PASS', nil).presence
 fallback_prefix = ENV.fetch('REDIS_NAMESPACE', nil).presence
 prefix          = ENV.fetch('ES_PREFIX') { fallback_prefix }
+ca_file         = ENV.fetch('ES_CA_CERT', nil).presence
+
+transport_options = { ssl: { ca_file: ca_file } } if ca_file.present?
 
 Chewy.settings = {
   host: "#{host}:#{port}",
@@ -18,6 +21,7 @@
   index: {
     number_of_replicas: ['single_node_cluster', nil].include?(ENV['ES_PRESET'].presence) ? 0 : 1,
   },
+  transport_options: transport_options,
 }
 
 # We use our own async strategy even outside the request-response

From 17052714a28e3b30c5d2053d8dbea4a352c4199b Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 7 Feb 2024 13:38:37 +0100
Subject: [PATCH 0085/2191] New Crowdin Translations (automated) (#29121)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/tok.json | 167 +++++++++++++++++++++++
 config/locales/activerecord.tok.yml      |   6 +
 config/locales/devise.tok.yml            |   1 +
 config/locales/doorkeeper.tok.yml        |   1 +
 config/locales/simple_form.tok.yml       |  14 ++
 config/locales/tok.yml                   |   1 +
 6 files changed, 190 insertions(+)
 create mode 100644 app/javascript/mastodon/locales/tok.json
 create mode 100644 config/locales/activerecord.tok.yml
 create mode 100644 config/locales/devise.tok.yml
 create mode 100644 config/locales/doorkeeper.tok.yml
 create mode 100644 config/locales/simple_form.tok.yml
 create mode 100644 config/locales/tok.yml

diff --git a/app/javascript/mastodon/locales/tok.json b/app/javascript/mastodon/locales/tok.json
new file mode 100644
index 00000000000000..a0227969dd6b4f
--- /dev/null
+++ b/app/javascript/mastodon/locales/tok.json
@@ -0,0 +1,167 @@
+{
+  "about.contact": "toki:",
+  "about.domain_blocks.no_reason_available": "mi sona ala e tan",
+  "about.not_available": "lon kulupu ni la sina ken alasa ala e sona ni.",
+  "about.rules": "lawa kulupu",
+  "account.account_note_header": "sona awen",
+  "account.block": "o weka e @{name}",
+  "account.block_domain": "o weka e ma {domain}",
+  "account.block_short": "o weka e jan",
+  "account.blocked": "jan ni li weka",
+  "account.browse_more_on_origin_server": "sina tawa ma tan pi jan ni la sina ken lukin e mute",
+  "account.cancel_follow_request": "o pini wile kute",
+  "account.copy": "o pali same e linja pi lipu jan",
+  "account.direct": "len la o mu e @{name}",
+  "account.disable_notifications": "@{name} li toki la o toki ala e toki ona tawa mi",
+  "account.domain_blocked": "ma ni li weka tawa sina",
+  "account.edit_profile": "o ante e lipu mi",
+  "account.enable_notifications": "@{name} li toki la o toki e toki ona tawa mi",
+  "account.endorse": "lipu jan la o suli e ni",
+  "account.featured_tags.last_status_at": "sitelen pini pi jan ni li lon tenpo {date}",
+  "account.featured_tags.last_status_never": "toki ala li lon",
+  "account.follow": "o kute",
+  "account.follow_back": "jan ni li kute e sina. o kute",
+  "account.followers": "jan kute",
+  "account.followers.empty": "jan ala li kute e jan ni",
+  "account.following": "sina kute e jan ni",
+  "account.follows.empty": "jan ni li kute e jan ala",
+  "account.go_to_profile": "o tawa lipu jan",
+  "account.hide_reblogs": "o lukin ala e pana toki tan @{name}",
+  "account.languages": "sina wile lukin e sitelen pi toki seme",
+  "account.locked_info": "sina wile kute e jan ni la ona o toki e ken",
+  "account.mention": "o toki e jan @{name}",
+  "account.moved_to": "lipu jan sin pi jan {name} li ni:",
+  "account.mute": "o kute ala e @{name}",
+  "account.mute_notifications_short": "o kute ala e mu tan jan ni",
+  "account.mute_short": "o kute ala",
+  "account.muted": "sina kute ala e jan ni",
+  "account.no_bio": "lipu li weka",
+  "account.posts": "toki suli",
+  "account.posts_with_replies": "toki ale",
+  "account.report": "jan @{name} la o toki e lawa",
+  "account.requested": "jan ni o ken e kute sina. sina pini wile kute la o luka e ni",
+  "account.requested_follow": "{name} li wile kute e sina",
+  "account.show_reblogs": "o lukin e pana toki tan @{name}",
+  "account.unblock_short": "o pini weka",
+  "account.unfollow": "o pini kute",
+  "account.unmute": "o ken lukin e sitelen tan @{name}",
+  "account.unmute_notifications_short": "o kute e mu tan jan ni",
+  "account.unmute_short": "o ken kute e jan ni",
+  "alert.unexpected.message": "pakala li lon",
+  "alert.unexpected.title": "pakala",
+  "announcement.announcement": "toki suli",
+  "audio.hide": "o len e kalama",
+  "bundle_column_error.error.title": "pakala!",
+  "bundle_column_error.network.title": "pakala la ilo sina li toki ala tawa ilo ante",
+  "bundle_column_error.retry": "o ni sin",
+  "bundle_column_error.routing.body": "ilo li sona ala e lipu wile. sina pana ala pana e nasin pona tawa lipu?",
+  "bundle_column_error.routing.title": "pakala nanpa 404",
+  "bundle_modal_error.message": "ilo li wile kama e ijo ni, taso pakala li lon.",
+  "bundle_modal_error.retry": "o ni sin",
+  "column.mutes": "sina wile ala kute e jan ni",
+  "compose.language.change": "o ante e nasin toki",
+  "compose.language.search": "o alasa e nasin toki...",
+  "compose.saved.body": "ilo li awen e ijo pana sina.",
+  "compose_form.direct_message_warning_learn_more": "o kama sona e ijo ante",
+  "compose_form.placeholder": "o toki",
+  "compose_form.poll.option_placeholder": "ken nanpa {number}",
+  "compose_form.poll.switch_to_multiple": "o ante e nasin pana. pana mute o ken",
+  "compose_form.poll.switch_to_single": "o ante e nasin pana. pana wan taso o lon",
+  "compose_form.publish": "o toki",
+  "compose_form.publish_form": "o open toki sin",
+  "compose_form.reply": "o toki lon ijo ni",
+  "compose_form.save_changes": "o sin e ni",
+  "compose_form.spoiler.marked": "o weka e toki pi ijo ike ken",
+  "confirmations.cancel_follow_request.confirm": "o weka e wile sina",
+  "confirmations.cancel_follow_request.message": "sina awen ala awen wile weka e wile kute sina lon {name}?",
+  "confirmations.delete.confirm": "o pakala",
+  "confirmations.delete.message": "sina wile ala wile pakala e toki ni",
+  "confirmations.delete_list.confirm": "o pakala",
+  "confirmations.delete_list.message": "sina wile ala wile pakala e lipu ni",
+  "confirmations.discard_edit_media.confirm": "o weka",
+  "confirmations.edit.confirm": "o ante",
+  "confirmations.logout.confirm": "o weka",
+  "confirmations.logout.message": "sina wile ala wile weka",
+  "confirmations.mute.confirm": "sina wile ala kute e jan ni",
+  "confirmations.mute.message": "sina awen ala awen wile kute ala e {name}?",
+  "confirmations.redraft.confirm": "o pakala o pali sin e toki",
+  "conversation.mark_as_read": "ni o sin ala",
+  "conversation.open": "o lukin e toki",
+  "conversation.with": "lon {names}",
+  "directory.new_arrivals": "jan pi kama sin",
+  "dismissable_banner.dismiss": "o weka",
+  "emoji_button.flags": "len ma",
+  "emoji_button.food": "moku",
+  "emoji_button.label": "o pana e Emosi",
+  "emoji_button.nature": "soweli en kasi",
+  "emoji_button.not_found": "sitelen Emosi ala li lon",
+  "emoji_button.objects": "ijo",
+  "emoji_button.people": "jan",
+  "emoji_button.search": "o alasa",
+  "emoji_button.search_results": "ijo pi alasa ni",
+  "emoji_button.symbols": "sitelen",
+  "emoji_button.travel": "ma en tawa",
+  "empty_column.account_timeline": "toki ala li lon!",
+  "empty_column.followed_tags": "sina alasa ala e toki ꞏ sina alasa e toki la toki li lon ni",
+  "empty_column.hashtag": "ala li lon toki ni",
+  "empty_column.mutes": "jan ala la sina wile ala kute.",
+  "explore.search_results": "ijo pi alasa ni",
+  "explore.suggested_follows": "jan",
+  "explore.title": "o alasa",
+  "explore.trending_links": "sin",
+  "explore.trending_statuses": "toki",
+  "filter_modal.select_filter.search": "o alasa anu pali",
+  "firehose.all": "ale",
+  "firehose.local": "ilo ni",
+  "firehose.remote": "ilo ante",
+  "follow_suggestions.view_all": "o lukin e ale",
+  "footer.privacy_policy": "lawa len",
+  "footer.source_code": "o lukin e toki ilo",
+  "footer.status": "lon",
+  "hashtag.column_settings.tag_mode.all": "ale ni",
+  "hashtag.column_settings.tag_mode.any": "wan ni",
+  "hashtag.column_settings.tag_mode.none": "ala ni",
+  "home.pending_critical_update.link": "o lukin e ijo ilo sin",
+  "interaction_modal.title.follow": "o kute e {name}",
+  "keyboard_shortcuts.muted": "sina wile ala kute e jan la o lukin e ona ale",
+  "lists.edit.submit": "o ante e nimi",
+  "mute_modal.duration": "tenpo seme",
+  "mute_modal.indefinite": "tenpo ale",
+  "navigation_bar.filters": "sina wile ala kute e nimi ni",
+  "navigation_bar.mutes": "sina wile ala kute e jan ni",
+  "report.block_explanation": "sina kama lukin ala e toki ona. ona li kama ala ken lukin e toki sina li kama ala ken kute e sina. ona li ken sona e kama ni.",
+  "report.category.title": "ike seme li lon {type} ni",
+  "report.mute": "o kute ala e ona",
+  "report.mute_explanation": "sina kama ala lukin e ijo pana ona. ona li awen ken kute e sina li awen ken lukin e sina li sona ala e weka kute sina e weka lukin sina.",
+  "search_popout.language_code": "nimi toki kepeken nasin ISO",
+  "status.edit": "o ante",
+  "status.edited": "ni li ante lon {date}",
+  "status.embed": "ni o lon insa pi lipu ante",
+  "status.history.created": "{name} li pali e ni lon {date}",
+  "status.history.edited": "{name} li ante lon {date}",
+  "status.load_more": "o kama e ijo ante",
+  "status.mute": "o kute ala e @{name}",
+  "status.mute_conversation": "o kute ala e ijo pi toki ni",
+  "status.show_less": "o lili e ni",
+  "status.show_less_all": "o lili e ale",
+  "status.show_more": "o suli e ni",
+  "status.show_more_all": "o suli e ale",
+  "status.show_original": "ijo mama pi ijo ni li seme",
+  "status.unmute_conversation": "o ken kute e ijo pi toki ni",
+  "timeline_hint.resources.statuses": "ijo pi tenpo suli",
+  "units.short.million": "{count}AAA",
+  "upload_error.limit": "ilo li ken ala e suli pi ijo ni.",
+  "upload_form.audio_description": "o toki e ijo kute tawa jan pi kute ala, tawa jan pi kute lili",
+  "upload_form.description": "o toki e ijo lukin tawa jan pi lukin ala, tawa jan pi lukin lili",
+  "upload_form.edit": "o ante",
+  "upload_form.video_description": "o toki e ijo kute tawa jan pi kute ala, tawa jan pi kute lili, e ijo lukin tawa jan pi lukin ala, tawa jan pi lukin lili",
+  "upload_modal.choose_image": "sitelen seme",
+  "upload_modal.description_placeholder": "mi pu jaki tan soweli",
+  "upload_modal.detect_text": "ilo o alasa e nimi tan sitelen",
+  "upload_modal.preparing_ocr": "ilo li open e alasa nimi lon sitelen…",
+  "upload_progress.label": "ilo li kama jo e ijo sina...",
+  "upload_progress.processing": "ilo li pali…",
+  "video.mute": "o kalama ala",
+  "video.pause": "o lape e ni",
+  "video.unmute": "o kalama"
+}
diff --git a/config/locales/activerecord.tok.yml b/config/locales/activerecord.tok.yml
new file mode 100644
index 00000000000000..5623538ba96cec
--- /dev/null
+++ b/config/locales/activerecord.tok.yml
@@ -0,0 +1,6 @@
+---
+tok:
+  activerecord:
+    attributes:
+      poll:
+        expires_at: pini tenpo
diff --git a/config/locales/devise.tok.yml b/config/locales/devise.tok.yml
new file mode 100644
index 00000000000000..d15ecd21b277d6
--- /dev/null
+++ b/config/locales/devise.tok.yml
@@ -0,0 +1 @@
+tok:
diff --git a/config/locales/doorkeeper.tok.yml b/config/locales/doorkeeper.tok.yml
new file mode 100644
index 00000000000000..d15ecd21b277d6
--- /dev/null
+++ b/config/locales/doorkeeper.tok.yml
@@ -0,0 +1 @@
+tok:
diff --git a/config/locales/simple_form.tok.yml b/config/locales/simple_form.tok.yml
new file mode 100644
index 00000000000000..9c60144bb5501d
--- /dev/null
+++ b/config/locales/simple_form.tok.yml
@@ -0,0 +1,14 @@
+---
+tok:
+  simple_form:
+    hints:
+      account:
+        display_name: nimi sina ale anu nimi sina musi.
+    labels:
+      defaults:
+        expires_in: ona o moli lon
+        setting_theme: kule lipu
+      user_role:
+        name: nimi
+    required:
+      text: ni li ken ala lon ala
diff --git a/config/locales/tok.yml b/config/locales/tok.yml
new file mode 100644
index 00000000000000..d15ecd21b277d6
--- /dev/null
+++ b/config/locales/tok.yml
@@ -0,0 +1 @@
+tok:

From 7efc33b909da0ec8a75521efab4357280a2f40ff Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 7 Feb 2024 14:35:37 +0100
Subject: [PATCH 0086/2191] Move HTTP Signature parsing code to its own class
 (#28932)

---
 .../activitypub/inboxes_controller.rb         |  5 +-
 .../concerns/signature_verification.rb        | 41 +-------------
 app/lib/signature_parser.rb                   | 53 +++++++++++++++++++
 spec/lib/signature_parser_spec.rb             | 34 ++++++++++++
 4 files changed, 91 insertions(+), 42 deletions(-)
 create mode 100644 app/lib/signature_parser.rb
 create mode 100644 spec/lib/signature_parser_spec.rb

diff --git a/app/controllers/activitypub/inboxes_controller.rb b/app/controllers/activitypub/inboxes_controller.rb
index ba85e0a7229a94..e8b0f47cdecbf5 100644
--- a/app/controllers/activitypub/inboxes_controller.rb
+++ b/app/controllers/activitypub/inboxes_controller.rb
@@ -62,11 +62,10 @@ def process_collection_synchronization
     return if raw_params.blank? || ENV['DISABLE_FOLLOWERS_SYNCHRONIZATION'] == 'true' || signed_request_account.nil?
 
     # Re-using the syntax for signature parameters
-    tree   = SignatureParamsParser.new.parse(raw_params)
-    params = SignatureParamsTransformer.new.apply(tree)
+    params = SignatureParser.parse(raw_params)
 
     ActivityPub::PrepareFollowersSynchronizationService.new.call(signed_request_account, params)
-  rescue Parslet::ParseFailed
+  rescue SignatureParser::ParsingError
     Rails.logger.warn 'Error parsing Collection-Synchronization header'
   end
 
diff --git a/app/controllers/concerns/signature_verification.rb b/app/controllers/concerns/signature_verification.rb
index 92f1eb5a168280..31558662716ba5 100644
--- a/app/controllers/concerns/signature_verification.rb
+++ b/app/controllers/concerns/signature_verification.rb
@@ -12,39 +12,6 @@ module SignatureVerification
 
   class SignatureVerificationError < StandardError; end
 
-  class SignatureParamsParser < Parslet::Parser
-    rule(:token)         { match("[0-9a-zA-Z!#$%&'*+.^_`|~-]").repeat(1).as(:token) }
-    rule(:quoted_string) { str('"') >> (qdtext | quoted_pair).repeat.as(:quoted_string) >> str('"') }
-    # qdtext and quoted_pair are not exactly according to spec but meh
-    rule(:qdtext)        { match('[^\\\\"]') }
-    rule(:quoted_pair)   { str('\\') >> any }
-    rule(:bws)           { match('\s').repeat }
-    rule(:param)         { (token.as(:key) >> bws >> str('=') >> bws >> (token | quoted_string).as(:value)).as(:param) }
-    rule(:comma)         { bws >> str(',') >> bws }
-    # Old versions of node-http-signature add an incorrect "Signature " prefix to the header
-    rule(:buggy_prefix)  { str('Signature ') }
-    rule(:params)        { buggy_prefix.maybe >> (param >> (comma >> param).repeat).as(:params) }
-    root(:params)
-  end
-
-  class SignatureParamsTransformer < Parslet::Transform
-    rule(params: subtree(:param)) do
-      (param.is_a?(Array) ? param : [param]).each_with_object({}) { |(key, value), hash| hash[key] = value }
-    end
-
-    rule(param: { key: simple(:key), value: simple(:val) }) do
-      [key, val]
-    end
-
-    rule(quoted_string: simple(:string)) do
-      string.to_s
-    end
-
-    rule(token: simple(:string)) do
-      string.to_s
-    end
-  end
-
   def require_account_signature!
     render json: signature_verification_failure_reason, status: signature_verification_failure_code unless signed_request_account
   end
@@ -135,12 +102,8 @@ def fail_with!(message, **options)
   end
 
   def signature_params
-    @signature_params ||= begin
-      raw_signature = request.headers['Signature']
-      tree          = SignatureParamsParser.new.parse(raw_signature)
-      SignatureParamsTransformer.new.apply(tree)
-    end
-  rescue Parslet::ParseFailed
+    @signature_params ||= SignatureParser.parse(request.headers['Signature'])
+  rescue SignatureParser::ParsingError
     raise SignatureVerificationError, 'Error parsing signature parameters'
   end
 
diff --git a/app/lib/signature_parser.rb b/app/lib/signature_parser.rb
new file mode 100644
index 00000000000000..c09ab0c841f694
--- /dev/null
+++ b/app/lib/signature_parser.rb
@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+class SignatureParser
+  class ParsingError < StandardError; end
+
+  # The syntax of this header is defined in:
+  # https://datatracker.ietf.org/doc/html/draft-cavage-http-signatures-12#section-4
+  # See https://datatracker.ietf.org/doc/html/rfc7235#appendix-C
+  # and https://datatracker.ietf.org/doc/html/rfc7230#section-3.2.6
+
+  # In addition, ignore a `Signature ` string prefix that was added by old versions
+  # of `node-http-signatures`
+
+  class SignatureParamsParser < Parslet::Parser
+    rule(:token)         { match("[0-9a-zA-Z!#$%&'*+.^_`|~-]").repeat(1).as(:token) }
+    rule(:quoted_string) { str('"') >> (qdtext | quoted_pair).repeat.as(:quoted_string) >> str('"') }
+    # qdtext and quoted_pair are not exactly according to spec but meh
+    rule(:qdtext)        { match('[^\\\\"]') }
+    rule(:quoted_pair)   { str('\\') >> any }
+    rule(:bws)           { match('\s').repeat }
+    rule(:param)         { (token.as(:key) >> bws >> str('=') >> bws >> (token | quoted_string).as(:value)).as(:param) }
+    rule(:comma)         { bws >> str(',') >> bws }
+    # Old versions of node-http-signature add an incorrect "Signature " prefix to the header
+    rule(:buggy_prefix)  { str('Signature ') }
+    rule(:params)        { buggy_prefix.maybe >> (param >> (comma >> param).repeat).as(:params) }
+    root(:params)
+  end
+
+  class SignatureParamsTransformer < Parslet::Transform
+    rule(params: subtree(:param)) do
+      (param.is_a?(Array) ? param : [param]).each_with_object({}) { |(key, value), hash| hash[key] = value }
+    end
+
+    rule(param: { key: simple(:key), value: simple(:val) }) do
+      [key, val]
+    end
+
+    rule(quoted_string: simple(:string)) do
+      string.to_s
+    end
+
+    rule(token: simple(:string)) do
+      string.to_s
+    end
+  end
+
+  def self.parse(raw_signature)
+    tree = SignatureParamsParser.new.parse(raw_signature)
+    SignatureParamsTransformer.new.apply(tree)
+  rescue Parslet::ParseFailed
+    raise ParsingError
+  end
+end
diff --git a/spec/lib/signature_parser_spec.rb b/spec/lib/signature_parser_spec.rb
new file mode 100644
index 00000000000000..183b486d560ae1
--- /dev/null
+++ b/spec/lib/signature_parser_spec.rb
@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe SignatureParser do
+  describe '.parse' do
+    subject { described_class.parse(header) }
+
+    context 'with Signature headers conforming to draft-cavage-http-signatures-12' do
+      let(:header) do
+        # This example signature string deliberately mixes uneven spacing
+        # and quoting styles to ensure everything is covered
+        'keyId = "https://remote.domain/users/bob#main-key",algorithm=  rsa-sha256 ,  headers="host date digest (request-target)",signature="gmhMjgMROGElJU3fpehV2acD5kMHeELi8EFP2UPHOdQ54H0r55AxIpji+J3lPe+N2qSb/4H1KXIh6f0lRu8TGSsu12OQmg5hiO8VA9flcA/mh9Lpk+qwlQZIPRqKP9xUEfqD+Z7ti5wPzDKrWAUK/7FIqWgcT/mlqB1R1MGkpMFc/q4CIs2OSNiWgA4K+Kp21oQxzC2kUuYob04gAZ7cyE/FTia5t08uv6lVYFdRsn4XNPn1MsHgFBwBMRG79ng3SyhoG4PrqBEi5q2IdLq3zfre/M6He3wlCpyO2VJNdGVoTIzeZ0Zz8jUscPV3XtWUchpGclLGSaKaq/JyNZeiYQ=="' # rubocop:disable Layout/LineLength
+      end
+
+      it 'correctly parses the header' do
+        expect(subject).to eq({
+          'keyId' => 'https://remote.domain/users/bob#main-key',
+          'algorithm' => 'rsa-sha256',
+          'headers' => 'host date digest (request-target)',
+          'signature' => 'gmhMjgMROGElJU3fpehV2acD5kMHeELi8EFP2UPHOdQ54H0r55AxIpji+J3lPe+N2qSb/4H1KXIh6f0lRu8TGSsu12OQmg5hiO8VA9flcA/mh9Lpk+qwlQZIPRqKP9xUEfqD+Z7ti5wPzDKrWAUK/7FIqWgcT/mlqB1R1MGkpMFc/q4CIs2OSNiWgA4K+Kp21oQxzC2kUuYob04gAZ7cyE/FTia5t08uv6lVYFdRsn4XNPn1MsHgFBwBMRG79ng3SyhoG4PrqBEi5q2IdLq3zfre/M6He3wlCpyO2VJNdGVoTIzeZ0Zz8jUscPV3XtWUchpGclLGSaKaq/JyNZeiYQ==', # rubocop:disable Layout/LineLength
+        })
+      end
+    end
+
+    context 'with a malformed Signature header' do
+      let(:header) { 'hello this is malformed!' }
+
+      it 'raises an error' do
+        expect { subject }.to raise_error(SignatureParser::ParsingError)
+      end
+    end
+  end
+end

From b2133fee5f365a5be370a08ff61187b5c40c9266 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 7 Feb 2024 08:37:10 -0500
Subject: [PATCH 0087/2191] Update artifact preservation to use `save_path`
 value (#29035)

---
 .github/workflows/test-ruby.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test-ruby.yml b/.github/workflows/test-ruby.yml
index 4275f594206767..7fd259ae0111e7 100644
--- a/.github/workflows/test-ruby.yml
+++ b/.github/workflows/test-ruby.yml
@@ -224,7 +224,7 @@ jobs:
         if: failure()
         with:
           name: e2e-screenshots
-          path: tmp/screenshots/
+          path: tmp/capybara/
 
   test-search:
     name: Elastic Search integration testing
@@ -328,4 +328,4 @@ jobs:
         if: failure()
         with:
           name: test-search-screenshots
-          path: tmp/screenshots/
+          path: tmp/capybara/

From dbafec88e5abdd1692007450d3f35fc9488afd7b Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 7 Feb 2024 15:10:38 +0100
Subject: [PATCH 0088/2191] Update dependency @reduxjs/toolkit to v2.1.0
 (#28879)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 75b4c355af97a5..7bfb524907a7dc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2612,11 +2612,11 @@ __metadata:
   linkType: hard
 
 "@reduxjs/toolkit@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "@reduxjs/toolkit@npm:2.0.1"
+  version: 2.1.0
+  resolution: "@reduxjs/toolkit@npm:2.1.0"
   dependencies:
     immer: "npm:^10.0.3"
-    redux: "npm:^5.0.0"
+    redux: "npm:^5.0.1"
     redux-thunk: "npm:^3.1.0"
     reselect: "npm:^5.0.1"
   peerDependencies:
@@ -2627,7 +2627,7 @@ __metadata:
       optional: true
     react-redux:
       optional: true
-  checksum: 161b9b8e11d9688890ab97b604a4c10c0d41b1369425a5fa821586932db4cd5a391d15799732b3612e6120a6336458ff577ff254219315c05ecd68da5d15fd79
+  checksum: 4ea9e9ea8cc2cab1c997127dc332c165cebc55bf8e95812ba4dc40d48dd87d5ee4bf3316b9eab49b5cce056eda6bdcb4b2a7dc3a15f056f64f76134f148f9f10
   languageName: node
   linkType: hard
 
@@ -14068,7 +14068,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"redux@npm:^5.0.0":
+"redux@npm:^5.0.1":
   version: 5.0.1
   resolution: "redux@npm:5.0.1"
   checksum: b10c28357194f38e7d53b760ed5e64faa317cc63de1fb95bc5d9e127fab956392344368c357b8e7a9bedb0c35b111e7efa522210cfdc3b3c75e5074718e9069c

From 95da28d201b9a9536331abe1fce6e7e571f3ff4a Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 7 Feb 2024 09:53:29 -0500
Subject: [PATCH 0089/2191] Add common `ThreadingHelper` module for specs
 (#29116)

---
 spec/lib/request_pool_spec.rb                 | 14 ++++-----
 spec/models/account_spec.rb                   | 13 ++------
 spec/models/concerns/account/counters_spec.rb | 30 +++++--------------
 spec/rails_helper.rb                          |  1 +
 spec/services/resolve_account_service_spec.rb | 22 +++++---------
 spec/support/threading_helpers.rb             | 17 +++++++++++
 6 files changed, 40 insertions(+), 57 deletions(-)
 create mode 100644 spec/support/threading_helpers.rb

diff --git a/spec/lib/request_pool_spec.rb b/spec/lib/request_pool_spec.rb
index a31d0783279ddb..a82eb5a188c0d9 100644
--- a/spec/lib/request_pool_spec.rb
+++ b/spec/lib/request_pool_spec.rb
@@ -33,18 +33,14 @@
 
       subject
 
-      threads = Array.new(5) do
-        Thread.new do
-          subject.with('http://example.com') do |http_client|
-            http_client.get('/').flush
-            # Nudge scheduler to yield and exercise the full pool
-            sleep(0.01)
-          end
+      multi_threaded_execution(5) do
+        subject.with('http://example.com') do |http_client|
+          http_client.get('/').flush
+          # Nudge scheduler to yield and exercise the full pool
+          sleep(0.01)
         end
       end
 
-      threads.map(&:join)
-
       expect(subject.size).to be > 1
     end
 
diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb
index 7ef5ca94cc894e..b1dca52dc5e916 100644
--- a/spec/models/account_spec.rb
+++ b/spec/models/account_spec.rb
@@ -1035,19 +1035,10 @@
     it 'increments the count in multi-threaded an environment when account_stat is not yet initialized' do
       subject
 
-      increment_by   = 15
-      wait_for_start = true
-
-      threads = Array.new(increment_by) do
-        Thread.new do
-          true while wait_for_start
-          described_class.find(subject.id).increment_count!(:followers_count)
-        end
+      multi_threaded_execution(15) do
+        described_class.find(subject.id).increment_count!(:followers_count)
       end
 
-      wait_for_start = false
-      threads.each(&:join)
-
       expect(subject.reload.followers_count).to eq 15
     end
   end
diff --git a/spec/models/concerns/account/counters_spec.rb b/spec/models/concerns/account/counters_spec.rb
index 2e1cd700bc2a75..3c063a2fa2901f 100644
--- a/spec/models/concerns/account/counters_spec.rb
+++ b/spec/models/concerns/account/counters_spec.rb
@@ -6,6 +6,8 @@
   let!(:account) { Fabricate(:account) }
 
   describe '#increment_count!' do
+    let(:increment_by) { 15 }
+
     it 'increments the count' do
       expect(account.followers_count).to eq 0
       account.increment_count!(:followers_count)
@@ -13,24 +15,17 @@
     end
 
     it 'increments the count in multi-threaded an environment' do
-      increment_by   = 15
-      wait_for_start = true
-
-      threads = Array.new(increment_by) do
-        Thread.new do
-          true while wait_for_start
-          account.increment_count!(:statuses_count)
-        end
+      multi_threaded_execution(increment_by) do
+        account.increment_count!(:statuses_count)
       end
 
-      wait_for_start = false
-      threads.each(&:join)
-
       expect(account.statuses_count).to eq increment_by
     end
   end
 
   describe '#decrement_count!' do
+    let(:decrement_by) { 10 }
+
     it 'decrements the count' do
       account.followers_count = 15
       account.save!
@@ -40,22 +35,13 @@
     end
 
     it 'decrements the count in multi-threaded an environment' do
-      decrement_by   = 10
-      wait_for_start = true
-
       account.statuses_count = 15
       account.save!
 
-      threads = Array.new(decrement_by) do
-        Thread.new do
-          true while wait_for_start
-          account.decrement_count!(:statuses_count)
-        end
+      multi_threaded_execution(decrement_by) do
+        account.decrement_count!(:statuses_count)
       end
 
-      wait_for_start = false
-      threads.each(&:join)
-
       expect(account.statuses_count).to eq 5
     end
   end
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 51253390961a52..cde5a439dbf106 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -86,6 +86,7 @@ def sign_in(resource, _deprecated = nil, scope: nil)
   config.include ActiveSupport::Testing::TimeHelpers
   config.include Chewy::Rspec::Helpers
   config.include Redisable
+  config.include ThreadingHelpers
   config.include SignedRequestHelpers, type: :request
   config.include CommandLineHelpers, type: :cli
 
diff --git a/spec/services/resolve_account_service_spec.rb b/spec/services/resolve_account_service_spec.rb
index 1c4c3b40160ff9..b82e5b3865a6cb 100644
--- a/spec/services/resolve_account_service_spec.rb
+++ b/spec/services/resolve_account_service_spec.rb
@@ -219,27 +219,19 @@
   end
 
   it 'processes one remote account at a time using locks' do
-    wait_for_start = true
     fail_occurred  = false
     return_values  = Concurrent::Array.new
 
-    threads = Array.new(5) do
-      Thread.new do
-        true while wait_for_start
-
-        begin
-          return_values << described_class.new.call('foo@ap.example.com')
-        rescue ActiveRecord::RecordNotUnique
-          fail_occurred = true
-        ensure
-          RedisConfiguration.pool.checkin if Thread.current[:redis]
-        end
+    multi_threaded_execution(5) do
+      begin
+        return_values << described_class.new.call('foo@ap.example.com')
+      rescue ActiveRecord::RecordNotUnique
+        fail_occurred = true
+      ensure
+        RedisConfiguration.pool.checkin if Thread.current[:redis]
       end
     end
 
-    wait_for_start = false
-    threads.each(&:join)
-
     expect(fail_occurred).to be false
     expect(return_values).to_not include(nil)
   end
diff --git a/spec/support/threading_helpers.rb b/spec/support/threading_helpers.rb
new file mode 100644
index 00000000000000..edf45822cae8b4
--- /dev/null
+++ b/spec/support/threading_helpers.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module ThreadingHelpers
+  def multi_threaded_execution(thread_count)
+    wait_for_start = true
+
+    threads = Array.new(thread_count) do
+      Thread.new do
+        true while wait_for_start
+        yield
+      end
+    end
+
+    wait_for_start = false
+    threads.each(&:join)
+  end
+end

From 79b4b94f3a3ec0ee7d81acf152e66b802e250b39 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 7 Feb 2024 09:54:40 -0500
Subject: [PATCH 0090/2191] Configure `CountAsOne` value for
 `RSpec/ExampleLength` cop (#29115)

---
 .rubocop.yml      | 5 +++++
 .rubocop_todo.yml | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 330c40de1b67b0..a8310489ea7084 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -134,6 +134,11 @@ Rails/UnusedIgnoredColumns:
 Rails/NegateInclude:
   Enabled: false
 
+# Reason: Enforce default limit, but allow some elements to span lines
+# https://docs.rubocop.org/rubocop-rspec/cops_rspec.html#rspecexamplelength
+RSpec/ExampleLength:
+  CountAsOne: ['array', 'heredoc', 'method_call']
+
 # Reason: Deprecated cop, will be removed in 3.0, replaced by SpecFilePathFormat
 # https://docs.rubocop.org/rubocop-rspec/cops_rspec.html#rspecfilepath
 RSpec/FilePath:
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 09e9fd73d8d27c..11ac570836da9f 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -36,7 +36,7 @@ Metrics/PerceivedComplexity:
 
 # Configuration parameters: CountAsOne.
 RSpec/ExampleLength:
-  Max: 22
+  Max: 20 # Override default of 5
 
 RSpec/MultipleExpectations:
   Max: 7

From eff447a4554e5285f5869432e1ea9e1ca884a806 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 7 Feb 2024 18:24:42 +0100
Subject: [PATCH 0091/2191] Rewrite signature verification using regexps and
 `StringScanner` (#29133)

---
 app/lib/signature_parser.rb       | 47 +++++++++++--------------------
 spec/lib/signature_parser_spec.rb |  4 +--
 2 files changed, 19 insertions(+), 32 deletions(-)

diff --git a/app/lib/signature_parser.rb b/app/lib/signature_parser.rb
index c09ab0c841f694..7a75080d987ef4 100644
--- a/app/lib/signature_parser.rb
+++ b/app/lib/signature_parser.rb
@@ -11,43 +11,30 @@ class ParsingError < StandardError; end
   # In addition, ignore a `Signature ` string prefix that was added by old versions
   # of `node-http-signatures`
 
-  class SignatureParamsParser < Parslet::Parser
-    rule(:token)         { match("[0-9a-zA-Z!#$%&'*+.^_`|~-]").repeat(1).as(:token) }
-    rule(:quoted_string) { str('"') >> (qdtext | quoted_pair).repeat.as(:quoted_string) >> str('"') }
-    # qdtext and quoted_pair are not exactly according to spec but meh
-    rule(:qdtext)        { match('[^\\\\"]') }
-    rule(:quoted_pair)   { str('\\') >> any }
-    rule(:bws)           { match('\s').repeat }
-    rule(:param)         { (token.as(:key) >> bws >> str('=') >> bws >> (token | quoted_string).as(:value)).as(:param) }
-    rule(:comma)         { bws >> str(',') >> bws }
+  TOKEN_RE = /[0-9a-zA-Z!#$%&'*+.^_`|~-]+/
+  # qdtext and quoted_pair are not exactly according to spec but meh
+  QUOTED_STRING_RE = /"([^\\"]|(\\.))*"/
+  PARAM_RE = /(?<key>#{TOKEN_RE})\s*=\s*((?<value>#{TOKEN_RE})|(?<quoted_value>#{QUOTED_STRING_RE}))/
+
+  def self.parse(raw_signature)
     # Old versions of node-http-signature add an incorrect "Signature " prefix to the header
-    rule(:buggy_prefix)  { str('Signature ') }
-    rule(:params)        { buggy_prefix.maybe >> (param >> (comma >> param).repeat).as(:params) }
-    root(:params)
-  end
+    raw_signature = raw_signature.delete_prefix('Signature ')
 
-  class SignatureParamsTransformer < Parslet::Transform
-    rule(params: subtree(:param)) do
-      (param.is_a?(Array) ? param : [param]).each_with_object({}) { |(key, value), hash| hash[key] = value }
-    end
+    params = {}
+    scanner = StringScanner.new(raw_signature)
 
-    rule(param: { key: simple(:key), value: simple(:val) }) do
-      [key, val]
-    end
+    # Use `skip` instead of `scan` as we only care about the subgroups
+    while scanner.skip(PARAM_RE)
+      # This is not actually correct with regards to quoted pairs, but it's consistent
+      # with our previous implementation, and good enough in practice.
+      params[scanner[:key]] = scanner[:value] || scanner[:quoted_value][1...-1]
 
-    rule(quoted_string: simple(:string)) do
-      string.to_s
-    end
+      scanner.skip(/\s*/)
+      return params if scanner.eos?
 
-    rule(token: simple(:string)) do
-      string.to_s
+      raise ParsingError unless scanner.skip(/\s*,\s*/)
     end
-  end
 
-  def self.parse(raw_signature)
-    tree = SignatureParamsParser.new.parse(raw_signature)
-    SignatureParamsTransformer.new.apply(tree)
-  rescue Parslet::ParseFailed
     raise ParsingError
   end
 end
diff --git a/spec/lib/signature_parser_spec.rb b/spec/lib/signature_parser_spec.rb
index 183b486d560ae1..08e9bea66c6e9e 100644
--- a/spec/lib/signature_parser_spec.rb
+++ b/spec/lib/signature_parser_spec.rb
@@ -10,12 +10,12 @@
       let(:header) do
         # This example signature string deliberately mixes uneven spacing
         # and quoting styles to ensure everything is covered
-        'keyId = "https://remote.domain/users/bob#main-key",algorithm=  rsa-sha256 ,  headers="host date digest (request-target)",signature="gmhMjgMROGElJU3fpehV2acD5kMHeELi8EFP2UPHOdQ54H0r55AxIpji+J3lPe+N2qSb/4H1KXIh6f0lRu8TGSsu12OQmg5hiO8VA9flcA/mh9Lpk+qwlQZIPRqKP9xUEfqD+Z7ti5wPzDKrWAUK/7FIqWgcT/mlqB1R1MGkpMFc/q4CIs2OSNiWgA4K+Kp21oQxzC2kUuYob04gAZ7cyE/FTia5t08uv6lVYFdRsn4XNPn1MsHgFBwBMRG79ng3SyhoG4PrqBEi5q2IdLq3zfre/M6He3wlCpyO2VJNdGVoTIzeZ0Zz8jUscPV3XtWUchpGclLGSaKaq/JyNZeiYQ=="' # rubocop:disable Layout/LineLength
+        'keyId = "https://remote.domain/users/bob#main-key,",algorithm=  rsa-sha256 ,  headers="host date digest (request-target)",signature="gmhMjgMROGElJU3fpehV2acD5kMHeELi8EFP2UPHOdQ54H0r55AxIpji+J3lPe+N2qSb/4H1KXIh6f0lRu8TGSsu12OQmg5hiO8VA9flcA/mh9Lpk+qwlQZIPRqKP9xUEfqD+Z7ti5wPzDKrWAUK/7FIqWgcT/mlqB1R1MGkpMFc/q4CIs2OSNiWgA4K+Kp21oQxzC2kUuYob04gAZ7cyE/FTia5t08uv6lVYFdRsn4XNPn1MsHgFBwBMRG79ng3SyhoG4PrqBEi5q2IdLq3zfre/M6He3wlCpyO2VJNdGVoTIzeZ0Zz8jUscPV3XtWUchpGclLGSaKaq/JyNZeiYQ=="' # rubocop:disable Layout/LineLength
       end
 
       it 'correctly parses the header' do
         expect(subject).to eq({
-          'keyId' => 'https://remote.domain/users/bob#main-key',
+          'keyId' => 'https://remote.domain/users/bob#main-key,',
           'algorithm' => 'rsa-sha256',
           'headers' => 'host date digest (request-target)',
           'signature' => 'gmhMjgMROGElJU3fpehV2acD5kMHeELi8EFP2UPHOdQ54H0r55AxIpji+J3lPe+N2qSb/4H1KXIh6f0lRu8TGSsu12OQmg5hiO8VA9flcA/mh9Lpk+qwlQZIPRqKP9xUEfqD+Z7ti5wPzDKrWAUK/7FIqWgcT/mlqB1R1MGkpMFc/q4CIs2OSNiWgA4K+Kp21oQxzC2kUuYob04gAZ7cyE/FTia5t08uv6lVYFdRsn4XNPn1MsHgFBwBMRG79ng3SyhoG4PrqBEi5q2IdLq3zfre/M6He3wlCpyO2VJNdGVoTIzeZ0Zz8jUscPV3XtWUchpGclLGSaKaq/JyNZeiYQ==', # rubocop:disable Layout/LineLength

From 2a362d62a81a5ec54f15cced02e1d197636d1773 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 8 Feb 2024 10:43:02 +0100
Subject: [PATCH 0092/2191] New Crowdin Translations (automated) (#29145)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/sk.json  |  5 ++
 app/javascript/mastodon/locales/tok.json | 73 ++++++++++++++++++++++--
 config/locales/devise.lad.yml            | 22 +++----
 config/locales/lad.yml                   |  4 +-
 config/locales/simple_form.tok.yml       |  3 +
 config/locales/sk.yml                    |  5 ++
 6 files changed, 95 insertions(+), 17 deletions(-)

diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json
index b91c45bb297235..7a05eb4f7e5d04 100644
--- a/app/javascript/mastodon/locales/sk.json
+++ b/app/javascript/mastodon/locales/sk.json
@@ -277,6 +277,7 @@
   "follow_request.authorize": "Povoľ prístup",
   "follow_request.reject": "Odmietni",
   "follow_requests.unlocked_explanation": "Síce Váš učet nie je uzamknutý, ale {domain} tím si myslel že môžete chcieť skontrolovať žiadosti o sledovanie z týchto účtov manuálne.",
+  "follow_suggestions.curated_suggestion": "Výber zo servera",
   "follow_suggestions.dismiss": "Znovu nezobrazuj",
   "follow_suggestions.personalized_suggestion": "Prispôsobené odporúčania",
   "follow_suggestions.view_all": "Zobraz všetky",
@@ -521,8 +522,12 @@
   "poll_button.add_poll": "Pridaj anketu",
   "poll_button.remove_poll": "Odstráň anketu",
   "privacy.change": "Uprav súkromie príspevku",
+  "privacy.direct.short": "Konkrétni ľudia",
+  "privacy.private.long": "Iba tvoji nasledovatelia",
   "privacy.private.short": "Sledovatelia",
+  "privacy.public.long": "Ktokoľvek na, aj mimo Mastodonu",
   "privacy.public.short": "Verejné",
+  "privacy.unlisted.short": "Verejný v tichosti",
   "privacy_policy.last_updated": "Posledná úprava {date}",
   "privacy_policy.title": "Zásady súkromia",
   "recommended": "Odporúčané",
diff --git a/app/javascript/mastodon/locales/tok.json b/app/javascript/mastodon/locales/tok.json
index a0227969dd6b4f..1c8435623855d1 100644
--- a/app/javascript/mastodon/locales/tok.json
+++ b/app/javascript/mastodon/locales/tok.json
@@ -1,9 +1,11 @@
 {
+  "about.blocks": "ma lawa",
   "about.contact": "toki:",
   "about.domain_blocks.no_reason_available": "mi sona ala e tan",
   "about.not_available": "lon kulupu ni la sina ken alasa ala e sona ni.",
   "about.rules": "lawa kulupu",
   "account.account_note_header": "sona awen",
+  "account.badges.group": "kulupu",
   "account.block": "o weka e @{name}",
   "account.block_domain": "o weka e ma {domain}",
   "account.block_short": "o weka e jan",
@@ -29,6 +31,7 @@
   "account.hide_reblogs": "o lukin ala e pana toki tan @{name}",
   "account.languages": "sina wile lukin e sitelen pi toki seme",
   "account.locked_info": "sina wile kute e jan ni la ona o toki e ken",
+  "account.media": "sitelen",
   "account.mention": "o toki e jan @{name}",
   "account.moved_to": "lipu jan sin pi jan {name} li ni:",
   "account.mute": "o kute ala e @{name}",
@@ -36,17 +39,25 @@
   "account.mute_short": "o kute ala",
   "account.muted": "sina kute ala e jan ni",
   "account.no_bio": "lipu li weka",
+  "account.open_original_page": "o open e lipu open",
   "account.posts": "toki suli",
   "account.posts_with_replies": "toki ale",
   "account.report": "jan @{name} la o toki e lawa",
   "account.requested": "jan ni o ken e kute sina. sina pini wile kute la o luka e ni",
   "account.requested_follow": "{name} li wile kute e sina",
+  "account.share": "o pana e lipu jan @{name}",
   "account.show_reblogs": "o lukin e pana toki tan @{name}",
+  "account.unblock": "o weka ala e jan {name}",
+  "account.unblock_domain": "o weka ala e ma {domain}",
   "account.unblock_short": "o pini weka",
   "account.unfollow": "o pini kute",
-  "account.unmute": "o ken lukin e sitelen tan @{name}",
+  "account.unmute": "o kute e @{name}",
   "account.unmute_notifications_short": "o kute e mu tan jan ni",
   "account.unmute_short": "o ken kute e jan ni",
+  "admin.dashboard.retention.average": "sama",
+  "admin.dashboard.retention.cohort": "tenpo mun open",
+  "admin.dashboard.retention.cohort_size": "jan sin",
+  "alert.rate_limited.message": "tenpo {retry_time, time, medium} la o pali awen",
   "alert.unexpected.message": "pakala li lon",
   "alert.unexpected.title": "pakala",
   "announcement.announcement": "toki suli",
@@ -56,14 +67,21 @@
   "bundle_column_error.retry": "o ni sin",
   "bundle_column_error.routing.body": "ilo li sona ala e lipu wile. sina pana ala pana e nasin pona tawa lipu?",
   "bundle_column_error.routing.title": "pakala nanpa 404",
+  "bundle_modal_error.close": "o pini",
   "bundle_modal_error.message": "ilo li wile kama e ijo ni, taso pakala li lon.",
   "bundle_modal_error.retry": "o ni sin",
+  "closed_registrations_modal.find_another_server": "o alasa e ma ante",
+  "column.blocks": "kulupu pi jan weka",
+  "column.lists": "lipu pi lipu mute",
   "column.mutes": "sina wile ala kute e jan ni",
+  "community.column_settings.local_only": "toki lon ni taso",
+  "community.column_settings.media_only": "sitelen taso",
   "compose.language.change": "o ante e nasin toki",
   "compose.language.search": "o alasa e nasin toki...",
+  "compose.published.open": "o lukin",
   "compose.saved.body": "ilo li awen e ijo pana sina.",
   "compose_form.direct_message_warning_learn_more": "o kama sona e ijo ante",
-  "compose_form.placeholder": "o toki",
+  "compose_form.placeholder": "sina toki insa e seme",
   "compose_form.poll.option_placeholder": "ken nanpa {number}",
   "compose_form.poll.switch_to_multiple": "o ante e nasin pana. pana mute o ken",
   "compose_form.poll.switch_to_single": "o ante e nasin pana. pana wan taso o lon",
@@ -72,6 +90,8 @@
   "compose_form.reply": "o toki lon ijo ni",
   "compose_form.save_changes": "o sin e ni",
   "compose_form.spoiler.marked": "o weka e toki pi ijo ike ken",
+  "confirmations.block.confirm": "o weka.",
+  "confirmations.block.message": "sina o wile ala wile weka e jan {name}?",
   "confirmations.cancel_follow_request.confirm": "o weka e wile sina",
   "confirmations.cancel_follow_request.message": "sina awen ala awen wile weka e wile kute sina lon {name}?",
   "confirmations.delete.confirm": "o pakala",
@@ -79,12 +99,16 @@
   "confirmations.delete_list.confirm": "o pakala",
   "confirmations.delete_list.message": "sina wile ala wile pakala e lipu ni",
   "confirmations.discard_edit_media.confirm": "o weka",
+  "confirmations.domain_block.confirm": "o weka.",
   "confirmations.edit.confirm": "o ante",
   "confirmations.logout.confirm": "o weka",
   "confirmations.logout.message": "sina wile ala wile weka",
   "confirmations.mute.confirm": "sina wile ala kute e jan ni",
   "confirmations.mute.message": "sina awen ala awen wile kute ala e {name}?",
   "confirmations.redraft.confirm": "o pakala o pali sin e toki",
+  "confirmations.unfollow.confirm": "o pini kute",
+  "confirmations.unfollow.message": "sina o wile ala wile pini kute e jan {name}?",
+  "conversation.delete": "o weka e toki ni",
   "conversation.mark_as_read": "ni o sin ala",
   "conversation.open": "o lukin e toki",
   "conversation.with": "lon {names}",
@@ -102,6 +126,7 @@
   "emoji_button.symbols": "sitelen",
   "emoji_button.travel": "ma en tawa",
   "empty_column.account_timeline": "toki ala li lon!",
+  "empty_column.account_unavailable": "ken ala lukin e lipu jan",
   "empty_column.followed_tags": "sina alasa ala e toki ꞏ sina alasa e toki la toki li lon ni",
   "empty_column.hashtag": "ala li lon toki ni",
   "empty_column.mutes": "jan ala la sina wile ala kute.",
@@ -110,36 +135,73 @@
   "explore.title": "o alasa",
   "explore.trending_links": "sin",
   "explore.trending_statuses": "toki",
+  "filter_modal.select_filter.expired": "tenpo pini",
   "filter_modal.select_filter.search": "o alasa anu pali",
   "firehose.all": "ale",
   "firehose.local": "ilo ni",
   "firehose.remote": "ilo ante",
+  "follow_request.authorize": "o sina kama",
+  "follow_request.reject": "o weka",
   "follow_suggestions.view_all": "o lukin e ale",
   "footer.privacy_policy": "lawa len",
   "footer.source_code": "o lukin e toki ilo",
   "footer.status": "lon",
+  "hashtag.column_header.tag_mode.all": "en {additional}",
+  "hashtag.column_header.tag_mode.any": "anu {additional}",
   "hashtag.column_settings.tag_mode.all": "ale ni",
   "hashtag.column_settings.tag_mode.any": "wan ni",
   "hashtag.column_settings.tag_mode.none": "ala ni",
   "home.pending_critical_update.link": "o lukin e ijo ilo sin",
+  "interaction_modal.on_another_server": "lon ma ante",
+  "interaction_modal.on_this_server": "lon ma ni",
   "interaction_modal.title.follow": "o kute e {name}",
   "keyboard_shortcuts.muted": "sina wile ala kute e jan la o lukin e ona ale",
+  "keyboard_shortcuts.open_media": "o open e sitelen",
+  "keyboard_shortcuts.toggle_sensitivity": "sitelen la o len anu lukin",
+  "lightbox.close": "o pini",
+  "link_preview.author": "{name} li pali e ni",
   "lists.edit.submit": "o ante e nimi",
-  "mute_modal.duration": "tenpo seme",
+  "lists.replies_policy.none": "jan ala",
+  "mute_modal.duration": "tenpo",
   "mute_modal.indefinite": "tenpo ale",
   "navigation_bar.filters": "sina wile ala kute e nimi ni",
   "navigation_bar.mutes": "sina wile ala kute e jan ni",
+  "notification.follow": "jan {name} li kama kute e sina",
+  "notification.follow_request": "{name} li wile kute e sina",
+  "notification.mention": "jan {name} li toki e sina",
+  "notifications.column_settings.follow": "jan kute sin",
+  "notifications.filter.all": "ale",
+  "onboarding.start.title": "sina o kama pona a!",
+  "privacy.public.short": "jan ale",
+  "relative_time.full.just_now": "tenpo ni",
+  "relative_time.just_now": "tenpo ni",
+  "relative_time.today": "tenpo suno ni",
+  "report.block": "o weka e jan",
   "report.block_explanation": "sina kama lukin ala e toki ona. ona li kama ala ken lukin e toki sina li kama ala ken kute e sina. ona li ken sona e kama ni.",
   "report.category.title": "ike seme li lon {type} ni",
+  "report.close": "o pini",
   "report.mute": "o kute ala e ona",
   "report.mute_explanation": "sina kama ala lukin e ijo pana ona. ona li awen ken kute e sina li awen ken lukin e sina li sona ala e weka kute sina e weka lukin sina.",
+  "report.reasons.dislike": "ni li ike tawa mi",
+  "report.thanks.title": "sina wile ala lukin e ni anu seme?",
+  "search.placeholder": "o alasa",
+  "search.quick_action.go_to_account": "o tawa lipu jan {x}",
   "search_popout.language_code": "nimi toki kepeken nasin ISO",
+  "search_results.all": "ale",
+  "search_results.see_all": "ale",
+  "search_results.statuses": "toki",
+  "search_results.title": "o alasa e {q}",
+  "status.block": "o weka e @{name}",
+  "status.delete": "o weka",
   "status.edit": "o ante",
   "status.edited": "ni li ante lon {date}",
   "status.embed": "ni o lon insa pi lipu ante",
   "status.history.created": "{name} li pali e ni lon {date}",
   "status.history.edited": "{name} li ante lon {date}",
   "status.load_more": "o kama e ijo ante",
+  "status.media.open": "o open",
+  "status.media.show": "o lukin",
+  "status.media_hidden": "sitelen li len",
   "status.mute": "o kute ala e @{name}",
   "status.mute_conversation": "o kute ala e ijo pi toki ni",
   "status.show_less": "o lili e ni",
@@ -147,6 +209,7 @@
   "status.show_more": "o suli e ni",
   "status.show_more_all": "o suli e ale",
   "status.show_original": "ijo mama pi ijo ni li seme",
+  "status.uncached_media_warning": "lukin lili li weka",
   "status.unmute_conversation": "o ken kute e ijo pi toki ni",
   "timeline_hint.resources.statuses": "ijo pi tenpo suli",
   "units.short.million": "{count}AAA",
@@ -155,12 +218,14 @@
   "upload_form.description": "o toki e ijo lukin tawa jan pi lukin ala, tawa jan pi lukin lili",
   "upload_form.edit": "o ante",
   "upload_form.video_description": "o toki e ijo kute tawa jan pi kute ala, tawa jan pi kute lili, e ijo lukin tawa jan pi lukin ala, tawa jan pi lukin lili",
-  "upload_modal.choose_image": "sitelen seme",
+  "upload_modal.choose_image": "o wile e sitelen",
   "upload_modal.description_placeholder": "mi pu jaki tan soweli",
   "upload_modal.detect_text": "ilo o alasa e nimi tan sitelen",
+  "upload_modal.edit_media": "o ante e sitelen",
   "upload_modal.preparing_ocr": "ilo li open e alasa nimi lon sitelen…",
   "upload_progress.label": "ilo li kama jo e ijo sina...",
   "upload_progress.processing": "ilo li pali…",
+  "username.taken": "jan ante li jo e nimi ni. sina o pali e nimi sin.",
   "video.mute": "o kalama ala",
   "video.pause": "o lape e ni",
   "video.unmute": "o kalama"
diff --git a/config/locales/devise.lad.yml b/config/locales/devise.lad.yml
index 88099f48c4e2dd..d2ce53760c5257 100644
--- a/config/locales/devise.lad.yml
+++ b/config/locales/devise.lad.yml
@@ -89,25 +89,25 @@ lad:
       no_token: No puedes akseder a esta pajina si no vienes dizde una posta elektronika de restablesimyento de kod. Si vienes dizde una posta elektronika de restablesimyento de kod, por favor asigurate de utilizar el URL kompleto embiado.
       send_instructions: Si tu adreso de posta elektronika existe en muestra baza de datos, risiviras un atadijo de rekuperasyon de kod en tu adreso de posta elektronika en pokos minutos. Por favor, komprova tu kuti de posta spam si no risives akeya posta elektronika.
       send_paranoid_instructions: Si tu adreso de posta elektronika existe en muestra baza de datos, risiviras un atadijo de rekuperasyon de kod en tu adreso de posta elektronika en pokos minutos. Por favor, komprova tu kuti de posta no deseado si no risives akeya posta elektronika.
-      updated: Tu kod a sido trokado kon reusho. Tyenes entrado en kuento.
-      updated_not_active: Tu kod se tiene trokado kon reusho.
+      updated: Tu kod a sido trokado kon reushita. Tyenes entrado en kuento.
+      updated_not_active: Tu kod se tiene trokado kon reushita.
     registrations:
-      destroyed: Tu kuento a sido efasado kon reusho. Asperamos verte de muevo pronto.
+      destroyed: Tu kuento a sido efasado kon reushita. Asperamos verte de muevo pronto.
       signed_up: Bienvenido! Te tienes enrejistrado djustamente.
-      signed_up_but_inactive: Te tienes enrejistrado kon reusho. Entanto, no se pudio inisyar sesyon porke tu kuento ainda no esta aktivado.
-      signed_up_but_locked: Te tienes enrejistrado kon reusho. Entanto, no pudites konektarte kon tu kuento porke tu kuento esta blokado.
+      signed_up_but_inactive: Te tienes enrejistrado kon reushita. Entanto, no se pudio inisyar sesyon porke tu kuento ainda no esta aktivado.
+      signed_up_but_locked: Te tienes enrejistrado kon reushita. Entanto, no pudites konektarte kon tu kuento porke tu kuento esta blokado.
       signed_up_but_pending: Un mesaj kon un atadijo de konfirmasyon a sido enviado a tu adreso de posta elektronika. Dempues de klikar en el atadijo, revizaremos tu solisitud. Seras avizado si se acheta.
       signed_up_but_unconfirmed: Un mesaj kon un atadijo de konfirmasyon a sido enviado a tu adreso de posta elektronika. Por favor, sigue el atadijo para aktivar tu kuento. Por favor, komprova tu kuti de posta spam si no risives akeya posta elektronika.
-      update_needs_confirmation: Tienes aktualizado tu kuento kon reusho, pero kale verifikar tu muevo adreso de posta elektronika. Por favor, komprova tu posta elektronika i sige el atadijo de konfirmasyon para konfirmar tu muevo adreso de posta elektronika. Por favor, komprova tu kuti de posta spam si no risives akeya posta elektronika.
-      updated: Tu kuento se aktualizo kon reusho.
+      update_needs_confirmation: Tienes aktualizado tu kuento kon reushita, pero kale verifikar tu muevo adreso de posta elektronika. Por favor, komprova tu posta elektronika i sige el atadijo de konfirmasyon para konfirmar tu muevo adreso de posta elektronika. Por favor, komprova tu kuti de posta spam si no risives akeya posta elektronika.
+      updated: Tu kuento se aktualizo kon reushita.
     sessions:
-      already_signed_out: Salites del kuento kon reusho.
-      signed_in: Konektates kon tu kuento kon reusho.
-      signed_out: Salites del kuento kon reusho.
+      already_signed_out: Salites del kuento kon reushita.
+      signed_in: Konektates kon tu kuento kon reushita.
+      signed_out: Salites del kuento kon reushita.
     unlocks:
       send_instructions: En unos minutos risiviras una posta elektronika kon instruksyones para dezblokar tu kuento. Por favor, komprova tu kuti de posta spam si no risives akeya posta elektronika.
       send_paranoid_instructions: Si tu kuento existe, en unos minutos risiviras una posta elektronika kon instruksyones para dezblokarlo. Por favor, reviza tu kuti de posta spam si no risives akeya posta elektronika.
-      unlocked: Tu kuento fue dezblokado kon reusho. Por favor, konektate kon tu kuento para kontinuar.
+      unlocked: Tu kuento fue dezblokado kon reushita. Por favor, konektate kon tu kuento para kontinuar.
   errors:
     messages:
       already_confirmed: ya estaba konfirmado, por favor aprova konektarte kon tu kuento
diff --git a/config/locales/lad.yml b/config/locales/lad.yml
index d4f772095e096e..77501e3b324883 100644
--- a/config/locales/lad.yml
+++ b/config/locales/lad.yml
@@ -1146,7 +1146,7 @@ lad:
     confirm_password: Eskrive tu kod aktual para demostrar tu identita
     confirm_username: Eskrive tu nombre de utilizador para konfirmar
     proceed: Efasa kuento
-    success_msg: Tu kuento fue efasado kon reusho
+    success_msg: Tu kuento fue efasado kon reushita
     warning:
       before: 'Antes de kontinuar, por favor melda kon atensyon las sigientes notas:'
       caches: El kontenido ke tiene sido magazinado en kashe por otros sirvidores puede persistir
@@ -1283,7 +1283,7 @@ lad:
       one: "<strong>%{count}</strong> elemento ke koenside con tu bushkeda esta eskojido."
       other: Todos los <strong>%{count}</strong> elementos ke koensiden con tu bushkeda estan eskojidos.
     cancel: Anula
-    changes_saved_msg: Trokamientos guadrados kon reusho!
+    changes_saved_msg: Trokamientos guadrados kon reushita!
     confirm: Konfirma
     copy: Kopia
     delete: Efasa
diff --git a/config/locales/simple_form.tok.yml b/config/locales/simple_form.tok.yml
index 9c60144bb5501d..1eb7d5be87c29f 100644
--- a/config/locales/simple_form.tok.yml
+++ b/config/locales/simple_form.tok.yml
@@ -4,6 +4,9 @@ tok:
     hints:
       account:
         display_name: nimi sina ale anu nimi sina musi.
+      defaults:
+        setting_display_media_hide_all: tenpo ale la, o weka e sitelen
+        setting_display_media_show_all: tenpo ale la, o awen e sitelen
     labels:
       defaults:
         expires_in: ona o moli lon
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 5ffbf45bdedf33..f13a15d795a981 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -260,6 +260,11 @@ sk:
         suspend_account_html: "%{name} zablokoval/a účet používateľa %{target}"
         unassigned_report_html: "%{name} odobral/a report od %{target}"
         unsuspend_account_html: "%{name} spojazdnil/a účet %{target}"
+        update_announcement_html: "%{name} aktualizoval/a oboznámenie %{target}"
+        update_custom_emoji_html: "%{name} aktualizoval/a emotikonu %{target}"
+        update_domain_block_html: "%{name} aktualizoval/a blokovanie domény pre %{target}"
+        update_ip_block_html: "%{name} zmenil/a pravidlo pre IP %{target}"
+        update_status_html: "%{name} aktualizoval/a príspevok od %{target}"
         update_user_role_html: "%{name} zmenil/a rolu pre %{target}"
       deleted_account: zmazaný účet
       empty: Žiadne záznamy nenájdené.

From 52986f35b87d97b71e99536b01f41f7a77ca5ec6 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 8 Feb 2024 10:49:24 +0100
Subject: [PATCH 0093/2191] Update dependency postcss to v8.4.35 (#29136)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 7bfb524907a7dc..fb3472904855ea 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -13144,13 +13144,13 @@ __metadata:
   linkType: hard
 
 "postcss@npm:^8.2.15, postcss@npm:^8.4.24, postcss@npm:^8.4.33":
-  version: 8.4.34
-  resolution: "postcss@npm:8.4.34"
+  version: 8.4.35
+  resolution: "postcss@npm:8.4.35"
   dependencies:
     nanoid: "npm:^3.3.7"
     picocolors: "npm:^1.0.0"
     source-map-js: "npm:^1.0.2"
-  checksum: 4d6f072cdfdc1ced16b4336263d830f8b4397fc47b9b382e02f6448fda9386d881aa9d27fbe0dd124f59c76f3a5da4f360919d25dfc818eca50b48f042af35a8
+  checksum: e8dd04e48001eb5857abc9475365bf08f4e508ddf9bc0b8525449a95d190f10d025acebc5b56ac2e94b3c7146790e4ae78989bb9633cb7ee20d1cc9b7dc909b2
   languageName: node
   linkType: hard
 

From 5271131658181bd94eb8a57cc877ef281855e132 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 8 Feb 2024 05:02:53 -0500
Subject: [PATCH 0094/2191] Extract helper method for repeated form fill in
 admin/domain_blocks feature spec (#29128)

---
 spec/features/admin/domain_blocks_spec.rb | 31 +++++++++++++----------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/spec/features/admin/domain_blocks_spec.rb b/spec/features/admin/domain_blocks_spec.rb
index 6a1405cdf64169..99aa7cf1a760fa 100644
--- a/spec/features/admin/domain_blocks_spec.rb
+++ b/spec/features/admin/domain_blocks_spec.rb
@@ -12,9 +12,7 @@
     it 'adds a new domain block' do
       visit new_admin_domain_block_path
 
-      fill_in 'domain_block_domain', with: 'example.com'
-      select I18n.t('admin.domain_blocks.new.severity.silence'), from: 'domain_block_severity'
-      click_on I18n.t('admin.domain_blocks.new.create')
+      submit_domain_block('example.com', 'silence')
 
       expect(DomainBlock.exists?(domain: 'example.com', severity: 'silence')).to be true
       expect(DomainBlockWorker).to have_received(:perform_async)
@@ -25,9 +23,7 @@
     it 'presents a confirmation screen before suspending the domain' do
       visit new_admin_domain_block_path
 
-      fill_in 'domain_block_domain', with: 'example.com'
-      select I18n.t('admin.domain_blocks.new.severity.suspend'), from: 'domain_block_severity'
-      click_on I18n.t('admin.domain_blocks.new.create')
+      submit_domain_block('example.com', 'suspend')
 
       # It doesn't immediately block but presents a confirmation screen
       expect(page).to have_title(I18n.t('admin.domain_blocks.confirm_suspension.title', domain: 'example.com'))
@@ -47,9 +43,7 @@
 
       visit new_admin_domain_block_path
 
-      fill_in 'domain_block_domain', with: 'example.com'
-      select I18n.t('admin.domain_blocks.new.severity.suspend'), from: 'domain_block_severity'
-      click_on I18n.t('admin.domain_blocks.new.create')
+      submit_domain_block('example.com', 'suspend')
 
       # It doesn't immediately block but presents a confirmation screen
       expect(page).to have_title(I18n.t('admin.domain_blocks.confirm_suspension.title', domain: 'example.com'))
@@ -69,9 +63,7 @@
 
       visit new_admin_domain_block_path
 
-      fill_in 'domain_block_domain', with: 'subdomain.example.com'
-      select I18n.t('admin.domain_blocks.new.severity.suspend'), from: 'domain_block_severity'
-      click_on I18n.t('admin.domain_blocks.new.create')
+      submit_domain_block('subdomain.example.com', 'suspend')
 
       # It doesn't immediately block but presents a confirmation screen
       expect(page).to have_title(I18n.t('admin.domain_blocks.confirm_suspension.title', domain: 'subdomain.example.com'))
@@ -84,8 +76,11 @@
       expect(DomainBlockWorker).to have_received(:perform_async)
 
       # And leaves the previous block alone
-      expect(domain_block.reload.severity).to eq 'silence'
-      expect(domain_block.reload.domain).to eq 'example.com'
+      expect(domain_block.reload)
+        .to have_attributes(
+          severity: eq('silence'),
+          domain: eq('example.com')
+        )
     end
   end
 
@@ -109,4 +104,12 @@
       expect(domain_block.reload.severity).to eq 'suspend'
     end
   end
+
+  private
+
+  def submit_domain_block(domain, severity)
+    fill_in 'domain_block_domain', with: domain
+    select I18n.t("admin.domain_blocks.new.severity.#{severity}"), from: 'domain_block_severity'
+    click_on I18n.t('admin.domain_blocks.new.create')
+  end
 end

From 15437e4ad9a741eef2d309d5c56a431504d5a45e Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 8 Feb 2024 05:03:04 -0500
Subject: [PATCH 0095/2191] Add `context` and `before` to lengthy tag manager
 spec examples (#29129)

---
 spec/lib/activitypub/tag_manager_spec.rb | 70 ++++++++++++++----------
 1 file changed, 42 insertions(+), 28 deletions(-)

diff --git a/spec/lib/activitypub/tag_manager_spec.rb b/spec/lib/activitypub/tag_manager_spec.rb
index 55e9b4bb510f1f..05d2609b0dad0e 100644
--- a/spec/lib/activitypub/tag_manager_spec.rb
+++ b/spec/lib/activitypub/tag_manager_spec.rb
@@ -52,20 +52,27 @@
       expect(subject.to(status)).to include(subject.followers_uri_for(mentioned))
     end
 
-    it "returns URIs of mentions for direct silenced author's status only if they are followers or requesting to be" do
-      bob    = Fabricate(:account, username: 'bob')
-      alice  = Fabricate(:account, username: 'alice')
-      foo    = Fabricate(:account)
-      author = Fabricate(:account, username: 'author', silenced: true)
-      status = Fabricate(:status, visibility: :direct, account: author)
-      bob.follow!(author)
-      FollowRequest.create!(account: foo, target_account: author)
-      status.mentions.create(account: alice)
-      status.mentions.create(account: bob)
-      status.mentions.create(account: foo)
-      expect(subject.to(status)).to include(subject.uri_for(bob))
-      expect(subject.to(status)).to include(subject.uri_for(foo))
-      expect(subject.to(status)).to_not include(subject.uri_for(alice))
+    context 'with followers and requested followers' do
+      let!(:bob) { Fabricate(:account, username: 'bob') }
+      let!(:alice) { Fabricate(:account, username: 'alice') }
+      let!(:foo) { Fabricate(:account) }
+      let!(:author) { Fabricate(:account, username: 'author', silenced: true) }
+      let!(:status) { Fabricate(:status, visibility: :direct, account: author) }
+
+      before do
+        bob.follow!(author)
+        FollowRequest.create!(account: foo, target_account: author)
+        status.mentions.create(account: alice)
+        status.mentions.create(account: bob)
+        status.mentions.create(account: foo)
+      end
+
+      it "returns URIs of mentions for direct silenced author's status only if they are followers or requesting to be" do
+        expect(subject.to(status))
+          .to include(subject.uri_for(bob))
+          .and include(subject.uri_for(foo))
+          .and not_include(subject.uri_for(alice))
+      end
     end
   end
 
@@ -97,20 +104,27 @@
       expect(subject.cc(status)).to include(subject.uri_for(mentioned))
     end
 
-    it "returns URIs of mentions for silenced author's non-direct status only if they are followers or requesting to be" do
-      bob    = Fabricate(:account, username: 'bob')
-      alice  = Fabricate(:account, username: 'alice')
-      foo    = Fabricate(:account)
-      author = Fabricate(:account, username: 'author', silenced: true)
-      status = Fabricate(:status, visibility: :public, account: author)
-      bob.follow!(author)
-      FollowRequest.create!(account: foo, target_account: author)
-      status.mentions.create(account: alice)
-      status.mentions.create(account: bob)
-      status.mentions.create(account: foo)
-      expect(subject.cc(status)).to include(subject.uri_for(bob))
-      expect(subject.cc(status)).to include(subject.uri_for(foo))
-      expect(subject.cc(status)).to_not include(subject.uri_for(alice))
+    context 'with followers and requested followers' do
+      let!(:bob) { Fabricate(:account, username: 'bob') }
+      let!(:alice) { Fabricate(:account, username: 'alice') }
+      let!(:foo) { Fabricate(:account) }
+      let!(:author) { Fabricate(:account, username: 'author', silenced: true) }
+      let!(:status) { Fabricate(:status, visibility: :public, account: author) }
+
+      before do
+        bob.follow!(author)
+        FollowRequest.create!(account: foo, target_account: author)
+        status.mentions.create(account: alice)
+        status.mentions.create(account: bob)
+        status.mentions.create(account: foo)
+      end
+
+      it "returns URIs of mentions for silenced author's non-direct status only if they are followers or requesting to be" do
+        expect(subject.cc(status))
+          .to include(subject.uri_for(bob))
+          .and include(subject.uri_for(foo))
+          .and not_include(subject.uri_for(alice))
+      end
     end
 
     it 'returns poster of reblogged post, if reblog' do

From 13840d685c3a19dee6f99d3b74a8bfd3a45cb2ab Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 8 Feb 2024 11:03:30 +0100
Subject: [PATCH 0096/2191] Update dependency irb to v1.11.2 (#29135)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index d60def5222acc2..aa3d95715de88c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -351,7 +351,7 @@ GEM
       terminal-table (>= 1.5.1)
     idn-ruby (0.1.5)
     io-console (0.7.2)
-    irb (1.11.1)
+    irb (1.11.2)
       rdoc
       reline (>= 0.4.2)
     jmespath (1.6.2)

From d4db1c497bb25e8a8cb8b0a505d49bb3a99e308c Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 8 Feb 2024 11:03:39 +0100
Subject: [PATCH 0097/2191] Update dependency pghero to v3.4.1 (#29144)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index aa3d95715de88c..152436b47a421c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -506,7 +506,7 @@ GEM
     pastel (0.8.0)
       tty-color (~> 0.5)
     pg (1.5.4)
-    pghero (3.4.0)
+    pghero (3.4.1)
       activerecord (>= 6)
     posix-spawn (0.3.15)
     premailer (1.21.0)

From 67ec192d7dbb350511059a858d573daf49ecaf4f Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 8 Feb 2024 12:40:22 +0100
Subject: [PATCH 0098/2191] Clean up some unused CSS definitions (#29146)

---
 .../styles/mastodon/components.scss           | 51 -------------------
 1 file changed, 51 deletions(-)

diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index f70fa12a51abd4..427144ed8e053a 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -4711,43 +4711,6 @@ a.status-card {
   animation: heartbeat 1.5s ease-in-out infinite both;
 }
 
-@keyframes shake-bottom {
-  0%,
-  100% {
-    transform: rotate(0deg);
-    transform-origin: 50% 100%;
-  }
-
-  10% {
-    transform: rotate(2deg);
-  }
-
-  20%,
-  40%,
-  60% {
-    transform: rotate(-4deg);
-  }
-
-  30%,
-  50%,
-  70% {
-    transform: rotate(4deg);
-  }
-
-  80% {
-    transform: rotate(-2deg);
-  }
-
-  90% {
-    transform: rotate(2deg);
-  }
-}
-
-.no-reduce-motion .shake-bottom {
-  transform-origin: 50% 100%;
-  animation: shake-bottom 0.8s cubic-bezier(0.455, 0.03, 0.515, 0.955) 2s 2 both;
-}
-
 .emoji-picker-dropdown__menu {
   position: relative;
   margin-top: 5px;
@@ -5353,20 +5316,6 @@ a.status-card {
   }
 }
 
-.search-results__hashtag {
-  display: block;
-  padding: 10px;
-  color: $secondary-text-color;
-  text-decoration: none;
-
-  &:hover,
-  &:active,
-  &:focus {
-    color: lighten($secondary-text-color, 4%);
-    text-decoration: underline;
-  }
-}
-
 .search-results__info {
   padding: 20px;
   color: $darker-text-color;

From a9e91eb95565a7da74d7c961e56e9c7d6d6b94b1 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 8 Feb 2024 09:26:45 -0500
Subject: [PATCH 0099/2191] Add common stub setup for resolv dns in email mx
 validator spec (#29140)

---
 spec/validators/email_mx_validator_spec.rb | 96 +++++++++++-----------
 1 file changed, 46 insertions(+), 50 deletions(-)

diff --git a/spec/validators/email_mx_validator_spec.rb b/spec/validators/email_mx_validator_spec.rb
index 21b1ad0a113c37..bc26be8729551e 100644
--- a/spec/validators/email_mx_validator_spec.rb
+++ b/spec/validators/email_mx_validator_spec.rb
@@ -5,6 +5,7 @@
 describe EmailMxValidator do
   describe '#validate' do
     let(:user) { instance_double(User, email: 'foo@example.com', sign_up_ip: '1.2.3.4', errors: instance_double(ActiveModel::Errors, add: nil)) }
+    let(:resolv_dns_double) { instance_double(Resolv::DNS) }
 
     context 'with an e-mail domain that is explicitly allowed' do
       around do |block|
@@ -15,13 +16,7 @@
       end
 
       it 'does not add errors if there are no DNS records' do
-        resolver = instance_double(Resolv::DNS)
-
-        allow(resolver).to receive(:getresources).with('example.com', Resolv::DNS::Resource::IN::MX).and_return([])
-        allow(resolver).to receive(:getresources).with('example.com', Resolv::DNS::Resource::IN::A).and_return([])
-        allow(resolver).to receive(:getresources).with('example.com', Resolv::DNS::Resource::IN::AAAA).and_return([])
-        allow(resolver).to receive(:timeouts=).and_return(nil)
-        allow(Resolv::DNS).to receive(:open).and_yield(resolver)
+        configure_resolver('example.com')
 
         subject.validate(user)
         expect(user.errors).to_not have_received(:add)
@@ -29,13 +24,7 @@
     end
 
     it 'adds no error if there are DNS records for the e-mail domain' do
-      resolver = instance_double(Resolv::DNS)
-
-      allow(resolver).to receive(:getresources).with('example.com', Resolv::DNS::Resource::IN::MX).and_return([])
-      allow(resolver).to receive(:getresources).with('example.com', Resolv::DNS::Resource::IN::A).and_return([Resolv::DNS::Resource::IN::A.new('192.0.2.42')])
-      allow(resolver).to receive(:getresources).with('example.com', Resolv::DNS::Resource::IN::AAAA).and_return([])
-      allow(resolver).to receive(:timeouts=).and_return(nil)
-      allow(Resolv::DNS).to receive(:open).and_yield(resolver)
+      configure_resolver('example.com', a: resolv_double_a('192.0.2.42'))
 
       subject.validate(user)
       expect(user.errors).to_not have_received(:add)
@@ -58,13 +47,7 @@
     end
 
     it 'adds an error if the email domain name contains empty labels' do
-      resolver = instance_double(Resolv::DNS)
-
-      allow(resolver).to receive(:getresources).with('example..com', Resolv::DNS::Resource::IN::MX).and_return([])
-      allow(resolver).to receive(:getresources).with('example..com', Resolv::DNS::Resource::IN::A).and_return([Resolv::DNS::Resource::IN::A.new('192.0.2.42')])
-      allow(resolver).to receive(:getresources).with('example..com', Resolv::DNS::Resource::IN::AAAA).and_return([])
-      allow(resolver).to receive(:timeouts=).and_return(nil)
-      allow(Resolv::DNS).to receive(:open).and_yield(resolver)
+      configure_resolver('example..com', a: resolv_double_a('192.0.2.42'))
 
       user = instance_double(User, email: 'foo@example..com', sign_up_ip: '1.2.3.4', errors: instance_double(ActiveModel::Errors, add: nil))
       subject.validate(user)
@@ -72,30 +55,15 @@
     end
 
     it 'adds an error if there are no DNS records for the e-mail domain' do
-      resolver = instance_double(Resolv::DNS)
-
-      allow(resolver).to receive(:getresources).with('example.com', Resolv::DNS::Resource::IN::MX).and_return([])
-      allow(resolver).to receive(:getresources).with('example.com', Resolv::DNS::Resource::IN::A).and_return([])
-      allow(resolver).to receive(:getresources).with('example.com', Resolv::DNS::Resource::IN::AAAA).and_return([])
-      allow(resolver).to receive(:timeouts=).and_return(nil)
-      allow(Resolv::DNS).to receive(:open).and_yield(resolver)
+      configure_resolver('example.com')
 
       subject.validate(user)
       expect(user.errors).to have_received(:add)
     end
 
     it 'adds an error if a MX record does not lead to an IP' do
-      resolver = instance_double(Resolv::DNS)
-
-      allow(resolver).to receive(:getresources)
-        .with('example.com', Resolv::DNS::Resource::IN::MX)
-        .and_return([instance_double(Resolv::DNS::Resource::MX, exchange: 'mail.example.com')])
-      allow(resolver).to receive(:getresources).with('example.com', Resolv::DNS::Resource::IN::A).and_return([])
-      allow(resolver).to receive(:getresources).with('example.com', Resolv::DNS::Resource::IN::AAAA).and_return([])
-      allow(resolver).to receive(:getresources).with('mail.example.com', Resolv::DNS::Resource::IN::A).and_return([])
-      allow(resolver).to receive(:getresources).with('mail.example.com', Resolv::DNS::Resource::IN::AAAA).and_return([])
-      allow(resolver).to receive(:timeouts=).and_return(nil)
-      allow(Resolv::DNS).to receive(:open).and_yield(resolver)
+      configure_resolver('example.com', mx: resolv_double_mx('mail.example.com'))
+      configure_resolver('mail.example.com')
 
       subject.validate(user)
       expect(user.errors).to have_received(:add)
@@ -103,20 +71,48 @@
 
     it 'adds an error if the MX record is blacklisted' do
       EmailDomainBlock.create!(domain: 'mail.example.com')
-      resolver = instance_double(Resolv::DNS)
-
-      allow(resolver).to receive(:getresources)
-        .with('example.com', Resolv::DNS::Resource::IN::MX)
-        .and_return([instance_double(Resolv::DNS::Resource::MX, exchange: 'mail.example.com')])
-      allow(resolver).to receive(:getresources).with('example.com', Resolv::DNS::Resource::IN::A).and_return([])
-      allow(resolver).to receive(:getresources).with('example.com', Resolv::DNS::Resource::IN::AAAA).and_return([])
-      allow(resolver).to receive(:getresources).with('mail.example.com', Resolv::DNS::Resource::IN::A).and_return([instance_double(Resolv::DNS::Resource::IN::A, address: '2.3.4.5')])
-      allow(resolver).to receive(:getresources).with('mail.example.com', Resolv::DNS::Resource::IN::AAAA).and_return([instance_double(Resolv::DNS::Resource::IN::AAAA, address: 'fd00::2')])
-      allow(resolver).to receive(:timeouts=).and_return(nil)
-      allow(Resolv::DNS).to receive(:open).and_yield(resolver)
+
+      configure_resolver(
+        'example.com',
+        mx: resolv_double_mx('mail.example.com')
+      )
+      configure_resolver(
+        'mail.example.com',
+        a: instance_double(Resolv::DNS::Resource::IN::A, address: '2.3.4.5'),
+        aaaa: instance_double(Resolv::DNS::Resource::IN::AAAA, address: 'fd00::2')
+      )
 
       subject.validate(user)
       expect(user.errors).to have_received(:add)
     end
   end
+
+  def configure_resolver(domain, options = {})
+    allow(resolv_dns_double)
+      .to receive(:getresources)
+      .with(domain, Resolv::DNS::Resource::IN::MX)
+      .and_return(Array(options[:mx]))
+    allow(resolv_dns_double)
+      .to receive(:getresources)
+      .with(domain, Resolv::DNS::Resource::IN::A)
+      .and_return(Array(options[:a]))
+    allow(resolv_dns_double)
+      .to receive(:getresources)
+      .with(domain, Resolv::DNS::Resource::IN::AAAA)
+      .and_return(Array(options[:aaaa]))
+    allow(resolv_dns_double)
+      .to receive(:timeouts=)
+      .and_return(nil)
+    allow(Resolv::DNS)
+      .to receive(:open)
+      .and_yield(resolv_dns_double)
+  end
+
+  def resolv_double_mx(domain)
+    instance_double(Resolv::DNS::Resource::MX, exchange: domain)
+  end
+
+  def resolv_double_a(domain)
+    Resolv::DNS::Resource::IN::A.new(domain)
+  end
 end

From ca8fbda5d031b9671447445a83acac96b4fab2fb Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 8 Feb 2024 20:13:44 +0100
Subject: [PATCH 0100/2191] Add end-to-end test for OCR in media uploads
 (#29148)

---
 .../compose/components/upload_button.jsx      |   1 +
 spec/fixtures/files/text.png                  | Bin 0 -> 16219 bytes
 spec/system/ocr_spec.rb                       |  33 ++++++++++++++++++
 3 files changed, 34 insertions(+)
 create mode 100644 spec/fixtures/files/text.png
 create mode 100644 spec/system/ocr_spec.rb

diff --git a/app/javascript/mastodon/features/compose/components/upload_button.jsx b/app/javascript/mastodon/features/compose/components/upload_button.jsx
index 3866f239d7cbf8..50c9ad6321a19a 100644
--- a/app/javascript/mastodon/features/compose/components/upload_button.jsx
+++ b/app/javascript/mastodon/features/compose/components/upload_button.jsx
@@ -65,6 +65,7 @@ class UploadButton extends ImmutablePureComponent {
             key={resetFileKey}
             ref={this.setRef}
             type='file'
+            name='file-upload-input'
             multiple
             accept={acceptContentTypes.toArray().join(',')}
             onChange={this.handleChange}
diff --git a/spec/fixtures/files/text.png b/spec/fixtures/files/text.png
new file mode 100644
index 0000000000000000000000000000000000000000..7463b54fd558938e4c59e71f5a90027692c28d7f
GIT binary patch
literal 16219
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

literal 0
HcmV?d00001

diff --git a/spec/system/ocr_spec.rb b/spec/system/ocr_spec.rb
new file mode 100644
index 00000000000000..3ab815c047ae60
--- /dev/null
+++ b/spec/system/ocr_spec.rb
@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'OCR', :paperclip_processing, :sidekiq_inline do
+  include ProfileStories
+
+  let(:email)               { 'test@example.com' }
+  let(:password)            { 'password' }
+  let(:confirmed_at)        { Time.zone.now }
+  let(:finished_onboarding) { true }
+
+  before do
+    as_a_logged_in_user
+    visit root_path
+  end
+
+  it 'can recognize text in a media attachment' do
+    expect(page).to have_css('div.app-holder')
+
+    within('.compose-form') do
+      attach_file('file-upload-input', file_fixture('text.png'), make_visible: true)
+
+      within('.compose-form__upload') do
+        click_on('Edit')
+      end
+    end
+
+    click_on('Detect text from picture')
+
+    expect(page).to have_css('#upload-modal__description', text: 'Hello Mastodon')
+  end
+end

From c07028b2fae4dc692570df84227023ca90443288 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 9 Feb 2024 10:55:30 +0100
Subject: [PATCH 0101/2191] New Crowdin Translations (automated) (#29152)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/ia.json  |  22 +++
 app/javascript/mastodon/locales/sk.json  |   9 +-
 app/javascript/mastodon/locales/tok.json | 177 ++++++++++++++++++-----
 config/locales/activerecord.tok.yml      |   8 +
 config/locales/doorkeeper.tok.yml        |  50 +++++++
 config/locales/simple_form.tok.yml       |   4 +-
 config/locales/sk.yml                    |   2 +-
 config/locales/tok.yml                   |   4 +
 8 files changed, 230 insertions(+), 46 deletions(-)

diff --git a/app/javascript/mastodon/locales/ia.json b/app/javascript/mastodon/locales/ia.json
index 7b9ab3742b6746..10328efd0e0de2 100644
--- a/app/javascript/mastodon/locales/ia.json
+++ b/app/javascript/mastodon/locales/ia.json
@@ -2,6 +2,8 @@
   "about.blocks": "Servitores moderate",
   "about.contact": "Contacto:",
   "about.disclaimer": "Mastodon es software libere, de codice aperte, e un marca de Mastodon gGmbH.",
+  "about.domain_blocks.silenced.title": "Limitate",
+  "about.domain_blocks.suspended.title": "Suspendite",
   "about.rules": "Regulas del servitor",
   "account.account_note_header": "Nota",
   "account.add_or_remove_from_list": "Adder o remover ab listas",
@@ -12,6 +14,7 @@
   "account.blocked": "Blocate",
   "account.browse_more_on_origin_server": "Navigar plus sur le profilo original",
   "account.copy": "Copiar ligamine a profilo",
+  "account.direct": "Mentionar privatemente a @{name}",
   "account.disable_notifications": "Stoppar le notificationes quando @{name} publica",
   "account.domain_blocked": "Dominio blocate",
   "account.edit_profile": "Modificar profilo",
@@ -33,6 +36,7 @@
   "account.languages": "Cambiar le linguas subscribite",
   "account.link_verified_on": "Le proprietate de iste ligamine esseva verificate le {date}",
   "account.locked_info": "Le stato de confidentialitate de iste conto es definite a blocate. Le proprietario revisa manualmente qui pote sequer lo.",
+  "account.media": "Multimedia",
   "account.mention": "Mentionar @{name}",
   "account.moved_to": "{name} indicava que lor nove conto ora es:",
   "account.mute": "Silentiar @{name}",
@@ -57,6 +61,7 @@
   "account.unmute_notifications_short": "Non plus silentiar le notificationes",
   "account.unmute_short": "Non plus silentiar",
   "account_note.placeholder": "Clicca pro adder un nota",
+  "admin.dashboard.retention.average": "Median",
   "admin.dashboard.retention.cohort_size": "Nove usatores",
   "admin.impact_report.instance_followers": "Sequitores que nostre usatores poterea perder",
   "admin.impact_report.instance_follows": "Sequitores que lor usatores poterea perder",
@@ -69,6 +74,7 @@
   "bundle_column_error.return": "Retornar al initio",
   "bundle_modal_error.close": "Clauder",
   "bundle_modal_error.retry": "Tentar novemente",
+  "closed_registrations_modal.description": "Crear un conto in {domain} actualmente non es possibile, ma considera que tu non besonia un conto specific in {domain} pro usar Mastodon.",
   "closed_registrations_modal.find_another_server": "Trovar altere servitor",
   "column.about": "A proposito de",
   "column.blocks": "Usatores blocate",
@@ -105,6 +111,7 @@
   "compose_form.poll.option_placeholder": "Option {number}",
   "compose_form.poll.single": "Seliger un",
   "compose_form.poll.switch_to_multiple": "Cambiar inquesta pro permitter selectiones multiple",
+  "compose_form.poll.switch_to_single": "Cambiar inquesta pro permitter selection singule",
   "compose_form.poll.type": "Stylo",
   "compose_form.publish": "Publicar",
   "compose_form.publish_form": "Nove message",
@@ -117,6 +124,8 @@
   "confirmations.block.block_and_report": "Blocar e signalar",
   "confirmations.block.confirm": "Blocar",
   "confirmations.block.message": "Es tu secur que tu vole blocar {name}?",
+  "confirmations.cancel_follow_request.confirm": "Retirar requesta",
+  "confirmations.cancel_follow_request.message": "Es tu secur que tu vole retirar tu requesta a sequer a {name}?",
   "confirmations.delete.confirm": "Deler",
   "confirmations.delete.message": "Es tu secur que tu vole deler iste message?",
   "confirmations.delete_list.confirm": "Deler",
@@ -320,6 +329,8 @@
   "report.placeholder": "Commentos additional",
   "report.reasons.dislike": "Non me place",
   "report_notification.categories.other": "Alteres",
+  "report_notification.open": "Aperir reporto",
+  "search.no_recent_searches": "Nulle recercas recente",
   "search.quick_action.go_to_account": "Vader al profilo {x}",
   "search.quick_action.go_to_hashtag": "Vader al hashtag {x}",
   "search.quick_action.open_url": "Aperir URL in Mastodon",
@@ -333,14 +344,20 @@
   "search_results.hashtags": "Hashtags",
   "search_results.see_all": "Vider toto",
   "search_results.statuses": "Messages",
+  "server_banner.active_users": "usatores active",
   "server_banner.learn_more": "Apprender plus",
+  "server_banner.server_stats": "Statos del servitor:",
   "sign_in_banner.create_account": "Crear un conto",
   "sign_in_banner.sign_in": "Initiar le session",
   "status.block": "Blocar @{name}",
   "status.copy": "Copiar ligamine a message",
   "status.delete": "Deler",
+  "status.direct": "Mentionar privatemente a @{name}",
   "status.direct_indicator": "Mention private",
   "status.edit": "Modificar",
+  "status.edited": "Modificate le {date}",
+  "status.edited_x_times": "Modificate {count, plural, one {{count} tempore} other {{count} tempores}}",
+  "status.favourite": "Adder al favoritos",
   "status.filter": "Filtrar iste message",
   "status.hide": "Celar le message",
   "status.history.created": "create per {name} le {date}",
@@ -351,12 +368,17 @@
   "status.mute_conversation": "Silentiar conversation",
   "status.read_more": "Leger plus",
   "status.share": "Compartir",
+  "status.show_less": "Monstrar minus",
+  "status.show_more": "Monstrar plus",
   "status.translate": "Traducer",
   "status.translated_from_with": "Traducite ab {lang} usante {provider}",
+  "status.uncached_media_warning": "Previsualisation non disponibile",
+  "subscribed_languages.save": "Salveguardar le cambiamentos",
   "tabs_bar.home": "Initio",
   "tabs_bar.notifications": "Notificationes",
   "timeline_hint.resources.statuses": "Messages ancian",
   "trends.trending_now": "Ora in tendentias",
+  "upload_button.label": "Adde imagines, un video o un file de audio",
   "upload_modal.choose_image": "Seliger un imagine",
   "upload_modal.detect_text": "Deteger texto ab un pictura",
   "video.close": "Clauder le video",
diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json
index 7a05eb4f7e5d04..ad7837cab28e76 100644
--- a/app/javascript/mastodon/locales/sk.json
+++ b/app/javascript/mastodon/locales/sk.json
@@ -280,6 +280,7 @@
   "follow_suggestions.curated_suggestion": "Výber zo servera",
   "follow_suggestions.dismiss": "Znovu nezobrazuj",
   "follow_suggestions.personalized_suggestion": "Prispôsobené odporúčania",
+  "follow_suggestions.popular_suggestion": "Populárne návrhy",
   "follow_suggestions.view_all": "Zobraz všetky",
   "follow_suggestions.who_to_follow": "Koho nasledovať",
   "followed_tags": "Nasledované haštagy",
@@ -355,7 +356,7 @@
   "keyboard_shortcuts.muted": "otvor zoznam stíšených užívateľov",
   "keyboard_shortcuts.my_profile": "otvor svoj profil",
   "keyboard_shortcuts.notifications": "Otvor panel oznámení",
-  "keyboard_shortcuts.open_media": "na otvorenie médií",
+  "keyboard_shortcuts.open_media": "Otvorenie médií",
   "keyboard_shortcuts.pinned": "otvor zoznam pripnutých príspevkov",
   "keyboard_shortcuts.profile": "otvor autorov profil",
   "keyboard_shortcuts.reply": "odpovedať",
@@ -364,7 +365,7 @@
   "keyboard_shortcuts.spoilers": "to show/hide CW field",
   "keyboard_shortcuts.start": "otvor panel ''začíname''",
   "keyboard_shortcuts.toggle_hidden": "ukáž/skry text za CW",
-  "keyboard_shortcuts.toggle_sensitivity": "pre zobrazenie/skrytie médií",
+  "keyboard_shortcuts.toggle_sensitivity": "Ukáž/skry médiá",
   "keyboard_shortcuts.toot": "začni úplne nový príspevok",
   "keyboard_shortcuts.unfocus": "nesústreď sa na písaciu plochu, alebo hľadanie",
   "keyboard_shortcuts.up": "posuň sa vyššie v zozname",
@@ -493,7 +494,7 @@
   "onboarding.share.message": "Na Mastodone som {username}. Príď ma nasledovať na {url}",
   "onboarding.share.next_steps": "Ďalšie možné kroky:",
   "onboarding.share.title": "Zdieľaj svoj profil",
-  "onboarding.start.lead": "Your new Mastodon account is ready to go. Here's how you can make the most of it:",
+  "onboarding.start.lead": "Teraz si súčasťou Mastodonu, unikátnej, decentralizovanej sociálnej platformy, kde ty, nie algoritmus, spravuješ svoj vlastný zážitok. Poďme ťa naštartovať na tomto novom sociálnom pomedzí:",
   "onboarding.start.skip": "Want to skip right ahead?",
   "onboarding.start.title": "Zvládli ste to!",
   "onboarding.steps.follow_people.body": "You curate your own feed. Lets fill it with interesting people.",
@@ -705,7 +706,7 @@
   "units.short.million": "{count}mil.",
   "units.short.thousand": "{count}tis.",
   "upload_area.title": "Pretiahni a pusť pre nahratie",
-  "upload_button.label": "Pridaj médiálny súbor (JPEG, PNG, GIF, WebM, MP4, MOV)",
+  "upload_button.label": "Pridaj obrázky, video, alebo zvukový súbor",
   "upload_error.limit": "Limit pre nahrávanie súborov bol prekročený.",
   "upload_error.poll": "Nahrávanie súborov pri anketách nieje možné.",
   "upload_form.audio_description": "Popíš, pre ľudí so stratou sluchu",
diff --git a/app/javascript/mastodon/locales/tok.json b/app/javascript/mastodon/locales/tok.json
index 1c8435623855d1..7270d520672a55 100644
--- a/app/javascript/mastodon/locales/tok.json
+++ b/app/javascript/mastodon/locales/tok.json
@@ -2,16 +2,18 @@
   "about.blocks": "ma lawa",
   "about.contact": "toki:",
   "about.domain_blocks.no_reason_available": "mi sona ala e tan",
+  "about.domain_blocks.suspended.title": "weka",
   "about.not_available": "lon kulupu ni la sina ken alasa ala e sona ni.",
   "about.rules": "lawa kulupu",
   "account.account_note_header": "sona awen",
+  "account.badges.bot": "ilo nanpa li lawa e ni",
   "account.badges.group": "kulupu",
   "account.block": "o weka e @{name}",
   "account.block_domain": "o weka e ma {domain}",
-  "account.block_short": "o weka e jan",
-  "account.blocked": "jan ni li weka",
+  "account.block_short": "o weka e jan tawa mi",
+  "account.blocked": "jan ni li weka tawa mi",
   "account.browse_more_on_origin_server": "sina tawa ma tan pi jan ni la sina ken lukin e mute",
-  "account.cancel_follow_request": "o pini wile kute",
+  "account.cancel_follow_request": "o pini kute",
   "account.copy": "o pali same e linja pi lipu jan",
   "account.direct": "len la o mu e @{name}",
   "account.disable_notifications": "@{name} li toki la o toki ala e toki ona tawa mi",
@@ -34,15 +36,15 @@
   "account.media": "sitelen",
   "account.mention": "o toki e jan @{name}",
   "account.moved_to": "lipu jan sin pi jan {name} li ni:",
-  "account.mute": "o kute ala e @{name}",
+  "account.mute": "o len e @{name}",
   "account.mute_notifications_short": "o kute ala e mu tan jan ni",
   "account.mute_short": "o kute ala",
-  "account.muted": "sina kute ala e jan ni",
+  "account.muted": "sina len e jan ni",
   "account.no_bio": "lipu li weka",
   "account.open_original_page": "o open e lipu open",
   "account.posts": "toki suli",
   "account.posts_with_replies": "toki ale",
-  "account.report": "jan @{name} la o toki e lawa",
+  "account.report": "jan @{name} la o toki tawa lawa",
   "account.requested": "jan ni o ken e kute sina. sina pini wile kute la o luka e ni",
   "account.requested_follow": "{name} li wile kute e sina",
   "account.share": "o pana e lipu jan @{name}",
@@ -51,20 +53,21 @@
   "account.unblock_domain": "o weka ala e ma {domain}",
   "account.unblock_short": "o pini weka",
   "account.unfollow": "o pini kute",
-  "account.unmute": "o kute e @{name}",
+  "account.unmute": "o len ala e @{name}",
   "account.unmute_notifications_short": "o kute e mu tan jan ni",
-  "account.unmute_short": "o ken kute e jan ni",
+  "account.unmute_short": "o len ala",
   "admin.dashboard.retention.average": "sama",
   "admin.dashboard.retention.cohort": "tenpo mun open",
   "admin.dashboard.retention.cohort_size": "jan sin",
   "alert.rate_limited.message": "tenpo {retry_time, time, medium} la o pali awen",
   "alert.unexpected.message": "pakala li lon",
-  "alert.unexpected.title": "pakala",
+  "alert.unexpected.title": "pakala a!",
   "announcement.announcement": "toki suli",
   "audio.hide": "o len e kalama",
-  "bundle_column_error.error.title": "pakala!",
+  "bundle_column_error.error.title": "ike a!",
   "bundle_column_error.network.title": "pakala la ilo sina li toki ala tawa ilo ante",
   "bundle_column_error.retry": "o ni sin",
+  "bundle_column_error.return": "o tawa tomo",
   "bundle_column_error.routing.body": "ilo li sona ala e lipu wile. sina pana ala pana e nasin pona tawa lipu?",
   "bundle_column_error.routing.title": "pakala nanpa 404",
   "bundle_modal_error.close": "o pini",
@@ -72,64 +75,92 @@
   "bundle_modal_error.retry": "o ni sin",
   "closed_registrations_modal.find_another_server": "o alasa e ma ante",
   "column.blocks": "kulupu pi jan weka",
-  "column.lists": "lipu pi lipu mute",
-  "column.mutes": "sina wile ala kute e jan ni",
-  "community.column_settings.local_only": "toki lon ni taso",
+  "column.home": "lipu open",
+  "column.lists": "kulupu lipu",
+  "column.mutes": "jan len",
+  "column.pins": "toki sewi",
+  "column_header.hide_settings": "o len e lawa",
+  "column_header.pin": "o sewi",
+  "column_header.show_settings": "o lukin e lawa",
+  "column_header.unpin": "o sewi ala",
+  "community.column_settings.local_only": "toki tan ni taso",
   "community.column_settings.media_only": "sitelen taso",
+  "community.column_settings.remote_only": "toki tan ante taso",
   "compose.language.change": "o ante e nasin toki",
   "compose.language.search": "o alasa e nasin toki...",
+  "compose.published.body": "toki li pana.",
   "compose.published.open": "o lukin",
   "compose.saved.body": "ilo li awen e ijo pana sina.",
   "compose_form.direct_message_warning_learn_more": "o kama sona e ijo ante",
-  "compose_form.placeholder": "sina toki insa e seme",
+  "compose_form.placeholder": "sina wile toki e seme?",
+  "compose_form.poll.duration": "tenpo pana",
+  "compose_form.poll.multiple": "pana mute",
   "compose_form.poll.option_placeholder": "ken nanpa {number}",
+  "compose_form.poll.single": "pana pi wan taso",
   "compose_form.poll.switch_to_multiple": "o ante e nasin pana. pana mute o ken",
   "compose_form.poll.switch_to_single": "o ante e nasin pana. pana wan taso o lon",
+  "compose_form.poll.type": "nasin",
   "compose_form.publish": "o toki",
   "compose_form.publish_form": "o open toki sin",
   "compose_form.reply": "o toki lon ijo ni",
   "compose_form.save_changes": "o sin e ni",
   "compose_form.spoiler.marked": "o weka e toki pi ijo ike ken",
-  "confirmations.block.confirm": "o weka.",
+  "confirmation_modal.cancel": "o pini",
+  "confirmations.block.confirm": "o weka",
   "confirmations.block.message": "sina o wile ala wile weka e jan {name}?",
   "confirmations.cancel_follow_request.confirm": "o weka e wile sina",
   "confirmations.cancel_follow_request.message": "sina awen ala awen wile weka e wile kute sina lon {name}?",
-  "confirmations.delete.confirm": "o pakala",
-  "confirmations.delete.message": "sina wile ala wile pakala e toki ni",
-  "confirmations.delete_list.confirm": "o pakala",
-  "confirmations.delete_list.message": "sina wile ala wile pakala e lipu ni",
+  "confirmations.delete.confirm": "o weka",
+  "confirmations.delete.message": "sina wile ala wile weka e toki ni?",
+  "confirmations.delete_list.confirm": "o weka",
+  "confirmations.delete_list.message": "sina wile ala wile weka e lipu ni?",
   "confirmations.discard_edit_media.confirm": "o weka",
+  "confirmations.discard_edit_media.message": "toki sitelen anu lukin lili sitelen la ante pi awen ala li lon. sina wile weka e ante ni?",
   "confirmations.domain_block.confirm": "o weka.",
   "confirmations.edit.confirm": "o ante",
   "confirmations.logout.confirm": "o weka",
   "confirmations.logout.message": "sina wile ala wile weka",
-  "confirmations.mute.confirm": "sina wile ala kute e jan ni",
+  "confirmations.mute.confirm": "o len",
   "confirmations.mute.message": "sina awen ala awen wile kute ala e {name}?",
-  "confirmations.redraft.confirm": "o pakala o pali sin e toki",
+  "confirmations.redraft.confirm": "o weka o pali sin e toki",
+  "confirmations.redraft.message": "pali sin e toki ni la sina wile ala wile weka e ona? sina ni la suli pi toki ni en wawa pi toki ni li weka. kin la toki lon toki ni li jo e mama ala.",
+  "confirmations.reply.confirm": "toki lon toki ni",
+  "confirmations.reply.message": "toki tawa ona li weka e toki pali sina ꞏ sina wile ala wile ni",
   "confirmations.unfollow.confirm": "o pini kute",
   "confirmations.unfollow.message": "sina o wile ala wile pini kute e jan {name}?",
   "conversation.delete": "o weka e toki ni",
   "conversation.mark_as_read": "ni o sin ala",
   "conversation.open": "o lukin e toki",
   "conversation.with": "lon {names}",
+  "directory.local": "tan {domain} taso",
   "directory.new_arrivals": "jan pi kama sin",
+  "directory.recently_active": "jan lon tenpo poka",
+  "disabled_account_banner.account_settings": "wile pi lipu jan",
+  "disabled_account_banner.text": "sina ken ala kepeken e lipu jan sina pi nimi {disabledAccount}.",
+  "dismissable_banner.community_timeline": "ni li toki pi tenpo poka tawa ale tan jan lon ma lawa pi nimi {domain}.",
   "dismissable_banner.dismiss": "o weka",
+  "dismissable_banner.explore_links": "ni li toki pi ijo sin ꞏ jan mute li pana e ni lon tenpo suno ni ꞏ sin la jan mute li pana la ni li kama suli",
+  "embed.preview": "ni li jo e sitelen ni:",
+  "emoji_button.activity": "musi",
   "emoji_button.flags": "len ma",
   "emoji_button.food": "moku",
-  "emoji_button.label": "o pana e Emosi",
+  "emoji_button.label": "o pana e sitelen pilin",
   "emoji_button.nature": "soweli en kasi",
-  "emoji_button.not_found": "sitelen Emosi ala li lon",
+  "emoji_button.not_found": "sitelen pilin ala li lon",
   "emoji_button.objects": "ijo",
   "emoji_button.people": "jan",
-  "emoji_button.search": "o alasa",
+  "emoji_button.search": "o alasa...",
   "emoji_button.search_results": "ijo pi alasa ni",
   "emoji_button.symbols": "sitelen",
   "emoji_button.travel": "ma en tawa",
+  "empty_column.account_hides_collections": "jan ni li wile len e sona ni",
   "empty_column.account_timeline": "toki ala li lon!",
   "empty_column.account_unavailable": "ken ala lukin e lipu jan",
+  "empty_column.blocks": "jan ala li weka tawa sina.",
   "empty_column.followed_tags": "sina alasa ala e toki ꞏ sina alasa e toki la toki li lon ni",
   "empty_column.hashtag": "ala li lon toki ni",
-  "empty_column.mutes": "jan ala la sina wile ala kute.",
+  "empty_column.mutes": "jan ala li len tawa sina.",
+  "errors.unexpected_crash.report_issue": "o toki e pakala tawa lawa",
   "explore.search_results": "ijo pi alasa ni",
   "explore.suggested_follows": "jan",
   "explore.title": "o alasa",
@@ -138,52 +169,102 @@
   "filter_modal.select_filter.expired": "tenpo pini",
   "filter_modal.select_filter.search": "o alasa anu pali",
   "firehose.all": "ale",
-  "firehose.local": "ilo ni",
-  "firehose.remote": "ilo ante",
-  "follow_request.authorize": "o sina kama",
-  "follow_request.reject": "o weka",
+  "firehose.local": "kulupu ni",
+  "firehose.remote": "kulupu ante",
+  "follow_request.authorize": "o ken",
+  "follow_request.reject": "o ala",
   "follow_suggestions.view_all": "o lukin e ale",
+  "follow_suggestions.who_to_follow": "sina o kute e ni",
+  "footer.get_app": "o jo e ilo",
   "footer.privacy_policy": "lawa len",
   "footer.source_code": "o lukin e toki ilo",
   "footer.status": "lon",
+  "generic.saved": "ni li awen",
   "hashtag.column_header.tag_mode.all": "en {additional}",
   "hashtag.column_header.tag_mode.any": "anu {additional}",
+  "hashtag.column_header.tag_mode.none": "en {additional} ala",
   "hashtag.column_settings.tag_mode.all": "ale ni",
   "hashtag.column_settings.tag_mode.any": "wan ni",
   "hashtag.column_settings.tag_mode.none": "ala ni",
   "home.pending_critical_update.link": "o lukin e ijo ilo sin",
   "interaction_modal.on_another_server": "lon ma ante",
   "interaction_modal.on_this_server": "lon ma ni",
+  "interaction_modal.title.favourite": "o suli e toki {name}",
   "interaction_modal.title.follow": "o kute e {name}",
-  "keyboard_shortcuts.muted": "sina wile ala kute e jan la o lukin e ona ale",
-  "keyboard_shortcuts.open_media": "o open e sitelen",
-  "keyboard_shortcuts.toggle_sensitivity": "sitelen la o len anu lukin",
+  "interaction_modal.title.reblog": "o wawa e toki {name}",
+  "keyboard_shortcuts.blocked": "o lukin e lipu sina pi jan weka",
+  "keyboard_shortcuts.down": "o tawa anpa lon lipu",
+  "keyboard_shortcuts.enter": "o lukin e toki",
+  "keyboard_shortcuts.favourite": "o suli e toki",
+  "keyboard_shortcuts.favourites": "o lukin e lipu sina pi toki suli",
+  "keyboard_shortcuts.muted": "o lukin e lipu sina pi jan len",
+  "keyboard_shortcuts.my_profile": "o lukin e lipu sina",
+  "keyboard_shortcuts.open_media": "o lukin e sitelen",
+  "keyboard_shortcuts.pinned": "o lukin pi lipu sina pi toki sewi",
+  "keyboard_shortcuts.toggle_sensitivity": "o ante e ken lukin",
+  "keyboard_shortcuts.up": "o tawa sewi lon lipu",
   "lightbox.close": "o pini",
-  "link_preview.author": "{name} li pali e ni",
+  "lightbox.compress": "o lili e sitelen",
+  "lightbox.expand": "o suli e sitelen",
+  "lightbox.next": "sinpin",
+  "lightbox.previous": "monsi",
+  "link_preview.author": "tan {name}",
+  "lists.account.add": "o pana tawa kulupu lipu",
+  "lists.account.remove": "o weka tan kulupu lipu",
+  "lists.delete": "o weka e kulupu lipu",
+  "lists.edit": "o ante e kulupu lipu",
   "lists.edit.submit": "o ante e nimi",
+  "lists.exclusive": "o len e toki lon lipu open",
+  "lists.new.create": "o sin e kulupu lipu",
+  "lists.replies_policy.followed": "jan kute ale",
+  "lists.replies_policy.list": "jan pi kulupu ni taso",
   "lists.replies_policy.none": "jan ala",
+  "lists.subheading": "kulupu lipu sina",
+  "load_pending": "{count, plural, other {ijo sin #}}",
+  "loading_indicator.label": "ni li kama…",
+  "media_gallery.toggle_visible": "{number, plural, other {o len e sitelen}}",
   "mute_modal.duration": "tenpo",
   "mute_modal.indefinite": "tenpo ale",
-  "navigation_bar.filters": "sina wile ala kute e nimi ni",
+  "navigation_bar.blocks": "jan weka",
+  "navigation_bar.compose": "o pali e toki sin",
+  "navigation_bar.favourites": "toki suli",
+  "navigation_bar.filters": "nimi len",
+  "navigation_bar.lists": "kulupu lipu",
   "navigation_bar.mutes": "sina wile ala kute e jan ni",
-  "notification.follow": "jan {name} li kama kute e sina",
+  "navigation_bar.pins": "toki sewi",
+  "navigation_bar.preferences": "wile sina",
+  "navigation_bar.search": "o alasa",
+  "notification.admin.sign_up": "{name} li kama",
+  "notification.favourite": "{name} li suli e toki sina",
+  "notification.follow": " {name} li kute e sina",
   "notification.follow_request": "{name} li wile kute e sina",
   "notification.mention": "jan {name} li toki e sina",
+  "notification.reblog": "{name} li wawa e toki sina",
+  "notification.status": "{name} li toki",
+  "notification.update": "{name} li ante e toki",
   "notifications.column_settings.follow": "jan kute sin",
   "notifications.filter.all": "ale",
+  "onboarding.compose.template": "toki a, #Mastodon o!",
   "onboarding.start.title": "sina o kama pona a!",
-  "privacy.public.short": "jan ale",
+  "poll.total_people": "{count, plural, other {jan #}}",
+  "privacy.public.short": "tawa ale",
   "relative_time.full.just_now": "tenpo ni",
   "relative_time.just_now": "tenpo ni",
   "relative_time.today": "tenpo suno ni",
   "report.block": "o weka e jan",
   "report.block_explanation": "sina kama lukin ala e toki ona. ona li kama ala ken lukin e toki sina li kama ala ken kute e sina. ona li ken sona e kama ni.",
   "report.category.title": "ike seme li lon {type} ni",
+  "report.category.title_account": "lipu",
+  "report.category.title_status": "toki",
   "report.close": "o pini",
   "report.mute": "o kute ala e ona",
   "report.mute_explanation": "sina kama ala lukin e ijo pana ona. ona li awen ken kute e sina li awen ken lukin e sina li sona ala e weka kute sina e weka lukin sina.",
   "report.reasons.dislike": "ni li ike tawa mi",
+  "report.reasons.legal": "ni li ike tawa lawa",
+  "report.reasons.other": "ni li ike tan ante",
+  "report.reasons.spam": "ni li ike tan toki mute",
   "report.thanks.title": "sina wile ala lukin e ni anu seme?",
+  "report.unfollow": "o pini kute e {name}",
   "search.placeholder": "o alasa",
   "search.quick_action.go_to_account": "o tawa lipu jan {x}",
   "search_popout.language_code": "nimi toki kepeken nasin ISO",
@@ -196,27 +277,40 @@
   "status.edit": "o ante",
   "status.edited": "ni li ante lon {date}",
   "status.embed": "ni o lon insa pi lipu ante",
+  "status.favourite": "o suli",
+  "status.hide": "o len",
   "status.history.created": "{name} li pali e ni lon {date}",
   "status.history.edited": "{name} li ante lon {date}",
   "status.load_more": "o kama e ijo ante",
   "status.media.open": "o open",
   "status.media.show": "o lukin",
   "status.media_hidden": "sitelen li len",
-  "status.mute": "o kute ala e @{name}",
+  "status.mute": "o len e @{name}",
   "status.mute_conversation": "o kute ala e ijo pi toki ni",
+  "status.pin": "o sewi lon lipu sina",
+  "status.pinned": "toki sewi",
+  "status.reblog": "o wawa",
+  "status.share": "o pana tawa ante",
   "status.show_less": "o lili e ni",
   "status.show_less_all": "o lili e ale",
   "status.show_more": "o suli e ni",
   "status.show_more_all": "o suli e ale",
-  "status.show_original": "ijo mama pi ijo ni li seme",
+  "status.show_original": "o lukin e mama",
+  "status.translate": "o ante pi nasin toki",
+  "status.translated_from_with": "toki li ante tan {lang} kepeken {provider}",
   "status.uncached_media_warning": "lukin lili li weka",
   "status.unmute_conversation": "o ken kute e ijo pi toki ni",
+  "status.unpin": "o sewi ala lon lipu sina",
+  "subscribed_languages.save": "o awen e ante",
+  "tabs_bar.home": "lipu open",
   "timeline_hint.resources.statuses": "ijo pi tenpo suli",
   "units.short.million": "{count}AAA",
+  "upload_button.label": "o pana e sitelen anu kalama",
   "upload_error.limit": "ilo li ken ala e suli pi ijo ni.",
   "upload_form.audio_description": "o toki e ijo kute tawa jan pi kute ala, tawa jan pi kute lili",
   "upload_form.description": "o toki e ijo lukin tawa jan pi lukin ala, tawa jan pi lukin lili",
   "upload_form.edit": "o ante",
+  "upload_form.thumbnail": "o ante e sitelen lili",
   "upload_form.video_description": "o toki e ijo kute tawa jan pi kute ala, tawa jan pi kute lili, e ijo lukin tawa jan pi lukin ala, tawa jan pi lukin lili",
   "upload_modal.choose_image": "o wile e sitelen",
   "upload_modal.description_placeholder": "mi pu jaki tan soweli",
@@ -225,7 +319,12 @@
   "upload_modal.preparing_ocr": "ilo li open e alasa nimi lon sitelen…",
   "upload_progress.label": "ilo li kama jo e ijo sina...",
   "upload_progress.processing": "ilo li pali…",
-  "username.taken": "jan ante li jo e nimi ni. sina o pali e nimi sin.",
+  "username.taken": "jan ante li kepeken e nimi ni. sina o kepeken e nimi sin",
+  "video.close": "o weka e ni",
+  "video.download": "o jo e ni",
+  "video.exit_fullscreen": "o weka tan sitelen suli",
+  "video.expand": "o suli e ni",
+  "video.hide": "o len e sitelen",
   "video.mute": "o kalama ala",
   "video.pause": "o lape e ni",
   "video.unmute": "o kalama"
diff --git a/config/locales/activerecord.tok.yml b/config/locales/activerecord.tok.yml
index 5623538ba96cec..9862a7f9532dba 100644
--- a/config/locales/activerecord.tok.yml
+++ b/config/locales/activerecord.tok.yml
@@ -4,3 +4,11 @@ tok:
     attributes:
       poll:
         expires_at: pini tenpo
+      user/account:
+        username: nimi jan
+    errors:
+      models:
+        account:
+          attributes:
+            username:
+              reserved: jan ante li jo e nimi ni
diff --git a/config/locales/doorkeeper.tok.yml b/config/locales/doorkeeper.tok.yml
index d15ecd21b277d6..6aef4fb34bb58d 100644
--- a/config/locales/doorkeeper.tok.yml
+++ b/config/locales/doorkeeper.tok.yml
@@ -1 +1,51 @@
+---
 tok:
+  doorkeeper:
+    applications:
+      buttons:
+        cancel: o pini
+        destroy: o weka
+        edit: o ante
+        submit: o awen
+      confirmations:
+        destroy: ni li pona ala pona?
+      edit:
+        title: o ante e ilo nanpa
+      form:
+        error: 'pakala a! o lukin e ni: lipu sina li jo ala jo e pakala.'
+      index:
+        delete: o weka
+        empty: sina li jo e ilo nanpa ala.
+        name: nimi
+        new: o pali e ilo nanpa sin
+        title: ilo nanpa sina
+      new:
+        title: o pali e ilo nanpa sin
+      show:
+        title: ilo nanpa pi nimi %{name}
+    authorizations:
+      error:
+        title: pakala li lon.
+    authorized_applications:
+      confirmations:
+        revoke: ni li pona ala pona?
+      index:
+        scopes: ken
+    errors:
+      messages:
+        invalid_request:
+          missing_param: o pana e sona "%{value}".
+    flash:
+      applications:
+        create:
+          notice: sina pali e ilo nanpa.
+        destroy:
+          notice: sina weka e ilo nanpa.
+        update:
+          notice: sina ante e ilo nanpa.
+      authorized_applications:
+        destroy:
+          notice: sina weka e ilo nanpa tawa sina.
+    grouped_scopes:
+      access:
+        read: lukin taso
diff --git a/config/locales/simple_form.tok.yml b/config/locales/simple_form.tok.yml
index 1eb7d5be87c29f..37b0ee765a6be5 100644
--- a/config/locales/simple_form.tok.yml
+++ b/config/locales/simple_form.tok.yml
@@ -5,8 +5,8 @@ tok:
       account:
         display_name: nimi sina ale anu nimi sina musi.
       defaults:
-        setting_display_media_hide_all: tenpo ale la, o weka e sitelen
-        setting_display_media_show_all: tenpo ale la, o awen e sitelen
+        setting_display_media_hide_all: sitelen ale li len
+        setting_display_media_show_all: sitelen ale li len ala
     labels:
       defaults:
         expires_in: ona o moli lon
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index f13a15d795a981..88617967ff9918 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -88,7 +88,7 @@ sk:
         remote: Federované
         title: Umiestnenie
       login_status: Stav prihlásenia
-      media_attachments: Prílohy
+      media_attachments: Mediálne prílohy
       memorialize: Zmeň na "Navždy budeme spomínať"
       memorialized: Spomienka na
       memorialized_msg: Úspešne zmenené %{username} na spomienkové konto
diff --git a/config/locales/tok.yml b/config/locales/tok.yml
index d15ecd21b277d6..9f962d2b5344b0 100644
--- a/config/locales/tok.yml
+++ b/config/locales/tok.yml
@@ -1 +1,5 @@
+---
 tok:
+  admin:
+    accounts:
+      are_you_sure: ni li pona ala pona?

From 8125dae5a84e3115be6f487b337ac942c70a81f0 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 12 Feb 2024 10:54:06 +0100
Subject: [PATCH 0102/2191] Rename `ES_CA_CERT` to `ES_CA_FILE` for consistency
 (#29147)

---
 config/initializers/chewy.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/initializers/chewy.rb b/config/initializers/chewy.rb
index 0fb311dbb37bc8..0d9fc75e9948b2 100644
--- a/config/initializers/chewy.rb
+++ b/config/initializers/chewy.rb
@@ -7,7 +7,7 @@
 password        = ENV.fetch('ES_PASS', nil).presence
 fallback_prefix = ENV.fetch('REDIS_NAMESPACE', nil).presence
 prefix          = ENV.fetch('ES_PREFIX') { fallback_prefix }
-ca_file         = ENV.fetch('ES_CA_CERT', nil).presence
+ca_file         = ENV.fetch('ES_CA_FILE', nil).presence
 
 transport_options = { ssl: { ca_file: ca_file } } if ca_file.present?
 

From 6482948547beb35ecd5ad583a49e2c47c35cb0dd Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 12 Feb 2024 09:59:05 +0000
Subject: [PATCH 0103/2191] New Crowdin Translations (automated) (#29156)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/be.json  |  4 ++--
 app/javascript/mastodon/locales/bg.json  | 12 ++++++------
 app/javascript/mastodon/locales/ca.json  |  2 +-
 app/javascript/mastodon/locales/de.json  | 12 ++++++------
 app/javascript/mastodon/locales/ia.json  |  8 ++++++++
 app/javascript/mastodon/locales/sv.json  |  1 +
 app/javascript/mastodon/locales/tok.json |  6 ++++--
 config/locales/ca.yml                    |  2 +-
 config/locales/devise.ia.yml             |  2 ++
 config/locales/devise.ro.yml             |  9 +++++++++
 config/locales/doorkeeper.ia.yml         |  1 +
 config/locales/ia.yml                    |  3 +++
 config/locales/simple_form.bg.yml        |  2 +-
 config/locales/simple_form.ia.yml        |  1 +
 config/locales/simple_form.zh-TW.yml     |  4 ++--
 config/locales/sk.yml                    |  4 +++-
 16 files changed, 51 insertions(+), 22 deletions(-)

diff --git a/app/javascript/mastodon/locales/be.json b/app/javascript/mastodon/locales/be.json
index daff6563e87bf0..7e21703b4a8d21 100644
--- a/app/javascript/mastodon/locales/be.json
+++ b/app/javascript/mastodon/locales/be.json
@@ -152,8 +152,8 @@
   "compose_form.poll.switch_to_multiple": "Змяніце апытанне, каб дазволіць некалькі варыянтаў адказу",
   "compose_form.poll.switch_to_single": "Змяніце апытанне, каб дазволіць адзіны варыянт адказу",
   "compose_form.poll.type": "Стыль",
-  "compose_form.publish": "Допіс",
-  "compose_form.publish_form": "Апублікаваць",
+  "compose_form.publish": "Даслаць",
+  "compose_form.publish_form": "Новы допіс",
   "compose_form.reply": "Адказаць",
   "compose_form.save_changes": "Абнавіць",
   "compose_form.spoiler.marked": "Выдаліць папярэджанне аб змесціве",
diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json
index 99c0f8b1022f01..95572a79328209 100644
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@@ -3,7 +3,7 @@
   "about.contact": "За контакти:",
   "about.disclaimer": "Mastodon е безплатен софтуер с отворен изходен код и търговска марка на Mastodon gGmbH.",
   "about.domain_blocks.no_reason_available": "Няма налична причина",
-  "about.domain_blocks.preamble": "Mastodon обикновено позволява да разглеждате съдържание и да взаимодействате с други потребители от всякакви сървъри във Федивърс. Има изключения, направени конкретно за този сървър.",
+  "about.domain_blocks.preamble": "Mastodon обикновено позволява да разглеждате съдържание и да взаимодействате с други потребители от всякакви сървъри във Федивселената. Има изключения, направени конкретно за този сървър.",
   "about.domain_blocks.silenced.explanation": "Обикновено няма да виждате профили и съдържание, освен ако изрично не го потърсите или се включете в него, следвайки го.",
   "about.domain_blocks.silenced.title": "Ограничено",
   "about.domain_blocks.suspended.explanation": "Никакви данни от този сървър няма да се обработват, съхраняват или обменят, правещи невъзможно всяко взаимодействие или комуникация с потребители от тези сървъри.",
@@ -110,7 +110,7 @@
   "column.about": "Относно",
   "column.blocks": "Блокирани потребители",
   "column.bookmarks": "Отметки",
-  "column.community": "Локална часова ос",
+  "column.community": "Локален инфопоток",
   "column.direct": "Частни споменавания",
   "column.directory": "Разглеждане на профили",
   "column.domain_blocks": "Блокирани домейни",
@@ -228,7 +228,7 @@
   "empty_column.account_unavailable": "Профилът не е наличен",
   "empty_column.blocks": "Още не сте блокирали никакви потребители.",
   "empty_column.bookmarked_statuses": "Още не сте отметнали публикации. Отметвайки някоя, то тя ще се покаже тук.",
-  "empty_column.community": "Местната часова ос е празна. Напишете нещо обществено, за да завъртите нещата!",
+  "empty_column.community": "Локалният инфопоток е празен. Публикувайте нещо, за да започнете!",
   "empty_column.direct": "Още нямате никакви частни споменавания. Тук ще се показват, изпращайки или получавайки едно.",
   "empty_column.domain_blocks": "Още няма блокирани домейни.",
   "empty_column.explore_statuses": "Няма нищо налагащо се в момента. Проверете пак по-късно!",
@@ -348,10 +348,10 @@
   "keyboard_shortcuts.favourites": "Отваряне на списъка с любими",
   "keyboard_shortcuts.federated": "Отваряне на федерирания инфопоток",
   "keyboard_shortcuts.heading": "Клавишни съчетания",
-  "keyboard_shortcuts.home": "Отваряне на началната часова ос",
+  "keyboard_shortcuts.home": "Отваряне на личния инфопоток",
   "keyboard_shortcuts.hotkey": "Бърз клавиш",
   "keyboard_shortcuts.legend": "Показване на тази легенда",
-  "keyboard_shortcuts.local": "Отваряне на местна часова ос",
+  "keyboard_shortcuts.local": "Отваряне на локалния инфопоток",
   "keyboard_shortcuts.mention": "Споменаване на автора",
   "keyboard_shortcuts.muted": "Отваряне на списъка със заглушени потребители",
   "keyboard_shortcuts.my_profile": "Отваряне на профила ви",
@@ -402,7 +402,7 @@
   "navigation_bar.advanced_interface": "Отваряне в разширен уебинтерфейс",
   "navigation_bar.blocks": "Блокирани потребители",
   "navigation_bar.bookmarks": "Отметки",
-  "navigation_bar.community_timeline": "Локална часова ос",
+  "navigation_bar.community_timeline": "Локален инфопоток",
   "navigation_bar.compose": "Съставяне на нова публикация",
   "navigation_bar.direct": "Частни споменавания",
   "navigation_bar.discover": "Откриване",
diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index 0ae471e02370be..42de594cdc2ea9 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -532,7 +532,7 @@
   "privacy.public.short": "Públic",
   "privacy.unlisted.additional": "Es comporta igual que públic, excepte que la publicació no apareixerà als canals en directe o etiquetes, l'explora o a la cerca de Mastodon, fins i tot si ho heu activat a nivell de compte.",
   "privacy.unlisted.long": "Menys fanfàrries algorísmiques",
-  "privacy.unlisted.short": "Públic tranquil",
+  "privacy.unlisted.short": "Públic silenciós",
   "privacy_policy.last_updated": "Darrera actualització {date}",
   "privacy_policy.title": "Política de Privacitat",
   "recommended": "Recomanat",
diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json
index cb90252c7f73e3..f29d016b07438f 100644
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@@ -146,12 +146,12 @@
   "compose_form.lock_disclaimer.lock": "geschützt",
   "compose_form.placeholder": "Was gibt’s Neues?",
   "compose_form.poll.duration": "Umfragedauer",
-  "compose_form.poll.multiple": "Mehrfachauswahl",
-  "compose_form.poll.option_placeholder": "{number}. Auswahlmöglichkeit",
+  "compose_form.poll.multiple": "Mul­ti­ple-Choice",
+  "compose_form.poll.option_placeholder": "Option {number}",
   "compose_form.poll.single": "Einfachauswahl",
   "compose_form.poll.switch_to_multiple": "Mehrfachauswahl erlauben",
   "compose_form.poll.switch_to_single": "Nur Einfachauswahl erlauben",
-  "compose_form.poll.type": "Art",
+  "compose_form.poll.type": "Stil",
   "compose_form.publish": "Veröffentlichen",
   "compose_form.publish_form": "Neuer Beitrag",
   "compose_form.reply": "Antworten",
@@ -277,9 +277,9 @@
   "follow_request.authorize": "Genehmigen",
   "follow_request.reject": "Ablehnen",
   "follow_requests.unlocked_explanation": "Auch wenn dein Konto öffentlich bzw. nicht geschützt ist, haben die Moderator*innen von {domain} gedacht, dass du diesen Follower lieber manuell bestätigen solltest.",
-  "follow_suggestions.curated_suggestion": "Vom Server empfohlen",
+  "follow_suggestions.curated_suggestion": "Auswahl des Herausgebers",
   "follow_suggestions.dismiss": "Nicht mehr anzeigen",
-  "follow_suggestions.personalized_suggestion": "Personalisierte Empfehlung",
+  "follow_suggestions.personalized_suggestion": "Persönliche Empfehlung",
   "follow_suggestions.popular_suggestion": "Beliebte Empfehlung",
   "follow_suggestions.view_all": "Alle anzeigen",
   "follow_suggestions.who_to_follow": "Empfohlene Profile",
@@ -528,7 +528,7 @@
   "privacy.direct.short": "Bestimmte Profile",
   "privacy.private.long": "Nur deine Follower",
   "privacy.private.short": "Follower",
-  "privacy.public.long": "Alle auf und außerhalb von Mastodon",
+  "privacy.public.long": "Alle in und außerhalb von Mastodon",
   "privacy.public.short": "Öffentlich",
   "privacy.unlisted.additional": "Das Verhalten ist wie bei „Öffentlich“, jedoch erscheint dieser Beitrag nicht in „Live-Feeds“, „Erkunden“, Hashtags oder über die Mastodon-Suchfunktion – selbst wenn du das in den Einstellungen aktiviert hast.",
   "privacy.unlisted.long": "Weniger im Algorithmus berücksichtigt",
diff --git a/app/javascript/mastodon/locales/ia.json b/app/javascript/mastodon/locales/ia.json
index 10328efd0e0de2..07966628514746 100644
--- a/app/javascript/mastodon/locales/ia.json
+++ b/app/javascript/mastodon/locales/ia.json
@@ -2,8 +2,10 @@
   "about.blocks": "Servitores moderate",
   "about.contact": "Contacto:",
   "about.disclaimer": "Mastodon es software libere, de codice aperte, e un marca de Mastodon gGmbH.",
+  "about.domain_blocks.no_reason_available": "Ration non disponibile",
   "about.domain_blocks.silenced.title": "Limitate",
   "about.domain_blocks.suspended.title": "Suspendite",
+  "about.not_available": "Iste information non faceva disponibile in iste servitor.",
   "about.rules": "Regulas del servitor",
   "account.account_note_header": "Nota",
   "account.add_or_remove_from_list": "Adder o remover ab listas",
@@ -153,6 +155,7 @@
   "disabled_account_banner.account_settings": "Parametros de conto",
   "disabled_account_banner.text": "Tu conto {disabledAccount} es actualmente disactivate.",
   "dismissable_banner.dismiss": "Dimitter",
+  "embed.preview": "Hic es como il parera:",
   "emoji_button.activity": "Activitate",
   "emoji_button.clear": "Rader",
   "emoji_button.custom": "Personalisate",
@@ -171,6 +174,11 @@
   "empty_column.account_timeline": "Nulle messages hic!",
   "empty_column.account_unavailable": "Profilo non disponibile",
   "empty_column.blocks": "Tu non ha blocate alcun usator ancora.",
+  "empty_column.domain_blocks": "Il non ha dominios blocate ancora.",
+  "empty_column.explore_statuses": "Nihil es in tendentias ora mesme. Retorna postea!",
+  "empty_column.favourited_statuses": "Tu non ha necun messages favorite ancora. Quando tu marca un como favorito, ille essera monstrate hic.",
+  "empty_column.followed_tags": "Tu ancora non ha sequite necun hashtags. Quando tu lo face, illes essera monstrate hic.",
+  "empty_column.hashtag": "Ancora non il ha nihil in iste hashtag.",
   "errors.unexpected_crash.report_issue": "Signalar un defecto",
   "explore.search_results": "Resultatos de recerca",
   "explore.suggested_follows": "Personas",
diff --git a/app/javascript/mastodon/locales/sv.json b/app/javascript/mastodon/locales/sv.json
index f9356fd279cc21..4a15c60ed82826 100644
--- a/app/javascript/mastodon/locales/sv.json
+++ b/app/javascript/mastodon/locales/sv.json
@@ -148,6 +148,7 @@
   "compose_form.poll.duration": "Varaktighet för omröstning",
   "compose_form.poll.multiple": "Flera val",
   "compose_form.poll.option_placeholder": "Alternativ {number}",
+  "compose_form.poll.single": "Välj en",
   "compose_form.poll.switch_to_multiple": "Ändra enkät för att tillåta flera val",
   "compose_form.poll.switch_to_single": "Ändra enkät för att tillåta ett enda val",
   "compose_form.poll.type": "Stil",
diff --git a/app/javascript/mastodon/locales/tok.json b/app/javascript/mastodon/locales/tok.json
index 7270d520672a55..ba45f844532b75 100644
--- a/app/javascript/mastodon/locales/tok.json
+++ b/app/javascript/mastodon/locales/tok.json
@@ -11,12 +11,12 @@
   "account.block": "o weka e @{name}",
   "account.block_domain": "o weka e ma {domain}",
   "account.block_short": "o weka e jan tawa mi",
-  "account.blocked": "jan ni li weka tawa mi",
+  "account.blocked": "jan li weka tawa mi",
   "account.browse_more_on_origin_server": "sina tawa ma tan pi jan ni la sina ken lukin e mute",
   "account.cancel_follow_request": "o pini kute",
   "account.copy": "o pali same e linja pi lipu jan",
   "account.direct": "len la o mu e @{name}",
-  "account.disable_notifications": "@{name} li toki la o toki ala e toki ona tawa mi",
+  "account.disable_notifications": "@{name} li toki la o mu ala e mi",
   "account.domain_blocked": "ma ni li weka tawa sina",
   "account.edit_profile": "o ante e lipu mi",
   "account.enable_notifications": "@{name} li toki la o toki e toki ona tawa mi",
@@ -92,6 +92,7 @@
   "compose.published.open": "o lukin",
   "compose.saved.body": "ilo li awen e ijo pana sina.",
   "compose_form.direct_message_warning_learn_more": "o kama sona e ijo ante",
+  "compose_form.encryption_warning": "toki li len ala lon ilo Masoton ꞏ o pana ala e sona suli len lon ilo Masoton",
   "compose_form.placeholder": "sina wile toki e seme?",
   "compose_form.poll.duration": "tenpo pana",
   "compose_form.poll.multiple": "pana mute",
@@ -117,6 +118,7 @@
   "confirmations.discard_edit_media.confirm": "o weka",
   "confirmations.discard_edit_media.message": "toki sitelen anu lukin lili sitelen la ante pi awen ala li lon. sina wile weka e ante ni?",
   "confirmations.domain_block.confirm": "o weka.",
+  "confirmations.domain_block.message": "sina wile ala a wile a len e ma {domain} ꞏ ken suli la len jan taso li pona ꞏ len pi ma ni la sina ken ala lukin e ijo pi ma ni lon lipu toki ale anu lukin toki ꞏ len ni la jan kute sina pi ma ni li weka",
   "confirmations.edit.confirm": "o ante",
   "confirmations.logout.confirm": "o weka",
   "confirmations.logout.message": "sina wile ala wile weka",
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 58f6e26374ba9b..f79d63a4593d82 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -1548,7 +1548,7 @@ ca:
       unrecognized_emoji: no és un emoji reconegut
   redirects:
     prompt: Si confieu en aquest enllaç, feu-hi clic per a continuar.
-    title: Esteu sortint de %{instance}.
+    title: Deixeu %{instance}.
   relationships:
     activity: Activitat del compte
     confirm_follow_selected_followers: Segur que vols seguir els seguidors seleccionats?
diff --git a/config/locales/devise.ia.yml b/config/locales/devise.ia.yml
index c07e75fefff0e5..4b4d1f441b3a85 100644
--- a/config/locales/devise.ia.yml
+++ b/config/locales/devise.ia.yml
@@ -39,6 +39,8 @@ ia:
       webauthn_enabled:
         title: Claves de securitate activate
     registrations:
+      destroyed: A revider! Tu conto esseva cancellate con successo. Nos spera vider te novemente tosto.
+      signed_up_but_pending: Un message con un ligamine de confirmation esseva inviate a tu conto de email. Post que tu clicca le ligamine, nos revidera tu application. Tu essera notificate si illo es approbate.
       updated: Tu conto ha essite actualisate con successo.
     unlocks:
       unlocked: Tu conto ha essite disblocate con successo. Initia session a continuar.
diff --git a/config/locales/devise.ro.yml b/config/locales/devise.ro.yml
index 1a6a3ecd778de6..868bb4b3a19401 100644
--- a/config/locales/devise.ro.yml
+++ b/config/locales/devise.ro.yml
@@ -47,14 +47,19 @@ ro:
         subject: Instrucțiuni pentru resetarea parolei
         title: Resetare parolă
       two_factor_disabled:
+        explanation: Conectarea este acum posibilă folosind doar adresa de e-mail și parola.
         subject: Autentificare cu doi factori dezactivată
+        subtitle: Autentificarea cu doi factori pentru contul dvs. a fost dezactivată.
         title: 2FA dezactivat
       two_factor_enabled:
+        explanation: Pentru autentificare va fi necesar un token generat de aplicația TOTP asociată.
         subject: Autentificare în doi pași activată
+        subtitle: Autentificarea cu doi factori a fost activată pentru contul dvs.
         title: 2FA activat
       two_factor_recovery_codes_changed:
         explanation: Codurile anterioare de recuperare au fost invalidate și unele noi generate.
         subject: Recuperare în doi factori
+        subtitle: Codurile de recuperare anterioare au fost invalidate și s-au generat altele noi.
         title: Coduri de recuperare 2FA modificate
       unlock_instructions:
         subject: Instrucțiuni de deblocare
@@ -68,9 +73,13 @@ ro:
           subject: 'Mastodon: Cheie de securitate ștearsă'
           title: Una dintre cheile tale de securitate a fost ștearsă
       webauthn_disabled:
+        explanation: Autentificarea cu chei de securitate a fost dezactivată pentru contul dvs.
+        extra: Conectarea este acum posibilă folosind doar token-ul generat de aplicația TOTP asociată.
         subject: 'Mastodon: Autentificarea cu chei de securitate dezactivată'
         title: Chei de securitate dezactivate
       webauthn_enabled:
+        explanation: Autentificarea cu cheie de securitate a fost activată pentru contul dvs.
+        extra: Cheia ta de securitate poate fi acum folosită pentru conectare.
         subject: 'Mastodon: Autentificarea cheii de securitate activată'
         title: Chei de securitate activate
     omniauth_callbacks:
diff --git a/config/locales/doorkeeper.ia.yml b/config/locales/doorkeeper.ia.yml
index e7e6f03cdbfbe3..443342b404760c 100644
--- a/config/locales/doorkeeper.ia.yml
+++ b/config/locales/doorkeeper.ia.yml
@@ -34,6 +34,7 @@ ia:
       confirmations:
         revoke: Es tu secur?
       index:
+        last_used_at: Ultime uso in %{date}
         never_used: Nunquam usate
         scopes: Permissiones
         title: Tu applicationes autorisate
diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index bf7da9a314070a..a85af012f3be7a 100644
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -236,6 +236,8 @@ ia:
   migrations:
     errors:
       not_found: non poterea esser trovate
+  preferences:
+    public_timelines: Chronologias public
   statuses_cleanup:
     min_age:
       '1209600': 2 septimanas
@@ -254,6 +256,7 @@ ia:
     disable: Disactivar 2FA
   user_mailer:
     welcome:
+      final_step: 'Comencia a publicar! Mesmo sin sequitores, tu messages public poterea esser reguardate per alteres, per exemplo in le chronologia local o in hashtags. Tu poterea voler introducer te con le hashtag #introductiones.'
       subject: Benvenite in Mastodon
   webauthn_credentials:
     delete: Deler
diff --git a/config/locales/simple_form.bg.yml b/config/locales/simple_form.bg.yml
index 68e45ef47bd4bf..a4637a68109e89 100644
--- a/config/locales/simple_form.bg.yml
+++ b/config/locales/simple_form.bg.yml
@@ -261,7 +261,7 @@ bg:
         status_page_url: URL адрес на страница със състоянието
         theme: Стандартна тема
         thumbnail: Образче на сървъра
-        timeline_preview: Позволяване на неупълномощен достъп до публични часови оси
+        timeline_preview: Позволяване на неудостоверен достъп до публични инфопотоци
         trendable_by_default: Без преглед на налагащото се
         trends: Включване на налагащи се
         trends_as_landing_page: Употреба на налагащото се като целева страница
diff --git a/config/locales/simple_form.ia.yml b/config/locales/simple_form.ia.yml
index 552abb255098e1..af198d932a38f3 100644
--- a/config/locales/simple_form.ia.yml
+++ b/config/locales/simple_form.ia.yml
@@ -26,6 +26,7 @@ ia:
         username: Nomine de usator
         username_or_email: Nomine de usator o e-mail
       form_admin_settings:
+        bootstrap_timeline_accounts: Recommenda sempre iste contos a nove usatores
         custom_css: CSS personalisate
         profile_directory: Activar directorio de profilos
         site_contact_email: Adresse de e-mail de contacto
diff --git a/config/locales/simple_form.zh-TW.yml b/config/locales/simple_form.zh-TW.yml
index a31ad5eb1190d8..696fd5fed98f9e 100644
--- a/config/locales/simple_form.zh-TW.yml
+++ b/config/locales/simple_form.zh-TW.yml
@@ -200,12 +200,12 @@ zh-TW:
         password: 密碼
         phrase: 關鍵字或片語
         setting_advanced_layout: 啟用進階網頁介面
-        setting_aggregate_reblogs: 時間軸中的群組轉嘟
+        setting_aggregate_reblogs: 於時間軸中不重複顯示轉嘟
         setting_always_send_emails: 總是發送電子郵件通知
         setting_auto_play_gif: 自動播放 GIF 動畫
         setting_boost_modal: 轉嘟前先詢問我
         setting_default_language: 嘟文語言
-        setting_default_privacy: 嘟文可見範圍
+        setting_default_privacy: 嘟文隱私設定
         setting_default_sensitive: 總是將媒體標記為敏感內容
         setting_delete_modal: 刪除嘟文前先詢問我
         setting_disable_swiping: 停用滑動手勢
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 88617967ff9918..520b64f886ec3b 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -251,14 +251,16 @@ sk:
         enable_user_html: "%{name} povolil/a prihlásenie pre používateľa %{target}"
         memorialize_account_html: "%{name} zmenil/a účet %{target} na pamätnú stránku"
         reject_appeal_html: "%{name} zamietol/la námietku moderovacieho rozhodnutia od %{target}"
+        remove_avatar_user_html: "%{name} vymazal/a %{target}/ov/in avatar"
         reopen_report_html: "%{name} znovu otvoril/a nahlásenie %{target}"
         resend_user_html: "%{name} znovu odoslal/a potvrdzovací email pre %{target}"
         reset_password_user_html: "%{name} resetoval/a heslo používateľa %{target}"
         resolve_report_html: "%{name} vyriešil/a nahlásenie %{target}"
-        sensitive_account_html: "%{name} označil médium od %{target} za chúlostivé"
+        sensitive_account_html: "%{name} označil/a médium od %{target} za chúlostivé"
         silence_account_html: "%{name} obmedzil/a účet %{target}"
         suspend_account_html: "%{name} zablokoval/a účet používateľa %{target}"
         unassigned_report_html: "%{name} odobral/a report od %{target}"
+        unsensitive_account_html: "%{name} odznačil/a médium od %{target} ako chúlostivé"
         unsuspend_account_html: "%{name} spojazdnil/a účet %{target}"
         update_announcement_html: "%{name} aktualizoval/a oboznámenie %{target}"
         update_custom_emoji_html: "%{name} aktualizoval/a emotikonu %{target}"

From 58918844a90b9a3f5bd39d3ed525f7bcbe02ef32 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 12 Feb 2024 11:20:54 +0100
Subject: [PATCH 0104/2191] Update peter-evans/create-pull-request action to v6
 (#29167)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .github/workflows/crowdin-download.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/crowdin-download.yml b/.github/workflows/crowdin-download.yml
index d3988d2f1a3ae1..a676ff12fcdc7e 100644
--- a/.github/workflows/crowdin-download.yml
+++ b/.github/workflows/crowdin-download.yml
@@ -52,7 +52,7 @@ jobs:
 
       # Create or update the pull request
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v5.0.2
+        uses: peter-evans/create-pull-request@v6.0.0
         with:
           commit-message: 'New Crowdin translations'
           title: 'New Crowdin Translations (automated)'

From cf0d6bef8b62acd8f4594f56e9096817149a6135 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 12 Feb 2024 11:21:17 +0100
Subject: [PATCH 0105/2191] Update eslint (non-major) (#29166)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 122 +++++++++++++++++++++++++++---------------------------
 1 file changed, 61 insertions(+), 61 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index fb3472904855ea..351fd31ab4b249 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1697,14 +1697,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@es-joy/jsdoccomment@npm:~0.41.0":
-  version: 0.41.0
-  resolution: "@es-joy/jsdoccomment@npm:0.41.0"
+"@es-joy/jsdoccomment@npm:~0.42.0":
+  version: 0.42.0
+  resolution: "@es-joy/jsdoccomment@npm:0.42.0"
   dependencies:
     comment-parser: "npm:1.4.1"
     esquery: "npm:^1.5.0"
     jsdoc-type-pratt-parser: "npm:~4.0.0"
-  checksum: 1fa27531eba32e4699664da53a0865aeeda1f7e83ac156fe53b7a6b09d2f3816baa94a34845ff019c10289b09572bda5519ec917e3e241088975477fa880f72d
+  checksum: a8122762d2df3c6501a9c459e2822315a23c0078c4aeb0b40fb3c84b99e21a78e85e67f962d6b5dde5eb751792a1c67c6a170b619573db7151098a19950abe35
   languageName: node
   linkType: hard
 
@@ -3663,14 +3663,14 @@ __metadata:
   linkType: hard
 
 "@typescript-eslint/eslint-plugin@npm:^6.0.0":
-  version: 6.20.0
-  resolution: "@typescript-eslint/eslint-plugin@npm:6.20.0"
+  version: 6.21.0
+  resolution: "@typescript-eslint/eslint-plugin@npm:6.21.0"
   dependencies:
     "@eslint-community/regexpp": "npm:^4.5.1"
-    "@typescript-eslint/scope-manager": "npm:6.20.0"
-    "@typescript-eslint/type-utils": "npm:6.20.0"
-    "@typescript-eslint/utils": "npm:6.20.0"
-    "@typescript-eslint/visitor-keys": "npm:6.20.0"
+    "@typescript-eslint/scope-manager": "npm:6.21.0"
+    "@typescript-eslint/type-utils": "npm:6.21.0"
+    "@typescript-eslint/utils": "npm:6.21.0"
+    "@typescript-eslint/visitor-keys": "npm:6.21.0"
     debug: "npm:^4.3.4"
     graphemer: "npm:^1.4.0"
     ignore: "npm:^5.2.4"
@@ -3683,44 +3683,44 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 5020faac39be476de056342f58f2bf68bb788f230e2fa4a2e27ceab8a5187dc450beba7333b0aa741a43aeaff45a117558132953f9390b5eca4c2cc004fde716
+  checksum: f911a79ee64d642f814a3b6cdb0d324b5f45d9ef955c5033e78903f626b7239b4aa773e464a38c3e667519066169d983538f2bf8e5d00228af587c9d438fb344
   languageName: node
   linkType: hard
 
 "@typescript-eslint/parser@npm:^6.17.0":
-  version: 6.20.0
-  resolution: "@typescript-eslint/parser@npm:6.20.0"
+  version: 6.21.0
+  resolution: "@typescript-eslint/parser@npm:6.21.0"
   dependencies:
-    "@typescript-eslint/scope-manager": "npm:6.20.0"
-    "@typescript-eslint/types": "npm:6.20.0"
-    "@typescript-eslint/typescript-estree": "npm:6.20.0"
-    "@typescript-eslint/visitor-keys": "npm:6.20.0"
+    "@typescript-eslint/scope-manager": "npm:6.21.0"
+    "@typescript-eslint/types": "npm:6.21.0"
+    "@typescript-eslint/typescript-estree": "npm:6.21.0"
+    "@typescript-eslint/visitor-keys": "npm:6.21.0"
     debug: "npm:^4.3.4"
   peerDependencies:
     eslint: ^7.0.0 || ^8.0.0
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: d84ad5e2282b1096c80dedb903c83ecc31eaf7be1aafcb14c18d9ec2d4a319f2fd1e5a9038b944d9f42c36c1c57add5e4292d4026ca7d3d5441d41286700d402
+  checksum: a8f99820679decd0d115c0af61903fb1de3b1b5bec412dc72b67670bf636de77ab07f2a68ee65d6da7976039bbf636907f9d5ca546db3f0b98a31ffbc225bc7d
   languageName: node
   linkType: hard
 
-"@typescript-eslint/scope-manager@npm:6.20.0":
-  version: 6.20.0
-  resolution: "@typescript-eslint/scope-manager@npm:6.20.0"
+"@typescript-eslint/scope-manager@npm:6.21.0":
+  version: 6.21.0
+  resolution: "@typescript-eslint/scope-manager@npm:6.21.0"
   dependencies:
-    "@typescript-eslint/types": "npm:6.20.0"
-    "@typescript-eslint/visitor-keys": "npm:6.20.0"
-  checksum: f6768ed2dcd2d1771d55ed567ff392a6569ffd683a26500067509dd41769f8838c43686460fe7337144f324fd063df33f5d5646d44e5df4998ceffb3ad1fb790
+    "@typescript-eslint/types": "npm:6.21.0"
+    "@typescript-eslint/visitor-keys": "npm:6.21.0"
+  checksum: eaf868938d811cbbea33e97e44ba7050d2b6892202cea6a9622c486b85ab1cf801979edf78036179a8ba4ac26f1dfdf7fcc83a68c1ff66be0b3a8e9a9989b526
   languageName: node
   linkType: hard
 
-"@typescript-eslint/type-utils@npm:6.20.0":
-  version: 6.20.0
-  resolution: "@typescript-eslint/type-utils@npm:6.20.0"
+"@typescript-eslint/type-utils@npm:6.21.0":
+  version: 6.21.0
+  resolution: "@typescript-eslint/type-utils@npm:6.21.0"
   dependencies:
-    "@typescript-eslint/typescript-estree": "npm:6.20.0"
-    "@typescript-eslint/utils": "npm:6.20.0"
+    "@typescript-eslint/typescript-estree": "npm:6.21.0"
+    "@typescript-eslint/utils": "npm:6.21.0"
     debug: "npm:^4.3.4"
     ts-api-utils: "npm:^1.0.1"
   peerDependencies:
@@ -3728,23 +3728,23 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 8f622fbb14268f1d00b2948f995b570f0ef82be02c12be41d90385290a56ea0dbd34d855d6a5aff100b57f3bdd300ff0c300f16c78f12d6064f7ae6e34fd71bf
+  checksum: 7409c97d1c4a4386b488962739c4f1b5b04dc60cf51f8cd88e6b12541f84d84c6b8b67e491a147a2c95f9ec486539bf4519fb9d418411aef6537b9c156468117
   languageName: node
   linkType: hard
 
-"@typescript-eslint/types@npm:6.20.0":
-  version: 6.20.0
-  resolution: "@typescript-eslint/types@npm:6.20.0"
-  checksum: 37589003b0e06f83c1945e3748e91af85918cfd997766894642a08e6f355f611cfe11df4e7632dda96e3a9b3441406283fe834ab0906cf81ea97fd43ca2aebe3
+"@typescript-eslint/types@npm:6.21.0":
+  version: 6.21.0
+  resolution: "@typescript-eslint/types@npm:6.21.0"
+  checksum: 020631d3223bbcff8a0da3efbdf058220a8f48a3de221563996ad1dcc30d6c08dadc3f7608cc08830d21c0d565efd2db19b557b9528921c78aabb605eef2d74d
   languageName: node
   linkType: hard
 
-"@typescript-eslint/typescript-estree@npm:6.20.0":
-  version: 6.20.0
-  resolution: "@typescript-eslint/typescript-estree@npm:6.20.0"
+"@typescript-eslint/typescript-estree@npm:6.21.0":
+  version: 6.21.0
+  resolution: "@typescript-eslint/typescript-estree@npm:6.21.0"
   dependencies:
-    "@typescript-eslint/types": "npm:6.20.0"
-    "@typescript-eslint/visitor-keys": "npm:6.20.0"
+    "@typescript-eslint/types": "npm:6.21.0"
+    "@typescript-eslint/visitor-keys": "npm:6.21.0"
     debug: "npm:^4.3.4"
     globby: "npm:^11.1.0"
     is-glob: "npm:^4.0.3"
@@ -3754,34 +3754,34 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 551f13445a303882d9fc0fbe14ef8507eb8414253fd87a5f13d2e324b5280b626421a238b8ec038e628bc80128dc06c057757f668738e82e64d5b39a9083c27d
+  checksum: af1438c60f080045ebb330155a8c9bb90db345d5069cdd5d01b67de502abb7449d6c75500519df829f913a6b3f490ade3e8215279b6bdc63d0fb0ae61034df5f
   languageName: node
   linkType: hard
 
-"@typescript-eslint/utils@npm:6.20.0, @typescript-eslint/utils@npm:^6.18.1":
-  version: 6.20.0
-  resolution: "@typescript-eslint/utils@npm:6.20.0"
+"@typescript-eslint/utils@npm:6.21.0, @typescript-eslint/utils@npm:^6.18.1":
+  version: 6.21.0
+  resolution: "@typescript-eslint/utils@npm:6.21.0"
   dependencies:
     "@eslint-community/eslint-utils": "npm:^4.4.0"
     "@types/json-schema": "npm:^7.0.12"
     "@types/semver": "npm:^7.5.0"
-    "@typescript-eslint/scope-manager": "npm:6.20.0"
-    "@typescript-eslint/types": "npm:6.20.0"
-    "@typescript-eslint/typescript-estree": "npm:6.20.0"
+    "@typescript-eslint/scope-manager": "npm:6.21.0"
+    "@typescript-eslint/types": "npm:6.21.0"
+    "@typescript-eslint/typescript-estree": "npm:6.21.0"
     semver: "npm:^7.5.4"
   peerDependencies:
     eslint: ^7.0.0 || ^8.0.0
-  checksum: 0a8ede3d80a365b52ae96d88e4a9f6e6abf3569c6b60ff9f42ff900cd843ae7c5493cd95f8f2029d90bb0acbf31030980206af98e581d760d6d41e0f80e9fb86
+  checksum: ab2df3833b2582d4e5467a484d08942b4f2f7208f8e09d67de510008eb8001a9b7460f2f9ba11c12086fd3cdcac0c626761c7995c2c6b5657d5fa6b82030a32d
   languageName: node
   linkType: hard
 
-"@typescript-eslint/visitor-keys@npm:6.20.0":
-  version: 6.20.0
-  resolution: "@typescript-eslint/visitor-keys@npm:6.20.0"
+"@typescript-eslint/visitor-keys@npm:6.21.0":
+  version: 6.21.0
+  resolution: "@typescript-eslint/visitor-keys@npm:6.21.0"
   dependencies:
-    "@typescript-eslint/types": "npm:6.20.0"
+    "@typescript-eslint/types": "npm:6.21.0"
     eslint-visitor-keys: "npm:^3.4.1"
-  checksum: 852d938f2e5d57200cf62733b42e73a369f797b097d17e8fd3fffd0f7315c3b9e1863eed60bb8d57d6535a3b7f1980f645f96ec6d513950f182bfa8107b33fab
+  checksum: 7395f69739cfa1cb83c1fb2fad30afa2a814756367302fb4facd5893eff66abc807e8d8f63eba94ed3b0fe0c1c996ac9a1680bcbf0f83717acedc3f2bb724fbf
   languageName: node
   linkType: hard
 
@@ -7347,21 +7347,21 @@ __metadata:
   linkType: hard
 
 "eslint-plugin-jsdoc@npm:^48.0.0":
-  version: 48.0.4
-  resolution: "eslint-plugin-jsdoc@npm:48.0.4"
+  version: 48.0.6
+  resolution: "eslint-plugin-jsdoc@npm:48.0.6"
   dependencies:
-    "@es-joy/jsdoccomment": "npm:~0.41.0"
+    "@es-joy/jsdoccomment": "npm:~0.42.0"
     are-docs-informative: "npm:^0.0.2"
     comment-parser: "npm:1.4.1"
     debug: "npm:^4.3.4"
     escape-string-regexp: "npm:^4.0.0"
     esquery: "npm:^1.5.0"
     is-builtin-module: "npm:^3.2.1"
-    semver: "npm:^7.5.4"
+    semver: "npm:^7.6.0"
     spdx-expression-parse: "npm:^4.0.0"
   peerDependencies:
     eslint: ^7.0.0 || ^8.0.0 || ^9.0.0
-  checksum: c73063d26ca70d37ea00eea9750d1f889e5bfda64ca46dbfc6bf4842b892551c320368220cb46acc9d3d96a89fd5391486650284b82dc722f700e3b5df5c78db
+  checksum: 7762793fb2a738d248144346e85b8c7ec2f975be1a24d45984a5d24da03723b76c66ead1b8064d60b18be09a9a9835320036a39fef917a1b6c83b916729d70dd
   languageName: node
   linkType: hard
 
@@ -14721,14 +14721,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.5.3, semver@npm:^7.5.4":
-  version: 7.5.4
-  resolution: "semver@npm:7.5.4"
+"semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.5.3, semver@npm:^7.5.4, semver@npm:^7.6.0":
+  version: 7.6.0
+  resolution: "semver@npm:7.6.0"
   dependencies:
     lru-cache: "npm:^6.0.0"
   bin:
     semver: bin/semver.js
-  checksum: 5160b06975a38b11c1ab55950cb5b8a23db78df88275d3d8a42ccf1f29e55112ac995b3a26a522c36e3b5f76b0445f1eef70d696b8c7862a2b4303d7b0e7609e
+  checksum: fbfe717094ace0aa8d6332d7ef5ce727259815bd8d8815700853f4faf23aacbd7192522f0dc5af6df52ef4fa85a355ebd2f5d39f554bd028200d6cf481ab9b53
   languageName: node
   linkType: hard
 

From 819ede190e1edeab1c42f41d53895e2bf784406d Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 12 Feb 2024 11:39:31 +0100
Subject: [PATCH 0106/2191] Update dependency dotenv to v16.4.2 (#29157)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 351fd31ab4b249..d76af5d9ef86d0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6844,9 +6844,9 @@ __metadata:
   linkType: hard
 
 "dotenv@npm:^16.0.3":
-  version: 16.4.1
-  resolution: "dotenv@npm:16.4.1"
-  checksum: ef3d95f48f38146df0881a4b58447ae437d2da3f6d645074b84de4e64ef64ba75fc357c5ed66b3c2b813b5369fdeb6a4777d6ade2d50e54eed6aa06dddc98bc4
+  version: 16.4.2
+  resolution: "dotenv@npm:16.4.2"
+  checksum: 04373a742f565896de1ab3eadcd15c1543b6d1fc37bb7ab2faa2286a0b3fd432aa02c6fd330ede758432f36865f0fb128afa2e5991e0a789b9011e720ba4a876
   languageName: node
   linkType: hard
 

From b244e5cb81bc49c54194cd340408b0b27c0802db Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 13 Feb 2024 08:56:46 +0100
Subject: [PATCH 0107/2191] Update dependency sidekiq-unique-jobs to v7.1.33
 (#29175)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 152436b47a421c..00ca4663a848ca 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -707,7 +707,7 @@ GEM
       rufus-scheduler (~> 3.2)
       sidekiq (>= 6, < 8)
       tilt (>= 1.4.0)
-    sidekiq-unique-jobs (7.1.31)
+    sidekiq-unique-jobs (7.1.33)
       brpoplpush-redis_script (> 0.1.1, <= 2.0.0)
       concurrent-ruby (~> 1.0, >= 1.0.5)
       redis (< 5.0)

From e25d9dfb25f9e412a5dabe1e27675130a285b0d3 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 13 Feb 2024 09:02:55 +0100
Subject: [PATCH 0108/2191] Update dependency dotenv to v16.4.3 (#29174)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index d76af5d9ef86d0..6088034d9bd88a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6844,9 +6844,9 @@ __metadata:
   linkType: hard
 
 "dotenv@npm:^16.0.3":
-  version: 16.4.2
-  resolution: "dotenv@npm:16.4.2"
-  checksum: 04373a742f565896de1ab3eadcd15c1543b6d1fc37bb7ab2faa2286a0b3fd432aa02c6fd330ede758432f36865f0fb128afa2e5991e0a789b9011e720ba4a876
+  version: 16.4.3
+  resolution: "dotenv@npm:16.4.3"
+  checksum: c6a572b2dab5d71accb7064c90b38dfd4068c2487be859a0f053460fcaa685a7718e78db51d643b32e0736b318988c31f8c45cb4ab99cd620278f537177cb0ab
   languageName: node
   linkType: hard
 

From 5de1ce23c3debb019f926b297e19a7c37e229871 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 13 Feb 2024 10:08:55 +0100
Subject: [PATCH 0109/2191] New Crowdin Translations (automated) (#29182)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/bg.json  |  2 +-
 app/javascript/mastodon/locales/es.json  |  2 ++
 app/javascript/mastodon/locales/ro.json  | 30 ++++++++++++++++++++++++
 app/javascript/mastodon/locales/tok.json | 13 ++++++++++
 4 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json
index 95572a79328209..5a6fa175e8abe5 100644
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@@ -524,7 +524,7 @@
   "poll_button.add_poll": "Анкетиране",
   "poll_button.remove_poll": "Премахване на анкета",
   "privacy.change": "Промяна на поверителността на публикация",
-  "privacy.direct.long": "Всеки споменат в публикацията",
+  "privacy.direct.long": "Споменатите в публикацията",
   "privacy.direct.short": "Определени хора",
   "privacy.private.long": "Само последователите ви",
   "privacy.private.short": "Последователи",
diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json
index d5e8f4239eeb4c..3e4f36ba5a416b 100644
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@@ -530,6 +530,8 @@
   "privacy.private.short": "Seguidores",
   "privacy.public.long": "Cualquiera dentro y fuera de Mastodon",
   "privacy.public.short": "Público",
+  "privacy.unlisted.additional": "Esto se comporta exactamente igual que el público, excepto que la publicación no aparecerá en la cronología en directo o en las etiquetas, la exploración o búsqueda de Mastodon, incluso si está optado por activar la cuenta de usuario.",
+  "privacy.unlisted.long": "Menos fanfares algorítmicos",
   "privacy.unlisted.short": "Público tranquilo",
   "privacy_policy.last_updated": "Actualizado por última vez {date}",
   "privacy_policy.title": "Política de Privacidad",
diff --git a/app/javascript/mastodon/locales/ro.json b/app/javascript/mastodon/locales/ro.json
index d236ba49698158..547493af18d598 100644
--- a/app/javascript/mastodon/locales/ro.json
+++ b/app/javascript/mastodon/locales/ro.json
@@ -21,6 +21,8 @@
   "account.blocked": "Blocat",
   "account.browse_more_on_origin_server": "Vezi mai multe pe profilul original",
   "account.cancel_follow_request": "Retrage cererea de urmărire",
+  "account.copy": "Copiază link-ul profilului",
+  "account.direct": "Menționează pe @{name} în privat",
   "account.disable_notifications": "Nu îmi mai trimite notificări când postează @{name}",
   "account.domain_blocked": "Domeniu blocat",
   "account.edit_profile": "Modifică profilul",
@@ -30,6 +32,7 @@
   "account.featured_tags.last_status_never": "Fără postări",
   "account.featured_tags.title": "Haștagurile recomandate de {name}",
   "account.follow": "Abonează-te",
+  "account.follow_back": "Urmăreşte înapoi",
   "account.followers": "Urmăritori",
   "account.followers.empty": "Acest utilizator nu are încă urmăritori.",
   "account.followers_counter": "{count, plural, one {Un abonat} few {{counter} abonați} other {{counter} de abonați}}",
@@ -38,6 +41,7 @@
   "account.follows.empty": "Momentan acest utilizator nu are niciun abonament.",
   "account.go_to_profile": "Mergi la profil",
   "account.hide_reblogs": "Ascunde distribuirile de la @{name}",
+  "account.in_memoriam": "În Memoriam.",
   "account.joined_short": "Înscris",
   "account.languages": "Schimbă limbile abonate",
   "account.link_verified_on": "Proprietatea acestui link a fost verificată pe {date}",
@@ -46,7 +50,10 @@
   "account.mention": "Menționează pe @{name}",
   "account.moved_to": "{name} a indicat că noul său cont este acum:",
   "account.mute": "Pune pe @{name} pe silențios",
+  "account.mute_notifications_short": "Amuțește notificările",
+  "account.mute_short": "Ignoră",
   "account.muted": "Pus pe silențios",
+  "account.no_bio": "Nicio descriere furnizată.",
   "account.open_original_page": "Deschide pagina originală",
   "account.posts": "Postări",
   "account.posts_with_replies": "Postări și răspunsuri",
@@ -69,6 +76,7 @@
   "admin.dashboard.retention.average": "În medie",
   "admin.dashboard.retention.cohort": "Înregistrări lunar",
   "admin.dashboard.retention.cohort_size": "Utilizatori noi",
+  "admin.impact_report.title": "Rezumatul impactului",
   "alert.rate_limited.message": "Vă rugăm să reîncercați după {retry_time, time, medium}.",
   "alert.rate_limited.title": "Debit limitat",
   "alert.unexpected.message": "A apărut o eroare neașteptată.",
@@ -98,9 +106,11 @@
   "column.blocks": "Utilizatori blocați",
   "column.bookmarks": "Marcaje",
   "column.community": "Cronologie locală",
+  "column.direct": "Mențiuni private",
   "column.directory": "Explorează profiluri",
   "column.domain_blocks": "Domenii blocate",
   "column.favourites": "Favorite",
+  "column.firehose": "Fluxuri live",
   "column.follow_requests": "Cereri de abonare",
   "column.home": "Acasă",
   "column.lists": "Liste",
@@ -131,11 +141,19 @@
   "compose_form.lock_disclaimer.lock": "privat",
   "compose_form.placeholder": "La ce te gândești?",
   "compose_form.poll.duration": "Durata sondajului",
+  "compose_form.poll.multiple": "Alegeri multiple",
+  "compose_form.poll.option_placeholder": "Opțiune {number}",
+  "compose_form.poll.single": "Alegeți unul",
   "compose_form.poll.switch_to_multiple": "Modifică sondajul pentru a permite mai multe opțiuni",
   "compose_form.poll.switch_to_single": "Modifică sondajul pentru a permite o singură opțiune",
+  "compose_form.poll.type": "Stil",
+  "compose_form.publish": "Postare",
   "compose_form.publish_form": "Publică",
+  "compose_form.reply": "Răspundeți",
+  "compose_form.save_changes": "Actualizare",
   "compose_form.spoiler.marked": "Elimină avertismentul privind conținutul",
   "compose_form.spoiler.unmarked": "Adaugă un avertisment privind conținutul",
+  "compose_form.spoiler_placeholder": "Atenționare de conținut (opțional)",
   "confirmation_modal.cancel": "Anulează",
   "confirmations.block.block_and_report": "Blochează și raportează",
   "confirmations.block.confirm": "Blochează",
@@ -151,6 +169,7 @@
   "confirmations.domain_block.confirm": "Blochează întregul domeniu",
   "confirmations.domain_block.message": "Ești absolut sigur că vrei să blochezi tot domeniul {domain}? În cele mai multe cazuri, raportarea sau blocarea anumitor lucruri este suficientă și de preferat. Nu vei mai vedea niciun conținut din acest domeniu în vreun flux public sau în vreo notificare. Abonații tăi din acest domeniu vor fi eliminați.",
   "confirmations.edit.confirm": "Modifică",
+  "confirmations.edit.message": "Editarea acum va suprascrie mesajul pe care îl compuneți în prezent. Sunteți sigur că vreți să continuați?",
   "confirmations.logout.confirm": "Deconectare",
   "confirmations.logout.message": "Ești sigur că vrei să te deconectezi?",
   "confirmations.mute.confirm": "Ignoră",
@@ -165,6 +184,7 @@
   "conversation.mark_as_read": "Marchează ca citit",
   "conversation.open": "Vizualizează conversația",
   "conversation.with": "Cu {names}",
+  "copy_icon_button.copied": "Copiat în clipboard",
   "copypaste.copied": "Copiat",
   "copypaste.copy_to_clipboard": "Copiază în clipboard",
   "directory.federated": "Din fediversul cunoscut",
@@ -240,10 +260,17 @@
   "filter_modal.select_filter.title": "Filtrează această postare",
   "filter_modal.title.status": "Filtrează o postare",
   "firehose.all": "Toate",
+  "firehose.local": "Acest Server",
   "firehose.remote": "Alte servere",
   "follow_request.authorize": "Acceptă",
   "follow_request.reject": "Respinge",
   "follow_requests.unlocked_explanation": "Chiar dacă contul tău nu este blocat, personalul {domain} a considerat că ai putea prefera să consulți manual cererile de abonare de la aceste conturi.",
+  "follow_suggestions.curated_suggestion": "Alegerile Editorilor",
+  "follow_suggestions.dismiss": "Nu mai afișa din nou",
+  "follow_suggestions.personalized_suggestion": "Sugestie personalizată",
+  "follow_suggestions.popular_suggestion": "Sugestie populară",
+  "follow_suggestions.view_all": "Vizualizați tot",
+  "follow_suggestions.who_to_follow": "Pe cine să urmăriți",
   "followed_tags": "Hastaguri urmărite",
   "footer.about": "Despre",
   "footer.directory": "Catalogul de profiluri",
@@ -272,12 +299,15 @@
   "home.hide_announcements": "Ascunde anunțurile",
   "home.pending_critical_update.body": "Te rugăm să-ți actualizezi serverul de Mastodon cat mai curând posibil!",
   "home.pending_critical_update.link": "Vezi noutăți",
+  "home.pending_critical_update.title": "Actualizare critică de securitate disponibilă!",
   "home.show_announcements": "Afișează anunțurile",
+  "interaction_modal.description.favourite": "Cu un cont pe Mastodon, poți adăuga această postare la favorite pentru a-l informa pe autorul ei că o apreciezi și pentru a o salva pentru mai târziu.",
   "interaction_modal.description.follow": "Cu un cont Mastodon, poți urmări pe {name} pentru a vedea postările sale în cronologia ta principală.",
   "interaction_modal.description.reblog": "Cu un cont pe Mastodon, poți distribui această postare pentru a le-o arăta și celor abonați ție.",
   "interaction_modal.description.reply": "Cu un cont pe Mastodon, poți răspunde acestei postări.",
   "interaction_modal.login.action": "Du-mă acasă",
   "interaction_modal.login.prompt": "Adresa serverului tău acasă, de ex. mastodon.social",
+  "interaction_modal.no_account_yet": "Nu ești încă pe Mastodon?",
   "interaction_modal.on_another_server": "Pe un alt server",
   "interaction_modal.on_this_server": "Pe acest server",
   "interaction_modal.title.follow": "Urmărește pe {name}",
diff --git a/app/javascript/mastodon/locales/tok.json b/app/javascript/mastodon/locales/tok.json
index ba45f844532b75..85f62f404ae718 100644
--- a/app/javascript/mastodon/locales/tok.json
+++ b/app/javascript/mastodon/locales/tok.json
@@ -6,6 +6,7 @@
   "about.not_available": "lon kulupu ni la sina ken alasa ala e sona ni.",
   "about.rules": "lawa kulupu",
   "account.account_note_header": "sona awen",
+  "account.add_or_remove_from_list": "o ante e lipu jan",
   "account.badges.bot": "ilo nanpa li lawa e ni",
   "account.badges.group": "kulupu",
   "account.block": "o weka e @{name}",
@@ -83,6 +84,7 @@
   "column_header.pin": "o sewi",
   "column_header.show_settings": "o lukin e lawa",
   "column_header.unpin": "o sewi ala",
+  "column_subheading.settings": "ken ilo",
   "community.column_settings.local_only": "toki tan ni taso",
   "community.column_settings.media_only": "sitelen taso",
   "community.column_settings.remote_only": "toki tan ante taso",
@@ -177,6 +179,8 @@
   "follow_request.reject": "o ala",
   "follow_suggestions.view_all": "o lukin e ale",
   "follow_suggestions.who_to_follow": "sina o kute e ni",
+  "footer.about": "sona",
+  "footer.directory": "lipu jan",
   "footer.get_app": "o jo e ilo",
   "footer.privacy_policy": "lawa len",
   "footer.source_code": "o lukin e toki ilo",
@@ -195,6 +199,7 @@
   "interaction_modal.title.follow": "o kute e {name}",
   "interaction_modal.title.reblog": "o wawa e toki {name}",
   "keyboard_shortcuts.blocked": "o lukin e lipu sina pi jan weka",
+  "keyboard_shortcuts.boost": "o pana sin e toki",
   "keyboard_shortcuts.down": "o tawa anpa lon lipu",
   "keyboard_shortcuts.enter": "o lukin e toki",
   "keyboard_shortcuts.favourite": "o suli e toki",
@@ -204,6 +209,7 @@
   "keyboard_shortcuts.open_media": "o lukin e sitelen",
   "keyboard_shortcuts.pinned": "o lukin pi lipu sina pi toki sewi",
   "keyboard_shortcuts.toggle_sensitivity": "o ante e ken lukin",
+  "keyboard_shortcuts.toot": "o toki",
   "keyboard_shortcuts.up": "o tawa sewi lon lipu",
   "lightbox.close": "o pini",
   "lightbox.compress": "o lili e sitelen",
@@ -227,6 +233,7 @@
   "media_gallery.toggle_visible": "{number, plural, other {o len e sitelen}}",
   "mute_modal.duration": "tenpo",
   "mute_modal.indefinite": "tenpo ale",
+  "navigation_bar.about": "sona",
   "navigation_bar.blocks": "jan weka",
   "navigation_bar.compose": "o pali e toki sin",
   "navigation_bar.favourites": "toki suli",
@@ -261,12 +268,14 @@
   "report.close": "o pini",
   "report.mute": "o kute ala e ona",
   "report.mute_explanation": "sina kama ala lukin e ijo pana ona. ona li awen ken kute e sina li awen ken lukin e sina li sona ala e weka kute sina e weka lukin sina.",
+  "report.next": "awen",
   "report.reasons.dislike": "ni li ike tawa mi",
   "report.reasons.legal": "ni li ike tawa lawa",
   "report.reasons.other": "ni li ike tan ante",
   "report.reasons.spam": "ni li ike tan toki mute",
   "report.thanks.title": "sina wile ala lukin e ni anu seme?",
   "report.unfollow": "o pini kute e {name}",
+  "report_notification.categories.legal": "ike tawa nasin lawa",
   "search.placeholder": "o alasa",
   "search.quick_action.go_to_account": "o tawa lipu jan {x}",
   "search_popout.language_code": "nimi toki kepeken nasin ISO",
@@ -275,6 +284,7 @@
   "search_results.statuses": "toki",
   "search_results.title": "o alasa e {q}",
   "status.block": "o weka e @{name}",
+  "status.cancel_reblog_private": "o pini e pana",
   "status.delete": "o weka",
   "status.edit": "o ante",
   "status.edited": "ni li ante lon {date}",
@@ -305,7 +315,10 @@
   "status.unpin": "o sewi ala lon lipu sina",
   "subscribed_languages.save": "o awen e ante",
   "tabs_bar.home": "lipu open",
+  "timeline_hint.resources.followers": "jan kute",
+  "timeline_hint.resources.follows": "jan lukin",
   "timeline_hint.resources.statuses": "ijo pi tenpo suli",
+  "trends.trending_now": "jan mute li toki",
   "units.short.million": "{count}AAA",
   "upload_button.label": "o pana e sitelen anu kalama",
   "upload_error.limit": "ilo li ken ala e suli pi ijo ni.",

From 476a043fc5339526536cbb1ba64d0ba2230e870c Mon Sep 17 00:00:00 2001
From: Nicolas Hoffmann <dante3333@gmail.com>
Date: Tue, 13 Feb 2024 13:58:21 +0100
Subject: [PATCH 0110/2191] Fix modal container bounds (#29185)

---
 app/javascript/styles/mastodon/components.scss | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 427144ed8e053a..af9fc88e7bbe1d 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -5343,6 +5343,8 @@ a.status-card {
   inset-inline-start: 0;
   width: 100%;
   height: 100%;
+  max-width: 100vw;
+  max-height: 100vh;
   box-sizing: border-box;
   display: flex;
   flex-direction: column;

From e8b66a0525f0468fe6588803ec2a15ff186d08ab Mon Sep 17 00:00:00 2001
From: Emelia Smith <ThisIsMissEm@users.noreply.github.com>
Date: Tue, 13 Feb 2024 18:14:49 +0100
Subject: [PATCH 0111/2191] Ignore legacy moderator and admin columns on User
 model (#29188)

---
 app/models/concerns/user/ldap_authenticable.rb | 10 +++++++++-
 app/models/concerns/user/pam_authenticable.rb  |  1 -
 app/models/user.rb                             |  2 ++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/models/concerns/user/ldap_authenticable.rb b/app/models/concerns/user/ldap_authenticable.rb
index d84ff084b2f10f..180df9d3101ebb 100644
--- a/app/models/concerns/user/ldap_authenticable.rb
+++ b/app/models/concerns/user/ldap_authenticable.rb
@@ -25,7 +25,15 @@ def ldap_get_user(attributes = {})
       resource = joins(:account).find_by(accounts: { username: safe_username })
 
       if resource.blank?
-        resource = new(email: attributes[Devise.ldap_mail.to_sym].first, agreement: true, account_attributes: { username: safe_username }, admin: false, external: true, confirmed_at: Time.now.utc)
+        resource = new(
+          email: attributes[Devise.ldap_mail.to_sym].first,
+          agreement: true,
+          account_attributes: {
+            username: safe_username,
+          },
+          external: true,
+          confirmed_at: Time.now.utc
+        )
         resource.save!
       end
 
diff --git a/app/models/concerns/user/pam_authenticable.rb b/app/models/concerns/user/pam_authenticable.rb
index a682058ccacd99..30dc7d8aef20f6 100644
--- a/app/models/concerns/user/pam_authenticable.rb
+++ b/app/models/concerns/user/pam_authenticable.rb
@@ -32,7 +32,6 @@ def pam_setup(_attributes)
 
       self.email        = "#{account.username}@#{find_pam_suffix}" if email.nil? && find_pam_suffix
       self.confirmed_at = Time.now.utc
-      self.admin        = false
       self.account      = account
       self.external     = true
 
diff --git a/app/models/user.rb b/app/models/user.rb
index 70c24336f35cfa..95fdc431ac43ea 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -51,6 +51,8 @@ class User < ApplicationRecord
     last_sign_in_ip
     skip_sign_in_token
     filtered_languages
+    admin
+    moderator
   )
 
   include LanguagesHelper

From 46142cdbddd6d3eb5e88386c74b5600abe520c38 Mon Sep 17 00:00:00 2001
From: Emelia Smith <ThisIsMissEm@users.noreply.github.com>
Date: Tue, 13 Feb 2024 19:11:47 +0100
Subject: [PATCH 0112/2191] Disable administrative doorkeeper routes (#29187)

---
 config/initializers/doorkeeper.rb             |  9 +-
 .../requests/disabled_oauth_endpoints_spec.rb | 83 +++++++++++++++++++
 2 files changed, 90 insertions(+), 2 deletions(-)
 create mode 100644 spec/requests/disabled_oauth_endpoints_spec.rb

diff --git a/config/initializers/doorkeeper.rb b/config/initializers/doorkeeper.rb
index fe3871d2e72fbb..f9d47a205ccd9c 100644
--- a/config/initializers/doorkeeper.rb
+++ b/config/initializers/doorkeeper.rb
@@ -21,9 +21,14 @@
     user unless user&.otp_required_for_login?
   end
 
-  # If you want to restrict access to the web interface for adding oauth authorized applications, you need to declare the block below.
+  # Doorkeeper provides some administrative interfaces for managing OAuth
+  # Applications, allowing creation, edit, and deletion of applications from the
+  # server. At present, these administrative routes are not integrated into
+  # Mastodon, and as such, we've disabled them by always return a 403 forbidden
+  # response for them. This does not affect the ability for users to manage
+  # their own OAuth Applications.
   admin_authenticator do
-    current_user&.admin? || redirect_to(new_user_session_url)
+    head 403
   end
 
   # Authorization Code expiration time (default 10 minutes).
diff --git a/spec/requests/disabled_oauth_endpoints_spec.rb b/spec/requests/disabled_oauth_endpoints_spec.rb
new file mode 100644
index 00000000000000..7c2c09f3804bf3
--- /dev/null
+++ b/spec/requests/disabled_oauth_endpoints_spec.rb
@@ -0,0 +1,83 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'Disabled OAuth routes' do
+  # These routes are disabled via the doorkeeper configuration for
+  # `admin_authenticator`, as these routes should only be accessible by server
+  # administrators. For now, these routes are not properly designed and
+  # integrated into Mastodon, so we're disabling them completely
+  describe 'GET /oauth/applications' do
+    it 'returns 403 forbidden' do
+      get oauth_applications_path
+
+      expect(response).to have_http_status(403)
+    end
+  end
+
+  describe 'POST /oauth/applications' do
+    it 'returns 403 forbidden' do
+      post oauth_applications_path
+
+      expect(response).to have_http_status(403)
+    end
+  end
+
+  describe 'GET /oauth/applications/new' do
+    it 'returns 403 forbidden' do
+      get new_oauth_application_path
+
+      expect(response).to have_http_status(403)
+    end
+  end
+
+  describe 'GET /oauth/applications/:id' do
+    let(:application) { Fabricate(:application, scopes: 'read') }
+
+    it 'returns 403 forbidden' do
+      get oauth_application_path(application)
+
+      expect(response).to have_http_status(403)
+    end
+  end
+
+  describe 'PATCH /oauth/applications/:id' do
+    let(:application) { Fabricate(:application, scopes: 'read') }
+
+    it 'returns 403 forbidden' do
+      patch oauth_application_path(application)
+
+      expect(response).to have_http_status(403)
+    end
+  end
+
+  describe 'PUT /oauth/applications/:id' do
+    let(:application) { Fabricate(:application, scopes: 'read') }
+
+    it 'returns 403 forbidden' do
+      put oauth_application_path(application)
+
+      expect(response).to have_http_status(403)
+    end
+  end
+
+  describe 'DELETE /oauth/applications/:id' do
+    let(:application) { Fabricate(:application, scopes: 'read') }
+
+    it 'returns 403 forbidden' do
+      delete oauth_application_path(application)
+
+      expect(response).to have_http_status(403)
+    end
+  end
+
+  describe 'GET /oauth/applications/:id/edit' do
+    let(:application) { Fabricate(:application, scopes: 'read') }
+
+    it 'returns 403 forbidden' do
+      get edit_oauth_application_path(application)
+
+      expect(response).to have_http_status(403)
+    end
+  end
+end

From 554e2a019e40755fbe6ae02fbf5cfc1862550e20 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 14 Feb 2024 13:12:13 +0100
Subject: [PATCH 0113/2191] Add `sidekiq_unique_jobs:delete_all_locks` task and
 disable `sidekiq-unique-jobs` UI by default (#29199)

---
 config/routes.rb                   |  2 +-
 lib/tasks/sidekiq_unique_jobs.rake | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 lib/tasks/sidekiq_unique_jobs.rake

diff --git a/config/routes.rb b/config/routes.rb
index bb088821fd7356..51c10a14f6e6a6 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'sidekiq_unique_jobs/web'
+require 'sidekiq_unique_jobs/web' if ENV['ENABLE_SIDEKIQ_UNIQUE_JOBS_UI'] == true
 require 'sidekiq-scheduler/web'
 
 class RedirectWithVary < ActionDispatch::Routing::PathRedirect
diff --git a/lib/tasks/sidekiq_unique_jobs.rake b/lib/tasks/sidekiq_unique_jobs.rake
new file mode 100644
index 00000000000000..bedc8fe4c650c4
--- /dev/null
+++ b/lib/tasks/sidekiq_unique_jobs.rake
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+namespace :sidekiq_unique_jobs do
+  task delete_all_locks: :environment do
+    digests = SidekiqUniqueJobs::Digests.new
+    digests.delete_by_pattern('*', count: digests.count)
+
+    expiring_digests = SidekiqUniqueJobs::ExpiringDigests.new
+    expiring_digests.delete_by_pattern('*', count: expiring_digests.count)
+  end
+end

From 68eaa804c9bafdc5f798e114e9ba00161425dd71 Mon Sep 17 00:00:00 2001
From: Emelia Smith <ThisIsMissEm@users.noreply.github.com>
Date: Wed, 14 Feb 2024 15:15:34 +0100
Subject: [PATCH 0114/2191] Merge pull request from GHSA-7w3c-p9j8-mq3x

* Ensure destruction of OAuth Applications notifies streaming

Due to doorkeeper using a dependent: delete_all relationship, the destroy of an OAuth Application bypassed the existing AccessTokenExtension callbacks for announcing destructing of access tokens.

* Ensure password resets revoke access to Streaming API

* Improve performance of deleting OAuth tokens

---------

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
---
 app/lib/application_extension.rb | 20 ++++++++++++++++++++
 app/models/user.rb               | 10 ++++++++++
 spec/models/user_spec.rb         |  7 +++++++
 3 files changed, 37 insertions(+)

diff --git a/app/lib/application_extension.rb b/app/lib/application_extension.rb
index fb442e2c2d2fca..400c51a023d09b 100644
--- a/app/lib/application_extension.rb
+++ b/app/lib/application_extension.rb
@@ -4,14 +4,34 @@ module ApplicationExtension
   extend ActiveSupport::Concern
 
   included do
+    include Redisable
+
     has_many :created_users, class_name: 'User', foreign_key: 'created_by_application_id', inverse_of: :created_by_application
 
     validates :name, length: { maximum: 60 }
     validates :website, url: true, length: { maximum: 2_000 }, if: :website?
     validates :redirect_uri, length: { maximum: 2_000 }
+
+    # The relationship used between Applications and AccessTokens is using
+    # dependent: delete_all, which means the ActiveRecord callback in
+    # AccessTokenExtension is not run, so instead we manually announce to
+    # streaming that these tokens are being deleted.
+    before_destroy :push_to_streaming_api, prepend: true
   end
 
   def confirmation_redirect_uri
     redirect_uri.lines.first.strip
   end
+
+  def push_to_streaming_api
+    # TODO: #28793 Combine into a single topic
+    payload = Oj.dump(event: :kill)
+    access_tokens.in_batches do |tokens|
+      redis.pipelined do |pipeline|
+        tokens.ids.each do |id|
+          pipeline.publish("timeline:access_token:#{id}", payload)
+        end
+      end
+    end
+  end
 end
diff --git a/app/models/user.rb b/app/models/user.rb
index 95fdc431ac43ea..f706c91eff55c4 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -344,6 +344,16 @@ def revoke_access!
     Doorkeeper::AccessToken.by_resource_owner(self).in_batches do |batch|
       batch.update_all(revoked_at: Time.now.utc)
       Web::PushSubscription.where(access_token_id: batch).delete_all
+
+      # Revoke each access token for the Streaming API, since `update_all``
+      # doesn't trigger ActiveRecord Callbacks:
+      # TODO: #28793 Combine into a single topic
+      payload = Oj.dump(event: :kill)
+      redis.pipelined do |pipeline|
+        batch.ids.each do |id|
+          pipeline.publish("timeline:access_token:#{id}", payload)
+        end
+      end
     end
   end
 
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 5ac41c0ff1dd94..845335e87341e9 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -420,7 +420,10 @@
     let!(:access_token) { Fabricate(:access_token, resource_owner_id: user.id) }
     let!(:web_push_subscription) { Fabricate(:web_push_subscription, access_token: access_token) }
 
+    let(:redis_pipeline_stub) { instance_double(Redis::Namespace, publish: nil) }
+
     before do
+      allow(redis).to receive(:pipelined).and_yield(redis_pipeline_stub)
       user.reset_password!
     end
 
@@ -437,6 +440,10 @@
       expect(Doorkeeper::AccessToken.active_for(user).count).to eq 0
     end
 
+    it 'revokes streaming access for all access tokens' do
+      expect(redis_pipeline_stub).to have_received(:publish).with("timeline:access_token:#{access_token.id}", Oj.dump(event: :kill)).once
+    end
+
     it 'removes push subscriptions' do
       expect(Web::PushSubscription.where(user: user).or(Web::PushSubscription.where(access_token: access_token)).count).to eq 0
       expect { web_push_subscription.reload }.to raise_error(ActiveRecord::RecordNotFound)

From b31af34c9716338e4a32a62cc812d1ca59e88d15 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 14 Feb 2024 15:16:07 +0100
Subject: [PATCH 0115/2191] Merge pull request from GHSA-vm39-j3vx-pch3

* Prevent different identities from a same SSO provider from accessing a same account

* Lock auth provider changes behind `ALLOW_UNSAFE_AUTH_PROVIDER_REATTACH=true`

* Rename methods to avoid confusion between OAuth and OmniAuth
---
 .../auth/omniauth_callbacks_controller.rb     |  2 +-
 app/models/concerns/user/omniauthable.rb      | 52 ++++++++++++++-----
 app/models/identity.rb                        |  2 +-
 spec/models/identity_spec.rb                  |  6 +--
 spec/requests/omniauth_callbacks_spec.rb      |  2 +-
 5 files changed, 44 insertions(+), 20 deletions(-)

diff --git a/app/controllers/auth/omniauth_callbacks_controller.rb b/app/controllers/auth/omniauth_callbacks_controller.rb
index 707b50ef9e1c03..9b83de945bee2a 100644
--- a/app/controllers/auth/omniauth_callbacks_controller.rb
+++ b/app/controllers/auth/omniauth_callbacks_controller.rb
@@ -7,7 +7,7 @@ class Auth::OmniauthCallbacksController < Devise::OmniauthCallbacksController
   def self.provides_callback_for(provider)
     define_method provider do
       @provider = provider
-      @user = User.find_for_oauth(request.env['omniauth.auth'], current_user)
+      @user = User.find_for_omniauth(request.env['omniauth.auth'], current_user)
 
       if @user.persisted?
         record_login_activity
diff --git a/app/models/concerns/user/omniauthable.rb b/app/models/concerns/user/omniauthable.rb
index 113bfda23043eb..396a0598f87b82 100644
--- a/app/models/concerns/user/omniauthable.rb
+++ b/app/models/concerns/user/omniauthable.rb
@@ -19,17 +19,18 @@ def email_present?
   end
 
   class_methods do
-    def find_for_oauth(auth, signed_in_resource = nil)
+    def find_for_omniauth(auth, signed_in_resource = nil)
       # EOLE-SSO Patch
       auth.uid = (auth.uid[0][:uid] || auth.uid[0][:user]) if auth.uid.is_a? Hashie::Array
-      identity = Identity.find_for_oauth(auth)
+      identity = Identity.find_for_omniauth(auth)
 
       # If a signed_in_resource is provided it always overrides the existing user
       # to prevent the identity being locked with accidentally created accounts.
       # Note that this may leave zombie accounts (with no associated identity) which
       # can be cleaned up at a later date.
       user   = signed_in_resource || identity.user
-      user ||= create_for_oauth(auth)
+      user ||= reattach_for_auth(auth)
+      user ||= create_for_auth(auth)
 
       if identity.user.nil?
         identity.user = user
@@ -39,19 +40,35 @@ def find_for_oauth(auth, signed_in_resource = nil)
       user
     end
 
-    def create_for_oauth(auth)
-      # Check if the user exists with provided email. If no email was provided,
-      # we assign a temporary email and ask the user to verify it on
-      # the next step via Auth::SetupController.show
+    private
 
-      strategy          = Devise.omniauth_configs[auth.provider.to_sym].strategy
-      assume_verified   = strategy&.security&.assume_email_is_verified
-      email_is_verified = auth.info.verified || auth.info.verified_email || auth.info.email_verified || assume_verified
-      email             = auth.info.verified_email || auth.info.email
+    def reattach_for_auth(auth)
+      # If allowed, check if a user exists with the provided email address,
+      # and return it if they does not have an associated identity with the
+      # current authentication provider.
+
+      # This can be used to provide a choice of alternative auth providers
+      # or provide smooth gradual transition between multiple auth providers,
+      # but this is discouraged because any insecure provider will put *all*
+      # local users at risk, regardless of which provider they registered with.
+
+      return unless ENV['ALLOW_UNSAFE_AUTH_PROVIDER_REATTACH'] == 'true'
 
-      user = User.find_by(email: email) if email_is_verified
+      email, email_is_verified = email_from_auth(auth)
+      return unless email_is_verified
 
-      return user unless user.nil?
+      user = User.find_by(email: email)
+      return if user.nil? || Identity.exists?(provider: auth.provider, user_id: user.id)
+
+      user
+    end
+
+    def create_for_auth(auth)
+      # Create a user for the given auth params. If no email was provided,
+      # we assign a temporary email and ask the user to verify it on
+      # the next step via Auth::SetupController.show
+
+      email, email_is_verified = email_from_auth(auth)
 
       user = User.new(user_params_from_auth(email, auth))
 
@@ -66,7 +83,14 @@ def create_for_oauth(auth)
       user
     end
 
-    private
+    def email_from_auth(auth)
+      strategy          = Devise.omniauth_configs[auth.provider.to_sym].strategy
+      assume_verified   = strategy&.security&.assume_email_is_verified
+      email_is_verified = auth.info.verified || auth.info.verified_email || auth.info.email_verified || assume_verified
+      email             = auth.info.verified_email || auth.info.email
+
+      [email, email_is_verified]
+    end
 
     def user_params_from_auth(email, auth)
       {
diff --git a/app/models/identity.rb b/app/models/identity.rb
index c95a68a6f63abb..77821b78fa2550 100644
--- a/app/models/identity.rb
+++ b/app/models/identity.rb
@@ -17,7 +17,7 @@ class Identity < ApplicationRecord
   validates :uid, presence: true, uniqueness: { scope: :provider }
   validates :provider, presence: true
 
-  def self.find_for_oauth(auth)
+  def self.find_for_omniauth(auth)
     find_or_create_by(uid: auth.uid, provider: auth.provider)
   end
 end
diff --git a/spec/models/identity_spec.rb b/spec/models/identity_spec.rb
index 70224544433c8d..d5a2ffbc869fad 100644
--- a/spec/models/identity_spec.rb
+++ b/spec/models/identity_spec.rb
@@ -3,19 +3,19 @@
 require 'rails_helper'
 
 RSpec.describe Identity do
-  describe '.find_for_oauth' do
+  describe '.find_for_omniauth' do
     let(:auth) { Fabricate(:identity, user: Fabricate(:user)) }
 
     it 'calls .find_or_create_by' do
       allow(described_class).to receive(:find_or_create_by)
 
-      described_class.find_for_oauth(auth)
+      described_class.find_for_omniauth(auth)
 
       expect(described_class).to have_received(:find_or_create_by).with(uid: auth.uid, provider: auth.provider)
     end
 
     it 'returns an instance of Identity' do
-      expect(described_class.find_for_oauth(auth)).to be_instance_of described_class
+      expect(described_class.find_for_omniauth(auth)).to be_instance_of described_class
     end
   end
 end
diff --git a/spec/requests/omniauth_callbacks_spec.rb b/spec/requests/omniauth_callbacks_spec.rb
index 0d37c411403bdc..b478ca1ce614f6 100644
--- a/spec/requests/omniauth_callbacks_spec.rb
+++ b/spec/requests/omniauth_callbacks_spec.rb
@@ -96,7 +96,7 @@
 
     context 'when a user cannot be built' do
       before do
-        allow(User).to receive(:find_for_oauth).and_return(User.new)
+        allow(User).to receive(:find_for_omniauth).and_return(User.new)
       end
 
       it 'redirects to the new user signup page' do

From 8e8e0f104fc3a64c9f862eca588a63ddbb8b6865 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 14 Feb 2024 15:20:02 +0100
Subject: [PATCH 0116/2191] Bump version to v4.3.0-alpha.2 (#29200)

---
 lib/mastodon/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index dd7c84207e0b1e..c2f26aee63551e 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -17,7 +17,7 @@ def patch
     end
 
     def default_prerelease
-      'alpha.1'
+      'alpha.2'
     end
 
     def prerelease

From bbbbf000849a3eb38f2a1fb58370f7e81ef71f11 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 14 Feb 2024 15:57:49 +0100
Subject: [PATCH 0117/2191] Fix OmniAuth tests (#29201)

---
 spec/requests/omniauth_callbacks_spec.rb | 35 ++++++++++++++++++------
 1 file changed, 26 insertions(+), 9 deletions(-)

diff --git a/spec/requests/omniauth_callbacks_spec.rb b/spec/requests/omniauth_callbacks_spec.rb
index b478ca1ce614f6..1e488b3f43fc3a 100644
--- a/spec/requests/omniauth_callbacks_spec.rb
+++ b/spec/requests/omniauth_callbacks_spec.rb
@@ -39,16 +39,33 @@
           Fabricate(:user, email: 'user@host.example')
         end
 
-        it 'matches the existing user, creates an identity, and redirects to root path' do
-          expect { subject }
-            .to not_change(User, :count)
-            .and change(Identity, :count)
-            .by(1)
-            .and change(LoginActivity, :count)
-            .by(1)
+        context 'when ALLOW_UNSAFE_AUTH_PROVIDER_REATTACH is set to true' do
+          around do |example|
+            ClimateControl.modify ALLOW_UNSAFE_AUTH_PROVIDER_REATTACH: 'true' do
+              example.run
+            end
+          end
+
+          it 'matches the existing user, creates an identity, and redirects to root path' do
+            expect { subject }
+              .to not_change(User, :count)
+              .and change(Identity, :count)
+              .by(1)
+              .and change(LoginActivity, :count)
+              .by(1)
+
+            expect(Identity.find_by(user: User.last).uid).to eq('123')
+            expect(response).to redirect_to(root_path)
+          end
+        end
 
-          expect(Identity.find_by(user: User.last).uid).to eq('123')
-          expect(response).to redirect_to(root_path)
+        context 'when ALLOW_UNSAFE_AUTH_PROVIDER_REATTACH is not set to true' do
+          it 'does not match the existing user or create an identity' do
+            expect { subject }
+              .to not_change(User, :count)
+              .and not_change(Identity, :count)
+              .and not_change(LoginActivity, :count)
+          end
         end
       end
 

From 844aa59bdfe76d8db2253c1a25d2f9b6caead690 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 14 Feb 2024 11:44:27 -0500
Subject: [PATCH 0118/2191] Doc update about ruby version 3.0+ (#29202)

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 267f0ed29578ab..6cf722b355af8b 100644
--- a/README.md
+++ b/README.md
@@ -69,7 +69,7 @@ Mastodon acts as an OAuth2 provider, so 3rd party apps can use the REST and Stre
 
 - **PostgreSQL** 12+
 - **Redis** 4+
-- **Ruby** 2.7+
+- **Ruby** 3.0+
 - **Node.js** 16+
 
 The repository includes deployment configurations for **Docker and docker-compose** as well as specific platforms like **Heroku**, **Scalingo**, and **Nanobox**. For Helm charts, reference the [mastodon/chart repository](https://github.com/mastodon/chart). The [**standalone** installation guide](https://docs.joinmastodon.org/admin/install/) is available in the documentation.

From d4d0565b0fd86ca80d2dbf0c7d09a9af5ea4a293 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 14 Feb 2024 22:49:45 +0100
Subject: [PATCH 0119/2191] Fix user creation failure handling in OAuth paths
 (#29207)

---
 app/controllers/auth/omniauth_callbacks_controller.rb | 3 +++
 config/locales/devise.en.yml                          | 1 +
 spec/requests/omniauth_callbacks_spec.rb              | 4 +++-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/controllers/auth/omniauth_callbacks_controller.rb b/app/controllers/auth/omniauth_callbacks_controller.rb
index 9b83de945bee2a..9d496220a3d277 100644
--- a/app/controllers/auth/omniauth_callbacks_controller.rb
+++ b/app/controllers/auth/omniauth_callbacks_controller.rb
@@ -17,6 +17,9 @@ def self.provides_callback_for(provider)
         session["devise.#{provider}_data"] = request.env['omniauth.auth']
         redirect_to new_user_registration_url
       end
+    rescue ActiveRecord::RecordInvalid
+      flash[:alert] = I18n.t('devise.failure.omniauth_user_creation_failure') if is_navigational_format?
+      redirect_to new_user_session_url
     end
   end
 
diff --git a/config/locales/devise.en.yml b/config/locales/devise.en.yml
index 4439397c8eead1..61bd33851b6fca 100644
--- a/config/locales/devise.en.yml
+++ b/config/locales/devise.en.yml
@@ -12,6 +12,7 @@ en:
       last_attempt: You have one more attempt before your account is locked.
       locked: Your account is locked.
       not_found_in_database: Invalid %{authentication_keys} or password.
+      omniauth_user_creation_failure: Error creating an account for this identity.
       pending: Your account is still under review.
       timeout: Your session expired. Please login again to continue.
       unauthenticated: You need to login or sign up before continuing.
diff --git a/spec/requests/omniauth_callbacks_spec.rb b/spec/requests/omniauth_callbacks_spec.rb
index 1e488b3f43fc3a..095535e48598e0 100644
--- a/spec/requests/omniauth_callbacks_spec.rb
+++ b/spec/requests/omniauth_callbacks_spec.rb
@@ -60,11 +60,13 @@
         end
 
         context 'when ALLOW_UNSAFE_AUTH_PROVIDER_REATTACH is not set to true' do
-          it 'does not match the existing user or create an identity' do
+          it 'does not match the existing user or create an identity, and redirects to login page' do
             expect { subject }
               .to not_change(User, :count)
               .and not_change(Identity, :count)
               .and not_change(LoginActivity, :count)
+
+            expect(response).to redirect_to(new_user_session_url)
           end
         end
       end

From fc4f82346440573898c60fcd4af1f033ec724aae Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 16 Feb 2024 02:41:25 -0500
Subject: [PATCH 0120/2191] Avoid local block var assignment in
 ap/process_status_update_service spec (#29210)

---
 .../services/activitypub/process_status_update_service_spec.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/spec/services/activitypub/process_status_update_service_spec.rb b/spec/services/activitypub/process_status_update_service_spec.rb
index 53cbaf4cc1aaaa..67f2f27276537d 100644
--- a/spec/services/activitypub/process_status_update_service_spec.rb
+++ b/spec/services/activitypub/process_status_update_service_spec.rb
@@ -218,7 +218,8 @@ def poll_option_json(name, votes)
       end
 
       it 'does not update the text, spoiler_text or edited_at' do
-        expect { subject.call(status, json, json) }.to_not(change { s = status.reload; [s.text, s.spoiler_text, s.edited_at] })
+        expect { subject.call(status, json, json) }
+          .to_not(change { status.reload.attributes.slice('text', 'spoiler_text', 'edited_at').values })
       end
     end
 

From 1df2ffc3eee80ab53de00d076658dd546515a9bd Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 16 Feb 2024 02:42:03 -0500
Subject: [PATCH 0121/2191] Use `subject` in blacklist email validator spec
 (#29211)

---
 spec/validators/blacklisted_email_validator_spec.rb | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/spec/validators/blacklisted_email_validator_spec.rb b/spec/validators/blacklisted_email_validator_spec.rb
index 6292f0737ed757..86760df2e7f4b0 100644
--- a/spec/validators/blacklisted_email_validator_spec.rb
+++ b/spec/validators/blacklisted_email_validator_spec.rb
@@ -4,7 +4,7 @@
 
 RSpec.describe BlacklistedEmailValidator do
   describe '#validate' do
-    subject { described_class.new.validate(user); errors }
+    subject { described_class.new.validate(user) }
 
     let(:user)   { instance_double(User, email: 'info@mail.com', sign_up_ip: '1.2.3.4', errors: errors) }
     let(:errors) { instance_double(ActiveModel::Errors, add: nil) }
@@ -18,7 +18,8 @@
       let(:blocked_email) { true }
 
       it 'adds error' do
-        described_class.new.validate(user)
+        subject
+
         expect(errors).to have_received(:add).with(:email, :blocked).once
       end
     end
@@ -27,7 +28,8 @@
       let(:blocked_email) { false }
 
       it 'does not add errors' do
-        described_class.new.validate(user)
+        subject
+
         expect(errors).to_not have_received(:add)
       end
 
@@ -39,7 +41,8 @@
         end
 
         it 'adds error' do
-          described_class.new.validate(user)
+          subject
+
           expect(errors).to have_received(:add).with(:email, :taken).once
         end
       end

From ed4939296a2f0ecf5d072c4f04c2733170038fa4 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 16 Feb 2024 02:43:00 -0500
Subject: [PATCH 0122/2191] Reduce `RSpec/MultipleExpectations` in
 ap/activity/create spec (#29224)

---
 spec/lib/activitypub/activity/create_spec.rb | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/spec/lib/activitypub/activity/create_spec.rb b/spec/lib/activitypub/activity/create_spec.rb
index e4966cffa33f1f..dec17b916b803b 100644
--- a/spec/lib/activitypub/activity/create_spec.rb
+++ b/spec/lib/activitypub/activity/create_spec.rb
@@ -970,12 +970,15 @@ def activity_for_object(json)
       it 'creates an encrypted message' do
         encrypted_message = target_device.encrypted_messages.reload.first
 
-        expect(encrypted_message).to_not be_nil
-        expect(encrypted_message.from_device_id).to eq '1234'
-        expect(encrypted_message.from_account).to eq sender
-        expect(encrypted_message.type).to eq 1
-        expect(encrypted_message.body).to eq 'Foo'
-        expect(encrypted_message.digest).to eq 'Foo123'
+        expect(encrypted_message)
+          .to be_present
+          .and have_attributes(
+            from_device_id: eq('1234'),
+            from_account: eq(sender),
+            type: eq(1),
+            body: eq('Foo'),
+            digest: eq('Foo123')
+          )
       end
 
       it 'creates a message franking' do

From 1c93d625c6392374ebf014c190166ce98652f539 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 16 Feb 2024 08:51:13 +0100
Subject: [PATCH 0123/2191] New Crowdin Translations (automated) (#29195)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/bg.json  |  12 +-
 app/javascript/mastodon/locales/ie.json  |  13 +++
 app/javascript/mastodon/locales/kab.json |  61 ++++++----
 app/javascript/mastodon/locales/sk.json  |   1 +
 app/javascript/mastodon/locales/th.json  |   4 +-
 app/javascript/mastodon/locales/tok.json |  10 ++
 config/locales/de.yml                    |   4 +-
 config/locales/devise.be.yml             |   1 +
 config/locales/devise.ca.yml             |   1 +
 config/locales/devise.da.yml             |   1 +
 config/locales/devise.de.yml             |   1 +
 config/locales/devise.es-AR.yml          |   1 +
 config/locales/devise.eu.yml             |   1 +
 config/locales/devise.fi.yml             |   1 +
 config/locales/devise.fo.yml             |   1 +
 config/locales/devise.fy.yml             |   1 +
 config/locales/devise.gl.yml             |   1 +
 config/locales/devise.he.yml             |   1 +
 config/locales/devise.hu.yml             |   1 +
 config/locales/devise.ie.yml             |   1 +
 config/locales/devise.is.yml             |   1 +
 config/locales/devise.it.yml             |   1 +
 config/locales/devise.kab.yml            |   8 +-
 config/locales/devise.ko.yml             |   1 +
 config/locales/devise.lad.yml            |   1 +
 config/locales/devise.nl.yml             |   1 +
 config/locales/devise.pl.yml             |   1 +
 config/locales/devise.pt-PT.yml          |   1 +
 config/locales/devise.sk.yml             |   1 +
 config/locales/devise.sl.yml             |   1 +
 config/locales/devise.sq.yml             |   1 +
 config/locales/devise.sr-Latn.yml        |   1 +
 config/locales/devise.sr.yml             |   1 +
 config/locales/devise.tr.yml             |   1 +
 config/locales/devise.uk.yml             |   1 +
 config/locales/devise.zh-CN.yml          |   1 +
 config/locales/devise.zh-HK.yml          |   1 +
 config/locales/devise.zh-TW.yml          |   1 +
 config/locales/doorkeeper.kab.yml        |  10 +-
 config/locales/ie.yml                    |   6 +
 config/locales/kab.yml                   | 136 +++++++++++++++--------
 config/locales/simple_form.kab.yml       |   8 +-
 config/locales/sq.yml                    |   4 +-
 config/locales/th.yml                    |   2 +-
 44 files changed, 211 insertions(+), 98 deletions(-)

diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json
index 5a6fa175e8abe5..3e7f6e51b218f4 100644
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@@ -201,7 +201,7 @@
   "disabled_account_banner.text": "Вашият акаунт {disabledAccount} сега е изключен.",
   "dismissable_banner.community_timeline": "Ето най-скорошните публични публикации от хора, чиито акаунти са разположени в {domain}.",
   "dismissable_banner.dismiss": "Отхвърляне",
-  "dismissable_banner.explore_links": "Тези новини се разказват от хората в този и други сървъри на децентрализираната мрежа точно сега.",
+  "dismissable_banner.explore_links": "Това са най-споделяните новини в социалната мрежа днес. По-нови истории, споделени от повече хора се показват по-напред.",
   "dismissable_banner.explore_statuses": "Има публикации през социалната мрежа, които днес набират популярност. По-новите публикации с повече подсилвания и любими са класирани по-високо.",
   "dismissable_banner.explore_tags": "Тези хаштагове сега набират популярност сред хората в този и други сървъри на децентрализирата мрежа.",
   "dismissable_banner.public_timeline": "Ето най-новите обществени публикации от хора в социална мрежа, която хората в {domain} следват.",
@@ -231,7 +231,7 @@
   "empty_column.community": "Локалният инфопоток е празен. Публикувайте нещо, за да започнете!",
   "empty_column.direct": "Още нямате никакви частни споменавания. Тук ще се показват, изпращайки или получавайки едно.",
   "empty_column.domain_blocks": "Още няма блокирани домейни.",
-  "empty_column.explore_statuses": "Няма нищо налагащо се в момента. Проверете пак по-късно!",
+  "empty_column.explore_statuses": "Няма тенденции в момента. Проверете пак по-късно!",
   "empty_column.favourited_statuses": "Още нямате никакви любими публикации. Правейки любима, то тя ще се покаже тук.",
   "empty_column.favourites": "Още никого не е слагал публикацията в любими. Когато някой го направи, този човек ще се покаже тук.",
   "empty_column.follow_requests": "Още нямате заявки за последване. Получавайки такава, то тя ще се покаже тук.",
@@ -407,7 +407,7 @@
   "navigation_bar.direct": "Частни споменавания",
   "navigation_bar.discover": "Откриване",
   "navigation_bar.domain_blocks": "Блокирани домейни",
-  "navigation_bar.explore": "Изследване",
+  "navigation_bar.explore": "Разглеждане",
   "navigation_bar.favourites": "Любими",
   "navigation_bar.filters": "Заглушени думи",
   "navigation_bar.follow_requests": "Заявки за последване",
@@ -474,10 +474,10 @@
   "notifications_permission_banner.title": "Никога не пропускате нещо",
   "onboarding.action.back": "Върнете ме обратно",
   "onboarding.actions.back": "Върнете ме обратно",
-  "onboarding.actions.go_to_explore": "Вижте какво изгрява",
+  "onboarding.actions.go_to_explore": "Виж тенденции",
   "onboarding.actions.go_to_home": "Към началния ви инфоканал",
   "onboarding.compose.template": "Здравейте, #Mastodon!",
-  "onboarding.follows.empty": "За съжаление, в момента не могат да се показват резултати. Може да опитате да употребявате търсене или да прегледате страницата за изследване, за да намерите страница за последване, или да опитате пак по-късно.",
+  "onboarding.follows.empty": "За съжаление, в момента не могат да бъдат показани резултати. Може да опитате да търсите или да разгледате, за да намерите кого да последвате, или опитайте отново по-късно.",
   "onboarding.follows.lead": "Може да бъдете куратор на началния си инфоканал. Последвайки повече хора, по-деен и по-интересен ще става. Тези профили може да са добра начална точка, от която винаги по-късно да спрете да следвате!",
   "onboarding.follows.title": "Популярно в Mastodon",
   "onboarding.profile.discoverable": "Правене на моя профил откриваем",
@@ -530,7 +530,7 @@
   "privacy.private.short": "Последователи",
   "privacy.public.long": "Всеки във и извън Mastodon",
   "privacy.public.short": "Публично",
-  "privacy.unlisted.additional": "Това поведение е точно като публичното, с изключение на това, че публикацията няма да се появява в каналите на живо, хаштаговете, проучването или търсенето в Mastodon, дори ако сте се включили в целия акаунт.",
+  "privacy.unlisted.additional": "Това действие е точно като публичното, с изключение на това, че публикацията няма да се появява в каналите на живо, хаштаговете, разглеждането или търсенето в Mastodon, дори ако сте избрали да се публично видими на ниво акаунт.",
   "privacy.unlisted.long": "По-малко алгоритмични фанфари",
   "privacy.unlisted.short": "Тиха публика",
   "privacy_policy.last_updated": "Последно осъвременяване на {date}",
diff --git a/app/javascript/mastodon/locales/ie.json b/app/javascript/mastodon/locales/ie.json
index d39aa6cf61bcda..0c21832ed62e0d 100644
--- a/app/javascript/mastodon/locales/ie.json
+++ b/app/javascript/mastodon/locales/ie.json
@@ -158,6 +158,7 @@
   "compose_form.save_changes": "Actualisar",
   "compose_form.spoiler.marked": "Remover avise pri li contenete",
   "compose_form.spoiler.unmarked": "Adjunter avise pri li contenete",
+  "compose_form.spoiler_placeholder": "Advertiment de contenete (optional)",
   "confirmation_modal.cancel": "Anullar",
   "confirmations.block.block_and_report": "Bloccar & Raportar",
   "confirmations.block.confirm": "Bloccar",
@@ -276,6 +277,12 @@
   "follow_request.authorize": "Autorisar",
   "follow_request.reject": "Rejecter",
   "follow_requests.unlocked_explanation": "Benque tu conto ne es cludet, li administratores de {domain} pensat que tu fórsan vell voler tractar seque-petitiones de tis-ci contos manualmen.",
+  "follow_suggestions.curated_suggestion": "Selection del Servitor",
+  "follow_suggestions.dismiss": "Ne monstrar plu",
+  "follow_suggestions.personalized_suggestion": "Personalisat suggestion",
+  "follow_suggestions.popular_suggestion": "Populari suggestion",
+  "follow_suggestions.view_all": "Vider omnicos",
+  "follow_suggestions.who_to_follow": "Persones a sequer",
   "followed_tags": "Sequet hashtags",
   "footer.about": "Information",
   "footer.directory": "Profilarium",
@@ -517,11 +524,15 @@
   "poll_button.add_poll": "Adjunter un balotation",
   "poll_button.remove_poll": "Remover balotation",
   "privacy.change": "Changear li privatie del posta",
+  "privacy.direct.long": "Omnes mentionat in li posta",
   "privacy.direct.short": "Specific persones",
   "privacy.private.long": "Solmen tui sequitores",
   "privacy.private.short": "Sequitores",
   "privacy.public.long": "Quicunc in e ex Mastodon",
   "privacy.public.short": "Public",
+  "privacy.unlisted.additional": "It acte just quam public, except que li posta ne va aparir in tendentie o hashtags, explorar, o sercha de Mastodon, mem si tu ha optet por les sur tui tot conto.",
+  "privacy.unlisted.long": "Minu fanfare algoritmic",
+  "privacy.unlisted.short": "Quiet public",
   "privacy_policy.last_updated": "Ultimmen actualisat ye {date}",
   "privacy_policy.title": "Politica pri Privatie",
   "recommended": "Recomandat",
@@ -539,7 +550,9 @@
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "hodie",
+  "reply_indicator.attachments": "{count, plural, one {# atachament} other {# atachamentes}}",
   "reply_indicator.cancel": "Anullar",
+  "reply_indicator.poll": "Balotar",
   "report.block": "Bloccar",
   "report.block_explanation": "Tu ne va vider su postas. Li usator ni va posser vider tui postas, ni sequer te, ni va posser saver pri li statu de esser bloccat.",
   "report.categories.legal": "Legal",
diff --git a/app/javascript/mastodon/locales/kab.json b/app/javascript/mastodon/locales/kab.json
index 7fb617518ca0ef..b69e93952b5548 100644
--- a/app/javascript/mastodon/locales/kab.json
+++ b/app/javascript/mastodon/locales/kab.json
@@ -11,11 +11,13 @@
   "account.blocked": "Yettusewḥel",
   "account.browse_more_on_origin_server": "Snirem ugar deg umeɣnu aneẓli",
   "account.cancel_follow_request": "Withdraw follow request",
+  "account.copy": "Nɣel assaɣ ɣer umaɣnu",
   "account.disable_notifications": "Ḥbes ur iyi-d-ttazen ara ilɣa mi ara d-isuffeɣ @{name}",
   "account.domain_blocked": "Taɣult yeffren",
   "account.edit_profile": "Ẓreg amaɣnu",
   "account.enable_notifications": "Azen-iyi-d ilɣa mi ara d-isuffeɣ @{name}",
   "account.endorse": "Welleh fell-as deg umaɣnu-inek",
+  "account.featured_tags.last_status_never": "Ulac tisuffaɣ",
   "account.follow": "Ḍfer",
   "account.followers": "Imeḍfaren",
   "account.followers.empty": "Ar tura, ulac yiwen i yeṭṭafaṛen amseqdac-agi.",
@@ -65,7 +67,7 @@
   "bundle_modal_error.message": "Tella-d kra n tuccḍa mi d-yettali ugbur-agi.",
   "bundle_modal_error.retry": "Ɛreḍ tikelt-nniḍen",
   "closed_registrations_modal.find_another_server": "Aff-d aqeddac nniḍen",
-  "column.about": "Γef",
+  "column.about": "Ɣef",
   "column.blocks": "Imiḍanen yettusḥebsen",
   "column.bookmarks": "Ticraḍ",
   "column.community": "Tasuddemt tadigant",
@@ -77,7 +79,7 @@
   "column.lists": "Tibdarin",
   "column.mutes": "Imiḍanen yettwasgugmen",
   "column.notifications": "Tilɣa",
-  "column.pins": "Tijewwaqin yettwasenṭḍen",
+  "column.pins": "Tisuffaɣ yettwasenṭḍen",
   "column.public": "Tasuddemt tamatut",
   "column_back_button.label": "Tuɣalin",
   "column_header.hide_settings": "Ffer iɣewwaṛen",
@@ -88,32 +90,36 @@
   "column_header.unpin": "Kkes asenteḍ",
   "column_subheading.settings": "Iɣewwaṛen",
   "community.column_settings.local_only": "Adigan kan",
-  "community.column_settings.media_only": "Allal n teywalt kan",
+  "community.column_settings.media_only": "Imidyaten kan",
   "community.column_settings.remote_only": "Anmeggag kan",
   "compose.language.change": "Beddel tutlayt",
   "compose.language.search": "Nadi tutlayin …",
   "compose.published.open": "Ldi",
   "compose_form.direct_message_warning_learn_more": "Issin ugar",
-  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
-  "compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.",
+  "compose_form.encryption_warning": "",
+  "compose_form.hashtag_warning": "",
   "compose_form.lock_disclaimer": "Amiḍan-ik·im ur yelli ara {locked}. Menwala yezmer ad k·kem-yeḍfeṛ akken ad iẓer acu tbeṭṭuḍ akked yimeḍfaṛen-ik·im.",
   "compose_form.lock_disclaimer.lock": "yettwacekkel",
   "compose_form.placeholder": "D acu i itezzin deg wallaɣ?",
   "compose_form.poll.duration": "Tanzagt n tefrant",
+  "compose_form.poll.option_placeholder": "Taxtiṛt {number}",
   "compose_form.poll.single": "Fren yiwen",
-  "compose_form.publish_form": "Suffeɣ",
+  "compose_form.publish_form": "Tasuffeɣt tamaynut",
+  "compose_form.reply": "Err",
+  "compose_form.save_changes": "Leqqem",
   "compose_form.spoiler.marked": "Kkes aḍris yettwaffren deffir n walɣu",
   "compose_form.spoiler.unmarked": "Rnu aḍris yettwaffren deffir n walɣu",
   "confirmation_modal.cancel": "Sefsex",
   "confirmations.block.block_and_report": "Sewḥel & sewɛed",
   "confirmations.block.confirm": "Sewḥel",
-  "confirmations.block.message": "Tebγiḍ s tidet ad tesḥebseḍ {name}?",
+  "confirmations.block.message": "Tebɣiḍ s tidet ad tesḥebseḍ {name}?",
   "confirmations.delete.confirm": "Kkes",
   "confirmations.delete.message": "Tebɣiḍ s tidet ad tekkseḍ tasuffeɣt-agi?",
   "confirmations.delete_list.confirm": "Kkes",
   "confirmations.delete_list.message": "Tebɣiḍ s tidet ad tekkseḍ umuɣ-agi i lebda?",
   "confirmations.discard_edit_media.confirm": "Sefsex",
   "confirmations.domain_block.confirm": "Ffer taɣult meṛṛa",
+  "confirmations.edit.confirm": "Ẓreg",
   "confirmations.logout.confirm": "Ffeɣ",
   "confirmations.logout.message": "D tidet tebɣiḍ ad teffɣeḍ?",
   "confirmations.mute.confirm": "Sgugem",
@@ -133,12 +139,13 @@
   "directory.local": "Seg {domain} kan",
   "directory.new_arrivals": "Imaynuten id yewḍen",
   "directory.recently_active": "Yermed xas melmi kan",
-  "disabled_account_banner.account_settings": "Iγewwaṛen n umiḍan",
+  "disabled_account_banner.account_settings": "Iɣewwaṛen n umiḍan",
   "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
   "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.",
   "embed.instructions": "Ẓẓu addad-agi deg usmel-inek s wenγal n tangalt yellan sdaw-agi.",
   "embed.preview": "Akka ara d-iban:",
   "emoji_button.activity": "Aqeddic",
+  "emoji_button.clear": "Sfeḍ",
   "emoji_button.custom": "Udmawan",
   "emoji_button.flags": "Innayen",
   "emoji_button.food": "Tegwella & Tissit",
@@ -153,7 +160,7 @@
   "emoji_button.symbols": "Izamulen",
   "emoji_button.travel": "Imeḍqan d Yinigen",
   "empty_column.account_suspended": "Amiḍan yettwaḥbas",
-  "empty_column.account_timeline": "Ulac tijewwaqin dagi!",
+  "empty_column.account_timeline": "Ulac tisuffaɣ da !",
   "empty_column.account_unavailable": "Ur nufi ara amaɣnu-ayi",
   "empty_column.blocks": "Ur tesḥebseḍ ula yiwen n umseqdac ar tura.",
   "empty_column.bookmarked_statuses": "Ulac tijewwaqin i terniḍ ɣer yismenyifen-ik ar tura. Ticki terniḍ yiwet, ad d-tettwasken da.",
@@ -174,7 +181,7 @@
   "explore.suggested_follows": "Imdanen",
   "explore.title": "Snirem",
   "explore.trending_links": "Isallen",
-  "explore.trending_statuses": "Tisuffiɣin",
+  "explore.trending_statuses": "Tisuffaɣ",
   "explore.trending_tags": "Ihacṭagen",
   "filter_modal.added.settings_link": "asebter n yiɣewwaṛen",
   "filter_modal.select_filter.prompt_new": "Taggayt tamaynutt : {name}",
@@ -183,8 +190,9 @@
   "firehose.local": "Deg uqeddac-ayi",
   "follow_request.authorize": "Ssireg",
   "follow_request.reject": "Agi",
-  "footer.about": "Γef",
-  "footer.directory": "Akaram n imaγnuten",
+  "followed_tags": "Ihacṭagen yettwaḍfaren",
+  "footer.about": "Ɣef",
+  "footer.directory": "Akaram n imaɣnuten",
   "footer.get_app": "Awi-d asnas",
   "footer.invite": "Ɛreḍ-d kra n yimdanen",
   "footer.keyboard_shortcuts": "Inegzumen n unasiw",
@@ -207,6 +215,7 @@
   "home.column_settings.show_replies": "Ssken-d tiririyin",
   "home.hide_announcements": "Ffer ulɣuyen",
   "home.show_announcements": "Ssken-d ulɣuyen",
+  "interaction_modal.no_account_yet": "Ulac-ik·ikem deg Maṣṭudun?",
   "interaction_modal.on_this_server": "Deg uqeddac-ayi",
   "interaction_modal.title.follow": "Ḍfer {name}",
   "intervals.full.days": "{number, plural, one {# n wass} other {# n wussan}}",
@@ -247,8 +256,8 @@
   "lightbox.close": "Mdel",
   "lightbox.compress": "Ḥemmeẓ tamnaḍt n uskan n tugna",
   "lightbox.expand": "Simeɣer tamnaḍt n uskan n tugna",
-  "lightbox.next": "Γer zdat",
-  "lightbox.previous": "Γer deffir",
+  "lightbox.next": "Ɣer zdat",
+  "lightbox.previous": "Ɣer deffir",
   "link_preview.author": "S-ɣur {name}",
   "lists.account.add": "Rnu ɣer tebdart",
   "lists.account.remove": "Kkes seg tebdart",
@@ -264,11 +273,12 @@
   "lists.search": "Nadi gar yemdanen i teṭṭafaṛeḍ",
   "lists.subheading": "Tibdarin-ik·im",
   "load_pending": "{count, plural, one {# n uferdis amaynut} other {# n yiferdisen imaynuten}}",
-  "media_gallery.toggle_visible": "Ffer {number, plural, one {tugna} other {tugniwin}}",
+  "loading_indicator.label": "Yessalay-d …",
+  "media_gallery.toggle_visible": "{number, plural, one {Ffer tugna} other {Ffer tugniwin}}",
   "mute_modal.duration": "Tanzagt",
   "mute_modal.hide_notifications": "Tebɣiḍ ad teffreḍ talɣutin n umseqdac-a?",
   "mute_modal.indefinite": "Ur yettwasbadu ara",
-  "navigation_bar.about": "Γef",
+  "navigation_bar.about": "Ɣef",
   "navigation_bar.blocks": "Imseqdacen yettusḥebsen",
   "navigation_bar.bookmarks": "Ticraḍ",
   "navigation_bar.community_timeline": "Tasuddemt tadigant",
@@ -284,7 +294,7 @@
   "navigation_bar.logout": "Ffeɣ",
   "navigation_bar.mutes": "Iseqdacen yettwasusmen",
   "navigation_bar.personal": "Udmawan",
-  "navigation_bar.pins": "Tijewwiqin yettwasentḍen",
+  "navigation_bar.pins": "Tisuffaɣ yettwasenṭḍen",
   "navigation_bar.preferences": "Imenyafen",
   "navigation_bar.public_timeline": "Tasuddemt tazayezt tamatut",
   "navigation_bar.search": "Nadi",
@@ -311,7 +321,7 @@
   "notifications.column_settings.reblog": "Seǧhed:",
   "notifications.column_settings.show": "Ssken-d tilɣa deg ujgu",
   "notifications.column_settings.sound": "Rmed imesli",
-  "notifications.column_settings.status": "Tiẓenẓunin timaynutin:",
+  "notifications.column_settings.status": "Tisuffaɣ timaynutin :",
   "notifications.filter.all": "Akk",
   "notifications.filter.boosts": "Seǧhed",
   "notifications.filter.favourites": "Imenyafen",
@@ -325,11 +335,15 @@
   "notifications.permission_denied": "D awezɣi ad yili wermad n yilɣa n tnarit axateṛ turagt tettwagdel.",
   "notifications_permission_banner.enable": "Rmed talɣutin n tnarit",
   "notifications_permission_banner.title": "Ur zeggel acemma",
+  "onboarding.action.back": "Tuɣalin ɣer deffir",
+  "onboarding.actions.back": "Tuɣalin ɣer deffir",
   "onboarding.actions.go_to_explore": "See what's trending",
   "onboarding.actions.go_to_home": "Go to your home feed",
   "onboarding.compose.template": "Azul a #Mastodon!",
   "onboarding.follows.lead": "You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!",
   "onboarding.follows.title": "Popular on Mastodon",
+  "onboarding.profile.display_name": "Isem ara d-yettwaskanen",
+  "onboarding.share.title": "Bḍu amaɣnu-inek·inem",
   "onboarding.start.lead": "Your new Mastodon account is ready to go. Here's how you can make the most of it:",
   "onboarding.start.skip": "Want to skip right ahead?",
   "onboarding.steps.follow_people.body": "You curate your own feed. Lets fill it with interesting people.",
@@ -365,7 +379,7 @@
   "report.block": "Sewḥel",
   "report.categories.other": "Tiyyaḍ",
   "report.categories.spam": "Aspam",
-  "report.category.title_account": "ameγnu",
+  "report.category.title_account": "ameɣnu",
   "report.category.title_status": "tasuffeɣt",
   "report.close": "Immed",
   "report.forward": "Bren-it ɣeṛ {target}",
@@ -383,6 +397,7 @@
   "report_notification.open": "Ldi aneqqis",
   "search.placeholder": "Nadi",
   "search.search_or_paste": "Nadi neɣ senṭeḍ URL",
+  "search_popout.user": "amseqdac",
   "search_results.all": "Akk",
   "search_results.hashtags": "Ihacṭagen",
   "search_results.statuses": "Tisuffaɣ",
@@ -405,7 +420,7 @@
   "status.embed": "Seddu",
   "status.filtered": "Yettwasizdeg",
   "status.load_more": "Sali ugar",
-  "status.media_hidden": "Taɣwalt tettwaffer",
+  "status.media_hidden": "Amidya yettwaffer",
   "status.mention": "Bder-d @{name}",
   "status.more": "Ugar",
   "status.mute": "Sussem @{name}",
@@ -425,7 +440,7 @@
   "status.sensitive_warning": "Agbur amḥulfu",
   "status.share": "Bḍu",
   "status.show_less": "Ssken-d drus",
-  "status.show_less_all": "Semẓi akk tisuffγin",
+  "status.show_less_all": "Semẓi akk tisuffɣin",
   "status.show_more": "Ssken-d ugar",
   "status.show_more_all": "Ẓerr ugar lebda",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
@@ -444,7 +459,7 @@
   "timeline_hint.remote_resource_not_displayed": "{resource} seg yiqeddacen-nniḍen ur d-ttwaskanent ara.",
   "timeline_hint.resources.followers": "Imeḍfaṛen",
   "timeline_hint.resources.follows": "T·Yeṭafaṛ",
-  "timeline_hint.resources.statuses": "Tijewwaqin tiqdimin",
+  "timeline_hint.resources.statuses": "Tisuffaɣ tiqdimin",
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {# days}}",
   "trends.trending_now": "Ayen mucaɛen tura",
   "ui.beforeunload": "Arewway-ik·im ad iruḥ ma yella tefeɣ-d deg Maṣṭudun.",
@@ -465,7 +480,7 @@
   "upload_modal.choose_image": "Fren tugna",
   "upload_modal.description_placeholder": "Aberraɣ arurad ineggez nnig n uqjun amuṭṭis",
   "upload_modal.detect_text": "Sefru-d aḍris seg tugna",
-  "upload_modal.edit_media": "Ẓreg taɣwalt",
+  "upload_modal.edit_media": "Ẓreg amidya",
   "upload_modal.preparing_ocr": "Aheyyi n OCR…",
   "upload_modal.preview_label": "Taskant ({ratio})",
   "upload_progress.label": "Asali iteddu...",
diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json
index ad7837cab28e76..da76e9868750bd 100644
--- a/app/javascript/mastodon/locales/sk.json
+++ b/app/javascript/mastodon/locales/sk.json
@@ -523,6 +523,7 @@
   "poll_button.add_poll": "Pridaj anketu",
   "poll_button.remove_poll": "Odstráň anketu",
   "privacy.change": "Uprav súkromie príspevku",
+  "privacy.direct.long": "Všetci spomenutí v príspevku",
   "privacy.direct.short": "Konkrétni ľudia",
   "privacy.private.long": "Iba tvoji nasledovatelia",
   "privacy.private.short": "Sledovatelia",
diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json
index 72ecb11ed1ca05..e0aa072a77cc45 100644
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@@ -279,8 +279,8 @@
   "follow_requests.unlocked_explanation": "แม้ว่าไม่มีการล็อคบัญชีของคุณ พนักงานของ {domain} คิดว่าคุณอาจต้องการตรวจทานคำขอติดตามจากบัญชีเหล่านี้ด้วยตนเอง",
   "follow_suggestions.curated_suggestion": "คัดสรรโดยบรรณาธิการ",
   "follow_suggestions.dismiss": "ไม่ต้องแสดงอีก",
-  "follow_suggestions.personalized_suggestion": "คำแนะนำเฉพาะบุคคล",
-  "follow_suggestions.popular_suggestion": "คำแนะนำยอดนิยม",
+  "follow_suggestions.personalized_suggestion": "ข้อเสนอแนะเฉพาะบุคคล",
+  "follow_suggestions.popular_suggestion": "ข้อเสนอแนะยอดนิยม",
   "follow_suggestions.view_all": "ดูทั้งหมด",
   "follow_suggestions.who_to_follow": "ติดตามใครดี",
   "followed_tags": "แฮชแท็กที่ติดตาม",
diff --git a/app/javascript/mastodon/locales/tok.json b/app/javascript/mastodon/locales/tok.json
index 85f62f404ae718..4d2cc3d1dc6c72 100644
--- a/app/javascript/mastodon/locales/tok.json
+++ b/app/javascript/mastodon/locales/tok.json
@@ -2,6 +2,9 @@
   "about.blocks": "ma lawa",
   "about.contact": "toki:",
   "about.domain_blocks.no_reason_available": "mi sona ala e tan",
+  "about.domain_blocks.preamble": "ilo Masoton li ken e ni: sina lukin e toki jan pi ma ilo mute. sina ken toki tawa ona lon kulupu ma. taso, ma ni li ken ala e ni tawa ma ni:",
+  "about.domain_blocks.silenced.explanation": "sina lukin ala e toki e jan tan ma ni. taso, sina wile la, sina ken ni.",
+  "about.domain_blocks.silenced.title": "ken lili lukin",
   "about.domain_blocks.suspended.title": "weka",
   "about.not_available": "lon kulupu ni la sina ken alasa ala e sona ni.",
   "about.rules": "lawa kulupu",
@@ -32,6 +35,7 @@
   "account.follows.empty": "jan ni li kute e jan ala",
   "account.go_to_profile": "o tawa lipu jan",
   "account.hide_reblogs": "o lukin ala e pana toki tan @{name}",
+  "account.in_memoriam": "jan ni li moli. pona o tawa ona.",
   "account.languages": "sina wile lukin e sitelen pi toki seme",
   "account.locked_info": "sina wile kute e jan ni la ona o toki e ken",
   "account.media": "sitelen",
@@ -53,6 +57,7 @@
   "account.unblock": "o weka ala e jan {name}",
   "account.unblock_domain": "o weka ala e ma {domain}",
   "account.unblock_short": "o pini weka",
+  "account.unendorse": "lipu jan la o suli ala e ni",
   "account.unfollow": "o pini kute",
   "account.unmute": "o len ala e @{name}",
   "account.unmute_notifications_short": "o kute e mu tan jan ni",
@@ -65,6 +70,9 @@
   "alert.unexpected.title": "pakala a!",
   "announcement.announcement": "toki suli",
   "audio.hide": "o len e kalama",
+  "boost_modal.combo": "sina ken luka e nena {combo} tawa ni: sina wile ala luka e nena lon tenpo kama",
+  "bundle_column_error.copy_stacktrace": "o awen e sona pakala lon ilo sina",
+  "bundle_column_error.error.body": "ilo li ken ala pana e lipu ni. ni li ken tan pakala ilo.",
   "bundle_column_error.error.title": "ike a!",
   "bundle_column_error.network.title": "pakala la ilo sina li toki ala tawa ilo ante",
   "bundle_column_error.retry": "o ni sin",
@@ -75,7 +83,9 @@
   "bundle_modal_error.message": "ilo li wile kama e ijo ni, taso pakala li lon.",
   "bundle_modal_error.retry": "o ni sin",
   "closed_registrations_modal.find_another_server": "o alasa e ma ante",
+  "column.about": "sona",
   "column.blocks": "kulupu pi jan weka",
+  "column.bookmarks": "awen toki",
   "column.home": "lipu open",
   "column.lists": "kulupu lipu",
   "column.mutes": "jan len",
diff --git a/config/locales/de.yml b/config/locales/de.yml
index b77f4151904498..57ce5268a8b910 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -979,7 +979,7 @@ de:
       next_steps: Du kannst dem Einspruch zustimmen, um die Moderationsentscheidung rückgängig zu machen, oder ihn ignorieren.
       subject: "%{username} hat Einspruch gegen eine Moderationsentscheidung auf %{instance} erhoben"
     new_critical_software_updates:
-      body: Kritische Updates wurden für Mastodon veröffentlicht – du solltest so schnell wie möglich aktualisieren!
+      body: ein neues Sicherheitsupdate wurde veröffentlicht. Du solltest Mastodon so schnell wie möglich aktualisieren!
       subject: Kritische Mastodon-Updates sind für %{instance} verfügbar!
     new_pending_account:
       body: Die Details von diesem neuem Konto sind unten. Du kannst die Anfrage akzeptieren oder ablehnen.
@@ -1023,7 +1023,7 @@ de:
     salutation: "%{name},"
     settings: 'E-Mail-Einstellungen ändern: %{link}'
     unsubscribe: Abbestellen
-    view: 'Hier überprüfen:'
+    view: 'Siehe:'
     view_profile: Profil anzeigen
     view_status: Beitrag anschauen
   applications:
diff --git a/config/locales/devise.be.yml b/config/locales/devise.be.yml
index 18785d16ab956b..81f3120a885f59 100644
--- a/config/locales/devise.be.yml
+++ b/config/locales/devise.be.yml
@@ -12,6 +12,7 @@ be:
       last_attempt: У вас ёсць яшчэ адна спроба, перш чым ваш рахунак будзе заблакаваны
       locked: Ваш уліковы запіс заблакіраваны.
       not_found_in_database: Няправільны %{authentication_keys} або пароль.
+      omniauth_user_creation_failure: Памылка пры стварэнні ўліковага запісу для гэтай асобы.
       pending: Ваш уліковы запіс яшчэ разглядаецца.
       timeout: Ваш сеанс скончыўся. Каб працягнуць, увайдзіце яшчэ раз.
       unauthenticated: Вам патрэбна зайсьці альбо зарэгістравацца, каб працягнуць
diff --git a/config/locales/devise.ca.yml b/config/locales/devise.ca.yml
index 3720d3c5f7067c..9b4ccccff7937e 100644
--- a/config/locales/devise.ca.yml
+++ b/config/locales/devise.ca.yml
@@ -14,6 +14,7 @@ ca:
       last_attempt: Tens un intent més abans no es bloqui el teu compte.
       locked: El teu compte s'ha blocat.
       not_found_in_database: "%{authentication_keys} o contrasenya no són vàlids."
+      omniauth_user_creation_failure: S'ha produït un error en crear un compte per a aquesta identitat.
       pending: El teu compte encara està en revisió.
       timeout: La teva sessió ha expirat. Torna a iniciar-la per a continuar.
       unauthenticated: Necessites iniciar sessió o registrar-te abans de continuar.
diff --git a/config/locales/devise.da.yml b/config/locales/devise.da.yml
index daf802cdb734de..c472242ba7a1b7 100644
--- a/config/locales/devise.da.yml
+++ b/config/locales/devise.da.yml
@@ -12,6 +12,7 @@ da:
       last_attempt: Du har ét forsøg mere, før din konto bliver låst.
       locked: Din konto er låst.
       not_found_in_database: Ugyldig %{authentication_keys} eller adgangskode.
+      omniauth_user_creation_failure: Fejl under oprettelse af konto for denne identitet.
       pending: Din konto er stadig under revision.
       timeout: Session udløbet. Log ind igen for at fortsætte.
       unauthenticated: Log ind eller tilmeld dig for at fortsætte.
diff --git a/config/locales/devise.de.yml b/config/locales/devise.de.yml
index cf05ddc16b1994..7982f8a743237b 100644
--- a/config/locales/devise.de.yml
+++ b/config/locales/devise.de.yml
@@ -12,6 +12,7 @@ de:
       last_attempt: Du hast nur noch einen Versuch, bevor dein Zugang gesperrt wird.
       locked: Dein Konto ist gesperrt.
       not_found_in_database: "%{authentication_keys} oder Passwort ungültig."
+      omniauth_user_creation_failure: Fehler beim Erstellen eines Kontos für diese Identität.
       pending: Dein Konto wird weiterhin überprüft.
       timeout: Deine Sitzung ist abgelaufen. Bitte melde dich erneut an, um fortzufahren.
       unauthenticated: Du musst dich anmelden oder registrieren, bevor du fortfahren kannst.
diff --git a/config/locales/devise.es-AR.yml b/config/locales/devise.es-AR.yml
index ca60ee5debca62..62492945974185 100644
--- a/config/locales/devise.es-AR.yml
+++ b/config/locales/devise.es-AR.yml
@@ -12,6 +12,7 @@ es-AR:
       last_attempt: Tenés un intento más antes de que se bloquee tu cuenta.
       locked: Se bloqueó tu cuenta.
       not_found_in_database: "%{authentication_keys} o contraseña no válidas."
+      omniauth_user_creation_failure: Error al crear una cuenta para esta identidad.
       pending: Tu cuenta todavía está bajo revisión.
       timeout: Venció tu sesión. Por favor, volvé a iniciar sesión para continuar.
       unauthenticated: Necesitás iniciar sesión o registrarte antes de continuar.
diff --git a/config/locales/devise.eu.yml b/config/locales/devise.eu.yml
index 624f9ee93d8972..3e675659fe6064 100644
--- a/config/locales/devise.eu.yml
+++ b/config/locales/devise.eu.yml
@@ -12,6 +12,7 @@ eu:
       last_attempt: Saiakera bat geratzen zaizu zure kontua giltzapetu aurretik.
       locked: Zure kontua giltzapetuta dago.
       not_found_in_database: Baliogabeko %{authentication_keys} edo pasahitza.
+      omniauth_user_creation_failure: Errorea identitate honen kontu bat sortzean.
       pending: Zure kontua oraindik berrikusteke dago.
       timeout: Zure saioa iraungitu da. Hasi saioa berriro jarraitzeko.
       unauthenticated: Saioa hasi edo izena eman behar duzu jarraitu aurretik.
diff --git a/config/locales/devise.fi.yml b/config/locales/devise.fi.yml
index 66616d16b115fb..003d48417b6869 100644
--- a/config/locales/devise.fi.yml
+++ b/config/locales/devise.fi.yml
@@ -12,6 +12,7 @@ fi:
       last_attempt: Sinulla on vielä yksi yritys ennen kuin tilisi lukitaan.
       locked: Tilisi on lukittu.
       not_found_in_database: Virheellinen %{authentication_keys} tai salasana.
+      omniauth_user_creation_failure: Virhe luotaessa tiliä tälle henkilöllisyydelle.
       pending: Tilisi on vielä tarkistamatta.
       timeout: Istuntosi on vanhentunut. Jatkaaksesi käyttöä, kirjaudu uudelleen.
       unauthenticated: Sinun on kirjauduttava tai rekisteröidyttävä ennen kuin voit jatkaa.
diff --git a/config/locales/devise.fo.yml b/config/locales/devise.fo.yml
index 1f7708bb44fe26..30f83ba0da28d0 100644
--- a/config/locales/devise.fo.yml
+++ b/config/locales/devise.fo.yml
@@ -12,6 +12,7 @@ fo:
       last_attempt: Tú kanst royna einaferð afturat áðrenn kontan verður stongd.
       locked: Kontan hjá tær er læst.
       not_found_in_database: Ogyldigur %{authentication_keys} ella loyniorð.
+      omniauth_user_creation_failure: Feilur í sambandi við, at ein konta fyri hendan samleikan bleiv stovnað.
       pending: Kontan hjá tær verður kannað enn.
       timeout: Tín innritan er útgingin. Innrita av nýggjum, fyri at hada fram.
       unauthenticated: Tú mást skriva teg inn aftur fyri at halda fram.
diff --git a/config/locales/devise.fy.yml b/config/locales/devise.fy.yml
index 05fd7b807108b3..c8a04a740501fc 100644
--- a/config/locales/devise.fy.yml
+++ b/config/locales/devise.fy.yml
@@ -12,6 +12,7 @@ fy:
       last_attempt: Jo hawwe noch ien besykjen oer eardat jo account blokkearre wurdt.
       locked: Jo account is blokkearre.
       not_found_in_database: "%{authentication_keys} of wachtwurd ûnjildich."
+      omniauth_user_creation_failure: Flater by it oanmeitsjen fan in account foar dizze identiteit.
       pending: Jo account moat noch hieltyd beoardiele wurde.
       timeout: Jo sesje is ferrûn. Meld jo opnij oan om troch te gean.
       unauthenticated: Jo moatte oanmelde of registrearje.
diff --git a/config/locales/devise.gl.yml b/config/locales/devise.gl.yml
index b9f4a0a0056381..00b1824808af37 100644
--- a/config/locales/devise.gl.yml
+++ b/config/locales/devise.gl.yml
@@ -12,6 +12,7 @@ gl:
       last_attempt: Tes un intento máis antes de que a túa conta fique bloqueada.
       locked: A túa conta está bloqueada.
       not_found_in_database: "%{authentication_keys} ou contrasinal non válidos."
+      omniauth_user_creation_failure: Erro ao crear unha conta para esta identidade.
       pending: A túa conta aínda está baixo revisión.
       timeout: A túa sesión caducou. Accede outra vez para continuar.
       unauthenticated: Precisas iniciar sesión ou rexistrarte antes de continuar.
diff --git a/config/locales/devise.he.yml b/config/locales/devise.he.yml
index f2ec3a6716e1cd..02e307ae1cda2a 100644
--- a/config/locales/devise.he.yml
+++ b/config/locales/devise.he.yml
@@ -12,6 +12,7 @@ he:
       last_attempt: יש לך עוד ניסיון אחד לפני נעילת החשבון.
       locked: חשבון זה נעול.
       not_found_in_database: "%{authentication_keys} או סיסמה לא נכונים."
+      omniauth_user_creation_failure: שגיאה ביצירת חשבון לזהות הזו.
       pending: חשבונך נמצא עדיין בבדיקה.
       timeout: פג תוקף השהיה בחשבון. נא להכנס מחדש על מנת להמשיך.
       unauthenticated: יש להרשם או להכנס לחשבון על מנת להמשיך.
diff --git a/config/locales/devise.hu.yml b/config/locales/devise.hu.yml
index fea56ab24a9286..8c9fdf6a5037ad 100644
--- a/config/locales/devise.hu.yml
+++ b/config/locales/devise.hu.yml
@@ -12,6 +12,7 @@ hu:
       last_attempt: Már csak egy próbálkozásod maradt, mielőtt a fiókodat zároljuk.
       locked: A fiókodat zároltuk.
       not_found_in_database: Helytelen %{authentication_keys} vagy jelszó.
+      omniauth_user_creation_failure: Hiba történt a fiók létrehozása során ehhez az identitáshoz.
       pending: A fiókod még engedélyezésre vár.
       timeout: A munkameneted lejárt. A folytatáshoz jelentkezz be újra.
       unauthenticated: A folytatás előtt be kell jelentkezned vagy regisztrálnod kell.
diff --git a/config/locales/devise.ie.yml b/config/locales/devise.ie.yml
index 332c9da4563d88..9c82bd45299700 100644
--- a/config/locales/devise.ie.yml
+++ b/config/locales/devise.ie.yml
@@ -12,6 +12,7 @@ ie:
       last_attempt: Hay solmen un prova ante que tui conto deveni serrat.
       locked: Tui conto es serrat.
       not_found_in_database: Ínvalid %{authentication_keys} o passa-parol.
+      omniauth_user_creation_failure: Errore in li creation de un conto por ti-ci identitá.
       pending: Tui conto es ancor sub revision.
       timeout: Tui session ha expirat. Ples reintrar denov por continuar.
       unauthenticated: Tu deve intrar o registrar te ante continuar.
diff --git a/config/locales/devise.is.yml b/config/locales/devise.is.yml
index 12015fa29d628a..a045bdd80c0f07 100644
--- a/config/locales/devise.is.yml
+++ b/config/locales/devise.is.yml
@@ -12,6 +12,7 @@ is:
       last_attempt: Þú getur reynt einu sinni í viðbót áður en aðgangnum þínum verður læst.
       locked: Notandaaðgangurinn þinn er læstur.
       not_found_in_database: Ógilt %{authentication_keys} eða lykilorð.
+      omniauth_user_creation_failure: Villa við að útbúa aðgang fyrir þetta auðkenni.
       pending: Notandaaðgangurinn þinn er enn til yfirferðar.
       timeout: Setan þín er útrunnin. Skráðu þig aftur inn til að halda áfram.
       unauthenticated: Þú þarft að skrá þig inn eða nýskrá þig áður en lengra er haldið.
diff --git a/config/locales/devise.it.yml b/config/locales/devise.it.yml
index 19bd999aade12e..8aaea3c15be681 100644
--- a/config/locales/devise.it.yml
+++ b/config/locales/devise.it.yml
@@ -12,6 +12,7 @@ it:
       last_attempt: Hai un altro tentativo, prima che il tuo profilo venga bloccato.
       locked: Il tuo profilo è bloccato.
       not_found_in_database: "%{authentication_keys} o password non valida."
+      omniauth_user_creation_failure: Errore nella creazione di un account per questa identità.
       pending: Il tuo profilo è ancora in revisione.
       timeout: La tua sessione è scaduta. Sei pregato di accedere nuovamente per continuare.
       unauthenticated: Devi accedere o registrarti, per continuare.
diff --git a/config/locales/devise.kab.yml b/config/locales/devise.kab.yml
index 2f60629fd70cbb..f878a5b5039058 100644
--- a/config/locales/devise.kab.yml
+++ b/config/locales/devise.kab.yml
@@ -13,13 +13,13 @@ kab:
       locked: Amiḍan-ik yettwargel.
       not_found_in_database: Tella tuccḍa deg %{authentication_keys} neγ deg wawal uffir.
       pending: Amiḍan-inek mazal-it deg ɛiwed n tmuγli.
-      timeout: Tiγimit n tuqqna tezri. Ma ulac aγilif ɛiwed tuqqna akken ad tkemmleḍ.
-      unauthenticated: Ilaq ad teqqneḍ neγ ad tjerrḍeḍ akken ad tkemmelḍ.
+      timeout: Tiɣimit n tuqqna tezri. Ma ulac aɣilif ɛiwed tuqqna akken ad tkemmleḍ.
+      unauthenticated: Ilaq ad teqqneḍ neɣ ad tjerrḍeḍ akken ad tkemmelḍ.
       unconfirmed: Ilaq ad wekdeḍ tansa-inek imayl akken ad tkemmelḍ.
     mailer:
       confirmation_instructions:
         action: Senqed tansa-inek imayl
-        action_with_app: Wekked sakkin uγal γer %{app}
+        action_with_app: Sentem sakkin uɣal ɣer %{app}
         explanation: Aqla-k terniḍ amiḍan deg %{host} s tansa imayl-agi. Mazal-ak yiwen utekki akken ad t-tremdeḍ. Ma mačči d kečč i yessutren ay-agi, ttxil-k ssinef izen-a.
         explanation_when_pending: Tsutreḍ-d ajerred deg %{host} s tansa-agi imayl. Ad nγeṛ asuter-ik ticki tsentmeḍ tansa-ik imayl. Send asentem, ur tezmireḍ ara ad teqqneḍ γer umiḍan-ik. Ma yella nugi asuter-ik, isefka-ik ad ttwakksen seg uqeddac, ihi ulac tigawt-nniḍen ara k-d-yettuqeblen. Ma mačči d kečč i yellan deffir n usuter-agi, ttxil-k ssinef izen-agi.
         extra_html: Ttxil-k ẓer daγen <a href="%{terms_path}">ilugan n uqeddac</a> akked <a href="%{policy_path}">twetlin n useqdec-nneγ</a>.
@@ -87,7 +87,7 @@ kab:
     unlocks:
       send_instructions: Deg kra n tesdatin, ad teṭṭfeḍ imayl deg-s iwellihen i yilaqen i userreḥ n umiḍan-ik·im. Ma yella ur tufiḍ ara izen-agi, ttxil-k·m ẓer deg ukaram spam.
       send_paranoid_instructions: Ma yella umiḍan-ik·im yella, ad teṭṭfeḍ imayl deg tesdatin i d-iteddun, deg-s iwellihen i yilaqen i userreḥ n umiḍan-ik·im. Ma yella ur tufiḍ ara izen-agi, ttxil-k·m ẓer deg ukaram spam.
-      unlocked: Iserreḥ umiḍan-ik·im akken iwata. ttxil qqen akken ad tkemleḍ.
+      unlocked: Iserreḥ umiḍan-ik·im akken iwata. Ttxil qqen akken ad tkemleḍ.
   errors:
     messages:
       already_confirmed: ittwasentem yakan, ttxil εreḍ ad teqneḍ
diff --git a/config/locales/devise.ko.yml b/config/locales/devise.ko.yml
index 0c848e4bac35c5..198d44a4f799b2 100644
--- a/config/locales/devise.ko.yml
+++ b/config/locales/devise.ko.yml
@@ -12,6 +12,7 @@ ko:
       last_attempt: 계정이 잠기기까지 한 번의 시도가 남았습니다.
       locked: 계정이 잠겼습니다.
       not_found_in_database: 올바르지 않은 %{authentication_keys} 혹은 암호입니다.
+      omniauth_user_creation_failure: 이 신원으로 계정을 만드는데 실패했습니다.
       pending: 이 계정은 아직 검토 중입니다.
       timeout: 세션이 만료되었습니다. 다시 로그인 하세요.
       unauthenticated: 계속 하려면 로그인을 해야 합니다.
diff --git a/config/locales/devise.lad.yml b/config/locales/devise.lad.yml
index d2ce53760c5257..7d447140f4f7c6 100644
--- a/config/locales/devise.lad.yml
+++ b/config/locales/devise.lad.yml
@@ -12,6 +12,7 @@ lad:
       last_attempt: Aprova una vez mas antes de ke tu kuento sea blokado.
       locked: Tu kuento esta blokado.
       not_found_in_database: Inkorekto %{authentication_keys} o kod.
+      omniauth_user_creation_failure: Ay un error en kriyar un kuento para esta identita.
       pending: Tu kuento ainda esta basho revizyon.
       timeout: Tu sesyon tiene kadukado. Por favor konektate kon tu kuento de muevo para kontinuar.
       unauthenticated: Kale konektarte kon tu kuento o enregistrarte antes de kontinuar.
diff --git a/config/locales/devise.nl.yml b/config/locales/devise.nl.yml
index 0aaf376f7fca8d..ab6ae84db4d229 100644
--- a/config/locales/devise.nl.yml
+++ b/config/locales/devise.nl.yml
@@ -12,6 +12,7 @@ nl:
       last_attempt: Je hebt nog één poging over voordat jouw account wordt opgeschort.
       locked: Jouw account is opgeschort.
       not_found_in_database: "%{authentication_keys} of wachtwoord ongeldig."
+      omniauth_user_creation_failure: Fout bij het aanmaken van een account voor deze identiteit.
       pending: Jouw account moet nog steeds worden beoordeeld.
       timeout: Jouw sessie is verlopen, log opnieuw in.
       unauthenticated: Je dient in te loggen of te registreren.
diff --git a/config/locales/devise.pl.yml b/config/locales/devise.pl.yml
index a6d48f11ef0e09..f34fd04633a67e 100644
--- a/config/locales/devise.pl.yml
+++ b/config/locales/devise.pl.yml
@@ -12,6 +12,7 @@ pl:
       last_attempt: Masz jeszcze jedną próbę; Twoje konto zostanie zablokowane jeśli się nie powiedzie.
       locked: Twoje konto zostało zablokowane.
       not_found_in_database: Nieprawidłowy %{authentication_keys} lub hasło.
+      omniauth_user_creation_failure: Błąd przy tworzeniu konta dla tej tożsamości.
       pending: Twoje konto oczekuje na przegląd.
       timeout: Twoja sesja wygasła. Zaloguj się ponownie, aby kontynuować..
       unauthenticated: Zapisz się lub zaloguj, aby kontynuować.
diff --git a/config/locales/devise.pt-PT.yml b/config/locales/devise.pt-PT.yml
index c169ddeb971887..c66181fc5b8e3b 100644
--- a/config/locales/devise.pt-PT.yml
+++ b/config/locales/devise.pt-PT.yml
@@ -12,6 +12,7 @@ pt-PT:
       last_attempt: Tem só mais uma tentativa antes da sua conta ser bloqueada.
       locked: A tua conta está bloqueada.
       not_found_in_database: "%{authentication_keys} ou palavra-passe inválida."
+      omniauth_user_creation_failure: Erro ao criar uma conta para esta identidade.
       pending: A sua conta está ainda a aguardar revisão.
       timeout: A tua sessão expirou. Por favor, entra de novo para continuares.
       unauthenticated: Precisas de entrar na tua conta ou de te registares antes de continuar.
diff --git a/config/locales/devise.sk.yml b/config/locales/devise.sk.yml
index 3eb4b5304cf31f..bc01b73ccfca26 100644
--- a/config/locales/devise.sk.yml
+++ b/config/locales/devise.sk.yml
@@ -12,6 +12,7 @@ sk:
       last_attempt: Máš posledný pokus pred zamknutím tvojho účtu.
       locked: Tvoj účet je zamknutý.
       not_found_in_database: Nesprávny %{authentication_keys}, alebo heslo.
+      omniauth_user_creation_failure: Chyba pri vytváraní účtu pre túto identitu.
       pending: Tvoj účet je stále prehodnocovaný.
       timeout: Tvoja aktívna sezóna vypršala. Pre pokračovanie sa prosím prihlás znovu.
       unauthenticated: K pokračovaniu sa musíš zaregistrovať alebo prihlásiť.
diff --git a/config/locales/devise.sl.yml b/config/locales/devise.sl.yml
index 2d567e63f47797..0eb9b6330a8a26 100644
--- a/config/locales/devise.sl.yml
+++ b/config/locales/devise.sl.yml
@@ -12,6 +12,7 @@ sl:
       last_attempt: Pred zaklepom računa imate še en poskus.
       locked: Vaš račun je zaklenjen.
       not_found_in_database: Neveljavno %{authentication_keys} ali geslo.
+      omniauth_user_creation_failure: Napaka pri ustvarjanju računa za to identiteto.
       pending: Vaš račun je še vedno pod drobnogledom.
       timeout: Vaša seja je potekla. Če želite nadaljevati, se znova prijavite.
       unauthenticated: Pred nadaljevanjem se morate prijaviti ali vpisati.
diff --git a/config/locales/devise.sq.yml b/config/locales/devise.sq.yml
index 32136a0baa8e87..76dd493245f332 100644
--- a/config/locales/devise.sq.yml
+++ b/config/locales/devise.sq.yml
@@ -12,6 +12,7 @@ sq:
       last_attempt: Mund të provoni edhe një herë, përpara se llogaria juaj të kyçet.
       locked: Llogaria juaj është e kyçur.
       not_found_in_database: "%{authentication_keys} ose fjalëkalim i pavlefshëm."
+      omniauth_user_creation_failure: Gabim në krijim llogarie për këtë identitet.
       pending: Llogaria juaj është ende nën shqyrtim.
       timeout: Sesioni juaj ka skaduar. Ju lutemi, që të vazhdohet, ribëni hyrjen.
       unauthenticated: Përpara se të vazhdohet më tej, lypset të bëni hyrjen ose të regjistroheni.
diff --git a/config/locales/devise.sr-Latn.yml b/config/locales/devise.sr-Latn.yml
index c48ed87dca6b88..3947b2d84f2462 100644
--- a/config/locales/devise.sr-Latn.yml
+++ b/config/locales/devise.sr-Latn.yml
@@ -12,6 +12,7 @@ sr-Latn:
       last_attempt: Imate još jedan pokušaj pre nego što Vaš nalog bude zaključan.
       locked: Vaš nalog je zaključan.
       not_found_in_database: Neispravna %{authentication_keys} ili lozinka.
+      omniauth_user_creation_failure: Greška pri kreiranju naloga za ovaj identitet.
       pending: Vaš račun je još uvek u pregledu.
       timeout: Vreme trajanja Vaše sesije je isteklo. Za nastavak prijavite se ponovo.
       unauthenticated: Za nastavak se morate prijaviti ili registrovati.
diff --git a/config/locales/devise.sr.yml b/config/locales/devise.sr.yml
index 3e49cf97eeb5a6..a4c08dfaf0c511 100644
--- a/config/locales/devise.sr.yml
+++ b/config/locales/devise.sr.yml
@@ -12,6 +12,7 @@ sr:
       last_attempt: Имате још један покушај пре него што Ваш налог буде закључан.
       locked: Ваш налог је закључан.
       not_found_in_database: Неисправна %{authentication_keys} или лозинка.
+      omniauth_user_creation_failure: Грешка при креирању налога за овај идентитет.
       pending: Ваш налог се још увек прегледа.
       timeout: Ваша сесија је истекла. Пријавите се поново да бисте наставили.
       unauthenticated: Морате да се пријавите или региструјете пре него што наставите.
diff --git a/config/locales/devise.tr.yml b/config/locales/devise.tr.yml
index 66ca9b2816956a..e709d3fff156f4 100644
--- a/config/locales/devise.tr.yml
+++ b/config/locales/devise.tr.yml
@@ -12,6 +12,7 @@ tr:
       last_attempt: Hesabınız kilitlenmeden önce bir kez daha denemeniz gerekir.
       locked: Hesabınız kilitlendi.
       not_found_in_database: Geçersiz %{authentication_keys} ya da parola.
+      omniauth_user_creation_failure: Bu kimlik için hesap oluşturmada hata.
       pending: Hesabınız hala inceleniyor.
       timeout: Oturum süreniz sona erdi. Lütfen devam etmek için tekrar giriş yapınız.
       unauthenticated: Devam etmeden önce oturum açmanız veya kayıt olmanız gerek.
diff --git a/config/locales/devise.uk.yml b/config/locales/devise.uk.yml
index 3b3883fa9c9d63..65e89a274f953c 100644
--- a/config/locales/devise.uk.yml
+++ b/config/locales/devise.uk.yml
@@ -12,6 +12,7 @@ uk:
       last_attempt: У вас залишилась ще одна спроба, після якої ваш обліковий запис буде заблоковано.
       locked: Ваш обліковий запис заблоковано.
       not_found_in_database: Неправильний %{authentication_keys} або пароль.
+      omniauth_user_creation_failure: Помилка створення облікового запису для цієї особи.
       pending: Ваш обліковий запис ще перебуває на розгляді.
       timeout: Час сеансу минув. Будь ласка, увійдіть знову, щоб продовжити.
       unauthenticated: Щоб продовжити, увійдіть або зареєструйтеся.
diff --git a/config/locales/devise.zh-CN.yml b/config/locales/devise.zh-CN.yml
index 9b4b3ae2039c50..3eb722b96187be 100644
--- a/config/locales/devise.zh-CN.yml
+++ b/config/locales/devise.zh-CN.yml
@@ -12,6 +12,7 @@ zh-CN:
       last_attempt: 你只有最后一次尝试机会，若未通过，帐号将被锁定。
       locked: 你的账户已被锁定。
       not_found_in_database: "%{authentication_keys}或密码错误。"
+      omniauth_user_creation_failure: 为此身份创建账户时出错。
       pending: 你的账号仍在审核中。
       timeout: 你的会话已过期。请重新登录再继续操作。
       unauthenticated: 继续操作前请注册或者登录。
diff --git a/config/locales/devise.zh-HK.yml b/config/locales/devise.zh-HK.yml
index 7f728bf0adc8fc..a2620a8e4a98f3 100644
--- a/config/locales/devise.zh-HK.yml
+++ b/config/locales/devise.zh-HK.yml
@@ -12,6 +12,7 @@ zh-HK:
       last_attempt: 若你再一次嘗試失敗，我們將鎖定你的帳號，以策安全。
       locked: 你的帳號已被鎖定。
       not_found_in_database: 不正確的%{authentication_keys}或密碼。
+      omniauth_user_creation_failure: 為此身份建立帳號時出錯。
       pending: 你的帳號仍在審核中
       timeout: 你的登入階段已經過期，請重新登入以繼續使用。
       unauthenticated: 你必須先登入或登記，以繼續使用。
diff --git a/config/locales/devise.zh-TW.yml b/config/locales/devise.zh-TW.yml
index 06438971a794a1..7ead831e4f75aa 100644
--- a/config/locales/devise.zh-TW.yml
+++ b/config/locales/devise.zh-TW.yml
@@ -12,6 +12,7 @@ zh-TW:
       last_attempt: 帳號鎖定前，您還有最後一次嘗試機會。
       locked: 已鎖定您的帳號。
       not_found_in_database: 無效的 %{authentication_keys} 或密碼。
+      omniauth_user_creation_failure: 以此身分新增帳號時發生錯誤。
       pending: 您的帳號仍在審核中。
       timeout: 登入階段逾時。請重新登入以繼續。
       unauthenticated: 您必須先登入或註冊才能繼續使用。
diff --git a/config/locales/doorkeeper.kab.yml b/config/locales/doorkeeper.kab.yml
index fe1a8d9c50da34..d7f8904a35e9b1 100644
--- a/config/locales/doorkeeper.kab.yml
+++ b/config/locales/doorkeeper.kab.yml
@@ -36,7 +36,7 @@ kab:
         application: Asnas
         callback_url: URL n tririt n wawal
         delete: Kkes
-        empty: Ulac γur-ek·em isnasen.
+        empty: Ulac ɣur-k·m isnasen.
         name: Isem
         new: Asnas amaynut
         show: Ẓer
@@ -57,7 +57,7 @@ kab:
       new:
         title: Tlaq tsiregt
       show:
-        title: Nγel tangalt n wurag sakkin senteḍ-itt deg usnas.
+        title: Nɣel tangalt n wurag sakkin senteḍ-itt deg usnas.
     authorized_applications:
       buttons:
         revoke: Ḥwi
@@ -113,13 +113,13 @@ kab:
       read:notifications: ẓer tilγa-ik
       read:reports: ẓer ineqqisen-ik·im
       read:search: anadi deg umkan-ik·im
-      read:statuses: ẓer meṛṛa tisuffaγ
+      read:statuses: ẓer meṛṛa tisuffaɣ
       write: beddel meṛṛa isefka n umiḍan-ik
       write:accounts: ẓreg amaγnu-ik
       write:blocks: seḥbes imiḍanen d tγula
-      write:bookmarks: ad yernu tisuffγin γer ticraḍ
+      write:bookmarks: ad yernu tisuffaɣ ɣer ticraḍ
       write:filters: rnu-d imsizedgen
       write:follows: ḍfeṛ imdanen
       write:lists: ad yesnulfu tibdarin
-      write:media: ad yessali ifayluyen n teγwalt
+      write:media: ad yessali ifuyla n umidya
       write:notifications: sfeḍ tilɣa-k·m
diff --git a/config/locales/ie.yml b/config/locales/ie.yml
index a8287da5338735..7ab7f953bec191 100644
--- a/config/locales/ie.yml
+++ b/config/locales/ie.yml
@@ -1793,6 +1793,12 @@ ie:
       extra: It es ja pret a descargar!
       subject: Tui archive es pret por descargar
       title: Descargar archive
+    failed_2fa:
+      details: 'Vi li detallies del prova de intrar:'
+      explanation: Alqui provat accesser tui conto ma usat un ínvalid duesim factor de autentication.
+      further_actions_html: Si it ne esset tu, noi recomanda que tu strax %{action} nam li conto posse esser compromisset.
+      subject: Falliment de autentication de duesim factor
+      title: Fallit autentication de duesim factor
     suspicious_sign_in:
       change_password: changear tui passa-parol
       details: 'Vi li detallies del apertion de session:'
diff --git a/config/locales/kab.yml b/config/locales/kab.yml
index 66aeafde603aca..bf574fc016b159 100644
--- a/config/locales/kab.yml
+++ b/config/locales/kab.yml
@@ -5,7 +5,7 @@ kab:
     contact_missing: Ur yettusbadu ara
     contact_unavailable: Wlac
     hosted_on: Maṣṭudun yersen deg %{domain}
-    title: Γef
+    title: Ɣef
   accounts:
     follow: Ḍfeṛ
     followers:
@@ -15,9 +15,9 @@ kab:
     last_active: armud aneggaru
     nothing_here: Ulac kra da!
     posts:
-      one: Tajewwiqt
-      other: Tijewwiqin
-    posts_tab_heading: Tijewwiqin
+      one: Tasuffeɣt
+      other: Tisuffaɣ
+    posts_tab_heading: Tisuffaɣ
   admin:
     account_actions:
       action: Eg tigawt
@@ -47,7 +47,7 @@ kab:
       disable_two_factor_authentication: Gdel 2FA
       disabled: Yensa
       display_name: Isem ara d-yettwaskanen
-      domain: Taγult
+      domain: Taɣult
       edit: Ẓreg
       email: Imayl
       email_status: Addad n imayl
@@ -111,7 +111,7 @@ kab:
         targeted_reports: Yettwazen uneqqis sɣur wiyaḍ
       silence: Sgugem
       silenced: Yettwasgugem
-      statuses: Tisuffɣin
+      statuses: Tisuffaɣ
       subscribe: Jerred
       suspended: Yeḥbes
       title: Imiḍanen
@@ -203,22 +203,22 @@ kab:
     announcements:
       destroyed_msg: Tamselɣut tettwakkes akken iwata!
       edit:
-        title: Ẓreg ulγu
-      empty: Ulac kra n ulγuyen.
+        title: Ẓreg ulɣu
+      empty: Ulac kra n yilɣa yettwafen.
       live: Srid
       new:
-        create: Rnu-d ulγu
-        title: Ulγu amaynut
+        create: Snlufu-d ulɣu
+        title: Ulɣu amaynut
       publish: Sufeɣ
       published_msg: Tamselɣut tettwasufeɣ-d akken iwata!
       scheduled_for: Yettusɣiwsen i %{time}
       scheduled_msg: Tamselɣut tettusɣiwes i usufeɣ!
-      title: Ulγuyen
+      title: Ilɣa
     custom_emojis:
       assign_category: Efk taggayt
-      by_domain: Taγult
+      by_domain: Taɣult
       copied_msg: Takna tadigant n imuji yettwarna-d mebla ugur
-      copy: Nγel
+      copy: Nɣel
       create_new_category: Rnu-d taggayt tamaynut
       created_msg: Imuji yettwarna-d mebla ugur!
       delete: Kkes
@@ -229,7 +229,7 @@ kab:
       enable: Rmed
       enabled: Yermed
       enabled_msg: Imuji yermed mebla ugur
-      list: Umuγ
+      list: Tabdart
       new:
         title: Timerna n imuji udmawan amaynut
       overwrite: Semselsi
@@ -256,7 +256,7 @@ kab:
       add_new: Rni iḥder amaynut n taɣult
       confirm_suspension:
         cancel: Sefsex
-      domain: Taγult
+      domain: Taɣult
       export: Sifeḍ
       import: Kter
       new:
@@ -274,9 +274,9 @@ kab:
     email_domain_blocks:
       add_new: Rnu amaynut
       delete: Kkes
-      domain: Taγult
+      domain: Taɣult
       new:
-        create: Rnu taγult
+        create: Rnu taɣult
         title: Timerna n taɣult tamaynut n imayl ɣer tebdart taberkant
       title: Tabdart taberkant n imayl
     follow_recommendations:
@@ -286,8 +286,8 @@ kab:
     instances:
       back_to_all: Akk
       back_to_limited: Ɣur-s talast
-      back_to_warning: Γur-wat
-      by_domain: Taγult
+      back_to_warning: Ɣur-wat
+      by_domain: Taɣult
       content_policies:
         policy: Tasertit
       delivery:
@@ -306,7 +306,7 @@ kab:
       private_comment: Awennit uslig
       public_comment: Awennit azayez
       title: Tamatut
-      total_blocked_by_us: Ttwasḥebsen sγur-neγ
+      total_blocked_by_us: Ttwasḥebsen sɣur-neɣ
       total_followed_by_them: Ṭtafaṛen-t
       total_followed_by_us: Neṭṭafaṛ-it
       total_reported: Ineqqisen fell-asen
@@ -354,12 +354,15 @@ kab:
           other: "%{count} n timawin"
       action_taken_by: Tigawt yettwaṭṭfen sɣur
       are_you_sure: Tetḥaq-eḍ?
+      cancel: Sefsex
       category: Taggayt
       comment:
         none: Ula yiwen
       confirm: Sentem
+      delete_and_resolve: Kkes tisuffaɣ
       mark_as_resolved: Creḍ-it yefra
       mark_as_unresolved: Creḍ-it ur yefra ara
+      no_one_assigned: Ula yiwen
       notes:
         create: Rnu tazmilt
         create_and_resolve: Fru s tamawt
@@ -390,16 +393,16 @@ kab:
       title: Ilugan n uqeddac
     settings:
       about:
-        title: Γef
+        title: Ɣef
       appearance:
         title: Udem
       discovery:
-        profile_directory: Akaram n imaγnuten
+        profile_directory: Akaram n imaɣnuten
         trends: Ayen mucaɛen
       domain_blocks:
         all: I medden akk
-        disabled: Γef ula yiwen
-        users: Γef yimseqdacen idiganen i yeqqnen
+        disabled: Ɣef ula yiwen
+        users: Ɣef yimseqdacen idiganen i yeqqnen
       registrations:
         title: Ajerred
       registrations_mode:
@@ -408,19 +411,26 @@ kab:
           open: Zemren akk ad jerden
     site_uploads:
       delete: Kkes afaylu yulin
+    software_updates:
+      documentation_link: Issin ugar
     statuses:
       application: Asnas
-      back_to_account: Tuγalin γer usebter n umiḍan
+      back_to_account: Tuɣalin ɣer usebter n umiḍan
       deleted: Yettwakkes
       favourites: Imenyafen
       language: Tutlayt
       media:
-        title: Taγwalt
-      title: Tisuffiγin n umiḍan
-      with_media: S taγwalt
+        title: Amidya
+      title: Tisuffaɣ n umiḍan
+      trending: Ayen mucaɛen
+      visibility: Abani
+      with_media: S umidya
     title: Tadbelt
     trends:
       allow: Sireg
+      statuses:
+        title: Tisuffaɣ mucaɛen
+      trending: Ayen mucaɛen
     warning_presets:
       add_new: Rnu amaynut
       delete: Kkes
@@ -431,7 +441,11 @@ kab:
     new_report:
       body: "%{reporter} yettwazen ɣef %{target}"
       subject: Aneqqis amaynut i %{instance} (#%{id})
+    new_trends:
+      new_trending_statuses:
+        title: Tisuffaɣ mucaɛen
   appearance:
+    advanced_web_interface: Agrudem n web leqqayen
     discovery: Asnirem
     localization:
       guide_link: https://crowdin.com/project/mastodon
@@ -448,6 +462,8 @@ kab:
     your_token: Ajiṭun-ik·im n unekcum
   auth:
     apply_for_account: Suter amiḍan
+    confirmations:
+      welcome_title: Ansuf yessek·em, %{name}!
     delete_account: Kkes amiḍan
     description:
       prefix_invited_by_user: "@%{name} inced-ik·ikem ad ternuḍ ɣer uqeddac-a n Mastodon!"
@@ -455,9 +471,11 @@ kab:
     forgot_password: Tettud awal-ik uffir?
     log_in_with: Qqen s
     login: Qqen
-    logout: Ffeγ
-    migrate_account: Gujj γer umiḍan nniḍen
-    or_log_in_with: Neγ eqqen s
+    logout: Ffeɣ
+    migrate_account: Gujj ɣer umiḍan nniḍen
+    or_log_in_with: Neɣ eqqen s
+    progress:
+      confirm: Sentem imayl
     providers:
       cas: CAS
       saml: SAML
@@ -466,8 +484,11 @@ kab:
     reset_password: Wennez awal uffir
     rules:
       back: Tuɣalin
-    security: Taγellist
+    security: Taɣellist
     set_new_password: Egr-d awal uffir amaynut
+    sign_in:
+      preamble_html: Kcem ar <strong>%{domain}</strong> s inekcam-inek n tuqqna. Ma yella yezga-d umiḍan-ik deg uqeddac-nniḍen, ur tezmireḍ ara ad tkecmeḍ sya.
+      title: Akeččum ɣer %{domain}
     status:
       account_status: Addad n umiḍan
     use_security_key: Seqdec tasarut n teɣlist
@@ -498,16 +519,21 @@ kab:
     warning:
       username_available: Isem-ik·im n useqdac ad yuɣal yella i tikkelt-nniḍen
       username_unavailable: Isem-ik·im n useqdac ad yeqqim ulac-it
+  disputes:
+    strikes:
+      status: 'Tasuffeɣt #%{id}'
+      title_actions:
+        none: Ɣur-wat
   errors:
     '500':
-      title: Asebter-ayi d arameγtu
+      title: Asebter-ayi d arameɣtu
   existing_username_validator:
     not_found_multiple: ur yezmir ara ad yaf %{usernames}
   exports:
     archive_takeout:
       date: Azemz
       download: Sider-d aḥraz-ik·im
-      size: Teγzi
+      size: Teɣzi
     bookmarks: Ticraḍ
     csv: CSV
     lists: Tibdarin
@@ -516,8 +542,8 @@ kab:
     add_new: Rnu amaynut
   filters:
     contexts:
-      account: Imuγna
-      notifications: Tilγa
+      account: Imuɣna
+      notifications: Ilɣa
       thread: Idiwenniyen
     edit:
       title: Ẓreg amzizdig
@@ -534,8 +560,10 @@ kab:
         remove: Kkes seg umsizdeg
   generic:
     all: Akk
+    cancel: Sefsex
     changes_saved_msg: Ttwaskelsen ibelliden-ik·im akken ilaq!
-    copy: Nγel
+    confirm: Sentem
+    copy: Nɣel
     delete: Kkes
     order_by: Sizwer s
     save_changes: Sekles ibeddilen
@@ -575,7 +603,7 @@ kab:
       sign_in_token: tangalt n tɣellist n tansa imayl
       webauthn: tisura n tɣellist
   migrations:
-    acct: Ibeddel γer
+    acct: Ibeddel ɣer
     incoming_migrations: Tusiḍ-d seg umiḍan nniḍen
     proceed_with_move: Awid imeḍfaṛen-ik
   moderation:
@@ -597,7 +625,7 @@ kab:
     reblog:
       subject: "%{name} yesselha addad-ik·im"
   notifications:
-    other_settings: Iγewwaṛen nniḍen n tilγa
+    other_settings: Iɣewwaṛen nniḍen n yilɣa
   number:
     human:
       decimal_units:
@@ -611,11 +639,13 @@ kab:
     setup: Sbadu
   pagination:
     newer: Amaynut
-    next: Γer zdat
+    next: Ɣer zdat
     older: Aqbuṛ
     prev: Win iɛeddan
   preferences:
     other: Wiyaḍ
+  privacy:
+    privacy: Tabaḍnit
   privacy_policy:
     title: Tasertit tabaḍnit
   relationships:
@@ -634,6 +664,7 @@ kab:
     browser: Iminig
     browsers:
       alipay: Alipay
+      blackberry: BlackBerry
       chrome: Chrome
       edge: Microsoft Edge
       electron: Electron
@@ -648,37 +679,41 @@ kab:
       qq: Iminig QQ
       safari: Safari
       weibo: Weibo
-    current_session: Tiγimit tamirant
+    current_session: Tiɣimit tamirant
+    date: Azemz
     description: "%{browser} s %{platform}"
     ip: IP
     platforms:
       adobe_air: Adobe Air
       android: Android
+      blackberry: BlackBerry
+      chrome_os: ChromeOS
       firefox_os: Firefox OS
       ios: iOS
+      kai_os: KaiOS
       linux: Linux
       mac: macOS
       windows: Windows
       windows_mobile: Windows Mobile
-      windows_phone: Tiliγri Windows Phone
+      windows_phone: Tiliɣri Windows Phone
     revoke: Ḥwi
     title: Tiɣimiyin
   settings:
     account: Amiḍan
-    account_settings: Iγewwaṛen n umiḍan
+    account_settings: Iɣewwaṛen n umiḍan
     appearance: Udem
     authorized_apps: Isnasen yettussirgen
-    back: Uγal γer Maṣṭudun
+    back: Uɣal ɣer Maṣṭudun
     delete: Tukksa n umiḍan
     development: Taneflit
-    edit_profile: Ẓreg amaγnu
+    edit_profile: Ẓreg amaɣnu
     export: Taktert n yisefka
     import: Kter
     import_and_export: Taktert d usifeḍ
     migrate: Tunigin n umiḍan
-    notifications: Tilγa
+    notifications: Ilɣa
     preferences: Imenyafen
-    profile: Ameγnu
+    profile: Ameɣnu
     relationships: Imeḍfaṛen akked wid i teṭṭafaṛeḍ
     statuses_cleanup: Tukksa tawurmant n tsuffaɣ
     two_factor_authentication: Asesteb s snat n tarrayin
@@ -745,22 +780,25 @@ kab:
     otp: Asnas n usesteb
     webauthn: Tisura n teɣlist
   user_mailer:
+    appeal_approved:
+      action: Iɣewwaṛen n umiḍan
     warning:
       categories:
         spam: Aspam
       title:
         disable: Amiḍan i igersen
-        none: Γur-wat
+        none: Ɣur-wat
         silence: Amiḍan yesɛa talast
         suspend: Amiḍan yettwaḥbas
     welcome:
       final_action: Bdu asuffeɣ
       full_handle: Tansa umiḍan-ik takemmalit
-      subject: Ansuf γer Maṣṭudun
+      subject: Ansuf ɣer Maṣṭudun
       title: Ansuf yessek·em, %{name}!
   users:
     signed_in_as: 'Teqqneḍ amzun d:'
   verification:
+    here_is_how: Ha-t-a amek
     verification: Asenqed
   webauthn_credentials:
     add: Rnu tasarut n teɣlist tamaynut
diff --git a/config/locales/simple_form.kab.yml b/config/locales/simple_form.kab.yml
index 1e1c52da24e37b..546336660c7327 100644
--- a/config/locales/simple_form.kab.yml
+++ b/config/locales/simple_form.kab.yml
@@ -12,7 +12,7 @@ kab:
       defaults:
         autofollow: Imdanen ara ijerrden s usnebgi-inek, ad k-ḍefṛen s wudem awurman
         email: Ad n-teṭṭfeḍ imayl i usentem
-        irreversible: Tijewwaqin i tessazedgeḍ ad ttwakksent i lebda, ula ma tekkseḍ imsizdeg-nni ar zdat
+        irreversible: Tisuffaɣ i tessazedgeḍ ad ttwakksent i lebda, ula ma tekkseḍ imsizdeg-nni ar zdat
         locale: Tutlayt n ugrudem, imaylen d tilγa
         password: Seqdec ma drus 8 n yisekkilen
         setting_display_media_default: Ffer teywalt yettwacreḍ d tanafrit
@@ -69,12 +69,12 @@ kab:
         setting_display_media_show_all: Ssken kullec
         setting_hide_network: Ffer azetta-k·m
         setting_theme: Asental n wesmel
-        setting_use_pending_items: Askar aleγwayan
+        setting_use_pending_items: Askar aleɣwayan
         sign_in_token_attempt: Tangalt n tɣellist
         title: Azwel
         type: Anaw n uktar
         username: Isem n useqdac
-        username_or_email: Isem n useqdac neγ imal
+        username_or_email: Isem n useqdac neɣ imal
         whole_word: Awal akk
       featured_tag:
         name: Ahacṭag
@@ -84,7 +84,7 @@ kab:
       invite:
         comment: Awennit
       invite_request:
-        text: Acimi tebγiḍ ad ternuḍ iman-ik?
+        text: Acimi tebɣiḍ ad ternuḍ iman-ik?
       ip_block:
         comment: Awennit
         ip: IP
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index 3dd47312096656..460fd82dc08506 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -188,7 +188,7 @@ sq:
         create_user_role: Krijoni Rol
         demote_user: Zhgradoje Përdoruesin
         destroy_announcement: Fshije Lajmërimin
-        destroy_canonical_email_block: Fshi Bllokim El-esh
+        destroy_canonical_email_block: Fshi Bllokim Email-esh
         destroy_custom_emoji: Fshi Emotikon Vetjak
         destroy_domain_allow: Fshi Lejim Përkatësie
         destroy_domain_block: Fshi Bllokim Përkatësie
@@ -283,7 +283,7 @@ sq:
         unsuspend_account_html: "%{name} hoqi pezullimin për llogarinë e %{target}"
         update_announcement_html: "%{name} përditësoi lajmërimin %{target}"
         update_custom_emoji_html: "%{name} përditësoi emoxhin %{target}"
-        update_domain_block_html: "%{name} përditësoi bllokimin e përkatësish për %{target}"
+        update_domain_block_html: "%{name} përditësoi bllokim përkatësish për %{target}"
         update_ip_block_html: "%{name} ndryshoi rregull për IP-në %{target}"
         update_status_html: "%{name} përditësoi gjendjen me %{target}"
         update_user_role_html: "%{name} ndryshoi rolin për %{target}"
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 74fc1b26b72c94..b76f6992ad2c6c 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -452,7 +452,7 @@ th:
         title: นำเข้าการปิดกั้นโดเมน
       no_file: ไม่ได้เลือกไฟล์
     follow_recommendations:
-      description_html: "<strong>คำแนะนำการติดตามช่วยให้ผู้ใช้ใหม่ค้นหาเนื้อหาที่น่าสนใจได้อย่างรวดเร็ว</strong> เมื่อผู้ใช้ไม่ได้โต้ตอบกับผู้อื่นมากพอที่จะสร้างคำแนะนำการติดตามส่วนบุคคล จะแนะนำบัญชีเหล่านี้แทน จะคำนวณคำแนะนำใหม่เป็นประจำทุกวันจากบัญชีต่าง ๆ ที่มีการมีส่วนร่วมล่าสุดสูงสุดและจำนวนผู้ติดตามในเซิร์ฟเวอร์สูงสุดสำหรับภาษาที่กำหนด"
+      description_html: "<strong>คำแนะนำการติดตามช่วยให้ผู้ใช้ใหม่ค้นหาเนื้อหาที่น่าสนใจได้อย่างรวดเร็ว</strong> เมื่อผู้ใช้ไม่ได้โต้ตอบกับผู้อื่นมากพอที่จะสร้างคำแนะนำการติดตามเฉพาะบุคคล จะแนะนำบัญชีเหล่านี้แทน จะคำนวณคำแนะนำใหม่เป็นประจำทุกวันจากบัญชีต่าง ๆ ที่มีการมีส่วนร่วมล่าสุดสูงสุดและจำนวนผู้ติดตามในเซิร์ฟเวอร์สูงสุดสำหรับภาษาที่กำหนด"
       language: สำหรับภาษา
       status: สถานะ
       suppress: ระงับคำแนะนำการติดตาม

From 4b7f04e3eab274e574289a554f004c4a58e7ef9b Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 16 Feb 2024 02:52:29 -0500
Subject: [PATCH 0124/2191] Reduce `RSpec/MultipleExpectations` in
 post_status_service spec (#29225)

---
 spec/services/post_status_service_spec.rb | 28 +++++++++++------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/spec/services/post_status_service_spec.rb b/spec/services/post_status_service_spec.rb
index d10a82607e009b..acbebc5056b794 100644
--- a/spec/services/post_status_service_spec.rb
+++ b/spec/services/post_status_service_spec.rb
@@ -32,27 +32,27 @@
     let!(:future)          { Time.now.utc + 2.hours }
     let!(:previous_status) { Fabricate(:status, account: account) }
 
-    it 'schedules a status' do
-      status = subject.call(account, text: 'Hi future!', scheduled_at: future)
-      expect(status).to be_a ScheduledStatus
-      expect(status.scheduled_at).to eq future
-      expect(status.params['text']).to eq 'Hi future!'
-    end
-
-    it 'does not immediately create a status' do
+    it 'schedules a status for future creation and does not create one immediately' do
       media = Fabricate(:media_attachment, account: account)
       status = subject.call(account, text: 'Hi future!', media_ids: [media.id], scheduled_at: future)
 
-      expect(status).to be_a ScheduledStatus
-      expect(status.scheduled_at).to eq future
-      expect(status.params['text']).to eq 'Hi future!'
-      expect(status.params['media_ids']).to eq [media.id]
+      expect(status)
+        .to be_a(ScheduledStatus)
+        .and have_attributes(
+          scheduled_at: eq(future),
+          params: include(
+            'text' => eq('Hi future!'),
+            'media_ids' => contain_exactly(media.id)
+          )
+        )
       expect(media.reload.status).to be_nil
       expect(Status.where(text: 'Hi future!')).to_not exist
     end
 
-    it 'does not change statuses count' do
-      expect { subject.call(account, text: 'Hi future!', scheduled_at: future, thread: previous_status) }.to_not(change { [account.statuses_count, previous_status.replies_count] })
+    it 'does not change statuses_count of account or replies_count of thread previous status' do
+      expect { subject.call(account, text: 'Hi future!', scheduled_at: future, thread: previous_status) }
+        .to not_change { account.statuses_count }
+        .and(not_change { previous_status.replies_count })
     end
   end
 

From a9f9b0097bc18b87c7fe6636a74ea135bab61dc0 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 16 Feb 2024 02:52:57 -0500
Subject: [PATCH 0125/2191] Reduce `RSpec/MultipleExpectations` in captcha
 feature spec (#29226)

---
 spec/features/captcha_spec.rb | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/spec/features/captcha_spec.rb b/spec/features/captcha_spec.rb
index 15c37eb463aebb..06c823adf258eb 100644
--- a/spec/features/captcha_spec.rb
+++ b/spec/features/captcha_spec.rb
@@ -19,12 +19,10 @@
       # It presents the user with a captcha form
       expect(page).to have_title(I18n.t('auth.captcha_confirmation.title'))
 
-      # It does not confirm the user just yet
-      expect(user.reload.confirmed?).to be false
-
       # It redirects to app and confirms user
-      click_on I18n.t('challenge.confirm')
-      expect(user.reload.confirmed?).to be true
+      expect { click_on I18n.t('challenge.confirm') }
+        .to change { user.reload.confirmed? }.from(false).to(true)
+
       expect(page).to have_current_path(/\A#{client_app.confirmation_redirect_uri}/, url: true)
 
       # Browsers will generally reload the original page upon redirection
@@ -32,8 +30,9 @@
       visit "/auth/confirmation?confirmation_token=#{user.confirmation_token}&redirect_to_app=true"
 
       # It presents a page with a link to the app callback
-      expect(page).to have_content(I18n.t('auth.confirmations.registration_complete', domain: 'cb6e6126.ngrok.io'))
-      expect(page).to have_link(I18n.t('auth.confirmations.clicking_this_link'), href: client_app.confirmation_redirect_uri)
+      expect(page)
+        .to have_content(I18n.t('auth.confirmations.registration_complete', domain: 'cb6e6126.ngrok.io'))
+        .and have_link(I18n.t('auth.confirmations.clicking_this_link'), href: client_app.confirmation_redirect_uri)
     end
   end
 

From a8ee6fdd62a85cc8ad20007783000682110a8f0d Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 16 Feb 2024 09:12:10 +0100
Subject: [PATCH 0126/2191] Update dependency pg to v1.5.5 (#29230)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 00ca4663a848ca..0b53df82e064de 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -505,7 +505,7 @@ GEM
     parslet (2.0.0)
     pastel (0.8.0)
       tty-color (~> 0.5)
-    pg (1.5.4)
+    pg (1.5.5)
     pghero (3.4.1)
       activerecord (>= 6)
     posix-spawn (0.3.15)

From 9fee5e852669e26f970e278021302e1a203fc022 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 16 Feb 2024 11:56:12 +0100
Subject: [PATCH 0127/2191] Merge pull request from GHSA-jhrq-qvrm-qr36

* Fix insufficient Content-Type checking of fetched ActivityStreams objects

* Allow JSON-LD documents with multiple profiles
---
 app/helpers/jsonld_helper.rb                   | 14 +++++++++++++-
 app/services/fetch_resource_service.rb         |  2 +-
 spec/helpers/json_ld_helper_spec.rb            | 14 +++++++-------
 spec/lib/activitypub/activity/announce_spec.rb |  4 ++--
 .../fetch_featured_collection_service_spec.rb  | 18 +++++++++---------
 ...ch_featured_tags_collection_service_spec.rb |  8 ++++----
 .../fetch_remote_account_service_spec.rb       | 10 +++++-----
 .../fetch_remote_actor_service_spec.rb         | 10 +++++-----
 .../fetch_remote_key_service_spec.rb           |  8 ++++----
 .../activitypub/fetch_replies_service_spec.rb  |  6 +++---
 .../synchronize_followers_service_spec.rb      |  6 +++---
 .../activitypub/fetch_replies_worker_spec.rb   |  2 +-
 12 files changed, 57 insertions(+), 45 deletions(-)

diff --git a/app/helpers/jsonld_helper.rb b/app/helpers/jsonld_helper.rb
index cc05b7a403483e..b0f2077db0e501 100644
--- a/app/helpers/jsonld_helper.rb
+++ b/app/helpers/jsonld_helper.rb
@@ -174,7 +174,19 @@ def fetch_resource_without_id_validation(uri, on_behalf_of = nil, raise_on_tempo
     build_request(uri, on_behalf_of, options: request_options).perform do |response|
       raise Mastodon::UnexpectedResponseError, response unless response_successful?(response) || response_error_unsalvageable?(response) || !raise_on_temporary_error
 
-      body_to_json(response.body_with_limit) if response.code == 200
+      body_to_json(response.body_with_limit) if response.code == 200 && valid_activitypub_content_type?(response)
+    end
+  end
+
+  def valid_activitypub_content_type?(response)
+    return true if response.mime_type == 'application/activity+json'
+
+    # When the mime type is `application/ld+json`, we need to check the profile,
+    # but `http.rb` does not parse it for us.
+    return false unless response.mime_type == 'application/ld+json'
+
+    response.headers[HTTP::Headers::CONTENT_TYPE]&.split(';')&.map(&:strip)&.any? do |str|
+      str.start_with?('profile="') && str[9...-1].split.include?('https://www.w3.org/ns/activitystreams')
     end
   end
 
diff --git a/app/services/fetch_resource_service.rb b/app/services/fetch_resource_service.rb
index 71c6cca790c6ee..84c36f6a1014b8 100644
--- a/app/services/fetch_resource_service.rb
+++ b/app/services/fetch_resource_service.rb
@@ -44,7 +44,7 @@ def process_response(response, terminal = false)
     @response_code = response.code
     return nil if response.code != 200
 
-    if ['application/activity+json', 'application/ld+json'].include?(response.mime_type)
+    if valid_activitypub_content_type?(response)
       body = response.body_with_limit
       json = body_to_json(body)
 
diff --git a/spec/helpers/json_ld_helper_spec.rb b/spec/helpers/json_ld_helper_spec.rb
index 99857278a14c66..48550850274e01 100644
--- a/spec/helpers/json_ld_helper_spec.rb
+++ b/spec/helpers/json_ld_helper_spec.rb
@@ -56,15 +56,15 @@
   describe '#fetch_resource' do
     context 'when the second argument is false' do
       it 'returns resource even if the retrieved ID and the given URI does not match' do
-        stub_request(:get, 'https://bob.test/').to_return body: '{"id": "https://alice.test/"}'
-        stub_request(:get, 'https://alice.test/').to_return body: '{"id": "https://alice.test/"}'
+        stub_request(:get, 'https://bob.test/').to_return(body: '{"id": "https://alice.test/"}', headers: { 'Content-Type': 'application/activity+json' })
+        stub_request(:get, 'https://alice.test/').to_return(body: '{"id": "https://alice.test/"}', headers: { 'Content-Type': 'application/activity+json' })
 
         expect(fetch_resource('https://bob.test/', false)).to eq({ 'id' => 'https://alice.test/' })
       end
 
       it 'returns nil if the object identified by the given URI and the object identified by the retrieved ID does not match' do
-        stub_request(:get, 'https://mallory.test/').to_return body: '{"id": "https://marvin.test/"}'
-        stub_request(:get, 'https://marvin.test/').to_return body: '{"id": "https://alice.test/"}'
+        stub_request(:get, 'https://mallory.test/').to_return(body: '{"id": "https://marvin.test/"}', headers: { 'Content-Type': 'application/activity+json' })
+        stub_request(:get, 'https://marvin.test/').to_return(body: '{"id": "https://alice.test/"}', headers: { 'Content-Type': 'application/activity+json' })
 
         expect(fetch_resource('https://mallory.test/', false)).to be_nil
       end
@@ -72,7 +72,7 @@
 
     context 'when the second argument is true' do
       it 'returns nil if the retrieved ID and the given URI does not match' do
-        stub_request(:get, 'https://mallory.test/').to_return body: '{"id": "https://alice.test/"}'
+        stub_request(:get, 'https://mallory.test/').to_return(body: '{"id": "https://alice.test/"}', headers: { 'Content-Type': 'application/activity+json' })
         expect(fetch_resource('https://mallory.test/', true)).to be_nil
       end
     end
@@ -80,12 +80,12 @@
 
   describe '#fetch_resource_without_id_validation' do
     it 'returns nil if the status code is not 200' do
-      stub_request(:get, 'https://host.test/').to_return status: 400, body: '{}'
+      stub_request(:get, 'https://host.test/').to_return(status: 400, body: '{}', headers: { 'Content-Type': 'application/activity+json' })
       expect(fetch_resource_without_id_validation('https://host.test/')).to be_nil
     end
 
     it 'returns hash' do
-      stub_request(:get, 'https://host.test/').to_return status: 200, body: '{}'
+      stub_request(:get, 'https://host.test/').to_return(status: 200, body: '{}', headers: { 'Content-Type': 'application/activity+json' })
       expect(fetch_resource_without_id_validation('https://host.test/')).to eq({})
     end
   end
diff --git a/spec/lib/activitypub/activity/announce_spec.rb b/spec/lib/activitypub/activity/announce_spec.rb
index 8ad892975d13c5..b556bfd6c2ece3 100644
--- a/spec/lib/activitypub/activity/announce_spec.rb
+++ b/spec/lib/activitypub/activity/announce_spec.rb
@@ -35,7 +35,7 @@
     context 'when sender is followed by a local account' do
       before do
         Fabricate(:account).follow!(sender)
-        stub_request(:get, 'https://example.com/actor/hello-world').to_return(body: Oj.dump(unknown_object_json))
+        stub_request(:get, 'https://example.com/actor/hello-world').to_return(body: Oj.dump(unknown_object_json), headers: { 'Content-Type': 'application/activity+json' })
         subject.perform
       end
 
@@ -120,7 +120,7 @@
       let(:object_json) { 'https://example.com/actor/hello-world' }
 
       before do
-        stub_request(:get, 'https://example.com/actor/hello-world').to_return(body: Oj.dump(unknown_object_json))
+        stub_request(:get, 'https://example.com/actor/hello-world').to_return(body: Oj.dump(unknown_object_json), headers: { 'Content-Type': 'application/activity+json' })
       end
 
       context 'when the relay is enabled' do
diff --git a/spec/services/activitypub/fetch_featured_collection_service_spec.rb b/spec/services/activitypub/fetch_featured_collection_service_spec.rb
index b9e95b825f553c..dab204406bbb23 100644
--- a/spec/services/activitypub/fetch_featured_collection_service_spec.rb
+++ b/spec/services/activitypub/fetch_featured_collection_service_spec.rb
@@ -72,11 +72,11 @@
 
   shared_examples 'sets pinned posts' do
     before do
-      stub_request(:get, 'https://example.com/account/pinned/known').to_return(status: 200, body: Oj.dump(status_json_pinned_known))
-      stub_request(:get, 'https://example.com/account/pinned/unknown-inlined').to_return(status: 200, body: Oj.dump(status_json_pinned_unknown_inlined))
+      stub_request(:get, 'https://example.com/account/pinned/known').to_return(status: 200, body: Oj.dump(status_json_pinned_known), headers: { 'Content-Type': 'application/activity+json' })
+      stub_request(:get, 'https://example.com/account/pinned/unknown-inlined').to_return(status: 200, body: Oj.dump(status_json_pinned_unknown_inlined), headers: { 'Content-Type': 'application/activity+json' })
       stub_request(:get, 'https://example.com/account/pinned/unknown-unreachable').to_return(status: 404)
-      stub_request(:get, 'https://example.com/account/pinned/unknown-reachable').to_return(status: 200, body: Oj.dump(status_json_pinned_unknown_reachable))
-      stub_request(:get, 'https://example.com/account/collections/featured').to_return(status: 200, body: Oj.dump(featured_with_null))
+      stub_request(:get, 'https://example.com/account/pinned/unknown-reachable').to_return(status: 200, body: Oj.dump(status_json_pinned_unknown_reachable), headers: { 'Content-Type': 'application/activity+json' })
+      stub_request(:get, 'https://example.com/account/collections/featured').to_return(status: 200, body: Oj.dump(featured_with_null), headers: { 'Content-Type': 'application/activity+json' })
 
       subject.call(actor, note: true, hashtag: false)
     end
@@ -94,7 +94,7 @@
   describe '#call' do
     context 'when the endpoint is a Collection' do
       before do
-        stub_request(:get, actor.featured_collection_url).to_return(status: 200, body: Oj.dump(payload))
+        stub_request(:get, actor.featured_collection_url).to_return(status: 200, body: Oj.dump(payload), headers: { 'Content-Type': 'application/activity+json' })
       end
 
       it_behaves_like 'sets pinned posts'
@@ -111,7 +111,7 @@
       end
 
       before do
-        stub_request(:get, actor.featured_collection_url).to_return(status: 200, body: Oj.dump(payload))
+        stub_request(:get, actor.featured_collection_url).to_return(status: 200, body: Oj.dump(payload), headers: { 'Content-Type': 'application/activity+json' })
       end
 
       it_behaves_like 'sets pinned posts'
@@ -120,7 +120,7 @@
         let(:items) { 'https://example.com/account/pinned/unknown-reachable' }
 
         before do
-          stub_request(:get, 'https://example.com/account/pinned/unknown-reachable').to_return(status: 200, body: Oj.dump(status_json_pinned_unknown_reachable))
+          stub_request(:get, 'https://example.com/account/pinned/unknown-reachable').to_return(status: 200, body: Oj.dump(status_json_pinned_unknown_reachable), headers: { 'Content-Type': 'application/activity+json' })
           subject.call(actor, note: true, hashtag: false)
         end
 
@@ -147,7 +147,7 @@
       end
 
       before do
-        stub_request(:get, actor.featured_collection_url).to_return(status: 200, body: Oj.dump(payload))
+        stub_request(:get, actor.featured_collection_url).to_return(status: 200, body: Oj.dump(payload), headers: { 'Content-Type': 'application/activity+json' })
       end
 
       it_behaves_like 'sets pinned posts'
@@ -156,7 +156,7 @@
         let(:items) { 'https://example.com/account/pinned/unknown-reachable' }
 
         before do
-          stub_request(:get, 'https://example.com/account/pinned/unknown-reachable').to_return(status: 200, body: Oj.dump(status_json_pinned_unknown_reachable))
+          stub_request(:get, 'https://example.com/account/pinned/unknown-reachable').to_return(status: 200, body: Oj.dump(status_json_pinned_unknown_reachable), headers: { 'Content-Type': 'application/activity+json' })
           subject.call(actor, note: true, hashtag: false)
         end
 
diff --git a/spec/services/activitypub/fetch_featured_tags_collection_service_spec.rb b/spec/services/activitypub/fetch_featured_tags_collection_service_spec.rb
index 071e4d92d59865..638278a10e5375 100644
--- a/spec/services/activitypub/fetch_featured_tags_collection_service_spec.rb
+++ b/spec/services/activitypub/fetch_featured_tags_collection_service_spec.rb
@@ -38,7 +38,7 @@
   describe '#call' do
     context 'when the endpoint is a Collection' do
       before do
-        stub_request(:get, collection_url).to_return(status: 200, body: Oj.dump(payload))
+        stub_request(:get, collection_url).to_return(status: 200, body: Oj.dump(payload), headers: { 'Content-Type': 'application/activity+json' })
       end
 
       it_behaves_like 'sets featured tags'
@@ -46,7 +46,7 @@
 
     context 'when the account already has featured tags' do
       before do
-        stub_request(:get, collection_url).to_return(status: 200, body: Oj.dump(payload))
+        stub_request(:get, collection_url).to_return(status: 200, body: Oj.dump(payload), headers: { 'Content-Type': 'application/activity+json' })
 
         actor.featured_tags.create!(name: 'FoO')
         actor.featured_tags.create!(name: 'baz')
@@ -67,7 +67,7 @@
       end
 
       before do
-        stub_request(:get, collection_url).to_return(status: 200, body: Oj.dump(payload))
+        stub_request(:get, collection_url).to_return(status: 200, body: Oj.dump(payload), headers: { 'Content-Type': 'application/activity+json' })
       end
 
       it_behaves_like 'sets featured tags'
@@ -88,7 +88,7 @@
       end
 
       before do
-        stub_request(:get, collection_url).to_return(status: 200, body: Oj.dump(payload))
+        stub_request(:get, collection_url).to_return(status: 200, body: Oj.dump(payload), headers: { 'Content-Type': 'application/activity+json' })
       end
 
       it_behaves_like 'sets featured tags'
diff --git a/spec/services/activitypub/fetch_remote_account_service_spec.rb b/spec/services/activitypub/fetch_remote_account_service_spec.rb
index e7f6bb8dd83401..799a70d0916d3f 100644
--- a/spec/services/activitypub/fetch_remote_account_service_spec.rb
+++ b/spec/services/activitypub/fetch_remote_account_service_spec.rb
@@ -38,7 +38,7 @@
       before do
         actor[:inbox] = nil
 
-        stub_request(:get, 'https://example.com/alice').to_return(body: Oj.dump(actor))
+        stub_request(:get, 'https://example.com/alice').to_return(body: Oj.dump(actor), headers: { 'Content-Type': 'application/activity+json' })
         stub_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com').to_return(body: Oj.dump(webfinger), headers: { 'Content-Type': 'application/jrd+json' })
       end
 
@@ -54,7 +54,7 @@
       let!(:webfinger) { { subject: 'acct:alice@example.com', links: [{ rel: 'self', href: 'https://example.com/alice' }] } }
 
       before do
-        stub_request(:get, 'https://example.com/alice').to_return(body: Oj.dump(actor))
+        stub_request(:get, 'https://example.com/alice').to_return(body: Oj.dump(actor), headers: { 'Content-Type': 'application/activity+json' })
         stub_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com').to_return(body: Oj.dump(webfinger), headers: { 'Content-Type': 'application/jrd+json' })
       end
 
@@ -75,7 +75,7 @@
       let!(:webfinger) { { subject: 'acct:alice@iscool.af', links: [{ rel: 'self', href: 'https://example.com/alice' }] } }
 
       before do
-        stub_request(:get, 'https://example.com/alice').to_return(body: Oj.dump(actor))
+        stub_request(:get, 'https://example.com/alice').to_return(body: Oj.dump(actor), headers: { 'Content-Type': 'application/activity+json' })
         stub_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com').to_return(body: Oj.dump(webfinger), headers: { 'Content-Type': 'application/jrd+json' })
         stub_request(:get, 'https://iscool.af/.well-known/webfinger?resource=acct:alice@iscool.af').to_return(body: Oj.dump(webfinger), headers: { 'Content-Type': 'application/jrd+json' })
       end
@@ -98,7 +98,7 @@
       let!(:webfinger) { { subject: 'acct:alice@example.com', links: [{ rel: 'self', href: 'https://example.com/bob' }] } }
 
       before do
-        stub_request(:get, 'https://example.com/alice').to_return(body: Oj.dump(actor))
+        stub_request(:get, 'https://example.com/alice').to_return(body: Oj.dump(actor), headers: { 'Content-Type': 'application/activity+json' })
         stub_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com').to_return(body: Oj.dump(webfinger), headers: { 'Content-Type': 'application/jrd+json' })
       end
 
@@ -114,7 +114,7 @@
       let!(:webfinger) { { subject: 'acct:alice@iscool.af', links: [{ rel: 'self', href: 'https://example.com/bob' }] } }
 
       before do
-        stub_request(:get, 'https://example.com/alice').to_return(body: Oj.dump(actor))
+        stub_request(:get, 'https://example.com/alice').to_return(body: Oj.dump(actor), headers: { 'Content-Type': 'application/activity+json' })
         stub_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com').to_return(body: Oj.dump(webfinger), headers: { 'Content-Type': 'application/jrd+json' })
         stub_request(:get, 'https://iscool.af/.well-known/webfinger?resource=acct:alice@iscool.af').to_return(body: Oj.dump(webfinger), headers: { 'Content-Type': 'application/jrd+json' })
       end
diff --git a/spec/services/activitypub/fetch_remote_actor_service_spec.rb b/spec/services/activitypub/fetch_remote_actor_service_spec.rb
index e622c7d4c30d84..4ce42ea5609f0c 100644
--- a/spec/services/activitypub/fetch_remote_actor_service_spec.rb
+++ b/spec/services/activitypub/fetch_remote_actor_service_spec.rb
@@ -38,7 +38,7 @@
       before do
         actor[:inbox] = nil
 
-        stub_request(:get, 'https://example.com/alice').to_return(body: Oj.dump(actor))
+        stub_request(:get, 'https://example.com/alice').to_return(body: Oj.dump(actor), headers: { 'Content-Type': 'application/activity+json' })
         stub_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com').to_return(body: Oj.dump(webfinger), headers: { 'Content-Type': 'application/jrd+json' })
       end
 
@@ -54,7 +54,7 @@
       let!(:webfinger) { { subject: 'acct:alice@example.com', links: [{ rel: 'self', href: 'https://example.com/alice' }] } }
 
       before do
-        stub_request(:get, 'https://example.com/alice').to_return(body: Oj.dump(actor))
+        stub_request(:get, 'https://example.com/alice').to_return(body: Oj.dump(actor), headers: { 'Content-Type': 'application/activity+json' })
         stub_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com').to_return(body: Oj.dump(webfinger), headers: { 'Content-Type': 'application/jrd+json' })
       end
 
@@ -75,7 +75,7 @@
       let!(:webfinger) { { subject: 'acct:alice@iscool.af', links: [{ rel: 'self', href: 'https://example.com/alice' }] } }
 
       before do
-        stub_request(:get, 'https://example.com/alice').to_return(body: Oj.dump(actor))
+        stub_request(:get, 'https://example.com/alice').to_return(body: Oj.dump(actor), headers: { 'Content-Type': 'application/activity+json' })
         stub_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com').to_return(body: Oj.dump(webfinger), headers: { 'Content-Type': 'application/jrd+json' })
         stub_request(:get, 'https://iscool.af/.well-known/webfinger?resource=acct:alice@iscool.af').to_return(body: Oj.dump(webfinger), headers: { 'Content-Type': 'application/jrd+json' })
       end
@@ -98,7 +98,7 @@
       let!(:webfinger) { { subject: 'acct:alice@example.com', links: [{ rel: 'self', href: 'https://example.com/bob' }] } }
 
       before do
-        stub_request(:get, 'https://example.com/alice').to_return(body: Oj.dump(actor))
+        stub_request(:get, 'https://example.com/alice').to_return(body: Oj.dump(actor), headers: { 'Content-Type': 'application/activity+json' })
         stub_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com').to_return(body: Oj.dump(webfinger), headers: { 'Content-Type': 'application/jrd+json' })
       end
 
@@ -114,7 +114,7 @@
       let!(:webfinger) { { subject: 'acct:alice@iscool.af', links: [{ rel: 'self', href: 'https://example.com/bob' }] } }
 
       before do
-        stub_request(:get, 'https://example.com/alice').to_return(body: Oj.dump(actor))
+        stub_request(:get, 'https://example.com/alice').to_return(body: Oj.dump(actor), headers: { 'Content-Type': 'application/activity+json' })
         stub_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com').to_return(body: Oj.dump(webfinger), headers: { 'Content-Type': 'application/jrd+json' })
         stub_request(:get, 'https://iscool.af/.well-known/webfinger?resource=acct:alice@iscool.af').to_return(body: Oj.dump(webfinger), headers: { 'Content-Type': 'application/jrd+json' })
       end
diff --git a/spec/services/activitypub/fetch_remote_key_service_spec.rb b/spec/services/activitypub/fetch_remote_key_service_spec.rb
index 0b14da4f446e5f..478778cc9f5762 100644
--- a/spec/services/activitypub/fetch_remote_key_service_spec.rb
+++ b/spec/services/activitypub/fetch_remote_key_service_spec.rb
@@ -50,7 +50,7 @@
   end
 
   before do
-    stub_request(:get, 'https://example.com/alice').to_return(body: Oj.dump(actor))
+    stub_request(:get, 'https://example.com/alice').to_return(body: Oj.dump(actor), headers: { 'Content-Type': 'application/activity+json' })
     stub_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com').to_return(body: Oj.dump(webfinger), headers: { 'Content-Type': 'application/jrd+json' })
   end
 
@@ -59,7 +59,7 @@
 
     context 'when the key is a sub-object from the actor' do
       before do
-        stub_request(:get, public_key_id).to_return(body: Oj.dump(actor))
+        stub_request(:get, public_key_id).to_return(body: Oj.dump(actor), headers: { 'Content-Type': 'application/activity+json' })
       end
 
       it 'returns the expected account' do
@@ -71,7 +71,7 @@
       let(:public_key_id) { 'https://example.com/alice-public-key.json' }
 
       before do
-        stub_request(:get, public_key_id).to_return(body: Oj.dump(key_json.merge({ '@context': ['https://www.w3.org/ns/activitystreams', 'https://w3id.org/security/v1'] })))
+        stub_request(:get, public_key_id).to_return(body: Oj.dump(key_json.merge({ '@context': ['https://www.w3.org/ns/activitystreams', 'https://w3id.org/security/v1'] })), headers: { 'Content-Type': 'application/activity+json' })
       end
 
       it 'returns the expected account' do
@@ -84,7 +84,7 @@
       let(:actor_public_key) { 'https://example.com/alice-public-key.json' }
 
       before do
-        stub_request(:get, public_key_id).to_return(body: Oj.dump(key_json.merge({ '@context': ['https://www.w3.org/ns/activitystreams', 'https://w3id.org/security/v1'] })))
+        stub_request(:get, public_key_id).to_return(body: Oj.dump(key_json.merge({ '@context': ['https://www.w3.org/ns/activitystreams', 'https://w3id.org/security/v1'] })), headers: { 'Content-Type': 'application/activity+json' })
       end
 
       it 'returns the nil' do
diff --git a/spec/services/activitypub/fetch_replies_service_spec.rb b/spec/services/activitypub/fetch_replies_service_spec.rb
index a76b996c20fcd6..8e1f606e26e794 100644
--- a/spec/services/activitypub/fetch_replies_service_spec.rb
+++ b/spec/services/activitypub/fetch_replies_service_spec.rb
@@ -58,7 +58,7 @@
 
       context 'when passing the URL to the collection' do
         before do
-          stub_request(:get, collection_uri).to_return(status: 200, body: Oj.dump(payload))
+          stub_request(:get, collection_uri).to_return(status: 200, body: Oj.dump(payload), headers: { 'Content-Type': 'application/activity+json' })
         end
 
         it 'spawns workers for up to 5 replies on the same server' do
@@ -93,7 +93,7 @@
 
       context 'when passing the URL to the collection' do
         before do
-          stub_request(:get, collection_uri).to_return(status: 200, body: Oj.dump(payload))
+          stub_request(:get, collection_uri).to_return(status: 200, body: Oj.dump(payload), headers: { 'Content-Type': 'application/activity+json' })
         end
 
         it 'spawns workers for up to 5 replies on the same server' do
@@ -132,7 +132,7 @@
 
       context 'when passing the URL to the collection' do
         before do
-          stub_request(:get, collection_uri).to_return(status: 200, body: Oj.dump(payload))
+          stub_request(:get, collection_uri).to_return(status: 200, body: Oj.dump(payload), headers: { 'Content-Type': 'application/activity+json' })
         end
 
         it 'spawns workers for up to 5 replies on the same server' do
diff --git a/spec/services/activitypub/synchronize_followers_service_spec.rb b/spec/services/activitypub/synchronize_followers_service_spec.rb
index c9a513e24b7c3b..f62376ab95b24e 100644
--- a/spec/services/activitypub/synchronize_followers_service_spec.rb
+++ b/spec/services/activitypub/synchronize_followers_service_spec.rb
@@ -60,7 +60,7 @@
   describe '#call' do
     context 'when the endpoint is a Collection of actor URIs' do
       before do
-        stub_request(:get, collection_uri).to_return(status: 200, body: Oj.dump(payload))
+        stub_request(:get, collection_uri).to_return(status: 200, body: Oj.dump(payload), headers: { 'Content-Type': 'application/activity+json' })
       end
 
       it_behaves_like 'synchronizes followers'
@@ -77,7 +77,7 @@
       end
 
       before do
-        stub_request(:get, collection_uri).to_return(status: 200, body: Oj.dump(payload))
+        stub_request(:get, collection_uri).to_return(status: 200, body: Oj.dump(payload), headers: { 'Content-Type': 'application/activity+json' })
       end
 
       it_behaves_like 'synchronizes followers'
@@ -98,7 +98,7 @@
       end
 
       before do
-        stub_request(:get, collection_uri).to_return(status: 200, body: Oj.dump(payload))
+        stub_request(:get, collection_uri).to_return(status: 200, body: Oj.dump(payload), headers: { 'Content-Type': 'application/activity+json' })
       end
 
       it_behaves_like 'synchronizes followers'
diff --git a/spec/workers/activitypub/fetch_replies_worker_spec.rb b/spec/workers/activitypub/fetch_replies_worker_spec.rb
index ff4d049a269ed9..2d080e286ecc98 100644
--- a/spec/workers/activitypub/fetch_replies_worker_spec.rb
+++ b/spec/workers/activitypub/fetch_replies_worker_spec.rb
@@ -21,7 +21,7 @@
 
   describe 'perform' do
     it 'performs a request if the collection URI is from the same host' do
-      stub_request(:get, 'https://example.com/statuses_replies/1').to_return(status: 200, body: json)
+      stub_request(:get, 'https://example.com/statuses_replies/1').to_return(status: 200, body: json, headers: { 'Content-Type': 'application/activity+json' })
       subject.perform(status.id, 'https://example.com/statuses_replies/1')
       expect(a_request(:get, 'https://example.com/statuses_replies/1')).to have_been_made.once
     end

From 5f21a1f5a3492a212a25235086e620799d47f1c9 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 16 Feb 2024 12:06:47 +0100
Subject: [PATCH 0128/2191] Bump version to v4.3.0-alpha.3 (#29241)

---
 CHANGELOG.md            | 95 +++++++++++++++++++++++++++++++++++++++++
 docker-compose.yml      |  6 +--
 lib/mastodon/version.rb |  2 +-
 3 files changed, 99 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6f775fcfa8cc5e..a53790afafb8d1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,101 @@
 
 All notable changes to this project will be documented in this file.
 
+## [4.2.7] - 2024-02-16
+
+### Fixed
+
+- Fix OmniAuth tests and edge cases in error handling ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/29201), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/29207))
+- Fix new installs by upgrading to the latest release of the `nsa` gem, instead of a no longer existing commit ([mjankowski](https://github.com/mastodon/mastodon/pull/29065))
+
+### Security
+
+- Fix insufficient checking of remote posts ([GHSA-jhrq-qvrm-qr36](https://github.com/mastodon/mastodon/security/advisories/GHSA-jhrq-qvrm-qr36))
+
+## [4.2.6] - 2024-02-14
+
+### Security
+
+- Update the `sidekiq-unique-jobs` dependency (see [GHSA-cmh9-rx85-xj38](https://github.com/mhenrixon/sidekiq-unique-jobs/security/advisories/GHSA-cmh9-rx85-xj38))
+  In addition, we have disabled the web interface for `sidekiq-unique-jobs` out of caution.
+  If you need it, you can re-enable it by setting `ENABLE_SIDEKIQ_UNIQUE_JOBS_UI=true`.
+  If you only need to clear all locks, you can now use `bundle exec rake sidekiq_unique_jobs:delete_all_locks`.
+- Update the `nokogiri` dependency (see [GHSA-xc9x-jj77-9p9j](https://github.com/sparklemotion/nokogiri/security/advisories/GHSA-xc9x-jj77-9p9j))
+- Disable administrative Doorkeeper routes ([ThisIsMissEm](https://github.com/mastodon/mastodon/pull/29187))
+- Fix ongoing streaming sessions not being invalidated when applications get deleted in some cases ([GHSA-7w3c-p9j8-mq3x](https://github.com/mastodon/mastodon/security/advisories/GHSA-7w3c-p9j8-mq3x))
+  In some rare cases, the streaming server was not notified of access tokens revocation on application deletion.
+- Change external authentication behavior to never reattach a new identity to an existing user by default ([GHSA-vm39-j3vx-pch3](https://github.com/mastodon/mastodon/security/advisories/GHSA-vm39-j3vx-pch3))
+  Up until now, Mastodon has allowed new identities from external authentication providers to attach to an existing local user based on their verified e-mail address.
+  This allowed upgrading users from a database-stored password to an external authentication provider, or move from one authentication provider to another.
+  However, this behavior may be unexpected, and means that when multiple authentication providers are configured, the overall security would be that of the least secure authentication provider.
+  For these reasons, this behavior is now locked under the `ALLOW_UNSAFE_AUTH_PROVIDER_REATTACH` environment variable.
+  In addition, regardless of this environment variable, Mastodon will refuse to attach two identities from the same authentication provider to the same account.
+
+## [4.2.5] - 2024-02-01
+
+### Security
+
+- Fix insufficient origin validation (CVE-2024-23832, [GHSA-3fjr-858r-92rw](https://github.com/mastodon/mastodon/security/advisories/GHSA-3fjr-858r-92rw))
+
+## [4.2.4] - 2024-01-24
+
+### Fixed
+
+- Fix error when processing remote files with unusually long names ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/28823))
+- Fix processing of compacted single-item JSON-LD collections ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/28816))
+- Retry 401 errors on replies fetching ([ShadowJonathan](https://github.com/mastodon/mastodon/pull/28788))
+- Fix `RecordNotUnique` errors in LinkCrawlWorker ([tribela](https://github.com/mastodon/mastodon/pull/28748))
+- Fix Mastodon not correctly processing HTTP Signatures with query strings ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/28443), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/28476))
+- Fix potential redirection loop of streaming endpoint ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/28665))
+- Fix streaming API redirection ignoring the port of `streaming_api_base_url` ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/28558))
+- Fix error when processing link preview with an array as `inLanguage` ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/28252))
+- Fix unsupported time zone or locale preventing sign-up ([Gargron](https://github.com/mastodon/mastodon/pull/28035))
+- Fix "Hide these posts from home" list setting not refreshing when switching lists ([brianholley](https://github.com/mastodon/mastodon/pull/27763))
+- Fix missing background behind dismissable banner in web UI ([Gargron](https://github.com/mastodon/mastodon/pull/27479))
+- Fix line wrapping of language selection button with long locale codes ([gunchleoc](https://github.com/mastodon/mastodon/pull/27100), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/27127))
+- Fix `Undo Announce` activity not being sent to non-follower authors ([MitarashiDango](https://github.com/mastodon/mastodon/pull/18482))
+- Fix N+1s because of association preloaders not actually getting called ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/28339))
+- Fix empty column explainer getting cropped under certain conditions ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/28337))
+- Fix `LinkCrawlWorker` error when encountering empty OEmbed response ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/28268))
+- Fix call to inefficient `delete_matched` cache method in domain blocks ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/28367))
+
+### Security
+
+- Add rate-limit of TOTP authentication attempts at controller level ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/28801))
+
+## [4.2.3] - 2023-12-05
+
+### Fixed
+
+- Fix dependency on `json-canonicalization` version that has been made unavailable since last release
+
+## [4.2.2] - 2023-12-04
+
+### Changed
+
+- Change dismissed banners to be stored server-side ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/27055))
+- Change GIF max matrix size error to explicitly mention GIF files ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/27927))
+- Change `Follow` activities delivery to bypass availability check ([ShadowJonathan](https://github.com/mastodon/mastodon/pull/27586))
+- Change single-column navigation notice to be displayed outside of the logo container ([renchap](https://github.com/mastodon/mastodon/pull/27462), [renchap](https://github.com/mastodon/mastodon/pull/27476))
+- Change Content-Security-Policy to be tighter on media paths ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/26889))
+- Change post language code to include country code when relevant ([gunchleoc](https://github.com/mastodon/mastodon/pull/27099), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/27207))
+
+### Fixed
+
+- Fix upper border radius of onboarding columns ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/27890))
+- Fix incoming status creation date not being restricted to standard ISO8601 ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/27655), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/28081))
+- Fix some posts from threads received out-of-order sometimes not being inserted into timelines ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/27653))
+- Fix posts from force-sensitized accounts being able to trend ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/27620))
+- Fix error when trying to delete already-deleted file with OpenStack Swift ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/27569))
+- Fix batch attachment deletion when using OpenStack Swift ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/27554))
+- Fix processing LDSigned activities from actors with unknown public keys ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/27474))
+- Fix error and incorrect URLs in `/api/v1/accounts/:id/featured_tags` for remote accounts ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/27459))
+- Fix report processing notice not mentioning the report number when performing a custom action ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/27442))
+- Fix handling of `inLanguage` attribute in preview card processing ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/27423))
+- Fix own posts being removed from home timeline when unfollowing a used hashtag ([kmycode](https://github.com/mastodon/mastodon/pull/27391))
+- Fix some link anchors being recognized as hashtags ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/27271), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/27584))
+- Fix format-dependent redirects being cached regardless of requested format ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/27634))
+
 ## [4.2.1] - 2023-10-10
 
 ### Added
diff --git a/docker-compose.yml b/docker-compose.yml
index 93451d9611036a..154754d45f61bd 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -56,7 +56,7 @@ services:
 
   web:
     build: .
-    image: ghcr.io/mastodon/mastodon:v4.2.0
+    image: ghcr.io/mastodon/mastodon:v4.2.7
     restart: always
     env_file: .env.production
     command: bundle exec puma -C config/puma.rb
@@ -77,7 +77,7 @@ services:
 
   streaming:
     build: .
-    image: ghcr.io/mastodon/mastodon:v4.2.0
+    image: ghcr.io/mastodon/mastodon:v4.2.7
     restart: always
     env_file: .env.production
     command: node ./streaming
@@ -95,7 +95,7 @@ services:
 
   sidekiq:
     build: .
-    image: ghcr.io/mastodon/mastodon:v4.2.0
+    image: ghcr.io/mastodon/mastodon:v4.2.7
     restart: always
     env_file: .env.production
     command: bundle exec sidekiq
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index c2f26aee63551e..1135ba0a174ebb 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -17,7 +17,7 @@ def patch
     end
 
     def default_prerelease
-      'alpha.2'
+      'alpha.3'
     end
 
     def prerelease

From e140d05a6a6d679153fe02ac38588aaa4656e464 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 16 Feb 2024 13:59:51 +0100
Subject: [PATCH 0129/2191] Update dependency doorkeeper to v5.6.9 (#29196)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 0b53df82e064de..79d3b1e637d90c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -219,7 +219,7 @@ GEM
     docile (1.4.0)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    doorkeeper (5.6.8)
+    doorkeeper (5.6.9)
       railties (>= 5)
     dotenv (2.8.1)
     dotenv-rails (2.8.1)
@@ -811,7 +811,7 @@ GEM
     xorcist (1.1.3)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.12)
+    zeitwerk (2.6.13)
 
 PLATFORMS
   ruby

From bba488c189084d8499173c3e65dcce8e40a5606a Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 16 Feb 2024 08:00:09 -0500
Subject: [PATCH 0130/2191] Reduce `RSpec/MultipleExpectations` in
 media_attachment spec (#29228)

---
 spec/models/media_attachment_spec.rb | 51 ++++++++++++++--------------
 1 file changed, 26 insertions(+), 25 deletions(-)

diff --git a/spec/models/media_attachment_spec.rb b/spec/models/media_attachment_spec.rb
index 89916f9f500eee..1b9a13c38c2d62 100644
--- a/spec/models/media_attachment_spec.rb
+++ b/spec/models/media_attachment_spec.rb
@@ -91,20 +91,15 @@
     end
 
     it 'saves media attachment with correct file metadata' do
-      expect(media.persisted?).to be true
-      expect(media.file).to_not be_nil
-
-      # completes processing
-      expect(media.processing_complete?).to be true
-
-      # sets type
-      expect(media.type).to eq 'image'
-
-      # sets content type
-      expect(media.file_content_type).to eq content_type
-
-      # sets file extension
-      expect(media.file_file_name).to end_with extension
+      expect(media)
+        .to be_persisted
+        .and be_processing_complete
+        .and have_attributes(
+          file: be_present,
+          type: eq('image'),
+          file_content_type: eq(content_type),
+          file_file_name: end_with(extension)
+        )
 
       # Rack::Mime (used by PublicFileServerMiddleware) recognizes file extension
       expect(Rack::Mime.mime_type(extension, nil)).to eq content_type
@@ -112,17 +107,23 @@
 
     it 'saves media attachment with correct size metadata' do
       # strips original file name
-      expect(media.file_file_name).to_not start_with '600x400'
-
-      # sets meta for original
-      expect(media.file.meta['original']['width']).to eq 600
-      expect(media.file.meta['original']['height']).to eq 400
-      expect(media.file.meta['original']['aspect']).to eq 1.5
-
-      # sets meta for thumbnail
-      expect(media.file.meta['small']['width']).to eq 588
-      expect(media.file.meta['small']['height']).to eq 392
-      expect(media.file.meta['small']['aspect']).to eq 1.5
+      expect(media.file_file_name)
+        .to_not start_with '600x400'
+
+      # sets meta for original and thumbnail
+      expect(media.file.meta.deep_symbolize_keys)
+        .to include(
+          original: include(
+            width: eq(600),
+            height: eq(400),
+            aspect: eq(1.5)
+          ),
+          small: include(
+            width: eq(588),
+            height: eq(392),
+            aspect: eq(1.5)
+          )
+        )
     end
   end
 

From 1690fb39e6e4a26cc5f708626920d3491d7dd95b Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 16 Feb 2024 08:00:11 -0500
Subject: [PATCH 0131/2191] Reduce `RSpec/MultipleExpectations` in
 instance_actors_controller spec (#29229)

---
 .../instance_actors_controller_spec.rb           | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/spec/controllers/instance_actors_controller_spec.rb b/spec/controllers/instance_actors_controller_spec.rb
index 36b9049fbcf3c4..be1eefa7b22747 100644
--- a/spec/controllers/instance_actors_controller_spec.rb
+++ b/spec/controllers/instance_actors_controller_spec.rb
@@ -13,17 +13,19 @@
         end
 
         it 'returns http success with correct media type, headers, and session values' do
-          expect(response).to have_http_status(200)
+          expect(response)
+            .to have_http_status(200)
+            .and have_attributes(
+              media_type: eq('application/activity+json'),
+              cookies: be_empty
+            )
 
-          expect(response.media_type).to eq 'application/activity+json'
-
-          expect(response.cookies).to be_empty
-          expect(response.headers['Set-Cookies']).to be_nil
+          expect(response.headers)
+            .to include('Cache-Control' => include('public'))
+            .and not_include('Set-Cookies')
 
           expect(session).to be_empty
 
-          expect(response.headers['Cache-Control']).to include 'public'
-
           expect(body_as_json)
             .to include(:id, :type, :preferredUsername, :inbox, :publicKey, :inbox, :outbox, :url)
         end

From 117b507df59b2f302c278797a0ea312aee68d570 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 16 Feb 2024 08:01:04 -0500
Subject: [PATCH 0132/2191] Extract `subject` from
 `User#mark_email_as_confirmed!` spec (#29231)

---
 spec/models/user_spec.rb | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 845335e87341e9..1baa3ccbf9c957 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -451,35 +451,32 @@
   end
 
   describe '#mark_email_as_confirmed!' do
-    subject(:user) { Fabricate(:user, confirmed_at: confirmed_at) }
+    subject { user.mark_email_as_confirmed! }
 
-    before do
-      ActionMailer::Base.deliveries.clear
-      user.mark_email_as_confirmed!
-    end
+    let!(:user) { Fabricate(:user, confirmed_at: confirmed_at) }
+
+    before { ActionMailer::Base.deliveries.clear }
 
     after { ActionMailer::Base.deliveries.clear }
 
     context 'when user is new' do
       let(:confirmed_at) { nil }
 
-      it 'confirms user' do
-        expect(user.confirmed_at).to be_present
-      end
+      it 'confirms user and delivers welcome email', :sidekiq_inline do
+        subject
 
-      it 'delivers mails', :sidekiq_inline do
-        expect(ActionMailer::Base.deliveries.count).to eq 2
+        expect(user.confirmed_at).to be_present
+        expect(ActionMailer::Base.deliveries.count).to eq 1
       end
     end
 
     context 'when user is not new' do
       let(:confirmed_at) { Time.zone.now }
 
-      it 'confirms user' do
-        expect(user.confirmed_at).to be_present
-      end
+      it 'confirms user but does not deliver welcome email' do
+        subject
 
-      it 'does not deliver mail' do
+        expect(user.confirmed_at).to be_present
         expect(ActionMailer::Base.deliveries.count).to eq 0
       end
     end

From a316c0e38de9e0dd5853c1c7a1f8d8b7188fb253 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 16 Feb 2024 08:01:15 -0500
Subject: [PATCH 0133/2191] Reduce round trips in disputes/appeals spec
 (#29232)

---
 .../disputes/appeals_controller_spec.rb       | 22 +++++++------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/spec/controllers/disputes/appeals_controller_spec.rb b/spec/controllers/disputes/appeals_controller_spec.rb
index da2f86ade5efeb..d763068ebe8c67 100644
--- a/spec/controllers/disputes/appeals_controller_spec.rb
+++ b/spec/controllers/disputes/appeals_controller_spec.rb
@@ -10,19 +10,17 @@
   let!(:admin) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
 
   describe '#create' do
+    subject { post :create, params: params }
+
     context 'with valid params' do
       let(:current_user) { Fabricate(:user) }
       let(:strike) { Fabricate(:account_warning, target_account: current_user.account) }
+      let(:params) { { strike_id: strike.id, appeal: { text: 'Foo' } } }
 
-      before do
-        post :create, params: { strike_id: strike.id, appeal: { text: 'Foo' } }
-      end
+      it 'notifies staff about new appeal and redirects back to strike page', :sidekiq_inline do
+        subject
 
-      it 'notifies staff about new appeal', :sidekiq_inline do
         expect(ActionMailer::Base.deliveries.first.to).to eq([admin.email])
-      end
-
-      it 'redirects back to the strike page' do
         expect(response).to redirect_to(disputes_strike_path(strike.id))
       end
     end
@@ -30,16 +28,12 @@
     context 'with invalid params' do
       let(:current_user) { Fabricate(:user) }
       let(:strike) { Fabricate(:account_warning, target_account: current_user.account) }
+      let(:params) { { strike_id: strike.id, appeal: { text: '' } } }
 
-      before do
-        post :create, params: { strike_id: strike.id, appeal: { text: '' } }
-      end
+      it 'does not send email and renders strike show page', :sidekiq_inline do
+        subject
 
-      it 'does not send email', :sidekiq_inline do
         expect(ActionMailer::Base.deliveries.size).to eq(0)
-      end
-
-      it 'renders the strike show page' do
         expect(response).to render_template('disputes/strikes/show')
       end
     end

From 3454fcbd719f3f28b1466fd65c42c14d394212c0 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 16 Feb 2024 08:38:49 -0500
Subject: [PATCH 0134/2191] Reduce round trips in auth/sessions spec (#29233)

---
 .../auth/sessions_controller_spec.rb          | 80 ++++++-------------
 1 file changed, 25 insertions(+), 55 deletions(-)

diff --git a/spec/controllers/auth/sessions_controller_spec.rb b/spec/controllers/auth/sessions_controller_spec.rb
index b663f55afacd51..dcbaf1fcbb78c9 100644
--- a/spec/controllers/auth/sessions_controller_spec.rb
+++ b/spec/controllers/auth/sessions_controller_spec.rb
@@ -57,11 +57,9 @@
           post :create, params: { user: { email: 'pam_user1', password: '123456' } }
         end
 
-        it 'redirects to home' do
+        it 'redirects to home and logs the user in' do
           expect(response).to redirect_to(root_path)
-        end
 
-        it 'logs the user in' do
           expect(controller.current_user).to be_instance_of(User)
         end
       end
@@ -71,11 +69,9 @@
           post :create, params: { user: { email: 'pam_user1', password: 'WRONGPW' } }
         end
 
-        it 'shows a login error' do
+        it 'shows a login error and does not log the user in' do
           expect(flash[:alert]).to match I18n.t('devise.failure.invalid', authentication_keys: I18n.t('activerecord.attributes.user.email'))
-        end
 
-        it "doesn't log the user in" do
           expect(controller.current_user).to be_nil
         end
       end
@@ -92,11 +88,9 @@
           post :create, params: { user: { email: user.email, password: '123456' } }
         end
 
-        it 'redirects to home' do
+        it 'redirects to home and logs the user in' do
           expect(response).to redirect_to(root_path)
-        end
 
-        it 'logs the user in' do
           expect(controller.current_user).to eq user
         end
       end
@@ -110,16 +104,16 @@
           post :create, params: { user: { email: user.email, password: user.password } }
         end
 
-        it 'redirects to home' do
+        it 'redirects to home and logs the user in' do
           expect(response).to redirect_to(root_path)
-        end
 
-        it 'logs the user in' do
           expect(controller.current_user).to eq user
         end
       end
 
       context 'when using a valid password on a previously-used account with a new IP address' do
+        subject { post :create, params: { user: { email: user.email, password: user.password } } }
+
         let(:previous_ip) { '1.2.3.4' }
         let(:current_ip)  { '4.3.2.1' }
 
@@ -127,18 +121,17 @@
           Fabricate(:login_activity, user: user, ip: previous_ip)
           allow(controller.request).to receive(:remote_ip).and_return(current_ip)
           user.update(current_sign_in_at: 1.month.ago)
-          post :create, params: { user: { email: user.email, password: user.password } }
         end
 
-        it 'redirects to home' do
-          expect(response).to redirect_to(root_path)
-        end
+        it 'logs the user in and sends suspicious email and redirects home', :sidekiq_inline do
+          subject
 
-        it 'logs the user in' do
-          expect(controller.current_user).to eq user
-        end
+          expect(response)
+            .to redirect_to(root_path)
+
+          expect(controller.current_user)
+            .to eq user
 
-        it 'sends a suspicious sign-in mail', :sidekiq_inline do
           expect(UserMailer.deliveries.size).to eq(1)
           expect(UserMailer.deliveries.first.to.first).to eq(user.email)
           expect(UserMailer.deliveries.first.subject).to eq(I18n.t('user_mailer.suspicious_sign_in.subject'))
@@ -150,11 +143,9 @@
           post :create, params: { user: { email: user.email.upcase, password: user.password } }
         end
 
-        it 'redirects to home' do
+        it 'redirects to home and logs the user in' do
           expect(response).to redirect_to(root_path)
-        end
 
-        it 'logs the user in' do
           expect(controller.current_user).to eq user
         end
       end
@@ -164,11 +155,9 @@
           post :create, params: { user: { email: user.email, password: 'wrongpw' } }
         end
 
-        it 'shows a login error' do
+        it 'shows a login error and does not log the user in' do
           expect(flash[:alert]).to match I18n.t('devise.failure.invalid', authentication_keys: I18n.t('activerecord.attributes.user.email'))
-        end
 
-        it "doesn't log the user in" do
           expect(controller.current_user).to be_nil
         end
       end
@@ -270,7 +259,7 @@
             travel_to '2023-12-20T10:00:00Z'
           end
 
-          it 'does not log the user in' do
+          it 'does not log the user in, sets a flash message, and sends a suspicious sign in email', :sidekiq_inline do
             Auth::SessionsController::MAX_2FA_ATTEMPTS_PER_HOUR.times do
               post :create, params: { user: { otp_attempt: '1234' } }, session: { attempt_user_id: user.id, attempt_user_updated_at: user.updated_at.to_s }
               expect(controller.current_user).to be_nil
@@ -278,17 +267,10 @@
 
             post :create, params: { user: { otp_attempt: user.current_otp } }, session: { attempt_user_id: user.id, attempt_user_updated_at: user.updated_at.to_s }
 
-            expect(controller.current_user).to be_nil
-            expect(flash[:alert]).to match I18n.t('users.rate_limited')
-          end
-
-          it 'sends a suspicious sign-in mail', :sidekiq_inline do
-            Auth::SessionsController::MAX_2FA_ATTEMPTS_PER_HOUR.times do
-              post :create, params: { user: { otp_attempt: '1234' } }, session: { attempt_user_id: user.id, attempt_user_updated_at: user.updated_at.to_s }
-              expect(controller.current_user).to be_nil
-            end
-
-            post :create, params: { user: { otp_attempt: user.current_otp } }, session: { attempt_user_id: user.id, attempt_user_updated_at: user.updated_at.to_s }
+            expect(controller.current_user)
+              .to be_nil
+            expect(flash[:alert])
+              .to match I18n.t('users.rate_limited')
 
             expect(UserMailer.deliveries.size).to eq(1)
             expect(UserMailer.deliveries.first.to.first).to eq(user.email)
@@ -301,11 +283,9 @@
             post :create, params: { user: { otp_attempt: user.current_otp } }, session: { attempt_user_id: user.id, attempt_user_updated_at: user.updated_at.to_s }
           end
 
-          it 'redirects to home' do
+          it 'redirects to home and logs the user in' do
             expect(response).to redirect_to(root_path)
-          end
 
-          it 'logs the user in' do
             expect(controller.current_user).to eq user
           end
         end
@@ -318,11 +298,9 @@
             post :create, params: { user: { otp_attempt: user.current_otp } }, session: { attempt_user_id: user.id, attempt_user_updated_at: user.updated_at.to_s }
           end
 
-          it 'shows a login error' do
+          it 'shows a login error and does not log the user in' do
             expect(flash[:alert]).to match I18n.t('users.invalid_otp_token')
-          end
 
-          it "doesn't log the user in" do
             expect(controller.current_user).to be_nil
           end
         end
@@ -332,11 +310,9 @@
             post :create, params: { user: { otp_attempt: recovery_codes.first } }, session: { attempt_user_id: user.id, attempt_user_updated_at: user.updated_at.to_s }
           end
 
-          it 'redirects to home' do
+          it 'redirects to home and logs the user in' do
             expect(response).to redirect_to(root_path)
-          end
 
-          it 'logs the user in' do
             expect(controller.current_user).to eq user
           end
         end
@@ -346,11 +322,9 @@
             post :create, params: { user: { otp_attempt: 'wrongotp' } }, session: { attempt_user_id: user.id, attempt_user_updated_at: user.updated_at.to_s }
           end
 
-          it 'shows a login error' do
+          it 'shows a login error and does not log the user in' do
             expect(flash[:alert]).to match I18n.t('users.invalid_otp_token')
-          end
 
-          it "doesn't log the user in" do
             expect(controller.current_user).to be_nil
           end
         end
@@ -417,15 +391,11 @@
             post :create, params: { user: { credential: fake_credential } }, session: { attempt_user_id: user.id, attempt_user_updated_at: user.updated_at.to_s }
           end
 
-          it 'instructs the browser to redirect to home' do
+          it 'instructs the browser to redirect to home, logs the user in, and updates the sign count' do
             expect(body_as_json[:redirect_path]).to eq(root_path)
-          end
 
-          it 'logs the user in' do
             expect(controller.current_user).to eq user
-          end
 
-          it 'updates the sign count' do
             expect(webauthn_credential.reload.sign_count).to eq(sign_count)
           end
         end

From 1946e171e6d150cecedf3949c3c4630d5bce1066 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 16 Feb 2024 08:46:28 -0500
Subject: [PATCH 0135/2191] Reduce round trips in admin/disputes/appeals spec
 (#29234)

---
 .../admin/disputes/appeals_controller_spec.rb | 31 +++++++++----------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/spec/controllers/admin/disputes/appeals_controller_spec.rb b/spec/controllers/admin/disputes/appeals_controller_spec.rb
index f830c3b95c974c..d36523316746aa 100644
--- a/spec/controllers/admin/disputes/appeals_controller_spec.rb
+++ b/spec/controllers/admin/disputes/appeals_controller_spec.rb
@@ -30,21 +30,19 @@
   end
 
   describe 'POST #approve' do
+    subject { post :approve, params: { id: appeal.id } }
+
     let(:current_user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
 
-    before do
-      post :approve, params: { id: appeal.id }
-    end
+    it 'redirects back to the strike page and notifies target account about approved appeal', :sidekiq_inline do
+      subject
 
-    it 'unsuspends a suspended account' do
-      expect(target_account.reload.suspended?).to be false
-    end
+      expect(response)
+        .to redirect_to(disputes_strike_path(appeal.strike))
 
-    it 'redirects back to the strike page' do
-      expect(response).to redirect_to(disputes_strike_path(appeal.strike))
-    end
+      expect(target_account.reload)
+        .to_not be_suspended
 
-    it 'notifies target account about approved appeal', :sidekiq_inline do
       expect(UserMailer.deliveries.size).to eq(1)
       expect(UserMailer.deliveries.first.to.first).to eq(target_account.user.email)
       expect(UserMailer.deliveries.first.subject).to eq(I18n.t('user_mailer.appeal_approved.subject', date: I18n.l(appeal.created_at)))
@@ -52,17 +50,16 @@
   end
 
   describe 'POST #reject' do
+    subject { post :reject, params: { id: appeal.id } }
+
     let(:current_user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
 
-    before do
-      post :reject, params: { id: appeal.id }
-    end
+    it 'redirects back to the strike page and notifies target account about rejected appeal', :sidekiq_inline do
+      subject
 
-    it 'redirects back to the strike page' do
-      expect(response).to redirect_to(disputes_strike_path(appeal.strike))
-    end
+      expect(response)
+        .to redirect_to(disputes_strike_path(appeal.strike))
 
-    it 'notifies target account about rejected appeal', :sidekiq_inline do
       expect(UserMailer.deliveries.size).to eq(1)
       expect(UserMailer.deliveries.first.to.first).to eq(target_account.user.email)
       expect(UserMailer.deliveries.first.subject).to eq(I18n.t('user_mailer.appeal_rejected.subject', date: I18n.l(appeal.created_at)))

From 1d9d14b8de67daab169d10293e1f09901734c445 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 16 Feb 2024 09:29:24 -0500
Subject: [PATCH 0136/2191] Use `abort` instead of `warn(); exit` in boot.rb
 env check (#29209)

---
 .rubocop.yml   |  6 ------
 config/boot.rb | 11 +++++++++--
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index a8310489ea7084..dce33eab30d1b1 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -96,12 +96,6 @@ Rails/FilePath:
 Rails/HttpStatus:
   EnforcedStyle: numeric
 
-# Reason: Allowed in boot ENV checker
-# https://docs.rubocop.org/rubocop-rails/cops_rails.html#railsexit
-Rails/Exit:
-  Exclude:
-    - 'config/boot.rb'
-
 # Reason: Conflicts with `Lint/UselessMethodDefinition` for inherited controller actions
 # https://docs.rubocop.org/rubocop-rails/cops_rails.html#railslexicallyscopedactionfilter
 Rails/LexicallyScopedActionFilter:
diff --git a/config/boot.rb b/config/boot.rb
index 717de85f20f5e7..70ffe22c04d979 100644
--- a/config/boot.rb
+++ b/config/boot.rb
@@ -1,8 +1,15 @@
 # frozen_string_literal: true
 
 unless ENV.key?('RAILS_ENV')
-  warn 'ERROR: Missing RAILS_ENV environment variable, please set it to "production", "development", or "test".'
-  exit 1
+  abort <<~ERROR
+    The RAILS_ENV environment variable is not set.
+
+    Please set it correctly depending on context:
+
+      - Use "production" for a live deployment of the application
+      - Use "development" for local feature work
+      - Use "test" when running the automated spec suite
+  ERROR
 end
 
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)

From cfadb8707737ff679b1b08fa9dcab627a632f6ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Fourn=C3=A8s?= <w.wohanka@gmail.com>
Date: Fri, 16 Feb 2024 15:54:23 +0100
Subject: [PATCH 0137/2191] Update enum syntax to use the new Rails 7.0 style
 (#29217)

---
 app/models/account.rb          | 4 ++--
 app/models/account_warning.rb  | 4 ++--
 app/models/bulk_import.rb      | 4 ++--
 app/models/custom_filter.rb    | 2 +-
 app/models/domain_block.rb     | 2 +-
 app/models/import.rb           | 2 +-
 app/models/ip_block.rb         | 2 +-
 app/models/list.rb             | 2 +-
 app/models/login_activity.rb   | 2 +-
 app/models/media_attachment.rb | 4 ++--
 app/models/preview_card.rb     | 4 ++--
 app/models/relay.rb            | 2 +-
 app/models/report.rb           | 2 +-
 app/models/software_update.rb  | 2 +-
 app/models/status.rb           | 2 +-
 15 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/app/models/account.rb b/app/models/account.rb
index 05e1f943cae197..442d4a431d6c13 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -85,8 +85,8 @@ class Account < ApplicationRecord
   include DomainNormalizable
   include Paginable
 
-  enum protocol: { ostatus: 0, activitypub: 1 }
-  enum suspension_origin: { local: 0, remote: 1 }, _prefix: true
+  enum :protocol, { ostatus: 0, activitypub: 1 }
+  enum :suspension_origin, { local: 0, remote: 1 }, prefix: true
 
   validates :username, presence: true
   validates_with UniqueUsernameValidator, if: -> { will_save_change_to_username? }
diff --git a/app/models/account_warning.rb b/app/models/account_warning.rb
index 9286577f516e65..a54387a562f222 100644
--- a/app/models/account_warning.rb
+++ b/app/models/account_warning.rb
@@ -17,7 +17,7 @@
 #
 
 class AccountWarning < ApplicationRecord
-  enum action: {
+  enum :action, {
     none: 0,
     disable: 1_000,
     mark_statuses_as_sensitive: 1_250,
@@ -25,7 +25,7 @@ class AccountWarning < ApplicationRecord
     sensitive: 2_000,
     silence: 3_000,
     suspend: 4_000,
-  }, _suffix: :action
+  }, suffix: :action
 
   normalizes :text, with: ->(text) { text.to_s }, apply_to_nil: true
 
diff --git a/app/models/bulk_import.rb b/app/models/bulk_import.rb
index 406fb2aba26c7a..4cd228705a860a 100644
--- a/app/models/bulk_import.rb
+++ b/app/models/bulk_import.rb
@@ -24,7 +24,7 @@ class BulkImport < ApplicationRecord
   belongs_to :account
   has_many :rows, class_name: 'BulkImportRow', inverse_of: :bulk_import, dependent: :delete_all
 
-  enum type: {
+  enum :type, {
     following: 0,
     blocking: 1,
     muting: 2,
@@ -33,7 +33,7 @@ class BulkImport < ApplicationRecord
     lists: 5,
   }
 
-  enum state: {
+  enum :state, {
     unconfirmed: 0,
     scheduled: 1,
     in_progress: 2,
diff --git a/app/models/custom_filter.rb b/app/models/custom_filter.rb
index c8120c239547a0..5e2d152e34895e 100644
--- a/app/models/custom_filter.rb
+++ b/app/models/custom_filter.rb
@@ -31,7 +31,7 @@ class CustomFilter < ApplicationRecord
   include Expireable
   include Redisable
 
-  enum action: { warn: 0, hide: 1 }, _suffix: :action
+  enum :action, { warn: 0, hide: 1 }, suffix: :action
 
   belongs_to :account
   has_many :keywords, class_name: 'CustomFilterKeyword', inverse_of: :custom_filter, dependent: :destroy
diff --git a/app/models/domain_block.rb b/app/models/domain_block.rb
index a05db099a8d1d8..e310918e9b436e 100644
--- a/app/models/domain_block.rb
+++ b/app/models/domain_block.rb
@@ -21,7 +21,7 @@ class DomainBlock < ApplicationRecord
   include DomainNormalizable
   include DomainMaterializable
 
-  enum severity: { silence: 0, suspend: 1, noop: 2 }
+  enum :severity, { silence: 0, suspend: 1, noop: 2 }
 
   validates :domain, presence: true, uniqueness: true, domain: true
 
diff --git a/app/models/import.rb b/app/models/import.rb
index 7cd6cccf7cec0b..4bdb392014b70d 100644
--- a/app/models/import.rb
+++ b/app/models/import.rb
@@ -28,7 +28,7 @@ class Import < ApplicationRecord
 
   belongs_to :account
 
-  enum type: { following: 0, blocking: 1, muting: 2, domain_blocking: 3, bookmarks: 4 }
+  enum :type, { following: 0, blocking: 1, muting: 2, domain_blocking: 3, bookmarks: 4 }
 
   validates :type, presence: true
 
diff --git a/app/models/ip_block.rb b/app/models/ip_block.rb
index 99783050b8aac7..9def5b0cde1016 100644
--- a/app/models/ip_block.rb
+++ b/app/models/ip_block.rb
@@ -19,7 +19,7 @@ class IpBlock < ApplicationRecord
   include Expireable
   include Paginable
 
-  enum severity: {
+  enum :severity, {
     sign_up_requires_approval: 5000,
     sign_up_block: 5500,
     no_access: 9999,
diff --git a/app/models/list.rb b/app/models/list.rb
index fcef49e6e9ad5f..b45bd057bc7caa 100644
--- a/app/models/list.rb
+++ b/app/models/list.rb
@@ -18,7 +18,7 @@ class List < ApplicationRecord
 
   PER_ACCOUNT_LIMIT = 50
 
-  enum replies_policy: { list: 0, followed: 1, none: 2 }, _prefix: :show
+  enum :replies_policy, { list: 0, followed: 1, none: 2 }, prefix: :show
 
   belongs_to :account, optional: true
 
diff --git a/app/models/login_activity.rb b/app/models/login_activity.rb
index 2b7b37f8e499f6..654dd623ad13ca 100644
--- a/app/models/login_activity.rb
+++ b/app/models/login_activity.rb
@@ -16,7 +16,7 @@
 #
 
 class LoginActivity < ApplicationRecord
-  enum authentication_method: { password: 'password', otp: 'otp', webauthn: 'webauthn', sign_in_token: 'sign_in_token', omniauth: 'omniauth' }
+  enum :authentication_method, { password: 'password', otp: 'otp', webauthn: 'webauthn', sign_in_token: 'sign_in_token', omniauth: 'omniauth' }
 
   belongs_to :user
 
diff --git a/app/models/media_attachment.rb b/app/models/media_attachment.rb
index 7ff6a15f5dcd49..f53da04a9755be 100644
--- a/app/models/media_attachment.rb
+++ b/app/models/media_attachment.rb
@@ -34,8 +34,8 @@ class MediaAttachment < ApplicationRecord
 
   include Attachmentable
 
-  enum type: { image: 0, gifv: 1, video: 2, unknown: 3, audio: 4 }
-  enum processing: { queued: 0, in_progress: 1, complete: 2, failed: 3 }, _prefix: true
+  enum :type, { image: 0, gifv: 1, video: 2, unknown: 3, audio: 4 }
+  enum :processing, { queued: 0, in_progress: 1, complete: 2, failed: 3 }, prefix: true
 
   MAX_DESCRIPTION_LENGTH = 1_500
 
diff --git a/app/models/preview_card.rb b/app/models/preview_card.rb
index 83759274306cf3..9fe02bd1681014 100644
--- a/app/models/preview_card.rb
+++ b/app/models/preview_card.rb
@@ -47,8 +47,8 @@ class PreviewCard < ApplicationRecord
 
   self.inheritance_column = false
 
-  enum type: { link: 0, photo: 1, video: 2, rich: 3 }
-  enum link_type: { unknown: 0, article: 1 }
+  enum :type, { link: 0, photo: 1, video: 2, rich: 3 }
+  enum :link_type, { unknown: 0, article: 1 }
 
   has_many :preview_cards_statuses, dependent: :delete_all, inverse_of: :preview_card
   has_many :statuses, through: :preview_cards_statuses
diff --git a/app/models/relay.rb b/app/models/relay.rb
index 8d697b891f9360..f652b4864b66c0 100644
--- a/app/models/relay.rb
+++ b/app/models/relay.rb
@@ -15,7 +15,7 @@
 class Relay < ApplicationRecord
   validates :inbox_url, presence: true, uniqueness: true, url: true, if: :will_save_change_to_inbox_url?
 
-  enum state: { idle: 0, pending: 1, accepted: 2, rejected: 3 }
+  enum :state, { idle: 0, pending: 1, accepted: 2, rejected: 3 }
 
   scope :enabled, -> { accepted }
 
diff --git a/app/models/report.rb b/app/models/report.rb
index 1b132753b515f5..df7e3d2efc0f62 100644
--- a/app/models/report.rb
+++ b/app/models/report.rb
@@ -55,7 +55,7 @@ class Report < ApplicationRecord
   # - app/javascript/mastodon/features/notifications/components/report.jsx
   # - app/javascript/mastodon/features/report/category.jsx
   # - app/javascript/mastodon/components/admin/ReportReasonSelector.jsx
-  enum category: {
+  enum :category, {
     other: 0,
     spam: 1_000,
     legal: 1_500,
diff --git a/app/models/software_update.rb b/app/models/software_update.rb
index cb3a6df2aeb96e..51a73c27311d9a 100644
--- a/app/models/software_update.rb
+++ b/app/models/software_update.rb
@@ -16,7 +16,7 @@
 class SoftwareUpdate < ApplicationRecord
   self.inheritance_column = nil
 
-  enum type: { patch: 0, minor: 1, major: 2 }, _suffix: :type
+  enum :type, { patch: 0, minor: 1, major: 2 }, suffix: :type
 
   def gem_version
     Gem::Version.new(version)
diff --git a/app/models/status.rb b/app/models/status.rb
index e3d41ccedafcc7..0ec69c8dd14123 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -50,7 +50,7 @@ class Status < ApplicationRecord
   update_index('statuses', :proper)
   update_index('public_statuses', :proper)
 
-  enum visibility: { public: 0, unlisted: 1, private: 2, direct: 3, limited: 4 }, _suffix: :visibility
+  enum :visibility, { public: 0, unlisted: 1, private: 2, direct: 3, limited: 4 }, suffix: :visibility
 
   belongs_to :application, class_name: 'Doorkeeper::Application', optional: true
 

From 96ddf1d4820419a6b5367af022be5cf17526109e Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 16 Feb 2024 17:57:23 +0100
Subject: [PATCH 0138/2191] Fix flaky end-to-end OCR test (#29244)

---
 spec/system/ocr_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/system/ocr_spec.rb b/spec/system/ocr_spec.rb
index 3ab815c047ae60..254efa71370aff 100644
--- a/spec/system/ocr_spec.rb
+++ b/spec/system/ocr_spec.rb
@@ -28,6 +28,6 @@
 
     click_on('Detect text from picture')
 
-    expect(page).to have_css('#upload-modal__description', text: 'Hello Mastodon')
+    expect(page).to have_css('#upload-modal__description', text: /Hello Mastodon\s*/, wait: 10)
   end
 end

From 8a10feb8dcefa28019ea1143f42061a041621c22 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 9 Nov 2023 13:58:02 +0100
Subject: [PATCH 0139/2191] [Glitch] Fix Web UI not displaying appropriate
 explanation when a user hides their follows/followers

Port 9b06c0f24a2d3fb5a453611fe8e1c938e2351e5a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/api_types/accounts.ts        | 1 +
 app/javascript/flavours/glitch/features/followers/index.jsx | 5 ++++-
 app/javascript/flavours/glitch/features/following/index.jsx | 5 ++++-
 app/javascript/flavours/glitch/models/account.ts            | 1 +
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/javascript/flavours/glitch/api_types/accounts.ts b/app/javascript/flavours/glitch/api_types/accounts.ts
index 3347a970fb3ca1..5bf3e64288c76e 100644
--- a/app/javascript/flavours/glitch/api_types/accounts.ts
+++ b/app/javascript/flavours/glitch/api_types/accounts.ts
@@ -43,4 +43,5 @@ export interface ApiAccountJSON {
   suspended?: boolean;
   limited?: boolean;
   memorial?: boolean;
+  hide_collections: boolean;
 }
diff --git a/app/javascript/flavours/glitch/features/followers/index.jsx b/app/javascript/flavours/glitch/features/followers/index.jsx
index 6226c96f2191f5..2ea3574a9010f3 100644
--- a/app/javascript/flavours/glitch/features/followers/index.jsx
+++ b/app/javascript/flavours/glitch/features/followers/index.jsx
@@ -45,6 +45,7 @@ const mapStateToProps = (state, { params: { acct, id } }) => {
     hasMore: !!state.getIn(['user_lists', 'followers', accountId, 'next']),
     isLoading: state.getIn(['user_lists', 'followers', accountId, 'isLoading'], true),
     suspended: state.getIn(['accounts', accountId, 'suspended'], false),
+    hideCollections: state.getIn(['accounts', accountId, 'hide_collections'], false),
     hidden: getAccountHidden(state, accountId),
   };
 };
@@ -117,7 +118,7 @@ class Followers extends ImmutablePureComponent {
   };
 
   render () {
-    const { accountId, accountIds, hasMore, isAccount, multiColumn, isLoading, suspended, hidden, remote, remoteUrl } = this.props;
+    const { accountId, accountIds, hasMore, isAccount, multiColumn, isLoading, suspended, hidden, remote, remoteUrl, hideCollections } = this.props;
 
     if (!isAccount) {
       return (
@@ -141,6 +142,8 @@ class Followers extends ImmutablePureComponent {
       emptyMessage = <FormattedMessage id='empty_column.account_suspended' defaultMessage='Account suspended' />;
     } else if (hidden) {
       emptyMessage = <LimitedAccountHint accountId={accountId} />;
+    } else if (hideCollections && accountIds.isEmpty()) {
+      emptyMessage = <FormattedMessage id='empty_column.account_hides_collections' defaultMessage='This user has chosen to not make this information available' />;
     } else if (remote && accountIds.isEmpty()) {
       emptyMessage = <RemoteHint url={remoteUrl} />;
     } else {
diff --git a/app/javascript/flavours/glitch/features/following/index.jsx b/app/javascript/flavours/glitch/features/following/index.jsx
index 69936343028ad0..0d18e76ec4e653 100644
--- a/app/javascript/flavours/glitch/features/following/index.jsx
+++ b/app/javascript/flavours/glitch/features/following/index.jsx
@@ -45,6 +45,7 @@ const mapStateToProps = (state, { params: { acct, id } }) => {
     hasMore: !!state.getIn(['user_lists', 'following', accountId, 'next']),
     isLoading: state.getIn(['user_lists', 'following', accountId, 'isLoading'], true),
     suspended: state.getIn(['accounts', accountId, 'suspended'], false),
+    hideCollections: state.getIn(['accounts', accountId, 'hide_collections'], false),
     hidden: getAccountHidden(state, accountId),
   };
 };
@@ -117,7 +118,7 @@ class Following extends ImmutablePureComponent {
   };
 
   render () {
-    const { accountId, accountIds, hasMore, isAccount, multiColumn, isLoading, suspended, hidden, remote, remoteUrl } = this.props;
+    const { accountId, accountIds, hasMore, isAccount, multiColumn, isLoading, suspended, hidden, remote, remoteUrl, hideCollections } = this.props;
 
     if (!isAccount) {
       return (
@@ -141,6 +142,8 @@ class Following extends ImmutablePureComponent {
       emptyMessage = <FormattedMessage id='empty_column.account_suspended' defaultMessage='Account suspended' />;
     } else if (hidden) {
       emptyMessage = <LimitedAccountHint accountId={accountId} />;
+    } else if (hideCollections && accountIds.isEmpty()) {
+      emptyMessage = <FormattedMessage id='empty_column.account_hides_collections' defaultMessage='This user has chosen to not make this information available' />;
     } else if (remote && accountIds.isEmpty()) {
       emptyMessage = <RemoteHint url={remoteUrl} />;
     } else {
diff --git a/app/javascript/flavours/glitch/models/account.ts b/app/javascript/flavours/glitch/models/account.ts
index 8500009e0f2321..0b698ead3d1930 100644
--- a/app/javascript/flavours/glitch/models/account.ts
+++ b/app/javascript/flavours/glitch/models/account.ts
@@ -94,6 +94,7 @@ export const accountDefaultValues: AccountShape = {
   memorial: false,
   limited: false,
   moved: null,
+  hide_collections: false,
 };
 
 const AccountFactory = ImmutableRecord<AccountShape>(accountDefaultValues);

From e078ede0972c32f9e61fcbbb1c01dc6bcddde157 Mon Sep 17 00:00:00 2001
From: Danko Aleksejevs <danko@very.lv>
Date: Sun, 18 Feb 2024 20:10:58 +0200
Subject: [PATCH 0140/2191] Remove status content from mobile actions modal
 (#2615)

---
 .../features/ui/components/actions_modal.jsx  | 31 +------------------
 1 file changed, 1 insertion(+), 30 deletions(-)

diff --git a/app/javascript/flavours/glitch/features/ui/components/actions_modal.jsx b/app/javascript/flavours/glitch/features/ui/components/actions_modal.jsx
index 7f2027eb01ebf6..82ccc884751940 100644
--- a/app/javascript/flavours/glitch/features/ui/components/actions_modal.jsx
+++ b/app/javascript/flavours/glitch/features/ui/components/actions_modal.jsx
@@ -5,11 +5,6 @@ import classNames from 'classnames';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-import { Avatar } from 'flavours/glitch/components/avatar';
-import { DisplayName } from 'flavours/glitch/components/display_name';
-import { RelativeTimestamp } from 'flavours/glitch/components/relative_timestamp';
-import StatusContent from 'flavours/glitch/components/status_content';
-
 import { IconButton } from '../../../components/icon_button';
 
 export default class ActionsModal extends ImmutablePureComponent {
@@ -58,33 +53,9 @@ export default class ActionsModal extends ImmutablePureComponent {
   };
 
   render () {
-    const status = this.props.status && (
-      <div className='status light'>
-        <div className='boost-modal__status-header'>
-          <div className='boost-modal__status-time'>
-            <a href={this.props.status.get('url')} className='status__relative-time' target='_blank' rel='noopener noreferrer'>
-              <RelativeTimestamp timestamp={this.props.status.get('created_at')} />
-            </a>
-          </div>
-
-          <a href={this.props.status.getIn(['account', 'url'])} className='status__display-name' rel='noopener noreferrer'>
-            <div className='status__avatar'>
-              <Avatar account={this.props.status.get('account')} size={48} />
-            </div>
-
-            <DisplayName account={this.props.status.get('account')} />
-          </a>
-        </div>
-
-        <StatusContent status={this.props.status} />
-      </div>
-    );
-
     return (
       <div className='modal-root__modal actions-modal'>
-        {status}
-
-        <ul className={classNames({ 'with-status': !!status })}>
+        <ul>
           {this.props.actions.map(this.renderAction)}
         </ul>
       </div>

From 9a11b077f78e2228b9316571d37158816ff5028a Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Sun, 18 Feb 2024 19:12:23 +0100
Subject: [PATCH 0141/2191] Reduce CSS and markup differences with upstream
 (#2629)

---
 .../compose/components/dropdown_menu.jsx      |  6 ++-
 .../features/compose/components/options.jsx   |  4 +-
 .../flavours/glitch/styles/components.scss    | 45 +++++++++++--------
 3 files changed, 34 insertions(+), 21 deletions(-)

diff --git a/app/javascript/flavours/glitch/features/compose/components/dropdown_menu.jsx b/app/javascript/flavours/glitch/features/compose/components/dropdown_menu.jsx
index 33f28e46f4bec1..e5f24b51f9d496 100644
--- a/app/javascript/flavours/glitch/features/compose/components/dropdown_menu.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/dropdown_menu.jsx
@@ -156,7 +156,11 @@ export default class ComposerOptionsDropdownContent extends PureComponent {
     if (!contents) {
       contents = (
         <>
-          {icon && <Icon className='icon' id={icon} icon={iconComponent} />}
+          {icon && (
+            <div className='privacy-dropdown__option__icon'>
+              <Icon className='icon' id={icon} icon={iconComponent} />
+            </div>
+          )}
 
           <div className='privacy-dropdown__option__content'>
             <strong>{text}</strong>
diff --git a/app/javascript/flavours/glitch/features/compose/components/options.jsx b/app/javascript/flavours/glitch/features/compose/components/options.jsx
index 314b6e638fab7b..5460960364927c 100644
--- a/app/javascript/flavours/glitch/features/compose/components/options.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/options.jsx
@@ -110,7 +110,9 @@ class ToggleOptionImpl extends ImmutablePureComponent {
 
     return (
       <>
-        <Toggle checked={checked} onChange={this.handleChange} />
+        <div className='privacy-dropdown__option__icon'>
+          <Toggle checked={checked} onChange={this.handleChange} />
+        </div>
 
         <div className='privacy-dropdown__option__content'>
           <strong>{text}</strong>
diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index 029c87c81498ce..b425fea1dec56b 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -698,6 +698,22 @@ body > [data-popper-placement] {
       .icon-button {
         height: 100%;
       }
+
+      .compose-form__upload-button-icon {
+        line-height: 27px;
+      }
+
+      .compose-form__sensitive-button {
+        display: none;
+
+        &.compose-form__sensitive-button--visible {
+          display: block;
+        }
+
+        .compose-form__sensitive-button__icon {
+          line-height: 27px;
+        }
+      }
     }
 
     .icon-button,
@@ -1057,8 +1073,9 @@ body > [data-popper-placement] {
   }
 
   &.light {
-    .status__relative-time {
-      color: $lighter-text-color;
+    .status__relative-time,
+    .status__visibility-icon {
+      color: $light-text-color;
     }
 
     .status__display-name {
@@ -4142,19 +4159,18 @@ a.status-card.compact:hover {
   background: $base-overlay-background;
   color: $darker-text-color;
   border: 0;
+  padding: 0;
   width: 100%;
   height: 100%;
+  border-radius: 4px;
+  appearance: none;
 
   &:hover,
   &:active,
   &:focus {
+    padding: 0;
     color: lighten($darker-text-color, 8%);
   }
-
-  .status__content > & {
-    margin-top: 15px; // Add margin when used bare for NSFW video player
-  }
-  @include fullwidth-gallery;
 }
 
 .media-spoiler__warning {
@@ -4165,7 +4181,7 @@ a.status-card.compact:hover {
 .media-spoiler__trigger {
   display: block;
   font-size: 11px;
-  font-weight: 500;
+  font-weight: 700;
 }
 
 .spoiler-button {
@@ -4829,10 +4845,6 @@ a.status-card.compact:hover {
   flex: 1 1 auto;
   color: $lighter-text-color;
 
-  &:not(:first-child) {
-    margin-inline-start: 10px;
-  }
-
   strong {
     font-weight: 500;
     display: block;
@@ -4864,11 +4876,6 @@ a.status-card.compact:hover {
   min-width: 75%;
 }
 
-.account__header__wrapper {
-  flex: 0 0 auto;
-  background: lighten($ui-base-color, 4%);
-}
-
 .account__disclaimer {
   display: flex;
   padding: 10px;
@@ -5729,9 +5736,9 @@ a.status-card.compact:hover {
   display: flex;
 }
 
-.video-modal__container {
+.video-modal .video-player {
+  max-height: 80vh;
   max-width: 100vw;
-  max-height: 100vh;
 }
 
 .audio-modal__container {

From 034be5ad507dc3e08515b18fcc53ade646e026c7 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Sun, 18 Feb 2024 20:45:36 +0100
Subject: [PATCH 0142/2191] Further reduce CSS differences with upstream
 (#2630)

---
 .../flavours/glitch/styles/components.scss    | 27 ++++++-------------
 1 file changed, 8 insertions(+), 19 deletions(-)

diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index b425fea1dec56b..fcac924c093983 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -1272,8 +1272,6 @@ body > [data-popper-placement] {
 .account {
   padding: 10px;
   border-bottom: 1px solid lighten($ui-base-color, 8%);
-  color: inherit;
-  text-decoration: none;
 
   .account__display-name {
     flex: 1 1 auto;
@@ -1347,10 +1345,6 @@ body > [data-popper-placement] {
   align-items: center;
 }
 
-.account__avatar-wrapper {
-  float: left;
-}
-
 .account__avatar {
   @include avatar-radius;
 
@@ -1484,10 +1478,13 @@ a.status__display-name,
 }
 
 .detailed-status__display-name {
-  color: $secondary-text-color;
-  display: block;
-  line-height: 24px;
-  margin-bottom: 15px;
+  color: $darker-text-color;
+  display: flex;
+  align-items: center;
+  gap: 10px;
+  font-size: 15px;
+  line-height: 22px;
+  margin-bottom: 16px;
   overflow: hidden;
 
   strong,
@@ -1498,16 +1495,10 @@ a.status__display-name,
   }
 
   strong {
-    font-size: 16px;
     color: $primary-text-color;
   }
 }
 
-.detailed-status__display-avatar {
-  float: left;
-  margin-inline-end: 10px;
-}
-
 .status__relative-time,
 .detailed-status__datetime {
   &:hover {
@@ -6134,8 +6125,7 @@ a.status-card.compact:hover {
   justify-content: space-between;
   align-items: center;
   background: $ui-secondary-color;
-  padding: 10px;
-  line-height: 36px;
+  padding: 10px; // purposefully reduce padding in glitch-soc
 
   & > div {
     flex: 1 1 auto;
@@ -8403,7 +8393,6 @@ noscript {
 
   &--compact &__item {
     padding: 10px;
-    padding-inline-end: 28px;
   }
 }
 

From bbecf1c56b12fc2fa3c980d30a66e46903d12b7a Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Sun, 18 Feb 2024 22:30:20 +0100
Subject: [PATCH 0143/2191] Further reduce differences with upstream (#2631)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Further reduce CSS diffs with upstream

* Remove superfluous “Sensitive content” label in media galleries and clean up dead code
---
 .../glitch/components/media_gallery.jsx       | 30 ++-----------
 .../flavours/glitch/locales/en.json           |  2 -
 .../flavours/glitch/styles/components.scss    | 44 +++----------------
 3 files changed, 10 insertions(+), 66 deletions(-)

diff --git a/app/javascript/flavours/glitch/components/media_gallery.jsx b/app/javascript/flavours/glitch/components/media_gallery.jsx
index 9db2a430099afe..ec18f882b64047 100644
--- a/app/javascript/flavours/glitch/components/media_gallery.jsx
+++ b/app/javascript/flavours/glitch/components/media_gallery.jsx
@@ -18,26 +18,7 @@ import { autoPlayGif, displayMedia, useBlurhash } from '../initial_state';
 import { IconButton } from './icon_button';
 
 const messages = defineMessages({
-  hidden: {
-    defaultMessage: 'Media hidden',
-    id: 'status.media_hidden',
-  },
-  sensitive: {
-    defaultMessage: 'Sensitive',
-    id: 'media_gallery.sensitive',
-  },
-  toggle: {
-    defaultMessage: 'Click to view',
-    id: 'status.sensitive_toggle',
-  },
-  toggle_visible: {
-    defaultMessage: '{number, plural, one {Hide image} other {Hide images}}',
-    id: 'media_gallery.toggle_visible',
-  },
-  warning: {
-    defaultMessage: 'Sensitive content',
-    id: 'status.sensitive_warning',
-  },
+  toggle_visible: { id: 'media_gallery.toggle_visible', defaultMessage: '{number, plural, one {Hide image} other {Hide images}}' },
 });
 
 class Item extends PureComponent {
@@ -299,8 +280,8 @@ class MediaGallery extends PureComponent {
     this.props.onOpenMedia(this.props.media, index, this.props.lang);
   };
 
-  handleRef = (node) => {
-    this.node = node;
+  handleRef = c => {
+    this.node = c;
 
     if (this.node) {
       this._setDimensions();
@@ -379,11 +360,6 @@ class MediaGallery extends PureComponent {
       <div className={computedClass} style={style} ref={this.handleRef}>
         <div className={classNames('spoiler-button', { 'spoiler-button--minified': visible && !uncached, 'spoiler-button--click-thru': uncached })}>
           {spoilerButton}
-          {visible && sensitive && (
-            <span className='sensitive-marker'>
-              <FormattedMessage {...messages.sensitive} />
-            </span>
-          )}
         </div>
 
         {children}
diff --git a/app/javascript/flavours/glitch/locales/en.json b/app/javascript/flavours/glitch/locales/en.json
index 829492c13cdaa3..94e7415b031bb3 100644
--- a/app/javascript/flavours/glitch/locales/en.json
+++ b/app/javascript/flavours/glitch/locales/en.json
@@ -52,7 +52,6 @@
   "keyboard_shortcuts.bookmark": "to bookmark",
   "keyboard_shortcuts.secondary_toot": "to send toot using secondary privacy setting",
   "keyboard_shortcuts.toggle_collapse": "to collapse/uncollapse toots",
-  "media_gallery.sensitive": "Sensitive",
   "moved_to_warning": "This account is marked as moved to {moved_to_link}, and may thus not accept new follows.",
   "navigation_bar.app_settings": "App settings",
   "navigation_bar.featured_users": "Featured users",
@@ -153,7 +152,6 @@
   "status.in_reply_to": "This toot is a reply",
   "status.is_poll": "This toot is a poll",
   "status.local_only": "Only visible from your instance",
-  "status.sensitive_toggle": "Click to view",
   "status.uncollapse": "Uncollapse",
   "suggestions.dismiss": "Dismiss suggestion"
 }
diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index fcac924c093983..a74d862c283782 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -602,7 +602,7 @@ body > [data-popper-placement] {
     height: 16px;
   }
 
-  .autosuggest-account .display-name > span {
+  .autosuggest-account .display-name__account {
     color: $lighter-text-color;
   }
 
@@ -837,11 +837,6 @@ body > [data-popper-placement] {
   line-height: 24px;
   overflow: hidden;
   text-decoration: none;
-
-  & > .display-name {
-    line-height: unset;
-    height: unset;
-  }
 }
 
 .reply-indicator__display-avatar {
@@ -1043,12 +1038,6 @@ body > [data-popper-placement] {
   border-bottom: 1px solid lighten($ui-base-color, 8%);
   cursor: auto;
 
-  @supports (-ms-overflow-style: -ms-autohiding-scrollbar) {
-    // Add margin to avoid Edge auto-hiding scrollbar appearing over content.
-    // On Edge 16 this is 16px and Edge <=15 it's 12px, so aim for 16px.
-    padding-inline-end: 28px; // 12px + 16px
-  }
-
   @keyframes fade {
     0% {
       opacity: 0;
@@ -2178,6 +2167,7 @@ $ui-header-height: 55px;
 .columns-area--mobile {
   flex-direction: column;
   width: 100%;
+  height: 100%;
   margin: 0 auto;
 
   .column,
@@ -7444,8 +7434,11 @@ img.modal-warning {
 
 .notification__filter-bar,
 .account__section-headline {
-  // deliberate glitch-soc choice for now
-  background: darken($ui-base-color, 4%);
+  background: darken(
+    $ui-base-color,
+    4%
+  ); // deliberate glitch-soc choice for now
+
   border-bottom: 1px solid lighten($ui-base-color, 8%);
   cursor: default;
   display: flex;
@@ -7584,24 +7577,6 @@ noscript {
   }
 }
 
-// glitch-specific “sensitive” label on displayed images; TODO: remove it?
-.sensitive-marker {
-  margin: 0 3px;
-  border-radius: 2px;
-  padding: 2px 6px;
-  color: rgba($primary-text-color, 0.8);
-  background: rgba($base-overlay-background, 0.5);
-  font-size: 12px;
-  line-height: 18px;
-  text-transform: uppercase;
-  opacity: 0.9;
-  transition: opacity 0.1s ease;
-
-  .media-gallery:hover & {
-    opacity: 1;
-  }
-}
-
 .embed-modal {
   width: auto;
   max-width: 80vw;
@@ -8457,11 +8432,6 @@ noscript {
         color: $primary-text-color;
         text-decoration: none;
 
-        .icon {
-          width: 15px;
-          height: 15px;
-        }
-
         &:hover,
         &:focus,
         &:active {

From 245064bb98ab11face7a04303fd62724820d9610 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 19 Feb 2024 06:09:43 -0500
Subject: [PATCH 0144/2191] Move "everyone" role and "instance actor" account
 magic number IDs to constants (#29260)

---
 app/models/account.rb                                  |  5 +++--
 app/models/concerns/account/finder_concern.rb          |  4 ++--
 app/models/user_role.rb                                | 10 ++++++----
 db/migrate/20190715164535_add_instance_actor.rb        |  6 ++++--
 .../20220704024901_migrate_settings_to_user_roles.rb   |  6 ++++--
 db/seeds/02_instance_actor.rb                          |  2 +-
 lib/tasks/tests.rake                                   |  2 +-
 spec/models/account_spec.rb                            |  4 ++--
 spec/models/user_role_spec.rb                          |  6 +++---
 9 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/app/models/account.rb b/app/models/account.rb
index 442d4a431d6c13..d627fd6b64422f 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -64,6 +64,7 @@ class Account < ApplicationRecord
   )
 
   BACKGROUND_REFRESH_INTERVAL = 1.week.freeze
+  INSTANCE_ACTOR_ID = -99
 
   USERNAME_RE   = /[a-z0-9_]+([a-z0-9_.-]+[a-z0-9_]+)?/i
   MENTION_RE    = %r{(?<![=/[:word:]])@((#{USERNAME_RE})(?:@[[:word:].-]+[[:word:]]+)?)}i
@@ -118,7 +119,7 @@ class Account < ApplicationRecord
   scope :sensitized, -> { where.not(sensitized_at: nil) }
   scope :without_suspended, -> { where(suspended_at: nil) }
   scope :without_silenced, -> { where(silenced_at: nil) }
-  scope :without_instance_actor, -> { where.not(id: -99) }
+  scope :without_instance_actor, -> { where.not(id: INSTANCE_ACTOR_ID) }
   scope :recent, -> { reorder(id: :desc) }
   scope :bots, -> { where(actor_type: %w(Application Service)) }
   scope :groups, -> { where(actor_type: 'Group') }
@@ -176,7 +177,7 @@ def bot?
   end
 
   def instance_actor?
-    id == -99
+    id == INSTANCE_ACTOR_ID
   end
 
   alias bot bot?
diff --git a/app/models/concerns/account/finder_concern.rb b/app/models/concerns/account/finder_concern.rb
index 7faaddeb4302c6..a7acff1cbbf968 100644
--- a/app/models/concerns/account/finder_concern.rb
+++ b/app/models/concerns/account/finder_concern.rb
@@ -13,11 +13,11 @@ def find_remote!(username, domain)
     end
 
     def representative
-      actor = Account.find(-99).tap(&:ensure_keys!)
+      actor = Account.find(Account::INSTANCE_ACTOR_ID).tap(&:ensure_keys!)
       actor.update!(username: 'mastodon.internal') if actor.username.include?(':')
       actor
     rescue ActiveRecord::RecordNotFound
-      Account.create!(id: -99, actor_type: 'Application', locked: true, username: 'mastodon.internal')
+      Account.create!(id: Account::INSTANCE_ACTOR_ID, actor_type: 'Application', locked: true, username: 'mastodon.internal')
     end
 
     def find_local(username)
diff --git a/app/models/user_role.rb b/app/models/user_role.rb
index 89354da5423bb3..ed64ca05380ad9 100644
--- a/app/models/user_role.rb
+++ b/app/models/user_role.rb
@@ -38,6 +38,8 @@ class UserRole < ApplicationRecord
     delete_user_data: (1 << 19),
   }.freeze
 
+  EVERYONE_ROLE_ID = -99
+
   module Flags
     NONE = 0
     ALL  = FLAGS.values.reduce(&:|)
@@ -94,7 +96,7 @@ module Flags
 
   before_validation :set_position
 
-  scope :assignable, -> { where.not(id: -99).order(position: :asc) }
+  scope :assignable, -> { where.not(id: EVERYONE_ROLE_ID).order(position: :asc) }
 
   has_many :users, inverse_of: :role, foreign_key: 'role_id', dependent: :nullify
 
@@ -103,9 +105,9 @@ def self.nobody
   end
 
   def self.everyone
-    UserRole.find(-99)
+    UserRole.find(EVERYONE_ROLE_ID)
   rescue ActiveRecord::RecordNotFound
-    UserRole.create!(id: -99, permissions: Flags::DEFAULT)
+    UserRole.create!(id: EVERYONE_ROLE_ID, permissions: Flags::DEFAULT)
   end
 
   def self.that_can(*any_of_privileges)
@@ -113,7 +115,7 @@ def self.that_can(*any_of_privileges)
   end
 
   def everyone?
-    id == -99
+    id == EVERYONE_ROLE_ID
   end
 
   def nobody?
diff --git a/db/migrate/20190715164535_add_instance_actor.rb b/db/migrate/20190715164535_add_instance_actor.rb
index 3785dc2553c4bd..6871b37bdf91c7 100644
--- a/db/migrate/20190715164535_add_instance_actor.rb
+++ b/db/migrate/20190715164535_add_instance_actor.rb
@@ -5,6 +5,8 @@ class Account < ApplicationRecord
     # Dummy class, to make migration possible across version changes
     validates :username, uniqueness: { scope: :domain, case_sensitive: false }
 
+    INSTANCE_ACTOR_ID = -99
+
     before_create :generate_keys
 
     def generate_keys
@@ -15,10 +17,10 @@ def generate_keys
   end
 
   def up
-    Account.create!(id: -99, actor_type: 'Application', locked: true, username: Rails.configuration.x.local_domain)
+    Account.create!(id: Account::INSTANCE_ACTOR_ID, actor_type: 'Application', locked: true, username: Rails.configuration.x.local_domain)
   end
 
   def down
-    Account.find_by(id: -99, actor_type: 'Application').destroy!
+    Account.find_by(id: Account::INSTANCE_ACTOR_ID, actor_type: 'Application').destroy!
   end
 end
diff --git a/db/post_migrate/20220704024901_migrate_settings_to_user_roles.rb b/db/post_migrate/20220704024901_migrate_settings_to_user_roles.rb
index 00afee26d0c8d5..42dc37f08b42ed 100644
--- a/db/post_migrate/20220704024901_migrate_settings_to_user_roles.rb
+++ b/db/post_migrate/20220704024901_migrate_settings_to_user_roles.rb
@@ -3,7 +3,9 @@
 class MigrateSettingsToUserRoles < ActiveRecord::Migration[6.1]
   disable_ddl_transaction!
 
-  class UserRole < ApplicationRecord; end
+  class UserRole < ApplicationRecord
+    EVERYONE_ROLE_ID = -99
+  end
 
   def up
     process_role_everyone
@@ -17,7 +19,7 @@ def down; end
   private
 
   def process_role_everyone
-    everyone_role = UserRole.find_by(id: -99)
+    everyone_role = UserRole.find_by(id: UserRole::EVERYONE_ROLE_ID)
     return unless everyone_role
 
     everyone_role.permissions &= ~::UserRole::FLAGS[:invite_users] unless min_invite_role == 'user'
diff --git a/db/seeds/02_instance_actor.rb b/db/seeds/02_instance_actor.rb
index 55e83e8a0815ca..2b6befec0d98e7 100644
--- a/db/seeds/02_instance_actor.rb
+++ b/db/seeds/02_instance_actor.rb
@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-Account.create_with(actor_type: 'Application', locked: true, username: 'mastodon.internal').find_or_create_by(id: -99)
+Account.create_with(actor_type: 'Application', locked: true, username: 'mastodon.internal').find_or_create_by(id: Account::INSTANCE_ACTOR_ID)
diff --git a/lib/tasks/tests.rake b/lib/tasks/tests.rake
index 885be79f4168dc..935f6d24a38eaa 100644
--- a/lib/tasks/tests.rake
+++ b/lib/tasks/tests.rake
@@ -50,7 +50,7 @@ namespace :tests do
         exit(1)
       end
 
-      if Account.find(-99).private_key.blank?
+      if Account.find(Account::INSTANCE_ACTOR_ID).private_key.blank?
         puts 'Instance actor does not have a private key'
         exit(1)
       end
diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb
index b1dca52dc5e916..f6376eb36e7789 100644
--- a/spec/models/account_spec.rb
+++ b/spec/models/account_spec.rb
@@ -746,13 +746,13 @@
       end
 
       it 'is valid if we are creating an instance actor account with a period' do
-        account = Fabricate.build(:account, id: -99, actor_type: 'Application', locked: true, username: 'example.com')
+        account = Fabricate.build(:account, id: described_class::INSTANCE_ACTOR_ID, actor_type: 'Application', locked: true, username: 'example.com')
         expect(account.valid?).to be true
       end
 
       it 'is valid if we are creating a possibly-conflicting instance actor account' do
         _account = Fabricate(:account, username: 'examplecom')
-        instance_account = Fabricate.build(:account, id: -99, actor_type: 'Application', locked: true, username: 'example.com')
+        instance_account = Fabricate.build(:account, id: described_class::INSTANCE_ACTOR_ID, actor_type: 'Application', locked: true, username: 'example.com')
         expect(instance_account.valid?).to be true
       end
 
diff --git a/spec/models/user_role_spec.rb b/spec/models/user_role_spec.rb
index d5234ebe8d96a9..9dd04a8172e424 100644
--- a/spec/models/user_role_spec.rb
+++ b/spec/models/user_role_spec.rb
@@ -164,12 +164,12 @@
   end
 
   describe '#everyone?' do
-    it 'returns true when id is -99' do
-      subject.id = -99
+    it 'returns true when id matches the everyone id' do
+      subject.id = described_class::EVERYONE_ROLE_ID
       expect(subject.everyone?).to be true
     end
 
-    it 'returns false when id is not -99' do
+    it 'returns false when id does not match the everyone id' do
       subject.id = 123
       expect(subject.everyone?).to be false
     end

From 63f4ea055aceff47ae47eabe6da103af05ffafd5 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 19 Feb 2024 12:09:58 +0100
Subject: [PATCH 0145/2191] Change follow suggestions design in web UI (#29272)

---
 .../components/inline_follow_suggestions.jsx  | 25 ++++++++++++++++---
 app/javascript/mastodon/locales/en.json       |  7 +++++-
 .../styles/mastodon/components.scss           |  9 +++++--
 3 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/app/javascript/mastodon/features/home_timeline/components/inline_follow_suggestions.jsx b/app/javascript/mastodon/features/home_timeline/components/inline_follow_suggestions.jsx
index f76526e04502e2..c39b43badefac0 100644
--- a/app/javascript/mastodon/features/home_timeline/components/inline_follow_suggestions.jsx
+++ b/app/javascript/mastodon/features/home_timeline/components/inline_follow_suggestions.jsx
@@ -21,6 +21,7 @@ import { DisplayName } from 'mastodon/components/display_name';
 import { Icon } from 'mastodon/components/icon';
 import { IconButton } from 'mastodon/components/icon_button';
 import { VerifiedBadge } from 'mastodon/components/verified_badge';
+import { domain } from 'mastodon/initial_state';
 
 const messages = defineMessages({
   follow: { id: 'account.follow', defaultMessage: 'Follow' },
@@ -28,27 +29,43 @@ const messages = defineMessages({
   previous: { id: 'lightbox.previous', defaultMessage: 'Previous' },
   next: { id: 'lightbox.next', defaultMessage: 'Next' },
   dismiss: { id: 'follow_suggestions.dismiss', defaultMessage: "Don't show again" },
+  friendsOfFriendsHint: { id: 'follow_suggestions.hints.friends_of_friends', defaultMessage: 'This profile is popular among the people you follow.' },
+  similarToRecentlyFollowedHint: { id: 'follow_suggestions.hints.similar_to_recently_followed', defaultMessage: 'This profile is similar to the profiles you have most recently followed.' },
+  featuredHint: { id: 'follow_suggestions.hints.featured', defaultMessage: 'This profile has been hand-picked by the {domain} team.' },
+  mostFollowedHint: { id: 'follow_suggestions.hints.most_followed', defaultMessage: 'This profile is one of the most followed on {domain}.'},
+  mostInteractionsHint: { id: 'follow_suggestions.hints.most_interactions', defaultMessage: 'This profile has been recently getting a lot of attention on {domain}.' },
 });
 
 const Source = ({ id }) => {
-  let label;
+  const intl = useIntl();
+
+  let label, hint;
 
   switch (id) {
   case 'friends_of_friends':
+    hint = intl.formatMessage(messages.friendsOfFriendsHint);
+    label = <FormattedMessage id='follow_suggestions.personalized_suggestion' defaultMessage='Personalized suggestion' />;
+    break;
   case 'similar_to_recently_followed':
+    hint = intl.formatMessage(messages.similarToRecentlyFollowedHint);
     label = <FormattedMessage id='follow_suggestions.personalized_suggestion' defaultMessage='Personalized suggestion' />;
     break;
   case 'featured':
-    label = <FormattedMessage id='follow_suggestions.curated_suggestion' defaultMessage="Editors' Choice" />;
+    hint = intl.formatMessage(messages.featuredHint, { domain });
+    label = <FormattedMessage id='follow_suggestions.curated_suggestion' defaultMessage='Staff pick' />;
     break;
   case 'most_followed':
+    hint = intl.formatMessage(messages.mostFollowedHint, { domain });
+    label = <FormattedMessage id='follow_suggestions.popular_suggestion' defaultMessage='Popular suggestion' />;
+    break;
   case 'most_interactions':
+    hint = intl.formatMessage(messages.mostInteractionsHint, { domain });
     label = <FormattedMessage id='follow_suggestions.popular_suggestion' defaultMessage='Popular suggestion' />;
     break;
   }
 
   return (
-    <div className='inline-follow-suggestions__body__scrollable__card__text-stack__source'>
+    <div className='inline-follow-suggestions__body__scrollable__card__text-stack__source' title={hint}>
       <Icon icon={InfoIcon} />
       {label}
     </div>
@@ -92,7 +109,7 @@ const Card = ({ id, sources }) => {
         {firstVerifiedField ? <VerifiedBadge link={firstVerifiedField.get('value')} /> : <Source id={sources.get(0)} />}
       </div>
 
-      <Button text={intl.formatMessage(following ? messages.unfollow : messages.follow)} onClick={handleFollow} />
+      <Button text={intl.formatMessage(following ? messages.unfollow : messages.follow)} secondary={following} onClick={handleFollow} />
     </div>
   );
 };
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index 12d0068d69eafc..342b4c6e2599b2 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -277,8 +277,13 @@
   "follow_request.authorize": "Authorize",
   "follow_request.reject": "Reject",
   "follow_requests.unlocked_explanation": "Even though your account is not locked, the {domain} staff thought you might want to review follow requests from these accounts manually.",
-  "follow_suggestions.curated_suggestion": "Editors' Choice",
+  "follow_suggestions.curated_suggestion": "Staff pick",
   "follow_suggestions.dismiss": "Don't show again",
+  "follow_suggestions.hints.featured": "This profile has been hand-picked by the {domain} team.",
+  "follow_suggestions.hints.friends_of_friends": "This profile is popular among the people you follow.",
+  "follow_suggestions.hints.most_followed": "This profile is one of the most followed on {domain}.",
+  "follow_suggestions.hints.most_interactions": "This profile has been recently getting a lot of attention on {domain}.",
+  "follow_suggestions.hints.similar_to_recently_followed": "This profile is similar to the profiles you have most recently followed.",
   "follow_suggestions.personalized_suggestion": "Personalized suggestion",
   "follow_suggestions.popular_suggestion": "Popular suggestion",
   "follow_suggestions.view_all": "View all",
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index af9fc88e7bbe1d..605b5d4b55838d 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -9416,6 +9416,7 @@ noscript {
   flex-direction: column;
   gap: 12px;
   padding: 16px 0;
+  padding-bottom: 0;
   border-bottom: 1px solid mix($ui-base-color, $ui-highlight-color, 75%);
   background: mix($ui-base-color, $ui-highlight-color, 95%);
 
@@ -9454,6 +9455,7 @@ noscript {
       cursor: pointer;
       top: 0;
       color: $primary-text-color;
+      opacity: 0.5;
 
       &.left {
         left: 0;
@@ -9481,6 +9483,8 @@ noscript {
       &:hover,
       &:focus,
       &:active {
+        opacity: 1;
+
         .inline-follow-suggestions__body__scroll-button__icon {
           background: lighten($ui-highlight-color, 4%);
         }
@@ -9492,11 +9496,10 @@ noscript {
       flex-wrap: nowrap;
       gap: 16px;
       padding: 16px;
-      padding-bottom: 0;
       scroll-snap-type: x mandatory;
       scroll-padding: 16px;
       scroll-behavior: smooth;
-      overflow-x: hidden;
+      overflow-x: scroll;
 
       &__card {
         background: darken($ui-base-color, 4%);
@@ -9521,6 +9524,7 @@ noscript {
           position: absolute;
           inset-inline-end: 8px;
           top: 8px;
+          opacity: 0.75;
         }
 
         &__avatar {
@@ -9558,6 +9562,7 @@ noscript {
             gap: 4px;
             overflow: hidden;
             white-space: nowrap;
+            cursor: help;
 
             > span {
               overflow: hidden;

From fe6c055f356dca08907ea5e21cb361a138759894 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 19 Feb 2024 11:10:03 +0000
Subject: [PATCH 0146/2191] Update dependency eslint-plugin-jsdoc to v48.1.0
 (#29275)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 6088034d9bd88a..6ef5386d7af96d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7347,8 +7347,8 @@ __metadata:
   linkType: hard
 
 "eslint-plugin-jsdoc@npm:^48.0.0":
-  version: 48.0.6
-  resolution: "eslint-plugin-jsdoc@npm:48.0.6"
+  version: 48.1.0
+  resolution: "eslint-plugin-jsdoc@npm:48.1.0"
   dependencies:
     "@es-joy/jsdoccomment": "npm:~0.42.0"
     are-docs-informative: "npm:^0.0.2"
@@ -7361,7 +7361,7 @@ __metadata:
     spdx-expression-parse: "npm:^4.0.0"
   peerDependencies:
     eslint: ^7.0.0 || ^8.0.0 || ^9.0.0
-  checksum: 7762793fb2a738d248144346e85b8c7ec2f975be1a24d45984a5d24da03723b76c66ead1b8064d60b18be09a9a9835320036a39fef917a1b6c83b916729d70dd
+  checksum: e0fb3fb4479b6ee539b8c1b626de625ff5d24408f695fcbf648e214854fea9ea3e29b77f56b177bf38655e30a6c9a6eaaff93ef990f69c454c74e180747e39e5
   languageName: node
   linkType: hard
 

From ad16362efe5f1c753c86847b6cb7a2ea5add3229 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 19 Feb 2024 14:25:45 +0100
Subject: [PATCH 0147/2191] New Crowdin Translations (automated) (#29255)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/cs.json    | 23 ++++---
 app/javascript/mastodon/locales/en-GB.json |  2 +-
 app/javascript/mastodon/locales/eo.json    |  2 +-
 app/javascript/mastodon/locales/fil.json   | 53 +++++++++++++++-
 app/javascript/mastodon/locales/kab.json   | 17 ++++-
 app/javascript/mastodon/locales/ms.json    | 34 ++++++++++
 app/javascript/mastodon/locales/nl.json    |  6 +-
 app/javascript/mastodon/locales/vi.json    |  2 +-
 config/locales/cs.yml                      | 72 ++++++++++++++++++++--
 config/locales/devise.bg.yml               |  1 +
 config/locales/devise.cs.yml               | 20 ++++--
 config/locales/devise.cy.yml               |  1 +
 config/locales/devise.lt.yml               |  1 +
 config/locales/devise.th.yml               |  1 +
 config/locales/devise.vi.yml               |  1 +
 config/locales/doorkeeper.cs.yml           |  2 +-
 config/locales/kab.yml                     |  1 +
 config/locales/nl.yml                      |  2 +-
 config/locales/simple_form.cs.yml          | 25 +++++++-
 config/locales/simple_form.nl.yml          |  4 +-
 config/locales/sk.yml                      |  2 +
 21 files changed, 240 insertions(+), 32 deletions(-)

diff --git a/app/javascript/mastodon/locales/cs.json b/app/javascript/mastodon/locales/cs.json
index 24248db15cca81..2856ac4a45eba5 100644
--- a/app/javascript/mastodon/locales/cs.json
+++ b/app/javascript/mastodon/locales/cs.json
@@ -237,7 +237,7 @@
   "empty_column.follow_requests": "Zatím nemáte žádné žádosti o sledování. Až nějakou obdržíte, zobrazí se zde.",
   "empty_column.followed_tags": "Zatím jste nesledovali žádné hashtagy. Až to uděláte, objeví se zde.",
   "empty_column.hashtag": "Pod tímto hashtagem zde zatím nic není.",
-  "empty_column.home": "Vaše domovská časová osa je prázdná! Naplňte ji sledováním dalších lidí. {suggestions}",
+  "empty_column.home": "Vaše domovská časová osa je prázdná! Naplňte ji sledováním dalších lidí.",
   "empty_column.list": "V tomto seznamu zatím nic není. Až nějaký člen z tohoto seznamu zveřejní nový příspěvek, objeví se zde.",
   "empty_column.lists": "Zatím nemáte žádné seznamy. Až nějaký vytvoříte, zobrazí se zde.",
   "empty_column.mutes": "Zatím jste neskryli žádného uživatele.",
@@ -277,8 +277,11 @@
   "follow_request.authorize": "Autorizovat",
   "follow_request.reject": "Zamítnout",
   "follow_requests.unlocked_explanation": "Přestože váš účet není zamčený, administrátor {domain} usoudil, že byste mohli chtít tyto žádosti o sledování zkontrolovat ručně.",
+  "follow_suggestions.curated_suggestion": "Návrh serveru",
   "follow_suggestions.dismiss": "Znovu nezobrazovat",
+  "follow_suggestions.personalized_suggestion": "Přizpůsobený návrh",
   "follow_suggestions.popular_suggestion": "Populární návrh",
+  "follow_suggestions.view_all": "Zobrazit vše",
   "follow_suggestions.who_to_follow": "Koho sledovat",
   "followed_tags": "Sledované hashtagy",
   "footer.about": "O aplikaci",
@@ -300,8 +303,12 @@
   "hashtag.column_settings.tag_mode.any": "Jakýkoliv z těchto",
   "hashtag.column_settings.tag_mode.none": "Žádný z těchto",
   "hashtag.column_settings.tag_toggle": "Zahrnout v tomto sloupci další štítky",
+  "hashtag.counter_by_accounts": "{count, plural, one {{counter} účastník} few {{counter} účastníci} other {{counter} účastníků}}",
+  "hashtag.counter_by_uses": "{count, plural, one {{counter} příspěvek} few {{counter} příspěvky} other {{counter} příspěvků}}",
+  "hashtag.counter_by_uses_today": "Dnes {count, plural, one {{counter} příspěvek} few {{counter} příspěvky} other {{counter} příspěvků}}",
   "hashtag.follow": "Sledovat hashtag",
   "hashtag.unfollow": "Přestat sledovat hashtag",
+  "hashtags.and_other": "…a {count, plural, one {# další} few {# další} other {# dalších}}",
   "home.column_settings.basic": "Základní",
   "home.column_settings.show_reblogs": "Zobrazit boosty",
   "home.column_settings.show_replies": "Zobrazit odpovědi",
@@ -471,8 +478,8 @@
   "onboarding.actions.go_to_home": "Přejít na svůj domovský feed",
   "onboarding.compose.template": "Ahoj #Mastodon!",
   "onboarding.follows.empty": "Bohužel, žádné výsledky nelze momentálně zobrazit. Můžete zkusit vyhledat nebo procházet stránku s průzkumem a najít lidi, kteří budou sledovat, nebo to zkuste znovu později.",
-  "onboarding.follows.lead": "You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!",
-  "onboarding.follows.title": "Populární na Mastodonu",
+  "onboarding.follows.lead": "Domovský kanál je hlavní metodou zažívání Mastodonu. Čím více lidí sledujete, tím aktivnější a zajímavější bude. Pro začnutí, zde máte několik návrhů:",
+  "onboarding.follows.title": "Přispůsobit vlastní domovský kanál",
   "onboarding.profile.discoverable": "Udělat svůj profil vyhledatelným",
   "onboarding.profile.discoverable_hint": "Když se rozhodnete být vyhledatelný na Mastodonu, vaše příspěvky se mohou objevit ve výsledcích vyhledávání a v populárních, a váš profil může být navrhován lidem s podobnými zájmy.",
   "onboarding.profile.display_name": "Zobrazované jméno",
@@ -491,13 +498,13 @@
   "onboarding.start.lead": "Your new Mastodon account is ready to go. Here's how you can make the most of it:",
   "onboarding.start.skip": "Want to skip right ahead?",
   "onboarding.start.title": "Dokázali jste to!",
-  "onboarding.steps.follow_people.body": "You curate your own feed. Lets fill it with interesting people.",
-  "onboarding.steps.follow_people.title": "Follow {count, plural, one {one person} other {# people}}",
-  "onboarding.steps.publish_status.body": "Řekněte světu Ahoj.",
+  "onboarding.steps.follow_people.body": "Mastodon je o sledování zajimavých lidí.",
+  "onboarding.steps.follow_people.title": "Přispůsobit vlastní domovský kanál",
+  "onboarding.steps.publish_status.body": "Řekněte světu ahoj s pomocí textem, fotografiemi, videami nebo anketami {emoji}",
   "onboarding.steps.publish_status.title": "Vytvořte svůj první příspěvek",
   "onboarding.steps.setup_profile.body": "Others are more likely to interact with you with a filled out profile.",
   "onboarding.steps.setup_profile.title": "Přizpůsobit svůj profil",
-  "onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
+  "onboarding.steps.share_profile.body": "Dejte blízkým lidem vědět, jak vás mohou najít na Mastodonu",
   "onboarding.steps.share_profile.title": "Sdílejte svůj profil",
   "onboarding.tips.2fa": "<strong>Víte, že?</strong> Svůj účet můžete zabezpečit nastavením dvoufaktorového ověřování v nastavení účtu. Funguje s jakoukoli TOTP aplikací podle vašeho výběru, telefonní číslo není nutné!",
   "onboarding.tips.accounts_from_other_servers": "<strong>Víte, že?</strong> Protože je Mastodon decentralizovaný, některé profily, na které narazíte, budou hostovány na jiných serverech, než je ten váš. A přesto s nimi můžete bezproblémově komunikovat! Jejich server se nachází v druhé polovině uživatelského jména!",
@@ -525,6 +532,7 @@
   "privacy.public.short": "Veřejné",
   "privacy.unlisted.additional": "Chová se stejně jako veřejný, až na to, že se příspěvek neobjeví v živých kanálech nebo hashtazích, v objevování nebo vyhledávání na Mastodonu, a to i když je účet nastaven tak, aby se zde všude tyto příspěvky zobrazovaly.",
   "privacy.unlisted.long": "Méně algoritmických fanfár",
+  "privacy.unlisted.short": "Ztišené veřejné",
   "privacy_policy.last_updated": "Naposledy aktualizováno {date}",
   "privacy_policy.title": "Zásady ochrany osobních údajů",
   "recommended": "Doporučeno",
@@ -542,6 +550,7 @@
   "relative_time.minutes": "{number} m",
   "relative_time.seconds": "{number} s",
   "relative_time.today": "dnes",
+  "reply_indicator.attachments": "{count, plural, one {{counter} příloha} few {{counter} přílohy} other {{counter} přilohů}}",
   "reply_indicator.cancel": "Zrušit",
   "reply_indicator.poll": "Anketa",
   "report.block": "Blokovat",
diff --git a/app/javascript/mastodon/locales/en-GB.json b/app/javascript/mastodon/locales/en-GB.json
index 3431d95cb6ec4f..84cba3092f3b94 100644
--- a/app/javascript/mastodon/locales/en-GB.json
+++ b/app/javascript/mastodon/locales/en-GB.json
@@ -308,7 +308,7 @@
   "hashtag.counter_by_uses_today": "{count, plural, one {{counter} post} other {{counter} posts}} today",
   "hashtag.follow": "Follow hashtag",
   "hashtag.unfollow": "Unfollow hashtag",
-  "hashtags.and_other": "…and {count, plural, one {}other {# more}}",
+  "hashtags.and_other": "…and {count, plural, one {one more} other {# more}}",
   "home.column_settings.basic": "Basic",
   "home.column_settings.show_reblogs": "Show boosts",
   "home.column_settings.show_replies": "Show replies",
diff --git a/app/javascript/mastodon/locales/eo.json b/app/javascript/mastodon/locales/eo.json
index 887d754a4094a4..911502d85ff891 100644
--- a/app/javascript/mastodon/locales/eo.json
+++ b/app/javascript/mastodon/locales/eo.json
@@ -115,7 +115,7 @@
   "column.directory": "Foliumi la profilojn",
   "column.domain_blocks": "Blokitaj domajnoj",
   "column.favourites": "Stelumoj",
-  "column.firehose": "Vivantaj fluoj",
+  "column.firehose": "Rektaj fluoj",
   "column.follow_requests": "Petoj de sekvado",
   "column.home": "Hejmo",
   "column.lists": "Listoj",
diff --git a/app/javascript/mastodon/locales/fil.json b/app/javascript/mastodon/locales/fil.json
index b677f9d197453b..938251e5f55ffc 100644
--- a/app/javascript/mastodon/locales/fil.json
+++ b/app/javascript/mastodon/locales/fil.json
@@ -46,7 +46,9 @@
   "account.report": "I-ulat si/ang @{name}",
   "account.requested_follow": "Hinihiling ni {name} na sundan ka",
   "account.show_reblogs": "Ipakita ang mga pagpapalakas mula sa/kay {name}",
+  "account.unendorse": "Huwag itampok sa profile",
   "admin.dashboard.retention.cohort_size": "Mga bagong tagagamit",
+  "alert.rate_limited.message": "Mangyaring subukan muli pagkatapos ng {retry_time, time, medium}.",
   "bundle_column_error.error.title": "Naku!",
   "bundle_column_error.network.body": "Nagkaroon ng kamalian habang sinusubukang i-karga ang pahinang ito. Maaaring dahil ito sa pansamantalang problema ng iyong koneksyon sa internet o ang server na ito.",
   "bundle_column_error.network.title": "Kamaliang network",
@@ -107,6 +109,7 @@
   "confirmations.block.message": "Sigurado ka bang gusto mong harangan si {name}?",
   "confirmations.cancel_follow_request.confirm": "Bawiin ang kahilingan",
   "confirmations.cancel_follow_request.message": "Sigurdo ka bang gusto mong bawiin ang kahilingang sundan si/ang {name}?",
+  "confirmations.discard_edit_media.confirm": "Ipagpaliban",
   "confirmations.domain_block.confirm": "Harangan ang buong domain",
   "confirmations.edit.confirm": "Baguhin",
   "confirmations.reply.confirm": "Tumugon",
@@ -175,10 +178,14 @@
   "hashtag.column_header.tag_mode.all": "at {additional}",
   "hashtag.column_header.tag_mode.any": "o {additional}",
   "home.pending_critical_update.body": "Mangyaring i-update ang iyong serbiro ng Mastodon sa lalong madaling panahon!",
+  "interaction_modal.login.action": "Iuwi mo ako",
   "interaction_modal.no_account_yet": "Wala sa Mastodon?",
   "interaction_modal.on_another_server": "Sa ibang serbiro",
   "interaction_modal.on_this_server": "Sa serbirong ito",
   "interaction_modal.title.follow": "Sundan si {name}",
+  "intervals.full.days": "{number, plural, one {# araw} other {# na araw}}",
+  "intervals.full.hours": "{number, plural, one {# oras} other {# na oras}}",
+  "intervals.full.minutes": "{number, plural, one {# minuto} other {# na minuto}}",
   "keyboard_shortcuts.description": "Paglalarawan",
   "keyboard_shortcuts.down": "Ilipat pababa sa talaan",
   "keyboard_shortcuts.requests": "Buksan ang talaan ng mga kahilingan sa pagsunod",
@@ -186,35 +193,72 @@
   "lightbox.close": "Isara",
   "lightbox.next": "Susunod",
   "lightbox.previous": "Nakaraan",
+  "link_preview.author": "Ni/ng {name}",
+  "lists.account.add": "Idagdag sa talaan",
+  "lists.account.remove": "Tanggalin mula sa talaan",
   "lists.new.create": "Idagdag sa talaan",
   "lists.new.title_placeholder": "Bagong pangalan ng talaan",
   "lists.replies_policy.title": "Ipakita ang mga tugon sa:",
   "lists.subheading": "Iyong mga talaan",
+  "loading_indicator.label": "Kumakarga…",
   "navigation_bar.about": "Tungkol dito",
   "navigation_bar.blocks": "Nakaharang na mga tagagamit",
   "navigation_bar.favourites": "Mga paborito",
   "navigation_bar.lists": "Mga listahan",
+  "navigation_bar.search": "Maghanap",
   "notification.admin.report": "Iniulat ni {name} si {target}",
   "notification.follow": "Sinundan ka ni {name}",
   "notification.follow_request": "Hinihiling ni {name} na sundan ka",
+  "notification.mention": "Binanggit ka ni {name}",
   "notifications.column_settings.admin.report": "Mga bagong ulat:",
   "notifications.column_settings.favourite": "Mga paborito:",
   "notifications.column_settings.follow": "Mga bagong tagasunod:",
+  "notifications.column_settings.update": "Mga pagbago:",
   "notifications.filter.all": "Lahat",
   "onboarding.action.back": "Ibalik mo ako",
   "onboarding.actions.back": "Ibalik mo ako",
+  "onboarding.profile.save_and_continue": "Iimbak at magpatuloy",
   "onboarding.share.next_steps": "Mga posibleng susunod na hakbang:",
   "poll.voted": "Binoto mo para sa sagot na ito",
+  "poll_button.remove_poll": "Tanggalin ang boto",
+  "relative_time.days": "{number}a",
+  "relative_time.full.days": "{number, plural, one {# araw} other {# na araw}} ang nakalipas",
+  "relative_time.full.hours": "{number, plural, one {# oras} other {# na oras}} ang nakalipas",
   "relative_time.full.just_now": "ngayon lang",
+  "relative_time.full.minutes": "{number, plural, one {# minuto} other {# na minuto}} ang nakalipas",
+  "relative_time.full.seconds": "{number, plural, one {# segundo} other {# na segundo}} ang nakalipas",
+  "relative_time.hours": "{number}o",
   "relative_time.just_now": "ngayon",
+  "relative_time.minutes": "{number}m",
+  "relative_time.seconds": "{number}s",
   "reply_indicator.cancel": "Ipagpaliban",
   "report.block": "Harangan",
   "report.categories.other": "Iba pa",
+  "report.category.title": "Sabihin mo sa amin kung anong nangyari sa {type} na ito",
   "report.close": "Tapos na",
   "report.next": "Sunod",
+  "report.reasons.violation": "Lumalabag ito sa mga panuntunan ng serbiro",
+  "report.reasons.violation_description": "Alam mo na lumalabag ito sa mga partikular na panuntunan",
+  "report.rules.title": "Aling mga patakaran ang nilabag?",
+  "report.submit": "Isumite",
+  "report.target": "Iniulat si/ang {target}",
+  "report.thanks.take_action_actionable": "Habang sinusuri namin ito, maaari kang gumawa ng aksyon laban kay/sa {name}:",
+  "report.thanks.title": "Ayaw mo bang makita ito?",
+  "report.thanks.title_actionable": "Salamat sa pag-uulat, titingnan namin ito.",
+  "report_notification.categories.other": "Iba pa",
+  "search_results.all": "Lahat",
   "server_banner.learn_more": "Matuto nang higit pa",
+  "status.direct_indicator": "Palihim na banggit",
+  "status.edit": "Baguhin",
+  "status.edited": "Binago noong {date}",
+  "status.edited_x_times": "Binago {count, plural, one {{count} beses} other {{count} na beses}}",
+  "status.history.created": "Nilikha ni/ng {name} {date}",
+  "status.history.edited": "Binago ni/ng {name} {date}",
+  "status.mention": "Banggitin ang/si @{name}",
   "status.more": "Higit pa",
   "status.reply": "Tumugon",
+  "status.report": "I-ulat si/ang @{name}",
+  "status.sensitive_warning": "Sensitibong nilalaman",
   "status.share": "Ibahagi",
   "status.show_less": "Magpakita ng mas kaunti",
   "status.show_less_all": "Magpakita ng mas kaunti para sa lahat",
@@ -222,5 +266,12 @@
   "status.show_more_all": "Magpakita ng higit pa para sa lahat",
   "status.translate": "Isalin",
   "status.translated_from_with": "Isalin mula sa {lang} gamit ang {provider}",
-  "status.uncached_media_warning": "Hindi makuha ang paunang tigin"
+  "status.uncached_media_warning": "Hindi makuha ang paunang tigin",
+  "time_remaining.days": "{number, plural, one {# araw} other {# na araw}} ang natitira",
+  "time_remaining.hours": "{number, plural, one {# oras} other {# na oras}} ang natitira",
+  "time_remaining.minutes": "{number, plural, one {# minuto} other {# na minuto}} ang natitira",
+  "time_remaining.seconds": "{number, plural, one {# segundo} other {# na segundo}} ang natitira",
+  "timeline_hint.remote_resource_not_displayed": "Hindi ipinapakita ang {resource} mula sa ibang mga serbiro.",
+  "timeline_hint.resources.followers": "Mga tagasunod",
+  "timeline_hint.resources.follows": "Mga sinusundan"
 }
diff --git a/app/javascript/mastodon/locales/kab.json b/app/javascript/mastodon/locales/kab.json
index b69e93952b5548..45c6fb321d133f 100644
--- a/app/javascript/mastodon/locales/kab.json
+++ b/app/javascript/mastodon/locales/kab.json
@@ -26,6 +26,7 @@
   "account.follows.empty": "Ar tura, amseqdac-agi ur yeṭṭafaṛ yiwen.",
   "account.go_to_profile": "Ddu ɣer umaɣnu",
   "account.hide_reblogs": "Ffer ayen i ibeṭṭu @{name}",
+  "account.joined_short": "Izeddi da",
   "account.link_verified_on": "Taɣara n useɣwen-a tettwasenqed ass n {date}",
   "account.locked_info": "Amiḍan-agi uslig isekweṛ. D bab-is kan i izemren ad yeǧǧ, s ufus-is, win ara t-iḍefṛen.",
   "account.media": "Timidyatin",
@@ -67,6 +68,7 @@
   "bundle_modal_error.message": "Tella-d kra n tuccḍa mi d-yettali ugbur-agi.",
   "bundle_modal_error.retry": "Ɛreḍ tikelt-nniḍen",
   "closed_registrations_modal.find_another_server": "Aff-d aqeddac nniḍen",
+  "closed_registrations_modal.title": "Ajerred deg Masṭudun",
   "column.about": "Ɣef",
   "column.blocks": "Imiḍanen yettusḥebsen",
   "column.bookmarks": "Ticraḍ",
@@ -95,6 +97,7 @@
   "compose.language.change": "Beddel tutlayt",
   "compose.language.search": "Nadi tutlayin …",
   "compose.published.open": "Ldi",
+  "compose.saved.body": "Tettwasekles tsuffeɣt.",
   "compose_form.direct_message_warning_learn_more": "Issin ugar",
   "compose_form.encryption_warning": "",
   "compose_form.hashtag_warning": "",
@@ -104,6 +107,7 @@
   "compose_form.poll.duration": "Tanzagt n tefrant",
   "compose_form.poll.option_placeholder": "Taxtiṛt {number}",
   "compose_form.poll.single": "Fren yiwen",
+  "compose_form.publish": "Suffeɣ",
   "compose_form.publish_form": "Tasuffeɣt tamaynut",
   "compose_form.reply": "Err",
   "compose_form.save_changes": "Leqqem",
@@ -163,7 +167,7 @@
   "empty_column.account_timeline": "Ulac tisuffaɣ da !",
   "empty_column.account_unavailable": "Ur nufi ara amaɣnu-ayi",
   "empty_column.blocks": "Ur tesḥebseḍ ula yiwen n umseqdac ar tura.",
-  "empty_column.bookmarked_statuses": "Ulac tijewwaqin i terniḍ ɣer yismenyifen-ik ar tura. Ticki terniḍ yiwet, ad d-tettwasken da.",
+  "empty_column.bookmarked_statuses": "Ulac kra n tsuffeɣt i terniḍ ɣer yismenyifen-ik·im ar tura. Ticki terniḍ yiwet, ad d-tettwasken da.",
   "empty_column.community": "Tasuddemt tazayezt tadigant n yisallen d tilemt. Aru ihi kra akken ad tt-teččareḍ!",
   "empty_column.domain_blocks": "Ulac kra n taɣult yettwaffren ar tura.",
   "empty_column.follow_requests": "Ulac ɣur-k ula yiwen n usuter n teḍfeṛt. Ticki teṭṭfeḍ-d yiwen ad d-yettwasken da.",
@@ -190,6 +194,7 @@
   "firehose.local": "Deg uqeddac-ayi",
   "follow_request.authorize": "Ssireg",
   "follow_request.reject": "Agi",
+  "follow_suggestions.who_to_follow": "Menhu ara ḍefṛeḍ",
   "followed_tags": "Ihacṭagen yettwaḍfaren",
   "footer.about": "Ɣef",
   "footer.directory": "Akaram n imaɣnuten",
@@ -209,6 +214,8 @@
   "hashtag.column_settings.tag_mode.any": "Yiwen seg-sen",
   "hashtag.column_settings.tag_mode.none": "Yiwen ala seg-sen",
   "hashtag.column_settings.tag_toggle": "Glu-d s yihacṭagen imerna i ujgu-agi",
+  "hashtag.counter_by_uses": "{count, plural, one {{counter} n tsuffeɣt} other {{counter} n tsuffaɣ}}",
+  "hashtag.counter_by_uses_today": "{count, plural, one {{counter} n tsuffeɣt} other {{counter} n tsuffaɣ}} assa",
   "hashtag.follow": "Ḍfeṛ ahacṭag",
   "home.column_settings.basic": "Igejdanen",
   "home.column_settings.show_reblogs": "Ssken-d beṭṭu",
@@ -289,6 +296,7 @@
   "navigation_bar.favourites": "Imenyafen",
   "navigation_bar.filters": "Awalen i yettwasgugmen",
   "navigation_bar.follow_requests": "Isuturen n teḍfeṛt",
+  "navigation_bar.followed_tags": "Ihacṭagen yettwaḍfaren",
   "navigation_bar.follows_and_followers": "Imeḍfaṛen akked wid i teṭṭafaṛeḍ",
   "navigation_bar.lists": "Tibdarin",
   "navigation_bar.logout": "Ffeɣ",
@@ -300,7 +308,7 @@
   "navigation_bar.search": "Nadi",
   "navigation_bar.security": "Taɣellist",
   "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
-  "notification.follow": "{name} yeṭṭafaṛ-ik",
+  "notification.follow": "iṭṭafar-ik·em-id {name}",
   "notification.follow_request": "{name} yessuter-d ad k-yeḍfeṛ",
   "notification.mention": "{name} yebder-ik-id",
   "notification.own_poll": "Tafrant-ik·im tfuk",
@@ -354,7 +362,7 @@
   "onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
   "onboarding.steps.share_profile.title": "Share your profile",
   "picture_in_picture.restore": "Err-it amkan-is",
-  "poll.closed": "Ifukk",
+  "poll.closed": "Tfukk",
   "poll.refresh": "Smiren",
   "poll.total_people": "{count, plural, one {# n wemdan} other {# n yemdanen}}",
   "poll.total_votes": "{count, plural, one {# n udɣaṛ} other {# n yedɣaṛen}}",
@@ -363,6 +371,7 @@
   "poll_button.add_poll": "Rnu asenqed",
   "poll_button.remove_poll": "Kkes asenqed",
   "privacy.change": "Seggem tabaḍnit n yizen",
+  "privacy.private.short": "Imeḍfaren",
   "privacy.public.short": "Azayez",
   "privacy_policy.title": "Tasertit tabaḍnit",
   "refresh": "Smiren",
@@ -400,6 +409,7 @@
   "search_popout.user": "amseqdac",
   "search_results.all": "Akk",
   "search_results.hashtags": "Ihacṭagen",
+  "search_results.see_all": "Wali-ten akk",
   "search_results.statuses": "Tisuffaɣ",
   "search_results.title": "Anadi ɣef {q}",
   "server_banner.administered_by": "Yettwadbel sɣur :",
@@ -419,6 +429,7 @@
   "status.edited_x_times": "Tettwaẓreg {count, plural, one {{count} n tikkelt} other {{count} n tikkal}}",
   "status.embed": "Seddu",
   "status.filtered": "Yettwasizdeg",
+  "status.hide": "Ffer tasuffeɣt",
   "status.load_more": "Sali ugar",
   "status.media_hidden": "Amidya yettwaffer",
   "status.mention": "Bder-d @{name}",
diff --git a/app/javascript/mastodon/locales/ms.json b/app/javascript/mastodon/locales/ms.json
index 2c3221cfddff61..c24ffc1d3a80be 100644
--- a/app/javascript/mastodon/locales/ms.json
+++ b/app/javascript/mastodon/locales/ms.json
@@ -21,6 +21,7 @@
   "account.blocked": "Disekat",
   "account.browse_more_on_origin_server": "Layari selebihnya di profil asal",
   "account.cancel_follow_request": "Menarik balik permintaan mengikut",
+  "account.copy": "Salin pautan ke profil",
   "account.direct": "Sebut secara persendirian @{name}",
   "account.disable_notifications": "Berhenti maklumkan saya apabila @{name} mengirim hantaran",
   "account.domain_blocked": "Domain disekat",
@@ -31,6 +32,7 @@
   "account.featured_tags.last_status_never": "Tiada hantaran",
   "account.featured_tags.title": "Tanda pagar pilihan {name}",
   "account.follow": "Ikuti",
+  "account.follow_back": "Ikut balik",
   "account.followers": "Pengikut",
   "account.followers.empty": "Belum ada yang mengikuti pengguna ini.",
   "account.followers_counter": "{count, plural, one {{counter} Pengikut} other {{counter} Pengikut}}",
@@ -51,6 +53,7 @@
   "account.mute_notifications_short": "Redam pemberitahuan",
   "account.mute_short": "Redam",
   "account.muted": "Dibisukan",
+  "account.mutual": "Rakan kongsi",
   "account.no_bio": "Tiada penerangan diberikan.",
   "account.open_original_page": "Buka halaman asal",
   "account.posts": "Hantaran",
@@ -143,11 +146,19 @@
   "compose_form.lock_disclaimer.lock": "dikunci",
   "compose_form.placeholder": "Apakah yang sedang anda fikirkan?",
   "compose_form.poll.duration": "Tempoh undian",
+  "compose_form.poll.multiple": "Pelbagai pilihan",
+  "compose_form.poll.option_placeholder": "Pilihan {number}",
+  "compose_form.poll.single": "Pilih satu",
   "compose_form.poll.switch_to_multiple": "Ubah kepada membenarkan aneka undian",
   "compose_form.poll.switch_to_single": "Ubah kepada undian pilihan tunggal",
+  "compose_form.poll.type": "Gaya",
+  "compose_form.publish": "Siaran",
   "compose_form.publish_form": "Terbit",
+  "compose_form.reply": "Balas",
+  "compose_form.save_changes": "Kemas kini",
   "compose_form.spoiler.marked": "Buang amaran kandungan",
   "compose_form.spoiler.unmarked": "Tambah amaran kandungan",
+  "compose_form.spoiler_placeholder": "Amaran kandungan (pilihan)",
   "confirmation_modal.cancel": "Batal",
   "confirmations.block.block_and_report": "Sekat & Lapor",
   "confirmations.block.confirm": "Sekat",
@@ -179,6 +190,7 @@
   "conversation.mark_as_read": "Tanda sudah dibaca",
   "conversation.open": "Lihat perbualan",
   "conversation.with": "Dengan {names}",
+  "copy_icon_button.copied": "Disalin ke papan klip",
   "copypaste.copied": "Disalin",
   "copypaste.copy_to_clipboard": "Salin ke papan klip",
   "directory.federated": "Dari fediverse yang diketahui",
@@ -210,6 +222,7 @@
   "emoji_button.search_results": "Hasil carian",
   "emoji_button.symbols": "Simbol",
   "emoji_button.travel": "Kembara & Tempat",
+  "empty_column.account_hides_collections": "Pengguna ini telah memilih untuk tidak menyediakan informasi tersebut",
   "empty_column.account_suspended": "Akaun digantung",
   "empty_column.account_timeline": "Tiada hantaran di sini!",
   "empty_column.account_unavailable": "Profil tidak tersedia",
@@ -264,6 +277,11 @@
   "follow_request.authorize": "Benarkan",
   "follow_request.reject": "Tolak",
   "follow_requests.unlocked_explanation": "Walaupun akaun anda tidak dikunci, kakitangan {domain} merasakan anda mungkin ingin menyemak permintaan ikutan daripada akaun ini secara manual.",
+  "follow_suggestions.curated_suggestion": "Pilihan Editor",
+  "follow_suggestions.dismiss": "Jangan papar lagi",
+  "follow_suggestions.personalized_suggestion": "Cadangan peribadi",
+  "follow_suggestions.popular_suggestion": "Cadangan terkenal",
+  "follow_suggestions.view_all": "Lihat semua",
   "followed_tags": "Topik terpilih",
   "footer.about": "Perihal",
   "footer.directory": "Direktori profil",
@@ -284,6 +302,9 @@
   "hashtag.column_settings.tag_mode.any": "Mana-mana daripada yang ini",
   "hashtag.column_settings.tag_mode.none": "Tiada apa pun daripada yang ini",
   "hashtag.column_settings.tag_toggle": "Sertakan tag tambahan untuk lajur ini",
+  "hashtag.counter_by_accounts": "{count, plural, other {{counter} peserta}}",
+  "hashtag.counter_by_uses": "{count, plural, other {{counter} siaran}}",
+  "hashtag.counter_by_uses_today": "{count, plural, other {{counter} siaran}} hari ini",
   "hashtag.follow": "Ikuti hashtag",
   "hashtag.unfollow": "Nyahikut tanda pagar",
   "hashtags.and_other": "…dan {count, plural, other {# more}}",
@@ -370,6 +391,7 @@
   "lists.search": "Cari dalam kalangan orang yang anda ikuti",
   "lists.subheading": "Senarai anda",
   "load_pending": "{count, plural, one {# item baharu} other {# item baharu}}",
+  "loading_indicator.label": "Memuatkan…",
   "media_gallery.toggle_visible": "{number, plural, other {Sembunyikan imej}}",
   "moved_to_account_banner.text": "Akaun anda {disabledAccount} kini dinyahdayakan kerana anda berpindah ke {movedToAccount}.",
   "mute_modal.duration": "Tempoh",
@@ -457,6 +479,11 @@
   "onboarding.follows.empty": "Malangnya, tiada hasil dapat ditunjukkan sekarang. Anda boleh cuba menggunakan carian atau menyemak imbas halaman teroka untuk mencari orang untuk diikuti atau cuba lagi kemudian.",
   "onboarding.follows.lead": "You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!",
   "onboarding.follows.title": "Popular on Mastodon",
+  "onboarding.profile.display_name": "Nama paparan",
+  "onboarding.profile.display_name_hint": "Nama penuh anda atau nama anda yang menyeronokkan…",
+  "onboarding.profile.note_hint": "Anda boleh @menyebut orang lain atau #hashtags…",
+  "onboarding.profile.save_and_continue": "Simpan dan teruskan",
+  "onboarding.profile.upload_avatar": "Muat naik gambar profil",
   "onboarding.share.lead": "Beritahu orang ramai bagaimana mereka boleh menemui anda di Mastodon!",
   "onboarding.share.message": "Saya {username} di #Mastodon! Jom ikut saya di {url}",
   "onboarding.share.next_steps": "Langkah seterusnya yang mungkin:",
@@ -490,9 +517,14 @@
   "poll_button.add_poll": "Tambah undian",
   "poll_button.remove_poll": "Buang undian",
   "privacy.change": "Ubah privasi hantaran",
+  "privacy.direct.long": "Semua orang yang disebutkan dalam siaran",
+  "privacy.direct.short": "Orang tertentu",
+  "privacy.private.long": "Pengikut anda sahaja",
+  "privacy.private.short": "Pengikut",
   "privacy.public.short": "Awam",
   "privacy_policy.last_updated": "Dikemaskini {date}",
   "privacy_policy.title": "Dasar Privasi",
+  "recommended": "Disyorkan",
   "refresh": "Muat semula",
   "regeneration_indicator.label": "Memuatkan…",
   "regeneration_indicator.sublabel": "Suapan rumah anda sedang disediakan!",
@@ -507,7 +539,9 @@
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "hari ini",
+  "reply_indicator.attachments": "{count, plural, other {# lampiran}}",
   "reply_indicator.cancel": "Batal",
+  "reply_indicator.poll": "Undian",
   "report.block": "Sekat",
   "report.block_explanation": "Anda tidak akan melihat hantaran mereka. Mereka tidak dapat melihat hantaran anda atau mengikuti anda. Mereka akan sedar bahawa mereka disekat.",
   "report.categories.legal": "Sah",
diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json
index 24099f2d339e8a..dc51092dd3e58b 100644
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@@ -113,7 +113,7 @@
   "column.community": "Lokale tijdlijn",
   "column.direct": "Privéberichten",
   "column.directory": "Gebruikersgids",
-  "column.domain_blocks": "Geblokkeerde domeinen",
+  "column.domain_blocks": "Geblokkeerde servers",
   "column.favourites": "Favorieten",
   "column.firehose": "Openbare tijdlijnen",
   "column.follow_requests": "Volgverzoeken",
@@ -230,7 +230,7 @@
   "empty_column.bookmarked_statuses": "Jij hebt nog geen berichten aan je bladwijzers toegevoegd. Wanneer je er een aan jouw bladwijzers toevoegt, valt deze hier te zien.",
   "empty_column.community": "De lokale tijdlijn is nog leeg. Plaats een openbaar bericht om de spits af te bijten!",
   "empty_column.direct": "Je hebt nog geen privéberichten. Wanneer je er een verstuurt of ontvangt, zullen deze hier verschijnen.",
-  "empty_column.domain_blocks": "Er zijn nog geen geblokkeerde domeinen.",
+  "empty_column.domain_blocks": "Er zijn nog geen geblokkeerde servers.",
   "empty_column.explore_statuses": "Momenteel zijn er geen trends. Kom later terug!",
   "empty_column.favourited_statuses": "Jij hebt nog geen favoriete berichten. Wanneer je een bericht als favoriet markeert, valt deze hier te zien.",
   "empty_column.favourites": "Niemand heeft dit bericht nog als favoriet gemarkeerd. Wanneer iemand dit doet, valt dat hier te zien.",
@@ -406,7 +406,7 @@
   "navigation_bar.compose": "Nieuw bericht schrijven",
   "navigation_bar.direct": "Privéberichten",
   "navigation_bar.discover": "Ontdekken",
-  "navigation_bar.domain_blocks": "Geblokkeerde domeinen",
+  "navigation_bar.domain_blocks": "Geblokkeerde servers",
   "navigation_bar.explore": "Verkennen",
   "navigation_bar.favourites": "Favorieten",
   "navigation_bar.filters": "Filters",
diff --git a/app/javascript/mastodon/locales/vi.json b/app/javascript/mastodon/locales/vi.json
index 626f40783c3be0..766407183bc2ae 100644
--- a/app/javascript/mastodon/locales/vi.json
+++ b/app/javascript/mastodon/locales/vi.json
@@ -274,7 +274,7 @@
   "firehose.all": "Toàn bộ",
   "firehose.local": "Máy chủ này",
   "firehose.remote": "Máy chủ khác",
-  "follow_request.authorize": "Cho phép",
+  "follow_request.authorize": "Chấp nhận",
   "follow_request.reject": "Từ chối",
   "follow_requests.unlocked_explanation": "Mặc dù tài khoản của bạn đang ở chế độ công khai, quản trị viên của {domain} vẫn tin rằng bạn sẽ muốn xem lại yêu cầu theo dõi từ những người khác.",
   "follow_suggestions.curated_suggestion": "Lựa chọn của máy chủ",
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index eafbead761ddb0..6f67aeeeaa35dc 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -439,6 +439,7 @@ cs:
       view: Zobrazit blokaci domény
     email_domain_blocks:
       add_new: Přidat
+      allow_registrations_with_approval: Povolit registrace se schválením
       attempts_over_week:
         few: "%{count} pokusy o registraci za poslední týden"
         many: "%{count} pokusů o registraci za poslední týden"
@@ -635,6 +636,7 @@ cs:
       created_at: Nahlášené
       delete_and_resolve: Smazat příspěvky
       forwarded: Přeposláno
+      forwarded_replies_explanation: Toto hlášení je od uživatele z jiného serveru, a je o obsahu z jeho serveru. Byl převeden na vás, protože nahlášený obsah odpovídá jednomu z vašich uživatelů.
       forwarded_to: Přeposláno na %{domain}
       mark_as_resolved: Označit jako vyřešené
       mark_as_sensitive: Označit jako citlivé
@@ -645,7 +647,7 @@ cs:
         create_and_resolve: Vyřešit s poznámkou
         create_and_unresolve: Znovu otevřít s poznámkou
         delete: Smazat
-        placeholder: Popište, jaké akce byly vykonány, nebo jakékoliv jiné související aktuality…
+        placeholder: Popište, jaké akce byly vykonány, nebo jakékoliv jiné související aktuality...
         title: Poznámky
       notes_description_html: Zobrazit a zanechat poznámky pro ostatní moderátory i sebe v budoucnu
       processed_msg: Nahlášení č.%{id} bylo úspěšně zpracováno
@@ -714,7 +716,7 @@ cs:
         administrator_description: Uživatelé s tímto oprávněním obejdou všechna oprávnění
         delete_user_data: Mazat uživatelská data
         delete_user_data_description: Umožňuje uživatelům bezodkladně mazat data jiných uživatelů
-        invite_users: Zvát uživatele
+        invite_users: Pozvat uživatele
         invite_users_description: Umožňuje uživatelům zvát na server nové lidi
         manage_announcements: Spravovat oznámení
         manage_announcements_description: Umožňuje uživatelům spravovat oznámení na serveru
@@ -802,13 +804,16 @@ cs:
           open: Kdokoliv se může registrovat
       security:
         authorized_fetch: Vyžadovat autentizaci od federovaných serverů
+        authorized_fetch_hint: Vyžadování ověřování pravosti od federalizovaných serverů umožňuje přísnější prosazování uživatelských i serverních bloků. K tomu však dochází k snížení výkonu, snižení dosah vašich odpovědí a můžou se zavést problémy s kompatibilitou s některými federálními službami. Kromě toho to nebude bránit oddaným uživatelům či robotům v načítání vašich veřejných příspěvků a účtů.
         authorized_fetch_overridden_hint: Momentálně nemůžete změnit toto nastavení, protože je přepsáno proměnnou prostředí.
+        federation_authentication: Uplatnění ověřování pravosti federace
       title: Nastavení serveru
     site_uploads:
       delete: Odstranit nahraný soubor
       destroyed_msg: Upload stránky byl úspěšně smazán!
     software_updates:
       critical_update: Kritické — aktualizujte, prosím, co nejdříve
+      description: Doporučujeme udržovat vaši instalaci Mastodonu aktuální, aby se využily nejnovější opravy a funkce. Kromě toho je někdy velmi důležité včas aktualizovat Mastodon, aby se předešlo bezpečnostním problémům. Z těchto důvodů Mastodon kontroluje aktualizace každých 30 minut a bude vás informovat podle nastavení e-mailových oznámení.
       documentation_link: Zjistit více
       release_notes: Poznámky k vydání
       title: Dostupné aktualizace
@@ -1072,8 +1077,12 @@ cs:
       hint_html: Ještě jedna věc! Musíme potvrdit, že jste člověk (to proto, abychom drželi stranou spam!). Vyřešte CAPTCHA níže a klikněte na "Pokračovat".
       title: Bezpečnostní kontrola
     confirmations:
+      awaiting_review: Vaše e-mailová adresa je potvrzena! Pracovníci %{domain} nyní kontrolují vaši registraci. Pokud váš účet schválí, obdržíte e-mail!
       awaiting_review_title: Vaše registrace se ověřuje
       clicking_this_link: kliknutím na tento odkaz
+      login_link: přihlásit se
+      proceed_to_login_html: Nyní můžete pokračovat do %{login_link}.
+      redirect_to_app_html: Měli byste být přesměrováni do aplikace <strong>%{app_name}</strong>. Pokud se tak nestalo, zkuste %{clicking_this_link} nebo ručně se vrátit do aplikace.
       registration_complete: Vaše registrace na %{domain} je hotová!
       welcome_title: Vítám uživatele %{name}!
       wrong_email_hint: Pokud není e-mail správný, můžete si ho změnit v nastavení účtu.
@@ -1244,7 +1253,7 @@ cs:
       date: Datum
       download: Stáhnout váš archiv
       hint_html: Můžete si vyžádat archiv vašich <strong>příspěvků a nahraných médií</strong>. Exportovaná data budou ve formátu ActivityPub a budou čitelná kterýmkoliv kompatibilním softwarem. Archiv si můžete vyžádat každých 7 dní.
-      in_progress: Kompiluji váš archiv…
+      in_progress: Kompilujeme váš archiv...
       request: Vyžádat váš archiv
       size: Velikost
     blocks: Blokujete
@@ -1354,6 +1363,20 @@ cs:
       merge_long: Ponechat existující záznamy a přidat nové
       overwrite: Přepsat
       overwrite_long: Nahradit aktuální záznamy novými
+    overwrite_preambles:
+      blocking_html: Chystáte se <strong>nahradit váš seznam bloků</strong> s <strong>%{total_items} účtami</strong> od <strong>%{filename}</strong>.
+      bookmarks_html: Chystáte se <strong>nahradit své záložky</strong> s <strong>%{total_items} příspěvků</strong> z <strong>%{filename}</strong>.
+      domain_blocking_html: Chystáte se <strong>nahradit seznam stránek</strong> s <strong>%{total_items} stránek</strong> z <strong>%{filename}</strong>.
+      following_html: Chystáte se <strong>sledovat</strong> až <strong>%{total_items} účtů</strong> z <strong>%{filename}</strong> a <strong>přestanete sledovat všechny ostatní</strong>.
+      lists_html: Chystáte se <strong>nahradit své seznamy</strong> obsahem <strong>%{filename}</strong>. Až <strong>%{total_items} účtů</strong> budou přidány do nových seznamů.
+      muting_html: Chystáte se <strong>nahradit seznam skrytých účtů</strong> s <strong>%{total_items} účtami</strong> z <strong>%{filename}</strong>.
+    preambles:
+      blocking_html: Chystáte se <strong>blokovat</strong> až <strong>%{total_items} účtů</strong> z <strong>%{filename}</strong>.
+      bookmarks_html: Chystáte se přidat až <strong>%{total_items} příspěvků</strong> z <strong>%{filename}</strong> do vašich <strong>záložek</strong>.
+      domain_blocking_html: Chystáte se <strong>blokovat</strong> až <strong>%{total_items} stránek</strong> z <strong>%{filename}</strong>.
+      following_html: Chystáte se <strong>sledovat</strong> až <strong>%{total_items} účtů</strong> z <strong>%{filename}</strong>.
+      lists_html: Chystáte se přidat <strong>%{total_items} účtů</strong> z <strong>%{filename}</strong> do vaších <strong>seznamů</strong>. Nové seznamy budou vytvořeny, pokud neexistuje žádný seznam, do kterého by bylo možné přidat.
+      muting_html: Chystáte se <strong>skrýt</strong> až <strong>%{total_items} účtů</strong> z <strong>%{filename}</strong>.
     preface: Můžete importovat data, která jste exportovali z jiného serveru, jako například seznam lidí, které sledujete či blokujete.
     recent_imports: Nedávné importy
     states:
@@ -1369,8 +1392,12 @@ cs:
       bookmarks: Import záložek
       domain_blocking: Import blokovaných domén
       following: Import sledovaných účtů
-      muting: Import ztlumených účtů
+      lists: Příjmání seznamů
+      muting: Dovoz skrytých uživatelů
     type: Typ importu
+    type_groups:
+      constructive: Sledování a Záložky
+      destructive: Bloky & skrytí
     types:
       blocking: Seznam blokovaných
       bookmarks: Záložky
@@ -1391,6 +1418,7 @@ cs:
       '86400': 1 den
     expires_in_prompt: Nikdy
     generate: Vygenerovat zvací odkaz
+    invalid: Tato pozvánka není platná
     invited_by: 'Pozval váš uživatel:'
     max_uses:
       few: "%{count} použití"
@@ -1417,6 +1445,21 @@ cs:
     failed_sign_in_html: Neúspěšný pokus o přihlášení %{method} z %{ip} (%{browser})
     successful_sign_in_html: Úspěšné přihlášení %{method} z %{ip} (%{browser})
     title: Historie přihlášení
+  mail_subscriptions:
+    unsubscribe:
+      action: Ano, odeberte odběr
+      complete: Odběr byl odhlášen
+      confirmation_html: Opravdu nechcete dostávat %{type} pro Mastodon na %{domain} na váš e-mail %{email}? Vždy se můžete opět přihlásit do <a href="%{settings_path}">nastavení e-mailových oznámení</a>.
+      emails:
+        notification_emails:
+          favourite: e-mailové oznámení při oblíbení
+          follow: e-mailové oznámení při sledování
+          follow_request: e-mail při žádost o sledování
+          mention: e-mailové oznámení při zmínění
+          reblog: e-mailové oznámení při boostu
+      resubscribe_html: Při omylu se můžete znovu přihlásit do vaších <a href="%{settings_path}">nastavení e-mailových oznámení</a>.
+      success_html: Již nebudete dostávat %{type} pro Mastodon na %{domain} na vaší e-mailové adrese %{email}.
+      title: Odhlásit odběr
   media_attachments:
     validations:
       images_and_video: K příspěvku, který již obsahuje obrázky, nelze připojit video
@@ -1496,6 +1539,7 @@ cs:
     update:
       subject: Uživatel %{name} upravil příspěvek
   notifications:
+    administration_emails: E-mailová oznámení administrátora
     email_events: Události pro e-mailová oznámení
     email_events_hint: 'Vyberte události, pro které chcete dostávat oznámení:'
     other_settings: Další nastavení oznámení
@@ -1554,6 +1598,9 @@ cs:
     errors:
       limit_reached: Dosažen limit různých reakcí
       unrecognized_emoji: není známý smajlík
+  redirects:
+    prompt: Pokud tomuto odkazu důvěřujete, klikněte na něj a pokračujte.
+    title: Odcházíte z %{instance}.
   relationships:
     activity: Aktivita účtu
     confirm_follow_selected_followers: Jste si jisti, že chcete sledovat vybrané sledující?
@@ -1616,6 +1663,7 @@ cs:
       unknown_browser: Neznámý prohlížeč
       weibo: Weibo
     current_session: Aktuální relace
+    date: Datum
     description: "%{browser} na systému %{platform}"
     explanation: Tohle jsou webové prohlížeče aktuálně přihlášené na váš účet Mastodon.
     ip: IP adresa
@@ -1772,8 +1820,10 @@ cs:
       default: "%d. %b %Y, %H:%M"
       month: "%b %Y"
       time: "%H:%M"
+      with_time_zone: "%b %d, %Y, %H:%M %Z"
   translation:
     errors:
+      quota_exceeded: Byla vyčerpaná kvóta pro využívání překládací služby na úrovni serveru.
       too_many_requests: Na překladatelskou službu bylo zasláno v poslední době příliš mnoho požadavků.
   two_factor_authentication:
     add: Přidat
@@ -1792,16 +1842,27 @@ cs:
     webauthn: Bezpečnostní klíče
   user_mailer:
     appeal_approved:
+      action: Možnosti Účtu
       explanation: Odvolání proti prohřešku vašeho účtu ze dne %{strike_date}, které jste podali %{appeal_date}, bylo schváleno. Váš účet je opět v pořádku.
       subject: Vaše odvolání ze dne %{date} bylo schváleno
+      subtitle: Váš účet je opět v dobrém stavu.
       title: Odvolání schváleno
     appeal_rejected:
       explanation: Odvolání proti prohřešku vašeho účtu ze dne %{strike_date}, které jste podali %{appeal_date}, bylo zamítnuto.
       subject: Vaše odvolání z %{date} bylo zamítnuto
+      subtitle: Vaše odvolání bylo zamítnuto.
       title: Odvolání zamítnuto
     backup_ready:
+      explanation: Požádali jste o úplnou zálohu vašeho účtu Mastodon.
+      extra: Nyní je připraven ke stažení!
       subject: Váš archiv je připraven ke stažení
       title: Stažení archivu
+    failed_2fa:
+      details: 'Zde jsou podrobnosti o pokusu o přihlášení:'
+      explanation: Někdo se pokusil přihlásit k vašemu účtu, ale poskytl neplatný token Dvoufázového ověření.
+      further_actions_html: Pokud jste to nebyl, doporučujeme vám okamžitě %{action}, protože váš účet mohl být napaden.
+      subject: Druhý omyl při Dvoufázovém ověření
+      title: Omyl při Dvoufázovém ověření
     suspicious_sign_in:
       change_password: změnit vaše heslo
       details: 'Tady jsou detaily přihášení:'
@@ -1855,10 +1916,13 @@ cs:
     go_to_sso_account_settings: Přejděte do nastavení účtu poskytovatele identity
     invalid_otp_token: Neplatný kód pro dvoufázové ověřování
     otp_lost_help_html: Pokud jste ztratili přístup k oběma, spojte se s %{email}
+    rate_limited: Příliš mnoho pokusů o ověření, zkuste to znovu později.
     seamless_external_login: Jste přihlášeni přes externí službu, nastavení hesla a e-mailu proto nejsou dostupná.
     signed_in_as: 'Přihlášeni jako:'
   verification:
+    extra_instructions_html: <strong>Tip:</strong> Odkaz na vaší webové stránce může být neviditelný. Důležitou součástí je <code>rel="me"</code>, která brání proti napodování vás na webových stránkách s obsahem vytvořeným uživatelem. Můžete dokonce použít <code>odkaz</code> v záhlaví stránky místo <code>a</code>, ale HTML musí být přístupné bez spuštění JavaScript.
     here_is_how: Jak na to
+    hint_html: "<strong>Ověření Vaší identity na Mastodonu je pro každého výborné.</strong> Na základě otevřených webových standardů, nyní a navždy zdarma. Jediné, co potřebujete, je osobní webová stránka, na které vás lidé poznají. Když odkazujete na tuto stránku z vašeho profilu, zkontrolujeme, zda webové stránky odkazují na váš profil a zobrazí na něm vizuální indikátor."
     instructions_html: Zkopírujte a vložte níže uvedený kód do HTML vašeho webu. Poté přidejte adresu vašeho webu do jednoho z extra políček na vašem profilu na záložce "Upravit profil" a uložte změny.
     verification: Ověření
     verified_links: Vaše ověřené odkazy
diff --git a/config/locales/devise.bg.yml b/config/locales/devise.bg.yml
index f3586bcd859825..116939762c1f29 100644
--- a/config/locales/devise.bg.yml
+++ b/config/locales/devise.bg.yml
@@ -12,6 +12,7 @@ bg:
       last_attempt: Разполагате с още един опит преди акаунтът ви да се заключи.
       locked: Вашият акаунт е заключен.
       not_found_in_database: Невалиден %{authentication_keys} или парола.
+      omniauth_user_creation_failure: Грешка, сътворявайки акаунт за тази самоличност.
       pending: Вашият акаунт все още е в процес на проверка.
       timeout: Заседанието ви изтече. Влезте пак, за да продължите.
       unauthenticated: Преди да продължите, трябва да влезете или да се регистрирате.
diff --git a/config/locales/devise.cs.yml b/config/locales/devise.cs.yml
index fb3893325c26f1..4dbc2e08bf6880 100644
--- a/config/locales/devise.cs.yml
+++ b/config/locales/devise.cs.yml
@@ -12,6 +12,7 @@ cs:
       last_attempt: Máte ještě jeden pokus, než bude váš účet uzamčen.
       locked: Váš účet je uzamčen.
       not_found_in_database: Neplatné %{authentication_keys} nebo heslo.
+      omniauth_user_creation_failure: Při vytvoření účtu pro tuto identitu se nastala chyba.
       pending: Váš účet je stále posuzován.
       timeout: Vaše relace vypršela. Pro pokračování se prosím přihlaste znovu.
       unauthenticated: Před pokračováním se musíte přihlásit nebo zaregistrovat.
@@ -47,15 +48,20 @@ cs:
         subject: 'Mastodon: Instrukce pro obnovení hesla'
         title: Obnovení hesla
       two_factor_disabled:
+        explanation: Přihlášení je nyní možné pouze pomocí emailové adresy a hesla.
         subject: 'Mastodon: Dvoufázové ověření bylo vypnuto'
-        title: 2FA bylo vypnuto
+        subtitle: Dvoufaktorové ověřování vašeho účtu bylo vypnuto.
+        title: Dvoufázové ověření bylo vypnuto
       two_factor_enabled:
+        explanation: Pro přihlášení bude vyžadován token generovaný spárovanou TOTP aplikací.
         subject: 'Mastodon: Dvoufázové ověření bylo zapnuto'
-        title: 2FA bylo zapnuto
+        subtitle: Dvoufaktorové ověřování vašeho účtu bylo zapnuto.
+        title: Dvoufázové ověření bylo zapnuto
       two_factor_recovery_codes_changed:
         explanation: Předchozí záložní kódy byly zrušeny a byly vygenerovány nové.
-        subject: 'Mastodon: Dvoufázové záložní kódy byly znovu vygenerovány'
-        title: Záložní kódy pro 2FA byly změněny
+        subject: 'Mastodon: Záložní kódy pro dvoufázové ověření byly znovu vygenerovány'
+        subtitle: Předchozí záložní kódy byly zrušeny a byly vygenerovány nové.
+        title: Záložní kódy pro dvoufázové ověření byly změněny
       unlock_instructions:
         subject: 'Mastodon: Instrukce pro odemčení účtu'
       webauthn_credential:
@@ -68,9 +74,13 @@ cs:
           subject: 'Mastodon: Bezpečnostní klíč byl smazán'
           title: Jeden z vašich bezpečnostních klíčů byl smazán
       webauthn_disabled:
-        subject: 'Mastodon: Přihlašování bezpečnostními klíči bylo vypnuto'
+        explanation: 'Mastodon: Přihlašování pomocí bezpečnostními klíčemi bylo pro váš účet vypnuto.'
+        extra: Přihlášení je nyní možné pouze pomocí tokenem vygenerovaný spárovanou TOTP aplikací.
+        subject: 'Mastodon: Přihlašování pomocí bezpečnostními klíčemi bylo vypnuto'
         title: Bezpečnostní klíče byly zakázány
       webauthn_enabled:
+        explanation: 'Mastodon: Přihlašování bezpečnostními klíči bylo pro váš účet povoleno.'
+        extra: Váš bezpečnostní klíč nyní může být použit pro přihlášení.
         subject: 'Mastodon: Přihlašování bezpečnostními klíči bylo povoleno'
         title: Bezpečnostní klíče byly povoleny
     omniauth_callbacks:
diff --git a/config/locales/devise.cy.yml b/config/locales/devise.cy.yml
index d3eeb8eeb60e2d..523ae70b049c4a 100644
--- a/config/locales/devise.cy.yml
+++ b/config/locales/devise.cy.yml
@@ -12,6 +12,7 @@ cy:
       last_attempt: Mae gennych un cyfle arall cyn i'ch cyfrif gael ei gloi.
       locked: Mae eich cyfrif wedi ei gloi.
       not_found_in_database: "%{authentication_keys} neu gyfrinair annilys."
+      omniauth_user_creation_failure: Gwall wrth greu cyfrif ar gyfer yr hunaniaeth hon.
       pending: Mae eich cyfrif dal o dan adolygiad.
       timeout: Mae eich sesiwn wedi dod i ben. Mewngofnodwch eto i barhau.
       unauthenticated: Mae angen i chi fewngofnodi neu gofrestru cyn parhau.
diff --git a/config/locales/devise.lt.yml b/config/locales/devise.lt.yml
index 3fba5ed08e909c..548894cca0748c 100644
--- a/config/locales/devise.lt.yml
+++ b/config/locales/devise.lt.yml
@@ -12,6 +12,7 @@ lt:
       last_attempt: Turi dar vieną bandymą, kol tavo paskyra bus užrakinta.
       locked: Tavo paskyra užrakinta.
       not_found_in_database: Netinkami %{authentication_keys} arba slaptažodis.
+      omniauth_user_creation_failure: Klaida kuriant šios tapatybės paskyrą.
       pending: Tavo paskyra vis dar peržiūrima.
       timeout: Tavo seansas baigėsi. Norėdamas (-a) tęsti, prisijunk dar kartą.
       unauthenticated: Prieš tęsdamas (-a) turi prisijungti arba užsiregistruoti.
diff --git a/config/locales/devise.th.yml b/config/locales/devise.th.yml
index 40baabcf753377..50e2e4b29e3422 100644
--- a/config/locales/devise.th.yml
+++ b/config/locales/devise.th.yml
@@ -12,6 +12,7 @@ th:
       last_attempt: คุณลองได้อีกหนึ่งครั้งก่อนที่จะมีการล็อคบัญชีของคุณ
       locked: มีการล็อคบัญชีของคุณอยู่
       not_found_in_database: "%{authentication_keys} หรือรหัสผ่านไม่ถูกต้อง"
+      omniauth_user_creation_failure: เกิดข้อผิดพลาดในการสร้างบัญชีสำหรับข้อมูลประจำตัวนี้
       pending: บัญชีของคุณยังคงอยู่ระหว่างการตรวจทาน
       timeout: เซสชันของคุณหมดอายุแล้ว โปรดเข้าสู่ระบบอีกครั้งเพื่อดำเนินการต่อ
       unauthenticated: คุณจำเป็นต้องเข้าสู่ระบบหรือลงทะเบียนก่อนดำเนินการต่อ
diff --git a/config/locales/devise.vi.yml b/config/locales/devise.vi.yml
index 190f7282c4befe..6ae78f83ccad0a 100644
--- a/config/locales/devise.vi.yml
+++ b/config/locales/devise.vi.yml
@@ -12,6 +12,7 @@ vi:
       last_attempt: Nếu thử sai lần nữa, tài khoản của bạn sẽ bị khóa.
       locked: Tài khoản của bạn bị khóa.
       not_found_in_database: "%{authentication_keys} không có trong dữ liệu."
+      omniauth_user_creation_failure: Xảy ra lỗi khi tạo tài khoản này.
       pending: Tài khoản của bạn vẫn đang được xem xét.
       timeout: Phiên của bạn đã hết hạn. Vui lòng đăng nhập lại để tiếp tục.
       unauthenticated: Bạn cần đăng nhập để tiếp tục.
diff --git a/config/locales/doorkeeper.cs.yml b/config/locales/doorkeeper.cs.yml
index ba2100edfdff2a..be2a4d971a5039 100644
--- a/config/locales/doorkeeper.cs.yml
+++ b/config/locales/doorkeeper.cs.yml
@@ -84,7 +84,7 @@ cs:
         credential_flow_not_configured: Proud Resource Owner Password Credentials selhal, protože Doorkeeper.configure.resource_owner_from_credentials nebylo nakonfigurováno.
         invalid_client: Ověření klienta selhalo kvůli neznámému klientovi, chybějící klientské autentizaci či nepodporované autentizační metodě.
         invalid_grant: Poskytnuté oprávnění je neplatné, vypršela jeho platnost, bylo odvoláno, neshoduje se s URI přesměrování použitým v požadavku o autorizaci, nebo bylo uděleno jinému klientu.
-        invalid_redirect_uri: URI pro přesměrování není platné.
+        invalid_redirect_uri: Zahrnutá přesměrovací URI není platná.
         invalid_request:
           missing_param: 'Chybí potřebný parametr: %{value}.'
           request_not_authorized: Požadavek musí být autorizován. Potřebný parametr pro autorizaci požadavku chybí nebo není platný.
diff --git a/config/locales/kab.yml b/config/locales/kab.yml
index bf574fc016b159..bd73b4ce0fc87d 100644
--- a/config/locales/kab.yml
+++ b/config/locales/kab.yml
@@ -646,6 +646,7 @@ kab:
     other: Wiyaḍ
   privacy:
     privacy: Tabaḍnit
+    search: Anadi
   privacy_policy:
     title: Tasertit tabaḍnit
   relationships:
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 1c31ed9e2bcd8e..ea811400a65aae 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -1843,7 +1843,7 @@ nl:
       explanation: Hier zijn enkele tips om je op weg te helpen
       final_action: Begin berichten te plaatsen
       final_step: 'Begin berichten te plaatsen! Zelfs zonder volgers kunnen jouw openbare berichten door anderen bekeken worden, bijvoorbeeld op de lokale tijdlijn en onder hashtags. Je kunt jezelf voorstellen met het gebruik van de hashtag #introductions.'
-      full_handle: Jouw volledige Mastodonadres
+      full_handle: Jouw volledige Mastodon-adres
       full_handle_hint: Dit geef je aan jouw vrienden, zodat ze jou berichten kunnen sturen of (vanaf een andere Mastodonserver) kunnen volgen.
       subject: Welkom op Mastodon
       title: Welkom aan boord %{name}!
diff --git a/config/locales/simple_form.cs.yml b/config/locales/simple_form.cs.yml
index dff937809856ab..9da377ae9c7e06 100644
--- a/config/locales/simple_form.cs.yml
+++ b/config/locales/simple_form.cs.yml
@@ -3,9 +3,13 @@ cs:
   simple_form:
     hints:
       account:
+        discoverable: Vaše veřejné příspěvky a profil mohou být zobrazeny nebo doporučeny v různých oblastech Mastodonu a váš profil může být navrhován ostatním uživatelům.
         display_name: Vaše celé jméno nebo přezdívka.
         fields: Vaše domovská stránka, zájmena, věk, cokoliv chcete.
+        indexable: Vaše veřejné příspěvky se mohou objevit ve výsledcích vyhledávání na Mastodonu. Lidé, kteří s vašimi příspěvky interagovaly, je mohou stále vyhledávat.
         note: 'Můžete @zmínit jiné osoby nebo #hashtagy.'
+        show_collections: Lidé budou moci procházet skrz sledující. Lidé, které sledujete, uvidí, že je sledujete bezohledně.
+        unlocked: Lidé vás budou moci sledovat, aniž by vás žádali o schválení. Zrušte zaškrtnutí, pokud chcete zkontrolovat požadavky a zvolte, zda přijmete nebo odmítněte nové následovníky.
       account_alias:
         acct: Zadejte svůj účet, ze kterého se chcete přesunout jinam, ve formátu přezdívka@doména
       account_migration:
@@ -34,7 +38,7 @@ cs:
       appeal:
         text: Proti prohřešku se můžete odvolat jen jednou
       defaults:
-        autofollow: Lidé, kteří se zaregistrují na základě pozvánky, vás budou automaticky sledovat
+        autofollow: Lidé, kteří se zaregistrují skrz pozvánky, vás budou automaticky sledovat
         avatar: PNG, GIF či JPG. Maximálně %{size}. Bude zmenšen na %{dimensions} px
         bot: Signalizovat ostatním, že účet převážně vykonává automatizované akce a nemusí být monitorován
         context: Jeden či více kontextů, ve kterých má být filtr uplatněn
@@ -72,7 +76,7 @@ cs:
           hide: Úplně schovat filtrovaný obsah tak, jako by neexistoval
           warn: Schovat filtrovaný obsah za varováním zmiňujicím název filtru
       form_admin_settings:
-        activity_api_enabled: Počty lokálně publikovaných příspěvků, aktivních uživatelů a nových registrací v týdenních intervalech
+        activity_api_enabled: Počty lokálně zveřejnělých příspěvků, aktivních uživatelů a nových registrací v týdenních intervalech
         backups_retention_period: Zachovat generované uživatelské archivy pro zadaný počet dní.
         bootstrap_timeline_accounts: Tyto účty budou připnuty na vrchol nových uživatelů podle doporučení.
         closed_registrations_message: Zobrazeno při zavření registrace
@@ -116,6 +120,9 @@ cs:
       sessions:
         otp: 'Zadejte kód pro dvoufázové ověření vygenerovaný vaší mobilní aplikací, nebo použijte jeden z vašich záložních kódů:'
         webauthn: Pokud jde o USB klíč, vložte jej a případně se dotkněte jeho tlačítka.
+      settings:
+        indexable: Vaše profilová stránka se může objevit ve výsledcích vyhledávání na Google, Bingu a ostatních vyhledávačích.
+        show_application: I tak budete vždy moci vidět, která aplikace zveřejnila váš příspěvek.
       tag:
         name: Můžete měnit pouze velikost písmen, například kvůli lepší čitelnosti
       user:
@@ -133,9 +140,13 @@ cs:
         url: Kam budou události odesílány
     labels:
       account:
+        discoverable: Zobrazovat profil a příspěvky ve vyhledávacích algoritmech
         fields:
           name: Označení
           value: Obsah
+        indexable: Zahrnout veřejné příspěvky do výsledků hledání
+        show_collections: Zobrazit koho sledujete a kdo vás sleduje v profilu
+        unlocked: Automaticky přijímat nové sledující
       account_alias:
         acct: Adresa starého účtu
       account_migration:
@@ -280,9 +291,18 @@ cs:
         pending_account: Je třeba posoudit nový účet
         reblog: Někdo boostnul váš příspěvek
         report: Je odesláno nové hlášení
+        software_updates:
+          all: Upozornit na všechny aktualizace
+          critical: Upozornit pouze na kritické aktualizace
+          label: Nová verze Mastodonu k dispozici
+          none: Nikdy neoznamovat aktualizace (nedoporučeno)
+          patch: Upozornit na aktualizace chyb
         trending_tag: Nový trend vyžaduje posouzení
       rule:
         text: Pravidlo
+      settings:
+        indexable: Zahrnout stránku profilu do vyhledávačů
+        show_application: Zobrazit aplikaci, ze které jste odeslali příspěvek
       tag:
         listable: Povolit zobrazení tohoto hashtagu ve vyhledávání a návrzích
         name: Hashtag
@@ -303,6 +323,7 @@ cs:
         url: URL koncového bodu
     'no': Ne
     not_recommended: Nedoporučuje se
+    overridden: Přepsáno
     recommended: Doporučeno
     required:
       mark: "*"
diff --git a/config/locales/simple_form.nl.yml b/config/locales/simple_form.nl.yml
index b0b695745b72de..f7e917ac3cd733 100644
--- a/config/locales/simple_form.nl.yml
+++ b/config/locales/simple_form.nl.yml
@@ -148,9 +148,9 @@ nl:
         show_collections: Accounts die jij volgt en die jou volgen op je profiel tonen
         unlocked: Automatisch nieuwe volgers accepteren
       account_alias:
-        acct: Mastodonadres van het oude account
+        acct: Mastodon-adres van het oude account
       account_migration:
-        acct: Mastodonadres van het nieuwe account
+        acct: Mastodon-adres van het nieuwe account
       account_warning_preset:
         text: Tekst van preset
         title: Titel
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 520b64f886ec3b..90f8144ea856c9 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -175,6 +175,7 @@ sk:
         approve_user: Odobri užívateľa
         assigned_to_self_report: Priraď hlásenie
         change_email_user: Zmeň email pre užívateľa
+        change_role_user: Zmeň užívateľskú rolu
         confirm_user: Potvrď užívateľa
         create_account_warning: Vytvor výstrahu
         create_announcement: Vytvor oboznámenie
@@ -791,6 +792,7 @@ sk:
     captcha_confirmation:
       title: Bezpečnostná kontrola
     confirmations:
+      clicking_this_link: kliknutím na tento odkaz
       login_link: prihlás sa
       welcome_title: Vitaj, %{name}!
     delete_account: Vymaž účet

From c645490d553124d800d30488595f7d2d9d61584d Mon Sep 17 00:00:00 2001
From: Hinaloe <hina@hinaloe.net>
Date: Mon, 19 Feb 2024 22:31:16 +0900
Subject: [PATCH 0148/2191] Fix `sensitive` flag not being removed when
 removing CW in new compose form (#29248)

---
 app/javascript/mastodon/reducers/compose.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/javascript/mastodon/reducers/compose.js b/app/javascript/mastodon/reducers/compose.js
index f57bbb77b870d4..f1bc0cbaef4616 100644
--- a/app/javascript/mastodon/reducers/compose.js
+++ b/app/javascript/mastodon/reducers/compose.js
@@ -315,8 +315,8 @@ export default function compose(state = initialState, action) {
       map.set('spoiler', !state.get('spoiler'));
       map.set('idempotencyKey', uuid());
 
-      if (!state.get('sensitive') && state.get('media_attachments').size >= 1) {
-        map.set('sensitive', true);
+      if (state.get('media_attachments').size >= 1 && !state.get('default_sensitive')) {
+        map.set('sensitive', !state.get('spoiler'));
       }
     });
   case COMPOSE_SPOILER_TEXT_CHANGE:

From 72b0c9e20bbd2f9089b02671042da462f2120410 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 19 Feb 2024 08:35:13 -0500
Subject: [PATCH 0149/2191] Re-enable fixed `Style/Semicolon` cop (#29212)

---
 .rubocop.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index dce33eab30d1b1..d968346f6b5681 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -210,11 +210,6 @@ Style/RedundantBegin:
 Style/RescueStandardError:
   EnforcedStyle: implicit
 
-# Reason: Simplify some spec layouts
-# https://docs.rubocop.org/rubocop/cops_style.html#stylesemicolon
-Style/Semicolon:
-  AllowAsExpressionSeparator: true
-
 # Reason: Originally disabled for CodeClimate, and no config consensus has been found
 # https://docs.rubocop.org/rubocop/cops_style.html#stylesymbolarray
 Style/SymbolArray:

From 86627ea2e449cd9413abf252249d8d6961a3f0ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Fourn=C3=A8s?= <w.wohanka@gmail.com>
Date: Mon, 19 Feb 2024 14:35:58 +0100
Subject: [PATCH 0150/2191] Add a missing thread example to the statuses spec
 (#29278)

---
 spec/requests/api/v1/statuses_spec.rb | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/spec/requests/api/v1/statuses_spec.rb b/spec/requests/api/v1/statuses_spec.rb
index 201674fccdc03b..a3b84afa261d25 100644
--- a/spec/requests/api/v1/statuses_spec.rb
+++ b/spec/requests/api/v1/statuses_spec.rb
@@ -167,6 +167,16 @@
           expect(response.headers['X-RateLimit-Remaining']).to eq '0'
         end
       end
+
+      context 'with missing thread' do
+        let(:params) { { status: 'Hello world', in_reply_to_id: 0 } }
+
+        it 'returns http not found' do
+          subject
+
+          expect(response).to have_http_status(404)
+        end
+      end
     end
 
     describe 'DELETE /api/v1/statuses/:id' do

From 64f9939e397c6b0b0dbcbc0a29380b544de91329 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 19 Feb 2024 10:57:47 -0500
Subject: [PATCH 0151/2191] Use `capture_emails` helper to improve email
 assertions in specs (#29245)

---
 .../admin/disputes/appeals_controller_spec.rb | 25 +++++++++-----
 .../admin/resets_controller_spec.rb           | 10 +++---
 .../auth/sessions_controller_spec.rb          | 34 ++++++++++++-------
 .../disputes/appeals_controller_spec.rb       | 16 ++++++---
 spec/models/user_spec.rb                      | 18 +++++-----
 spec/rails_helper.rb                          |  1 +
 spec/requests/api/v1/reports_spec.rb          | 10 ++++--
 spec/services/notify_service_spec.rb          | 16 ++++++---
 spec/services/report_service_spec.rb          |  5 +--
 spec/workers/backup_worker_spec.rb            | 11 ++++--
 10 files changed, 98 insertions(+), 48 deletions(-)

diff --git a/spec/controllers/admin/disputes/appeals_controller_spec.rb b/spec/controllers/admin/disputes/appeals_controller_spec.rb
index d36523316746aa..bf7f9bd70485c0 100644
--- a/spec/controllers/admin/disputes/appeals_controller_spec.rb
+++ b/spec/controllers/admin/disputes/appeals_controller_spec.rb
@@ -35,7 +35,7 @@
     let(:current_user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
 
     it 'redirects back to the strike page and notifies target account about approved appeal', :sidekiq_inline do
-      subject
+      emails = capture_emails { subject }
 
       expect(response)
         .to redirect_to(disputes_strike_path(appeal.strike))
@@ -43,9 +43,13 @@
       expect(target_account.reload)
         .to_not be_suspended
 
-      expect(UserMailer.deliveries.size).to eq(1)
-      expect(UserMailer.deliveries.first.to.first).to eq(target_account.user.email)
-      expect(UserMailer.deliveries.first.subject).to eq(I18n.t('user_mailer.appeal_approved.subject', date: I18n.l(appeal.created_at)))
+      expect(emails.size)
+        .to eq(1)
+      expect(emails.first)
+        .to have_attributes(
+          to: contain_exactly(target_account.user.email),
+          subject: eq(I18n.t('user_mailer.appeal_approved.subject', date: I18n.l(appeal.created_at)))
+        )
     end
   end
 
@@ -55,14 +59,19 @@
     let(:current_user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
 
     it 'redirects back to the strike page and notifies target account about rejected appeal', :sidekiq_inline do
-      subject
+      emails = capture_emails { subject }
 
       expect(response)
         .to redirect_to(disputes_strike_path(appeal.strike))
 
-      expect(UserMailer.deliveries.size).to eq(1)
-      expect(UserMailer.deliveries.first.to.first).to eq(target_account.user.email)
-      expect(UserMailer.deliveries.first.subject).to eq(I18n.t('user_mailer.appeal_rejected.subject', date: I18n.l(appeal.created_at)))
+      expect(emails.size)
+        .to eq(1)
+
+      expect(emails.first)
+        .to have_attributes(
+          to: contain_exactly(target_account.user.email),
+          subject: eq(I18n.t('user_mailer.appeal_rejected.subject', date: I18n.l(appeal.created_at)))
+        )
     end
   end
 end
diff --git a/spec/controllers/admin/resets_controller_spec.rb b/spec/controllers/admin/resets_controller_spec.rb
index e82a3a6afa70a6..10ed2cf969730c 100644
--- a/spec/controllers/admin/resets_controller_spec.rb
+++ b/spec/controllers/admin/resets_controller_spec.rb
@@ -5,6 +5,8 @@
 describe Admin::ResetsController do
   render_views
 
+  subject { post :create, params: { account_id: account.id } }
+
   let(:account) { Fabricate(:account) }
 
   before do
@@ -13,11 +15,11 @@
 
   describe 'POST #create', :sidekiq_inline do
     it 'redirects to admin accounts page' do
-      expect do
-        post :create, params: { account_id: account.id }
-      end.to change(Devise.mailer.deliveries, :size).by(2)
+      emails = capture_emails { subject }
 
-      expect(Devise.mailer.deliveries).to have_attributes(
+      expect(emails.size)
+        .to eq(2)
+      expect(emails).to have_attributes(
         first: have_attributes(
           to: include(account.user.email),
           subject: I18n.t('devise.mailer.password_change.subject')
diff --git a/spec/controllers/auth/sessions_controller_spec.rb b/spec/controllers/auth/sessions_controller_spec.rb
index dcbaf1fcbb78c9..7adafc6f1418de 100644
--- a/spec/controllers/auth/sessions_controller_spec.rb
+++ b/spec/controllers/auth/sessions_controller_spec.rb
@@ -124,7 +124,7 @@
         end
 
         it 'logs the user in and sends suspicious email and redirects home', :sidekiq_inline do
-          subject
+          emails = capture_emails { subject }
 
           expect(response)
             .to redirect_to(root_path)
@@ -132,9 +132,13 @@
           expect(controller.current_user)
             .to eq user
 
-          expect(UserMailer.deliveries.size).to eq(1)
-          expect(UserMailer.deliveries.first.to.first).to eq(user.email)
-          expect(UserMailer.deliveries.first.subject).to eq(I18n.t('user_mailer.suspicious_sign_in.subject'))
+          expect(emails.size)
+            .to eq(1)
+          expect(emails.first)
+            .to have_attributes(
+              to: contain_exactly(user.email),
+              subject: eq(I18n.t('user_mailer.suspicious_sign_in.subject'))
+            )
         end
       end
 
@@ -260,21 +264,27 @@
           end
 
           it 'does not log the user in, sets a flash message, and sends a suspicious sign in email', :sidekiq_inline do
-            Auth::SessionsController::MAX_2FA_ATTEMPTS_PER_HOUR.times do
-              post :create, params: { user: { otp_attempt: '1234' } }, session: { attempt_user_id: user.id, attempt_user_updated_at: user.updated_at.to_s }
-              expect(controller.current_user).to be_nil
+            emails = capture_emails do
+              Auth::SessionsController::MAX_2FA_ATTEMPTS_PER_HOUR.times do
+                post :create, params: { user: { otp_attempt: '1234' } }, session: { attempt_user_id: user.id, attempt_user_updated_at: user.updated_at.to_s }
+                expect(controller.current_user).to be_nil
+              end
+              post :create, params: { user: { otp_attempt: user.current_otp } }, session: { attempt_user_id: user.id, attempt_user_updated_at: user.updated_at.to_s }
             end
 
-            post :create, params: { user: { otp_attempt: user.current_otp } }, session: { attempt_user_id: user.id, attempt_user_updated_at: user.updated_at.to_s }
-
             expect(controller.current_user)
               .to be_nil
+
             expect(flash[:alert])
               .to match I18n.t('users.rate_limited')
 
-            expect(UserMailer.deliveries.size).to eq(1)
-            expect(UserMailer.deliveries.first.to.first).to eq(user.email)
-            expect(UserMailer.deliveries.first.subject).to eq(I18n.t('user_mailer.failed_2fa.subject'))
+            expect(emails.size)
+              .to eq(1)
+            expect(emails.first)
+              .to have_attributes(
+                to: contain_exactly(user.email),
+                subject: eq(I18n.t('user_mailer.failed_2fa.subject'))
+              )
           end
         end
 
diff --git a/spec/controllers/disputes/appeals_controller_spec.rb b/spec/controllers/disputes/appeals_controller_spec.rb
index d763068ebe8c67..99d5a8b17f0252 100644
--- a/spec/controllers/disputes/appeals_controller_spec.rb
+++ b/spec/controllers/disputes/appeals_controller_spec.rb
@@ -18,9 +18,15 @@
       let(:params) { { strike_id: strike.id, appeal: { text: 'Foo' } } }
 
       it 'notifies staff about new appeal and redirects back to strike page', :sidekiq_inline do
-        subject
-
-        expect(ActionMailer::Base.deliveries.first.to).to eq([admin.email])
+        emails = capture_emails { subject }
+
+        expect(emails.size)
+          .to eq(1)
+        expect(emails.first)
+          .to have_attributes(
+            to: contain_exactly(admin.email),
+            subject: eq(I18n.t('admin_mailer.new_appeal.subject', username: current_user.account.acct, instance: Rails.configuration.x.local_domain))
+          )
         expect(response).to redirect_to(disputes_strike_path(strike.id))
       end
     end
@@ -31,9 +37,9 @@
       let(:params) { { strike_id: strike.id, appeal: { text: '' } } }
 
       it 'does not send email and renders strike show page', :sidekiq_inline do
-        subject
+        emails = capture_emails { subject }
 
-        expect(ActionMailer::Base.deliveries.size).to eq(0)
+        expect(emails).to be_empty
         expect(response).to render_template('disputes/strikes/show')
       end
     end
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 1baa3ccbf9c957..39986f476c0161 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -455,18 +455,20 @@
 
     let!(:user) { Fabricate(:user, confirmed_at: confirmed_at) }
 
-    before { ActionMailer::Base.deliveries.clear }
-
-    after { ActionMailer::Base.deliveries.clear }
-
     context 'when user is new' do
       let(:confirmed_at) { nil }
 
       it 'confirms user and delivers welcome email', :sidekiq_inline do
-        subject
+        emails = capture_emails { subject }
 
         expect(user.confirmed_at).to be_present
-        expect(ActionMailer::Base.deliveries.count).to eq 1
+        expect(emails.size)
+          .to eq(1)
+        expect(emails.first)
+          .to have_attributes(
+            to: contain_exactly(user.email),
+            subject: eq(I18n.t('user_mailer.welcome.subject'))
+          )
       end
     end
 
@@ -474,10 +476,10 @@
       let(:confirmed_at) { Time.zone.now }
 
       it 'confirms user but does not deliver welcome email' do
-        subject
+        emails = capture_emails { subject }
 
         expect(user.confirmed_at).to be_present
-        expect(ActionMailer::Base.deliveries.count).to eq 0
+        expect(emails).to be_empty
       end
     end
   end
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index cde5a439dbf106..3e84d687383551 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -82,6 +82,7 @@ def sign_in(resource, _deprecated = nil, scope: nil)
   config.include Devise::Test::ControllerHelpers, type: :view
   config.include Devise::Test::IntegrationHelpers, type: :feature
   config.include Devise::Test::IntegrationHelpers, type: :request
+  config.include ActionMailer::TestHelper
   config.include Paperclip::Shoulda::Matchers
   config.include ActiveSupport::Testing::TimeHelpers
   config.include Chewy::Rspec::Helpers
diff --git a/spec/requests/api/v1/reports_spec.rb b/spec/requests/api/v1/reports_spec.rb
index ba3d2b3060e033..94baf8cb989895 100644
--- a/spec/requests/api/v1/reports_spec.rb
+++ b/spec/requests/api/v1/reports_spec.rb
@@ -35,7 +35,7 @@
 
     it 'creates a report', :aggregate_failures do
       perform_enqueued_jobs do
-        subject
+        emails = capture_emails { subject }
 
         expect(response).to have_http_status(200)
         expect(body_as_json).to match(
@@ -49,7 +49,13 @@
         expect(target_account.targeted_reports).to_not be_empty
         expect(target_account.targeted_reports.first.comment).to eq 'reasons'
 
-        expect(ActionMailer::Base.deliveries.first.to).to eq([admin.email])
+        expect(emails.size)
+          .to eq(1)
+        expect(emails.first)
+          .to have_attributes(
+            to: contain_exactly(admin.email),
+            subject: eq(I18n.t('admin_mailer.new_report.subject', instance: Rails.configuration.x.local_domain, id: target_account.targeted_reports.first.id))
+          )
       end
     end
 
diff --git a/spec/services/notify_service_spec.rb b/spec/services/notify_service_spec.rb
index 38a33c522d0b11..e818fadcbe8d65 100644
--- a/spec/services/notify_service_spec.rb
+++ b/spec/services/notify_service_spec.rb
@@ -157,8 +157,6 @@
 
   describe 'email' do
     before do
-      ActionMailer::Base.deliveries.clear
-
       user.settings.update('notification_emails.follow': enabled)
       user.save
     end
@@ -167,7 +165,15 @@
       let(:enabled) { true }
 
       it 'sends email', :sidekiq_inline do
-        expect { subject }.to change(ActionMailer::Base.deliveries, :count).by(1)
+        emails = capture_emails { subject }
+
+        expect(emails.size)
+          .to eq(1)
+        expect(emails.first)
+          .to have_attributes(
+            to: contain_exactly(user.email),
+            subject: eq(I18n.t('notification_mailer.follow.subject', name: sender.acct))
+          )
       end
     end
 
@@ -175,7 +181,9 @@
       let(:enabled) { false }
 
       it "doesn't send email" do
-        expect { subject }.to_not change(ActionMailer::Base.deliveries, :count).from(0)
+        emails = capture_emails { subject }
+
+        expect(emails).to be_empty
       end
     end
   end
diff --git a/spec/services/report_service_spec.rb b/spec/services/report_service_spec.rb
index 39e14a6a1c7938..2caeb189d99551 100644
--- a/spec/services/report_service_spec.rb
+++ b/spec/services/report_service_spec.rb
@@ -158,13 +158,14 @@
 
     before do
       Fabricate(:report, target_account: target_account)
-      ActionMailer::Base.deliveries.clear
       source_account.user.settings['notification_emails.report'] = true
       source_account.user.save
     end
 
     it 'does not send an e-mail' do
-      expect { subject.call }.to_not change(ActionMailer::Base.deliveries, :count).from(0)
+      emails = capture_emails { subject.call }
+
+      expect(emails).to be_empty
     end
   end
 end
diff --git a/spec/workers/backup_worker_spec.rb b/spec/workers/backup_worker_spec.rb
index 987cbc7d609185..74928c7ca6ba63 100644
--- a/spec/workers/backup_worker_spec.rb
+++ b/spec/workers/backup_worker_spec.rb
@@ -15,12 +15,17 @@
     let!(:other_backup) { Fabricate(:backup, user: backup.user) }
 
     it 'sends the backup to the service and removes other backups', :sidekiq_inline do
-      expect do
-        worker.perform(backup.id)
-      end.to change(UserMailer.deliveries, :size).by(1)
+      emails = capture_emails { worker.perform(backup.id) }
 
       expect(service).to have_received(:call).with(backup)
       expect { other_backup.reload }.to raise_error(ActiveRecord::RecordNotFound)
+      expect(emails.size)
+        .to eq(1)
+      expect(emails.first)
+        .to have_attributes(
+          to: contain_exactly(backup.user.email),
+          subject: I18n.t('user_mailer.backup_ready.subject')
+        )
     end
 
     context 'when sidekiq retries are exhausted' do

From 89ea492d702218f1ac60ad7b2f2698f3cc1984aa Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 19 Feb 2024 19:54:51 +0100
Subject: [PATCH 0152/2191] Further reduce CSS changes with upstream (#2632)

---
 .../flavours/glitch/styles/components.scss    | 425 +++++++++---------
 1 file changed, 210 insertions(+), 215 deletions(-)

diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index a74d862c283782..30366b938f9e5a 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -1186,6 +1186,216 @@ body > [data-popper-placement] {
   text-overflow: ellipsis;
 }
 
+.notification__relative_time {
+  color: $dark-text-color;
+  float: right;
+  font-size: 14px;
+  padding-bottom: 1px;
+}
+
+.status__display-name {
+  color: $dark-text-color;
+  overflow: hidden;
+}
+
+.status__info__account .status__display-name {
+  display: block;
+  max-width: 100%;
+}
+
+.status__info {
+  display: flex;
+  justify-content: space-between;
+  font-size: 15px;
+
+  > span {
+    text-overflow: ellipsis;
+    overflow: hidden;
+  }
+
+  .notification__message > span {
+    word-wrap: break-word;
+  }
+}
+
+.status__info__icons {
+  display: flex;
+  align-items: center;
+  height: 1em;
+  color: $action-button-color;
+
+  .status__media-icon,
+  .status__visibility-icon,
+  .status__reply-icon,
+  .text-icon {
+    padding-inline-start: 2px;
+    padding-inline-end: 2px;
+  }
+
+  & > .icon {
+    width: 16px;
+    height: 16px;
+  }
+
+  .status__collapse-button.active > .icon {
+    transform: rotate(-180deg);
+  }
+}
+
+.no-reduce-motion .status__collapse-button {
+  &.activate {
+    & > .icon {
+      animation: spring-flip-in 1s linear;
+    }
+  }
+
+  &.deactivate {
+    & > .icon {
+      animation: spring-flip-out 1s linear;
+    }
+  }
+}
+
+.status__info__account {
+  display: flex;
+  align-items: center;
+  justify-content: flex-start;
+}
+
+.status-check-box__status {
+  display: block;
+  box-sizing: border-box;
+  width: 100%;
+  padding: 0 10px;
+
+  .detailed-status__display-name {
+    color: lighten($inverted-text-color, 16%);
+
+    span {
+      display: inline;
+    }
+
+    &:hover strong {
+      text-decoration: none;
+    }
+  }
+
+  .media-gallery,
+  .audio-player,
+  .video-player {
+    margin-top: 15px;
+    max-width: 250px;
+  }
+
+  .status__content {
+    padding: 0;
+    white-space: normal;
+  }
+
+  .media-gallery__item-thumbnail {
+    cursor: default;
+  }
+}
+
+.status__prepend {
+  display: inline-flex;
+  gap: 10px;
+  font-size: 14px;
+  line-height: 22px;
+  font-weight: 500;
+  color: $dark-text-color;
+
+  .status__display-name strong {
+    color: $dark-text-color;
+  }
+
+  > span {
+    display: block;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+}
+
+.status__action-bar {
+  align-items: center;
+  display: flex;
+  gap: 18px;
+  margin-top: 8px;
+}
+
+.status__action-bar-spacer {
+  flex-grow: 1;
+}
+
+.detailed-status__action-bar-dropdown {
+  flex: 1 1 auto;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  position: relative;
+}
+
+.detailed-status {
+  background: lighten($ui-base-color, 4%);
+  padding: 14px 10px;
+  border-top: 1px solid lighten($ui-base-color, 8%);
+
+  &--flex {
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-between;
+    align-items: flex-start;
+
+    .status__content,
+    .detailed-status__meta {
+      flex: 100%;
+    }
+  }
+
+  .status__content {
+    font-size: 19px;
+    line-height: 24px;
+
+    .emojione {
+      width: 24px;
+      height: 24px;
+      margin: -1px 0 0;
+    }
+  }
+
+  .media-gallery,
+  .video-player,
+  .audio-player {
+    margin-top: 8px;
+  }
+}
+
+.scrollable > div:first-child .detailed-status {
+  border-top: 0;
+}
+
+.detailed-status__meta {
+  margin-top: 15px;
+  color: $dark-text-color;
+  font-size: 14px;
+  line-height: 18px;
+
+  .icon {
+    width: 15px;
+    height: 15px;
+    vertical-align: middle;
+  }
+}
+
+.detailed-status__action-bar {
+  background: lighten($ui-base-color, 4%);
+  border-top: 1px solid lighten($ui-base-color, 8%);
+  border-bottom: 1px solid lighten($ui-base-color, 8%);
+  display: flex;
+  flex-direction: row;
+  padding: 8px 0;
+}
+
 .compose-form__textarea-icons {
   display: block;
   position: absolute;
@@ -5111,11 +5321,6 @@ a.status-card.compact:hover {
   }
 }
 
-.status__prepend-icon-wrapper {
-  inset-inline-start: -26px;
-  position: absolute;
-}
-
 .notification-follow,
 .notification-follow-request {
   position: relative;
@@ -5138,216 +5343,6 @@ a.status-card.compact:hover {
   }
 }
 
-.status__display-name {
-  color: $dark-text-color;
-  overflow: hidden;
-}
-
-.status__info__account .status__display-name {
-  display: block;
-  max-width: 100%;
-}
-
-.status__info {
-  display: flex;
-  justify-content: space-between;
-  font-size: 15px;
-
-  > span {
-    text-overflow: ellipsis;
-    overflow: hidden;
-  }
-
-  .notification__message > span {
-    word-wrap: break-word;
-  }
-}
-
-.status__info__icons {
-  display: flex;
-  align-items: center;
-  height: 1em;
-  color: $action-button-color;
-
-  .status__media-icon,
-  .status__visibility-icon,
-  .status__reply-icon,
-  .text-icon {
-    padding-inline-start: 2px;
-    padding-inline-end: 2px;
-  }
-
-  & > .icon {
-    width: 16px;
-    height: 16px;
-  }
-
-  .status__collapse-button.active > .icon {
-    transform: rotate(-180deg);
-  }
-}
-
-.no-reduce-motion .status__collapse-button {
-  &.activate {
-    & > .icon {
-      animation: spring-flip-in 1s linear;
-    }
-  }
-
-  &.deactivate {
-    & > .icon {
-      animation: spring-flip-out 1s linear;
-    }
-  }
-}
-
-.status__info__account {
-  display: flex;
-  align-items: center;
-  justify-content: flex-start;
-}
-
-.status-check-box__status {
-  display: block;
-  box-sizing: border-box;
-  width: 100%;
-  padding: 0 10px;
-
-  .detailed-status__display-name {
-    color: lighten($inverted-text-color, 16%);
-
-    span {
-      display: inline;
-    }
-
-    &:hover strong {
-      text-decoration: none;
-    }
-  }
-
-  .media-gallery,
-  .audio-player,
-  .video-player {
-    margin-top: 15px;
-    max-width: 250px;
-  }
-
-  .status__content {
-    padding: 0;
-    white-space: normal;
-  }
-
-  .media-gallery__item-thumbnail {
-    cursor: default;
-  }
-}
-
-.status__prepend {
-  margin-top: -2px;
-  margin-bottom: 8px;
-  margin-inline-start: 58px;
-  color: $dark-text-color;
-  font-size: 14px;
-  position: relative;
-
-  .status__display-name strong {
-    color: $dark-text-color;
-  }
-
-  > span {
-    display: block;
-    overflow: hidden;
-    text-overflow: ellipsis;
-  }
-}
-
-.status__action-bar {
-  align-items: center;
-  display: flex;
-  margin-top: 8px;
-}
-
-.status__action-bar-button {
-  margin-inline-end: 18px;
-
-  &.icon-button--with-counter {
-    margin-inline-end: 14px;
-  }
-}
-
-.status__action-bar-dropdown {
-  height: 23.15px;
-  width: 23.15px;
-}
-
-.status__action-bar-spacer {
-  flex-grow: 1;
-}
-
-.detailed-status__action-bar-dropdown {
-  flex: 1 1 auto;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  position: relative;
-}
-
-.detailed-status {
-  background: lighten($ui-base-color, 4%);
-  padding: 14px 10px;
-  border-top: 1px solid lighten($ui-base-color, 8%);
-
-  &--flex {
-    display: flex;
-    flex-wrap: wrap;
-    justify-content: space-between;
-    align-items: flex-start;
-
-    .status__content,
-    .detailed-status__meta {
-      flex: 100%;
-    }
-  }
-
-  .status__content {
-    font-size: 19px;
-    line-height: 24px;
-
-    .emojione {
-      width: 24px;
-      height: 24px;
-      margin: -1px 0 0;
-    }
-  }
-
-  .video-player,
-  .audio-player {
-    margin-top: 8px;
-  }
-}
-
-.detailed-status__meta {
-  margin-top: 15px;
-  color: $dark-text-color;
-  font-size: 14px;
-  line-height: 18px;
-
-  .icon {
-    width: 15px;
-    height: 15px;
-    vertical-align: middle;
-  }
-}
-
-.detailed-status__action-bar {
-  background: lighten($ui-base-color, 4%);
-  border-top: 1px solid lighten($ui-base-color, 8%);
-  border-bottom: 1px solid lighten($ui-base-color, 8%);
-  display: flex;
-  flex-direction: row;
-  padding: 8px 0;
-}
-
 .language-dropdown {
   &__dropdown {
     background: $simple-background-color;

From 0a2b95c4f5412e7b422464f0960a1fb9843f4da8 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 19 Feb 2024 22:47:01 +0100
Subject: [PATCH 0153/2191] Adopt upstream's design for preview cards (#2634)

Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: Christian Schmidt <github@chsc.dk>
---
 .../flavours/glitch/components/status.jsx     |   1 -
 .../features/status/components/card.jsx       |  95 ++++------
 .../flavours/glitch/styles/components.scss    | 175 +++++++++++-------
 3 files changed, 137 insertions(+), 134 deletions(-)

diff --git a/app/javascript/flavours/glitch/components/status.jsx b/app/javascript/flavours/glitch/components/status.jsx
index 02d4adf015bdf4..62b58a5ec9b7be 100644
--- a/app/javascript/flavours/glitch/components/status.jsx
+++ b/app/javascript/flavours/glitch/components/status.jsx
@@ -729,7 +729,6 @@ class Status extends ImmutablePureComponent {
         <Card
           onOpenMedia={this.handleOpenMedia}
           card={status.get('card')}
-          compact
           sensitive={status.get('sensitive')}
         />,
       );
diff --git a/app/javascript/flavours/glitch/features/status/components/card.jsx b/app/javascript/flavours/glitch/features/status/components/card.jsx
index 3d5522ab61374d..c4461f43781c11 100644
--- a/app/javascript/flavours/glitch/features/status/components/card.jsx
+++ b/app/javascript/flavours/glitch/features/status/components/card.jsx
@@ -8,12 +8,12 @@ import classNames from 'classnames';
 import Immutable from 'immutable';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 
-
 import DescriptionIcon from '@/material-icons/400-24px/description-fill.svg?react';
 import OpenInNewIcon from '@/material-icons/400-24px/open_in_new.svg?react';
 import PlayArrowIcon from '@/material-icons/400-24px/play_arrow-fill.svg?react';
 import { Blurhash } from 'flavours/glitch/components/blurhash';
 import { Icon }  from 'flavours/glitch/components/icon';
+import { RelativeTimestamp } from 'flavours/glitch/components/relative_timestamp';
 import { useBlurhash } from 'flavours/glitch/initial_state';
 import { decode as decodeIDNA } from 'flavours/glitch/utils/idna';
 
@@ -51,14 +51,9 @@ export default class Card extends PureComponent {
   static propTypes = {
     card: ImmutablePropTypes.map,
     onOpenMedia: PropTypes.func.isRequired,
-    compact: PropTypes.bool,
     sensitive: PropTypes.bool,
   };
 
-  static defaultProps = {
-    compact: false,
-  };
-
   state = {
     previewLoaded: false,
     embedded: false,
@@ -69,6 +64,7 @@ export default class Card extends PureComponent {
     if (!Immutable.is(this.props.card, nextProps.card)) {
       this.setState({ embedded: false, previewLoaded: false });
     }
+
     if (this.props.sensitive !== nextProps.sensitive) {
       this.setState({ revealed: !nextProps.sensitive });
     }
@@ -82,35 +78,8 @@ export default class Card extends PureComponent {
     window.removeEventListener('resize', this.handleResize);
   }
 
-  handlePhotoClick = () => {
-    const { card, onOpenMedia } = this.props;
-
-    onOpenMedia(
-      Immutable.fromJS([
-        {
-          type: 'image',
-          url: card.get('embed_url'),
-          description: card.get('title'),
-          meta: {
-            original: {
-              width: card.get('width'),
-              height: card.get('height'),
-            },
-          },
-        },
-      ]),
-      0,
-    );
-  };
-
   handleEmbedClick = () => {
-    const { card } = this.props;
-
-    if (card.get('type') === 'photo') {
-      this.handlePhotoClick();
-    } else {
-      this.setState({ embedded: true });
-    }
+    this.setState({ embedded: true });
   };
 
   setRef = c => {
@@ -128,21 +97,21 @@ export default class Card extends PureComponent {
   };
 
   renderVideo () {
-    const { card }  = this.props;
-    const content   = { __html: addAutoPlay(card.get('html')) };
+    const { card } = this.props;
+    const content = { __html: addAutoPlay(card.get('html')) };
 
     return (
       <div
         ref={this.setRef}
         className='status-card__image status-card-video'
         dangerouslySetInnerHTML={content}
-        style={{ aspectRatio: `${card.get('width')} / ${card.get('height')}` }}
+        style={{ aspectRatio: '16 / 9' }}
       />
     );
   }
 
   render () {
-    const { card, compact } = this.props;
+    const { card } = this.props;
     const { embedded, revealed } = this.state;
 
     if (card === null) {
@@ -150,29 +119,37 @@ export default class Card extends PureComponent {
     }
 
     const provider    = card.get('provider_name').length === 0 ? decodeIDNA(getHostname(card.get('url'))) : card.get('provider_name');
-    const horizontal  = (!compact && card.get('width') > card.get('height')) || card.get('type') !== 'link' || embedded;
-    const interactive = card.get('type') !== 'link';
-    const className   = classNames('status-card', { horizontal, compact, interactive });
-    const title       = interactive ? <a className='status-card__title' href={card.get('url')} title={card.get('title')} rel='noopener noreferrer' target='_blank'><strong>{card.get('title')}</strong></a> : <strong className='status-card__title' title={card.get('title')}>{card.get('title')}</strong>;
+    const interactive = card.get('type') === 'video';
     const language    = card.get('language') || '';
+    const largeImage  = (card.get('image')?.length > 0 && card.get('width') > card.get('height')) || interactive;
 
     const description = (
-      <div className='status-card__content' lang={language}>
-        {title}
-        {!(horizontal || compact) && <p className='status-card__description' title={card.get('description')}>{card.get('description')}</p>}
-        <span className='status-card__host'>{provider}</span>
+      <div className='status-card__content'>
+        <span className='status-card__host'>
+          <span lang={language}>{provider}</span>
+          {card.get('published_at') && <> · <RelativeTimestamp timestamp={card.get('published_at')} /></>}
+        </span>
+
+        <strong className='status-card__title' title={card.get('title')} lang={language}>{card.get('title')}</strong>
+
+        {card.get('author_name').length > 0 ? <span className='status-card__author'><FormattedMessage id='link_preview.author' defaultMessage='By {name}' values={{ name: <strong>{card.get('author_name')}</strong> }} /></span> : <span className='status-card__description' lang={language}>{card.get('description')}</span>}
       </div>
     );
 
     const thumbnailStyle = {
-      visibility: revealed? null : 'hidden',
+      visibility: revealed ? null : 'hidden',
     };
 
-    if (horizontal) {
-      thumbnailStyle.aspectRatio = (compact && !embedded) ? '16 / 9' : `${card.get('width')} / ${card.get('height')}`;
+    if (largeImage && card.get('type') === 'video') {
+      thumbnailStyle.aspectRatio = `16 / 9`;
+    } else if (largeImage) {
+      thumbnailStyle.aspectRatio = '1.91 / 1';
+    } else {
+      thumbnailStyle.aspectRatio = 1;
     }
 
-    let embed     = '';
+    let embed;
+
     let canvas = (
       <Blurhash
         className={classNames('status-card__image-preview', {
@@ -205,22 +182,16 @@ export default class Card extends PureComponent {
       if (embedded) {
         embed = this.renderVideo();
       } else {
-        let iconVariant = 'play';
-
-        if (card.get('type') === 'photo') {
-          iconVariant = 'search-plus';
-        }
-
         embed = (
           <div className='status-card__image'>
             {canvas}
             {thumbnail}
 
             {revealed ? (
-              <div className='status-card__actions'>
+              <div className='status-card__actions' onClick={this.handleEmbedClick} role='none'>
                 <div>
-                  <button type='button' onClick={this.handleEmbedClick}><Icon id={iconVariant} icon={PlayArrowIcon} /></button>
-                  {horizontal && <a href={card.get('url')} target='_blank' rel='noopener noreferrer'><Icon id='external-link' icon={OpenInNewIcon} /></a>}
+                  <button type='button' onClick={this.handleEmbedClick}><Icon id='play' icon={PlayArrowIcon} /></button>
+                  <a href={card.get('url')} target='_blank' rel='noopener noreferrer'><Icon id='external-link' icon={OpenInNewIcon} /></a>
                 </div>
               </div>
             ) : spoilerButton}
@@ -229,9 +200,9 @@ export default class Card extends PureComponent {
       }
 
       return (
-        <div className={className} ref={this.setRef} onClick={revealed ? null : this.handleReveal} role={revealed ? 'button' : null}>
+        <div className={classNames('status-card', { expanded: largeImage })} ref={this.setRef} onClick={revealed ? null : this.handleReveal} role={revealed ? 'button' : null}>
           {embed}
-          {!compact && description}
+          <a href={card.get('url')} target='_blank' rel='noopener noreferrer'>{description}</a>
         </div>
       );
     } else if (card.get('image')) {
@@ -250,7 +221,7 @@ export default class Card extends PureComponent {
     }
 
     return (
-      <a href={card.get('url')} className={className} target='_blank' rel='noopener noreferrer' ref={this.setRef}>
+      <a href={card.get('url')} className={classNames('status-card', { expanded: largeImage })} target='_blank' rel='noopener noreferrer' ref={this.setRef}>
         {embed}
         {description}
       </a>
diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index 30366b938f9e5a..f2decf9b5312c6 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -3486,15 +3486,16 @@ input.glitch-setting-text {
 }
 
 .status-card {
-  position: relative;
   display: flex;
+  align-items: center;
+  position: relative;
   font-size: 14px;
-  border: 1px solid lighten($ui-base-color, 8%);
-  border-radius: 4px;
-  color: $dark-text-color;
+  color: $darker-text-color;
   margin-top: 14px;
   text-decoration: none;
   overflow: hidden;
+  border: 1px solid lighten($ui-base-color, 8%);
+  border-radius: 8px;
 
   &__actions {
     bottom: 0;
@@ -3505,11 +3506,13 @@ input.glitch-setting-text {
     display: flex;
     justify-content: center;
     align-items: center;
+    cursor: pointer;
 
     & > div {
       background: rgba($base-shadow-color, 0.6);
       border-radius: 8px;
       padding: 12px 9px;
+      backdrop-filter: blur(10px) saturate(180%) contrast(75%) brightness(70%);
       flex: 0 0 auto;
       display: flex;
       justify-content: center;
@@ -3539,19 +3542,37 @@ input.glitch-setting-text {
       position: relative;
       bottom: -1px;
     }
-
-    a .fa,
-    a:hover .fa {
-      color: inherit;
-    }
   }
 }
 
 a.status-card {
   cursor: pointer;
 
-  &:hover {
-    background: lighten($ui-base-color, 8%);
+  &:hover,
+  &:focus,
+  &:active {
+    .status-card__title,
+    .status-card__host,
+    .status-card__author,
+    .status-card__description {
+      color: $highlight-text-color;
+    }
+  }
+}
+
+.status-card a {
+  color: inherit;
+  text-decoration: none;
+
+  &:hover,
+  &:focus,
+  &:active {
+    .status-card__title,
+    .status-card__host,
+    .status-card__author,
+    .status-card__description {
+      color: $highlight-text-color;
+    }
   }
 }
 
@@ -3577,41 +3598,66 @@ a.status-card {
 
 .status-card__title {
   display: block;
-  font-weight: 500;
-  margin-bottom: 5px;
-  color: $darker-text-color;
+  font-weight: 700;
+  font-size: 19px;
+  line-height: 24px;
+  color: $primary-text-color;
   overflow: hidden;
-  text-overflow: ellipsis;
   white-space: nowrap;
-  text-decoration: none;
+  text-overflow: ellipsis;
+}
+
+.status-card.expanded .status-card__title {
+  white-space: normal;
+  display: -webkit-box;
+  -webkit-line-clamp: 2;
+  -webkit-box-orient: vertical;
 }
 
 .status-card__content {
   flex: 1 1 auto;
   overflow: hidden;
-  padding: 14px;
-  padding-inline-start: 8px;
+  padding: 8px 10px; // intentional glitch-soc change to reduce padding
+  box-sizing: border-box;
+  max-width: 100%;
 }
 
-.status-card__description {
-  color: $darker-text-color;
+.status-card__host {
+  display: block;
+  font-size: 14px;
+  margin-bottom: 8px;
+  white-space: nowrap;
   overflow: hidden;
-  display: -webkit-box;
-  -webkit-box-orient: vertical;
-  -webkit-line-clamp: 2;
+  text-overflow: ellipsis;
 }
 
-.status-card__host {
+.status-card__author {
   display: block;
-  margin-top: 5px;
-  font-size: 13px;
+  margin-top: 8px;
+  font-size: 14px;
+  color: $primary-text-color;
+  white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
+
+  strong {
+    font-weight: 500;
+  }
+}
+
+.status-card__description {
+  display: block;
+  margin-top: 8px;
+  font-size: 14px;
   white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
 }
 
 .status-card__image {
-  flex: 0 0 100px;
+  flex: 0 0 auto;
+  width: 96px; // intentional glitch-soc change to better use space
+  aspect-ratio: 1;
   background: lighten($ui-base-color, 8%);
   position: relative;
 
@@ -3626,50 +3672,7 @@ a.status-card {
   }
 }
 
-.status-card.horizontal {
-  display: block;
-
-  .status-card__image {
-    width: 100%;
-  }
-
-  .status-card__image-image,
-  .status-card__image-preview {
-    border-radius: 4px 4px 0 0;
-  }
-
-  .status-card__title {
-    white-space: inherit;
-  }
-}
-
-.status-card.compact {
-  border-color: lighten($ui-base-color, 4%);
-
-  &.interactive {
-    border: 0;
-  }
-
-  .status-card__content {
-    padding: 8px;
-    padding-top: 10px;
-  }
-
-  .status-card__title {
-    white-space: nowrap;
-  }
-
-  .status-card__image {
-    flex: 0 0 60px;
-  }
-}
-
-a.status-card.compact:hover {
-  background-color: lighten($ui-base-color, 4%);
-}
-
 .status-card__image-image {
-  border-radius: 4px 0 0 4px;
   display: block;
   margin: 0;
   width: 100%;
@@ -3680,7 +3683,6 @@ a.status-card.compact:hover {
 }
 
 .status-card__image-preview {
-  border-radius: 4px 0 0 4px;
   display: block;
   margin: 0;
   width: 100%;
@@ -3697,6 +3699,37 @@ a.status-card.compact:hover {
   }
 }
 
+.status-card.expanded {
+  flex-direction: column;
+  align-items: flex-start;
+}
+
+.status-card.expanded .status-card__image {
+  width: 100%;
+  aspect-ratio: auto;
+}
+
+.status-card__image,
+.status-card__image-image,
+.status-card__image-preview {
+  border-start-start-radius: 8px;
+  border-start-end-radius: 0;
+  border-end-end-radius: 0;
+  border-end-start-radius: 8px;
+}
+
+.status-card.expanded .status-card__image,
+.status-card.expanded .status-card__image-image,
+.status-card.expanded .status-card__image-preview {
+  border-start-end-radius: 8px;
+  border-end-end-radius: 0;
+  border-end-start-radius: 0;
+}
+
+.status-card.expanded > a {
+  width: 100%;
+}
+
 .notification,
 .status {
   position: relative;

From b8b2f20b16d92274fc3e576f493d19347f9421da Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Tue, 20 Feb 2024 10:10:44 +0100
Subject: [PATCH 0154/2191] Change explore icon from hashtag to compass in web
 UI (#29294)

---
 app/javascript/mastodon/features/explore/index.jsx            | 4 ++--
 .../mastodon/features/ui/components/navigation_panel.jsx      | 4 ++--
 app/javascript/material-icons/400-24px/explore-fill.svg       | 1 +
 app/javascript/material-icons/400-24px/explore.svg            | 1 +
 4 files changed, 6 insertions(+), 4 deletions(-)
 create mode 100644 app/javascript/material-icons/400-24px/explore-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/explore.svg

diff --git a/app/javascript/mastodon/features/explore/index.jsx b/app/javascript/mastodon/features/explore/index.jsx
index 8ebaccd0132de7..8cc8a4b009d20e 100644
--- a/app/javascript/mastodon/features/explore/index.jsx
+++ b/app/javascript/mastodon/features/explore/index.jsx
@@ -8,8 +8,8 @@ import { NavLink, Switch, Route } from 'react-router-dom';
 
 import { connect } from 'react-redux';
 
+import ExploreIcon from '@/material-icons/400-24px/explore.svg?react';
 import SearchIcon from '@/material-icons/400-24px/search.svg?react';
-import TagIcon from '@/material-icons/400-24px/tag.svg?react';
 import Column from 'mastodon/components/column';
 import ColumnHeader from 'mastodon/components/column_header';
 import Search from 'mastodon/features/compose/containers/search_container';
@@ -59,7 +59,7 @@ class Explore extends PureComponent {
       <Column bindToDocument={!multiColumn} ref={this.setRef} label={intl.formatMessage(messages.title)}>
         <ColumnHeader
           icon={isSearching ? 'search' : 'hashtag'}
-          iconComponent={isSearching ? SearchIcon : TagIcon}
+          iconComponent={isSearching ? SearchIcon : ExploreIcon}
           title={intl.formatMessage(isSearching ? messages.searchResults : messages.title)}
           onClick={this.handleHeaderClick}
           multiColumn={multiColumn}
diff --git a/app/javascript/mastodon/features/ui/components/navigation_panel.jsx b/app/javascript/mastodon/features/ui/components/navigation_panel.jsx
index bf5e2826bbf5e6..8fa149d0b7ec56 100644
--- a/app/javascript/mastodon/features/ui/components/navigation_panel.jsx
+++ b/app/javascript/mastodon/features/ui/components/navigation_panel.jsx
@@ -7,6 +7,7 @@ import { Link } from 'react-router-dom';
 
 import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
 import BookmarksIcon from '@/material-icons/400-24px/bookmarks-fill.svg?react';
+import ExploreIcon from '@/material-icons/400-24px/explore.svg?react';
 import HomeIcon from '@/material-icons/400-24px/home-fill.svg?react';
 import ListAltIcon from '@/material-icons/400-24px/list_alt.svg?react';
 import MoreHorizIcon from '@/material-icons/400-24px/more_horiz.svg?react';
@@ -14,7 +15,6 @@ import PublicIcon from '@/material-icons/400-24px/public.svg?react';
 import SearchIcon from '@/material-icons/400-24px/search.svg?react';
 import SettingsIcon from '@/material-icons/400-24px/settings-fill.svg?react';
 import StarIcon from '@/material-icons/400-24px/star-fill.svg?react';
-import TagIcon from '@/material-icons/400-24px/tag.svg?react';
 import { WordmarkLogo } from 'mastodon/components/logo';
 import { NavigationPortal } from 'mastodon/components/navigation_portal';
 import { timelinePreview, trendsEnabled } from 'mastodon/initial_state';
@@ -94,7 +94,7 @@ class NavigationPanel extends Component {
         )}
 
         {trendsEnabled ? (
-          <ColumnLink transparent to='/explore' icon='hashtag' iconComponent={TagIcon} text={intl.formatMessage(messages.explore)} />
+          <ColumnLink transparent to='/explore' icon='hashtag' iconComponent={ExploreIcon} text={intl.formatMessage(messages.explore)} />
         ) : (
           <ColumnLink transparent to='/search' icon='search' iconComponent={SearchIcon} text={intl.formatMessage(messages.search)} />
         )}
diff --git a/app/javascript/material-icons/400-24px/explore-fill.svg b/app/javascript/material-icons/400-24px/explore-fill.svg
new file mode 100644
index 00000000000000..febe0a63b44b3f
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/explore-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="m260-260 300-140 140-300-300 140-140 300Zm220-180q-17 0-28.5-11.5T440-480q0-17 11.5-28.5T480-520q17 0 28.5 11.5T520-480q0 17-11.5 28.5T480-440Zm0 360q-83 0-156-31.5T197-197q-54-54-85.5-127T80-480q0-83 31.5-156T197-763q54-54 127-85.5T480-880q83 0 156 31.5T763-763q54 54 85.5 127T880-480q0 83-31.5 156T763-197q-54 54-127 85.5T480-80Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/explore.svg b/app/javascript/material-icons/400-24px/explore.svg
new file mode 100644
index 00000000000000..547a9994217ab5
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/explore.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="m260-260 300-140 140-300-300 140-140 300Zm220-180q-17 0-28.5-11.5T440-480q0-17 11.5-28.5T480-520q17 0 28.5 11.5T520-480q0 17-11.5 28.5T480-440Zm0 360q-83 0-156-31.5T197-197q-54-54-85.5-127T80-480q0-83 31.5-156T197-763q54-54 127-85.5T480-880q83 0 156 31.5T763-763q54 54 85.5 127T880-480q0 83-31.5 156T763-197q-54 54-127 85.5T480-80Zm0-80q134 0 227-93t93-227q0-134-93-227t-227-93q-134 0-227 93t-93 227q0 134 93 227t227 93Zm0-320Z"/></svg>
\ No newline at end of file

From 6e4c1e172b4fdd20864e3dac2e04c69ed83aeb7d Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 20 Feb 2024 09:11:22 +0000
Subject: [PATCH 0155/2191] Update dependency webmock to v3.21.2 (#29290)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 79d3b1e637d90c..fac511d02664ad 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -793,7 +793,7 @@ GEM
     webfinger (1.2.0)
       activesupport
       httpclient (>= 2.4)
-    webmock (3.20.0)
+    webmock (3.21.2)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)

From 5d9d0d174a54bb07f9af236dc573b3f5bfa4896e Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 20 Feb 2024 10:17:41 +0100
Subject: [PATCH 0156/2191] Update dependency selenium-webdriver to v4.18.1
 (#29287)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index fac511d02664ad..8dd1a7ed08d5c3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -691,7 +691,7 @@ GEM
     scenic (1.7.0)
       activerecord (>= 4.0.0)
       railties (>= 4.0.0)
-    selenium-webdriver (4.17.0)
+    selenium-webdriver (4.18.1)
       base64 (~> 0.2)
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 3.0)

From 785e2f939980803c70a1e61c8eb6c0a2d7401d2d Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 20 Feb 2024 04:18:05 -0500
Subject: [PATCH 0157/2191] Add scope `providing_styles` to `UserRole` (#29286)

---
 app/controllers/custom_css_controller.rb | 2 +-
 app/models/user_role.rb                  | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/controllers/custom_css_controller.rb b/app/controllers/custom_css_controller.rb
index 62f8e0d772e647..eb6417698ae02d 100644
--- a/app/controllers/custom_css_controller.rb
+++ b/app/controllers/custom_css_controller.rb
@@ -16,6 +16,6 @@ def custom_css_styles
   helper_method :custom_css_styles
 
   def set_user_roles
-    @user_roles = UserRole.where(highlighted: true).where.not(color: [nil, ''])
+    @user_roles = UserRole.providing_styles
   end
 end
diff --git a/app/models/user_role.rb b/app/models/user_role.rb
index ed64ca05380ad9..9115d91c2442b1 100644
--- a/app/models/user_role.rb
+++ b/app/models/user_role.rb
@@ -97,6 +97,9 @@ module Flags
   before_validation :set_position
 
   scope :assignable, -> { where.not(id: EVERYONE_ROLE_ID).order(position: :asc) }
+  scope :highlighted, -> { where(highlighted: true) }
+  scope :with_color, -> { where.not(color: [nil, '']) }
+  scope :providing_styles, -> { highlighted.with_color }
 
   has_many :users, inverse_of: :role, foreign_key: 'role_id', dependent: :nullify
 

From bde4df6be651b930e724703a398947dd18c341fa Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 20 Feb 2024 10:18:44 +0100
Subject: [PATCH 0158/2191] Remove CSS definitions for some unused classes
 (#29279)

---
 .../styles/mastodon-light/diff.scss           |  6 ----
 .../styles/mastodon/components.scss           | 29 -------------------
 2 files changed, 35 deletions(-)

diff --git a/app/javascript/styles/mastodon-light/diff.scss b/app/javascript/styles/mastodon-light/diff.scss
index 520e91e28bbd67..e3872283e14033 100644
--- a/app/javascript/styles/mastodon-light/diff.scss
+++ b/app/javascript/styles/mastodon-light/diff.scss
@@ -210,12 +210,6 @@ html {
   }
 }
 
-// Change the background colors of media and video spoilers
-.media-spoiler,
-.video-player__spoiler {
-  background: $ui-base-color;
-}
-
 .account-gallery__item a {
   background-color: $ui-base-color;
 }
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 605b5d4b55838d..50b5de35dfb712 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -4325,35 +4325,6 @@ a.status-card {
   z-index: 100;
 }
 
-.media-spoiler {
-  background: $base-overlay-background;
-  color: $darker-text-color;
-  border: 0;
-  padding: 0;
-  width: 100%;
-  height: 100%;
-  border-radius: 4px;
-  appearance: none;
-
-  &:hover,
-  &:active,
-  &:focus {
-    padding: 0;
-    color: lighten($darker-text-color, 8%);
-  }
-}
-
-.media-spoiler__warning {
-  display: block;
-  font-size: 14px;
-}
-
-.media-spoiler__trigger {
-  display: block;
-  font-size: 11px;
-  font-weight: 700;
-}
-
 .spoiler-button {
   top: 0;
   inset-inline-start: 0;

From e1cee84e582ce0927c9cf2af344e5a04525d777e Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 20 Feb 2024 09:19:41 +0000
Subject: [PATCH 0159/2191] Update dependency cocoon-js-vanilla to v1.4.0
 (#29293)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 6ef5386d7af96d..f4c84110a14023 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5606,9 +5606,9 @@ __metadata:
   linkType: hard
 
 "cocoon-js-vanilla@npm:^1.3.0":
-  version: 1.3.0
-  resolution: "cocoon-js-vanilla@npm:1.3.0"
-  checksum: 12adec293ba625c608518ef504c24f4b5906873713092e55d28343dd12fbc9ab7940d8c2bbe02a320bd56120d3768ae90a8d8bc5a6a82e604a56c216b66027e1
+  version: 1.4.0
+  resolution: "cocoon-js-vanilla@npm:1.4.0"
+  checksum: 3a3976d325d24518317ca38536ad5f4e570c139b86082dd33c64d38c2a4b2c58fa9cc9aac4624d8fd2f4c9f0eafe681bb8872360010e6b36d9974d8abc57f520
   languageName: node
   linkType: hard
 

From 0ef44ee720a4d6a416de109cdc6c2fe7d528e3ba Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 20 Feb 2024 04:21:49 -0500
Subject: [PATCH 0160/2191] Move `AccountSuggestions::Source` subclasses
 default limit value to constant (#29282)

---
 app/models/account_suggestions/friends_of_friends_source.rb | 2 +-
 app/models/account_suggestions/global_source.rb             | 2 +-
 app/models/account_suggestions/setting_source.rb            | 2 +-
 app/models/account_suggestions/similar_profiles_source.rb   | 2 +-
 app/models/account_suggestions/source.rb                    | 2 ++
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/models/account_suggestions/friends_of_friends_source.rb b/app/models/account_suggestions/friends_of_friends_source.rb
index 28d0ab99b3b1f9..93fb10f3b064c6 100644
--- a/app/models/account_suggestions/friends_of_friends_source.rb
+++ b/app/models/account_suggestions/friends_of_friends_source.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class AccountSuggestions::FriendsOfFriendsSource < AccountSuggestions::Source
-  def get(account, limit: 10)
+  def get(account, limit: DEFAULT_LIMIT)
     Account.find_by_sql([<<~SQL.squish, { id: account.id, limit: limit }]).map { |row| [row.id, key] }
       WITH first_degree AS (
           SELECT target_account_id
diff --git a/app/models/account_suggestions/global_source.rb b/app/models/account_suggestions/global_source.rb
index d68f285e4f4e89..c05bcf2ce8d88b 100644
--- a/app/models/account_suggestions/global_source.rb
+++ b/app/models/account_suggestions/global_source.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class AccountSuggestions::GlobalSource < AccountSuggestions::Source
-  def get(account, limit: 10)
+  def get(account, limit: DEFAULT_LIMIT)
     FollowRecommendation.localized(content_locale).joins(:account).merge(base_account_scope(account)).order(rank: :desc).limit(limit).pluck(:account_id, :reason)
   end
 
diff --git a/app/models/account_suggestions/setting_source.rb b/app/models/account_suggestions/setting_source.rb
index 4b7275bf7ada96..9f3cd7bd3dcbe9 100644
--- a/app/models/account_suggestions/setting_source.rb
+++ b/app/models/account_suggestions/setting_source.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class AccountSuggestions::SettingSource < AccountSuggestions::Source
-  def get(account, limit: 10)
+  def get(account, limit: DEFAULT_LIMIT)
     if setting_enabled?
       base_account_scope(account).where(setting_to_where_condition).limit(limit).pluck(:id).zip([key].cycle)
     else
diff --git a/app/models/account_suggestions/similar_profiles_source.rb b/app/models/account_suggestions/similar_profiles_source.rb
index 733c5f0bbcd649..3ece20aa5133eb 100644
--- a/app/models/account_suggestions/similar_profiles_source.rb
+++ b/app/models/account_suggestions/similar_profiles_source.rb
@@ -47,7 +47,7 @@ def should_clauses
     end
   end
 
-  def get(account, limit: 10)
+  def get(account, limit: DEFAULT_LIMIT)
     recently_followed_account_ids = account.active_relationships.recent.limit(5).pluck(:target_account_id)
 
     if Chewy.enabled? && !recently_followed_account_ids.empty?
diff --git a/app/models/account_suggestions/source.rb b/app/models/account_suggestions/source.rb
index d83f5e3773cf6c..b2c3c7a3a24af4 100644
--- a/app/models/account_suggestions/source.rb
+++ b/app/models/account_suggestions/source.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class AccountSuggestions::Source
+  DEFAULT_LIMIT = 10
+
   def get(_account, **kwargs)
     raise NotImplementedError
   end

From 9a2b9d14840b640077b081fab3c98472e68f4c7e Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 20 Feb 2024 10:23:40 +0100
Subject: [PATCH 0161/2191] New Crowdin Translations (automated) (#29298)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/ar.json      |  1 -
 app/javascript/mastodon/locales/ast.json     |  1 -
 app/javascript/mastodon/locales/be.json      |  7 ++++-
 app/javascript/mastodon/locales/bg.json      |  1 -
 app/javascript/mastodon/locales/ca.json      |  7 ++++-
 app/javascript/mastodon/locales/cs.json      |  9 +++++--
 app/javascript/mastodon/locales/cy.json      |  1 -
 app/javascript/mastodon/locales/da.json      |  6 +++++
 app/javascript/mastodon/locales/de.json      |  7 ++++-
 app/javascript/mastodon/locales/en-GB.json   |  1 -
 app/javascript/mastodon/locales/es-AR.json   |  7 ++++-
 app/javascript/mastodon/locales/es-MX.json   |  3 ++-
 app/javascript/mastodon/locales/es.json      |  3 ++-
 app/javascript/mastodon/locales/eu.json      |  7 ++++-
 app/javascript/mastodon/locales/fi.json      |  7 ++++-
 app/javascript/mastodon/locales/fil.json     | 27 ++++++++++++++++++++
 app/javascript/mastodon/locales/fo.json      |  7 ++++-
 app/javascript/mastodon/locales/fy.json      |  7 ++++-
 app/javascript/mastodon/locales/ga.json      |  1 -
 app/javascript/mastodon/locales/gd.json      |  1 -
 app/javascript/mastodon/locales/gl.json      |  1 -
 app/javascript/mastodon/locales/he.json      |  7 ++++-
 app/javascript/mastodon/locales/hu.json      |  7 ++++-
 app/javascript/mastodon/locales/ia.json      |  1 -
 app/javascript/mastodon/locales/ie.json      |  1 -
 app/javascript/mastodon/locales/is.json      |  7 ++++-
 app/javascript/mastodon/locales/it.json      |  7 ++++-
 app/javascript/mastodon/locales/ja.json      | 10 ++++++++
 app/javascript/mastodon/locales/ko.json      |  7 ++++-
 app/javascript/mastodon/locales/lad.json     |  7 ++++-
 app/javascript/mastodon/locales/lt.json      |  5 +++-
 app/javascript/mastodon/locales/ms.json      |  1 -
 app/javascript/mastodon/locales/nl.json      |  7 ++++-
 app/javascript/mastodon/locales/pl.json      |  7 ++++-
 app/javascript/mastodon/locales/pt-BR.json   |  1 -
 app/javascript/mastodon/locales/pt-PT.json   |  7 ++++-
 app/javascript/mastodon/locales/ro.json      |  1 -
 app/javascript/mastodon/locales/ru.json      |  1 -
 app/javascript/mastodon/locales/sk.json      |  1 -
 app/javascript/mastodon/locales/sl.json      |  7 ++++-
 app/javascript/mastodon/locales/sq.json      |  7 ++++-
 app/javascript/mastodon/locales/sr-Latn.json |  1 -
 app/javascript/mastodon/locales/sr.json      |  6 ++++-
 app/javascript/mastodon/locales/th.json      |  1 -
 app/javascript/mastodon/locales/tr.json      |  7 ++++-
 app/javascript/mastodon/locales/uk.json      |  7 ++++-
 app/javascript/mastodon/locales/vi.json      |  1 -
 app/javascript/mastodon/locales/zh-CN.json   |  9 +++++--
 app/javascript/mastodon/locales/zh-HK.json   |  1 -
 app/javascript/mastodon/locales/zh-TW.json   |  5 ++++
 config/locales/cs.yml                        |  2 +-
 51 files changed, 202 insertions(+), 49 deletions(-)

diff --git a/app/javascript/mastodon/locales/ar.json b/app/javascript/mastodon/locales/ar.json
index 790a971cdfd543..2eebd1369cd6b8 100644
--- a/app/javascript/mastodon/locales/ar.json
+++ b/app/javascript/mastodon/locales/ar.json
@@ -277,7 +277,6 @@
   "follow_request.authorize": "ترخيص",
   "follow_request.reject": "رفض",
   "follow_requests.unlocked_explanation": "حتى وإن كان حسابك غير مقفل، يعتقد فريق {domain} أنك قد ترغب في مراجعة طلبات المتابعة من هذه الحسابات يدوياً.",
-  "follow_suggestions.curated_suggestion": "خيار المحرر",
   "follow_suggestions.dismiss": "لا تُظهرها مجدّدًا",
   "follow_suggestions.personalized_suggestion": "توصية مخصصة",
   "follow_suggestions.popular_suggestion": "توصية رائجة",
diff --git a/app/javascript/mastodon/locales/ast.json b/app/javascript/mastodon/locales/ast.json
index 18bba991174c8d..8e69d434b478dd 100644
--- a/app/javascript/mastodon/locales/ast.json
+++ b/app/javascript/mastodon/locales/ast.json
@@ -199,7 +199,6 @@
   "follow_request.authorize": "Autorizar",
   "follow_request.reject": "Refugar",
   "follow_requests.unlocked_explanation": "Magar que la to cuenta nun seya privada, el personal del dominiu «{domain}» pensó qu'a lo meyor quies revisar manualmente les solicitúes de siguimientu d'estes cuentes.",
-  "follow_suggestions.curated_suggestion": "Escoyeta del sirvidor",
   "follow_suggestions.dismiss": "Nun volver amosar",
   "follow_suggestions.personalized_suggestion": "Suxerencia personalizada",
   "follow_suggestions.popular_suggestion": "Suxerencia popular",
diff --git a/app/javascript/mastodon/locales/be.json b/app/javascript/mastodon/locales/be.json
index 7e21703b4a8d21..c0b744fbaf7160 100644
--- a/app/javascript/mastodon/locales/be.json
+++ b/app/javascript/mastodon/locales/be.json
@@ -277,8 +277,13 @@
   "follow_request.authorize": "Аўтарызацыя",
   "follow_request.reject": "Адхіліць",
   "follow_requests.unlocked_explanation": "Ваш акаўнт не схаваны, аднак прадстаўнікі {domain} палічылі, што вы можаце захацець праглядзець запыты на падпіску з гэтых профіляў уручную.",
-  "follow_suggestions.curated_suggestion": "Выбар сервера",
+  "follow_suggestions.curated_suggestion": "Выбар адміністрацыі",
   "follow_suggestions.dismiss": "Не паказваць зноў",
+  "follow_suggestions.hints.featured": "Гэты профіль быў выбраны ўручную камандай {domain}.",
+  "follow_suggestions.hints.friends_of_friends": "Гэты профіль папулярны сярод людзей, на якіх вы падпісаліся.",
+  "follow_suggestions.hints.most_followed": "Гэты профіль - адзін з профіляў з самай вялікай колькасцю падпісак на {domain}.",
+  "follow_suggestions.hints.most_interactions": "У апошні час гэты профіль прыцягвае шмат увагі на {domain}.",
+  "follow_suggestions.hints.similar_to_recently_followed": "Гэты профіль падобны на профілі, на якія вы нядаўна падпісаліся.",
   "follow_suggestions.personalized_suggestion": "Персаналізаваная прапанова",
   "follow_suggestions.popular_suggestion": "Папулярная прапанова",
   "follow_suggestions.view_all": "Праглядзець усё",
diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json
index 3e7f6e51b218f4..5acee5cdd0831d 100644
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@@ -277,7 +277,6 @@
   "follow_request.authorize": "Упълномощаване",
   "follow_request.reject": "Отхвърляне",
   "follow_requests.unlocked_explanation": "Въпреки че акаунтът ви не е заключен, служителите на {domain} помислиха, че може да искате да преглеждате ръчно заявките за последване на тези профили.",
-  "follow_suggestions.curated_suggestion": "Избор от редакторите",
   "follow_suggestions.dismiss": "Без ново показване",
   "follow_suggestions.personalized_suggestion": "Персонализирано предложение",
   "follow_suggestions.popular_suggestion": "Популярно предложение",
diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index 42de594cdc2ea9..d50f38aa1525db 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -277,8 +277,13 @@
   "follow_request.authorize": "Autoritza",
   "follow_request.reject": "Rebutja",
   "follow_requests.unlocked_explanation": "Tot i que el teu compte no està blocat, el personal de {domain} ha pensat que és possible que vulguis revisar manualment les sol·licituds de seguiment d’aquests comptes.",
-  "follow_suggestions.curated_suggestion": "Tria de l'editor",
+  "follow_suggestions.curated_suggestion": "Tria de l'equip",
   "follow_suggestions.dismiss": "No ho tornis a mostrar",
+  "follow_suggestions.hints.featured": "Aquest perfil ha estat triat per l'equip de {domain}.",
+  "follow_suggestions.hints.friends_of_friends": "Aquest perfil és popular entre la gent que segueixes.",
+  "follow_suggestions.hints.most_followed": "Aquest perfil és un dels més seguits a {domain}.",
+  "follow_suggestions.hints.most_interactions": "Aquest perfil ha estat rebent un munt d'atenció recentment a {domain}.",
+  "follow_suggestions.hints.similar_to_recently_followed": "Aquest perfil és similar a d'altres que heu seguit recentment.",
   "follow_suggestions.personalized_suggestion": "Suggeriment personalitzat",
   "follow_suggestions.popular_suggestion": "Suggeriment popular",
   "follow_suggestions.view_all": "Mostra-ho tot",
diff --git a/app/javascript/mastodon/locales/cs.json b/app/javascript/mastodon/locales/cs.json
index 2856ac4a45eba5..00b27e05216d93 100644
--- a/app/javascript/mastodon/locales/cs.json
+++ b/app/javascript/mastodon/locales/cs.json
@@ -276,9 +276,14 @@
   "firehose.remote": "Ostatní servery",
   "follow_request.authorize": "Autorizovat",
   "follow_request.reject": "Zamítnout",
-  "follow_requests.unlocked_explanation": "Přestože váš účet není zamčený, administrátor {domain} usoudil, že byste mohli chtít tyto žádosti o sledování zkontrolovat ručně.",
-  "follow_suggestions.curated_suggestion": "Návrh serveru",
+  "follow_requests.unlocked_explanation": "Přestože váš účet není uzamčen, personál {domain} usoudil, že byste mohli chtít tyto požadavky na sledování zkontrolovat ručně.",
+  "follow_suggestions.curated_suggestion": "Výběr personálů",
   "follow_suggestions.dismiss": "Znovu nezobrazovat",
+  "follow_suggestions.hints.featured": "Tento profil byl ručně vybrán týmem {domain}.",
+  "follow_suggestions.hints.friends_of_friends": "Tento profil je populární mezi lidmi, které sledujete.",
+  "follow_suggestions.hints.most_followed": "Tento profil je jedním z nejvíce sledovaných na {domain}.",
+  "follow_suggestions.hints.most_interactions": "Tento profil nedávno dostalo velkou pozornost na {domain}.",
+  "follow_suggestions.hints.similar_to_recently_followed": "Tento profil je podobný profilům, které jste nedávno sledovali.",
   "follow_suggestions.personalized_suggestion": "Přizpůsobený návrh",
   "follow_suggestions.popular_suggestion": "Populární návrh",
   "follow_suggestions.view_all": "Zobrazit vše",
diff --git a/app/javascript/mastodon/locales/cy.json b/app/javascript/mastodon/locales/cy.json
index f023c5a2a7720c..294cdde38f24d2 100644
--- a/app/javascript/mastodon/locales/cy.json
+++ b/app/javascript/mastodon/locales/cy.json
@@ -277,7 +277,6 @@
   "follow_request.authorize": "Awdurdodi",
   "follow_request.reject": "Gwrthod",
   "follow_requests.unlocked_explanation": "Er nid yw eich cyfrif wedi'i gloi, roedd y staff {domain} yn meddwl efallai hoffech adolygu ceisiadau dilyn o'r cyfrifau rhain wrth law.",
-  "follow_suggestions.curated_suggestion": "Dewis y Golygydd",
   "follow_suggestions.dismiss": "Peidio â dangos hwn eto",
   "follow_suggestions.personalized_suggestion": "Awgrym personol",
   "follow_suggestions.popular_suggestion": "Awgrym poblogaidd",
diff --git a/app/javascript/mastodon/locales/da.json b/app/javascript/mastodon/locales/da.json
index 548421b3c03d3b..b9ef82bf0c68ea 100644
--- a/app/javascript/mastodon/locales/da.json
+++ b/app/javascript/mastodon/locales/da.json
@@ -277,7 +277,13 @@
   "follow_request.authorize": "Godkend",
   "follow_request.reject": "Afvis",
   "follow_requests.unlocked_explanation": "Selvom din konto ikke er låst, synes {domain}-personalet, du måske bør gennemgå disse anmodninger manuelt.",
+  "follow_suggestions.curated_suggestion": "Personaleudvalgt",
   "follow_suggestions.dismiss": "Vis ikke igen",
+  "follow_suggestions.hints.featured": "Denne profil er håndplukket af {domain}-teamet.",
+  "follow_suggestions.hints.friends_of_friends": "Denne profil er populær blandt de personer, som følges.",
+  "follow_suggestions.hints.most_followed": "Denne profil er en af de mest fulgte på {domain}.",
+  "follow_suggestions.hints.most_interactions": "Denne profil har for nylig fået stor opmærksomhed på {domain}.",
+  "follow_suggestions.hints.similar_to_recently_followed": "Denne profil svarer til de profiler, som senest er blevet fulgt.",
   "follow_suggestions.personalized_suggestion": "Personligt forslag",
   "follow_suggestions.popular_suggestion": "Populært forslag",
   "follow_suggestions.view_all": "Vis alle",
diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json
index f29d016b07438f..2c9431481064ca 100644
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@@ -277,8 +277,13 @@
   "follow_request.authorize": "Genehmigen",
   "follow_request.reject": "Ablehnen",
   "follow_requests.unlocked_explanation": "Auch wenn dein Konto öffentlich bzw. nicht geschützt ist, haben die Moderator*innen von {domain} gedacht, dass du diesen Follower lieber manuell bestätigen solltest.",
-  "follow_suggestions.curated_suggestion": "Auswahl des Herausgebers",
+  "follow_suggestions.curated_suggestion": "Vom Server empfohlen",
   "follow_suggestions.dismiss": "Nicht mehr anzeigen",
+  "follow_suggestions.hints.featured": "Dieses Profil wurde vom {domain}-Team ausgewählt.",
+  "follow_suggestions.hints.friends_of_friends": "Dieses Profil ist bei deinen Followern beliebt.",
+  "follow_suggestions.hints.most_followed": "Dieses Profil wird von den meisten auf {domain} gefolgt.",
+  "follow_suggestions.hints.most_interactions": "Dieses Profil erhielt auf {domain} in letzter Zeit viel Aufmerksamkeit.",
+  "follow_suggestions.hints.similar_to_recently_followed": "Dieses Profil ähnelt den Profilen, denen du in letzter Zeit gefolgt hast.",
   "follow_suggestions.personalized_suggestion": "Persönliche Empfehlung",
   "follow_suggestions.popular_suggestion": "Beliebte Empfehlung",
   "follow_suggestions.view_all": "Alle anzeigen",
diff --git a/app/javascript/mastodon/locales/en-GB.json b/app/javascript/mastodon/locales/en-GB.json
index 84cba3092f3b94..6232207af2f865 100644
--- a/app/javascript/mastodon/locales/en-GB.json
+++ b/app/javascript/mastodon/locales/en-GB.json
@@ -277,7 +277,6 @@
   "follow_request.authorize": "Authorise",
   "follow_request.reject": "Reject",
   "follow_requests.unlocked_explanation": "Even though your account is not locked, the {domain} staff thought you might want to review follow requests from these accounts manually.",
-  "follow_suggestions.curated_suggestion": "Editors' Choice",
   "follow_suggestions.dismiss": "Don't show again",
   "follow_suggestions.personalized_suggestion": "Personalised suggestion",
   "follow_suggestions.popular_suggestion": "Popular suggestion",
diff --git a/app/javascript/mastodon/locales/es-AR.json b/app/javascript/mastodon/locales/es-AR.json
index 87ab62cda27f34..3b63c505e4424d 100644
--- a/app/javascript/mastodon/locales/es-AR.json
+++ b/app/javascript/mastodon/locales/es-AR.json
@@ -277,8 +277,13 @@
   "follow_request.authorize": "Autorizar",
   "follow_request.reject": "Rechazar",
   "follow_requests.unlocked_explanation": "A pesar de que tu cuenta no es privada, el equipo de {domain} pensó que podrías querer revisar manualmente las solicitudes de seguimiento de estas cuentas.",
-  "follow_suggestions.curated_suggestion": "Cuentas elegidas del servidor",
+  "follow_suggestions.curated_suggestion": "Selección del equipo",
   "follow_suggestions.dismiss": "No mostrar de nuevo",
+  "follow_suggestions.hints.featured": "Este perfil fue seleccionado a mano por el equipo de {domain}.",
+  "follow_suggestions.hints.friends_of_friends": "Este perfil es popular entre las cuentas que seguís.",
+  "follow_suggestions.hints.most_followed": "Este perfil es uno de los más seguidos en {domain}.",
+  "follow_suggestions.hints.most_interactions": "Este perfil ha estado recibiendo recientemente mucha atención en {domain}.",
+  "follow_suggestions.hints.similar_to_recently_followed": "Este perfil es similar a los que comenzaste a seguir.",
   "follow_suggestions.personalized_suggestion": "Sugerencia personalizada",
   "follow_suggestions.popular_suggestion": "Sugerencia popular",
   "follow_suggestions.view_all": "Ver todo",
diff --git a/app/javascript/mastodon/locales/es-MX.json b/app/javascript/mastodon/locales/es-MX.json
index 95b87b26dd3cf7..9ee2cbca14f710 100644
--- a/app/javascript/mastodon/locales/es-MX.json
+++ b/app/javascript/mastodon/locales/es-MX.json
@@ -277,8 +277,9 @@
   "follow_request.authorize": "Autorizar",
   "follow_request.reject": "Rechazar",
   "follow_requests.unlocked_explanation": "A pesar de que tu cuenta no es privada, el personal de {domain} ha pensado que quizás deberías revisar manualmente las solicitudes de seguimiento de estas cuentas.",
-  "follow_suggestions.curated_suggestion": "Recomendaciones del equipo",
   "follow_suggestions.dismiss": "No mostrar de nuevo",
+  "follow_suggestions.hints.friends_of_friends": "Este perfil es popular entre las personas que sigues.",
+  "follow_suggestions.hints.most_followed": "Este perfil es uno de los más seguidos en {domain}.",
   "follow_suggestions.personalized_suggestion": "Sugerencia personalizada",
   "follow_suggestions.popular_suggestion": "Sugerencia popular",
   "follow_suggestions.view_all": "Ver todo",
diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json
index 3e4f36ba5a416b..5b5263b3f49bfe 100644
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@@ -277,8 +277,9 @@
   "follow_request.authorize": "Autorizar",
   "follow_request.reject": "Rechazar",
   "follow_requests.unlocked_explanation": "A pesar de que tu cuenta no es privada, el personal de {domain} ha pensado que quizás deberías revisar manualmente las solicitudes de seguimiento de estas cuentas.",
-  "follow_suggestions.curated_suggestion": "Recomendaciones del equipo",
   "follow_suggestions.dismiss": "No mostrar de nuevo",
+  "follow_suggestions.hints.friends_of_friends": "Este perfil es popular entre las personas que sigues.",
+  "follow_suggestions.hints.most_followed": "Este perfil es uno de los más seguidos en {domain}.",
   "follow_suggestions.personalized_suggestion": "Sugerencia personalizada",
   "follow_suggestions.popular_suggestion": "Sugerencia popular",
   "follow_suggestions.view_all": "Ver todo",
diff --git a/app/javascript/mastodon/locales/eu.json b/app/javascript/mastodon/locales/eu.json
index e80e7fcf462592..da7d03ce4199ea 100644
--- a/app/javascript/mastodon/locales/eu.json
+++ b/app/javascript/mastodon/locales/eu.json
@@ -277,8 +277,13 @@
   "follow_request.authorize": "Baimendu",
   "follow_request.reject": "Ukatu",
   "follow_requests.unlocked_explanation": "Zure kontua blokeatuta ez badago ere, {domain} domeinuko arduradunek uste dute kontu hauetako jarraipen eskaerak agian eskuz begiratu nahiko dituzula.",
-  "follow_suggestions.curated_suggestion": "Zerbitzariaren iradokizunak",
+  "follow_suggestions.curated_suggestion": "Domeinuaren iradokizuna",
   "follow_suggestions.dismiss": "Ez erakutsi berriro",
+  "follow_suggestions.hints.featured": "Profil hau {domain} domeinuko taldeak eskuz aukeratu du.",
+  "follow_suggestions.hints.friends_of_friends": "Profil hau ezaguna da jarraitzen duzun jendearen artean.",
+  "follow_suggestions.hints.most_followed": "Profil hau {domain} domeinuan gehien jarraitzen den profiletako bat da.",
+  "follow_suggestions.hints.most_interactions": "Profil hau arreta handia jasotzen ari da berriki {domain} domeinuan.",
+  "follow_suggestions.hints.similar_to_recently_followed": "Profil hau duela gutxi jarraitu dituzun profil askoren antzekoa da.",
   "follow_suggestions.personalized_suggestion": "Iradokizun pertsonalizatua",
   "follow_suggestions.popular_suggestion": "Iradokizun ezaguna",
   "follow_suggestions.view_all": "Ikusi denak",
diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index 277f0f2e721641..484baae1228460 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -277,8 +277,13 @@
   "follow_request.authorize": "Valtuuta",
   "follow_request.reject": "Hylkää",
   "follow_requests.unlocked_explanation": "Vaikkei tiliäsi ole lukittu, palvelimen {domain} ylläpito on arvioinut, että saatat olla halukas tarkistamaan nämä seuraamispyynnöt erikseen.",
-  "follow_suggestions.curated_suggestion": "Päätoimittajan valinta",
+  "follow_suggestions.curated_suggestion": "Ylläpidon valinta",
   "follow_suggestions.dismiss": "Älä näytä uudelleen",
+  "follow_suggestions.hints.featured": "Tämän profiilin on valinnut palvelimen {domain} tiimi.",
+  "follow_suggestions.hints.friends_of_friends": "Tämä profiili on suosittu seuraamiesi henkilöiden parissa.",
+  "follow_suggestions.hints.most_followed": "Tämä profiili on yksi seuratuimmista palvelimella {domain}.",
+  "follow_suggestions.hints.most_interactions": "Tämä profiili on viime aikoina saanut paljon huomiota palvelimella {domain}.",
+  "follow_suggestions.hints.similar_to_recently_followed": "Tämä profiili on samankaltainen kuin profiilit, joita olet viimeksi seurannut.",
   "follow_suggestions.personalized_suggestion": "Personoitu ehdotus",
   "follow_suggestions.popular_suggestion": "Suosittu ehdotus",
   "follow_suggestions.view_all": "Näytä kaikki",
diff --git a/app/javascript/mastodon/locales/fil.json b/app/javascript/mastodon/locales/fil.json
index 938251e5f55ffc..04208c5544fb64 100644
--- a/app/javascript/mastodon/locales/fil.json
+++ b/app/javascript/mastodon/locales/fil.json
@@ -49,6 +49,7 @@
   "account.unendorse": "Huwag itampok sa profile",
   "admin.dashboard.retention.cohort_size": "Mga bagong tagagamit",
   "alert.rate_limited.message": "Mangyaring subukan muli pagkatapos ng {retry_time, time, medium}.",
+  "audio.hide": "Itago ang tunog",
   "bundle_column_error.error.title": "Naku!",
   "bundle_column_error.network.body": "Nagkaroon ng kamalian habang sinusubukang i-karga ang pahinang ito. Maaaring dahil ito sa pansamantalang problema ng iyong koneksyon sa internet o ang server na ito.",
   "bundle_column_error.network.title": "Kamaliang network",
@@ -100,6 +101,7 @@
   "compose_form.encryption_warning": "Ang mga post sa Mastodon ay hindi naka-encrypt nang dulo-dulo. Huwag magbahagi ng anumang sensitibong impormasyon sa Mastodon.",
   "compose_form.hashtag_warning": "Hindi maililista ang post na ito sa anumang hashtag dahil hindi ito nakapubliko. Mga nakapublikong post lamang ang mahahanap ayon sa hashtag.",
   "compose_form.placeholder": "Anong nangyari?",
+  "compose_form.poll.multiple": "Maraming pagpipilian",
   "compose_form.poll.single": "Piliin ang isa",
   "compose_form.reply": "Tumugon",
   "compose_form.spoiler.unmarked": "Idagdag ang babala sa nilalaman",
@@ -109,6 +111,9 @@
   "confirmations.block.message": "Sigurado ka bang gusto mong harangan si {name}?",
   "confirmations.cancel_follow_request.confirm": "Bawiin ang kahilingan",
   "confirmations.cancel_follow_request.message": "Sigurdo ka bang gusto mong bawiin ang kahilingang sundan si/ang {name}?",
+  "confirmations.delete.message": "Sigurado ka bang gusto mong burahin ang post na ito?",
+  "confirmations.delete_list.confirm": "Tanggalin",
+  "confirmations.delete_list.message": "Sigurado ka bang gusto mong burahin ang listahang ito?",
   "confirmations.discard_edit_media.confirm": "Ipagpaliban",
   "confirmations.domain_block.confirm": "Harangan ang buong domain",
   "confirmations.edit.confirm": "Baguhin",
@@ -188,6 +193,7 @@
   "intervals.full.minutes": "{number, plural, one {# minuto} other {# na minuto}}",
   "keyboard_shortcuts.description": "Paglalarawan",
   "keyboard_shortcuts.down": "Ilipat pababa sa talaan",
+  "keyboard_shortcuts.mention": "Banggitin ang may-akda",
   "keyboard_shortcuts.requests": "Buksan ang talaan ng mga kahilingan sa pagsunod",
   "keyboard_shortcuts.up": "Ilipat pataas sa talaan",
   "lightbox.close": "Isara",
@@ -203,24 +209,35 @@
   "loading_indicator.label": "Kumakarga…",
   "navigation_bar.about": "Tungkol dito",
   "navigation_bar.blocks": "Nakaharang na mga tagagamit",
+  "navigation_bar.direct": "Mga palihim na banggit",
   "navigation_bar.favourites": "Mga paborito",
+  "navigation_bar.follows_and_followers": "Mga sinusundan at tagasunod",
   "navigation_bar.lists": "Mga listahan",
   "navigation_bar.search": "Maghanap",
   "notification.admin.report": "Iniulat ni {name} si {target}",
   "notification.follow": "Sinundan ka ni {name}",
   "notification.follow_request": "Hinihiling ni {name} na sundan ka",
   "notification.mention": "Binanggit ka ni {name}",
+  "notifications.clear": "Burahin mga abiso",
   "notifications.column_settings.admin.report": "Mga bagong ulat:",
   "notifications.column_settings.favourite": "Mga paborito:",
   "notifications.column_settings.follow": "Mga bagong tagasunod:",
+  "notifications.column_settings.unread_notifications.category": "Hindi Nabasang mga Abiso",
   "notifications.column_settings.update": "Mga pagbago:",
   "notifications.filter.all": "Lahat",
+  "notifications.mark_as_read": "Markahan lahat ng abiso bilang nabasa na",
   "onboarding.action.back": "Ibalik mo ako",
   "onboarding.actions.back": "Ibalik mo ako",
+  "onboarding.profile.note_hint": "Maaari mong @bangitin ang ibang mga tao o mga #hashtag…",
   "onboarding.profile.save_and_continue": "Iimbak at magpatuloy",
   "onboarding.share.next_steps": "Mga posibleng susunod na hakbang:",
+  "poll.closed": "Sarado",
+  "poll.reveal": "Ipakita ang mga resulta",
   "poll.voted": "Binoto mo para sa sagot na ito",
   "poll_button.remove_poll": "Tanggalin ang boto",
+  "privacy.direct.long": "Lahat ng mga binanggit sa post",
+  "privacy.private.long": "Mga tagasunod mo lamang",
+  "privacy.private.short": "Mga tagasunod",
   "relative_time.days": "{number}a",
   "relative_time.full.days": "{number, plural, one {# araw} other {# na araw}} ang nakalipas",
   "relative_time.full.hours": "{number, plural, one {# oras} other {# na oras}} ang nakalipas",
@@ -247,15 +264,24 @@
   "report.thanks.title_actionable": "Salamat sa pag-uulat, titingnan namin ito.",
   "report_notification.categories.other": "Iba pa",
   "search_results.all": "Lahat",
+  "search_results.see_all": "Ipakita lahat",
   "server_banner.learn_more": "Matuto nang higit pa",
+  "server_banner.server_stats": "Katayuan ng serbiro:",
+  "status.block": "Harangan si @{name}",
+  "status.delete": "Tanggalin",
+  "status.direct": "Palihim na banggitin si/ang @{name}",
   "status.direct_indicator": "Palihim na banggit",
   "status.edit": "Baguhin",
   "status.edited": "Binago noong {date}",
   "status.edited_x_times": "Binago {count, plural, one {{count} beses} other {{count} na beses}}",
   "status.history.created": "Nilikha ni/ng {name} {date}",
   "status.history.edited": "Binago ni/ng {name} {date}",
+  "status.media.open": "Pindutin upang buksan",
+  "status.media.show": "Pindutin upang ipakita",
   "status.mention": "Banggitin ang/si @{name}",
   "status.more": "Higit pa",
+  "status.read_more": "Basahin ang higit pa",
+  "status.reblogs.empty": "Wala pang nagpalakas ng post na ito. Kung may sinumang nagpalakas, makikita sila rito.",
   "status.reply": "Tumugon",
   "status.report": "I-ulat si/ang @{name}",
   "status.sensitive_warning": "Sensitibong nilalaman",
@@ -267,6 +293,7 @@
   "status.translate": "Isalin",
   "status.translated_from_with": "Isalin mula sa {lang} gamit ang {provider}",
   "status.uncached_media_warning": "Hindi makuha ang paunang tigin",
+  "tabs_bar.notifications": "Mga abiso",
   "time_remaining.days": "{number, plural, one {# araw} other {# na araw}} ang natitira",
   "time_remaining.hours": "{number, plural, one {# oras} other {# na oras}} ang natitira",
   "time_remaining.minutes": "{number, plural, one {# minuto} other {# na minuto}} ang natitira",
diff --git a/app/javascript/mastodon/locales/fo.json b/app/javascript/mastodon/locales/fo.json
index abd2ab2681c94b..13e49eb314a4dc 100644
--- a/app/javascript/mastodon/locales/fo.json
+++ b/app/javascript/mastodon/locales/fo.json
@@ -277,8 +277,13 @@
   "follow_request.authorize": "Veit myndugleika",
   "follow_request.reject": "Nokta",
   "follow_requests.unlocked_explanation": "Sjálvt um konta tín ikki er læst, so hugsa {domain} starvsfólkini, at tú kanska hevur hug at kanna umbønir um at fylgja frá hesum kontum við hond.",
-  "follow_suggestions.curated_suggestion": "Val umsjónarfólksins",
+  "follow_suggestions.curated_suggestion": "Val hjá ábyrgdarfólki",
   "follow_suggestions.dismiss": "Lat vera við at vísa",
+  "follow_suggestions.hints.featured": "Hesin vangin er úrvaldur av toyminum handan {domain}.",
+  "follow_suggestions.hints.friends_of_friends": "Hesin vangin er vælumtóktur millum tey, tú fylgir.",
+  "follow_suggestions.hints.most_followed": "Hesin vangin er ein av teimum, sum er mest fylgdur á {domain}.",
+  "follow_suggestions.hints.most_interactions": "Nýliga hava nógv lagt merki til hendan vangan á {domain}.",
+  "follow_suggestions.hints.similar_to_recently_followed": "Hesin vangin líkist teimum, sum tú nýliga hevur fylgt.",
   "follow_suggestions.personalized_suggestion": "Persónligt uppskot",
   "follow_suggestions.popular_suggestion": "Vælumtókt uppskot",
   "follow_suggestions.view_all": "Vís øll",
diff --git a/app/javascript/mastodon/locales/fy.json b/app/javascript/mastodon/locales/fy.json
index 9bd5327c8f6f34..bc4fecb93d476c 100644
--- a/app/javascript/mastodon/locales/fy.json
+++ b/app/javascript/mastodon/locales/fy.json
@@ -277,8 +277,13 @@
   "follow_request.authorize": "Goedkarre",
   "follow_request.reject": "Wegerje",
   "follow_requests.unlocked_explanation": "Ek al is jo account net besletten, de meiwurkers fan {domain} tinke dat jo miskien de folgjende folchfersiken hânmjittich kontrolearje.",
-  "follow_suggestions.curated_suggestion": "Kar fan de moderator",
+  "follow_suggestions.curated_suggestion": "Spesjaal selektearre",
   "follow_suggestions.dismiss": "Net mear werjaan",
+  "follow_suggestions.hints.featured": "Dit profyl is hânmjittich troch it {domain}-team selektearre.",
+  "follow_suggestions.hints.friends_of_friends": "Dit profyl is populêr ûnder de minsken dy’t jo folgje.",
+  "follow_suggestions.hints.most_followed": "Dit profyl is ien fan de meast folge op {domain}.",
+  "follow_suggestions.hints.most_interactions": "Dit profyl hat de lêste tiid in protte oandacht krigen op {domain}.",
+  "follow_suggestions.hints.similar_to_recently_followed": "Dit profyl is hast lyk oan de profilen dy’t jo koartlyn folge hawwe.",
   "follow_suggestions.personalized_suggestion": "Personalisearre suggestje",
   "follow_suggestions.popular_suggestion": "Populêre suggestje",
   "follow_suggestions.view_all": "Alles werjaan",
diff --git a/app/javascript/mastodon/locales/ga.json b/app/javascript/mastodon/locales/ga.json
index 329286277d0a4b..a708088fbb3608 100644
--- a/app/javascript/mastodon/locales/ga.json
+++ b/app/javascript/mastodon/locales/ga.json
@@ -226,7 +226,6 @@
   "follow_request.authorize": "Ceadaigh",
   "follow_request.reject": "Diúltaigh",
   "follow_requests.unlocked_explanation": "Cé nach bhfuil do chuntas faoi ghlas, cheap foireann {domain} gur mhaith leat súil siar ar iarratais leanúnaí as na cuntais seo.",
-  "follow_suggestions.curated_suggestion": "Rogha an eagarthóra",
   "follow_suggestions.dismiss": "Ná taispeáin arís",
   "follow_suggestions.personalized_suggestion": "Nod pearsantaithe",
   "follow_suggestions.popular_suggestion": "Nod coiteann",
diff --git a/app/javascript/mastodon/locales/gd.json b/app/javascript/mastodon/locales/gd.json
index 47b1e231929acc..d775a7b027129d 100644
--- a/app/javascript/mastodon/locales/gd.json
+++ b/app/javascript/mastodon/locales/gd.json
@@ -277,7 +277,6 @@
   "follow_request.authorize": "Ùghdarraich",
   "follow_request.reject": "Diùlt",
   "follow_requests.unlocked_explanation": "Ged nach eil an cunntas agad glaiste, tha sgioba {domain} dhen bheachd gum b’ fheàirrde thu lèirmheas a dhèanamh air na h-iarrtasan leantainn o na cunntasan seo a làimh.",
-  "follow_suggestions.curated_suggestion": "Roghainn an deasaiche",
   "follow_suggestions.dismiss": "Na seall seo a-rithist",
   "follow_suggestions.personalized_suggestion": "Moladh pearsanaichte",
   "follow_suggestions.popular_suggestion": "Moladh air a bheil fèill mhòr",
diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json
index 7512740c5e33ae..1e83adf126556a 100644
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@@ -277,7 +277,6 @@
   "follow_request.authorize": "Autorizar",
   "follow_request.reject": "Rexeitar",
   "follow_requests.unlocked_explanation": "Malia que a túa conta non é privada, a administración de {domain} pensou que quizabes terías que revisar de xeito manual as solicitudes de seguiminto.",
-  "follow_suggestions.curated_suggestion": "O servidor suxíreche",
   "follow_suggestions.dismiss": "Non mostrar máis",
   "follow_suggestions.personalized_suggestion": "Suxestión personalizada",
   "follow_suggestions.popular_suggestion": "Suxestión popular",
diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json
index bf182a1657f1a1..2eef70f0feff56 100644
--- a/app/javascript/mastodon/locales/he.json
+++ b/app/javascript/mastodon/locales/he.json
@@ -277,8 +277,13 @@
   "follow_request.authorize": "הרשאה",
   "follow_request.reject": "דחיה",
   "follow_requests.unlocked_explanation": "למרות שחשבונך אינו נעול, צוות {domain} חושב שאולי כדאי לוודא את בקשות המעקב האלה ידנית.",
-  "follow_suggestions.curated_suggestion": "בחירת העורכים",
+  "follow_suggestions.curated_suggestion": "בחירת הצוות",
   "follow_suggestions.dismiss": "לא להציג שוב",
+  "follow_suggestions.hints.featured": "החשבון הזה נבחר אישית על ידי צוות {domain}.",
+  "follow_suggestions.hints.friends_of_friends": "חשבון זה פופולרי בין הנעקבים שלך.",
+  "follow_suggestions.hints.most_followed": "חשבון זה הוא מבין הנעקבים ביותר בשרת {domain}.",
+  "follow_suggestions.hints.most_interactions": "חשבון זה קיבל לאחרונה הרבה תשומת לב על שרת {domain}.",
+  "follow_suggestions.hints.similar_to_recently_followed": "חשבון זה דומה לחשבונות אחרים שאחריהם התחלת לעקוב לאחרונה.",
   "follow_suggestions.personalized_suggestion": "הצעות מותאמות אישית",
   "follow_suggestions.popular_suggestion": "הצעה פופולרית",
   "follow_suggestions.view_all": "צפיה בכל",
diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json
index 8f979e55581161..f499e08f6d2b94 100644
--- a/app/javascript/mastodon/locales/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@@ -277,8 +277,13 @@
   "follow_request.authorize": "Hitelesítés",
   "follow_request.reject": "Elutasítás",
   "follow_requests.unlocked_explanation": "Bár a fiókod nincs zárolva, a(z) {domain} csapata úgy gondolta, hogy talán kézzel szeretnéd ellenőrizni ezen fiókok követési kéréseit.",
-  "follow_suggestions.curated_suggestion": "Szerkesztői ajánlat",
+  "follow_suggestions.curated_suggestion": "A stáb választása",
   "follow_suggestions.dismiss": "Ne jelenjen meg újra",
+  "follow_suggestions.hints.featured": "Ezt a profilt a(z) {domain} csapata választotta ki.",
+  "follow_suggestions.hints.friends_of_friends": "Ez a profil népszerű az általad követett emberek körében.",
+  "follow_suggestions.hints.most_followed": "Ez a profil a leginkább követett a(z) {domain} oldalon.",
+  "follow_suggestions.hints.most_interactions": "Ez a profil mostanában sok figyelmet kap a(z) {domain} oldalon.",
+  "follow_suggestions.hints.similar_to_recently_followed": "Ez a profil hasonló azokhoz a profilokhoz, melyeket nemrég kezdtél el követni.",
   "follow_suggestions.personalized_suggestion": "Személyre szabott javaslat",
   "follow_suggestions.popular_suggestion": "Népszerű javaslat",
   "follow_suggestions.view_all": "Összes megtekintése",
diff --git a/app/javascript/mastodon/locales/ia.json b/app/javascript/mastodon/locales/ia.json
index 07966628514746..599688cc07315c 100644
--- a/app/javascript/mastodon/locales/ia.json
+++ b/app/javascript/mastodon/locales/ia.json
@@ -197,7 +197,6 @@
   "firehose.all": "Toto",
   "firehose.local": "Iste servitor",
   "firehose.remote": "Altere servitores",
-  "follow_suggestions.curated_suggestion": "Selection del editores",
   "follow_suggestions.dismiss": "Non monstrar novemente",
   "follow_suggestions.personalized_suggestion": "Suggestion personalisate",
   "follow_suggestions.popular_suggestion": "Suggestion personalisate",
diff --git a/app/javascript/mastodon/locales/ie.json b/app/javascript/mastodon/locales/ie.json
index 0c21832ed62e0d..c28a348dc7a02c 100644
--- a/app/javascript/mastodon/locales/ie.json
+++ b/app/javascript/mastodon/locales/ie.json
@@ -277,7 +277,6 @@
   "follow_request.authorize": "Autorisar",
   "follow_request.reject": "Rejecter",
   "follow_requests.unlocked_explanation": "Benque tu conto ne es cludet, li administratores de {domain} pensat que tu fórsan vell voler tractar seque-petitiones de tis-ci contos manualmen.",
-  "follow_suggestions.curated_suggestion": "Selection del Servitor",
   "follow_suggestions.dismiss": "Ne monstrar plu",
   "follow_suggestions.personalized_suggestion": "Personalisat suggestion",
   "follow_suggestions.popular_suggestion": "Populari suggestion",
diff --git a/app/javascript/mastodon/locales/is.json b/app/javascript/mastodon/locales/is.json
index 3c2337efd2133a..1f42180159958c 100644
--- a/app/javascript/mastodon/locales/is.json
+++ b/app/javascript/mastodon/locales/is.json
@@ -277,8 +277,13 @@
   "follow_request.authorize": "Heimila",
   "follow_request.reject": "Hafna",
   "follow_requests.unlocked_explanation": "Jafnvel þótt aðgangurinn þinn sé ekki læstur, hafa umsjónarmenn {domain} ímyndað sér að þú gætir viljað yfirfara handvirkt fylgjendabeiðnir frá þessum notendum.",
-  "follow_suggestions.curated_suggestion": "Úrval umsjónarfólks",
+  "follow_suggestions.curated_suggestion": "Úrval starfsfólks",
   "follow_suggestions.dismiss": "Ekki birta þetta aftur",
+  "follow_suggestions.hints.featured": "Þetta notandasnið hefur verið handvalið af {domain}-teyminu.",
+  "follow_suggestions.hints.friends_of_friends": "Þetta notandasnið er vinsælt hjá fólki sem þú fylgist með.",
+  "follow_suggestions.hints.most_followed": "Þetta notandasnið er eitt af þeim sem mest er fylgst með á {domain}.",
+  "follow_suggestions.hints.most_interactions": "Þetta notandasnið hefur vakið mikla athygli að undanförnu á {domain}.",
+  "follow_suggestions.hints.similar_to_recently_followed": "Þetta notandasnið er líkt þeim sniðum sem þú hefur valið að fylgjast með að undanförnu.",
   "follow_suggestions.personalized_suggestion": "Persónuaðlöguð tillaga",
   "follow_suggestions.popular_suggestion": "Vinsæl tillaga",
   "follow_suggestions.view_all": "Skoða allt",
diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json
index db8e88bd2a1b34..9e68216a332dda 100644
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@@ -277,8 +277,13 @@
   "follow_request.authorize": "Autorizza",
   "follow_request.reject": "Rifiuta",
   "follow_requests.unlocked_explanation": "Anche se il tuo profilo non è privato, lo staff di {domain} ha pensato che potresti voler revisionare manualmente le richieste di seguirti da questi profili.",
-  "follow_suggestions.curated_suggestion": "Scelta dell'editore",
+  "follow_suggestions.curated_suggestion": "Scelta personale",
   "follow_suggestions.dismiss": "Non visualizzare più",
+  "follow_suggestions.hints.featured": "Questo profilo è stato selezionato personalmente dal team di {domain}.",
+  "follow_suggestions.hints.friends_of_friends": "Questo profilo è popolare tra le persone che segui.",
+  "follow_suggestions.hints.most_followed": "Questo profilo è uno dei più seguiti su {domain}.",
+  "follow_suggestions.hints.most_interactions": "Recentemente, questo profilo ha ricevuto molta attenzione su {domain}.",
+  "follow_suggestions.hints.similar_to_recently_followed": "Questo profilo è simile ai profili che hai seguito più recentemente.",
   "follow_suggestions.personalized_suggestion": "Suggerimenti personalizzati",
   "follow_suggestions.popular_suggestion": "Suggerimento frequente",
   "follow_suggestions.view_all": "Vedi tutto",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index 180963e9e6e523..27ed9816a79ee9 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -277,7 +277,17 @@
   "follow_request.authorize": "許可",
   "follow_request.reject": "拒否",
   "follow_requests.unlocked_explanation": "あなたのアカウントは承認制ではありませんが、{domain}のスタッフはこれらのアカウントからのフォローリクエストの確認が必要であると判断しました。",
+  "follow_suggestions.curated_suggestion": "サーバースタッフ公認",
+  "follow_suggestions.dismiss": "今後表示しない",
+  "follow_suggestions.hints.featured": "{domain} の運営スタッフが選んだアカウントです。",
+  "follow_suggestions.hints.friends_of_friends": "フォロー中のユーザーのあいだで人気のアカウントです。",
+  "follow_suggestions.hints.most_followed": "{domain} でもっともフォローされているアカウントのひとつです。",
+  "follow_suggestions.hints.most_interactions": "{domain} でいま大きな注目を集めています。",
+  "follow_suggestions.hints.similar_to_recently_followed": "最近フォローしたユーザーに似ているアカウントです。",
+  "follow_suggestions.personalized_suggestion": "フォローに基づく提案",
+  "follow_suggestions.popular_suggestion": "人気のアカウント",
   "follow_suggestions.view_all": "すべて表示",
+  "follow_suggestions.who_to_follow": "フォローを増やしてみませんか？",
   "followed_tags": "フォロー中のハッシュタグ",
   "footer.about": "概要",
   "footer.directory": "ディレクトリ",
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index 50d99599944e8c..d469af5d50554b 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -277,8 +277,13 @@
   "follow_request.authorize": "허가",
   "follow_request.reject": "거부",
   "follow_requests.unlocked_explanation": "귀하의 계정이 잠긴 계정이 아닐지라도, {domain} 스태프는 이 계정들의 팔로우 요청을 수동으로 처리해 주시면 좋겠다고 생각했습니다.",
-  "follow_suggestions.curated_suggestion": "중재자의 추천",
+  "follow_suggestions.curated_suggestion": "스태프의 추천",
   "follow_suggestions.dismiss": "다시 보지 않기",
+  "follow_suggestions.hints.featured": "이 프로필은 {domain} 팀이 손수 선택했습니다.",
+  "follow_suggestions.hints.friends_of_friends": "이 프로필은 내가 팔로우 하는 사람들에게서 유명합니다.",
+  "follow_suggestions.hints.most_followed": "이 프로필은 {domain}에서 가장 많이 팔로우 된 사람들 중 하나입니다.",
+  "follow_suggestions.hints.most_interactions": "이 프로필은 최근 {domain}에서 많은 관심을 받았습니다.",
+  "follow_suggestions.hints.similar_to_recently_followed": "이 프로필은 내가 최근에 팔로우 한 프로필들과 유사합니다.",
   "follow_suggestions.personalized_suggestion": "개인화된 추천",
   "follow_suggestions.popular_suggestion": "인기있는 추천",
   "follow_suggestions.view_all": "모두 보기",
diff --git a/app/javascript/mastodon/locales/lad.json b/app/javascript/mastodon/locales/lad.json
index 3ec3b6af1b5faf..91540d58ca8070 100644
--- a/app/javascript/mastodon/locales/lad.json
+++ b/app/javascript/mastodon/locales/lad.json
@@ -277,8 +277,13 @@
   "follow_request.authorize": "Autoriza",
   "follow_request.reject": "Refuza",
   "follow_requests.unlocked_explanation": "Aunke tu kuento no esta serrado, la taifa de {domain} kreye ke talvez keres revizar manualmente las solisitudes de segimento de estos kuentos.",
-  "follow_suggestions.curated_suggestion": "Sujestion del sirvidor",
+  "follow_suggestions.curated_suggestion": "Seleksyon de la taifa",
   "follow_suggestions.dismiss": "No amostra mas",
+  "follow_suggestions.hints.featured": "Este profil tiene sido eskojido por la taifa de {domain}.",
+  "follow_suggestions.hints.friends_of_friends": "Este profil es popular entre las personas ke siges.",
+  "follow_suggestions.hints.most_followed": "Este profil es uno de los mas segidos en {domain}.",
+  "follow_suggestions.hints.most_interactions": "Este profil tiene resivido muncha atansion resientemente en {domain}.",
+  "follow_suggestions.hints.similar_to_recently_followed": "Este profil es similar a otros ke tienes segido resientemente.",
   "follow_suggestions.personalized_suggestion": "Sujestion personalizada",
   "follow_suggestions.popular_suggestion": "Sujestion populara",
   "follow_suggestions.view_all": "Ve todos",
diff --git a/app/javascript/mastodon/locales/lt.json b/app/javascript/mastodon/locales/lt.json
index 0923a10065a68e..ce725181455223 100644
--- a/app/javascript/mastodon/locales/lt.json
+++ b/app/javascript/mastodon/locales/lt.json
@@ -269,8 +269,11 @@
   "follow_request.authorize": "Autorizuoti",
   "follow_request.reject": "Atmesti",
   "follow_requests.unlocked_explanation": "Nors tavo paskyra neužrakinta, {domain} personalas mano, kad galbūt norėsi rankiniu būdu patikrinti šių paskyrų sekimo užklausas.",
-  "follow_suggestions.curated_suggestion": "Redaktorių pasirinkimas",
   "follow_suggestions.dismiss": "Daugiau nerodyti",
+  "follow_suggestions.hints.friends_of_friends": "Šis profilis yra populiarus tarp žmonių, kuriuos sekei.",
+  "follow_suggestions.hints.most_followed": "Šis profilis yra vienas iš labiausiai sekamų {domain}.",
+  "follow_suggestions.hints.most_interactions": "Pastaruoju metu šis profilis sulaukia daug dėmesio šiame {domain}.",
+  "follow_suggestions.hints.similar_to_recently_followed": "Šis profilis panašus į profilius, kuriuos neseniai sekei.",
   "follow_suggestions.personalized_suggestion": "Suasmenintas pasiūlymas",
   "follow_suggestions.popular_suggestion": "Populiarus pasiūlymas",
   "follow_suggestions.view_all": "Peržiūrėti viską",
diff --git a/app/javascript/mastodon/locales/ms.json b/app/javascript/mastodon/locales/ms.json
index c24ffc1d3a80be..88b4680ae0fb6b 100644
--- a/app/javascript/mastodon/locales/ms.json
+++ b/app/javascript/mastodon/locales/ms.json
@@ -277,7 +277,6 @@
   "follow_request.authorize": "Benarkan",
   "follow_request.reject": "Tolak",
   "follow_requests.unlocked_explanation": "Walaupun akaun anda tidak dikunci, kakitangan {domain} merasakan anda mungkin ingin menyemak permintaan ikutan daripada akaun ini secara manual.",
-  "follow_suggestions.curated_suggestion": "Pilihan Editor",
   "follow_suggestions.dismiss": "Jangan papar lagi",
   "follow_suggestions.personalized_suggestion": "Cadangan peribadi",
   "follow_suggestions.popular_suggestion": "Cadangan terkenal",
diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json
index dc51092dd3e58b..5155b296f7078c 100644
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@@ -277,8 +277,13 @@
   "follow_request.authorize": "Goedkeuren",
   "follow_request.reject": "Afwijzen",
   "follow_requests.unlocked_explanation": "Ook al is jouw account niet besloten, de medewerkers van {domain} denken dat jij misschien de volgende volgverzoeken handmatig wil controleren.",
-  "follow_suggestions.curated_suggestion": "Keuze van de moderator(en)",
+  "follow_suggestions.curated_suggestion": "Speciaal geselecteerd",
   "follow_suggestions.dismiss": "Niet meer weergeven",
+  "follow_suggestions.hints.featured": "Dit profiel is geselecteerd door het team van {domain}.",
+  "follow_suggestions.hints.friends_of_friends": "Dit profiel is populair onder de mensen die jij volgt.",
+  "follow_suggestions.hints.most_followed": "Dit profiel is een van de meest gevolgde op {domain}.",
+  "follow_suggestions.hints.most_interactions": "Dit profiel heeft de laatste tijd veel aandacht gekregen op {domain}.",
+  "follow_suggestions.hints.similar_to_recently_followed": "Dit profiel is vergelijkbaar met de profielen die je recentelijk hebt gevolgd.",
   "follow_suggestions.personalized_suggestion": "Gepersonaliseerde aanbeveling",
   "follow_suggestions.popular_suggestion": "Populaire aanbeveling",
   "follow_suggestions.view_all": "Alles weergeven",
diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json
index 814d0f2de0dec0..01b88eacdc0f5a 100644
--- a/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@@ -277,8 +277,13 @@
   "follow_request.authorize": "Autoryzuj",
   "follow_request.reject": "Odrzuć",
   "follow_requests.unlocked_explanation": "Mimo że Twoje konto nie jest zablokowane, zespół {domain} uznał że możesz chcieć ręcznie przejrzeć prośby o możliwość obserwacji.",
-  "follow_suggestions.curated_suggestion": "Wybór redakcji",
+  "follow_suggestions.curated_suggestion": "Wybrane przez personel",
   "follow_suggestions.dismiss": "Nie pokazuj ponownie",
+  "follow_suggestions.hints.featured": "Ten profil został wybrany przez zespół {domain}.",
+  "follow_suggestions.hints.friends_of_friends": "Ten profil jest popularny w gronie użytkowników, których obserwujesz.",
+  "follow_suggestions.hints.most_followed": "Ten profil jest jednym z najczęściej obserwowanych na {domain}.",
+  "follow_suggestions.hints.most_interactions": "Ten profil otrzymuje dużo interakcji na {domain}.",
+  "follow_suggestions.hints.similar_to_recently_followed": "Ten profil jest podobny do profili ostatnio przez ciebie zaobserwowanych.",
   "follow_suggestions.personalized_suggestion": "Sugestia spersonalizowana",
   "follow_suggestions.popular_suggestion": "Sugestia popularna",
   "follow_suggestions.view_all": "Pokaż wszystkie",
diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json
index eced6ca7adcdcb..8911afe946192f 100644
--- a/app/javascript/mastodon/locales/pt-BR.json
+++ b/app/javascript/mastodon/locales/pt-BR.json
@@ -277,7 +277,6 @@
   "follow_request.authorize": "Aprovar",
   "follow_request.reject": "Recusar",
   "follow_requests.unlocked_explanation": "Apesar de seu perfil não ser trancado, {domain} exige que você revise a solicitação para te seguir destes perfis manualmente.",
-  "follow_suggestions.curated_suggestion": "Escolha dos editores",
   "follow_suggestions.dismiss": "Não mostrar novamente",
   "follow_suggestions.personalized_suggestion": "Sugestão personalizada",
   "follow_suggestions.popular_suggestion": "Sugestão popular",
diff --git a/app/javascript/mastodon/locales/pt-PT.json b/app/javascript/mastodon/locales/pt-PT.json
index 3674126144bdae..26aa0f0b5f932c 100644
--- a/app/javascript/mastodon/locales/pt-PT.json
+++ b/app/javascript/mastodon/locales/pt-PT.json
@@ -277,8 +277,13 @@
   "follow_request.authorize": "Autorizar",
   "follow_request.reject": "Rejeitar",
   "follow_requests.unlocked_explanation": "Apesar de a sua não ser privada, a administração de {domain} pensa que poderá querer rever manualmente os pedidos de seguimento dessas contas.",
-  "follow_suggestions.curated_suggestion": "Escolha dos Editores",
+  "follow_suggestions.curated_suggestion": "Escolha da equipe",
   "follow_suggestions.dismiss": "Não mostrar novamente",
+  "follow_suggestions.hints.featured": "Este perfil foi escolhido a dedo pela equipe {domain}.",
+  "follow_suggestions.hints.friends_of_friends": "Este perfil é popular entre as pessoas que você segue.",
+  "follow_suggestions.hints.most_followed": "Este perfil é um dos mais seguidos no {domain}.",
+  "follow_suggestions.hints.most_interactions": "Este perfil tem recebido recentemente muita atenção no {domain}.",
+  "follow_suggestions.hints.similar_to_recently_followed": "Este perfil é semelhante aos perfis que você seguiu mais recentemente.",
   "follow_suggestions.personalized_suggestion": "Sugestão personalizada",
   "follow_suggestions.popular_suggestion": "Sugestão popular",
   "follow_suggestions.view_all": "Ver tudo",
diff --git a/app/javascript/mastodon/locales/ro.json b/app/javascript/mastodon/locales/ro.json
index 547493af18d598..b8bb779f85db12 100644
--- a/app/javascript/mastodon/locales/ro.json
+++ b/app/javascript/mastodon/locales/ro.json
@@ -265,7 +265,6 @@
   "follow_request.authorize": "Acceptă",
   "follow_request.reject": "Respinge",
   "follow_requests.unlocked_explanation": "Chiar dacă contul tău nu este blocat, personalul {domain} a considerat că ai putea prefera să consulți manual cererile de abonare de la aceste conturi.",
-  "follow_suggestions.curated_suggestion": "Alegerile Editorilor",
   "follow_suggestions.dismiss": "Nu mai afișa din nou",
   "follow_suggestions.personalized_suggestion": "Sugestie personalizată",
   "follow_suggestions.popular_suggestion": "Sugestie populară",
diff --git a/app/javascript/mastodon/locales/ru.json b/app/javascript/mastodon/locales/ru.json
index 623b4038322375..5fcca414cff3f7 100644
--- a/app/javascript/mastodon/locales/ru.json
+++ b/app/javascript/mastodon/locales/ru.json
@@ -277,7 +277,6 @@
   "follow_request.authorize": "Авторизовать",
   "follow_request.reject": "Отказать",
   "follow_requests.unlocked_explanation": "Хотя ваша учетная запись не закрыта, команда {domain} подумала, что вы захотите просмотреть запросы от этих учетных записей вручную.",
-  "follow_suggestions.curated_suggestion": "Выбор редакции",
   "follow_suggestions.dismiss": "Больше не показывать",
   "follow_suggestions.personalized_suggestion": "Персонализированное предложение",
   "follow_suggestions.popular_suggestion": "Популярное предложение",
diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json
index da76e9868750bd..af975069b8d025 100644
--- a/app/javascript/mastodon/locales/sk.json
+++ b/app/javascript/mastodon/locales/sk.json
@@ -277,7 +277,6 @@
   "follow_request.authorize": "Povoľ prístup",
   "follow_request.reject": "Odmietni",
   "follow_requests.unlocked_explanation": "Síce Váš učet nie je uzamknutý, ale {domain} tím si myslel že môžete chcieť skontrolovať žiadosti o sledovanie z týchto účtov manuálne.",
-  "follow_suggestions.curated_suggestion": "Výber zo servera",
   "follow_suggestions.dismiss": "Znovu nezobrazuj",
   "follow_suggestions.personalized_suggestion": "Prispôsobené odporúčania",
   "follow_suggestions.popular_suggestion": "Populárne návrhy",
diff --git a/app/javascript/mastodon/locales/sl.json b/app/javascript/mastodon/locales/sl.json
index 3aae75dc368595..8396e02a68bc2e 100644
--- a/app/javascript/mastodon/locales/sl.json
+++ b/app/javascript/mastodon/locales/sl.json
@@ -277,8 +277,13 @@
   "follow_request.authorize": "Overi",
   "follow_request.reject": "Zavrni",
   "follow_requests.unlocked_explanation": "Čeprav vaš račun ni zaklenjen, zaposleni pri {domain} menijo, da bi morda želeli pregledati zahteve za sledenje teh računov ročno.",
-  "follow_suggestions.curated_suggestion": "Izbor urednikov",
+  "follow_suggestions.curated_suggestion": "Izbor osebja",
   "follow_suggestions.dismiss": "Ne pokaži več",
+  "follow_suggestions.hints.featured": "Ta profil so izbrali skrbniki strežnika {domain}.",
+  "follow_suggestions.hints.friends_of_friends": "Ta profil je priljubljen med osebami, ki jim sledite.",
+  "follow_suggestions.hints.most_followed": "Ta profil na strežniku {domain} je en izmed najbolj sledenih.",
+  "follow_suggestions.hints.most_interactions": "Ta profil na strežniku {domain} je nedavno prejel veliko pozornosti.",
+  "follow_suggestions.hints.similar_to_recently_followed": "Ta profil je podoben profilom, ki ste jim nedavno začeli slediti.",
   "follow_suggestions.personalized_suggestion": "Osebno prilagojen predlog",
   "follow_suggestions.popular_suggestion": "Priljubljen predlog",
   "follow_suggestions.view_all": "Pokaži vse",
diff --git a/app/javascript/mastodon/locales/sq.json b/app/javascript/mastodon/locales/sq.json
index 496e35fe761f7c..c388ebb8657946 100644
--- a/app/javascript/mastodon/locales/sq.json
+++ b/app/javascript/mastodon/locales/sq.json
@@ -277,8 +277,13 @@
   "follow_request.authorize": "Autorizoje",
   "follow_request.reject": "Hidhe tej",
   "follow_requests.unlocked_explanation": "Edhe pse llogaria juaj s’është e kyçur, ekipi i {domain} mendoi se mund të donit të shqyrtonit dorazi kërkesa ndjekjeje prej këtyre llogarive.",
-  "follow_suggestions.curated_suggestion": "Zgjedhur nga Ekipi",
+  "follow_suggestions.curated_suggestion": "Zgjedhur nga ekipi",
   "follow_suggestions.dismiss": "Mos shfaq më",
+  "follow_suggestions.hints.featured": "Ky profil është zgjedhur nga ekipi {domain}.",
+  "follow_suggestions.hints.friends_of_friends": "Ky profil është popullor mes personave që ndiqni.",
+  "follow_suggestions.hints.most_followed": "Ky profil është një nga më të ndjekur në {domain}.",
+  "follow_suggestions.hints.most_interactions": "Ky profil ka tërhequr mjaft vëmendjen së fundi në {domain}.",
+  "follow_suggestions.hints.similar_to_recently_followed": "Ky profil është i ngjashëm me profile që keni ndjekur tani afër.",
   "follow_suggestions.personalized_suggestion": "Sugjerim i personalizuar",
   "follow_suggestions.popular_suggestion": "Sugjerim popullor",
   "follow_suggestions.view_all": "Shihni krejt",
diff --git a/app/javascript/mastodon/locales/sr-Latn.json b/app/javascript/mastodon/locales/sr-Latn.json
index d9490ef70d86cc..e6be3f37957e65 100644
--- a/app/javascript/mastodon/locales/sr-Latn.json
+++ b/app/javascript/mastodon/locales/sr-Latn.json
@@ -277,7 +277,6 @@
   "follow_request.authorize": "Odobri",
   "follow_request.reject": "Odbij",
   "follow_requests.unlocked_explanation": "Iako vaš nalog nije zaključan, osoblje {domain} smatra da biste možda želeli da ručno pregledate zahteve za praćenje sa ovih naloga.",
-  "follow_suggestions.curated_suggestion": "Izbor urednika",
   "follow_suggestions.dismiss": "Ne prikazuj ponovo",
   "follow_suggestions.personalized_suggestion": "Personalizovani predlog",
   "follow_suggestions.popular_suggestion": "Popularni predlog",
diff --git a/app/javascript/mastodon/locales/sr.json b/app/javascript/mastodon/locales/sr.json
index fd09f5db493ab9..3143b5215eeefa 100644
--- a/app/javascript/mastodon/locales/sr.json
+++ b/app/javascript/mastodon/locales/sr.json
@@ -277,8 +277,12 @@
   "follow_request.authorize": "Одобри",
   "follow_request.reject": "Одбиј",
   "follow_requests.unlocked_explanation": "Иако ваш налог није закључан, особље {domain} сматра да бисте можда желели да ручно прегледате захтеве за праћење са ових налога.",
-  "follow_suggestions.curated_suggestion": "Избор уредника",
   "follow_suggestions.dismiss": "Не приказуј поново",
+  "follow_suggestions.hints.featured": "Овај профил је ручно изабрао тим {domain}.",
+  "follow_suggestions.hints.friends_of_friends": "Овај профил је популаран међу људима које пратите.",
+  "follow_suggestions.hints.most_followed": "Овај профил је један од најпраћенијих на {domain}.",
+  "follow_suggestions.hints.most_interactions": "Овај профил је недавно добио велику пажњу на {domain}.",
+  "follow_suggestions.hints.similar_to_recently_followed": "Овај профил је сличан профилима које сте недавно запратили.",
   "follow_suggestions.personalized_suggestion": "Персонализовани предлог",
   "follow_suggestions.popular_suggestion": "Популарни предлог",
   "follow_suggestions.view_all": "Прикажи све",
diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json
index e0aa072a77cc45..f071a86ba0d901 100644
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@@ -277,7 +277,6 @@
   "follow_request.authorize": "อนุญาต",
   "follow_request.reject": "ปฏิเสธ",
   "follow_requests.unlocked_explanation": "แม้ว่าไม่มีการล็อคบัญชีของคุณ พนักงานของ {domain} คิดว่าคุณอาจต้องการตรวจทานคำขอติดตามจากบัญชีเหล่านี้ด้วยตนเอง",
-  "follow_suggestions.curated_suggestion": "คัดสรรโดยบรรณาธิการ",
   "follow_suggestions.dismiss": "ไม่ต้องแสดงอีก",
   "follow_suggestions.personalized_suggestion": "ข้อเสนอแนะเฉพาะบุคคล",
   "follow_suggestions.popular_suggestion": "ข้อเสนอแนะยอดนิยม",
diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json
index 7ab370b8bcd088..fa728a6821e7ed 100644
--- a/app/javascript/mastodon/locales/tr.json
+++ b/app/javascript/mastodon/locales/tr.json
@@ -277,8 +277,13 @@
   "follow_request.authorize": "İzin Ver",
   "follow_request.reject": "Reddet",
   "follow_requests.unlocked_explanation": "Hesabınız kilitli olmasa da, {domain} personeli bu hesaplardan gelen takip isteklerini gözden geçirmek isteyebileceğinizi düşündü.",
-  "follow_suggestions.curated_suggestion": "Editörün Seçimi",
+  "follow_suggestions.curated_suggestion": "Çalışanların seçtikleri",
   "follow_suggestions.dismiss": "Tekrar gösterme",
+  "follow_suggestions.hints.featured": "Bu profil {domain} ekibi tarafından elle seçilmiştir.",
+  "follow_suggestions.hints.friends_of_friends": "Bu profil takip ettiğiniz insanlar arasında popülerdir.",
+  "follow_suggestions.hints.most_followed": "Bu, {domain} sunucusunda en fazla izlenen profildir.",
+  "follow_suggestions.hints.most_interactions": "Bu, {domain} sunucusunda son zamanlarda oldukça fazla dikkat çeken bir profildir.",
+  "follow_suggestions.hints.similar_to_recently_followed": "Bu profil, son zamanlarda takip ettiğiniz profillere benziyor.",
   "follow_suggestions.personalized_suggestion": "Kişiselleşmiş öneriler",
   "follow_suggestions.popular_suggestion": "Popüler öneriler",
   "follow_suggestions.view_all": "Tümünü gör",
diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json
index 0504ec60d87d25..d14654d17c8956 100644
--- a/app/javascript/mastodon/locales/uk.json
+++ b/app/javascript/mastodon/locales/uk.json
@@ -277,8 +277,13 @@
   "follow_request.authorize": "Авторизувати",
   "follow_request.reject": "Відмовити",
   "follow_requests.unlocked_explanation": "Хоча ваш обліковий запис не заблоковано, персонал {domain} припускає, що, можливо, ви хотіли б переглянути ці запити на підписку.",
-  "follow_suggestions.curated_suggestion": "Вибір редакції",
+  "follow_suggestions.curated_suggestion": "Відібрано командою",
   "follow_suggestions.dismiss": "Більше не показувати",
+  "follow_suggestions.hints.featured": "Цей профіль був обраний командою {domain}.",
+  "follow_suggestions.hints.friends_of_friends": "Цей профіль популярний серед тих людей, на яких ви підписані.",
+  "follow_suggestions.hints.most_followed": "За цим профілем один з найпопулярніших на {domain}.",
+  "follow_suggestions.hints.most_interactions": "Нещодавно цей профіль отримав багато уваги на {domain}.",
+  "follow_suggestions.hints.similar_to_recently_followed": "Цей профіль схожий на профілі, за якими ви стежили останнім часом.",
   "follow_suggestions.personalized_suggestion": "Персоналізована пропозиція",
   "follow_suggestions.popular_suggestion": "Популярна пропозиція",
   "follow_suggestions.view_all": "Переглянути все",
diff --git a/app/javascript/mastodon/locales/vi.json b/app/javascript/mastodon/locales/vi.json
index 766407183bc2ae..7f4b833f31fc35 100644
--- a/app/javascript/mastodon/locales/vi.json
+++ b/app/javascript/mastodon/locales/vi.json
@@ -277,7 +277,6 @@
   "follow_request.authorize": "Chấp nhận",
   "follow_request.reject": "Từ chối",
   "follow_requests.unlocked_explanation": "Mặc dù tài khoản của bạn đang ở chế độ công khai, quản trị viên của {domain} vẫn tin rằng bạn sẽ muốn xem lại yêu cầu theo dõi từ những người khác.",
-  "follow_suggestions.curated_suggestion": "Lựa chọn của máy chủ",
   "follow_suggestions.dismiss": "Không hiện lại",
   "follow_suggestions.personalized_suggestion": "Gợi ý cá nhân hóa",
   "follow_suggestions.popular_suggestion": "Những người nổi tiếng",
diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json
index 9d0da95c819046..84c42a4aa28ef5 100644
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@@ -53,7 +53,7 @@
   "account.mute_notifications_short": "关闭通知",
   "account.mute_short": "隐藏",
   "account.muted": "已隐藏",
-  "account.mutual": "互粉好友",
+  "account.mutual": "互关",
   "account.no_bio": "未提供描述。",
   "account.open_original_page": "打开原始页面",
   "account.posts": "嘟文",
@@ -277,8 +277,13 @@
   "follow_request.authorize": "同意",
   "follow_request.reject": "拒绝",
   "follow_requests.unlocked_explanation": "尽管你没有锁嘟，但是 {domain} 的工作人员认为你也许会想手动审核审核这些账号的关注请求。",
-  "follow_suggestions.curated_suggestion": "主编推荐",
+  "follow_suggestions.curated_suggestion": "管理员精选",
   "follow_suggestions.dismiss": "不再显示",
+  "follow_suggestions.hints.featured": "该个人资料已被 {domain} 管理团队精选。",
+  "follow_suggestions.hints.friends_of_friends": "该个人资料在您关注的人中很受欢迎。",
+  "follow_suggestions.hints.most_followed": "该个人资料是 {domain} 上关注度最高的个人资料之一。",
+  "follow_suggestions.hints.most_interactions": "该个人资料最近在 {domain} 上获得了很多关注。",
+  "follow_suggestions.hints.similar_to_recently_followed": "该个人资料与您最近关注的个人资料类似。",
   "follow_suggestions.personalized_suggestion": "个性化建议",
   "follow_suggestions.popular_suggestion": "热门建议",
   "follow_suggestions.view_all": "查看全部",
diff --git a/app/javascript/mastodon/locales/zh-HK.json b/app/javascript/mastodon/locales/zh-HK.json
index c1a69591ff7314..2382e3c61ce2c2 100644
--- a/app/javascript/mastodon/locales/zh-HK.json
+++ b/app/javascript/mastodon/locales/zh-HK.json
@@ -277,7 +277,6 @@
   "follow_request.authorize": "批准",
   "follow_request.reject": "拒絕",
   "follow_requests.unlocked_explanation": "即使您的帳號未上鎖，{domain} 的工作人員認為您可能會想手動審核來自這些帳號的追蹤請求。",
-  "follow_suggestions.curated_suggestion": "編輯推薦",
   "follow_suggestions.dismiss": "不再顯示",
   "follow_suggestions.personalized_suggestion": "個人化推薦",
   "follow_suggestions.popular_suggestion": "熱門推薦",
diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json
index d83b523d1eba53..0ecf1378e3c9c2 100644
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@@ -279,6 +279,11 @@
   "follow_requests.unlocked_explanation": "即便您的帳號未被鎖定，{domain} 的管理員認為您可能想要自己審核這些帳號的跟隨請求。",
   "follow_suggestions.curated_suggestion": "精選內容",
   "follow_suggestions.dismiss": "不再顯示",
+  "follow_suggestions.hints.featured": "這個個人檔案是 {domain} 管理團隊精心挑選。",
+  "follow_suggestions.hints.friends_of_friends": "這個個人檔案於您跟隨的帳號中很受歡迎。",
+  "follow_suggestions.hints.most_followed": "這個個人檔案是 {domain} 中最受歡迎的帳號之一。",
+  "follow_suggestions.hints.most_interactions": "這個個人檔案最近於 {domain} 受到非常多關注。",
+  "follow_suggestions.hints.similar_to_recently_followed": "這個個人檔案與您最近跟隨之帳號類似。",
   "follow_suggestions.personalized_suggestion": "個人化推薦",
   "follow_suggestions.popular_suggestion": "熱門推薦",
   "follow_suggestions.view_all": "檢視全部",
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 6f67aeeeaa35dc..0c85930a4f962d 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -1077,7 +1077,7 @@ cs:
       hint_html: Ještě jedna věc! Musíme potvrdit, že jste člověk (to proto, abychom drželi stranou spam!). Vyřešte CAPTCHA níže a klikněte na "Pokračovat".
       title: Bezpečnostní kontrola
     confirmations:
-      awaiting_review: Vaše e-mailová adresa je potvrzena! Pracovníci %{domain} nyní kontrolují vaši registraci. Pokud váš účet schválí, obdržíte e-mail!
+      awaiting_review: Vaše e-mailová adresa je potvrzena! Personál %{domain} nyní kontrolují vaši registraci. Pokud váš účet schválí, obdržíte e-mail!
       awaiting_review_title: Vaše registrace se ověřuje
       clicking_this_link: kliknutím na tento odkaz
       login_link: přihlásit se

From 937dad1ee6cfe333435709dc1c88655ffc2614b1 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 20 Feb 2024 05:08:32 -0500
Subject: [PATCH 0162/2191] Extract ES query and filter hashes into private
 methods in `TagSearchService` (#29288)

---
 app/services/tag_search_service.rb | 54 ++++++++++++++++--------------
 1 file changed, 29 insertions(+), 25 deletions(-)

diff --git a/app/services/tag_search_service.rb b/app/services/tag_search_service.rb
index d5d1974275c039..929cfd884f7c83 100644
--- a/app/services/tag_search_service.rb
+++ b/app/services/tag_search_service.rb
@@ -16,7 +16,32 @@ def call(query, options = {})
   private
 
   def from_elasticsearch
-    query = {
+    definition = TagsIndex.query(elastic_search_query)
+    definition = definition.filter(elastic_search_filter) if @options[:exclude_unreviewed]
+
+    ensure_exact_match(definition.limit(@limit).offset(@offset).objects.compact)
+  rescue Faraday::ConnectionFailed, Parslet::ParseFailed
+    nil
+  end
+
+  # Since the ElasticSearch Query doesn't guarantee the exact match will be the
+  # first result or that it will even be returned, patch the results accordingly
+  def ensure_exact_match(results)
+    return results unless @offset.nil? || @offset.zero?
+
+    normalized_query = Tag.normalize(@query)
+    exact_match = results.find { |tag| tag.name.downcase == normalized_query }
+    exact_match ||= Tag.find_normalized(normalized_query)
+    unless exact_match.nil?
+      results.delete(exact_match)
+      results = [exact_match] + results
+    end
+
+    results
+  end
+
+  def elastic_search_query
+    {
       function_score: {
         query: {
           multi_match: {
@@ -50,8 +75,10 @@ def from_elasticsearch
         boost_mode: 'multiply',
       },
     }
+  end
 
-    filter = {
+  def elastic_search_filter
+    {
       bool: {
         should: [
           {
@@ -72,29 +99,6 @@ def from_elasticsearch
         ],
       },
     }
-
-    definition = TagsIndex.query(query)
-    definition = definition.filter(filter) if @options[:exclude_unreviewed]
-
-    ensure_exact_match(definition.limit(@limit).offset(@offset).objects.compact)
-  rescue Faraday::ConnectionFailed, Parslet::ParseFailed
-    nil
-  end
-
-  # Since the ElasticSearch Query doesn't guarantee the exact match will be the
-  # first result or that it will even be returned, patch the results accordingly
-  def ensure_exact_match(results)
-    return results unless @offset.nil? || @offset.zero?
-
-    normalized_query = Tag.normalize(@query)
-    exact_match = results.find { |tag| tag.name.downcase == normalized_query }
-    exact_match ||= Tag.find_normalized(normalized_query)
-    unless exact_match.nil?
-      results.delete(exact_match)
-      results = [exact_match] + results
-    end
-
-    results
   end
 
   def from_database

From 36fd47ac5792fc6bb552e4a566e387dc629e6aff Mon Sep 17 00:00:00 2001
From: Wojciech Maj <kontakt@wojtekmaj.pl>
Date: Tue, 20 Feb 2024 11:10:58 +0100
Subject: [PATCH 0163/2191] Remove unused dependencies (#29289)

---
 package.json |  6 +-----
 yarn.lock    | 19 +++----------------
 2 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/package.json b/package.json
index d0b1b2e71cd2dd..e34749558557de 100644
--- a/package.json
+++ b/package.json
@@ -89,7 +89,6 @@
     "mark-loader": "^0.1.6",
     "marky": "^1.2.5",
     "mini-css-extract-plugin": "^1.6.2",
-    "mkdirp": "^3.0.1",
     "path-complete-extname": "^1.0.0",
     "postcss": "^8.4.24",
     "postcss-loader": "^4.3.0",
@@ -118,7 +117,6 @@
     "redux-immutable": "^4.0.0",
     "regenerator-runtime": "^0.14.0",
     "requestidlecallback": "^0.3.0",
-    "rimraf": "^5.0.1",
     "sass": "^1.62.1",
     "sass-loader": "^10.2.0",
     "stacktrace-js": "^2.0.2",
@@ -175,7 +173,6 @@
     "@types/redux-immutable": "^4.0.3",
     "@types/requestidlecallback": "^0.3.5",
     "@types/webpack": "^4.41.33",
-    "@types/yargs": "^17.0.24",
     "@typescript-eslint/eslint-plugin": "^6.0.0",
     "@typescript-eslint/parser": "^6.17.0",
     "babel-jest": "^29.5.0",
@@ -200,8 +197,7 @@
     "stylelint": "^16.0.2",
     "stylelint-config-standard-scss": "^13.0.0",
     "typescript": "^5.0.4",
-    "webpack-dev-server": "^3.11.3",
-    "yargs": "^17.7.2"
+    "webpack-dev-server": "^3.11.3"
   },
   "resolutions": {
     "kind-of": "^6.0.3",
diff --git a/yarn.lock b/yarn.lock
index f4c84110a14023..1f653070e7d5db 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2334,7 +2334,6 @@ __metadata:
     "@types/redux-immutable": "npm:^4.0.3"
     "@types/requestidlecallback": "npm:^0.3.5"
     "@types/webpack": "npm:^4.41.33"
-    "@types/yargs": "npm:^17.0.24"
     "@typescript-eslint/eslint-plugin": "npm:^6.0.0"
     "@typescript-eslint/parser": "npm:^6.17.0"
     arrow-key-navigation: "npm:^1.2.0"
@@ -2391,7 +2390,6 @@ __metadata:
     mark-loader: "npm:^0.1.6"
     marky: "npm:^1.2.5"
     mini-css-extract-plugin: "npm:^1.6.2"
-    mkdirp: "npm:^3.0.1"
     path-complete-extname: "npm:^1.0.0"
     postcss: "npm:^8.4.24"
     postcss-loader: "npm:^4.3.0"
@@ -2422,7 +2420,6 @@ __metadata:
     redux-immutable: "npm:^4.0.0"
     regenerator-runtime: "npm:^0.14.0"
     requestidlecallback: "npm:^0.3.0"
-    rimraf: "npm:^5.0.1"
     sass: "npm:^1.62.1"
     sass-loader: "npm:^10.2.0"
     stacktrace-js: "npm:^2.0.2"
@@ -2448,7 +2445,6 @@ __metadata:
     workbox-strategies: "npm:^7.0.0"
     workbox-webpack-plugin: "npm:^7.0.0"
     workbox-window: "npm:^7.0.0"
-    yargs: "npm:^17.7.2"
   peerDependenciesMeta:
     react:
       optional: true
@@ -3653,7 +3649,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/yargs@npm:^17.0.24, @types/yargs@npm:^17.0.8":
+"@types/yargs@npm:^17.0.8":
   version: 17.0.32
   resolution: "@types/yargs@npm:17.0.32"
   dependencies:
@@ -11581,15 +11577,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"mkdirp@npm:^3.0.1":
-  version: 3.0.1
-  resolution: "mkdirp@npm:3.0.1"
-  bin:
-    mkdirp: dist/cjs/src/bin.js
-  checksum: 9f2b975e9246351f5e3a40dcfac99fcd0baa31fbfab615fe059fb11e51f10e4803c63de1f384c54d656e4db31d000e4767e9ef076a22e12a641357602e31d57d
-  languageName: node
-  linkType: hard
-
 "mousetrap@npm:^1.5.2":
   version: 1.6.5
   resolution: "mousetrap@npm:1.6.5"
@@ -14440,7 +14427,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rimraf@npm:^5.0.1, rimraf@npm:^5.0.5":
+"rimraf@npm:^5.0.5":
   version: 5.0.5
   resolution: "rimraf@npm:5.0.5"
   dependencies:
@@ -17741,7 +17728,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"yargs@npm:^17.3.1, yargs@npm:^17.7.2":
+"yargs@npm:^17.3.1":
   version: 17.7.2
   resolution: "yargs@npm:17.7.2"
   dependencies:

From 5f50b634cf89a84b5b507fc72ae989564e9962f9 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 20 Feb 2024 18:49:59 +0100
Subject: [PATCH 0164/2191] Further reduce CSS and markup differences with
 upstream (#2635)

* Further reduce CSS differences with upstream

* Reduce differences in markup and CSS with upstream

* Redo collapsible post notifications

* Reduce CSS differences further

* Reduce differences with upstream regarding `.status` and `.status__wrapper`

* Further reduce differences with upstream

* Reduce differences with upstream in DisplayName
---
 .../flavours/glitch/components/account.jsx    |   2 +-
 .../glitch/components/collapse_button.jsx     |  45 ++
 .../glitch/components/display_name.tsx        |  11 +-
 .../flavours/glitch/components/status.jsx     | 116 +++--
 .../glitch/components/status_header.jsx       |  31 +-
 .../glitch/components/status_icons.jsx        |  21 +-
 .../glitch/components/status_prepend.jsx      |  28 +-
 .../notifications/components/admin_report.jsx |   4 +-
 .../notifications/components/admin_signup.jsx |   4 +-
 .../notifications/components/follow.jsx       |   4 +-
 .../components/follow_request.jsx             |   4 +-
 .../features/ui/components/boost_modal.jsx    |  12 +-
 .../ui/components/favourite_modal.jsx         |  14 +-
 .../flavours/glitch/styles/components.scss    | 454 +++++++++---------
 14 files changed, 390 insertions(+), 360 deletions(-)
 create mode 100644 app/javascript/flavours/glitch/components/collapse_button.jsx

diff --git a/app/javascript/flavours/glitch/components/account.jsx b/app/javascript/flavours/glitch/components/account.jsx
index 266a3ca995fb0a..fd7caea6df99a9 100644
--- a/app/javascript/flavours/glitch/components/account.jsx
+++ b/app/javascript/flavours/glitch/components/account.jsx
@@ -147,7 +147,7 @@ class Account extends ImmutablePureComponent {
             </div>
 
             <div className='account__contents'>
-              <DisplayName account={account} inline />
+              <DisplayName account={account} />
               {!minimal && (
                 <div className='account__details'>
                   {account.get('followers_count') !== -1 && (
diff --git a/app/javascript/flavours/glitch/components/collapse_button.jsx b/app/javascript/flavours/glitch/components/collapse_button.jsx
new file mode 100644
index 00000000000000..36cda45361de5f
--- /dev/null
+++ b/app/javascript/flavours/glitch/components/collapse_button.jsx
@@ -0,0 +1,45 @@
+import PropTypes from 'prop-types';
+import { useCallback } from 'react';
+
+import { defineMessages, useIntl } from 'react-intl';
+
+import ExpandLessIcon from '@/material-icons/400-24px/expand_less.svg?react';
+
+import { IconButton } from './icon_button';
+
+const messages = defineMessages({
+  collapse: { id: 'status.collapse', defaultMessage: 'Collapse' },
+  uncollapse: { id: 'status.uncollapse', defaultMessage: 'Uncollapse' },
+});
+
+export const CollapseButton = ({ collapsed, setCollapsed }) => {
+  const intl = useIntl();
+
+  const handleCollapsedClick = useCallback((e) => {
+    if (e.button === 0) {
+      setCollapsed(!collapsed);
+      e.preventDefault();
+    }
+  }, [collapsed, setCollapsed]);
+
+  return (
+    <IconButton
+      className='status__collapse-button'
+      animate
+      active={collapsed}
+      title={
+        collapsed ?
+          intl.formatMessage(messages.uncollapse) :
+          intl.formatMessage(messages.collapse)
+      }
+      icon='angle-double-up'
+      iconComponent={ExpandLessIcon}
+      onClick={handleCollapsedClick}
+    />
+  );
+};
+
+CollapseButton.propTypes = {
+  collapsed: PropTypes.bool,
+  setCollapsed: PropTypes.func.isRequired,
+};
diff --git a/app/javascript/flavours/glitch/components/display_name.tsx b/app/javascript/flavours/glitch/components/display_name.tsx
index 82b66b57485006..dd7d12f70af4cb 100644
--- a/app/javascript/flavours/glitch/components/display_name.tsx
+++ b/app/javascript/flavours/glitch/components/display_name.tsx
@@ -1,7 +1,5 @@
 import React from 'react';
 
-import classNames from 'classnames';
-
 import type { List } from 'immutable';
 
 import type { Account } from 'flavours/glitch/models/account';
@@ -14,7 +12,6 @@ interface Props {
   account?: Account;
   others?: List<Account>;
   localDomain?: string;
-  inline?: boolean;
 }
 
 export class DisplayName extends React.PureComponent<Props> {
@@ -51,7 +48,7 @@ export class DisplayName extends React.PureComponent<Props> {
   };
 
   render() {
-    const { others, localDomain, inline } = this.props;
+    const { others, localDomain } = this.props;
 
     let displayName: React.ReactNode,
       suffix: React.ReactNode,
@@ -114,13 +111,11 @@ export class DisplayName extends React.PureComponent<Props> {
 
     return (
       <span
-        className={classNames('display-name', { inline })}
+        className='display-name'
         onMouseEnter={this.handleMouseEnter}
         onMouseLeave={this.handleMouseLeave}
       >
-        {displayName}
-        {inline ? ' ' : null}
-        {suffix}
+        {displayName} {suffix}
       </span>
     );
   }
diff --git a/app/javascript/flavours/glitch/components/status.jsx b/app/javascript/flavours/glitch/components/status.jsx
index 62b58a5ec9b7be..42076f089076f5 100644
--- a/app/javascript/flavours/glitch/components/status.jsx
+++ b/app/javascript/flavours/glitch/components/status.jsx
@@ -23,6 +23,7 @@ import { MediaGallery, Video, Audio } from '../features/ui/util/async-components
 import { displayMedia } from '../initial_state';
 
 import AttachmentList from './attachment_list';
+import { CollapseButton } from './collapse_button';
 import { getHashtagBarForStatus } from './hashtag_bar';
 import StatusActionBar from './status_action_bar';
 import StatusContent from './status_content';
@@ -510,7 +511,6 @@ class Status extends ImmutablePureComponent {
 
   render () {
     const {
-      handleRef,
       parseClick,
       setCollapsed,
     } = this;
@@ -763,7 +763,13 @@ class Status extends ImmutablePureComponent {
           account={account}
           parseClick={parseClick}
           notificationId={this.props.notificationId}
-        />
+        >
+          {muted && settings.getIn(['collapsed', 'enabled']) && (
+            <div className='notification__message-collapse-button'>
+              <CollapseButton collapsed={isCollapsed} setCollapsed={setCollapsed} />
+            </div>
+          )}
+        </StatusPrepend>
       );
     }
 
@@ -771,85 +777,77 @@ class Status extends ImmutablePureComponent {
       rebloggedByText = intl.formatMessage({ id: 'status.reblogged_by', defaultMessage: '{name} boosted' }, { name: account.get('acct') });
     }
 
-    const computedClass = classNames('status', `status-${status.get('visibility')}`, {
-      collapsed: isCollapsed,
-      'has-background': isCollapsed && background,
-      'status__wrapper-reply': !!status.get('in_reply_to_id'),
-      'status--in-thread': !!rootId,
-      'status--first-in-thread': previousId && (!connectUp || connectToRoot),
-      unread,
-      muted,
-    }, 'focusable');
-
     const {statusContentProps, hashtagBar} = getHashtagBarForStatus(status);
     contentMedia.push(hashtagBar);
 
     return (
       <HotKeys handlers={handlers}>
         <div
-          className={computedClass}
-          style={isCollapsed && background ? { backgroundImage: `url(${background})` } : null}
+          className={classNames('status__wrapper', 'focusable', `status__wrapper-${status.get('visibility')}`, { 'status__wrapper-reply': !!status.get('in_reply_to_id'), unread, collapsed: isCollapsed })}
           {...selectorAttribs}
-          ref={handleRef}
           tabIndex={0}
           data-featured={featured ? 'true' : null}
           aria-label={textForScreenReader(intl, status, rebloggedByText, !status.get('hidden'))}
+          ref={this.handleRef}
           data-nosnippet={status.getIn(['account', 'noindex'], true) || undefined}
         >
-          {!muted && prepend}
+          {prepend}
 
-          {(connectReply || connectUp || connectToRoot) && <div className={classNames('status__line', { 'status__line--full': connectReply, 'status__line--first': !status.get('in_reply_to_id') && !connectToRoot })} />}
+          <div
+            className={classNames('status', `status-${status.get('visibility')}`, { 'status-reply': !!status.get('in_reply_to_id'), 'status--in-thread': !!rootId, 'status--first-in-thread': previousId && (!connectUp || connectToRoot), muted: this.props.muted, 'has-background': isCollapsed && background, collapsed: isCollapsed })}
+            data-id={status.get('id')}
+            style={isCollapsed && background ? { backgroundImage: `url(${background})` } : null}
+          >
+            {(connectReply || connectUp || connectToRoot) && <div className={classNames('status__line', { 'status__line--full': connectReply, 'status__line--first': !status.get('in_reply_to_id') && !connectToRoot })} />}
 
-          <header className='status__info'>
-            <span>
-              {muted && prepend}
-              {!muted || !isCollapsed ? (
+            {(!muted || !isCollapsed) && (
+              <header className='status__info'>
                 <StatusHeader
                   status={status}
                   friend={account}
                   collapsed={isCollapsed}
                   parseClick={parseClick}
                 />
-              ) : null}
-            </span>
-            <StatusIcons
-              status={status}
-              mediaIcons={contentMediaIcons.concat(extraMediaIcons)}
-              collapsible={settings.getIn(['collapsed', 'enabled'])}
-              collapsed={isCollapsed}
-              setCollapsed={setCollapsed}
-              settings={settings.get('status_icons')}
-            />
-          </header>
-          <StatusContent
-            status={status}
-            media={contentMedia}
-            extraMedia={extraMedia}
-            mediaIcons={contentMediaIcons}
-            expanded={isExpanded}
-            onExpandedToggle={this.handleExpandedToggle}
-            onTranslate={this.handleTranslate}
-            parseClick={parseClick}
-            disabled={!history}
-            tagLinks={settings.get('tag_misleading_links')}
-            rewriteMentions={settings.get('rewrite_mentions')}
-            {...statusContentProps}
-          />
-
-          {!isCollapsed || !(muted || !settings.getIn(['collapsed', 'show_action_bar'])) ? (
-            <StatusActionBar
+                <StatusIcons
+                  status={status}
+                  mediaIcons={contentMediaIcons.concat(extraMediaIcons)}
+                  collapsible={!muted && settings.getIn(['collapsed', 'enabled'])}
+                  collapsed={isCollapsed}
+                  setCollapsed={setCollapsed}
+                  settings={settings.get('status_icons')}
+                />
+              </header>
+            )}
+            <StatusContent
               status={status}
-              account={status.get('account')}
-              showReplyCount={settings.get('show_reply_count')}
-              onFilter={matchedFilters ? this.handleFilterClick : null}
-              {...other}
-            />
-          ) : null}
-          {notification ? (
-            <NotificationOverlayContainer
-              notification={notification}
+              media={contentMedia}
+              extraMedia={extraMedia}
+              mediaIcons={contentMediaIcons}
+              expanded={isExpanded}
+              onExpandedToggle={this.handleExpandedToggle}
+              onTranslate={this.handleTranslate}
+              parseClick={parseClick}
+              disabled={!history}
+              tagLinks={settings.get('tag_misleading_links')}
+              rewriteMentions={settings.get('rewrite_mentions')}
+              {...statusContentProps}
             />
-          ) : null}
+
+            {(!isCollapsed || !(muted || !settings.getIn(['collapsed', 'show_action_bar']))) && (
+              <StatusActionBar
+                status={status}
+                account={status.get('account')}
+                showReplyCount={settings.get('show_reply_count')}
+                onFilter={matchedFilters ? this.handleFilterClick : null}
+                {...other}
+              />
+            )}
+            {notification && (
+              <NotificationOverlayContainer
+                notification={notification}
+              />
+            )}
+          </div>
         </div>
       </HotKeys>
     );
diff --git a/app/javascript/flavours/glitch/components/status_header.jsx b/app/javascript/flavours/glitch/components/status_header.jsx
index 1c51707cefaa9c..692dca5c7bf568 100644
--- a/app/javascript/flavours/glitch/components/status_header.jsx
+++ b/app/javascript/flavours/glitch/components/status_header.jsx
@@ -45,26 +45,19 @@ export default class StatusHeader extends PureComponent {
     }
 
     return (
-      <div className='status__info__account'>
-        <a
-          href={account.get('url')}
-          target='_blank'
-          className='status__avatar'
-          onClick={this.handleAccountClick}
-          rel='noopener noreferrer'
-        >
+      <a
+        href={account.get('url')}
+        className='status__display-name'
+        target='_blank'
+        onClick={this.handleAccountClick}
+        rel='noopener noreferrer'
+      >
+        <div className='status__avatar'>
           {statusAvatar}
-        </a>
-        <a
-          href={account.get('url')}
-          target='_blank'
-          className='status__display-name'
-          onClick={this.handleAccountClick}
-          rel='noopener noreferrer'
-        >
-          <DisplayName account={account} />
-        </a>
-      </div>
+        </div>
+
+        <DisplayName account={account} />
+      </a>
     );
   }
 
diff --git a/app/javascript/flavours/glitch/components/status_icons.jsx b/app/javascript/flavours/glitch/components/status_icons.jsx
index 2727d3410acc92..8ee84fe26969f3 100644
--- a/app/javascript/flavours/glitch/components/status_icons.jsx
+++ b/app/javascript/flavours/glitch/components/status_icons.jsx
@@ -6,7 +6,6 @@ import { defineMessages, injectIntl } from 'react-intl';
 
 import ImmutablePropTypes from 'react-immutable-proptypes';
 
-import ExpandLessIcon from '@/material-icons/400-24px/expand_less.svg?react';
 import ForumIcon from '@/material-icons/400-24px/forum.svg?react';
 import HomeIcon from '@/material-icons/400-24px/home.svg?react';
 import ImageIcon from '@/material-icons/400-24px/image.svg?react';
@@ -17,8 +16,7 @@ import MusicNoteIcon from '@/material-icons/400-24px/music_note.svg?react';
 import { Icon } from 'flavours/glitch/components/icon';
 import { languages } from 'flavours/glitch/initial_state';
 
-
-import { IconButton } from './icon_button';
+import { CollapseButton } from './collapse_button';
 import { VisibilityIcon } from './visibility_icon';
 
 const messages = defineMessages({
@@ -118,6 +116,7 @@ class StatusIcons extends PureComponent {
       mediaIcons,
       collapsible,
       collapsed,
+      setCollapsed,
       settings,
       intl,
     } = this.props;
@@ -143,21 +142,7 @@ class StatusIcons extends PureComponent {
           />}
         {settings.get('media') && !!mediaIcons && mediaIcons.map(icon => this.renderIcon(icon))}
         {settings.get('visibility') && <VisibilityIcon visibility={status.get('visibility')} />}
-        {collapsible && (
-          <IconButton
-            className='status__collapse-button'
-            animate
-            active={collapsed}
-            title={
-              collapsed ?
-                intl.formatMessage(messages.uncollapse) :
-                intl.formatMessage(messages.collapse)
-            }
-            icon='angle-double-up'
-            iconComponent={ExpandLessIcon}
-            onClick={this.handleCollapsedClick}
-          />
-        )}
+        {collapsible && <CollapseButton collapsed={collapsed} setCollapsed={setCollapsed} />}
       </div>
     );
   }
diff --git a/app/javascript/flavours/glitch/components/status_prepend.jsx b/app/javascript/flavours/glitch/components/status_prepend.jsx
index 355f65a3e21ff5..41902e60ba7c36 100644
--- a/app/javascript/flavours/glitch/components/status_prepend.jsx
+++ b/app/javascript/flavours/glitch/components/status_prepend.jsx
@@ -23,6 +23,7 @@ export default class StatusPrepend extends PureComponent {
     account: ImmutablePropTypes.map.isRequired,
     parseClick: PropTypes.func.isRequired,
     notificationId: PropTypes.number,
+    children: PropTypes.node,
   };
 
   handleClick = (e) => {
@@ -38,11 +39,13 @@ export default class StatusPrepend extends PureComponent {
         href={account.get('url')}
         className='status__display-name'
       >
-        <b
-          dangerouslySetInnerHTML={{
-            __html : account.get('display_name_html') || account.get('username'),
-          }}
-        />
+        <bdi>
+          <strong
+            dangerouslySetInnerHTML={{
+              __html : account.get('display_name_html') || account.get('username'),
+            }}
+          />
+        </bdi>
       </a>
     );
     switch (type) {
@@ -112,7 +115,7 @@ export default class StatusPrepend extends PureComponent {
 
   render () {
     const { Message } = this;
-    const { type } = this.props;
+    const { type, children } = this.props;
 
     let iconId, iconComponent;
 
@@ -146,14 +149,13 @@ export default class StatusPrepend extends PureComponent {
 
     return !type ? null : (
       <aside className={type === 'reblogged_by' || type === 'featured' ? 'status__prepend' : 'notification__message'}>
-        <div className={type === 'reblogged_by' || type === 'featured' ? 'status__prepend-icon-wrapper' : 'notification__favourite-icon-wrapper'}>
-          <Icon
-            className={`status__prepend-icon ${type === 'favourite' ? 'star-icon' : ''}`}
-            id={iconId}
-            icon={iconComponent}
-          />
-        </div>
+        <Icon
+          className={`status__prepend-icon ${type === 'favourite' ? 'star-icon' : ''}`}
+          id={iconId}
+          icon={iconComponent}
+        />
         <Message />
+        {children}
       </aside>
     );
   }
diff --git a/app/javascript/flavours/glitch/features/notifications/components/admin_report.jsx b/app/javascript/flavours/glitch/features/notifications/components/admin_report.jsx
index d16a775ea57221..5ca8b59a5e2aad 100644
--- a/app/javascript/flavours/glitch/features/notifications/components/admin_report.jsx
+++ b/app/javascript/flavours/glitch/features/notifications/components/admin_report.jsx
@@ -95,9 +95,7 @@ class AdminReport extends ImmutablePureComponent {
       <HotKeys handlers={this.getHandlers()}>
         <div className={classNames('notification notification-admin-report focusable', { unread })} tabIndex={0}>
           <div className='notification__message'>
-            <div className='notification__favourite-icon-wrapper'>
-              <Icon id='flag' icon={FlagIcon} />
-            </div>
+            <Icon id='flag' icon={FlagIcon} />
 
             <span title={notification.get('created_at')}>
               <FormattedMessage id='notification.admin.report' defaultMessage='{name} reported {target}' values={{ name: link, target: targetLink }} />
diff --git a/app/javascript/flavours/glitch/features/notifications/components/admin_signup.jsx b/app/javascript/flavours/glitch/features/notifications/components/admin_signup.jsx
index 60affd444b6c91..4c815099b12f60 100644
--- a/app/javascript/flavours/glitch/features/notifications/components/admin_signup.jsx
+++ b/app/javascript/flavours/glitch/features/notifications/components/admin_signup.jsx
@@ -86,9 +86,7 @@ class NotificationAdminSignup extends ImmutablePureComponent {
       <HotKeys handlers={this.getHandlers()}>
         <div className={classNames('notification notification-admin-sign-up focusable', { unread })} tabIndex={0}>
           <div className='notification__message'>
-            <div className='notification__favourite-icon-wrapper'>
-              <Icon id='user-plus' icon={PersonAddIcon} />
-            </div>
+            <Icon id='user-plus' icon={PersonAddIcon} />
 
             <FormattedMessage
               id='notification.admin.sign_up'
diff --git a/app/javascript/flavours/glitch/features/notifications/components/follow.jsx b/app/javascript/flavours/glitch/features/notifications/components/follow.jsx
index 85ccde094b04e8..d26039fd5faf06 100644
--- a/app/javascript/flavours/glitch/features/notifications/components/follow.jsx
+++ b/app/javascript/flavours/glitch/features/notifications/components/follow.jsx
@@ -86,9 +86,7 @@ class NotificationFollow extends ImmutablePureComponent {
       <HotKeys handlers={this.getHandlers()}>
         <div className={classNames('notification notification-follow focusable', { unread })} tabIndex={0}>
           <div className='notification__message'>
-            <div className='notification__favourite-icon-wrapper'>
-              <Icon id='user-plus' icon={PersonAddIcon} />
-            </div>
+            <Icon id='user-plus' icon={PersonAddIcon} />
 
             <FormattedMessage
               id='notification.follow'
diff --git a/app/javascript/flavours/glitch/features/notifications/components/follow_request.jsx b/app/javascript/flavours/glitch/features/notifications/components/follow_request.jsx
index 66072799835519..11aa343609a735 100644
--- a/app/javascript/flavours/glitch/features/notifications/components/follow_request.jsx
+++ b/app/javascript/flavours/glitch/features/notifications/components/follow_request.jsx
@@ -108,9 +108,7 @@ class FollowRequest extends ImmutablePureComponent {
       <HotKeys handlers={this.getHandlers()}>
         <div className={classNames('notification notification-follow-request focusable', { unread })} tabIndex={0}>
           <div className='notification__message'>
-            <div className='notification__favourite-icon-wrapper'>
-              <Icon id='user' icon={PersonIcon} />
-            </div>
+            <Icon id='user' icon={PersonIcon} />
 
             <FormattedMessage
               id='notification.follow_request'
diff --git a/app/javascript/flavours/glitch/features/ui/components/boost_modal.jsx b/app/javascript/flavours/glitch/features/ui/components/boost_modal.jsx
index f44fd5ebf41c2c..c16ed71cb8c657 100644
--- a/app/javascript/flavours/glitch/features/ui/components/boost_modal.jsx
+++ b/app/javascript/flavours/glitch/features/ui/components/boost_modal.jsx
@@ -9,7 +9,6 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-
 import RepeatIcon from '@/material-icons/400-24px/repeat.svg?react';
 import { changeBoostPrivacy } from 'flavours/glitch/actions/boosts';
 import AttachmentList from 'flavours/glitch/components/attachment_list';
@@ -78,12 +77,11 @@ class BoostModal extends ImmutablePureComponent {
       <div className='modal-root__modal boost-modal'>
         <div className='boost-modal__container'>
           <div className={classNames('status', `status-${status.get('visibility')}`, 'light')}>
-            <div className='boost-modal__status-header'>
-              <div className='boost-modal__status-time'>
-                <a href={status.get('url')} className='status__relative-time' target='_blank' rel='noopener noreferrer'>
-                  <VisibilityIcon visibility={status.get('visibility')} />
-                  <RelativeTimestamp timestamp={status.get('created_at')} /></a>
-              </div>
+            <div className='status__info'>
+              <a href={status.get('url')} className='status__relative-time' target='_blank' rel='noopener noreferrer'>
+                <span className='status__visibility-icon'><VisibilityIcon visibility={status.get('visibility')} /></span>
+                <RelativeTimestamp timestamp={status.get('created_at')} />
+              </a>
 
               <a onClick={this.handleAccountClick} href={status.getIn(['account', 'url'])} className='status__display-name'>
                 <div className='status__avatar'>
diff --git a/app/javascript/flavours/glitch/features/ui/components/favourite_modal.jsx b/app/javascript/flavours/glitch/features/ui/components/favourite_modal.jsx
index 388bc5762cfa5d..138f44f21c1fad 100644
--- a/app/javascript/flavours/glitch/features/ui/components/favourite_modal.jsx
+++ b/app/javascript/flavours/glitch/features/ui/components/favourite_modal.jsx
@@ -8,7 +8,6 @@ import { withRouter } from 'react-router-dom';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-
 import StarIcon from '@/material-icons/400-24px/star-fill.svg?react';
 import AttachmentList from 'flavours/glitch/components/attachment_list';
 import { Avatar } from 'flavours/glitch/components/avatar';
@@ -54,13 +53,11 @@ class FavouriteModal extends ImmutablePureComponent {
       <div className='modal-root__modal boost-modal'>
         <div className='boost-modal__container'>
           <div className={classNames('status', `status-${status.get('visibility')}`, 'light')}>
-            <div className='boost-modal__status-header'>
-              <div className='boost-modal__status-time'>
-                <a href={status.get('url')} className='status__relative-time' target='_blank' rel='noopener noreferrer'>
-                  <VisibilityIcon visibility={status.get('visibility')} />
-                  <RelativeTimestamp timestamp={status.get('created_at')} />
-                </a>
-              </div>
+            <div className='status__info'>
+              <a href={status.get('url')} className='status__relative-time' target='_blank' rel='noopener noreferrer'>
+                <span className='status__visibility-icon'><VisibilityIcon visibility={status.get('visibility')} /></span>
+                <RelativeTimestamp timestamp={status.get('created_at')} />
+              </a>
 
               <a onClick={this.handleAccountClick} href={status.getIn(['account', 'url'])} className='status__display-name'>
                 <div className='status__avatar'>
@@ -68,7 +65,6 @@ class FavouriteModal extends ImmutablePureComponent {
                 </div>
 
                 <DisplayName account={status.get('account')} />
-
               </a>
             </div>
 
diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index f2decf9b5312c6..9d5b73af46cbff 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -412,7 +412,7 @@ body > [data-popper-placement] {
 
   .compose-form__warning {
     color: $inverted-text-color;
-    margin-bottom: 15px;
+    margin-bottom: 10px;
     background: $ui-primary-color;
     box-shadow: 0 2px 6px rgba($base-shadow-color, 0.3);
     padding: 8px 10px;
@@ -1033,8 +1033,7 @@ body > [data-popper-placement] {
 
 .status {
   padding: 10px 14px;
-  position: relative;
-  height: auto;
+  min-height: 54px;
   border-bottom: 1px solid lighten($ui-base-color, 8%);
   cursor: auto;
 
@@ -1090,17 +1089,69 @@ body > [data-popper-placement] {
         color: $primary-text-color;
         background: $ui-primary-color;
 
-        &:hover {
+        &:hover,
+        &:focus {
           background: lighten($ui-primary-color, 8%);
         }
       }
     }
   }
 
+  &--in-thread {
+    $thread-margin: 46px + 10px;
+
+    border-bottom: 0;
+
+    .status__content,
+    .status__action-bar {
+      margin-inline-start: $thread-margin;
+      width: calc(100% - ($thread-margin));
+    }
+  }
+
+  &--first-in-thread {
+    border-top: 1px solid lighten($ui-base-color, 8%);
+  }
+
+  &__line {
+    height: 10px - 4px;
+    border-inline-start: 2px solid lighten($ui-base-color, 8%);
+    width: 0;
+    position: absolute;
+    top: 0;
+    inset-inline-start: 14px + ((46px - 2px) * 0.5);
+
+    &--full {
+      top: 0;
+      height: 100%;
+
+      &::before {
+        content: '';
+        display: block;
+        position: absolute;
+        top: 10px - 4px;
+        height: 46px + 4px + 4px;
+        width: 2px;
+        background: $ui-base-color;
+        inset-inline-start: -2px;
+      }
+    }
+
+    &--first {
+      top: 10px + 46px + 4px;
+      height: calc(100% - (10px + 46px + 4px));
+
+      &::before {
+        display: none;
+      }
+    }
+  }
+
   &.collapsed {
     background-position: center;
     background-size: cover;
     user-select: none;
+    min-height: 0;
 
     &.has-background::before {
       display: block;
@@ -1161,25 +1212,30 @@ body > [data-popper-placement] {
         rgba(mix($ui-base-color, $ui-highlight-color, 95%), 1)
       );
     }
-
-    .notification__message {
-      margin-bottom: 0;
-    }
-
-    .status__info .notification__message > span {
-      white-space: nowrap;
-    }
   }
+}
 
+.status__wrapper.collapsed {
   .notification__message {
-    margin: -10px 0 10px;
+    margin-bottom: 0;
+    white-space: nowrap;
+  }
+}
+
+.notification__message-collapse-button {
+  text-align: end;
+  flex-grow: 2;
+
+  .status__collapse-button .icon {
+    width: 24px;
+    height: 24px;
   }
 }
 
 .status__relative-time {
-  display: inline-block;
-  color: $dark-text-color;
+  display: block;
   font-size: 14px;
+  color: $dark-text-color;
   text-align: end;
   white-space: nowrap;
   overflow: hidden;
@@ -1198,48 +1254,59 @@ body > [data-popper-placement] {
   overflow: hidden;
 }
 
-.status__info__account .status__display-name {
-  display: block;
+.status__info .status__display-name {
   max-width: 100%;
-}
-
-.status__info {
   display: flex;
-  justify-content: space-between;
   font-size: 15px;
+  line-height: 22px;
+  align-items: center;
+  gap: 10px;
+  overflow: hidden;
 
-  > span {
-    text-overflow: ellipsis;
-    overflow: hidden;
-  }
+  .display-name {
+    bdi {
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
 
-  .notification__message > span {
-    word-wrap: break-word;
+    &__account {
+      white-space: nowrap;
+      display: block;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
   }
 }
 
+.status__info {
+  font-size: 15px;
+  padding-bottom: 10px;
+  display: flex;
+  justify-content: space-between;
+  gap: 10px;
+  cursor: pointer;
+}
+
 .status__info__icons {
   display: flex;
   align-items: center;
   height: 1em;
   color: $action-button-color;
-
-  .status__media-icon,
-  .status__visibility-icon,
-  .status__reply-icon,
-  .text-icon {
-    padding-inline-start: 2px;
-    padding-inline-end: 2px;
-  }
+  gap: 4px;
 
   & > .icon {
     width: 16px;
     height: 16px;
   }
+}
 
-  .status__collapse-button.active > .icon {
-    transform: rotate(-180deg);
-  }
+.status__collapse-button {
+  // compensate for large padding built into the icon
+  margin: -4px;
+}
+
+.status__collapse-button.active > .icon {
+  transform: rotate(-180deg);
 }
 
 .no-reduce-motion .status__collapse-button {
@@ -1256,12 +1323,6 @@ body > [data-popper-placement] {
   }
 }
 
-.status__info__account {
-  display: flex;
-  align-items: center;
-  justify-content: flex-start;
-}
-
 .status-check-box__status {
   display: block;
   box-sizing: border-box;
@@ -1298,6 +1359,8 @@ body > [data-popper-placement] {
 }
 
 .status__prepend {
+  padding: 8px 14px; // intentionally reduced padding in glitch-soc
+  padding-bottom: 0;
   display: inline-flex;
   gap: 10px;
   font-size: 14px;
@@ -1317,14 +1380,14 @@ body > [data-popper-placement] {
 }
 
 .status__action-bar {
-  align-items: center;
   display: flex;
+  align-items: center;
   gap: 18px;
   margin-top: 8px;
-}
 
-.status__action-bar-spacer {
-  flex-grow: 1;
+  &-spacer {
+    flex-grow: 1;
+  }
 }
 
 .detailed-status__action-bar-dropdown {
@@ -1375,7 +1438,7 @@ body > [data-popper-placement] {
 }
 
 .detailed-status__meta {
-  margin-top: 15px;
+  margin-top: 16px;
   color: $dark-text-color;
   font-size: 14px;
   line-height: 18px;
@@ -1418,11 +1481,6 @@ body > [data-popper-placement] {
   }
 }
 
-.notification__favourite-icon-wrapper {
-  inset-inline-start: 0;
-  position: absolute;
-}
-
 .detailed-status__link {
   display: inline-flex;
   align-items: center;
@@ -1656,10 +1714,10 @@ a .account__avatar {
   }
 }
 
-a.status__display-name,
+.status__display-name,
 .reply-indicator__display-name,
 .detailed-status__display-name,
-.account__display-name {
+a.account__display-name {
   &:hover .display-name strong {
     text-decoration: underline;
   }
@@ -1698,15 +1756,9 @@ a.status__display-name,
   }
 }
 
-.status__relative-time,
-.detailed-status__datetime {
-  &:hover {
-    text-decoration: underline;
-  }
-}
-
 .status__avatar {
-  margin-inline-end: 10px;
+  width: 46px;
+  height: 46px;
 }
 
 .muted {
@@ -1738,41 +1790,53 @@ a.status__display-name,
 }
 
 .notification__report {
-  padding: 8px 10px;
-  padding-inline-start: 68px;
-  position: relative;
+  padding: 10px; // deliberate glitch-soc change
   border-bottom: 1px solid lighten($ui-base-color, 8%);
-  min-height: 54px;
+  display: flex;
+  gap: 10px;
 
   &__avatar {
-    position: absolute;
-    inset-inline-start: 10px;
-    top: 10px;
+    flex: 0 0 auto;
   }
 
   &__details {
+    flex: 1 1 auto;
     display: flex;
     justify-content: space-between;
     align-items: center;
     color: $darker-text-color;
+    gap: 10px;
     font-size: 15px;
     line-height: 22px;
+    white-space: nowrap;
+    overflow: hidden;
+
+    & > div {
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
 
     strong {
       font-weight: 500;
     }
   }
+
+  &__actions {
+    flex: 0 0 auto;
+  }
 }
 
 .notification__message {
-  margin-inline-start: 42px;
-  padding-top: 8px;
-  padding-inline-start: 26px;
+  padding: 8px 14px 0; // padding intentionally reduced for glitch-soc
   cursor: default;
   color: $darker-text-color;
   font-size: 15px;
-  position: relative;
+
+  // line-height: 22px; omitted in glitch-soc for space saving
+  font-weight: 500;
+  display: flex;
   align-items: center;
+  gap: 10px;
 
   .icon {
     color: $highlight-text-color;
@@ -1785,7 +1849,7 @@ a.status__display-name,
   }
 
   > span {
-    display: block;
+    display: inline;
     overflow: hidden;
     text-overflow: ellipsis;
   }
@@ -1837,53 +1901,17 @@ a.status__display-name,
     text-overflow: ellipsis;
     overflow: hidden;
   }
-
-  a {
-    color: inherit;
-    text-decoration: inherit;
-  }
-
-  strong {
-    display: block;
-  }
-
-  > a:hover {
-    strong {
-      text-decoration: underline;
-    }
-  }
-
-  &.inline {
-    padding: 0;
-    height: 18px;
-    font-size: 15px;
-    line-height: 18px;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    overflow: hidden;
-
-    strong {
-      display: inline;
-      height: auto;
-      font-size: inherit;
-      line-height: inherit;
-    }
-
-    span {
-      display: inline;
-      height: auto;
-      font-size: inherit;
-      line-height: inherit;
-    }
-  }
 }
 
 .display-name__html {
   font-weight: 500;
 }
 
-.display-name__account {
-  font-size: 14px;
+.status__relative-time,
+.detailed-status__datetime {
+  &:hover {
+    text-decoration: underline;
+  }
 }
 
 .image-loader {
@@ -3730,59 +3758,6 @@ a.status-card {
   width: 100%;
 }
 
-.notification,
-.status {
-  position: relative;
-
-  &--in-thread {
-    border-bottom: 0;
-
-    .status__content,
-    .status__action-bar {
-      margin-inline-start: 46px + 10px;
-      width: calc(100% - (46px + 10px));
-    }
-  }
-
-  &--first-in-thread {
-    border-top: 1px solid lighten($ui-base-color, 8%);
-  }
-
-  &__line {
-    height: 10px - 4px;
-    border-inline-start: 2px solid lighten($ui-base-color, 8%);
-    width: 0;
-    position: absolute;
-    top: 0;
-    inset-inline-start: 14px + ((46px - 2px) * 0.5);
-
-    &--full {
-      top: 0;
-      height: 100%;
-
-      &::before {
-        content: '';
-        display: block;
-        position: absolute;
-        top: 10px - 4px;
-        height: 46px + 4px + 4px;
-        width: 2px;
-        background: $ui-base-color;
-        inset-inline-start: -2px;
-      }
-    }
-
-    &--first {
-      top: 10px + 46px + 4px;
-      height: calc(100% - (10px + 46px + 4px));
-
-      &::before {
-        display: none;
-      }
-    }
-  }
-}
-
 .load-more {
   display: block;
   color: $dark-text-color;
@@ -3929,6 +3904,7 @@ a.status-card {
     margin: 0;
     border: 0;
     padding: 13px;
+    padding-inline-end: 0;
     color: inherit;
     background: transparent;
     font: inherit;
@@ -3963,7 +3939,6 @@ a.status-card {
 .column-header__buttons {
   height: 48px;
   display: flex;
-  margin-inline-start: 0;
 }
 
 .column-header__links {
@@ -5073,6 +5048,12 @@ a.status-card {
     font-weight: 500;
     display: block;
     color: $inverted-text-color;
+
+    @each $lang in $cjk-langs {
+      &:lang(#{$lang}) {
+        font-weight: 700;
+      }
+    }
   }
 }
 
@@ -5109,12 +5090,6 @@ a.status-card {
 
   strong {
     font-weight: 500;
-
-    @each $lang in $cjk-langs {
-      &:lang(#{$lang}) {
-        font-weight: 700;
-      }
-    }
   }
 
   a {
@@ -5270,7 +5245,6 @@ a.status-card {
 
 .status__content {
   position: relative;
-  margin: 10px 0;
   font-size: 15px;
   line-height: 20px;
   word-wrap: break-word;
@@ -6092,27 +6066,7 @@ a.status-card {
   flex-direction: column;
 
   .status__relative-time {
-    color: $dark-text-color;
-    float: right;
-    font-size: 14px;
-    width: auto;
-    margin: initial;
-    padding: initial;
-  }
-
-  .status__visibility-icon {
-    color: $dark-text-color;
-    font-size: 14px;
-    padding: 0 4px;
-  }
-
-  .status__display-name {
-    display: flex;
-  }
-
-  .status__avatar {
-    height: 48px;
-    width: 48px;
+    order: 2;
   }
 
   .status__content__spoiler-link {
@@ -6161,15 +6115,6 @@ a.status-card {
   }
 }
 
-.boost-modal__status-header {
-  font-size: 15px;
-}
-
-.boost-modal__status-time {
-  float: right;
-  font-size: 14px;
-}
-
 .mute-modal,
 .block-modal {
   line-height: 24px;
@@ -7462,11 +7407,8 @@ img.modal-warning {
 
 .notification__filter-bar,
 .account__section-headline {
-  background: darken(
-    $ui-base-color,
-    4%
-  ); // deliberate glitch-soc choice for now
-
+  // deliberate glitch-soc choice for now
+  background: darken($ui-base-color, 4%);
   border-bottom: 1px solid lighten($ui-base-color, 8%);
   cursor: default;
   display: flex;
@@ -7605,6 +7547,90 @@ noscript {
   }
 }
 
+@media screen and (width <= 630px) and (height <= 400px) {
+  $duration: 400ms;
+  $delay: 100ms;
+
+  .search {
+    will-change: margin-top;
+    transition: margin-top $duration $delay;
+  }
+
+  .navigation-bar {
+    will-change: padding-bottom;
+    transition: padding-bottom $duration $delay;
+  }
+
+  .navigation-bar {
+    & > a:first-child {
+      will-change: margin-top, margin-inline-start, margin-inline-end, width;
+      transition:
+        margin-top $duration $delay,
+        margin-inline-start $duration ($duration + $delay),
+        margin-inline-end $duration ($duration + $delay);
+    }
+
+    & > .navigation-bar__profile-edit {
+      will-change: margin-top;
+      transition: margin-top $duration $delay;
+    }
+
+    .navigation-bar__actions {
+      & > .icon-button.close {
+        will-change: opacity transform;
+        transition:
+          opacity $duration * 0.5 $delay,
+          transform $duration $delay;
+      }
+
+      & > .compose__action-bar .icon-button {
+        will-change: opacity transform;
+        transition:
+          opacity $duration * 0.5 $delay + $duration * 0.5,
+          transform $duration $delay;
+      }
+    }
+  }
+
+  .is-composing {
+    .search {
+      margin-top: -50px;
+    }
+
+    .navigation-bar {
+      padding-bottom: 0;
+
+      & > a:first-child {
+        margin: -100px 10px 0 -50px;
+      }
+
+      .navigation-bar__profile {
+        padding-top: 2px;
+      }
+
+      .navigation-bar__profile-edit {
+        position: absolute;
+        margin-top: -60px;
+      }
+
+      .navigation-bar__actions {
+        .icon-button.close {
+          pointer-events: auto;
+          opacity: 1;
+          transform: scale(1, 1) translate(0, 0);
+          bottom: 5px;
+        }
+
+        .compose__action-bar .icon-button {
+          pointer-events: none;
+          opacity: 0;
+          transform: scale(0, 1) translate(100%, 0);
+        }
+      }
+    }
+  }
+}
+
 .embed-modal {
   width: auto;
   max-width: 80vw;
@@ -8682,7 +8708,7 @@ noscript {
 }
 
 .notification,
-.status {
+.status__wrapper {
   position: relative;
 
   &.unread {

From 4ad7fadb824c6219e2c3a17d30e9f53554398099 Mon Sep 17 00:00:00 2001
From: Emelia Smith <ThisIsMissEm@users.noreply.github.com>
Date: Tue, 20 Feb 2024 20:19:58 +0100
Subject: [PATCH 0165/2191] Fix logging error in streaming server (#2636)

Logger changed upstream causing `log.silly` to error and crash the server for local only statuses
---
 streaming/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/streaming/index.js b/streaming/index.js
index 0d7bf2fc8182ea..b9bdb44f2407e2 100644
--- a/streaming/index.js
+++ b/streaming/index.js
@@ -767,7 +767,7 @@ const startServer = async () => {
 
       // Only send local-only statuses to logged-in users
       if ((event === 'update' || event === 'status.update') && payload.local_only && !(req.accountId && allowLocalOnly)) {
-        log.silly(req.requestId, `Message ${payload.id} filtered because it was local-only`);
+        log.debug(`Message ${payload.id} filtered because it was local-only`);
         return;
       }
 

From bf6e57b420ed929ac9d670d1f12e2a1cf5eab80a Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 20 Feb 2024 23:06:17 +0100
Subject: [PATCH 0166/2191] Further reduce CSS and markup differences with
 upstream (#2637)

* Reduce differences in `MovedNote` markup and styling

* Remove unused setting toggle meta text support

* Fix various CSS discrepancies with upstream

* Further reduce differences with upstream
---
 .../components/moved_note.jsx                 |  42 ++---
 .../components/setting_toggle.jsx             |   4 +-
 .../flavours/glitch/styles/components.scss    | 168 ++++--------------
 3 files changed, 50 insertions(+), 164 deletions(-)

diff --git a/app/javascript/flavours/glitch/features/account_timeline/components/moved_note.jsx b/app/javascript/flavours/glitch/features/account_timeline/components/moved_note.jsx
index 9ccf5bd17ac8b4..cb8836ef7cc2d3 100644
--- a/app/javascript/flavours/glitch/features/account_timeline/components/moved_note.jsx
+++ b/app/javascript/flavours/glitch/features/account_timeline/components/moved_note.jsx
@@ -1,54 +1,38 @@
 import { FormattedMessage } from 'react-intl';
 
-import { withRouter } from 'react-router-dom';
-
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-
-import TripIcon from '@/material-icons/400-24px/trip.svg?react';
-import { Icon } from 'flavours/glitch/components/icon';
-import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router';
-
 import { AvatarOverlay } from '../../../components/avatar_overlay';
 import { DisplayName } from '../../../components/display_name';
+import { Permalink } from '../../../components/permalink';
 
-class MovedNote extends ImmutablePureComponent {
+export default class MovedNote extends ImmutablePureComponent {
 
   static propTypes = {
     from: ImmutablePropTypes.map.isRequired,
     to: ImmutablePropTypes.map.isRequired,
-    ...WithRouterPropTypes,
-  };
-
-  handleAccountClick = e => {
-    if (e.button === 0) {
-      e.preventDefault();
-      this.props.history.push(`/@${this.props.to.get('acct')}`);
-    }
-
-    e.stopPropagation();
   };
 
   render () {
     const { from, to } = this.props;
-    const displayNameHtml = { __html: from.get('display_name_html') };
 
     return (
-      <div className='account__moved-note'>
-        <div className='account__moved-note__message'>
-          <div className='account__moved-note__icon-wrapper'><Icon id='suitcase' className='account__moved-note__icon' icon={TripIcon} /></div>
-          <FormattedMessage id='account.moved_to' defaultMessage='{name} has indicated that their new account is now:' values={{ name: <bdi><strong dangerouslySetInnerHTML={displayNameHtml} /></bdi> }} />
+      <div className='moved-account-banner'>
+        <div className='moved-account-banner__message'>
+          <FormattedMessage id='account.moved_to' defaultMessage='{name} has indicated that their new account is now:' values={{ name: <bdi><strong dangerouslySetInnerHTML={{ __html: from.get('display_name_html') }} /></bdi> }} />
         </div>
 
-        <a href={to.get('url')} onClick={this.handleAccountClick} className='detailed-status__display-name'>
-          <div className='detailed-status__display-avatar'><AvatarOverlay account={to} friend={from} /></div>
-          <DisplayName account={to} />
-        </a>
+        <div className='moved-account-banner__action'>
+          <Permalink to={`/@${to.get('acct')}`} href={to.get('url')} className='detailed-status__display-name'>
+            <div className='detailed-status__display-avatar'><AvatarOverlay account={to} friend={from} /></div>
+            <DisplayName account={to} />
+          </Permalink>
+
+          <Permalink to={`/@${to.get('acct')}`} href={to.get('url')} className='button'><FormattedMessage id='account.go_to_profile' defaultMessage='Go to profile' /></Permalink>
+        </div>
       </div>
     );
   }
 
 }
-
-export default withRouter(MovedNote);
diff --git a/app/javascript/flavours/glitch/features/notifications/components/setting_toggle.jsx b/app/javascript/flavours/glitch/features/notifications/components/setting_toggle.jsx
index 2f849c54841031..9bf4b147a9019a 100644
--- a/app/javascript/flavours/glitch/features/notifications/components/setting_toggle.jsx
+++ b/app/javascript/flavours/glitch/features/notifications/components/setting_toggle.jsx
@@ -12,7 +12,6 @@ export default class SettingToggle extends PureComponent {
     settings: ImmutablePropTypes.map.isRequired,
     settingPath: PropTypes.array.isRequired,
     label: PropTypes.node.isRequired,
-    meta: PropTypes.node,
     onChange: PropTypes.func.isRequired,
     defaultValue: PropTypes.bool,
     disabled: PropTypes.bool,
@@ -23,14 +22,13 @@ export default class SettingToggle extends PureComponent {
   };
 
   render () {
-    const { prefix, settings, settingPath, label, meta, defaultValue, disabled } = this.props;
+    const { prefix, settings, settingPath, label, defaultValue, disabled } = this.props;
     const id = ['setting-toggle', prefix, ...settingPath].filter(Boolean).join('-');
 
     return (
       <div className='setting-toggle'>
         <Toggle disabled={disabled} id={id} checked={settings.getIn(settingPath, defaultValue)} onChange={this.onChange} onKeyDown={this.onKeyDown} />
         <label htmlFor={id} className='setting-toggle__label'>{label}</label>
-        {meta && <span className='setting-meta__label'>{meta}</span>}
       </div>
     );
   }
diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index 9d5b73af46cbff..9e21cc36ba733e 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -374,7 +374,7 @@ body > [data-popper-placement] {
 }
 
 .compose-form {
-  padding: 10px;
+  padding: 10px; // glitch: reduced padding
 
   &__sensitive-button {
     padding: 10px;
@@ -1032,7 +1032,7 @@ body > [data-popper-placement] {
 }
 
 .status {
-  padding: 10px 14px;
+  padding: 10px 14px; // glitch: reduced padding
   min-height: 54px;
   border-bottom: 1px solid lighten($ui-base-color, 8%);
   cursor: auto;
@@ -1050,9 +1050,11 @@ body > [data-popper-placement] {
   opacity: 1;
   animation: fade 150ms linear;
 
+  .media-gallery,
   .video-player,
-  .audio-player {
-    margin-top: 8px;
+  .audio-player,
+  .attachment-list {
+    margin-top: 8px; // glitch: reduced margins
   }
 
   &.status-direct {
@@ -1085,7 +1087,7 @@ body > [data-popper-placement] {
         color: $highlight-text-color;
       }
 
-      a.status__content__spoiler-link {
+      &__spoiler-link {
         color: $primary-text-color;
         background: $ui-primary-color;
 
@@ -1251,7 +1253,6 @@ body > [data-popper-placement] {
 
 .status__display-name {
   color: $dark-text-color;
-  overflow: hidden;
 }
 
 .status__info .status__display-name {
@@ -1359,7 +1360,7 @@ body > [data-popper-placement] {
 }
 
 .status__prepend {
-  padding: 8px 14px; // intentionally reduced padding in glitch-soc
+  padding: 8px 14px; // glitch: reduced padding
   padding-bottom: 0;
   display: inline-flex;
   gap: 10px;
@@ -1400,7 +1401,7 @@ body > [data-popper-placement] {
 
 .detailed-status {
   background: lighten($ui-base-color, 4%);
-  padding: 14px 10px;
+  padding: 14px 10px; // glitch: reduced padding
   border-top: 1px solid lighten($ui-base-color, 8%);
 
   &--flex {
@@ -1456,7 +1457,7 @@ body > [data-popper-placement] {
   border-bottom: 1px solid lighten($ui-base-color, 8%);
   display: flex;
   flex-direction: row;
-  padding: 8px 0;
+  padding: 8px 0; // glitch: reduced padding
 }
 
 .compose-form__textarea-icons {
@@ -1527,7 +1528,7 @@ body > [data-popper-placement] {
 }
 
 .account {
-  padding: 10px;
+  padding: 10px; // glitch: reduced padding
   border-bottom: 1px solid lighten($ui-base-color, 8%);
 
   .account__display-name {
@@ -1790,7 +1791,7 @@ a.account__display-name {
 }
 
 .notification__report {
-  padding: 10px; // deliberate glitch-soc change
+  padding: 10px; // glitch: reduced padding
   border-bottom: 1px solid lighten($ui-base-color, 8%);
   display: flex;
   gap: 10px;
@@ -1827,12 +1828,12 @@ a.account__display-name {
 }
 
 .notification__message {
-  padding: 8px 14px 0; // padding intentionally reduced for glitch-soc
+  padding: 8px 14px; // glitch: reduced padding
+  padding-bottom: 0;
   cursor: default;
   color: $darker-text-color;
   font-size: 15px;
-
-  // line-height: 22px; omitted in glitch-soc for space saving
+  line-height: 22px;
   font-weight: 500;
   display: flex;
   align-items: center;
@@ -1885,7 +1886,6 @@ a.account__display-name {
   text-decoration: none;
 
   &:hover {
-    color: $primary-text-color;
     text-decoration: underline;
   }
 }
@@ -1975,7 +1975,7 @@ a.account__display-name {
 }
 
 .navigation-bar {
-  padding: 10px;
+  padding: 10px; // glitch: reduced padding
   display: flex;
   align-items: center;
   flex-shrink: 0;
@@ -2012,6 +2012,7 @@ a.account__display-name {
   display: flex;
   flex-direction: column;
   flex: 1 1 auto;
+  line-height: 20px;
 }
 
 .navigation-bar__profile-account {
@@ -2056,14 +2057,14 @@ a.account__display-name {
 
 .dropdown-menu__separator {
   border-bottom: 1px solid var(--dropdown-border-color);
-  margin: 2px 0;
+  margin: 2px 0; // glitch: reduced margins
   height: 0;
 }
 
 .dropdown-menu {
   background: var(--dropdown-background-color);
   border: 1px solid var(--dropdown-border-color);
-  padding: 2px;
+  padding: 2px; // glitch: reduced padding
   border-radius: 4px;
   box-shadow: var(--dropdown-shadow);
   z-index: 9999;
@@ -2093,8 +2094,8 @@ a.account__display-name {
   &__container {
     &__header {
       border-bottom: 1px solid var(--dropdown-border-color);
-      padding: 6px 14px;
-      padding-bottom: 12px;
+      padding: 6px 14px; // glitch: reduced padding
+      padding-bottom: 12px; // glitch: reduced padding
       margin-bottom: 4px;
       font-size: 13px;
       line-height: 18px;
@@ -2150,7 +2151,7 @@ a.account__display-name {
     font: inherit;
     display: block;
     width: 100%;
-    padding: 6px 14px;
+    padding: 6px 14px; // glitch: reduced padding
     border: 0;
     margin: 0;
     background: transparent;
@@ -2931,6 +2932,8 @@ $ui-header-height: 55px;
     display: flex;
     flex-direction: column;
     min-height: 310px;
+    padding-bottom: 71px;
+    margin-bottom: -71px;
   }
 
   .compose-form__autosuggest-wrapper {
@@ -3645,7 +3648,7 @@ a.status-card {
 .status-card__content {
   flex: 1 1 auto;
   overflow: hidden;
-  padding: 8px 10px; // intentional glitch-soc change to reduce padding
+  padding: 8px 10px; // glitch: reduced padding
   box-sizing: border-box;
   max-width: 100%;
 }
@@ -3684,7 +3687,7 @@ a.status-card {
 
 .status-card__image {
   flex: 0 0 auto;
-  width: 96px; // intentional glitch-soc change to better use space
+  width: 96px; // glitch: intentional change to better use space
   aspect-ratio: 1;
   background: lighten($ui-base-color, 8%);
   position: relative;
@@ -4392,12 +4395,12 @@ a.status-card {
   z-index: 100;
 
   &--minified {
-    display: flex;
+    display: flex; // glitch: media icon in spoiler button
     inset-inline-start: 4px;
     top: 4px;
     width: auto;
     height: auto;
-    align-items: center;
+    align-items: center; // glitch: media icon in spoiler button
   }
 
   &--click-thru {
@@ -4616,8 +4619,7 @@ a.status-card {
   line-height: 24px;
 }
 
-.setting-toggle__label,
-.setting-meta__label {
+.setting-toggle__label {
   color: $darker-text-color;
   display: inline-block;
   margin-bottom: 14px;
@@ -4625,10 +4627,6 @@ a.status-card {
   vertical-align: middle;
 }
 
-.setting-meta__label {
-  float: right;
-}
-
 .limited-account-hint {
   p {
     color: $secondary-text-color;
@@ -5162,43 +5160,6 @@ a.status-card {
   }
 }
 
-.account__moved-note {
-  padding: 14px 10px;
-  padding-bottom: 16px;
-  background: lighten($ui-base-color, 4%);
-  border-top: 1px solid lighten($ui-base-color, 8%);
-  border-bottom: 1px solid lighten($ui-base-color, 8%);
-
-  &__message {
-    position: relative;
-    margin-inline-start: 58px;
-    color: $dark-text-color;
-    padding: 8px 0;
-    padding-top: 0;
-    padding-bottom: 4px;
-    font-size: 14px;
-
-    > span {
-      display: block;
-      overflow: hidden;
-      text-overflow: ellipsis;
-    }
-  }
-
-  &__icon-wrapper {
-    inset-inline-start: -26px;
-    position: absolute;
-  }
-
-  .detailed-status__display-avatar {
-    position: relative;
-  }
-
-  .detailed-status__display-name {
-    margin-bottom: 0;
-  }
-}
-
 @keyframes spring-flip-in {
   0% {
     transform: rotate(0deg);
@@ -5340,16 +5301,6 @@ a.status-card {
   }
 }
 
-.notification-favourite {
-  .status.status-direct {
-    background: transparent;
-
-    .icon-button.disabled {
-      color: lighten($action-button-color, 13%);
-    }
-  }
-}
-
 .language-dropdown {
   &__dropdown {
     background: $simple-background-color;
@@ -6666,6 +6617,7 @@ a.status-card {
   z-index: 9999;
 }
 
+// glitch: deprecated settings modal
 img.modal-warning {
   display: block;
   margin: auto;
@@ -6673,65 +6625,19 @@ img.modal-warning {
   width: 60px;
 }
 
-.column {
-  overflow: hidden;
-
-  .wide .columns-area:not(.columns-area--mobile) & {
+// glitch: optional wide mode
+.wide .columns-area:not(.columns-area--mobile) {
+  .column {
     flex: auto;
     min-width: 330px;
     max-width: 400px;
   }
 
-  > .scrollable {
-    background: $ui-base-color;
-    border-radius: 0 0 4px 4px;
-  }
-}
-
-.drawer {
-  padding: 10px 5px;
-  flex: none;
-
-  &:first-child {
-    padding-inline-start: 10px;
-  }
-
-  &:last-child {
-    padding-inline-end: 10px;
-  }
-
-  @media screen and (width <= 630px) {
-    flex: auto;
-  }
-
-  @media screen and (width <= 630px) {
-    &,
-    &:first-child,
-    &:last-child {
-      padding: 0;
-    }
-  }
-
-  .wide & {
+  .drawer {
     min-width: 300px;
     max-width: 400px;
     flex: 1 1 200px;
   }
-
-  @media screen and (width <= 630px) {
-    :root & {
-      //  Overrides `.wide` for single-column view
-      flex: auto;
-      width: 100%;
-      min-width: 0;
-      max-width: none;
-      padding: 0;
-    }
-  }
-
-  .react-swipeable-view-container & {
-    height: 100%;
-  }
 }
 
 .media-gallery__item__badges {
@@ -6769,7 +6675,7 @@ img.modal-warning {
   font-size: 14px;
   border: 1px solid lighten($ui-base-color, 8%);
   border-radius: 4px;
-  margin-top: 14px; // glitch-soc change to reduce margins
+  margin-top: 14px; // glitch: reduced margins
   overflow: hidden;
 
   &__icon {
@@ -6811,7 +6717,7 @@ img.modal-warning {
 
   &.compact {
     border: 0;
-    margin-top: 4px; // glitch-soc addition to reduce margins
+    margin-top: 4px; // glitch: reduced margins
 
     .attachment-list__list {
       padding: 0;
@@ -6908,8 +6814,6 @@ img.modal-warning {
   overflow: hidden;
   position: relative;
   width: 100%;
-  display: flex;
-  justify-content: center;
 }
 
 .media-gallery__item-gifv-thumbnail {

From fd2b6c29c6b7159b7a9843957913bc0240b49033 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 21 Feb 2024 12:24:44 +0100
Subject: [PATCH 0167/2191] New Crowdin Translations (automated) (#29311)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/bg.json    |  8 ++++++-
 app/javascript/mastodon/locales/br.json    | 26 ++++++++++++----------
 app/javascript/mastodon/locales/ca.json    |  4 ++--
 app/javascript/mastodon/locales/cy.json    |  6 +++++
 app/javascript/mastodon/locales/es-MX.json |  4 ++++
 app/javascript/mastodon/locales/es.json    |  4 ++++
 app/javascript/mastodon/locales/gl.json    |  6 +++++
 app/javascript/mastodon/locales/lt.json    |  1 +
 app/javascript/mastodon/locales/nl.json    | 10 ++++-----
 app/javascript/mastodon/locales/vi.json    |  6 +++++
 app/javascript/mastodon/locales/zh-CN.json | 18 +++++++--------
 config/locales/br.yml                      | 21 ++++++++++++++---
 config/locales/devise.br.yml               |  2 +-
 config/locales/devise.es-MX.yml            |  1 +
 config/locales/devise.es.yml               |  1 +
 config/locales/devise.ja.yml               |  1 +
 config/locales/doorkeeper.gl.yml           |  4 ++--
 config/locales/simple_form.br.yml          |  4 +++-
 config/locales/zh-CN.yml                   |  8 +++----
 config/locales/zh-TW.yml                   |  2 +-
 20 files changed, 96 insertions(+), 41 deletions(-)

diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json
index 5acee5cdd0831d..f08ca46af80af5 100644
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@@ -277,7 +277,13 @@
   "follow_request.authorize": "Упълномощаване",
   "follow_request.reject": "Отхвърляне",
   "follow_requests.unlocked_explanation": "Въпреки че акаунтът ви не е заключен, служителите на {domain} помислиха, че може да искате да преглеждате ръчно заявките за последване на тези профили.",
+  "follow_suggestions.curated_suggestion": "Избор на персонал",
   "follow_suggestions.dismiss": "Без ново показване",
+  "follow_suggestions.hints.featured": "Този профил е ръчно подбран от отбора на {domain}.",
+  "follow_suggestions.hints.friends_of_friends": "Този профил е популярен измежду хората, които следвате.",
+  "follow_suggestions.hints.most_followed": "Този профил е един от най-следваните при {domain}.",
+  "follow_suggestions.hints.most_interactions": "Този профил наскоро получи много внимание при {domain}.",
+  "follow_suggestions.hints.similar_to_recently_followed": "Този профил е подобен на профилите, които сте последвали наскоро.",
   "follow_suggestions.personalized_suggestion": "Персонализирано предложение",
   "follow_suggestions.popular_suggestion": "Популярно предложение",
   "follow_suggestions.view_all": "Преглед на всички",
@@ -470,7 +476,7 @@
   "notifications.permission_required": "Известията на работния плот ги няма, щото няма дадено нужното позволение.",
   "notifications_permission_banner.enable": "Включване на известията на работния плот",
   "notifications_permission_banner.how_to_control": "За да получавате известия, когато Mastodon не е отворен, включете известията на работния плот. Може да управлявате точно кои видове взаимодействия пораждат известия на работния плот чрез бутона {icon} по-горе, след като бъдат включени.",
-  "notifications_permission_banner.title": "Никога не пропускате нещо",
+  "notifications_permission_banner.title": "Никога не пропускайте нищо",
   "onboarding.action.back": "Върнете ме обратно",
   "onboarding.actions.back": "Върнете ме обратно",
   "onboarding.actions.go_to_explore": "Виж тенденции",
diff --git a/app/javascript/mastodon/locales/br.json b/app/javascript/mastodon/locales/br.json
index 8cbe4591d59358..5ce52d527a42ee 100644
--- a/app/javascript/mastodon/locales/br.json
+++ b/app/javascript/mastodon/locales/br.json
@@ -29,7 +29,7 @@
   "account.enable_notifications": "Ma c'hemenn pa vez embannet traoù gant @{name}",
   "account.endorse": "Lakaat war-wel war ar profil",
   "account.featured_tags.last_status_at": "Toud diwezhañ : {date}",
-  "account.featured_tags.last_status_never": "Toud ebet",
+  "account.featured_tags.last_status_never": "Embannadur ebet",
   "account.featured_tags.title": "Hashtagoù pennañ {name}",
   "account.follow": "Heuliañ",
   "account.follow_back": "Heuliañ d'ho tro",
@@ -62,7 +62,7 @@
   "account.requested_follow": "Gant {name} eo bet goulennet ho heuliañ",
   "account.share": "Skignañ profil @{name}",
   "account.show_reblogs": "Diskouez skignadennoù @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} Toud} two {{counter} Doud} other {{counter} a Doudoù}}",
+  "account.statuses_counter": "{count, plural, one {{counter} C'hannad} two {{counter} Gannad} other {{counter} a Gannadoù}}",
   "account.unblock": "Diverzañ @{name}",
   "account.unblock_domain": "Diverzañ an domani {domain}",
   "account.unblock_short": "Distankañ",
@@ -118,9 +118,9 @@
   "column.lists": "Listennoù",
   "column.mutes": "Implijer·ion·ezed kuzhet",
   "column.notifications": "Kemennoù",
-  "column.pins": "Toudoù spilhennet",
+  "column.pins": "Embannadurioù spilhennet",
   "column.public": "Red-amzer kevredet",
-  "column_back_button.label": "Distro",
+  "column_back_button.label": "Distreiñ",
   "column_header.hide_settings": "Kuzhat an arventennoù",
   "column_header.moveLeft_settings": "Dilec'hiañ ar bannad a-gleiz",
   "column_header.moveRight_settings": "Dilec'hiañ ar bannad a-zehou",
@@ -199,9 +199,9 @@
   "embed.preview": "Setu penaos e teuio war wel :",
   "emoji_button.activity": "Obererezh",
   "emoji_button.clear": "Diverkañ",
-  "emoji_button.custom": "Kempennet",
+  "emoji_button.custom": "Personelaet",
   "emoji_button.flags": "Bannieloù",
-  "emoji_button.food": "Boued hag Evaj",
+  "emoji_button.food": "Boued & Evajoù",
   "emoji_button.label": "Enlakaat un emoji",
   "emoji_button.nature": "Natur",
   "emoji_button.not_found": "Emoji ebet !! (╯°□°）╯︵ ┻━┻",
@@ -211,12 +211,12 @@
   "emoji_button.search": "O klask...",
   "emoji_button.search_results": "Disoc'hoù an enklask",
   "emoji_button.symbols": "Arouezioù",
-  "emoji_button.travel": "Lec'hioù ha Beajoù",
+  "emoji_button.travel": "Beajiñ & Lec'hioù",
   "empty_column.account_suspended": "Kont ehanet",
   "empty_column.account_timeline": "Toud ebet amañ !",
   "empty_column.account_unavailable": "Profil dihegerz",
   "empty_column.blocks": "N'eus ket bet berzet implijer·ez ganeoc'h c'hoazh.",
-  "empty_column.bookmarked_statuses": "N'ho peus toud ebet enrollet en ho sinedoù c'hoazh. Pa vo ouzhpennet unan e teuio war wel amañ.",
+  "empty_column.bookmarked_statuses": "N'ho peus embannadur ebet enrollet en ho sinedoù c'hoazh. Pa vo ouzhpennet unan e teuio war wel amañ.",
   "empty_column.community": "Goulo eo ar red-amzer lec'hel. Skrivit'ta un dra evit lakaat tan dezhi !",
   "empty_column.domain_blocks": "N'eus domani kuzh ebet c'hoazh.",
   "empty_column.explore_statuses": "N'eus tuadur ebet evit c'hoazh. Distroit diwezhatoc'h !",
@@ -260,6 +260,7 @@
   "follow_request.authorize": "Aotren",
   "follow_request.reject": "Nac'hañ",
   "follow_requests.unlocked_explanation": "Daoust ma n'eo ket ho kont prennet, skipailh {domain} a soñj e fellfe deoc'h gwiriekaat pedadennoù heuliañ deus ar c'hontoù-se diwar-zorn.",
+  "follow_suggestions.view_all": "Gwelet pep tra",
   "followed_tags": "Hashtagoù o heuliañ",
   "footer.about": "Diwar-benn",
   "footer.directory": "Kavlec'h ar profiloù",
@@ -267,7 +268,7 @@
   "footer.invite": "Pediñ tud",
   "footer.keyboard_shortcuts": "Berradennoù klavier",
   "footer.privacy_policy": "Reolennoù prevezded",
-  "footer.source_code": "Gwelet kod mammenn",
+  "footer.source_code": "Gwelet ar c'hod mammenn",
   "footer.status": "Statud",
   "generic.saved": "Enrollet",
   "getting_started.heading": "Loc'hañ",
@@ -295,7 +296,7 @@
   "interaction_modal.description.follow": "Gant ur gont Mastodon e c'hellit heuliañ {name} evit resev an toudoù a embann war ho red degemer.",
   "interaction_modal.description.reblog": "Gant ur gont Mastodon e c'hellit skignañ an toud-mañ evit rannañ anezhañ gant ho heulierien·ezed.",
   "interaction_modal.description.reply": "Gant ur gont Mastodon e c'hellit respont d'an toud-mañ.",
-  "interaction_modal.no_account_yet": "N'eo ket war vMastodon?",
+  "interaction_modal.no_account_yet": "N'emañ ket war vMastodon?",
   "interaction_modal.on_another_server": "War ur servijer all",
   "interaction_modal.on_this_server": "War ar servijer-mañ",
   "interaction_modal.title.favourite": "Ouzhpennañ embannadur {name} d'ar re vuiañ-karet",
@@ -463,7 +464,7 @@
   "onboarding.steps.setup_profile.body": "Others are more likely to interact with you with a filled out profile.",
   "onboarding.steps.setup_profile.title": "Customize your profile",
   "onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
-  "onboarding.steps.share_profile.title": "Share your profile",
+  "onboarding.steps.share_profile.title": "Rannit ho kont Mastodon",
   "password_confirmation.mismatching": "Disheñvel eo an daou c'her-termen-se",
   "picture_in_picture.restore": "Adlakaat",
   "poll.closed": "Serret",
@@ -476,7 +477,8 @@
   "poll.votes": "{votes, plural,one {#votadenn} other {# votadenn}}",
   "poll_button.add_poll": "Ouzhpennañ ur sontadeg",
   "poll_button.remove_poll": "Dilemel ar sontadeg",
-  "privacy.change": "Cheñch prevezded an toud",
+  "privacy.change": "Cheñch prevezded an embannadur",
+  "privacy.direct.short": "Tud resis",
   "privacy.private.short": "Heulierien",
   "privacy.public.short": "Publik",
   "privacy_policy.last_updated": "Hizivadenn ziwezhañ {date}",
diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index d50f38aa1525db..23454247286f1b 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -279,8 +279,8 @@
   "follow_requests.unlocked_explanation": "Tot i que el teu compte no està blocat, el personal de {domain} ha pensat que és possible que vulguis revisar manualment les sol·licituds de seguiment d’aquests comptes.",
   "follow_suggestions.curated_suggestion": "Tria de l'equip",
   "follow_suggestions.dismiss": "No ho tornis a mostrar",
-  "follow_suggestions.hints.featured": "Aquest perfil ha estat triat per l'equip de {domain}.",
-  "follow_suggestions.hints.friends_of_friends": "Aquest perfil és popular entre la gent que segueixes.",
+  "follow_suggestions.hints.featured": "L'equip de {domain} ha seleccionat aquest perfil.",
+  "follow_suggestions.hints.friends_of_friends": "Aquest perfil és popular entre la gent que seguiu.",
   "follow_suggestions.hints.most_followed": "Aquest perfil és un dels més seguits a {domain}.",
   "follow_suggestions.hints.most_interactions": "Aquest perfil ha estat rebent un munt d'atenció recentment a {domain}.",
   "follow_suggestions.hints.similar_to_recently_followed": "Aquest perfil és similar a d'altres que heu seguit recentment.",
diff --git a/app/javascript/mastodon/locales/cy.json b/app/javascript/mastodon/locales/cy.json
index 294cdde38f24d2..0c1472dcad91fe 100644
--- a/app/javascript/mastodon/locales/cy.json
+++ b/app/javascript/mastodon/locales/cy.json
@@ -277,7 +277,13 @@
   "follow_request.authorize": "Awdurdodi",
   "follow_request.reject": "Gwrthod",
   "follow_requests.unlocked_explanation": "Er nid yw eich cyfrif wedi'i gloi, roedd y staff {domain} yn meddwl efallai hoffech adolygu ceisiadau dilyn o'r cyfrifau rhain wrth law.",
+  "follow_suggestions.curated_suggestion": "Dewis staff",
   "follow_suggestions.dismiss": "Peidio â dangos hwn eto",
+  "follow_suggestions.hints.featured": "Mae'r proffil hwn wedi'i ddewis yn arbennig gan dîm {domain}.",
+  "follow_suggestions.hints.friends_of_friends": "Mae'r proffil hwn yn boblogaidd ymhlith y bobl rydych chi'n eu dilyn.",
+  "follow_suggestions.hints.most_followed": "Mae'r proffil hwn yn un o'r rhai sy'n cael ei ddilyn fwyaf ar {domain}.",
+  "follow_suggestions.hints.most_interactions": "Mae'r proffil hwn wedi bod yn cael llawer o sylw yn ddiweddar ar {domain}.",
+  "follow_suggestions.hints.similar_to_recently_followed": "Mae'r proffil hwn yn debyg i'r proffiliau rydych chi wedi'u dilyn yn fwyaf diweddar.",
   "follow_suggestions.personalized_suggestion": "Awgrym personol",
   "follow_suggestions.popular_suggestion": "Awgrym poblogaidd",
   "follow_suggestions.view_all": "Gweld y cyfan",
diff --git a/app/javascript/mastodon/locales/es-MX.json b/app/javascript/mastodon/locales/es-MX.json
index 9ee2cbca14f710..aa935e410efbfd 100644
--- a/app/javascript/mastodon/locales/es-MX.json
+++ b/app/javascript/mastodon/locales/es-MX.json
@@ -277,9 +277,13 @@
   "follow_request.authorize": "Autorizar",
   "follow_request.reject": "Rechazar",
   "follow_requests.unlocked_explanation": "A pesar de que tu cuenta no es privada, el personal de {domain} ha pensado que quizás deberías revisar manualmente las solicitudes de seguimiento de estas cuentas.",
+  "follow_suggestions.curated_suggestion": "Recomendaciones del equipo",
   "follow_suggestions.dismiss": "No mostrar de nuevo",
+  "follow_suggestions.hints.featured": "Este perfil ha sido elegido a mano por el equipo de {domain}.",
   "follow_suggestions.hints.friends_of_friends": "Este perfil es popular entre las personas que sigues.",
   "follow_suggestions.hints.most_followed": "Este perfil es uno de los más seguidos en {domain}.",
+  "follow_suggestions.hints.most_interactions": "Este perfil ha estado recibiendo recientemente mucha atención en {domain}.",
+  "follow_suggestions.hints.similar_to_recently_followed": "Este perfil es similar a los perfiles que has seguido recientemente.",
   "follow_suggestions.personalized_suggestion": "Sugerencia personalizada",
   "follow_suggestions.popular_suggestion": "Sugerencia popular",
   "follow_suggestions.view_all": "Ver todo",
diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json
index 5b5263b3f49bfe..b3f8e744f128db 100644
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@@ -277,9 +277,13 @@
   "follow_request.authorize": "Autorizar",
   "follow_request.reject": "Rechazar",
   "follow_requests.unlocked_explanation": "A pesar de que tu cuenta no es privada, el personal de {domain} ha pensado que quizás deberías revisar manualmente las solicitudes de seguimiento de estas cuentas.",
+  "follow_suggestions.curated_suggestion": "Recomendaciones del equipo",
   "follow_suggestions.dismiss": "No mostrar de nuevo",
+  "follow_suggestions.hints.featured": "Este perfil ha sido elegido a mano por el equipo de {domain}.",
   "follow_suggestions.hints.friends_of_friends": "Este perfil es popular entre las personas que sigues.",
   "follow_suggestions.hints.most_followed": "Este perfil es uno de los más seguidos en {domain}.",
+  "follow_suggestions.hints.most_interactions": "Este perfil ha estado recibiendo recientemente mucha atención en {domain}.",
+  "follow_suggestions.hints.similar_to_recently_followed": "Este perfil es similar a los perfiles que has seguido recientemente.",
   "follow_suggestions.personalized_suggestion": "Sugerencia personalizada",
   "follow_suggestions.popular_suggestion": "Sugerencia popular",
   "follow_suggestions.view_all": "Ver todo",
diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json
index 1e83adf126556a..91b6870be7f13b 100644
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@@ -277,7 +277,13 @@
   "follow_request.authorize": "Autorizar",
   "follow_request.reject": "Rexeitar",
   "follow_requests.unlocked_explanation": "Malia que a túa conta non é privada, a administración de {domain} pensou que quizabes terías que revisar de xeito manual as solicitudes de seguiminto.",
+  "follow_suggestions.curated_suggestion": "Suxestións do Servidor",
   "follow_suggestions.dismiss": "Non mostrar máis",
+  "follow_suggestions.hints.featured": "Este perfil foi escollido pola administración de {domain}.",
+  "follow_suggestions.hints.friends_of_friends": "Este perfil é popular entre as persoas que segues.",
+  "follow_suggestions.hints.most_followed": "Este perfil é un dos máis seguidos en {domain}.",
+  "follow_suggestions.hints.most_interactions": "Este perfil tivo moitas interaccións últimamente en {domain}.",
+  "follow_suggestions.hints.similar_to_recently_followed": "Este perfil ten semellanzas cos perfís que ti seguiches últimamente.",
   "follow_suggestions.personalized_suggestion": "Suxestión personalizada",
   "follow_suggestions.popular_suggestion": "Suxestión popular",
   "follow_suggestions.view_all": "Ver todas",
diff --git a/app/javascript/mastodon/locales/lt.json b/app/javascript/mastodon/locales/lt.json
index ce725181455223..e8c51791ee1143 100644
--- a/app/javascript/mastodon/locales/lt.json
+++ b/app/javascript/mastodon/locales/lt.json
@@ -269,6 +269,7 @@
   "follow_request.authorize": "Autorizuoti",
   "follow_request.reject": "Atmesti",
   "follow_requests.unlocked_explanation": "Nors tavo paskyra neužrakinta, {domain} personalas mano, kad galbūt norėsi rankiniu būdu patikrinti šių paskyrų sekimo užklausas.",
+  "follow_suggestions.curated_suggestion": "Personalo pasirinkimai",
   "follow_suggestions.dismiss": "Daugiau nerodyti",
   "follow_suggestions.hints.friends_of_friends": "Šis profilis yra populiarus tarp žmonių, kuriuos sekei.",
   "follow_suggestions.hints.most_followed": "Šis profilis yra vienas iš labiausiai sekamų {domain}.",
diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json
index 5155b296f7078c..df04ded1668e87 100644
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@@ -279,11 +279,11 @@
   "follow_requests.unlocked_explanation": "Ook al is jouw account niet besloten, de medewerkers van {domain} denken dat jij misschien de volgende volgverzoeken handmatig wil controleren.",
   "follow_suggestions.curated_suggestion": "Speciaal geselecteerd",
   "follow_suggestions.dismiss": "Niet meer weergeven",
-  "follow_suggestions.hints.featured": "Dit profiel is geselecteerd door het team van {domain}.",
-  "follow_suggestions.hints.friends_of_friends": "Dit profiel is populair onder de mensen die jij volgt.",
-  "follow_suggestions.hints.most_followed": "Dit profiel is een van de meest gevolgde op {domain}.",
-  "follow_suggestions.hints.most_interactions": "Dit profiel heeft de laatste tijd veel aandacht gekregen op {domain}.",
-  "follow_suggestions.hints.similar_to_recently_followed": "Dit profiel is vergelijkbaar met de profielen die je recentelijk hebt gevolgd.",
+  "follow_suggestions.hints.featured": "Deze gebruiker is geselecteerd door het team van {domain}.",
+  "follow_suggestions.hints.friends_of_friends": "Deze gebruiker is populair onder de mensen die jij volgt.",
+  "follow_suggestions.hints.most_followed": "Deze gebruiker is een van de meest gevolgde gebruikers op {domain}.",
+  "follow_suggestions.hints.most_interactions": "Deze gebruiker is de laatste tijd erg populair op {domain}.",
+  "follow_suggestions.hints.similar_to_recently_followed": "Deze gebruiker is vergelijkbaar met gebruikers die je recentelijk hebt gevolgd.",
   "follow_suggestions.personalized_suggestion": "Gepersonaliseerde aanbeveling",
   "follow_suggestions.popular_suggestion": "Populaire aanbeveling",
   "follow_suggestions.view_all": "Alles weergeven",
diff --git a/app/javascript/mastodon/locales/vi.json b/app/javascript/mastodon/locales/vi.json
index 7f4b833f31fc35..9a4182e540197d 100644
--- a/app/javascript/mastodon/locales/vi.json
+++ b/app/javascript/mastodon/locales/vi.json
@@ -277,7 +277,13 @@
   "follow_request.authorize": "Chấp nhận",
   "follow_request.reject": "Từ chối",
   "follow_requests.unlocked_explanation": "Mặc dù tài khoản của bạn đang ở chế độ công khai, quản trị viên của {domain} vẫn tin rằng bạn sẽ muốn xem lại yêu cầu theo dõi từ những người khác.",
+  "follow_suggestions.curated_suggestion": "Gợi ý từ máy chủ",
   "follow_suggestions.dismiss": "Không hiện lại",
+  "follow_suggestions.hints.featured": "Người này được đội ngũ {domain} đề xuất.",
+  "follow_suggestions.hints.friends_of_friends": "Người này nổi tiếng với những người bạn theo dõi.",
+  "follow_suggestions.hints.most_followed": "Người này được theo dõi nhiều nhất trên {domain}.",
+  "follow_suggestions.hints.most_interactions": "Người này đang thu hút sự chú ý trên {domain}.",
+  "follow_suggestions.hints.similar_to_recently_followed": "Người này có nét giống những người mà bạn theo dõi gần đây.",
   "follow_suggestions.personalized_suggestion": "Gợi ý cá nhân hóa",
   "follow_suggestions.popular_suggestion": "Những người nổi tiếng",
   "follow_suggestions.view_all": "Xem tất cả",
diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json
index 84c42a4aa28ef5..3e714987c077e8 100644
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@@ -21,7 +21,7 @@
   "account.blocked": "已屏蔽",
   "account.browse_more_on_origin_server": "在原始个人资料页面上浏览详情",
   "account.cancel_follow_request": "撤回关注请求",
-  "account.copy": "复制资料卡链接",
+  "account.copy": "复制个人资料链接",
   "account.direct": "私下提及 @{name}",
   "account.disable_notifications": "当 @{name} 发布嘟文时不要通知我",
   "account.domain_blocked": "域名已屏蔽",
@@ -53,7 +53,7 @@
   "account.mute_notifications_short": "关闭通知",
   "account.mute_short": "隐藏",
   "account.muted": "已隐藏",
-  "account.mutual": "互关",
+  "account.mutual": "互相关注",
   "account.no_bio": "未提供描述。",
   "account.open_original_page": "打开原始页面",
   "account.posts": "嘟文",
@@ -277,13 +277,13 @@
   "follow_request.authorize": "同意",
   "follow_request.reject": "拒绝",
   "follow_requests.unlocked_explanation": "尽管你没有锁嘟，但是 {domain} 的工作人员认为你也许会想手动审核审核这些账号的关注请求。",
-  "follow_suggestions.curated_suggestion": "管理员精选",
+  "follow_suggestions.curated_suggestion": "站务人员精选",
   "follow_suggestions.dismiss": "不再显示",
-  "follow_suggestions.hints.featured": "该个人资料已被 {domain} 管理团队精选。",
-  "follow_suggestions.hints.friends_of_friends": "该个人资料在您关注的人中很受欢迎。",
-  "follow_suggestions.hints.most_followed": "该个人资料是 {domain} 上关注度最高的个人资料之一。",
-  "follow_suggestions.hints.most_interactions": "该个人资料最近在 {domain} 上获得了很多关注。",
-  "follow_suggestions.hints.similar_to_recently_followed": "该个人资料与您最近关注的个人资料类似。",
+  "follow_suggestions.hints.featured": "该用户已被 {domain} 管理团队精选。",
+  "follow_suggestions.hints.friends_of_friends": "该用户在您关注的人中很受欢迎。",
+  "follow_suggestions.hints.most_followed": "该用户是 {domain} 上关注度最高的用户之一。",
+  "follow_suggestions.hints.most_interactions": "该用户最近在 {domain} 上获得了很多关注。",
+  "follow_suggestions.hints.similar_to_recently_followed": "该用户与您最近关注的用户类似。",
   "follow_suggestions.personalized_suggestion": "个性化建议",
   "follow_suggestions.popular_suggestion": "热门建议",
   "follow_suggestions.view_all": "查看全部",
@@ -447,7 +447,7 @@
   "notifications.column_settings.alert": "桌面通知",
   "notifications.column_settings.favourite": "喜欢：",
   "notifications.column_settings.filter_bar.advanced": "显示所有类别",
-  "notifications.column_settings.filter_bar.category": "快速过滤栏",
+  "notifications.column_settings.filter_bar.category": "快速筛选栏",
   "notifications.column_settings.filter_bar.show_bar": "显示过滤栏",
   "notifications.column_settings.follow": "新粉丝：",
   "notifications.column_settings.follow_request": "新关注请求：",
diff --git a/config/locales/br.yml b/config/locales/br.yml
index d20609a8ce7adf..01c6db4ef56ddc 100644
--- a/config/locales/br.yml
+++ b/config/locales/br.yml
@@ -3,6 +3,7 @@ br:
   about:
     contact_missing: Andermenet
     contact_unavailable: N'eus ket
+    hosted_on: Servijer Mastodon herberc'hiet war %{domain}
     title: Diwar-benn
   accounts:
     follow: Heuliañ
@@ -135,6 +136,9 @@ br:
     disputes:
       appeals:
         title: Galvoù
+    domain_allows:
+      export: Ezporzhiañ
+      import: Enporzhiañ
     domain_blocks:
       domain: Domani
       new:
@@ -151,6 +155,8 @@ br:
       domain: Domani
       new:
         create: Ouzhpenniñ un domani
+    export_domain_allows:
+      no_file: Restr ebet diuzet
     follow_recommendations:
       status: Statud
       suppressed: Dilamet
@@ -265,10 +271,12 @@ br:
         delete_statuses: Dilamet eo bet toudoù %{target} gant %{name}
     trends:
       allow: Aotren
+      approved: Aprouet
       links:
         allow: Aotren al liamm
       preview_card_providers:
         title: Embannerien·ezed
+      rejected: Nac'het
       statuses:
         allow: Aotren ar c'hannad
       tags:
@@ -297,6 +305,9 @@ br:
         title: Hashtagoù diouzh ar c'hiz
   appearance:
     discovery: Dizoloadur
+    localization:
+      body: Gant tud a-youl vat eo troet Mastodon.
+      guide_link: https://crowdin.com/project/mastodon
   application_mailer:
     view: 'Sellet :'
     view_status: Gwelet ar c'hannad
@@ -373,10 +384,12 @@ br:
         title: Toudoù silet
   generic:
     all: Pep tra
+    changes_saved_msg: Enrollet eo bet ar cheñchamantoù gant berzh!
     copy: Eilañ
     delete: Dilemel
     none: Hini ebet
     order_by: Urzhiañ dre
+    save_changes: Enrollañ ar cheñchamantoù
     today: hiziv
   imports:
     modes:
@@ -488,6 +501,7 @@ br:
   settings:
     account: Kont
     account_settings: Arventennoù ar gont
+    back: Distreiñ da vMastodon
     development: Diorren
     edit_profile: Kemmañ ar profil
     featured_tags: Hashtagoù pennañ
@@ -521,13 +535,14 @@ br:
       '604800': 1 sizhunvezh
       '63113904': 2 vloavezh
   themes:
-    default: Mastodoñ (Teñval)
-    mastodon-light: Mastodoñ (Sklaer)
+    default: Mastodon (Teñval)
+    mastodon-light: Mastodon (Sklaer)
   time:
     formats:
       default: "%d a viz %b %Y, %H:%M"
       month: Miz %b %Y
       time: "%H:%M"
+      with_time_zone: "%d a viz %b %Y, %H:%M %Z"
   two_factor_authentication:
     add: Ouzhpennañ
     disable: Diweredekaat
@@ -546,7 +561,7 @@ br:
         none: Diwall
     welcome:
       edit_profile_action: Kefluniañ ar profil
-      subject: Donemat e Mastodoñ
+      subject: Donemat e Mastodon
       title: Degemer mat e bourzh, %{name}!
   users:
     follow_limit_reached: N'hallit ket heulian muioc'h eget %{limit} a zen
diff --git a/config/locales/devise.br.yml b/config/locales/devise.br.yml
index 205e11e797c584..cb406e5f5e0001 100644
--- a/config/locales/devise.br.yml
+++ b/config/locales/devise.br.yml
@@ -19,7 +19,7 @@ br:
     mailer:
       confirmation_instructions:
         action: Gwiriekaat ar chomlec'h postel
-        action_with_app: Kadarnaat ha distroiñ da %{app}
+        action_with_app: Kadarnaat ha distreiñ da %{app}
         explanation: Krouet ho peus ur c'hont war %{host} gant ar chomlec'h-postel-mañ. N'eus nemet ur c'hlik evit bevaat anezhañ. Ma ne oa ket krouet ganeoc'h, dianavezit ar postel-se.
         explanation_when_pending: Enskrivañ ho peus d'ur c'hemennad da %{host} gant ar chomlec'h-postel-se. Pa vo kadarnaet ho chomlec'h-postel, hoc'h enskrivadur a vo asantet. Gallout a rit mont-tre evit kemmañ munudoù ho kont pe skarzhañ anezhañ, met ne c'hellit ket implijout ul lod eus an aezamantoù par ma n'eo ket asantet ho kont. Ma vefe hoc'h enskrivadur nac'het, ho keloù a vefe skarzhet, neuze ne vo ket ret deoc'h ober netra ken. Ma ne oa ket ac'hanoc'h, dianavezit ar postel-se.
         extra_html: Mar plij, gwiriit ivez <a href="%{terms_path}"> reolennoù ar servijer</a> ha <a href="%{policy_path}"> hon divizoù-implij</a>.
diff --git a/config/locales/devise.es-MX.yml b/config/locales/devise.es-MX.yml
index c4a7f319af02f5..ac90412e855acc 100644
--- a/config/locales/devise.es-MX.yml
+++ b/config/locales/devise.es-MX.yml
@@ -12,6 +12,7 @@ es-MX:
       last_attempt: Tiene un intento más antes de que tu cuenta sea bloqueada.
       locked: Tu cuenta está bloqueada.
       not_found_in_database: Incorrecto %{authentication_keys} o contraseña.
+      omniauth_user_creation_failure: Error al crear una cuenta para esta identidad.
       pending: Su cuenta aun se encuentra bajo revisión.
       timeout: Su sesión ha expirado. Por favor inicie sesión de nuevo para continuar.
       unauthenticated: Necesita iniciar sesión o registrarse antes de continuar.
diff --git a/config/locales/devise.es.yml b/config/locales/devise.es.yml
index 642871710db300..0d8fc0ac67dcbe 100644
--- a/config/locales/devise.es.yml
+++ b/config/locales/devise.es.yml
@@ -12,6 +12,7 @@ es:
       last_attempt: Tiene un intento más antes de que tu cuenta sea bloqueada.
       locked: Tu cuenta está bloqueada.
       not_found_in_database: Incorrecto %{authentication_keys} o contraseña.
+      omniauth_user_creation_failure: Error al crear una cuenta para esta identidad.
       pending: Su cuenta aun se encuentra bajo revisión.
       timeout: Tu sesión expiró. Por favor, inicia sesión nuevamente para continuar.
       unauthenticated: Necesitas iniciar sesión o registrarte antes de continuar.
diff --git a/config/locales/devise.ja.yml b/config/locales/devise.ja.yml
index 44a9a31839af17..2cd7cfa41598fd 100644
--- a/config/locales/devise.ja.yml
+++ b/config/locales/devise.ja.yml
@@ -12,6 +12,7 @@ ja:
       last_attempt: あと1回失敗するとアカウントがロックされます。
       locked: アカウントはロックされました。
       not_found_in_database: "%{authentication_keys}かパスワードが誤っています。"
+      omniauth_user_creation_failure: 指定されたIDに対応するアカウントを作成できませんでした。
       pending: あなたのアカウントはまだ承認待ちです。
       timeout: セッションの有効期限が切れました。続行するには再度ログインしてください。
       unauthenticated: 続行するにはログインするか、アカウントを作成してください。
diff --git a/config/locales/doorkeeper.gl.yml b/config/locales/doorkeeper.gl.yml
index 57ee4777c97887..7564bc2dc63bb7 100644
--- a/config/locales/doorkeeper.gl.yml
+++ b/config/locales/doorkeeper.gl.yml
@@ -151,9 +151,9 @@ gl:
       admin:read:accounts: ler información sensible de todas as contas
       admin:read:canonical_email_blocks: ler a información sensíbel de tódolos bloqueos de correos electrónicos canónicos
       admin:read:domain_allows: ler a información sensible de todos os dominios permitidos
-      admin:read:domain_blocks: ler a información sensible de tódolos bloqueos de dominio
+      admin:read:domain_blocks: ler a información sensible de todos os bloqueos de dominio
       admin:read:email_domain_blocks: ler a información sensible de tódolos dominios de correo electrónico
-      admin:read:ip_blocks: ler a información sensible de tódolos bloqueos de IP
+      admin:read:ip_blocks: ler a información sensible de todos os bloqueos de IP
       admin:read:reports: ler información sensible de todos os informes e contas denunciadas
       admin:write: modificar todos os datos no servidor
       admin:write:accounts: executar accións de moderación nas contas
diff --git a/config/locales/simple_form.br.yml b/config/locales/simple_form.br.yml
index 9e8aefad499026..98a7e7e641068b 100644
--- a/config/locales/simple_form.br.yml
+++ b/config/locales/simple_form.br.yml
@@ -41,7 +41,7 @@ br:
         email: Chomlec'h postel
         expires_in: Mont war e dermen goude
         header: Talbenn
-        locale: Yezh ar c'hetal
+        locale: Yezh an etrefas
         new_password: Ger-tremen nevez
         note: Kinnig
         password: Ger-tremen
@@ -49,6 +49,7 @@ br:
         setting_display_media_default: Dre ziouer
         setting_display_media_hide_all: Kuzhat pep tra
         setting_display_media_show_all: Diskouez pep tra
+        setting_theme: Neuz al lec'hienn
         setting_use_pending_items: Mod gorrek
         title: Titl
         username: Anv
@@ -73,6 +74,7 @@ br:
         usable: Aotren an embannadurioù da implijout an hashtag-mañ
       user:
         role: Roll
+        time_zone: Gwerzhid eur
       user_role:
         name: Anv
     'no': Ket
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index d1255bfefe2321..8ccf4c08b3e57e 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -772,13 +772,13 @@ zh-CN:
     software_updates:
       critical_update: 紧急 — 请尽快更新
       description: 建议您及时更新Mastodon实例，以便获得最新修复和功能。此外，为避免安全问题，有时候及时更新Mastodon是至关重要的。出于这些原因，Mastodon每30分钟检查一次更新，并根据您的电子邮件通知偏好向您发送通知。
-      documentation_link: 了解详情
-      release_notes: 更新日志
+      documentation_link: 详细了解
+      release_notes: 发行说明
       title: 可用的更新
       type: 类型
       types:
-        major: 大版本更新
-        minor: 小版本更新
+        major: 重大更新
+        minor: 次要更新
         patch: 补丁级更新 - 修复了错误并进行了易于应用的更改
       version: 版本
     statuses:
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 7fe60541e6bd48..9e8044ebfcf4e3 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -779,7 +779,7 @@ zh-TW:
       title: 可取得的更新
       type: 類型
       types:
-        major: 主要版本更新 (major release)
+        major: 主要版本更新
         minor: 次要版本更新 (minor release)
         patch: 修正版本 (patch release) — 錯誤修正及易於套用之變更
       version: 版本

From 1f648fdf1ab0c709bce7974c3d2ec28a69351a42 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 21 Feb 2024 06:25:33 -0500
Subject: [PATCH 0168/2191] Remove erroneous service type on `TagFeed` model
 spec (#29302)

---
 spec/models/tag_feed_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/models/tag_feed_spec.rb b/spec/models/tag_feed_spec.rb
index 6f5e1eb307ee4b..61b8d8d824ec46 100644
--- a/spec/models/tag_feed_spec.rb
+++ b/spec/models/tag_feed_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe TagFeed, type: :service do
+describe TagFeed do
   describe '#get' do
     let(:account) { Fabricate(:account) }
     let(:tag_cats) { Fabricate(:tag, name: 'cats') }

From 154a3119fb45401dcd785b085b28fe18202b091c Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 21 Feb 2024 17:50:41 +0100
Subject: [PATCH 0169/2191] Further reduce CSS differences with upstream
 (#2638)

---
 .../flavours/glitch/styles/components.scss    | 153 ++++++++----------
 1 file changed, 66 insertions(+), 87 deletions(-)

diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index 9e21cc36ba733e..b37ffe322eaf37 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -852,21 +852,33 @@ body > [data-popper-placement] {
   clear: both;
 }
 
+.status__content,
 .reply-indicator__content {
   position: relative;
-  font-size: 14px;
+  font-size: 15px;
   line-height: 20px;
   word-wrap: break-word;
   font-weight: 400;
   overflow: hidden;
-  padding-top: 5px;
-  color: $inverted-text-color;
-  white-space: pre-wrap;
+  text-overflow: ellipsis;
+  padding-top: 2px;
+  color: $primary-text-color;
+
+  &:focus {
+    outline: 0;
+  }
+
+  .emojione {
+    width: 20px;
+    height: 20px;
+    margin: -3px 0 0;
+  }
 
   p,
   pre {
     margin-bottom: 20px;
     white-space: pre-wrap;
+    unicode-bidi: plaintext;
 
     &:last-child {
       margin-bottom: 0;
@@ -874,8 +886,9 @@ body > [data-popper-placement] {
   }
 
   a {
-    color: $lighter-text-color;
+    color: $secondary-text-color;
     text-decoration: none;
+    unicode-bidi: isolate;
 
     &:hover {
       text-decoration: underline;
@@ -892,10 +905,45 @@ body > [data-popper-placement] {
     }
   }
 
-  .emojione {
-    width: 20px;
-    height: 20px;
-    margin: -5px 0 0;
+  a.unhandled-link {
+    color: $highlight-text-color;
+
+    .link-origin-tag {
+      color: $gold-star;
+      font-size: 0.8em;
+    }
+  }
+
+  .status__content__spoiler-link {
+    background: $action-button-color;
+
+    &:hover,
+    &:focus {
+      background: lighten($action-button-color, 7%);
+      text-decoration: none;
+    }
+
+    &::-moz-focus-inner {
+      border: 0;
+    }
+
+    &::-moz-focus-inner,
+    &:focus,
+    &:active {
+      outline: 0 !important;
+    }
+  }
+}
+
+.status__content {
+  overflow: visible;
+
+  .status__content__spoiler {
+    display: none;
+
+    &.status__content__spoiler--visible {
+      display: block;
+    }
   }
 }
 
@@ -1503,6 +1551,15 @@ body > [data-popper-placement] {
   line-height: 18px;
 }
 
+.reply-indicator__content {
+  color: $inverted-text-color;
+  font-size: 14px;
+
+  a {
+    color: $lighter-text-color;
+  }
+}
+
 .domain {
   padding: 10px;
   border-bottom: 1px solid lighten($ui-base-color, 8%);
@@ -5204,84 +5261,6 @@ a.status-card {
   }
 }
 
-.status__content {
-  position: relative;
-  font-size: 15px;
-  line-height: 20px;
-  word-wrap: break-word;
-  font-weight: 400;
-  overflow: visible;
-  padding-top: 5px;
-
-  &:focus {
-    outline: 0;
-  }
-
-  .emojione {
-    width: 20px;
-    height: 20px;
-    margin: -3px 0 0;
-  }
-
-  p,
-  pre {
-    margin-bottom: 20px;
-    white-space: pre-wrap;
-    unicode-bidi: plaintext;
-
-    &:last-child {
-      margin-bottom: 0;
-    }
-  }
-
-  a {
-    color: $secondary-text-color;
-    text-decoration: none;
-    unicode-bidi: isolate;
-
-    &:hover {
-      text-decoration: underline;
-    }
-
-    &.mention {
-      &:hover {
-        text-decoration: none;
-
-        span {
-          text-decoration: underline;
-        }
-      }
-    }
-  }
-
-  .status__content__spoiler {
-    display: none;
-
-    &.status__content__spoiler--visible {
-      display: block;
-    }
-  }
-
-  a.unhandled-link {
-    color: $highlight-text-color;
-
-    .link-origin-tag {
-      color: $gold-star;
-      font-size: 0.8em;
-    }
-  }
-
-  .status__content__spoiler-link {
-    background: lighten($ui-base-color, 30%);
-
-    &:hover,
-    &:focus {
-      background: lighten($ui-base-color, 33%);
-      text-decoration: none;
-    }
-  }
-}
-
 .notif-cleaning {
   .status,
   .notification {

From 5f19e7e7993d90ef0de37c25f06122499469465a Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 21 Feb 2024 11:57:45 -0500
Subject: [PATCH 0170/2191] Add basic coverage for `ProcessHashtagsService`
 class (#29320)

---
 spec/services/process_hashtags_service_spec.rb | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 spec/services/process_hashtags_service_spec.rb

diff --git a/spec/services/process_hashtags_service_spec.rb b/spec/services/process_hashtags_service_spec.rb
new file mode 100644
index 00000000000000..a0d5ef3464d408
--- /dev/null
+++ b/spec/services/process_hashtags_service_spec.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe ProcessHashtagsService do
+  describe '#call' do
+    let(:status) { Fabricate(:status, visibility: :public, text: 'With tags #one #two') }
+
+    it 'applies the tags from the status text' do
+      expect { subject.call(status) }
+        .to change(Tag, :count).by(2)
+      expect(status.reload.tags.map(&:name))
+        .to contain_exactly('one', 'two')
+    end
+  end
+end

From b73932461f9251b39546f3a92b619ce3266680f6 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 21 Feb 2024 11:58:19 -0500
Subject: [PATCH 0171/2191] Add basic coverage for `CreateFeaturedTagService`
 class (#29321)

---
 .../create_featured_tag_service_spec.rb       | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 spec/services/create_featured_tag_service_spec.rb

diff --git a/spec/services/create_featured_tag_service_spec.rb b/spec/services/create_featured_tag_service_spec.rb
new file mode 100644
index 00000000000000..29a7c5b309124c
--- /dev/null
+++ b/spec/services/create_featured_tag_service_spec.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe CreateFeaturedTagService do
+  describe '#call' do
+    let(:tag) { 'test' }
+
+    context 'with a local account' do
+      let(:account) { Fabricate(:account, domain: nil) }
+
+      it 'creates a new featured tag and distributes' do
+        expect { subject.call(account, tag) }
+          .to change(FeaturedTag, :count).by(1)
+        expect(ActivityPub::AccountRawDistributionWorker)
+          .to have_enqueued_sidekiq_job(anything, account.id)
+      end
+    end
+
+    context 'with a remote account' do
+      let(:account) { Fabricate(:account, domain: 'host.example') }
+
+      it 'creates a new featured tag and does not distributes' do
+        expect { subject.call(account, tag) }
+          .to change(FeaturedTag, :count).by(1)
+        expect(ActivityPub::AccountRawDistributionWorker)
+          .to_not have_enqueued_sidekiq_job
+      end
+    end
+  end
+end

From 8f61e32569ca2ad68ec26b391c5c7f6ee6a333a8 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 21 Feb 2024 12:12:31 -0500
Subject: [PATCH 0172/2191] Add basic coverage for `AppealService` class
 (#29322)

---
 spec/services/appeal_service_spec.rb | 40 ++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 spec/services/appeal_service_spec.rb

diff --git a/spec/services/appeal_service_spec.rb b/spec/services/appeal_service_spec.rb
new file mode 100644
index 00000000000000..10c0f148dc0345
--- /dev/null
+++ b/spec/services/appeal_service_spec.rb
@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe AppealService do
+  describe '#call' do
+    let!(:admin) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
+
+    context 'with an existing strike' do
+      let(:strike) { Fabricate(:account_warning) }
+      let(:text) { 'Appeal text' }
+
+      it 'creates an appeal and notifies staff' do
+        emails = capture_emails { subject.call(strike, text) }
+
+        expect(Appeal.last)
+          .to have_attributes(
+            strike: strike,
+            text: text,
+            account: strike.target_account
+          )
+
+        expect(emails.size)
+          .to eq(1)
+
+        expect(emails.first)
+          .to have_attributes(
+            to: contain_exactly(admin.email),
+            subject: eq(
+              I18n.t(
+                'admin_mailer.new_appeal.subject',
+                username: strike.target_account.acct,
+                instance: Rails.configuration.x.local_domain
+              )
+            )
+          )
+      end
+    end
+  end
+end

From 08342ad40c1b92caf873282190efe8533a7d6e2e Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 21 Feb 2024 12:13:11 -0500
Subject: [PATCH 0173/2191] Add basic coverage for `AfterUnallowDomainService`
 class (#29324)

---
 .../after_unallow_domain_service_spec.rb      | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 spec/services/after_unallow_domain_service_spec.rb

diff --git a/spec/services/after_unallow_domain_service_spec.rb b/spec/services/after_unallow_domain_service_spec.rb
new file mode 100644
index 00000000000000..717c42b931c5de
--- /dev/null
+++ b/spec/services/after_unallow_domain_service_spec.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe AfterUnallowDomainService do
+  describe '#call' do
+    context 'with accounts for a domain' do
+      let!(:account) { Fabricate(:account, domain: 'host.example') }
+      let!(:test_account) { Fabricate(:account, domain: 'test.example') }
+      let(:service_double) { instance_double(DeleteAccountService, call: true) }
+
+      before { allow(DeleteAccountService).to receive(:new).and_return(service_double) }
+
+      it 'calls the delete service for accounts from the relevant domain' do
+        subject.call 'test.example'
+
+        expect(service_double)
+          .to_not have_received(:call).with(account, reserve_username: false)
+        expect(service_double)
+          .to have_received(:call).with(test_account, reserve_username: false)
+      end
+    end
+  end
+end

From 2751acb6cd3a6c67253a5a0218013397a9bccb93 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 21 Feb 2024 18:45:06 +0100
Subject: [PATCH 0174/2191] Automatically switch from open to approved
 registrations in absence of moderators (#29318)

---
 app/mailers/admin_mailer.rb                   |  6 ++
 .../auto_close_registrations.text.erb         |  3 +
 .../auto_close_registrations_scheduler.rb     | 33 ++++++++++
 config/locales/en.yml                         |  3 +
 config/sidekiq.yml                            |  4 ++
 ...auto_close_registrations_scheduler_spec.rb | 60 +++++++++++++++++++
 6 files changed, 109 insertions(+)
 create mode 100644 app/views/admin_mailer/auto_close_registrations.text.erb
 create mode 100644 app/workers/scheduler/auto_close_registrations_scheduler.rb
 create mode 100644 spec/workers/scheduler/auto_close_registrations_scheduler_spec.rb

diff --git a/app/mailers/admin_mailer.rb b/app/mailers/admin_mailer.rb
index 2a6fbb0ab7e0a5..8990b2a8470013 100644
--- a/app/mailers/admin_mailer.rb
+++ b/app/mailers/admin_mailer.rb
@@ -61,6 +61,12 @@ def new_critical_software_updates
     end
   end
 
+  def auto_close_registrations
+    locale_for_account(@me) do
+      mail subject: default_i18n_subject(instance: @instance)
+    end
+  end
+
   private
 
   def process_params
diff --git a/app/views/admin_mailer/auto_close_registrations.text.erb b/app/views/admin_mailer/auto_close_registrations.text.erb
new file mode 100644
index 00000000000000..c0f848692965b9
--- /dev/null
+++ b/app/views/admin_mailer/auto_close_registrations.text.erb
@@ -0,0 +1,3 @@
+<%= raw t('admin_mailer.auto_close_registrations.body', instance: @instance) %>
+
+<%= raw t('application_mailer.view')%> <%= admin_settings_registrations_url %>
diff --git a/app/workers/scheduler/auto_close_registrations_scheduler.rb b/app/workers/scheduler/auto_close_registrations_scheduler.rb
new file mode 100644
index 00000000000000..17516dd23fe840
--- /dev/null
+++ b/app/workers/scheduler/auto_close_registrations_scheduler.rb
@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+class Scheduler::AutoCloseRegistrationsScheduler
+  include Sidekiq::Worker
+  include Redisable
+
+  sidekiq_options retry: 0
+
+  # Automatically switch away from open registrations if no
+  # moderator had any activity in that period of time
+  OPEN_REGISTRATIONS_MODERATOR_THRESHOLD = 1.week + UserTrackingConcern::SIGN_IN_UPDATE_FREQUENCY
+
+  def perform
+    return if Rails.configuration.x.email_domains_whitelist.present? || ENV['DISABLE_AUTOMATIC_SWITCHING_TO_APPROVED_REGISTRATIONS'] == 'true'
+    return unless Setting.registrations_mode == 'open'
+
+    switch_to_approval_mode! unless active_moderators?
+  end
+
+  private
+
+  def active_moderators?
+    User.those_who_can(:manage_reports).exists?(current_sign_in_at: OPEN_REGISTRATIONS_MODERATOR_THRESHOLD.ago...)
+  end
+
+  def switch_to_approval_mode!
+    Setting.registrations_mode = 'approved'
+
+    User.those_who_can(:view_devops).includes(:account).find_each do |user|
+      AdminMailer.with(recipient: user.account).auto_close_registrations.deliver_later
+    end
+  end
+end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 9d739be07f8a4e..a7a83391d46324 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -966,6 +966,9 @@ en:
       title: Webhooks
       webhook: Webhook
   admin_mailer:
+    auto_close_registrations:
+      body: Due to a lack of recent moderator activity, registrations on %{instance} have been automatically switched to requiring manual review, to prevent %{instance} from being used as a platform for potential bad actors. You can switch it back to open registrations at any time.
+      subject: Registrations for %{instance} have been automatically switched to requiring approval
     new_appeal:
       actions:
         delete_statuses: to delete their posts
diff --git a/config/sidekiq.yml b/config/sidekiq.yml
index 3f9cbd9a7a5bef..488c2f2ab343ce 100644
--- a/config/sidekiq.yml
+++ b/config/sidekiq.yml
@@ -63,3 +63,7 @@
       interval: 30 minutes
       class: Scheduler::SoftwareUpdateCheckScheduler
       queue: scheduler
+    auto_close_registrations_scheduler:
+      interval: 1 hour
+      class: Scheduler::AutoCloseRegistrationsScheduler
+      queue: scheduler
diff --git a/spec/workers/scheduler/auto_close_registrations_scheduler_spec.rb b/spec/workers/scheduler/auto_close_registrations_scheduler_spec.rb
new file mode 100644
index 00000000000000..c0c50b128d8f47
--- /dev/null
+++ b/spec/workers/scheduler/auto_close_registrations_scheduler_spec.rb
@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe Scheduler::AutoCloseRegistrationsScheduler do
+  subject { described_class.new }
+
+  describe '#perform' do
+    let(:moderator_activity_date) { Time.now.utc }
+
+    before do
+      Fabricate(:user, role: UserRole.find_by(name: 'Owner'), current_sign_in_at: 10.years.ago)
+      Fabricate(:user, role: UserRole.find_by(name: 'Moderator'), current_sign_in_at: moderator_activity_date)
+    end
+
+    context 'when registrations are open' do
+      before do
+        Setting.registrations_mode = 'open'
+      end
+
+      context 'when a moderator has logged in recently' do
+        let(:moderator_activity_date) { Time.now.utc }
+
+        it 'does not change registrations mode' do
+          expect { subject.perform }.to_not change(Setting, :registrations_mode)
+        end
+      end
+
+      context 'when a moderator has not recently signed in' do
+        let(:moderator_activity_date) { 1.year.ago }
+
+        it 'changes registrations mode from open to approved' do
+          expect { subject.perform }.to change(Setting, :registrations_mode).from('open').to('approved')
+        end
+      end
+    end
+
+    context 'when registrations are closed' do
+      before do
+        Setting.registrations_mode = 'none'
+      end
+
+      context 'when a moderator has logged in recently' do
+        let(:moderator_activity_date) { Time.now.utc }
+
+        it 'does not change registrations mode' do
+          expect { subject.perform }.to_not change(Setting, :registrations_mode)
+        end
+      end
+
+      context 'when a moderator has not recently signed in' do
+        let(:moderator_activity_date) { 1.year.ago }
+
+        it 'does not change registrations mode' do
+          expect { subject.perform }.to_not change(Setting, :registrations_mode)
+        end
+      end
+    end
+  end
+end

From 604c93332f860105aca0d02d1654b1220f7ca679 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 21 Feb 2024 19:30:54 +0100
Subject: [PATCH 0175/2191] Fix pillbar button colors (#2639)

---
 app/javascript/flavours/glitch/styles/components.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index b37ffe322eaf37..831efb01e9f56b 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -4185,7 +4185,7 @@ a.status-card {
   margin: 0;
   font-size: inherit;
   flex: auto;
-  background-color: $ui-base-color;
+  background-color: lighten($ui-base-color, 8%);
   transition: all 0.2s ease;
   transition-property: background-color, box-shadow;
 

From 581f14e56f4d6d6c6f4ff93327b933485d981087 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 21 Feb 2024 16:18:01 -0500
Subject: [PATCH 0176/2191] Update yarn to version 4.1.0 (#29339)

---
 package.json           |    2 +-
 streaming/package.json |    2 +-
 yarn.lock              | 3490 ++++++++++++++++++++--------------------
 3 files changed, 1747 insertions(+), 1747 deletions(-)

diff --git a/package.json b/package.json
index e34749558557de..49a22f54929c56 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@mastodon/mastodon",
   "license": "AGPL-3.0-or-later",
-  "packageManager": "yarn@4.0.2",
+  "packageManager": "yarn@4.1.0",
   "engines": {
     "node": ">=18"
   },
diff --git a/streaming/package.json b/streaming/package.json
index 3f76e25786cf7e..71f204c0fbfb17 100644
--- a/streaming/package.json
+++ b/streaming/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@mastodon/streaming",
   "license": "AGPL-3.0-or-later",
-  "packageManager": "yarn@4.0.2",
+  "packageManager": "yarn@4.1.0",
   "engines": {
     "node": ">=18"
   },
diff --git a/yarn.lock b/yarn.lock
index 1f653070e7d5db..048f2c7f28f96d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8,14 +8,14 @@ __metadata:
 "@aashutoshrathi/word-wrap@npm:^1.2.3":
   version: 1.2.6
   resolution: "@aashutoshrathi/word-wrap@npm:1.2.6"
-  checksum: 53c2b231a61a46792b39a0d43bc4f4f776bb4542aa57ee04930676802e5501282c2fc8aac14e4cd1f1120ff8b52616b6ff5ab539ad30aa2277d726444b71619f
+  checksum: 10c0/53c2b231a61a46792b39a0d43bc4f4f776bb4542aa57ee04930676802e5501282c2fc8aac14e4cd1f1120ff8b52616b6ff5ab539ad30aa2277d726444b71619f
   languageName: node
   linkType: hard
 
 "@adobe/css-tools@npm:^4.3.2":
   version: 4.3.2
   resolution: "@adobe/css-tools@npm:4.3.2"
-  checksum: 296a03dd29f227c60500d2da8c7f64991fecf1d8b456ce2b4adb8cec7363d9c08b5b03f1463673fc8cbfe54b538745588e7a13c736d2dd14a80c01a20f127f39
+  checksum: 10c0/296a03dd29f227c60500d2da8c7f64991fecf1d8b456ce2b4adb8cec7363d9c08b5b03f1463673fc8cbfe54b538745588e7a13c736d2dd14a80c01a20f127f39
   languageName: node
   linkType: hard
 
@@ -25,7 +25,7 @@ __metadata:
   dependencies:
     "@jridgewell/gen-mapping": "npm:^0.3.0"
     "@jridgewell/trace-mapping": "npm:^0.3.9"
-  checksum: 92ce5915f8901d8c7cd4f4e6e2fe7b9fd335a29955b400caa52e0e5b12ca3796ada7c2f10e78c9c5b0f9c2539dff0ffea7b19850a56e1487aa083531e1e46d43
+  checksum: 10c0/92ce5915f8901d8c7cd4f4e6e2fe7b9fd335a29955b400caa52e0e5b12ca3796ada7c2f10e78c9c5b0f9c2539dff0ffea7b19850a56e1487aa083531e1e46d43
   languageName: node
   linkType: hard
 
@@ -38,7 +38,7 @@ __metadata:
     leven: "npm:^3.1.0"
   peerDependencies:
     ajv: ">=8"
-  checksum: f89a1e16ecbc2ada91c56d4391c8345471e385f0b9c38d62c3bccac40ec94482cdfa496d4c2fe0af411e9851a9931c0d5042a8040f52213f603ba6b6fd7f949b
+  checksum: 10c0/f89a1e16ecbc2ada91c56d4391c8345471e385f0b9c38d62c3bccac40ec94482cdfa496d4c2fe0af411e9851a9931c0d5042a8040f52213f603ba6b6fd7f949b
   languageName: node
   linkType: hard
 
@@ -48,14 +48,14 @@ __metadata:
   dependencies:
     "@babel/highlight": "npm:^7.23.4"
     chalk: "npm:^2.4.2"
-  checksum: a10e843595ddd9f97faa99917414813c06214f4d9205294013e20c70fbdf4f943760da37dec1d998bf3e6fc20fa2918a47c0e987a7e458663feb7698063ad7c6
+  checksum: 10c0/a10e843595ddd9f97faa99917414813c06214f4d9205294013e20c70fbdf4f943760da37dec1d998bf3e6fc20fa2918a47c0e987a7e458663feb7698063ad7c6
   languageName: node
   linkType: hard
 
 "@babel/compat-data@npm:^7.22.6, @babel/compat-data@npm:^7.23.3, @babel/compat-data@npm:^7.23.5":
   version: 7.23.5
   resolution: "@babel/compat-data@npm:7.23.5"
-  checksum: 081278ed46131a890ad566a59c61600a5f9557bd8ee5e535890c8548192532ea92590742fd74bd9db83d74c669ef8a04a7e1c85cdea27f960233e3b83c3a957c
+  checksum: 10c0/081278ed46131a890ad566a59c61600a5f9557bd8ee5e535890c8548192532ea92590742fd74bd9db83d74c669ef8a04a7e1c85cdea27f960233e3b83c3a957c
   languageName: node
   linkType: hard
 
@@ -78,7 +78,7 @@ __metadata:
     gensync: "npm:^1.0.0-beta.2"
     json5: "npm:^2.2.3"
     semver: "npm:^6.3.1"
-  checksum: 03883300bf1252ab4c9ba5b52f161232dd52873dbe5cde9289bb2bb26e935c42682493acbac9194a59a3b6cbd17f4c4c84030db8d6d482588afe64531532ff9b
+  checksum: 10c0/03883300bf1252ab4c9ba5b52f161232dd52873dbe5cde9289bb2bb26e935c42682493acbac9194a59a3b6cbd17f4c4c84030db8d6d482588afe64531532ff9b
   languageName: node
   linkType: hard
 
@@ -90,7 +90,7 @@ __metadata:
     "@jridgewell/gen-mapping": "npm:^0.3.2"
     "@jridgewell/trace-mapping": "npm:^0.3.17"
     jsesc: "npm:^2.5.1"
-  checksum: 53540e905cd10db05d9aee0a5304e36927f455ce66f95d1253bb8a179f286b88fa7062ea0db354c566fe27f8bb96567566084ffd259f8feaae1de5eccc8afbda
+  checksum: 10c0/53540e905cd10db05d9aee0a5304e36927f455ce66f95d1253bb8a179f286b88fa7062ea0db354c566fe27f8bb96567566084ffd259f8feaae1de5eccc8afbda
   languageName: node
   linkType: hard
 
@@ -99,7 +99,7 @@ __metadata:
   resolution: "@babel/helper-annotate-as-pure@npm:7.22.5"
   dependencies:
     "@babel/types": "npm:^7.22.5"
-  checksum: 5a80dc364ddda26b334bbbc0f6426cab647381555ef7d0cd32eb284e35b867c012ce6ce7d52a64672ed71383099c99d32765b3d260626527bb0e3470b0f58e45
+  checksum: 10c0/5a80dc364ddda26b334bbbc0f6426cab647381555ef7d0cd32eb284e35b867c012ce6ce7d52a64672ed71383099c99d32765b3d260626527bb0e3470b0f58e45
   languageName: node
   linkType: hard
 
@@ -108,7 +108,7 @@ __metadata:
   resolution: "@babel/helper-builder-binary-assignment-operator-visitor@npm:7.22.15"
   dependencies:
     "@babel/types": "npm:^7.22.15"
-  checksum: 2535e3824ca6337f65786bbac98e562f71699f25532cecd196f027d7698b4967a96953d64e36567956658ad1a05ccbdc62d1ba79ee751c79f4f1d2d3ecc2e01c
+  checksum: 10c0/2535e3824ca6337f65786bbac98e562f71699f25532cecd196f027d7698b4967a96953d64e36567956658ad1a05ccbdc62d1ba79ee751c79f4f1d2d3ecc2e01c
   languageName: node
   linkType: hard
 
@@ -118,7 +118,7 @@ __metadata:
   dependencies:
     "@babel/helper-annotate-as-pure": "npm:^7.22.5"
     "@babel/types": "npm:^7.22.10"
-  checksum: 8e2ad2e17dd779ddccec29f6b1de61df1f199694673bdbbae0474878211139f2e574810726110e4d46c1e9a0221af1f2d38bd0398dd20490eb03a24f790602be
+  checksum: 10c0/8e2ad2e17dd779ddccec29f6b1de61df1f199694673bdbbae0474878211139f2e574810726110e4d46c1e9a0221af1f2d38bd0398dd20490eb03a24f790602be
   languageName: node
   linkType: hard
 
@@ -131,7 +131,7 @@ __metadata:
     browserslist: "npm:^4.22.2"
     lru-cache: "npm:^5.1.1"
     semver: "npm:^6.3.1"
-  checksum: ba38506d11185f48b79abf439462ece271d3eead1673dd8814519c8c903c708523428806f05f2ec5efd0c56e4e278698fac967e5a4b5ee842c32415da54bc6fa
+  checksum: 10c0/ba38506d11185f48b79abf439462ece271d3eead1673dd8814519c8c903c708523428806f05f2ec5efd0c56e4e278698fac967e5a4b5ee842c32415da54bc6fa
   languageName: node
   linkType: hard
 
@@ -150,7 +150,7 @@ __metadata:
     semver: "npm:^6.3.1"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 2ae5759fe8845fda99b34f2ba6cd0794fc860213d14c93a87aa9180960252bce621157a79c373b7fbb423b25a55fb0e20eae0d5f8e4ad5ef22dc70e7c2af3805
+  checksum: 10c0/2ae5759fe8845fda99b34f2ba6cd0794fc860213d14c93a87aa9180960252bce621157a79c373b7fbb423b25a55fb0e20eae0d5f8e4ad5ef22dc70e7c2af3805
   languageName: node
   linkType: hard
 
@@ -163,7 +163,7 @@ __metadata:
     semver: "npm:^6.3.1"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 8eba4c1b7b94a83e7a82df5c3e504584ff0ba6ab8710a67ecc2c434a7fb841a29c2f5c94d2de51f25446119a1df538fa90b37bd570db22ddd5e7147fe98277c6
+  checksum: 10c0/8eba4c1b7b94a83e7a82df5c3e504584ff0ba6ab8710a67ecc2c434a7fb841a29c2f5c94d2de51f25446119a1df538fa90b37bd570db22ddd5e7147fe98277c6
   languageName: node
   linkType: hard
 
@@ -178,14 +178,14 @@ __metadata:
     resolve: "npm:^1.14.2"
   peerDependencies:
     "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0
-  checksum: 2b053b96a0c604a7e0f5c7d13a8a55f4451d938f7af42bd40f62a87df15e6c87a0b1dbd893a0f0bb51077b54dc3ba00a58b166531a5940ad286ab685dd8979ec
+  checksum: 10c0/2b053b96a0c604a7e0f5c7d13a8a55f4451d938f7af42bd40f62a87df15e6c87a0b1dbd893a0f0bb51077b54dc3ba00a58b166531a5940ad286ab685dd8979ec
   languageName: node
   linkType: hard
 
 "@babel/helper-environment-visitor@npm:^7.22.20, @babel/helper-environment-visitor@npm:^7.22.5":
   version: 7.22.20
   resolution: "@babel/helper-environment-visitor@npm:7.22.20"
-  checksum: e762c2d8f5d423af89bd7ae9abe35bd4836d2eb401af868a63bbb63220c513c783e25ef001019418560b3fdc6d9a6fb67e6c0b650bcdeb3a2ac44b5c3d2bdd94
+  checksum: 10c0/e762c2d8f5d423af89bd7ae9abe35bd4836d2eb401af868a63bbb63220c513c783e25ef001019418560b3fdc6d9a6fb67e6c0b650bcdeb3a2ac44b5c3d2bdd94
   languageName: node
   linkType: hard
 
@@ -195,7 +195,7 @@ __metadata:
   dependencies:
     "@babel/template": "npm:^7.22.15"
     "@babel/types": "npm:^7.23.0"
-  checksum: d771dd1f3222b120518176733c52b7cadac1c256ff49b1889dbbe5e3fed81db855b8cc4e40d949c9d3eae0e795e8229c1c8c24c0e83f27cfa6ee3766696c6428
+  checksum: 10c0/d771dd1f3222b120518176733c52b7cadac1c256ff49b1889dbbe5e3fed81db855b8cc4e40d949c9d3eae0e795e8229c1c8c24c0e83f27cfa6ee3766696c6428
   languageName: node
   linkType: hard
 
@@ -204,7 +204,7 @@ __metadata:
   resolution: "@babel/helper-hoist-variables@npm:7.22.5"
   dependencies:
     "@babel/types": "npm:^7.22.5"
-  checksum: 60a3077f756a1cd9f14eb89f0037f487d81ede2b7cfe652ea6869cd4ec4c782b0fb1de01b8494b9a2d2050e3d154d7d5ad3be24806790acfb8cbe2073bf1e208
+  checksum: 10c0/60a3077f756a1cd9f14eb89f0037f487d81ede2b7cfe652ea6869cd4ec4c782b0fb1de01b8494b9a2d2050e3d154d7d5ad3be24806790acfb8cbe2073bf1e208
   languageName: node
   linkType: hard
 
@@ -213,7 +213,7 @@ __metadata:
   resolution: "@babel/helper-member-expression-to-functions@npm:7.23.0"
   dependencies:
     "@babel/types": "npm:^7.23.0"
-  checksum: b810daddf093ffd0802f1429052349ed9ea08ef7d0c56da34ffbcdecbdafac86f95bdea2fe30e0e0e629febc7dd41b56cb5eacc10d1a44336d37b755dac31fa4
+  checksum: 10c0/b810daddf093ffd0802f1429052349ed9ea08ef7d0c56da34ffbcdecbdafac86f95bdea2fe30e0e0e629febc7dd41b56cb5eacc10d1a44336d37b755dac31fa4
   languageName: node
   linkType: hard
 
@@ -222,7 +222,7 @@ __metadata:
   resolution: "@babel/helper-module-imports@npm:7.22.15"
   dependencies:
     "@babel/types": "npm:^7.22.15"
-  checksum: 4e0d7fc36d02c1b8c8b3006dfbfeedf7a367d3334a04934255de5128115ea0bafdeb3e5736a2559917f0653e4e437400d54542da0468e08d3cbc86d3bbfa8f30
+  checksum: 10c0/4e0d7fc36d02c1b8c8b3006dfbfeedf7a367d3334a04934255de5128115ea0bafdeb3e5736a2559917f0653e4e437400d54542da0468e08d3cbc86d3bbfa8f30
   languageName: node
   linkType: hard
 
@@ -237,7 +237,7 @@ __metadata:
     "@babel/helper-validator-identifier": "npm:^7.22.20"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 211e1399d0c4993671e8e5c2b25383f08bee40004ace5404ed4065f0e9258cc85d99c1b82fd456c030ce5cfd4d8f310355b54ef35de9924eabfc3dff1331d946
+  checksum: 10c0/211e1399d0c4993671e8e5c2b25383f08bee40004ace5404ed4065f0e9258cc85d99c1b82fd456c030ce5cfd4d8f310355b54ef35de9924eabfc3dff1331d946
   languageName: node
   linkType: hard
 
@@ -246,14 +246,14 @@ __metadata:
   resolution: "@babel/helper-optimise-call-expression@npm:7.22.5"
   dependencies:
     "@babel/types": "npm:^7.22.5"
-  checksum: 31b41a764fc3c585196cf5b776b70cf4705c132e4ce9723f39871f215f2ddbfb2e28a62f9917610f67c8216c1080482b9b05f65dd195dae2a52cef461f2ac7b8
+  checksum: 10c0/31b41a764fc3c585196cf5b776b70cf4705c132e4ce9723f39871f215f2ddbfb2e28a62f9917610f67c8216c1080482b9b05f65dd195dae2a52cef461f2ac7b8
   languageName: node
   linkType: hard
 
 "@babel/helper-plugin-utils@npm:^7.0.0, @babel/helper-plugin-utils@npm:^7.10.4, @babel/helper-plugin-utils@npm:^7.12.13, @babel/helper-plugin-utils@npm:^7.14.5, @babel/helper-plugin-utils@npm:^7.18.6, @babel/helper-plugin-utils@npm:^7.22.5, @babel/helper-plugin-utils@npm:^7.8.0, @babel/helper-plugin-utils@npm:^7.8.3":
   version: 7.22.5
   resolution: "@babel/helper-plugin-utils@npm:7.22.5"
-  checksum: d2c4bfe2fa91058bcdee4f4e57a3f4933aed7af843acfd169cd6179fab8d13c1d636474ecabb2af107dc77462c7e893199aa26632bac1c6d7e025a17cbb9d20d
+  checksum: 10c0/d2c4bfe2fa91058bcdee4f4e57a3f4933aed7af843acfd169cd6179fab8d13c1d636474ecabb2af107dc77462c7e893199aa26632bac1c6d7e025a17cbb9d20d
   languageName: node
   linkType: hard
 
@@ -266,7 +266,7 @@ __metadata:
     "@babel/helper-wrap-function": "npm:^7.22.20"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: aa93aa74250b636d477e8d863fbe59d4071f8c2654841b7ac608909e480c1cf3ff7d7af5a4038568829ad09d810bb681668cbe497d9c89ba5c352793dc9edf1e
+  checksum: 10c0/aa93aa74250b636d477e8d863fbe59d4071f8c2654841b7ac608909e480c1cf3ff7d7af5a4038568829ad09d810bb681668cbe497d9c89ba5c352793dc9edf1e
   languageName: node
   linkType: hard
 
@@ -279,7 +279,7 @@ __metadata:
     "@babel/helper-optimise-call-expression": "npm:^7.22.5"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 6b0858811ad46873817c90c805015d63300e003c5a85c147a17d9845fa2558a02047c3cc1f07767af59014b2dd0fa75b503e5bc36e917f360e9b67bb6f1e79f4
+  checksum: 10c0/6b0858811ad46873817c90c805015d63300e003c5a85c147a17d9845fa2558a02047c3cc1f07767af59014b2dd0fa75b503e5bc36e917f360e9b67bb6f1e79f4
   languageName: node
   linkType: hard
 
@@ -288,7 +288,7 @@ __metadata:
   resolution: "@babel/helper-simple-access@npm:7.22.5"
   dependencies:
     "@babel/types": "npm:^7.22.5"
-  checksum: f0cf81a30ba3d09a625fd50e5a9069e575c5b6719234e04ee74247057f8104beca89ed03e9217b6e9b0493434cedc18c5ecca4cea6244990836f1f893e140369
+  checksum: 10c0/f0cf81a30ba3d09a625fd50e5a9069e575c5b6719234e04ee74247057f8104beca89ed03e9217b6e9b0493434cedc18c5ecca4cea6244990836f1f893e140369
   languageName: node
   linkType: hard
 
@@ -297,7 +297,7 @@ __metadata:
   resolution: "@babel/helper-skip-transparent-expression-wrappers@npm:7.22.5"
   dependencies:
     "@babel/types": "npm:^7.22.5"
-  checksum: ab7fa2aa709ab49bb8cd86515a1e715a3108c4bb9a616965ba76b43dc346dee66d1004ccf4d222b596b6224e43e04cbc5c3a34459501b388451f8c589fbc3691
+  checksum: 10c0/ab7fa2aa709ab49bb8cd86515a1e715a3108c4bb9a616965ba76b43dc346dee66d1004ccf4d222b596b6224e43e04cbc5c3a34459501b388451f8c589fbc3691
   languageName: node
   linkType: hard
 
@@ -306,28 +306,28 @@ __metadata:
   resolution: "@babel/helper-split-export-declaration@npm:7.22.6"
   dependencies:
     "@babel/types": "npm:^7.22.5"
-  checksum: d83e4b623eaa9622c267d3c83583b72f3aac567dc393dda18e559d79187961cb29ae9c57b2664137fc3d19508370b12ec6a81d28af73a50e0846819cb21c6e44
+  checksum: 10c0/d83e4b623eaa9622c267d3c83583b72f3aac567dc393dda18e559d79187961cb29ae9c57b2664137fc3d19508370b12ec6a81d28af73a50e0846819cb21c6e44
   languageName: node
   linkType: hard
 
 "@babel/helper-string-parser@npm:^7.23.4":
   version: 7.23.4
   resolution: "@babel/helper-string-parser@npm:7.23.4"
-  checksum: f348d5637ad70b6b54b026d6544bd9040f78d24e7ec245a0fc42293968181f6ae9879c22d89744730d246ce8ec53588f716f102addd4df8bbc79b73ea10004ac
+  checksum: 10c0/f348d5637ad70b6b54b026d6544bd9040f78d24e7ec245a0fc42293968181f6ae9879c22d89744730d246ce8ec53588f716f102addd4df8bbc79b73ea10004ac
   languageName: node
   linkType: hard
 
 "@babel/helper-validator-identifier@npm:^7.22.20":
   version: 7.22.20
   resolution: "@babel/helper-validator-identifier@npm:7.22.20"
-  checksum: dcad63db345fb110e032de46c3688384b0008a42a4845180ce7cd62b1a9c0507a1bed727c4d1060ed1a03ae57b4d918570259f81724aaac1a5b776056f37504e
+  checksum: 10c0/dcad63db345fb110e032de46c3688384b0008a42a4845180ce7cd62b1a9c0507a1bed727c4d1060ed1a03ae57b4d918570259f81724aaac1a5b776056f37504e
   languageName: node
   linkType: hard
 
 "@babel/helper-validator-option@npm:^7.22.15, @babel/helper-validator-option@npm:^7.23.5":
   version: 7.23.5
   resolution: "@babel/helper-validator-option@npm:7.23.5"
-  checksum: af45d5c0defb292ba6fd38979e8f13d7da63f9623d8ab9ededc394f67eb45857d2601278d151ae9affb6e03d5d608485806cd45af08b4468a0515cf506510e94
+  checksum: 10c0/af45d5c0defb292ba6fd38979e8f13d7da63f9623d8ab9ededc394f67eb45857d2601278d151ae9affb6e03d5d608485806cd45af08b4468a0515cf506510e94
   languageName: node
   linkType: hard
 
@@ -338,7 +338,7 @@ __metadata:
     "@babel/helper-function-name": "npm:^7.22.5"
     "@babel/template": "npm:^7.22.15"
     "@babel/types": "npm:^7.22.19"
-  checksum: 97b5f42ff4d305318ff2f99a5f59d3e97feff478333b2d893c4f85456d3c66372070f71d7bf9141f598c8cf2741c49a15918193633c427a88d170d98eb8c46eb
+  checksum: 10c0/97b5f42ff4d305318ff2f99a5f59d3e97feff478333b2d893c4f85456d3c66372070f71d7bf9141f598c8cf2741c49a15918193633c427a88d170d98eb8c46eb
   languageName: node
   linkType: hard
 
@@ -349,7 +349,7 @@ __metadata:
     "@babel/template": "npm:^7.23.9"
     "@babel/traverse": "npm:^7.23.9"
     "@babel/types": "npm:^7.23.9"
-  checksum: f69fd0aca96a6fb8bd6dd044cd8a5c0f1851072d4ce23355345b9493c4032e76d1217f86b70df795e127553cf7f3fcd1587ede9d1b03b95e8b62681ca2165b87
+  checksum: 10c0/f69fd0aca96a6fb8bd6dd044cd8a5c0f1851072d4ce23355345b9493c4032e76d1217f86b70df795e127553cf7f3fcd1587ede9d1b03b95e8b62681ca2165b87
   languageName: node
   linkType: hard
 
@@ -360,7 +360,7 @@ __metadata:
     "@babel/helper-validator-identifier": "npm:^7.22.20"
     chalk: "npm:^2.4.2"
     js-tokens: "npm:^4.0.0"
-  checksum: fbff9fcb2f5539289c3c097d130e852afd10d89a3a08ac0b5ebebbc055cc84a4bcc3dcfed463d488cde12dd0902ef1858279e31d7349b2e8cee43913744bda33
+  checksum: 10c0/fbff9fcb2f5539289c3c097d130e852afd10d89a3a08ac0b5ebebbc055cc84a4bcc3dcfed463d488cde12dd0902ef1858279e31d7349b2e8cee43913744bda33
   languageName: node
   linkType: hard
 
@@ -369,7 +369,7 @@ __metadata:
   resolution: "@babel/parser@npm:7.23.9"
   bin:
     parser: ./bin/babel-parser.js
-  checksum: 7df97386431366d4810538db4b9ec538f4377096f720c0591c7587a16f6810e62747e9fbbfa1ff99257fd4330035e4fb1b5b77c7bd3b97ce0d2e3780a6618975
+  checksum: 10c0/7df97386431366d4810538db4b9ec538f4377096f720c0591c7587a16f6810e62747e9fbbfa1ff99257fd4330035e4fb1b5b77c7bd3b97ce0d2e3780a6618975
   languageName: node
   linkType: hard
 
@@ -380,7 +380,7 @@ __metadata:
     "@babel/helper-plugin-utils": "npm:^7.22.5"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 356a4e9fc52d7ca761ce6857fc58e2295c2785d22565760e6a5680be86c6e5883ab86e0ba25ef572882c01713d3a31ae6cfa3e3222cdb95e6026671dab1fa415
+  checksum: 10c0/356a4e9fc52d7ca761ce6857fc58e2295c2785d22565760e6a5680be86c6e5883ab86e0ba25ef572882c01713d3a31ae6cfa3e3222cdb95e6026671dab1fa415
   languageName: node
   linkType: hard
 
@@ -393,7 +393,7 @@ __metadata:
     "@babel/plugin-transform-optional-chaining": "npm:^7.23.3"
   peerDependencies:
     "@babel/core": ^7.13.0
-  checksum: a8785f099d55ca71ed89815e0f3a636a80c16031f80934cfec17c928d096ee0798964733320c8b145ef36ba429c5e19d5107b06231e0ab6777cfb0f01adfdc23
+  checksum: 10c0/a8785f099d55ca71ed89815e0f3a636a80c16031f80934cfec17c928d096ee0798964733320c8b145ef36ba429c5e19d5107b06231e0ab6777cfb0f01adfdc23
   languageName: node
   linkType: hard
 
@@ -405,7 +405,7 @@ __metadata:
     "@babel/helper-plugin-utils": "npm:^7.22.5"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 355746e21ad7f43e4f4daef54cfe2ef461ecd19446b2afedd53c39df1bf9aa2eeeeaabee2279b1321de89a97c9360e4f76e9ba950fee50ff1676c25f6929d625
+  checksum: 10c0/355746e21ad7f43e4f4daef54cfe2ef461ecd19446b2afedd53c39df1bf9aa2eeeeaabee2279b1321de89a97c9360e4f76e9ba950fee50ff1676c25f6929d625
   languageName: node
   linkType: hard
 
@@ -414,7 +414,7 @@ __metadata:
   resolution: "@babel/plugin-proposal-private-property-in-object@npm:7.21.0-placeholder-for-preset-env.2"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: e605e0070da087f6c35579499e65801179a521b6842c15181a1e305c04fded2393f11c1efd09b087be7f8b083d1b75e8f3efcbc1292b4f60d3369e14812cff63
+  checksum: 10c0/e605e0070da087f6c35579499e65801179a521b6842c15181a1e305c04fded2393f11c1efd09b087be7f8b083d1b75e8f3efcbc1292b4f60d3369e14812cff63
   languageName: node
   linkType: hard
 
@@ -425,7 +425,7 @@ __metadata:
     "@babel/helper-plugin-utils": "npm:^7.8.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: d13efb282838481348c71073b6be6245b35d4f2f964a8f71e4174f235009f929ef7613df25f8d2338e2d3e44bc4265a9f8638c6aaa136d7a61fe95985f9725c8
+  checksum: 10c0/d13efb282838481348c71073b6be6245b35d4f2f964a8f71e4174f235009f929ef7613df25f8d2338e2d3e44bc4265a9f8638c6aaa136d7a61fe95985f9725c8
   languageName: node
   linkType: hard
 
@@ -436,7 +436,7 @@ __metadata:
     "@babel/helper-plugin-utils": "npm:^7.8.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 686891b81af2bc74c39013655da368a480f17dd237bf9fbc32048e5865cb706d5a8f65438030da535b332b1d6b22feba336da8fa931f663b6b34e13147d12dde
+  checksum: 10c0/686891b81af2bc74c39013655da368a480f17dd237bf9fbc32048e5865cb706d5a8f65438030da535b332b1d6b22feba336da8fa931f663b6b34e13147d12dde
   languageName: node
   linkType: hard
 
@@ -447,7 +447,7 @@ __metadata:
     "@babel/helper-plugin-utils": "npm:^7.12.13"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 95168fa186416195280b1264fb18afcdcdcea780b3515537b766cb90de6ce042d42dd6a204a39002f794ae5845b02afb0fd4861a3308a861204a55e68310a120
+  checksum: 10c0/95168fa186416195280b1264fb18afcdcdcea780b3515537b766cb90de6ce042d42dd6a204a39002f794ae5845b02afb0fd4861a3308a861204a55e68310a120
   languageName: node
   linkType: hard
 
@@ -458,7 +458,7 @@ __metadata:
     "@babel/helper-plugin-utils": "npm:^7.14.5"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 4464bf9115f4a2d02ce1454411baf9cfb665af1da53709c5c56953e5e2913745b0fcce82982a00463d6facbdd93445c691024e310b91431a1e2f024b158f6371
+  checksum: 10c0/4464bf9115f4a2d02ce1454411baf9cfb665af1da53709c5c56953e5e2913745b0fcce82982a00463d6facbdd93445c691024e310b91431a1e2f024b158f6371
   languageName: node
   linkType: hard
 
@@ -469,7 +469,7 @@ __metadata:
     "@babel/helper-plugin-utils": "npm:^7.8.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 9c50927bf71adf63f60c75370e2335879402648f468d0172bc912e303c6a3876927d8eb35807331b57f415392732ed05ab9b42c68ac30a936813ab549e0246c5
+  checksum: 10c0/9c50927bf71adf63f60c75370e2335879402648f468d0172bc912e303c6a3876927d8eb35807331b57f415392732ed05ab9b42c68ac30a936813ab549e0246c5
   languageName: node
   linkType: hard
 
@@ -480,7 +480,7 @@ __metadata:
     "@babel/helper-plugin-utils": "npm:^7.8.3"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 5100d658ba563829700cd8d001ddc09f4c0187b1a13de300d729c5b3e87503f75a6d6c99c1794182f7f1a9f546ee009df4f15a0ce36376e206ed0012fa7cdc24
+  checksum: 10c0/5100d658ba563829700cd8d001ddc09f4c0187b1a13de300d729c5b3e87503f75a6d6c99c1794182f7f1a9f546ee009df4f15a0ce36376e206ed0012fa7cdc24
   languageName: node
   linkType: hard
 
@@ -491,7 +491,7 @@ __metadata:
     "@babel/helper-plugin-utils": "npm:^7.22.5"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 7db8b59f75667bada2293353bb66b9d5651a673b22c72f47da9f5c46e719142481601b745f9822212fd7522f92e26e8576af37116f85dae1b5e5967f80d0faab
+  checksum: 10c0/7db8b59f75667bada2293353bb66b9d5651a673b22c72f47da9f5c46e719142481601b745f9822212fd7522f92e26e8576af37116f85dae1b5e5967f80d0faab
   languageName: node
   linkType: hard
 
@@ -502,7 +502,7 @@ __metadata:
     "@babel/helper-plugin-utils": "npm:^7.22.5"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 99b40d33d79205a8e04bb5dea56fd72906ffc317513b20ca7319e7683e18fce8ea2eea5e9171056f92b979dc0ab1e31b2cb5171177a5ba61e05b54fe7850a606
+  checksum: 10c0/99b40d33d79205a8e04bb5dea56fd72906ffc317513b20ca7319e7683e18fce8ea2eea5e9171056f92b979dc0ab1e31b2cb5171177a5ba61e05b54fe7850a606
   languageName: node
   linkType: hard
 
@@ -513,7 +513,7 @@ __metadata:
     "@babel/helper-plugin-utils": "npm:^7.10.4"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 0b08b5e4c3128523d8e346f8cfc86824f0da2697b1be12d71af50a31aff7a56ceb873ed28779121051475010c28d6146a6bfea8518b150b71eeb4e46190172ee
+  checksum: 10c0/0b08b5e4c3128523d8e346f8cfc86824f0da2697b1be12d71af50a31aff7a56ceb873ed28779121051475010c28d6146a6bfea8518b150b71eeb4e46190172ee
   languageName: node
   linkType: hard
 
@@ -524,7 +524,7 @@ __metadata:
     "@babel/helper-plugin-utils": "npm:^7.8.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: e98f31b2ec406c57757d115aac81d0336e8434101c224edd9a5c93cefa53faf63eacc69f3138960c8b25401315af03df37f68d316c151c4b933136716ed6906e
+  checksum: 10c0/e98f31b2ec406c57757d115aac81d0336e8434101c224edd9a5c93cefa53faf63eacc69f3138960c8b25401315af03df37f68d316c151c4b933136716ed6906e
   languageName: node
   linkType: hard
 
@@ -535,7 +535,7 @@ __metadata:
     "@babel/helper-plugin-utils": "npm:^7.22.5"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 563bb7599b868773f1c7c1d441ecc9bc53aeb7832775da36752c926fc402a1fa5421505b39e724f71eb217c13e4b93117e081cac39723b0e11dac4c897f33c3e
+  checksum: 10c0/563bb7599b868773f1c7c1d441ecc9bc53aeb7832775da36752c926fc402a1fa5421505b39e724f71eb217c13e4b93117e081cac39723b0e11dac4c897f33c3e
   languageName: node
   linkType: hard
 
@@ -546,7 +546,7 @@ __metadata:
     "@babel/helper-plugin-utils": "npm:^7.10.4"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 2594cfbe29411ad5bc2ad4058de7b2f6a8c5b86eda525a993959438615479e59c012c14aec979e538d60a584a1a799b60d1b8942c3b18468cb9d99b8fd34cd0b
+  checksum: 10c0/2594cfbe29411ad5bc2ad4058de7b2f6a8c5b86eda525a993959438615479e59c012c14aec979e538d60a584a1a799b60d1b8942c3b18468cb9d99b8fd34cd0b
   languageName: node
   linkType: hard
 
@@ -557,7 +557,7 @@ __metadata:
     "@babel/helper-plugin-utils": "npm:^7.8.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 2024fbb1162899094cfc81152449b12bd0cc7053c6d4bda8ac2852545c87d0a851b1b72ed9560673cbf3ef6248257262c3c04aabf73117215c1b9cc7dd2542ce
+  checksum: 10c0/2024fbb1162899094cfc81152449b12bd0cc7053c6d4bda8ac2852545c87d0a851b1b72ed9560673cbf3ef6248257262c3c04aabf73117215c1b9cc7dd2542ce
   languageName: node
   linkType: hard
 
@@ -568,7 +568,7 @@ __metadata:
     "@babel/helper-plugin-utils": "npm:^7.10.4"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: c55a82b3113480942c6aa2fcbe976ff9caa74b7b1109ff4369641dfbc88d1da348aceb3c31b6ed311c84d1e7c479440b961906c735d0ab494f688bf2fd5b9bb9
+  checksum: 10c0/c55a82b3113480942c6aa2fcbe976ff9caa74b7b1109ff4369641dfbc88d1da348aceb3c31b6ed311c84d1e7c479440b961906c735d0ab494f688bf2fd5b9bb9
   languageName: node
   linkType: hard
 
@@ -579,7 +579,7 @@ __metadata:
     "@babel/helper-plugin-utils": "npm:^7.8.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: ee1eab52ea6437e3101a0a7018b0da698545230015fc8ab129d292980ec6dff94d265e9e90070e8ae5fed42f08f1622c14c94552c77bcac784b37f503a82ff26
+  checksum: 10c0/ee1eab52ea6437e3101a0a7018b0da698545230015fc8ab129d292980ec6dff94d265e9e90070e8ae5fed42f08f1622c14c94552c77bcac784b37f503a82ff26
   languageName: node
   linkType: hard
 
@@ -590,7 +590,7 @@ __metadata:
     "@babel/helper-plugin-utils": "npm:^7.8.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 27e2493ab67a8ea6d693af1287f7e9acec206d1213ff107a928e85e173741e1d594196f99fec50e9dde404b09164f39dec5864c767212154ffe1caa6af0bc5af
+  checksum: 10c0/27e2493ab67a8ea6d693af1287f7e9acec206d1213ff107a928e85e173741e1d594196f99fec50e9dde404b09164f39dec5864c767212154ffe1caa6af0bc5af
   languageName: node
   linkType: hard
 
@@ -601,7 +601,7 @@ __metadata:
     "@babel/helper-plugin-utils": "npm:^7.8.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 46edddf2faa6ebf94147b8e8540dfc60a5ab718e2de4d01b2c0bdf250a4d642c2bd47cbcbb739febcb2bf75514dbcefad3c52208787994b8d0f8822490f55e81
+  checksum: 10c0/46edddf2faa6ebf94147b8e8540dfc60a5ab718e2de4d01b2c0bdf250a4d642c2bd47cbcbb739febcb2bf75514dbcefad3c52208787994b8d0f8822490f55e81
   languageName: node
   linkType: hard
 
@@ -612,7 +612,7 @@ __metadata:
     "@babel/helper-plugin-utils": "npm:^7.14.5"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 69822772561706c87f0a65bc92d0772cea74d6bc0911537904a676d5ff496a6d3ac4e05a166d8125fce4a16605bace141afc3611074e170a994e66e5397787f3
+  checksum: 10c0/69822772561706c87f0a65bc92d0772cea74d6bc0911537904a676d5ff496a6d3ac4e05a166d8125fce4a16605bace141afc3611074e170a994e66e5397787f3
   languageName: node
   linkType: hard
 
@@ -623,7 +623,7 @@ __metadata:
     "@babel/helper-plugin-utils": "npm:^7.14.5"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 14bf6e65d5bc1231ffa9def5f0ef30b19b51c218fcecaa78cd1bdf7939dfdf23f90336080b7f5196916368e399934ce5d581492d8292b46a2fb569d8b2da106f
+  checksum: 10c0/14bf6e65d5bc1231ffa9def5f0ef30b19b51c218fcecaa78cd1bdf7939dfdf23f90336080b7f5196916368e399934ce5d581492d8292b46a2fb569d8b2da106f
   languageName: node
   linkType: hard
 
@@ -634,7 +634,7 @@ __metadata:
     "@babel/helper-plugin-utils": "npm:^7.22.5"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 4d6e9cdb9d0bfb9bd9b220fc951d937fce2ca69135ec121153572cebe81d86abc9a489208d6b69ee5f10cadcaeffa10d0425340a5029e40e14a6025021b90948
+  checksum: 10c0/4d6e9cdb9d0bfb9bd9b220fc951d937fce2ca69135ec121153572cebe81d86abc9a489208d6b69ee5f10cadcaeffa10d0425340a5029e40e14a6025021b90948
   languageName: node
   linkType: hard
 
@@ -646,7 +646,7 @@ __metadata:
     "@babel/helper-plugin-utils": "npm:^7.18.6"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 9144e5b02a211a4fb9a0ce91063f94fbe1004e80bde3485a0910c9f14897cf83fabd8c21267907cff25db8e224858178df0517f14333cfcf3380ad9a4139cb50
+  checksum: 10c0/9144e5b02a211a4fb9a0ce91063f94fbe1004e80bde3485a0910c9f14897cf83fabd8c21267907cff25db8e224858178df0517f14333cfcf3380ad9a4139cb50
   languageName: node
   linkType: hard
 
@@ -657,7 +657,7 @@ __metadata:
     "@babel/helper-plugin-utils": "npm:^7.22.5"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: b128315c058f5728d29b0b78723659b11de88247ea4d0388f0b935cddf60a80c40b9067acf45cbbe055bd796928faef152a09d9e4a0695465aca4394d9f109ca
+  checksum: 10c0/b128315c058f5728d29b0b78723659b11de88247ea4d0388f0b935cddf60a80c40b9067acf45cbbe055bd796928faef152a09d9e4a0695465aca4394d9f109ca
   languageName: node
   linkType: hard
 
@@ -671,7 +671,7 @@ __metadata:
     "@babel/plugin-syntax-async-generators": "npm:^7.8.4"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 4ff75f9ce500e1de8c0236fa5122e6475a477d19cb9a4c2ae8651e78e717ebb2e2cecfeca69d420def779deaec78b945843b9ffd15f02ecd7de5072030b4469b
+  checksum: 10c0/4ff75f9ce500e1de8c0236fa5122e6475a477d19cb9a4c2ae8651e78e717ebb2e2cecfeca69d420def779deaec78b945843b9ffd15f02ecd7de5072030b4469b
   languageName: node
   linkType: hard
 
@@ -684,7 +684,7 @@ __metadata:
     "@babel/helper-remap-async-to-generator": "npm:^7.22.20"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: da3ffd413eef02a8e2cfee3e0bb0d5fc0fcb795c187bc14a5a8e8874cdbdc43bbf00089c587412d7752d97efc5967c3c18ff5398e3017b9a14a06126f017e7e9
+  checksum: 10c0/da3ffd413eef02a8e2cfee3e0bb0d5fc0fcb795c187bc14a5a8e8874cdbdc43bbf00089c587412d7752d97efc5967c3c18ff5398e3017b9a14a06126f017e7e9
   languageName: node
   linkType: hard
 
@@ -695,7 +695,7 @@ __metadata:
     "@babel/helper-plugin-utils": "npm:^7.22.5"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 82c12a11277528184a979163de7189ceb00129f60dd930b0d5313454310bf71205f302fb2bf0430247161c8a22aaa9fb9eec1459f9f7468206422c191978fd59
+  checksum: 10c0/82c12a11277528184a979163de7189ceb00129f60dd930b0d5313454310bf71205f302fb2bf0430247161c8a22aaa9fb9eec1459f9f7468206422c191978fd59
   languageName: node
   linkType: hard
 
@@ -706,7 +706,7 @@ __metadata:
     "@babel/helper-plugin-utils": "npm:^7.22.5"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 83006804dddf980ab1bcd6d67bc381e24b58c776507c34f990468f820d0da71dba3697355ca4856532fa2eeb2a1e3e73c780f03760b5507a511cbedb0308e276
+  checksum: 10c0/83006804dddf980ab1bcd6d67bc381e24b58c776507c34f990468f820d0da71dba3697355ca4856532fa2eeb2a1e3e73c780f03760b5507a511cbedb0308e276
   languageName: node
   linkType: hard
 
@@ -718,7 +718,7 @@ __metadata:
     "@babel/helper-plugin-utils": "npm:^7.22.5"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: bca30d576f539eef216494b56d610f1a64aa9375de4134bc021d9660f1fa735b1d7cc413029f22abc0b7cb737e3a57935c8ae9d8bd1730921ccb1deebce51bfd
+  checksum: 10c0/bca30d576f539eef216494b56d610f1a64aa9375de4134bc021d9660f1fa735b1d7cc413029f22abc0b7cb737e3a57935c8ae9d8bd1730921ccb1deebce51bfd
   languageName: node
   linkType: hard
 
@@ -731,7 +731,7 @@ __metadata:
     "@babel/plugin-syntax-class-static-block": "npm:^7.14.5"
   peerDependencies:
     "@babel/core": ^7.12.0
-  checksum: fdca96640ef29d8641a7f8de106f65f18871b38cc01c0f7b696d2b49c76b77816b30a812c08e759d06dd10b4d9b3af6b5e4ac22a2017a88c4077972224b77ab0
+  checksum: 10c0/fdca96640ef29d8641a7f8de106f65f18871b38cc01c0f7b696d2b49c76b77816b30a812c08e759d06dd10b4d9b3af6b5e4ac22a2017a88c4077972224b77ab0
   languageName: node
   linkType: hard
 
@@ -749,7 +749,7 @@ __metadata:
     globals: "npm:^11.1.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 227ac5166501e04d9e7fbd5eda6869b084ffa4af6830ac12544ac6ea14953ca00eb1762b0df9349c0f6c8d2a799385910f558066cd0fb85b9ca437b1131a6043
+  checksum: 10c0/227ac5166501e04d9e7fbd5eda6869b084ffa4af6830ac12544ac6ea14953ca00eb1762b0df9349c0f6c8d2a799385910f558066cd0fb85b9ca437b1131a6043
   languageName: node
   linkType: hard
 
@@ -761,7 +761,7 @@ __metadata:
     "@babel/template": "npm:^7.22.15"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 3ca8a006f8e652b58c21ecb84df1d01a73f0a96b1d216fd09a890b235dd90cb966b152b603b88f7e850ae238644b1636ce5c30b7c029c0934b43383932372e4a
+  checksum: 10c0/3ca8a006f8e652b58c21ecb84df1d01a73f0a96b1d216fd09a890b235dd90cb966b152b603b88f7e850ae238644b1636ce5c30b7c029c0934b43383932372e4a
   languageName: node
   linkType: hard
 
@@ -772,7 +772,7 @@ __metadata:
     "@babel/helper-plugin-utils": "npm:^7.22.5"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 717e9a62c1b0c93c507f87b4eaf839ec08d3c3147f14d74ae240d8749488d9762a8b3950132be620a069bde70f4b3e4ee9867b226c973fcc40f3cdec975cde71
+  checksum: 10c0/717e9a62c1b0c93c507f87b4eaf839ec08d3c3147f14d74ae240d8749488d9762a8b3950132be620a069bde70f4b3e4ee9867b226c973fcc40f3cdec975cde71
   languageName: node
   linkType: hard
 
@@ -784,7 +784,7 @@ __metadata:
     "@babel/helper-plugin-utils": "npm:^7.22.5"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 6c89286d1277c2a63802a453c797c87c1203f89e4c25115f7b6620f5fce15d8c8d37af613222f6aa497aa98773577a6ec8752e79e13d59bc5429270677ea010b
+  checksum: 10c0/6c89286d1277c2a63802a453c797c87c1203f89e4c25115f7b6620f5fce15d8c8d37af613222f6aa497aa98773577a6ec8752e79e13d59bc5429270677ea010b
   languageName: node
   linkType: hard
 
@@ -795,7 +795,7 @@ __metadata:
     "@babel/helper-plugin-utils": "npm:^7.22.5"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 7e2640e4e6adccd5e7b0615b6e9239d7c98363e21c52086ea13759dfa11cf7159b255fc5331c2de435639ea8eb6acefae115ae0d797a3d19d12587652f8052a5
+  checksum: 10c0/7e2640e4e6adccd5e7b0615b6e9239d7c98363e21c52086ea13759dfa11cf7159b255fc5331c2de435639ea8eb6acefae115ae0d797a3d19d12587652f8052a5
   languageName: node
   linkType: hard
 
@@ -807,7 +807,7 @@ __metadata:
     "@babel/plugin-syntax-dynamic-import": "npm:^7.8.3"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 19ae4a4a2ca86d35224734c41c48b2aa6a13139f3cfa1cbd18c0e65e461de8b65687dec7e52b7a72bb49db04465394c776aa1b13a2af5dc975b2a0cde3dcab67
+  checksum: 10c0/19ae4a4a2ca86d35224734c41c48b2aa6a13139f3cfa1cbd18c0e65e461de8b65687dec7e52b7a72bb49db04465394c776aa1b13a2af5dc975b2a0cde3dcab67
   languageName: node
   linkType: hard
 
@@ -819,7 +819,7 @@ __metadata:
     "@babel/helper-plugin-utils": "npm:^7.22.5"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 5c33ee6a1bdc52fcdf0807f445b27e3fbdce33008531885e65a699762327565fffbcfde8395be7f21bcb22d582e425eddae45650c986462bb84ba68f43687516
+  checksum: 10c0/5c33ee6a1bdc52fcdf0807f445b27e3fbdce33008531885e65a699762327565fffbcfde8395be7f21bcb22d582e425eddae45650c986462bb84ba68f43687516
   languageName: node
   linkType: hard
 
@@ -831,7 +831,7 @@ __metadata:
     "@babel/plugin-syntax-export-namespace-from": "npm:^7.8.3"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 38bf04f851e36240bbe83ace4169da626524f4107bfb91f05b4ad93a5fb6a36d5b3d30b8883c1ba575ccfc1bac7938e90ca2e3cb227f7b3f4a9424beec6fd4a7
+  checksum: 10c0/38bf04f851e36240bbe83ace4169da626524f4107bfb91f05b4ad93a5fb6a36d5b3d30b8883c1ba575ccfc1bac7938e90ca2e3cb227f7b3f4a9424beec6fd4a7
   languageName: node
   linkType: hard
 
@@ -843,7 +843,7 @@ __metadata:
     "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.22.5"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 46681b6ab10f3ca2d961f50d4096b62ab5d551e1adad84e64be1ee23e72eb2f26a1e30e617e853c74f1349fffe4af68d33921a128543b6f24b6d46c09a3e2aec
+  checksum: 10c0/46681b6ab10f3ca2d961f50d4096b62ab5d551e1adad84e64be1ee23e72eb2f26a1e30e617e853c74f1349fffe4af68d33921a128543b6f24b6d46c09a3e2aec
   languageName: node
   linkType: hard
 
@@ -856,7 +856,7 @@ __metadata:
     "@babel/helper-plugin-utils": "npm:^7.22.5"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 89cb9747802118048115cf92a8f310752f02030549b26f008904990cbdc86c3d4a68e07ca3b5c46de8a46ed4df2cb576ac222c74c56de67253d2a3ddc2956083
+  checksum: 10c0/89cb9747802118048115cf92a8f310752f02030549b26f008904990cbdc86c3d4a68e07ca3b5c46de8a46ed4df2cb576ac222c74c56de67253d2a3ddc2956083
   languageName: node
   linkType: hard
 
@@ -868,7 +868,7 @@ __metadata:
     "@babel/plugin-syntax-json-strings": "npm:^7.8.3"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 39e82223992a9ad857722ae051291935403852ad24b0dd64c645ca1c10517b6bf9822377d88643fed8b3e61a4e3f7e5ae41cf90eb07c40a786505d47d5970e54
+  checksum: 10c0/39e82223992a9ad857722ae051291935403852ad24b0dd64c645ca1c10517b6bf9822377d88643fed8b3e61a4e3f7e5ae41cf90eb07c40a786505d47d5970e54
   languageName: node
   linkType: hard
 
@@ -879,7 +879,7 @@ __metadata:
     "@babel/helper-plugin-utils": "npm:^7.22.5"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 8292106b106201464c2bfdd5c014fe6a9ca1c0256eb0a8031deb20081e21906fe68b156186f77d993c23eeab6d8d6f5f66e8895eec7ed97ce6de5dbcafbcd7f4
+  checksum: 10c0/8292106b106201464c2bfdd5c014fe6a9ca1c0256eb0a8031deb20081e21906fe68b156186f77d993c23eeab6d8d6f5f66e8895eec7ed97ce6de5dbcafbcd7f4
   languageName: node
   linkType: hard
 
@@ -891,7 +891,7 @@ __metadata:
     "@babel/plugin-syntax-logical-assignment-operators": "npm:^7.10.4"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 87b034dd13143904e405887e6125d76c27902563486efc66b7d9a9d8f9406b76c6ac42d7b37224014af5783d7edb465db0cdecd659fa3227baad0b3a6a35deff
+  checksum: 10c0/87b034dd13143904e405887e6125d76c27902563486efc66b7d9a9d8f9406b76c6ac42d7b37224014af5783d7edb465db0cdecd659fa3227baad0b3a6a35deff
   languageName: node
   linkType: hard
 
@@ -902,7 +902,7 @@ __metadata:
     "@babel/helper-plugin-utils": "npm:^7.22.5"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 687f24f3ec60b627fef6e87b9e2770df77f76727b9d5f54fa4c84a495bb24eb4a20f1a6240fa22d339d45aac5eaeb1b39882e941bfd00cf498f9c53478d1ec88
+  checksum: 10c0/687f24f3ec60b627fef6e87b9e2770df77f76727b9d5f54fa4c84a495bb24eb4a20f1a6240fa22d339d45aac5eaeb1b39882e941bfd00cf498f9c53478d1ec88
   languageName: node
   linkType: hard
 
@@ -914,7 +914,7 @@ __metadata:
     "@babel/helper-plugin-utils": "npm:^7.22.5"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 9f7ec036f7cfc588833a4dd117a44813b64aa4c1fd5bfb6c78f60198c1d290938213090c93a46f97a68a2490fad909e21a82b2472e95da74d108c125df21c8d5
+  checksum: 10c0/9f7ec036f7cfc588833a4dd117a44813b64aa4c1fd5bfb6c78f60198c1d290938213090c93a46f97a68a2490fad909e21a82b2472e95da74d108c125df21c8d5
   languageName: node
   linkType: hard
 
@@ -927,7 +927,7 @@ __metadata:
     "@babel/helper-simple-access": "npm:^7.22.5"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 5c8840c5c9ecba39367ae17c973ed13dbc43234147b77ae780eec65010e2a9993c5d717721b23e8179f7cf49decdd325c509b241d69cfbf92aa647a1d8d5a37d
+  checksum: 10c0/5c8840c5c9ecba39367ae17c973ed13dbc43234147b77ae780eec65010e2a9993c5d717721b23e8179f7cf49decdd325c509b241d69cfbf92aa647a1d8d5a37d
   languageName: node
   linkType: hard
 
@@ -941,7 +941,7 @@ __metadata:
     "@babel/helper-validator-identifier": "npm:^7.22.20"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 1926631fe9d87c0c53427a3420ad49da62d53320d0016b6afab64e5417a672aa5bdff3ea1d24746ffa1e43319c28a80f5d8cef0ad214760d399c293b5850500f
+  checksum: 10c0/1926631fe9d87c0c53427a3420ad49da62d53320d0016b6afab64e5417a672aa5bdff3ea1d24746ffa1e43319c28a80f5d8cef0ad214760d399c293b5850500f
   languageName: node
   linkType: hard
 
@@ -953,7 +953,7 @@ __metadata:
     "@babel/helper-plugin-utils": "npm:^7.22.5"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: f0d2f890a15b4367d0d8f160bed7062bdb145c728c24e9bfbc1211c7925aae5df72a88df3832c92dd2011927edfed4da1b1249e4c78402e893509316c0c2caa6
+  checksum: 10c0/f0d2f890a15b4367d0d8f160bed7062bdb145c728c24e9bfbc1211c7925aae5df72a88df3832c92dd2011927edfed4da1b1249e4c78402e893509316c0c2caa6
   languageName: node
   linkType: hard
 
@@ -965,7 +965,7 @@ __metadata:
     "@babel/helper-plugin-utils": "npm:^7.22.5"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: b0b072bef303670b5a98307bc37d1ac326cb7ad40ea162b89a03c2ffc465451be7ef05be95cb81ed28bfeb29670dc98fe911f793a67bceab18b4cb4c81ef48f3
+  checksum: 10c0/b0b072bef303670b5a98307bc37d1ac326cb7ad40ea162b89a03c2ffc465451be7ef05be95cb81ed28bfeb29670dc98fe911f793a67bceab18b4cb4c81ef48f3
   languageName: node
   linkType: hard
 
@@ -976,7 +976,7 @@ __metadata:
     "@babel/helper-plugin-utils": "npm:^7.22.5"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: f489b9e1f17b42b2ba6312d58351e757cb23a8409f64f2bb6af4c09d015359588a5d68943b20756f141d0931a94431c782f3ed1225228a930a04b07be0c31b04
+  checksum: 10c0/f489b9e1f17b42b2ba6312d58351e757cb23a8409f64f2bb6af4c09d015359588a5d68943b20756f141d0931a94431c782f3ed1225228a930a04b07be0c31b04
   languageName: node
   linkType: hard
 
@@ -988,7 +988,7 @@ __metadata:
     "@babel/plugin-syntax-nullish-coalescing-operator": "npm:^7.8.3"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: bce490d22da5c87ff27fffaff6ad5a4d4979b8d7b72e30857f191e9c1e1824ba73bb8d7081166289369e388f94f0ce5383a593b1fc84d09464a062c75f824b0b
+  checksum: 10c0/bce490d22da5c87ff27fffaff6ad5a4d4979b8d7b72e30857f191e9c1e1824ba73bb8d7081166289369e388f94f0ce5383a593b1fc84d09464a062c75f824b0b
   languageName: node
   linkType: hard
 
@@ -1000,7 +1000,7 @@ __metadata:
     "@babel/plugin-syntax-numeric-separator": "npm:^7.10.4"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: e34902da4f5588dc4812c92cb1f6a5e3e3647baf7b4623e30942f551bf1297621abec4e322ebfa50b320c987c0f34d9eb4355b3d289961d9035e2126e3119c12
+  checksum: 10c0/e34902da4f5588dc4812c92cb1f6a5e3e3647baf7b4623e30942f551bf1297621abec4e322ebfa50b320c987c0f34d9eb4355b3d289961d9035e2126e3119c12
   languageName: node
   linkType: hard
 
@@ -1015,7 +1015,7 @@ __metadata:
     "@babel/plugin-transform-parameters": "npm:^7.23.3"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: b56017992ffe7fcd1dd9a9da67c39995a141820316266bcf7d77dc912980d228ccbd3f36191d234f5cc389b09157b5d2a955e33e8fb368319534affd1c72b262
+  checksum: 10c0/b56017992ffe7fcd1dd9a9da67c39995a141820316266bcf7d77dc912980d228ccbd3f36191d234f5cc389b09157b5d2a955e33e8fb368319534affd1c72b262
   languageName: node
   linkType: hard
 
@@ -1027,7 +1027,7 @@ __metadata:
     "@babel/helper-replace-supers": "npm:^7.22.20"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: a6856fd8c0afbe5b3318c344d4d201d009f4051e2f6ff6237ff2660593e93c5997a58772b13d639077c3e29ced3440247b29c496cd77b13af1e7559a70009775
+  checksum: 10c0/a6856fd8c0afbe5b3318c344d4d201d009f4051e2f6ff6237ff2660593e93c5997a58772b13d639077c3e29ced3440247b29c496cd77b13af1e7559a70009775
   languageName: node
   linkType: hard
 
@@ -1039,7 +1039,7 @@ __metadata:
     "@babel/plugin-syntax-optional-catch-binding": "npm:^7.8.3"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 4ef61812af0e4928485e28301226ce61139a8b8cea9e9a919215ebec4891b9fea2eb7a83dc3090e2679b7d7b2c8653da601fbc297d2addc54a908b315173991e
+  checksum: 10c0/4ef61812af0e4928485e28301226ce61139a8b8cea9e9a919215ebec4891b9fea2eb7a83dc3090e2679b7d7b2c8653da601fbc297d2addc54a908b315173991e
   languageName: node
   linkType: hard
 
@@ -1052,7 +1052,7 @@ __metadata:
     "@babel/plugin-syntax-optional-chaining": "npm:^7.8.3"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 305b773c29ad61255b0e83ec1e92b2f7af6aa58be4cba1e3852bddaa14f7d2afd7b4438f41c28b179d6faac7eb8d4fb5530a17920294f25d459b8f84406bfbfb
+  checksum: 10c0/305b773c29ad61255b0e83ec1e92b2f7af6aa58be4cba1e3852bddaa14f7d2afd7b4438f41c28b179d6faac7eb8d4fb5530a17920294f25d459b8f84406bfbfb
   languageName: node
   linkType: hard
 
@@ -1063,7 +1063,7 @@ __metadata:
     "@babel/helper-plugin-utils": "npm:^7.22.5"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: a8d4cbe0f6ba68d158f5b4215c63004fc37a1fdc539036eb388a9792017c8496ea970a1932ccb929308f61e53dc56676ed01d8df6f42bc0a85c7fd5ba82482b7
+  checksum: 10c0/a8d4cbe0f6ba68d158f5b4215c63004fc37a1fdc539036eb388a9792017c8496ea970a1932ccb929308f61e53dc56676ed01d8df6f42bc0a85c7fd5ba82482b7
   languageName: node
   linkType: hard
 
@@ -1075,7 +1075,7 @@ __metadata:
     "@babel/helper-plugin-utils": "npm:^7.22.5"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 745a655edcd111b7f91882b921671ca0613079760d8c9befe336b8a9bc4ce6bb49c0c08941831c950afb1b225b4b2d3eaac8842e732db095b04db38efd8c34f4
+  checksum: 10c0/745a655edcd111b7f91882b921671ca0613079760d8c9befe336b8a9bc4ce6bb49c0c08941831c950afb1b225b4b2d3eaac8842e732db095b04db38efd8c34f4
   languageName: node
   linkType: hard
 
@@ -1089,7 +1089,7 @@ __metadata:
     "@babel/plugin-syntax-private-property-in-object": "npm:^7.14.5"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 8d31b28f24204b4d13514cd3a8f3033abf575b1a6039759ddd6e1d82dd33ba7281f9bc85c9f38072a665d69bfa26dc40737eefaf9d397b024654a483d2357bf5
+  checksum: 10c0/8d31b28f24204b4d13514cd3a8f3033abf575b1a6039759ddd6e1d82dd33ba7281f9bc85c9f38072a665d69bfa26dc40737eefaf9d397b024654a483d2357bf5
   languageName: node
   linkType: hard
 
@@ -1100,7 +1100,7 @@ __metadata:
     "@babel/helper-plugin-utils": "npm:^7.22.5"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: b2549f23f90cf276c2e3058c2225c3711c2ad1c417e336d3391199445a9776dd791b83be47b2b9a7ae374b40652d74b822387e31fa5267a37bf49c122e1a9747
+  checksum: 10c0/b2549f23f90cf276c2e3058c2225c3711c2ad1c417e336d3391199445a9776dd791b83be47b2b9a7ae374b40652d74b822387e31fa5267a37bf49c122e1a9747
   languageName: node
   linkType: hard
 
@@ -1111,7 +1111,7 @@ __metadata:
     "@babel/helper-plugin-utils": "npm:^7.22.5"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 3a54802058ed3eef9c98efcc9ec4888763dce552f117db9a62fc2cdca30d9de0218cf7722a748d4b715a8bd833b9725d7ee018d01a18209b44434d15f719b173
+  checksum: 10c0/3a54802058ed3eef9c98efcc9ec4888763dce552f117db9a62fc2cdca30d9de0218cf7722a748d4b715a8bd833b9725d7ee018d01a18209b44434d15f719b173
   languageName: node
   linkType: hard
 
@@ -1122,7 +1122,7 @@ __metadata:
     "@babel/helper-plugin-utils": "npm:^7.22.5"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 3aed142af7bd1aed1df2bdad91ed33ba1cdd5c3c67ce6eafba821ff72f129162a197ffb55f1eb1775af276abd5545934489a8257fef6c6665ddf253a4f39a939
+  checksum: 10c0/3aed142af7bd1aed1df2bdad91ed33ba1cdd5c3c67ce6eafba821ff72f129162a197ffb55f1eb1775af276abd5545934489a8257fef6c6665ddf253a4f39a939
   languageName: node
   linkType: hard
 
@@ -1134,7 +1134,7 @@ __metadata:
     "@babel/helper-plugin-utils": "npm:^7.22.5"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 138f7769b30f65d339588155affe677c68fde3cdaa060a2dc73152cc8c941c246d4b2ae73c8f1d9ddf1055e587fcb7379c155d49daec086ed50557f2117c1d50
+  checksum: 10c0/138f7769b30f65d339588155affe677c68fde3cdaa060a2dc73152cc8c941c246d4b2ae73c8f1d9ddf1055e587fcb7379c155d49daec086ed50557f2117c1d50
   languageName: node
   linkType: hard
 
@@ -1145,7 +1145,7 @@ __metadata:
     "@babel/plugin-transform-react-jsx": "npm:^7.22.5"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 4d2e9e68383238feb873f6111df972df4a2ebf6256d6f787a8772241867efa975b3980f7d75ab7d750e7eaad4bd454e8cc6e106301fd7572dd389e553f5f69d2
+  checksum: 10c0/4d2e9e68383238feb873f6111df972df4a2ebf6256d6f787a8772241867efa975b3980f7d75ab7d750e7eaad4bd454e8cc6e106301fd7572dd389e553f5f69d2
   languageName: node
   linkType: hard
 
@@ -1160,7 +1160,7 @@ __metadata:
     "@babel/types": "npm:^7.22.15"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: db37491e3eea5530521e177380312f308f01f806866fa0ce08d48fc5a8c9eaf9a954f778fa1ff477248afb72e916eb66ab3d35254bb6a8979f8b8e74a0fd8873
+  checksum: 10c0/db37491e3eea5530521e177380312f308f01f806866fa0ce08d48fc5a8c9eaf9a954f778fa1ff477248afb72e916eb66ab3d35254bb6a8979f8b8e74a0fd8873
   languageName: node
   linkType: hard
 
@@ -1172,7 +1172,7 @@ __metadata:
     "@babel/helper-plugin-utils": "npm:^7.22.5"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 76287adeab656fb7f39243e5ab6a8c60069cf69fffeebd1566457d56cb2f966366a23bd755d3e369f4d0437459e3b76243df370caa7d7d2287a8560b66c53ca2
+  checksum: 10c0/76287adeab656fb7f39243e5ab6a8c60069cf69fffeebd1566457d56cb2f966366a23bd755d3e369f4d0437459e3b76243df370caa7d7d2287a8560b66c53ca2
   languageName: node
   linkType: hard
 
@@ -1184,7 +1184,7 @@ __metadata:
     regenerator-transform: "npm:^0.15.2"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 3b0e989ae5db78894ee300b24e07fbcec490c39ab48629c519377581cf94e90308f4ddc10a8914edc9f403e2d3ac7a7ae0ae09003629d852da03e2ba846299c6
+  checksum: 10c0/3b0e989ae5db78894ee300b24e07fbcec490c39ab48629c519377581cf94e90308f4ddc10a8914edc9f403e2d3ac7a7ae0ae09003629d852da03e2ba846299c6
   languageName: node
   linkType: hard
 
@@ -1195,7 +1195,7 @@ __metadata:
     "@babel/helper-plugin-utils": "npm:^7.22.5"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 4e6d61f6c9757592661cfbd2c39c4f61551557b98cb5f0995ef10f5540f67e18dde8a42b09716d58943b6e4b7ef5c9bcf19902839e7328a4d49149e0fecdbfcd
+  checksum: 10c0/4e6d61f6c9757592661cfbd2c39c4f61551557b98cb5f0995ef10f5540f67e18dde8a42b09716d58943b6e4b7ef5c9bcf19902839e7328a4d49149e0fecdbfcd
   languageName: node
   linkType: hard
 
@@ -1211,7 +1211,7 @@ __metadata:
     semver: "npm:^6.3.1"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 3b959c2b88ea0009c288fa190d9f69b0d26cb336b8a7cab54a5e54b844f33cce1996725c15305a40049c8f23ca30082ee27e1f6853ff35fad723543e3d2dba47
+  checksum: 10c0/3b959c2b88ea0009c288fa190d9f69b0d26cb336b8a7cab54a5e54b844f33cce1996725c15305a40049c8f23ca30082ee27e1f6853ff35fad723543e3d2dba47
   languageName: node
   linkType: hard
 
@@ -1222,7 +1222,7 @@ __metadata:
     "@babel/helper-plugin-utils": "npm:^7.22.5"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: c423c66fec0b6503f50561741754c84366ef9e9818442c8881fbaa90cc363fd137084b9431cdc00ed2f1fd8c8a1a5982c4a7e1f2af3769db4caf2ac7ea55d4f0
+  checksum: 10c0/c423c66fec0b6503f50561741754c84366ef9e9818442c8881fbaa90cc363fd137084b9431cdc00ed2f1fd8c8a1a5982c4a7e1f2af3769db4caf2ac7ea55d4f0
   languageName: node
   linkType: hard
 
@@ -1234,7 +1234,7 @@ __metadata:
     "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.22.5"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: a348e4ae47e4ceeceb760506ec7bf835ccc18a2cf70ec74ebfbe41bc172fa2412b05b7d1b86836f8aee375e41a04ff20486074778d0e2d19d668b33dc52e9dbb
+  checksum: 10c0/a348e4ae47e4ceeceb760506ec7bf835ccc18a2cf70ec74ebfbe41bc172fa2412b05b7d1b86836f8aee375e41a04ff20486074778d0e2d19d668b33dc52e9dbb
   languageName: node
   linkType: hard
 
@@ -1245,7 +1245,7 @@ __metadata:
     "@babel/helper-plugin-utils": "npm:^7.22.5"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: cd15c407906b41e4b924ea151e455c11274dba050771ee7154ad88a1a274140ac5e84efc8d08c4379f2f0cec8a09e4a0a3b2a3a954ba6a67d9fb35df1c714c56
+  checksum: 10c0/cd15c407906b41e4b924ea151e455c11274dba050771ee7154ad88a1a274140ac5e84efc8d08c4379f2f0cec8a09e4a0a3b2a3a954ba6a67d9fb35df1c714c56
   languageName: node
   linkType: hard
 
@@ -1256,7 +1256,7 @@ __metadata:
     "@babel/helper-plugin-utils": "npm:^7.22.5"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 9b5f43788b9ffcb8f2b445a16b1aa40fcf23cb0446a4649445f098ec6b4cb751f243a535da623d59fefe48f4c40552f5621187a61811779076bab26863e3373d
+  checksum: 10c0/9b5f43788b9ffcb8f2b445a16b1aa40fcf23cb0446a4649445f098ec6b4cb751f243a535da623d59fefe48f4c40552f5621187a61811779076bab26863e3373d
   languageName: node
   linkType: hard
 
@@ -1267,7 +1267,7 @@ __metadata:
     "@babel/helper-plugin-utils": "npm:^7.22.5"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 50e81d84c6059878be2a0e41e0d790cab10882cfb8fa85e8c2665ccb0b3cd7233f49197f17427bc7c1b36c80e07076640ecf1b641888d78b9cb91bc16478d84a
+  checksum: 10c0/50e81d84c6059878be2a0e41e0d790cab10882cfb8fa85e8c2665ccb0b3cd7233f49197f17427bc7c1b36c80e07076640ecf1b641888d78b9cb91bc16478d84a
   languageName: node
   linkType: hard
 
@@ -1281,7 +1281,7 @@ __metadata:
     "@babel/plugin-syntax-typescript": "npm:^7.23.3"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: a3c738efcf491ceb1eee646f57c44990ee0c80465527b88fcfa0b7602688c4ff8c165a4c5b62caf05d968b095212018fd30a02879c12d37c657081f57b31fb26
+  checksum: 10c0/a3c738efcf491ceb1eee646f57c44990ee0c80465527b88fcfa0b7602688c4ff8c165a4c5b62caf05d968b095212018fd30a02879c12d37c657081f57b31fb26
   languageName: node
   linkType: hard
 
@@ -1292,7 +1292,7 @@ __metadata:
     "@babel/helper-plugin-utils": "npm:^7.22.5"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: f1ed54742dc982666f471df5d087cfda9c6dbf7842bec2d0f7893ed359b142a38c0210358f297ab5c7a3e11ec0dfb0e523de2e2edf48b62f257aaadd5f068866
+  checksum: 10c0/f1ed54742dc982666f471df5d087cfda9c6dbf7842bec2d0f7893ed359b142a38c0210358f297ab5c7a3e11ec0dfb0e523de2e2edf48b62f257aaadd5f068866
   languageName: node
   linkType: hard
 
@@ -1304,7 +1304,7 @@ __metadata:
     "@babel/helper-plugin-utils": "npm:^7.22.5"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: dca5702d43fac70351623a12e4dfa454fd028a67498888522b644fd1a02534fabd440106897e886ebcc6ce6a39c58094ca29953b6f51bc67372aa8845a5ae49f
+  checksum: 10c0/dca5702d43fac70351623a12e4dfa454fd028a67498888522b644fd1a02534fabd440106897e886ebcc6ce6a39c58094ca29953b6f51bc67372aa8845a5ae49f
   languageName: node
   linkType: hard
 
@@ -1316,7 +1316,7 @@ __metadata:
     "@babel/helper-plugin-utils": "npm:^7.22.5"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: df824dcca2f6e731f61d69103e87d5dd974d8a04e46e28684a4ba935ae633d876bded09b8db890fd72d0caf7b9638e2672b753671783613cc78d472951e2df8c
+  checksum: 10c0/df824dcca2f6e731f61d69103e87d5dd974d8a04e46e28684a4ba935ae633d876bded09b8db890fd72d0caf7b9638e2672b753671783613cc78d472951e2df8c
   languageName: node
   linkType: hard
 
@@ -1328,7 +1328,7 @@ __metadata:
     "@babel/helper-plugin-utils": "npm:^7.22.5"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 30fe1d29af8395a867d40a63a250ca89072033d9bc7d4587eeebeaf4ad7f776aab83064321bfdb1d09d7e29a1d392852361f4f60a353f0f4d1a3b435dcbf256b
+  checksum: 10c0/30fe1d29af8395a867d40a63a250ca89072033d9bc7d4587eeebeaf4ad7f776aab83064321bfdb1d09d7e29a1d392852361f4f60a353f0f4d1a3b435dcbf256b
   languageName: node
   linkType: hard
 
@@ -1418,7 +1418,7 @@ __metadata:
     semver: "npm:^6.3.1"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 2837a42089180e51bfd6864b6d197e01fc0abec1920422e71c0513c2fc8fb5f3bfe694ed778cc4e45856c546964945bc53bf8105e4b26f3580ce3685fa50cc0f
+  checksum: 10c0/2837a42089180e51bfd6864b6d197e01fc0abec1920422e71c0513c2fc8fb5f3bfe694ed778cc4e45856c546964945bc53bf8105e4b26f3580ce3685fa50cc0f
   languageName: node
   linkType: hard
 
@@ -1431,7 +1431,7 @@ __metadata:
     esutils: "npm:^2.0.2"
   peerDependencies:
     "@babel/core": ^7.0.0-0 || ^8.0.0-0 <8.0.0
-  checksum: 9d02f70d7052446c5f3a4fb39e6b632695fb6801e46d31d7f7c5001f7c18d31d1ea8369212331ca7ad4e7877b73231f470b0d559162624128f1b80fe591409e6
+  checksum: 10c0/9d02f70d7052446c5f3a4fb39e6b632695fb6801e46d31d7f7c5001f7c18d31d1ea8369212331ca7ad4e7877b73231f470b0d559162624128f1b80fe591409e6
   languageName: node
   linkType: hard
 
@@ -1447,7 +1447,7 @@ __metadata:
     "@babel/plugin-transform-react-pure-annotations": "npm:^7.23.3"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: cecb2493e09fd4ffa5effcef1d06e968386b1bfe077a99834f7e8ef249208274fca62fe5a6b3986ef1c1c3900b2eb409adb528ae1b73dba31397b16f9262e83c
+  checksum: 10c0/cecb2493e09fd4ffa5effcef1d06e968386b1bfe077a99834f7e8ef249208274fca62fe5a6b3986ef1c1c3900b2eb409adb528ae1b73dba31397b16f9262e83c
   languageName: node
   linkType: hard
 
@@ -1462,14 +1462,14 @@ __metadata:
     "@babel/plugin-transform-typescript": "npm:^7.23.3"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: e72b654c7f0f08b35d7e1c0e3a59c0c13037f295c425760b8b148aa7dde01e6ddd982efc525710f997a1494fafdd55cb525738c016609e7e4d703d02014152b7
+  checksum: 10c0/e72b654c7f0f08b35d7e1c0e3a59c0c13037f295c425760b8b148aa7dde01e6ddd982efc525710f997a1494fafdd55cb525738c016609e7e4d703d02014152b7
   languageName: node
   linkType: hard
 
 "@babel/regjsgen@npm:^0.8.0":
   version: 0.8.0
   resolution: "@babel/regjsgen@npm:0.8.0"
-  checksum: 4f3ddd8c7c96d447e05c8304c1d5ba3a83fcabd8a716bc1091c2f31595cdd43a3a055fff7cb5d3042b8cb7d402d78820fcb4e05d896c605a7d8bcf30f2424c4a
+  checksum: 10c0/4f3ddd8c7c96d447e05c8304c1d5ba3a83fcabd8a716bc1091c2f31595cdd43a3a055fff7cb5d3042b8cb7d402d78820fcb4e05d896c605a7d8bcf30f2424c4a
   languageName: node
   linkType: hard
 
@@ -1478,7 +1478,7 @@ __metadata:
   resolution: "@babel/runtime@npm:7.0.0"
   dependencies:
     regenerator-runtime: "npm:^0.12.0"
-  checksum: fbbdf86380a1cfa6ce32a743549f4e4c8b8eb06a18be5054441cc0f66e75a747ae43b042d8989f4657027e1be3b9a82069865ccc5080838f004abd1161093742
+  checksum: 10c0/fbbdf86380a1cfa6ce32a743549f4e4c8b8eb06a18be5054441cc0f66e75a747ae43b042d8989f4657027e1be3b9a82069865ccc5080838f004abd1161093742
   languageName: node
   linkType: hard
 
@@ -1487,7 +1487,7 @@ __metadata:
   resolution: "@babel/runtime@npm:7.23.9"
   dependencies:
     regenerator-runtime: "npm:^0.14.0"
-  checksum: e71205fdd7082b2656512cc98e647d9ea7e222e4fe5c36e9e5adc026446fcc3ba7b3cdff8b0b694a0b78bb85db83e7b1e3d4c56ef90726682b74f13249cf952d
+  checksum: 10c0/e71205fdd7082b2656512cc98e647d9ea7e222e4fe5c36e9e5adc026446fcc3ba7b3cdff8b0b694a0b78bb85db83e7b1e3d4c56ef90726682b74f13249cf952d
   languageName: node
   linkType: hard
 
@@ -1498,7 +1498,7 @@ __metadata:
     "@babel/code-frame": "npm:^7.23.5"
     "@babel/parser": "npm:^7.23.9"
     "@babel/types": "npm:^7.23.9"
-  checksum: 0e8b60119433787742bc08ae762bbd8d6755611c4cabbcb7627b292ec901a55af65d93d1c88572326069efb64136ef151ec91ffb74b2df7689bbab237030833a
+  checksum: 10c0/0e8b60119433787742bc08ae762bbd8d6755611c4cabbcb7627b292ec901a55af65d93d1c88572326069efb64136ef151ec91ffb74b2df7689bbab237030833a
   languageName: node
   linkType: hard
 
@@ -1516,7 +1516,7 @@ __metadata:
     "@babel/types": "npm:^7.23.9"
     debug: "npm:^4.3.1"
     globals: "npm:^11.1.0"
-  checksum: d1615d1d02f04d47111a7ea4446a1a6275668ca39082f31d51f08380de9502e19862be434eaa34b022ce9a17dbb8f9e2b73a746c654d9575f3a680a7ffdf5630
+  checksum: 10c0/d1615d1d02f04d47111a7ea4446a1a6275668ca39082f31d51f08380de9502e19862be434eaa34b022ce9a17dbb8f9e2b73a746c654d9575f3a680a7ffdf5630
   languageName: node
   linkType: hard
 
@@ -1527,14 +1527,14 @@ __metadata:
     "@babel/helper-string-parser": "npm:^7.23.4"
     "@babel/helper-validator-identifier": "npm:^7.22.20"
     to-fast-properties: "npm:^2.0.0"
-  checksum: edc7bb180ce7e4d2aea10c6972fb10474341ac39ba8fdc4a27ffb328368dfdfbf40fca18e441bbe7c483774500d5c05e222cec276c242e952853dcaf4eb884f7
+  checksum: 10c0/edc7bb180ce7e4d2aea10c6972fb10474341ac39ba8fdc4a27ffb328368dfdfbf40fca18e441bbe7c483774500d5c05e222cec276c242e952853dcaf4eb884f7
   languageName: node
   linkType: hard
 
 "@bcoe/v8-coverage@npm:^0.2.3":
   version: 0.2.3
   resolution: "@bcoe/v8-coverage@npm:0.2.3"
-  checksum: 6b80ae4cb3db53f486da2dc63b6e190a74c8c3cca16bb2733f234a0b6a9382b09b146488ae08e2b22cf00f6c83e20f3e040a2f7894f05c045c946d6a090b1d52
+  checksum: 10c0/6b80ae4cb3db53f486da2dc63b6e190a74c8c3cca16bb2733f234a0b6a9382b09b146488ae08e2b22cf00f6c83e20f3e040a2f7894f05c045c946d6a090b1d52
   languageName: node
   linkType: hard
 
@@ -1543,14 +1543,14 @@ __metadata:
   resolution: "@csstools/css-parser-algorithms@npm:2.5.0"
   peerDependencies:
     "@csstools/css-tokenizer": ^2.2.3
-  checksum: 31b4a523d956e204af9842183678cca5a88ad76551d54dcb6083f8a6f2dfd8fdec6c09bca5410842af54b90997308bebee7593c17dbc1a4e951453b54bd3f024
+  checksum: 10c0/31b4a523d956e204af9842183678cca5a88ad76551d54dcb6083f8a6f2dfd8fdec6c09bca5410842af54b90997308bebee7593c17dbc1a4e951453b54bd3f024
   languageName: node
   linkType: hard
 
 "@csstools/css-tokenizer@npm:^2.2.3":
   version: 2.2.3
   resolution: "@csstools/css-tokenizer@npm:2.2.3"
-  checksum: 557266ec52e8b36c19008a5bbd7151effba085cdd6d68270c01afebf914981caac698eda754b2a530a8a9947a3dd70e3f3a39a5e037c4170bb2a055a92754acb
+  checksum: 10c0/557266ec52e8b36c19008a5bbd7151effba085cdd6d68270c01afebf914981caac698eda754b2a530a8a9947a3dd70e3f3a39a5e037c4170bb2a055a92754acb
   languageName: node
   linkType: hard
 
@@ -1560,7 +1560,7 @@ __metadata:
   peerDependencies:
     "@csstools/css-parser-algorithms": ^2.5.0
     "@csstools/css-tokenizer": ^2.2.3
-  checksum: 433aef06b00f1d402fd24074a1919b8e2de94245a3b780da6466c8cc9e0f3cc93d2db930f0fce36c7d6908cd50b626cd61e803d3f62dddad79eeb742858028ef
+  checksum: 10c0/433aef06b00f1d402fd24074a1919b8e2de94245a3b780da6466c8cc9e0f3cc93d2db930f0fce36c7d6908cd50b626cd61e803d3f62dddad79eeb742858028ef
   languageName: node
   linkType: hard
 
@@ -1569,14 +1569,14 @@ __metadata:
   resolution: "@csstools/selector-specificity@npm:3.0.1"
   peerDependencies:
     postcss-selector-parser: ^6.0.13
-  checksum: 4280f494726d5e38de74e28dee2ff74ec86244560dff4edeec3ddff3ac73c774c19535bd1bb70cad77949bfb359cf87e977d0ec3264591e3b7260342a20dd84f
+  checksum: 10c0/4280f494726d5e38de74e28dee2ff74ec86244560dff4edeec3ddff3ac73c774c19535bd1bb70cad77949bfb359cf87e977d0ec3264591e3b7260342a20dd84f
   languageName: node
   linkType: hard
 
 "@discoveryjs/json-ext@npm:0.5.7":
   version: 0.5.7
   resolution: "@discoveryjs/json-ext@npm:0.5.7"
-  checksum: e10f1b02b78e4812646ddf289b7d9f2cb567d336c363b266bd50cd223cf3de7c2c74018d91cd2613041568397ef3a4a2b500aba588c6e5bd78c38374ba68f38c
+  checksum: 10c0/e10f1b02b78e4812646ddf289b7d9f2cb567d336c363b266bd50cd223cf3de7c2c74018d91cd2613041568397ef3a4a2b500aba588c6e5bd78c38374ba68f38c
   languageName: node
   linkType: hard
 
@@ -1595,7 +1595,7 @@ __metadata:
     find-root: "npm:^1.1.0"
     source-map: "npm:^0.5.7"
     stylis: "npm:4.2.0"
-  checksum: 89cbb6ec0e52c8ee9c2a4b9889ccd4fc3a75d28091d835bfac6d7c4565d3338621e23af0a85f3bcd133e1cae795c692e1dadada015784d4b0554aa5bb111df43
+  checksum: 10c0/89cbb6ec0e52c8ee9c2a4b9889ccd4fc3a75d28091d835bfac6d7c4565d3338621e23af0a85f3bcd133e1cae795c692e1dadada015784d4b0554aa5bb111df43
   languageName: node
   linkType: hard
 
@@ -1608,21 +1608,21 @@ __metadata:
     "@emotion/utils": "npm:^1.2.1"
     "@emotion/weak-memoize": "npm:^0.3.1"
     stylis: "npm:4.2.0"
-  checksum: a23ab5ab2fd08e904698106d58ad3536fed51cc1aa0ef228e95bb640eaf11f560dbd91a395477b0d84e1e3c20150263764b4558517cf6576a89d2d6cc5253688
+  checksum: 10c0/a23ab5ab2fd08e904698106d58ad3536fed51cc1aa0ef228e95bb640eaf11f560dbd91a395477b0d84e1e3c20150263764b4558517cf6576a89d2d6cc5253688
   languageName: node
   linkType: hard
 
 "@emotion/hash@npm:^0.9.1":
   version: 0.9.1
   resolution: "@emotion/hash@npm:0.9.1"
-  checksum: cdafe5da63fc1137f3db6e232fdcde9188b2b47ee66c56c29137199642a4086f42382d866911cfb4833cae2cc00271ab45cad3946b024f67b527bb7fac7f4c9d
+  checksum: 10c0/cdafe5da63fc1137f3db6e232fdcde9188b2b47ee66c56c29137199642a4086f42382d866911cfb4833cae2cc00271ab45cad3946b024f67b527bb7fac7f4c9d
   languageName: node
   linkType: hard
 
 "@emotion/memoize@npm:^0.8.1":
   version: 0.8.1
   resolution: "@emotion/memoize@npm:0.8.1"
-  checksum: dffed372fc3b9fa2ba411e76af22b6bb686fb0cb07694fdfaa6dd2baeb0d5e4968c1a7caa472bfcf06a5997d5e7c7d16b90e993f9a6ffae79a2c3dbdc76dfe78
+  checksum: 10c0/dffed372fc3b9fa2ba411e76af22b6bb686fb0cb07694fdfaa6dd2baeb0d5e4968c1a7caa472bfcf06a5997d5e7c7d16b90e993f9a6ffae79a2c3dbdc76dfe78
   languageName: node
   linkType: hard
 
@@ -1643,7 +1643,7 @@ __metadata:
   peerDependenciesMeta:
     "@types/react":
       optional: true
-  checksum: 1aea4d735b537fbfbeda828bbf929488a7e1b5b7d131f14aeede8737e92bb3b611e15fec353e97f85aed7a65a1c86a695a04ba6e9be905231beef6bd624cb705
+  checksum: 10c0/1aea4d735b537fbfbeda828bbf929488a7e1b5b7d131f14aeede8737e92bb3b611e15fec353e97f85aed7a65a1c86a695a04ba6e9be905231beef6bd624cb705
   languageName: node
   linkType: hard
 
@@ -1656,21 +1656,21 @@ __metadata:
     "@emotion/unitless": "npm:^0.8.1"
     "@emotion/utils": "npm:^1.2.1"
     csstype: "npm:^3.0.2"
-  checksum: d243e0e5abce8d2183d25a32ec89bf650ee741ebadb29e6405abde05d4e2ed446ba5b3f725a29833ad709d0d08f0a5c8d0532fdcd43f4b23d931d8b6d4f218c1
+  checksum: 10c0/d243e0e5abce8d2183d25a32ec89bf650ee741ebadb29e6405abde05d4e2ed446ba5b3f725a29833ad709d0d08f0a5c8d0532fdcd43f4b23d931d8b6d4f218c1
   languageName: node
   linkType: hard
 
 "@emotion/sheet@npm:^1.2.2":
   version: 1.2.2
   resolution: "@emotion/sheet@npm:1.2.2"
-  checksum: 69827a1bfa43d7b188f1d8cea42163143a36312543fdade5257c459a2b3efd7ce386aac84ba152bc2517a4f7e54384c04800b26adb382bb284ac7e4ad40e584b
+  checksum: 10c0/69827a1bfa43d7b188f1d8cea42163143a36312543fdade5257c459a2b3efd7ce386aac84ba152bc2517a4f7e54384c04800b26adb382bb284ac7e4ad40e584b
   languageName: node
   linkType: hard
 
 "@emotion/unitless@npm:^0.8.1":
   version: 0.8.1
   resolution: "@emotion/unitless@npm:0.8.1"
-  checksum: a1ed508628288f40bfe6dd17d431ed899c067a899fa293a13afe3aed1d70fac0412b8a215fafab0b42829360db687fecd763e5f01a64ddc4a4b58ec3112ff548
+  checksum: 10c0/a1ed508628288f40bfe6dd17d431ed899c067a899fa293a13afe3aed1d70fac0412b8a215fafab0b42829360db687fecd763e5f01a64ddc4a4b58ec3112ff548
   languageName: node
   linkType: hard
 
@@ -1679,21 +1679,21 @@ __metadata:
   resolution: "@emotion/use-insertion-effect-with-fallbacks@npm:1.0.1"
   peerDependencies:
     react: ">=16.8.0"
-  checksum: a15b2167940e3a908160687b73fc4fcd81e59ab45136b6967f02c7c419d9a149acd22a416b325c389642d4f1c3d33cf4196cad6b618128b55b7c74f6807a240b
+  checksum: 10c0/a15b2167940e3a908160687b73fc4fcd81e59ab45136b6967f02c7c419d9a149acd22a416b325c389642d4f1c3d33cf4196cad6b618128b55b7c74f6807a240b
   languageName: node
   linkType: hard
 
 "@emotion/utils@npm:^1.2.1":
   version: 1.2.1
   resolution: "@emotion/utils@npm:1.2.1"
-  checksum: db43ca803361740c14dfb1cca1464d10d27f4c8b40d3e8864e6932ccf375d1450778ff4e4eadee03fb97f2aeb18de9fae98294905596a12ff7d4cd1910414d8d
+  checksum: 10c0/db43ca803361740c14dfb1cca1464d10d27f4c8b40d3e8864e6932ccf375d1450778ff4e4eadee03fb97f2aeb18de9fae98294905596a12ff7d4cd1910414d8d
   languageName: node
   linkType: hard
 
 "@emotion/weak-memoize@npm:^0.3.1":
   version: 0.3.1
   resolution: "@emotion/weak-memoize@npm:0.3.1"
-  checksum: ed514b3cb94bbacece4ac2450d98898066c0a0698bdeda256e312405ca53634cb83c75889b25cd8bbbe185c80f4c05a1f0a0091e1875460ba6be61d0334f0b8a
+  checksum: 10c0/ed514b3cb94bbacece4ac2450d98898066c0a0698bdeda256e312405ca53634cb83c75889b25cd8bbbe185c80f4c05a1f0a0091e1875460ba6be61d0334f0b8a
   languageName: node
   linkType: hard
 
@@ -1704,7 +1704,7 @@ __metadata:
     comment-parser: "npm:1.4.1"
     esquery: "npm:^1.5.0"
     jsdoc-type-pratt-parser: "npm:~4.0.0"
-  checksum: a8122762d2df3c6501a9c459e2822315a23c0078c4aeb0b40fb3c84b99e21a78e85e67f962d6b5dde5eb751792a1c67c6a170b619573db7151098a19950abe35
+  checksum: 10c0/a8122762d2df3c6501a9c459e2822315a23c0078c4aeb0b40fb3c84b99e21a78e85e67f962d6b5dde5eb751792a1c67c6a170b619573db7151098a19950abe35
   languageName: node
   linkType: hard
 
@@ -1715,14 +1715,14 @@ __metadata:
     eslint-visitor-keys: "npm:^3.3.0"
   peerDependencies:
     eslint: ^6.0.0 || ^7.0.0 || >=8.0.0
-  checksum: 7e559c4ce59cd3a06b1b5a517b593912e680a7f981ae7affab0d01d709e99cd5647019be8fafa38c350305bc32f1f7d42c7073edde2ab536c745e365f37b607e
+  checksum: 10c0/7e559c4ce59cd3a06b1b5a517b593912e680a7f981ae7affab0d01d709e99cd5647019be8fafa38c350305bc32f1f7d42c7073edde2ab536c745e365f37b607e
   languageName: node
   linkType: hard
 
 "@eslint-community/regexpp@npm:^4.5.1, @eslint-community/regexpp@npm:^4.6.1":
   version: 4.10.0
   resolution: "@eslint-community/regexpp@npm:4.10.0"
-  checksum: c5f60ef1f1ea7649fa7af0e80a5a79f64b55a8a8fa5086de4727eb4c86c652aedee407a9c143b8995d2c0b2d75c1222bec9ba5d73dbfc1f314550554f0979ef4
+  checksum: 10c0/c5f60ef1f1ea7649fa7af0e80a5a79f64b55a8a8fa5086de4727eb4c86c652aedee407a9c143b8995d2c0b2d75c1222bec9ba5d73dbfc1f314550554f0979ef4
   languageName: node
   linkType: hard
 
@@ -1739,14 +1739,14 @@ __metadata:
     js-yaml: "npm:^4.1.0"
     minimatch: "npm:^3.1.2"
     strip-json-comments: "npm:^3.1.1"
-  checksum: 32f67052b81768ae876c84569ffd562491ec5a5091b0c1e1ca1e0f3c24fb42f804952fdd0a137873bc64303ba368a71ba079a6f691cee25beee9722d94cc8573
+  checksum: 10c0/32f67052b81768ae876c84569ffd562491ec5a5091b0c1e1ca1e0f3c24fb42f804952fdd0a137873bc64303ba368a71ba079a6f691cee25beee9722d94cc8573
   languageName: node
   linkType: hard
 
 "@eslint/js@npm:8.56.0":
   version: 8.56.0
   resolution: "@eslint/js@npm:8.56.0"
-  checksum: 60b3a1cf240e2479cec9742424224465dc50e46d781da1b7f5ef240501b2d1202c225bd456207faac4b34a64f4765833345bc4ddffd00395e1db40fa8c426f5a
+  checksum: 10c0/60b3a1cf240e2479cec9742424224465dc50e46d781da1b7f5ef240501b2d1202c225bd456207faac4b34a64f4765833345bc4ddffd00395e1db40fa8c426f5a
   languageName: node
   linkType: hard
 
@@ -1755,7 +1755,7 @@ __metadata:
   resolution: "@floating-ui/core@npm:1.5.0"
   dependencies:
     "@floating-ui/utils": "npm:^0.1.3"
-  checksum: bca811cefd09c3f56c4cf58c3e94826c1ce4a0b40124e9030ddca2ef1cc68b4ddc5ba5b4d7cc94c9555aea6876d2428a77a2ae261fe5b39c79df247a9518b053
+  checksum: 10c0/bca811cefd09c3f56c4cf58c3e94826c1ce4a0b40124e9030ddca2ef1cc68b4ddc5ba5b4d7cc94c9555aea6876d2428a77a2ae261fe5b39c79df247a9518b053
   languageName: node
   linkType: hard
 
@@ -1765,14 +1765,14 @@ __metadata:
   dependencies:
     "@floating-ui/core": "npm:^1.4.2"
     "@floating-ui/utils": "npm:^0.1.3"
-  checksum: e5f30b911f939e40003851077bba441f269ae689bdc43c674bee43aa98fc6b7a5f59be432d27b7be599b1e4ab7b15c752875ea777a89cff01d157e593b78b25b
+  checksum: 10c0/e5f30b911f939e40003851077bba441f269ae689bdc43c674bee43aa98fc6b7a5f59be432d27b7be599b1e4ab7b15c752875ea777a89cff01d157e593b78b25b
   languageName: node
   linkType: hard
 
 "@floating-ui/utils@npm:^0.1.3":
   version: 0.1.6
   resolution: "@floating-ui/utils@npm:0.1.6"
-  checksum: 0a089db0e0526b89e83cb0a773a903517db5c9067cd473febfd8fa91a3a2ccbc3a835234796c1bb528def21dbb67be50e28d9c473cb58a6d90679d7e549b9c0c
+  checksum: 10c0/0a089db0e0526b89e83cb0a773a903517db5c9067cd473febfd8fa91a3a2ccbc3a835234796c1bb528def21dbb67be50e28d9c473cb58a6d90679d7e549b9c0c
   languageName: node
   linkType: hard
 
@@ -1786,7 +1786,7 @@ __metadata:
       optional: true
   bin:
     formatjs: bin/formatjs
-  checksum: ee7b0873a734e02721ce1ee107ee60845bb30855f4ca686bfb6c5e9862353249d5d20748b18db93200aabc7a59875ff062f485c64d41cb8e61f1d43e2bb5eceb
+  checksum: 10c0/ee7b0873a734e02721ce1ee107ee60845bb30855f4ca686bfb6c5e9862353249d5d20748b18db93200aabc7a59875ff062f485c64d41cb8e61f1d43e2bb5eceb
   languageName: node
   linkType: hard
 
@@ -1796,7 +1796,7 @@ __metadata:
   dependencies:
     "@formatjs/intl-localematcher": "npm:0.5.4"
     tslib: "npm:^2.4.0"
-  checksum: 87afb37dd937555e712ca85d5142a9083d617c491d1dddf8d660fdfb6186272d2bc75b78809b076388d26f016200c8bddbce73281fd707eb899da2bf3bc9b7ca
+  checksum: 10c0/87afb37dd937555e712ca85d5142a9083d617c491d1dddf8d660fdfb6186272d2bc75b78809b076388d26f016200c8bddbce73281fd707eb899da2bf3bc9b7ca
   languageName: node
   linkType: hard
 
@@ -1805,7 +1805,7 @@ __metadata:
   resolution: "@formatjs/fast-memoize@npm:2.2.0"
   dependencies:
     tslib: "npm:^2.4.0"
-  checksum: ae88c5a93b96235aba4bd9b947d0310d2ec013687a99133413361b24122b5cdea8c9bf2e04a4a2a8b61f1f4ee5419ef6416ca4796554226b5050e05a9ce6ef49
+  checksum: 10c0/ae88c5a93b96235aba4bd9b947d0310d2ec013687a99133413361b24122b5cdea8c9bf2e04a4a2a8b61f1f4ee5419ef6416ca4796554226b5050e05a9ce6ef49
   languageName: node
   linkType: hard
 
@@ -1816,7 +1816,7 @@ __metadata:
     "@formatjs/ecma402-abstract": "npm:1.18.2"
     "@formatjs/icu-skeleton-parser": "npm:1.8.0"
     tslib: "npm:^2.4.0"
-  checksum: 9fc72c2075333a969601e2be4260638940b1abefd1a5fc15b93b0b10d2319c9df5778aa51fc2a173ce66ca5e8a47b4b64caca85a32d0eb6095e16e8d65cb4b00
+  checksum: 10c0/9fc72c2075333a969601e2be4260638940b1abefd1a5fc15b93b0b10d2319c9df5778aa51fc2a173ce66ca5e8a47b4b64caca85a32d0eb6095e16e8d65cb4b00
   languageName: node
   linkType: hard
 
@@ -1826,7 +1826,7 @@ __metadata:
   dependencies:
     "@formatjs/ecma402-abstract": "npm:1.18.2"
     tslib: "npm:^2.4.0"
-  checksum: 10956732d70cc67049d216410b5dc3ef048935d1ea2ae76f5755bb9d0243af37ddeabd5d140ddbf5f6c7047068c3d02a05f93c68a89cedfaf7488d5062885ea4
+  checksum: 10c0/10956732d70cc67049d216410b5dc3ef048935d1ea2ae76f5755bb9d0243af37ddeabd5d140ddbf5f6c7047068c3d02a05f93c68a89cedfaf7488d5062885ea4
   languageName: node
   linkType: hard
 
@@ -1837,7 +1837,7 @@ __metadata:
     "@formatjs/ecma402-abstract": "npm:1.18.2"
     "@formatjs/intl-localematcher": "npm:0.5.4"
     tslib: "npm:^2.4.0"
-  checksum: 4ba40057cfafaabf04485137bc96705d5ed7ac48f17ed7dfe8dbd7f71119667b6c0b7fa75469e32b70c9bada2c5d03af37a5261d655a37b81c63ba907edbb2e8
+  checksum: 10c0/4ba40057cfafaabf04485137bc96705d5ed7ac48f17ed7dfe8dbd7f71119667b6c0b7fa75469e32b70c9bada2c5d03af37a5261d655a37b81c63ba907edbb2e8
   languageName: node
   linkType: hard
 
@@ -1848,7 +1848,7 @@ __metadata:
     "@formatjs/ecma402-abstract": "npm:1.18.2"
     "@formatjs/intl-localematcher": "npm:0.5.4"
     tslib: "npm:^2.4.0"
-  checksum: bc9d8cbe42bd9513db0b2b221c0b1a752892005a90fa629b4cf7df1cbd3b96997cddbf420e562ebdfdc691a28d9b759ccae9633d5987aa0bceed5aef77a07ca4
+  checksum: 10c0/bc9d8cbe42bd9513db0b2b221c0b1a752892005a90fa629b4cf7df1cbd3b96997cddbf420e562ebdfdc691a28d9b759ccae9633d5987aa0bceed5aef77a07ca4
   languageName: node
   linkType: hard
 
@@ -1857,7 +1857,7 @@ __metadata:
   resolution: "@formatjs/intl-localematcher@npm:0.5.4"
   dependencies:
     tslib: "npm:^2.4.0"
-  checksum: c9ff5d34ca8b6fe59f8f303a3cc31a92d343e095a6987e273e5cc23f0fe99feb557a392a05da95931c7d24106acb6988e588d00ddd05b0934005aafd7fdbafe6
+  checksum: 10c0/c9ff5d34ca8b6fe59f8f303a3cc31a92d343e095a6987e273e5cc23f0fe99feb557a392a05da95931c7d24106acb6988e588d00ddd05b0934005aafd7fdbafe6
   languageName: node
   linkType: hard
 
@@ -1868,7 +1868,7 @@ __metadata:
     "@formatjs/ecma402-abstract": "npm:1.18.2"
     "@formatjs/intl-localematcher": "npm:0.5.4"
     tslib: "npm:^2.4.0"
-  checksum: 0f4d9f4f272dd962b2f742519045ad43a1b6358755787d3394efcc5884b02184cc8d76fb13d98b1f30c41a813b81f82dd2342e1fb0fbd7b7efa69f5d0d59c4d0
+  checksum: 10c0/0f4d9f4f272dd962b2f742519045ad43a1b6358755787d3394efcc5884b02184cc8d76fb13d98b1f30c41a813b81f82dd2342e1fb0fbd7b7efa69f5d0d59c4d0
   languageName: node
   linkType: hard
 
@@ -1888,7 +1888,7 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 7566038b011116cee7069165a25836b3fb687948e61b041809a9d978ac6c0882ae8d81a624a415cfb8e43852d097cd1cbc3c6707e717928e39b75c252491a712
+  checksum: 10c0/7566038b011116cee7069165a25836b3fb687948e61b041809a9d978ac6c0882ae8d81a624a415cfb8e43852d097cd1cbc3c6707e717928e39b75c252491a712
   languageName: node
   linkType: hard
 
@@ -1908,21 +1908,21 @@ __metadata:
   peerDependenciesMeta:
     ts-jest:
       optional: true
-  checksum: 68f72ee6379b87b7ef6340e118a5370cb2fa18cbbae08f5f3d10893803a52f0533e644002e0b5e9ffeded5b2f0aa9daad6adf8b487b10f5d2b61f9fb3fed0dbd
+  checksum: 10c0/68f72ee6379b87b7ef6340e118a5370cb2fa18cbbae08f5f3d10893803a52f0533e644002e0b5e9ffeded5b2f0aa9daad6adf8b487b10f5d2b61f9fb3fed0dbd
   languageName: node
   linkType: hard
 
 "@gamestdio/websocket@npm:^0.3.2":
   version: 0.3.2
   resolution: "@gamestdio/websocket@npm:0.3.2"
-  checksum: f232411203d649fef1363bb6c83cd250adab8da2f01b568b919dee9751512b63b650d7dcd593da4a60c23f19d005124c159eba78f437a21eb8a1ebf73f63cc19
+  checksum: 10c0/f232411203d649fef1363bb6c83cd250adab8da2f01b568b919dee9751512b63b650d7dcd593da4a60c23f19d005124c159eba78f437a21eb8a1ebf73f63cc19
   languageName: node
   linkType: hard
 
 "@gar/promisify@npm:^1.0.1":
   version: 1.1.3
   resolution: "@gar/promisify@npm:1.1.3"
-  checksum: 0b3c9958d3cd17f4add3574975e3115ae05dc7f1298a60810414b16f6f558c137b5fb3cd3905df380bacfd955ec13f67c1e6710cbb5c246a7e8d65a8289b2bff
+  checksum: 10c0/0b3c9958d3cd17f4add3574975e3115ae05dc7f1298a60810414b16f6f558c137b5fb3cd3905df380bacfd955ec13f67c1e6710cbb5c246a7e8d65a8289b2bff
   languageName: node
   linkType: hard
 
@@ -1931,7 +1931,7 @@ __metadata:
   resolution: "@github/webauthn-json@npm:2.1.1"
   bin:
     webauthn-json: dist/bin/main.js
-  checksum: 4423ddd1e5b74d91ded02ea551923a73c45b1ee2ee4294943aaddfc12e1929405ea1e8b4380456db829fcdc3a4d8a89bf8ee29c6a35be3889dc00236b1c96968
+  checksum: 10c0/4423ddd1e5b74d91ded02ea551923a73c45b1ee2ee4294943aaddfc12e1929405ea1e8b4380456db829fcdc3a4d8a89bf8ee29c6a35be3889dc00236b1c96968
   languageName: node
   linkType: hard
 
@@ -1942,28 +1942,28 @@ __metadata:
     "@humanwhocodes/object-schema": "npm:^2.0.1"
     debug: "npm:^4.1.1"
     minimatch: "npm:^3.0.5"
-  checksum: d76ca802d853366094d0e98ff0d0994117fc8eff96649cd357b15e469e428228f597cd2e929d54ab089051684949955f16ee905bb19f7b2f0446fb377157be7a
+  checksum: 10c0/d76ca802d853366094d0e98ff0d0994117fc8eff96649cd357b15e469e428228f597cd2e929d54ab089051684949955f16ee905bb19f7b2f0446fb377157be7a
   languageName: node
   linkType: hard
 
 "@humanwhocodes/module-importer@npm:^1.0.1":
   version: 1.0.1
   resolution: "@humanwhocodes/module-importer@npm:1.0.1"
-  checksum: 909b69c3b86d482c26b3359db16e46a32e0fb30bd306a3c176b8313b9e7313dba0f37f519de6aa8b0a1921349e505f259d19475e123182416a506d7f87e7f529
+  checksum: 10c0/909b69c3b86d482c26b3359db16e46a32e0fb30bd306a3c176b8313b9e7313dba0f37f519de6aa8b0a1921349e505f259d19475e123182416a506d7f87e7f529
   languageName: node
   linkType: hard
 
 "@humanwhocodes/object-schema@npm:^2.0.1":
   version: 2.0.1
   resolution: "@humanwhocodes/object-schema@npm:2.0.1"
-  checksum: 9dba24e59fdb4041829d92b693aacb778add3b6f612aaa9c0774f3b650c11a378cc64f042a59da85c11dae33df456580a3c36837b953541aed6ff94294f97fac
+  checksum: 10c0/9dba24e59fdb4041829d92b693aacb778add3b6f612aaa9c0774f3b650c11a378cc64f042a59da85c11dae33df456580a3c36837b953541aed6ff94294f97fac
   languageName: node
   linkType: hard
 
 "@ioredis/commands@npm:^1.1.1":
   version: 1.2.0
   resolution: "@ioredis/commands@npm:1.2.0"
-  checksum: a5d3c29dd84d8a28b7c67a441ac1715cbd7337a7b88649c0f17c345d89aa218578d2b360760017c48149ef8a70f44b051af9ac0921a0622c2b479614c4f65b36
+  checksum: 10c0/a5d3c29dd84d8a28b7c67a441ac1715cbd7337a7b88649c0f17c345d89aa218578d2b360760017c48149ef8a70f44b051af9ac0921a0622c2b479614c4f65b36
   languageName: node
   linkType: hard
 
@@ -1977,7 +1977,7 @@ __metadata:
     strip-ansi-cjs: "npm:strip-ansi@^6.0.1"
     wrap-ansi: "npm:^8.1.0"
     wrap-ansi-cjs: "npm:wrap-ansi@^7.0.0"
-  checksum: b1bf42535d49f11dc137f18d5e4e63a28c5569de438a221c369483731e9dac9fb797af554e8bf02b6192d1e5eba6e6402cf93900c3d0ac86391d00d04876789e
+  checksum: 10c0/b1bf42535d49f11dc137f18d5e4e63a28c5569de438a221c369483731e9dac9fb797af554e8bf02b6192d1e5eba6e6402cf93900c3d0ac86391d00d04876789e
   languageName: node
   linkType: hard
 
@@ -1990,14 +1990,14 @@ __metadata:
     get-package-type: "npm:^0.1.0"
     js-yaml: "npm:^3.13.1"
     resolve-from: "npm:^5.0.0"
-  checksum: dd2a8b094887da5a1a2339543a4933d06db2e63cbbc2e288eb6431bd832065df0c099d091b6a67436e71b7d6bf85f01ce7c15f9253b4cbebcc3b9a496165ba42
+  checksum: 10c0/dd2a8b094887da5a1a2339543a4933d06db2e63cbbc2e288eb6431bd832065df0c099d091b6a67436e71b7d6bf85f01ce7c15f9253b4cbebcc3b9a496165ba42
   languageName: node
   linkType: hard
 
 "@istanbuljs/schema@npm:^0.1.2":
   version: 0.1.3
   resolution: "@istanbuljs/schema@npm:0.1.3"
-  checksum: 61c5286771676c9ca3eb2bd8a7310a9c063fb6e0e9712225c8471c582d157392c88f5353581c8c9adbe0dff98892317d2fdfc56c3499aa42e0194405206a963a
+  checksum: 10c0/61c5286771676c9ca3eb2bd8a7310a9c063fb6e0e9712225c8471c582d157392c88f5353581c8c9adbe0dff98892317d2fdfc56c3499aa42e0194405206a963a
   languageName: node
   linkType: hard
 
@@ -2011,7 +2011,7 @@ __metadata:
     jest-message-util: "npm:^29.7.0"
     jest-util: "npm:^29.7.0"
     slash: "npm:^3.0.0"
-  checksum: 7be408781d0a6f657e969cbec13b540c329671819c2f57acfad0dae9dbfe2c9be859f38fe99b35dba9ff1536937dc6ddc69fdcd2794812fa3c647a1619797f6c
+  checksum: 10c0/7be408781d0a6f657e969cbec13b540c329671819c2f57acfad0dae9dbfe2c9be859f38fe99b35dba9ff1536937dc6ddc69fdcd2794812fa3c647a1619797f6c
   languageName: node
   linkType: hard
 
@@ -2052,7 +2052,7 @@ __metadata:
   peerDependenciesMeta:
     node-notifier:
       optional: true
-  checksum: 934f7bf73190f029ac0f96662c85cd276ec460d407baf6b0dbaec2872e157db4d55a7ee0b1c43b18874602f662b37cb973dda469a4e6d88b4e4845b521adeeb2
+  checksum: 10c0/934f7bf73190f029ac0f96662c85cd276ec460d407baf6b0dbaec2872e157db4d55a7ee0b1c43b18874602f662b37cb973dda469a4e6d88b4e4845b521adeeb2
   languageName: node
   linkType: hard
 
@@ -2064,7 +2064,7 @@ __metadata:
     "@jest/types": "npm:^29.6.3"
     "@types/node": "npm:*"
     jest-mock: "npm:^29.7.0"
-  checksum: c7b1b40c618f8baf4d00609022d2afa086d9c6acc706f303a70bb4b67275868f620ad2e1a9efc5edd418906157337cce50589a627a6400bbdf117d351b91ef86
+  checksum: 10c0/c7b1b40c618f8baf4d00609022d2afa086d9c6acc706f303a70bb4b67275868f620ad2e1a9efc5edd418906157337cce50589a627a6400bbdf117d351b91ef86
   languageName: node
   linkType: hard
 
@@ -2073,7 +2073,7 @@ __metadata:
   resolution: "@jest/expect-utils@npm:29.7.0"
   dependencies:
     jest-get-type: "npm:^29.6.3"
-  checksum: 60b79d23a5358dc50d9510d726443316253ecda3a7fb8072e1526b3e0d3b14f066ee112db95699b7a43ad3f0b61b750c72e28a5a1cac361d7a2bb34747fa938a
+  checksum: 10c0/60b79d23a5358dc50d9510d726443316253ecda3a7fb8072e1526b3e0d3b14f066ee112db95699b7a43ad3f0b61b750c72e28a5a1cac361d7a2bb34747fa938a
   languageName: node
   linkType: hard
 
@@ -2083,7 +2083,7 @@ __metadata:
   dependencies:
     expect: "npm:^29.7.0"
     jest-snapshot: "npm:^29.7.0"
-  checksum: b41f193fb697d3ced134349250aed6ccea075e48c4f803159db102b826a4e473397c68c31118259868fd69a5cba70e97e1c26d2c2ff716ca39dc73a2ccec037e
+  checksum: 10c0/b41f193fb697d3ced134349250aed6ccea075e48c4f803159db102b826a4e473397c68c31118259868fd69a5cba70e97e1c26d2c2ff716ca39dc73a2ccec037e
   languageName: node
   linkType: hard
 
@@ -2097,7 +2097,7 @@ __metadata:
     jest-message-util: "npm:^29.7.0"
     jest-mock: "npm:^29.7.0"
     jest-util: "npm:^29.7.0"
-  checksum: cf0a8bcda801b28dc2e2b2ba36302200ee8104a45ad7a21e6c234148932f826cb3bc57c8df3b7b815aeea0861d7b6ca6f0d4778f93b9219398ef28749e03595c
+  checksum: 10c0/cf0a8bcda801b28dc2e2b2ba36302200ee8104a45ad7a21e6c234148932f826cb3bc57c8df3b7b815aeea0861d7b6ca6f0d4778f93b9219398ef28749e03595c
   languageName: node
   linkType: hard
 
@@ -2109,7 +2109,7 @@ __metadata:
     "@jest/expect": "npm:^29.7.0"
     "@jest/types": "npm:^29.6.3"
     jest-mock: "npm:^29.7.0"
-  checksum: a385c99396878fe6e4460c43bd7bb0a5cc52befb462cc6e7f2a3810f9e7bcce7cdeb51908fd530391ee452dc856c98baa2c5f5fa8a5b30b071d31ef7f6955cea
+  checksum: 10c0/a385c99396878fe6e4460c43bd7bb0a5cc52befb462cc6e7f2a3810f9e7bcce7cdeb51908fd530391ee452dc856c98baa2c5f5fa8a5b30b071d31ef7f6955cea
   languageName: node
   linkType: hard
 
@@ -2146,7 +2146,7 @@ __metadata:
   peerDependenciesMeta:
     node-notifier:
       optional: true
-  checksum: a754402a799541c6e5aff2c8160562525e2a47e7d568f01ebfc4da66522de39cbb809bbb0a841c7052e4270d79214e70aec3c169e4eae42a03bc1a8a20cb9fa2
+  checksum: 10c0/a754402a799541c6e5aff2c8160562525e2a47e7d568f01ebfc4da66522de39cbb809bbb0a841c7052e4270d79214e70aec3c169e4eae42a03bc1a8a20cb9fa2
   languageName: node
   linkType: hard
 
@@ -2155,7 +2155,7 @@ __metadata:
   resolution: "@jest/schemas@npm:29.6.3"
   dependencies:
     "@sinclair/typebox": "npm:^0.27.8"
-  checksum: b329e89cd5f20b9278ae1233df74016ebf7b385e0d14b9f4c1ad18d096c4c19d1e687aa113a9c976b16ec07f021ae53dea811fb8c1248a50ac34fbe009fdf6be
+  checksum: 10c0/b329e89cd5f20b9278ae1233df74016ebf7b385e0d14b9f4c1ad18d096c4c19d1e687aa113a9c976b16ec07f021ae53dea811fb8c1248a50ac34fbe009fdf6be
   languageName: node
   linkType: hard
 
@@ -2166,7 +2166,7 @@ __metadata:
     "@jridgewell/trace-mapping": "npm:^0.3.18"
     callsites: "npm:^3.0.0"
     graceful-fs: "npm:^4.2.9"
-  checksum: a2f177081830a2e8ad3f2e29e20b63bd40bade294880b595acf2fc09ec74b6a9dd98f126a2baa2bf4941acd89b13a4ade5351b3885c224107083a0059b60a219
+  checksum: 10c0/a2f177081830a2e8ad3f2e29e20b63bd40bade294880b595acf2fc09ec74b6a9dd98f126a2baa2bf4941acd89b13a4ade5351b3885c224107083a0059b60a219
   languageName: node
   linkType: hard
 
@@ -2178,7 +2178,7 @@ __metadata:
     "@jest/types": "npm:^29.6.3"
     "@types/istanbul-lib-coverage": "npm:^2.0.0"
     collect-v8-coverage: "npm:^1.0.0"
-  checksum: 7de54090e54a674ca173470b55dc1afdee994f2d70d185c80236003efd3fa2b753fff51ffcdda8e2890244c411fd2267529d42c4a50a8303755041ee493e6a04
+  checksum: 10c0/7de54090e54a674ca173470b55dc1afdee994f2d70d185c80236003efd3fa2b753fff51ffcdda8e2890244c411fd2267529d42c4a50a8303755041ee493e6a04
   languageName: node
   linkType: hard
 
@@ -2190,7 +2190,7 @@ __metadata:
     graceful-fs: "npm:^4.2.9"
     jest-haste-map: "npm:^29.7.0"
     slash: "npm:^3.0.0"
-  checksum: 593a8c4272797bb5628984486080cbf57aed09c7cfdc0a634e8c06c38c6bef329c46c0016e84555ee55d1cd1f381518cf1890990ff845524c1123720c8c1481b
+  checksum: 10c0/593a8c4272797bb5628984486080cbf57aed09c7cfdc0a634e8c06c38c6bef329c46c0016e84555ee55d1cd1f381518cf1890990ff845524c1123720c8c1481b
   languageName: node
   linkType: hard
 
@@ -2213,7 +2213,7 @@ __metadata:
     pirates: "npm:^4.0.4"
     slash: "npm:^3.0.0"
     write-file-atomic: "npm:^4.0.2"
-  checksum: 7f4a7f73dcf45dfdf280c7aa283cbac7b6e5a904813c3a93ead7e55873761fc20d5c4f0191d2019004fac6f55f061c82eb3249c2901164ad80e362e7a7ede5a6
+  checksum: 10c0/7f4a7f73dcf45dfdf280c7aa283cbac7b6e5a904813c3a93ead7e55873761fc20d5c4f0191d2019004fac6f55f061c82eb3249c2901164ad80e362e7a7ede5a6
   languageName: node
   linkType: hard
 
@@ -2227,7 +2227,7 @@ __metadata:
     "@types/node": "npm:*"
     "@types/yargs": "npm:^17.0.8"
     chalk: "npm:^4.0.0"
-  checksum: ea4e493dd3fb47933b8ccab201ae573dcc451f951dc44ed2a86123cd8541b82aa9d2b1031caf9b1080d6673c517e2dcc25a44b2dc4f3fbc37bfc965d444888c0
+  checksum: 10c0/ea4e493dd3fb47933b8ccab201ae573dcc451f951dc44ed2a86123cd8541b82aa9d2b1031caf9b1080d6673c517e2dcc25a44b2dc4f3fbc37bfc965d444888c0
   languageName: node
   linkType: hard
 
@@ -2238,21 +2238,21 @@ __metadata:
     "@jridgewell/set-array": "npm:^1.0.1"
     "@jridgewell/sourcemap-codec": "npm:^1.4.10"
     "@jridgewell/trace-mapping": "npm:^0.3.9"
-  checksum: 376fc11cf5a967318ba3ddd9d8e91be528eab6af66810a713c49b0c3f8dc67e9949452c51c38ab1b19aa618fb5e8594da5a249977e26b1e7fea1ee5a1fcacc74
+  checksum: 10c0/376fc11cf5a967318ba3ddd9d8e91be528eab6af66810a713c49b0c3f8dc67e9949452c51c38ab1b19aa618fb5e8594da5a249977e26b1e7fea1ee5a1fcacc74
   languageName: node
   linkType: hard
 
 "@jridgewell/resolve-uri@npm:^3.1.0":
   version: 3.1.1
   resolution: "@jridgewell/resolve-uri@npm:3.1.1"
-  checksum: 0dbc9e29bc640bbbdc5b9876d2859c69042bfcf1423c1e6421bcca53e826660bff4e41c7d4bcb8dbea696404231a6f902f76ba41835d049e20f2dd6cffb713bf
+  checksum: 10c0/0dbc9e29bc640bbbdc5b9876d2859c69042bfcf1423c1e6421bcca53e826660bff4e41c7d4bcb8dbea696404231a6f902f76ba41835d049e20f2dd6cffb713bf
   languageName: node
   linkType: hard
 
 "@jridgewell/set-array@npm:^1.0.1":
   version: 1.1.2
   resolution: "@jridgewell/set-array@npm:1.1.2"
-  checksum: bc7ab4c4c00470de4e7562ecac3c0c84f53e7ee8a711e546d67c47da7febe7c45cd67d4d84ee3c9b2c05ae8e872656cdded8a707a283d30bd54fbc65aef821ab
+  checksum: 10c0/bc7ab4c4c00470de4e7562ecac3c0c84f53e7ee8a711e546d67c47da7febe7c45cd67d4d84ee3c9b2c05ae8e872656cdded8a707a283d30bd54fbc65aef821ab
   languageName: node
   linkType: hard
 
@@ -2262,14 +2262,14 @@ __metadata:
   dependencies:
     "@jridgewell/gen-mapping": "npm:^0.3.0"
     "@jridgewell/trace-mapping": "npm:^0.3.9"
-  checksum: b985d9ebd833a21a6e9ace820c8a76f60345a34d9e28d98497c16b6e93ce1f131bff0abd45f8585f14aa382cce678ed680d628c631b40a9616a19cfbc2049b68
+  checksum: 10c0/b985d9ebd833a21a6e9ace820c8a76f60345a34d9e28d98497c16b6e93ce1f131bff0abd45f8585f14aa382cce678ed680d628c631b40a9616a19cfbc2049b68
   languageName: node
   linkType: hard
 
 "@jridgewell/sourcemap-codec@npm:^1.4.10, @jridgewell/sourcemap-codec@npm:^1.4.14, @jridgewell/sourcemap-codec@npm:^1.4.15":
   version: 1.4.15
   resolution: "@jridgewell/sourcemap-codec@npm:1.4.15"
-  checksum: 0c6b5ae663087558039052a626d2d7ed5208da36cfd707dcc5cea4a07cfc918248403dcb5989a8f7afaf245ce0573b7cc6fd94c4a30453bd10e44d9363940ba5
+  checksum: 10c0/0c6b5ae663087558039052a626d2d7ed5208da36cfd707dcc5cea4a07cfc918248403dcb5989a8f7afaf245ce0573b7cc6fd94c4a30453bd10e44d9363940ba5
   languageName: node
   linkType: hard
 
@@ -2279,7 +2279,7 @@ __metadata:
   dependencies:
     "@jridgewell/resolve-uri": "npm:^3.1.0"
     "@jridgewell/sourcemap-codec": "npm:^1.4.14"
-  checksum: 0ea0b2675cf513ec44dc25605616a3c9b808b9832e74b5b63c44260d66b58558bba65764f81928fc1033ead911f8718dca1134049c3e7a93937faf436671df31
+  checksum: 10c0/0ea0b2675cf513ec44dc25605616a3c9b808b9832e74b5b63c44260d66b58558bba65764f81928fc1033ead911f8718dca1134049c3e7a93937faf436671df31
   languageName: node
   linkType: hard
 
@@ -2495,14 +2495,14 @@ __metadata:
   dependencies:
     "@nodelib/fs.stat": "npm:2.0.5"
     run-parallel: "npm:^1.1.9"
-  checksum: 732c3b6d1b1e967440e65f284bd06e5821fedf10a1bea9ed2bb75956ea1f30e08c44d3def9d6a230666574edbaf136f8cfd319c14fd1f87c66e6a44449afb2eb
+  checksum: 10c0/732c3b6d1b1e967440e65f284bd06e5821fedf10a1bea9ed2bb75956ea1f30e08c44d3def9d6a230666574edbaf136f8cfd319c14fd1f87c66e6a44449afb2eb
   languageName: node
   linkType: hard
 
 "@nodelib/fs.stat@npm:2.0.5, @nodelib/fs.stat@npm:^2.0.2":
   version: 2.0.5
   resolution: "@nodelib/fs.stat@npm:2.0.5"
-  checksum: 88dafe5e3e29a388b07264680dc996c17f4bda48d163a9d4f5c1112979f0ce8ec72aa7116122c350b4e7976bc5566dc3ddb579be1ceaacc727872eb4ed93926d
+  checksum: 10c0/88dafe5e3e29a388b07264680dc996c17f4bda48d163a9d4f5c1112979f0ce8ec72aa7116122c350b4e7976bc5566dc3ddb579be1ceaacc727872eb4ed93926d
   languageName: node
   linkType: hard
 
@@ -2512,7 +2512,7 @@ __metadata:
   dependencies:
     "@nodelib/fs.scandir": "npm:2.1.5"
     fastq: "npm:^1.6.0"
-  checksum: db9de047c3bb9b51f9335a7bb46f4fcfb6829fb628318c12115fbaf7d369bfce71c15b103d1fc3b464812d936220ee9bc1c8f762d032c9f6be9acc99249095b1
+  checksum: 10c0/db9de047c3bb9b51f9335a7bb46f4fcfb6829fb628318c12115fbaf7d369bfce71c15b103d1fc3b464812d936220ee9bc1c8f762d032c9f6be9acc99249095b1
   languageName: node
   linkType: hard
 
@@ -2525,7 +2525,7 @@ __metadata:
     https-proxy-agent: "npm:^7.0.1"
     lru-cache: "npm:^10.0.1"
     socks-proxy-agent: "npm:^8.0.1"
-  checksum: 7b89590598476dda88e79c473766b67c682aae6e0ab0213491daa6083dcc0c171f86b3868f5506f22c09aa5ea69ad7dfb78f4bf39a8dca375d89a42f408645b3
+  checksum: 10c0/7b89590598476dda88e79c473766b67c682aae6e0ab0213491daa6083dcc0c171f86b3868f5506f22c09aa5ea69ad7dfb78f4bf39a8dca375d89a42f408645b3
   languageName: node
   linkType: hard
 
@@ -2535,7 +2535,7 @@ __metadata:
   dependencies:
     "@gar/promisify": "npm:^1.0.1"
     semver: "npm:^7.3.5"
-  checksum: 4143c317a7542af9054018b71601e3c3392e6704e884561229695f099a71336cbd580df9a9ffb965d0024bf0ed593189ab58900fd1714baef1c9ee59c738c3e2
+  checksum: 10c0/4143c317a7542af9054018b71601e3c3392e6704e884561229695f099a71336cbd580df9a9ffb965d0024bf0ed593189ab58900fd1714baef1c9ee59c738c3e2
   languageName: node
   linkType: hard
 
@@ -2544,7 +2544,7 @@ __metadata:
   resolution: "@npmcli/fs@npm:3.1.0"
   dependencies:
     semver: "npm:^7.3.5"
-  checksum: 162b4a0b8705cd6f5c2470b851d1dc6cd228c86d2170e1769d738c1fbb69a87160901411c3c035331e9e99db72f1f1099a8b734bf1637cc32b9a5be1660e4e1e
+  checksum: 10c0/162b4a0b8705cd6f5c2470b851d1dc6cd228c86d2170e1769d738c1fbb69a87160901411c3c035331e9e99db72f1f1099a8b734bf1637cc32b9a5be1660e4e1e
   languageName: node
   linkType: hard
 
@@ -2554,21 +2554,21 @@ __metadata:
   dependencies:
     mkdirp: "npm:^1.0.4"
     rimraf: "npm:^3.0.2"
-  checksum: 02e946f3dafcc6743132fe2e0e2b585a96ca7265653a38df5a3e53fcf26c7c7a57fc0f861d7c689a23fdb6d6836c7eea5050c8086abf3c994feb2208d1514ff0
+  checksum: 10c0/02e946f3dafcc6743132fe2e0e2b585a96ca7265653a38df5a3e53fcf26c7c7a57fc0f861d7c689a23fdb6d6836c7eea5050c8086abf3c994feb2208d1514ff0
   languageName: node
   linkType: hard
 
 "@opentelemetry/api@npm:^1.4.0":
   version: 1.6.0
   resolution: "@opentelemetry/api@npm:1.6.0"
-  checksum: f419853358fdd7d9bad51dfeea5a676d7894e7983633448d1022b867e979bc28083181e000e477ee53efda97895dd6a357e15392ac39ac8dfdc42dd194e0f17e
+  checksum: 10c0/f419853358fdd7d9bad51dfeea5a676d7894e7983633448d1022b867e979bc28083181e000e477ee53efda97895dd6a357e15392ac39ac8dfdc42dd194e0f17e
   languageName: node
   linkType: hard
 
 "@pkgjs/parseargs@npm:^0.11.0":
   version: 0.11.0
   resolution: "@pkgjs/parseargs@npm:0.11.0"
-  checksum: 5bd7576bb1b38a47a7fc7b51ac9f38748e772beebc56200450c4a817d712232b8f1d3ef70532c80840243c657d491cf6a6be1e3a214cff907645819fdc34aadd
+  checksum: 10c0/5bd7576bb1b38a47a7fc7b51ac9f38748e772beebc56200450c4a817d712232b8f1d3ef70532c80840243c657d491cf6a6be1e3a214cff907645819fdc34aadd
   languageName: node
   linkType: hard
 
@@ -2582,28 +2582,28 @@ __metadata:
     open: "npm:^9.1.0"
     picocolors: "npm:^1.0.0"
     tslib: "npm:^2.6.0"
-  checksum: 7c3e68f6405a1d4c51f418d8d580e71d7bade2683d5db07e8413d8e57f7e389047eda44a2341f77a1b3085895fca7676a9d45e8812a58312524f8c4c65d501be
+  checksum: 10c0/7c3e68f6405a1d4c51f418d8d580e71d7bade2683d5db07e8413d8e57f7e389047eda44a2341f77a1b3085895fca7676a9d45e8812a58312524f8c4c65d501be
   languageName: node
   linkType: hard
 
 "@polka/url@npm:^1.0.0-next.20":
   version: 1.0.0-next.21
   resolution: "@polka/url@npm:1.0.0-next.21"
-  checksum: 53c1f28683a075aac41f8ce2a54eb952b6bc67a03494b2dca1cb63d833a6da898cea6a92df8e1e6b680db985fb7f9c16e11c20afa6584bcdda68a16fb4c18737
+  checksum: 10c0/53c1f28683a075aac41f8ce2a54eb952b6bc67a03494b2dca1cb63d833a6da898cea6a92df8e1e6b680db985fb7f9c16e11c20afa6584bcdda68a16fb4c18737
   languageName: node
   linkType: hard
 
 "@popperjs/core@npm:^2.11.6":
   version: 2.11.8
   resolution: "@popperjs/core@npm:2.11.8"
-  checksum: 4681e682abc006d25eb380d0cf3efc7557043f53b6aea7a5057d0d1e7df849a00e281cd8ea79c902a35a414d7919621fc2ba293ecec05f413598e0b23d5a1e63
+  checksum: 10c0/4681e682abc006d25eb380d0cf3efc7557043f53b6aea7a5057d0d1e7df849a00e281cd8ea79c902a35a414d7919621fc2ba293ecec05f413598e0b23d5a1e63
   languageName: node
   linkType: hard
 
 "@rails/ujs@npm:^7.1.1":
   version: 7.1.3
   resolution: "@rails/ujs@npm:7.1.3"
-  checksum: 68112d9add9dbc59b40c2ec1bc095a67445c57d20d0ab7d817ce3de0cd90374e2690af8ad54ce6ecc2d1c748b34c0c44d0fbd2f515ce2c443d7c5d23d00b9ce5
+  checksum: 10c0/68112d9add9dbc59b40c2ec1bc095a67445c57d20d0ab7d817ce3de0cd90374e2690af8ad54ce6ecc2d1c748b34c0c44d0fbd2f515ce2c443d7c5d23d00b9ce5
   languageName: node
   linkType: hard
 
@@ -2623,7 +2623,7 @@ __metadata:
       optional: true
     react-redux:
       optional: true
-  checksum: 4ea9e9ea8cc2cab1c997127dc332c165cebc55bf8e95812ba4dc40d48dd87d5ee4bf3316b9eab49b5cce056eda6bdcb4b2a7dc3a15f056f64f76134f148f9f10
+  checksum: 10c0/4ea9e9ea8cc2cab1c997127dc332c165cebc55bf8e95812ba4dc40d48dd87d5ee4bf3316b9eab49b5cce056eda6bdcb4b2a7dc3a15f056f64f76134f148f9f10
   languageName: node
   linkType: hard
 
@@ -2634,7 +2634,7 @@ __metadata:
     dequal: "npm:^2.0.2"
   peerDependencies:
     react: ">=16.8.0"
-  checksum: 2f34918bc3174a399b9d7f0f43abec505a494da33f787e612581a35b71fdc3ca5064772e991ac4a6991db31ce3e1fde0e1facbe24e80489a44e1a09f79d7a619
+  checksum: 10c0/2f34918bc3174a399b9d7f0f43abec505a494da33f787e612581a35b71fdc3ca5064772e991ac4a6991db31ce3e1fde0e1facbe24e80489a44e1a09f79d7a619
   languageName: node
   linkType: hard
 
@@ -2651,7 +2651,7 @@ __metadata:
   peerDependenciesMeta:
     "@types/babel__core":
       optional: true
-  checksum: 2766134dd5567c0d4fd6909d1f511ce9bf3bd9d727e1bc5ffdd6097a3606faca324107ae8e0961839ee4dbb45e5e579ae601efe472fc0a271259aea79920cafa
+  checksum: 10c0/2766134dd5567c0d4fd6909d1f511ce9bf3bd9d727e1bc5ffdd6097a3606faca324107ae8e0961839ee4dbb45e5e579ae601efe472fc0a271259aea79920cafa
   languageName: node
   linkType: hard
 
@@ -2667,7 +2667,7 @@ __metadata:
     resolve: "npm:^1.19.0"
   peerDependencies:
     rollup: ^1.20.0||^2.0.0
-  checksum: a8226b01352ee1f7133b1b59b3906267e11c99020a55e3b7a313e03889f790d1cd94e7f7769d3963261e897c3265082533ba595976f8e3f08cf70aa88bf1ddd7
+  checksum: 10c0/a8226b01352ee1f7133b1b59b3906267e11c99020a55e3b7a313e03889f790d1cd94e7f7769d3963261e897c3265082533ba595976f8e3f08cf70aa88bf1ddd7
   languageName: node
   linkType: hard
 
@@ -2679,7 +2679,7 @@ __metadata:
     magic-string: "npm:^0.25.7"
   peerDependencies:
     rollup: ^1.20.0 || ^2.0.0
-  checksum: ea3d27291c791661638b91809d0247dde1ee71be0b16fa7060078c2700db3669eada2c3978ea979b917b29ebe06f3fddc8797feae554da966264a22142b5771a
+  checksum: 10c0/ea3d27291c791661638b91809d0247dde1ee71be0b16fa7060078c2700db3669eada2c3978ea979b917b29ebe06f3fddc8797feae554da966264a22142b5771a
   languageName: node
   linkType: hard
 
@@ -2692,14 +2692,14 @@ __metadata:
     picomatch: "npm:^2.2.2"
   peerDependencies:
     rollup: ^1.20.0||^2.0.0
-  checksum: 7151753160d15ba2b259461a6c25b3932150994ea52dba8fd3144f634c7647c2e56733d986e2c15de67c4d96a9ee7d6278efa6d2e626a7169898fd64adc0f90c
+  checksum: 10c0/7151753160d15ba2b259461a6c25b3932150994ea52dba8fd3144f634c7647c2e56733d986e2c15de67c4d96a9ee7d6278efa6d2e626a7169898fd64adc0f90c
   languageName: node
   linkType: hard
 
 "@sinclair/typebox@npm:^0.27.8":
   version: 0.27.8
   resolution: "@sinclair/typebox@npm:0.27.8"
-  checksum: ef6351ae073c45c2ac89494dbb3e1f87cc60a93ce4cde797b782812b6f97da0d620ae81973f104b43c9b7eaa789ad20ba4f6a1359f1cc62f63729a55a7d22d4e
+  checksum: 10c0/ef6351ae073c45c2ac89494dbb3e1f87cc60a93ce4cde797b782812b6f97da0d620ae81973f104b43c9b7eaa789ad20ba4f6a1359f1cc62f63729a55a7d22d4e
   languageName: node
   linkType: hard
 
@@ -2708,7 +2708,7 @@ __metadata:
   resolution: "@sinonjs/commons@npm:3.0.0"
   dependencies:
     type-detect: "npm:4.0.8"
-  checksum: 1df9cd257942f4e4960dfb9fd339d9e97b6a3da135f3d5b8646562918e863809cb8e00268535f4f4723535d2097881c8fc03d545c414d8555183376cfc54ee84
+  checksum: 10c0/1df9cd257942f4e4960dfb9fd339d9e97b6a3da135f3d5b8646562918e863809cb8e00268535f4f4723535d2097881c8fc03d545c414d8555183376cfc54ee84
   languageName: node
   linkType: hard
 
@@ -2717,7 +2717,7 @@ __metadata:
   resolution: "@sinonjs/fake-timers@npm:10.3.0"
   dependencies:
     "@sinonjs/commons": "npm:^3.0.0"
-  checksum: 2e2fb6cc57f227912814085b7b01fede050cd4746ea8d49a1e44d5a0e56a804663b0340ae2f11af7559ea9bf4d087a11f2f646197a660ea3cb04e19efc04aa63
+  checksum: 10c0/2e2fb6cc57f227912814085b7b01fede050cd4746ea8d49a1e44d5a0e56a804663b0340ae2f11af7559ea9bf4d087a11f2f646197a660ea3cb04e19efc04aa63
   languageName: node
   linkType: hard
 
@@ -2729,63 +2729,63 @@ __metadata:
     json5: "npm:^2.2.0"
     magic-string: "npm:^0.25.0"
     string.prototype.matchall: "npm:^4.0.6"
-  checksum: 4f36a7488cdae2907053a48231430e8e9aa8f1903a96131bf8325786afba3224011f9120164cae75043558bd051881050b071958388fe477927d340b1cc1a066
+  checksum: 10c0/4f36a7488cdae2907053a48231430e8e9aa8f1903a96131bf8325786afba3224011f9120164cae75043558bd051881050b071958388fe477927d340b1cc1a066
   languageName: node
   linkType: hard
 
 "@svgr/babel-plugin-add-jsx-attribute@npm:^5.4.0":
   version: 5.4.0
   resolution: "@svgr/babel-plugin-add-jsx-attribute@npm:5.4.0"
-  checksum: f7f7681f0353a265c85a9fa0a6682c2c39c2eba35d6c855bbf25ea9739b339bf1fdd826b61fb3875642bf607c77bf41e6a66a97a4f07fb6e84bd521a363749e5
+  checksum: 10c0/f7f7681f0353a265c85a9fa0a6682c2c39c2eba35d6c855bbf25ea9739b339bf1fdd826b61fb3875642bf607c77bf41e6a66a97a4f07fb6e84bd521a363749e5
   languageName: node
   linkType: hard
 
 "@svgr/babel-plugin-remove-jsx-attribute@npm:^5.4.0":
   version: 5.4.0
   resolution: "@svgr/babel-plugin-remove-jsx-attribute@npm:5.4.0"
-  checksum: 0562c4c1597aecab0248fbd250e45e630de373307468568b7508c78d315a93f29920dffad2f5f54aad8e2aad9da440e16867e54961f3e6402d9855e5fc836948
+  checksum: 10c0/0562c4c1597aecab0248fbd250e45e630de373307468568b7508c78d315a93f29920dffad2f5f54aad8e2aad9da440e16867e54961f3e6402d9855e5fc836948
   languageName: node
   linkType: hard
 
 "@svgr/babel-plugin-remove-jsx-empty-expression@npm:^5.0.1":
   version: 5.0.1
   resolution: "@svgr/babel-plugin-remove-jsx-empty-expression@npm:5.0.1"
-  checksum: 80e2d736528ee553f54916acb9a9a0414e4a06730df420fb2a14788446125728abcb5125bfca6b15ce6fd99771397160f02ec95828871777c1a7803fcf258a44
+  checksum: 10c0/80e2d736528ee553f54916acb9a9a0414e4a06730df420fb2a14788446125728abcb5125bfca6b15ce6fd99771397160f02ec95828871777c1a7803fcf258a44
   languageName: node
   linkType: hard
 
 "@svgr/babel-plugin-replace-jsx-attribute-value@npm:^5.0.1":
   version: 5.0.1
   resolution: "@svgr/babel-plugin-replace-jsx-attribute-value@npm:5.0.1"
-  checksum: fb9e267ba961a0daf1f37f2954552617e09ad1d8e97f033aefc28d2a7d7824831318a5324e8e873341b53c9bb10a0c266665c7871251fd0dd2a8294fe1546fac
+  checksum: 10c0/fb9e267ba961a0daf1f37f2954552617e09ad1d8e97f033aefc28d2a7d7824831318a5324e8e873341b53c9bb10a0c266665c7871251fd0dd2a8294fe1546fac
   languageName: node
   linkType: hard
 
 "@svgr/babel-plugin-svg-dynamic-title@npm:^5.4.0":
   version: 5.4.0
   resolution: "@svgr/babel-plugin-svg-dynamic-title@npm:5.4.0"
-  checksum: e6d1a1ef2f4b91473152bf5153a6857585857e7f0e7897df2d18e14d567811814a5590c9d10d80cf3f2964a5b7bd93d3e4cbd15c8d006c5dd83d4e6839646636
+  checksum: 10c0/e6d1a1ef2f4b91473152bf5153a6857585857e7f0e7897df2d18e14d567811814a5590c9d10d80cf3f2964a5b7bd93d3e4cbd15c8d006c5dd83d4e6839646636
   languageName: node
   linkType: hard
 
 "@svgr/babel-plugin-svg-em-dimensions@npm:^5.4.0":
   version: 5.4.0
   resolution: "@svgr/babel-plugin-svg-em-dimensions@npm:5.4.0"
-  checksum: 1dc247f376ed110d1407b96c1c919c0bfa2907cd02b2eaa98d40209f21f1ff3602a46f0eb0528e514826a843dc411c06ed251cf8c691efbc961f0cbe0aaf860d
+  checksum: 10c0/1dc247f376ed110d1407b96c1c919c0bfa2907cd02b2eaa98d40209f21f1ff3602a46f0eb0528e514826a843dc411c06ed251cf8c691efbc961f0cbe0aaf860d
   languageName: node
   linkType: hard
 
 "@svgr/babel-plugin-transform-react-native-svg@npm:^5.4.0":
   version: 5.4.0
   resolution: "@svgr/babel-plugin-transform-react-native-svg@npm:5.4.0"
-  checksum: 3ad2f074d0e5857d07758492d0c98d1d862f2def9fab48939c69c5a3c4387065d01b0e8ac62c53a402a9ce09ed3de099bdf41cd2a597e7d58ddf47fb3a3b2c3e
+  checksum: 10c0/3ad2f074d0e5857d07758492d0c98d1d862f2def9fab48939c69c5a3c4387065d01b0e8ac62c53a402a9ce09ed3de099bdf41cd2a597e7d58ddf47fb3a3b2c3e
   languageName: node
   linkType: hard
 
 "@svgr/babel-plugin-transform-svg-component@npm:^5.5.0":
   version: 5.5.0
   resolution: "@svgr/babel-plugin-transform-svg-component@npm:5.5.0"
-  checksum: 73bfb09933d4a85a0ee8ec364684a0915a9ce05e668d024c073369cc36d78dcde41ddcdb493dde6440f5ee5649ed75b95ac8add226eaee32b20dc54894ac2974
+  checksum: 10c0/73bfb09933d4a85a0ee8ec364684a0915a9ce05e668d024c073369cc36d78dcde41ddcdb493dde6440f5ee5649ed75b95ac8add226eaee32b20dc54894ac2974
   languageName: node
   linkType: hard
 
@@ -2801,7 +2801,7 @@ __metadata:
     "@svgr/babel-plugin-svg-em-dimensions": "npm:^5.4.0"
     "@svgr/babel-plugin-transform-react-native-svg": "npm:^5.4.0"
     "@svgr/babel-plugin-transform-svg-component": "npm:^5.5.0"
-  checksum: a737592044ee3aea22506fa7178464fc0e1e6e6f3005cbc8db12d6963f18b8a097c97a2d4ede93dd1d3309074f84f47272924614cd74d2c7900c649f0356e349
+  checksum: 10c0/a737592044ee3aea22506fa7178464fc0e1e6e6f3005cbc8db12d6963f18b8a097c97a2d4ede93dd1d3309074f84f47272924614cd74d2c7900c649f0356e349
   languageName: node
   linkType: hard
 
@@ -2812,7 +2812,7 @@ __metadata:
     "@svgr/plugin-jsx": "npm:^5.5.0"
     camelcase: "npm:^6.2.0"
     cosmiconfig: "npm:^7.0.0"
-  checksum: a8f8ac7f829ea92a6d0305c746afb33feba3b1c7000e6f22d83b8bad13fdcd5aacc3ebde60330368830eebf23ff3090ddd3ef959d41a90d694f4b7914aea6686
+  checksum: 10c0/a8f8ac7f829ea92a6d0305c746afb33feba3b1c7000e6f22d83b8bad13fdcd5aacc3ebde60330368830eebf23ff3090ddd3ef959d41a90d694f4b7914aea6686
   languageName: node
   linkType: hard
 
@@ -2821,7 +2821,7 @@ __metadata:
   resolution: "@svgr/hast-util-to-babel-ast@npm:5.5.0"
   dependencies:
     "@babel/types": "npm:^7.12.6"
-  checksum: 1758afd99594b094ec3d0966ba0e81e5ca8acea075801b8a93c5e97269b046eca1fd8dac7c7efbc3b5775e2496adb6880530fd1d6ccaaf8792afd567773a4f64
+  checksum: 10c0/1758afd99594b094ec3d0966ba0e81e5ca8acea075801b8a93c5e97269b046eca1fd8dac7c7efbc3b5775e2496adb6880530fd1d6ccaaf8792afd567773a4f64
   languageName: node
   linkType: hard
 
@@ -2833,7 +2833,7 @@ __metadata:
     "@svgr/babel-preset": "npm:^5.5.0"
     "@svgr/hast-util-to-babel-ast": "npm:^5.5.0"
     svg-parser: "npm:^2.0.2"
-  checksum: 96f84139dae94cdda7e24896ab23e9d41e699fc8ecbbd11e280604eb7a67dfec55f126ec12ea3c622b8df6b0fccce5eb261d96f6ca8c59366d3963f13e411ec6
+  checksum: 10c0/96f84139dae94cdda7e24896ab23e9d41e699fc8ecbbd11e280604eb7a67dfec55f126ec12ea3c622b8df6b0fccce5eb261d96f6ca8c59366d3963f13e411ec6
   languageName: node
   linkType: hard
 
@@ -2844,7 +2844,7 @@ __metadata:
     cosmiconfig: "npm:^7.0.0"
     deepmerge: "npm:^4.2.2"
     svgo: "npm:^1.2.2"
-  checksum: 7494f7417ac339422f4eb2219489badaa51cdd79de2b5b3ff772c602036c5a38faf92fdefaab47414175f7c83406c4db195c35e619aae88d0573d7b199ec4503
+  checksum: 10c0/7494f7417ac339422f4eb2219489badaa51cdd79de2b5b3ff772c602036c5a38faf92fdefaab47414175f7c83406c4db195c35e619aae88d0573d7b199ec4503
   languageName: node
   linkType: hard
 
@@ -2860,7 +2860,7 @@ __metadata:
     "@svgr/plugin-jsx": "npm:^5.5.0"
     "@svgr/plugin-svgo": "npm:^5.5.0"
     loader-utils: "npm:^2.0.0"
-  checksum: 0313712a1892f387d8c425652239dd635269241b18e7e6f9aad6a339cbe887ebec813d146df23407229384ac5e9d6527f3571aa2fc9dcb30e32006c9eb918663
+  checksum: 10c0/0313712a1892f387d8c425652239dd635269241b18e7e6f9aad6a339cbe887ebec813d146df23407229384ac5e9d6527f3571aa2fc9dcb30e32006c9eb918663
   languageName: node
   linkType: hard
 
@@ -2876,7 +2876,7 @@ __metadata:
     dom-accessibility-api: "npm:^0.5.9"
     lz-string: "npm:^1.5.0"
     pretty-format: "npm:^27.0.2"
-  checksum: 25d1deddba014c107fd9703181fbb7063ed376d3ad42d7918ee752e7e677edfb5abaf672b22afc5257ffe760c9c7e5cc981656297c328bc61578d23c6b65b4dc
+  checksum: 10c0/25d1deddba014c107fd9703181fbb7063ed376d3ad42d7918ee752e7e677edfb5abaf672b22afc5257ffe760c9c7e5cc981656297c328bc61578d23c6b65b4dc
   languageName: node
   linkType: hard
 
@@ -2909,7 +2909,7 @@ __metadata:
       optional: true
     vitest:
       optional: true
-  checksum: 6b7eba9ca388986a721fb12f84adf0f5534bf7ec5851982023a889c4a0afac6e9e91291bdac39e1f59a05adefd7727e30463d98b21c3da32fbfec229ccb11ef1
+  checksum: 10c0/6b7eba9ca388986a721fb12f84adf0f5534bf7ec5851982023a889c4a0afac6e9e91291bdac39e1f59a05adefd7727e30463d98b21c3da32fbfec229ccb11ef1
   languageName: node
   linkType: hard
 
@@ -2923,28 +2923,28 @@ __metadata:
   peerDependencies:
     react: ^18.0.0
     react-dom: ^18.0.0
-  checksum: b5b0990d3aa0ea8b37c55804e0d5d584fc638a5c7d4df90da9a0fdb00bc981b27b6991468b2dc719982a5d0b0107a41596063ce51ad519eeab47b22bc04d6779
+  checksum: 10c0/b5b0990d3aa0ea8b37c55804e0d5d584fc638a5c7d4df90da9a0fdb00bc981b27b6991468b2dc719982a5d0b0107a41596063ce51ad519eeab47b22bc04d6779
   languageName: node
   linkType: hard
 
 "@tootallnate/once@npm:2":
   version: 2.0.0
   resolution: "@tootallnate/once@npm:2.0.0"
-  checksum: 073bfa548026b1ebaf1659eb8961e526be22fa77139b10d60e712f46d2f0f05f4e6c8bec62a087d41088ee9e29faa7f54838568e475ab2f776171003c3920858
+  checksum: 10c0/073bfa548026b1ebaf1659eb8961e526be22fa77139b10d60e712f46d2f0f05f4e6c8bec62a087d41088ee9e29faa7f54838568e475ab2f776171003c3920858
   languageName: node
   linkType: hard
 
 "@trysound/sax@npm:0.2.0":
   version: 0.2.0
   resolution: "@trysound/sax@npm:0.2.0"
-  checksum: 44907308549ce775a41c38a815f747009ac45929a45d642b836aa6b0a536e4978d30b8d7d680bbd116e9dd73b7dbe2ef0d1369dcfc2d09e83ba381e485ecbe12
+  checksum: 10c0/44907308549ce775a41c38a815f747009ac45929a45d642b836aa6b0a536e4978d30b8d7d680bbd116e9dd73b7dbe2ef0d1369dcfc2d09e83ba381e485ecbe12
   languageName: node
   linkType: hard
 
 "@types/aria-query@npm:^5.0.1":
   version: 5.0.1
   resolution: "@types/aria-query@npm:5.0.1"
-  checksum: bc9e40ce37bd3a1654948778c7829bd55aea1bc5f2cd06fcf6cd650b07bb388995799e9aab6e2d93a6cf55dcba3b85c155f7ba93adefcc7c2e152fc6057061b5
+  checksum: 10c0/bc9e40ce37bd3a1654948778c7829bd55aea1bc5f2cd06fcf6cd650b07bb388995799e9aab6e2d93a6cf55dcba3b85c155f7ba93adefcc7c2e152fc6057061b5
   languageName: node
   linkType: hard
 
@@ -2957,7 +2957,7 @@ __metadata:
     "@types/babel__generator": "npm:*"
     "@types/babel__template": "npm:*"
     "@types/babel__traverse": "npm:*"
-  checksum: bdee3bb69951e833a4b811b8ee9356b69a61ed5b7a23e1a081ec9249769117fa83aaaf023bb06562a038eb5845155ff663e2d5c75dd95c1d5ccc91db012868ff
+  checksum: 10c0/bdee3bb69951e833a4b811b8ee9356b69a61ed5b7a23e1a081ec9249769117fa83aaaf023bb06562a038eb5845155ff663e2d5c75dd95c1d5ccc91db012868ff
   languageName: node
   linkType: hard
 
@@ -2966,7 +2966,7 @@ __metadata:
   resolution: "@types/babel__generator@npm:7.6.6"
   dependencies:
     "@babel/types": "npm:^7.0.0"
-  checksum: 214d8b170e0eb04282d0e9dfda2c27116f64751729479786c2bf1b7ec22a5e9e5bbeb70585f047b0fd580d7d8948dc2108223c5a16e998d9674de0582d4e23d7
+  checksum: 10c0/214d8b170e0eb04282d0e9dfda2c27116f64751729479786c2bf1b7ec22a5e9e5bbeb70585f047b0fd580d7d8948dc2108223c5a16e998d9674de0582d4e23d7
   languageName: node
   linkType: hard
 
@@ -2975,7 +2975,7 @@ __metadata:
   resolution: "@types/babel__helper-plugin-utils@npm:7.10.2"
   dependencies:
     "@types/babel__core": "npm:*"
-  checksum: 1c544e33b30ccfc02254b9fe090c52880c8bb05e5406f525bfdce71ce34e93677276f788b93e9fa5e1a16f6317b97e59a07d8a92bf4726d8f4639a0045ebb590
+  checksum: 10c0/1c544e33b30ccfc02254b9fe090c52880c8bb05e5406f525bfdce71ce34e93677276f788b93e9fa5e1a16f6317b97e59a07d8a92bf4726d8f4639a0045ebb590
   languageName: node
   linkType: hard
 
@@ -2985,7 +2985,7 @@ __metadata:
   dependencies:
     "@babel/parser": "npm:^7.1.0"
     "@babel/types": "npm:^7.0.0"
-  checksum: f989bd918e1ebfcc6e68c72a3818b7518049673c4e7ba31b11c10d5d3064261c534f3d2f3097f82f80d5fc58f56f3633c21ddf0332552a926a488c105d042c45
+  checksum: 10c0/f989bd918e1ebfcc6e68c72a3818b7518049673c4e7ba31b11c10d5d3064261c534f3d2f3097f82f80d5fc58f56f3633c21ddf0332552a926a488c105d042c45
   languageName: node
   linkType: hard
 
@@ -2994,7 +2994,7 @@ __metadata:
   resolution: "@types/babel__traverse@npm:7.20.3"
   dependencies:
     "@babel/types": "npm:^7.20.7"
-  checksum: 295ed9b837e62e17ee43be0df45d90fff5208986bd43af593c9020d152d3b2c55328e038c2f8585926b63cc22f887f28bf3f4c805aa881e2dd0bdd5ead92ece0
+  checksum: 10c0/295ed9b837e62e17ee43be0df45d90fff5208986bd43af593c9020d152d3b2c55328e038c2f8585926b63cc22f887f28bf3f4c805aa881e2dd0bdd5ead92ece0
   languageName: node
   linkType: hard
 
@@ -3004,7 +3004,7 @@ __metadata:
   dependencies:
     "@types/connect": "npm:*"
     "@types/node": "npm:*"
-  checksum: aebeb200f25e8818d8cf39cd0209026750d77c9b85381cdd8deeb50913e4d18a1ebe4b74ca9b0b4d21952511eeaba5e9fbbf739b52731a2061e206ec60d568df
+  checksum: 10c0/aebeb200f25e8818d8cf39cd0209026750d77c9b85381cdd8deeb50913e4d18a1ebe4b74ca9b0b4d21952511eeaba5e9fbbf739b52731a2061e206ec60d568df
   languageName: node
   linkType: hard
 
@@ -3013,7 +3013,7 @@ __metadata:
   resolution: "@types/connect@npm:3.4.38"
   dependencies:
     "@types/node": "npm:*"
-  checksum: 2e1cdba2c410f25649e77856505cd60223250fa12dff7a503e492208dbfdd25f62859918f28aba95315251fd1f5e1ffbfca1e25e73037189ab85dd3f8d0a148c
+  checksum: 10c0/2e1cdba2c410f25649e77856505cd60223250fa12dff7a503e492208dbfdd25f62859918f28aba95315251fd1f5e1ffbfca1e25e73037189ab85dd3f8d0a148c
   languageName: node
   linkType: hard
 
@@ -3022,7 +3022,7 @@ __metadata:
   resolution: "@types/cors@npm:2.8.17"
   dependencies:
     "@types/node": "npm:*"
-  checksum: 457364c28c89f3d9ed34800e1de5c6eaaf344d1bb39af122f013322a50bc606eb2aa6f63de4e41a7a08ba7ef454473926c94a830636723da45bf786df032696d
+  checksum: 10c0/457364c28c89f3d9ed34800e1de5c6eaaf344d1bb39af122f013322a50bc606eb2aa6f63de4e41a7a08ba7ef454473926c94a830636723da45bf786df032696d
   languageName: node
   linkType: hard
 
@@ -3031,14 +3031,14 @@ __metadata:
   resolution: "@types/emoji-mart@npm:3.0.14"
   dependencies:
     "@types/react": "npm:*"
-  checksum: 23ded65fce9b3355fbe903d3971cb67cc827a5d587464bb7e3f349615527ef4a9197b3bb59fa84c4391d1b901e7f200f686a7fc83f649ae2a51a0fb948cbadfb
+  checksum: 10c0/23ded65fce9b3355fbe903d3971cb67cc827a5d587464bb7e3f349615527ef4a9197b3bb59fa84c4391d1b901e7f200f686a7fc83f649ae2a51a0fb948cbadfb
   languageName: node
   linkType: hard
 
 "@types/escape-html@npm:^1.0.2":
   version: 1.0.4
   resolution: "@types/escape-html@npm:1.0.4"
-  checksum: 5cdae9d38e97b1ad61180528ef7ca66bf6be96e875cc560c3e064d6ca75ccf2adaf2fa3b7bdd4f7494013e4357a2fb0bb62f2e59ca53097d5c45c7519d0ce9c3
+  checksum: 10c0/5cdae9d38e97b1ad61180528ef7ca66bf6be96e875cc560c3e064d6ca75ccf2adaf2fa3b7bdd4f7494013e4357a2fb0bb62f2e59ca53097d5c45c7519d0ce9c3
   languageName: node
   linkType: hard
 
@@ -3048,21 +3048,21 @@ __metadata:
   dependencies:
     "@types/estree": "npm:*"
     "@types/json-schema": "npm:*"
-  checksum: fc449107eb186bdc5d30149bbcb4e673af8530afdeacca3b89f14deefcbfc67463157d6a81b42cd9df92ddeafda5351853d13310ff7ac6ab0d9769ac7cc0cc3a
+  checksum: 10c0/fc449107eb186bdc5d30149bbcb4e673af8530afdeacca3b89f14deefcbfc67463157d6a81b42cd9df92ddeafda5351853d13310ff7ac6ab0d9769ac7cc0cc3a
   languageName: node
   linkType: hard
 
 "@types/estree@npm:*":
   version: 1.0.3
   resolution: "@types/estree@npm:1.0.3"
-  checksum: 5171f467fdd77852e28d7eec575222bc6c900e117a44e916a5ff65807ae8e1ed15f57d21e8954d6bd532e37c49a8ecfee730fcb152b7b44234d38681978b2caa
+  checksum: 10c0/5171f467fdd77852e28d7eec575222bc6c900e117a44e916a5ff65807ae8e1ed15f57d21e8954d6bd532e37c49a8ecfee730fcb152b7b44234d38681978b2caa
   languageName: node
   linkType: hard
 
 "@types/estree@npm:0.0.39":
   version: 0.0.39
   resolution: "@types/estree@npm:0.0.39"
-  checksum: f0af6c95ac1988c4827964bd9d3b51d24da442e2188943f6dfcb1e1559103d5d024d564b2e9d3f84c53714a02a0a7435c7441138eb63d9af5de4dfc66cdc0d92
+  checksum: 10c0/f0af6c95ac1988c4827964bd9d3b51d24da442e2188943f6dfcb1e1559103d5d024d564b2e9d3f84c53714a02a0a7435c7441138eb63d9af5de4dfc66cdc0d92
   languageName: node
   linkType: hard
 
@@ -3074,7 +3074,7 @@ __metadata:
     "@types/qs": "npm:*"
     "@types/range-parser": "npm:*"
     "@types/send": "npm:*"
-  checksum: dc166cbf4475c00a81fbcab120bf7477c527184be11ae149df7f26d9c1082114c68f8d387a2926fe80291b06477c8bbd9231ff4f5775de328e887695aefce269
+  checksum: 10c0/dc166cbf4475c00a81fbcab120bf7477c527184be11ae149df7f26d9c1082114c68f8d387a2926fe80291b06477c8bbd9231ff4f5775de328e887695aefce269
   languageName: node
   linkType: hard
 
@@ -3086,7 +3086,7 @@ __metadata:
     "@types/express-serve-static-core": "npm:^4.17.33"
     "@types/qs": "npm:*"
     "@types/serve-static": "npm:*"
-  checksum: 12e562c4571da50c7d239e117e688dc434db1bac8be55613294762f84fd77fbd0658ccd553c7d3ab02408f385bc93980992369dd30e2ecd2c68c358e6af8fabf
+  checksum: 10c0/12e562c4571da50c7d239e117e688dc434db1bac8be55613294762f84fd77fbd0658ccd553c7d3ab02408f385bc93980992369dd30e2ecd2c68c358e6af8fabf
   languageName: node
   linkType: hard
 
@@ -3096,7 +3096,7 @@ __metadata:
   dependencies:
     "@types/minimatch": "npm:*"
     "@types/node": "npm:*"
-  checksum: a8eb5d5cb5c48fc58c7ca3ff1e1ddf771ee07ca5043da6e4871e6757b4472e2e73b4cfef2644c38983174a4bc728c73f8da02845c28a1212f98cabd293ecae98
+  checksum: 10c0/a8eb5d5cb5c48fc58c7ca3ff1e1ddf771ee07ca5043da6e4871e6757b4472e2e73b4cfef2644c38983174a4bc728c73f8da02845c28a1212f98cabd293ecae98
   languageName: node
   linkType: hard
 
@@ -3105,14 +3105,14 @@ __metadata:
   resolution: "@types/graceful-fs@npm:4.1.6"
   dependencies:
     "@types/node": "npm:*"
-  checksum: b1d32c5ae7bd52cf60e29df20407904c4312a39612e7ec2ee23c1e3731c1cfe31d97c6941bf6cb52f5f929d50d86d92dd506436b63fafa833181d439b628885e
+  checksum: 10c0/b1d32c5ae7bd52cf60e29df20407904c4312a39612e7ec2ee23c1e3731c1cfe31d97c6941bf6cb52f5f929d50d86d92dd506436b63fafa833181d439b628885e
   languageName: node
   linkType: hard
 
 "@types/history@npm:^4.7.11":
   version: 4.7.11
   resolution: "@types/history@npm:4.7.11"
-  checksum: 3facf37c2493d1f92b2e93a22cac7ea70b06351c2ab9aaceaa3c56aa6099fb63516f6c4ec1616deb5c56b4093c026a043ea2d3373e6c0644d55710364d02c934
+  checksum: 10c0/3facf37c2493d1f92b2e93a22cac7ea70b06351c2ab9aaceaa3c56aa6099fb63516f6c4ec1616deb5c56b4093c026a043ea2d3373e6c0644d55710364d02c934
   languageName: node
   linkType: hard
 
@@ -3122,14 +3122,14 @@ __metadata:
   dependencies:
     "@types/react": "npm:*"
     hoist-non-react-statics: "npm:^3.3.0"
-  checksum: 2a3b64bf3d9817d7830afa60ee314493c475fb09570a64e7737084cd482d2177ebdddf888ce837350bac51741278b077683facc9541f052d4bbe8487b4e3e618
+  checksum: 10c0/2a3b64bf3d9817d7830afa60ee314493c475fb09570a64e7737084cd482d2177ebdddf888ce837350bac51741278b077683facc9541f052d4bbe8487b4e3e618
   languageName: node
   linkType: hard
 
 "@types/http-errors@npm:*":
   version: 2.0.4
   resolution: "@types/http-errors@npm:2.0.4"
-  checksum: 494670a57ad4062fee6c575047ad5782506dd35a6b9ed3894cea65830a94367bd84ba302eb3dde331871f6d70ca287bfedb1b2cf658e6132cd2cbd427ab56836
+  checksum: 10c0/494670a57ad4062fee6c575047ad5782506dd35a6b9ed3894cea65830a94367bd84ba302eb3dde331871f6d70ca287bfedb1b2cf658e6132cd2cbd427ab56836
   languageName: node
   linkType: hard
 
@@ -3138,21 +3138,21 @@ __metadata:
   resolution: "@types/http-link-header@npm:1.0.5"
   dependencies:
     "@types/node": "npm:*"
-  checksum: adeb13381b38c3625478149820772924c154b4a7250dca62c346810a8378f8968fc7f3a9a4f55ec61de5d06083637540f862c8a920f6a710310c9645d19a077d
+  checksum: 10c0/adeb13381b38c3625478149820772924c154b4a7250dca62c346810a8378f8968fc7f3a9a4f55ec61de5d06083637540f862c8a920f6a710310c9645d19a077d
   languageName: node
   linkType: hard
 
 "@types/intl@npm:^1.2.0":
   version: 1.2.2
   resolution: "@types/intl@npm:1.2.2"
-  checksum: f465c320139c01dfc9ae1382406259fd23f6a455aad31517f61b7fd79bdde493e854d6666c2198ae644d8cf6e147e78831ea810f83a787f65b765bc56834f259
+  checksum: 10c0/f465c320139c01dfc9ae1382406259fd23f6a455aad31517f61b7fd79bdde493e854d6666c2198ae644d8cf6e147e78831ea810f83a787f65b765bc56834f259
   languageName: node
   linkType: hard
 
 "@types/istanbul-lib-coverage@npm:*, @types/istanbul-lib-coverage@npm:^2.0.0, @types/istanbul-lib-coverage@npm:^2.0.1":
   version: 2.0.5
   resolution: "@types/istanbul-lib-coverage@npm:2.0.5"
-  checksum: e15cfc01a7ac60062f771314c959011bae7de7ceaef8e294f13427a11f21741cbfac98ad8cd9ecbf0e3d72ab7ddc327bacb3fab32c6b26ab19dbbbc1a69a9d3b
+  checksum: 10c0/e15cfc01a7ac60062f771314c959011bae7de7ceaef8e294f13427a11f21741cbfac98ad8cd9ecbf0e3d72ab7ddc327bacb3fab32c6b26ab19dbbbc1a69a9d3b
   languageName: node
   linkType: hard
 
@@ -3161,7 +3161,7 @@ __metadata:
   resolution: "@types/istanbul-lib-report@npm:3.0.2"
   dependencies:
     "@types/istanbul-lib-coverage": "npm:*"
-  checksum: c168e425c95c167d83c7cbd65ff6b620cc53c5ef199a58428758586bbc28faf5c51291667e4455777b47ada12381e53fce7b92e32f431f85d8ac8025074d1908
+  checksum: 10c0/c168e425c95c167d83c7cbd65ff6b620cc53c5ef199a58428758586bbc28faf5c51291667e4455777b47ada12381e53fce7b92e32f431f85d8ac8025074d1908
   languageName: node
   linkType: hard
 
@@ -3170,7 +3170,7 @@ __metadata:
   resolution: "@types/istanbul-reports@npm:3.0.3"
   dependencies:
     "@types/istanbul-lib-report": "npm:*"
-  checksum: dcd8291370d9192aa980bf849309a7ca27e1d030ccc5e7edeef47d6612c2d57d611855543b9ffeb982d162a5ab2a44d8b40baa4dc93c1d7aa6fbcaeb16e69e78
+  checksum: 10c0/dcd8291370d9192aa980bf849309a7ca27e1d030ccc5e7edeef47d6612c2d57d611855543b9ffeb982d162a5ab2a44d8b40baa4dc93c1d7aa6fbcaeb16e69e78
   languageName: node
   linkType: hard
 
@@ -3180,14 +3180,14 @@ __metadata:
   dependencies:
     expect: "npm:^29.0.0"
     pretty-format: "npm:^29.0.0"
-  checksum: 25fc8e4c611fa6c4421e631432e9f0a6865a8cb07c9815ec9ac90d630271cad773b2ee5fe08066f7b95bebd18bb967f8ce05d018ee9ab0430f9dfd1d84665b6f
+  checksum: 10c0/25fc8e4c611fa6c4421e631432e9f0a6865a8cb07c9815ec9ac90d630271cad773b2ee5fe08066f7b95bebd18bb967f8ce05d018ee9ab0430f9dfd1d84665b6f
   languageName: node
   linkType: hard
 
 "@types/js-yaml@npm:^4.0.5":
   version: 4.0.9
   resolution: "@types/js-yaml@npm:4.0.9"
-  checksum: 24de857aa8d61526bbfbbaa383aa538283ad17363fcd5bb5148e2c7f604547db36646440e739d78241ed008702a8920665d1add5618687b6743858fae00da211
+  checksum: 10c0/24de857aa8d61526bbfbbaa383aa538283ad17363fcd5bb5148e2c7f604547db36646440e739d78241ed008702a8920665d1add5618687b6743858fae00da211
   languageName: node
   linkType: hard
 
@@ -3198,56 +3198,56 @@ __metadata:
     "@types/node": "npm:*"
     "@types/tough-cookie": "npm:*"
     parse5: "npm:^7.0.0"
-  checksum: 3d4b2a3eab145674ee6da482607c5e48977869109f0f62560bf91ae1a792c9e847ac7c6aaf243ed2e97333cb3c51aef314ffa54a19ef174b8f9592dfcb836b25
+  checksum: 10c0/3d4b2a3eab145674ee6da482607c5e48977869109f0f62560bf91ae1a792c9e847ac7c6aaf243ed2e97333cb3c51aef314ffa54a19ef174b8f9592dfcb836b25
   languageName: node
   linkType: hard
 
 "@types/json-schema@npm:*, @types/json-schema@npm:^7.0.12, @types/json-schema@npm:^7.0.5, @types/json-schema@npm:^7.0.8":
   version: 7.0.14
   resolution: "@types/json-schema@npm:7.0.14"
-  checksum: da68689ccd44cb93ca4c9a4af3b25c6091ecf45fb370d1ed0d0ac5b780e235bf0b9bdc1f7e28f19e6713b22567c3db11fefcbcc6d48ac6b356d035a8f9f4ea30
+  checksum: 10c0/da68689ccd44cb93ca4c9a4af3b25c6091ecf45fb370d1ed0d0ac5b780e235bf0b9bdc1f7e28f19e6713b22567c3db11fefcbcc6d48ac6b356d035a8f9f4ea30
   languageName: node
   linkType: hard
 
 "@types/json-stable-stringify@npm:^1.0.32":
   version: 1.0.35
   resolution: "@types/json-stable-stringify@npm:1.0.35"
-  checksum: 67b50a86478f932c932ba21515b80700a8844d55e0656b3abe2c32c41c1c405c70fcd10b30ff8f38d1869871af2deae63ffdea54ce72cc2ee92e94a9d1cf2b6f
+  checksum: 10c0/67b50a86478f932c932ba21515b80700a8844d55e0656b3abe2c32c41c1c405c70fcd10b30ff8f38d1869871af2deae63ffdea54ce72cc2ee92e94a9d1cf2b6f
   languageName: node
   linkType: hard
 
 "@types/json5@npm:^0.0.29":
   version: 0.0.29
   resolution: "@types/json5@npm:0.0.29"
-  checksum: 6bf5337bc447b706bb5b4431d37686aa2ea6d07cfd6f79cc31de80170d6ff9b1c7384a9c0ccbc45b3f512bae9e9f75c2e12109806a15331dc94e8a8db6dbb4ac
+  checksum: 10c0/6bf5337bc447b706bb5b4431d37686aa2ea6d07cfd6f79cc31de80170d6ff9b1c7384a9c0ccbc45b3f512bae9e9f75c2e12109806a15331dc94e8a8db6dbb4ac
   languageName: node
   linkType: hard
 
 "@types/lodash@npm:^4.14.195":
   version: 4.14.202
   resolution: "@types/lodash@npm:4.14.202"
-  checksum: 6064d43c8f454170841bd67c8266cc9069d9e570a72ca63f06bceb484cb4a3ee60c9c1f305c1b9e3a87826049fd41124b8ef265c4dd08b00f6766609c7fe9973
+  checksum: 10c0/6064d43c8f454170841bd67c8266cc9069d9e570a72ca63f06bceb484cb4a3ee60c9c1f305c1b9e3a87826049fd41124b8ef265c4dd08b00f6766609c7fe9973
   languageName: node
   linkType: hard
 
 "@types/mime@npm:*":
   version: 3.0.4
   resolution: "@types/mime@npm:3.0.4"
-  checksum: db478bc0f99e40f7b3e01d356a9bdf7817060808a294978111340317bcd80ca35382855578c5b60fbc84ae449674bd9bb38427b18417e1f8f19e4f72f8b242cd
+  checksum: 10c0/db478bc0f99e40f7b3e01d356a9bdf7817060808a294978111340317bcd80ca35382855578c5b60fbc84ae449674bd9bb38427b18417e1f8f19e4f72f8b242cd
   languageName: node
   linkType: hard
 
 "@types/mime@npm:^1":
   version: 1.3.5
   resolution: "@types/mime@npm:1.3.5"
-  checksum: c2ee31cd9b993804df33a694d5aa3fa536511a49f2e06eeab0b484fef59b4483777dbb9e42a4198a0809ffbf698081fdbca1e5c2218b82b91603dfab10a10fbc
+  checksum: 10c0/c2ee31cd9b993804df33a694d5aa3fa536511a49f2e06eeab0b484fef59b4483777dbb9e42a4198a0809ffbf698081fdbca1e5c2218b82b91603dfab10a10fbc
   languageName: node
   linkType: hard
 
 "@types/minimatch@npm:*":
   version: 5.1.2
   resolution: "@types/minimatch@npm:5.1.2"
-  checksum: 83cf1c11748891b714e129de0585af4c55dd4c2cafb1f1d5233d79246e5e1e19d1b5ad9e8db449667b3ffa2b6c80125c429dbee1054e9efb45758dbc4e118562
+  checksum: 10c0/83cf1c11748891b714e129de0585af4c55dd4c2cafb1f1d5233d79246e5e1e19d1b5ad9e8db449667b3ffa2b6c80125c429dbee1054e9efb45758dbc4e118562
   languageName: node
   linkType: hard
 
@@ -3256,28 +3256,28 @@ __metadata:
   resolution: "@types/node@npm:20.8.10"
   dependencies:
     undici-types: "npm:~5.26.4"
-  checksum: caaa3ae9294f1bfdacb029a916c64af63cbcea613a52f53ea86f93c91779859af177b2b68113ef835194519f5e76cadda08559929b68297f1a8a568c207f9f66
+  checksum: 10c0/caaa3ae9294f1bfdacb029a916c64af63cbcea613a52f53ea86f93c91779859af177b2b68113ef835194519f5e76cadda08559929b68297f1a8a568c207f9f66
   languageName: node
   linkType: hard
 
 "@types/node@npm:14 || 16 || 17":
   version: 17.0.45
   resolution: "@types/node@npm:17.0.45"
-  checksum: 0db377133d709b33a47892581a21a41cd7958f22723a3cc6c71d55ac018121382de42fbfc7970d5ae3e7819dbe5f40e1c6a5174aedf7e7964e9cb8fa72b580b0
+  checksum: 10c0/0db377133d709b33a47892581a21a41cd7958f22723a3cc6c71d55ac018121382de42fbfc7970d5ae3e7819dbe5f40e1c6a5174aedf7e7964e9cb8fa72b580b0
   languageName: node
   linkType: hard
 
 "@types/object-assign@npm:^4.0.30":
   version: 4.0.33
   resolution: "@types/object-assign@npm:4.0.33"
-  checksum: 7fbc399aa1140beff35a152e206bfb336dd880721f4a13cc1ea01d964ab376fa4ca2c19059145cbd777c9d3eaf724008faec8cf3becff97353c69560196af086
+  checksum: 10c0/7fbc399aa1140beff35a152e206bfb336dd880721f4a13cc1ea01d964ab376fa4ca2c19059145cbd777c9d3eaf724008faec8cf3becff97353c69560196af086
   languageName: node
   linkType: hard
 
 "@types/parse-json@npm:^4.0.0":
   version: 4.0.1
   resolution: "@types/parse-json@npm:4.0.1"
-  checksum: 6851183c2ffe4aff607f034f6b5325ebc81ff90409132e2d59fe6cae030d7064593e521d75cda017d9f6b696a7e19d26d1703f366b3e7cbfec8c825331c79c31
+  checksum: 10c0/6851183c2ffe4aff607f034f6b5325ebc81ff90409132e2d59fe6cae030d7064593e521d75cda017d9f6b696a7e19d26d1703f366b3e7cbfec8c825331c79c31
   languageName: node
   linkType: hard
 
@@ -3288,56 +3288,56 @@ __metadata:
     "@types/node": "npm:*"
     pg-protocol: "npm:*"
     pg-types: "npm:^4.0.1"
-  checksum: df2c2ac11fa5e8863a98aadce9a9168af5cfc38a226a228d8b1be513ef48d33ceb9bfaa64ef685a87e0611a4f8d94f2e0736bb2812fa00ed264f76679b86945d
+  checksum: 10c0/df2c2ac11fa5e8863a98aadce9a9168af5cfc38a226a228d8b1be513ef48d33ceb9bfaa64ef685a87e0611a4f8d94f2e0736bb2812fa00ed264f76679b86945d
   languageName: node
   linkType: hard
 
 "@types/picomatch@npm:^2.3.0":
   version: 2.3.2
   resolution: "@types/picomatch@npm:2.3.2"
-  checksum: 91445cfc0d07fe2a44c16ee284ab2e2a279da3f6df9c62ad61e7bc50343e47bef541369aff6110c4e51bd8fe501fc9c564deefbb4c03e392254889de6b46f237
+  checksum: 10c0/91445cfc0d07fe2a44c16ee284ab2e2a279da3f6df9c62ad61e7bc50343e47bef541369aff6110c4e51bd8fe501fc9c564deefbb4c03e392254889de6b46f237
   languageName: node
   linkType: hard
 
 "@types/prop-types@npm:*, @types/prop-types@npm:^15.7.5":
   version: 15.7.11
   resolution: "@types/prop-types@npm:15.7.11"
-  checksum: e53423cf9d510515ef8b47ff42f4f1b65a7b7b37c8704e2dbfcb9a60defe0c0e1f3cb1acfdeb466bad44ca938d7c79bffdd51b48ffb659df2432169d0b27a132
+  checksum: 10c0/e53423cf9d510515ef8b47ff42f4f1b65a7b7b37c8704e2dbfcb9a60defe0c0e1f3cb1acfdeb466bad44ca938d7c79bffdd51b48ffb659df2432169d0b27a132
   languageName: node
   linkType: hard
 
 "@types/punycode@npm:^2.1.0":
   version: 2.1.3
   resolution: "@types/punycode@npm:2.1.3"
-  checksum: c4babd33d0ed010017bc2d44a15b322b1e2997b9bb335020c26a58ac855e176d337536fa0ca84aa1b0c6d7008799566d4d5430a083d123ac6bbcc59c451b9cfc
+  checksum: 10c0/c4babd33d0ed010017bc2d44a15b322b1e2997b9bb335020c26a58ac855e176d337536fa0ca84aa1b0c6d7008799566d4d5430a083d123ac6bbcc59c451b9cfc
   languageName: node
   linkType: hard
 
 "@types/q@npm:^1.5.1":
   version: 1.5.7
   resolution: "@types/q@npm:1.5.7"
-  checksum: 70ede8b114077e5f4cdec377c43f8b72306363b2248669c669b4484bdb9c4aaee051ccfcc49d21633486d9747d6b4f443c9ea51e4d0596a1993f86643d0b5530
+  checksum: 10c0/70ede8b114077e5f4cdec377c43f8b72306363b2248669c669b4484bdb9c4aaee051ccfcc49d21633486d9747d6b4f443c9ea51e4d0596a1993f86643d0b5530
   languageName: node
   linkType: hard
 
 "@types/qs@npm:*":
   version: 6.9.10
   resolution: "@types/qs@npm:6.9.10"
-  checksum: 6be12e5f062d1b41eb037d59bf9cb65bc9410cedd5e6da832dfd7c8e2b3f4c91e81c9b90b51811140770e5052c6c4e8361181bd9437ddcd4515dc128b7c00353
+  checksum: 10c0/6be12e5f062d1b41eb037d59bf9cb65bc9410cedd5e6da832dfd7c8e2b3f4c91e81c9b90b51811140770e5052c6c4e8361181bd9437ddcd4515dc128b7c00353
   languageName: node
   linkType: hard
 
 "@types/rails__ujs@npm:^6.0.4":
   version: 6.0.4
   resolution: "@types/rails__ujs@npm:6.0.4"
-  checksum: 7477cb03a0e1339b9cd5c8ac4a197a153e2ff48742b2f527c5a39dcdf80f01493011e368483290d3717662c63066fada3ab203a335804cbb3573cf575f37007e
+  checksum: 10c0/7477cb03a0e1339b9cd5c8ac4a197a153e2ff48742b2f527c5a39dcdf80f01493011e368483290d3717662c63066fada3ab203a335804cbb3573cf575f37007e
   languageName: node
   linkType: hard
 
 "@types/range-parser@npm:*":
   version: 1.2.7
   resolution: "@types/range-parser@npm:1.2.7"
-  checksum: 361bb3e964ec5133fa40644a0b942279ed5df1949f21321d77de79f48b728d39253e5ce0408c9c17e4e0fd95ca7899da36841686393b9f7a1e209916e9381a3c
+  checksum: 10c0/361bb3e964ec5133fa40644a0b942279ed5df1949f21321d77de79f48b728d39253e5ce0408c9c17e4e0fd95ca7899da36841686393b9f7a1e209916e9381a3c
   languageName: node
   linkType: hard
 
@@ -3346,7 +3346,7 @@ __metadata:
   resolution: "@types/react-dom@npm:18.2.18"
   dependencies:
     "@types/react": "npm:*"
-  checksum: 74dba11a1b8156f3a763f3fca1fb4ec1dcd349153279b8bf79210024a69f994bf2cf0728198c047f8130c5318420ea56281b0a4ef84c8ae943cd9a0cac705220
+  checksum: 10c0/74dba11a1b8156f3a763f3fca1fb4ec1dcd349153279b8bf79210024a69f994bf2cf0728198c047f8130c5318420ea56281b0a4ef84c8ae943cd9a0cac705220
   languageName: node
   linkType: hard
 
@@ -3355,7 +3355,7 @@ __metadata:
   resolution: "@types/react-helmet@npm:6.1.11"
   dependencies:
     "@types/react": "npm:*"
-  checksum: f7b3bb2151d992a108ae46fed876fb9c8119108397d9a01d150c5642782997542c8b3c52e742b56e8689b7dbfa62ca9cfc76aa7e05dec4e60c652f7ef53fa783
+  checksum: 10c0/f7b3bb2151d992a108ae46fed876fb9c8119108397d9a01d150c5642782997542c8b3c52e742b56e8689b7dbfa62ca9cfc76aa7e05dec4e60c652f7ef53fa783
   languageName: node
   linkType: hard
 
@@ -3365,7 +3365,7 @@ __metadata:
   dependencies:
     "@types/prop-types": "npm:*"
     immutable: "npm:^3.8.2"
-  checksum: 4dab74a43a2dde9bea6299a999dd600ae82f00082fe2b8865b11e5154e658f72fbb117132fa3753dd9a280dd8032a2574d8e7c94de5e268afdadd50d720086da
+  checksum: 10c0/4dab74a43a2dde9bea6299a999dd600ae82f00082fe2b8865b11e5154e658f72fbb117132fa3753dd9a280dd8032a2574d8e7c94de5e268afdadd50d720086da
   languageName: node
   linkType: hard
 
@@ -3374,7 +3374,7 @@ __metadata:
   resolution: "@types/react-motion@npm:0.0.40"
   dependencies:
     "@types/react": "npm:*"
-  checksum: 8a560051be917833fdbe051185b53aeafbe8657968ac8e073ac874b9a55c6f16e3793748b13cfb9bd6d9a3d27aba116d6f8f296ec1950f4175dc94d17c5e8470
+  checksum: 10c0/8a560051be917833fdbe051185b53aeafbe8657968ac8e073ac874b9a55c6f16e3793748b13cfb9bd6d9a3d27aba116d6f8f296ec1950f4175dc94d17c5e8470
   languageName: node
   linkType: hard
 
@@ -3383,7 +3383,7 @@ __metadata:
   resolution: "@types/react-overlays@npm:3.1.0"
   dependencies:
     react-overlays: "npm:*"
-  checksum: 99a4de7c56a286cf72dbf135ad6f9da7c095483987ab548ba7e63d1d885fd54939e78e8bd3dd3cf275a6f4c3d6bdcd00c6923c92cc6c3a4c9bacf5a55550f18b
+  checksum: 10c0/99a4de7c56a286cf72dbf135ad6f9da7c095483987ab548ba7e63d1d885fd54939e78e8bd3dd3cf275a6f4c3d6bdcd00c6923c92cc6c3a4c9bacf5a55550f18b
   languageName: node
   linkType: hard
 
@@ -3394,7 +3394,7 @@ __metadata:
     "@types/history": "npm:^4.7.11"
     "@types/react": "npm:*"
     "@types/react-router": "npm:*"
-  checksum: a9231a16afb9ed5142678147eafec9d48582809295754fb60946e29fcd3757a4c7a3180fa94b45763e4c7f6e3f02379e2fcb8dd986db479dcab40eff5fc62a91
+  checksum: 10c0/a9231a16afb9ed5142678147eafec9d48582809295754fb60946e29fcd3757a4c7a3180fa94b45763e4c7f6e3f02379e2fcb8dd986db479dcab40eff5fc62a91
   languageName: node
   linkType: hard
 
@@ -3404,7 +3404,7 @@ __metadata:
   dependencies:
     "@types/history": "npm:^4.7.11"
     "@types/react": "npm:*"
-  checksum: 1f7eee61981d2f807fa01a34a0ef98ebc0774023832b6611a69c7f28fdff01de5a38cabf399f32e376bf8099dcb7afaf724775bea9d38870224492bea4cb5737
+  checksum: 10c0/1f7eee61981d2f807fa01a34a0ef98ebc0774023832b6611a69c7f28fdff01de5a38cabf399f32e376bf8099dcb7afaf724775bea9d38870224492bea4cb5737
   languageName: node
   linkType: hard
 
@@ -3413,7 +3413,7 @@ __metadata:
   resolution: "@types/react-select@npm:5.0.1"
   dependencies:
     react-select: "npm:*"
-  checksum: 6ea7f3beaebb38e537e5b742a0d8b49f212bdf1dade9f9ce5e3c91e24aad95284aeda0efc8a235e05a7102748f475c4476fb6830030b5574fdf19c3f1d908027
+  checksum: 10c0/6ea7f3beaebb38e537e5b742a0d8b49f212bdf1dade9f9ce5e3c91e24aad95284aeda0efc8a235e05a7102748f475c4476fb6830030b5574fdf19c3f1d908027
   languageName: node
   linkType: hard
 
@@ -3422,7 +3422,7 @@ __metadata:
   resolution: "@types/react-sparklines@npm:1.7.5"
   dependencies:
     "@types/react": "npm:*"
-  checksum: acb0937ebc06019921ec5254fb125356f206038f5e2f244663eb849c692b6f6413f75ce3ee84be91d8c659ae43c8f743dd5c4397cdea65749cd601a495491242
+  checksum: 10c0/acb0937ebc06019921ec5254fb125356f206038f5e2f244663eb849c692b6f6413f75ce3ee84be91d8c659ae43c8f743dd5c4397cdea65749cd601a495491242
   languageName: node
   linkType: hard
 
@@ -3431,7 +3431,7 @@ __metadata:
   resolution: "@types/react-swipeable-views@npm:0.13.5"
   dependencies:
     "@types/react": "npm:*"
-  checksum: d1dcc78d862f37d30a43d79d915fdb388e05dce0b2ac07462ca4f1b00e0eef37cb41d75997f5685dec79bcce1ffee0dfbc744f20d5266dd3090658def5b4e193
+  checksum: 10c0/d1dcc78d862f37d30a43d79d915fdb388e05dce0b2ac07462ca4f1b00e0eef37cb41d75997f5685dec79bcce1ffee0dfbc744f20d5266dd3090658def5b4e193
   languageName: node
   linkType: hard
 
@@ -3440,7 +3440,7 @@ __metadata:
   resolution: "@types/react-test-renderer@npm:18.0.7"
   dependencies:
     "@types/react": "npm:*"
-  checksum: 45cbe963354acee2ab090979d856763c84f59ef7b63477d1fef5d0fd52760b69aa67bbd205fbd3bd36264620fce72c8e407735a9f2009c40ca50da59b0058c34
+  checksum: 10c0/45cbe963354acee2ab090979d856763c84f59ef7b63477d1fef5d0fd52760b69aa67bbd205fbd3bd36264620fce72c8e407735a9f2009c40ca50da59b0058c34
   languageName: node
   linkType: hard
 
@@ -3449,7 +3449,7 @@ __metadata:
   resolution: "@types/react-textarea-autosize@npm:8.0.0"
   dependencies:
     react-textarea-autosize: "npm:*"
-  checksum: 8d6a40e53aa3452ddda53a2b9eb8668ffdfdabc8133d731a3ea2205309376f66fb7537832170def243520fefec70e02b7f05043cf4fdeac520b5883fbb66dc12
+  checksum: 10c0/8d6a40e53aa3452ddda53a2b9eb8668ffdfdabc8133d731a3ea2205309376f66fb7537832170def243520fefec70e02b7f05043cf4fdeac520b5883fbb66dc12
   languageName: node
   linkType: hard
 
@@ -3458,7 +3458,7 @@ __metadata:
   resolution: "@types/react-toggle@npm:4.0.5"
   dependencies:
     "@types/react": "npm:*"
-  checksum: f557b85c96715b145bcc3beb2903f88ee3a6045ef85da0f80561c7cc2ecdc531e2d4ae121ed8ec3a1761264de25b8410653744093f37abf042201587add7ffa6
+  checksum: 10c0/f557b85c96715b145bcc3beb2903f88ee3a6045ef85da0f80561c7cc2ecdc531e2d4ae121ed8ec3a1761264de25b8410653744093f37abf042201587add7ffa6
   languageName: node
   linkType: hard
 
@@ -3467,7 +3467,7 @@ __metadata:
   resolution: "@types/react-transition-group@npm:4.4.8"
   dependencies:
     "@types/react": "npm:*"
-  checksum: 6ef75e4ad25db1ad3547521aa11afd4ad887bb53cfc68bd83d6f2fd0483540cff5d78d68b663a0674698d7ac1a739d2d9dc91b82d82219d6c92e43e54f9cd69a
+  checksum: 10c0/6ef75e4ad25db1ad3547521aa11afd4ad887bb53cfc68bd83d6f2fd0483540cff5d78d68b663a0674698d7ac1a739d2d9dc91b82d82219d6c92e43e54f9cd69a
   languageName: node
   linkType: hard
 
@@ -3478,7 +3478,7 @@ __metadata:
     "@types/prop-types": "npm:*"
     "@types/scheduler": "npm:*"
     csstype: "npm:^3.0.2"
-  checksum: ad38193c30a063a481aeec2460de6396c80d8de2f1c7a8cbb80a4e8bc594f74c308ce93e165d743b38507c3ac0a491c24ce0efbd84c9ab21fd5fd38d2963d329
+  checksum: 10c0/ad38193c30a063a481aeec2460de6396c80d8de2f1c7a8cbb80a4e8bc594f74c308ce93e165d743b38507c3ac0a491c24ce0efbd84c9ab21fd5fd38d2963d329
   languageName: node
   linkType: hard
 
@@ -3488,14 +3488,14 @@ __metadata:
   dependencies:
     immutable: "npm:^4.0.0-rc.1"
     redux: "npm:^4.0.0"
-  checksum: 19972c307f2bbd31a201b28844224ce06e34917823cf2ded3c303cffcced273a2107c4186cc37af9db4f948204fc48c461e609b9f3d2719963049dedae3ebf82
+  checksum: 10c0/19972c307f2bbd31a201b28844224ce06e34917823cf2ded3c303cffcced273a2107c4186cc37af9db4f948204fc48c461e609b9f3d2719963049dedae3ebf82
   languageName: node
   linkType: hard
 
 "@types/requestidlecallback@npm:^0.3.5":
   version: 0.3.7
   resolution: "@types/requestidlecallback@npm:0.3.7"
-  checksum: aa5d1d981d7ddc98b9212c75c89d2ddb2e521077d6c0c5e285d944a8c6ae8baeec30d4d201aec31716d668d3435f884e80e768e28d929a5b87a55097bc21a5e1
+  checksum: 10c0/aa5d1d981d7ddc98b9212c75c89d2ddb2e521077d6c0c5e285d944a8c6ae8baeec30d4d201aec31716d668d3435f884e80e768e28d929a5b87a55097bc21a5e1
   languageName: node
   linkType: hard
 
@@ -3504,21 +3504,21 @@ __metadata:
   resolution: "@types/resolve@npm:1.17.1"
   dependencies:
     "@types/node": "npm:*"
-  checksum: 6eeb9c27d99bf4b393bf168d43208f63e78cefca5644662a0bdb2bdbf8352386f4f3aca66add138fc41bce5f66fd48a0de430a1473f11b612fbed0375ae78031
+  checksum: 10c0/6eeb9c27d99bf4b393bf168d43208f63e78cefca5644662a0bdb2bdbf8352386f4f3aca66add138fc41bce5f66fd48a0de430a1473f11b612fbed0375ae78031
   languageName: node
   linkType: hard
 
 "@types/scheduler@npm:*":
   version: 0.16.5
   resolution: "@types/scheduler@npm:0.16.5"
-  checksum: 625b63cd5dcaf6fb88fe03aa7c797f28cb121f03584126d4811b2d03f39bc3e238ce52cf7685ad8adfe8445d679934e6be47347723a6771ca2058c01f0c33760
+  checksum: 10c0/625b63cd5dcaf6fb88fe03aa7c797f28cb121f03584126d4811b2d03f39bc3e238ce52cf7685ad8adfe8445d679934e6be47347723a6771ca2058c01f0c33760
   languageName: node
   linkType: hard
 
 "@types/semver@npm:^7.5.0":
   version: 7.5.4
   resolution: "@types/semver@npm:7.5.4"
-  checksum: dee66a71d9f089c118be74b5937d4fef42864d68d9472a3f4f5399b9e3ad74d56a8e155020c846667b9ecf9de78fdb9ea55a53fff5067af28e06779b282b6c40
+  checksum: 10c0/dee66a71d9f089c118be74b5937d4fef42864d68d9472a3f4f5399b9e3ad74d56a8e155020c846667b9ecf9de78fdb9ea55a53fff5067af28e06779b282b6c40
   languageName: node
   linkType: hard
 
@@ -3528,7 +3528,7 @@ __metadata:
   dependencies:
     "@types/mime": "npm:^1"
     "@types/node": "npm:*"
-  checksum: 7f17fa696cb83be0a104b04b424fdedc7eaba1c9a34b06027239aba513b398a0e2b7279778af521f516a397ced417c96960e5f50fcfce40c4bc4509fb1a5883c
+  checksum: 10c0/7f17fa696cb83be0a104b04b424fdedc7eaba1c9a34b06027239aba513b398a0e2b7279778af521f516a397ced417c96960e5f50fcfce40c4bc4509fb1a5883c
   languageName: node
   linkType: hard
 
@@ -3539,42 +3539,42 @@ __metadata:
     "@types/http-errors": "npm:*"
     "@types/mime": "npm:*"
     "@types/node": "npm:*"
-  checksum: 811d1a2f7e74a872195e7a013bcd87a2fb1edf07eaedcb9dcfd20c1eb4bc56ad4ea0d52141c13192c91ccda7c8aeb8a530d8a7e60b9c27f5990d7e62e0fecb03
+  checksum: 10c0/811d1a2f7e74a872195e7a013bcd87a2fb1edf07eaedcb9dcfd20c1eb4bc56ad4ea0d52141c13192c91ccda7c8aeb8a530d8a7e60b9c27f5990d7e62e0fecb03
   languageName: node
   linkType: hard
 
 "@types/source-list-map@npm:*":
   version: 0.1.4
   resolution: "@types/source-list-map@npm:0.1.4"
-  checksum: d08a191a1fa0549ef2bd0aafdff3973681de323315a011fef907ffdeb0cab534a6aa508b37333278e2a63f290afad6ee3e4e950594fb75b516e5b9b65af338bf
+  checksum: 10c0/d08a191a1fa0549ef2bd0aafdff3973681de323315a011fef907ffdeb0cab534a6aa508b37333278e2a63f290afad6ee3e4e950594fb75b516e5b9b65af338bf
   languageName: node
   linkType: hard
 
 "@types/stack-utils@npm:^2.0.0":
   version: 2.0.2
   resolution: "@types/stack-utils@npm:2.0.2"
-  checksum: c2bf0de59ee0a1e2b2031e8a6225f412976377868c42a66537e284a020e9eb4068ed9b9da69d14c1727ab56e605532e877777c7d1bbfd3e9a42ae17bcef7d213
+  checksum: 10c0/c2bf0de59ee0a1e2b2031e8a6225f412976377868c42a66537e284a020e9eb4068ed9b9da69d14c1727ab56e605532e877777c7d1bbfd3e9a42ae17bcef7d213
   languageName: node
   linkType: hard
 
 "@types/tapable@npm:^1":
   version: 1.0.10
   resolution: "@types/tapable@npm:1.0.10"
-  checksum: 414e0e94085f6a280d34eb44f8e2434a4029b8c4eb4903e01dcc58dae7f61fff403ace58dcd54ca543b318a4edb390cd4c3f7ff4504c97ef740fd681497f7b43
+  checksum: 10c0/414e0e94085f6a280d34eb44f8e2434a4029b8c4eb4903e01dcc58dae7f61fff403ace58dcd54ca543b318a4edb390cd4c3f7ff4504c97ef740fd681497f7b43
   languageName: node
   linkType: hard
 
 "@types/tough-cookie@npm:*":
   version: 4.0.2
   resolution: "@types/tough-cookie@npm:4.0.2"
-  checksum: 38d01fc79a9a87166253b8c548bb401599424c57a818bea1b47a68be6dcd37fc3bff381f978354e00221f284937d5066bb92d58bf79952f9d21deb934e8ec9a7
+  checksum: 10c0/38d01fc79a9a87166253b8c548bb401599424c57a818bea1b47a68be6dcd37fc3bff381f978354e00221f284937d5066bb92d58bf79952f9d21deb934e8ec9a7
   languageName: node
   linkType: hard
 
 "@types/trusted-types@npm:^2.0.2":
   version: 2.0.3
   resolution: "@types/trusted-types@npm:2.0.3"
-  checksum: 25eae736a8a6d24353c3e0108138935250f79d1d239f6fd6f3eb52d88476456ba946f8cb8f3130c6841d40534cafc2dd2326358d86966327c3c4a3d3eecaf585
+  checksum: 10c0/25eae736a8a6d24353c3e0108138935250f79d1d239f6fd6f3eb52d88476456ba946f8cb8f3130c6841d40534cafc2dd2326358d86966327c3c4a3d3eecaf585
   languageName: node
   linkType: hard
 
@@ -3583,28 +3583,28 @@ __metadata:
   resolution: "@types/uglify-js@npm:3.17.3"
   dependencies:
     source-map: "npm:^0.6.1"
-  checksum: 718b7d6170acf2c2bb95e7cc9a1958c319d7d8f46633b3b9123a77bcf4801fd7c5d5719ebdb73e8fe1bfe261748bdd2238e65e2dfefc8f4632fa223542646821
+  checksum: 10c0/718b7d6170acf2c2bb95e7cc9a1958c319d7d8f46633b3b9123a77bcf4801fd7c5d5719ebdb73e8fe1bfe261748bdd2238e65e2dfefc8f4632fa223542646821
   languageName: node
   linkType: hard
 
 "@types/use-sync-external-store@npm:^0.0.3":
   version: 0.0.3
   resolution: "@types/use-sync-external-store@npm:0.0.3"
-  checksum: 82824c1051ba40a00e3d47964cdf4546a224e95f172e15a9c62aa3f118acee1c7518b627a34f3aa87298a2039f982e8509f92bfcc18bea7c255c189c293ba547
+  checksum: 10c0/82824c1051ba40a00e3d47964cdf4546a224e95f172e15a9c62aa3f118acee1c7518b627a34f3aa87298a2039f982e8509f92bfcc18bea7c255c189c293ba547
   languageName: node
   linkType: hard
 
 "@types/uuid@npm:^9.0.0":
   version: 9.0.8
   resolution: "@types/uuid@npm:9.0.8"
-  checksum: b411b93054cb1d4361919579ef3508a1f12bf15b5fdd97337d3d351bece6c921b52b6daeef89b62340fd73fd60da407878432a1af777f40648cbe53a01723489
+  checksum: 10c0/b411b93054cb1d4361919579ef3508a1f12bf15b5fdd97337d3d351bece6c921b52b6daeef89b62340fd73fd60da407878432a1af777f40648cbe53a01723489
   languageName: node
   linkType: hard
 
 "@types/warning@npm:^3.0.0":
   version: 3.0.2
   resolution: "@types/warning@npm:3.0.2"
-  checksum: 84b76cea7b9455bd2a47129f27a5be1cc7a33f54466930abb3c220c93bbeae997c8b08a7b8d6569152a2f8b615b5b865bf4548556c09d2c61ca356a888bc522c
+  checksum: 10c0/84b76cea7b9455bd2a47129f27a5be1cc7a33f54466930abb3c220c93bbeae997c8b08a7b8d6569152a2f8b615b5b865bf4548556c09d2c61ca356a888bc522c
   languageName: node
   linkType: hard
 
@@ -3615,7 +3615,7 @@ __metadata:
     "@types/node": "npm:*"
     "@types/source-list-map": "npm:*"
     source-map: "npm:^0.7.3"
-  checksum: 4c7a0bfdaa7c8dbed505c1de5bb3cc4a3d7a2f00f982948bc2f1795d46920465d412d62f8fc344a09b78a2c47a2782aad525b651be4018ae40be0f31748dfaf5
+  checksum: 10c0/4c7a0bfdaa7c8dbed505c1de5bb3cc4a3d7a2f00f982948bc2f1795d46920465d412d62f8fc344a09b78a2c47a2782aad525b651be4018ae40be0f31748dfaf5
   languageName: node
   linkType: hard
 
@@ -3629,7 +3629,7 @@ __metadata:
     "@types/webpack-sources": "npm:*"
     anymatch: "npm:^3.0.0"
     source-map: "npm:^0.6.0"
-  checksum: 5a0a7465d45a0e7701a8c863e88c6cba7660b37e4aeab851c71baf505dbab2e178be1cac82488c2e7d0ea11fb703ceddb53476daec3ec9a004e2fc1554233483
+  checksum: 10c0/5a0a7465d45a0e7701a8c863e88c6cba7660b37e4aeab851c71baf505dbab2e178be1cac82488c2e7d0ea11fb703ceddb53476daec3ec9a004e2fc1554233483
   languageName: node
   linkType: hard
 
@@ -3638,14 +3638,14 @@ __metadata:
   resolution: "@types/ws@npm:8.5.10"
   dependencies:
     "@types/node": "npm:*"
-  checksum: e9af279b984c4a04ab53295a40aa95c3e9685f04888df5c6920860d1dd073fcc57c7bd33578a04b285b2c655a0b52258d34bee0a20569dca8defb8393e1e5d29
+  checksum: 10c0/e9af279b984c4a04ab53295a40aa95c3e9685f04888df5c6920860d1dd073fcc57c7bd33578a04b285b2c655a0b52258d34bee0a20569dca8defb8393e1e5d29
   languageName: node
   linkType: hard
 
 "@types/yargs-parser@npm:*":
   version: 21.0.2
   resolution: "@types/yargs-parser@npm:21.0.2"
-  checksum: 422b8c59e21d9594e5a94afa45a3692d96c14f8fc7554bb1c1c390276815f09996ce0f8ed11893b6f8b2efc4ced686231dca5be6d76a4c4ceb56534474e95aca
+  checksum: 10c0/422b8c59e21d9594e5a94afa45a3692d96c14f8fc7554bb1c1c390276815f09996ce0f8ed11893b6f8b2efc4ced686231dca5be6d76a4c4ceb56534474e95aca
   languageName: node
   linkType: hard
 
@@ -3654,7 +3654,7 @@ __metadata:
   resolution: "@types/yargs@npm:17.0.32"
   dependencies:
     "@types/yargs-parser": "npm:*"
-  checksum: 2095e8aad8a4e66b86147415364266b8d607a3b95b4239623423efd7e29df93ba81bb862784a6e08664f645cc1981b25fd598f532019174cd3e5e1e689e1cccf
+  checksum: 10c0/2095e8aad8a4e66b86147415364266b8d607a3b95b4239623423efd7e29df93ba81bb862784a6e08664f645cc1981b25fd598f532019174cd3e5e1e689e1cccf
   languageName: node
   linkType: hard
 
@@ -3679,7 +3679,7 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: f911a79ee64d642f814a3b6cdb0d324b5f45d9ef955c5033e78903f626b7239b4aa773e464a38c3e667519066169d983538f2bf8e5d00228af587c9d438fb344
+  checksum: 10c0/f911a79ee64d642f814a3b6cdb0d324b5f45d9ef955c5033e78903f626b7239b4aa773e464a38c3e667519066169d983538f2bf8e5d00228af587c9d438fb344
   languageName: node
   linkType: hard
 
@@ -3697,7 +3697,7 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: a8f99820679decd0d115c0af61903fb1de3b1b5bec412dc72b67670bf636de77ab07f2a68ee65d6da7976039bbf636907f9d5ca546db3f0b98a31ffbc225bc7d
+  checksum: 10c0/a8f99820679decd0d115c0af61903fb1de3b1b5bec412dc72b67670bf636de77ab07f2a68ee65d6da7976039bbf636907f9d5ca546db3f0b98a31ffbc225bc7d
   languageName: node
   linkType: hard
 
@@ -3707,7 +3707,7 @@ __metadata:
   dependencies:
     "@typescript-eslint/types": "npm:6.21.0"
     "@typescript-eslint/visitor-keys": "npm:6.21.0"
-  checksum: eaf868938d811cbbea33e97e44ba7050d2b6892202cea6a9622c486b85ab1cf801979edf78036179a8ba4ac26f1dfdf7fcc83a68c1ff66be0b3a8e9a9989b526
+  checksum: 10c0/eaf868938d811cbbea33e97e44ba7050d2b6892202cea6a9622c486b85ab1cf801979edf78036179a8ba4ac26f1dfdf7fcc83a68c1ff66be0b3a8e9a9989b526
   languageName: node
   linkType: hard
 
@@ -3724,14 +3724,14 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 7409c97d1c4a4386b488962739c4f1b5b04dc60cf51f8cd88e6b12541f84d84c6b8b67e491a147a2c95f9ec486539bf4519fb9d418411aef6537b9c156468117
+  checksum: 10c0/7409c97d1c4a4386b488962739c4f1b5b04dc60cf51f8cd88e6b12541f84d84c6b8b67e491a147a2c95f9ec486539bf4519fb9d418411aef6537b9c156468117
   languageName: node
   linkType: hard
 
 "@typescript-eslint/types@npm:6.21.0":
   version: 6.21.0
   resolution: "@typescript-eslint/types@npm:6.21.0"
-  checksum: 020631d3223bbcff8a0da3efbdf058220a8f48a3de221563996ad1dcc30d6c08dadc3f7608cc08830d21c0d565efd2db19b557b9528921c78aabb605eef2d74d
+  checksum: 10c0/020631d3223bbcff8a0da3efbdf058220a8f48a3de221563996ad1dcc30d6c08dadc3f7608cc08830d21c0d565efd2db19b557b9528921c78aabb605eef2d74d
   languageName: node
   linkType: hard
 
@@ -3750,7 +3750,7 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: af1438c60f080045ebb330155a8c9bb90db345d5069cdd5d01b67de502abb7449d6c75500519df829f913a6b3f490ade3e8215279b6bdc63d0fb0ae61034df5f
+  checksum: 10c0/af1438c60f080045ebb330155a8c9bb90db345d5069cdd5d01b67de502abb7449d6c75500519df829f913a6b3f490ade3e8215279b6bdc63d0fb0ae61034df5f
   languageName: node
   linkType: hard
 
@@ -3767,7 +3767,7 @@ __metadata:
     semver: "npm:^7.5.4"
   peerDependencies:
     eslint: ^7.0.0 || ^8.0.0
-  checksum: ab2df3833b2582d4e5467a484d08942b4f2f7208f8e09d67de510008eb8001a9b7460f2f9ba11c12086fd3cdcac0c626761c7995c2c6b5657d5fa6b82030a32d
+  checksum: 10c0/ab2df3833b2582d4e5467a484d08942b4f2f7208f8e09d67de510008eb8001a9b7460f2f9ba11c12086fd3cdcac0c626761c7995c2c6b5657d5fa6b82030a32d
   languageName: node
   linkType: hard
 
@@ -3777,14 +3777,14 @@ __metadata:
   dependencies:
     "@typescript-eslint/types": "npm:6.21.0"
     eslint-visitor-keys: "npm:^3.4.1"
-  checksum: 7395f69739cfa1cb83c1fb2fad30afa2a814756367302fb4facd5893eff66abc807e8d8f63eba94ed3b0fe0c1c996ac9a1680bcbf0f83717acedc3f2bb724fbf
+  checksum: 10c0/7395f69739cfa1cb83c1fb2fad30afa2a814756367302fb4facd5893eff66abc807e8d8f63eba94ed3b0fe0c1c996ac9a1680bcbf0f83717acedc3f2bb724fbf
   languageName: node
   linkType: hard
 
 "@ungap/structured-clone@npm:^1.2.0":
   version: 1.2.0
   resolution: "@ungap/structured-clone@npm:1.2.0"
-  checksum: 8209c937cb39119f44eb63cf90c0b73e7c754209a6411c707be08e50e29ee81356dca1a848a405c8bdeebfe2f5e4f831ad310ae1689eeef65e7445c090c6657d
+  checksum: 10c0/8209c937cb39119f44eb63cf90c0b73e7c754209a6411c707be08e50e29ee81356dca1a848a405c8bdeebfe2f5e4f831ad310ae1689eeef65e7445c090c6657d
   languageName: node
   linkType: hard
 
@@ -3795,28 +3795,28 @@ __metadata:
     "@webassemblyjs/helper-module-context": "npm:1.9.0"
     "@webassemblyjs/helper-wasm-bytecode": "npm:1.9.0"
     "@webassemblyjs/wast-parser": "npm:1.9.0"
-  checksum: 8246c714346cdcd3ab204a2b09904d9d36c4f7da8f30cc217b0b7272a3ef57a3c21e95d51b26601641133fb66fea5cc46c357cf897808512f13b3d1c2efe88e4
+  checksum: 10c0/8246c714346cdcd3ab204a2b09904d9d36c4f7da8f30cc217b0b7272a3ef57a3c21e95d51b26601641133fb66fea5cc46c357cf897808512f13b3d1c2efe88e4
   languageName: node
   linkType: hard
 
 "@webassemblyjs/floating-point-hex-parser@npm:1.9.0":
   version: 1.9.0
   resolution: "@webassemblyjs/floating-point-hex-parser@npm:1.9.0"
-  checksum: 17acfdfe6650691ae8d0279e6ff4fb8b5efce64e12f3fa18c6a7d279968cc72eb21c0db7ebb5be9d627d05fa7014cef087843d999de96c917079f57d7dac8f77
+  checksum: 10c0/17acfdfe6650691ae8d0279e6ff4fb8b5efce64e12f3fa18c6a7d279968cc72eb21c0db7ebb5be9d627d05fa7014cef087843d999de96c917079f57d7dac8f77
   languageName: node
   linkType: hard
 
 "@webassemblyjs/helper-api-error@npm:1.9.0":
   version: 1.9.0
   resolution: "@webassemblyjs/helper-api-error@npm:1.9.0"
-  checksum: 892851b25cf4b4b307490328f45858414326dac667ca15244b5e959fa6e22478b29dabeb581d49ef8a2874e291d0417a3a959be70428c39cd40870e73b394dbc
+  checksum: 10c0/892851b25cf4b4b307490328f45858414326dac667ca15244b5e959fa6e22478b29dabeb581d49ef8a2874e291d0417a3a959be70428c39cd40870e73b394dbc
   languageName: node
   linkType: hard
 
 "@webassemblyjs/helper-buffer@npm:1.9.0":
   version: 1.9.0
   resolution: "@webassemblyjs/helper-buffer@npm:1.9.0"
-  checksum: b09a3e27d9127ccaab095bd171336e7675bb5b832e05b701ff174a853b763154a49f5382c4c3f2f1cc746b1cff3f2025452145cf807ddf788133bcccf5920ca8
+  checksum: 10c0/b09a3e27d9127ccaab095bd171336e7675bb5b832e05b701ff174a853b763154a49f5382c4c3f2f1cc746b1cff3f2025452145cf807ddf788133bcccf5920ca8
   languageName: node
   linkType: hard
 
@@ -3825,14 +3825,14 @@ __metadata:
   resolution: "@webassemblyjs/helper-code-frame@npm:1.9.0"
   dependencies:
     "@webassemblyjs/wast-printer": "npm:1.9.0"
-  checksum: 010969a6c8b016680a9b1383ff4b8147c363608dd1e29602154e5460954af4fd48daed518a76b232ca43935d4b6bebf54fba38da56f809e2bd12f063d84013ec
+  checksum: 10c0/010969a6c8b016680a9b1383ff4b8147c363608dd1e29602154e5460954af4fd48daed518a76b232ca43935d4b6bebf54fba38da56f809e2bd12f063d84013ec
   languageName: node
   linkType: hard
 
 "@webassemblyjs/helper-fsm@npm:1.9.0":
   version: 1.9.0
   resolution: "@webassemblyjs/helper-fsm@npm:1.9.0"
-  checksum: ef0c99b58716d757a1a41f99fb46578d3f07d97b60cd51deaeffdf0aad09ec47f5093ee8d098d12324d57f8812609704c377fccfe9a32d02c0a658a4a33dce94
+  checksum: 10c0/ef0c99b58716d757a1a41f99fb46578d3f07d97b60cd51deaeffdf0aad09ec47f5093ee8d098d12324d57f8812609704c377fccfe9a32d02c0a658a4a33dce94
   languageName: node
   linkType: hard
 
@@ -3841,14 +3841,14 @@ __metadata:
   resolution: "@webassemblyjs/helper-module-context@npm:1.9.0"
   dependencies:
     "@webassemblyjs/ast": "npm:1.9.0"
-  checksum: 130a9ac1141770b9f70ad568ec2dc769e92c756f91b06ece9cda2c2a5e80e21ec9c8c2a945a5839bf379e52fa921ae134245a7492e1b9ae0e8c557bb9b4953c3
+  checksum: 10c0/130a9ac1141770b9f70ad568ec2dc769e92c756f91b06ece9cda2c2a5e80e21ec9c8c2a945a5839bf379e52fa921ae134245a7492e1b9ae0e8c557bb9b4953c3
   languageName: node
   linkType: hard
 
 "@webassemblyjs/helper-wasm-bytecode@npm:1.9.0":
   version: 1.9.0
   resolution: "@webassemblyjs/helper-wasm-bytecode@npm:1.9.0"
-  checksum: 1741993e1c723f56b619a4981ec975f903886aa3f1f50c7bdb2eaa45ca4ad8d023d6ae7413ef643f060567b1f12a9dcfad6c43688879c46ee4f0b53aa71cd5c9
+  checksum: 10c0/1741993e1c723f56b619a4981ec975f903886aa3f1f50c7bdb2eaa45ca4ad8d023d6ae7413ef643f060567b1f12a9dcfad6c43688879c46ee4f0b53aa71cd5c9
   languageName: node
   linkType: hard
 
@@ -3860,7 +3860,7 @@ __metadata:
     "@webassemblyjs/helper-buffer": "npm:1.9.0"
     "@webassemblyjs/helper-wasm-bytecode": "npm:1.9.0"
     "@webassemblyjs/wasm-gen": "npm:1.9.0"
-  checksum: 2a5baa7749c50a4a428f372ab88b7e52956b48798d44e7291b4aa8558b247337dba791112ce8a4f5b2281e1b9014e6d44d0141476a5fcde6016fac2e009671e8
+  checksum: 10c0/2a5baa7749c50a4a428f372ab88b7e52956b48798d44e7291b4aa8558b247337dba791112ce8a4f5b2281e1b9014e6d44d0141476a5fcde6016fac2e009671e8
   languageName: node
   linkType: hard
 
@@ -3869,7 +3869,7 @@ __metadata:
   resolution: "@webassemblyjs/ieee754@npm:1.9.0"
   dependencies:
     "@xtuc/ieee754": "npm:^1.2.0"
-  checksum: 0eff34ec7048400b30282ab9af6ad19d2852dab2f5ffaec8bdc697b8380bc2c9dbe6cadf65f49e68242c82ee3caa8aa6e46c89dbfdab37615189b4da2eab3819
+  checksum: 10c0/0eff34ec7048400b30282ab9af6ad19d2852dab2f5ffaec8bdc697b8380bc2c9dbe6cadf65f49e68242c82ee3caa8aa6e46c89dbfdab37615189b4da2eab3819
   languageName: node
   linkType: hard
 
@@ -3878,14 +3878,14 @@ __metadata:
   resolution: "@webassemblyjs/leb128@npm:1.9.0"
   dependencies:
     "@xtuc/long": "npm:4.2.2"
-  checksum: 441be8634733b33b710f44d4394552d6290bb1a0a8311b384b1865b58c3549d0ddeaf1c3985bbee024a8df12c597be3580fc1cde2ae003dcbf26762b493a7a2f
+  checksum: 10c0/441be8634733b33b710f44d4394552d6290bb1a0a8311b384b1865b58c3549d0ddeaf1c3985bbee024a8df12c597be3580fc1cde2ae003dcbf26762b493a7a2f
   languageName: node
   linkType: hard
 
 "@webassemblyjs/utf8@npm:1.9.0":
   version: 1.9.0
   resolution: "@webassemblyjs/utf8@npm:1.9.0"
-  checksum: 9566689a1bcf555d6b79d0da79e24ff2be23c0395e5a19ed3c2ceca7831e50b867e0b1c66b3ff1b1d7f297b2d2414314967a884a77634ad0acff8a78489e2b19
+  checksum: 10c0/9566689a1bcf555d6b79d0da79e24ff2be23c0395e5a19ed3c2ceca7831e50b867e0b1c66b3ff1b1d7f297b2d2414314967a884a77634ad0acff8a78489e2b19
   languageName: node
   linkType: hard
 
@@ -3901,7 +3901,7 @@ __metadata:
     "@webassemblyjs/wasm-opt": "npm:1.9.0"
     "@webassemblyjs/wasm-parser": "npm:1.9.0"
     "@webassemblyjs/wast-printer": "npm:1.9.0"
-  checksum: 07f4cb4a73989622c524f9264b6afe664d33354f081499f04db675aed2b79498bd43600c3d7bebcb9f93ccce6a094b3c28f3f7b11ea62e9e82074c2ae68dc058
+  checksum: 10c0/07f4cb4a73989622c524f9264b6afe664d33354f081499f04db675aed2b79498bd43600c3d7bebcb9f93ccce6a094b3c28f3f7b11ea62e9e82074c2ae68dc058
   languageName: node
   linkType: hard
 
@@ -3914,7 +3914,7 @@ __metadata:
     "@webassemblyjs/ieee754": "npm:1.9.0"
     "@webassemblyjs/leb128": "npm:1.9.0"
     "@webassemblyjs/utf8": "npm:1.9.0"
-  checksum: 876826bef91f3af9e48118fb269c348871d5b6f019e071065556da56a3a5818630b00133e07c9dd2cc767e7f2c70934f3ed0060330ce3e37910e9c9df25f1600
+  checksum: 10c0/876826bef91f3af9e48118fb269c348871d5b6f019e071065556da56a3a5818630b00133e07c9dd2cc767e7f2c70934f3ed0060330ce3e37910e9c9df25f1600
   languageName: node
   linkType: hard
 
@@ -3926,7 +3926,7 @@ __metadata:
     "@webassemblyjs/helper-buffer": "npm:1.9.0"
     "@webassemblyjs/wasm-gen": "npm:1.9.0"
     "@webassemblyjs/wasm-parser": "npm:1.9.0"
-  checksum: 3d5558e078b660cd9777950f2df60f005f3cbdbcfa6c8c19dc0cf012f44f5bfa97c991d7ac26b3e78596bad0538e92dd00b5db4b51ebc373da8e329a03639190
+  checksum: 10c0/3d5558e078b660cd9777950f2df60f005f3cbdbcfa6c8c19dc0cf012f44f5bfa97c991d7ac26b3e78596bad0538e92dd00b5db4b51ebc373da8e329a03639190
   languageName: node
   linkType: hard
 
@@ -3940,7 +3940,7 @@ __metadata:
     "@webassemblyjs/ieee754": "npm:1.9.0"
     "@webassemblyjs/leb128": "npm:1.9.0"
     "@webassemblyjs/utf8": "npm:1.9.0"
-  checksum: 1e8615b9f9c3c431c9635c9a9884bca89eff1ab2383ad849341c23e09899454482a8f8813d33bf86ee1b0acc97c7c83926961a9b34d4804fa5d559610ab0a4a2
+  checksum: 10c0/1e8615b9f9c3c431c9635c9a9884bca89eff1ab2383ad849341c23e09899454482a8f8813d33bf86ee1b0acc97c7c83926961a9b34d4804fa5d559610ab0a4a2
   languageName: node
   linkType: hard
 
@@ -3954,7 +3954,7 @@ __metadata:
     "@webassemblyjs/helper-code-frame": "npm:1.9.0"
     "@webassemblyjs/helper-fsm": "npm:1.9.0"
     "@xtuc/long": "npm:4.2.2"
-  checksum: c79952466fdf7816be527b1db102952b777b12318eabb5c40df074cd8361e3a7b0179a985534fa8b5a7b93668b07ba46875ffeb5da03ca5177c80ba960ebdffc
+  checksum: 10c0/c79952466fdf7816be527b1db102952b777b12318eabb5c40df074cd8361e3a7b0179a985534fa8b5a7b93668b07ba46875ffeb5da03ca5177c80ba960ebdffc
   languageName: node
   linkType: hard
 
@@ -3965,35 +3965,35 @@ __metadata:
     "@webassemblyjs/ast": "npm:1.9.0"
     "@webassemblyjs/wast-parser": "npm:1.9.0"
     "@xtuc/long": "npm:4.2.2"
-  checksum: f3d106aa884cbb7687307db7adeb3b98abff9de81b9ba8c1065267340b5e9de64ffc533044ab916b1f4ce8a67fb03efa54b29b61c8e908abe4c07edf82f614cd
+  checksum: 10c0/f3d106aa884cbb7687307db7adeb3b98abff9de81b9ba8c1065267340b5e9de64ffc533044ab916b1f4ce8a67fb03efa54b29b61c8e908abe4c07edf82f614cd
   languageName: node
   linkType: hard
 
 "@xtuc/ieee754@npm:^1.2.0":
   version: 1.2.0
   resolution: "@xtuc/ieee754@npm:1.2.0"
-  checksum: a8565d29d135039bd99ae4b2220d3e167d22cf53f867e491ed479b3f84f895742d0097f935b19aab90265a23d5d46711e4204f14c479ae3637fbf06c4666882f
+  checksum: 10c0/a8565d29d135039bd99ae4b2220d3e167d22cf53f867e491ed479b3f84f895742d0097f935b19aab90265a23d5d46711e4204f14c479ae3637fbf06c4666882f
   languageName: node
   linkType: hard
 
 "@xtuc/long@npm:4.2.2":
   version: 4.2.2
   resolution: "@xtuc/long@npm:4.2.2"
-  checksum: 8582cbc69c79ad2d31568c412129bf23d2b1210a1dfb60c82d5a1df93334da4ee51f3057051658569e2c196d8dc33bc05ae6b974a711d0d16e801e1d0647ccd1
+  checksum: 10c0/8582cbc69c79ad2d31568c412129bf23d2b1210a1dfb60c82d5a1df93334da4ee51f3057051658569e2c196d8dc33bc05ae6b974a711d0d16e801e1d0647ccd1
   languageName: node
   linkType: hard
 
 "abab@npm:^2.0.6":
   version: 2.0.6
   resolution: "abab@npm:2.0.6"
-  checksum: 0b245c3c3ea2598fe0025abf7cc7bb507b06949d51e8edae5d12c1b847a0a0c09639abcb94788332b4e2044ac4491c1e8f571b51c7826fd4b0bda1685ad4a278
+  checksum: 10c0/0b245c3c3ea2598fe0025abf7cc7bb507b06949d51e8edae5d12c1b847a0a0c09639abcb94788332b4e2044ac4491c1e8f571b51c7826fd4b0bda1685ad4a278
   languageName: node
   linkType: hard
 
 "abbrev@npm:^2.0.0":
   version: 2.0.0
   resolution: "abbrev@npm:2.0.0"
-  checksum: f742a5a107473946f426c691c08daba61a1d15942616f300b5d32fd735be88fef5cba24201757b6c407fd564555fb48c751cfa33519b2605c8a7aadd22baf372
+  checksum: 10c0/f742a5a107473946f426c691c08daba61a1d15942616f300b5d32fd735be88fef5cba24201757b6c407fd564555fb48c751cfa33519b2605c8a7aadd22baf372
   languageName: node
   linkType: hard
 
@@ -4002,7 +4002,7 @@ __metadata:
   resolution: "abort-controller@npm:3.0.0"
   dependencies:
     event-target-shim: "npm:^5.0.0"
-  checksum: 90ccc50f010250152509a344eb2e71977fbf8db0ab8f1061197e3275ddf6c61a41a6edfd7b9409c664513131dd96e962065415325ef23efa5db931b382d24ca5
+  checksum: 10c0/90ccc50f010250152509a344eb2e71977fbf8db0ab8f1061197e3275ddf6c61a41a6edfd7b9409c664513131dd96e962065415325ef23efa5db931b382d24ca5
   languageName: node
   linkType: hard
 
@@ -4012,7 +4012,7 @@ __metadata:
   dependencies:
     mime-types: "npm:~2.1.34"
     negotiator: "npm:0.6.3"
-  checksum: 3a35c5f5586cfb9a21163ca47a5f77ac34fa8ceb5d17d2fa2c0d81f41cbd7f8c6fa52c77e2c039acc0f4d09e71abdc51144246900f6bef5e3c4b333f77d89362
+  checksum: 10c0/3a35c5f5586cfb9a21163ca47a5f77ac34fa8ceb5d17d2fa2c0d81f41cbd7f8c6fa52c77e2c039acc0f4d09e71abdc51144246900f6bef5e3c4b333f77d89362
   languageName: node
   linkType: hard
 
@@ -4022,7 +4022,7 @@ __metadata:
   dependencies:
     acorn: "npm:^8.1.0"
     acorn-walk: "npm:^8.0.2"
-  checksum: 7437f58e92d99292dbebd0e79531af27d706c9f272f31c675d793da6c82d897e75302a8744af13c7f7978a8399840f14a353b60cf21014647f71012982456d2b
+  checksum: 10c0/7437f58e92d99292dbebd0e79531af27d706c9f272f31c675d793da6c82d897e75302a8744af13c7f7978a8399840f14a353b60cf21014647f71012982456d2b
   languageName: node
   linkType: hard
 
@@ -4031,14 +4031,14 @@ __metadata:
   resolution: "acorn-jsx@npm:5.3.2"
   peerDependencies:
     acorn: ^6.0.0 || ^7.0.0 || ^8.0.0
-  checksum: 4c54868fbef3b8d58927d5e33f0a4de35f59012fe7b12cf9dfbb345fb8f46607709e1c4431be869a23fb63c151033d84c4198fa9f79385cec34fcb1dd53974c1
+  checksum: 10c0/4c54868fbef3b8d58927d5e33f0a4de35f59012fe7b12cf9dfbb345fb8f46607709e1c4431be869a23fb63c151033d84c4198fa9f79385cec34fcb1dd53974c1
   languageName: node
   linkType: hard
 
 "acorn-walk@npm:^8.0.0, acorn-walk@npm:^8.0.2":
   version: 8.2.0
   resolution: "acorn-walk@npm:8.2.0"
-  checksum: dbe92f5b2452c93e960c5594e666dd1fae141b965ff2cb4a1e1d0381e3e4db4274c5ce4ffa3d681a86ca2a8d4e29d5efc0670a08e23fd2800051ea387df56ca2
+  checksum: 10c0/dbe92f5b2452c93e960c5594e666dd1fae141b965ff2cb4a1e1d0381e3e4db4274c5ce4ffa3d681a86ca2a8d4e29d5efc0670a08e23fd2800051ea387df56ca2
   languageName: node
   linkType: hard
 
@@ -4047,7 +4047,7 @@ __metadata:
   resolution: "acorn@npm:6.4.2"
   bin:
     acorn: bin/acorn
-  checksum: 52a72d5d785fa64a95880f2951021a38954f8f69a4944dfeab6fb1449b0f02293eae109a56d55b58ff31a90a00d16a804658a12db8ef834c20b3d1201fe5ba5b
+  checksum: 10c0/52a72d5d785fa64a95880f2951021a38954f8f69a4944dfeab6fb1449b0f02293eae109a56d55b58ff31a90a00d16a804658a12db8ef834c20b3d1201fe5ba5b
   languageName: node
   linkType: hard
 
@@ -4056,7 +4056,7 @@ __metadata:
   resolution: "acorn@npm:8.11.2"
   bin:
     acorn: bin/acorn
-  checksum: a3ed76c761b75ec54b1ec3068fb7f113a182e95aea7f322f65098c2958d232e3d211cb6dac35ff9c647024b63714bc528a26d54a925d1fef2c25585b4c8e4017
+  checksum: 10c0/a3ed76c761b75ec54b1ec3068fb7f113a182e95aea7f322f65098c2958d232e3d211cb6dac35ff9c647024b63714bc528a26d54a925d1fef2c25585b4c8e4017
   languageName: node
   linkType: hard
 
@@ -4065,7 +4065,7 @@ __metadata:
   resolution: "agent-base@npm:6.0.2"
   dependencies:
     debug: "npm:4"
-  checksum: dc4f757e40b5f3e3d674bc9beb4f1048f4ee83af189bae39be99f57bf1f48dde166a8b0a5342a84b5944ee8e6ed1e5a9d801858f4ad44764e84957122fe46261
+  checksum: 10c0/dc4f757e40b5f3e3d674bc9beb4f1048f4ee83af189bae39be99f57bf1f48dde166a8b0a5342a84b5944ee8e6ed1e5a9d801858f4ad44764e84957122fe46261
   languageName: node
   linkType: hard
 
@@ -4074,7 +4074,7 @@ __metadata:
   resolution: "agent-base@npm:7.1.0"
   dependencies:
     debug: "npm:^4.3.4"
-  checksum: fc974ab57ffdd8421a2bc339644d312a9cca320c20c3393c9d8b1fd91731b9bbabdb985df5fc860f5b79d81c3e350daa3fcb31c5c07c0bb385aafc817df004ce
+  checksum: 10c0/fc974ab57ffdd8421a2bc339644d312a9cca320c20c3393c9d8b1fd91731b9bbabdb985df5fc860f5b79d81c3e350daa3fcb31c5c07c0bb385aafc817df004ce
   languageName: node
   linkType: hard
 
@@ -4084,7 +4084,7 @@ __metadata:
   dependencies:
     clean-stack: "npm:^2.0.0"
     indent-string: "npm:^4.0.0"
-  checksum: a42f67faa79e3e6687a4923050e7c9807db3848a037076f791d10e092677d65c1d2d863b7848560699f40fc0502c19f40963fb1cd1fb3d338a7423df8e45e039
+  checksum: 10c0/a42f67faa79e3e6687a4923050e7c9807db3848a037076f791d10e092677d65c1d2d863b7848560699f40fc0502c19f40963fb1cd1fb3d338a7423df8e45e039
   languageName: node
   linkType: hard
 
@@ -4093,7 +4093,7 @@ __metadata:
   resolution: "ajv-errors@npm:1.0.1"
   peerDependencies:
     ajv: ">=5.0.0"
-  checksum: de2d6e8100c8707ea063ee4785d53adf599b457c0d4f72c3592244d67ad16448a6d35f7ce45f12bdd2819939447c876e8ef2f1c0800896d7f2aa25c3838acdf1
+  checksum: 10c0/de2d6e8100c8707ea063ee4785d53adf599b457c0d4f72c3592244d67ad16448a6d35f7ce45f12bdd2819939447c876e8ef2f1c0800896d7f2aa25c3838acdf1
   languageName: node
   linkType: hard
 
@@ -4102,7 +4102,7 @@ __metadata:
   resolution: "ajv-keywords@npm:3.5.2"
   peerDependencies:
     ajv: ^6.9.1
-  checksum: 0c57a47cbd656e8cdfd99d7c2264de5868918ffa207c8d7a72a7f63379d4333254b2ba03d69e3c035e996a3fd3eb6d5725d7a1597cca10694296e32510546360
+  checksum: 10c0/0c57a47cbd656e8cdfd99d7c2264de5868918ffa207c8d7a72a7f63379d4333254b2ba03d69e3c035e996a3fd3eb6d5725d7a1597cca10694296e32510546360
   languageName: node
   linkType: hard
 
@@ -4114,7 +4114,7 @@ __metadata:
     fast-json-stable-stringify: "npm:^2.0.0"
     json-schema-traverse: "npm:^0.4.1"
     uri-js: "npm:^4.2.2"
-  checksum: 41e23642cbe545889245b9d2a45854ebba51cda6c778ebced9649420d9205f2efb39cb43dbc41e358409223b1ea43303ae4839db682c848b891e4811da1a5a71
+  checksum: 10c0/41e23642cbe545889245b9d2a45854ebba51cda6c778ebced9649420d9205f2efb39cb43dbc41e358409223b1ea43303ae4839db682c848b891e4811da1a5a71
   languageName: node
   linkType: hard
 
@@ -4126,14 +4126,14 @@ __metadata:
     json-schema-traverse: "npm:^1.0.0"
     require-from-string: "npm:^2.0.2"
     uri-js: "npm:^4.2.2"
-  checksum: ac4f72adf727ee425e049bc9d8b31d4a57e1c90da8d28bcd23d60781b12fcd6fc3d68db5df16994c57b78b94eed7988f5a6b482fd376dc5b084125e20a0a622e
+  checksum: 10c0/ac4f72adf727ee425e049bc9d8b31d4a57e1c90da8d28bcd23d60781b12fcd6fc3d68db5df16994c57b78b94eed7988f5a6b482fd376dc5b084125e20a0a622e
   languageName: node
   linkType: hard
 
 "ansi-colors@npm:^3.0.0":
   version: 3.2.4
   resolution: "ansi-colors@npm:3.2.4"
-  checksum: 1785466547bac3b1cb8055325a415c8c946a818669da4fd3d1247cab7617b845b221c2ae04756277074d278b52d90efd67f73d2dd927c7a0d1a10395c1b7665b
+  checksum: 10c0/1785466547bac3b1cb8055325a415c8c946a818669da4fd3d1247cab7617b845b221c2ae04756277074d278b52d90efd67f73d2dd927c7a0d1a10395c1b7665b
   languageName: node
   linkType: hard
 
@@ -4142,7 +4142,7 @@ __metadata:
   resolution: "ansi-escapes@npm:4.3.2"
   dependencies:
     type-fest: "npm:^0.21.3"
-  checksum: da917be01871525a3dfcf925ae2977bc59e8c513d4423368645634bf5d4ceba5401574eb705c1e92b79f7292af5a656f78c5725a4b0e1cec97c4b413705c1d50
+  checksum: 10c0/da917be01871525a3dfcf925ae2977bc59e8c513d4423368645634bf5d4ceba5401574eb705c1e92b79f7292af5a656f78c5725a4b0e1cec97c4b413705c1d50
   languageName: node
   linkType: hard
 
@@ -4151,7 +4151,7 @@ __metadata:
   resolution: "ansi-escapes@npm:6.2.0"
   dependencies:
     type-fest: "npm:^3.0.0"
-  checksum: 3eec75deedd8b10192c5f98e4cd9715cc3ff268d33fc463c24b7d22446668bfcd4ad1803993ea89c0f51f88b5a3399572bacb7c8cb1a067fc86e189c5f3b0c7e
+  checksum: 10c0/3eec75deedd8b10192c5f98e4cd9715cc3ff268d33fc463c24b7d22446668bfcd4ad1803993ea89c0f51f88b5a3399572bacb7c8cb1a067fc86e189c5f3b0c7e
   languageName: node
   linkType: hard
 
@@ -4160,35 +4160,35 @@ __metadata:
   resolution: "ansi-html-community@npm:0.0.8"
   bin:
     ansi-html: bin/ansi-html
-  checksum: 45d3a6f0b4f10b04fdd44bef62972e2470bfd917bf00439471fa7473d92d7cbe31369c73db863cc45dda115cb42527f39e232e9256115534b8ee5806b0caeed4
+  checksum: 10c0/45d3a6f0b4f10b04fdd44bef62972e2470bfd917bf00439471fa7473d92d7cbe31369c73db863cc45dda115cb42527f39e232e9256115534b8ee5806b0caeed4
   languageName: node
   linkType: hard
 
 "ansi-regex@npm:^2.0.0":
   version: 2.1.1
   resolution: "ansi-regex@npm:2.1.1"
-  checksum: 78cebaf50bce2cb96341a7230adf28d804611da3ce6bf338efa7b72f06cc6ff648e29f80cd95e582617ba58d5fdbec38abfeed3500a98bce8381a9daec7c548b
+  checksum: 10c0/78cebaf50bce2cb96341a7230adf28d804611da3ce6bf338efa7b72f06cc6ff648e29f80cd95e582617ba58d5fdbec38abfeed3500a98bce8381a9daec7c548b
   languageName: node
   linkType: hard
 
 "ansi-regex@npm:^4.1.0":
   version: 4.1.1
   resolution: "ansi-regex@npm:4.1.1"
-  checksum: d36d34234d077e8770169d980fed7b2f3724bfa2a01da150ccd75ef9707c80e883d27cdf7a0eac2f145ac1d10a785a8a855cffd05b85f778629a0db62e7033da
+  checksum: 10c0/d36d34234d077e8770169d980fed7b2f3724bfa2a01da150ccd75ef9707c80e883d27cdf7a0eac2f145ac1d10a785a8a855cffd05b85f778629a0db62e7033da
   languageName: node
   linkType: hard
 
 "ansi-regex@npm:^5.0.1":
   version: 5.0.1
   resolution: "ansi-regex@npm:5.0.1"
-  checksum: 9a64bb8627b434ba9327b60c027742e5d17ac69277960d041898596271d992d4d52ba7267a63ca10232e29f6107fc8a835f6ce8d719b88c5f8493f8254813737
+  checksum: 10c0/9a64bb8627b434ba9327b60c027742e5d17ac69277960d041898596271d992d4d52ba7267a63ca10232e29f6107fc8a835f6ce8d719b88c5f8493f8254813737
   languageName: node
   linkType: hard
 
 "ansi-regex@npm:^6.0.1":
   version: 6.0.1
   resolution: "ansi-regex@npm:6.0.1"
-  checksum: cbe16dbd2c6b2735d1df7976a7070dd277326434f0212f43abf6d87674095d247968209babdaad31bb00882fa68807256ba9be340eec2f1004de14ca75f52a08
+  checksum: 10c0/cbe16dbd2c6b2735d1df7976a7070dd277326434f0212f43abf6d87674095d247968209babdaad31bb00882fa68807256ba9be340eec2f1004de14ca75f52a08
   languageName: node
   linkType: hard
 
@@ -4197,7 +4197,7 @@ __metadata:
   resolution: "ansi-styles@npm:3.2.1"
   dependencies:
     color-convert: "npm:^1.9.0"
-  checksum: ece5a8ef069fcc5298f67e3f4771a663129abd174ea2dfa87923a2be2abf6cd367ef72ac87942da00ce85bd1d651d4cd8595aebdb1b385889b89b205860e977b
+  checksum: 10c0/ece5a8ef069fcc5298f67e3f4771a663129abd174ea2dfa87923a2be2abf6cd367ef72ac87942da00ce85bd1d651d4cd8595aebdb1b385889b89b205860e977b
   languageName: node
   linkType: hard
 
@@ -4206,21 +4206,21 @@ __metadata:
   resolution: "ansi-styles@npm:4.3.0"
   dependencies:
     color-convert: "npm:^2.0.1"
-  checksum: 895a23929da416f2bd3de7e9cb4eabd340949328ab85ddd6e484a637d8f6820d485f53933446f5291c3b760cbc488beb8e88573dd0f9c7daf83dccc8fe81b041
+  checksum: 10c0/895a23929da416f2bd3de7e9cb4eabd340949328ab85ddd6e484a637d8f6820d485f53933446f5291c3b760cbc488beb8e88573dd0f9c7daf83dccc8fe81b041
   languageName: node
   linkType: hard
 
 "ansi-styles@npm:^5.0.0":
   version: 5.2.0
   resolution: "ansi-styles@npm:5.2.0"
-  checksum: 9c4ca80eb3c2fb7b33841c210d2f20807f40865d27008d7c3f707b7f95cab7d67462a565e2388ac3285b71cb3d9bb2173de8da37c57692a362885ec34d6e27df
+  checksum: 10c0/9c4ca80eb3c2fb7b33841c210d2f20807f40865d27008d7c3f707b7f95cab7d67462a565e2388ac3285b71cb3d9bb2173de8da37c57692a362885ec34d6e27df
   languageName: node
   linkType: hard
 
 "ansi-styles@npm:^6.0.0, ansi-styles@npm:^6.1.0, ansi-styles@npm:^6.2.1":
   version: 6.2.1
   resolution: "ansi-styles@npm:6.2.1"
-  checksum: 5d1ec38c123984bcedd996eac680d548f31828bd679a66db2bdf11844634dde55fec3efa9c6bb1d89056a5e79c1ac540c4c784d592ea1d25028a92227d2f2d5c
+  checksum: 10c0/5d1ec38c123984bcedd996eac680d548f31828bd679a66db2bdf11844634dde55fec3efa9c6bb1d89056a5e79c1ac540c4c784d592ea1d25028a92227d2f2d5c
   languageName: node
   linkType: hard
 
@@ -4230,7 +4230,7 @@ __metadata:
   dependencies:
     micromatch: "npm:^3.1.4"
     normalize-path: "npm:^2.1.1"
-  checksum: a0d745e52f0233048724b9c9d7b1d8a650f7a50151a0f1d2cce1857b09fd096052d334f8c570cc88596edef8249ae778f767db94025cd00f81e154a37bb7e34e
+  checksum: 10c0/a0d745e52f0233048724b9c9d7b1d8a650f7a50151a0f1d2cce1857b09fd096052d334f8c570cc88596edef8249ae778f767db94025cd00f81e154a37bb7e34e
   languageName: node
   linkType: hard
 
@@ -4240,14 +4240,14 @@ __metadata:
   dependencies:
     normalize-path: "npm:^3.0.0"
     picomatch: "npm:^2.0.4"
-  checksum: 57b06ae984bc32a0d22592c87384cd88fe4511b1dd7581497831c56d41939c8a001b28e7b853e1450f2bf61992dfcaa8ae2d0d161a0a90c4fb631ef07098fbac
+  checksum: 10c0/57b06ae984bc32a0d22592c87384cd88fe4511b1dd7581497831c56d41939c8a001b28e7b853e1450f2bf61992dfcaa8ae2d0d161a0a90c4fb631ef07098fbac
   languageName: node
   linkType: hard
 
 "are-docs-informative@npm:^0.0.2":
   version: 0.0.2
   resolution: "are-docs-informative@npm:0.0.2"
-  checksum: f0326981bd699c372d268b526b170a28f2e1aec2cf99d7de0686083528427ecdf6ae41fef5d9988e224a5616298af747ad8a76e7306b0a7c97cc085a99636d60
+  checksum: 10c0/f0326981bd699c372d268b526b170a28f2e1aec2cf99d7de0686083528427ecdf6ae41fef5d9988e224a5616298af747ad8a76e7306b0a7c97cc085a99636d60
   languageName: node
   linkType: hard
 
@@ -4256,14 +4256,14 @@ __metadata:
   resolution: "argparse@npm:1.0.10"
   dependencies:
     sprintf-js: "npm:~1.0.2"
-  checksum: b2972c5c23c63df66bca144dbc65d180efa74f25f8fd9b7d9a0a6c88ae839db32df3d54770dcb6460cf840d232b60695d1a6b1053f599d84e73f7437087712de
+  checksum: 10c0/b2972c5c23c63df66bca144dbc65d180efa74f25f8fd9b7d9a0a6c88ae839db32df3d54770dcb6460cf840d232b60695d1a6b1053f599d84e73f7437087712de
   languageName: node
   linkType: hard
 
 "argparse@npm:^2.0.1":
   version: 2.0.1
   resolution: "argparse@npm:2.0.1"
-  checksum: c5640c2d89045371c7cedd6a70212a04e360fd34d6edeae32f6952c63949e3525ea77dbec0289d8213a99bbaeab5abfa860b5c12cf88a2e6cf8106e90dd27a7e
+  checksum: 10c0/c5640c2d89045371c7cedd6a70212a04e360fd34d6edeae32f6952c63949e3525ea77dbec0289d8213a99bbaeab5abfa860b5c12cf88a2e6cf8106e90dd27a7e
   languageName: node
   linkType: hard
 
@@ -4272,7 +4272,7 @@ __metadata:
   resolution: "aria-query@npm:5.1.3"
   dependencies:
     deep-equal: "npm:^2.0.5"
-  checksum: edcbc8044c4663d6f88f785e983e6784f98cb62b4ba1e9dd8d61b725d0203e4cfca38d676aee984c31f354103461102a3d583aa4fbe4fd0a89b679744f4e5faf
+  checksum: 10c0/edcbc8044c4663d6f88f785e983e6784f98cb62b4ba1e9dd8d61b725d0203e4cfca38d676aee984c31f354103461102a3d583aa4fbe4fd0a89b679744f4e5faf
   languageName: node
   linkType: hard
 
@@ -4281,28 +4281,28 @@ __metadata:
   resolution: "aria-query@npm:5.3.0"
   dependencies:
     dequal: "npm:^2.0.3"
-  checksum: 2bff0d4eba5852a9dd578ecf47eaef0e82cc52569b48469b0aac2db5145db0b17b7a58d9e01237706d1e14b7a1b0ac9b78e9c97027ad97679dd8f91b85da1469
+  checksum: 10c0/2bff0d4eba5852a9dd578ecf47eaef0e82cc52569b48469b0aac2db5145db0b17b7a58d9e01237706d1e14b7a1b0ac9b78e9c97027ad97679dd8f91b85da1469
   languageName: node
   linkType: hard
 
 "arr-diff@npm:^4.0.0":
   version: 4.0.0
   resolution: "arr-diff@npm:4.0.0"
-  checksum: 67b80067137f70c89953b95f5c6279ad379c3ee39f7143578e13bd51580a40066ee2a55da066e22d498dce10f68c2d70056d7823f972fab99dfbf4c78d0bc0f7
+  checksum: 10c0/67b80067137f70c89953b95f5c6279ad379c3ee39f7143578e13bd51580a40066ee2a55da066e22d498dce10f68c2d70056d7823f972fab99dfbf4c78d0bc0f7
   languageName: node
   linkType: hard
 
 "arr-flatten@npm:^1.1.0":
   version: 1.1.0
   resolution: "arr-flatten@npm:1.1.0"
-  checksum: bef53be02ed3bc58f202b3861a5b1eb6e1ae4fecf39c3ad4d15b1e0433f941077d16e019a33312d820844b0661777322acbb7d0c447b04d9bdf7d6f9c532548a
+  checksum: 10c0/bef53be02ed3bc58f202b3861a5b1eb6e1ae4fecf39c3ad4d15b1e0433f941077d16e019a33312d820844b0661777322acbb7d0c447b04d9bdf7d6f9c532548a
   languageName: node
   linkType: hard
 
 "arr-union@npm:^3.1.0":
   version: 3.1.0
   resolution: "arr-union@npm:3.1.0"
-  checksum: 7d5aa05894e54aa93c77c5726c1dd5d8e8d3afe4f77983c0aa8a14a8a5cbe8b18f0cf4ecaa4ac8c908ef5f744d2cbbdaa83fd6e96724d15fea56cfa7f5efdd51
+  checksum: 10c0/7d5aa05894e54aa93c77c5726c1dd5d8e8d3afe4f77983c0aa8a14a8a5cbe8b18f0cf4ecaa4ac8c908ef5f744d2cbbdaa83fd6e96724d15fea56cfa7f5efdd51
   languageName: node
   linkType: hard
 
@@ -4312,21 +4312,21 @@ __metadata:
   dependencies:
     call-bind: "npm:^1.0.2"
     is-array-buffer: "npm:^3.0.1"
-  checksum: 12f84f6418b57a954caa41654e5e63e019142a4bbb2c6829ba86d1ba65d31ccfaf1461d1743556fd32b091fac34ff44d9dfbdb001402361c45c373b2c86f5c20
+  checksum: 10c0/12f84f6418b57a954caa41654e5e63e019142a4bbb2c6829ba86d1ba65d31ccfaf1461d1743556fd32b091fac34ff44d9dfbdb001402361c45c373b2c86f5c20
   languageName: node
   linkType: hard
 
 "array-flatten@npm:1.1.1":
   version: 1.1.1
   resolution: "array-flatten@npm:1.1.1"
-  checksum: 806966c8abb2f858b08f5324d9d18d7737480610f3bd5d3498aaae6eb5efdc501a884ba019c9b4a8f02ff67002058749d05548fd42fa8643f02c9c7f22198b91
+  checksum: 10c0/806966c8abb2f858b08f5324d9d18d7737480610f3bd5d3498aaae6eb5efdc501a884ba019c9b4a8f02ff67002058749d05548fd42fa8643f02c9c7f22198b91
   languageName: node
   linkType: hard
 
 "array-flatten@npm:^2.1.0":
   version: 2.1.2
   resolution: "array-flatten@npm:2.1.2"
-  checksum: bdc1cee68e41bec9cfc1161408734e2269428ef371445606bce4e6241001e138a94b9a617cc9a5b4b7fe6a3a51e3d5a942646975ce82a2e202ccf3e9b478c82f
+  checksum: 10c0/bdc1cee68e41bec9cfc1161408734e2269428ef371445606bce4e6241001e138a94b9a617cc9a5b4b7fe6a3a51e3d5a942646975ce82a2e202ccf3e9b478c82f
   languageName: node
   linkType: hard
 
@@ -4339,7 +4339,7 @@ __metadata:
     es-abstract: "npm:^1.22.1"
     get-intrinsic: "npm:^1.2.1"
     is-string: "npm:^1.0.7"
-  checksum: 692907bd7f19d06dc58ccb761f34b58f5dc0b437d2b47a8fe42a1501849a5cf5c27aed3d521a9702667827c2c85a7e75df00a402c438094d87fc43f39ebf9b2b
+  checksum: 10c0/692907bd7f19d06dc58ccb761f34b58f5dc0b437d2b47a8fe42a1501849a5cf5c27aed3d521a9702667827c2c85a7e75df00a402c438094d87fc43f39ebf9b2b
   languageName: node
   linkType: hard
 
@@ -4348,28 +4348,28 @@ __metadata:
   resolution: "array-union@npm:1.0.2"
   dependencies:
     array-uniq: "npm:^1.0.1"
-  checksum: 18686767c0cfdae8dc4acf5ac119b0f0eacad82b7fcc0aa62cc41f93c5ad406d494b6a6e53d85e52e8f0349b67a4fec815feeb537e95c02510d747bc9a4157c7
+  checksum: 10c0/18686767c0cfdae8dc4acf5ac119b0f0eacad82b7fcc0aa62cc41f93c5ad406d494b6a6e53d85e52e8f0349b67a4fec815feeb537e95c02510d747bc9a4157c7
   languageName: node
   linkType: hard
 
 "array-union@npm:^2.1.0":
   version: 2.1.0
   resolution: "array-union@npm:2.1.0"
-  checksum: 429897e68110374f39b771ec47a7161fc6a8fc33e196857c0a396dc75df0b5f65e4d046674db764330b6bb66b39ef48dd7c53b6a2ee75cfb0681e0c1a7033962
+  checksum: 10c0/429897e68110374f39b771ec47a7161fc6a8fc33e196857c0a396dc75df0b5f65e4d046674db764330b6bb66b39ef48dd7c53b6a2ee75cfb0681e0c1a7033962
   languageName: node
   linkType: hard
 
 "array-uniq@npm:^1.0.1":
   version: 1.0.3
   resolution: "array-uniq@npm:1.0.3"
-  checksum: 3acbaf9e6d5faeb1010e2db04ab171b8d265889e46c61762e502979bdc5e55656013726e9a61507de3c82d329a0dc1e8072630a3454b4f2b881cb19ba7fd8aa6
+  checksum: 10c0/3acbaf9e6d5faeb1010e2db04ab171b8d265889e46c61762e502979bdc5e55656013726e9a61507de3c82d329a0dc1e8072630a3454b4f2b881cb19ba7fd8aa6
   languageName: node
   linkType: hard
 
 "array-unique@npm:^0.3.2":
   version: 0.3.2
   resolution: "array-unique@npm:0.3.2"
-  checksum: dbf4462cdba8a4b85577be07705210b3d35be4b765822a3f52962d907186617638ce15e0603a4fefdcf82f4cbbc9d433f8cbbd6855148a68872fa041b6474121
+  checksum: 10c0/dbf4462cdba8a4b85577be07705210b3d35be4b765822a3f52962d907186617638ce15e0603a4fefdcf82f4cbbc9d433f8cbbd6855148a68872fa041b6474121
   languageName: node
   linkType: hard
 
@@ -4382,7 +4382,7 @@ __metadata:
     es-abstract: "npm:^1.22.1"
     es-shim-unscopables: "npm:^1.0.0"
     get-intrinsic: "npm:^1.2.1"
-  checksum: 2c5c4d3f07512d6729f728f6260a314c00f2eb0a243123092661fa1bc65dce90234c3b483b5f978396eccef6f69c50f0bea248448aaf9cdfcd1cedad6217acbb
+  checksum: 10c0/2c5c4d3f07512d6729f728f6260a314c00f2eb0a243123092661fa1bc65dce90234c3b483b5f978396eccef6f69c50f0bea248448aaf9cdfcd1cedad6217acbb
   languageName: node
   linkType: hard
 
@@ -4394,7 +4394,7 @@ __metadata:
     define-properties: "npm:^1.2.0"
     es-abstract: "npm:^1.22.1"
     es-shim-unscopables: "npm:^1.0.0"
-  checksum: a578ed836a786efbb6c2db0899ae80781b476200617f65a44846cb1ed8bd8b24c8821b83703375d8af639c689497b7b07277060024b9919db94ac3e10dc8a49b
+  checksum: 10c0/a578ed836a786efbb6c2db0899ae80781b476200617f65a44846cb1ed8bd8b24c8821b83703375d8af639c689497b7b07277060024b9919db94ac3e10dc8a49b
   languageName: node
   linkType: hard
 
@@ -4406,7 +4406,7 @@ __metadata:
     define-properties: "npm:^1.2.0"
     es-abstract: "npm:^1.22.1"
     es-shim-unscopables: "npm:^1.0.0"
-  checksum: 67b3f1d602bb73713265145853128b1ad77cc0f9b833c7e1e056b323fbeac41a4ff1c9c99c7b9445903caea924d9ca2450578d9011913191aa88cc3c3a4b54f4
+  checksum: 10c0/67b3f1d602bb73713265145853128b1ad77cc0f9b833c7e1e056b323fbeac41a4ff1c9c99c7b9445903caea924d9ca2450578d9011913191aa88cc3c3a4b54f4
   languageName: node
   linkType: hard
 
@@ -4419,7 +4419,7 @@ __metadata:
     es-abstract: "npm:^1.20.4"
     es-array-method-boxes-properly: "npm:^1.0.0"
     is-string: "npm:^1.0.7"
-  checksum: 0c6c589d22d6cda4a32458c6fd57a41f420a4fa6cd184a3f6fe7b507f457bc4a073aff6accd595bcd6ac29cad856e7ac306549f127acdb098f401eea13c54901
+  checksum: 10c0/0c6c589d22d6cda4a32458c6fd57a41f420a4fa6cd184a3f6fe7b507f457bc4a073aff6accd595bcd6ac29cad856e7ac306549f127acdb098f401eea13c54901
   languageName: node
   linkType: hard
 
@@ -4432,7 +4432,7 @@ __metadata:
     es-abstract: "npm:^1.20.4"
     es-shim-unscopables: "npm:^1.0.0"
     get-intrinsic: "npm:^1.1.3"
-  checksum: fd5f57aca3c7ddcd1bb83965457b625f3a67d8f334f5cbdb8ac8ef33d5b0d38281524114db2936f8c08048115d5158af216c94e6ae1eb966241b9b6f4ab8a7e8
+  checksum: 10c0/fd5f57aca3c7ddcd1bb83965457b625f3a67d8f334f5cbdb8ac8ef33d5b0d38281524114db2936f8c08048115d5158af216c94e6ae1eb966241b9b6f4ab8a7e8
   languageName: node
   linkType: hard
 
@@ -4447,14 +4447,14 @@ __metadata:
     get-intrinsic: "npm:^1.2.1"
     is-array-buffer: "npm:^3.0.2"
     is-shared-array-buffer: "npm:^1.0.2"
-  checksum: 96b6e40e439678ffb7fa266398510074d33c3980fbb475490b69980cca60adec3b0777047ef377068a29862157f83edef42efc64ce48ce38977d04d68de5b7fb
+  checksum: 10c0/96b6e40e439678ffb7fa266398510074d33c3980fbb475490b69980cca60adec3b0777047ef377068a29862157f83edef42efc64ce48ce38977d04d68de5b7fb
   languageName: node
   linkType: hard
 
 "arrow-key-navigation@npm:^1.2.0":
   version: 1.2.0
   resolution: "arrow-key-navigation@npm:1.2.0"
-  checksum: 6a6ae0aa65cc1aeb2970fcd0ef855b3a4ba8366e785c20d2228e739c08364a2aac62aac09dc3224066aa9bc5fde1a95e7daf5084775fc71abb724649c54da68b
+  checksum: 10c0/6a6ae0aa65cc1aeb2970fcd0ef855b3a4ba8366e785c20d2228e739c08364a2aac62aac09dc3224066aa9bc5fde1a95e7daf5084775fc71abb724649c54da68b
   languageName: node
   linkType: hard
 
@@ -4466,7 +4466,7 @@ __metadata:
     inherits: "npm:^2.0.1"
     minimalistic-assert: "npm:^1.0.0"
     safer-buffer: "npm:^2.1.0"
-  checksum: b577232fa6069cc52bb128e564002c62b2b1fe47f7137bdcd709c0b8495aa79cee0f8cc458a831b2d8675900eea0d05781b006be5e1aa4f0ae3577a73ec20324
+  checksum: 10c0/b577232fa6069cc52bb128e564002c62b2b1fe47f7137bdcd709c0b8495aa79cee0f8cc458a831b2d8675900eea0d05781b006be5e1aa4f0ae3577a73ec20324
   languageName: node
   linkType: hard
 
@@ -4476,42 +4476,42 @@ __metadata:
   dependencies:
     object-assign: "npm:^4.1.1"
     util: "npm:0.10.3"
-  checksum: 188da37d63be479a3b14657c01080db90cdf7fa004e346af916cf8beebcaffb11359c596d0c9c3cd8174c9125a6225796ef1ce533487edc97f8ce3b18c1ab590
+  checksum: 10c0/188da37d63be479a3b14657c01080db90cdf7fa004e346af916cf8beebcaffb11359c596d0c9c3cd8174c9125a6225796ef1ce533487edc97f8ce3b18c1ab590
   languageName: node
   linkType: hard
 
 "assign-symbols@npm:^1.0.0":
   version: 1.0.0
   resolution: "assign-symbols@npm:1.0.0"
-  checksum: 29a654b8a6da6889a190d0d0efef4b1bfb5948fa06cbc245054aef05139f889f2f7c75b989917e3fde853fc4093b88048e4de8578a73a76f113d41bfd66e5775
+  checksum: 10c0/29a654b8a6da6889a190d0d0efef4b1bfb5948fa06cbc245054aef05139f889f2f7c75b989917e3fde853fc4093b88048e4de8578a73a76f113d41bfd66e5775
   languageName: node
   linkType: hard
 
 "ast-types-flow@npm:^0.0.8":
   version: 0.0.8
   resolution: "ast-types-flow@npm:0.0.8"
-  checksum: f2a0ba8055353b743c41431974521e5e852a9824870cd6fce2db0e538ac7bf4da406bbd018d109af29ff3f8f0993f6a730c9eddbd0abd031fbcb29ca75c1014e
+  checksum: 10c0/f2a0ba8055353b743c41431974521e5e852a9824870cd6fce2db0e538ac7bf4da406bbd018d109af29ff3f8f0993f6a730c9eddbd0abd031fbcb29ca75c1014e
   languageName: node
   linkType: hard
 
 "astral-regex@npm:^2.0.0":
   version: 2.0.0
   resolution: "astral-regex@npm:2.0.0"
-  checksum: f63d439cc383db1b9c5c6080d1e240bd14dae745f15d11ec5da863e182bbeca70df6c8191cffef5deba0b566ef98834610a68be79ac6379c95eeb26e1b310e25
+  checksum: 10c0/f63d439cc383db1b9c5c6080d1e240bd14dae745f15d11ec5da863e182bbeca70df6c8191cffef5deba0b566ef98834610a68be79ac6379c95eeb26e1b310e25
   languageName: node
   linkType: hard
 
 "async-each@npm:^1.0.1":
   version: 1.0.6
   resolution: "async-each@npm:1.0.6"
-  checksum: d4e45e8f077e20e015952c065ceae75f82b30ee2d4a8e56a5c454ae44331aaa009d8c94fe043ba254c177bffae9f6ebeefebb7daf9f7ce4d27fac0274dc328ae
+  checksum: 10c0/d4e45e8f077e20e015952c065ceae75f82b30ee2d4a8e56a5c454ae44331aaa009d8c94fe043ba254c177bffae9f6ebeefebb7daf9f7ce4d27fac0274dc328ae
   languageName: node
   linkType: hard
 
 "async-limiter@npm:~1.0.0":
   version: 1.0.1
   resolution: "async-limiter@npm:1.0.1"
-  checksum: 0693d378cfe86842a70d4c849595a0bb50dc44c11649640ca982fa90cbfc74e3cc4753b5a0847e51933f2e9c65ce8e05576e75e5e1fd963a086e673735b35969
+  checksum: 10c0/0693d378cfe86842a70d4c849595a0bb50dc44c11649640ca982fa90cbfc74e3cc4753b5a0847e51933f2e9c65ce8e05576e75e5e1fd963a086e673735b35969
   languageName: node
   linkType: hard
 
@@ -4520,7 +4520,7 @@ __metadata:
   resolution: "async-mutex@npm:0.4.1"
   dependencies:
     tslib: "npm:^2.4.0"
-  checksum: 3c412736c0bc4a9a2cfd948276a8caab8686aa615866a5bd20986e616f8945320acb310058a17afa1b31b8de6f634a78b7ec2217a33d7559b38f68bb85a95854
+  checksum: 10c0/3c412736c0bc4a9a2cfd948276a8caab8686aa615866a5bd20986e616f8945320acb310058a17afa1b31b8de6f634a78b7ec2217a33d7559b38f68bb85a95854
   languageName: node
   linkType: hard
 
@@ -4529,14 +4529,14 @@ __metadata:
   resolution: "async@npm:2.6.4"
   dependencies:
     lodash: "npm:^4.17.14"
-  checksum: 0ebb3273ef96513389520adc88e0d3c45e523d03653cc9b66f5c46f4239444294899bfd13d2b569e7dbfde7da2235c35cf5fd3ece9524f935d41bbe4efccdad0
+  checksum: 10c0/0ebb3273ef96513389520adc88e0d3c45e523d03653cc9b66f5c46f4239444294899bfd13d2b569e7dbfde7da2235c35cf5fd3ece9524f935d41bbe4efccdad0
   languageName: node
   linkType: hard
 
 "async@npm:^3.2.3":
   version: 3.2.4
   resolution: "async@npm:3.2.4"
-  checksum: b5d02fed64717edf49e35b2b156debd9cf524934ea670108fa5528e7615ed66a5e0bf6c65f832c9483b63aa7f0bffe3e588ebe8d58a539b833798d324516e1c9
+  checksum: 10c0/b5d02fed64717edf49e35b2b156debd9cf524934ea670108fa5528e7615ed66a5e0bf6c65f832c9483b63aa7f0bffe3e588ebe8d58a539b833798d324516e1c9
   languageName: node
   linkType: hard
 
@@ -4545,21 +4545,21 @@ __metadata:
   resolution: "asynciterator.prototype@npm:1.0.0"
   dependencies:
     has-symbols: "npm:^1.0.3"
-  checksum: fb76850e57d931ff59fd16b6cddb79b0d34fe45f400b2c3480d38892e72cd089787401687dbdb7cdb14ece402c275d3e02a648760d1489cd493527129c4c6204
+  checksum: 10c0/fb76850e57d931ff59fd16b6cddb79b0d34fe45f400b2c3480d38892e72cd089787401687dbdb7cdb14ece402c275d3e02a648760d1489cd493527129c4c6204
   languageName: node
   linkType: hard
 
 "asynckit@npm:^0.4.0":
   version: 0.4.0
   resolution: "asynckit@npm:0.4.0"
-  checksum: d73e2ddf20c4eb9337e1b3df1a0f6159481050a5de457c55b14ea2e5cb6d90bb69e004c9af54737a5ee0917fcf2c9e25de67777bbe58261847846066ba75bc9d
+  checksum: 10c0/d73e2ddf20c4eb9337e1b3df1a0f6159481050a5de457c55b14ea2e5cb6d90bb69e004c9af54737a5ee0917fcf2c9e25de67777bbe58261847846066ba75bc9d
   languageName: node
   linkType: hard
 
 "at-least-node@npm:^1.0.0":
   version: 1.0.0
   resolution: "at-least-node@npm:1.0.0"
-  checksum: 4c058baf6df1bc5a1697cf182e2029c58cd99975288a13f9e70068ef5d6f4e1f1fd7c4d2c3c4912eae44797d1725be9700995736deca441b39f3e66d8dee97ef
+  checksum: 10c0/4c058baf6df1bc5a1697cf182e2029c58cd99975288a13f9e70068ef5d6f4e1f1fd7c4d2c3c4912eae44797d1725be9700995736deca441b39f3e66d8dee97ef
   languageName: node
   linkType: hard
 
@@ -4568,14 +4568,14 @@ __metadata:
   resolution: "atob@npm:2.1.2"
   bin:
     atob: bin/atob.js
-  checksum: ada635b519dc0c576bb0b3ca63a73b50eefacf390abb3f062558342a8d68f2db91d0c8db54ce81b0d89de3b0f000de71f3ae7d761fd7d8cc624278fe443d6c7e
+  checksum: 10c0/ada635b519dc0c576bb0b3ca63a73b50eefacf390abb3f062558342a8d68f2db91d0c8db54ce81b0d89de3b0f000de71f3ae7d761fd7d8cc624278fe443d6c7e
   languageName: node
   linkType: hard
 
 "atomic-sleep@npm:^1.0.0":
   version: 1.0.0
   resolution: "atomic-sleep@npm:1.0.0"
-  checksum: e329a6665512736a9bbb073e1761b4ec102f7926cce35037753146a9db9c8104f5044c1662e4a863576ce544fb8be27cd2be6bc8c1a40147d03f31eb1cfb6e8a
+  checksum: 10c0/e329a6665512736a9bbb073e1761b4ec102f7926cce35037753146a9db9c8104f5044c1662e4a863576ce544fb8be27cd2be6bc8c1a40147d03f31eb1cfb6e8a
   languageName: node
   linkType: hard
 
@@ -4593,21 +4593,21 @@ __metadata:
     postcss: ^8.1.0
   bin:
     autoprefixer: bin/autoprefixer
-  checksum: 1d21cc8edb7bf993682094ceed03a32c18f5293f071182a64c2c6defb44bbe91d576ad775d2347469a81997b80cea0bbc4ad3eeb5b12710f9feacf2e6c04bb51
+  checksum: 10c0/1d21cc8edb7bf993682094ceed03a32c18f5293f071182a64c2c6defb44bbe91d576ad775d2347469a81997b80cea0bbc4ad3eeb5b12710f9feacf2e6c04bb51
   languageName: node
   linkType: hard
 
 "available-typed-arrays@npm:^1.0.5":
   version: 1.0.5
   resolution: "available-typed-arrays@npm:1.0.5"
-  checksum: c4df567ca72d2754a6cbad20088f5f98b1065b3360178169fa9b44ea101af62c0f423fc3854fa820fd6895b6b9171b8386e71558203103ff8fc2ad503fdcc660
+  checksum: 10c0/c4df567ca72d2754a6cbad20088f5f98b1065b3360178169fa9b44ea101af62c0f423fc3854fa820fd6895b6b9171b8386e71558203103ff8fc2ad503fdcc660
   languageName: node
   linkType: hard
 
 "axe-core@npm:=4.7.0":
   version: 4.7.0
   resolution: "axe-core@npm:4.7.0"
-  checksum: 89ac5712b5932ac7d23398b4cb5ba081c394a086e343acc68ba49c83472706e18e0799804e8388c779dcdacc465377deb29f2714241d3fbb389cf3a6b275c9ba
+  checksum: 10c0/89ac5712b5932ac7d23398b4cb5ba081c394a086e343acc68ba49c83472706e18e0799804e8388c779dcdacc465377deb29f2714241d3fbb389cf3a6b275c9ba
   languageName: node
   linkType: hard
 
@@ -4618,7 +4618,7 @@ __metadata:
     follow-redirects: "npm:^1.15.4"
     form-data: "npm:^4.0.0"
     proxy-from-env: "npm:^1.1.0"
-  checksum: 131bf8e62eee48ca4bd84e6101f211961bf6a21a33b95e5dfb3983d5a2fe50d9fffde0b57668d7ce6f65063d3dc10f2212cbcb554f75cfca99da1c73b210358d
+  checksum: 10c0/131bf8e62eee48ca4bd84e6101f211961bf6a21a33b95e5dfb3983d5a2fe50d9fffde0b57668d7ce6f65063d3dc10f2212cbcb554f75cfca99da1c73b210358d
   languageName: node
   linkType: hard
 
@@ -4627,7 +4627,7 @@ __metadata:
   resolution: "axobject-query@npm:3.2.1"
   dependencies:
     dequal: "npm:^2.0.3"
-  checksum: f7debc2012e456139b57d888c223f6d3cb4b61eb104164a85e3d346273dd6ef0bc9a04b6660ca9407704a14a8e05fa6b6eb9d55f44f348c7210de7ffb350c3a7
+  checksum: 10c0/f7debc2012e456139b57d888c223f6d3cb4b61eb104164a85e3d346273dd6ef0bc9a04b6660ca9407704a14a8e05fa6b6eb9d55f44f348c7210de7ffb350c3a7
   languageName: node
   linkType: hard
 
@@ -4644,7 +4644,7 @@ __metadata:
     slash: "npm:^3.0.0"
   peerDependencies:
     "@babel/core": ^7.8.0
-  checksum: 2eda9c1391e51936ca573dd1aedfee07b14c59b33dbe16ef347873ddd777bcf6e2fc739681e9e9661ab54ef84a3109a03725be2ac32cd2124c07ea4401cbe8c1
+  checksum: 10c0/2eda9c1391e51936ca573dd1aedfee07b14c59b33dbe16ef347873ddd777bcf6e2fc739681e9e9661ab54ef84a3109a03725be2ac32cd2124c07ea4401cbe8c1
   languageName: node
   linkType: hard
 
@@ -4659,7 +4659,7 @@ __metadata:
   peerDependencies:
     "@babel/core": ^7.0.0
     webpack: ">=2"
-  checksum: 7b83bae35a12fbc5cdf250e2d36a288305fe5b6d20ab044ab7c09bbf456c8895b80af7a4f1e8b64b5c07a4fd48d4b5144dab40b4bc72a4fed532dc000362f38f
+  checksum: 10c0/7b83bae35a12fbc5cdf250e2d36a288305fe5b6d20ab044ab7c09bbf456c8895b80af7a4f1e8b64b5c07a4fd48d4b5144dab40b4bc72a4fed532dc000362f38f
   languageName: node
   linkType: hard
 
@@ -4678,7 +4678,7 @@ __metadata:
     "@types/babel__helper-plugin-utils": "npm:^7.10.0"
     "@types/babel__traverse": "npm:^7.1.7"
     tslib: "npm:^2.4.0"
-  checksum: 1ce0b69478dd3c92126a7e3440f1fad46feebebc9318e8bbb102dea91a60448da4a8511b3c8ffbf2c3675995fca6c8ce7f097c08907455b33a5f9185e39fb94e
+  checksum: 10c0/1ce0b69478dd3c92126a7e3440f1fad46feebebc9318e8bbb102dea91a60448da4a8511b3c8ffbf2c3675995fca6c8ce7f097c08907455b33a5f9185e39fb94e
   languageName: node
   linkType: hard
 
@@ -4691,7 +4691,7 @@ __metadata:
     "@istanbuljs/schema": "npm:^0.1.2"
     istanbul-lib-instrument: "npm:^5.0.4"
     test-exclude: "npm:^6.0.0"
-  checksum: 1075657feb705e00fd9463b329921856d3775d9867c5054b449317d39153f8fbcebd3e02ebf00432824e647faff3683a9ca0a941325ef1afe9b3c4dd51b24beb
+  checksum: 10c0/1075657feb705e00fd9463b329921856d3775d9867c5054b449317d39153f8fbcebd3e02ebf00432824e647faff3683a9ca0a941325ef1afe9b3c4dd51b24beb
   languageName: node
   linkType: hard
 
@@ -4703,7 +4703,7 @@ __metadata:
     "@babel/types": "npm:^7.3.3"
     "@types/babel__core": "npm:^7.1.14"
     "@types/babel__traverse": "npm:^7.0.6"
-  checksum: 7e6451caaf7dce33d010b8aafb970e62f1b0c0b57f4978c37b0d457bbcf0874d75a395a102daf0bae0bd14eafb9f6e9a165ee5e899c0a4f1f3bb2e07b304ed2e
+  checksum: 10c0/7e6451caaf7dce33d010b8aafb970e62f1b0c0b57f4978c37b0d457bbcf0874d75a395a102daf0bae0bd14eafb9f6e9a165ee5e899c0a4f1f3bb2e07b304ed2e
   languageName: node
   linkType: hard
 
@@ -4716,7 +4716,7 @@ __metadata:
     glob: "npm:^7.1.1"
     lodash: "npm:^4.17.10"
     require-package-name: "npm:^2.0.1"
-  checksum: 1a1db624f70c1e9badd3ca112bc6819157e75768aab949c424cfabe562765d7f22cf93e5e088e820d5d5b1da7b2bd9d045cb54a5790616b65da1f84eda2ecc08
+  checksum: 10c0/1a1db624f70c1e9badd3ca112bc6819157e75768aab949c424cfabe562765d7f22cf93e5e088e820d5d5b1da7b2bd9d045cb54a5790616b65da1f84eda2ecc08
   languageName: node
   linkType: hard
 
@@ -4729,7 +4729,7 @@ __metadata:
     glob: "npm:^7.1.1"
     lodash: "npm:^4.17.10"
     require-package-name: "npm:^2.0.1"
-  checksum: 61fe073dcb381141d5cce766582750f487609bea3ad1c6725d736287f2ccd270e14d14190a7bd2700945a39acf8d58fdbee3ab7f80a7eb2a65980cf77185226c
+  checksum: 10c0/61fe073dcb381141d5cce766582750f487609bea3ad1c6725d736287f2ccd270e14d14190a7bd2700945a39acf8d58fdbee3ab7f80a7eb2a65980cf77185226c
   languageName: node
   linkType: hard
 
@@ -4740,7 +4740,7 @@ __metadata:
     "@babel/runtime": "npm:^7.12.5"
     cosmiconfig: "npm:^7.0.0"
     resolve: "npm:^1.19.0"
-  checksum: c6dfb15de96f67871d95bd2e8c58b0c81edc08b9b087dc16755e7157f357dc1090a8dc60ebab955e92587a9101f02eba07e730adc253a1e4cf593ca3ebd3839c
+  checksum: 10c0/c6dfb15de96f67871d95bd2e8c58b0c81edc08b9b087dc16755e7157f357dc1090a8dc60ebab955e92587a9101f02eba07e730adc253a1e4cf593ca3ebd3839c
   languageName: node
   linkType: hard
 
@@ -4753,7 +4753,7 @@ __metadata:
     semver: "npm:^6.3.1"
   peerDependencies:
     "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0
-  checksum: 843e7528de0e03a31a6f3837896a95f75b0b24b0294a077246282372279e974400b0bdd82399e8f9cbfe42c87ed56540fd71c33eafb7c8e8b9adac546ecc5fe5
+  checksum: 10c0/843e7528de0e03a31a6f3837896a95f75b0b24b0294a077246282372279e974400b0bdd82399e8f9cbfe42c87ed56540fd71c33eafb7c8e8b9adac546ecc5fe5
   languageName: node
   linkType: hard
 
@@ -4765,7 +4765,7 @@ __metadata:
     core-js-compat: "npm:^3.34.0"
   peerDependencies:
     "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0
-  checksum: b857010736c5e42e20b683973dae862448a42082fcc95b3ef188305a6864a4f94b5cbd568e49e4cd7172c6b2eace7bc403c3ba0984fbe5479474ade01126d559
+  checksum: 10c0/b857010736c5e42e20b683973dae862448a42082fcc95b3ef188305a6864a4f94b5cbd568e49e4cd7172c6b2eace7bc403c3ba0984fbe5479474ade01126d559
   languageName: node
   linkType: hard
 
@@ -4776,7 +4776,7 @@ __metadata:
     "@babel/helper-define-polyfill-provider": "npm:^0.5.0"
   peerDependencies:
     "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0
-  checksum: 2aab692582082d54e0df9f9373dca1b223e65b4e7e96440160f27ed8803d417a1fa08da550f08aa3820d2010329ca91b68e2b6e9bd7aed51c93d46dfe79629bb
+  checksum: 10c0/2aab692582082d54e0df9f9373dca1b223e65b4e7e96440160f27ed8803d417a1fa08da550f08aa3820d2010329ca91b68e2b6e9bd7aed51c93d46dfe79629bb
   languageName: node
   linkType: hard
 
@@ -4788,14 +4788,14 @@ __metadata:
     "@types/babel__core": "npm:^7.1.12"
     babel-plugin-macros: "npm:^3.0.1"
     require-from-string: "npm:^2.0.2"
-  checksum: d40814ca18f24df818a87e71ad8c1dc559cf69c0e44218bb9f5aef24680431a04e4bad8e96dc2679282b50b16a55c9597e37130d6bd5489b3eddab97d020ae5e
+  checksum: 10c0/d40814ca18f24df818a87e71ad8c1dc559cf69c0e44218bb9f5aef24680431a04e4bad8e96dc2679282b50b16a55c9597e37130d6bd5489b3eddab97d020ae5e
   languageName: node
   linkType: hard
 
 "babel-plugin-transform-react-remove-prop-types@npm:^0.4.24":
   version: 0.4.24
   resolution: "babel-plugin-transform-react-remove-prop-types@npm:0.4.24"
-  checksum: 713441fd9fb663cc95709cb52d9c2c6228ea6d5406092a8a50094c810bcb13c3c347f8fca703d45b20cc401782743a91d7272025950147f9247d53360267f107
+  checksum: 10c0/713441fd9fb663cc95709cb52d9c2c6228ea6d5406092a8a50094c810bcb13c3c347f8fca703d45b20cc401782743a91d7272025950147f9247d53360267f107
   languageName: node
   linkType: hard
 
@@ -4817,7 +4817,7 @@ __metadata:
     "@babel/plugin-syntax-top-level-await": "npm:^7.8.3"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 5ba39a3a0e6c37d25e56a4fb843be632dac98d54706d8a0933f9bcb1a07987a96d55c2b5a6c11788a74063fb2534fe68c1f1dbb6c93626850c785e0938495627
+  checksum: 10c0/5ba39a3a0e6c37d25e56a4fb843be632dac98d54706d8a0933f9bcb1a07987a96d55c2b5a6c11788a74063fb2534fe68c1f1dbb6c93626850c785e0938495627
   languageName: node
   linkType: hard
 
@@ -4829,28 +4829,28 @@ __metadata:
     babel-preset-current-node-syntax: "npm:^1.0.0"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: ec5fd0276b5630b05f0c14bb97cc3815c6b31600c683ebb51372e54dcb776cff790bdeeabd5b8d01ede375a040337ccbf6a3ccd68d3a34219125945e167ad943
+  checksum: 10c0/ec5fd0276b5630b05f0c14bb97cc3815c6b31600c683ebb51372e54dcb776cff790bdeeabd5b8d01ede375a040337ccbf6a3ccd68d3a34219125945e167ad943
   languageName: node
   linkType: hard
 
 "balanced-match@npm:^1.0.0":
   version: 1.0.2
   resolution: "balanced-match@npm:1.0.2"
-  checksum: 9308baf0a7e4838a82bbfd11e01b1cb0f0cf2893bc1676c27c2a8c0e70cbae1c59120c3268517a8ae7fb6376b4639ef81ca22582611dbee4ed28df945134aaee
+  checksum: 10c0/9308baf0a7e4838a82bbfd11e01b1cb0f0cf2893bc1676c27c2a8c0e70cbae1c59120c3268517a8ae7fb6376b4639ef81ca22582611dbee4ed28df945134aaee
   languageName: node
   linkType: hard
 
 "balanced-match@npm:^2.0.0":
   version: 2.0.0
   resolution: "balanced-match@npm:2.0.0"
-  checksum: 60a54e0b75a61674e16a7a336b805f06c72d6f8fc457639c24efc512ba2bf9cb5744b9f6f5225afcefb99da39714440c83c737208cc65c5d9ecd1f3093331ca3
+  checksum: 10c0/60a54e0b75a61674e16a7a336b805f06c72d6f8fc457639c24efc512ba2bf9cb5744b9f6f5225afcefb99da39714440c83c737208cc65c5d9ecd1f3093331ca3
   languageName: node
   linkType: hard
 
 "base64-js@npm:^1.0.2, base64-js@npm:^1.3.1":
   version: 1.5.1
   resolution: "base64-js@npm:1.5.1"
-  checksum: f23823513b63173a001030fae4f2dabe283b99a9d324ade3ad3d148e218134676f1ee8568c877cd79ec1c53158dcf2d2ba527a97c606618928ba99dd930102bf
+  checksum: 10c0/f23823513b63173a001030fae4f2dabe283b99a9d324ade3ad3d148e218134676f1ee8568c877cd79ec1c53158dcf2d2ba527a97c606618928ba99dd930102bf
   languageName: node
   linkType: hard
 
@@ -4865,42 +4865,42 @@ __metadata:
     isobject: "npm:^3.0.1"
     mixin-deep: "npm:^1.2.0"
     pascalcase: "npm:^0.1.1"
-  checksum: 30a2c0675eb52136b05ef496feb41574d9f0bb2d6d677761da579c00a841523fccf07f1dbabec2337b5f5750f428683b8ca60d89e56a1052c4ae1c0cd05de64d
+  checksum: 10c0/30a2c0675eb52136b05ef496feb41574d9f0bb2d6d677761da579c00a841523fccf07f1dbabec2337b5f5750f428683b8ca60d89e56a1052c4ae1c0cd05de64d
   languageName: node
   linkType: hard
 
 "batch@npm:0.6.1":
   version: 0.6.1
   resolution: "batch@npm:0.6.1"
-  checksum: 925a13897b4db80d4211082fe287bcf96d297af38e26448c857cee3e095c9792e3b8f26b37d268812e7f38a589f694609de8534a018b1937d7dc9f84e6b387c5
+  checksum: 10c0/925a13897b4db80d4211082fe287bcf96d297af38e26448c857cee3e095c9792e3b8f26b37d268812e7f38a589f694609de8534a018b1937d7dc9f84e6b387c5
   languageName: node
   linkType: hard
 
 "big-integer@npm:^1.6.44":
   version: 1.6.51
   resolution: "big-integer@npm:1.6.51"
-  checksum: c8139662d57f8833a44802f4b65be911679c569535ea73c5cfd3c1c8994eaead1b84b6f63e1db63833e4d4cacb6b6a9e5522178113dfdc8e4c81ed8436f1e8cc
+  checksum: 10c0/c8139662d57f8833a44802f4b65be911679c569535ea73c5cfd3c1c8994eaead1b84b6f63e1db63833e4d4cacb6b6a9e5522178113dfdc8e4c81ed8436f1e8cc
   languageName: node
   linkType: hard
 
 "big.js@npm:^5.2.2":
   version: 5.2.2
   resolution: "big.js@npm:5.2.2"
-  checksum: 230520f1ff920b2d2ce3e372d77a33faa4fa60d802fe01ca4ffbc321ee06023fe9a741ac02793ee778040a16b7e497f7d60c504d1c402b8fdab6f03bb785a25f
+  checksum: 10c0/230520f1ff920b2d2ce3e372d77a33faa4fa60d802fe01ca4ffbc321ee06023fe9a741ac02793ee778040a16b7e497f7d60c504d1c402b8fdab6f03bb785a25f
   languageName: node
   linkType: hard
 
 "binary-extensions@npm:^1.0.0":
   version: 1.13.1
   resolution: "binary-extensions@npm:1.13.1"
-  checksum: 2d616938ac23d828ec3fbe0dea429b566fd2c137ddc38f166f16561ccd58029deac3fa9fddb489ab13d679c8fb5f1bd0e82824041299e5e39d8dd3cc68fbb9f9
+  checksum: 10c0/2d616938ac23d828ec3fbe0dea429b566fd2c137ddc38f166f16561ccd58029deac3fa9fddb489ab13d679c8fb5f1bd0e82824041299e5e39d8dd3cc68fbb9f9
   languageName: node
   linkType: hard
 
 "binary-extensions@npm:^2.0.0":
   version: 2.2.0
   resolution: "binary-extensions@npm:2.2.0"
-  checksum: d73d8b897238a2d3ffa5f59c0241870043aa7471335e89ea5e1ff48edb7c2d0bb471517a3e4c5c3f4c043615caa2717b5f80a5e61e07503d51dc85cb848e665d
+  checksum: 10c0/d73d8b897238a2d3ffa5f59c0241870043aa7471335e89ea5e1ff48edb7c2d0bb471517a3e4c5c3f4c043615caa2717b5f80a5e61e07503d51dc85cb848e665d
   languageName: node
   linkType: hard
 
@@ -4909,49 +4909,49 @@ __metadata:
   resolution: "bindings@npm:1.5.0"
   dependencies:
     file-uri-to-path: "npm:1.0.0"
-  checksum: 3dab2491b4bb24124252a91e656803eac24292473e56554e35bbfe3cc1875332cfa77600c3bac7564049dc95075bf6fcc63a4609920ff2d64d0fe405fcf0d4ba
+  checksum: 10c0/3dab2491b4bb24124252a91e656803eac24292473e56554e35bbfe3cc1875332cfa77600c3bac7564049dc95075bf6fcc63a4609920ff2d64d0fe405fcf0d4ba
   languageName: node
   linkType: hard
 
 "bintrees@npm:1.0.2":
   version: 1.0.2
   resolution: "bintrees@npm:1.0.2"
-  checksum: 132944b20c93c1a8f97bf8aa25980a76c6eb4291b7f2df2dbcd01cb5b417c287d3ee0847c7260c9f05f3d5a4233aaa03dec95114e97f308abe9cc3f72bed4a44
+  checksum: 10c0/132944b20c93c1a8f97bf8aa25980a76c6eb4291b7f2df2dbcd01cb5b417c287d3ee0847c7260c9f05f3d5a4233aaa03dec95114e97f308abe9cc3f72bed4a44
   languageName: node
   linkType: hard
 
 "blueimp-load-image@npm:^3.0.0":
   version: 3.0.0
   resolution: "blueimp-load-image@npm:3.0.0"
-  checksum: e860da4113afd8e58bc026fb17240007e15dc155287a70fb57b3048fc8f0aa5f7dbd052efed8bff19d1208eeab4d058dc6788684a721c50ccd08b68d836a8d18
+  checksum: 10c0/e860da4113afd8e58bc026fb17240007e15dc155287a70fb57b3048fc8f0aa5f7dbd052efed8bff19d1208eeab4d058dc6788684a721c50ccd08b68d836a8d18
   languageName: node
   linkType: hard
 
 "blurhash@npm:^2.0.5":
   version: 2.0.5
   resolution: "blurhash@npm:2.0.5"
-  checksum: 75d5f042b5bb8ead977524a985048378a033af866534abbaee73c80030cc9fc34e6c5b7d483c68bbdb600e0ae438f2ea6140b1f46d75fcfa57a902208ae8b85e
+  checksum: 10c0/75d5f042b5bb8ead977524a985048378a033af866534abbaee73c80030cc9fc34e6c5b7d483c68bbdb600e0ae438f2ea6140b1f46d75fcfa57a902208ae8b85e
   languageName: node
   linkType: hard
 
 "bmp-js@npm:^0.1.0":
   version: 0.1.0
   resolution: "bmp-js@npm:0.1.0"
-  checksum: c651bd5936dcf8d67900050fac14dcbe30baf87c3d21c58f4934fcdf46172e152a87d8c0c3ca25caa2b4b2c7780ef3b5fcc6cd20afd8f0351856cadb1bef9694
+  checksum: 10c0/c651bd5936dcf8d67900050fac14dcbe30baf87c3d21c58f4934fcdf46172e152a87d8c0c3ca25caa2b4b2c7780ef3b5fcc6cd20afd8f0351856cadb1bef9694
   languageName: node
   linkType: hard
 
 "bn.js@npm:^4.0.0, bn.js@npm:^4.1.0, bn.js@npm:^4.11.9":
   version: 4.12.0
   resolution: "bn.js@npm:4.12.0"
-  checksum: 9736aaa317421b6b3ed038ff3d4491935a01419ac2d83ddcfebc5717385295fcfcf0c57311d90fe49926d0abbd7a9dbefdd8861e6129939177f7e67ebc645b21
+  checksum: 10c0/9736aaa317421b6b3ed038ff3d4491935a01419ac2d83ddcfebc5717385295fcfcf0c57311d90fe49926d0abbd7a9dbefdd8861e6129939177f7e67ebc645b21
   languageName: node
   linkType: hard
 
 "bn.js@npm:^5.0.0, bn.js@npm:^5.1.1":
   version: 5.2.1
   resolution: "bn.js@npm:5.2.1"
-  checksum: bed3d8bd34ec89dbcf9f20f88bd7d4a49c160fda3b561c7bb227501f974d3e435a48fb9b61bc3de304acab9215a3bda0803f7017ffb4d0016a0c3a740a283caa
+  checksum: 10c0/bed3d8bd34ec89dbcf9f20f88bd7d4a49c160fda3b561c7bb227501f974d3e435a48fb9b61bc3de304acab9215a3bda0803f7017ffb4d0016a0c3a740a283caa
   languageName: node
   linkType: hard
 
@@ -4971,7 +4971,7 @@ __metadata:
     raw-body: "npm:2.5.1"
     type-is: "npm:~1.6.18"
     unpipe: "npm:1.0.0"
-  checksum: a202d493e2c10a33fb7413dac7d2f713be579c4b88343cd814b6df7a38e5af1901fc31044e04de176db56b16d9772aa25a7723f64478c20f4d91b1ac223bf3b8
+  checksum: 10c0/a202d493e2c10a33fb7413dac7d2f713be579c4b88343cd814b6df7a38e5af1901fc31044e04de176db56b16d9772aa25a7723f64478c20f4d91b1ac223bf3b8
   languageName: node
   linkType: hard
 
@@ -4985,14 +4985,14 @@ __metadata:
     dns-txt: "npm:^2.0.2"
     multicast-dns: "npm:^6.0.1"
     multicast-dns-service-types: "npm:^1.1.0"
-  checksum: 0be7c4cd96df563571973706226e750f6feeacd81d01c1ade11247eb3a7e14846af49cffe397ab970059b828dd89f694f456e22bca4ca315a7f0326e9303e241
+  checksum: 10c0/0be7c4cd96df563571973706226e750f6feeacd81d01c1ade11247eb3a7e14846af49cffe397ab970059b828dd89f694f456e22bca4ca315a7f0326e9303e241
   languageName: node
   linkType: hard
 
 "boolbase@npm:^1.0.0, boolbase@npm:~1.0.0":
   version: 1.0.0
   resolution: "boolbase@npm:1.0.0"
-  checksum: e4b53deb4f2b85c52be0e21a273f2045c7b6a6ea002b0e139c744cb6f95e9ec044439a52883b0d74dedd1ff3da55ed140cfdddfed7fb0cccbed373de5dce1bcf
+  checksum: 10c0/e4b53deb4f2b85c52be0e21a273f2045c7b6a6ea002b0e139c744cb6f95e9ec044439a52883b0d74dedd1ff3da55ed140cfdddfed7fb0cccbed373de5dce1bcf
   languageName: node
   linkType: hard
 
@@ -5001,7 +5001,7 @@ __metadata:
   resolution: "bplist-parser@npm:0.2.0"
   dependencies:
     big-integer: "npm:^1.6.44"
-  checksum: ce79c69e0f6efe506281e7c84e3712f7d12978991675b6e3a58a295b16f13ca81aa9b845c335614a545e0af728c8311b6aa3142af76ba1cb616af9bbac5c4a9f
+  checksum: 10c0/ce79c69e0f6efe506281e7c84e3712f7d12978991675b6e3a58a295b16f13ca81aa9b845c335614a545e0af728c8311b6aa3142af76ba1cb616af9bbac5c4a9f
   languageName: node
   linkType: hard
 
@@ -5011,7 +5011,7 @@ __metadata:
   dependencies:
     balanced-match: "npm:^1.0.0"
     concat-map: "npm:0.0.1"
-  checksum: 695a56cd058096a7cb71fb09d9d6a7070113c7be516699ed361317aca2ec169f618e28b8af352e02ab4233fb54eb0168460a40dc320bab0034b36ab59aaad668
+  checksum: 10c0/695a56cd058096a7cb71fb09d9d6a7070113c7be516699ed361317aca2ec169f618e28b8af352e02ab4233fb54eb0168460a40dc320bab0034b36ab59aaad668
   languageName: node
   linkType: hard
 
@@ -5020,7 +5020,7 @@ __metadata:
   resolution: "brace-expansion@npm:2.0.1"
   dependencies:
     balanced-match: "npm:^1.0.0"
-  checksum: b358f2fe060e2d7a87aa015979ecea07f3c37d4018f8d6deb5bd4c229ad3a0384fe6029bb76cd8be63c81e516ee52d1a0673edbe2023d53a5191732ae3c3e49f
+  checksum: 10c0/b358f2fe060e2d7a87aa015979ecea07f3c37d4018f8d6deb5bd4c229ad3a0384fe6029bb76cd8be63c81e516ee52d1a0673edbe2023d53a5191732ae3c3e49f
   languageName: node
   linkType: hard
 
@@ -5038,7 +5038,7 @@ __metadata:
     snapdragon-node: "npm:^2.0.1"
     split-string: "npm:^3.0.2"
     to-regex: "npm:^3.0.1"
-  checksum: 72b27ea3ea2718f061c29e70fd6e17606e37c65f5801abddcf0b0052db1de7d60f3bf92cfc220ab57b44bd0083a5f69f9d03b3461d2816cfe9f9398207acc728
+  checksum: 10c0/72b27ea3ea2718f061c29e70fd6e17606e37c65f5801abddcf0b0052db1de7d60f3bf92cfc220ab57b44bd0083a5f69f9d03b3461d2816cfe9f9398207acc728
   languageName: node
   linkType: hard
 
@@ -5047,14 +5047,14 @@ __metadata:
   resolution: "braces@npm:3.0.2"
   dependencies:
     fill-range: "npm:^7.0.1"
-  checksum: 321b4d675791479293264019156ca322163f02dc06e3c4cab33bb15cd43d80b51efef69b0930cfde3acd63d126ebca24cd0544fa6f261e093a0fb41ab9dda381
+  checksum: 10c0/321b4d675791479293264019156ca322163f02dc06e3c4cab33bb15cd43d80b51efef69b0930cfde3acd63d126ebca24cd0544fa6f261e093a0fb41ab9dda381
   languageName: node
   linkType: hard
 
 "brorand@npm:^1.0.1, brorand@npm:^1.1.0":
   version: 1.1.0
   resolution: "brorand@npm:1.1.0"
-  checksum: 6f366d7c4990f82c366e3878492ba9a372a73163c09871e80d82fb4ae0d23f9f8924cb8a662330308206e6b3b76ba1d528b4601c9ef73c2166b440b2ea3b7571
+  checksum: 10c0/6f366d7c4990f82c366e3878492ba9a372a73163c09871e80d82fb4ae0d23f9f8924cb8a662330308206e6b3b76ba1d528b4601c9ef73c2166b440b2ea3b7571
   languageName: node
   linkType: hard
 
@@ -5068,7 +5068,7 @@ __metadata:
     evp_bytestokey: "npm:^1.0.3"
     inherits: "npm:^2.0.1"
     safe-buffer: "npm:^5.0.1"
-  checksum: 967f2ae60d610b7b252a4cbb55a7a3331c78293c94b4dd9c264d384ca93354c089b3af9c0dd023534efdc74ffbc82510f7ad4399cf82bc37bc07052eea485f18
+  checksum: 10c0/967f2ae60d610b7b252a4cbb55a7a3331c78293c94b4dd9c264d384ca93354c089b3af9c0dd023534efdc74ffbc82510f7ad4399cf82bc37bc07052eea485f18
   languageName: node
   linkType: hard
 
@@ -5079,7 +5079,7 @@ __metadata:
     browserify-aes: "npm:^1.0.4"
     browserify-des: "npm:^1.0.0"
     evp_bytestokey: "npm:^1.0.0"
-  checksum: aa256dcb42bc53a67168bbc94ab85d243b0a3b56109dee3b51230b7d010d9b78985ffc1fb36e145c6e4db151f888076c1cfc207baf1525d3e375cbe8187fe27d
+  checksum: 10c0/aa256dcb42bc53a67168bbc94ab85d243b0a3b56109dee3b51230b7d010d9b78985ffc1fb36e145c6e4db151f888076c1cfc207baf1525d3e375cbe8187fe27d
   languageName: node
   linkType: hard
 
@@ -5091,7 +5091,7 @@ __metadata:
     des.js: "npm:^1.0.0"
     inherits: "npm:^2.0.1"
     safe-buffer: "npm:^5.1.2"
-  checksum: 943eb5d4045eff80a6cde5be4e5fbb1f2d5002126b5a4789c3c1aae3cdddb1eb92b00fb92277f512288e5c6af330730b1dbabcf7ce0923e749e151fcee5a074d
+  checksum: 10c0/943eb5d4045eff80a6cde5be4e5fbb1f2d5002126b5a4789c3c1aae3cdddb1eb92b00fb92277f512288e5c6af330730b1dbabcf7ce0923e749e151fcee5a074d
   languageName: node
   linkType: hard
 
@@ -5101,7 +5101,7 @@ __metadata:
   dependencies:
     bn.js: "npm:^5.0.0"
     randombytes: "npm:^2.0.1"
-  checksum: fb2b5a8279d8a567a28d8ee03fb62e448428a906bab5c3dc9e9c3253ace551b5ea271db15e566ac78f1b1d71b243559031446604168b9235c351a32cae99d02a
+  checksum: 10c0/fb2b5a8279d8a567a28d8ee03fb62e448428a906bab5c3dc9e9c3253ace551b5ea271db15e566ac78f1b1d71b243559031446604168b9235c351a32cae99d02a
   languageName: node
   linkType: hard
 
@@ -5118,7 +5118,7 @@ __metadata:
     parse-asn1: "npm:^5.1.5"
     readable-stream: "npm:^3.6.0"
     safe-buffer: "npm:^5.2.0"
-  checksum: 8f00a370e3e97060977dc58e51251d3ca398ee73523994a44430321e8de2c7d85395362d59014b2b07efe4190f369baee2ff28eb8f405ff4660b776651cf052d
+  checksum: 10c0/8f00a370e3e97060977dc58e51251d3ca398ee73523994a44430321e8de2c7d85395362d59014b2b07efe4190f369baee2ff28eb8f405ff4660b776651cf052d
   languageName: node
   linkType: hard
 
@@ -5127,7 +5127,7 @@ __metadata:
   resolution: "browserify-zlib@npm:0.2.0"
   dependencies:
     pako: "npm:~1.0.5"
-  checksum: 9ab10b6dc732c6c5ec8ebcbe5cb7fe1467f97402c9b2140113f47b5f187b9438f93a8e065d8baf8b929323c18324fbf1105af479ee86d9d36cab7d7ef3424ad9
+  checksum: 10c0/9ab10b6dc732c6c5ec8ebcbe5cb7fe1467f97402c9b2140113f47b5f187b9438f93a8e065d8baf8b929323c18324fbf1105af479ee86d9d36cab7d7ef3424ad9
   languageName: node
   linkType: hard
 
@@ -5141,7 +5141,7 @@ __metadata:
     update-browserslist-db: "npm:^1.0.13"
   bin:
     browserslist: cli.js
-  checksum: 2a331aab90503130043ca41dd5d281fa1e89d5e076d07a2d75e76bf4d693bd56e73d5abcd8c4f39119da6328d450578c216cf1cd5c99b82d8a90a2ae6271b465
+  checksum: 10c0/2a331aab90503130043ca41dd5d281fa1e89d5e076d07a2d75e76bf4d693bd56e73d5abcd8c4f39119da6328d450578c216cf1cd5c99b82d8a90a2ae6271b465
   languageName: node
   linkType: hard
 
@@ -5150,35 +5150,35 @@ __metadata:
   resolution: "bser@npm:2.1.1"
   dependencies:
     node-int64: "npm:^0.4.0"
-  checksum: 24d8dfb7b6d457d73f32744e678a60cc553e4ec0e9e1a01cf614b44d85c3c87e188d3cc78ef0442ce5032ee6818de20a0162ba1074725c0d08908f62ea979227
+  checksum: 10c0/24d8dfb7b6d457d73f32744e678a60cc553e4ec0e9e1a01cf614b44d85c3c87e188d3cc78ef0442ce5032ee6818de20a0162ba1074725c0d08908f62ea979227
   languageName: node
   linkType: hard
 
 "buffer-from@npm:^1.0.0":
   version: 1.1.2
   resolution: "buffer-from@npm:1.1.2"
-  checksum: 124fff9d66d691a86d3b062eff4663fe437a9d9ee4b47b1b9e97f5a5d14f6d5399345db80f796827be7c95e70a8e765dd404b7c3ff3b3324f98e9b0c8826cc34
+  checksum: 10c0/124fff9d66d691a86d3b062eff4663fe437a9d9ee4b47b1b9e97f5a5d14f6d5399345db80f796827be7c95e70a8e765dd404b7c3ff3b3324f98e9b0c8826cc34
   languageName: node
   linkType: hard
 
 "buffer-indexof@npm:^1.0.0":
   version: 1.1.1
   resolution: "buffer-indexof@npm:1.1.1"
-  checksum: 67906b0a9892854e24ac717ef823c3b19790c653a8b1902835bbf3c3c46ea8d99f0680a92f7394fc5acbbecb3385775ccd504ea00587d2d67d8dfaadd460eeae
+  checksum: 10c0/67906b0a9892854e24ac717ef823c3b19790c653a8b1902835bbf3c3c46ea8d99f0680a92f7394fc5acbbecb3385775ccd504ea00587d2d67d8dfaadd460eeae
   languageName: node
   linkType: hard
 
 "buffer-writer@npm:2.0.0":
   version: 2.0.0
   resolution: "buffer-writer@npm:2.0.0"
-  checksum: c91b2ab09a200cf0862237e5a4dbd5077003b42d26d4f0c596ec7149f82ef83e0751d670bcdf379ed988d1a08c0fac7759a8cb928cf1a4710a1988a7618b1190
+  checksum: 10c0/c91b2ab09a200cf0862237e5a4dbd5077003b42d26d4f0c596ec7149f82ef83e0751d670bcdf379ed988d1a08c0fac7759a8cb928cf1a4710a1988a7618b1190
   languageName: node
   linkType: hard
 
 "buffer-xor@npm:^1.0.3":
   version: 1.0.3
   resolution: "buffer-xor@npm:1.0.3"
-  checksum: fd269d0e0bf71ecac3146187cfc79edc9dbb054e2ee69b4d97dfb857c6d997c33de391696d04bdd669272751fa48e7872a22f3a6c7b07d6c0bc31dbe02a4075c
+  checksum: 10c0/fd269d0e0bf71ecac3146187cfc79edc9dbb054e2ee69b4d97dfb857c6d997c33de391696d04bdd669272751fa48e7872a22f3a6c7b07d6c0bc31dbe02a4075c
   languageName: node
   linkType: hard
 
@@ -5189,7 +5189,7 @@ __metadata:
     base64-js: "npm:^1.0.2"
     ieee754: "npm:^1.1.4"
     isarray: "npm:^1.0.0"
-  checksum: dc443d7e7caab23816b58aacdde710b72f525ad6eecd7d738fcaa29f6d6c12e8d9c13fed7219fd502be51ecf0615f5c077d4bdc6f9308dde2e53f8e5393c5b21
+  checksum: 10c0/dc443d7e7caab23816b58aacdde710b72f525ad6eecd7d738fcaa29f6d6c12e8d9c13fed7219fd502be51ecf0615f5c077d4bdc6f9308dde2e53f8e5393c5b21
   languageName: node
   linkType: hard
 
@@ -5199,7 +5199,7 @@ __metadata:
   dependencies:
     base64-js: "npm:^1.3.1"
     ieee754: "npm:^1.2.1"
-  checksum: 2a905fbbcde73cc5d8bd18d1caa23715d5f83a5935867c2329f0ac06104204ba7947be098fe1317fbd8830e26090ff8e764f08cd14fefc977bb248c3487bcbd0
+  checksum: 10c0/2a905fbbcde73cc5d8bd18d1caa23715d5f83a5935867c2329f0ac06104204ba7947be098fe1317fbd8830e26090ff8e764f08cd14fefc977bb248c3487bcbd0
   languageName: node
   linkType: hard
 
@@ -5209,21 +5209,21 @@ __metadata:
   dependencies:
     node-gyp: "npm:latest"
     node-gyp-build: "npm:^4.3.0"
-  checksum: 36cdc5b53a38d9f61f89fdbe62029a2ebcd020599862253fefebe31566155726df9ff961f41b8c97b02b4c12b391ef97faf94e2383392654cf8f0ed68f76e47c
+  checksum: 10c0/36cdc5b53a38d9f61f89fdbe62029a2ebcd020599862253fefebe31566155726df9ff961f41b8c97b02b4c12b391ef97faf94e2383392654cf8f0ed68f76e47c
   languageName: node
   linkType: hard
 
 "builtin-modules@npm:^3.1.0, builtin-modules@npm:^3.3.0":
   version: 3.3.0
   resolution: "builtin-modules@npm:3.3.0"
-  checksum: 2cb3448b4f7306dc853632a4fcddc95e8d4e4b9868c139400027b71938fc6806d4ff44007deffb362ac85724bd40c2c6452fb6a0aa4531650eeddb98d8e5ee8a
+  checksum: 10c0/2cb3448b4f7306dc853632a4fcddc95e8d4e4b9868c139400027b71938fc6806d4ff44007deffb362ac85724bd40c2c6452fb6a0aa4531650eeddb98d8e5ee8a
   languageName: node
   linkType: hard
 
 "builtin-status-codes@npm:^3.0.0":
   version: 3.0.0
   resolution: "builtin-status-codes@npm:3.0.0"
-  checksum: c37bbba11a34c4431e56bd681b175512e99147defbe2358318d8152b3a01df7bf25e0305873947e5b350073d5ef41a364a22b37e48f1fb6d2fe6d5286a0f348c
+  checksum: 10c0/c37bbba11a34c4431e56bd681b175512e99147defbe2358318d8152b3a01df7bf25e0305873947e5b350073d5ef41a364a22b37e48f1fb6d2fe6d5286a0f348c
   languageName: node
   linkType: hard
 
@@ -5232,21 +5232,21 @@ __metadata:
   resolution: "bundle-name@npm:3.0.0"
   dependencies:
     run-applescript: "npm:^5.0.0"
-  checksum: 57bc7f8b025d83961b04db2f1eff6a87f2363c2891f3542a4b82471ff8ebb5d484af48e9784fcdb28ef1d48bb01f03d891966dc3ef58758e46ea32d750ce40f8
+  checksum: 10c0/57bc7f8b025d83961b04db2f1eff6a87f2363c2891f3542a4b82471ff8ebb5d484af48e9784fcdb28ef1d48bb01f03d891966dc3ef58758e46ea32d750ce40f8
   languageName: node
   linkType: hard
 
 "bytes@npm:3.0.0":
   version: 3.0.0
   resolution: "bytes@npm:3.0.0"
-  checksum: 91d42c38601c76460519ffef88371caacaea483a354c8e4b8808e7b027574436a5713337c003ea3de63ee4991c2a9a637884fdfe7f761760d746929d9e8fec60
+  checksum: 10c0/91d42c38601c76460519ffef88371caacaea483a354c8e4b8808e7b027574436a5713337c003ea3de63ee4991c2a9a637884fdfe7f761760d746929d9e8fec60
   languageName: node
   linkType: hard
 
 "bytes@npm:3.1.2":
   version: 3.1.2
   resolution: "bytes@npm:3.1.2"
-  checksum: 76d1c43cbd602794ad8ad2ae94095cddeb1de78c5dddaa7005c51af10b0176c69971a6d88e805a90c2b6550d76636e43c40d8427a808b8645ede885de4a0358e
+  checksum: 10c0/76d1c43cbd602794ad8ad2ae94095cddeb1de78c5dddaa7005c51af10b0176c69971a6d88e805a90c2b6550d76636e43c40d8427a808b8645ede885de4a0358e
   languageName: node
   linkType: hard
 
@@ -5272,7 +5272,7 @@ __metadata:
     ssri: "npm:^8.0.1"
     tar: "npm:^6.0.2"
     unique-filename: "npm:^1.1.1"
-  checksum: 886fcc0acc4f6fd5cd142d373d8276267bc6d655d7c4ce60726fbbec10854de3395ee19bbf9e7e73308cdca9fdad0ad55060ff3bd16c6d4165c5b8d21515e1d8
+  checksum: 10c0/886fcc0acc4f6fd5cd142d373d8276267bc6d655d7c4ce60726fbbec10854de3395ee19bbf9e7e73308cdca9fdad0ad55060ff3bd16c6d4165c5b8d21515e1d8
   languageName: node
   linkType: hard
 
@@ -5292,7 +5292,7 @@ __metadata:
     ssri: "npm:^10.0.0"
     tar: "npm:^6.1.11"
     unique-filename: "npm:^3.0.0"
-  checksum: e359823778d712ad365740cef3f488d4f74c62cc79be5935896d9597a7d81033e50c54c15898fa9cc018620879307ab30d1dddc476ae705bfd5b29c145ae6938
+  checksum: 10c0/e359823778d712ad365740cef3f488d4f74c62cc79be5935896d9597a7d81033e50c54c15898fa9cc018620879307ab30d1dddc476ae705bfd5b29c145ae6938
   languageName: node
   linkType: hard
 
@@ -5309,7 +5309,7 @@ __metadata:
     to-object-path: "npm:^0.3.0"
     union-value: "npm:^1.0.0"
     unset-value: "npm:^1.0.0"
-  checksum: a7142e25c73f767fa520957dcd179b900b86eac63b8cfeaa3b2a35e18c9ca5968aa4e2d2bed7a3e7efd10f13be404344cfab3a4156217e71f9bdb95940bb9c8c
+  checksum: 10c0/a7142e25c73f767fa520957dcd179b900b86eac63b8cfeaa3b2a35e18c9ca5968aa4e2d2bed7a3e7efd10f13be404344cfab3a4156217e71f9bdb95940bb9c8c
   languageName: node
   linkType: hard
 
@@ -5320,28 +5320,28 @@ __metadata:
     function-bind: "npm:^1.1.2"
     get-intrinsic: "npm:^1.2.1"
     set-function-length: "npm:^1.1.1"
-  checksum: a6172c168fd6dacf744fcde745099218056bd755c50415b592655dcd6562157ed29f130f56c3f6db2250f67e4bd62e5c218cdc56d7bfd76e0bda50770fce2d10
+  checksum: 10c0/a6172c168fd6dacf744fcde745099218056bd755c50415b592655dcd6562157ed29f130f56c3f6db2250f67e4bd62e5c218cdc56d7bfd76e0bda50770fce2d10
   languageName: node
   linkType: hard
 
 "callsites@npm:^3.0.0":
   version: 3.1.0
   resolution: "callsites@npm:3.1.0"
-  checksum: fff92277400eb06c3079f9e74f3af120db9f8ea03bad0e84d9aede54bbe2d44a56cccb5f6cf12211f93f52306df87077ecec5b712794c5a9b5dac6d615a3f301
+  checksum: 10c0/fff92277400eb06c3079f9e74f3af120db9f8ea03bad0e84d9aede54bbe2d44a56cccb5f6cf12211f93f52306df87077ecec5b712794c5a9b5dac6d615a3f301
   languageName: node
   linkType: hard
 
 "camelcase@npm:^5.0.0, camelcase@npm:^5.3.1":
   version: 5.3.1
   resolution: "camelcase@npm:5.3.1"
-  checksum: 92ff9b443bfe8abb15f2b1513ca182d16126359ad4f955ebc83dc4ddcc4ef3fdd2c078bc223f2673dc223488e75c99b16cc4d056624374b799e6a1555cf61b23
+  checksum: 10c0/92ff9b443bfe8abb15f2b1513ca182d16126359ad4f955ebc83dc4ddcc4ef3fdd2c078bc223f2673dc223488e75c99b16cc4d056624374b799e6a1555cf61b23
   languageName: node
   linkType: hard
 
 "camelcase@npm:^6.2.0":
   version: 6.3.0
   resolution: "camelcase@npm:6.3.0"
-  checksum: 0d701658219bd3116d12da3eab31acddb3f9440790c0792e0d398f0a520a6a4058018e546862b6fba89d7ae990efaeb97da71e1913e9ebf5a8b5621a3d55c710
+  checksum: 10c0/0d701658219bd3116d12da3eab31acddb3f9440790c0792e0d398f0a520a6a4058018e546862b6fba89d7ae990efaeb97da71e1913e9ebf5a8b5621a3d55c710
   languageName: node
   linkType: hard
 
@@ -5353,21 +5353,21 @@ __metadata:
     caniuse-lite: "npm:^1.0.0"
     lodash.memoize: "npm:^4.1.2"
     lodash.uniq: "npm:^4.5.0"
-  checksum: 60f9e85a3331e6d761b1b03eec71ca38ef7d74146bece34694853033292156b815696573ed734b65583acf493e88163618eda915c6c826d46a024c71a9572b4c
+  checksum: 10c0/60f9e85a3331e6d761b1b03eec71ca38ef7d74146bece34694853033292156b815696573ed734b65583acf493e88163618eda915c6c826d46a024c71a9572b4c
   languageName: node
   linkType: hard
 
 "caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001565, caniuse-lite@npm:^1.0.30001578":
   version: 1.0.30001578
   resolution: "caniuse-lite@npm:1.0.30001578"
-  checksum: c3bd9c08a945cee4f0cc284a217ebe9c2613e04d5aef4b48f1871a779b1875c34286469eb8d7d94bd028b5a354613e676ad503b6bf8db20a2f154574bd5fde48
+  checksum: 10c0/c3bd9c08a945cee4f0cc284a217ebe9c2613e04d5aef4b48f1871a779b1875c34286469eb8d7d94bd028b5a354613e676ad503b6bf8db20a2f154574bd5fde48
   languageName: node
   linkType: hard
 
 "chalk@npm:5.3.0":
   version: 5.3.0
   resolution: "chalk@npm:5.3.0"
-  checksum: 8297d436b2c0f95801103ff2ef67268d362021b8210daf8ddbe349695333eb3610a71122172ff3b0272f1ef2cf7cc2c41fdaa4715f52e49ffe04c56340feed09
+  checksum: 10c0/8297d436b2c0f95801103ff2ef67268d362021b8210daf8ddbe349695333eb3610a71122172ff3b0272f1ef2cf7cc2c41fdaa4715f52e49ffe04c56340feed09
   languageName: node
   linkType: hard
 
@@ -5378,7 +5378,7 @@ __metadata:
     ansi-styles: "npm:^3.2.1"
     escape-string-regexp: "npm:^1.0.5"
     supports-color: "npm:^5.3.0"
-  checksum: e6543f02ec877732e3a2d1c3c3323ddb4d39fbab687c23f526e25bd4c6a9bf3b83a696e8c769d078e04e5754921648f7821b2a2acfd16c550435fd630026e073
+  checksum: 10c0/e6543f02ec877732e3a2d1c3c3323ddb4d39fbab687c23f526e25bd4c6a9bf3b83a696e8c769d078e04e5754921648f7821b2a2acfd16c550435fd630026e073
   languageName: node
   linkType: hard
 
@@ -5388,7 +5388,7 @@ __metadata:
   dependencies:
     ansi-styles: "npm:^4.1.0"
     supports-color: "npm:^7.1.0"
-  checksum: ee650b0a065b3d7a6fda258e75d3a86fc8e4effa55871da730a9e42ccb035bf5fd203525e5a1ef45ec2582ecc4f65b47eb11357c526b84dd29a14fb162c414d2
+  checksum: 10c0/ee650b0a065b3d7a6fda258e75d3a86fc8e4effa55871da730a9e42ccb035bf5fd203525e5a1ef45ec2582ecc4f65b47eb11357c526b84dd29a14fb162c414d2
   languageName: node
   linkType: hard
 
@@ -5398,14 +5398,14 @@ __metadata:
   dependencies:
     ansi-styles: "npm:^4.1.0"
     supports-color: "npm:^7.1.0"
-  checksum: 4a3fef5cc34975c898ffe77141450f679721df9dde00f6c304353fa9c8b571929123b26a0e4617bde5018977eb655b31970c297b91b63ee83bb82aeb04666880
+  checksum: 10c0/4a3fef5cc34975c898ffe77141450f679721df9dde00f6c304353fa9c8b571929123b26a0e4617bde5018977eb655b31970c297b91b63ee83bb82aeb04666880
   languageName: node
   linkType: hard
 
 "char-regex@npm:^1.0.2":
   version: 1.0.2
   resolution: "char-regex@npm:1.0.2"
-  checksum: 57a09a86371331e0be35d9083ba429e86c4f4648ecbe27455dbfb343037c16ee6fdc7f6b61f433a57cc5ded5561d71c56a150e018f40c2ffb7bc93a26dae341e
+  checksum: 10c0/57a09a86371331e0be35d9083ba429e86c4f4648ecbe27455dbfb343037c16ee6fdc7f6b61f433a57cc5ded5561d71c56a150e018f40c2ffb7bc93a26dae341e
   languageName: node
   linkType: hard
 
@@ -5424,7 +5424,7 @@ __metadata:
   dependenciesMeta:
     fsevents:
       optional: true
-  checksum: 1076953093e0707c882a92c66c0f56ba6187831aa51bb4de878c1fec59ae611a3bf02898f190efec8e77a086b8df61c2b2a3ea324642a0558bdf8ee6c5dc9ca1
+  checksum: 10c0/1076953093e0707c882a92c66c0f56ba6187831aa51bb4de878c1fec59ae611a3bf02898f190efec8e77a086b8df61c2b2a3ea324642a0558bdf8ee6c5dc9ca1
   languageName: node
   linkType: hard
 
@@ -5447,28 +5447,28 @@ __metadata:
   dependenciesMeta:
     fsevents:
       optional: true
-  checksum: 5631cc00080224f9482cf5418dcbea111aec02fa8d81a8cfe37e47b9cf36089e071de52d503647e3a821a01426a40adc926ba899f657af86a51b8f8d4eef12a7
+  checksum: 10c0/5631cc00080224f9482cf5418dcbea111aec02fa8d81a8cfe37e47b9cf36089e071de52d503647e3a821a01426a40adc926ba899f657af86a51b8f8d4eef12a7
   languageName: node
   linkType: hard
 
 "chownr@npm:^2.0.0":
   version: 2.0.0
   resolution: "chownr@npm:2.0.0"
-  checksum: 594754e1303672171cc04e50f6c398ae16128eb134a88f801bf5354fd96f205320f23536a045d9abd8b51024a149696e51231565891d4efdab8846021ecf88e6
+  checksum: 10c0/594754e1303672171cc04e50f6c398ae16128eb134a88f801bf5354fd96f205320f23536a045d9abd8b51024a149696e51231565891d4efdab8846021ecf88e6
   languageName: node
   linkType: hard
 
 "chrome-trace-event@npm:^1.0.2":
   version: 1.0.3
   resolution: "chrome-trace-event@npm:1.0.3"
-  checksum: 080ce2d20c2b9e0f8461a380e9585686caa768b1c834a464470c9dc74cda07f27611c7b727a2cd768a9cecd033297fdec4ce01f1e58b62227882c1059dec321c
+  checksum: 10c0/080ce2d20c2b9e0f8461a380e9585686caa768b1c834a464470c9dc74cda07f27611c7b727a2cd768a9cecd033297fdec4ce01f1e58b62227882c1059dec321c
   languageName: node
   linkType: hard
 
 "ci-info@npm:^3.2.0":
   version: 3.9.0
   resolution: "ci-info@npm:3.9.0"
-  checksum: 6f0109e36e111684291d46123d491bc4e7b7a1934c3a20dea28cba89f1d4a03acd892f5f6a81ed3855c38647e285a150e3c9ba062e38943bef57fee6c1554c3a
+  checksum: 10c0/6f0109e36e111684291d46123d491bc4e7b7a1934c3a20dea28cba89f1d4a03acd892f5f6a81ed3855c38647e285a150e3c9ba062e38943bef57fee6c1554c3a
   languageName: node
   linkType: hard
 
@@ -5478,7 +5478,7 @@ __metadata:
   dependencies:
     inherits: "npm:^2.0.1"
     safe-buffer: "npm:^5.0.1"
-  checksum: d8d005f8b64d8a77b3d3ce531301ae7b45902c9cab4ec8b66bdbd2bf2a1d9fceb9a2133c293eb3c060b2d964da0f14c47fb740366081338aa3795dd1faa8984b
+  checksum: 10c0/d8d005f8b64d8a77b3d3ce531301ae7b45902c9cab4ec8b66bdbd2bf2a1d9fceb9a2133c293eb3c060b2d964da0f14c47fb740366081338aa3795dd1faa8984b
   languageName: node
   linkType: hard
 
@@ -5487,14 +5487,14 @@ __metadata:
   resolution: "circular-dependency-plugin@npm:5.2.2"
   peerDependencies:
     webpack: ">=4.0.1"
-  checksum: a2227a7d76c6110f818d364d280406d9dc79c99f7d18f7c643b0a72a2694399195e68ace32115b2bb2da6e53328fda0cadd4fa9535dd67c884567daa3e5a9560
+  checksum: 10c0/a2227a7d76c6110f818d364d280406d9dc79c99f7d18f7c643b0a72a2694399195e68ace32115b2bb2da6e53328fda0cadd4fa9535dd67c884567daa3e5a9560
   languageName: node
   linkType: hard
 
 "cjs-module-lexer@npm:^1.0.0":
   version: 1.2.3
   resolution: "cjs-module-lexer@npm:1.2.3"
-  checksum: 0de9a9c3fad03a46804c0d38e7b712fb282584a9c7ef1ed44cae22fb71d9bb600309d66a9711ac36a596fd03422f5bb03e021e8f369c12a39fa1786ae531baab
+  checksum: 10c0/0de9a9c3fad03a46804c0d38e7b712fb282584a9c7ef1ed44cae22fb71d9bb600309d66a9711ac36a596fd03422f5bb03e021e8f369c12a39fa1786ae531baab
   languageName: node
   linkType: hard
 
@@ -5506,21 +5506,21 @@ __metadata:
     define-property: "npm:^0.2.5"
     isobject: "npm:^3.0.0"
     static-extend: "npm:^0.1.1"
-  checksum: d44f4afc7a3e48dba4c2d3fada5f781a1adeeff371b875c3b578bc33815c6c29d5d06483c2abfd43a32d35b104b27b67bfa39c2e8a422fa858068bd756cfbd42
+  checksum: 10c0/d44f4afc7a3e48dba4c2d3fada5f781a1adeeff371b875c3b578bc33815c6c29d5d06483c2abfd43a32d35b104b27b67bfa39c2e8a422fa858068bd756cfbd42
   languageName: node
   linkType: hard
 
 "classnames@npm:^2.2.5, classnames@npm:^2.3.2":
   version: 2.5.1
   resolution: "classnames@npm:2.5.1"
-  checksum: afff4f77e62cea2d79c39962980bf316bacb0d7c49e13a21adaadb9221e1c6b9d3cdb829d8bb1b23c406f4e740507f37e1dcf506f7e3b7113d17c5bab787aa69
+  checksum: 10c0/afff4f77e62cea2d79c39962980bf316bacb0d7c49e13a21adaadb9221e1c6b9d3cdb829d8bb1b23c406f4e740507f37e1dcf506f7e3b7113d17c5bab787aa69
   languageName: node
   linkType: hard
 
 "clean-stack@npm:^2.0.0":
   version: 2.2.0
   resolution: "clean-stack@npm:2.2.0"
-  checksum: 1f90262d5f6230a17e27d0c190b09d47ebe7efdd76a03b5a1127863f7b3c9aec4c3e6c8bb3a7bbf81d553d56a1fd35728f5a8ef4c63f867ac8d690109742a8c1
+  checksum: 10c0/1f90262d5f6230a17e27d0c190b09d47ebe7efdd76a03b5a1127863f7b3c9aec4c3e6c8bb3a7bbf81d553d56a1fd35728f5a8ef4c63f867ac8d690109742a8c1
   languageName: node
   linkType: hard
 
@@ -5529,7 +5529,7 @@ __metadata:
   resolution: "cli-cursor@npm:4.0.0"
   dependencies:
     restore-cursor: "npm:^4.0.0"
-  checksum: e776e8c3c6727300d0539b0d25160b2bb56aed1a63942753ba1826b012f337a6f4b7ace3548402e4f2f13b5e16bfd751be672c44b203205e7eca8be94afec42c
+  checksum: 10c0/e776e8c3c6727300d0539b0d25160b2bb56aed1a63942753ba1826b012f337a6f4b7ace3548402e4f2f13b5e16bfd751be672c44b203205e7eca8be94afec42c
   languageName: node
   linkType: hard
 
@@ -5539,7 +5539,7 @@ __metadata:
   dependencies:
     slice-ansi: "npm:^5.0.0"
     string-width: "npm:^7.0.0"
-  checksum: d7f0b73e3d9b88cb496e6c086df7410b541b56a43d18ade6a573c9c18bd001b1c3fba1ad578f741a4218fdc794d042385f8ac02c25e1c295a2d8b9f3cb86eb4c
+  checksum: 10c0/d7f0b73e3d9b88cb496e6c086df7410b541b56a43d18ade6a573c9c18bd001b1c3fba1ad578f741a4218fdc794d042385f8ac02c25e1c295a2d8b9f3cb86eb4c
   languageName: node
   linkType: hard
 
@@ -5550,7 +5550,7 @@ __metadata:
     string-width: "npm:^3.1.0"
     strip-ansi: "npm:^5.2.0"
     wrap-ansi: "npm:^5.1.0"
-  checksum: 76142bf306965850a71efd10c9755bd7f447c7c20dd652e1c1ce27d987f862a3facb3cceb2909cef6f0cb363646ee7a1735e3dfdd49f29ed16d733d33e15e2f8
+  checksum: 10c0/76142bf306965850a71efd10c9755bd7f447c7c20dd652e1c1ce27d987f862a3facb3cceb2909cef6f0cb363646ee7a1735e3dfdd49f29ed16d733d33e15e2f8
   languageName: node
   linkType: hard
 
@@ -5561,7 +5561,7 @@ __metadata:
     string-width: "npm:^4.2.0"
     strip-ansi: "npm:^6.0.1"
     wrap-ansi: "npm:^7.0.0"
-  checksum: 4bda0f09c340cbb6dfdc1ed508b3ca080f12992c18d68c6be4d9cf51756033d5266e61ec57529e610dacbf4da1c634423b0c1b11037709cc6b09045cbd815df5
+  checksum: 10c0/4bda0f09c340cbb6dfdc1ed508b3ca080f12992c18d68c6be4d9cf51756033d5266e61ec57529e610dacbf4da1c634423b0c1b11037709cc6b09045cbd815df5
   languageName: node
   linkType: hard
 
@@ -5572,21 +5572,21 @@ __metadata:
     is-plain-object: "npm:^2.0.4"
     kind-of: "npm:^6.0.2"
     shallow-clone: "npm:^3.0.0"
-  checksum: 637753615aa24adf0f2d505947a1bb75e63964309034a1cf56ba4b1f30af155201edd38d26ffe26911adaae267a3c138b344a4947d39f5fc1b6d6108125aa758
+  checksum: 10c0/637753615aa24adf0f2d505947a1bb75e63964309034a1cf56ba4b1f30af155201edd38d26ffe26911adaae267a3c138b344a4947d39f5fc1b6d6108125aa758
   languageName: node
   linkType: hard
 
 "cluster-key-slot@npm:^1.1.0":
   version: 1.1.2
   resolution: "cluster-key-slot@npm:1.1.2"
-  checksum: d7d39ca28a8786e9e801eeb8c770e3c3236a566625d7299a47bb71113fb2298ce1039596acb82590e598c52dbc9b1f088c8f587803e697cb58e1867a95ff94d3
+  checksum: 10c0/d7d39ca28a8786e9e801eeb8c770e3c3236a566625d7299a47bb71113fb2298ce1039596acb82590e598c52dbc9b1f088c8f587803e697cb58e1867a95ff94d3
   languageName: node
   linkType: hard
 
 "co@npm:^4.6.0":
   version: 4.6.0
   resolution: "co@npm:4.6.0"
-  checksum: c0e85ea0ca8bf0a50cbdca82efc5af0301240ca88ebe3644a6ffb8ffe911f34d40f8fbcf8f1d52c5ddd66706abd4d3bfcd64259f1e8e2371d4f47573b0dc8c28
+  checksum: 10c0/c0e85ea0ca8bf0a50cbdca82efc5af0301240ca88ebe3644a6ffb8ffe911f34d40f8fbcf8f1d52c5ddd66706abd4d3bfcd64259f1e8e2371d4f47573b0dc8c28
   languageName: node
   linkType: hard
 
@@ -5597,21 +5597,21 @@ __metadata:
     "@types/q": "npm:^1.5.1"
     chalk: "npm:^2.4.1"
     q: "npm:^1.1.2"
-  checksum: 0264392e3b691a8551e619889f3e67558b4f755eeb09d67625032a25c37634731e778fabbd9d14df6477d6ae770e30ea9405d18e515b2ec492b0eb90bb8d7f43
+  checksum: 10c0/0264392e3b691a8551e619889f3e67558b4f755eeb09d67625032a25c37634731e778fabbd9d14df6477d6ae770e30ea9405d18e515b2ec492b0eb90bb8d7f43
   languageName: node
   linkType: hard
 
 "cocoon-js-vanilla@npm:^1.3.0":
   version: 1.4.0
   resolution: "cocoon-js-vanilla@npm:1.4.0"
-  checksum: 3a3976d325d24518317ca38536ad5f4e570c139b86082dd33c64d38c2a4b2c58fa9cc9aac4624d8fd2f4c9f0eafe681bb8872360010e6b36d9974d8abc57f520
+  checksum: 10c0/3a3976d325d24518317ca38536ad5f4e570c139b86082dd33c64d38c2a4b2c58fa9cc9aac4624d8fd2f4c9f0eafe681bb8872360010e6b36d9974d8abc57f520
   languageName: node
   linkType: hard
 
 "collect-v8-coverage@npm:^1.0.0":
   version: 1.0.2
   resolution: "collect-v8-coverage@npm:1.0.2"
-  checksum: ed7008e2e8b6852c5483b444a3ae6e976e088d4335a85aa0a9db2861c5f1d31bd2d7ff97a60469b3388deeba661a619753afbe201279fb159b4b9548ab8269a1
+  checksum: 10c0/ed7008e2e8b6852c5483b444a3ae6e976e088d4335a85aa0a9db2861c5f1d31bd2d7ff97a60469b3388deeba661a619753afbe201279fb159b4b9548ab8269a1
   languageName: node
   linkType: hard
 
@@ -5621,14 +5621,14 @@ __metadata:
   dependencies:
     map-visit: "npm:^1.0.0"
     object-visit: "npm:^1.0.0"
-  checksum: add72a8d1c37cb90e53b1aaa2c31bf1989bfb733f0b02ce82c9fa6828c7a14358dba2e4f8e698c02f69e424aeccae1ffb39acdeaf872ade2f41369e84a2fcf8a
+  checksum: 10c0/add72a8d1c37cb90e53b1aaa2c31bf1989bfb733f0b02ce82c9fa6828c7a14358dba2e4f8e698c02f69e424aeccae1ffb39acdeaf872ade2f41369e84a2fcf8a
   languageName: node
   linkType: hard
 
 "color-blend@npm:^4.0.0":
   version: 4.0.0
   resolution: "color-blend@npm:4.0.0"
-  checksum: d046f3b017e7b0e70a130e49f4bfb2867ebf41d7cf1e816bd6cbcf1c492cdbb795b204743ce099ebe3fa17d9b24114555ce174d211c741e06bf7db91a633ab24
+  checksum: 10c0/d046f3b017e7b0e70a130e49f4bfb2867ebf41d7cf1e816bd6cbcf1c492cdbb795b204743ce099ebe3fa17d9b24114555ce174d211c741e06bf7db91a633ab24
   languageName: node
   linkType: hard
 
@@ -5637,7 +5637,7 @@ __metadata:
   resolution: "color-convert@npm:1.9.3"
   dependencies:
     color-name: "npm:1.1.3"
-  checksum: 5ad3c534949a8c68fca8fbc6f09068f435f0ad290ab8b2f76841b9e6af7e0bb57b98cb05b0e19fe33f5d91e5a8611ad457e5f69e0a484caad1f7487fd0e8253c
+  checksum: 10c0/5ad3c534949a8c68fca8fbc6f09068f435f0ad290ab8b2f76841b9e6af7e0bb57b98cb05b0e19fe33f5d91e5a8611ad457e5f69e0a484caad1f7487fd0e8253c
   languageName: node
   linkType: hard
 
@@ -5646,42 +5646,42 @@ __metadata:
   resolution: "color-convert@npm:2.0.1"
   dependencies:
     color-name: "npm:~1.1.4"
-  checksum: 37e1150172f2e311fe1b2df62c6293a342ee7380da7b9cfdba67ea539909afbd74da27033208d01d6d5cfc65ee7868a22e18d7e7648e004425441c0f8a15a7d7
+  checksum: 10c0/37e1150172f2e311fe1b2df62c6293a342ee7380da7b9cfdba67ea539909afbd74da27033208d01d6d5cfc65ee7868a22e18d7e7648e004425441c0f8a15a7d7
   languageName: node
   linkType: hard
 
 "color-name@npm:1.1.3":
   version: 1.1.3
   resolution: "color-name@npm:1.1.3"
-  checksum: 566a3d42cca25b9b3cd5528cd7754b8e89c0eb646b7f214e8e2eaddb69994ac5f0557d9c175eb5d8f0ad73531140d9c47525085ee752a91a2ab15ab459caf6d6
+  checksum: 10c0/566a3d42cca25b9b3cd5528cd7754b8e89c0eb646b7f214e8e2eaddb69994ac5f0557d9c175eb5d8f0ad73531140d9c47525085ee752a91a2ab15ab459caf6d6
   languageName: node
   linkType: hard
 
 "color-name@npm:~1.1.4":
   version: 1.1.4
   resolution: "color-name@npm:1.1.4"
-  checksum: a1a3f914156960902f46f7f56bc62effc6c94e84b2cae157a526b1c1f74b677a47ec602bf68a61abfa2b42d15b7c5651c6dbe72a43af720bc588dff885b10f95
+  checksum: 10c0/a1a3f914156960902f46f7f56bc62effc6c94e84b2cae157a526b1c1f74b677a47ec602bf68a61abfa2b42d15b7c5651c6dbe72a43af720bc588dff885b10f95
   languageName: node
   linkType: hard
 
 "colord@npm:^2.9.1, colord@npm:^2.9.3":
   version: 2.9.3
   resolution: "colord@npm:2.9.3"
-  checksum: 9699e956894d8996b28c686afe8988720785f476f59335c80ce852ded76ab3ebe252703aec53d9bef54f6219aea6b960fb3d9a8300058a1d0c0d4026460cd110
+  checksum: 10c0/9699e956894d8996b28c686afe8988720785f476f59335c80ce852ded76ab3ebe252703aec53d9bef54f6219aea6b960fb3d9a8300058a1d0c0d4026460cd110
   languageName: node
   linkType: hard
 
 "colorette@npm:^2.0.20, colorette@npm:^2.0.7":
   version: 2.0.20
   resolution: "colorette@npm:2.0.20"
-  checksum: e94116ff33b0ff56f3b83b9ace895e5bf87c2a7a47b3401b8c3f3226e050d5ef76cf4072fb3325f9dc24d1698f9b730baf4e05eeaf861d74a1883073f4c98a40
+  checksum: 10c0/e94116ff33b0ff56f3b83b9ace895e5bf87c2a7a47b3401b8c3f3226e050d5ef76cf4072fb3325f9dc24d1698f9b730baf4e05eeaf861d74a1883073f4c98a40
   languageName: node
   linkType: hard
 
 "colors@npm:^1.4.0":
   version: 1.4.0
   resolution: "colors@npm:1.4.0"
-  checksum: 9af357c019da3c5a098a301cf64e3799d27549d8f185d86f79af23069e4f4303110d115da98483519331f6fb71c8568d5688fa1c6523600044fd4a54e97c4efb
+  checksum: 10c0/9af357c019da3c5a098a301cf64e3799d27549d8f185d86f79af23069e4f4303110d115da98483519331f6fb71c8568d5688fa1c6523600044fd4a54e97c4efb
   languageName: node
   linkType: hard
 
@@ -5690,56 +5690,56 @@ __metadata:
   resolution: "combined-stream@npm:1.0.8"
   dependencies:
     delayed-stream: "npm:~1.0.0"
-  checksum: 0dbb829577e1b1e839fa82b40c07ffaf7de8a09b935cadd355a73652ae70a88b4320db322f6634a4ad93424292fa80973ac6480986247f1734a1137debf271d5
+  checksum: 10c0/0dbb829577e1b1e839fa82b40c07ffaf7de8a09b935cadd355a73652ae70a88b4320db322f6634a4ad93424292fa80973ac6480986247f1734a1137debf271d5
   languageName: node
   linkType: hard
 
 "commander@npm:11.1.0":
   version: 11.1.0
   resolution: "commander@npm:11.1.0"
-  checksum: 13cc6ac875e48780250f723fb81c1c1178d35c5decb1abb1b628b3177af08a8554e76b2c0f29de72d69eef7c864d12613272a71fabef8047922bc622ab75a179
+  checksum: 10c0/13cc6ac875e48780250f723fb81c1c1178d35c5decb1abb1b628b3177af08a8554e76b2c0f29de72d69eef7c864d12613272a71fabef8047922bc622ab75a179
   languageName: node
   linkType: hard
 
 "commander@npm:^2.20.0":
   version: 2.20.3
   resolution: "commander@npm:2.20.3"
-  checksum: 74c781a5248c2402a0a3e966a0a2bba3c054aad144f5c023364be83265e796b20565aa9feff624132ff629aa64e16999fa40a743c10c12f7c61e96a794b99288
+  checksum: 10c0/74c781a5248c2402a0a3e966a0a2bba3c054aad144f5c023364be83265e796b20565aa9feff624132ff629aa64e16999fa40a743c10c12f7c61e96a794b99288
   languageName: node
   linkType: hard
 
 "commander@npm:^7.2.0":
   version: 7.2.0
   resolution: "commander@npm:7.2.0"
-  checksum: 8d690ff13b0356df7e0ebbe6c59b4712f754f4b724d4f473d3cc5b3fdcf978e3a5dc3078717858a2ceb50b0f84d0660a7f22a96cdc50fb877d0c9bb31593d23a
+  checksum: 10c0/8d690ff13b0356df7e0ebbe6c59b4712f754f4b724d4f473d3cc5b3fdcf978e3a5dc3078717858a2ceb50b0f84d0660a7f22a96cdc50fb877d0c9bb31593d23a
   languageName: node
   linkType: hard
 
 "comment-parser@npm:1.4.1":
   version: 1.4.1
   resolution: "comment-parser@npm:1.4.1"
-  checksum: d6c4be3f5be058f98b24f2d557f745d8fe1cc9eb75bebbdccabd404a0e1ed41563171b16285f593011f8b6a5ec81f564fb1f2121418ac5cbf0f49255bf0840dd
+  checksum: 10c0/d6c4be3f5be058f98b24f2d557f745d8fe1cc9eb75bebbdccabd404a0e1ed41563171b16285f593011f8b6a5ec81f564fb1f2121418ac5cbf0f49255bf0840dd
   languageName: node
   linkType: hard
 
 "common-tags@npm:^1.8.0":
   version: 1.8.2
   resolution: "common-tags@npm:1.8.2"
-  checksum: 23efe47ff0a1a7c91489271b3a1e1d2a171c12ec7f9b35b29b2fce51270124aff0ec890087e2bc2182c1cb746e232ab7561aaafe05f1e7452aea733d2bfe3f63
+  checksum: 10c0/23efe47ff0a1a7c91489271b3a1e1d2a171c12ec7f9b35b29b2fce51270124aff0ec890087e2bc2182c1cb746e232ab7561aaafe05f1e7452aea733d2bfe3f63
   languageName: node
   linkType: hard
 
 "commondir@npm:^1.0.1":
   version: 1.0.1
   resolution: "commondir@npm:1.0.1"
-  checksum: 33a124960e471c25ee19280c9ce31ccc19574b566dc514fe4f4ca4c34fa8b0b57cf437671f5de380e11353ea9426213fca17687dd2ef03134fea2dbc53809fd6
+  checksum: 10c0/33a124960e471c25ee19280c9ce31ccc19574b566dc514fe4f4ca4c34fa8b0b57cf437671f5de380e11353ea9426213fca17687dd2ef03134fea2dbc53809fd6
   languageName: node
   linkType: hard
 
 "component-emitter@npm:^1.2.1":
   version: 1.3.0
   resolution: "component-emitter@npm:1.3.0"
-  checksum: 68774a0a3754fb6c0ba53c2e88886dfbd0c773931066abb1d7fd1b0c893b2a838d8f088ab4dca1f18cc1a4fc2e6932019eba3ded2d931b5ba2241ce40e93a24f
+  checksum: 10c0/68774a0a3754fb6c0ba53c2e88886dfbd0c773931066abb1d7fd1b0c893b2a838d8f088ab4dca1f18cc1a4fc2e6932019eba3ded2d931b5ba2241ce40e93a24f
   languageName: node
   linkType: hard
 
@@ -5748,7 +5748,7 @@ __metadata:
   resolution: "compressible@npm:2.0.18"
   dependencies:
     mime-db: "npm:>= 1.43.0 < 2"
-  checksum: 8a03712bc9f5b9fe530cc5a79e164e665550d5171a64575d7dcf3e0395d7b4afa2d79ab176c61b5b596e28228b350dd07c1a2a6ead12fd81d1b6cd632af2fef7
+  checksum: 10c0/8a03712bc9f5b9fe530cc5a79e164e665550d5171a64575d7dcf3e0395d7b4afa2d79ab176c61b5b596e28228b350dd07c1a2a6ead12fd81d1b6cd632af2fef7
   languageName: node
   linkType: hard
 
@@ -5763,7 +5763,7 @@ __metadata:
     webpack-sources: "npm:^1.4.3"
   peerDependencies:
     webpack: ^4.0.0 || ^5.0.0
-  checksum: 966b1417bbeaa55af8d4b7911cf4435a187adbaaff34d3e9f2ef2b7ff747877469ff965d5b653a2211eaecfd0ce8b3c834d3a8f5519aa15dd79e68bbfea0b69e
+  checksum: 10c0/966b1417bbeaa55af8d4b7911cf4435a187adbaaff34d3e9f2ef2b7ff747877469ff965d5b653a2211eaecfd0ce8b3c834d3a8f5519aa15dd79e68bbfea0b69e
   languageName: node
   linkType: hard
 
@@ -5778,35 +5778,35 @@ __metadata:
     on-headers: "npm:~1.0.2"
     safe-buffer: "npm:5.1.2"
     vary: "npm:~1.1.2"
-  checksum: 138db836202a406d8a14156a5564fb1700632a76b6e7d1546939472895a5304f2b23c80d7a22bf44c767e87a26e070dbc342ea63bb45ee9c863354fa5556bbbc
+  checksum: 10c0/138db836202a406d8a14156a5564fb1700632a76b6e7d1546939472895a5304f2b23c80d7a22bf44c767e87a26e070dbc342ea63bb45ee9c863354fa5556bbbc
   languageName: node
   linkType: hard
 
 "concat-map@npm:0.0.1":
   version: 0.0.1
   resolution: "concat-map@npm:0.0.1"
-  checksum: c996b1cfdf95b6c90fee4dae37e332c8b6eb7d106430c17d538034c0ad9a1630cb194d2ab37293b1bdd4d779494beee7786d586a50bd9376fd6f7bcc2bd4c98f
+  checksum: 10c0/c996b1cfdf95b6c90fee4dae37e332c8b6eb7d106430c17d538034c0ad9a1630cb194d2ab37293b1bdd4d779494beee7786d586a50bd9376fd6f7bcc2bd4c98f
   languageName: node
   linkType: hard
 
 "connect-history-api-fallback@npm:^1.6.0":
   version: 1.6.0
   resolution: "connect-history-api-fallback@npm:1.6.0"
-  checksum: 6d59c68070fcb2f6d981992f88d050d7544e8e1af6600c23ad680d955e316216794a742a1669d1f14ed5171fc628b916f8a4e15c5a1e55bffc8ccc60bfeb0b2c
+  checksum: 10c0/6d59c68070fcb2f6d981992f88d050d7544e8e1af6600c23ad680d955e316216794a742a1669d1f14ed5171fc628b916f8a4e15c5a1e55bffc8ccc60bfeb0b2c
   languageName: node
   linkType: hard
 
 "console-browserify@npm:^1.1.0":
   version: 1.2.0
   resolution: "console-browserify@npm:1.2.0"
-  checksum: 89b99a53b7d6cee54e1e64fa6b1f7ac24b844b4019c5d39db298637e55c1f4ffa5c165457ad984864de1379df2c8e1886cbbdac85d9dbb6876a9f26c3106f226
+  checksum: 10c0/89b99a53b7d6cee54e1e64fa6b1f7ac24b844b4019c5d39db298637e55c1f4ffa5c165457ad984864de1379df2c8e1886cbbdac85d9dbb6876a9f26c3106f226
   languageName: node
   linkType: hard
 
 "constants-browserify@npm:^1.0.0":
   version: 1.0.0
   resolution: "constants-browserify@npm:1.0.0"
-  checksum: ab49b1d59a433ed77c964d90d19e08b2f77213fb823da4729c0baead55e3c597f8f97ebccfdfc47bd896d43854a117d114c849a6f659d9986420e97da0f83ac5
+  checksum: 10c0/ab49b1d59a433ed77c964d90d19e08b2f77213fb823da4729c0baead55e3c597f8f97ebccfdfc47bd896d43854a117d114c849a6f659d9986420e97da0f83ac5
   languageName: node
   linkType: hard
 
@@ -5815,49 +5815,49 @@ __metadata:
   resolution: "content-disposition@npm:0.5.4"
   dependencies:
     safe-buffer: "npm:5.2.1"
-  checksum: bac0316ebfeacb8f381b38285dc691c9939bf0a78b0b7c2d5758acadad242d04783cee5337ba7d12a565a19075af1b3c11c728e1e4946de73c6ff7ce45f3f1bb
+  checksum: 10c0/bac0316ebfeacb8f381b38285dc691c9939bf0a78b0b7c2d5758acadad242d04783cee5337ba7d12a565a19075af1b3c11c728e1e4946de73c6ff7ce45f3f1bb
   languageName: node
   linkType: hard
 
 "content-type@npm:~1.0.4":
   version: 1.0.5
   resolution: "content-type@npm:1.0.5"
-  checksum: b76ebed15c000aee4678c3707e0860cb6abd4e680a598c0a26e17f0bfae723ec9cc2802f0ff1bc6e4d80603719010431d2231018373d4dde10f9ccff9dadf5af
+  checksum: 10c0/b76ebed15c000aee4678c3707e0860cb6abd4e680a598c0a26e17f0bfae723ec9cc2802f0ff1bc6e4d80603719010431d2231018373d4dde10f9ccff9dadf5af
   languageName: node
   linkType: hard
 
 "convert-source-map@npm:^1.5.0, convert-source-map@npm:^1.6.0":
   version: 1.9.0
   resolution: "convert-source-map@npm:1.9.0"
-  checksum: 281da55454bf8126cbc6625385928c43479f2060984180c42f3a86c8b8c12720a24eac260624a7d1e090004028d2dee78602330578ceec1a08e27cb8bb0a8a5b
+  checksum: 10c0/281da55454bf8126cbc6625385928c43479f2060984180c42f3a86c8b8c12720a24eac260624a7d1e090004028d2dee78602330578ceec1a08e27cb8bb0a8a5b
   languageName: node
   linkType: hard
 
 "convert-source-map@npm:^2.0.0":
   version: 2.0.0
   resolution: "convert-source-map@npm:2.0.0"
-  checksum: 8f2f7a27a1a011cc6cc88cc4da2d7d0cfa5ee0369508baae3d98c260bb3ac520691464e5bbe4ae7cdf09860c1d69ecc6f70c63c6e7c7f7e3f18ec08484dc7d9b
+  checksum: 10c0/8f2f7a27a1a011cc6cc88cc4da2d7d0cfa5ee0369508baae3d98c260bb3ac520691464e5bbe4ae7cdf09860c1d69ecc6f70c63c6e7c7f7e3f18ec08484dc7d9b
   languageName: node
   linkType: hard
 
 "cookie-signature@npm:1.0.6":
   version: 1.0.6
   resolution: "cookie-signature@npm:1.0.6"
-  checksum: b36fd0d4e3fef8456915fcf7742e58fbfcc12a17a018e0eb9501c9d5ef6893b596466f03b0564b81af29ff2538fd0aa4b9d54fe5ccbfb4c90ea50ad29fe2d221
+  checksum: 10c0/b36fd0d4e3fef8456915fcf7742e58fbfcc12a17a018e0eb9501c9d5ef6893b596466f03b0564b81af29ff2538fd0aa4b9d54fe5ccbfb4c90ea50ad29fe2d221
   languageName: node
   linkType: hard
 
 "cookie@npm:0.5.0":
   version: 0.5.0
   resolution: "cookie@npm:0.5.0"
-  checksum: c01ca3ef8d7b8187bae434434582288681273b5a9ed27521d4d7f9f7928fe0c920df0decd9f9d3bbd2d14ac432b8c8cf42b98b3bdd5bfe0e6edddeebebe8b61d
+  checksum: 10c0/c01ca3ef8d7b8187bae434434582288681273b5a9ed27521d4d7f9f7928fe0c920df0decd9f9d3bbd2d14ac432b8c8cf42b98b3bdd5bfe0e6edddeebebe8b61d
   languageName: node
   linkType: hard
 
 "copy-descriptor@npm:^0.1.0":
   version: 0.1.1
   resolution: "copy-descriptor@npm:0.1.1"
-  checksum: 161f6760b7348c941007a83df180588fe2f1283e0867cc027182734e0f26134e6cc02de09aa24a95dc267b2e2025b55659eef76c8019df27bc2d883033690181
+  checksum: 10c0/161f6760b7348c941007a83df180588fe2f1283e0867cc027182734e0f26134e6cc02de09aa24a95dc267b2e2025b55659eef76c8019df27bc2d883033690181
   languageName: node
   linkType: hard
 
@@ -5866,28 +5866,28 @@ __metadata:
   resolution: "core-js-compat@npm:3.35.1"
   dependencies:
     browserslist: "npm:^4.22.2"
-  checksum: c3b872e1f9703aa9554cce816207d85730da4703f1776c540b4da11bbbef6d9a1e6041625b5c1f58d2ada3d05f4a2b92897b7de5315c5ecd5d33d50dec86cca7
+  checksum: 10c0/c3b872e1f9703aa9554cce816207d85730da4703f1776c540b4da11bbbef6d9a1e6041625b5c1f58d2ada3d05f4a2b92897b7de5315c5ecd5d33d50dec86cca7
   languageName: node
   linkType: hard
 
 "core-js@npm:^2.5.0":
   version: 2.6.12
   resolution: "core-js@npm:2.6.12"
-  checksum: 00128efe427789120a06b819adc94cc72b96955acb331cb71d09287baf9bd37bebd191d91f1ee4939c893a050307ead4faea08876f09115112612b6a05684b63
+  checksum: 10c0/00128efe427789120a06b819adc94cc72b96955acb331cb71d09287baf9bd37bebd191d91f1ee4939c893a050307ead4faea08876f09115112612b6a05684b63
   languageName: node
   linkType: hard
 
 "core-js@npm:^3.30.2":
   version: 3.35.1
   resolution: "core-js@npm:3.35.1"
-  checksum: ebc8e22c36d13bcf2140cbc1d8ad65d1b08192bff4c43ade70c72eac103cb4dcfbc521f2b1ad1c74881b0a4353e64986537893ae4f07888e49228340efa13ae6
+  checksum: 10c0/ebc8e22c36d13bcf2140cbc1d8ad65d1b08192bff4c43ade70c72eac103cb4dcfbc521f2b1ad1c74881b0a4353e64986537893ae4f07888e49228340efa13ae6
   languageName: node
   linkType: hard
 
 "core-util-is@npm:~1.0.0":
   version: 1.0.3
   resolution: "core-util-is@npm:1.0.3"
-  checksum: 90a0e40abbddfd7618f8ccd63a74d88deea94e77d0e8dbbea059fa7ebebb8fbb4e2909667fe26f3a467073de1a542ebe6ae4c73a73745ac5833786759cd906c9
+  checksum: 10c0/90a0e40abbddfd7618f8ccd63a74d88deea94e77d0e8dbbea059fa7ebebb8fbb4e2909667fe26f3a467073de1a542ebe6ae4c73a73745ac5833786759cd906c9
   languageName: node
   linkType: hard
 
@@ -5897,7 +5897,7 @@ __metadata:
   dependencies:
     object-assign: "npm:^4"
     vary: "npm:^1"
-  checksum: 373702b7999409922da80de4a61938aabba6929aea5b6fd9096fefb9e8342f626c0ebd7507b0e8b0b311380744cc985f27edebc0a26e0ddb784b54e1085de761
+  checksum: 10c0/373702b7999409922da80de4a61938aabba6929aea5b6fd9096fefb9e8342f626c0ebd7507b0e8b0b311380744cc985f27edebc0a26e0ddb784b54e1085de761
   languageName: node
   linkType: hard
 
@@ -5910,7 +5910,7 @@ __metadata:
     parse-json: "npm:^5.0.0"
     path-type: "npm:^4.0.0"
     yaml: "npm:^1.10.0"
-  checksum: b923ff6af581638128e5f074a5450ba12c0300b71302398ea38dbeabd33bbcaa0245ca9adbedfcf284a07da50f99ede5658c80bb3e39e2ce770a99d28a21ef03
+  checksum: 10c0/b923ff6af581638128e5f074a5450ba12c0300b71302398ea38dbeabd33bbcaa0245ca9adbedfcf284a07da50f99ede5658c80bb3e39e2ce770a99d28a21ef03
   languageName: node
   linkType: hard
 
@@ -5927,7 +5927,7 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 1c1703be4f02a250b1d6ca3267e408ce16abfe8364193891afc94c2d5c060b69611fdc8d97af74b7e6d5d1aac0ab2fb94d6b079573146bc2d756c2484ce5f0ee
+  checksum: 10c0/1c1703be4f02a250b1d6ca3267e408ce16abfe8364193891afc94c2d5c060b69611fdc8d97af74b7e6d5d1aac0ab2fb94d6b079573146bc2d756c2484ce5f0ee
   languageName: node
   linkType: hard
 
@@ -5937,7 +5937,7 @@ __metadata:
   dependencies:
     bn.js: "npm:^4.1.0"
     elliptic: "npm:^6.5.3"
-  checksum: 77b11a51360fec9c3bce7a76288fc0deba4b9c838d5fb354b3e40c59194d23d66efe6355fd4b81df7580da0661e1334a235a2a5c040b7569ba97db428d466e7f
+  checksum: 10c0/77b11a51360fec9c3bce7a76288fc0deba4b9c838d5fb354b3e40c59194d23d66efe6355fd4b81df7580da0661e1334a235a2a5c040b7569ba97db428d466e7f
   languageName: node
   linkType: hard
 
@@ -5950,7 +5950,7 @@ __metadata:
     md5.js: "npm:^1.3.4"
     ripemd160: "npm:^2.0.1"
     sha.js: "npm:^2.4.0"
-  checksum: d402e60e65e70e5083cb57af96d89567954d0669e90550d7cec58b56d49c4b193d35c43cec8338bc72358198b8cbf2f0cac14775b651e99238e1cf411490f915
+  checksum: 10c0/d402e60e65e70e5083cb57af96d89567954d0669e90550d7cec58b56d49c4b193d35c43cec8338bc72358198b8cbf2f0cac14775b651e99238e1cf411490f915
   languageName: node
   linkType: hard
 
@@ -5964,7 +5964,7 @@ __metadata:
     ripemd160: "npm:^2.0.0"
     safe-buffer: "npm:^5.0.1"
     sha.js: "npm:^2.4.8"
-  checksum: 24332bab51011652a9a0a6d160eed1e8caa091b802335324ae056b0dcb5acbc9fcf173cf10d128eba8548c3ce98dfa4eadaa01bd02f44a34414baee26b651835
+  checksum: 10c0/24332bab51011652a9a0a6d160eed1e8caa091b802335324ae056b0dcb5acbc9fcf173cf10d128eba8548c3ce98dfa4eadaa01bd02f44a34414baee26b651835
   languageName: node
   linkType: hard
 
@@ -5981,7 +5981,7 @@ __metadata:
     prompts: "npm:^2.0.1"
   bin:
     create-jest: bin/create-jest.js
-  checksum: e7e54c280692470d3398f62a6238fd396327e01c6a0757002833f06d00afc62dd7bfe04ff2b9cd145264460e6b4d1eb8386f2925b7e567f97939843b7b0e812f
+  checksum: 10c0/e7e54c280692470d3398f62a6238fd396327e01c6a0757002833f06d00afc62dd7bfe04ff2b9cd145264460e6b4d1eb8386f2925b7e567f97939843b7b0e812f
   languageName: node
   linkType: hard
 
@@ -5993,7 +5993,7 @@ __metadata:
   bin:
     cross-env: src/bin/cross-env.js
     cross-env-shell: src/bin/cross-env-shell.js
-  checksum: f3765c25746c69fcca369655c442c6c886e54ccf3ab8c16847d5ad0e91e2f337d36eedc6599c1227904bf2a228d721e690324446876115bc8e7b32a866735ecf
+  checksum: 10c0/f3765c25746c69fcca369655c442c6c886e54ccf3ab8c16847d5ad0e91e2f337d36eedc6599c1227904bf2a228d721e690324446876115bc8e7b32a866735ecf
   languageName: node
   linkType: hard
 
@@ -6006,7 +6006,7 @@ __metadata:
     semver: "npm:^5.5.0"
     shebang-command: "npm:^1.2.0"
     which: "npm:^1.2.9"
-  checksum: e05544722e9d7189b4292c66e42b7abeb21db0d07c91b785f4ae5fefceb1f89e626da2703744657b287e86dcd4af57b54567cef75159957ff7a8a761d9055012
+  checksum: 10c0/e05544722e9d7189b4292c66e42b7abeb21db0d07c91b785f4ae5fefceb1f89e626da2703744657b287e86dcd4af57b54567cef75159957ff7a8a761d9055012
   languageName: node
   linkType: hard
 
@@ -6017,7 +6017,7 @@ __metadata:
     path-key: "npm:^3.1.0"
     shebang-command: "npm:^2.0.0"
     which: "npm:^2.0.1"
-  checksum: 5738c312387081c98d69c98e105b6327b069197f864a60593245d64c8089c8a0a744e16349281210d56835bb9274130d825a78b2ad6853ca13cfbeffc0c31750
+  checksum: 10c0/5738c312387081c98d69c98e105b6327b069197f864a60593245d64c8089c8a0a744e16349281210d56835bb9274130d825a78b2ad6853ca13cfbeffc0c31750
   languageName: node
   linkType: hard
 
@@ -6036,14 +6036,14 @@ __metadata:
     public-encrypt: "npm:^4.0.0"
     randombytes: "npm:^2.0.0"
     randomfill: "npm:^1.0.3"
-  checksum: 0c20198886576050a6aa5ba6ae42f2b82778bfba1753d80c5e7a090836890dc372bdc780986b2568b4fb8ed2a91c958e61db1f0b6b1cc96af4bd03ffc298ba92
+  checksum: 10c0/0c20198886576050a6aa5ba6ae42f2b82778bfba1753d80c5e7a090836890dc372bdc780986b2568b4fb8ed2a91c958e61db1f0b6b1cc96af4bd03ffc298ba92
   languageName: node
   linkType: hard
 
 "crypto-random-string@npm:^2.0.0":
   version: 2.0.0
   resolution: "crypto-random-string@npm:2.0.0"
-  checksum: 288589b2484fe787f9e146f56c4be90b940018f17af1b152e4dde12309042ff5a2bf69e949aab8b8ac253948381529cc6f3e5a2427b73643a71ff177fa122b37
+  checksum: 10c0/288589b2484fe787f9e146f56c4be90b940018f17af1b152e4dde12309042ff5a2bf69e949aab8b8ac253948381529cc6f3e5a2427b73643a71ff177fa122b37
   languageName: node
   linkType: hard
 
@@ -6052,14 +6052,14 @@ __metadata:
   resolution: "css-declaration-sorter@npm:7.1.1"
   peerDependencies:
     postcss: ^8.0.9
-  checksum: bea446e441bafde21c3c7b3f7639559311da12eea140db7ee3c61e4f41df455b7b098df107f99bc0cca32a5020841cc94bf8a2d5efb1b383e51f9de478c4816e
+  checksum: 10c0/bea446e441bafde21c3c7b3f7639559311da12eea140db7ee3c61e4f41df455b7b098df107f99bc0cca32a5020841cc94bf8a2d5efb1b383e51f9de478c4816e
   languageName: node
   linkType: hard
 
 "css-functions-list@npm:^3.2.1":
   version: 3.2.1
   resolution: "css-functions-list@npm:3.2.1"
-  checksum: e6e2d9580437ad6df9f2cf18cff3f941691ec5cbbaebd4cb17a5da40d8d5dac50004807ddd05c00a121d2f21a224e2c5d339fe8e13614af21c00181d7d1c22b9
+  checksum: 10c0/e6e2d9580437ad6df9f2cf18cff3f941691ec5cbbaebd4cb17a5da40d8d5dac50004807ddd05c00a121d2f21a224e2c5d339fe8e13614af21c00181d7d1c22b9
   languageName: node
   linkType: hard
 
@@ -6079,14 +6079,14 @@ __metadata:
     semver: "npm:^7.3.5"
   peerDependencies:
     webpack: ^4.27.0 || ^5.0.0
-  checksum: 02fbdb0dca92e4a4d2aa27b2817ea51d0af3d662d3295c61f2aa37537b29f9a46a9c2e87d8f5e40a1a97159f35d5c7b9a325f27761b59a38c8e15e8ca3988d2b
+  checksum: 10c0/02fbdb0dca92e4a4d2aa27b2817ea51d0af3d662d3295c61f2aa37537b29f9a46a9c2e87d8f5e40a1a97159f35d5c7b9a325f27761b59a38c8e15e8ca3988d2b
   languageName: node
   linkType: hard
 
 "css-select-base-adapter@npm:^0.1.1":
   version: 0.1.1
   resolution: "css-select-base-adapter@npm:0.1.1"
-  checksum: 17f28a0d9e8596c541de250e48958e72a65399c9e15ba5689915d6631a451068187c19d674f08187843a61cb949951cb33c7db82bd7341536769523baed867dc
+  checksum: 10c0/17f28a0d9e8596c541de250e48958e72a65399c9e15ba5689915d6631a451068187c19d674f08187843a61cb949951cb33c7db82bd7341536769523baed867dc
   languageName: node
   linkType: hard
 
@@ -6098,7 +6098,7 @@ __metadata:
     css-what: "npm:^3.2.1"
     domutils: "npm:^1.7.0"
     nth-check: "npm:^1.0.2"
-  checksum: 47832492c8218ffd92ed18eaa325397bd0bd8e4bcf3bc71767c5e1ed8b4f39b672ba157b0b5e693ef50006017d78c19e46791a75b43bb192c4db3680a331afc7
+  checksum: 10c0/47832492c8218ffd92ed18eaa325397bd0bd8e4bcf3bc71767c5e1ed8b4f39b672ba157b0b5e693ef50006017d78c19e46791a75b43bb192c4db3680a331afc7
   languageName: node
   linkType: hard
 
@@ -6111,7 +6111,7 @@ __metadata:
     domhandler: "npm:^5.0.2"
     domutils: "npm:^3.0.1"
     nth-check: "npm:^2.0.1"
-  checksum: 551c60dba5b54054741032c1793b5734f6ba45e23ae9e82761a3c0ed1acbb8cfedfa443aaba3a3c1a54cac12b456d2012a09d2cd5f0e82e430454c1b9d84d500
+  checksum: 10c0/551c60dba5b54054741032c1793b5734f6ba45e23ae9e82761a3c0ed1acbb8cfedfa443aaba3a3c1a54cac12b456d2012a09d2cd5f0e82e430454c1b9d84d500
   languageName: node
   linkType: hard
 
@@ -6121,7 +6121,7 @@ __metadata:
   dependencies:
     mdn-data: "npm:2.0.4"
     source-map: "npm:^0.6.1"
-  checksum: 8f3c197baea919f4f55d0e84b1665d5e7d5fd74cb192fd0bf951828929b9cd5fd71de074afb685705bf5b40d7b04d4c5a206bfab26954378f04f2f5ce426d2f8
+  checksum: 10c0/8f3c197baea919f4f55d0e84b1665d5e7d5fd74cb192fd0bf951828929b9cd5fd71de074afb685705bf5b40d7b04d4c5a206bfab26954378f04f2f5ce426d2f8
   languageName: node
   linkType: hard
 
@@ -6131,7 +6131,7 @@ __metadata:
   dependencies:
     mdn-data: "npm:2.0.14"
     source-map: "npm:^0.6.1"
-  checksum: 499a507bfa39b8b2128f49736882c0dd636b0cd3370f2c69f4558ec86d269113286b7df469afc955de6a68b0dba00bc533e40022a73698081d600072d5d83c1c
+  checksum: 10c0/499a507bfa39b8b2128f49736882c0dd636b0cd3370f2c69f4558ec86d269113286b7df469afc955de6a68b0dba00bc533e40022a73698081d600072d5d83c1c
   languageName: node
   linkType: hard
 
@@ -6141,7 +6141,7 @@ __metadata:
   dependencies:
     mdn-data: "npm:2.0.30"
     source-map-js: "npm:^1.0.1"
-  checksum: 6f8c1a11d5e9b14bf02d10717fc0351b66ba12594166f65abfbd8eb8b5b490dd367f5c7721db241a3c792d935fc6751fbc09f7e1598d421477ad9fadc30f4f24
+  checksum: 10c0/6f8c1a11d5e9b14bf02d10717fc0351b66ba12594166f65abfbd8eb8b5b490dd367f5c7721db241a3c792d935fc6751fbc09f7e1598d421477ad9fadc30f4f24
   languageName: node
   linkType: hard
 
@@ -6151,28 +6151,28 @@ __metadata:
   dependencies:
     mdn-data: "npm:2.0.28"
     source-map-js: "npm:^1.0.1"
-  checksum: 47e87b0f02f8ac22f57eceb65c58011dd142d2158128882a0bf963cf2eabb81a4ebbc2e3790c8289be7919fa8b83750c7b69272bd66772c708143b772ba3c186
+  checksum: 10c0/47e87b0f02f8ac22f57eceb65c58011dd142d2158128882a0bf963cf2eabb81a4ebbc2e3790c8289be7919fa8b83750c7b69272bd66772c708143b772ba3c186
   languageName: node
   linkType: hard
 
 "css-what@npm:^3.2.1":
   version: 3.4.2
   resolution: "css-what@npm:3.4.2"
-  checksum: 454dca1b9dff8cf740d666d24a6c517562f374fe3a160891ebf8c82a9dd76864757913573c4db30537a959f5f595750420be00552ea6d5a9456ee68acc2349bf
+  checksum: 10c0/454dca1b9dff8cf740d666d24a6c517562f374fe3a160891ebf8c82a9dd76864757913573c4db30537a959f5f595750420be00552ea6d5a9456ee68acc2349bf
   languageName: node
   linkType: hard
 
 "css-what@npm:^6.1.0":
   version: 6.1.0
   resolution: "css-what@npm:6.1.0"
-  checksum: a09f5a6b14ba8dcf57ae9a59474722e80f20406c53a61e9aedb0eedc693b135113ffe2983f4efc4b5065ae639442e9ae88df24941ef159c218b231011d733746
+  checksum: 10c0/a09f5a6b14ba8dcf57ae9a59474722e80f20406c53a61e9aedb0eedc693b135113ffe2983f4efc4b5065ae639442e9ae88df24941ef159c218b231011d733746
   languageName: node
   linkType: hard
 
 "css.escape@npm:^1.5.1":
   version: 1.5.1
   resolution: "css.escape@npm:1.5.1"
-  checksum: 5e09035e5bf6c2c422b40c6df2eb1529657a17df37fda5d0433d722609527ab98090baf25b13970ca754079a0f3161dd3dfc0e743563ded8cfa0749d861c1525
+  checksum: 10c0/5e09035e5bf6c2c422b40c6df2eb1529657a17df37fda5d0433d722609527ab98090baf25b13970ca754079a0f3161dd3dfc0e743563ded8cfa0749d861c1525
   languageName: node
   linkType: hard
 
@@ -6181,7 +6181,7 @@ __metadata:
   resolution: "cssesc@npm:3.0.0"
   bin:
     cssesc: bin/cssesc
-  checksum: 6bcfd898662671be15ae7827120472c5667afb3d7429f1f917737f3bf84c4176003228131b643ae74543f17a394446247df090c597bb9a728cce298606ed0aa7
+  checksum: 10c0/6bcfd898662671be15ae7827120472c5667afb3d7429f1f917737f3bf84c4176003228131b643ae74543f17a394446247df090c597bb9a728cce298606ed0aa7
   languageName: node
   linkType: hard
 
@@ -6220,7 +6220,7 @@ __metadata:
     postcss-unique-selectors: "npm:^6.0.2"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: d100a1f8ab71adbb6df85e00f4a9e5d04ac06fc50343157eef853aded3f75dd0489dd845a5b2fb43ca701bd88c39c5aa88673f842bc1f94f4318c7b38ced1963
+  checksum: 10c0/d100a1f8ab71adbb6df85e00f4a9e5d04ac06fc50343157eef853aded3f75dd0489dd845a5b2fb43ca701bd88c39c5aa88673f842bc1f94f4318c7b38ced1963
   languageName: node
   linkType: hard
 
@@ -6229,7 +6229,7 @@ __metadata:
   resolution: "cssnano-utils@npm:4.0.1"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 20513a393402f283c85c450ece43d1a6a06a9906b524481043ac203a86888a4ca5cbef878c615a58fdd82a9e870ce62c6f3fea9f51814034a084d8980e17cf96
+  checksum: 10c0/20513a393402f283c85c450ece43d1a6a06a9906b524481043ac203a86888a4ca5cbef878c615a58fdd82a9e870ce62c6f3fea9f51814034a084d8980e17cf96
   languageName: node
   linkType: hard
 
@@ -6241,7 +6241,7 @@ __metadata:
     lilconfig: "npm:^3.0.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: d1669eb987fd96159bae262ef2f76c1a64fffefe8fa593918a6bda377977798b60fb4a6a871a9b9a9deb11258130ee254fdb8c3144769b3060ad9f2a95a4ed0a
+  checksum: 10c0/d1669eb987fd96159bae262ef2f76c1a64fffefe8fa593918a6bda377977798b60fb4a6a871a9b9a9deb11258130ee254fdb8c3144769b3060ad9f2a95a4ed0a
   languageName: node
   linkType: hard
 
@@ -6250,7 +6250,7 @@ __metadata:
   resolution: "csso@npm:4.2.0"
   dependencies:
     css-tree: "npm:^1.1.2"
-  checksum: f8c6b1300efaa0f8855a7905ae3794a29c6496e7f16a71dec31eb6ca7cfb1f058a4b03fd39b66c4deac6cb06bf6b4ba86da7b67d7320389cb9994d52b924b903
+  checksum: 10c0/f8c6b1300efaa0f8855a7905ae3794a29c6496e7f16a71dec31eb6ca7cfb1f058a4b03fd39b66c4deac6cb06bf6b4ba86da7b67d7320389cb9994d52b924b903
   languageName: node
   linkType: hard
 
@@ -6259,21 +6259,21 @@ __metadata:
   resolution: "csso@npm:5.0.5"
   dependencies:
     css-tree: "npm:~2.2.0"
-  checksum: ab4beb1e97dd7e207c10e9925405b45f15a6cd1b4880a8686ad573aa6d476aed28b4121a666cffd26c37a26179f7b54741f7c257543003bfb244d06a62ad569b
+  checksum: 10c0/ab4beb1e97dd7e207c10e9925405b45f15a6cd1b4880a8686ad573aa6d476aed28b4121a666cffd26c37a26179f7b54741f7c257543003bfb244d06a62ad569b
   languageName: node
   linkType: hard
 
 "cssom@npm:^0.5.0":
   version: 0.5.0
   resolution: "cssom@npm:0.5.0"
-  checksum: 8c4121c243baf0678c65dcac29b201ff0067dfecf978de9d5c83b2ff127a8fdefd2bfd54577f5ad8c80ed7d2c8b489ae01c82023545d010c4ecb87683fb403dd
+  checksum: 10c0/8c4121c243baf0678c65dcac29b201ff0067dfecf978de9d5c83b2ff127a8fdefd2bfd54577f5ad8c80ed7d2c8b489ae01c82023545d010c4ecb87683fb403dd
   languageName: node
   linkType: hard
 
 "cssom@npm:~0.3.6":
   version: 0.3.8
   resolution: "cssom@npm:0.3.8"
-  checksum: d74017b209440822f9e24d8782d6d2e808a8fdd58fa626a783337222fe1c87a518ba944d4c88499031b4786e68772c99dfae616638d71906fe9f203aeaf14411
+  checksum: 10c0/d74017b209440822f9e24d8782d6d2e808a8fdd58fa626a783337222fe1c87a518ba944d4c88499031b4786e68772c99dfae616638d71906fe9f203aeaf14411
   languageName: node
   linkType: hard
 
@@ -6282,7 +6282,7 @@ __metadata:
   resolution: "cssstyle@npm:2.3.0"
   dependencies:
     cssom: "npm:~0.3.6"
-  checksum: 863400da2a458f73272b9a55ba7ff05de40d850f22eb4f37311abebd7eff801cf1cd2fb04c4c92b8c3daed83fe766e52e4112afb7bc88d86c63a9c2256a7d178
+  checksum: 10c0/863400da2a458f73272b9a55ba7ff05de40d850f22eb4f37311abebd7eff801cf1cd2fb04c4c92b8c3daed83fe766e52e4112afb7bc88d86c63a9c2256a7d178
   languageName: node
   linkType: hard
 
@@ -6291,21 +6291,21 @@ __metadata:
   resolution: "cssstyle@npm:4.0.1"
   dependencies:
     rrweb-cssom: "npm:^0.6.0"
-  checksum: cadf9a8b23e11f4c6d63f21291096a0b0be868bd4ab9c799daa2c5b18330e39e5281605f01da906e901b42f742df0f3b3645af6465e83377ff7d15a88ee432a0
+  checksum: 10c0/cadf9a8b23e11f4c6d63f21291096a0b0be868bd4ab9c799daa2c5b18330e39e5281605f01da906e901b42f742df0f3b3645af6465e83377ff7d15a88ee432a0
   languageName: node
   linkType: hard
 
 "csstype@npm:^3.0.2":
   version: 3.1.2
   resolution: "csstype@npm:3.1.2"
-  checksum: 32c038af259897c807ac738d9eab16b3d86747c72b09d5c740978e06f067f9b7b1737e1b75e407c7ab1fe1543dc95f20e202b4786aeb1b8d3bdf5d5ce655e6c6
+  checksum: 10c0/32c038af259897c807ac738d9eab16b3d86747c72b09d5c740978e06f067f9b7b1737e1b75e407c7ab1fe1543dc95f20e202b4786aeb1b8d3bdf5d5ce655e6c6
   languageName: node
   linkType: hard
 
 "damerau-levenshtein@npm:^1.0.8":
   version: 1.0.8
   resolution: "damerau-levenshtein@npm:1.0.8"
-  checksum: 4c2647e0f42acaee7d068756c1d396e296c3556f9c8314bac1ac63ffb236217ef0e7e58602b18bb2173deec7ec8e0cac8e27cccf8f5526666b4ff11a13ad54a3
+  checksum: 10c0/4c2647e0f42acaee7d068756c1d396e296c3556f9c8314bac1ac63ffb236217ef0e7e58602b18bb2173deec7ec8e0cac8e27cccf8f5526666b4ff11a13ad54a3
   languageName: node
   linkType: hard
 
@@ -6316,7 +6316,7 @@ __metadata:
     abab: "npm:^2.0.6"
     whatwg-mimetype: "npm:^3.0.0"
     whatwg-url: "npm:^11.0.0"
-  checksum: 051c3aaaf3e961904f136aab095fcf6dff4db23a7fc759dd8ba7b3e6ba03fc07ef608086caad8ab910d864bd3b5e57d0d2f544725653d77c96a2c971567045f4
+  checksum: 10c0/051c3aaaf3e961904f136aab095fcf6dff4db23a7fc759dd8ba7b3e6ba03fc07ef608086caad8ab910d864bd3b5e57d0d2f544725653d77c96a2c971567045f4
   languageName: node
   linkType: hard
 
@@ -6326,21 +6326,21 @@ __metadata:
   dependencies:
     whatwg-mimetype: "npm:^4.0.0"
     whatwg-url: "npm:^14.0.0"
-  checksum: 1b894d7d41c861f3a4ed2ae9b1c3f0909d4575ada02e36d3d3bc584bdd84278e20709070c79c3b3bff7ac98598cb191eb3e86a89a79ea4ee1ef360e1694f92ad
+  checksum: 10c0/1b894d7d41c861f3a4ed2ae9b1c3f0909d4575ada02e36d3d3bc584bdd84278e20709070c79c3b3bff7ac98598cb191eb3e86a89a79ea4ee1ef360e1694f92ad
   languageName: node
   linkType: hard
 
 "dateformat@npm:^4.6.3":
   version: 4.6.3
   resolution: "dateformat@npm:4.6.3"
-  checksum: e2023b905e8cfe2eb8444fb558562b524807a51cdfe712570f360f873271600b5c94aebffaf11efb285e2c072264a7cf243eadb68f3eba0f8cc85fb86cd25df6
+  checksum: 10c0/e2023b905e8cfe2eb8444fb558562b524807a51cdfe712570f360f873271600b5c94aebffaf11efb285e2c072264a7cf243eadb68f3eba0f8cc85fb86cd25df6
   languageName: node
   linkType: hard
 
 "debounce@npm:^1.2.1":
   version: 1.2.1
   resolution: "debounce@npm:1.2.1"
-  checksum: 6c9320aa0973fc42050814621a7a8a78146c1975799b5b3cc1becf1f77ba9a5aa583987884230da0842a03f385def452fad5d60db97c3d1c8b824e38a8edf500
+  checksum: 10c0/6c9320aa0973fc42050814621a7a8a78146c1975799b5b3cc1becf1f77ba9a5aa583987884230da0842a03f385def452fad5d60db97c3d1c8b824e38a8edf500
   languageName: node
   linkType: hard
 
@@ -6349,7 +6349,7 @@ __metadata:
   resolution: "debug@npm:2.6.9"
   dependencies:
     ms: "npm:2.0.0"
-  checksum: 121908fb839f7801180b69a7e218a40b5a0b718813b886b7d6bdb82001b931c938e2941d1e4450f33a1b1df1da653f5f7a0440c197f29fbf8a6e9d45ff6ef589
+  checksum: 10c0/121908fb839f7801180b69a7e218a40b5a0b718813b886b7d6bdb82001b931c938e2941d1e4450f33a1b1df1da653f5f7a0440c197f29fbf8a6e9d45ff6ef589
   languageName: node
   linkType: hard
 
@@ -6361,7 +6361,7 @@ __metadata:
   peerDependenciesMeta:
     supports-color:
       optional: true
-  checksum: cedbec45298dd5c501d01b92b119cd3faebe5438c3917ff11ae1bff86a6c722930ac9c8659792824013168ba6db7c4668225d845c633fbdafbbf902a6389f736
+  checksum: 10c0/cedbec45298dd5c501d01b92b119cd3faebe5438c3917ff11ae1bff86a6c722930ac9c8659792824013168ba6db7c4668225d845c633fbdafbbf902a6389f736
   languageName: node
   linkType: hard
 
@@ -6370,28 +6370,28 @@ __metadata:
   resolution: "debug@npm:3.2.7"
   dependencies:
     ms: "npm:^2.1.1"
-  checksum: 37d96ae42cbc71c14844d2ae3ba55adf462ec89fd3a999459dec3833944cd999af6007ff29c780f1c61153bcaaf2c842d1e4ce1ec621e4fc4923244942e4a02a
+  checksum: 10c0/37d96ae42cbc71c14844d2ae3ba55adf462ec89fd3a999459dec3833944cd999af6007ff29c780f1c61153bcaaf2c842d1e4ce1ec621e4fc4923244942e4a02a
   languageName: node
   linkType: hard
 
 "decamelize@npm:^1.2.0":
   version: 1.2.0
   resolution: "decamelize@npm:1.2.0"
-  checksum: 85c39fe8fbf0482d4a1e224ef0119db5c1897f8503bcef8b826adff7a1b11414972f6fef2d7dec2ee0b4be3863cf64ac1439137ae9e6af23a3d8dcbe26a5b4b2
+  checksum: 10c0/85c39fe8fbf0482d4a1e224ef0119db5c1897f8503bcef8b826adff7a1b11414972f6fef2d7dec2ee0b4be3863cf64ac1439137ae9e6af23a3d8dcbe26a5b4b2
   languageName: node
   linkType: hard
 
 "decimal.js@npm:^10.4.2, decimal.js@npm:^10.4.3":
   version: 10.4.3
   resolution: "decimal.js@npm:10.4.3"
-  checksum: 6d60206689ff0911f0ce968d40f163304a6c1bc739927758e6efc7921cfa630130388966f16bf6ef6b838cb33679fbe8e7a78a2f3c478afce841fd55ac8fb8ee
+  checksum: 10c0/6d60206689ff0911f0ce968d40f163304a6c1bc739927758e6efc7921cfa630130388966f16bf6ef6b838cb33679fbe8e7a78a2f3c478afce841fd55ac8fb8ee
   languageName: node
   linkType: hard
 
 "decode-uri-component@npm:^0.2.0":
   version: 0.2.2
   resolution: "decode-uri-component@npm:0.2.2"
-  checksum: 1f4fa54eb740414a816b3f6c24818fbfcabd74ac478391e9f4e2282c994127db02010ce804f3d08e38255493cfe68608b3f5c8e09fd6efc4ae46c807691f7a31
+  checksum: 10c0/1f4fa54eb740414a816b3f6c24818fbfcabd74ac478391e9f4e2282c994127db02010ce804f3d08e38255493cfe68608b3f5c8e09fd6efc4ae46c807691f7a31
   languageName: node
   linkType: hard
 
@@ -6403,7 +6403,7 @@ __metadata:
   peerDependenciesMeta:
     babel-plugin-macros:
       optional: true
-  checksum: f8612cd5b00aab58b18bb95572dca08dc2d49720bfa7201a444c3dae430291e8a06d4928614a6ec8764d713927f44bce9c990d3b8238fca2f430990ddc17c070
+  checksum: 10c0/f8612cd5b00aab58b18bb95572dca08dc2d49720bfa7201a444c3dae430291e8a06d4928614a6ec8764d713927f44bce9c990d3b8238fca2f430990ddc17c070
   languageName: node
   linkType: hard
 
@@ -6417,7 +6417,7 @@ __metadata:
     object-is: "npm:^1.0.1"
     object-keys: "npm:^1.1.1"
     regexp.prototype.flags: "npm:^1.2.0"
-  checksum: 473d5dd1d707afd5ad3068864765590591b049d0e0d9a01931599dbbd820e35f09d0a42faa6e4644deb7cf6b7dc90f7bfdf5559f42279d67f714209b62036212
+  checksum: 10c0/473d5dd1d707afd5ad3068864765590591b049d0e0d9a01931599dbbd820e35f09d0a42faa6e4644deb7cf6b7dc90f7bfdf5559f42279d67f714209b62036212
   languageName: node
   linkType: hard
 
@@ -6443,21 +6443,21 @@ __metadata:
     which-boxed-primitive: "npm:^1.0.2"
     which-collection: "npm:^1.0.1"
     which-typed-array: "npm:^1.1.9"
-  checksum: 9e32606f0e24ef4d6b100c68cadae81495c3638944e933afc4b8389b042e95c5fe1381492cf7a6d385bcbae564c9cfb7086f37f277e37521a632b008a6b208dc
+  checksum: 10c0/9e32606f0e24ef4d6b100c68cadae81495c3638944e933afc4b8389b042e95c5fe1381492cf7a6d385bcbae564c9cfb7086f37f277e37521a632b008a6b208dc
   languageName: node
   linkType: hard
 
 "deep-is@npm:^0.1.3":
   version: 0.1.4
   resolution: "deep-is@npm:0.1.4"
-  checksum: 7f0ee496e0dff14a573dc6127f14c95061b448b87b995fc96c017ce0a1e66af1675e73f1d6064407975bc4ea6ab679497a29fff7b5b9c4e99cb10797c1ad0b4c
+  checksum: 10c0/7f0ee496e0dff14a573dc6127f14c95061b448b87b995fc96c017ce0a1e66af1675e73f1d6064407975bc4ea6ab679497a29fff7b5b9c4e99cb10797c1ad0b4c
   languageName: node
   linkType: hard
 
 "deepmerge@npm:^4.0, deepmerge@npm:^4.2.2":
   version: 4.3.1
   resolution: "deepmerge@npm:4.3.1"
-  checksum: e53481aaf1aa2c4082b5342be6b6d8ad9dfe387bc92ce197a66dea08bd4265904a087e75e464f14d1347cf2ac8afe1e4c16b266e0561cc5df29382d3c5f80044
+  checksum: 10c0/e53481aaf1aa2c4082b5342be6b6d8ad9dfe387bc92ce197a66dea08bd4265904a087e75e464f14d1347cf2ac8afe1e4c16b266e0561cc5df29382d3c5f80044
   languageName: node
   linkType: hard
 
@@ -6467,7 +6467,7 @@ __metadata:
   dependencies:
     bplist-parser: "npm:^0.2.0"
     untildify: "npm:^4.0.0"
-  checksum: 8db3ab882eb3e1e8b59d84c8641320e6c66d8eeb17eb4bb848b7dd549b1e6fd313988e4a13542e95fbaeff03f6e9dedc5ad191ad4df7996187753eb0d45c00b7
+  checksum: 10c0/8db3ab882eb3e1e8b59d84c8641320e6c66d8eeb17eb4bb848b7dd549b1e6fd313988e4a13542e95fbaeff03f6e9dedc5ad191ad4df7996187753eb0d45c00b7
   languageName: node
   linkType: hard
 
@@ -6479,7 +6479,7 @@ __metadata:
     default-browser-id: "npm:^3.0.0"
     execa: "npm:^7.1.1"
     titleize: "npm:^3.0.0"
-  checksum: 7c8848badc139ecf9d878e562bc4e7ab4301e51ba120b24d8dcb14739c30152115cc612065ac3ab73c02aace4afa29db5a044257b2f0cf234f16e3a58f6c925e
+  checksum: 10c0/7c8848badc139ecf9d878e562bc4e7ab4301e51ba120b24d8dcb14739c30152115cc612065ac3ab73c02aace4afa29db5a044257b2f0cf234f16e3a58f6c925e
   languageName: node
   linkType: hard
 
@@ -6489,7 +6489,7 @@ __metadata:
   dependencies:
     execa: "npm:^1.0.0"
     ip-regex: "npm:^2.1.0"
-  checksum: 2f499b3a9a6c995fd2b4c0d2411256b1899c94e7eacdb895be64e25c301fa8bce8fd3f8152e540669bb178c6a355154c2f86ec23d4ff40ff3b8413d2a59cd86d
+  checksum: 10c0/2f499b3a9a6c995fd2b4c0d2411256b1899c94e7eacdb895be64e25c301fa8bce8fd3f8152e540669bb178c6a355154c2f86ec23d4ff40ff3b8413d2a59cd86d
   languageName: node
   linkType: hard
 
@@ -6500,14 +6500,14 @@ __metadata:
     get-intrinsic: "npm:^1.2.1"
     gopd: "npm:^1.0.1"
     has-property-descriptors: "npm:^1.0.0"
-  checksum: 77ef6e0bceb515e05b5913ab635a84d537cee84f8a7c37c77fdcb31fc5b80f6dbe81b33375e4b67d96aa04e6a0d8d4ea099e431d83f089af8d93adfb584bcb94
+  checksum: 10c0/77ef6e0bceb515e05b5913ab635a84d537cee84f8a7c37c77fdcb31fc5b80f6dbe81b33375e4b67d96aa04e6a0d8d4ea099e431d83f089af8d93adfb584bcb94
   languageName: node
   linkType: hard
 
 "define-lazy-prop@npm:^3.0.0":
   version: 3.0.0
   resolution: "define-lazy-prop@npm:3.0.0"
-  checksum: 5ab0b2bf3fa58b3a443140bbd4cd3db1f91b985cc8a246d330b9ac3fc0b6a325a6d82bddc0b055123d745b3f9931afeea74a5ec545439a1630b9c8512b0eeb49
+  checksum: 10c0/5ab0b2bf3fa58b3a443140bbd4cd3db1f91b985cc8a246d330b9ac3fc0b6a325a6d82bddc0b055123d745b3f9931afeea74a5ec545439a1630b9c8512b0eeb49
   languageName: node
   linkType: hard
 
@@ -6518,7 +6518,7 @@ __metadata:
     define-data-property: "npm:^1.0.1"
     has-property-descriptors: "npm:^1.0.0"
     object-keys: "npm:^1.1.1"
-  checksum: 88a152319ffe1396ccc6ded510a3896e77efac7a1bfbaa174a7b00414a1747377e0bb525d303794a47cf30e805c2ec84e575758512c6e44a993076d29fd4e6c3
+  checksum: 10c0/88a152319ffe1396ccc6ded510a3896e77efac7a1bfbaa174a7b00414a1747377e0bb525d303794a47cf30e805c2ec84e575758512c6e44a993076d29fd4e6c3
   languageName: node
   linkType: hard
 
@@ -6527,7 +6527,7 @@ __metadata:
   resolution: "define-property@npm:0.2.5"
   dependencies:
     is-descriptor: "npm:^0.1.0"
-  checksum: 9986915c0893818dedc9ca23eaf41370667762fd83ad8aa4bf026a28563120dbaacebdfbfbf2b18d3b929026b9c6ee972df1dbf22de8fafb5fe6ef18361e4750
+  checksum: 10c0/9986915c0893818dedc9ca23eaf41370667762fd83ad8aa4bf026a28563120dbaacebdfbfbf2b18d3b929026b9c6ee972df1dbf22de8fafb5fe6ef18361e4750
   languageName: node
   linkType: hard
 
@@ -6536,7 +6536,7 @@ __metadata:
   resolution: "define-property@npm:1.0.0"
   dependencies:
     is-descriptor: "npm:^1.0.0"
-  checksum: d7cf09db10d55df305f541694ed51dafc776ad9bb8a24428899c9f2d36b11ab38dce5527a81458d1b5e7c389f8cbe803b4abad6e91a0037a329d153b84fc975e
+  checksum: 10c0/d7cf09db10d55df305f541694ed51dafc776ad9bb8a24428899c9f2d36b11ab38dce5527a81458d1b5e7c389f8cbe803b4abad6e91a0037a329d153b84fc975e
   languageName: node
   linkType: hard
 
@@ -6546,7 +6546,7 @@ __metadata:
   dependencies:
     is-descriptor: "npm:^1.0.2"
     isobject: "npm:^3.0.1"
-  checksum: f91a08ad008fa764172a2c072adc7312f10217ade89ddaea23018321c6d71b2b68b8c229141ed2064179404e345c537f1a2457c379824813695b51a6ad3e4969
+  checksum: 10c0/f91a08ad008fa764172a2c072adc7312f10217ade89ddaea23018321c6d71b2b68b8c229141ed2064179404e345c537f1a2457c379824813695b51a6ad3e4969
   languageName: node
   linkType: hard
 
@@ -6561,42 +6561,42 @@ __metadata:
     p-map: "npm:^2.0.0"
     pify: "npm:^4.0.1"
     rimraf: "npm:^2.6.3"
-  checksum: ed3233e86e39c0a6a7ea85d8ad0ebc00603078ad408b9c34b4742f707c20028c5731dce2e8aa9a6eb5ae6bee30ccc5405cf7b5d457306520e37c92d0410b6061
+  checksum: 10c0/ed3233e86e39c0a6a7ea85d8ad0ebc00603078ad408b9c34b4742f707c20028c5731dce2e8aa9a6eb5ae6bee30ccc5405cf7b5d457306520e37c92d0410b6061
   languageName: node
   linkType: hard
 
 "delayed-stream@npm:~1.0.0":
   version: 1.0.0
   resolution: "delayed-stream@npm:1.0.0"
-  checksum: d758899da03392e6712f042bec80aa293bbe9e9ff1b2634baae6a360113e708b91326594c8a486d475c69d6259afb7efacdc3537bfcda1c6c648e390ce601b19
+  checksum: 10c0/d758899da03392e6712f042bec80aa293bbe9e9ff1b2634baae6a360113e708b91326594c8a486d475c69d6259afb7efacdc3537bfcda1c6c648e390ce601b19
   languageName: node
   linkType: hard
 
 "denque@npm:^2.1.0":
   version: 2.1.0
   resolution: "denque@npm:2.1.0"
-  checksum: f9ef81aa0af9c6c614a727cb3bd13c5d7db2af1abf9e6352045b86e85873e629690f6222f4edd49d10e4ccf8f078bbeec0794fafaf61b659c0589d0c511ec363
+  checksum: 10c0/f9ef81aa0af9c6c614a727cb3bd13c5d7db2af1abf9e6352045b86e85873e629690f6222f4edd49d10e4ccf8f078bbeec0794fafaf61b659c0589d0c511ec363
   languageName: node
   linkType: hard
 
 "depd@npm:2.0.0":
   version: 2.0.0
   resolution: "depd@npm:2.0.0"
-  checksum: 58bd06ec20e19529b06f7ad07ddab60e504d9e0faca4bd23079fac2d279c3594334d736508dc350e06e510aba5e22e4594483b3a6562ce7c17dd797f4cc4ad2c
+  checksum: 10c0/58bd06ec20e19529b06f7ad07ddab60e504d9e0faca4bd23079fac2d279c3594334d736508dc350e06e510aba5e22e4594483b3a6562ce7c17dd797f4cc4ad2c
   languageName: node
   linkType: hard
 
 "depd@npm:~1.1.2":
   version: 1.1.2
   resolution: "depd@npm:1.1.2"
-  checksum: acb24aaf936ef9a227b6be6d495f0d2eb20108a9a6ad40585c5bda1a897031512fef6484e4fdbb80bd249fdaa82841fa1039f416ece03188e677ba11bcfda249
+  checksum: 10c0/acb24aaf936ef9a227b6be6d495f0d2eb20108a9a6ad40585c5bda1a897031512fef6484e4fdbb80bd249fdaa82841fa1039f416ece03188e677ba11bcfda249
   languageName: node
   linkType: hard
 
 "dequal@npm:^2.0.2, dequal@npm:^2.0.3":
   version: 2.0.3
   resolution: "dequal@npm:2.0.3"
-  checksum: f98860cdf58b64991ae10205137c0e97d384c3a4edc7f807603887b7c4b850af1224a33d88012009f150861cbee4fa2d322c4cc04b9313bee312e47f6ecaa888
+  checksum: 10c0/f98860cdf58b64991ae10205137c0e97d384c3a4edc7f807603887b7c4b850af1224a33d88012009f150861cbee4fa2d322c4cc04b9313bee312e47f6ecaa888
   languageName: node
   linkType: hard
 
@@ -6606,42 +6606,42 @@ __metadata:
   dependencies:
     inherits: "npm:^2.0.1"
     minimalistic-assert: "npm:^1.0.0"
-  checksum: 671354943ad67493e49eb4c555480ab153edd7cee3a51c658082fcde539d2690ed2a4a0b5d1f401f9cde822edf3939a6afb2585f32c091f2d3a1b1665cd45236
+  checksum: 10c0/671354943ad67493e49eb4c555480ab153edd7cee3a51c658082fcde539d2690ed2a4a0b5d1f401f9cde822edf3939a6afb2585f32c091f2d3a1b1665cd45236
   languageName: node
   linkType: hard
 
 "destroy@npm:1.2.0":
   version: 1.2.0
   resolution: "destroy@npm:1.2.0"
-  checksum: bd7633942f57418f5a3b80d5cb53898127bcf53e24cdf5d5f4396be471417671f0fee48a4ebe9a1e9defbde2a31280011af58a57e090ff822f589b443ed4e643
+  checksum: 10c0/bd7633942f57418f5a3b80d5cb53898127bcf53e24cdf5d5f4396be471417671f0fee48a4ebe9a1e9defbde2a31280011af58a57e090ff822f589b443ed4e643
   languageName: node
   linkType: hard
 
 "detect-file@npm:^1.0.0":
   version: 1.0.0
   resolution: "detect-file@npm:1.0.0"
-  checksum: c782a5f992047944c39d337c82f5d1d21d65d1378986d46c354df9d9ec6d5f356bca0182969c11b08b9b8a7af8727b3c2d5a9fad0b022be4a3bf4c216f63ed07
+  checksum: 10c0/c782a5f992047944c39d337c82f5d1d21d65d1378986d46c354df9d9ec6d5f356bca0182969c11b08b9b8a7af8727b3c2d5a9fad0b022be4a3bf4c216f63ed07
   languageName: node
   linkType: hard
 
 "detect-it@npm:^4.0.1":
   version: 4.0.1
   resolution: "detect-it@npm:4.0.1"
-  checksum: 9633dcafaa28dfd61b5e8f2925ec5cd09fda19d99ff7ea062e22d7cc8b3a8dfccf5c5118b6e72940f15d8371bd5d696ea66cc0972d1a6cbee918d4b06448c359
+  checksum: 10c0/9633dcafaa28dfd61b5e8f2925ec5cd09fda19d99ff7ea062e22d7cc8b3a8dfccf5c5118b6e72940f15d8371bd5d696ea66cc0972d1a6cbee918d4b06448c359
   languageName: node
   linkType: hard
 
 "detect-newline@npm:^3.0.0":
   version: 3.1.0
   resolution: "detect-newline@npm:3.1.0"
-  checksum: c38cfc8eeb9fda09febb44bcd85e467c970d4e3bf526095394e5a4f18bc26dd0cf6b22c69c1fa9969261521c593836db335c2795218f6d781a512aea2fb8209d
+  checksum: 10c0/c38cfc8eeb9fda09febb44bcd85e467c970d4e3bf526095394e5a4f18bc26dd0cf6b22c69c1fa9969261521c593836db335c2795218f6d781a512aea2fb8209d
   languageName: node
   linkType: hard
 
 "detect-node@npm:^2.0.4":
   version: 2.1.0
   resolution: "detect-node@npm:2.1.0"
-  checksum: f039f601790f2e9d4654e499913259a798b1f5246ae24f86ab5e8bd4aaf3bce50484234c494f11fb00aecb0c6e2733aa7b1cf3f530865640b65fbbd65b2c4e09
+  checksum: 10c0/f039f601790f2e9d4654e499913259a798b1f5246ae24f86ab5e8bd4aaf3bce50484234c494f11fb00aecb0c6e2733aa7b1cf3f530865640b65fbbd65b2c4e09
   languageName: node
   linkType: hard
 
@@ -6650,14 +6650,14 @@ __metadata:
   resolution: "detect-passive-events@npm:2.0.3"
   dependencies:
     detect-it: "npm:^4.0.1"
-  checksum: 92a20249ef379f0119a8c76de7cbfc3e50ad95515debae028c27349023af1f29646dc0ba928be4aaff94ec4d5da10c20444b16fc3db407caf68ba200a96e9aea
+  checksum: 10c0/92a20249ef379f0119a8c76de7cbfc3e50ad95515debae028c27349023af1f29646dc0ba928be4aaff94ec4d5da10c20444b16fc3db407caf68ba200a96e9aea
   languageName: node
   linkType: hard
 
 "diff-sequences@npm:^29.6.3":
   version: 29.6.3
   resolution: "diff-sequences@npm:29.6.3"
-  checksum: 32e27ac7dbffdf2fb0eb5a84efd98a9ad084fbabd5ac9abb8757c6770d5320d2acd172830b28c4add29bb873d59420601dfc805ac4064330ce59b1adfd0593b2
+  checksum: 10c0/32e27ac7dbffdf2fb0eb5a84efd98a9ad084fbabd5ac9abb8757c6770d5320d2acd172830b28c4add29bb873d59420601dfc805ac4064330ce59b1adfd0593b2
   languageName: node
   linkType: hard
 
@@ -6668,7 +6668,7 @@ __metadata:
     bn.js: "npm:^4.1.0"
     miller-rabin: "npm:^4.0.0"
     randombytes: "npm:^2.0.0"
-  checksum: ce53ccafa9ca544b7fc29b08a626e23a9b6562efc2a98559a0c97b4718937cebaa9b5d7d0a05032cc9c1435e9b3c1532b9e9bf2e0ede868525922807ad6e1ecf
+  checksum: 10c0/ce53ccafa9ca544b7fc29b08a626e23a9b6562efc2a98559a0c97b4718937cebaa9b5d7d0a05032cc9c1435e9b3c1532b9e9bf2e0ede868525922807ad6e1ecf
   languageName: node
   linkType: hard
 
@@ -6677,14 +6677,14 @@ __metadata:
   resolution: "dir-glob@npm:3.0.1"
   dependencies:
     path-type: "npm:^4.0.0"
-  checksum: dcac00920a4d503e38bb64001acb19df4efc14536ada475725e12f52c16777afdee4db827f55f13a908ee7efc0cb282e2e3dbaeeb98c0993dd93d1802d3bf00c
+  checksum: 10c0/dcac00920a4d503e38bb64001acb19df4efc14536ada475725e12f52c16777afdee4db827f55f13a908ee7efc0cb282e2e3dbaeeb98c0993dd93d1802d3bf00c
   languageName: node
   linkType: hard
 
 "dns-equal@npm:^1.0.0":
   version: 1.0.0
   resolution: "dns-equal@npm:1.0.0"
-  checksum: da966e5275ac50546e108af6bc29aaae2164d2ae96d60601b333c4a3aff91f50b6ca14929cf91f20a9cad1587b356323e300cea3ff6588a6a816988485f445f1
+  checksum: 10c0/da966e5275ac50546e108af6bc29aaae2164d2ae96d60601b333c4a3aff91f50b6ca14929cf91f20a9cad1587b356323e300cea3ff6588a6a816988485f445f1
   languageName: node
   linkType: hard
 
@@ -6694,7 +6694,7 @@ __metadata:
   dependencies:
     ip: "npm:^1.1.0"
     safe-buffer: "npm:^5.0.1"
-  checksum: ee06478da192f9014ab43c7e9118c77b9e353a8d5c06b0d2cba367b3501dd7453bcfed89354a8890cf740491379dcf4b28153d064d051e55c30cfbdf92b88608
+  checksum: 10c0/ee06478da192f9014ab43c7e9118c77b9e353a8d5c06b0d2cba367b3501dd7453bcfed89354a8890cf740491379dcf4b28153d064d051e55c30cfbdf92b88608
   languageName: node
   linkType: hard
 
@@ -6703,7 +6703,7 @@ __metadata:
   resolution: "dns-txt@npm:2.0.2"
   dependencies:
     buffer-indexof: "npm:^1.0.0"
-  checksum: 71703e65156a2d626216157e6c4fddd844e7e790b6cd3cec830ef8eed80e7ea2697e5f4f2f3eb3aae809be3c91e370cad7a5d91b05ce6b6fcd5e191e7e3d31ca
+  checksum: 10c0/71703e65156a2d626216157e6c4fddd844e7e790b6cd3cec830ef8eed80e7ea2697e5f4f2f3eb3aae809be3c91e370cad7a5d91b05ce6b6fcd5e191e7e3d31ca
   languageName: node
   linkType: hard
 
@@ -6712,7 +6712,7 @@ __metadata:
   resolution: "doctrine@npm:2.1.0"
   dependencies:
     esutils: "npm:^2.0.2"
-  checksum: b6416aaff1f380bf56c3b552f31fdf7a69b45689368deca72d28636f41c16bb28ec3ebc40ace97db4c1afc0ceeb8120e8492fe0046841c94c2933b2e30a7d5ac
+  checksum: 10c0/b6416aaff1f380bf56c3b552f31fdf7a69b45689368deca72d28636f41c16bb28ec3ebc40ace97db4c1afc0ceeb8120e8492fe0046841c94c2933b2e30a7d5ac
   languageName: node
   linkType: hard
 
@@ -6721,21 +6721,21 @@ __metadata:
   resolution: "doctrine@npm:3.0.0"
   dependencies:
     esutils: "npm:^2.0.2"
-  checksum: c96bdccabe9d62ab6fea9399fdff04a66e6563c1d6fb3a3a063e8d53c3bb136ba63e84250bbf63d00086a769ad53aef92d2bd483f03f837fc97b71cbee6b2520
+  checksum: 10c0/c96bdccabe9d62ab6fea9399fdff04a66e6563c1d6fb3a3a063e8d53c3bb136ba63e84250bbf63d00086a769ad53aef92d2bd483f03f837fc97b71cbee6b2520
   languageName: node
   linkType: hard
 
 "dom-accessibility-api@npm:^0.5.9":
   version: 0.5.16
   resolution: "dom-accessibility-api@npm:0.5.16"
-  checksum: b2c2eda4fae568977cdac27a9f0c001edf4f95a6a6191dfa611e3721db2478d1badc01db5bb4fa8a848aeee13e442a6c2a4386d65ec65a1436f24715a2f8d053
+  checksum: 10c0/b2c2eda4fae568977cdac27a9f0c001edf4f95a6a6191dfa611e3721db2478d1badc01db5bb4fa8a848aeee13e442a6c2a4386d65ec65a1436f24715a2f8d053
   languageName: node
   linkType: hard
 
 "dom-accessibility-api@npm:^0.6.3":
   version: 0.6.3
   resolution: "dom-accessibility-api@npm:0.6.3"
-  checksum: 10bee5aa514b2a9a37c87cd81268db607a2e933a050074abc2f6fa3da9080ebed206a320cbc123567f2c3087d22292853bdfdceaffdd4334ffe2af9510b29360
+  checksum: 10c0/10bee5aa514b2a9a37c87cd81268db607a2e933a050074abc2f6fa3da9080ebed206a320cbc123567f2c3087d22292853bdfdceaffdd4334ffe2af9510b29360
   languageName: node
   linkType: hard
 
@@ -6744,7 +6744,7 @@ __metadata:
   resolution: "dom-helpers@npm:3.4.0"
   dependencies:
     "@babel/runtime": "npm:^7.1.2"
-  checksum: 1d2d3e4eadac2c4f4c8c7470a737ab32b7ec28237c4d094ea967ec3184168fd12452196fcc424a5d7860b6176117301aeaecba39467bf1a6e8492a8e5c9639d1
+  checksum: 10c0/1d2d3e4eadac2c4f4c8c7470a737ab32b7ec28237c4d094ea967ec3184168fd12452196fcc424a5d7860b6176117301aeaecba39467bf1a6e8492a8e5c9639d1
   languageName: node
   linkType: hard
 
@@ -6754,7 +6754,7 @@ __metadata:
   dependencies:
     "@babel/runtime": "npm:^7.8.7"
     csstype: "npm:^3.0.2"
-  checksum: f735074d66dd759b36b158fa26e9d00c9388ee0e8c9b16af941c38f014a37fc80782de83afefd621681b19ac0501034b4f1c4a3bff5caa1b8667f0212b5e124c
+  checksum: 10c0/f735074d66dd759b36b158fa26e9d00c9388ee0e8c9b16af941c38f014a37fc80782de83afefd621681b19ac0501034b4f1c4a3bff5caa1b8667f0212b5e124c
   languageName: node
   linkType: hard
 
@@ -6764,7 +6764,7 @@ __metadata:
   dependencies:
     domelementtype: "npm:^2.0.1"
     entities: "npm:^2.0.0"
-  checksum: 5cb595fb77e1a23eca56742f47631e6f4af66ce1982c7ed28b3d0ef21f1f50304c067adc29d3eaf824c572be022cee88627d0ac9b929408f24e923f3c7bed37b
+  checksum: 10c0/5cb595fb77e1a23eca56742f47631e6f4af66ce1982c7ed28b3d0ef21f1f50304c067adc29d3eaf824c572be022cee88627d0ac9b929408f24e923f3c7bed37b
   languageName: node
   linkType: hard
 
@@ -6775,28 +6775,28 @@ __metadata:
     domelementtype: "npm:^2.3.0"
     domhandler: "npm:^5.0.2"
     entities: "npm:^4.2.0"
-  checksum: d5ae2b7110ca3746b3643d3ef60ef823f5f078667baf530cec096433f1627ec4b6fa8c072f09d079d7cda915fd2c7bc1b7b935681e9b09e591e1e15f4040b8e2
+  checksum: 10c0/d5ae2b7110ca3746b3643d3ef60ef823f5f078667baf530cec096433f1627ec4b6fa8c072f09d079d7cda915fd2c7bc1b7b935681e9b09e591e1e15f4040b8e2
   languageName: node
   linkType: hard
 
 "domain-browser@npm:^1.1.1":
   version: 1.2.0
   resolution: "domain-browser@npm:1.2.0"
-  checksum: a955f482f4b4710fbd77c12a33e77548d63603c30c80f61a80519f27e3db1ba8530b914584cc9e9365d2038753d6b5bd1f4e6c81e432b007b0ec95b8b5e69b1b
+  checksum: 10c0/a955f482f4b4710fbd77c12a33e77548d63603c30c80f61a80519f27e3db1ba8530b914584cc9e9365d2038753d6b5bd1f4e6c81e432b007b0ec95b8b5e69b1b
   languageName: node
   linkType: hard
 
 "domelementtype@npm:1":
   version: 1.3.1
   resolution: "domelementtype@npm:1.3.1"
-  checksum: 6d4f5761060a21eaf3c96545501e9d188745c7e1c31b8d141bf15d8748feeadba868f4ea32877751b8678b286fb1afbe6ae905ca3fb8f0214d8322e482cdbec0
+  checksum: 10c0/6d4f5761060a21eaf3c96545501e9d188745c7e1c31b8d141bf15d8748feeadba868f4ea32877751b8678b286fb1afbe6ae905ca3fb8f0214d8322e482cdbec0
   languageName: node
   linkType: hard
 
 "domelementtype@npm:^2.0.1, domelementtype@npm:^2.3.0":
   version: 2.3.0
   resolution: "domelementtype@npm:2.3.0"
-  checksum: 686f5a9ef0fff078c1412c05db73a0dce096190036f33e400a07e2a4518e9f56b1e324f5c576a0a747ef0e75b5d985c040b0d51945ce780c0dd3c625a18cd8c9
+  checksum: 10c0/686f5a9ef0fff078c1412c05db73a0dce096190036f33e400a07e2a4518e9f56b1e324f5c576a0a747ef0e75b5d985c040b0d51945ce780c0dd3c625a18cd8c9
   languageName: node
   linkType: hard
 
@@ -6805,7 +6805,7 @@ __metadata:
   resolution: "domexception@npm:4.0.0"
   dependencies:
     webidl-conversions: "npm:^7.0.0"
-  checksum: 774277cd9d4df033f852196e3c0077a34dbd15a96baa4d166e0e47138a80f4c0bdf0d94e4703e6ff5883cec56bb821a6fff84402d8a498e31de7c87eb932a294
+  checksum: 10c0/774277cd9d4df033f852196e3c0077a34dbd15a96baa4d166e0e47138a80f4c0bdf0d94e4703e6ff5883cec56bb821a6fff84402d8a498e31de7c87eb932a294
   languageName: node
   linkType: hard
 
@@ -6814,7 +6814,7 @@ __metadata:
   resolution: "domhandler@npm:5.0.3"
   dependencies:
     domelementtype: "npm:^2.3.0"
-  checksum: bba1e5932b3e196ad6862286d76adc89a0dbf0c773e5ced1eb01f9af930c50093a084eff14b8de5ea60b895c56a04d5de8bbc4930c5543d029091916770b2d2a
+  checksum: 10c0/bba1e5932b3e196ad6862286d76adc89a0dbf0c773e5ced1eb01f9af930c50093a084eff14b8de5ea60b895c56a04d5de8bbc4930c5543d029091916770b2d2a
   languageName: node
   linkType: hard
 
@@ -6824,7 +6824,7 @@ __metadata:
   dependencies:
     dom-serializer: "npm:0"
     domelementtype: "npm:1"
-  checksum: 437fcd2d6d6be03f488152e73c6f953e289c58496baa22be9626b2b46f9cfd40486ae77d144487ff6b102929a3231cdb9a8bf8ef485fb7b7c30c985daedc77eb
+  checksum: 10c0/437fcd2d6d6be03f488152e73c6f953e289c58496baa22be9626b2b46f9cfd40486ae77d144487ff6b102929a3231cdb9a8bf8ef485fb7b7c30c985daedc77eb
   languageName: node
   linkType: hard
 
@@ -6835,35 +6835,35 @@ __metadata:
     dom-serializer: "npm:^2.0.0"
     domelementtype: "npm:^2.3.0"
     domhandler: "npm:^5.0.3"
-  checksum: 342d64cf4d07b8a0573fb51e0a6312a88fb520c7fefd751870bf72fa5fc0f2e0cb9a3958a573610b1d608c6e2a69b8e9b4b40f0bfb8f87a71bce4f180cca1887
+  checksum: 10c0/342d64cf4d07b8a0573fb51e0a6312a88fb520c7fefd751870bf72fa5fc0f2e0cb9a3958a573610b1d608c6e2a69b8e9b4b40f0bfb8f87a71bce4f180cca1887
   languageName: node
   linkType: hard
 
 "dotenv@npm:^16.0.3":
   version: 16.4.3
   resolution: "dotenv@npm:16.4.3"
-  checksum: c6a572b2dab5d71accb7064c90b38dfd4068c2487be859a0f053460fcaa685a7718e78db51d643b32e0736b318988c31f8c45cb4ab99cd620278f537177cb0ab
+  checksum: 10c0/c6a572b2dab5d71accb7064c90b38dfd4068c2487be859a0f053460fcaa685a7718e78db51d643b32e0736b318988c31f8c45cb4ab99cd620278f537177cb0ab
   languageName: node
   linkType: hard
 
 "duplexer@npm:^0.1.2":
   version: 0.1.2
   resolution: "duplexer@npm:0.1.2"
-  checksum: c57bcd4bdf7e623abab2df43a7b5b23d18152154529d166c1e0da6bee341d84c432d157d7e97b32fecb1bf3a8b8857dd85ed81a915789f550637ed25b8e64fc2
+  checksum: 10c0/c57bcd4bdf7e623abab2df43a7b5b23d18152154529d166c1e0da6bee341d84c432d157d7e97b32fecb1bf3a8b8857dd85ed81a915789f550637ed25b8e64fc2
   languageName: node
   linkType: hard
 
 "eastasianwidth@npm:^0.2.0":
   version: 0.2.0
   resolution: "eastasianwidth@npm:0.2.0"
-  checksum: 26f364ebcdb6395f95124fda411f63137a4bfb5d3a06453f7f23dfe52502905bd84e0488172e0f9ec295fdc45f05c23d5d91baf16bd26f0fe9acd777a188dc39
+  checksum: 10c0/26f364ebcdb6395f95124fda411f63137a4bfb5d3a06453f7f23dfe52502905bd84e0488172e0f9ec295fdc45f05c23d5d91baf16bd26f0fe9acd777a188dc39
   languageName: node
   linkType: hard
 
 "ee-first@npm:1.1.1":
   version: 1.1.1
   resolution: "ee-first@npm:1.1.1"
-  checksum: b5bb125ee93161bc16bfe6e56c6b04de5ad2aa44234d8f644813cc95d861a6910903132b05093706de2b706599367c4130eb6d170f6b46895686b95f87d017b7
+  checksum: 10c0/b5bb125ee93161bc16bfe6e56c6b04de5ad2aa44234d8f644813cc95d861a6910903132b05093706de2b706599367c4130eb6d170f6b46895686b95f87d017b7
   languageName: node
   linkType: hard
 
@@ -6874,14 +6874,14 @@ __metadata:
     jake: "npm:^10.8.5"
   bin:
     ejs: bin/cli.js
-  checksum: f0e249c79128810f5f6d5cbf347fc906d86bb9384263db0b2a9004aea649f2bc2d112736de5716c509c80afb4721c47281bd5b57c757d3b63f1bf5ac5f885893
+  checksum: 10c0/f0e249c79128810f5f6d5cbf347fc906d86bb9384263db0b2a9004aea649f2bc2d112736de5716c509c80afb4721c47281bd5b57c757d3b63f1bf5ac5f885893
   languageName: node
   linkType: hard
 
 "electron-to-chromium@npm:^1.4.601":
   version: 1.4.609
   resolution: "electron-to-chromium@npm:1.4.609"
-  checksum: 9675a79388acbaff5953a4c61589af7da93e0d1f9d6a3b284c7630f10126eb0998557b07448514214d5a3d19025310039b55f405ab701b1253130fc94907f743
+  checksum: 10c0/9675a79388acbaff5953a4c61589af7da93e0d1f9d6a3b284c7630f10126eb0998557b07448514214d5a3d19025310039b55f405ab701b1253130fc94907f743
   languageName: node
   linkType: hard
 
@@ -6896,14 +6896,14 @@ __metadata:
     inherits: "npm:^2.0.4"
     minimalistic-assert: "npm:^1.0.1"
     minimalistic-crypto-utils: "npm:^1.0.1"
-  checksum: 5f361270292c3b27cf0843e84526d11dec31652f03c2763c6c2b8178548175ff5eba95341dd62baff92b2265d1af076526915d8af6cc9cb7559c44a62f8ca6e2
+  checksum: 10c0/5f361270292c3b27cf0843e84526d11dec31652f03c2763c6c2b8178548175ff5eba95341dd62baff92b2265d1af076526915d8af6cc9cb7559c44a62f8ca6e2
   languageName: node
   linkType: hard
 
 "emittery@npm:^0.13.1":
   version: 0.13.1
   resolution: "emittery@npm:0.13.1"
-  checksum: 1573d0ae29ab34661b6c63251ff8f5facd24ccf6a823f19417ae8ba8c88ea450325788c67f16c99edec8de4b52ce93a10fe441ece389fd156e88ee7dab9bfa35
+  checksum: 10c0/1573d0ae29ab34661b6c63251ff8f5facd24ccf6a823f19417ae8ba8c88ea450325788c67f16c99edec8de4b52ce93a10fe441ece389fd156e88ee7dab9bfa35
   languageName: node
   linkType: hard
 
@@ -6916,49 +6916,49 @@ __metadata:
     prop-types: "npm:^15.6.0"
   peerDependencies:
     react: ^0.14.0 || ^15.0.0-0 || ^16.0.0 || ^17.0.0
-  checksum: be673a03292d6a79db38fa0f5ad525a82a642ee5211b8ff32630dfce70988627bb9724695c60f11d635a5631a539beabbddd1185f0986f06890f4266e9cedee2
+  checksum: 10c0/be673a03292d6a79db38fa0f5ad525a82a642ee5211b8ff32630dfce70988627bb9724695c60f11d635a5631a539beabbddd1185f0986f06890f4266e9cedee2
   languageName: node
   linkType: hard
 
 "emoji-regex@npm:10.3.0, emoji-regex@npm:^10.2.1, emoji-regex@npm:^10.3.0":
   version: 10.3.0
   resolution: "emoji-regex@npm:10.3.0"
-  checksum: b4838e8dcdceb44cf47f59abe352c25ff4fe7857acaf5fb51097c427f6f75b44d052eb907a7a3b86f86bc4eae3a93f5c2b7460abe79c407307e6212d65c91163
+  checksum: 10c0/b4838e8dcdceb44cf47f59abe352c25ff4fe7857acaf5fb51097c427f6f75b44d052eb907a7a3b86f86bc4eae3a93f5c2b7460abe79c407307e6212d65c91163
   languageName: node
   linkType: hard
 
 "emoji-regex@npm:^7.0.1":
   version: 7.0.3
   resolution: "emoji-regex@npm:7.0.3"
-  checksum: a8917d695c3a3384e4b7230a6a06fd2de6b3db3709116792e8b7b36ddbb3db4deb28ad3e983e70d4f2a1f9063b5dab9025e4e26e9ca08278da4fbb73e213743f
+  checksum: 10c0/a8917d695c3a3384e4b7230a6a06fd2de6b3db3709116792e8b7b36ddbb3db4deb28ad3e983e70d4f2a1f9063b5dab9025e4e26e9ca08278da4fbb73e213743f
   languageName: node
   linkType: hard
 
 "emoji-regex@npm:^8.0.0":
   version: 8.0.0
   resolution: "emoji-regex@npm:8.0.0"
-  checksum: b6053ad39951c4cf338f9092d7bfba448cdfd46fe6a2a034700b149ac9ffbc137e361cbd3c442297f86bed2e5f7576c1b54cc0a6bf8ef5106cc62f496af35010
+  checksum: 10c0/b6053ad39951c4cf338f9092d7bfba448cdfd46fe6a2a034700b149ac9ffbc137e361cbd3c442297f86bed2e5f7576c1b54cc0a6bf8ef5106cc62f496af35010
   languageName: node
   linkType: hard
 
 "emoji-regex@npm:^9.2.2":
   version: 9.2.2
   resolution: "emoji-regex@npm:9.2.2"
-  checksum: af014e759a72064cf66e6e694a7fc6b0ed3d8db680427b021a89727689671cefe9d04151b2cad51dbaf85d5ba790d061cd167f1cf32eb7b281f6368b3c181639
+  checksum: 10c0/af014e759a72064cf66e6e694a7fc6b0ed3d8db680427b021a89727689671cefe9d04151b2cad51dbaf85d5ba790d061cd167f1cf32eb7b281f6368b3c181639
   languageName: node
   linkType: hard
 
 "emojis-list@npm:^3.0.0":
   version: 3.0.0
   resolution: "emojis-list@npm:3.0.0"
-  checksum: 7dc4394b7b910444910ad64b812392159a21e1a7ecc637c775a440227dcb4f80eff7fe61f4453a7d7603fa23d23d30cc93fe9e4b5ed985b88d6441cd4a35117b
+  checksum: 10c0/7dc4394b7b910444910ad64b812392159a21e1a7ecc637c775a440227dcb4f80eff7fe61f4453a7d7603fa23d23d30cc93fe9e4b5ed985b88d6441cd4a35117b
   languageName: node
   linkType: hard
 
 "encodeurl@npm:~1.0.2":
   version: 1.0.2
   resolution: "encodeurl@npm:1.0.2"
-  checksum: f6c2387379a9e7c1156c1c3d4f9cb7bb11cf16dd4c1682e1f6746512564b053df5781029b6061296832b59fb22f459dbe250386d217c2f6e203601abb2ee0bec
+  checksum: 10c0/f6c2387379a9e7c1156c1c3d4f9cb7bb11cf16dd4c1682e1f6746512564b053df5781029b6061296832b59fb22f459dbe250386d217c2f6e203601abb2ee0bec
   languageName: node
   linkType: hard
 
@@ -6967,7 +6967,7 @@ __metadata:
   resolution: "encoding@npm:0.1.13"
   dependencies:
     iconv-lite: "npm:^0.6.2"
-  checksum: 36d938712ff00fe1f4bac88b43bcffb5930c1efa57bbcdca9d67e1d9d6c57cfb1200fb01efe0f3109b2ce99b231f90779532814a81370a1bd3274a0f58585039
+  checksum: 10c0/36d938712ff00fe1f4bac88b43bcffb5930c1efa57bbcdca9d67e1d9d6c57cfb1200fb01efe0f3109b2ce99b231f90779532814a81370a1bd3274a0f58585039
   languageName: node
   linkType: hard
 
@@ -6976,7 +6976,7 @@ __metadata:
   resolution: "end-of-stream@npm:1.4.4"
   dependencies:
     once: "npm:^1.4.0"
-  checksum: 870b423afb2d54bb8d243c63e07c170409d41e20b47eeef0727547aea5740bd6717aca45597a9f2745525667a6b804c1e7bede41f856818faee5806dd9ff3975
+  checksum: 10c0/870b423afb2d54bb8d243c63e07c170409d41e20b47eeef0727547aea5740bd6717aca45597a9f2745525667a6b804c1e7bede41f856818faee5806dd9ff3975
   languageName: node
   linkType: hard
 
@@ -6987,7 +6987,7 @@ __metadata:
     graceful-fs: "npm:^4.1.2"
     memory-fs: "npm:^0.5.0"
     tapable: "npm:^1.0.0"
-  checksum: d95fc630606ea35bed21c4a029bbb1681919571a2d1d2011c7fc42a26a9e48ed3d74a89949ce331e1fd3229850a303e3218b887b92951330f16bdfbb93a10e64
+  checksum: 10c0/d95fc630606ea35bed21c4a029bbb1681919571a2d1d2011c7fc42a26a9e48ed3d74a89949ce331e1fd3229850a303e3218b887b92951330f16bdfbb93a10e64
   languageName: node
   linkType: hard
 
@@ -6997,35 +6997,35 @@ __metadata:
   dependencies:
     graceful-fs: "npm:^4.2.4"
     tapable: "npm:^2.2.0"
-  checksum: 69984a7990913948b4150855aed26a84afb4cb1c5a94fb8e3a65bd00729a73fc2eaff6871fb8e345377f294831afe349615c93560f2f54d61b43cdfdf668f19a
+  checksum: 10c0/69984a7990913948b4150855aed26a84afb4cb1c5a94fb8e3a65bd00729a73fc2eaff6871fb8e345377f294831afe349615c93560f2f54d61b43cdfdf668f19a
   languageName: node
   linkType: hard
 
 "entities@npm:^2.0.0":
   version: 2.2.0
   resolution: "entities@npm:2.2.0"
-  checksum: 7fba6af1f116300d2ba1c5673fc218af1961b20908638391b4e1e6d5850314ee2ac3ec22d741b3a8060479911c99305164aed19b6254bde75e7e6b1b2c3f3aa3
+  checksum: 10c0/7fba6af1f116300d2ba1c5673fc218af1961b20908638391b4e1e6d5850314ee2ac3ec22d741b3a8060479911c99305164aed19b6254bde75e7e6b1b2c3f3aa3
   languageName: node
   linkType: hard
 
 "entities@npm:^4.2.0, entities@npm:^4.4.0":
   version: 4.5.0
   resolution: "entities@npm:4.5.0"
-  checksum: 5b039739f7621f5d1ad996715e53d964035f75ad3b9a4d38c6b3804bb226e282ffeae2443624d8fdd9c47d8e926ae9ac009c54671243f0c3294c26af7cc85250
+  checksum: 10c0/5b039739f7621f5d1ad996715e53d964035f75ad3b9a4d38c6b3804bb226e282ffeae2443624d8fdd9c47d8e926ae9ac009c54671243f0c3294c26af7cc85250
   languageName: node
   linkType: hard
 
 "env-paths@npm:^2.2.0, env-paths@npm:^2.2.1":
   version: 2.2.1
   resolution: "env-paths@npm:2.2.1"
-  checksum: 285325677bf00e30845e330eec32894f5105529db97496ee3f598478e50f008c5352a41a30e5e72ec9de8a542b5a570b85699cd63bd2bc646dbcb9f311d83bc4
+  checksum: 10c0/285325677bf00e30845e330eec32894f5105529db97496ee3f598478e50f008c5352a41a30e5e72ec9de8a542b5a570b85699cd63bd2bc646dbcb9f311d83bc4
   languageName: node
   linkType: hard
 
 "err-code@npm:^2.0.2":
   version: 2.0.3
   resolution: "err-code@npm:2.0.3"
-  checksum: b642f7b4dd4a376e954947550a3065a9ece6733ab8e51ad80db727aaae0817c2e99b02a97a3d6cecc648a97848305e728289cf312d09af395403a90c9d4d8a66
+  checksum: 10c0/b642f7b4dd4a376e954947550a3065a9ece6733ab8e51ad80db727aaae0817c2e99b02a97a3d6cecc648a97848305e728289cf312d09af395403a90c9d4d8a66
   languageName: node
   linkType: hard
 
@@ -7036,7 +7036,7 @@ __metadata:
     prr: "npm:~1.0.1"
   bin:
     errno: cli.js
-  checksum: 83758951967ec57bf00b5f5b7dc797e6d65a6171e57ea57adcf1bd1a0b477fd9b5b35fae5be1ff18f4090ed156bce1db749fe7e317aac19d485a5d150f6a4936
+  checksum: 10c0/83758951967ec57bf00b5f5b7dc797e6d65a6171e57ea57adcf1bd1a0b477fd9b5b35fae5be1ff18f4090ed156bce1db749fe7e317aac19d485a5d150f6a4936
   languageName: node
   linkType: hard
 
@@ -7045,7 +7045,7 @@ __metadata:
   resolution: "error-ex@npm:1.3.2"
   dependencies:
     is-arrayish: "npm:^0.2.1"
-  checksum: ba827f89369b4c93382cfca5a264d059dfefdaa56ecc5e338ffa58a6471f5ed93b71a20add1d52290a4873d92381174382658c885ac1a2305f7baca363ce9cce
+  checksum: 10c0/ba827f89369b4c93382cfca5a264d059dfefdaa56ecc5e338ffa58a6471f5ed93b71a20add1d52290a4873d92381174382658c885ac1a2305f7baca363ce9cce
   languageName: node
   linkType: hard
 
@@ -7054,7 +7054,7 @@ __metadata:
   resolution: "error-stack-parser@npm:2.1.4"
   dependencies:
     stackframe: "npm:^1.3.4"
-  checksum: 7679b780043c98b01fc546725484e0cfd3071bf5c906bbe358722972f04abf4fc3f0a77988017665bab367f6ef3fc2d0185f7528f45966b83e7c99c02d5509b9
+  checksum: 10c0/7679b780043c98b01fc546725484e0cfd3071bf5c906bbe358722972f04abf4fc3f0a77988017665bab367f6ef3fc2d0185f7528f45966b83e7c99c02d5509b9
   languageName: node
   linkType: hard
 
@@ -7101,14 +7101,14 @@ __metadata:
     typed-array-length: "npm:^1.0.4"
     unbox-primitive: "npm:^1.0.2"
     which-typed-array: "npm:^1.1.13"
-  checksum: da31ec43b1c8eb47ba8a17693cac143682a1078b6c3cd883ce0e2062f135f532e93d873694ef439670e1f6ca03195118f43567ba6f33fb0d6c7daae750090236
+  checksum: 10c0/da31ec43b1c8eb47ba8a17693cac143682a1078b6c3cd883ce0e2062f135f532e93d873694ef439670e1f6ca03195118f43567ba6f33fb0d6c7daae750090236
   languageName: node
   linkType: hard
 
 "es-array-method-boxes-properly@npm:^1.0.0":
   version: 1.0.0
   resolution: "es-array-method-boxes-properly@npm:1.0.0"
-  checksum: 4b7617d3fbd460d6f051f684ceca6cf7e88e6724671d9480388d3ecdd72119ddaa46ca31f2c69c5426a82e4b3091c1e81867c71dcdc453565cd90005ff2c382d
+  checksum: 10c0/4b7617d3fbd460d6f051f684ceca6cf7e88e6724671d9480388d3ecdd72119ddaa46ca31f2c69c5426a82e4b3091c1e81867c71dcdc453565cd90005ff2c382d
   languageName: node
   linkType: hard
 
@@ -7125,7 +7125,7 @@ __metadata:
     is-string: "npm:^1.0.7"
     isarray: "npm:^2.0.5"
     stop-iteration-iterator: "npm:^1.0.0"
-  checksum: ebd11effa79851ea75d7f079405f9d0dc185559fd65d986c6afea59a0ff2d46c2ed8675f19f03dce7429d7f6c14ff9aede8d121fbab78d75cfda6a263030bac0
+  checksum: 10c0/ebd11effa79851ea75d7f079405f9d0dc185559fd65d986c6afea59a0ff2d46c2ed8675f19f03dce7429d7f6c14ff9aede8d121fbab78d75cfda6a263030bac0
   languageName: node
   linkType: hard
 
@@ -7147,7 +7147,7 @@ __metadata:
     internal-slot: "npm:^1.0.5"
     iterator.prototype: "npm:^1.1.2"
     safe-array-concat: "npm:^1.0.1"
-  checksum: b4c83f94bfe624260d5238092de3173989f76f1416b1d02c388aea3b2024174e5f5f0e864057311ac99790b57e836ca3545b6e77256b26066dac944519f5e6d6
+  checksum: 10c0/b4c83f94bfe624260d5238092de3173989f76f1416b1d02c388aea3b2024174e5f5f0e864057311ac99790b57e836ca3545b6e77256b26066dac944519f5e6d6
   languageName: node
   linkType: hard
 
@@ -7158,7 +7158,7 @@ __metadata:
     get-intrinsic: "npm:^1.1.3"
     has: "npm:^1.0.3"
     has-tostringtag: "npm:^1.0.0"
-  checksum: 9af096365e3861bb29755cc5f76f15f66a7eab0e83befca396129090c1d9737e54090278b8e5357e97b5f0a5b0459fca07c40c6740884c2659cbf90ef8e508cc
+  checksum: 10c0/9af096365e3861bb29755cc5f76f15f66a7eab0e83befca396129090c1d9737e54090278b8e5357e97b5f0a5b0459fca07c40c6740884c2659cbf90ef8e508cc
   languageName: node
   linkType: hard
 
@@ -7167,7 +7167,7 @@ __metadata:
   resolution: "es-shim-unscopables@npm:1.0.0"
   dependencies:
     has: "npm:^1.0.3"
-  checksum: d54a66239fbd19535b3e50333913260394f14d2d7adb136a95396a13ca584bab400cf9cb2ffd9232f3fe2f0362540bd3a708240c493e46e13fe0b90cfcfedc3d
+  checksum: 10c0/d54a66239fbd19535b3e50333913260394f14d2d7adb136a95396a13ca584bab400cf9cb2ffd9232f3fe2f0362540bd3a708240c493e46e13fe0b90cfcfedc3d
   languageName: node
   linkType: hard
 
@@ -7178,42 +7178,42 @@ __metadata:
     is-callable: "npm:^1.1.4"
     is-date-object: "npm:^1.0.1"
     is-symbol: "npm:^1.0.2"
-  checksum: 0886572b8dc075cb10e50c0af62a03d03a68e1e69c388bd4f10c0649ee41b1fbb24840a1b7e590b393011b5cdbe0144b776da316762653685432df37d6de60f1
+  checksum: 10c0/0886572b8dc075cb10e50c0af62a03d03a68e1e69c388bd4f10c0649ee41b1fbb24840a1b7e590b393011b5cdbe0144b776da316762653685432df37d6de60f1
   languageName: node
   linkType: hard
 
 "escalade@npm:^3.1.1":
   version: 3.1.1
   resolution: "escalade@npm:3.1.1"
-  checksum: afd02e6ca91ffa813e1108b5e7756566173d6bc0d1eb951cb44d6b21702ec17c1cf116cfe75d4a2b02e05acb0b808a7a9387d0d1ca5cf9c04ad03a8445c3e46d
+  checksum: 10c0/afd02e6ca91ffa813e1108b5e7756566173d6bc0d1eb951cb44d6b21702ec17c1cf116cfe75d4a2b02e05acb0b808a7a9387d0d1ca5cf9c04ad03a8445c3e46d
   languageName: node
   linkType: hard
 
 "escape-html@npm:^1.0.3, escape-html@npm:~1.0.3":
   version: 1.0.3
   resolution: "escape-html@npm:1.0.3"
-  checksum: 524c739d776b36c3d29fa08a22e03e8824e3b2fd57500e5e44ecf3cc4707c34c60f9ca0781c0e33d191f2991161504c295e98f68c78fe7baa6e57081ec6ac0a3
+  checksum: 10c0/524c739d776b36c3d29fa08a22e03e8824e3b2fd57500e5e44ecf3cc4707c34c60f9ca0781c0e33d191f2991161504c295e98f68c78fe7baa6e57081ec6ac0a3
   languageName: node
   linkType: hard
 
 "escape-string-regexp@npm:^1.0.5":
   version: 1.0.5
   resolution: "escape-string-regexp@npm:1.0.5"
-  checksum: a968ad453dd0c2724e14a4f20e177aaf32bb384ab41b674a8454afe9a41c5e6fe8903323e0a1052f56289d04bd600f81278edf140b0fcc02f5cac98d0f5b5371
+  checksum: 10c0/a968ad453dd0c2724e14a4f20e177aaf32bb384ab41b674a8454afe9a41c5e6fe8903323e0a1052f56289d04bd600f81278edf140b0fcc02f5cac98d0f5b5371
   languageName: node
   linkType: hard
 
 "escape-string-regexp@npm:^2.0.0":
   version: 2.0.0
   resolution: "escape-string-regexp@npm:2.0.0"
-  checksum: 2530479fe8db57eace5e8646c9c2a9c80fa279614986d16dcc6bcaceb63ae77f05a851ba6c43756d816c61d7f4534baf56e3c705e3e0d884818a46808811c507
+  checksum: 10c0/2530479fe8db57eace5e8646c9c2a9c80fa279614986d16dcc6bcaceb63ae77f05a851ba6c43756d816c61d7f4534baf56e3c705e3e0d884818a46808811c507
   languageName: node
   linkType: hard
 
 "escape-string-regexp@npm:^4.0.0":
   version: 4.0.0
   resolution: "escape-string-regexp@npm:4.0.0"
-  checksum: 9497d4dd307d845bd7f75180d8188bb17ea8c151c1edbf6b6717c100e104d629dc2dfb687686181b0f4b7d732c7dfdc4d5e7a8ff72de1b0ca283a75bbb3a9cd9
+  checksum: 10c0/9497d4dd307d845bd7f75180d8188bb17ea8c151c1edbf6b6717c100e104d629dc2dfb687686181b0f4b7d732c7dfdc4d5e7a8ff72de1b0ca283a75bbb3a9cd9
   languageName: node
   linkType: hard
 
@@ -7231,7 +7231,7 @@ __metadata:
   bin:
     escodegen: bin/escodegen.js
     esgenerate: bin/esgenerate.js
-  checksum: e1450a1f75f67d35c061bf0d60888b15f62ab63aef9df1901cffc81cffbbb9e8b3de237c5502cf8613a017c1df3a3003881307c78835a1ab54d8c8d2206e01d3
+  checksum: 10c0/e1450a1f75f67d35c061bf0d60888b15f62ab63aef9df1901cffc81cffbbb9e8b3de237c5502cf8613a017c1df3a3003881307c78835a1ab54d8c8d2206e01d3
   languageName: node
   linkType: hard
 
@@ -7242,14 +7242,14 @@ __metadata:
     eslint: ">=7.0.0"
   bin:
     eslint-config-prettier: bin/cli.js
-  checksum: 6d332694b36bc9ac6fdb18d3ca2f6ac42afa2ad61f0493e89226950a7091e38981b66bac2b47ba39d15b73fff2cd32c78b850a9cf9eed9ca9a96bfb2f3a2f10d
+  checksum: 10c0/6d332694b36bc9ac6fdb18d3ca2f6ac42afa2ad61f0493e89226950a7091e38981b66bac2b47ba39d15b73fff2cd32c78b850a9cf9eed9ca9a96bfb2f3a2f10d
   languageName: node
   linkType: hard
 
 "eslint-define-config@npm:^2.0.0":
   version: 2.1.0
   resolution: "eslint-define-config@npm:2.1.0"
-  checksum: 034bd6bfbfec2db6c720a51815de6b072efeef7afbf99d90c23a1871f9cd741bb77f9d34e0bc2465262298c6110c5c45b704714d8575c6567fd2df963fb792ea
+  checksum: 10c0/034bd6bfbfec2db6c720a51815de6b072efeef7afbf99d90c23a1871f9cd741bb77f9d34e0bc2465262298c6110c5c45b704714d8575c6567fd2df963fb792ea
   languageName: node
   linkType: hard
 
@@ -7260,7 +7260,7 @@ __metadata:
     debug: "npm:^3.2.7"
     is-core-module: "npm:^2.13.0"
     resolve: "npm:^1.22.4"
-  checksum: 0ea8a24a72328a51fd95aa8f660dcca74c1429806737cf10261ab90cfcaaf62fd1eff664b76a44270868e0a932711a81b250053942595bcd00a93b1c1575dd61
+  checksum: 10c0/0ea8a24a72328a51fd95aa8f660dcca74c1429806737cf10261ab90cfcaaf62fd1eff664b76a44270868e0a932711a81b250053942595bcd00a93b1c1575dd61
   languageName: node
   linkType: hard
 
@@ -7278,7 +7278,7 @@ __metadata:
   peerDependencies:
     eslint: "*"
     eslint-plugin-import: "*"
-  checksum: cb1cb4389916fe78bf8c8567aae2f69243dbfe624bfe21078c56ad46fa1ebf0634fa7239dd3b2055ab5c27359e4b4c28b69b11fcb3a5df8a9e6f7add8e034d86
+  checksum: 10c0/cb1cb4389916fe78bf8c8567aae2f69243dbfe624bfe21078c56ad46fa1ebf0634fa7239dd3b2055ab5c27359e4b4c28b69b11fcb3a5df8a9e6f7add8e034d86
   languageName: node
   linkType: hard
 
@@ -7290,7 +7290,7 @@ __metadata:
   peerDependenciesMeta:
     eslint:
       optional: true
-  checksum: c7a8d1a58d76ec8217a8fea49271ec8132d1b9390965a75f6a4ecbc9e5983d742195b46d2e4378231d2186801439fe1aa5700714b0bfd4eb17aac6e1b65309df
+  checksum: 10c0/c7a8d1a58d76ec8217a8fea49271ec8132d1b9390965a75f6a4ecbc9e5983d742195b46d2e4378231d2186801439fe1aa5700714b0bfd4eb17aac6e1b65309df
   languageName: node
   linkType: hard
 
@@ -7311,7 +7311,7 @@ __metadata:
     unicode-emoji-utils: "npm:^1.2.0"
   peerDependencies:
     eslint: 7 || 8
-  checksum: 77cc1a2959903fcb6639d9fec89e7dfc55cf1e4ea58fca7d3bd6d12fa540aa173cbf5f90fc629b6aaf2ea3b8e61ed0a3cfce940fd2bec6f0796353315e2dbeef
+  checksum: 10c0/77cc1a2959903fcb6639d9fec89e7dfc55cf1e4ea58fca7d3bd6d12fa540aa173cbf5f90fc629b6aaf2ea3b8e61ed0a3cfce940fd2bec6f0796353315e2dbeef
   languageName: node
   linkType: hard
 
@@ -7338,7 +7338,7 @@ __metadata:
     tsconfig-paths: "npm:^3.15.0"
   peerDependencies:
     eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8
-  checksum: 5f35dfbf4e8e67f741f396987de9504ad125c49f4144508a93282b4ea0127e052bde65ab6def1f31b6ace6d5d430be698333f75bdd7dca3bc14226c92a083196
+  checksum: 10c0/5f35dfbf4e8e67f741f396987de9504ad125c49f4144508a93282b4ea0127e052bde65ab6def1f31b6ace6d5d430be698333f75bdd7dca3bc14226c92a083196
   languageName: node
   linkType: hard
 
@@ -7357,7 +7357,7 @@ __metadata:
     spdx-expression-parse: "npm:^4.0.0"
   peerDependencies:
     eslint: ^7.0.0 || ^8.0.0 || ^9.0.0
-  checksum: e0fb3fb4479b6ee539b8c1b626de625ff5d24408f695fcbf648e214854fea9ea3e29b77f56b177bf38655e30a6c9a6eaaff93ef990f69c454c74e180747e39e5
+  checksum: 10c0/e0fb3fb4479b6ee539b8c1b626de625ff5d24408f695fcbf648e214854fea9ea3e29b77f56b177bf38655e30a6c9a6eaaff93ef990f69c454c74e180747e39e5
   languageName: node
   linkType: hard
 
@@ -7383,7 +7383,7 @@ __metadata:
     object.fromentries: "npm:^2.0.7"
   peerDependencies:
     eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8
-  checksum: 199b883e526e6f9d7c54cb3f094abc54f11a1ec816db5fb6cae3b938eb0e503acc10ccba91ca7451633a9d0b9abc0ea03601844a8aba5fe88c5e8897c9ac8f49
+  checksum: 10c0/199b883e526e6f9d7c54cb3f094abc54f11a1ec816db5fb6cae3b938eb0e503acc10ccba91ca7451633a9d0b9abc0ea03601844a8aba5fe88c5e8897c9ac8f49
   languageName: node
   linkType: hard
 
@@ -7403,7 +7403,7 @@ __metadata:
       optional: true
     eslint-config-prettier:
       optional: true
-  checksum: f45d5fc1fcfec6b0cf038a7a65ddd10a25df4fe3f9e1f6b7f0d5100e66f046a26a2492e69ee765dddf461b93c114cf2e1eb18d4970aafa6f385448985c136e09
+  checksum: 10c0/f45d5fc1fcfec6b0cf038a7a65ddd10a25df4fe3f9e1f6b7f0d5100e66f046a26a2492e69ee765dddf461b93c114cf2e1eb18d4970aafa6f385448985c136e09
   languageName: node
   linkType: hard
 
@@ -7412,7 +7412,7 @@ __metadata:
   resolution: "eslint-plugin-promise@npm:6.1.1"
   peerDependencies:
     eslint: ^7.0.0 || ^8.0.0
-  checksum: ec705741c110cd1cb4d702776e1c7f7fe60b671b71f706c88054ab443cf2767aae5a663928fb426373ba1095eaeda312a740a4f880546631f0e0727f298b3393
+  checksum: 10c0/ec705741c110cd1cb4d702776e1c7f7fe60b671b71f706c88054ab443cf2767aae5a663928fb426373ba1095eaeda312a740a4f880546631f0e0727f298b3393
   languageName: node
   linkType: hard
 
@@ -7421,7 +7421,7 @@ __metadata:
   resolution: "eslint-plugin-react-hooks@npm:4.6.0"
   peerDependencies:
     eslint: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0
-  checksum: 58c7e10ea5792c33346fcf5cb4024e14837035ce412ff99c2dcb7c4f903dc9b17939078f80bfef826301ce326582c396c00e8e0ac9d10ac2cde2b42d33763c65
+  checksum: 10c0/58c7e10ea5792c33346fcf5cb4024e14837035ce412ff99c2dcb7c4f903dc9b17939078f80bfef826301ce326582c396c00e8e0ac9d10ac2cde2b42d33763c65
   languageName: node
   linkType: hard
 
@@ -7447,7 +7447,7 @@ __metadata:
     string.prototype.matchall: "npm:^4.0.8"
   peerDependencies:
     eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8
-  checksum: f9b247861024bafc396c4bd3c9ac946604b3b23077251c98f23602aa22027a0c33a69157fd49564e4ff7f17b3678e5dc366a46c7ec42a09454d7cbce786d5001
+  checksum: 10c0/f9b247861024bafc396c4bd3c9ac946604b3b23077251c98f23602aa22027a0c33a69157fd49564e4ff7f17b3678e5dc366a46c7ec42a09454d7cbce786d5001
   languageName: node
   linkType: hard
 
@@ -7457,7 +7457,7 @@ __metadata:
   dependencies:
     esrecurse: "npm:^4.1.0"
     estraverse: "npm:^4.1.1"
-  checksum: a2a3fe5845938ce7cfd2e658c309a9bb27a7f9ce94f0cc447ed5f9fa95b16451556d7e1db4c8e5d2aaa02d02850f5346d23091bbe94f7097412ce846504b4dcc
+  checksum: 10c0/a2a3fe5845938ce7cfd2e658c309a9bb27a7f9ce94f0cc447ed5f9fa95b16451556d7e1db4c8e5d2aaa02d02850f5346d23091bbe94f7097412ce846504b4dcc
   languageName: node
   linkType: hard
 
@@ -7467,14 +7467,14 @@ __metadata:
   dependencies:
     esrecurse: "npm:^4.3.0"
     estraverse: "npm:^5.2.0"
-  checksum: 613c267aea34b5a6d6c00514e8545ef1f1433108097e857225fed40d397dd6b1809dffd11c2fde23b37ca53d7bf935fe04d2a18e6fc932b31837b6ad67e1c116
+  checksum: 10c0/613c267aea34b5a6d6c00514e8545ef1f1433108097e857225fed40d397dd6b1809dffd11c2fde23b37ca53d7bf935fe04d2a18e6fc932b31837b6ad67e1c116
   languageName: node
   linkType: hard
 
 "eslint-visitor-keys@npm:^3.3.0, eslint-visitor-keys@npm:^3.4.1, eslint-visitor-keys@npm:^3.4.3":
   version: 3.4.3
   resolution: "eslint-visitor-keys@npm:3.4.3"
-  checksum: 92708e882c0a5ffd88c23c0b404ac1628cf20104a108c745f240a13c332a11aac54f49a22d5762efbffc18ecbc9a580d1b7ad034bf5f3cc3307e5cbff2ec9820
+  checksum: 10c0/92708e882c0a5ffd88c23c0b404ac1628cf20104a108c745f240a13c332a11aac54f49a22d5762efbffc18ecbc9a580d1b7ad034bf5f3cc3307e5cbff2ec9820
   languageName: node
   linkType: hard
 
@@ -7522,7 +7522,7 @@ __metadata:
     text-table: "npm:^0.2.0"
   bin:
     eslint: bin/eslint.js
-  checksum: 2be598f7da1339d045ad933ffd3d4742bee610515cd2b0d9a2b8b729395a01d4e913552fff555b559fccaefd89d7b37632825789d1b06470608737ae69ab43fb
+  checksum: 10c0/2be598f7da1339d045ad933ffd3d4742bee610515cd2b0d9a2b8b729395a01d4e913552fff555b559fccaefd89d7b37632825789d1b06470608737ae69ab43fb
   languageName: node
   linkType: hard
 
@@ -7533,7 +7533,7 @@ __metadata:
     acorn: "npm:^8.9.0"
     acorn-jsx: "npm:^5.3.2"
     eslint-visitor-keys: "npm:^3.4.1"
-  checksum: 1a2e9b4699b715347f62330bcc76aee224390c28bb02b31a3752e9d07549c473f5f986720483c6469cf3cfb3c9d05df612ffc69eb1ee94b54b739e67de9bb460
+  checksum: 10c0/1a2e9b4699b715347f62330bcc76aee224390c28bb02b31a3752e9d07549c473f5f986720483c6469cf3cfb3c9d05df612ffc69eb1ee94b54b739e67de9bb460
   languageName: node
   linkType: hard
 
@@ -7543,7 +7543,7 @@ __metadata:
   bin:
     esparse: ./bin/esparse.js
     esvalidate: ./bin/esvalidate.js
-  checksum: ad4bab9ead0808cf56501750fd9d3fb276f6b105f987707d059005d57e182d18a7c9ec7f3a01794ebddcca676773e42ca48a32d67a250c9d35e009ca613caba3
+  checksum: 10c0/ad4bab9ead0808cf56501750fd9d3fb276f6b105f987707d059005d57e182d18a7c9ec7f3a01794ebddcca676773e42ca48a32d67a250c9d35e009ca613caba3
   languageName: node
   linkType: hard
 
@@ -7552,7 +7552,7 @@ __metadata:
   resolution: "esquery@npm:1.5.0"
   dependencies:
     estraverse: "npm:^5.1.0"
-  checksum: a084bd049d954cc88ac69df30534043fb2aee5555b56246493f42f27d1e168f00d9e5d4192e46f10290d312dc30dc7d58994d61a609c579c1219d636996f9213
+  checksum: 10c0/a084bd049d954cc88ac69df30534043fb2aee5555b56246493f42f27d1e168f00d9e5d4192e46f10290d312dc30dc7d58994d61a609c579c1219d636996f9213
   languageName: node
   linkType: hard
 
@@ -7561,77 +7561,77 @@ __metadata:
   resolution: "esrecurse@npm:4.3.0"
   dependencies:
     estraverse: "npm:^5.2.0"
-  checksum: 81a37116d1408ded88ada45b9fb16dbd26fba3aadc369ce50fcaf82a0bac12772ebd7b24cd7b91fc66786bf2c1ac7b5f196bc990a473efff972f5cb338877cf5
+  checksum: 10c0/81a37116d1408ded88ada45b9fb16dbd26fba3aadc369ce50fcaf82a0bac12772ebd7b24cd7b91fc66786bf2c1ac7b5f196bc990a473efff972f5cb338877cf5
   languageName: node
   linkType: hard
 
 "estraverse@npm:^4.1.1":
   version: 4.3.0
   resolution: "estraverse@npm:4.3.0"
-  checksum: 9cb46463ef8a8a4905d3708a652d60122a0c20bb58dec7e0e12ab0e7235123d74214fc0141d743c381813e1b992767e2708194f6f6e0f9fd00c1b4e0887b8b6d
+  checksum: 10c0/9cb46463ef8a8a4905d3708a652d60122a0c20bb58dec7e0e12ab0e7235123d74214fc0141d743c381813e1b992767e2708194f6f6e0f9fd00c1b4e0887b8b6d
   languageName: node
   linkType: hard
 
 "estraverse@npm:^5.1.0, estraverse@npm:^5.2.0, estraverse@npm:^5.3.0":
   version: 5.3.0
   resolution: "estraverse@npm:5.3.0"
-  checksum: 1ff9447b96263dec95d6d67431c5e0771eb9776427421260a3e2f0fdd5d6bd4f8e37a7338f5ad2880c9f143450c9b1e4fc2069060724570a49cf9cf0312bd107
+  checksum: 10c0/1ff9447b96263dec95d6d67431c5e0771eb9776427421260a3e2f0fdd5d6bd4f8e37a7338f5ad2880c9f143450c9b1e4fc2069060724570a49cf9cf0312bd107
   languageName: node
   linkType: hard
 
 "estree-walker@npm:^1.0.1":
   version: 1.0.1
   resolution: "estree-walker@npm:1.0.1"
-  checksum: fa9e5f8c1bbe8d01e314c0f03067b64a4f22d4c58410fc5237060d0c15b81e58c23921c41acc60abbdab490f1fdfcbd6408ede2d03ca704454272e0244d61a55
+  checksum: 10c0/fa9e5f8c1bbe8d01e314c0f03067b64a4f22d4c58410fc5237060d0c15b81e58c23921c41acc60abbdab490f1fdfcbd6408ede2d03ca704454272e0244d61a55
   languageName: node
   linkType: hard
 
 "esutils@npm:^2.0.2":
   version: 2.0.3
   resolution: "esutils@npm:2.0.3"
-  checksum: 9a2fe69a41bfdade834ba7c42de4723c97ec776e40656919c62cbd13607c45e127a003f05f724a1ea55e5029a4cf2de444b13009f2af71271e42d93a637137c7
+  checksum: 10c0/9a2fe69a41bfdade834ba7c42de4723c97ec776e40656919c62cbd13607c45e127a003f05f724a1ea55e5029a4cf2de444b13009f2af71271e42d93a637137c7
   languageName: node
   linkType: hard
 
 "etag@npm:~1.8.1":
   version: 1.8.1
   resolution: "etag@npm:1.8.1"
-  checksum: 12be11ef62fb9817314d790089a0a49fae4e1b50594135dcb8076312b7d7e470884b5100d249b28c18581b7fd52f8b485689ffae22a11ed9ec17377a33a08f84
+  checksum: 10c0/12be11ef62fb9817314d790089a0a49fae4e1b50594135dcb8076312b7d7e470884b5100d249b28c18581b7fd52f8b485689ffae22a11ed9ec17377a33a08f84
   languageName: node
   linkType: hard
 
 "event-target-shim@npm:^5.0.0":
   version: 5.0.1
   resolution: "event-target-shim@npm:5.0.1"
-  checksum: 0255d9f936215fd206156fd4caa9e8d35e62075d720dc7d847e89b417e5e62cf1ce6c9b4e0a1633a9256de0efefaf9f8d26924b1f3c8620cffb9db78e7d3076b
+  checksum: 10c0/0255d9f936215fd206156fd4caa9e8d35e62075d720dc7d847e89b417e5e62cf1ce6c9b4e0a1633a9256de0efefaf9f8d26924b1f3c8620cffb9db78e7d3076b
   languageName: node
   linkType: hard
 
 "eventemitter3@npm:^4.0.0":
   version: 4.0.7
   resolution: "eventemitter3@npm:4.0.7"
-  checksum: 5f6d97cbcbac47be798e6355e3a7639a84ee1f7d9b199a07017f1d2f1e2fe236004d14fa5dfaeba661f94ea57805385e326236a6debbc7145c8877fbc0297c6b
+  checksum: 10c0/5f6d97cbcbac47be798e6355e3a7639a84ee1f7d9b199a07017f1d2f1e2fe236004d14fa5dfaeba661f94ea57805385e326236a6debbc7145c8877fbc0297c6b
   languageName: node
   linkType: hard
 
 "eventemitter3@npm:^5.0.1":
   version: 5.0.1
   resolution: "eventemitter3@npm:5.0.1"
-  checksum: 4ba5c00c506e6c786b4d6262cfbce90ddc14c10d4667e5c83ae993c9de88aa856033994dd2b35b83e8dc1170e224e66a319fa80adc4c32adcd2379bbc75da814
+  checksum: 10c0/4ba5c00c506e6c786b4d6262cfbce90ddc14c10d4667e5c83ae993c9de88aa856033994dd2b35b83e8dc1170e224e66a319fa80adc4c32adcd2379bbc75da814
   languageName: node
   linkType: hard
 
 "events@npm:^3.0.0, events@npm:^3.3.0":
   version: 3.3.0
   resolution: "events@npm:3.3.0"
-  checksum: d6b6f2adbccbcda74ddbab52ed07db727ef52e31a61ed26db9feb7dc62af7fc8e060defa65e5f8af9449b86b52cc1a1f6a79f2eafcf4e62add2b7a1fa4a432f6
+  checksum: 10c0/d6b6f2adbccbcda74ddbab52ed07db727ef52e31a61ed26db9feb7dc62af7fc8e060defa65e5f8af9449b86b52cc1a1f6a79f2eafcf4e62add2b7a1fa4a432f6
   languageName: node
   linkType: hard
 
 "eventsource@npm:^2.0.2":
   version: 2.0.2
   resolution: "eventsource@npm:2.0.2"
-  checksum: 0b8c70b35e45dd20f22ff64b001be9d530e33b92ca8bdbac9e004d0be00d957ab02ef33c917315f59bf2f20b178c56af85c52029bc8e6cc2d61c31d87d943573
+  checksum: 10c0/0b8c70b35e45dd20f22ff64b001be9d530e33b92ca8bdbac9e004d0be00d957ab02ef33c917315f59bf2f20b178c56af85c52029bc8e6cc2d61c31d87d943573
   languageName: node
   linkType: hard
 
@@ -7642,7 +7642,7 @@ __metadata:
     md5.js: "npm:^1.3.4"
     node-gyp: "npm:latest"
     safe-buffer: "npm:^5.1.1"
-  checksum: 77fbe2d94a902a80e9b8f5a73dcd695d9c14899c5e82967a61b1fc6cbbb28c46552d9b127cff47c45fcf684748bdbcfa0a50410349109de87ceb4b199ef6ee99
+  checksum: 10c0/77fbe2d94a902a80e9b8f5a73dcd695d9c14899c5e82967a61b1fc6cbbb28c46552d9b127cff47c45fcf684748bdbcfa0a50410349109de87ceb4b199ef6ee99
   languageName: node
   linkType: hard
 
@@ -7659,7 +7659,7 @@ __metadata:
     onetime: "npm:^6.0.0"
     signal-exit: "npm:^4.1.0"
     strip-final-newline: "npm:^3.0.0"
-  checksum: 2c52d8775f5bf103ce8eec9c7ab3059909ba350a5164744e9947ed14a53f51687c040a250bda833f906d1283aa8803975b84e6c8f7a7c42f99dc8ef80250d1af
+  checksum: 10c0/2c52d8775f5bf103ce8eec9c7ab3059909ba350a5164744e9947ed14a53f51687c040a250bda833f906d1283aa8803975b84e6c8f7a7c42f99dc8ef80250d1af
   languageName: node
   linkType: hard
 
@@ -7674,7 +7674,7 @@ __metadata:
     p-finally: "npm:^1.0.0"
     signal-exit: "npm:^3.0.0"
     strip-eof: "npm:^1.0.0"
-  checksum: cc71707c9aa4a2552346893ee63198bf70a04b5a1bc4f8a0ef40f1d03c319eae80932c59191f037990d7d102193e83a38ec72115fff814ec2fb3099f3661a590
+  checksum: 10c0/cc71707c9aa4a2552346893ee63198bf70a04b5a1bc4f8a0ef40f1d03c319eae80932c59191f037990d7d102193e83a38ec72115fff814ec2fb3099f3661a590
   languageName: node
   linkType: hard
 
@@ -7691,7 +7691,7 @@ __metadata:
     onetime: "npm:^5.1.2"
     signal-exit: "npm:^3.0.3"
     strip-final-newline: "npm:^2.0.0"
-  checksum: c8e615235e8de4c5addf2fa4c3da3e3aa59ce975a3e83533b4f6a71750fb816a2e79610dc5f1799b6e28976c9ae86747a36a606655bf8cb414a74d8d507b304f
+  checksum: 10c0/c8e615235e8de4c5addf2fa4c3da3e3aa59ce975a3e83533b4f6a71750fb816a2e79610dc5f1799b6e28976c9ae86747a36a606655bf8cb414a74d8d507b304f
   languageName: node
   linkType: hard
 
@@ -7708,14 +7708,14 @@ __metadata:
     onetime: "npm:^6.0.0"
     signal-exit: "npm:^3.0.7"
     strip-final-newline: "npm:^3.0.0"
-  checksum: 098cd6a1bc26d509e5402c43f4971736450b84d058391820c6f237aeec6436963e006fd8423c9722f148c53da86aa50045929c7278b5522197dff802d10f9885
+  checksum: 10c0/098cd6a1bc26d509e5402c43f4971736450b84d058391820c6f237aeec6436963e006fd8423c9722f148c53da86aa50045929c7278b5522197dff802d10f9885
   languageName: node
   linkType: hard
 
 "exit@npm:^0.1.2":
   version: 0.1.2
   resolution: "exit@npm:0.1.2"
-  checksum: 71d2ad9b36bc25bb8b104b17e830b40a08989be7f7d100b13269aaae7c3784c3e6e1e88a797e9e87523993a25ba27c8958959a554535370672cfb4d824af8989
+  checksum: 10c0/71d2ad9b36bc25bb8b104b17e830b40a08989be7f7d100b13269aaae7c3784c3e6e1e88a797e9e87523993a25ba27c8958959a554535370672cfb4d824af8989
   languageName: node
   linkType: hard
 
@@ -7730,7 +7730,7 @@ __metadata:
     regex-not: "npm:^1.0.0"
     snapdragon: "npm:^0.8.1"
     to-regex: "npm:^3.0.1"
-  checksum: 3e2fb95d2d7d7231486493fd65db913927b656b6fcdfcce41e139c0991a72204af619ad4acb1be75ed994ca49edb7995ef241dbf8cf44dc3c03d211328428a87
+  checksum: 10c0/3e2fb95d2d7d7231486493fd65db913927b656b6fcdfcce41e139c0991a72204af619ad4acb1be75ed994ca49edb7995ef241dbf8cf44dc3c03d211328428a87
   languageName: node
   linkType: hard
 
@@ -7739,7 +7739,7 @@ __metadata:
   resolution: "expand-tilde@npm:2.0.2"
   dependencies:
     homedir-polyfill: "npm:^1.0.1"
-  checksum: 205a60497422746d1c3acbc1d65bd609b945066f239a2b785e69a7a651ac4cbeb4e08555b1ea0023abbe855e6fcb5bbf27d0b371367fdccd303d4fb2b4d66845
+  checksum: 10c0/205a60497422746d1c3acbc1d65bd609b945066f239a2b785e69a7a651ac4cbeb4e08555b1ea0023abbe855e6fcb5bbf27d0b371367fdccd303d4fb2b4d66845
   languageName: node
   linkType: hard
 
@@ -7752,14 +7752,14 @@ __metadata:
     jest-matcher-utils: "npm:^29.7.0"
     jest-message-util: "npm:^29.7.0"
     jest-util: "npm:^29.7.0"
-  checksum: 2eddeace66e68b8d8ee5f7be57f3014b19770caaf6815c7a08d131821da527fb8c8cb7b3dcd7c883d2d3d8d184206a4268984618032d1e4b16dc8d6596475d41
+  checksum: 10c0/2eddeace66e68b8d8ee5f7be57f3014b19770caaf6815c7a08d131821da527fb8c8cb7b3dcd7c883d2d3d8d184206a4268984618032d1e4b16dc8d6596475d41
   languageName: node
   linkType: hard
 
 "exponential-backoff@npm:^3.1.1":
   version: 3.1.1
   resolution: "exponential-backoff@npm:3.1.1"
-  checksum: 160456d2d647e6019640bd07111634d8c353038d9fa40176afb7cd49b0548bdae83b56d05e907c2cce2300b81cae35d800ef92fefb9d0208e190fa3b7d6bb579
+  checksum: 10c0/160456d2d647e6019640bd07111634d8c353038d9fa40176afb7cd49b0548bdae83b56d05e907c2cce2300b81cae35d800ef92fefb9d0208e190fa3b7d6bb579
   languageName: node
   linkType: hard
 
@@ -7798,7 +7798,7 @@ __metadata:
     type-is: "npm:~1.6.18"
     utils-merge: "npm:1.0.1"
     vary: "npm:~1.1.2"
-  checksum: 75af556306b9241bc1d7bdd40c9744b516c38ce50ae3210658efcbf96e3aed4ab83b3432f06215eae5610c123bc4136957dc06e50dfc50b7d4d775af56c4c59c
+  checksum: 10c0/75af556306b9241bc1d7bdd40c9744b516c38ce50ae3210658efcbf96e3aed4ab83b3432f06215eae5610c123bc4136957dc06e50dfc50b7d4d775af56c4c59c
   languageName: node
   linkType: hard
 
@@ -7807,7 +7807,7 @@ __metadata:
   resolution: "extend-shallow@npm:2.0.1"
   dependencies:
     is-extendable: "npm:^0.1.0"
-  checksum: ee1cb0a18c9faddb42d791b2d64867bd6cfd0f3affb711782eb6e894dd193e2934a7f529426aac7c8ddb31ac5d38000a00aa2caf08aa3dfc3e1c8ff6ba340bd9
+  checksum: 10c0/ee1cb0a18c9faddb42d791b2d64867bd6cfd0f3affb711782eb6e894dd193e2934a7f529426aac7c8ddb31ac5d38000a00aa2caf08aa3dfc3e1c8ff6ba340bd9
   languageName: node
   linkType: hard
 
@@ -7817,7 +7817,7 @@ __metadata:
   dependencies:
     assign-symbols: "npm:^1.0.0"
     is-extendable: "npm:^1.0.1"
-  checksum: f39581b8f98e3ad94995e33214fff725b0297cf09f2725b6f624551cfb71e0764accfd0af80becc0182af5014d2a57b31b85ec999f9eb8a6c45af81752feac9a
+  checksum: 10c0/f39581b8f98e3ad94995e33214fff725b0297cf09f2725b6f624551cfb71e0764accfd0af80becc0182af5014d2a57b31b85ec999f9eb8a6c45af81752feac9a
   languageName: node
   linkType: hard
 
@@ -7833,28 +7833,28 @@ __metadata:
     regex-not: "npm:^1.0.0"
     snapdragon: "npm:^0.8.1"
     to-regex: "npm:^3.0.1"
-  checksum: e1a891342e2010d046143016c6c03d58455c2c96c30bf5570ea07929984ee7d48fad86b363aee08f7a8a638f5c3a66906429b21ecb19bc8e90df56a001cd282c
+  checksum: 10c0/e1a891342e2010d046143016c6c03d58455c2c96c30bf5570ea07929984ee7d48fad86b363aee08f7a8a638f5c3a66906429b21ecb19bc8e90df56a001cd282c
   languageName: node
   linkType: hard
 
 "fast-copy@npm:^3.0.0":
   version: 3.0.1
   resolution: "fast-copy@npm:3.0.1"
-  checksum: a8310dbcc4c94ed001dc3e0bbc3c3f0491bb04e6c17163abe441a54997ba06cdf1eb532c2f05e54777c6f072c84548c23ef0ecd54665cd611be1d42f37eca258
+  checksum: 10c0/a8310dbcc4c94ed001dc3e0bbc3c3f0491bb04e6c17163abe441a54997ba06cdf1eb532c2f05e54777c6f072c84548c23ef0ecd54665cd611be1d42f37eca258
   languageName: node
   linkType: hard
 
 "fast-deep-equal@npm:^3.1.1, fast-deep-equal@npm:^3.1.3":
   version: 3.1.3
   resolution: "fast-deep-equal@npm:3.1.3"
-  checksum: 40dedc862eb8992c54579c66d914635afbec43350afbbe991235fdcb4e3a8d5af1b23ae7e79bef7d4882d0ecee06c3197488026998fb19f72dc95acff1d1b1d0
+  checksum: 10c0/40dedc862eb8992c54579c66d914635afbec43350afbbe991235fdcb4e3a8d5af1b23ae7e79bef7d4882d0ecee06c3197488026998fb19f72dc95acff1d1b1d0
   languageName: node
   linkType: hard
 
 "fast-diff@npm:^1.1.2":
   version: 1.3.0
   resolution: "fast-diff@npm:1.3.0"
-  checksum: 5c19af237edb5d5effda008c891a18a585f74bf12953be57923f17a3a4d0979565fc64dbc73b9e20926b9d895f5b690c618cbb969af0cf022e3222471220ad29
+  checksum: 10c0/5c19af237edb5d5effda008c891a18a585f74bf12953be57923f17a3a4d0979565fc64dbc73b9e20926b9d895f5b690c618cbb969af0cf022e3222471220ad29
   languageName: node
   linkType: hard
 
@@ -7867,42 +7867,42 @@ __metadata:
     glob-parent: "npm:^5.1.2"
     merge2: "npm:^1.3.0"
     micromatch: "npm:^4.0.4"
-  checksum: 42baad7b9cd40b63e42039132bde27ca2cb3a4950d0a0f9abe4639ea1aa9d3e3b40f98b1fe31cbc0cc17b664c9ea7447d911a152fa34ec5b72977b125a6fc845
+  checksum: 10c0/42baad7b9cd40b63e42039132bde27ca2cb3a4950d0a0f9abe4639ea1aa9d3e3b40f98b1fe31cbc0cc17b664c9ea7447d911a152fa34ec5b72977b125a6fc845
   languageName: node
   linkType: hard
 
 "fast-json-stable-stringify@npm:^2.0.0, fast-json-stable-stringify@npm:^2.1.0":
   version: 2.1.0
   resolution: "fast-json-stable-stringify@npm:2.1.0"
-  checksum: 7f081eb0b8a64e0057b3bb03f974b3ef00135fbf36c1c710895cd9300f13c94ba809bb3a81cf4e1b03f6e5285610a61abbd7602d0652de423144dfee5a389c9b
+  checksum: 10c0/7f081eb0b8a64e0057b3bb03f974b3ef00135fbf36c1c710895cd9300f13c94ba809bb3a81cf4e1b03f6e5285610a61abbd7602d0652de423144dfee5a389c9b
   languageName: node
   linkType: hard
 
 "fast-levenshtein@npm:^2.0.6":
   version: 2.0.6
   resolution: "fast-levenshtein@npm:2.0.6"
-  checksum: 111972b37338bcb88f7d9e2c5907862c280ebf4234433b95bc611e518d192ccb2d38119c4ac86e26b668d75f7f3894f4ff5c4982899afced7ca78633b08287c4
+  checksum: 10c0/111972b37338bcb88f7d9e2c5907862c280ebf4234433b95bc611e518d192ccb2d38119c4ac86e26b668d75f7f3894f4ff5c4982899afced7ca78633b08287c4
   languageName: node
   linkType: hard
 
 "fast-redact@npm:^3.1.1":
   version: 3.3.0
   resolution: "fast-redact@npm:3.3.0"
-  checksum: d81562510681e9ba6404ee5d3838ff5257a44d2f80937f5024c099049ff805437d0fae0124458a7e87535cc9dcf4de305bb075cab8f08d6c720bbc3447861b4e
+  checksum: 10c0/d81562510681e9ba6404ee5d3838ff5257a44d2f80937f5024c099049ff805437d0fae0124458a7e87535cc9dcf4de305bb075cab8f08d6c720bbc3447861b4e
   languageName: node
   linkType: hard
 
 "fast-safe-stringify@npm:^2.1.1":
   version: 2.1.1
   resolution: "fast-safe-stringify@npm:2.1.1"
-  checksum: d90ec1c963394919828872f21edaa3ad6f1dddd288d2bd4e977027afff09f5db40f94e39536d4646f7e01761d704d72d51dce5af1b93717f3489ef808f5f4e4d
+  checksum: 10c0/d90ec1c963394919828872f21edaa3ad6f1dddd288d2bd4e977027afff09f5db40f94e39536d4646f7e01761d704d72d51dce5af1b93717f3489ef808f5f4e4d
   languageName: node
   linkType: hard
 
 "fastest-levenshtein@npm:^1.0.16":
   version: 1.0.16
   resolution: "fastest-levenshtein@npm:1.0.16"
-  checksum: 7e3d8ae812a7f4fdf8cad18e9cde436a39addf266a5986f653ea0d81e0de0900f50c0f27c6d5aff3f686bcb48acbd45be115ae2216f36a6a13a7dbbf5cad878b
+  checksum: 10c0/7e3d8ae812a7f4fdf8cad18e9cde436a39addf266a5986f653ea0d81e0de0900f50c0f27c6d5aff3f686bcb48acbd45be115ae2216f36a6a13a7dbbf5cad878b
   languageName: node
   linkType: hard
 
@@ -7911,7 +7911,7 @@ __metadata:
   resolution: "fastq@npm:1.15.0"
   dependencies:
     reusify: "npm:^1.0.4"
-  checksum: 5ce4f83afa5f88c9379e67906b4d31bc7694a30826d6cc8d0f0473c966929017fda65c2174b0ec89f064ede6ace6c67f8a4fe04cef42119b6a55b0d465554c24
+  checksum: 10c0/5ce4f83afa5f88c9379e67906b4d31bc7694a30826d6cc8d0f0473c966929017fda65c2174b0ec89f064ede6ace6c67f8a4fe04cef42119b6a55b0d465554c24
   languageName: node
   linkType: hard
 
@@ -7920,7 +7920,7 @@ __metadata:
   resolution: "faye-websocket@npm:0.11.4"
   dependencies:
     websocket-driver: "npm:>=0.5.1"
-  checksum: c6052a0bb322778ce9f89af92890f6f4ce00d5ec92418a35e5f4c6864a4fe736fec0bcebd47eac7c0f0e979b01530746b1c85c83cb04bae789271abf19737420
+  checksum: 10c0/c6052a0bb322778ce9f89af92890f6f4ce00d5ec92418a35e5f4c6864a4fe736fec0bcebd47eac7c0f0e979b01530746b1c85c83cb04bae789271abf19737420
   languageName: node
   linkType: hard
 
@@ -7929,7 +7929,7 @@ __metadata:
   resolution: "fb-watchman@npm:2.0.2"
   dependencies:
     bser: "npm:2.1.1"
-  checksum: feae89ac148adb8f6ae8ccd87632e62b13563e6fb114cacb5265c51f585b17e2e268084519fb2edd133872f1d47a18e6bfd7e5e08625c0d41b93149694187581
+  checksum: 10c0/feae89ac148adb8f6ae8ccd87632e62b13563e6fb114cacb5265c51f585b17e2e268084519fb2edd133872f1d47a18e6bfd7e5e08625c0d41b93149694187581
   languageName: node
   linkType: hard
 
@@ -7938,7 +7938,7 @@ __metadata:
   resolution: "file-entry-cache@npm:6.0.1"
   dependencies:
     flat-cache: "npm:^3.0.4"
-  checksum: 58473e8a82794d01b38e5e435f6feaf648e3f36fdb3a56e98f417f4efae71ad1c0d4ebd8a9a7c50c3ad085820a93fc7494ad721e0e4ebc1da3573f4e1c3c7cdd
+  checksum: 10c0/58473e8a82794d01b38e5e435f6feaf648e3f36fdb3a56e98f417f4efae71ad1c0d4ebd8a9a7c50c3ad085820a93fc7494ad721e0e4ebc1da3573f4e1c3c7cdd
   languageName: node
   linkType: hard
 
@@ -7947,7 +7947,7 @@ __metadata:
   resolution: "file-entry-cache@npm:8.0.0"
   dependencies:
     flat-cache: "npm:^4.0.0"
-  checksum: 9e2b5938b1cd9b6d7e3612bdc533afd4ac17b2fc646569e9a8abbf2eb48e5eb8e316bc38815a3ef6a1b456f4107f0d0f055a614ca613e75db6bf9ff4d72c1638
+  checksum: 10c0/9e2b5938b1cd9b6d7e3612bdc533afd4ac17b2fc646569e9a8abbf2eb48e5eb8e316bc38815a3ef6a1b456f4107f0d0f055a614ca613e75db6bf9ff4d72c1638
   languageName: node
   linkType: hard
 
@@ -7959,21 +7959,21 @@ __metadata:
     schema-utils: "npm:^3.0.0"
   peerDependencies:
     webpack: ^4.0.0 || ^5.0.0
-  checksum: e176a57c2037ab0f78e5755dbf293a6b7f0f8392350a120bd03cc2ce2525bea017458ba28fea14ca535ff1848055e86d1a3a216bdb2561ef33395b27260a1dd3
+  checksum: 10c0/e176a57c2037ab0f78e5755dbf293a6b7f0f8392350a120bd03cc2ce2525bea017458ba28fea14ca535ff1848055e86d1a3a216bdb2561ef33395b27260a1dd3
   languageName: node
   linkType: hard
 
 "file-type@npm:^12.4.1":
   version: 12.4.2
   resolution: "file-type@npm:12.4.2"
-  checksum: 26a307262a2a0b41ea83136550fbe83d8b502d080778b6577e0336fbfe9e919e1f871a286a6eb59f668425f60ebb19402fcb6c0443af58446d33c63362554e1d
+  checksum: 10c0/26a307262a2a0b41ea83136550fbe83d8b502d080778b6577e0336fbfe9e919e1f871a286a6eb59f668425f60ebb19402fcb6c0443af58446d33c63362554e1d
   languageName: node
   linkType: hard
 
 "file-uri-to-path@npm:1.0.0":
   version: 1.0.0
   resolution: "file-uri-to-path@npm:1.0.0"
-  checksum: 3b545e3a341d322d368e880e1c204ef55f1d45cdea65f7efc6c6ce9e0c4d22d802d5629320eb779d006fe59624ac17b0e848d83cc5af7cd101f206cb704f5519
+  checksum: 10c0/3b545e3a341d322d368e880e1c204ef55f1d45cdea65f7efc6c6ce9e0c4d22d802d5629320eb779d006fe59624ac17b0e848d83cc5af7cd101f206cb704f5519
   languageName: node
   linkType: hard
 
@@ -7982,7 +7982,7 @@ __metadata:
   resolution: "filelist@npm:1.0.4"
   dependencies:
     minimatch: "npm:^5.0.1"
-  checksum: 426b1de3944a3d153b053f1c0ebfd02dccd0308a4f9e832ad220707a6d1f1b3c9784d6cadf6b2f68f09a57565f63ebc7bcdc913ccf8012d834f472c46e596f41
+  checksum: 10c0/426b1de3944a3d153b053f1c0ebfd02dccd0308a4f9e832ad220707a6d1f1b3c9784d6cadf6b2f68f09a57565f63ebc7bcdc913ccf8012d834f472c46e596f41
   languageName: node
   linkType: hard
 
@@ -7994,7 +7994,7 @@ __metadata:
     is-number: "npm:^3.0.0"
     repeat-string: "npm:^1.6.1"
     to-regex-range: "npm:^2.1.0"
-  checksum: ccd57b7c43d7e28a1f8a60adfa3c401629c08e2f121565eece95e2386ebc64dedc7128d8c3448342aabf19db0c55a34f425f148400c7a7be9a606ba48749e089
+  checksum: 10c0/ccd57b7c43d7e28a1f8a60adfa3c401629c08e2f121565eece95e2386ebc64dedc7128d8c3448342aabf19db0c55a34f425f148400c7a7be9a606ba48749e089
   languageName: node
   linkType: hard
 
@@ -8003,7 +8003,7 @@ __metadata:
   resolution: "fill-range@npm:7.0.1"
   dependencies:
     to-regex-range: "npm:^5.0.1"
-  checksum: 7cdad7d426ffbaadf45aeb5d15ec675bbd77f7597ad5399e3d2766987ed20bda24d5fac64b3ee79d93276f5865608bb22344a26b9b1ae6c4d00bd94bf611623f
+  checksum: 10c0/7cdad7d426ffbaadf45aeb5d15ec675bbd77f7597ad5399e3d2766987ed20bda24d5fac64b3ee79d93276f5865608bb22344a26b9b1ae6c4d00bd94bf611623f
   languageName: node
   linkType: hard
 
@@ -8018,7 +8018,7 @@ __metadata:
     parseurl: "npm:~1.3.3"
     statuses: "npm:2.0.1"
     unpipe: "npm:~1.0.0"
-  checksum: 64b7e5ff2ad1fcb14931cd012651631b721ce657da24aedb5650ddde9378bf8e95daa451da43398123f5de161a81e79ff5affe4f9f2a6d2df4a813d6d3e254b7
+  checksum: 10c0/64b7e5ff2ad1fcb14931cd012651631b721ce657da24aedb5650ddde9378bf8e95daa451da43398123f5de161a81e79ff5affe4f9f2a6d2df4a813d6d3e254b7
   languageName: node
   linkType: hard
 
@@ -8029,14 +8029,14 @@ __metadata:
     commondir: "npm:^1.0.1"
     make-dir: "npm:^3.0.2"
     pkg-dir: "npm:^4.1.0"
-  checksum: 92747cda42bff47a0266b06014610981cfbb71f55d60f2c8216bc3108c83d9745507fb0b14ecf6ab71112bed29cd6fb1a137ee7436179ea36e11287e3159e587
+  checksum: 10c0/92747cda42bff47a0266b06014610981cfbb71f55d60f2c8216bc3108c83d9745507fb0b14ecf6ab71112bed29cd6fb1a137ee7436179ea36e11287e3159e587
   languageName: node
   linkType: hard
 
 "find-root@npm:^1.1.0":
   version: 1.1.0
   resolution: "find-root@npm:1.1.0"
-  checksum: 1abc7f3bf2f8d78ff26d9e00ce9d0f7b32e5ff6d1da2857bcdf4746134c422282b091c672cde0572cac3840713487e0a7a636af9aa1b74cb11894b447a521efa
+  checksum: 10c0/1abc7f3bf2f8d78ff26d9e00ce9d0f7b32e5ff6d1da2857bcdf4746134c422282b091c672cde0572cac3840713487e0a7a636af9aa1b74cb11894b447a521efa
   languageName: node
   linkType: hard
 
@@ -8045,7 +8045,7 @@ __metadata:
   resolution: "find-up@npm:3.0.0"
   dependencies:
     locate-path: "npm:^3.0.0"
-  checksum: 2c2e7d0a26db858e2f624f39038c74739e38306dee42b45f404f770db357947be9d0d587f1cac72d20c114deb38aa57316e879eb0a78b17b46da7dab0a3bd6e3
+  checksum: 10c0/2c2e7d0a26db858e2f624f39038c74739e38306dee42b45f404f770db357947be9d0d587f1cac72d20c114deb38aa57316e879eb0a78b17b46da7dab0a3bd6e3
   languageName: node
   linkType: hard
 
@@ -8055,7 +8055,7 @@ __metadata:
   dependencies:
     locate-path: "npm:^5.0.0"
     path-exists: "npm:^4.0.0"
-  checksum: 0406ee89ebeefa2d507feb07ec366bebd8a6167ae74aa4e34fb4c4abd06cf782a3ce26ae4194d70706f72182841733f00551c209fe575cb00bd92104056e78c1
+  checksum: 10c0/0406ee89ebeefa2d507feb07ec366bebd8a6167ae74aa4e34fb4c4abd06cf782a3ce26ae4194d70706f72182841733f00551c209fe575cb00bd92104056e78c1
   languageName: node
   linkType: hard
 
@@ -8065,7 +8065,7 @@ __metadata:
   dependencies:
     locate-path: "npm:^6.0.0"
     path-exists: "npm:^4.0.0"
-  checksum: 062c5a83a9c02f53cdd6d175a37ecf8f87ea5bbff1fdfb828f04bfa021441bc7583e8ebc0872a4c1baab96221fb8a8a275a19809fb93fbc40bd69ec35634069a
+  checksum: 10c0/062c5a83a9c02f53cdd6d175a37ecf8f87ea5bbff1fdfb828f04bfa021441bc7583e8ebc0872a4c1baab96221fb8a8a275a19809fb93fbc40bd69ec35634069a
   languageName: node
   linkType: hard
 
@@ -8077,7 +8077,7 @@ __metadata:
     is-glob: "npm:^4.0.0"
     micromatch: "npm:^3.0.4"
     resolve-dir: "npm:^1.0.1"
-  checksum: ff6f37328a7629775db2abf0fcd40e7c117baf37f23006f206c18bcd9ca0ce99d8c24ae86df540370ec76c1080ab59fe82cb71d2c7c1ad819ccccee726af7e92
+  checksum: 10c0/ff6f37328a7629775db2abf0fcd40e7c117baf37f23006f206c18bcd9ca0ce99d8c24ae86df540370ec76c1080ab59fe82cb71d2c7c1ad819ccccee726af7e92
   languageName: node
   linkType: hard
 
@@ -8088,7 +8088,7 @@ __metadata:
     flatted: "npm:^3.2.9"
     keyv: "npm:^4.5.3"
     rimraf: "npm:^3.0.2"
-  checksum: b76f611bd5f5d68f7ae632e3ae503e678d205cf97a17c6ab5b12f6ca61188b5f1f7464503efae6dc18683ed8f0b41460beb48ac4b9ac63fe6201296a91ba2f75
+  checksum: 10c0/b76f611bd5f5d68f7ae632e3ae503e678d205cf97a17c6ab5b12f6ca61188b5f1f7464503efae6dc18683ed8f0b41460beb48ac4b9ac63fe6201296a91ba2f75
   languageName: node
   linkType: hard
 
@@ -8099,7 +8099,7 @@ __metadata:
     flatted: "npm:^3.2.9"
     keyv: "npm:^4.5.4"
     rimraf: "npm:^5.0.5"
-  checksum: 8f99e27bb3de94e91e7b4ca5120488cdc2b7f8cd952a538f1a566101963057eb42ca318e9fac0d36987dcca34316ff04b61c1dc3dcc8084f6f5e801a52a8e547
+  checksum: 10c0/8f99e27bb3de94e91e7b4ca5120488cdc2b7f8cd952a538f1a566101963057eb42ca318e9fac0d36987dcca34316ff04b61c1dc3dcc8084f6f5e801a52a8e547
   languageName: node
   linkType: hard
 
@@ -8108,14 +8108,14 @@ __metadata:
   resolution: "flat@npm:5.0.2"
   bin:
     flat: cli.js
-  checksum: f178b13482f0cd80c7fede05f4d10585b1f2fdebf26e12edc138e32d3150c6ea6482b7f12813a1091143bad52bb6d3596bca51a162257a21163c0ff438baa5fe
+  checksum: 10c0/f178b13482f0cd80c7fede05f4d10585b1f2fdebf26e12edc138e32d3150c6ea6482b7f12813a1091143bad52bb6d3596bca51a162257a21163c0ff438baa5fe
   languageName: node
   linkType: hard
 
 "flatted@npm:^3.2.9":
   version: 3.2.9
   resolution: "flatted@npm:3.2.9"
-  checksum: 5c91c5a0a21bbc0b07b272231e5b4efe6b822bcb4ad317caf6bb06984be4042a9e9045026307da0fdb4583f1f545e317a67ef1231a59e71f7fced3cc429cfc53
+  checksum: 10c0/5c91c5a0a21bbc0b07b272231e5b4efe6b822bcb4ad317caf6bb06984be4042a9e9045026307da0fdb4583f1f545e317a67ef1231a59e71f7fced3cc429cfc53
   languageName: node
   linkType: hard
 
@@ -8125,14 +8125,14 @@ __metadata:
   peerDependenciesMeta:
     debug:
       optional: true
-  checksum: 5f37ed9170c9eb19448c5418fdb0f2b73f644b5364834e70791a76ecc7db215246f9773bbef4852cfae4067764ffc852e047f744b661b0211532155b73556a6a
+  checksum: 10c0/5f37ed9170c9eb19448c5418fdb0f2b73f644b5364834e70791a76ecc7db215246f9773bbef4852cfae4067764ffc852e047f744b661b0211532155b73556a6a
   languageName: node
   linkType: hard
 
 "font-awesome@npm:^4.7.0":
   version: 4.7.0
   resolution: "font-awesome@npm:4.7.0"
-  checksum: 1c456e2939c55192eed67db9c0efb8db3e92fd357ca189ca00030eb44acffa1e9f835288d2204c14b9a9c490a7b14b7090dfaff80ded6b2473f50a923dfb41e7
+  checksum: 10c0/1c456e2939c55192eed67db9c0efb8db3e92fd357ca189ca00030eb44acffa1e9f835288d2204c14b9a9c490a7b14b7090dfaff80ded6b2473f50a923dfb41e7
   languageName: node
   linkType: hard
 
@@ -8141,14 +8141,14 @@ __metadata:
   resolution: "for-each@npm:0.3.3"
   dependencies:
     is-callable: "npm:^1.1.3"
-  checksum: 22330d8a2db728dbf003ec9182c2d421fbcd2969b02b4f97ec288721cda63eb28f2c08585ddccd0f77cb2930af8d958005c9e72f47141dc51816127a118f39aa
+  checksum: 10c0/22330d8a2db728dbf003ec9182c2d421fbcd2969b02b4f97ec288721cda63eb28f2c08585ddccd0f77cb2930af8d958005c9e72f47141dc51816127a118f39aa
   languageName: node
   linkType: hard
 
 "for-in@npm:^1.0.2":
   version: 1.0.2
   resolution: "for-in@npm:1.0.2"
-  checksum: 42bb609d564b1dc340e1996868b67961257fd03a48d7fdafd4f5119530b87f962be6b4d5b7e3a3fc84c9854d149494b1d358e0b0ce9837e64c4c6603a49451d6
+  checksum: 10c0/42bb609d564b1dc340e1996868b67961257fd03a48d7fdafd4f5119530b87f962be6b4d5b7e3a3fc84c9854d149494b1d358e0b0ce9837e64c4c6603a49451d6
   languageName: node
   linkType: hard
 
@@ -8158,7 +8158,7 @@ __metadata:
   dependencies:
     cross-spawn: "npm:^7.0.0"
     signal-exit: "npm:^4.0.1"
-  checksum: 9700a0285628abaeb37007c9a4d92bd49f67210f09067638774338e146c8e9c825c5c877f072b2f75f41dc6a2d0be8664f79ffc03f6576649f54a84fb9b47de0
+  checksum: 10c0/9700a0285628abaeb37007c9a4d92bd49f67210f09067638774338e146c8e9c825c5c877f072b2f75f41dc6a2d0be8664f79ffc03f6576649f54a84fb9b47de0
   languageName: node
   linkType: hard
 
@@ -8169,21 +8169,21 @@ __metadata:
     asynckit: "npm:^0.4.0"
     combined-stream: "npm:^1.0.8"
     mime-types: "npm:^2.1.12"
-  checksum: cb6f3ac49180be03ff07ba3ff125f9eba2ff0b277fb33c7fc47569fc5e616882c5b1c69b9904c4c4187e97dd0419dd03b134174756f296dec62041e6527e2c6e
+  checksum: 10c0/cb6f3ac49180be03ff07ba3ff125f9eba2ff0b277fb33c7fc47569fc5e616882c5b1c69b9904c4c4187e97dd0419dd03b134174756f296dec62041e6527e2c6e
   languageName: node
   linkType: hard
 
 "forwarded@npm:0.2.0":
   version: 0.2.0
   resolution: "forwarded@npm:0.2.0"
-  checksum: 9b67c3fac86acdbc9ae47ba1ddd5f2f81526fa4c8226863ede5600a3f7c7416ef451f6f1e240a3cc32d0fd79fcfe6beb08fd0da454f360032bde70bf80afbb33
+  checksum: 10c0/9b67c3fac86acdbc9ae47ba1ddd5f2f81526fa4c8226863ede5600a3f7c7416ef451f6f1e240a3cc32d0fd79fcfe6beb08fd0da454f360032bde70bf80afbb33
   languageName: node
   linkType: hard
 
 "fraction.js@npm:^4.3.7":
   version: 4.3.7
   resolution: "fraction.js@npm:4.3.7"
-  checksum: df291391beea9ab4c263487ffd9d17fed162dbb736982dee1379b2a8cc94e4e24e46ed508c6d278aded9080ba51872f1bc5f3a5fd8d7c74e5f105b508ac28711
+  checksum: 10c0/df291391beea9ab4c263487ffd9d17fed162dbb736982dee1379b2a8cc94e4e24e46ed508c6d278aded9080ba51872f1bc5f3a5fd8d7c74e5f105b508ac28711
   languageName: node
   linkType: hard
 
@@ -8192,14 +8192,14 @@ __metadata:
   resolution: "fragment-cache@npm:0.2.1"
   dependencies:
     map-cache: "npm:^0.2.2"
-  checksum: 5891d1c1d1d5e1a7fb3ccf28515c06731476fa88f7a50f4ede8a0d8d239a338448e7f7cc8b73db48da19c229fa30066104fe6489862065a4f1ed591c42fbeabf
+  checksum: 10c0/5891d1c1d1d5e1a7fb3ccf28515c06731476fa88f7a50f4ede8a0d8d239a338448e7f7cc8b73db48da19c229fa30066104fe6489862065a4f1ed591c42fbeabf
   languageName: node
   linkType: hard
 
 "fresh@npm:0.5.2":
   version: 0.5.2
   resolution: "fresh@npm:0.5.2"
-  checksum: c6d27f3ed86cc5b601404822f31c900dd165ba63fff8152a3ef714e2012e7535027063bc67ded4cb5b3a49fa596495d46cacd9f47d6328459cf570f08b7d9e5a
+  checksum: 10c0/c6d27f3ed86cc5b601404822f31c900dd165ba63fff8152a3ef714e2012e7535027063bc67ded4cb5b3a49fa596495d46cacd9f47d6328459cf570f08b7d9e5a
   languageName: node
   linkType: hard
 
@@ -8211,7 +8211,7 @@ __metadata:
     graceful-fs: "npm:^4.2.0"
     jsonfile: "npm:^6.0.1"
     universalify: "npm:^2.0.0"
-  checksum: 9b808bd884beff5cb940773018179a6b94a966381d005479f00adda6b44e5e3d4abf765135773d849cc27efe68c349e4a7b86acd7d3306d5932c14f3a4b17a92
+  checksum: 10c0/9b808bd884beff5cb940773018179a6b94a966381d005479f00adda6b44e5e3d4abf765135773d849cc27efe68c349e4a7b86acd7d3306d5932c14f3a4b17a92
   languageName: node
   linkType: hard
 
@@ -8220,7 +8220,7 @@ __metadata:
   resolution: "fs-minipass@npm:2.1.0"
   dependencies:
     minipass: "npm:^3.0.0"
-  checksum: 703d16522b8282d7299337539c3ed6edddd1afe82435e4f5b76e34a79cd74e488a8a0e26a636afc2440e1a23b03878e2122e3a2cfe375a5cf63c37d92b86a004
+  checksum: 10c0/703d16522b8282d7299337539c3ed6edddd1afe82435e4f5b76e34a79cd74e488a8a0e26a636afc2440e1a23b03878e2122e3a2cfe375a5cf63c37d92b86a004
   languageName: node
   linkType: hard
 
@@ -8229,14 +8229,14 @@ __metadata:
   resolution: "fs-minipass@npm:3.0.3"
   dependencies:
     minipass: "npm:^7.0.3"
-  checksum: 63e80da2ff9b621e2cb1596abcb9207f1cf82b968b116ccd7b959e3323144cce7fb141462200971c38bbf2ecca51695069db45265705bed09a7cd93ae5b89f94
+  checksum: 10c0/63e80da2ff9b621e2cb1596abcb9207f1cf82b968b116ccd7b959e3323144cce7fb141462200971c38bbf2ecca51695069db45265705bed09a7cd93ae5b89f94
   languageName: node
   linkType: hard
 
 "fs.realpath@npm:^1.0.0":
   version: 1.0.0
   resolution: "fs.realpath@npm:1.0.0"
-  checksum: 444cf1291d997165dfd4c0d58b69f0e4782bfd9149fd72faa4fe299e68e0e93d6db941660b37dd29153bf7186672ececa3b50b7e7249477b03fdf850f287c948
+  checksum: 10c0/444cf1291d997165dfd4c0d58b69f0e4782bfd9149fd72faa4fe299e68e0e93d6db941660b37dd29153bf7186672ececa3b50b7e7249477b03fdf850f287c948
   languageName: node
   linkType: hard
 
@@ -8246,7 +8246,7 @@ __metadata:
   dependencies:
     bindings: "npm:^1.5.0"
     nan: "npm:^2.12.1"
-  checksum: 4427ff08db9ee7327f2c3ad58ec56f9096a917eed861bfffaa2e2be419479cdf37d00750869ab9ecbf5f59f32ad999bd59577d73fc639193e6c0ce52bb253e02
+  checksum: 10c0/4427ff08db9ee7327f2c3ad58ec56f9096a917eed861bfffaa2e2be419479cdf37d00750869ab9ecbf5f59f32ad999bd59577d73fc639193e6c0ce52bb253e02
   conditions: os=darwin
   languageName: node
   linkType: hard
@@ -8256,7 +8256,7 @@ __metadata:
   resolution: "fsevents@npm:2.3.3"
   dependencies:
     node-gyp: "npm:latest"
-  checksum: a1f0c44595123ed717febbc478aa952e47adfc28e2092be66b8ab1635147254ca6cfe1df792a8997f22716d4cbafc73309899ff7bfac2ac3ad8cf2e4ecc3ec60
+  checksum: 10c0/a1f0c44595123ed717febbc478aa952e47adfc28e2092be66b8ab1635147254ca6cfe1df792a8997f22716d4cbafc73309899ff7bfac2ac3ad8cf2e4ecc3ec60
   conditions: os=darwin
   languageName: node
   linkType: hard
@@ -8283,7 +8283,7 @@ __metadata:
 "function-bind@npm:^1.1.1, function-bind@npm:^1.1.2":
   version: 1.1.2
   resolution: "function-bind@npm:1.1.2"
-  checksum: d8680ee1e5fcd4c197e4ac33b2b4dce03c71f4d91717292785703db200f5c21f977c568d28061226f9b5900cbcd2c84463646134fd5337e7925e0942bc3f46d5
+  checksum: 10c0/d8680ee1e5fcd4c197e4ac33b2b4dce03c71f4d91717292785703db200f5c21f977c568d28061226f9b5900cbcd2c84463646134fd5337e7925e0942bc3f46d5
   languageName: node
   linkType: hard
 
@@ -8295,42 +8295,42 @@ __metadata:
     define-properties: "npm:^1.2.0"
     es-abstract: "npm:^1.22.1"
     functions-have-names: "npm:^1.2.3"
-  checksum: 9eae11294905b62cb16874adb4fc687927cda3162285e0ad9612e6a1d04934005d46907362ea9cdb7428edce05a2f2c3dabc3b2d21e9fd343e9bb278230ad94b
+  checksum: 10c0/9eae11294905b62cb16874adb4fc687927cda3162285e0ad9612e6a1d04934005d46907362ea9cdb7428edce05a2f2c3dabc3b2d21e9fd343e9bb278230ad94b
   languageName: node
   linkType: hard
 
 "functions-have-names@npm:^1.2.3":
   version: 1.2.3
   resolution: "functions-have-names@npm:1.2.3"
-  checksum: 33e77fd29bddc2d9bb78ab3eb854c165909201f88c75faa8272e35899e2d35a8a642a15e7420ef945e1f64a9670d6aa3ec744106b2aa42be68ca5114025954ca
+  checksum: 10c0/33e77fd29bddc2d9bb78ab3eb854c165909201f88c75faa8272e35899e2d35a8a642a15e7420ef945e1f64a9670d6aa3ec744106b2aa42be68ca5114025954ca
   languageName: node
   linkType: hard
 
 "fuzzysort@npm:^2.0.4":
   version: 2.0.4
   resolution: "fuzzysort@npm:2.0.4"
-  checksum: 3170d16fccc0f4ac5e31323dbab7d0da7b1a4024878ed4d6b4ec86c0df94e12dc335f8d4181e38d97ca7919ac51bc5de4a9c2ec94914a4e51f9e9c05208c9ea9
+  checksum: 10c0/3170d16fccc0f4ac5e31323dbab7d0da7b1a4024878ed4d6b4ec86c0df94e12dc335f8d4181e38d97ca7919ac51bc5de4a9c2ec94914a4e51f9e9c05208c9ea9
   languageName: node
   linkType: hard
 
 "gensync@npm:^1.0.0-beta.2":
   version: 1.0.0-beta.2
   resolution: "gensync@npm:1.0.0-beta.2"
-  checksum: 782aba6cba65b1bb5af3b095d96249d20edbe8df32dbf4696fd49be2583faf676173bf4809386588828e4dd76a3354fcbeb577bab1c833ccd9fc4577f26103f8
+  checksum: 10c0/782aba6cba65b1bb5af3b095d96249d20edbe8df32dbf4696fd49be2583faf676173bf4809386588828e4dd76a3354fcbeb577bab1c833ccd9fc4577f26103f8
   languageName: node
   linkType: hard
 
 "get-caller-file@npm:^2.0.1, get-caller-file@npm:^2.0.5":
   version: 2.0.5
   resolution: "get-caller-file@npm:2.0.5"
-  checksum: c6c7b60271931fa752aeb92f2b47e355eac1af3a2673f47c9589e8f8a41adc74d45551c1bc57b5e66a80609f10ffb72b6f575e4370d61cc3f7f3aaff01757cde
+  checksum: 10c0/c6c7b60271931fa752aeb92f2b47e355eac1af3a2673f47c9589e8f8a41adc74d45551c1bc57b5e66a80609f10ffb72b6f575e4370d61cc3f7f3aaff01757cde
   languageName: node
   linkType: hard
 
 "get-east-asian-width@npm:^1.0.0":
   version: 1.2.0
   resolution: "get-east-asian-width@npm:1.2.0"
-  checksum: 914b1e217cf38436c24b4c60b4c45289e39a45bf9e65ef9fd343c2815a1a02b8a0215aeec8bf9c07c516089004b6e3826332481f40a09529fcadbf6e579f286b
+  checksum: 10c0/914b1e217cf38436c24b4c60b4c45289e39a45bf9e65ef9fd343c2815a1a02b8a0215aeec8bf9c07c516089004b6e3826332481f40a09529fcadbf6e579f286b
   languageName: node
   linkType: hard
 
@@ -8342,21 +8342,21 @@ __metadata:
     has-proto: "npm:^1.0.1"
     has-symbols: "npm:^1.0.3"
     hasown: "npm:^2.0.0"
-  checksum: 4e7fb8adc6172bae7c4fe579569b4d5238b3667c07931cd46b4eee74bbe6ff6b91329bec311a638d8e60f5b51f44fe5445693c6be89ae88d4b5c49f7ff12db0b
+  checksum: 10c0/4e7fb8adc6172bae7c4fe579569b4d5238b3667c07931cd46b4eee74bbe6ff6b91329bec311a638d8e60f5b51f44fe5445693c6be89ae88d4b5c49f7ff12db0b
   languageName: node
   linkType: hard
 
 "get-own-enumerable-property-symbols@npm:^3.0.0":
   version: 3.0.2
   resolution: "get-own-enumerable-property-symbols@npm:3.0.2"
-  checksum: 103999855f3d1718c631472437161d76962cbddcd95cc642a34c07bfb661ed41b6c09a9c669ccdff89ee965beb7126b80eec7b2101e20e31e9cc6c4725305e10
+  checksum: 10c0/103999855f3d1718c631472437161d76962cbddcd95cc642a34c07bfb661ed41b6c09a9c669ccdff89ee965beb7126b80eec7b2101e20e31e9cc6c4725305e10
   languageName: node
   linkType: hard
 
 "get-package-type@npm:^0.1.0":
   version: 0.1.0
   resolution: "get-package-type@npm:0.1.0"
-  checksum: e34cdf447fdf1902a1f6d5af737eaadf606d2ee3518287abde8910e04159368c268568174b2e71102b87b26c2020486f126bfca9c4fb1ceb986ff99b52ecd1be
+  checksum: 10c0/e34cdf447fdf1902a1f6d5af737eaadf606d2ee3518287abde8910e04159368c268568174b2e71102b87b26c2020486f126bfca9c4fb1ceb986ff99b52ecd1be
   languageName: node
   linkType: hard
 
@@ -8365,21 +8365,21 @@ __metadata:
   resolution: "get-stream@npm:4.1.0"
   dependencies:
     pump: "npm:^3.0.0"
-  checksum: 294d876f667694a5ca23f0ca2156de67da950433b6fb53024833733975d32582896dbc7f257842d331809979efccf04d5e0b6b75ad4d45744c45f193fd497539
+  checksum: 10c0/294d876f667694a5ca23f0ca2156de67da950433b6fb53024833733975d32582896dbc7f257842d331809979efccf04d5e0b6b75ad4d45744c45f193fd497539
   languageName: node
   linkType: hard
 
 "get-stream@npm:^6.0.0, get-stream@npm:^6.0.1":
   version: 6.0.1
   resolution: "get-stream@npm:6.0.1"
-  checksum: 49825d57d3fd6964228e6200a58169464b8e8970489b3acdc24906c782fb7f01f9f56f8e6653c4a50713771d6658f7cfe051e5eb8c12e334138c9c918b296341
+  checksum: 10c0/49825d57d3fd6964228e6200a58169464b8e8970489b3acdc24906c782fb7f01f9f56f8e6653c4a50713771d6658f7cfe051e5eb8c12e334138c9c918b296341
   languageName: node
   linkType: hard
 
 "get-stream@npm:^8.0.1":
   version: 8.0.1
   resolution: "get-stream@npm:8.0.1"
-  checksum: 5c2181e98202b9dae0bb4a849979291043e5892eb40312b47f0c22b9414fc9b28a3b6063d2375705eb24abc41ecf97894d9a51f64ff021511b504477b27b4290
+  checksum: 10c0/5c2181e98202b9dae0bb4a849979291043e5892eb40312b47f0c22b9414fc9b28a3b6063d2375705eb24abc41ecf97894d9a51f64ff021511b504477b27b4290
   languageName: node
   linkType: hard
 
@@ -8389,7 +8389,7 @@ __metadata:
   dependencies:
     call-bind: "npm:^1.0.2"
     get-intrinsic: "npm:^1.1.1"
-  checksum: 23bc3b44c221cdf7669a88230c62f4b9e30393b61eb21ba4400cb3e346801bd8f95fe4330ee78dbae37aecd874646d53e3e76a17a654d0c84c77f6690526d6bb
+  checksum: 10c0/23bc3b44c221cdf7669a88230c62f4b9e30393b61eb21ba4400cb3e346801bd8f95fe4330ee78dbae37aecd874646d53e3e76a17a654d0c84c77f6690526d6bb
   languageName: node
   linkType: hard
 
@@ -8398,14 +8398,14 @@ __metadata:
   resolution: "get-tsconfig@npm:4.7.2"
   dependencies:
     resolve-pkg-maps: "npm:^1.0.0"
-  checksum: 169b2beababfbb16e8a0ae813ee59d3e14d4960231c816615161ab5be68ec07a394dce59695742ac84295e2efab8d9e89bcf3abaf5e253dfbec3496e01bb9a65
+  checksum: 10c0/169b2beababfbb16e8a0ae813ee59d3e14d4960231c816615161ab5be68ec07a394dce59695742ac84295e2efab8d9e89bcf3abaf5e253dfbec3496e01bb9a65
   languageName: node
   linkType: hard
 
 "get-value@npm:^2.0.3, get-value@npm:^2.0.6":
   version: 2.0.6
   resolution: "get-value@npm:2.0.6"
-  checksum: f069c132791b357c8fc4adfe9e2929b0a2c6e95f98ca7bc6fcbc27f8a302e552f86b4ae61ec56d9e9ac2544b93b6a39743d479866a37b43fcc104088ba74f0d9
+  checksum: 10c0/f069c132791b357c8fc4adfe9e2929b0a2c6e95f98ca7bc6fcbc27f8a302e552f86b4ae61ec56d9e9ac2544b93b6a39743d479866a37b43fcc104088ba74f0d9
   languageName: node
   linkType: hard
 
@@ -8415,7 +8415,7 @@ __metadata:
   dependencies:
     is-glob: "npm:^3.1.0"
     path-dirname: "npm:^1.0.0"
-  checksum: bfa89ce5ae1dfea4c2ece7b61d2ea230d87fcbec7472915cfdb3f4caf688a91ecb0dc86ae39b1e17505adce7e64cae3b971d64dc66091f3a0131169fd631b00d
+  checksum: 10c0/bfa89ce5ae1dfea4c2ece7b61d2ea230d87fcbec7472915cfdb3f4caf688a91ecb0dc86ae39b1e17505adce7e64cae3b971d64dc66091f3a0131169fd631b00d
   languageName: node
   linkType: hard
 
@@ -8424,7 +8424,7 @@ __metadata:
   resolution: "glob-parent@npm:5.1.2"
   dependencies:
     is-glob: "npm:^4.0.1"
-  checksum: cab87638e2112bee3f839ef5f6e0765057163d39c66be8ec1602f3823da4692297ad4e972de876ea17c44d652978638d2fd583c6713d0eb6591706825020c9ee
+  checksum: 10c0/cab87638e2112bee3f839ef5f6e0765057163d39c66be8ec1602f3823da4692297ad4e972de876ea17c44d652978638d2fd583c6713d0eb6591706825020c9ee
   languageName: node
   linkType: hard
 
@@ -8433,7 +8433,7 @@ __metadata:
   resolution: "glob-parent@npm:6.0.2"
   dependencies:
     is-glob: "npm:^4.0.3"
-  checksum: 317034d88654730230b3f43bb7ad4f7c90257a426e872ea0bf157473ac61c99bf5d205fad8f0185f989be8d2fa6d3c7dce1645d99d545b6ea9089c39f838e7f8
+  checksum: 10c0/317034d88654730230b3f43bb7ad4f7c90257a426e872ea0bf157473ac61c99bf5d205fad8f0185f989be8d2fa6d3c7dce1645d99d545b6ea9089c39f838e7f8
   languageName: node
   linkType: hard
 
@@ -8448,7 +8448,7 @@ __metadata:
     path-scurry: "npm:^1.10.1"
   bin:
     glob: dist/esm/bin.mjs
-  checksum: 13d8a1feb7eac7945f8c8480e11cd4a44b24d26503d99a8d8ac8d5aefbf3e9802a2b6087318a829fad04cb4e829f25c5f4f1110c68966c498720dd261c7e344d
+  checksum: 10c0/13d8a1feb7eac7945f8c8480e11cd4a44b24d26503d99a8d8ac8d5aefbf3e9802a2b6087318a829fad04cb4e829f25c5f4f1110c68966c498720dd261c7e344d
   languageName: node
   linkType: hard
 
@@ -8462,7 +8462,7 @@ __metadata:
     minimatch: "npm:^3.1.1"
     once: "npm:^1.3.0"
     path-is-absolute: "npm:^1.0.0"
-  checksum: 65676153e2b0c9095100fe7f25a778bf45608eeb32c6048cf307f579649bcc30353277b3b898a3792602c65764e5baa4f643714dfbdfd64ea271d210c7a425fe
+  checksum: 10c0/65676153e2b0c9095100fe7f25a778bf45608eeb32c6048cf307f579649bcc30353277b3b898a3792602c65764e5baa4f643714dfbdfd64ea271d210c7a425fe
   languageName: node
   linkType: hard
 
@@ -8473,7 +8473,7 @@ __metadata:
     global-prefix: "npm:^1.0.1"
     is-windows: "npm:^1.0.1"
     resolve-dir: "npm:^1.0.0"
-  checksum: 7d91ecf78d4fcbc966b2d89c1400df273afea795bc8cadf39857ee1684e442065621fd79413ff5fcd9e90c6f1b2dc0123e644fa0b7811f987fd54c6b9afad858
+  checksum: 10c0/7d91ecf78d4fcbc966b2d89c1400df273afea795bc8cadf39857ee1684e442065621fd79413ff5fcd9e90c6f1b2dc0123e644fa0b7811f987fd54c6b9afad858
   languageName: node
   linkType: hard
 
@@ -8482,7 +8482,7 @@ __metadata:
   resolution: "global-modules@npm:2.0.0"
   dependencies:
     global-prefix: "npm:^3.0.0"
-  checksum: 43b770fe24aa6028f4b9770ea583a47f39750be15cf6e2578f851e4ccc9e4fa674b8541928c0b09c21461ca0763f0d36e4068cec86c914b07fd6e388e66ba5b9
+  checksum: 10c0/43b770fe24aa6028f4b9770ea583a47f39750be15cf6e2578f851e4ccc9e4fa674b8541928c0b09c21461ca0763f0d36e4068cec86c914b07fd6e388e66ba5b9
   languageName: node
   linkType: hard
 
@@ -8495,7 +8495,7 @@ __metadata:
     ini: "npm:^1.3.4"
     is-windows: "npm:^1.0.1"
     which: "npm:^1.2.14"
-  checksum: d8037e300f1dc04d5d410d16afa662e71bfad22dcceba6c9727bb55cc273b8988ca940b3402f62e5392fd261dd9924a9a73a865ef2000219461f31f3fc86be06
+  checksum: 10c0/d8037e300f1dc04d5d410d16afa662e71bfad22dcceba6c9727bb55cc273b8988ca940b3402f62e5392fd261dd9924a9a73a865ef2000219461f31f3fc86be06
   languageName: node
   linkType: hard
 
@@ -8506,14 +8506,14 @@ __metadata:
     ini: "npm:^1.3.5"
     kind-of: "npm:^6.0.2"
     which: "npm:^1.3.1"
-  checksum: 510f489fb68d1cc7060f276541709a0ee6d41356ef852de48f7906c648ac223082a1cc8fce86725ca6c0e032bcdc1189ae77b4744a624b29c34a9d0ece498269
+  checksum: 10c0/510f489fb68d1cc7060f276541709a0ee6d41356ef852de48f7906c648ac223082a1cc8fce86725ca6c0e032bcdc1189ae77b4744a624b29c34a9d0ece498269
   languageName: node
   linkType: hard
 
 "globals@npm:^11.1.0":
   version: 11.12.0
   resolution: "globals@npm:11.12.0"
-  checksum: 758f9f258e7b19226bd8d4af5d3b0dcf7038780fb23d82e6f98932c44e239f884847f1766e8fa9cc5635ccb3204f7fa7314d4408dd4002a5e8ea827b4018f0a1
+  checksum: 10c0/758f9f258e7b19226bd8d4af5d3b0dcf7038780fb23d82e6f98932c44e239f884847f1766e8fa9cc5635ccb3204f7fa7314d4408dd4002a5e8ea827b4018f0a1
   languageName: node
   linkType: hard
 
@@ -8522,7 +8522,7 @@ __metadata:
   resolution: "globals@npm:13.23.0"
   dependencies:
     type-fest: "npm:^0.20.2"
-  checksum: fc05e184b3be59bffa2580f28551a12a758c3a18df4be91444202982c76f13f52821ad54ffaf7d3f2a4d2498fdf54aeaca8d4540fd9e860a9edb09d34ef4c507
+  checksum: 10c0/fc05e184b3be59bffa2580f28551a12a758c3a18df4be91444202982c76f13f52821ad54ffaf7d3f2a4d2498fdf54aeaca8d4540fd9e860a9edb09d34ef4c507
   languageName: node
   linkType: hard
 
@@ -8531,7 +8531,7 @@ __metadata:
   resolution: "globalthis@npm:1.0.3"
   dependencies:
     define-properties: "npm:^1.1.3"
-  checksum: 0db6e9af102a5254630351557ac15e6909bc7459d3e3f6b001e59fe784c96d31108818f032d9095739355a88467459e6488ff16584ee6250cd8c27dec05af4b0
+  checksum: 10c0/0db6e9af102a5254630351557ac15e6909bc7459d3e3f6b001e59fe784c96d31108818f032d9095739355a88467459e6488ff16584ee6250cd8c27dec05af4b0
   languageName: node
   linkType: hard
 
@@ -8545,7 +8545,7 @@ __metadata:
     ignore: "npm:^5.2.0"
     merge2: "npm:^1.4.1"
     slash: "npm:^3.0.0"
-  checksum: b39511b4afe4bd8a7aead3a27c4ade2b9968649abab0a6c28b1a90141b96ca68ca5db1302f7c7bd29eab66bf51e13916b8e0a3d0ac08f75e1e84a39b35691189
+  checksum: 10c0/b39511b4afe4bd8a7aead3a27c4ade2b9968649abab0a6c28b1a90141b96ca68ca5db1302f7c7bd29eab66bf51e13916b8e0a3d0ac08f75e1e84a39b35691189
   languageName: node
   linkType: hard
 
@@ -8558,14 +8558,14 @@ __metadata:
     object-assign: "npm:^4.0.1"
     pify: "npm:^2.0.0"
     pinkie-promise: "npm:^2.0.0"
-  checksum: 656ad1f0d02c6ef378c07589519ed3ec27fe988ea177195c05b8aff280320f3d67b91fa0baa6f7e49288f9bf1f92fc84f783a79ac3ed66278f3fa082e627ed84
+  checksum: 10c0/656ad1f0d02c6ef378c07589519ed3ec27fe988ea177195c05b8aff280320f3d67b91fa0baa6f7e49288f9bf1f92fc84f783a79ac3ed66278f3fa082e627ed84
   languageName: node
   linkType: hard
 
 "globjoin@npm:^0.1.4":
   version: 0.1.4
   resolution: "globjoin@npm:0.1.4"
-  checksum: 236e991b48f1a9869fe2aa7bb5141fb1f32973940567a3c012f8ccb58c3c85ab78ce594d374fa819410fff3b48cfd24584d7ef726939f8a3c3772890e62ea16b
+  checksum: 10c0/236e991b48f1a9869fe2aa7bb5141fb1f32973940567a3c012f8ccb58c3c85ab78ce594d374fa819410fff3b48cfd24584d7ef726939f8a3c3772890e62ea16b
   languageName: node
   linkType: hard
 
@@ -8574,21 +8574,21 @@ __metadata:
   resolution: "gopd@npm:1.0.1"
   dependencies:
     get-intrinsic: "npm:^1.1.3"
-  checksum: 505c05487f7944c552cee72087bf1567debb470d4355b1335f2c262d218ebbff805cd3715448fe29b4b380bae6912561d0467233e4165830efd28da241418c63
+  checksum: 10c0/505c05487f7944c552cee72087bf1567debb470d4355b1335f2c262d218ebbff805cd3715448fe29b4b380bae6912561d0467233e4165830efd28da241418c63
   languageName: node
   linkType: hard
 
 "graceful-fs@npm:^4.1.11, graceful-fs@npm:^4.1.2, graceful-fs@npm:^4.1.6, graceful-fs@npm:^4.2.0, graceful-fs@npm:^4.2.4, graceful-fs@npm:^4.2.6, graceful-fs@npm:^4.2.9":
   version: 4.2.11
   resolution: "graceful-fs@npm:4.2.11"
-  checksum: 386d011a553e02bc594ac2ca0bd6d9e4c22d7fa8cfbfc448a6d148c59ea881b092db9dbe3547ae4b88e55f1b01f7c4a2ecc53b310c042793e63aa44cf6c257f2
+  checksum: 10c0/386d011a553e02bc594ac2ca0bd6d9e4c22d7fa8cfbfc448a6d148c59ea881b092db9dbe3547ae4b88e55f1b01f7c4a2ecc53b310c042793e63aa44cf6c257f2
   languageName: node
   linkType: hard
 
 "graphemer@npm:^1.4.0":
   version: 1.4.0
   resolution: "graphemer@npm:1.4.0"
-  checksum: e951259d8cd2e0d196c72ec711add7115d42eb9a8146c8eeda5b8d3ac91e5dd816b9cd68920726d9fd4490368e7ed86e9c423f40db87e2d8dfafa00fa17c3a31
+  checksum: 10c0/e951259d8cd2e0d196c72ec711add7115d42eb9a8146c8eeda5b8d3ac91e5dd816b9cd68920726d9fd4490368e7ed86e9c423f40db87e2d8dfafa00fa17c3a31
   languageName: node
   linkType: hard
 
@@ -8597,35 +8597,35 @@ __metadata:
   resolution: "gzip-size@npm:6.0.0"
   dependencies:
     duplexer: "npm:^0.1.2"
-  checksum: 4ccb924626c82125897a997d1c84f2377846a6ef57fbee38f7c0e6b41387fba4d00422274440747b58008b5d60114bac2349c2908e9aba55188345281af40a3f
+  checksum: 10c0/4ccb924626c82125897a997d1c84f2377846a6ef57fbee38f7c0e6b41387fba4d00422274440747b58008b5d60114bac2349c2908e9aba55188345281af40a3f
   languageName: node
   linkType: hard
 
 "handle-thing@npm:^2.0.0":
   version: 2.0.1
   resolution: "handle-thing@npm:2.0.1"
-  checksum: 7ae34ba286a3434f1993ebd1cc9c9e6b6d8ea672182db28b1afc0a7119229552fa7031e3e5f3cd32a76430ece4e94b7da6f12af2eb39d6239a7693e4bd63a998
+  checksum: 10c0/7ae34ba286a3434f1993ebd1cc9c9e6b6d8ea672182db28b1afc0a7119229552fa7031e3e5f3cd32a76430ece4e94b7da6f12af2eb39d6239a7693e4bd63a998
   languageName: node
   linkType: hard
 
 "has-bigints@npm:^1.0.1, has-bigints@npm:^1.0.2":
   version: 1.0.2
   resolution: "has-bigints@npm:1.0.2"
-  checksum: 724eb1485bfa3cdff6f18d95130aa190561f00b3fcf9f19dc640baf8176b5917c143b81ec2123f8cddb6c05164a198c94b13e1377c497705ccc8e1a80306e83b
+  checksum: 10c0/724eb1485bfa3cdff6f18d95130aa190561f00b3fcf9f19dc640baf8176b5917c143b81ec2123f8cddb6c05164a198c94b13e1377c497705ccc8e1a80306e83b
   languageName: node
   linkType: hard
 
 "has-flag@npm:^3.0.0":
   version: 3.0.0
   resolution: "has-flag@npm:3.0.0"
-  checksum: 1c6c83b14b8b1b3c25b0727b8ba3e3b647f99e9e6e13eb7322107261de07a4c1be56fc0d45678fc376e09772a3a1642ccdaf8fc69bdf123b6c086598397ce473
+  checksum: 10c0/1c6c83b14b8b1b3c25b0727b8ba3e3b647f99e9e6e13eb7322107261de07a4c1be56fc0d45678fc376e09772a3a1642ccdaf8fc69bdf123b6c086598397ce473
   languageName: node
   linkType: hard
 
 "has-flag@npm:^4.0.0":
   version: 4.0.0
   resolution: "has-flag@npm:4.0.0"
-  checksum: 2e789c61b7888d66993e14e8331449e525ef42aac53c627cc53d1c3334e768bcb6abdc4f5f0de1478a25beec6f0bd62c7549058b7ac53e924040d4f301f02fd1
+  checksum: 10c0/2e789c61b7888d66993e14e8331449e525ef42aac53c627cc53d1c3334e768bcb6abdc4f5f0de1478a25beec6f0bd62c7549058b7ac53e924040d4f301f02fd1
   languageName: node
   linkType: hard
 
@@ -8634,21 +8634,21 @@ __metadata:
   resolution: "has-property-descriptors@npm:1.0.0"
   dependencies:
     get-intrinsic: "npm:^1.1.1"
-  checksum: d4ca882b6960d6257bd28baa3ddfa21f068d260411004a093b30ca357c740e11e985771c85216a6d1eef4161e862657f48c4758ec8ab515223b3895200ad164b
+  checksum: 10c0/d4ca882b6960d6257bd28baa3ddfa21f068d260411004a093b30ca357c740e11e985771c85216a6d1eef4161e862657f48c4758ec8ab515223b3895200ad164b
   languageName: node
   linkType: hard
 
 "has-proto@npm:^1.0.1":
   version: 1.0.1
   resolution: "has-proto@npm:1.0.1"
-  checksum: c8a8fe411f810b23a564bd5546a8f3f0fff6f1b692740eb7a2fdc9df716ef870040806891e2f23ff4653f1083e3895bf12088703dd1a0eac3d9202d3a4768cd0
+  checksum: 10c0/c8a8fe411f810b23a564bd5546a8f3f0fff6f1b692740eb7a2fdc9df716ef870040806891e2f23ff4653f1083e3895bf12088703dd1a0eac3d9202d3a4768cd0
   languageName: node
   linkType: hard
 
 "has-symbols@npm:^1.0.1, has-symbols@npm:^1.0.2, has-symbols@npm:^1.0.3":
   version: 1.0.3
   resolution: "has-symbols@npm:1.0.3"
-  checksum: e6922b4345a3f37069cdfe8600febbca791c94988c01af3394d86ca3360b4b93928bbf395859158f88099cb10b19d98e3bbab7c9ff2c1bd09cf665ee90afa2c3
+  checksum: 10c0/e6922b4345a3f37069cdfe8600febbca791c94988c01af3394d86ca3360b4b93928bbf395859158f88099cb10b19d98e3bbab7c9ff2c1bd09cf665ee90afa2c3
   languageName: node
   linkType: hard
 
@@ -8657,7 +8657,7 @@ __metadata:
   resolution: "has-tostringtag@npm:1.0.0"
   dependencies:
     has-symbols: "npm:^1.0.2"
-  checksum: 1cdba76b7d13f65198a92b8ca1560ba40edfa09e85d182bf436d928f3588a9ebd260451d569f0ed1b849c4bf54f49c862aa0d0a77f9552b1855bb6deb526c011
+  checksum: 10c0/1cdba76b7d13f65198a92b8ca1560ba40edfa09e85d182bf436d928f3588a9ebd260451d569f0ed1b849c4bf54f49c862aa0d0a77f9552b1855bb6deb526c011
   languageName: node
   linkType: hard
 
@@ -8668,7 +8668,7 @@ __metadata:
     get-value: "npm:^2.0.3"
     has-values: "npm:^0.1.4"
     isobject: "npm:^2.0.0"
-  checksum: 7a7c2e9d07bc9742c81806150adb154d149bc6155267248c459cd1ce2a64b0759980d26213260e4b7599c8a3754551179f155ded88d0533a0d2bc7bc29028432
+  checksum: 10c0/7a7c2e9d07bc9742c81806150adb154d149bc6155267248c459cd1ce2a64b0759980d26213260e4b7599c8a3754551179f155ded88d0533a0d2bc7bc29028432
   languageName: node
   linkType: hard
 
@@ -8679,14 +8679,14 @@ __metadata:
     get-value: "npm:^2.0.6"
     has-values: "npm:^1.0.0"
     isobject: "npm:^3.0.0"
-  checksum: 17cdccaf50f8aac80a109dba2e2ee5e800aec9a9d382ef9deab66c56b34269e4c9ac720276d5ffa722764304a1180ae436df077da0dd05548cfae0209708ba4d
+  checksum: 10c0/17cdccaf50f8aac80a109dba2e2ee5e800aec9a9d382ef9deab66c56b34269e4c9ac720276d5ffa722764304a1180ae436df077da0dd05548cfae0209708ba4d
   languageName: node
   linkType: hard
 
 "has-values@npm:^0.1.4":
   version: 0.1.4
   resolution: "has-values@npm:0.1.4"
-  checksum: a8f00ad862c20289798c35243d5bd0b0a97dd44b668c2204afe082e0265f2d0bf3b89fc8cc0ef01a52b49f10aa35cf85c336ee3a5f1cac96ed490f5e901cdbf2
+  checksum: 10c0/a8f00ad862c20289798c35243d5bd0b0a97dd44b668c2204afe082e0265f2d0bf3b89fc8cc0ef01a52b49f10aa35cf85c336ee3a5f1cac96ed490f5e901cdbf2
   languageName: node
   linkType: hard
 
@@ -8696,14 +8696,14 @@ __metadata:
   dependencies:
     is-number: "npm:^3.0.0"
     kind-of: "npm:^4.0.0"
-  checksum: a6f2a1cc6b2e43eacc68e62e71ad6890def7f4b13d2ef06b4ad3ee156c23e470e6df144b9b467701908e17633411f1075fdff0cab45fb66c5e0584d89b25f35e
+  checksum: 10c0/a6f2a1cc6b2e43eacc68e62e71ad6890def7f4b13d2ef06b4ad3ee156c23e470e6df144b9b467701908e17633411f1075fdff0cab45fb66c5e0584d89b25f35e
   languageName: node
   linkType: hard
 
 "has@npm:^1.0.3":
   version: 1.0.4
   resolution: "has@npm:1.0.4"
-  checksum: 82c1220573dc1f0a014a5d6189ae52a1f820f99dfdc00323c3a725b5002dcb7f04e44f460fea7af068474b2dd7c88cbe1846925c84017be9e31e1708936d305b
+  checksum: 10c0/82c1220573dc1f0a014a5d6189ae52a1f820f99dfdc00323c3a725b5002dcb7f04e44f460fea7af068474b2dd7c88cbe1846925c84017be9e31e1708936d305b
   languageName: node
   linkType: hard
 
@@ -8714,7 +8714,7 @@ __metadata:
     inherits: "npm:^2.0.4"
     readable-stream: "npm:^3.6.0"
     safe-buffer: "npm:^5.2.0"
-  checksum: 663eabcf4173326fbb65a1918a509045590a26cc7e0964b754eef248d281305c6ec9f6b31cb508d02ffca383ab50028180ce5aefe013e942b44a903ac8dc80d0
+  checksum: 10c0/663eabcf4173326fbb65a1918a509045590a26cc7e0964b754eef248d281305c6ec9f6b31cb508d02ffca383ab50028180ce5aefe013e942b44a903ac8dc80d0
   languageName: node
   linkType: hard
 
@@ -8724,7 +8724,7 @@ __metadata:
   dependencies:
     inherits: "npm:^2.0.3"
     minimalistic-assert: "npm:^1.0.1"
-  checksum: 41ada59494eac5332cfc1ce6b7ebdd7b88a3864a6d6b08a3ea8ef261332ed60f37f10877e0c825aaa4bddebf164fbffa618286aeeec5296675e2671cbfa746c4
+  checksum: 10c0/41ada59494eac5332cfc1ce6b7ebdd7b88a3864a6d6b08a3ea8ef261332ed60f37f10877e0c825aaa4bddebf164fbffa618286aeeec5296675e2671cbfa746c4
   languageName: node
   linkType: hard
 
@@ -8733,14 +8733,14 @@ __metadata:
   resolution: "hasown@npm:2.0.0"
   dependencies:
     function-bind: "npm:^1.1.2"
-  checksum: 5d415b114f410661208c95e7ab4879f1cc2765b8daceff4dc8718317d1cb7b9ffa7c5d1eafd9a4389c9aab7445d6ea88e05f3096cb1e529618b55304956b87fc
+  checksum: 10c0/5d415b114f410661208c95e7ab4879f1cc2765b8daceff4dc8718317d1cb7b9ffa7c5d1eafd9a4389c9aab7445d6ea88e05f3096cb1e529618b55304956b87fc
   languageName: node
   linkType: hard
 
 "help-me@npm:^5.0.0":
   version: 5.0.0
   resolution: "help-me@npm:5.0.0"
-  checksum: 054c0e2e9ae2231c85ab5e04f75109b9d068ffcc54e58fb22079822a5ace8ff3d02c66fd45379c902ad5ab825e5d2e1451fcc2f7eab1eb49e7d488133ba4cacb
+  checksum: 10c0/054c0e2e9ae2231c85ab5e04f75109b9d068ffcc54e58fb22079822a5ace8ff3d02c66fd45379c902ad5ab825e5d2e1451fcc2f7eab1eb49e7d488133ba4cacb
   languageName: node
   linkType: hard
 
@@ -8754,7 +8754,7 @@ __metadata:
     tiny-invariant: "npm:^1.0.2"
     tiny-warning: "npm:^1.0.0"
     value-equal: "npm:^1.0.1"
-  checksum: 35377694e4f10f2cf056a9cb1a8ee083e04e4b4717a63baeee4afd565658a62c7e73700bf9e82aa53dbe1ec94e0a25a83c080d63bad8ee6b274a98d2fbc5ed4c
+  checksum: 10c0/35377694e4f10f2cf056a9cb1a8ee083e04e4b4717a63baeee4afd565658a62c7e73700bf9e82aa53dbe1ec94e0a25a83c080d63bad8ee6b274a98d2fbc5ed4c
   languageName: node
   linkType: hard
 
@@ -8765,7 +8765,7 @@ __metadata:
     hash.js: "npm:^1.0.3"
     minimalistic-assert: "npm:^1.0.0"
     minimalistic-crypto-utils: "npm:^1.0.1"
-  checksum: f3d9ba31b40257a573f162176ac5930109816036c59a09f901eb2ffd7e5e705c6832bedfff507957125f2086a0ab8f853c0df225642a88bf1fcaea945f20600d
+  checksum: 10c0/f3d9ba31b40257a573f162176ac5930109816036c59a09f901eb2ffd7e5e705c6832bedfff507957125f2086a0ab8f853c0df225642a88bf1fcaea945f20600d
   languageName: node
   linkType: hard
 
@@ -8774,7 +8774,7 @@ __metadata:
   resolution: "hoist-non-react-statics@npm:3.3.2"
   dependencies:
     react-is: "npm:^16.7.0"
-  checksum: fe0889169e845d738b59b64badf5e55fa3cf20454f9203d1eb088df322d49d4318df774828e789898dcb280e8a5521bb59b3203385662ca5e9218a6ca5820e74
+  checksum: 10c0/fe0889169e845d738b59b64badf5e55fa3cf20454f9203d1eb088df322d49d4318df774828e789898dcb280e8a5521bb59b3203385662ca5e9218a6ca5820e74
   languageName: node
   linkType: hard
 
@@ -8783,7 +8783,7 @@ __metadata:
   resolution: "homedir-polyfill@npm:1.0.3"
   dependencies:
     parse-passwd: "npm:^1.0.0"
-  checksum: 3c099844f94b8b438f124bd5698bdcfef32b2d455115fb8050d7148e7f7b95fc89ba9922586c491f0e1cdebf437b1053c84ecddb8d596e109e9ac69c5b4a9e27
+  checksum: 10c0/3c099844f94b8b438f124bd5698bdcfef32b2d455115fb8050d7148e7f7b95fc89ba9922586c491f0e1cdebf437b1053c84ecddb8d596e109e9ac69c5b4a9e27
   languageName: node
   linkType: hard
 
@@ -8795,7 +8795,7 @@ __metadata:
     obuf: "npm:^1.0.0"
     readable-stream: "npm:^2.0.1"
     wbuf: "npm:^1.1.0"
-  checksum: 55b9e824430bab82a19d079cb6e33042d7d0640325678c9917fcc020c61d8a08ca671b6c942c7f0aae9bb6e4b67ffb50734a72f9e21d66407c3138c1983b70f0
+  checksum: 10c0/55b9e824430bab82a19d079cb6e33042d7d0640325678c9917fcc020c61d8a08ca671b6c942c7f0aae9bb6e4b67ffb50734a72f9e21d66407c3138c1983b70f0
   languageName: node
   linkType: hard
 
@@ -8804,7 +8804,7 @@ __metadata:
   resolution: "html-encoding-sniffer@npm:3.0.0"
   dependencies:
     whatwg-encoding: "npm:^2.0.0"
-  checksum: b17b3b0fb5d061d8eb15121c3b0b536376c3e295ecaf09ba48dd69c6b6c957839db124fe1e2b3f11329753a4ee01aa7dedf63b7677999e86da17fbbdd82c5386
+  checksum: 10c0/b17b3b0fb5d061d8eb15121c3b0b536376c3e295ecaf09ba48dd69c6b6c957839db124fe1e2b3f11329753a4ee01aa7dedf63b7677999e86da17fbbdd82c5386
   languageName: node
   linkType: hard
 
@@ -8813,42 +8813,42 @@ __metadata:
   resolution: "html-encoding-sniffer@npm:4.0.0"
   dependencies:
     whatwg-encoding: "npm:^3.1.1"
-  checksum: 523398055dc61ac9b34718a719cb4aa691e4166f29187e211e1607de63dc25ac7af52ca7c9aead0c4b3c0415ffecb17326396e1202e2e86ff4bca4c0ee4c6140
+  checksum: 10c0/523398055dc61ac9b34718a719cb4aa691e4166f29187e211e1607de63dc25ac7af52ca7c9aead0c4b3c0415ffecb17326396e1202e2e86ff4bca4c0ee4c6140
   languageName: node
   linkType: hard
 
 "html-entities@npm:^1.3.1":
   version: 1.4.0
   resolution: "html-entities@npm:1.4.0"
-  checksum: eb2de616fb5948e681157805687672ea90e67c8a4f21a3215888ab422a984cab61fec96860708dca3bde0ae52577515683c8e28157ac8637220bb6a57a031b85
+  checksum: 10c0/eb2de616fb5948e681157805687672ea90e67c8a4f21a3215888ab422a984cab61fec96860708dca3bde0ae52577515683c8e28157ac8637220bb6a57a031b85
   languageName: node
   linkType: hard
 
 "html-escaper@npm:^2.0.0, html-escaper@npm:^2.0.2":
   version: 2.0.2
   resolution: "html-escaper@npm:2.0.2"
-  checksum: 208e8a12de1a6569edbb14544f4567e6ce8ecc30b9394fcaa4e7bb1e60c12a7c9a1ed27e31290817157e8626f3a4f29e76c8747030822eb84a6abb15c255f0a0
+  checksum: 10c0/208e8a12de1a6569edbb14544f4567e6ce8ecc30b9394fcaa4e7bb1e60c12a7c9a1ed27e31290817157e8626f3a4f29e76c8747030822eb84a6abb15c255f0a0
   languageName: node
   linkType: hard
 
 "html-tags@npm:^3.3.1":
   version: 3.3.1
   resolution: "html-tags@npm:3.3.1"
-  checksum: 680165e12baa51bad7397452d247dbcc5a5c29dac0e6754b1187eee3bf26f514bc1907a431dd2f7eb56207611ae595ee76a0acc8eaa0d931e72c791dd6463d79
+  checksum: 10c0/680165e12baa51bad7397452d247dbcc5a5c29dac0e6754b1187eee3bf26f514bc1907a431dd2f7eb56207611ae595ee76a0acc8eaa0d931e72c791dd6463d79
   languageName: node
   linkType: hard
 
 "http-cache-semantics@npm:^4.1.1":
   version: 4.1.1
   resolution: "http-cache-semantics@npm:4.1.1"
-  checksum: ce1319b8a382eb3cbb4a37c19f6bfe14e5bb5be3d09079e885e8c513ab2d3cd9214902f8a31c9dc4e37022633ceabfc2d697405deeaf1b8f3552bb4ed996fdfc
+  checksum: 10c0/ce1319b8a382eb3cbb4a37c19f6bfe14e5bb5be3d09079e885e8c513ab2d3cd9214902f8a31c9dc4e37022633ceabfc2d697405deeaf1b8f3552bb4ed996fdfc
   languageName: node
   linkType: hard
 
 "http-deceiver@npm:^1.2.7":
   version: 1.2.7
   resolution: "http-deceiver@npm:1.2.7"
-  checksum: 8bb9b716f5fc55f54a451da7f49b9c695c3e45498a789634daec26b61e4add7c85613a4a9e53726c39d09de7a163891ecd6eb5809adb64500a840fd86fe81d03
+  checksum: 10c0/8bb9b716f5fc55f54a451da7f49b9c695c3e45498a789634daec26b61e4add7c85613a4a9e53726c39d09de7a163891ecd6eb5809adb64500a840fd86fe81d03
   languageName: node
   linkType: hard
 
@@ -8861,7 +8861,7 @@ __metadata:
     setprototypeof: "npm:1.2.0"
     statuses: "npm:2.0.1"
     toidentifier: "npm:1.0.1"
-  checksum: fc6f2715fe188d091274b5ffc8b3657bd85c63e969daa68ccb77afb05b071a4b62841acb7a21e417b5539014dff2ebf9550f0b14a9ff126f2734a7c1387f8e19
+  checksum: 10c0/fc6f2715fe188d091274b5ffc8b3657bd85c63e969daa68ccb77afb05b071a4b62841acb7a21e417b5539014dff2ebf9550f0b14a9ff126f2734a7c1387f8e19
   languageName: node
   linkType: hard
 
@@ -8873,21 +8873,21 @@ __metadata:
     inherits: "npm:2.0.3"
     setprototypeof: "npm:1.1.0"
     statuses: "npm:>= 1.4.0 < 2"
-  checksum: 17ec4046ee974477778bfdd525936c254b872054703ec2caa4d6f099566b8adade636ae6aeeacb39302c5cd6e28fb407ebd937f500f5010d0b6850750414ff78
+  checksum: 10c0/17ec4046ee974477778bfdd525936c254b872054703ec2caa4d6f099566b8adade636ae6aeeacb39302c5cd6e28fb407ebd937f500f5010d0b6850750414ff78
   languageName: node
   linkType: hard
 
 "http-link-header@npm:^1.1.1":
   version: 1.1.1
   resolution: "http-link-header@npm:1.1.1"
-  checksum: a97b679e01e9f0860c823917c2c6637e3f0c06aa6cc0de4da98e1a433690e19b21323595889aa9347618134600bc7e2b0ff3cbeea7e4cea2f8cdae65dd9cc7f1
+  checksum: 10c0/a97b679e01e9f0860c823917c2c6637e3f0c06aa6cc0de4da98e1a433690e19b21323595889aa9347618134600bc7e2b0ff3cbeea7e4cea2f8cdae65dd9cc7f1
   languageName: node
   linkType: hard
 
 "http-parser-js@npm:>=0.5.1":
   version: 0.5.8
   resolution: "http-parser-js@npm:0.5.8"
-  checksum: 4ed89f812c44f84c4ae5d43dd3a0c47942b875b63be0ed2ccecbe6b0018af867d806495fc6e12474aff868721163699c49246585bddea4f0ecc6d2b02e19faf1
+  checksum: 10c0/4ed89f812c44f84c4ae5d43dd3a0c47942b875b63be0ed2ccecbe6b0018af867d806495fc6e12474aff868721163699c49246585bddea4f0ecc6d2b02e19faf1
   languageName: node
   linkType: hard
 
@@ -8898,7 +8898,7 @@ __metadata:
     "@tootallnate/once": "npm:2"
     agent-base: "npm:6"
     debug: "npm:4"
-  checksum: 32a05e413430b2c1e542e5c74b38a9f14865301dd69dff2e53ddb684989440e3d2ce0c4b64d25eb63cf6283e6265ff979a61cf93e3ca3d23047ddfdc8df34a32
+  checksum: 10c0/32a05e413430b2c1e542e5c74b38a9f14865301dd69dff2e53ddb684989440e3d2ce0c4b64d25eb63cf6283e6265ff979a61cf93e3ca3d23047ddfdc8df34a32
   languageName: node
   linkType: hard
 
@@ -8908,7 +8908,7 @@ __metadata:
   dependencies:
     agent-base: "npm:^7.1.0"
     debug: "npm:^4.3.4"
-  checksum: a11574ff39436cee3c7bc67f259444097b09474605846ddd8edf0bf4ad8644be8533db1aa463426e376865047d05dc22755e638632819317c0c2f1b2196657c8
+  checksum: 10c0/a11574ff39436cee3c7bc67f259444097b09474605846ddd8edf0bf4ad8644be8533db1aa463426e376865047d05dc22755e638632819317c0c2f1b2196657c8
   languageName: node
   linkType: hard
 
@@ -8920,7 +8920,7 @@ __metadata:
     is-glob: "npm:^4.0.0"
     lodash: "npm:^4.17.11"
     micromatch: "npm:^3.1.10"
-  checksum: b0c466dd54fac365e93f43138cba256063040557ae24fc92944b06fac35e879b882085e36fe276e48f5a27848b1600cd3ae59a845cb18714f5c0f205523783b1
+  checksum: 10c0/b0c466dd54fac365e93f43138cba256063040557ae24fc92944b06fac35e879b882085e36fe276e48f5a27848b1600cd3ae59a845cb18714f5c0f205523783b1
   languageName: node
   linkType: hard
 
@@ -8931,14 +8931,14 @@ __metadata:
     eventemitter3: "npm:^4.0.0"
     follow-redirects: "npm:^1.0.0"
     requires-port: "npm:^1.0.0"
-  checksum: 148dfa700a03fb421e383aaaf88ac1d94521dfc34072f6c59770528c65250983c2e4ec996f2f03aa9f3fe46cd1270a593126068319311e3e8d9e610a37533e94
+  checksum: 10c0/148dfa700a03fb421e383aaaf88ac1d94521dfc34072f6c59770528c65250983c2e4ec996f2f03aa9f3fe46cd1270a593126068319311e3e8d9e610a37533e94
   languageName: node
   linkType: hard
 
 "https-browserify@npm:^1.0.0":
   version: 1.0.0
   resolution: "https-browserify@npm:1.0.0"
-  checksum: e17b6943bc24ea9b9a7da5714645d808670af75a425f29baffc3284962626efdc1eb3aa9bbffaa6e64028a6ad98af5b09fabcb454a8f918fb686abfdc9e9b8ae
+  checksum: 10c0/e17b6943bc24ea9b9a7da5714645d808670af75a425f29baffc3284962626efdc1eb3aa9bbffaa6e64028a6ad98af5b09fabcb454a8f918fb686abfdc9e9b8ae
   languageName: node
   linkType: hard
 
@@ -8948,7 +8948,7 @@ __metadata:
   dependencies:
     agent-base: "npm:6"
     debug: "npm:4"
-  checksum: 6dd639f03434003577c62b27cafdb864784ef19b2de430d8ae2a1d45e31c4fd60719e5637b44db1a88a046934307da7089e03d6089ec3ddacc1189d8de8897d1
+  checksum: 10c0/6dd639f03434003577c62b27cafdb864784ef19b2de430d8ae2a1d45e31c4fd60719e5637b44db1a88a046934307da7089e03d6089ec3ddacc1189d8de8897d1
   languageName: node
   linkType: hard
 
@@ -8958,28 +8958,28 @@ __metadata:
   dependencies:
     agent-base: "npm:^7.0.2"
     debug: "npm:4"
-  checksum: 7735eb90073db087e7e79312e3d97c8c04baf7ea7ca7b013382b6a45abbaa61b281041a98f4e13c8c80d88f843785bcc84ba189165b4b4087b1e3496ba656d77
+  checksum: 10c0/7735eb90073db087e7e79312e3d97c8c04baf7ea7ca7b013382b6a45abbaa61b281041a98f4e13c8c80d88f843785bcc84ba189165b4b4087b1e3496ba656d77
   languageName: node
   linkType: hard
 
 "human-signals@npm:^2.1.0":
   version: 2.1.0
   resolution: "human-signals@npm:2.1.0"
-  checksum: 695edb3edfcfe9c8b52a76926cd31b36978782062c0ed9b1192b36bebc75c4c87c82e178dfcb0ed0fc27ca59d434198aac0bd0be18f5781ded775604db22304a
+  checksum: 10c0/695edb3edfcfe9c8b52a76926cd31b36978782062c0ed9b1192b36bebc75c4c87c82e178dfcb0ed0fc27ca59d434198aac0bd0be18f5781ded775604db22304a
   languageName: node
   linkType: hard
 
 "human-signals@npm:^4.3.0":
   version: 4.3.1
   resolution: "human-signals@npm:4.3.1"
-  checksum: 40498b33fe139f5cc4ef5d2f95eb1803d6318ac1b1c63eaf14eeed5484d26332c828de4a5a05676b6c83d7b9e57727c59addb4b1dea19cb8d71e83689e5b336c
+  checksum: 10c0/40498b33fe139f5cc4ef5d2f95eb1803d6318ac1b1c63eaf14eeed5484d26332c828de4a5a05676b6c83d7b9e57727c59addb4b1dea19cb8d71e83689e5b336c
   languageName: node
   linkType: hard
 
 "human-signals@npm:^5.0.0":
   version: 5.0.0
   resolution: "human-signals@npm:5.0.0"
-  checksum: 5a9359073fe17a8b58e5a085e9a39a950366d9f00217c4ff5878bd312e09d80f460536ea6a3f260b5943a01fe55c158d1cea3fc7bee3d0520aeef04f6d915c82
+  checksum: 10c0/5a9359073fe17a8b58e5a085e9a39a950366d9f00217c4ff5878bd312e09d80f460536ea6a3f260b5943a01fe55c158d1cea3fc7bee3d0520aeef04f6d915c82
   languageName: node
   linkType: hard
 
@@ -8988,7 +8988,7 @@ __metadata:
   resolution: "husky@npm:8.0.3"
   bin:
     husky: lib/bin.js
-  checksum: 6722591771c657b91a1abb082e07f6547eca79144d678e586828ae806499d90dce2a6aee08b66183fd8b085f19d20e0990a2ad396961746b4c8bd5bdb619d668
+  checksum: 10c0/6722591771c657b91a1abb082e07f6547eca79144d678e586828ae806499d90dce2a6aee08b66183fd8b085f19d20e0990a2ad396961746b4c8bd5bdb619d668
   languageName: node
   linkType: hard
 
@@ -8997,7 +8997,7 @@ __metadata:
   resolution: "iconv-lite@npm:0.4.24"
   dependencies:
     safer-buffer: "npm:>= 2.1.2 < 3"
-  checksum: c6886a24cc00f2a059767440ec1bc00d334a89f250db8e0f7feb4961c8727118457e27c495ba94d082e51d3baca378726cd110aaf7ded8b9bbfd6a44760cf1d4
+  checksum: 10c0/c6886a24cc00f2a059767440ec1bc00d334a89f250db8e0f7feb4961c8727118457e27c495ba94d082e51d3baca378726cd110aaf7ded8b9bbfd6a44760cf1d4
   languageName: node
   linkType: hard
 
@@ -9006,7 +9006,7 @@ __metadata:
   resolution: "iconv-lite@npm:0.6.3"
   dependencies:
     safer-buffer: "npm:>= 2.1.2 < 3.0.0"
-  checksum: 98102bc66b33fcf5ac044099d1257ba0b7ad5e3ccd3221f34dd508ab4070edff183276221684e1e0555b145fce0850c9f7d2b60a9fcac50fbb4ea0d6e845a3b1
+  checksum: 10c0/98102bc66b33fcf5ac044099d1257ba0b7ad5e3ccd3221f34dd508ab4070edff183276221684e1e0555b145fce0850c9f7d2b60a9fcac50fbb4ea0d6e845a3b1
   languageName: node
   linkType: hard
 
@@ -9015,56 +9015,56 @@ __metadata:
   resolution: "icss-utils@npm:5.1.0"
   peerDependencies:
     postcss: ^8.1.0
-  checksum: 39c92936fabd23169c8611d2b5cc39e39d10b19b0d223352f20a7579f75b39d5f786114a6b8fc62bee8c5fed59ba9e0d38f7219a4db383e324fb3061664b043d
+  checksum: 10c0/39c92936fabd23169c8611d2b5cc39e39d10b19b0d223352f20a7579f75b39d5f786114a6b8fc62bee8c5fed59ba9e0d38f7219a4db383e324fb3061664b043d
   languageName: node
   linkType: hard
 
 "idb-keyval@npm:^3.2.0":
   version: 3.2.0
   resolution: "idb-keyval@npm:3.2.0"
-  checksum: 9b1f65d5f08630ef444a89334370c394175b1543f157621b36a3bc5e5208946f3f0ab5d5e24c74e81f2ef54b55b742b4e5b439c561f62695ffb69a06b0bce8e1
+  checksum: 10c0/9b1f65d5f08630ef444a89334370c394175b1543f157621b36a3bc5e5208946f3f0ab5d5e24c74e81f2ef54b55b742b4e5b439c561f62695ffb69a06b0bce8e1
   languageName: node
   linkType: hard
 
 "idb@npm:^7.0.1":
   version: 7.1.1
   resolution: "idb@npm:7.1.1"
-  checksum: 72418e4397638797ee2089f97b45fc29f937b830bc0eb4126f4a9889ecf10320ceacf3a177fe5d7ffaf6b4fe38b20bbd210151549bfdc881db8081eed41c870d
+  checksum: 10c0/72418e4397638797ee2089f97b45fc29f937b830bc0eb4126f4a9889ecf10320ceacf3a177fe5d7ffaf6b4fe38b20bbd210151549bfdc881db8081eed41c870d
   languageName: node
   linkType: hard
 
 "ieee754@npm:^1.1.4, ieee754@npm:^1.2.1":
   version: 1.2.1
   resolution: "ieee754@npm:1.2.1"
-  checksum: b0782ef5e0935b9f12883a2e2aa37baa75da6e66ce6515c168697b42160807d9330de9a32ec1ed73149aea02e0d822e572bca6f1e22bdcbd2149e13b050b17bb
+  checksum: 10c0/b0782ef5e0935b9f12883a2e2aa37baa75da6e66ce6515c168697b42160807d9330de9a32ec1ed73149aea02e0d822e572bca6f1e22bdcbd2149e13b050b17bb
   languageName: node
   linkType: hard
 
 "ignore@npm:^5.2.0, ignore@npm:^5.2.4, ignore@npm:^5.3.0":
   version: 5.3.0
   resolution: "ignore@npm:5.3.0"
-  checksum: dc06bea5c23aae65d0725a957a0638b57e235ae4568dda51ca142053ed2c352de7e3bc93a69b2b32ac31966a1952e9a93c5ef2e2ab7c6b06aef9808f6b55b571
+  checksum: 10c0/dc06bea5c23aae65d0725a957a0638b57e235ae4568dda51ca142053ed2c352de7e3bc93a69b2b32ac31966a1952e9a93c5ef2e2ab7c6b06aef9808f6b55b571
   languageName: node
   linkType: hard
 
 "immer@npm:^10.0.3":
   version: 10.0.3
   resolution: "immer@npm:10.0.3"
-  checksum: 282a4f8479a40f7d12b2b3243c095e3e892bf99058e2ffcdd6b8e9fd143e6a90f2717ab9b6c8b97c927ffb8054465c8f647056f41660dbfd672e240cf1063503
+  checksum: 10c0/282a4f8479a40f7d12b2b3243c095e3e892bf99058e2ffcdd6b8e9fd143e6a90f2717ab9b6c8b97c927ffb8054465c8f647056f41660dbfd672e240cf1063503
   languageName: node
   linkType: hard
 
 "immutable@npm:^3.8.2":
   version: 3.8.2
   resolution: "immutable@npm:3.8.2"
-  checksum: fb6a2999ad3bda9e51741721e42547076dd492635ee4df9241224055fe953ec843583a700088cc4915f23dc326e5084f4e17f1bbd7388c3e872ef5a242e0ac5e
+  checksum: 10c0/fb6a2999ad3bda9e51741721e42547076dd492635ee4df9241224055fe953ec843583a700088cc4915f23dc326e5084f4e17f1bbd7388c3e872ef5a242e0ac5e
   languageName: node
   linkType: hard
 
 "immutable@npm:^4.0.0, immutable@npm:^4.0.0-rc.1, immutable@npm:^4.3.0":
   version: 4.3.5
   resolution: "immutable@npm:4.3.5"
-  checksum: 63d2d7908241a955d18c7822fd2215b6e89ff5a1a33cc72cd475b013cbbdef7a705aa5170a51ce9f84a57f62fdddfaa34e7b5a14b33d8a43c65cc6a881d6e894
+  checksum: 10c0/63d2d7908241a955d18c7822fd2215b6e89ff5a1a33cc72cd475b013cbbdef7a705aa5170a51ce9f84a57f62fdddfaa34e7b5a14b33d8a43c65cc6a881d6e894
   languageName: node
   linkType: hard
 
@@ -9074,7 +9074,7 @@ __metadata:
   dependencies:
     parent-module: "npm:^1.0.0"
     resolve-from: "npm:^4.0.0"
-  checksum: 7f882953aa6b740d1f0e384d0547158bc86efbf2eea0f1483b8900a6f65c5a5123c2cf09b0d542cc419d0b98a759ecaeb394237e97ea427f2da221dc3cd80cc3
+  checksum: 10c0/7f882953aa6b740d1f0e384d0547158bc86efbf2eea0f1483b8900a6f65c5a5123c2cf09b0d542cc419d0b98a759ecaeb394237e97ea427f2da221dc3cd80cc3
   languageName: node
   linkType: hard
 
@@ -9086,7 +9086,7 @@ __metadata:
     resolve-cwd: "npm:^2.0.0"
   bin:
     import-local-fixture: fixtures/cli.js
-  checksum: 68f2d9203d3760a836db97e917ea1793e865e0c5dd3749380ccaf52be907553febb0828f14c3169e66ba1a458d931b3cc5597cc9b623c7f79b395b0c3892601e
+  checksum: 10c0/68f2d9203d3760a836db97e917ea1793e865e0c5dd3749380ccaf52be907553febb0828f14c3169e66ba1a458d931b3cc5597cc9b623c7f79b395b0c3892601e
   languageName: node
   linkType: hard
 
@@ -9098,7 +9098,7 @@ __metadata:
     resolve-cwd: "npm:^3.0.0"
   bin:
     import-local-fixture: fixtures/cli.js
-  checksum: c67ecea72f775fe8684ca3d057e54bdb2ae28c14bf261d2607c269c18ea0da7b730924c06262eca9aed4b8ab31e31d65bc60b50e7296c85908a56e2f7d41ecd2
+  checksum: 10c0/c67ecea72f775fe8684ca3d057e54bdb2ae28c14bf261d2607c269c18ea0da7b730924c06262eca9aed4b8ab31e31d65bc60b50e7296c85908a56e2f7d41ecd2
   languageName: node
   linkType: hard
 
@@ -9112,28 +9112,28 @@ __metadata:
     strip-comments: "npm:^2.0.1"
   peerDependencies:
     webpack: ^4.0.0 || ^5.0.0
-  checksum: b77a0016808ebe6e5eec083a3afb94879b03653922dd4bc2b9c9aae13093e804d4089f7da171d1395f78d357de581ca3a4aea9100293dcbe02cf6c1e861085bf
+  checksum: 10c0/b77a0016808ebe6e5eec083a3afb94879b03653922dd4bc2b9c9aae13093e804d4089f7da171d1395f78d357de581ca3a4aea9100293dcbe02cf6c1e861085bf
   languageName: node
   linkType: hard
 
 "imurmurhash@npm:^0.1.4":
   version: 0.1.4
   resolution: "imurmurhash@npm:0.1.4"
-  checksum: 8b51313850dd33605c6c9d3fd9638b714f4c4c40250cff658209f30d40da60f78992fb2df5dabee4acf589a6a82bbc79ad5486550754bd9ec4e3fc0d4a57d6a6
+  checksum: 10c0/8b51313850dd33605c6c9d3fd9638b714f4c4c40250cff658209f30d40da60f78992fb2df5dabee4acf589a6a82bbc79ad5486550754bd9ec4e3fc0d4a57d6a6
   languageName: node
   linkType: hard
 
 "indent-string@npm:^4.0.0":
   version: 4.0.0
   resolution: "indent-string@npm:4.0.0"
-  checksum: 1e1904ddb0cb3d6cce7cd09e27a90184908b7a5d5c21b92e232c93579d314f0b83c246ffb035493d0504b1e9147ba2c9b21df0030f48673fba0496ecd698161f
+  checksum: 10c0/1e1904ddb0cb3d6cce7cd09e27a90184908b7a5d5c21b92e232c93579d314f0b83c246ffb035493d0504b1e9147ba2c9b21df0030f48673fba0496ecd698161f
   languageName: node
   linkType: hard
 
 "infer-owner@npm:^1.0.4":
   version: 1.0.4
   resolution: "infer-owner@npm:1.0.4"
-  checksum: a7b241e3149c26e37474e3435779487f42f36883711f198c45794703c7556bc38af224088bd4d1a221a45b8208ae2c2bcf86200383621434d0c099304481c5b9
+  checksum: 10c0/a7b241e3149c26e37474e3435779487f42f36883711f198c45794703c7556bc38af224088bd4d1a221a45b8208ae2c2bcf86200383621434d0c099304481c5b9
   languageName: node
   linkType: hard
 
@@ -9143,35 +9143,35 @@ __metadata:
   dependencies:
     once: "npm:^1.3.0"
     wrappy: "npm:1"
-  checksum: 7faca22584600a9dc5b9fca2cd5feb7135ac8c935449837b315676b4c90aa4f391ec4f42240178244b5a34e8bede1948627fda392ca3191522fc46b34e985ab2
+  checksum: 10c0/7faca22584600a9dc5b9fca2cd5feb7135ac8c935449837b315676b4c90aa4f391ec4f42240178244b5a34e8bede1948627fda392ca3191522fc46b34e985ab2
   languageName: node
   linkType: hard
 
 "inherits@npm:2, inherits@npm:2.0.4, inherits@npm:^2.0.1, inherits@npm:^2.0.3, inherits@npm:^2.0.4, inherits@npm:~2.0.1, inherits@npm:~2.0.3":
   version: 2.0.4
   resolution: "inherits@npm:2.0.4"
-  checksum: 4e531f648b29039fb7426fb94075e6545faa1eb9fe83c29f0b6d9e7263aceb4289d2d4557db0d428188eeb449cc7c5e77b0a0b2c4e248ff2a65933a0dee49ef2
+  checksum: 10c0/4e531f648b29039fb7426fb94075e6545faa1eb9fe83c29f0b6d9e7263aceb4289d2d4557db0d428188eeb449cc7c5e77b0a0b2c4e248ff2a65933a0dee49ef2
   languageName: node
   linkType: hard
 
 "inherits@npm:2.0.1":
   version: 2.0.1
   resolution: "inherits@npm:2.0.1"
-  checksum: bfc7b37c21a2cddb272adc65b053b1716612d408bb2c9a4e5c32679dc2b08032aadd67880c405be3dff060a62e45b353fc3d9fa79a3067ad7a3deb6a283cc5c6
+  checksum: 10c0/bfc7b37c21a2cddb272adc65b053b1716612d408bb2c9a4e5c32679dc2b08032aadd67880c405be3dff060a62e45b353fc3d9fa79a3067ad7a3deb6a283cc5c6
   languageName: node
   linkType: hard
 
 "inherits@npm:2.0.3":
   version: 2.0.3
   resolution: "inherits@npm:2.0.3"
-  checksum: 6e56402373149ea076a434072671f9982f5fad030c7662be0332122fe6c0fa490acb3cc1010d90b6eff8d640b1167d77674add52dfd1bb85d545cf29e80e73e7
+  checksum: 10c0/6e56402373149ea076a434072671f9982f5fad030c7662be0332122fe6c0fa490acb3cc1010d90b6eff8d640b1167d77674add52dfd1bb85d545cf29e80e73e7
   languageName: node
   linkType: hard
 
 "ini@npm:^1.3.4, ini@npm:^1.3.5":
   version: 1.3.8
   resolution: "ini@npm:1.3.8"
-  checksum: ec93838d2328b619532e4f1ff05df7909760b6f66d9c9e2ded11e5c1897d6f2f9980c54dd638f88654b00919ce31e827040631eab0a3969e4d1abefa0719516a
+  checksum: 10c0/ec93838d2328b619532e4f1ff05df7909760b6f66d9c9e2ded11e5c1897d6f2f9980c54dd638f88654b00919ce31e827040631eab0a3969e4d1abefa0719516a
   languageName: node
   linkType: hard
 
@@ -9181,7 +9181,7 @@ __metadata:
   dependencies:
     default-gateway: "npm:^4.2.0"
     ipaddr.js: "npm:^1.9.0"
-  checksum: c0ad0b95981c8f21a2d4f115212af38c894a6a6d0a2a3cac4d73d1b5beb214fdfce7b5e66f087e8d575977d4df630886914412d1bc9c2678e5870210154ad65b
+  checksum: 10c0/c0ad0b95981c8f21a2d4f115212af38c894a6a6d0a2a3cac4d73d1b5beb214fdfce7b5e66f087e8d575977d4df630886914412d1bc9c2678e5870210154ad65b
   languageName: node
   linkType: hard
 
@@ -9192,21 +9192,21 @@ __metadata:
     get-intrinsic: "npm:^1.2.0"
     has: "npm:^1.0.3"
     side-channel: "npm:^1.0.4"
-  checksum: 66d8a66b4b5310c042e8ad00ce895dc55cb25165a3a7da0d7862ca18d69d3b1ba86511b4bf3baf4273d744d3f6e9154574af45189ef11135a444945309e39e4a
+  checksum: 10c0/66d8a66b4b5310c042e8ad00ce895dc55cb25165a3a7da0d7862ca18d69d3b1ba86511b4bf3baf4273d744d3f6e9154574af45189ef11135a444945309e39e4a
   languageName: node
   linkType: hard
 
 "interpret@npm:^1.4.0":
   version: 1.4.0
   resolution: "interpret@npm:1.4.0"
-  checksum: 08c5ad30032edeec638485bc3f6db7d0094d9b3e85e0f950866600af3c52e9fd69715416d29564731c479d9f4d43ff3e4d302a178196bdc0e6837ec147640450
+  checksum: 10c0/08c5ad30032edeec638485bc3f6db7d0094d9b3e85e0f950866600af3c52e9fd69715416d29564731c479d9f4d43ff3e4d302a178196bdc0e6837ec147640450
   languageName: node
   linkType: hard
 
 "intersection-observer@npm:^0.12.0":
   version: 0.12.2
   resolution: "intersection-observer@npm:0.12.2"
-  checksum: 9591f46b2b742f5801ed69dbc8860f487771b4af8361e7a5dcb28a377beff2ba56336a2b090af261825430d225dae9417121496d2e6925e000e4a469958843ff
+  checksum: 10c0/9591f46b2b742f5801ed69dbc8860f487771b4af8361e7a5dcb28a377beff2ba56336a2b090af261825430d225dae9417121496d2e6925e000e4a469958843ff
   languageName: node
   linkType: hard
 
@@ -9218,7 +9218,7 @@ __metadata:
     "@formatjs/fast-memoize": "npm:2.2.0"
     "@formatjs/icu-messageformat-parser": "npm:2.7.6"
     tslib: "npm:^2.4.0"
-  checksum: 423f1c879ce2d0e7b9e0b4c1787a81ead7fe4d1734e0366a20fef56b06c09146e7ca3618e2e78b4f8b8f2b59cafe6237ceed21530fe0c16cfb47d915fc80222d
+  checksum: 10c0/423f1c879ce2d0e7b9e0b4c1787a81ead7fe4d1734e0366a20fef56b06c09146e7ca3618e2e78b4f8b8f2b59cafe6237ceed21530fe0c16cfb47d915fc80222d
   languageName: node
   linkType: hard
 
@@ -9227,7 +9227,7 @@ __metadata:
   resolution: "invariant@npm:2.2.4"
   dependencies:
     loose-envify: "npm:^1.0.0"
-  checksum: 5af133a917c0bcf65e84e7f23e779e7abc1cd49cb7fdc62d00d1de74b0d8c1b5ee74ac7766099fb3be1b05b26dfc67bab76a17030d2fe7ea2eef867434362dfc
+  checksum: 10c0/5af133a917c0bcf65e84e7f23e779e7abc1cd49cb7fdc62d00d1de74b0d8c1b5ee74ac7766099fb3be1b05b26dfc67bab76a17030d2fe7ea2eef867434362dfc
   languageName: node
   linkType: hard
 
@@ -9244,42 +9244,42 @@ __metadata:
     redis-errors: "npm:^1.2.0"
     redis-parser: "npm:^3.0.0"
     standard-as-callback: "npm:^2.1.0"
-  checksum: 0dd2b5b8004e891f5b62edf18ac223194f1f5204698ec827c903e789ea05b0b36f73395491749ec63c66470485bdfb228ccdf1714fbf631a0f78f33211f2c883
+  checksum: 10c0/0dd2b5b8004e891f5b62edf18ac223194f1f5204698ec827c903e789ea05b0b36f73395491749ec63c66470485bdfb228ccdf1714fbf631a0f78f33211f2c883
   languageName: node
   linkType: hard
 
 "ip-regex@npm:^2.1.0":
   version: 2.1.0
   resolution: "ip-regex@npm:2.1.0"
-  checksum: 3ce2d8307fa0373ca357eba7504e66e73b8121805fd9eba6a343aeb077c64c30659fa876b11ac7a75635b7529d2ce87723f208a5b9d51571513b5c68c0cc1541
+  checksum: 10c0/3ce2d8307fa0373ca357eba7504e66e73b8121805fd9eba6a343aeb077c64c30659fa876b11ac7a75635b7529d2ce87723f208a5b9d51571513b5c68c0cc1541
   languageName: node
   linkType: hard
 
 "ip@npm:^1.1.0, ip@npm:^1.1.5":
   version: 1.1.8
   resolution: "ip@npm:1.1.8"
-  checksum: ab32a5ecfa678d4c158c1381c4c6744fce89a1d793e1b6635ba79d0753c069030b672d765887b6fff55670c711dfa47475895e5d6013efbbcf04687c51cb8db9
+  checksum: 10c0/ab32a5ecfa678d4c158c1381c4c6744fce89a1d793e1b6635ba79d0753c069030b672d765887b6fff55670c711dfa47475895e5d6013efbbcf04687c51cb8db9
   languageName: node
   linkType: hard
 
 "ip@npm:^2.0.0":
   version: 2.0.0
   resolution: "ip@npm:2.0.0"
-  checksum: 8d186cc5585f57372847ae29b6eba258c68862055e18a75cc4933327232cb5c107f89800ce29715d542eef2c254fbb68b382e780a7414f9ee7caf60b7a473958
+  checksum: 10c0/8d186cc5585f57372847ae29b6eba258c68862055e18a75cc4933327232cb5c107f89800ce29715d542eef2c254fbb68b382e780a7414f9ee7caf60b7a473958
   languageName: node
   linkType: hard
 
 "ipaddr.js@npm:1.9.1, ipaddr.js@npm:^1.9.0":
   version: 1.9.1
   resolution: "ipaddr.js@npm:1.9.1"
-  checksum: 0486e775047971d3fdb5fb4f063829bac45af299ae0b82dcf3afa2145338e08290563a2a70f34b732d795ecc8311902e541a8530eeb30d75860a78ff4e94ce2a
+  checksum: 10c0/0486e775047971d3fdb5fb4f063829bac45af299ae0b82dcf3afa2145338e08290563a2a70f34b732d795ecc8311902e541a8530eeb30d75860a78ff4e94ce2a
   languageName: node
   linkType: hard
 
 "is-absolute-url@npm:^3.0.3":
   version: 3.0.3
   resolution: "is-absolute-url@npm:3.0.3"
-  checksum: 04c415974c32e73a83d3a21a9bea18fc4e2c14fbe6bbd64832cf1e67a75ade2af0e900f552f0b8a447f1305f5ffc9d143ccd8d005dbe715d198c359d342b86f0
+  checksum: 10c0/04c415974c32e73a83d3a21a9bea18fc4e2c14fbe6bbd64832cf1e67a75ade2af0e900f552f0b8a447f1305f5ffc9d143ccd8d005dbe715d198c359d342b86f0
   languageName: node
   linkType: hard
 
@@ -9288,7 +9288,7 @@ __metadata:
   resolution: "is-accessor-descriptor@npm:0.1.6"
   dependencies:
     kind-of: "npm:^3.0.2"
-  checksum: f2c314b314ec6e8a6e559351bff3c7ee9aed7a5e9c6f61dd8cb9e1382c8bfe33dca3f0e0af13daf9ded9e6e66390ff23b4acfb615d7a249009a51506a7b0f151
+  checksum: 10c0/f2c314b314ec6e8a6e559351bff3c7ee9aed7a5e9c6f61dd8cb9e1382c8bfe33dca3f0e0af13daf9ded9e6e66390ff23b4acfb615d7a249009a51506a7b0f151
   languageName: node
   linkType: hard
 
@@ -9297,7 +9297,7 @@ __metadata:
   resolution: "is-accessor-descriptor@npm:1.0.0"
   dependencies:
     kind-of: "npm:^6.0.0"
-  checksum: d68edafd8ef133e9003837f3c80f4e5b82b12ab5456c772d1796857671ae83e3a426ed225a28a7e35bceabbce68c1f1ffdabf47e6d53f5a4d6c4558776ad3c20
+  checksum: 10c0/d68edafd8ef133e9003837f3c80f4e5b82b12ab5456c772d1796857671ae83e3a426ed225a28a7e35bceabbce68c1f1ffdabf47e6d53f5a4d6c4558776ad3c20
   languageName: node
   linkType: hard
 
@@ -9307,7 +9307,7 @@ __metadata:
   dependencies:
     call-bind: "npm:^1.0.2"
     has-tostringtag: "npm:^1.0.0"
-  checksum: 5ff1f341ee4475350adfc14b2328b38962564b7c2076be2f5bac7bd9b61779efba99b9f844a7b82ba7654adccf8e8eb19d1bb0cc6d1c1a085e498f6793d4328f
+  checksum: 10c0/5ff1f341ee4475350adfc14b2328b38962564b7c2076be2f5bac7bd9b61779efba99b9f844a7b82ba7654adccf8e8eb19d1bb0cc6d1c1a085e498f6793d4328f
   languageName: node
   linkType: hard
 
@@ -9318,14 +9318,14 @@ __metadata:
     call-bind: "npm:^1.0.2"
     get-intrinsic: "npm:^1.2.0"
     is-typed-array: "npm:^1.1.10"
-  checksum: 40ed13a5f5746ac3ae2f2e463687d9b5a3f5fd0086f970fb4898f0253c2a5ec2e3caea2d664dd8f54761b1c1948609702416921a22faebe160c7640a9217c80e
+  checksum: 10c0/40ed13a5f5746ac3ae2f2e463687d9b5a3f5fd0086f970fb4898f0253c2a5ec2e3caea2d664dd8f54761b1c1948609702416921a22faebe160c7640a9217c80e
   languageName: node
   linkType: hard
 
 "is-arrayish@npm:^0.2.1":
   version: 0.2.1
   resolution: "is-arrayish@npm:0.2.1"
-  checksum: e7fb686a739068bb70f860b39b67afc62acc62e36bb61c5f965768abce1873b379c563e61dd2adad96ebb7edf6651111b385e490cf508378959b0ed4cac4e729
+  checksum: 10c0/e7fb686a739068bb70f860b39b67afc62acc62e36bb61c5f965768abce1873b379c563e61dd2adad96ebb7edf6651111b385e490cf508378959b0ed4cac4e729
   languageName: node
   linkType: hard
 
@@ -9334,7 +9334,7 @@ __metadata:
   resolution: "is-async-function@npm:2.0.0"
   dependencies:
     has-tostringtag: "npm:^1.0.0"
-  checksum: 787bc931576aad525d751fc5ce211960fe91e49ac84a5c22d6ae0bc9541945fbc3f686dc590c3175722ce4f6d7b798a93f6f8ff4847fdb2199aea6f4baf5d668
+  checksum: 10c0/787bc931576aad525d751fc5ce211960fe91e49ac84a5c22d6ae0bc9541945fbc3f686dc590c3175722ce4f6d7b798a93f6f8ff4847fdb2199aea6f4baf5d668
   languageName: node
   linkType: hard
 
@@ -9343,7 +9343,7 @@ __metadata:
   resolution: "is-bigint@npm:1.0.4"
   dependencies:
     has-bigints: "npm:^1.0.1"
-  checksum: eb9c88e418a0d195ca545aff2b715c9903d9b0a5033bc5922fec600eb0c3d7b1ee7f882dbf2e0d5a6e694e42391be3683e4368737bd3c4a77f8ac293e7773696
+  checksum: 10c0/eb9c88e418a0d195ca545aff2b715c9903d9b0a5033bc5922fec600eb0c3d7b1ee7f882dbf2e0d5a6e694e42391be3683e4368737bd3c4a77f8ac293e7773696
   languageName: node
   linkType: hard
 
@@ -9352,7 +9352,7 @@ __metadata:
   resolution: "is-binary-path@npm:1.0.1"
   dependencies:
     binary-extensions: "npm:^1.0.0"
-  checksum: 16e456fa3782eaf3d8e28d382b750507e3d54ff6694df8a1b2c6498da321e2ead311de9c42e653d8fb3213de72bac204b5f97e4a110cda8a72f17b1c1b4eb643
+  checksum: 10c0/16e456fa3782eaf3d8e28d382b750507e3d54ff6694df8a1b2c6498da321e2ead311de9c42e653d8fb3213de72bac204b5f97e4a110cda8a72f17b1c1b4eb643
   languageName: node
   linkType: hard
 
@@ -9361,7 +9361,7 @@ __metadata:
   resolution: "is-binary-path@npm:2.1.0"
   dependencies:
     binary-extensions: "npm:^2.0.0"
-  checksum: a16eaee59ae2b315ba36fad5c5dcaf8e49c3e27318f8ab8fa3cdb8772bf559c8d1ba750a589c2ccb096113bb64497084361a25960899cb6172a6925ab6123d38
+  checksum: 10c0/a16eaee59ae2b315ba36fad5c5dcaf8e49c3e27318f8ab8fa3cdb8772bf559c8d1ba750a589c2ccb096113bb64497084361a25960899cb6172a6925ab6123d38
   languageName: node
   linkType: hard
 
@@ -9371,7 +9371,7 @@ __metadata:
   dependencies:
     call-bind: "npm:^1.0.2"
     has-tostringtag: "npm:^1.0.0"
-  checksum: 6090587f8a8a8534c0f816da868bc94f32810f08807aa72fa7e79f7e11c466d281486ffe7a788178809c2aa71fe3e700b167fe80dd96dad68026bfff8ebf39f7
+  checksum: 10c0/6090587f8a8a8534c0f816da868bc94f32810f08807aa72fa7e79f7e11c466d281486ffe7a788178809c2aa71fe3e700b167fe80dd96dad68026bfff8ebf39f7
   languageName: node
   linkType: hard
 
@@ -9380,14 +9380,14 @@ __metadata:
   resolution: "is-builtin-module@npm:3.2.1"
   dependencies:
     builtin-modules: "npm:^3.3.0"
-  checksum: 5a66937a03f3b18803381518f0ef679752ac18cdb7dd53b5e23ee8df8d440558737bd8dcc04d2aae555909d2ecb4a81b5c0d334d119402584b61e6a003e31af1
+  checksum: 10c0/5a66937a03f3b18803381518f0ef679752ac18cdb7dd53b5e23ee8df8d440558737bd8dcc04d2aae555909d2ecb4a81b5c0d334d119402584b61e6a003e31af1
   languageName: node
   linkType: hard
 
 "is-callable@npm:^1.1.3, is-callable@npm:^1.1.4, is-callable@npm:^1.2.7":
   version: 1.2.7
   resolution: "is-callable@npm:1.2.7"
-  checksum: ceebaeb9d92e8adee604076971dd6000d38d6afc40bb843ea8e45c5579b57671c3f3b50d7f04869618242c6cee08d1b67806a8cb8edaaaf7c0748b3720d6066f
+  checksum: 10c0/ceebaeb9d92e8adee604076971dd6000d38d6afc40bb843ea8e45c5579b57671c3f3b50d7f04869618242c6cee08d1b67806a8cb8edaaaf7c0748b3720d6066f
   languageName: node
   linkType: hard
 
@@ -9396,7 +9396,7 @@ __metadata:
   resolution: "is-core-module@npm:2.13.1"
   dependencies:
     hasown: "npm:^2.0.0"
-  checksum: 2cba9903aaa52718f11c4896dabc189bab980870aae86a62dc0d5cedb546896770ee946fb14c84b7adf0735f5eaea4277243f1b95f5cefa90054f92fbcac2518
+  checksum: 10c0/2cba9903aaa52718f11c4896dabc189bab980870aae86a62dc0d5cedb546896770ee946fb14c84b7adf0735f5eaea4277243f1b95f5cefa90054f92fbcac2518
   languageName: node
   linkType: hard
 
@@ -9405,7 +9405,7 @@ __metadata:
   resolution: "is-data-descriptor@npm:0.1.4"
   dependencies:
     kind-of: "npm:^3.0.2"
-  checksum: 32fda7e966b2c1f093230d5ef2aad1bb86e43e7280da50961e38ec31dbd8a50570a2911fd45277d321074a0762adc98e8462bb62820462594128857225e90d21
+  checksum: 10c0/32fda7e966b2c1f093230d5ef2aad1bb86e43e7280da50961e38ec31dbd8a50570a2911fd45277d321074a0762adc98e8462bb62820462594128857225e90d21
   languageName: node
   linkType: hard
 
@@ -9414,7 +9414,7 @@ __metadata:
   resolution: "is-data-descriptor@npm:1.0.0"
   dependencies:
     kind-of: "npm:^6.0.0"
-  checksum: bed31385d7d1a0dbb2ab3077faf2188acf42609192dca4e320ed7b3dc14a9d70c00658956cdaa2c0402be136c6b56e183973ad81b730fd90ab427fb6fd3608be
+  checksum: 10c0/bed31385d7d1a0dbb2ab3077faf2188acf42609192dca4e320ed7b3dc14a9d70c00658956cdaa2c0402be136c6b56e183973ad81b730fd90ab427fb6fd3608be
   languageName: node
   linkType: hard
 
@@ -9423,7 +9423,7 @@ __metadata:
   resolution: "is-date-object@npm:1.0.5"
   dependencies:
     has-tostringtag: "npm:^1.0.0"
-  checksum: eed21e5dcc619c48ccef804dfc83a739dbb2abee6ca202838ee1bd5f760fe8d8a93444f0d49012ad19bb7c006186e2884a1b92f6e1c056da7fd23d0a9ad5992e
+  checksum: 10c0/eed21e5dcc619c48ccef804dfc83a739dbb2abee6ca202838ee1bd5f760fe8d8a93444f0d49012ad19bb7c006186e2884a1b92f6e1c056da7fd23d0a9ad5992e
   languageName: node
   linkType: hard
 
@@ -9434,7 +9434,7 @@ __metadata:
     is-accessor-descriptor: "npm:^0.1.6"
     is-data-descriptor: "npm:^0.1.4"
     kind-of: "npm:^5.0.0"
-  checksum: 6b8f5617b764ef8c6be3d54830184357e6cdedd8e0eddf1b97d0658616ac170bfdbc7c1ad00e0aa9f5b767acdb9d6c63d4df936501784b34936bd0f9acf3b665
+  checksum: 10c0/6b8f5617b764ef8c6be3d54830184357e6cdedd8e0eddf1b97d0658616ac170bfdbc7c1ad00e0aa9f5b767acdb9d6c63d4df936501784b34936bd0f9acf3b665
   languageName: node
   linkType: hard
 
@@ -9445,7 +9445,7 @@ __metadata:
     is-accessor-descriptor: "npm:^1.0.0"
     is-data-descriptor: "npm:^1.0.0"
     kind-of: "npm:^6.0.2"
-  checksum: a05169c7a87feb88fc155e3ada469090cfabb5a548a3f794358b511cc47a0871b8b95e7345be4925a22ef3df585c3923b31943b3ad6255ce563a9d97f2e221e0
+  checksum: 10c0/a05169c7a87feb88fc155e3ada469090cfabb5a548a3f794358b511cc47a0871b8b95e7345be4925a22ef3df585c3923b31943b3ad6255ce563a9d97f2e221e0
   languageName: node
   linkType: hard
 
@@ -9454,7 +9454,7 @@ __metadata:
   resolution: "is-docker@npm:2.2.1"
   bin:
     is-docker: cli.js
-  checksum: e828365958d155f90c409cdbe958f64051d99e8aedc2c8c4cd7c89dcf35329daed42f7b99346f7828df013e27deb8f721cf9408ba878c76eb9e8290235fbcdcc
+  checksum: 10c0/e828365958d155f90c409cdbe958f64051d99e8aedc2c8c4cd7c89dcf35329daed42f7b99346f7828df013e27deb8f721cf9408ba878c76eb9e8290235fbcdcc
   languageName: node
   linkType: hard
 
@@ -9463,21 +9463,21 @@ __metadata:
   resolution: "is-docker@npm:3.0.0"
   bin:
     is-docker: cli.js
-  checksum: d2c4f8e6d3e34df75a5defd44991b6068afad4835bb783b902fa12d13ebdb8f41b2a199dcb0b5ed2cb78bfee9e4c0bbdb69c2d9646f4106464674d3e697a5856
+  checksum: 10c0/d2c4f8e6d3e34df75a5defd44991b6068afad4835bb783b902fa12d13ebdb8f41b2a199dcb0b5ed2cb78bfee9e4c0bbdb69c2d9646f4106464674d3e697a5856
   languageName: node
   linkType: hard
 
 "is-electron@npm:^2.2.0":
   version: 2.2.2
   resolution: "is-electron@npm:2.2.2"
-  checksum: 327bb373f7be01b16cdff3998b5ddaa87d28f576092affaa7fe0659571b3306fdd458afbf0683a66841e7999af13f46ad0e1b51647b469526cd05a4dd736438a
+  checksum: 10c0/327bb373f7be01b16cdff3998b5ddaa87d28f576092affaa7fe0659571b3306fdd458afbf0683a66841e7999af13f46ad0e1b51647b469526cd05a4dd736438a
   languageName: node
   linkType: hard
 
 "is-extendable@npm:^0.1.0, is-extendable@npm:^0.1.1":
   version: 0.1.1
   resolution: "is-extendable@npm:0.1.1"
-  checksum: dd5ca3994a28e1740d1e25192e66eed128e0b2ff161a7ea348e87ae4f616554b486854de423877a2a2c171d5f7cd6e8093b91f54533bc88a59ee1c9838c43879
+  checksum: 10c0/dd5ca3994a28e1740d1e25192e66eed128e0b2ff161a7ea348e87ae4f616554b486854de423877a2a2c171d5f7cd6e8093b91f54533bc88a59ee1c9838c43879
   languageName: node
   linkType: hard
 
@@ -9486,14 +9486,14 @@ __metadata:
   resolution: "is-extendable@npm:1.0.1"
   dependencies:
     is-plain-object: "npm:^2.0.4"
-  checksum: 1d6678a5be1563db6ecb121331c819c38059703f0179f52aa80c242c223ee9c6b66470286636c0e63d7163e4d905c0a7d82a096e0b5eaeabb51b9f8d0af0d73f
+  checksum: 10c0/1d6678a5be1563db6ecb121331c819c38059703f0179f52aa80c242c223ee9c6b66470286636c0e63d7163e4d905c0a7d82a096e0b5eaeabb51b9f8d0af0d73f
   languageName: node
   linkType: hard
 
 "is-extglob@npm:^2.1.0, is-extglob@npm:^2.1.1":
   version: 2.1.1
   resolution: "is-extglob@npm:2.1.1"
-  checksum: 5487da35691fbc339700bbb2730430b07777a3c21b9ebaecb3072512dfd7b4ba78ac2381a87e8d78d20ea08affb3f1971b4af629173a6bf435ff8a4c47747912
+  checksum: 10c0/5487da35691fbc339700bbb2730430b07777a3c21b9ebaecb3072512dfd7b4ba78ac2381a87e8d78d20ea08affb3f1971b4af629173a6bf435ff8a4c47747912
   languageName: node
   linkType: hard
 
@@ -9502,28 +9502,28 @@ __metadata:
   resolution: "is-finalizationregistry@npm:1.0.2"
   dependencies:
     call-bind: "npm:^1.0.2"
-  checksum: 81caecc984d27b1a35c68741156fc651fb1fa5e3e6710d21410abc527eb226d400c0943a167922b2e920f6b3e58b0dede9aa795882b038b85f50b3a4b877db86
+  checksum: 10c0/81caecc984d27b1a35c68741156fc651fb1fa5e3e6710d21410abc527eb226d400c0943a167922b2e920f6b3e58b0dede9aa795882b038b85f50b3a4b877db86
   languageName: node
   linkType: hard
 
 "is-fullwidth-code-point@npm:^2.0.0":
   version: 2.0.0
   resolution: "is-fullwidth-code-point@npm:2.0.0"
-  checksum: e58f3e4a601fc0500d8b2677e26e9fe0cd450980e66adb29d85b6addf7969731e38f8e43ed2ec868a09c101a55ac3d8b78902209269f38c5286bc98f5bc1b4d9
+  checksum: 10c0/e58f3e4a601fc0500d8b2677e26e9fe0cd450980e66adb29d85b6addf7969731e38f8e43ed2ec868a09c101a55ac3d8b78902209269f38c5286bc98f5bc1b4d9
   languageName: node
   linkType: hard
 
 "is-fullwidth-code-point@npm:^3.0.0":
   version: 3.0.0
   resolution: "is-fullwidth-code-point@npm:3.0.0"
-  checksum: bb11d825e049f38e04c06373a8d72782eee0205bda9d908cc550ccb3c59b99d750ff9537982e01733c1c94a58e35400661f57042158ff5e8f3e90cf936daf0fc
+  checksum: 10c0/bb11d825e049f38e04c06373a8d72782eee0205bda9d908cc550ccb3c59b99d750ff9537982e01733c1c94a58e35400661f57042158ff5e8f3e90cf936daf0fc
   languageName: node
   linkType: hard
 
 "is-fullwidth-code-point@npm:^4.0.0":
   version: 4.0.0
   resolution: "is-fullwidth-code-point@npm:4.0.0"
-  checksum: df2a717e813567db0f659c306d61f2f804d480752526886954a2a3e2246c7745fd07a52b5fecf2b68caf0a6c79dcdace6166fdf29cc76ed9975cc334f0a018b8
+  checksum: 10c0/df2a717e813567db0f659c306d61f2f804d480752526886954a2a3e2246c7745fd07a52b5fecf2b68caf0a6c79dcdace6166fdf29cc76ed9975cc334f0a018b8
   languageName: node
   linkType: hard
 
@@ -9532,14 +9532,14 @@ __metadata:
   resolution: "is-fullwidth-code-point@npm:5.0.0"
   dependencies:
     get-east-asian-width: "npm:^1.0.0"
-  checksum: cd591b27d43d76b05fa65ed03eddce57a16e1eca0b7797ff7255de97019bcaf0219acfc0c4f7af13319e13541f2a53c0ace476f442b13267b9a6a7568f2b65c8
+  checksum: 10c0/cd591b27d43d76b05fa65ed03eddce57a16e1eca0b7797ff7255de97019bcaf0219acfc0c4f7af13319e13541f2a53c0ace476f442b13267b9a6a7568f2b65c8
   languageName: node
   linkType: hard
 
 "is-generator-fn@npm:^2.0.0":
   version: 2.1.0
   resolution: "is-generator-fn@npm:2.1.0"
-  checksum: 2957cab387997a466cd0bf5c1b6047bd21ecb32bdcfd8996b15747aa01002c1c88731802f1b3d34ac99f4f6874b626418bd118658cf39380fe5fff32a3af9c4d
+  checksum: 10c0/2957cab387997a466cd0bf5c1b6047bd21ecb32bdcfd8996b15747aa01002c1c88731802f1b3d34ac99f4f6874b626418bd118658cf39380fe5fff32a3af9c4d
   languageName: node
   linkType: hard
 
@@ -9548,7 +9548,7 @@ __metadata:
   resolution: "is-generator-function@npm:1.0.10"
   dependencies:
     has-tostringtag: "npm:^1.0.0"
-  checksum: df03514df01a6098945b5a0cfa1abff715807c8e72f57c49a0686ad54b3b74d394e2d8714e6f709a71eb00c9630d48e73ca1796c1ccc84ac95092c1fecc0d98b
+  checksum: 10c0/df03514df01a6098945b5a0cfa1abff715807c8e72f57c49a0686ad54b3b74d394e2d8714e6f709a71eb00c9630d48e73ca1796c1ccc84ac95092c1fecc0d98b
   languageName: node
   linkType: hard
 
@@ -9557,7 +9557,7 @@ __metadata:
   resolution: "is-glob@npm:3.1.0"
   dependencies:
     is-extglob: "npm:^2.1.0"
-  checksum: ba816a35dcf5285de924a8a4654df7b183a86381d73ea3bbf3df3cc61b3ba61fdddf90ee205709a2235b210ee600ee86e5e8600093cf291a662607fd032e2ff4
+  checksum: 10c0/ba816a35dcf5285de924a8a4654df7b183a86381d73ea3bbf3df3cc61b3ba61fdddf90ee205709a2235b210ee600ee86e5e8600093cf291a662607fd032e2ff4
   languageName: node
   linkType: hard
 
@@ -9566,7 +9566,7 @@ __metadata:
   resolution: "is-glob@npm:4.0.3"
   dependencies:
     is-extglob: "npm:^2.1.1"
-  checksum: 17fb4014e22be3bbecea9b2e3a76e9e34ff645466be702f1693e8f1ee1adac84710d0be0bd9f967d6354036fd51ab7c2741d954d6e91dae6bb69714de92c197a
+  checksum: 10c0/17fb4014e22be3bbecea9b2e3a76e9e34ff645466be702f1693e8f1ee1adac84710d0be0bd9f967d6354036fd51ab7c2741d954d6e91dae6bb69714de92c197a
   languageName: node
   linkType: hard
 
@@ -9577,35 +9577,35 @@ __metadata:
     is-docker: "npm:^3.0.0"
   bin:
     is-inside-container: cli.js
-  checksum: a8efb0e84f6197e6ff5c64c52890fa9acb49b7b74fed4da7c95383965da6f0fa592b4dbd5e38a79f87fc108196937acdbcd758fcefc9b140e479b39ce1fcd1cd
+  checksum: 10c0/a8efb0e84f6197e6ff5c64c52890fa9acb49b7b74fed4da7c95383965da6f0fa592b4dbd5e38a79f87fc108196937acdbcd758fcefc9b140e479b39ce1fcd1cd
   languageName: node
   linkType: hard
 
 "is-lambda@npm:^1.0.1":
   version: 1.0.1
   resolution: "is-lambda@npm:1.0.1"
-  checksum: 85fee098ae62ba6f1e24cf22678805473c7afd0fb3978a3aa260e354cb7bcb3a5806cf0a98403188465efedec41ab4348e8e4e79305d409601323855b3839d4d
+  checksum: 10c0/85fee098ae62ba6f1e24cf22678805473c7afd0fb3978a3aa260e354cb7bcb3a5806cf0a98403188465efedec41ab4348e8e4e79305d409601323855b3839d4d
   languageName: node
   linkType: hard
 
 "is-map@npm:^2.0.1, is-map@npm:^2.0.2":
   version: 2.0.2
   resolution: "is-map@npm:2.0.2"
-  checksum: 119ff9137a37fd131a72fab3f4ab8c9d6a24b0a1ee26b4eff14dc625900d8675a97785eea5f4174265e2006ed076cc24e89f6e57ebd080a48338d914ec9168a5
+  checksum: 10c0/119ff9137a37fd131a72fab3f4ab8c9d6a24b0a1ee26b4eff14dc625900d8675a97785eea5f4174265e2006ed076cc24e89f6e57ebd080a48338d914ec9168a5
   languageName: node
   linkType: hard
 
 "is-module@npm:^1.0.0":
   version: 1.0.0
   resolution: "is-module@npm:1.0.0"
-  checksum: 795a3914bcae7c26a1c23a1e5574c42eac13429625045737bf3e324ce865c0601d61aee7a5afbca1bee8cb300c7d9647e7dc98860c9bdbc3b7fdc51d8ac0bffc
+  checksum: 10c0/795a3914bcae7c26a1c23a1e5574c42eac13429625045737bf3e324ce865c0601d61aee7a5afbca1bee8cb300c7d9647e7dc98860c9bdbc3b7fdc51d8ac0bffc
   languageName: node
   linkType: hard
 
 "is-negative-zero@npm:^2.0.2":
   version: 2.0.2
   resolution: "is-negative-zero@npm:2.0.2"
-  checksum: eda024c158f70f2017f3415e471b818d314da5ef5be68f801b16314d4a4b6304a74cbed778acf9e2f955bb9c1c5f2935c1be0c7c99e1ad12286f45366217b6a3
+  checksum: 10c0/eda024c158f70f2017f3415e471b818d314da5ef5be68f801b16314d4a4b6304a74cbed778acf9e2f955bb9c1c5f2935c1be0c7c99e1ad12286f45366217b6a3
   languageName: node
   linkType: hard
 
@@ -9614,7 +9614,7 @@ __metadata:
   resolution: "is-number-object@npm:1.0.7"
   dependencies:
     has-tostringtag: "npm:^1.0.0"
-  checksum: aad266da1e530f1804a2b7bd2e874b4869f71c98590b3964f9d06cc9869b18f8d1f4778f838ecd2a11011bce20aeecb53cb269ba916209b79c24580416b74b1b
+  checksum: 10c0/aad266da1e530f1804a2b7bd2e874b4869f71c98590b3964f9d06cc9869b18f8d1f4778f838ecd2a11011bce20aeecb53cb269ba916209b79c24580416b74b1b
   languageName: node
   linkType: hard
 
@@ -9623,28 +9623,28 @@ __metadata:
   resolution: "is-number@npm:3.0.0"
   dependencies:
     kind-of: "npm:^3.0.2"
-  checksum: e639c54640b7f029623df24d3d103901e322c0c25ea5bde97cd723c2d0d4c05857a8364ab5c58d963089dbed6bf1d0ffe975cb6aef917e2ad0ccbca653d31b4f
+  checksum: 10c0/e639c54640b7f029623df24d3d103901e322c0c25ea5bde97cd723c2d0d4c05857a8364ab5c58d963089dbed6bf1d0ffe975cb6aef917e2ad0ccbca653d31b4f
   languageName: node
   linkType: hard
 
 "is-number@npm:^7.0.0":
   version: 7.0.0
   resolution: "is-number@npm:7.0.0"
-  checksum: b4686d0d3053146095ccd45346461bc8e53b80aeb7671cc52a4de02dbbf7dc0d1d2a986e2fe4ae206984b4d34ef37e8b795ebc4f4295c978373e6575e295d811
+  checksum: 10c0/b4686d0d3053146095ccd45346461bc8e53b80aeb7671cc52a4de02dbbf7dc0d1d2a986e2fe4ae206984b4d34ef37e8b795ebc4f4295c978373e6575e295d811
   languageName: node
   linkType: hard
 
 "is-obj@npm:^1.0.1":
   version: 1.0.1
   resolution: "is-obj@npm:1.0.1"
-  checksum: 5003acba0af7aa47dfe0760e545a89bbac89af37c12092c3efadc755372cdaec034f130e7a3653a59eb3c1843cfc72ca71eaf1a6c3bafe5a0bab3611a47f9945
+  checksum: 10c0/5003acba0af7aa47dfe0760e545a89bbac89af37c12092c3efadc755372cdaec034f130e7a3653a59eb3c1843cfc72ca71eaf1a6c3bafe5a0bab3611a47f9945
   languageName: node
   linkType: hard
 
 "is-path-cwd@npm:^2.0.0":
   version: 2.2.0
   resolution: "is-path-cwd@npm:2.2.0"
-  checksum: afce71533a427a759cd0329301c18950333d7589533c2c90205bd3fdcf7b91eb92d1940493190567a433134d2128ec9325de2fd281e05be1920fbee9edd22e0a
+  checksum: 10c0/afce71533a427a759cd0329301c18950333d7589533c2c90205bd3fdcf7b91eb92d1940493190567a433134d2128ec9325de2fd281e05be1920fbee9edd22e0a
   languageName: node
   linkType: hard
 
@@ -9653,7 +9653,7 @@ __metadata:
   resolution: "is-path-in-cwd@npm:2.1.0"
   dependencies:
     is-path-inside: "npm:^2.1.0"
-  checksum: 674a4282fb3732cf4b4e9ea31e06380d8b074fb8106c4c1742a9f0f3d5650bf059b2c45e5c4cfa7abe847ca88474de63abec323a7fe1eb14f8ec4de2fa951d3a
+  checksum: 10c0/674a4282fb3732cf4b4e9ea31e06380d8b074fb8106c4c1742a9f0f3d5650bf059b2c45e5c4cfa7abe847ca88474de63abec323a7fe1eb14f8ec4de2fa951d3a
   languageName: node
   linkType: hard
 
@@ -9662,14 +9662,14 @@ __metadata:
   resolution: "is-path-inside@npm:2.1.0"
   dependencies:
     path-is-inside: "npm:^1.0.2"
-  checksum: 50272b9aa301964c0bc4032d5c968e63c516d15bd7800cd06845df97bee637451fcd92a8001b37e309563eff2dffae5fa6d635a0c1d162dc257489c86b1fda51
+  checksum: 10c0/50272b9aa301964c0bc4032d5c968e63c516d15bd7800cd06845df97bee637451fcd92a8001b37e309563eff2dffae5fa6d635a0c1d162dc257489c86b1fda51
   languageName: node
   linkType: hard
 
 "is-path-inside@npm:^3.0.3":
   version: 3.0.3
   resolution: "is-path-inside@npm:3.0.3"
-  checksum: cf7d4ac35fb96bab6a1d2c3598fe5ebb29aafb52c0aaa482b5a3ed9d8ba3edc11631e3ec2637660c44b3ce0e61a08d54946e8af30dec0b60a7c27296c68ffd05
+  checksum: 10c0/cf7d4ac35fb96bab6a1d2c3598fe5ebb29aafb52c0aaa482b5a3ed9d8ba3edc11631e3ec2637660c44b3ce0e61a08d54946e8af30dec0b60a7c27296c68ffd05
   languageName: node
   linkType: hard
 
@@ -9678,21 +9678,21 @@ __metadata:
   resolution: "is-plain-object@npm:2.0.4"
   dependencies:
     isobject: "npm:^3.0.1"
-  checksum: f050fdd5203d9c81e8c4df1b3ff461c4bc64e8b5ca383bcdde46131361d0a678e80bcf00b5257646f6c636197629644d53bd8e2375aea633de09a82d57e942f4
+  checksum: 10c0/f050fdd5203d9c81e8c4df1b3ff461c4bc64e8b5ca383bcdde46131361d0a678e80bcf00b5257646f6c636197629644d53bd8e2375aea633de09a82d57e942f4
   languageName: node
   linkType: hard
 
 "is-plain-object@npm:^5.0.0":
   version: 5.0.0
   resolution: "is-plain-object@npm:5.0.0"
-  checksum: 893e42bad832aae3511c71fd61c0bf61aa3a6d853061c62a307261842727d0d25f761ce9379f7ba7226d6179db2a3157efa918e7fe26360f3bf0842d9f28942c
+  checksum: 10c0/893e42bad832aae3511c71fd61c0bf61aa3a6d853061c62a307261842727d0d25f761ce9379f7ba7226d6179db2a3157efa918e7fe26360f3bf0842d9f28942c
   languageName: node
   linkType: hard
 
 "is-potential-custom-element-name@npm:^1.0.1":
   version: 1.0.1
   resolution: "is-potential-custom-element-name@npm:1.0.1"
-  checksum: b73e2f22bc863b0939941d369486d308b43d7aef1f9439705e3582bfccaa4516406865e32c968a35f97a99396dac84e2624e67b0a16b0a15086a785e16ce7db9
+  checksum: 10c0/b73e2f22bc863b0939941d369486d308b43d7aef1f9439705e3582bfccaa4516406865e32c968a35f97a99396dac84e2624e67b0a16b0a15086a785e16ce7db9
   languageName: node
   linkType: hard
 
@@ -9702,21 +9702,21 @@ __metadata:
   dependencies:
     call-bind: "npm:^1.0.2"
     has-tostringtag: "npm:^1.0.0"
-  checksum: bb72aae604a69eafd4a82a93002058c416ace8cde95873589a97fc5dac96a6c6c78a9977d487b7b95426a8f5073969124dd228f043f9f604f041f32fcc465fc1
+  checksum: 10c0/bb72aae604a69eafd4a82a93002058c416ace8cde95873589a97fc5dac96a6c6c78a9977d487b7b95426a8f5073969124dd228f043f9f604f041f32fcc465fc1
   languageName: node
   linkType: hard
 
 "is-regexp@npm:^1.0.0":
   version: 1.0.0
   resolution: "is-regexp@npm:1.0.0"
-  checksum: 34cacda1901e00f6e44879378f1d2fa96320ea956c1bec27713130aaf1d44f6e7bd963eed28945bfe37e600cb27df1cf5207302680dad8bdd27b9baff8ecf611
+  checksum: 10c0/34cacda1901e00f6e44879378f1d2fa96320ea956c1bec27713130aaf1d44f6e7bd963eed28945bfe37e600cb27df1cf5207302680dad8bdd27b9baff8ecf611
   languageName: node
   linkType: hard
 
 "is-set@npm:^2.0.1, is-set@npm:^2.0.2":
   version: 2.0.2
   resolution: "is-set@npm:2.0.2"
-  checksum: 5f8bd1880df8c0004ce694e315e6e1e47a3452014be792880bb274a3b2cdb952fdb60789636ca6e084c7947ca8b7ae03ccaf54c93a7fcfed228af810559e5432
+  checksum: 10c0/5f8bd1880df8c0004ce694e315e6e1e47a3452014be792880bb274a3b2cdb952fdb60789636ca6e084c7947ca8b7ae03ccaf54c93a7fcfed228af810559e5432
   languageName: node
   linkType: hard
 
@@ -9725,28 +9725,28 @@ __metadata:
   resolution: "is-shared-array-buffer@npm:1.0.2"
   dependencies:
     call-bind: "npm:^1.0.2"
-  checksum: cfeee6f171f1b13e6cbc6f3b6cc44e192b93df39f3fcb31aa66ffb1d2df3b91e05664311659f9701baba62f5e98c83b0673c628e7adc30f55071c4874fcdccec
+  checksum: 10c0/cfeee6f171f1b13e6cbc6f3b6cc44e192b93df39f3fcb31aa66ffb1d2df3b91e05664311659f9701baba62f5e98c83b0673c628e7adc30f55071c4874fcdccec
   languageName: node
   linkType: hard
 
 "is-stream@npm:^1.1.0":
   version: 1.1.0
   resolution: "is-stream@npm:1.1.0"
-  checksum: b8ae7971e78d2e8488d15f804229c6eed7ed36a28f8807a1815938771f4adff0e705218b7dab968270433f67103e4fef98062a0beea55d64835f705ee72c7002
+  checksum: 10c0/b8ae7971e78d2e8488d15f804229c6eed7ed36a28f8807a1815938771f4adff0e705218b7dab968270433f67103e4fef98062a0beea55d64835f705ee72c7002
   languageName: node
   linkType: hard
 
 "is-stream@npm:^2.0.0":
   version: 2.0.1
   resolution: "is-stream@npm:2.0.1"
-  checksum: 7c284241313fc6efc329b8d7f08e16c0efeb6baab1b4cd0ba579eb78e5af1aa5da11e68559896a2067cd6c526bd29241dda4eb1225e627d5aa1a89a76d4635a5
+  checksum: 10c0/7c284241313fc6efc329b8d7f08e16c0efeb6baab1b4cd0ba579eb78e5af1aa5da11e68559896a2067cd6c526bd29241dda4eb1225e627d5aa1a89a76d4635a5
   languageName: node
   linkType: hard
 
 "is-stream@npm:^3.0.0":
   version: 3.0.0
   resolution: "is-stream@npm:3.0.0"
-  checksum: eb2f7127af02ee9aa2a0237b730e47ac2de0d4e76a4a905a50a11557f2339df5765eaea4ceb8029f1efa978586abe776908720bfcb1900c20c6ec5145f6f29d8
+  checksum: 10c0/eb2f7127af02ee9aa2a0237b730e47ac2de0d4e76a4a905a50a11557f2339df5765eaea4ceb8029f1efa978586abe776908720bfcb1900c20c6ec5145f6f29d8
   languageName: node
   linkType: hard
 
@@ -9755,7 +9755,7 @@ __metadata:
   resolution: "is-string@npm:1.0.7"
   dependencies:
     has-tostringtag: "npm:^1.0.0"
-  checksum: 905f805cbc6eedfa678aaa103ab7f626aac9ebbdc8737abb5243acaa61d9820f8edc5819106b8fcd1839e33db21de9f0116ae20de380c8382d16dc2a601921f6
+  checksum: 10c0/905f805cbc6eedfa678aaa103ab7f626aac9ebbdc8737abb5243acaa61d9820f8edc5819106b8fcd1839e33db21de9f0116ae20de380c8382d16dc2a601921f6
   languageName: node
   linkType: hard
 
@@ -9764,7 +9764,7 @@ __metadata:
   resolution: "is-symbol@npm:1.0.4"
   dependencies:
     has-symbols: "npm:^1.0.2"
-  checksum: 9381dd015f7c8906154dbcbf93fad769de16b4b961edc94f88d26eb8c555935caa23af88bda0c93a18e65560f6d7cca0fd5a3f8a8e1df6f1abbb9bead4502ef7
+  checksum: 10c0/9381dd015f7c8906154dbcbf93fad769de16b4b961edc94f88d26eb8c555935caa23af88bda0c93a18e65560f6d7cca0fd5a3f8a8e1df6f1abbb9bead4502ef7
   languageName: node
   linkType: hard
 
@@ -9773,21 +9773,21 @@ __metadata:
   resolution: "is-typed-array@npm:1.1.12"
   dependencies:
     which-typed-array: "npm:^1.1.11"
-  checksum: 9863e9cc7223c6fc1c462a2c3898a7beff6b41b1ee0fabb03b7d278ae7de670b5bcbc8627db56bb66ed60902fa37d53fe5cce0fd2f7d73ac64fe5da6f409b6ae
+  checksum: 10c0/9863e9cc7223c6fc1c462a2c3898a7beff6b41b1ee0fabb03b7d278ae7de670b5bcbc8627db56bb66ed60902fa37d53fe5cce0fd2f7d73ac64fe5da6f409b6ae
   languageName: node
   linkType: hard
 
 "is-url@npm:^1.2.4":
   version: 1.2.4
   resolution: "is-url@npm:1.2.4"
-  checksum: 0157a79874f8f95fdd63540e3f38c8583c2ef572661cd0693cda80ae3e42dfe8e9a4a972ec1b827f861d9a9acf75b37f7d58a37f94a8a053259642912c252bc3
+  checksum: 10c0/0157a79874f8f95fdd63540e3f38c8583c2ef572661cd0693cda80ae3e42dfe8e9a4a972ec1b827f861d9a9acf75b37f7d58a37f94a8a053259642912c252bc3
   languageName: node
   linkType: hard
 
 "is-weakmap@npm:^2.0.1":
   version: 2.0.1
   resolution: "is-weakmap@npm:2.0.1"
-  checksum: 9c9fec9efa7bf5030a4a927f33fff2a6976b93646259f92b517d3646c073cc5b98283a162ce75c412b060a46de07032444b530f0a4c9b6e012ef8f1741c3a987
+  checksum: 10c0/9c9fec9efa7bf5030a4a927f33fff2a6976b93646259f92b517d3646c073cc5b98283a162ce75c412b060a46de07032444b530f0a4c9b6e012ef8f1741c3a987
   languageName: node
   linkType: hard
 
@@ -9796,7 +9796,7 @@ __metadata:
   resolution: "is-weakref@npm:1.0.2"
   dependencies:
     call-bind: "npm:^1.0.2"
-  checksum: 1545c5d172cb690c392f2136c23eec07d8d78a7f57d0e41f10078aa4f5daf5d7f57b6513a67514ab4f073275ad00c9822fc8935e00229d0a2089e1c02685d4b1
+  checksum: 10c0/1545c5d172cb690c392f2136c23eec07d8d78a7f57d0e41f10078aa4f5daf5d7f57b6513a67514ab4f073275ad00c9822fc8935e00229d0a2089e1c02685d4b1
   languageName: node
   linkType: hard
 
@@ -9806,21 +9806,21 @@ __metadata:
   dependencies:
     call-bind: "npm:^1.0.2"
     get-intrinsic: "npm:^1.1.1"
-  checksum: ef5136bd446ae4603229b897f73efd0720c6ab3ec6cc05c8d5c4b51aa9f95164713c4cad0a22ff1fedf04865ff86cae4648bc1d5eead4b6388e1150525af1cc1
+  checksum: 10c0/ef5136bd446ae4603229b897f73efd0720c6ab3ec6cc05c8d5c4b51aa9f95164713c4cad0a22ff1fedf04865ff86cae4648bc1d5eead4b6388e1150525af1cc1
   languageName: node
   linkType: hard
 
 "is-windows@npm:^1.0.1, is-windows@npm:^1.0.2":
   version: 1.0.2
   resolution: "is-windows@npm:1.0.2"
-  checksum: b32f418ab3385604a66f1b7a3ce39d25e8881dee0bd30816dc8344ef6ff9df473a732bcc1ec4e84fe99b2f229ae474f7133e8e93f9241686cfcf7eebe53ba7a5
+  checksum: 10c0/b32f418ab3385604a66f1b7a3ce39d25e8881dee0bd30816dc8344ef6ff9df473a732bcc1ec4e84fe99b2f229ae474f7133e8e93f9241686cfcf7eebe53ba7a5
   languageName: node
   linkType: hard
 
 "is-wsl@npm:^1.1.0":
   version: 1.1.0
   resolution: "is-wsl@npm:1.1.0"
-  checksum: 7ad0012f21092d6f586c7faad84755a8ef0da9b9ec295e4dc82313cce4e1a93a3da3c217265016461f9b141503fe55fa6eb1fd5457d3f05e8d1bdbb48e50c13a
+  checksum: 10c0/7ad0012f21092d6f586c7faad84755a8ef0da9b9ec295e4dc82313cce4e1a93a3da3c217265016461f9b141503fe55fa6eb1fd5457d3f05e8d1bdbb48e50c13a
   languageName: node
   linkType: hard
 
@@ -9829,42 +9829,42 @@ __metadata:
   resolution: "is-wsl@npm:2.2.0"
   dependencies:
     is-docker: "npm:^2.0.0"
-  checksum: a6fa2d370d21be487c0165c7a440d567274fbba1a817f2f0bfa41cc5e3af25041d84267baa22df66696956038a43973e72fca117918c91431920bdef490fa25e
+  checksum: 10c0/a6fa2d370d21be487c0165c7a440d567274fbba1a817f2f0bfa41cc5e3af25041d84267baa22df66696956038a43973e72fca117918c91431920bdef490fa25e
   languageName: node
   linkType: hard
 
 "isarray@npm:0.0.1":
   version: 0.0.1
   resolution: "isarray@npm:0.0.1"
-  checksum: ed1e62da617f71fe348907c71743b5ed550448b455f8d269f89a7c7ddb8ae6e962de3dab6a74a237b06f5eb7f6ece7a45ada8ce96d87fe972926530f91ae3311
+  checksum: 10c0/ed1e62da617f71fe348907c71743b5ed550448b455f8d269f89a7c7ddb8ae6e962de3dab6a74a237b06f5eb7f6ece7a45ada8ce96d87fe972926530f91ae3311
   languageName: node
   linkType: hard
 
 "isarray@npm:1.0.0, isarray@npm:^1.0.0, isarray@npm:~1.0.0":
   version: 1.0.0
   resolution: "isarray@npm:1.0.0"
-  checksum: 18b5be6669be53425f0b84098732670ed4e727e3af33bc7f948aac01782110eb9a18b3b329c5323bcdd3acdaae547ee077d3951317e7f133bff7105264b3003d
+  checksum: 10c0/18b5be6669be53425f0b84098732670ed4e727e3af33bc7f948aac01782110eb9a18b3b329c5323bcdd3acdaae547ee077d3951317e7f133bff7105264b3003d
   languageName: node
   linkType: hard
 
 "isarray@npm:^2.0.5":
   version: 2.0.5
   resolution: "isarray@npm:2.0.5"
-  checksum: 4199f14a7a13da2177c66c31080008b7124331956f47bca57dd0b6ea9f11687aa25e565a2c7a2b519bc86988d10398e3049a1f5df13c9f6b7664154690ae79fd
+  checksum: 10c0/4199f14a7a13da2177c66c31080008b7124331956f47bca57dd0b6ea9f11687aa25e565a2c7a2b519bc86988d10398e3049a1f5df13c9f6b7664154690ae79fd
   languageName: node
   linkType: hard
 
 "isexe@npm:^2.0.0":
   version: 2.0.0
   resolution: "isexe@npm:2.0.0"
-  checksum: 228cfa503fadc2c31596ab06ed6aa82c9976eec2bfd83397e7eaf06d0ccf42cd1dfd6743bf9aeb01aebd4156d009994c5f76ea898d2832c1fe342da923ca457d
+  checksum: 10c0/228cfa503fadc2c31596ab06ed6aa82c9976eec2bfd83397e7eaf06d0ccf42cd1dfd6743bf9aeb01aebd4156d009994c5f76ea898d2832c1fe342da923ca457d
   languageName: node
   linkType: hard
 
 "isexe@npm:^3.1.1":
   version: 3.1.1
   resolution: "isexe@npm:3.1.1"
-  checksum: 9ec257654093443eb0a528a9c8cbba9c0ca7616ccb40abd6dde7202734d96bb86e4ac0d764f0f8cd965856aacbff2f4ce23e730dc19dfb41e3b0d865ca6fdcc7
+  checksum: 10c0/9ec257654093443eb0a528a9c8cbba9c0ca7616ccb40abd6dde7202734d96bb86e4ac0d764f0f8cd965856aacbff2f4ce23e730dc19dfb41e3b0d865ca6fdcc7
   languageName: node
   linkType: hard
 
@@ -9873,21 +9873,21 @@ __metadata:
   resolution: "isobject@npm:2.1.0"
   dependencies:
     isarray: "npm:1.0.0"
-  checksum: c4cafec73b3b2ee11be75dff8dafd283b5728235ac099b07d7873d5182553a707768e208327bbc12931b9422d8822280bf88d894a0024ff5857b3efefb480e7b
+  checksum: 10c0/c4cafec73b3b2ee11be75dff8dafd283b5728235ac099b07d7873d5182553a707768e208327bbc12931b9422d8822280bf88d894a0024ff5857b3efefb480e7b
   languageName: node
   linkType: hard
 
 "isobject@npm:^3.0.0, isobject@npm:^3.0.1":
   version: 3.0.1
   resolution: "isobject@npm:3.0.1"
-  checksum: 03344f5064a82f099a0cd1a8a407f4c0d20b7b8485e8e816c39f249e9416b06c322e8dec5b842b6bb8a06de0af9cb48e7bc1b5352f0fadc2f0abac033db3d4db
+  checksum: 10c0/03344f5064a82f099a0cd1a8a407f4c0d20b7b8485e8e816c39f249e9416b06c322e8dec5b842b6bb8a06de0af9cb48e7bc1b5352f0fadc2f0abac033db3d4db
   languageName: node
   linkType: hard
 
 "istanbul-lib-coverage@npm:^3.0.0, istanbul-lib-coverage@npm:^3.2.0":
   version: 3.2.0
   resolution: "istanbul-lib-coverage@npm:3.2.0"
-  checksum: 10ecb00a50cac2f506af8231ce523ffa1ac1310db0435c8ffaabb50c1d72539906583aa13c84f8835dc103998b9989edc3c1de989d2e2a96a91a9ba44e5db6b9
+  checksum: 10c0/10ecb00a50cac2f506af8231ce523ffa1ac1310db0435c8ffaabb50c1d72539906583aa13c84f8835dc103998b9989edc3c1de989d2e2a96a91a9ba44e5db6b9
   languageName: node
   linkType: hard
 
@@ -9900,7 +9900,7 @@ __metadata:
     "@istanbuljs/schema": "npm:^0.1.2"
     istanbul-lib-coverage: "npm:^3.2.0"
     semver: "npm:^6.3.0"
-  checksum: 8a1bdf3e377dcc0d33ec32fe2b6ecacdb1e4358fd0eb923d4326bb11c67622c0ceb99600a680f3dad5d29c66fc1991306081e339b4d43d0b8a2ab2e1d910a6ee
+  checksum: 10c0/8a1bdf3e377dcc0d33ec32fe2b6ecacdb1e4358fd0eb923d4326bb11c67622c0ceb99600a680f3dad5d29c66fc1991306081e339b4d43d0b8a2ab2e1d910a6ee
   languageName: node
   linkType: hard
 
@@ -9913,7 +9913,7 @@ __metadata:
     "@istanbuljs/schema": "npm:^0.1.2"
     istanbul-lib-coverage: "npm:^3.2.0"
     semver: "npm:^7.5.4"
-  checksum: 313d61aca3f82a04ad9377841d05061d603ea3d4a4dd281fdda2479ec4ddbc86dc1792c73651f21c93480570d1ecadc5f63011e2df86f30ee662b62c0c00e3d8
+  checksum: 10c0/313d61aca3f82a04ad9377841d05061d603ea3d4a4dd281fdda2479ec4ddbc86dc1792c73651f21c93480570d1ecadc5f63011e2df86f30ee662b62c0c00e3d8
   languageName: node
   linkType: hard
 
@@ -9924,7 +9924,7 @@ __metadata:
     istanbul-lib-coverage: "npm:^3.0.0"
     make-dir: "npm:^4.0.0"
     supports-color: "npm:^7.1.0"
-  checksum: 84323afb14392de8b6a5714bd7e9af845cfbd56cfe71ed276cda2f5f1201aea673c7111901227ee33e68e4364e288d73861eb2ed48f6679d1e69a43b6d9b3ba7
+  checksum: 10c0/84323afb14392de8b6a5714bd7e9af845cfbd56cfe71ed276cda2f5f1201aea673c7111901227ee33e68e4364e288d73861eb2ed48f6679d1e69a43b6d9b3ba7
   languageName: node
   linkType: hard
 
@@ -9935,7 +9935,7 @@ __metadata:
     debug: "npm:^4.1.1"
     istanbul-lib-coverage: "npm:^3.0.0"
     source-map: "npm:^0.6.1"
-  checksum: 19e4cc405016f2c906dff271a76715b3e881fa9faeb3f09a86cb99b8512b3a5ed19cadfe0b54c17ca0e54c1142c9c6de9330d65506e35873994e06634eebeb66
+  checksum: 10c0/19e4cc405016f2c906dff271a76715b3e881fa9faeb3f09a86cb99b8512b3a5ed19cadfe0b54c17ca0e54c1142c9c6de9330d65506e35873994e06634eebeb66
   languageName: node
   linkType: hard
 
@@ -9945,7 +9945,7 @@ __metadata:
   dependencies:
     html-escaper: "npm:^2.0.0"
     istanbul-lib-report: "npm:^3.0.0"
-  checksum: ec3f1bdbc51b3e0b325a5b9f4ad31a247697f31001df4e81075f7980413f14da1b5adfec574fd156efd3b0464023f61320f6718efc66ee72b32d89611cef99dd
+  checksum: 10c0/ec3f1bdbc51b3e0b325a5b9f4ad31a247697f31001df4e81075f7980413f14da1b5adfec574fd156efd3b0464023f61320f6718efc66ee72b32d89611cef99dd
   languageName: node
   linkType: hard
 
@@ -9958,7 +9958,7 @@ __metadata:
     has-symbols: "npm:^1.0.3"
     reflect.getprototypeof: "npm:^1.0.4"
     set-function-name: "npm:^2.0.1"
-  checksum: a32151326095e916f306990d909f6bbf23e3221999a18ba686419535dcd1749b10ded505e89334b77dc4c7a58a8508978f0eb16c2c8573e6d412eb7eb894ea79
+  checksum: 10c0/a32151326095e916f306990d909f6bbf23e3221999a18ba686419535dcd1749b10ded505e89334b77dc4c7a58a8508978f0eb16c2c8573e6d412eb7eb894ea79
   languageName: node
   linkType: hard
 
@@ -9971,7 +9971,7 @@ __metadata:
   dependenciesMeta:
     "@pkgjs/parseargs":
       optional: true
-  checksum: f01d8f972d894cd7638bc338e9ef5ddb86f7b208ce177a36d718eac96ec86638a6efa17d0221b10073e64b45edc2ce15340db9380b1f5d5c5d000cbc517dc111
+  checksum: 10c0/f01d8f972d894cd7638bc338e9ef5ddb86f7b208ce177a36d718eac96ec86638a6efa17d0221b10073e64b45edc2ce15340db9380b1f5d5c5d000cbc517dc111
   languageName: node
   linkType: hard
 
@@ -9985,7 +9985,7 @@ __metadata:
     minimatch: "npm:^3.1.2"
   bin:
     jake: bin/cli.js
-  checksum: 89326d01a8bc110d02d973729a66394c79a34b34461116f5c530a2a2dbc30265683fe6737928f75df9178e9d369ff1442f5753fb983d525e740eefdadc56a103
+  checksum: 10c0/89326d01a8bc110d02d973729a66394c79a34b34461116f5c530a2a2dbc30265683fe6737928f75df9178e9d369ff1442f5753fb983d525e740eefdadc56a103
   languageName: node
   linkType: hard
 
@@ -9996,7 +9996,7 @@ __metadata:
     execa: "npm:^5.0.0"
     jest-util: "npm:^29.7.0"
     p-limit: "npm:^3.1.0"
-  checksum: e071384d9e2f6bb462231ac53f29bff86f0e12394c1b49ccafbad225ce2ab7da226279a8a94f421949920bef9be7ef574fd86aee22e8adfa149be73554ab828b
+  checksum: 10c0/e071384d9e2f6bb462231ac53f29bff86f0e12394c1b49ccafbad225ce2ab7da226279a8a94f421949920bef9be7ef574fd86aee22e8adfa149be73554ab828b
   languageName: node
   linkType: hard
 
@@ -10024,7 +10024,7 @@ __metadata:
     pure-rand: "npm:^6.0.0"
     slash: "npm:^3.0.0"
     stack-utils: "npm:^2.0.3"
-  checksum: 8d15344cf7a9f14e926f0deed64ed190c7a4fa1ed1acfcd81e4cc094d3cc5bf7902ebb7b874edc98ada4185688f90c91e1747e0dfd7ac12463b097968ae74b5e
+  checksum: 10c0/8d15344cf7a9f14e926f0deed64ed190c7a4fa1ed1acfcd81e4cc094d3cc5bf7902ebb7b874edc98ada4185688f90c91e1747e0dfd7ac12463b097968ae74b5e
   languageName: node
   linkType: hard
 
@@ -10050,7 +10050,7 @@ __metadata:
       optional: true
   bin:
     jest: bin/jest.js
-  checksum: a658fd55050d4075d65c1066364595962ead7661711495cfa1dfeecf3d6d0a8ffec532f3dbd8afbb3e172dd5fd2fb2e813c5e10256e7cf2fea766314942fb43a
+  checksum: 10c0/a658fd55050d4075d65c1066364595962ead7661711495cfa1dfeecf3d6d0a8ffec532f3dbd8afbb3e172dd5fd2fb2e813c5e10256e7cf2fea766314942fb43a
   languageName: node
   linkType: hard
 
@@ -10088,7 +10088,7 @@ __metadata:
       optional: true
     ts-node:
       optional: true
-  checksum: bab23c2eda1fff06e0d104b00d6adfb1d1aabb7128441899c9bff2247bd26710b050a5364281ce8d52b46b499153bf7e3ee88b19831a8f3451f1477a0246a0f1
+  checksum: 10c0/bab23c2eda1fff06e0d104b00d6adfb1d1aabb7128441899c9bff2247bd26710b050a5364281ce8d52b46b499153bf7e3ee88b19831a8f3451f1477a0246a0f1
   languageName: node
   linkType: hard
 
@@ -10100,7 +10100,7 @@ __metadata:
     diff-sequences: "npm:^29.6.3"
     jest-get-type: "npm:^29.6.3"
     pretty-format: "npm:^29.7.0"
-  checksum: 89a4a7f182590f56f526443dde69acefb1f2f0c9e59253c61d319569856c4931eae66b8a3790c443f529267a0ddba5ba80431c585deed81827032b2b2a1fc999
+  checksum: 10c0/89a4a7f182590f56f526443dde69acefb1f2f0c9e59253c61d319569856c4931eae66b8a3790c443f529267a0ddba5ba80431c585deed81827032b2b2a1fc999
   languageName: node
   linkType: hard
 
@@ -10109,7 +10109,7 @@ __metadata:
   resolution: "jest-docblock@npm:29.7.0"
   dependencies:
     detect-newline: "npm:^3.0.0"
-  checksum: d932a8272345cf6b6142bb70a2bb63e0856cc0093f082821577ea5bdf4643916a98744dfc992189d2b1417c38a11fa42466f6111526bc1fb81366f56410f3be9
+  checksum: 10c0/d932a8272345cf6b6142bb70a2bb63e0856cc0093f082821577ea5bdf4643916a98744dfc992189d2b1417c38a11fa42466f6111526bc1fb81366f56410f3be9
   languageName: node
   linkType: hard
 
@@ -10122,7 +10122,7 @@ __metadata:
     jest-get-type: "npm:^29.6.3"
     jest-util: "npm:^29.7.0"
     pretty-format: "npm:^29.7.0"
-  checksum: f7f9a90ebee80cc688e825feceb2613627826ac41ea76a366fa58e669c3b2403d364c7c0a74d862d469b103c843154f8456d3b1c02b487509a12afa8b59edbb4
+  checksum: 10c0/f7f9a90ebee80cc688e825feceb2613627826ac41ea76a366fa58e669c3b2403d364c7c0a74d862d469b103c843154f8456d3b1c02b487509a12afa8b59edbb4
   languageName: node
   linkType: hard
 
@@ -10143,7 +10143,7 @@ __metadata:
   peerDependenciesMeta:
     canvas:
       optional: true
-  checksum: 139b94e2c8ec1bb5a46ce17df5211da65ce867354b3fd4e00fa6a0d1da95902df4cf7881273fc6ea937e5c325d39d6773f0d41b6c469363334de9d489d2c321f
+  checksum: 10c0/139b94e2c8ec1bb5a46ce17df5211da65ce867354b3fd4e00fa6a0d1da95902df4cf7881273fc6ea937e5c325d39d6773f0d41b6c469363334de9d489d2c321f
   languageName: node
   linkType: hard
 
@@ -10157,14 +10157,14 @@ __metadata:
     "@types/node": "npm:*"
     jest-mock: "npm:^29.7.0"
     jest-util: "npm:^29.7.0"
-  checksum: 61f04fec077f8b1b5c1a633e3612fc0c9aa79a0ab7b05600683428f1e01a4d35346c474bde6f439f9fcc1a4aa9a2861ff852d079a43ab64b02105d1004b2592b
+  checksum: 10c0/61f04fec077f8b1b5c1a633e3612fc0c9aa79a0ab7b05600683428f1e01a4d35346c474bde6f439f9fcc1a4aa9a2861ff852d079a43ab64b02105d1004b2592b
   languageName: node
   linkType: hard
 
 "jest-get-type@npm:^29.6.3":
   version: 29.6.3
   resolution: "jest-get-type@npm:29.6.3"
-  checksum: 552e7a97a983d3c2d4e412a44eb7de0430ff773dd99f7500962c268d6dfbfa431d7d08f919c9d960530e5f7f78eb47f267ad9b318265e5092b3ff9ede0db7c2b
+  checksum: 10c0/552e7a97a983d3c2d4e412a44eb7de0430ff773dd99f7500962c268d6dfbfa431d7d08f919c9d960530e5f7f78eb47f267ad9b318265e5092b3ff9ede0db7c2b
   languageName: node
   linkType: hard
 
@@ -10187,7 +10187,7 @@ __metadata:
   dependenciesMeta:
     fsevents:
       optional: true
-  checksum: 2683a8f29793c75a4728787662972fedd9267704c8f7ef9d84f2beed9a977f1cf5e998c07b6f36ba5603f53cb010c911fe8cd0ac9886e073fe28ca66beefd30c
+  checksum: 10c0/2683a8f29793c75a4728787662972fedd9267704c8f7ef9d84f2beed9a977f1cf5e998c07b6f36ba5603f53cb010c911fe8cd0ac9886e073fe28ca66beefd30c
   languageName: node
   linkType: hard
 
@@ -10197,7 +10197,7 @@ __metadata:
   dependencies:
     jest-get-type: "npm:^29.6.3"
     pretty-format: "npm:^29.7.0"
-  checksum: 71bb9f77fc489acb842a5c7be030f2b9acb18574dc9fb98b3100fc57d422b1abc55f08040884bd6e6dbf455047a62f7eaff12aa4058f7cbdc11558718ca6a395
+  checksum: 10c0/71bb9f77fc489acb842a5c7be030f2b9acb18574dc9fb98b3100fc57d422b1abc55f08040884bd6e6dbf455047a62f7eaff12aa4058f7cbdc11558718ca6a395
   languageName: node
   linkType: hard
 
@@ -10209,7 +10209,7 @@ __metadata:
     jest-diff: "npm:^29.7.0"
     jest-get-type: "npm:^29.6.3"
     pretty-format: "npm:^29.7.0"
-  checksum: 0d0e70b28fa5c7d4dce701dc1f46ae0922102aadc24ed45d594dd9b7ae0a8a6ef8b216718d1ab79e451291217e05d4d49a82666e1a3cc2b428b75cd9c933244e
+  checksum: 10c0/0d0e70b28fa5c7d4dce701dc1f46ae0922102aadc24ed45d594dd9b7ae0a8a6ef8b216718d1ab79e451291217e05d4d49a82666e1a3cc2b428b75cd9c933244e
   languageName: node
   linkType: hard
 
@@ -10226,7 +10226,7 @@ __metadata:
     pretty-format: "npm:^29.7.0"
     slash: "npm:^3.0.0"
     stack-utils: "npm:^2.0.3"
-  checksum: 850ae35477f59f3e6f27efac5215f706296e2104af39232bb14e5403e067992afb5c015e87a9243ec4d9df38525ef1ca663af9f2f4766aa116f127247008bd22
+  checksum: 10c0/850ae35477f59f3e6f27efac5215f706296e2104af39232bb14e5403e067992afb5c015e87a9243ec4d9df38525ef1ca663af9f2f4766aa116f127247008bd22
   languageName: node
   linkType: hard
 
@@ -10237,7 +10237,7 @@ __metadata:
     "@jest/types": "npm:^29.6.3"
     "@types/node": "npm:*"
     jest-util: "npm:^29.7.0"
-  checksum: 7b9f8349ee87695a309fe15c46a74ab04c853369e5c40952d68061d9dc3159a0f0ed73e215f81b07ee97a9faaf10aebe5877a9d6255068a0977eae6a9ff1d5ac
+  checksum: 10c0/7b9f8349ee87695a309fe15c46a74ab04c853369e5c40952d68061d9dc3159a0f0ed73e215f81b07ee97a9faaf10aebe5877a9d6255068a0977eae6a9ff1d5ac
   languageName: node
   linkType: hard
 
@@ -10249,14 +10249,14 @@ __metadata:
   peerDependenciesMeta:
     jest-resolve:
       optional: true
-  checksum: 86eec0c78449a2de733a6d3e316d49461af6a858070e113c97f75fb742a48c2396ea94150cbca44159ffd4a959f743a47a8b37a792ef6fdad2cf0a5cba973fac
+  checksum: 10c0/86eec0c78449a2de733a6d3e316d49461af6a858070e113c97f75fb742a48c2396ea94150cbca44159ffd4a959f743a47a8b37a792ef6fdad2cf0a5cba973fac
   languageName: node
   linkType: hard
 
 "jest-regex-util@npm:^29.6.3":
   version: 29.6.3
   resolution: "jest-regex-util@npm:29.6.3"
-  checksum: 4e33fb16c4f42111159cafe26397118dcfc4cf08bc178a67149fb05f45546a91928b820894572679d62559839d0992e21080a1527faad65daaae8743a5705a3b
+  checksum: 10c0/4e33fb16c4f42111159cafe26397118dcfc4cf08bc178a67149fb05f45546a91928b820894572679d62559839d0992e21080a1527faad65daaae8743a5705a3b
   languageName: node
   linkType: hard
 
@@ -10266,7 +10266,7 @@ __metadata:
   dependencies:
     jest-regex-util: "npm:^29.6.3"
     jest-snapshot: "npm:^29.7.0"
-  checksum: b6e9ad8ae5b6049474118ea6441dfddd385b6d1fc471db0136f7c8fbcfe97137a9665e4f837a9f49f15a29a1deb95a14439b7aec812f3f99d08f228464930f0d
+  checksum: 10c0/b6e9ad8ae5b6049474118ea6441dfddd385b6d1fc471db0136f7c8fbcfe97137a9665e4f837a9f49f15a29a1deb95a14439b7aec812f3f99d08f228464930f0d
   languageName: node
   linkType: hard
 
@@ -10283,7 +10283,7 @@ __metadata:
     resolve: "npm:^1.20.0"
     resolve.exports: "npm:^2.0.0"
     slash: "npm:^3.0.0"
-  checksum: 59da5c9c5b50563e959a45e09e2eace783d7f9ac0b5dcc6375dea4c0db938d2ebda97124c8161310082760e8ebbeff9f6b177c15ca2f57fb424f637a5d2adb47
+  checksum: 10c0/59da5c9c5b50563e959a45e09e2eace783d7f9ac0b5dcc6375dea4c0db938d2ebda97124c8161310082760e8ebbeff9f6b177c15ca2f57fb424f637a5d2adb47
   languageName: node
   linkType: hard
 
@@ -10312,7 +10312,7 @@ __metadata:
     jest-worker: "npm:^29.7.0"
     p-limit: "npm:^3.1.0"
     source-map-support: "npm:0.5.13"
-  checksum: 2194b4531068d939f14c8d3274fe5938b77fa73126aedf9c09ec9dec57d13f22c72a3b5af01ac04f5c1cf2e28d0ac0b4a54212a61b05f10b5d6b47f2a1097bb4
+  checksum: 10c0/2194b4531068d939f14c8d3274fe5938b77fa73126aedf9c09ec9dec57d13f22c72a3b5af01ac04f5c1cf2e28d0ac0b4a54212a61b05f10b5d6b47f2a1097bb4
   languageName: node
   linkType: hard
 
@@ -10342,7 +10342,7 @@ __metadata:
     jest-util: "npm:^29.7.0"
     slash: "npm:^3.0.0"
     strip-bom: "npm:^4.0.0"
-  checksum: 7cd89a1deda0bda7d0941835434e44f9d6b7bd50b5c5d9b0fc9a6c990b2d4d2cab59685ab3cb2850ed4cc37059f6de903af5a50565d7f7f1192a77d3fd6dd2a6
+  checksum: 10c0/7cd89a1deda0bda7d0941835434e44f9d6b7bd50b5c5d9b0fc9a6c990b2d4d2cab59685ab3cb2850ed4cc37059f6de903af5a50565d7f7f1192a77d3fd6dd2a6
   languageName: node
   linkType: hard
 
@@ -10370,7 +10370,7 @@ __metadata:
     natural-compare: "npm:^1.4.0"
     pretty-format: "npm:^29.7.0"
     semver: "npm:^7.5.3"
-  checksum: 6e9003c94ec58172b4a62864a91c0146513207bedf4e0a06e1e2ac70a4484088a2683e3a0538d8ea913bcfd53dc54a9b98a98cdfa562e7fe1d1339aeae1da570
+  checksum: 10c0/6e9003c94ec58172b4a62864a91c0146513207bedf4e0a06e1e2ac70a4484088a2683e3a0538d8ea913bcfd53dc54a9b98a98cdfa562e7fe1d1339aeae1da570
   languageName: node
   linkType: hard
 
@@ -10384,7 +10384,7 @@ __metadata:
     ci-info: "npm:^3.2.0"
     graceful-fs: "npm:^4.2.9"
     picomatch: "npm:^2.2.3"
-  checksum: bc55a8f49fdbb8f51baf31d2a4f312fb66c9db1483b82f602c9c990e659cdd7ec529c8e916d5a89452ecbcfae4949b21b40a7a59d4ffc0cd813a973ab08c8150
+  checksum: 10c0/bc55a8f49fdbb8f51baf31d2a4f312fb66c9db1483b82f602c9c990e659cdd7ec529c8e916d5a89452ecbcfae4949b21b40a7a59d4ffc0cd813a973ab08c8150
   languageName: node
   linkType: hard
 
@@ -10398,7 +10398,7 @@ __metadata:
     jest-get-type: "npm:^29.6.3"
     leven: "npm:^3.1.0"
     pretty-format: "npm:^29.7.0"
-  checksum: a20b930480c1ed68778c739f4739dce39423131bc070cd2505ddede762a5570a256212e9c2401b7ae9ba4d7b7c0803f03c5b8f1561c62348213aba18d9dbece2
+  checksum: 10c0/a20b930480c1ed68778c739f4739dce39423131bc070cd2505ddede762a5570a256212e9c2401b7ae9ba4d7b7c0803f03c5b8f1561c62348213aba18d9dbece2
   languageName: node
   linkType: hard
 
@@ -10414,7 +10414,7 @@ __metadata:
     emittery: "npm:^0.13.1"
     jest-util: "npm:^29.7.0"
     string-length: "npm:^4.0.1"
-  checksum: ec6c75030562fc8f8c727cb8f3b94e75d831fc718785abfc196e1f2a2ebc9a2e38744a15147170039628a853d77a3b695561ce850375ede3a4ee6037a2574567
+  checksum: 10c0/ec6c75030562fc8f8c727cb8f3b94e75d831fc718785abfc196e1f2a2ebc9a2e38744a15147170039628a853d77a3b695561ce850375ede3a4ee6037a2574567
   languageName: node
   linkType: hard
 
@@ -10425,7 +10425,7 @@ __metadata:
     "@types/node": "npm:*"
     merge-stream: "npm:^2.0.0"
     supports-color: "npm:^7.0.0"
-  checksum: 07e4dba650381604cda253ab6d5837fe0279c8d68c25884995b45bfe149a7a1e1b5a97f304b4518f257dac2a9ddc1808d57d650649c3ab855e9e60cf824d2970
+  checksum: 10c0/07e4dba650381604cda253ab6d5837fe0279c8d68c25884995b45bfe149a7a1e1b5a97f304b4518f257dac2a9ddc1808d57d650649c3ab855e9e60cf824d2970
   languageName: node
   linkType: hard
 
@@ -10437,7 +10437,7 @@ __metadata:
     jest-util: "npm:^29.7.0"
     merge-stream: "npm:^2.0.0"
     supports-color: "npm:^8.0.0"
-  checksum: 5570a3a005b16f46c131968b8a5b56d291f9bbb85ff4217e31c80bd8a02e7de799e59a54b95ca28d5c302f248b54cbffde2d177c2f0f52ffcee7504c6eabf660
+  checksum: 10c0/5570a3a005b16f46c131968b8a5b56d291f9bbb85ff4217e31c80bd8a02e7de799e59a54b95ca28d5c302f248b54cbffde2d177c2f0f52ffcee7504c6eabf660
   languageName: node
   linkType: hard
 
@@ -10456,14 +10456,14 @@ __metadata:
       optional: true
   bin:
     jest: bin/jest.js
-  checksum: f40eb8171cf147c617cc6ada49d062fbb03b4da666cb8d39cdbfb739a7d75eea4c3ca150fb072d0d273dce0c753db4d0467d54906ad0293f59c54f9db4a09d8b
+  checksum: 10c0/f40eb8171cf147c617cc6ada49d062fbb03b4da666cb8d39cdbfb739a7d75eea4c3ca150fb072d0d273dce0c753db4d0467d54906ad0293f59c54f9db4a09d8b
   languageName: node
   linkType: hard
 
 "joycon@npm:^3.1.1":
   version: 3.1.1
   resolution: "joycon@npm:3.1.1"
-  checksum: 131fb1e98c9065d067fd49b6e685487ac4ad4d254191d7aa2c9e3b90f4e9ca70430c43cad001602bdbdabcf58717d3b5c5b7461c1bd8e39478c8de706b3fe6ae
+  checksum: 10c0/131fb1e98c9065d067fd49b6e685487ac4ad4d254191d7aa2c9e3b90f4e9ca70430c43cad001602bdbdabcf58717d3b5c5b7461c1bd8e39478c8de706b3fe6ae
   languageName: node
   linkType: hard
 
@@ -10478,21 +10478,21 @@ __metadata:
     yargs-parser: "npm:^20.2.1"
   bin:
     jpeg-autorotate: src/cli.js
-  checksum: 75328e15b7abcaf8b36c980495cb0b37ffabeb8921e8576312deac8139a9e8a66f85d9196f314120e4633c76623d1b595e65ca7a87b679511ffb804f880a1644
+  checksum: 10c0/75328e15b7abcaf8b36c980495cb0b37ffabeb8921e8576312deac8139a9e8a66f85d9196f314120e4633c76623d1b595e65ca7a87b679511ffb804f880a1644
   languageName: node
   linkType: hard
 
 "jpeg-js@npm:^0.4.2":
   version: 0.4.4
   resolution: "jpeg-js@npm:0.4.4"
-  checksum: 4d0d5097f8e55d8bbce6f1dc32ffaf3f43f321f6222e4e6490734fdc6d005322e3bd6fb992c2df7f5b587343b1441a1c333281dc3285bc9116e369fd2a2b43a7
+  checksum: 10c0/4d0d5097f8e55d8bbce6f1dc32ffaf3f43f321f6222e4e6490734fdc6d005322e3bd6fb992c2df7f5b587343b1441a1c333281dc3285bc9116e369fd2a2b43a7
   languageName: node
   linkType: hard
 
 "js-tokens@npm:^3.0.0 || ^4.0.0, js-tokens@npm:^4.0.0":
   version: 4.0.0
   resolution: "js-tokens@npm:4.0.0"
-  checksum: e248708d377aa058eacf2037b07ded847790e6de892bbad3dac0abba2e759cb9f121b00099a65195616badcb6eca8d14d975cb3e89eb1cfda644756402c8aeed
+  checksum: 10c0/e248708d377aa058eacf2037b07ded847790e6de892bbad3dac0abba2e759cb9f121b00099a65195616badcb6eca8d14d975cb3e89eb1cfda644756402c8aeed
   languageName: node
   linkType: hard
 
@@ -10504,7 +10504,7 @@ __metadata:
     esprima: "npm:^4.0.0"
   bin:
     js-yaml: bin/js-yaml.js
-  checksum: 6746baaaeac312c4db8e75fa22331d9a04cccb7792d126ed8ce6a0bbcfef0cedaddd0c5098fade53db067c09fe00aa1c957674b4765610a8b06a5a189e46433b
+  checksum: 10c0/6746baaaeac312c4db8e75fa22331d9a04cccb7792d126ed8ce6a0bbcfef0cedaddd0c5098fade53db067c09fe00aa1c957674b4765610a8b06a5a189e46433b
   languageName: node
   linkType: hard
 
@@ -10515,14 +10515,14 @@ __metadata:
     argparse: "npm:^2.0.1"
   bin:
     js-yaml: bin/js-yaml.js
-  checksum: 184a24b4eaacfce40ad9074c64fd42ac83cf74d8c8cd137718d456ced75051229e5061b8633c3366b8aada17945a7a356b337828c19da92b51ae62126575018f
+  checksum: 10c0/184a24b4eaacfce40ad9074c64fd42ac83cf74d8c8cd137718d456ced75051229e5061b8633c3366b8aada17945a7a356b337828c19da92b51ae62126575018f
   languageName: node
   linkType: hard
 
 "jsdoc-type-pratt-parser@npm:~4.0.0":
   version: 4.0.0
   resolution: "jsdoc-type-pratt-parser@npm:4.0.0"
-  checksum: b23ef7bbbe2f56d72630d1c5a233dc9fecaff399063d373c57bef136908c1b05e723dac107177303c03ccf8d75aa51507510b282aa567600477479c5ea0c36d1
+  checksum: 10c0/b23ef7bbbe2f56d72630d1c5a233dc9fecaff399063d373c57bef136908c1b05e723dac107177303c03ccf8d75aa51507510b282aa567600477479c5ea0c36d1
   languageName: node
   linkType: hard
 
@@ -10561,7 +10561,7 @@ __metadata:
   peerDependenciesMeta:
     canvas:
       optional: true
-  checksum: b109073bb826a966db7828f46cb1d7371abecd30f182b143c52be5fe1ed84513bbbe995eb3d157241681fcd18331381e61e3dc004d4949f3a63bca02f6214902
+  checksum: 10c0/b109073bb826a966db7828f46cb1d7371abecd30f182b143c52be5fe1ed84513bbbe995eb3d157241681fcd18331381e61e3dc004d4949f3a63bca02f6214902
   languageName: node
   linkType: hard
 
@@ -10595,7 +10595,7 @@ __metadata:
   peerDependenciesMeta:
     canvas:
       optional: true
-  checksum: 7b35043d7af39ad6dcaef0fa5679d8c8a94c6c9b6cc4a79222b7c9987d57ab7150c50856684ae56b473ab28c7d82aec0fb7ca19dcbd4c3f46683c807d717a3af
+  checksum: 10c0/7b35043d7af39ad6dcaef0fa5679d8c8a94c6c9b6cc4a79222b7c9987d57ab7150c50856684ae56b473ab28c7d82aec0fb7ca19dcbd4c3f46683c807d717a3af
   languageName: node
   linkType: hard
 
@@ -10604,7 +10604,7 @@ __metadata:
   resolution: "jsesc@npm:2.5.2"
   bin:
     jsesc: bin/jsesc
-  checksum: dbf59312e0ebf2b4405ef413ec2b25abb5f8f4d9bc5fb8d9f90381622ebca5f2af6a6aa9a8578f65903f9e33990a6dc798edd0ce5586894bf0e9e31803a1de88
+  checksum: 10c0/dbf59312e0ebf2b4405ef413ec2b25abb5f8f4d9bc5fb8d9f90381622ebca5f2af6a6aa9a8578f65903f9e33990a6dc798edd0ce5586894bf0e9e31803a1de88
   languageName: node
   linkType: hard
 
@@ -10613,56 +10613,56 @@ __metadata:
   resolution: "jsesc@npm:0.5.0"
   bin:
     jsesc: bin/jsesc
-  checksum: f93792440ae1d80f091b65f8ceddf8e55c4bb7f1a09dee5dcbdb0db5612c55c0f6045625aa6b7e8edb2e0a4feabd80ee48616dbe2d37055573a84db3d24f96d9
+  checksum: 10c0/f93792440ae1d80f091b65f8ceddf8e55c4bb7f1a09dee5dcbdb0db5612c55c0f6045625aa6b7e8edb2e0a4feabd80ee48616dbe2d37055573a84db3d24f96d9
   languageName: node
   linkType: hard
 
 "json-buffer@npm:3.0.1":
   version: 3.0.1
   resolution: "json-buffer@npm:3.0.1"
-  checksum: 0d1c91569d9588e7eef2b49b59851f297f3ab93c7b35c7c221e288099322be6b562767d11e4821da500f3219542b9afd2e54c5dc573107c1126ed1080f8e96d7
+  checksum: 10c0/0d1c91569d9588e7eef2b49b59851f297f3ab93c7b35c7c221e288099322be6b562767d11e4821da500f3219542b9afd2e54c5dc573107c1126ed1080f8e96d7
   languageName: node
   linkType: hard
 
 "json-parse-better-errors@npm:^1.0.2":
   version: 1.0.2
   resolution: "json-parse-better-errors@npm:1.0.2"
-  checksum: 2f1287a7c833e397c9ddd361a78638e828fc523038bb3441fd4fc144cfd2c6cd4963ffb9e207e648cf7b692600f1e1e524e965c32df5152120910e4903a47dcb
+  checksum: 10c0/2f1287a7c833e397c9ddd361a78638e828fc523038bb3441fd4fc144cfd2c6cd4963ffb9e207e648cf7b692600f1e1e524e965c32df5152120910e4903a47dcb
   languageName: node
   linkType: hard
 
 "json-parse-even-better-errors@npm:^2.3.0":
   version: 2.3.1
   resolution: "json-parse-even-better-errors@npm:2.3.1"
-  checksum: 140932564c8f0b88455432e0f33c4cb4086b8868e37524e07e723f4eaedb9425bdc2bafd71bd1d9765bd15fd1e2d126972bc83990f55c467168c228c24d665f3
+  checksum: 10c0/140932564c8f0b88455432e0f33c4cb4086b8868e37524e07e723f4eaedb9425bdc2bafd71bd1d9765bd15fd1e2d126972bc83990f55c467168c228c24d665f3
   languageName: node
   linkType: hard
 
 "json-schema-traverse@npm:^0.4.1":
   version: 0.4.1
   resolution: "json-schema-traverse@npm:0.4.1"
-  checksum: 108fa90d4cc6f08243aedc6da16c408daf81793bf903e9fd5ab21983cda433d5d2da49e40711da016289465ec2e62e0324dcdfbc06275a607fe3233fde4942ce
+  checksum: 10c0/108fa90d4cc6f08243aedc6da16c408daf81793bf903e9fd5ab21983cda433d5d2da49e40711da016289465ec2e62e0324dcdfbc06275a607fe3233fde4942ce
   languageName: node
   linkType: hard
 
 "json-schema-traverse@npm:^1.0.0":
   version: 1.0.0
   resolution: "json-schema-traverse@npm:1.0.0"
-  checksum: 71e30015d7f3d6dc1c316d6298047c8ef98a06d31ad064919976583eb61e1018a60a0067338f0f79cabc00d84af3fcc489bd48ce8a46ea165d9541ba17fb30c6
+  checksum: 10c0/71e30015d7f3d6dc1c316d6298047c8ef98a06d31ad064919976583eb61e1018a60a0067338f0f79cabc00d84af3fcc489bd48ce8a46ea165d9541ba17fb30c6
   languageName: node
   linkType: hard
 
 "json-schema@npm:^0.4.0":
   version: 0.4.0
   resolution: "json-schema@npm:0.4.0"
-  checksum: d4a637ec1d83544857c1c163232f3da46912e971d5bf054ba44fdb88f07d8d359a462b4aec46f2745efbc57053365608d88bc1d7b1729f7b4fc3369765639ed3
+  checksum: 10c0/d4a637ec1d83544857c1c163232f3da46912e971d5bf054ba44fdb88f07d8d359a462b4aec46f2745efbc57053365608d88bc1d7b1729f7b4fc3369765639ed3
   languageName: node
   linkType: hard
 
 "json-stable-stringify-without-jsonify@npm:^1.0.1":
   version: 1.0.1
   resolution: "json-stable-stringify-without-jsonify@npm:1.0.1"
-  checksum: cb168b61fd4de83e58d09aaa6425ef71001bae30d260e2c57e7d09a5fd82223e2f22a042dedaab8db23b7d9ae46854b08bb1f91675a8be11c5cffebef5fb66a5
+  checksum: 10c0/cb168b61fd4de83e58d09aaa6425ef71001bae30d260e2c57e7d09a5fd82223e2f22a042dedaab8db23b7d9ae46854b08bb1f91675a8be11c5cffebef5fb66a5
   languageName: node
   linkType: hard
 
@@ -10671,7 +10671,7 @@ __metadata:
   resolution: "json-stable-stringify@npm:1.0.2"
   dependencies:
     jsonify: "npm:^0.0.1"
-  checksum: 502d021c3c59c09587faa40d7693d77c00460fd6c68bae95d6e35804909ec8c4aec71b136d3a09df61a7ebf803eb6e820f23ede76b77e74b8b02c76afb2ada8c
+  checksum: 10c0/502d021c3c59c09587faa40d7693d77c00460fd6c68bae95d6e35804909ec8c4aec71b136d3a09df61a7ebf803eb6e820f23ede76b77e74b8b02c76afb2ada8c
   languageName: node
   linkType: hard
 
@@ -10682,7 +10682,7 @@ __metadata:
     minimist: "npm:^1.2.0"
   bin:
     json5: lib/cli.js
-  checksum: 9ee316bf21f000b00752e6c2a3b79ecf5324515a5c60ee88983a1910a45426b643a4f3461657586e8aeca87aaf96f0a519b0516d2ae527a6c3e7eed80f68717f
+  checksum: 10c0/9ee316bf21f000b00752e6c2a3b79ecf5324515a5c60ee88983a1910a45426b643a4f3461657586e8aeca87aaf96f0a519b0516d2ae527a6c3e7eed80f68717f
   languageName: node
   linkType: hard
 
@@ -10691,7 +10691,7 @@ __metadata:
   resolution: "json5@npm:2.2.3"
   bin:
     json5: lib/cli.js
-  checksum: 5a04eed94810fa55c5ea138b2f7a5c12b97c3750bc63d11e511dcecbfef758003861522a070c2272764ee0f4e3e323862f386945aeb5b85b87ee43f084ba586c
+  checksum: 10c0/5a04eed94810fa55c5ea138b2f7a5c12b97c3750bc63d11e511dcecbfef758003861522a070c2272764ee0f4e3e323862f386945aeb5b85b87ee43f084ba586c
   languageName: node
   linkType: hard
 
@@ -10704,21 +10704,21 @@ __metadata:
   dependenciesMeta:
     graceful-fs:
       optional: true
-  checksum: 4f95b5e8a5622b1e9e8f33c96b7ef3158122f595998114d1e7f03985649ea99cb3cd99ce1ed1831ae94c8c8543ab45ebd044207612f31a56fd08462140e46865
+  checksum: 10c0/4f95b5e8a5622b1e9e8f33c96b7ef3158122f595998114d1e7f03985649ea99cb3cd99ce1ed1831ae94c8c8543ab45ebd044207612f31a56fd08462140e46865
   languageName: node
   linkType: hard
 
 "jsonify@npm:^0.0.1":
   version: 0.0.1
   resolution: "jsonify@npm:0.0.1"
-  checksum: 7f5499cdd59a0967ed35bda48b7cec43d850bbc8fb955cdd3a1717bb0efadbe300724d5646de765bb7a99fc1c3ab06eb80d93503c6faaf99b4ff50a3326692f6
+  checksum: 10c0/7f5499cdd59a0967ed35bda48b7cec43d850bbc8fb955cdd3a1717bb0efadbe300724d5646de765bb7a99fc1c3ab06eb80d93503c6faaf99b4ff50a3326692f6
   languageName: node
   linkType: hard
 
 "jsonpointer@npm:^5.0.0":
   version: 5.0.1
   resolution: "jsonpointer@npm:5.0.1"
-  checksum: 89929e58b400fcb96928c0504fcf4fc3f919d81e9543ceb055df125538470ee25290bb4984251e172e6ef8fcc55761eb998c118da763a82051ad89d4cb073fe7
+  checksum: 10c0/89929e58b400fcb96928c0504fcf4fc3f919d81e9543ceb055df125538470ee25290bb4984251e172e6ef8fcc55761eb998c118da763a82051ad89d4cb073fe7
   languageName: node
   linkType: hard
 
@@ -10730,14 +10730,14 @@ __metadata:
     array.prototype.flat: "npm:^1.3.1"
     object.assign: "npm:^4.1.4"
     object.values: "npm:^1.1.6"
-  checksum: a32679e9cb55469cb6d8bbc863f7d631b2c98b7fc7bf172629261751a6e7bc8da6ae374ddb74d5fbd8b06cf0eb4572287b259813d92b36e384024ed35e4c13e1
+  checksum: 10c0/a32679e9cb55469cb6d8bbc863f7d631b2c98b7fc7bf172629261751a6e7bc8da6ae374ddb74d5fbd8b06cf0eb4572287b259813d92b36e384024ed35e4c13e1
   languageName: node
   linkType: hard
 
 "keycode@npm:^2.1.7":
   version: 2.2.1
   resolution: "keycode@npm:2.2.1"
-  checksum: e38ecbdc62f57e18ef9f7ad88aefded84e05b89115a40eea3081a7002d7c055765ddb5f5c3e2dd36ac2b2ab3901053c8286c9db082fd807b3abeb7e44034d96a
+  checksum: 10c0/e38ecbdc62f57e18ef9f7ad88aefded84e05b89115a40eea3081a7002d7c055765ddb5f5c3e2dd36ac2b2ab3901053c8286c9db082fd807b3abeb7e44034d96a
   languageName: node
   linkType: hard
 
@@ -10746,49 +10746,49 @@ __metadata:
   resolution: "keyv@npm:4.5.4"
   dependencies:
     json-buffer: "npm:3.0.1"
-  checksum: aa52f3c5e18e16bb6324876bb8b59dd02acf782a4b789c7b2ae21107fab95fab3890ed448d4f8dba80ce05391eeac4bfabb4f02a20221342982f806fa2cf271e
+  checksum: 10c0/aa52f3c5e18e16bb6324876bb8b59dd02acf782a4b789c7b2ae21107fab95fab3890ed448d4f8dba80ce05391eeac4bfabb4f02a20221342982f806fa2cf271e
   languageName: node
   linkType: hard
 
 "killable@npm:^1.0.1":
   version: 1.0.1
   resolution: "killable@npm:1.0.1"
-  checksum: 1de0ffe2dd603920685d1b2027136051f095ab42be03e354a43713664e99617cf32cbdb61fc03742c329386d7cf9450edbf4593e50daeaae381e20627b477cd6
+  checksum: 10c0/1de0ffe2dd603920685d1b2027136051f095ab42be03e354a43713664e99617cf32cbdb61fc03742c329386d7cf9450edbf4593e50daeaae381e20627b477cd6
   languageName: node
   linkType: hard
 
 "kind-of@npm:^6.0.3":
   version: 6.0.3
   resolution: "kind-of@npm:6.0.3"
-  checksum: 61cdff9623dabf3568b6445e93e31376bee1cdb93f8ba7033d86022c2a9b1791a1d9510e026e6465ebd701a6dd2f7b0808483ad8838341ac52f003f512e0b4c4
+  checksum: 10c0/61cdff9623dabf3568b6445e93e31376bee1cdb93f8ba7033d86022c2a9b1791a1d9510e026e6465ebd701a6dd2f7b0808483ad8838341ac52f003f512e0b4c4
   languageName: node
   linkType: hard
 
 "kleur@npm:^3.0.3":
   version: 3.0.3
   resolution: "kleur@npm:3.0.3"
-  checksum: cd3a0b8878e7d6d3799e54340efe3591ca787d9f95f109f28129bdd2915e37807bf8918bb295ab86afb8c82196beec5a1adcaf29042ce3f2bd932b038fe3aa4b
+  checksum: 10c0/cd3a0b8878e7d6d3799e54340efe3591ca787d9f95f109f28129bdd2915e37807bf8918bb295ab86afb8c82196beec5a1adcaf29042ce3f2bd932b038fe3aa4b
   languageName: node
   linkType: hard
 
 "klona@npm:^2.0.4":
   version: 2.0.6
   resolution: "klona@npm:2.0.6"
-  checksum: 94eed2c6c2ce99f409df9186a96340558897b3e62a85afdc1ee39103954d2ebe1c1c4e9fe2b0952771771fa96d70055ede8b27962a7021406374fdb695fd4d01
+  checksum: 10c0/94eed2c6c2ce99f409df9186a96340558897b3e62a85afdc1ee39103954d2ebe1c1c4e9fe2b0952771771fa96d70055ede8b27962a7021406374fdb695fd4d01
   languageName: node
   linkType: hard
 
 "known-css-properties@npm:^0.29.0":
   version: 0.29.0
   resolution: "known-css-properties@npm:0.29.0"
-  checksum: f66e9992097b8f54e97dbe729943d4a11b8d3ba15f68dbb3deb8bb0122cb89c22c90c9221ecb1e3f2e236838fe3c0faae319b43908c81b6e254ac43cafde2906
+  checksum: 10c0/f66e9992097b8f54e97dbe729943d4a11b8d3ba15f68dbb3deb8bb0122cb89c22c90c9221ecb1e3f2e236838fe3c0faae319b43908c81b6e254ac43cafde2906
   languageName: node
   linkType: hard
 
 "language-subtag-registry@npm:^0.3.20":
   version: 0.3.22
   resolution: "language-subtag-registry@npm:0.3.22"
-  checksum: d1e09971260a7cd3b9fdeb190d33af0b6e99c8697013537d9aaa15f7856d9d83aee128ba8078e219df0a7cf4b8dd18d1a0c188f6543b500d92a2689d2d114b70
+  checksum: 10c0/d1e09971260a7cd3b9fdeb190d33af0b6e99c8697013537d9aaa15f7856d9d83aee128ba8078e219df0a7cf4b8dd18d1a0c188f6543b500d92a2689d2d114b70
   languageName: node
   linkType: hard
 
@@ -10797,14 +10797,14 @@ __metadata:
   resolution: "language-tags@npm:1.0.9"
   dependencies:
     language-subtag-registry: "npm:^0.3.20"
-  checksum: 9ab911213c4bd8bd583c850201c17794e52cb0660d1ab6e32558aadc8324abebf6844e46f92b80a5d600d0fbba7eface2c207bfaf270a1c7fd539e4c3a880bff
+  checksum: 10c0/9ab911213c4bd8bd583c850201c17794e52cb0660d1ab6e32558aadc8324abebf6844e46f92b80a5d600d0fbba7eface2c207bfaf270a1c7fd539e4c3a880bff
   languageName: node
   linkType: hard
 
 "leven@npm:^3.1.0":
   version: 3.1.0
   resolution: "leven@npm:3.1.0"
-  checksum: cd778ba3fbab0f4d0500b7e87d1f6e1f041507c56fdcd47e8256a3012c98aaee371d4c15e0a76e0386107af2d42e2b7466160a2d80688aaa03e66e49949f42df
+  checksum: 10c0/cd778ba3fbab0f4d0500b7e87d1f6e1f041507c56fdcd47e8256a3012c98aaee371d4c15e0a76e0386107af2d42e2b7466160a2d80688aaa03e66e49949f42df
   languageName: node
   linkType: hard
 
@@ -10814,21 +10814,21 @@ __metadata:
   dependencies:
     prelude-ls: "npm:^1.2.1"
     type-check: "npm:~0.4.0"
-  checksum: effb03cad7c89dfa5bd4f6989364bfc79994c2042ec5966cb9b95990e2edee5cd8969ddf42616a0373ac49fac1403437deaf6e9050fbbaa3546093a59b9ac94e
+  checksum: 10c0/effb03cad7c89dfa5bd4f6989364bfc79994c2042ec5966cb9b95990e2edee5cd8969ddf42616a0373ac49fac1403437deaf6e9050fbbaa3546093a59b9ac94e
   languageName: node
   linkType: hard
 
 "lilconfig@npm:3.0.0, lilconfig@npm:^3.0.0":
   version: 3.0.0
   resolution: "lilconfig@npm:3.0.0"
-  checksum: 7f5ee7a658dc016cacf146815e8d88b06f06f4402823b8b0934e305a57a197f55ccc9c5cd4fb5ea1b2b821c8ccaf2d54abd59602a4931af06eabda332388d3e6
+  checksum: 10c0/7f5ee7a658dc016cacf146815e8d88b06f06f4402823b8b0934e305a57a197f55ccc9c5cd4fb5ea1b2b821c8ccaf2d54abd59602a4931af06eabda332388d3e6
   languageName: node
   linkType: hard
 
 "lines-and-columns@npm:^1.1.6":
   version: 1.2.4
   resolution: "lines-and-columns@npm:1.2.4"
-  checksum: 3da6ee62d4cd9f03f5dc90b4df2540fb85b352081bee77fe4bbcd12c9000ead7f35e0a38b8d09a9bb99b13223446dd8689ff3c4959807620726d788701a83d2d
+  checksum: 10c0/3da6ee62d4cd9f03f5dc90b4df2540fb85b352081bee77fe4bbcd12c9000ead7f35e0a38b8d09a9bb99b13223446dd8689ff3c4959807620726d788701a83d2d
   languageName: node
   linkType: hard
 
@@ -10848,7 +10848,7 @@ __metadata:
     yaml: "npm:2.3.4"
   bin:
     lint-staged: bin/lint-staged.js
-  checksum: 4a1ff25dd06dbd4346fd244c9a0ebb936532ba18c0caedeb895c2e232f3c6c5fd08f6667624716660bc29e3e0f9f0440a9175114394616e991ebd5fab4b1f092
+  checksum: 10c0/4a1ff25dd06dbd4346fd244c9a0ebb936532ba18c0caedeb895c2e232f3c6c5fd08f6667624716660bc29e3e0f9f0440a9175114394616e991ebd5fab4b1f092
   languageName: node
   linkType: hard
 
@@ -10862,14 +10862,14 @@ __metadata:
     log-update: "npm:^6.0.0"
     rfdc: "npm:^1.3.0"
     wrap-ansi: "npm:^9.0.0"
-  checksum: 6e356df9127c68b69186c927c993645223557e941a76b0bb210e35786aedc53f577df437251db804606ff37ac509c5d945289a84b3daee7fadf2e3dcb889ecc9
+  checksum: 10c0/6e356df9127c68b69186c927c993645223557e941a76b0bb210e35786aedc53f577df437251db804606ff37ac509c5d945289a84b3daee7fadf2e3dcb889ecc9
   languageName: node
   linkType: hard
 
 "loader-runner@npm:^2.4.0":
   version: 2.4.0
   resolution: "loader-runner@npm:2.4.0"
-  checksum: 1f723bd8318453c2d073d7befbf891ba6d2a02f22622688bf7d22e7ba527a0f9476c7fdfedc6bfa2b55c0389d9f406f3a5239ed1b33c9088d77cfed085086a1e
+  checksum: 10c0/1f723bd8318453c2d073d7befbf891ba6d2a02f22622688bf7d22e7ba527a0f9476c7fdfedc6bfa2b55c0389d9f406f3a5239ed1b33c9088d77cfed085086a1e
   languageName: node
   linkType: hard
 
@@ -10880,7 +10880,7 @@ __metadata:
     big.js: "npm:^5.2.2"
     emojis-list: "npm:^3.0.0"
     json5: "npm:^1.0.1"
-  checksum: 2b726088b5526f7605615e3e28043ae9bbd2453f4a85898e1151f3c39dbf7a2b65d09f3996bc588d92ac7e717ded529d3e1ea3ea42c433393be84a58234a2f53
+  checksum: 10c0/2b726088b5526f7605615e3e28043ae9bbd2453f4a85898e1151f3c39dbf7a2b65d09f3996bc588d92ac7e717ded529d3e1ea3ea42c433393be84a58234a2f53
   languageName: node
   linkType: hard
 
@@ -10891,7 +10891,7 @@ __metadata:
     big.js: "npm:^5.2.2"
     emojis-list: "npm:^3.0.0"
     json5: "npm:^2.1.2"
-  checksum: d5654a77f9d339ec2a03d88221a5a695f337bf71eb8dea031b3223420bb818964ba8ed0069145c19b095f6c8b8fd386e602a3fc7ca987042bd8bb1dcc90d7100
+  checksum: 10c0/d5654a77f9d339ec2a03d88221a5a695f337bf71eb8dea031b3223420bb818964ba8ed0069145c19b095f6c8b8fd386e602a3fc7ca987042bd8bb1dcc90d7100
   languageName: node
   linkType: hard
 
@@ -10901,7 +10901,7 @@ __metadata:
   dependencies:
     p-locate: "npm:^3.0.0"
     path-exists: "npm:^3.0.0"
-  checksum: 3db394b7829a7fe2f4fbdd25d3c4689b85f003c318c5da4052c7e56eed697da8f1bce5294f685c69ff76e32cba7a33629d94396976f6d05fb7f4c755c5e2ae8b
+  checksum: 10c0/3db394b7829a7fe2f4fbdd25d3c4689b85f003c318c5da4052c7e56eed697da8f1bce5294f685c69ff76e32cba7a33629d94396976f6d05fb7f4c755c5e2ae8b
   languageName: node
   linkType: hard
 
@@ -10910,7 +10910,7 @@ __metadata:
   resolution: "locate-path@npm:5.0.0"
   dependencies:
     p-locate: "npm:^4.1.0"
-  checksum: 33a1c5247e87e022f9713e6213a744557a3e9ec32c5d0b5efb10aa3a38177615bf90221a5592674857039c1a0fd2063b82f285702d37b792d973e9e72ace6c59
+  checksum: 10c0/33a1c5247e87e022f9713e6213a744557a3e9ec32c5d0b5efb10aa3a38177615bf90221a5592674857039c1a0fd2063b82f285702d37b792d973e9e72ace6c59
   languageName: node
   linkType: hard
 
@@ -10919,7 +10919,7 @@ __metadata:
   resolution: "locate-path@npm:6.0.0"
   dependencies:
     p-locate: "npm:^5.0.0"
-  checksum: d3972ab70dfe58ce620e64265f90162d247e87159b6126b01314dd67be43d50e96a50b517bce2d9452a79409c7614054c277b5232377de50416564a77ac7aad3
+  checksum: 10c0/d3972ab70dfe58ce620e64265f90162d247e87159b6126b01314dd67be43d50e96a50b517bce2d9452a79409c7614054c277b5232377de50416564a77ac7aad3
   languageName: node
   linkType: hard
 
@@ -10928,105 +10928,105 @@ __metadata:
   resolution: "lockfile@npm:1.0.4"
   dependencies:
     signal-exit: "npm:^3.0.2"
-  checksum: 80b7777ceb43105d9e588733c3efc2514653a5e3a0dae3e61347a1f5381da34dcaa2caaa60c39ed5d4ad31c1735a4831e5639a0ba1c508bfea8dbc9c89777b37
+  checksum: 10c0/80b7777ceb43105d9e588733c3efc2514653a5e3a0dae3e61347a1f5381da34dcaa2caaa60c39ed5d4ad31c1735a4831e5639a0ba1c508bfea8dbc9c89777b37
   languageName: node
   linkType: hard
 
 "lodash.debounce@npm:^4.0.8":
   version: 4.0.8
   resolution: "lodash.debounce@npm:4.0.8"
-  checksum: 762998a63e095412b6099b8290903e0a8ddcb353ac6e2e0f2d7e7d03abd4275fe3c689d88960eb90b0dde4f177554d51a690f22a343932ecbc50a5d111849987
+  checksum: 10c0/762998a63e095412b6099b8290903e0a8ddcb353ac6e2e0f2d7e7d03abd4275fe3c689d88960eb90b0dde4f177554d51a690f22a343932ecbc50a5d111849987
   languageName: node
   linkType: hard
 
 "lodash.defaults@npm:^4.2.0":
   version: 4.2.0
   resolution: "lodash.defaults@npm:4.2.0"
-  checksum: d5b77aeb702caa69b17be1358faece33a84497bcca814897383c58b28a2f8dfc381b1d9edbec239f8b425126a3bbe4916223da2a576bb0411c2cefd67df80707
+  checksum: 10c0/d5b77aeb702caa69b17be1358faece33a84497bcca814897383c58b28a2f8dfc381b1d9edbec239f8b425126a3bbe4916223da2a576bb0411c2cefd67df80707
   languageName: node
   linkType: hard
 
 "lodash.get@npm:^4.0":
   version: 4.4.2
   resolution: "lodash.get@npm:4.4.2"
-  checksum: 48f40d471a1654397ed41685495acb31498d5ed696185ac8973daef424a749ca0c7871bf7b665d5c14f5cc479394479e0307e781f61d5573831769593411be6e
+  checksum: 10c0/48f40d471a1654397ed41685495acb31498d5ed696185ac8973daef424a749ca0c7871bf7b665d5c14f5cc479394479e0307e781f61d5573831769593411be6e
   languageName: node
   linkType: hard
 
 "lodash.has@npm:^4.0":
   version: 4.5.2
   resolution: "lodash.has@npm:4.5.2"
-  checksum: 3ffa9e549f321996a5fdf6204494c035ff550b2df703f936a448c553131bbb55492b4e7995bb13500648b50b268ed8afc974a7a0c0a43744d28d61cc95cb1ffe
+  checksum: 10c0/3ffa9e549f321996a5fdf6204494c035ff550b2df703f936a448c553131bbb55492b4e7995bb13500648b50b268ed8afc974a7a0c0a43744d28d61cc95cb1ffe
   languageName: node
   linkType: hard
 
 "lodash.isarguments@npm:^3.1.0":
   version: 3.1.0
   resolution: "lodash.isarguments@npm:3.1.0"
-  checksum: 5e8f95ba10975900a3920fb039a3f89a5a79359a1b5565e4e5b4310ed6ebe64011e31d402e34f577eca983a1fc01ff86c926e3cbe602e1ddfc858fdd353e62d8
+  checksum: 10c0/5e8f95ba10975900a3920fb039a3f89a5a79359a1b5565e4e5b4310ed6ebe64011e31d402e34f577eca983a1fc01ff86c926e3cbe602e1ddfc858fdd353e62d8
   languageName: node
   linkType: hard
 
 "lodash.isboolean@npm:^3.0.3":
   version: 3.0.3
   resolution: "lodash.isboolean@npm:3.0.3"
-  checksum: 0aac604c1ef7e72f9a6b798e5b676606042401dd58e49f051df3cc1e3adb497b3d7695635a5cbec4ae5f66456b951fdabe7d6b387055f13267cde521f10ec7f7
+  checksum: 10c0/0aac604c1ef7e72f9a6b798e5b676606042401dd58e49f051df3cc1e3adb497b3d7695635a5cbec4ae5f66456b951fdabe7d6b387055f13267cde521f10ec7f7
   languageName: node
   linkType: hard
 
 "lodash.isequal@npm:^4.5.0":
   version: 4.5.0
   resolution: "lodash.isequal@npm:4.5.0"
-  checksum: dfdb2356db19631a4b445d5f37868a095e2402292d59539a987f134a8778c62a2810c2452d11ae9e6dcac71fc9de40a6fedcb20e2952a15b431ad8b29e50e28f
+  checksum: 10c0/dfdb2356db19631a4b445d5f37868a095e2402292d59539a987f134a8778c62a2810c2452d11ae9e6dcac71fc9de40a6fedcb20e2952a15b431ad8b29e50e28f
   languageName: node
   linkType: hard
 
 "lodash.isobject@npm:^3.0.2":
   version: 3.0.2
   resolution: "lodash.isobject@npm:3.0.2"
-  checksum: da4c8480d98b16835b59380b2fbd43c54081acd9466febb788ba77c434384349e0bec162d1c4e89f613f21687b2b6d8384d8a112b80da00c78d28d9915a5cdde
+  checksum: 10c0/da4c8480d98b16835b59380b2fbd43c54081acd9466febb788ba77c434384349e0bec162d1c4e89f613f21687b2b6d8384d8a112b80da00c78d28d9915a5cdde
   languageName: node
   linkType: hard
 
 "lodash.memoize@npm:^4.1.2":
   version: 4.1.2
   resolution: "lodash.memoize@npm:4.1.2"
-  checksum: c8713e51eccc650422716a14cece1809cfe34bc5ab5e242b7f8b4e2241c2483697b971a604252807689b9dd69bfe3a98852e19a5b89d506b000b4187a1285df8
+  checksum: 10c0/c8713e51eccc650422716a14cece1809cfe34bc5ab5e242b7f8b4e2241c2483697b971a604252807689b9dd69bfe3a98852e19a5b89d506b000b4187a1285df8
   languageName: node
   linkType: hard
 
 "lodash.merge@npm:^4.6.2":
   version: 4.6.2
   resolution: "lodash.merge@npm:4.6.2"
-  checksum: 402fa16a1edd7538de5b5903a90228aa48eb5533986ba7fa26606a49db2572bf414ff73a2c9f5d5fd36b31c46a5d5c7e1527749c07cbcf965ccff5fbdf32c506
+  checksum: 10c0/402fa16a1edd7538de5b5903a90228aa48eb5533986ba7fa26606a49db2572bf414ff73a2c9f5d5fd36b31c46a5d5c7e1527749c07cbcf965ccff5fbdf32c506
   languageName: node
   linkType: hard
 
 "lodash.sortby@npm:^4.7.0":
   version: 4.7.0
   resolution: "lodash.sortby@npm:4.7.0"
-  checksum: fc48fb54ff7669f33bb32997cab9460757ee99fafaf72400b261c3e10fde21538e47d8cfcbe6a25a31bcb5b7b727c27d52626386fc2de24eb059a6d64a89cdf5
+  checksum: 10c0/fc48fb54ff7669f33bb32997cab9460757ee99fafaf72400b261c3e10fde21538e47d8cfcbe6a25a31bcb5b7b727c27d52626386fc2de24eb059a6d64a89cdf5
   languageName: node
   linkType: hard
 
 "lodash.truncate@npm:^4.4.2":
   version: 4.4.2
   resolution: "lodash.truncate@npm:4.4.2"
-  checksum: 4e870d54e8a6c86c8687e057cec4069d2e941446ccab7f40b4d9555fa5872d917d0b6aa73bece7765500a3123f1723bcdba9ae881b679ef120bba9e1a0b0ed70
+  checksum: 10c0/4e870d54e8a6c86c8687e057cec4069d2e941446ccab7f40b4d9555fa5872d917d0b6aa73bece7765500a3123f1723bcdba9ae881b679ef120bba9e1a0b0ed70
   languageName: node
   linkType: hard
 
 "lodash.uniq@npm:^4.5.0":
   version: 4.5.0
   resolution: "lodash.uniq@npm:4.5.0"
-  checksum: 262d400bb0952f112162a320cc4a75dea4f66078b9e7e3075ffbc9c6aa30b3e9df3cf20e7da7d566105e1ccf7804e4fbd7d804eee0b53de05d83f16ffbf41c5e
+  checksum: 10c0/262d400bb0952f112162a320cc4a75dea4f66078b9e7e3075ffbc9c6aa30b3e9df3cf20e7da7d566105e1ccf7804e4fbd7d804eee0b53de05d83f16ffbf41c5e
   languageName: node
   linkType: hard
 
 "lodash@npm:^4.17.10, lodash@npm:^4.17.11, lodash@npm:^4.17.14, lodash@npm:^4.17.15, lodash@npm:^4.17.20, lodash@npm:^4.17.21":
   version: 4.17.21
   resolution: "lodash@npm:4.17.21"
-  checksum: d8cbea072bb08655bb4c989da418994b073a608dffa608b09ac04b43a791b12aeae7cd7ad919aa4c925f33b48490b5cfe6c1f71d827956071dae2e7bb3a6b74c
+  checksum: 10c0/d8cbea072bb08655bb4c989da418994b073a608dffa608b09ac04b43a791b12aeae7cd7ad919aa4c925f33b48490b5cfe6c1f71d827956071dae2e7bb3a6b74c
   languageName: node
   linkType: hard
 
@@ -11039,14 +11039,14 @@ __metadata:
     slice-ansi: "npm:^7.0.0"
     strip-ansi: "npm:^7.1.0"
     wrap-ansi: "npm:^9.0.0"
-  checksum: e0b3c3401ef49ce3eb17e2f83d644765e4f7988498fc1344eaa4f31ab30e510dcc469a7fb64dc01bd1c8d9237d917598fa677a9818705fb3774c10f6e9d4b27c
+  checksum: 10c0/e0b3c3401ef49ce3eb17e2f83d644765e4f7988498fc1344eaa4f31ab30e510dcc469a7fb64dc01bd1c8d9237d917598fa677a9818705fb3774c10f6e9d4b27c
   languageName: node
   linkType: hard
 
 "loglevel@npm:^1.6.8":
   version: 1.8.1
   resolution: "loglevel@npm:1.8.1"
-  checksum: 21069436c97448a1801b154a77d19ada212225c513d94f0471bfe299c981ffd4dc0d21e6211f9250bd6209ba9837bfe0d40d9295c673d73e3c543ec6b1c5d9ef
+  checksum: 10c0/21069436c97448a1801b154a77d19ada212225c513d94f0471bfe299c981ffd4dc0d21e6211f9250bd6209ba9837bfe0d40d9295c673d73e3c543ec6b1c5d9ef
   languageName: node
   linkType: hard
 
@@ -11057,14 +11057,14 @@ __metadata:
     js-tokens: "npm:^3.0.0 || ^4.0.0"
   bin:
     loose-envify: cli.js
-  checksum: 655d110220983c1a4b9c0c679a2e8016d4b67f6e9c7b5435ff5979ecdb20d0813f4dec0a08674fcbdd4846a3f07edbb50a36811fd37930b94aaa0d9daceb017e
+  checksum: 10c0/655d110220983c1a4b9c0c679a2e8016d4b67f6e9c7b5435ff5979ecdb20d0813f4dec0a08674fcbdd4846a3f07edbb50a36811fd37930b94aaa0d9daceb017e
   languageName: node
   linkType: hard
 
 "lru-cache@npm:^10.0.1, lru-cache@npm:^9.1.1 || ^10.0.0":
   version: 10.0.1
   resolution: "lru-cache@npm:10.0.1"
-  checksum: 982dabfb227b9a2daf56d712ae0e72e01115a28c0a2068cd71277bca04568f3417bbf741c6c7941abc5c620fd8059e34f15607f90ebccbfa0a17533322d27a8e
+  checksum: 10c0/982dabfb227b9a2daf56d712ae0e72e01115a28c0a2068cd71277bca04568f3417bbf741c6c7941abc5c620fd8059e34f15607f90ebccbfa0a17533322d27a8e
   languageName: node
   linkType: hard
 
@@ -11073,7 +11073,7 @@ __metadata:
   resolution: "lru-cache@npm:5.1.1"
   dependencies:
     yallist: "npm:^3.0.2"
-  checksum: 89b2ef2ef45f543011e38737b8a8622a2f8998cddf0e5437174ef8f1f70a8b9d14a918ab3e232cb3ba343b7abddffa667f0b59075b2b80e6b4d63c3de6127482
+  checksum: 10c0/89b2ef2ef45f543011e38737b8a8622a2f8998cddf0e5437174ef8f1f70a8b9d14a918ab3e232cb3ba343b7abddffa667f0b59075b2b80e6b4d63c3de6127482
   languageName: node
   linkType: hard
 
@@ -11082,7 +11082,7 @@ __metadata:
   resolution: "lru-cache@npm:6.0.0"
   dependencies:
     yallist: "npm:^4.0.0"
-  checksum: cb53e582785c48187d7a188d3379c181b5ca2a9c78d2bce3e7dee36f32761d1c42983da3fe12b55cb74e1779fa94cdc2e5367c028a9b35317184ede0c07a30a9
+  checksum: 10c0/cb53e582785c48187d7a188d3379c181b5ca2a9c78d2bce3e7dee36f32761d1c42983da3fe12b55cb74e1779fa94cdc2e5367c028a9b35317184ede0c07a30a9
   languageName: node
   linkType: hard
 
@@ -11091,7 +11091,7 @@ __metadata:
   resolution: "lz-string@npm:1.5.0"
   bin:
     lz-string: bin/bin.js
-  checksum: 36128e4de34791838abe979b19927c26e67201ca5acf00880377af7d765b38d1c60847e01c5ec61b1a260c48029084ab3893a3925fd6e48a04011364b089991b
+  checksum: 10c0/36128e4de34791838abe979b19927c26e67201ca5acf00880377af7d765b38d1c60847e01c5ec61b1a260c48029084ab3893a3925fd6e48a04011364b089991b
   languageName: node
   linkType: hard
 
@@ -11100,7 +11100,7 @@ __metadata:
   resolution: "magic-string@npm:0.25.9"
   dependencies:
     sourcemap-codec: "npm:^1.4.8"
-  checksum: 37f5e01a7e8b19a072091f0b45ff127cda676232d373ce2c551a162dd4053c575ec048b9cbb4587a1f03adb6c5d0fd0dd49e8ab070cd2c83a4992b2182d9cb56
+  checksum: 10c0/37f5e01a7e8b19a072091f0b45ff127cda676232d373ce2c551a162dd4053c575ec048b9cbb4587a1f03adb6c5d0fd0dd49e8ab070cd2c83a4992b2182d9cb56
   languageName: node
   linkType: hard
 
@@ -11109,7 +11109,7 @@ __metadata:
   resolution: "magic-string@npm:0.30.5"
   dependencies:
     "@jridgewell/sourcemap-codec": "npm:^1.4.15"
-  checksum: 38ac220ca7539e96da7ea2f38d85796bdf5c69b6bcae728c4bc2565084e6dc326b9174ee9770bea345cf6c9b3a24041b767167874fab5beca874d2356a9d1520
+  checksum: 10c0/38ac220ca7539e96da7ea2f38d85796bdf5c69b6bcae728c4bc2565084e6dc326b9174ee9770bea345cf6c9b3a24041b767167874fab5beca874d2356a9d1520
   languageName: node
   linkType: hard
 
@@ -11118,7 +11118,7 @@ __metadata:
   resolution: "make-dir@npm:3.1.0"
   dependencies:
     semver: "npm:^6.0.0"
-  checksum: 56aaafefc49c2dfef02c5c95f9b196c4eb6988040cf2c712185c7fe5c99b4091591a7fc4d4eafaaefa70ff763a26f6ab8c3ff60b9e75ea19876f49b18667ecaa
+  checksum: 10c0/56aaafefc49c2dfef02c5c95f9b196c4eb6988040cf2c712185c7fe5c99b4091591a7fc4d4eafaaefa70ff763a26f6ab8c3ff60b9e75ea19876f49b18667ecaa
   languageName: node
   linkType: hard
 
@@ -11127,7 +11127,7 @@ __metadata:
   resolution: "make-dir@npm:4.0.0"
   dependencies:
     semver: "npm:^7.5.3"
-  checksum: 69b98a6c0b8e5c4fe9acb61608a9fbcfca1756d910f51e5dbe7a9e5cfb74fca9b8a0c8a0ffdf1294a740826c1ab4871d5bf3f62f72a3049e5eac6541ddffed68
+  checksum: 10c0/69b98a6c0b8e5c4fe9acb61608a9fbcfca1756d910f51e5dbe7a9e5cfb74fca9b8a0c8a0ffdf1294a740826c1ab4871d5bf3f62f72a3049e5eac6541ddffed68
   languageName: node
   linkType: hard
 
@@ -11146,7 +11146,7 @@ __metadata:
     negotiator: "npm:^0.6.3"
     promise-retry: "npm:^2.0.1"
     ssri: "npm:^10.0.0"
-  checksum: 43b9f6dcbc6fe8b8604cb6396957c3698857a15ba4dbc38284f7f0e61f248300585ef1eb8cc62df54e9c724af977e45b5cdfd88320ef7f53e45070ed3488da55
+  checksum: 10c0/43b9f6dcbc6fe8b8604cb6396957c3698857a15ba4dbc38284f7f0e61f248300585ef1eb8cc62df54e9c724af977e45b5cdfd88320ef7f53e45070ed3488da55
   languageName: node
   linkType: hard
 
@@ -11155,14 +11155,14 @@ __metadata:
   resolution: "makeerror@npm:1.0.12"
   dependencies:
     tmpl: "npm:1.0.5"
-  checksum: b0e6e599780ce6bab49cc413eba822f7d1f0dfebd1c103eaa3785c59e43e22c59018323cf9e1708f0ef5329e94a745d163fcbb6bff8e4c6742f9be9e86f3500c
+  checksum: 10c0/b0e6e599780ce6bab49cc413eba822f7d1f0dfebd1c103eaa3785c59e43e22c59018323cf9e1708f0ef5329e94a745d163fcbb6bff8e4c6742f9be9e86f3500c
   languageName: node
   linkType: hard
 
 "map-cache@npm:^0.2.2":
   version: 0.2.2
   resolution: "map-cache@npm:0.2.2"
-  checksum: 05e3eb005c1b80b9f949ca007687640e8c5d0fc88dc45c3c3ab4902a3bec79d66a58f3e3b04d6985d90cd267c629c7b46c977e9c34433e8c11ecfcbb9f0fa290
+  checksum: 10c0/05e3eb005c1b80b9f949ca007687640e8c5d0fc88dc45c3c3ab4902a3bec79d66a58f3e3b04d6985d90cd267c629c7b46c977e9c34433e8c11ecfcbb9f0fa290
   languageName: node
   linkType: hard
 
@@ -11171,28 +11171,28 @@ __metadata:
   resolution: "map-visit@npm:1.0.0"
   dependencies:
     object-visit: "npm:^1.0.0"
-  checksum: fb3475e5311939a6147e339999113db607adc11c7c3cd3103e5e9dbf502898416ecba6b1c7c649c6d4d12941de00cee58b939756bdf20a9efe7d4fa5a5738b73
+  checksum: 10c0/fb3475e5311939a6147e339999113db607adc11c7c3cd3103e5e9dbf502898416ecba6b1c7c649c6d4d12941de00cee58b939756bdf20a9efe7d4fa5a5738b73
   languageName: node
   linkType: hard
 
 "mark-loader@npm:^0.1.6":
   version: 0.1.6
   resolution: "mark-loader@npm:0.1.6"
-  checksum: 873d75bc87179f95b1059c0f00ecea7419b83a3b42a95a951f9e8157f0d2b3a6ce8313c8a0d7e68dbe534fe668d307c218c69b465cebb1a49e3fde5375d30d15
+  checksum: 10c0/873d75bc87179f95b1059c0f00ecea7419b83a3b42a95a951f9e8157f0d2b3a6ce8313c8a0d7e68dbe534fe668d307c218c69b465cebb1a49e3fde5375d30d15
   languageName: node
   linkType: hard
 
 "marky@npm:^1.2.5":
   version: 1.2.5
   resolution: "marky@npm:1.2.5"
-  checksum: ca8a011f287dab1ac3291df720fc32b366c4cd767347b63722966650405ce71ec6566f71d1e22e1768bf6461a7fd689b9038e7df0fcfb62eacf3a5a6dcac249e
+  checksum: 10c0/ca8a011f287dab1ac3291df720fc32b366c4cd767347b63722966650405ce71ec6566f71d1e22e1768bf6461a7fd689b9038e7df0fcfb62eacf3a5a6dcac249e
   languageName: node
   linkType: hard
 
 "mathml-tag-names@npm:^2.1.3":
   version: 2.1.3
   resolution: "mathml-tag-names@npm:2.1.3"
-  checksum: e2b094658a2618433efd2678a5a3e551645e09ba17c7c777783cd8dfa0178b0195fda0a5c46a6be5e778923662cf8dde891c894c869ff14fbb4ea3208c31bc4d
+  checksum: 10c0/e2b094658a2618433efd2678a5a3e551645e09ba17c7c777783cd8dfa0178b0195fda0a5c46a6be5e778923662cf8dde891c894c869ff14fbb4ea3208c31bc4d
   languageName: node
   linkType: hard
 
@@ -11203,49 +11203,49 @@ __metadata:
     hash-base: "npm:^3.0.0"
     inherits: "npm:^2.0.1"
     safe-buffer: "npm:^5.1.2"
-  checksum: b7bd75077f419c8e013fc4d4dada48be71882e37d69a44af65a2f2804b91e253441eb43a0614423a1c91bb830b8140b0dc906bc797245e2e275759584f4efcc5
+  checksum: 10c0/b7bd75077f419c8e013fc4d4dada48be71882e37d69a44af65a2f2804b91e253441eb43a0614423a1c91bb830b8140b0dc906bc797245e2e275759584f4efcc5
   languageName: node
   linkType: hard
 
 "mdn-data@npm:2.0.14":
   version: 2.0.14
   resolution: "mdn-data@npm:2.0.14"
-  checksum: 67241f8708c1e665a061d2b042d2d243366e93e5bf1f917693007f6d55111588b952dcbfd3ea9c2d0969fb754aad81b30fdcfdcc24546495fc3b24336b28d4bd
+  checksum: 10c0/67241f8708c1e665a061d2b042d2d243366e93e5bf1f917693007f6d55111588b952dcbfd3ea9c2d0969fb754aad81b30fdcfdcc24546495fc3b24336b28d4bd
   languageName: node
   linkType: hard
 
 "mdn-data@npm:2.0.28":
   version: 2.0.28
   resolution: "mdn-data@npm:2.0.28"
-  checksum: 20000932bc4cd1cde9cba4e23f08cc4f816398af4c15ec81040ed25421d6bf07b5cf6b17095972577fb498988f40f4cb589e3169b9357bb436a12d8e07e5ea7b
+  checksum: 10c0/20000932bc4cd1cde9cba4e23f08cc4f816398af4c15ec81040ed25421d6bf07b5cf6b17095972577fb498988f40f4cb589e3169b9357bb436a12d8e07e5ea7b
   languageName: node
   linkType: hard
 
 "mdn-data@npm:2.0.30":
   version: 2.0.30
   resolution: "mdn-data@npm:2.0.30"
-  checksum: a2c472ea16cee3911ae742593715aa4c634eb3d4b9f1e6ada0902aa90df13dcbb7285d19435f3ff213ebaa3b2e0c0265c1eb0e3fb278fda7f8919f046a410cd9
+  checksum: 10c0/a2c472ea16cee3911ae742593715aa4c634eb3d4b9f1e6ada0902aa90df13dcbb7285d19435f3ff213ebaa3b2e0c0265c1eb0e3fb278fda7f8919f046a410cd9
   languageName: node
   linkType: hard
 
 "mdn-data@npm:2.0.4":
   version: 2.0.4
   resolution: "mdn-data@npm:2.0.4"
-  checksum: a935c4530b938407481f7d0ccb82119ae618d9c673d2ee78bb10dcba8bd0ccbe2e2c7fe850ddc60b67e08f4c9d97f50b900993f6c2f2926e64a52ed6baa00b3a
+  checksum: 10c0/a935c4530b938407481f7d0ccb82119ae618d9c673d2ee78bb10dcba8bd0ccbe2e2c7fe850ddc60b67e08f4c9d97f50b900993f6c2f2926e64a52ed6baa00b3a
   languageName: node
   linkType: hard
 
 "media-typer@npm:0.3.0":
   version: 0.3.0
   resolution: "media-typer@npm:0.3.0"
-  checksum: d160f31246907e79fed398470285f21bafb45a62869dc469b1c8877f3f064f5eabc4bcc122f9479b8b605bc5c76187d7871cf84c4ee3ecd3e487da1993279928
+  checksum: 10c0/d160f31246907e79fed398470285f21bafb45a62869dc469b1c8877f3f064f5eabc4bcc122f9479b8b605bc5c76187d7871cf84c4ee3ecd3e487da1993279928
   languageName: node
   linkType: hard
 
 "memoize-one@npm:^6.0.0":
   version: 6.0.0
   resolution: "memoize-one@npm:6.0.0"
-  checksum: 45c88e064fd715166619af72e8cf8a7a17224d6edf61f7a8633d740ed8c8c0558a4373876c9b8ffc5518c2b65a960266adf403cc215cb1e90f7e262b58991f54
+  checksum: 10c0/45c88e064fd715166619af72e8cf8a7a17224d6edf61f7a8633d740ed8c8c0558a4373876c9b8ffc5518c2b65a960266adf403cc215cb1e90f7e262b58991f54
   languageName: node
   linkType: hard
 
@@ -11255,7 +11255,7 @@ __metadata:
   dependencies:
     errno: "npm:^0.1.3"
     readable-stream: "npm:^2.0.1"
-  checksum: f114c44ad8285103cb0e71420cf5bb628d3eb6cbd918197f5951590ff56ba2072f4a97924949c170320cdf180d2da4e8d16a0edd92ba0ca2d2de51dc932841e2
+  checksum: 10c0/f114c44ad8285103cb0e71420cf5bb628d3eb6cbd918197f5951590ff56ba2072f4a97924949c170320cdf180d2da4e8d16a0edd92ba0ca2d2de51dc932841e2
   languageName: node
   linkType: hard
 
@@ -11265,42 +11265,42 @@ __metadata:
   dependencies:
     errno: "npm:^0.1.3"
     readable-stream: "npm:^2.0.1"
-  checksum: 2737a27b14a9e8b8cd757be2ad99e8cc504b78a78aba9d6aa18ff1ef528e2223a433413d2df6ab5332997a5a8ccf075e6c6e90e31ab732a55455ca620e4a720b
+  checksum: 10c0/2737a27b14a9e8b8cd757be2ad99e8cc504b78a78aba9d6aa18ff1ef528e2223a433413d2df6ab5332997a5a8ccf075e6c6e90e31ab732a55455ca620e4a720b
   languageName: node
   linkType: hard
 
 "meow@npm:^13.1.0":
   version: 13.1.0
   resolution: "meow@npm:13.1.0"
-  checksum: 2dac9dbf99a17ce29618fe5919072a9b28e2aedb9547f9b1f15d046d5501dd6c14fe1f35f7a5665d0ee7111c98c4d359fcf3f985463ec5896dd50177363f442d
+  checksum: 10c0/2dac9dbf99a17ce29618fe5919072a9b28e2aedb9547f9b1f15d046d5501dd6c14fe1f35f7a5665d0ee7111c98c4d359fcf3f985463ec5896dd50177363f442d
   languageName: node
   linkType: hard
 
 "merge-descriptors@npm:1.0.1":
   version: 1.0.1
   resolution: "merge-descriptors@npm:1.0.1"
-  checksum: b67d07bd44cfc45cebdec349bb6e1f7b077ee2fd5beb15d1f7af073849208cb6f144fe403e29a36571baf3f4e86469ac39acf13c318381e958e186b2766f54ec
+  checksum: 10c0/b67d07bd44cfc45cebdec349bb6e1f7b077ee2fd5beb15d1f7af073849208cb6f144fe403e29a36571baf3f4e86469ac39acf13c318381e958e186b2766f54ec
   languageName: node
   linkType: hard
 
 "merge-stream@npm:^2.0.0":
   version: 2.0.0
   resolution: "merge-stream@npm:2.0.0"
-  checksum: 867fdbb30a6d58b011449b8885601ec1690c3e41c759ecd5a9d609094f7aed0096c37823ff4a7190ef0b8f22cc86beb7049196ff68c016e3b3c671d0dac91ce5
+  checksum: 10c0/867fdbb30a6d58b011449b8885601ec1690c3e41c759ecd5a9d609094f7aed0096c37823ff4a7190ef0b8f22cc86beb7049196ff68c016e3b3c671d0dac91ce5
   languageName: node
   linkType: hard
 
 "merge2@npm:^1.3.0, merge2@npm:^1.4.1":
   version: 1.4.1
   resolution: "merge2@npm:1.4.1"
-  checksum: 254a8a4605b58f450308fc474c82ac9a094848081bf4c06778200207820e5193726dc563a0d2c16468810516a5c97d9d3ea0ca6585d23c58ccfff2403e8dbbeb
+  checksum: 10c0/254a8a4605b58f450308fc474c82ac9a094848081bf4c06778200207820e5193726dc563a0d2c16468810516a5c97d9d3ea0ca6585d23c58ccfff2403e8dbbeb
   languageName: node
   linkType: hard
 
 "methods@npm:~1.1.2":
   version: 1.1.2
   resolution: "methods@npm:1.1.2"
-  checksum: bdf7cc72ff0a33e3eede03708c08983c4d7a173f91348b4b1e4f47d4cdbf734433ad971e7d1e8c77247d9e5cd8adb81ea4c67b0a2db526b758b2233d7814b8b2
+  checksum: 10c0/bdf7cc72ff0a33e3eede03708c08983c4d7a173f91348b4b1e4f47d4cdbf734433ad971e7d1e8c77247d9e5cd8adb81ea4c67b0a2db526b758b2233d7814b8b2
   languageName: node
   linkType: hard
 
@@ -11310,7 +11310,7 @@ __metadata:
   dependencies:
     braces: "npm:^3.0.2"
     picomatch: "npm:^2.3.1"
-  checksum: 3d6505b20f9fa804af5d8c596cb1c5e475b9b0cd05f652c5b56141cf941bd72adaeb7a436fda344235cef93a7f29b7472efc779fcdb83b478eab0867b95cdeff
+  checksum: 10c0/3d6505b20f9fa804af5d8c596cb1c5e475b9b0cd05f652c5b56141cf941bd72adaeb7a436fda344235cef93a7f29b7472efc779fcdb83b478eab0867b95cdeff
   languageName: node
   linkType: hard
 
@@ -11331,7 +11331,7 @@ __metadata:
     regex-not: "npm:^1.0.0"
     snapdragon: "npm:^0.8.1"
     to-regex: "npm:^3.0.2"
-  checksum: 531a32e7ac92bef60657820202be71b63d0f945c08a69cc4c239c0b19372b751483d464a850a2e3a5ff6cc9060641e43d44c303af104c1a27493d137d8af017f
+  checksum: 10c0/531a32e7ac92bef60657820202be71b63d0f945c08a69cc4c239c0b19372b751483d464a850a2e3a5ff6cc9060641e43d44c303af104c1a27493d137d8af017f
   languageName: node
   linkType: hard
 
@@ -11343,14 +11343,14 @@ __metadata:
     brorand: "npm:^1.0.1"
   bin:
     miller-rabin: bin/miller-rabin
-  checksum: 26b2b96f6e49dbcff7faebb78708ed2f5f9ae27ac8cbbf1d7c08f83cf39bed3d418c0c11034dce997da70d135cc0ff6f3a4c15dc452f8e114c11986388a64346
+  checksum: 10c0/26b2b96f6e49dbcff7faebb78708ed2f5f9ae27ac8cbbf1d7c08f83cf39bed3d418c0c11034dce997da70d135cc0ff6f3a4c15dc452f8e114c11986388a64346
   languageName: node
   linkType: hard
 
 "mime-db@npm:1.52.0, mime-db@npm:>= 1.43.0 < 2":
   version: 1.52.0
   resolution: "mime-db@npm:1.52.0"
-  checksum: 0557a01deebf45ac5f5777fe7740b2a5c309c6d62d40ceab4e23da9f821899ce7a900b7ac8157d4548ddbb7beffe9abc621250e6d182b0397ec7f10c7b91a5aa
+  checksum: 10c0/0557a01deebf45ac5f5777fe7740b2a5c309c6d62d40ceab4e23da9f821899ce7a900b7ac8157d4548ddbb7beffe9abc621250e6d182b0397ec7f10c7b91a5aa
   languageName: node
   linkType: hard
 
@@ -11359,7 +11359,7 @@ __metadata:
   resolution: "mime-types@npm:2.1.35"
   dependencies:
     mime-db: "npm:1.52.0"
-  checksum: 82fb07ec56d8ff1fc999a84f2f217aa46cb6ed1033fefaabd5785b9a974ed225c90dc72fff460259e66b95b73648596dbcc50d51ed69cdf464af2d237d3149b2
+  checksum: 10c0/82fb07ec56d8ff1fc999a84f2f217aa46cb6ed1033fefaabd5785b9a974ed225c90dc72fff460259e66b95b73648596dbcc50d51ed69cdf464af2d237d3149b2
   languageName: node
   linkType: hard
 
@@ -11368,7 +11368,7 @@ __metadata:
   resolution: "mime@npm:1.6.0"
   bin:
     mime: cli.js
-  checksum: b92cd0adc44888c7135a185bfd0dddc42c32606401c72896a842ae15da71eb88858f17669af41e498b463cd7eb998f7b48939a25b08374c7924a9c8a6f8a81b0
+  checksum: 10c0/b92cd0adc44888c7135a185bfd0dddc42c32606401c72896a842ae15da71eb88858f17669af41e498b463cd7eb998f7b48939a25b08374c7924a9c8a6f8a81b0
   languageName: node
   linkType: hard
 
@@ -11377,28 +11377,28 @@ __metadata:
   resolution: "mime@npm:2.6.0"
   bin:
     mime: cli.js
-  checksum: a7f2589900d9c16e3bdf7672d16a6274df903da958c1643c9c45771f0478f3846dcb1097f31eb9178452570271361e2149310931ec705c037210fc69639c8e6c
+  checksum: 10c0/a7f2589900d9c16e3bdf7672d16a6274df903da958c1643c9c45771f0478f3846dcb1097f31eb9178452570271361e2149310931ec705c037210fc69639c8e6c
   languageName: node
   linkType: hard
 
 "mimic-fn@npm:^2.1.0":
   version: 2.1.0
   resolution: "mimic-fn@npm:2.1.0"
-  checksum: b26f5479d7ec6cc2bce275a08f146cf78f5e7b661b18114e2506dd91ec7ec47e7a25bf4360e5438094db0560bcc868079fb3b1fb3892b833c1ecbf63f80c95a4
+  checksum: 10c0/b26f5479d7ec6cc2bce275a08f146cf78f5e7b661b18114e2506dd91ec7ec47e7a25bf4360e5438094db0560bcc868079fb3b1fb3892b833c1ecbf63f80c95a4
   languageName: node
   linkType: hard
 
 "mimic-fn@npm:^4.0.0":
   version: 4.0.0
   resolution: "mimic-fn@npm:4.0.0"
-  checksum: de9cc32be9996fd941e512248338e43407f63f6d497abe8441fa33447d922e927de54d4cc3c1a3c6d652857acd770389d5a3823f311a744132760ce2be15ccbf
+  checksum: 10c0/de9cc32be9996fd941e512248338e43407f63f6d497abe8441fa33447d922e927de54d4cc3c1a3c6d652857acd770389d5a3823f311a744132760ce2be15ccbf
   languageName: node
   linkType: hard
 
 "min-indent@npm:^1.0.0":
   version: 1.0.1
   resolution: "min-indent@npm:1.0.1"
-  checksum: 7e207bd5c20401b292de291f02913230cb1163abca162044f7db1d951fa245b174dc00869d40dd9a9f32a885ad6a5f3e767ee104cf278f399cb4e92d3f582d5c
+  checksum: 10c0/7e207bd5c20401b292de291f02913230cb1163abca162044f7db1d951fa245b174dc00869d40dd9a9f32a885ad6a5f3e767ee104cf278f399cb4e92d3f582d5c
   languageName: node
   linkType: hard
 
@@ -11411,21 +11411,21 @@ __metadata:
     webpack-sources: "npm:^1.1.0"
   peerDependencies:
     webpack: ^4.4.0 || ^5.0.0
-  checksum: 138c008f8a510012266d2834227e75181feeffd09e89e9cde0a63f17be3d64ea3ddbba01036aac9c8a969462c0142285659a20c294e8d01ba948aa1124affdc2
+  checksum: 10c0/138c008f8a510012266d2834227e75181feeffd09e89e9cde0a63f17be3d64ea3ddbba01036aac9c8a969462c0142285659a20c294e8d01ba948aa1124affdc2
   languageName: node
   linkType: hard
 
 "minimalistic-assert@npm:^1.0.0, minimalistic-assert@npm:^1.0.1":
   version: 1.0.1
   resolution: "minimalistic-assert@npm:1.0.1"
-  checksum: 96730e5601cd31457f81a296f521eb56036e6f69133c0b18c13fe941109d53ad23a4204d946a0d638d7f3099482a0cec8c9bb6d642604612ce43ee536be3dddd
+  checksum: 10c0/96730e5601cd31457f81a296f521eb56036e6f69133c0b18c13fe941109d53ad23a4204d946a0d638d7f3099482a0cec8c9bb6d642604612ce43ee536be3dddd
   languageName: node
   linkType: hard
 
 "minimalistic-crypto-utils@npm:^1.0.1":
   version: 1.0.1
   resolution: "minimalistic-crypto-utils@npm:1.0.1"
-  checksum: 790ecec8c5c73973a4fbf2c663d911033e8494d5fb0960a4500634766ab05d6107d20af896ca2132e7031741f19888154d44b2408ada0852446705441383e9f8
+  checksum: 10c0/790ecec8c5c73973a4fbf2c663d911033e8494d5fb0960a4500634766ab05d6107d20af896ca2132e7031741f19888154d44b2408ada0852446705441383e9f8
   languageName: node
   linkType: hard
 
@@ -11434,7 +11434,7 @@ __metadata:
   resolution: "minimatch@npm:9.0.3"
   dependencies:
     brace-expansion: "npm:^2.0.1"
-  checksum: 85f407dcd38ac3e180f425e86553911d101455ca3ad5544d6a7cec16286657e4f8a9aa6695803025c55e31e35a91a2252b5dc8e7d527211278b8b65b4dbd5eac
+  checksum: 10c0/85f407dcd38ac3e180f425e86553911d101455ca3ad5544d6a7cec16286657e4f8a9aa6695803025c55e31e35a91a2252b5dc8e7d527211278b8b65b4dbd5eac
   languageName: node
   linkType: hard
 
@@ -11443,7 +11443,7 @@ __metadata:
   resolution: "minimatch@npm:3.1.2"
   dependencies:
     brace-expansion: "npm:^1.1.7"
-  checksum: 0262810a8fc2e72cca45d6fd86bd349eee435eb95ac6aa45c9ea2180e7ee875ef44c32b55b5973ceabe95ea12682f6e3725cbb63d7a2d1da3ae1163c8b210311
+  checksum: 10c0/0262810a8fc2e72cca45d6fd86bd349eee435eb95ac6aa45c9ea2180e7ee875ef44c32b55b5973ceabe95ea12682f6e3725cbb63d7a2d1da3ae1163c8b210311
   languageName: node
   linkType: hard
 
@@ -11452,14 +11452,14 @@ __metadata:
   resolution: "minimatch@npm:5.1.6"
   dependencies:
     brace-expansion: "npm:^2.0.1"
-  checksum: 3defdfd230914f22a8da203747c42ee3c405c39d4d37ffda284dac5e45b7e1f6c49aa8be606509002898e73091ff2a3bbfc59c2c6c71d4660609f63aa92f98e3
+  checksum: 10c0/3defdfd230914f22a8da203747c42ee3c405c39d4d37ffda284dac5e45b7e1f6c49aa8be606509002898e73091ff2a3bbfc59c2c6c71d4660609f63aa92f98e3
   languageName: node
   linkType: hard
 
 "minimist@npm:^1.2.0, minimist@npm:^1.2.6":
   version: 1.2.8
   resolution: "minimist@npm:1.2.8"
-  checksum: 19d3fcdca050087b84c2029841a093691a91259a47def2f18222f41e7645a0b7c44ef4b40e88a1e58a40c84d2ef0ee6047c55594d298146d0eb3f6b737c20ce6
+  checksum: 10c0/19d3fcdca050087b84c2029841a093691a91259a47def2f18222f41e7645a0b7c44ef4b40e88a1e58a40c84d2ef0ee6047c55594d298146d0eb3f6b737c20ce6
   languageName: node
   linkType: hard
 
@@ -11468,7 +11468,7 @@ __metadata:
   resolution: "minipass-collect@npm:1.0.2"
   dependencies:
     minipass: "npm:^3.0.0"
-  checksum: 8f82bd1f3095b24f53a991b04b67f4c710c894e518b813f0864a31de5570441a509be1ca17e0bb92b047591a8fdbeb886f502764fefb00d2f144f4011791e898
+  checksum: 10c0/8f82bd1f3095b24f53a991b04b67f4c710c894e518b813f0864a31de5570441a509be1ca17e0bb92b047591a8fdbeb886f502764fefb00d2f144f4011791e898
   languageName: node
   linkType: hard
 
@@ -11483,7 +11483,7 @@ __metadata:
   dependenciesMeta:
     encoding:
       optional: true
-  checksum: 1b63c1f3313e88eeac4689f1b71c9f086598db9a189400e3ee960c32ed89e06737fa23976c9305c2d57464fb3fcdc12749d3378805c9d6176f5569b0d0ee8a75
+  checksum: 10c0/1b63c1f3313e88eeac4689f1b71c9f086598db9a189400e3ee960c32ed89e06737fa23976c9305c2d57464fb3fcdc12749d3378805c9d6176f5569b0d0ee8a75
   languageName: node
   linkType: hard
 
@@ -11492,7 +11492,7 @@ __metadata:
   resolution: "minipass-flush@npm:1.0.5"
   dependencies:
     minipass: "npm:^3.0.0"
-  checksum: 2a51b63feb799d2bb34669205eee7c0eaf9dce01883261a5b77410c9408aa447e478efd191b4de6fc1101e796ff5892f8443ef20d9544385819093dbb32d36bd
+  checksum: 10c0/2a51b63feb799d2bb34669205eee7c0eaf9dce01883261a5b77410c9408aa447e478efd191b4de6fc1101e796ff5892f8443ef20d9544385819093dbb32d36bd
   languageName: node
   linkType: hard
 
@@ -11501,7 +11501,7 @@ __metadata:
   resolution: "minipass-pipeline@npm:1.2.4"
   dependencies:
     minipass: "npm:^3.0.0"
-  checksum: cbda57cea20b140b797505dc2cac71581a70b3247b84480c1fed5ca5ba46c25ecc25f68bfc9e6dcb1a6e9017dab5c7ada5eab73ad4f0a49d84e35093e0c643f2
+  checksum: 10c0/cbda57cea20b140b797505dc2cac71581a70b3247b84480c1fed5ca5ba46c25ecc25f68bfc9e6dcb1a6e9017dab5c7ada5eab73ad4f0a49d84e35093e0c643f2
   languageName: node
   linkType: hard
 
@@ -11510,7 +11510,7 @@ __metadata:
   resolution: "minipass-sized@npm:1.0.3"
   dependencies:
     minipass: "npm:^3.0.0"
-  checksum: 298f124753efdc745cfe0f2bdfdd81ba25b9f4e753ca4a2066eb17c821f25d48acea607dfc997633ee5bf7b6dfffb4eee4f2051eb168663f0b99fad2fa4829cb
+  checksum: 10c0/298f124753efdc745cfe0f2bdfdd81ba25b9f4e753ca4a2066eb17c821f25d48acea607dfc997633ee5bf7b6dfffb4eee4f2051eb168663f0b99fad2fa4829cb
   languageName: node
   linkType: hard
 
@@ -11519,21 +11519,21 @@ __metadata:
   resolution: "minipass@npm:3.3.6"
   dependencies:
     yallist: "npm:^4.0.0"
-  checksum: a114746943afa1dbbca8249e706d1d38b85ed1298b530f5808ce51f8e9e941962e2a5ad2e00eae7dd21d8a4aae6586a66d4216d1a259385e9d0358f0c1eba16c
+  checksum: 10c0/a114746943afa1dbbca8249e706d1d38b85ed1298b530f5808ce51f8e9e941962e2a5ad2e00eae7dd21d8a4aae6586a66d4216d1a259385e9d0358f0c1eba16c
   languageName: node
   linkType: hard
 
 "minipass@npm:^5.0.0":
   version: 5.0.0
   resolution: "minipass@npm:5.0.0"
-  checksum: a91d8043f691796a8ac88df039da19933ef0f633e3d7f0d35dcd5373af49131cf2399bfc355f41515dc495e3990369c3858cd319e5c2722b4753c90bf3152462
+  checksum: 10c0/a91d8043f691796a8ac88df039da19933ef0f633e3d7f0d35dcd5373af49131cf2399bfc355f41515dc495e3990369c3858cd319e5c2722b4753c90bf3152462
   languageName: node
   linkType: hard
 
 "minipass@npm:^5.0.0 || ^6.0.2 || ^7.0.0, minipass@npm:^7.0.2, minipass@npm:^7.0.3":
   version: 7.0.4
   resolution: "minipass@npm:7.0.4"
-  checksum: 6c7370a6dfd257bf18222da581ba89a5eaedca10e158781232a8b5542a90547540b4b9b7e7f490e4cda43acfbd12e086f0453728ecf8c19e0ef6921bc5958ac5
+  checksum: 10c0/6c7370a6dfd257bf18222da581ba89a5eaedca10e158781232a8b5542a90547540b4b9b7e7f490e4cda43acfbd12e086f0453728ecf8c19e0ef6921bc5958ac5
   languageName: node
   linkType: hard
 
@@ -11543,7 +11543,7 @@ __metadata:
   dependencies:
     minipass: "npm:^3.0.0"
     yallist: "npm:^4.0.0"
-  checksum: 64fae024e1a7d0346a1102bb670085b17b7f95bf6cfdf5b128772ec8faf9ea211464ea4add406a3a6384a7d87a0cd1a96263692134323477b4fb43659a6cab78
+  checksum: 10c0/64fae024e1a7d0346a1102bb670085b17b7f95bf6cfdf5b128772ec8faf9ea211464ea4add406a3a6384a7d87a0cd1a96263692134323477b4fb43659a6cab78
   languageName: node
   linkType: hard
 
@@ -11553,7 +11553,7 @@ __metadata:
   dependencies:
     for-in: "npm:^1.0.2"
     is-extendable: "npm:^1.0.1"
-  checksum: cb39ffb73c377222391af788b4c83d1a6cecb2d9fceb7015384f8deb46e151a9b030c21ef59a79cb524d4557e3f74c7248ab948a62a6e7e296b42644863d183b
+  checksum: 10c0/cb39ffb73c377222391af788b4c83d1a6cecb2d9fceb7015384f8deb46e151a9b030c21ef59a79cb524d4557e3f74c7248ab948a62a6e7e296b42644863d183b
   languageName: node
   linkType: hard
 
@@ -11564,7 +11564,7 @@ __metadata:
     minimist: "npm:^1.2.6"
   bin:
     mkdirp: bin/cmd.js
-  checksum: e2e2be789218807b58abced04e7b49851d9e46e88a2f9539242cc8a92c9b5c3a0b9bab360bd3014e02a140fc4fbc58e31176c408b493f8a2a6f4986bd7527b01
+  checksum: 10c0/e2e2be789218807b58abced04e7b49851d9e46e88a2f9539242cc8a92c9b5c3a0b9bab360bd3014e02a140fc4fbc58e31176c408b493f8a2a6f4986bd7527b01
   languageName: node
   linkType: hard
 
@@ -11573,49 +11573,49 @@ __metadata:
   resolution: "mkdirp@npm:1.0.4"
   bin:
     mkdirp: bin/cmd.js
-  checksum: 46ea0f3ffa8bc6a5bc0c7081ffc3907777f0ed6516888d40a518c5111f8366d97d2678911ad1a6882bf592fa9de6c784fea32e1687bb94e1f4944170af48a5cf
+  checksum: 10c0/46ea0f3ffa8bc6a5bc0c7081ffc3907777f0ed6516888d40a518c5111f8366d97d2678911ad1a6882bf592fa9de6c784fea32e1687bb94e1f4944170af48a5cf
   languageName: node
   linkType: hard
 
 "mousetrap@npm:^1.5.2":
   version: 1.6.5
   resolution: "mousetrap@npm:1.6.5"
-  checksum: 5c361bdbbff3966fd58d70f39b9fe1f8e32c78f3ce65989d83af7aad32a3a95313ce835a8dd8a55cb5de9eeb7c1f0c2b9048631a3073b5606241589e8fc0ba53
+  checksum: 10c0/5c361bdbbff3966fd58d70f39b9fe1f8e32c78f3ce65989d83af7aad32a3a95313ce835a8dd8a55cb5de9eeb7c1f0c2b9048631a3073b5606241589e8fc0ba53
   languageName: node
   linkType: hard
 
 "mrmime@npm:^1.0.0":
   version: 1.0.1
   resolution: "mrmime@npm:1.0.1"
-  checksum: ab071441da76fd23b3b0d1823d77aacf8679d379a4a94cacd83e487d3d906763b277f3203a594c613602e31ab5209c26a8119b0477c4541ef8555b293a9db6d3
+  checksum: 10c0/ab071441da76fd23b3b0d1823d77aacf8679d379a4a94cacd83e487d3d906763b277f3203a594c613602e31ab5209c26a8119b0477c4541ef8555b293a9db6d3
   languageName: node
   linkType: hard
 
 "ms@npm:2.0.0":
   version: 2.0.0
   resolution: "ms@npm:2.0.0"
-  checksum: f8fda810b39fd7255bbdc451c46286e549794fcc700dc9cd1d25658bbc4dc2563a5de6fe7c60f798a16a60c6ceb53f033cb353f493f0cf63e5199b702943159d
+  checksum: 10c0/f8fda810b39fd7255bbdc451c46286e549794fcc700dc9cd1d25658bbc4dc2563a5de6fe7c60f798a16a60c6ceb53f033cb353f493f0cf63e5199b702943159d
   languageName: node
   linkType: hard
 
 "ms@npm:2.1.2":
   version: 2.1.2
   resolution: "ms@npm:2.1.2"
-  checksum: a437714e2f90dbf881b5191d35a6db792efbca5badf112f87b9e1c712aace4b4b9b742dd6537f3edf90fd6f684de897cec230abde57e87883766712ddda297cc
+  checksum: 10c0/a437714e2f90dbf881b5191d35a6db792efbca5badf112f87b9e1c712aace4b4b9b742dd6537f3edf90fd6f684de897cec230abde57e87883766712ddda297cc
   languageName: node
   linkType: hard
 
 "ms@npm:2.1.3, ms@npm:^2.1.1":
   version: 2.1.3
   resolution: "ms@npm:2.1.3"
-  checksum: d924b57e7312b3b63ad21fc5b3dc0af5e78d61a1fc7cfb5457edaf26326bf62be5307cc87ffb6862ef1c2b33b0233cdb5d4f01c4c958cc0d660948b65a287a48
+  checksum: 10c0/d924b57e7312b3b63ad21fc5b3dc0af5e78d61a1fc7cfb5457edaf26326bf62be5307cc87ffb6862ef1c2b33b0233cdb5d4f01c4c958cc0d660948b65a287a48
   languageName: node
   linkType: hard
 
 "multicast-dns-service-types@npm:^1.1.0":
   version: 1.1.0
   resolution: "multicast-dns-service-types@npm:1.1.0"
-  checksum: 25abc0e9ee509f38d874e22b03d563b16009d3976760d29bed25bf70ea992cfe30b0403743f49342279c67178a03311d31ecc1ec54bf79af2e6fe55f11af2660
+  checksum: 10c0/25abc0e9ee509f38d874e22b03d563b16009d3976760d29bed25bf70ea992cfe30b0403743f49342279c67178a03311d31ecc1ec54bf79af2e6fe55f11af2660
   languageName: node
   linkType: hard
 
@@ -11627,7 +11627,7 @@ __metadata:
     thunky: "npm:^1.0.2"
   bin:
     multicast-dns: cli.js
-  checksum: 972fc50869e922d80d66eeb91ad39fd2e107241e0c791fc914e76578e4f7f3dfe3bf007020dd4d7ed4d0ffd69d9aa2238a9f8bbb4d160bd6eb3f35dde0c2c513
+  checksum: 10c0/972fc50869e922d80d66eeb91ad39fd2e107241e0c791fc914e76578e4f7f3dfe3bf007020dd4d7ed4d0ffd69d9aa2238a9f8bbb4d160bd6eb3f35dde0c2c513
   languageName: node
   linkType: hard
 
@@ -11636,7 +11636,7 @@ __metadata:
   resolution: "nan@npm:2.17.0"
   dependencies:
     node-gyp: "npm:latest"
-  checksum: 4a231a62dba025f4c4fa814c1e6ffeb450c5cd0852b780f19fe4ea22b86ba0f1f394406dfd628c67fb7f0987e982fa230da1fbd3632258f927b8defd7046c1ad
+  checksum: 10c0/4a231a62dba025f4c4fa814c1e6ffeb450c5cd0852b780f19fe4ea22b86ba0f1f394406dfd628c67fb7f0987e982fa230da1fbd3632258f927b8defd7046c1ad
   languageName: node
   linkType: hard
 
@@ -11645,7 +11645,7 @@ __metadata:
   resolution: "nanoid@npm:3.3.7"
   bin:
     nanoid: bin/nanoid.cjs
-  checksum: e3fb661aa083454f40500473bb69eedb85dc160e763150b9a2c567c7e9ff560ce028a9f833123b618a6ea742e311138b591910e795614a629029e86e180660f3
+  checksum: 10c0/e3fb661aa083454f40500473bb69eedb85dc160e763150b9a2c567c7e9ff560ce028a9f833123b618a6ea742e311138b591910e795614a629029e86e180660f3
   languageName: node
   linkType: hard
 
@@ -11664,35 +11664,35 @@ __metadata:
     regex-not: "npm:^1.0.0"
     snapdragon: "npm:^0.8.1"
     to-regex: "npm:^3.0.1"
-  checksum: 0f5cefa755ca2e20c86332821995effb24acb79551ddaf51c1b9112628cad234a0d8fd9ac6aa56ad1f8bfad6ff6ae86e851acb960943249d9fa44b091479953a
+  checksum: 10c0/0f5cefa755ca2e20c86332821995effb24acb79551ddaf51c1b9112628cad234a0d8fd9ac6aa56ad1f8bfad6ff6ae86e851acb960943249d9fa44b091479953a
   languageName: node
   linkType: hard
 
 "natural-compare@npm:^1.4.0":
   version: 1.4.0
   resolution: "natural-compare@npm:1.4.0"
-  checksum: f5f9a7974bfb28a91afafa254b197f0f22c684d4a1731763dda960d2c8e375b36c7d690e0d9dc8fba774c537af14a7e979129bca23d88d052fbeb9466955e447
+  checksum: 10c0/f5f9a7974bfb28a91afafa254b197f0f22c684d4a1731763dda960d2c8e375b36c7d690e0d9dc8fba774c537af14a7e979129bca23d88d052fbeb9466955e447
   languageName: node
   linkType: hard
 
 "negotiator@npm:0.6.3, negotiator@npm:^0.6.3":
   version: 0.6.3
   resolution: "negotiator@npm:0.6.3"
-  checksum: 3ec9fd413e7bf071c937ae60d572bc67155262068ed522cf4b3be5edbe6ddf67d095ec03a3a14ebf8fc8e95f8e1d61be4869db0dbb0de696f6b837358bd43fc2
+  checksum: 10c0/3ec9fd413e7bf071c937ae60d572bc67155262068ed522cf4b3be5edbe6ddf67d095ec03a3a14ebf8fc8e95f8e1d61be4869db0dbb0de696f6b837358bd43fc2
   languageName: node
   linkType: hard
 
 "neo-async@npm:^2.5.0, neo-async@npm:^2.6.1, neo-async@npm:^2.6.2":
   version: 2.6.2
   resolution: "neo-async@npm:2.6.2"
-  checksum: c2f5a604a54a8ec5438a342e1f356dff4bc33ccccdb6dc668d94fe8e5eccfc9d2c2eea6064b0967a767ba63b33763f51ccf2cd2441b461a7322656c1f06b3f5d
+  checksum: 10c0/c2f5a604a54a8ec5438a342e1f356dff4bc33ccccdb6dc668d94fe8e5eccfc9d2c2eea6064b0967a767ba63b33763f51ccf2cd2441b461a7322656c1f06b3f5d
   languageName: node
   linkType: hard
 
 "nice-try@npm:^1.0.4":
   version: 1.0.5
   resolution: "nice-try@npm:1.0.5"
-  checksum: 95568c1b73e1d0d4069a3e3061a2102d854513d37bcfda73300015b7ba4868d3b27c198d1dbbd8ebdef4112fc2ed9e895d4a0f2e1cce0bd334f2a1346dc9205f
+  checksum: 10c0/95568c1b73e1d0d4069a3e3061a2102d854513d37bcfda73300015b7ba4868d3b27c198d1dbbd8ebdef4112fc2ed9e895d4a0f2e1cce0bd334f2a1346dc9205f
   languageName: node
   linkType: hard
 
@@ -11706,14 +11706,14 @@ __metadata:
   peerDependenciesMeta:
     encoding:
       optional: true
-  checksum: 3ec847ca43f678d07b80abfd85bdf06523c2554ee9a494c992c5fc61f5d9cde9f9f16aa33ff09a62f19eee9d54813b8850d7f054cdfee8b2daf789c57f8eeaea
+  checksum: 10c0/3ec847ca43f678d07b80abfd85bdf06523c2554ee9a494c992c5fc61f5d9cde9f9f16aa33ff09a62f19eee9d54813b8850d7f054cdfee8b2daf789c57f8eeaea
   languageName: node
   linkType: hard
 
 "node-forge@npm:^0.10.0":
   version: 0.10.0
   resolution: "node-forge@npm:0.10.0"
-  checksum: 9cbf9ac8fc3889a5a46b0248f7238ee4014770bf31d22e04c0c7f04ed91c8be4584c5f534cdf6037e99f236c636c925cba960501ed2b850e077512e152760663
+  checksum: 10c0/9cbf9ac8fc3889a5a46b0248f7238ee4014770bf31d22e04c0c7f04ed91c8be4584c5f534cdf6037e99f236c636c925cba960501ed2b850e077512e152760663
   languageName: node
   linkType: hard
 
@@ -11724,7 +11724,7 @@ __metadata:
     node-gyp-build: bin.js
     node-gyp-build-optional: optional.js
     node-gyp-build-test: build-test.js
-  checksum: bd7738c96608c1fa056344623b93d4bbdc63fec05862061e5489284639e3a53daa407b9158c45bfc2e33d0b419851ed5c1f03f4c9ba34726361e2a7b765c0ddc
+  checksum: 10c0/bd7738c96608c1fa056344623b93d4bbdc63fec05862061e5489284639e3a53daa407b9158c45bfc2e33d0b419851ed5c1f03f4c9ba34726361e2a7b765c0ddc
   languageName: node
   linkType: hard
 
@@ -11744,14 +11744,14 @@ __metadata:
     which: "npm:^4.0.0"
   bin:
     node-gyp: bin/node-gyp.js
-  checksum: abddfff7d873312e4ed4a5fb75ce893a5c4fb69e7fcb1dfa71c28a6b92a7f1ef6b62790dffb39181b5a82728ba8f2f32d229cf8cbe66769fe02cea7db4a555aa
+  checksum: 10c0/abddfff7d873312e4ed4a5fb75ce893a5c4fb69e7fcb1dfa71c28a6b92a7f1ef6b62790dffb39181b5a82728ba8f2f32d229cf8cbe66769fe02cea7db4a555aa
   languageName: node
   linkType: hard
 
 "node-int64@npm:^0.4.0":
   version: 0.4.0
   resolution: "node-int64@npm:0.4.0"
-  checksum: a6a4d8369e2f2720e9c645255ffde909c0fbd41c92ea92a5607fc17055955daac99c1ff589d421eee12a0d24e99f7bfc2aabfeb1a4c14742f6c099a51863f31a
+  checksum: 10c0/a6a4d8369e2f2720e9c645255ffde909c0fbd41c92ea92a5607fc17055955daac99c1ff589d421eee12a0d24e99f7bfc2aabfeb1a4c14742f6c099a51863f31a
   languageName: node
   linkType: hard
 
@@ -11782,14 +11782,14 @@ __metadata:
     url: "npm:^0.11.0"
     util: "npm:^0.11.0"
     vm-browserify: "npm:^1.0.1"
-  checksum: 0e05321a6396408903ed642231d2bca7dd96492d074c7af161ba06a63c95378bd3de50b4105eccbbc02d93ba3da69f0ff5e624bc2a8c92ca462ceb6a403e7986
+  checksum: 10c0/0e05321a6396408903ed642231d2bca7dd96492d074c7af161ba06a63c95378bd3de50b4105eccbbc02d93ba3da69f0ff5e624bc2a8c92ca462ceb6a403e7986
   languageName: node
   linkType: hard
 
 "node-releases@npm:^2.0.14":
   version: 2.0.14
   resolution: "node-releases@npm:2.0.14"
-  checksum: 199fc93773ae70ec9969bc6d5ac5b2bbd6eb986ed1907d751f411fef3ede0e4bfdb45ceb43711f8078bea237b6036db8b1bf208f6ff2b70c7d615afd157f3ab9
+  checksum: 10c0/199fc93773ae70ec9969bc6d5ac5b2bbd6eb986ed1907d751f411fef3ede0e4bfdb45ceb43711f8078bea237b6036db8b1bf208f6ff2b70c7d615afd157f3ab9
   languageName: node
   linkType: hard
 
@@ -11800,7 +11800,7 @@ __metadata:
     abbrev: "npm:^2.0.0"
   bin:
     nopt: bin/nopt.js
-  checksum: 9bd7198df6f16eb29ff16892c77bcf7f0cc41f9fb5c26280ac0def2cf8cf319f3b821b3af83eba0e74c85807cc430a16efe0db58fe6ae1f41e69519f585b6aff
+  checksum: 10c0/9bd7198df6f16eb29ff16892c77bcf7f0cc41f9fb5c26280ac0def2cf8cf319f3b821b3af83eba0e74c85807cc430a16efe0db58fe6ae1f41e69519f585b6aff
   languageName: node
   linkType: hard
 
@@ -11809,21 +11809,21 @@ __metadata:
   resolution: "normalize-path@npm:2.1.1"
   dependencies:
     remove-trailing-separator: "npm:^1.0.1"
-  checksum: db814326ff88057437233361b4c7e9cac7b54815b051b57f2d341ce89b1d8ec8cbd43e7fa95d7652b3b69ea8fcc294b89b8530d556a84d1bdace94229e1e9a8b
+  checksum: 10c0/db814326ff88057437233361b4c7e9cac7b54815b051b57f2d341ce89b1d8ec8cbd43e7fa95d7652b3b69ea8fcc294b89b8530d556a84d1bdace94229e1e9a8b
   languageName: node
   linkType: hard
 
 "normalize-path@npm:^3.0.0, normalize-path@npm:~3.0.0":
   version: 3.0.0
   resolution: "normalize-path@npm:3.0.0"
-  checksum: e008c8142bcc335b5e38cf0d63cfd39d6cf2d97480af9abdbe9a439221fd4d749763bab492a8ee708ce7a194bb00c9da6d0a115018672310850489137b3da046
+  checksum: 10c0/e008c8142bcc335b5e38cf0d63cfd39d6cf2d97480af9abdbe9a439221fd4d749763bab492a8ee708ce7a194bb00c9da6d0a115018672310850489137b3da046
   languageName: node
   linkType: hard
 
 "normalize-range@npm:^0.1.2":
   version: 0.1.2
   resolution: "normalize-range@npm:0.1.2"
-  checksum: bf39b73a63e0a42ad1a48c2bd1bda5a07ede64a7e2567307a407674e595bcff0fa0d57e8e5f1e7fa5e91000797c7615e13613227aaaa4d6d6e87f5bd5cc95de6
+  checksum: 10c0/bf39b73a63e0a42ad1a48c2bd1bda5a07ede64a7e2567307a407674e595bcff0fa0d57e8e5f1e7fa5e91000797c7615e13613227aaaa4d6d6e87f5bd5cc95de6
   languageName: node
   linkType: hard
 
@@ -11832,7 +11832,7 @@ __metadata:
   resolution: "npm-run-path@npm:2.0.2"
   dependencies:
     path-key: "npm:^2.0.0"
-  checksum: 95549a477886f48346568c97b08c4fda9cdbf7ce8a4fbc2213f36896d0d19249e32d68d7451bdcbca8041b5fba04a6b2c4a618beaf19849505c05b700740f1de
+  checksum: 10c0/95549a477886f48346568c97b08c4fda9cdbf7ce8a4fbc2213f36896d0d19249e32d68d7451bdcbca8041b5fba04a6b2c4a618beaf19849505c05b700740f1de
   languageName: node
   linkType: hard
 
@@ -11841,7 +11841,7 @@ __metadata:
   resolution: "npm-run-path@npm:4.0.1"
   dependencies:
     path-key: "npm:^3.0.0"
-  checksum: 6f9353a95288f8455cf64cbeb707b28826a7f29690244c1e4bb61ec573256e021b6ad6651b394eb1ccfd00d6ec50147253aba2c5fe58a57ceb111fad62c519ac
+  checksum: 10c0/6f9353a95288f8455cf64cbeb707b28826a7f29690244c1e4bb61ec573256e021b6ad6651b394eb1ccfd00d6ec50147253aba2c5fe58a57ceb111fad62c519ac
   languageName: node
   linkType: hard
 
@@ -11850,7 +11850,7 @@ __metadata:
   resolution: "npm-run-path@npm:5.1.0"
   dependencies:
     path-key: "npm:^4.0.0"
-  checksum: ff6d77514489f47fa1c3b1311d09cd4b6d09a874cc1866260f9dea12cbaabda0436ed7f8c2ee44d147bf99a3af29307c6f63b0f83d242b0b6b0ab25dff2629e3
+  checksum: 10c0/ff6d77514489f47fa1c3b1311d09cd4b6d09a874cc1866260f9dea12cbaabda0436ed7f8c2ee44d147bf99a3af29307c6f63b0f83d242b0b6b0ab25dff2629e3
   languageName: node
   linkType: hard
 
@@ -11859,7 +11859,7 @@ __metadata:
   resolution: "nth-check@npm:1.0.2"
   dependencies:
     boolbase: "npm:~1.0.0"
-  checksum: 1a67ce53a99e276eea672f892d712b29f3e6802bbbef7285ffab72ecea4f972e8244defac1ebded0daffabf459def31355bb9c64e5657ac2ab032c13f185d0fd
+  checksum: 10c0/1a67ce53a99e276eea672f892d712b29f3e6802bbbef7285ffab72ecea4f972e8244defac1ebded0daffabf459def31355bb9c64e5657ac2ab032c13f185d0fd
   languageName: node
   linkType: hard
 
@@ -11868,21 +11868,21 @@ __metadata:
   resolution: "nth-check@npm:2.1.1"
   dependencies:
     boolbase: "npm:^1.0.0"
-  checksum: 5fee7ff309727763689cfad844d979aedd2204a817fbaaf0e1603794a7c20db28548d7b024692f953557df6ce4a0ee4ae46cd8ebd9b36cfb300b9226b567c479
+  checksum: 10c0/5fee7ff309727763689cfad844d979aedd2204a817fbaaf0e1603794a7c20db28548d7b024692f953557df6ce4a0ee4ae46cd8ebd9b36cfb300b9226b567c479
   languageName: node
   linkType: hard
 
 "nwsapi@npm:^2.2.2, nwsapi@npm:^2.2.7":
   version: 2.2.7
   resolution: "nwsapi@npm:2.2.7"
-  checksum: 44be198adae99208487a1c886c0a3712264f7bbafa44368ad96c003512fed2753d4e22890ca1e6edb2690c3456a169f2a3c33bfacde1905cf3bf01c7722464db
+  checksum: 10c0/44be198adae99208487a1c886c0a3712264f7bbafa44368ad96c003512fed2753d4e22890ca1e6edb2690c3456a169f2a3c33bfacde1905cf3bf01c7722464db
   languageName: node
   linkType: hard
 
 "object-assign@npm:^4, object-assign@npm:^4.0.1, object-assign@npm:^4.1.1":
   version: 4.1.1
   resolution: "object-assign@npm:4.1.1"
-  checksum: 1f4df9945120325d041ccf7b86f31e8bcc14e73d29171e37a7903050e96b81323784ec59f93f102ec635bcf6fa8034ba3ea0a8c7e69fa202b87ae3b6cec5a414
+  checksum: 10c0/1f4df9945120325d041ccf7b86f31e8bcc14e73d29171e37a7903050e96b81323784ec59f93f102ec635bcf6fa8034ba3ea0a8c7e69fa202b87ae3b6cec5a414
   languageName: node
   linkType: hard
 
@@ -11893,14 +11893,14 @@ __metadata:
     copy-descriptor: "npm:^0.1.0"
     define-property: "npm:^0.2.5"
     kind-of: "npm:^3.0.3"
-  checksum: 79314b05e9d626159a04f1d913f4c4aba9eae8848511cf5f4c8e3b04bb3cc313b65f60357f86462c959a14c2d58380fedf89b6b32ecec237c452a5ef3900a293
+  checksum: 10c0/79314b05e9d626159a04f1d913f4c4aba9eae8848511cf5f4c8e3b04bb3cc313b65f60357f86462c959a14c2d58380fedf89b6b32ecec237c452a5ef3900a293
   languageName: node
   linkType: hard
 
 "object-inspect@npm:^1.13.1, object-inspect@npm:^1.9.0":
   version: 1.13.1
   resolution: "object-inspect@npm:1.13.1"
-  checksum: fad603f408e345c82e946abdf4bfd774260a5ed3e5997a0b057c44153ac32c7271ff19e3a5ae39c858da683ba045ccac2f65245c12763ce4e8594f818f4a648d
+  checksum: 10c0/fad603f408e345c82e946abdf4bfd774260a5ed3e5997a0b057c44153ac32c7271ff19e3a5ae39c858da683ba045ccac2f65245c12763ce4e8594f818f4a648d
   languageName: node
   linkType: hard
 
@@ -11910,14 +11910,14 @@ __metadata:
   dependencies:
     call-bind: "npm:^1.0.2"
     define-properties: "npm:^1.1.3"
-  checksum: 8c263fb03fc28f1ffb54b44b9147235c5e233dc1ca23768e7d2569740b5d860154d7cc29a30220fe28ed6d8008e2422aefdebfe987c103e1c5d190cf02d9d886
+  checksum: 10c0/8c263fb03fc28f1ffb54b44b9147235c5e233dc1ca23768e7d2569740b5d860154d7cc29a30220fe28ed6d8008e2422aefdebfe987c103e1c5d190cf02d9d886
   languageName: node
   linkType: hard
 
 "object-keys@npm:^1.1.1":
   version: 1.1.1
   resolution: "object-keys@npm:1.1.1"
-  checksum: b11f7ccdbc6d406d1f186cdadb9d54738e347b2692a14439ca5ac70c225fa6db46db809711b78589866d47b25fc3e8dee0b4c722ac751e11180f9380e3d8601d
+  checksum: 10c0/b11f7ccdbc6d406d1f186cdadb9d54738e347b2692a14439ca5ac70c225fa6db46db809711b78589866d47b25fc3e8dee0b4c722ac751e11180f9380e3d8601d
   languageName: node
   linkType: hard
 
@@ -11926,7 +11926,7 @@ __metadata:
   resolution: "object-visit@npm:1.0.1"
   dependencies:
     isobject: "npm:^3.0.0"
-  checksum: 086b475bda24abd2318d2b187c3e928959b89f5cb5883d6fe5a42d03719b61fc18e765f658de9ac8730e67ba9ff26d61e73d991215948ff9ecefe771e0071029
+  checksum: 10c0/086b475bda24abd2318d2b187c3e928959b89f5cb5883d6fe5a42d03719b61fc18e765f658de9ac8730e67ba9ff26d61e73d991215948ff9ecefe771e0071029
   languageName: node
   linkType: hard
 
@@ -11938,7 +11938,7 @@ __metadata:
     define-properties: "npm:^1.1.4"
     has-symbols: "npm:^1.0.3"
     object-keys: "npm:^1.1.1"
-  checksum: 2f286118c023e557757620e647b02e7c88d3d417e0c568fca0820de8ec9cca68928304854d5b03e99763eddad6e78a6716e2930f7e6372e4b9b843f3fd3056f3
+  checksum: 10c0/2f286118c023e557757620e647b02e7c88d3d417e0c568fca0820de8ec9cca68928304854d5b03e99763eddad6e78a6716e2930f7e6372e4b9b843f3fd3056f3
   languageName: node
   linkType: hard
 
@@ -11949,7 +11949,7 @@ __metadata:
     call-bind: "npm:^1.0.2"
     define-properties: "npm:^1.2.0"
     es-abstract: "npm:^1.22.1"
-  checksum: 3ad1899cc7bf14546bf28f4a9b363ae8690b90948fcfbcac4c808395435d760f26193d9cae95337ce0e3c1e5c1f4fa45f7b46b31b68d389e9e117fce38775d86
+  checksum: 10c0/3ad1899cc7bf14546bf28f4a9b363ae8690b90948fcfbcac4c808395435d760f26193d9cae95337ce0e3c1e5c1f4fa45f7b46b31b68d389e9e117fce38775d86
   languageName: node
   linkType: hard
 
@@ -11960,7 +11960,7 @@ __metadata:
     call-bind: "npm:^1.0.2"
     define-properties: "npm:^1.2.0"
     es-abstract: "npm:^1.22.1"
-  checksum: 071745c21f6fc9e6c914691f2532c1fb60ad967e5ddc52801d09958b5de926566299d07ae14466452a7efd29015f9145d6c09c573d93a0dc6f1683ee0ec2b93b
+  checksum: 10c0/071745c21f6fc9e6c914691f2532c1fb60ad967e5ddc52801d09958b5de926566299d07ae14466452a7efd29015f9145d6c09c573d93a0dc6f1683ee0ec2b93b
   languageName: node
   linkType: hard
 
@@ -11973,7 +11973,7 @@ __metadata:
     define-properties: "npm:^1.2.0"
     es-abstract: "npm:^1.21.2"
     safe-array-concat: "npm:^1.0.0"
-  checksum: 9c401557a1cd47d873810b8df61dba350bc39848753180a2c7bdc8b9a67907b7c12e5aa9318fde7fe68d3b62c88b9cbd729b3cc8bbdf02655619b9d2a99b5c2a
+  checksum: 10c0/9c401557a1cd47d873810b8df61dba350bc39848753180a2c7bdc8b9a67907b7c12e5aa9318fde7fe68d3b62c88b9cbd729b3cc8bbdf02655619b9d2a99b5c2a
   languageName: node
   linkType: hard
 
@@ -11985,7 +11985,7 @@ __metadata:
     define-properties: "npm:^1.2.0"
     es-abstract: "npm:^1.22.1"
     get-intrinsic: "npm:^1.2.1"
-  checksum: 61e41fbf08cc04ed860363db9629eedeaa590fce243c0960e948fd7b11f78a9d4350065c339936d118a2dd8775d7259e26207340cc8ce688bec66cb615fec6fe
+  checksum: 10c0/61e41fbf08cc04ed860363db9629eedeaa590fce243c0960e948fd7b11f78a9d4350065c339936d118a2dd8775d7259e26207340cc8ce688bec66cb615fec6fe
   languageName: node
   linkType: hard
 
@@ -11995,7 +11995,7 @@ __metadata:
   dependencies:
     define-properties: "npm:^1.1.4"
     es-abstract: "npm:^1.20.4"
-  checksum: 419fc1c74a2aea7ebb4d49b79d5b1599a010b26c18eae35bd061ccdd013ccb749c499d8dd6ee21a91e6d7264ccc592573d0f13562970f76e25fc844d8c1b02ce
+  checksum: 10c0/419fc1c74a2aea7ebb4d49b79d5b1599a010b26c18eae35bd061ccdd013ccb749c499d8dd6ee21a91e6d7264ccc592573d0f13562970f76e25fc844d8c1b02ce
   languageName: node
   linkType: hard
 
@@ -12004,7 +12004,7 @@ __metadata:
   resolution: "object.pick@npm:1.3.0"
   dependencies:
     isobject: "npm:^3.0.1"
-  checksum: cd316ec986e49895a28f2df9182de9cdeee57cd2a952c122aacc86344c28624fe002d9affc4f48b5014ec7c033da9942b08821ddb44db8c5bac5b3ec54bdc31e
+  checksum: 10c0/cd316ec986e49895a28f2df9182de9cdeee57cd2a952c122aacc86344c28624fe002d9affc4f48b5014ec7c033da9942b08821ddb44db8c5bac5b3ec54bdc31e
   languageName: node
   linkType: hard
 
@@ -12015,21 +12015,21 @@ __metadata:
     call-bind: "npm:^1.0.2"
     define-properties: "npm:^1.2.0"
     es-abstract: "npm:^1.22.1"
-  checksum: e869d6a37fb7afdd0054dea49036d6ccebb84854a8848a093bbd1bc516f53e690bba88f0bc3e83fdfa74c601469ee6989c9b13359cda9604144c6e732fad3b6b
+  checksum: 10c0/e869d6a37fb7afdd0054dea49036d6ccebb84854a8848a093bbd1bc516f53e690bba88f0bc3e83fdfa74c601469ee6989c9b13359cda9604144c6e732fad3b6b
   languageName: node
   linkType: hard
 
 "obuf@npm:^1.0.0, obuf@npm:^1.1.2, obuf@npm:~1.1.2":
   version: 1.1.2
   resolution: "obuf@npm:1.1.2"
-  checksum: 520aaac7ea701618eacf000fc96ae458e20e13b0569845800fc582f81b386731ab22d55354b4915d58171db00e79cfcd09c1638c02f89577ef092b38c65b7d81
+  checksum: 10c0/520aaac7ea701618eacf000fc96ae458e20e13b0569845800fc582f81b386731ab22d55354b4915d58171db00e79cfcd09c1638c02f89577ef092b38c65b7d81
   languageName: node
   linkType: hard
 
 "on-exit-leak-free@npm:^2.1.0":
   version: 2.1.2
   resolution: "on-exit-leak-free@npm:2.1.2"
-  checksum: faea2e1c9d696ecee919026c32be8d6a633a7ac1240b3b87e944a380e8a11dc9c95c4a1f8fb0568de7ab8db3823e790f12bda45296b1d111e341aad3922a0570
+  checksum: 10c0/faea2e1c9d696ecee919026c32be8d6a633a7ac1240b3b87e944a380e8a11dc9c95c4a1f8fb0568de7ab8db3823e790f12bda45296b1d111e341aad3922a0570
   languageName: node
   linkType: hard
 
@@ -12038,14 +12038,14 @@ __metadata:
   resolution: "on-finished@npm:2.4.1"
   dependencies:
     ee-first: "npm:1.1.1"
-  checksum: 46fb11b9063782f2d9968863d9cbba33d77aa13c17f895f56129c274318b86500b22af3a160fe9995aa41317efcd22941b6eba747f718ced08d9a73afdb087b4
+  checksum: 10c0/46fb11b9063782f2d9968863d9cbba33d77aa13c17f895f56129c274318b86500b22af3a160fe9995aa41317efcd22941b6eba747f718ced08d9a73afdb087b4
   languageName: node
   linkType: hard
 
 "on-headers@npm:~1.0.2":
   version: 1.0.2
   resolution: "on-headers@npm:1.0.2"
-  checksum: f649e65c197bf31505a4c0444875db0258e198292f34b884d73c2f751e91792ef96bb5cf89aa0f4fecc2e4dc662461dda606b1274b0e564f539cae5d2f5fc32f
+  checksum: 10c0/f649e65c197bf31505a4c0444875db0258e198292f34b884d73c2f751e91792ef96bb5cf89aa0f4fecc2e4dc662461dda606b1274b0e564f539cae5d2f5fc32f
   languageName: node
   linkType: hard
 
@@ -12054,7 +12054,7 @@ __metadata:
   resolution: "once@npm:1.4.0"
   dependencies:
     wrappy: "npm:1"
-  checksum: 5d48aca287dfefabd756621c5dfce5c91a549a93e9fdb7b8246bc4c4790aa2ec17b34a260530474635147aeb631a2dcc8b32c613df0675f96041cbb8244517d0
+  checksum: 10c0/5d48aca287dfefabd756621c5dfce5c91a549a93e9fdb7b8246bc4c4790aa2ec17b34a260530474635147aeb631a2dcc8b32c613df0675f96041cbb8244517d0
   languageName: node
   linkType: hard
 
@@ -12063,7 +12063,7 @@ __metadata:
   resolution: "onetime@npm:5.1.2"
   dependencies:
     mimic-fn: "npm:^2.1.0"
-  checksum: ffcef6fbb2692c3c40749f31ea2e22677a876daea92959b8a80b521d95cca7a668c884d8b2045d1d8ee7d56796aa405c405462af112a1477594cc63531baeb8f
+  checksum: 10c0/ffcef6fbb2692c3c40749f31ea2e22677a876daea92959b8a80b521d95cca7a668c884d8b2045d1d8ee7d56796aa405c405462af112a1477594cc63531baeb8f
   languageName: node
   linkType: hard
 
@@ -12072,7 +12072,7 @@ __metadata:
   resolution: "onetime@npm:6.0.0"
   dependencies:
     mimic-fn: "npm:^4.0.0"
-  checksum: 4eef7c6abfef697dd4479345a4100c382d73c149d2d56170a54a07418c50816937ad09500e1ed1e79d235989d073a9bade8557122aee24f0576ecde0f392bb6c
+  checksum: 10c0/4eef7c6abfef697dd4479345a4100c382d73c149d2d56170a54a07418c50816937ad09500e1ed1e79d235989d073a9bade8557122aee24f0576ecde0f392bb6c
   languageName: node
   linkType: hard
 
@@ -12084,7 +12084,7 @@ __metadata:
     define-lazy-prop: "npm:^3.0.0"
     is-inside-container: "npm:^1.0.0"
     is-wsl: "npm:^2.2.0"
-  checksum: 8073ec0dd8994a7a7d9bac208bd17d093993a65ce10f2eb9b62b6d3a91c9366ae903938a237c275493c130171d339f6dcbdd2a2de7e32953452c0867b97825af
+  checksum: 10c0/8073ec0dd8994a7a7d9bac208bd17d093993a65ce10f2eb9b62b6d3a91c9366ae903938a237c275493c130171d339f6dcbdd2a2de7e32953452c0867b97825af
   languageName: node
   linkType: hard
 
@@ -12093,7 +12093,7 @@ __metadata:
   resolution: "opencollective-postinstall@npm:2.0.3"
   bin:
     opencollective-postinstall: index.js
-  checksum: 8a0104a218bc1afaae943f0af378461eeb2836f9848bad872bbd067ec5d1d9791636f307454ab77d0746f10341366f295384656a340ebdb87a2585058e8567e5
+  checksum: 10c0/8a0104a218bc1afaae943f0af378461eeb2836f9848bad872bbd067ec5d1d9791636f307454ab77d0746f10341366f295384656a340ebdb87a2585058e8567e5
   languageName: node
   linkType: hard
 
@@ -12102,7 +12102,7 @@ __metadata:
   resolution: "opener@npm:1.5.2"
   bin:
     opener: bin/opener-bin.js
-  checksum: dd56256ab0cf796585617bc28e06e058adf09211781e70b264c76a1dbe16e90f868c974e5bf5309c93469157c7d14b89c35dc53fe7293b0e40b4d2f92073bc79
+  checksum: 10c0/dd56256ab0cf796585617bc28e06e058adf09211781e70b264c76a1dbe16e90f868c974e5bf5309c93469157c7d14b89c35dc53fe7293b0e40b4d2f92073bc79
   languageName: node
   linkType: hard
 
@@ -12111,7 +12111,7 @@ __metadata:
   resolution: "opn@npm:5.5.0"
   dependencies:
     is-wsl: "npm:^1.1.0"
-  checksum: 03f78b1ab464fd0d97543e2a90e47ca872e2324696bc13f741467693060fe058e87e38e9cfc9f3b568e60dfb31579fbe664d8e806b2f219262c423da953bba4c
+  checksum: 10c0/03f78b1ab464fd0d97543e2a90e47ca872e2324696bc13f741467693060fe058e87e38e9cfc9f3b568e60dfb31579fbe664d8e806b2f219262c423da953bba4c
   languageName: node
   linkType: hard
 
@@ -12125,21 +12125,21 @@ __metadata:
     levn: "npm:^0.4.1"
     prelude-ls: "npm:^1.2.1"
     type-check: "npm:^0.4.0"
-  checksum: 66fba794d425b5be51353035cf3167ce6cfa049059cbb93229b819167687e0f48d2bc4603fcb21b091c99acb516aae1083624675b15c4765b2e4693a085e959c
+  checksum: 10c0/66fba794d425b5be51353035cf3167ce6cfa049059cbb93229b819167687e0f48d2bc4603fcb21b091c99acb516aae1083624675b15c4765b2e4693a085e959c
   languageName: node
   linkType: hard
 
 "os-browserify@npm:^0.3.0":
   version: 0.3.0
   resolution: "os-browserify@npm:0.3.0"
-  checksum: 6ff32cb1efe2bc6930ad0fd4c50e30c38010aee909eba8d65be60af55efd6cbb48f0287e3649b4e3f3a63dce5a667b23c187c4293a75e557f0d5489d735bcf52
+  checksum: 10c0/6ff32cb1efe2bc6930ad0fd4c50e30c38010aee909eba8d65be60af55efd6cbb48f0287e3649b4e3f3a63dce5a667b23c187c4293a75e557f0d5489d735bcf52
   languageName: node
   linkType: hard
 
 "p-finally@npm:^1.0.0":
   version: 1.0.0
   resolution: "p-finally@npm:1.0.0"
-  checksum: 6b8552339a71fe7bd424d01d8451eea92d379a711fc62f6b2fe64cad8a472c7259a236c9a22b4733abca0b5666ad503cb497792a0478c5af31ded793d00937e7
+  checksum: 10c0/6b8552339a71fe7bd424d01d8451eea92d379a711fc62f6b2fe64cad8a472c7259a236c9a22b4733abca0b5666ad503cb497792a0478c5af31ded793d00937e7
   languageName: node
   linkType: hard
 
@@ -12148,7 +12148,7 @@ __metadata:
   resolution: "p-limit@npm:2.3.0"
   dependencies:
     p-try: "npm:^2.0.0"
-  checksum: 8da01ac53efe6a627080fafc127c873da40c18d87b3f5d5492d465bb85ec7207e153948df6b9cbaeb130be70152f874229b8242ee2be84c0794082510af97f12
+  checksum: 10c0/8da01ac53efe6a627080fafc127c873da40c18d87b3f5d5492d465bb85ec7207e153948df6b9cbaeb130be70152f874229b8242ee2be84c0794082510af97f12
   languageName: node
   linkType: hard
 
@@ -12157,7 +12157,7 @@ __metadata:
   resolution: "p-limit@npm:3.1.0"
   dependencies:
     yocto-queue: "npm:^0.1.0"
-  checksum: 9db675949dbdc9c3763c89e748d0ef8bdad0afbb24d49ceaf4c46c02c77d30db4e0652ed36d0a0a7a95154335fab810d95c86153105bb73b3a90448e2bb14e1a
+  checksum: 10c0/9db675949dbdc9c3763c89e748d0ef8bdad0afbb24d49ceaf4c46c02c77d30db4e0652ed36d0a0a7a95154335fab810d95c86153105bb73b3a90448e2bb14e1a
   languageName: node
   linkType: hard
 
@@ -12166,7 +12166,7 @@ __metadata:
   resolution: "p-locate@npm:3.0.0"
   dependencies:
     p-limit: "npm:^2.0.0"
-  checksum: 7b7f06f718f19e989ce6280ed4396fb3c34dabdee0df948376483032f9d5ec22fdf7077ec942143a75827bb85b11da72016497fc10dac1106c837ed593969ee8
+  checksum: 10c0/7b7f06f718f19e989ce6280ed4396fb3c34dabdee0df948376483032f9d5ec22fdf7077ec942143a75827bb85b11da72016497fc10dac1106c837ed593969ee8
   languageName: node
   linkType: hard
 
@@ -12175,7 +12175,7 @@ __metadata:
   resolution: "p-locate@npm:4.1.0"
   dependencies:
     p-limit: "npm:^2.2.0"
-  checksum: 1b476ad69ad7f6059744f343b26d51ce091508935c1dbb80c4e0a2f397ffce0ca3a1f9f5cd3c7ce19d7929a09719d5c65fe70d8ee289c3f267cd36f2881813e9
+  checksum: 10c0/1b476ad69ad7f6059744f343b26d51ce091508935c1dbb80c4e0a2f397ffce0ca3a1f9f5cd3c7ce19d7929a09719d5c65fe70d8ee289c3f267cd36f2881813e9
   languageName: node
   linkType: hard
 
@@ -12184,14 +12184,14 @@ __metadata:
   resolution: "p-locate@npm:5.0.0"
   dependencies:
     p-limit: "npm:^3.0.2"
-  checksum: 2290d627ab7903b8b70d11d384fee714b797f6040d9278932754a6860845c4d3190603a0772a663c8cb5a7b21d1b16acb3a6487ebcafa9773094edc3dfe6009a
+  checksum: 10c0/2290d627ab7903b8b70d11d384fee714b797f6040d9278932754a6860845c4d3190603a0772a663c8cb5a7b21d1b16acb3a6487ebcafa9773094edc3dfe6009a
   languageName: node
   linkType: hard
 
 "p-map@npm:^2.0.0":
   version: 2.1.0
   resolution: "p-map@npm:2.1.0"
-  checksum: 735dae87badd4737a2dd582b6d8f93e49a1b79eabbc9815a4d63a528d5e3523e978e127a21d784cccb637010e32103a40d2aaa3ab23ae60250b1a820ca752043
+  checksum: 10c0/735dae87badd4737a2dd582b6d8f93e49a1b79eabbc9815a4d63a528d5e3523e978e127a21d784cccb637010e32103a40d2aaa3ab23ae60250b1a820ca752043
   languageName: node
   linkType: hard
 
@@ -12200,7 +12200,7 @@ __metadata:
   resolution: "p-map@npm:4.0.0"
   dependencies:
     aggregate-error: "npm:^3.0.0"
-  checksum: 592c05bd6262c466ce269ff172bb8de7c6975afca9b50c975135b974e9bdaafbfe80e61aaaf5be6d1200ba08b30ead04b88cfa7e25ff1e3b93ab28c9f62a2c75
+  checksum: 10c0/592c05bd6262c466ce269ff172bb8de7c6975afca9b50c975135b974e9bdaafbfe80e61aaaf5be6d1200ba08b30ead04b88cfa7e25ff1e3b93ab28c9f62a2c75
   languageName: node
   linkType: hard
 
@@ -12209,28 +12209,28 @@ __metadata:
   resolution: "p-retry@npm:3.0.1"
   dependencies:
     retry: "npm:^0.12.0"
-  checksum: 4fbec30cb0d8d10c5d9d1787a2d2c2b5ee60ddfa1897e86ec4e556ca1dff0901859872d7a7ecc33dd94af6e1c3a92ed79cc828161bbd221a2a1e464971c51b1b
+  checksum: 10c0/4fbec30cb0d8d10c5d9d1787a2d2c2b5ee60ddfa1897e86ec4e556ca1dff0901859872d7a7ecc33dd94af6e1c3a92ed79cc828161bbd221a2a1e464971c51b1b
   languageName: node
   linkType: hard
 
 "p-try@npm:^2.0.0":
   version: 2.2.0
   resolution: "p-try@npm:2.2.0"
-  checksum: c36c19907734c904b16994e6535b02c36c2224d433e01a2f1ab777237f4d86e6289fd5fd464850491e940379d4606ed850c03e0f9ab600b0ebddb511312e177f
+  checksum: 10c0/c36c19907734c904b16994e6535b02c36c2224d433e01a2f1ab777237f4d86e6289fd5fd464850491e940379d4606ed850c03e0f9ab600b0ebddb511312e177f
   languageName: node
   linkType: hard
 
 "packet-reader@npm:1.0.0":
   version: 1.0.0
   resolution: "packet-reader@npm:1.0.0"
-  checksum: c86c3321bb07e0f03cc2db59f7701184e0bbfcb914f1fdc963993b03262486deb402292adcef39b64e3530ea66b3b2e2163d6da7b3792a730bdd1c6df3175aaa
+  checksum: 10c0/c86c3321bb07e0f03cc2db59f7701184e0bbfcb914f1fdc963993b03262486deb402292adcef39b64e3530ea66b3b2e2163d6da7b3792a730bdd1c6df3175aaa
   languageName: node
   linkType: hard
 
 "pako@npm:~1.0.5":
   version: 1.0.11
   resolution: "pako@npm:1.0.11"
-  checksum: 86dd99d8b34c3930345b8bbeb5e1cd8a05f608eeb40967b293f72fe469d0e9c88b783a8777e4cc7dc7c91ce54c5e93d88ff4b4f060e6ff18408fd21030d9ffbe
+  checksum: 10c0/86dd99d8b34c3930345b8bbeb5e1cd8a05f608eeb40967b293f72fe469d0e9c88b783a8777e4cc7dc7c91ce54c5e93d88ff4b4f060e6ff18408fd21030d9ffbe
   languageName: node
   linkType: hard
 
@@ -12239,7 +12239,7 @@ __metadata:
   resolution: "parent-module@npm:1.0.1"
   dependencies:
     callsites: "npm:^3.0.0"
-  checksum: c63d6e80000d4babd11978e0d3fee386ca7752a02b035fd2435960ffaa7219dc42146f07069fb65e6e8bf1caef89daf9af7535a39bddf354d78bf50d8294f556
+  checksum: 10c0/c63d6e80000d4babd11978e0d3fee386ca7752a02b035fd2435960ffaa7219dc42146f07069fb65e6e8bf1caef89daf9af7535a39bddf354d78bf50d8294f556
   languageName: node
   linkType: hard
 
@@ -12252,7 +12252,7 @@ __metadata:
     evp_bytestokey: "npm:^1.0.0"
     pbkdf2: "npm:^3.0.3"
     safe-buffer: "npm:^5.1.1"
-  checksum: 4ed1d9b9e120c5484d29d67bb90171aac0b73422bc016d6294160aea983275c28a27ab85d862059a36a86a97dd31b7ddd97486802ca9fac67115fe3409e9dcbd
+  checksum: 10c0/4ed1d9b9e120c5484d29d67bb90171aac0b73422bc016d6294160aea983275c28a27ab85d862059a36a86a97dd31b7ddd97486802ca9fac67115fe3409e9dcbd
   languageName: node
   linkType: hard
 
@@ -12264,14 +12264,14 @@ __metadata:
     error-ex: "npm:^1.3.1"
     json-parse-even-better-errors: "npm:^2.3.0"
     lines-and-columns: "npm:^1.1.6"
-  checksum: 77947f2253005be7a12d858aedbafa09c9ae39eb4863adf330f7b416ca4f4a08132e453e08de2db46459256fb66afaac5ee758b44fe6541b7cdaf9d252e59585
+  checksum: 10c0/77947f2253005be7a12d858aedbafa09c9ae39eb4863adf330f7b416ca4f4a08132e453e08de2db46459256fb66afaac5ee758b44fe6541b7cdaf9d252e59585
   languageName: node
   linkType: hard
 
 "parse-passwd@npm:^1.0.0":
   version: 1.0.0
   resolution: "parse-passwd@npm:1.0.0"
-  checksum: 1c05c05f95f184ab9ca604841d78e4fe3294d46b8e3641d305dcc28e930da0e14e602dbda9f3811cd48df5b0e2e27dbef7357bf0d7c40e41b18c11c3a8b8d17b
+  checksum: 10c0/1c05c05f95f184ab9ca604841d78e4fe3294d46b8e3641d305dcc28e930da0e14e602dbda9f3811cd48df5b0e2e27dbef7357bf0d7c40e41b18c11c3a8b8d17b
   languageName: node
   linkType: hard
 
@@ -12280,98 +12280,98 @@ __metadata:
   resolution: "parse5@npm:7.1.2"
   dependencies:
     entities: "npm:^4.4.0"
-  checksum: 297d7af8224f4b5cb7f6617ecdae98eeaed7f8cbd78956c42785e230505d5a4f07cef352af10d3006fa5c1544b76b57784d3a22d861ae071bbc460c649482bf4
+  checksum: 10c0/297d7af8224f4b5cb7f6617ecdae98eeaed7f8cbd78956c42785e230505d5a4f07cef352af10d3006fa5c1544b76b57784d3a22d861ae071bbc460c649482bf4
   languageName: node
   linkType: hard
 
 "parseurl@npm:~1.3.2, parseurl@npm:~1.3.3":
   version: 1.3.3
   resolution: "parseurl@npm:1.3.3"
-  checksum: 90dd4760d6f6174adb9f20cf0965ae12e23879b5f5464f38e92fce8073354341e4b3b76fa3d878351efe7d01e617121955284cfd002ab087fba1a0726ec0b4f5
+  checksum: 10c0/90dd4760d6f6174adb9f20cf0965ae12e23879b5f5464f38e92fce8073354341e4b3b76fa3d878351efe7d01e617121955284cfd002ab087fba1a0726ec0b4f5
   languageName: node
   linkType: hard
 
 "pascalcase@npm:^0.1.1":
   version: 0.1.1
   resolution: "pascalcase@npm:0.1.1"
-  checksum: 48dfe90618e33810bf58211d8f39ad2c0262f19ad6354da1ba563935b5f429f36409a1fb9187c220328f7a4dc5969917f8e3e01ee089b5f1627b02aefe39567b
+  checksum: 10c0/48dfe90618e33810bf58211d8f39ad2c0262f19ad6354da1ba563935b5f429f36409a1fb9187c220328f7a4dc5969917f8e3e01ee089b5f1627b02aefe39567b
   languageName: node
   linkType: hard
 
 "path-browserify@npm:0.0.1":
   version: 0.0.1
   resolution: "path-browserify@npm:0.0.1"
-  checksum: 3d59710cddeea06509d91935196185900f3d9d29376dff68ff0e146fbd41d0fb304e983d0158f30cabe4dd2ffcc6a7d3d977631994ee984c88e66aed50a1ccd3
+  checksum: 10c0/3d59710cddeea06509d91935196185900f3d9d29376dff68ff0e146fbd41d0fb304e983d0158f30cabe4dd2ffcc6a7d3d977631994ee984c88e66aed50a1ccd3
   languageName: node
   linkType: hard
 
 "path-complete-extname@npm:^1.0.0":
   version: 1.0.0
   resolution: "path-complete-extname@npm:1.0.0"
-  checksum: 06139eff7acc24a5ca1521d61571fe2a52e9a69a1a417dd6ad28f0a6fb046f623ff2480a1ef2de623d1e051b5dc988b610f263ebbb6352e0c53b3e24d706cc18
+  checksum: 10c0/06139eff7acc24a5ca1521d61571fe2a52e9a69a1a417dd6ad28f0a6fb046f623ff2480a1ef2de623d1e051b5dc988b610f263ebbb6352e0c53b3e24d706cc18
   languageName: node
   linkType: hard
 
 "path-dirname@npm:^1.0.0":
   version: 1.0.2
   resolution: "path-dirname@npm:1.0.2"
-  checksum: 71e59be2bada7c91f62b976245fd421b7cb01fde3207fe53a82d8880621ad04fd8b434e628c9cf4e796259fc168a107d77cd56837725267c5b2c58cefe2c4e1b
+  checksum: 10c0/71e59be2bada7c91f62b976245fd421b7cb01fde3207fe53a82d8880621ad04fd8b434e628c9cf4e796259fc168a107d77cd56837725267c5b2c58cefe2c4e1b
   languageName: node
   linkType: hard
 
 "path-exists@npm:^3.0.0":
   version: 3.0.0
   resolution: "path-exists@npm:3.0.0"
-  checksum: 17d6a5664bc0a11d48e2b2127d28a0e58822c6740bde30403f08013da599182289c56518bec89407e3f31d3c2b6b296a4220bc3f867f0911fee6952208b04167
+  checksum: 10c0/17d6a5664bc0a11d48e2b2127d28a0e58822c6740bde30403f08013da599182289c56518bec89407e3f31d3c2b6b296a4220bc3f867f0911fee6952208b04167
   languageName: node
   linkType: hard
 
 "path-exists@npm:^4.0.0":
   version: 4.0.0
   resolution: "path-exists@npm:4.0.0"
-  checksum: 8c0bd3f5238188197dc78dced15207a4716c51cc4e3624c44fc97acf69558f5ebb9a2afff486fe1b4ee148e0c133e96c5e11a9aa5c48a3006e3467da070e5e1b
+  checksum: 10c0/8c0bd3f5238188197dc78dced15207a4716c51cc4e3624c44fc97acf69558f5ebb9a2afff486fe1b4ee148e0c133e96c5e11a9aa5c48a3006e3467da070e5e1b
   languageName: node
   linkType: hard
 
 "path-is-absolute@npm:^1.0.0":
   version: 1.0.1
   resolution: "path-is-absolute@npm:1.0.1"
-  checksum: 127da03c82172a2a50099cddbf02510c1791fc2cc5f7713ddb613a56838db1e8168b121a920079d052e0936c23005562059756d653b7c544c53185efe53be078
+  checksum: 10c0/127da03c82172a2a50099cddbf02510c1791fc2cc5f7713ddb613a56838db1e8168b121a920079d052e0936c23005562059756d653b7c544c53185efe53be078
   languageName: node
   linkType: hard
 
 "path-is-inside@npm:^1.0.2":
   version: 1.0.2
   resolution: "path-is-inside@npm:1.0.2"
-  checksum: 7fdd4b41672c70461cce734fc222b33e7b447fa489c7c4377c95e7e6852d83d69741f307d88ec0cc3b385b41cb4accc6efac3c7c511cd18512e95424f5fa980c
+  checksum: 10c0/7fdd4b41672c70461cce734fc222b33e7b447fa489c7c4377c95e7e6852d83d69741f307d88ec0cc3b385b41cb4accc6efac3c7c511cd18512e95424f5fa980c
   languageName: node
   linkType: hard
 
 "path-key@npm:^2.0.0, path-key@npm:^2.0.1":
   version: 2.0.1
   resolution: "path-key@npm:2.0.1"
-  checksum: dd2044f029a8e58ac31d2bf34c34b93c3095c1481942960e84dd2faa95bbb71b9b762a106aead0646695330936414b31ca0bd862bf488a937ad17c8c5d73b32b
+  checksum: 10c0/dd2044f029a8e58ac31d2bf34c34b93c3095c1481942960e84dd2faa95bbb71b9b762a106aead0646695330936414b31ca0bd862bf488a937ad17c8c5d73b32b
   languageName: node
   linkType: hard
 
 "path-key@npm:^3.0.0, path-key@npm:^3.1.0":
   version: 3.1.1
   resolution: "path-key@npm:3.1.1"
-  checksum: 748c43efd5a569c039d7a00a03b58eecd1d75f3999f5a28303d75f521288df4823bc057d8784eb72358b2895a05f29a070bc9f1f17d28226cc4e62494cc58c4c
+  checksum: 10c0/748c43efd5a569c039d7a00a03b58eecd1d75f3999f5a28303d75f521288df4823bc057d8784eb72358b2895a05f29a070bc9f1f17d28226cc4e62494cc58c4c
   languageName: node
   linkType: hard
 
 "path-key@npm:^4.0.0":
   version: 4.0.0
   resolution: "path-key@npm:4.0.0"
-  checksum: 794efeef32863a65ac312f3c0b0a99f921f3e827ff63afa5cb09a377e202c262b671f7b3832a4e64731003fa94af0263713962d317b9887bd1e0c48a342efba3
+  checksum: 10c0/794efeef32863a65ac312f3c0b0a99f921f3e827ff63afa5cb09a377e202c262b671f7b3832a4e64731003fa94af0263713962d317b9887bd1e0c48a342efba3
   languageName: node
   linkType: hard
 
 "path-parse@npm:^1.0.7":
   version: 1.0.7
   resolution: "path-parse@npm:1.0.7"
-  checksum: 11ce261f9d294cc7a58d6a574b7f1b935842355ec66fba3c3fd79e0f036462eaf07d0aa95bb74ff432f9afef97ce1926c720988c6a7451d8a584930ae7de86e1
+  checksum: 10c0/11ce261f9d294cc7a58d6a574b7f1b935842355ec66fba3c3fd79e0f036462eaf07d0aa95bb74ff432f9afef97ce1926c720988c6a7451d8a584930ae7de86e1
   languageName: node
   linkType: hard
 
@@ -12381,14 +12381,14 @@ __metadata:
   dependencies:
     lru-cache: "npm:^9.1.1 || ^10.0.0"
     minipass: "npm:^5.0.0 || ^6.0.2 || ^7.0.0"
-  checksum: e5dc78a7348d25eec61ab166317e9e9c7b46818aa2c2b9006c507a6ff48c672d011292d9662527213e558f5652ce0afcc788663a061d8b59ab495681840c0c1e
+  checksum: 10c0/e5dc78a7348d25eec61ab166317e9e9c7b46818aa2c2b9006c507a6ff48c672d011292d9662527213e558f5652ce0afcc788663a061d8b59ab495681840c0c1e
   languageName: node
   linkType: hard
 
 "path-to-regexp@npm:0.1.7":
   version: 0.1.7
   resolution: "path-to-regexp@npm:0.1.7"
-  checksum: 50a1ddb1af41a9e68bd67ca8e331a705899d16fb720a1ea3a41e310480948387daf603abb14d7b0826c58f10146d49050a1291ba6a82b78a382d1c02c0b8f905
+  checksum: 10c0/50a1ddb1af41a9e68bd67ca8e331a705899d16fb720a1ea3a41e310480948387daf603abb14d7b0826c58f10146d49050a1291ba6a82b78a382d1c02c0b8f905
   languageName: node
   linkType: hard
 
@@ -12397,14 +12397,14 @@ __metadata:
   resolution: "path-to-regexp@npm:1.8.0"
   dependencies:
     isarray: "npm:0.0.1"
-  checksum: 7b25d6f27a8de03f49406d16195450f5ced694398adea1510b0f949d9660600d1769c5c6c83668583b7e6b503f3caf1ede8ffc08135dbe3e982f034f356fbb5c
+  checksum: 10c0/7b25d6f27a8de03f49406d16195450f5ced694398adea1510b0f949d9660600d1769c5c6c83668583b7e6b503f3caf1ede8ffc08135dbe3e982f034f356fbb5c
   languageName: node
   linkType: hard
 
 "path-type@npm:^4.0.0":
   version: 4.0.0
   resolution: "path-type@npm:4.0.0"
-  checksum: 666f6973f332f27581371efaf303fd6c272cc43c2057b37aa99e3643158c7e4b2626549555d88626e99ea9e046f82f32e41bbde5f1508547e9a11b149b52387c
+  checksum: 10c0/666f6973f332f27581371efaf303fd6c272cc43c2057b37aa99e3643158c7e4b2626549555d88626e99ea9e046f82f32e41bbde5f1508547e9a11b149b52387c
   languageName: node
   linkType: hard
 
@@ -12417,49 +12417,49 @@ __metadata:
     ripemd160: "npm:^2.0.1"
     safe-buffer: "npm:^5.0.1"
     sha.js: "npm:^2.4.8"
-  checksum: 5a30374e87d33fa080a92734d778cf172542cc7e41b96198c4c88763997b62d7850de3fbda5c3111ddf79805ee7c1da7046881c90ac4920b5e324204518b05fd
+  checksum: 10c0/5a30374e87d33fa080a92734d778cf172542cc7e41b96198c4c88763997b62d7850de3fbda5c3111ddf79805ee7c1da7046881c90ac4920b5e324204518b05fd
   languageName: node
   linkType: hard
 
 "performance-now@npm:^0.2.0":
   version: 0.2.0
   resolution: "performance-now@npm:0.2.0"
-  checksum: d7f3824e443491208f7124b45d3280dbff889f8f048c3aee507109c24644d51a226eb07fd7ac51dd0eef144639590c57410c2d167bd4fdf0c5caa0101a449c3d
+  checksum: 10c0/d7f3824e443491208f7124b45d3280dbff889f8f048c3aee507109c24644d51a226eb07fd7ac51dd0eef144639590c57410c2d167bd4fdf0c5caa0101a449c3d
   languageName: node
   linkType: hard
 
 "performance-now@npm:^2.1.0":
   version: 2.1.0
   resolution: "performance-now@npm:2.1.0"
-  checksum: 22c54de06f269e29f640e0e075207af57de5052a3d15e360c09b9a8663f393f6f45902006c1e71aa8a5a1cdfb1a47fe268826f8496d6425c362f00f5bc3e85d9
+  checksum: 10c0/22c54de06f269e29f640e0e075207af57de5052a3d15e360c09b9a8663f393f6f45902006c1e71aa8a5a1cdfb1a47fe268826f8496d6425c362f00f5bc3e85d9
   languageName: node
   linkType: hard
 
 "pg-cloudflare@npm:^1.1.1":
   version: 1.1.1
   resolution: "pg-cloudflare@npm:1.1.1"
-  checksum: a68b957f755be6af813d68ccaf4c906a000fd2ecb362cd281220052cc9e2f6c26da3b88792742387008c30b3bf0d2fa3a0eff04aeb8af4414023c99ae78e07bd
+  checksum: 10c0/a68b957f755be6af813d68ccaf4c906a000fd2ecb362cd281220052cc9e2f6c26da3b88792742387008c30b3bf0d2fa3a0eff04aeb8af4414023c99ae78e07bd
   languageName: node
   linkType: hard
 
 "pg-connection-string@npm:^2.6.0, pg-connection-string@npm:^2.6.2":
   version: 2.6.2
   resolution: "pg-connection-string@npm:2.6.2"
-  checksum: e8fdea74fcc8bdc3d7c5c6eadd9425fdba7e67fb7fe836f9c0cecad94c8984e435256657d1d8ce0483d1fedef667e7a57e32449a63cb805cb0289fc34b62da35
+  checksum: 10c0/e8fdea74fcc8bdc3d7c5c6eadd9425fdba7e67fb7fe836f9c0cecad94c8984e435256657d1d8ce0483d1fedef667e7a57e32449a63cb805cb0289fc34b62da35
   languageName: node
   linkType: hard
 
 "pg-int8@npm:1.0.1":
   version: 1.0.1
   resolution: "pg-int8@npm:1.0.1"
-  checksum: be6a02d851fc2a4ae3e9de81710d861de3ba35ac927268973eb3cb618873a05b9424656df464dd43bd7dc3fc5295c3f5b3c8349494f87c7af50ec59ef14e0b98
+  checksum: 10c0/be6a02d851fc2a4ae3e9de81710d861de3ba35ac927268973eb3cb618873a05b9424656df464dd43bd7dc3fc5295c3f5b3c8349494f87c7af50ec59ef14e0b98
   languageName: node
   linkType: hard
 
 "pg-numeric@npm:1.0.2":
   version: 1.0.2
   resolution: "pg-numeric@npm:1.0.2"
-  checksum: 43dd9884e7b52c79ddc28d2d282d7475fce8bba13452d33c04ceb2e0a65f561edf6699694e8e1c832ff9093770496363183c950dd29608e1bdd98f344b25bca9
+  checksum: 10c0/43dd9884e7b52c79ddc28d2d282d7475fce8bba13452d33c04ceb2e0a65f561edf6699694e8e1c832ff9093770496363183c950dd29608e1bdd98f344b25bca9
   languageName: node
   linkType: hard
 
@@ -12468,14 +12468,14 @@ __metadata:
   resolution: "pg-pool@npm:3.6.1"
   peerDependencies:
     pg: ">=8.0"
-  checksum: 47837c4e4c2b9e195cec01bd58b6e276acc915537191707ad4d6ed975fd9bc03c73f63cb7fde4cb0e08ed059e35faf60fbd03744dee3af71d4b4631ab40eeb7f
+  checksum: 10c0/47837c4e4c2b9e195cec01bd58b6e276acc915537191707ad4d6ed975fd9bc03c73f63cb7fde4cb0e08ed059e35faf60fbd03744dee3af71d4b4631ab40eeb7f
   languageName: node
   linkType: hard
 
 "pg-protocol@npm:*, pg-protocol@npm:^1.6.0":
   version: 1.6.0
   resolution: "pg-protocol@npm:1.6.0"
-  checksum: 318a4d1e9cebd3927b10a8bc412f5017117a1f9a5fafb628d75847da7d1ab81c33250de58596bd0990029e14e92a995a851286d60fc236692299faf509572213
+  checksum: 10c0/318a4d1e9cebd3927b10a8bc412f5017117a1f9a5fafb628d75847da7d1ab81c33250de58596bd0990029e14e92a995a851286d60fc236692299faf509572213
   languageName: node
   linkType: hard
 
@@ -12488,7 +12488,7 @@ __metadata:
     postgres-bytea: "npm:~1.0.0"
     postgres-date: "npm:~1.0.4"
     postgres-interval: "npm:^1.1.0"
-  checksum: ab3f8069a323f601cd2d2279ca8c425447dab3f9b61d933b0601d7ffc00d6200df25e26a4290b2b0783b59278198f7dd2ed03e94c4875797919605116a577c65
+  checksum: 10c0/ab3f8069a323f601cd2d2279ca8c425447dab3f9b61d933b0601d7ffc00d6200df25e26a4290b2b0783b59278198f7dd2ed03e94c4875797919605116a577c65
   languageName: node
   linkType: hard
 
@@ -12503,7 +12503,7 @@ __metadata:
     postgres-date: "npm:~2.0.1"
     postgres-interval: "npm:^3.0.0"
     postgres-range: "npm:^1.1.1"
-  checksum: e2126b2775554ae8bacb3b104814487c2af2caff44cc52bee786b3887c65fe4c1fe031237e51e30ffed1cbb13b71776bd60cc1e65ac800c9946df4030849a074
+  checksum: 10c0/e2126b2775554ae8bacb3b104814487c2af2caff44cc52bee786b3887c65fe4c1fe031237e51e30ffed1cbb13b71776bd60cc1e65ac800c9946df4030849a074
   languageName: node
   linkType: hard
 
@@ -12527,7 +12527,7 @@ __metadata:
   peerDependenciesMeta:
     pg-native:
       optional: true
-  checksum: 07e6967fc8bd5d72bab9be6620626e8e3ab59128ebf56bf0de83d67f10801a19221d88b3317e90b93339ba48d0498b39967b782ae39686aabda6bc647bceb438
+  checksum: 10c0/07e6967fc8bd5d72bab9be6620626e8e3ab59128ebf56bf0de83d67f10801a19221d88b3317e90b93339ba48d0498b39967b782ae39686aabda6bc647bceb438
   languageName: node
   linkType: hard
 
@@ -12536,21 +12536,21 @@ __metadata:
   resolution: "pgpass@npm:1.0.5"
   dependencies:
     split2: "npm:^4.1.0"
-  checksum: 5ea6c9b2de04c33abb08d33a2dded303c4a3c7162a9264519cbe85c0a9857d712463140ba42fad0c7cd4b21f644dd870b45bb2e02fcbe505b4de0744fd802c1d
+  checksum: 10c0/5ea6c9b2de04c33abb08d33a2dded303c4a3c7162a9264519cbe85c0a9857d712463140ba42fad0c7cd4b21f644dd870b45bb2e02fcbe505b4de0744fd802c1d
   languageName: node
   linkType: hard
 
 "picocolors@npm:^1.0.0":
   version: 1.0.0
   resolution: "picocolors@npm:1.0.0"
-  checksum: 20a5b249e331c14479d94ec6817a182fd7a5680debae82705747b2db7ec50009a5f6648d0621c561b0572703f84dbef0858abcbd5856d3c5511426afcb1961f7
+  checksum: 10c0/20a5b249e331c14479d94ec6817a182fd7a5680debae82705747b2db7ec50009a5f6648d0621c561b0572703f84dbef0858abcbd5856d3c5511426afcb1961f7
   languageName: node
   linkType: hard
 
 "picomatch@npm:^2.0.4, picomatch@npm:^2.2.1, picomatch@npm:^2.2.2, picomatch@npm:^2.2.3, picomatch@npm:^2.3.1":
   version: 2.3.1
   resolution: "picomatch@npm:2.3.1"
-  checksum: 26c02b8d06f03206fc2ab8d16f19960f2ff9e81a658f831ecb656d8f17d9edc799e8364b1f4a7873e89d9702dff96204be0fa26fe4181f6843f040f819dac4be
+  checksum: 10c0/26c02b8d06f03206fc2ab8d16f19960f2ff9e81a658f831ecb656d8f17d9edc799e8364b1f4a7873e89d9702dff96204be0fa26fe4181f6843f040f819dac4be
   languageName: node
   linkType: hard
 
@@ -12559,28 +12559,28 @@ __metadata:
   resolution: "pidtree@npm:0.6.0"
   bin:
     pidtree: bin/pidtree.js
-  checksum: 0829ec4e9209e230f74ebf4265f5ccc9ebfb488334b525cb13f86ff801dca44b362c41252cd43ae4d7653a10a5c6ab3be39d2c79064d6895e0d78dc50a5ed6e9
+  checksum: 10c0/0829ec4e9209e230f74ebf4265f5ccc9ebfb488334b525cb13f86ff801dca44b362c41252cd43ae4d7653a10a5c6ab3be39d2c79064d6895e0d78dc50a5ed6e9
   languageName: node
   linkType: hard
 
 "piexifjs@npm:^1.0.6":
   version: 1.0.6
   resolution: "piexifjs@npm:1.0.6"
-  checksum: 69a10fe09c08f1e67e653844ac79e720324a7fa34689b020359d60d98b3a601c070e1759df8f2d97d022298bd2f5b79eed4c92de86c5f215300c8a63adf947b1
+  checksum: 10c0/69a10fe09c08f1e67e653844ac79e720324a7fa34689b020359d60d98b3a601c070e1759df8f2d97d022298bd2f5b79eed4c92de86c5f215300c8a63adf947b1
   languageName: node
   linkType: hard
 
 "pify@npm:^2.0.0":
   version: 2.3.0
   resolution: "pify@npm:2.3.0"
-  checksum: 551ff8ab830b1052633f59cb8adc9ae8407a436e06b4a9718bcb27dc5844b83d535c3a8512b388b6062af65a98c49bdc0dd523d8b2617b188f7c8fee457158dc
+  checksum: 10c0/551ff8ab830b1052633f59cb8adc9ae8407a436e06b4a9718bcb27dc5844b83d535c3a8512b388b6062af65a98c49bdc0dd523d8b2617b188f7c8fee457158dc
   languageName: node
   linkType: hard
 
 "pify@npm:^4.0.1":
   version: 4.0.1
   resolution: "pify@npm:4.0.1"
-  checksum: 6f9d404b0d47a965437403c9b90eca8bb2536407f03de165940e62e72c8c8b75adda5516c6b9b23675a5877cc0bcac6bdfb0ef0e39414cd2476d5495da40e7cf
+  checksum: 10c0/6f9d404b0d47a965437403c9b90eca8bb2536407f03de165940e62e72c8c8b75adda5516c6b9b23675a5877cc0bcac6bdfb0ef0e39414cd2476d5495da40e7cf
   languageName: node
   linkType: hard
 
@@ -12589,14 +12589,14 @@ __metadata:
   resolution: "pinkie-promise@npm:2.0.1"
   dependencies:
     pinkie: "npm:^2.0.0"
-  checksum: 11b5e5ce2b090c573f8fad7b517cbca1bb9a247587306f05ae71aef6f9b2cd2b923c304aa9663c2409cfde27b367286179f1379bc4ec18a3fbf2bb0d473b160a
+  checksum: 10c0/11b5e5ce2b090c573f8fad7b517cbca1bb9a247587306f05ae71aef6f9b2cd2b923c304aa9663c2409cfde27b367286179f1379bc4ec18a3fbf2bb0d473b160a
   languageName: node
   linkType: hard
 
 "pinkie@npm:^2.0.0":
   version: 2.0.4
   resolution: "pinkie@npm:2.0.4"
-  checksum: 25228b08b5597da42dc384221aa0ce56ee0fbf32965db12ba838e2a9ca0193c2f0609c45551ee077ccd2060bf109137fdb185b00c6d7e0ed7e35006d20fdcbc6
+  checksum: 10c0/25228b08b5597da42dc384221aa0ce56ee0fbf32965db12ba838e2a9ca0193c2f0609c45551ee077ccd2060bf109137fdb185b00c6d7e0ed7e35006d20fdcbc6
   languageName: node
   linkType: hard
 
@@ -12606,7 +12606,7 @@ __metadata:
   dependencies:
     readable-stream: "npm:^4.0.0"
     split2: "npm:^4.0.0"
-  checksum: 6e9b9d5a2c0a37f91ecaf224d335daae1ae682b1c79a05b06ef9e0f0a5d289f8e597992217efc857796dae6f1067e9b4882f95c6228ff433ddc153532cae8aca
+  checksum: 10c0/6e9b9d5a2c0a37f91ecaf224d335daae1ae682b1c79a05b06ef9e0f0a5d289f8e597992217efc857796dae6f1067e9b4882f95c6228ff433ddc153532cae8aca
   languageName: node
   linkType: hard
 
@@ -12618,7 +12618,7 @@ __metadata:
     pino: "npm:^8.17.1"
     pino-std-serializers: "npm:^6.2.2"
     process-warning: "npm:^3.0.0"
-  checksum: 05496cb76cc9908658e50c4620fbdf7b0b5d99fb529493d601c3e4635b0bf7ce12b8a8eed7b5b520089f643b099233d61dd71f7cdfad8b66e59b9b81d79b6512
+  checksum: 10c0/05496cb76cc9908658e50c4620fbdf7b0b5d99fb529493d601c3e4635b0bf7ce12b8a8eed7b5b520089f643b099233d61dd71f7cdfad8b66e59b9b81d79b6512
   languageName: node
   linkType: hard
 
@@ -12642,14 +12642,14 @@ __metadata:
     strip-json-comments: "npm:^3.1.1"
   bin:
     pino-pretty: bin.js
-  checksum: 6964fba5acc7a9f112e4c6738d602e123daf16cb5f6ddc56ab4b6bb05059f28876d51da8f72358cf1172e95fa12496b70465431a0836df693c462986d050686b
+  checksum: 10c0/6964fba5acc7a9f112e4c6738d602e123daf16cb5f6ddc56ab4b6bb05059f28876d51da8f72358cf1172e95fa12496b70465431a0836df693c462986d050686b
   languageName: node
   linkType: hard
 
 "pino-std-serializers@npm:^6.0.0, pino-std-serializers@npm:^6.2.2":
   version: 6.2.2
   resolution: "pino-std-serializers@npm:6.2.2"
-  checksum: 8f1c7f0f0d8f91e6c6b5b2a6bfb48f06441abeb85f1c2288319f736f9c6d814fbeebe928d2314efc2ba6018fa7db9357a105eca9fc99fc1f28945a8a8b28d3d5
+  checksum: 10c0/8f1c7f0f0d8f91e6c6b5b2a6bfb48f06441abeb85f1c2288319f736f9c6d814fbeebe928d2314efc2ba6018fa7db9357a105eca9fc99fc1f28945a8a8b28d3d5
   languageName: node
   linkType: hard
 
@@ -12670,14 +12670,14 @@ __metadata:
     thread-stream: "npm:^2.0.0"
   bin:
     pino: bin.js
-  checksum: ca73bb31e4656954413b89f48c486b1680fec0c6bb12d4d796c5ccf8eca40f3ee12c9532a0fa61284ed9a800c14eaa0f496f520057ef70cdee0447114813e8eb
+  checksum: 10c0/ca73bb31e4656954413b89f48c486b1680fec0c6bb12d4d796c5ccf8eca40f3ee12c9532a0fa61284ed9a800c14eaa0f496f520057ef70cdee0447114813e8eb
   languageName: node
   linkType: hard
 
 "pirates@npm:^4.0.4":
   version: 4.0.6
   resolution: "pirates@npm:4.0.6"
-  checksum: 00d5fa51f8dded94d7429700fb91a0c1ead00ae2c7fd27089f0c5b63e6eca36197fe46384631872690a66f390c5e27198e99006ab77ae472692ab9c2ca903f36
+  checksum: 10c0/00d5fa51f8dded94d7429700fb91a0c1ead00ae2c7fd27089f0c5b63e6eca36197fe46384631872690a66f390c5e27198e99006ab77ae472692ab9c2ca903f36
   languageName: node
   linkType: hard
 
@@ -12686,7 +12686,7 @@ __metadata:
   resolution: "pkg-dir@npm:3.0.0"
   dependencies:
     find-up: "npm:^3.0.0"
-  checksum: 902a3d0c1f8ac43b1795fa1ba6ffeb37dfd53c91469e969790f6ed5e29ff2bdc50b63ba6115dc056d2efb4a040aa2446d512b3804bdafdf302f734fb3ec21847
+  checksum: 10c0/902a3d0c1f8ac43b1795fa1ba6ffeb37dfd53c91469e969790f6ed5e29ff2bdc50b63ba6115dc056d2efb4a040aa2446d512b3804bdafdf302f734fb3ec21847
   languageName: node
   linkType: hard
 
@@ -12695,7 +12695,7 @@ __metadata:
   resolution: "pkg-dir@npm:4.2.0"
   dependencies:
     find-up: "npm:^4.0.0"
-  checksum: c56bda7769e04907a88423feb320babaed0711af8c436ce3e56763ab1021ba107c7b0cafb11cde7529f669cfc22bffcaebffb573645cbd63842ea9fb17cd7728
+  checksum: 10c0/c56bda7769e04907a88423feb320babaed0711af8c436ce3e56763ab1021ba107c7b0cafb11cde7529f669cfc22bffcaebffb573645cbd63842ea9fb17cd7728
   languageName: node
   linkType: hard
 
@@ -12706,14 +12706,14 @@ __metadata:
     async: "npm:^2.6.4"
     debug: "npm:^3.2.7"
     mkdirp: "npm:^0.5.6"
-  checksum: cef8b567b78aabccc59fe8e103bac8b394bb45a6a69be626608f099f454124c775aaf47b274c006332c07ab3f501cde55e49aaeb9d49d78d90362d776a565cbf
+  checksum: 10c0/cef8b567b78aabccc59fe8e103bac8b394bb45a6a69be626608f099f454124c775aaf47b274c006332c07ab3f501cde55e49aaeb9d49d78d90362d776a565cbf
   languageName: node
   linkType: hard
 
 "posix-character-classes@npm:^0.1.0":
   version: 0.1.1
   resolution: "posix-character-classes@npm:0.1.1"
-  checksum: cce88011548a973b4af58361cd8f5f7b5a6faff8eef0901565802f067bcabf82597e920d4c97c22068464be3cbc6447af589f6cc8a7d813ea7165be60a0395bc
+  checksum: 10c0/cce88011548a973b4af58361cd8f5f7b5a6faff8eef0901565802f067bcabf82597e920d4c97c22068464be3cbc6447af589f6cc8a7d813ea7165be60a0395bc
   languageName: node
   linkType: hard
 
@@ -12725,7 +12725,7 @@ __metadata:
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.2.2
-  checksum: e0df07337162dbcaac5d6e030c7fd289e21da8766a9daca5d6b2b3c8094bb524ae5d74c70048ea7fe5fe4960ce048c60ac97922d917c3bbff34f58e9d2b0eb0e
+  checksum: 10c0/e0df07337162dbcaac5d6e030c7fd289e21da8766a9daca5d6b2b3c8094bb524ae5d74c70048ea7fe5fe4960ce048c60ac97922d917c3bbff34f58e9d2b0eb0e
   languageName: node
   linkType: hard
 
@@ -12739,7 +12739,7 @@ __metadata:
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 229681f9b89ba0909b4c69563837b0c32cc3d1c17ed1b00c33d4abfb0a0ef455124968e4885b5f92c64482e92074cd1958018ec111ed5d118f1e24baeda19c14
+  checksum: 10c0/229681f9b89ba0909b4c69563837b0c32cc3d1c17ed1b00c33d4abfb0a0ef455124968e4885b5f92c64482e92074cd1958018ec111ed5d118f1e24baeda19c14
   languageName: node
   linkType: hard
 
@@ -12751,7 +12751,7 @@ __metadata:
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 882d0b7839ef07ac8ffbf9cb48db0f610939a3496bd0321c7f23096ead676f13e09ab3d9c20ff3dbe2c887e855826051ca7dffeaffce5068cfdc9aaa573a3842
+  checksum: 10c0/882d0b7839ef07ac8ffbf9cb48db0f610939a3496bd0321c7f23096ead676f13e09ab3d9c20ff3dbe2c887e855826051ca7dffeaffce5068cfdc9aaa573a3842
   languageName: node
   linkType: hard
 
@@ -12760,7 +12760,7 @@ __metadata:
   resolution: "postcss-discard-comments@npm:6.0.1"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 5e9128ffb8c005081bb0521f5a23cf090e8513d928ed39935504ffde2e335a62a7e1a749c5c7bc2d03f06a8667900d19dd7eed19dfa4273043b5fd760476260d
+  checksum: 10c0/5e9128ffb8c005081bb0521f5a23cf090e8513d928ed39935504ffde2e335a62a7e1a749c5c7bc2d03f06a8667900d19dd7eed19dfa4273043b5fd760476260d
   languageName: node
   linkType: hard
 
@@ -12769,7 +12769,7 @@ __metadata:
   resolution: "postcss-discard-duplicates@npm:6.0.1"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: b9ea10a3c7528bb1630613c11756f809a95da634822d943fa91b28f2a37787e7cdb9ff96deed9776e2c3753d35e42c8afd5074b630930df7b5150573d4beda23
+  checksum: 10c0/b9ea10a3c7528bb1630613c11756f809a95da634822d943fa91b28f2a37787e7cdb9ff96deed9776e2c3753d35e42c8afd5074b630930df7b5150573d4beda23
   languageName: node
   linkType: hard
 
@@ -12778,7 +12778,7 @@ __metadata:
   resolution: "postcss-discard-empty@npm:6.0.1"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 6b95e588a3e8fb262e56bd313060daf29d7c9d44184bb6c4c5858ae81d6cd2907b15b3e3023b6621d50a67cfc10e6077920ff1e908892b207dee29477376498f
+  checksum: 10c0/6b95e588a3e8fb262e56bd313060daf29d7c9d44184bb6c4c5858ae81d6cd2907b15b3e3023b6621d50a67cfc10e6077920ff1e908892b207dee29477376498f
   languageName: node
   linkType: hard
 
@@ -12787,7 +12787,7 @@ __metadata:
   resolution: "postcss-discard-overridden@npm:6.0.1"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 22f9d56e53b90bc0f8e6d1c24d6da6c7c1a9d757644a128a7a4263a5479aaa8eca4ce3bfe9db10358051635ed40e8778a68c3f1831b7163eae10ced001db4a87
+  checksum: 10c0/22f9d56e53b90bc0f8e6d1c24d6da6c7c1a9d757644a128a7a4263a5479aaa8eca4ce3bfe9db10358051635ed40e8778a68c3f1831b7163eae10ced001db4a87
   languageName: node
   linkType: hard
 
@@ -12803,14 +12803,14 @@ __metadata:
   peerDependencies:
     postcss: ^7.0.0 || ^8.0.1
     webpack: ^4.0.0 || ^5.0.0
-  checksum: 3405584e571ec4d66d7c2b665a2a4823eaa7208433fd40eb6b669ac441f23398bc81fc18fe631c7d7805a303ad31f284a5066c4097dd082c1faba7edf13db8aa
+  checksum: 10c0/3405584e571ec4d66d7c2b665a2a4823eaa7208433fd40eb6b669ac441f23398bc81fc18fe631c7d7805a303ad31f284a5066c4097dd082c1faba7edf13db8aa
   languageName: node
   linkType: hard
 
 "postcss-media-query-parser@npm:^0.2.3":
   version: 0.2.3
   resolution: "postcss-media-query-parser@npm:0.2.3"
-  checksum: 252c8cf24f0e9018516b0d70b7b3d6f5b52e81c4bab2164b49a4e4c1b87bb11f5dbe708c0076990665cb24c70d5fd2f3aee9c922b0f67c7c619e051801484688
+  checksum: 10c0/252c8cf24f0e9018516b0d70b7b3d6f5b52e81c4bab2164b49a4e4c1b87bb11f5dbe708c0076990665cb24c70d5fd2f3aee9c922b0f67c7c619e051801484688
   languageName: node
   linkType: hard
 
@@ -12822,7 +12822,7 @@ __metadata:
     stylehacks: "npm:^6.0.2"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 2b3fae51bffc5962258d638bc7f415237593b515f369233e023f0eae5b13116297463c04b8c47a7b7af51cba5faaa7f517b653f6123e51935d670d4d4de5a26d
+  checksum: 10c0/2b3fae51bffc5962258d638bc7f415237593b515f369233e023f0eae5b13116297463c04b8c47a7b7af51cba5faaa7f517b653f6123e51935d670d4d4de5a26d
   languageName: node
   linkType: hard
 
@@ -12836,7 +12836,7 @@ __metadata:
     postcss-selector-parser: "npm:^6.0.15"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: c8355db11aa60bedcb1e6535fcd70f6ecec2dadd5c2975d3accf0eedbc92af782ac1f5e91a53866816ce332e4cbf1b94749a9425067935be066bc0c974e30fee
+  checksum: 10c0/c8355db11aa60bedcb1e6535fcd70f6ecec2dadd5c2975d3accf0eedbc92af782ac1f5e91a53866816ce332e4cbf1b94749a9425067935be066bc0c974e30fee
   languageName: node
   linkType: hard
 
@@ -12847,7 +12847,7 @@ __metadata:
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 15af236245a6d27f1c83c943ef90d144ca043894bbd86f134506a984811a936a06824739984824965c7c3fd5a0ff4ed299f26a33f3b628662aa4fb40d7536fd0
+  checksum: 10c0/15af236245a6d27f1c83c943ef90d144ca043894bbd86f134506a984811a936a06824739984824965c7c3fd5a0ff4ed299f26a33f3b628662aa4fb40d7536fd0
   languageName: node
   linkType: hard
 
@@ -12860,7 +12860,7 @@ __metadata:
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: e700c3f6dc425072ff739fb18bb71c970599e0d909b326f4a5c84e91cf24c4f1ee78e4d161bd4cdf6e25b7d78f1ad082bb885afdd2a150f9b281520fc6359d5c
+  checksum: 10c0/e700c3f6dc425072ff739fb18bb71c970599e0d909b326f4a5c84e91cf24c4f1ee78e4d161bd4cdf6e25b7d78f1ad082bb885afdd2a150f9b281520fc6359d5c
   languageName: node
   linkType: hard
 
@@ -12873,7 +12873,7 @@ __metadata:
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 6638460d2be4a2eca8adee8409b70d6c6a19aff8cf93fda1b45c9da627b258b6baaa6acb48f51d26cd287704a235f9c9ae2e4744335b1fd47e163177c33896df
+  checksum: 10c0/6638460d2be4a2eca8adee8409b70d6c6a19aff8cf93fda1b45c9da627b258b6baaa6acb48f51d26cd287704a235f9c9ae2e4744335b1fd47e163177c33896df
   languageName: node
   linkType: hard
 
@@ -12884,7 +12884,7 @@ __metadata:
     postcss-selector-parser: "npm:^6.0.15"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 5437b586c1237fc442e7e6078d4f23c987efc456366368b07a0da67332b04bd55821cedf0441e73e1209689f63139e272d930508e2963ba6e27c46561a661128
+  checksum: 10c0/5437b586c1237fc442e7e6078d4f23c987efc456366368b07a0da67332b04bd55821cedf0441e73e1209689f63139e272d930508e2963ba6e27c46561a661128
   languageName: node
   linkType: hard
 
@@ -12893,7 +12893,7 @@ __metadata:
   resolution: "postcss-modules-extract-imports@npm:3.0.0"
   peerDependencies:
     postcss: ^8.1.0
-  checksum: f8879d66d8162fb7a3fcd916d37574006c584ea509107b1cfb798a5e090175ef9470f601e46f0a305070d8ff2500e07489a5c1ac381c29a1dc1120e827ca7943
+  checksum: 10c0/f8879d66d8162fb7a3fcd916d37574006c584ea509107b1cfb798a5e090175ef9470f601e46f0a305070d8ff2500e07489a5c1ac381c29a1dc1120e827ca7943
   languageName: node
   linkType: hard
 
@@ -12906,7 +12906,7 @@ __metadata:
     postcss-value-parser: "npm:^4.1.0"
   peerDependencies:
     postcss: ^8.1.0
-  checksum: be49b86efbfb921f42287e227584aac91af9826fc1083db04958ae283dfe215ca539421bfba71f9da0f0b10651f28e95a64b5faca7166f578a1933b8646051f7
+  checksum: 10c0/be49b86efbfb921f42287e227584aac91af9826fc1083db04958ae283dfe215ca539421bfba71f9da0f0b10651f28e95a64b5faca7166f578a1933b8646051f7
   languageName: node
   linkType: hard
 
@@ -12917,7 +12917,7 @@ __metadata:
     postcss-selector-parser: "npm:^6.0.4"
   peerDependencies:
     postcss: ^8.1.0
-  checksum: 60af503910363689568c2c3701cb019a61b58b3d739391145185eec211bea5d50ccb6ecbe6955b39d856088072fd50ea002e40a52b50e33b181ff5c41da0308a
+  checksum: 10c0/60af503910363689568c2c3701cb019a61b58b3d739391145185eec211bea5d50ccb6ecbe6955b39d856088072fd50ea002e40a52b50e33b181ff5c41da0308a
   languageName: node
   linkType: hard
 
@@ -12928,7 +12928,7 @@ __metadata:
     icss-utils: "npm:^5.0.0"
   peerDependencies:
     postcss: ^8.1.0
-  checksum: dd18d7631b5619fb9921b198c86847a2a075f32e0c162e0428d2647685e318c487a2566cc8cc669fc2077ef38115cde7a068e321f46fb38be3ad49646b639dbc
+  checksum: 10c0/dd18d7631b5619fb9921b198c86847a2a075f32e0c162e0428d2647685e318c487a2566cc8cc669fc2077ef38115cde7a068e321f46fb38be3ad49646b639dbc
   languageName: node
   linkType: hard
 
@@ -12937,7 +12937,7 @@ __metadata:
   resolution: "postcss-normalize-charset@npm:6.0.1"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 8c09eedaf8813123875c65ab35120f14a87d6b9e8d6805fa808e3a714a8f868d15123f34f61e2240d89225f2f5c2bdabbcdf6385ce86b2487370d8994a65a857
+  checksum: 10c0/8c09eedaf8813123875c65ab35120f14a87d6b9e8d6805fa808e3a714a8f868d15123f34f61e2240d89225f2f5c2bdabbcdf6385ce86b2487370d8994a65a857
   languageName: node
   linkType: hard
 
@@ -12948,7 +12948,7 @@ __metadata:
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: d08a92c653fb4f2506e029ceb8e3fdae9bc937fb1a7e80ecde759d02f6d15f69211af384d89d8582b160fd129abd9c77c8c64d75379417098ee5a2ba779e33d3
+  checksum: 10c0/d08a92c653fb4f2506e029ceb8e3fdae9bc937fb1a7e80ecde759d02f6d15f69211af384d89d8582b160fd129abd9c77c8c64d75379417098ee5a2ba779e33d3
   languageName: node
   linkType: hard
 
@@ -12959,7 +12959,7 @@ __metadata:
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: bb0267b13c92791543f5e9f94b119a0540e08aa46f600acd73a692cd38d07d2d2fddb11148a81adb58e3f65671eebb05ea38d2ded48f3202b2582f1199aa848e
+  checksum: 10c0/bb0267b13c92791543f5e9f94b119a0540e08aa46f600acd73a692cd38d07d2d2fddb11148a81adb58e3f65671eebb05ea38d2ded48f3202b2582f1199aa848e
   languageName: node
   linkType: hard
 
@@ -12970,7 +12970,7 @@ __metadata:
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: f6e943dbbf9341dd6ce2c9fc6820e8ae2a838d1db84f58f75b1e5c1b8b9d6895d17fb30b320e2189b8747f844713ec687540b5b1d52ccd6c9108d6d35328c659
+  checksum: 10c0/f6e943dbbf9341dd6ce2c9fc6820e8ae2a838d1db84f58f75b1e5c1b8b9d6895d17fb30b320e2189b8747f844713ec687540b5b1d52ccd6c9108d6d35328c659
   languageName: node
   linkType: hard
 
@@ -12981,7 +12981,7 @@ __metadata:
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: afcdd69522fc3ebafc349c2ef4b62f1e734ade9b6148fd20f2b841477808ac6cf6e5bfbb533c492fdc6bb2184b84be8ebb800a6ae174c4313f87fb0695088cc0
+  checksum: 10c0/afcdd69522fc3ebafc349c2ef4b62f1e734ade9b6148fd20f2b841477808ac6cf6e5bfbb533c492fdc6bb2184b84be8ebb800a6ae174c4313f87fb0695088cc0
   languageName: node
   linkType: hard
 
@@ -12992,7 +12992,7 @@ __metadata:
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: c1c81d0dcb2f74fbd69cc45b0b6bd6cde390a0c9df602aabbf3eb2149a49da48e808837e811d22a525ffb036e158e63b4b2cf12c94cf28f2c2f6af858876134e
+  checksum: 10c0/c1c81d0dcb2f74fbd69cc45b0b6bd6cde390a0c9df602aabbf3eb2149a49da48e808837e811d22a525ffb036e158e63b4b2cf12c94cf28f2c2f6af858876134e
   languageName: node
   linkType: hard
 
@@ -13004,7 +13004,7 @@ __metadata:
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: ea696194f65ad31de2a9c022f1946a07c298f04070706d88a20061845e1e052e645c74b5bc785595814db87d14e435f85e968a44855dedc207d8c0b5d43b1aee
+  checksum: 10c0/ea696194f65ad31de2a9c022f1946a07c298f04070706d88a20061845e1e052e645c74b5bc785595814db87d14e435f85e968a44855dedc207d8c0b5d43b1aee
   languageName: node
   linkType: hard
 
@@ -13015,7 +13015,7 @@ __metadata:
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 4e3e713a95e01f263feccd041b2b10016a0a09e494c81567f012d1326d9b2d57dc4a68956a820313630370c0ef591bdbb37cc96ed259022559623be179aad436
+  checksum: 10c0/4e3e713a95e01f263feccd041b2b10016a0a09e494c81567f012d1326d9b2d57dc4a68956a820313630370c0ef591bdbb37cc96ed259022559623be179aad436
   languageName: node
   linkType: hard
 
@@ -13026,7 +13026,7 @@ __metadata:
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 259c0b7653f033ed14303602a30e458c37dc63ee55f47226b6379a6ea553ca7c9b971d49715b8f3f36a3a06927f6f87d7997c027ad4664af3bca37a5fe30352e
+  checksum: 10c0/259c0b7653f033ed14303602a30e458c37dc63ee55f47226b6379a6ea553ca7c9b971d49715b8f3f36a3a06927f6f87d7997c027ad4664af3bca37a5fe30352e
   languageName: node
   linkType: hard
 
@@ -13038,7 +13038,7 @@ __metadata:
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 2e71f035c90b26d7a8d31e1b716f977532367f75bc76de3318b6ba7b2e1ec43c011cc09e741f59f7d93dff427b7d90a35db0b460d2f171a6f0c6e8c938ef30ad
+  checksum: 10c0/2e71f035c90b26d7a8d31e1b716f977532367f75bc76de3318b6ba7b2e1ec43c011cc09e741f59f7d93dff427b7d90a35db0b460d2f171a6f0c6e8c938ef30ad
   languageName: node
   linkType: hard
 
@@ -13050,7 +13050,7 @@ __metadata:
     caniuse-api: "npm:^3.0.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: d35ad6f9725cdceb390a97a461e8594df7fbed4c55497c90d07c42f8343bf80139e720eaebc580bf480bf10e92959490aa308af66d8802ba71c327bdf08c93a1
+  checksum: 10c0/d35ad6f9725cdceb390a97a461e8594df7fbed4c55497c90d07c42f8343bf80139e720eaebc580bf480bf10e92959490aa308af66d8802ba71c327bdf08c93a1
   languageName: node
   linkType: hard
 
@@ -13061,14 +13061,14 @@ __metadata:
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: de7631302311071d86622166539162e69df506785e3674afab0602c86ed9aa67799e44405b40327f0011d58089d2dc4e2ae481b21812177818e28f9272d350a5
+  checksum: 10c0/de7631302311071d86622166539162e69df506785e3674afab0602c86ed9aa67799e44405b40327f0011d58089d2dc4e2ae481b21812177818e28f9272d350a5
   languageName: node
   linkType: hard
 
 "postcss-resolve-nested-selector@npm:^0.1.1":
   version: 0.1.1
   resolution: "postcss-resolve-nested-selector@npm:0.1.1"
-  checksum: e86412064c5d805fbee20f4e851395304102addd7d583b6a991adaa5616e8d5f45549864eb6292d4cf15075cd261c289f069acdf6a2556689fc44fe72bcb306e
+  checksum: 10c0/e86412064c5d805fbee20f4e851395304102addd7d583b6a991adaa5616e8d5f45549864eb6292d4cf15075cd261c289f069acdf6a2556689fc44fe72bcb306e
   languageName: node
   linkType: hard
 
@@ -13077,7 +13077,7 @@ __metadata:
   resolution: "postcss-safe-parser@npm:7.0.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 4217afd8ce2809e959dc365e4675f499303cc6b91f94db06c8164422822db2d3b3124df701ee2234db4127ad05619b016bfb9c2bccae9bf9cf898a396f1632c9
+  checksum: 10c0/4217afd8ce2809e959dc365e4675f499303cc6b91f94db06c8164422822db2d3b3124df701ee2234db4127ad05619b016bfb9c2bccae9bf9cf898a396f1632c9
   languageName: node
   linkType: hard
 
@@ -13086,7 +13086,7 @@ __metadata:
   resolution: "postcss-scss@npm:4.0.9"
   peerDependencies:
     postcss: ^8.4.29
-  checksum: f917ecfd4b9113a6648e966a41f027ff7e14238393914978d44596e227a50f084667dc8818742348dc7d8b20130b30d4259aca1d4db86754a9c141202ae03714
+  checksum: 10c0/f917ecfd4b9113a6648e966a41f027ff7e14238393914978d44596e227a50f084667dc8818742348dc7d8b20130b30d4259aca1d4db86754a9c141202ae03714
   languageName: node
   linkType: hard
 
@@ -13096,7 +13096,7 @@ __metadata:
   dependencies:
     cssesc: "npm:^3.0.0"
     util-deprecate: "npm:^1.0.2"
-  checksum: 48b425d6cef497bcf6b7d136f6fd95cfca43026955e07ec9290d3c15457de3a862dbf251dd36f42c07a0d5b5ab6f31e41acefeff02528995a989b955505e440b
+  checksum: 10c0/48b425d6cef497bcf6b7d136f6fd95cfca43026955e07ec9290d3c15457de3a862dbf251dd36f42c07a0d5b5ab6f31e41acefeff02528995a989b955505e440b
   languageName: node
   linkType: hard
 
@@ -13108,7 +13108,7 @@ __metadata:
     svgo: "npm:^3.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: db607404d09af256c7957a0ace822d651a00a52a1796da603f93ba3f0a095ac7595e1f624b9dc53f362ab10e382845d7873f485980f9c92fcb86256833f5e835
+  checksum: 10c0/db607404d09af256c7957a0ace822d651a00a52a1796da603f93ba3f0a095ac7595e1f624b9dc53f362ab10e382845d7873f485980f9c92fcb86256833f5e835
   languageName: node
   linkType: hard
 
@@ -13119,14 +13119,14 @@ __metadata:
     postcss-selector-parser: "npm:^6.0.15"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: a0fe112d1094f90e1bfcfd2174a74b2fd0630a24449e9942923d02956c7d64ea4add5adede53d9efb3f6d40cd388ac150d032a115f6a46b73d5f3d3d26fa1bb7
+  checksum: 10c0/a0fe112d1094f90e1bfcfd2174a74b2fd0630a24449e9942923d02956c7d64ea4add5adede53d9efb3f6d40cd388ac150d032a115f6a46b73d5f3d3d26fa1bb7
   languageName: node
   linkType: hard
 
 "postcss-value-parser@npm:^4.1.0, postcss-value-parser@npm:^4.2.0":
   version: 4.2.0
   resolution: "postcss-value-parser@npm:4.2.0"
-  checksum: f4142a4f56565f77c1831168e04e3effd9ffcc5aebaf0f538eee4b2d465adfd4b85a44257bb48418202a63806a7da7fe9f56c330aebb3cac898e46b4cbf49161
+  checksum: 10c0/f4142a4f56565f77c1831168e04e3effd9ffcc5aebaf0f538eee4b2d465adfd4b85a44257bb48418202a63806a7da7fe9f56c330aebb3cac898e46b4cbf49161
   languageName: node
   linkType: hard
 
@@ -13137,28 +13137,28 @@ __metadata:
     nanoid: "npm:^3.3.7"
     picocolors: "npm:^1.0.0"
     source-map-js: "npm:^1.0.2"
-  checksum: e8dd04e48001eb5857abc9475365bf08f4e508ddf9bc0b8525449a95d190f10d025acebc5b56ac2e94b3c7146790e4ae78989bb9633cb7ee20d1cc9b7dc909b2
+  checksum: 10c0/e8dd04e48001eb5857abc9475365bf08f4e508ddf9bc0b8525449a95d190f10d025acebc5b56ac2e94b3c7146790e4ae78989bb9633cb7ee20d1cc9b7dc909b2
   languageName: node
   linkType: hard
 
 "postgres-array@npm:~2.0.0":
   version: 2.0.0
   resolution: "postgres-array@npm:2.0.0"
-  checksum: cbd56207e4141d7fbf08c86f2aebf21fa7064943d3f808ec85f442ff94b48d891e7a144cc02665fb2de5dbcb9b8e3183a2ac749959e794b4a4cfd379d7a21d08
+  checksum: 10c0/cbd56207e4141d7fbf08c86f2aebf21fa7064943d3f808ec85f442ff94b48d891e7a144cc02665fb2de5dbcb9b8e3183a2ac749959e794b4a4cfd379d7a21d08
   languageName: node
   linkType: hard
 
 "postgres-array@npm:~3.0.1":
   version: 3.0.2
   resolution: "postgres-array@npm:3.0.2"
-  checksum: 644aa071f67a66a59f641f8e623887d2b915bc102a32643e2aa8b54c11acd343c5ad97831ea444dd37bd4b921ba35add4aa2cb0c6b76700a8252c2324aeba5b4
+  checksum: 10c0/644aa071f67a66a59f641f8e623887d2b915bc102a32643e2aa8b54c11acd343c5ad97831ea444dd37bd4b921ba35add4aa2cb0c6b76700a8252c2324aeba5b4
   languageName: node
   linkType: hard
 
 "postgres-bytea@npm:~1.0.0":
   version: 1.0.0
   resolution: "postgres-bytea@npm:1.0.0"
-  checksum: febf2364b8a8953695cac159eeb94542ead5886792a9627b97e33f6b5bb6e263bc0706ab47ec221516e79fbd6b2452d668841830fb3b49ec6c0fc29be61892ce
+  checksum: 10c0/febf2364b8a8953695cac159eeb94542ead5886792a9627b97e33f6b5bb6e263bc0706ab47ec221516e79fbd6b2452d668841830fb3b49ec6c0fc29be61892ce
   languageName: node
   linkType: hard
 
@@ -13167,21 +13167,21 @@ __metadata:
   resolution: "postgres-bytea@npm:3.0.0"
   dependencies:
     obuf: "npm:~1.1.2"
-  checksum: 41c79cc48aa730c5ba3eda6ab989a940034f07a1f57b8f2777dce56f1b8cca16c5870582932b5b10cc605048aef9b6157e06253c871b4717cafc6d00f55376aa
+  checksum: 10c0/41c79cc48aa730c5ba3eda6ab989a940034f07a1f57b8f2777dce56f1b8cca16c5870582932b5b10cc605048aef9b6157e06253c871b4717cafc6d00f55376aa
   languageName: node
   linkType: hard
 
 "postgres-date@npm:~1.0.4":
   version: 1.0.7
   resolution: "postgres-date@npm:1.0.7"
-  checksum: 0ff91fccc64003e10b767fcfeefb5eaffbc522c93aa65d5051c49b3c4ce6cb93ab091a7d22877a90ad60b8874202c6f1d0f935f38a7235ed3b258efd54b97ca9
+  checksum: 10c0/0ff91fccc64003e10b767fcfeefb5eaffbc522c93aa65d5051c49b3c4ce6cb93ab091a7d22877a90ad60b8874202c6f1d0f935f38a7235ed3b258efd54b97ca9
   languageName: node
   linkType: hard
 
 "postgres-date@npm:~2.0.1":
   version: 2.0.1
   resolution: "postgres-date@npm:2.0.1"
-  checksum: 2d3698958f858b7d1df0a3929fb8750ccb43fa2c8ee9fec7a021e7926291f6c85ddd9d94d87cd6529d70bd2444f3e14fb5bb323af19ceaa733542cc05c5c653a
+  checksum: 10c0/2d3698958f858b7d1df0a3929fb8750ccb43fa2c8ee9fec7a021e7926291f6c85ddd9d94d87cd6529d70bd2444f3e14fb5bb323af19ceaa733542cc05c5c653a
   languageName: node
   linkType: hard
 
@@ -13190,28 +13190,28 @@ __metadata:
   resolution: "postgres-interval@npm:1.2.0"
   dependencies:
     xtend: "npm:^4.0.0"
-  checksum: c1734c3cb79e7f22579af0b268a463b1fa1d084e742a02a7a290c4f041e349456f3bee3b4ee0bb3f226828597f7b76deb615c1b857db9a742c45520100456272
+  checksum: 10c0/c1734c3cb79e7f22579af0b268a463b1fa1d084e742a02a7a290c4f041e349456f3bee3b4ee0bb3f226828597f7b76deb615c1b857db9a742c45520100456272
   languageName: node
   linkType: hard
 
 "postgres-interval@npm:^3.0.0":
   version: 3.0.0
   resolution: "postgres-interval@npm:3.0.0"
-  checksum: 8b570b30ea37c685e26d136d34460f246f98935a1533defc4b53bb05ee23ae3dc7475b718ec7ea607a57894d8c6b4f1adf67ca9cc83a75bdacffd427d5c68de8
+  checksum: 10c0/8b570b30ea37c685e26d136d34460f246f98935a1533defc4b53bb05ee23ae3dc7475b718ec7ea607a57894d8c6b4f1adf67ca9cc83a75bdacffd427d5c68de8
   languageName: node
   linkType: hard
 
 "postgres-range@npm:^1.1.1":
   version: 1.1.3
   resolution: "postgres-range@npm:1.1.3"
-  checksum: f46bc379a198a9e3282a222c8e432d77494854bd4fa0706dff01641846db0bf4f09a9723e7fbb202da34ec3b2d88fc50e26e4bbeded7df19646e3acd6a7465ce
+  checksum: 10c0/f46bc379a198a9e3282a222c8e432d77494854bd4fa0706dff01641846db0bf4f09a9723e7fbb202da34ec3b2d88fc50e26e4bbeded7df19646e3acd6a7465ce
   languageName: node
   linkType: hard
 
 "prelude-ls@npm:^1.2.1":
   version: 1.2.1
   resolution: "prelude-ls@npm:1.2.1"
-  checksum: b00d617431e7886c520a6f498a2e14c75ec58f6d93ba48c3b639cf241b54232d90daa05d83a9e9b9fef6baa63cb7e1e4602c2372fea5bc169668401eb127d0cd
+  checksum: 10c0/b00d617431e7886c520a6f498a2e14c75ec58f6d93ba48c3b639cf241b54232d90daa05d83a9e9b9fef6baa63cb7e1e4602c2372fea5bc169668401eb127d0cd
   languageName: node
   linkType: hard
 
@@ -13220,7 +13220,7 @@ __metadata:
   resolution: "prettier-linter-helpers@npm:1.0.0"
   dependencies:
     fast-diff: "npm:^1.1.2"
-  checksum: 81e0027d731b7b3697ccd2129470ed9913ecb111e4ec175a12f0fcfab0096516373bf0af2fef132af50cafb0a905b74ff57996d615f59512bb9ac7378fcc64ab
+  checksum: 10c0/81e0027d731b7b3697ccd2129470ed9913ecb111e4ec175a12f0fcfab0096516373bf0af2fef132af50cafb0a905b74ff57996d615f59512bb9ac7378fcc64ab
   languageName: node
   linkType: hard
 
@@ -13229,14 +13229,14 @@ __metadata:
   resolution: "prettier@npm:3.2.4"
   bin:
     prettier: bin/prettier.cjs
-  checksum: 88dfeb78ac6096522c9a5b81f1413d875f568420d9bb6a5e5103527912519b993f2bcdcac311fcff5718d5869671d44e4f85827d3626f3a6ce32b9abc65d88e0
+  checksum: 10c0/88dfeb78ac6096522c9a5b81f1413d875f568420d9bb6a5e5103527912519b993f2bcdcac311fcff5718d5869671d44e4f85827d3626f3a6ce32b9abc65d88e0
   languageName: node
   linkType: hard
 
 "pretty-bytes@npm:^5.3.0, pretty-bytes@npm:^5.4.1":
   version: 5.6.0
   resolution: "pretty-bytes@npm:5.6.0"
-  checksum: f69f494dcc1adda98dbe0e4a36d301e8be8ff99bfde7a637b2ee2820e7cb583b0fc0f3a63b0e3752c01501185a5cf38602c7be60da41bdf84ef5b70e89c370f3
+  checksum: 10c0/f69f494dcc1adda98dbe0e4a36d301e8be8ff99bfde7a637b2ee2820e7cb583b0fc0f3a63b0e3752c01501185a5cf38602c7be60da41bdf84ef5b70e89c370f3
   languageName: node
   linkType: hard
 
@@ -13247,7 +13247,7 @@ __metadata:
     ansi-regex: "npm:^5.0.1"
     ansi-styles: "npm:^5.0.0"
     react-is: "npm:^17.0.1"
-  checksum: 0cbda1031aa30c659e10921fa94e0dd3f903ecbbbe7184a729ad66f2b6e7f17891e8c7d7654c458fa4ccb1a411ffb695b4f17bbcd3fe075fabe181027c4040ed
+  checksum: 10c0/0cbda1031aa30c659e10921fa94e0dd3f903ecbbbe7184a729ad66f2b6e7f17891e8c7d7654c458fa4ccb1a411ffb695b4f17bbcd3fe075fabe181027c4040ed
   languageName: node
   linkType: hard
 
@@ -13258,35 +13258,35 @@ __metadata:
     "@jest/schemas": "npm:^29.6.3"
     ansi-styles: "npm:^5.0.0"
     react-is: "npm:^18.0.0"
-  checksum: edc5ff89f51916f036c62ed433506b55446ff739358de77207e63e88a28ca2894caac6e73dcb68166a606e51c8087d32d400473e6a9fdd2dbe743f46c9c0276f
+  checksum: 10c0/edc5ff89f51916f036c62ed433506b55446ff739358de77207e63e88a28ca2894caac6e73dcb68166a606e51c8087d32d400473e6a9fdd2dbe743f46c9c0276f
   languageName: node
   linkType: hard
 
 "proc-log@npm:^3.0.0":
   version: 3.0.0
   resolution: "proc-log@npm:3.0.0"
-  checksum: f66430e4ff947dbb996058f6fd22de2c66612ae1a89b097744e17fb18a4e8e7a86db99eda52ccf15e53f00b63f4ec0b0911581ff2aac0355b625c8eac509b0dc
+  checksum: 10c0/f66430e4ff947dbb996058f6fd22de2c66612ae1a89b097744e17fb18a4e8e7a86db99eda52ccf15e53f00b63f4ec0b0911581ff2aac0355b625c8eac509b0dc
   languageName: node
   linkType: hard
 
 "process-nextick-args@npm:~2.0.0":
   version: 2.0.1
   resolution: "process-nextick-args@npm:2.0.1"
-  checksum: bec089239487833d46b59d80327a1605e1c5287eaad770a291add7f45fda1bb5e28b38e0e061add0a1d0ee0984788ce74fa394d345eed1c420cacf392c554367
+  checksum: 10c0/bec089239487833d46b59d80327a1605e1c5287eaad770a291add7f45fda1bb5e28b38e0e061add0a1d0ee0984788ce74fa394d345eed1c420cacf392c554367
   languageName: node
   linkType: hard
 
 "process-warning@npm:^3.0.0":
   version: 3.0.0
   resolution: "process-warning@npm:3.0.0"
-  checksum: 60f3c8ddee586f0706c1e6cb5aa9c86df05774b9330d792d7c8851cf0031afd759d665404d07037e0b4901b55c44a423f07bdc465c63de07d8d23196bb403622
+  checksum: 10c0/60f3c8ddee586f0706c1e6cb5aa9c86df05774b9330d792d7c8851cf0031afd759d665404d07037e0b4901b55c44a423f07bdc465c63de07d8d23196bb403622
   languageName: node
   linkType: hard
 
 "process@npm:^0.11.10":
   version: 0.11.10
   resolution: "process@npm:0.11.10"
-  checksum: 40c3ce4b7e6d4b8c3355479df77aeed46f81b279818ccdc500124e6a5ab882c0cc81ff7ea16384873a95a74c4570b01b120f287abbdd4c877931460eca6084b3
+  checksum: 10c0/40c3ce4b7e6d4b8c3355479df77aeed46f81b279818ccdc500124e6a5ab882c0cc81ff7ea16384873a95a74c4570b01b120f287abbdd4c877931460eca6084b3
   languageName: node
   linkType: hard
 
@@ -13296,14 +13296,14 @@ __metadata:
   dependencies:
     "@opentelemetry/api": "npm:^1.4.0"
     tdigest: "npm:^0.1.1"
-  checksum: c10781adbf49225298e44da5396a51a0bd4d0cddc3c7e237ba50e888e12ead26a8f98261f362a442f1bbcdaddd6e7302d5675b37beac67ea9b6f82e4d39fb3cc
+  checksum: 10c0/c10781adbf49225298e44da5396a51a0bd4d0cddc3c7e237ba50e888e12ead26a8f98261f362a442f1bbcdaddd6e7302d5675b37beac67ea9b6f82e4d39fb3cc
   languageName: node
   linkType: hard
 
 "promise-inflight@npm:^1.0.1":
   version: 1.0.1
   resolution: "promise-inflight@npm:1.0.1"
-  checksum: d179d148d98fbff3d815752fa9a08a87d3190551d1420f17c4467f628214db12235ae068d98cd001f024453676d8985af8f28f002345646c4ece4600a79620bc
+  checksum: 10c0/d179d148d98fbff3d815752fa9a08a87d3190551d1420f17c4467f628214db12235ae068d98cd001f024453676d8985af8f28f002345646c4ece4600a79620bc
   languageName: node
   linkType: hard
 
@@ -13313,7 +13313,7 @@ __metadata:
   dependencies:
     err-code: "npm:^2.0.2"
     retry: "npm:^0.12.0"
-  checksum: 9c7045a1a2928094b5b9b15336dcd2a7b1c052f674550df63cc3f36cd44028e5080448175b6f6ca32b642de81150f5e7b1a98b728f15cb069f2dd60ac2616b96
+  checksum: 10c0/9c7045a1a2928094b5b9b15336dcd2a7b1c052f674550df63cc3f36cd44028e5080448175b6f6ca32b642de81150f5e7b1a98b728f15cb069f2dd60ac2616b96
   languageName: node
   linkType: hard
 
@@ -13323,7 +13323,7 @@ __metadata:
   dependencies:
     kleur: "npm:^3.0.3"
     sisteransi: "npm:^1.0.5"
-  checksum: 16f1ac2977b19fe2cf53f8411cc98db7a3c8b115c479b2ca5c82b5527cd937aa405fa04f9a5960abeb9daef53191b53b4d13e35c1f5d50e8718c76917c5f1ea4
+  checksum: 10c0/16f1ac2977b19fe2cf53f8411cc98db7a3c8b115c479b2ca5c82b5527cd937aa405fa04f9a5960abeb9daef53191b53b4d13e35c1f5d50e8718c76917c5f1ea4
   languageName: node
   linkType: hard
 
@@ -13334,7 +13334,7 @@ __metadata:
     loose-envify: "npm:^1.4.0"
     object-assign: "npm:^4.1.1"
     react-is: "npm:^16.13.1"
-  checksum: 59ece7ca2fb9838031d73a48d4becb9a7cc1ed10e610517c7d8f19a1e02fa47f7c27d557d8a5702bec3cfeccddc853579832b43f449e54635803f277b1c78077
+  checksum: 10c0/59ece7ca2fb9838031d73a48d4becb9a7cc1ed10e610517c7d8f19a1e02fa47f7c27d557d8a5702bec3cfeccddc853579832b43f449e54635803f277b1c78077
   languageName: node
   linkType: hard
 
@@ -13344,28 +13344,28 @@ __metadata:
   dependencies:
     forwarded: "npm:0.2.0"
     ipaddr.js: "npm:1.9.1"
-  checksum: c3eed999781a35f7fd935f398b6d8920b6fb00bbc14287bc6de78128ccc1a02c89b95b56742bf7cf0362cc333c61d138532049c7dedc7a328ef13343eff81210
+  checksum: 10c0/c3eed999781a35f7fd935f398b6d8920b6fb00bbc14287bc6de78128ccc1a02c89b95b56742bf7cf0362cc333c61d138532049c7dedc7a328ef13343eff81210
   languageName: node
   linkType: hard
 
 "proxy-from-env@npm:^1.1.0":
   version: 1.1.0
   resolution: "proxy-from-env@npm:1.1.0"
-  checksum: fe7dd8b1bdbbbea18d1459107729c3e4a2243ca870d26d34c2c1bcd3e4425b7bcc5112362df2d93cc7fb9746f6142b5e272fd1cc5c86ddf8580175186f6ad42b
+  checksum: 10c0/fe7dd8b1bdbbbea18d1459107729c3e4a2243ca870d26d34c2c1bcd3e4425b7bcc5112362df2d93cc7fb9746f6142b5e272fd1cc5c86ddf8580175186f6ad42b
   languageName: node
   linkType: hard
 
 "prr@npm:~1.0.1":
   version: 1.0.1
   resolution: "prr@npm:1.0.1"
-  checksum: 5b9272c602e4f4472a215e58daff88f802923b84bc39c8860376bb1c0e42aaf18c25d69ad974bd06ec6db6f544b783edecd5502cd3d184748d99080d68e4be5f
+  checksum: 10c0/5b9272c602e4f4472a215e58daff88f802923b84bc39c8860376bb1c0e42aaf18c25d69ad974bd06ec6db6f544b783edecd5502cd3d184748d99080d68e4be5f
   languageName: node
   linkType: hard
 
 "psl@npm:^1.1.33":
   version: 1.9.0
   resolution: "psl@npm:1.9.0"
-  checksum: 6a3f805fdab9442f44de4ba23880c4eba26b20c8e8e0830eff1cb31007f6825dace61d17203c58bfe36946842140c97a1ba7f67bc63ca2d88a7ee052b65d97ab
+  checksum: 10c0/6a3f805fdab9442f44de4ba23880c4eba26b20c8e8e0830eff1cb31007f6825dace61d17203c58bfe36946842140c97a1ba7f67bc63ca2d88a7ee052b65d97ab
   languageName: node
   linkType: hard
 
@@ -13379,7 +13379,7 @@ __metadata:
     parse-asn1: "npm:^5.0.0"
     randombytes: "npm:^2.0.1"
     safe-buffer: "npm:^5.1.2"
-  checksum: 6c2cc19fbb554449e47f2175065d6b32f828f9b3badbee4c76585ac28ae8641aafb9bb107afc430c33c5edd6b05dbe318df4f7d6d7712b1093407b11c4280700
+  checksum: 10c0/6c2cc19fbb554449e47f2175065d6b32f828f9b3badbee4c76585ac28ae8641aafb9bb107afc430c33c5edd6b05dbe318df4f7d6d7712b1093407b11c4280700
   languageName: node
   linkType: hard
 
@@ -13389,35 +13389,35 @@ __metadata:
   dependencies:
     end-of-stream: "npm:^1.1.0"
     once: "npm:^1.3.1"
-  checksum: bbdeda4f747cdf47db97428f3a135728669e56a0ae5f354a9ac5b74556556f5446a46f720a8f14ca2ece5be9b4d5d23c346db02b555f46739934cc6c093a5478
+  checksum: 10c0/bbdeda4f747cdf47db97428f3a135728669e56a0ae5f354a9ac5b74556556f5446a46f720a8f14ca2ece5be9b4d5d23c346db02b555f46739934cc6c093a5478
   languageName: node
   linkType: hard
 
 "punycode@npm:1.4.1, punycode@npm:^1.2.4, punycode@npm:^1.4.1":
   version: 1.4.1
   resolution: "punycode@npm:1.4.1"
-  checksum: 354b743320518aef36f77013be6e15da4db24c2b4f62c5f1eb0529a6ed02fbaf1cb52925785f6ab85a962f2b590d9cd5ad730b70da72b5f180e2556b8bd3ca08
+  checksum: 10c0/354b743320518aef36f77013be6e15da4db24c2b4f62c5f1eb0529a6ed02fbaf1cb52925785f6ab85a962f2b590d9cd5ad730b70da72b5f180e2556b8bd3ca08
   languageName: node
   linkType: hard
 
 "punycode@npm:^2.1.0, punycode@npm:^2.1.1, punycode@npm:^2.3.0, punycode@npm:^2.3.1":
   version: 2.3.1
   resolution: "punycode@npm:2.3.1"
-  checksum: 14f76a8206bc3464f794fb2e3d3cc665ae416c01893ad7a02b23766eb07159144ee612ad67af5e84fa4479ccfe67678c4feb126b0485651b302babf66f04f9e9
+  checksum: 10c0/14f76a8206bc3464f794fb2e3d3cc665ae416c01893ad7a02b23766eb07159144ee612ad67af5e84fa4479ccfe67678c4feb126b0485651b302babf66f04f9e9
   languageName: node
   linkType: hard
 
 "pure-rand@npm:^6.0.0":
   version: 6.0.2
   resolution: "pure-rand@npm:6.0.2"
-  checksum: 0556bee2e16a8d081a2b7630d9cb4e5dafd4e6bd6e4c61de1cf1ef5974f127847523e3d0e62884f6f5d64b66a5e93b05bd8f37ed009f3a4fe5089899e05914aa
+  checksum: 10c0/0556bee2e16a8d081a2b7630d9cb4e5dafd4e6bd6e4c61de1cf1ef5974f127847523e3d0e62884f6f5d64b66a5e93b05bd8f37ed009f3a4fe5089899e05914aa
   languageName: node
   linkType: hard
 
 "q@npm:^1.1.2":
   version: 1.5.1
   resolution: "q@npm:1.5.1"
-  checksum: 7855fbdba126cb7e92ef3a16b47ba998c0786ec7fface236e3eb0135b65df36429d91a86b1fff3ab0927b4ac4ee88a2c44527c7c3b8e2a37efbec9fe34803df4
+  checksum: 10c0/7855fbdba126cb7e92ef3a16b47ba998c0786ec7fface236e3eb0135b65df36429d91a86b1fff3ab0927b4ac4ee88a2c44527c7c3b8e2a37efbec9fe34803df4
   languageName: node
   linkType: hard
 
@@ -13426,7 +13426,7 @@ __metadata:
   resolution: "qs@npm:6.11.0"
   dependencies:
     side-channel: "npm:^1.0.4"
-  checksum: 4e4875e4d7c7c31c233d07a448e7e4650f456178b9dd3766b7cfa13158fdb24ecb8c4f059fa91e820dc6ab9f2d243721d071c9c0378892dcdad86e9e9a27c68f
+  checksum: 10c0/4e4875e4d7c7c31c233d07a448e7e4650f456178b9dd3766b7cfa13158fdb24ecb8c4f059fa91e820dc6ab9f2d243721d071c9c0378892dcdad86e9e9a27c68f
   languageName: node
   linkType: hard
 
@@ -13435,35 +13435,35 @@ __metadata:
   resolution: "qs@npm:6.11.2"
   dependencies:
     side-channel: "npm:^1.0.4"
-  checksum: 4f95d4ff18ed480befcafa3390022817ffd3087fc65f146cceb40fc5edb9fa96cb31f648cae2fa96ca23818f0798bd63ad4ca369a0e22702fcd41379b3ab6571
+  checksum: 10c0/4f95d4ff18ed480befcafa3390022817ffd3087fc65f146cceb40fc5edb9fa96cb31f648cae2fa96ca23818f0798bd63ad4ca369a0e22702fcd41379b3ab6571
   languageName: node
   linkType: hard
 
 "querystring-es3@npm:^0.2.0":
   version: 0.2.1
   resolution: "querystring-es3@npm:0.2.1"
-  checksum: 476938c1adb45c141f024fccd2ffd919a3746e79ed444d00e670aad68532977b793889648980e7ca7ff5ffc7bfece623118d0fbadcaf217495eeb7059ae51580
+  checksum: 10c0/476938c1adb45c141f024fccd2ffd919a3746e79ed444d00e670aad68532977b793889648980e7ca7ff5ffc7bfece623118d0fbadcaf217495eeb7059ae51580
   languageName: node
   linkType: hard
 
 "querystringify@npm:^2.1.1":
   version: 2.2.0
   resolution: "querystringify@npm:2.2.0"
-  checksum: 3258bc3dbdf322ff2663619afe5947c7926a6ef5fb78ad7d384602974c467fadfc8272af44f5eb8cddd0d011aae8fabf3a929a8eee4b86edcc0a21e6bd10f9aa
+  checksum: 10c0/3258bc3dbdf322ff2663619afe5947c7926a6ef5fb78ad7d384602974c467fadfc8272af44f5eb8cddd0d011aae8fabf3a929a8eee4b86edcc0a21e6bd10f9aa
   languageName: node
   linkType: hard
 
 "queue-microtask@npm:^1.2.2":
   version: 1.2.3
   resolution: "queue-microtask@npm:1.2.3"
-  checksum: 900a93d3cdae3acd7d16f642c29a642aea32c2026446151f0778c62ac089d4b8e6c986811076e1ae180a694cedf077d453a11b58ff0a865629a4f82ab558e102
+  checksum: 10c0/900a93d3cdae3acd7d16f642c29a642aea32c2026446151f0778c62ac089d4b8e6c986811076e1ae180a694cedf077d453a11b58ff0a865629a4f82ab558e102
   languageName: node
   linkType: hard
 
 "quick-format-unescaped@npm:^4.0.3":
   version: 4.0.4
   resolution: "quick-format-unescaped@npm:4.0.4"
-  checksum: fe5acc6f775b172ca5b4373df26f7e4fd347975578199e7d74b2ae4077f0af05baa27d231de1e80e8f72d88275ccc6028568a7a8c9ee5e7368ace0e18eff93a4
+  checksum: 10c0/fe5acc6f775b172ca5b4373df26f7e4fd347975578199e7d74b2ae4077f0af05baa27d231de1e80e8f72d88275ccc6028568a7a8c9ee5e7368ace0e18eff93a4
   languageName: node
   linkType: hard
 
@@ -13472,7 +13472,7 @@ __metadata:
   resolution: "raf@npm:3.4.1"
   dependencies:
     performance-now: "npm:^2.1.0"
-  checksum: 337f0853c9e6a77647b0f499beedafea5d6facfb9f2d488a624f88b03df2be72b8a0e7f9118a3ff811377d534912039a3311815700d2b6d2313f82f736f9eb6e
+  checksum: 10c0/337f0853c9e6a77647b0f499beedafea5d6facfb9f2d488a624f88b03df2be72b8a0e7f9118a3ff811377d534912039a3311815700d2b6d2313f82f736f9eb6e
   languageName: node
   linkType: hard
 
@@ -13481,7 +13481,7 @@ __metadata:
   resolution: "randombytes@npm:2.1.0"
   dependencies:
     safe-buffer: "npm:^5.1.0"
-  checksum: 50395efda7a8c94f5dffab564f9ff89736064d32addf0cc7e8bf5e4166f09f8ded7a0849ca6c2d2a59478f7d90f78f20d8048bca3cdf8be09d8e8a10790388f3
+  checksum: 10c0/50395efda7a8c94f5dffab564f9ff89736064d32addf0cc7e8bf5e4166f09f8ded7a0849ca6c2d2a59478f7d90f78f20d8048bca3cdf8be09d8e8a10790388f3
   languageName: node
   linkType: hard
 
@@ -13491,14 +13491,14 @@ __metadata:
   dependencies:
     randombytes: "npm:^2.0.5"
     safe-buffer: "npm:^5.1.0"
-  checksum: 11aeed35515872e8f8a2edec306734e6b74c39c46653607f03c68385ab8030e2adcc4215f76b5e4598e028c4750d820afd5c65202527d831d2a5f207fe2bc87c
+  checksum: 10c0/11aeed35515872e8f8a2edec306734e6b74c39c46653607f03c68385ab8030e2adcc4215f76b5e4598e028c4750d820afd5c65202527d831d2a5f207fe2bc87c
   languageName: node
   linkType: hard
 
 "range-parser@npm:^1.2.1, range-parser@npm:~1.2.1":
   version: 1.2.1
   resolution: "range-parser@npm:1.2.1"
-  checksum: 96c032ac2475c8027b7a4e9fe22dc0dfe0f6d90b85e496e0f016fbdb99d6d066de0112e680805075bd989905e2123b3b3d002765149294dce0c1f7f01fcc2ea0
+  checksum: 10c0/96c032ac2475c8027b7a4e9fe22dc0dfe0f6d90b85e496e0f016fbdb99d6d066de0112e680805075bd989905e2123b3b3d002765149294dce0c1f7f01fcc2ea0
   languageName: node
   linkType: hard
 
@@ -13510,7 +13510,7 @@ __metadata:
     http-errors: "npm:2.0.0"
     iconv-lite: "npm:0.4.24"
     unpipe: "npm:1.0.0"
-  checksum: 5dad5a3a64a023b894ad7ab4e5c7c1ce34d3497fc7138d02f8c88a3781e68d8a55aa7d4fd3a458616fa8647cc228be314a1c03fb430a07521de78b32c4dd09d2
+  checksum: 10c0/5dad5a3a64a023b894ad7ab4e5c7c1ce34d3497fc7138d02f8c88a3781e68d8a55aa7d4fd3a458616fa8647cc228be314a1c03fb430a07521de78b32c4dd09d2
   languageName: node
   linkType: hard
 
@@ -13522,7 +13522,7 @@ __metadata:
     scheduler: "npm:^0.23.0"
   peerDependencies:
     react: ^18.2.0
-  checksum: 66dfc5f93e13d0674e78ef41f92ed21dfb80f9c4ac4ac25a4b51046d41d4d2186abc915b897f69d3d0ebbffe6184e7c5876f2af26bfa956f179225d921be713a
+  checksum: 10c0/66dfc5f93e13d0674e78ef41f92ed21dfb80f9c4ac4ac25a4b51046d41d4d2186abc915b897f69d3d0ebbffe6184e7c5876f2af26bfa956f179225d921be713a
   languageName: node
   linkType: hard
 
@@ -13535,14 +13535,14 @@ __metadata:
     warning: "npm:^4.0.1"
   peerDependencies:
     react: ^16.3.0
-  checksum: 07ca093d74b7963cb6048953517f881a0fdee9b485d31dabd49814cda51543eee20e714dd423e25946984b0ac26dbcb80aaf1211b0170e9b0cfa92fa85b0984e
+  checksum: 10c0/07ca093d74b7963cb6048953517f881a0fdee9b485d31dabd49814cda51543eee20e714dd423e25946984b0ac26dbcb80aaf1211b0170e9b0cfa92fa85b0984e
   languageName: node
   linkType: hard
 
 "react-fast-compare@npm:^3.1.1":
   version: 3.2.2
   resolution: "react-fast-compare@npm:3.2.2"
-  checksum: 0bbd2f3eb41ab2ff7380daaa55105db698d965c396df73e6874831dbafec8c4b5b08ba36ff09df01526caa3c61595247e3269558c284e37646241cba2b90a367
+  checksum: 10c0/0bbd2f3eb41ab2ff7380daaa55105db698d965c396df73e6874831dbafec8c4b5b08ba36ff09df01526caa3c61595247e3269558c284e37646241cba2b90a367
   languageName: node
   linkType: hard
 
@@ -13556,7 +13556,7 @@ __metadata:
     react-side-effect: "npm:^2.1.0"
   peerDependencies:
     react: ">=16.3.0"
-  checksum: 1d2831d9c3b4f5c91f020076aeb6502437a4788077d0c438421e466eb9633d5dc2aacedf7b779a970b807d61cf87793c5ff76ee3190a185d71c90b5cfb367e96
+  checksum: 10c0/1d2831d9c3b4f5c91f020076aeb6502437a4788077d0c438421e466eb9633d5dc2aacedf7b779a970b807d61cf87793c5ff76ee3190a185d71c90b5cfb367e96
   languageName: node
   linkType: hard
 
@@ -13572,7 +13572,7 @@ __metadata:
   peerDependencies:
     react: ">= 0.14.0"
     react-dom: ">= 0.14.0"
-  checksum: 6bd566ea97e00058749d43d768ee843e5132f988571536e090b564d5dbaa71093695255514fc5b9fcf9fbd03fcb0603f6e135dcab6dcaaffe43dedbfe742a163
+  checksum: 10c0/6bd566ea97e00058749d43d768ee843e5132f988571536e090b564d5dbaa71093695255514fc5b9fcf9fbd03fcb0603f6e135dcab6dcaaffe43dedbfe742a163
   languageName: node
   linkType: hard
 
@@ -13583,7 +13583,7 @@ __metadata:
     invariant: "npm:^2.2.2"
   peerDependencies:
     immutable: ">=3.6.2"
-  checksum: 4f3e147303be418d157a00246c9988068df0d21cb92e40f9d78a09538da71b967f5ddbd7f7facf54f05b5ddb011cc717afa82c8c490b0188bf90a6251acc9fb9
+  checksum: 10c0/4f3e147303be418d157a00246c9988068df0d21cb92e40f9d78a09538da71b967f5ddbd7f7facf54f05b5ddb011cc717afa82c8c490b0188bf90a6251acc9fb9
   languageName: node
   linkType: hard
 
@@ -13594,7 +13594,7 @@ __metadata:
     immutable: ">= 2 || >= 4.0.0-rc"
     react: ">= 16.6"
     react-dom: ">= 16.6"
-  checksum: d13dc10069bd13059ab91741169c6adaa2a44efb425fc3cf7506925f8cfcde40ef8c7d88f0ac5977a9b1eb5b6456f7fe530a1c670df727424dd72a1642163675
+  checksum: 10c0/d13dc10069bd13059ab91741169c6adaa2a44efb425fc3cf7506925f8cfcde40ef8c7d88f0ac5977a9b1eb5b6456f7fe530a1c670df727424dd72a1642163675
   languageName: node
   linkType: hard
 
@@ -13618,35 +13618,35 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 78288a0fded816735812dca6dcfee3eaa8bb3af7e963ba47639b51cc700a102a526859ff647ca79a5ebcdc69d6d78da90daeeed15cc0b819c7a20a74b2e1469c
+  checksum: 10c0/78288a0fded816735812dca6dcfee3eaa8bb3af7e963ba47639b51cc700a102a526859ff647ca79a5ebcdc69d6d78da90daeeed15cc0b819c7a20a74b2e1469c
   languageName: node
   linkType: hard
 
 "react-is@npm:^16.12.0 || ^17.0.0 || ^18.0.0, react-is@npm:^18.0.0, react-is@npm:^18.2.0":
   version: 18.2.0
   resolution: "react-is@npm:18.2.0"
-  checksum: 6eb5e4b28028c23e2bfcf73371e72cd4162e4ac7ab445ddae2afe24e347a37d6dc22fae6e1748632cd43c6d4f9b8f86dcf26bf9275e1874f436d129952528ae0
+  checksum: 10c0/6eb5e4b28028c23e2bfcf73371e72cd4162e4ac7ab445ddae2afe24e347a37d6dc22fae6e1748632cd43c6d4f9b8f86dcf26bf9275e1874f436d129952528ae0
   languageName: node
   linkType: hard
 
 "react-is@npm:^16.13.1, react-is@npm:^16.6.0, react-is@npm:^16.7.0":
   version: 16.13.1
   resolution: "react-is@npm:16.13.1"
-  checksum: 33977da7a5f1a287936a0c85639fec6ca74f4f15ef1e59a6bc20338fc73dc69555381e211f7a3529b8150a1f71e4225525b41b60b52965bda53ce7d47377ada1
+  checksum: 10c0/33977da7a5f1a287936a0c85639fec6ca74f4f15ef1e59a6bc20338fc73dc69555381e211f7a3529b8150a1f71e4225525b41b60b52965bda53ce7d47377ada1
   languageName: node
   linkType: hard
 
 "react-is@npm:^17.0.1":
   version: 17.0.2
   resolution: "react-is@npm:17.0.2"
-  checksum: 2bdb6b93fbb1820b024b496042cce405c57e2f85e777c9aabd55f9b26d145408f9f74f5934676ffdc46f3dcff656d78413a6e43968e7b3f92eea35b3052e9053
+  checksum: 10c0/2bdb6b93fbb1820b024b496042cce405c57e2f85e777c9aabd55f9b26d145408f9f74f5934676ffdc46f3dcff656d78413a6e43968e7b3f92eea35b3052e9053
   languageName: node
   linkType: hard
 
 "react-lifecycles-compat@npm:^3.0.4":
   version: 3.0.4
   resolution: "react-lifecycles-compat@npm:3.0.4"
-  checksum: 1d0df3c85af79df720524780f00c064d53a9dd1899d785eddb7264b378026979acbddb58a4b7e06e7d0d12aa1494fd5754562ee55d32907b15601068dae82c27
+  checksum: 10c0/1d0df3c85af79df720524780f00c064d53a9dd1899d785eddb7264b378026979acbddb58a4b7e06e7d0d12aa1494fd5754562ee55d32907b15601068dae82c27
   languageName: node
   linkType: hard
 
@@ -13659,7 +13659,7 @@ __metadata:
     raf: "npm:^3.1.0"
   peerDependencies:
     react: ^0.14.9 || ^15.3.0 || ^16.0.0
-  checksum: 4ea6f1cc7079f0161fd786cc755133a822d87d9c0510369b8fb348d9ad602111efa2e3496dbcc390c967229e39e3eb5f6dd5dd6d3d124289443de31d6035a6c8
+  checksum: 10c0/4ea6f1cc7079f0161fd786cc755133a822d87d9c0510369b8fb348d9ad602111efa2e3496dbcc390c967229e39e3eb5f6dd5dd6d3d124289443de31d6035a6c8
   languageName: node
   linkType: hard
 
@@ -13670,7 +13670,7 @@ __metadata:
     prop-types: "npm:^15.6.2"
   peerDependencies:
     react: ^0.14.0 || ^15.0.0 || ^16.0.0
-  checksum: 14ffb71a5b18301830699b814d1de2421f4f43f31df5b95efd95cd47548a0d7597ec58abc16a12191958cad398495eba9274193af3294863e2864d32ea79f2c6
+  checksum: 10c0/14ffb71a5b18301830699b814d1de2421f4f43f31df5b95efd95cd47548a0d7597ec58abc16a12191958cad398495eba9274193af3294863e2864d32ea79f2c6
   languageName: node
   linkType: hard
 
@@ -13689,7 +13689,7 @@ __metadata:
   peerDependencies:
     react: ">=16.3.0"
     react-dom: ">=16.3.0"
-  checksum: 61836490040cfcdebc792b6eddcfac47b7b7e159f99304165371e9eb389a6875f20ddba3433421413ccfb918e8da6042ab2829f9b1f6f5dd9f8476aa16ddcfbe
+  checksum: 10c0/61836490040cfcdebc792b6eddcfac47b7b7e159f99304165371e9eb389a6875f20ddba3433421413ccfb918e8da6042ab2829f9b1f6f5dd9f8476aa16ddcfbe
   languageName: node
   linkType: hard
 
@@ -13704,7 +13704,7 @@ __metadata:
     react-dom: ^0.14.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0
     react-redux: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0
     redux: ^3.0.0 || ^4.0.0 || ^5.0.0
-  checksum: 797c1abf8bcc947feb127380e6d363db264c12bc94e578d635f86f1d806b0ec714dc3723e54c884937448b17f9042cfc995fe7a1deaf558efc01681e43e4669c
+  checksum: 10c0/797c1abf8bcc947feb127380e6d363db264c12bc94e578d635f86f1d806b0ec714dc3723e54c884937448b17f9042cfc995fe7a1deaf558efc01681e43e4669c
   languageName: node
   linkType: hard
 
@@ -13726,7 +13726,7 @@ __metadata:
       optional: true
     redux:
       optional: true
-  checksum: 53161b5dc4d109020fbc42d26906ace92fed9ba1d7ab6274af60e9c0684583d20d1c8ec6d58601ac7b833c6468a652bbf3d4a102149d1793cb8a28b05b042f73
+  checksum: 10c0/53161b5dc4d109020fbc42d26906ace92fed9ba1d7ab6274af60e9c0684583d20d1c8ec6d58601ac7b833c6468a652bbf3d4a102149d1793cb8a28b05b042f73
   languageName: node
   linkType: hard
 
@@ -13743,7 +13743,7 @@ __metadata:
     tiny-warning: "npm:^1.0.0"
   peerDependencies:
     react: ">=15"
-  checksum: f04f727e2ed2e9d1d3830af02cc61690ff67b1524c0d18690582bfba0f4d14142ccc88fb6da6befad644fddf086f5ae4c2eb7048c67da8a0b0929c19426421b0
+  checksum: 10c0/f04f727e2ed2e9d1d3830af02cc61690ff67b1524c0d18690582bfba0f4d14142ccc88fb6da6befad644fddf086f5ae4c2eb7048c67da8a0b0929c19426421b0
   languageName: node
   linkType: hard
 
@@ -13758,7 +13758,7 @@ __metadata:
     react: ^15.0.0 || ^16.0.0
     react-dom: ^15.0.0 || ^16.0.0
     react-router-dom: ^4.0
-  checksum: ad195b7359fd3146530cf299ec437f0a619c577b2cacfb2c76a156d3cd9d5d3e97af56e17c300c37ca8c485041e93124fe63f0c86db6aea468caf838281e62cb
+  checksum: 10c0/ad195b7359fd3146530cf299ec437f0a619c577b2cacfb2c76a156d3cd9d5d3e97af56e17c300c37ca8c485041e93124fe63f0c86db6aea468caf838281e62cb
   languageName: node
   linkType: hard
 
@@ -13777,7 +13777,7 @@ __metadata:
     tiny-warning: "npm:^1.0.0"
   peerDependencies:
     react: ">=15"
-  checksum: e15c00dfef199249b4c6e6d98e5e76cc352ce66f3270f13df37cc069ddf7c05e43281e8c308fc407e4435d72924373baef1d2890e0f6b0b1eb423cf47315a053
+  checksum: 10c0/e15c00dfef199249b4c6e6d98e5e76cc352ce66f3270f13df37cc069ddf7c05e43281e8c308fc407e4435d72924373baef1d2890e0f6b0b1eb423cf47315a053
   languageName: node
   linkType: hard
 
@@ -13797,7 +13797,7 @@ __metadata:
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
     react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-  checksum: b4b98aaf117ee5cc4642871b7bd51fd0e2697988d0b880f30b21e933ca90258959147117d8aada36713b622e0e4cb06bd18ec02069f3f108896e0d31e69e3c16
+  checksum: 10c0/b4b98aaf117ee5cc4642871b7bd51fd0e2697988d0b880f30b21e933ca90258959147117d8aada36713b622e0e4cb06bd18ec02069f3f108896e0d31e69e3c16
   languageName: node
   linkType: hard
 
@@ -13809,7 +13809,7 @@ __metadata:
     react-is: "npm:^16.12.0 || ^17.0.0 || ^18.0.0"
   peerDependencies:
     react: ^16.0.0 || ^17.0.0 || ^18.0.0
-  checksum: c194d741792e86043a4ae272f7353c1cb9412bc649945c4220c6a101a6ea5410cceb3d65d5a4d750f11a24f7426e8eec7977e8a4e3ad5d3ee235ca2b18166fa8
+  checksum: 10c0/c194d741792e86043a4ae272f7353c1cb9412bc649945c4220c6a101a6ea5410cceb3d65d5a4d750f11a24f7426e8eec7977e8a4e3ad5d3ee235ca2b18166fa8
   languageName: node
   linkType: hard
 
@@ -13818,7 +13818,7 @@ __metadata:
   resolution: "react-side-effect@npm:2.1.2"
   peerDependencies:
     react: ^16.3.0 || ^17.0.0 || ^18.0.0
-  checksum: 5d934cae438f701ce646f566750ae6a445e99185ce1a026108f9db728147f7962a22ecf8db79ff26089953a3799b3607766904f4f10194ce42bcd5a1aa0215e8
+  checksum: 10c0/5d934cae438f701ce646f566750ae6a445e99185ce1a026108f9db728147f7962a22ecf8db79ff26089953a3799b3607766904f4f10194ce42bcd5a1aa0215e8
   languageName: node
   linkType: hard
 
@@ -13830,7 +13830,7 @@ __metadata:
   peerDependencies:
     react: "*"
     react-dom: "*"
-  checksum: 06545f917abfd2a24168cc717f396b4451185275db66118d39026f4a189e6376ad73dbc89492c612a87262561783e038a19f9f3f36fb60b14ba53e29a2b29b35
+  checksum: 10c0/06545f917abfd2a24168cc717f396b4451185275db66118d39026f4a189e6376ad73dbc89492c612a87262561783e038a19f9f3f36fb60b14ba53e29a2b29b35
   languageName: node
   linkType: hard
 
@@ -13840,7 +13840,7 @@ __metadata:
   dependencies:
     "@babel/runtime": "npm:7.0.0"
     warning: "npm:^4.0.1"
-  checksum: ca015701587ca9cf5329088809ad5897b0344c1cd377f8f0d21277128c95019dd67aefa64d19b40bc1c171a375c003dbe3343111d9ce12b7327d72e9e98dce7e
+  checksum: 10c0/ca015701587ca9cf5329088809ad5897b0344c1cd377f8f0d21277128c95019dd67aefa64d19b40bc1c171a375c003dbe3343111d9ce12b7327d72e9e98dce7e
   languageName: node
   linkType: hard
 
@@ -13854,7 +13854,7 @@ __metadata:
     react-event-listener: "npm:^0.6.0"
     react-swipeable-views-core: "npm:^0.14.0"
     shallow-equal: "npm:^1.2.1"
-  checksum: acc1b1d7f0bc81485e44aa2a465adc13cd89865add87bf32b88dc0986f1556c8b227b79763a7c0b197bf6eeacc333451c7b8ab5c40517809d1a913f7b9742588
+  checksum: 10c0/acc1b1d7f0bc81485e44aa2a465adc13cd89865add87bf32b88dc0986f1556c8b227b79763a7c0b197bf6eeacc333451c7b8ab5c40517809d1a913f7b9742588
   languageName: node
   linkType: hard
 
@@ -13869,7 +13869,7 @@ __metadata:
     warning: "npm:^4.0.1"
   peerDependencies:
     react: ^15.3.0 || ^16.0.0 || ^17.0.0
-  checksum: 032e7a1ff49e6e57eb755e133968eb207a4acc67c68ed8d0b09b4fe0826b290344454da5d420f17d8f4c049d900f3c12594ba5b97a79f20ef3b30bc62e866aa1
+  checksum: 10c0/032e7a1ff49e6e57eb755e133968eb207a4acc67c68ed8d0b09b4fe0826b290344454da5d420f17d8f4c049d900f3c12594ba5b97a79f20ef3b30bc62e866aa1
   languageName: node
   linkType: hard
 
@@ -13882,7 +13882,7 @@ __metadata:
     scheduler: "npm:^0.23.0"
   peerDependencies:
     react: ^18.2.0
-  checksum: 53dfada1da1e8dd0498a5601e9eea3dc6ca23c6c2694d1cab9712faea869c11e4ce1c9a618d674cb668a668b41fb6bcf9a7b0a078cd853b1922f002fa22f42c8
+  checksum: 10c0/53dfada1da1e8dd0498a5601e9eea3dc6ca23c6c2694d1cab9712faea869c11e4ce1c9a618d674cb668a668b41fb6bcf9a7b0a078cd853b1922f002fa22f42c8
   languageName: node
   linkType: hard
 
@@ -13895,7 +13895,7 @@ __metadata:
     use-latest: "npm:^1.2.1"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
-  checksum: 33d38a6d96cf584842695b50c341980944ece23a42155bf0bd1958f02396adb185c7720b88678dc677817fe111783059c0ebcdf7761644006892583b10e258ee
+  checksum: 10c0/33d38a6d96cf584842695b50c341980944ece23a42155bf0bd1958f02396adb185c7720b88678dc677817fe111783059c0ebcdf7761644006892583b10e258ee
   languageName: node
   linkType: hard
 
@@ -13908,7 +13908,7 @@ __metadata:
     prop-types: ">= 15.3.0 < 19"
     react: ">= 15.3.0 < 19"
     react-dom: ">= 15.3.0 < 19"
-  checksum: afae643981d6fb922d66830ec0e9c793e729d7a55e3974edf212965acc8dc51f0d098ae6e409461d3ff2f87fe027dc3556a1a746f8472ed3a79c8878bf338fee
+  checksum: 10c0/afae643981d6fb922d66830ec0e9c793e729d7a55e3974edf212965acc8dc51f0d098ae6e409461d3ff2f87fe027dc3556a1a746f8472ed3a79c8878bf338fee
   languageName: node
   linkType: hard
 
@@ -13923,7 +13923,7 @@ __metadata:
   peerDependencies:
     react: ">=16.6.0"
     react-dom: ">=16.6.0"
-  checksum: 2ba754ba748faefa15f87c96dfa700d5525054a0141de8c75763aae6734af0740e77e11261a1e8f4ffc08fd9ab78510122e05c21c2d79066c38bb6861a886c82
+  checksum: 10c0/2ba754ba748faefa15f87c96dfa700d5525054a0141de8c75763aae6734af0740e77e11261a1e8f4ffc08fd9ab78510122e05c21c2d79066c38bb6861a886c82
   languageName: node
   linkType: hard
 
@@ -13932,7 +13932,7 @@ __metadata:
   resolution: "react@npm:18.2.0"
   dependencies:
     loose-envify: "npm:^1.1.0"
-  checksum: b562d9b569b0cb315e44b48099f7712283d93df36b19a39a67c254c6686479d3980b7f013dc931f4a5a3ae7645eae6386b4aa5eea933baa54ecd0f9acb0902b8
+  checksum: 10c0/b562d9b569b0cb315e44b48099f7712283d93df36b19a39a67c254c6686479d3980b7f013dc931f4a5a3ae7645eae6386b4aa5eea933baa54ecd0f9acb0902b8
   languageName: node
   linkType: hard
 
@@ -13947,7 +13947,7 @@ __metadata:
     safe-buffer: "npm:~5.1.1"
     string_decoder: "npm:~1.1.1"
     util-deprecate: "npm:~1.0.1"
-  checksum: 7efdb01f3853bc35ac62ea25493567bf588773213f5f4a79f9c365e1ad13bab845ac0dae7bc946270dc40c3929483228415e92a3fc600cc7e4548992f41ee3fa
+  checksum: 10c0/7efdb01f3853bc35ac62ea25493567bf588773213f5f4a79f9c365e1ad13bab845ac0dae7bc946270dc40c3929483228415e92a3fc600cc7e4548992f41ee3fa
   languageName: node
   linkType: hard
 
@@ -13958,7 +13958,7 @@ __metadata:
     inherits: "npm:^2.0.3"
     string_decoder: "npm:^1.1.1"
     util-deprecate: "npm:^1.0.1"
-  checksum: e37be5c79c376fdd088a45fa31ea2e423e5d48854be7a22a58869b4e84d25047b193f6acb54f1012331e1bcd667ffb569c01b99d36b0bd59658fb33f513511b7
+  checksum: 10c0/e37be5c79c376fdd088a45fa31ea2e423e5d48854be7a22a58869b4e84d25047b193f6acb54f1012331e1bcd667ffb569c01b99d36b0bd59658fb33f513511b7
   languageName: node
   linkType: hard
 
@@ -13971,7 +13971,7 @@ __metadata:
     events: "npm:^3.3.0"
     process: "npm:^0.11.10"
     string_decoder: "npm:^1.3.0"
-  checksum: cf7cc8daa2b57872d120945a20a1458c13dcb6c6f352505421115827b18ac4df0e483ac1fe195cb1f5cd226e1073fc55b92b569269d8299e8530840bcdbba40c
+  checksum: 10c0/cf7cc8daa2b57872d120945a20a1458c13dcb6c6f352505421115827b18ac4df0e483ac1fe195cb1f5cd226e1073fc55b92b569269d8299e8530840bcdbba40c
   languageName: node
   linkType: hard
 
@@ -13982,7 +13982,7 @@ __metadata:
     graceful-fs: "npm:^4.1.11"
     micromatch: "npm:^3.1.10"
     readable-stream: "npm:^2.0.2"
-  checksum: 770d177372ff2212d382d425d55ca48301fcbf3231ab3827257bbcca7ff44fb51fe4af6acc2dda8512dc7f29da390e9fbea5b2b3fc724b86e85cc828395b7797
+  checksum: 10c0/770d177372ff2212d382d425d55ca48301fcbf3231ab3827257bbcca7ff44fb51fe4af6acc2dda8512dc7f29da390e9fbea5b2b3fc724b86e85cc828395b7797
   languageName: node
   linkType: hard
 
@@ -13991,14 +13991,14 @@ __metadata:
   resolution: "readdirp@npm:3.6.0"
   dependencies:
     picomatch: "npm:^2.2.1"
-  checksum: 6fa848cf63d1b82ab4e985f4cf72bd55b7dcfd8e0a376905804e48c3634b7e749170940ba77b32804d5fe93b3cc521aa95a8d7e7d725f830da6d93f3669ce66b
+  checksum: 10c0/6fa848cf63d1b82ab4e985f4cf72bd55b7dcfd8e0a376905804e48c3634b7e749170940ba77b32804d5fe93b3cc521aa95a8d7e7d725f830da6d93f3669ce66b
   languageName: node
   linkType: hard
 
 "real-require@npm:^0.2.0":
   version: 0.2.0
   resolution: "real-require@npm:0.2.0"
-  checksum: 23eea5623642f0477412ef8b91acd3969015a1501ed34992ada0e3af521d3c865bb2fe4cdbfec5fe4b505f6d1ef6a03e5c3652520837a8c3b53decff7e74b6a0
+  checksum: 10c0/23eea5623642f0477412ef8b91acd3969015a1501ed34992ada0e3af521d3c865bb2fe4cdbfec5fe4b505f6d1ef6a03e5c3652520837a8c3b53decff7e74b6a0
   languageName: node
   linkType: hard
 
@@ -14008,14 +14008,14 @@ __metadata:
   dependencies:
     indent-string: "npm:^4.0.0"
     strip-indent: "npm:^3.0.0"
-  checksum: d64a6b5c0b50eb3ddce3ab770f866658a2b9998c678f797919ceb1b586bab9259b311407280bd80b804e2a7c7539b19238ae6a2a20c843f1a7fcff21d48c2eae
+  checksum: 10c0/d64a6b5c0b50eb3ddce3ab770f866658a2b9998c678f797919ceb1b586bab9259b311407280bd80b804e2a7c7539b19238ae6a2a20c843f1a7fcff21d48c2eae
   languageName: node
   linkType: hard
 
 "redis-errors@npm:^1.0.0, redis-errors@npm:^1.2.0":
   version: 1.2.0
   resolution: "redis-errors@npm:1.2.0"
-  checksum: 5b316736e9f532d91a35bff631335137a4f974927bb2fb42bf8c2f18879173a211787db8ac4c3fde8f75ed6233eb0888e55d52510b5620e30d69d7d719c8b8a7
+  checksum: 10c0/5b316736e9f532d91a35bff631335137a4f974927bb2fb42bf8c2f18879173a211787db8ac4c3fde8f75ed6233eb0888e55d52510b5620e30d69d7d719c8b8a7
   languageName: node
   linkType: hard
 
@@ -14024,7 +14024,7 @@ __metadata:
   resolution: "redis-parser@npm:3.0.0"
   dependencies:
     redis-errors: "npm:^1.0.0"
-  checksum: ee16ac4c7b2a60b1f42a2cdaee22b005bd4453eb2d0588b8a4939718997ae269da717434da5d570fe0b05030466eeb3f902a58cf2e8e1ca058bf6c9c596f632f
+  checksum: 10c0/ee16ac4c7b2a60b1f42a2cdaee22b005bd4453eb2d0588b8a4939718997ae269da717434da5d570fe0b05030466eeb3f902a58cf2e8e1ca058bf6c9c596f632f
   languageName: node
   linkType: hard
 
@@ -14033,7 +14033,7 @@ __metadata:
   resolution: "redux-immutable@npm:4.0.0"
   peerDependencies:
     immutable: ^3.8.1 || ^4.0.0-rc.1
-  checksum: c706c9f72a1fbce92d54ab9117ab641b6d7ee69f2860ec6de827dbed5bed918d4677a0895e6564bb59011202bb5e639cf69f4e2d2d14086053b32e5c4e35f512
+  checksum: 10c0/c706c9f72a1fbce92d54ab9117ab641b6d7ee69f2860ec6de827dbed5bed918d4677a0895e6564bb59011202bb5e639cf69f4e2d2d14086053b32e5c4e35f512
   languageName: node
   linkType: hard
 
@@ -14042,7 +14042,7 @@ __metadata:
   resolution: "redux-thunk@npm:3.1.0"
   peerDependencies:
     redux: ^5.0.0
-  checksum: 21557f6a30e1b2e3e470933247e51749be7f1d5a9620069a3125778675ce4d178d84bdee3e2a0903427a5c429e3aeec6d4df57897faf93eb83455bc1ef7b66fd
+  checksum: 10c0/21557f6a30e1b2e3e470933247e51749be7f1d5a9620069a3125778675ce4d178d84bdee3e2a0903427a5c429e3aeec6d4df57897faf93eb83455bc1ef7b66fd
   languageName: node
   linkType: hard
 
@@ -14051,14 +14051,14 @@ __metadata:
   resolution: "redux@npm:4.2.1"
   dependencies:
     "@babel/runtime": "npm:^7.9.2"
-  checksum: 136d98b3d5dbed1cd6279c8c18a6a74c416db98b8a432a46836bdd668475de6279a2d4fd9d1363f63904e00f0678a8a3e7fa532c897163340baf1e71bb42c742
+  checksum: 10c0/136d98b3d5dbed1cd6279c8c18a6a74c416db98b8a432a46836bdd668475de6279a2d4fd9d1363f63904e00f0678a8a3e7fa532c897163340baf1e71bb42c742
   languageName: node
   linkType: hard
 
 "redux@npm:^5.0.1":
   version: 5.0.1
   resolution: "redux@npm:5.0.1"
-  checksum: b10c28357194f38e7d53b760ed5e64faa317cc63de1fb95bc5d9e127fab956392344368c357b8e7a9bedb0c35b111e7efa522210cfdc3b3c75e5074718e9069c
+  checksum: 10c0/b10c28357194f38e7d53b760ed5e64faa317cc63de1fb95bc5d9e127fab956392344368c357b8e7a9bedb0c35b111e7efa522210cfdc3b3c75e5074718e9069c
   languageName: node
   linkType: hard
 
@@ -14072,7 +14072,7 @@ __metadata:
     get-intrinsic: "npm:^1.2.1"
     globalthis: "npm:^1.0.3"
     which-builtin-type: "npm:^1.1.3"
-  checksum: 02104cdd22658b637efe6b1df73658edab539268347327c8250a72d0cb273dcdf280c284e2d94155d22601d022d16be1a816a8616d679e447cbcbde9860d15cb
+  checksum: 10c0/02104cdd22658b637efe6b1df73658edab539268347327c8250a72d0cb273dcdf280c284e2d94155d22601d022d16be1a816a8616d679e447cbcbde9860d15cb
   languageName: node
   linkType: hard
 
@@ -14081,35 +14081,35 @@ __metadata:
   resolution: "regenerate-unicode-properties@npm:10.1.1"
   dependencies:
     regenerate: "npm:^1.4.2"
-  checksum: 89adb5ee5ba081380c78f9057c02e156a8181969f6fcca72451efc45612e0c3df767b4333f8d8479c274d9c6fe52ec4854f0d8a22ef95dccbe87da8e5f2ac77d
+  checksum: 10c0/89adb5ee5ba081380c78f9057c02e156a8181969f6fcca72451efc45612e0c3df767b4333f8d8479c274d9c6fe52ec4854f0d8a22ef95dccbe87da8e5f2ac77d
   languageName: node
   linkType: hard
 
 "regenerate@npm:^1.4.2":
   version: 1.4.2
   resolution: "regenerate@npm:1.4.2"
-  checksum: f73c9eba5d398c818edc71d1c6979eaa05af7a808682749dd079f8df2a6d91a9b913db216c2c9b03e0a8ba2bba8701244a93f45211afbff691c32c7b275db1b8
+  checksum: 10c0/f73c9eba5d398c818edc71d1c6979eaa05af7a808682749dd079f8df2a6d91a9b913db216c2c9b03e0a8ba2bba8701244a93f45211afbff691c32c7b275db1b8
   languageName: node
   linkType: hard
 
 "regenerator-runtime@npm:^0.12.0":
   version: 0.12.1
   resolution: "regenerator-runtime@npm:0.12.1"
-  checksum: dbefbb38f5d6d55261aec1182d7c97ac93f2eec6ef9c756d9656eb5152f5cb3f8d873df020ddb4a3a8126c2ac1a3c2e534413cffe18d8f89b1c2a480a0a38601
+  checksum: 10c0/dbefbb38f5d6d55261aec1182d7c97ac93f2eec6ef9c756d9656eb5152f5cb3f8d873df020ddb4a3a8126c2ac1a3c2e534413cffe18d8f89b1c2a480a0a38601
   languageName: node
   linkType: hard
 
 "regenerator-runtime@npm:^0.13.3":
   version: 0.13.11
   resolution: "regenerator-runtime@npm:0.13.11"
-  checksum: 12b069dc774001fbb0014f6a28f11c09ebfe3c0d984d88c9bced77fdb6fedbacbca434d24da9ae9371bfbf23f754869307fb51a4c98a8b8b18e5ef748677ca24
+  checksum: 10c0/12b069dc774001fbb0014f6a28f11c09ebfe3c0d984d88c9bced77fdb6fedbacbca434d24da9ae9371bfbf23f754869307fb51a4c98a8b8b18e5ef748677ca24
   languageName: node
   linkType: hard
 
 "regenerator-runtime@npm:^0.14.0":
   version: 0.14.1
   resolution: "regenerator-runtime@npm:0.14.1"
-  checksum: 1b16eb2c4bceb1665c89de70dcb64126a22bc8eb958feef3cd68fe11ac6d2a4899b5cd1b80b0774c7c03591dc57d16631a7f69d2daa2ec98100e2f29f7ec4cc4
+  checksum: 10c0/1b16eb2c4bceb1665c89de70dcb64126a22bc8eb958feef3cd68fe11ac6d2a4899b5cd1b80b0774c7c03591dc57d16631a7f69d2daa2ec98100e2f29f7ec4cc4
   languageName: node
   linkType: hard
 
@@ -14118,7 +14118,7 @@ __metadata:
   resolution: "regenerator-transform@npm:0.15.2"
   dependencies:
     "@babel/runtime": "npm:^7.8.4"
-  checksum: 7cfe6931ec793269701994a93bab89c0cc95379191fad866270a7fea2adfec67ea62bb5b374db77058b60ba4509319d9b608664d0d288bd9989ca8dbd08fae90
+  checksum: 10c0/7cfe6931ec793269701994a93bab89c0cc95379191fad866270a7fea2adfec67ea62bb5b374db77058b60ba4509319d9b608664d0d288bd9989ca8dbd08fae90
   languageName: node
   linkType: hard
 
@@ -14128,7 +14128,7 @@ __metadata:
   dependencies:
     extend-shallow: "npm:^3.0.2"
     safe-regex: "npm:^1.1.0"
-  checksum: a0f8d6045f63b22e9759db10e248369c443b41cedd7dba0922d002b66c2734bc2aef0d98c4d45772d1f756245f4c5203856b88b9624bba2a58708858a8d485d6
+  checksum: 10c0/a0f8d6045f63b22e9759db10e248369c443b41cedd7dba0922d002b66c2734bc2aef0d98c4d45772d1f756245f4c5203856b88b9624bba2a58708858a8d485d6
   languageName: node
   linkType: hard
 
@@ -14139,7 +14139,7 @@ __metadata:
     call-bind: "npm:^1.0.2"
     define-properties: "npm:^1.2.0"
     set-function-name: "npm:^2.0.0"
-  checksum: 1de7d214c0a726c7c874a7023e47b0e27b9f7fdb64175bfe1861189de1704aaeca05c3d26c35aa375432289b99946f3cf86651a92a8f7601b90d8c226a23bcd8
+  checksum: 10c0/1de7d214c0a726c7c874a7023e47b0e27b9f7fdb64175bfe1861189de1704aaeca05c3d26c35aa375432289b99946f3cf86651a92a8f7601b90d8c226a23bcd8
   languageName: node
   linkType: hard
 
@@ -14153,7 +14153,7 @@ __metadata:
     regjsparser: "npm:^0.9.1"
     unicode-match-property-ecmascript: "npm:^2.0.0"
     unicode-match-property-value-ecmascript: "npm:^2.1.0"
-  checksum: 7945d5ab10c8bbed3ca383d4274687ea825aee4ab93a9c51c6e31e1365edd5ea807f6908f800ba017b66c462944ba68011164e7055207747ab651f8111ef3770
+  checksum: 10c0/7945d5ab10c8bbed3ca383d4274687ea825aee4ab93a9c51c6e31e1365edd5ea807f6908f800ba017b66c462944ba68011164e7055207747ab651f8111ef3770
   languageName: node
   linkType: hard
 
@@ -14164,77 +14164,77 @@ __metadata:
     jsesc: "npm:~0.5.0"
   bin:
     regjsparser: bin/parser
-  checksum: fe44fcf19a99fe4f92809b0b6179530e5ef313ff7f87df143b08ce9a2eb3c4b6189b43735d645be6e8f4033bfb015ed1ca54f0583bc7561bed53fd379feb8225
+  checksum: 10c0/fe44fcf19a99fe4f92809b0b6179530e5ef313ff7f87df143b08ce9a2eb3c4b6189b43735d645be6e8f4033bfb015ed1ca54f0583bc7561bed53fd379feb8225
   languageName: node
   linkType: hard
 
 "remove-trailing-separator@npm:^1.0.1":
   version: 1.1.0
   resolution: "remove-trailing-separator@npm:1.1.0"
-  checksum: 3568f9f8f5af3737b4aee9e6e1e8ec4be65a92da9cb27f989e0893714d50aa95ed2ff02d40d1fa35e1b1a234dc9c2437050ef356704a3999feaca6667d9e9bfc
+  checksum: 10c0/3568f9f8f5af3737b4aee9e6e1e8ec4be65a92da9cb27f989e0893714d50aa95ed2ff02d40d1fa35e1b1a234dc9c2437050ef356704a3999feaca6667d9e9bfc
   languageName: node
   linkType: hard
 
 "repeat-element@npm:^1.1.2":
   version: 1.1.4
   resolution: "repeat-element@npm:1.1.4"
-  checksum: 81aa8d82bc845780803ef52df3533fa399974b99df571d0bb86e91f0ffca9ee4b9c4e8e5e72af087938cc28d2aef93d106a6d01da685d72ce96455b90a9f9f69
+  checksum: 10c0/81aa8d82bc845780803ef52df3533fa399974b99df571d0bb86e91f0ffca9ee4b9c4e8e5e72af087938cc28d2aef93d106a6d01da685d72ce96455b90a9f9f69
   languageName: node
   linkType: hard
 
 "repeat-string@npm:^1.6.1":
   version: 1.6.1
   resolution: "repeat-string@npm:1.6.1"
-  checksum: 87fa21bfdb2fbdedc44b9a5b118b7c1239bdd2c2c1e42742ef9119b7d412a5137a1d23f1a83dc6bb686f4f27429ac6f542e3d923090b44181bafa41e8ac0174d
+  checksum: 10c0/87fa21bfdb2fbdedc44b9a5b118b7c1239bdd2c2c1e42742ef9119b7d412a5137a1d23f1a83dc6bb686f4f27429ac6f542e3d923090b44181bafa41e8ac0174d
   languageName: node
   linkType: hard
 
 "requestidlecallback@npm:^0.3.0":
   version: 0.3.0
   resolution: "requestidlecallback@npm:0.3.0"
-  checksum: 68a2ff3154788643ccf96436cfaf8ad5bbe2f4d3f4b4d7858ec74681bf7d6a487d17df6a238130ff1e73d0a4a85bdc44b5f945eb79ef7d5552e23fc6288e795f
+  checksum: 10c0/68a2ff3154788643ccf96436cfaf8ad5bbe2f4d3f4b4d7858ec74681bf7d6a487d17df6a238130ff1e73d0a4a85bdc44b5f945eb79ef7d5552e23fc6288e795f
   languageName: node
   linkType: hard
 
 "require-directory@npm:^2.1.1":
   version: 2.1.1
   resolution: "require-directory@npm:2.1.1"
-  checksum: 83aa76a7bc1531f68d92c75a2ca2f54f1b01463cb566cf3fbc787d0de8be30c9dbc211d1d46be3497dac5785fe296f2dd11d531945ac29730643357978966e99
+  checksum: 10c0/83aa76a7bc1531f68d92c75a2ca2f54f1b01463cb566cf3fbc787d0de8be30c9dbc211d1d46be3497dac5785fe296f2dd11d531945ac29730643357978966e99
   languageName: node
   linkType: hard
 
 "require-from-string@npm:^2.0.2":
   version: 2.0.2
   resolution: "require-from-string@npm:2.0.2"
-  checksum: aaa267e0c5b022fc5fd4eef49d8285086b15f2a1c54b28240fdf03599cbd9c26049fee3eab894f2e1f6ca65e513b030a7c264201e3f005601e80c49fb2937ce2
+  checksum: 10c0/aaa267e0c5b022fc5fd4eef49d8285086b15f2a1c54b28240fdf03599cbd9c26049fee3eab894f2e1f6ca65e513b030a7c264201e3f005601e80c49fb2937ce2
   languageName: node
   linkType: hard
 
 "require-main-filename@npm:^2.0.0":
   version: 2.0.0
   resolution: "require-main-filename@npm:2.0.0"
-  checksum: db91467d9ead311b4111cbd73a4e67fa7820daed2989a32f7023785a2659008c6d119752d9c4ac011ae07e537eb86523adff99804c5fdb39cd3a017f9b401bb6
+  checksum: 10c0/db91467d9ead311b4111cbd73a4e67fa7820daed2989a32f7023785a2659008c6d119752d9c4ac011ae07e537eb86523adff99804c5fdb39cd3a017f9b401bb6
   languageName: node
   linkType: hard
 
 "require-package-name@npm:^2.0.1":
   version: 2.0.1
   resolution: "require-package-name@npm:2.0.1"
-  checksum: 2da87caecdd2157489deaf8add246696dc9cbcebd89ef49b062ad1183594b979f96f8194d4b0f5447a92ad72d39b9fae2df38ec5b9ecef9c7c0157af38eeecbc
+  checksum: 10c0/2da87caecdd2157489deaf8add246696dc9cbcebd89ef49b062ad1183594b979f96f8194d4b0f5447a92ad72d39b9fae2df38ec5b9ecef9c7c0157af38eeecbc
   languageName: node
   linkType: hard
 
 "requires-port@npm:^1.0.0":
   version: 1.0.0
   resolution: "requires-port@npm:1.0.0"
-  checksum: b2bfdd09db16c082c4326e573a82c0771daaf7b53b9ce8ad60ea46aa6e30aaf475fe9b164800b89f93b748d2c234d8abff945d2551ba47bf5698e04cd7713267
+  checksum: 10c0/b2bfdd09db16c082c4326e573a82c0771daaf7b53b9ce8ad60ea46aa6e30aaf475fe9b164800b89f93b748d2c234d8abff945d2551ba47bf5698e04cd7713267
   languageName: node
   linkType: hard
 
 "reselect@npm:^5.0.1":
   version: 5.0.1
   resolution: "reselect@npm:5.0.1"
-  checksum: 0724b4555cd6411849de334a75177780f127af849eb71c4b709966d07ade8090d125c0c926dc6cf936866d23ebadda6aad1da93cd8340525323b889f25d56d51
+  checksum: 10c0/0724b4555cd6411849de334a75177780f127af849eb71c4b709966d07ade8090d125c0c926dc6cf936866d23ebadda6aad1da93cd8340525323b889f25d56d51
   languageName: node
   linkType: hard
 
@@ -14243,7 +14243,7 @@ __metadata:
   resolution: "resolve-cwd@npm:2.0.0"
   dependencies:
     resolve-from: "npm:^3.0.0"
-  checksum: 10c3a7ffeb55af51206f5ca8696ed833376179399336ce8e9df8f76c044c13bccd0e9a3148708daf272193179a581ddb076e203eaa71efa0ad341b243174ca12
+  checksum: 10c0/10c3a7ffeb55af51206f5ca8696ed833376179399336ce8e9df8f76c044c13bccd0e9a3148708daf272193179a581ddb076e203eaa71efa0ad341b243174ca12
   languageName: node
   linkType: hard
 
@@ -14252,7 +14252,7 @@ __metadata:
   resolution: "resolve-cwd@npm:3.0.0"
   dependencies:
     resolve-from: "npm:^5.0.0"
-  checksum: e608a3ebd15356264653c32d7ecbc8fd702f94c6703ea4ac2fb81d9c359180cba0ae2e6b71faa446631ed6145454d5a56b227efc33a2d40638ac13f8beb20ee4
+  checksum: 10c0/e608a3ebd15356264653c32d7ecbc8fd702f94c6703ea4ac2fb81d9c359180cba0ae2e6b71faa446631ed6145454d5a56b227efc33a2d40638ac13f8beb20ee4
   languageName: node
   linkType: hard
 
@@ -14262,56 +14262,56 @@ __metadata:
   dependencies:
     expand-tilde: "npm:^2.0.0"
     global-modules: "npm:^1.0.0"
-  checksum: 8197ed13e4a51d9cd786ef6a09fc83450db016abe7ef3311ca39389b3e508d77c26fe0cf0483a9b407b8caa2764bb5ccc52cf6a017ded91492a416475a56066f
+  checksum: 10c0/8197ed13e4a51d9cd786ef6a09fc83450db016abe7ef3311ca39389b3e508d77c26fe0cf0483a9b407b8caa2764bb5ccc52cf6a017ded91492a416475a56066f
   languageName: node
   linkType: hard
 
 "resolve-from@npm:^3.0.0":
   version: 3.0.0
   resolution: "resolve-from@npm:3.0.0"
-  checksum: 24affcf8e81f4c62f0dcabc774afe0e19c1f38e34e43daac0ddb409d79435fc3037f612b0cc129178b8c220442c3babd673e88e870d27215c99454566e770ebc
+  checksum: 10c0/24affcf8e81f4c62f0dcabc774afe0e19c1f38e34e43daac0ddb409d79435fc3037f612b0cc129178b8c220442c3babd673e88e870d27215c99454566e770ebc
   languageName: node
   linkType: hard
 
 "resolve-from@npm:^4.0.0":
   version: 4.0.0
   resolution: "resolve-from@npm:4.0.0"
-  checksum: 8408eec31a3112ef96e3746c37be7d64020cda07c03a920f5024e77290a218ea758b26ca9529fd7b1ad283947f34b2291c1c0f6aa0ed34acfdda9c6014c8d190
+  checksum: 10c0/8408eec31a3112ef96e3746c37be7d64020cda07c03a920f5024e77290a218ea758b26ca9529fd7b1ad283947f34b2291c1c0f6aa0ed34acfdda9c6014c8d190
   languageName: node
   linkType: hard
 
 "resolve-from@npm:^5.0.0":
   version: 5.0.0
   resolution: "resolve-from@npm:5.0.0"
-  checksum: b21cb7f1fb746de8107b9febab60095187781137fd803e6a59a76d421444b1531b641bba5857f5dc011974d8a5c635d61cec49e6bd3b7fc20e01f0fafc4efbf2
+  checksum: 10c0/b21cb7f1fb746de8107b9febab60095187781137fd803e6a59a76d421444b1531b641bba5857f5dc011974d8a5c635d61cec49e6bd3b7fc20e01f0fafc4efbf2
   languageName: node
   linkType: hard
 
 "resolve-pathname@npm:^3.0.0":
   version: 3.0.0
   resolution: "resolve-pathname@npm:3.0.0"
-  checksum: c6ec49b670dc35b9a303c47fa83ba9348a71e92d64a4c4bb85e1b659a29b407aa1ac1cb14a9b5b502982132ca77482bd80534bca147439d66880d35a137fe723
+  checksum: 10c0/c6ec49b670dc35b9a303c47fa83ba9348a71e92d64a4c4bb85e1b659a29b407aa1ac1cb14a9b5b502982132ca77482bd80534bca147439d66880d35a137fe723
   languageName: node
   linkType: hard
 
 "resolve-pkg-maps@npm:^1.0.0":
   version: 1.0.0
   resolution: "resolve-pkg-maps@npm:1.0.0"
-  checksum: fb8f7bbe2ca281a73b7ef423a1cbc786fb244bd7a95cbe5c3fba25b27d327150beca8ba02f622baea65919a57e061eb5005204daa5f93ed590d9b77463a567ab
+  checksum: 10c0/fb8f7bbe2ca281a73b7ef423a1cbc786fb244bd7a95cbe5c3fba25b27d327150beca8ba02f622baea65919a57e061eb5005204daa5f93ed590d9b77463a567ab
   languageName: node
   linkType: hard
 
 "resolve-url@npm:^0.2.1":
   version: 0.2.1
   resolution: "resolve-url@npm:0.2.1"
-  checksum: c285182cfcddea13a12af92129ce0569be27fb0074ffaefbd3ba3da2eac2acecdfc996d435c4982a9fa2b4708640e52837c9153a5ab9255886a00b0b9e8d2a54
+  checksum: 10c0/c285182cfcddea13a12af92129ce0569be27fb0074ffaefbd3ba3da2eac2acecdfc996d435c4982a9fa2b4708640e52837c9153a5ab9255886a00b0b9e8d2a54
   languageName: node
   linkType: hard
 
 "resolve.exports@npm:^2.0.0":
   version: 2.0.2
   resolution: "resolve.exports@npm:2.0.2"
-  checksum: cc4cffdc25447cf34730f388dca5021156ba9302a3bad3d7f168e790dc74b2827dff603f1bc6ad3d299bac269828dca96dd77e036dc9fba6a2a1807c47ab5c98
+  checksum: 10c0/cc4cffdc25447cf34730f388dca5021156ba9302a3bad3d7f168e790dc74b2827dff603f1bc6ad3d299bac269828dca96dd77e036dc9fba6a2a1807c47ab5c98
   languageName: node
   linkType: hard
 
@@ -14324,7 +14324,7 @@ __metadata:
     supports-preserve-symlinks-flag: "npm:^1.0.0"
   bin:
     resolve: bin/resolve
-  checksum: 07e179f4375e1fd072cfb72ad66d78547f86e6196c4014b31cb0b8bb1db5f7ca871f922d08da0fbc05b94e9fd42206f819648fa3b5b873ebbc8e1dc68fec433a
+  checksum: 10c0/07e179f4375e1fd072cfb72ad66d78547f86e6196c4014b31cb0b8bb1db5f7ca871f922d08da0fbc05b94e9fd42206f819648fa3b5b873ebbc8e1dc68fec433a
   languageName: node
   linkType: hard
 
@@ -14337,7 +14337,7 @@ __metadata:
     supports-preserve-symlinks-flag: "npm:^1.0.0"
   bin:
     resolve: bin/resolve
-  checksum: 1de92669e7c46cfe125294c66d5405e13288bb87b97e9bdab71693ceebbcc0255c789bde30e2834265257d330d8ff57414d7d88e3097d8f69951f3ce978bf045
+  checksum: 10c0/1de92669e7c46cfe125294c66d5405e13288bb87b97e9bdab71693ceebbcc0255c789bde30e2834265257d330d8ff57414d7d88e3097d8f69951f3ce978bf045
   languageName: node
   linkType: hard
 
@@ -14350,7 +14350,7 @@ __metadata:
     supports-preserve-symlinks-flag: "npm:^1.0.0"
   bin:
     resolve: bin/resolve
-  checksum: 0446f024439cd2e50c6c8fa8ba77eaa8370b4180f401a96abf3d1ebc770ac51c1955e12764cde449fde3fff480a61f84388e3505ecdbab778f4bef5f8212c729
+  checksum: 10c0/0446f024439cd2e50c6c8fa8ba77eaa8370b4180f401a96abf3d1ebc770ac51c1955e12764cde449fde3fff480a61f84388e3505ecdbab778f4bef5f8212c729
   languageName: node
   linkType: hard
 
@@ -14363,7 +14363,7 @@ __metadata:
     supports-preserve-symlinks-flag: "npm:^1.0.0"
   bin:
     resolve: bin/resolve
-  checksum: ed2bb51d616b9cd30fe85cf49f7a2240094d9fa01a221d361918462be81f683d1855b7f192391d2ab5325245b42464ca59690db5bd5dad0a326fc0de5974dd10
+  checksum: 10c0/ed2bb51d616b9cd30fe85cf49f7a2240094d9fa01a221d361918462be81f683d1855b7f192391d2ab5325245b42464ca59690db5bd5dad0a326fc0de5974dd10
   languageName: node
   linkType: hard
 
@@ -14373,35 +14373,35 @@ __metadata:
   dependencies:
     onetime: "npm:^5.1.0"
     signal-exit: "npm:^3.0.2"
-  checksum: 6f7da8c5e422ac26aa38354870b1afac09963572cf2879443540449068cb43476e9cbccf6f8de3e0171e0d6f7f533c2bc1a0a008003c9a525bbc098e89041318
+  checksum: 10c0/6f7da8c5e422ac26aa38354870b1afac09963572cf2879443540449068cb43476e9cbccf6f8de3e0171e0d6f7f533c2bc1a0a008003c9a525bbc098e89041318
   languageName: node
   linkType: hard
 
 "ret@npm:~0.1.10":
   version: 0.1.15
   resolution: "ret@npm:0.1.15"
-  checksum: 01f77cad0f7ea4f955852c03d66982609893edc1240c0c964b4c9251d0f9fb6705150634060d169939b096d3b77f4c84d6b6098a5b5d340160898c8581f1f63f
+  checksum: 10c0/01f77cad0f7ea4f955852c03d66982609893edc1240c0c964b4c9251d0f9fb6705150634060d169939b096d3b77f4c84d6b6098a5b5d340160898c8581f1f63f
   languageName: node
   linkType: hard
 
 "retry@npm:^0.12.0":
   version: 0.12.0
   resolution: "retry@npm:0.12.0"
-  checksum: 59933e8501727ba13ad73ef4a04d5280b3717fd650408460c987392efe9d7be2040778ed8ebe933c5cbd63da3dcc37919c141ef8af0a54a6e4fca5a2af177bfe
+  checksum: 10c0/59933e8501727ba13ad73ef4a04d5280b3717fd650408460c987392efe9d7be2040778ed8ebe933c5cbd63da3dcc37919c141ef8af0a54a6e4fca5a2af177bfe
   languageName: node
   linkType: hard
 
 "reusify@npm:^1.0.4":
   version: 1.0.4
   resolution: "reusify@npm:1.0.4"
-  checksum: c19ef26e4e188f408922c46f7ff480d38e8dfc55d448310dfb518736b23ed2c4f547fb64a6ed5bdba92cd7e7ddc889d36ff78f794816d5e71498d645ef476107
+  checksum: 10c0/c19ef26e4e188f408922c46f7ff480d38e8dfc55d448310dfb518736b23ed2c4f547fb64a6ed5bdba92cd7e7ddc889d36ff78f794816d5e71498d645ef476107
   languageName: node
   linkType: hard
 
 "rfdc@npm:^1.3.0":
   version: 1.3.0
   resolution: "rfdc@npm:1.3.0"
-  checksum: a17fd7b81f42c7ae4cb932abd7b2f677b04cc462a03619fb46945ae1ccae17c3bc87c020ffdde1751cbfa8549860a2883486fdcabc9b9de3f3108af32b69a667
+  checksum: 10c0/a17fd7b81f42c7ae4cb932abd7b2f677b04cc462a03619fb46945ae1ccae17c3bc87c020ffdde1751cbfa8549860a2883486fdcabc9b9de3f3108af32b69a667
   languageName: node
   linkType: hard
 
@@ -14412,7 +14412,7 @@ __metadata:
     glob: "npm:^7.1.3"
   bin:
     rimraf: ./bin.js
-  checksum: 4eef73d406c6940927479a3a9dee551e14a54faf54b31ef861250ac815172bade86cc6f7d64a4dc5e98b65e4b18a2e1c9ff3b68d296be0c748413f092bb0dd40
+  checksum: 10c0/4eef73d406c6940927479a3a9dee551e14a54faf54b31ef861250ac815172bade86cc6f7d64a4dc5e98b65e4b18a2e1c9ff3b68d296be0c748413f092bb0dd40
   languageName: node
   linkType: hard
 
@@ -14423,7 +14423,7 @@ __metadata:
     glob: "npm:^7.1.3"
   bin:
     rimraf: bin.js
-  checksum: 9cb7757acb489bd83757ba1a274ab545eafd75598a9d817e0c3f8b164238dd90eba50d6b848bd4dcc5f3040912e882dc7ba71653e35af660d77b25c381d402e8
+  checksum: 10c0/9cb7757acb489bd83757ba1a274ab545eafd75598a9d817e0c3f8b164238dd90eba50d6b848bd4dcc5f3040912e882dc7ba71653e35af660d77b25c381d402e8
   languageName: node
   linkType: hard
 
@@ -14434,7 +14434,7 @@ __metadata:
     glob: "npm:^10.3.7"
   bin:
     rimraf: dist/esm/bin.mjs
-  checksum: d50dbe724f33835decd88395b25ed35995077c60a50ae78ded06e0185418914e555817aad1b4243edbff2254548c2f6ad6f70cc850040bebb4da9e8cc016f586
+  checksum: 10c0/d50dbe724f33835decd88395b25ed35995077c60a50ae78ded06e0185418914e555817aad1b4243edbff2254548c2f6ad6f70cc850040bebb4da9e8cc016f586
   languageName: node
   linkType: hard
 
@@ -14444,7 +14444,7 @@ __metadata:
   dependencies:
     hash-base: "npm:^3.0.0"
     inherits: "npm:^2.0.1"
-  checksum: f6f0df78817e78287c766687aed4d5accbebc308a8e7e673fb085b9977473c1f139f0c5335d353f172a915bb288098430755d2ad3c4f30612f4dd0c901cd2c3a
+  checksum: 10c0/f6f0df78817e78287c766687aed4d5accbebc308a8e7e673fb085b9977473c1f139f0c5335d353f172a915bb288098430755d2ad3c4f30612f4dd0c901cd2c3a
   languageName: node
   linkType: hard
 
@@ -14458,7 +14458,7 @@ __metadata:
     terser: "npm:^5.0.0"
   peerDependencies:
     rollup: ^2.0.0
-  checksum: f79b851c6f7b06555d3a8ce7a4e32abd2b7cb8318e89fb8db73e662fa6e3af1a59920e881d111efc65a7437fd9582b61b1f4859b6fd839ba948616829d92432d
+  checksum: 10c0/f79b851c6f7b06555d3a8ce7a4e32abd2b7cb8318e89fb8db73e662fa6e3af1a59920e881d111efc65a7437fd9582b61b1f4859b6fd839ba948616829d92432d
   languageName: node
   linkType: hard
 
@@ -14472,14 +14472,14 @@ __metadata:
       optional: true
   bin:
     rollup: dist/bin/rollup
-  checksum: 421418687f5dcd7324f4387f203c6bfc7118b7ace789e30f5da022471c43e037a76f5fd93837052754eeeae798a4fb266ac05ccee1e594406d912a59af98dde9
+  checksum: 10c0/421418687f5dcd7324f4387f203c6bfc7118b7ace789e30f5da022471c43e037a76f5fd93837052754eeeae798a4fb266ac05ccee1e594406d912a59af98dde9
   languageName: node
   linkType: hard
 
 "rrweb-cssom@npm:^0.6.0":
   version: 0.6.0
   resolution: "rrweb-cssom@npm:0.6.0"
-  checksum: 3d9d90d53c2349ea9c8509c2690df5a4ef930c9cf8242aeb9425d4046f09d712bb01047e00da0e1c1dab5db35740b3d78fd45c3e7272f75d3724a563f27c30a3
+  checksum: 10c0/3d9d90d53c2349ea9c8509c2690df5a4ef930c9cf8242aeb9425d4046f09d712bb01047e00da0e1c1dab5db35740b3d78fd45c3e7272f75d3724a563f27c30a3
   languageName: node
   linkType: hard
 
@@ -14488,7 +14488,7 @@ __metadata:
   resolution: "run-applescript@npm:5.0.0"
   dependencies:
     execa: "npm:^5.0.0"
-  checksum: f9977db5770929f3f0db434b8e6aa266498c70dec913c84320c0a06add510cf44e3a048c44da088abee312006f9cbf572fd065cdc8f15d7682afda8755f4114c
+  checksum: 10c0/f9977db5770929f3f0db434b8e6aa266498c70dec913c84320c0a06add510cf44e3a048c44da088abee312006f9cbf572fd065cdc8f15d7682afda8755f4114c
   languageName: node
   linkType: hard
 
@@ -14497,7 +14497,7 @@ __metadata:
   resolution: "run-parallel@npm:1.2.0"
   dependencies:
     queue-microtask: "npm:^1.2.2"
-  checksum: 200b5ab25b5b8b7113f9901bfe3afc347e19bb7475b267d55ad0eb86a62a46d77510cb0f232507c9e5d497ebda569a08a9867d0d14f57a82ad5564d991588b39
+  checksum: 10c0/200b5ab25b5b8b7113f9901bfe3afc347e19bb7475b267d55ad0eb86a62a46d77510cb0f232507c9e5d497ebda569a08a9867d0d14f57a82ad5564d991588b39
   languageName: node
   linkType: hard
 
@@ -14509,21 +14509,21 @@ __metadata:
     get-intrinsic: "npm:^1.2.1"
     has-symbols: "npm:^1.0.3"
     isarray: "npm:^2.0.5"
-  checksum: 4b15ce5fce5ce4d7e744a63592cded88d2f27806ed229eadb2e42629cbcd40e770f7478608e75f455e7fe341acd8c0a01bdcd7146b10645ea7411c5e3c1d1dd8
+  checksum: 10c0/4b15ce5fce5ce4d7e744a63592cded88d2f27806ed229eadb2e42629cbcd40e770f7478608e75f455e7fe341acd8c0a01bdcd7146b10645ea7411c5e3c1d1dd8
   languageName: node
   linkType: hard
 
 "safe-buffer@npm:5.1.2, safe-buffer@npm:~5.1.0, safe-buffer@npm:~5.1.1":
   version: 5.1.2
   resolution: "safe-buffer@npm:5.1.2"
-  checksum: 780ba6b5d99cc9a40f7b951d47152297d0e260f0df01472a1b99d4889679a4b94a13d644f7dbc4f022572f09ae9005fa2fbb93bbbd83643316f365a3e9a45b21
+  checksum: 10c0/780ba6b5d99cc9a40f7b951d47152297d0e260f0df01472a1b99d4889679a4b94a13d644f7dbc4f022572f09ae9005fa2fbb93bbbd83643316f365a3e9a45b21
   languageName: node
   linkType: hard
 
 "safe-buffer@npm:5.2.1, safe-buffer@npm:>=5.1.0, safe-buffer@npm:^5.0.1, safe-buffer@npm:^5.1.0, safe-buffer@npm:^5.1.1, safe-buffer@npm:^5.1.2, safe-buffer@npm:^5.2.0, safe-buffer@npm:~5.2.0":
   version: 5.2.1
   resolution: "safe-buffer@npm:5.2.1"
-  checksum: 6501914237c0a86e9675d4e51d89ca3c21ffd6a31642efeba25ad65720bce6921c9e7e974e5be91a786b25aa058b5303285d3c15dbabf983a919f5f630d349f3
+  checksum: 10c0/6501914237c0a86e9675d4e51d89ca3c21ffd6a31642efeba25ad65720bce6921c9e7e974e5be91a786b25aa058b5303285d3c15dbabf983a919f5f630d349f3
   languageName: node
   linkType: hard
 
@@ -14534,7 +14534,7 @@ __metadata:
     call-bind: "npm:^1.0.2"
     get-intrinsic: "npm:^1.1.3"
     is-regex: "npm:^1.1.4"
-  checksum: 14a81a7e683f97b2d6e9c8be61fddcf8ed7a02f4e64a825515f96bb1738eb007145359313741d2704d28b55b703a0f6300c749dde7c1dbc13952a2b85048ede2
+  checksum: 10c0/14a81a7e683f97b2d6e9c8be61fddcf8ed7a02f4e64a825515f96bb1738eb007145359313741d2704d28b55b703a0f6300c749dde7c1dbc13952a2b85048ede2
   languageName: node
   linkType: hard
 
@@ -14543,21 +14543,21 @@ __metadata:
   resolution: "safe-regex@npm:1.1.0"
   dependencies:
     ret: "npm:~0.1.10"
-  checksum: 547d58aa5184cbef368fd5ed5f28d20f911614748c5da6b35f53fd6626396707587251e6e3d1e3010fd3ff1212e413841b8825eaa5f317017ca62a30899af31a
+  checksum: 10c0/547d58aa5184cbef368fd5ed5f28d20f911614748c5da6b35f53fd6626396707587251e6e3d1e3010fd3ff1212e413841b8825eaa5f317017ca62a30899af31a
   languageName: node
   linkType: hard
 
 "safe-stable-stringify@npm:^2.3.1":
   version: 2.4.3
   resolution: "safe-stable-stringify@npm:2.4.3"
-  checksum: 81dede06b8f2ae794efd868b1e281e3c9000e57b39801c6c162267eb9efda17bd7a9eafa7379e1f1cacd528d4ced7c80d7460ad26f62ada7c9e01dec61b2e768
+  checksum: 10c0/81dede06b8f2ae794efd868b1e281e3c9000e57b39801c6c162267eb9efda17bd7a9eafa7379e1f1cacd528d4ced7c80d7460ad26f62ada7c9e01dec61b2e768
   languageName: node
   linkType: hard
 
 "safer-buffer@npm:>= 2.1.2 < 3, safer-buffer@npm:>= 2.1.2 < 3.0.0, safer-buffer@npm:^2.1.0":
   version: 2.1.2
   resolution: "safer-buffer@npm:2.1.2"
-  checksum: 7e3c8b2e88a1841c9671094bbaeebd94448111dd90a81a1f606f3f67708a6ec57763b3b47f06da09fc6054193e0e6709e77325415dc8422b04497a8070fa02d4
+  checksum: 10c0/7e3c8b2e88a1841c9671094bbaeebd94448111dd90a81a1f606f3f67708a6ec57763b3b47f06da09fc6054193e0e6709e77325415dc8422b04497a8070fa02d4
   languageName: node
   linkType: hard
 
@@ -14582,7 +14582,7 @@ __metadata:
       optional: true
     sass:
       optional: true
-  checksum: 5ba4a83459fbb50e21d4f4b1b59baf1ddf8dd404099b6d1f2ec887c6903659e505879915030dd9efb1c6dd5fde2d515a19f418487b73d1cc59f6aad60c79bcf5
+  checksum: 10c0/5ba4a83459fbb50e21d4f4b1b59baf1ddf8dd404099b6d1f2ec887c6903659e505879915030dd9efb1c6dd5fde2d515a19f418487b73d1cc59f6aad60c79bcf5
   languageName: node
   linkType: hard
 
@@ -14595,14 +14595,14 @@ __metadata:
     source-map-js: "npm:>=0.6.2 <2.0.0"
   bin:
     sass: sass.js
-  checksum: 7c309ee1c096d591746d122da9f1ebd65b4c4b3a60c2cc0ec720fd98fe1205fa8b44c9f563d113b9fdfeb25af1e32ec9b3e048bd4b8e05d267f020953bd7baf0
+  checksum: 10c0/7c309ee1c096d591746d122da9f1ebd65b4c4b3a60c2cc0ec720fd98fe1205fa8b44c9f563d113b9fdfeb25af1e32ec9b3e048bd4b8e05d267f020953bd7baf0
   languageName: node
   linkType: hard
 
 "sax@npm:~1.2.4":
   version: 1.2.4
   resolution: "sax@npm:1.2.4"
-  checksum: 6e9b05ff443ee5e5096ce92d31c0740a20d33002fad714ebcb8fc7a664d9ee159103ebe8f7aef0a1f7c5ecacdd01f177f510dff95611c589399baf76437d3fe3
+  checksum: 10c0/6e9b05ff443ee5e5096ce92d31c0740a20d33002fad714ebcb8fc7a664d9ee159103ebe8f7aef0a1f7c5ecacdd01f177f510dff95611c589399baf76437d3fe3
   languageName: node
   linkType: hard
 
@@ -14611,7 +14611,7 @@ __metadata:
   resolution: "saxes@npm:6.0.0"
   dependencies:
     xmlchars: "npm:^2.2.0"
-  checksum: 3847b839f060ef3476eb8623d099aa502ad658f5c40fd60c105ebce86d244389b0d76fcae30f4d0c728d7705ceb2f7e9b34bb54717b6a7dbedaf5dad2d9a4b74
+  checksum: 10c0/3847b839f060ef3476eb8623d099aa502ad658f5c40fd60c105ebce86d244389b0d76fcae30f4d0c728d7705ceb2f7e9b34bb54717b6a7dbedaf5dad2d9a4b74
   languageName: node
   linkType: hard
 
@@ -14620,7 +14620,7 @@ __metadata:
   resolution: "scheduler@npm:0.23.0"
   dependencies:
     loose-envify: "npm:^1.1.0"
-  checksum: b777f7ca0115e6d93e126ac490dbd82642d14983b3079f58f35519d992fa46260be7d6e6cede433a92db70306310c6f5f06e144f0e40c484199e09c1f7be53dd
+  checksum: 10c0/b777f7ca0115e6d93e126ac490dbd82642d14983b3079f58f35519d992fa46260be7d6e6cede433a92db70306310c6f5f06e144f0e40c484199e09c1f7be53dd
   languageName: node
   linkType: hard
 
@@ -14631,7 +14631,7 @@ __metadata:
     ajv: "npm:^6.1.0"
     ajv-errors: "npm:^1.0.0"
     ajv-keywords: "npm:^3.1.0"
-  checksum: 670e22d7f0ff0b6f4514a4d6fb27c359101b44b7dbfd9563af201af72eb4a9ff06144020cab5f85b16e88821fd09b97cbdae6c893721c6528c8cb704124e6a2f
+  checksum: 10c0/670e22d7f0ff0b6f4514a4d6fb27c359101b44b7dbfd9563af201af72eb4a9ff06144020cab5f85b16e88821fd09b97cbdae6c893721c6528c8cb704124e6a2f
   languageName: node
   linkType: hard
 
@@ -14642,7 +14642,7 @@ __metadata:
     "@types/json-schema": "npm:^7.0.5"
     ajv: "npm:^6.12.4"
     ajv-keywords: "npm:^3.5.2"
-  checksum: f484f34464edd8758712d5d3ba25a306e367dac988aecaf4ce112e99baae73f33a807b5cf869240bb6648c80720b36af2d7d72be3a27faa49a2d4fc63fa3f85f
+  checksum: 10c0/f484f34464edd8758712d5d3ba25a306e367dac988aecaf4ce112e99baae73f33a807b5cf869240bb6648c80720b36af2d7d72be3a27faa49a2d4fc63fa3f85f
   languageName: node
   linkType: hard
 
@@ -14653,7 +14653,7 @@ __metadata:
     "@types/json-schema": "npm:^7.0.8"
     ajv: "npm:^6.12.5"
     ajv-keywords: "npm:^3.5.2"
-  checksum: fafdbde91ad8aa1316bc543d4b61e65ea86970aebbfb750bfb6d8a6c287a23e415e0e926c2498696b242f63af1aab8e585252637fabe811fd37b604351da6500
+  checksum: 10c0/fafdbde91ad8aa1316bc543d4b61e65ea86970aebbfb750bfb6d8a6c287a23e415e0e926c2498696b242f63af1aab8e585252637fabe811fd37b604351da6500
   languageName: node
   linkType: hard
 
@@ -14663,21 +14663,21 @@ __metadata:
   dependencies:
     dom-helpers: "npm:^3.4.0"
     invariant: "npm:^2.2.4"
-  checksum: 4f438c48b93a1dcc2ab51a18670fac6f5ce41885291d8aa13251b4a187be9d0c6dd518ee974eb52ac9bbe227b9811c2615ecca73192a1a190b78dfdadb9c2cf2
+  checksum: 10c0/4f438c48b93a1dcc2ab51a18670fac6f5ce41885291d8aa13251b4a187be9d0c6dd518ee974eb52ac9bbe227b9811c2615ecca73192a1a190b78dfdadb9c2cf2
   languageName: node
   linkType: hard
 
 "secure-json-parse@npm:^2.4.0":
   version: 2.7.0
   resolution: "secure-json-parse@npm:2.7.0"
-  checksum: f57eb6a44a38a3eeaf3548228585d769d788f59007454214fab9ed7f01fbf2e0f1929111da6db28cf0bcc1a2e89db5219a59e83eeaec3a54e413a0197ce879e4
+  checksum: 10c0/f57eb6a44a38a3eeaf3548228585d769d788f59007454214fab9ed7f01fbf2e0f1929111da6db28cf0bcc1a2e89db5219a59e83eeaec3a54e413a0197ce879e4
   languageName: node
   linkType: hard
 
 "select-hose@npm:^2.0.0":
   version: 2.0.0
   resolution: "select-hose@npm:2.0.0"
-  checksum: 01cc52edd29feddaf379efb4328aededa633f0ac43c64b11a8abd075ff34f05b0d280882c4fbcbdf1a0658202c9cd2ea8d5985174dcf9a2dac7e3a4996fa9b67
+  checksum: 10c0/01cc52edd29feddaf379efb4328aededa633f0ac43c64b11a8abd075ff34f05b0d280882c4fbcbdf1a0658202c9cd2ea8d5985174dcf9a2dac7e3a4996fa9b67
   languageName: node
   linkType: hard
 
@@ -14686,7 +14686,7 @@ __metadata:
   resolution: "selfsigned@npm:1.10.14"
   dependencies:
     node-forge: "npm:^0.10.0"
-  checksum: cb7c92e28a3e8a34e91a3b20b9dd7d237a1bffccd9890c434f74eef65ae8bfffe7c1ab3379faac017b957ea44522923e06e2b41e0858c643edb01137a507cd16
+  checksum: 10c0/cb7c92e28a3e8a34e91a3b20b9dd7d237a1bffccd9890c434f74eef65ae8bfffe7c1ab3379faac017b957ea44522923e06e2b41e0858c643edb01137a507cd16
   languageName: node
   linkType: hard
 
@@ -14695,7 +14695,7 @@ __metadata:
   resolution: "semver@npm:5.7.1"
   bin:
     semver: ./bin/semver
-  checksum: d4884f2aeca28bff35d0bd40ff0a9b2dfc4b36a883bf0ea5dc15d10d9a01bdc9041035b05f825d4b5ac8a56e490703dbf0d986d054de82cc5e9bad3f02ca6e00
+  checksum: 10c0/d4884f2aeca28bff35d0bd40ff0a9b2dfc4b36a883bf0ea5dc15d10d9a01bdc9041035b05f825d4b5ac8a56e490703dbf0d986d054de82cc5e9bad3f02ca6e00
   languageName: node
   linkType: hard
 
@@ -14704,7 +14704,7 @@ __metadata:
   resolution: "semver@npm:6.3.1"
   bin:
     semver: bin/semver.js
-  checksum: e3d79b609071caa78bcb6ce2ad81c7966a46a7431d9d58b8800cfa9cb6a63699b3899a0e4bcce36167a284578212d9ae6942b6929ba4aa5015c079a67751d42d
+  checksum: 10c0/e3d79b609071caa78bcb6ce2ad81c7966a46a7431d9d58b8800cfa9cb6a63699b3899a0e4bcce36167a284578212d9ae6942b6929ba4aa5015c079a67751d42d
   languageName: node
   linkType: hard
 
@@ -14715,7 +14715,7 @@ __metadata:
     lru-cache: "npm:^6.0.0"
   bin:
     semver: bin/semver.js
-  checksum: fbfe717094ace0aa8d6332d7ef5ce727259815bd8d8815700853f4faf23aacbd7192522f0dc5af6df52ef4fa85a355ebd2f5d39f554bd028200d6cf481ab9b53
+  checksum: 10c0/fbfe717094ace0aa8d6332d7ef5ce727259815bd8d8815700853f4faf23aacbd7192522f0dc5af6df52ef4fa85a355ebd2f5d39f554bd028200d6cf481ab9b53
   languageName: node
   linkType: hard
 
@@ -14736,7 +14736,7 @@ __metadata:
     on-finished: "npm:2.4.1"
     range-parser: "npm:~1.2.1"
     statuses: "npm:2.0.1"
-  checksum: 0eb134d6a51fc13bbcb976a1f4214ea1e33f242fae046efc311e80aff66c7a43603e26a79d9d06670283a13000e51be6e0a2cb80ff0942eaf9f1cd30b7ae736a
+  checksum: 10c0/0eb134d6a51fc13bbcb976a1f4214ea1e33f242fae046efc311e80aff66c7a43603e26a79d9d06670283a13000e51be6e0a2cb80ff0942eaf9f1cd30b7ae736a
   languageName: node
   linkType: hard
 
@@ -14745,7 +14745,7 @@ __metadata:
   resolution: "serialize-javascript@npm:4.0.0"
   dependencies:
     randombytes: "npm:^2.1.0"
-  checksum: 510dfe7f0311c0b2f7ab06311afa1668ba2969ab2f1faaac0a4924ede76b7f22ba85cfdeaa0052ec5a047bca42c8cd8ac8df8f0efe52f9bd290b3a39ae69fe9d
+  checksum: 10c0/510dfe7f0311c0b2f7ab06311afa1668ba2969ab2f1faaac0a4924ede76b7f22ba85cfdeaa0052ec5a047bca42c8cd8ac8df8f0efe52f9bd290b3a39ae69fe9d
   languageName: node
   linkType: hard
 
@@ -14754,7 +14754,7 @@ __metadata:
   resolution: "serialize-javascript@npm:5.0.1"
   dependencies:
     randombytes: "npm:^2.1.0"
-  checksum: 646bd92a8298d764d38316f3006bce0b0def6d0e254791396ac34403847654d9346b0b6ed7865efd799d93d4c47d900e08a8fa7a6f7f8d2dbaebab5444c3b431
+  checksum: 10c0/646bd92a8298d764d38316f3006bce0b0def6d0e254791396ac34403847654d9346b0b6ed7865efd799d93d4c47d900e08a8fa7a6f7f8d2dbaebab5444c3b431
   languageName: node
   linkType: hard
 
@@ -14769,7 +14769,7 @@ __metadata:
     http-errors: "npm:~1.6.2"
     mime-types: "npm:~2.1.17"
     parseurl: "npm:~1.3.2"
-  checksum: a666471a24196f74371edf2c3c7bcdd82adbac52f600804508754b5296c3567588bf694258b19e0cb23a567acfa20d9721bfdaed3286007b81f9741ada8a3a9c
+  checksum: 10c0/a666471a24196f74371edf2c3c7bcdd82adbac52f600804508754b5296c3567588bf694258b19e0cb23a567acfa20d9721bfdaed3286007b81f9741ada8a3a9c
   languageName: node
   linkType: hard
 
@@ -14781,14 +14781,14 @@ __metadata:
     escape-html: "npm:~1.0.3"
     parseurl: "npm:~1.3.3"
     send: "npm:0.18.0"
-  checksum: fa9f0e21a540a28f301258dfe1e57bb4f81cd460d28f0e973860477dd4acef946a1f41748b5bd41c73b621bea2029569c935faa38578fd34cd42a9b4947088ba
+  checksum: 10c0/fa9f0e21a540a28f301258dfe1e57bb4f81cd460d28f0e973860477dd4acef946a1f41748b5bd41c73b621bea2029569c935faa38578fd34cd42a9b4947088ba
   languageName: node
   linkType: hard
 
 "set-blocking@npm:^2.0.0":
   version: 2.0.0
   resolution: "set-blocking@npm:2.0.0"
-  checksum: 9f8c1b2d800800d0b589de1477c753492de5c1548d4ade52f57f1d1f5e04af5481554d75ce5e5c43d4004b80a3eb714398d6907027dc0534177b7539119f4454
+  checksum: 10c0/9f8c1b2d800800d0b589de1477c753492de5c1548d4ade52f57f1d1f5e04af5481554d75ce5e5c43d4004b80a3eb714398d6907027dc0534177b7539119f4454
   languageName: node
   linkType: hard
 
@@ -14800,7 +14800,7 @@ __metadata:
     get-intrinsic: "npm:^1.2.1"
     gopd: "npm:^1.0.1"
     has-property-descriptors: "npm:^1.0.0"
-  checksum: a29e255c116c29e3323b851c4f46c58c91be9bb8b065f191e2ea1807cb2c839df56e3175732a498e0c6d54626ba6b6fef896bf699feb7ab70c42dc47eb247c95
+  checksum: 10c0/a29e255c116c29e3323b851c4f46c58c91be9bb8b065f191e2ea1807cb2c839df56e3175732a498e0c6d54626ba6b6fef896bf699feb7ab70c42dc47eb247c95
   languageName: node
   linkType: hard
 
@@ -14811,7 +14811,7 @@ __metadata:
     define-data-property: "npm:^1.0.1"
     functions-have-names: "npm:^1.2.3"
     has-property-descriptors: "npm:^1.0.0"
-  checksum: 6be7d3e15be47f4db8a5a563a35c60b5e7c4af91cc900e8972ffad33d3aaa227900faa55f60121cdb04b85866a734bb7fe4cd91f654c632861cc86121a48312a
+  checksum: 10c0/6be7d3e15be47f4db8a5a563a35c60b5e7c4af91cc900e8972ffad33d3aaa227900faa55f60121cdb04b85866a734bb7fe4cd91f654c632861cc86121a48312a
   languageName: node
   linkType: hard
 
@@ -14823,28 +14823,28 @@ __metadata:
     is-extendable: "npm:^0.1.1"
     is-plain-object: "npm:^2.0.3"
     split-string: "npm:^3.0.1"
-  checksum: 4c40573c4f6540456e4b38b95f570272c4cfbe1d12890ad4057886da8535047cd772dfadf5b58e2e87aa244dfb4c57e3586f6716b976fc47c5144b6b09e1811b
+  checksum: 10c0/4c40573c4f6540456e4b38b95f570272c4cfbe1d12890ad4057886da8535047cd772dfadf5b58e2e87aa244dfb4c57e3586f6716b976fc47c5144b6b09e1811b
   languageName: node
   linkType: hard
 
 "setimmediate@npm:^1.0.4":
   version: 1.0.5
   resolution: "setimmediate@npm:1.0.5"
-  checksum: 5bae81bfdbfbd0ce992893286d49c9693c82b1bcc00dcaaf3a09c8f428fdeacf4190c013598b81875dfac2b08a572422db7df779a99332d0fce186d15a3e4d49
+  checksum: 10c0/5bae81bfdbfbd0ce992893286d49c9693c82b1bcc00dcaaf3a09c8f428fdeacf4190c013598b81875dfac2b08a572422db7df779a99332d0fce186d15a3e4d49
   languageName: node
   linkType: hard
 
 "setprototypeof@npm:1.1.0":
   version: 1.1.0
   resolution: "setprototypeof@npm:1.1.0"
-  checksum: a77b20876689c6a89c3b42f0c3596a9cae02f90fc902570cbd97198e9e8240382086c9303ad043e88cee10f61eae19f1004e51d885395a1e9bf49f9ebed12872
+  checksum: 10c0/a77b20876689c6a89c3b42f0c3596a9cae02f90fc902570cbd97198e9e8240382086c9303ad043e88cee10f61eae19f1004e51d885395a1e9bf49f9ebed12872
   languageName: node
   linkType: hard
 
 "setprototypeof@npm:1.2.0":
   version: 1.2.0
   resolution: "setprototypeof@npm:1.2.0"
-  checksum: 68733173026766fa0d9ecaeb07f0483f4c2dc70ca376b3b7c40b7cda909f94b0918f6c5ad5ce27a9160bdfb475efaa9d5e705a11d8eaae18f9835d20976028bc
+  checksum: 10c0/68733173026766fa0d9ecaeb07f0483f4c2dc70ca376b3b7c40b7cda909f94b0918f6c5ad5ce27a9160bdfb475efaa9d5e705a11d8eaae18f9835d20976028bc
   languageName: node
   linkType: hard
 
@@ -14856,7 +14856,7 @@ __metadata:
     safe-buffer: "npm:^5.0.1"
   bin:
     sha.js: ./bin.js
-  checksum: b7a371bca8821c9cc98a0aeff67444a03d48d745cb103f17228b96793f455f0eb0a691941b89ea1e60f6359207e36081d9be193252b0f128e0daf9cfea2815a5
+  checksum: 10c0/b7a371bca8821c9cc98a0aeff67444a03d48d745cb103f17228b96793f455f0eb0a691941b89ea1e60f6359207e36081d9be193252b0f128e0daf9cfea2815a5
   languageName: node
   linkType: hard
 
@@ -14865,14 +14865,14 @@ __metadata:
   resolution: "shallow-clone@npm:3.0.1"
   dependencies:
     kind-of: "npm:^6.0.2"
-  checksum: 7bab09613a1b9f480c85a9823aebec533015579fa055ba6634aa56ba1f984380670eaf33b8217502931872aa1401c9fcadaa15f9f604d631536df475b05bcf1e
+  checksum: 10c0/7bab09613a1b9f480c85a9823aebec533015579fa055ba6634aa56ba1f984380670eaf33b8217502931872aa1401c9fcadaa15f9f604d631536df475b05bcf1e
   languageName: node
   linkType: hard
 
 "shallow-equal@npm:^1.2.1":
   version: 1.2.1
   resolution: "shallow-equal@npm:1.2.1"
-  checksum: 51e03abadd97c9ebe590547d92db9148446962a3f23a3a0fb1ba2fccab80af881eef0ff1f8ccefd3f066c0bc5a4c8ca53706194813b95c8835fa66448a843a26
+  checksum: 10c0/51e03abadd97c9ebe590547d92db9148446962a3f23a3a0fb1ba2fccab80af881eef0ff1f8ccefd3f066c0bc5a4c8ca53706194813b95c8835fa66448a843a26
   languageName: node
   linkType: hard
 
@@ -14881,7 +14881,7 @@ __metadata:
   resolution: "shebang-command@npm:1.2.0"
   dependencies:
     shebang-regex: "npm:^1.0.0"
-  checksum: 7b20dbf04112c456b7fc258622dafd566553184ac9b6938dd30b943b065b21dabd3776460df534cc02480db5e1b6aec44700d985153a3da46e7db7f9bd21326d
+  checksum: 10c0/7b20dbf04112c456b7fc258622dafd566553184ac9b6938dd30b943b065b21dabd3776460df534cc02480db5e1b6aec44700d985153a3da46e7db7f9bd21326d
   languageName: node
   linkType: hard
 
@@ -14890,21 +14890,21 @@ __metadata:
   resolution: "shebang-command@npm:2.0.0"
   dependencies:
     shebang-regex: "npm:^3.0.0"
-  checksum: a41692e7d89a553ef21d324a5cceb5f686d1f3c040759c50aab69688634688c5c327f26f3ecf7001ebfd78c01f3c7c0a11a7c8bfd0a8bc9f6240d4f40b224e4e
+  checksum: 10c0/a41692e7d89a553ef21d324a5cceb5f686d1f3c040759c50aab69688634688c5c327f26f3ecf7001ebfd78c01f3c7c0a11a7c8bfd0a8bc9f6240d4f40b224e4e
   languageName: node
   linkType: hard
 
 "shebang-regex@npm:^1.0.0":
   version: 1.0.0
   resolution: "shebang-regex@npm:1.0.0"
-  checksum: 9abc45dee35f554ae9453098a13fdc2f1730e525a5eb33c51f096cc31f6f10a4b38074c1ebf354ae7bffa7229506083844008dfc3bb7818228568c0b2dc1fff2
+  checksum: 10c0/9abc45dee35f554ae9453098a13fdc2f1730e525a5eb33c51f096cc31f6f10a4b38074c1ebf354ae7bffa7229506083844008dfc3bb7818228568c0b2dc1fff2
   languageName: node
   linkType: hard
 
 "shebang-regex@npm:^3.0.0":
   version: 3.0.0
   resolution: "shebang-regex@npm:3.0.0"
-  checksum: 1dbed0726dd0e1152a92696c76c7f06084eb32a90f0528d11acd764043aacf76994b2fb30aa1291a21bd019d6699164d048286309a278855ee7bec06cf6fb690
+  checksum: 10c0/1dbed0726dd0e1152a92696c76c7f06084eb32a90f0528d11acd764043aacf76994b2fb30aa1291a21bd019d6699164d048286309a278855ee7bec06cf6fb690
   languageName: node
   linkType: hard
 
@@ -14915,21 +14915,21 @@ __metadata:
     call-bind: "npm:^1.0.0"
     get-intrinsic: "npm:^1.0.2"
     object-inspect: "npm:^1.9.0"
-  checksum: 054a5d23ee35054b2c4609b9fd2a0587760737782b5d765a9c7852264710cc39c6dcb56a9bbd6c12cd84071648aea3edb2359d2f6e560677eedadce511ac1da5
+  checksum: 10c0/054a5d23ee35054b2c4609b9fd2a0587760737782b5d765a9c7852264710cc39c6dcb56a9bbd6c12cd84071648aea3edb2359d2f6e560677eedadce511ac1da5
   languageName: node
   linkType: hard
 
 "signal-exit@npm:^3.0.0, signal-exit@npm:^3.0.2, signal-exit@npm:^3.0.3, signal-exit@npm:^3.0.7":
   version: 3.0.7
   resolution: "signal-exit@npm:3.0.7"
-  checksum: 25d272fa73e146048565e08f3309d5b942c1979a6f4a58a8c59d5fa299728e9c2fcd1a759ec870863b1fd38653670240cd420dad2ad9330c71f36608a6a1c912
+  checksum: 10c0/25d272fa73e146048565e08f3309d5b942c1979a6f4a58a8c59d5fa299728e9c2fcd1a759ec870863b1fd38653670240cd420dad2ad9330c71f36608a6a1c912
   languageName: node
   linkType: hard
 
 "signal-exit@npm:^4.0.1, signal-exit@npm:^4.1.0":
   version: 4.1.0
   resolution: "signal-exit@npm:4.1.0"
-  checksum: 41602dce540e46d599edba9d9860193398d135f7ff72cab629db5171516cfae628d21e7bfccde1bbfdf11c48726bc2a6d1a8fb8701125852fbfda7cf19c6aa83
+  checksum: 10c0/41602dce540e46d599edba9d9860193398d135f7ff72cab629db5171516cfae628d21e7bfccde1bbfdf11c48726bc2a6d1a8fb8701125852fbfda7cf19c6aa83
   languageName: node
   linkType: hard
 
@@ -14940,21 +14940,21 @@ __metadata:
     "@polka/url": "npm:^1.0.0-next.20"
     mrmime: "npm:^1.0.0"
     totalist: "npm:^3.0.0"
-  checksum: 333bd665ee5ac3805047ea47757e04e2b18ca562749b9a07f5bbbee6dabd99ff00011604689b1ada3d22e46a4198c61e05e2d1abd5454d94da483ce3a3813205
+  checksum: 10c0/333bd665ee5ac3805047ea47757e04e2b18ca562749b9a07f5bbbee6dabd99ff00011604689b1ada3d22e46a4198c61e05e2d1abd5454d94da483ce3a3813205
   languageName: node
   linkType: hard
 
 "sisteransi@npm:^1.0.5":
   version: 1.0.5
   resolution: "sisteransi@npm:1.0.5"
-  checksum: 230ac975cca485b7f6fe2b96a711aa62a6a26ead3e6fb8ba17c5a00d61b8bed0d7adc21f5626b70d7c33c62ff4e63933017a6462942c719d1980bb0b1207ad46
+  checksum: 10c0/230ac975cca485b7f6fe2b96a711aa62a6a26ead3e6fb8ba17c5a00d61b8bed0d7adc21f5626b70d7c33c62ff4e63933017a6462942c719d1980bb0b1207ad46
   languageName: node
   linkType: hard
 
 "slash@npm:^3.0.0":
   version: 3.0.0
   resolution: "slash@npm:3.0.0"
-  checksum: e18488c6a42bdfd4ac5be85b2ced3ccd0224773baae6ad42cfbb9ec74fc07f9fa8396bd35ee638084ead7a2a0818eb5e7151111544d4731ce843019dab4be47b
+  checksum: 10c0/e18488c6a42bdfd4ac5be85b2ced3ccd0224773baae6ad42cfbb9ec74fc07f9fa8396bd35ee638084ead7a2a0818eb5e7151111544d4731ce843019dab4be47b
   languageName: node
   linkType: hard
 
@@ -14965,7 +14965,7 @@ __metadata:
     ansi-styles: "npm:^4.0.0"
     astral-regex: "npm:^2.0.0"
     is-fullwidth-code-point: "npm:^3.0.0"
-  checksum: 6c25678db1270d4793e0327620f1e0f9f5bea4630123f51e9e399191bc52c87d6e6de53ed33538609e5eacbd1fab769fae00f3705d08d029f02102a540648918
+  checksum: 10c0/6c25678db1270d4793e0327620f1e0f9f5bea4630123f51e9e399191bc52c87d6e6de53ed33538609e5eacbd1fab769fae00f3705d08d029f02102a540648918
   languageName: node
   linkType: hard
 
@@ -14975,7 +14975,7 @@ __metadata:
   dependencies:
     ansi-styles: "npm:^6.0.0"
     is-fullwidth-code-point: "npm:^4.0.0"
-  checksum: 2d4d40b2a9d5cf4e8caae3f698fe24ae31a4d778701724f578e984dcb485ec8c49f0c04dab59c401821e80fcdfe89cace9c66693b0244e40ec485d72e543914f
+  checksum: 10c0/2d4d40b2a9d5cf4e8caae3f698fe24ae31a4d778701724f578e984dcb485ec8c49f0c04dab59c401821e80fcdfe89cace9c66693b0244e40ec485d72e543914f
   languageName: node
   linkType: hard
 
@@ -14985,14 +14985,14 @@ __metadata:
   dependencies:
     ansi-styles: "npm:^6.2.1"
     is-fullwidth-code-point: "npm:^5.0.0"
-  checksum: 631c971d4abf56cf880f034d43fcc44ff883624867bf11ecbd538c47343911d734a4656d7bc02362b40b89d765652a7f935595441e519b59e2ad3f4d5d6fe7ca
+  checksum: 10c0/631c971d4abf56cf880f034d43fcc44ff883624867bf11ecbd538c47343911d734a4656d7bc02362b40b89d765652a7f935595441e519b59e2ad3f4d5d6fe7ca
   languageName: node
   linkType: hard
 
 "smart-buffer@npm:^4.2.0":
   version: 4.2.0
   resolution: "smart-buffer@npm:4.2.0"
-  checksum: a16775323e1404dd43fabafe7460be13a471e021637bc7889468eb45ce6a6b207261f454e4e530a19500cc962c4cc5348583520843b363f4193cee5c00e1e539
+  checksum: 10c0/a16775323e1404dd43fabafe7460be13a471e021637bc7889468eb45ce6a6b207261f454e4e530a19500cc962c4cc5348583520843b363f4193cee5c00e1e539
   languageName: node
   linkType: hard
 
@@ -15003,7 +15003,7 @@ __metadata:
     define-property: "npm:^1.0.0"
     isobject: "npm:^3.0.0"
     snapdragon-util: "npm:^3.0.1"
-  checksum: 7616e6a1ca054afe3ad8defda17ebe4c73b0800d2e0efd635c44ee1b286f8ac7900517314b5330862ce99b28cd2782348ee78bae573ff0f55832ad81d9657f3f
+  checksum: 10c0/7616e6a1ca054afe3ad8defda17ebe4c73b0800d2e0efd635c44ee1b286f8ac7900517314b5330862ce99b28cd2782348ee78bae573ff0f55832ad81d9657f3f
   languageName: node
   linkType: hard
 
@@ -15012,7 +15012,7 @@ __metadata:
   resolution: "snapdragon-util@npm:3.0.1"
   dependencies:
     kind-of: "npm:^3.2.0"
-  checksum: 4441856d343399ba7f37f79681949d51b922e290fcc07e7bc94655a50f584befa4fb08f40c3471cd160e004660161964d8ff140cba49baa59aa6caba774240e3
+  checksum: 10c0/4441856d343399ba7f37f79681949d51b922e290fcc07e7bc94655a50f584befa4fb08f40c3471cd160e004660161964d8ff140cba49baa59aa6caba774240e3
   languageName: node
   linkType: hard
 
@@ -15028,7 +15028,7 @@ __metadata:
     source-map: "npm:^0.5.6"
     source-map-resolve: "npm:^0.5.0"
     use: "npm:^3.1.0"
-  checksum: dfdac1f73d47152d72fc07f4322da09bbddfa31c1c9c3ae7346f252f778c45afa5b03e90813332f02f04f6de8003b34a168c456f8bb719024d092f932520ffca
+  checksum: 10c0/dfdac1f73d47152d72fc07f4322da09bbddfa31c1c9c3ae7346f252f778c45afa5b03e90813332f02f04f6de8003b34a168c456f8bb719024d092f932520ffca
   languageName: node
   linkType: hard
 
@@ -15041,7 +15041,7 @@ __metadata:
     faye-websocket: "npm:^0.11.4"
     inherits: "npm:^2.0.4"
     url-parse: "npm:^1.5.10"
-  checksum: c1b55470aac0a31b0fc87806535b0e5cf5d6289584bcd03ffa9f50328a74a40098be63292d6862bd6f483ac9ef487ad60a8a5082feb1f9d0caee5bad6e50f3a9
+  checksum: 10c0/c1b55470aac0a31b0fc87806535b0e5cf5d6289584bcd03ffa9f50328a74a40098be63292d6862bd6f483ac9ef487ad60a8a5082feb1f9d0caee5bad6e50f3a9
   languageName: node
   linkType: hard
 
@@ -15052,7 +15052,7 @@ __metadata:
     faye-websocket: "npm:^0.11.3"
     uuid: "npm:^8.3.2"
     websocket-driver: "npm:^0.7.4"
-  checksum: aa102c7d921bf430215754511c81ea7248f2dcdf268fbdb18e4d8183493a86b8793b164c636c52f474a886f747447c962741df2373888823271efdb9d2594f33
+  checksum: 10c0/aa102c7d921bf430215754511c81ea7248f2dcdf268fbdb18e4d8183493a86b8793b164c636c52f474a886f747447c962741df2373888823271efdb9d2594f33
   languageName: node
   linkType: hard
 
@@ -15063,7 +15063,7 @@ __metadata:
     agent-base: "npm:^7.0.2"
     debug: "npm:^4.3.4"
     socks: "npm:^2.7.1"
-  checksum: a842402fc9b8848a31367f2811ca3cd14c4106588b39a0901cd7a69029998adfc6456b0203617c18ed090542ad0c24ee4e9d4c75a0c4b75071e214227c177eb7
+  checksum: 10c0/a842402fc9b8848a31367f2811ca3cd14c4106588b39a0901cd7a69029998adfc6456b0203617c18ed090542ad0c24ee4e9d4c75a0c4b75071e214227c177eb7
   languageName: node
   linkType: hard
 
@@ -15073,7 +15073,7 @@ __metadata:
   dependencies:
     ip: "npm:^2.0.0"
     smart-buffer: "npm:^4.2.0"
-  checksum: 43f69dbc9f34fc8220bc51c6eea1c39715ab3cfdb115d6e3285f6c7d1a603c5c75655668a5bbc11e3c7e2c99d60321fb8d7ab6f38cda6a215fadd0d6d0b52130
+  checksum: 10c0/43f69dbc9f34fc8220bc51c6eea1c39715ab3cfdb115d6e3285f6c7d1a603c5c75655668a5bbc11e3c7e2c99d60321fb8d7ab6f38cda6a215fadd0d6d0b52130
   languageName: node
   linkType: hard
 
@@ -15082,21 +15082,21 @@ __metadata:
   resolution: "sonic-boom@npm:3.7.0"
   dependencies:
     atomic-sleep: "npm:^1.0.0"
-  checksum: 57a3d560efb77f4576db111168ee2649c99e7869fda6ce0ec2a4e5458832d290ba58d74b073ddb5827d9a30f96d23cff79157993d919e1a6d5f28d8b6391c7f0
+  checksum: 10c0/57a3d560efb77f4576db111168ee2649c99e7869fda6ce0ec2a4e5458832d290ba58d74b073ddb5827d9a30f96d23cff79157993d919e1a6d5f28d8b6391c7f0
   languageName: node
   linkType: hard
 
 "source-list-map@npm:^2.0.0":
   version: 2.0.1
   resolution: "source-list-map@npm:2.0.1"
-  checksum: 2e5e421b185dcd857f46c3c70e2e711a65d717b78c5f795e2e248c9d67757882ea989b80ebc08cf164eeeda5f4be8aa95d3b990225070b2daaaf3257c5958149
+  checksum: 10c0/2e5e421b185dcd857f46c3c70e2e711a65d717b78c5f795e2e248c9d67757882ea989b80ebc08cf164eeeda5f4be8aa95d3b990225070b2daaaf3257c5958149
   languageName: node
   linkType: hard
 
 "source-map-js@npm:>=0.6.2 <2.0.0, source-map-js@npm:^1.0.1, source-map-js@npm:^1.0.2":
   version: 1.0.2
   resolution: "source-map-js@npm:1.0.2"
-  checksum: 32f2dfd1e9b7168f9a9715eb1b4e21905850f3b50cf02cf476e47e4eebe8e6b762b63a64357896aa29b37e24922b4282df0f492e0d2ace572b43d15525976ff8
+  checksum: 10c0/32f2dfd1e9b7168f9a9715eb1b4e21905850f3b50cf02cf476e47e4eebe8e6b762b63a64357896aa29b37e24922b4282df0f492e0d2ace572b43d15525976ff8
   languageName: node
   linkType: hard
 
@@ -15109,7 +15109,7 @@ __metadata:
     resolve-url: "npm:^0.2.1"
     source-map-url: "npm:^0.4.0"
     urix: "npm:^0.1.0"
-  checksum: 410acbe93882e058858d4c1297be61da3e1533f95f25b95903edddc1fb719654e705663644677542d1fb78a66390238fad1a57115fc958a0724cf9bb509caf57
+  checksum: 10c0/410acbe93882e058858d4c1297be61da3e1533f95f25b95903edddc1fb719654e705663644677542d1fb78a66390238fad1a57115fc958a0724cf9bb509caf57
   languageName: node
   linkType: hard
 
@@ -15119,7 +15119,7 @@ __metadata:
   dependencies:
     buffer-from: "npm:^1.0.0"
     source-map: "npm:^0.6.0"
-  checksum: 137539f8c453fa0f496ea42049ab5da4569f96781f6ac8e5bfda26937be9494f4e8891f523c5f98f0e85f71b35d74127a00c46f83f6a4f54672b58d53202565e
+  checksum: 10c0/137539f8c453fa0f496ea42049ab5da4569f96781f6ac8e5bfda26937be9494f4e8891f523c5f98f0e85f71b35d74127a00c46f83f6a4f54672b58d53202565e
   languageName: node
   linkType: hard
 
@@ -15129,42 +15129,42 @@ __metadata:
   dependencies:
     buffer-from: "npm:^1.0.0"
     source-map: "npm:^0.6.0"
-  checksum: 9ee09942f415e0f721d6daad3917ec1516af746a8120bba7bb56278707a37f1eb8642bde456e98454b8a885023af81a16e646869975f06afc1a711fb90484e7d
+  checksum: 10c0/9ee09942f415e0f721d6daad3917ec1516af746a8120bba7bb56278707a37f1eb8642bde456e98454b8a885023af81a16e646869975f06afc1a711fb90484e7d
   languageName: node
   linkType: hard
 
 "source-map-url@npm:^0.4.0":
   version: 0.4.1
   resolution: "source-map-url@npm:0.4.1"
-  checksum: f8af0678500d536c7f643e32094d6718a4070ab4ca2d2326532512cfbe2d5d25a45849b4b385879326f2d7523bb3b686d0360dd347a3cda09fd89a5c28d4bc58
+  checksum: 10c0/f8af0678500d536c7f643e32094d6718a4070ab4ca2d2326532512cfbe2d5d25a45849b4b385879326f2d7523bb3b686d0360dd347a3cda09fd89a5c28d4bc58
   languageName: node
   linkType: hard
 
 "source-map@npm:0.5.6":
   version: 0.5.6
   resolution: "source-map@npm:0.5.6"
-  checksum: beb2c5974bb58954d75e86249953d47ae16f7df1a8531abb9fcae0cd262d9fa09c2db3a134e20e99358b1adba42b6b054a32c8e16b571b3efcf6af644c329f0d
+  checksum: 10c0/beb2c5974bb58954d75e86249953d47ae16f7df1a8531abb9fcae0cd262d9fa09c2db3a134e20e99358b1adba42b6b054a32c8e16b571b3efcf6af644c329f0d
   languageName: node
   linkType: hard
 
 "source-map@npm:^0.5.6, source-map@npm:^0.5.7":
   version: 0.5.7
   resolution: "source-map@npm:0.5.7"
-  checksum: 904e767bb9c494929be013017380cbba013637da1b28e5943b566031e29df04fba57edf3f093e0914be094648b577372bd8ad247fa98cfba9c600794cd16b599
+  checksum: 10c0/904e767bb9c494929be013017380cbba013637da1b28e5943b566031e29df04fba57edf3f093e0914be094648b577372bd8ad247fa98cfba9c600794cd16b599
   languageName: node
   linkType: hard
 
 "source-map@npm:^0.6.0, source-map@npm:^0.6.1, source-map@npm:~0.6.1":
   version: 0.6.1
   resolution: "source-map@npm:0.6.1"
-  checksum: ab55398007c5e5532957cb0beee2368529618ac0ab372d789806f5718123cc4367d57de3904b4e6a4170eb5a0b0f41373066d02ca0735a0c4d75c7d328d3e011
+  checksum: 10c0/ab55398007c5e5532957cb0beee2368529618ac0ab372d789806f5718123cc4367d57de3904b4e6a4170eb5a0b0f41373066d02ca0735a0c4d75c7d328d3e011
   languageName: node
   linkType: hard
 
 "source-map@npm:^0.7.3":
   version: 0.7.4
   resolution: "source-map@npm:0.7.4"
-  checksum: dc0cf3768fe23c345ea8760487f8c97ef6fca8a73c83cd7c9bf2fde8bc2c34adb9c0824d6feb14bc4f9e37fb522e18af621543f1289038a66ac7586da29aa7dc
+  checksum: 10c0/dc0cf3768fe23c345ea8760487f8c97ef6fca8a73c83cd7c9bf2fde8bc2c34adb9c0824d6feb14bc4f9e37fb522e18af621543f1289038a66ac7586da29aa7dc
   languageName: node
   linkType: hard
 
@@ -15173,21 +15173,21 @@ __metadata:
   resolution: "source-map@npm:0.8.0-beta.0"
   dependencies:
     whatwg-url: "npm:^7.0.0"
-  checksum: fb4d9bde9a9fdb2c29b10e5eae6c71d10e09ef467e1afb75fdec2eb7e11fa5b343a2af553f74f18b695dbc0b81f9da2e9fa3d7a317d5985e9939499ec6087835
+  checksum: 10c0/fb4d9bde9a9fdb2c29b10e5eae6c71d10e09ef467e1afb75fdec2eb7e11fa5b343a2af553f74f18b695dbc0b81f9da2e9fa3d7a317d5985e9939499ec6087835
   languageName: node
   linkType: hard
 
 "sourcemap-codec@npm:^1.4.8":
   version: 1.4.8
   resolution: "sourcemap-codec@npm:1.4.8"
-  checksum: f099279fdaae070ff156df7414bbe39aad69cdd615454947ed3e19136bfdfcb4544952685ee73f56e17038f4578091e12b17b283ed8ac013882916594d95b9e6
+  checksum: 10c0/f099279fdaae070ff156df7414bbe39aad69cdd615454947ed3e19136bfdfcb4544952685ee73f56e17038f4578091e12b17b283ed8ac013882916594d95b9e6
   languageName: node
   linkType: hard
 
 "spdx-exceptions@npm:^2.1.0":
   version: 2.3.0
   resolution: "spdx-exceptions@npm:2.3.0"
-  checksum: 83089e77d2a91cb6805a5c910a2bedb9e50799da091f532c2ba4150efdef6e53f121523d3e2dc2573a340dc0189e648b03157097f65465b3a0c06da1f18d7e8a
+  checksum: 10c0/83089e77d2a91cb6805a5c910a2bedb9e50799da091f532c2ba4150efdef6e53f121523d3e2dc2573a340dc0189e648b03157097f65465b3a0c06da1f18d7e8a
   languageName: node
   linkType: hard
 
@@ -15197,14 +15197,14 @@ __metadata:
   dependencies:
     spdx-exceptions: "npm:^2.1.0"
     spdx-license-ids: "npm:^3.0.0"
-  checksum: 965c487e77f4fb173f1c471f3eef4eb44b9f0321adc7f93d95e7620da31faa67d29356eb02523cd7df8a7fc1ec8238773cdbf9e45bd050329d2b26492771b736
+  checksum: 10c0/965c487e77f4fb173f1c471f3eef4eb44b9f0321adc7f93d95e7620da31faa67d29356eb02523cd7df8a7fc1ec8238773cdbf9e45bd050329d2b26492771b736
   languageName: node
   linkType: hard
 
 "spdx-license-ids@npm:^3.0.0":
   version: 3.0.15
   resolution: "spdx-license-ids@npm:3.0.15"
-  checksum: 1d44fa43d2024d4533816ceffac983149f9c76214698033496e13f6224d7fe6e61649a2bb9eb6c88b5f7f71bc19cc5f0aed3dba75b430e27c06e0f71cc251959
+  checksum: 10c0/1d44fa43d2024d4533816ceffac983149f9c76214698033496e13f6224d7fe6e61649a2bb9eb6c88b5f7f71bc19cc5f0aed3dba75b430e27c06e0f71cc251959
   languageName: node
   linkType: hard
 
@@ -15218,7 +15218,7 @@ __metadata:
     obuf: "npm:^1.1.2"
     readable-stream: "npm:^3.0.6"
     wbuf: "npm:^1.7.3"
-  checksum: eaf7440fa90724fffc813c386d4a8a7427d967d6e46d7c51d8f8a533d1a6911b9823ea9218703debbae755337e85f110185d7a00ae22ec5c847077b908ce71bb
+  checksum: 10c0/eaf7440fa90724fffc813c386d4a8a7427d967d6e46d7c51d8f8a533d1a6911b9823ea9218703debbae755337e85f110185d7a00ae22ec5c847077b908ce71bb
   languageName: node
   linkType: hard
 
@@ -15231,7 +15231,7 @@ __metadata:
     http-deceiver: "npm:^1.2.7"
     select-hose: "npm:^2.0.0"
     spdy-transport: "npm:^3.0.0"
-  checksum: 983509c0be9d06fd00bb9dff713c5b5d35d3ffd720db869acdd5ad7aa6fc0e02c2318b58f75328957d8ff772acdf1f7d19382b6047df342044ff3e2d6805ccdf
+  checksum: 10c0/983509c0be9d06fd00bb9dff713c5b5d35d3ffd720db869acdd5ad7aa6fc0e02c2318b58f75328957d8ff772acdf1f7d19382b6047df342044ff3e2d6805ccdf
   languageName: node
   linkType: hard
 
@@ -15240,21 +15240,21 @@ __metadata:
   resolution: "split-string@npm:3.1.0"
   dependencies:
     extend-shallow: "npm:^3.0.0"
-  checksum: 72d7cd625445c7af215130e1e2bc183013bb9dd48a074eda1d35741e2b0dcb355e6df5b5558a62543a24dcec37dd1d6eb7a6228ff510d3c9de0f3dc1d1da8a70
+  checksum: 10c0/72d7cd625445c7af215130e1e2bc183013bb9dd48a074eda1d35741e2b0dcb355e6df5b5558a62543a24dcec37dd1d6eb7a6228ff510d3c9de0f3dc1d1da8a70
   languageName: node
   linkType: hard
 
 "split2@npm:^4.0.0, split2@npm:^4.1.0":
   version: 4.2.0
   resolution: "split2@npm:4.2.0"
-  checksum: b292beb8ce9215f8c642bb68be6249c5a4c7f332fc8ecadae7be5cbdf1ea95addc95f0459ef2e7ad9d45fd1064698a097e4eb211c83e772b49bc0ee423e91534
+  checksum: 10c0/b292beb8ce9215f8c642bb68be6249c5a4c7f332fc8ecadae7be5cbdf1ea95addc95f0459ef2e7ad9d45fd1064698a097e4eb211c83e772b49bc0ee423e91534
   languageName: node
   linkType: hard
 
 "sprintf-js@npm:~1.0.2":
   version: 1.0.3
   resolution: "sprintf-js@npm:1.0.3"
-  checksum: ecadcfe4c771890140da5023d43e190b7566d9cf8b2d238600f31bec0fc653f328da4450eb04bd59a431771a8e9cc0e118f0aa3974b683a4981b4e07abc2a5bb
+  checksum: 10c0/ecadcfe4c771890140da5023d43e190b7566d9cf8b2d238600f31bec0fc653f328da4450eb04bd59a431771a8e9cc0e118f0aa3974b683a4981b4e07abc2a5bb
   languageName: node
   linkType: hard
 
@@ -15263,7 +15263,7 @@ __metadata:
   resolution: "ssri@npm:10.0.5"
   dependencies:
     minipass: "npm:^7.0.3"
-  checksum: b091f2ae92474183c7ac5ed3f9811457e1df23df7a7e70c9476eaa9a0c4a0c8fc190fb45acefbf023ca9ee864dd6754237a697dc52a0fb182afe65d8e77443d8
+  checksum: 10c0/b091f2ae92474183c7ac5ed3f9811457e1df23df7a7e70c9476eaa9a0c4a0c8fc190fb45acefbf023ca9ee864dd6754237a697dc52a0fb182afe65d8e77443d8
   languageName: node
   linkType: hard
 
@@ -15272,14 +15272,14 @@ __metadata:
   resolution: "ssri@npm:8.0.1"
   dependencies:
     minipass: "npm:^3.1.1"
-  checksum: 5cfae216ae02dcd154d1bbed2d0a60038a4b3a2fcaac3c7e47401ff4e058e551ee74cfdba618871bf168cd583db7b8324f94af6747d4303b73cd4c3f6dc5c9c2
+  checksum: 10c0/5cfae216ae02dcd154d1bbed2d0a60038a4b3a2fcaac3c7e47401ff4e058e551ee74cfdba618871bf168cd583db7b8324f94af6747d4303b73cd4c3f6dc5c9c2
   languageName: node
   linkType: hard
 
 "stable@npm:^0.1.8":
   version: 0.1.8
   resolution: "stable@npm:0.1.8"
-  checksum: df74b5883075076e78f8e365e4068ecd977af6c09da510cfc3148a303d4b87bc9aa8f7c48feb67ed4ef970b6140bd9eabba2129e28024aa88df5ea0114cba39d
+  checksum: 10c0/df74b5883075076e78f8e365e4068ecd977af6c09da510cfc3148a303d4b87bc9aa8f7c48feb67ed4ef970b6140bd9eabba2129e28024aa88df5ea0114cba39d
   languageName: node
   linkType: hard
 
@@ -15288,7 +15288,7 @@ __metadata:
   resolution: "stack-generator@npm:2.0.10"
   dependencies:
     stackframe: "npm:^1.3.4"
-  checksum: c3f6f6c580488e65c0fee806a57f6ae4b79e6435f144be471c1f20328a8d9d8492d4f3beed31840f6dae03e2633325e2764fd3aca5c3126a0639e7c9ddfa45ce
+  checksum: 10c0/c3f6f6c580488e65c0fee806a57f6ae4b79e6435f144be471c1f20328a8d9d8492d4f3beed31840f6dae03e2633325e2764fd3aca5c3126a0639e7c9ddfa45ce
   languageName: node
   linkType: hard
 
@@ -15297,14 +15297,14 @@ __metadata:
   resolution: "stack-utils@npm:2.0.6"
   dependencies:
     escape-string-regexp: "npm:^2.0.0"
-  checksum: 651c9f87667e077584bbe848acaecc6049bc71979f1e9a46c7b920cad4431c388df0f51b8ad7cfd6eed3db97a2878d0fc8b3122979439ea8bac29c61c95eec8a
+  checksum: 10c0/651c9f87667e077584bbe848acaecc6049bc71979f1e9a46c7b920cad4431c388df0f51b8ad7cfd6eed3db97a2878d0fc8b3122979439ea8bac29c61c95eec8a
   languageName: node
   linkType: hard
 
 "stackframe@npm:^1.3.4":
   version: 1.3.4
   resolution: "stackframe@npm:1.3.4"
-  checksum: 18410f7a1e0c5d211a4effa83bdbf24adbe8faa8c34db52e1cd3e89837518c592be60b60d8b7270ac53eeeb8b807cd11b399a41667f6c9abb41059c3ccc8a989
+  checksum: 10c0/18410f7a1e0c5d211a4effa83bdbf24adbe8faa8c34db52e1cd3e89837518c592be60b60d8b7270ac53eeeb8b807cd11b399a41667f6c9abb41059c3ccc8a989
   languageName: node
   linkType: hard
 
@@ -15314,7 +15314,7 @@ __metadata:
   dependencies:
     source-map: "npm:0.5.6"
     stackframe: "npm:^1.3.4"
-  checksum: 0dcc1aa46e364a2b4d1eabce4777fecf337576a11ee3cfc92f07b9ec79ccb76810752431eeb9771289d250d0bb58dbe19a178b96bf7b2e9f773334d03aa96bb9
+  checksum: 10c0/0dcc1aa46e364a2b4d1eabce4777fecf337576a11ee3cfc92f07b9ec79ccb76810752431eeb9771289d250d0bb58dbe19a178b96bf7b2e9f773334d03aa96bb9
   languageName: node
   linkType: hard
 
@@ -15325,14 +15325,14 @@ __metadata:
     error-stack-parser: "npm:^2.0.6"
     stack-generator: "npm:^2.0.5"
     stacktrace-gps: "npm:^3.0.4"
-  checksum: 9a10c222524ca03690bcb27437b39039885223e39320367f2be36e6f750c2d198ae99189869a22c255bf60072631eb609d47e8e33661e95133686904e01121ec
+  checksum: 10c0/9a10c222524ca03690bcb27437b39039885223e39320367f2be36e6f750c2d198ae99189869a22c255bf60072631eb609d47e8e33661e95133686904e01121ec
   languageName: node
   linkType: hard
 
 "standard-as-callback@npm:^2.1.0":
   version: 2.1.0
   resolution: "standard-as-callback@npm:2.1.0"
-  checksum: 012677236e3d3fdc5689d29e64ea8a599331c4babe86956bf92fc5e127d53f85411c5536ee0079c52c43beb0026b5ce7aa1d834dd35dd026e82a15d1bcaead1f
+  checksum: 10c0/012677236e3d3fdc5689d29e64ea8a599331c4babe86956bf92fc5e127d53f85411c5536ee0079c52c43beb0026b5ce7aa1d834dd35dd026e82a15d1bcaead1f
   languageName: node
   linkType: hard
 
@@ -15342,21 +15342,21 @@ __metadata:
   dependencies:
     define-property: "npm:^0.2.5"
     object-copy: "npm:^0.1.0"
-  checksum: 284f5865a9e19d079f1badbcd70d5f9f82e7a08393f818a220839cd5f71729e89105e1c95322bd28e833161d484cee671380ca443869ae89578eef2bf55c0653
+  checksum: 10c0/284f5865a9e19d079f1badbcd70d5f9f82e7a08393f818a220839cd5f71729e89105e1c95322bd28e833161d484cee671380ca443869ae89578eef2bf55c0653
   languageName: node
   linkType: hard
 
 "statuses@npm:2.0.1":
   version: 2.0.1
   resolution: "statuses@npm:2.0.1"
-  checksum: 34378b207a1620a24804ce8b5d230fea0c279f00b18a7209646d5d47e419d1cc23e7cbf33a25a1e51ac38973dc2ac2e1e9c647a8e481ef365f77668d72becfd0
+  checksum: 10c0/34378b207a1620a24804ce8b5d230fea0c279f00b18a7209646d5d47e419d1cc23e7cbf33a25a1e51ac38973dc2ac2e1e9c647a8e481ef365f77668d72becfd0
   languageName: node
   linkType: hard
 
 "statuses@npm:>= 1.4.0 < 2":
   version: 1.5.0
   resolution: "statuses@npm:1.5.0"
-  checksum: e433900956357b3efd79b1c547da4d291799ac836960c016d10a98f6a810b1b5c0dcc13b5a7aa609a58239b5190e1ea176ad9221c2157d2fd1c747393e6b2940
+  checksum: 10c0/e433900956357b3efd79b1c547da4d291799ac836960c016d10a98f6a810b1b5c0dcc13b5a7aa609a58239b5190e1ea176ad9221c2157d2fd1c747393e6b2940
   languageName: node
   linkType: hard
 
@@ -15365,7 +15365,7 @@ __metadata:
   resolution: "stop-iteration-iterator@npm:1.0.0"
   dependencies:
     internal-slot: "npm:^1.0.4"
-  checksum: c4158d6188aac510d9e92925b58709207bd94699e9c31186a040c80932a687f84a51356b5895e6dc72710aad83addb9411c22171832c9ae0e6e11b7d61b0dfb9
+  checksum: 10c0/c4158d6188aac510d9e92925b58709207bd94699e9c31186a040c80932a687f84a51356b5895e6dc72710aad83addb9411c22171832c9ae0e6e11b7d61b0dfb9
   languageName: node
   linkType: hard
 
@@ -15375,7 +15375,7 @@ __metadata:
   dependencies:
     inherits: "npm:~2.0.1"
     readable-stream: "npm:^2.0.2"
-  checksum: 485562bd5d962d633ae178449029c6fa2611052e356bdb5668f768544aa4daa94c4f9a97de718f3f30ad98f3cb98a5f396252bb3855aff153c138f79c0e8f6ac
+  checksum: 10c0/485562bd5d962d633ae178449029c6fa2611052e356bdb5668f768544aa4daa94c4f9a97de718f3f30ad98f3cb98a5f396252bb3855aff153c138f79c0e8f6ac
   languageName: node
   linkType: hard
 
@@ -15388,14 +15388,14 @@ __metadata:
     readable-stream: "npm:^2.3.6"
     to-arraybuffer: "npm:^1.0.0"
     xtend: "npm:^4.0.0"
-  checksum: fbe7d327a29216bbabe88d3819bb8f7a502f11eeacf3212579e5af1f76fa7283f6ffa66134ab7d80928070051f571d1029e85f65ce3369fffd4c4df3669446c4
+  checksum: 10c0/fbe7d327a29216bbabe88d3819bb8f7a502f11eeacf3212579e5af1f76fa7283f6ffa66134ab7d80928070051f571d1029e85f65ce3369fffd4c4df3669446c4
   languageName: node
   linkType: hard
 
 "string-argv@npm:0.3.2":
   version: 0.3.2
   resolution: "string-argv@npm:0.3.2"
-  checksum: 75c02a83759ad1722e040b86823909d9a2fc75d15dd71ec4b537c3560746e33b5f5a07f7332d1e3f88319909f82190843aa2f0a0d8c8d591ec08e93d5b8dec82
+  checksum: 10c0/75c02a83759ad1722e040b86823909d9a2fc75d15dd71ec4b537c3560746e33b5f5a07f7332d1e3f88319909f82190843aa2f0a0d8c8d591ec08e93d5b8dec82
   languageName: node
   linkType: hard
 
@@ -15405,7 +15405,7 @@ __metadata:
   dependencies:
     char-regex: "npm:^1.0.2"
     strip-ansi: "npm:^6.0.0"
-  checksum: 1cd77409c3d7db7bc59406f6bcc9ef0783671dcbabb23597a1177c166906ef2ee7c8290f78cae73a8aec858768f189d2cb417797df5e15ec4eb5e16b3346340c
+  checksum: 10c0/1cd77409c3d7db7bc59406f6bcc9ef0783671dcbabb23597a1177c166906ef2ee7c8290f78cae73a8aec858768f189d2cb417797df5e15ec4eb5e16b3346340c
   languageName: node
   linkType: hard
 
@@ -15416,7 +15416,7 @@ __metadata:
     emoji-regex: "npm:^8.0.0"
     is-fullwidth-code-point: "npm:^3.0.0"
     strip-ansi: "npm:^6.0.1"
-  checksum: 1e525e92e5eae0afd7454086eed9c818ee84374bb80328fc41217ae72ff5f065ef1c9d7f72da41de40c75fa8bb3dee63d92373fd492c84260a552c636392a47b
+  checksum: 10c0/1e525e92e5eae0afd7454086eed9c818ee84374bb80328fc41217ae72ff5f065ef1c9d7f72da41de40c75fa8bb3dee63d92373fd492c84260a552c636392a47b
   languageName: node
   linkType: hard
 
@@ -15427,7 +15427,7 @@ __metadata:
     emoji-regex: "npm:^7.0.1"
     is-fullwidth-code-point: "npm:^2.0.0"
     strip-ansi: "npm:^5.1.0"
-  checksum: 85fa0d4f106e7999bb68c1c640c76fa69fb8c069dab75b009e29c123914e2d3b532e6cfa4b9d1bd913176fc83dedd7a2d7bf40d21a81a8a1978432cedfb65b91
+  checksum: 10c0/85fa0d4f106e7999bb68c1c640c76fa69fb8c069dab75b009e29c123914e2d3b532e6cfa4b9d1bd913176fc83dedd7a2d7bf40d21a81a8a1978432cedfb65b91
   languageName: node
   linkType: hard
 
@@ -15438,7 +15438,7 @@ __metadata:
     eastasianwidth: "npm:^0.2.0"
     emoji-regex: "npm:^9.2.2"
     strip-ansi: "npm:^7.0.1"
-  checksum: ab9c4264443d35b8b923cbdd513a089a60de339216d3b0ed3be3ba57d6880e1a192b70ae17225f764d7adbf5994e9bb8df253a944736c15a0240eff553c678ca
+  checksum: 10c0/ab9c4264443d35b8b923cbdd513a089a60de339216d3b0ed3be3ba57d6880e1a192b70ae17225f764d7adbf5994e9bb8df253a944736c15a0240eff553c678ca
   languageName: node
   linkType: hard
 
@@ -15449,7 +15449,7 @@ __metadata:
     emoji-regex: "npm:^10.3.0"
     get-east-asian-width: "npm:^1.0.0"
     strip-ansi: "npm:^7.1.0"
-  checksum: 8ffaeeccf4a56ccce5b6235d0b99ee3a581e3e3e5d453708efe7aa8e264fa3a858b4fe2244310cb71c6a20d8c05921cedc8b2ccd88cbaad9f5c92051ff68edc6
+  checksum: 10c0/8ffaeeccf4a56ccce5b6235d0b99ee3a581e3e3e5d453708efe7aa8e264fa3a858b4fe2244310cb71c6a20d8c05921cedc8b2ccd88cbaad9f5c92051ff68edc6
   languageName: node
   linkType: hard
 
@@ -15465,7 +15465,7 @@ __metadata:
     internal-slot: "npm:^1.0.3"
     regexp.prototype.flags: "npm:^1.4.3"
     side-channel: "npm:^1.0.4"
-  checksum: 644523d05c1ee93bab7474e999a5734ee5f6ad2d7ad24ed6ea8706c270dc92b352bde0f2a5420bfbeed54e28cb6a770c3800e1988a5267a70fd5e677c7750abc
+  checksum: 10c0/644523d05c1ee93bab7474e999a5734ee5f6ad2d7ad24ed6ea8706c270dc92b352bde0f2a5420bfbeed54e28cb6a770c3800e1988a5267a70fd5e677c7750abc
   languageName: node
   linkType: hard
 
@@ -15476,7 +15476,7 @@ __metadata:
     call-bind: "npm:^1.0.2"
     define-properties: "npm:^1.2.0"
     es-abstract: "npm:^1.22.1"
-  checksum: 4f76c583908bcde9a71208ddff38f67f24c9ec8093631601666a0df8b52fad44dad2368c78895ce83eb2ae8e7068294cc96a02fc971ab234e4d5c9bb61ea4e34
+  checksum: 10c0/4f76c583908bcde9a71208ddff38f67f24c9ec8093631601666a0df8b52fad44dad2368c78895ce83eb2ae8e7068294cc96a02fc971ab234e4d5c9bb61ea4e34
   languageName: node
   linkType: hard
 
@@ -15487,7 +15487,7 @@ __metadata:
     call-bind: "npm:^1.0.2"
     define-properties: "npm:^1.2.0"
     es-abstract: "npm:^1.22.1"
-  checksum: 53c24911c7c4d8d65f5ef5322de23a3d5b6b4db73273e05871d5ab4571ae5638f38f7f19d71d09116578fb060e5a145cc6a208af2d248c8baf7a34f44d32ce57
+  checksum: 10c0/53c24911c7c4d8d65f5ef5322de23a3d5b6b4db73273e05871d5ab4571ae5638f38f7f19d71d09116578fb060e5a145cc6a208af2d248c8baf7a34f44d32ce57
   languageName: node
   linkType: hard
 
@@ -15498,7 +15498,7 @@ __metadata:
     call-bind: "npm:^1.0.2"
     define-properties: "npm:^1.2.0"
     es-abstract: "npm:^1.22.1"
-  checksum: 0bcf391b41ea16d4fda9c9953d0a7075171fe090d33b4cf64849af94944c50862995672ac03e0c5dba2940a213ad7f53515a668dac859ce22a0276289ae5cf4f
+  checksum: 10c0/0bcf391b41ea16d4fda9c9953d0a7075171fe090d33b4cf64849af94944c50862995672ac03e0c5dba2940a213ad7f53515a668dac859ce22a0276289ae5cf4f
   languageName: node
   linkType: hard
 
@@ -15507,7 +15507,7 @@ __metadata:
   resolution: "string_decoder@npm:1.3.0"
   dependencies:
     safe-buffer: "npm:~5.2.0"
-  checksum: 810614ddb030e271cd591935dcd5956b2410dd079d64ff92a1844d6b7588bf992b3e1b69b0f4d34a3e06e0bd73046ac646b5264c1987b20d0601f81ef35d731d
+  checksum: 10c0/810614ddb030e271cd591935dcd5956b2410dd079d64ff92a1844d6b7588bf992b3e1b69b0f4d34a3e06e0bd73046ac646b5264c1987b20d0601f81ef35d731d
   languageName: node
   linkType: hard
 
@@ -15516,7 +15516,7 @@ __metadata:
   resolution: "string_decoder@npm:1.1.1"
   dependencies:
     safe-buffer: "npm:~5.1.0"
-  checksum: b4f89f3a92fd101b5653ca3c99550e07bdf9e13b35037e9e2a1c7b47cec4e55e06ff3fc468e314a0b5e80bfbaf65c1ca5a84978764884ae9413bec1fc6ca924e
+  checksum: 10c0/b4f89f3a92fd101b5653ca3c99550e07bdf9e13b35037e9e2a1c7b47cec4e55e06ff3fc468e314a0b5e80bfbaf65c1ca5a84978764884ae9413bec1fc6ca924e
   languageName: node
   linkType: hard
 
@@ -15527,7 +15527,7 @@ __metadata:
     get-own-enumerable-property-symbols: "npm:^3.0.0"
     is-obj: "npm:^1.0.1"
     is-regexp: "npm:^1.0.0"
-  checksum: ba8078f84128979ee24b3de9a083489cbd3c62cb8572a061b47d4d82601a8ae4b4d86fa8c54dd955593da56bb7c16a6de51c27221fdc6b7139bb4f29d815f35b
+  checksum: 10c0/ba8078f84128979ee24b3de9a083489cbd3c62cb8572a061b47d4d82601a8ae4b4d86fa8c54dd955593da56bb7c16a6de51c27221fdc6b7139bb4f29d815f35b
   languageName: node
   linkType: hard
 
@@ -15536,7 +15536,7 @@ __metadata:
   resolution: "stringz@npm:2.1.0"
   dependencies:
     char-regex: "npm:^1.0.2"
-  checksum: bc4ff36d98469f07cd7d2221067d9480b3460c3b1266585a1dccae0aee75cd3ae1fe72f23816af017585965791e410b19d8f73a75ad7189f2e836c9ee48c49f9
+  checksum: 10c0/bc4ff36d98469f07cd7d2221067d9480b3460c3b1266585a1dccae0aee75cd3ae1fe72f23816af017585965791e410b19d8f73a75ad7189f2e836c9ee48c49f9
   languageName: node
   linkType: hard
 
@@ -15545,7 +15545,7 @@ __metadata:
   resolution: "strip-ansi@npm:6.0.1"
   dependencies:
     ansi-regex: "npm:^5.0.1"
-  checksum: 1ae5f212a126fe5b167707f716942490e3933085a5ff6c008ab97ab2f272c8025d3aa218b7bd6ab25729ca20cc81cddb252102f8751e13482a5199e873680952
+  checksum: 10c0/1ae5f212a126fe5b167707f716942490e3933085a5ff6c008ab97ab2f272c8025d3aa218b7bd6ab25729ca20cc81cddb252102f8751e13482a5199e873680952
   languageName: node
   linkType: hard
 
@@ -15554,7 +15554,7 @@ __metadata:
   resolution: "strip-ansi@npm:3.0.1"
   dependencies:
     ansi-regex: "npm:^2.0.0"
-  checksum: f6e7fbe8e700105dccf7102eae20e4f03477537c74b286fd22cfc970f139002ed6f0d9c10d0e21aa9ed9245e0fa3c9275930e8795c5b947da136e4ecb644a70f
+  checksum: 10c0/f6e7fbe8e700105dccf7102eae20e4f03477537c74b286fd22cfc970f139002ed6f0d9c10d0e21aa9ed9245e0fa3c9275930e8795c5b947da136e4ecb644a70f
   languageName: node
   linkType: hard
 
@@ -15563,7 +15563,7 @@ __metadata:
   resolution: "strip-ansi@npm:5.2.0"
   dependencies:
     ansi-regex: "npm:^4.1.0"
-  checksum: de4658c8a097ce3b15955bc6008f67c0790f85748bdc025b7bc8c52c7aee94bc4f9e50624516150ed173c3db72d851826cd57e7a85fe4e4bb6dbbebd5d297fdf
+  checksum: 10c0/de4658c8a097ce3b15955bc6008f67c0790f85748bdc025b7bc8c52c7aee94bc4f9e50624516150ed173c3db72d851826cd57e7a85fe4e4bb6dbbebd5d297fdf
   languageName: node
   linkType: hard
 
@@ -15572,49 +15572,49 @@ __metadata:
   resolution: "strip-ansi@npm:7.1.0"
   dependencies:
     ansi-regex: "npm:^6.0.1"
-  checksum: a198c3762e8832505328cbf9e8c8381de14a4fa50a4f9b2160138158ea88c0f5549fb50cb13c651c3088f47e63a108b34622ec18c0499b6c8c3a5ddf6b305ac4
+  checksum: 10c0/a198c3762e8832505328cbf9e8c8381de14a4fa50a4f9b2160138158ea88c0f5549fb50cb13c651c3088f47e63a108b34622ec18c0499b6c8c3a5ddf6b305ac4
   languageName: node
   linkType: hard
 
 "strip-bom@npm:^3.0.0":
   version: 3.0.0
   resolution: "strip-bom@npm:3.0.0"
-  checksum: 51201f50e021ef16672593d7434ca239441b7b760e905d9f33df6e4f3954ff54ec0e0a06f100d028af0982d6f25c35cd5cda2ce34eaebccd0250b8befb90d8f1
+  checksum: 10c0/51201f50e021ef16672593d7434ca239441b7b760e905d9f33df6e4f3954ff54ec0e0a06f100d028af0982d6f25c35cd5cda2ce34eaebccd0250b8befb90d8f1
   languageName: node
   linkType: hard
 
 "strip-bom@npm:^4.0.0":
   version: 4.0.0
   resolution: "strip-bom@npm:4.0.0"
-  checksum: 26abad1172d6bc48985ab9a5f96c21e440f6e7e476686de49be813b5a59b3566dccb5c525b831ec54fe348283b47f3ffb8e080bc3f965fde12e84df23f6bb7ef
+  checksum: 10c0/26abad1172d6bc48985ab9a5f96c21e440f6e7e476686de49be813b5a59b3566dccb5c525b831ec54fe348283b47f3ffb8e080bc3f965fde12e84df23f6bb7ef
   languageName: node
   linkType: hard
 
 "strip-comments@npm:^2.0.1":
   version: 2.0.1
   resolution: "strip-comments@npm:2.0.1"
-  checksum: 984321b1ec47a531bdcfddd87f217590934e2d2f142198a080ec88588280239a5b58a81ca780730679b6195e52afef83673c6d6466c07c2277f71f44d7d9553d
+  checksum: 10c0/984321b1ec47a531bdcfddd87f217590934e2d2f142198a080ec88588280239a5b58a81ca780730679b6195e52afef83673c6d6466c07c2277f71f44d7d9553d
   languageName: node
   linkType: hard
 
 "strip-eof@npm:^1.0.0":
   version: 1.0.0
   resolution: "strip-eof@npm:1.0.0"
-  checksum: f336beed8622f7c1dd02f2cbd8422da9208fae81daf184f73656332899978919d5c0ca84dc6cfc49ad1fc4dd7badcde5412a063cf4e0d7f8ed95a13a63f68f45
+  checksum: 10c0/f336beed8622f7c1dd02f2cbd8422da9208fae81daf184f73656332899978919d5c0ca84dc6cfc49ad1fc4dd7badcde5412a063cf4e0d7f8ed95a13a63f68f45
   languageName: node
   linkType: hard
 
 "strip-final-newline@npm:^2.0.0":
   version: 2.0.0
   resolution: "strip-final-newline@npm:2.0.0"
-  checksum: bddf8ccd47acd85c0e09ad7375409d81653f645fda13227a9d459642277c253d877b68f2e5e4d819fe75733b0e626bac7e954c04f3236f6d196f79c94fa4a96f
+  checksum: 10c0/bddf8ccd47acd85c0e09ad7375409d81653f645fda13227a9d459642277c253d877b68f2e5e4d819fe75733b0e626bac7e954c04f3236f6d196f79c94fa4a96f
   languageName: node
   linkType: hard
 
 "strip-final-newline@npm:^3.0.0":
   version: 3.0.0
   resolution: "strip-final-newline@npm:3.0.0"
-  checksum: a771a17901427bac6293fd416db7577e2bc1c34a19d38351e9d5478c3c415f523f391003b42ed475f27e33a78233035df183525395f731d3bfb8cdcbd4da08ce
+  checksum: 10c0/a771a17901427bac6293fd416db7577e2bc1c34a19d38351e9d5478c3c415f523f391003b42ed475f27e33a78233035df183525395f731d3bfb8cdcbd4da08ce
   languageName: node
   linkType: hard
 
@@ -15623,14 +15623,14 @@ __metadata:
   resolution: "strip-indent@npm:3.0.0"
   dependencies:
     min-indent: "npm:^1.0.0"
-  checksum: ae0deaf41c8d1001c5d4fbe16cb553865c1863da4fae036683b474fa926af9fc121e155cb3fc57a68262b2ae7d5b8420aa752c97a6428c315d00efe2a3875679
+  checksum: 10c0/ae0deaf41c8d1001c5d4fbe16cb553865c1863da4fae036683b474fa926af9fc121e155cb3fc57a68262b2ae7d5b8420aa752c97a6428c315d00efe2a3875679
   languageName: node
   linkType: hard
 
 "strip-json-comments@npm:^3.1.1":
   version: 3.1.1
   resolution: "strip-json-comments@npm:3.1.1"
-  checksum: 9681a6257b925a7fa0f285851c0e613cc934a50661fa7bb41ca9cbbff89686bb4a0ee366e6ecedc4daafd01e83eee0720111ab294366fe7c185e935475ebcecd
+  checksum: 10c0/9681a6257b925a7fa0f285851c0e613cc934a50661fa7bb41ca9cbbff89686bb4a0ee366e6ecedc4daafd01e83eee0720111ab294366fe7c185e935475ebcecd
   languageName: node
   linkType: hard
 
@@ -15642,7 +15642,7 @@ __metadata:
     postcss-selector-parser: "npm:^6.0.15"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 658cac8b28edcb94d1db67808ab3aaa511cb1b9293594fc95607ee42ac4f57e742d9a1fa3ff5d5849db692971dc2a310e9ac1ed0bd4ea4bc48c80f5a6ef823fc
+  checksum: 10c0/658cac8b28edcb94d1db67808ab3aaa511cb1b9293594fc95607ee42ac4f57e742d9a1fa3ff5d5849db692971dc2a310e9ac1ed0bd4ea4bc48c80f5a6ef823fc
   languageName: node
   linkType: hard
 
@@ -15659,7 +15659,7 @@ __metadata:
   peerDependenciesMeta:
     postcss:
       optional: true
-  checksum: 9ddc92e7a5fa131b41cee1ab1f69251934ca35c0e2803dc613329cdead7b8b27d8457048a63db29f61a1442e7cdef14207f88a3abce00ec53fdefe0d604f7de3
+  checksum: 10c0/9ddc92e7a5fa131b41cee1ab1f69251934ca35c0e2803dc613329cdead7b8b27d8457048a63db29f61a1442e7cdef14207f88a3abce00ec53fdefe0d604f7de3
   languageName: node
   linkType: hard
 
@@ -15668,7 +15668,7 @@ __metadata:
   resolution: "stylelint-config-recommended@npm:14.0.0"
   peerDependencies:
     stylelint: ^16.0.0
-  checksum: 4ad15c36e8c03291aa7bbe4b672ebfb0f46ab698e7580a0da8d29644046d102d7f31dbf00a2a6eab94b565c390c6fb0d5d528737b83ac3acf6dc2ef085a90b11
+  checksum: 10c0/4ad15c36e8c03291aa7bbe4b672ebfb0f46ab698e7580a0da8d29644046d102d7f31dbf00a2a6eab94b565c390c6fb0d5d528737b83ac3acf6dc2ef085a90b11
   languageName: node
   linkType: hard
 
@@ -15684,7 +15684,7 @@ __metadata:
   peerDependenciesMeta:
     postcss:
       optional: true
-  checksum: 4abf317676184f4aaace6ce72b9fc9e2dffe051d43dd5637afc5803b062ea381e2807ae983c045dff22e96af58388a8b1fe9a8bdda9f97bc3660280cf24fb4d3
+  checksum: 10c0/4abf317676184f4aaace6ce72b9fc9e2dffe051d43dd5637afc5803b062ea381e2807ae983c045dff22e96af58388a8b1fe9a8bdda9f97bc3660280cf24fb4d3
   languageName: node
   linkType: hard
 
@@ -15695,7 +15695,7 @@ __metadata:
     stylelint-config-recommended: "npm:^14.0.0"
   peerDependencies:
     stylelint: ^16.1.0
-  checksum: 1fc9adddfc5cf0a1d7a443182a0731712a3950ace72a24081b4ede2b0bb6fc1eebd003c009f1d8d06c3a64ba9b31b0ed12512db2f91c8fa549238d8341580e4b
+  checksum: 10c0/1fc9adddfc5cf0a1d7a443182a0731712a3950ace72a24081b4ede2b0bb6fc1eebd003c009f1d8d06c3a64ba9b31b0ed12512db2f91c8fa549238d8341580e4b
   languageName: node
   linkType: hard
 
@@ -15710,7 +15710,7 @@ __metadata:
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     stylelint: ^16.0.2
-  checksum: f5e971d19ef6879ae5c18cb8fba8033fe7928f241178e6afd80357cc080d2feddfd6f7fe564aaa696008aa10345df5885d9a4471c926b3e266088e015927782e
+  checksum: 10c0/f5e971d19ef6879ae5c18cb8fba8033fe7928f241178e6afd80357cc080d2feddfd6f7fe564aaa696008aa10345df5885d9a4471c926b3e266088e015927782e
   languageName: node
   linkType: hard
 
@@ -15758,21 +15758,21 @@ __metadata:
     write-file-atomic: "npm:^5.0.1"
   bin:
     stylelint: bin/stylelint.mjs
-  checksum: 6fdf0451833c11b18c9aa502f687febd6881a912ac94f39d509b894b0f74ccb636f3dac2991c69cc82dc6190731cc2fa48e307fed477d2a0fce57067cd22b572
+  checksum: 10c0/6fdf0451833c11b18c9aa502f687febd6881a912ac94f39d509b894b0f74ccb636f3dac2991c69cc82dc6190731cc2fa48e307fed477d2a0fce57067cd22b572
   languageName: node
   linkType: hard
 
 "stylis@npm:4.2.0":
   version: 4.2.0
   resolution: "stylis@npm:4.2.0"
-  checksum: a7128ad5a8ed72652c6eba46bed4f416521bc9745a460ef5741edc725252cebf36ee45e33a8615a7057403c93df0866ab9ee955960792db210bb80abd5ac6543
+  checksum: 10c0/a7128ad5a8ed72652c6eba46bed4f416521bc9745a460ef5741edc725252cebf36ee45e33a8615a7057403c93df0866ab9ee955960792db210bb80abd5ac6543
   languageName: node
   linkType: hard
 
 "substring-trie@npm:^1.0.2":
   version: 1.0.2
   resolution: "substring-trie@npm:1.0.2"
-  checksum: ee1a65a6282f57fc4a97ded6dd057ffc597516ea7a4b0ae7374c0c0313ca4d9f3cb0652ae0294ca52232f2d5dedf13c27e9e442666d8ad51bcf91877cd18c092
+  checksum: 10c0/ee1a65a6282f57fc4a97ded6dd057ffc597516ea7a4b0ae7374c0c0313ca4d9f3cb0652ae0294ca52232f2d5dedf13c27e9e442666d8ad51bcf91877cd18c092
   languageName: node
   linkType: hard
 
@@ -15781,7 +15781,7 @@ __metadata:
   resolution: "supports-color@npm:5.5.0"
   dependencies:
     has-flag: "npm:^3.0.0"
-  checksum: 6ae5ff319bfbb021f8a86da8ea1f8db52fac8bd4d499492e30ec17095b58af11f0c55f8577390a749b1c4dde691b6a0315dab78f5f54c9b3d83f8fb5905c1c05
+  checksum: 10c0/6ae5ff319bfbb021f8a86da8ea1f8db52fac8bd4d499492e30ec17095b58af11f0c55f8577390a749b1c4dde691b6a0315dab78f5f54c9b3d83f8fb5905c1c05
   languageName: node
   linkType: hard
 
@@ -15790,7 +15790,7 @@ __metadata:
   resolution: "supports-color@npm:6.1.0"
   dependencies:
     has-flag: "npm:^3.0.0"
-  checksum: ebf2befe41b55932c6d77192b91775f1403c389440ce2dab6f72663cf32ee87a1d9dea3512131a18e45ccac91424a8873b266142828489d0206d65ee93d224b6
+  checksum: 10c0/ebf2befe41b55932c6d77192b91775f1403c389440ce2dab6f72663cf32ee87a1d9dea3512131a18e45ccac91424a8873b266142828489d0206d65ee93d224b6
   languageName: node
   linkType: hard
 
@@ -15799,7 +15799,7 @@ __metadata:
   resolution: "supports-color@npm:7.2.0"
   dependencies:
     has-flag: "npm:^4.0.0"
-  checksum: afb4c88521b8b136b5f5f95160c98dee7243dc79d5432db7efc27efb219385bbc7d9427398e43dd6cc730a0f87d5085ce1652af7efbe391327bc0a7d0f7fc124
+  checksum: 10c0/afb4c88521b8b136b5f5f95160c98dee7243dc79d5432db7efc27efb219385bbc7d9427398e43dd6cc730a0f87d5085ce1652af7efbe391327bc0a7d0f7fc124
   languageName: node
   linkType: hard
 
@@ -15808,7 +15808,7 @@ __metadata:
   resolution: "supports-color@npm:8.1.1"
   dependencies:
     has-flag: "npm:^4.0.0"
-  checksum: ea1d3c275dd604c974670f63943ed9bd83623edc102430c05adb8efc56ba492746b6e95386e7831b872ec3807fd89dd8eb43f735195f37b5ec343e4234cc7e89
+  checksum: 10c0/ea1d3c275dd604c974670f63943ed9bd83623edc102430c05adb8efc56ba492746b6e95386e7831b872ec3807fd89dd8eb43f735195f37b5ec343e4234cc7e89
   languageName: node
   linkType: hard
 
@@ -15818,28 +15818,28 @@ __metadata:
   dependencies:
     has-flag: "npm:^4.0.0"
     supports-color: "npm:^7.0.0"
-  checksum: 36aaa55e67645dded8e0f846fd81d7dd05ce82ea81e62347f58d86213577eb627b2b45298656ce7a70e7155e39f071d0d3f83be91e112aed801ebaa8db1ef1d0
+  checksum: 10c0/36aaa55e67645dded8e0f846fd81d7dd05ce82ea81e62347f58d86213577eb627b2b45298656ce7a70e7155e39f071d0d3f83be91e112aed801ebaa8db1ef1d0
   languageName: node
   linkType: hard
 
 "supports-preserve-symlinks-flag@npm:^1.0.0":
   version: 1.0.0
   resolution: "supports-preserve-symlinks-flag@npm:1.0.0"
-  checksum: 6c4032340701a9950865f7ae8ef38578d8d7053f5e10518076e6554a9381fa91bd9c6850193695c141f32b21f979c985db07265a758867bac95de05f7d8aeb39
+  checksum: 10c0/6c4032340701a9950865f7ae8ef38578d8d7053f5e10518076e6554a9381fa91bd9c6850193695c141f32b21f979c985db07265a758867bac95de05f7d8aeb39
   languageName: node
   linkType: hard
 
 "svg-parser@npm:^2.0.2":
   version: 2.0.4
   resolution: "svg-parser@npm:2.0.4"
-  checksum: 02f6cb155dd7b63ebc2f44f36365bc294543bebb81b614b7628f1af3c54ab64f7e1cec20f06e252bf95bdde78441ae295a412c68ad1678f16a6907d924512b7a
+  checksum: 10c0/02f6cb155dd7b63ebc2f44f36365bc294543bebb81b614b7628f1af3c54ab64f7e1cec20f06e252bf95bdde78441ae295a412c68ad1678f16a6907d924512b7a
   languageName: node
   linkType: hard
 
 "svg-tags@npm:^1.0.0":
   version: 1.0.0
   resolution: "svg-tags@npm:1.0.0"
-  checksum: 5867e29e8f431bf7aecf5a244d1af5725f80a1086187dbc78f26d8433b5e96b8fe9361aeb10d1699ff483b9afec785a10916b9312fe9d734d1a7afd48226c954
+  checksum: 10c0/5867e29e8f431bf7aecf5a244d1af5725f80a1086187dbc78f26d8433b5e96b8fe9361aeb10d1699ff483b9afec785a10916b9312fe9d734d1a7afd48226c954
   languageName: node
   linkType: hard
 
@@ -15862,7 +15862,7 @@ __metadata:
     util.promisify: "npm:~1.0.0"
   bin:
     svgo: ./bin/svgo
-  checksum: 261a82b08acf63accd7a54b47b4ffcd2fc7e7d7f8efef3cbc61184583b24b4c5434656004c30190302821af0f6d7b047eac730b0dcdab5d179e6a74383ccc776
+  checksum: 10c0/261a82b08acf63accd7a54b47b4ffcd2fc7e7d7f8efef3cbc61184583b24b4c5434656004c30190302821af0f6d7b047eac730b0dcdab5d179e6a74383ccc776
   languageName: node
   linkType: hard
 
@@ -15879,14 +15879,14 @@ __metadata:
     picocolors: "npm:^1.0.0"
   bin:
     svgo: ./bin/svgo
-  checksum: 28fa9061ccbcf2e3616d48d1feb613aaa05f8f290a329beb0e585914f1864385152934a7d4d683a4609fafbae3d51666633437c359c5c5ef74fb58ad09092a7c
+  checksum: 10c0/28fa9061ccbcf2e3616d48d1feb613aaa05f8f290a329beb0e585914f1864385152934a7d4d683a4609fafbae3d51666633437c359c5c5ef74fb58ad09092a7c
   languageName: node
   linkType: hard
 
 "symbol-tree@npm:^3.2.4":
   version: 3.2.4
   resolution: "symbol-tree@npm:3.2.4"
-  checksum: dfbe201ae09ac6053d163578778c53aa860a784147ecf95705de0cd23f42c851e1be7889241495e95c37cabb058edb1052f141387bef68f705afc8f9dd358509
+  checksum: 10c0/dfbe201ae09ac6053d163578778c53aa860a784147ecf95705de0cd23f42c851e1be7889241495e95c37cabb058edb1052f141387bef68f705afc8f9dd358509
   languageName: node
   linkType: hard
 
@@ -15896,7 +15896,7 @@ __metadata:
   dependencies:
     "@pkgr/utils": "npm:^2.4.2"
     tslib: "npm:^2.6.2"
-  checksum: 200528062e3915a0190a4c6b1e01436fcfdf812e2e8d977746746f3998bb4182d758af760e51b06a64f8323e705735aff7b4b3efc4a0ab5f75eaccc044a8cfcc
+  checksum: 10c0/200528062e3915a0190a4c6b1e01436fcfdf812e2e8d977746746f3998bb4182d758af760e51b06a64f8323e705735aff7b4b3efc4a0ab5f75eaccc044a8cfcc
   languageName: node
   linkType: hard
 
@@ -15909,21 +15909,21 @@ __metadata:
     slice-ansi: "npm:^4.0.0"
     string-width: "npm:^4.2.3"
     strip-ansi: "npm:^6.0.1"
-  checksum: 591ed84b2438b01c9bc02248e2238e21e8bfb73654bc5acca0d469053eb39be3db2f57d600dcf08ac983b6f50f80842c44612c03877567c2afee3aec4a033e5f
+  checksum: 10c0/591ed84b2438b01c9bc02248e2238e21e8bfb73654bc5acca0d469053eb39be3db2f57d600dcf08ac983b6f50f80842c44612c03877567c2afee3aec4a033e5f
   languageName: node
   linkType: hard
 
 "tapable@npm:^1.0, tapable@npm:^1.0.0, tapable@npm:^1.1.3":
   version: 1.1.3
   resolution: "tapable@npm:1.1.3"
-  checksum: c9f0265e55e45821ec672b9b9ee8a35d95bf3ea6b352199f8606a2799018e89cfe4433c554d424b31fc67c4be26b05d4f36dc3c607def416fdb2514cd63dba50
+  checksum: 10c0/c9f0265e55e45821ec672b9b9ee8a35d95bf3ea6b352199f8606a2799018e89cfe4433c554d424b31fc67c4be26b05d4f36dc3c607def416fdb2514cd63dba50
   languageName: node
   linkType: hard
 
 "tapable@npm:^2.2.0":
   version: 2.2.1
   resolution: "tapable@npm:2.2.1"
-  checksum: bc40e6efe1e554d075469cedaba69a30eeb373552aaf41caeaaa45bf56ffacc2674261b106245bd566b35d8f3329b52d838e851ee0a852120acae26e622925c9
+  checksum: 10c0/bc40e6efe1e554d075469cedaba69a30eeb373552aaf41caeaaa45bf56ffacc2674261b106245bd566b35d8f3329b52d838e851ee0a852120acae26e622925c9
   languageName: node
   linkType: hard
 
@@ -15937,7 +15937,7 @@ __metadata:
     minizlib: "npm:^2.1.1"
     mkdirp: "npm:^1.0.3"
     yallist: "npm:^4.0.0"
-  checksum: 02ca064a1a6b4521fef88c07d389ac0936730091f8c02d30ea60d472e0378768e870769ab9e986d87807bfee5654359cf29ff4372746cc65e30cbddc352660d8
+  checksum: 10c0/02ca064a1a6b4521fef88c07d389ac0936730091f8c02d30ea60d472e0378768e870769ab9e986d87807bfee5654359cf29ff4372746cc65e30cbddc352660d8
   languageName: node
   linkType: hard
 
@@ -15946,14 +15946,14 @@ __metadata:
   resolution: "tdigest@npm:0.1.2"
   dependencies:
     bintrees: "npm:1.0.2"
-  checksum: 10187b8144b112fcdfd3a5e4e9068efa42c990b1e30cd0d4f35ee8f58f16d1b41bc587e668fa7a6f6ca31308961cbd06cd5d4a4ae1dc388335902ae04f7d57df
+  checksum: 10c0/10187b8144b112fcdfd3a5e4e9068efa42c990b1e30cd0d4f35ee8f58f16d1b41bc587e668fa7a6f6ca31308961cbd06cd5d4a4ae1dc388335902ae04f7d57df
   languageName: node
   linkType: hard
 
 "temp-dir@npm:^2.0.0":
   version: 2.0.0
   resolution: "temp-dir@npm:2.0.0"
-  checksum: b1df969e3f3f7903f3426861887ed76ba3b495f63f6d0c8e1ce22588679d9384d336df6064210fda14e640ed422e2a17d5c40d901f60e161c99482d723f4d309
+  checksum: 10c0/b1df969e3f3f7903f3426861887ed76ba3b495f63f6d0c8e1ce22588679d9384d336df6064210fda14e640ed422e2a17d5c40d901f60e161c99482d723f4d309
   languageName: node
   linkType: hard
 
@@ -15965,7 +15965,7 @@ __metadata:
     temp-dir: "npm:^2.0.0"
     type-fest: "npm:^0.16.0"
     unique-string: "npm:^2.0.0"
-  checksum: ca0882276732d1313b85006b0427620cb4a8d7a57738a2311a72befae60ed152be7d5b41b951dcb447a01a35404bed76f33eb4e37c55263cd7f807eee1187f8f
+  checksum: 10c0/ca0882276732d1313b85006b0427620cb4a8d7a57738a2311a72befae60ed152be7d5b41b951dcb447a01a35404bed76f33eb4e37c55263cd7f807eee1187f8f
   languageName: node
   linkType: hard
 
@@ -15984,7 +15984,7 @@ __metadata:
     webpack-sources: "npm:^1.4.3"
   peerDependencies:
     webpack: ^4.0.0 || ^5.0.0
-  checksum: 52bd036b72b596b162e65dce314f1ee7ba1e82b97200d919b61ad50592dc72608b5fe50d7e3f6c0934e42183dfc746b98b922c9e1d00d75253933f799687fa4b
+  checksum: 10c0/52bd036b72b596b162e65dce314f1ee7ba1e82b97200d919b61ad50592dc72608b5fe50d7e3f6c0934e42183dfc746b98b922c9e1d00d75253933f799687fa4b
   languageName: node
   linkType: hard
 
@@ -15998,14 +15998,14 @@ __metadata:
     source-map-support: "npm:~0.5.20"
   bin:
     terser: bin/terser
-  checksum: 39c6687609f5b9061f2fb82bee02d2f9d7756fcb5bd50c67da1482f52cf5977e03e0c5df5cb4ce17e549428024c8859075137c461ec4a9ae8cf91a505759255a
+  checksum: 10c0/39c6687609f5b9061f2fb82bee02d2f9d7756fcb5bd50c67da1482f52cf5977e03e0c5df5cb4ce17e549428024c8859075137c461ec4a9ae8cf91a505759255a
   languageName: node
   linkType: hard
 
 "tesseract.js-core@npm:^2.2.0":
   version: 2.2.0
   resolution: "tesseract.js-core@npm:2.2.0"
-  checksum: 9ef569529f1ee96f8bf18388ef086d4940d3f02d28b4252df133a9bd36f6a9d140085e77a12ff1963cf9b4cd85bd1c644b61eca266ecfc51bb83adb30a1f11e3
+  checksum: 10c0/9ef569529f1ee96f8bf18388ef086d4940d3f02d28b4252df133a9bd36f6a9d140085e77a12ff1963cf9b4cd85bd1c644b61eca266ecfc51bb83adb30a1f11e3
   languageName: node
   linkType: hard
 
@@ -16026,7 +16026,7 @@ __metadata:
     resolve-url: "npm:^0.2.1"
     tesseract.js-core: "npm:^2.2.0"
     zlibjs: "npm:^0.3.1"
-  checksum: b3aaee9189f3bc7f4217b83e110d0dd4d9afcafc3045b842f72b7ca9beb00bec732bc6b4b00eca14167c16b014c437fcf83dd272a640c9c8b5e1e9b55ea00ff5
+  checksum: 10c0/b3aaee9189f3bc7f4217b83e110d0dd4d9afcafc3045b842f72b7ca9beb00bec732bc6b4b00eca14167c16b014c437fcf83dd272a640c9c8b5e1e9b55ea00ff5
   languageName: node
   linkType: hard
 
@@ -16037,14 +16037,14 @@ __metadata:
     "@istanbuljs/schema": "npm:^0.1.2"
     glob: "npm:^7.1.4"
     minimatch: "npm:^3.0.4"
-  checksum: 019d33d81adff3f9f1bfcff18125fb2d3c65564f437d9be539270ee74b994986abb8260c7c2ce90e8f30162178b09dbbce33c6389273afac4f36069c48521f57
+  checksum: 10c0/019d33d81adff3f9f1bfcff18125fb2d3c65564f437d9be539270ee74b994986abb8260c7c2ce90e8f30162178b09dbbce33c6389273afac4f36069c48521f57
   languageName: node
   linkType: hard
 
 "text-table@npm:^0.2.0":
   version: 0.2.0
   resolution: "text-table@npm:0.2.0"
-  checksum: 02805740c12851ea5982686810702e2f14369a5f4c5c40a836821e3eefc65ffeec3131ba324692a37608294b0fd8c1e55a2dd571ffed4909822787668ddbee5c
+  checksum: 10c0/02805740c12851ea5982686810702e2f14369a5f4c5c40a836821e3eefc65ffeec3131ba324692a37608294b0fd8c1e55a2dd571ffed4909822787668ddbee5c
   languageName: node
   linkType: hard
 
@@ -16053,14 +16053,14 @@ __metadata:
   resolution: "thread-stream@npm:2.4.1"
   dependencies:
     real-require: "npm:^0.2.0"
-  checksum: ce29265810b9550ce896726301ff006ebfe96b90292728f07cfa4c379740585583046e2a8018afc53aca66b18fed12b33a84f3883e7ebc317185f6682898b8f8
+  checksum: 10c0/ce29265810b9550ce896726301ff006ebfe96b90292728f07cfa4c379740585583046e2a8018afc53aca66b18fed12b33a84f3883e7ebc317185f6682898b8f8
   languageName: node
   linkType: hard
 
 "thunky@npm:^1.0.2":
   version: 1.1.0
   resolution: "thunky@npm:1.1.0"
-  checksum: 369764f39de1ce1de2ba2fa922db4a3f92e9c7f33bcc9a713241bc1f4a5238b484c17e0d36d1d533c625efb00e9e82c3e45f80b47586945557b45abb890156d2
+  checksum: 10c0/369764f39de1ce1de2ba2fa922db4a3f92e9c7f33bcc9a713241bc1f4a5238b484c17e0d36d1d533c625efb00e9e82c3e45f80b47586945557b45abb890156d2
   languageName: node
   linkType: hard
 
@@ -16069,56 +16069,56 @@ __metadata:
   resolution: "timers-browserify@npm:2.0.12"
   dependencies:
     setimmediate: "npm:^1.0.4"
-  checksum: 98e84db1a685bc8827c117a8bc62aac811ad56a995d07938fc7ed8cdc5bf3777bfe2d4e5da868847194e771aac3749a20f6cdd22091300fe889a76fe214a4641
+  checksum: 10c0/98e84db1a685bc8827c117a8bc62aac811ad56a995d07938fc7ed8cdc5bf3777bfe2d4e5da868847194e771aac3749a20f6cdd22091300fe889a76fe214a4641
   languageName: node
   linkType: hard
 
 "tiny-invariant@npm:^1.0.2":
   version: 1.3.1
   resolution: "tiny-invariant@npm:1.3.1"
-  checksum: 5b87c1d52847d9452b60d0dcb77011b459044e0361ca8253bfe7b43d6288106e12af926adb709a6fc28900e3864349b91dad9a4ac93c39aa15f360b26c2ff4db
+  checksum: 10c0/5b87c1d52847d9452b60d0dcb77011b459044e0361ca8253bfe7b43d6288106e12af926adb709a6fc28900e3864349b91dad9a4ac93c39aa15f360b26c2ff4db
   languageName: node
   linkType: hard
 
 "tiny-queue@npm:^0.2.1":
   version: 0.2.1
   resolution: "tiny-queue@npm:0.2.1"
-  checksum: 710c658bf84f5e1fe72f2a2d6fbc8e6d078ede1d367968b7d16ca01639ab34aeae9d200b8228c78fe2346bcb16e1654bd013f501e9f7dea687488479438dc0d1
+  checksum: 10c0/710c658bf84f5e1fe72f2a2d6fbc8e6d078ede1d367968b7d16ca01639ab34aeae9d200b8228c78fe2346bcb16e1654bd013f501e9f7dea687488479438dc0d1
   languageName: node
   linkType: hard
 
 "tiny-warning@npm:^1.0.0":
   version: 1.0.3
   resolution: "tiny-warning@npm:1.0.3"
-  checksum: ef8531f581b30342f29670cb41ca248001c6fd7975ce22122bd59b8d62b4fc84ad4207ee7faa95cde982fa3357cd8f4be650142abc22805538c3b1392d7084fa
+  checksum: 10c0/ef8531f581b30342f29670cb41ca248001c6fd7975ce22122bd59b8d62b4fc84ad4207ee7faa95cde982fa3357cd8f4be650142abc22805538c3b1392d7084fa
   languageName: node
   linkType: hard
 
 "titleize@npm:^3.0.0":
   version: 3.0.0
   resolution: "titleize@npm:3.0.0"
-  checksum: 5ae6084ba299b5782f95e3fe85ea9f0fa4d74b8ae722b6b3208157e975589fbb27733aeba4e5080fa9314a856044ef52caa61b87caea4b1baade951a55c06336
+  checksum: 10c0/5ae6084ba299b5782f95e3fe85ea9f0fa4d74b8ae722b6b3208157e975589fbb27733aeba4e5080fa9314a856044ef52caa61b87caea4b1baade951a55c06336
   languageName: node
   linkType: hard
 
 "tmpl@npm:1.0.5":
   version: 1.0.5
   resolution: "tmpl@npm:1.0.5"
-  checksum: f935537799c2d1922cb5d6d3805f594388f75338fe7a4a9dac41504dd539704ca4db45b883b52e7b0aa5b2fd5ddadb1452bf95cd23a69da2f793a843f9451cc9
+  checksum: 10c0/f935537799c2d1922cb5d6d3805f594388f75338fe7a4a9dac41504dd539704ca4db45b883b52e7b0aa5b2fd5ddadb1452bf95cd23a69da2f793a843f9451cc9
   languageName: node
   linkType: hard
 
 "to-arraybuffer@npm:^1.0.0":
   version: 1.0.1
   resolution: "to-arraybuffer@npm:1.0.1"
-  checksum: 2460bd95524f4845a751e4f8bf9937f9f3dcd1651f104e1512868782f858f8302c1cf25bbc30794bc1b3ff65c4e135158377302f2abaff43a2d8e3c38dfe098c
+  checksum: 10c0/2460bd95524f4845a751e4f8bf9937f9f3dcd1651f104e1512868782f858f8302c1cf25bbc30794bc1b3ff65c4e135158377302f2abaff43a2d8e3c38dfe098c
   languageName: node
   linkType: hard
 
 "to-fast-properties@npm:^2.0.0":
   version: 2.0.0
   resolution: "to-fast-properties@npm:2.0.0"
-  checksum: b214d21dbfb4bce3452b6244b336806ffea9c05297148d32ebb428d5c43ce7545bdfc65a1ceb58c9ef4376a65c0cb2854d645f33961658b3e3b4f84910ddcdd7
+  checksum: 10c0/b214d21dbfb4bce3452b6244b336806ffea9c05297148d32ebb428d5c43ce7545bdfc65a1ceb58c9ef4376a65c0cb2854d645f33961658b3e3b4f84910ddcdd7
   languageName: node
   linkType: hard
 
@@ -16127,7 +16127,7 @@ __metadata:
   resolution: "to-object-path@npm:0.3.0"
   dependencies:
     kind-of: "npm:^3.0.2"
-  checksum: 731832a977614c03a770363ad2bd9e9c82f233261861724a8e612bb90c705b94b1a290a19f52958e8e179180bb9b71121ed65e245691a421467726f06d1d7fc3
+  checksum: 10c0/731832a977614c03a770363ad2bd9e9c82f233261861724a8e612bb90c705b94b1a290a19f52958e8e179180bb9b71121ed65e245691a421467726f06d1d7fc3
   languageName: node
   linkType: hard
 
@@ -16137,7 +16137,7 @@ __metadata:
   dependencies:
     is-number: "npm:^3.0.0"
     repeat-string: "npm:^1.6.1"
-  checksum: 440d82dbfe0b2e24f36dd8a9467240406ad1499fc8b2b0f547372c22ed1d092ace2a3eb522bb09bfd9c2f39bf1ca42eb78035cf6d2b8c9f5c78da3abc96cd949
+  checksum: 10c0/440d82dbfe0b2e24f36dd8a9467240406ad1499fc8b2b0f547372c22ed1d092ace2a3eb522bb09bfd9c2f39bf1ca42eb78035cf6d2b8c9f5c78da3abc96cd949
   languageName: node
   linkType: hard
 
@@ -16146,7 +16146,7 @@ __metadata:
   resolution: "to-regex-range@npm:5.0.1"
   dependencies:
     is-number: "npm:^7.0.0"
-  checksum: 487988b0a19c654ff3e1961b87f471702e708fa8a8dd02a298ef16da7206692e8552a0250e8b3e8759270f62e9d8314616f6da274734d3b558b1fc7b7724e892
+  checksum: 10c0/487988b0a19c654ff3e1961b87f471702e708fa8a8dd02a298ef16da7206692e8552a0250e8b3e8759270f62e9d8314616f6da274734d3b558b1fc7b7724e892
   languageName: node
   linkType: hard
 
@@ -16158,21 +16158,21 @@ __metadata:
     extend-shallow: "npm:^3.0.2"
     regex-not: "npm:^1.0.2"
     safe-regex: "npm:^1.1.0"
-  checksum: 99d0b8ef397b3f7abed4bac757b0f0bb9f52bfd39167eb7105b144becfaa9a03756892352d01ac6a911f0c1ceef9f81db68c46899521a3eed054082042796120
+  checksum: 10c0/99d0b8ef397b3f7abed4bac757b0f0bb9f52bfd39167eb7105b144becfaa9a03756892352d01ac6a911f0c1ceef9f81db68c46899521a3eed054082042796120
   languageName: node
   linkType: hard
 
 "toidentifier@npm:1.0.1":
   version: 1.0.1
   resolution: "toidentifier@npm:1.0.1"
-  checksum: 93937279934bd66cc3270016dd8d0afec14fb7c94a05c72dc57321f8bd1fa97e5bea6d1f7c89e728d077ca31ea125b78320a616a6c6cd0e6b9cb94cb864381c1
+  checksum: 10c0/93937279934bd66cc3270016dd8d0afec14fb7c94a05c72dc57321f8bd1fa97e5bea6d1f7c89e728d077ca31ea125b78320a616a6c6cd0e6b9cb94cb864381c1
   languageName: node
   linkType: hard
 
 "totalist@npm:^3.0.0":
   version: 3.0.1
   resolution: "totalist@npm:3.0.1"
-  checksum: 4bb1fadb69c3edbef91c73ebef9d25b33bbf69afe1e37ce544d5f7d13854cda15e47132f3e0dc4cafe300ddb8578c77c50a65004d8b6e97e77934a69aa924863
+  checksum: 10c0/4bb1fadb69c3edbef91c73ebef9d25b33bbf69afe1e37ce544d5f7d13854cda15e47132f3e0dc4cafe300ddb8578c77c50a65004d8b6e97e77934a69aa924863
   languageName: node
   linkType: hard
 
@@ -16184,7 +16184,7 @@ __metadata:
     punycode: "npm:^2.1.1"
     universalify: "npm:^0.2.0"
     url-parse: "npm:^1.5.3"
-  checksum: 4fc0433a0cba370d57c4b240f30440c848906dee3180bb6e85033143c2726d322e7e4614abb51d42d111ebec119c4876ed8d7247d4113563033eebbc1739c831
+  checksum: 10c0/4fc0433a0cba370d57c4b240f30440c848906dee3180bb6e85033143c2726d322e7e4614abb51d42d111ebec119c4876ed8d7247d4113563033eebbc1739c831
   languageName: node
   linkType: hard
 
@@ -16193,7 +16193,7 @@ __metadata:
   resolution: "tr46@npm:1.0.1"
   dependencies:
     punycode: "npm:^2.1.0"
-  checksum: 41525c2ccce86e3ef30af6fa5e1464e6d8bb4286a58ea8db09228f598889581ef62347153f6636cd41553dc41685bdfad0a9d032ef58df9fbb0792b3447d0f04
+  checksum: 10c0/41525c2ccce86e3ef30af6fa5e1464e6d8bb4286a58ea8db09228f598889581ef62347153f6636cd41553dc41685bdfad0a9d032ef58df9fbb0792b3447d0f04
   languageName: node
   linkType: hard
 
@@ -16202,7 +16202,7 @@ __metadata:
   resolution: "tr46@npm:3.0.0"
   dependencies:
     punycode: "npm:^2.1.1"
-  checksum: cdc47cad3a9d0b6cb293e39ccb1066695ae6fdd39b9e4f351b010835a1f8b4f3a6dc3a55e896b421371187f22b48d7dac1b693de4f6551bdef7b6ab6735dfe3b
+  checksum: 10c0/cdc47cad3a9d0b6cb293e39ccb1066695ae6fdd39b9e4f351b010835a1f8b4f3a6dc3a55e896b421371187f22b48d7dac1b693de4f6551bdef7b6ab6735dfe3b
   languageName: node
   linkType: hard
 
@@ -16211,14 +16211,14 @@ __metadata:
   resolution: "tr46@npm:5.0.0"
   dependencies:
     punycode: "npm:^2.3.1"
-  checksum: 1521b6e7bbc8adc825c4561480f9fe48eb2276c81335eed9fa610aa4c44a48a3221f78b10e5f18b875769eb3413e30efbf209ed556a17a42aa8d690df44b7bee
+  checksum: 10c0/1521b6e7bbc8adc825c4561480f9fe48eb2276c81335eed9fa610aa4c44a48a3221f78b10e5f18b875769eb3413e30efbf209ed556a17a42aa8d690df44b7bee
   languageName: node
   linkType: hard
 
 "tr46@npm:~0.0.3":
   version: 0.0.3
   resolution: "tr46@npm:0.0.3"
-  checksum: 047cb209a6b60c742f05c9d3ace8fa510bff609995c129a37ace03476a9b12db4dbf975e74600830ef0796e18882b2381fb5fb1f6b4f96b832c374de3ab91a11
+  checksum: 10c0/047cb209a6b60c742f05c9d3ace8fa510bff609995c129a37ace03476a9b12db4dbf975e74600830ef0796e18882b2381fb5fb1f6b4f96b832c374de3ab91a11
   languageName: node
   linkType: hard
 
@@ -16227,7 +16227,7 @@ __metadata:
   resolution: "ts-api-utils@npm:1.0.3"
   peerDependencies:
     typescript: ">=4.2.0"
-  checksum: 9408338819c3aca2a709f0bc54e3f874227901506cacb1163612a6c8a43df224174feb965a5eafdae16f66fc68fd7bfee8d3275d0fa73fbb8699e03ed26520c9
+  checksum: 10c0/9408338819c3aca2a709f0bc54e3f874227901506cacb1163612a6c8a43df224174feb965a5eafdae16f66fc68fd7bfee8d3275d0fa73fbb8699e03ed26520c9
   languageName: node
   linkType: hard
 
@@ -16239,28 +16239,28 @@ __metadata:
     json5: "npm:^1.0.2"
     minimist: "npm:^1.2.6"
     strip-bom: "npm:^3.0.0"
-  checksum: 5b4f301a2b7a3766a986baf8fc0e177eb80bdba6e396792ff92dc23b5bca8bb279fc96517dcaaef63a3b49bebc6c4c833653ec58155780bc906bdbcf7dda0ef5
+  checksum: 10c0/5b4f301a2b7a3766a986baf8fc0e177eb80bdba6e396792ff92dc23b5bca8bb279fc96517dcaaef63a3b49bebc6c4c833653ec58155780bc906bdbcf7dda0ef5
   languageName: node
   linkType: hard
 
 "tslib@npm:2.6.2, tslib@npm:^2.4.0, tslib@npm:^2.6.0, tslib@npm:^2.6.2":
   version: 2.6.2
   resolution: "tslib@npm:2.6.2"
-  checksum: e03a8a4271152c8b26604ed45535954c0a45296e32445b4b87f8a5abdb2421f40b59b4ca437c4346af0f28179780d604094eb64546bee2019d903d01c6c19bdb
+  checksum: 10c0/e03a8a4271152c8b26604ed45535954c0a45296e32445b4b87f8a5abdb2421f40b59b4ca437c4346af0f28179780d604094eb64546bee2019d903d01c6c19bdb
   languageName: node
   linkType: hard
 
 "tty-browserify@npm:0.0.0":
   version: 0.0.0
   resolution: "tty-browserify@npm:0.0.0"
-  checksum: c0c68206565f1372e924d5cdeeff1a0d9cc729833f1da98c03d78be8f939e5f61a107bd0ab77d1ef6a47d62bb0e48b1081fbea273acf404959e22fd3891439c5
+  checksum: 10c0/c0c68206565f1372e924d5cdeeff1a0d9cc729833f1da98c03d78be8f939e5f61a107bd0ab77d1ef6a47d62bb0e48b1081fbea273acf404959e22fd3891439c5
   languageName: node
   linkType: hard
 
 "twemoji-parser@npm:^11.0.2":
   version: 11.0.2
   resolution: "twemoji-parser@npm:11.0.2"
-  checksum: b06116434ef19dcf34fcc44129482dcf561a4f78fd6525aba55329b5a50b525c68125f95d040e9274cd9a1f3e8315b8e6842bb735c68069530a9cb28422130d6
+  checksum: 10c0/b06116434ef19dcf34fcc44129482dcf561a4f78fd6525aba55329b5a50b525c68125f95d040e9274cd9a1f3e8315b8e6842bb735c68069530a9cb28422130d6
   languageName: node
   linkType: hard
 
@@ -16272,7 +16272,7 @@ __metadata:
     core-js: "npm:^2.5.0"
     punycode: "npm:1.4.1"
     twemoji-parser: "npm:^11.0.2"
-  checksum: 34f2b42df7a0cde707ae3d9138b0232eabced946ab9f825b2500fbcc0c8be8a494fdf98ab5f4c44d7c652843c0c3846ab0aba952c7e3ca90aad69edb06dccdf5
+  checksum: 10c0/34f2b42df7a0cde707ae3d9138b0232eabced946ab9f825b2500fbcc0c8be8a494fdf98ab5f4c44d7c652843c0c3846ab0aba952c7e3ca90aad69edb06dccdf5
   languageName: node
   linkType: hard
 
@@ -16281,42 +16281,42 @@ __metadata:
   resolution: "type-check@npm:0.4.0"
   dependencies:
     prelude-ls: "npm:^1.2.1"
-  checksum: 7b3fd0ed43891e2080bf0c5c504b418fbb3e5c7b9708d3d015037ba2e6323a28152ec163bcb65212741fa5d2022e3075ac3c76440dbd344c9035f818e8ecee58
+  checksum: 10c0/7b3fd0ed43891e2080bf0c5c504b418fbb3e5c7b9708d3d015037ba2e6323a28152ec163bcb65212741fa5d2022e3075ac3c76440dbd344c9035f818e8ecee58
   languageName: node
   linkType: hard
 
 "type-detect@npm:4.0.8":
   version: 4.0.8
   resolution: "type-detect@npm:4.0.8"
-  checksum: 8fb9a51d3f365a7de84ab7f73b653534b61b622aa6800aecdb0f1095a4a646d3f5eb295322127b6573db7982afcd40ab492d038cf825a42093a58b1e1353e0bd
+  checksum: 10c0/8fb9a51d3f365a7de84ab7f73b653534b61b622aa6800aecdb0f1095a4a646d3f5eb295322127b6573db7982afcd40ab492d038cf825a42093a58b1e1353e0bd
   languageName: node
   linkType: hard
 
 "type-fest@npm:^0.16.0":
   version: 0.16.0
   resolution: "type-fest@npm:0.16.0"
-  checksum: 6b4d846534e7bcb49a6160b068ffaed2b62570d989d909ac3f29df5ef1e993859f890a4242eebe023c9e923f96adbcb3b3e88a198c35a1ee9a731e147a6839c3
+  checksum: 10c0/6b4d846534e7bcb49a6160b068ffaed2b62570d989d909ac3f29df5ef1e993859f890a4242eebe023c9e923f96adbcb3b3e88a198c35a1ee9a731e147a6839c3
   languageName: node
   linkType: hard
 
 "type-fest@npm:^0.20.2":
   version: 0.20.2
   resolution: "type-fest@npm:0.20.2"
-  checksum: dea9df45ea1f0aaa4e2d3bed3f9a0bfe9e5b2592bddb92eb1bf06e50bcf98dbb78189668cd8bc31a0511d3fc25539b4cd5c704497e53e93e2d40ca764b10bfc3
+  checksum: 10c0/dea9df45ea1f0aaa4e2d3bed3f9a0bfe9e5b2592bddb92eb1bf06e50bcf98dbb78189668cd8bc31a0511d3fc25539b4cd5c704497e53e93e2d40ca764b10bfc3
   languageName: node
   linkType: hard
 
 "type-fest@npm:^0.21.3":
   version: 0.21.3
   resolution: "type-fest@npm:0.21.3"
-  checksum: 902bd57bfa30d51d4779b641c2bc403cdf1371fb9c91d3c058b0133694fcfdb817aef07a47f40faf79039eecbaa39ee9d3c532deff244f3a19ce68cea71a61e8
+  checksum: 10c0/902bd57bfa30d51d4779b641c2bc403cdf1371fb9c91d3c058b0133694fcfdb817aef07a47f40faf79039eecbaa39ee9d3c532deff244f3a19ce68cea71a61e8
   languageName: node
   linkType: hard
 
 "type-fest@npm:^3.0.0":
   version: 3.13.1
   resolution: "type-fest@npm:3.13.1"
-  checksum: 547d22186f73a8c04590b70dcf63baff390078c75ea8acd366bbd510fd0646e348bd1970e47ecf795b7cff0b41d26e9c475c1fedd6ef5c45c82075fbf916b629
+  checksum: 10c0/547d22186f73a8c04590b70dcf63baff390078c75ea8acd366bbd510fd0646e348bd1970e47ecf795b7cff0b41d26e9c475c1fedd6ef5c45c82075fbf916b629
   languageName: node
   linkType: hard
 
@@ -16326,7 +16326,7 @@ __metadata:
   dependencies:
     media-typer: "npm:0.3.0"
     mime-types: "npm:~2.1.24"
-  checksum: a23daeb538591b7efbd61ecf06b6feb2501b683ffdc9a19c74ef5baba362b4347e42f1b4ed81f5882a8c96a3bfff7f93ce3ffaf0cbbc879b532b04c97a55db9d
+  checksum: 10c0/a23daeb538591b7efbd61ecf06b6feb2501b683ffdc9a19c74ef5baba362b4347e42f1b4ed81f5882a8c96a3bfff7f93ce3ffaf0cbbc879b532b04c97a55db9d
   languageName: node
   linkType: hard
 
@@ -16337,7 +16337,7 @@ __metadata:
     call-bind: "npm:^1.0.2"
     get-intrinsic: "npm:^1.2.1"
     is-typed-array: "npm:^1.1.10"
-  checksum: ebad66cdf00c96b1395dffc7873169cf09801fca5954507a484f41f253feb1388d815db297b0b3bb8ce7421eac6f7ff45e2ec68450a3d68408aa4ae02fcf3a6c
+  checksum: 10c0/ebad66cdf00c96b1395dffc7873169cf09801fca5954507a484f41f253feb1388d815db297b0b3bb8ce7421eac6f7ff45e2ec68450a3d68408aa4ae02fcf3a6c
   languageName: node
   linkType: hard
 
@@ -16349,7 +16349,7 @@ __metadata:
     for-each: "npm:^0.3.3"
     has-proto: "npm:^1.0.1"
     is-typed-array: "npm:^1.1.10"
-  checksum: 6696435d53ce0e704ff6760c57ccc35138aec5f87859e03eb2a3246336d546feae367952dbc918116f3f0dffbe669734e3cbd8960283c2fa79aac925db50d888
+  checksum: 10c0/6696435d53ce0e704ff6760c57ccc35138aec5f87859e03eb2a3246336d546feae367952dbc918116f3f0dffbe669734e3cbd8960283c2fa79aac925db50d888
   languageName: node
   linkType: hard
 
@@ -16362,7 +16362,7 @@ __metadata:
     for-each: "npm:^0.3.3"
     has-proto: "npm:^1.0.1"
     is-typed-array: "npm:^1.1.10"
-  checksum: 4036ce007ae9752931bed3dd61e0d6de2a3e5f6a5a85a05f3adb35388d2c0728f9b1a1e638d75579f168e49c289bfb5417f00e96d4ab081f38b647fc854ff7a5
+  checksum: 10c0/4036ce007ae9752931bed3dd61e0d6de2a3e5f6a5a85a05f3adb35388d2c0728f9b1a1e638d75579f168e49c289bfb5417f00e96d4ab081f38b647fc854ff7a5
   languageName: node
   linkType: hard
 
@@ -16373,7 +16373,7 @@ __metadata:
     call-bind: "npm:^1.0.2"
     for-each: "npm:^0.3.3"
     is-typed-array: "npm:^1.1.9"
-  checksum: c5163c0103d07fefc8a2ad0fc151f9ca9a1f6422098c00f695d55f9896e4d63614cd62cf8d8a031c6cee5f418e8980a533796597174da4edff075b3d275a7e23
+  checksum: 10c0/c5163c0103d07fefc8a2ad0fc151f9ca9a1f6422098c00f695d55f9896e4d63614cd62cf8d8a031c6cee5f418e8980a533796597174da4edff075b3d275a7e23
   languageName: node
   linkType: hard
 
@@ -16383,7 +16383,7 @@ __metadata:
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
-  checksum: e33cef99d82573624fc0f854a2980322714986bc35b9cb4d1ce736ed182aeab78e2cb32b385efa493b2a976ef52c53e20d6c6918312353a91850e2b76f1ea44f
+  checksum: 10c0/e33cef99d82573624fc0f854a2980322714986bc35b9cb4d1ce736ed182aeab78e2cb32b385efa493b2a976ef52c53e20d6c6918312353a91850e2b76f1ea44f
   languageName: node
   linkType: hard
 
@@ -16393,7 +16393,7 @@ __metadata:
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
-  checksum: 1d0a5f4ce496c42caa9a30e659c467c5686eae15d54b027ee7866744952547f1be1262f2d40de911618c242b510029d51d43ff605dba8fb740ec85ca2d3f9500
+  checksum: 10c0/1d0a5f4ce496c42caa9a30e659c467c5686eae15d54b027ee7866744952547f1be1262f2d40de911618c242b510029d51d43ff605dba8fb740ec85ca2d3f9500
   languageName: node
   linkType: hard
 
@@ -16405,7 +16405,7 @@ __metadata:
     has-bigints: "npm:^1.0.2"
     has-symbols: "npm:^1.0.3"
     which-boxed-primitive: "npm:^1.0.2"
-  checksum: 81ca2e81134167cc8f75fa79fbcc8a94379d6c61de67090986a2273850989dd3bae8440c163121b77434b68263e34787a675cbdcb34bb2f764c6b9c843a11b66
+  checksum: 10c0/81ca2e81134167cc8f75fa79fbcc8a94379d6c61de67090986a2273850989dd3bae8440c163121b77434b68263e34787a675cbdcb34bb2f764c6b9c843a11b66
   languageName: node
   linkType: hard
 
@@ -16419,21 +16419,21 @@ __metadata:
     react-lifecycles-compat: "npm:^3.0.4"
   peerDependencies:
     react: ">=15.0.0"
-  checksum: 81473e892027a99f1ead6b9afd16db65097651cd36c4b6db710728f206f1fc4b82ba9170ecb4a1127a23857e01ba51c0194d0a7cfeecfea61ba9418e0276cb56
+  checksum: 10c0/81473e892027a99f1ead6b9afd16db65097651cd36c4b6db710728f206f1fc4b82ba9170ecb4a1127a23857e01ba51c0194d0a7cfeecfea61ba9418e0276cb56
   languageName: node
   linkType: hard
 
 "undici-types@npm:~5.26.4":
   version: 5.26.5
   resolution: "undici-types@npm:5.26.5"
-  checksum: bb673d7876c2d411b6eb6c560e0c571eef4a01c1c19925175d16e3a30c4c428181fb8d7ae802a261f283e4166a0ac435e2f505743aa9e45d893f9a3df017b501
+  checksum: 10c0/bb673d7876c2d411b6eb6c560e0c571eef4a01c1c19925175d16e3a30c4c428181fb8d7ae802a261f283e4166a0ac435e2f505743aa9e45d893f9a3df017b501
   languageName: node
   linkType: hard
 
 "unicode-canonical-property-names-ecmascript@npm:^2.0.0":
   version: 2.0.0
   resolution: "unicode-canonical-property-names-ecmascript@npm:2.0.0"
-  checksum: 0fe812641bcfa3ae433025178a64afb5d9afebc21a922dafa7cba971deebb5e4a37350423890750132a85c936c290fb988146d0b1bd86838ad4897f4fc5bd0de
+  checksum: 10c0/0fe812641bcfa3ae433025178a64afb5d9afebc21a922dafa7cba971deebb5e4a37350423890750132a85c936c290fb988146d0b1bd86838ad4897f4fc5bd0de
   languageName: node
   linkType: hard
 
@@ -16442,7 +16442,7 @@ __metadata:
   resolution: "unicode-emoji-utils@npm:1.2.0"
   dependencies:
     emoji-regex: "npm:10.3.0"
-  checksum: 224413cab5f915abbbbf3e6061878f3c1b67acf7c6ab1d4bf283f13d290677633d614a7fd58b7af8cec54dc3a4e4f51c01f4797caa23c7c83cdaa759fe6de9ce
+  checksum: 10c0/224413cab5f915abbbbf3e6061878f3c1b67acf7c6ab1d4bf283f13d290677633d614a7fd58b7af8cec54dc3a4e4f51c01f4797caa23c7c83cdaa759fe6de9ce
   languageName: node
   linkType: hard
 
@@ -16452,21 +16452,21 @@ __metadata:
   dependencies:
     unicode-canonical-property-names-ecmascript: "npm:^2.0.0"
     unicode-property-aliases-ecmascript: "npm:^2.0.0"
-  checksum: 4d05252cecaf5c8e36d78dc5332e03b334c6242faf7cf16b3658525441386c0a03b5f603d42cbec0f09bb63b9fd25c9b3b09667aee75463cac3efadae2cd17ec
+  checksum: 10c0/4d05252cecaf5c8e36d78dc5332e03b334c6242faf7cf16b3658525441386c0a03b5f603d42cbec0f09bb63b9fd25c9b3b09667aee75463cac3efadae2cd17ec
   languageName: node
   linkType: hard
 
 "unicode-match-property-value-ecmascript@npm:^2.1.0":
   version: 2.1.0
   resolution: "unicode-match-property-value-ecmascript@npm:2.1.0"
-  checksum: f5b9499b9e0ffdc6027b744d528f17ec27dd7c15da03254ed06851feec47e0531f20d410910c8a49af4a6a190f4978413794c8d75ce112950b56d583b5d5c7f2
+  checksum: 10c0/f5b9499b9e0ffdc6027b744d528f17ec27dd7c15da03254ed06851feec47e0531f20d410910c8a49af4a6a190f4978413794c8d75ce112950b56d583b5d5c7f2
   languageName: node
   linkType: hard
 
 "unicode-property-aliases-ecmascript@npm:^2.0.0":
   version: 2.1.0
   resolution: "unicode-property-aliases-ecmascript@npm:2.1.0"
-  checksum: 50ded3f8c963c7785e48c510a3b7c6bc4e08a579551489aa0349680a35b1ceceec122e33b2b6c1b579d0be2250f34bb163ac35f5f8695fe10bbc67fb757f0af8
+  checksum: 10c0/50ded3f8c963c7785e48c510a3b7c6bc4e08a579551489aa0349680a35b1ceceec122e33b2b6c1b579d0be2250f34bb163ac35f5f8695fe10bbc67fb757f0af8
   languageName: node
   linkType: hard
 
@@ -16478,7 +16478,7 @@ __metadata:
     get-value: "npm:^2.0.6"
     is-extendable: "npm:^0.1.1"
     set-value: "npm:^2.0.1"
-  checksum: 8758d880cb9545f62ce9cfb9b791b2b7a206e0ff5cc4b9d7cd6581da2c6839837fbb45e639cf1fd8eef3cae08c0201b614b7c06dd9f5f70d9dbe7c5fe2fbf592
+  checksum: 10c0/8758d880cb9545f62ce9cfb9b791b2b7a206e0ff5cc4b9d7cd6581da2c6839837fbb45e639cf1fd8eef3cae08c0201b614b7c06dd9f5f70d9dbe7c5fe2fbf592
   languageName: node
   linkType: hard
 
@@ -16487,7 +16487,7 @@ __metadata:
   resolution: "unique-filename@npm:1.1.1"
   dependencies:
     unique-slug: "npm:^2.0.0"
-  checksum: d005bdfaae6894da8407c4de2b52f38b3c58ec86e79fc2ee19939da3085374413b073478ec54e721dc8e32b102cf9e50d0481b8331abdc62202e774b789ea874
+  checksum: 10c0/d005bdfaae6894da8407c4de2b52f38b3c58ec86e79fc2ee19939da3085374413b073478ec54e721dc8e32b102cf9e50d0481b8331abdc62202e774b789ea874
   languageName: node
   linkType: hard
 
@@ -16496,7 +16496,7 @@ __metadata:
   resolution: "unique-filename@npm:3.0.0"
   dependencies:
     unique-slug: "npm:^4.0.0"
-  checksum: 6363e40b2fa758eb5ec5e21b3c7fb83e5da8dcfbd866cc0c199d5534c42f03b9ea9ab069769cc388e1d7ab93b4eeef28ef506ab5f18d910ef29617715101884f
+  checksum: 10c0/6363e40b2fa758eb5ec5e21b3c7fb83e5da8dcfbd866cc0c199d5534c42f03b9ea9ab069769cc388e1d7ab93b4eeef28ef506ab5f18d910ef29617715101884f
   languageName: node
   linkType: hard
 
@@ -16505,7 +16505,7 @@ __metadata:
   resolution: "unique-slug@npm:2.0.2"
   dependencies:
     imurmurhash: "npm:^0.1.4"
-  checksum: 9eabc51680cf0b8b197811a48857e41f1364b25362300c1ff636c0eca5ec543a92a38786f59cf0697e62c6f814b11ecbe64e8093db71246468a1f03b80c83970
+  checksum: 10c0/9eabc51680cf0b8b197811a48857e41f1364b25362300c1ff636c0eca5ec543a92a38786f59cf0697e62c6f814b11ecbe64e8093db71246468a1f03b80c83970
   languageName: node
   linkType: hard
 
@@ -16514,7 +16514,7 @@ __metadata:
   resolution: "unique-slug@npm:4.0.0"
   dependencies:
     imurmurhash: "npm:^0.1.4"
-  checksum: cb811d9d54eb5821b81b18205750be84cb015c20a4a44280794e915f5a0a70223ce39066781a354e872df3572e8155c228f43ff0cce94c7cbf4da2cc7cbdd635
+  checksum: 10c0/cb811d9d54eb5821b81b18205750be84cb015c20a4a44280794e915f5a0a70223ce39066781a354e872df3572e8155c228f43ff0cce94c7cbf4da2cc7cbdd635
   languageName: node
   linkType: hard
 
@@ -16523,35 +16523,35 @@ __metadata:
   resolution: "unique-string@npm:2.0.0"
   dependencies:
     crypto-random-string: "npm:^2.0.0"
-  checksum: 11820db0a4ba069d174bedfa96c588fc2c96b083066fafa186851e563951d0de78181ac79c744c1ed28b51f9d82ac5b8196ff3e4560d0178046ef455d8c2244b
+  checksum: 10c0/11820db0a4ba069d174bedfa96c588fc2c96b083066fafa186851e563951d0de78181ac79c744c1ed28b51f9d82ac5b8196ff3e4560d0178046ef455d8c2244b
   languageName: node
   linkType: hard
 
 "universalify@npm:^0.2.0":
   version: 0.2.0
   resolution: "universalify@npm:0.2.0"
-  checksum: cedbe4d4ca3967edf24c0800cfc161c5a15e240dac28e3ce575c689abc11f2c81ccc6532c8752af3b40f9120fb5e454abecd359e164f4f6aa44c29cd37e194fe
+  checksum: 10c0/cedbe4d4ca3967edf24c0800cfc161c5a15e240dac28e3ce575c689abc11f2c81ccc6532c8752af3b40f9120fb5e454abecd359e164f4f6aa44c29cd37e194fe
   languageName: node
   linkType: hard
 
 "universalify@npm:^2.0.0":
   version: 2.0.0
   resolution: "universalify@npm:2.0.0"
-  checksum: 07092b9f46df61b823d8ab5e57f0ee5120c178b39609a95e4a15a98c42f6b0b8e834e66fbb47ff92831786193be42f1fd36347169b88ce8639d0f9670af24a71
+  checksum: 10c0/07092b9f46df61b823d8ab5e57f0ee5120c178b39609a95e4a15a98c42f6b0b8e834e66fbb47ff92831786193be42f1fd36347169b88ce8639d0f9670af24a71
   languageName: node
   linkType: hard
 
 "unpipe@npm:1.0.0, unpipe@npm:~1.0.0":
   version: 1.0.0
   resolution: "unpipe@npm:1.0.0"
-  checksum: 193400255bd48968e5c5383730344fbb4fa114cdedfab26e329e50dd2d81b134244bb8a72c6ac1b10ab0281a58b363d06405632c9d49ca9dfd5e90cbd7d0f32c
+  checksum: 10c0/193400255bd48968e5c5383730344fbb4fa114cdedfab26e329e50dd2d81b134244bb8a72c6ac1b10ab0281a58b363d06405632c9d49ca9dfd5e90cbd7d0f32c
   languageName: node
   linkType: hard
 
 "unquote@npm:~1.1.1":
   version: 1.1.1
   resolution: "unquote@npm:1.1.1"
-  checksum: de59fb48cbaadc636002c6563dcb6b1bce95c91ebecb92addbc9bb47982cb03e7d8a8371c9617267b9e5746bbcb4403394139bc1310106b9ac4c26790ed57859
+  checksum: 10c0/de59fb48cbaadc636002c6563dcb6b1bce95c91ebecb92addbc9bb47982cb03e7d8a8371c9617267b9e5746bbcb4403394139bc1310106b9ac4c26790ed57859
   languageName: node
   linkType: hard
 
@@ -16561,21 +16561,21 @@ __metadata:
   dependencies:
     has-value: "npm:^0.3.1"
     isobject: "npm:^3.0.0"
-  checksum: 68a796dde4a373afdbf017de64f08490a3573ebee549136da0b3a2245299e7f65f647ef70dc13c4ac7f47b12fba4de1646fa0967a365638578fedce02b9c0b1f
+  checksum: 10c0/68a796dde4a373afdbf017de64f08490a3573ebee549136da0b3a2245299e7f65f647ef70dc13c4ac7f47b12fba4de1646fa0967a365638578fedce02b9c0b1f
   languageName: node
   linkType: hard
 
 "untildify@npm:^4.0.0":
   version: 4.0.0
   resolution: "untildify@npm:4.0.0"
-  checksum: d758e624c707d49f76f7511d75d09a8eda7f2020d231ec52b67ff4896bcf7013be3f9522d8375f57e586e9a2e827f5641c7e06ee46ab9c435fc2b2b2e9de517a
+  checksum: 10c0/d758e624c707d49f76f7511d75d09a8eda7f2020d231ec52b67ff4896bcf7013be3f9522d8375f57e586e9a2e827f5641c7e06ee46ab9c435fc2b2b2e9de517a
   languageName: node
   linkType: hard
 
 "upath@npm:^1.1.1, upath@npm:^1.2.0":
   version: 1.2.0
   resolution: "upath@npm:1.2.0"
-  checksum: 3746f24099bf69dbf8234cecb671e1016e1f6b26bd306de4ff8966fb0bc463fa1014ffc48646b375de1ab573660e3a0256f6f2a87218b2dfa1779a84ef6992fa
+  checksum: 10c0/3746f24099bf69dbf8234cecb671e1016e1f6b26bd306de4ff8966fb0bc463fa1014ffc48646b375de1ab573660e3a0256f6f2a87218b2dfa1779a84ef6992fa
   languageName: node
   linkType: hard
 
@@ -16589,7 +16589,7 @@ __metadata:
     browserslist: ">= 4.21.0"
   bin:
     update-browserslist-db: cli.js
-  checksum: e52b8b521c78ce1e0c775f356cd16a9c22c70d25f3e01180839c407a5dc787fb05a13f67560cbaf316770d26fa99f78f1acd711b1b54a4f35d4820d4ea7136e6
+  checksum: 10c0/e52b8b521c78ce1e0c775f356cd16a9c22c70d25f3e01180839c407a5dc787fb05a13f67560cbaf316770d26fa99f78f1acd711b1b54a4f35d4820d4ea7136e6
   languageName: node
   linkType: hard
 
@@ -16598,14 +16598,14 @@ __metadata:
   resolution: "uri-js@npm:4.4.1"
   dependencies:
     punycode: "npm:^2.1.0"
-  checksum: 4ef57b45aa820d7ac6496e9208559986c665e49447cb072744c13b66925a362d96dd5a46c4530a6b8e203e5db5fe849369444440cb22ecfc26c679359e5dfa3c
+  checksum: 10c0/4ef57b45aa820d7ac6496e9208559986c665e49447cb072744c13b66925a362d96dd5a46c4530a6b8e203e5db5fe849369444440cb22ecfc26c679359e5dfa3c
   languageName: node
   linkType: hard
 
 "urix@npm:^0.1.0":
   version: 0.1.0
   resolution: "urix@npm:0.1.0"
-  checksum: 264f1b29360c33c0aec5fb9819d7e28f15d1a3b83175d2bcc9131efe8583f459f07364957ae3527f1478659ec5b2d0f1ad401dfb625f73e4d424b3ae35fc5fc0
+  checksum: 10c0/264f1b29360c33c0aec5fb9819d7e28f15d1a3b83175d2bcc9131efe8583f459f07364957ae3527f1478659ec5b2d0f1ad401dfb625f73e4d424b3ae35fc5fc0
   languageName: node
   linkType: hard
 
@@ -16615,7 +16615,7 @@ __metadata:
   dependencies:
     querystringify: "npm:^2.1.1"
     requires-port: "npm:^1.0.0"
-  checksum: bd5aa9389f896974beb851c112f63b466505a04b4807cea2e5a3b7092f6fbb75316f0491ea84e44f66fed55f1b440df5195d7e3a8203f64fcefa19d182f5be87
+  checksum: 10c0/bd5aa9389f896974beb851c112f63b466505a04b4807cea2e5a3b7092f6fbb75316f0491ea84e44f66fed55f1b440df5195d7e3a8203f64fcefa19d182f5be87
   languageName: node
   linkType: hard
 
@@ -16625,7 +16625,7 @@ __metadata:
   dependencies:
     punycode: "npm:^1.4.1"
     qs: "npm:^6.11.0"
-  checksum: 9e18c57b854d6a8e0288c4ddf21f9e30273a0ef2efb28a7e3e3d6eac392637dbdecce0d8f616586d58ff43154997150ecc2c9873e6c845d1e742e24c940b6e12
+  checksum: 10c0/9e18c57b854d6a8e0288c4ddf21f9e30273a0ef2efb28a7e3e3d6eac392637dbdecce0d8f616586d58ff43154997150ecc2c9873e6c845d1e742e24c940b6e12
   languageName: node
   linkType: hard
 
@@ -16634,7 +16634,7 @@ __metadata:
   resolution: "use-composed-ref@npm:1.3.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
-  checksum: e64ce52f4b18c020407636784192726807404a2552609acf7497b66a2b7070674fb5d2b950d426c4aa85f353e2bbecb02ebf9c5b865cd06797938c70bcbf5d26
+  checksum: 10c0/e64ce52f4b18c020407636784192726807404a2552609acf7497b66a2b7070674fb5d2b950d426c4aa85f353e2bbecb02ebf9c5b865cd06797938c70bcbf5d26
   languageName: node
   linkType: hard
 
@@ -16646,7 +16646,7 @@ __metadata:
   peerDependenciesMeta:
     "@types/react":
       optional: true
-  checksum: d8deea8b85e55ac6daba237a889630bfdbf0ebf60e9e22b6a78a78c26fabe6025e04ada7abef1e444e6786227d921e648b2707db8b3564daf757264a148a6e23
+  checksum: 10c0/d8deea8b85e55ac6daba237a889630bfdbf0ebf60e9e22b6a78a78c26fabe6025e04ada7abef1e444e6786227d921e648b2707db8b3564daf757264a148a6e23
   languageName: node
   linkType: hard
 
@@ -16660,7 +16660,7 @@ __metadata:
   peerDependenciesMeta:
     "@types/react":
       optional: true
-  checksum: 1958886fc35262d973f5cd4ce16acd6ce3a66707a72761c93abd1b5ae64e1a11efa83f68e6c8c9bf1647628037980ce59df64cba50adb36bd4071851e70527d2
+  checksum: 10c0/1958886fc35262d973f5cd4ce16acd6ce3a66707a72761c93abd1b5ae64e1a11efa83f68e6c8c9bf1647628037980ce59df64cba50adb36bd4071851e70527d2
   languageName: node
   linkType: hard
 
@@ -16669,14 +16669,14 @@ __metadata:
   resolution: "use-sync-external-store@npm:1.2.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
-  checksum: ac4814e5592524f242921157e791b022efe36e451fe0d4fd4d204322d5433a4fc300d63b0ade5185f8e0735ded044c70bcf6d2352db0f74d097a238cebd2da02
+  checksum: 10c0/ac4814e5592524f242921157e791b022efe36e451fe0d4fd4d204322d5433a4fc300d63b0ade5185f8e0735ded044c70bcf6d2352db0f74d097a238cebd2da02
   languageName: node
   linkType: hard
 
 "use@npm:^3.1.0":
   version: 3.1.1
   resolution: "use@npm:3.1.1"
-  checksum: 75b48673ab80d5139c76922630d5a8a44e72ed58dbaf54dee1b88352d10e1c1c1fc332066c782d8ae9a56503b85d3dc67ff6d2ffbd9821120466d1280ebb6d6e
+  checksum: 10c0/75b48673ab80d5139c76922630d5a8a44e72ed58dbaf54dee1b88352d10e1c1c1fc332066c782d8ae9a56503b85d3dc67ff6d2ffbd9821120466d1280ebb6d6e
   languageName: node
   linkType: hard
 
@@ -16686,14 +16686,14 @@ __metadata:
   dependencies:
     node-gyp: "npm:latest"
     node-gyp-build: "npm:^4.3.0"
-  checksum: 2ca08b07f4070540b33ff15f3f0632fa30baaee8a766fff993be47b4829b4fb30fd36fdf1270336324d03f65e0936c4608ee719d862230d75311751dcfe27a83
+  checksum: 10c0/2ca08b07f4070540b33ff15f3f0632fa30baaee8a766fff993be47b4829b4fb30fd36fdf1270336324d03f65e0936c4608ee719d862230d75311751dcfe27a83
   languageName: node
   linkType: hard
 
 "util-deprecate@npm:^1.0.1, util-deprecate@npm:^1.0.2, util-deprecate@npm:~1.0.1":
   version: 1.0.2
   resolution: "util-deprecate@npm:1.0.2"
-  checksum: 41a5bdd214df2f6c3ecf8622745e4a366c4adced864bc3c833739791aeeeb1838119af7daed4ba36428114b5c67dcda034a79c882e97e43c03e66a4dd7389942
+  checksum: 10c0/41a5bdd214df2f6c3ecf8622745e4a366c4adced864bc3c833739791aeeeb1838119af7daed4ba36428114b5c67dcda034a79c882e97e43c03e66a4dd7389942
   languageName: node
   linkType: hard
 
@@ -16705,7 +16705,7 @@ __metadata:
     es-abstract: "npm:^1.17.2"
     has-symbols: "npm:^1.0.1"
     object.getownpropertydescriptors: "npm:^2.1.0"
-  checksum: d72b7c1344816bc9c8713efbf5cb23b536730a8fb7df9ae50654d9efa4d24241fc5ecc69a7dc63b9a2f98cabc9635c303923671933f8c6f41fa7d64fe2188e27
+  checksum: 10c0/d72b7c1344816bc9c8713efbf5cb23b536730a8fb7df9ae50654d9efa4d24241fc5ecc69a7dc63b9a2f98cabc9635c303923671933f8c6f41fa7d64fe2188e27
   languageName: node
   linkType: hard
 
@@ -16714,7 +16714,7 @@ __metadata:
   resolution: "util@npm:0.10.3"
   dependencies:
     inherits: "npm:2.0.1"
-  checksum: 88bb58fec3b1f5f43dea27795f61f24b3b505bbba6f3ad6e91b32db0cd0928b2acb54ebe21603a75743c6e21a52f954cd2ffb6cddafed5a01169dd1287db3ff3
+  checksum: 10c0/88bb58fec3b1f5f43dea27795f61f24b3b505bbba6f3ad6e91b32db0cd0928b2acb54ebe21603a75743c6e21a52f954cd2ffb6cddafed5a01169dd1287db3ff3
   languageName: node
   linkType: hard
 
@@ -16723,14 +16723,14 @@ __metadata:
   resolution: "util@npm:0.11.1"
   dependencies:
     inherits: "npm:2.0.3"
-  checksum: 8e9d1a85e661c8a8d9883d821aedbff3f8d9c3accd85357020905386ada5653b20389fc3591901e2a0bde64f8dc86b28c3f990114aa5a38eaaf30b455fa3cdf6
+  checksum: 10c0/8e9d1a85e661c8a8d9883d821aedbff3f8d9c3accd85357020905386ada5653b20389fc3591901e2a0bde64f8dc86b28c3f990114aa5a38eaaf30b455fa3cdf6
   languageName: node
   linkType: hard
 
 "utils-merge@npm:1.0.1":
   version: 1.0.1
   resolution: "utils-merge@npm:1.0.1"
-  checksum: 02ba649de1b7ca8854bfe20a82f1dfbdda3fb57a22ab4a8972a63a34553cf7aa51bc9081cf7e001b035b88186d23689d69e71b510e610a09a4c66f68aa95b672
+  checksum: 10c0/02ba649de1b7ca8854bfe20a82f1dfbdda3fb57a22ab4a8972a63a34553cf7aa51bc9081cf7e001b035b88186d23689d69e71b510e610a09a4c66f68aa95b672
   languageName: node
   linkType: hard
 
@@ -16739,7 +16739,7 @@ __metadata:
   resolution: "uuid@npm:3.4.0"
   bin:
     uuid: ./bin/uuid
-  checksum: 1c13950df865c4f506ebfe0a24023571fa80edf2e62364297a537c80af09c618299797bbf2dbac6b1f8ae5ad182ba474b89db61e0e85839683991f7e08795347
+  checksum: 10c0/1c13950df865c4f506ebfe0a24023571fa80edf2e62364297a537c80af09c618299797bbf2dbac6b1f8ae5ad182ba474b89db61e0e85839683991f7e08795347
   languageName: node
   linkType: hard
 
@@ -16748,7 +16748,7 @@ __metadata:
   resolution: "uuid@npm:8.3.2"
   bin:
     uuid: dist/bin/uuid
-  checksum: bcbb807a917d374a49f475fae2e87fdca7da5e5530820ef53f65ba1d12131bd81a92ecf259cc7ce317cbe0f289e7d79fdfebcef9bfa3087c8c8a2fa304c9be54
+  checksum: 10c0/bcbb807a917d374a49f475fae2e87fdca7da5e5530820ef53f65ba1d12131bd81a92ecf259cc7ce317cbe0f289e7d79fdfebcef9bfa3087c8c8a2fa304c9be54
   languageName: node
   linkType: hard
 
@@ -16757,14 +16757,14 @@ __metadata:
   resolution: "uuid@npm:9.0.1"
   bin:
     uuid: dist/bin/uuid
-  checksum: 1607dd32ac7fc22f2d8f77051e6a64845c9bce5cd3dd8aa0070c074ec73e666a1f63c7b4e0f4bf2bc8b9d59dc85a15e17807446d9d2b17c8485fbc2147b27f9b
+  checksum: 10c0/1607dd32ac7fc22f2d8f77051e6a64845c9bce5cd3dd8aa0070c074ec73e666a1f63c7b4e0f4bf2bc8b9d59dc85a15e17807446d9d2b17c8485fbc2147b27f9b
   languageName: node
   linkType: hard
 
 "v8-compile-cache@npm:^2.1.1":
   version: 2.3.0
   resolution: "v8-compile-cache@npm:2.3.0"
-  checksum: b2d866febf943fbbf0b5e8d43ae9a9b0dacd11dd76e6a9c8e8032268f0136f081e894a2723774ae2d86befa994be4d4046b0717d82df4f3a10e067994ad5c688
+  checksum: 10c0/b2d866febf943fbbf0b5e8d43ae9a9b0dacd11dd76e6a9c8e8032268f0136f081e894a2723774ae2d86befa994be4d4046b0717d82df4f3a10e067994ad5c688
   languageName: node
   linkType: hard
 
@@ -16775,28 +16775,28 @@ __metadata:
     "@jridgewell/trace-mapping": "npm:^0.3.12"
     "@types/istanbul-lib-coverage": "npm:^2.0.1"
     convert-source-map: "npm:^1.6.0"
-  checksum: 657ef7c52a514c1a0769663f96dd6f2cd11d2d3f6c8272d1035f4a543dca0b52c84b005beb7f0ca215eb98425c8bc4aa92a62826b1fc76abc1f7228d33ccbc60
+  checksum: 10c0/657ef7c52a514c1a0769663f96dd6f2cd11d2d3f6c8272d1035f4a543dca0b52c84b005beb7f0ca215eb98425c8bc4aa92a62826b1fc76abc1f7228d33ccbc60
   languageName: node
   linkType: hard
 
 "value-equal@npm:^1.0.1":
   version: 1.0.1
   resolution: "value-equal@npm:1.0.1"
-  checksum: 79068098355483ef29f4d3753999ad880875b87625d7e9055cad9346ea4b7662aad3a66f87976801b0dd7a6f828ba973d28b1669ebcd37eaf88cc5f687c1a691
+  checksum: 10c0/79068098355483ef29f4d3753999ad880875b87625d7e9055cad9346ea4b7662aad3a66f87976801b0dd7a6f828ba973d28b1669ebcd37eaf88cc5f687c1a691
   languageName: node
   linkType: hard
 
 "vary@npm:^1, vary@npm:~1.1.2":
   version: 1.1.2
   resolution: "vary@npm:1.1.2"
-  checksum: f15d588d79f3675135ba783c91a4083dcd290a2a5be9fcb6514220a1634e23df116847b1cc51f66bfb0644cf9353b2abb7815ae499bab06e46dd33c1a6bf1f4f
+  checksum: 10c0/f15d588d79f3675135ba783c91a4083dcd290a2a5be9fcb6514220a1634e23df116847b1cc51f66bfb0644cf9353b2abb7815ae499bab06e46dd33c1a6bf1f4f
   languageName: node
   linkType: hard
 
 "vm-browserify@npm:^1.0.1":
   version: 1.1.2
   resolution: "vm-browserify@npm:1.1.2"
-  checksum: 0cc1af6e0d880deb58bc974921320c187f9e0a94f25570fca6b1bd64e798ce454ab87dfd797551b1b0cc1849307421aae0193cedf5f06bdb5680476780ee344b
+  checksum: 10c0/0cc1af6e0d880deb58bc974921320c187f9e0a94f25570fca6b1bd64e798ce454ab87dfd797551b1b0cc1849307421aae0193cedf5f06bdb5680476780ee344b
   languageName: node
   linkType: hard
 
@@ -16805,7 +16805,7 @@ __metadata:
   resolution: "w3c-xmlserializer@npm:4.0.0"
   dependencies:
     xml-name-validator: "npm:^4.0.0"
-  checksum: 02cc66d6efc590bd630086cd88252444120f5feec5c4043932b0d0f74f8b060512f79dc77eb093a7ad04b4f02f39da79ce4af47ceb600f2bf9eacdc83204b1a8
+  checksum: 10c0/02cc66d6efc590bd630086cd88252444120f5feec5c4043932b0d0f74f8b060512f79dc77eb093a7ad04b4f02f39da79ce4af47ceb600f2bf9eacdc83204b1a8
   languageName: node
   linkType: hard
 
@@ -16814,7 +16814,7 @@ __metadata:
   resolution: "w3c-xmlserializer@npm:5.0.0"
   dependencies:
     xml-name-validator: "npm:^5.0.0"
-  checksum: 8712774c1aeb62dec22928bf1cdfd11426c2c9383a1a63f2bcae18db87ca574165a0fbe96b312b73652149167ac6c7f4cf5409f2eb101d9c805efe0e4bae798b
+  checksum: 10c0/8712774c1aeb62dec22928bf1cdfd11426c2c9383a1a63f2bcae18db87ca574165a0fbe96b312b73652149167ac6c7f4cf5409f2eb101d9c805efe0e4bae798b
   languageName: node
   linkType: hard
 
@@ -16823,7 +16823,7 @@ __metadata:
   resolution: "walker@npm:1.0.8"
   dependencies:
     makeerror: "npm:1.0.12"
-  checksum: a17e037bccd3ca8a25a80cb850903facdfed0de4864bd8728f1782370715d679fa72e0a0f5da7c1c1379365159901e5935f35be531229da53bbfc0efdabdb48e
+  checksum: 10c0/a17e037bccd3ca8a25a80cb850903facdfed0de4864bd8728f1782370715d679fa72e0a0f5da7c1c1379365159901e5935f35be531229da53bbfc0efdabdb48e
   languageName: node
   linkType: hard
 
@@ -16832,7 +16832,7 @@ __metadata:
   resolution: "warning@npm:3.0.0"
   dependencies:
     loose-envify: "npm:^1.0.0"
-  checksum: 6a2a56ab3139d3927193d926a027e74e1449fa47cc692feea95f8a81a4bb5b7f10c312def94cce03f3b58cb26ba3247858e75d17d596451d2c483a62e8204705
+  checksum: 10c0/6a2a56ab3139d3927193d926a027e74e1449fa47cc692feea95f8a81a4bb5b7f10c312def94cce03f3b58cb26ba3247858e75d17d596451d2c483a62e8204705
   languageName: node
   linkType: hard
 
@@ -16841,7 +16841,7 @@ __metadata:
   resolution: "warning@npm:4.0.3"
   dependencies:
     loose-envify: "npm:^1.0.0"
-  checksum: aebab445129f3e104c271f1637fa38e55eb25f968593e3825bd2f7a12bd58dc3738bb70dc8ec85826621d80b4acfed5a29ebc9da17397c6125864d72301b937e
+  checksum: 10c0/aebab445129f3e104c271f1637fa38e55eb25f968593e3825bd2f7a12bd58dc3738bb70dc8ec85826621d80b4acfed5a29ebc9da17397c6125864d72301b937e
   languageName: node
   linkType: hard
 
@@ -16850,7 +16850,7 @@ __metadata:
   resolution: "watchpack-chokidar2@npm:2.0.1"
   dependencies:
     chokidar: "npm:^2.1.8"
-  checksum: 9b8d880ae2543dd4f26a69f6b7f881119494f6b772b7431027a06a5cf963e0ebc1cac91a3ef479365c358b693c65fa80a1f8297427fa11fd4c080c3d6408c372
+  checksum: 10c0/9b8d880ae2543dd4f26a69f6b7f881119494f6b772b7431027a06a5cf963e0ebc1cac91a3ef479365c358b693c65fa80a1f8297427fa11fd4c080c3d6408c372
   languageName: node
   linkType: hard
 
@@ -16867,7 +16867,7 @@ __metadata:
       optional: true
     watchpack-chokidar2:
       optional: true
-  checksum: 53e3b112064f5de9edbb2a14973fb3901d9697b24cc70f8531a143eaace2353a273ca25c0ba21def8d3803cfedb8f6861ca1e49e9782257e40d5b5f8f5365c86
+  checksum: 10c0/53e3b112064f5de9edbb2a14973fb3901d9697b24cc70f8531a143eaace2353a273ca25c0ba21def8d3803cfedb8f6861ca1e49e9782257e40d5b5f8f5365c86
   languageName: node
   linkType: hard
 
@@ -16876,28 +16876,28 @@ __metadata:
   resolution: "wbuf@npm:1.7.3"
   dependencies:
     minimalistic-assert: "npm:^1.0.0"
-  checksum: 56edcc5ef2b3d30913ba8f1f5cccc364d180670b24d5f3f8849c1e6fb514e5c7e3a87548ae61227a82859eba6269c11393ae24ce12a2ea1ecb9b465718ddced7
+  checksum: 10c0/56edcc5ef2b3d30913ba8f1f5cccc364d180670b24d5f3f8849c1e6fb514e5c7e3a87548ae61227a82859eba6269c11393ae24ce12a2ea1ecb9b465718ddced7
   languageName: node
   linkType: hard
 
 "webidl-conversions@npm:^3.0.0":
   version: 3.0.1
   resolution: "webidl-conversions@npm:3.0.1"
-  checksum: 5612d5f3e54760a797052eb4927f0ddc01383550f542ccd33d5238cfd65aeed392a45ad38364970d0a0f4fea32e1f4d231b3d8dac4a3bdd385e5cf802ae097db
+  checksum: 10c0/5612d5f3e54760a797052eb4927f0ddc01383550f542ccd33d5238cfd65aeed392a45ad38364970d0a0f4fea32e1f4d231b3d8dac4a3bdd385e5cf802ae097db
   languageName: node
   linkType: hard
 
 "webidl-conversions@npm:^4.0.2":
   version: 4.0.2
   resolution: "webidl-conversions@npm:4.0.2"
-  checksum: def5c5ac3479286dffcb604547628b2e6b46c5c5b8a8cfaa8c71dc3bafc85859bde5fbe89467ff861f571ab38987cf6ab3d6e7c80b39b999e50e803c12f3164f
+  checksum: 10c0/def5c5ac3479286dffcb604547628b2e6b46c5c5b8a8cfaa8c71dc3bafc85859bde5fbe89467ff861f571ab38987cf6ab3d6e7c80b39b999e50e803c12f3164f
   languageName: node
   linkType: hard
 
 "webidl-conversions@npm:^7.0.0":
   version: 7.0.0
   resolution: "webidl-conversions@npm:7.0.0"
-  checksum: 228d8cb6d270c23b0720cb2d95c579202db3aaf8f633b4e9dd94ec2000a04e7e6e43b76a94509cdb30479bd00ae253ab2371a2da9f81446cc313f89a4213a2c4
+  checksum: 10c0/228d8cb6d270c23b0720cb2d95c579202db3aaf8f633b4e9dd94ec2000a04e7e6e43b76a94509cdb30479bd00ae253ab2371a2da9f81446cc313f89a4213a2c4
   languageName: node
   linkType: hard
 
@@ -16916,7 +16916,7 @@ __metadata:
     webpack-sources: "npm:^1.0"
   peerDependencies:
     webpack: ^4.40.0
-  checksum: 718493ccf05b48e95fdef2abc2b9770d88abcc161b3e683fd7004493038947dac3a91cad7632bca4199ee5832e425fee6d49c8d0b72339ccf0c7ee3b9f9bf1dc
+  checksum: 10c0/718493ccf05b48e95fdef2abc2b9770d88abcc161b3e683fd7004493038947dac3a91cad7632bca4199ee5832e425fee6d49c8d0b72339ccf0c7ee3b9f9bf1dc
   languageName: node
   linkType: hard
 
@@ -16939,7 +16939,7 @@ __metadata:
     ws: "npm:^7.3.1"
   bin:
     webpack-bundle-analyzer: lib/bin/analyzer.js
-  checksum: 6a94c8f6aa03296fb2eb00d6ad3b27bd5c551590fd253772bc61debf3177414d42701014079d4f85c74ba1ca685ae9f0cb4063812b58c21f294d108e9908e5cd
+  checksum: 10c0/6a94c8f6aa03296fb2eb00d6ad3b27bd5c551590fd253772bc61debf3177414d42701014079d4f85c74ba1ca685ae9f0cb4063812b58c21f294d108e9908e5cd
   languageName: node
   linkType: hard
 
@@ -16962,7 +16962,7 @@ __metadata:
     webpack: 4.x.x
   bin:
     webpack-cli: bin/cli.js
-  checksum: d0bb486651af5c438983d82904f6d4d187dfa83d480b493cd0b231d653d2a40aaf48c6bae3620f5d8ad520c08870b8553363e7579cfd7c8c2f7b3a279c454698
+  checksum: 10c0/d0bb486651af5c438983d82904f6d4d187dfa83d480b493cd0b231d653d2a40aaf48c6bae3620f5d8ad520c08870b8553363e7579cfd7c8c2f7b3a279c454698
   languageName: node
   linkType: hard
 
@@ -16977,7 +16977,7 @@ __metadata:
     webpack-log: "npm:^2.0.0"
   peerDependencies:
     webpack: ^4.0.0 || ^5.0.0
-  checksum: f9bd8318c6f356d006dc99e3e46ef8870d67640e43f26cfcd2bb36c9e7eaf64015513f43498e92b532896f7fbd8f32c0710d4489fc81d7a45ea328d7e4cf3085
+  checksum: 10c0/f9bd8318c6f356d006dc99e3e46ef8870d67640e43f26cfcd2bb36c9e7eaf64015513f43498e92b532896f7fbd8f32c0710d4489fc81d7a45ea328d7e4cf3085
   languageName: node
   linkType: hard
 
@@ -17025,7 +17025,7 @@ __metadata:
       optional: true
   bin:
     webpack-dev-server: bin/webpack-dev-server.js
-  checksum: 90fe960dc28cc75b501b1fa4ad3eba358a98dbb929658725e74db12326afaf165b6bd54f0cad0381b9771f6c47c92dba573d615b491ceeec4875ffe49143a38a
+  checksum: 10c0/90fe960dc28cc75b501b1fa4ad3eba358a98dbb929658725e74db12326afaf165b6bd54f0cad0381b9771f6c47c92dba573d615b491ceeec4875ffe49143a38a
   languageName: node
   linkType: hard
 
@@ -17035,7 +17035,7 @@ __metadata:
   dependencies:
     ansi-colors: "npm:^3.0.0"
     uuid: "npm:^3.3.2"
-  checksum: 515b800433da1c0b5722317baaeb05fc185da5a1fde5e39d25bed0b05c13ee3a544aa13844db8590696274a3c5dc04fd5abdd39f38f8c46a4084b74ff0dc9c60
+  checksum: 10c0/515b800433da1c0b5722317baaeb05fc185da5a1fde5e39d25bed0b05c13ee3a544aa13844db8590696274a3c5dc04fd5abdd39f38f8c46a4084b74ff0dc9c60
   languageName: node
   linkType: hard
 
@@ -17046,7 +17046,7 @@ __metadata:
     clone-deep: "npm:^4.0.1"
     flat: "npm:^5.0.2"
     wildcard: "npm:^2.0.0"
-  checksum: b607c84cabaf74689f965420051a55a08722d897bdd6c29cb0b2263b451c090f962d41ecf8c9bf56b0ab3de56e65476ace0a8ecda4f4a4663684243d90e0512b
+  checksum: 10c0/b607c84cabaf74689f965420051a55a08722d897bdd6c29cb0b2263b451c090f962d41ecf8c9bf56b0ab3de56e65476ace0a8ecda4f4a4663684243d90e0512b
   languageName: node
   linkType: hard
 
@@ -17056,7 +17056,7 @@ __metadata:
   dependencies:
     source-list-map: "npm:^2.0.0"
     source-map: "npm:~0.6.1"
-  checksum: 78dafb3e1e297d3f4eb6204311e8c64d28cd028f82887ba33aaf03fffc82482d8e1fdf6de25a60f4dde621d3565f4c3b1bfb350f09add8f4e54e00279ff3db5e
+  checksum: 10c0/78dafb3e1e297d3f4eb6204311e8c64d28cd028f82887ba33aaf03fffc82482d8e1fdf6de25a60f4dde621d3565f4c3b1bfb350f09add8f4e54e00279ff3db5e
   languageName: node
   linkType: hard
 
@@ -17094,7 +17094,7 @@ __metadata:
       optional: true
   bin:
     webpack: bin/webpack.js
-  checksum: bc90202110a341359c11ead60ea09bd5cfa51e2c93004d7e40b7c2f76208cc6717e39c9d9544825cc44958046ada762c78a8cf9848619ea450315bce98228701
+  checksum: 10c0/bc90202110a341359c11ead60ea09bd5cfa51e2c93004d7e40b7c2f76208cc6717e39c9d9544825cc44958046ada762c78a8cf9848619ea450315bce98228701
   languageName: node
   linkType: hard
 
@@ -17105,14 +17105,14 @@ __metadata:
     http-parser-js: "npm:>=0.5.1"
     safe-buffer: "npm:>=5.1.0"
     websocket-extensions: "npm:>=0.1.1"
-  checksum: 5f09547912b27bdc57bac17b7b6527d8993aa4ac8a2d10588bb74aebaf785fdcf64fea034aae0c359b7adff2044dd66f3d03866e4685571f81b13e548f9021f1
+  checksum: 10c0/5f09547912b27bdc57bac17b7b6527d8993aa4ac8a2d10588bb74aebaf785fdcf64fea034aae0c359b7adff2044dd66f3d03866e4685571f81b13e548f9021f1
   languageName: node
   linkType: hard
 
 "websocket-extensions@npm:>=0.1.1":
   version: 0.1.4
   resolution: "websocket-extensions@npm:0.1.4"
-  checksum: bbc8c233388a0eb8a40786ee2e30d35935cacbfe26ab188b3e020987e85d519c2009fe07cfc37b7f718b85afdba7e54654c9153e6697301f72561bfe429177e0
+  checksum: 10c0/bbc8c233388a0eb8a40786ee2e30d35935cacbfe26ab188b3e020987e85d519c2009fe07cfc37b7f718b85afdba7e54654c9153e6697301f72561bfe429177e0
   languageName: node
   linkType: hard
 
@@ -17121,7 +17121,7 @@ __metadata:
   resolution: "whatwg-encoding@npm:2.0.0"
   dependencies:
     iconv-lite: "npm:0.6.3"
-  checksum: 91b90a49f312dc751496fd23a7e68981e62f33afe938b97281ad766235c4872fc4e66319f925c5e9001502b3040dd25a33b02a9c693b73a4cbbfdc4ad10c3e3e
+  checksum: 10c0/91b90a49f312dc751496fd23a7e68981e62f33afe938b97281ad766235c4872fc4e66319f925c5e9001502b3040dd25a33b02a9c693b73a4cbbfdc4ad10c3e3e
   languageName: node
   linkType: hard
 
@@ -17130,21 +17130,21 @@ __metadata:
   resolution: "whatwg-encoding@npm:3.1.1"
   dependencies:
     iconv-lite: "npm:0.6.3"
-  checksum: 273b5f441c2f7fda3368a496c3009edbaa5e43b71b09728f90425e7f487e5cef9eb2b846a31bd760dd8077739c26faf6b5ca43a5f24033172b003b72cf61a93e
+  checksum: 10c0/273b5f441c2f7fda3368a496c3009edbaa5e43b71b09728f90425e7f487e5cef9eb2b846a31bd760dd8077739c26faf6b5ca43a5f24033172b003b72cf61a93e
   languageName: node
   linkType: hard
 
 "whatwg-mimetype@npm:^3.0.0":
   version: 3.0.0
   resolution: "whatwg-mimetype@npm:3.0.0"
-  checksum: 323895a1cda29a5fb0b9ca82831d2c316309fede0365047c4c323073e3239067a304a09a1f4b123b9532641ab604203f33a1403b5ca6a62ef405bcd7a204080f
+  checksum: 10c0/323895a1cda29a5fb0b9ca82831d2c316309fede0365047c4c323073e3239067a304a09a1f4b123b9532641ab604203f33a1403b5ca6a62ef405bcd7a204080f
   languageName: node
   linkType: hard
 
 "whatwg-mimetype@npm:^4.0.0":
   version: 4.0.0
   resolution: "whatwg-mimetype@npm:4.0.0"
-  checksum: a773cdc8126b514d790bdae7052e8bf242970cebd84af62fb2f35a33411e78e981f6c0ab9ed1fe6ec5071b09d5340ac9178e05b52d35a9c4bcf558ba1b1551df
+  checksum: 10c0/a773cdc8126b514d790bdae7052e8bf242970cebd84af62fb2f35a33411e78e981f6c0ab9ed1fe6ec5071b09d5340ac9178e05b52d35a9c4bcf558ba1b1551df
   languageName: node
   linkType: hard
 
@@ -17154,7 +17154,7 @@ __metadata:
   dependencies:
     tr46: "npm:^3.0.0"
     webidl-conversions: "npm:^7.0.0"
-  checksum: f7ec264976d7c725e0696fcaf9ebe056e14422eacbf92fdbb4462034609cba7d0c85ffa1aab05e9309d42969bcf04632ba5ed3f3882c516d7b093053315bf4c1
+  checksum: 10c0/f7ec264976d7c725e0696fcaf9ebe056e14422eacbf92fdbb4462034609cba7d0c85ffa1aab05e9309d42969bcf04632ba5ed3f3882c516d7b093053315bf4c1
   languageName: node
   linkType: hard
 
@@ -17164,7 +17164,7 @@ __metadata:
   dependencies:
     tr46: "npm:^5.0.0"
     webidl-conversions: "npm:^7.0.0"
-  checksum: ac32e9ba9d08744605519bbe9e1371174d36229689ecc099157b6ba102d4251a95e81d81f3d80271eb8da182eccfa65653f07f0ab43ea66a6934e643fd091ba9
+  checksum: 10c0/ac32e9ba9d08744605519bbe9e1371174d36229689ecc099157b6ba102d4251a95e81d81f3d80271eb8da182eccfa65653f07f0ab43ea66a6934e643fd091ba9
   languageName: node
   linkType: hard
 
@@ -17174,7 +17174,7 @@ __metadata:
   dependencies:
     tr46: "npm:~0.0.3"
     webidl-conversions: "npm:^3.0.0"
-  checksum: 1588bed84d10b72d5eec1d0faa0722ba1962f1821e7539c535558fb5398d223b0c50d8acab950b8c488b4ba69043fd833cc2697056b167d8ad46fac3995a55d5
+  checksum: 10c0/1588bed84d10b72d5eec1d0faa0722ba1962f1821e7539c535558fb5398d223b0c50d8acab950b8c488b4ba69043fd833cc2697056b167d8ad46fac3995a55d5
   languageName: node
   linkType: hard
 
@@ -17185,7 +17185,7 @@ __metadata:
     lodash.sortby: "npm:^4.7.0"
     tr46: "npm:^1.0.1"
     webidl-conversions: "npm:^4.0.2"
-  checksum: 2785fe4647690e5a0225a79509ba5e21fdf4a71f9de3eabdba1192483fe006fc79961198e0b99f82751557309f17fc5a07d4d83c251aa5b2f85ba71e674cbee9
+  checksum: 10c0/2785fe4647690e5a0225a79509ba5e21fdf4a71f9de3eabdba1192483fe006fc79961198e0b99f82751557309f17fc5a07d4d83c251aa5b2f85ba71e674cbee9
   languageName: node
   linkType: hard
 
@@ -17198,7 +17198,7 @@ __metadata:
     is-number-object: "npm:^1.0.4"
     is-string: "npm:^1.0.5"
     is-symbol: "npm:^1.0.3"
-  checksum: 0a62a03c00c91dd4fb1035b2f0733c341d805753b027eebd3a304b9cb70e8ce33e25317add2fe9b5fea6f53a175c0633ae701ff812e604410ddd049777cd435e
+  checksum: 10c0/0a62a03c00c91dd4fb1035b2f0733c341d805753b027eebd3a304b9cb70e8ce33e25317add2fe9b5fea6f53a175c0633ae701ff812e604410ddd049777cd435e
   languageName: node
   linkType: hard
 
@@ -17218,7 +17218,7 @@ __metadata:
     which-boxed-primitive: "npm:^1.0.2"
     which-collection: "npm:^1.0.1"
     which-typed-array: "npm:^1.1.9"
-  checksum: 2b7b234df3443b52f4fbd2b65b731804de8d30bcc4210ec84107ef377a81923cea7f2763b7fb78b394175cea59118bf3c41b9ffd2d643cb1d748ef93b33b6bd4
+  checksum: 10c0/2b7b234df3443b52f4fbd2b65b731804de8d30bcc4210ec84107ef377a81923cea7f2763b7fb78b394175cea59118bf3c41b9ffd2d643cb1d748ef93b33b6bd4
   languageName: node
   linkType: hard
 
@@ -17230,14 +17230,14 @@ __metadata:
     is-set: "npm:^2.0.1"
     is-weakmap: "npm:^2.0.1"
     is-weakset: "npm:^2.0.1"
-  checksum: 249f913e1758ed2f06f00706007d87dc22090a80591a56917376e70ecf8fc9ab6c41d98e1c87208bb9648676f65d4b09c0e4d23c56c7afb0f0a73a27d701df5d
+  checksum: 10c0/249f913e1758ed2f06f00706007d87dc22090a80591a56917376e70ecf8fc9ab6c41d98e1c87208bb9648676f65d4b09c0e4d23c56c7afb0f0a73a27d701df5d
   languageName: node
   linkType: hard
 
 "which-module@npm:^2.0.0":
   version: 2.0.1
   resolution: "which-module@npm:2.0.1"
-  checksum: 087038e7992649eaffa6c7a4f3158d5b53b14cf5b6c1f0e043dccfacb1ba179d12f17545d5b85ebd94a42ce280a6fe65d0cbcab70f4fc6daad1dfae85e0e6a3e
+  checksum: 10c0/087038e7992649eaffa6c7a4f3158d5b53b14cf5b6c1f0e043dccfacb1ba179d12f17545d5b85ebd94a42ce280a6fe65d0cbcab70f4fc6daad1dfae85e0e6a3e
   languageName: node
   linkType: hard
 
@@ -17250,7 +17250,7 @@ __metadata:
     for-each: "npm:^0.3.3"
     gopd: "npm:^1.0.1"
     has-tostringtag: "npm:^1.0.0"
-  checksum: 9f5f1c42918df3d5b91c4315ed0051d5d874370998bf095c9ae0df374f0881f85094e3c384b8fb08ab7b4d4f54ba81c0aff75da6226e7c0589b83dfbec1cd4c9
+  checksum: 10c0/9f5f1c42918df3d5b91c4315ed0051d5d874370998bf095c9ae0df374f0881f85094e3c384b8fb08ab7b4d4f54ba81c0aff75da6226e7c0589b83dfbec1cd4c9
   languageName: node
   linkType: hard
 
@@ -17261,7 +17261,7 @@ __metadata:
     isexe: "npm:^2.0.0"
   bin:
     which: ./bin/which
-  checksum: e945a8b6bbf6821aaaef7f6e0c309d4b615ef35699576d5489b4261da9539f70393c6b2ce700ee4321c18f914ebe5644bc4631b15466ffbaad37d83151f6af59
+  checksum: 10c0/e945a8b6bbf6821aaaef7f6e0c309d4b615ef35699576d5489b4261da9539f70393c6b2ce700ee4321c18f914ebe5644bc4631b15466ffbaad37d83151f6af59
   languageName: node
   linkType: hard
 
@@ -17272,7 +17272,7 @@ __metadata:
     isexe: "npm:^2.0.0"
   bin:
     node-which: ./bin/node-which
-  checksum: 66522872a768b60c2a65a57e8ad184e5372f5b6a9ca6d5f033d4b0dc98aff63995655a7503b9c0a2598936f532120e81dd8cc155e2e92ed662a2b9377cc4374f
+  checksum: 10c0/66522872a768b60c2a65a57e8ad184e5372f5b6a9ca6d5f033d4b0dc98aff63995655a7503b9c0a2598936f532120e81dd8cc155e2e92ed662a2b9377cc4374f
   languageName: node
   linkType: hard
 
@@ -17283,21 +17283,21 @@ __metadata:
     isexe: "npm:^3.1.1"
   bin:
     node-which: bin/which.js
-  checksum: 449fa5c44ed120ccecfe18c433296a4978a7583bf2391c50abce13f76878d2476defde04d0f79db8165bdf432853c1f8389d0485ca6e8ebce3bbcded513d5e6a
+  checksum: 10c0/449fa5c44ed120ccecfe18c433296a4978a7583bf2391c50abce13f76878d2476defde04d0f79db8165bdf432853c1f8389d0485ca6e8ebce3bbcded513d5e6a
   languageName: node
   linkType: hard
 
 "wicg-inert@npm:^3.1.2":
   version: 3.1.2
   resolution: "wicg-inert@npm:3.1.2"
-  checksum: 5b20eaedcb30f1093fb6afd0480a059e40814da56c6052469c6fe95dd2d288b89c55ed1bdbfae4db70fd5ec8148dda8dd3b671a27a26870c8f77626b13cedd1b
+  checksum: 10c0/5b20eaedcb30f1093fb6afd0480a059e40814da56c6052469c6fe95dd2d288b89c55ed1bdbfae4db70fd5ec8148dda8dd3b671a27a26870c8f77626b13cedd1b
   languageName: node
   linkType: hard
 
 "wildcard@npm:^2.0.0":
   version: 2.0.1
   resolution: "wildcard@npm:2.0.1"
-  checksum: 08f70cd97dd9a20aea280847a1fe8148e17cae7d231640e41eb26d2388697cbe65b67fd9e68715251c39b080c5ae4f76d71a9a69fa101d897273efdfb1b58bf7
+  checksum: 10c0/08f70cd97dd9a20aea280847a1fe8148e17cae7d231640e41eb26d2388697cbe65b67fd9e68715251c39b080c5ae4f76d71a9a69fa101d897273efdfb1b58bf7
   languageName: node
   linkType: hard
 
@@ -17307,7 +17307,7 @@ __metadata:
   dependencies:
     idb: "npm:^7.0.1"
     workbox-core: "npm:7.0.0"
-  checksum: 91eb064c608cfb4cf7aa4f062215d8217a99b93d67c4ae571e5abdda1b020c5ab45c7bddab99cb77d334aae8d259f0fe91b7c42ee6e7ad10db32b4a971991489
+  checksum: 10c0/91eb064c608cfb4cf7aa4f062215d8217a99b93d67c4ae571e5abdda1b020c5ab45c7bddab99cb77d334aae8d259f0fe91b7c42ee6e7ad10db32b4a971991489
   languageName: node
   linkType: hard
 
@@ -17316,7 +17316,7 @@ __metadata:
   resolution: "workbox-broadcast-update@npm:7.0.0"
   dependencies:
     workbox-core: "npm:7.0.0"
-  checksum: 3c3a6e1e72c19d2971d187297b99b242f304b1ec442f6f1ec84ea9c6e125dc01cd626d51e6ecf1c8d89226e6a286dccaa9f950bd5ef6183518af10ba0f4f524e
+  checksum: 10c0/3c3a6e1e72c19d2971d187297b99b242f304b1ec442f6f1ec84ea9c6e125dc01cd626d51e6ecf1c8d89226e6a286dccaa9f950bd5ef6183518af10ba0f4f524e
   languageName: node
   linkType: hard
 
@@ -17361,7 +17361,7 @@ __metadata:
     workbox-streams: "npm:7.0.0"
     workbox-sw: "npm:7.0.0"
     workbox-window: "npm:7.0.0"
-  checksum: a090aeee836f59d42ca9eda8b82aa5a0ee8f4ce3f3095b6fcbe157a9a154c492e4ba86b5c4d6aa50ef7c37ea1c38c965442b56d1404911fd0351d0fc9a859a3c
+  checksum: 10c0/a090aeee836f59d42ca9eda8b82aa5a0ee8f4ce3f3095b6fcbe157a9a154c492e4ba86b5c4d6aa50ef7c37ea1c38c965442b56d1404911fd0351d0fc9a859a3c
   languageName: node
   linkType: hard
 
@@ -17370,14 +17370,14 @@ __metadata:
   resolution: "workbox-cacheable-response@npm:7.0.0"
   dependencies:
     workbox-core: "npm:7.0.0"
-  checksum: ddf123b3461070e215af51d88c672f3302b540b93ecf61ad5f3853f0a997194973eedb2c9ed21e849b7419f68804ef8a8d876dced3836a7eb2c697099e3d408f
+  checksum: 10c0/ddf123b3461070e215af51d88c672f3302b540b93ecf61ad5f3853f0a997194973eedb2c9ed21e849b7419f68804ef8a8d876dced3836a7eb2c697099e3d408f
   languageName: node
   linkType: hard
 
 "workbox-core@npm:7.0.0":
   version: 7.0.0
   resolution: "workbox-core@npm:7.0.0"
-  checksum: aaaf7b66978456bf5d6a90b1068b5acd82bf451f4a23c5a416201524b50ea4e0bc62a01365499bc088b4c18cddc513fdebbe8b048ab15aff960fe7cbbf55d5bd
+  checksum: 10c0/aaaf7b66978456bf5d6a90b1068b5acd82bf451f4a23c5a416201524b50ea4e0bc62a01365499bc088b4c18cddc513fdebbe8b048ab15aff960fe7cbbf55d5bd
   languageName: node
   linkType: hard
 
@@ -17387,7 +17387,7 @@ __metadata:
   dependencies:
     idb: "npm:^7.0.1"
     workbox-core: "npm:7.0.0"
-  checksum: 990a6c2c9b177d796c012b0112913621e41b283e2736d83acb58cb9645591ddc7a6aef585145c5686f9b071d73ce12b4b1887765754624322545b0f4125d649f
+  checksum: 10c0/990a6c2c9b177d796c012b0112913621e41b283e2736d83acb58cb9645591ddc7a6aef585145c5686f9b071d73ce12b4b1887765754624322545b0f4125d649f
   languageName: node
   linkType: hard
 
@@ -17399,7 +17399,7 @@ __metadata:
     workbox-core: "npm:7.0.0"
     workbox-routing: "npm:7.0.0"
     workbox-strategies: "npm:7.0.0"
-  checksum: 7656ab4bff15fbcbc7f546d86628ccbc74736a99139ec70a166c465fc4ff59656aecd44cc0aef45b4690fd88a4980d6c9f27ce8c6606fd12d026162259a8069d
+  checksum: 10c0/7656ab4bff15fbcbc7f546d86628ccbc74736a99139ec70a166c465fc4ff59656aecd44cc0aef45b4690fd88a4980d6c9f27ce8c6606fd12d026162259a8069d
   languageName: node
   linkType: hard
 
@@ -17408,7 +17408,7 @@ __metadata:
   resolution: "workbox-navigation-preload@npm:7.0.0"
   dependencies:
     workbox-core: "npm:7.0.0"
-  checksum: f29ac8364c7f7f392daa1f886134adc780057199b218ab6c6eef298841b8825d6cbc4bc88e655299929bdf14c700edfb9f217ca5c0b46094627247528f655011
+  checksum: 10c0/f29ac8364c7f7f392daa1f886134adc780057199b218ab6c6eef298841b8825d6cbc4bc88e655299929bdf14c700edfb9f217ca5c0b46094627247528f655011
   languageName: node
   linkType: hard
 
@@ -17419,7 +17419,7 @@ __metadata:
     workbox-core: "npm:7.0.0"
     workbox-routing: "npm:7.0.0"
     workbox-strategies: "npm:7.0.0"
-  checksum: 1b47cb151bb6ec7442b2dc8981203feff22527a4383510f2399730338b620ef0d03076bd3dbc1eb9a05272d5d6f4803fb4262f320bf5645f0818981e91077f39
+  checksum: 10c0/1b47cb151bb6ec7442b2dc8981203feff22527a4383510f2399730338b620ef0d03076bd3dbc1eb9a05272d5d6f4803fb4262f320bf5645f0818981e91077f39
   languageName: node
   linkType: hard
 
@@ -17428,7 +17428,7 @@ __metadata:
   resolution: "workbox-range-requests@npm:7.0.0"
   dependencies:
     workbox-core: "npm:7.0.0"
-  checksum: 909f0ed7a176e5dc55692792825e67b577dacf1015a3f3775389fcec34ff5b3441b15595109455fe226f0bc4dce4789a7c86e5e9c5963c13b4d6482f6d01d44f
+  checksum: 10c0/909f0ed7a176e5dc55692792825e67b577dacf1015a3f3775389fcec34ff5b3441b15595109455fe226f0bc4dce4789a7c86e5e9c5963c13b4d6482f6d01d44f
   languageName: node
   linkType: hard
 
@@ -17442,7 +17442,7 @@ __metadata:
     workbox-precaching: "npm:7.0.0"
     workbox-routing: "npm:7.0.0"
     workbox-strategies: "npm:7.0.0"
-  checksum: c024141f24b0778355bdfbfe2b4a24a3f74e279f6f7541635758533e79318e15986f9f556a899c97717a9c25a1738d9e112d17dd36aa19cebf901462ebeeb8e4
+  checksum: 10c0/c024141f24b0778355bdfbfe2b4a24a3f74e279f6f7541635758533e79318e15986f9f556a899c97717a9c25a1738d9e112d17dd36aa19cebf901462ebeeb8e4
   languageName: node
   linkType: hard
 
@@ -17451,7 +17451,7 @@ __metadata:
   resolution: "workbox-routing@npm:7.0.0"
   dependencies:
     workbox-core: "npm:7.0.0"
-  checksum: 74ad651a0643506cfd3ca51eee754f5fe34e3f1460e6b772ed213e0422028cf002d70f91da32d13261bc5ee2160527ffb5436ac209fdbe8d0e7071784aa65190
+  checksum: 10c0/74ad651a0643506cfd3ca51eee754f5fe34e3f1460e6b772ed213e0422028cf002d70f91da32d13261bc5ee2160527ffb5436ac209fdbe8d0e7071784aa65190
   languageName: node
   linkType: hard
 
@@ -17460,7 +17460,7 @@ __metadata:
   resolution: "workbox-strategies@npm:7.0.0"
   dependencies:
     workbox-core: "npm:7.0.0"
-  checksum: 4fe122b80e547b347bedf187aeb2c2eb34efc3fbde2733b7709530cccb6b6e03b29adcbccecf301e4fcaad0d5cd4a74e1e704f769d949c32439dca358130a613
+  checksum: 10c0/4fe122b80e547b347bedf187aeb2c2eb34efc3fbde2733b7709530cccb6b6e03b29adcbccecf301e4fcaad0d5cd4a74e1e704f769d949c32439dca358130a613
   languageName: node
   linkType: hard
 
@@ -17470,14 +17470,14 @@ __metadata:
   dependencies:
     workbox-core: "npm:7.0.0"
     workbox-routing: "npm:7.0.0"
-  checksum: 9a1a9b8200f5b315523ac49c61a9b88791009377bbdedd44cf19c4b2258e710bd2fbc6f74ef53b72db7849da7ce9965ced5983f167785ccfc7efa1df761e3371
+  checksum: 10c0/9a1a9b8200f5b315523ac49c61a9b88791009377bbdedd44cf19c4b2258e710bd2fbc6f74ef53b72db7849da7ce9965ced5983f167785ccfc7efa1df761e3371
   languageName: node
   linkType: hard
 
 "workbox-sw@npm:7.0.0":
   version: 7.0.0
   resolution: "workbox-sw@npm:7.0.0"
-  checksum: 06d9713398ca92d8b2cad70a7d302825ec7650e05e2e0c8e68f453442fdf9a9227350c856484f7b649df6cb429cc03a103f8ecd9596e83bfa52e845bf25ffbcd
+  checksum: 10c0/06d9713398ca92d8b2cad70a7d302825ec7650e05e2e0c8e68f453442fdf9a9227350c856484f7b649df6cb429cc03a103f8ecd9596e83bfa52e845bf25ffbcd
   languageName: node
   linkType: hard
 
@@ -17492,7 +17492,7 @@ __metadata:
     workbox-build: "npm:7.0.0"
   peerDependencies:
     webpack: ^4.4.0 || ^5.9.0
-  checksum: 3d585842bb6f801db5571e4d3e5c1d7c141f91d9ba2ed0c36b617d86a00b37bdefc055e6cc981c557f21f878ff4a9cf8b82e4b0b31084ddf4d9d149673ce8882
+  checksum: 10c0/3d585842bb6f801db5571e4d3e5c1d7c141f91d9ba2ed0c36b617d86a00b37bdefc055e6cc981c557f21f878ff4a9cf8b82e4b0b31084ddf4d9d149673ce8882
   languageName: node
   linkType: hard
 
@@ -17502,7 +17502,7 @@ __metadata:
   dependencies:
     "@types/trusted-types": "npm:^2.0.2"
     workbox-core: "npm:7.0.0"
-  checksum: 8070fb80734a8543248ed6e3b186b8d3ee64419400a6d6d75f78809c44bf16321c5d9739bdf60ee62f631461ebb67a8a7dd78192504678d00bf2a9d3683f1324
+  checksum: 10c0/8070fb80734a8543248ed6e3b186b8d3ee64419400a6d6d75f78809c44bf16321c5d9739bdf60ee62f631461ebb67a8a7dd78192504678d00bf2a9d3683f1324
   languageName: node
   linkType: hard
 
@@ -17513,7 +17513,7 @@ __metadata:
     ansi-styles: "npm:^4.0.0"
     string-width: "npm:^4.1.0"
     strip-ansi: "npm:^6.0.0"
-  checksum: d15fc12c11e4cbc4044a552129ebc75ee3f57aa9c1958373a4db0292d72282f54373b536103987a4a7594db1ef6a4f10acf92978f79b98c49306a4b58c77d4da
+  checksum: 10c0/d15fc12c11e4cbc4044a552129ebc75ee3f57aa9c1958373a4db0292d72282f54373b536103987a4a7594db1ef6a4f10acf92978f79b98c49306a4b58c77d4da
   languageName: node
   linkType: hard
 
@@ -17524,7 +17524,7 @@ __metadata:
     ansi-styles: "npm:^3.2.0"
     string-width: "npm:^3.0.0"
     strip-ansi: "npm:^5.0.0"
-  checksum: fcd0b39b7453df512f2fe8c714a1c1b147fe3e6a4b5a2e4de6cadc3af47212f335eceaffe588e98322d6345e72672137e2c0b834d8a662e73a32296c1c8216bb
+  checksum: 10c0/fcd0b39b7453df512f2fe8c714a1c1b147fe3e6a4b5a2e4de6cadc3af47212f335eceaffe588e98322d6345e72672137e2c0b834d8a662e73a32296c1c8216bb
   languageName: node
   linkType: hard
 
@@ -17535,7 +17535,7 @@ __metadata:
     ansi-styles: "npm:^6.1.0"
     string-width: "npm:^5.0.1"
     strip-ansi: "npm:^7.0.1"
-  checksum: 138ff58a41d2f877eae87e3282c0630fc2789012fc1af4d6bd626eeb9a2f9a65ca92005e6e69a75c7b85a68479fe7443c7dbe1eb8fbaa681a4491364b7c55c60
+  checksum: 10c0/138ff58a41d2f877eae87e3282c0630fc2789012fc1af4d6bd626eeb9a2f9a65ca92005e6e69a75c7b85a68479fe7443c7dbe1eb8fbaa681a4491364b7c55c60
   languageName: node
   linkType: hard
 
@@ -17546,14 +17546,14 @@ __metadata:
     ansi-styles: "npm:^6.2.1"
     string-width: "npm:^7.0.0"
     strip-ansi: "npm:^7.1.0"
-  checksum: a139b818da9573677548dd463bd626a5a5286271211eb6e4e82f34a4f643191d74e6d4a9bb0a3c26ec90e6f904f679e0569674ac099ea12378a8b98e20706066
+  checksum: 10c0/a139b818da9573677548dd463bd626a5a5286271211eb6e4e82f34a4f643191d74e6d4a9bb0a3c26ec90e6f904f679e0569674ac099ea12378a8b98e20706066
   languageName: node
   linkType: hard
 
 "wrappy@npm:1":
   version: 1.0.2
   resolution: "wrappy@npm:1.0.2"
-  checksum: 56fece1a4018c6a6c8e28fbc88c87e0fbf4ea8fd64fc6c63b18f4acc4bd13e0ad2515189786dd2c30d3eec9663d70f4ecf699330002f8ccb547e4a18231fc9f0
+  checksum: 10c0/56fece1a4018c6a6c8e28fbc88c87e0fbf4ea8fd64fc6c63b18f4acc4bd13e0ad2515189786dd2c30d3eec9663d70f4ecf699330002f8ccb547e4a18231fc9f0
   languageName: node
   linkType: hard
 
@@ -17563,7 +17563,7 @@ __metadata:
   dependencies:
     imurmurhash: "npm:^0.1.4"
     signal-exit: "npm:^3.0.7"
-  checksum: a2c282c95ef5d8e1c27b335ae897b5eca00e85590d92a3fd69a437919b7b93ff36a69ea04145da55829d2164e724bc62202cdb5f4b208b425aba0807889375c7
+  checksum: 10c0/a2c282c95ef5d8e1c27b335ae897b5eca00e85590d92a3fd69a437919b7b93ff36a69ea04145da55829d2164e724bc62202cdb5f4b208b425aba0807889375c7
   languageName: node
   linkType: hard
 
@@ -17573,7 +17573,7 @@ __metadata:
   dependencies:
     imurmurhash: "npm:^0.1.4"
     signal-exit: "npm:^4.0.1"
-  checksum: e8c850a8e3e74eeadadb8ad23c9d9d63e4e792bd10f4836ed74189ef6e996763959f1249c5650e232f3c77c11169d239cbfc8342fc70f3fe401407d23810505d
+  checksum: 10c0/e8c850a8e3e74eeadadb8ad23c9d9d63e4e792bd10f4836ed74189ef6e996763959f1249c5650e232f3c77c11169d239cbfc8342fc70f3fe401407d23810505d
   languageName: node
   linkType: hard
 
@@ -17582,7 +17582,7 @@ __metadata:
   resolution: "ws@npm:6.2.2"
   dependencies:
     async-limiter: "npm:~1.0.0"
-  checksum: d628a1e95668a296644b4f51ce5debb43d9f1d89ebb2e32fef205a685b9439378eb824d60ce3a40bbc3bad0e887d84a56b343f2076f48d74f17c4c0800c42967
+  checksum: 10c0/d628a1e95668a296644b4f51ce5debb43d9f1d89ebb2e32fef205a685b9439378eb824d60ce3a40bbc3bad0e887d84a56b343f2076f48d74f17c4c0800c42967
   languageName: node
   linkType: hard
 
@@ -17597,7 +17597,7 @@ __metadata:
       optional: true
     utf-8-validate:
       optional: true
-  checksum: aec4ef4eb65821a7dde7b44790f8699cfafb7978c9b080f6d7a98a7f8fc0ce674c027073a78574c94786ba7112cc90fa2cc94fc224ceba4d4b1030cff9662494
+  checksum: 10c0/aec4ef4eb65821a7dde7b44790f8699cfafb7978c9b080f6d7a98a7f8fc0ce674c027073a78574c94786ba7112cc90fa2cc94fc224ceba4d4b1030cff9662494
   languageName: node
   linkType: hard
 
@@ -17612,77 +17612,77 @@ __metadata:
       optional: true
     utf-8-validate:
       optional: true
-  checksum: a7783bb421c648b1e622b423409cb2a58ac5839521d2f689e84bc9dc41d59379c692dd405b15a997ea1d4c0c2e5314ad707332d0c558f15232d2bc07c0b4618a
+  checksum: 10c0/a7783bb421c648b1e622b423409cb2a58ac5839521d2f689e84bc9dc41d59379c692dd405b15a997ea1d4c0c2e5314ad707332d0c558f15232d2bc07c0b4618a
   languageName: node
   linkType: hard
 
 "xml-name-validator@npm:^4.0.0":
   version: 4.0.0
   resolution: "xml-name-validator@npm:4.0.0"
-  checksum: c1bfa219d64e56fee265b2bd31b2fcecefc063ee802da1e73bad1f21d7afd89b943c9e2c97af2942f60b1ad46f915a4c81e00039c7d398b53cf410e29d3c30bd
+  checksum: 10c0/c1bfa219d64e56fee265b2bd31b2fcecefc063ee802da1e73bad1f21d7afd89b943c9e2c97af2942f60b1ad46f915a4c81e00039c7d398b53cf410e29d3c30bd
   languageName: node
   linkType: hard
 
 "xml-name-validator@npm:^5.0.0":
   version: 5.0.0
   resolution: "xml-name-validator@npm:5.0.0"
-  checksum: 3fcf44e7b73fb18be917fdd4ccffff3639373c7cb83f8fc35df6001fecba7942f1dbead29d91ebb8315e2f2ff786b508f0c9dc0215b6353f9983c6b7d62cb1f5
+  checksum: 10c0/3fcf44e7b73fb18be917fdd4ccffff3639373c7cb83f8fc35df6001fecba7942f1dbead29d91ebb8315e2f2ff786b508f0c9dc0215b6353f9983c6b7d62cb1f5
   languageName: node
   linkType: hard
 
 "xmlchars@npm:^2.2.0":
   version: 2.2.0
   resolution: "xmlchars@npm:2.2.0"
-  checksum: b64b535861a6f310c5d9bfa10834cf49127c71922c297da9d4d1b45eeaae40bf9b4363275876088fbe2667e5db028d2cd4f8ee72eed9bede840a67d57dab7593
+  checksum: 10c0/b64b535861a6f310c5d9bfa10834cf49127c71922c297da9d4d1b45eeaae40bf9b4363275876088fbe2667e5db028d2cd4f8ee72eed9bede840a67d57dab7593
   languageName: node
   linkType: hard
 
 "xtend@npm:^4.0.0":
   version: 4.0.2
   resolution: "xtend@npm:4.0.2"
-  checksum: 366ae4783eec6100f8a02dff02ac907bf29f9a00b82ac0264b4d8b832ead18306797e283cf19de776538babfdcb2101375ec5646b59f08c52128ac4ab812ed0e
+  checksum: 10c0/366ae4783eec6100f8a02dff02ac907bf29f9a00b82ac0264b4d8b832ead18306797e283cf19de776538babfdcb2101375ec5646b59f08c52128ac4ab812ed0e
   languageName: node
   linkType: hard
 
 "y18n@npm:^4.0.0":
   version: 4.0.3
   resolution: "y18n@npm:4.0.3"
-  checksum: 308a2efd7cc296ab2c0f3b9284fd4827be01cfeb647b3ba18230e3a416eb1bc887ac050de9f8c4fd9e7856b2e8246e05d190b53c96c5ad8d8cb56dffb6f81024
+  checksum: 10c0/308a2efd7cc296ab2c0f3b9284fd4827be01cfeb647b3ba18230e3a416eb1bc887ac050de9f8c4fd9e7856b2e8246e05d190b53c96c5ad8d8cb56dffb6f81024
   languageName: node
   linkType: hard
 
 "y18n@npm:^5.0.5":
   version: 5.0.8
   resolution: "y18n@npm:5.0.8"
-  checksum: 4df2842c36e468590c3691c894bc9cdbac41f520566e76e24f59401ba7d8b4811eb1e34524d57e54bc6d864bcb66baab7ffd9ca42bf1eda596618f9162b91249
+  checksum: 10c0/4df2842c36e468590c3691c894bc9cdbac41f520566e76e24f59401ba7d8b4811eb1e34524d57e54bc6d864bcb66baab7ffd9ca42bf1eda596618f9162b91249
   languageName: node
   linkType: hard
 
 "yallist@npm:^3.0.2":
   version: 3.1.1
   resolution: "yallist@npm:3.1.1"
-  checksum: c66a5c46bc89af1625476f7f0f2ec3653c1a1791d2f9407cfb4c2ba812a1e1c9941416d71ba9719876530e3340a99925f697142989371b72d93b9ee628afd8c1
+  checksum: 10c0/c66a5c46bc89af1625476f7f0f2ec3653c1a1791d2f9407cfb4c2ba812a1e1c9941416d71ba9719876530e3340a99925f697142989371b72d93b9ee628afd8c1
   languageName: node
   linkType: hard
 
 "yallist@npm:^4.0.0":
   version: 4.0.0
   resolution: "yallist@npm:4.0.0"
-  checksum: 2286b5e8dbfe22204ab66e2ef5cc9bbb1e55dfc873bbe0d568aa943eb255d131890dfd5bf243637273d31119b870f49c18fcde2c6ffbb7a7a092b870dc90625a
+  checksum: 10c0/2286b5e8dbfe22204ab66e2ef5cc9bbb1e55dfc873bbe0d568aa943eb255d131890dfd5bf243637273d31119b870f49c18fcde2c6ffbb7a7a092b870dc90625a
   languageName: node
   linkType: hard
 
 "yaml@npm:2.3.4":
   version: 2.3.4
   resolution: "yaml@npm:2.3.4"
-  checksum: cf03b68f8fef5e8516b0f0b54edaf2459f1648317fc6210391cf606d247e678b449382f4bd01f77392538429e306c7cba8ff46ff6b37cac4de9a76aff33bd9e1
+  checksum: 10c0/cf03b68f8fef5e8516b0f0b54edaf2459f1648317fc6210391cf606d247e678b449382f4bd01f77392538429e306c7cba8ff46ff6b37cac4de9a76aff33bd9e1
   languageName: node
   linkType: hard
 
 "yaml@npm:^1.10.0":
   version: 1.10.2
   resolution: "yaml@npm:1.10.2"
-  checksum: 5c28b9eb7adc46544f28d9a8d20c5b3cb1215a886609a2fd41f51628d8aaa5878ccd628b755dbcd29f6bb4921bd04ffbc6dcc370689bb96e594e2f9813d2605f
+  checksum: 10c0/5c28b9eb7adc46544f28d9a8d20c5b3cb1215a886609a2fd41f51628d8aaa5878ccd628b755dbcd29f6bb4921bd04ffbc6dcc370689bb96e594e2f9813d2605f
   languageName: node
   linkType: hard
 
@@ -17692,21 +17692,21 @@ __metadata:
   dependencies:
     camelcase: "npm:^5.0.0"
     decamelize: "npm:^1.2.0"
-  checksum: aeded49d2285c5e284e48b7c69eab4a6cf1c94decfdba073125cc4054ff49da7128a3c7c840edb6b497a075e455be304e89ba4b9228be35f1ed22f4a7bba62cc
+  checksum: 10c0/aeded49d2285c5e284e48b7c69eab4a6cf1c94decfdba073125cc4054ff49da7128a3c7c840edb6b497a075e455be304e89ba4b9228be35f1ed22f4a7bba62cc
   languageName: node
   linkType: hard
 
 "yargs-parser@npm:^20.2.1":
   version: 20.2.9
   resolution: "yargs-parser@npm:20.2.9"
-  checksum: 0685a8e58bbfb57fab6aefe03c6da904a59769bd803a722bb098bd5b0f29d274a1357762c7258fb487512811b8063fb5d2824a3415a0a4540598335b3b086c72
+  checksum: 10c0/0685a8e58bbfb57fab6aefe03c6da904a59769bd803a722bb098bd5b0f29d274a1357762c7258fb487512811b8063fb5d2824a3415a0a4540598335b3b086c72
   languageName: node
   linkType: hard
 
 "yargs-parser@npm:^21.1.1":
   version: 21.1.1
   resolution: "yargs-parser@npm:21.1.1"
-  checksum: f84b5e48169479d2f402239c59f084cfd1c3acc197a05c59b98bab067452e6b3ea46d4dd8ba2985ba7b3d32a343d77df0debd6b343e5dae3da2aab2cdf5886b2
+  checksum: 10c0/f84b5e48169479d2f402239c59f084cfd1c3acc197a05c59b98bab067452e6b3ea46d4dd8ba2985ba7b3d32a343d77df0debd6b343e5dae3da2aab2cdf5886b2
   languageName: node
   linkType: hard
 
@@ -17724,7 +17724,7 @@ __metadata:
     which-module: "npm:^2.0.0"
     y18n: "npm:^4.0.0"
     yargs-parser: "npm:^13.1.2"
-  checksum: 6612f9f0ffeee07fff4c85f153d10eba4072bf5c11e1acba96153169f9d771409dfb63253dbb0841ace719264b663cd7b18c75c0eba91af7740e76094239d386
+  checksum: 10c0/6612f9f0ffeee07fff4c85f153d10eba4072bf5c11e1acba96153169f9d771409dfb63253dbb0841ace719264b663cd7b18c75c0eba91af7740e76094239d386
   languageName: node
   linkType: hard
 
@@ -17739,20 +17739,20 @@ __metadata:
     string-width: "npm:^4.2.3"
     y18n: "npm:^5.0.5"
     yargs-parser: "npm:^21.1.1"
-  checksum: ccd7e723e61ad5965fffbb791366db689572b80cca80e0f96aad968dfff4156cd7cd1ad18607afe1046d8241e6fb2d6c08bf7fa7bfb5eaec818735d8feac8f05
+  checksum: 10c0/ccd7e723e61ad5965fffbb791366db689572b80cca80e0f96aad968dfff4156cd7cd1ad18607afe1046d8241e6fb2d6c08bf7fa7bfb5eaec818735d8feac8f05
   languageName: node
   linkType: hard
 
 "yocto-queue@npm:^0.1.0":
   version: 0.1.0
   resolution: "yocto-queue@npm:0.1.0"
-  checksum: dceb44c28578b31641e13695d200d34ec4ab3966a5729814d5445b194933c096b7ced71494ce53a0e8820685d1d010df8b2422e5bf2cdea7e469d97ffbea306f
+  checksum: 10c0/dceb44c28578b31641e13695d200d34ec4ab3966a5729814d5445b194933c096b7ced71494ce53a0e8820685d1d010df8b2422e5bf2cdea7e469d97ffbea306f
   languageName: node
   linkType: hard
 
 "zlibjs@npm:^0.3.1":
   version: 0.3.1
   resolution: "zlibjs@npm:0.3.1"
-  checksum: 2d110bfcb0f8b8dbf225423f6556da9c5bca95c8b849c1218983676158a24b5cd0350357e0c4d504e27f8c7e18d471d9712576f35114a81a51bcf83453f02beb
+  checksum: 10c0/2d110bfcb0f8b8dbf225423f6556da9c5bca95c8b849c1218983676158a24b5cd0350357e0c4d504e27f8c7e18d471d9712576f35114a81a51bcf83453f02beb
   languageName: node
   linkType: hard

From d48d824d9ac27417a3d443c100708ee5b7330e7a Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 21 Feb 2024 22:27:00 +0100
Subject: [PATCH 0177/2191] Update DefinitelyTyped types (non-major) (#29165)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 048f2c7f28f96d..9293500fddc5ac 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3307,9 +3307,9 @@ __metadata:
   linkType: hard
 
 "@types/punycode@npm:^2.1.0":
-  version: 2.1.3
-  resolution: "@types/punycode@npm:2.1.3"
-  checksum: 10c0/c4babd33d0ed010017bc2d44a15b322b1e2997b9bb335020c26a58ac855e176d337536fa0ca84aa1b0c6d7008799566d4d5430a083d123ac6bbcc59c451b9cfc
+  version: 2.1.4
+  resolution: "@types/punycode@npm:2.1.4"
+  checksum: 10c0/0472cc871783a22859ad83fe7cb62d23226ff78694b9807d2a3ec37571d46b05409ca9282c8ccedfb59e58e4a4561b27463623ce95bcfd6bd9c11ac1ef3cd0d1
   languageName: node
   linkType: hard
 
@@ -3342,11 +3342,11 @@ __metadata:
   linkType: hard
 
 "@types/react-dom@npm:^18.0.0, @types/react-dom@npm:^18.2.4":
-  version: 18.2.18
-  resolution: "@types/react-dom@npm:18.2.18"
+  version: 18.2.19
+  resolution: "@types/react-dom@npm:18.2.19"
   dependencies:
     "@types/react": "npm:*"
-  checksum: 10c0/74dba11a1b8156f3a763f3fca1fb4ec1dcd349153279b8bf79210024a69f994bf2cf0728198c047f8130c5318420ea56281b0a4ef84c8ae943cd9a0cac705220
+  checksum: 10c0/88d7c6daa4659f661d0c97985d9fca492f24b421a34bb614dcd94c343aed7bea121463149e97fb01ecaa693be17b7d1542cf71ddb1705f3889a81eb2639a88aa
   languageName: node
   linkType: hard
 
@@ -3472,13 +3472,13 @@ __metadata:
   linkType: hard
 
 "@types/react@npm:*, @types/react@npm:16 || 17 || 18, @types/react@npm:>=16.9.11, @types/react@npm:^18.2.7":
-  version: 18.2.54
-  resolution: "@types/react@npm:18.2.54"
+  version: 18.2.57
+  resolution: "@types/react@npm:18.2.57"
   dependencies:
     "@types/prop-types": "npm:*"
     "@types/scheduler": "npm:*"
     csstype: "npm:^3.0.2"
-  checksum: 10c0/ad38193c30a063a481aeec2460de6396c80d8de2f1c7a8cbb80a4e8bc594f74c308ce93e165d743b38507c3ac0a491c24ce0efbd84c9ab21fd5fd38d2963d329
+  checksum: 10c0/d5ed2f04c069c591e41ef1bea5b70f89dc7a4edff2254c4df801ddaa21b43b2aa70c106c049b9b6736f98f5afe66576d0e75a9e47c7044f2660b1744ff64f535
   languageName: node
   linkType: hard
 

From 38d02922814180f3f585517e247be86be6b77ec9 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 21 Feb 2024 22:27:28 +0100
Subject: [PATCH 0178/2191] Update dependency @reduxjs/toolkit to v2.2.1
 (#29178)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 9293500fddc5ac..9d3c8569dadf70 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2608,8 +2608,8 @@ __metadata:
   linkType: hard
 
 "@reduxjs/toolkit@npm:^2.0.1":
-  version: 2.1.0
-  resolution: "@reduxjs/toolkit@npm:2.1.0"
+  version: 2.2.1
+  resolution: "@reduxjs/toolkit@npm:2.2.1"
   dependencies:
     immer: "npm:^10.0.3"
     redux: "npm:^5.0.1"
@@ -2623,7 +2623,7 @@ __metadata:
       optional: true
     react-redux:
       optional: true
-  checksum: 10c0/4ea9e9ea8cc2cab1c997127dc332c165cebc55bf8e95812ba4dc40d48dd87d5ee4bf3316b9eab49b5cce056eda6bdcb4b2a7dc3a15f056f64f76134f148f9f10
+  checksum: 10c0/675f816b311d6d703259e00c73977c9c5968e41b039d6d149e34e9084d5e6718aff3b692d2b7697974fb57a056687932117da1dd5202d392811d8d4e91d09322
   languageName: node
   linkType: hard
 

From df4ed603317ce709c0e06a5bee77d32b65f6b76c Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 21 Feb 2024 22:28:10 +0100
Subject: [PATCH 0179/2191] Update dependency dotenv to v16.4.5 (#29190)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 9d3c8569dadf70..04d820e1130d40 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6840,9 +6840,9 @@ __metadata:
   linkType: hard
 
 "dotenv@npm:^16.0.3":
-  version: 16.4.3
-  resolution: "dotenv@npm:16.4.3"
-  checksum: 10c0/c6a572b2dab5d71accb7064c90b38dfd4068c2487be859a0f053460fcaa685a7718e78db51d643b32e0736b318988c31f8c45cb4ab99cd620278f537177cb0ab
+  version: 16.4.5
+  resolution: "dotenv@npm:16.4.5"
+  checksum: 10c0/48d92870076832af0418b13acd6e5a5a3e83bb00df690d9812e94b24aff62b88ade955ac99a05501305b8dc8f1b0ee7638b18493deb6fe93d680e5220936292f
   languageName: node
   linkType: hard
 

From bcc0860100399023496ce4cf0abd4430bcb2ab7a Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 21 Feb 2024 22:28:53 +0100
Subject: [PATCH 0180/2191] Update dependency core-js to v3.36.0 (#29197)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 04d820e1130d40..b95b003a7bc0e6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5878,9 +5878,9 @@ __metadata:
   linkType: hard
 
 "core-js@npm:^3.30.2":
-  version: 3.35.1
-  resolution: "core-js@npm:3.35.1"
-  checksum: 10c0/ebc8e22c36d13bcf2140cbc1d8ad65d1b08192bff4c43ade70c72eac103cb4dcfbc521f2b1ad1c74881b0a4353e64986537893ae4f07888e49228340efa13ae6
+  version: 3.36.0
+  resolution: "core-js@npm:3.36.0"
+  checksum: 10c0/62dcb41ba79ead581e4c5b2740ae18bfe6ee230e853893736d16edb01b580574d8645ff6c5513d1c75d59620f8451aee45c119d3c4f5ebc66cff5f003a816864
   languageName: node
   linkType: hard
 

From aed60df80e7e254808d3eb43c2fbf1961b122b4a Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 21 Feb 2024 22:29:41 +0100
Subject: [PATCH 0181/2191] Update dependency sass to v1.71.1 (#29238)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index b95b003a7bc0e6..c4379b45cd79ba 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -14587,15 +14587,15 @@ __metadata:
   linkType: hard
 
 "sass@npm:^1.62.1":
-  version: 1.70.0
-  resolution: "sass@npm:1.70.0"
+  version: 1.71.1
+  resolution: "sass@npm:1.71.1"
   dependencies:
     chokidar: "npm:>=3.0.0 <4.0.0"
     immutable: "npm:^4.0.0"
     source-map-js: "npm:>=0.6.2 <2.0.0"
   bin:
     sass: sass.js
-  checksum: 10c0/7c309ee1c096d591746d122da9f1ebd65b4c4b3a60c2cc0ec720fd98fe1205fa8b44c9f563d113b9fdfeb25af1e32ec9b3e048bd4b8e05d267f020953bd7baf0
+  checksum: 10c0/59d79a6e106747746792b0c71908ae0aecdaf9b794d5724ee64e5249412f0d8ebe7ee2bf12946618848f14f949c4f6b530d82da3e62ab31c71198c6f73002130
   languageName: node
   linkType: hard
 

From 638861b2a31fc680639dc44f68bece8969a25f1b Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 21 Feb 2024 22:31:09 +0100
Subject: [PATCH 0182/2191] Update dependency http-link-header to v1.1.2
 (#29340)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index c4379b45cd79ba..d1324fa2912eda 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8878,9 +8878,9 @@ __metadata:
   linkType: hard
 
 "http-link-header@npm:^1.1.1":
-  version: 1.1.1
-  resolution: "http-link-header@npm:1.1.1"
-  checksum: 10c0/a97b679e01e9f0860c823917c2c6637e3f0c06aa6cc0de4da98e1a433690e19b21323595889aa9347618134600bc7e2b0ff3cbeea7e4cea2f8cdae65dd9cc7f1
+  version: 1.1.2
+  resolution: "http-link-header@npm:1.1.2"
+  checksum: 10c0/d4ae44b912dd1f5a37c11438878b51635a7a8f9228bf004b2ecf9e1d23a9d912942b02e5f41695bbe9fa93ab380bdd10c58db717c3531c705116e61014aba3f0
   languageName: node
   linkType: hard
 

From c63567a214bef81e853425d86f4165f67254823f Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 21 Feb 2024 23:06:17 +0100
Subject: [PATCH 0183/2191] Update typescript-eslint monorepo to v7 (major)
 (#29179)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 package.json |   4 +-
 yarn.lock    | 121 +++++++++++++++++++++++++++++++++++++++------------
 2 files changed, 94 insertions(+), 31 deletions(-)

diff --git a/package.json b/package.json
index 49a22f54929c56..8d104f48647188 100644
--- a/package.json
+++ b/package.json
@@ -173,8 +173,8 @@
     "@types/redux-immutable": "^4.0.3",
     "@types/requestidlecallback": "^0.3.5",
     "@types/webpack": "^4.41.33",
-    "@typescript-eslint/eslint-plugin": "^6.0.0",
-    "@typescript-eslint/parser": "^6.17.0",
+    "@typescript-eslint/eslint-plugin": "^7.0.0",
+    "@typescript-eslint/parser": "^7.0.0",
     "babel-jest": "^29.5.0",
     "eslint": "^8.41.0",
     "eslint-config-prettier": "^9.0.0",
diff --git a/yarn.lock b/yarn.lock
index d1324fa2912eda..eeb38ae901d8b9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2334,8 +2334,8 @@ __metadata:
     "@types/redux-immutable": "npm:^4.0.3"
     "@types/requestidlecallback": "npm:^0.3.5"
     "@types/webpack": "npm:^4.41.33"
-    "@typescript-eslint/eslint-plugin": "npm:^6.0.0"
-    "@typescript-eslint/parser": "npm:^6.17.0"
+    "@typescript-eslint/eslint-plugin": "npm:^7.0.0"
+    "@typescript-eslint/parser": "npm:^7.0.0"
     arrow-key-navigation: "npm:^1.2.0"
     async-mutex: "npm:^0.4.0"
     autoprefixer: "npm:^10.4.14"
@@ -3658,15 +3658,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/eslint-plugin@npm:^6.0.0":
-  version: 6.21.0
-  resolution: "@typescript-eslint/eslint-plugin@npm:6.21.0"
+"@typescript-eslint/eslint-plugin@npm:^7.0.0":
+  version: 7.0.2
+  resolution: "@typescript-eslint/eslint-plugin@npm:7.0.2"
   dependencies:
     "@eslint-community/regexpp": "npm:^4.5.1"
-    "@typescript-eslint/scope-manager": "npm:6.21.0"
-    "@typescript-eslint/type-utils": "npm:6.21.0"
-    "@typescript-eslint/utils": "npm:6.21.0"
-    "@typescript-eslint/visitor-keys": "npm:6.21.0"
+    "@typescript-eslint/scope-manager": "npm:7.0.2"
+    "@typescript-eslint/type-utils": "npm:7.0.2"
+    "@typescript-eslint/utils": "npm:7.0.2"
+    "@typescript-eslint/visitor-keys": "npm:7.0.2"
     debug: "npm:^4.3.4"
     graphemer: "npm:^1.4.0"
     ignore: "npm:^5.2.4"
@@ -3674,30 +3674,30 @@ __metadata:
     semver: "npm:^7.5.4"
     ts-api-utils: "npm:^1.0.1"
   peerDependencies:
-    "@typescript-eslint/parser": ^6.0.0 || ^6.0.0-alpha
-    eslint: ^7.0.0 || ^8.0.0
+    "@typescript-eslint/parser": ^7.0.0
+    eslint: ^8.56.0
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 10c0/f911a79ee64d642f814a3b6cdb0d324b5f45d9ef955c5033e78903f626b7239b4aa773e464a38c3e667519066169d983538f2bf8e5d00228af587c9d438fb344
+  checksum: 10c0/76727ad48f01c1bb4ef37690e7ed12754930ce3a4bbe5dcd52f24d42f4625fc0b151db8189947f3956b4a09a562eb2da683ff65b57a13a15426eee3b680f80a5
   languageName: node
   linkType: hard
 
-"@typescript-eslint/parser@npm:^6.17.0":
-  version: 6.21.0
-  resolution: "@typescript-eslint/parser@npm:6.21.0"
+"@typescript-eslint/parser@npm:^7.0.0":
+  version: 7.0.2
+  resolution: "@typescript-eslint/parser@npm:7.0.2"
   dependencies:
-    "@typescript-eslint/scope-manager": "npm:6.21.0"
-    "@typescript-eslint/types": "npm:6.21.0"
-    "@typescript-eslint/typescript-estree": "npm:6.21.0"
-    "@typescript-eslint/visitor-keys": "npm:6.21.0"
+    "@typescript-eslint/scope-manager": "npm:7.0.2"
+    "@typescript-eslint/types": "npm:7.0.2"
+    "@typescript-eslint/typescript-estree": "npm:7.0.2"
+    "@typescript-eslint/visitor-keys": "npm:7.0.2"
     debug: "npm:^4.3.4"
   peerDependencies:
-    eslint: ^7.0.0 || ^8.0.0
+    eslint: ^8.56.0
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 10c0/a8f99820679decd0d115c0af61903fb1de3b1b5bec412dc72b67670bf636de77ab07f2a68ee65d6da7976039bbf636907f9d5ca546db3f0b98a31ffbc225bc7d
+  checksum: 10c0/acffdbea0bba24398ba8bd1ccf5b59438bc093e41d7a325019383094f39d676b5cf2f5963bfa5e332e54728e5b9e14be3984752ee91da6f0e1a3e0b613422d0e
   languageName: node
   linkType: hard
 
@@ -3711,20 +3711,30 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/type-utils@npm:6.21.0":
-  version: 6.21.0
-  resolution: "@typescript-eslint/type-utils@npm:6.21.0"
+"@typescript-eslint/scope-manager@npm:7.0.2":
+  version: 7.0.2
+  resolution: "@typescript-eslint/scope-manager@npm:7.0.2"
   dependencies:
-    "@typescript-eslint/typescript-estree": "npm:6.21.0"
-    "@typescript-eslint/utils": "npm:6.21.0"
+    "@typescript-eslint/types": "npm:7.0.2"
+    "@typescript-eslint/visitor-keys": "npm:7.0.2"
+  checksum: 10c0/60241a0dbed7605133b6242d7fc172e8ee649e1033b8a179cebe3e21c60e0c08c12679fd37644cfef57c95a5d75a3927afc9d6365a5f9684c1d043285db23c66
+  languageName: node
+  linkType: hard
+
+"@typescript-eslint/type-utils@npm:7.0.2":
+  version: 7.0.2
+  resolution: "@typescript-eslint/type-utils@npm:7.0.2"
+  dependencies:
+    "@typescript-eslint/typescript-estree": "npm:7.0.2"
+    "@typescript-eslint/utils": "npm:7.0.2"
     debug: "npm:^4.3.4"
     ts-api-utils: "npm:^1.0.1"
   peerDependencies:
-    eslint: ^7.0.0 || ^8.0.0
+    eslint: ^8.56.0
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 10c0/7409c97d1c4a4386b488962739c4f1b5b04dc60cf51f8cd88e6b12541f84d84c6b8b67e491a147a2c95f9ec486539bf4519fb9d418411aef6537b9c156468117
+  checksum: 10c0/fa7957aa65cb0d7366c7c9be94e45cc2f1ebe9981cbf393054b505c6d555a01b2a2fe7cd1254d668f30183a275032f909186ce0b9f213f64b776bd7872144a6e
   languageName: node
   linkType: hard
 
@@ -3735,6 +3745,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@typescript-eslint/types@npm:7.0.2":
+  version: 7.0.2
+  resolution: "@typescript-eslint/types@npm:7.0.2"
+  checksum: 10c0/5f95266cc2cd0e6cf1239dcd36b53c7d98b01ba12c61947316f0d879df87b912b4d23f0796324e2ab0fb8780503a338da41a4695fa91d90392b6c6aca5239fa7
+  languageName: node
+  linkType: hard
+
 "@typescript-eslint/typescript-estree@npm:6.21.0":
   version: 6.21.0
   resolution: "@typescript-eslint/typescript-estree@npm:6.21.0"
@@ -3754,7 +3771,43 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/utils@npm:6.21.0, @typescript-eslint/utils@npm:^6.18.1":
+"@typescript-eslint/typescript-estree@npm:7.0.2":
+  version: 7.0.2
+  resolution: "@typescript-eslint/typescript-estree@npm:7.0.2"
+  dependencies:
+    "@typescript-eslint/types": "npm:7.0.2"
+    "@typescript-eslint/visitor-keys": "npm:7.0.2"
+    debug: "npm:^4.3.4"
+    globby: "npm:^11.1.0"
+    is-glob: "npm:^4.0.3"
+    minimatch: "npm:9.0.3"
+    semver: "npm:^7.5.4"
+    ts-api-utils: "npm:^1.0.1"
+  peerDependenciesMeta:
+    typescript:
+      optional: true
+  checksum: 10c0/2f6795b05fced9f2e0887f6735aa1a0b20516952792e4be13cd94c5e56db8ad013ba27aeb56f89fedff8b7af587f854482f00aac75b418611c74e42169c29aeb
+  languageName: node
+  linkType: hard
+
+"@typescript-eslint/utils@npm:7.0.2":
+  version: 7.0.2
+  resolution: "@typescript-eslint/utils@npm:7.0.2"
+  dependencies:
+    "@eslint-community/eslint-utils": "npm:^4.4.0"
+    "@types/json-schema": "npm:^7.0.12"
+    "@types/semver": "npm:^7.5.0"
+    "@typescript-eslint/scope-manager": "npm:7.0.2"
+    "@typescript-eslint/types": "npm:7.0.2"
+    "@typescript-eslint/typescript-estree": "npm:7.0.2"
+    semver: "npm:^7.5.4"
+  peerDependencies:
+    eslint: ^8.56.0
+  checksum: 10c0/b4ae9a36393c92b332e99d70219d1ee056271261f7433924db804e5f06d97ca60408b9c7a655afce8a851982e7153243a625d6cc76fea764f767f96c8f3e16da
+  languageName: node
+  linkType: hard
+
+"@typescript-eslint/utils@npm:^6.18.1":
   version: 6.21.0
   resolution: "@typescript-eslint/utils@npm:6.21.0"
   dependencies:
@@ -3781,6 +3834,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@typescript-eslint/visitor-keys@npm:7.0.2":
+  version: 7.0.2
+  resolution: "@typescript-eslint/visitor-keys@npm:7.0.2"
+  dependencies:
+    "@typescript-eslint/types": "npm:7.0.2"
+    eslint-visitor-keys: "npm:^3.4.1"
+  checksum: 10c0/4146d1ad6ce9374e6b5a75677fc709816bdc5fe324b1a857405f21dad23bb28c79cfd0555bc2a01c4af1d9e9ee81ff5e29ec41cc9d05b0b1101cc4264e7f21d1
+  languageName: node
+  linkType: hard
+
 "@ungap/structured-clone@npm:^1.2.0":
   version: 1.2.0
   resolution: "@ungap/structured-clone@npm:1.2.0"

From 006aa4e35a02ebc21623420e76a7b04db9fa572d Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 22 Feb 2024 04:02:15 -0500
Subject: [PATCH 0184/2191] Update husky and remove deprecated features
 (#29338)

---
 .husky/pre-commit |  3 ---
 package.json      |  4 ++--
 yarn.lock         | 12 ++++++------
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/.husky/pre-commit b/.husky/pre-commit
index d2ae35e84b09c1..372362317175c3 100755
--- a/.husky/pre-commit
+++ b/.husky/pre-commit
@@ -1,4 +1 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
 yarn lint-staged
diff --git a/package.json b/package.json
index 8d104f48647188..3e0bdc35ae4d1c 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,7 @@
     "lint:yml": "prettier --check \"**/*.{yaml,yml}\"",
     "lint": "yarn lint:js && yarn lint:json && yarn lint:sass && yarn lint:yml",
     "postversion": "git push --tags",
-    "prepare": "husky install",
+    "prepare": "husky",
     "start": "node ./streaming/index.js",
     "test": "yarn lint && yarn run typecheck && yarn jest",
     "typecheck": "tsc --noEmit"
@@ -188,7 +188,7 @@
     "eslint-plugin-promise": "~6.1.1",
     "eslint-plugin-react": "^7.33.2",
     "eslint-plugin-react-hooks": "^4.6.0",
-    "husky": "^8.0.3",
+    "husky": "^9.0.11",
     "jest": "^29.5.0",
     "jest-environment-jsdom": "^29.5.0",
     "lint-staged": "^15.0.0",
diff --git a/yarn.lock b/yarn.lock
index eeb38ae901d8b9..68544fbd975a8a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2378,7 +2378,7 @@ __metadata:
     history: "npm:^4.10.1"
     hoist-non-react-statics: "npm:^3.3.2"
     http-link-header: "npm:^1.1.1"
-    husky: "npm:^8.0.3"
+    husky: "npm:^9.0.11"
     immutable: "npm:^4.3.0"
     imports-loader: "npm:^1.2.0"
     intl-messageformat: "npm:^10.3.5"
@@ -9046,12 +9046,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"husky@npm:^8.0.3":
-  version: 8.0.3
-  resolution: "husky@npm:8.0.3"
+"husky@npm:^9.0.11":
+  version: 9.0.11
+  resolution: "husky@npm:9.0.11"
   bin:
-    husky: lib/bin.js
-  checksum: 10c0/6722591771c657b91a1abb082e07f6547eca79144d678e586828ae806499d90dce2a6aee08b66183fd8b085f19d20e0990a2ad396961746b4c8bd5bdb619d668
+    husky: bin.mjs
+  checksum: 10c0/2c787dcf74a837fc9a4fea7da907509d4bd9a289f4ea10ecc9d86279e4d4542b0f5f6443a619bccae19e265f2677172cc2b86aae5c932a35a330cc227d914605
   languageName: node
   linkType: hard
 

From 53a4648db1a86e6cbe91cb08bef382c3b1363497 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 22 Feb 2024 09:03:13 +0000
Subject: [PATCH 0185/2191] Update dependency pino to v8.19.0 (#29253)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 68544fbd975a8a..0ab97ab5a1662b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -12717,8 +12717,8 @@ __metadata:
   linkType: hard
 
 "pino@npm:^8.17.1, pino@npm:^8.17.2":
-  version: 8.18.0
-  resolution: "pino@npm:8.18.0"
+  version: 8.19.0
+  resolution: "pino@npm:8.19.0"
   dependencies:
     atomic-sleep: "npm:^1.0.0"
     fast-redact: "npm:^3.1.1"
@@ -12733,7 +12733,7 @@ __metadata:
     thread-stream: "npm:^2.0.0"
   bin:
     pino: bin.js
-  checksum: 10c0/ca73bb31e4656954413b89f48c486b1680fec0c6bb12d4d796c5ccf8eca40f3ee12c9532a0fa61284ed9a800c14eaa0f496f520057ef70cdee0447114813e8eb
+  checksum: 10c0/53e6e9db91e451163e93294b0a7c5c8135742d58909dfc4a6fa1afc155b2b0dc44448ec3d057e08351951f9a3ea67e6ea8e72e952b64a1d889f4d5376cbd1a5d
   languageName: node
   linkType: hard
 

From 449fcf1ae75ffc01e44934bd417c57c849fabf48 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 22 Feb 2024 11:37:48 +0100
Subject: [PATCH 0186/2191] New Crowdin Translations (automated) (#29343)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 config/locales/da.yml    | 3 +++
 config/locales/de.yml    | 3 +++
 config/locales/es-AR.yml | 3 +++
 config/locales/es-MX.yml | 3 +++
 config/locales/es.yml    | 3 +++
 config/locales/fo.yml    | 3 +++
 config/locales/hu.yml    | 3 +++
 config/locales/it.yml    | 3 +++
 config/locales/ja.yml    | 3 +++
 config/locales/nl.yml    | 3 +++
 config/locales/nn.yml    | 3 +++
 config/locales/pl.yml    | 3 +++
 config/locales/sl.yml    | 3 +++
 config/locales/sq.yml    | 3 +++
 config/locales/uk.yml    | 3 +++
 config/locales/vi.yml    | 3 +++
 config/locales/zh-CN.yml | 3 +++
 config/locales/zh-TW.yml | 3 +++
 18 files changed, 54 insertions(+)

diff --git a/config/locales/da.yml b/config/locales/da.yml
index 57899d5f71f4be..4abc59dd4c172c 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -966,6 +966,9 @@ da:
       title: Webhooks
       webhook: Webhook
   admin_mailer:
+    auto_close_registrations:
+      body: Grundet manglende nylig moderatoraktivitet er registreringsproceduren på %{instance} automatisk ændret til at kræve manuel gennemgang for at forhindre, at %{instance} bruges som platform for potentielle dårlige aktører. Proceduren kan til enhver tid ændre igen til åbne registreringer.
+      subject: Registreringsproceduren for %{instance} er automatisk ændret til at kræve godkendelse
     new_appeal:
       actions:
         delete_statuses: for sletning af vedkommendes indlæg
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 57ce5268a8b910..4b60ddecc03ab0 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -966,6 +966,9 @@ de:
       title: Webhooks
       webhook: Webhook
   admin_mailer:
+    auto_close_registrations:
+      body: Aufgrund fehlender Aktivität von Moderator*innen müssen neue Registrierungen auf %{instance} jetzt manuell genehmigt werden. Dies wurde automatisch umgestellt, damit %{instance} nicht als Plattform für Böswillige missbraucht werden kann. Du kannst jederzeit auf uneingeschränkte Registrierungen zurückwechseln.
+      subject: Registrierungen auf %{instance} erfordern jetzt eine manuelle Genehmigung (automatisch umgestellt)
     new_appeal:
       actions:
         delete_statuses: das Löschen der Beiträge
diff --git a/config/locales/es-AR.yml b/config/locales/es-AR.yml
index d1dbdbf0b835ad..c4d12d70ae9247 100644
--- a/config/locales/es-AR.yml
+++ b/config/locales/es-AR.yml
@@ -966,6 +966,9 @@ es-AR:
       title: Webhooks
       webhook: Webhook
   admin_mailer:
+    auto_close_registrations:
+      body: Debido a la falta de actividad reciente por parte de moderadores, los registros en %{instance} fueron cambiados automáticamente para requerir revisión manual, para evitar que %{instance} se use como una plataforma para potenciales malos actores. Podés volver a cambiar esto para abrir los registros en cualquier momento.
+      subject: Los registros de %{instance} se cambiaron automáticamente para requerir aprobación
     new_appeal:
       actions:
         delete_statuses: para eliminar sus mensajes
diff --git a/config/locales/es-MX.yml b/config/locales/es-MX.yml
index a8b918a8fef911..eedd8bf7ce588b 100644
--- a/config/locales/es-MX.yml
+++ b/config/locales/es-MX.yml
@@ -966,6 +966,9 @@ es-MX:
       title: Webhooks
       webhook: Webhook
   admin_mailer:
+    auto_close_registrations:
+      body: Debido a la falta de actividad reciente de los moderadores, se ha cambiado automáticamente el registro en %{instance} para requerir revisión manual, para evitar que la instancia %{instance} sea usada como plataforma para malos actores potenciales. Puedes volver a cambiarlo en cualquier momento para abrir de nuevo los registros.
+      subject: Se ha cambiado automáticamente el registro de %{instance} para requerir aprobación
     new_appeal:
       actions:
         delete_statuses: para eliminar sus mensajes
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 08fc0988e4eb6f..b6217953812401 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -966,6 +966,9 @@ es:
       title: Webhooks
       webhook: Webhook
   admin_mailer:
+    auto_close_registrations:
+      body: Debido a la falta de actividad reciente de los moderadores, se ha cambiado automáticamente el registro en %{instance} para requerir revisión manual, para evitar que la instancia %{instance} sea usada como plataforma para malos actores potenciales. Puedes volver a cambiarlo en cualquier momento para abrir de nuevo los registros.
+      subject: Se ha cambiado automáticamente el registro de %{instance} para requerir aprobación
     new_appeal:
       actions:
         delete_statuses: para eliminar sus mensajes
diff --git a/config/locales/fo.yml b/config/locales/fo.yml
index 10b1e76f5f06f8..0e59783a060d9e 100644
--- a/config/locales/fo.yml
+++ b/config/locales/fo.yml
@@ -966,6 +966,9 @@ fo:
       title: Webhooks/vevhúkar
       webhook: Webhook/vevhúkur
   admin_mailer:
+    auto_close_registrations:
+      body: Vegna avmarkað virksemi hjá umsjónarfólki eru skrásetingar á %{instance} broyttar sjálvvirkandi til at krevja manuella eftirkanning fyri at forða at %{instance} verður brúktur sum ein pallur fyri ringar aktørar. Tú kanst skifta aftur til opnar skrásetingar tá tú vilt.
+      subject: Skrásetingar á %{instance} eru sjálvvirkandi broyttar soleiðis at tær krevja váttan
     new_appeal:
       actions:
         delete_statuses: at strika teirra postar
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 34ae9a21c8d221..a8edcd58bb42c9 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -966,6 +966,9 @@ hu:
       title: Webhookok
       webhook: Webhook
   admin_mailer:
+    auto_close_registrations:
+      body: A közelmúlt moderátori tevékenységnek hiánya miatt %{instance} regisztráció automatikusan kézi ellenőrzést igénylőre vált, hogy megakadályozz, hogy a %{instance} platformot potenciális rossz szereplők számára használhasson. Bármikor visszakapcsolhatjuk a nyitott regisztrációkhoz.
+      subject: "%{instance} regisztráció automatikusan átállt jóváhagyást igénylőre."
     new_appeal:
       actions:
         delete_statuses: bejegyzések törléséről
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 31de2252d181fb..34fa65cc76adb9 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -966,6 +966,9 @@ it:
       title: Webhook
       webhook: Webhook
   admin_mailer:
+    auto_close_registrations:
+      body: A causa della mancanza di attività recente da parte dei moderatori, le registrazioni su %{instance} sono passate automaticamente alla richiesta di revisione manuale, per evitare che %{instance} venga utilizzata come piattaforma per potenziali malintenzionati. Puoi ripristinarlo per aprire le registrazioni in qualsiasi momento.
+      subject: Le registrazioni per %{instance} sono passate automaticamente alla richiesta di approvazione
     new_appeal:
       actions:
         delete_statuses: per cancellare i loro post
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 6880f64c5e691d..2cc423332530b8 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -948,6 +948,9 @@ ja:
       title: Webhooks
       webhook: Webhook
   admin_mailer:
+    auto_close_registrations:
+      body: "%{instance} のモデレーターによる活動がしばらくなかったため、%{instance} のアカウント作成は手動での承認を必要とするように自動的に変更されました。これには %{instance} が悪意ある者の踏み台として使われることを防ぐ役割があります。アカウント作成は必要に応じていつでも再び開放できます。"
+      subject: "%{instance} のアカウント作成は自動的に承認制に変更されました"
     new_appeal:
       actions:
         delete_statuses: 投稿を削除する
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index ea811400a65aae..d992d8b4321ef2 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -966,6 +966,9 @@ nl:
       title: Webhooks
       webhook: Webhook
   admin_mailer:
+    auto_close_registrations:
+      body: In verband met een gebrek aan recentelijke moderator-activiteit, is de registratie-modus op %{instance} automatisch veranderd naar handmatige beoordeling door moderatoren. Dit om te voorkomen dat %{instance} als platform voor eventueel misbruik kan worden gebruikt. Je kunt op elk gewenst moment veel terugschakelen naar open registraties.
+      subject: De registratie-modus op %{instance} is automatisch veranderd naar handmatige beoordeling door moderatoren
     new_appeal:
       actions:
         delete_statuses: het verwijderen van diens berichten
diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index ffa5198a3a4ebf..b1ae928997bb79 100644
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -966,6 +966,9 @@ nn:
       title: Webhooker
       webhook: Webhook
   admin_mailer:
+    auto_close_registrations:
+      body: På grunn av mangel på nyleg moderatoraktivitet, er registreringar på %{instance} automatisk bytt til å krevje manuell gjennomgang, for å hindre at %{instance} vert brukt som ein plattform for potensielle dårlege aktørar. Du kan byte tilbake for å opne registreringar når som helst.
+      subject: Registreringar for %{instance} er automatisk bytt til å krevje godkjenning
     new_appeal:
       actions:
         delete_statuses: å slette sine innlegg
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 5bc78a6adfa4d7..401ca3de46ae4e 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -1002,6 +1002,9 @@ pl:
       title: Webhooki
       webhook: Webhook
   admin_mailer:
+    auto_close_registrations:
+      body: Z powodu braku niedawnych działań moderacyjnych, rejestracje na %{instance} wymagają ręcznej weryfikacji (by uniknąć dystrybucji spamu itp.). W dowolnym momencie możesz przywrócić politykę otwartej rejestracji.
+      subject: "%{instance} zostało automatycznie przełączone na zatwierdzanie rejestracji"
     new_appeal:
       actions:
         delete_statuses: aby usunąć ich wpisy
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 54a4da3ea2d9ae..89668a71335eb4 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -1002,6 +1002,9 @@ sl:
       title: Spletne zanke
       webhook: Spletna zanka
   admin_mailer:
+    auto_close_registrations:
+      body: Zaradi pomanjkanja moderiranja v zadnjem času, se je za strežnik %{instance} samodejno vklopilo ročno preverjanje in potrjevanje prijav. S tem se prepreči morebitno zlorabo strežnika %{instance}. Prijave lahko kadarkoli spet spremenite nazaj v odprte.
+      subject: Za strežnik %{instance} se je samodejno vklopilo ročno potrjevanje prijav
     new_appeal:
       actions:
         delete_statuses: brisanje njihovih objav,
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index 460fd82dc08506..da82dda9cbf504 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -962,6 +962,9 @@ sq:
       title: Webhook-ë
       webhook: Webhook
   admin_mailer:
+    auto_close_registrations:
+      body: Për shkak mungese veprimtarie moderatori së fundi, regjistrimet te %{instance} janë kaluar automatikisht të kërkojnë shqyrtim dorazi, për të penguar përdorimin e %{instance} si një platformë për aktorë të këqij. Mund të kaloni kurdo te regjistrime të hapura.
+      subject: Regjistrimet te %{instance} janë kaluar automatikisht të kërkojnë miratim
     new_appeal:
       actions:
         delete_statuses: fshirje e postimeve të tij
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 237305c0e94be9..5d11bfcfd439f9 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -1002,6 +1002,9 @@ uk:
       title: Вебхуки
       webhook: Вебхук
   admin_mailer:
+    auto_close_registrations:
+      body: Через нестачу нещодавньої активності модератора реєстрація на %{instance} автоматично переключена на вимагу ручного відгуку, для запобігання використанню %{instance} як платформи для потенційних поганих гравців. Ви можете будь-коли переключитися на відкриті реєстрації.
+      subject: Реєстрації для %{instance} автоматично перейшли на такі, що вимагають схвалення
     new_appeal:
       actions:
         delete_statuses: щоб видалити їхні дописи
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 045a000e38bd41..99434c35442176 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -948,6 +948,9 @@ vi:
       title: Webhook
       webhook: Webhook
   admin_mailer:
+    auto_close_registrations:
+      body: Do gần đây thiếu kiểm duyệt viên nên việc đăng ký trên %{instance} sẽ tự động chuyển thành duyệt thủ công, để tránh %{instance} bị sử dụng làm nền tảng cho những kẻ xấu. Bạn có thể chuyển nó trở lại trạng thái đăng ký mở bất kỳ lúc nào.
+      subject: Đăng ký mới %{instance} đã được tự động chuyển sang duyệt thủ công
     new_appeal:
       actions:
         delete_statuses: xóa tút của họ
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 8ccf4c08b3e57e..554e8d873c5028 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -948,6 +948,9 @@ zh-CN:
       title: Webhooks
       webhook: Webhook
   admin_mailer:
+    auto_close_registrations:
+      body: 由于近期缺乏管理员活动， %{instance} 上的注册已自动切换为需要手动审核，以防止 %{instance} 被潜在的不良行为者用作平台。您可以随时将其切换回开放注册。
+      subject: "%{instance} 的注册已自动切换为需要批准"
     new_appeal:
       actions:
         delete_statuses: 删除其嘟文
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 9e8044ebfcf4e3..4276782cccfc40 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -950,6 +950,9 @@ zh-TW:
       title: Webhooks
       webhook: Webhook
   admin_mailer:
+    auto_close_registrations:
+      body: 由於近日缺少管理員活動，%{instance} 上之註冊已自動切換為需要人工審核，以防止 %{instance} 被作為潛在不良行為者之跳板。您隨時能將其切換回開放註冊。
+      subject: "%{instance} 之註冊已自動切換為需要審核"
     new_appeal:
       actions:
         delete_statuses: 要刪除他們的嘟文

From 96d5c44db2896a4bab028c5d17fa4261fdfea87e Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 22 Feb 2024 11:37:52 +0100
Subject: [PATCH 0187/2191] Update dependency rails to v7.1.3.2 (#29342)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 110 +++++++++++++++++++++++++--------------------------
 1 file changed, 55 insertions(+), 55 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 8dd1a7ed08d5c3..b88a06256612f9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -10,35 +10,35 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.1.3)
-      actionpack (= 7.1.3)
-      activesupport (= 7.1.3)
+    actioncable (7.1.3.2)
+      actionpack (= 7.1.3.2)
+      activesupport (= 7.1.3.2)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    actionmailbox (7.1.3)
-      actionpack (= 7.1.3)
-      activejob (= 7.1.3)
-      activerecord (= 7.1.3)
-      activestorage (= 7.1.3)
-      activesupport (= 7.1.3)
+    actionmailbox (7.1.3.2)
+      actionpack (= 7.1.3.2)
+      activejob (= 7.1.3.2)
+      activerecord (= 7.1.3.2)
+      activestorage (= 7.1.3.2)
+      activesupport (= 7.1.3.2)
       mail (>= 2.7.1)
       net-imap
       net-pop
       net-smtp
-    actionmailer (7.1.3)
-      actionpack (= 7.1.3)
-      actionview (= 7.1.3)
-      activejob (= 7.1.3)
-      activesupport (= 7.1.3)
+    actionmailer (7.1.3.2)
+      actionpack (= 7.1.3.2)
+      actionview (= 7.1.3.2)
+      activejob (= 7.1.3.2)
+      activesupport (= 7.1.3.2)
       mail (~> 2.5, >= 2.5.4)
       net-imap
       net-pop
       net-smtp
       rails-dom-testing (~> 2.2)
-    actionpack (7.1.3)
-      actionview (= 7.1.3)
-      activesupport (= 7.1.3)
+    actionpack (7.1.3.2)
+      actionview (= 7.1.3.2)
+      activesupport (= 7.1.3.2)
       nokogiri (>= 1.8.5)
       racc
       rack (>= 2.2.4)
@@ -46,15 +46,15 @@ GEM
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    actiontext (7.1.3)
-      actionpack (= 7.1.3)
-      activerecord (= 7.1.3)
-      activestorage (= 7.1.3)
-      activesupport (= 7.1.3)
+    actiontext (7.1.3.2)
+      actionpack (= 7.1.3.2)
+      activerecord (= 7.1.3.2)
+      activestorage (= 7.1.3.2)
+      activesupport (= 7.1.3.2)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.1.3)
-      activesupport (= 7.1.3)
+    actionview (7.1.3.2)
+      activesupport (= 7.1.3.2)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
@@ -64,22 +64,22 @@ GEM
       activemodel (>= 4.1)
       case_transform (>= 0.2)
       jsonapi-renderer (>= 0.1.1.beta1, < 0.3)
-    activejob (7.1.3)
-      activesupport (= 7.1.3)
+    activejob (7.1.3.2)
+      activesupport (= 7.1.3.2)
       globalid (>= 0.3.6)
-    activemodel (7.1.3)
-      activesupport (= 7.1.3)
-    activerecord (7.1.3)
-      activemodel (= 7.1.3)
-      activesupport (= 7.1.3)
+    activemodel (7.1.3.2)
+      activesupport (= 7.1.3.2)
+    activerecord (7.1.3.2)
+      activemodel (= 7.1.3.2)
+      activesupport (= 7.1.3.2)
       timeout (>= 0.4.0)
-    activestorage (7.1.3)
-      actionpack (= 7.1.3)
-      activejob (= 7.1.3)
-      activerecord (= 7.1.3)
-      activesupport (= 7.1.3)
+    activestorage (7.1.3.2)
+      actionpack (= 7.1.3.2)
+      activejob (= 7.1.3.2)
+      activerecord (= 7.1.3.2)
+      activesupport (= 7.1.3.2)
       marcel (~> 1.0)
-    activesupport (7.1.3)
+    activesupport (7.1.3.2)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -444,7 +444,7 @@ GEM
       uri
     net-http-persistent (4.0.2)
       connection_pool (~> 2.2)
-    net-imap (0.4.9.1)
+    net-imap (0.4.10)
       date
       net-protocol
     net-ldap (0.19.0)
@@ -532,7 +532,7 @@ GEM
       activesupport (>= 3.0.0)
     raabro (1.4.0)
     racc (1.7.3)
-    rack (2.2.8)
+    rack (2.2.8.1)
     rack-attack (6.7.0)
       rack (>= 1.0, < 4)
     rack-cors (2.0.1)
@@ -554,20 +554,20 @@ GEM
     rackup (1.0.0)
       rack (< 3)
       webrick
-    rails (7.1.3)
-      actioncable (= 7.1.3)
-      actionmailbox (= 7.1.3)
-      actionmailer (= 7.1.3)
-      actionpack (= 7.1.3)
-      actiontext (= 7.1.3)
-      actionview (= 7.1.3)
-      activejob (= 7.1.3)
-      activemodel (= 7.1.3)
-      activerecord (= 7.1.3)
-      activestorage (= 7.1.3)
-      activesupport (= 7.1.3)
+    rails (7.1.3.2)
+      actioncable (= 7.1.3.2)
+      actionmailbox (= 7.1.3.2)
+      actionmailer (= 7.1.3.2)
+      actionpack (= 7.1.3.2)
+      actiontext (= 7.1.3.2)
+      actionview (= 7.1.3.2)
+      activejob (= 7.1.3.2)
+      activemodel (= 7.1.3.2)
+      activerecord (= 7.1.3.2)
+      activestorage (= 7.1.3.2)
+      activesupport (= 7.1.3.2)
       bundler (>= 1.15.0)
-      railties (= 7.1.3)
+      railties (= 7.1.3.2)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
       actionview (>= 5.0.1.rc1)
@@ -582,9 +582,9 @@ GEM
     rails-i18n (7.0.8)
       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 8)
-    railties (7.1.3)
-      actionpack (= 7.1.3)
-      activesupport (= 7.1.3)
+    railties (7.1.3.2)
+      actionpack (= 7.1.3.2)
+      activesupport (= 7.1.3.2)
       irb
       rackup (>= 1.0.0)
       rake (>= 12.2)

From fa1c3a0915b0553bf012fe2544375e6d58935d05 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 22 Feb 2024 11:37:54 +0100
Subject: [PATCH 0188/2191] Update dependency rack to v2.2.8.1 (#29341)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

From ab2ef63a035767c587c46aa5820f7291ac033641 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 22 Feb 2024 05:39:18 -0500
Subject: [PATCH 0189/2191] Add basic coverage for `VoteService` class (#29334)

---
 spec/services/vote_service_spec.rb | 40 ++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 spec/services/vote_service_spec.rb

diff --git a/spec/services/vote_service_spec.rb b/spec/services/vote_service_spec.rb
new file mode 100644
index 00000000000000..88207b001c3c90
--- /dev/null
+++ b/spec/services/vote_service_spec.rb
@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe VoteService do
+  describe '#call' do
+    subject { described_class.new.call(voter, poll, [0]) }
+
+    context 'with a poll and poll options' do
+      let(:poll) { Fabricate(:poll, account: account, options: %w(Fun UnFun)) }
+      let(:fun_vote) { Fabricate(:poll_vote, poll: poll) }
+      let(:not_fun_vote) { Fabricate(:poll_vote, poll: poll) }
+      let(:voter) { Fabricate(:account, domain: nil) }
+
+      context 'when the poll was created by a local account' do
+        let(:account) { Fabricate(:account, domain: nil) }
+
+        it 'stores the votes and distributes the poll' do
+          expect { subject }
+            .to change(PollVote, :count).by(1)
+
+          expect(ActivityPub::DistributePollUpdateWorker)
+            .to have_enqueued_sidekiq_job(poll.status.id)
+        end
+      end
+
+      context 'when the poll was created by a remote account' do
+        let(:account) { Fabricate(:account, domain: 'host.example') }
+
+        it 'stores the votes and processes delivery' do
+          expect { subject }
+            .to change(PollVote, :count).by(1)
+
+          expect(ActivityPub::DeliveryWorker)
+            .to have_enqueued_sidekiq_job(anything, voter.id, poll.account.inbox_url)
+        end
+      end
+    end
+  end
+end

From d1602c017d76c236775dafa848fbfaaa72d9f51b Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 22 Feb 2024 05:40:07 -0500
Subject: [PATCH 0190/2191] Add basic coverage for `ApproveAppealService` class
 (#29333)

---
 spec/services/approve_appeal_service_spec.rb | 30 ++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 spec/services/approve_appeal_service_spec.rb

diff --git a/spec/services/approve_appeal_service_spec.rb b/spec/services/approve_appeal_service_spec.rb
new file mode 100644
index 00000000000000..5707c5d7f4c5ea
--- /dev/null
+++ b/spec/services/approve_appeal_service_spec.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe ApproveAppealService do
+  describe '#call' do
+    context 'with an existing appeal' do
+      let(:appeal) { Fabricate(:appeal) }
+      let(:account) { Fabricate(:account) }
+
+      it 'processes the appeal approval' do
+        expect { subject.call(appeal, account) }
+          .to mark_overruled
+          .and record_approver
+      end
+
+      def mark_overruled
+        change(appeal.strike, :overruled_at)
+          .from(nil)
+          .to(be > 1.minute.ago)
+      end
+
+      def record_approver
+        change(appeal, :approved_by_account)
+          .from(nil)
+          .to(account)
+      end
+    end
+  end
+end

From a69fe534e3f0052e6b1f74a0a5ee16497761397c Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 22 Feb 2024 05:46:20 -0500
Subject: [PATCH 0191/2191] Add basic coverage for `WebhookService` class
 (#29331)

---
 spec/services/webhook_service_spec.rb | 30 +++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 spec/services/webhook_service_spec.rb

diff --git a/spec/services/webhook_service_spec.rb b/spec/services/webhook_service_spec.rb
new file mode 100644
index 00000000000000..22a60db9f59efa
--- /dev/null
+++ b/spec/services/webhook_service_spec.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe WebhookService do
+  describe '#call' do
+    context 'with a relevant event webhook' do
+      let!(:report) { Fabricate(:report) }
+      let!(:webhook) { Fabricate(:webhook, events: ['report.created']) }
+
+      it 'finds and delivers webhook payloads' do
+        expect { subject.call('report.created', report) }
+          .to enqueue_sidekiq_job(Webhooks::DeliveryWorker)
+          .with(
+            webhook.id,
+            anything
+          )
+      end
+    end
+
+    context 'without any relevant event webhooks' do
+      let!(:report) { Fabricate(:report) }
+
+      it 'does not deliver webhook payloads' do
+        expect { subject.call('report.created', report) }
+          .to_not enqueue_sidekiq_job(Webhooks::DeliveryWorker)
+      end
+    end
+  end
+end

From f70905f127ab006a171e1e02e0e182640af53c14 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 22 Feb 2024 05:48:09 -0500
Subject: [PATCH 0192/2191] Add basic coverage for `UnmuteService` class
 (#29330)

---
 spec/services/unmute_service_spec.rb | 46 ++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 spec/services/unmute_service_spec.rb

diff --git a/spec/services/unmute_service_spec.rb b/spec/services/unmute_service_spec.rb
new file mode 100644
index 00000000000000..00135b5ac09106
--- /dev/null
+++ b/spec/services/unmute_service_spec.rb
@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe UnmuteService do
+  describe '#call' do
+    let!(:account) { Fabricate(:account) }
+    let!(:target_account) { Fabricate(:account) }
+
+    context 'when account is muting target account' do
+      before { Fabricate :mute, account: account, target_account: target_account }
+
+      context 'when account follows target_account' do
+        before { Fabricate :follow, account: account, target_account: target_account }
+
+        it 'removes the account mute and sets up a merge' do
+          expect { subject.call(account, target_account) }
+            .to remove_account_mute
+          expect(MergeWorker).to have_enqueued_sidekiq_job(target_account.id, account.id)
+        end
+      end
+
+      context 'when account does not follow target_account' do
+        it 'removes the account mute and does not create a merge' do
+          expect { subject.call(account, target_account) }
+            .to remove_account_mute
+          expect(MergeWorker).to_not have_enqueued_sidekiq_job
+        end
+      end
+
+      def remove_account_mute
+        change { account.reload.muting?(target_account) }
+          .from(true)
+          .to(false)
+      end
+    end
+
+    context 'when account is not muting target account' do
+      it 'does nothing and returns' do
+        expect { subject.call(account, target_account) }
+          .to_not(change { account.reload.muting?(target_account) })
+        expect(MergeWorker).to_not have_enqueued_sidekiq_job
+      end
+    end
+  end
+end

From 6342ddd698934e310db23c4ff5901aaee3c698e3 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 22 Feb 2024 05:48:42 -0500
Subject: [PATCH 0193/2191] Add basic coverage for `UnfavouriteService` class
 (#29329)

---
 spec/services/unfavourite_service_spec.rb | 36 +++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 spec/services/unfavourite_service_spec.rb

diff --git a/spec/services/unfavourite_service_spec.rb b/spec/services/unfavourite_service_spec.rb
new file mode 100644
index 00000000000000..a714cc0675cece
--- /dev/null
+++ b/spec/services/unfavourite_service_spec.rb
@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe UnfavouriteService do
+  describe '#call' do
+    context 'with a favourited status' do
+      let(:status) { Fabricate(:status, account: account) }
+      let!(:favourite) { Fabricate(:favourite, status: status) }
+
+      context 'when the status account is local' do
+        let(:account) { Fabricate(:account, domain: nil) }
+
+        it 'destroys the favourite' do
+          subject.call(favourite.account, status)
+
+          expect { favourite.reload }
+            .to raise_error(ActiveRecord::RecordNotFound)
+        end
+      end
+
+      context 'when the status account is a remote activitypub account' do
+        let(:account) { Fabricate(:account, domain: 'host.example', protocol: :activitypub) }
+
+        it 'destroys the favourite and sends a notification' do
+          subject.call(favourite.account, status)
+
+          expect { favourite.reload }
+            .to raise_error(ActiveRecord::RecordNotFound)
+          expect(ActivityPub::DeliveryWorker)
+            .to have_enqueued_sidekiq_job(anything, favourite.account.id, status.account.inbox_url)
+        end
+      end
+    end
+  end
+end

From 7c7dfe7de33c27b65805960061bd5d0a42733722 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 22 Feb 2024 05:51:04 -0500
Subject: [PATCH 0194/2191] Add basic coverage for `RemoveFeaturedTagService`
 class (#29328)

---
 .../remove_featured_tag_service_spec.rb       | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 spec/services/remove_featured_tag_service_spec.rb

diff --git a/spec/services/remove_featured_tag_service_spec.rb b/spec/services/remove_featured_tag_service_spec.rb
new file mode 100644
index 00000000000000..6cf5388c7feb89
--- /dev/null
+++ b/spec/services/remove_featured_tag_service_spec.rb
@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe RemoveFeaturedTagService do
+  describe '#call' do
+    context 'with a featured tag' do
+      let(:featured_tag) { Fabricate(:featured_tag) }
+
+      context 'when called by a local account' do
+        let(:account) { Fabricate(:account, domain: nil) }
+
+        it 'destroys the featured tag and sends a distribution' do
+          subject.call(account, featured_tag)
+
+          expect { featured_tag.reload }
+            .to raise_error(ActiveRecord::RecordNotFound)
+          expect(ActivityPub::AccountRawDistributionWorker)
+            .to have_enqueued_sidekiq_job(anything, account.id)
+        end
+      end
+
+      context 'when called by a non local account' do
+        let(:account) { Fabricate(:account, domain: 'host.example') }
+
+        it 'destroys the featured tag and does not send a distribution' do
+          subject.call(account, featured_tag)
+
+          expect { featured_tag.reload }
+            .to raise_error(ActiveRecord::RecordNotFound)
+          expect(ActivityPub::AccountRawDistributionWorker)
+            .to_not have_enqueued_sidekiq_job
+        end
+      end
+    end
+  end
+end

From e9b0f0c3149f830dcf29968692933f2361f80ebb Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 22 Feb 2024 05:53:38 -0500
Subject: [PATCH 0195/2191] Add basic coverage for
 `RemoveDomainsFromFollowersService` class (#29327)

---
 ...ove_domains_from_followers_service_spec.rb | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 spec/services/remove_domains_from_followers_service_spec.rb

diff --git a/spec/services/remove_domains_from_followers_service_spec.rb b/spec/services/remove_domains_from_followers_service_spec.rb
new file mode 100644
index 00000000000000..9e9d6cef2db793
--- /dev/null
+++ b/spec/services/remove_domains_from_followers_service_spec.rb
@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe RemoveDomainsFromFollowersService do
+  describe '#call' do
+    context 'with account followers' do
+      let(:account) { Fabricate(:account, domain: nil) }
+      let(:good_domain_account) { Fabricate(:account, domain: 'good.example', protocol: :activitypub) }
+      let(:bad_domain_account) { Fabricate(:account, domain: 'bad.example', protocol: :activitypub) }
+
+      before do
+        Fabricate :follow, target_account: account, account: good_domain_account
+        Fabricate :follow, target_account: account, account: bad_domain_account
+      end
+
+      it 'removes followers from supplied domains and sends a notification' do
+        subject.call(account, ['bad.example'])
+
+        expect(account.followers)
+          .to include(good_domain_account)
+          .and not_include(bad_domain_account)
+        expect(ActivityPub::DeliveryWorker)
+          .to have_enqueued_sidekiq_job(anything, account.id, bad_domain_account.inbox_url)
+      end
+    end
+  end
+end

From ebe208608728cbeab0cb36f943c8bbc0b612f0ab Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 22 Feb 2024 12:26:48 +0100
Subject: [PATCH 0196/2191] Update dependency haml_lint to v0.57.0 (#29181)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index b88a06256612f9..07e6afb1c121ee 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -309,7 +309,7 @@ GEM
       activesupport (>= 5.1)
       haml (>= 4.0.6)
       railties (>= 5.1)
-    haml_lint (0.56.0)
+    haml_lint (0.57.0)
       haml (>= 5.0)
       parallel (~> 1.10)
       rainbow

From 491dd9764244c8adf37861f00d916c96bdbfdaf8 Mon Sep 17 00:00:00 2001
From: Emelia Smith <ThisIsMissEm@users.noreply.github.com>
Date: Thu, 22 Feb 2024 14:20:20 +0100
Subject: [PATCH 0197/2191] Streaming: refactor to custom Error classes
 (#28632)

Co-authored-by: Renaud Chaput <renchap@gmail.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
---
 streaming/errors.js | 51 ++++++++++++++++++++++++
 streaming/index.js  | 94 +++++++++++++++++++++++++--------------------
 2 files changed, 103 insertions(+), 42 deletions(-)
 create mode 100644 streaming/errors.js

diff --git a/streaming/errors.js b/streaming/errors.js
new file mode 100644
index 00000000000000..9a641180ba4624
--- /dev/null
+++ b/streaming/errors.js
@@ -0,0 +1,51 @@
+// @ts-check
+
+/**
+ * Typed as a string because otherwise it's a const string, which means we can't
+ * override it in let statements.
+ * @type {string}
+ */
+const UNEXPECTED_ERROR_MESSAGE = 'An unexpected error occurred';
+exports.UNKNOWN_ERROR_MESSAGE = UNEXPECTED_ERROR_MESSAGE;
+
+/**
+ * Extracts the status and message properties from the error object, if
+ * available for public use. The `unknown` is for catch statements
+ * @param {Error | AuthenticationError | RequestError | unknown} err
+ */
+exports.extractStatusAndMessage = function(err) {
+  let statusCode = 500;
+  let errorMessage = UNEXPECTED_ERROR_MESSAGE;
+  if (err instanceof AuthenticationError || err instanceof RequestError) {
+    statusCode = err.status;
+    errorMessage = err.message;
+  }
+
+  return { statusCode, errorMessage };
+};
+
+class RequestError extends Error {
+  /**
+   * @param {string} message
+   */
+  constructor(message) {
+    super(message);
+    this.name = "RequestError";
+    this.status = 400;
+  }
+}
+
+exports.RequestError = RequestError;
+
+class AuthenticationError extends Error {
+  /**
+   * @param {string} message
+   */
+  constructor(message) {
+    super(message);
+    this.name = "AuthenticationError";
+    this.status = 401;
+  }
+}
+
+exports.AuthenticationError = AuthenticationError;
diff --git a/streaming/index.js b/streaming/index.js
index 6945a9ae7da183..1c312ebd70b21b 100644
--- a/streaming/index.js
+++ b/streaming/index.js
@@ -14,6 +14,8 @@ const pg = require('pg');
 const dbUrlToConfig = require('pg-connection-string').parse;
 const WebSocket = require('ws');
 
+const errors = require('./errors');
+const { AuthenticationError, RequestError } = require('./errors');
 const { logger, httpLogger, initializeLogLevel, attachWebsocketHttpLogger, createWebsocketLogger } = require('./logging');
 const { setupMetrics } = require('./metrics');
 const { isTruthy, normalizeHashtag, firstParam } = require("./utils");
@@ -324,7 +326,7 @@ const startServer = async () => {
       // Unfortunately for using the on('upgrade') setup, we need to manually
       // write a HTTP Response to the Socket to close the connection upgrade
       // attempt, so the following code is to handle all of that.
-      const statusCode = err.status ?? 401;
+      const {statusCode, errorMessage } = errors.extractStatusAndMessage(err);
 
       /** @type {Record<string, string | number | import('pino-http').ReqId>} */
       const headers = {
@@ -332,7 +334,7 @@ const startServer = async () => {
         'Content-Type': 'text/plain',
         'Content-Length': 0,
         'X-Request-Id': request.id,
-        'X-Error-Message': err.status ? err.toString() : 'An unexpected error occurred'
+        'X-Error-Message': errorMessage
       };
 
       // Ensure the socket is closed once we've finished writing to it:
@@ -350,7 +352,7 @@ const startServer = async () => {
           statusCode,
           headers
         }
-      }, err.toString());
+      }, errorMessage);
 
       return;
     }
@@ -535,11 +537,7 @@ const startServer = async () => {
         }
 
         if (result.rows.length === 0) {
-          err = new Error('Invalid access token');
-          // @ts-ignore
-          err.status = 401;
-
-          reject(err);
+          reject(new AuthenticationError('Invalid access token'));
           return;
         }
 
@@ -570,11 +568,7 @@ const startServer = async () => {
     const accessToken   = location.query.access_token || req.headers['sec-websocket-protocol'];
 
     if (!authorization && !accessToken) {
-      const err = new Error('Missing access token');
-      // @ts-ignore
-      err.status = 401;
-
-      reject(err);
+      reject(new AuthenticationError('Missing access token'));
       return;
     }
 
@@ -651,11 +645,7 @@ const startServer = async () => {
       return;
     }
 
-    const err = new Error('Access token does not cover required scopes');
-    // @ts-ignore
-    err.status = 401;
-
-    reject(err);
+    reject(new AuthenticationError('Access token does not have the required scopes'));
   });
 
   /**
@@ -731,11 +721,7 @@ const startServer = async () => {
     // If no channelName can be found for the request, then we should terminate
     // the connection, as there's nothing to stream back
     if (!channelName) {
-      const err = new Error('Unknown channel requested');
-      // @ts-ignore
-      err.status = 400;
-
-      next(err);
+      next(new RequestError('Unknown channel requested'));
       return;
     }
 
@@ -762,10 +748,7 @@ const startServer = async () => {
       return;
     }
 
-    const hasStatusCode = Object.hasOwnProperty.call(err, 'status');
-    // @ts-ignore
-    const statusCode = hasStatusCode ? err.status : 500;
-    const errorMessage = hasStatusCode ? err.toString() : 'An unexpected error occurred';
+    const {statusCode, errorMessage } = errors.extractStatusAndMessage(err);
 
     res.writeHead(statusCode, { 'Content-Type': 'application/json' });
     res.end(JSON.stringify({ error: errorMessage }));
@@ -1140,7 +1123,7 @@ const startServer = async () => {
   };
 
   /**
-   * @param {any} res
+   * @param {http.ServerResponse} res
    */
   const httpNotFound = res => {
     res.writeHead(404, { 'Content-Type': 'application/json' });
@@ -1155,16 +1138,29 @@ const startServer = async () => {
   api.use(errorMiddleware);
 
   api.get('/api/v1/streaming/*', (req, res) => {
-    // @ts-ignore
-    channelNameToIds(req, channelNameFromPath(req), req.query).then(({ channelIds, options }) => {
+    const channelName = channelNameFromPath(req);
+
+    // FIXME: In theory we'd never actually reach here due to
+    // authenticationMiddleware catching this case, however, we need to refactor
+    // how those middlewares work, so I'm adding the extra check in here.
+    if (!channelName) {
+      httpNotFound(res);
+      return;
+    }
+
+    channelNameToIds(req, channelName, req.query).then(({ channelIds, options }) => {
       const onSend = streamToHttp(req, res);
       const onEnd = streamHttpEnd(req, subscriptionHeartbeat(channelIds));
 
       // @ts-ignore
       streamFrom(channelIds, req, req.log, onSend, onEnd, 'eventsource', options.needsFiltering);
     }).catch(err => {
-      res.log.info({ err }, 'Subscription error:', err.toString());
-      httpNotFound(res);
+      const {statusCode, errorMessage } = errors.extractStatusAndMessage(err);
+
+      res.log.info({ err }, 'Eventsource subscription error');
+
+      res.writeHead(statusCode, { 'Content-Type': 'application/json' });
+      res.end(JSON.stringify({ error: errorMessage }));
     });
   });
 
@@ -1265,8 +1261,8 @@ const startServer = async () => {
 
       break;
     case 'hashtag':
-      if (!params.tag || params.tag.length === 0) {
-        reject('No tag for stream provided');
+      if (!params.tag) {
+        reject(new RequestError('Missing tag name parameter'));
       } else {
         resolve({
           channelIds: [`timeline:hashtag:${normalizeHashtag(params.tag)}`],
@@ -1276,8 +1272,8 @@ const startServer = async () => {
 
       break;
     case 'hashtag:local':
-      if (!params.tag || params.tag.length === 0) {
-        reject('No tag for stream provided');
+      if (!params.tag) {
+        reject(new RequestError('Missing tag name parameter'));
       } else {
         resolve({
           channelIds: [`timeline:hashtag:${normalizeHashtag(params.tag)}:local`],
@@ -1287,19 +1283,23 @@ const startServer = async () => {
 
       break;
     case 'list':
-      // @ts-ignore
+      if (!params.list) {
+        reject(new RequestError('Missing list name parameter'));
+        return;
+      }
+
       authorizeListAccess(params.list, req).then(() => {
         resolve({
           channelIds: [`timeline:list:${params.list}`],
           options: { needsFiltering: false },
         });
       }).catch(() => {
-        reject('Not authorized to stream this list');
+        reject(new AuthenticationError('Not authorized to stream this list'));
       });
 
       break;
     default:
-      reject('Unknown stream type');
+      reject(new RequestError('Unknown stream type'));
     }
   });
 
@@ -1353,8 +1353,17 @@ const startServer = async () => {
         stopHeartbeat,
       };
     }).catch(err => {
-      logger.error({ err }, 'Subscription error');
-      websocket.send(JSON.stringify({ error: err.toString() }));
+      const {statusCode, errorMessage } = errors.extractStatusAndMessage(err);
+
+      logger.error({ err }, 'Websocket subscription error');
+
+      // If we have a socket that is alive and open still, send the error back to the client:
+      if (websocket.isAlive && websocket.readyState === websocket.OPEN) {
+        websocket.send(JSON.stringify({
+          error: errorMessage,
+          status: statusCode
+        }));
+      }
     });
   };
 
@@ -1393,10 +1402,11 @@ const startServer = async () => {
     channelNameToIds(request, channelName, params).then(({ channelIds }) => {
       removeSubscription(session, channelIds);
     }).catch(err => {
-      logger.error({err}, 'Unsubscribe error');
+      logger.error({err}, 'Websocket unsubscribe error');
 
       // If we have a socket that is alive and open still, send the error back to the client:
       if (websocket.isAlive && websocket.readyState === websocket.OPEN) {
+        // TODO: Use a better error response here
         websocket.send(JSON.stringify({ error: "Error unsubscribing from channel" }));
       }
     });

From b71904816a30d29ef62bb35582fc47162a50d539 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 22 Feb 2024 14:28:19 +0100
Subject: [PATCH 0198/2191] Change registrations to be disabled by default for
 new servers (#29280)

---
 app/javascript/packs/admin.jsx                        | 4 ++++
 app/views/admin/settings/registrations/show.html.haml | 4 +++-
 config/locales/en.yml                                 | 2 ++
 config/settings.yml                                   | 2 +-
 spec/spec_helper.rb                                   | 6 ++++++
 spec/support/streaming_server_manager.rb              | 7 +++++++
 6 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/app/javascript/packs/admin.jsx b/app/javascript/packs/admin.jsx
index d3bfc4ea90fbd5..817a5d46bc9a3b 100644
--- a/app/javascript/packs/admin.jsx
+++ b/app/javascript/packs/admin.jsx
@@ -145,6 +145,10 @@ Rails.delegate(document, '#form_admin_settings_enable_bootstrap_timeline_account
 const onChangeRegistrationMode = (target) => {
   const enabled = target.value === 'approved';
 
+  [].forEach.call(document.querySelectorAll('.form_admin_settings_registrations_mode .warning-hint'), (warning_hint) => {
+    warning_hint.style.display = target.value === 'open' ? 'inline' : 'none';
+  });
+
   [].forEach.call(document.querySelectorAll('#form_admin_settings_require_invite_text'), (input) => {
     input.disabled = !enabled;
     if (enabled) {
diff --git a/app/views/admin/settings/registrations/show.html.haml b/app/views/admin/settings/registrations/show.html.haml
index 168f1097570772..4ece27bf4e708f 100644
--- a/app/views/admin/settings/registrations/show.html.haml
+++ b/app/views/admin/settings/registrations/show.html.haml
@@ -10,9 +10,11 @@
 
   %p.lead= t('admin.settings.registrations.preamble')
 
+  .flash-message= t('admin.settings.registrations.moderation_recommandation')
+
   .fields-row
     .fields-row__column.fields-row__column-6.fields-group
-      = f.input :registrations_mode, collection: %w(open approved none), wrapper: :with_label, include_blank: false, label_method: ->(mode) { I18n.t("admin.settings.registrations_mode.modes.#{mode}") }
+      = f.input :registrations_mode, collection: %w(open approved none), wrapper: :with_label, include_blank: false, label_method: ->(mode) { I18n.t("admin.settings.registrations_mode.modes.#{mode}") }, warning_hint: I18n.t('admin.settings.registrations_mode.warning_hint')
 
     .fields-row__column.fields-row__column-6.fields-group
       = f.input :require_invite_text, as: :boolean, wrapper: :with_label, disabled: !approved_registrations?
diff --git a/config/locales/en.yml b/config/locales/en.yml
index a7a83391d46324..efd603740a76cf 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -767,6 +767,7 @@ en:
         disabled: To no one
         users: To logged-in local users
       registrations:
+        moderation_recommandation: Please make sure you have an adequate and reactive moderation team before you open registrations to everyone!
         preamble: Control who can create an account on your server.
         title: Registrations
       registrations_mode:
@@ -774,6 +775,7 @@ en:
           approved: Approval required for sign up
           none: Nobody can sign up
           open: Anyone can sign up
+        warning_hint: We recommend using “Approval required for sign up” unless you are confident your moderation team can handle spam and malicious registrations in a timely fashion.
       security:
         authorized_fetch: Require authentication from federated servers
         authorized_fetch_hint: Requiring authentication from federated servers enables stricter enforcement of both user-level and server-level blocks. However, this comes at the cost of a performance penalty, reduces the reach of your replies, and may introduce compatibility issues with some federated services. In addition, this will not prevent dedicated actors from fetching your public posts and accounts.
diff --git a/config/settings.yml b/config/settings.yml
index 67297c26ceafcf..208c8e3760c2e5 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -9,7 +9,7 @@ defaults: &defaults
   site_terms: ''
   site_contact_username: ''
   site_contact_email: ''
-  registrations_mode: 'open'
+  registrations_mode: 'none'
   profile_directory: true
   closed_registrations_message: ''
   timeline_preview: true
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index dc60976d05f080..8a01792a19910b 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -23,6 +23,12 @@
   config.before :suite do
     Rails.application.load_seed
     Chewy.strategy(:bypass)
+
+    # NOTE: we switched registrations mode to closed by default, but the specs
+    # very heavily rely on having it enabled by default, as it relies on users
+    # being approved by default except in select cases where explicitly testing
+    # other registration modes
+    Setting.registrations_mode = 'open'
   end
 
   config.after :suite do
diff --git a/spec/support/streaming_server_manager.rb b/spec/support/streaming_server_manager.rb
index 39657586f24fa9..33819182990940 100644
--- a/spec/support/streaming_server_manager.rb
+++ b/spec/support/streaming_server_manager.rb
@@ -102,6 +102,13 @@ def stop
     self.use_transactional_tests = false
 
     DatabaseCleaner.cleaning do
+      # NOTE: we switched registrations mode to closed by default, but the specs
+      # very heavily rely on having it enabled by default, as it relies on users
+      # being approved by default except in select cases where explicitly testing
+      # other registration modes
+      # Also needs to be set per-example here because of the database cleaner.
+      Setting.registrations_mode = 'open'
+
       example.run
     end
 

From a9496882fc1257c3169fc2fdcb8afd1549044da7 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 22 Feb 2024 15:52:14 +0100
Subject: [PATCH 0199/2191] Fix auto-close email being sent to users with
 devops permissions instead of settings permissions (#29355)

---
 app/workers/scheduler/auto_close_registrations_scheduler.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/workers/scheduler/auto_close_registrations_scheduler.rb b/app/workers/scheduler/auto_close_registrations_scheduler.rb
index 17516dd23fe840..68745029150c49 100644
--- a/app/workers/scheduler/auto_close_registrations_scheduler.rb
+++ b/app/workers/scheduler/auto_close_registrations_scheduler.rb
@@ -26,7 +26,7 @@ def active_moderators?
   def switch_to_approval_mode!
     Setting.registrations_mode = 'approved'
 
-    User.those_who_can(:view_devops).includes(:account).find_each do |user|
+    User.those_who_can(:manage_settings).includes(:account).find_each do |user|
       AdminMailer.with(recipient: user.account).auto_close_registrations.deliver_later
     end
   end

From 5152dd869e4884117732f7ff3c41c4fbc109b1ee Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 22 Feb 2024 18:31:50 +0100
Subject: [PATCH 0200/2191] Fix link verifications when page size exceeds 1MB
 (#29358)

---
 app/services/verify_link_service.rb       |  2 +-
 spec/services/verify_link_service_spec.rb | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/services/verify_link_service.rb b/app/services/verify_link_service.rb
index 707aeb4e08b47a..b317fc31a859da 100644
--- a/app/services/verify_link_service.rb
+++ b/app/services/verify_link_service.rb
@@ -19,7 +19,7 @@ def call(field)
 
   def perform_request!
     @body = Request.new(:get, @url).add_headers('Accept' => 'text/html').perform do |res|
-      res.code == 200 ? res.body_with_limit : nil
+      res.code == 200 ? res.truncated_body : nil
     end
   end
 
diff --git a/spec/services/verify_link_service_spec.rb b/spec/services/verify_link_service_spec.rb
index 415788cb585a1f..d06344f9cc32cc 100644
--- a/spec/services/verify_link_service_spec.rb
+++ b/spec/services/verify_link_service_spec.rb
@@ -80,24 +80,25 @@
         "
           <!doctype html>
           <body>
-            <a rel=\"me\" href=\"#{ActivityPub::TagManager.instance.url_for(account)}\"
+            <a rel=\"me\" href=\"#{ActivityPub::TagManager.instance.url_for(account)}\">
         "
       end
 
-      it 'marks the field as not verified' do
-        expect(field.verified?).to be false
+      it 'marks the field as verified' do
+        expect(field.verified?).to be true
       end
     end
 
-    context 'when a link back might be truncated' do
+    context 'when a link tag might be truncated' do
       let(:html) do
         "
           <!doctype html>
           <body>
-            <a rel=\"me\" href=\"#{ActivityPub::TagManager.instance.url_for(account)}"
+            <a rel=\"me\" href=\"#{ActivityPub::TagManager.instance.url_for(account)}\"
+        "
       end
 
-      it 'does not mark the field as verified' do
+      it 'marks the field as not verified' do
         expect(field.verified?).to be false
       end
     end

From fff378177eaf9c39ce817a715121ecd56c564adc Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 22 Feb 2024 18:45:54 +0100
Subject: [PATCH 0201/2191] Further reduce differences with upstream (mainly
 private mention styling) (#2641)

* Use upstream's CSS for private mentions styling

* Further reduce differences with upstream
---
 .../flavours/glitch/styles/components.scss    | 239 +++++++++++-------
 1 file changed, 144 insertions(+), 95 deletions(-)

diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index 831efb01e9f56b..954a014f3a77f7 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -774,6 +774,28 @@ body > [data-popper-placement] {
     opacity 0.4s ease;
 }
 
+.compose-form__textarea-icons {
+  display: block;
+  position: absolute;
+  top: 29px;
+  inset-inline-end: 5px;
+  bottom: 5px;
+  overflow: hidden;
+
+  & > .textarea_icon {
+    display: block;
+    margin-top: 2px;
+    margin-inline-start: 2px;
+    width: 24px;
+    height: 24px;
+    color: $lighter-text-color;
+    font-size: 18px;
+    line-height: 24px;
+    text-align: center;
+    opacity: 0.8;
+  }
+}
+
 .sign-in-banner {
   padding: 10px;
 
@@ -933,10 +955,6 @@ body > [data-popper-placement] {
       outline: 0 !important;
     }
   }
-}
-
-.status__content {
-  overflow: visible;
 
   .status__content__spoiler {
     display: none;
@@ -947,6 +965,11 @@ body > [data-popper-placement] {
   }
 }
 
+.status__content {
+  // glitch: necessary for fullwidth media options
+  overflow: visible;
+}
+
 .announcements__item__content {
   word-wrap: break-word;
   overflow-y: auto;
@@ -990,6 +1013,30 @@ body > [data-popper-placement] {
   }
 }
 
+.status__content__read-more-button,
+.status__content__translate-button {
+  display: flex;
+  align-items: center;
+  font-size: 15px;
+  line-height: 22px;
+  color: $highlight-text-color;
+  border: 0;
+  background: transparent;
+  padding: 0;
+  padding-top: 16px;
+  text-decoration: none;
+
+  &:hover,
+  &:active {
+    text-decoration: underline;
+  }
+
+  .icon {
+    width: 15px;
+    height: 15px;
+  }
+}
+
 .translate-button {
   margin-top: 16px;
   font-size: 15px;
@@ -1002,7 +1049,7 @@ body > [data-popper-placement] {
 .status__content__spoiler-link {
   display: inline-flex;
   border-radius: 2px;
-  background: lighten($ui-base-color, 30%);
+  background: transparent;
   border: 0;
   color: $inverted-text-color;
   font-weight: 700;
@@ -1064,14 +1111,6 @@ body > [data-popper-placement] {
     outline: 0;
     background: lighten($ui-base-color, 4%);
 
-    &.status.status-direct {
-      background: mix(lighten($ui-base-color, 4%), $ui-highlight-color, 95%);
-
-      &.muted {
-        background: transparent;
-      }
-    }
-
     .detailed-status,
     .detailed-status__action-bar {
       background: lighten($ui-base-color, 8%);
@@ -1105,11 +1144,6 @@ body > [data-popper-placement] {
     margin-top: 8px; // glitch: reduced margins
   }
 
-  &.status-direct {
-    background: mix($ui-base-color, $ui-highlight-color, 95%);
-    border-bottom-color: lighten($ui-base-color, 12%);
-  }
-
   &.light {
     .status__relative-time,
     .status__visibility-icon {
@@ -1157,6 +1191,10 @@ body > [data-popper-placement] {
       margin-inline-start: $thread-margin;
       width: calc(100% - ($thread-margin));
     }
+
+    .status__content__read-more-button {
+      margin-inline-start: $thread-margin;
+    }
   }
 
   &--first-in-thread {
@@ -1256,6 +1294,7 @@ body > [data-popper-placement] {
       );
     }
 
+    // TODO: review
     &.status-direct > .status__content::after {
       background: linear-gradient(
         rgba(mix($ui-base-color, $ui-highlight-color, 95%), 0),
@@ -1372,6 +1411,50 @@ body > [data-popper-placement] {
   }
 }
 
+@keyframes spring-flip-in {
+  0% {
+    transform: rotate(0deg);
+  }
+
+  30% {
+    transform: rotate(-242.4deg);
+  }
+
+  60% {
+    transform: rotate(-158.35deg);
+  }
+
+  90% {
+    transform: rotate(-187.5deg);
+  }
+
+  100% {
+    transform: rotate(-180deg);
+  }
+}
+
+@keyframes spring-flip-out {
+  0% {
+    transform: rotate(-180deg);
+  }
+
+  30% {
+    transform: rotate(62.4deg);
+  }
+
+  60% {
+    transform: rotate(-21.635deg);
+  }
+
+  90% {
+    transform: rotate(7.5deg);
+  }
+
+  100% {
+    transform: rotate(0deg);
+  }
+}
+
 .status-check-box__status {
   display: block;
   box-sizing: border-box;
@@ -1428,6 +1511,18 @@ body > [data-popper-placement] {
   }
 }
 
+.status__wrapper-direct {
+  background: mix($ui-base-color, $ui-highlight-color, 95%);
+
+  &:focus {
+    background: mix(lighten($ui-base-color, 4%), $ui-highlight-color, 95%);
+  }
+
+  .status__prepend {
+    color: $highlight-text-color;
+  }
+}
+
 .status__action-bar {
   display: flex;
   align-items: center;
@@ -1473,6 +1568,11 @@ body > [data-popper-placement] {
       height: 24px;
       margin: -1px 0 0;
     }
+
+    .status__content__spoiler-link {
+      line-height: 24px;
+      margin: -1px 0 0;
+    }
   }
 
   .media-gallery,
@@ -1508,25 +1608,29 @@ body > [data-popper-placement] {
   padding: 8px 0; // glitch: reduced padding
 }
 
-.compose-form__textarea-icons {
-  display: block;
-  position: absolute;
-  top: 29px;
-  inset-inline-end: 5px;
-  bottom: 5px;
-  overflow: hidden;
+.detailed-status__wrapper-direct {
+  .detailed-status,
+  .detailed-status__action-bar {
+    background: mix($ui-base-color, $ui-highlight-color, 95%);
+  }
 
-  & > .textarea_icon {
-    display: block;
-    margin-top: 2px;
-    margin-inline-start: 2px;
-    width: 24px;
-    height: 24px;
-    color: $lighter-text-color;
-    font-size: 18px;
-    line-height: 24px;
-    text-align: center;
-    opacity: 0.8;
+  &:focus {
+    .detailed-status,
+    .detailed-status__action-bar {
+      background: mix(lighten($ui-base-color, 4%), $ui-highlight-color, 95%);
+    }
+  }
+
+  .detailed-status__action-bar {
+    border-top-color: mix(
+      lighten($ui-base-color, 8%),
+      $ui-highlight-color,
+      95%
+    );
+  }
+
+  .status__prepend {
+    color: $highlight-text-color;
   }
 }
 
@@ -4659,10 +4763,10 @@ a.status-card {
   margin-bottom: 4px;
   display: block;
   background-color: rgba($black, 0.45);
-  text-transform: uppercase;
   font-size: 11px;
-  font-weight: 500;
-  padding: 4px;
+  text-transform: uppercase;
+  font-weight: 700;
+  padding: 2px 6px;
   border-radius: 4px;
   opacity: 0.7;
 
@@ -5217,50 +5321,6 @@ a.status-card {
   }
 }
 
-@keyframes spring-flip-in {
-  0% {
-    transform: rotate(0deg);
-  }
-
-  30% {
-    transform: rotate(-242.4deg);
-  }
-
-  60% {
-    transform: rotate(-158.35deg);
-  }
-
-  90% {
-    transform: rotate(-187.5deg);
-  }
-
-  100% {
-    transform: rotate(-180deg);
-  }
-}
-
-@keyframes spring-flip-out {
-  0% {
-    transform: rotate(-180deg);
-  }
-
-  30% {
-    transform: rotate(62.4deg);
-  }
-
-  60% {
-    transform: rotate(-21.635deg);
-  }
-
-  90% {
-    transform: rotate(7.5deg);
-  }
-
-  100% {
-    transform: rotate(0deg);
-  }
-}
-
 .notif-cleaning {
   .status,
   .notification {
@@ -5268,18 +5328,6 @@ a.status-card {
   }
 }
 
-.notification-follow,
-.notification-follow-request {
-  position: relative;
-
-  // same like Status
-  border-bottom: 1px solid lighten($ui-base-color, 8%);
-
-  .account {
-    border-bottom: 0 none;
-  }
-}
-
 .language-dropdown {
   &__dropdown {
     background: $simple-background-color;
@@ -8614,6 +8662,7 @@ noscript {
   inset-inline-end: 20px;
   width: 300px;
 
+  // glitch: feature to chose which side the pop-in player is displayed
   &.left {
     inset-inline-end: unset;
     inset-inline-start: 20px;

From 7cd5866ddc1e5db080ccb200f7d631d6866105f1 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 16 Feb 2024 13:59:51 +0100
Subject: [PATCH 0202/2191] Update dependency doorkeeper to v5.6.9 (#29196)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 0b53df82e064de..79d3b1e637d90c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -219,7 +219,7 @@ GEM
     docile (1.4.0)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    doorkeeper (5.6.8)
+    doorkeeper (5.6.9)
       railties (>= 5)
     dotenv (2.8.1)
     dotenv-rails (2.8.1)
@@ -811,7 +811,7 @@ GEM
     xorcist (1.1.3)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.12)
+    zeitwerk (2.6.13)
 
 PLATFORMS
   ruby

From 840ce1e0cb4ba47861fac9876819a0e4b3928552 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 20 Feb 2024 09:11:22 +0000
Subject: [PATCH 0203/2191] Update dependency webmock to v3.21.2 (#29290)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 79d3b1e637d90c..fac511d02664ad 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -793,7 +793,7 @@ GEM
     webfinger (1.2.0)
       activesupport
       httpclient (>= 2.4)
-    webmock (3.20.0)
+    webmock (3.21.2)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)

From fec49022ed00323d1176c51b0949f45ee78d8fb7 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 20 Feb 2024 10:17:41 +0100
Subject: [PATCH 0204/2191] Update dependency selenium-webdriver to v4.18.1
 (#29287)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index fac511d02664ad..8dd1a7ed08d5c3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -691,7 +691,7 @@ GEM
     scenic (1.7.0)
       activerecord (>= 4.0.0)
       railties (>= 4.0.0)
-    selenium-webdriver (4.17.0)
+    selenium-webdriver (4.18.1)
       base64 (~> 0.2)
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 3.0)

From d10848946c391e343e0b19f88672a159c2293fc5 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 22 Feb 2024 11:37:52 +0100
Subject: [PATCH 0205/2191] Update dependency rails to v7.1.3.2 (#29342)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 110 +++++++++++++++++++++++++--------------------------
 1 file changed, 55 insertions(+), 55 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 8dd1a7ed08d5c3..b88a06256612f9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -10,35 +10,35 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.1.3)
-      actionpack (= 7.1.3)
-      activesupport (= 7.1.3)
+    actioncable (7.1.3.2)
+      actionpack (= 7.1.3.2)
+      activesupport (= 7.1.3.2)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    actionmailbox (7.1.3)
-      actionpack (= 7.1.3)
-      activejob (= 7.1.3)
-      activerecord (= 7.1.3)
-      activestorage (= 7.1.3)
-      activesupport (= 7.1.3)
+    actionmailbox (7.1.3.2)
+      actionpack (= 7.1.3.2)
+      activejob (= 7.1.3.2)
+      activerecord (= 7.1.3.2)
+      activestorage (= 7.1.3.2)
+      activesupport (= 7.1.3.2)
       mail (>= 2.7.1)
       net-imap
       net-pop
       net-smtp
-    actionmailer (7.1.3)
-      actionpack (= 7.1.3)
-      actionview (= 7.1.3)
-      activejob (= 7.1.3)
-      activesupport (= 7.1.3)
+    actionmailer (7.1.3.2)
+      actionpack (= 7.1.3.2)
+      actionview (= 7.1.3.2)
+      activejob (= 7.1.3.2)
+      activesupport (= 7.1.3.2)
       mail (~> 2.5, >= 2.5.4)
       net-imap
       net-pop
       net-smtp
       rails-dom-testing (~> 2.2)
-    actionpack (7.1.3)
-      actionview (= 7.1.3)
-      activesupport (= 7.1.3)
+    actionpack (7.1.3.2)
+      actionview (= 7.1.3.2)
+      activesupport (= 7.1.3.2)
       nokogiri (>= 1.8.5)
       racc
       rack (>= 2.2.4)
@@ -46,15 +46,15 @@ GEM
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    actiontext (7.1.3)
-      actionpack (= 7.1.3)
-      activerecord (= 7.1.3)
-      activestorage (= 7.1.3)
-      activesupport (= 7.1.3)
+    actiontext (7.1.3.2)
+      actionpack (= 7.1.3.2)
+      activerecord (= 7.1.3.2)
+      activestorage (= 7.1.3.2)
+      activesupport (= 7.1.3.2)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.1.3)
-      activesupport (= 7.1.3)
+    actionview (7.1.3.2)
+      activesupport (= 7.1.3.2)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
@@ -64,22 +64,22 @@ GEM
       activemodel (>= 4.1)
       case_transform (>= 0.2)
       jsonapi-renderer (>= 0.1.1.beta1, < 0.3)
-    activejob (7.1.3)
-      activesupport (= 7.1.3)
+    activejob (7.1.3.2)
+      activesupport (= 7.1.3.2)
       globalid (>= 0.3.6)
-    activemodel (7.1.3)
-      activesupport (= 7.1.3)
-    activerecord (7.1.3)
-      activemodel (= 7.1.3)
-      activesupport (= 7.1.3)
+    activemodel (7.1.3.2)
+      activesupport (= 7.1.3.2)
+    activerecord (7.1.3.2)
+      activemodel (= 7.1.3.2)
+      activesupport (= 7.1.3.2)
       timeout (>= 0.4.0)
-    activestorage (7.1.3)
-      actionpack (= 7.1.3)
-      activejob (= 7.1.3)
-      activerecord (= 7.1.3)
-      activesupport (= 7.1.3)
+    activestorage (7.1.3.2)
+      actionpack (= 7.1.3.2)
+      activejob (= 7.1.3.2)
+      activerecord (= 7.1.3.2)
+      activesupport (= 7.1.3.2)
       marcel (~> 1.0)
-    activesupport (7.1.3)
+    activesupport (7.1.3.2)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -444,7 +444,7 @@ GEM
       uri
     net-http-persistent (4.0.2)
       connection_pool (~> 2.2)
-    net-imap (0.4.9.1)
+    net-imap (0.4.10)
       date
       net-protocol
     net-ldap (0.19.0)
@@ -532,7 +532,7 @@ GEM
       activesupport (>= 3.0.0)
     raabro (1.4.0)
     racc (1.7.3)
-    rack (2.2.8)
+    rack (2.2.8.1)
     rack-attack (6.7.0)
       rack (>= 1.0, < 4)
     rack-cors (2.0.1)
@@ -554,20 +554,20 @@ GEM
     rackup (1.0.0)
       rack (< 3)
       webrick
-    rails (7.1.3)
-      actioncable (= 7.1.3)
-      actionmailbox (= 7.1.3)
-      actionmailer (= 7.1.3)
-      actionpack (= 7.1.3)
-      actiontext (= 7.1.3)
-      actionview (= 7.1.3)
-      activejob (= 7.1.3)
-      activemodel (= 7.1.3)
-      activerecord (= 7.1.3)
-      activestorage (= 7.1.3)
-      activesupport (= 7.1.3)
+    rails (7.1.3.2)
+      actioncable (= 7.1.3.2)
+      actionmailbox (= 7.1.3.2)
+      actionmailer (= 7.1.3.2)
+      actionpack (= 7.1.3.2)
+      actiontext (= 7.1.3.2)
+      actionview (= 7.1.3.2)
+      activejob (= 7.1.3.2)
+      activemodel (= 7.1.3.2)
+      activerecord (= 7.1.3.2)
+      activestorage (= 7.1.3.2)
+      activesupport (= 7.1.3.2)
       bundler (>= 1.15.0)
-      railties (= 7.1.3)
+      railties (= 7.1.3.2)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
       actionview (>= 5.0.1.rc1)
@@ -582,9 +582,9 @@ GEM
     rails-i18n (7.0.8)
       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 8)
-    railties (7.1.3)
-      actionpack (= 7.1.3)
-      activesupport (= 7.1.3)
+    railties (7.1.3.2)
+      actionpack (= 7.1.3.2)
+      activesupport (= 7.1.3.2)
       irb
       rackup (>= 1.0.0)
       rake (>= 12.2)

From 3dae23816bdcf149c6ab974a338b8c1514949d4c Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 22 Feb 2024 12:26:48 +0100
Subject: [PATCH 0206/2191] Update dependency haml_lint to v0.57.0 (#29181)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index b88a06256612f9..07e6afb1c121ee 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -309,7 +309,7 @@ GEM
       activesupport (>= 5.1)
       haml (>= 4.0.6)
       railties (>= 5.1)
-    haml_lint (0.56.0)
+    haml_lint (0.57.0)
       haml (>= 5.0)
       parallel (~> 1.10)
       rainbow

From d908ed8e86d08e67c91a41f6f90bd33c6552446f Mon Sep 17 00:00:00 2001
From: Wojciech Maj <kontakt@wojtekmaj.pl>
Date: Tue, 20 Feb 2024 11:10:58 +0100
Subject: [PATCH 0207/2191] Remove unused dependencies (#29289)

---
 package.json |  6 +-----
 yarn.lock    | 19 +++----------------
 2 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/package.json b/package.json
index abb65a98da1ad5..f38457272d05a7 100644
--- a/package.json
+++ b/package.json
@@ -92,7 +92,6 @@
     "mark-loader": "^0.1.6",
     "marky": "^1.2.5",
     "mini-css-extract-plugin": "^1.6.2",
-    "mkdirp": "^3.0.1",
     "path-complete-extname": "^1.0.0",
     "postcss": "^8.4.24",
     "postcss-loader": "^4.3.0",
@@ -121,7 +120,6 @@
     "redux-immutable": "^4.0.0",
     "regenerator-runtime": "^0.14.0",
     "requestidlecallback": "^0.3.0",
-    "rimraf": "^5.0.1",
     "sass": "^1.62.1",
     "sass-loader": "^10.2.0",
     "stacktrace-js": "^2.0.2",
@@ -178,7 +176,6 @@
     "@types/redux-immutable": "^4.0.3",
     "@types/requestidlecallback": "^0.3.5",
     "@types/webpack": "^4.41.33",
-    "@types/yargs": "^17.0.24",
     "@typescript-eslint/eslint-plugin": "^6.0.0",
     "@typescript-eslint/parser": "^6.17.0",
     "babel-jest": "^29.5.0",
@@ -203,8 +200,7 @@
     "stylelint": "^16.0.2",
     "stylelint-config-standard-scss": "^13.0.0",
     "typescript": "^5.0.4",
-    "webpack-dev-server": "^3.11.3",
-    "yargs": "^17.7.2"
+    "webpack-dev-server": "^3.11.3"
   },
   "resolutions": {
     "kind-of": "^6.0.3",
diff --git a/yarn.lock b/yarn.lock
index 3dc42445467ed3..bdd218804c0aa8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2394,7 +2394,6 @@ __metadata:
     "@types/redux-immutable": "npm:^4.0.3"
     "@types/requestidlecallback": "npm:^0.3.5"
     "@types/webpack": "npm:^4.41.33"
-    "@types/yargs": "npm:^17.0.24"
     "@typescript-eslint/eslint-plugin": "npm:^6.0.0"
     "@typescript-eslint/parser": "npm:^6.17.0"
     arrow-key-navigation: "npm:^1.2.0"
@@ -2454,7 +2453,6 @@ __metadata:
     mark-loader: "npm:^0.1.6"
     marky: "npm:^1.2.5"
     mini-css-extract-plugin: "npm:^1.6.2"
-    mkdirp: "npm:^3.0.1"
     path-complete-extname: "npm:^1.0.0"
     postcss: "npm:^8.4.24"
     postcss-loader: "npm:^4.3.0"
@@ -2485,7 +2483,6 @@ __metadata:
     redux-immutable: "npm:^4.0.0"
     regenerator-runtime: "npm:^0.14.0"
     requestidlecallback: "npm:^0.3.0"
-    rimraf: "npm:^5.0.1"
     sass: "npm:^1.62.1"
     sass-loader: "npm:^10.2.0"
     stacktrace-js: "npm:^2.0.2"
@@ -2511,7 +2508,6 @@ __metadata:
     workbox-strategies: "npm:^7.0.0"
     workbox-webpack-plugin: "npm:^7.0.0"
     workbox-window: "npm:^7.0.0"
-    yargs: "npm:^17.7.2"
   peerDependenciesMeta:
     react:
       optional: true
@@ -3713,7 +3709,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/yargs@npm:^17.0.24, @types/yargs@npm:^17.0.8":
+"@types/yargs@npm:^17.0.8":
   version: 17.0.32
   resolution: "@types/yargs@npm:17.0.32"
   dependencies:
@@ -11662,15 +11658,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"mkdirp@npm:^3.0.1":
-  version: 3.0.1
-  resolution: "mkdirp@npm:3.0.1"
-  bin:
-    mkdirp: dist/cjs/src/bin.js
-  checksum: 9f2b975e9246351f5e3a40dcfac99fcd0baa31fbfab615fe059fb11e51f10e4803c63de1f384c54d656e4db31d000e4767e9ef076a22e12a641357602e31d57d
-  languageName: node
-  linkType: hard
-
 "mousetrap@npm:^1.5.2":
   version: 1.6.5
   resolution: "mousetrap@npm:1.6.5"
@@ -14521,7 +14508,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rimraf@npm:^5.0.1, rimraf@npm:^5.0.5":
+"rimraf@npm:^5.0.5":
   version: 5.0.5
   resolution: "rimraf@npm:5.0.5"
   dependencies:
@@ -17822,7 +17809,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"yargs@npm:^17.3.1, yargs@npm:^17.7.2":
+"yargs@npm:^17.3.1":
   version: 17.7.2
   resolution: "yargs@npm:17.7.2"
   dependencies:

From d23f445527ecc71dd41b649e578f9139e35b2bb2 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 21 Feb 2024 18:45:06 +0100
Subject: [PATCH 0208/2191] Automatically switch from open to approved
 registrations in absence of moderators (#29318)

---
 app/mailers/admin_mailer.rb                   |  6 ++
 .../auto_close_registrations.text.erb         |  3 +
 .../auto_close_registrations_scheduler.rb     | 33 ++++++++++
 config/locales/en.yml                         |  3 +
 config/sidekiq.yml                            |  4 ++
 ...auto_close_registrations_scheduler_spec.rb | 60 +++++++++++++++++++
 6 files changed, 109 insertions(+)
 create mode 100644 app/views/admin_mailer/auto_close_registrations.text.erb
 create mode 100644 app/workers/scheduler/auto_close_registrations_scheduler.rb
 create mode 100644 spec/workers/scheduler/auto_close_registrations_scheduler_spec.rb

diff --git a/app/mailers/admin_mailer.rb b/app/mailers/admin_mailer.rb
index 2a6fbb0ab7e0a5..8990b2a8470013 100644
--- a/app/mailers/admin_mailer.rb
+++ b/app/mailers/admin_mailer.rb
@@ -61,6 +61,12 @@ def new_critical_software_updates
     end
   end
 
+  def auto_close_registrations
+    locale_for_account(@me) do
+      mail subject: default_i18n_subject(instance: @instance)
+    end
+  end
+
   private
 
   def process_params
diff --git a/app/views/admin_mailer/auto_close_registrations.text.erb b/app/views/admin_mailer/auto_close_registrations.text.erb
new file mode 100644
index 00000000000000..c0f848692965b9
--- /dev/null
+++ b/app/views/admin_mailer/auto_close_registrations.text.erb
@@ -0,0 +1,3 @@
+<%= raw t('admin_mailer.auto_close_registrations.body', instance: @instance) %>
+
+<%= raw t('application_mailer.view')%> <%= admin_settings_registrations_url %>
diff --git a/app/workers/scheduler/auto_close_registrations_scheduler.rb b/app/workers/scheduler/auto_close_registrations_scheduler.rb
new file mode 100644
index 00000000000000..17516dd23fe840
--- /dev/null
+++ b/app/workers/scheduler/auto_close_registrations_scheduler.rb
@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+class Scheduler::AutoCloseRegistrationsScheduler
+  include Sidekiq::Worker
+  include Redisable
+
+  sidekiq_options retry: 0
+
+  # Automatically switch away from open registrations if no
+  # moderator had any activity in that period of time
+  OPEN_REGISTRATIONS_MODERATOR_THRESHOLD = 1.week + UserTrackingConcern::SIGN_IN_UPDATE_FREQUENCY
+
+  def perform
+    return if Rails.configuration.x.email_domains_whitelist.present? || ENV['DISABLE_AUTOMATIC_SWITCHING_TO_APPROVED_REGISTRATIONS'] == 'true'
+    return unless Setting.registrations_mode == 'open'
+
+    switch_to_approval_mode! unless active_moderators?
+  end
+
+  private
+
+  def active_moderators?
+    User.those_who_can(:manage_reports).exists?(current_sign_in_at: OPEN_REGISTRATIONS_MODERATOR_THRESHOLD.ago...)
+  end
+
+  def switch_to_approval_mode!
+    Setting.registrations_mode = 'approved'
+
+    User.those_who_can(:view_devops).includes(:account).find_each do |user|
+      AdminMailer.with(recipient: user.account).auto_close_registrations.deliver_later
+    end
+  end
+end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 9d739be07f8a4e..a7a83391d46324 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -966,6 +966,9 @@ en:
       title: Webhooks
       webhook: Webhook
   admin_mailer:
+    auto_close_registrations:
+      body: Due to a lack of recent moderator activity, registrations on %{instance} have been automatically switched to requiring manual review, to prevent %{instance} from being used as a platform for potential bad actors. You can switch it back to open registrations at any time.
+      subject: Registrations for %{instance} have been automatically switched to requiring approval
     new_appeal:
       actions:
         delete_statuses: to delete their posts
diff --git a/config/sidekiq.yml b/config/sidekiq.yml
index 3f9cbd9a7a5bef..488c2f2ab343ce 100644
--- a/config/sidekiq.yml
+++ b/config/sidekiq.yml
@@ -63,3 +63,7 @@
       interval: 30 minutes
       class: Scheduler::SoftwareUpdateCheckScheduler
       queue: scheduler
+    auto_close_registrations_scheduler:
+      interval: 1 hour
+      class: Scheduler::AutoCloseRegistrationsScheduler
+      queue: scheduler
diff --git a/spec/workers/scheduler/auto_close_registrations_scheduler_spec.rb b/spec/workers/scheduler/auto_close_registrations_scheduler_spec.rb
new file mode 100644
index 00000000000000..c0c50b128d8f47
--- /dev/null
+++ b/spec/workers/scheduler/auto_close_registrations_scheduler_spec.rb
@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe Scheduler::AutoCloseRegistrationsScheduler do
+  subject { described_class.new }
+
+  describe '#perform' do
+    let(:moderator_activity_date) { Time.now.utc }
+
+    before do
+      Fabricate(:user, role: UserRole.find_by(name: 'Owner'), current_sign_in_at: 10.years.ago)
+      Fabricate(:user, role: UserRole.find_by(name: 'Moderator'), current_sign_in_at: moderator_activity_date)
+    end
+
+    context 'when registrations are open' do
+      before do
+        Setting.registrations_mode = 'open'
+      end
+
+      context 'when a moderator has logged in recently' do
+        let(:moderator_activity_date) { Time.now.utc }
+
+        it 'does not change registrations mode' do
+          expect { subject.perform }.to_not change(Setting, :registrations_mode)
+        end
+      end
+
+      context 'when a moderator has not recently signed in' do
+        let(:moderator_activity_date) { 1.year.ago }
+
+        it 'changes registrations mode from open to approved' do
+          expect { subject.perform }.to change(Setting, :registrations_mode).from('open').to('approved')
+        end
+      end
+    end
+
+    context 'when registrations are closed' do
+      before do
+        Setting.registrations_mode = 'none'
+      end
+
+      context 'when a moderator has logged in recently' do
+        let(:moderator_activity_date) { Time.now.utc }
+
+        it 'does not change registrations mode' do
+          expect { subject.perform }.to_not change(Setting, :registrations_mode)
+        end
+      end
+
+      context 'when a moderator has not recently signed in' do
+        let(:moderator_activity_date) { 1.year.ago }
+
+        it 'does not change registrations mode' do
+          expect { subject.perform }.to_not change(Setting, :registrations_mode)
+        end
+      end
+    end
+  end
+end

From b0822ae9cdad0405ade823b5b19de1e1da0e75be Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 22 Feb 2024 15:52:14 +0100
Subject: [PATCH 0209/2191] Fix auto-close email being sent to users with
 devops permissions instead of settings permissions (#29355)

---
 app/workers/scheduler/auto_close_registrations_scheduler.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/workers/scheduler/auto_close_registrations_scheduler.rb b/app/workers/scheduler/auto_close_registrations_scheduler.rb
index 17516dd23fe840..68745029150c49 100644
--- a/app/workers/scheduler/auto_close_registrations_scheduler.rb
+++ b/app/workers/scheduler/auto_close_registrations_scheduler.rb
@@ -26,7 +26,7 @@ def active_moderators?
   def switch_to_approval_mode!
     Setting.registrations_mode = 'approved'
 
-    User.those_who_can(:view_devops).includes(:account).find_each do |user|
+    User.those_who_can(:manage_settings).includes(:account).find_each do |user|
       AdminMailer.with(recipient: user.account).auto_close_registrations.deliver_later
     end
   end

From f25414014a68deae1c05d7e22ecebd69215b8755 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 22 Feb 2024 18:31:50 +0100
Subject: [PATCH 0210/2191] Fix link verifications when page size exceeds 1MB
 (#29358)

---
 app/services/verify_link_service.rb       |  2 +-
 spec/services/verify_link_service_spec.rb | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/services/verify_link_service.rb b/app/services/verify_link_service.rb
index 707aeb4e08b47a..b317fc31a859da 100644
--- a/app/services/verify_link_service.rb
+++ b/app/services/verify_link_service.rb
@@ -19,7 +19,7 @@ def call(field)
 
   def perform_request!
     @body = Request.new(:get, @url).add_headers('Accept' => 'text/html').perform do |res|
-      res.code == 200 ? res.body_with_limit : nil
+      res.code == 200 ? res.truncated_body : nil
     end
   end
 
diff --git a/spec/services/verify_link_service_spec.rb b/spec/services/verify_link_service_spec.rb
index 415788cb585a1f..d06344f9cc32cc 100644
--- a/spec/services/verify_link_service_spec.rb
+++ b/spec/services/verify_link_service_spec.rb
@@ -80,24 +80,25 @@
         "
           <!doctype html>
           <body>
-            <a rel=\"me\" href=\"#{ActivityPub::TagManager.instance.url_for(account)}\"
+            <a rel=\"me\" href=\"#{ActivityPub::TagManager.instance.url_for(account)}\">
         "
       end
 
-      it 'marks the field as not verified' do
-        expect(field.verified?).to be false
+      it 'marks the field as verified' do
+        expect(field.verified?).to be true
       end
     end
 
-    context 'when a link back might be truncated' do
+    context 'when a link tag might be truncated' do
       let(:html) do
         "
           <!doctype html>
           <body>
-            <a rel=\"me\" href=\"#{ActivityPub::TagManager.instance.url_for(account)}"
+            <a rel=\"me\" href=\"#{ActivityPub::TagManager.instance.url_for(account)}\"
+        "
       end
 
-      it 'does not mark the field as verified' do
+      it 'marks the field as not verified' do
         expect(field.verified?).to be false
       end
     end

From 7586d4348f5958267a9f3e682ee24410f5ece9cb Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 22 Feb 2024 22:04:09 +0100
Subject: [PATCH 0211/2191] Switch glitch-soc to upstream's old composer

---
 .../flavours/glitch/actions/compose.js        |  47 +--
 .../compose/components/action_bar.jsx         |   6 +-
 .../components/autosuggest_account.jsx        |   2 +-
 .../compose/components/compose_form.jsx       | 146 +++-----
 .../features/compose/components/dropdown.jsx  | 243 -------------
 .../compose/components/dropdown_menu.jsx      | 205 -----------
 .../features/compose/components/header.jsx    | 149 --------
 .../compose/components/navigation_bar.jsx     |  22 +-
 .../features/compose/components/options.jsx   | 330 ------------------
 .../compose/components/poll_button.jsx        |  61 ++++
 .../features/compose/components/poll_form.jsx |  50 +--
 .../compose/components/privacy_dropdown.jsx   | 308 +++++++++++++---
 .../features/compose/components/publisher.jsx | 114 ------
 .../compose/components/reply_indicator.jsx    |   5 +-
 .../features/compose/components/search.jsx    |  11 +-
 .../compose/components/search_results.jsx     |   5 +-
 .../compose/components/textarea_icons.jsx     |  59 ----
 .../features/compose/components/upload.jsx    |   1 -
 .../compose/components/upload_button.jsx      |  87 +++++
 .../containers/compose_form_container.js      |  94 +----
 .../compose/containers/dropdown_container.js  |  14 -
 .../compose/containers/header_container.js    |  42 ---
 .../compose/containers/options_container.js   |  56 ---
 .../containers/poll_button_container.js       |  25 ++
 .../compose/containers/search_container.js    |   4 +-
 .../containers/sensitive_button_container.jsx |  14 +-
 .../containers/spoiler_button_container.js    |  28 ++
 .../containers/upload_button_container.js     |  20 ++
 .../compose/containers/warning_container.jsx  |   5 +-
 .../glitch/features/compose/index.jsx         | 131 ++++---
 .../flavours/glitch/reducers/compose.js       |  29 +-
 .../flavours/glitch/styles/components.scss    |  46 +--
 32 files changed, 738 insertions(+), 1621 deletions(-)
 delete mode 100644 app/javascript/flavours/glitch/features/compose/components/dropdown.jsx
 delete mode 100644 app/javascript/flavours/glitch/features/compose/components/dropdown_menu.jsx
 delete mode 100644 app/javascript/flavours/glitch/features/compose/components/header.jsx
 delete mode 100644 app/javascript/flavours/glitch/features/compose/components/options.jsx
 create mode 100644 app/javascript/flavours/glitch/features/compose/components/poll_button.jsx
 delete mode 100644 app/javascript/flavours/glitch/features/compose/components/publisher.jsx
 delete mode 100644 app/javascript/flavours/glitch/features/compose/components/textarea_icons.jsx
 create mode 100644 app/javascript/flavours/glitch/features/compose/components/upload_button.jsx
 delete mode 100644 app/javascript/flavours/glitch/features/compose/containers/dropdown_container.js
 delete mode 100644 app/javascript/flavours/glitch/features/compose/containers/header_container.js
 delete mode 100644 app/javascript/flavours/glitch/features/compose/containers/options_container.js
 create mode 100644 app/javascript/flavours/glitch/features/compose/containers/poll_button_container.js
 create mode 100644 app/javascript/flavours/glitch/features/compose/containers/spoiler_button_container.js
 create mode 100644 app/javascript/flavours/glitch/features/compose/containers/upload_button_container.js

diff --git a/app/javascript/flavours/glitch/actions/compose.js b/app/javascript/flavours/glitch/actions/compose.js
index 07f60b92708924..d2c049f3418de2 100644
--- a/app/javascript/flavours/glitch/actions/compose.js
+++ b/app/javascript/flavours/glitch/actions/compose.js
@@ -59,7 +59,7 @@ export const COMPOSE_SENSITIVITY_CHANGE  = 'COMPOSE_SENSITIVITY_CHANGE';
 export const COMPOSE_SPOILERNESS_CHANGE  = 'COMPOSE_SPOILERNESS_CHANGE';
 export const COMPOSE_SPOILER_TEXT_CHANGE = 'COMPOSE_SPOILER_TEXT_CHANGE';
 export const COMPOSE_VISIBILITY_CHANGE   = 'COMPOSE_VISIBILITY_CHANGE';
-export const COMPOSE_LISTABILITY_CHANGE  = 'COMPOSE_LISTABILITY_CHANGE';
+export const COMPOSE_COMPOSING_CHANGE    = 'COMPOSE_COMPOSING_CHANGE';
 export const COMPOSE_CONTENT_TYPE_CHANGE = 'COMPOSE_CONTENT_TYPE_CHANGE';
 export const COMPOSE_LANGUAGE_CHANGE     = 'COMPOSE_LANGUAGE_CHANGE';
 
@@ -148,13 +148,13 @@ export function resetCompose() {
   };
 }
 
-export const focusCompose = (routerHistory, defaultText) => dispatch => {
+export const focusCompose = (routerHistory, defaultText) => (dispatch, getState) => {
   dispatch({
     type: COMPOSE_FOCUS,
     defaultText,
   });
 
-  ensureComposeIsVisible(routerHistory);
+  ensureComposeIsVisible(getState, routerHistory);
 };
 
 export function mentionCompose(account, routerHistory) {
@@ -246,11 +246,6 @@ export function submitCompose(routerHistory) {
       dispatch(insertIntoTagHistory(response.data.tags, status));
       dispatch(submitComposeSuccess({ ...response.data }));
 
-      //  If the response has no data then we can't do anything else.
-      if (!response.data) {
-        return;
-      }
-
       // To make the app more responsive, immediately push the status
       // into the columns
       const insertIfOnline = timelineId => {
@@ -660,15 +655,19 @@ export const readyComposeSuggestionsTags = (token, tags) => ({
 
 export function selectComposeSuggestion(position, token, suggestion, path) {
   return (dispatch, getState) => {
-    let completion;
+    let completion, startPosition;
+
     if (suggestion.type === 'emoji') {
-      completion = suggestion.native || suggestion.colons;
+      completion    = suggestion.native || suggestion.colons;
+      startPosition = position - 1;
 
       dispatch(useEmoji(suggestion));
     } else if (suggestion.type === 'hashtag') {
-      completion = `#${suggestion.name}`;
+      completion    = `#${suggestion.name}`;
+      startPosition = position - 1;
     } else if (suggestion.type === 'account') {
-      completion = '@' + getState().getIn(['accounts', suggestion.id, 'acct']);
+      completion    = getState().getIn(['accounts', suggestion.id, 'acct']);
+      startPosition = position;
     }
 
     // We don't want to replace hashtags that vary only in case due to accessibility, but we need to fire off an event so that
@@ -676,7 +675,7 @@ export function selectComposeSuggestion(position, token, suggestion, path) {
     if (suggestion.type !== 'hashtag' || token.slice(1).localeCompare(suggestion.name, undefined, { sensitivity: 'accent' }) !== 0) {
       dispatch({
         type: COMPOSE_SUGGESTION_SELECT,
-        position,
+        position: startPosition,
         token,
         completion,
         path,
@@ -684,7 +683,7 @@ export function selectComposeSuggestion(position, token, suggestion, path) {
     } else {
       dispatch({
         type: COMPOSE_SUGGESTION_IGNORE,
-        position,
+        position: startPosition,
         token,
         completion,
         path,
@@ -786,18 +785,26 @@ export function changeComposeVisibility(value) {
   };
 }
 
-export function changeComposeContentType(value) {
+export function insertEmojiCompose(position, emoji, needsSpace) {
   return {
-    type: COMPOSE_CONTENT_TYPE_CHANGE,
+    type: COMPOSE_EMOJI_INSERT,
+    position,
+    emoji,
+    needsSpace,
+  };
+}
+
+export function changeComposing(value) {
+  return {
+    type: COMPOSE_COMPOSING_CHANGE,
     value,
   };
 }
 
-export function insertEmojiCompose(position, emoji) {
+export function changeComposeContentType(value) {
   return {
-    type: COMPOSE_EMOJI_INSERT,
-    position,
-    emoji,
+    type: COMPOSE_CONTENT_TYPE_CHANGE,
+    value,
   };
 }
 
diff --git a/app/javascript/flavours/glitch/features/compose/components/action_bar.jsx b/app/javascript/flavours/glitch/features/compose/components/action_bar.jsx
index de5d2369c39380..411ad77c79c0be 100644
--- a/app/javascript/flavours/glitch/features/compose/components/action_bar.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/action_bar.jsx
@@ -6,8 +6,6 @@ import { defineMessages, injectIntl } from 'react-intl';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 
 import MenuIcon from '@/material-icons/400-24px/menu.svg?react';
-import { preferencesLink, profileLink } from 'flavours/glitch/utils/backend_links';
-
 
 import DropdownMenuContainer from '../../../containers/dropdown_menu_container';
 
@@ -44,8 +42,8 @@ class ActionBar extends PureComponent {
 
     let menu = [];
 
-    menu.push({ text: intl.formatMessage(messages.edit_profile), href: profileLink });
-    menu.push({ text: intl.formatMessage(messages.preferences), href: preferencesLink });
+    menu.push({ text: intl.formatMessage(messages.edit_profile), href: '/settings/profile' });
+    menu.push({ text: intl.formatMessage(messages.preferences), href: '/settings/preferences' });
     menu.push({ text: intl.formatMessage(messages.pins), to: '/pinned' });
     menu.push(null);
     menu.push({ text: intl.formatMessage(messages.follow_requests), to: '/follow_requests' });
diff --git a/app/javascript/flavours/glitch/features/compose/components/autosuggest_account.jsx b/app/javascript/flavours/glitch/features/compose/components/autosuggest_account.jsx
index 6c3ee3846b24bd..0a73bc1020f4f6 100644
--- a/app/javascript/flavours/glitch/features/compose/components/autosuggest_account.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/autosuggest_account.jsx
@@ -16,7 +16,7 @@ export default class AutosuggestAccount extends ImmutablePureComponent {
     return (
       <div className='autosuggest-account' title={account.get('acct')}>
         <div className='autosuggest-account-icon'><Avatar account={account} size={18} /></div>
-        <DisplayName account={account} inline />
+        <DisplayName account={account} />
       </div>
     );
   }
diff --git a/app/javascript/flavours/glitch/features/compose/components/compose_form.jsx b/app/javascript/flavours/glitch/features/compose/components/compose_form.jsx
index 12f4f2948bfb86..1f24828c665cd8 100644
--- a/app/javascript/flavours/glitch/features/compose/components/compose_form.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/compose_form.jsx
@@ -10,35 +10,36 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
 
 import { length } from 'stringz';
 
-import { maxChars } from 'flavours/glitch/initial_state';
-import { isMobile } from 'flavours/glitch/is_mobile';
+import LockIcon from '@/material-icons/400-24px/lock.svg?react';
+import { Icon }  from 'flavours/glitch/components/icon';
 import { WithOptionalRouterPropTypes, withOptionalRouter } from 'flavours/glitch/utils/react_router';
 
 import AutosuggestInput from '../../../components/autosuggest_input';
 import AutosuggestTextarea from '../../../components/autosuggest_textarea';
+import { Button } from '../../../components/button';
+import { maxChars } from '../../../initial_state';
 import EmojiPickerDropdown from '../containers/emoji_picker_dropdown_container';
-import OptionsContainer from '../containers/options_container';
+import LanguageDropdown from '../containers/language_dropdown_container';
+import PollButtonContainer from '../containers/poll_button_container';
 import PollFormContainer from '../containers/poll_form_container';
+import PrivacyDropdownContainer from '../containers/privacy_dropdown_container';
 import ReplyIndicatorContainer from '../containers/reply_indicator_container';
+import SpoilerButtonContainer from '../containers/spoiler_button_container';
+import UploadButtonContainer from '../containers/upload_button_container';
 import UploadFormContainer from '../containers/upload_form_container';
 import WarningContainer from '../containers/warning_container';
 import { countableText } from '../util/counter';
 
 import CharacterCounter from './character_counter';
-import Publisher from './publisher';
-import TextareaIcons from './textarea_icons';
+
+const allowedAroundShortCode = '><\u0085\u0020\u00a0\u1680\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029\u0009\u000a\u000b\u000c\u000d';
 
 const messages = defineMessages({
   placeholder: { id: 'compose_form.placeholder', defaultMessage: 'What is on your mind?' },
-  missingDescriptionMessage: {
-    id: 'confirmations.missing_media_description.message',
-    defaultMessage: 'At least one media attachment is lacking a description. Consider describing all media attachments for the visually impaired before sending your toot.',
-  },
-  missingDescriptionConfirm: {
-    id: 'confirmations.missing_media_description.confirm',
-    defaultMessage: 'Send anyway',
-  },
   spoiler_placeholder: { id: 'compose_form.spoiler_placeholder', defaultMessage: 'Write your warning here' },
+  publish: { id: 'compose_form.publish', defaultMessage: 'Publish' },
+  publishLoud: { id: 'compose_form.publish_loud', defaultMessage: '{publish}!' },
+  saveChanges: { id: 'compose_form.save_changes', defaultMessage: 'Save changes' },
 });
 
 class ComposeForm extends ImmutablePureComponent {
@@ -64,26 +65,16 @@ class ComposeForm extends ImmutablePureComponent {
     onChangeSpoilerText: PropTypes.func.isRequired,
     onPaste: PropTypes.func.isRequired,
     onPickEmoji: PropTypes.func.isRequired,
-    showSearch: PropTypes.bool,
+    autoFocus: PropTypes.bool,
     anyMedia: PropTypes.bool,
     isInReply: PropTypes.bool,
     singleColumn: PropTypes.bool,
     lang: PropTypes.string,
-    advancedOptions: ImmutablePropTypes.map,
-    media: ImmutablePropTypes.list,
-    sideArm: PropTypes.string,
-    sensitive: PropTypes.bool,
-    spoilersAlwaysOn: PropTypes.bool,
-    mediaDescriptionConfirmation: PropTypes.bool,
-    preselectOnReply: PropTypes.bool,
-    onChangeSpoilerness: PropTypes.func.isRequired,
-    onChangeVisibility: PropTypes.func.isRequired,
-    onMediaDescriptionConfirm: PropTypes.func.isRequired,
     ...WithOptionalRouterPropTypes
   };
 
   static defaultProps = {
-    showSearch: false,
+    autoFocus: false,
   };
 
   state = {
@@ -103,28 +94,21 @@ class ComposeForm extends ImmutablePureComponent {
     if (e.keyCode === 13 && (e.ctrlKey || e.metaKey)) {
       this.handleSubmit();
     }
-
-    if (e.keyCode === 13 && e.altKey) {
-      this.handleSecondarySubmit();
-    }
   };
 
   getFulltextForCharacterCounting = () => {
-    return [
-      this.props.spoiler? this.props.spoilerText: '',
-      countableText(this.props.text),
-      this.props.advancedOptions && this.props.advancedOptions.get('do_not_federate') ? ' 👁️' : '',
-    ].join('');
+    return [this.props.spoiler? this.props.spoilerText: '', countableText(this.props.text)].join('');
   };
 
   canSubmit = () => {
     const { isSubmitting, isChangingUpload, isUploading, anyMedia } = this.props;
     const fulltext = this.getFulltextForCharacterCounting();
+    const isOnlyWhitespace = fulltext.length !== 0 && fulltext.trim().length === 0;
 
-    return !(isSubmitting || isUploading || isChangingUpload || length(fulltext) > maxChars || (!fulltext.trim().length && !anyMedia));
+    return !(isSubmitting || isUploading || isChangingUpload || length(fulltext) > maxChars || (isOnlyWhitespace && !anyMedia));
   };
 
-  handleSubmit = (e, overriddenVisibility = null) => {
+  handleSubmit = (e) => {
     if (this.props.text !== this.textareaRef.current.value) {
       // Something changed the text inside the textarea (e.g. browser extensions like Grammarly)
       // Update the state to match the current text
@@ -135,26 +119,11 @@ class ComposeForm extends ImmutablePureComponent {
       return;
     }
 
+    this.props.onSubmit(this.props.history || null);
+
     if (e) {
       e.preventDefault();
     }
-
-    // Submit unless there are media with missing descriptions
-    if (this.props.mediaDescriptionConfirmation && this.props.media && this.props.media.some(item => !item.get('description'))) {
-      const firstWithoutDescription = this.props.media.find(item => !item.get('description'));
-      this.props.onMediaDescriptionConfirm(this.props.history || null, firstWithoutDescription.get('id'), overriddenVisibility);
-    } else {
-      if (overriddenVisibility) {
-        this.props.onChangeVisibility(overriddenVisibility);
-      }
-      this.props.onSubmit(this.props.history || null);
-    }
-  };
-
-  //  Handles the secondary submit button.
-  handleSecondarySubmit = () => {
-    const { sideArm } = this.props;
-    this.handleSubmit(null, sideArm === 'none' ? null : sideArm);
   };
 
   onSuggestionsClearRequested = () => {
@@ -207,7 +176,7 @@ class ComposeForm extends ImmutablePureComponent {
     if (this.props.focusDate && this.props.focusDate !== prevProps.focusDate) {
       let selectionEnd, selectionStart;
 
-      if (this.props.preselectDate !== prevProps.preselectDate && this.props.isInReply && this.props.preselectOnReply) {
+      if (this.props.preselectDate !== prevProps.preselectDate && this.props.isInReply) {
         selectionEnd   = this.props.text.length;
         selectionStart = this.props.text.search(/\s/) + 1;
       } else if (typeof this.props.caretPosition === 'number') {
@@ -224,7 +193,6 @@ class ComposeForm extends ImmutablePureComponent {
       Promise.resolve().then(() => {
         this.textareaRef.current.setSelectionRange(selectionStart, selectionEnd);
         this.textareaRef.current.focus();
-        if (!this.props.singleColumn) this.textareaRef.current.scrollIntoView();
         this.setState({ highlighted: true });
         this.timeout = setTimeout(() => this.setState({ highlighted: false }), 700);
       }).catch(console.error);
@@ -248,28 +216,28 @@ class ComposeForm extends ImmutablePureComponent {
   };
 
   handleEmojiPick = (data) => {
-    const position = this.textareaRef.current.selectionStart;
+    const { text }     = this.props;
+    const position     = this.textareaRef.current.selectionStart;
+    const needsSpace   = data.custom && position > 0 && !allowedAroundShortCode.includes(text[position - 1]);
 
-    this.props.onPickEmoji(position, data);
+    this.props.onPickEmoji(position, data, needsSpace);
   };
 
   render () {
-    const {
-      intl,
-      advancedOptions,
-      isSubmitting,
-      onChangeSpoilerness,
-      onPaste,
-      privacy,
-      sensitive,
-      showSearch,
-      sideArm,
-      spoilersAlwaysOn,
-      isEditing,
-    } = this.props;
+    const { intl, onPaste, autoFocus } = this.props;
     const { highlighted } = this.state;
     const disabled = this.props.isSubmitting;
 
+    let publishText = '';
+
+    if (this.props.isEditing) {
+      publishText = intl.formatMessage(messages.saveChanges);
+    } else if (this.props.privacy === 'private' || this.props.privacy === 'direct') {
+      publishText = <><Icon id='lock' icon={LockIcon} /> {intl.formatMessage(messages.publish)}</>;
+    } else {
+      publishText = this.props.privacy !== 'unlisted' ? intl.formatMessage(messages.publishLoud, { publish: intl.formatMessage(messages.publish) }) : intl.formatMessage(messages.publish);
+    }
+
     return (
       <form className='compose-form' onSubmit={this.handleSubmit}>
         <WarningContainer />
@@ -292,7 +260,6 @@ class ComposeForm extends ImmutablePureComponent {
             id='cw-spoiler-input'
             className='spoiler-input__input'
             lang={this.props.lang}
-            autoFocus={false}
             spellCheck
           />
         </div>
@@ -311,10 +278,9 @@ class ComposeForm extends ImmutablePureComponent {
             onSuggestionsClearRequested={this.onSuggestionsClearRequested}
             onSuggestionSelected={this.onSuggestionSelected}
             onPaste={onPaste}
-            autoFocus={!showSearch && !isMobile(window.innerWidth)}
+            autoFocus={autoFocus}
             lang={this.props.lang}
           >
-            <TextareaIcons advancedOptions={advancedOptions} />
             <div className='compose-form__modifiers'>
               <UploadFormContainer />
               <PollFormContainer />
@@ -323,28 +289,30 @@ class ComposeForm extends ImmutablePureComponent {
           <EmojiPickerDropdown onPickEmoji={this.handleEmojiPick} />
 
           <div className='compose-form__buttons-wrapper'>
-            <OptionsContainer
-              advancedOptions={advancedOptions}
-              disabled={isSubmitting}
-              onToggleSpoiler={this.props.spoilersAlwaysOn ? null : onChangeSpoilerness}
-              onUpload={onPaste}
-              isEditing={isEditing}
-              sensitive={sensitive || (spoilersAlwaysOn && this.props.spoilerText && this.props.spoilerText.length > 0)}
-              spoiler={spoilersAlwaysOn ? (this.props.spoilerText && this.props.spoilerText.length > 0) : this.props.spoiler}
-            />
+            <div className='compose-form__buttons'>
+              <UploadButtonContainer />
+              <PollButtonContainer />
+              <PrivacyDropdownContainer disabled={this.props.isEditing} />
+              <SpoilerButtonContainer />
+              <LanguageDropdown />
+            </div>
+
             <div className='character-counter__wrapper'>
               <CharacterCounter max={maxChars} text={this.getFulltextForCharacterCounting()} />
             </div>
           </div>
         </div>
 
-        <Publisher
-          disabled={!this.canSubmit()}
-          isEditing={isEditing}
-          onSecondarySubmit={this.handleSecondarySubmit}
-          privacy={privacy}
-          sideArm={sideArm}
-        />
+        <div className='compose-form__publish'>
+          <div className='compose-form__publish-button-wrapper'>
+            <Button
+              type='submit'
+              text={publishText}
+              disabled={!this.canSubmit()}
+              block
+            />
+          </div>
+        </div>
       </form>
     );
   }
diff --git a/app/javascript/flavours/glitch/features/compose/components/dropdown.jsx b/app/javascript/flavours/glitch/features/compose/components/dropdown.jsx
deleted file mode 100644
index 4b9098835f6047..00000000000000
--- a/app/javascript/flavours/glitch/features/compose/components/dropdown.jsx
+++ /dev/null
@@ -1,243 +0,0 @@
-//  Package imports.
-import PropTypes from 'prop-types';
-import { PureComponent } from 'react';
-
-import classNames from 'classnames';
-
-import Overlay from 'react-overlays/Overlay';
-
-//  Components.
-import { IconButton } from 'flavours/glitch/components/icon_button';
-
-import DropdownMenu from './dropdown_menu';
-
-//  The component.
-export default class ComposerOptionsDropdown extends PureComponent {
-
-  static propTypes = {
-    isUserTouching: PropTypes.func,
-    disabled: PropTypes.bool,
-    icon: PropTypes.string,
-    iconComponent: PropTypes.func,
-    items: PropTypes.arrayOf(PropTypes.shape({
-      icon: PropTypes.string,
-      iconComponent: PropTypes.func,
-      meta: PropTypes.string,
-      name: PropTypes.string.isRequired,
-      text: PropTypes.string,
-    })).isRequired,
-    onModalOpen: PropTypes.func,
-    onModalClose: PropTypes.func,
-    title: PropTypes.string,
-    value: PropTypes.string,
-    onChange: PropTypes.func,
-    container: PropTypes.func,
-    renderItemContents: PropTypes.func,
-    closeOnChange: PropTypes.bool,
-  };
-
-  static defaultProps = {
-    closeOnChange: true,
-  };
-
-  state = {
-    open: false,
-    openedViaKeyboard: undefined,
-    placement: 'bottom',
-  };
-
-  //  Toggles opening and closing the dropdown.
-  handleToggle = ({ type }) => {
-    const { onModalOpen } = this.props;
-    const { open } = this.state;
-
-    if (this.props.isUserTouching && this.props.isUserTouching()) {
-      if (open) {
-        this.props.onModalClose();
-      } else {
-        const modal = this.handleMakeModal();
-        if (modal && onModalOpen) {
-          onModalOpen(modal);
-        }
-      }
-    } else {
-      if (open && this.activeElement) {
-        this.activeElement.focus({ preventScroll: true });
-      }
-      this.setState({ open: !open, openedViaKeyboard: type !== 'click' });
-    }
-  };
-
-  handleKeyDown = (e) => {
-    switch (e.key) {
-    case 'Escape':
-      this.handleClose();
-      break;
-    }
-  };
-
-  handleMouseDown = () => {
-    if (!this.state.open) {
-      this.activeElement = document.activeElement;
-    }
-  };
-
-  handleButtonKeyDown = (e) => {
-    switch(e.key) {
-    case ' ':
-    case 'Enter':
-      this.handleMouseDown();
-      break;
-    }
-  };
-
-  handleKeyPress = (e) => {
-    switch(e.key) {
-    case ' ':
-    case 'Enter':
-      this.handleToggle(e);
-      e.stopPropagation();
-      e.preventDefault();
-      break;
-    }
-  };
-
-  handleClose = () => {
-    if (this.state.open && this.activeElement) {
-      this.activeElement.focus({ preventScroll: true });
-    }
-    this.setState({ open: false });
-  };
-
-  handleItemClick = (e) => {
-    const {
-      items,
-      onChange,
-      onModalClose,
-      closeOnChange,
-    } = this.props;
-
-    const i = Number(e.currentTarget.getAttribute('data-index'));
-
-    const { name } = items[i];
-
-    e.preventDefault();  //  Prevents focus from changing
-    if (closeOnChange) onModalClose();
-    onChange(name);
-  };
-
-  //  Creates an action modal object.
-  handleMakeModal = () => {
-    const {
-      items,
-      onChange,
-      onModalOpen,
-      onModalClose,
-      value,
-    } = this.props;
-
-    //  Required props.
-    if (!(onChange && onModalOpen && onModalClose && items)) {
-      return null;
-    }
-
-    //  The object.
-    return {
-      renderItemContents: this.props.renderItemContents,
-      onClick: this.handleItemClick,
-      actions: items.map(
-        ({
-          name,
-          ...rest
-        }) => ({
-          ...rest,
-          active: value && name === value,
-          name,
-        }),
-      ),
-    };
-  };
-
-  setTargetRef = c => {
-    this.target = c;
-  };
-
-  findTarget = () => {
-    return this.target;
-  };
-
-  handleOverlayEnter = (state) => {
-    this.setState({ placement: state.placement });
-  };
-
-  //  Rendering.
-  render () {
-    const {
-      disabled,
-      title,
-      icon,
-      iconComponent,
-      items,
-      onChange,
-      value,
-      container,
-      renderItemContents,
-      closeOnChange,
-    } = this.props;
-    const { open, placement } = this.state;
-
-    return (
-      <div
-        className={classNames('privacy-dropdown', placement, { active: open })}
-        onKeyDown={this.handleKeyDown}
-        ref={this.setTargetRef}
-      >
-        <IconButton
-          active={open}
-          className='privacy-dropdown__value-icon'
-          disabled={disabled}
-          icon={icon}
-          iconComponent={iconComponent}
-          inverted
-          onClick={this.handleToggle}
-          onMouseDown={this.handleMouseDown}
-          onKeyDown={this.handleButtonKeyDown}
-          onKeyPress={this.handleKeyPress}
-          size={18}
-          style={{
-            height: null,
-            lineHeight: '27px',
-          }}
-          title={title}
-        />
-
-        <Overlay
-          containerPadding={20}
-          placement={placement}
-          show={open}
-          flip
-          target={this.findTarget}
-          container={container}
-          popperConfig={{ strategy: 'fixed', onFirstUpdate: this.handleOverlayEnter }}
-        >
-          {({ props, placement }) => (
-            <div {...props}>
-              <div className={`dropdown-animation privacy-dropdown__dropdown ${placement}`}>
-                <DropdownMenu
-                  items={items}
-                  renderItemContents={renderItemContents}
-                  onChange={onChange}
-                  onClose={this.handleClose}
-                  value={value}
-                  openedViaKeyboard={this.state.openedViaKeyboard}
-                  closeOnChange={closeOnChange}
-                />
-              </div>
-            </div>
-          )}
-        </Overlay>
-      </div>
-    );
-  }
-
-}
diff --git a/app/javascript/flavours/glitch/features/compose/components/dropdown_menu.jsx b/app/javascript/flavours/glitch/features/compose/components/dropdown_menu.jsx
deleted file mode 100644
index e5f24b51f9d496..00000000000000
--- a/app/javascript/flavours/glitch/features/compose/components/dropdown_menu.jsx
+++ /dev/null
@@ -1,205 +0,0 @@
-//  Package imports.
-import PropTypes from 'prop-types';
-import { PureComponent } from 'react';
-
-import classNames from 'classnames';
-
-import { supportsPassiveEvents } from 'detect-passive-events';
-
-//  Components.
-import { Icon } from 'flavours/glitch/components/icon';
-
-const listenerOptions = supportsPassiveEvents ? { passive: true, capture: true } : true;
-
-//  The component.
-export default class ComposerOptionsDropdownContent extends PureComponent {
-
-  static propTypes = {
-    items: PropTypes.arrayOf(PropTypes.shape({
-      icon: PropTypes.string,
-      iconComponent: PropTypes.func,
-      meta: PropTypes.node,
-      name: PropTypes.string.isRequired,
-      text: PropTypes.node,
-    })),
-    onChange: PropTypes.func.isRequired,
-    onClose: PropTypes.func.isRequired,
-    style: PropTypes.object,
-    value: PropTypes.string,
-    renderItemContents: PropTypes.func,
-    openedViaKeyboard: PropTypes.bool,
-    closeOnChange: PropTypes.bool,
-  };
-
-  static defaultProps = {
-    style: {},
-    closeOnChange: true,
-  };
-
-  state = {
-    value: this.props.openedViaKeyboard ? this.props.items[0].name : undefined,
-  };
-
-  //  When the document is clicked elsewhere, we close the dropdown.
-  handleDocumentClick = (e) => {
-    if (this.node && !this.node.contains(e.target)) {
-      this.props.onClose();
-      e.stopPropagation();
-    }
-  };
-
-  //  Stores our node in `this.node`.
-  setRef = (node) => {
-    this.node = node;
-  };
-
-  //  On mounting, we add our listeners.
-  componentDidMount () {
-    document.addEventListener('click', this.handleDocumentClick, { capture: true });
-    document.addEventListener('touchend', this.handleDocumentClick, listenerOptions);
-    if (this.focusedItem) {
-      this.focusedItem.focus({ preventScroll: true });
-    } else {
-      this.node.firstChild.focus({ preventScroll: true });
-    }
-  }
-
-  //  On unmounting, we remove our listeners.
-  componentWillUnmount () {
-    document.removeEventListener('click', this.handleDocumentClick, { capture: true });
-    document.removeEventListener('touchend', this.handleDocumentClick, listenerOptions);
-  }
-
-  handleClick = (e) => {
-    const i = Number(e.currentTarget.getAttribute('data-index'));
-
-    const {
-      onChange,
-      onClose,
-      closeOnChange,
-      items,
-    } = this.props;
-
-    const { name } = items[i];
-
-    e.preventDefault();  //  Prevents change in focus on click
-    if (closeOnChange) {
-      onClose();
-    }
-    onChange(name);
-  };
-
-  // Handle changes differently whether the dropdown is a list of options or actions
-  handleChange = (name) => {
-    if (this.props.value) {
-      this.props.onChange(name);
-    } else {
-      this.setState({ value: name });
-    }
-  };
-
-  handleKeyDown = (e) => {
-    const index = Number(e.currentTarget.getAttribute('data-index'));
-    const { items } = this.props;
-    let element = null;
-
-    switch(e.key) {
-    case 'Escape':
-      this.props.onClose();
-      break;
-    case 'Enter':
-    case ' ':
-      this.handleClick(e);
-      break;
-    case 'ArrowDown':
-      element = this.node.childNodes[index + 1] || this.node.firstChild;
-      break;
-    case 'ArrowUp':
-      element = this.node.childNodes[index - 1] || this.node.lastChild;
-      break;
-    case 'Tab':
-      if (e.shiftKey) {
-        element = this.node.childNodes[index - 1] || this.node.lastChild;
-      } else {
-        element = this.node.childNodes[index + 1] || this.node.firstChild;
-      }
-      break;
-    case 'Home':
-      element = this.node.firstChild;
-      break;
-    case 'End':
-      element = this.node.lastChild;
-      break;
-    }
-
-    if (element) {
-      element.focus();
-      this.handleChange(items[Number(element.getAttribute('data-index'))].name);
-      e.preventDefault();
-      e.stopPropagation();
-    }
-  };
-
-  setFocusRef = c => {
-    this.focusedItem = c;
-  };
-
-  renderItem = (item, i) => {
-    const { name, icon, iconComponent, meta, text } = item;
-
-    const active = (name === (this.props.value || this.state.value));
-
-    const computedClass = classNames('privacy-dropdown__option', { active });
-
-    let contents = this.props.renderItemContents && this.props.renderItemContents(item, i);
-
-    if (!contents) {
-      contents = (
-        <>
-          {icon && (
-            <div className='privacy-dropdown__option__icon'>
-              <Icon className='icon' id={icon} icon={iconComponent} />
-            </div>
-          )}
-
-          <div className='privacy-dropdown__option__content'>
-            <strong>{text}</strong>
-            {meta}
-          </div>
-        </>
-      );
-    }
-
-    return (
-      <div
-        className={computedClass}
-        onClick={this.handleClick}
-        onKeyDown={this.handleKeyDown}
-        role='option'
-        aria-selected={active}
-        tabIndex={0}
-        key={name}
-        data-index={i}
-        ref={active ? this.setFocusRef : null}
-      >
-        {contents}
-      </div>
-    );
-  };
-
-  //  Rendering.
-  render () {
-    const {
-      items,
-      style,
-    } = this.props;
-
-    //  The result.
-    return (
-      <div style={{ ...style }} role='listbox' ref={this.setRef}>
-        {!!items && items.map((item, i) => this.renderItem(item, i))}
-      </div>
-    );
-  }
-
-}
diff --git a/app/javascript/flavours/glitch/features/compose/components/header.jsx b/app/javascript/flavours/glitch/features/compose/components/header.jsx
deleted file mode 100644
index bdcb51cd92881c..00000000000000
--- a/app/javascript/flavours/glitch/features/compose/components/header.jsx
+++ /dev/null
@@ -1,149 +0,0 @@
-import PropTypes from 'prop-types';
-
-import { injectIntl, defineMessages } from 'react-intl';
-
-import { Link } from 'react-router-dom';
-
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import ImmutablePureComponent from 'react-immutable-pure-component';
-
-import PeopleIcon from '@/material-icons/400-24px/group.svg?react';
-import HomeIcon from '@/material-icons/400-24px/home-fill.svg?react';
-import LogoutIcon from '@/material-icons/400-24px/logout.svg?react';
-import ManufacturingIcon from '@/material-icons/400-24px/manufacturing.svg?react';
-import MenuIcon from '@/material-icons/400-24px/menu.svg?react';
-import NotificationsIcon from '@/material-icons/400-24px/notifications-fill.svg?react';
-import PublicIcon from '@/material-icons/400-24px/public.svg?react';
-import { Icon } from 'flavours/glitch/components/icon';
-import { signOutLink } from 'flavours/glitch/utils/backend_links';
-import { conditionalRender } from 'flavours/glitch/utils/react_helpers';
-
-
-const messages = defineMessages({
-  community: {
-    defaultMessage: 'Local timeline',
-    id: 'navigation_bar.community_timeline',
-  },
-  home_timeline: {
-    defaultMessage: 'Home',
-    id: 'tabs_bar.home',
-  },
-  logout: {
-    defaultMessage: 'Logout',
-    id: 'navigation_bar.logout',
-  },
-  notifications: {
-    defaultMessage: 'Notifications',
-    id: 'tabs_bar.notifications',
-  },
-  public: {
-    defaultMessage: 'Federated timeline',
-    id: 'navigation_bar.public_timeline',
-  },
-  settings: {
-    defaultMessage: 'App settings',
-    id: 'navigation_bar.app_settings',
-  },
-  start: {
-    defaultMessage: 'Getting started',
-    id: 'getting_started.heading',
-  },
-});
-
-class Header extends ImmutablePureComponent {
-
-  static propTypes = {
-    columns: ImmutablePropTypes.list,
-    unreadNotifications: PropTypes.number,
-    showNotificationsBadge: PropTypes.bool,
-    intl: PropTypes.object,
-    onSettingsClick: PropTypes.func,
-    onLogout: PropTypes.func.isRequired,
-  };
-
-  handleLogoutClick = e => {
-    e.preventDefault();
-    e.stopPropagation();
-
-    this.props.onLogout();
-
-    return false;
-  };
-
-  render () {
-    const { intl, columns, unreadNotifications, showNotificationsBadge, onSettingsClick } = this.props;
-
-    //  Only renders the component if the column isn't being shown.
-    const renderForColumn = conditionalRender.bind(null,
-      columnId => !columns || !columns.some(
-        column => column.get('id') === columnId,
-      ),
-    );
-
-    //  The result.
-    return (
-      <nav className='drawer__header'>
-        <Link
-          aria-label={intl.formatMessage(messages.start)}
-          title={intl.formatMessage(messages.start)}
-          to='/getting-started'
-          className='drawer__tab'
-        ><Icon id='bars' icon={MenuIcon} /></Link>
-        {renderForColumn('HOME', (
-          <Link
-            aria-label={intl.formatMessage(messages.home_timeline)}
-            title={intl.formatMessage(messages.home_timeline)}
-            to='/home'
-            className='drawer__tab'
-          ><Icon id='home' icon={HomeIcon} /></Link>
-        ))}
-        {renderForColumn('NOTIFICATIONS', (
-          <Link
-            aria-label={intl.formatMessage(messages.notifications)}
-            title={intl.formatMessage(messages.notifications)}
-            to='/notifications'
-            className='drawer__tab'
-          >
-            <span className='icon-badge-wrapper'>
-              <Icon id='bell' icon={NotificationsIcon} />
-              { showNotificationsBadge && unreadNotifications > 0 && <div className='icon-badge' />}
-            </span>
-          </Link>
-        ))}
-        {renderForColumn('COMMUNITY', (
-          <Link
-            aria-label={intl.formatMessage(messages.community)}
-            title={intl.formatMessage(messages.community)}
-            to='/public/local'
-            className='drawer__tab'
-          ><Icon id='users' icon={PeopleIcon} /></Link>
-        ))}
-        {renderForColumn('PUBLIC', (
-          <Link
-            aria-label={intl.formatMessage(messages.public)}
-            title={intl.formatMessage(messages.public)}
-            to='/public'
-            className='drawer__tab'
-          ><Icon id='globe' icon={PublicIcon} /></Link>
-        ))}
-        <a
-          aria-label={intl.formatMessage(messages.settings)}
-          onClick={onSettingsClick}
-          href='/settings/preferences'
-          title={intl.formatMessage(messages.settings)}
-          className='drawer__tab'
-        ><Icon id='cogs' icon={ManufacturingIcon} /></a>
-        <a
-          aria-label={intl.formatMessage(messages.logout)}
-          onClick={this.handleLogoutClick}
-          href={signOutLink}
-          title={intl.formatMessage(messages.logout)}
-          className='drawer__tab'
-        ><Icon id='sign-out' icon={LogoutIcon} /></a>
-      </nav>
-    );
-  }
-
-}
-
-export default injectIntl(Header);
diff --git a/app/javascript/flavours/glitch/features/compose/components/navigation_bar.jsx b/app/javascript/flavours/glitch/features/compose/components/navigation_bar.jsx
index fed84359faec5c..2f0bb79f891827 100644
--- a/app/javascript/flavours/glitch/features/compose/components/navigation_bar.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/navigation_bar.jsx
@@ -2,12 +2,11 @@ import PropTypes from 'prop-types';
 
 import { FormattedMessage } from 'react-intl';
 
+import { Link } from 'react-router-dom';
+
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-import { Permalink } from 'flavours/glitch/components/permalink';
-import { profileLink } from 'flavours/glitch/utils/backend_links';
-
 import { Avatar } from '../../../components/avatar';
 
 import ActionBar from './action_bar';
@@ -24,24 +23,21 @@ export default class NavigationBar extends ImmutablePureComponent {
     const username = this.props.account.get('acct');
     return (
       <div className='navigation-bar'>
-        <Permalink className='avatar' href={this.props.account.get('url')} to={`/@${username}`}>
+        <Link to={`/@${username}`}>
           <span style={{ display: 'none' }}>{username}</span>
           <Avatar account={this.props.account} size={46} />
-        </Permalink>
+        </Link>
 
         <div className='navigation-bar__profile'>
           <span>
-            <Permalink className='acct' href={this.props.account.get('url')} to={`/@${username}`}>
+            <Link to={`/@${username}`}>
               <strong className='navigation-bar__profile-account'>@{username}</strong>
-            </Permalink>
+            </Link>
           </span>
 
-          { profileLink !== undefined && (
-            <a
-              href={profileLink}
-              className='navigation-bar__profile-edit'
-            ><FormattedMessage id='navigation_bar.edit_profile' defaultMessage='Edit profile' /></a>
-          )}
+          <span>
+            <a href='/settings/profile' className='navigation-bar__profile-edit'><FormattedMessage id='navigation_bar.edit_profile' defaultMessage='Edit profile' /></a>
+          </span>
         </div>
 
         <div className='navigation-bar__actions'>
diff --git a/app/javascript/flavours/glitch/features/compose/components/options.jsx b/app/javascript/flavours/glitch/features/compose/components/options.jsx
deleted file mode 100644
index 5460960364927c..00000000000000
--- a/app/javascript/flavours/glitch/features/compose/components/options.jsx
+++ /dev/null
@@ -1,330 +0,0 @@
-import PropTypes from 'prop-types';
-
-import { defineMessages, injectIntl } from 'react-intl';
-
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import ImmutablePureComponent from 'react-immutable-pure-component';
-import { connect } from 'react-redux';
-
-import Toggle from 'react-toggle';
-
-import AttachFileIcon from '@/material-icons/400-24px/attach_file.svg?react';
-import BrushIcon from '@/material-icons/400-24px/brush.svg?react';
-import CodeIcon from '@/material-icons/400-24px/code.svg?react';
-import DescriptionIcon from '@/material-icons/400-24px/description.svg?react';
-import InsertChartIcon from '@/material-icons/400-24px/insert_chart.svg?react';
-import MarkdownIcon from '@/material-icons/400-24px/markdown.svg?react';
-import MoreHorizIcon from '@/material-icons/400-24px/more_horiz.svg?react';
-import UploadFileIcon from '@/material-icons/400-24px/upload_file.svg?react';
-import { IconButton } from 'flavours/glitch/components/icon_button';
-import { pollLimits } from 'flavours/glitch/initial_state';
-
-
-import DropdownContainer from '../containers/dropdown_container';
-import LanguageDropdown from '../containers/language_dropdown_container';
-import PrivacyDropdownContainer from '../containers/privacy_dropdown_container';
-
-import TextIconButton from './text_icon_button';
-
-const messages = defineMessages({
-  advanced_options_icon_title: {
-    defaultMessage: 'Advanced options',
-    id: 'advanced_options.icon_title',
-  },
-  attach: {
-    defaultMessage: 'Attach...',
-    id: 'compose.attach',
-  },
-  content_type: {
-    defaultMessage: 'Content type',
-    id: 'content-type.change',
-  },
-  doodle: {
-    defaultMessage: 'Draw something',
-    id: 'compose.attach.doodle',
-  },
-  html: {
-    defaultMessage: 'HTML',
-    id: 'compose.content-type.html',
-  },
-  local_only_long: {
-    defaultMessage: 'Do not post to other instances',
-    id: 'advanced_options.local-only.long',
-  },
-  local_only_short: {
-    defaultMessage: 'Local-only',
-    id: 'advanced_options.local-only.short',
-  },
-  markdown: {
-    defaultMessage: 'Markdown',
-    id: 'compose.content-type.markdown',
-  },
-  plain: {
-    defaultMessage: 'Plain text',
-    id: 'compose.content-type.plain',
-  },
-  spoiler: {
-    defaultMessage: 'Hide text behind warning',
-    id: 'compose_form.spoiler',
-  },
-  threaded_mode_long: {
-    defaultMessage: 'Automatically opens a reply on posting',
-    id: 'advanced_options.threaded_mode.long',
-  },
-  threaded_mode_short: {
-    defaultMessage: 'Threaded mode',
-    id: 'advanced_options.threaded_mode.short',
-  },
-  upload: {
-    defaultMessage: 'Upload a file',
-    id: 'compose.attach.upload',
-  },
-  add_poll: {
-    defaultMessage: 'Add a poll',
-    id: 'poll_button.add_poll',
-  },
-  remove_poll: {
-    defaultMessage: 'Remove poll',
-    id: 'poll_button.remove_poll',
-  },
-});
-
-const mapStateToProps = (state, { name }) => ({
-  checked: state.getIn(['compose', 'advanced_options', name]),
-});
-
-class ToggleOptionImpl extends ImmutablePureComponent {
-
-  static propTypes = {
-    name: PropTypes.string.isRequired,
-    checked: PropTypes.bool,
-    onChangeAdvancedOption: PropTypes.func.isRequired,
-  };
-
-  handleChange = () => {
-    this.props.onChangeAdvancedOption(this.props.name);
-  };
-
-  render() {
-    const { meta, text, checked } = this.props;
-
-    return (
-      <>
-        <div className='privacy-dropdown__option__icon'>
-          <Toggle checked={checked} onChange={this.handleChange} />
-        </div>
-
-        <div className='privacy-dropdown__option__content'>
-          <strong>{text}</strong>
-          {meta}
-        </div>
-      </>
-    );
-  }
-
-}
-
-const ToggleOption = connect(mapStateToProps)(ToggleOptionImpl);
-
-class ComposerOptions extends ImmutablePureComponent {
-
-  static propTypes = {
-    acceptContentTypes: PropTypes.string,
-    advancedOptions: ImmutablePropTypes.map,
-    disabled: PropTypes.bool,
-    allowMedia: PropTypes.bool,
-    allowPoll: PropTypes.bool,
-    hasPoll: PropTypes.bool,
-    intl: PropTypes.object.isRequired,
-    onChangeAdvancedOption: PropTypes.func.isRequired,
-    onChangeContentType: PropTypes.func.isRequired,
-    onTogglePoll: PropTypes.func.isRequired,
-    onDoodleOpen: PropTypes.func.isRequired,
-    onToggleSpoiler: PropTypes.func,
-    onUpload: PropTypes.func.isRequired,
-    contentType: PropTypes.string,
-    resetFileKey: PropTypes.number,
-    spoiler: PropTypes.bool,
-    showContentTypeChoice: PropTypes.bool,
-    isEditing: PropTypes.bool,
-  };
-
-  handleChangeFiles = ({ target: { files } }) => {
-    const { onUpload } = this.props;
-    if (files.length) {
-      onUpload(files);
-    }
-  };
-
-  handleClickAttach = (name) => {
-    const { fileElement } = this;
-    const { onDoodleOpen } = this.props;
-
-    switch (name) {
-    case 'upload':
-      if (fileElement) {
-        fileElement.click();
-      }
-      return;
-    case 'doodle':
-      onDoodleOpen();
-      return;
-    }
-  };
-
-  handleRefFileElement = (fileElement) => {
-    this.fileElement = fileElement;
-  };
-
-  renderToggleItemContents = (item) => {
-    const { onChangeAdvancedOption } = this.props;
-    const { name, meta, text } = item;
-
-    return <ToggleOption name={name} text={text} meta={meta} onChangeAdvancedOption={onChangeAdvancedOption} />;
-  };
-
-  render () {
-    const {
-      acceptContentTypes,
-      advancedOptions,
-      contentType,
-      disabled,
-      allowMedia,
-      allowPoll,
-      hasPoll,
-      onChangeAdvancedOption,
-      onChangeContentType,
-      onTogglePoll,
-      onToggleSpoiler,
-      resetFileKey,
-      spoiler,
-      showContentTypeChoice,
-      isEditing,
-      intl: { formatMessage },
-    } = this.props;
-
-    const contentTypeItems = {
-      plain: {
-        icon: 'file-text',
-        iconComponent: DescriptionIcon,
-        name: 'text/plain',
-        text: formatMessage(messages.plain),
-      },
-      html: {
-        icon: 'code',
-        iconComponent: CodeIcon,
-        name: 'text/html',
-        text: formatMessage(messages.html),
-      },
-      markdown: {
-        icon: 'arrow-circle-down',
-        iconComponent: MarkdownIcon,
-        name: 'text/markdown',
-        text: formatMessage(messages.markdown),
-      },
-    };
-
-    //  The result.
-    return (
-      <div className='compose-form__buttons'>
-        <input
-          accept={acceptContentTypes}
-          disabled={disabled || !allowMedia}
-          key={resetFileKey}
-          onChange={this.handleChangeFiles}
-          ref={this.handleRefFileElement}
-          type='file'
-          multiple
-          style={{ display: 'none' }}
-        />
-        <DropdownContainer
-          disabled={disabled || !allowMedia}
-          icon='paperclip'
-          iconComponent={AttachFileIcon}
-          items={[
-            {
-              icon: 'cloud-upload',
-              iconComponent: UploadFileIcon,
-              name: 'upload',
-              text: formatMessage(messages.upload),
-            },
-            {
-              icon: 'paint-brush',
-              iconComponent: BrushIcon,
-              name: 'doodle',
-              text: formatMessage(messages.doodle),
-            },
-          ]}
-          onChange={this.handleClickAttach}
-          title={formatMessage(messages.attach)}
-        />
-        {!!pollLimits && (
-          <IconButton
-            active={hasPoll}
-            disabled={disabled || !allowPoll}
-            icon='tasks'
-            iconComponent={InsertChartIcon}
-            inverted
-            onClick={onTogglePoll}
-            size={18}
-            style={{
-              height: null,
-              lineHeight: null,
-            }}
-            title={formatMessage(hasPoll ? messages.remove_poll : messages.add_poll)}
-          />
-        )}
-        <PrivacyDropdownContainer disabled={disabled || isEditing} />
-        {showContentTypeChoice && (
-          <DropdownContainer
-            disabled={disabled}
-            icon={(contentTypeItems[contentType.split('/')[1]] || {}).icon}
-            iconComponent={(contentTypeItems[contentType.split('/')[1]] || {}).iconComponent}
-            items={[
-              contentTypeItems.plain,
-              contentTypeItems.html,
-              contentTypeItems.markdown,
-            ]}
-            onChange={onChangeContentType}
-            title={formatMessage(messages.content_type)}
-            value={contentType}
-          />
-        )}
-        {onToggleSpoiler && (
-          <TextIconButton
-            active={spoiler}
-            ariaControls='cw-spoiler-input'
-            label='CW'
-            onClick={onToggleSpoiler}
-            title={formatMessage(messages.spoiler)}
-          />
-        )}
-        <LanguageDropdown />
-        <DropdownContainer
-          disabled={disabled || isEditing}
-          icon='ellipsis-h'
-          iconComponent={MoreHorizIcon}
-          items={advancedOptions ? [
-            {
-              meta: formatMessage(messages.local_only_long),
-              name: 'do_not_federate',
-              text: formatMessage(messages.local_only_short),
-            },
-            {
-              meta: formatMessage(messages.threaded_mode_long),
-              name: 'threaded_mode',
-              text: formatMessage(messages.threaded_mode_short),
-            },
-          ] : null}
-          onChange={onChangeAdvancedOption}
-          renderItemContents={this.renderToggleItemContents}
-          title={formatMessage(messages.advanced_options_icon_title)}
-          closeOnChange={false}
-        />
-      </div>
-    );
-  }
-
-}
-
-export default injectIntl(ComposerOptions);
diff --git a/app/javascript/flavours/glitch/features/compose/components/poll_button.jsx b/app/javascript/flavours/glitch/features/compose/components/poll_button.jsx
new file mode 100644
index 00000000000000..4900d381192779
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/compose/components/poll_button.jsx
@@ -0,0 +1,61 @@
+import PropTypes from 'prop-types';
+import { PureComponent } from 'react';
+
+import { defineMessages, injectIntl } from 'react-intl';
+
+import InsertChartIcon from '@/material-icons/400-24px/insert_chart.svg?react';
+
+import { IconButton } from '../../../components/icon_button';
+
+
+const messages = defineMessages({
+  add_poll: { id: 'poll_button.add_poll', defaultMessage: 'Add a poll' },
+  remove_poll: { id: 'poll_button.remove_poll', defaultMessage: 'Remove poll' },
+});
+
+const iconStyle = {
+  height: null,
+  lineHeight: '27px',
+};
+
+class PollButton extends PureComponent {
+
+  static propTypes = {
+    disabled: PropTypes.bool,
+    unavailable: PropTypes.bool,
+    active: PropTypes.bool,
+    onClick: PropTypes.func.isRequired,
+    intl: PropTypes.object.isRequired,
+  };
+
+  handleClick = () => {
+    this.props.onClick();
+  };
+
+  render () {
+    const { intl, active, unavailable, disabled } = this.props;
+
+    if (unavailable) {
+      return null;
+    }
+
+    return (
+      <div className='compose-form__poll-button'>
+        <IconButton
+          icon='tasks'
+          iconComponent={InsertChartIcon}
+          title={intl.formatMessage(active ? messages.remove_poll : messages.add_poll)}
+          disabled={disabled}
+          onClick={this.handleClick}
+          className={`compose-form__poll-button-icon ${active ? 'active' : ''}`}
+          size={18}
+          inverted
+          style={iconStyle}
+        />
+      </div>
+    );
+  }
+
+}
+
+export default injectIntl(PollButton);
diff --git a/app/javascript/flavours/glitch/features/compose/components/poll_form.jsx b/app/javascript/flavours/glitch/features/compose/components/poll_form.jsx
index 053b02673de03a..1ee0a06c629dd2 100644
--- a/app/javascript/flavours/glitch/features/compose/components/poll_form.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/poll_form.jsx
@@ -8,21 +8,19 @@ import classNames from 'classnames';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-
 import AddIcon from '@/material-icons/400-24px/add.svg?react';
 import CloseIcon from '@/material-icons/400-24px/close.svg?react';
 import AutosuggestInput from 'flavours/glitch/components/autosuggest_input';
 import { Icon }  from 'flavours/glitch/components/icon';
 import { IconButton } from 'flavours/glitch/components/icon_button';
-import { pollLimits } from 'flavours/glitch/initial_state';
 
 const messages = defineMessages({
   option_placeholder: { id: 'compose_form.poll.option_placeholder', defaultMessage: 'Choice {number}' },
   add_option: { id: 'compose_form.poll.add_option', defaultMessage: 'Add a choice' },
   remove_option: { id: 'compose_form.poll.remove_option', defaultMessage: 'Remove this choice' },
   poll_duration: { id: 'compose_form.poll.duration', defaultMessage: 'Poll duration' },
-  single_choice: { id: 'compose_form.poll.single_choice', defaultMessage: 'Allow one choice' },
-  multiple_choices: { id: 'compose_form.poll.multiple_choices', defaultMessage: 'Allow multiple choices' },
+  switchToMultiple: { id: 'compose_form.poll.switch_to_multiple', defaultMessage: 'Change poll to allow multiple choices' },
+  switchToSingle: { id: 'compose_form.poll.switch_to_single', defaultMessage: 'Change poll to allow for a single choice' },
   minutes: { id: 'intervals.full.minutes', defaultMessage: '{number, plural, one {# minute} other {# minutes}}' },
   hours: { id: 'intervals.full.hours', defaultMessage: '{number, plural, one {# hour} other {# hours}}' },
   days: { id: 'intervals.full.days', defaultMessage: '{number, plural, one {# day} other {# days}}' },
@@ -38,6 +36,7 @@ class OptionIntl extends PureComponent {
     autoFocus: PropTypes.bool,
     onChange: PropTypes.func.isRequired,
     onRemove: PropTypes.func.isRequired,
+    onToggleMultiple: PropTypes.func.isRequired,
     suggestions: ImmutablePropTypes.list,
     onClearSuggestions: PropTypes.func.isRequired,
     onFetchSuggestions: PropTypes.func.isRequired,
@@ -53,6 +52,19 @@ class OptionIntl extends PureComponent {
     this.props.onRemove(this.props.index);
   };
 
+
+  handleToggleMultiple = e => {
+    this.props.onToggleMultiple();
+    e.preventDefault();
+    e.stopPropagation();
+  };
+
+  handleCheckboxKeypress = e => {
+    if (e.key === 'Enter' || e.key === ' ') {
+      this.handleToggleMultiple(e);
+    }
+  };
+
   onSuggestionsClearRequested = () => {
     this.props.onClearSuggestions();
   };
@@ -71,11 +83,19 @@ class OptionIntl extends PureComponent {
     return (
       <li>
         <label className='poll__option editable'>
-          <span className={classNames('poll__input', { checkbox: isPollMultiple })} />
+          <span
+            className={classNames('poll__input', { checkbox: isPollMultiple })}
+            onClick={this.handleToggleMultiple}
+            onKeyPress={this.handleCheckboxKeypress}
+            role='button'
+            tabIndex={0}
+            title={intl.formatMessage(isPollMultiple ? messages.switchToSingle : messages.switchToMultiple)}
+            aria-label={intl.formatMessage(isPollMultiple ? messages.switchToSingle : messages.switchToMultiple)}
+          />
 
           <AutosuggestInput
             placeholder={intl.formatMessage(messages.option_placeholder, { number: index + 1 })}
-            maxLength={pollLimits.max_option_chars}
+            maxLength={100}
             value={title}
             lang={lang}
             spellCheck
@@ -126,8 +146,8 @@ class PollForm extends ImmutablePureComponent {
     this.props.onChangeSettings(e.target.value, this.props.isMultiple);
   };
 
-  handleSelectMultiple = e => {
-    this.props.onChangeSettings(this.props.expiresIn, e.target.value === 'true');
+  handleToggleMultiple = () => {
+    this.props.onChangeSettings(this.props.expiresIn, !this.props.isMultiple);
   };
 
   render () {
@@ -142,21 +162,11 @@ class PollForm extends ImmutablePureComponent {
     return (
       <div className='compose-form__poll-wrapper'>
         <ul>
-          {options.map((title, i) => <Option title={title} lang={lang} key={i} index={i} onChange={onChangeOption} onRemove={onRemoveOption} isPollMultiple={isMultiple} autoFocus={i === autoFocusIndex} {...other} />)}
-          {options.size < pollLimits.max_options && (
-            <label className='poll__text editable'>
-              <span className={classNames('poll__input')} style={{ opacity: 0 }} />
-              <button className='button button-secondary' onClick={this.handleAddOption} type='button'><Icon id='plus' icon={AddIcon} /> <FormattedMessage {...messages.add_option} /></button>
-            </label>
-          )}
+          {options.map((title, i) => <Option title={title} lang={lang} key={i} index={i} onChange={onChangeOption} onRemove={onRemoveOption} isPollMultiple={isMultiple} onToggleMultiple={this.handleToggleMultiple} autoFocus={i === autoFocusIndex} {...other} />)}
         </ul>
 
         <div className='poll__footer'>
-          {/* eslint-disable-next-line jsx-a11y/no-onchange */}
-          <select value={isMultiple ? 'true' : 'false'} onChange={this.handleSelectMultiple}>
-            <option value='false'>{intl.formatMessage(messages.single_choice)}</option>
-            <option value='true'>{intl.formatMessage(messages.multiple_choices)}</option>
-          </select>
+          <button type='button' disabled={options.size >= 5} className='button button-secondary' onClick={this.handleAddOption}><Icon id='plus' icon={AddIcon} /> <FormattedMessage {...messages.add_option} /></button>
 
           {/* eslint-disable-next-line jsx-a11y/no-onchange */}
           <select value={expiresIn} onChange={this.handleSelectDuration}>
diff --git a/app/javascript/flavours/glitch/features/compose/components/privacy_dropdown.jsx b/app/javascript/flavours/glitch/features/compose/components/privacy_dropdown.jsx
index 7980c1007e817b..f7c893f28a27d2 100644
--- a/app/javascript/flavours/glitch/features/compose/components/privacy_dropdown.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/privacy_dropdown.jsx
@@ -3,12 +3,19 @@ import { PureComponent } from 'react';
 
 import { injectIntl, defineMessages } from 'react-intl';
 
+import classNames from 'classnames';
+
+
+import { supportsPassiveEvents } from 'detect-passive-events';
+import Overlay from 'react-overlays/Overlay';
+
+import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
 import LockIcon from '@/material-icons/400-24px/lock.svg?react';
 import LockOpenIcon from '@/material-icons/400-24px/lock_open.svg?react';
-import MailIcon from '@/material-icons/400-24px/mail.svg?react';
 import PublicIcon from '@/material-icons/400-24px/public.svg?react';
+import { Icon }  from 'flavours/glitch/components/icon';
 
-import Dropdown from './dropdown';
+import { IconButton } from '../../../components/icon_button';
 
 const messages = defineMessages({
   public_short: { id: 'privacy.public.short', defaultMessage: 'Public' },
@@ -22,6 +29,120 @@ const messages = defineMessages({
   change_privacy: { id: 'privacy.change', defaultMessage: 'Adjust status privacy' },
 });
 
+const listenerOptions = supportsPassiveEvents ? { passive: true, capture: true } : true;
+
+class PrivacyDropdownMenu extends PureComponent {
+
+  static propTypes = {
+    style: PropTypes.object,
+    items: PropTypes.array.isRequired,
+    value: PropTypes.string.isRequired,
+    onClose: PropTypes.func.isRequired,
+    onChange: PropTypes.func.isRequired,
+  };
+
+  handleDocumentClick = e => {
+    if (this.node && !this.node.contains(e.target)) {
+      this.props.onClose();
+      e.stopPropagation();
+    }
+  };
+
+  handleKeyDown = e => {
+    const { items } = this.props;
+    const value = e.currentTarget.getAttribute('data-index');
+    const index = items.findIndex(item => {
+      return (item.value === value);
+    });
+    let element = null;
+
+    switch(e.key) {
+    case 'Escape':
+      this.props.onClose();
+      break;
+    case 'Enter':
+      this.handleClick(e);
+      break;
+    case 'ArrowDown':
+      element = this.node.childNodes[index + 1] || this.node.firstChild;
+      break;
+    case 'ArrowUp':
+      element = this.node.childNodes[index - 1] || this.node.lastChild;
+      break;
+    case 'Tab':
+      if (e.shiftKey) {
+        element = this.node.childNodes[index - 1] || this.node.lastChild;
+      } else {
+        element = this.node.childNodes[index + 1] || this.node.firstChild;
+      }
+      break;
+    case 'Home':
+      element = this.node.firstChild;
+      break;
+    case 'End':
+      element = this.node.lastChild;
+      break;
+    }
+
+    if (element) {
+      element.focus();
+      this.props.onChange(element.getAttribute('data-index'));
+      e.preventDefault();
+      e.stopPropagation();
+    }
+  };
+
+  handleClick = e => {
+    const value = e.currentTarget.getAttribute('data-index');
+
+    e.preventDefault();
+
+    this.props.onClose();
+    this.props.onChange(value);
+  };
+
+  componentDidMount () {
+    document.addEventListener('click', this.handleDocumentClick, { capture: true });
+    document.addEventListener('touchend', this.handleDocumentClick, listenerOptions);
+    if (this.focusedItem) this.focusedItem.focus({ preventScroll: true });
+  }
+
+  componentWillUnmount () {
+    document.removeEventListener('click', this.handleDocumentClick, { capture: true });
+    document.removeEventListener('touchend', this.handleDocumentClick, listenerOptions);
+  }
+
+  setRef = c => {
+    this.node = c;
+  };
+
+  setFocusRef = c => {
+    this.focusedItem = c;
+  };
+
+  render () {
+    const { style, items, value } = this.props;
+
+    return (
+      <div style={{ ...style }} role='listbox' ref={this.setRef}>
+        {items.map(item => (
+          <div role='option' tabIndex={0} key={item.value} data-index={item.value} onKeyDown={this.handleKeyDown} onClick={this.handleClick} className={classNames('privacy-dropdown__option', { active: item.value === value })} aria-selected={item.value === value} ref={item.value === value ? this.setFocusRef : null}>
+            <div className='privacy-dropdown__option__icon'>
+              <Icon id={item.icon} icon={item.iconComponent} />
+            </div>
+
+            <div className='privacy-dropdown__option__content'>
+              <strong>{item.text}</strong>
+              {item.meta}
+            </div>
+          </div>
+        ))}
+      </div>
+    );
+  }
+
+}
+
 class PrivacyDropdown extends PureComponent {
 
   static propTypes = {
@@ -36,62 +157,139 @@ class PrivacyDropdown extends PureComponent {
     intl: PropTypes.object.isRequired,
   };
 
-  render () {
-    const { value, onChange, onModalOpen, onModalClose, disabled, noDirect, container, isUserTouching, intl: { formatMessage } } = this.props;
-
-    //  We predefine our privacy items so that we can easily pick the
-    //  dropdown icon later.
-    const privacyItems = {
-      direct: {
-        icon: 'envelope',
-        iconComponent: MailIcon,
-        meta: formatMessage(messages.direct_long),
-        name: 'direct',
-        text: formatMessage(messages.direct_short),
-      },
-      private: {
-        icon: 'lock',
-        iconComponent: LockIcon,
-        meta: formatMessage(messages.private_long),
-        name: 'private',
-        text: formatMessage(messages.private_short),
-      },
-      public: {
-        icon: 'globe',
-        iconComponent: PublicIcon,
-        meta: formatMessage(messages.public_long),
-        name: 'public',
-        text: formatMessage(messages.public_short),
-      },
-      unlisted: {
-        icon: 'unlock',
-        iconComponent: LockOpenIcon,
-        meta: formatMessage(messages.unlisted_long),
-        name: 'unlisted',
-        text: formatMessage(messages.unlisted_short),
-      },
-    };
-
-    const items = [privacyItems.public, privacyItems.unlisted, privacyItems.private];
-
-    if (!noDirect) {
-      items.push(privacyItems.direct);
+  state = {
+    open: false,
+    placement: 'bottom',
+  };
+
+  handleToggle = () => {
+    if (this.props.isUserTouching && this.props.isUserTouching()) {
+      if (this.state.open) {
+        this.props.onModalClose();
+      } else {
+        this.props.onModalOpen({
+          actions: this.options.map(option => ({ ...option, active: option.value === this.props.value })),
+          onClick: this.handleModalActionClick,
+        });
+      }
+    } else {
+      if (this.state.open && this.activeElement) {
+        this.activeElement.focus({ preventScroll: true });
+      }
+      this.setState({ open: !this.state.open });
+    }
+  };
+
+  handleModalActionClick = (e) => {
+    e.preventDefault();
+
+    const { value } = this.options[e.currentTarget.getAttribute('data-index')];
+
+    this.props.onModalClose();
+    this.props.onChange(value);
+  };
+
+  handleKeyDown = e => {
+    switch(e.key) {
+    case 'Escape':
+      this.handleClose();
+      break;
+    }
+  };
+
+  handleMouseDown = () => {
+    if (!this.state.open) {
+      this.activeElement = document.activeElement;
+    }
+  };
+
+  handleButtonKeyDown = (e) => {
+    switch(e.key) {
+    case ' ':
+    case 'Enter':
+      this.handleMouseDown();
+      break;
+    }
+  };
+
+  handleClose = () => {
+    if (this.state.open && this.activeElement) {
+      this.activeElement.focus({ preventScroll: true });
+    }
+    this.setState({ open: false });
+  };
+
+  handleChange = value => {
+    this.props.onChange(value);
+  };
+
+  UNSAFE_componentWillMount () {
+    const { intl: { formatMessage } } = this.props;
+
+    this.options = [
+      { icon: 'globe', iconComponent: PublicIcon, value: 'public', text: formatMessage(messages.public_short), meta: formatMessage(messages.public_long) },
+      { icon: 'unlock', iconComponent: LockOpenIcon,  value: 'unlisted', text: formatMessage(messages.unlisted_short), meta: formatMessage(messages.unlisted_long) },
+      { icon: 'lock', iconComponent: LockIcon, value: 'private', text: formatMessage(messages.private_short), meta: formatMessage(messages.private_long) },
+    ];
+
+    if (!this.props.noDirect) {
+      this.options.push(
+        { icon: 'at', iconComponent: AlternateEmailIcon, value: 'direct', text: formatMessage(messages.direct_short), meta: formatMessage(messages.direct_long) },
+      );
     }
+  }
+
+  setTargetRef = c => {
+    this.target = c;
+  };
+
+  findTarget = () => {
+    return this.target;
+  };
+
+  handleOverlayEnter = (state) => {
+    this.setState({ placement: state.placement });
+  };
+
+  render () {
+    const { value, container, disabled, intl } = this.props;
+    const { open, placement } = this.state;
+
+    const valueOption = this.options.find(item => item.value === value);
 
     return (
-      <Dropdown
-        disabled={disabled}
-        icon={(privacyItems[value] || {}).icon}
-        iconComponent={(privacyItems[value] || {}).iconComponent}
-        items={items}
-        onChange={onChange}
-        isUserTouching={isUserTouching}
-        onModalClose={onModalClose}
-        onModalOpen={onModalOpen}
-        title={formatMessage(messages.change_privacy)}
-        container={container}
-        value={value}
-      />
+      <div ref={this.setTargetRef} onKeyDown={this.handleKeyDown}>
+        <IconButton
+          className='privacy-dropdown__value-icon'
+          icon={valueOption.icon}
+          iconComponent={valueOption.iconComponent}
+          title={intl.formatMessage(messages.change_privacy)}
+          size={18}
+          expanded={open}
+          active={open}
+          inverted
+          onClick={this.handleToggle}
+          onMouseDown={this.handleMouseDown}
+          onKeyDown={this.handleButtonKeyDown}
+          style={{ height: null, lineHeight: '27px' }}
+          disabled={disabled}
+        />
+
+        <Overlay show={open} placement={placement} flip target={this.findTarget} container={container} popperConfig={{ strategy: 'fixed', onFirstUpdate: this.handleOverlayEnter }}>
+          {({ props, placement }) => (
+            <div {...props}>
+              <div className={`dropdown-animation privacy-dropdown__dropdown ${placement}`}>
+                <PrivacyDropdownMenu
+                  items={this.options}
+                  value={value}
+                  onClose={this.handleClose}
+                  onChange={this.handleChange}
+                />
+              </div>
+            </div>
+          )}
+        </Overlay>
+      </div>
     );
   }
 
diff --git a/app/javascript/flavours/glitch/features/compose/components/publisher.jsx b/app/javascript/flavours/glitch/features/compose/components/publisher.jsx
deleted file mode 100644
index ff825ca0c925d0..00000000000000
--- a/app/javascript/flavours/glitch/features/compose/components/publisher.jsx
+++ /dev/null
@@ -1,114 +0,0 @@
-import PropTypes from 'prop-types';
-
-import { defineMessages, injectIntl } from 'react-intl';
-
-import ImmutablePureComponent from 'react-immutable-pure-component';
-
-import LockIcon from '@/material-icons/400-24px/lock.svg?react';
-import LockOpenIcon from '@/material-icons/400-24px/lock_open.svg?react';
-import MailIcon from '@/material-icons/400-24px/mail.svg?react';
-import PublicIcon from '@/material-icons/400-24px/public.svg?react';
-import { Button } from 'flavours/glitch/components/button';
-import { Icon } from 'flavours/glitch/components/icon';
-
-
-const messages = defineMessages({
-  publish: {
-    defaultMessage: 'Publish',
-    id: 'compose_form.publish',
-  },
-  publishLoud: {
-    defaultMessage: '{publish}!',
-    id: 'compose_form.publish_loud',
-  },
-  saveChanges: { id: 'compose_form.save_changes', defaultMessage: 'Save changes' },
-  public: { id: 'privacy.public.short', defaultMessage: 'Public' },
-  unlisted: { id: 'privacy.unlisted.short', defaultMessage: 'Unlisted' },
-  private: { id: 'privacy.private.short', defaultMessage: 'Followers only' },
-  direct: { id: 'privacy.direct.short', defaultMessage: 'Mentioned people only' },
-});
-
-class Publisher extends ImmutablePureComponent {
-
-  static propTypes = {
-    disabled: PropTypes.bool,
-    intl: PropTypes.object.isRequired,
-    onSecondarySubmit: PropTypes.func,
-    privacy: PropTypes.oneOf(['direct', 'private', 'unlisted', 'public']),
-    sideArm: PropTypes.oneOf(['none', 'direct', 'private', 'unlisted', 'public']),
-    isEditing: PropTypes.bool,
-  };
-
-  render () {
-    const { disabled, intl, onSecondarySubmit, privacy, sideArm, isEditing } = this.props;
-
-    const privacyIcons = {
-      direct: {
-        id: 'envelope',
-        icon: MailIcon,
-      },
-      private: {
-        id: 'lock',
-        icon: LockIcon,
-      },
-      public: {
-        id: 'globe',
-        icon: PublicIcon,
-      },
-      unlisted: {
-        id: 'unlock',
-        icon: LockOpenIcon,
-      },
-    };
-
-    let publishText;
-    if (isEditing) {
-      publishText = intl.formatMessage(messages.saveChanges);
-    } else if (privacy === 'private' || privacy === 'direct') {
-      const icon = privacyIcons[privacy];
-      publishText = (
-        <span>
-          <Icon {...icon} /> {intl.formatMessage(messages.publish)}
-        </span>
-      );
-    } else {
-      publishText = privacy !== 'unlisted' ? intl.formatMessage(messages.publishLoud, { publish: intl.formatMessage(messages.publish) }) : intl.formatMessage(messages.publish);
-    }
-
-    const privacyNames = {
-      public: messages.public,
-      unlisted: messages.unlisted,
-      private: messages.private,
-      direct: messages.direct,
-    };
-
-    return (
-      <div className='compose-form__publish'>
-        {sideArm && !isEditing && sideArm !== 'none' && (
-          <div className='compose-form__publish-button-wrapper'>
-            <Button
-              className='side_arm'
-              disabled={disabled}
-              onClick={onSecondarySubmit}
-              style={{ padding: null }}
-              text={<Icon {...privacyIcons[sideArm]} />}
-              title={`${intl.formatMessage(messages.publish)}: ${intl.formatMessage(privacyNames[sideArm])}`}
-            />
-          </div>
-        )}
-        <div className='compose-form__publish-button-wrapper'>
-          <Button
-            className='primary'
-            type='submit'
-            text={publishText}
-            title={`${intl.formatMessage(messages.publish)}: ${intl.formatMessage(privacyNames[privacy])}`}
-            disabled={disabled}
-          />
-        </div>
-      </div>
-    );
-  }
-
-}
-
-export default injectIntl(Publisher);
diff --git a/app/javascript/flavours/glitch/features/compose/components/reply_indicator.jsx b/app/javascript/flavours/glitch/features/compose/components/reply_indicator.jsx
index 8af8cd441a02ea..e3721b6fa90996 100644
--- a/app/javascript/flavours/glitch/features/compose/components/reply_indicator.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/reply_indicator.jsx
@@ -5,7 +5,6 @@ import { defineMessages, injectIntl } from 'react-intl';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-
 import CloseIcon from '@/material-icons/400-24px/close.svg?react';
 import AttachmentList from 'flavours/glitch/components/attachment_list';
 import { WithOptionalRouterPropTypes, withOptionalRouter } from 'flavours/glitch/utils/react_router';
@@ -52,9 +51,9 @@ class ReplyIndicator extends ImmutablePureComponent {
         <div className='reply-indicator__header'>
           <div className='reply-indicator__cancel'><IconButton title={intl.formatMessage(messages.cancel)} icon='times' iconComponent={CloseIcon} onClick={this.handleClick} inverted /></div>
 
-          <a href={status.getIn(['account', 'url'])} onClick={this.handleAccountClick} className='reply-indicator__display-name' target='_blank' rel='noopener noreferrer'>
+          <a href={`/@${status.getIn(['account', 'acct'])}`} onClick={this.handleAccountClick} className='reply-indicator__display-name'>
             <div className='reply-indicator__display-avatar'><Avatar account={status.get('account')} size={24} /></div>
-            <DisplayName account={status.get('account')} inline />
+            <DisplayName account={status.get('account')} />
           </a>
         </div>
 
diff --git a/app/javascript/flavours/glitch/features/compose/components/search.jsx b/app/javascript/flavours/glitch/features/compose/components/search.jsx
index fa995663f0633d..4b64038f570941 100644
--- a/app/javascript/flavours/glitch/features/compose/components/search.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/search.jsx
@@ -8,7 +8,6 @@ import { withRouter } from 'react-router-dom';
 
 import ImmutablePropTypes from 'react-immutable-proptypes';
 
-
 import CancelIcon from '@/material-icons/400-24px/cancel-fill.svg?react';
 import CloseIcon from '@/material-icons/400-24px/close.svg?react';
 import SearchIcon from '@/material-icons/400-24px/search.svg?react';
@@ -186,9 +185,9 @@ class Search extends PureComponent {
   };
 
   handleURLClick = () => {
-    const { onOpenURL, history } = this.props;
+    const { value, onOpenURL, history } = this.props;
 
-    onOpenURL(history);
+    onOpenURL(value, history);
     this._unfocus();
   };
 
@@ -331,7 +330,7 @@ class Search extends PureComponent {
           type='text'
           placeholder={intl.formatMessage(signedIn ? messages.placeholderSignedIn : messages.placeholder)}
           aria-label={intl.formatMessage(signedIn ? messages.placeholderSignedIn : messages.placeholder)}
-          value={value || ''}
+          value={value}
           onChange={this.handleChange}
           onKeyDown={this.handleKeyDown}
           onFocus={this.handleFocus}
@@ -339,8 +338,8 @@ class Search extends PureComponent {
         />
 
         <div role='button' tabIndex={0} className='search__icon' onClick={this.handleClear}>
-          <Icon id='search' icon={SearchIcon}  className={hasValue ? '' : 'active'} />
-          <Icon id='times-circle' icon={CancelIcon} className={hasValue ? 'active' : ''} />
+          <Icon id='search' icon={SearchIcon} className={hasValue ? '' : 'active'} />
+          <Icon id='times-circle' icon={CancelIcon} className={hasValue ? 'active' : ''} aria-label={intl.formatMessage(messages.placeholder)} />
         </div>
 
         <div className='search__popout'>
diff --git a/app/javascript/flavours/glitch/features/compose/components/search_results.jsx b/app/javascript/flavours/glitch/features/compose/components/search_results.jsx
index 0eb2239f802830..b759eac90b25de 100644
--- a/app/javascript/flavours/glitch/features/compose/components/search_results.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/search_results.jsx
@@ -13,7 +13,6 @@ import { Icon }  from 'flavours/glitch/components/icon';
 import { LoadMore } from 'flavours/glitch/components/load_more';
 import { SearchSection } from 'flavours/glitch/features/explore/components/search_section';
 
-
 import { ImmutableHashtag as Hashtag } from '../../../components/hashtag';
 import AccountContainer from '../../../containers/account_container';
 import StatusContainer from '../../../containers/status_container';
@@ -77,10 +76,10 @@ class SearchResults extends ImmutablePureComponent {
 
     return (
       <div className='search-results'>
-        <header className='search-results__header'>
+        <div className='search-results__header'>
           <Icon id='search' icon={SearchIcon} />
           <FormattedMessage id='explore.search_results' defaultMessage='Search results' />
-        </header>
+        </div>
 
         {accounts}
         {hashtags}
diff --git a/app/javascript/flavours/glitch/features/compose/components/textarea_icons.jsx b/app/javascript/flavours/glitch/features/compose/components/textarea_icons.jsx
deleted file mode 100644
index 74706833d91905..00000000000000
--- a/app/javascript/flavours/glitch/features/compose/components/textarea_icons.jsx
+++ /dev/null
@@ -1,59 +0,0 @@
-import PropTypes from 'prop-types';
-
-import { defineMessages, injectIntl } from 'react-intl';
-
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import ImmutablePureComponent from 'react-immutable-pure-component';
-
-import ForumIcon from '@/material-icons/400-24px/forum.svg?react';
-import HomeIcon from '@/material-icons/400-24px/home-fill.svg?react';
-import { Icon } from 'flavours/glitch/components/icon';
-
-
-const messages = defineMessages({
-  localOnly: {
-    defaultMessage: 'This post is local-only',
-    id: 'advanced_options.local-only.tooltip',
-  },
-  threadedMode: {
-    defaultMessage: 'Threaded mode enabled',
-    id: 'advanced_options.threaded_mode.tooltip',
-  },
-});
-
-//  We use an array of tuples here instead of an object because it
-//  preserves order.
-const iconMap = [
-  ['do_not_federate', 'home', HomeIcon, messages.localOnly],
-  ['threaded_mode', 'comments', ForumIcon, messages.threadedMode],
-];
-
-class TextareaIcons extends ImmutablePureComponent {
-
-  static propTypes = {
-    advancedOptions: ImmutablePropTypes.map,
-    intl: PropTypes.object.isRequired,
-  };
-
-  render () {
-    const { advancedOptions, intl } = this.props;
-    return (
-      <div className='compose-form__textarea-icons'>
-        {advancedOptions && iconMap.map(
-          ([key, icon, iconComponent, message]) => advancedOptions.get(key) && (
-            <span
-              className='textarea_icon'
-              key={key}
-              title={intl.formatMessage(message)}
-            >
-              <Icon id={icon} icon={iconComponent} />
-            </span>
-          ),
-        )}
-      </div>
-    );
-  }
-
-}
-
-export default injectIntl(TextareaIcons);
diff --git a/app/javascript/flavours/glitch/features/compose/components/upload.jsx b/app/javascript/flavours/glitch/features/compose/components/upload.jsx
index c317fc4fc13568..fd2d80e2f20cc6 100644
--- a/app/javascript/flavours/glitch/features/compose/components/upload.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/upload.jsx
@@ -12,7 +12,6 @@ import EditIcon from '@/material-icons/400-24px/edit.svg?react';
 import InfoIcon from '@/material-icons/400-24px/info.svg?react';
 import { Icon }  from 'flavours/glitch/components/icon';
 
-
 import Motion from '../../ui/util/optional_motion';
 
 export default class Upload extends ImmutablePureComponent {
diff --git a/app/javascript/flavours/glitch/features/compose/components/upload_button.jsx b/app/javascript/flavours/glitch/features/compose/components/upload_button.jsx
new file mode 100644
index 00000000000000..923d6a3c47e458
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/compose/components/upload_button.jsx
@@ -0,0 +1,87 @@
+import PropTypes from 'prop-types';
+
+import { defineMessages, injectIntl } from 'react-intl';
+
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import ImmutablePureComponent from 'react-immutable-pure-component';
+import { connect } from 'react-redux';
+
+import AddPhotoAlternateIcon from '@/material-icons/400-24px/add_photo_alternate.svg?react';
+
+import { IconButton } from '../../../components/icon_button';
+
+const messages = defineMessages({
+  upload: { id: 'upload_button.label', defaultMessage: 'Add images, a video or an audio file' },
+});
+
+const makeMapStateToProps = () => {
+  const mapStateToProps = state => ({
+    acceptContentTypes: state.getIn(['media_attachments', 'accept_content_types']),
+  });
+
+  return mapStateToProps;
+};
+
+const iconStyle = {
+  height: null,
+  lineHeight: '27px',
+};
+
+class UploadButton extends ImmutablePureComponent {
+
+  static propTypes = {
+    disabled: PropTypes.bool,
+    unavailable: PropTypes.bool,
+    onSelectFile: PropTypes.func.isRequired,
+    style: PropTypes.object,
+    resetFileKey: PropTypes.number,
+    acceptContentTypes: ImmutablePropTypes.listOf(PropTypes.string).isRequired,
+    intl: PropTypes.object.isRequired,
+  };
+
+  handleChange = (e) => {
+    if (e.target.files.length > 0) {
+      this.props.onSelectFile(e.target.files);
+    }
+  };
+
+  handleClick = () => {
+    this.fileElement.click();
+  };
+
+  setRef = (c) => {
+    this.fileElement = c;
+  };
+
+  render () {
+    const { intl, resetFileKey, unavailable, disabled, acceptContentTypes } = this.props;
+
+    if (unavailable) {
+      return null;
+    }
+
+    const message = intl.formatMessage(messages.upload);
+
+    return (
+      <div className='compose-form__upload-button'>
+        <IconButton icon='paperclip' iconComponent={AddPhotoAlternateIcon} title={message} disabled={disabled} onClick={this.handleClick} className='compose-form__upload-button-icon' size={18} inverted style={iconStyle} />
+        <label>
+          <span style={{ display: 'none' }}>{message}</span>
+          <input
+            key={resetFileKey}
+            ref={this.setRef}
+            type='file'
+            multiple
+            accept={acceptContentTypes.toArray().join(',')}
+            onChange={this.handleChange}
+            disabled={disabled}
+            style={{ display: 'none' }}
+          />
+        </label>
+      </div>
+    );
+  }
+
+}
+
+export default connect(makeMapStateToProps)(injectIntl(UploadButton));
diff --git a/app/javascript/flavours/glitch/features/compose/containers/compose_form_container.js b/app/javascript/flavours/glitch/features/compose/containers/compose_form_container.js
index c717058eafb087..ba20698bac8c5c 100644
--- a/app/javascript/flavours/glitch/features/compose/containers/compose_form_container.js
+++ b/app/javascript/flavours/glitch/features/compose/containers/compose_form_container.js
@@ -1,9 +1,5 @@
-import { defineMessages, injectIntl } from 'react-intl';
-
 import { connect } from 'react-redux';
 
-import { privacyPreference } from 'flavours/glitch/utils/privacy_preference';
-
 import {
   changeCompose,
   submitCompose,
@@ -11,53 +7,15 @@ import {
   fetchComposeSuggestions,
   selectComposeSuggestion,
   changeComposeSpoilerText,
-  changeComposeSpoilerness,
-  changeComposeVisibility,
   insertEmojiCompose,
   uploadCompose,
 } from '../../../actions/compose';
-import { changeLocalSetting } from '../../../actions/local_settings';
-import {
-  openModal,
-} from '../../../actions/modal';
 import ComposeForm from '../components/compose_form';
 
-const messages = defineMessages({
-  missingDescriptionMessage: {
-    id: 'confirmations.missing_media_description.message',
-    defaultMessage: 'At least one media attachment is lacking a description. Consider describing all media attachments for the visually impaired before sending your toot.',
-  },
-  missingDescriptionConfirm: {
-    id: 'confirmations.missing_media_description.confirm',
-    defaultMessage: 'Send anyway',
-  },
-  missingDescriptionEdit: {
-    id: 'confirmations.missing_media_description.edit',
-    defaultMessage: 'Edit media',
-  },
-});
-
-const sideArmPrivacy = state => {
-  const inReplyTo = state.getIn(['compose', 'in_reply_to']);
-  const replyPrivacy = inReplyTo ? state.getIn(['statuses', inReplyTo, 'visibility']) : null;
-  const sideArmBasePrivacy = state.getIn(['local_settings', 'side_arm']);
-  const sideArmRestrictedPrivacy = replyPrivacy ? privacyPreference(replyPrivacy, sideArmBasePrivacy) : null;
-  let sideArmPrivacy = null;
-  switch (state.getIn(['local_settings', 'side_arm_reply_mode'])) {
-  case 'copy':
-    sideArmPrivacy = replyPrivacy;
-    break;
-  case 'restrict':
-    sideArmPrivacy = sideArmRestrictedPrivacy;
-    break;
-  }
-  return sideArmPrivacy || sideArmBasePrivacy;
-};
-
 const mapStateToProps = state => ({
   text: state.getIn(['compose', 'text']),
   suggestions: state.getIn(['compose', 'suggestions']),
-  spoiler: state.getIn(['local_settings', 'always_show_spoilers_field']) || state.getIn(['compose', 'spoiler']),
+  spoiler: state.getIn(['compose', 'spoiler']),
   spoilerText: state.getIn(['compose', 'spoiler_text']),
   privacy: state.getIn(['compose', 'privacy']),
   focusDate: state.getIn(['compose', 'focusDate']),
@@ -70,17 +28,9 @@ const mapStateToProps = state => ({
   anyMedia: state.getIn(['compose', 'media_attachments']).size > 0,
   isInReply: state.getIn(['compose', 'in_reply_to']) !== null,
   lang: state.getIn(['compose', 'language']),
-  advancedOptions: state.getIn(['compose', 'advanced_options']),
-  media: state.getIn(['compose', 'media_attachments']),
-  sideArm: sideArmPrivacy(state),
-  sensitive: state.getIn(['compose', 'sensitive']),
-  showSearch: state.getIn(['search', 'submitted']) && !state.getIn(['search', 'hidden']),
-  spoilersAlwaysOn: state.getIn(['local_settings', 'always_show_spoilers_field']),
-  mediaDescriptionConfirmation: state.getIn(['local_settings', 'confirm_missing_media_description']),
-  preselectOnReply: state.getIn(['local_settings', 'preselect_on_reply']),
 });
 
-const mapDispatchToProps = (dispatch, { intl }) => ({
+const mapDispatchToProps = (dispatch) => ({
 
   onChange (text) {
     dispatch(changeCompose(text));
@@ -102,48 +52,18 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
     dispatch(selectComposeSuggestion(position, token, suggestion, path));
   },
 
-  onChangeSpoilerText (text) {
-    dispatch(changeComposeSpoilerText(text));
+  onChangeSpoilerText (checked) {
+    dispatch(changeComposeSpoilerText(checked));
   },
 
   onPaste (files) {
     dispatch(uploadCompose(files));
   },
 
-  onPickEmoji (position, emoji) {
-    dispatch(insertEmojiCompose(position, emoji));
-  },
-
-  onChangeSpoilerness() {
-    dispatch(changeComposeSpoilerness());
-  },
-
-  onChangeVisibility(value) {
-    dispatch(changeComposeVisibility(value));
-  },
-
-  onMediaDescriptionConfirm(routerHistory, mediaId, overriddenVisibility = null) {
-    dispatch(openModal({
-      modalType: 'CONFIRM',
-      modalProps: {
-        message: intl.formatMessage(messages.missingDescriptionMessage),
-        confirm: intl.formatMessage(messages.missingDescriptionConfirm),
-        onConfirm: () => {
-          if (overriddenVisibility) {
-            dispatch(changeComposeVisibility(overriddenVisibility));
-          }
-          dispatch(submitCompose(routerHistory));
-        },
-        secondary: intl.formatMessage(messages.missingDescriptionEdit),
-        onSecondary: () => dispatch(openModal({
-          modalType: 'FOCAL_POINT',
-          modalProps: { id: mediaId },
-        })),
-        onDoNotAsk: () => dispatch(changeLocalSetting(['confirm_missing_media_description'], false)),
-      },
-    }));
+  onPickEmoji (position, data, needsSpace) {
+    dispatch(insertEmojiCompose(position, data, needsSpace));
   },
 
 });
 
-export default injectIntl(connect(mapStateToProps, mapDispatchToProps)(ComposeForm));
+export default connect(mapStateToProps, mapDispatchToProps)(ComposeForm);
diff --git a/app/javascript/flavours/glitch/features/compose/containers/dropdown_container.js b/app/javascript/flavours/glitch/features/compose/containers/dropdown_container.js
deleted file mode 100644
index aa156b8e563df3..00000000000000
--- a/app/javascript/flavours/glitch/features/compose/containers/dropdown_container.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import { connect } from 'react-redux';
-
-import { openModal, closeModal } from 'flavours/glitch/actions/modal';
-import { isUserTouching } from 'flavours/glitch/is_mobile';
-
-import Dropdown from '../components/dropdown';
-
-const mapDispatchToProps = dispatch => ({
-  isUserTouching,
-  onModalOpen: props => dispatch(openModal({ modalType: 'ACTIONS', modalProps: props })),
-  onModalClose: () => dispatch(closeModal({ modalType: undefined, ignoreFocus: false })),
-});
-
-export default connect(null, mapDispatchToProps)(Dropdown);
diff --git a/app/javascript/flavours/glitch/features/compose/containers/header_container.js b/app/javascript/flavours/glitch/features/compose/containers/header_container.js
deleted file mode 100644
index 5b78c8b9cd0cd2..00000000000000
--- a/app/javascript/flavours/glitch/features/compose/containers/header_container.js
+++ /dev/null
@@ -1,42 +0,0 @@
-import { defineMessages, injectIntl } from 'react-intl';
-
-import { connect }   from 'react-redux';
-
-import { openModal } from 'flavours/glitch/actions/modal';
-import { logOut } from 'flavours/glitch/utils/log_out';
-
-import Header from '../components/header';
-
-const messages = defineMessages({
-  logoutMessage: { id: 'confirmations.logout.message', defaultMessage: 'Are you sure you want to log out?' },
-  logoutConfirm: { id: 'confirmations.logout.confirm', defaultMessage: 'Log out' },
-});
-
-const mapStateToProps = state => {
-  return {
-    columns: state.getIn(['settings', 'columns']),
-    unreadNotifications: state.getIn(['notifications', 'unread']),
-    showNotificationsBadge: state.getIn(['local_settings', 'notifications', 'tab_badge']),
-  };
-};
-
-const mapDispatchToProps = (dispatch, { intl }) => ({
-  onSettingsClick (e) {
-    e.preventDefault();
-    e.stopPropagation();
-    dispatch(openModal({ modalType: 'SETTINGS', modalProps: {} }));
-  },
-  onLogout () {
-    dispatch(openModal({
-      modalType: 'CONFIRM',
-      modalProps: {
-        message: intl.formatMessage(messages.logoutMessage),
-        confirm: intl.formatMessage(messages.logoutConfirm),
-        closeWhenConfirm: false,
-        onConfirm: () => logOut(),
-      },
-    }));
-  },
-});
-
-export default injectIntl(connect(mapStateToProps, mapDispatchToProps)(Header));
diff --git a/app/javascript/flavours/glitch/features/compose/containers/options_container.js b/app/javascript/flavours/glitch/features/compose/containers/options_container.js
deleted file mode 100644
index c44d3ce3050c90..00000000000000
--- a/app/javascript/flavours/glitch/features/compose/containers/options_container.js
+++ /dev/null
@@ -1,56 +0,0 @@
-import { connect } from 'react-redux';
-
-import {
-  changeComposeAdvancedOption,
-  changeComposeContentType,
-  addPoll,
-  removePoll,
-} from 'flavours/glitch/actions/compose';
-import { openModal } from 'flavours/glitch/actions/modal';
-
-import Options from '../components/options';
-
-function mapStateToProps (state) {
-  const poll = state.getIn(['compose', 'poll']);
-  const media = state.getIn(['compose', 'media_attachments']);
-  const pending_media = state.getIn(['compose', 'pending_media_attachments']);
-  return {
-    acceptContentTypes: state.getIn(['media_attachments', 'accept_content_types']).toArray().join(','),
-    resetFileKey: state.getIn(['compose', 'resetFileKey']),
-    hasPoll: !!poll,
-    allowMedia: !poll && (media ? media.size + pending_media < 4 && !media.some(item => ['video', 'audio'].includes(item.get('type'))) : pending_media < 4),
-    allowPoll: !(media && !!media.size),
-    showContentTypeChoice: state.getIn(['local_settings', 'show_content_type_choice']),
-    contentType: state.getIn(['compose', 'content_type']),
-  };
-}
-
-const mapDispatchToProps = (dispatch) => ({
-
-  onChangeAdvancedOption(option, value) {
-    dispatch(changeComposeAdvancedOption(option, value));
-  },
-
-  onChangeContentType(value) {
-    dispatch(changeComposeContentType(value));
-  },
-
-  onTogglePoll() {
-    dispatch((_, getState) => {
-      if (getState().getIn(['compose', 'poll'])) {
-        dispatch(removePoll());
-      } else {
-        dispatch(addPoll());
-      }
-    });
-  },
-
-  onDoodleOpen() {
-    dispatch(openModal({
-      modalType: 'DOODLE',
-      modalProps: { noEsc: true, noClose: true },
-    }));
-  },
-});
-
-export default connect(mapStateToProps, mapDispatchToProps)(Options);
diff --git a/app/javascript/flavours/glitch/features/compose/containers/poll_button_container.js b/app/javascript/flavours/glitch/features/compose/containers/poll_button_container.js
new file mode 100644
index 00000000000000..b7785ecbb42865
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/compose/containers/poll_button_container.js
@@ -0,0 +1,25 @@
+import { connect } from 'react-redux';
+
+import { addPoll, removePoll } from '../../../actions/compose';
+import PollButton from '../components/poll_button';
+
+const mapStateToProps = state => ({
+  unavailable: state.getIn(['compose', 'is_uploading']) || (state.getIn(['compose', 'media_attachments']).size > 0),
+  active: state.getIn(['compose', 'poll']) !== null,
+});
+
+const mapDispatchToProps = dispatch => ({
+
+  onClick () {
+    dispatch((_, getState) => {
+      if (getState().getIn(['compose', 'poll'])) {
+        dispatch(removePoll());
+      } else {
+        dispatch(addPoll());
+      }
+    });
+  },
+
+});
+
+export default connect(mapStateToProps, mapDispatchToProps)(PollButton);
diff --git a/app/javascript/flavours/glitch/features/compose/containers/search_container.js b/app/javascript/flavours/glitch/features/compose/containers/search_container.js
index 93b8645ac62f8b..d2da52c8c0c6e7 100644
--- a/app/javascript/flavours/glitch/features/compose/containers/search_container.js
+++ b/app/javascript/flavours/glitch/features/compose/containers/search_container.js
@@ -42,8 +42,8 @@ const mapDispatchToProps = dispatch => ({
     dispatch(showSearch());
   },
 
-  onOpenURL (routerHistory) {
-    dispatch(openURL(routerHistory));
+  onOpenURL (q, routerHistory) {
+    dispatch(openURL(q, routerHistory));
   },
 
   onClickSearchResult (q, type) {
diff --git a/app/javascript/flavours/glitch/features/compose/containers/sensitive_button_container.jsx b/app/javascript/flavours/glitch/features/compose/containers/sensitive_button_container.jsx
index 5a57332dd9336b..ad56ff1b929c9c 100644
--- a/app/javascript/flavours/glitch/features/compose/containers/sensitive_button_container.jsx
+++ b/app/javascript/flavours/glitch/features/compose/containers/sensitive_button_container.jsx
@@ -20,15 +20,11 @@ const messages = defineMessages({
   },
 });
 
-const mapStateToProps = state => {
-  const spoilersAlwaysOn = state.getIn(['local_settings', 'always_show_spoilers_field']);
-  const spoilerText = state.getIn(['compose', 'spoiler_text']);
-  return {
-    active: state.getIn(['compose', 'sensitive']) || (spoilersAlwaysOn && spoilerText && spoilerText.length > 0),
-    disabled: state.getIn(['compose', 'spoiler']),
-    mediaCount: state.getIn(['compose', 'media_attachments']).size,
-  };
-};
+const mapStateToProps = state => ({
+  active: state.getIn(['compose', 'sensitive']),
+  disabled: state.getIn(['compose', 'spoiler']),
+  mediaCount: state.getIn(['compose', 'media_attachments']).size,
+});
 
 const mapDispatchToProps = dispatch => ({
 
diff --git a/app/javascript/flavours/glitch/features/compose/containers/spoiler_button_container.js b/app/javascript/flavours/glitch/features/compose/containers/spoiler_button_container.js
new file mode 100644
index 00000000000000..b3d7a713355775
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/compose/containers/spoiler_button_container.js
@@ -0,0 +1,28 @@
+import { injectIntl, defineMessages } from 'react-intl';
+
+import { connect } from 'react-redux';
+
+import { changeComposeSpoilerness } from '../../../actions/compose';
+import TextIconButton from '../components/text_icon_button';
+
+const messages = defineMessages({
+  marked: { id: 'compose_form.spoiler.marked', defaultMessage: 'Text is hidden behind warning' },
+  unmarked: { id: 'compose_form.spoiler.unmarked', defaultMessage: 'Text is not hidden' },
+});
+
+const mapStateToProps = (state, { intl }) => ({
+  label: 'CW',
+  title: intl.formatMessage(state.getIn(['compose', 'spoiler']) ? messages.marked : messages.unmarked),
+  active: state.getIn(['compose', 'spoiler']),
+  ariaControls: 'cw-spoiler-input',
+});
+
+const mapDispatchToProps = dispatch => ({
+
+  onClick () {
+    dispatch(changeComposeSpoilerness());
+  },
+
+});
+
+export default injectIntl(connect(mapStateToProps, mapDispatchToProps)(TextIconButton));
diff --git a/app/javascript/flavours/glitch/features/compose/containers/upload_button_container.js b/app/javascript/flavours/glitch/features/compose/containers/upload_button_container.js
new file mode 100644
index 00000000000000..42195da617b94f
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/compose/containers/upload_button_container.js
@@ -0,0 +1,20 @@
+import { connect } from 'react-redux';
+
+import { uploadCompose } from '../../../actions/compose';
+import UploadButton from '../components/upload_button';
+
+const mapStateToProps = state => ({
+  disabled: state.getIn(['compose', 'is_uploading']) || (state.getIn(['compose', 'media_attachments']).size + state.getIn(['compose', 'pending_media_attachments']) > 3 || state.getIn(['compose', 'media_attachments']).some(m => ['video', 'audio'].includes(m.get('type')))),
+  unavailable: state.getIn(['compose', 'poll']) !== null,
+  resetFileKey: state.getIn(['compose', 'resetFileKey']),
+});
+
+const mapDispatchToProps = dispatch => ({
+
+  onSelectFile (files) {
+    dispatch(uploadCompose(files));
+  },
+
+});
+
+export default connect(mapStateToProps, mapDispatchToProps)(UploadButton);
diff --git a/app/javascript/flavours/glitch/features/compose/containers/warning_container.jsx b/app/javascript/flavours/glitch/features/compose/containers/warning_container.jsx
index f339ccdfbfaf1f..c3efe80e8cf575 100644
--- a/app/javascript/flavours/glitch/features/compose/containers/warning_container.jsx
+++ b/app/javascript/flavours/glitch/features/compose/containers/warning_container.jsx
@@ -5,7 +5,6 @@ import { FormattedMessage } from 'react-intl';
 import { connect } from 'react-redux';
 
 import { me } from 'flavours/glitch/initial_state';
-import { profileLink, privacyPolicyLink } from 'flavours/glitch/utils/backend_links';
 import { HASHTAG_PATTERN_REGEX } from 'flavours/glitch/utils/hashtags';
 
 import Warning from '../components/warning';
@@ -18,7 +17,7 @@ const mapStateToProps = state => ({
 
 const WarningWrapper = ({ needsLockWarning, hashtagWarning, directMessageWarning }) => {
   if (needsLockWarning) {
-    return <Warning message={<FormattedMessage id='compose_form.lock_disclaimer' defaultMessage='Your account is not {locked}. Anyone can follow you to view your follower-only posts.' values={{ locked: <a href={profileLink}><FormattedMessage id='compose_form.lock_disclaimer.lock' defaultMessage='locked' /></a> }} />} />;
+    return <Warning message={<FormattedMessage id='compose_form.lock_disclaimer' defaultMessage='Your account is not {locked}. Anyone can follow you to view your follower-only posts.' values={{ locked: <a href='/settings/profile'><FormattedMessage id='compose_form.lock_disclaimer.lock' defaultMessage='locked' /></a> }} />} />;
   }
 
   if (hashtagWarning) {
@@ -28,7 +27,7 @@ const WarningWrapper = ({ needsLockWarning, hashtagWarning, directMessageWarning
   if (directMessageWarning) {
     const message = (
       <span>
-        <FormattedMessage id='compose_form.encryption_warning' defaultMessage='Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.' /> {!!privacyPolicyLink && <a href={privacyPolicyLink} target='_blank'><FormattedMessage id='compose_form.direct_message_warning_learn_more' defaultMessage='Learn more' /></a>}
+        <FormattedMessage id='compose_form.encryption_warning' defaultMessage='Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.' /> <a href='/terms' target='_blank'><FormattedMessage id='compose_form.direct_message_warning_learn_more' defaultMessage='Learn more' /></a>
       </span>
     );
 
diff --git a/app/javascript/flavours/glitch/features/compose/index.jsx b/app/javascript/flavours/glitch/features/compose/index.jsx
index 86d5f31485e476..5bbb7fab96fe9d 100644
--- a/app/javascript/flavours/glitch/features/compose/index.jsx
+++ b/app/javascript/flavours/glitch/features/compose/index.jsx
@@ -3,93 +3,138 @@ import { PureComponent } from 'react';
 
 import { injectIntl, defineMessages } from 'react-intl';
 
-import classNames from 'classnames';
 import { Helmet } from 'react-helmet';
+import { Link } from 'react-router-dom';
 
+import ImmutablePropTypes from 'react-immutable-proptypes';
 import { connect } from 'react-redux';
 
 import spring from 'react-motion/lib/spring';
 
-import { mountCompose, unmountCompose, cycleElefriendCompose } from 'flavours/glitch/actions/compose';
+import PeopleIcon from '@/material-icons/400-24px/group.svg?react';
+import HomeIcon from '@/material-icons/400-24px/home-fill.svg?react';
+import LogoutIcon from '@/material-icons/400-24px/logout.svg?react';
+import MenuIcon from '@/material-icons/400-24px/menu.svg?react';
+import NotificationsIcon from '@/material-icons/400-24px/notifications-fill.svg?react';
+import PublicIcon from '@/material-icons/400-24px/public.svg?react';
+import SettingsIcon from '@/material-icons/400-24px/settings-fill.svg?react';
+import { openModal } from 'flavours/glitch/actions/modal';
 import Column from 'flavours/glitch/components/column';
+import { Icon }  from 'flavours/glitch/components/icon';
+import { logOut } from 'flavours/glitch/utils/log_out';
 
+import elephantUIPlane from '../../../../images/elephant_ui_plane.svg';
+import { changeComposing, mountCompose, unmountCompose } from '../../actions/compose';
 import { mascot } from '../../initial_state';
+import { isMobile } from '../../is_mobile';
 import Motion from '../ui/util/optional_motion';
 
 import ComposeFormContainer from './containers/compose_form_container';
-import HeaderContainer from './containers/header_container';
 import NavigationContainer from './containers/navigation_container';
 import SearchContainer from './containers/search_container';
 import SearchResultsContainer from './containers/search_results_container';
 
 const messages = defineMessages({
+  start: { id: 'getting_started.heading', defaultMessage: 'Getting started' },
+  home_timeline: { id: 'tabs_bar.home', defaultMessage: 'Home' },
+  notifications: { id: 'tabs_bar.notifications', defaultMessage: 'Notifications' },
+  public: { id: 'navigation_bar.public_timeline', defaultMessage: 'Federated timeline' },
+  community: { id: 'navigation_bar.community_timeline', defaultMessage: 'Local timeline' },
+  preferences: { id: 'navigation_bar.preferences', defaultMessage: 'Preferences' },
+  logout: { id: 'navigation_bar.logout', defaultMessage: 'Logout' },
   compose: { id: 'navigation_bar.compose', defaultMessage: 'Compose new post' },
+  logoutMessage: { id: 'confirmations.logout.message', defaultMessage: 'Are you sure you want to log out?' },
+  logoutConfirm: { id: 'confirmations.logout.confirm', defaultMessage: 'Log out' },
 });
 
 const mapStateToProps = (state, ownProps) => ({
-  elefriend: state.getIn(['compose', 'elefriend']),
+  columns: state.getIn(['settings', 'columns']),
   showSearch: ownProps.multiColumn ? state.getIn(['search', 'submitted']) && !state.getIn(['search', 'hidden']) : false,
 });
 
-const mapDispatchToProps = (dispatch) => ({
-  onClickElefriend () {
-    dispatch(cycleElefriendCompose());
-  },
-
-  onMount () {
-    dispatch(mountCompose());
-  },
-
-  onUnmount () {
-    dispatch(unmountCompose());
-  },
-});
-
 class Compose extends PureComponent {
 
   static propTypes = {
+    dispatch: PropTypes.func.isRequired,
+    columns: ImmutablePropTypes.list.isRequired,
     multiColumn: PropTypes.bool,
     showSearch: PropTypes.bool,
-    elefriend: PropTypes.number,
-    onClickElefriend: PropTypes.func,
-    onMount: PropTypes.func,
-    onUnmount: PropTypes.func,
     intl: PropTypes.object.isRequired,
   };
 
   componentDidMount () {
-    this.props.onMount();
+    const { dispatch } = this.props;
+    dispatch(mountCompose());
   }
 
   componentWillUnmount () {
-    this.props.onUnmount();
+    const { dispatch } = this.props;
+    dispatch(unmountCompose());
   }
 
+  handleLogoutClick = e => {
+    const { dispatch, intl } = this.props;
+
+    e.preventDefault();
+    e.stopPropagation();
+
+    dispatch(openModal({
+      modalType: 'CONFIRM',
+      modalProps: {
+        message: intl.formatMessage(messages.logoutMessage),
+        confirm: intl.formatMessage(messages.logoutConfirm),
+        closeWhenConfirm: false,
+        onConfirm: () => logOut(),
+      },
+    }));
+
+    return false;
+  };
+
+  onFocus = () => {
+    this.props.dispatch(changeComposing(true));
+  };
+
+  onBlur = () => {
+    this.props.dispatch(changeComposing(false));
+  };
+
   render () {
-    const {
-      elefriend,
-      intl,
-      multiColumn,
-      onClickElefriend,
-      showSearch,
-    } = this.props;
-    const computedClass = classNames('drawer', `mbstobon-${elefriend}`);
+    const { multiColumn, showSearch, intl } = this.props;
 
     if (multiColumn) {
-      return (
-        <div className={computedClass} role='region' aria-label={intl.formatMessage(messages.compose)}>
-          <HeaderContainer />
+      const { columns } = this.props;
 
-          {multiColumn && <SearchContainer />}
+      return (
+        <div className='drawer' role='region' aria-label={intl.formatMessage(messages.compose)}>
+          <nav className='drawer__header'>
+            <Link to='/getting-started' className='drawer__tab' title={intl.formatMessage(messages.start)} aria-label={intl.formatMessage(messages.start)}><Icon id='bars' icon={MenuIcon} /></Link>
+            {!columns.some(column => column.get('id') === 'HOME') && (
+              <Link to='/home' className='drawer__tab' title={intl.formatMessage(messages.home_timeline)} aria-label={intl.formatMessage(messages.home_timeline)}><Icon id='home' icon={HomeIcon} /></Link>
+            )}
+            {!columns.some(column => column.get('id') === 'NOTIFICATIONS') && (
+              <Link to='/notifications' className='drawer__tab' title={intl.formatMessage(messages.notifications)} aria-label={intl.formatMessage(messages.notifications)}><Icon id='bell' icon={NotificationsIcon} /></Link>
+            )}
+            {!columns.some(column => column.get('id') === 'COMMUNITY') && (
+              <Link to='/public/local' className='drawer__tab' title={intl.formatMessage(messages.community)} aria-label={intl.formatMessage(messages.community)}><Icon id='users' icon={PeopleIcon} /></Link>
+            )}
+            {!columns.some(column => column.get('id') === 'PUBLIC') && (
+              <Link to='/public' className='drawer__tab' title={intl.formatMessage(messages.public)} aria-label={intl.formatMessage(messages.public)}><Icon id='globe' icon={PublicIcon} /></Link>
+            )}
+            <a href='/settings/preferences' className='drawer__tab' title={intl.formatMessage(messages.preferences)} aria-label={intl.formatMessage(messages.preferences)}><Icon id='cog' icon={SettingsIcon} /></a>
+            <a href='/auth/sign_out' className='drawer__tab' title={intl.formatMessage(messages.logout)} aria-label={intl.formatMessage(messages.logout)} onClick={this.handleLogoutClick}><Icon id='sign-out' icon={LogoutIcon} /></a>
+          </nav>
+
+          {multiColumn && <SearchContainer /> }
 
           <div className='drawer__pager'>
-            <div className='drawer__inner'>
-              <NavigationContainer />
+            <div className='drawer__inner' onFocus={this.onFocus}>
+              <NavigationContainer onClose={this.onBlur} />
 
-              <ComposeFormContainer />
+              <ComposeFormContainer autoFocus={!isMobile(window.innerWidth)} />
 
               <div className='drawer__inner__mastodon'>
-                {mascot ? <img alt='' draggable='false' src={mascot} /> : <button className='mastodon' onClick={onClickElefriend} />}
+                <img alt='' draggable='false' src={mascot || elephantUIPlane} />
               </div>
             </div>
 
@@ -106,8 +151,8 @@ class Compose extends PureComponent {
     }
 
     return (
-      <Column>
-        <NavigationContainer />
+      <Column onFocus={this.onFocus}>
+        <NavigationContainer onClose={this.onBlur} />
         <ComposeFormContainer />
 
         <Helmet>
@@ -119,4 +164,4 @@ class Compose extends PureComponent {
 
 }
 
-export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(Compose));
+export default connect(mapStateToProps)(injectIntl(Compose));
diff --git a/app/javascript/flavours/glitch/reducers/compose.js b/app/javascript/flavours/glitch/reducers/compose.js
index 96e5a2d7a33ee1..8a221e64068551 100644
--- a/app/javascript/flavours/glitch/reducers/compose.js
+++ b/app/javascript/flavours/glitch/reducers/compose.js
@@ -34,6 +34,7 @@ import {
   COMPOSE_SPOILER_TEXT_CHANGE,
   COMPOSE_VISIBILITY_CHANGE,
   COMPOSE_LANGUAGE_CHANGE,
+  COMPOSE_COMPOSING_CHANGE,
   COMPOSE_CONTENT_TYPE_CHANGE,
   COMPOSE_EMOJI_INSERT,
   COMPOSE_UPLOAD_CHANGE_REQUEST,
@@ -87,9 +88,10 @@ const initialState = ImmutableMap({
   caretPosition: null,
   preselectDate: null,
   in_reply_to: null,
+  is_composing: false,
   is_submitting: false,
-  is_uploading: false,
   is_changing_upload: false,
+  is_uploading: false,
   progress: 0,
   isUploadingThumbnail: false,
   thumbnailProgress: 0,
@@ -252,7 +254,7 @@ function removeMedia(state, mediaId) {
 
 const insertSuggestion = (state, position, token, completion, path) => {
   return state.withMutations(map => {
-    map.updateIn(path, oldText => `${oldText.slice(0, position)}${completion}${completion[0] === ':' ? '\u200B' : ' '}${oldText.slice(position + token.length)}`);
+    map.updateIn(path, oldText => `${oldText.slice(0, position)}${completion} ${oldText.slice(position + token.length)}`);
     map.set('suggestion_token', null);
     map.set('suggestions', ImmutableList());
     if (path.length === 1 && path[0] === 'text') {
@@ -294,14 +296,15 @@ const sortHashtagsByUse = (state, tags) => {
   return sorted;
 };
 
-const insertEmoji = (state, position, emojiData) => {
-  const emoji = emojiData.native;
+const insertEmoji = (state, position, emojiData, needsSpace) => {
+  const oldText = state.get('text');
+  const emoji = needsSpace ? ' ' + emojiData.native : emojiData.native;
 
-  return state.withMutations(map => {
-    map.update('text', oldText => `${oldText.slice(0, position)}${emoji}\u200B${oldText.slice(position)}`);
-    map.set('focusDate', new Date());
-    map.set('caretPosition', position + emoji.length + 1);
-    map.set('idempotencyKey', uuid());
+  return state.merge({
+    text: `${oldText.slice(0, position)}${emoji} ${oldText.slice(position)}`,
+    focusDate: new Date(),
+    caretPosition: position + emoji.length + 1,
+    idempotencyKey: uuid(),
   });
 };
 
@@ -370,7 +373,9 @@ export default function compose(state = initialState, action) {
   case COMPOSE_MOUNT:
     return state.set('mounted', state.get('mounted') + 1);
   case COMPOSE_UNMOUNT:
-    return state.set('mounted', Math.max(state.get('mounted') - 1, 0));
+    return state
+      .set('mounted', Math.max(state.get('mounted') - 1, 0))
+      .set('is_composing', false);
   case COMPOSE_ADVANCED_OPTIONS_CHANGE:
     return state
       .set('advanced_options', state.get('advanced_options').set(action.option, !!overwrite(!state.getIn(['advanced_options', action.option]), action.value)))
@@ -408,6 +413,8 @@ export default function compose(state = initialState, action) {
     return state
       .set('text', action.text)
       .set('idempotencyKey', uuid());
+  case COMPOSE_COMPOSING_CHANGE:
+    return state.set('is_composing', action.value);
   case COMPOSE_CYCLE_ELEFRIEND:
     return state
       .set('elefriend', (state.get('elefriend') + 1) % totalElefriends);
@@ -553,7 +560,7 @@ export default function compose(state = initialState, action) {
       return state;
     }
   case COMPOSE_EMOJI_INSERT:
-    return insertEmoji(state, action.position, action.emoji);
+    return insertEmoji(state, action.position, action.emoji, action.needsSpace);
   case COMPOSE_UPLOAD_CHANGE_SUCCESS:
     return state
       .set('is_changing_upload', false)
diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index 954a014f3a77f7..54a119ded7eb94 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -648,6 +648,11 @@ body > [data-popper-placement] {
         padding: 10px;
         font-family: inherit;
 
+        .icon {
+          width: 15px;
+          height: 15px;
+        }
+
         &:hover,
         &:focus,
         &:active {
@@ -733,25 +738,9 @@ body > [data-popper-placement] {
     justify-content: flex-end;
     min-width: 0;
     flex: 0 0 auto;
-    column-gap: 5px;
 
     .compose-form__publish-button-wrapper {
-      padding-top: 10px;
-
-      button {
-        padding: 7px 10px;
-        text-align: center;
-
-        & > span {
-          display: flex;
-          gap: 5px;
-          align-items: center;
-        }
-      }
-
-      .side_arm {
-        height: 100%;
-      }
+      padding-top: 15px;
     }
   }
 }
@@ -774,28 +763,6 @@ body > [data-popper-placement] {
     opacity 0.4s ease;
 }
 
-.compose-form__textarea-icons {
-  display: block;
-  position: absolute;
-  top: 29px;
-  inset-inline-end: 5px;
-  bottom: 5px;
-  overflow: hidden;
-
-  & > .textarea_icon {
-    display: block;
-    margin-top: 2px;
-    margin-inline-start: 2px;
-    width: 24px;
-    height: 24px;
-    color: $lighter-text-color;
-    font-size: 18px;
-    line-height: 24px;
-    text-align: center;
-    opacity: 0.8;
-  }
-}
-
 .sign-in-banner {
   padding: 10px;
 
@@ -858,6 +825,7 @@ body > [data-popper-placement] {
   max-width: 100%;
   line-height: 24px;
   overflow: hidden;
+  padding-inline-end: 25px;
   text-decoration: none;
 }
 

From a6ed148769db8b27a9f4393b2270971e2a4a3677 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 22 Feb 2024 16:26:48 -0500
Subject: [PATCH 0212/2191] Use heredoc on the `HTML` blocks in verify link
 spec (#29365)

---
 spec/services/verify_link_service_spec.rb | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/spec/services/verify_link_service_spec.rb b/spec/services/verify_link_service_spec.rb
index d06344f9cc32cc..28950724208013 100644
--- a/spec/services/verify_link_service_spec.rb
+++ b/spec/services/verify_link_service_spec.rb
@@ -77,11 +77,11 @@
 
     context 'when a document is truncated but the link back is valid' do
       let(:html) do
-        "
+        <<-HTML
           <!doctype html>
           <body>
-            <a rel=\"me\" href=\"#{ActivityPub::TagManager.instance.url_for(account)}\">
-        "
+            <a rel="me" href="#{ActivityPub::TagManager.instance.url_for(account)}">
+        HTML
       end
 
       it 'marks the field as verified' do
@@ -91,11 +91,11 @@
 
     context 'when a link tag might be truncated' do
       let(:html) do
-        "
+        <<-HTML_TRUNCATED
           <!doctype html>
           <body>
-            <a rel=\"me\" href=\"#{ActivityPub::TagManager.instance.url_for(account)}\"
-        "
+            <a rel="me" href="#{ActivityPub::TagManager.instance.url_for(account)}"
+        HTML_TRUNCATED
       end
 
       it 'marks the field as not verified' do
@@ -166,7 +166,11 @@
       #
       # apparently github allows the user to enter website URLs with a single
       # slash and makes no attempts to correct that.
-      let(:html) { '<a href="http:/unrelated.example">Hello</a>' }
+      let(:html) do
+        <<-HTML
+          <a href="http:/unrelated.example">Hello</a>
+        HTML
+      end
 
       it 'does not crash' do
         # We could probably put more effort into perhaps auto-correcting the

From 9d8dfeb5fbbc274482489a3ac9f22dd736da156c Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 22 Feb 2024 22:27:24 +0100
Subject: [PATCH 0213/2191] Fix processing of `Link` objects in `Image` objects
 (#29335)

---
 .../activitypub/process_account_service.rb    | 11 +++++---
 .../process_account_service_spec.rb           | 27 +++++++++++++++++--
 2 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/app/services/activitypub/process_account_service.rb b/app/services/activitypub/process_account_service.rb
index 9e787ace508a0d..b667e97f4d8019 100644
--- a/app/services/activitypub/process_account_service.rb
+++ b/app/services/activitypub/process_account_service.rb
@@ -201,10 +201,15 @@ def image_url(key)
     value = first_of_value(@json[key])
 
     return if value.nil?
-    return value['url'] if value.is_a?(Hash)
 
-    image = fetch_resource_without_id_validation(value)
-    image['url'] if image
+    if value.is_a?(String)
+      value = fetch_resource_without_id_validation(value)
+      return if value.nil?
+    end
+
+    value = first_of_value(value['url']) if value.is_a?(Hash) && value['type'] == 'Image'
+    value = value['href'] if value.is_a?(Hash)
+    value if value.is_a?(String)
   end
 
   def public_key
diff --git a/spec/services/activitypub/process_account_service_spec.rb b/spec/services/activitypub/process_account_service_spec.rb
index 824577d1b0505f..b13869f357bba3 100644
--- a/spec/services/activitypub/process_account_service_spec.rb
+++ b/spec/services/activitypub/process_account_service_spec.rb
@@ -5,7 +5,7 @@
 RSpec.describe ActivityPub::ProcessAccountService, type: :service do
   subject { described_class.new }
 
-  context 'with property values' do
+  context 'with property values, an avatar, and a profile header' do
     let(:payload) do
       {
         id: 'https://foo.test',
@@ -16,10 +16,29 @@
           { type: 'PropertyValue', name: 'Occupation', value: 'Unit test' },
           { type: 'PropertyValue', name: 'non-string', value: %w(foo bar) },
         ],
+        image: {
+          type: 'Image',
+          mediaType: 'image/png',
+          url: 'https://foo.test/image.png',
+        },
+        icon: {
+          type: 'Image',
+          url: [
+            {
+              mediaType: 'image/png',
+              href: 'https://foo.test/icon.png',
+            },
+          ],
+        },
       }.with_indifferent_access
     end
 
-    it 'parses out of attachment' do
+    before do
+      stub_request(:get, 'https://foo.test/image.png').to_return(request_fixture('avatar.txt'))
+      stub_request(:get, 'https://foo.test/icon.png').to_return(request_fixture('avatar.txt'))
+    end
+
+    it 'parses property values, avatar and profile header as expected' do
       account = subject.call('alice', 'example.com', payload)
 
       expect(account.fields)
@@ -37,6 +56,10 @@
           name: eq('Occupation'),
           value: eq('Unit test')
         )
+      expect(account).to have_attributes(
+        avatar_remote_url: 'https://foo.test/icon.png',
+        header_remote_url: 'https://foo.test/image.png'
+      )
     end
   end
 

From 82e2370f5f2f18cab2839bf22a248cc7ba45355a Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 22 Feb 2024 22:34:08 +0100
Subject: [PATCH 0214/2191] Update dependency cssnano to v6.0.4 (#29367)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 57 +++++++++++++++++++++++++++++++------------------------
 1 file changed, 32 insertions(+), 25 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 0ab97ab5a1662b..5a8028a8903833 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6248,18 +6248,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cssnano-preset-default@npm:^6.0.3":
-  version: 6.0.3
-  resolution: "cssnano-preset-default@npm:6.0.3"
+"cssnano-preset-default@npm:^6.0.4":
+  version: 6.0.4
+  resolution: "cssnano-preset-default@npm:6.0.4"
   dependencies:
     css-declaration-sorter: "npm:^7.1.1"
     cssnano-utils: "npm:^4.0.1"
     postcss-calc: "npm:^9.0.1"
     postcss-colormin: "npm:^6.0.2"
-    postcss-convert-values: "npm:^6.0.2"
+    postcss-convert-values: "npm:^6.0.3"
     postcss-discard-comments: "npm:^6.0.1"
-    postcss-discard-duplicates: "npm:^6.0.1"
-    postcss-discard-empty: "npm:^6.0.1"
+    postcss-discard-duplicates: "npm:^6.0.2"
+    postcss-discard-empty: "npm:^6.0.2"
     postcss-discard-overridden: "npm:^6.0.1"
     postcss-merge-longhand: "npm:^6.0.2"
     postcss-merge-rules: "npm:^6.0.3"
@@ -6283,7 +6283,7 @@ __metadata:
     postcss-unique-selectors: "npm:^6.0.2"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/d100a1f8ab71adbb6df85e00f4a9e5d04ac06fc50343157eef853aded3f75dd0489dd845a5b2fb43ca701bd88c39c5aa88673f842bc1f94f4318c7b38ced1963
+  checksum: 10c0/8a1569756c2189d9db91b2bbd7bc44b39ec6c0bac8cb1a34ab37801b40626b372c2341e696f3a4dfe03ee0490f033299b5e5f9511e2d3572b9b5a2edb7a76e3b
   languageName: node
   linkType: hard
 
@@ -6297,14 +6297,14 @@ __metadata:
   linkType: hard
 
 "cssnano@npm:^6.0.1":
-  version: 6.0.3
-  resolution: "cssnano@npm:6.0.3"
+  version: 6.0.4
+  resolution: "cssnano@npm:6.0.4"
   dependencies:
-    cssnano-preset-default: "npm:^6.0.3"
-    lilconfig: "npm:^3.0.0"
+    cssnano-preset-default: "npm:^6.0.4"
+    lilconfig: "npm:^3.1.1"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/d1669eb987fd96159bae262ef2f76c1a64fffefe8fa593918a6bda377977798b60fb4a6a871a9b9a9deb11258130ee254fdb8c3144769b3060ad9f2a95a4ed0a
+  checksum: 10c0/734b8d1a925288a707fa73087b7ae340a93c59a1838ac897f470104bbebf8aa4fb2a24e190e50a4eea592b595bca0a2f25e8aedcf237ea1675c8d1e636f587a5
   languageName: node
   linkType: hard
 
@@ -10881,13 +10881,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lilconfig@npm:3.0.0, lilconfig@npm:^3.0.0":
+"lilconfig@npm:3.0.0":
   version: 3.0.0
   resolution: "lilconfig@npm:3.0.0"
   checksum: 10c0/7f5ee7a658dc016cacf146815e8d88b06f06f4402823b8b0934e305a57a197f55ccc9c5cd4fb5ea1b2b821c8ccaf2d54abd59602a4931af06eabda332388d3e6
   languageName: node
   linkType: hard
 
+"lilconfig@npm:^3.1.1":
+  version: 3.1.1
+  resolution: "lilconfig@npm:3.1.1"
+  checksum: 10c0/311b559794546894e3fe176663427326026c1c644145be9e8041c58e268aa9328799b8dfe7e4dd8c6a4ae305feae95a1c9e007db3569f35b42b6e1bc8274754c
+  languageName: node
+  linkType: hard
+
 "lines-and-columns@npm:^1.1.6":
   version: 1.2.4
   resolution: "lines-and-columns@npm:1.2.4"
@@ -12806,15 +12813,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-convert-values@npm:^6.0.2":
-  version: 6.0.2
-  resolution: "postcss-convert-values@npm:6.0.2"
+"postcss-convert-values@npm:^6.0.3":
+  version: 6.0.3
+  resolution: "postcss-convert-values@npm:6.0.3"
   dependencies:
     browserslist: "npm:^4.22.2"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/882d0b7839ef07ac8ffbf9cb48db0f610939a3496bd0321c7f23096ead676f13e09ab3d9c20ff3dbe2c887e855826051ca7dffeaffce5068cfdc9aaa573a3842
+  checksum: 10c0/614a24d4bc9142f277ed12eefe556eae6ad8292092953c8ebfcf518ef52e8de5dd337a9e915b64e712b8b95175ca0fd8d1b1e9e806d25a8e4f01c75d784f3118
   languageName: node
   linkType: hard
 
@@ -12827,21 +12834,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-discard-duplicates@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "postcss-discard-duplicates@npm:6.0.1"
+"postcss-discard-duplicates@npm:^6.0.2":
+  version: 6.0.2
+  resolution: "postcss-discard-duplicates@npm:6.0.2"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/b9ea10a3c7528bb1630613c11756f809a95da634822d943fa91b28f2a37787e7cdb9ff96deed9776e2c3753d35e42c8afd5074b630930df7b5150573d4beda23
+  checksum: 10c0/316b8263c3a06d3303288d99e093ed2922757222fe5ea457b70d8d3fccadf0a1a452a6cc3b8296e749e70b0a231b68a742f9e01c606baa7fe3e14327bae3094b
   languageName: node
   linkType: hard
 
-"postcss-discard-empty@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "postcss-discard-empty@npm:6.0.1"
+"postcss-discard-empty@npm:^6.0.2":
+  version: 6.0.2
+  resolution: "postcss-discard-empty@npm:6.0.2"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/6b95e588a3e8fb262e56bd313060daf29d7c9d44184bb6c4c5858ae81d6cd2907b15b3e3023b6621d50a67cfc10e6077920ff1e908892b207dee29477376498f
+  checksum: 10c0/abae41eecf93ed7b2b34bb77d319d70093e663ee4b23dc0b1e0007044bbf4315d980539bb67466a8ed24a475afdd52bd465f92433466cf3bf2057591c7124ab1
   languageName: node
   linkType: hard
 

From 45f71e39541468d417c15b699f3f7a05639a2641 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 22 Feb 2024 16:35:14 -0500
Subject: [PATCH 0215/2191] Update `@rails/ujs` to version 7.1.3-2 (#29359)

---
 package.json |  2 +-
 yarn.lock    | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 3e0bdc35ae4d1c..af83867fe88c24 100644
--- a/package.json
+++ b/package.json
@@ -49,7 +49,7 @@
     "@formatjs/intl-pluralrules": "^5.2.2",
     "@gamestdio/websocket": "^0.3.2",
     "@github/webauthn-json": "^2.1.1",
-    "@rails/ujs": "^7.1.1",
+    "@rails/ujs": "7.1.3-2",
     "@reduxjs/toolkit": "^2.0.1",
     "@svgr/webpack": "^5.5.0",
     "arrow-key-navigation": "^1.2.0",
diff --git a/yarn.lock b/yarn.lock
index 5a8028a8903833..5834f5566dcaf9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2299,7 +2299,7 @@ __metadata:
     "@formatjs/intl-pluralrules": "npm:^5.2.2"
     "@gamestdio/websocket": "npm:^0.3.2"
     "@github/webauthn-json": "npm:^2.1.1"
-    "@rails/ujs": "npm:^7.1.1"
+    "@rails/ujs": "npm:7.1.3-2"
     "@reduxjs/toolkit": "npm:^2.0.1"
     "@svgr/webpack": "npm:^5.5.0"
     "@testing-library/jest-dom": "npm:^6.0.0"
@@ -2600,10 +2600,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rails/ujs@npm:^7.1.1":
-  version: 7.1.3
-  resolution: "@rails/ujs@npm:7.1.3"
-  checksum: 10c0/68112d9add9dbc59b40c2ec1bc095a67445c57d20d0ab7d817ce3de0cd90374e2690af8ad54ce6ecc2d1c748b34c0c44d0fbd2f515ce2c443d7c5d23d00b9ce5
+"@rails/ujs@npm:7.1.3-2":
+  version: 7.1.3-2
+  resolution: "@rails/ujs@npm:7.1.3-2"
+  checksum: 10c0/8bd5b3a409c62f53790ed7e914f1f48235f461a472da7b4ce1d9ad57356fcdeaa7891c946298f7f620ff0ff7c6d5b995bf44057929c4fce796867a8cf4f27c99
   languageName: node
   linkType: hard
 

From 9c10aaa4d5bed500c074c1bef3caaa1e84949c00 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 25 Jan 2024 16:41:31 +0100
Subject: [PATCH 0216/2191] [Glitch] Change design of compose form in web UI

Port 6936e5aa693ccc4aabd26ef18a65fbb8132f6f74 to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/components/account.jsx    |    8 +-
 .../glitch/components/autosuggest_emoji.jsx   |    2 +-
 .../glitch/components/autosuggest_hashtag.tsx |   37 +-
 .../glitch/components/autosuggest_input.jsx   |   61 +-
 .../components/autosuggest_textarea.jsx       |   69 +-
 .../glitch/components/dropdown_menu.jsx       |    2 +-
 .../glitch/components/visibility_icon.tsx     |   13 +-
 .../glitch/containers/compose_container.jsx   |   40 +-
 .../compose/components/action_bar.jsx         |   99 +-
 .../components/autosuggest_account.jsx        |    2 +-
 .../compose/components/character_counter.jsx  |   28 +-
 .../compose/components/compose_form.jsx       |  162 +--
 .../compose/components/edit_indicator.jsx     |   62 +
 .../components/emoji_picker_dropdown.jsx      |   24 +-
 .../compose/components/language_dropdown.jsx  |   37 +-
 .../compose/components/navigation_bar.jsx     |   68 +-
 .../compose/components/poll_button.jsx        |   12 +-
 .../features/compose/components/poll_form.jsx |  313 ++--
 .../compose/components/privacy_dropdown.jsx   |   76 +-
 .../compose/components/reply_indicator.jsx    |   94 +-
 .../features/compose/components/upload.jsx    |   28 +-
 .../compose/components/upload_button.jsx      |   14 +-
 .../compose/components/upload_form.jsx        |   19 +-
 .../compose/components/upload_progress.jsx    |    4 +-
 .../containers/navigation_container.js        |   36 -
 .../containers/poll_button_container.js       |    2 +-
 .../compose/containers/poll_form_container.js |   53 -
 .../containers/reply_indicator_container.js   |   36 -
 .../containers/sensitive_button_container.jsx |   73 -
 .../containers/spoiler_button_container.js    |   10 +-
 .../containers/upload_button_container.js     |    3 +-
 .../compose/containers/upload_container.js    |    1 +
 .../glitch/features/compose/index.jsx         |    4 -
 .../glitch/features/getting_started/index.jsx |    2 +-
 .../features/local_settings/page/index.jsx    |    6 +-
 .../features/standalone/compose/index.jsx     |   36 +-
 .../features/ui/components/compose_panel.jsx  |    6 +-
 .../ui/components/focal_point_modal.jsx       |    2 +-
 .../features/ui/components/mute_modal.jsx     |    1 -
 .../flavours/glitch/locales/en.json           |   20 -
 .../flavours/glitch/packs/share.jsx           |    4 +-
 .../flavours/glitch/reducers/compose.js       |   20 +-
 .../flavours/glitch/styles/_mixins.scss       |    5 +-
 .../flavours/glitch/styles/admin.scss         |    6 +
 .../flavours/glitch/styles/basics.scss        |    2 +-
 .../flavours/glitch/styles/components.scss    | 1282 ++++++++++-------
 .../flavours/glitch/styles/containers.scss    |   21 +-
 .../flavours/glitch/styles/contrast/diff.scss |   37 +-
 .../flavours/glitch/styles/emoji_picker.scss  |   30 +-
 .../glitch/styles/mastodon-light/diff.scss    |  153 +-
 .../styles/mastodon-light/variables.scss      |    7 +-
 .../flavours/glitch/styles/modal.scss         |    2 +-
 .../flavours/glitch/styles/polls.scss         |  127 +-
 53 files changed, 1490 insertions(+), 1771 deletions(-)
 create mode 100644 app/javascript/flavours/glitch/features/compose/components/edit_indicator.jsx
 delete mode 100644 app/javascript/flavours/glitch/features/compose/containers/navigation_container.js
 delete mode 100644 app/javascript/flavours/glitch/features/compose/containers/poll_form_container.js
 delete mode 100644 app/javascript/flavours/glitch/features/compose/containers/reply_indicator_container.js
 delete mode 100644 app/javascript/flavours/glitch/features/compose/containers/sensitive_button_container.jsx

diff --git a/app/javascript/flavours/glitch/components/account.jsx b/app/javascript/flavours/glitch/components/account.jsx
index fd7caea6df99a9..7e5209653eb333 100644
--- a/app/javascript/flavours/glitch/components/account.jsx
+++ b/app/javascript/flavours/glitch/components/account.jsx
@@ -37,10 +37,10 @@ class Account extends ImmutablePureComponent {
   static propTypes = {
     size: PropTypes.number,
     account: ImmutablePropTypes.record,
-    onFollow: PropTypes.func.isRequired,
-    onBlock: PropTypes.func.isRequired,
-    onMute: PropTypes.func.isRequired,
-    onMuteNotifications: PropTypes.func.isRequired,
+    onFollow: PropTypes.func,
+    onBlock: PropTypes.func,
+    onMute: PropTypes.func,
+    onMuteNotifications: PropTypes.func,
     intl: PropTypes.object.isRequired,
     hidden: PropTypes.bool,
     minimal: PropTypes.bool,
diff --git a/app/javascript/flavours/glitch/components/autosuggest_emoji.jsx b/app/javascript/flavours/glitch/components/autosuggest_emoji.jsx
index eb25f5a6436786..892d068b319249 100644
--- a/app/javascript/flavours/glitch/components/autosuggest_emoji.jsx
+++ b/app/javascript/flavours/glitch/components/autosuggest_emoji.jsx
@@ -35,7 +35,7 @@ export default class AutosuggestEmoji extends PureComponent {
           alt={emoji.native || emoji.colons}
         />
 
-        {emoji.colons}
+        <div className='autosuggest-emoji__name'>{emoji.colons}</div>
       </div>
     );
   }
diff --git a/app/javascript/flavours/glitch/components/autosuggest_hashtag.tsx b/app/javascript/flavours/glitch/components/autosuggest_hashtag.tsx
index 6da620014262bb..808f303754e65d 100644
--- a/app/javascript/flavours/glitch/components/autosuggest_hashtag.tsx
+++ b/app/javascript/flavours/glitch/components/autosuggest_hashtag.tsx
@@ -1,5 +1,3 @@
-import { FormattedMessage } from 'react-intl';
-
 import { ShortNumber } from 'flavours/glitch/components/short_number';
 
 interface Props {
@@ -16,27 +14,18 @@ interface Props {
   };
 }
 
-export const AutosuggestHashtag: React.FC<Props> = ({ tag }) => {
-  const weeklyUses = tag.history && (
-    <ShortNumber
-      value={tag.history.reduce((total, day) => total + day.uses * 1, 0)}
-    />
-  );
+export const AutosuggestHashtag: React.FC<Props> = ({ tag }) => (
+  <div className='autosuggest-hashtag'>
+    <div className='autosuggest-hashtag__name'>
+      #<strong>{tag.name}</strong>
+    </div>
 
-  return (
-    <div className='autosuggest-hashtag'>
-      <div className='autosuggest-hashtag__name'>
-        #<strong>{tag.name}</strong>
+    {tag.history !== undefined && (
+      <div className='autosuggest-hashtag__uses'>
+        <ShortNumber
+          value={tag.history.reduce((total, day) => total + day.uses * 1, 0)}
+        />
       </div>
-      {tag.history !== undefined && (
-        <div className='autosuggest-hashtag__uses'>
-          <FormattedMessage
-            id='autosuggest_hashtag.per_week'
-            defaultMessage='{count} per week'
-            values={{ count: weeklyUses }}
-          />
-        </div>
-      )}
-    </div>
-  );
-};
+    )}
+  </div>
+);
diff --git a/app/javascript/flavours/glitch/components/autosuggest_input.jsx b/app/javascript/flavours/glitch/components/autosuggest_input.jsx
index 6d2474b4426bb0..97da532ebba265 100644
--- a/app/javascript/flavours/glitch/components/autosuggest_input.jsx
+++ b/app/javascript/flavours/glitch/components/autosuggest_input.jsx
@@ -5,6 +5,8 @@ import classNames from 'classnames';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
+import Overlay from 'react-overlays/Overlay';
+
 import AutosuggestAccountContainer from '../features/compose/containers/autosuggest_account_container';
 
 import AutosuggestEmoji from './autosuggest_emoji';
@@ -195,34 +197,37 @@ export default class AutosuggestInput extends ImmutablePureComponent {
 
     return (
       <div className='autosuggest-input'>
-        <label>
-          <span style={{ display: 'none' }}>{placeholder}</span>
-
-          <input
-            type='text'
-            ref={this.setInput}
-            disabled={disabled}
-            placeholder={placeholder}
-            autoFocus={autoFocus}
-            value={value}
-            onChange={this.onChange}
-            onKeyDown={this.onKeyDown}
-            onKeyUp={onKeyUp}
-            onFocus={this.onFocus}
-            onBlur={this.onBlur}
-            dir='auto'
-            aria-autocomplete='list'
-            id={id}
-            className={className}
-            maxLength={maxLength}
-            lang={lang}
-            spellCheck={spellCheck}
-          />
-        </label>
-
-        <div className={`autosuggest-textarea__suggestions ${suggestionsHidden || suggestions.isEmpty() ? '' : 'autosuggest-textarea__suggestions--visible'}`}>
-          {suggestions.map(this.renderSuggestion)}
-        </div>
+        <input
+          type='text'
+          ref={this.setInput}
+          disabled={disabled}
+          placeholder={placeholder}
+          autoFocus={autoFocus}
+          value={value}
+          onChange={this.onChange}
+          onKeyDown={this.onKeyDown}
+          onKeyUp={onKeyUp}
+          onFocus={this.onFocus}
+          onBlur={this.onBlur}
+          dir='auto'
+          aria-autocomplete='list'
+          aria-label={placeholder}
+          id={id}
+          className={className}
+          maxLength={maxLength}
+          lang={lang}
+          spellCheck={spellCheck}
+        />
+
+        <Overlay show={!(suggestionsHidden || suggestions.isEmpty())} offset={[0, 0]} placement='bottom' target={this.input} popperConfig={{ strategy: 'fixed' }}>
+          {({ props }) => (
+            <div {...props}>
+              <div className='autosuggest-textarea__suggestions' style={{ width: this.input?.clientWidth }}>
+                {suggestions.map(this.renderSuggestion)}
+              </div>
+            </div>
+          )}
+        </Overlay>
       </div>
     );
   }
diff --git a/app/javascript/flavours/glitch/components/autosuggest_textarea.jsx b/app/javascript/flavours/glitch/components/autosuggest_textarea.jsx
index 28384075c3c16e..9fd199a21c47b7 100644
--- a/app/javascript/flavours/glitch/components/autosuggest_textarea.jsx
+++ b/app/javascript/flavours/glitch/components/autosuggest_textarea.jsx
@@ -5,6 +5,7 @@ import classNames from 'classnames';
 
 import ImmutablePropTypes from 'react-immutable-proptypes';
 
+import Overlay from 'react-overlays/Overlay';
 import Textarea from 'react-textarea-autosize';
 
 import AutosuggestAccountContainer from '../features/compose/containers/autosuggest_account_container';
@@ -52,7 +53,6 @@ const AutosuggestTextarea = forwardRef(({
   onFocus,
   autoFocus = true,
   lang,
-  children,
 }, textareaRef) => {
 
   const [suggestionsHidden, setSuggestionsHidden] = useState(true);
@@ -183,40 +183,38 @@ const AutosuggestTextarea = forwardRef(({
     );
   };
 
-  return [
-    <div className='compose-form__autosuggest-wrapper' key='autosuggest-wrapper'>
-      <div className='autosuggest-textarea'>
-        <label>
-          <span style={{ display: 'none' }}>{placeholder}</span>
-
-          <Textarea
-            ref={textareaRef}
-            className='autosuggest-textarea__textarea'
-            disabled={disabled}
-            placeholder={placeholder}
-            autoFocus={autoFocus}
-            value={value}
-            onChange={handleChange}
-            onKeyDown={handleKeyDown}
-            onKeyUp={onKeyUp}
-            onFocus={handleFocus}
-            onBlur={handleBlur}
-            onPaste={handlePaste}
-            dir='auto'
-            aria-autocomplete='list'
-            lang={lang}
-          />
-        </label>
-      </div>
-      {children}
-    </div>,
-
-    <div className='autosuggest-textarea__suggestions-wrapper' key='suggestions-wrapper'>
-      <div className={`autosuggest-textarea__suggestions ${suggestionsHidden || suggestions.isEmpty() ? '' : 'autosuggest-textarea__suggestions--visible'}`}>
-        {suggestions.map(renderSuggestion)}
-      </div>
-    </div>,
-  ];
+  return (
+    <div className='autosuggest-textarea'>
+      <Textarea
+        ref={textareaRef}
+        className='autosuggest-textarea__textarea'
+        disabled={disabled}
+        placeholder={placeholder}
+        autoFocus={autoFocus}
+        value={value}
+        onChange={handleChange}
+        onKeyDown={handleKeyDown}
+        onKeyUp={onKeyUp}
+        onFocus={handleFocus}
+        onBlur={handleBlur}
+        onPaste={handlePaste}
+        dir='auto'
+        aria-autocomplete='list'
+        aria-label={placeholder}
+        lang={lang}
+      />
+
+      <Overlay show={!(suggestionsHidden || suggestions.isEmpty())} offset={[0, 0]} placement='bottom' target={textareaRef} popperConfig={{ strategy: 'fixed' }}>
+        {({ props }) => (
+          <div {...props}>
+            <div className='autosuggest-textarea__suggestions' style={{ width: textareaRef.current?.clientWidth }}>
+              {suggestions.map(renderSuggestion)}
+            </div>
+          </div>
+        )}
+      </Overlay>
+    </div>
+  );
 });
 
 AutosuggestTextarea.propTypes = {
@@ -232,7 +230,6 @@ AutosuggestTextarea.propTypes = {
   onKeyDown: PropTypes.func,
   onPaste: PropTypes.func.isRequired,
   onFocus:PropTypes.func,
-  children: PropTypes.node,
   autoFocus: PropTypes.bool,
   lang: PropTypes.string,
 };
diff --git a/app/javascript/flavours/glitch/components/dropdown_menu.jsx b/app/javascript/flavours/glitch/components/dropdown_menu.jsx
index bfaa53f6e5b8a5..4d9c34a7628227 100644
--- a/app/javascript/flavours/glitch/components/dropdown_menu.jsx
+++ b/app/javascript/flavours/glitch/components/dropdown_menu.jsx
@@ -165,7 +165,7 @@ class Dropdown extends PureComponent {
     children: PropTypes.node,
     icon: PropTypes.string,
     iconComponent: PropTypes.func,
-    items: PropTypes.oneOfType([PropTypes.array, ImmutablePropTypes.list]).isRequired,
+    items: PropTypes.oneOfType([PropTypes.array, ImmutablePropTypes.list]),
     loading: PropTypes.bool,
     size: PropTypes.number,
     title: PropTypes.string,
diff --git a/app/javascript/flavours/glitch/components/visibility_icon.tsx b/app/javascript/flavours/glitch/components/visibility_icon.tsx
index baf134c0aeaf2f..dd24c5c9272dbe 100644
--- a/app/javascript/flavours/glitch/components/visibility_icon.tsx
+++ b/app/javascript/flavours/glitch/components/visibility_icon.tsx
@@ -1,9 +1,9 @@
 import { defineMessages, useIntl } from 'react-intl';
 
 import LockIcon from '@/material-icons/400-24px/lock.svg?react';
-import LockOpenIcon from '@/material-icons/400-24px/lock_open.svg?react';
 import MailIcon from '@/material-icons/400-24px/mail.svg?react';
 import PublicIcon from '@/material-icons/400-24px/public.svg?react';
+import QuietTimeIcon from '@/material-icons/400-24px/quiet_time.svg?react';
 
 import { Icon } from './icon';
 
@@ -11,14 +11,17 @@ type Visibility = 'public' | 'unlisted' | 'private' | 'direct';
 
 const messages = defineMessages({
   public_short: { id: 'privacy.public.short', defaultMessage: 'Public' },
-  unlisted_short: { id: 'privacy.unlisted.short', defaultMessage: 'Unlisted' },
+  unlisted_short: {
+    id: 'privacy.unlisted.short',
+    defaultMessage: 'Quiet public',
+  },
   private_short: {
     id: 'privacy.private.short',
-    defaultMessage: 'Followers only',
+    defaultMessage: 'Followers',
   },
   direct_short: {
     id: 'privacy.direct.short',
-    defaultMessage: 'Mentioned people only',
+    defaultMessage: 'Specific people',
   },
 });
 
@@ -35,7 +38,7 @@ export const VisibilityIcon: React.FC<{ visibility: Visibility }> = ({
     },
     unlisted: {
       icon: 'unlock',
-      iconComponent: LockOpenIcon,
+      iconComponent: QuietTimeIcon,
       text: intl.formatMessage(messages.unlisted_short),
     },
     private: {
diff --git a/app/javascript/flavours/glitch/containers/compose_container.jsx b/app/javascript/flavours/glitch/containers/compose_container.jsx
index f76550678ed2e1..772ac5fa6b5eaf 100644
--- a/app/javascript/flavours/glitch/containers/compose_container.jsx
+++ b/app/javascript/flavours/glitch/containers/compose_container.jsx
@@ -1,14 +1,12 @@
-import { PureComponent } from 'react';
-
 import { Provider } from 'react-redux';
 
-import { fetchCustomEmojis } from '../actions/custom_emojis';
-import { hydrateStore } from '../actions/store';
-import Compose from '../features/standalone/compose';
-import initialState from '../initial_state';
-import { IntlProvider } from '../locales';
-import { store } from '../store';
-
+import { fetchCustomEmojis } from 'flavours/glitch/actions/custom_emojis';
+import { hydrateStore } from 'flavours/glitch/actions/store';
+import { Router } from 'flavours/glitch/components/router';
+import Compose from 'flavours/glitch/features/standalone/compose';
+import initialState from 'flavours/glitch/initial_state';
+import { IntlProvider } from 'flavours/glitch/locales';
+import { store } from 'flavours/glitch/store';
 
 if (initialState) {
   store.dispatch(hydrateStore(initialState));
@@ -16,16 +14,14 @@ if (initialState) {
 
 store.dispatch(fetchCustomEmojis());
 
-export default class ComposeContainer extends PureComponent {
-
-  render () {
-    return (
-      <IntlProvider>
-        <Provider store={store}>
-          <Compose />
-        </Provider>
-      </IntlProvider>
-    );
-  }
-
-}
+const ComposeContainer = () => (
+  <IntlProvider>
+    <Provider store={store}>
+      <Router>
+        <Compose />
+      </Router>
+    </Provider>
+  </IntlProvider>
+);
+
+export default ComposeContainer;
diff --git a/app/javascript/flavours/glitch/features/compose/components/action_bar.jsx b/app/javascript/flavours/glitch/features/compose/components/action_bar.jsx
index 411ad77c79c0be..7fda25ded59854 100644
--- a/app/javascript/flavours/glitch/features/compose/components/action_bar.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/action_bar.jsx
@@ -1,13 +1,13 @@
-import PropTypes from 'prop-types';
-import { PureComponent } from 'react';
+import { useCallback } from 'react';
 
-import { defineMessages, injectIntl } from 'react-intl';
+import { defineMessages, useIntl } from 'react-intl';
 
-import ImmutablePropTypes from 'react-immutable-proptypes';
+import { useDispatch } from 'react-redux';
 
-import MenuIcon from '@/material-icons/400-24px/menu.svg?react';
-
-import DropdownMenuContainer from '../../../containers/dropdown_menu_container';
+import MoreHorizIcon from '@/material-icons/400-24px/more_horiz.svg?react';
+import { openModal } from 'flavours/glitch/actions/modal';
+import DropdownMenuContainer from 'flavours/glitch/containers/dropdown_menu_container';
+import { logOut } from 'flavours/glitch/utils/log_out';
 
 const messages = defineMessages({
   edit_profile: { id: 'account.edit_profile', defaultMessage: 'Edit profile' },
@@ -23,51 +23,52 @@ const messages = defineMessages({
   filters: { id: 'navigation_bar.filters', defaultMessage: 'Muted words' },
   logout: { id: 'navigation_bar.logout', defaultMessage: 'Logout' },
   bookmarks: { id: 'navigation_bar.bookmarks', defaultMessage: 'Bookmarks' },
+  logoutMessage: { id: 'confirmations.logout.message', defaultMessage: 'Are you sure you want to log out?' },
+  logoutConfirm: { id: 'confirmations.logout.confirm', defaultMessage: 'Log out' },
 });
 
-class ActionBar extends PureComponent {
-
-  static propTypes = {
-    account: ImmutablePropTypes.record.isRequired,
-    onLogout: PropTypes.func.isRequired,
-    intl: PropTypes.object.isRequired,
-  };
-
-  handleLogout = () => {
-    this.props.onLogout();
-  };
-
-  render () {
-    const { intl } = this.props;
-
-    let menu = [];
+export const ActionBar = () => {
+  const dispatch = useDispatch();
+  const intl = useIntl();
 
-    menu.push({ text: intl.formatMessage(messages.edit_profile), href: '/settings/profile' });
-    menu.push({ text: intl.formatMessage(messages.preferences), href: '/settings/preferences' });
-    menu.push({ text: intl.formatMessage(messages.pins), to: '/pinned' });
-    menu.push(null);
-    menu.push({ text: intl.formatMessage(messages.follow_requests), to: '/follow_requests' });
-    menu.push({ text: intl.formatMessage(messages.favourites), to: '/favourites' });
-    menu.push({ text: intl.formatMessage(messages.bookmarks), to: '/bookmarks' });
-    menu.push({ text: intl.formatMessage(messages.lists), to: '/lists' });
-    menu.push({ text: intl.formatMessage(messages.followed_tags), to: '/followed_tags' });
-    menu.push(null);
-    menu.push({ text: intl.formatMessage(messages.mutes), to: '/mutes' });
-    menu.push({ text: intl.formatMessage(messages.blocks), to: '/blocks' });
-    menu.push({ text: intl.formatMessage(messages.domain_blocks), to: '/domain_blocks' });
-    menu.push({ text: intl.formatMessage(messages.filters), href: '/filters' });
-    menu.push(null);
-    menu.push({ text: intl.formatMessage(messages.logout), action: this.handleLogout });
+  const handleLogoutClick = useCallback(() => {
+    dispatch(openModal({
+      modalType: 'CONFIRM',
+      modalProps: {
+        message: intl.formatMessage(messages.logoutMessage),
+        confirm: intl.formatMessage(messages.logoutConfirm),
+        closeWhenConfirm: false,
+        onConfirm: () => logOut(),
+      },
+    }));
+  }, [dispatch, intl]);
 
-    return (
-      <div className='compose__action-bar'>
-        <div className='compose__action-bar-dropdown'>
-          <DropdownMenuContainer items={menu} icon='bars' iconComponent={MenuIcon} size={24} direction='right' />
-        </div>
-      </div>
-    );
-  }
+  let menu = [];
 
-}
+  menu.push({ text: intl.formatMessage(messages.edit_profile), href: '/settings/profile' });
+  menu.push({ text: intl.formatMessage(messages.preferences), href: '/settings/preferences' });
+  menu.push({ text: intl.formatMessage(messages.pins), to: '/pinned' });
+  menu.push(null);
+  menu.push({ text: intl.formatMessage(messages.follow_requests), to: '/follow_requests' });
+  menu.push({ text: intl.formatMessage(messages.favourites), to: '/favourites' });
+  menu.push({ text: intl.formatMessage(messages.bookmarks), to: '/bookmarks' });
+  menu.push({ text: intl.formatMessage(messages.lists), to: '/lists' });
+  menu.push({ text: intl.formatMessage(messages.followed_tags), to: '/followed_tags' });
+  menu.push(null);
+  menu.push({ text: intl.formatMessage(messages.mutes), to: '/mutes' });
+  menu.push({ text: intl.formatMessage(messages.blocks), to: '/blocks' });
+  menu.push({ text: intl.formatMessage(messages.domain_blocks), to: '/domain_blocks' });
+  menu.push({ text: intl.formatMessage(messages.filters), href: '/filters' });
+  menu.push(null);
+  menu.push({ text: intl.formatMessage(messages.logout), action: handleLogoutClick });
 
-export default injectIntl(ActionBar);
+  return (
+    <DropdownMenuContainer
+      items={menu}
+      icon='bars'
+      iconComponent={MoreHorizIcon}
+      size={24}
+      direction='right'
+    />
+  );
+};
diff --git a/app/javascript/flavours/glitch/features/compose/components/autosuggest_account.jsx b/app/javascript/flavours/glitch/features/compose/components/autosuggest_account.jsx
index 0a73bc1020f4f6..fe684c1483ebe8 100644
--- a/app/javascript/flavours/glitch/features/compose/components/autosuggest_account.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/autosuggest_account.jsx
@@ -15,7 +15,7 @@ export default class AutosuggestAccount extends ImmutablePureComponent {
 
     return (
       <div className='autosuggest-account' title={account.get('acct')}>
-        <div className='autosuggest-account-icon'><Avatar account={account} size={18} /></div>
+        <Avatar account={account} size={24} />
         <DisplayName account={account} />
       </div>
     );
diff --git a/app/javascript/flavours/glitch/features/compose/components/character_counter.jsx b/app/javascript/flavours/glitch/features/compose/components/character_counter.jsx
index 42452b30f6af55..f400d1fe2fd15a 100644
--- a/app/javascript/flavours/glitch/features/compose/components/character_counter.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/character_counter.jsx
@@ -1,26 +1,18 @@
 import PropTypes from 'prop-types';
-import { PureComponent } from 'react';
 
 import { length } from 'stringz';
 
-export default class CharacterCounter extends PureComponent {
+export const CharacterCounter = ({ text, max }) => {
+  const diff = max - length(text);
 
-  static propTypes = {
-    text: PropTypes.string.isRequired,
-    max: PropTypes.number.isRequired,
-  };
-
-  checkRemainingText (diff) {
-    if (diff < 0) {
-      return <span className='character-counter character-counter--over'>{diff}</span>;
-    }
-
-    return <span className='character-counter'>{diff}</span>;
+  if (diff < 0) {
+    return <span className='character-counter character-counter--over'>{diff}</span>;
   }
 
-  render () {
-    const diff = this.props.max - length(this.props.text);
-    return this.checkRemainingText(diff);
-  }
+  return <span className='character-counter'>{diff}</span>;
+};
 
-}
+CharacterCounter.propTypes = {
+  text: PropTypes.string.isRequired,
+  max: PropTypes.number.isRequired,
+};
diff --git a/app/javascript/flavours/glitch/features/compose/components/compose_form.jsx b/app/javascript/flavours/glitch/features/compose/components/compose_form.jsx
index 1f24828c665cd8..737bbfc126230f 100644
--- a/app/javascript/flavours/glitch/features/compose/components/compose_form.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/compose_form.jsx
@@ -10,8 +10,6 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
 
 import { length } from 'stringz';
 
-import LockIcon from '@/material-icons/400-24px/lock.svg?react';
-import { Icon }  from 'flavours/glitch/components/icon';
 import { WithOptionalRouterPropTypes, withOptionalRouter } from 'flavours/glitch/utils/react_router';
 
 import AutosuggestInput from '../../../components/autosuggest_input';
@@ -21,25 +19,27 @@ import { maxChars } from '../../../initial_state';
 import EmojiPickerDropdown from '../containers/emoji_picker_dropdown_container';
 import LanguageDropdown from '../containers/language_dropdown_container';
 import PollButtonContainer from '../containers/poll_button_container';
-import PollFormContainer from '../containers/poll_form_container';
 import PrivacyDropdownContainer from '../containers/privacy_dropdown_container';
-import ReplyIndicatorContainer from '../containers/reply_indicator_container';
 import SpoilerButtonContainer from '../containers/spoiler_button_container';
 import UploadButtonContainer from '../containers/upload_button_container';
 import UploadFormContainer from '../containers/upload_form_container';
 import WarningContainer from '../containers/warning_container';
 import { countableText } from '../util/counter';
 
-import CharacterCounter from './character_counter';
+import { CharacterCounter } from './character_counter';
+import { EditIndicator } from './edit_indicator';
+import { NavigationBar } from './navigation_bar';
+import { PollForm } from "./poll_form";
+import { ReplyIndicator } from './reply_indicator';
 
 const allowedAroundShortCode = '><\u0085\u0020\u00a0\u1680\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029\u0009\u000a\u000b\u000c\u000d';
 
 const messages = defineMessages({
   placeholder: { id: 'compose_form.placeholder', defaultMessage: 'What is on your mind?' },
-  spoiler_placeholder: { id: 'compose_form.spoiler_placeholder', defaultMessage: 'Write your warning here' },
-  publish: { id: 'compose_form.publish', defaultMessage: 'Publish' },
-  publishLoud: { id: 'compose_form.publish_loud', defaultMessage: '{publish}!' },
-  saveChanges: { id: 'compose_form.save_changes', defaultMessage: 'Save changes' },
+  spoiler_placeholder: { id: 'compose_form.spoiler_placeholder', defaultMessage: 'Content warning (optional)' },
+  publish: { id: 'compose_form.publish', defaultMessage: 'Post' },
+  saveChanges: { id: 'compose_form.save_changes', defaultMessage: 'Update' },
+  reply: { id: 'compose_form.reply', defaultMessage: 'Reply' },
 });
 
 class ComposeForm extends ImmutablePureComponent {
@@ -66,6 +66,7 @@ class ComposeForm extends ImmutablePureComponent {
     onPaste: PropTypes.func.isRequired,
     onPickEmoji: PropTypes.func.isRequired,
     autoFocus: PropTypes.bool,
+    withoutNavigation: PropTypes.bool,
     anyMedia: PropTypes.bool,
     isInReply: PropTypes.bool,
     singleColumn: PropTypes.bool,
@@ -224,95 +225,92 @@ class ComposeForm extends ImmutablePureComponent {
   };
 
   render () {
-    const { intl, onPaste, autoFocus } = this.props;
+    const { intl, onPaste, autoFocus, withoutNavigation } = this.props;
     const { highlighted } = this.state;
     const disabled = this.props.isSubmitting;
 
-    let publishText = '';
-
-    if (this.props.isEditing) {
-      publishText = intl.formatMessage(messages.saveChanges);
-    } else if (this.props.privacy === 'private' || this.props.privacy === 'direct') {
-      publishText = <><Icon id='lock' icon={LockIcon} /> {intl.formatMessage(messages.publish)}</>;
-    } else {
-      publishText = this.props.privacy !== 'unlisted' ? intl.formatMessage(messages.publishLoud, { publish: intl.formatMessage(messages.publish) }) : intl.formatMessage(messages.publish);
-    }
-
     return (
       <form className='compose-form' onSubmit={this.handleSubmit}>
+        <ReplyIndicator />
+        {!withoutNavigation && <NavigationBar />}
         <WarningContainer />
 
-        <ReplyIndicatorContainer />
-
-        <div className={`spoiler-input ${this.props.spoiler ? 'spoiler-input--visible' : ''}`} ref={this.setRef} aria-hidden={!this.props.spoiler}>
-          <AutosuggestInput
-            placeholder={intl.formatMessage(messages.spoiler_placeholder)}
-            value={this.props.spoilerText}
-            onChange={this.handleChangeSpoilerText}
-            onKeyDown={this.handleKeyDown}
-            disabled={!this.props.spoiler}
-            ref={this.setSpoilerText}
-            suggestions={this.props.suggestions}
-            onSuggestionsFetchRequested={this.onSuggestionsFetchRequested}
-            onSuggestionsClearRequested={this.onSuggestionsClearRequested}
-            onSuggestionSelected={this.onSpoilerSuggestionSelected}
-            searchTokens={[':']}
-            id='cw-spoiler-input'
-            className='spoiler-input__input'
-            lang={this.props.lang}
-            spellCheck
-          />
-        </div>
+        <div className={classNames('compose-form__highlightable', { active: highlighted })} ref={this.setRef}>
+          <div className='compose-form__scrollable'>
+            <EditIndicator />
+
+            {this.props.spoiler && (
+              <div className='spoiler-input'>
+                <div className='spoiler-input__border' />
+
+                <AutosuggestInput
+                  placeholder={intl.formatMessage(messages.spoiler_placeholder)}
+                  value={this.props.spoilerText}
+                  disabled={disabled}
+                  onChange={this.handleChangeSpoilerText}
+                  onKeyDown={this.handleKeyDown}
+                  ref={this.setSpoilerText}
+                  suggestions={this.props.suggestions}
+                  onSuggestionsFetchRequested={this.onSuggestionsFetchRequested}
+                  onSuggestionsClearRequested={this.onSuggestionsClearRequested}
+                  onSuggestionSelected={this.onSpoilerSuggestionSelected}
+                  searchTokens={[':']}
+                  id='cw-spoiler-input'
+                  className='spoiler-input__input'
+                  lang={this.props.lang}
+                  spellCheck
+                />
+
+                <div className='spoiler-input__border' />
+              </div>
+            )}
+
+            <AutosuggestTextarea
+              ref={this.textareaRef}
+              placeholder={intl.formatMessage(messages.placeholder)}
+              disabled={disabled}
+              value={this.props.text}
+              onChange={this.handleChange}
+              suggestions={this.props.suggestions}
+              onFocus={this.handleFocus}
+              onKeyDown={this.handleKeyDown}
+              onSuggestionsFetchRequested={this.onSuggestionsFetchRequested}
+              onSuggestionsClearRequested={this.onSuggestionsClearRequested}
+              onSuggestionSelected={this.onSuggestionSelected}
+              onPaste={onPaste}
+              autoFocus={autoFocus}
+              lang={this.props.lang}
+            />
+          </div>
 
-        <div className={classNames('compose-form__highlightable', { active: highlighted })}>
-          <AutosuggestTextarea
-            ref={this.textareaRef}
-            placeholder={intl.formatMessage(messages.placeholder)}
-            disabled={disabled}
-            value={this.props.text}
-            onChange={this.handleChange}
-            suggestions={this.props.suggestions}
-            onFocus={this.handleFocus}
-            onKeyDown={this.handleKeyDown}
-            onSuggestionsFetchRequested={this.onSuggestionsFetchRequested}
-            onSuggestionsClearRequested={this.onSuggestionsClearRequested}
-            onSuggestionSelected={this.onSuggestionSelected}
-            onPaste={onPaste}
-            autoFocus={autoFocus}
-            lang={this.props.lang}
-          >
-            <div className='compose-form__modifiers'>
-              <UploadFormContainer />
-              <PollFormContainer />
-            </div>
-          </AutosuggestTextarea>
-          <EmojiPickerDropdown onPickEmoji={this.handleEmojiPick} />
+          <UploadFormContainer />
+          <PollForm />
 
-          <div className='compose-form__buttons-wrapper'>
-            <div className='compose-form__buttons'>
-              <UploadButtonContainer />
-              <PollButtonContainer />
+          <div className='compose-form__footer'>
+            <div className='compose-form__dropdowns'>
               <PrivacyDropdownContainer disabled={this.props.isEditing} />
-              <SpoilerButtonContainer />
               <LanguageDropdown />
             </div>
 
-            <div className='character-counter__wrapper'>
-              <CharacterCounter max={maxChars} text={this.getFulltextForCharacterCounting()} />
+            <div className='compose-form__actions'>
+              <div className='compose-form__buttons'>
+                <UploadButtonContainer />
+                <PollButtonContainer />
+                <SpoilerButtonContainer />
+                <EmojiPickerDropdown onPickEmoji={this.handleEmojiPick} />
+                <CharacterCounter max={maxChars} text={this.getFulltextForCharacterCounting()} />
+              </div>
+
+              <div className='compose-form__submit'>
+                <Button
+                  type='submit'
+                  text={intl.formatMessage(this.props.isEditing ? messages.saveChanges : (this.props.isInReply ? messages.reply : messages.publish))}
+                  disabled={!this.canSubmit()}
+                />
+              </div>
             </div>
           </div>
         </div>
-
-        <div className='compose-form__publish'>
-          <div className='compose-form__publish-button-wrapper'>
-            <Button
-              type='submit'
-              text={publishText}
-              disabled={!this.canSubmit()}
-              block
-            />
-          </div>
-        </div>
       </form>
     );
   }
diff --git a/app/javascript/flavours/glitch/features/compose/components/edit_indicator.jsx b/app/javascript/flavours/glitch/features/compose/components/edit_indicator.jsx
new file mode 100644
index 00000000000000..4e3d909833eba4
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/compose/components/edit_indicator.jsx
@@ -0,0 +1,62 @@
+import { useCallback } from 'react';
+
+import { defineMessages, useIntl, FormattedMessage } from 'react-intl';
+
+import { Link } from 'react-router-dom';
+
+import { useDispatch, useSelector } from 'react-redux';
+
+import BarChart4BarsIcon from '@/material-icons/400-24px/bar_chart_4_bars.svg?react';
+import CloseIcon from '@/material-icons/400-24px/close.svg?react';
+import PhotoLibraryIcon from '@/material-icons/400-24px/photo_library.svg?react';
+import { cancelReplyCompose } from 'flavours/glitch/actions/compose';
+import { Icon } from 'flavours/glitch/components/icon';
+import { IconButton } from 'flavours/glitch/components/icon_button';
+import { RelativeTimestamp } from 'flavours/glitch/components/relative_timestamp';
+
+const messages = defineMessages({
+  cancel: { id: 'reply_indicator.cancel', defaultMessage: 'Cancel' },
+});
+
+export const EditIndicator = () => {
+  const intl = useIntl();
+  const dispatch = useDispatch();
+  const id = useSelector(state => state.getIn(['compose', 'id']));
+  const status = useSelector(state => state.getIn(['statuses', id]));
+  const account = useSelector(state => state.getIn(['accounts', status?.get('account')]));
+
+  const handleCancelClick = useCallback(() => {
+    dispatch(cancelReplyCompose());
+  }, [dispatch]);
+
+  if (!status) {
+    return null;
+  }
+
+  const content = { __html: status.get('contentHtml') };
+
+  return (
+    <div className='edit-indicator'>
+      <div className='edit-indicator__header'>
+        <div className='edit-indicator__display-name'>
+          <Link to={`/@${account.get('acct')}`}>@{account.get('acct')}</Link>
+          ·
+          <Link to={`/@${account.get('acct')}/${status.get('id')}`}><RelativeTimestamp timestamp={status.get('created_at')} /></Link>
+        </div>
+
+        <div className='edit-indicator__cancel'>
+          <IconButton title={intl.formatMessage(messages.cancel)} icon='times' iconComponent={CloseIcon} onClick={handleCancelClick} inverted />
+        </div>
+      </div>
+
+      <div className='edit-indicator__content translate' dangerouslySetInnerHTML={content} />
+
+      {(status.get('poll') || status.get('media_attachments').size > 0) && (
+        <div className='edit-indicator__attachments'>
+          {status.get('poll') && <><Icon icon={BarChart4BarsIcon} /><FormattedMessage id='reply_indicator.poll' defaultMessage='Poll' /></>}
+          {status.get('media_attachments').size > 0 && <><Icon icon={PhotoLibraryIcon} /><FormattedMessage id='reply_indicator.attachments' defaultMessage='{count, plural, one {# attachment} other {# attachments}}' values={{ count: status.get('media_attachments').size }} /></>}
+        </div>
+      )}
+    </div>
+  );
+};
diff --git a/app/javascript/flavours/glitch/features/compose/components/emoji_picker_dropdown.jsx b/app/javascript/flavours/glitch/features/compose/components/emoji_picker_dropdown.jsx
index 4195316794da00..0846468c4edc33 100644
--- a/app/javascript/flavours/glitch/features/compose/components/emoji_picker_dropdown.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/emoji_picker_dropdown.jsx
@@ -10,6 +10,8 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import { supportsPassiveEvents } from 'detect-passive-events';
 import Overlay from 'react-overlays/Overlay';
 
+import MoodIcon from '@/material-icons/400-24px/mood.svg?react';
+import { IconButton } from 'flavours/glitch/components/icon_button';
 import { useSystemEmojiFont } from 'flavours/glitch/initial_state';
 import { assetHost } from 'flavours/glitch/utils/config';
 
@@ -323,7 +325,6 @@ class EmojiPickerDropdown extends PureComponent {
     onPickEmoji: PropTypes.func.isRequired,
     onSkinTone: PropTypes.func.isRequired,
     skinTone: PropTypes.number.isRequired,
-    button: PropTypes.node,
   };
 
   state = {
@@ -381,23 +382,24 @@ class EmojiPickerDropdown extends PureComponent {
   };
 
   render () {
-    const { intl, onPickEmoji, onSkinTone, skinTone, frequentlyUsedEmojis, button } = this.props;
+    const { intl, onPickEmoji, onSkinTone, skinTone, frequentlyUsedEmojis } = this.props;
     const title = intl.formatMessage(messages.emoji);
     const { active, loading } = this.state;
 
     return (
-      <div className='emoji-picker-dropdown' onKeyDown={this.handleKeyDown}>
-        <div ref={this.setTargetRef} className='emoji-button' title={title} aria-label={title} aria-expanded={active} role='button' onClick={this.onToggle} onKeyDown={this.onToggle} tabIndex={0}>
-          {button || <img
-            className={classNames('emojione', { 'pulse-loading': active && loading })}
-            alt='🙂'
-            src={`${assetHost}/emoji/1f642.svg`}
-          />}
-        </div>
+      <div className='emoji-picker-dropdown' onKeyDown={this.handleKeyDown} ref={this.setTargetRef}>
+        <IconButton
+          title={title}
+          aria-expanded={active}
+          active={active}
+          iconComponent={MoodIcon}
+          onClick={this.onToggle}
+          inverted
+        />
 
         <Overlay show={active} placement={'bottom'} target={this.findTarget} popperConfig={{ strategy: 'fixed' }}>
           {({ props, placement })=> (
-            <div {...props} style={{ ...props.style, width: 299 }}>
+            <div {...props} style={{ ...props.style }}>
               <div className={`dropdown-animation ${placement}`}>
                 <EmojiPickerMenu
                   custom_emojis={this.props.custom_emojis}
diff --git a/app/javascript/flavours/glitch/features/compose/components/language_dropdown.jsx b/app/javascript/flavours/glitch/features/compose/components/language_dropdown.jsx
index a067f686e13075..db1ce9cecec561 100644
--- a/app/javascript/flavours/glitch/features/compose/components/language_dropdown.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/language_dropdown.jsx
@@ -9,10 +9,11 @@ import { supportsPassiveEvents } from 'detect-passive-events';
 import fuzzysort from 'fuzzysort';
 import Overlay from 'react-overlays/Overlay';
 
+import CancelIcon from '@/material-icons/400-24px/cancel-fill.svg?react';
+import SearchIcon from '@/material-icons/400-24px/search.svg?react';
+import TranslateIcon from '@/material-icons/400-24px/translate.svg?react';
+import { Icon } from 'flavours/glitch/components/icon';
 import { languages as preloadedLanguages } from 'flavours/glitch/initial_state';
-import { loupeIcon, deleteIcon } from 'flavours/glitch/utils/icons';
-
-import TextIconButton from './text_icon_button';
 
 const messages = defineMessages({
   changeLanguage: { id: 'compose.language.change', defaultMessage: 'Change language' },
@@ -231,7 +232,7 @@ class LanguageDropdownMenu extends PureComponent {
       <div ref={this.setRef}>
         <div className='emoji-mart-search'>
           <input type='search' value={searchValue} onChange={this.handleSearchChange} onKeyDown={this.handleSearchKeyDown} placeholder={intl.formatMessage(messages.search)} />
-          <button type='button' className='emoji-mart-search-icon' disabled={!isSearching} aria-label={intl.formatMessage(messages.clear)} onClick={this.handleClear}>{!isSearching ? loupeIcon : deleteIcon}</button>
+          <button type='button' className='emoji-mart-search-icon' disabled={!isSearching} aria-label={intl.formatMessage(messages.clear)} onClick={this.handleClear}><Icon icon={!isSearching ? SearchIcon : CancelIcon} /></button>
         </div>
 
         <div className='language-dropdown__dropdown__results emoji-mart-scroll' role='listbox' ref={this.setListRef}>
@@ -297,20 +298,24 @@ class LanguageDropdown extends PureComponent {
   render () {
     const { value, intl, frequentlyUsedLanguages } = this.props;
     const { open, placement } = this.state;
+    const current = preloadedLanguages.find(lang => lang[0] === value) ?? [];
 
     return (
-      <div className={classNames('privacy-dropdown', placement, { active: open })}>
-        <div className='privacy-dropdown__value' ref={this.setTargetRef} >
-          <TextIconButton
-            className='privacy-dropdown__value-icon'
-            label={value && value.toUpperCase()}
-            title={intl.formatMessage(messages.changeLanguage)}
-            active={open}
-            onClick={this.handleToggle}
-          />
-        </div>
-
-        <Overlay show={open} placement={'bottom'} flip target={this.findTarget} popperConfig={{ strategy: 'fixed', onFirstUpdate: this.handleOverlayEnter }}>
+      <div ref={this.setTargetRef} onKeyDown={this.handleKeyDown}>
+        <button
+          type='button'
+          title={intl.formatMessage(messages.changeLanguage)}
+          aria-expanded={open}
+          onClick={this.handleToggle}
+          onMouseDown={this.handleMouseDown}
+          onKeyDown={this.handleButtonKeyDown}
+          className={classNames('dropdown-button', { active: open })}
+        >
+          <Icon icon={TranslateIcon} />
+          <span className='dropdown-button__label'>{current[2] ?? value}</span>
+        </button>
+
+        <Overlay show={open} offset={[5, 5]} placement={placement} flip target={this.findTarget} popperConfig={{ strategy: 'fixed', onFirstUpdate: this.handleOverlayEnter }}>
           {({ props, placement }) => (
             <div {...props}>
               <div className={`dropdown-animation language-dropdown__dropdown ${placement}`} >
diff --git a/app/javascript/flavours/glitch/features/compose/components/navigation_bar.jsx b/app/javascript/flavours/glitch/features/compose/components/navigation_bar.jsx
index 2f0bb79f891827..ef9d01bd20de9d 100644
--- a/app/javascript/flavours/glitch/features/compose/components/navigation_bar.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/navigation_bar.jsx
@@ -1,50 +1,36 @@
-import PropTypes from 'prop-types';
+import { useCallback } from 'react';
 
-import { FormattedMessage } from 'react-intl';
+import { useIntl, defineMessages } from 'react-intl';
 
-import { Link } from 'react-router-dom';
+import { useSelector, useDispatch } from 'react-redux';
 
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import ImmutablePureComponent from 'react-immutable-pure-component';
+import CloseIcon from '@/material-icons/400-24px/close.svg?react';
+import { cancelReplyCompose } from 'flavours/glitch/actions/compose';
+import Account from 'flavours/glitch/components/account';
+import { IconButton } from 'flavours/glitch/components/icon_button';
+import { me } from 'flavours/glitch/initial_state';
 
-import { Avatar } from '../../../components/avatar';
+import { ActionBar } from './action_bar';
 
-import ActionBar from './action_bar';
 
-export default class NavigationBar extends ImmutablePureComponent {
+const messages = defineMessages({
+  cancel: { id: 'reply_indicator.cancel', defaultMessage: 'Cancel' },
+});
 
-  static propTypes = {
-    account: ImmutablePropTypes.record.isRequired,
-    onLogout: PropTypes.func.isRequired,
-    onClose: PropTypes.func,
-  };
+export const NavigationBar = () => {
+  const dispatch = useDispatch();
+  const intl = useIntl();
+  const account = useSelector(state => state.getIn(['accounts', me]));
+  const isReplying = useSelector(state => !!state.getIn(['compose', 'in_reply_to']));
 
-  render () {
-    const username = this.props.account.get('acct');
-    return (
-      <div className='navigation-bar'>
-        <Link to={`/@${username}`}>
-          <span style={{ display: 'none' }}>{username}</span>
-          <Avatar account={this.props.account} size={46} />
-        </Link>
+  const handleCancelClick = useCallback(() => {
+    dispatch(cancelReplyCompose());
+  }, [dispatch]);
 
-        <div className='navigation-bar__profile'>
-          <span>
-            <Link to={`/@${username}`}>
-              <strong className='navigation-bar__profile-account'>@{username}</strong>
-            </Link>
-          </span>
-
-          <span>
-            <a href='/settings/profile' className='navigation-bar__profile-edit'><FormattedMessage id='navigation_bar.edit_profile' defaultMessage='Edit profile' /></a>
-          </span>
-        </div>
-
-        <div className='navigation-bar__actions'>
-          <ActionBar account={this.props.account} onLogout={this.props.onLogout} />
-        </div>
-      </div>
-    );
-  }
-
-}
+  return (
+    <div className='navigation-bar'>
+      <Account account={account} minimal />
+      {isReplying ? <IconButton title={intl.formatMessage(messages.cancel)} iconComponent={CloseIcon} onClick={handleCancelClick} /> : <ActionBar />}
+    </div>
+  );
+};
diff --git a/app/javascript/flavours/glitch/features/compose/components/poll_button.jsx b/app/javascript/flavours/glitch/features/compose/components/poll_button.jsx
index 4900d381192779..345497abd32b8c 100644
--- a/app/javascript/flavours/glitch/features/compose/components/poll_button.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/poll_button.jsx
@@ -3,11 +3,10 @@ import { PureComponent } from 'react';
 
 import { defineMessages, injectIntl } from 'react-intl';
 
-import InsertChartIcon from '@/material-icons/400-24px/insert_chart.svg?react';
+import BarChart4BarsIcon from '@/material-icons/400-24px/bar_chart_4_bars.svg?react';
 
 import { IconButton } from '../../../components/icon_button';
 
-
 const messages = defineMessages({
   add_poll: { id: 'poll_button.add_poll', defaultMessage: 'Add a poll' },
   remove_poll: { id: 'poll_button.remove_poll', defaultMessage: 'Remove poll' },
@@ -22,7 +21,6 @@ class PollButton extends PureComponent {
 
   static propTypes = {
     disabled: PropTypes.bool,
-    unavailable: PropTypes.bool,
     active: PropTypes.bool,
     onClick: PropTypes.func.isRequired,
     intl: PropTypes.object.isRequired,
@@ -33,17 +31,13 @@ class PollButton extends PureComponent {
   };
 
   render () {
-    const { intl, active, unavailable, disabled } = this.props;
-
-    if (unavailable) {
-      return null;
-    }
+    const { intl, active, disabled } = this.props;
 
     return (
       <div className='compose-form__poll-button'>
         <IconButton
           icon='tasks'
-          iconComponent={InsertChartIcon}
+          iconComponent={BarChart4BarsIcon}
           title={intl.formatMessage(active ? messages.remove_poll : messages.add_poll)}
           disabled={disabled}
           onClick={this.handleClick}
diff --git a/app/javascript/flavours/glitch/features/compose/components/poll_form.jsx b/app/javascript/flavours/glitch/features/compose/components/poll_form.jsx
index 1ee0a06c629dd2..8964121c5760cc 100644
--- a/app/javascript/flavours/glitch/features/compose/components/poll_form.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/poll_form.jsx
@@ -1,189 +1,162 @@
 import PropTypes from 'prop-types';
-import { PureComponent } from 'react';
+import { useCallback } from 'react';
 
-import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
+import { defineMessages, useIntl } from 'react-intl';
 
 import classNames from 'classnames';
 
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import ImmutablePureComponent from 'react-immutable-pure-component';
+import { useDispatch, useSelector } from 'react-redux';
 
-import AddIcon from '@/material-icons/400-24px/add.svg?react';
-import CloseIcon from '@/material-icons/400-24px/close.svg?react';
+import {
+  changePollSettings,
+  changePollOption,
+  clearComposeSuggestions,
+  fetchComposeSuggestions,
+  selectComposeSuggestion,
+} from 'flavours/glitch/actions/compose';
 import AutosuggestInput from 'flavours/glitch/components/autosuggest_input';
-import { Icon }  from 'flavours/glitch/components/icon';
-import { IconButton } from 'flavours/glitch/components/icon_button';
 
 const messages = defineMessages({
-  option_placeholder: { id: 'compose_form.poll.option_placeholder', defaultMessage: 'Choice {number}' },
-  add_option: { id: 'compose_form.poll.add_option', defaultMessage: 'Add a choice' },
-  remove_option: { id: 'compose_form.poll.remove_option', defaultMessage: 'Remove this choice' },
-  poll_duration: { id: 'compose_form.poll.duration', defaultMessage: 'Poll duration' },
+  option_placeholder: { id: 'compose_form.poll.option_placeholder', defaultMessage: 'Option {number}' },
+  add_option: { id: 'compose_form.poll.add_option', defaultMessage: 'Add option' },
+  remove_option: { id: 'compose_form.poll.remove_option', defaultMessage: 'Remove this option' },
+  duration: { id: 'compose_form.poll.duration', defaultMessage: 'Poll length' },
+  type: { id: 'compose_form.poll.type', defaultMessage: 'Style' },
   switchToMultiple: { id: 'compose_form.poll.switch_to_multiple', defaultMessage: 'Change poll to allow multiple choices' },
   switchToSingle: { id: 'compose_form.poll.switch_to_single', defaultMessage: 'Change poll to allow for a single choice' },
   minutes: { id: 'intervals.full.minutes', defaultMessage: '{number, plural, one {# minute} other {# minutes}}' },
   hours: { id: 'intervals.full.hours', defaultMessage: '{number, plural, one {# hour} other {# hours}}' },
   days: { id: 'intervals.full.days', defaultMessage: '{number, plural, one {# day} other {# days}}' },
+  singleChoice: { id: 'compose_form.poll.single', defaultMessage: 'Pick one' },
+  multipleChoice: { id: 'compose_form.poll.multiple', defaultMessage: 'Multiple choice' },
 });
 
-class OptionIntl extends PureComponent {
-
-  static propTypes = {
-    title: PropTypes.string.isRequired,
-    lang: PropTypes.string,
-    index: PropTypes.number.isRequired,
-    isPollMultiple: PropTypes.bool,
-    autoFocus: PropTypes.bool,
-    onChange: PropTypes.func.isRequired,
-    onRemove: PropTypes.func.isRequired,
-    onToggleMultiple: PropTypes.func.isRequired,
-    suggestions: ImmutablePropTypes.list,
-    onClearSuggestions: PropTypes.func.isRequired,
-    onFetchSuggestions: PropTypes.func.isRequired,
-    onSuggestionSelected: PropTypes.func.isRequired,
-    intl: PropTypes.object.isRequired,
-  };
-
-  handleOptionTitleChange = e => {
-    this.props.onChange(this.props.index, e.target.value);
-  };
-
-  handleOptionRemove = () => {
-    this.props.onRemove(this.props.index);
-  };
-
-
-  handleToggleMultiple = e => {
-    this.props.onToggleMultiple();
-    e.preventDefault();
-    e.stopPropagation();
-  };
-
-  handleCheckboxKeypress = e => {
-    if (e.key === 'Enter' || e.key === ' ') {
-      this.handleToggleMultiple(e);
-    }
-  };
-
-  onSuggestionsClearRequested = () => {
-    this.props.onClearSuggestions();
-  };
-
-  onSuggestionsFetchRequested = (token) => {
-    this.props.onFetchSuggestions(token);
-  };
-
-  onSuggestionSelected = (tokenStart, token, value) => {
-    this.props.onSuggestionSelected(tokenStart, token, value, ['poll', 'options', this.props.index]);
-  };
-
-  render () {
-    const { isPollMultiple, title, lang, index, autoFocus, intl } = this.props;
-
-    return (
-      <li>
-        <label className='poll__option editable'>
-          <span
-            className={classNames('poll__input', { checkbox: isPollMultiple })}
-            onClick={this.handleToggleMultiple}
-            onKeyPress={this.handleCheckboxKeypress}
-            role='button'
-            tabIndex={0}
-            title={intl.formatMessage(isPollMultiple ? messages.switchToSingle : messages.switchToMultiple)}
-            aria-label={intl.formatMessage(isPollMultiple ? messages.switchToSingle : messages.switchToMultiple)}
-          />
-
-          <AutosuggestInput
-            placeholder={intl.formatMessage(messages.option_placeholder, { number: index + 1 })}
-            maxLength={100}
-            value={title}
-            lang={lang}
-            spellCheck
-            onChange={this.handleOptionTitleChange}
-            suggestions={this.props.suggestions}
-            onSuggestionsFetchRequested={this.onSuggestionsFetchRequested}
-            onSuggestionsClearRequested={this.onSuggestionsClearRequested}
-            onSuggestionSelected={this.onSuggestionSelected}
-            searchTokens={[':']}
-            autoFocus={autoFocus}
-          />
-        </label>
-
-        <div className='poll__cancel'>
-          <IconButton disabled={index <= 1} title={intl.formatMessage(messages.remove_option)} icon='times' iconComponent={CloseIcon} onClick={this.handleOptionRemove} />
-        </div>
-      </li>
-    );
+const Select = ({ label, options, value, onChange }) => {
+  return (
+    <label className='compose-form__poll__select'>
+      <span className='compose-form__poll__select__label'>{label}</span>
+
+      <select className='compose-form__poll__select__value' value={value} onChange={onChange}>
+        {options.map((option, i) => (
+          <option key={i} value={option.value}>{option.label}</option>
+        ))}
+      </select>
+    </label>
+  );
+};
+
+Select.propTypes = {
+  label: PropTypes.node,
+  value: PropTypes.any,
+  onChange: PropTypes.func,
+  options: PropTypes.arrayOf(PropTypes.shape({
+    label: PropTypes.node,
+    value: PropTypes.any,
+  })),
+};
+
+const Option = ({ multipleChoice, index, title, autoFocus }) => {
+  const intl = useIntl();
+  const dispatch = useDispatch();
+  const suggestions = useSelector(state => state.getIn(['compose', 'suggestions']));
+  const lang = useSelector(state => state.getIn(['compose', 'language']));
+
+  const handleChange = useCallback(({ target: { value } }) => {
+    dispatch(changePollOption(index, value));
+  }, [dispatch, index]);
+
+  const handleSuggestionsFetchRequested = useCallback(token => {
+    dispatch(fetchComposeSuggestions(token));
+  }, [dispatch]);
+
+  const handleSuggestionsClearRequested = useCallback(() => {
+    dispatch(clearComposeSuggestions());
+  }, [dispatch]);
+
+  const handleSuggestionSelected = useCallback((tokenStart, token, value) => {
+    dispatch(selectComposeSuggestion(tokenStart, token, value, ['poll', 'options', index]));
+  }, [dispatch, index]);
+
+  return (
+    <label className={classNames('poll__option editable', { empty: index > 1 && title.length === 0 })}>
+      <span className={classNames('poll__input', { checkbox: multipleChoice })} />
+
+      <AutosuggestInput
+        placeholder={intl.formatMessage(messages.option_placeholder, { number: index + 1 })}
+        maxLength={100}
+        value={title}
+        lang={lang}
+        spellCheck
+        onChange={handleChange}
+        suggestions={suggestions}
+        onSuggestionsFetchRequested={handleSuggestionsFetchRequested}
+        onSuggestionsClearRequested={handleSuggestionsClearRequested}
+        onSuggestionSelected={handleSuggestionSelected}
+        searchTokens={[':']}
+        autoFocus={autoFocus}
+      />
+    </label>
+  );
+};
+
+Option.propTypes = {
+  title: PropTypes.string.isRequired,
+  index: PropTypes.number.isRequired,
+  multipleChoice: PropTypes.bool,
+  autoFocus: PropTypes.bool,
+};
+
+export const PollForm = () => {
+  const intl = useIntl();
+  const dispatch = useDispatch();
+  const poll = useSelector(state => state.getIn(['compose', 'poll']));
+  const options = poll?.get('options');
+  const expiresIn = poll?.get('expires_in');
+  const isMultiple = poll?.get('multiple');
+
+  const handleDurationChange = useCallback(({ target: { value } }) => {
+    dispatch(changePollSettings(value, isMultiple));
+  }, [dispatch, isMultiple]);
+
+  const handleTypeChange = useCallback(({ target: { value } }) => {
+    dispatch(changePollSettings(expiresIn, value === 'true'));
+  }, [dispatch, expiresIn]);
+
+  if (poll === null) {
+    return null;
   }
 
-}
-
-const Option = injectIntl(OptionIntl);
-
-class PollForm extends ImmutablePureComponent {
-
-  static propTypes = {
-    options: ImmutablePropTypes.list,
-    lang: PropTypes.string,
-    expiresIn: PropTypes.number,
-    isMultiple: PropTypes.bool,
-    onChangeOption: PropTypes.func.isRequired,
-    onAddOption: PropTypes.func.isRequired,
-    onRemoveOption: PropTypes.func.isRequired,
-    onChangeSettings: PropTypes.func.isRequired,
-    suggestions: ImmutablePropTypes.list,
-    onClearSuggestions: PropTypes.func.isRequired,
-    onFetchSuggestions: PropTypes.func.isRequired,
-    onSuggestionSelected: PropTypes.func.isRequired,
-    intl: PropTypes.object.isRequired,
-  };
-
-  handleAddOption = () => {
-    this.props.onAddOption('');
-  };
-
-  handleSelectDuration = e => {
-    this.props.onChangeSettings(e.target.value, this.props.isMultiple);
-  };
-
-  handleToggleMultiple = () => {
-    this.props.onChangeSettings(this.props.expiresIn, !this.props.isMultiple);
-  };
-
-  render () {
-    const { options, lang, expiresIn, isMultiple, onChangeOption, onRemoveOption, intl, ...other } = this.props;
-
-    if (!options) {
-      return null;
-    }
-
-    const autoFocusIndex = options.indexOf('');
-
-    return (
-      <div className='compose-form__poll-wrapper'>
-        <ul>
-          {options.map((title, i) => <Option title={title} lang={lang} key={i} index={i} onChange={onChangeOption} onRemove={onRemoveOption} isPollMultiple={isMultiple} onToggleMultiple={this.handleToggleMultiple} autoFocus={i === autoFocusIndex} {...other} />)}
-        </ul>
-
-        <div className='poll__footer'>
-          <button type='button' disabled={options.size >= 5} className='button button-secondary' onClick={this.handleAddOption}><Icon id='plus' icon={AddIcon} /> <FormattedMessage {...messages.add_option} /></button>
-
-          {/* eslint-disable-next-line jsx-a11y/no-onchange */}
-          <select value={expiresIn} onChange={this.handleSelectDuration}>
-            <option value={300}>{intl.formatMessage(messages.minutes, { number: 5 })}</option>
-            <option value={1800}>{intl.formatMessage(messages.minutes, { number: 30 })}</option>
-            <option value={3600}>{intl.formatMessage(messages.hours, { number: 1 })}</option>
-            <option value={21600}>{intl.formatMessage(messages.hours, { number: 6 })}</option>
-            <option value={43200}>{intl.formatMessage(messages.hours, { number: 12 })}</option>
-            <option value={86400}>{intl.formatMessage(messages.days, { number: 1 })}</option>
-            <option value={259200}>{intl.formatMessage(messages.days, { number: 3 })}</option>
-            <option value={604800}>{intl.formatMessage(messages.days, { number: 7 })}</option>
-          </select>
-        </div>
+  return (
+    <div className='compose-form__poll'>
+      {options.map((title, i) => (
+        <Option
+          title={title}
+          key={i}
+          index={i}
+          multipleChoice={isMultiple}
+          autoFocus={i === 0}
+        />
+      ))}
+
+      <div className='compose-form__poll__footer'>
+        <Select label={intl.formatMessage(messages.duration)} options={[
+          { value: 300, label: intl.formatMessage(messages.minutes, { number: 5 })},
+          { value: 1800, label: intl.formatMessage(messages.minutes, { number: 30 })},
+          { value: 3600, label: intl.formatMessage(messages.hours, { number: 1 })},
+          { value: 21600, label: intl.formatMessage(messages.hours, { number: 6 })},
+          { value: 43200, label: intl.formatMessage(messages.hours, { number: 12 })},
+          { value: 86400, label: intl.formatMessage(messages.days, { number: 1 })},
+          { value: 259200, label: intl.formatMessage(messages.days, { number: 3 })},
+          { value: 604800, label: intl.formatMessage(messages.days, { number: 7 })},
+        ]} value={expiresIn} onChange={handleDurationChange} />
+
+        <div className='compose-form__poll__footer__sep' />
+
+        <Select label={intl.formatMessage(messages.type)} options={[
+          { value: false, label: intl.formatMessage(messages.singleChoice) },
+          { value: true, label: intl.formatMessage(messages.multipleChoice) },
+        ]} value={isMultiple} onChange={handleTypeChange} />
       </div>
-    );
-  }
-
-}
-
-export default injectIntl(PollForm);
+    </div>
+  );
+};
diff --git a/app/javascript/flavours/glitch/features/compose/components/privacy_dropdown.jsx b/app/javascript/flavours/glitch/features/compose/components/privacy_dropdown.jsx
index f7c893f28a27d2..8a49f71511e008 100644
--- a/app/javascript/flavours/glitch/features/compose/components/privacy_dropdown.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/privacy_dropdown.jsx
@@ -5,28 +5,27 @@ import { injectIntl, defineMessages } from 'react-intl';
 
 import classNames from 'classnames';
 
-
 import { supportsPassiveEvents } from 'detect-passive-events';
 import Overlay from 'react-overlays/Overlay';
 
 import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
+import InfoIcon from '@/material-icons/400-24px/info.svg?react';
 import LockIcon from '@/material-icons/400-24px/lock.svg?react';
-import LockOpenIcon from '@/material-icons/400-24px/lock_open.svg?react';
 import PublicIcon from '@/material-icons/400-24px/public.svg?react';
+import QuietTimeIcon from '@/material-icons/400-24px/quiet_time.svg?react';
 import { Icon }  from 'flavours/glitch/components/icon';
 
-import { IconButton } from '../../../components/icon_button';
-
 const messages = defineMessages({
   public_short: { id: 'privacy.public.short', defaultMessage: 'Public' },
-  public_long: { id: 'privacy.public.long', defaultMessage: 'Visible for all' },
-  unlisted_short: { id: 'privacy.unlisted.short', defaultMessage: 'Unlisted' },
-  unlisted_long: { id: 'privacy.unlisted.long', defaultMessage: 'Visible for all, but opted-out of discovery features' },
-  private_short: { id: 'privacy.private.short', defaultMessage: 'Followers only' },
-  private_long: { id: 'privacy.private.long', defaultMessage: 'Visible for followers only' },
-  direct_short: { id: 'privacy.direct.short', defaultMessage: 'Mentioned people only' },
-  direct_long: { id: 'privacy.direct.long', defaultMessage: 'Visible for mentioned users only' },
-  change_privacy: { id: 'privacy.change', defaultMessage: 'Adjust status privacy' },
+  public_long: { id: 'privacy.public.long', defaultMessage: 'Anyone on and off Mastodon' },
+  unlisted_short: { id: 'privacy.unlisted.short', defaultMessage: 'Quiet public' },
+  unlisted_long: { id: 'privacy.unlisted.long', defaultMessage: 'Fewer algorithmic fanfares' },
+  private_short: { id: 'privacy.private.short', defaultMessage: 'Followers' },
+  private_long: { id: 'privacy.private.long', defaultMessage: 'Only your followers' },
+  direct_short: { id: 'privacy.direct.short', defaultMessage: 'Specific people' },
+  direct_long: { id: 'privacy.direct.long', defaultMessage: 'Everyone mentioned in the post' },
+  change_privacy: { id: 'privacy.change', defaultMessage: 'Change post privacy' },
+  unlisted_extra: { id: 'privacy.unlisted.additional', defaultMessage: 'This behaves exactly like public, except the post will not appear in live feeds or hashtags, explore, or Mastodon search, even if you are opted-in account-wide.' },
 });
 
 const listenerOptions = supportsPassiveEvents ? { passive: true, capture: true } : true;
@@ -135,6 +134,12 @@ class PrivacyDropdownMenu extends PureComponent {
               <strong>{item.text}</strong>
               {item.meta}
             </div>
+
+            {item.extra && (
+              <div className='privacy-dropdown__option__additional' title={item.extra}>
+                <Icon id='info-circle' icon={InfoIcon} />
+              </div>
+            )}
           </div>
         ))}
       </div>
@@ -163,30 +168,11 @@ class PrivacyDropdown extends PureComponent {
   };
 
   handleToggle = () => {
-    if (this.props.isUserTouching && this.props.isUserTouching()) {
-      if (this.state.open) {
-        this.props.onModalClose();
-      } else {
-        this.props.onModalOpen({
-          actions: this.options.map(option => ({ ...option, active: option.value === this.props.value })),
-          onClick: this.handleModalActionClick,
-        });
-      }
-    } else {
-      if (this.state.open && this.activeElement) {
-        this.activeElement.focus({ preventScroll: true });
-      }
-      this.setState({ open: !this.state.open });
+    if (this.state.open && this.activeElement) {
+      this.activeElement.focus({ preventScroll: true });
     }
-  };
 
-  handleModalActionClick = (e) => {
-    e.preventDefault();
-
-    const { value } = this.options[e.currentTarget.getAttribute('data-index')];
-
-    this.props.onModalClose();
-    this.props.onChange(value);
+    this.setState({ open: !this.state.open });
   };
 
   handleKeyDown = e => {
@@ -228,7 +214,7 @@ class PrivacyDropdown extends PureComponent {
 
     this.options = [
       { icon: 'globe', iconComponent: PublicIcon, value: 'public', text: formatMessage(messages.public_short), meta: formatMessage(messages.public_long) },
-      { icon: 'unlock', iconComponent: LockOpenIcon,  value: 'unlisted', text: formatMessage(messages.unlisted_short), meta: formatMessage(messages.unlisted_long) },
+      { icon: 'unlock', iconComponent: QuietTimeIcon,  value: 'unlisted', text: formatMessage(messages.unlisted_short), meta: formatMessage(messages.unlisted_long), extra: formatMessage(messages.unlisted_extra) },
       { icon: 'lock', iconComponent: LockIcon, value: 'private', text: formatMessage(messages.private_short), meta: formatMessage(messages.private_long) },
     ];
 
@@ -259,23 +245,21 @@ class PrivacyDropdown extends PureComponent {
 
     return (
       <div ref={this.setTargetRef} onKeyDown={this.handleKeyDown}>
-        <IconButton
-          className='privacy-dropdown__value-icon'
-          icon={valueOption.icon}
-          iconComponent={valueOption.iconComponent}
+        <button
+          type='button'
           title={intl.formatMessage(messages.change_privacy)}
-          size={18}
-          expanded={open}
-          active={open}
-          inverted
+          aria-expanded={open}
           onClick={this.handleToggle}
           onMouseDown={this.handleMouseDown}
           onKeyDown={this.handleButtonKeyDown}
-          style={{ height: null, lineHeight: '27px' }}
           disabled={disabled}
-        />
+          className={classNames('dropdown-button', { active: open })}
+        >
+          <Icon id={valueOption.icon} icon={valueOption.iconComponent} />
+          <span className='dropdown-button__label'>{valueOption.text}</span>
+        </button>
 
-        <Overlay show={open} placement={placement} flip target={this.findTarget} container={container} popperConfig={{ strategy: 'fixed', onFirstUpdate: this.handleOverlayEnter }}>
+        <Overlay show={open} offset={[5, 5]} placement={placement} flip target={this.findTarget} container={container} popperConfig={{ strategy: 'fixed', onFirstUpdate: this.handleOverlayEnter }}>
           {({ props, placement }) => (
             <div {...props}>
               <div className={`dropdown-animation privacy-dropdown__dropdown ${placement}`}>
diff --git a/app/javascript/flavours/glitch/features/compose/components/reply_indicator.jsx b/app/javascript/flavours/glitch/features/compose/components/reply_indicator.jsx
index e3721b6fa90996..5c895195a0036f 100644
--- a/app/javascript/flavours/glitch/features/compose/components/reply_indicator.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/reply_indicator.jsx
@@ -1,74 +1,48 @@
-import PropTypes from 'prop-types';
+import { FormattedMessage } from 'react-intl';
 
-import { defineMessages, injectIntl } from 'react-intl';
+import { Link } from 'react-router-dom';
 
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import ImmutablePureComponent from 'react-immutable-pure-component';
+import { useSelector } from 'react-redux';
 
-import CloseIcon from '@/material-icons/400-24px/close.svg?react';
-import AttachmentList from 'flavours/glitch/components/attachment_list';
-import { WithOptionalRouterPropTypes, withOptionalRouter } from 'flavours/glitch/utils/react_router';
+import BarChart4BarsIcon from '@/material-icons/400-24px/bar_chart_4_bars.svg?react';
+import PhotoLibraryIcon from '@/material-icons/400-24px/photo_library.svg?react';
+import { Avatar } from 'flavours/glitch/components/avatar';
+import { DisplayName } from 'flavours/glitch/components/display_name';
+import { Icon } from 'flavours/glitch/components/icon';
 
-import { Avatar } from '../../../components/avatar';
-import { DisplayName } from '../../../components/display_name';
-import { IconButton } from '../../../components/icon_button';
+export const ReplyIndicator = () => {
+  const inReplyToId = useSelector(state => state.getIn(['compose', 'in_reply_to']));
+  const status = useSelector(state => state.getIn(['statuses', inReplyToId]));
+  const account = useSelector(state => state.getIn(['accounts', status?.get('account')]));
 
-const messages = defineMessages({
-  cancel: { id: 'reply_indicator.cancel', defaultMessage: 'Cancel' },
-});
-
-class ReplyIndicator extends ImmutablePureComponent {
-
-  static propTypes = {
-    status: ImmutablePropTypes.map,
-    onCancel: PropTypes.func.isRequired,
-    intl: PropTypes.object.isRequired,
-    ...WithOptionalRouterPropTypes,
-  };
-
-  handleClick = () => {
-    this.props.onCancel();
-  };
-
-  handleAccountClick = (e) => {
-    if (e.button === 0 && !(e.ctrlKey || e.metaKey)) {
-      e.preventDefault();
-      this.props.history?.push(`/@${this.props.status.getIn(['account', 'acct'])}`);
-    }
-  };
-
-  render () {
-    const { status, intl } = this.props;
+  if (!status) {
+    return null;
+  }
 
-    if (!status) {
-      return null;
-    }
+  const content = { __html: status.get('contentHtml') };
 
-    const content = { __html: status.get('contentHtml') };
+  return (
+    <div className='reply-indicator'>
+      <div className='reply-indicator__line' />
 
-    return (
-      <div className='reply-indicator'>
-        <div className='reply-indicator__header'>
-          <div className='reply-indicator__cancel'><IconButton title={intl.formatMessage(messages.cancel)} icon='times' iconComponent={CloseIcon} onClick={this.handleClick} inverted /></div>
+      <Link to={`/@${account.get('acct')}`} className='detailed-status__display-avatar'>
+        <Avatar account={account} size={46} />
+      </Link>
 
-          <a href={`/@${status.getIn(['account', 'acct'])}`} onClick={this.handleAccountClick} className='reply-indicator__display-name'>
-            <div className='reply-indicator__display-avatar'><Avatar account={status.get('account')} size={24} /></div>
-            <DisplayName account={status.get('account')} />
-          </a>
-        </div>
+      <div className='reply-indicator__main'>
+        <Link to={`/@${account.get('acct')}`} className='detailed-status__display-name'>
+          <DisplayName account={account} />
+        </Link>
 
         <div className='reply-indicator__content translate' dangerouslySetInnerHTML={content} />
 
-        {status.get('media_attachments').size > 0 && (
-          <AttachmentList
-            compact
-            media={status.get('media_attachments')}
-          />
+        {(status.get('poll') || status.get('media_attachments').size > 0) && (
+          <div className='reply-indicator__attachments'>
+            {status.get('poll') && <><Icon icon={BarChart4BarsIcon} /><FormattedMessage id='reply_indicator.poll' defaultMessage='Poll' /></>}
+            {status.get('media_attachments').size > 0 && <><Icon icon={PhotoLibraryIcon} /><FormattedMessage id='reply_indicator.attachments' defaultMessage='{count, plural, one {# attachment} other {# attachments}}' values={{ count: status.get('media_attachments').size }} /></>}
+          </div>
         )}
       </div>
-    );
-  }
-
-}
-
-export default withOptionalRouter(injectIntl(ReplyIndicator));
+    </div>
+  );
+};
diff --git a/app/javascript/flavours/glitch/features/compose/components/upload.jsx b/app/javascript/flavours/glitch/features/compose/components/upload.jsx
index fd2d80e2f20cc6..2568aacb54850d 100644
--- a/app/javascript/flavours/glitch/features/compose/components/upload.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/upload.jsx
@@ -2,6 +2,8 @@ import PropTypes from 'prop-types';
 
 import { FormattedMessage } from 'react-intl';
 
+import classNames from 'classnames';
+
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
@@ -9,7 +11,8 @@ import spring from 'react-motion/lib/spring';
 
 import CloseIcon from '@/material-icons/400-24px/close.svg?react';
 import EditIcon from '@/material-icons/400-24px/edit.svg?react';
-import InfoIcon from '@/material-icons/400-24px/info.svg?react';
+import WarningIcon from '@/material-icons/400-24px/warning.svg?react';
+import { Blurhash } from 'flavours/glitch/components/blurhash';
 import { Icon }  from 'flavours/glitch/components/icon';
 
 import Motion from '../../ui/util/optional_motion';
@@ -18,6 +21,7 @@ export default class Upload extends ImmutablePureComponent {
 
   static propTypes = {
     media: ImmutablePropTypes.map.isRequired,
+    sensitive: PropTypes.bool,
     onUndo: PropTypes.func.isRequired,
     onOpenFocalPoint: PropTypes.func.isRequired,
   };
@@ -33,7 +37,7 @@ export default class Upload extends ImmutablePureComponent {
   };
 
   render () {
-    const { media } = this.props;
+    const { media, sensitive } = this.props;
 
     if (!media) {
       return null;
@@ -43,22 +47,26 @@ export default class Upload extends ImmutablePureComponent {
     const focusY = media.getIn(['meta', 'focus', 'y']);
     const x = ((focusX /  2) + .5) * 100;
     const y = ((focusY / -2) + .5) * 100;
+    const missingDescription = (media.get('description') || '').length === 0;
 
     return (
       <div className='compose-form__upload'>
         <Motion defaultStyle={{ scale: 0.8 }} style={{ scale: spring(1, { stiffness: 180, damping: 12 }) }}>
           {({ scale }) => (
-            <div className='compose-form__upload-thumbnail' style={{ transform: `scale(${scale})`, backgroundImage: `url(${media.get('preview_url')})`, backgroundPosition: `${x}% ${y}%` }}>
+            <div className='compose-form__upload__thumbnail' style={{ transform: `scale(${scale})`, backgroundImage: !sensitive ? `url(${media.get('preview_url')})` : null, backgroundPosition: `${x}% ${y}%` }}>
+              {sensitive && <Blurhash
+                hash={media.get('blurhash')}
+                className='compose-form__upload__preview'
+              />}
+
               <div className='compose-form__upload__actions'>
-                <button type='button' className='icon-button' onClick={this.handleUndoClick}><Icon id='times' icon={CloseIcon} /> <FormattedMessage id='upload_form.undo' defaultMessage='Delete' /></button>
-                <button type='button' className='icon-button' onClick={this.handleFocalPointClick}><Icon id='pencil' icon={EditIcon} /> <FormattedMessage id='upload_form.edit' defaultMessage='Edit' /></button>
+                <button type='button' className='icon-button compose-form__upload__delete' onClick={this.handleUndoClick}><Icon icon={CloseIcon} /></button>
+                <button type='button' className='icon-button' onClick={this.handleFocalPointClick}><Icon icon={EditIcon} /> <FormattedMessage id='upload_form.edit' defaultMessage='Edit' /></button>
               </div>
 
-              {(media.get('description') || '').length === 0 && (
-                <div className='compose-form__upload__warning'>
-                  <button type='button' className='icon-button' onClick={this.handleFocalPointClick}><Icon id='info-circle' icon={InfoIcon} /> <FormattedMessage id='upload_form.description_missing' defaultMessage='No description added' /></button>
-                </div>
-              )}
+              <div className='compose-form__upload__warning'>
+                <button type='button' className={classNames('icon-button', { active: missingDescription })} onClick={this.handleFocalPointClick}>{missingDescription && <Icon icon={WarningIcon} />} ALT</button>
+              </div>
             </div>
           )}
         </Motion>
diff --git a/app/javascript/flavours/glitch/features/compose/components/upload_button.jsx b/app/javascript/flavours/glitch/features/compose/components/upload_button.jsx
index 923d6a3c47e458..4b8f7213b74947 100644
--- a/app/javascript/flavours/glitch/features/compose/components/upload_button.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/upload_button.jsx
@@ -6,9 +6,8 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-import AddPhotoAlternateIcon from '@/material-icons/400-24px/add_photo_alternate.svg?react';
-
-import { IconButton } from '../../../components/icon_button';
+import PhotoLibraryIcon from '@/material-icons/400-24px/photo_library.svg?react';
+import { IconButton } from 'flavours/glitch/components/icon_button';
 
 const messages = defineMessages({
   upload: { id: 'upload_button.label', defaultMessage: 'Add images, a video or an audio file' },
@@ -31,7 +30,6 @@ class UploadButton extends ImmutablePureComponent {
 
   static propTypes = {
     disabled: PropTypes.bool,
-    unavailable: PropTypes.bool,
     onSelectFile: PropTypes.func.isRequired,
     style: PropTypes.object,
     resetFileKey: PropTypes.number,
@@ -54,17 +52,13 @@ class UploadButton extends ImmutablePureComponent {
   };
 
   render () {
-    const { intl, resetFileKey, unavailable, disabled, acceptContentTypes } = this.props;
-
-    if (unavailable) {
-      return null;
-    }
+    const { intl, resetFileKey, disabled, acceptContentTypes } = this.props;
 
     const message = intl.formatMessage(messages.upload);
 
     return (
       <div className='compose-form__upload-button'>
-        <IconButton icon='paperclip' iconComponent={AddPhotoAlternateIcon} title={message} disabled={disabled} onClick={this.handleClick} className='compose-form__upload-button-icon' size={18} inverted style={iconStyle} />
+        <IconButton icon='paperclip' iconComponent={PhotoLibraryIcon} title={message} disabled={disabled} onClick={this.handleClick} className='compose-form__upload-button-icon' size={18} inverted style={iconStyle} />
         <label>
           <span style={{ display: 'none' }}>{message}</span>
           <input
diff --git a/app/javascript/flavours/glitch/features/compose/components/upload_form.jsx b/app/javascript/flavours/glitch/features/compose/components/upload_form.jsx
index cf2e53ad905f0d..46bac7823b8d16 100644
--- a/app/javascript/flavours/glitch/features/compose/components/upload_form.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/upload_form.jsx
@@ -1,7 +1,6 @@
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-import SensitiveButtonContainer from '../containers/sensitive_button_container';
 import UploadContainer from '../containers/upload_container';
 import UploadProgressContainer from '../containers/upload_progress_container';
 
@@ -15,17 +14,17 @@ export default class UploadForm extends ImmutablePureComponent {
     const { mediaIds } = this.props;
 
     return (
-      <div className='compose-form__upload-wrapper'>
+      <>
         <UploadProgressContainer />
 
-        <div className='compose-form__uploads-wrapper'>
-          {mediaIds.map(id => (
-            <UploadContainer id={id} key={id} />
-          ))}
-        </div>
-
-        {!mediaIds.isEmpty() && <SensitiveButtonContainer />}
-      </div>
+        {mediaIds.size > 0 && (
+          <div className='compose-form__uploads'>
+            {mediaIds.map(id => (
+              <UploadContainer id={id} key={id} />
+            ))}
+          </div>
+        )}
+      </>
     );
   }
 
diff --git a/app/javascript/flavours/glitch/features/compose/components/upload_progress.jsx b/app/javascript/flavours/glitch/features/compose/components/upload_progress.jsx
index f4408b5460084c..7af5d9090e795b 100644
--- a/app/javascript/flavours/glitch/features/compose/components/upload_progress.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/upload_progress.jsx
@@ -35,9 +35,7 @@ export default class UploadProgress extends PureComponent {
 
     return (
       <div className='upload-progress'>
-        <div className='upload-progress__icon'>
-          <Icon id='upload' icon={UploadFileIcon} />
-        </div>
+        <Icon id='upload' icon={UploadFileIcon} />
 
         <div className='upload-progress__message'>
           {message}
diff --git a/app/javascript/flavours/glitch/features/compose/containers/navigation_container.js b/app/javascript/flavours/glitch/features/compose/containers/navigation_container.js
deleted file mode 100644
index 459fffd9107463..00000000000000
--- a/app/javascript/flavours/glitch/features/compose/containers/navigation_container.js
+++ /dev/null
@@ -1,36 +0,0 @@
-import { defineMessages, injectIntl } from 'react-intl';
-
-import { connect }   from 'react-redux';
-
-import { openModal } from 'flavours/glitch/actions/modal';
-import { logOut } from 'flavours/glitch/utils/log_out';
-
-import { me } from '../../../initial_state';
-import NavigationBar from '../components/navigation_bar';
-
-const messages = defineMessages({
-  logoutMessage: { id: 'confirmations.logout.message', defaultMessage: 'Are you sure you want to log out?' },
-  logoutConfirm: { id: 'confirmations.logout.confirm', defaultMessage: 'Log out' },
-});
-
-const mapStateToProps = state => {
-  return {
-    account: state.getIn(['accounts', me]),
-  };
-};
-
-const mapDispatchToProps = (dispatch, { intl }) => ({
-  onLogout () {
-    dispatch(openModal({
-      modalType: 'CONFIRM',
-      modalProps: {
-        message: intl.formatMessage(messages.logoutMessage),
-        confirm: intl.formatMessage(messages.logoutConfirm),
-        closeWhenConfirm: false,
-        onConfirm: () => logOut(),
-      },
-    }));
-  },
-});
-
-export default injectIntl(connect(mapStateToProps, mapDispatchToProps)(NavigationBar));
diff --git a/app/javascript/flavours/glitch/features/compose/containers/poll_button_container.js b/app/javascript/flavours/glitch/features/compose/containers/poll_button_container.js
index b7785ecbb42865..9de388f64aab78 100644
--- a/app/javascript/flavours/glitch/features/compose/containers/poll_button_container.js
+++ b/app/javascript/flavours/glitch/features/compose/containers/poll_button_container.js
@@ -4,7 +4,7 @@ import { addPoll, removePoll } from '../../../actions/compose';
 import PollButton from '../components/poll_button';
 
 const mapStateToProps = state => ({
-  unavailable: state.getIn(['compose', 'is_uploading']) || (state.getIn(['compose', 'media_attachments']).size > 0),
+  disabled: state.getIn(['compose', 'is_uploading']) || (state.getIn(['compose', 'media_attachments']).size > 0),
   active: state.getIn(['compose', 'poll']) !== null,
 });
 
diff --git a/app/javascript/flavours/glitch/features/compose/containers/poll_form_container.js b/app/javascript/flavours/glitch/features/compose/containers/poll_form_container.js
deleted file mode 100644
index 177ffcea6acb4b..00000000000000
--- a/app/javascript/flavours/glitch/features/compose/containers/poll_form_container.js
+++ /dev/null
@@ -1,53 +0,0 @@
-import { connect } from 'react-redux';
-
-import {
-  addPollOption,
-  removePollOption,
-  changePollOption,
-  changePollSettings,
-  clearComposeSuggestions,
-  fetchComposeSuggestions,
-  selectComposeSuggestion,
-} from '../../../actions/compose';
-import PollForm from '../components/poll_form';
-
-const mapStateToProps = state => ({
-  suggestions: state.getIn(['compose', 'suggestions']),
-  options: state.getIn(['compose', 'poll', 'options']),
-  lang: state.getIn(['compose', 'language']),
-  expiresIn: state.getIn(['compose', 'poll', 'expires_in']),
-  isMultiple: state.getIn(['compose', 'poll', 'multiple']),
-});
-
-const mapDispatchToProps = dispatch => ({
-  onAddOption(title) {
-    dispatch(addPollOption(title));
-  },
-
-  onRemoveOption(index) {
-    dispatch(removePollOption(index));
-  },
-
-  onChangeOption(index, title) {
-    dispatch(changePollOption(index, title));
-  },
-
-  onChangeSettings(expiresIn, isMultiple) {
-    dispatch(changePollSettings(expiresIn, isMultiple));
-  },
-
-  onClearSuggestions () {
-    dispatch(clearComposeSuggestions());
-  },
-
-  onFetchSuggestions (token) {
-    dispatch(fetchComposeSuggestions(token));
-  },
-
-  onSuggestionSelected (position, token, accountId, path) {
-    dispatch(selectComposeSuggestion(position, token, accountId, path));
-  },
-
-});
-
-export default connect(mapStateToProps, mapDispatchToProps)(PollForm);
diff --git a/app/javascript/flavours/glitch/features/compose/containers/reply_indicator_container.js b/app/javascript/flavours/glitch/features/compose/containers/reply_indicator_container.js
deleted file mode 100644
index 1147e448afef33..00000000000000
--- a/app/javascript/flavours/glitch/features/compose/containers/reply_indicator_container.js
+++ /dev/null
@@ -1,36 +0,0 @@
-import { connect } from 'react-redux';
-
-import { cancelReplyCompose } from '../../../actions/compose';
-import { makeGetStatus } from '../../../selectors';
-import ReplyIndicator from '../components/reply_indicator';
-
-const makeMapStateToProps = () => {
-  const getStatus = makeGetStatus();
-
-  const mapStateToProps = state => {
-    let statusId = state.getIn(['compose', 'id'], null);
-    let editing  = true;
-
-    if (statusId === null) {
-      statusId = state.getIn(['compose', 'in_reply_to']);
-      editing  = false;
-    }
-
-    return {
-      status: getStatus(state, { id: statusId }),
-      editing,
-    };
-  };
-
-  return mapStateToProps;
-};
-
-const mapDispatchToProps = dispatch => ({
-
-  onCancel () {
-    dispatch(cancelReplyCompose());
-  },
-
-});
-
-export default connect(makeMapStateToProps, mapDispatchToProps)(ReplyIndicator);
diff --git a/app/javascript/flavours/glitch/features/compose/containers/sensitive_button_container.jsx b/app/javascript/flavours/glitch/features/compose/containers/sensitive_button_container.jsx
deleted file mode 100644
index ad56ff1b929c9c..00000000000000
--- a/app/javascript/flavours/glitch/features/compose/containers/sensitive_button_container.jsx
+++ /dev/null
@@ -1,73 +0,0 @@
-import PropTypes from 'prop-types';
-import { PureComponent } from 'react';
-
-import { injectIntl, defineMessages, FormattedMessage } from 'react-intl';
-
-import classNames from 'classnames';
-
-import { connect } from 'react-redux';
-
-import { changeComposeSensitivity } from 'flavours/glitch/actions/compose';
-
-const messages = defineMessages({
-  marked: {
-    id: 'compose_form.sensitive.marked',
-    defaultMessage: '{count, plural, one {Media is marked as sensitive} other {Media is marked as sensitive}}',
-  },
-  unmarked: {
-    id: 'compose_form.sensitive.unmarked',
-    defaultMessage: '{count, plural, one {Media is not marked as sensitive} other {Media is not marked as sensitive}}',
-  },
-});
-
-const mapStateToProps = state => ({
-  active: state.getIn(['compose', 'sensitive']),
-  disabled: state.getIn(['compose', 'spoiler']),
-  mediaCount: state.getIn(['compose', 'media_attachments']).size,
-});
-
-const mapDispatchToProps = dispatch => ({
-
-  onClick () {
-    dispatch(changeComposeSensitivity());
-  },
-
-});
-
-class SensitiveButton extends PureComponent {
-
-  static propTypes = {
-    active: PropTypes.bool,
-    disabled: PropTypes.bool,
-    mediaCount: PropTypes.number,
-    onClick: PropTypes.func.isRequired,
-    intl: PropTypes.object.isRequired,
-  };
-
-  render () {
-    const { active, disabled, mediaCount, onClick, intl } = this.props;
-
-    return (
-      <div className='compose-form__sensitive-button'>
-        <label className={classNames('icon-button', { active })} title={intl.formatMessage(active ? messages.marked : messages.unmarked, { count: mediaCount })}>
-          <input
-            name='mark-sensitive'
-            type='checkbox'
-            checked={active}
-            onChange={onClick}
-            disabled={disabled}
-          />
-
-          <FormattedMessage
-            id='compose_form.sensitive.hide'
-            defaultMessage='{count, plural, one {Mark media as sensitive} other {Mark media as sensitive}}'
-            values={{ count: mediaCount }}
-          />
-        </label>
-      </div>
-    );
-  }
-
-}
-
-export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(SensitiveButton));
diff --git a/app/javascript/flavours/glitch/features/compose/containers/spoiler_button_container.js b/app/javascript/flavours/glitch/features/compose/containers/spoiler_button_container.js
index b3d7a713355775..fce1816fe864e7 100644
--- a/app/javascript/flavours/glitch/features/compose/containers/spoiler_button_container.js
+++ b/app/javascript/flavours/glitch/features/compose/containers/spoiler_button_container.js
@@ -2,8 +2,10 @@ import { injectIntl, defineMessages } from 'react-intl';
 
 import { connect } from 'react-redux';
 
+import WarningIcon from '@/material-icons/400-24px/warning.svg?react';
+import { IconButton } from 'flavours/glitch/components/icon_button';
+
 import { changeComposeSpoilerness } from '../../../actions/compose';
-import TextIconButton from '../components/text_icon_button';
 
 const messages = defineMessages({
   marked: { id: 'compose_form.spoiler.marked', defaultMessage: 'Text is hidden behind warning' },
@@ -11,10 +13,12 @@ const messages = defineMessages({
 });
 
 const mapStateToProps = (state, { intl }) => ({
-  label: 'CW',
+  iconComponent: WarningIcon,
   title: intl.formatMessage(state.getIn(['compose', 'spoiler']) ? messages.marked : messages.unmarked),
   active: state.getIn(['compose', 'spoiler']),
   ariaControls: 'cw-spoiler-input',
+  size: 18,
+  inverted: true,
 });
 
 const mapDispatchToProps = dispatch => ({
@@ -25,4 +29,4 @@ const mapDispatchToProps = dispatch => ({
 
 });
 
-export default injectIntl(connect(mapStateToProps, mapDispatchToProps)(TextIconButton));
+export default injectIntl(connect(mapStateToProps, mapDispatchToProps)(IconButton));
diff --git a/app/javascript/flavours/glitch/features/compose/containers/upload_button_container.js b/app/javascript/flavours/glitch/features/compose/containers/upload_button_container.js
index 42195da617b94f..7c4757b6c3da0d 100644
--- a/app/javascript/flavours/glitch/features/compose/containers/upload_button_container.js
+++ b/app/javascript/flavours/glitch/features/compose/containers/upload_button_container.js
@@ -4,8 +4,7 @@ import { uploadCompose } from '../../../actions/compose';
 import UploadButton from '../components/upload_button';
 
 const mapStateToProps = state => ({
-  disabled: state.getIn(['compose', 'is_uploading']) || (state.getIn(['compose', 'media_attachments']).size + state.getIn(['compose', 'pending_media_attachments']) > 3 || state.getIn(['compose', 'media_attachments']).some(m => ['video', 'audio'].includes(m.get('type')))),
-  unavailable: state.getIn(['compose', 'poll']) !== null,
+  disabled: state.getIn(['compose', 'poll']) !== null || state.getIn(['compose', 'is_uploading']) || (state.getIn(['compose', 'media_attachments']).size + state.getIn(['compose', 'pending_media_attachments']) > 3 || state.getIn(['compose', 'media_attachments']).some(m => ['video', 'audio'].includes(m.get('type')))),
   resetFileKey: state.getIn(['compose', 'resetFileKey']),
 });
 
diff --git a/app/javascript/flavours/glitch/features/compose/containers/upload_container.js b/app/javascript/flavours/glitch/features/compose/containers/upload_container.js
index 77bb90db87b91a..a17a6914448b8a 100644
--- a/app/javascript/flavours/glitch/features/compose/containers/upload_container.js
+++ b/app/javascript/flavours/glitch/features/compose/containers/upload_container.js
@@ -5,6 +5,7 @@ import Upload from '../components/upload';
 
 const mapStateToProps = (state, { id }) => ({
   media: state.getIn(['compose', 'media_attachments']).find(item => item.get('id') === id),
+  sensitive: state.getIn(['compose', 'spoiler']),
 });
 
 const mapDispatchToProps = dispatch => ({
diff --git a/app/javascript/flavours/glitch/features/compose/index.jsx b/app/javascript/flavours/glitch/features/compose/index.jsx
index 5bbb7fab96fe9d..8d0c1942279186 100644
--- a/app/javascript/flavours/glitch/features/compose/index.jsx
+++ b/app/javascript/flavours/glitch/features/compose/index.jsx
@@ -30,7 +30,6 @@ import { isMobile } from '../../is_mobile';
 import Motion from '../ui/util/optional_motion';
 
 import ComposeFormContainer from './containers/compose_form_container';
-import NavigationContainer from './containers/navigation_container';
 import SearchContainer from './containers/search_container';
 import SearchResultsContainer from './containers/search_results_container';
 
@@ -129,8 +128,6 @@ class Compose extends PureComponent {
 
           <div className='drawer__pager'>
             <div className='drawer__inner' onFocus={this.onFocus}>
-              <NavigationContainer onClose={this.onBlur} />
-
               <ComposeFormContainer autoFocus={!isMobile(window.innerWidth)} />
 
               <div className='drawer__inner__mastodon'>
@@ -152,7 +149,6 @@ class Compose extends PureComponent {
 
     return (
       <Column onFocus={this.onFocus}>
-        <NavigationContainer onClose={this.onBlur} />
         <ComposeFormContainer />
 
         <Helmet>
diff --git a/app/javascript/flavours/glitch/features/getting_started/index.jsx b/app/javascript/flavours/glitch/features/getting_started/index.jsx
index 866904eafbd85f..a3464f146af0d5 100644
--- a/app/javascript/flavours/glitch/features/getting_started/index.jsx
+++ b/app/javascript/flavours/glitch/features/getting_started/index.jsx
@@ -32,7 +32,7 @@ import { preferencesLink } from 'flavours/glitch/utils/backend_links';
 
 
 import { me, showTrends } from '../../initial_state';
-import NavigationBar from '../compose/components/navigation_bar';
+import { NavigationBar } from '../compose/components/navigation_bar';
 import ColumnLink from '../ui/components/column_link';
 import ColumnSubheading from '../ui/components/column_subheading';
 
diff --git a/app/javascript/flavours/glitch/features/local_settings/page/index.jsx b/app/javascript/flavours/glitch/features/local_settings/page/index.jsx
index dab63c4ce6d753..849a553e065abc 100644
--- a/app/javascript/flavours/glitch/features/local_settings/page/index.jsx
+++ b/app/javascript/flavours/glitch/features/local_settings/page/index.jsx
@@ -28,9 +28,9 @@ const messages = defineMessages({
   pop_in_left: { id: 'settings.pop_in_left', defaultMessage: 'Left' },
   pop_in_right: { id: 'settings.pop_in_right', defaultMessage:  'Right' },
   public: { id: 'privacy.public.short', defaultMessage: 'Public' },
-  unlisted: { id: 'privacy.unlisted.short', defaultMessage: 'Unlisted' },
-  private: { id: 'privacy.private.short', defaultMessage: 'Followers only' },
-  direct: { id: 'privacy.direct.short', defaultMessage: 'Mentioned people only' },
+  unlisted: { id: 'privacy.unlisted.short', defaultMessage: 'Quiet public' },
+  private: { id: 'privacy.private.short', defaultMessage: 'Followers' },
+  direct: { id: 'privacy.direct.short', defaultMessage: 'Specific people' },
 });
 
 class LocalSettingsPage extends PureComponent {
diff --git a/app/javascript/flavours/glitch/features/standalone/compose/index.jsx b/app/javascript/flavours/glitch/features/standalone/compose/index.jsx
index c36e843f5ada65..a0482c3ce5d706 100644
--- a/app/javascript/flavours/glitch/features/standalone/compose/index.jsx
+++ b/app/javascript/flavours/glitch/features/standalone/compose/index.jsx
@@ -1,21 +1,15 @@
-import { PureComponent } from 'react';
-
-import ComposeFormContainer from '../../compose/containers/compose_form_container';
-import LoadingBarContainer from '../../ui/containers/loading_bar_container';
-import ModalContainer from '../../ui/containers/modal_container';
-import NotificationsContainer from '../../ui/containers/notifications_container';
-
-export default class Compose extends PureComponent {
-
-  render () {
-    return (
-      <div>
-        <ComposeFormContainer autoFocus />
-        <NotificationsContainer />
-        <ModalContainer />
-        <LoadingBarContainer className='loading-bar' />
-      </div>
-    );
-  }
-
-}
+import ComposeFormContainer from 'flavours/glitch/features/compose/containers/compose_form_container';
+import LoadingBarContainer from 'flavours/glitch/features/ui/containers/loading_bar_container';
+import ModalContainer from 'flavours/glitch/features/ui/containers/modal_container';
+import NotificationsContainer from 'flavours/glitch/features/ui/containers/notifications_container';
+
+const Compose = () => (
+  <>
+    <ComposeFormContainer autoFocus withoutNavigation />
+    <NotificationsContainer />
+    <ModalContainer />
+    <LoadingBarContainer className='loading-bar' />
+  </>
+);
+
+export default Compose;
diff --git a/app/javascript/flavours/glitch/features/ui/components/compose_panel.jsx b/app/javascript/flavours/glitch/features/ui/components/compose_panel.jsx
index 3f9ba99e4ffb9c..a99d76c1a47707 100644
--- a/app/javascript/flavours/glitch/features/ui/components/compose_panel.jsx
+++ b/app/javascript/flavours/glitch/features/ui/components/compose_panel.jsx
@@ -6,7 +6,6 @@ import { connect } from 'react-redux';
 import { mountCompose, unmountCompose } from 'flavours/glitch/actions/compose';
 import ServerBanner from 'flavours/glitch/components/server_banner';
 import ComposeFormContainer from 'flavours/glitch/features/compose/containers/compose_form_container';
-import NavigationContainer from 'flavours/glitch/features/compose/containers/navigation_container';
 import SearchContainer from 'flavours/glitch/features/compose/containers/search_container';
 
 import LinkFooter from './link_footer';
@@ -46,10 +45,7 @@ class ComposePanel extends PureComponent {
         )}
 
         {signedIn && (
-          <>
-            <NavigationContainer />
-            <ComposeFormContainer singleColumn />
-          </>
+          <ComposeFormContainer singleColumn />
         )}
 
         <LinkFooter />
diff --git a/app/javascript/flavours/glitch/features/ui/components/focal_point_modal.jsx b/app/javascript/flavours/glitch/features/ui/components/focal_point_modal.jsx
index caed29c2520604..d584277dc3ba26 100644
--- a/app/javascript/flavours/glitch/features/ui/components/focal_point_modal.jsx
+++ b/app/javascript/flavours/glitch/features/ui/components/focal_point_modal.jsx
@@ -21,7 +21,7 @@ import { Button } from 'flavours/glitch/components/button';
 import { GIFV } from 'flavours/glitch/components/gifv';
 import { IconButton } from 'flavours/glitch/components/icon_button';
 import Audio from 'flavours/glitch/features/audio';
-import CharacterCounter from 'flavours/glitch/features/compose/components/character_counter';
+import { CharacterCounter } from 'flavours/glitch/features/compose/components/character_counter';
 import UploadProgress from 'flavours/glitch/features/compose/components/upload_progress';
 import { Tesseract as fetchTesseract } from 'flavours/glitch/features/ui/util/async-components';
 import { me } from 'flavours/glitch/initial_state';
diff --git a/app/javascript/flavours/glitch/features/ui/components/mute_modal.jsx b/app/javascript/flavours/glitch/features/ui/components/mute_modal.jsx
index 2d95cabef84db1..fa81ea81a31d53 100644
--- a/app/javascript/flavours/glitch/features/ui/components/mute_modal.jsx
+++ b/app/javascript/flavours/glitch/features/ui/components/mute_modal.jsx
@@ -108,7 +108,6 @@ class MuteModal extends PureComponent {
           <div>
             <span><FormattedMessage id='mute_modal.duration' defaultMessage='Duration' />: </span>
 
-            {/* eslint-disable-next-line jsx-a11y/no-onchange */}
             <select value={muteDuration} onChange={this.changeMuteDuration}>
               <option value={0}>{intl.formatMessage(messages.indefinite)}</option>
               <option value={300}>{intl.formatMessage(messages.minutes, { number: 5 })}</option>
diff --git a/app/javascript/flavours/glitch/locales/en.json b/app/javascript/flavours/glitch/locales/en.json
index 94e7415b031bb3..7321f5ac3da557 100644
--- a/app/javascript/flavours/glitch/locales/en.json
+++ b/app/javascript/flavours/glitch/locales/en.json
@@ -5,13 +5,6 @@
   "account.follows_you": "Follows you",
   "account.suspended_disclaimer_full": "This user has been suspended by a moderator.",
   "account.view_full_profile": "View full profile",
-  "advanced_options.icon_title": "Advanced options",
-  "advanced_options.local-only.long": "Do not post to other instances",
-  "advanced_options.local-only.short": "Local-only",
-  "advanced_options.local-only.tooltip": "This post is local-only",
-  "advanced_options.threaded_mode.long": "Automatically opens a reply on posting",
-  "advanced_options.threaded_mode.short": "Threaded mode",
-  "advanced_options.threaded_mode.tooltip": "Threaded mode enabled",
   "boost_modal.missing_description": "This toot contains some media without description",
   "column.favourited_by": "Favourited by",
   "column.heading": "Misc",
@@ -21,26 +14,13 @@
   "column_subheading.lists": "Lists",
   "column_subheading.navigation": "Navigation",
   "community.column_settings.allow_local_only": "Show local-only toots",
-  "compose.attach": "Attach...",
-  "compose.attach.doodle": "Draw something",
-  "compose.attach.upload": "Upload a file",
-  "compose.content-type.html": "HTML",
-  "compose.content-type.markdown": "Markdown",
-  "compose.content-type.plain": "Plain text",
-  "compose_form.poll.multiple_choices": "Allow multiple choices",
-  "compose_form.poll.single_choice": "Allow one choice",
-  "compose_form.spoiler": "Hide text behind warning",
   "confirmation_modal.do_not_ask_again": "Do not ask for confirmation again",
   "confirmations.deprecated_settings.confirm": "Use Mastodon preferences",
   "confirmations.deprecated_settings.message": "Some of the glitch-soc device-specific {app_settings} you are using have been replaced by Mastodon {preferences} and will be overriden:",
-  "confirmations.missing_media_description.confirm": "Send anyway",
-  "confirmations.missing_media_description.edit": "Edit media",
-  "confirmations.missing_media_description.message": "At least one media attachment is lacking a description. Consider describing all media attachments for the visually impaired before sending your toot.",
   "confirmations.unfilter.author": "Author",
   "confirmations.unfilter.confirm": "Show",
   "confirmations.unfilter.edit_filter": "Edit filter",
   "confirmations.unfilter.filters": "Matching {count, plural, one {filter} other {filters}}",
-  "content-type.change": "Content type",
   "direct.group_by_conversations": "Group by conversation",
   "endorsed_accounts_editor.endorsed_accounts": "Featured accounts",
   "favourite_modal.combo": "You can press {combo} to skip this next time",
diff --git a/app/javascript/flavours/glitch/packs/share.jsx b/app/javascript/flavours/glitch/packs/share.jsx
index 21f1da638da281..7a4e333653f8d8 100644
--- a/app/javascript/flavours/glitch/packs/share.jsx
+++ b/app/javascript/flavours/glitch/packs/share.jsx
@@ -10,10 +10,12 @@ function loaded() {
 
   if (mountNode) {
     const attr = mountNode.getAttribute('data-props');
-    if(!attr) return;
+
+    if (!attr) return;
 
     const props = JSON.parse(attr);
     const root = createRoot(mountNode);
+
     root.render(<ComposeContainer {...props} />);
   }
 }
diff --git a/app/javascript/flavours/glitch/reducers/compose.js b/app/javascript/flavours/glitch/reducers/compose.js
index 8a221e64068551..e11a103026c196 100644
--- a/app/javascript/flavours/glitch/reducers/compose.js
+++ b/app/javascript/flavours/glitch/reducers/compose.js
@@ -44,9 +44,7 @@ import {
   COMPOSE_RESET,
   COMPOSE_POLL_ADD,
   COMPOSE_POLL_REMOVE,
-  COMPOSE_POLL_OPTION_ADD,
   COMPOSE_POLL_OPTION_CHANGE,
-  COMPOSE_POLL_OPTION_REMOVE,
   COMPOSE_POLL_SETTINGS_CHANGE,
   INIT_MEDIA_EDIT_MODAL,
   COMPOSE_CHANGE_MEDIA_DESCRIPTION,
@@ -366,6 +364,18 @@ const updateSuggestionTags = (state, token) => {
   });
 };
 
+const updatePoll = (state, index, value) => state.updateIn(['poll', 'options'], options => {
+  const tmp = options.set(index, value).filterNot(x => x.trim().length === 0);
+
+  if (tmp.size === 0) {
+    return tmp.push('').push('');
+  } else if (tmp.size < 4) {
+    return tmp.push('');
+  }
+
+  return tmp;
+});
+
 export default function compose(state = initialState, action) {
   switch(action.type) {
   case STORE_HYDRATE:
@@ -649,12 +659,8 @@ export default function compose(state = initialState, action) {
     return state.set('poll', initialPoll);
   case COMPOSE_POLL_REMOVE:
     return state.set('poll', null);
-  case COMPOSE_POLL_OPTION_ADD:
-    return state.updateIn(['poll', 'options'], options => options.push(action.title));
   case COMPOSE_POLL_OPTION_CHANGE:
-    return state.setIn(['poll', 'options', action.index], action.title);
-  case COMPOSE_POLL_OPTION_REMOVE:
-    return state.updateIn(['poll', 'options'], options => options.delete(action.index));
+    return updatePoll(state, action.index, action.title);
   case COMPOSE_POLL_SETTINGS_CHANGE:
     return state.update('poll', poll => poll.set('expires_in', action.expiresIn).set('multiple', action.isMultiple));
   case COMPOSE_LANGUAGE_CHANGE:
diff --git a/app/javascript/flavours/glitch/styles/_mixins.scss b/app/javascript/flavours/glitch/styles/_mixins.scss
index ec2a7e7ced145d..a59bb2d4419559 100644
--- a/app/javascript/flavours/glitch/styles/_mixins.scss
+++ b/app/javascript/flavours/glitch/styles/_mixins.scss
@@ -24,13 +24,14 @@
   outline: 0;
   box-sizing: border-box;
   width: 100%;
-  border: 0;
   box-shadow: none;
   font-family: inherit;
   background: $ui-base-color;
   color: $darker-text-color;
   border-radius: 4px;
-  font-size: 14px;
+  border: 1px solid lighten($ui-base-color, 8%);
+  font-size: 17px;
+  line-height: normal;
   margin: 0;
 }
 
diff --git a/app/javascript/flavours/glitch/styles/admin.scss b/app/javascript/flavours/glitch/styles/admin.scss
index 2f4027b03fb6ea..5963f3ee6edeb1 100644
--- a/app/javascript/flavours/glitch/styles/admin.scss
+++ b/app/javascript/flavours/glitch/styles/admin.scss
@@ -1336,6 +1336,9 @@ a.sparkline {
 
     &__label {
       padding: 15px;
+      display: flex;
+      gap: 8px;
+      align-items: center;
     }
 
     &__rules {
@@ -1346,6 +1349,9 @@ a.sparkline {
   &__rule {
     cursor: pointer;
     padding: 15px;
+    display: flex;
+    gap: 8px;
+    align-items: center;
   }
 }
 
diff --git a/app/javascript/flavours/glitch/styles/basics.scss b/app/javascript/flavours/glitch/styles/basics.scss
index a796bce6743997..7dc8e340c3256b 100644
--- a/app/javascript/flavours/glitch/styles/basics.scss
+++ b/app/javascript/flavours/glitch/styles/basics.scss
@@ -8,7 +8,7 @@
 
 body {
   font-family: $font-sans-serif, sans-serif;
-  background: darken($ui-base-color, 7%);
+  background: darken($ui-base-color, 8%);
   font-size: 13px;
   line-height: 18px;
   font-weight: 400;
diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index 54a119ded7eb94..5be0e85606621e 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -373,46 +373,155 @@ body > [data-popper-placement] {
   }
 }
 
-.compose-form {
-  padding: 10px; // glitch: reduced padding
-
-  &__sensitive-button {
-    padding: 10px;
-    padding-top: 0;
-    font-size: 14px;
-    font-weight: 500;
+.autosuggest-textarea {
+  &__textarea {
+    background: transparent;
+    min-height: 100px;
+    padding-bottom: 0;
+    resize: none;
+    scrollbar-color: initial;
 
-    &.active {
-      color: $highlight-text-color;
+    &::-webkit-scrollbar {
+      all: unset;
     }
+  }
 
-    input[type='checkbox'] {
-      appearance: none;
-      display: inline-block;
-      position: relative;
-      border: 1px solid $ui-primary-color;
+  &__suggestions {
+    box-shadow: var(--dropdown-shadow);
+    background: $ui-base-color;
+    border: 1px solid lighten($ui-base-color, 14%);
+    border-radius: 0 0 4px 4px;
+    color: $secondary-text-color;
+    font-size: 14px;
+    padding: 0;
+
+    &__item {
       box-sizing: border-box;
-      width: 18px;
-      height: 18px;
-      flex: 0 0 auto;
-      margin-inline-end: 10px;
-      top: -1px;
-      border-radius: 4px;
-      vertical-align: middle;
-      cursor: inherit;
+      display: flex;
+      align-items: center;
+      height: 48px;
+      cursor: pointer;
+      font-size: 14px;
+      line-height: 20px;
+      letter-spacing: 0.25px;
+      color: $secondary-text-color;
 
-      &:checked {
-        border-color: $highlight-text-color;
-        background: $highlight-text-color
-          url("data:image/svg+xml;utf8,<svg width='18' height='18' fill='none' xmlns='http://www.w3.org/2000/svg'><path d='M4.5 8.5L8 12l6-6' stroke='white' stroke-width='1.5'/></svg>")
-          center center no-repeat;
+      &:last-child {
+        border-radius: 0 0 4px 4px;
       }
+
+      &:hover,
+      &:focus,
+      &:active,
+      &.selected {
+        background: $ui-highlight-color;
+        color: $primary-text-color;
+
+        .autosuggest-account .display-name__account {
+          color: inherit;
+        }
+      }
+    }
+  }
+}
+
+.autosuggest-account,
+.autosuggest-emoji,
+.autosuggest-hashtag {
+  flex: 1 0 0;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: flex-start;
+  gap: 12px;
+  padding: 8px 12px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.autosuggest-account {
+  .display-name {
+    font-weight: 400;
+    display: flex;
+    flex-direction: column;
+    flex: 1 0 0;
+  }
+
+  .display-name__account {
+    display: block;
+    line-height: 16px;
+    font-size: 12px;
+    color: $dark-text-color;
+  }
+}
+
+.autosuggest-hashtag {
+  justify-content: space-between;
+
+  &__name {
+    flex: 1 1 auto;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+
+  &__uses {
+    flex: 0 0 auto;
+    text-align: end;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+}
+
+.autosuggest-emoji {
+  &__name {
+    flex: 1 0 0;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+}
+
+.autosuggest-account .account__avatar,
+.autosuggest-emoji img {
+  display: block;
+  width: 24px;
+  height: 24px;
+  flex: 0 0 auto;
+}
+
+.compose-form {
+  display: flex;
+  flex-direction: column;
+  gap: 32px;
+
+  .layout-multiple-columns &,
+  .column & {
+    padding: 15px;
+  }
+
+  &__highlightable {
+    display: flex;
+    flex-direction: column;
+    gap: 16px;
+    flex: 0 1 auto;
+    border-radius: 4px;
+    border: 1px solid lighten($ui-base-color, 8%);
+    transition: border-color 300ms linear;
+    min-height: 0;
+    position: relative;
+    background: $ui-base-color;
+    overflow-y: auto;
+
+    &.active {
+      transition: none;
+      border-color: $ui-highlight-color;
     }
   }
 
-  .compose-form__warning {
+  &__warning {
     color: $inverted-text-color;
-    margin-bottom: 10px;
     background: $ui-primary-color;
     box-shadow: 0 2px 6px rgba($base-shadow-color, 0.3);
     padding: 8px 10px;
@@ -444,32 +553,27 @@ body > [data-popper-placement] {
     }
   }
 
-  .emoji-picker-dropdown {
-    position: absolute;
-    top: 0;
-    inset-inline-end: 0;
-  }
+  .spoiler-input {
+    display: flex;
+    align-items: stretch;
 
-  .compose-form__autosuggest-wrapper {
-    position: relative;
-  }
+    &__border {
+      background: url('~images/warning-stripes.svg') repeat-y;
+      width: 5px;
+      flex: 0 0 auto;
 
-  .autosuggest-textarea,
-  .autosuggest-input,
-  .spoiler-input {
-    position: relative;
-    width: 100%;
-  }
+      &:first-child {
+        border-start-start-radius: 4px;
+      }
 
-  .spoiler-input {
-    height: 0;
-    transform-origin: bottom;
-    opacity: 0;
+      &:last-child {
+        border-start-end-radius: 4px;
+      }
+    }
 
-    &.spoiler-input--visible {
-      height: 36px;
-      margin-bottom: 11px;
-      opacity: 1;
+    .autosuggest-input {
+      flex: 1 1 auto;
+      border-bottom: 1px solid lighten($ui-base-color, 8%);
     }
   }
 
@@ -479,269 +583,303 @@ body > [data-popper-placement] {
     box-sizing: border-box;
     width: 100%;
     margin: 0;
-    color: $inverted-text-color;
-    background: $simple-background-color;
-    padding: 10px;
+    color: $secondary-text-color;
+    background: $ui-base-color;
     font-family: inherit;
     font-size: 14px;
-    resize: vertical;
+    padding: 12px;
+    line-height: normal;
     border: 0;
     outline: 0;
 
-    &::placeholder {
-      color: $dark-text-color;
-    }
-
     &:focus {
       outline: 0;
     }
-
-    @media screen and (width <= 600px) {
-      font-size: 16px;
-    }
   }
 
   .spoiler-input__input {
-    border-radius: 4px;
+    padding: 12px 12px - 5px;
+    background: mix($ui-base-color, $ui-highlight-color, 85%);
+    color: $highlight-text-color;
   }
 
-  .autosuggest-textarea__textarea {
-    min-height: 100px;
-    border-radius: 4px 4px 0 0;
-    padding-bottom: 0;
-    padding-right: 10px + 22px; // Cannot use inline-end because of dir=auto
-    resize: none;
-    scrollbar-color: initial;
-
-    &::-webkit-scrollbar {
-      all: unset;
-    }
+  &__dropdowns {
+    display: flex;
+    align-items: center;
+    gap: 8px;
 
-    @media screen and (width <= 600px) {
-      height: 100px !important; // Prevent auto-resize textarea
-      resize: vertical;
+    & > div {
+      overflow: hidden;
+      display: flex;
     }
   }
 
-  .autosuggest-textarea__suggestions-wrapper {
-    position: relative;
-    height: 0;
+  &__uploads {
+    display: flex;
+    gap: 8px;
+    padding: 0 12px;
+    flex-wrap: wrap;
+    align-self: stretch;
+    align-items: flex-start;
+    align-content: flex-start;
+    justify-content: center;
   }
 
-  .autosuggest-textarea__suggestions {
-    box-sizing: border-box;
-    display: none;
-    position: absolute;
-    top: 100%;
-    width: 100%;
-    z-index: 99;
-    box-shadow: 4px 4px 6px rgba($base-shadow-color, 0.4);
-    background: $ui-secondary-color;
-    border-radius: 0 0 4px 4px;
-    color: $inverted-text-color;
-    font-size: 14px;
-    padding: 6px;
+  &__upload {
+    flex: 1 1 0;
+    min-width: calc(50% - 8px);
 
-    &.autosuggest-textarea__suggestions--visible {
-      display: block;
+    &__actions {
+      display: flex;
+      align-items: flex-start;
+      justify-content: space-between;
+      padding: 8px;
     }
-  }
 
-  .autosuggest-textarea__suggestions__item {
-    padding: 10px;
-    cursor: pointer;
-    border-radius: 4px;
-
-    &:hover,
-    &:focus,
-    &:active,
-    &.selected {
-      background: darken($ui-secondary-color, 10%);
+    &__preview {
+      position: absolute;
+      width: 100%;
+      height: 100%;
+      border-radius: 6px;
+      z-index: -1;
+      top: 0;
+      inset-inline-start: 0;
     }
-  }
 
-  .autosuggest-account,
-  .autosuggest-emoji,
-  .autosuggest-hashtag {
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-    justify-content: flex-start;
-    line-height: 18px;
-    font-size: 14px;
-  }
-
-  .autosuggest-hashtag {
-    justify-content: space-between;
-
-    &__name {
-      flex: 1 1 auto;
+    &__thumbnail {
+      width: 100%;
+      height: 144px;
+      border-radius: 6px;
+      background-position: center;
+      background-size: cover;
+      background-repeat: no-repeat;
       overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
     }
 
-    strong {
+    .icon-button {
+      flex: 0 0 auto;
+      color: $white;
+      background: rgba(0, 0, 0, 75%);
+      border-radius: 6px;
+      font-size: 12px;
+      line-height: 16px;
       font-weight: 500;
+      padding: 4px 8px;
+      font-family: inherit;
+
+      .icon {
+        width: 15px;
+        height: 15px;
+      }
     }
 
-    &__uses {
-      flex: 0 0 auto;
-      text-align: end;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
+    .icon-button.compose-form__upload__delete {
+      padding: 3px;
+      border-radius: 50%;
+
+      .icon {
+        width: 18px;
+        height: 18px;
+      }
+    }
+
+    &__warning {
+      position: absolute;
+      z-index: 2;
+      bottom: 0;
+      inset-inline-start: 0;
+      inset-inline-end: 0;
+      padding: 8px;
+
+      .icon-button.active {
+        color: #ffbe2e;
+        background: rgba(0, 0, 0, 75%);
+      }
     }
   }
 
-  .autosuggest-account-icon,
-  .autosuggest-emoji img {
-    display: block;
-    margin-inline-end: 8px;
-    width: 16px;
-    height: 16px;
+  &__footer {
+    display: flex;
+    flex-direction: column;
+    gap: 12px;
+    padding: 12px;
+    padding-top: 0;
   }
 
-  .autosuggest-account .display-name__account {
-    color: $lighter-text-color;
+  &__submit {
+    display: flex;
+    align-items: center;
+    flex: 1 1 auto;
+    max-width: 100%;
+    overflow: hidden;
   }
 
-  .compose-form__modifiers {
-    color: $inverted-text-color;
-    font-family: inherit;
-    font-size: 14px;
-    background: $simple-background-color;
+  &__buttons {
+    display: flex;
+    gap: 8px;
+    align-items: center;
+    flex: 1 1 auto;
 
-    .compose-form__upload-wrapper {
-      overflow: hidden;
+    & > div {
+      display: flex;
     }
 
-    .compose-form__uploads-wrapper {
-      display: flex;
-      flex-direction: row;
-      padding: 5px;
-      flex-wrap: wrap;
+    .icon-button {
+      padding: 3px;
     }
 
-    .compose-form__upload {
-      flex: 1 1 0;
-      min-width: 40%;
-      margin: 5px;
+    .icon-button .icon {
+      width: 18px;
+      height: 18px;
+    }
+  }
 
-      &__actions {
-        background: linear-gradient(
-          180deg,
-          rgba($base-shadow-color, 0.8) 0,
-          rgba($base-shadow-color, 0.35) 80%,
-          transparent
-        );
-        display: flex;
-        align-items: flex-start;
-        justify-content: space-between;
-      }
+  &__actions {
+    display: flex;
+    align-items: center;
+    flex: 0 0 auto;
+    gap: 12px;
+    flex-wrap: wrap;
 
-      .icon-button {
-        flex: 0 1 auto;
-        color: $secondary-text-color;
-        font-size: 14px;
-        font-weight: 500;
-        padding: 10px;
-        font-family: inherit;
+    .button {
+      display: block; // Otherwise text-ellipsis doesn't work
+      font-size: 14px;
+      line-height: normal;
+      font-weight: 700;
+      flex: 1 1 auto;
+      padding: 5px 12px;
+      border-radius: 4px;
+    }
 
-        .icon {
-          width: 15px;
-          height: 15px;
-        }
+    .icon-button {
+      box-sizing: content-box;
+      color: $highlight-text-color;
 
-        &:hover,
-        &:focus,
-        &:active {
-          color: lighten($secondary-text-color, 7%);
-        }
+      &:hover,
+      &:focus,
+      &:active {
+        color: $highlight-text-color;
       }
 
-      &__warning {
-        position: absolute;
-        z-index: 2;
-        bottom: 0;
-        inset-inline-start: 0;
-        inset-inline-end: 0;
-        box-sizing: border-box;
-        background: linear-gradient(
-          0deg,
-          rgba($base-shadow-color, 0.8) 0,
-          rgba($base-shadow-color, 0.35) 80%,
-          transparent
-        );
+      &.disabled {
+        color: $highlight-text-color;
+        opacity: 0.5;
       }
-    }
 
-    .compose-form__upload-thumbnail {
-      border-radius: 4px;
-      background-color: $base-shadow-color;
-      background-position: center;
-      background-size: cover;
-      background-repeat: no-repeat;
-      height: 140px;
-      width: 100%;
-      overflow: hidden;
+      &.active {
+        background: $ui-highlight-color;
+        color: $primary-text-color;
+      }
     }
   }
 
-  .compose-form__buttons-wrapper {
-    padding: 10px;
-    background: darken($simple-background-color, 8%);
-    border-radius: 0 0 4px 4px;
+  &__poll {
     display: flex;
-    justify-content: space-between;
-    flex: 0 0 auto;
-
-    .compose-form__buttons {
-      display: flex;
-      gap: 2px;
+    flex-direction: column;
+    align-self: stretch;
+    gap: 8px;
 
-      .icon-button {
-        height: 100%;
-      }
+    .poll__option {
+      padding: 0 12px;
+      gap: 8px;
 
-      .compose-form__upload-button-icon {
-        line-height: 27px;
+      &.empty:not(:focus-within) {
+        opacity: 0.5;
       }
+    }
 
-      .compose-form__sensitive-button {
-        display: none;
+    .poll__input {
+      width: 17px;
+      height: 17px;
+      border-color: $darker-text-color;
+    }
 
-        &.compose-form__sensitive-button--visible {
-          display: block;
-        }
+    &__footer {
+      display: flex;
+      align-items: center;
+      gap: 16px;
+      padding-inline-start: 37px;
+      padding-inline-end: 40px;
 
-        .compose-form__sensitive-button__icon {
-          line-height: 27px;
-        }
+      &__sep {
+        width: 1px;
+        height: 22px;
+        background: lighten($ui-base-color, 8%);
+        flex: 0 0 auto;
       }
     }
 
-    .icon-button,
-    .text-icon-button {
-      box-sizing: content-box;
-      padding: 0 3px;
-    }
+    &__select {
+      display: flex;
+      flex-direction: column;
+      gap: 2px;
+      flex: 1 1 auto;
+      min-width: 0;
+
+      &__label {
+        flex: 0 0 auto;
+        font-size: 11px;
+        font-weight: 500;
+        line-height: 16px;
+        letter-spacing: 0.5px;
+        color: $darker-text-color;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+        overflow: hidden;
+      }
 
-    .character-counter__wrapper {
-      align-self: center;
-      margin-inline-end: 4px;
+      &__value {
+        flex: 0 0 auto;
+        appearance: none;
+        background: transparent;
+        border: none;
+        padding: 0;
+        font-size: 14px;
+        font-weight: 500;
+        line-height: 20px;
+        letter-spacing: 0.1px;
+        color: $highlight-text-color;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+        overflow: hidden;
+      }
     }
   }
+}
 
-  .compose-form__publish {
-    display: flex;
-    justify-content: flex-end;
-    min-width: 0;
+.dropdown-button {
+  display: flex;
+  align-items: center;
+  gap: 4px;
+  background: transparent;
+  color: $highlight-text-color;
+  border-radius: 6px;
+  border: 1px solid $highlight-text-color;
+  padding: 4px 8px;
+  font-size: 13px;
+  line-height: normal;
+  font-weight: 400;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+
+  .icon {
+    width: 15px;
+    height: 15px;
     flex: 0 0 auto;
+  }
 
-    .compose-form__publish-button-wrapper {
-      padding-top: 15px;
-    }
+  &__label {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    flex: 1 1 auto;
+  }
+
+  &.active {
+    background: $ui-highlight-color;
+    border-color: $ui-highlight-color;
+    color: $primary-text-color;
   }
 }
 
@@ -749,11 +887,14 @@ body > [data-popper-placement] {
   cursor: default;
   font-family: $font-sans-serif, sans-serif;
   font-size: 14px;
-  font-weight: 600;
-  color: $lighter-text-color;
+  font-weight: 400;
+  line-height: normal;
+  color: $darker-text-color;
+  flex: 1 0 auto;
+  text-align: end;
 
   &.character-counter--over {
-    color: $warning-red;
+    color: $error-red;
   }
 }
 
@@ -799,41 +940,6 @@ body > [data-popper-placement] {
   }
 }
 
-.reply-indicator {
-  border-radius: 4px;
-  margin-bottom: 10px;
-  background: $ui-primary-color;
-  padding: 10px;
-  min-height: 23px;
-  overflow-y: auto;
-  flex: 0 2 auto;
-}
-
-.reply-indicator__header {
-  margin-bottom: 5px;
-  overflow: hidden;
-}
-
-.reply-indicator__cancel {
-  float: right;
-  line-height: 24px;
-}
-
-.reply-indicator__display-name {
-  color: $inverted-text-color;
-  display: block;
-  max-width: 100%;
-  line-height: 24px;
-  overflow: hidden;
-  padding-inline-end: 25px;
-  text-decoration: none;
-}
-
-.reply-indicator__display-avatar {
-  float: left;
-  margin-inline-end: 5px;
-}
-
 .status__content--with-action {
   cursor: pointer;
 }
@@ -843,14 +949,15 @@ body > [data-popper-placement] {
 }
 
 .status__content,
+.edit-indicator__content,
 .reply-indicator__content {
   position: relative;
-  font-size: 15px;
-  line-height: 20px;
   word-wrap: break-word;
   font-weight: 400;
   overflow: hidden;
   text-overflow: ellipsis;
+  font-size: 15px;
+  line-height: 20px;
   padding-top: 2px;
   color: $primary-text-color;
 
@@ -938,6 +1045,174 @@ body > [data-popper-placement] {
   overflow: visible;
 }
 
+.reply-indicator {
+  display: grid;
+  grid-template-columns: 46px minmax(0, 1fr);
+  grid-template-rows: 46px max-content;
+  gap: 0 10px;
+
+  .detailed-status__display-name {
+    margin-bottom: 4px;
+  }
+
+  .detailed-status__display-avatar {
+    grid-column-start: 1;
+    grid-row-start: 1;
+    grid-row-end: span 1;
+  }
+
+  &__main {
+    grid-column-start: 2;
+    grid-row-start: 1;
+    grid-row-end: span 2;
+  }
+
+  .display-name {
+    font-size: 14px;
+    line-height: 16px;
+
+    &__account {
+      display: none;
+    }
+  }
+
+  &__line {
+    grid-column-start: 1;
+    grid-row-start: 2;
+    grid-row-end: span 1;
+    position: relative;
+
+    &::before {
+      display: block;
+      content: '';
+      position: absolute;
+      inset-inline-start: 50%;
+      top: 4px;
+      transform: translateX(-50%);
+      background: lighten($ui-base-color, 8%);
+      width: 2px;
+      height: calc(100% + 32px - 8px); // Account for gap to next element
+    }
+  }
+
+  &__content {
+    font-size: 14px;
+    line-height: 20px;
+    letter-spacing: 0.25px;
+    display: -webkit-box;
+    -webkit-line-clamp: 4;
+    -webkit-box-orient: vertical;
+    padding: 0;
+    max-height: 4 * 20px;
+    overflow: hidden;
+    color: $darker-text-color;
+  }
+
+  &__attachments {
+    margin-top: 4px;
+    color: $darker-text-color;
+    font-size: 12px;
+    line-height: 16px;
+    display: flex;
+    align-items: center;
+    gap: 4px;
+
+    .icon {
+      width: 18px;
+      height: 18px;
+    }
+  }
+}
+
+.edit-indicator {
+  border-radius: 4px 4px 0 0;
+  background: lighten($ui-base-color, 4%);
+  padding: 12px;
+  overflow-y: auto;
+  flex: 0 0 auto;
+  border-bottom: 0.5px solid lighten($ui-base-color, 8%);
+  display: flex;
+  flex-direction: column;
+  gap: 4px;
+
+  &__header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    color: $darker-text-color;
+    font-size: 12px;
+    line-height: 16px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  &__cancel {
+    display: flex;
+
+    .icon {
+      width: 18px;
+      height: 18px;
+    }
+  }
+
+  &__display-name {
+    display: flex;
+    gap: 4px;
+
+    a {
+      color: inherit;
+      text-decoration: none;
+
+      &:hover,
+      &:focus,
+      &:active {
+        text-decoration: underline;
+      }
+    }
+  }
+
+  &__content {
+    color: $secondary-text-color;
+    font-size: 14px;
+    line-height: 20px;
+    letter-spacing: 0.25px;
+    padding-top: 0 !important;
+    display: -webkit-box;
+    -webkit-line-clamp: 4;
+    -webkit-box-orient: vertical;
+    max-height: 4 * 20px;
+    overflow: hidden;
+
+    a {
+      color: $highlight-text-color;
+    }
+  }
+
+  &__attachments {
+    color: $darker-text-color;
+    font-size: 12px;
+    line-height: 16px;
+    opacity: 0.75;
+    display: flex;
+    align-items: center;
+    gap: 4px;
+
+    .icon {
+      width: 18px;
+      height: 18px;
+    }
+  }
+}
+
+.edit-indicator__content,
+.reply-indicator__content {
+  .emojione {
+    width: 18px;
+    height: 18px;
+    margin: -3px 0 0;
+  }
+}
+
 .announcements__item__content {
   word-wrap: break-word;
   overflow-y: auto;
@@ -1618,18 +1893,9 @@ body > [data-popper-placement] {
 
 .detailed-status__favorites,
 .detailed-status__reblogs {
-  font-weight: 500;
-  font-size: 12px;
-  line-height: 18px;
-}
-
-.reply-indicator__content {
-  color: $inverted-text-color;
-  font-size: 14px;
-
-  a {
-    color: $lighter-text-color;
-  }
+  font-weight: 500;
+  font-size: 12px;
+  line-height: 18px;
 }
 
 .domain {
@@ -1845,7 +2111,6 @@ a .account__avatar {
 }
 
 .status__display-name,
-.reply-indicator__display-name,
 .detailed-status__display-name,
 a.account__display-name {
   &:hover .display-name strong {
@@ -2104,57 +2369,45 @@ a.account__display-name {
 }
 
 .navigation-bar {
-  padding: 10px; // glitch: reduced padding
   display: flex;
   align-items: center;
   flex-shrink: 0;
   cursor: default;
   gap: 10px;
-  color: $darker-text-color;
-
-  strong {
-    color: $secondary-text-color;
-  }
 
-  a {
-    color: inherit;
-    text-decoration: none;
+  .column > & {
+    padding: 15px;
   }
 
-  .navigation-bar__actions {
-    position: relative;
+  .account {
+    border-bottom: 0;
+    padding: 0;
+    flex: 1 1 auto;
+    min-width: 0;
 
-    .compose__action-bar .icon-button {
-      pointer-events: auto;
-      transform: scale(1, 1) translate(0, 0);
-      opacity: 1;
+    &__display-name {
+      font-size: 16px;
+      line-height: 24px;
+      letter-spacing: 0.15px;
+      font-weight: 500;
 
-      .icon {
-        width: 24px;
-        height: 24px;
+      .display-name__account {
+        font-size: 14px;
+        line-height: 20px;
+        letter-spacing: 0.1px;
       }
     }
   }
-}
-
-.navigation-bar__profile {
-  display: flex;
-  flex-direction: column;
-  flex: 1 1 auto;
-  line-height: 20px;
-}
 
-.navigation-bar__profile-account {
-  display: inline;
-  font-weight: 500;
-  overflow: hidden;
-  text-overflow: ellipsis;
-}
+  .icon-button {
+    padding: 8px;
+    color: $secondary-text-color;
+  }
 
-.navigation-bar__profile-edit {
-  display: inline;
-  color: inherit;
-  text-decoration: none;
+  .icon-button .icon {
+    width: 24px;
+    height: 24px;
+  }
 }
 
 .dropdown-animation {
@@ -2328,6 +2581,7 @@ a.account__display-name {
   &__panels {
     display: flex;
     justify-content: center;
+    gap: 16px;
     width: 100%;
     height: 100%;
     min-height: 100vh;
@@ -2360,7 +2614,6 @@ a.account__display-name {
       flex-direction: column;
 
       @media screen and (min-width: $no-gap-breakpoint) {
-        padding: 0 10px;
         max-width: 600px;
       }
     }
@@ -2610,6 +2863,7 @@ $ui-header-height: 55px;
 
   .columns-area__panels {
     min-height: calc(100vh - $ui-header-height);
+    gap: 0;
   }
 
   .columns-area__panels__pane--navigational {
@@ -3009,21 +3263,6 @@ $ui-header-height: 55px;
   }
 }
 
-.compose-form__highlightable {
-  display: flex;
-  flex-direction: column;
-  flex: 0 1 auto;
-  border-radius: 4px;
-  transition: box-shadow 300ms linear;
-  min-height: 0;
-  position: relative;
-
-  &.active {
-    transition: none;
-    box-shadow: 0 0 0 6px rgba(lighten($highlight-text-color, 8%), 0.7);
-  }
-}
-
 .compose-panel {
   width: 285px;
   margin-top: 10px;
@@ -3052,32 +3291,9 @@ $ui-header-height: 55px;
     }
   }
 
-  .navigation-bar {
-    flex: 0 1 48px;
-  }
-
   .compose-form {
-    flex: 1;
-    display: flex;
-    flex-direction: column;
-    min-height: 310px;
-    padding-bottom: 71px;
-    margin-bottom: -71px;
-  }
-
-  .compose-form__autosuggest-wrapper {
-    overflow-y: auto;
-    background-color: $white;
-    border-radius: 4px 4px 0 0;
-    flex: 0 1 auto;
-  }
-
-  .autosuggest-textarea__textarea {
-    overflow-y: hidden;
-  }
-
-  .compose-form__upload-thumbnail {
-    height: 80px;
+    flex: 1 1 auto;
+    min-height: 0;
   }
 }
 
@@ -3097,6 +3313,10 @@ $ui-header-height: 55px;
     height: 30px;
     width: auto;
   }
+
+  &__logo {
+    margin-bottom: 12px;
+  }
 }
 
 .navigation-panel,
@@ -3128,7 +3348,7 @@ $ui-header-height: 55px;
   position: absolute;
   top: 0;
   inset-inline-start: 0;
-  background: $ui-base-color;
+  background: darken($ui-base-color, 4%);
   box-sizing: border-box;
   padding: 0;
   display: flex;
@@ -3144,7 +3364,7 @@ $ui-header-height: 55px;
 }
 
 .drawer__inner__mastodon {
-  background: $ui-base-color
+  background: darken($ui-base-color, 4%)
     url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 234.80078 31.757813" width="234.80078" height="31.757812"><path d="M19.599609 0c-1.05 0-2.10039.375-2.90039 1.125L0 16.925781v14.832031h234.80078V17.025391l-16.5-15.900391c-1.6-1.5-4.20078-1.5-5.80078 0l-13.80078 13.099609c-1.6 1.5-4.19883 1.5-5.79883 0L179.09961 1.125c-1.6-1.5-4.19883-1.5-5.79883 0L159.5 14.224609c-1.6 1.5-4.20078 1.5-5.80078 0L139.90039 1.125c-1.6-1.5-4.20078-1.5-5.80078 0l-13.79883 13.099609c-1.6 1.5-4.20078 1.5-5.80078 0L100.69922 1.125c-1.600001-1.5-4.198829-1.5-5.798829 0l-13.59961 13.099609c-1.6 1.5-4.200781 1.5-5.800781 0L61.699219 1.125c-1.6-1.5-4.198828-1.5-5.798828 0L42.099609 14.224609c-1.6 1.5-4.198828 1.5-5.798828 0L22.5 1.125C21.7.375 20.649609 0 19.599609 0z" fill="#{hex-color($ui-base-color)}"/></svg>')
     no-repeat bottom / 100% auto;
   flex: 1;
@@ -3174,24 +3394,20 @@ $ui-header-height: 55px;
   }
 }
 
-.pseudo-drawer {
-  background: lighten($ui-base-color, 13%);
-  font-size: 13px;
-  text-align: start;
-}
-
 .drawer__header {
   flex: 0 0 auto;
   font-size: 16px;
-  background: $ui-base-color;
+  background: darken($ui-base-color, 4%);
   margin-bottom: 10px;
   display: flex;
   flex-direction: row;
   border-radius: 4px;
   overflow: hidden;
 
-  a:hover {
-    background: lighten($ui-base-color, 3%);
+  a:hover,
+  a:focus,
+  a:active {
+    background: $ui-base-color;
   }
 }
 
@@ -3437,7 +3653,7 @@ $ui-header-height: 55px;
 
   &--transparent {
     background: transparent;
-    color: $ui-secondary-color;
+    color: $secondary-text-color;
 
     &:hover,
     &:focus,
@@ -4915,10 +5131,7 @@ a.status-card {
 }
 
 .emoji-picker-dropdown__menu {
-  background: $simple-background-color;
   position: relative;
-  box-shadow: var(--dropdown-shadow);
-  border-radius: 4px;
   margin-top: 5px;
   z-index: 2;
 
@@ -4941,11 +5154,12 @@ a.status-card {
 .emoji-picker-dropdown__modifiers__menu {
   position: absolute;
   z-index: 4;
-  top: -4px;
-  inset-inline-start: -8px;
-  background: $simple-background-color;
+  top: -5px;
+  inset-inline-start: -9px;
+  background: var(--dropdown-background-color);
+  border: 1px solid var(--dropdown-border-color);
   border-radius: 4px;
-  box-shadow: 1px 2px 6px rgba($base-shadow-color, 0.2);
+  box-shadow: var(--dropdown-shadow);
   overflow: hidden;
 
   button {
@@ -4958,7 +5172,7 @@ a.status-card {
     &:hover,
     &:focus,
     &:active {
-      background: rgba($ui-secondary-color, 0.4);
+      background: var(--dropdown-border-color);
     }
   }
 
@@ -5027,15 +5241,17 @@ a.status-card {
 }
 
 .upload-progress {
-  padding: 10px;
-  color: $lighter-text-color;
+  color: $darker-text-color;
   overflow: hidden;
   display: flex;
-  gap: 10px;
+  gap: 8px;
+  align-items: center;
+  padding: 0 12px;
 
   .icon {
     width: 24px;
     height: 24px;
+    color: $ui-highlight-color;
   }
 
   span {
@@ -5054,7 +5270,7 @@ a.status-card {
   width: 100%;
   height: 6px;
   border-radius: 6px;
-  background: darken($simple-background-color, 8%);
+  background: darken($ui-base-color, 8%);
   position: relative;
   margin-top: 5px;
 }
@@ -5108,12 +5324,16 @@ a.status-card {
   filter: none;
 }
 
-.privacy-dropdown__dropdown {
-  background: $simple-background-color;
+.privacy-dropdown__dropdown,
+.language-dropdown__dropdown {
   box-shadow: var(--dropdown-shadow);
+  background: var(--dropdown-background-color);
+  border: 1px solid var(--dropdown-border-color);
+  padding: 4px;
   border-radius: 4px;
   overflow: hidden;
   z-index: 2;
+  width: 300px;
 
   &.top {
     transform-origin: 50% 100%;
@@ -5134,29 +5354,41 @@ a.status-card {
 }
 
 .privacy-dropdown__option {
-  color: $inverted-text-color;
-  padding: 10px;
-  align-items: center;
+  font-size: 14px;
+  line-height: 20px;
+  letter-spacing: 0.25px;
+  padding: 8px 12px;
   cursor: pointer;
   display: flex;
+  align-items: center;
+  gap: 12px;
+  border-radius: 4px;
+  color: $primary-text-color;
 
   &:hover,
+  &:active {
+    background: var(--dropdown-border-color);
+  }
+
+  &:focus,
   &.active {
     background: $ui-highlight-color;
     color: $primary-text-color;
     outline: 0;
 
-    .privacy-dropdown__option__content {
+    .privacy-dropdown__option__content,
+    .privacy-dropdown__option__content strong,
+    .privacy-dropdown__option__additional {
       color: $primary-text-color;
-
-      strong {
-        color: $primary-text-color;
-      }
     }
   }
 
-  &.active:hover {
-    background: lighten($ui-highlight-color, 4%);
+  &__additional {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    color: $darker-text-color;
+    cursor: help;
   }
 }
 
@@ -5164,17 +5396,16 @@ a.status-card {
   display: flex;
   align-items: center;
   justify-content: center;
-  margin-inline-end: 10px;
 }
 
 .privacy-dropdown__option__content {
   flex: 1 1 auto;
-  color: $lighter-text-color;
+  color: $darker-text-color;
 
   strong {
+    color: $primary-text-color;
     font-weight: 500;
     display: block;
-    color: $inverted-text-color;
 
     @each $lang in $cjk-langs {
       &:lang(#{$lang}) {
@@ -5298,64 +5529,78 @@ a.status-card {
 
 .language-dropdown {
   &__dropdown {
-    background: $simple-background-color;
-    box-shadow: var(--dropdown-shadow);
-    border-radius: 4px;
-    overflow: hidden;
-    z-index: 2;
+    padding: 0;
 
-    &.top {
-      transform-origin: 50% 100%;
-    }
+    .emoji-mart-search {
+      padding: 10px;
+      background: var(--dropdown-background-color);
 
-    &.bottom {
-      transform-origin: 50% 0;
-    }
+      input {
+        padding: 8px 12px;
+        background: $ui-base-color;
+        border: 1px solid lighten($ui-base-color, 8%);
+        color: $darker-text-color;
 
-    .emoji-mart-search {
-      padding-inline-end: 10px;
+        @media screen and (width <= 600px) {
+          font-size: 16px;
+          line-height: 24px;
+          letter-spacing: 0.5px;
+        }
+      }
     }
 
     .emoji-mart-search-icon {
-      inset-inline-end: 10px + 5px;
+      inset-inline-end: 15px;
+      opacity: 1;
+      color: $darker-text-color;
+
+      .icon {
+        width: 18px;
+        height: 18px;
+      }
+
+      &:disabled {
+        opacity: 0.38;
+      }
     }
 
     .emoji-mart-scroll {
       padding: 0 10px 10px;
+      background: var(--dropdown-background-color);
     }
 
     &__results {
       &__item {
         cursor: pointer;
-        color: $inverted-text-color;
+        color: $primary-text-color;
+        font-size: 14px;
+        line-height: 20px;
+        letter-spacing: 0.25px;
         font-weight: 500;
-        padding: 10px;
+        padding: 8px 12px;
         border-radius: 4px;
-        display: flex;
-        gap: 6px;
-        align-items: center;
-
-        &:focus,
-        &:active,
-        &:hover {
-          background: $ui-secondary-color;
-        }
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
 
         &__common-name {
           color: $darker-text-color;
+          font-weight: 400;
+        }
+
+        &:active,
+        &:hover {
+          background: var(--dropdown-border-color);
         }
 
+        &:focus,
         &.active {
           background: $ui-highlight-color;
           color: $primary-text-color;
           outline: 0;
 
           .language-dropdown__dropdown__results__item__common-name {
-            color: $secondary-text-color;
-          }
-
-          &:hover {
-            background: lighten($ui-highlight-color, 4%);
+            color: $primary-text-color;
           }
         }
       }
@@ -5364,9 +5609,13 @@ a.status-card {
 }
 
 .search {
-  margin-bottom: 10px;
+  margin-bottom: 32px;
   position: relative;
 
+  .layout-multiple-columns & {
+    margin-bottom: 10px;
+  }
+
   &__popout {
     box-sizing: border-box;
     display: none;
@@ -5375,6 +5624,7 @@ a.status-card {
     margin-top: -2px;
     width: 100%;
     background: $ui-base-color;
+    border: 1px solid lighten($ui-base-color, 8%);
     border-radius: 0 0 4px 4px;
     box-shadow: var(--dropdown-shadow);
     z-index: 99;
@@ -5383,7 +5633,7 @@ a.status-card {
 
     h4 {
       text-transform: uppercase;
-      color: $dark-text-color;
+      color: $darker-text-color;
       font-weight: 500;
       padding: 0 10px;
       margin-bottom: 10px;
@@ -5391,6 +5641,7 @@ a.status-card {
 
     .icon-button {
       padding: 0;
+      color: $darker-text-color;
     }
 
     .icon {
@@ -5406,7 +5657,7 @@ a.status-card {
       }
 
       &__message {
-        color: $dark-text-color;
+        color: $darker-text-color;
         padding: 0 10px;
       }
 
@@ -5462,6 +5713,10 @@ a.status-card {
   }
 
   &.active {
+    .search__input {
+      border-radius: 4px 4px 0 0;
+    }
+
     .search__popout {
       display: block;
     }
@@ -5472,14 +5727,9 @@ a.status-card {
   @include search-input;
 
   display: block;
-  padding: 15px;
-  padding-inline-end: 30px;
-  line-height: 18px;
-  font-size: 16px;
-
-  &::placeholder {
-    color: lighten($darker-text-color, 4%);
-  }
+  padding: 12px 16px;
+  padding-inline-start: 16px + 15px + 8px;
+  line-height: normal;
 
   &::-moz-focus-inner {
     border: 0;
@@ -5490,10 +5740,6 @@ a.status-card {
   &:active {
     outline: 0 !important;
   }
-
-  &:focus {
-    background: lighten($ui-base-color, 4%);
-  }
 }
 
 .search__icon {
@@ -5508,21 +5754,21 @@ a.status-card {
 
   .icon {
     position: absolute;
-    top: 13px;
-    inset-inline-end: 10px;
+    top: 12px + 2px;
+    inset-inline-start: 16px - 2px;
     display: inline-block;
     opacity: 0;
     transition: all 100ms linear;
     transition-property: transform, opacity;
-    width: 24px;
-    height: 24px;
-    color: $secondary-text-color;
+    width: 20px;
+    height: 20px;
+    color: $darker-text-color;
     cursor: default;
     pointer-events: none;
 
     &.active {
       pointer-events: auto;
-      opacity: 0.3;
+      opacity: 1;
     }
   }
 
@@ -5537,16 +5783,10 @@ a.status-card {
 
   .icon-times-circle {
     transform: rotate(0deg);
-    color: $action-button-color;
     cursor: pointer;
 
     &.active {
       transform: rotate(90deg);
-      opacity: 1;
-    }
-
-    &:hover {
-      color: lighten($action-button-color, 7%);
     }
   }
 }
@@ -6167,6 +6407,11 @@ a.status-card {
     }
   }
 
+  .dialog-option {
+    align-items: center;
+    gap: 12px;
+  }
+
   .dialog-option .poll__input {
     border-color: $inverted-text-color;
     color: $ui-secondary-color;
@@ -6175,8 +6420,8 @@ a.status-card {
     justify-content: center;
 
     svg {
-      width: 8px;
-      height: auto;
+      width: 15px;
+      height: 15px;
     }
 
     &:active,
@@ -7446,90 +7691,6 @@ noscript {
   }
 }
 
-@media screen and (width <= 630px) and (height <= 400px) {
-  $duration: 400ms;
-  $delay: 100ms;
-
-  .search {
-    will-change: margin-top;
-    transition: margin-top $duration $delay;
-  }
-
-  .navigation-bar {
-    will-change: padding-bottom;
-    transition: padding-bottom $duration $delay;
-  }
-
-  .navigation-bar {
-    & > a:first-child {
-      will-change: margin-top, margin-inline-start, margin-inline-end, width;
-      transition:
-        margin-top $duration $delay,
-        margin-inline-start $duration ($duration + $delay),
-        margin-inline-end $duration ($duration + $delay);
-    }
-
-    & > .navigation-bar__profile-edit {
-      will-change: margin-top;
-      transition: margin-top $duration $delay;
-    }
-
-    .navigation-bar__actions {
-      & > .icon-button.close {
-        will-change: opacity transform;
-        transition:
-          opacity $duration * 0.5 $delay,
-          transform $duration $delay;
-      }
-
-      & > .compose__action-bar .icon-button {
-        will-change: opacity transform;
-        transition:
-          opacity $duration * 0.5 $delay + $duration * 0.5,
-          transform $duration $delay;
-      }
-    }
-  }
-
-  .is-composing {
-    .search {
-      margin-top: -50px;
-    }
-
-    .navigation-bar {
-      padding-bottom: 0;
-
-      & > a:first-child {
-        margin: -100px 10px 0 -50px;
-      }
-
-      .navigation-bar__profile {
-        padding-top: 2px;
-      }
-
-      .navigation-bar__profile-edit {
-        position: absolute;
-        margin-top: -60px;
-      }
-
-      .navigation-bar__actions {
-        .icon-button.close {
-          pointer-events: auto;
-          opacity: 1;
-          transform: scale(1, 1) translate(0, 0);
-          bottom: 5px;
-        }
-
-        .compose__action-bar .icon-button {
-          pointer-events: none;
-          opacity: 0;
-          transform: scale(0, 1) translate(100%, 0);
-        }
-      }
-    }
-  }
-}
-
 .embed-modal {
   width: auto;
   max-width: 80vw;
@@ -9498,11 +9659,14 @@ noscript {
 
 .link-footer {
   flex: 0 0 auto;
-  padding: 10px;
   padding-top: 20px;
   z-index: 1;
   font-size: 13px;
 
+  .column & {
+    padding: 15px;
+  }
+
   p {
     color: $dark-text-color;
     margin-bottom: 20px;
diff --git a/app/javascript/flavours/glitch/styles/containers.scss b/app/javascript/flavours/glitch/styles/containers.scss
index 6d72e43924a650..632f1da8c73d88 100644
--- a/app/javascript/flavours/glitch/styles/containers.scss
+++ b/app/javascript/flavours/glitch/styles/containers.scss
@@ -40,13 +40,12 @@
   .compose-form {
     width: 400px;
     margin: 0 auto;
-    padding: 20px 0;
-    margin-top: 40px;
+    padding: 10px 0;
+    padding-bottom: 20px;
     box-sizing: border-box;
 
     @media screen and (width <= 400px) {
       width: 100%;
-      margin-top: 0;
       padding: 20px;
     }
   }
@@ -56,13 +55,15 @@
   width: 400px;
   margin: 0 auto;
   display: flex;
-  font-size: 13px;
-  line-height: 18px;
+  align-items: center;
+  gap: 10px;
+  font-size: 14px;
+  line-height: 20px;
   box-sizing: border-box;
   padding: 20px 0;
   margin-top: 40px;
   margin-bottom: 10px;
-  border-bottom: 1px solid $ui-base-color;
+  border-bottom: 1px solid lighten($ui-base-color, 8%);
 
   @media screen and (width <= 440px) {
     width: 100%;
@@ -73,6 +74,7 @@
   .avatar {
     width: 40px;
     height: 40px;
+    flex: 0 0 auto;
     @include avatar-size(40px);
 
     margin-inline-end: 10px;
@@ -90,13 +92,14 @@
   .name {
     flex: 1 1 auto;
     color: $secondary-text-color;
-    width: calc(100% - 90px);
 
     .username {
       display: block;
-      font-weight: 500;
+      font-size: 16px;
+      line-height: 24px;
       text-overflow: ellipsis;
       overflow: hidden;
+      color: $primary-text-color;
     }
   }
 
@@ -104,7 +107,7 @@
     display: block;
     font-size: 32px;
     line-height: 40px;
-    margin-inline-start: 10px;
+    flex: 0 0 auto;
   }
 }
 
diff --git a/app/javascript/flavours/glitch/styles/contrast/diff.scss b/app/javascript/flavours/glitch/styles/contrast/diff.scss
index 1c2386f02d2df9..ae607f484a8c9b 100644
--- a/app/javascript/flavours/glitch/styles/contrast/diff.scss
+++ b/app/javascript/flavours/glitch/styles/contrast/diff.scss
@@ -1,20 +1,7 @@
-.compose-form {
-  .compose-form__modifiers {
-    .compose-form__upload {
-      &-description {
-        input {
-          &::placeholder {
-            opacity: 1;
-          }
-        }
-      }
-    }
-  }
-}
-
 .status__content a,
-.link-footer a,
 .reply-indicator__content a,
+.edit-indicator__content a,
+.link-footer a,
 .status__content__read-more-button,
 .status__content__translate-button {
   text-decoration: underline;
@@ -42,7 +29,9 @@
   }
 }
 
-.status__content a {
+.status__content a,
+.reply-indicator__content a,
+.edit-indicator__content a {
   color: $highlight-text-color;
 }
 
@@ -50,24 +39,10 @@
   color: $darker-text-color;
 }
 
-.compose-form__poll-wrapper .button.button-secondary,
-.compose-form .autosuggest-textarea__textarea::placeholder,
-.compose-form .spoiler-input__input::placeholder,
-.report-dialog-modal__textarea::placeholder,
-.language-dropdown__dropdown__results__item__common-name,
-.compose-form .icon-button {
+.report-dialog-modal__textarea::placeholder {
   color: $inverted-text-color;
 }
 
-.text-icon-button.active {
-  color: $ui-highlight-color;
-}
-
-.language-dropdown__dropdown__results__item.active {
-  background: $ui-highlight-color;
-  font-weight: 500;
-}
-
 .link-button:disabled {
   cursor: not-allowed;
 
diff --git a/app/javascript/flavours/glitch/styles/emoji_picker.scss b/app/javascript/flavours/glitch/styles/emoji_picker.scss
index c7247c3a5723cb..fec0c10ddb9db9 100644
--- a/app/javascript/flavours/glitch/styles/emoji_picker.scss
+++ b/app/javascript/flavours/glitch/styles/emoji_picker.scss
@@ -1,7 +1,6 @@
 .emoji-mart {
   font-size: 13px;
   display: inline-block;
-  color: $inverted-text-color;
 
   &,
   * {
@@ -15,13 +14,13 @@
 }
 
 .emoji-mart-bar {
-  border: 0 solid darken($ui-secondary-color, 8%);
+  border: 0 solid var(--dropdown-border-color);
 
   &:first-child {
     border-bottom-width: 1px;
     border-top-left-radius: 5px;
     border-top-right-radius: 5px;
-    background: $ui-secondary-color;
+    background: var(--dropdown-border-color);
   }
 
   &:last-child {
@@ -36,7 +35,6 @@
   display: flex;
   justify-content: space-between;
   padding: 0 6px;
-  color: $lighter-text-color;
   line-height: 0;
 }
 
@@ -50,9 +48,10 @@
   cursor: pointer;
   background: transparent;
   border: 0;
+  color: $darker-text-color;
 
   &:hover {
-    color: darken($lighter-text-color, 4%);
+    color: lighten($darker-text-color, 4%);
   }
 }
 
@@ -60,7 +59,7 @@
   color: $highlight-text-color;
 
   &:hover {
-    color: darken($highlight-text-color, 4%);
+    color: lighten($highlight-text-color, 4%);
   }
 
   .emoji-mart-anchor-bar {
@@ -95,7 +94,7 @@
   height: 270px;
   max-height: 35vh;
   padding: 0 6px 6px;
-  background: $simple-background-color;
+  background: var(--dropdown-background-color);
   will-change: transform;
 
   &::-webkit-scrollbar-track:hover,
@@ -107,7 +106,7 @@
 .emoji-mart-search {
   padding: 10px;
   padding-inline-end: 45px;
-  background: $simple-background-color;
+  background: var(--dropdown-background-color);
   position: relative;
 
   input {
@@ -118,9 +117,9 @@
     font-family: inherit;
     display: block;
     width: 100%;
-    background: rgba($ui-secondary-color, 0.3);
-    color: $inverted-text-color;
-    border: 1px solid $ui-secondary-color;
+    background: $ui-base-color;
+    color: $darker-text-color;
+    border: 1px solid lighten($ui-base-color, 8%);
     border-radius: 4px;
 
     &::-moz-focus-inner {
@@ -155,11 +154,10 @@
   &:disabled {
     cursor: default;
     pointer-events: none;
-    opacity: 0.3;
   }
 
   svg {
-    fill: $action-button-color;
+    fill: $darker-text-color;
   }
 }
 
@@ -180,7 +178,7 @@
     inset-inline-start: 0;
     width: 100%;
     height: 100%;
-    background-color: rgba($ui-secondary-color, 0.7);
+    background-color: var(--dropdown-border-color);
     border-radius: 100%;
   }
 }
@@ -197,7 +195,7 @@
     width: 100%;
     font-weight: 500;
     padding: 5px 6px;
-    background: $simple-background-color;
+    background: var(--dropdown-background-color);
   }
 }
 
@@ -241,7 +239,7 @@
 
 .emoji-mart-no-results {
   font-size: 14px;
-  color: $light-text-color;
+  color: $dark-text-color;
   text-align: center;
   padding: 5px 6px;
   padding-top: 70px;
diff --git a/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss b/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss
index 0f3a6fa32f5c4b..1025a1bbaa6f70 100644
--- a/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss
+++ b/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss
@@ -145,10 +145,6 @@ html {
   }
 }
 
-.compose-form__autosuggest-wrapper,
-.poll__option input[type='text'],
-.compose-form .spoiler-input__input,
-.compose-form__poll-wrapper select,
 .search__input,
 .setting-text,
 .report-dialog-modal__textarea,
@@ -172,28 +168,11 @@ html {
   border-bottom: 0;
 }
 
-.compose-form__poll-wrapper select {
-  background: $simple-background-color
-    url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 14.933 18.467' height='19.698' width='15.929'><path d='M3.467 14.967l-3.393-3.5H14.86l-3.392 3.5c-1.866 1.925-3.666 3.5-4 3.5-.335 0-2.135-1.575-4-3.5zm.266-11.234L7.467 0 11.2 3.733l3.733 3.734H0l3.733-3.734z' fill='#{hex-color(lighten($ui-base-color, 8%))}'/></svg>")
-    no-repeat right 8px center / auto 16px;
-}
-
-.compose-form__poll-wrapper,
-.compose-form__poll-wrapper .poll__footer {
-  border-top-color: lighten($ui-base-color, 8%);
-}
-
 .notification__filter-bar {
   border: 1px solid lighten($ui-base-color, 8%);
   border-top: 0;
 }
 
-.compose-form .compose-form__buttons-wrapper {
-  background: $ui-base-color;
-  border: 1px solid lighten($ui-base-color, 8%);
-  border-top: 0;
-}
-
 .drawer__header,
 .drawer__inner {
   background: $white;
@@ -206,52 +185,6 @@ html {
     no-repeat bottom / 100% auto;
 }
 
-// Change the colors used in compose-form
-.compose-form {
-  .compose-form__modifiers {
-    .compose-form__upload__actions .icon-button,
-    .compose-form__upload__warning .icon-button {
-      color: lighten($white, 7%);
-
-      &:active,
-      &:focus,
-      &:hover {
-        color: $white;
-      }
-    }
-  }
-
-  .compose-form__buttons-wrapper {
-    background: darken($ui-base-color, 6%);
-  }
-
-  .autosuggest-textarea__suggestions {
-    background: darken($ui-base-color, 6%);
-  }
-
-  .autosuggest-textarea__suggestions__item {
-    &:hover,
-    &:focus,
-    &:active,
-    &.selected {
-      background: lighten($ui-base-color, 4%);
-    }
-  }
-}
-
-.emoji-mart-bar {
-  border-color: lighten($ui-base-color, 4%);
-
-  &:first-child {
-    background: darken($ui-base-color, 6%);
-  }
-}
-
-.emoji-mart-search input {
-  background: rgba($ui-base-color, 0.3);
-  border-color: $ui-base-color;
-}
-
 .upload-progress__backdrop {
   background: $ui-base-color;
 }
@@ -283,46 +216,11 @@ html {
   background: $ui-base-color;
 }
 
-.privacy-dropdown.active .privacy-dropdown__value.active .icon-button {
-  color: $white;
-}
-
 .account-gallery__item a {
   background-color: $ui-base-color;
 }
 
-// Change the colors used in the dropdown menu
-.dropdown-menu {
-  background: $white;
-
-  &__arrow::before {
-    background-color: $white;
-  }
-
-  &__item {
-    color: $darker-text-color;
-
-    &--dangerous {
-      color: $error-value-color;
-    }
-
-    a,
-    button {
-      background: $white;
-    }
-  }
-}
-
 // Change the text colors on inverted background
-.privacy-dropdown__option.active,
-.privacy-dropdown__option:hover,
-.privacy-dropdown__option.active .privacy-dropdown__option__content,
-.privacy-dropdown__option.active .privacy-dropdown__option__content strong,
-.privacy-dropdown__option:hover .privacy-dropdown__option__content,
-.privacy-dropdown__option:hover .privacy-dropdown__option__content strong,
-.dropdown-menu__item:not(.dropdown-menu__item--dangerous) a:active,
-.dropdown-menu__item:not(.dropdown-menu__item--dangerous) a:focus,
-.dropdown-menu__item:not(.dropdown-menu__item--dangerous) a:hover,
 .actions-modal ul li:not(:empty) a.active,
 .actions-modal ul li:not(:empty) a.active button,
 .actions-modal ul li:not(:empty) a:active,
@@ -331,7 +229,6 @@ html {
 .actions-modal ul li:not(:empty) a:focus button,
 .actions-modal ul li:not(:empty) a:hover,
 .actions-modal ul li:not(:empty) a:hover button,
-.language-dropdown__dropdown__results__item.active,
 .admin-wrapper .sidebar ul .simple-navigation-active-leaf a,
 .simple_form .block-button,
 .simple_form .button,
@@ -339,19 +236,6 @@ html {
   color: $white;
 }
 
-.language-dropdown__dropdown__results__item
-  .language-dropdown__dropdown__results__item__common-name {
-  color: lighten($ui-base-color, 8%);
-}
-
-.language-dropdown__dropdown__results__item.active
-  .language-dropdown__dropdown__results__item__common-name {
-  color: darken($ui-base-color, 12%);
-}
-
-.dropdown-menu__separator,
-.dropdown-menu__item.edited-timestamp__history__item,
-.dropdown-menu__container__header,
 .compare-history-modal .report-modal__target,
 .report-dialog-modal .poll__option.dialog-option {
   border-bottom-color: lighten($ui-base-color, 4%);
@@ -385,10 +269,7 @@ html {
 
 .reactions-bar__item:hover,
 .reactions-bar__item:focus,
-.reactions-bar__item:active,
-.language-dropdown__dropdown__results__item:hover,
-.language-dropdown__dropdown__results__item:focus,
-.language-dropdown__dropdown__results__item:active {
+.reactions-bar__item:active {
   background-color: $ui-base-color;
 }
 
@@ -631,11 +512,6 @@ html {
   }
 }
 
-.reply-indicator {
-  background: transparent;
-  border: 1px solid lighten($ui-base-color, 8%);
-}
-
 .status__content,
 .reply-indicator__content {
   a {
@@ -745,3 +621,30 @@ html {
     filter: contrast(75%) brightness(75%) !important;
   }
 }
+
+.compose-form__actions .icon-button.active,
+.dropdown-button.active,
+.privacy-dropdown__option.active,
+.privacy-dropdown__option:focus,
+.language-dropdown__dropdown__results__item:focus,
+.language-dropdown__dropdown__results__item.active,
+.privacy-dropdown__option:focus .privacy-dropdown__option__content,
+.privacy-dropdown__option:focus .privacy-dropdown__option__content strong,
+.privacy-dropdown__option.active .privacy-dropdown__option__content,
+.privacy-dropdown__option.active .privacy-dropdown__option__content strong,
+.language-dropdown__dropdown__results__item:focus
+  .language-dropdown__dropdown__results__item__common-name,
+.language-dropdown__dropdown__results__item.active
+  .language-dropdown__dropdown__results__item__common-name {
+  color: $white;
+}
+
+.compose-form .spoiler-input__input {
+  color: lighten($ui-highlight-color, 8%);
+}
+
+.compose-form .autosuggest-textarea__textarea,
+.compose-form__highlightable,
+.poll__option input[type='text'] {
+  background: darken($ui-base-color, 10%);
+}
diff --git a/app/javascript/flavours/glitch/styles/mastodon-light/variables.scss b/app/javascript/flavours/glitch/styles/mastodon-light/variables.scss
index 250e200fc6d258..3cf5561ca3b962 100644
--- a/app/javascript/flavours/glitch/styles/mastodon-light/variables.scss
+++ b/app/javascript/flavours/glitch/styles/mastodon-light/variables.scss
@@ -34,7 +34,7 @@ $ui-button-tertiary-border-color: $blurple-500 !default;
 
 $primary-text-color: $black !default;
 $darker-text-color: $classic-base-color !default;
-$highlight-text-color: darken($ui-highlight-color, 8%) !default;
+$highlight-text-color: $ui-highlight-color !default;
 $dark-text-color: #444b5d;
 $action-button-color: #606984;
 
@@ -55,3 +55,8 @@ $account-background-color: $white !default;
 }
 
 $emojis-requiring-inversion: 'chains';
+
+.theme-mastodon-light {
+  --dropdown-border-color: #d9e1e8;
+  --dropdown-background-color: #fff;
+}
diff --git a/app/javascript/flavours/glitch/styles/modal.scss b/app/javascript/flavours/glitch/styles/modal.scss
index 0b7220b21d1115..60e7d622458e20 100644
--- a/app/javascript/flavours/glitch/styles/modal.scss
+++ b/app/javascript/flavours/glitch/styles/modal.scss
@@ -1,5 +1,5 @@
 .modal-layout {
-  background: $ui-base-color
+  background: darken($ui-base-color, 4%)
     url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 234.80078 31.757813" width="234.80078" height="31.757812"><path d="M19.599609 0c-1.05 0-2.10039.375-2.90039 1.125L0 16.925781v14.832031h234.80078V17.025391l-16.5-15.900391c-1.6-1.5-4.20078-1.5-5.80078 0l-13.80078 13.099609c-1.6 1.5-4.19883 1.5-5.79883 0L179.09961 1.125c-1.6-1.5-4.19883-1.5-5.79883 0L159.5 14.224609c-1.6 1.5-4.20078 1.5-5.80078 0L139.90039 1.125c-1.6-1.5-4.20078-1.5-5.80078 0l-13.79883 13.099609c-1.6 1.5-4.20078 1.5-5.80078 0L100.69922 1.125c-1.600001-1.5-4.198829-1.5-5.798829 0l-13.59961 13.099609c-1.6 1.5-4.200781 1.5-5.800781 0L61.699219 1.125c-1.6-1.5-4.198828-1.5-5.798828 0L42.099609 14.224609c-1.6 1.5-4.198828 1.5-5.798828 0L22.5 1.125C21.7.375 20.649609 0 19.599609 0z" fill="#{hex-color($ui-base-lighter-color)}33"/></svg>')
     repeat-x bottom fixed;
   display: flex;
diff --git a/app/javascript/flavours/glitch/styles/polls.scss b/app/javascript/flavours/glitch/styles/polls.scss
index 4566a013a630fb..f12fd827ded692 100644
--- a/app/javascript/flavours/glitch/styles/polls.scss
+++ b/app/javascript/flavours/glitch/styles/polls.scss
@@ -58,6 +58,8 @@
   &__option {
     position: relative;
     display: flex;
+    align-items: flex-start;
+    gap: 8px;
     padding: 6px 0;
     line-height: 18px;
     cursor: default;
@@ -84,16 +86,22 @@
       box-sizing: border-box;
       width: 100%;
       font-size: 14px;
-      color: $inverted-text-color;
+      color: $secondary-text-color;
       outline: 0;
       font-family: inherit;
-      background: $simple-background-color;
-      border: 1px solid darken($simple-background-color, 14%);
+      background: $ui-base-color;
+      border: 1px solid $darker-text-color;
       border-radius: 4px;
-      padding: 6px 10px;
+      padding: 8px 12px;
 
       &:focus {
-        border-color: $highlight-text-color;
+        border-color: $ui-highlight-color;
+      }
+
+      @media screen and (width <= 600px) {
+        font-size: 16px;
+        line-height: 24px;
+        letter-spacing: 0.5px;
       }
     }
 
@@ -102,26 +110,20 @@
     }
 
     &.editable {
-      display: flex;
       align-items: center;
       overflow: visible;
     }
   }
 
   &__input {
-    display: inline-block;
+    display: block;
     position: relative;
     border: 1px solid $ui-primary-color;
     box-sizing: border-box;
-    width: 18px;
-    height: 18px;
-    margin-inline-end: 10px;
-    top: -1px;
+    width: 17px;
+    height: 17px;
     border-radius: 50%;
-    vertical-align: middle;
-    margin-top: auto;
-    margin-bottom: auto;
-    flex: 0 0 18px;
+    flex: 0 0 auto;
 
     &.checkbox {
       border-radius: 4px;
@@ -165,6 +167,15 @@
     }
   }
 
+  &__option.editable &__input {
+    &:active,
+    &:focus,
+    &:hover {
+      border-color: $ui-primary-color;
+      border-width: 1px;
+    }
+  }
+
   &__number {
     display: inline-block;
     width: 45px;
@@ -215,92 +226,6 @@
   }
 }
 
-.compose-form__poll-wrapper {
-  border-top: 1px solid darken($simple-background-color, 8%);
-  overflow-x: hidden;
-
-  ul {
-    padding: 10px;
-  }
-
-  .poll__input {
-    &:active,
-    &:focus,
-    &:hover {
-      border-color: $ui-button-focus-background-color;
-    }
-  }
-
-  .poll__footer {
-    border-top: 1px solid darken($simple-background-color, 8%);
-    padding: 10px;
-    display: flex;
-    align-items: center;
-
-    button,
-    select {
-      width: 100%;
-      flex: 1 1 50%;
-
-      &:focus {
-        border-color: $highlight-text-color;
-      }
-    }
-  }
-
-  .button.button-secondary {
-    font-size: 14px;
-    font-weight: 400;
-    padding: 6px 10px;
-    height: auto;
-    line-height: inherit;
-    color: $action-button-color;
-    border-color: $action-button-color;
-    margin-inline-end: 5px;
-
-    &:hover,
-    &:focus,
-    &.active {
-      border-color: $action-button-color;
-      background-color: $action-button-color;
-      color: $ui-button-color;
-    }
-  }
-
-  li {
-    display: flex;
-    align-items: center;
-
-    .poll__option {
-      flex: 0 0 auto;
-      width: calc(100% - (23px + 6px));
-      margin-inline-end: 6px;
-    }
-  }
-
-  select {
-    appearance: none;
-    box-sizing: border-box;
-    font-size: 14px;
-    color: $inverted-text-color;
-    display: inline-block;
-    width: auto;
-    outline: 0;
-    font-family: inherit;
-    background: $simple-background-color
-      url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 14.933 18.467' height='19.698' width='15.929'><path d='M3.467 14.967l-3.393-3.5H14.86l-3.392 3.5c-1.866 1.925-3.666 3.5-4 3.5-.335 0-2.135-1.575-4-3.5zm.266-11.234L7.467 0 11.2 3.733l3.733 3.734H0l3.733-3.734z' fill='#{hex-color(darken($simple-background-color, 14%))}'/></svg>")
-      no-repeat right 8px center / auto 16px;
-    border: 1px solid darken($simple-background-color, 14%);
-    border-radius: 4px;
-    padding: 6px 10px;
-    padding-inline-end: 30px;
-  }
-
-  .icon-button.disabled {
-    color: darken($simple-background-color, 14%);
-  }
-}
-
 .muted .poll {
   color: $dark-text-color;
 

From 5fd50756b4c8fc0e2c87251108ad34d78e3b702e Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 22 Feb 2024 23:01:58 +0100
Subject: [PATCH 0217/2191] Restore glitch-soc's support of custom poll limits

---
 .../flavours/glitch/features/compose/components/poll_form.jsx | 3 ++-
 app/javascript/flavours/glitch/reducers/compose.js            | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/javascript/flavours/glitch/features/compose/components/poll_form.jsx b/app/javascript/flavours/glitch/features/compose/components/poll_form.jsx
index 8964121c5760cc..34b35088fc40c7 100644
--- a/app/javascript/flavours/glitch/features/compose/components/poll_form.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/poll_form.jsx
@@ -15,6 +15,7 @@ import {
   selectComposeSuggestion,
 } from 'flavours/glitch/actions/compose';
 import AutosuggestInput from 'flavours/glitch/components/autosuggest_input';
+import { pollLimits } from 'flavours/glitch/initial_state';
 
 const messages = defineMessages({
   option_placeholder: { id: 'compose_form.poll.option_placeholder', defaultMessage: 'Option {number}' },
@@ -83,7 +84,7 @@ const Option = ({ multipleChoice, index, title, autoFocus }) => {
 
       <AutosuggestInput
         placeholder={intl.formatMessage(messages.option_placeholder, { number: index + 1 })}
-        maxLength={100}
+        maxLength={pollLimits.max_option_chars}
         value={title}
         lang={lang}
         spellCheck
diff --git a/app/javascript/flavours/glitch/reducers/compose.js b/app/javascript/flavours/glitch/reducers/compose.js
index e11a103026c196..181ea38e710afb 100644
--- a/app/javascript/flavours/glitch/reducers/compose.js
+++ b/app/javascript/flavours/glitch/reducers/compose.js
@@ -55,7 +55,7 @@ import {
 import { REDRAFT } from '../actions/statuses';
 import { STORE_HYDRATE } from '../actions/store';
 import { TIMELINE_DELETE } from '../actions/timelines';
-import { me, defaultContentType } from '../initial_state';
+import { me, defaultContentType, pollLimits } from '../initial_state';
 import { recoverHashtags } from '../utils/hashtag';
 import { unescapeHTML } from '../utils/html';
 import { overwrite } from '../utils/js_helpers';
@@ -369,7 +369,7 @@ const updatePoll = (state, index, value) => state.updateIn(['poll', 'options'],
 
   if (tmp.size === 0) {
     return tmp.push('').push('');
-  } else if (tmp.size < 4) {
+  } else if (tmp.size < pollLimits.max_options) {
     return tmp.push('');
   }
 

From 380f4fc95cb63fa374644c7ca09b939df9181321 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 22 Feb 2024 23:24:23 +0100
Subject: [PATCH 0218/2191] Reimplement sensitive checkbox

---
 .../compose/components/sensitive_button.jsx   | 57 +++++++++++++++++++
 .../compose/components/upload_form.jsx        |  4 ++
 .../compose/containers/upload_container.js    |  2 +-
 .../flavours/glitch/locales/en.json           |  3 +
 .../flavours/glitch/styles/components.scss    | 42 ++++++++++++++
 5 files changed, 107 insertions(+), 1 deletion(-)
 create mode 100644 app/javascript/flavours/glitch/features/compose/components/sensitive_button.jsx

diff --git a/app/javascript/flavours/glitch/features/compose/components/sensitive_button.jsx b/app/javascript/flavours/glitch/features/compose/components/sensitive_button.jsx
new file mode 100644
index 00000000000000..37debf9dd76728
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/compose/components/sensitive_button.jsx
@@ -0,0 +1,57 @@
+import { useCallback } from 'react';
+
+import { useIntl, defineMessages, FormattedMessage } from 'react-intl';
+
+import classNames from 'classnames';
+
+import { changeComposeSensitivity } from 'flavours/glitch/actions/compose';
+import { useAppSelector, useAppDispatch } from 'flavours/glitch/store';
+
+const messages = defineMessages({
+  marked: {
+    id: 'compose_form.sensitive.marked',
+    defaultMessage: '{count, plural, one {Media is marked as sensitive} other {Media is marked as sensitive}}',
+  },
+  unmarked: {
+    id: 'compose_form.sensitive.unmarked',
+    defaultMessage: '{count, plural, one {Media is not marked as sensitive} other {Media is not marked as sensitive}}',
+  },
+});
+
+export const SensitiveButton = () => {
+  const intl = useIntl();
+
+  const spoilersAlwaysOn = useAppSelector((state) => state.getIn(['local_settings', 'always_show_spoilers_field']));
+  const spoilerText = useAppSelector((state) => state.getIn(['compose', 'spoiler_text']));
+  const sensitive = useAppSelector((state) => state.getIn(['compose', 'sensitive']));
+  const disabled = useAppSelector((state) => state.getIn(['compose', 'spoiler']));
+  const mediaCount = useAppSelector((state) => state.getIn(['compose', 'media_attachments']).size);
+
+  const active = sensitive || (spoilersAlwaysOn && spoilerText && spoilerText.length > 0);
+
+  const dispatch = useAppDispatch();
+
+  const handleClick = useCallback(() => {
+    dispatch(changeComposeSensitivity());
+  }, [dispatch]);
+
+  return (
+    <div className='compose-form__sensitive-button'>
+      <label className={classNames('icon-button', { active })} title={intl.formatMessage(active ? messages.marked : messages.unmarked, { count: mediaCount })}>
+        <input
+          name='mark-sensitive'
+          type='checkbox'
+          checked={active}
+          onChange={handleClick}
+          disabled={disabled}
+        />
+
+        <FormattedMessage
+          id='compose_form.sensitive.hide'
+          defaultMessage='{count, plural, one {Mark media as sensitive} other {Mark media as sensitive}}'
+          values={{ count: mediaCount }}
+        />
+      </label>
+    </div>
+  );
+};
diff --git a/app/javascript/flavours/glitch/features/compose/components/upload_form.jsx b/app/javascript/flavours/glitch/features/compose/components/upload_form.jsx
index 46bac7823b8d16..5c6406c3bacacc 100644
--- a/app/javascript/flavours/glitch/features/compose/components/upload_form.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/upload_form.jsx
@@ -4,6 +4,8 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
 import UploadContainer from '../containers/upload_container';
 import UploadProgressContainer from '../containers/upload_progress_container';
 
+import { SensitiveButton } from './sensitive_button';
+
 export default class UploadForm extends ImmutablePureComponent {
 
   static propTypes = {
@@ -24,6 +26,8 @@ export default class UploadForm extends ImmutablePureComponent {
             ))}
           </div>
         )}
+
+        {!mediaIds.isEmpty() && <SensitiveButton />}
       </>
     );
   }
diff --git a/app/javascript/flavours/glitch/features/compose/containers/upload_container.js b/app/javascript/flavours/glitch/features/compose/containers/upload_container.js
index a17a6914448b8a..5afe6eaa1adb01 100644
--- a/app/javascript/flavours/glitch/features/compose/containers/upload_container.js
+++ b/app/javascript/flavours/glitch/features/compose/containers/upload_container.js
@@ -5,7 +5,7 @@ import Upload from '../components/upload';
 
 const mapStateToProps = (state, { id }) => ({
   media: state.getIn(['compose', 'media_attachments']).find(item => item.get('id') === id),
-  sensitive: state.getIn(['compose', 'spoiler']),
+  sensitive: state.getIn(['compose', 'sensitive']),
 });
 
 const mapDispatchToProps = dispatch => ({
diff --git a/app/javascript/flavours/glitch/locales/en.json b/app/javascript/flavours/glitch/locales/en.json
index 7321f5ac3da557..b513e837b9fbd4 100644
--- a/app/javascript/flavours/glitch/locales/en.json
+++ b/app/javascript/flavours/glitch/locales/en.json
@@ -14,6 +14,9 @@
   "column_subheading.lists": "Lists",
   "column_subheading.navigation": "Navigation",
   "community.column_settings.allow_local_only": "Show local-only toots",
+  "compose_form.sensitive.hide": "{count, plural, one {Mark media as sensitive} other {Mark media as sensitive}}",
+  "compose_form.sensitive.marked": "{count, plural, one {Media is marked as sensitive} other {Media is marked as sensitive}}",
+  "compose_form.sensitive.unmarked": "{count, plural, one {Media is not marked as sensitive} other {Media is not marked as sensitive}}",
   "confirmation_modal.do_not_ask_again": "Do not ask for confirmation again",
   "confirmations.deprecated_settings.confirm": "Use Mastodon preferences",
   "confirmations.deprecated_settings.message": "Some of the glitch-soc device-specific {app_settings} you are using have been replaced by Mastodon {preferences} and will be overriden:",
diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index 5be0e85606621e..ffbf0c2aa8b547 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -698,6 +698,48 @@ body > [data-popper-placement] {
     }
   }
 
+  // glitch: reintroduce sensitive button
+  &__sensitive-button {
+    padding: 0 12px;
+
+    input[type='checkbox'] {
+      appearance: none;
+      display: block;
+      border: 1px solid $ui-primary-color;
+      box-sizing: border-box;
+      width: 17px;
+      height: 17px;
+      border-radius: 4px;
+      flex: 0 0 auto;
+
+      &:active,
+      &:focus,
+      &:hover {
+        border-color: $highlight-text-color;
+        border-width: 4px;
+      }
+
+      &:checked {
+        background-color: $highlight-text-color;
+        border-color: $highlight-text-color;
+      }
+
+      &::-moz-focus-inner {
+        outline: 0 !important;
+        border: 0;
+      }
+
+      &:focus,
+      &:active {
+        outline: 0 !important;
+      }
+
+      &:disabled {
+        opacity: 0.5;
+      }
+    }
+  }
+
   &__footer {
     display: flex;
     flex-direction: column;

From baa23738a86bd0513f09b921987d2c520b7d47a3 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 23 Feb 2024 10:57:26 +0100
Subject: [PATCH 0219/2191] Update dependency webmock to v3.22.0 (#29313)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 07e6afb1c121ee..734ed6ec8a19d4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -793,7 +793,7 @@ GEM
     webfinger (1.2.0)
       activesupport
       httpclient (>= 2.4)
-    webmock (3.21.2)
+    webmock (3.22.0)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)

From b0064ddda764226230424b1134bfbeb098b03339 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 23 Feb 2024 04:59:29 -0500
Subject: [PATCH 0220/2191] Add basic coverage for `MoveService` class (#29301)

---
 spec/services/move_service_spec.rb | 48 ++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 spec/services/move_service_spec.rb

diff --git a/spec/services/move_service_spec.rb b/spec/services/move_service_spec.rb
new file mode 100644
index 00000000000000..e63818f67ed312
--- /dev/null
+++ b/spec/services/move_service_spec.rb
@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe MoveService do
+  subject { described_class.new.call(migration) }
+
+  context 'with a valid migration record' do
+    let(:migration) { Fabricate(:account_migration, account: source_account, target_account: target_account) }
+    let(:source_account) { Fabricate(:account) }
+    let(:target_account) { Fabricate(:account, also_known_as: [source_account_uri]) }
+
+    it 'migrates the account to a new account' do
+      expect { subject }
+        .to change_source_moved_value
+        .and process_local_updates
+        .and distribute_updates
+        .and distribute_move
+    end
+  end
+
+  def source_account_uri
+    ActivityPub::TagManager
+      .instance
+      .uri_for(source_account)
+  end
+
+  def change_source_moved_value
+    change(source_account.reload, :moved_to_account)
+      .from(nil)
+      .to(target_account)
+  end
+
+  def process_local_updates
+    enqueue_sidekiq_job(MoveWorker)
+      .with(source_account.id, target_account.id)
+  end
+
+  def distribute_updates
+    enqueue_sidekiq_job(ActivityPub::UpdateDistributionWorker)
+      .with(source_account.id)
+  end
+
+  def distribute_move
+    enqueue_sidekiq_job(ActivityPub::MoveDistributionWorker)
+      .with(migration.id)
+  end
+end

From bba4118ddd58b9e9e167084d46e513e8507a6639 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 23 Feb 2024 16:21:02 +0100
Subject: [PATCH 0221/2191] New Crowdin Translations (automated) (#29369)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/ckb.json | 39 ++++++++++++++++++++++++
 app/javascript/mastodon/locales/es.json  | 25 +++++++--------
 app/javascript/mastodon/locales/sv.json  | 17 +++++++++--
 app/javascript/mastodon/locales/th.json  |  6 ++++
 config/locales/activerecord.es.yml       |  2 +-
 config/locales/ca.yml                    |  5 +++
 config/locales/ckb.yml                   |  3 ++
 config/locales/cs.yml                    |  7 ++++-
 config/locales/da.yml                    |  2 ++
 config/locales/de.yml                    |  4 ++-
 config/locales/devise.sv.yml             |  1 +
 config/locales/doorkeeper.eu.yml         |  2 +-
 config/locales/es-AR.yml                 |  2 ++
 config/locales/es-MX.yml                 |  4 ++-
 config/locales/es.yml                    |  6 ++--
 config/locales/eu.yml                    |  4 +--
 config/locales/gl.yml                    |  5 +++
 config/locales/he.yml                    |  3 ++
 config/locales/hu.yml                    |  6 ++--
 config/locales/it.yml                    |  2 ++
 config/locales/ja.yml                    |  2 ++
 config/locales/kab.yml                   |  2 ++
 config/locales/nl.yml                    |  2 ++
 config/locales/pl.yml                    |  2 ++
 config/locales/pt-PT.yml                 |  2 ++
 config/locales/simple_form.kab.yml       |  1 +
 config/locales/sk.yml                    |  3 ++
 config/locales/sl.yml                    |  2 ++
 config/locales/tr.yml                    |  5 +++
 config/locales/uk.yml                    |  4 ++-
 config/locales/zh-CN.yml                 |  2 ++
 config/locales/zh-TW.yml                 |  2 ++
 32 files changed, 148 insertions(+), 26 deletions(-)

diff --git a/app/javascript/mastodon/locales/ckb.json b/app/javascript/mastodon/locales/ckb.json
index 73910f9b7c7027..62195b72dc1a36 100644
--- a/app/javascript/mastodon/locales/ckb.json
+++ b/app/javascript/mastodon/locales/ckb.json
@@ -17,9 +17,11 @@
   "account.badges.group": "گرووپ",
   "account.block": "بلۆکی @{name}",
   "account.block_domain": "بلۆکی هەموو شتێک لە {domain}",
+  "account.block_short": "بلۆک",
   "account.blocked": "بلۆککرا",
   "account.browse_more_on_origin_server": "گەڕانی فرەتر لە سەر پرۆفایلی سەرەکی",
   "account.cancel_follow_request": "داواکاری فۆڵۆو بکشێنەوە",
+  "account.copy": "ڕوونووسی بەستەر بۆ توت",
   "account.direct": "بە شێوەیەکی تایبەت باسی @{name} بکە",
   "account.disable_notifications": "ئاگانامە مەنێرە بۆم کاتێک @{name} پۆست دەکرێت",
   "account.domain_blocked": "دۆمەین قەپاتکرا",
@@ -30,6 +32,7 @@
   "account.featured_tags.last_status_never": "هیچ پۆستێک نییە",
   "account.featured_tags.title": "هاشتاگە تایبەتەکانی {name}",
   "account.follow": "بەدواداچوون",
+  "account.follow_back": "فۆڵۆو بکەنەوە",
   "account.followers": "شوێنکەوتووان",
   "account.followers.empty": "کەسێک شوێن ئەم بەکارهێنەرە نەکەوتووە",
   "account.followers_counter": "{count, plural, one {{counter} شوێنکەوتوو} other {{counter} شوێنکەوتوو}}",
@@ -38,6 +41,7 @@
   "account.follows.empty": "ئەم بەکارهێنەرە تا ئێستا شوێن کەس نەکەوتووە.",
   "account.go_to_profile": "بڕۆ بۆ پڕۆفایلی",
   "account.hide_reblogs": "داشاردنی بووستەکان لە @{name}",
+  "account.in_memoriam": "لە یادەوەریدا.",
   "account.joined_short": "بەشداری کردووە",
   "account.languages": "گۆڕینی زمانە بەشداربووەکان",
   "account.link_verified_on": "خاوەنداریەتی ئەم لینکە لە {date} چێک کراوە",
@@ -46,7 +50,11 @@
   "account.mention": "ئاماژە @{name}",
   "account.moved_to": "{name} ئاماژەی بەوە کردووە کە ئەکاونتە نوێیەکەیان ئێستا:",
   "account.mute": "بێدەنگکردن @{name}",
+  "account.mute_notifications_short": "پاڵ بە ئاگادارکردنەوەکانەوە بنێ",
+  "account.mute_short": "بێدەنگ",
   "account.muted": "بێ دەنگ",
+  "account.mutual": "دوولایەنە",
+  "account.no_bio": "هیچ وەسفێک نەخراوەتەڕوو.",
   "account.open_original_page": "لاپەڕەی ئەسڵی بکەرەوە",
   "account.posts": "نووسراوەکان",
   "account.posts_with_replies": "توتس و وەڵامەکان",
@@ -62,6 +70,7 @@
   "account.unendorse": "تایبەتمەندی لەسەر پرۆفایلەکە نیە",
   "account.unfollow": "بەدوادانەچو",
   "account.unmute": "بێدەنگکردنی @{name}",
+  "account.unmute_notifications_short": "ئاگادارکردنەوەکان بێدەنگ بکەرەوە",
   "account.unmute_short": "بێدەنگی مەکە",
   "account_note.placeholder": "کرتەبکە بۆ زیادکردنی تێبینی",
   "admin.dashboard.daily_retention": "ڕێژەی مانەوەی بەکارهێنەر بەپێی ڕۆژ دوای ناو تۆمارکردن",
@@ -69,6 +78,10 @@
   "admin.dashboard.retention.average": "ڕێژە",
   "admin.dashboard.retention.cohort": "چوونەژوورەوەی مانگانە",
   "admin.dashboard.retention.cohort_size": "ئەندامی نوێ",
+  "admin.impact_report.instance_accounts": "پڕۆفایلی هەژمارەکان ئەمە دەسڕێتەوە",
+  "admin.impact_report.instance_followers": "فۆڵۆوەرەکان بەکارهێنەران لەدەست دەدەن",
+  "admin.impact_report.instance_follows": "فۆڵۆوەرەکان ئەمبەکارهێنەرە لەدەست دەدەن",
+  "admin.impact_report.title": "پوختەی کاریگەرییەکان",
   "alert.rate_limited.message": "تکایە هەوڵبدەرەوە دوای {retry_time, time, medium}.",
   "alert.rate_limited.title": "ڕێژەی سنووردار",
   "alert.unexpected.message": "هەڵەیەکی چاوەڕوان نەکراو ڕوویدا.",
@@ -101,6 +114,8 @@
   "column.direct": "ئاماژەی تایبەت",
   "column.directory": "گەڕان لە پرۆفایلەکان",
   "column.domain_blocks": "دۆمەینە داخراوەکان",
+  "column.favourites": "دڵخوازەکان",
+  "column.firehose": "فیدی ڕاستەوخۆ",
   "column.follow_requests": "بەدواداچوی داواکاریەکان بکە",
   "column.home": "سەرەتا",
   "column.lists": "پێرست",
@@ -121,6 +136,9 @@
   "community.column_settings.remote_only": "تەنها بۆ دوور",
   "compose.language.change": "گۆڕینی زمان",
   "compose.language.search": "گەڕان بە زمانەکان...",
+  "compose.published.body": "پۆست بڵاوکراوەتەوە.",
+  "compose.published.open": "بیکەوە",
+  "compose.saved.body": "پۆستەکە سەیڤ کراوە.",
   "compose_form.direct_message_warning_learn_more": "زیاتر فێربه",
   "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
   "compose_form.hashtag_warning": "ئەم بڵاوکراوەیە لە ژێر هیچ هاشتاگێکدا دا نانرێت وەک ئەوەیە، کە گشتی نەبێت. تەنها بڵاوکراوە گشتیەکان دەتوانرێ بە هاشتاگ گەڕانی بۆ بکرێت.",
@@ -128,11 +146,19 @@
   "compose_form.lock_disclaimer.lock": "قفڵ دراوە",
   "compose_form.placeholder": "چی لە مێشکتدایە?",
   "compose_form.poll.duration": "ماوەی ڕاپرسی",
+  "compose_form.poll.multiple": "فرە هەڵبژاردە",
+  "compose_form.poll.option_placeholder": "بژاردەی {number}",
+  "compose_form.poll.single": "یەکێك هەلبژێرە",
   "compose_form.poll.switch_to_multiple": "ڕاپرسی بگۆڕە بۆ ڕێگەدان بە چەند هەڵبژاردنێک",
   "compose_form.poll.switch_to_single": "گۆڕینی ڕاپرسی بۆ ڕێگەدان بە تاکە هەڵبژاردنێک",
+  "compose_form.poll.type": "ستایڵ",
+  "compose_form.publish": "پۆست",
   "compose_form.publish_form": "بڵاوی بکەوە",
+  "compose_form.reply": "وەڵام",
+  "compose_form.save_changes": "نوێکردنەوە",
   "compose_form.spoiler.marked": "دەق لە پشت ئاگاداریدا شاراوەتەوە",
   "compose_form.spoiler.unmarked": "دەق شاراوە نییە",
+  "compose_form.spoiler_placeholder": "ئاگادارکردنەوەی ناوەڕۆک (ئیختیاری)",
   "confirmation_modal.cancel": "هەڵوەشاندنەوه",
   "confirmations.block.block_and_report": "بلۆک & گوزارشت",
   "confirmations.block.confirm": "بلۆک",
@@ -155,6 +181,7 @@
   "confirmations.mute.explanation": "ئەمەش دەبێتە هۆی شاردنەوەی پۆستەکان یان ئەو بابەتانەی کە ئاماژەیان پێ دەکات ، بەڵام هێشتا ڕێگەیان پێ دەدات کە پۆستەکانتان ببینن و شوێنتان بکەون.",
   "confirmations.mute.message": "ئایا دڵنیایت لەوەی دەتەوێت بیلێیت {name}?",
   "confirmations.redraft.confirm": "سڕینەوە & دووبارە ڕەشکردنەوە",
+  "confirmations.redraft.message": "دڵنیای دەتەوێت ئەم پۆستە بسڕیتەوە و دووبارە دایبڕێژیتەوە؟ فەڤۆریت و بووستەکان لەدەست دەچن، وەڵامەکانی پۆستە ئەسڵیەکەش هەتیو دەبن.",
   "confirmations.reply.confirm": "وەڵام",
   "confirmations.reply.message": "وەڵامدانەوە ئێستا ئەو نامەیە ی کە تۆ ئێستا دایڕشتووە، دەنووسێتەوە. ئایا دڵنیایت کە دەتەوێت بەردەوام بیت?",
   "confirmations.unfollow.confirm": "بەدوادانەچو",
@@ -163,7 +190,9 @@
   "conversation.mark_as_read": "نیشانەکردن وەک خوێندراوە",
   "conversation.open": "نیشاندان گفتوگۆ",
   "conversation.with": "لەگەڵ{names}",
+  "copy_icon_button.copied": "کۆپی کراوە بۆ کلیپبۆرد",
   "copypaste.copied": "کۆپی کراوە",
+  "copypaste.copy_to_clipboard": "کۆپی کراوە بۆ کلیپبۆرد",
   "directory.federated": "لە ڕاژەکانی ناسراو",
   "directory.local": "تەنها لە {domain}",
   "directory.new_arrivals": "تازە گەیشتنەکان",
@@ -173,6 +202,7 @@
   "dismissable_banner.community_timeline": "ئەمانە دوایین پۆستی گشتی ئەو کەسانەن کە ئەکاونتەکانیان لەلایەن {domain}ەوە هۆست کراوە.",
   "dismissable_banner.dismiss": "بەلاوە نان",
   "dismissable_banner.explore_links": "ئەم هەواڵانە لە ئێستادا لەلایەن کەسانێکەوە لەسەر ئەم سێرڤەرە و سێرڤەرەکانی تری تۆڕی لامەرکەزی باس دەکرێن.",
+  "dismissable_banner.explore_statuses": "ئەمانە پۆستەکانن لە سەرانسەری وێبی کۆمەڵایەتی کە ئەمڕۆ کێشکردنیان بەدەستهێناوە. پۆستە نوێیەکان کە بووست و فەڤریتی زیاتریان هەیە ڕیزبەندی بەرزتریان هەیە.",
   "dismissable_banner.explore_tags": "ئەم هاشتاگانە لە ئێستادا لە نێو خەڵکی سەر ئەم سێرڤەرە و سێرڤەرەکانی تری تۆڕی لامەرکەزیدا جێگەی خۆیان دەگرن.",
   "embed.instructions": "ئەم توتە بنچین بکە لەسەر وێب سایتەکەت بە کۆپیکردنی کۆدەکەی خوارەوە.",
   "embed.preview": "ئەمە ئەو شتەیە کە لە شێوەی خۆی دەچێت:",
@@ -216,6 +246,7 @@
   "errors.unexpected_crash.copy_stacktrace": "کۆپیکردنی ستێکتراسی بۆ کلیپ بۆرد",
   "errors.unexpected_crash.report_issue": "کێشەی گوزارشت",
   "explore.search_results": "ئەنجامەکانی گەڕان",
+  "explore.suggested_follows": "خەڵک",
   "explore.title": "گەڕان",
   "explore.trending_links": "هەواڵەکان",
   "explore.trending_statuses": "بڵاوکراوەکان",
@@ -236,9 +267,16 @@
   "filter_modal.select_filter.subtitle": "بەکارهێنانی پۆلێنی بەردەست یان دروستکردنی پۆلێنێکی نوێ",
   "filter_modal.select_filter.title": "ئەم بڵاوکراوەیە بپاڵێوە",
   "filter_modal.title.status": "بڵاوکراوەیەک بپاڵێوە",
+  "firehose.all": "هەموو",
+  "firehose.local": "لەسەر ئەم ڕاژەیە",
+  "firehose.remote": "ڕاژەکانی دی",
   "follow_request.authorize": "ده‌سه‌ڵاتپێدراو",
   "follow_request.reject": "ڕەتکردنەوە",
   "follow_requests.unlocked_explanation": "هەرچەندە هەژمارەکەت داخراو نییە، ستافی {domain} وا بیریان کردەوە کە لەوانەیە بتانەوێت پێداچوونەوە بە داواکاریەکانی ئەم هەژمارەدا بکەن بە دەستی.",
+  "follow_suggestions.curated_suggestion": "ستاف هەڵبژاردنی",
+  "follow_suggestions.dismiss": "دوبارە پشانی مەدە",
+  "follow_suggestions.view_all": "بینینی هەموو",
+  "follow_suggestions.who_to_follow": "دواکەوتنی کێ",
   "followed_tags": "هاشتاگە شوێنکەوتووەکان",
   "footer.about": "دەربارە",
   "footer.directory": "ڕابەری پەڕەی ناساندن",
@@ -259,6 +297,7 @@
   "hashtag.column_settings.tag_mode.any": "هەر کام لەمانە",
   "hashtag.column_settings.tag_mode.none": "هیچ کام لەمانە",
   "hashtag.column_settings.tag_toggle": "تاگی زیادە ی ئەم ستوونە لەخۆ بنووسە",
+  "hashtag.counter_by_accounts": "{count, plural, one {{counter} participant} other {{counter} participants}}",
   "hashtag.follow": "شوێنکەوتنی هاشتاگ",
   "hashtag.unfollow": "شوێن نەکەوتنی هاشتاگ",
   "home.column_settings.basic": "بنەڕەتی",
diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json
index b3f8e744f128db..25ff1157fd8d95 100644
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@@ -171,21 +171,21 @@
   "confirmations.delete_list.message": "¿Seguro que quieres borrar esta lista permanentemente?",
   "confirmations.discard_edit_media.confirm": "Descartar",
   "confirmations.discard_edit_media.message": "Tienes cambios sin guardar en la descripción o vista previa del archivo audiovisual, ¿descartarlos de todos modos?",
-  "confirmations.domain_block.confirm": "Bloquear dominio entero",
-  "confirmations.domain_block.message": "¿Seguro de que quieres bloquear al dominio {domain} entero? En general unos cuantos bloqueos y silenciados concretos es suficiente y preferible.",
+  "confirmations.domain_block.confirm": "Bloquear todo el dominio",
+  "confirmations.domain_block.message": "¿Seguro que quieres bloquear todo el dominio {domain}? En general, unos cuantos bloqueos y silenciados concretos es suficiente y preferible. No verás contenido del dominio en ninguna cronología pública ni en tus notificaciones. Se eliminarán tus seguidores procedentes de ese dominio.",
   "confirmations.edit.confirm": "Editar",
-  "confirmations.edit.message": "Editar ahora reemplazará el mensaje que está escribiendo. ¿Está seguro que quiere proceder?",
+  "confirmations.edit.message": "Editar ahora reemplazará el mensaje que estás escribiendo. ¿Seguro que quieres proceder?",
   "confirmations.logout.confirm": "Cerrar sesión",
-  "confirmations.logout.message": "¿Estás seguro de querer cerrar la sesión?",
+  "confirmations.logout.message": "¿Seguro que quieres cerrar la sesión?",
   "confirmations.mute.confirm": "Silenciar",
-  "confirmations.mute.explanation": "Esto esconderá las publicaciones de ellos y en las que los has mencionado, pero les permitirá ver tus mensajes y seguirte.",
-  "confirmations.mute.message": "¿Estás seguro de que quieres silenciar a {name}?",
+  "confirmations.mute.explanation": "Esto esconderá sus publicaciones y las publicaciones que los mencionen, pero podrán seguir viendo tus mensajes y seguirte.",
+  "confirmations.mute.message": "¿Seguro que quieres silenciar a {name}?",
   "confirmations.redraft.confirm": "Borrar y volver a borrador",
   "confirmations.redraft.message": "¿Estás seguro de querer borrar esta publicación y reescribirla? Los favoritos e impulsos se perderán, y las respuestas a la publicación original quedarán sin contexto.",
   "confirmations.reply.confirm": "Responder",
   "confirmations.reply.message": "Responder sobrescribirá el mensaje que estás escribiendo. ¿Seguro que deseas continuar?",
   "confirmations.unfollow.confirm": "Dejar de seguir",
-  "confirmations.unfollow.message": "¿Estás seguro de que quieres dejar de seguir a {name}?",
+  "confirmations.unfollow.message": "¿Seguro que quieres dejar de seguir a {name}?",
   "conversation.delete": "Borrar conversación",
   "conversation.mark_as_read": "Marcar como leído",
   "conversation.open": "Ver conversación",
@@ -194,7 +194,7 @@
   "copypaste.copied": "Copiado",
   "copypaste.copy_to_clipboard": "Copiar al portapapeles",
   "directory.federated": "Desde el fediverso conocido",
-  "directory.local": "Sólo de {domain}",
+  "directory.local": "Solo de {domain}",
   "directory.new_arrivals": "Recién llegados",
   "directory.recently_active": "Recientemente activo",
   "disabled_account_banner.account_settings": "Ajustes de la cuenta",
@@ -210,11 +210,11 @@
   "emoji_button.activity": "Actividad",
   "emoji_button.clear": "Limpiar",
   "emoji_button.custom": "Personalizado",
-  "emoji_button.flags": "Marcas",
+  "emoji_button.flags": "Banderas",
   "emoji_button.food": "Comida y bebida",
   "emoji_button.label": "Insertar emoji",
   "emoji_button.nature": "Naturaleza",
-  "emoji_button.not_found": "No hay emojis!! ¯\\_(ツ)_/¯",
+  "emoji_button.not_found": "No se encontró ningún emoji coincidente",
   "emoji_button.objects": "Objetos",
   "emoji_button.people": "Personas",
   "emoji_button.recent": "Usados frecuentemente",
@@ -230,8 +230,8 @@
   "empty_column.bookmarked_statuses": "Aún no tienes ninguna publicación guardada como marcador. Cuando guardes una, se mostrará aquí.",
   "empty_column.community": "La línea de tiempo local está vacía. ¡Escribe algo para empezar la fiesta!",
   "empty_column.direct": "Aún no tienes menciones privadas. Cuando envíes o recibas una, aparecerán aquí.",
-  "empty_column.domain_blocks": "Todavía no hay dominios ocultos.",
-  "empty_column.explore_statuses": "Nada está en tendencia en este momento. ¡Revisa más tarde!",
+  "empty_column.domain_blocks": "Todavía no hay dominios bloqueados.",
+  "empty_column.explore_statuses": "No hay nada en tendencia en este momento. ¡Revisa más tarde!",
   "empty_column.favourited_statuses": "Todavía no tienes publicaciones favoritas. Cuando marques una publicación como favorita, se mostrarán aquí.",
   "empty_column.favourites": "Todavía nadie marcó esta publicación como favorita. Cuando alguien lo haga, se mostrarán aquí.",
   "empty_column.follow_requests": "No tienes ninguna petición de seguidor. Cuando recibas una, se mostrará aquí.",
@@ -555,6 +555,7 @@
   "relative_time.minutes": "{number} m",
   "relative_time.seconds": "{number} s",
   "relative_time.today": "hoy",
+  "reply_indicator.attachments": "{count, plural, one {# adjunto} other {# adjuntos}}",
   "reply_indicator.cancel": "Cancelar",
   "reply_indicator.poll": "Encuesta",
   "report.block": "Bloquear",
diff --git a/app/javascript/mastodon/locales/sv.json b/app/javascript/mastodon/locales/sv.json
index 4a15c60ed82826..55503ddf50a398 100644
--- a/app/javascript/mastodon/locales/sv.json
+++ b/app/javascript/mastodon/locales/sv.json
@@ -276,11 +276,18 @@
   "firehose.remote": "Andra servrar",
   "follow_request.authorize": "Godkänn",
   "follow_request.reject": "Avvisa",
-  "follow_requests.unlocked_explanation": "Även om ditt konto inte är låst tror {domain} personalen att du kanske vill granska dessa följares förfrågningar manuellt.",
+  "follow_requests.unlocked_explanation": "Även om ditt konto inte är låst tror {domain}-personalen att du kanske vill granska dessa följares förfrågningar manuellt.",
+  "follow_suggestions.curated_suggestion": "Utvald av personalen",
   "follow_suggestions.dismiss": "Visa inte igen",
+  "follow_suggestions.hints.featured": "Denna profil är handplockad av {domain}-teamet.",
+  "follow_suggestions.hints.friends_of_friends": "Denna profil är populär bland de personer du följer.",
+  "follow_suggestions.hints.most_followed": "Denna profil är en av de mest följda på {domain}.",
+  "follow_suggestions.hints.most_interactions": "Denna profil har nyligen fått mycket uppmärksamhet på {domain}.",
+  "follow_suggestions.hints.similar_to_recently_followed": "Denna profil liknar de profiler som du nyligen har följt.",
   "follow_suggestions.personalized_suggestion": "Personligt förslag",
   "follow_suggestions.popular_suggestion": "Populärt förslag",
   "follow_suggestions.view_all": "Visa alla",
+  "follow_suggestions.who_to_follow": "Rekommenderade profiler",
   "followed_tags": "Följda hashtags",
   "footer.about": "Om",
   "footer.directory": "Profilkatalog",
@@ -486,7 +493,9 @@
   "onboarding.profile.note": "Bio",
   "onboarding.profile.note_hint": "Du kan @nämna andra personer eller #hashtags…",
   "onboarding.profile.save_and_continue": "Spara och fortsätt",
+  "onboarding.profile.title": "Konfiguration av profil",
   "onboarding.profile.upload_avatar": "Ladda upp profilbild",
+  "onboarding.profile.upload_header": "Ladda upp profilbanner",
   "onboarding.share.lead": "Låt folk veta hur de kan hitta dig på Mastodon!",
   "onboarding.share.message": "Jag är {username} på #Mastodon! Följ mig på {url}",
   "onboarding.share.next_steps": "Möjliga nästa steg:",
@@ -521,10 +530,14 @@
   "poll_button.remove_poll": "Ta bort omröstning",
   "privacy.change": "Ändra inläggsintegritet",
   "privacy.direct.long": "Alla som nämns i inlägget",
+  "privacy.direct.short": "Särskilda personer",
   "privacy.private.long": "Endast dina följare",
   "privacy.private.short": "Följare",
   "privacy.public.long": "Alla på och utanför Mastodon",
-  "privacy.public.short": "Publik",
+  "privacy.public.short": "Offentlig",
+  "privacy.unlisted.additional": "Detta fungerar precis som offentlig, förutom att inlägget inte visas i liveflöden eller hashtaggar, utforska eller Mastodon-sökning, även om du har valt detta för hela kontot.",
+  "privacy.unlisted.long": "Mindre beaktat av algoritmen",
+  "privacy.unlisted.short": "Offentlig (begränsad)",
   "privacy_policy.last_updated": "Senast uppdaterad {date}",
   "privacy_policy.title": "Integritetspolicy",
   "recommended": "Rekommenderas",
diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json
index f071a86ba0d901..7aa54ae8cea9ff 100644
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@@ -277,7 +277,13 @@
   "follow_request.authorize": "อนุญาต",
   "follow_request.reject": "ปฏิเสธ",
   "follow_requests.unlocked_explanation": "แม้ว่าไม่มีการล็อคบัญชีของคุณ พนักงานของ {domain} คิดว่าคุณอาจต้องการตรวจทานคำขอติดตามจากบัญชีเหล่านี้ด้วยตนเอง",
+  "follow_suggestions.curated_suggestion": "คัดสรรโดยพนักงาน",
   "follow_suggestions.dismiss": "ไม่ต้องแสดงอีก",
+  "follow_suggestions.hints.featured": "โปรไฟล์นี้ได้รับการคัดสรรโดยทีม {domain}",
+  "follow_suggestions.hints.friends_of_friends": "โปรไฟล์นี้ได้รับความนิยมในหมู่ผู้คนที่คุณติดตาม",
+  "follow_suggestions.hints.most_followed": "โปรไฟล์นี้เป็นหนึ่งในโปรไฟล์ที่ได้รับการติดตามมากที่สุดใน {domain}",
+  "follow_suggestions.hints.most_interactions": "โปรไฟล์นี้เพิ่งได้รับความสนใจอย่างมากใน {domain}",
+  "follow_suggestions.hints.similar_to_recently_followed": "โปรไฟล์นี้คล้ายกับโปรไฟล์ที่คุณได้ติดตามล่าสุด",
   "follow_suggestions.personalized_suggestion": "ข้อเสนอแนะเฉพาะบุคคล",
   "follow_suggestions.popular_suggestion": "ข้อเสนอแนะยอดนิยม",
   "follow_suggestions.view_all": "ดูทั้งหมด",
diff --git a/config/locales/activerecord.es.yml b/config/locales/activerecord.es.yml
index 186104c702d9b6..569b783103c96a 100644
--- a/config/locales/activerecord.es.yml
+++ b/config/locales/activerecord.es.yml
@@ -56,4 +56,4 @@ es:
         webhook:
           attributes:
             events:
-              invalid_permissions: no se pueden incluir eventos para los que no tienes derechos
+              invalid_permissions: no puede incluir eventos para los que no tienes permisos
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index f79d63a4593d82..2f316984b504ab 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -767,6 +767,7 @@ ca:
         disabled: Per a ningú
         users: Per als usuaris locals en línia
       registrations:
+        moderation_recommandation: Assegureu-vos de tenir un equip de moderadors adient i actiu abans d'obrir l'alta de comptes al públic!
         preamble: Controla qui pot crear un compte en el teu servidor.
         title: Registres
       registrations_mode:
@@ -774,6 +775,7 @@ ca:
           approved: Cal l’aprovació per a registrar-se
           none: No es pot registrar ningú
           open: Qualsevol pot registrar-se
+        warning_hint: Recomanem utilitzar l'opció "Es requereix aprovació per a donar-se d'alta" si no teniu un equip de moderadors que puguin gestionar els enviaments de brossa o maliciosos en un temps raonable.
       security:
         authorized_fetch: Requereix autenticació dels servidors federats
         authorized_fetch_hint: Requerir l'autenticació dels servidors federats permet una aplicació més estricta dels bloqueigs a nivell d'usuari i a nivell de servidor. Tanmateix, això provoca una penalització del rendiment, redueix l'abast de les seves respostes i pot introduir problemes de compatibilitat amb alguns serveis federats. A més, això no impedirà que els actors dedicats busquin les teves publicacions i comptes públics.
@@ -966,6 +968,9 @@ ca:
       title: Webhooks
       webhook: Webhook
   admin_mailer:
+    auto_close_registrations:
+      body: A causa de la manca d'activitat recent dels moderadors, les altes a %{instance} han passat automàticament a necessitar una revisió manual, per tal d'evitar que %{instance} es faci servir com a plataforma de potencials mals actuants. Podeu revertir-ho a altes obertes en qualsevol moment.
+      subject: Les altes a %{instance} han passat automàticament a necessitar aprovació
     new_appeal:
       actions:
         delete_statuses: eliminar els seus tuts
diff --git a/config/locales/ckb.yml b/config/locales/ckb.yml
index 7905024381f473..72a3c08d4d31f8 100644
--- a/config/locales/ckb.yml
+++ b/config/locales/ckb.yml
@@ -521,11 +521,14 @@ ckb:
         all: بۆ هەموو کەسێک
         disabled: بۆ هیچ کەسێک
         users: بۆ چوونە ژوورەوەی بەکارهێنەرانی ناوخۆ
+      registrations:
+        moderation_recommandation: تکایە دڵنیابە پێش ئەوەی ناو تۆمارکردن بۆ هەمووان بکەیتەوە، تیمێکی میانڕەوی گونجاو و کاردانەوەتان هەیە!
       registrations_mode:
         modes:
           approved: پەسەندکردنی داواکراو بۆ ناوتۆمارکردن
           none: کەس ناتوانێت خۆی تۆمار بکات
           open: هەر کەسێک دەتوانێت خۆی تۆمار بکات
+        warning_hint: پێشنیار دەکەین "ڕەزامەندی پێویستە بۆ ناو تۆمارکردن" بەکاربهێنیت مەگەر دڵنیا بیت کە تیمی بەڕێوەبردنەکەت دەتوانێت لە کاتی خۆیدا مامەڵە لەگەڵ سپام و تۆمارکردنی زیانبەخشدا بکات.
     site_uploads:
       delete: سڕینەوەی فایلی بارکراو
       destroyed_msg: بارکردنی ماڵپەڕ بە سەرکەوتوویی سڕدراوەتەوە!
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 0c85930a4f962d..e43f671590d64b 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -795,13 +795,15 @@ cs:
         disabled: Nikomu
         users: Přihlášeným místním uživatelům
       registrations:
+        moderation_recommandation: Před otevřením registrací všem se ujistěte, že máte vhodný a reaktivní moderační tým!
         preamble: Mějte pod kontrolou, kdo může vytvořit účet na vašem serveru.
         title: Registrace
       registrations_mode:
         modes:
-          approved: Pro registraci je vyžadováno schválení
+          approved: Schválení požadované pro registraci
           none: Nikdo se nemůže registrovat
           open: Kdokoliv se může registrovat
+        warning_hint: Doporučujeme použít "Schválení požadované pro registraci", pokud si nejste jistí, že váš moderační tým dokáže včas zpracovat spam a škodlivé registrace.
       security:
         authorized_fetch: Vyžadovat autentizaci od federovaných serverů
         authorized_fetch_hint: Vyžadování ověřování pravosti od federalizovaných serverů umožňuje přísnější prosazování uživatelských i serverních bloků. K tomu však dochází k snížení výkonu, snižení dosah vašich odpovědí a můžou se zavést problémy s kompatibilitou s některými federálními službami. Kromě toho to nebude bránit oddaným uživatelům či robotům v načítání vašich veřejných příspěvků a účtů.
@@ -1002,6 +1004,9 @@ cs:
       title: Webhooky
       webhook: Webhook
   admin_mailer:
+    auto_close_registrations:
+      body: Kvůli nedostatku nedávných aktivit od moderátorů byly registrace na %{instance} automaticky přepnuty na vyžadující manuální kontrolu. aby se zabránilo použití %{instance} jako platformy pro potenciálně škodlivých hráčů. Můžete ji kdykoliv přepnout zpět na otevřené registrace.
+      subject: Registrace pro %{instance} byly automaticky přepnuty na vyžadující schválení
     new_appeal:
       actions:
         delete_statuses: smazání jeho příspěvků
diff --git a/config/locales/da.yml b/config/locales/da.yml
index 4abc59dd4c172c..43f4b64eef0fb4 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -767,6 +767,7 @@ da:
         disabled: Til ingen
         users: Til indloggede lokale brugere
       registrations:
+        moderation_recommandation: Sørg for, at der er et tilstrækkeligt og reaktivt moderationsteam, før registrering åbnes for alle!
         preamble: Styr, hvem der kan oprette en konto på serveren.
         title: Registreringer
       registrations_mode:
@@ -774,6 +775,7 @@ da:
           approved: Tilmeldingsgodkendelse kræves
           none: Ingen kan tilmelde sig
           open: Alle kan tilmelde sig
+        warning_hint: Brug af "Godkendelse kræves ved tilmelding" anbefales, medmindre man er sikker på, at moderationsteamet kan håndtere spam og ondsindede registreringer i tide.
       security:
         authorized_fetch: Kræver godkendelse fra fødererede servere
         authorized_fetch_hint: Krav om godkendelse fra fødererede servere muliggør strengere håndhævelse af både bruger- og serverniveaublokeringer. Omkostningen er dog en ydelsesreduktion, reduceret udstrækning af dine svar samt potentielle kompatibilitetsproblemer med visse fødererede tjenester. Derudover vil dette ikke hindre målrettede aktører i at hente dine offentlige indlæg og konti.
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 4b60ddecc03ab0..ae1af7b3087f4f 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -767,6 +767,7 @@ de:
         disabled: Niemandem
         users: Für angemeldete lokale Benutzer*innen
       registrations:
+        moderation_recommandation: Bitte vergewissere dich, dass du ein geeignetes und reaktionsschnelles Moderationsteam hast, bevor du die Registrierungen uneingeschränkt zulässt!
         preamble: Lege fest, wer auf deinem Server ein Konto erstellen darf.
         title: Registrierungen
       registrations_mode:
@@ -774,6 +775,7 @@ de:
           approved: Registrierung muss genehmigt werden
           none: Niemand darf sich registrieren
           open: Alle können sich registrieren
+        warning_hint: Wir empfehlen die Einstellung „Registrierung muss genehmigt werden“ zu verwenden, es sei denn, du bist dir sicher, dass dein Moderationsteam Spam und böswillige Registrierungen rechtzeitig bearbeiten kann.
       security:
         authorized_fetch: Authentisierung von föderierten Servern erforderlich machen
         authorized_fetch_hint: Das Anfordern einer Authentisierung von föderierten Servern ermöglicht ein strengeres Durchsetzen von Sperren sowohl auf Ebene der Benutzer*innen als auch des Servers. Allerdings ist das mit Leistungseinbußen verbunden, reduziert die Reichweite deiner Antworten und kann zu Kompatibilitätsproblemen mit einigen föderierten Diensten führen. Darüber hinaus wird das Abrufen deiner öffentlichen Beiträge und Konten durch spezialisierte Akteur*innen nicht verhindert.
@@ -968,7 +970,7 @@ de:
   admin_mailer:
     auto_close_registrations:
       body: Aufgrund fehlender Aktivität von Moderator*innen müssen neue Registrierungen auf %{instance} jetzt manuell genehmigt werden. Dies wurde automatisch umgestellt, damit %{instance} nicht als Plattform für Böswillige missbraucht werden kann. Du kannst jederzeit auf uneingeschränkte Registrierungen zurückwechseln.
-      subject: Registrierungen auf %{instance} erfordern jetzt eine manuelle Genehmigung (automatisch umgestellt)
+      subject: Registrierungen auf %{instance} müssen ab jetzt manuell genehmigt werden (automatisch umgestellt)
     new_appeal:
       actions:
         delete_statuses: das Löschen der Beiträge
diff --git a/config/locales/devise.sv.yml b/config/locales/devise.sv.yml
index 6544f426bd617b..9300493fa0e3a7 100644
--- a/config/locales/devise.sv.yml
+++ b/config/locales/devise.sv.yml
@@ -77,6 +77,7 @@ sv:
         subject: 'Mastodon: Autentisering med säkerhetsnycklar är inaktiverat'
         title: Säkerhetsnycklar inaktiverade
       webauthn_enabled:
+        explanation: Autentisering med säkerhetsnyckel har aktiverats för ditt konto.
         extra: Din säkerhetsnyckel kan nu användas för inloggning.
         subject: 'Mastodon: Autentisering med säkerhetsnyckel är aktiverat'
         title: Säkerhetsnycklar aktiverade
diff --git a/config/locales/doorkeeper.eu.yml b/config/locales/doorkeeper.eu.yml
index 9886e034b0ce19..e7963672fae5d3 100644
--- a/config/locales/doorkeeper.eu.yml
+++ b/config/locales/doorkeeper.eu.yml
@@ -97,7 +97,7 @@ eu:
           unknown: Sarbide token-a baliogabea da
         resource_owner_authenticator_not_configured: Baliabidearen jabearen bilaketak huts egin du Doorkeeper.configure.resource_owner_authenticator konfiguratu gabe dagoelako.
         server_error: Autorizatze zerbitzariak eskaera betetzea eragotzi duen ustekabeko baldintza bat aurkitu du.
-        temporarily_unavailable: Autorizatze zerbitzariak ezin du orain eskaera bete  une batez zerbitzariak gainezka egin duelako edo mantentze lanetan dagoelako.
+        temporarily_unavailable: Baimen-zerbitzariak ezin du orain eskaera bete, une batez zerbitzariak gainezka egin duelako edo mantentze lanetan dagoelako.
         unauthorized_client: Bezeroak ez du eskaera hau metodo hau erabiliz egiteko baimenik.
         unsupported_grant_type: Autorizatze mota ez da onartzen autorizatze zerbitzarian.
         unsupported_response_type: Autorizatze zerbitzari honek ez du onartzen erantzun mota hau.
diff --git a/config/locales/es-AR.yml b/config/locales/es-AR.yml
index c4d12d70ae9247..1db8e6ecf855d5 100644
--- a/config/locales/es-AR.yml
+++ b/config/locales/es-AR.yml
@@ -767,6 +767,7 @@ es-AR:
         disabled: A nadie
         users: A usuarios locales con sesiones abiertas
       registrations:
+        moderation_recommandation: Por favor, ¡asegurate de tener un equipo de moderación adecuado y reactivo antes de abrir los registros a todos!
         preamble: Controlá quién puede crear una cuenta en tu servidor.
         title: Registros
       registrations_mode:
@@ -774,6 +775,7 @@ es-AR:
           approved: Se requiere aprobación para registrarse
           none: Nadie puede registrarse
           open: Cualquiera puede registrarse
+        warning_hint: Recomendamos el uso de la opción “Se requiere aprobación para registrarse”, a menos que estés seguro de que tu equipo de moderación puede manejar el spam y los registros maliciosos de forma oportuna.
       security:
         authorized_fetch: Requiere autenticación de servidores federados
         authorized_fetch_hint: Requerir autenticación de servidores federados permite un cumplimiento más estricto tanto de los bloques de nivel de usuario como de nivel de servidor. Sin embargo, esto se produce a costa de una penalidad en el rendimiento, reduce el alcance de tus respuestas y puede introducir problemas de compatibilidad con algunos servicios federados. Además, esto no impedirá que actores dedicados obtengan tus mensajes y cuentas públicas.
diff --git a/config/locales/es-MX.yml b/config/locales/es-MX.yml
index eedd8bf7ce588b..db5c05322ba55c 100644
--- a/config/locales/es-MX.yml
+++ b/config/locales/es-MX.yml
@@ -767,6 +767,7 @@ es-MX:
         disabled: A nadie
         users: Para los usuarios locales que han iniciado sesión
       registrations:
+        moderation_recommandation: Por favor, ¡asegúrate de tener un equipo de moderación adecuado y reactivo antes de abrir los registros a todo el mundo!
         preamble: Controla quién puede crear una cuenta en tu servidor.
         title: Registros
       registrations_mode:
@@ -774,6 +775,7 @@ es-MX:
           approved: Se requiere aprobación para registrarse
           none: Nadie puede registrarse
           open: Cualquiera puede registrarse
+        warning_hint: Recomendamos el uso de “Se requiere aprobación para registrarse” a menos que estés seguro de que tu equipo de moderación puede manejar el spam y los registros maliciosos en un tiempo razonable.
       security:
         authorized_fetch: Requerir autenticación de servidores federados
         authorized_fetch_hint: Requerir autenticación de servidores federados permite un cumplimiento más estricto tanto de los bloqueos a nivel de usuario como a nivel de servidor. Sin embargo, esto se produce a costa de una penalización en el rendimiento, reduce el alcance de tus respuestas y puede introducir problemas de compatibilidad con algunos servicios federados. Además, esto no impedirá que actores dedicados obtengan tus cuentas y publicaciones públicas.
@@ -967,7 +969,7 @@ es-MX:
       webhook: Webhook
   admin_mailer:
     auto_close_registrations:
-      body: Debido a la falta de actividad reciente de los moderadores, se ha cambiado automáticamente el registro en %{instance} para requerir revisión manual, para evitar que la instancia %{instance} sea usada como plataforma para malos actores potenciales. Puedes volver a cambiarlo en cualquier momento para abrir de nuevo los registros.
+      body: Debido a la falta de moderadores activos, los registros en %{instance} han sido cambiados automáticamente para requerir revisión manual, para evitar que %{instance} se utilice potencialmente como plataforma por malos actores. Puedes volver a cambiarlo para abrir los registros en cualquier momento.
       subject: Se ha cambiado automáticamente el registro de %{instance} para requerir aprobación
     new_appeal:
       actions:
diff --git a/config/locales/es.yml b/config/locales/es.yml
index b6217953812401..f5f65d9b1f28aa 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -31,7 +31,7 @@ es:
       created_msg: "¡Nota de moderación creada con éxito!"
       destroyed_msg: "¡Nota de moderación destruida con éxito!"
     accounts:
-      add_email_domain_block: Poner en lista negra el dominio del correo
+      add_email_domain_block: Bloquear el dominio del correo
       approve: Aprobar
       approved_msg: La solicitud de registro de %{username} ha sido aprobada correctamente
       are_you_sure: "¿Estás seguro?"
@@ -767,6 +767,7 @@ es:
         disabled: A nadie
         users: Para los usuarios locales que han iniciado sesión
       registrations:
+        moderation_recommandation: Por favor, ¡asegúrate de tener un equipo de moderación adecuado y reactivo antes de abrir los registros a todo el mundo!
         preamble: Controla quién puede crear una cuenta en tu servidor.
         title: Registros
       registrations_mode:
@@ -774,6 +775,7 @@ es:
           approved: Se requiere aprobación para registrarse
           none: Nadie puede registrarse
           open: Cualquiera puede registrarse
+        warning_hint: Recomendamos el uso de “Se requiere aprobación para registrarse” a menos que estés seguro de que tu equipo de moderación puede manejar el spam y los registros maliciosos en un tiempo razonable.
       security:
         authorized_fetch: Requerir autenticación de servidores federados
         authorized_fetch_hint: Requerir autenticación de servidores federados permite un cumplimiento más estricto tanto de los bloqueos a nivel de usuario como a nivel de servidor. Sin embargo, esto se produce a costa de una penalización en el rendimiento, reduce el alcance de tus respuestas y puede introducir problemas de compatibilidad con algunos servicios federados. Además, esto no impedirá que actores dedicados obtengan tus cuentas y publicaciones públicas.
@@ -967,7 +969,7 @@ es:
       webhook: Webhook
   admin_mailer:
     auto_close_registrations:
-      body: Debido a la falta de actividad reciente de los moderadores, se ha cambiado automáticamente el registro en %{instance} para requerir revisión manual, para evitar que la instancia %{instance} sea usada como plataforma para malos actores potenciales. Puedes volver a cambiarlo en cualquier momento para abrir de nuevo los registros.
+      body: Debido a la falta de moderadores activos, los registros en %{instance} han sido cambiados automáticamente para requerir revisión manual, para evitar que %{instance} se utilice potencialmente como plataforma por malos actores. Puedes volver a cambiarlo para abrir los registros en cualquier momento.
       subject: Se ha cambiado automáticamente el registro de %{instance} para requerir aprobación
     new_appeal:
       actions:
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index 7acccea006dd43..768a84b7c18739 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -597,7 +597,7 @@ eu:
         silence_description_html: Kontua soilik honen jarraitzaile edo espresuki bilatzen dutenentzat izango da ikusgarri, kontuaren irisgarritasuna gogorki mugatzen delarik.
         suspend_description_html: Kontua bera eta honen edukiak eskuraezinak izango dira, eta azkenean, ezabatuak. Kontu honekin erlazionatzea ezinezkoa izango da. Prozesua 30 egunez itzulgarria izango da. Kontu honen aurkako txosten guztiak baztertuko lirateke.
       actions_description_html: Erabaki txosten hau konpontzeko ze ekintza hartu. Salatutako kontuaren aurka zigor ekintza bat hartzen baduzu, eposta jakinarazpen bat bidaliko zaie, <strong>Spam</strong> kategoria hautatzean ezik.
-      actions_description_remote_html: Txosten honi konponbidea aurkitzeko zein ekintza egin hautatu. Hau soilik <strong>zure</strong> zerbitzaria kontu honekin nola komunikatu eta bere edukia nola maneiatzeko da.
+      actions_description_remote_html: Hautatu txosten honi konponbidea aurkitzeko zein neurri hartu. Hau soilik <strong>zure</strong> zerbitzaria urruneko kontu honekin nola komunikatu eta bere edukia nola maneiatzeko da.
       add_to_report: Gehitu gehiago txostenera
       are_you_sure: Ziur zaude?
       assign_to_self: Esleitu niri
@@ -1847,7 +1847,7 @@ eu:
       explanation: Hona hasteko aholku batzuk
       final_action: Hasi bidalketak argitaratzen
       final_step: 'Hasi argitaratzen! Jarraitzailerik ez baduzu ere zure bidalketa publikoak besteek ikusi ditzakete, esaterako denbora-lerro lokalean eta traoletan. Zure burua aurkeztu nahi baduzu #aurkezpenak traola erabili zenezake.'
-      full_handle: Zure erabiltzaile-izen osoa
+      full_handle: Helbide osoa
       full_handle_hint: Hau da lagunei esango zeniekeena beste zerbitzari batetik zu jarraitzeko edo zuri mezuak bidaltzeko.
       subject: Ongi etorri Mastodon-era
       title: Ongi etorri, %{name}!
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 7b3fd1a6eb752e..705f0ef4e919cb 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -767,6 +767,7 @@ gl:
         disabled: Para ninguén
         users: Para usuarias locais conectadas
       registrations:
+        moderation_recommandation: Por favor, pon interese en crear un equipo de moderación competente e reactivo antes de permitir que calquera poida crear unha conta!
         preamble: Xestiona quen pode crear unha conta no teu servidor.
         title: Rexistros
       registrations_mode:
@@ -774,6 +775,7 @@ gl:
           approved: Precisa aprobación para rexistrarse
           none: Rexistro pechado
           open: Rexistro aberto
+        warning_hint: Recomendamos utilizar "Requerir aprobación para o rexistro" a menos que confíes en que o equipo de moderación é quen de xestionar áxilmente o spam e a creación de contas maliciosas.
       security:
         authorized_fetch: Require autenticación desde os servidores federados
         authorized_fetch_hint: Ao requerir autenticación desde os servidores federados activas un reforzamento das políticas de bloqueo a nivel usuaria e nivel servidor. Este proceder ten un custo no rendemento, reducindo o alcance das túas respostas e podería introducir problemas de compatibilidade con algúns servizos federados. Ademais, non evitará que contas con tal propósito vexan as túas publicacións públicas e contas.
@@ -966,6 +968,9 @@ gl:
       title: Webhooks
       webhook: Webhook
   admin_mailer:
+    auto_close_registrations:
+      body: Debido á falta de actividade recente de moderación, a creación de contas en %{instance} mudou ao modo de revisión manual das solicitudes, para evitar que %{instance} sexa usada como plataforma por actores maliciosos. Podes volver ao rexistro aberto en calquera momento.
+      subject: O modo de creación de contas en %{instance} mudou automáticamente a aprobación manual
     new_appeal:
       actions:
         delete_statuses: borrar as súas publicacións
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 05b52213a74e00..fc57f9fd588dc8 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -1002,6 +1002,9 @@ he:
       title: התליות רשת
       webhook: התליית רשת
   admin_mailer:
+    auto_close_registrations:
+      body: עקב חוסר פעילות מנחים, הרשמות אל %{instance} עברו אוטומטית למצב אישור ידני, כדי למנוע משרת %{instance} לשמש לכר פעילות לגורמים עוינים. ניתן תמיד לחזור להרשמה פתוחה.
+      subject: הרשמות אל %{instance} הועברו אוטומטית לדרישה לאישור ידני
     new_appeal:
       actions:
         delete_statuses: כדי למחוק את הודעותיהם
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index a8edcd58bb42c9..b902d0e6c2aaeb 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -767,6 +767,7 @@ hu:
         disabled: Senkinek
         users: Bejelentkezett helyi felhasználóknak
       registrations:
+        moderation_recommandation: Győződjünk meg arról, hogy megfelelő és reaktív moderátor csapatunk van, mielőtt mindenki számára megnyitjuk a regisztrációt!
         preamble: Szabályozd, hogy ki hozhat létre fiókot a kiszolgálón.
         title: Regisztrációk
       registrations_mode:
@@ -774,6 +775,7 @@ hu:
           approved: A regisztráció engedélyhez kötött
           none: Senki sem regisztrálhat
           open: Bárki regisztrálhat
+        warning_hint: Célszerű a "Jóváhagyás szükséges a regisztrációhoz” lehetőség használata, hkivéve, ha biztos vagyunk abban, hogy a moderátor csapat időben tudja kezelni a szemetet és a rosszindulatú regisztrációkat.
       security:
         authorized_fetch: Hitelesítés szükséges a föderációs kiszolgálóktól
         authorized_fetch_hint: A föderációs szerverek hitelesítésének szükségessége lehetővé teszi mind a felhasználói mind a szerver szintű blokkok szigorúbb végrehajtását. Ez azonban a teljesítménybüntetés árán jár, csökkenti a válaszok elérhetőségét és kompatibilitási problémákat vethet fel egyes föderációs szolgáltatásokkal. Emellett ez nem akadályozza meg a dedikált szereplőket abban, hogy nyilvános bejegyzéseiket és fiókjaikat letöltsék.
@@ -967,8 +969,8 @@ hu:
       webhook: Webhook
   admin_mailer:
     auto_close_registrations:
-      body: A közelmúlt moderátori tevékenységnek hiánya miatt %{instance} regisztráció automatikusan kézi ellenőrzést igénylőre vált, hogy megakadályozz, hogy a %{instance} platformot potenciális rossz szereplők számára használhasson. Bármikor visszakapcsolhatjuk a nyitott regisztrációkhoz.
-      subject: "%{instance} regisztráció automatikusan átállt jóváhagyást igénylőre."
+      body: A közelmúlt moderátori tevékenységének hiánya miatt a %{instance} regisztrációja automatikusan kézi ellenőrzést igénylőre váltott azért, hogy megakadályozzuk, hogy a %{instance} potenciálisan rossz szándékú szereplők számára szolgálhasson platformként. A nyílt regisztrációt bármikor visszakapcsolhatod.
+      subject: "%{instance} regisztrációja automatikusan átállt jóváhagyást igénylőre"
     new_appeal:
       actions:
         delete_statuses: bejegyzések törléséről
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 34fa65cc76adb9..a0f1ab76976201 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -767,6 +767,7 @@ it:
         disabled: A nessuno
         users: Agli utenti locali connessi
       registrations:
+        moderation_recommandation: Assicurati di avere un team di moderazione adeguato e reattivo prima di aprire le registrazioni a tutti!
         preamble: Controlla chi può creare un account sul tuo server.
         title: Registrazioni
       registrations_mode:
@@ -774,6 +775,7 @@ it:
           approved: Approvazione richiesta per le iscrizioni
           none: Nessuno può iscriversi
           open: Chiunque può iscriversi
+        warning_hint: Ti consigliamo di utilizzare “Approvazione richiesta per la registrazione” a meno che tu non sia sicuro che il tuo team di moderazione possa gestire lo spam e le registrazioni dannose in modo tempestivo.
       security:
         authorized_fetch: Richiede l'autenticazione dai server federati
         authorized_fetch_hint: La richiesta di autenticazione da server federati consente un'applicazione più rigorosa dei blocchi sia a livello di utente che a livello di server. Tuttavia, ciò comporta una riduzione delle prestazioni, riduce la portata delle tue risposte e potrebbe introdurre problemi di compatibilità con alcuni servizi federati. Inoltre, ciò non impedirà agli attori dedicati di recuperare i tuoi post pubblici e account.
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 2cc423332530b8..1bbda050bbb62d 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -753,6 +753,7 @@ ja:
         disabled: 誰にも許可しない
         users: ログイン済みローカルユーザーのみ許可
       registrations:
+        moderation_recommandation: 登録受付を開始する前に、迅速かつ適切にモデレーションを行うチームを編成しましょう！
         preamble: あなたのサーバー上でアカウントを作成できるユーザーを制御します。
         title: アカウント作成
       registrations_mode:
@@ -760,6 +761,7 @@ ja:
           approved: 登録には承認が必要
           none: 誰にも許可しない
           open: 誰でも登録可
+        warning_hint: モデレーションチームがスパムや悪意のある登録を迅速に処理できる自信がない限り、サインアップを承認制にすることをお勧めします。
       security:
         authorized_fetch: 連合サーバーによる署名なしでの情報取得を拒否する
         authorized_fetch_hint: ほかの連合サーバーから受け付けるリクエストに署名を必須にすることで、ユーザーによるブロックおよびドメインブロック両方の効果をより強力にします。ただし連合の処理コストが増えてパフォーマンス面で不利になるほか、このサーバーから送られた反応が届く範囲が狭まったり、連合における互換性の問題を招く可能性もあります。また、この機能は公開投稿やプロフィールへのアクセスをブロックした相手から完全に遮断できるものではありません。
diff --git a/config/locales/kab.yml b/config/locales/kab.yml
index bd73b4ce0fc87d..f50a357608dc9c 100644
--- a/config/locales/kab.yml
+++ b/config/locales/kab.yml
@@ -589,11 +589,13 @@ kab:
       '604800': 1 umalas
       '86400': 1 wass
     expires_in_prompt: Werǧin
+    generate: Slaled aseɣwen n uɛraḍ
     invited_by: 'Tettwaɛraḍeḍ s ɣur:'
     max_uses:
       one: 1 uuseqdec
       other: "%{count} yiseqdac"
     max_uses_prompt: Ulac talast
+    prompt: Slaled rnu bḍu assaɣen d wiyaḍ akken ad kecmen ɣer uqeddac-a
     table:
       expires_at: Ad ifat di
     title: Ɛreḍ-d kra n yimdanen
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index d992d8b4321ef2..4392c2366e6812 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -767,6 +767,7 @@ nl:
         disabled: Aan niemand
         users: Aan ingelogde lokale gebruikers
       registrations:
+        moderation_recommandation: Zorg ervoor dat je een adequaat en responsief moderatieteam hebt voordat je registraties voor iedereen openstelt!
         preamble: Toezicht houden op wie een account op deze server kan registreren.
         title: Registraties
       registrations_mode:
@@ -774,6 +775,7 @@ nl:
           approved: Goedkeuring vereist om te kunnen registreren
           none: Niemand kan zich registreren
           open: Iedereen kan zich registreren
+        warning_hint: We raden je aan om “Goedkeuring vereist om te kunnen registreren” te gebruiken, tenzij je er zeker van bent dat jouw moderatieteam spam en kwaadwillende registraties tijdig kan afhandelen.
       security:
         authorized_fetch: Verificatie van gefedeerde servers vereisen
         authorized_fetch_hint: Verificatie vereisen van gefedereerde servers maakt een striktere handhaving van blokkades op gebruikersniveau en serverniveau mogelijk. Dit gaat echter ten koste van de prestaties, vermindert het bereik van je reacties en kan compatibiliteitsproblemen met sommige gefedereerde services opleveren. Bovendien zal dit niet voorkomen dat personen met slechte bedoelingen je openbare berichten en accounts kunnen ophalen.
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 401ca3de46ae4e..f0e6a1f60b6b13 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -795,6 +795,7 @@ pl:
         disabled: Nikomu
         users: Zalogowanym lokalnym użytkownikom
       registrations:
+        moderation_recommandation: Upewnij się, że masz adekwatny i szybko reagujący zespół moderacyjny przed otwarciem rejestracji!
         preamble: Kontroluj, kto może utworzyć konto na Twoim serwerze.
         title: Rejestracje
       registrations_mode:
@@ -802,6 +803,7 @@ pl:
           approved: Przyjęcie jest wymagane do rejestracji
           none: Nikt nie może się zarejestrować
           open: Każdy może się zarejestrować
+        warning_hint: Polecamy "Przyjęcie jest wymagane do rejestracji" chyba że masz pewność, że twój zespół moderacyjny może szybko obsłużyć spam i złośliwe rejestracje.
       security:
         authorized_fetch: Wymagaj uwierzytelnienia od sfederowanych serwerów
         authorized_fetch_hint: Wymaganie uwierzytelnienia ze sfederowanych serwerów pozwala na ściślejsze wymuszanie bloków z poziomu użytkowników i serwera, ale jest wolniejsze, redukuje zasięg odpowiedzi, i może być niekompatybilne z niektórymi sfederowanymi usługami. Nie chroni również publicznych kont i wpisów przed oddanymi użytkownikami.
diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index 8a20bc68a148b0..0ebb032ff92e73 100644
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -767,6 +767,7 @@ pt-PT:
         disabled: Para ninguém
         users: Para utilizadores locais que se encontrem autenticados
       registrations:
+        moderation_recommandation: Por favor, certifique-se de que você tem uma equipe de moderação adequada e reativa antes de abrir os registros para todos!
         preamble: Controle quem pode criar uma conta no seu servidor.
         title: Inscrições
       registrations_mode:
@@ -774,6 +775,7 @@ pt-PT:
           approved: Registo sujeito a aprovação
           none: Ninguém se pode registar
           open: Qualquer pessoa se pode registar
+        warning_hint: Recomendamos o uso de "Aprovação necessária para se cadastrar", a menos que você esteja confiante de que sua equipe de moderação pode lidar com spam e registros maliciosos em tempo hábil.
       security:
         authorized_fetch: Exigir autenticação de servidores federados
         authorized_fetch_hint: Exigir autenticação de servidores federados permite uma aplicação mais rigorosa de bloqueios tanto ao nível do utilizador como do servidor. No entanto, isso é feito à custa de uma diminuição de desempenho, reduz o alcance das suas respostas e pode introduzir problemas de compatibilidade com alguns serviços federados. Além disso, isso não impede os atores mais empenhados de aceder às suas publicações e contas públicas.
diff --git a/config/locales/simple_form.kab.yml b/config/locales/simple_form.kab.yml
index 546336660c7327..c7370aedf61702 100644
--- a/config/locales/simple_form.kab.yml
+++ b/config/locales/simple_form.kab.yml
@@ -55,6 +55,7 @@ kab:
         data: Isefka
         display_name: Isem ara d-yettwaskanen
         email: Tansa imayl
+        expires_in: Ad yemmet
         header: Ixef
         locale: Tutlayt n wegrudem
         max_uses: Amḍan afellay n iseqdacen
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 90f8144ea856c9..66022b10aebdd2 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -634,6 +634,7 @@ sk:
           approved: Pre registráciu je nutné povolenie
           none: Nikto sa nemôže registrovať
           open: Ktokoľvek sa môže zaregistrovať
+        warning_hint: Odporúčame používať "Pre registráciu je potrebné schválenie", pokiaľ si niesi istý/á, že tvoj moderovací tím vie zvládnuť spam a záškodné registrácie včas.
       title: Nastavenia servera
     site_uploads:
       delete: Vymaž nahratý súbor
@@ -739,6 +740,8 @@ sk:
       enabled: Aktívne
       status: Stav
   admin_mailer:
+    auto_close_registrations:
+      subject: Registrácie na %{instance} boli automaticky prepnuté na vyžadujúce schválenie
     new_appeal:
       actions:
         none: varovanie
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 89668a71335eb4..915970f805d12a 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -795,6 +795,7 @@ sl:
         disabled: Nikomur
         users: Prijavljenim krajevnim uporabnikom
       registrations:
+        moderation_recommandation: Preden prijave odprete za vse poskrbite, da imate v ekipi moderatorjev zadosti aktivnih članov.
         preamble: Nadzirajte, kdo lahko ustvari račun na vašem strežniku.
         title: Registracije
       registrations_mode:
@@ -802,6 +803,7 @@ sl:
           approved: Potrebna je odobritev za prijavo
           none: Nihče se ne more prijaviti
           open: Vsakdo se lahko prijavi
+        warning_hint: Priporočamo uporabo možnosti »Potrebna je odobritev za prijavo«, razen če ste gotovi, da se bo vaša ekipa moderatorjev res zmožna hitro odzvati na neželene vsebine in škodoželjne prijave.
       security:
         authorized_fetch: Od drugih strežnikov v federaciji zahtevaj overitev pristnosti
         authorized_fetch_hint: Zahtevanje overitve pristnosti od drugih strežnikov v federaciji omogoči strožje uveljavljanje uporabniških in strežniških blokad. Vendar je cena za to počasnejše delovanje, zmanjšanje dosega vaših odgovorov in morebitne težave z združljivostjo z nekaterimi storitvami v federaciji. Poleg tega to odločenim akterjem ne bo preprečilo pridobivanja vaših javnih objav in računov.
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 2b605e5073ed51..f6e00ba520fd6b 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -767,6 +767,7 @@ tr:
         disabled: Hiç kimseye
         users: Oturum açan yerel kullanıcılara
       registrations:
+        moderation_recommandation: Lütfen kayıtları herkese açmadan önce yeterli ve duyarlı bir denetleyici ekibine sahip olduğunuzdan emin olun!
         preamble: Sunucunuzda kimin hesap oluşturabileceğini denetleyin.
         title: Kayıtlar
       registrations_mode:
@@ -774,6 +775,7 @@ tr:
           approved: Kayıt için onay gerekli
           none: Hiç kimse kayıt olamaz
           open: Herkes kaydolabilir
+        warning_hint: Denetleyici ekibinizin istenmeyen ve kötü niyetli kayıtları ele alabilecekleri konusunda emin değilseniz "Kayıt için onay gerekli" seçeneğini kullanmanızı öneririz.
       security:
         authorized_fetch: Dağıtık sunuculardan kimlik doğrulama gerektir
         authorized_fetch_hint: Dağıtık sunuculardan kimlik doğrulaması istemek, hem kullanıcı düzeyinde hem de sunucu düzeyinde blokların daha sıkı bir şekilde uygulanmasını sağlar. Ancak bu performans kaybına sebep olur, yanıtlarınızın erişimini azaltır ve bazı dağıtık hizmetlerle uyumluluk sorunları ortaya çıkarabilir. Ayrıca bu, özel aktörlerin herkese açık gönderilerinizi ve hesaplarınızı getirilmesini engellemez.
@@ -966,6 +968,9 @@ tr:
       title: Web kancaları
       webhook: Web kancası
   admin_mailer:
+    auto_close_registrations:
+      body: Son zamanlardaki denetleyi faaliyeti eksikliğinden dolayı, %{instance} üzerindeki kayıtlar, %{instance} sunucusunun olası kötü aktörler tarafından bir platform olarak kullanımını engellemek için otomatik olarak elle onay gerektirecek şekilde değiştirilmiştir. İstediğiniz zaman açık kayıtlara çevirebilirsiniz.
+      subject: "%{instance} üzerindeki kayıtlar otomatik olarak onay gerektirecek şekilde değiştirilmiştir"
     new_appeal:
       actions:
         delete_statuses: gönderilerini silme
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 5d11bfcfd439f9..4d4097d658f218 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -795,6 +795,7 @@ uk:
         disabled: Нікого
         users: Для авторизованих локальних користувачів
       registrations:
+        moderation_recommandation: Переконайтеся, що у вас є адекватна і швидка команда модерації, перш ніж ви відкриєте реєстрацію для всіх!
         preamble: Контролюйте, хто може створити обліковий запис на вашому сервері.
         title: Реєстрації
       registrations_mode:
@@ -802,6 +803,7 @@ uk:
           approved: Для входу потрібне схвалення
           none: Ніхто не може увійти
           open: Будь-хто може увійти
+        warning_hint: Радимо використовувати "Обов'язкове затвердження", якщо ви не впевнені, що ваша команда модерації може вчасно обробляти спам та зловмисні реєстрації.
       security:
         authorized_fetch: Вимагати аутентифікацію з федеративних серверів
         authorized_fetch_hint: Вимога автентифікації від федеративних серверів забезпечує суворіше застосування блокування як на рівні користувача, так і на рівні сервера. Однак це призводить до зниження продуктивності, зменшує охоплення ваших відповідей і може спричинити проблеми сумісності з деякими федеративними сервісами. Крім того, це не завадить зловмисникам отримувати ваші загальнодоступні дописи та облікові записи.
@@ -1003,7 +1005,7 @@ uk:
       webhook: Вебхук
   admin_mailer:
     auto_close_registrations:
-      body: Через нестачу нещодавньої активності модератора реєстрація на %{instance} автоматично переключена на вимагу ручного відгуку, для запобігання використанню %{instance} як платформи для потенційних поганих гравців. Ви можете будь-коли переключитися на відкриті реєстрації.
+      body: Через нестачу нещодавньої активності модератора реєстрація на %{instance} автоматично перемкнута на обов'язковий розгляд вручну, для запобігання використанню %{instance} платформою для потенційних зловмисників. Ви можете будь-коли перемкнутися на відкриту реєстрацію.
       subject: Реєстрації для %{instance} автоматично перейшли на такі, що вимагають схвалення
     new_appeal:
       actions:
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 554e8d873c5028..cf56a2d227f729 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -753,6 +753,7 @@ zh-CN:
         disabled: 不对任何人
         users: 对本地已登录用户
       registrations:
+        moderation_recommandation: 在向所有人开放注册之前，请确保您拥有一个人手足够且反应迅速的管理团队！
         preamble: 控制谁可以在你的服务器上创建账号。
         title: 注册
       registrations_mode:
@@ -760,6 +761,7 @@ zh-CN:
           approved: 注册时需要批准
           none: 关闭注册
           open: 开放注册
+        warning_hint: 我们建议使用“注册必须经过批准”，除非您确信您的管理团队能够及时处理骚扰和恶意注册。
       security:
         authorized_fetch: 需要跨站认证
         authorized_fetch_hint: 要求外站请求通过验证能够使用户级别与服务器级别的封锁更为严格。然而，这将带来额外的性能负担、减少回复触达范围、并可能导致与一些联邦宇宙服务的兼容性问题。此外，这并不能阻止他人针对性地获取公开嘟文与账户。
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 4276782cccfc40..bc8454884cc3e8 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -755,6 +755,7 @@ zh-TW:
         disabled: 給沒有人
         users: 套用至所有登入的本站使用者
       registrations:
+        moderation_recommandation: 對所有人開放註冊之前，請確保您有人手充足且反應靈敏的管理員團隊！
         preamble: 控制誰能於您伺服器上建立帳號。
         title: 註冊
       registrations_mode:
@@ -762,6 +763,7 @@ zh-TW:
           approved: 註冊需要審核
           none: 沒有人可註冊
           open: 任何人皆能註冊
+        warning_hint: 建議您使用「需要審核註冊」除非您相信您的管理員團隊能即時處理垃圾訊息與惡意帳號註冊。
       security:
         authorized_fetch: 要求自聯邦宇宙伺服器之驗證
         authorized_fetch_hint: 要求聯邦宇宙伺服器進行驗證將更嚴格地執行使用者層級及伺服器層級之封鎖。然而，這將會帶來一些性能損失、減少您的回嘟觸及量、並可能會引入與某些聯邦宇宙伺服器之相容性問題。 此外，這無法阻止專門服務抓取您的公開嘟文及帳號資料。

From 25ffe0af453cfdcad787913b57f217303bfa59a2 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 23 Feb 2024 16:32:13 +0100
Subject: [PATCH 0222/2191] Fix pixel alignment for some composer icons
 (#29372)

---
 .../features/compose/components/edit_indicator.jsx   |  6 +++---
 .../compose/components/emoji_picker_dropdown.jsx     |  2 +-
 .../compose/components/language_dropdown.jsx         |  6 +++---
 .../features/compose/components/navigation_bar.jsx   |  2 +-
 .../features/compose/components/poll_button.jsx      |  2 +-
 .../mastodon/features/compose/components/upload.jsx  |  2 +-
 .../features/compose/components/upload_button.jsx    |  2 +-
 .../compose/containers/spoiler_button_container.js   |  2 +-
 .../400-20px/bar_chart_4_bars-fill.svg               |  1 +
 .../material-icons/400-20px/bar_chart_4_bars.svg     |  1 +
 .../material-icons/400-20px/close-fill.svg           |  1 +
 app/javascript/material-icons/400-20px/close.svg     |  1 +
 app/javascript/material-icons/400-20px/mood-fill.svg |  1 +
 app/javascript/material-icons/400-20px/mood.svg      |  1 +
 .../material-icons/400-20px/photo_library-fill.svg   |  1 +
 .../material-icons/400-20px/photo_library.svg        |  1 +
 .../material-icons/400-20px/warning-fill.svg         |  1 +
 app/javascript/material-icons/400-20px/warning.svg   |  1 +
 app/javascript/material-icons/400-24px/mood-fill.svg |  1 -
 app/javascript/material-icons/400-24px/mood.svg      |  1 -
 app/javascript/styles/mastodon/components.scss       | 12 ++++++------
 21 files changed, 28 insertions(+), 20 deletions(-)
 create mode 100644 app/javascript/material-icons/400-20px/bar_chart_4_bars-fill.svg
 create mode 100644 app/javascript/material-icons/400-20px/bar_chart_4_bars.svg
 create mode 100644 app/javascript/material-icons/400-20px/close-fill.svg
 create mode 100644 app/javascript/material-icons/400-20px/close.svg
 create mode 100644 app/javascript/material-icons/400-20px/mood-fill.svg
 create mode 100644 app/javascript/material-icons/400-20px/mood.svg
 create mode 100644 app/javascript/material-icons/400-20px/photo_library-fill.svg
 create mode 100644 app/javascript/material-icons/400-20px/photo_library.svg
 create mode 100644 app/javascript/material-icons/400-20px/warning-fill.svg
 create mode 100644 app/javascript/material-icons/400-20px/warning.svg
 delete mode 100644 app/javascript/material-icons/400-24px/mood-fill.svg
 delete mode 100644 app/javascript/material-icons/400-24px/mood.svg

diff --git a/app/javascript/mastodon/features/compose/components/edit_indicator.jsx b/app/javascript/mastodon/features/compose/components/edit_indicator.jsx
index 6cdaaebea5f41a..cc37d2d7d8127b 100644
--- a/app/javascript/mastodon/features/compose/components/edit_indicator.jsx
+++ b/app/javascript/mastodon/features/compose/components/edit_indicator.jsx
@@ -6,9 +6,9 @@ import { Link } from 'react-router-dom';
 
 import { useDispatch, useSelector } from 'react-redux';
 
-import BarChart4BarsIcon from 'mastodon/../material-icons/400-24px/bar_chart_4_bars.svg?react';
-import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
-import PhotoLibraryIcon from 'mastodon/../material-icons/400-24px/photo_library.svg?react';
+import BarChart4BarsIcon from '@/material-icons/400-24px/bar_chart_4_bars.svg?react';
+import CloseIcon from '@/material-icons/400-24px/close.svg?react';
+import PhotoLibraryIcon from '@/material-icons/400-24px/photo_library.svg?react';
 import { cancelReplyCompose } from 'mastodon/actions/compose';
 import { Icon } from 'mastodon/components/icon';
 import { IconButton } from 'mastodon/components/icon_button';
diff --git a/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.jsx b/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.jsx
index 37017f4cc32021..acc3fd0ce51b3d 100644
--- a/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.jsx
+++ b/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.jsx
@@ -10,7 +10,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import { supportsPassiveEvents } from 'detect-passive-events';
 import Overlay from 'react-overlays/Overlay';
 
-import MoodIcon from 'mastodon/../material-icons/400-24px/mood.svg?react';
+import MoodIcon from '@/material-icons/400-20px/mood.svg?react';
 import { IconButton } from 'mastodon/components/icon_button';
 import { assetHost } from 'mastodon/utils/config';
 
diff --git a/app/javascript/mastodon/features/compose/components/language_dropdown.jsx b/app/javascript/mastodon/features/compose/components/language_dropdown.jsx
index 2783ca8be2a831..85057799be2fa7 100644
--- a/app/javascript/mastodon/features/compose/components/language_dropdown.jsx
+++ b/app/javascript/mastodon/features/compose/components/language_dropdown.jsx
@@ -9,9 +9,9 @@ import { supportsPassiveEvents } from 'detect-passive-events';
 import fuzzysort from 'fuzzysort';
 import Overlay from 'react-overlays/Overlay';
 
-import CancelIcon from 'mastodon/../material-icons/400-24px/cancel-fill.svg?react';
-import SearchIcon from 'mastodon/../material-icons/400-24px/search.svg?react';
-import TranslateIcon from 'mastodon/../material-icons/400-24px/translate.svg?react';
+import CancelIcon from '@/material-icons/400-24px/cancel-fill.svg?react';
+import SearchIcon from '@/material-icons/400-24px/search.svg?react';
+import TranslateIcon from '@/material-icons/400-24px/translate.svg?react';
 import { Icon } from 'mastodon/components/icon';
 import { languages as preloadedLanguages } from 'mastodon/initial_state';
 
diff --git a/app/javascript/mastodon/features/compose/components/navigation_bar.jsx b/app/javascript/mastodon/features/compose/components/navigation_bar.jsx
index ebf59e4c838c96..ec5578eef3ce81 100644
--- a/app/javascript/mastodon/features/compose/components/navigation_bar.jsx
+++ b/app/javascript/mastodon/features/compose/components/navigation_bar.jsx
@@ -4,7 +4,7 @@ import { useIntl, defineMessages } from 'react-intl';
 
 import { useSelector, useDispatch } from 'react-redux';
 
-import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
+import CloseIcon from '@/material-icons/400-24px/close.svg?react';
 import { cancelReplyCompose } from 'mastodon/actions/compose';
 import Account from 'mastodon/components/account';
 import { IconButton } from 'mastodon/components/icon_button';
diff --git a/app/javascript/mastodon/features/compose/components/poll_button.jsx b/app/javascript/mastodon/features/compose/components/poll_button.jsx
index 345497abd32b8c..cbaa25cb3c25ee 100644
--- a/app/javascript/mastodon/features/compose/components/poll_button.jsx
+++ b/app/javascript/mastodon/features/compose/components/poll_button.jsx
@@ -3,7 +3,7 @@ import { PureComponent } from 'react';
 
 import { defineMessages, injectIntl } from 'react-intl';
 
-import BarChart4BarsIcon from '@/material-icons/400-24px/bar_chart_4_bars.svg?react';
+import BarChart4BarsIcon from '@/material-icons/400-20px/bar_chart_4_bars.svg?react';
 
 import { IconButton } from '../../../components/icon_button';
 
diff --git a/app/javascript/mastodon/features/compose/components/upload.jsx b/app/javascript/mastodon/features/compose/components/upload.jsx
index 861232d0ecbe03..e8045ae81fb618 100644
--- a/app/javascript/mastodon/features/compose/components/upload.jsx
+++ b/app/javascript/mastodon/features/compose/components/upload.jsx
@@ -9,7 +9,7 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
 
 import spring from 'react-motion/lib/spring';
 
-import CloseIcon from '@/material-icons/400-24px/close.svg?react';
+import CloseIcon from '@/material-icons/400-20px/close.svg?react';
 import EditIcon from '@/material-icons/400-24px/edit.svg?react';
 import WarningIcon from '@/material-icons/400-24px/warning.svg?react';
 import { Blurhash } from 'mastodon/components/blurhash';
diff --git a/app/javascript/mastodon/features/compose/components/upload_button.jsx b/app/javascript/mastodon/features/compose/components/upload_button.jsx
index 50c9ad6321a19a..20fb20f09203f8 100644
--- a/app/javascript/mastodon/features/compose/components/upload_button.jsx
+++ b/app/javascript/mastodon/features/compose/components/upload_button.jsx
@@ -6,7 +6,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-import PhotoLibraryIcon from '@/material-icons/400-24px/photo_library.svg?react';
+import PhotoLibraryIcon from '@/material-icons/400-20px/photo_library.svg?react';
 import { IconButton } from 'mastodon/components/icon_button';
 
 const messages = defineMessages({
diff --git a/app/javascript/mastodon/features/compose/containers/spoiler_button_container.js b/app/javascript/mastodon/features/compose/containers/spoiler_button_container.js
index a2414177356864..9acc43437be0e4 100644
--- a/app/javascript/mastodon/features/compose/containers/spoiler_button_container.js
+++ b/app/javascript/mastodon/features/compose/containers/spoiler_button_container.js
@@ -2,7 +2,7 @@ import { injectIntl, defineMessages } from 'react-intl';
 
 import { connect } from 'react-redux';
 
-import WarningIcon from 'mastodon/../material-icons/400-24px/warning.svg?react';
+import WarningIcon from '@/material-icons/400-20px/warning.svg?react';
 import { IconButton } from 'mastodon/components/icon_button';
 
 import { changeComposeSpoilerness } from '../../../actions/compose';
diff --git a/app/javascript/material-icons/400-20px/bar_chart_4_bars-fill.svg b/app/javascript/material-icons/400-20px/bar_chart_4_bars-fill.svg
new file mode 100644
index 00000000000000..78ce1472728890
--- /dev/null
+++ b/app/javascript/material-icons/400-20px/bar_chart_4_bars-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="20" viewBox="0 -960 960 960" width="20"><path d="M96-144v-72h768v72H96Zm48-120v-264h96v264h-96Zm192 0v-456h96v456h-96Zm192 0v-336h96v336h-96Zm192 0v-552h96v552h-96Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-20px/bar_chart_4_bars.svg b/app/javascript/material-icons/400-20px/bar_chart_4_bars.svg
new file mode 100644
index 00000000000000..78ce1472728890
--- /dev/null
+++ b/app/javascript/material-icons/400-20px/bar_chart_4_bars.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="20" viewBox="0 -960 960 960" width="20"><path d="M96-144v-72h768v72H96Zm48-120v-264h96v264h-96Zm192 0v-456h96v456h-96Zm192 0v-336h96v336h-96Zm192 0v-552h96v552h-96Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-20px/close-fill.svg b/app/javascript/material-icons/400-20px/close-fill.svg
new file mode 100644
index 00000000000000..46d8afd7e19ee0
--- /dev/null
+++ b/app/javascript/material-icons/400-20px/close-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="20" viewBox="0 -960 960 960" width="20"><path d="m291-240-51-51 189-189-189-189 51-51 189 189 189-189 51 51-189 189 189 189-51 51-189-189-189 189Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-20px/close.svg b/app/javascript/material-icons/400-20px/close.svg
new file mode 100644
index 00000000000000..46d8afd7e19ee0
--- /dev/null
+++ b/app/javascript/material-icons/400-20px/close.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="20" viewBox="0 -960 960 960" width="20"><path d="m291-240-51-51 189-189-189-189 51-51 189 189 189-189 51 51-189 189 189 189-51 51-189-189-189 189Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-20px/mood-fill.svg b/app/javascript/material-icons/400-20px/mood-fill.svg
new file mode 100644
index 00000000000000..ef72aeef6e8f83
--- /dev/null
+++ b/app/javascript/material-icons/400-20px/mood-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="20" viewBox="0 -960 960 960" width="20"><path d="M612-516q25 0 42.5-17.5T672-576q0-25-17.5-42.5T612-636q-25 0-42.5 17.5T552-576q0 25 17.5 42.5T612-516Zm-264 0q25 0 42.5-17.5T408-576q0-25-17.5-42.5T348-636q-25 0-42.5 17.5T288-576q0 25 17.5 42.5T348-516Zm132 228q62 0 114.5-29t75.5-86H290q23 57 75.5 86T480-288Zm.276 192Q401-96 331-126q-70-30-122.5-82.5T126-330.958q-30-69.959-30-149.5Q96-560 126-629.5t82.5-122Q261-804 330.958-834q69.959-30 149.5-30Q560-864 629.5-834t122 82.5Q804-699 834-629.276q30 69.725 30 149Q864-401 834-331q-30 70-82.5 122.5T629.276-126q-69.725 30-149 30Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-20px/mood.svg b/app/javascript/material-icons/400-20px/mood.svg
new file mode 100644
index 00000000000000..abb44c466339b3
--- /dev/null
+++ b/app/javascript/material-icons/400-20px/mood.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="20" viewBox="0 -960 960 960" width="20"><path d="M612-516q25 0 42.5-17.5T672-576q0-25-17.5-42.5T612-636q-25 0-42.5 17.5T552-576q0 25 17.5 42.5T612-516Zm-264 0q25 0 42.5-17.5T408-576q0-25-17.5-42.5T348-636q-25 0-42.5 17.5T288-576q0 25 17.5 42.5T348-516Zm132 228q60 0 110.5-31t79.5-84H290q29 53 79.5 84T480-288Zm.276 192Q401-96 331-126q-70-30-122.5-82.5T126-330.958q-30-69.959-30-149.5Q96-560 126-629.5t82.5-122Q261-804 330.958-834q69.959-30 149.5-30Q560-864 629.5-834t122 82.5Q804-699 834-629.276q30 69.725 30 149Q864-401 834-331q-30 70-82.5 122.5T629.276-126q-69.725 30-149 30ZM480-480Zm0 312q130 0 221-91t91-221q0-130-91-221t-221-91q-130 0-221 91t-91 221q0 130 91 221t221 91Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-20px/photo_library-fill.svg b/app/javascript/material-icons/400-20px/photo_library-fill.svg
new file mode 100644
index 00000000000000..5f5e39fbf97929
--- /dev/null
+++ b/app/javascript/material-icons/400-20px/photo_library-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="20" viewBox="0 -960 960 960" width="20"><path d="M360-384h384L618-552l-90 120-66-88-102 136Zm-48 144q-29.7 0-50.85-21.15Q240-282.3 240-312v-480q0-29.7 21.15-50.85Q282.3-864 312-864h480q29.7 0 50.85 21.15Q864-821.7 864-792v480q0 29.7-21.15 50.85Q821.7-240 792-240H312ZM168-96q-29.7 0-50.85-21.15Q96-138.3 96-168v-552h72v552h552v72H168Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-20px/photo_library.svg b/app/javascript/material-icons/400-20px/photo_library.svg
new file mode 100644
index 00000000000000..5804edb01c237a
--- /dev/null
+++ b/app/javascript/material-icons/400-20px/photo_library.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="20" viewBox="0 -960 960 960" width="20"><path d="M360-384h384L618-552l-90 120-66-88-102 136Zm-48 144q-29.7 0-50.85-21.15Q240-282.3 240-312v-480q0-29.7 21.15-50.85Q282.3-864 312-864h480q29.7 0 50.85 21.15Q864-821.7 864-792v480q0 29.7-21.15 50.85Q821.7-240 792-240H312Zm0-72h480v-480H312v480ZM168-96q-29.7 0-50.85-21.15Q96-138.3 96-168v-552h72v552h552v72H168Zm144-696v480-480Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-20px/warning-fill.svg b/app/javascript/material-icons/400-20px/warning-fill.svg
new file mode 100644
index 00000000000000..85dd926d3934ff
--- /dev/null
+++ b/app/javascript/material-icons/400-20px/warning-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="20" viewBox="0 -960 960 960" width="20"><path d="m48-144 432-720 432 720H48Zm431.789-120Q495-264 505.5-274.289q10.5-10.29 10.5-25.5Q516-315 505.711-325.5q-10.29-10.5-25.5-10.5Q465-336 454.5-325.711q-10.5 10.29-10.5 25.5Q444-285 454.289-274.5q10.29 10.5 25.5 10.5ZM444-384h72v-192h-72v192Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-20px/warning.svg b/app/javascript/material-icons/400-20px/warning.svg
new file mode 100644
index 00000000000000..d7d45a32112f5d
--- /dev/null
+++ b/app/javascript/material-icons/400-20px/warning.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="20" viewBox="0 -960 960 960" width="20"><path d="m48-144 432-720 432 720H48Zm127-72h610L480-724 175-216Zm304.789-48Q495-264 505.5-274.289q10.5-10.29 10.5-25.5Q516-315 505.711-325.5q-10.29-10.5-25.5-10.5Q465-336 454.5-325.711q-10.5 10.29-10.5 25.5Q444-285 454.289-274.5q10.29 10.5 25.5 10.5ZM444-384h72v-192h-72v192Zm36-86Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/mood-fill.svg b/app/javascript/material-icons/400-24px/mood-fill.svg
deleted file mode 100644
index 9480d0fb92aaa3..00000000000000
--- a/app/javascript/material-icons/400-24px/mood-fill.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M620-520q25 0 42.5-17.5T680-580q0-25-17.5-42.5T620-640q-25 0-42.5 17.5T560-580q0 25 17.5 42.5T620-520Zm-280 0q25 0 42.5-17.5T400-580q0-25-17.5-42.5T340-640q-25 0-42.5 17.5T280-580q0 25 17.5 42.5T340-520Zm140 260q68 0 123.5-38.5T684-400H276q25 63 80.5 101.5T480-260Zm0 180q-83 0-156-31.5T197-197q-54-54-85.5-127T80-480q0-83 31.5-156T197-763q54-54 127-85.5T480-880q83 0 156 31.5T763-763q54 54 85.5 127T880-480q0 83-31.5 156T763-197q-54 54-127 85.5T480-80Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/mood.svg b/app/javascript/material-icons/400-24px/mood.svg
deleted file mode 100644
index 46cafa76808008..00000000000000
--- a/app/javascript/material-icons/400-24px/mood.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M620-520q25 0 42.5-17.5T680-580q0-25-17.5-42.5T620-640q-25 0-42.5 17.5T560-580q0 25 17.5 42.5T620-520Zm-280 0q25 0 42.5-17.5T400-580q0-25-17.5-42.5T340-640q-25 0-42.5 17.5T280-580q0 25 17.5 42.5T340-520Zm140 260q68 0 123.5-38.5T684-400H276q25 63 80.5 101.5T480-260Zm0 180q-83 0-156-31.5T197-197q-54-54-85.5-127T80-480q0-83 31.5-156T197-763q54-54 127-85.5T480-880q83 0 156 31.5T763-763q54 54 85.5 127T880-480q0 83-31.5 156T763-197q-54 54-127 85.5T480-80Zm0-400Zm0 320q134 0 227-93t93-227q0-134-93-227t-227-93q-134 0-227 93t-93 227q0 134 93 227t227 93Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 50b5de35dfb712..2e5db497db3120 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -669,12 +669,12 @@ body > [data-popper-placement] {
     }
 
     .icon-button.compose-form__upload__delete {
-      padding: 3px;
+      padding: 2px;
       border-radius: 50%;
 
       .icon {
-        width: 18px;
-        height: 18px;
+        width: 20px;
+        height: 20px;
       }
     }
 
@@ -720,12 +720,12 @@ body > [data-popper-placement] {
     }
 
     .icon-button {
-      padding: 3px;
+      padding: 2px;
     }
 
     .icon-button .icon {
-      width: 18px;
-      height: 18px;
+      width: 20px;
+      height: 20px;
     }
   }
 

From cfa71a4d16e71b04a42dda564ed8e188bd1badd9 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 23 Feb 2024 20:04:57 +0100
Subject: [PATCH 0223/2191] Fix admin account created by `mastodon:setup` not
 being auto-approved (#29379)

---
 lib/tasks/mastodon.rake | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/tasks/mastodon.rake b/lib/tasks/mastodon.rake
index f50ef4bbff14e2..cb364b30217c94 100644
--- a/lib/tasks/mastodon.rake
+++ b/lib/tasks/mastodon.rake
@@ -544,6 +544,7 @@ namespace :mastodon do
           owner_role = UserRole.find_by(name: 'Owner')
           user = User.new(email: email, password: password, confirmed_at: Time.now.utc, account_attributes: { username: username }, bypass_invite_request_check: true, role: owner_role)
           user.save(validate: false)
+          user.approve!
 
           Setting.site_contact_username = username
 

From 056f9bf3c296240cb55c356148c36332748fec31 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 23 Feb 2024 01:43:21 +0100
Subject: [PATCH 0224/2191] =?UTF-8?q?Add=20back=20=E2=80=9Cspoilers=20alwa?=
 =?UTF-8?q?ys=20on=E2=80=9D=20feature?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../glitch/features/compose/components/compose_form.jsx        | 3 ++-
 .../glitch/features/compose/components/sensitive_button.jsx    | 3 ++-
 .../features/compose/containers/compose_form_container.js      | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/javascript/flavours/glitch/features/compose/components/compose_form.jsx b/app/javascript/flavours/glitch/features/compose/components/compose_form.jsx
index 737bbfc126230f..43e4a9d6cb2b90 100644
--- a/app/javascript/flavours/glitch/features/compose/components/compose_form.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/compose_form.jsx
@@ -48,6 +48,7 @@ class ComposeForm extends ImmutablePureComponent {
     text: PropTypes.string.isRequired,
     suggestions: ImmutablePropTypes.list,
     spoiler: PropTypes.bool,
+    spoilerAlwaysOn: PropTypes.bool,
     privacy: PropTypes.string,
     spoilerText: PropTypes.string,
     focusDate: PropTypes.instanceOf(Date),
@@ -296,7 +297,7 @@ class ComposeForm extends ImmutablePureComponent {
               <div className='compose-form__buttons'>
                 <UploadButtonContainer />
                 <PollButtonContainer />
-                <SpoilerButtonContainer />
+                {!this.props.spoilerAlwaysOn && <SpoilerButtonContainer />}
                 <EmojiPickerDropdown onPickEmoji={this.handleEmojiPick} />
                 <CharacterCounter max={maxChars} text={this.getFulltextForCharacterCounting()} />
               </div>
diff --git a/app/javascript/flavours/glitch/features/compose/components/sensitive_button.jsx b/app/javascript/flavours/glitch/features/compose/components/sensitive_button.jsx
index 37debf9dd76728..deb401bfb744e4 100644
--- a/app/javascript/flavours/glitch/features/compose/components/sensitive_button.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/sensitive_button.jsx
@@ -24,8 +24,9 @@ export const SensitiveButton = () => {
   const spoilersAlwaysOn = useAppSelector((state) => state.getIn(['local_settings', 'always_show_spoilers_field']));
   const spoilerText = useAppSelector((state) => state.getIn(['compose', 'spoiler_text']));
   const sensitive = useAppSelector((state) => state.getIn(['compose', 'sensitive']));
-  const disabled = useAppSelector((state) => state.getIn(['compose', 'spoiler']));
+  const spoiler = useAppSelector((state) => state.getIn(['compose', 'spoiler']));
   const mediaCount = useAppSelector((state) => state.getIn(['compose', 'media_attachments']).size);
+  const disabled = spoilersAlwaysOn ? (spoilerText && spoilerText.length > 0) : spoiler;
 
   const active = sensitive || (spoilersAlwaysOn && spoilerText && spoilerText.length > 0);
 
diff --git a/app/javascript/flavours/glitch/features/compose/containers/compose_form_container.js b/app/javascript/flavours/glitch/features/compose/containers/compose_form_container.js
index ba20698bac8c5c..90de5c8de6eadf 100644
--- a/app/javascript/flavours/glitch/features/compose/containers/compose_form_container.js
+++ b/app/javascript/flavours/glitch/features/compose/containers/compose_form_container.js
@@ -15,7 +15,8 @@ import ComposeForm from '../components/compose_form';
 const mapStateToProps = state => ({
   text: state.getIn(['compose', 'text']),
   suggestions: state.getIn(['compose', 'suggestions']),
-  spoiler: state.getIn(['compose', 'spoiler']),
+  spoiler: state.getIn(['local_settings', 'always_show_spoilers_field']) || state.getIn(['compose', 'spoiler']),
+  spoilerAlwaysOn: state.getIn(['local_settings', 'always_show_spoilers_field']),
   spoilerText: state.getIn(['compose', 'spoiler_text']),
   privacy: state.getIn(['compose', 'privacy']),
   focusDate: state.getIn(['compose', 'focusDate']),

From 179437ed0ed4aa3b0a5affc38740d09790e7923d Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 22 Feb 2024 23:59:03 +0100
Subject: [PATCH 0225/2191] Restore access to glitch-soc app settings

---
 .../glitch/features/compose/index.jsx         | 23 ++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/app/javascript/flavours/glitch/features/compose/index.jsx b/app/javascript/flavours/glitch/features/compose/index.jsx
index 8d0c1942279186..fe81787fa85faf 100644
--- a/app/javascript/flavours/glitch/features/compose/index.jsx
+++ b/app/javascript/flavours/glitch/features/compose/index.jsx
@@ -14,10 +14,10 @@ import spring from 'react-motion/lib/spring';
 import PeopleIcon from '@/material-icons/400-24px/group.svg?react';
 import HomeIcon from '@/material-icons/400-24px/home-fill.svg?react';
 import LogoutIcon from '@/material-icons/400-24px/logout.svg?react';
+import ManufacturingIcon from '@/material-icons/400-24px/manufacturing-fill.svg?react';
 import MenuIcon from '@/material-icons/400-24px/menu.svg?react';
 import NotificationsIcon from '@/material-icons/400-24px/notifications-fill.svg?react';
 import PublicIcon from '@/material-icons/400-24px/public.svg?react';
-import SettingsIcon from '@/material-icons/400-24px/settings-fill.svg?react';
 import { openModal } from 'flavours/glitch/actions/modal';
 import Column from 'flavours/glitch/components/column';
 import { Icon }  from 'flavours/glitch/components/icon';
@@ -39,7 +39,7 @@ const messages = defineMessages({
   notifications: { id: 'tabs_bar.notifications', defaultMessage: 'Notifications' },
   public: { id: 'navigation_bar.public_timeline', defaultMessage: 'Federated timeline' },
   community: { id: 'navigation_bar.community_timeline', defaultMessage: 'Local timeline' },
-  preferences: { id: 'navigation_bar.preferences', defaultMessage: 'Preferences' },
+  settings: { id: 'navigation_bar.app_settings', defaultMessage: 'App settings' },
   logout: { id: 'navigation_bar.logout', defaultMessage: 'Logout' },
   compose: { id: 'navigation_bar.compose', defaultMessage: 'Compose new post' },
   logoutMessage: { id: 'confirmations.logout.message', defaultMessage: 'Are you sure you want to log out?' },
@@ -90,6 +90,15 @@ class Compose extends PureComponent {
     return false;
   };
 
+  handleSettingsClick = e => {
+    const { dispatch } = this.props;
+
+    e.preventDefault();
+    e.stopPropagation();
+
+    dispatch(openModal({ modalType: 'SETTINGS', modalProps: {} }));
+  };
+
   onFocus = () => {
     this.props.dispatch(changeComposing(true));
   };
@@ -120,7 +129,15 @@ class Compose extends PureComponent {
             {!columns.some(column => column.get('id') === 'PUBLIC') && (
               <Link to='/public' className='drawer__tab' title={intl.formatMessage(messages.public)} aria-label={intl.formatMessage(messages.public)}><Icon id='globe' icon={PublicIcon} /></Link>
             )}
-            <a href='/settings/preferences' className='drawer__tab' title={intl.formatMessage(messages.preferences)} aria-label={intl.formatMessage(messages.preferences)}><Icon id='cog' icon={SettingsIcon} /></a>
+            <a
+              onClick={this.handleSettingsClick}
+              href='/settings/preferences'
+              className='drawer__tab'
+              title={intl.formatMessage(messages.settings)}
+              aria-label={intl.formatMessage(messages.settings)}
+            >
+              <Icon id='cogs' icon={ManufacturingIcon} />
+            </a>
             <a href='/auth/sign_out' className='drawer__tab' title={intl.formatMessage(messages.logout)} aria-label={intl.formatMessage(messages.logout)} onClick={this.handleLogoutClick}><Icon id='sign-out' icon={LogoutIcon} /></a>
           </nav>
 

From 61559a42a97ed0b585392b3d605ae6669795d2fc Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 23 Feb 2024 00:02:39 +0100
Subject: [PATCH 0226/2191] Restore glitch-soc's permalink behavior for reply
 indicator

---
 .../features/compose/components/edit_indicator.jsx    |  7 +++----
 .../features/compose/components/reply_indicator.jsx   | 11 +++++------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/app/javascript/flavours/glitch/features/compose/components/edit_indicator.jsx b/app/javascript/flavours/glitch/features/compose/components/edit_indicator.jsx
index 4e3d909833eba4..060e760f06e093 100644
--- a/app/javascript/flavours/glitch/features/compose/components/edit_indicator.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/edit_indicator.jsx
@@ -2,8 +2,6 @@ import { useCallback } from 'react';
 
 import { defineMessages, useIntl, FormattedMessage } from 'react-intl';
 
-import { Link } from 'react-router-dom';
-
 import { useDispatch, useSelector } from 'react-redux';
 
 import BarChart4BarsIcon from '@/material-icons/400-24px/bar_chart_4_bars.svg?react';
@@ -12,6 +10,7 @@ import PhotoLibraryIcon from '@/material-icons/400-24px/photo_library.svg?react'
 import { cancelReplyCompose } from 'flavours/glitch/actions/compose';
 import { Icon } from 'flavours/glitch/components/icon';
 import { IconButton } from 'flavours/glitch/components/icon_button';
+import { Permalink } from 'flavours/glitch/components/permalink';
 import { RelativeTimestamp } from 'flavours/glitch/components/relative_timestamp';
 
 const messages = defineMessages({
@@ -39,9 +38,9 @@ export const EditIndicator = () => {
     <div className='edit-indicator'>
       <div className='edit-indicator__header'>
         <div className='edit-indicator__display-name'>
-          <Link to={`/@${account.get('acct')}`}>@{account.get('acct')}</Link>
+          <Permalink href={account.get('url')} to={`/@${account.get('acct')}`}>@{account.get('acct')}</Permalink>
           ·
-          <Link to={`/@${account.get('acct')}/${status.get('id')}`}><RelativeTimestamp timestamp={status.get('created_at')} /></Link>
+          <Permalink href={status.get('url')} to={`/@${account.get('acct')}/${status.get('id')}`}><RelativeTimestamp timestamp={status.get('created_at')} /></Permalink>
         </div>
 
         <div className='edit-indicator__cancel'>
diff --git a/app/javascript/flavours/glitch/features/compose/components/reply_indicator.jsx b/app/javascript/flavours/glitch/features/compose/components/reply_indicator.jsx
index 5c895195a0036f..b24f7ced9933b1 100644
--- a/app/javascript/flavours/glitch/features/compose/components/reply_indicator.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/reply_indicator.jsx
@@ -1,7 +1,5 @@
 import { FormattedMessage } from 'react-intl';
 
-import { Link } from 'react-router-dom';
-
 import { useSelector } from 'react-redux';
 
 import BarChart4BarsIcon from '@/material-icons/400-24px/bar_chart_4_bars.svg?react';
@@ -9,6 +7,7 @@ import PhotoLibraryIcon from '@/material-icons/400-24px/photo_library.svg?react'
 import { Avatar } from 'flavours/glitch/components/avatar';
 import { DisplayName } from 'flavours/glitch/components/display_name';
 import { Icon } from 'flavours/glitch/components/icon';
+import { Permalink } from 'flavours/glitch/components/permalink';
 
 export const ReplyIndicator = () => {
   const inReplyToId = useSelector(state => state.getIn(['compose', 'in_reply_to']));
@@ -25,14 +24,14 @@ export const ReplyIndicator = () => {
     <div className='reply-indicator'>
       <div className='reply-indicator__line' />
 
-      <Link to={`/@${account.get('acct')}`} className='detailed-status__display-avatar'>
+      <Permalink href={account.get('url')} to={`/@${account.get('acct')}`} className='detailed-status__display-avatar'>
         <Avatar account={account} size={46} />
-      </Link>
+      </Permalink>
 
       <div className='reply-indicator__main'>
-        <Link to={`/@${account.get('acct')}`} className='detailed-status__display-name'>
+        <Permalink href={account.get('url')} to={`/@${account.get('acct')}`} className='detailed-status__display-name'>
           <DisplayName account={account} />
-        </Link>
+        </Permalink>
 
         <div className='reply-indicator__content translate' dangerouslySetInnerHTML={content} />
 

From 118bb5bc81cd9ab1adf4307229a72d95cc5764e7 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 23 Feb 2024 00:26:54 +0100
Subject: [PATCH 0227/2191] Add secondary post button back

---
 .../flavours/glitch/actions/compose.js        |  4 +-
 .../compose/components/compose_form.jsx       | 21 ++++++++-
 .../components/secondary_privacy_button.jsx   | 45 +++++++++++++++++++
 .../containers/compose_form_container.js      | 24 +++++++++-
 .../flavours/glitch/styles/components.scss    | 11 ++++-
 5 files changed, 97 insertions(+), 8 deletions(-)
 create mode 100644 app/javascript/flavours/glitch/features/compose/components/secondary_privacy_button.jsx

diff --git a/app/javascript/flavours/glitch/actions/compose.js b/app/javascript/flavours/glitch/actions/compose.js
index d2c049f3418de2..350ee6fbbe4ab0 100644
--- a/app/javascript/flavours/glitch/actions/compose.js
+++ b/app/javascript/flavours/glitch/actions/compose.js
@@ -179,7 +179,7 @@ export function directCompose(account, routerHistory) {
   };
 }
 
-export function submitCompose(routerHistory) {
+export function submitCompose(routerHistory, overridePrivacy = null) {
   return function (dispatch, getState) {
     let status     = getState().getIn(['compose', 'text'], '');
     const media    = getState().getIn(['compose', 'media_attachments']);
@@ -228,7 +228,7 @@ export function submitCompose(routerHistory) {
         media_attributes,
         sensitive: getState().getIn(['compose', 'sensitive']) || (spoilerText.length > 0 && media.size !== 0),
         spoiler_text: spoilerText,
-        visibility: getState().getIn(['compose', 'privacy']),
+        visibility: overridePrivacy || getState().getIn(['compose', 'privacy']),
         poll: getState().getIn(['compose', 'poll'], null),
         language: getState().getIn(['compose', 'language']),
       },
diff --git a/app/javascript/flavours/glitch/features/compose/components/compose_form.jsx b/app/javascript/flavours/glitch/features/compose/components/compose_form.jsx
index 43e4a9d6cb2b90..12873e2cc082b1 100644
--- a/app/javascript/flavours/glitch/features/compose/components/compose_form.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/compose_form.jsx
@@ -31,6 +31,7 @@ import { EditIndicator } from './edit_indicator';
 import { NavigationBar } from './navigation_bar';
 import { PollForm } from "./poll_form";
 import { ReplyIndicator } from './reply_indicator';
+import { SecondaryPrivacyButton } from './secondary_privacy_button';
 
 const allowedAroundShortCode = '><\u0085\u0020\u00a0\u1680\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029\u0009\u000a\u000b\u000c\u000d';
 
@@ -50,6 +51,7 @@ class ComposeForm extends ImmutablePureComponent {
     spoiler: PropTypes.bool,
     spoilerAlwaysOn: PropTypes.bool,
     privacy: PropTypes.string,
+    sideArm: PropTypes.string,
     spoilerText: PropTypes.string,
     focusDate: PropTypes.instanceOf(Date),
     caretPosition: PropTypes.number,
@@ -96,6 +98,10 @@ class ComposeForm extends ImmutablePureComponent {
     if (e.keyCode === 13 && (e.ctrlKey || e.metaKey)) {
       this.handleSubmit();
     }
+
+    if (e.keyCode === 13 && e.altKey) {
+      this.handleSecondarySubmit();
+    }
   };
 
   getFulltextForCharacterCounting = () => {
@@ -110,7 +116,7 @@ class ComposeForm extends ImmutablePureComponent {
     return !(isSubmitting || isUploading || isChangingUpload || length(fulltext) > maxChars || (isOnlyWhitespace && !anyMedia));
   };
 
-  handleSubmit = (e) => {
+  handleSubmit = (e, overridePrivacy = null) => {
     if (this.props.text !== this.textareaRef.current.value) {
       // Something changed the text inside the textarea (e.g. browser extensions like Grammarly)
       // Update the state to match the current text
@@ -121,13 +127,18 @@ class ComposeForm extends ImmutablePureComponent {
       return;
     }
 
-    this.props.onSubmit(this.props.history || null);
+    this.props.onSubmit(this.props.history || null, overridePrivacy);
 
     if (e) {
       e.preventDefault();
     }
   };
 
+  handleSecondarySubmit = () => {
+    const { sideArm } = this.props;
+    this.handleSubmit(null, sideArm === 'none' ? null : sideArm);
+  };
+
   onSuggestionsClearRequested = () => {
     this.props.onClearSuggestions();
   };
@@ -303,6 +314,12 @@ class ComposeForm extends ImmutablePureComponent {
               </div>
 
               <div className='compose-form__submit'>
+                <SecondaryPrivacyButton
+                  disabled={!this.canSubmit()}
+                  privacy={this.props.sideArm}
+                  isEditing={this.props.isEditing}
+                  onClick={this.handleSecondarySubmit}
+                />
                 <Button
                   type='submit'
                   text={intl.formatMessage(this.props.isEditing ? messages.saveChanges : (this.props.isInReply ? messages.reply : messages.publish))}
diff --git a/app/javascript/flavours/glitch/features/compose/components/secondary_privacy_button.jsx b/app/javascript/flavours/glitch/features/compose/components/secondary_privacy_button.jsx
new file mode 100644
index 00000000000000..c78d7b8617e6bb
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/compose/components/secondary_privacy_button.jsx
@@ -0,0 +1,45 @@
+import PropTypes from 'prop-types';
+
+import { useIntl, defineMessages } from 'react-intl';
+
+import LockIcon from '@/material-icons/400-24px/lock.svg?react';
+import MailIcon from '@/material-icons/400-24px/mail.svg?react';
+import PublicIcon from '@/material-icons/400-24px/public.svg?react';
+import QuietTimeIcon from '@/material-icons/400-24px/quiet_time.svg?react';
+import { Button } from 'flavours/glitch/components/button';
+import { Icon } from 'flavours/glitch/components/icon';
+
+const messages = defineMessages({
+  public: { id: 'privacy.public.short', defaultMessage: 'Public' },
+  unlisted: { id: 'privacy.unlisted.short', defaultMessage: 'Quiet public' },
+  private: { id: 'privacy.private.short', defaultMessage: 'Followers' },
+  direct: { id: 'privacy.direct.short', defaultMessage: 'Specific people' },
+});
+
+export const SecondaryPrivacyButton = ({ disabled, privacy, isEditing, onClick }) => {
+  const intl = useIntl();
+
+  if (isEditing || !privacy || privacy === 'none') {
+    return null;
+  }
+
+  const privacyProps = {
+    direct: { icon: 'envelope', iconComponent: MailIcon, title: messages.direct },
+    private: { icon: 'lock', iconComponent: LockIcon, title: messages.private },
+    public: { icon: 'globe', iconComponent: PublicIcon, title: messages.public },
+    unlisted: { icon: 'unlock', iconComponent: QuietTimeIcon, title: messages.unlisted },
+  };
+
+  return (
+    <Button className='secondary-post-button' disabled={disabled} onClick={onClick} title={intl.formatMessage(privacyProps[privacy].title)}>
+      <Icon id={privacyProps[privacy].id} icon={privacyProps[privacy].iconComponent} />
+    </Button>
+  );
+};
+
+SecondaryPrivacyButton.propTypes = {
+  disabled: PropTypes.bool,
+  privacy: PropTypes.string,
+  isEditing: PropTypes.bool,
+  onClick: PropTypes.func.isRequired,
+};
diff --git a/app/javascript/flavours/glitch/features/compose/containers/compose_form_container.js b/app/javascript/flavours/glitch/features/compose/containers/compose_form_container.js
index 90de5c8de6eadf..2c6c07e9b34212 100644
--- a/app/javascript/flavours/glitch/features/compose/containers/compose_form_container.js
+++ b/app/javascript/flavours/glitch/features/compose/containers/compose_form_container.js
@@ -1,5 +1,7 @@
 import { connect } from 'react-redux';
 
+import { privacyPreference } from 'flavours/glitch/utils/privacy_preference';
+
 import {
   changeCompose,
   submitCompose,
@@ -12,6 +14,23 @@ import {
 } from '../../../actions/compose';
 import ComposeForm from '../components/compose_form';
 
+const sideArmPrivacy = state => {
+  const inReplyTo = state.getIn(['compose', 'in_reply_to']);
+  const replyPrivacy = inReplyTo ? state.getIn(['statuses', inReplyTo, 'visibility']) : null;
+  const sideArmBasePrivacy = state.getIn(['local_settings', 'side_arm']);
+  const sideArmRestrictedPrivacy = replyPrivacy ? privacyPreference(replyPrivacy, sideArmBasePrivacy) : null;
+  let sideArmPrivacy = null;
+  switch (state.getIn(['local_settings', 'side_arm_reply_mode'])) {
+  case 'copy':
+    sideArmPrivacy = replyPrivacy;
+    break;
+  case 'restrict':
+    sideArmPrivacy = sideArmRestrictedPrivacy;
+    break;
+  }
+  return sideArmPrivacy || sideArmBasePrivacy;
+};
+
 const mapStateToProps = state => ({
   text: state.getIn(['compose', 'text']),
   suggestions: state.getIn(['compose', 'suggestions']),
@@ -29,6 +48,7 @@ const mapStateToProps = state => ({
   anyMedia: state.getIn(['compose', 'media_attachments']).size > 0,
   isInReply: state.getIn(['compose', 'in_reply_to']) !== null,
   lang: state.getIn(['compose', 'language']),
+  sideArm: sideArmPrivacy(state),
 });
 
 const mapDispatchToProps = (dispatch) => ({
@@ -37,8 +57,8 @@ const mapDispatchToProps = (dispatch) => ({
     dispatch(changeCompose(text));
   },
 
-  onSubmit (router) {
-    dispatch(submitCompose(router));
+  onSubmit (router, overridePrivacy = null) {
+    dispatch(submitCompose(router, overridePrivacy));
   },
 
   onClearSuggestions () {
diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index ffbf0c2aa8b547..3fa8d041246840 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -750,10 +750,17 @@ body > [data-popper-placement] {
 
   &__submit {
     display: flex;
-    align-items: center;
-    flex: 1 1 auto;
+    flex: 1 0 100%; // glitch: always on its own line
     max-width: 100%;
     overflow: hidden;
+    gap: 5px; // glitch: handle secondary post privacy
+    align-items: stretch; // glitch: handle secondary post privacy
+
+    .button.secondary-post-button {
+      flex: 0 1 auto;
+      padding-top: 0;
+      padding-bottom: 0;
+    }
   }
 
   &__buttons {

From 47deb680d5dca389eb71ee756e475d38514c2ba8 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 23 Feb 2024 00:42:51 +0100
Subject: [PATCH 0228/2191] Add Content-Type dropdown back

---
 .../compose/components/compose_form.jsx       |   2 +
 .../components/content_type_button.jsx        | 115 ++++++++++++++++
 .../compose/components/dropdown_menu.jsx      | 125 ++++++++++++++++++
 .../flavours/glitch/locales/en.json           |   7 +
 4 files changed, 249 insertions(+)
 create mode 100644 app/javascript/flavours/glitch/features/compose/components/content_type_button.jsx
 create mode 100644 app/javascript/flavours/glitch/features/compose/components/dropdown_menu.jsx

diff --git a/app/javascript/flavours/glitch/features/compose/components/compose_form.jsx b/app/javascript/flavours/glitch/features/compose/components/compose_form.jsx
index 12873e2cc082b1..3e0613b10df5a4 100644
--- a/app/javascript/flavours/glitch/features/compose/components/compose_form.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/compose_form.jsx
@@ -27,6 +27,7 @@ import WarningContainer from '../containers/warning_container';
 import { countableText } from '../util/counter';
 
 import { CharacterCounter } from './character_counter';
+import { ContentTypeButton } from './content_type_button';
 import { EditIndicator } from './edit_indicator';
 import { NavigationBar } from './navigation_bar';
 import { PollForm } from "./poll_form";
@@ -309,6 +310,7 @@ class ComposeForm extends ImmutablePureComponent {
                 <UploadButtonContainer />
                 <PollButtonContainer />
                 {!this.props.spoilerAlwaysOn && <SpoilerButtonContainer />}
+                <ContentTypeButton />
                 <EmojiPickerDropdown onPickEmoji={this.handleEmojiPick} />
                 <CharacterCounter max={maxChars} text={this.getFulltextForCharacterCounting()} />
               </div>
diff --git a/app/javascript/flavours/glitch/features/compose/components/content_type_button.jsx b/app/javascript/flavours/glitch/features/compose/components/content_type_button.jsx
new file mode 100644
index 00000000000000..9ac382091e7293
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/compose/components/content_type_button.jsx
@@ -0,0 +1,115 @@
+import { useCallback, useState, useRef } from 'react';
+
+import { useIntl, defineMessages } from 'react-intl';
+
+import Overlay from 'react-overlays/Overlay';
+
+import CodeIcon from '@/material-icons/400-24px/code.svg?react';
+import DescriptionIcon from '@/material-icons/400-24px/description.svg?react';
+import MarkdownIcon from '@/material-icons/400-24px/markdown.svg?react';
+import { changeComposeContentType } from 'flavours/glitch/actions/compose';
+import { IconButton } from 'flavours/glitch/components/icon_button';
+import { useAppSelector, useAppDispatch } from 'flavours/glitch/store';
+
+import DropdownMenu from './dropdown_menu';
+
+const messages = defineMessages({
+  change_content_type: { id: 'compose.content-type.change', defaultMessage: 'Change advanced formatting options' },
+  plain_text_label: { id: 'compose.content-type.plain', defaultMessage: 'Plain text' },
+  plain_text_meta: { id: 'compose.content-type.plain_meta', defaultMessage: 'Write with no advanced formatting' },
+  markdown_label: { id: 'compose.content-type.markdown', defaultMessage: 'Markdown' },
+  markdown_meta: { id: 'compose.content-type.markdown_meta', defaultMessage: 'Format your posts using Markdown' },
+  html_label: { id: 'compose.content-type.html', defaultMessage: 'HTML' },
+  html_meta: { id: 'compose.content-type.html_meta', defaultMessage: 'Format your posts using HTML' },
+});
+
+export const ContentTypeButton = () => {
+  const intl = useIntl();
+
+  const showButton = useAppSelector((state) => state.getIn(['local_settings', 'show_content_type_choice']));
+  const contentType = useAppSelector((state) => state.getIn(['compose', 'content_type']));
+  const dispatch = useAppDispatch();
+
+  const containerRef = useRef(null);
+
+  const [activeElement, setActiveElement] = useState(null);
+  const [open, setOpen] = useState(false);
+  const [placement, setPlacement] = useState('bottom');
+
+  const handleToggle = useCallback(() => {
+    if (open && activeElement) {
+      activeElement.focus({ preventScroll: true });
+      setActiveElement(null);
+    }
+
+    setOpen(!open);
+  }, [open, setOpen, activeElement, setActiveElement]);
+
+  const handleClose = useCallback(() => {
+    if (open && activeElement) {
+      activeElement.focus({ preventScroll: true });
+      setActiveElement(null);
+    }
+
+    setOpen(false);
+  }, [open, setOpen, activeElement, setActiveElement]);
+
+  const handleChange = useCallback((value) => {
+    dispatch(changeComposeContentType(value));
+  }, [dispatch]);
+
+  const handleOverlayEnter = useCallback((state) => {
+    setPlacement(state.placement);
+  }, [setPlacement]);
+
+  if (!showButton) {
+    return null;
+  }
+
+  const options = [
+    { icon: 'file-text', iconComponent: DescriptionIcon, value: 'text/plain', text: intl.formatMessage(messages.plain_text_label), meta: intl.formatMessage(messages.plain_text_meta) },
+    { icon: 'arrow-circle-down', iconComponent: MarkdownIcon, value: 'text/markdown', text: intl.formatMessage(messages.markdown_label), meta: intl.formatMessage(messages.markdown_meta) },
+    { icon: 'code', iconComponent: CodeIcon,  value: 'text/html', text: intl.formatMessage(messages.html_label), meta: intl.formatMessage(messages.html_meta) },
+  ];
+
+  const icon = {
+    'text/plain': 'file-text',
+    'text/markdown': 'arrow-circle-down',
+    'text/html': 'code',
+  }[contentType];
+
+  const iconComponent = {
+    'text/plain': DescriptionIcon,
+    'text/markdown': MarkdownIcon,
+    'text/html': CodeIcon,
+  }[contentType];
+
+  return (
+    <div ref={containerRef}>
+      <IconButton
+        icon={icon}
+        onClick={handleToggle}
+        iconComponent={iconComponent}
+        title={intl.formatMessage(messages.change_content_type)}
+        active={open}
+        size={18}
+        inverted
+      />
+
+      <Overlay show={open} offset={[5, 5]} placement={placement} flip target={containerRef} popperConfig={{ strategy: 'fixed', onFirstUpdate: handleOverlayEnter }}>
+        {({ props, placement }) => (
+          <div {...props}>
+            <div className={`dropdown-animation privacy-dropdown__dropdown ${placement}`}>
+              <DropdownMenu
+                items={options}
+                value={contentType}
+                onClose={handleClose}
+                onChange={handleChange}
+              />
+            </div>
+          </div>
+        )}
+      </Overlay>
+    </div>
+  );
+};
diff --git a/app/javascript/flavours/glitch/features/compose/components/dropdown_menu.jsx b/app/javascript/flavours/glitch/features/compose/components/dropdown_menu.jsx
new file mode 100644
index 00000000000000..2f1adf2fd152f0
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/compose/components/dropdown_menu.jsx
@@ -0,0 +1,125 @@
+import PropTypes from 'prop-types';
+import { PureComponent } from 'react';
+
+import classNames from 'classnames';
+
+import { supportsPassiveEvents } from 'detect-passive-events';
+
+import { Icon }  from 'flavours/glitch/components/icon';
+
+const listenerOptions = supportsPassiveEvents ? { passive: true, capture: true } : true;
+
+// copied from PrivacyDropdown; will require refactor with upstream down the line
+class DropdownMenu extends PureComponent {
+
+  static propTypes = {
+    style: PropTypes.object,
+    items: PropTypes.array.isRequired,
+    value: PropTypes.string.isRequired,
+    onClose: PropTypes.func.isRequired,
+    onChange: PropTypes.func.isRequired,
+  };
+
+  handleDocumentClick = e => {
+    if (this.node && !this.node.contains(e.target)) {
+      this.props.onClose();
+      e.stopPropagation();
+    }
+  };
+
+  handleKeyDown = e => {
+    const { items } = this.props;
+    const value = e.currentTarget.getAttribute('data-index');
+    const index = items.findIndex(item => {
+      return (item.value === value);
+    });
+    let element = null;
+
+    switch(e.key) {
+    case 'Escape':
+      this.props.onClose();
+      break;
+    case 'Enter':
+      this.handleClick(e);
+      break;
+    case 'ArrowDown':
+      element = this.node.childNodes[index + 1] || this.node.firstChild;
+      break;
+    case 'ArrowUp':
+      element = this.node.childNodes[index - 1] || this.node.lastChild;
+      break;
+    case 'Tab':
+      if (e.shiftKey) {
+        element = this.node.childNodes[index - 1] || this.node.lastChild;
+      } else {
+        element = this.node.childNodes[index + 1] || this.node.firstChild;
+      }
+      break;
+    case 'Home':
+      element = this.node.firstChild;
+      break;
+    case 'End':
+      element = this.node.lastChild;
+      break;
+    }
+
+    if (element) {
+      element.focus();
+      this.props.onChange(element.getAttribute('data-index'));
+      e.preventDefault();
+      e.stopPropagation();
+    }
+  };
+
+  handleClick = e => {
+    const value = e.currentTarget.getAttribute('data-index');
+
+    e.preventDefault();
+
+    this.props.onClose();
+    this.props.onChange(value);
+  };
+
+  componentDidMount () {
+    document.addEventListener('click', this.handleDocumentClick, { capture: true });
+    document.addEventListener('touchend', this.handleDocumentClick, listenerOptions);
+    if (this.focusedItem) this.focusedItem.focus({ preventScroll: true });
+  }
+
+  componentWillUnmount () {
+    document.removeEventListener('click', this.handleDocumentClick, { capture: true });
+    document.removeEventListener('touchend', this.handleDocumentClick, listenerOptions);
+  }
+
+  setRef = c => {
+    this.node = c;
+  };
+
+  setFocusRef = c => {
+    this.focusedItem = c;
+  };
+
+  render () {
+    const { style, items, value } = this.props;
+
+    return (
+      <div style={{ ...style }} role='listbox' ref={this.setRef}>
+        {items.map(item => (
+          <div role='option' tabIndex={0} key={item.value} data-index={item.value} onKeyDown={this.handleKeyDown} onClick={this.handleClick} className={classNames('privacy-dropdown__option', { active: item.value === value })} aria-selected={item.value === value} ref={item.value === value ? this.setFocusRef : null}>
+            <div className='privacy-dropdown__option__icon'>
+              <Icon id={item.icon} icon={item.iconComponent} />
+            </div>
+
+            <div className='privacy-dropdown__option__content'>
+              <strong>{item.text}</strong>
+              {item.meta}
+            </div>
+          </div>
+        ))}
+      </div>
+    );
+  }
+
+}
+
+export default DropdownMenu;
diff --git a/app/javascript/flavours/glitch/locales/en.json b/app/javascript/flavours/glitch/locales/en.json
index b513e837b9fbd4..1fd648c6e05ee6 100644
--- a/app/javascript/flavours/glitch/locales/en.json
+++ b/app/javascript/flavours/glitch/locales/en.json
@@ -14,6 +14,13 @@
   "column_subheading.lists": "Lists",
   "column_subheading.navigation": "Navigation",
   "community.column_settings.allow_local_only": "Show local-only toots",
+  "compose.content-type.change": "Change advanced formatting options",
+  "compose.content-type.html": "HTML",
+  "compose.content-type.html_meta": "Format your posts using HTML",
+  "compose.content-type.markdown": "Markdown",
+  "compose.content-type.markdown_meta": "Format your posts using Markdown",
+  "compose.content-type.plain": "Plain text",
+  "compose.content-type.plain_meta": "Write with no advanced formatting",
   "compose_form.sensitive.hide": "{count, plural, one {Mark media as sensitive} other {Mark media as sensitive}}",
   "compose_form.sensitive.marked": "{count, plural, one {Media is marked as sensitive} other {Media is marked as sensitive}}",
   "compose_form.sensitive.unmarked": "{count, plural, one {Media is not marked as sensitive} other {Media is not marked as sensitive}}",

From 0e77c456240356275da03e2d5cd98fb00dc8b6e8 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 23 Feb 2024 02:02:22 +0100
Subject: [PATCH 0229/2191] Add local-only option back as a federation setting
 dropdown

---
 .../compose/components/compose_form.jsx       |  2 +
 .../compose/components/federation_button.jsx  | 94 +++++++++++++++++++
 .../flavours/glitch/locales/en.json           |  5 +
 .../400-24px/share_off-fill.svg               |  1 +
 .../material-icons/400-24px/share_off.svg     |  1 +
 5 files changed, 103 insertions(+)
 create mode 100644 app/javascript/flavours/glitch/features/compose/components/federation_button.jsx
 create mode 100644 app/javascript/material-icons/400-24px/share_off-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/share_off.svg

diff --git a/app/javascript/flavours/glitch/features/compose/components/compose_form.jsx b/app/javascript/flavours/glitch/features/compose/components/compose_form.jsx
index 3e0613b10df5a4..27544a2f80fe7d 100644
--- a/app/javascript/flavours/glitch/features/compose/components/compose_form.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/compose_form.jsx
@@ -29,6 +29,7 @@ import { countableText } from '../util/counter';
 import { CharacterCounter } from './character_counter';
 import { ContentTypeButton } from './content_type_button';
 import { EditIndicator } from './edit_indicator';
+import { FederationButton } from './federation_button';
 import { NavigationBar } from './navigation_bar';
 import { PollForm } from "./poll_form";
 import { ReplyIndicator } from './reply_indicator';
@@ -312,6 +313,7 @@ class ComposeForm extends ImmutablePureComponent {
                 {!this.props.spoilerAlwaysOn && <SpoilerButtonContainer />}
                 <ContentTypeButton />
                 <EmojiPickerDropdown onPickEmoji={this.handleEmojiPick} />
+                <FederationButton />
                 <CharacterCounter max={maxChars} text={this.getFulltextForCharacterCounting()} />
               </div>
 
diff --git a/app/javascript/flavours/glitch/features/compose/components/federation_button.jsx b/app/javascript/flavours/glitch/features/compose/components/federation_button.jsx
new file mode 100644
index 00000000000000..a7ef0aa028020a
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/compose/components/federation_button.jsx
@@ -0,0 +1,94 @@
+import { useCallback, useState, useRef } from 'react';
+
+import { useIntl, defineMessages } from 'react-intl';
+
+import Overlay from 'react-overlays/Overlay';
+
+import ShareIcon from '@/material-icons/400-24px/share.svg?react';
+import ShareOffIcon from '@/material-icons/400-24px/share_off.svg?react';
+import { changeComposeAdvancedOption } from 'flavours/glitch/actions/compose';
+import { IconButton } from 'flavours/glitch/components/icon_button';
+import { useAppSelector, useAppDispatch } from 'flavours/glitch/store';
+
+import DropdownMenu from './dropdown_menu';
+
+const messages = defineMessages({
+  change_federation_settings: { id: 'compose.change_federation', defaultMessage: 'Change federation settings' },
+  local_only_label: { id: 'federation.local_only.short', defaultMessage: 'Local-only' },
+  local_only_meta: { id: 'federation.local_only.long', defaultMessage: 'Prevent this post from reaching other servers' },
+  federated_label: { id: 'federation.federated.short', defaultMessage: 'Federated' },
+  federated_meta: { id: 'federation.federated.long', defaultMessage: 'Allow this post to reach other servers' },
+});
+
+export const FederationButton = () => {
+  const intl = useIntl();
+
+  const do_not_federate = useAppSelector((state) => state.getIn(['compose', 'advanced_options', 'do_not_federate']));
+  const dispatch = useAppDispatch();
+
+  const containerRef = useRef(null);
+
+  const [activeElement, setActiveElement] = useState(null);
+  const [open, setOpen] = useState(false);
+  const [placement, setPlacement] = useState('bottom');
+
+  const handleToggle = useCallback(() => {
+    if (open && activeElement) {
+      activeElement.focus({ preventScroll: true });
+      setActiveElement(null);
+    }
+
+    setOpen(!open);
+  }, [open, setOpen, activeElement, setActiveElement]);
+
+  const handleClose = useCallback(() => {
+    if (open && activeElement) {
+      activeElement.focus({ preventScroll: true });
+      setActiveElement(null);
+    }
+
+    setOpen(false);
+  }, [open, setOpen, activeElement, setActiveElement]);
+
+  const handleChange = useCallback((value) => {
+    dispatch(changeComposeAdvancedOption('do_not_federate', value === 'local-only'));
+  }, [dispatch]);
+
+  const handleOverlayEnter = useCallback((state) => {
+    setPlacement(state.placement);
+  }, [setPlacement]);
+
+  const options = [
+    { icon: 'link', iconComponent: ShareIcon, value: 'federated', text: intl.formatMessage(messages.federated_label), meta: intl.formatMessage(messages.federated_meta) },
+    { icon: 'link-slash', iconComponent: ShareOffIcon, value: 'local-only', text: intl.formatMessage(messages.local_only_label), meta: intl.formatMessage(messages.local_only_meta) },
+  ];
+
+  return (
+    <div ref={containerRef}>
+      <IconButton
+        icon={do_not_federate ? 'link-slash' : 'link'}
+        onClick={handleToggle}
+        iconComponent={do_not_federate ? ShareOffIcon : ShareIcon}
+        title={intl.formatMessage(messages.change_federation_settings)}
+        active={open}
+        size={18}
+        inverted
+      />
+
+      <Overlay show={open} offset={[5, 5]} placement={placement} flip target={containerRef} popperConfig={{ strategy: 'fixed', onFirstUpdate: handleOverlayEnter }}>
+        {({ props, placement }) => (
+          <div {...props}>
+            <div className={`dropdown-animation privacy-dropdown__dropdown ${placement}`}>
+              <DropdownMenu
+                items={options}
+                value={do_not_federate ? 'local-only' : 'federated'}
+                onClose={handleClose}
+                onChange={handleChange}
+              />
+            </div>
+          </div>
+        )}
+      </Overlay>
+    </div>
+  );
+};
diff --git a/app/javascript/flavours/glitch/locales/en.json b/app/javascript/flavours/glitch/locales/en.json
index 1fd648c6e05ee6..5b47393cab079a 100644
--- a/app/javascript/flavours/glitch/locales/en.json
+++ b/app/javascript/flavours/glitch/locales/en.json
@@ -14,6 +14,7 @@
   "column_subheading.lists": "Lists",
   "column_subheading.navigation": "Navigation",
   "community.column_settings.allow_local_only": "Show local-only toots",
+  "compose.change_federation": "Change federation settings",
   "compose.content-type.change": "Change advanced formatting options",
   "compose.content-type.html": "HTML",
   "compose.content-type.html_meta": "Format your posts using HTML",
@@ -34,6 +35,10 @@
   "direct.group_by_conversations": "Group by conversation",
   "endorsed_accounts_editor.endorsed_accounts": "Featured accounts",
   "favourite_modal.combo": "You can press {combo} to skip this next time",
+  "federation.federated.long": "Allow this post to reach other servers",
+  "federation.federated.short": "Federated",
+  "federation.local_only.long": "Prevent this post from reaching other servers",
+  "federation.local_only.short": "Local-only",
   "firehose.column_settings.allow_local_only": "Show local-only posts in \"All\"",
   "home.column_settings.advanced": "Advanced",
   "home.column_settings.filter_regex": "Filter out by regular expressions",
diff --git a/app/javascript/material-icons/400-24px/share_off-fill.svg b/app/javascript/material-icons/400-24px/share_off-fill.svg
new file mode 100644
index 00000000000000..3b6a05d11807e9
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/share_off-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M240-440q83 0 141.5 58.5T440-240q0 83-58.5 141.5T240-40q-83 0-141.5-58.5T40-240q0-83 58.5-141.5T240-440Zm0 228 70 71 29-28-71-71 71-71-28-28-71 71-71-71-28 28 71 71-71 71 28 28 71-71Zm480-428q-23 0-44-8.5T638-672L356-508q1 4 1.5 7.5t1.5 7.5q-27-13-57-20t-62-7q-32 0-62 7t-57 20q5-45 38.5-76t80.5-31q23 0 44 8.5t38 23.5l282-164q-2-6-3-13.5t-1-14.5q0-50 35-85t85-35q50 0 85 35t35 85q0 50-35 85t-85 35Zm0 560q-50 0-85-35t-35-85q0-7 1-14.5t3-13.5l-87-50q-4-27-12.5-52T483-378l155 90q17-15 38-23.5t44-8.5q50 0 85 35t35 85q0 50-35 85t-85 35Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/share_off.svg b/app/javascript/material-icons/400-24px/share_off.svg
new file mode 100644
index 00000000000000..00bb28659b5449
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/share_off.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M720-720q17 0 28.5-11.5T760-760q0-17-11.5-28.5T720-800q-17 0-28.5 11.5T680-760q0 17 11.5 28.5T720-720Zm0 560q17 0 28.5-11.5T760-200q0-17-11.5-28.5T720-240q-17 0-28.5 11.5T680-200q0 17 11.5 28.5T720-160Zm0-600Zm0 560ZM240-40q-83 0-141.5-58.5T40-240q0-83 58.5-141.5T240-440q83 0 141.5 58.5T440-240q0 83-58.5 141.5T240-40ZM121-493q5-45 38.5-76t80.5-31q23 0 44 8.5t38 23.5l282-164q-2-6-3-13.5t-1-14.5q0-50 35-85t85-35q50 0 85 35t35 85q0 50-35 85t-85 35q-23 0-44-8.5T638-672L356-508q1 4 1.5 7.5t1.5 7.5q-27-13-57-20t-62-7q-32 0-62 7t-57 20ZM720-80q-50 0-85-35t-35-85q0-7 1-14.5t3-13.5l-87-50q-4-27-12.5-52T483-378l155 90q17-15 38-23.5t44-8.5q50 0 85 35t35 85q0 50-35 85t-85 35ZM240-212l70 71 29-28-71-71 71-71-28-28-71 71-71-71-28 28 71 71-71 71 28 28 71-71Z"/></svg>
\ No newline at end of file

From 3564a1555336c54de087ef67ce3568eff1371438 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 23 Feb 2024 14:03:46 +0100
Subject: [PATCH 0230/2191] Refactor composer dropdowns

---
 .../components/content_type_button.jsx        | 69 +++--------------
 .../components/dropdown_icon_button.jsx       | 76 +++++++++++++++++++
 .../compose/components/federation_button.jsx  | 69 +++--------------
 3 files changed, 96 insertions(+), 118 deletions(-)
 create mode 100644 app/javascript/flavours/glitch/features/compose/components/dropdown_icon_button.jsx

diff --git a/app/javascript/flavours/glitch/features/compose/components/content_type_button.jsx b/app/javascript/flavours/glitch/features/compose/components/content_type_button.jsx
index 9ac382091e7293..c1d6860bde9bb8 100644
--- a/app/javascript/flavours/glitch/features/compose/components/content_type_button.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/content_type_button.jsx
@@ -1,17 +1,14 @@
-import { useCallback, useState, useRef } from 'react';
+import { useCallback } from 'react';
 
 import { useIntl, defineMessages } from 'react-intl';
 
-import Overlay from 'react-overlays/Overlay';
-
 import CodeIcon from '@/material-icons/400-24px/code.svg?react';
 import DescriptionIcon from '@/material-icons/400-24px/description.svg?react';
 import MarkdownIcon from '@/material-icons/400-24px/markdown.svg?react';
 import { changeComposeContentType } from 'flavours/glitch/actions/compose';
-import { IconButton } from 'flavours/glitch/components/icon_button';
 import { useAppSelector, useAppDispatch } from 'flavours/glitch/store';
 
-import DropdownMenu from './dropdown_menu';
+import { DropdownIconButton } from './dropdown_icon_button';
 
 const messages = defineMessages({
   change_content_type: { id: 'compose.content-type.change', defaultMessage: 'Change advanced formatting options' },
@@ -30,38 +27,10 @@ export const ContentTypeButton = () => {
   const contentType = useAppSelector((state) => state.getIn(['compose', 'content_type']));
   const dispatch = useAppDispatch();
 
-  const containerRef = useRef(null);
-
-  const [activeElement, setActiveElement] = useState(null);
-  const [open, setOpen] = useState(false);
-  const [placement, setPlacement] = useState('bottom');
-
-  const handleToggle = useCallback(() => {
-    if (open && activeElement) {
-      activeElement.focus({ preventScroll: true });
-      setActiveElement(null);
-    }
-
-    setOpen(!open);
-  }, [open, setOpen, activeElement, setActiveElement]);
-
-  const handleClose = useCallback(() => {
-    if (open && activeElement) {
-      activeElement.focus({ preventScroll: true });
-      setActiveElement(null);
-    }
-
-    setOpen(false);
-  }, [open, setOpen, activeElement, setActiveElement]);
-
   const handleChange = useCallback((value) => {
     dispatch(changeComposeContentType(value));
   }, [dispatch]);
 
-  const handleOverlayEnter = useCallback((state) => {
-    setPlacement(state.placement);
-  }, [setPlacement]);
-
   if (!showButton) {
     return null;
   }
@@ -85,31 +54,13 @@ export const ContentTypeButton = () => {
   }[contentType];
 
   return (
-    <div ref={containerRef}>
-      <IconButton
-        icon={icon}
-        onClick={handleToggle}
-        iconComponent={iconComponent}
-        title={intl.formatMessage(messages.change_content_type)}
-        active={open}
-        size={18}
-        inverted
-      />
-
-      <Overlay show={open} offset={[5, 5]} placement={placement} flip target={containerRef} popperConfig={{ strategy: 'fixed', onFirstUpdate: handleOverlayEnter }}>
-        {({ props, placement }) => (
-          <div {...props}>
-            <div className={`dropdown-animation privacy-dropdown__dropdown ${placement}`}>
-              <DropdownMenu
-                items={options}
-                value={contentType}
-                onClose={handleClose}
-                onChange={handleChange}
-              />
-            </div>
-          </div>
-        )}
-      </Overlay>
-    </div>
+    <DropdownIconButton
+      icon={icon}
+      iconComponent={iconComponent}
+      onChange={handleChange}
+      options={options}
+      title={intl.formatMessage(messages.change_content_type)}
+      value={contentType}
+    />
   );
 };
diff --git a/app/javascript/flavours/glitch/features/compose/components/dropdown_icon_button.jsx b/app/javascript/flavours/glitch/features/compose/components/dropdown_icon_button.jsx
new file mode 100644
index 00000000000000..58a9e633fbd955
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/compose/components/dropdown_icon_button.jsx
@@ -0,0 +1,76 @@
+import PropTypes from 'prop-types';
+import { useCallback, useState, useRef } from 'react';
+
+import Overlay from 'react-overlays/Overlay';
+
+import { IconButton } from 'flavours/glitch/components/icon_button';
+
+import DropdownMenu from './dropdown_menu';
+
+export const DropdownIconButton = ({ value, icon, onChange, iconComponent, title, options }) => {
+  const containerRef = useRef(null);
+
+  const [activeElement, setActiveElement] = useState(null);
+  const [open, setOpen] = useState(false);
+  const [placement, setPlacement] = useState('bottom');
+
+  const handleToggle = useCallback(() => {
+    if (open && activeElement) {
+      activeElement.focus({ preventScroll: true });
+      setActiveElement(null);
+    }
+
+    setOpen(!open);
+  }, [open, setOpen, activeElement, setActiveElement]);
+
+  const handleClose = useCallback(() => {
+    if (open && activeElement) {
+      activeElement.focus({ preventScroll: true });
+      setActiveElement(null);
+    }
+
+    setOpen(false);
+  }, [open, setOpen, activeElement, setActiveElement]);
+
+  const handleOverlayEnter = useCallback((state) => {
+    setPlacement(state.placement);
+  }, [setPlacement]);
+
+  return (
+    <div ref={containerRef}>
+      <IconButton
+        icon={icon}
+        onClick={handleToggle}
+        iconComponent={iconComponent}
+        title={title}
+        active={open}
+        size={18}
+        inverted
+      />
+
+      <Overlay show={open} offset={[5, 5]} placement={placement} flip target={containerRef} popperConfig={{ strategy: 'fixed', onFirstUpdate: handleOverlayEnter }}>
+        {({ props, placement }) => (
+          <div {...props}>
+            <div className={`dropdown-animation privacy-dropdown__dropdown ${placement}`}>
+              <DropdownMenu
+                items={options}
+                value={value}
+                onClose={handleClose}
+                onChange={onChange}
+              />
+            </div>
+          </div>
+        )}
+      </Overlay>
+    </div>
+  );
+};
+
+DropdownIconButton.propTypes = {
+  value: PropTypes.string.isRequired,
+  icon: PropTypes.string,
+  onChange: PropTypes.func.isRequired,
+  iconComponent: PropTypes.func.isRequired,
+  options: PropTypes.array.isRequired,
+  title: PropTypes.string.isRequired,
+};
diff --git a/app/javascript/flavours/glitch/features/compose/components/federation_button.jsx b/app/javascript/flavours/glitch/features/compose/components/federation_button.jsx
index a7ef0aa028020a..a1bb53f69216f5 100644
--- a/app/javascript/flavours/glitch/features/compose/components/federation_button.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/federation_button.jsx
@@ -1,16 +1,13 @@
-import { useCallback, useState, useRef } from 'react';
+import { useCallback } from 'react';
 
 import { useIntl, defineMessages } from 'react-intl';
 
-import Overlay from 'react-overlays/Overlay';
-
 import ShareIcon from '@/material-icons/400-24px/share.svg?react';
 import ShareOffIcon from '@/material-icons/400-24px/share_off.svg?react';
 import { changeComposeAdvancedOption } from 'flavours/glitch/actions/compose';
-import { IconButton } from 'flavours/glitch/components/icon_button';
 import { useAppSelector, useAppDispatch } from 'flavours/glitch/store';
 
-import DropdownMenu from './dropdown_menu';
+import { DropdownIconButton } from './dropdown_icon_button';
 
 const messages = defineMessages({
   change_federation_settings: { id: 'compose.change_federation', defaultMessage: 'Change federation settings' },
@@ -26,69 +23,23 @@ export const FederationButton = () => {
   const do_not_federate = useAppSelector((state) => state.getIn(['compose', 'advanced_options', 'do_not_federate']));
   const dispatch = useAppDispatch();
 
-  const containerRef = useRef(null);
-
-  const [activeElement, setActiveElement] = useState(null);
-  const [open, setOpen] = useState(false);
-  const [placement, setPlacement] = useState('bottom');
-
-  const handleToggle = useCallback(() => {
-    if (open && activeElement) {
-      activeElement.focus({ preventScroll: true });
-      setActiveElement(null);
-    }
-
-    setOpen(!open);
-  }, [open, setOpen, activeElement, setActiveElement]);
-
-  const handleClose = useCallback(() => {
-    if (open && activeElement) {
-      activeElement.focus({ preventScroll: true });
-      setActiveElement(null);
-    }
-
-    setOpen(false);
-  }, [open, setOpen, activeElement, setActiveElement]);
-
   const handleChange = useCallback((value) => {
     dispatch(changeComposeAdvancedOption('do_not_federate', value === 'local-only'));
   }, [dispatch]);
 
-  const handleOverlayEnter = useCallback((state) => {
-    setPlacement(state.placement);
-  }, [setPlacement]);
-
   const options = [
     { icon: 'link', iconComponent: ShareIcon, value: 'federated', text: intl.formatMessage(messages.federated_label), meta: intl.formatMessage(messages.federated_meta) },
     { icon: 'link-slash', iconComponent: ShareOffIcon, value: 'local-only', text: intl.formatMessage(messages.local_only_label), meta: intl.formatMessage(messages.local_only_meta) },
   ];
 
   return (
-    <div ref={containerRef}>
-      <IconButton
-        icon={do_not_federate ? 'link-slash' : 'link'}
-        onClick={handleToggle}
-        iconComponent={do_not_federate ? ShareOffIcon : ShareIcon}
-        title={intl.formatMessage(messages.change_federation_settings)}
-        active={open}
-        size={18}
-        inverted
-      />
-
-      <Overlay show={open} offset={[5, 5]} placement={placement} flip target={containerRef} popperConfig={{ strategy: 'fixed', onFirstUpdate: handleOverlayEnter }}>
-        {({ props, placement }) => (
-          <div {...props}>
-            <div className={`dropdown-animation privacy-dropdown__dropdown ${placement}`}>
-              <DropdownMenu
-                items={options}
-                value={do_not_federate ? 'local-only' : 'federated'}
-                onClose={handleClose}
-                onChange={handleChange}
-              />
-            </div>
-          </div>
-        )}
-      </Overlay>
-    </div>
+    <DropdownIconButton
+      icon={do_not_federate ? 'link-slash' : 'link'}
+      iconComponent={do_not_federate ? ShareOffIcon : ShareIcon}
+      onChange={handleChange}
+      options={options}
+      title={intl.formatMessage(messages.change_federation_settings)}
+      value={do_not_federate ? 'local-only' : 'federated'}
+    />
   );
 };

From 84d05ca22117d958a74fd517a14c9a77c29f502a Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 23 Feb 2024 01:34:45 +0100
Subject: [PATCH 0231/2191] Reimplement glitchy elephant friend

---
 .../flavours/glitch/actions/compose.js        |  7 ----
 .../glitch/features/compose/index.jsx         | 23 +++++++++-
 .../flavours/glitch/reducers/compose.js       | 11 -----
 .../flavours/glitch/styles/components.scss    | 42 -------------------
 4 files changed, 21 insertions(+), 62 deletions(-)

diff --git a/app/javascript/flavours/glitch/actions/compose.js b/app/javascript/flavours/glitch/actions/compose.js
index 350ee6fbbe4ab0..06f0d798742d4c 100644
--- a/app/javascript/flavours/glitch/actions/compose.js
+++ b/app/javascript/flavours/glitch/actions/compose.js
@@ -21,7 +21,6 @@ let fetchComposeSuggestionsAccountsController;
 let fetchComposeSuggestionsTagsController;
 
 export const COMPOSE_CHANGE          = 'COMPOSE_CHANGE';
-export const COMPOSE_CYCLE_ELEFRIEND = 'COMPOSE_CYCLE_ELEFRIEND';
 export const COMPOSE_SUBMIT_REQUEST  = 'COMPOSE_SUBMIT_REQUEST';
 export const COMPOSE_SUBMIT_SUCCESS  = 'COMPOSE_SUBMIT_SUCCESS';
 export const COMPOSE_SUBMIT_FAIL     = 'COMPOSE_SUBMIT_FAIL';
@@ -117,12 +116,6 @@ export function changeCompose(text) {
   };
 }
 
-export function cycleElefriendCompose() {
-  return {
-    type: COMPOSE_CYCLE_ELEFRIEND,
-  };
-}
-
 export function replyCompose(status, routerHistory) {
   return (dispatch, getState) => {
     const prependCWRe = getState().getIn(['local_settings', 'prepend_cw_re']);
diff --git a/app/javascript/flavours/glitch/features/compose/index.jsx b/app/javascript/flavours/glitch/features/compose/index.jsx
index fe81787fa85faf..35743bbd16f634 100644
--- a/app/javascript/flavours/glitch/features/compose/index.jsx
+++ b/app/javascript/flavours/glitch/features/compose/index.jsx
@@ -21,6 +21,9 @@ import PublicIcon from '@/material-icons/400-24px/public.svg?react';
 import { openModal } from 'flavours/glitch/actions/modal';
 import Column from 'flavours/glitch/components/column';
 import { Icon }  from 'flavours/glitch/components/icon';
+import glitchedElephant1 from 'flavours/glitch/images/mbstobon-ui-0.png';
+import glitchedElephant2 from 'flavours/glitch/images/mbstobon-ui-1.png';
+import glitchedElephant3 from 'flavours/glitch/images/mbstobon-ui-2.png';
 import { logOut } from 'flavours/glitch/utils/log_out';
 
 import elephantUIPlane from '../../../../images/elephant_ui_plane.svg';
@@ -51,6 +54,11 @@ const mapStateToProps = (state, ownProps) => ({
   showSearch: ownProps.multiColumn ? state.getIn(['search', 'submitted']) && !state.getIn(['search', 'hidden']) : false,
 });
 
+// ~4% chance you'll end up with an unexpected friend
+// glitch-soc/mastodon repo created_at date: 2017-04-20T21:55:28Z
+const glitchProbability = 1 - 0.0420215528;
+const totalElefriends = 3;
+
 class Compose extends PureComponent {
 
   static propTypes = {
@@ -61,6 +69,10 @@ class Compose extends PureComponent {
     intl: PropTypes.object.isRequired,
   };
 
+  state = {
+    elefriend: Math.random() < glitchProbability ? Math.floor(Math.random() * totalElefriends) : totalElefriends,
+  };
+
   componentDidMount () {
     const { dispatch } = this.props;
     dispatch(mountCompose());
@@ -107,9 +119,15 @@ class Compose extends PureComponent {
     this.props.dispatch(changeComposing(false));
   };
 
+  cycleElefriend = () => {
+    this.setState((state) => ({ elefriend: (state.elefriend + 1) % totalElefriends }));
+  };
+
   render () {
     const { multiColumn, showSearch, intl } = this.props;
 
+    const elefriend = [glitchedElephant1, glitchedElephant2, glitchedElephant3, elephantUIPlane][this.state.elefriend];
+
     if (multiColumn) {
       const { columns } = this.props;
 
@@ -147,8 +165,9 @@ class Compose extends PureComponent {
             <div className='drawer__inner' onFocus={this.onFocus}>
               <ComposeFormContainer autoFocus={!isMobile(window.innerWidth)} />
 
-              <div className='drawer__inner__mastodon'>
-                <img alt='' draggable='false' src={mascot || elephantUIPlane} />
+              {/* eslint-disable-next-line jsx-a11y/no-static-element-interactions -- this is not a feature but a visual easter egg */}
+              <div className='drawer__inner__mastodon' onClick={this.cycleElefriend}>
+                <img alt='' draggable='false' src={mascot || elefriend} />
               </div>
             </div>
 
diff --git a/app/javascript/flavours/glitch/reducers/compose.js b/app/javascript/flavours/glitch/reducers/compose.js
index 181ea38e710afb..05681738c58025 100644
--- a/app/javascript/flavours/glitch/reducers/compose.js
+++ b/app/javascript/flavours/glitch/reducers/compose.js
@@ -4,7 +4,6 @@ import {
   COMPOSE_MOUNT,
   COMPOSE_UNMOUNT,
   COMPOSE_CHANGE,
-  COMPOSE_CYCLE_ELEFRIEND,
   COMPOSE_REPLY,
   COMPOSE_REPLY_CANCEL,
   COMPOSE_DIRECT,
@@ -62,12 +61,6 @@ import { overwrite } from '../utils/js_helpers';
 import { privacyPreference } from '../utils/privacy_preference';
 import { uuid } from '../uuid';
 
-const totalElefriends = 3;
-
-// ~4% chance you'll end up with an unexpected friend
-// glitch-soc/mastodon repo created_at date: 2017-04-20T21:55:28Z
-const glitchProbability = 1 - 0.0420215528;
-
 const initialState = ImmutableMap({
   mounted: 0,
   advanced_options: ImmutableMap({
@@ -75,7 +68,6 @@ const initialState = ImmutableMap({
     threaded_mode: false,
   }),
   sensitive: false,
-  elefriend: Math.random() < glitchProbability ? Math.floor(Math.random() * totalElefriends) : totalElefriends,
   spoiler: false,
   spoiler_text: '',
   privacy: null,
@@ -425,9 +417,6 @@ export default function compose(state = initialState, action) {
       .set('idempotencyKey', uuid());
   case COMPOSE_COMPOSING_CHANGE:
     return state.set('is_composing', action.value);
-  case COMPOSE_CYCLE_ELEFRIEND:
-    return state
-      .set('elefriend', (state.get('elefriend') + 1) % totalElefriends);
   case COMPOSE_REPLY:
     return state.withMutations(map => {
       map.set('id', null);
diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index 3fa8d041246840..8757c498e11da3 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -3430,14 +3430,6 @@ $ui-header-height: 55px;
     user-select: none;
   }
 
-  > .mastodon {
-    display: block;
-    width: 100%;
-    height: 100%;
-    border: 0;
-    cursor: inherit;
-  }
-
   @media screen and (height >= 640px) {
     display: block;
   }
@@ -3460,40 +3452,6 @@ $ui-header-height: 55px;
   }
 }
 
-@for $i from 0 through 3 {
-  .mbstobon-#{$i} .drawer__inner__mastodon {
-    @if $i == 3 {
-      background:
-        url('~flavours/glitch/images/wave-drawer.png')
-          no-repeat
-          bottom /
-          100%
-          auto,
-        $ui-base-color;
-    } @else {
-      background:
-        url('~flavours/glitch/images/wave-drawer-glitched.png')
-          no-repeat
-          bottom /
-          100%
-          auto,
-        $ui-base-color;
-    }
-
-    & > .mastodon {
-      background: url('~flavours/glitch/images/mbstobon-ui-#{$i}.png')
-        no-repeat
-        left
-        bottom /
-        contain;
-
-      @if $i != 3 {
-        filter: contrast(50%) brightness(50%);
-      }
-    }
-  }
-}
-
 .scrollable {
   overflow-y: scroll;
   overflow-x: hidden;

From 23dc6505965eaed302f8c0a2699619a5db78946f Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 23 Feb 2024 01:40:12 +0100
Subject: [PATCH 0232/2191] Restore preselect on reply option

---
 .../glitch/features/compose/components/compose_form.jsx        | 3 ++-
 .../features/compose/containers/compose_form_container.js      | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/javascript/flavours/glitch/features/compose/components/compose_form.jsx b/app/javascript/flavours/glitch/features/compose/components/compose_form.jsx
index 27544a2f80fe7d..4718d20ff8159d 100644
--- a/app/javascript/flavours/glitch/features/compose/components/compose_form.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/compose_form.jsx
@@ -58,6 +58,7 @@ class ComposeForm extends ImmutablePureComponent {
     focusDate: PropTypes.instanceOf(Date),
     caretPosition: PropTypes.number,
     preselectDate: PropTypes.instanceOf(Date),
+    preselectOnReply: PropTypes.bool,
     isSubmitting: PropTypes.bool,
     isChangingUpload: PropTypes.bool,
     isEditing: PropTypes.bool,
@@ -191,7 +192,7 @@ class ComposeForm extends ImmutablePureComponent {
     if (this.props.focusDate && this.props.focusDate !== prevProps.focusDate) {
       let selectionEnd, selectionStart;
 
-      if (this.props.preselectDate !== prevProps.preselectDate && this.props.isInReply) {
+      if (this.props.preselectDate !== prevProps.preselectDate && this.props.isInReply && this.props.preselectOnReply) {
         selectionEnd   = this.props.text.length;
         selectionStart = this.props.text.search(/\s/) + 1;
       } else if (typeof this.props.caretPosition === 'number') {
diff --git a/app/javascript/flavours/glitch/features/compose/containers/compose_form_container.js b/app/javascript/flavours/glitch/features/compose/containers/compose_form_container.js
index 2c6c07e9b34212..a371606bee0af5 100644
--- a/app/javascript/flavours/glitch/features/compose/containers/compose_form_container.js
+++ b/app/javascript/flavours/glitch/features/compose/containers/compose_form_container.js
@@ -41,6 +41,7 @@ const mapStateToProps = state => ({
   focusDate: state.getIn(['compose', 'focusDate']),
   caretPosition: state.getIn(['compose', 'caretPosition']),
   preselectDate: state.getIn(['compose', 'preselectDate']),
+  preselectOnReply: state.getIn(['local_settings', 'preselect_on_reply']),
   isSubmitting: state.getIn(['compose', 'is_submitting']),
   isEditing: state.getIn(['compose', 'id']) !== null,
   isChangingUpload: state.getIn(['compose', 'is_changing_upload']),

From e62cd93650af563d4a10be05af09b123b683e2ff Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 23 Feb 2024 17:34:11 +0100
Subject: [PATCH 0233/2191] Fix composer offering to edit federation settings
 for an existing post

---
 .../features/compose/components/dropdown_icon_button.jsx      | 4 +++-
 .../glitch/features/compose/components/federation_button.jsx  | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/javascript/flavours/glitch/features/compose/components/dropdown_icon_button.jsx b/app/javascript/flavours/glitch/features/compose/components/dropdown_icon_button.jsx
index 58a9e633fbd955..0ced5a04ad0d14 100644
--- a/app/javascript/flavours/glitch/features/compose/components/dropdown_icon_button.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/dropdown_icon_button.jsx
@@ -7,7 +7,7 @@ import { IconButton } from 'flavours/glitch/components/icon_button';
 
 import DropdownMenu from './dropdown_menu';
 
-export const DropdownIconButton = ({ value, icon, onChange, iconComponent, title, options }) => {
+export const DropdownIconButton = ({ value, disabled, icon, onChange, iconComponent, title, options }) => {
   const containerRef = useRef(null);
 
   const [activeElement, setActiveElement] = useState(null);
@@ -39,6 +39,7 @@ export const DropdownIconButton = ({ value, icon, onChange, iconComponent, title
   return (
     <div ref={containerRef}>
       <IconButton
+        disabled={disabled}
         icon={icon}
         onClick={handleToggle}
         iconComponent={iconComponent}
@@ -68,6 +69,7 @@ export const DropdownIconButton = ({ value, icon, onChange, iconComponent, title
 
 DropdownIconButton.propTypes = {
   value: PropTypes.string.isRequired,
+  disabled: PropTypes.bool,
   icon: PropTypes.string,
   onChange: PropTypes.func.isRequired,
   iconComponent: PropTypes.func.isRequired,
diff --git a/app/javascript/flavours/glitch/features/compose/components/federation_button.jsx b/app/javascript/flavours/glitch/features/compose/components/federation_button.jsx
index a1bb53f69216f5..2ac0a9d3ec1dfe 100644
--- a/app/javascript/flavours/glitch/features/compose/components/federation_button.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/federation_button.jsx
@@ -20,6 +20,7 @@ const messages = defineMessages({
 export const FederationButton = () => {
   const intl = useIntl();
 
+  const isEditing = useAppSelector((state) => state.getIn(['compose', 'id']) !== null);
   const do_not_federate = useAppSelector((state) => state.getIn(['compose', 'advanced_options', 'do_not_federate']));
   const dispatch = useAppDispatch();
 
@@ -34,6 +35,7 @@ export const FederationButton = () => {
 
   return (
     <DropdownIconButton
+      disabled={isEditing}
       icon={do_not_federate ? 'link-slash' : 'link'}
       iconComponent={do_not_federate ? ShareOffIcon : ShareIcon}
       onChange={handleChange}

From e333453343c718057f2bb547eaf7f4d0d7edda82 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 23 Feb 2024 19:02:16 +0100
Subject: [PATCH 0234/2191] Use Warning icon for CWs in app settings

---
 .../features/local_settings/navigation/index.jsx      |  5 +++--
 .../features/local_settings/navigation/item/index.jsx |  4 +---
 app/javascript/flavours/glitch/styles/components.scss | 11 +++--------
 3 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/app/javascript/flavours/glitch/features/local_settings/navigation/index.jsx b/app/javascript/flavours/glitch/features/local_settings/navigation/index.jsx
index 00744fa2aed4c4..10d4097eef88a3 100644
--- a/app/javascript/flavours/glitch/features/local_settings/navigation/index.jsx
+++ b/app/javascript/flavours/glitch/features/local_settings/navigation/index.jsx
@@ -10,9 +10,9 @@ import ExpandLessIcon from '@/material-icons/400-24px/expand_less.svg?react';
 import ImageIcon from '@/material-icons/400-24px/image.svg?react';
 import ManufacturingIcon from '@/material-icons/400-24px/manufacturing.svg?react';
 import SettingsIcon from '@/material-icons/400-24px/settings-fill.svg?react';
+import WarningIcon from '@/material-icons/400-24px/warning.svg?react';
 import { preferencesLink } from 'flavours/glitch/utils/backend_links';
 
-
 import LocalSettingsNavigationItem from './item';
 
 const messages = defineMessages({
@@ -60,7 +60,8 @@ class LocalSettingsNavigation extends PureComponent {
           active={index === 2}
           index={2}
           onNavigate={onNavigate}
-          textIcon='CW'
+          icon='warning'
+          iconComponent={WarningIcon}
           title={intl.formatMessage(messages.content_warnings)}
         />
         <LocalSettingsNavigationItem
diff --git a/app/javascript/flavours/glitch/features/local_settings/navigation/item/index.jsx b/app/javascript/flavours/glitch/features/local_settings/navigation/item/index.jsx
index 54fd19311f264b..ad5e36b19d568c 100644
--- a/app/javascript/flavours/glitch/features/local_settings/navigation/item/index.jsx
+++ b/app/javascript/flavours/glitch/features/local_settings/navigation/item/index.jsx
@@ -13,7 +13,6 @@ export default class LocalSettingsPage extends PureComponent {
     className: PropTypes.string,
     href: PropTypes.string,
     icon: PropTypes.string,
-    textIcon: PropTypes.string,
     iconComponent: PropTypes.func,
     index: PropTypes.number.isRequired,
     onNavigate: PropTypes.func,
@@ -36,7 +35,6 @@ export default class LocalSettingsPage extends PureComponent {
       href,
       icon,
       iconComponent,
-      textIcon,
       onNavigate,
       title,
     } = this.props;
@@ -45,7 +43,7 @@ export default class LocalSettingsPage extends PureComponent {
       active,
     }, className);
 
-    const iconElem = icon ? <Icon id={icon} icon={iconComponent} /> : (textIcon ? <span className='text-icon-button'>{textIcon}</span> : null);
+    const iconElem = icon ? <Icon id={icon} icon={iconComponent} /> : null;
 
     if (href) return (
       <a
diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index 8757c498e11da3..ac3e4c99e6997f 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -299,21 +299,16 @@
   }
 }
 
-.text-icon,
-.text-icon-button {
-  font-weight: 600;
-  font-size: 11px;
-  line-height: 27px;
-  cursor: default;
-}
-
 .text-icon-button {
   color: $lighter-text-color;
   border: 0;
   border-radius: 4px;
   background: transparent;
   cursor: pointer;
+  font-weight: 600;
+  font-size: 11px;
   padding: 0 3px;
+  line-height: 27px;
   white-space: nowrap;
 
   &:hover,

From 9ab030bb13569ea4a6adb37926753cbc1a4b86a9 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 23 Feb 2024 19:40:08 +0100
Subject: [PATCH 0235/2191] Add thread mode button

---
 .../compose/components/compose_form.jsx       |  2 +
 .../compose/components/thread_mode_button.jsx | 41 +++++++++++++++++++
 .../flavours/glitch/locales/en.json           |  2 +
 .../400-24px/quickreply-fill.svg              |  1 +
 .../material-icons/400-24px/quickreply.svg    |  1 +
 5 files changed, 47 insertions(+)
 create mode 100644 app/javascript/flavours/glitch/features/compose/components/thread_mode_button.jsx
 create mode 100644 app/javascript/material-icons/400-24px/quickreply-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/quickreply.svg

diff --git a/app/javascript/flavours/glitch/features/compose/components/compose_form.jsx b/app/javascript/flavours/glitch/features/compose/components/compose_form.jsx
index 4718d20ff8159d..c8d95a11a752e7 100644
--- a/app/javascript/flavours/glitch/features/compose/components/compose_form.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/compose_form.jsx
@@ -34,6 +34,7 @@ import { NavigationBar } from './navigation_bar';
 import { PollForm } from "./poll_form";
 import { ReplyIndicator } from './reply_indicator';
 import { SecondaryPrivacyButton } from './secondary_privacy_button';
+import { ThreadModeButton } from './thread_mode_button';
 
 const allowedAroundShortCode = '><\u0085\u0020\u00a0\u1680\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029\u0009\u000a\u000b\u000c\u000d';
 
@@ -315,6 +316,7 @@ class ComposeForm extends ImmutablePureComponent {
                 <ContentTypeButton />
                 <EmojiPickerDropdown onPickEmoji={this.handleEmojiPick} />
                 <FederationButton />
+                <ThreadModeButton />
                 <CharacterCounter max={maxChars} text={this.getFulltextForCharacterCounting()} />
               </div>
 
diff --git a/app/javascript/flavours/glitch/features/compose/components/thread_mode_button.jsx b/app/javascript/flavours/glitch/features/compose/components/thread_mode_button.jsx
new file mode 100644
index 00000000000000..65b1b72897b5be
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/compose/components/thread_mode_button.jsx
@@ -0,0 +1,41 @@
+import { useCallback } from 'react';
+
+import { useIntl, defineMessages } from 'react-intl';
+
+import QuickreplyIcon from '@/material-icons/400-24px/quickreply.svg?react';
+import { changeComposeAdvancedOption } from 'flavours/glitch/actions/compose';
+import { IconButton } from 'flavours/glitch/components/icon_button';
+import { useAppSelector, useAppDispatch } from 'flavours/glitch/store';
+
+const messages = defineMessages({
+  enable_threaded_mode: { id: 'compose.enable_threaded_mode', defaultMessage: 'Enable threaded more' },
+  disable_threaded_mode: { id: 'compose.disable_threaded_mode', defaultMessage: 'Disable threaded more' },
+});
+
+export const ThreadModeButton = () => {
+  const intl = useIntl();
+
+  const isEditing = useAppSelector((state) => state.getIn(['compose', 'id']) !== null);
+  const active = useAppSelector((state) => state.getIn(['compose', 'advanced_options', 'threaded_mode']));
+
+  const dispatch = useAppDispatch();
+
+  const handleClick = useCallback(() => {
+    dispatch(changeComposeAdvancedOption('threaded_mode', !active));
+  }, [active, dispatch]);
+
+  const title = intl.formatMessage(active ? messages.disable_threaded_mode : messages.enable_threaded_mode);
+
+  return (
+    <IconButton
+      disabled={isEditing}
+      icon=''
+      onClick={handleClick}
+      iconComponent={QuickreplyIcon}
+      title={title}
+      active={active}
+      size={18}
+      inverted
+    />
+  );
+};
diff --git a/app/javascript/flavours/glitch/locales/en.json b/app/javascript/flavours/glitch/locales/en.json
index 5b47393cab079a..9c530262f294ad 100644
--- a/app/javascript/flavours/glitch/locales/en.json
+++ b/app/javascript/flavours/glitch/locales/en.json
@@ -22,6 +22,8 @@
   "compose.content-type.markdown_meta": "Format your posts using Markdown",
   "compose.content-type.plain": "Plain text",
   "compose.content-type.plain_meta": "Write with no advanced formatting",
+  "compose.disable_threaded_mode": "Disable threaded more",
+  "compose.enable_threaded_mode": "Enable threaded more",
   "compose_form.sensitive.hide": "{count, plural, one {Mark media as sensitive} other {Mark media as sensitive}}",
   "compose_form.sensitive.marked": "{count, plural, one {Media is marked as sensitive} other {Media is marked as sensitive}}",
   "compose_form.sensitive.unmarked": "{count, plural, one {Media is not marked as sensitive} other {Media is not marked as sensitive}}",
diff --git a/app/javascript/material-icons/400-24px/quickreply-fill.svg b/app/javascript/material-icons/400-24px/quickreply-fill.svg
new file mode 100644
index 00000000000000..a9ce9705ac91df
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/quickreply-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M760-40v-200h-80v-240h200l-68 160h88L760-40ZM80-80v-720q0-33 23.5-56.5T160-880h640q33 0 56.5 23.5T880-800v240H600v320H240L80-80Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/quickreply.svg b/app/javascript/material-icons/400-24px/quickreply.svg
new file mode 100644
index 00000000000000..522093e3cc4b7a
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/quickreply.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M80-80v-720q0-33 23.5-56.5T160-880h640q33 0 56.5 23.5T880-800v240h-80v-240H160v525l46-45h394v80H240L80-80Zm80-240v-480 480ZM760-40v-200h-80v-240h200l-68 160h88L760-40Z"/></svg>
\ No newline at end of file

From 6eede9d84b25c47966291447cf072035acaaabcc Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 23 Feb 2024 19:53:37 +0100
Subject: [PATCH 0236/2191] Add notification badge feature back

---
 .../flavours/glitch/features/compose/index.jsx      | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/javascript/flavours/glitch/features/compose/index.jsx b/app/javascript/flavours/glitch/features/compose/index.jsx
index 35743bbd16f634..0bba28b78702ba 100644
--- a/app/javascript/flavours/glitch/features/compose/index.jsx
+++ b/app/javascript/flavours/glitch/features/compose/index.jsx
@@ -52,6 +52,8 @@ const messages = defineMessages({
 const mapStateToProps = (state, ownProps) => ({
   columns: state.getIn(['settings', 'columns']),
   showSearch: ownProps.multiColumn ? state.getIn(['search', 'submitted']) && !state.getIn(['search', 'hidden']) : false,
+  unreadNotifications: state.getIn(['notifications', 'unread']),
+  showNotificationsBadge: state.getIn(['local_settings', 'notifications', 'tab_badge']),
 });
 
 // ~4% chance you'll end up with an unexpected friend
@@ -66,6 +68,8 @@ class Compose extends PureComponent {
     columns: ImmutablePropTypes.list.isRequired,
     multiColumn: PropTypes.bool,
     showSearch: PropTypes.bool,
+    unreadNotifications: PropTypes.number,
+    showNotificationsBadge: PropTypes.bool,
     intl: PropTypes.object.isRequired,
   };
 
@@ -124,7 +128,7 @@ class Compose extends PureComponent {
   };
 
   render () {
-    const { multiColumn, showSearch, intl } = this.props;
+    const { multiColumn, showSearch, showNotificationsBadge, unreadNotifications, intl } = this.props;
 
     const elefriend = [glitchedElephant1, glitchedElephant2, glitchedElephant3, elephantUIPlane][this.state.elefriend];
 
@@ -139,7 +143,12 @@ class Compose extends PureComponent {
               <Link to='/home' className='drawer__tab' title={intl.formatMessage(messages.home_timeline)} aria-label={intl.formatMessage(messages.home_timeline)}><Icon id='home' icon={HomeIcon} /></Link>
             )}
             {!columns.some(column => column.get('id') === 'NOTIFICATIONS') && (
-              <Link to='/notifications' className='drawer__tab' title={intl.formatMessage(messages.notifications)} aria-label={intl.formatMessage(messages.notifications)}><Icon id='bell' icon={NotificationsIcon} /></Link>
+              <Link to='/notifications' className='drawer__tab' title={intl.formatMessage(messages.notifications)} aria-label={intl.formatMessage(messages.notifications)}>
+                <span className='icon-badge-wrapper'>
+                  <Icon id='bell' icon={NotificationsIcon} />
+                  {showNotificationsBadge && unreadNotifications > 0 && <div className='icon-badge' />}
+                </span>
+              </Link>
             )}
             {!columns.some(column => column.get('id') === 'COMMUNITY') && (
               <Link to='/public/local' className='drawer__tab' title={intl.formatMessage(messages.community)} aria-label={intl.formatMessage(messages.community)}><Icon id='users' icon={PeopleIcon} /></Link>

From 138286147f542be9b33318d23e50e6183db49731 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 23 Feb 2024 21:45:48 +0100
Subject: [PATCH 0237/2191] Fix emoji being inserted in incorrect places

---
 .../flavours/glitch/components/autosuggest_input.jsx        | 6 +++---
 .../flavours/glitch/components/autosuggest_textarea.jsx     | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/javascript/flavours/glitch/components/autosuggest_input.jsx b/app/javascript/flavours/glitch/components/autosuggest_input.jsx
index 97da532ebba265..f707a18e1d697f 100644
--- a/app/javascript/flavours/glitch/components/autosuggest_input.jsx
+++ b/app/javascript/flavours/glitch/components/autosuggest_input.jsx
@@ -15,8 +15,8 @@ import { AutosuggestHashtag } from './autosuggest_hashtag';
 const textAtCursorMatchesToken = (str, caretPosition, searchTokens) => {
   let word;
 
-  let left  = str.slice(0, caretPosition).search(/[^\s\u200B]+$/);
-  let right = str.slice(caretPosition).search(/[\s\u200B]/);
+  let left  = str.slice(0, caretPosition).search(/\S+$/);
+  let right = str.slice(caretPosition).search(/\s/);
 
   if (right < 0) {
     word = str.slice(left);
@@ -31,7 +31,7 @@ const textAtCursorMatchesToken = (str, caretPosition, searchTokens) => {
   word = word.trim().toLowerCase();
 
   if (word.length > 0) {
-    return [left, word];
+    return [left + 1, word];
   } else {
     return [null, null];
   }
diff --git a/app/javascript/flavours/glitch/components/autosuggest_textarea.jsx b/app/javascript/flavours/glitch/components/autosuggest_textarea.jsx
index 9fd199a21c47b7..07fbccacc9c53b 100644
--- a/app/javascript/flavours/glitch/components/autosuggest_textarea.jsx
+++ b/app/javascript/flavours/glitch/components/autosuggest_textarea.jsx
@@ -16,8 +16,8 @@ import { AutosuggestHashtag } from './autosuggest_hashtag';
 const textAtCursorMatchesToken = (str, caretPosition) => {
   let word;
 
-  let left  = str.slice(0, caretPosition).search(/[^\s\u200B]+$/);
-  let right = str.slice(caretPosition).search(/[\s\u200B]/);
+  let left  = str.slice(0, caretPosition).search(/\S+$/);
+  let right = str.slice(caretPosition).search(/\s/);
 
   if (right < 0) {
     word = str.slice(left);
@@ -32,7 +32,7 @@ const textAtCursorMatchesToken = (str, caretPosition) => {
   word = word.trim().toLowerCase();
 
   if (word.length > 0) {
-    return [left, word];
+    return [left + 1, word];
   } else {
     return [null, null];
   }

From 6901930c8d62e2973ee3fc1f18d6519631364fd1 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 23 Feb 2024 23:03:57 +0100
Subject: [PATCH 0238/2191] Add back confirmation modal for missing media
 description

---
 .../compose/components/compose_form.jsx       | 21 ++++++---
 .../containers/compose_form_container.js      | 46 ++++++++++++++++++-
 .../flavours/glitch/locales/en.json           |  3 ++
 3 files changed, 62 insertions(+), 8 deletions(-)

diff --git a/app/javascript/flavours/glitch/features/compose/components/compose_form.jsx b/app/javascript/flavours/glitch/features/compose/components/compose_form.jsx
index c8d95a11a752e7..ecadf211703efe 100644
--- a/app/javascript/flavours/glitch/features/compose/components/compose_form.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/compose_form.jsx
@@ -75,6 +75,9 @@ class ComposeForm extends ImmutablePureComponent {
     autoFocus: PropTypes.bool,
     withoutNavigation: PropTypes.bool,
     anyMedia: PropTypes.bool,
+    media: ImmutablePropTypes.list,
+    mediaDescriptionConfirmation: PropTypes.bool,
+    onMediaDescriptionConfirm: PropTypes.func.isRequired,
     isInReply: PropTypes.bool,
     singleColumn: PropTypes.bool,
     lang: PropTypes.string,
@@ -100,11 +103,11 @@ class ComposeForm extends ImmutablePureComponent {
 
   handleKeyDown = (e) => {
     if (e.keyCode === 13 && (e.ctrlKey || e.metaKey)) {
-      this.handleSubmit();
+      this.handleSubmit(e);
     }
 
     if (e.keyCode === 13 && e.altKey) {
-      this.handleSecondarySubmit();
+      this.handleSecondarySubmit(e);
     }
   };
 
@@ -131,16 +134,22 @@ class ComposeForm extends ImmutablePureComponent {
       return;
     }
 
-    this.props.onSubmit(this.props.history || null, overridePrivacy);
-
     if (e) {
       e.preventDefault();
     }
+
+    // Submit unless there are media with missing descriptions
+    if (this.props.mediaDescriptionConfirmation && this.props.media && this.props.media.some(item => !item.get('description'))) {
+      const firstWithoutDescription = this.props.media.find(item => !item.get('description'));
+      this.props.onMediaDescriptionConfirm(this.props.history || null, firstWithoutDescription.get('id'), overridePrivacy);
+    } else {
+      this.props.onSubmit(this.props.history || null, overridePrivacy);
+    }
   };
 
-  handleSecondarySubmit = () => {
+  handleSecondarySubmit = (e) => {
     const { sideArm } = this.props;
-    this.handleSubmit(null, sideArm === 'none' ? null : sideArm);
+    this.handleSubmit(e, sideArm === 'none' ? null : sideArm);
   };
 
   onSuggestionsClearRequested = () => {
diff --git a/app/javascript/flavours/glitch/features/compose/containers/compose_form_container.js b/app/javascript/flavours/glitch/features/compose/containers/compose_form_container.js
index a371606bee0af5..6de24cc7067c4c 100644
--- a/app/javascript/flavours/glitch/features/compose/containers/compose_form_container.js
+++ b/app/javascript/flavours/glitch/features/compose/containers/compose_form_container.js
@@ -1,3 +1,5 @@
+import { defineMessages, injectIntl } from 'react-intl';
+
 import { connect } from 'react-redux';
 
 import { privacyPreference } from 'flavours/glitch/utils/privacy_preference';
@@ -12,8 +14,27 @@ import {
   insertEmojiCompose,
   uploadCompose,
 } from '../../../actions/compose';
+import { changeLocalSetting } from '../../../actions/local_settings';
+import {
+  openModal,
+} from '../../../actions/modal';
 import ComposeForm from '../components/compose_form';
 
+const messages = defineMessages({
+  missingDescriptionMessage: {
+    id: 'confirmations.missing_media_description.message',
+    defaultMessage: 'At least one media attachment is lacking a description. Consider describing all media attachments for the visually impaired before sending your toot.',
+  },
+  missingDescriptionConfirm: {
+    id: 'confirmations.missing_media_description.confirm',
+    defaultMessage: 'Send anyway',
+  },
+  missingDescriptionEdit: {
+    id: 'confirmations.missing_media_description.edit',
+    defaultMessage: 'Edit media',
+  },
+});
+
 const sideArmPrivacy = state => {
   const inReplyTo = state.getIn(['compose', 'in_reply_to']);
   const replyPrivacy = inReplyTo ? state.getIn(['statuses', inReplyTo, 'visibility']) : null;
@@ -50,9 +71,11 @@ const mapStateToProps = state => ({
   isInReply: state.getIn(['compose', 'in_reply_to']) !== null,
   lang: state.getIn(['compose', 'language']),
   sideArm: sideArmPrivacy(state),
+  media: state.getIn(['compose', 'media_attachments']),
+  mediaDescriptionConfirmation: state.getIn(['local_settings', 'confirm_missing_media_description']),
 });
 
-const mapDispatchToProps = (dispatch) => ({
+const mapDispatchToProps = (dispatch, { intl }) => ({
 
   onChange (text) {
     dispatch(changeCompose(text));
@@ -86,6 +109,25 @@ const mapDispatchToProps = (dispatch) => ({
     dispatch(insertEmojiCompose(position, data, needsSpace));
   },
 
+  onMediaDescriptionConfirm (routerHistory, mediaId, overridePrivacy = null) {
+    dispatch(openModal({
+      modalType: 'CONFIRM',
+      modalProps: {
+        message: intl.formatMessage(messages.missingDescriptionMessage),
+        confirm: intl.formatMessage(messages.missingDescriptionConfirm),
+        onConfirm: () => {
+          dispatch(submitCompose(routerHistory, overridePrivacy));
+        },
+        secondary: intl.formatMessage(messages.missingDescriptionEdit),
+        onSecondary: () => dispatch(openModal({
+          modalType: 'FOCAL_POINT',
+          modalProps: { id: mediaId },
+        })),
+        onDoNotAsk: () => dispatch(changeLocalSetting(['confirm_missing_media_description'], false)),
+      },
+    }));
+  },
+
 });
 
-export default connect(mapStateToProps, mapDispatchToProps)(ComposeForm);
+export default injectIntl(connect(mapStateToProps, mapDispatchToProps)(ComposeForm));
diff --git a/app/javascript/flavours/glitch/locales/en.json b/app/javascript/flavours/glitch/locales/en.json
index 9c530262f294ad..f7d3b7f4d840f5 100644
--- a/app/javascript/flavours/glitch/locales/en.json
+++ b/app/javascript/flavours/glitch/locales/en.json
@@ -30,6 +30,9 @@
   "confirmation_modal.do_not_ask_again": "Do not ask for confirmation again",
   "confirmations.deprecated_settings.confirm": "Use Mastodon preferences",
   "confirmations.deprecated_settings.message": "Some of the glitch-soc device-specific {app_settings} you are using have been replaced by Mastodon {preferences} and will be overriden:",
+  "confirmations.missing_media_description.confirm": "Send anyway",
+  "confirmations.missing_media_description.edit": "Edit media",
+  "confirmations.missing_media_description.message": "At least one media attachment is lacking a description. Consider describing all media attachments for the visually impaired before sending your toot.",
   "confirmations.unfilter.author": "Author",
   "confirmations.unfilter.confirm": "Show",
   "confirmations.unfilter.edit_filter": "Edit filter",

From aca691726b036af0d180ef2c31d7fa607c1505c3 Mon Sep 17 00:00:00 2001
From: Paolo Melchiorre <paolo@melchiorre.org>
Date: Fri, 23 Feb 2024 23:10:46 +0100
Subject: [PATCH 0239/2191] Fix #21492 Add missing WebP hint in avatar/header
 localizations (#22395)

---
 config/locales/simple_form.en.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml
index 0b718c5b6542d3..7ece81290f4a28 100644
--- a/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@@ -39,14 +39,14 @@ en:
         text: You can only appeal a strike once
       defaults:
         autofollow: People who sign up through the invite will automatically follow you
-        avatar: PNG, GIF or JPG. At most %{size}. Will be downscaled to %{dimensions}px
+        avatar: WEBP, PNG, GIF or JPG. At most %{size}. Will be downscaled to %{dimensions}px
         bot: Signal to others that the account mainly performs automated actions and might not be monitored
         context: One or multiple contexts where the filter should apply
         current_password: For security purposes please enter the password of the current account
         current_username: To confirm, please enter the username of the current account
         digest: Only sent after a long period of inactivity and only if you have received any personal messages in your absence
         email: You will be sent a confirmation e-mail
-        header: PNG, GIF or JPG. At most %{size}. Will be downscaled to %{dimensions}px
+        header: WEBP, PNG, GIF or JPG. At most %{size}. Will be downscaled to %{dimensions}px
         inbox_url: Copy the URL from the frontpage of the relay you want to use
         irreversible: Filtered posts will disappear irreversibly, even if filter is later removed
         locale: The language of the user interface, e-mails and push notifications

From e9f439a625d8edc589cb229ee15ef54bd1067576 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=88=E6=A7=8D=E7=94=B1=E7=B4=80?=
 <chikorita157@ateliershiori.moe>
Date: Sat, 17 Feb 2024 16:15:39 -0500
Subject: [PATCH 0240/2191] Enable rejection of Create Activities if the status
 includes unusable hashtags

---
 app/lib/activitypub/activity/create.rb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb
index c133ef673a64f4..489863fedb2a08 100644
--- a/app/lib/activitypub/activity/create.rb
+++ b/app/lib/activitypub/activity/create.rb
@@ -86,6 +86,9 @@ def process_status
     process_tags
     process_audience
 
+    # Reject the status unless all the hashtags are usable:
+    return reject_payload! unless @tags.all?(&:usable?)
+
     ApplicationRecord.transaction do
       @status = Status.create!(@params)
       attach_tags(@status)

From 833b6e40b850a4dbe9dfc2361a5a4cb061c98a6d Mon Sep 17 00:00:00 2001
From: noellabo <noel.yoshiba@gmail.com>
Date: Fri, 16 Feb 2024 16:14:23 +0900
Subject: [PATCH 0241/2191] Add reject pattern to Admin setting

---
 .../admin/settings/others_controller.rb       |  9 +++++++++
 app/views/admin/settings/other/show.html.haml |  3 +++
 .../admin/settings/others/show.html.haml      | 19 +++++++++++++++++++
 3 files changed, 31 insertions(+)
 create mode 100644 app/controllers/admin/settings/others_controller.rb
 create mode 100644 app/views/admin/settings/others/show.html.haml

diff --git a/app/controllers/admin/settings/others_controller.rb b/app/controllers/admin/settings/others_controller.rb
new file mode 100644
index 00000000000000..113d0c84ff1fc7
--- /dev/null
+++ b/app/controllers/admin/settings/others_controller.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class Admin::Settings::OthersController < Admin::SettingsController
+  private
+
+  def after_update_redirect_path
+    admin_settings_others_path
+  end
+end
diff --git a/app/views/admin/settings/other/show.html.haml b/app/views/admin/settings/other/show.html.haml
index 22c3a5253ab548..6a1528d39ab327 100644
--- a/app/views/admin/settings/other/show.html.haml
+++ b/app/views/admin/settings/other/show.html.haml
@@ -24,6 +24,9 @@
 
   %h4= t('admin.settings.others.activitypub')
 
+  .fields-group
+    = f.input :reject_pattern, wrapper: :with_block_label, as: :text, label: t('admin.settings.reject_pattern.title'), hint: t('admin.settings.reject_pattern.desc_html'), input_html: { rows: 8 }
+
   .fields-group
     = f.input :reject_pattern, wrapper: :with_block_label, as: :text, label: t('admin.settings.reject_pattern.title'), hint: t('admin.settings.reject_pattern.desc_html'), input_html: { rows: 8 }
 
diff --git a/app/views/admin/settings/others/show.html.haml b/app/views/admin/settings/others/show.html.haml
new file mode 100644
index 00000000000000..06dcf2bf8b0098
--- /dev/null
+++ b/app/views/admin/settings/others/show.html.haml
@@ -0,0 +1,19 @@
+- content_for :page_title do
+  = t('admin.settings.others.title')
+
+- content_for :heading do
+  %h2= t('admin.settings.title')
+  = render partial: 'admin/settings/shared/links'
+
+= simple_form_for @admin_settings, url: admin_settings_others_path, html: { method: :patch } do |f|
+  = render 'shared/error_messages', object: @admin_settings
+
+  %p.lead= t('admin.settings.others.preamble')
+
+  %h4= t('admin.settings.others.activitypub')
+
+  .fields-group
+    = f.input :reject_pattern, wrapper: :with_block_label, as: :text, label: t('admin.settings.reject_pattern.title'), hint: t('admin.settings.reject_pattern.desc_html'), input_html: { rows: 8 }
+
+  .actions
+    = f.button :button, t('generic.save_changes'), type: :submit

From d518f06eae294ab2a6ad62dfdfe4348b38cb3266 Mon Sep 17 00:00:00 2001
From: noellabo <noel.yoshiba@gmail.com>
Date: Sun, 18 Feb 2024 11:24:19 +0900
Subject: [PATCH 0242/2191] Add reject blurhash to Admin setting

---
 app/lib/activitypub/activity/create.rb         | 5 +++++
 app/models/form/admin_settings.rb              | 1 +
 app/views/admin/settings/others/show.html.haml | 3 +++
 config/locales/en.yml                          | 3 +++
 config/locales/ja.yml                          | 6 ++++++
 config/settings.yml                            | 1 +
 lib/exceptions.rb                              | 1 +
 7 files changed, 20 insertions(+)

diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb
index 489863fedb2a08..7b7566d3bf8248 100644
--- a/app/lib/activitypub/activity/create.rb
+++ b/app/lib/activitypub/activity/create.rb
@@ -14,6 +14,8 @@ def perform
     else
       create_status
     end
+  rescue Mastodon::RejectPayload
+    reject_payload!
   end
 
   private
@@ -83,6 +85,9 @@ def process_status
     @params               = {}
 
     process_status_params
+
+    raise Mastodon::RejectPayload if MediaAttachment.where(id: @params[:media_attachment_ids]).where(blurhash: Setting.reject_blurhash.split(/\r\n/).filter(&:present?).uniq).present?
+
     process_tags
     process_audience
 
diff --git a/app/models/form/admin_settings.rb b/app/models/form/admin_settings.rb
index d284b929fefc4a..cfc326047c5c3c 100644
--- a/app/models/form/admin_settings.rb
+++ b/app/models/form/admin_settings.rb
@@ -46,6 +46,7 @@ class Form::AdminSettings
     captcha_enabled
     authorized_fetch
     reject_pattern
+    reject_blurhash
   ).freeze
 
   INTEGER_KEYS = %i(
diff --git a/app/views/admin/settings/others/show.html.haml b/app/views/admin/settings/others/show.html.haml
index 06dcf2bf8b0098..8d0a2b1acf15c6 100644
--- a/app/views/admin/settings/others/show.html.haml
+++ b/app/views/admin/settings/others/show.html.haml
@@ -15,5 +15,8 @@
   .fields-group
     = f.input :reject_pattern, wrapper: :with_block_label, as: :text, label: t('admin.settings.reject_pattern.title'), hint: t('admin.settings.reject_pattern.desc_html'), input_html: { rows: 8 }
 
+  .fields-group
+    = f.input :reject_blurhash, wrapper: :with_block_label, as: :text, label: t('admin.settings.reject_blurhash.title'), hint: t('admin.settings.reject_blurhash.desc_html'), input_html: { rows: 8 }
+
   .actions
     = f.button :button, t('generic.save_changes'), type: :submit
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 6e9b972895ce37..d0067ec8ea9d2d 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -778,6 +778,9 @@ en:
           approved: Approval required for sign up
           none: Nobody can sign up
           open: Anyone can sign up
+      reject_blurhash:
+        desc_html: Set a blurhashes to inspect Create Activity media attachments, and refuse Activity if you match
+        title: Reject blurhash
       reject_pattern:
         desc_html: Set a regular expression pattern to inspect Create Activity content, and refuse Activity if you match
         title: Reject Pattern
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 2051e30aeeaeff..daec3555d5fc67 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -760,6 +760,12 @@ ja:
           approved: 登録には承認が必要
           none: 誰にも許可しない
           open: 誰でも登録可
+      reject_blurhash:
+        desc_html: Create Activityの添付画像を検査するblurhashを設定し、一致する場合はActivityを拒否します
+        title: 拒否画像ハッシュ
+      reject_pattern:
+        desc_html: Create Activityのcontentを検査する正規表現パターンを設定し、一致する場合はActivityを拒否します
+        title: 拒否パターン
       security:
         authorized_fetch: 連合サーバーによる署名なしでの情報取得を拒否する
         authorized_fetch_hint: ほかの連合サーバーから受け付けるリクエストに署名を必須にすることで、ユーザーによるブロックおよびドメインブロック両方の効果をより強力にします。ただし連合の処理コストが増えてパフォーマンス面で不利になるほか、このサーバーから送られた反応が届く範囲が狭まったり、連合における互換性の問題を招く可能性もあります。また、この機能は公開投稿やプロフィールへのアクセスをブロックした相手から完全に遮断できるものではありません。
diff --git a/config/settings.yml b/config/settings.yml
index 355fc5f5154311..72068b135e2f81 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -47,6 +47,7 @@ defaults: &defaults
   backups_retention_period: 7
   captcha_enabled: false
   reject_pattern: ''
+  reject_blurhash: ''
 
 development:
   <<: *defaults
diff --git a/lib/exceptions.rb b/lib/exceptions.rb
index d3b92f4a09300f..029235560b0630 100644
--- a/lib/exceptions.rb
+++ b/lib/exceptions.rb
@@ -8,6 +8,7 @@ class HostValidationError < ValidationError; end
   class LengthValidationError < ValidationError; end
   class DimensionsValidationError < ValidationError; end
   class StreamValidationError < ValidationError; end
+  class RejectPayload < ValidationError; end
   class RaceConditionError < Error; end
   class RateLimitExceededError < Error; end
   class SyntaxError < Error; end

From 026da980e7833afaf5310b7e39c1bf5fca20e0ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=88=E6=A7=8D=E7=94=B1=E7=B4=80?=
 <chikorita157@ateliershiori.moe>
Date: Sun, 18 Feb 2024 09:46:39 -0500
Subject: [PATCH 0243/2191] Fix blurhash for GlitchSoc

---
 app/views/admin/settings/other/show.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/admin/settings/other/show.html.haml b/app/views/admin/settings/other/show.html.haml
index 6a1528d39ab327..8cedfd44fbd48c 100644
--- a/app/views/admin/settings/other/show.html.haml
+++ b/app/views/admin/settings/other/show.html.haml
@@ -28,7 +28,7 @@
     = f.input :reject_pattern, wrapper: :with_block_label, as: :text, label: t('admin.settings.reject_pattern.title'), hint: t('admin.settings.reject_pattern.desc_html'), input_html: { rows: 8 }
 
   .fields-group
-    = f.input :reject_pattern, wrapper: :with_block_label, as: :text, label: t('admin.settings.reject_pattern.title'), hint: t('admin.settings.reject_pattern.desc_html'), input_html: { rows: 8 }
+    = f.input :reject_blurhash, wrapper: :with_block_label, as: :text, label: t('admin.settings.reject_blurhash.title'), hint: t('admin.settings.reject_blurhash.desc_html'), input_html: { rows: 8 }
 
   .actions
     = f.button :button, t('generic.save_changes'), type: :submit

From eda4ee91364454c05cbb5fdd3c1f8805d1dce77f Mon Sep 17 00:00:00 2001
From: Essem <smswessem@gmail.com>
Date: Sun, 18 Feb 2024 11:51:19 -0600
Subject: [PATCH 0244/2191] Remove duplicate "others" settings page

---
 .../admin/settings/others_controller.rb       |  9 --------
 .../admin/settings/others/show.html.haml      | 22 -------------------
 2 files changed, 31 deletions(-)
 delete mode 100644 app/controllers/admin/settings/others_controller.rb
 delete mode 100644 app/views/admin/settings/others/show.html.haml

diff --git a/app/controllers/admin/settings/others_controller.rb b/app/controllers/admin/settings/others_controller.rb
deleted file mode 100644
index 113d0c84ff1fc7..00000000000000
--- a/app/controllers/admin/settings/others_controller.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-class Admin::Settings::OthersController < Admin::SettingsController
-  private
-
-  def after_update_redirect_path
-    admin_settings_others_path
-  end
-end
diff --git a/app/views/admin/settings/others/show.html.haml b/app/views/admin/settings/others/show.html.haml
deleted file mode 100644
index 8d0a2b1acf15c6..00000000000000
--- a/app/views/admin/settings/others/show.html.haml
+++ /dev/null
@@ -1,22 +0,0 @@
-- content_for :page_title do
-  = t('admin.settings.others.title')
-
-- content_for :heading do
-  %h2= t('admin.settings.title')
-  = render partial: 'admin/settings/shared/links'
-
-= simple_form_for @admin_settings, url: admin_settings_others_path, html: { method: :patch } do |f|
-  = render 'shared/error_messages', object: @admin_settings
-
-  %p.lead= t('admin.settings.others.preamble')
-
-  %h4= t('admin.settings.others.activitypub')
-
-  .fields-group
-    = f.input :reject_pattern, wrapper: :with_block_label, as: :text, label: t('admin.settings.reject_pattern.title'), hint: t('admin.settings.reject_pattern.desc_html'), input_html: { rows: 8 }
-
-  .fields-group
-    = f.input :reject_blurhash, wrapper: :with_block_label, as: :text, label: t('admin.settings.reject_blurhash.title'), hint: t('admin.settings.reject_blurhash.desc_html'), input_html: { rows: 8 }
-
-  .actions
-    = f.button :button, t('generic.save_changes'), type: :submit

From a39c911251658d2744c8e8c4679a8723700c0ccb Mon Sep 17 00:00:00 2001
From: Essem <smswessem@gmail.com>
Date: Sun, 18 Feb 2024 12:10:02 -0600
Subject: [PATCH 0245/2191] Fix newline split

---
 app/lib/activitypub/activity/create.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb
index 7b7566d3bf8248..420027cf42ccb8 100644
--- a/app/lib/activitypub/activity/create.rb
+++ b/app/lib/activitypub/activity/create.rb
@@ -86,7 +86,7 @@ def process_status
 
     process_status_params
 
-    raise Mastodon::RejectPayload if MediaAttachment.where(id: @params[:media_attachment_ids]).where(blurhash: Setting.reject_blurhash.split(/\r\n/).filter(&:present?).uniq).present?
+    raise Mastodon::RejectPayload if MediaAttachment.where(id: @params[:media_attachment_ids]).where(blurhash: Setting.reject_blurhash.split(/\r?\n/).filter(&:present?).uniq).present?
 
     process_tags
     process_audience

From 206de12616cd1ddf8b8b9b15402a2bc6c82611e3 Mon Sep 17 00:00:00 2001
From: Jeremy Kescher <jeremy@kescher.at>
Date: Sat, 24 Feb 2024 11:17:01 +0100
Subject: [PATCH 0246/2191] Bump Catstodon version

---
 lib/mastodon/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index 9d8d2666fe8c93..d1b160b1899f0c 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -25,7 +25,7 @@ def prerelease
     end
 
     def catstodon_revision
-      '1.0.2'
+      '1.0.3'
     end
 
     def build_metadata

From c3adcec8fb8d9482a50432cc85b3a6059810154d Mon Sep 17 00:00:00 2001
From: Jeremy Kescher <jeremy@kescher.at>
Date: Sat, 24 Feb 2024 11:37:17 +0100
Subject: [PATCH 0247/2191] Fix profile fields styling in Oatstodon flavor

---
 .../flavours/glitch/styles/oatstodon.scss     | 433 +++++++++++++++---
 1 file changed, 364 insertions(+), 69 deletions(-)

diff --git a/app/javascript/flavours/glitch/styles/oatstodon.scss b/app/javascript/flavours/glitch/styles/oatstodon.scss
index c630bad7c14114..866e1daeb7b19b 100644
--- a/app/javascript/flavours/glitch/styles/oatstodon.scss
+++ b/app/javascript/flavours/glitch/styles/oatstodon.scss
@@ -7,119 +7,263 @@
   /* rgb for transparency to work */
   --text-color: 217, 225, 232;
   --text-color-secondary: 96, 105, 132; /* less bright, for unimportant bits */
-
   --background-color: 18, 18, 37;
   --background-color-brighter: 22, 22, 47;
   --app-background-color: 8, 8, 17; /* used only for the VERY background in the back */
-
   --accent-color: 39, 183, 145;
   --accent-color-secondary: 62, 91, 84; /* less saturated ver of --accent-color */
   --accent-color-bright: 92, 193, 162;
 }
 
-.account__avatar-overlay-base, .account__avatar-overlay-overlay, .account__avatar {
+.account__avatar-overlay-base,
+.account__avatar-overlay-overlay,
+.account__avatar {
   border-radius: var(--border-radius);
 }
 
 /* roundening shenanigans */
 
-.drawer > div, nav, .search, .drawer__header a, .drawer--header a, .search__input {
+.drawer > div,
+nav,
+.search,
+.drawer__header a,
+.drawer--header a,
+.search__input {
   border-radius: var(--border-radius) !important;
 }
 
-.column-header, .column-back-button, .navigation-panel .column-link:nth-child(1), .navigation-panel .column-link:nth-child(10), .navigation-bar {
-  border-radius: var(--border-radius) var(--border-radius) 0px 0px;
+.column-header,
+.column-back-button,
+.navigation-panel .column-link:nth-child(1),
+.navigation-panel .column-link:nth-child(10),
+.navigation-bar {
+  border-radius: var(--border-radius) var(--border-radius) 0 0;
 }
-.column > .scrollable, .getting-started, .navigation-panel .column-link:nth-child(8), .navigation-panel .column-link:nth-child(11) {
-  border-radius: 0px 0px var(--border-radius) var(--border-radius);
+
+.column > .scrollable,
+.getting-started,
+.navigation-panel .column-link:nth-child(8),
+.navigation-panel .column-link:nth-child(11) {
+  border-radius: 0 0 var(--border-radius) var(--border-radius);
 }
 
 /* standard fg/bg color changes */
 
-.drawer__inner, .drawer__inner__mastodon, .drawer__header, .drawer--header, .actions-modal, .block-modal, .boost-modal, .confirmation-modal, .mute-modal, .report-modal, article, .getting-started, .column-subheading, .column-link, .column-subheading, .column-link, .emoji-mart-scroll, .emoji-mart-search, .emoji-mart-category-label > span, .emoji-picker-dropdown__menu, .scrollable, .empty-column-indicator, .column-inline-form, .dropdown-menu, .dropdown-menu__item a, .account__header__fields dt, .search-popout, .confirmation-modal__action-bar, .reactions-bar__item, .emoji-picker-dropdown__modifiers__menu, .content-wrapper, .sidebar-wrapper--empty, .regeneration-indicator, .tabs-bar, .navigation-bar, .trends__header, .modal-layout {
+.drawer__inner,
+.drawer__inner__mastodon,
+.drawer__header,
+.drawer--header,
+.actions-modal,
+.block-modal,
+.boost-modal,
+.confirmation-modal,
+.mute-modal,
+.report-modal,
+article,
+.getting-started,
+.column-subheading,
+.column-link,
+.column-subheading,
+.column-link,
+.emoji-mart-scroll,
+.emoji-mart-search,
+.emoji-mart-category-label > span,
+.emoji-picker-dropdown__menu,
+.scrollable,
+.empty-column-indicator,
+.column-inline-form,
+.dropdown-menu,
+.dropdown-menu__item a,
+.account__header__fields,
+.search-popout,
+.confirmation-modal__action-bar,
+.reactions-bar__item,
+.emoji-picker-dropdown__modifiers__menu,
+.content-wrapper,
+.sidebar-wrapper--empty,
+.regeneration-indicator,
+.tabs-bar,
+.navigation-bar,
+.trends__header,
+.modal-layout {
   background-color: rgb(var(--background-color)) !important;
   color: rgb(var(--text-color)) !important;
 }
-.glitch.local-settings__navigation, .glitch.local-settings__navigation__item, .glitch.local-settings__page, .glitch.local-settings {
+
+.glitch.local-settings__navigation,
+.glitch.local-settings__navigation__item,
+.glitch.local-settings__page,
+.glitch.local-settings {
   background-color: rgb(var(--background-color));
   color: rgb(var(--text-color));
 }
 
-.modal-layout, .modal-layout__mastodon > * {
+.modal-layout,
+.modal-layout__mastodon > * {
   background-image: none;
 }
 
-.account__section-headline a.active::after, .account__section-headline button.active::after, .notification__filter-bar a.active::after, .notification__filter-bar button.active::after, .account__section-headline a.active::after, .account__section-headline a.active::before, .account__section-headline button.active::after, .account__section-headline button.active::before, .notification__filter-bar a.active::after, .notification__filter-bar a.active::before, .notification__filter-bar button.active::after, .notification__filter-bar button.active::before {
- border-color: transparent transparent rgb(var(--background-color));
+.account__section-headline a.active::after,
+.account__section-headline button.active::after,
+.notification__filter-bar a.active::after,
+.notification__filter-bar button.active::after,
+.account__section-headline a.active::after,
+.account__section-headline a.active::before,
+.account__section-headline button.active::after,
+.account__section-headline button.active::before,
+.notification__filter-bar a.active::after,
+.notification__filter-bar a.active::before,
+.notification__filter-bar button.active::after,
+.notification__filter-bar button.active::before {
+  border-color: transparent transparent rgb(var(--background-color));
 }
 
 .dropdown-menu__arrow {
   border-bottom-color: rgb(var(--background-color)) !important;
 }
+
 .dropdown-menu__arrow.top {
   border-top-color: rgb(var(--background-color)) !important;
 }
 
-.reply-indicator__content, .status__content, .reply-indicator__display-name, .privacy-dropdown__option__icon, .composer--options--dropdown--content--item .icon, .composer--reply > .content {
+.reply-indicator__content,
+.status__content,
+.reply-indicator__display-name,
+.privacy-dropdown__option__icon,
+.composer--options--dropdown--content--item .icon,
+.composer--reply > .content {
   color: rgb(var(--text-color)) !important;
 }
 
 html {
-  scrollbar-color: rgb(var(--background-color-brighter)) rgba(0,0,0,0.1);
+  scrollbar-color: rgb(var(--background-color-brighter)) rgba(0, 0, 0, 10%);
 }
 
 .tabs-bar__wrapper {
   background: rgb(var(--app-background-color));
 }
 
-.column-header, .column-header__button, .account__section-headline, .notification__filter-bar > button, .emoji-mart-bar, .column-back-button, .column-header__back-button, .announcements, .column-header__collapsible-inner, .status.status-direct:not(.read), .notification__filter-bar, .glitch.local-settings__page {
+.column-header,
+.column-header__button,
+.account__section-headline,
+.notification__filter-bar > button,
+.emoji-mart-bar,
+.column-back-button,
+.column-header__back-button,
+.announcements,
+.column-header__collapsible-inner,
+.status.status-direct:not(.read),
+.notification__filter-bar,
+.glitch.local-settings__page {
   background-color: rgb(var(--background-color-brighter)) !important;
   border-bottom: none;
 }
 
-.reply-indicator, .emoji-picker-dropdown__modifiers__menu button:hover, .compose-form .compose-form__buttons-wrapper, .composer--options-wrapper, .compose-form__poll-wrapper select, .flash-message, .card__bar, .card > a:hover .card__bar, .glitch.local-settings__navigation__item:hover {
+.reply-indicator,
+.emoji-picker-dropdown__modifiers__menu button:hover,
+.compose-form .compose-form__buttons-wrapper,
+.composer--options-wrapper,
+.compose-form__poll-wrapper select,
+.flash-message,
+.card__bar,
+.card > a:hover .card__bar,
+.glitch.local-settings__navigation__item:hover {
   background-color: rgb(var(--background-color-brighter));
 }
 
-.columns-area, .app-body, .getting-started__wrapper {
+.columns-area,
+.app-body,
+.getting-started__wrapper {
   background-color: rgb(var(--app-background-color));
 }
 
-.privacy-dropdown__option__content strong, .composer--options--dropdown--content strong, .character-counter, .report-modal__comment .setting-text-label, .compose-form__poll-wrapper select {
+.privacy-dropdown__option__content strong,
+.composer--options--dropdown--content strong,
+.character-counter,
+.report-modal__comment .setting-text-label,
+.compose-form__poll-wrapper select {
   color: rgb(var(--text-color)) !important;
 }
 
-input, textarea, .compose-form__modifiers, .privacy-dropdown__dropdown, .composer--options--dropdown--content, .privacy-dropdown__value {
+input,
+textarea,
+.compose-form__modifiers,
+.privacy-dropdown__dropdown,
+.composer--options--dropdown--content,
+.privacy-dropdown__value {
   background-color: rgb(var(--background-color-brighter)) !important;
   color: rgb(var(--text-color)) !important;
 }
 
-.compose-form__buttons-wrapper, .admin-wrapper .sidebar-wrapper__inner, .admin-wrapper .sidebar ul a:hover, .admin-wrapper .sidebar ul a, .admin-wrapper .sidebar ul a.selected, .account__disclaimer, .account__action-bar-links {
+.compose-form__buttons-wrapper,
+.admin-wrapper .sidebar-wrapper__inner,
+.admin-wrapper .sidebar ul a:hover,
+.admin-wrapper .sidebar ul a,
+.admin-wrapper .sidebar ul a.selected,
+.account__disclaimer,
+.account__action-bar-links {
   background-color: rgb(var(--background-color-brighter));
 }
 
-.detailed-status, .detailed-status__action-bar, .account__header__bar, .focusable:focus {
+.detailed-status,
+.detailed-status__action-bar,
+.account__header__bar,
+.focusable:focus {
   background-color: rgb(var(--background-color-brighter)) !important;
   border-bottom: none;
   border-top: none;
 }
 
 .status.collapsed .status__content::after {
-  background: linear-gradient(rgba(var(--background-color),0), rgba(var(--background-color),0)) !important;
+  background: linear-gradient(
+    rgba(var(--background-color), 0),
+    rgba(var(--background-color), 0)
+  ) !important;
 }
 
 /* accent color changes */
 
-.button, .react-toggle--checked .react-toggle-track, .react-toggle--checked:hover .react-toggle-track, .react-toggle--checked:hover:not(.react-toggle--disabled) .react-toggle-track, .button.logo-button, .emoji-mart-anchor-bar, .loading-bar, .icon-with-badge__badge, .video-player__volume__current, .video-player__volume__handle, .upload-progress__tracker, .video-player__seek__buffer, .video-player__seek__progress, .floating-action-button {
+.button,
+.react-toggle--checked .react-toggle-track,
+.react-toggle--checked:hover .react-toggle-track,
+.react-toggle--checked:hover:not(.react-toggle--disabled) .react-toggle-track,
+.button.logo-button,
+.emoji-mart-anchor-bar,
+.loading-bar,
+.icon-with-badge__badge,
+.video-player__volume__current,
+.video-player__volume__handle,
+.upload-progress__tracker,
+.video-player__seek__buffer,
+.video-player__seek__progress,
+.floating-action-button {
   background-color: rgb(var(--accent-color));
 }
-.react-toggle--checked .react-toggle-thumb, .compose-form__sensitive-button .checkbox, .filters .filter-subset a.selected, .account__action-bar__tab.active, .tabs-bar__link.active, .notification.unread::before, .status.unread::before {
+
+.react-toggle--checked .react-toggle-thumb,
+.compose-form__sensitive-button .checkbox,
+.filters .filter-subset a.selected,
+.account__action-bar__tab.active,
+.tabs-bar__link.active,
+.notification.unread::before,
+.status.unread::before {
   border-color: rgb(var(--accent-color));
 }
 
-.text-icon-button, .icon-button.inverted, button.inverted:hover, .icon-button, .icon-button:hover, .status__action-bar__counter__label, .text-icon-button:active, .text-icon-button:focus, .text-icon-button:hover, .icon-button.disabled, .composer--options--dropdown.open > .value {
+.text-icon-button,
+.icon-button.inverted,
+button.inverted:hover,
+.icon-button,
+.icon-button:hover,
+.status__action-bar__counter__label,
+.text-icon-button:active,
+.text-icon-button:focus,
+.text-icon-button:hover,
+.icon-button.disabled,
+.composer--options--dropdown.open > .value {
   color: rgb(var(--accent-color-secondary));
 }
+
 .status__info__icons i {
   color: rgb(var(--accent-color-secondary)) !important;
 }
@@ -127,14 +271,21 @@ input, textarea, .compose-form__modifiers, .privacy-dropdown__dropdown, .compose
 .status__content__spoiler-link {
   background-color: rgb(var(--accent-color-secondary)) !important;
 }
+
 .column-header__wrapper.active::before {
-  background: radial-gradient(ellipse, rgba(var(--accent-color),.23) 0%, rgba(var(--accent-color),0) 60%);
+  background: radial-gradient(
+    ellipse,
+    rgba(var(--accent-color), 0.23) 0%,
+    rgba(var(--accent-color), 0) 60%
+  );
 }
+
 .column-header__wrapper.active {
-  box-shadow: 0 1px 0 rgba(var(--accent-color),.3);
+  box-shadow: 0 1px 0 rgba(var(--accent-color), 0.3);
 }
 
-.compose-form__sensitive-button .checkbox.active, .poll__chart.leading {
+.compose-form__sensitive-button .checkbox.active,
+.poll__chart.leading {
   border-color: rgb(var(--accent-color));
   background-color: rgb(var(--accent-color));
 }
@@ -144,82 +295,178 @@ input, textarea, .compose-form__modifiers, .privacy-dropdown__dropdown, .compose
 }
 
 .column-header.active .column-header__icon {
-  text-shadow: 0 0 10px rgba(var(--accent-color),.4);
+  text-shadow: 0 0 10px rgba(var(--accent-color), 0.4);
 }
 
-.text-icon-button:active, .text-icon-button:focus, .text-icon-button:hover, .drawer__header a:hover, .drawer--header a:hover, .drawer--header a:focus, .icon-button:hover, .reactions-bar__item:hover {
-  background-color: rgba(var(--accent-color-secondary), .1);
+.text-icon-button:active,
+.text-icon-button:focus,
+.text-icon-button:hover,
+.drawer__header a:hover,
+.drawer--header a:hover,
+.drawer--header a:focus,
+.icon-button:hover,
+.reactions-bar__item:hover {
+  background-color: rgba(var(--accent-color-secondary), 0.1);
 }
 
-.icon-button.inverted:active, .icon-button.inverted:focus, .icon-button.inverted:hover, .reactions-bar__item.active {
-  background-color: rgba(var(--accent-color-secondary), .25);
+.icon-button.inverted:active,
+.icon-button.inverted:focus,
+.icon-button.inverted:hover,
+.reactions-bar__item.active {
+  background-color: rgba(var(--accent-color-secondary), 0.25);
   color: rgb(var(--accent-color-secondary));
 }
 
-.button:active, .button:focus, .button:hover, .admin-wrapper .sidebar ul .simple-navigation-active-leaf a:hover, .simple_form .block-button:hover, .simple_form .button:hover, .simple_form button:hover, .button.logo-button:active, .button.logo-button:focus, .button.logo-button:hover, .floating-action-button:hover, .glitch.local-settings__navigation__item.active:hover {
+.button:active,
+.button:focus,
+.button:hover,
+.admin-wrapper .sidebar ul .simple-navigation-active-leaf a:hover,
+.simple_form .block-button:hover,
+.simple_form .button:hover,
+.simple_form button:hover,
+.button.logo-button:active,
+.button.logo-button:focus,
+.button.logo-button:hover,
+.floating-action-button:hover,
+.glitch.local-settings__navigation__item.active:hover {
   background-color: rgb(var(--accent-color-bright));
 }
 
-.privacy-dropdown__option.active, .composer--options--dropdown--content--item.active, .privacy-dropdown__option:hover, .composer--options--dropdown--content--item:hover, .privacy-dropdown__option.active:hover, .composer--options--dropdown--content.active:hover, .admin-wrapper .sidebar ul .simple-navigation-active-leaf a, .simple_form .block-button, .simple_form .button, .simple_form button, .simple_form .block-button:active, .simple_form .block-button:focus, .simple_form .button:active, .simple_form .button:focus, .simple_form button:active, .simple_form button:focus, .composer--options--dropdown.open > .value, .glitch.local-settings__navigation__item.active {
+.privacy-dropdown__option.active,
+.composer--options--dropdown--content--item.active,
+.privacy-dropdown__option:hover,
+.composer--options--dropdown--content--item:hover,
+.privacy-dropdown__option.active:hover,
+.composer--options--dropdown--content.active:hover,
+.admin-wrapper .sidebar ul .simple-navigation-active-leaf a,
+.simple_form .block-button,
+.simple_form .button,
+.simple_form button,
+.simple_form .block-button:active,
+.simple_form .block-button:focus,
+.simple_form .button:active,
+.simple_form .button:focus,
+.simple_form button:active,
+.simple_form button:focus,
+.composer--options--dropdown.open > .value,
+.glitch.local-settings__navigation__item.active {
   background-color: rgb(var(--accent-color));
 }
 
-.status__info__icons .icon-button.active i, .tabs-bar__link.active, .status__content a {
+.status__info__icons .icon-button.active i,
+.tabs-bar__link.active,
+.status__content a {
   color: rgb(var(--accent-color)) !important;
 }
 
-
 .trends__item__sparkline path:last-child {
   stroke: rgb(var(--accent-color)) !important;
 }
+
 .trends__item__sparkline path:first-child {
   fill: rgb(var(--accent-color-secondary)) !important;
 }
 
-a.u-url, .status-link, .column-header__back-button, .status__content__read-more-button, .column-header.active .column-header__icon, .column-link.active, .account__section-headline a.active, .account__section-headline button.active, .notification__filter-bar a.active, .notification__filter-bar button.active, .account__header__content a, .account__header__bio .account__header__fields a, .reactions-bar__item.active .reactions-bar__item__count, .emoji-mart-anchor-selected, .reply-indicator__content a, .compose-form .compose-form__warning a, .text-icon-button.active, .icon-button.inverted.active, .drawer__tab:hover, .icon-button.active, .column-back-button, .filters .filter-subset a.selected, .admin-wrapper .content .muted-hint a, body .muted-hint a, .table a, .notification__message .fa, .drawer--header a:hover, .drawer--header a:focus {
+a.u-url,
+.status-link,
+.column-header__back-button,
+.status__content__read-more-button,
+.column-header.active .column-header__icon,
+.column-link.active,
+.account__section-headline a.active,
+.account__section-headline button.active,
+.notification__filter-bar a.active,
+.notification__filter-bar button.active,
+.account__header__content a,
+.account__header__bio .account__header__fields a,
+.reactions-bar__item.active .reactions-bar__item__count,
+.emoji-mart-anchor-selected,
+.reply-indicator__content a,
+.compose-form .compose-form__warning a,
+.text-icon-button.active,
+.icon-button.inverted.active,
+.drawer__tab:hover,
+.icon-button.active,
+.column-back-button,
+.filters .filter-subset a.selected,
+.admin-wrapper .content .muted-hint a,
+body .muted-hint a,
+.table a,
+.notification__message .fa,
+.drawer--header a:hover,
+.drawer--header a:focus {
   color: rgb(var(--accent-color)) !important;
 }
 
 /* fixes */
 
 /* boost hack, v2 */
+
 /* https://codepen.io/sosuke/pen/Pjoqqp */
 button.icon-button i.fa-retweet {
-  filter: brightness(0) saturate(100%) invert(31%) sepia(28%) saturate(388%) hue-rotate(115deg) brightness(94%) contrast(90%); /* accent-color-secondary */
+  filter: brightness(0) saturate(100%) invert(31%) sepia(28%) saturate(388%)
+    hue-rotate(115deg) brightness(94%) contrast(90%); /* accent-color-secondary */
+
   color: transparent !important;
 }
+
 button.icon-button.active i.fa-retweet {
-  filter: brightness(0) saturate(100%) invert(57%) sepia(61%) saturate(481%) hue-rotate(114deg) brightness(93%) contrast(91%); /* accent-color */
+  filter: brightness(0) saturate(100%) invert(57%) sepia(61%) saturate(481%)
+    hue-rotate(114deg) brightness(93%) contrast(91%); /* accent-color */
 }
-button.icon-button.disabled i.fa-retweet, button.icon-button.disabled i.fa-lock {
-  filter: brightness(0) saturate(100%) invert(31%) sepia(28%) saturate(388%) hue-rotate(115deg) brightness(60%) contrast(90%); /* accent-color-secondary with brightness set to 50% */
+
+button.icon-button.disabled i.fa-retweet,
+button.icon-button.disabled i.fa-lock {
+  filter: brightness(0) saturate(100%) invert(31%) sepia(28%) saturate(388%)
+    hue-rotate(115deg) brightness(60%) contrast(90%); /* accent-color-secondary with brightness set to 50% */
 }
 
-.load-more:hover, .mbstobon-2 .drawer__inner__mastodon, .mbstobon-1 .drawer__inner__mastodon, .mbstobon-0 .drawer__inner__mastodon {
+.load-more:hover,
+.mbstobon-2 .drawer__inner__mastodon,
+.mbstobon-1 .drawer__inner__mastodon,
+.mbstobon-0 .drawer__inner__mastodon {
   background: inherit;
 }
 
-.account__action-bar__tab, .account__action-bar {
+.account__action-bar__tab,
+.account__action-bar {
   border: none;
 }
 
-.notification__filter-bar, .account__header__bar, .admin-wrapper .content-heading, .admin-wrapper .content h4, .tabs-bar__link:not(.active) {
+.notification__filter-bar,
+.account__header__bar,
+.admin-wrapper .content-heading,
+.admin-wrapper .content h4,
+.tabs-bar__link:not(.active) {
   border-bottom: none;
 }
 
-.dropdown-menu__separator, hr {
+.dropdown-menu__separator,
+hr {
   opacity: 0;
 }
-.compose-form .autosuggest-textarea__textarea, .compose-form .spoiler-input__input, .compose-panel .compose-form__autosuggest-wrapper, .mbstobon-3 .drawer__inner__mastodon {
+
+.compose-form .autosuggest-textarea__textarea,
+.compose-form .spoiler-input__input,
+.compose-panel .compose-form__autosuggest-wrapper,
+.mbstobon-3 .drawer__inner__mastodon {
   background: transparent;
 }
-.status, .account, .account__header__fields dl, .account__header__fields, .account__header__bio .account__header__fields, .glitch.local-settings__navigation__item {
+
+.status,
+.account,
+.account__header__fields dl,
+.account__header__fields,
+.account__header__bio .account__header__fields,
+.glitch.local-settings__navigation__item {
   border-top: none;
   border-bottom: none;
 }
 
-.report-modal__container, .report-modal__comment, .report-modal__comment .setting-text__wrapper {
-  border-color: rgba(0, 0, 0, 0) !important;
+.report-modal__container,
+.report-modal__comment,
+.report-modal__comment .setting-text__wrapper {
+  border-color: rgba(0, 0, 0, 0%) !important;
 }
 
 .drawer__inner__mastodon {
@@ -227,35 +474,47 @@ button.icon-button.disabled i.fa-retweet, button.icon-button.disabled i.fa-lock
 }
 
 /* misc */
-.column-link:hover, .dropdown-menu__item a:active, .dropdown-menu__item a:focus, .dropdown-menu__item a:hover, header strong.display-name__html {
+.column-link:hover,
+.dropdown-menu__item a:active,
+.dropdown-menu__item a:focus,
+.dropdown-menu__item a:hover,
+header strong.display-name__html {
   color: #fff !important;
 }
 
-.notification__filter-bar button.active, .account__section-headline .active {
+.notification__filter-bar button.active,
+.account__section-headline .active {
   border-bottom: 3px solid rgb(var(--accent-color));
 }
+
 .notification__filter-bar button:not(.active):hover {
   top: -3px;
 }
-.account__section-headline a.active::after, .account__section-headline a.active::before {
+
+.account__section-headline a.active::after,
+.account__section-headline a.active::before {
   display: none;
 }
 
 .account__header__extra__links a:hover {
   text-decoration: underline;
 }
-.account__section-headline a:hover, .confirmation-modal__cancel-button span {
+
+.account__section-headline a:hover,
+.confirmation-modal__cancel-button span {
   color: #fff;
 }
 
 .notification__filter-bar button.active::after {
   opacity: 0;
 }
+
 .notification__filter-bar button.active::before {
   opacity: 0;
 }
 
-.column-link__badge, .column-subheading {
+.column-link__badge,
+.column-subheading {
   background-color: rgb(var(--accent-color));
   animation-name: flash;
   animation-duration: 1s;
@@ -264,8 +523,13 @@ button.icon-button.disabled i.fa-retweet, button.icon-button.disabled i.fa-lock
 }
 
 @keyframes flash {
-  from {background-color: rgb(var(--accent-color));}
-  to {background-color: rgb(var(--accent-color-secondary));}
+  from {
+    background-color: rgb(var(--accent-color));
+  }
+
+  to {
+    background-color: rgb(var(--accent-color-secondary));
+  }
 }
 
 .reply-indicator {
@@ -273,55 +537,87 @@ button.icon-button.disabled i.fa-retweet, button.icon-button.disabled i.fa-lock
   overflow-y: hidden;
   transition: max-height 1s;
 }
+
 .reply-indicator:hover {
   max-height: 100%;
 }
-.reply-indicator:before {
+
+.reply-indicator::before {
   content: 'Replying to:';
   font-size: 12px;
   color: rgb(var(--text-color-secondary));
 }
 
-.getting-started__footer p:after {
+.getting-started__footer p::after {
   content: ' Oat was here';
 }
 
-
 /* public/static css */
+
 /* for pages like /@username */
 
 .public-layout .public-account-header__tabs__tabs .counter.active::after {
   border-bottom-color: rgb(var(--accent-color));
 }
+
 .public-layout .public-account-bio .account__header__fields a {
   color: rgb(var(--accent-color));
 }
+
 .public-layout .header .nav-button {
   color: #fff;
   background-color: rgb(var(--accent-color));
 }
-.public-layout .header .nav-button:active, .public-layout .header .nav-button:focus, .public-layout .header .nav-button:hover {
-  background-color: rgb(var(--accent-color-bright))
+
+.public-layout .header .nav-button:active,
+.public-layout .header .nav-button:focus,
+.public-layout .header .nav-button:hover {
+  background-color: rgb(var(--accent-color-bright));
 }
-.public-layout .activity-stream .entry, .hero-widget__text, .table-of-contents {
+
+.public-layout .activity-stream .entry,
+.hero-widget__text,
+.table-of-contents {
   background-color: rgb(var(--background-color));
 }
+
 body {
   background-color: rgb(var(--app-background-color));
 }
+
 .public-layout .public-account-header__tabs__tabs .counter {
   border-right: none;
 }
-.public-layout .public-account-bio, .public-layout .public-account-header__bar::before, .public-layout .header, .directory__tag > a, .directory__tag > div, .directory__tag > a:active, .directory__tag > a:focus, .directory__tag > a:hover, .public-layout .header .brand:hover, .landing-page__call-to-action, .box-widget {
+
+.public-layout .public-account-bio,
+.public-layout .public-account-header__bar::before,
+.public-layout .header,
+.directory__tag > a,
+.directory__tag > div,
+.directory__tag > a:active,
+.directory__tag > a:focus,
+.directory__tag > a:hover,
+.public-layout .header .brand:hover,
+.landing-page__call-to-action,
+.box-widget {
   background-color: rgb(var(--background-color-brighter));
 }
-.public-layout .display-name, .status__relative-time time, .status__relative-time {
+
+.public-layout .display-name,
+.status__relative-time time,
+.status__relative-time {
   color: rgb(var(--text-color-secondary));
 }
-.rich-formatting, .rich-formatting p {
+
+.rich-formatting,
+.rich-formatting p {
   color: rgb(var(--text-color));
 }
-.rich-formatting table tbody tr, .rich-formatting table thead tr, .notification-follow, .notification-follow-request {
+
+.rich-formatting table tbody tr,
+.rich-formatting table thead tr,
+.notification-follow,
+.notification-follow-request {
   border-bottom: none;
 }
 
@@ -329,4 +625,3 @@ body {
 .search-popout em {
   color: rgb(var(--accent-color)) !important;
 }
-

From 6da69967d0df35b04deb66192b6ecf960451c7b3 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 26 Jan 2024 15:09:45 +0100
Subject: [PATCH 0248/2191] [Glitch] Change compose form to use server-provided
 post character limit

Port 805dba7f8d2a2d5f910ec1396247b36417170345 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../glitch/features/compose/components/compose_form.jsx     | 6 +++---
 .../features/compose/containers/compose_form_container.js   | 1 +
 app/javascript/flavours/glitch/initial_state.js             | 2 --
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/javascript/flavours/glitch/features/compose/components/compose_form.jsx b/app/javascript/flavours/glitch/features/compose/components/compose_form.jsx
index ecadf211703efe..a09830d2c6eb84 100644
--- a/app/javascript/flavours/glitch/features/compose/components/compose_form.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/compose_form.jsx
@@ -15,7 +15,6 @@ import { WithOptionalRouterPropTypes, withOptionalRouter } from 'flavours/glitch
 import AutosuggestInput from '../../../components/autosuggest_input';
 import AutosuggestTextarea from '../../../components/autosuggest_textarea';
 import { Button } from '../../../components/button';
-import { maxChars } from '../../../initial_state';
 import EmojiPickerDropdown from '../containers/emoji_picker_dropdown_container';
 import LanguageDropdown from '../containers/language_dropdown_container';
 import PollButtonContainer from '../containers/poll_button_container';
@@ -81,6 +80,7 @@ class ComposeForm extends ImmutablePureComponent {
     isInReply: PropTypes.bool,
     singleColumn: PropTypes.bool,
     lang: PropTypes.string,
+    maxChars: PropTypes.number,
     ...WithOptionalRouterPropTypes
   };
 
@@ -116,7 +116,7 @@ class ComposeForm extends ImmutablePureComponent {
   };
 
   canSubmit = () => {
-    const { isSubmitting, isChangingUpload, isUploading, anyMedia } = this.props;
+    const { isSubmitting, isChangingUpload, isUploading, anyMedia, maxChars } = this.props;
     const fulltext = this.getFulltextForCharacterCounting();
     const isOnlyWhitespace = fulltext.length !== 0 && fulltext.trim().length === 0;
 
@@ -250,7 +250,7 @@ class ComposeForm extends ImmutablePureComponent {
   };
 
   render () {
-    const { intl, onPaste, autoFocus, withoutNavigation } = this.props;
+    const { intl, onPaste, autoFocus, withoutNavigation, maxChars } = this.props;
     const { highlighted } = this.state;
     const disabled = this.props.isSubmitting;
 
diff --git a/app/javascript/flavours/glitch/features/compose/containers/compose_form_container.js b/app/javascript/flavours/glitch/features/compose/containers/compose_form_container.js
index 6de24cc7067c4c..067621c84ba627 100644
--- a/app/javascript/flavours/glitch/features/compose/containers/compose_form_container.js
+++ b/app/javascript/flavours/glitch/features/compose/containers/compose_form_container.js
@@ -73,6 +73,7 @@ const mapStateToProps = state => ({
   sideArm: sideArmPrivacy(state),
   media: state.getIn(['compose', 'media_attachments']),
   mediaDescriptionConfirmation: state.getIn(['local_settings', 'confirm_missing_media_description']),
+  maxChars: state.getIn(['server', 'server', 'configuration', 'statuses', 'max_characters'], 500),
 });
 
 const mapDispatchToProps = (dispatch, { intl }) => ({
diff --git a/app/javascript/flavours/glitch/initial_state.js b/app/javascript/flavours/glitch/initial_state.js
index a281dbaf316c83..15f2673fa2b880 100644
--- a/app/javascript/flavours/glitch/initial_state.js
+++ b/app/javascript/flavours/glitch/initial_state.js
@@ -66,7 +66,6 @@ export const hasMultiColumnPath = initialPath === '/'
  * @property {boolean=} critical_updates_pending
  * @property {InitialStateMeta} meta
  * @property {object} local_settings
- * @property {number} max_toot_chars
  * @property {number} max_feed_hashtags
  * @property {number} poll_limits
  */
@@ -130,7 +129,6 @@ export const statusPageUrl = getMeta('status_page_url');
 export const sso_redirect = getMeta('sso_redirect');
 
 // Glitch-soc-specific settings
-export const maxChars = (initialState && initialState.max_toot_chars) || 500;
 export const maxFeedHashtags = (initialState && initialState.max_feed_hashtags) || 4;
 export const favouriteModal = getMeta('favourite_modal');
 export const pollLimits = (initialState && initialState.poll_limits);

From 47b5105e5dc95ba58f0b8964533acb85e7f54b4f Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Sat, 24 Feb 2024 13:58:00 +0100
Subject: [PATCH 0249/2191] Remove `max_toot_chars` from initial-state

This is still in `/api/v1/instance` for compatibility with other clients
---
 app/serializers/initial_state_serializer.rb | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/serializers/initial_state_serializer.rb b/app/serializers/initial_state_serializer.rb
index 4135d8ed39434a..05c5df2cd36ebd 100644
--- a/app/serializers/initial_state_serializer.rb
+++ b/app/serializers/initial_state_serializer.rb
@@ -5,7 +5,7 @@ class InitialStateSerializer < ActiveModel::Serializer
 
   attributes :meta, :compose, :accounts,
              :media_attachments, :settings,
-             :max_toot_chars, :max_feed_hashtags, :poll_limits,
+             :max_feed_hashtags, :poll_limits,
              :languages
 
   attribute :critical_updates_pending, if: -> { object&.role&.can?(:view_devops) && SoftwareUpdate.check_enabled? }
@@ -13,10 +13,6 @@ class InitialStateSerializer < ActiveModel::Serializer
   has_one :push_subscription, serializer: REST::WebPushSubscriptionSerializer
   has_one :role, serializer: REST::RoleSerializer
 
-  def max_toot_chars
-    StatusLengthValidator::MAX_CHARS
-  end
-
   def max_feed_hashtags
     TagFeed::LIMIT_PER_MODE
   end

From 9bdde6d6ea931281149b63b5b4d753f5b6afe640 Mon Sep 17 00:00:00 2001
From: Jeremy Kescher <jeremy@kescher.at>
Date: Sat, 24 Feb 2024 14:01:37 +0100
Subject: [PATCH 0250/2191] Remove old, contradicting "develop" notice now that
 CatCatNya~ is running on main, and all forks should only ever be based on
 main

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index 48ef5f0b9a3031..9ef1ae438b91e6 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,6 @@
 ## Introduction
 
 This Mastodon fork is based on the [glitch-soc Fork of Mastodon](https://github.com/glitch-soc/mastodon), with changes made to suit [CatCatNya~](https://catcatnya.com).
-The aforementioned instance is running the `develop` branch.
 I intend to contribute some useful differences back to [glitch-soc](https://github.com/glitch-soc/mastodon) and [vanilla Mastodon](https://github.com/mastodon/mastodon).
 
 To install, take a look at [glitch-soc.github.io/docs/](https://glitch-soc.github.io/docs/). The instructions and features are the same, except for the differences outlined below.

From 6e635a42836f60d7f5881cbdb8c24026756981ce Mon Sep 17 00:00:00 2001
From: Jeremy Kescher <jeremy@kescher.at>
Date: Sat, 24 Feb 2024 13:53:11 +0100
Subject: [PATCH 0251/2191] Clarify English locale

---
 config/locales/en.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/locales/en.yml b/config/locales/en.yml
index d0067ec8ea9d2d..84eb2470deb919 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -779,10 +779,10 @@ en:
           none: Nobody can sign up
           open: Anyone can sign up
       reject_blurhash:
-        desc_html: Set a blurhashes to inspect Create Activity media attachments, and refuse Activity if you match
+        desc_html: Blurhashes to compare against Create activities' media attachments. Matching activities will be rejected. Separated by newline.
         title: Reject blurhash
       reject_pattern:
-        desc_html: Set a regular expression pattern to inspect Create Activity content, and refuse Activity if you match
+        desc_html: Regular expression pattern to match against Create activities. Matching activities will be rejected. Must be a single pattern.
         title: Reject Pattern
       security:
         authorized_fetch: Require authentication from federated servers

From 78b0f1c6cbfa778f171a8f18360426e19cb6ab25 Mon Sep 17 00:00:00 2001
From: Jeremy Kescher <jeremy@kescher.at>
Date: Sat, 24 Feb 2024 14:06:52 +0100
Subject: [PATCH 0252/2191] Bump version

---
 lib/mastodon/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index d1b160b1899f0c..ee7ef9b452a03e 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -25,7 +25,7 @@ def prerelease
     end
 
     def catstodon_revision
-      '1.0.3'
+      '1.0.4'
     end
 
     def build_metadata

From 73de36318ec83991cfc1748ac709f06a782b6233 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Sat, 24 Feb 2024 14:10:05 +0100
Subject: [PATCH 0253/2191] Move `api/v1/timelines/direct` to request spec

---
 .../api/v1/timelines/direct_controller_spec.rb | 17 -----------------
 spec/requests/api/v1/timelines/direct_spec.rb  | 18 ++++++++++++++++++
 2 files changed, 18 insertions(+), 17 deletions(-)
 delete mode 100644 spec/controllers/api/v1/timelines/direct_controller_spec.rb
 create mode 100644 spec/requests/api/v1/timelines/direct_spec.rb

diff --git a/spec/controllers/api/v1/timelines/direct_controller_spec.rb b/spec/controllers/api/v1/timelines/direct_controller_spec.rb
deleted file mode 100644
index def67a0feae79a..00000000000000
--- a/spec/controllers/api/v1/timelines/direct_controller_spec.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-RSpec.describe Api::V1::Timelines::DirectController do
-  let(:user)  { Fabricate(:user) }
-  let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read:statuses') }
-
-  describe 'GET #show' do
-    it 'returns 200' do
-      allow(controller).to receive(:doorkeeper_token) { token }
-      get :show
-
-      expect(response).to have_http_status(200)
-    end
-  end
-end
diff --git a/spec/requests/api/v1/timelines/direct_spec.rb b/spec/requests/api/v1/timelines/direct_spec.rb
new file mode 100644
index 00000000000000..f882e4ccc59406
--- /dev/null
+++ b/spec/requests/api/v1/timelines/direct_spec.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'API V1 Direct Timeline' do
+  let(:user) { Fabricate(:user) }
+  let(:scopes)  { 'read:statuses' }
+  let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+  let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
+
+  describe 'GET /api/v1/timelines/direct' do
+    it 'returns 200' do
+      get '/api/v1/timelines/direct', headers: headers
+
+      expect(response).to have_http_status(200)
+    end
+  end
+end

From 4d6844eb2f488e0ffb6bc15c6b2e3fc04fd36cad Mon Sep 17 00:00:00 2001
From: J H <jh97uk@icloud.com>
Date: Tue, 30 Jan 2024 13:38:49 +0000
Subject: [PATCH 0254/2191] [Glitch] Fixed the toggle emoji dropdown bug

Port 1467f1e1e1c18dc4b310862ff1f719165a24cfb6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../features/compose/components/emoji_picker_dropdown.jsx    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/javascript/flavours/glitch/features/compose/components/emoji_picker_dropdown.jsx b/app/javascript/flavours/glitch/features/compose/components/emoji_picker_dropdown.jsx
index 0846468c4edc33..557f60e8073d3f 100644
--- a/app/javascript/flavours/glitch/features/compose/components/emoji_picker_dropdown.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/emoji_picker_dropdown.jsx
@@ -165,6 +165,7 @@ class EmojiPickerMenuImpl extends PureComponent {
     intl: PropTypes.object.isRequired,
     skinTone: PropTypes.number.isRequired,
     onSkinTone: PropTypes.func.isRequired,
+    pickerButtonRef: PropTypes.func.isRequired
   };
 
   static defaultProps = {
@@ -179,7 +180,7 @@ class EmojiPickerMenuImpl extends PureComponent {
   };
 
   handleDocumentClick = e => {
-    if (this.node && !this.node.contains(e.target)) {
+    if (this.node && !this.node.contains(e.target) && !this.props.pickerButtonRef.contains(e.target)) {
       this.props.onClose();
     }
   };
@@ -234,6 +235,7 @@ class EmojiPickerMenuImpl extends PureComponent {
       emoji.native = emoji.colons;
     }
     if (!(event.ctrlKey || event.metaKey)) {
+
       this.props.onClose();
     }
     this.props.onPick(emoji);
@@ -409,6 +411,7 @@ class EmojiPickerDropdown extends PureComponent {
                   onSkinTone={onSkinTone}
                   skinTone={skinTone}
                   frequentlyUsedEmojis={frequentlyUsedEmojis}
+                  pickerButtonRef={this.target}
                 />
               </div>
             </div>

From b4cca47f5f64765f2337b56f61e665c0440a0537 Mon Sep 17 00:00:00 2001
From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Wed, 31 Jan 2024 00:34:07 +0900
Subject: [PATCH 0255/2191] [Glitch] Remove unused l18n messages

Port b3075a9993bff1bfca18ada91fe5587e921781d5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/features/compose/components/poll_form.jsx   | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/javascript/flavours/glitch/features/compose/components/poll_form.jsx b/app/javascript/flavours/glitch/features/compose/components/poll_form.jsx
index 34b35088fc40c7..e757b9162a4c13 100644
--- a/app/javascript/flavours/glitch/features/compose/components/poll_form.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/poll_form.jsx
@@ -19,8 +19,6 @@ import { pollLimits } from 'flavours/glitch/initial_state';
 
 const messages = defineMessages({
   option_placeholder: { id: 'compose_form.poll.option_placeholder', defaultMessage: 'Option {number}' },
-  add_option: { id: 'compose_form.poll.add_option', defaultMessage: 'Add option' },
-  remove_option: { id: 'compose_form.poll.remove_option', defaultMessage: 'Remove this option' },
   duration: { id: 'compose_form.poll.duration', defaultMessage: 'Poll length' },
   type: { id: 'compose_form.poll.type', defaultMessage: 'Style' },
   switchToMultiple: { id: 'compose_form.poll.switch_to_multiple', defaultMessage: 'Change poll to allow multiple choices' },

From cce3f3d6da1da81de01b767f518f3b96dec86443 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 1 Feb 2024 14:37:04 +0100
Subject: [PATCH 0256/2191] [Glitch] Change onboarding prompt to follow
 suggestions carousel in web UI

Port 9cdc60ecc6e5746b706bdcf19d0743d1c153105f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/actions/suggestions.js    |   9 +-
 .../flavours/glitch/actions/timelines.js      |  21 ++
 .../glitch/components/status_list.jsx         |  51 +++--
 .../components/explore_prompt.tsx             |  46 ----
 .../components/inline_follow_suggestions.jsx  | 201 ++++++++++++++++++
 .../glitch/features/home_timeline/index.jsx   |  51 +----
 .../ui/containers/status_list_container.js    |   2 +-
 .../flavours/glitch/reducers/settings.js      |   2 +-
 .../flavours/glitch/reducers/suggestions.js   |   6 +-
 .../flavours/glitch/reducers/timelines.js     |  31 ++-
 .../flavours/glitch/styles/components.scss    | 196 +++++++++++++++++
 .../glitch/styles/mastodon-light/diff.scss    |  13 ++
 12 files changed, 496 insertions(+), 133 deletions(-)
 delete mode 100644 app/javascript/flavours/glitch/features/home_timeline/components/explore_prompt.tsx
 create mode 100644 app/javascript/flavours/glitch/features/home_timeline/components/inline_follow_suggestions.jsx

diff --git a/app/javascript/flavours/glitch/actions/suggestions.js b/app/javascript/flavours/glitch/actions/suggestions.js
index 870a311024d12f..8eafe38b21ae0e 100644
--- a/app/javascript/flavours/glitch/actions/suggestions.js
+++ b/app/javascript/flavours/glitch/actions/suggestions.js
@@ -54,12 +54,5 @@ export const dismissSuggestion = accountId => (dispatch, getState) => {
     id: accountId,
   });
 
-  api(getState).delete(`/api/v1/suggestions/${accountId}`).then(() => {
-    dispatch(fetchSuggestionsRequest());
-
-    api(getState).get('/api/v2/suggestions').then(response => {
-      dispatch(importFetchedAccounts(response.data.map(x => x.account)));
-      dispatch(fetchSuggestionsSuccess(response.data));
-    }).catch(error => dispatch(fetchSuggestionsFail(error)));
-  }).catch(() => {});
+  api(getState).delete(`/api/v1/suggestions/${accountId}`).catch(() => {});
 };
diff --git a/app/javascript/flavours/glitch/actions/timelines.js b/app/javascript/flavours/glitch/actions/timelines.js
index fa69bca985b28d..980b4af66dfd60 100644
--- a/app/javascript/flavours/glitch/actions/timelines.js
+++ b/app/javascript/flavours/glitch/actions/timelines.js
@@ -22,6 +22,10 @@ export const TIMELINE_DISCONNECT   = 'TIMELINE_DISCONNECT';
 export const TIMELINE_CONNECT      = 'TIMELINE_CONNECT';
 
 export const TIMELINE_MARK_AS_PARTIAL = 'TIMELINE_MARK_AS_PARTIAL';
+export const TIMELINE_INSERT          = 'TIMELINE_INSERT';
+
+export const TIMELINE_SUGGESTIONS = 'inline-follow-suggestions';
+export const TIMELINE_GAP = null;
 
 export const loadPending = timeline => ({
   type: TIMELINE_LOAD_PENDING,
@@ -123,9 +127,19 @@ export function expandTimeline(timelineId, path, params = {}, done = noOp) {
 
     api(getState).get(path, { params }).then(response => {
       const next = getLinks(response).refs.find(link => link.rel === 'next');
+
       dispatch(importFetchedStatuses(response.data));
       dispatch(expandTimelineSuccess(timelineId, response.data, next ? next.uri : null, response.status === 206, isLoadingRecent, isLoadingMore, isLoadingRecent && preferPendingItems));
 
+      if (timelineId === 'home' && !isLoadingMore && !isLoadingRecent) {
+        const now = new Date();
+        const fittingIndex = response.data.findIndex(status => now - (new Date(status.created_at)) > 4 * 3600 * 1000);
+
+        if (fittingIndex !== -1) {
+          dispatch(insertIntoTimeline(timelineId, TIMELINE_SUGGESTIONS, Math.max(1, fittingIndex)));
+        }
+      }
+
       if (timelineId === 'home') {
         dispatch(submitMarkers());
       }
@@ -233,3 +247,10 @@ export const markAsPartial = timeline => ({
   type: TIMELINE_MARK_AS_PARTIAL,
   timeline,
 });
+
+export const insertIntoTimeline = (timeline, key, index) => ({
+  type: TIMELINE_INSERT,
+  timeline,
+  index,
+  key,
+});
diff --git a/app/javascript/flavours/glitch/components/status_list.jsx b/app/javascript/flavours/glitch/components/status_list.jsx
index 87825839e54cae..dde8bd9663ed63 100644
--- a/app/javascript/flavours/glitch/components/status_list.jsx
+++ b/app/javascript/flavours/glitch/components/status_list.jsx
@@ -5,7 +5,9 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
 
 import { debounce } from 'lodash';
 
+import { TIMELINE_GAP, TIMELINE_SUGGESTIONS } from 'flavours/glitch/actions/timelines';
 import RegenerationIndicator from 'flavours/glitch/components/regeneration_indicator';
+import { InlineFollowSuggestions } from 'flavours/glitch/features/home_timeline/components/inline_follow_suggestions';
 
 import StatusContainer from '../containers/status_container';
 
@@ -92,24 +94,37 @@ export default class StatusList extends ImmutablePureComponent {
     }
 
     let scrollableContent = (isLoading || statusIds.size > 0) ? (
-      statusIds.map((statusId, index) => statusId === null ? (
-        <LoadGap
-          key={'gap:' + statusIds.get(index + 1)}
-          disabled={isLoading}
-          maxId={index > 0 ? statusIds.get(index - 1) : null}
-          onClick={onLoadMore}
-        />
-      ) : (
-        <StatusContainer
-          key={statusId}
-          id={statusId}
-          onMoveUp={this.handleMoveUp}
-          onMoveDown={this.handleMoveDown}
-          contextType={timelineId}
-          scrollKey={this.props.scrollKey}
-          withCounters={this.props.withCounters}
-        />
-      ))
+      statusIds.map((statusId, index) => {
+        switch(statusId) {
+        case TIMELINE_SUGGESTIONS:
+          return (
+            <InlineFollowSuggestions
+              key='inline-follow-suggestions'
+            />
+          );
+        case TIMELINE_GAP:
+          return (
+            <LoadGap
+              key={'gap:' + statusIds.get(index + 1)}
+              disabled={isLoading}
+              maxId={index > 0 ? statusIds.get(index - 1) : null}
+              onClick={onLoadMore}
+            />
+          );
+        default:
+          return (
+            <StatusContainer
+              key={statusId}
+              id={statusId}
+              onMoveUp={this.handleMoveUp}
+              onMoveDown={this.handleMoveDown}
+              contextType={timelineId}
+              scrollKey={this.props.scrollKey}
+              withCounters={this.props.withCounters}
+            />
+          );
+        }
+      })
     ) : null;
 
     if (scrollableContent && featuredStatusIds) {
diff --git a/app/javascript/flavours/glitch/features/home_timeline/components/explore_prompt.tsx b/app/javascript/flavours/glitch/features/home_timeline/components/explore_prompt.tsx
deleted file mode 100644
index 73ef8a5fe1cc6e..00000000000000
--- a/app/javascript/flavours/glitch/features/home_timeline/components/explore_prompt.tsx
+++ /dev/null
@@ -1,46 +0,0 @@
-import { FormattedMessage } from 'react-intl';
-
-import { Link } from 'react-router-dom';
-
-import background from '@/images/friends-cropped.png';
-import { DismissableBanner } from 'flavours/glitch/components/dismissable_banner';
-
-export const ExplorePrompt = () => (
-  <DismissableBanner id='home.explore_prompt'>
-    <img
-      src={background}
-      alt=''
-      className='dismissable-banner__background-image'
-    />
-
-    <h1>
-      <FormattedMessage
-        id='home.explore_prompt.title'
-        defaultMessage='This is your home base within Mastodon.'
-      />
-    </h1>
-    <p>
-      <FormattedMessage
-        id='home.explore_prompt.body'
-        defaultMessage="Your home feed will have a mix of posts from the hashtags you've chosen to follow, the people you've chosen to follow, and the posts they boost. If that feels too quiet, you may want to:"
-      />
-    </p>
-
-    <div className='dismissable-banner__message__wrapper'>
-      <div className='dismissable-banner__message__actions'>
-        <Link to='/explore' className='button'>
-          <FormattedMessage
-            id='home.actions.go_to_explore'
-            defaultMessage="See what's trending"
-          />
-        </Link>
-        <Link to='/explore/suggestions' className='button button-tertiary'>
-          <FormattedMessage
-            id='home.actions.go_to_suggestions'
-            defaultMessage='Find people to follow'
-          />
-        </Link>
-      </div>
-    </div>
-  </DismissableBanner>
-);
diff --git a/app/javascript/flavours/glitch/features/home_timeline/components/inline_follow_suggestions.jsx b/app/javascript/flavours/glitch/features/home_timeline/components/inline_follow_suggestions.jsx
new file mode 100644
index 00000000000000..673b2d14d600b2
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/home_timeline/components/inline_follow_suggestions.jsx
@@ -0,0 +1,201 @@
+import PropTypes from 'prop-types';
+import { useEffect, useCallback, useRef, useState } from 'react';
+
+import { FormattedMessage, useIntl, defineMessages } from 'react-intl';
+
+import { Link } from 'react-router-dom';
+
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import { useDispatch, useSelector } from 'react-redux';
+
+import ChevronLeftIcon from '@/material-icons/400-24px/chevron_left.svg?react';
+import ChevronRightIcon from '@/material-icons/400-24px/chevron_right.svg?react';
+import CloseIcon from '@/material-icons/400-24px/close.svg?react';
+import InfoIcon from '@/material-icons/400-24px/info.svg?react';
+import { followAccount, unfollowAccount } from 'flavours/glitch/actions/accounts';
+import { changeSetting } from 'flavours/glitch/actions/settings';
+import { fetchSuggestions, dismissSuggestion } from 'flavours/glitch/actions/suggestions';
+import { Avatar } from 'flavours/glitch/components/avatar';
+import { Button } from 'flavours/glitch/components/button';
+import { DisplayName } from 'flavours/glitch/components/display_name';
+import { Icon } from 'flavours/glitch/components/icon';
+import { IconButton } from 'flavours/glitch/components/icon_button';
+import { VerifiedBadge } from 'flavours/glitch/components/verified_badge';
+
+const messages = defineMessages({
+  follow: { id: 'account.follow', defaultMessage: 'Follow' },
+  unfollow: { id: 'account.unfollow', defaultMessage: 'Unfollow' },
+  previous: { id: 'lightbox.previous', defaultMessage: 'Previous' },
+  next: { id: 'lightbox.next', defaultMessage: 'Next' },
+  dismiss: { id: 'follow_suggestions.dismiss', defaultMessage: "Don't show again" },
+});
+
+const Source = ({ id }) => {
+  let label;
+
+  switch (id) {
+  case 'friends_of_friends':
+  case 'similar_to_recently_followed':
+    label = <FormattedMessage id='follow_suggestions.personalized_suggestion' defaultMessage='Personalized suggestion' />;
+    break;
+  case 'featured':
+    label = <FormattedMessage id='follow_suggestions.curated_suggestion' defaultMessage="Editors' Choice" />;
+    break;
+  case 'most_followed':
+  case 'most_interactions':
+    label = <FormattedMessage id='follow_suggestions.popular_suggestion' defaultMessage='Popular suggestion' />;
+    break;
+  }
+
+  return (
+    <div className='inline-follow-suggestions__body__scrollable__card__text-stack__source'>
+      <Icon icon={InfoIcon} />
+      {label}
+    </div>
+  );
+};
+
+Source.propTypes = {
+  id: PropTypes.oneOf(['friends_of_friends', 'similar_to_recently_followed', 'featured', 'most_followed', 'most_interactions']),
+};
+
+const Card = ({ id, source }) => {
+  const intl = useIntl();
+  const account = useSelector(state => state.getIn(['accounts', id]));
+  const relationship = useSelector(state => state.getIn(['relationships', id]));
+  const firstVerifiedField = account.get('fields').find(item => !!item.get('verified_at'));
+  const dispatch = useDispatch();
+  const following = relationship?.get('following') ?? relationship?.get('requested');
+
+  const handleFollow = useCallback(() => {
+    if (following) {
+      dispatch(unfollowAccount(id));
+    } else {
+      dispatch(followAccount(id));
+    }
+  }, [id, following, dispatch]);
+
+  const handleDismiss = useCallback(() => {
+    dispatch(dismissSuggestion(id));
+  }, [id, dispatch]);
+
+  return (
+    <div className='inline-follow-suggestions__body__scrollable__card'>
+      <IconButton iconComponent={CloseIcon} onClick={handleDismiss} title={intl.formatMessage(messages.dismiss)} />
+
+      <div className='inline-follow-suggestions__body__scrollable__card__avatar'>
+        <Link to={`/@${account.get('acct')}`}><Avatar account={account} size={72} /></Link>
+      </div>
+
+      <div className='inline-follow-suggestions__body__scrollable__card__text-stack'>
+        <Link to={`/@${account.get('acct')}`}><DisplayName account={account} /></Link>
+        {firstVerifiedField ? <VerifiedBadge link={firstVerifiedField.get('value')} /> : <Source id={source.get(0)} />}
+      </div>
+
+      <Button text={intl.formatMessage(following ? messages.unfollow : messages.follow)} onClick={handleFollow} />
+    </div>
+  );
+};
+
+Card.propTypes = {
+  id: PropTypes.string.isRequired,
+  source: ImmutablePropTypes.list,
+};
+
+const DISMISSIBLE_ID = 'home/follow-suggestions';
+
+export const InlineFollowSuggestions = ({ hidden }) => {
+  const intl = useIntl();
+  const dispatch = useDispatch();
+  const suggestions = useSelector(state => state.getIn(['suggestions', 'items']));
+  const isLoading = useSelector(state => state.getIn(['suggestions', 'isLoading']));
+  const dismissed = useSelector(state => state.getIn(['settings', 'dismissed_banners', DISMISSIBLE_ID]));
+  const bodyRef = useRef();
+  const [canScrollLeft, setCanScrollLeft] = useState(false);
+  const [canScrollRight, setCanScrollRight] = useState(true);
+
+  useEffect(() => {
+    dispatch(fetchSuggestions());
+  }, [dispatch]);
+
+  useEffect(() => {
+    if (!bodyRef.current) {
+      return;
+    }
+
+    setCanScrollLeft(bodyRef.current.scrollLeft > 0);
+    setCanScrollRight((bodyRef.current.scrollLeft + bodyRef.current.clientWidth) < bodyRef.current.scrollWidth);
+  }, [setCanScrollRight, setCanScrollLeft, bodyRef, suggestions]);
+
+  const handleLeftNav = useCallback(() => {
+    bodyRef.current.scrollLeft -= 200;
+  }, [bodyRef]);
+
+  const handleRightNav = useCallback(() => {
+    bodyRef.current.scrollLeft += 200;
+  }, [bodyRef]);
+
+  const handleScroll = useCallback(() => {
+    if (!bodyRef.current) {
+      return;
+    }
+
+    setCanScrollLeft(bodyRef.current.scrollLeft > 0);
+    setCanScrollRight((bodyRef.current.scrollLeft + bodyRef.current.clientWidth) < bodyRef.current.scrollWidth);
+  }, [setCanScrollRight, setCanScrollLeft, bodyRef]);
+
+  const handleDismiss = useCallback(() => {
+    dispatch(changeSetting(['dismissed_banners', DISMISSIBLE_ID], true));
+  }, [dispatch]);
+
+  if (dismissed || (!isLoading && suggestions.isEmpty())) {
+    return null;
+  }
+
+  if (hidden) {
+    return (
+      <div className='inline-follow-suggestions' />
+    );
+  }
+
+  return (
+    <div className='inline-follow-suggestions'>
+      <div className='inline-follow-suggestions__header'>
+        <h3><FormattedMessage id='follow_suggestions.who_to_follow' defaultMessage='Who to follow' /></h3>
+
+        <div className='inline-follow-suggestions__header__actions'>
+          <button className='link-button' onClick={handleDismiss}><FormattedMessage id='follow_suggestions.dismiss' defaultMessage="Don't show again" /></button>
+          <Link to='/explore/suggestions' className='link-button'><FormattedMessage id='follow_suggestions.view_all' defaultMessage='View all' /></Link>
+        </div>
+      </div>
+
+      <div className='inline-follow-suggestions__body'>
+        <div className='inline-follow-suggestions__body__scrollable' ref={bodyRef} onScroll={handleScroll}>
+          {suggestions.map(suggestion => (
+            <Card
+              key={suggestion.get('account')}
+              id={suggestion.get('account')}
+              source={suggestion.get('source')}
+            />
+          ))}
+        </div>
+
+        {canScrollLeft && (
+          <button className='inline-follow-suggestions__body__scroll-button left' onClick={handleLeftNav} aria-label={intl.formatMessage(messages.previous)}>
+            <div className='inline-follow-suggestions__body__scroll-button__icon'><Icon icon={ChevronLeftIcon} /></div>
+          </button>
+        )}
+
+        {canScrollRight && (
+          <button className='inline-follow-suggestions__body__scroll-button right' onClick={handleRightNav} aria-label={intl.formatMessage(messages.next)}>
+            <div className='inline-follow-suggestions__body__scroll-button__icon'><Icon icon={ChevronRightIcon} /></div>
+          </button>
+        )}
+      </div>
+    </div>
+  );
+};
+
+InlineFollowSuggestions.propTypes = {
+  hidden: PropTypes.bool,
+};
diff --git a/app/javascript/flavours/glitch/features/home_timeline/index.jsx b/app/javascript/flavours/glitch/features/home_timeline/index.jsx
index 093d8a7602ff15..f383a6e48cb08b 100644
--- a/app/javascript/flavours/glitch/features/home_timeline/index.jsx
+++ b/app/javascript/flavours/glitch/features/home_timeline/index.jsx
@@ -6,8 +6,6 @@ import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
 import classNames from 'classnames';
 import { Helmet } from 'react-helmet';
 
-import { createSelector } from '@reduxjs/toolkit';
-import { List as ImmutableList } from 'immutable';
 import { connect } from 'react-redux';
 
 
@@ -17,7 +15,7 @@ import { fetchAnnouncements, toggleShowAnnouncements } from 'flavours/glitch/act
 import { IconWithBadge } from 'flavours/glitch/components/icon_with_badge';
 import { NotSignedInIndicator } from 'flavours/glitch/components/not_signed_in_indicator';
 import AnnouncementsContainer from 'flavours/glitch/features/getting_started/containers/announcements_container';
-import { me, criticalUpdatesPending } from 'flavours/glitch/initial_state';
+import { criticalUpdatesPending } from 'flavours/glitch/initial_state';
 
 import { addColumn, removeColumn, moveColumn } from '../../actions/columns';
 import { expandHomeTimeline } from '../../actions/timelines';
@@ -27,7 +25,6 @@ import StatusListContainer from '../ui/containers/status_list_container';
 
 import { ColumnSettings } from './components/column_settings';
 import { CriticalUpdateBanner } from './components/critical_update_banner';
-import { ExplorePrompt } from './components/explore_prompt';
 
 const messages = defineMessages({
   title: { id: 'column.home', defaultMessage: 'Home' },
@@ -35,51 +32,12 @@ const messages = defineMessages({
   hide_announcements: { id: 'home.hide_announcements', defaultMessage: 'Hide announcements' },
 });
 
-const getHomeFeedSpeed = createSelector([
-  state => state.getIn(['timelines', 'home', 'items'], ImmutableList()),
-  state => state.getIn(['timelines', 'home', 'pendingItems'], ImmutableList()),
-  state => state.get('statuses'),
-], (statusIds, pendingStatusIds, statusMap) => {
-  const recentStatusIds = pendingStatusIds.concat(statusIds);
-  const statuses = recentStatusIds.filter(id => id !== null).map(id => statusMap.get(id)).filter(status => status?.get('account') !== me).take(20);
-
-  if (statuses.isEmpty()) {
-    return {
-      gap: 0,
-      newest: new Date(0),
-    };
-  }
-
-  const datetimes = statuses.map(status => status.get('created_at', 0));
-  const oldest = new Date(datetimes.min());
-  const newest = new Date(datetimes.max());
-  const averageGap = (newest - oldest) / (1000 * (statuses.size + 1)); // Average gap between posts on first page in seconds
-
-  return {
-    gap: averageGap,
-    newest,
-  };
-});
-
-const homeTooSlow = createSelector([
-  state => state.getIn(['timelines', 'home', 'isLoading']),
-  state => state.getIn(['timelines', 'home', 'isPartial']),
-  getHomeFeedSpeed,
-], (isLoading, isPartial, speed) =>
-  !isLoading && !isPartial // Only if the home feed has finished loading
-  && (
-    (speed.gap > (30 * 60) // If the average gap between posts is more than 30 minutes
-    || (Date.now() - speed.newest) > (1000 * 3600)) // If the most recent post is from over an hour ago
-  )
-);
-
 const mapStateToProps = state => ({
   hasUnread: state.getIn(['timelines', 'home', 'unread']) > 0,
   isPartial: state.getIn(['timelines', 'home', 'isPartial']),
   hasAnnouncements: !state.getIn(['announcements', 'items']).isEmpty(),
   unreadAnnouncements: state.getIn(['announcements', 'items']).count(item => !item.get('read')),
   showAnnouncements: state.getIn(['announcements', 'show']),
-  tooSlow: homeTooSlow(state),
   regex: state.getIn(['settings', 'home', 'regex', 'body']),
 });
 
@@ -99,7 +57,6 @@ class HomeTimeline extends PureComponent {
     hasAnnouncements: PropTypes.bool,
     unreadAnnouncements: PropTypes.number,
     showAnnouncements: PropTypes.bool,
-    tooSlow: PropTypes.bool,
     regex: PropTypes.string,
   };
 
@@ -170,7 +127,7 @@ class HomeTimeline extends PureComponent {
   };
 
   render () {
-    const { intl, hasUnread, columnId, multiColumn, tooSlow, hasAnnouncements, unreadAnnouncements, showAnnouncements } = this.props;
+    const { intl, hasUnread, columnId, multiColumn, hasAnnouncements, unreadAnnouncements, showAnnouncements } = this.props;
     const pinned = !!columnId;
     const { signedIn } = this.context.identity;
     const banners = [];
@@ -194,10 +151,6 @@ class HomeTimeline extends PureComponent {
       banners.push(<CriticalUpdateBanner key='critical-update-banner' />);
     }
 
-    if (tooSlow) {
-      banners.push(<ExplorePrompt key='explore-prompt' />);
-    }
-
     return (
       <Column bindToDocument={!multiColumn} ref={this.setRef} label={intl.formatMessage(messages.title)}>
         <ColumnHeader
diff --git a/app/javascript/flavours/glitch/features/ui/containers/status_list_container.js b/app/javascript/flavours/glitch/features/ui/containers/status_list_container.js
index 7d31240d8faeb0..2d36262be2919f 100644
--- a/app/javascript/flavours/glitch/features/ui/containers/status_list_container.js
+++ b/app/javascript/flavours/glitch/features/ui/containers/status_list_container.js
@@ -28,7 +28,7 @@ const makeGetStatusIds = (pending = false) => createSelector([
   getRegex,
 ], (columnSettings, statusIds, statuses, regex) => {
   return statusIds.filter(id => {
-    if (id === null) return true;
+    if (id === null || id === 'inline-follow-suggestions') return true;
 
     const statusForId = statuses.get(id);
     let showStatus    = true;
diff --git a/app/javascript/flavours/glitch/reducers/settings.js b/app/javascript/flavours/glitch/reducers/settings.js
index a1b2434cdbb666..59b2e5dd408628 100644
--- a/app/javascript/flavours/glitch/reducers/settings.js
+++ b/app/javascript/flavours/glitch/reducers/settings.js
@@ -114,7 +114,7 @@ const initialState = ImmutableMap({
   dismissed_banners: ImmutableMap({
     'public_timeline': false,
     'community_timeline': false,
-    'home.explore_prompt': false,
+    'home/follow-suggestions': false,
     'explore/links': false,
     'explore/statuses': false,
     'explore/tags': false,
diff --git a/app/javascript/flavours/glitch/reducers/suggestions.js b/app/javascript/flavours/glitch/reducers/suggestions.js
index 03a7c80cf539b1..dc5dfc24553772 100644
--- a/app/javascript/flavours/glitch/reducers/suggestions.js
+++ b/app/javascript/flavours/glitch/reducers/suggestions.js
@@ -28,12 +28,12 @@ export default function suggestionsReducer(state = initialState, action) {
   case SUGGESTIONS_FETCH_FAIL:
     return state.set('isLoading', false);
   case SUGGESTIONS_DISMISS:
-    return state.update('items', list => list.filterNot(x => x.account === action.id));
+    return state.update('items', list => list.filterNot(x => x.get('account') === action.id));
   case blockAccountSuccess.type:
   case muteAccountSuccess.type:
-    return state.update('items', list => list.filterNot(x => x.account === action.payload.relationship.id));
+    return state.update('items', list => list.filterNot(x => x.get('account') === action.payload.relationship.id));
   case blockDomainSuccess.type:
-    return state.update('items', list => list.filterNot(x => action.payload.accounts.includes(x.account)));
+    return state.update('items', list => list.filterNot(x => action.payload.accounts.includes(x.get('account'))));
   default:
     return state;
   }
diff --git a/app/javascript/flavours/glitch/reducers/timelines.js b/app/javascript/flavours/glitch/reducers/timelines.js
index 6ff83aa7f0f662..08c7a483369e89 100644
--- a/app/javascript/flavours/glitch/reducers/timelines.js
+++ b/app/javascript/flavours/glitch/reducers/timelines.js
@@ -17,6 +17,9 @@ import {
   TIMELINE_DISCONNECT,
   TIMELINE_LOAD_PENDING,
   TIMELINE_MARK_AS_PARTIAL,
+  TIMELINE_INSERT,
+  TIMELINE_GAP,
+  TIMELINE_SUGGESTIONS,
 } from '../actions/timelines';
 import { compareId } from '../compare_id';
 
@@ -32,6 +35,8 @@ const initialTimeline = ImmutableMap({
   items: ImmutableList(),
 });
 
+const isPlaceholder = value => value === TIMELINE_GAP || value === TIMELINE_SUGGESTIONS;
+
 const expandNormalizedTimeline = (state, timeline, statuses, next, isPartial, isLoadingRecent, usePendingItems) => {
   // This method is pretty tricky because:
   // - existing items in the timeline might be out of order
@@ -63,20 +68,20 @@ const expandNormalizedTimeline = (state, timeline, statuses, next, isPartial, is
         // First, find the furthest (if properly sorted, oldest) item in the timeline that is
         // newer than the oldest fetched one, as it's most likely that it delimits the gap.
         // Start the gap *after* that item.
-        const lastIndex = oldIds.findLastIndex(id => id !== null && compareId(id, newIds.last()) >= 0) + 1;
+        const lastIndex = oldIds.findLastIndex(id => !isPlaceholder(id) && compareId(id, newIds.last()) >= 0) + 1;
 
         // Then, try to find the furthest (if properly sorted, oldest) item in the timeline that
         // is newer than the most recent fetched one, as it delimits a section comprised of only
         // items older or within `newIds` (or that were deleted from the server, so should be removed
         // anyway).
         // Stop the gap *after* that item.
-        const firstIndex = oldIds.take(lastIndex).findLastIndex(id => id !== null && compareId(id, newIds.first()) > 0) + 1;
+        const firstIndex = oldIds.take(lastIndex).findLastIndex(id => !isPlaceholder(id) && compareId(id, newIds.first()) > 0) + 1;
 
         let insertedIds = ImmutableOrderedSet(newIds).withMutations(insertedIds => {
           // It is possible, though unlikely, that the slice we are replacing contains items older
           // than the elements we got from the API. Get them and add them back at the back of the
           // slice.
-          const olderIds = oldIds.slice(firstIndex, lastIndex).filter(id => id !== null && compareId(id, newIds.last()) < 0);
+          const olderIds = oldIds.slice(firstIndex, lastIndex).filter(id => !isPlaceholder(id) && compareId(id, newIds.last()) < 0);
           insertedIds.union(olderIds);
 
           // Make sure we aren't inserting duplicates
@@ -84,8 +89,8 @@ const expandNormalizedTimeline = (state, timeline, statuses, next, isPartial, is
         }).toList();
 
         // Finally, insert a gap marker if the data is marked as partial by the server
-        if (isPartial && (firstIndex === 0 || oldIds.get(firstIndex - 1) !== null)) {
-          insertedIds = insertedIds.unshift(null);
+        if (isPartial && (firstIndex === 0 || oldIds.get(firstIndex - 1) !== TIMELINE_GAP)) {
+          insertedIds = insertedIds.unshift(TIMELINE_GAP);
         }
 
         return oldIds.take(firstIndex).concat(
@@ -184,7 +189,7 @@ const reconnectTimeline = (state, usePendingItems) => {
   }
 
   return state.withMutations(mMap => {
-    mMap.update(usePendingItems ? 'pendingItems' : 'items', items => items.first() ? items.unshift(null) : items);
+    mMap.update(usePendingItems ? 'pendingItems' : 'items', items => items.first() ? items.unshift(TIMELINE_GAP) : items);
     mMap.set('online', true);
   });
 };
@@ -219,7 +224,7 @@ export default function timelines(state = initialState, action) {
     return state.update(
       action.timeline,
       initialTimeline,
-      map => map.set('online', false).update(action.usePendingItems ? 'pendingItems' : 'items', items => items.first() ? items.unshift(null) : items),
+      map => map.set('online', false).update(action.usePendingItems ? 'pendingItems' : 'items', items => items.first() ? items.unshift(TIMELINE_GAP) : items),
     );
   case TIMELINE_MARK_AS_PARTIAL:
     return state.update(
@@ -227,6 +232,18 @@ export default function timelines(state = initialState, action) {
       initialTimeline,
       map => map.set('isPartial', true).set('items', ImmutableList()).set('pendingItems', ImmutableList()).set('unread', 0),
     );
+  case TIMELINE_INSERT:
+    return state.update(
+      action.timeline,
+      initialTimeline,
+      map => map.update('items', ImmutableList(), list => {
+        if (!list.includes(action.key)) {
+          return list.insert(action.index, action.key);
+        }
+
+        return list;
+      })
+    );
   default:
     return state;
   }
diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index ac3e4c99e6997f..e9e78c9f6c44cc 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -10048,3 +10048,199 @@ noscript {
     padding: 0;
   }
 }
+
+.inline-follow-suggestions {
+  display: flex;
+  flex-direction: column;
+  gap: 12px;
+  padding: 16px 0;
+  border-bottom: 1px solid mix($ui-base-color, $ui-highlight-color, 75%);
+  background: mix($ui-base-color, $ui-highlight-color, 95%);
+
+  &__header {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 16px;
+
+    h3 {
+      font-size: 15px;
+      line-height: 22px;
+      font-weight: 500;
+    }
+
+    &__actions {
+      display: flex;
+      align-items: center;
+      gap: 24px;
+    }
+
+    .link-button {
+      font-size: 13px;
+      font-weight: 500;
+    }
+  }
+
+  &__body {
+    position: relative;
+
+    &__scroll-button {
+      position: absolute;
+      height: 100%;
+      background: transparent;
+      border: none;
+      cursor: pointer;
+      top: 0;
+      color: $primary-text-color;
+
+      &.left {
+        left: 0;
+      }
+
+      &.right {
+        right: 0;
+      }
+
+      &__icon {
+        border-radius: 50%;
+        background: $ui-highlight-color;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        aspect-ratio: 1;
+        padding: 8px;
+
+        .icon {
+          width: 24px;
+          height: 24px;
+        }
+      }
+
+      &:hover,
+      &:focus,
+      &:active {
+        .inline-follow-suggestions__body__scroll-button__icon {
+          background: lighten($ui-highlight-color, 4%);
+        }
+      }
+    }
+
+    &__scrollable {
+      display: flex;
+      flex-wrap: nowrap;
+      gap: 16px;
+      padding: 16px;
+      padding-bottom: 0;
+      scroll-snap-type: x mandatory;
+      scroll-padding: 16px;
+      scroll-behavior: smooth;
+      overflow-x: hidden;
+
+      &__card {
+        background: darken($ui-base-color, 4%);
+        border: 1px solid lighten($ui-base-color, 8%);
+        border-radius: 4px;
+        display: flex;
+        flex-direction: column;
+        gap: 12px;
+        align-items: center;
+        padding: 12px;
+        scroll-snap-align: start;
+        flex: 0 0 auto;
+        width: 200px;
+        box-sizing: border-box;
+        position: relative;
+
+        a {
+          text-decoration: none;
+        }
+
+        & > .icon-button {
+          position: absolute;
+          inset-inline-end: 8px;
+          top: 8px;
+        }
+
+        &__avatar {
+          height: 48px;
+          display: flex;
+
+          a {
+            display: flex;
+            text-decoration: none;
+          }
+        }
+
+        .account__avatar {
+          flex-shrink: 0;
+          align-self: flex-end;
+          border: 1px solid lighten($ui-base-color, 8%);
+          background-color: $ui-base-color;
+        }
+
+        &__text-stack {
+          display: flex;
+          flex-direction: column;
+          gap: 4px;
+          align-items: center;
+          max-width: 100%;
+
+          a {
+            max-width: 100%;
+          }
+
+          &__source {
+            display: inline-flex;
+            align-items: center;
+            color: $dark-text-color;
+            gap: 4px;
+            overflow: hidden;
+            white-space: nowrap;
+
+            > span {
+              overflow: hidden;
+              text-overflow: ellipsis;
+            }
+
+            .icon {
+              width: 16px;
+              height: 16px;
+            }
+          }
+        }
+
+        .display-name {
+          display: flex;
+          flex-direction: column;
+          gap: 4px;
+          align-items: center;
+
+          & > * {
+            max-width: 100%;
+          }
+
+          &__html {
+            font-size: 15px;
+            font-weight: 500;
+            color: $secondary-text-color;
+          }
+
+          &__account {
+            font-size: 14px;
+            color: $darker-text-color;
+          }
+        }
+
+        .verified-badge {
+          font-size: 14px;
+          max-width: 100%;
+        }
+
+        .button {
+          display: block;
+          width: 100%;
+        }
+      }
+    }
+  }
+}
diff --git a/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss b/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss
index 1025a1bbaa6f70..6bf4a1e48899a9 100644
--- a/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss
+++ b/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss
@@ -648,3 +648,16 @@ html {
 .poll__option input[type='text'] {
   background: darken($ui-base-color, 10%);
 }
+
+.inline-follow-suggestions {
+  background-color: rgba($ui-highlight-color, 0.1);
+  border-bottom-color: rgba($ui-highlight-color, 0.3);
+}
+
+.inline-follow-suggestions__body__scrollable__card {
+  background: $white;
+}
+
+.inline-follow-suggestions__body__scroll-button__icon {
+  color: $white;
+}

From 38946742007d94f561b338f1d57cada76cbd752f Mon Sep 17 00:00:00 2001
From: "y.takahashi" <eai@mizle.net>
Date: Fri, 2 Feb 2024 15:33:53 +0900
Subject: [PATCH 0257/2191] [Glitch] Fix 'focus the compose textarea' shortcut
 is not working

Port 3c315a68afdb3b6ea1bc66b66bc7dcd49a335a08 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/features/ui/index.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/flavours/glitch/features/ui/index.jsx b/app/javascript/flavours/glitch/features/ui/index.jsx
index b10bd042195ebd..88829662136c3b 100644
--- a/app/javascript/flavours/glitch/features/ui/index.jsx
+++ b/app/javascript/flavours/glitch/features/ui/index.jsx
@@ -483,7 +483,7 @@ class UI extends PureComponent {
   handleHotkeyNew = e => {
     e.preventDefault();
 
-    const element = this.node.querySelector('.compose-form__autosuggest-wrapper textarea');
+    const element = this.node.querySelector('.autosuggest-textarea__textarea');
 
     if (element) {
       element.focus();

From 3c36e1be689bdd04d16b94d60e25bde709af0509 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 6 Feb 2024 10:35:36 +0100
Subject: [PATCH 0258/2191] [Glitch] Fix report reason selector in moderation
 interface not unselecting rules when changing category

Port 9ce914cc897d2b1100cee8cb6d792a2283d877ec to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/components/admin/ReportReasonSelector.jsx   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/flavours/glitch/components/admin/ReportReasonSelector.jsx b/app/javascript/flavours/glitch/components/admin/ReportReasonSelector.jsx
index 542ca3e1b60abc..9ff1d308991beb 100644
--- a/app/javascript/flavours/glitch/components/admin/ReportReasonSelector.jsx
+++ b/app/javascript/flavours/glitch/components/admin/ReportReasonSelector.jsx
@@ -124,7 +124,7 @@ class ReportReasonSelector extends PureComponent {
 
     api().put(`/api/v1/admin/reports/${id}`, {
       category,
-      rule_ids,
+      rule_ids: category === 'violation' ? rule_ids : [],
     }).catch(err => {
       console.error(err);
     });

From 9f0ff2bedf6ebc982962d006160c9758813bb631 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 8 Feb 2024 12:40:22 +0100
Subject: [PATCH 0259/2191] [Glitch] Clean up some unused CSS definitions

Port 67ec192d7dbb350511059a858d573daf49ecaf4f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/styles/components.scss    | 51 -------------------
 1 file changed, 51 deletions(-)

diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index e9e78c9f6c44cc..8d71099c4537a8 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -5095,43 +5095,6 @@ a.status-card {
   animation: heartbeat 1.5s ease-in-out infinite both;
 }
 
-@keyframes shake-bottom {
-  0%,
-  100% {
-    transform: rotate(0deg);
-    transform-origin: 50% 100%;
-  }
-
-  10% {
-    transform: rotate(2deg);
-  }
-
-  20%,
-  40%,
-  60% {
-    transform: rotate(-4deg);
-  }
-
-  30%,
-  50%,
-  70% {
-    transform: rotate(4deg);
-  }
-
-  80% {
-    transform: rotate(-2deg);
-  }
-
-  90% {
-    transform: rotate(2deg);
-  }
-}
-
-.no-reduce-motion .shake-bottom {
-  transform-origin: 50% 100%;
-  animation: shake-bottom 0.8s cubic-bezier(0.455, 0.03, 0.515, 0.955) 2s 2 both;
-}
-
 .emoji-picker-dropdown__menu {
   position: relative;
   margin-top: 5px;
@@ -5849,20 +5812,6 @@ a.status-card {
   }
 }
 
-.search-results__hashtag {
-  display: block;
-  padding: 10px;
-  color: $secondary-text-color;
-  text-decoration: none;
-
-  &:hover,
-  &:active,
-  &:focus {
-    color: lighten($secondary-text-color, 4%);
-    text-decoration: underline;
-  }
-}
-
 .search-results__info {
   padding: 20px;
   color: $darker-text-color;

From e45f40d2036d446b892c6d8222581ff8d2bbba67 Mon Sep 17 00:00:00 2001
From: Nicolas Hoffmann <dante3333@gmail.com>
Date: Tue, 13 Feb 2024 13:58:21 +0100
Subject: [PATCH 0260/2191] [Glitch] Fix modal container bounds

Port 476a043fc5339526536cbb1ba64d0ba2230e870c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/styles/components.scss | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index 8d71099c4537a8..906bc087caa2f8 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -5839,6 +5839,8 @@ a.status-card {
   inset-inline-start: 0;
   width: 100%;
   height: 100%;
+  max-width: 100vw;
+  max-height: 100vh;
   box-sizing: border-box;
   display: flex;
   flex-direction: column;

From 26924a0c7d8772079ee87434ac145b7a16453665 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 6 Feb 2024 18:10:17 +0100
Subject: [PATCH 0261/2191] [Glitch] Change `source` attribute of `Suggestion`
 entity in `/api/v2/suggestions` back to a string

Port 7ee93b74317c0b51516146fbe32e72cd9bbb151c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../components/inline_follow_suggestions.jsx              | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/javascript/flavours/glitch/features/home_timeline/components/inline_follow_suggestions.jsx b/app/javascript/flavours/glitch/features/home_timeline/components/inline_follow_suggestions.jsx
index 673b2d14d600b2..d915f1e55faff9 100644
--- a/app/javascript/flavours/glitch/features/home_timeline/components/inline_follow_suggestions.jsx
+++ b/app/javascript/flavours/glitch/features/home_timeline/components/inline_follow_suggestions.jsx
@@ -59,7 +59,7 @@ Source.propTypes = {
   id: PropTypes.oneOf(['friends_of_friends', 'similar_to_recently_followed', 'featured', 'most_followed', 'most_interactions']),
 };
 
-const Card = ({ id, source }) => {
+const Card = ({ id, sources }) => {
   const intl = useIntl();
   const account = useSelector(state => state.getIn(['accounts', id]));
   const relationship = useSelector(state => state.getIn(['relationships', id]));
@@ -89,7 +89,7 @@ const Card = ({ id, source }) => {
 
       <div className='inline-follow-suggestions__body__scrollable__card__text-stack'>
         <Link to={`/@${account.get('acct')}`}><DisplayName account={account} /></Link>
-        {firstVerifiedField ? <VerifiedBadge link={firstVerifiedField.get('value')} /> : <Source id={source.get(0)} />}
+        {firstVerifiedField ? <VerifiedBadge link={firstVerifiedField.get('value')} /> : <Source id={sources.get(0)} />}
       </div>
 
       <Button text={intl.formatMessage(following ? messages.unfollow : messages.follow)} onClick={handleFollow} />
@@ -99,7 +99,7 @@ const Card = ({ id, source }) => {
 
 Card.propTypes = {
   id: PropTypes.string.isRequired,
-  source: ImmutablePropTypes.list,
+  sources: ImmutablePropTypes.list,
 };
 
 const DISMISSIBLE_ID = 'home/follow-suggestions';
@@ -175,7 +175,7 @@ export const InlineFollowSuggestions = ({ hidden }) => {
             <Card
               key={suggestion.get('account')}
               id={suggestion.get('account')}
-              source={suggestion.get('source')}
+              sources={suggestion.get('sources')}
             />
           ))}
         </div>

From 200e11ae88cdecb131ac806857ef49a2021a212f Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 19 Feb 2024 12:09:58 +0100
Subject: [PATCH 0262/2191] [Glitch] Change follow suggestions design in web UI

Port 63f4ea055aceff47ae47eabe6da103af05ffafd5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../components/inline_follow_suggestions.jsx  | 25 ++++++++++++++++---
 .../flavours/glitch/styles/components.scss    |  9 +++++--
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/app/javascript/flavours/glitch/features/home_timeline/components/inline_follow_suggestions.jsx b/app/javascript/flavours/glitch/features/home_timeline/components/inline_follow_suggestions.jsx
index d915f1e55faff9..97b64a09b18e46 100644
--- a/app/javascript/flavours/glitch/features/home_timeline/components/inline_follow_suggestions.jsx
+++ b/app/javascript/flavours/glitch/features/home_timeline/components/inline_follow_suggestions.jsx
@@ -21,6 +21,7 @@ import { DisplayName } from 'flavours/glitch/components/display_name';
 import { Icon } from 'flavours/glitch/components/icon';
 import { IconButton } from 'flavours/glitch/components/icon_button';
 import { VerifiedBadge } from 'flavours/glitch/components/verified_badge';
+import { domain } from 'flavours/glitch/initial_state';
 
 const messages = defineMessages({
   follow: { id: 'account.follow', defaultMessage: 'Follow' },
@@ -28,27 +29,43 @@ const messages = defineMessages({
   previous: { id: 'lightbox.previous', defaultMessage: 'Previous' },
   next: { id: 'lightbox.next', defaultMessage: 'Next' },
   dismiss: { id: 'follow_suggestions.dismiss', defaultMessage: "Don't show again" },
+  friendsOfFriendsHint: { id: 'follow_suggestions.hints.friends_of_friends', defaultMessage: 'This profile is popular among the people you follow.' },
+  similarToRecentlyFollowedHint: { id: 'follow_suggestions.hints.similar_to_recently_followed', defaultMessage: 'This profile is similar to the profiles you have most recently followed.' },
+  featuredHint: { id: 'follow_suggestions.hints.featured', defaultMessage: 'This profile has been hand-picked by the {domain} team.' },
+  mostFollowedHint: { id: 'follow_suggestions.hints.most_followed', defaultMessage: 'This profile is one of the most followed on {domain}.'},
+  mostInteractionsHint: { id: 'follow_suggestions.hints.most_interactions', defaultMessage: 'This profile has been recently getting a lot of attention on {domain}.' },
 });
 
 const Source = ({ id }) => {
-  let label;
+  const intl = useIntl();
+
+  let label, hint;
 
   switch (id) {
   case 'friends_of_friends':
+    hint = intl.formatMessage(messages.friendsOfFriendsHint);
+    label = <FormattedMessage id='follow_suggestions.personalized_suggestion' defaultMessage='Personalized suggestion' />;
+    break;
   case 'similar_to_recently_followed':
+    hint = intl.formatMessage(messages.similarToRecentlyFollowedHint);
     label = <FormattedMessage id='follow_suggestions.personalized_suggestion' defaultMessage='Personalized suggestion' />;
     break;
   case 'featured':
-    label = <FormattedMessage id='follow_suggestions.curated_suggestion' defaultMessage="Editors' Choice" />;
+    hint = intl.formatMessage(messages.featuredHint, { domain });
+    label = <FormattedMessage id='follow_suggestions.curated_suggestion' defaultMessage='Staff pick' />;
     break;
   case 'most_followed':
+    hint = intl.formatMessage(messages.mostFollowedHint, { domain });
+    label = <FormattedMessage id='follow_suggestions.popular_suggestion' defaultMessage='Popular suggestion' />;
+    break;
   case 'most_interactions':
+    hint = intl.formatMessage(messages.mostInteractionsHint, { domain });
     label = <FormattedMessage id='follow_suggestions.popular_suggestion' defaultMessage='Popular suggestion' />;
     break;
   }
 
   return (
-    <div className='inline-follow-suggestions__body__scrollable__card__text-stack__source'>
+    <div className='inline-follow-suggestions__body__scrollable__card__text-stack__source' title={hint}>
       <Icon icon={InfoIcon} />
       {label}
     </div>
@@ -92,7 +109,7 @@ const Card = ({ id, sources }) => {
         {firstVerifiedField ? <VerifiedBadge link={firstVerifiedField.get('value')} /> : <Source id={sources.get(0)} />}
       </div>
 
-      <Button text={intl.formatMessage(following ? messages.unfollow : messages.follow)} onClick={handleFollow} />
+      <Button text={intl.formatMessage(following ? messages.unfollow : messages.follow)} secondary={following} onClick={handleFollow} />
     </div>
   );
 };
diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index 906bc087caa2f8..e299d9f5d32e86 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -10005,6 +10005,7 @@ noscript {
   flex-direction: column;
   gap: 12px;
   padding: 16px 0;
+  padding-bottom: 0;
   border-bottom: 1px solid mix($ui-base-color, $ui-highlight-color, 75%);
   background: mix($ui-base-color, $ui-highlight-color, 95%);
 
@@ -10043,6 +10044,7 @@ noscript {
       cursor: pointer;
       top: 0;
       color: $primary-text-color;
+      opacity: 0.5;
 
       &.left {
         left: 0;
@@ -10070,6 +10072,8 @@ noscript {
       &:hover,
       &:focus,
       &:active {
+        opacity: 1;
+
         .inline-follow-suggestions__body__scroll-button__icon {
           background: lighten($ui-highlight-color, 4%);
         }
@@ -10081,11 +10085,10 @@ noscript {
       flex-wrap: nowrap;
       gap: 16px;
       padding: 16px;
-      padding-bottom: 0;
       scroll-snap-type: x mandatory;
       scroll-padding: 16px;
       scroll-behavior: smooth;
-      overflow-x: hidden;
+      overflow-x: scroll;
 
       &__card {
         background: darken($ui-base-color, 4%);
@@ -10110,6 +10113,7 @@ noscript {
           position: absolute;
           inset-inline-end: 8px;
           top: 8px;
+          opacity: 0.75;
         }
 
         &__avatar {
@@ -10147,6 +10151,7 @@ noscript {
             gap: 4px;
             overflow: hidden;
             white-space: nowrap;
+            cursor: help;
 
             > span {
               overflow: hidden;

From ba67ea3d1266f04ac3ee5b5d43dcfd122ac6e730 Mon Sep 17 00:00:00 2001
From: Hinaloe <hina@hinaloe.net>
Date: Mon, 19 Feb 2024 22:31:16 +0900
Subject: [PATCH 0263/2191] [Glitch] Fix `sensitive` flag not being removed
 when removing CW in new compose form

Port c645490d553124d800d30488595f7d2d9d61584d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/reducers/compose.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/javascript/flavours/glitch/reducers/compose.js b/app/javascript/flavours/glitch/reducers/compose.js
index 05681738c58025..787e7ee2db6d66 100644
--- a/app/javascript/flavours/glitch/reducers/compose.js
+++ b/app/javascript/flavours/glitch/reducers/compose.js
@@ -395,8 +395,8 @@ export default function compose(state = initialState, action) {
       map.set('spoiler', !state.get('spoiler'));
       map.set('idempotencyKey', uuid());
 
-      if (!state.get('sensitive') && state.get('media_attachments').size >= 1) {
-        map.set('sensitive', true);
+      if (state.get('media_attachments').size >= 1 && !state.get('default_sensitive')) {
+        map.set('sensitive', !state.get('spoiler'));
       }
     });
   case COMPOSE_SPOILER_TEXT_CHANGE:

From ad0be125f5d7751438668b2637e2c2dc054beb9a Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 23 Feb 2024 16:32:13 +0100
Subject: [PATCH 0264/2191] [Glitch] Fix pixel alignment for some composer
 icons

Port 25ffe0af453cfdcad787913b57f217303bfa59a2 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../compose/components/content_type_button.jsx       |  9 ++++++---
 .../compose/components/emoji_picker_dropdown.jsx     |  2 +-
 .../compose/components/federation_button.jsx         |  4 +++-
 .../features/compose/components/poll_button.jsx      |  2 +-
 .../compose/components/thread_mode_button.jsx        |  2 +-
 .../glitch/features/compose/components/upload.jsx    |  2 +-
 .../features/compose/components/upload_button.jsx    |  2 +-
 .../compose/containers/spoiler_button_container.js   |  2 +-
 .../flavours/glitch/styles/components.scss           | 12 ++++++------
 app/javascript/material-icons/400-20px/code-fill.svg |  1 +
 app/javascript/material-icons/400-20px/code.svg      |  1 +
 .../material-icons/400-20px/description-fill.svg     |  1 +
 .../material-icons/400-20px/description.svg          |  1 +
 .../material-icons/400-20px/markdown-fill.svg        |  1 +
 app/javascript/material-icons/400-20px/markdown.svg  |  1 +
 .../material-icons/400-20px/quickreply-fill.svg      |  1 +
 .../material-icons/400-20px/quickreply.svg           |  1 +
 .../material-icons/400-20px/share-fill.svg           |  1 +
 app/javascript/material-icons/400-20px/share.svg     |  1 +
 .../material-icons/400-20px/share_off-fill.svg       |  1 +
 app/javascript/material-icons/400-20px/share_off.svg |  1 +
 .../material-icons/400-24px/quickreply-fill.svg      |  1 -
 .../material-icons/400-24px/quickreply.svg           |  1 -
 23 files changed, 33 insertions(+), 18 deletions(-)
 create mode 100644 app/javascript/material-icons/400-20px/code-fill.svg
 create mode 100644 app/javascript/material-icons/400-20px/code.svg
 create mode 100644 app/javascript/material-icons/400-20px/description-fill.svg
 create mode 100644 app/javascript/material-icons/400-20px/description.svg
 create mode 100644 app/javascript/material-icons/400-20px/markdown-fill.svg
 create mode 100644 app/javascript/material-icons/400-20px/markdown.svg
 create mode 100644 app/javascript/material-icons/400-20px/quickreply-fill.svg
 create mode 100644 app/javascript/material-icons/400-20px/quickreply.svg
 create mode 100644 app/javascript/material-icons/400-20px/share-fill.svg
 create mode 100644 app/javascript/material-icons/400-20px/share.svg
 create mode 100644 app/javascript/material-icons/400-20px/share_off-fill.svg
 create mode 100644 app/javascript/material-icons/400-20px/share_off.svg
 delete mode 100644 app/javascript/material-icons/400-24px/quickreply-fill.svg
 delete mode 100644 app/javascript/material-icons/400-24px/quickreply.svg

diff --git a/app/javascript/flavours/glitch/features/compose/components/content_type_button.jsx b/app/javascript/flavours/glitch/features/compose/components/content_type_button.jsx
index c1d6860bde9bb8..0de05ce7aaf09c 100644
--- a/app/javascript/flavours/glitch/features/compose/components/content_type_button.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/content_type_button.jsx
@@ -2,6 +2,9 @@ import { useCallback } from 'react';
 
 import { useIntl, defineMessages } from 'react-intl';
 
+import SmallCodeIcon from '@/material-icons/400-20px/code.svg?react';
+import SmallDescriptionIcon from '@/material-icons/400-20px/description.svg?react';
+import SmallMarkdownIcon from '@/material-icons/400-20px/markdown.svg?react';
 import CodeIcon from '@/material-icons/400-24px/code.svg?react';
 import DescriptionIcon from '@/material-icons/400-24px/description.svg?react';
 import MarkdownIcon from '@/material-icons/400-24px/markdown.svg?react';
@@ -48,9 +51,9 @@ export const ContentTypeButton = () => {
   }[contentType];
 
   const iconComponent = {
-    'text/plain': DescriptionIcon,
-    'text/markdown': MarkdownIcon,
-    'text/html': CodeIcon,
+    'text/plain': SmallDescriptionIcon,
+    'text/markdown': SmallMarkdownIcon,
+    'text/html': SmallCodeIcon,
   }[contentType];
 
   return (
diff --git a/app/javascript/flavours/glitch/features/compose/components/emoji_picker_dropdown.jsx b/app/javascript/flavours/glitch/features/compose/components/emoji_picker_dropdown.jsx
index 557f60e8073d3f..afe2981d054e66 100644
--- a/app/javascript/flavours/glitch/features/compose/components/emoji_picker_dropdown.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/emoji_picker_dropdown.jsx
@@ -10,7 +10,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import { supportsPassiveEvents } from 'detect-passive-events';
 import Overlay from 'react-overlays/Overlay';
 
-import MoodIcon from '@/material-icons/400-24px/mood.svg?react';
+import MoodIcon from '@/material-icons/400-20px/mood.svg?react';
 import { IconButton } from 'flavours/glitch/components/icon_button';
 import { useSystemEmojiFont } from 'flavours/glitch/initial_state';
 import { assetHost } from 'flavours/glitch/utils/config';
diff --git a/app/javascript/flavours/glitch/features/compose/components/federation_button.jsx b/app/javascript/flavours/glitch/features/compose/components/federation_button.jsx
index 2ac0a9d3ec1dfe..7c71d72f5ef9f0 100644
--- a/app/javascript/flavours/glitch/features/compose/components/federation_button.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/federation_button.jsx
@@ -2,6 +2,8 @@ import { useCallback } from 'react';
 
 import { useIntl, defineMessages } from 'react-intl';
 
+import SmallShareIcon from '@/material-icons/400-20px/share.svg?react';
+import SmallShareOffIcon from '@/material-icons/400-20px/share_off.svg?react';
 import ShareIcon from '@/material-icons/400-24px/share.svg?react';
 import ShareOffIcon from '@/material-icons/400-24px/share_off.svg?react';
 import { changeComposeAdvancedOption } from 'flavours/glitch/actions/compose';
@@ -37,7 +39,7 @@ export const FederationButton = () => {
     <DropdownIconButton
       disabled={isEditing}
       icon={do_not_federate ? 'link-slash' : 'link'}
-      iconComponent={do_not_federate ? ShareOffIcon : ShareIcon}
+      iconComponent={do_not_federate ? SmallShareOffIcon : SmallShareIcon}
       onChange={handleChange}
       options={options}
       title={intl.formatMessage(messages.change_federation_settings)}
diff --git a/app/javascript/flavours/glitch/features/compose/components/poll_button.jsx b/app/javascript/flavours/glitch/features/compose/components/poll_button.jsx
index 345497abd32b8c..cbaa25cb3c25ee 100644
--- a/app/javascript/flavours/glitch/features/compose/components/poll_button.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/poll_button.jsx
@@ -3,7 +3,7 @@ import { PureComponent } from 'react';
 
 import { defineMessages, injectIntl } from 'react-intl';
 
-import BarChart4BarsIcon from '@/material-icons/400-24px/bar_chart_4_bars.svg?react';
+import BarChart4BarsIcon from '@/material-icons/400-20px/bar_chart_4_bars.svg?react';
 
 import { IconButton } from '../../../components/icon_button';
 
diff --git a/app/javascript/flavours/glitch/features/compose/components/thread_mode_button.jsx b/app/javascript/flavours/glitch/features/compose/components/thread_mode_button.jsx
index 65b1b72897b5be..9b8947c447b505 100644
--- a/app/javascript/flavours/glitch/features/compose/components/thread_mode_button.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/thread_mode_button.jsx
@@ -2,7 +2,7 @@ import { useCallback } from 'react';
 
 import { useIntl, defineMessages } from 'react-intl';
 
-import QuickreplyIcon from '@/material-icons/400-24px/quickreply.svg?react';
+import QuickreplyIcon from '@/material-icons/400-20px/quickreply.svg?react';
 import { changeComposeAdvancedOption } from 'flavours/glitch/actions/compose';
 import { IconButton } from 'flavours/glitch/components/icon_button';
 import { useAppSelector, useAppDispatch } from 'flavours/glitch/store';
diff --git a/app/javascript/flavours/glitch/features/compose/components/upload.jsx b/app/javascript/flavours/glitch/features/compose/components/upload.jsx
index 2568aacb54850d..a6115184e348a7 100644
--- a/app/javascript/flavours/glitch/features/compose/components/upload.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/upload.jsx
@@ -9,7 +9,7 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
 
 import spring from 'react-motion/lib/spring';
 
-import CloseIcon from '@/material-icons/400-24px/close.svg?react';
+import CloseIcon from '@/material-icons/400-20px/close.svg?react';
 import EditIcon from '@/material-icons/400-24px/edit.svg?react';
 import WarningIcon from '@/material-icons/400-24px/warning.svg?react';
 import { Blurhash } from 'flavours/glitch/components/blurhash';
diff --git a/app/javascript/flavours/glitch/features/compose/components/upload_button.jsx b/app/javascript/flavours/glitch/features/compose/components/upload_button.jsx
index 4b8f7213b74947..184143faeea872 100644
--- a/app/javascript/flavours/glitch/features/compose/components/upload_button.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/upload_button.jsx
@@ -6,7 +6,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-import PhotoLibraryIcon from '@/material-icons/400-24px/photo_library.svg?react';
+import PhotoLibraryIcon from '@/material-icons/400-20px/photo_library.svg?react';
 import { IconButton } from 'flavours/glitch/components/icon_button';
 
 const messages = defineMessages({
diff --git a/app/javascript/flavours/glitch/features/compose/containers/spoiler_button_container.js b/app/javascript/flavours/glitch/features/compose/containers/spoiler_button_container.js
index fce1816fe864e7..fc87ef37252069 100644
--- a/app/javascript/flavours/glitch/features/compose/containers/spoiler_button_container.js
+++ b/app/javascript/flavours/glitch/features/compose/containers/spoiler_button_container.js
@@ -2,7 +2,7 @@ import { injectIntl, defineMessages } from 'react-intl';
 
 import { connect } from 'react-redux';
 
-import WarningIcon from '@/material-icons/400-24px/warning.svg?react';
+import WarningIcon from '@/material-icons/400-20px/warning.svg?react';
 import { IconButton } from 'flavours/glitch/components/icon_button';
 
 import { changeComposeSpoilerness } from '../../../actions/compose';
diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index e299d9f5d32e86..024911139c11ad 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -669,12 +669,12 @@ body > [data-popper-placement] {
     }
 
     .icon-button.compose-form__upload__delete {
-      padding: 3px;
+      padding: 2px;
       border-radius: 50%;
 
       .icon {
-        width: 18px;
-        height: 18px;
+        width: 20px;
+        height: 20px;
       }
     }
 
@@ -769,12 +769,12 @@ body > [data-popper-placement] {
     }
 
     .icon-button {
-      padding: 3px;
+      padding: 2px;
     }
 
     .icon-button .icon {
-      width: 18px;
-      height: 18px;
+      width: 20px;
+      height: 20px;
     }
   }
 
diff --git a/app/javascript/material-icons/400-20px/code-fill.svg b/app/javascript/material-icons/400-20px/code-fill.svg
new file mode 100644
index 00000000000000..83fb85354f26fb
--- /dev/null
+++ b/app/javascript/material-icons/400-20px/code-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="20" viewBox="0 -960 960 960" width="20"><path d="M336-240 96-480l240-240 51 51-189 189 189 189-51 51Zm288 0-51-51 189-189-189-189 51-51 240 240-240 240Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-20px/code.svg b/app/javascript/material-icons/400-20px/code.svg
new file mode 100644
index 00000000000000..83fb85354f26fb
--- /dev/null
+++ b/app/javascript/material-icons/400-20px/code.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="20" viewBox="0 -960 960 960" width="20"><path d="M336-240 96-480l240-240 51 51-189 189 189 189-51 51Zm288 0-51-51 189-189-189-189 51-51 240 240-240 240Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-20px/description-fill.svg b/app/javascript/material-icons/400-20px/description-fill.svg
new file mode 100644
index 00000000000000..5eed963e0b6935
--- /dev/null
+++ b/app/javascript/material-icons/400-20px/description-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="20" viewBox="0 -960 960 960" width="20"><path d="M336-240h288v-72H336v72Zm0-144h288v-72H336v72ZM263.717-96Q234-96 213-117.15T192-168v-624q0-29.7 21.15-50.85Q234.3-864 264-864h312l192 192v504q0 29.7-21.162 50.85Q725.676-96 695.96-96H263.717ZM528-624h168L528-792v168Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-20px/description.svg b/app/javascript/material-icons/400-20px/description.svg
new file mode 100644
index 00000000000000..7ad7907881465e
--- /dev/null
+++ b/app/javascript/material-icons/400-20px/description.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="20" viewBox="0 -960 960 960" width="20"><path d="M336-240h288v-72H336v72Zm0-144h288v-72H336v72ZM263.717-96Q234-96 213-117.15T192-168v-624q0-29.7 21.15-50.85Q234.3-864 264-864h312l192 192v504q0 29.7-21.162 50.85Q725.676-96 695.96-96H263.717ZM528-624v-168H264v624h432v-456H528ZM264-792v189-189 624-624Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-20px/markdown-fill.svg b/app/javascript/material-icons/400-20px/markdown-fill.svg
new file mode 100644
index 00000000000000..6fed3547f6e615
--- /dev/null
+++ b/app/javascript/material-icons/400-20px/markdown-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="20" viewBox="0 -960 960 960" width="20"><path d="m600-384 96-96-34-34-38 38v-100h-48v100l-38-39-34 35 96 96ZM168-192q-29.7 0-50.85-21.162Q96-234.324 96-264.04v-432.243Q96-726 117.15-747T168-768h624q29.7 0 50.85 21.162Q864-725.676 864-695.96v432.243Q864-234 842.85-213T792-192H168Zm72-192h48v-144h24v96h48v-96h24v144h48v-168q0-10.2-6.9-17.1-6.9-6.9-17.1-6.9H264q-10.2 0-17.1 6.9-6.9 6.9-6.9 17.1v168Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-20px/markdown.svg b/app/javascript/material-icons/400-20px/markdown.svg
new file mode 100644
index 00000000000000..c5e480e938434c
--- /dev/null
+++ b/app/javascript/material-icons/400-20px/markdown.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="20" viewBox="0 -960 960 960" width="20"><path d="m600-384 96-96-34-34-38 38v-100h-48v100l-38-39-34 35 96 96ZM168-192q-29.7 0-50.85-21.162Q96-234.324 96-264.04v-432.243Q96-726 117.15-747T168-768h624q29.7 0 50.85 21.162Q864-725.676 864-695.96v432.243Q864-234 842.85-213T792-192H168Zm0-72h624v-432H168v432Zm0 0v-432 432Zm72-120h48v-144h24v96h48v-96h24v144h48v-168q0-10.2-6.9-17.1-6.9-6.9-17.1-6.9H264q-10.2 0-17.1 6.9-6.9 6.9-6.9 17.1v168Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-20px/quickreply-fill.svg b/app/javascript/material-icons/400-20px/quickreply-fill.svg
new file mode 100644
index 00000000000000..8adf5df3087600
--- /dev/null
+++ b/app/javascript/material-icons/400-20px/quickreply-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="20" viewBox="0 -960 960 960" width="20"><path d="M750-48v-192h-78v-240h192l-60 156h84L750-48ZM96-96v-696q0-29 21.5-50.5T168-864h624q30 0 51 21.5t21 50.5v240H600v312H240L96-96Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-20px/quickreply.svg b/app/javascript/material-icons/400-20px/quickreply.svg
new file mode 100644
index 00000000000000..4956ffcf3c7972
--- /dev/null
+++ b/app/javascript/material-icons/400-20px/quickreply.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="20" viewBox="0 -960 960 960" width="20"><path d="M96-96v-696q0-29 21.5-50.5T168-864h624q29.7 0 50.85 21.5Q864-821 864-792v240h-72v-240H168v522l42-42h390v72H240L96-96Zm72-216v-480 480ZM750-48v-192h-78v-240h192l-60 156h84L750-48Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-20px/share-fill.svg b/app/javascript/material-icons/400-20px/share-fill.svg
new file mode 100644
index 00000000000000..dc7011ff9fba7e
--- /dev/null
+++ b/app/javascript/material-icons/400-20px/share-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="20" viewBox="0 -960 960 960" width="20"><path d="M696-96q-50 0-85-35t-35-85q0-8 1-14.5t3-14.5L342-390q-15 16-35.354 23T264-360q-50 0-85-35t-35-85q0-50 35-85t85-35q22 0 42.5 7.5T342-570l238-145q-2-8-3-14.5t-1-14.5q0-50 35-85t85-35q50 0 85 35t35 85q0 50-35 85t-85 35q-22.292 0-42.646-7T618-654L380-509q2 8 3 14.5t1 14.5q0 8-1 14.5t-3 14.5l238 145q15-17 35.354-23.5T696-336q50 0 85 35t35 85q0 50-35 85t-85 35Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-20px/share.svg b/app/javascript/material-icons/400-20px/share.svg
new file mode 100644
index 00000000000000..5094eb336caad0
--- /dev/null
+++ b/app/javascript/material-icons/400-20px/share.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="20" viewBox="0 -960 960 960" width="20"><path d="M696-96q-50 0-85-35t-35-85q0-8 1-14.5t3-14.5L342-390q-15 16-35.354 23T264-360q-50 0-85-35t-35-85q0-50 35-85t85-35q22 0 42.5 7.5T342-570l238-145q-2-8-3-14.5t-1-14.5q0-50 35-85t85-35q50 0 85 35t35 85q0 50-35 85t-85 35q-22.292 0-42.646-7T618-654L380-509q2 8 3 14.5t1 14.5q0 8-1 14.5t-3 14.5l238 145q15-17 35.354-23.5T696-336q50 0 85 35t35 85q0 50-35 85t-85 35Zm0-600q20.4 0 34.2-13.8Q744-723.6 744-744q0-20.4-13.8-34.2Q716.4-792 696-792q-20.4 0-34.2 13.8Q648-764.4 648-744q0 20.4 13.8 34.2Q675.6-696 696-696ZM264-432q20.4 0 34.2-13.8Q312-459.6 312-480q0-20.4-13.8-34.2Q284.4-528 264-528q-20.4 0-34.2 13.8Q216-500.4 216-480q0 20.4 13.8 34.2Q243.6-432 264-432Zm432 264q20.4 0 34.2-13.8Q744-195.6 744-216q0-20.4-13.8-34.2Q716.4-264 696-264q-20.4 0-34.2 13.8Q648-236.4 648-216q0 20.4 13.8 34.2Q675.6-168 696-168Zm0-576ZM264-480Zm432 264Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-20px/share_off-fill.svg b/app/javascript/material-icons/400-20px/share_off-fill.svg
new file mode 100644
index 00000000000000..eeb1cb4f39e756
--- /dev/null
+++ b/app/javascript/material-icons/400-20px/share_off-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="20" viewBox="0 -960 960 960" width="20"><path d="M240.226-432Q320-432 376-375.774t56 136Q432-160 375.774-104t-136 56Q160-48 104-104.226t-56-136Q48-320 104.226-376t136-56ZM239-212l56 56 29-29-56-56 56-56-29-29-56 56-56-56-29 29 56 56-56 56 29 29 56-56Zm457-412q-22.292 0-42.646-7T618-654L380-509q3 17 3.5 25.5T382-462q-31-20-67.196-31-36.195-11-74.804-11-26 0-49.5 4.5T144-486q2-48 37-81t83-33q22.292 0 42.646 7.5T342-570l238-145q-2-8-3-14.5t-1-14.5q0-50 35-85t85-35q50 0 85 35t35 85q0 50-35 85t-85 35Zm0 528q-50 0-85-35t-35-85q0-8 1-14.5t3-14.5l-82-50q-8-35-23.5-65.5T436-417l182 111q15-17 35.354-23.5T696-336q50 0 85 35t35 85q0 50-35 85t-85 35Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-20px/share_off.svg b/app/javascript/material-icons/400-20px/share_off.svg
new file mode 100644
index 00000000000000..970fa28a25eec0
--- /dev/null
+++ b/app/javascript/material-icons/400-20px/share_off.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="20" viewBox="0 -960 960 960" width="20"><path d="M696-696q20.4 0 34.2-13.8Q744-723.6 744-744q0-20.4-13.8-34.2Q716.4-792 696-792q-20.4 0-34.2 13.8Q648-764.4 648-744q0 20.4 13.8 34.2Q675.6-696 696-696Zm0 528q20.4 0 34.2-13.8Q744-195.6 744-216q0-20.4-13.8-34.2Q716.4-264 696-264q-20.4 0-34.2 13.8Q648-236.4 648-216q0 20.4 13.8 34.2Q675.6-168 696-168Zm0-576Zm0 528ZM239.774-48Q160-48 104-104.226t-56-136Q48-320 104.226-376t136-56Q320-432 376-375.774t56 136Q432-160 375.774-104t-136 56ZM144-486q2-48 37-81t83-33q22.292 0 42.646 7.5T342-570l238-145q-2-8-3-14.5t-1-14.5q0-50 35-85t85-35q50 0 85 35t35 85q0 50-35 85t-85 35q-22.292 0-42.646-7T618-654L380-509q3 17 3.5 25.5T382-462q-31-20-67.196-31-36.195-11-74.804-11-26 0-49.5 4.5T144-486ZM696-96q-50 0-85-35t-35-85q0-8 1-14.5t3-14.5l-82-50q-8-35-23.5-65.5T436-417l182 111q15-17 35.354-23.5T696-336q50 0 85 35t35 85q0 50-35 85t-85 35ZM239-212l56 56 29-29-56-56 56-56-29-29-56 56-56-56-29 29 56 56-56 56 29 29 56-56Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/quickreply-fill.svg b/app/javascript/material-icons/400-24px/quickreply-fill.svg
deleted file mode 100644
index a9ce9705ac91df..00000000000000
--- a/app/javascript/material-icons/400-24px/quickreply-fill.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M760-40v-200h-80v-240h200l-68 160h88L760-40ZM80-80v-720q0-33 23.5-56.5T160-880h640q33 0 56.5 23.5T880-800v240H600v320H240L80-80Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/quickreply.svg b/app/javascript/material-icons/400-24px/quickreply.svg
deleted file mode 100644
index 522093e3cc4b7a..00000000000000
--- a/app/javascript/material-icons/400-24px/quickreply.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M80-80v-720q0-33 23.5-56.5T160-880h640q33 0 56.5 23.5T880-800v240h-80v-240H160v525l46-45h394v80H240L80-80Zm80-240v-480 480ZM760-40v-200h-80v-240h200l-68 160h88L760-40Z"/></svg>
\ No newline at end of file

From 3ffb81e04fb4bcbd65b60c082f6c55bd83182130 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 8 Feb 2024 20:13:44 +0100
Subject: [PATCH 0265/2191] [Glitch] Add end-to-end test for OCR in media
 uploads

Port ca8fbda5d031b9671447445a83acac96b4fab2fb to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../glitch/features/compose/components/upload_button.jsx         | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/javascript/flavours/glitch/features/compose/components/upload_button.jsx b/app/javascript/flavours/glitch/features/compose/components/upload_button.jsx
index 184143faeea872..caa6784cb9a420 100644
--- a/app/javascript/flavours/glitch/features/compose/components/upload_button.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/upload_button.jsx
@@ -65,6 +65,7 @@ class UploadButton extends ImmutablePureComponent {
             key={resetFileKey}
             ref={this.setRef}
             type='file'
+            name='file-upload-input'
             multiple
             accept={acceptContentTypes.toArray().join(',')}
             onChange={this.handleChange}

From 4c24022984f8b1862b9d19a57ab269894599f4d7 Mon Sep 17 00:00:00 2001
From: Jeremy Kescher <jeremy@kescher.at>
Date: Sat, 24 Feb 2024 18:17:27 +0100
Subject: [PATCH 0266/2191] Fix min_options, let vanilla flavor behave properly
 for pollLimits

---
 app/javascript/flavours/glitch/reducers/compose.js |  7 +++++--
 app/javascript/mastodon/initial_state.js           |  4 +---
 app/javascript/mastodon/reducers/compose.js        | 13 ++++++++-----
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/app/javascript/flavours/glitch/reducers/compose.js b/app/javascript/flavours/glitch/reducers/compose.js
index 15bf1a16906504..b291eaefc613b0 100644
--- a/app/javascript/flavours/glitch/reducers/compose.js
+++ b/app/javascript/flavours/glitch/reducers/compose.js
@@ -357,10 +357,13 @@ const updateSuggestionTags = (state, token) => {
 };
 
 const updatePoll = (state, index, value) => state.updateIn(['poll', 'options'], options => {
-  const tmp = options.set(index, value).filterNot(x => x.trim().length === 0);
+  let tmp = options.set(index, value).filterNot(x => x.trim().length === 0);
 
   if (tmp.size === 0) {
-    return tmp.push('').push('');
+    const minOptions = pollLimits.min_options ?? 2;
+    for (let i = 0; i < minOptions; i++) {
+      tmp = tmp.push('');
+    }
   } else if (tmp.size < pollLimits.max_options) {
     return tmp.push('');
   }
diff --git a/app/javascript/mastodon/initial_state.js b/app/javascript/mastodon/initial_state.js
index bb6cd12772cd10..7d07ccd6b0beca 100644
--- a/app/javascript/mastodon/initial_state.js
+++ b/app/javascript/mastodon/initial_state.js
@@ -122,8 +122,6 @@ export const sso_redirect = getMeta('sso_redirect');
 
 // Glitch-soc-specific settings
 export const maxChars = (initialState && initialState.max_toot_chars) || 500;
-
-// CatCatNya~ specific settings
-export const pollMinOptions = (initialState && initialState.poll_limits && initialState.poll_limits.min_options) || 2;
+export const pollLimits = (initialState && initialState.poll_limits);
 
 export default initialState;
diff --git a/app/javascript/mastodon/reducers/compose.js b/app/javascript/mastodon/reducers/compose.js
index c7914d52e47ef7..383c6d0988d430 100644
--- a/app/javascript/mastodon/reducers/compose.js
+++ b/app/javascript/mastodon/reducers/compose.js
@@ -51,7 +51,7 @@ import {
 import { REDRAFT } from '../actions/statuses';
 import { STORE_HYDRATE } from '../actions/store';
 import { TIMELINE_DELETE } from '../actions/timelines';
-import { me, pollMinOptions } from '../initial_state';
+import { me, pollLimits } from '../initial_state';
 import { unescapeHTML } from '../utils/html';
 import { uuid } from '../uuid';
 
@@ -95,7 +95,7 @@ const initialState = ImmutableMap({
 });
 
 const initialPoll = ImmutableMap({
-  options: ImmutableList(new Array(pollMinOptions).fill('')),
+  options: ImmutableList(new Array(pollLimits.min_options ?? 2).fill('')),
   expires_in: 24 * 3600,
   multiple: false,
 });
@@ -281,11 +281,14 @@ const updateSuggestionTags = (state, token) => {
 };
 
 const updatePoll = (state, index, value) => state.updateIn(['poll', 'options'], options => {
-  const tmp = options.set(index, value).filterNot(x => x.trim().length === 0);
+  let tmp = options.set(index, value).filterNot(x => x.trim().length === 0);
 
   if (tmp.size === 0) {
-    return tmp.push('').push('');
-  } else if (tmp.size < 4) {
+    const minOptions = pollLimits.min_options ?? 2;
+    for (let i = 0; i < minOptions; i++) {
+      tmp = tmp.push('');
+    }
+  } else if (tmp.size < pollLimits.max_options) {
     return tmp.push('');
   }
 

From 46910595eb786c37612463d15ceb12c2605e8d4f Mon Sep 17 00:00:00 2001
From: Jeremy Kescher <jeremy@kescher.at>
Date: Sat, 24 Feb 2024 18:44:27 +0100
Subject: [PATCH 0267/2191] Update README.md to reflect recent changes

- Emoji picker in composer is no longer a blob cat, or an emoji to begin with. So remove that point, lol.
- Update upstream image size limit (still lower than ours)
- We modified Oatstodon slightly to fix the appearance of profile fields.
- We have applied the mastodon-sakura filtering patch to our fork.
---
 README.md          |   6 +++---
 public/blobCat.png | Bin 9348 -> 0 bytes
 2 files changed, 3 insertions(+), 3 deletions(-)
 delete mode 100644 public/blobCat.png

diff --git a/README.md b/README.md
index 9ef1ae438b91e6..2221831248c309 100644
--- a/README.md
+++ b/README.md
@@ -21,15 +21,15 @@ instead, use merge (fast-forward, if possible, with merge commit otherwise).
   - sounds/boop.mp3
   - sounds/boop.ogg
     <br>You might want to revert these to the upstream files (or your own versions!) if you decide to use this fork for your own instance.
-- The web frontend emoji picker is a blobcat instead of the joy emoji.
 - The rate limits for authenticated users have been relaxed a bit.
 - The API endpoint `/api/v1/custom_emojis` is no longer affected by AUTHORIZED_FETCH, allowing anyone to copy custom emojis.
-- Allow higher resolution images. (4096x4096 instead of the previous limit of 1920x1080)
+- Allow higher resolution images. (4096x4096 instead of the previous limit of 3840x2160)
 - Allow posting polls with only one poll option (if `MIN_POLL_OPTIONS` is set to 1 on your instance).
-- Added oatstodon flavour (taken from [types.pl fork](https://github.com/ralsei/types.pl), by [@oat@hellsite.site](https://hellsite.site/@oat))
+- Added oatstodon flavour (taken from [types.pl fork](https://github.com/ralsei/types.pl), by [@oat@hellsite.site](https://hellsite.site/@oat)), with slight adjustments since.
 - Emoji reactions on statuses (with both Unicode and custom emojis, same as for announcements), a feature originally developed for [Nyastodon](https://git.bsd.gay/fef/nyastodon).
   Ended up as a Catstodon-maintained patch after its initial two Pull Requests to glitch-soc, but was handed over to [Essem's fork, Chuckya](https://github.com/TheEssem/mastodon) and is now pending [its fourth attempt of merging into glitch-soc](https://github.com/glitch-soc/mastodon/pull/2462).
 - Lifts the "only federate local favourites" restriction on favourites/likes and emoji reactions.
+- Cherry-picks the [activity filter branch](https://github.com/chikorita157/mastodon-sakura/tree/newmain-tmp3-noellabo-filtering) from [Sakurajima Mastodon](https://github.com/chikorita157/mastodon-sakura).
 
 ## Previous differences now merged into glitch-soc
 
diff --git a/public/blobCat.png b/public/blobCat.png
deleted file mode 100644
index 08e1b408072ba3fd009ce097a52762a8012fabc3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9348
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


From 77d74465af5c3b7795b952d39de8b300a41f7bbf Mon Sep 17 00:00:00 2001
From: Jeremy Kescher <jeremy@kescher.at>
Date: Sat, 24 Feb 2024 19:33:05 +0100
Subject: [PATCH 0268/2191] Remove useless "inverted" prop

---
 .../glitch/features/compose/components/emoji_picker_dropdown.jsx | 1 -
 .../features/compose/components/emoji_picker_dropdown.jsx        | 1 -
 2 files changed, 2 deletions(-)

diff --git a/app/javascript/flavours/glitch/features/compose/components/emoji_picker_dropdown.jsx b/app/javascript/flavours/glitch/features/compose/components/emoji_picker_dropdown.jsx
index 8dc89084d9bcfb..cdb40e6b756bb3 100644
--- a/app/javascript/flavours/glitch/features/compose/components/emoji_picker_dropdown.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/emoji_picker_dropdown.jsx
@@ -396,7 +396,6 @@ class EmojiPickerDropdown extends PureComponent {
           active={active}
           iconComponent={MoodIcon}
           onClick={this.onToggle}
-          inverted
         />
 
         <Overlay show={active} placement={'bottom'} flip target={this.findTarget} popperConfig={{ strategy: 'fixed' }}>
diff --git a/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.jsx b/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.jsx
index acc3fd0ce51b3d..598afe8ab74f75 100644
--- a/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.jsx
+++ b/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.jsx
@@ -394,7 +394,6 @@ class EmojiPickerDropdown extends PureComponent {
           active={active}
           iconComponent={MoodIcon}
           onClick={this.onToggle}
-          inverted
         />
 
         <Overlay show={active} placement={'bottom'} target={this.findTarget} popperConfig={{ strategy: 'fixed' }}>

From 0ea10045f1afac694da88a96bf364a28236c7fef Mon Sep 17 00:00:00 2001
From: Essem <smswessem@gmail.com>
Date: Sat, 24 Feb 2024 16:22:40 -0600
Subject: [PATCH 0269/2191] Merge fixes

---
 app/javascript/flavours/glitch/styles/components.scss | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index aa33ecd52da478..bd8ee0494bdc05 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -8727,6 +8727,8 @@ noscript {
   }
 
   &--empty {
+    margin-top: 0;
+
     .emoji-button {
       padding: 0;
     }

From 4edbebfbacc829be05a26b3687c689ad2c3ef206 Mon Sep 17 00:00:00 2001
From: Essem <smswessem@gmail.com>
Date: Sat, 24 Feb 2024 17:20:38 -0600
Subject: [PATCH 0270/2191] Fix reaction picker dropdown appearance

---
 .../glitch/components/status_action_bar.jsx   | 18 +----------------
 .../glitch/components/status_prepend.jsx      |  6 +++---
 .../components/emoji_picker_dropdown.jsx      | 11 ++++++----
 .../notifications/components/filter_bar.jsx   |  4 ++--
 .../features/status/components/action_bar.jsx | 20 +------------------
 .../flavours/glitch/styles/components.scss    |  8 ++++++--
 .../material-icons/400-24px/mood-fill.svg     |  1 +
 .../material-icons/400-24px/mood.svg          |  1 +
 8 files changed, 22 insertions(+), 47 deletions(-)
 create mode 100644 app/javascript/material-icons/400-24px/mood-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/mood.svg

diff --git a/app/javascript/flavours/glitch/components/status_action_bar.jsx b/app/javascript/flavours/glitch/components/status_action_bar.jsx
index d3b1e34a09c366..594980c3010a76 100644
--- a/app/javascript/flavours/glitch/components/status_action_bar.jsx
+++ b/app/javascript/flavours/glitch/components/status_action_bar.jsx
@@ -216,8 +216,6 @@ class StatusActionBar extends ImmutablePureComponent {
     this.props.onAddFilter(this.props.status);
   };
 
-  handleNoOp = () => {}; // hack for reaction add button
-
   render () {
     const { status, intl, withDismiss, withCounters, showReplyCount, scrollKey } = this.props;
     const { permissions, signedIn } = this.context.identity;
@@ -332,16 +330,6 @@ class StatusActionBar extends ImmutablePureComponent {
     );
 
     const canReact = permissions && status.get('reactions').filter(r => r.get('count') > 0 && r.get('me')).size < maxReactions;
-    const reactButton = (
-      <IconButton
-        className='status__action-bar-button'
-        onClick={this.handleNoOp} // EmojiPickerDropdown handles that
-        title={intl.formatMessage(messages.react)}
-        disabled={!canReact}
-        icon='add_reaction'
-        iconComponent={AddReactionIcon}
-      />
-    );
 
     return (
       <div className='status__action-bar'>
@@ -356,11 +344,7 @@ class StatusActionBar extends ImmutablePureComponent {
         />
         <IconButton className={classNames('status__action-bar-button', { reblogPrivate })} disabled={!publicStatus && !reblogPrivate} active={status.get('reblogged')} title={reblogTitle} icon={reblogIcon} iconComponent={reblogIconComponent} onClick={this.handleReblogClick} counter={withCounters ? status.get('reblogs_count') : undefined} />
         <IconButton className='status__action-bar-button star-icon' animate active={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='star' iconComponent={status.get('favourited') ? StarIcon : StarBorderIcon} onClick={this.handleFavouriteClick} counter={withCounters ? status.get('favourites_count') : undefined} />
-        {
-          signedIn
-            ? <EmojiPickerDropdown className='status__action-bar-button' onPickEmoji={this.handleEmojiPick} button={reactButton} disabled={!canReact} />
-            : reactButton
-        }
+        <EmojiPickerDropdown className='status__action-bar-button' onPickEmoji={this.handleEmojiPick} title={intl.formatMessage(messages.react)} icon={AddReactionIcon} disabled={!canReact} />
         <IconButton className='status__action-bar-button bookmark-icon' disabled={!signedIn} active={status.get('bookmarked')} title={intl.formatMessage(messages.bookmark)} icon='bookmark' iconComponent={status.get('bookmarked') ? BookmarkIcon : BookmarkBorderIcon} onClick={this.handleBookmarkClick} />
 
         {filterButton}
diff --git a/app/javascript/flavours/glitch/components/status_prepend.jsx b/app/javascript/flavours/glitch/components/status_prepend.jsx
index f189f7be9ee66f..e2ccea8183ef0f 100644
--- a/app/javascript/flavours/glitch/components/status_prepend.jsx
+++ b/app/javascript/flavours/glitch/components/status_prepend.jsx
@@ -6,10 +6,10 @@ import { FormattedMessage } from 'react-intl';
 
 import ImmutablePropTypes from 'react-immutable-proptypes';
 
-import AddReactionIcon from '@/material-icons/400-24px/add_reaction.svg?react';
 import EditIcon from '@/material-icons/400-24px/edit.svg?react';
 import HomeIcon from '@/material-icons/400-24px/home-fill.svg?react';
 import InsertChartIcon from '@/material-icons/400-24px/insert_chart.svg?react';
+import MoodIcon from '@/material-icons/400-24px/mood.svg?react';
 import PushPinIcon from '@/material-icons/400-24px/push_pin.svg?react';
 import RepeatIcon from '@/material-icons/400-24px/repeat.svg?react';
 import StarIcon from '@/material-icons/400-24px/star-fill.svg?react';
@@ -134,8 +134,8 @@ export default class StatusPrepend extends PureComponent {
       iconComponent = StarIcon;
       break;
     case 'reaction':
-      iconId = 'add_reaction';
-      iconComponent = AddReactionIcon;
+      iconId = 'mood';
+      iconComponent = MoodIcon;
       break;
     case 'featured':
       iconId = 'thumb-tack';
diff --git a/app/javascript/flavours/glitch/features/compose/components/emoji_picker_dropdown.jsx b/app/javascript/flavours/glitch/features/compose/components/emoji_picker_dropdown.jsx
index cdb40e6b756bb3..18fa0bcfec0473 100644
--- a/app/javascript/flavours/glitch/features/compose/components/emoji_picker_dropdown.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/emoji_picker_dropdown.jsx
@@ -327,6 +327,9 @@ class EmojiPickerDropdown extends PureComponent {
     onPickEmoji: PropTypes.func.isRequired,
     onSkinTone: PropTypes.func.isRequired,
     skinTone: PropTypes.number.isRequired,
+    title: PropTypes.string,
+    icon: PropTypes.node,
+    disabled: PropTypes.bool,
   };
 
   state = {
@@ -384,17 +387,17 @@ class EmojiPickerDropdown extends PureComponent {
   };
 
   render () {
-    const { intl, onPickEmoji, onSkinTone, skinTone, frequentlyUsedEmojis } = this.props;
-    const title = intl.formatMessage(messages.emoji);
+    const { intl, onPickEmoji, onSkinTone, skinTone, frequentlyUsedEmojis, title, icon, disabled } = this.props;
     const { active, loading } = this.state;
 
     return (
       <div className='emoji-picker-dropdown' onKeyDown={this.handleKeyDown} ref={this.setTargetRef}>
         <IconButton
-          title={title}
+          title={title || intl.formatMessage(messages.emoji)}
           aria-expanded={active}
           active={active}
-          iconComponent={MoodIcon}
+          disabled={disabled}
+          iconComponent={icon || MoodIcon}
           onClick={this.onToggle}
         />
 
diff --git a/app/javascript/flavours/glitch/features/notifications/components/filter_bar.jsx b/app/javascript/flavours/glitch/features/notifications/components/filter_bar.jsx
index 13aba0d0efbc2a..ba31e3c596d7e7 100644
--- a/app/javascript/flavours/glitch/features/notifications/components/filter_bar.jsx
+++ b/app/javascript/flavours/glitch/features/notifications/components/filter_bar.jsx
@@ -3,9 +3,9 @@ import { PureComponent } from 'react';
 
 import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
 
-import AddReactionIcon from '@/material-icons/400-24px/add_reaction.svg?react';
 import HomeIcon from '@/material-icons/400-24px/home-fill.svg?react';
 import InsertChartIcon from '@/material-icons/400-24px/insert_chart.svg?react';
+import MoodIcon from '@/material-icons/400-24px/mood.svg?react';
 import PersonAddIcon from '@/material-icons/400-24px/person_add.svg?react';
 import RepeatIcon from '@/material-icons/400-24px/repeat.svg?react';
 import ReplyAllIcon from '@/material-icons/400-24px/reply_all.svg?react';
@@ -89,7 +89,7 @@ class FilterBar extends PureComponent {
           onClick={this.onClick('reaction')}
           title={intl.formatMessage(tooltips.reactions)}
         >
-          <Icon id='add_reaction' icon={AddReactionIcon} />
+          <Icon id='mood' icon={MoodIcon} />
         </button>
         <button
           className={selectedFilter === 'reblog' ? 'active' : ''}
diff --git a/app/javascript/flavours/glitch/features/status/components/action_bar.jsx b/app/javascript/flavours/glitch/features/status/components/action_bar.jsx
index b057b7e3be2642..6db575c4adecef 100644
--- a/app/javascript/flavours/glitch/features/status/components/action_bar.jsx
+++ b/app/javascript/flavours/glitch/features/status/components/action_bar.jsx
@@ -163,8 +163,6 @@ class ActionBar extends PureComponent {
     navigator.clipboard.writeText(url);
   };
 
-  handleNoOp = () => {}; // hack for reaction add button
-
   render () {
     const { status, intl } = this.props;
     const { signedIn, permissions } = this.context.identity;
@@ -242,16 +240,6 @@ class ActionBar extends PureComponent {
     }
 
     const canReact = signedIn && status.get('reactions').filter(r => r.get('count') > 0 && r.get('me')).size < maxReactions;
-    const reactButton = (
-      <IconButton
-        className='add-reaction-icon'
-        onClick={this.handleNoOp} // EmojiPickerDropdown handles that
-        title={intl.formatMessage(messages.react)}
-        disabled={!canReact}
-        icon='add_reaction'
-        iconComponent={AddReactionIcon}
-      />
-    );
 
     const reblogPrivate = status.getIn(['account', 'id']) === me && status.get('visibility') === 'private';
 
@@ -276,13 +264,7 @@ class ActionBar extends PureComponent {
         <div className='detailed-status__button'><IconButton title={intl.formatMessage(messages.reply)} icon={replyIcon} iconComponent={replyIconComponent} onClick={this.handleReplyClick} /></div>
         <div className='detailed-status__button'><IconButton className={classNames({ reblogPrivate })} disabled={!publicStatus && !reblogPrivate} active={status.get('reblogged')} title={reblogTitle} icon='retweet' iconComponent={reblogIconComponent} onClick={this.handleReblogClick} /></div>
         <div className='detailed-status__button'><IconButton className='star-icon' animate active={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='star' iconComponent={status.get('favourited') ? StarIcon : StarBorderIcon} onClick={this.handleFavouriteClick} /></div>
-        <div className='detailed-status__button'>
-          {
-            signedIn
-              ? <EmojiPickerDropdown onPickEmoji={this.handleEmojiPick} button={reactButton} disabled={!canReact} />
-              : reactButton
-          }
-        </div>
+        <div className='detailed-status__button'><EmojiPickerDropdown onPickEmoji={this.handleEmojiPick} title={intl.formatMessage(messages.react)} icon={AddReactionIcon} disabled={!canReact} /></div>
         <div className='detailed-status__button'><IconButton className='bookmark-icon' disabled={!signedIn} active={status.get('bookmarked')} title={intl.formatMessage(messages.bookmark)} icon='bookmark' iconComponent={status.get('bookmarked') ? BookmarkIcon : BookmarkBorderIcon} onClick={this.handleBookmarkClick} /></div>
 
         <div className='detailed-status__action-bar-dropdown'>
diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index bd8ee0494bdc05..e767997ab55eb2 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -1825,8 +1825,12 @@ body > [data-popper-placement] {
     flex-grow: 1;
   }
 
-  & > .emoji-picker-dropdown > .emoji-button {
-    padding: 0;
+  & > .emoji-picker-dropdown {
+    height: 24px;
+
+    > .emoji-button {
+      padding: 0;
+    }
   }
 }
 
diff --git a/app/javascript/material-icons/400-24px/mood-fill.svg b/app/javascript/material-icons/400-24px/mood-fill.svg
new file mode 100644
index 00000000000000..9480d0fb92aaa3
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/mood-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M620-520q25 0 42.5-17.5T680-580q0-25-17.5-42.5T620-640q-25 0-42.5 17.5T560-580q0 25 17.5 42.5T620-520Zm-280 0q25 0 42.5-17.5T400-580q0-25-17.5-42.5T340-640q-25 0-42.5 17.5T280-580q0 25 17.5 42.5T340-520Zm140 260q68 0 123.5-38.5T684-400H276q25 63 80.5 101.5T480-260Zm0 180q-83 0-156-31.5T197-197q-54-54-85.5-127T80-480q0-83 31.5-156T197-763q54-54 127-85.5T480-880q83 0 156 31.5T763-763q54 54 85.5 127T880-480q0 83-31.5 156T763-197q-54 54-127 85.5T480-80Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/mood.svg b/app/javascript/material-icons/400-24px/mood.svg
new file mode 100644
index 00000000000000..46cafa76808008
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/mood.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M620-520q25 0 42.5-17.5T680-580q0-25-17.5-42.5T620-640q-25 0-42.5 17.5T560-580q0 25 17.5 42.5T620-520Zm-280 0q25 0 42.5-17.5T400-580q0-25-17.5-42.5T340-640q-25 0-42.5 17.5T280-580q0 25 17.5 42.5T340-520Zm140 260q68 0 123.5-38.5T684-400H276q25 63 80.5 101.5T480-260Zm0 180q-83 0-156-31.5T197-197q-54-54-85.5-127T80-480q0-83 31.5-156T197-763q54-54 127-85.5T480-880q83 0 156 31.5T763-763q54 54 85.5 127T880-480q0 83-31.5 156T763-197q-54 54-127 85.5T480-80Zm0-400Zm0 320q134 0 227-93t93-227q0-134-93-227t-227-93q-134 0-227 93t-93 227q0 134 93 227t227 93Z"/></svg>
\ No newline at end of file

From 9b59f9c652eb6accc2791db9aea2aa5d92fc155e Mon Sep 17 00:00:00 2001
From: Jeremy Kescher <jeremy@kescher.at>
Date: Sun, 25 Feb 2024 18:16:38 +0100
Subject: [PATCH 0271/2191] Bump Catstodon rev to 1.0.6

---
 lib/mastodon/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index 60ea3ec91daaf1..786e2114ce34c5 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -25,7 +25,7 @@ def prerelease
     end
 
     def catstodon_revision
-      '1.0.5'
+      '1.0.6'
     end
 
     def build_metadata

From 67a70be4634159a404a7fac9a86be807d837f73b Mon Sep 17 00:00:00 2001
From: Jeremy Kescher <jeremy@kescher.at>
Date: Sun, 25 Feb 2024 18:32:34 +0100
Subject: [PATCH 0272/2191] Move CHANGELOG.md to CHANGELOG_glitch.md

---
 CHANGELOG.md => CHANGELOG_glitch.md | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename CHANGELOG.md => CHANGELOG_glitch.md (100%)

diff --git a/CHANGELOG.md b/CHANGELOG_glitch.md
similarity index 100%
rename from CHANGELOG.md
rename to CHANGELOG_glitch.md

From 70e2623f7f622a64be9aae05a8253022e5533ab7 Mon Sep 17 00:00:00 2001
From: Jeremy Kescher <jeremy@kescher.at>
Date: Sun, 25 Feb 2024 18:37:46 +0100
Subject: [PATCH 0273/2191] Add Catstodon changelog file

---
 CHANGELOG.md | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 CHANGELOG.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 00000000000000..969bc2468a60bd
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,7 @@
+# Changelog
+
+All changes to Catstodon that aren't Mastodon or glitch-soc Mastodon changes will be documented here.
+
+## [v4.3.0-alpha.3+glitch+cat+1.0.6] - 2024-02-25
+
+- Applied changes to emoji reactions PR on glitch-soc

From fa2bbbfd9d28e45623b3e6ef063207a638fca6bb Mon Sep 17 00:00:00 2001
From: Essem <smswessem@gmail.com>
Date: Sun, 25 Feb 2024 17:09:45 -0600
Subject: [PATCH 0274/2191] Fix "threaded more" typo

---
 .../glitch/features/compose/components/thread_mode_button.jsx | 4 ++--
 app/javascript/flavours/glitch/locales/en.json                | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/javascript/flavours/glitch/features/compose/components/thread_mode_button.jsx b/app/javascript/flavours/glitch/features/compose/components/thread_mode_button.jsx
index 9b8947c447b505..59d569a999dd09 100644
--- a/app/javascript/flavours/glitch/features/compose/components/thread_mode_button.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/thread_mode_button.jsx
@@ -8,8 +8,8 @@ import { IconButton } from 'flavours/glitch/components/icon_button';
 import { useAppSelector, useAppDispatch } from 'flavours/glitch/store';
 
 const messages = defineMessages({
-  enable_threaded_mode: { id: 'compose.enable_threaded_mode', defaultMessage: 'Enable threaded more' },
-  disable_threaded_mode: { id: 'compose.disable_threaded_mode', defaultMessage: 'Disable threaded more' },
+  enable_threaded_mode: { id: 'compose.enable_threaded_mode', defaultMessage: 'Enable threaded mode' },
+  disable_threaded_mode: { id: 'compose.disable_threaded_mode', defaultMessage: 'Disable threaded mode' },
 });
 
 export const ThreadModeButton = () => {
diff --git a/app/javascript/flavours/glitch/locales/en.json b/app/javascript/flavours/glitch/locales/en.json
index f7d3b7f4d840f5..95ea68f93bfe9d 100644
--- a/app/javascript/flavours/glitch/locales/en.json
+++ b/app/javascript/flavours/glitch/locales/en.json
@@ -22,8 +22,8 @@
   "compose.content-type.markdown_meta": "Format your posts using Markdown",
   "compose.content-type.plain": "Plain text",
   "compose.content-type.plain_meta": "Write with no advanced formatting",
-  "compose.disable_threaded_mode": "Disable threaded more",
-  "compose.enable_threaded_mode": "Enable threaded more",
+  "compose.disable_threaded_mode": "Disable threaded mode",
+  "compose.enable_threaded_mode": "Enable threaded mode",
   "compose_form.sensitive.hide": "{count, plural, one {Mark media as sensitive} other {Mark media as sensitive}}",
   "compose_form.sensitive.marked": "{count, plural, one {Media is marked as sensitive} other {Media is marked as sensitive}}",
   "compose_form.sensitive.unmarked": "{count, plural, one {Media is not marked as sensitive} other {Media is not marked as sensitive}}",

From bbf6cb66f63c23daea725cb2b444a7c9f6c46899 Mon Sep 17 00:00:00 2001
From: Roni Laukkarinen <roni@dude.fi>
Date: Mon, 26 Feb 2024 02:57:13 +0200
Subject: [PATCH 0275/2191] Improve alt text form accessibility with long texts
 (#27095)

---
 app/javascript/styles/mastodon/components.scss | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 2e5db497db3120..46fda2033d96b3 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -5965,6 +5965,7 @@ a.status-card {
 .report-modal__comment {
   box-sizing: border-box;
   width: 50%;
+  min-width: 50%;
 
   @media screen and (width <= 480px) {
     width: 100%;
@@ -6033,6 +6034,14 @@ a.status-card {
     min-height: 100px;
     max-height: 50vh;
     border: 0;
+
+    @media screen and (height <= 600px) {
+      max-height: 20vh;
+    }
+
+    @media screen and (max-width: $no-columns-breakpoint) {
+      max-height: 20vh;
+    }
   }
 
   .setting-toggle {

From 1cb74eeec00b413d326308930c48280b4f8325f4 Mon Sep 17 00:00:00 2001
From: Roni Laukkarinen <roni@dude.fi>
Date: Mon, 26 Feb 2024 02:57:48 +0200
Subject: [PATCH 0276/2191] Fix search icon position on mobile (#29384)

---
 app/javascript/styles/mastodon/components.scss | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 46fda2033d96b3..93f2c0a48bb131 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -5195,7 +5195,6 @@ a.status-card {
   .icon {
     position: absolute;
     top: 12px + 2px;
-    inset-inline-start: 16px - 2px;
     display: inline-block;
     opacity: 0;
     transition: all 100ms linear;
@@ -5210,6 +5209,10 @@ a.status-card {
       pointer-events: auto;
       opacity: 1;
     }
+
+    @media screen and (min-width: $no-gap-breakpoint) {
+      inset-inline-start: 16px - 2px;
+    }
   }
 
   .icon-search {

From 8fd8b30c24ebb2f91292430bcf73f15884622195 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 26 Feb 2024 13:41:34 +0100
Subject: [PATCH 0277/2191] Update dependency cssnano to v6.0.5 (#29385)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 164 +++++++++++++++++++++++++++---------------------------
 1 file changed, 82 insertions(+), 82 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 5834f5566dcaf9..c85dc452bbe9ee 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5194,17 +5194,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"browserslist@npm:^4.0.0, browserslist@npm:^4.22.2":
-  version: 4.22.2
-  resolution: "browserslist@npm:4.22.2"
+"browserslist@npm:^4.0.0, browserslist@npm:^4.22.2, browserslist@npm:^4.23.0":
+  version: 4.23.0
+  resolution: "browserslist@npm:4.23.0"
   dependencies:
-    caniuse-lite: "npm:^1.0.30001565"
-    electron-to-chromium: "npm:^1.4.601"
+    caniuse-lite: "npm:^1.0.30001587"
+    electron-to-chromium: "npm:^1.4.668"
     node-releases: "npm:^2.0.14"
     update-browserslist-db: "npm:^1.0.13"
   bin:
     browserslist: cli.js
-  checksum: 10c0/2a331aab90503130043ca41dd5d281fa1e89d5e076d07a2d75e76bf4d693bd56e73d5abcd8c4f39119da6328d450578c216cf1cd5c99b82d8a90a2ae6271b465
+  checksum: 10c0/8e9cc154529062128d02a7af4d8adeead83ca1df8cd9ee65a88e2161039f3d68a4d40fea7353cab6bae4c16182dec2fdd9a1cf7dc2a2935498cee1af0e998943
   languageName: node
   linkType: hard
 
@@ -5420,10 +5420,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001565, caniuse-lite@npm:^1.0.30001578":
-  version: 1.0.30001578
-  resolution: "caniuse-lite@npm:1.0.30001578"
-  checksum: 10c0/c3bd9c08a945cee4f0cc284a217ebe9c2613e04d5aef4b48f1871a779b1875c34286469eb8d7d94bd028b5a354613e676ad503b6bf8db20a2f154574bd5fde48
+"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001578, caniuse-lite@npm:^1.0.30001587":
+  version: 1.0.30001589
+  resolution: "caniuse-lite@npm:1.0.30001589"
+  checksum: 10c0/20debfb949413f603011bc7dacaf050010778bc4f8632c86fafd1bd0c43180c95ae7c31f6c82348f6309e5e221934e327c3607a216e3f09640284acf78cd6d4d
   languageName: node
   linkType: hard
 
@@ -5727,7 +5727,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"colord@npm:^2.9.1, colord@npm:^2.9.3":
+"colord@npm:^2.9.3":
   version: 2.9.3
   resolution: "colord@npm:2.9.3"
   checksum: 10c0/9699e956894d8996b28c686afe8988720785f476f59335c80ce852ded76ab3ebe252703aec53d9bef54f6219aea6b960fb3d9a8300058a1d0c0d4026460cd110
@@ -6248,24 +6248,24 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cssnano-preset-default@npm:^6.0.4":
-  version: 6.0.4
-  resolution: "cssnano-preset-default@npm:6.0.4"
+"cssnano-preset-default@npm:^6.0.5":
+  version: 6.0.5
+  resolution: "cssnano-preset-default@npm:6.0.5"
   dependencies:
     css-declaration-sorter: "npm:^7.1.1"
     cssnano-utils: "npm:^4.0.1"
     postcss-calc: "npm:^9.0.1"
-    postcss-colormin: "npm:^6.0.2"
-    postcss-convert-values: "npm:^6.0.3"
+    postcss-colormin: "npm:^6.0.3"
+    postcss-convert-values: "npm:^6.0.4"
     postcss-discard-comments: "npm:^6.0.1"
     postcss-discard-duplicates: "npm:^6.0.2"
     postcss-discard-empty: "npm:^6.0.2"
     postcss-discard-overridden: "npm:^6.0.1"
-    postcss-merge-longhand: "npm:^6.0.2"
-    postcss-merge-rules: "npm:^6.0.3"
-    postcss-minify-font-values: "npm:^6.0.1"
-    postcss-minify-gradients: "npm:^6.0.1"
-    postcss-minify-params: "npm:^6.0.2"
+    postcss-merge-longhand: "npm:^6.0.3"
+    postcss-merge-rules: "npm:^6.0.4"
+    postcss-minify-font-values: "npm:^6.0.2"
+    postcss-minify-gradients: "npm:^6.0.2"
+    postcss-minify-params: "npm:^6.0.3"
     postcss-minify-selectors: "npm:^6.0.2"
     postcss-normalize-charset: "npm:^6.0.1"
     postcss-normalize-display-values: "npm:^6.0.1"
@@ -6273,17 +6273,17 @@ __metadata:
     postcss-normalize-repeat-style: "npm:^6.0.1"
     postcss-normalize-string: "npm:^6.0.1"
     postcss-normalize-timing-functions: "npm:^6.0.1"
-    postcss-normalize-unicode: "npm:^6.0.2"
+    postcss-normalize-unicode: "npm:^6.0.3"
     postcss-normalize-url: "npm:^6.0.1"
     postcss-normalize-whitespace: "npm:^6.0.1"
     postcss-ordered-values: "npm:^6.0.1"
-    postcss-reduce-initial: "npm:^6.0.2"
+    postcss-reduce-initial: "npm:^6.0.3"
     postcss-reduce-transforms: "npm:^6.0.1"
     postcss-svgo: "npm:^6.0.2"
     postcss-unique-selectors: "npm:^6.0.2"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/8a1569756c2189d9db91b2bbd7bc44b39ec6c0bac8cb1a34ab37801b40626b372c2341e696f3a4dfe03ee0490f033299b5e5f9511e2d3572b9b5a2edb7a76e3b
+  checksum: 10c0/b51072bf808ad7af0e7d38eb2490fc9dd27bfa95c0de804f7b5f242a283cedd6446ef55936843e4c7c9856540e225e322a794e70b47ae515b894e84b629a58ea
   languageName: node
   linkType: hard
 
@@ -6297,14 +6297,14 @@ __metadata:
   linkType: hard
 
 "cssnano@npm:^6.0.1":
-  version: 6.0.4
-  resolution: "cssnano@npm:6.0.4"
+  version: 6.0.5
+  resolution: "cssnano@npm:6.0.5"
   dependencies:
-    cssnano-preset-default: "npm:^6.0.4"
+    cssnano-preset-default: "npm:^6.0.5"
     lilconfig: "npm:^3.1.1"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/734b8d1a925288a707fa73087b7ae340a93c59a1838ac897f470104bbebf8aa4fb2a24e190e50a4eea592b595bca0a2f25e8aedcf237ea1675c8d1e636f587a5
+  checksum: 10c0/f802b563bf4a3a973d91e0327803536d56c4667138587d84f6341f68862d7514bceb2f1258d7bbf66b2fdedf1e9c1b7fd0b4848bb0069296ecbebbdc70f2ccca
   languageName: node
   linkType: hard
 
@@ -6941,10 +6941,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"electron-to-chromium@npm:^1.4.601":
-  version: 1.4.609
-  resolution: "electron-to-chromium@npm:1.4.609"
-  checksum: 10c0/9675a79388acbaff5953a4c61589af7da93e0d1f9d6a3b284c7630f10126eb0998557b07448514214d5a3d19025310039b55f405ab701b1253130fc94907f743
+"electron-to-chromium@npm:^1.4.668":
+  version: 1.4.681
+  resolution: "electron-to-chromium@npm:1.4.681"
+  checksum: 10c0/5b2558dfb8bb82c20fb5fa1d9bbe06a3add47431dc3e1e4815e997be6ad387787047d9e534ed96839a9e7012520a5281c865158b09db41d10c029af003f05f94
   languageName: node
   linkType: hard
 
@@ -12799,29 +12799,29 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-colormin@npm:^6.0.2":
-  version: 6.0.2
-  resolution: "postcss-colormin@npm:6.0.2"
+"postcss-colormin@npm:^6.0.3":
+  version: 6.0.3
+  resolution: "postcss-colormin@npm:6.0.3"
   dependencies:
-    browserslist: "npm:^4.22.2"
+    browserslist: "npm:^4.23.0"
     caniuse-api: "npm:^3.0.0"
-    colord: "npm:^2.9.1"
+    colord: "npm:^2.9.3"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/229681f9b89ba0909b4c69563837b0c32cc3d1c17ed1b00c33d4abfb0a0ef455124968e4885b5f92c64482e92074cd1958018ec111ed5d118f1e24baeda19c14
+  checksum: 10c0/beddf9fd1bda3f456e1235829297341de34ca40f9a2e16f23930e13d9df6b6186ca3717817da0adab266bf5e8fcde7bd056ab54187f959eb53d2bfbde7f441e6
   languageName: node
   linkType: hard
 
-"postcss-convert-values@npm:^6.0.3":
-  version: 6.0.3
-  resolution: "postcss-convert-values@npm:6.0.3"
+"postcss-convert-values@npm:^6.0.4":
+  version: 6.0.4
+  resolution: "postcss-convert-values@npm:6.0.4"
   dependencies:
-    browserslist: "npm:^4.22.2"
+    browserslist: "npm:^4.23.0"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/614a24d4bc9142f277ed12eefe556eae6ad8292092953c8ebfcf518ef52e8de5dd337a9e915b64e712b8b95175ca0fd8d1b1e9e806d25a8e4f01c75d784f3118
+  checksum: 10c0/c267ae8f2dbfc7fff5e46cd984bb6191405fe76f1eee04fd10a69fe10065ad7c3b62fa36e4bef3fa3a730284cd7295cb66968afb6cdaad0571a57cfcb25248fc
   languageName: node
   linkType: hard
 
@@ -12884,66 +12884,66 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-merge-longhand@npm:^6.0.2":
-  version: 6.0.2
-  resolution: "postcss-merge-longhand@npm:6.0.2"
+"postcss-merge-longhand@npm:^6.0.3":
+  version: 6.0.3
+  resolution: "postcss-merge-longhand@npm:6.0.3"
   dependencies:
     postcss-value-parser: "npm:^4.2.0"
-    stylehacks: "npm:^6.0.2"
+    stylehacks: "npm:^6.0.3"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/2b3fae51bffc5962258d638bc7f415237593b515f369233e023f0eae5b13116297463c04b8c47a7b7af51cba5faaa7f517b653f6123e51935d670d4d4de5a26d
+  checksum: 10c0/a71758832e198af58a3d1c5013731c8dcd646611bd6ce099a5cbcef4dc2fd7c574e2f28f80bfe67887b046abfacca94bbeb2982bef3b087e9b52bd4acd3d8a38
   languageName: node
   linkType: hard
 
-"postcss-merge-rules@npm:^6.0.3":
-  version: 6.0.3
-  resolution: "postcss-merge-rules@npm:6.0.3"
+"postcss-merge-rules@npm:^6.0.4":
+  version: 6.0.4
+  resolution: "postcss-merge-rules@npm:6.0.4"
   dependencies:
-    browserslist: "npm:^4.22.2"
+    browserslist: "npm:^4.23.0"
     caniuse-api: "npm:^3.0.0"
     cssnano-utils: "npm:^4.0.1"
     postcss-selector-parser: "npm:^6.0.15"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/c8355db11aa60bedcb1e6535fcd70f6ecec2dadd5c2975d3accf0eedbc92af782ac1f5e91a53866816ce332e4cbf1b94749a9425067935be066bc0c974e30fee
+  checksum: 10c0/57a16817c099dfc644bf2619831208bafcfd91225cccc8f6d2913241fe4a7225b3dc565bc92402902b4271771ad5d56358afd8eb7f709827a6576177e0bf9433
   languageName: node
   linkType: hard
 
-"postcss-minify-font-values@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "postcss-minify-font-values@npm:6.0.1"
+"postcss-minify-font-values@npm:^6.0.2":
+  version: 6.0.2
+  resolution: "postcss-minify-font-values@npm:6.0.2"
   dependencies:
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/15af236245a6d27f1c83c943ef90d144ca043894bbd86f134506a984811a936a06824739984824965c7c3fd5a0ff4ed299f26a33f3b628662aa4fb40d7536fd0
+  checksum: 10c0/6a9407441531efd83683d529c9632c5c4ac7d971716dffa708b3775f36382ca9a960372793c4f9df68aaae513213a53400860d9a6bd233da6f68f8fc985efe72
   languageName: node
   linkType: hard
 
-"postcss-minify-gradients@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "postcss-minify-gradients@npm:6.0.1"
+"postcss-minify-gradients@npm:^6.0.2":
+  version: 6.0.2
+  resolution: "postcss-minify-gradients@npm:6.0.2"
   dependencies:
-    colord: "npm:^2.9.1"
+    colord: "npm:^2.9.3"
     cssnano-utils: "npm:^4.0.1"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/e700c3f6dc425072ff739fb18bb71c970599e0d909b326f4a5c84e91cf24c4f1ee78e4d161bd4cdf6e25b7d78f1ad082bb885afdd2a150f9b281520fc6359d5c
+  checksum: 10c0/7a72edf3fe0028010d85af77d8c6bfa6147785bc9b3758efb0d09b51a8254ce3f8bc3f67220af6f204bb175e95b9e8355baf29b9c32b1df590506bca835b02f4
   languageName: node
   linkType: hard
 
-"postcss-minify-params@npm:^6.0.2":
-  version: 6.0.2
-  resolution: "postcss-minify-params@npm:6.0.2"
+"postcss-minify-params@npm:^6.0.3":
+  version: 6.0.3
+  resolution: "postcss-minify-params@npm:6.0.3"
   dependencies:
-    browserslist: "npm:^4.22.2"
+    browserslist: "npm:^4.23.0"
     cssnano-utils: "npm:^4.0.1"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/6638460d2be4a2eca8adee8409b70d6c6a19aff8cf93fda1b45c9da627b258b6baaa6acb48f51d26cd287704a235f9c9ae2e4744335b1fd47e163177c33896df
+  checksum: 10c0/65a8bc0f75e7dc8a292797209ec0b1adef52923daf181ad34a7e83cbc974e2192e0e35ce0f35dbcb0177828991f92da8e239564f56588482d99c04a3e0755266
   languageName: node
   linkType: hard
 
@@ -13066,15 +13066,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-normalize-unicode@npm:^6.0.2":
-  version: 6.0.2
-  resolution: "postcss-normalize-unicode@npm:6.0.2"
+"postcss-normalize-unicode@npm:^6.0.3":
+  version: 6.0.3
+  resolution: "postcss-normalize-unicode@npm:6.0.3"
   dependencies:
-    browserslist: "npm:^4.22.2"
+    browserslist: "npm:^4.23.0"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/ea696194f65ad31de2a9c022f1946a07c298f04070706d88a20061845e1e052e645c74b5bc785595814db87d14e435f85e968a44855dedc207d8c0b5d43b1aee
+  checksum: 10c0/9a79ff4fcdfc876e12fa595271f2fca655a5022fd63a202387fa9be1f6705a6e34395d555de8878ffed8b0305281ff452e26045bdc710e161f4103380b1d05d8
   languageName: node
   linkType: hard
 
@@ -13112,15 +13112,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-reduce-initial@npm:^6.0.2":
-  version: 6.0.2
-  resolution: "postcss-reduce-initial@npm:6.0.2"
+"postcss-reduce-initial@npm:^6.0.3":
+  version: 6.0.3
+  resolution: "postcss-reduce-initial@npm:6.0.3"
   dependencies:
-    browserslist: "npm:^4.22.2"
+    browserslist: "npm:^4.23.0"
     caniuse-api: "npm:^3.0.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/d35ad6f9725cdceb390a97a461e8594df7fbed4c55497c90d07c42f8343bf80139e720eaebc580bf480bf10e92959490aa308af66d8802ba71c327bdf08c93a1
+  checksum: 10c0/824813d56f1f0d502b35781de5dd3caa5af71c9652710c95266ef8602a36cd9ea757033fb7206562d0a03e21f7a4198c09538dbf8c7548d014631a64bdcbb406
   languageName: node
   linkType: hard
 
@@ -15704,15 +15704,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"stylehacks@npm:^6.0.2":
-  version: 6.0.2
-  resolution: "stylehacks@npm:6.0.2"
+"stylehacks@npm:^6.0.3":
+  version: 6.0.3
+  resolution: "stylehacks@npm:6.0.3"
   dependencies:
-    browserslist: "npm:^4.22.2"
+    browserslist: "npm:^4.23.0"
     postcss-selector-parser: "npm:^6.0.15"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/658cac8b28edcb94d1db67808ab3aaa511cb1b9293594fc95607ee42ac4f57e742d9a1fa3ff5d5849db692971dc2a310e9ac1ed0bd4ea4bc48c80f5a6ef823fc
+  checksum: 10c0/780c147a695d77794f60e993824f3c67f1cde04905163e5a1b50ba8a1715ddda789cfdf86d46711713afe4a38252d5e3f6d79b103dc29d3b6f3749c24749de1d
   languageName: node
   linkType: hard
 

From 1ad3cffaea00ef4e6f9fd12a9e97891e86dcc337 Mon Sep 17 00:00:00 2001
From: Jason Punyon <jason.punyon@gmail.com>
Date: Mon, 26 Feb 2024 07:42:09 -0500
Subject: [PATCH 0278/2191] Missed a .to_date (#29390)

---
 app/views/relationships/_account.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/relationships/_account.html.haml b/app/views/relationships/_account.html.haml
index 43a3d64bc859fc..23afcf74951978 100644
--- a/app/views/relationships/_account.html.haml
+++ b/app/views/relationships/_account.html.haml
@@ -16,7 +16,7 @@
             %small= t('accounts.followers', count: account.followers_count).downcase
           %td.accounts-table__count
             - if account.last_status_at.present?
-              %time.time-ago{ datetime: account.last_status_at.to_date.iso8601, title: l(account.last_status_at.to_date) }= l account.last_status_at
+              %time.time-ago{ datetime: account.last_status_at.to_date.iso8601, title: l(account.last_status_at.to_date) }= l account.last_status_at.to_date
             - else
               \-
             %small= t('accounts.last_active')

From e57d321097d0373001ad627646de989d26bd848f Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 26 Feb 2024 13:51:37 +0100
Subject: [PATCH 0279/2191] Update dependency httplog to v1.6.3 (#29399)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 734ed6ec8a19d4..090697e709968d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -333,7 +333,7 @@ GEM
     http-form_data (2.3.0)
     http_accept_language (2.1.1)
     httpclient (2.8.3)
-    httplog (1.6.2)
+    httplog (1.6.3)
       rack (>= 2.0)
       rainbow (>= 2.0.0)
     i18n (1.14.1)

From b829d261ba201bac309aa23d5f1c8bd29e9c0e3d Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 26 Feb 2024 13:52:03 +0100
Subject: [PATCH 0280/2191] Update DefinitelyTyped types (non-major) (#29404)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index c85dc452bbe9ee..943c488714735e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3282,13 +3282,13 @@ __metadata:
   linkType: hard
 
 "@types/pg@npm:^8.6.6":
-  version: 8.11.0
-  resolution: "@types/pg@npm:8.11.0"
+  version: 8.11.1
+  resolution: "@types/pg@npm:8.11.1"
   dependencies:
     "@types/node": "npm:*"
     pg-protocol: "npm:*"
     pg-types: "npm:^4.0.1"
-  checksum: 10c0/df2c2ac11fa5e8863a98aadce9a9168af5cfc38a226a228d8b1be513ef48d33ceb9bfaa64ef685a87e0611a4f8d94f2e0736bb2812fa00ed264f76679b86945d
+  checksum: 10c0/7563075e037c8f7579cfb55e60e0891b742537ac50dc1d802051185513f850725fb05a635418ff26602c7cb6f176f6677a0099d586d51b72c651bb741b05b6e7
   languageName: node
   linkType: hard
 
@@ -3472,13 +3472,13 @@ __metadata:
   linkType: hard
 
 "@types/react@npm:*, @types/react@npm:16 || 17 || 18, @types/react@npm:>=16.9.11, @types/react@npm:^18.2.7":
-  version: 18.2.57
-  resolution: "@types/react@npm:18.2.57"
+  version: 18.2.58
+  resolution: "@types/react@npm:18.2.58"
   dependencies:
     "@types/prop-types": "npm:*"
     "@types/scheduler": "npm:*"
     csstype: "npm:^3.0.2"
-  checksum: 10c0/d5ed2f04c069c591e41ef1bea5b70f89dc7a4edff2254c4df801ddaa21b43b2aa70c106c049b9b6736f98f5afe66576d0e75a9e47c7044f2660b1744ff64f535
+  checksum: 10c0/80145b707b780d682092b51d520f58a0171c4067ff36cf488d3346d92b715b27fd334acd0fabb8eb21a4eb6c4061f1535e8bfa6642a7f4025e63ebec868fb6d1
   languageName: node
   linkType: hard
 

From 98e3dc2578f4fee6cc8e08a714cfc273d7556ba4 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 26 Feb 2024 14:03:06 +0100
Subject: [PATCH 0281/2191] New Crowdin Translations (automated) (#29382)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/fr-CA.json | 11 ++++
 app/javascript/mastodon/locales/fr.json    | 11 ++++
 app/javascript/mastodon/locales/ie.json    |  6 ++
 app/javascript/mastodon/locales/kab.json   | 29 ++++++++--
 app/javascript/mastodon/locales/ko.json    |  2 +-
 app/javascript/mastodon/locales/sk.json    |  1 +
 app/javascript/mastodon/locales/tai.json   | 36 ++++++------
 app/javascript/mastodon/locales/th.json    | 10 ++--
 app/javascript/mastodon/locales/tr.json    |  4 +-
 config/locales/activerecord.el.yml         |  4 ++
 config/locales/be.yml                      |  5 ++
 config/locales/ca.yml                      |  4 +-
 config/locales/da.yml                      |  4 +-
 config/locales/devise.pt-BR.yml            |  1 +
 config/locales/doorkeeper.th.yml           | 14 ++---
 config/locales/el.yml                      | 13 +++++
 config/locales/es.yml                      |  2 +-
 config/locales/eu.yml                      |  2 +
 config/locales/fi.yml                      |  5 ++
 config/locales/fo.yml                      |  2 +
 config/locales/he.yml                      |  2 +
 config/locales/hu.yml                      |  4 +-
 config/locales/ie.yml                      |  5 ++
 config/locales/kab.yml                     |  6 +-
 config/locales/ko.yml                      |  5 ++
 config/locales/lad.yml                     |  5 ++
 config/locales/lt.yml                      |  5 ++
 config/locales/pt-BR.yml                   |  1 +
 config/locales/pt-PT.yml                   |  3 +
 config/locales/simple_form.an.yml          |  2 -
 config/locales/simple_form.ar.yml          |  2 -
 config/locales/simple_form.ast.yml         |  2 -
 config/locales/simple_form.be.yml          |  4 +-
 config/locales/simple_form.bg.yml          |  6 +-
 config/locales/simple_form.br.yml          |  4 +-
 config/locales/simple_form.ckb.yml         |  2 -
 config/locales/simple_form.co.yml          |  2 -
 config/locales/simple_form.cs.yml          |  4 +-
 config/locales/simple_form.cy.yml          |  2 -
 config/locales/simple_form.da.yml          |  4 +-
 config/locales/simple_form.de.yml          |  4 +-
 config/locales/simple_form.el.yml          |  2 -
 config/locales/simple_form.en-GB.yml       |  2 -
 config/locales/simple_form.eo.yml          |  2 -
 config/locales/simple_form.es-AR.yml       |  4 +-
 config/locales/simple_form.es-MX.yml       |  4 +-
 config/locales/simple_form.es.yml          | 16 +++---
 config/locales/simple_form.et.yml          |  2 -
 config/locales/simple_form.eu.yml          |  4 +-
 config/locales/simple_form.fa.yml          |  2 -
 config/locales/simple_form.fo.yml          |  4 +-
 config/locales/simple_form.fr-CA.yml       |  4 +-
 config/locales/simple_form.fr.yml          |  4 +-
 config/locales/simple_form.fy.yml          |  2 -
 config/locales/simple_form.gd.yml          |  2 -
 config/locales/simple_form.gl.yml          |  4 +-
 config/locales/simple_form.he.yml          |  4 +-
 config/locales/simple_form.hr.yml          |  2 -
 config/locales/simple_form.hu.yml          |  4 +-
 config/locales/simple_form.hy.yml          |  2 -
 config/locales/simple_form.id.yml          |  2 -
 config/locales/simple_form.ie.yml          |  4 +-
 config/locales/simple_form.io.yml          |  2 -
 config/locales/simple_form.is.yml          |  2 -
 config/locales/simple_form.it.yml          |  4 +-
 config/locales/simple_form.ja.yml          |  2 -
 config/locales/simple_form.ka.yml          |  2 -
 config/locales/simple_form.ko.yml          |  4 +-
 config/locales/simple_form.ku.yml          |  2 -
 config/locales/simple_form.lad.yml         |  4 +-
 config/locales/simple_form.lt.yml          |  4 +-
 config/locales/simple_form.lv.yml          |  2 -
 config/locales/simple_form.ms.yml          |  2 -
 config/locales/simple_form.my.yml          |  2 -
 config/locales/simple_form.nl.yml          |  4 +-
 config/locales/simple_form.nn.yml          |  2 -
 config/locales/simple_form.no.yml          |  2 -
 config/locales/simple_form.oc.yml          |  2 -
 config/locales/simple_form.pl.yml          |  4 +-
 config/locales/simple_form.pt-BR.yml       |  2 -
 config/locales/simple_form.pt-PT.yml       |  4 +-
 config/locales/simple_form.ro.yml          |  2 -
 config/locales/simple_form.ru.yml          |  2 -
 config/locales/simple_form.sc.yml          |  2 -
 config/locales/simple_form.sco.yml         |  2 -
 config/locales/simple_form.si.yml          |  2 -
 config/locales/simple_form.sk.yml          |  4 +-
 config/locales/simple_form.sl.yml          |  4 +-
 config/locales/simple_form.sq.yml          |  4 +-
 config/locales/simple_form.sr-Latn.yml     |  2 -
 config/locales/simple_form.sr.yml          |  2 -
 config/locales/simple_form.sv.yml          |  2 -
 config/locales/simple_form.ta.yml          |  1 -
 config/locales/simple_form.th.yml          | 12 ++--
 config/locales/simple_form.tr.yml          |  4 +-
 config/locales/simple_form.uk.yml          |  4 +-
 config/locales/simple_form.vi.yml          |  2 -
 config/locales/simple_form.zh-CN.yml       |  4 +-
 config/locales/simple_form.zh-HK.yml       |  2 -
 config/locales/simple_form.zh-TW.yml       |  4 +-
 config/locales/sq.yml                      |  2 +
 config/locales/th.yml                      | 65 ++++++++++++----------
 config/locales/tr.yml                      |  2 +-
 103 files changed, 268 insertions(+), 230 deletions(-)

diff --git a/app/javascript/mastodon/locales/fr-CA.json b/app/javascript/mastodon/locales/fr-CA.json
index 49db30d75ec7f9..fc969b02f436f8 100644
--- a/app/javascript/mastodon/locales/fr-CA.json
+++ b/app/javascript/mastodon/locales/fr-CA.json
@@ -277,6 +277,17 @@
   "follow_request.authorize": "Autoriser",
   "follow_request.reject": "Rejeter",
   "follow_requests.unlocked_explanation": "Même si votre compte n’est pas privé, l’équipe de {domain} a pensé que vous pourriez vouloir peut-être consulter manuellement les demandes d'abonnement de ces comptes.",
+  "follow_suggestions.curated_suggestion": "Choix du staff",
+  "follow_suggestions.dismiss": "Ne plus afficher",
+  "follow_suggestions.hints.featured": "Ce profil a été sélectionné par l'équipe de {domain}.",
+  "follow_suggestions.hints.friends_of_friends": "Ce profil est populaire parmi les personnes que vous suivez.",
+  "follow_suggestions.hints.most_followed": "Ce profil est l'un des plus suivis sur {domain}.",
+  "follow_suggestions.hints.most_interactions": "Ce profil a récemment fait l'objet d'une grande attention sur {domain}.",
+  "follow_suggestions.hints.similar_to_recently_followed": "Ce profil est similaire aux profils que vous avez suivis le plus récemment.",
+  "follow_suggestions.personalized_suggestion": "Suggestion personnalisée",
+  "follow_suggestions.popular_suggestion": "Suggestion populaire",
+  "follow_suggestions.view_all": "Tout afficher",
+  "follow_suggestions.who_to_follow": "Qui suivre",
   "followed_tags": "Hashtags suivis",
   "footer.about": "À propos",
   "footer.directory": "Annuaire des profils",
diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json
index 1f657c81853ab4..8396679d06265d 100644
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@@ -277,6 +277,17 @@
   "follow_request.authorize": "Accepter",
   "follow_request.reject": "Rejeter",
   "follow_requests.unlocked_explanation": "Même si votre compte n’est pas privé, l’équipe de {domain} a pensé que vous pourriez vouloir consulter manuellement les demandes de suivi de ces comptes.",
+  "follow_suggestions.curated_suggestion": "Choix du staff",
+  "follow_suggestions.dismiss": "Ne plus afficher",
+  "follow_suggestions.hints.featured": "Ce profil a été sélectionné par l'équipe de {domain}.",
+  "follow_suggestions.hints.friends_of_friends": "Ce profil est populaire parmi les personnes que vous suivez.",
+  "follow_suggestions.hints.most_followed": "Ce profil est l'un des plus suivis sur {domain}.",
+  "follow_suggestions.hints.most_interactions": "Ce profil a récemment fait l'objet d'une grande attention sur {domain}.",
+  "follow_suggestions.hints.similar_to_recently_followed": "Ce profil est similaire aux profils que vous avez suivis le plus récemment.",
+  "follow_suggestions.personalized_suggestion": "Suggestion personnalisée",
+  "follow_suggestions.popular_suggestion": "Suggestion populaire",
+  "follow_suggestions.view_all": "Tout afficher",
+  "follow_suggestions.who_to_follow": "Qui suivre",
   "followed_tags": "Hashtags suivis",
   "footer.about": "À propos",
   "footer.directory": "Annuaire des profils",
diff --git a/app/javascript/mastodon/locales/ie.json b/app/javascript/mastodon/locales/ie.json
index c28a348dc7a02c..7bd938c1bf447e 100644
--- a/app/javascript/mastodon/locales/ie.json
+++ b/app/javascript/mastodon/locales/ie.json
@@ -277,7 +277,13 @@
   "follow_request.authorize": "Autorisar",
   "follow_request.reject": "Rejecter",
   "follow_requests.unlocked_explanation": "Benque tu conto ne es cludet, li administratores de {domain} pensat que tu fórsan vell voler tractar seque-petitiones de tis-ci contos manualmen.",
+  "follow_suggestions.curated_suggestion": "Selection del employates",
   "follow_suggestions.dismiss": "Ne monstrar plu",
+  "follow_suggestions.hints.featured": "Ti-ci profil ha esset selectet directmen del equip de {domain}.",
+  "follow_suggestions.hints.friends_of_friends": "Ti-ci profil es populari ínter tis qui tu seque.",
+  "follow_suggestions.hints.most_followed": "Ti-ci profil es un del max sequet sur {domain}.",
+  "follow_suggestions.hints.most_interactions": "Ti-ci profil ha recivet mult atention recentmen sur {domain}.",
+  "follow_suggestions.hints.similar_to_recently_followed": "Ti-ci profil es simil al profiles queles tu ha recentmen sequet.",
   "follow_suggestions.personalized_suggestion": "Personalisat suggestion",
   "follow_suggestions.popular_suggestion": "Populari suggestion",
   "follow_suggestions.view_all": "Vider omnicos",
diff --git a/app/javascript/mastodon/locales/kab.json b/app/javascript/mastodon/locales/kab.json
index 45c6fb321d133f..c45543a80332ed 100644
--- a/app/javascript/mastodon/locales/kab.json
+++ b/app/javascript/mastodon/locales/kab.json
@@ -22,6 +22,7 @@
   "account.followers": "Imeḍfaren",
   "account.followers.empty": "Ar tura, ulac yiwen i yeṭṭafaṛen amseqdac-agi.",
   "account.followers_counter": "{count, plural, one {{count} n umeḍfar} other {{count} n imeḍfaren}}",
+  "account.following": "Yeṭṭafaṛ",
   "account.following_counter": "{count, plural, one {{counter} yettwaḍfaren} other {{counter} yettwaḍfaren}}",
   "account.follows.empty": "Ar tura, amseqdac-agi ur yeṭṭafaṛ yiwen.",
   "account.go_to_profile": "Ddu ɣer umaɣnu",
@@ -39,6 +40,7 @@
   "account.posts_with_replies": "Tisuffaɣ d tririyin",
   "account.report": "Cetki ɣef @{name}",
   "account.requested": "Di laɛḍil ad yettwaqbel. Ssit i wakken ad yefsex usuter n uḍfar",
+  "account.requested_follow": "{name} yessuter ad k-yeḍfer",
   "account.share": "Bḍu amaɣnu n @{name}",
   "account.show_reblogs": "Ssken-d inebḍa n @{name}",
   "account.statuses_counter": "{count, plural, one {{counter} n tsuffeɣt} other {{counter} n tsuffaɣ}}",
@@ -57,7 +59,7 @@
   "alert.unexpected.title": "Ayhuh!",
   "announcement.announcement": "Ulɣu",
   "audio.hide": "Ffer amesli",
-  "boost_modal.combo": "Tzemreḍ ad tetekkiḍ ɣef {combo} akken ad tessurfeḍ aya tikelt-nniḍen",
+  "boost_modal.combo": "Tzemreḍ ad tsiteḍ ɣef {combo} akken ad tzegleḍ aya tikelt i d-iteddun",
   "bundle_column_error.copy_stacktrace": "Nɣel tuccḍa n uneqqis",
   "bundle_column_error.error.title": "Uh, ala !",
   "bundle_column_error.network.title": "Tuccḍa deg uẓeṭṭa",
@@ -73,7 +75,8 @@
   "column.blocks": "Imiḍanen yettusḥebsen",
   "column.bookmarks": "Ticraḍ",
   "column.community": "Tasuddemt tadigant",
-  "column.directory": "Inig deg imaɣnuten",
+  "column.direct": "Tabdarin tusligin",
+  "column.directory": "Inig deg imeɣna",
   "column.domain_blocks": "Taɣulin yeffren",
   "column.favourites": "Imenyafen",
   "column.follow_requests": "Isuturen n teḍfeṛt",
@@ -105,6 +108,7 @@
   "compose_form.lock_disclaimer.lock": "yettwacekkel",
   "compose_form.placeholder": "D acu i itezzin deg wallaɣ?",
   "compose_form.poll.duration": "Tanzagt n tefrant",
+  "compose_form.poll.multiple": "Aṭas n ufran",
   "compose_form.poll.option_placeholder": "Taxtiṛt {number}",
   "compose_form.poll.single": "Fren yiwen",
   "compose_form.publish": "Suffeɣ",
@@ -187,17 +191,20 @@
   "explore.trending_links": "Isallen",
   "explore.trending_statuses": "Tisuffaɣ",
   "explore.trending_tags": "Ihacṭagen",
+  "filter_modal.added.review_and_configure_title": "Iɣewwaṛen n imzizdig",
   "filter_modal.added.settings_link": "asebter n yiɣewwaṛen",
   "filter_modal.select_filter.prompt_new": "Taggayt tamaynutt : {name}",
   "filter_modal.select_filter.search": "Nadi neɣ snulfu-d",
   "firehose.all": "Akk",
   "firehose.local": "Deg uqeddac-ayi",
+  "firehose.remote": "Iqeddacen nniḍen",
   "follow_request.authorize": "Ssireg",
   "follow_request.reject": "Agi",
+  "follow_suggestions.dismiss": "Ur ttɛawad ara ad t-id-sekneṭ",
   "follow_suggestions.who_to_follow": "Menhu ara ḍefṛeḍ",
   "followed_tags": "Ihacṭagen yettwaḍfaren",
   "footer.about": "Ɣef",
-  "footer.directory": "Akaram n imaɣnuten",
+  "footer.directory": "Akaram n imeɣna",
   "footer.get_app": "Awi-d asnas",
   "footer.invite": "Ɛreḍ-d kra n yimdanen",
   "footer.keyboard_shortcuts": "Inegzumen n unasiw",
@@ -221,9 +228,12 @@
   "home.column_settings.show_reblogs": "Ssken-d beṭṭu",
   "home.column_settings.show_replies": "Ssken-d tiririyin",
   "home.hide_announcements": "Ffer ulɣuyen",
+  "home.pending_critical_update.body": "Ma ulac aɣilif, leqqem aqeddac-ik Mastodon akken kan tzemreḍ !",
   "home.show_announcements": "Ssken-d ulɣuyen",
   "interaction_modal.no_account_yet": "Ulac-ik·ikem deg Maṣṭudun?",
+  "interaction_modal.on_another_server": "Deg uqeddac nniḍen",
   "interaction_modal.on_this_server": "Deg uqeddac-ayi",
+  "interaction_modal.sign_in": "Ur tekcimeḍ ara ɣer uqeddac-a. Anda yella umiḍan-ik·im ?",
   "interaction_modal.title.follow": "Ḍfer {name}",
   "intervals.full.days": "{number, plural, one {# n wass} other {# n wussan}}",
   "intervals.full.hours": "{number, plural, one {# n usarag} other {# n yesragen}}",
@@ -351,12 +361,15 @@
   "onboarding.follows.lead": "You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!",
   "onboarding.follows.title": "Popular on Mastodon",
   "onboarding.profile.display_name": "Isem ara d-yettwaskanen",
+  "onboarding.share.message": "Nekk d {username} deg #Mastodon! Ḍfer iyi-d sya {url}",
   "onboarding.share.title": "Bḍu amaɣnu-inek·inem",
   "onboarding.start.lead": "Your new Mastodon account is ready to go. Here's how you can make the most of it:",
   "onboarding.start.skip": "Want to skip right ahead?",
+  "onboarding.start.title": "Tseggmeḍ-tt !",
   "onboarding.steps.follow_people.body": "You curate your own feed. Lets fill it with interesting people.",
   "onboarding.steps.follow_people.title": "Follow {count, plural, one {one person} other {# people}}",
   "onboarding.steps.publish_status.body": "Say hello to the world.",
+  "onboarding.steps.publish_status.title": "Aru tasuffeɣt-inek·inem tamezwarutt",
   "onboarding.steps.setup_profile.body": "Others are more likely to interact with you with a filled out profile.",
   "onboarding.steps.setup_profile.title": "Customize your profile",
   "onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
@@ -371,7 +384,10 @@
   "poll_button.add_poll": "Rnu asenqed",
   "poll_button.remove_poll": "Kkes asenqed",
   "privacy.change": "Seggem tabaḍnit n yizen",
+  "privacy.direct.long": "Wid akk i d-yettwabdaren deg tuffeɣt",
+  "privacy.private.long": "Ala wid i k-yeṭṭafaṛen",
   "privacy.private.short": "Imeḍfaren",
+  "privacy.public.long": "Kra n win yellan deg Masṭudun neɣ berra-s",
   "privacy.public.short": "Azayez",
   "privacy_policy.title": "Tasertit tabaḍnit",
   "refresh": "Smiren",
@@ -404,9 +420,14 @@
   "report_notification.categories.other": "Ayen nniḍen",
   "report_notification.categories.spam": "Aspam",
   "report_notification.open": "Ldi aneqqis",
+  "search.no_recent_searches": "Ulac inadiyen ineggura",
   "search.placeholder": "Nadi",
   "search.search_or_paste": "Nadi neɣ senṭeḍ URL",
+  "search_popout.language_code": "Tangalt ISO n tutlayt",
+  "search_popout.options": "Iwellihen n unadi",
+  "search_popout.recent": "Inadiyen ineggura",
   "search_popout.user": "amseqdac",
+  "search_results.accounts": "Imeɣna",
   "search_results.all": "Akk",
   "search_results.hashtags": "Ihacṭagen",
   "search_results.see_all": "Wali-ten akk",
@@ -471,7 +492,7 @@
   "timeline_hint.resources.followers": "Imeḍfaṛen",
   "timeline_hint.resources.follows": "T·Yeṭafaṛ",
   "timeline_hint.resources.statuses": "Tisuffaɣ tiqdimin",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {# days}}",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} n wemdan} other {{counter} n medden}} deg {days, plural, one {ass} other {{days} n wussan}} iɛeddan",
   "trends.trending_now": "Ayen mucaɛen tura",
   "ui.beforeunload": "Arewway-ik·im ad iruḥ ma yella tefeɣ-d deg Maṣṭudun.",
   "units.short.billion": "{count}B",
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index d469af5d50554b..36290cbb95d8c6 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -536,7 +536,7 @@
   "privacy.public.long": "마스토돈 내외 모두",
   "privacy.public.short": "공개",
   "privacy.unlisted.additional": "공개와 똑같지만 게시물이 실시간 피드나 해시태그, 둘러보기, (계정 설정에서 허용했더라도) 마스토돈 검색에서 제외됩니다.",
-  "privacy.unlisted.long": "더 적은 알고리즘 팡파레",
+  "privacy.unlisted.long": "더 적은 알고리즘 팡파르",
   "privacy.unlisted.short": "조용한 공개",
   "privacy_policy.last_updated": "{date}에 마지막으로 업데이트됨",
   "privacy_policy.title": "개인정보처리방침",
diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json
index af975069b8d025..37c0dd1383fd06 100644
--- a/app/javascript/mastodon/locales/sk.json
+++ b/app/javascript/mastodon/locales/sk.json
@@ -277,6 +277,7 @@
   "follow_request.authorize": "Povoľ prístup",
   "follow_request.reject": "Odmietni",
   "follow_requests.unlocked_explanation": "Síce Váš učet nie je uzamknutý, ale {domain} tím si myslel že môžete chcieť skontrolovať žiadosti o sledovanie z týchto účtov manuálne.",
+  "follow_suggestions.curated_suggestion": "Staff pick",
   "follow_suggestions.dismiss": "Znovu nezobrazuj",
   "follow_suggestions.personalized_suggestion": "Prispôsobené odporúčania",
   "follow_suggestions.popular_suggestion": "Populárne návrhy",
diff --git a/app/javascript/mastodon/locales/tai.json b/app/javascript/mastodon/locales/tai.json
index b1a242c751d00d..fe6b8fe6503782 100644
--- a/app/javascript/mastodon/locales/tai.json
+++ b/app/javascript/mastodon/locales/tai.json
@@ -2,25 +2,25 @@
   "about.blocks": "Siū kuán-tsè ê su-hāu-khì",
   "about.contact": "Liân-lo̍k:",
   "about.disclaimer": "Ling-khí-tshiūnn sī tsi̍t-ê khai-guân nńg-thé，i ê siong-phiau sī Mastodon gGmbH.",
-  "account.badges.bot": "Bot",
-  "account.cancel_follow_request": "Withdraw follow request",
+  "account.badges.bot": "Tsū-tōng-ê",
+  "account.cancel_follow_request": "Mài-koh tui-tsong",
   "account.media": "Mûi-thé",
   "account.mention": "Thê-khí @{name}",
-  "account.posts": "Toots",
-  "account.posts_with_replies": "Toots and replies",
-  "account.requested": "Awaiting approval",
-  "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
-  "account_note.placeholder": "Click to add a note",
-  "column.pins": "Pinned toot",
-  "community.column_settings.media_only": "Media only",
-  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
-  "compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.",
-  "compose_form.placeholder": "What is on your mind?",
-  "compose_form.publish_form": "Publish",
-  "compose_form.spoiler.marked": "Text is hidden behind warning",
-  "compose_form.spoiler.unmarked": "Text is not hidden",
-  "confirmations.delete.message": "Are you sure you want to delete this status?",
-  "confirmations.domain_block.confirm": "Hide entire domain",
+  "account.posts": "Huah-siann",
+  "account.posts_with_replies": "Huah-siann kah huê-ìng",
+  "account.requested": "Tán-thāi phue-tsún",
+  "account.statuses_counter": "{count, plural, one {{counter} Huah-siann} other {{counter} Huah-siann}}",
+  "account_note.placeholder": "Tiám tsi̍t-ē ka-thiam pī-tsù",
+  "column.pins": "Tah thâu-tsîng ê huah-siann",
+  "community.column_settings.media_only": "Kan-na muî-thé",
+  "compose_form.encryption_warning": "Tī Mastodon tah huah-siann m̄-sī tuan-tuì-tuan ka-pì ê. M̄-thang tī Mastodon hun-hióng jīm-hô bín-kám ê tsū-sìn.",
+  "compose_form.hashtag_warning": "Tsit-ê huah-siann in-uī m̄-sī kong-khai ê, sóo-í buē tī jīm-hô tsú-tê piau-tshiam hián-sī. Kan-na kong-khai ê huah-siann ē-tàng hōo tsú-tê piau-tshiam tshâ-tshuē.",
+  "compose_form.placeholder": "Lí teh siūnn siánn?",
+  "compose_form.publish_form": "Huah--tshut-khì",
+  "compose_form.spoiler.marked": "Î-tû luē-iông kíng-kò",
+  "compose_form.spoiler.unmarked": "Tsing-ka luē-iông kíng-kò",
+  "confirmations.delete.message": "Lí kám bueh thâi-tiāu tsi̍t-ē huah-siann?",
+  "confirmations.domain_block.confirm": "Hong-só tsíng-kò bāng-hi̍k",
   "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
   "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.",
   "embed.instructions": "Embed this status on your website by copying the code below.",
@@ -46,7 +46,7 @@
   "keyboard_shortcuts.muted": "to open muted users list",
   "keyboard_shortcuts.my_profile": "to open your profile",
   "keyboard_shortcuts.notifications": "to open notifications column",
-  "keyboard_shortcuts.open_media": "to open media",
+  "keyboard_shortcuts.open_media": "Khui muî-thé",
   "keyboard_shortcuts.pinned": "to open pinned toots list",
   "keyboard_shortcuts.profile": "to open author's profile",
   "keyboard_shortcuts.reply": "to reply",
diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json
index 7aa54ae8cea9ff..0865b18542dcae 100644
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@@ -1,5 +1,5 @@
 {
-  "about.blocks": "เซิร์ฟเวอร์ที่มีการควบคุม",
+  "about.blocks": "เซิร์ฟเวอร์ที่มีการกลั่นกรอง",
   "about.contact": "ติดต่อ:",
   "about.disclaimer": "Mastodon เป็นซอฟต์แวร์เสรี โอเพนซอร์ส และเครื่องหมายการค้าของ Mastodon gGmbH",
   "about.domain_blocks.no_reason_available": "เหตุผลไม่พร้อมใช้งาน",
@@ -380,7 +380,7 @@
   "lightbox.next": "ถัดไป",
   "lightbox.previous": "ก่อนหน้า",
   "limited_account_hint.action": "แสดงโปรไฟล์ต่อไป",
-  "limited_account_hint.title": "มีการซ่อนโปรไฟล์นี้โดยผู้ควบคุมของ {domain}",
+  "limited_account_hint.title": "มีการซ่อนโปรไฟล์นี้โดยผู้กลั่นกรองของ {domain}",
   "link_preview.author": "โดย {name}",
   "lists.account.add": "เพิ่มไปยังรายการ",
   "lists.account.remove": "เอาออกจากรายการ",
@@ -637,9 +637,9 @@
   "sign_in_banner.sign_in": "เข้าสู่ระบบ",
   "sign_in_banner.sso_redirect": "เข้าสู่ระบบหรือลงทะเบียน",
   "sign_in_banner.text": "เข้าสู่ระบบเพื่อติดตามโปรไฟล์หรือแฮชแท็ก ชื่นชอบ แชร์ และตอบกลับโพสต์ คุณยังสามารถโต้ตอบจากบัญชีของคุณในเซิร์ฟเวอร์อื่น",
-  "status.admin_account": "เปิดส่วนติดต่อการควบคุมสำหรับ @{name}",
-  "status.admin_domain": "เปิดส่วนติดต่อการควบคุมสำหรับ {domain}",
-  "status.admin_status": "เปิดโพสต์นี้ในส่วนติดต่อการควบคุม",
+  "status.admin_account": "เปิดส่วนติดต่อการกลั่นกรองสำหรับ @{name}",
+  "status.admin_domain": "เปิดส่วนติดต่อการกลั่นกรองสำหรับ {domain}",
+  "status.admin_status": "เปิดโพสต์นี้ในส่วนติดต่อการกลั่นกรอง",
   "status.block": "ปิดกั้น @{name}",
   "status.bookmark": "เพิ่มที่คั่นหน้า",
   "status.cancel_reblog_private": "เลิกดัน",
diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json
index fa728a6821e7ed..02c9159be5503d 100644
--- a/app/javascript/mastodon/locales/tr.json
+++ b/app/javascript/mastodon/locales/tr.json
@@ -214,7 +214,7 @@
   "emoji_button.food": "Yiyecek ve İçecek",
   "emoji_button.label": "İfade ekle",
   "emoji_button.nature": "Doğa",
-  "emoji_button.not_found": "İfade yok!! (╯°□°）╯︵ ┻━┻",
+  "emoji_button.not_found": "Eşleşen emoji yok",
   "emoji_button.objects": "Nesneler",
   "emoji_button.people": "Kullanıcılar",
   "emoji_button.recent": "Sık kullanılan",
@@ -348,7 +348,7 @@
   "keyboard_shortcuts.description": "Açıklama",
   "keyboard_shortcuts.direct": "özel değinmeler sütununu açmak için",
   "keyboard_shortcuts.down": "Listede aşağıya inmek için",
-  "keyboard_shortcuts.enter": "gönderiyi aç",
+  "keyboard_shortcuts.enter": "Gönderiyi açınız",
   "keyboard_shortcuts.favourite": "Gönderiyi favorilerine ekle",
   "keyboard_shortcuts.favourites": "Gözde listeni aç",
   "keyboard_shortcuts.federated": "Federe akışı aç",
diff --git a/config/locales/activerecord.el.yml b/config/locales/activerecord.el.yml
index 4eae3b6a00204b..01e9a75f98e4ab 100644
--- a/config/locales/activerecord.el.yml
+++ b/config/locales/activerecord.el.yml
@@ -53,3 +53,7 @@ el:
             position:
               elevated: δεν μπορεί να είναι μεγαλύτερο από τον τρέχοντα ρόλο σας
               own_role: δεν μπορεί να αλλάξει με τον τρέχοντα ρόλο σας
+        webhook:
+          attributes:
+            events:
+              invalid_permissions: δεν μπορείτε να συμπεριλάβετε συμβάντα για τα οποία δεν έχετε τα δικαιώματα
diff --git a/config/locales/be.yml b/config/locales/be.yml
index 9bfc46e2a7b2cf..13cbcd8ffcf2f3 100644
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -795,6 +795,7 @@ be:
         disabled: Нікому
         users: Лакальным карыстальнікам, якія ўвайшлі
       registrations:
+        moderation_recommandation: Пераканайцеся, што ў вас ёсць адэкватная і аператыўная каманда мадэратараў, перш чым адчыняць рэгістрацыю для ўсіх жадаючых!
         preamble: Кантралюйце, хто можа ствараць уліковы запіс на вашым серверы.
         title: Рэгістрацыя
       registrations_mode:
@@ -802,6 +803,7 @@ be:
           approved: Для рэгістрацыі патрабуецца пацвярджэнне
           none: Нікому не магчыма зарэгістравацца
           open: Любому магчыма зарэгістравацца
+        warning_hint: Мы рэкамендуем выкарыстоўваць рэжым "для рэгістрацыі патрабуецца пацвярджэнне", калі вы не ўпэўненыя, што ваша каманда мадэратараў зможа своечасова спраўляцца са спамам і шкоднымі рэгістрацыямі.
       security:
         authorized_fetch: Патрабаваць аўтэнтыфікацыю ад федэратыўных сервераў
         authorized_fetch_hint: Патрабаванне аўтэнтыфікацыі ад федэратыўных сервераў дазваляе больш строга выконваць блакіроўкі як на ўзроўні карыстача, так і на ўзроўні сервера. Аднак пры гэтым зніжаецца прадукцыйнасць, памяншаецца ахоп вашых адказаў на допісы і могуць узнікнуць праблемы сумяшчальнасці з некаторымі федэратыўнымі сэрвісамі. Акрамя таго, гэта не перашкодзіць атрымліваць вашыя публічныя допісы і ўліковыя запісы.
@@ -1002,6 +1004,9 @@ be:
       title: Вэбхукі
       webhook: Вэбхук
   admin_mailer:
+    auto_close_registrations:
+      body: У сувязі з адсутнасцю актыўнасці мадэратараў у апошні час, рэгістрацыя на %{instance} была аўтаматычна пераведзена ў рэжым, які патрабуе ручной праверкі, каб прадухіліць выкарыстанне %{instance} у якасці платформы для патэнцыйных зламыснікаў. Вы можаце ў любы момант пераключыць яго назад ў рэжым "вольная рэгістрацыя".
+      subject: Рэгістрацыі для %{instance} былі аўтаматычна пераведзены ў рэжым "патрабуецца пацвярджэнне"
     new_appeal:
       actions:
         delete_statuses: выдаліць іх допісы
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 2f316984b504ab..4b5ec815ca50b0 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -969,8 +969,8 @@ ca:
       webhook: Webhook
   admin_mailer:
     auto_close_registrations:
-      body: A causa de la manca d'activitat recent dels moderadors, les altes a %{instance} han passat automàticament a necessitar una revisió manual, per tal d'evitar que %{instance} es faci servir com a plataforma de potencials mals actuants. Podeu revertir-ho a altes obertes en qualsevol moment.
-      subject: Les altes a %{instance} han passat automàticament a necessitar aprovació
+      body: A causa de la manca d'activitat recent dels moderadors, s'ha passat el procés d'alta de %{instance} al mode de revisió manual, a fi d'evitar que malfactors l'utilitzin com a plataforma. Podeu obrir el procés de registre en qualsevol moment.
+      subject: S'ha passat el procés d'alta de %{instance} al mode de validació manual
     new_appeal:
       actions:
         delete_statuses: eliminar els seus tuts
diff --git a/config/locales/da.yml b/config/locales/da.yml
index 43f4b64eef0fb4..5ceaad970594d8 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -500,7 +500,7 @@ da:
         instance_accounts_dimension: Mest fulgte konti
         instance_accounts_measure: gemte konti
         instance_followers_measure: vores følgere dér
-        instance_follows_measure: deres følgere dér
+        instance_follows_measure: deres følgere her
         instance_languages_dimension: Topsprog
         instance_media_attachments_measure: gemte medievedhæftninger
         instance_reports_measure: anmeldelser af dem
@@ -1445,7 +1445,7 @@ da:
       before: 'Inder der fortsættes, læs venligst disse notater omhyggeligt:'
       cooldown: Efter flytningen er der en venteperiode, hvor kontoen ikke kan flyttes igen
       disabled_account: Efterfølgende er din nuværende konto ikke fuldt funktionsdygtig, der er dog adgang til dataeksport samt genaktivering.
-      followers: Denne handling vil flytte alle følgere fra den aktuelle konto til den nye ditto
+      followers: Denne handling vil flytte alle følgere fra den aktuelle konto til den nye konto
       only_redirect_html: Alternativt kan du <a href="%{path}">oprette en omdirigering for din profil alene</a>.
       other_data: Ingen øvrige data flyttes automatisk
       redirect: Din nuværende kontoprofil opdateres med en omdirigeringsnotits og ekskluderes fra søgninger
diff --git a/config/locales/devise.pt-BR.yml b/config/locales/devise.pt-BR.yml
index 8b53f96514b5d7..e79a83c4314760 100644
--- a/config/locales/devise.pt-BR.yml
+++ b/config/locales/devise.pt-BR.yml
@@ -12,6 +12,7 @@ pt-BR:
       last_attempt: Você tem mais uma tentativa antes de sua conta ser bloqueada.
       locked: Sua conta está bloqueada.
       not_found_in_database: "%{authentication_keys} ou senha inválida."
+      omniauth_user_creation_failure: Erro ao criar uma conta para esta identidade.
       pending: Sua conta está sendo revisada.
       timeout: Sua sessão expirou. Por favor, entre novamente para continuar.
       unauthenticated: Você precisa entrar ou criar uma conta antes de continuar.
diff --git a/config/locales/doorkeeper.th.yml b/config/locales/doorkeeper.th.yml
index 3c2c75565b629d..067e0655884691 100644
--- a/config/locales/doorkeeper.th.yml
+++ b/config/locales/doorkeeper.th.yml
@@ -156,13 +156,13 @@ th:
       admin:read:ip_blocks: อ่านข้อมูลที่ละเอียดอ่อนของการปิดกั้น IP ทั้งหมด
       admin:read:reports: อ่านข้อมูลที่ละเอียดอ่อนของรายงานและบัญชีที่ได้รับการรายงานทั้งหมด
       admin:write: ปรับเปลี่ยนข้อมูลทั้งหมดในเซิร์ฟเวอร์
-      admin:write:accounts: ทำการกระทำการควบคุมบัญชี
-      admin:write:canonical_email_blocks: ทำการกระทำการควบคุมการปิดกั้นอีเมลมาตรฐาน
-      admin:write:domain_allows: ทำการกระทำการควบคุมการอนุญาตโดเมน
-      admin:write:domain_blocks: ทำการกระทำการควบคุมการปิดกั้นโดเมน
-      admin:write:email_domain_blocks: ทำการกระทำการควบคุมการปิดกั้นโดเมนอีเมล
-      admin:write:ip_blocks: ทำการกระทำการควบคุมการปิดกั้น IP
-      admin:write:reports: ทำการกระทำการควบคุมรายงาน
+      admin:write:accounts: ทำการกระทำการกลั่นกรองต่อบัญชี
+      admin:write:canonical_email_blocks: ทำการกระทำการกลั่นกรองต่อการปิดกั้นอีเมลมาตรฐาน
+      admin:write:domain_allows: ทำการกระทำการกลั่นกรองต่อการอนุญาตโดเมน
+      admin:write:domain_blocks: ทำการกระทำการกลั่นกรองต่อการปิดกั้นโดเมน
+      admin:write:email_domain_blocks: ทำการกระทำการกลั่นกรองต่อการปิดกั้นโดเมนอีเมล
+      admin:write:ip_blocks: ทำการกระทำการกลั่นกรองต่อการปิดกั้น IP
+      admin:write:reports: ทำการกระทำการกลั่นกรองต่อรายงาน
       crypto: ใช้การเข้ารหัสแบบต้นทางถึงปลายทาง
       follow: ปรับเปลี่ยนความสัมพันธ์ของบัญชี
       push: รับการแจ้งเตือนแบบผลักของคุณ
diff --git a/config/locales/el.yml b/config/locales/el.yml
index 8b632a358bf208..16c042f1856381 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -309,6 +309,7 @@ el:
       unpublish: Αναίρεση δημοσίευσης
       unpublished_msg: Επιτυχής ακύρωση δημοσίευσης ανακοίνωσης!
       updated_msg: Επιτυχής ενημέρωση ανακοίνωσης!
+    critical_update_pending: Κρίσιμη ενημέρωση σε αναμονή
     custom_emojis:
       assign_category: Ανάθεση κατηγορίας
       by_domain: Τομέας
@@ -382,6 +383,15 @@ el:
       undo: Αφαίρεση συναλλαγής με τον τομέα
     domain_blocks:
       add_new: Προσθήκη νέου αποκλεισμού τομέα
+      confirm_suspension:
+        cancel: Άκυρο
+        confirm: Αναστολή
+        permanent_action: Η κατάργηση της αναστολής δε θα αποκαταστήσει καθόλου δεδομένα ή σχέση.
+        preamble_html: Πρόκειται να αναστείλετε το <strong>%{domain}</strong> και τους υποτομείς του.
+        remove_all_data: Αυτό θα αφαιρέσει όλο το περιεχόμενο, τα μέσα και τα δεδομένα προφίλ για τους λογαριασμούς αυτού του τομέα από το διακομιστή σας.
+        stop_communication: Ο διακομιστής σας θα σταματήσει να επικοινωνεί με αυτούς τους διακομιστές.
+        title: Επιβεβαίωση αποκλεισμού τομέα για %{domain}
+        undo_relationships: Αυτό θα αναιρέσει οποιαδήποτε σχέση ακολουθίας μεταξύ των λογαριασμών αυτών των διακομιστών και των δικών σας.
       created_msg: Ο αποκλεισμός τομέα είναι υπό επεξεργασία
       destroyed_msg: Ο αποκλεισμός τομέα αναιρέθηκε
       domain: Τομέας
@@ -415,6 +425,7 @@ el:
       view: Εμφάνιση αποκλεισμού τομέα
     email_domain_blocks:
       add_new: Προσθήκη νέου
+      allow_registrations_with_approval: Να επιτρέπονται εγγραφές με έγκριση
       attempts_over_week:
         one: "%{count} προσπάθεια την τελευταία εβδομάδα"
         other: "%{count} προσπάθειες εγγραφής την τελευταία εβδομάδα"
@@ -524,6 +535,7 @@ el:
       total_reported: Αναφορές προς εκείνους
       total_storage: Συνημμένα πολυμέσα
       totals_time_period_hint_html: Τα σύνολα που εμφανίζονται παρακάτω περιλαμβάνουν στοιχεία από την αρχή.
+      unknown_instance: Προς το παρόν δεν υπάρχει καμία εγγραφή αυτού του τομέα σε αυτόν το διακομιστή.
     invites:
       deactivate_all: Απενεργοποίηση όλων
       filter:
@@ -600,6 +612,7 @@ el:
       created_at: Αναφέρθηκε
       delete_and_resolve: Διαγραφή αναρτήσεων
       forwarded: Προωθημένα
+      forwarded_replies_explanation: Αυτή η αναφορά είναι από απομακρυσμένο χρήστη και για απομακρυσμένο περιεχόμενο. Σας έχει διαβιβαστεί, επειδή το αναφερόμενο περιεχόμενο απαντά σε έναν από τους χρήστες σας.
       forwarded_to: Προώθημένα προς %{domain}
       mark_as_resolved: Σημείωση ως επιλυμένο
       mark_as_sensitive: Σήμανση ως ευαίσθητο
diff --git a/config/locales/es.yml b/config/locales/es.yml
index f5f65d9b1f28aa..e5ccee5ee3e354 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -1847,7 +1847,7 @@ es:
       edit_profile_step: Puedes personalizar tu perfil subiendo una foto de perfil, cambiando tu nombre de usuario y mucho más. Puedes optar por revisar a los nuevos seguidores antes de que puedan seguirte.
       explanation: Aquí hay algunos consejos para empezar
       final_action: Empezar a publicar
-      final_step: "¡Empieza a publicar! Incluso sin seguidores, tus publicaciones públicas pueden ser vistas por otros, por ejemplo en la línea de tiempo local o en etiquetas. Tal vez quieras presentarte con la etiqueta de #introducciones."
+      final_step: "¡Empieza a publicar! Incluso sin seguidores, tus publicaciones públicas pueden ser vistas por otros, por ejemplo en la línea de tiempo local o en etiquetas. Tal vez quieras presentarte con la etiqueta de #presentación."
       full_handle: Su sobrenombre completo
       full_handle_hint: Esto es lo que le dirías a tus amigos para que ellos puedan enviarte mensajes o seguirte desde otra instancia.
       subject: Bienvenido a Mastodon
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index 768a84b7c18739..6c625d08bda216 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -769,6 +769,7 @@ eu:
         disabled: Inori ez
         users: Saioa hasita duten erabiltzaile lokalei
       registrations:
+        moderation_recommandation: Mesedez, ziurtatu moderazio-talde egokia eta erreaktiboa duzula erregistroak guztiei ireki aurretik!
         preamble: Kontrolatu nork sortu dezakeen kontua zerbitzarian.
         title: Izen emateak
       registrations_mode:
@@ -776,6 +777,7 @@ eu:
           approved: Izena emateko onarpena behar da
           none: Ezin du inork izena eman
           open: Edonork eman dezake izena
+        warning_hint: "“Izena emateko onarpena behar da” erabiltzea gomendatzen dugu, baldin eta ez badakizu ziur zure moderazio-taldeak spama eta erregistro maltzurrak arrazoizko denboran erantzun ditzakeela."
       security:
         authorized_fetch: Eskatu autentifikazioa federatutako zerbitzarietatik
         authorized_fetch_hint: Zerbitzari federatuen autentifikazioa eskatzeak erabiltzaile-mailako zein zerbitzari-mailako blokeak zorrotzago betearaztea ahalbidetzen du. Hala ere, horrek errendimendu galera dakar, zure erantzunen irismena murrizten du eta baliteke federatutako zerbitzu batzuekin bateragarritasun-arazoak sortu ahal izatea. Horrez gain, horrek ez du eragotziko aktore dedikatuek zure mezu eta kontu publikoak eskuratzea.
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 15f448bc91d6ae..ad6d6e9c07ebcc 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -767,6 +767,7 @@ fi:
         disabled: Ei kenellekkään
         users: Kirjautuneille paikallisille käyttäjille
       registrations:
+        moderation_recommandation: Varmista, että sinulla on riittävä ja toimintavalmis joukko moderaattoreita ennen kuin avaat rekisteröitymiset kaikille!
         preamble: Määritä, kuka voi luoda tilin palvelimellesi.
         title: Rekisteröityminen
       registrations_mode:
@@ -774,6 +775,7 @@ fi:
           approved: Rekisteröinti vaatii hyväksynnän
           none: Kukaan ei voi rekisteröityä
           open: Kaikki voivat rekisteröityä
+        warning_hint: Suosittelemme käyttämään asetusta “Rekisteröinti vaatii hyväksynnän” ellet ole varma siitä, että moderaattorit ovat valmiina käsittelemään roskapostia ja haittarekisteröitymisiä oikea-aikaisesti.
       security:
         authorized_fetch: Vaadi todennus liittoutuvilta palvelimilta
         authorized_fetch_hint: Todennuksen vaatiminen liittoutuvilta palvelimilta mahdollistaa sekä käyttäjä- että palvelintason estojen tiukemman valvonnan. Tämä tapahtuu kuitenkin suorituskyvyn kustannuksella, vähentää vastauksiesi tavoittavuutta ja voi aiheuttaa yhteensopivuusongelmia joidenkin liittoutuvien palvelujen kanssa. Tämä ei myöskään estä omistautuneita toimijoita hakemasta julkisia julkaisujasi ja tilejäsi.
@@ -966,6 +968,9 @@ fi:
       title: Webhookit
       webhook: Webhook
   admin_mailer:
+    auto_close_registrations:
+      body: Viimeaikaisen moderaattoritoiminnan puutteen vuoksi %{instance} rekisteröinnit on vaihdettu automaattisesti manuaaliseen tarkasteluun, jotta %{instance} ei käytetä mahdollisien huonojen toimijoiden alustana. Voit vaihtaa sen takaisin avaamalla rekisteröinnit milloin tahansa.
+      subject: Rekisteröinnit %{instance} on automaattisesti vaihdettu vaatimaan hyväksyntää
     new_appeal:
       actions:
         delete_statuses: poistaa hänen julkaisunsa
diff --git a/config/locales/fo.yml b/config/locales/fo.yml
index 0e59783a060d9e..555b82a79d572b 100644
--- a/config/locales/fo.yml
+++ b/config/locales/fo.yml
@@ -767,6 +767,7 @@ fo:
         disabled: Til ongan
         users: Fyri lokalum brúkarum, sum eru ritaðir inn
       registrations:
+        moderation_recommandation: Vinarliga tryggja tær, at tú hevur eitt nøktandi og klárt umsjónartoymi, áðreen tú letur upp fyri skrásetingum frá øllum!
         preamble: Stýr, hvør kann stovna eina kontu á tínum ambætara.
         title: Skrásetingar
       registrations_mode:
@@ -774,6 +775,7 @@ fo:
           approved: Góðkenning kravd fyri tilmelding
           none: Eingin kann tilmelda seg
           open: Øll kunnu tilmelda seg
+        warning_hint: Vit mæla til at brúka "Góðkenning kravd fyri tilmelding" uttan so at tú er fullvís/ur í, at umsjónartoymið hjá tær kann handfara ruskpost og óndsinnaðar skrásetingar so hvørt.
       security:
         authorized_fetch: Krev samgildi frá sameindum ambætarum
         authorized_fetch_hint: At krevja samgildi frá sameindum ambætarum ger strangari útinning av blokkum bæði á brúkara- og ambætara-stigi møguliga. Tó so, kostnaðurin er ein avriksstraffur, minkar um hvussu langt svarini hjá tær røkka og kann viðføra sambæristruplleikar við summar sameindar tænastur. Harafturat forðar hetta ikki teimum, ið miðvíst leggja seg eftir at heinta tínar almennu postar og kontur.
diff --git a/config/locales/he.yml b/config/locales/he.yml
index fc57f9fd588dc8..b5a98dd24d5a56 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -795,6 +795,7 @@ he:
         disabled: לאף אחד
         users: למשתמשים מקומיים מחוברים
       registrations:
+        moderation_recommandation: יש לוודא שלאתר יש צוות מנחות ומנחי שיחה מספק ושירותי בטרם תבחרו לפתוח הרשמה לכולם!
         preamble: שליטה בהרשאות יצירת חשבון בשרת שלך.
         title: הרשמות
       registrations_mode:
@@ -802,6 +803,7 @@ he:
           approved: נדרש אישור הרשמה
           none: אף אחד לא יכול להרשם
           open: כל אחד יכול להרשם
+        warning_hint: אנו ממליצים להפעיל דרישה לאישור ידני של הרשמה אלא אם אתם מאמינים שצוות הנחיית השיחות שלכם יוכל להסתדר בזריזות עם מפיצי תכנים פוגעניים או פרסומיים על בסיס קבוע.
       security:
         authorized_fetch: לדרוש הזדהות מול שרתים בפדרציה
         authorized_fetch_hint: הדרישה להזדהות מול שרתים בפדרציה מאפשרת חסימה יותר יעילה ברמת המשתמש וברמת שרת. עם זאת, הדרישה באה עם מחיר של נפילת ביצועים, מקטינה את מעגל התפוצה של התשובות שלך, ועשויה ליצור אי תאימות מול שירותים אחרים בפדרציה. בנוסף, זה לא ימנע מצדדים החלטיים לקבל גישת קריאה להודעות ופרופילים ציבוריים.
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index b902d0e6c2aaeb..456636d4c5b040 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -767,7 +767,7 @@ hu:
         disabled: Senkinek
         users: Bejelentkezett helyi felhasználóknak
       registrations:
-        moderation_recommandation: Győződjünk meg arról, hogy megfelelő és reaktív moderátor csapatunk van, mielőtt mindenki számára megnyitjuk a regisztrációt!
+        moderation_recommandation: Győződj meg arról, hogy megfelelő és gyors reagálású moderátor csapatod van, mielőtt mindenki számára megnyitod a regisztrációt!
         preamble: Szabályozd, hogy ki hozhat létre fiókot a kiszolgálón.
         title: Regisztrációk
       registrations_mode:
@@ -775,7 +775,7 @@ hu:
           approved: A regisztráció engedélyhez kötött
           none: Senki sem regisztrálhat
           open: Bárki regisztrálhat
-        warning_hint: Célszerű a "Jóváhagyás szükséges a regisztrációhoz” lehetőség használata, hkivéve, ha biztos vagyunk abban, hogy a moderátor csapat időben tudja kezelni a szemetet és a rosszindulatú regisztrációkat.
+        warning_hint: Javasoljuk a "Jóváhagyás szükséges a regisztrációhoz” lehetőség használatát, hacsak nem vagy biztos abban, hogy a moderátor csapatod időben tudja kezelni a szemetet és a rosszindulatú regisztrációkat.
       security:
         authorized_fetch: Hitelesítés szükséges a föderációs kiszolgálóktól
         authorized_fetch_hint: A föderációs szerverek hitelesítésének szükségessége lehetővé teszi mind a felhasználói mind a szerver szintű blokkok szigorúbb végrehajtását. Ez azonban a teljesítménybüntetés árán jár, csökkenti a válaszok elérhetőségét és kompatibilitási problémákat vethet fel egyes föderációs szolgáltatásokkal. Emellett ez nem akadályozza meg a dedikált szereplőket abban, hogy nyilvános bejegyzéseiket és fiókjaikat letöltsék.
diff --git a/config/locales/ie.yml b/config/locales/ie.yml
index 7ab7f953bec191..4b84d53bd5481c 100644
--- a/config/locales/ie.yml
+++ b/config/locales/ie.yml
@@ -767,6 +767,7 @@ ie:
         disabled: A necun
         users: A local usatores qui ha initiat session
       registrations:
+        moderation_recommandation: Ples assecurar que tu have un equip de moderation quel es adequat e reactiv ante que tu aperte registrationes a omnes!
         preamble: Decider qui posse crear un conto che vor servitor.
         title: Registrationes
       registrations_mode:
@@ -774,6 +775,7 @@ ie:
           approved: Aprobation besonat por adhesion
           none: Nequi posse registrar se
           open: Quicunc posse registrar se
+        warning_hint: Noi recomanda usar "Aprobation besonat por inscrir" si tu ne es confident que tui equip de moderation posse gerer spam e maliciosi registrationes in un curt témpor.
       security:
         authorized_fetch: Postular autentication de federat servitores
         authorized_fetch_hint: Postular autentication de federat servitores possibilisa plu strict infortiament de ambi usatori e servitori bloccas. Támen, ti fórsan va limitar li potentie de vor servitor, reducter li atingement de vor responses, e possibilmen introducter problemas de compatibilitá con quelc federat servicies. Additionalmen, ti ne va preventer dedicat actores de accesser vor public postas e contos.
@@ -966,6 +968,9 @@ ie:
       title: Webcrocs
       webhook: Webcroc
   admin_mailer:
+    auto_close_registrations:
+      body: Pro un manca de recent activitá moderatori, registrationes sur %{instance} ha esset automaticmen changeat al mode quel besona un manual recension, por que %{instance} ne mey esser usat quam un platform por malfatores. Tu posse rechangear a apert registrationes quandecunc.
+      subject: Registrationes por %{instance} ha esset automaticmen changeat al mode quel besona aprobation
     new_appeal:
       actions:
         delete_statuses: deleter su postas
diff --git a/config/locales/kab.yml b/config/locales/kab.yml
index f50a357608dc9c..a24d8994fd3f9c 100644
--- a/config/locales/kab.yml
+++ b/config/locales/kab.yml
@@ -11,7 +11,7 @@ kab:
     followers:
       one: Umeḍfaṛ
       other: Imeḍfaṛen
-    following: Yeṭafaṛ
+    following: Yeṭṭafaṛ
     last_active: armud aneggaru
     nothing_here: Ulac kra da!
     posts:
@@ -542,7 +542,7 @@ kab:
     add_new: Rnu amaynut
   filters:
     contexts:
-      account: Imuɣna
+      account: Imeɣna
       notifications: Ilɣa
       thread: Idiwenniyen
     edit:
@@ -654,7 +654,7 @@ kab:
   relationships:
     activity: Armud n umiḍan
     followers: Imeḍfaṛen
-    following: Yeṭafaṛ
+    following: Yeṭṭafaṛ
     invited: Yettwancad
     last_active: Armud aneggaru
     most_recent: Melmi kan
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 2e354828bd2875..851c3c74b809b1 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -755,6 +755,7 @@ ko:
         disabled: 아무에게도 안 함
         users: 로그인 한 사용자에게
       registrations:
+        moderation_recommandation: 모두에게 가입을 열기 전에 적절하고 반응이 빠른 중재 팀을 데리고 있는지 확인해 주세요!
         preamble: 누가 이 서버에 계정을 만들 수 있는지 제어합니다.
         title: 가입
       registrations_mode:
@@ -762,6 +763,7 @@ ko:
           approved: 가입하려면 승인이 필요함
           none: 아무도 가입 할 수 없음
           open: 누구나 가입 할 수 있음
+        warning_hint: 당신의 중재 팀이 스팸이나 악의적인 가입을 시기적절하게 처리할 수 있다고 자신할 수 없다면 "가입이 승인을 요구하도록" 설정하는 것을 추천합니다.
       security:
         authorized_fetch: 연합된 서버들에게서 인증 필수
         authorized_fetch_hint: 연합된 서버들에게서 인증을 요구하는 것은 사용자 레벨과 서버 레벨의 차단을 좀 더 확실하게 해줍니다. 한편으로는 성능적인 페널티, 답글의 전달 범위 감소, 몇몇 연합된 서비스들과의 호환성 문제가 있을 가능성이 있습니다. 추가적으로 이 기능은 전용 액터가 공개된 게시물이나 계정을 페치하는 것은 막지 않습니다.
@@ -950,6 +952,9 @@ ko:
       title: 웹훅
       webhook: 웹훅
   admin_mailer:
+    auto_close_registrations:
+      body: 최근 모더레이터 활동 부족으로, %{instance}가 안좋은 일에 사용되는 것을 방지하기 위해 %{instance}의 가입이 수동 심사를 요구하도록 자동으로 변경되었습니다. 언제든지 가입을 다시 열 수 있습니다.
+      subject: "%{instance}의 가입이 승인을 필요로 하도록 자동으로 변경되었습니다"
     new_appeal:
       actions:
         delete_statuses: 게시물을 삭제하는 것
diff --git a/config/locales/lad.yml b/config/locales/lad.yml
index 77501e3b324883..d75d0d44c9b360 100644
--- a/config/locales/lad.yml
+++ b/config/locales/lad.yml
@@ -767,6 +767,7 @@ lad:
         disabled: A dinguno
         users: Para los utilizadores lokales ke entrado en su kuento
       registrations:
+        moderation_recommandation: Por favor, asigurate ke tyenes una taifa de moderasyon adekuada i reaktiva antes de avrir los enrejistramyentos a todos!
         preamble: Kontrola ken puede kriyar un kuento en tu sirvidor.
         title: Enrejistramientos
       registrations_mode:
@@ -774,6 +775,7 @@ lad:
           approved: Se rekiere achetasion para enrejistrarse
           none: Permete a los utilizadores trokar la konfigurasyon del sitio
           open: Kualkiera puede enrejistrarse
+        warning_hint: Rekomendamos el uzo de "Se rekiere achetasion para enrejistrarse" a manko ke estes siguro ke tu taifa de moderasyon puede moderar el spam i los enrejistramyentos malisiozos en un tyempo razonavle.
       security:
         authorized_fetch: Rekere autentifikasyon de sirvidores federados
         authorized_fetch_hint: Rekerir autentifikasyon de sirvidores federados permite un forsamyento mas estrikto de los blokos a nivel de utilizador i a nivel de sirvidor. Malgrado esto, el koste de esto es una penalizasyon de efisyensya, reduksyon del alkanse de tus repuestas i puede introduzir problemas de kompatibilita kon algunos sirvisyos federados. Ademas, esto no impidira ke aktores dedikados obtengan tus kuentos publikos i publikasyones publikas.
@@ -966,6 +968,9 @@ lad:
       title: Webhooks
       webhook: Webhook
   admin_mailer:
+    auto_close_registrations:
+      body: Por la falta de moderadores aktivos, los enrejistramyentos en %{instance} tyenen sido trokados otomatikamente para rekerir revizyon manuala, para ke %{instance} no se utilize potensyalmente komo platforma por malos aktores. Puedes trokarlo de muevo para avrir los enrejistramyentos en kualseker momento.
+      subject: Enrejistramyentos de %{instance} fueron otomatikamente trokados i agora nesesitan aprovasyon
     new_appeal:
       actions:
         delete_statuses: para supremir sus mesajes
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index f00cc97fbb9283..590062f3d94296 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -281,6 +281,8 @@ lt:
         desc_html: Tai priklauso nuo hCaptcha išorinių skriptų, kurie gali kelti susirūpinimą dėl saugumo ir privatumo. Be to, <strong>dėl to registracijos procesas kai kuriems žmonėms (ypač neįgaliesiems) gali būti gerokai sunkiau prieinami</strong>. Dėl šių priežasčių apsvarstyk alternatyvias priemones, pavyzdžiui, patvirtinimu arba kvietimu grindžiamą registraciją.
       domain_blocks:
         all: Visiems
+      registrations:
+        moderation_recommandation: Prieš atidarant registraciją visiems, įsitikink, kad turi tinkamą ir reaguojančią prižiūrėjimo komandą!
     software_updates:
       description: Rekomenduojama nuolat atnaujinti Mastodon diegyklę, kad galėtum naudotis naujausiais pataisymais ir funkcijomis. Be to, kartais labai svarbu laiku naujinti Mastodon, kad būtų išvengta saugumo problemų. Dėl šių priežasčių Mastodon kas 30 minučių tikrina, ar yra atnaujinimų, ir praneša tau apie tai pagal tavo el. pašto pranešimų parinktis.
     statuses:
@@ -304,6 +306,9 @@ lt:
       edit_preset: Keisti įspėjimo nustatymus
       title: Valdyti įspėjimo nustatymus
   admin_mailer:
+    auto_close_registrations:
+      body: Dėl pastarojo meto peržiūrėtojų aktyvumo trūkumo %{instance} registracija buvo automatiškai pakeista į reikalaujančią rankinės būdo peržiūros, kad %{instance} nebūtų naudojama kaip platforma potencialiems blogiems veikėjams. Bet kuriuo metu gali ją vėl perjungti į atvirą registraciją.
+      subject: "%{instance} registracijos automatiškai pakeistos į reikalaujančias patvirtinimo"
     new_report:
       body: "%{reporter} parašė skundą apie %{target}"
       body_remote: Kažkas iš %{domain} parašė skundą apie %{target}
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 79396d627f4743..ea91fd7dfe6446 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -767,6 +767,7 @@ pt-BR:
         disabled: Para ninguém
         users: Para usuários locais logados
       registrations:
+        moderation_recommandation: Por favor, certifique-se de ter uma equipe de moderação adequada e reativa antes de abrir as inscrições para todos!
         preamble: Controle quem pode criar uma conta no seu servidor.
         title: Inscrições
       registrations_mode:
diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index 0ebb032ff92e73..3007fd2df1c821 100644
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -968,6 +968,9 @@ pt-PT:
       title: Webhooks
       webhook: Webhook
   admin_mailer:
+    auto_close_registrations:
+      body: Devido à falta de atividade recente dos moderadores, as inscrições em %{instance} foram automaticamente alteradas para requererem revisão manual, para evitar que %{instance} seja utilizada como plataforma para potenciais maus atores. Pode voltar a alterar para inscrições abertas em qualquer altura.
+      subject: As incrições em %{instance} foram automaticamente alteradas para requererem aprovação
     new_appeal:
       actions:
         delete_statuses: para eliminar as suas publicações
diff --git a/config/locales/simple_form.an.yml b/config/locales/simple_form.an.yml
index f354e5ba8258c0..6ec8380f2a8408 100644
--- a/config/locales/simple_form.an.yml
+++ b/config/locales/simple_form.an.yml
@@ -31,14 +31,12 @@ an:
         text: Nomás puetz apelar una amonestación una vegada
       defaults:
         autofollow: Los usuarios que se rechistren per medio d'a invitación te seguirán automaticament
-        avatar: PNG, GIF u JPG. Maximo %{size}. Será escalau a %{dimensions}px
         bot: Esta cuenta executa prencipalment accions automatizadas y podría no estar monitorizada
         context: Un u multiples contextos en os quals ha d'aplicar-se lo filtro
         current_password: Per razons de seguranza per favor ingrese la clau d'a cuenta actual
         current_username: Pa confirmar, per favor ingrese lo nombre d'usuario d'a cuenta actual
         digest: Solo ninviau dimpués d'un largo periodo d'inactividat y nomás si has recibiu mensaches personals entre la tuya ausencia
         email: Se le ninviará un correu de confirmación
-        header: PNG, GIF u JPG. Maximo %{size}. Será escalau a %{dimensions}px
         inbox_url: Copia la URL d'a pachina prencipal d'o relés que quiers utilizar
         irreversible: Las publicacions filtradas desapareixerán irreversiblement, mesmo si este filtro ye eliminau mas abance
         locale: L'idioma d'a interficie d'usuario, correus y notificacions push
diff --git a/config/locales/simple_form.ar.yml b/config/locales/simple_form.ar.yml
index 92e181a8ed3f8d..896fcbf3fadbea 100644
--- a/config/locales/simple_form.ar.yml
+++ b/config/locales/simple_form.ar.yml
@@ -39,14 +39,12 @@ ar:
         text: يمكنك الطعن في عقوبة مرة واحدة فقط
       defaults:
         autofollow: سوف يتابعك تلقائيًا الأشخاص الذين يقومون بالتسجيل من خلال الدعوة
-        avatar: ملف PNG أو GIF أو JPG. حجمه على أقصى تصدير %{size}. سيتم تصغيره إلى %{dimensions}px
         bot: يقوم هذا الحساب أساسا بإجراءات آلية وقد لا يتم مراقبته
         context: واحد أو أكثر من السياقات التي يجب أن ينطبق عليها عامل التصفية
         current_password: لأسباب أمنية ، يرجى إدخال الكلمة السرية الخاصة بالحساب الحالي
         current_username: يرجى إدخال اسم المستخدم الخاص بالحساب الحالي قصد التأكيد
         digest: تُرسَل إليك بعد مُضيّ مدة مِن خمول نشاطك و فقط إذا ما تلقيت رسائل شخصية مباشِرة أثناء فترة غيابك مِن الشبكة
         email: سوف تتلقى رسالة إلكترونية للتأكيد
-        header: ملف PNG أو GIF أو JPG. حجمه على أقصى تصدير %{size}. سيتم تصغيره إلى %{dimensions}px
         inbox_url: نسخ العنوان الذي تريد استخدامه مِن صفحة الاستقبال للمُرحَّل
         irreversible: المنشورات التي تم تصفيتها ستختفي لا محالة حتى و إن تمت إزالة عامِل التصفية لاحقًا
         locale: لغة واجهة المستخدم و الرسائل الإلكترونية و الإشعارات
diff --git a/config/locales/simple_form.ast.yml b/config/locales/simple_form.ast.yml
index 9b560b67ebbca6..e3969625670018 100644
--- a/config/locales/simple_form.ast.yml
+++ b/config/locales/simple_form.ast.yml
@@ -18,10 +18,8 @@ ast:
         text: Pues usar la sintaxis de los artículos. Ten en cuenta l'espaciu que l'anunciu va ocupar na pantalla del usuariu/a
       defaults:
         autofollow: Les persones que se rexistren pente la invitación van siguite automáticamente
-        avatar: Ficheros PNG, GIF o JPG de %{size} como muncho. La semeya va redimensionase a %{dimensions} px
         bot: Avisa a otres persones de qu'esta cuenta fai principalmente aiciones automatizaes ya de que ye posible que nun tean supervisaes
         digest: Namás s'unvia dempués d'un periodu llongu d'inactividá ya namás si recibiesti dalgún mensaxe personal demientres la to ausencia
-        header: Ficheros PNG, GIF o JPG de %{size} como muncho. La semeya va redimensionase a %{dimensions} px
         irreversible: Los artículos peñeraos desapaecen de forma irreversible, magar que la peñera se quite dempués
         locale: La llingua de la interfaz, los mensaxes per corréu electrónicu ya los avisos push
         password: Usa polo menos 8 caráuteres
diff --git a/config/locales/simple_form.be.yml b/config/locales/simple_form.be.yml
index 7ad87cdd9f4d28..e72d16a1878b7a 100644
--- a/config/locales/simple_form.be.yml
+++ b/config/locales/simple_form.be.yml
@@ -39,14 +39,14 @@ be:
         text: Вы можаце абскардзіць рашэнне толькі адзін раз
       defaults:
         autofollow: Людзі, якія зарэгістраваліся праз запрашэнне, аўтаматычна падпішуцца на вас
-        avatar: PNG, GIF ці JPG. Не больш за %{size}. Будзе сціснуты да памеру %{dimensions}} пікселяў
+        avatar: WEBP, PNG, GIF ці JPG. Не больш за %{size}. Будзе сціснуты да памеру %{dimensions}} пікселяў
         bot: Паведаміць іншым, што гэты ўліковы запіс у асноўным выконвае аўтаматычныя дзеянні і можа не кантралявацца
         context: Адзін ці некалькі кантэкстаў, да якіх трэба прымяніць фільтр
         current_password: У мэтах бяспекі, калі ласка, увядзіце пароль бягучага ўліковага запісу
         current_username: Каб пацвердзіць, увядзіце, калі ласка імя карыстальніка бягучага ўліковага запісу
         digest: Будзе даслана толькі пасля доўгага перыяду неактыўнасці і толькі калі вы атрымалі асабістыя паведамленні падчас вашай адсутнасці
         email: Пацвярджэнне будзе выслана па электроннай пошце
-        header: PNG, GIF ці JPG. Не больш за %{size}. Будзе сціснуты да памеру %{dimensions}} пікселяў
+        header: WEBP, PNG, GIF ці JPG. Не больш за %{size}. Будзе сціснуты да памеру %{dimensions}} пікселяў
         inbox_url: Капіраваць URL са старонкі рэтранслятара, якім вы хочаце карыстацца
         irreversible: Адфільтраваныя пасты прападуць незваротна, нават калі фільтр потым будзе выдалены
         locale: Мова карыстальніцкага інтэрфейсу, электронных паведамленняў і апавяшчэнняў
diff --git a/config/locales/simple_form.bg.yml b/config/locales/simple_form.bg.yml
index a4637a68109e89..831e1a2f8c5443 100644
--- a/config/locales/simple_form.bg.yml
+++ b/config/locales/simple_form.bg.yml
@@ -9,7 +9,7 @@ bg:
         indexable: Вашите обществени публикации може да се появят в резултатите от търсене в Mastodon. Взаимодействалите с публикациите ви може да ги търсят независимо.
         note: 'Може да @споменавате други хора или #хаштагове.'
         show_collections: Хората ще може да разглеждат през вашите последвания и последователи. Хората, които сте следвали, ще видят, че ги следвате независимо от това.
-        unlocked: Хората ще може да ви следват без да се изисква одобрение. Размаркирайте, ако искате да преглеждате заявките за последване и изберете дали да приемете или отхвърлите новите последователи.
+        unlocked: Хората ще могат да ви последват без изискване на одобрение. Размаркирайте, ако искате да преглеждате заявките за последване и изберете дали да приемете или отхвърлите новите последователи.
       account_alias:
         acct: Посочете потребителско_име@домейн на акаунта си, от който искате да се преместите
       account_migration:
@@ -39,14 +39,14 @@ bg:
         text: Може да възразите срещу провинение само веднъж
       defaults:
         autofollow: Хората, които се регистрират чрез поканата, автоматично ще ви последват
-        avatar: PNG, GIF или JPG. До най-много %{size}. Ще се смали до %{dimensions} пиксела
+        avatar: WEBP, PNG, GIF или JPG. До най-много %{size}. Ще се смали до %{dimensions} пиксела
         bot: Сигнализиране до другите, че акаунтът изпълнява предимно автоматизирани деяния и може да не се наблюдава
         context: Един или повече контексти, към които да се приложи филтърът
         current_password: От съображения за сигурност, въведете паролата на текущия акаунт
         current_username: Въведете потребителското име на текущия профил, за да потвърдите
         digest: Изпраща се само след дълъг период на бездействие и само ако сте получили лични съобщения във ваше отсъствие
         email: Ще ви се изпрати имейл за потвърждение
-        header: PNG, GIF или JPG. До най-много %{size}. Ще се смали до %{dimensions} пиксела
+        header: WEBP, PNG, GIF или JPG. До най-много %{size}. Ще се смали до %{dimensions} пиксела
         inbox_url: Копирайте URL адреса от заглавната страница на предаващия сървър, който искате да използвате
         irreversible: Филтрираните публикации ще изчезнат безвъзвратно, дори филтърът да бъде премахнат по-късно
         locale: Езикът на потребителския интерфейс, известиятата по имейл и насочените известия
diff --git a/config/locales/simple_form.br.yml b/config/locales/simple_form.br.yml
index 98a7e7e641068b..529e3224e67c4d 100644
--- a/config/locales/simple_form.br.yml
+++ b/config/locales/simple_form.br.yml
@@ -3,8 +3,8 @@ br:
   simple_form:
     hints:
       defaults:
-        avatar: PNG, GIF pe JPG. Brasoc'h eget %{size}. A vo izelaet betek %{dimensions}px
-        header: PNG, GIF pe JPG. Brasoc'h eget %{size}. A vo izelaet betek %{dimensions}px
+        avatar: WEBP, PNG, GIF pe JPG. Bihanoc'h eget %{size}. A vo izelaet betek %{dimensions}px
+        header: WEBP, PNG, GIF pe JPG. Bihanoc'h eget %{size}. A vo izelaet betek %{dimensions}px
         password: Implijit 8 lizherennoù d'an neubeutañ
         setting_default_sensitive: Ar mediaoù kizidik a zo kuzhet dre ziouer ha gallout a reont bezañ diguzhet dre ur c'hlik
         setting_display_media_default: Kuzhat mediaoù aroueziet evel kizidik
diff --git a/config/locales/simple_form.ckb.yml b/config/locales/simple_form.ckb.yml
index a6110e20348f01..3c1d8315e326f4 100644
--- a/config/locales/simple_form.ckb.yml
+++ b/config/locales/simple_form.ckb.yml
@@ -25,14 +25,12 @@ ckb:
         text: دەتوانیت ڕستەسازی توت بەکار بێنیت. تکایە بیر لەو بۆشاییە بکەوە کە بانگەوازەکە لەسەر شاشەی بەکارهێنەرەکە دەست نیشان دەکات
       defaults:
         autofollow: ئەو کەسانەی کە لە ڕێگەی بانگهێشتکردنەوە تۆمار دەکرێن بە خۆکارانە شوێنت دەکەون
-        avatar: PNG, GIF یان JPG. لە زۆربەی %{size}. دەبێتە ئەندازەیەکی کەمکراوە بۆ %{dimensions}px
         bot: ئەم هەژمارە بەشێوەیەکی سەرەکی کردارە خۆکارانە ئەنجام دەدات و لەوانەیە چاودێری نەکرێت
         context: یەک یان چەند دەقێک کە پالافتنەکە جێبەجێ بکات
         current_password: بۆ مەبەستی پاراستن تکایە تێپەروشەی هەژمارەی ئێستاکەت بنووسە
         current_username: بۆ دڵنیابوون، تکایە ناوی بەکارهێنەری ئەم هەژمارەیە بنووسە
         digest: تەنیا دوای ماوەیەکی زۆر لە بێ چالاکیدەنێردرێت و تەنیا ئەگەر نامەیەکی کەسیت بۆ نووسرابێت
         email: ئیمەیڵێکی پشتڕاستکردنەوەت بۆ دەنێردرێت
-        header: PNG, GIF یان JPG. لە زۆربەی %{size}. دەبێتە ئەندازەیەکی کەمکراوە بۆ %{dimensions}پیکسێڵ
         inbox_url: نیشانەی پەڕەی سەرەکی ئەو رێڵە کە هەرەکتە بەکاریببەیت ڕوونووس دەکات
         irreversible: توتە فلتەرکراوەکە بە شێوەیەکی نەگەڕاو فرەدەدرێن، تەنانەت ئەگەر فلتەردواتر لاببرێت
         locale: زمانی ڕووکاری بەکارهێنەر، ئیمەیلەکان و ئاگانامەکان
diff --git a/config/locales/simple_form.co.yml b/config/locales/simple_form.co.yml
index fd6f595e919c6d..dfec033469efb6 100644
--- a/config/locales/simple_form.co.yml
+++ b/config/locales/simple_form.co.yml
@@ -23,14 +23,12 @@ co:
         text: Pudete utilizà a sintassa di i statuti. Pensate à a piazza chì l'annunziu hà da piglià nant'à u screnu di l'utilizatore
       defaults:
         autofollow: Quelli·e chì s'arregistranu cù l'invitazione saranu autumaticamente abbunati·e à voi
-        avatar: Furmatu PNG, GIF o JPG. %{size} o menu. Sarà ridottu à %{dimensions}px
         bot: Stu contu hè autumatizatu è ùn hè forse micca survegliatu
         context: Cuntestu·i induve u filtru deve esse applicatu
         current_password: Per ragione di sicurità, entrate a chjave d'accessu di stu contu
         current_username: Per cunfirmà, entrate u cugnome di questu contu
         digest: Solu mandatu dopu à una longa perioda d’inattività, è solu s’elli ci sò novi missaghji diretti
         email: Avete da riceve un'e-mail di cunfirmazione
-        header: Furmatu PNG, GIF o JPG. %{size} o menu. Sarà ridottu à %{dimensions}px
         inbox_url: Cupiate l'URL di a pagina d'accolta di u ripetitore chì vulete utilizà
         irreversible: I statuti filtrati saranu sguassati di manera irreversibile, ancu s'ellu hè toltu u filtru
         locale: A lingua di l'interfaccia utilizatore, di l'e-mail è di e nutificazione push
diff --git a/config/locales/simple_form.cs.yml b/config/locales/simple_form.cs.yml
index 9da377ae9c7e06..ca8cc49a98aa66 100644
--- a/config/locales/simple_form.cs.yml
+++ b/config/locales/simple_form.cs.yml
@@ -39,14 +39,14 @@ cs:
         text: Proti prohřešku se můžete odvolat jen jednou
       defaults:
         autofollow: Lidé, kteří se zaregistrují skrz pozvánky, vás budou automaticky sledovat
-        avatar: PNG, GIF či JPG. Maximálně %{size}. Bude zmenšen na %{dimensions} px
+        avatar: WEBP, PNG, GIF či JPG. Maximálně %{size}. Bude zmenšen na %{dimensions} px
         bot: Signalizovat ostatním, že účet převážně vykonává automatizované akce a nemusí být monitorován
         context: Jeden či více kontextů, ve kterých má být filtr uplatněn
         current_password: Z bezpečnostních důvodů prosím zadejte heslo současného účtu
         current_username: Potvrďte prosím tuto akci zadáním uživatelského jména aktuálního účtu
         digest: Odesíláno pouze po dlouhé době nečinnosti a pouze, pokud jste během své nepřítomnosti obdrželi osobní zprávy
         email: Bude vám poslán potvrzovací e-mail
-        header: PNG, GIF či JPG. Maximálně %{size}. Bude zmenšen na %{dimensions} px
+        header: WEBP, PNG, GIF či JPG. Maximálně %{size}. Bude zmenšen na %{dimensions} px
         inbox_url: Zkopírujte URL z hlavní stránky mostu, který chcete použít
         irreversible: Filtrované příspěvky nenávratně zmizí, i pokud bude filtr později odstraněn
         locale: Jazyk uživatelského rozhraní, e-mailů a push notifikací
diff --git a/config/locales/simple_form.cy.yml b/config/locales/simple_form.cy.yml
index ddc1b1b9353c6b..3bba0d71cb72e0 100644
--- a/config/locales/simple_form.cy.yml
+++ b/config/locales/simple_form.cy.yml
@@ -39,14 +39,12 @@ cy:
         text: Dim ond unwaith y gallwch apelio yn erbyn rhybudd
       defaults:
         autofollow: Bydd pobl sy'n cofrestru drwy'r gwahoddiad yn eich dilyn yn awtomatig
-        avatar: PNG, GIF neu JPG. %{size} yn uchafswm. Bydd yn cael ei israddio i %{dimensions}px
         bot: Mae'r cyfrif hwn yn perfformio gweithredoedd awtomatig yn bennaf ac mae'n bosib nad yw'n cael ei fonitro
         context: Un neu fwy cyd-destun lle dylai'r hidlydd weithio
         current_password: At ddibenion diogelwch, nodwch gyfrinair y cyfrif cyfredol
         current_username: I gadarnhau, nodwch enw defnyddiwr y cyfrif cyfredol
         digest: Ond yn cael eu hanfon ar ôl cyfnod hir o anweithgarwch ac ond os ydych wedi derbyn unrhyw negeseuon personol yn eich absenoldeb
         email: Byddwch yn derbyn e-bost cadarnhau
-        header: PNG, GIF neu JPG. %{size} ar y mwyaf. Bydd yn cael ei israddio i %{dimensions}px
         inbox_url: Copïwch yr URL o dudalen flaen y relái yr ydych am ei ddefnyddio
         irreversible: Bydd postiadau wedi'u hidlo'n diflannu'n ddiwrthdro, hyd yn oed os caiff yr hidlydd ei dynnu'n ddiweddarach
         locale: Iaith y rhyngwyneb, e-byst a hysbysiadau gwthiadwy
diff --git a/config/locales/simple_form.da.yml b/config/locales/simple_form.da.yml
index 0d86b2bc8d26a7..fde0bcc2485364 100644
--- a/config/locales/simple_form.da.yml
+++ b/config/locales/simple_form.da.yml
@@ -39,14 +39,14 @@ da:
         text: En advarsel kan kun appelleres én gang
       defaults:
         autofollow: Personer tilmeldt via invitationen vil automatisk blive følgere
-        avatar: PNG, GIF eller JPG. Maks. %{size}. Auto-nedskaleres til %{dimensions}px
+        avatar: WEBP, PNG, GIF eller JPG. Maks. %{size}. Nedskaleres til %{dimensions}px
         bot: Signalér til andre, at denne konto primært udfører automatiserede handlinger og muligvis ikke monitoreres
         context: En eller flere kontekster, hvor filteret skal anvendes
         current_password: Angiv af sikkerhedsårsager adgangskoden til den aktuelle konto
         current_username: For at bekræfte, angiv brugernavnet for den aktuelle konto
         digest: Sendes kun efter en lang inaktivitetsperiode, og kun hvis du har modtaget personlige beskeder under fraværet
         email: En bekræftelses-e-mail fremsendes
-        header: PNG, GIF eller JPG. Maks. %{size}. Auto-nedskaleres til %{dimensions}px
+        header: WEBP, PNG, GIF eller JPG. Maks. %{size}. Nedskaleres til %{dimensions}px
         inbox_url: Kopiér URL'en fra forsiden af den videreformidler, der skal anvendes
         irreversible: Filtrerede indlæg forsvinder permanent, selv hvis filteret senere fjernes
         locale: Sprog til brug for brugerflade, e-mails og push-notifikationer
diff --git a/config/locales/simple_form.de.yml b/config/locales/simple_form.de.yml
index fcf92e29f433d8..b8fec42d66f746 100644
--- a/config/locales/simple_form.de.yml
+++ b/config/locales/simple_form.de.yml
@@ -39,14 +39,14 @@ de:
         text: Du kannst nur einmal Einspruch gegen eine Maßnahme einlegen
       defaults:
         autofollow: Personen, die sich über deine Einladung registrieren, folgen automatisch deinem Profil
-        avatar: PNG, GIF oder JPG. Höchstens %{size} groß. Wird auf %{dimensions} px verkleinert
+        avatar: WEBP, PNG, GIF oder JPG. Höchstens %{size} groß. Wird auf %{dimensions} px verkleinert
         bot: Signalisiert, dass dieses Konto hauptsächlich automatisierte Aktionen durchführt und möglicherweise nicht persönlich betreut wird
         context: Orte, an denen der Filter aktiv sein soll
         current_password: Gib aus Sicherheitsgründen bitte das Passwort des aktuellen Kontos ein
         current_username: Um das zu bestätigen, gib den Profilnamen des aktuellen Kontos ein
         digest: Wenn du eine längere Zeit inaktiv bist oder du während deiner Abwesenheit in einer privaten Nachricht erwähnt worden bist
         email: Du wirst eine E-Mail zur Verifizierung dieser E-Mail-Adresse erhalten
-        header: PNG, GIF oder JPG. Höchstens %{size} groß. Wird auf %{dimensions} px verkleinert
+        header: WEBP, PNG, GIF oder JPG. Höchstens %{size} groß. Wird auf %{dimensions} px verkleinert
         inbox_url: Kopiere die URL von der Startseite des gewünschten Relays
         irreversible: Bereinigte Beiträge verschwinden unwiderruflich für dich, auch dann, wenn dieser Filter zu einem späteren wieder entfernt wird
         locale: Die Sprache der Bedienoberfläche, E-Mails und Push-Benachrichtigungen
diff --git a/config/locales/simple_form.el.yml b/config/locales/simple_form.el.yml
index dc140a199fc941..4ffc496d020ca1 100644
--- a/config/locales/simple_form.el.yml
+++ b/config/locales/simple_form.el.yml
@@ -31,14 +31,12 @@ el:
         text: Μπορείς να κάνετε έφεση σε ένα παράπτωμα μόνο μία φορά
       defaults:
         autofollow: Όσοι εγγραφούν μέσω της πρόσκλησης θα σε ακολουθούν αυτόματα
-        avatar: PNG, GIF ή JPG. Έως %{size}. Θα περιοριστεί σε διάσταση %{dimensions}px
         bot: Ο λογαριασμός αυτός εκτελεί κυρίως αυτοματοποιημένες ενέργειες και ίσως να μην παρακολουθείται
         context: Ένα ή περισσότερα πλαίσια στα οποία μπορεί να εφαρμόζεται αυτό το φίλτρο
         current_password: Για λόγους ασφαλείας παρακαλώ γράψε τον κωδικό του τρέχοντος λογαριασμού
         current_username: Για επιβεβαίωση, παρακαλώ γράψε το όνομα χρήστη του τρέχοντος λογαριασμού
         digest: Αποστέλλεται μόνο μετά από μακρά περίοδο αδράνειας και μόνο αν έχεις λάβει προσωπικά μηνύματα κατά την απουσία σου
         email: Θα σου σταλεί email επιβεβαίωσης
-        header: PNG, GIF ή JPG. Έως %{size}. Θα περιοριστεί σε διάσταση %{dimensions}px
         inbox_url: Αντέγραψε το URL της αρχικής σελίδας του ανταποκριτή που θέλεις να χρησιμοποιήσεις
         irreversible: Οι φιλτραρισμένες αναρτήσεις θα εξαφανιστούν αμετάκλητα, ακόμα και αν το φίλτρο αργότερα αφαιρεθεί
         locale: Η γλώσσα χρήσης, των email και των ειδοποιήσεων push
diff --git a/config/locales/simple_form.en-GB.yml b/config/locales/simple_form.en-GB.yml
index f0c18d1128b676..2ac4508b05500b 100644
--- a/config/locales/simple_form.en-GB.yml
+++ b/config/locales/simple_form.en-GB.yml
@@ -39,14 +39,12 @@ en-GB:
         text: You can only appeal a strike once
       defaults:
         autofollow: People who sign up through the invite will automatically follow you
-        avatar: PNG, GIF or JPG. At most %{size}. Will be downscaled to %{dimensions}px
         bot: Signal to others that the account mainly performs automated actions and might not be monitored
         context: One or multiple contexts where the filter should apply
         current_password: For security purposes please enter the password of the current account
         current_username: To confirm, please enter the username of the current account
         digest: Only sent after a long period of inactivity and only if you have received any personal messages in your absence
         email: You will be sent a confirmation e-mail
-        header: PNG, GIF or JPG. At most %{size}. Will be downscaled to %{dimensions}px
         inbox_url: Copy the URL from the frontpage of the relay you want to use
         irreversible: Filtered posts will disappear irreversibly, even if filter is later removed
         locale: The language of the user interface, e-mails and push notifications
diff --git a/config/locales/simple_form.eo.yml b/config/locales/simple_form.eo.yml
index d25412561bf494..ef4641d3e78777 100644
--- a/config/locales/simple_form.eo.yml
+++ b/config/locales/simple_form.eo.yml
@@ -39,14 +39,12 @@ eo:
         text: Oni povas apelaci strikin nur unufoje
       defaults:
         autofollow: Homoj, kiuj registriĝos per la invito aŭtomate sekvos vin
-        avatar: Formato PNG, GIF aŭ JPG. Ĝis %{size}. Estos malgrandigita al %{dimensions}px
         bot: Tiu konto ĉefe faras aŭtomatajn agojn, kaj povas esti ne kontrolata
         context: Unu ol pluraj kuntekstoj kie la filtrilo devus agi
         current_password: Pro sekuraj kialoj, bonvolu enigi la pasvorton de la nuna konto
         current_username: Por konfirmi, bonvolu enigi la uzantnomon de la nuna konto
         digest: Sendita nur post longa tempo de neaktiveco, kaj nur se vi ricevis personan mesaĝon en via foresto
         email: Vi ricevos konfirman retpoŝton
-        header: Formato PNG, GIF aŭ JPG. Ĝis %{size}. Estos malgrandigita al %{dimensions}px
         inbox_url: Kopiu la URL de la ĉefpaĝo de la ripetilo, kiun vi volas uzi
         irreversible: La filtritaj mesaĝoj malaperos por eterne, eĉ se la filtrilo poste estas forigita
         locale: La lingvo de la fasado, retpoŝtaĵoj, kaj sciigoj
diff --git a/config/locales/simple_form.es-AR.yml b/config/locales/simple_form.es-AR.yml
index 9b52ece34e0346..a074091313c8f1 100644
--- a/config/locales/simple_form.es-AR.yml
+++ b/config/locales/simple_form.es-AR.yml
@@ -39,14 +39,14 @@ es-AR:
         text: Sólo podés apelar un incumplimiento una vez
       defaults:
         autofollow: Los usuarios que se registren mediante la invitación te seguirán automáticamente
-        avatar: 'PNG, GIF o JPG. Máximo: %{size}. Será subescalado a %{dimensions} píxeles.'
+        avatar: WEBP, PNG, GIF o JPG. Máximo %{size}. Será escalado a %{dimensions}px
         bot: Esta cuenta ejecuta principalmente acciones automatizadas y podría no ser monitorizada
         context: Uno o múltiples contextos en los que debe aplicarse el filtro
         current_password: Por razones de seguridad, por favor, ingresá la contraseña de la cuenta actual
         current_username: Para confirmar, por favor, ingresá el nombre de usuario de la cuenta actual
         digest: Sólo enviado tras un largo periodo de inactividad, y sólo si recibiste mensajes personales en tu ausencia
         email: Se te enviará un correo electrónico de confirmación
-        header: 'PNG, GIF o JPG. Máximo: %{size}. Será subescalado a %{dimensions} píxeles.'
+        header: WEBP, PNG, GIF o JPG. Máximo %{size}. Será escalado a %{dimensions}px
         inbox_url: Copiá la dirección web desde la página principal del relé que querés usar
         irreversible: Los mensajes filtrados desaparecerán irreversiblemente, incluso si este filtro es eliminado después
         locale: El idioma de la interface de usuario, correos electrónicos y notificaciones push
diff --git a/config/locales/simple_form.es-MX.yml b/config/locales/simple_form.es-MX.yml
index 932ed6c59aa7c3..d8f1cf95a00c9d 100644
--- a/config/locales/simple_form.es-MX.yml
+++ b/config/locales/simple_form.es-MX.yml
@@ -39,14 +39,14 @@ es-MX:
         text: Sólo puede apelar una amonestación a la vez
       defaults:
         autofollow: Los usuarios que se registren mediante la invitación te seguirán automáticamente
-        avatar: PNG, GIF o JPG. Máximo %{size}. Será escalado a %{dimensions}px
+        avatar: WEBP, PNG, GIF o JPG. Máximo %{size}. Será escalado a %{dimensions}px
         bot: Esta cuenta ejecuta principalmente acciones automatizadas y podría no ser monitorizada
         context: Uno o múltiples contextos en los que debe aplicarse el filtro
         current_password: Por razones de seguridad por favor ingrese la contraseña de la cuenta actual
         current_username: Para confirmar, por favor ingrese el nombre de usuario de la cuenta actual
         digest: Solo enviado tras un largo periodo de inactividad y solo si has recibido mensajes personales durante tu ausencia
         email: Se le enviará un correo de confirmación
-        header: PNG, GIF o JPG. Máximo %{size}. Será escalado a %{dimensions}px
+        header: WEBP, PNG, GIF o JPG. Máximo %{size}. Será escalado a %{dimensions}px
         inbox_url: Copia la URL de la página principal del relés que quieres utilizar
         irreversible: Los toots filtrados desaparecerán irreversiblemente, incluso si este filtro es eliminado más adelante
         locale: El idioma de la interfaz de usuario, correos y notificaciones push
diff --git a/config/locales/simple_form.es.yml b/config/locales/simple_form.es.yml
index 997f09bf08f8a6..fee260aa8992f7 100644
--- a/config/locales/simple_form.es.yml
+++ b/config/locales/simple_form.es.yml
@@ -11,9 +11,9 @@ es:
         show_collections: Las personas podrán navegar a través de tus seguidos y seguidores. Esto no impide que las personas que sigues sepan que las estás siguiendo.
         unlocked: Las personas podrán seguirte sin pedir aprobación. Desmarca si deseas revisar las solicitudes de seguimiento y aceptar o rechazar nuevos seguidores.
       account_alias:
-        acct: Especifique su nombre de usuario@dominio de la cuenta de donde se desea migrar
+        acct: Especifica el nombre_de_usuario@dominio de la cuenta desde donde deseas migrar
       account_migration:
-        acct: Especifique el nombre de usuario@dominio de la cuenta de la cual se desea migrar
+        acct: Especifica el nombre_de_usuario@dominio de la cuenta hacia la que quieres migrar
       account_warning_preset:
         text: Puede usar sintaxis de publicaciones, como URLs, hashtags y menciones
         title: Opcional. No es visible para el destinatario
@@ -21,14 +21,14 @@ es:
         include_statuses: El usuario verá qué publicaciones han causado la acción de moderación o advertencia
         send_email_notification: El usuario recibirá una explicación de lo que ha sucedido con su cuenta
         text_html: Opcional. Puede usar sintaxis de publicaciones. Puede añadir <a href="%{path}">configuraciones predefinidas de advertencia</a> para ahorrar tiempo
-        type_html: Elige lo qué vas a hacer con <strong>%{acct}</strong>
+        type_html: Elige lo que vas a hacer con <strong>%{acct}</strong>
         types:
           disable: Evita que el usuario utilice su cuenta, pero no elimina ni oculta sus contenidos.
-          none: Utilizar esto para enviar una advertencia al usuario, sin poner en marcha ninguna otra acción.
+          none: Utiliza esto para enviar una advertencia al usuario, sin ejecutar ninguna otra acción.
           sensitive: Forzar que todos los archivos multimedia de este usuario sean marcados como sensibles.
           silence: Evita que el usuario pueda publicar con visibilidad pública, y oculta sus mensajes y notificaciones a personas que no lo siguen. Cierra todos los informes contra esta cuenta.
           suspend: Evita cualquier interacción desde o hacia esta cuenta y elimina su contenido. Reversible en 30 días. Cierra todos los informes contra esta cuenta.
-        warning_preset_id: Opcional. Aún puede añadir texto personalizado al final de la configuración predefinida
+        warning_preset_id: Opcional. Aún puedes añadir texto personalizado al final de la configuración predefinida
       announcement:
         all_day: Cuando está seleccionado solo se mostrarán las fechas del rango de tiempo
         ends_at: Opcional. El anuncio desaparecerá automáticamente en este momento
@@ -36,17 +36,17 @@ es:
         starts_at: Opcional. En caso de que su anuncio esté vinculado a un intervalo de tiempo específico
         text: Puedes usar la sintaxis de publicaciones. Por favor ten en cuenta el espacio que ocupará el anuncio en la pantalla del usuario
       appeal:
-        text: Sólo puedes apelar una amonestación una vez
+        text: Solo puedes apelar la amonestación una vez
       defaults:
         autofollow: Los usuarios que se registren mediante la invitación te seguirán automáticamente
-        avatar: PNG, GIF o JPG. Máximo %{size}. Será escalado a %{dimensions}px
+        avatar: WEBP, PNG, GIF o JPG. Máximo %{size}. Será escalado a %{dimensions}px
         bot: Esta cuenta ejecuta principalmente acciones automatizadas y podría no ser monitorizada
         context: Uno o múltiples contextos en los que debe aplicarse el filtro
         current_password: Por razones de seguridad por favor ingrese la contraseña de la cuenta actual
         current_username: Para confirmar, por favor ingrese el nombre de usuario de la cuenta actual
         digest: Solo enviado tras un largo periodo de inactividad y solo si has recibido mensajes personales durante tu ausencia
         email: Se le enviará un correo de confirmación
-        header: PNG, GIF o JPG. Máximo %{size}. Será escalado a %{dimensions}px
+        header: WEBP, PNG, GIF o JPG. Máximo %{size}. Será escalado a %{dimensions}px
         inbox_url: Copia la URL de la página principal del relés que quieres utilizar
         irreversible: Las publicaciones filtradas desaparecerán irreversiblemente, incluso si este filtro es eliminado más adelante
         locale: El idioma de la interfaz de usuario, correos y notificaciones push
diff --git a/config/locales/simple_form.et.yml b/config/locales/simple_form.et.yml
index 501e1f333eb4a1..15cf403cf2e831 100644
--- a/config/locales/simple_form.et.yml
+++ b/config/locales/simple_form.et.yml
@@ -39,14 +39,12 @@ et:
         text: Otsust on võimalik vaidlustada vaid 1 kord
       defaults:
         autofollow: Inimesed, kes loovad konto selle kutse läbi, automaatselt jälgivad sind
-        avatar: PNG, GIF või JPG. Kõige rohkem %{size}. Vähendatakse %{dimensions} pikslini
         bot: Teavita teisi, et see konto teeb enamjaolt automatiseeritud tegevusi ja ei pruugi olla järelvalve all
         context: Üks või mitu konteksti, mille vastu see filter peaks rakenduma
         current_password: Sisesta turvalisuse huvides oma siinse konto salasõna
         current_username: Kinnitamiseks palun sisesta oma konto kasutajanimi
         digest: Saadetakse ainult pärast pikka tegevusetuse perioodi ja ainult siis, kui on saadetud otsesõnumeid
         email: Sulle saadetakse e-posti teel kinnituskiri
-        header: PNG, GIF või JPG. Kõige rohkem %{size}. Vähendatakse %{dimensions} pikslini
         inbox_url: Kopeeri soovitud vahendaja avalehe URL
         irreversible: Filtreeritud postitused kaovad taastamatult, isegi kui filter on hiljem eemaldatud
         locale: Kasutajaliidese, e-kirjade ja tõuketeadete keel
diff --git a/config/locales/simple_form.eu.yml b/config/locales/simple_form.eu.yml
index ffd3081c937f7e..b417b45fa9ed75 100644
--- a/config/locales/simple_form.eu.yml
+++ b/config/locales/simple_form.eu.yml
@@ -39,14 +39,14 @@ eu:
         text: Neurri bati apelazioa behin bakarrik jarri diezaiokezu
       defaults:
         autofollow: Gonbidapena erabiliz izena ematen dutenek automatikoki jarraituko dizute
-        avatar: PNG, GIF edo JPG. Gehienez %{size}. %{dimensions}px neurrira eskalatuko da
+        avatar: WEBP, GIF edo JPG. Gehienez %{size}. %{dimensions}px neurrira eskalatuko da
         bot: Kontu honek nagusiki automatizatutako ekintzak burutzen ditu eta agian ez du inork monitorizatzen
         context: Iragazkia aplikatzeko testuinguru bat edo batzuk
         current_password: Segurtasunagatik sartu uneko kontuaren pasahitza
         current_username: Berresteko sartu uneko kontuaren erabiltzaile-izena
         digest: Jarduerarik gabeko epe luze bat eta gero mezu pertsonalen bat jaso baduzu soilik
         email: Baieztapen e-mail bat bidaliko zaizu
-        header: PNG, GIF edo JPG. Gehienez %{size}. %{dimensions}px eskalara txikituko da
+        header: WEBP, GIF edo JPG. Gehienez %{size}. %{dimensions}px neurrira eskalatuko da
         inbox_url: Kopiatu erabili nahi duzun errelearen hasiera orriaren URLa
         irreversible: Iragazitako tootak betirako galduko dira, geroago iragazkia kentzen baduzu ere
         locale: Erabiltzaile-interfazea, e-mail mezuen eta jakinarazpenen hizkuntza
diff --git a/config/locales/simple_form.fa.yml b/config/locales/simple_form.fa.yml
index 23fbc43b07ec33..a312e5aa1c641a 100644
--- a/config/locales/simple_form.fa.yml
+++ b/config/locales/simple_form.fa.yml
@@ -39,14 +39,12 @@ fa:
         text: فقط یک بار می‌توانید برای اخطار درخواست تجدیدنظر کنید
       defaults:
         autofollow: کسانی که از راه دعوت‌نامه عضو می‌شوند به طور خودکار پیگیر شما خواهند شد
-        avatar: یکی از قالب‌های PNG یا  GIF یا JPG. بیشترین اندازه %{size}. تصویر به اندازهٔ %{dimensions} پیکسل تبدیل خواهد شد
         bot: این حساب بیشتر به طور خودکار فعالیت می‌کند و نظارت پیوسته‌ای روی آن وجود ندارد
         context: یک یا چند زمینه که پالایه باید در آن‌ها اعمال شود
         current_password: به دلایل امنیتی لطفاً گذرواژه این حساب را وارد کنید
         current_username: برای تأیید، لطفاً نام کاربری حساب فعلی را وارد کنید
         digest: تنها وقتی فرستاده می‌شود که مدتی طولانی فعالیتی نداشته باشید و در این مدت برای شما پیغام خصوصی‌ای نوشته شده باشد
         email: به شما ایمیل تأییدی فرستاده خواهد شد
-        header: یکی از قالب‌های PNG یا  GIF یا JPG. بیشترین اندازه %{size}. تصویر به اندازهٔ %{dimensions} پیکسل تبدیل خواهد شد
         inbox_url: نشانی صفحهٔ اصلی رله‌ای را که می‌خواهید به کار ببرید کپی کنید
         irreversible: فرسته‌های پالوده به طور برگشت‌ناپذیری ناپدید می‌شوند، حتا اگر بعدها پالایه برداشته شود
         locale: زبان واسط کاربری، رایانامه‌ها و آگاهی‌های ارسالی
diff --git a/config/locales/simple_form.fo.yml b/config/locales/simple_form.fo.yml
index e4d87e1786a9ea..003eede25b92f6 100644
--- a/config/locales/simple_form.fo.yml
+++ b/config/locales/simple_form.fo.yml
@@ -39,14 +39,14 @@ fo:
         text: Tú kanst bara kæra eina atsókn eina ferð
       defaults:
         autofollow: Fólk, sum tilmelda seg gjøgnum innbjóðingina, fylgja tær sjálvvirkandi
-        avatar: PNG, GIF ella JPG. Ikki størri enn %{size}. Verður minkað til %{dimensions}px
+        avatar: WEBP, PNG, GIF ella JPG. Í mesta lagi %{size}. Verður minkað til %{dimensions}px
         bot: Tekin til onnur, at kontan í høvuðsheitum ger sjálvvirkandi atgerðir og møguliga ikki verður yvirvakað
         context: Ein ella fleiri kontekstir, har sum filtrið skal brúkast
         current_password: Av trygdarávum vinarliga les inn loyniorðið hjá verandi kontu
         current_username: Fyri at vátta, vinarliga les inn brúkaranavnið á verandi kontu
         digest: Einans sent eftir eitt langt tíðarskeið við óvirkni og einans um tú hevur móttikið persónlig boð meðan tú var burtur
         email: Tú fær sendandi ein váttanarteldupost
-        header: PNG, GIF ella JPG. Ikki størri enn %{size}. Verður minkað til %{dimensions}px
+        header: WEBP, PNG, GIF ella JPG. Í mesta lagi %{size}. Verður minkað til %{dimensions}px
         inbox_url: Avrita URL'in frá forsíðuni hjá reiðlagnum, sum tú vilt brúka
         irreversible: Filtreraðir postar blíva burtur med alla, eisini sjálvt um filtrið seinni verður strikað
         locale: Málið, sum verður brúkt í brúkaramarkamótinum, teldupostum og skumpiboðum
diff --git a/config/locales/simple_form.fr-CA.yml b/config/locales/simple_form.fr-CA.yml
index f5a2a428e9ccb2..a4e57841e6b10c 100644
--- a/config/locales/simple_form.fr-CA.yml
+++ b/config/locales/simple_form.fr-CA.yml
@@ -39,14 +39,14 @@ fr-CA:
         text: Vous ne pouvez faire appel d'une sanction qu'une seule fois
       defaults:
         autofollow: Les personnes qui s’inscrivent grâce à l’invitation vous suivront automatiquement
-        avatar: Au format PNG, GIF ou JPG. %{size} maximum. Sera réduit à %{dimensions}px
+        avatar: WEBP, PNG, GIF ou JPG. Au plus %{size}. Sera réduit à %{dimensions}px
         bot: Signale aux autres que ce compte exécute principalement des actions automatisées et pourrait ne pas être surveillé
         context: Un ou plusieurs contextes où le filtre devrait s’appliquer
         current_password: Par mesure de sécurité, veuillez saisir le mot de passe de ce compte
         current_username: Pour confirmer, veuillez saisir le nom d'utilisateur de ce compte
         digest: Uniquement envoyé après une longue période d’inactivité en cas de messages personnels reçus pendant votre absence
         email: Vous recevrez un courriel de confirmation
-        header: Au format PNG, GIF ou JPG. %{size} maximum. Sera réduit à %{dimensions}px
+        header: WEBP, PNG, GIF ou JPG. Au plus %{size}. Sera réduit à %{dimensions}px
         inbox_url: Copiez l’URL depuis la page d’accueil du relai que vous souhaitez utiliser
         irreversible: Les messages filtrés disparaîtront irrévocablement, même si le filtre est supprimé plus tard
         locale: La langue de l’interface, des courriels et des notifications
diff --git a/config/locales/simple_form.fr.yml b/config/locales/simple_form.fr.yml
index 5a74facb7a24b8..bd1dc6885f0076 100644
--- a/config/locales/simple_form.fr.yml
+++ b/config/locales/simple_form.fr.yml
@@ -39,14 +39,14 @@ fr:
         text: Vous ne pouvez faire appel d'une sanction qu'une seule fois
       defaults:
         autofollow: Les personnes qui s’inscrivent grâce à l’invitation vous suivront automatiquement
-        avatar: Au format PNG, GIF ou JPG. %{size} maximum. Sera réduit à %{dimensions}px
+        avatar: WEBP, PNG, GIF ou JPG. Au plus %{size}. Sera réduit à %{dimensions}px
         bot: Signale aux autres que ce compte exécute principalement des actions automatisées et pourrait ne pas être surveillé
         context: Un ou plusieurs contextes où le filtre devrait s’appliquer
         current_password: Par mesure de sécurité, veuillez saisir le mot de passe de ce compte
         current_username: Pour confirmer, veuillez saisir l’identifiant de ce compte
         digest: Uniquement envoyé après une longue période d’inactivité en cas de messages personnels reçus pendant votre absence
         email: Vous recevrez un courriel de confirmation
-        header: Au format PNG, GIF ou JPG. %{size} maximum. Sera réduit à %{dimensions}px
+        header: WEBP, PNG, GIF ou JPG. Au plus %{size}. Sera réduit à %{dimensions}px
         inbox_url: Copiez l’URL depuis la page d’accueil du relais que vous souhaitez utiliser
         irreversible: Les messages filtrés disparaîtront irrévocablement, même si le filtre est supprimé plus tard
         locale: La langue de l’interface, des courriels et des notifications
diff --git a/config/locales/simple_form.fy.yml b/config/locales/simple_form.fy.yml
index f506b792522054..8cedc3b1d5aedf 100644
--- a/config/locales/simple_form.fy.yml
+++ b/config/locales/simple_form.fy.yml
@@ -39,14 +39,12 @@ fy:
         text: Jo kinne mar ien kear beswier yntsjinje tsjin in fêststelde oertrêding
       defaults:
         autofollow: Minsken dy’t harren fia de útnûging registrearre hawwe, folgje jo automatysk
-        avatar: PNG, GIF of JPG. Maksimaal %{size}. Wurdt weromskeald nei %{dimensions}px
         bot: Sinjaal nei oare brûkers ta dat dizze account yn haadsaak automatisearre berjochten stjoert en mooglik net kontrolearre wurdt
         context: Ien of meardere lokaasjes wêr’t it filter aktyf wêze moat
         current_password: Fier foar feilichheidsredenen it wachtwurd fan jo aktuele account yn
         current_username: Fier ta befêstiging de brûkersnamme fan jo aktuele account yn
         digest: Wurdt allinnich nei in lange perioade fan ynaktiviteit ferstjoerd en allinnich wannear’t jo wylst jo ôfwêzigens persoanlike berjochten ûntfongen hawwe
         email: Jo krije in befêstigings-e-mailberjocht
-        header: PNG, GIF of JPG. Maksimaal %{size}. Wurdt weromskeald nei %{dimensions}px
         inbox_url: Kopiearje de URL fan de foarside fan de relayserver dy’t jo brûke wolle
         irreversible: Filtere berjochten ferdwine definityf, sels as it filter letter fuortsmiten wurdt
         locale: De taal fan de brûkersomjouwing, e-mailberjochten en pushmeldingen
diff --git a/config/locales/simple_form.gd.yml b/config/locales/simple_form.gd.yml
index a38dd43ad6fd58..7941ac334da736 100644
--- a/config/locales/simple_form.gd.yml
+++ b/config/locales/simple_form.gd.yml
@@ -39,14 +39,12 @@ gd:
         text: Chan urrainn dhut ath-thagradh a dhèanamh air rabhadh ach aon turas
       defaults:
         autofollow: Leanaidh na daoine a chlàraicheas leis a cuireadh thu gu fèin-obrachail
-        avatar: PNG, GIF or JPG. %{size} air a char as motha. Thèid a sgèileadh sìos gu %{dimensions}px
         bot: Comharraich do chàch gu bheil an cunntas seo ri gnìomhan fèin-obrachail gu h-àraidh is dh’fhaoidte nach doir duine sam bith sùil air idir
         context: Na co-theacsaichean air am bi a’ chriathrag an sàs
         current_password: A chùm tèarainteachd, cuir a-steach facal-faire a’ chunntais làithrich
         current_username: Airson seo a dhearbhadh, cuir a-steach ainm-cleachdaiche a’ chunntais làithrich
         digest: Cha dèid seo a chur ach nuair a bhios tu air ùine mhòr gun ghnìomh a ghabhail agus ma fhuair thu teachdaireachd phearsanta fhad ’s a bha thu air falbh
         email: Thèid post-d dearbhaidh a chur thugad
-        header: PNG, GIF or JPG. %{size} air a char as motha. Thèid a sgèileadh sìos gu %{dimensions}px
         inbox_url: Dèan lethbhreac dhen URL o phrìomh-dhuilleag an ath-sheachadain a bu mhiann leat cleachdadh
         irreversible: Thèid postaichean criathraichte à sealladh gu buan fiù ’s ma bheir thu a’ chriathrag air falbh às dèidh làimhe
         locale: Cànan eadar-aghaidh a’ chleachdaiche, nam post-d ’s nam brathan putaidh
diff --git a/config/locales/simple_form.gl.yml b/config/locales/simple_form.gl.yml
index 7bafca6b71a814..719da8eefa8bb3 100644
--- a/config/locales/simple_form.gl.yml
+++ b/config/locales/simple_form.gl.yml
@@ -39,14 +39,14 @@ gl:
         text: Só podes apelar a decisión unha vez
       defaults:
         autofollow: As persoas que se conectaron a través dun convite seguirante automáticamente
-        avatar: PNG, GIF ou JPG. Máximo %{size}. Será reducida a %{dimensions}px
+        avatar: WEBP, PNG, GIF ou JPG. Máximo %{size}. Será reducida a %{dimensions}px
         bot: Advirte ás usuarias de que esta conta realiza principalmente accións automatizadas e podería non estar monitorizada
         context: Un ou varios contextos onde se debería aplicar o filtro
         current_password: Por razóns de seguridade, introduce o contrasinal da conta actual
         current_username: Para confirmar, introduce o nome de usuaria da conta actual
         digest: Enviar só tras un longo período de inactividade e só se recibiches algunha mensaxe directa na tua ausencia
         email: Ímosche enviar un correo de confirmación
-        header: PNG, GIF ou JPG. Máximo %{size}. Será reducida a %{dimensions}px
+        header: WEBP, PNG, GIF ou JPG. Máximo %{size}. Será reducida a %{dimensions}px
         inbox_url: Copiar o URL desde a páxina de inicio do repetidor que queres utilizar
         irreversible: As publicacións filtradas desaparecerán de xeito irreversible, incluso se despois se elimina o filtro
         locale: O idioma da interface de usuaria, correos e notificacións
diff --git a/config/locales/simple_form.he.yml b/config/locales/simple_form.he.yml
index 0a8a57c3476eb3..3d7512c5f5461d 100644
--- a/config/locales/simple_form.he.yml
+++ b/config/locales/simple_form.he.yml
@@ -39,14 +39,14 @@ he:
         text: ניתן לערער על עברה רק פעם אחת
       defaults:
         autofollow: אנשים שיצטרפו בעזרת ההזמנה יעקבו אחריך באופן אוטומטי
-        avatar: PNG, GIF או JPG. מקסימום %{size}. גודל התמונה יוקטן ל-%{dimensions}px
+        avatar: WEBP, PNG, GIF או JPG. גודל מירבי %{size}. גודל התמונה יוקטן ל־%{dimensions} פיקסלים
         bot: איתות לאחרים שהחשבון מבצע בעיקר פעולות אוטומטיות ועשוי לא להיות מנוטר
         context: הקשר אחד או יותר בהם יופעל המסנן
         current_password: מסיבות אבטחה נא להזין את הסיסמא של החשבון הנוכחי
         current_username: על מנת לאשר, נא להכניס את שם המשתמש של החשבון הנוכחי
         digest: נשלח לאחר תקופה ארוכה של אי-פעילות עם סיכום איזכורים שקיבלת בהעדרך
         email: דוא"ל אישור יישלח אליך
-        header: PNG, GIF או JPG. מקסימום %{size}. גודל התמונה יוקטן %{dimensions}px
+        header: WEBP, PNG, GIF או JPG. גודל מירבי %{size}. גודל התמונה יוקטן ל־%{dimensions} פיקסלים
         inbox_url: נא להעתיק את הקישורית מדף הבית של הממסר בו תרצה/י להשתמש
         irreversible: הודעות מסוננות יעלמו באופן בלתי הפיך, אפילו אם מאוחר יותר יוסר המסנן
         locale: שפת ממשק המשתמש, הדוא"ל וההתראות בדחיפה
diff --git a/config/locales/simple_form.hr.yml b/config/locales/simple_form.hr.yml
index 3db4fd3b4a6792..ea40543c5155d1 100644
--- a/config/locales/simple_form.hr.yml
+++ b/config/locales/simple_form.hr.yml
@@ -8,8 +8,6 @@ hr:
         title: Proizvoljno. Nije vidljivo primatelju
       defaults:
         autofollow: Ljudi koji se registriraju kroz pozivnicu će te automatski slijediti
-        avatar: PNG, GIF ili JPG. Najviše %{size}. Bit će smanjeno na %{dimensions}px
-        header: PNG, GIF ili JPG. Najviše %{size}. Bit će smanjeno na %{dimensions}px
         password: Mora biti najmanje 8 znakova
         setting_display_media_default: Sakrij medijski sadržaj označen kao osjetljiv
         setting_display_media_hide_all: Uvijek sakrij medijski sadržaj
diff --git a/config/locales/simple_form.hu.yml b/config/locales/simple_form.hu.yml
index 6e11f7fb9346a4..573809c73a5904 100644
--- a/config/locales/simple_form.hu.yml
+++ b/config/locales/simple_form.hu.yml
@@ -39,14 +39,14 @@ hu:
         text: Egy vétséget csak egyszer fellebbezhetsz meg
       defaults:
         autofollow: Akik meghívón keresztül regisztrálnak, automatikusan követni fognak téged
-        avatar: PNG, GIF vagy JPG. Maximum %{size}. Átméretezzük %{dimensions} pixelre
+        avatar: WEBP, PNG, GIF vagy JPG. Legfeljebb %{size}. Át lesz méretezve %{dimensions} képpontosra.
         bot: Ez a fiók automatikus műveleteket végez és valószínűleg nem figyeljük
         context: Kontextusok, ahol a szűrőnek működnie kell
         current_password: Biztonsági okok miatt kérlek, írd be a jelenlegi fiók jelszavát
         current_username: A jóváhagyáshoz írd be a jelenlegi fiók felhasználói nevét
         digest: Csak hosszú távollét esetén küldődik és csak ha személyes üzenetet kaptál távollétedben
         email: Kapsz egy megerősítő e-mailt
-        header: PNG, GIF vagy JPG. Maximum %{size}. Átméretezzük %{dimensions} pixelre
+        header: WEBP, PNG, GIF vagy JPG. Legfeljebb %{size}. Át lesz méretezve %{dimensions} képpontosra.
         inbox_url: Másold ki a használandó relé szerver kezdőoldalának URL-jét
         irreversible: A kiszűrt bejegyzések visszafordíthatatlanul eltűnnek, a szűrő későbbi törlése esetén is
         locale: A felhasználói felület, e-mailek, push üzenetek nyelve
diff --git a/config/locales/simple_form.hy.yml b/config/locales/simple_form.hy.yml
index 9dbcd1301e590e..0525f2d6fc47c6 100644
--- a/config/locales/simple_form.hy.yml
+++ b/config/locales/simple_form.hy.yml
@@ -23,14 +23,12 @@ hy:
         text: Կարող ես օգտագործել գրառման առանձնայատկութիւնը։ Խնդրում ենք, լինել խելամիտ յայտարարութեան տարածքն օգտագործելիս, այն յայտնուելու է օգտատիրոջ էկրանին
       defaults:
         autofollow: Հրաւէրի միջոցով գրանցուող մարդիկ կը հետեւեն քեզ
-        avatar: PNG, GIF կամ JPG։ Առաւելագոյնը՝ %{size}։ Կը փոքրացուի մինչեւ %{dimensions}
         bot: Այս հաշիւը հիմնականում կատարում է աւտօմատացուած գործողութւնները եւ գուցէ չի վերայսկուում
         context: Մէկ կամ մի քանի կոնտեքստներ, որտեղ պէտք է կիրառուի զտիչ
         current_password: Անվտանգութեան նկատառումներից ելնելով, խնդրում ենք մուտքագրել տուել հաշուի ծածկագիրը
         current_username: Հաստատելու համար խնդրում ենք մուտքագրել տուել հաշուի օգտանունը
         digest: Ուղարկուում է պասիւութեան երկար շրջանից յետոյ եւ միայն այն դէպքում, երբ բացակայութեանդ ժամանակ որեւէ անձնական հաղորդագրութիւն ես ստացել
         email: Քեզ ուղարկուել է հաստատման իմակ
-        header: PNG, GIF կամ JPG։ Առաւելագոյնը՝ %{size}։ Կը փոքրացուի մինչեւ %{dimensions}
         inbox_url: Պատճէնիր URL այն շերտի դիմերեսից, որը ցանկանում ես օգտագործել
         irreversible: Զտուած գրառումները կորչելու են անդառնալիօրէն, նոյնիսկ եթէ զտիչը յետոյ հեռացնես
         locale: Ինտերֆեյսի լեզուն, էլ. նամակները եւ push ծանուցումները
diff --git a/config/locales/simple_form.id.yml b/config/locales/simple_form.id.yml
index 51046ce9d46212..8b9e74406a7a2f 100644
--- a/config/locales/simple_form.id.yml
+++ b/config/locales/simple_form.id.yml
@@ -29,14 +29,12 @@ id:
         text: Anda hanya dapat mengajukan banding peringatan sekali
       defaults:
         autofollow: Orang yang ingin mendaftar lewat undangan, otomatis mengikuti Anda
-        avatar: PNG, GIF atau JPG. Maksimal %{size}. Ukuran dikecilkan menjadi %{dimensions}px
         bot: Akun ini melakukan aksi otomatis dan mungkin tak termonitor
         context: Satu atau lebih konteks tempat saringan perlu diterapkan
         current_password: Untuk tujuan keamanan mohon masukkan kata sandi akun ini
         current_username: Untuk konfirmasi, mohon masukkan nama pengguna akun ini
         digest: Hanya kirim setelah lama tidak aktif dan hanya jika Anda menerima pesan personal atas absensi Anda
         email: Anda akan dikirimi email konfirmasi
-        header: PNG, GIF atau JPG. Maksimal %{size}. Ukuran dikecilkan menjadi %{dimensions}px
         inbox_url: Salin URL dari halaman depan relai yang ingin Anda pakai
         irreversible: Toot tersaring akan hilang permanen bahkan jika saringan dihapus kemudian
         locale: Bahasa antar muka pengguna, email, dan notifikasi dorong
diff --git a/config/locales/simple_form.ie.yml b/config/locales/simple_form.ie.yml
index dfd08364128395..3cf5c33f2c2121 100644
--- a/config/locales/simple_form.ie.yml
+++ b/config/locales/simple_form.ie.yml
@@ -39,14 +39,14 @@ ie:
         text: Tu posse apellar un admoniment solmen un vez
       defaults:
         autofollow: Persones qui adherer per li invitation va sequer te automaticmen
-        avatar: PNG, GIF o JPEG. Admaxim %{size}. Li grandore va esser contraet a %{dimensions}px
+        avatar: WEBP, PNG, GIF o JPG, con un maximum de %{size}. Va esser diminuet a %{dimensions}px
         bot: Dir a altres que li conto primarimen far automatic actiones e que fórsan null homan vigila it
         context: Un o multiplic contextus u li filtre deve aplicar
         current_password: Por securital rasones, ples introducter li passa-parol del actual conto
         current_username: Por confirmar, ples inmetter li usator-nómine del actual conto
         digest: Misset solmen pos un long periode de ínactivitá e solmen si tu ha recivet quelcunc missages personal in tui inbuxe
         email: On va misser te un email de confirmation
-        header: PNG, GIF o JPEG. Admaxim %{size}. Li grandore va esser contraet a %{dimensions}px
+        header: WEBP, PNG, GIF o JPG, con un maximum de %{size}. Va esser diminuet a %{dimensions}px
         inbox_url: Copiar li URL del initial págine del relé quel tu vole usar
         irreversible: Filtrat postas va desaparir ínreversibilmen, mem si li filtre es removet plu tard
         locale: Li lingue del usator-interfacie, emails e notificationes push
diff --git a/config/locales/simple_form.io.yml b/config/locales/simple_form.io.yml
index eef2014d19cff5..57a2aeb64d4f51 100644
--- a/config/locales/simple_form.io.yml
+++ b/config/locales/simple_form.io.yml
@@ -39,14 +39,12 @@ io:
         text: Vu povas nur apelar striko unafoye
       defaults:
         autofollow: Personi quo registresesas tra invito automatika sequos vu
-        avatar: En la formato PNG, GIF o JPG. Til %{size}. Esos mikrigita a %{dimensions}px
         bot: Signalez a altra personi ke la konto precipue havas automatikigita agi e forsan ne surveyesas
         context: Situeso kande filtrilo debas aplikesar
         current_password: Por sekuresorezoni, pozez pasvorto di ca konto
         current_username: Por konfirmar, pozez uzantonomo di ca konto
         digest: Nur sendesas pos longa neaktiveso e nur se vu ganis irga mesaji dum ke vu esas neprezenta
         email: Vu sendesos konfirmretposto
-        header: En la formato PNG, GIF o JPG. Til %{size}. Esos mikrigita a %{dimensions}px
         inbox_url: Kopiez URL de frontpagino de relayo quon vu volas uzar
         irreversible: Filtrita posti neinversigeble desaparos, mem se filtro efacesas pose
         locale: Linguo di uzantointervizajo, retposti e pulsavizi
diff --git a/config/locales/simple_form.is.yml b/config/locales/simple_form.is.yml
index 87190693f65472..0e9c50eff6fa73 100644
--- a/config/locales/simple_form.is.yml
+++ b/config/locales/simple_form.is.yml
@@ -39,14 +39,12 @@ is:
         text: Þú getur aðeins áfrýjað refsingu einu sinni
       defaults:
         autofollow: Fólk sem skráir sig í gegnum boðið mun sjálfkrafa fylgjast með þér
-        avatar: PNG, GIF eða JPG. Mest %{size}. Verður smækkað í %{dimensions}px
         bot: Þessi aðgangur er aðallega til að framkvæma sjálfvirkar aðgerðir og gæti verið án þess að hann sé vaktaður reglulega
         context: Eitt eða fleiri samhengi þar sem sían ætti að gilda
         current_password: Í öryggisskyni skaltu setja inn lykilorðið fyrir þennan notandaaðgang
         current_username: Til að staðfesta skaltu setja inn notandanafnið fyrir þennan notandaaðgang
         digest: Er aðeins sent eftir lengri tímabil án virkni og þá aðeins ef þú hefur fengið persónuleg skilaboð á meðan þú hefur ekki verið á línunni
         email: Þú munt fá sendan staðfestingarpóst
-        header: PNG, GIF eða JPG. Mest %{size}. Verður smækkað í %{dimensions}px
         inbox_url: Afritaðu slóðina af forsíðu endurvarpans sem þú vilt nota
         irreversible: Síaðar færslur munu hverfa óendurkræft, jafnvel þó sían sé seinna fjarlægð
         locale: Tungumál notandaviðmótsins, tölvupósts og ýti-tilkynninga
diff --git a/config/locales/simple_form.it.yml b/config/locales/simple_form.it.yml
index 731379835aa8bc..244cf7c44ad849 100644
--- a/config/locales/simple_form.it.yml
+++ b/config/locales/simple_form.it.yml
@@ -39,14 +39,14 @@ it:
         text: Puoi appellarti solo una volta
       defaults:
         autofollow: Le persone che si iscrivono attraverso l'invito ti seguiranno automaticamente
-        avatar: PNG, GIF o JPG. Al massimo %{size}. Verranno scalate a %{dimensions}px
+        avatar: WEBP, PNG, GIF o JPG. Al massimo %{size}. Verranno scalate a %{dimensions}px
         bot: Questo account esegue principalmente operazioni automatiche e potrebbe non essere tenuto sotto controllo da una persona
         context: Uno o più contesti nei quali il filtro dovrebbe essere applicato
         current_password: Per motivi di sicurezza inserisci la password dell'account attuale
         current_username: Per confermare, inserisci il nome utente dell'account attuale
         digest: Inviata solo dopo un lungo periodo di inattività e solo se hai ricevuto qualche messaggio personale in tua assenza
         email: Ti manderemo una email di conferma
-        header: PNG, GIF o JPG. Al massimo %{size}. Verranno scalate a %{dimensions}px
+        header: WEBP, PNG, GIF o JPG. Al massimo %{size}. Verranno scalate a %{dimensions}px
         inbox_url: Copia la URL dalla pagina iniziale del ripetitore che vuoi usare
         irreversible: I post filtrati scompariranno in modo irreversibile, anche se il filtro viene eliminato
         locale: La lingua dell'interfaccia utente, di email e notifiche push
diff --git a/config/locales/simple_form.ja.yml b/config/locales/simple_form.ja.yml
index e9fb3da9fa164b..eae1ea21793e0e 100644
--- a/config/locales/simple_form.ja.yml
+++ b/config/locales/simple_form.ja.yml
@@ -39,14 +39,12 @@ ja:
         text: 一度だけ異議を申し立てることができます
       defaults:
         autofollow: 招待から登録した人が自動的にあなたをフォローするようになります
-        avatar: "%{size}までのPNG、GIF、JPGが利用可能です。%{dimensions}pxまで縮小されます"
         bot: このアカウントは主に自動で動作し、人が見ていない可能性があります
         context: フィルターを適用する対象 (複数選択可)
         current_password: 現在のアカウントのパスワードを入力してください
         current_username: 確認のため、現在のアカウントのユーザー名を入力してください
         digest: 長期間使用していない場合と不在時に返信を受けた場合のみ送信されます
         email: 確認のメールが送信されます
-        header: "%{size}までのPNG、GIF、JPGが利用可能です。 %{dimensions}pxまで縮小されます"
         inbox_url: 使用したいリレーサーバーのトップページからURLをコピーします
         irreversible: フィルターが後で削除されても、除外された投稿は元に戻せなくなります
         locale: ユーザーインターフェース、メールやプッシュ通知の言語
diff --git a/config/locales/simple_form.ka.yml b/config/locales/simple_form.ka.yml
index e5d874c5a563d2..48f028c575da39 100644
--- a/config/locales/simple_form.ka.yml
+++ b/config/locales/simple_form.ka.yml
@@ -4,11 +4,9 @@ ka:
     hints:
       defaults:
         autofollow: ადამიანები რომლებიც დარეგისტრირდებიან მოწვევით, ავტომატურად გამოგყვებიან
-        avatar: პნგ, გიფ ან ჯპგ. მაქს. %{size}. ზომა დაპატარავდება %{dimensions}პიქს.-ზე
         bot: ეს ანგარიში უმთავრესად ასრულებს ავტომატურ მოქმედებებს და შესაძლოა არ იყოს მონიტორინგის ქვეშ
         context: ერთ ან მრავალი კონტექსტი სადაც ფილტრი უნდა შესრულდეს
         digest: იგზავნება მხოლოდ ხანგრძლივი უაქტივობის პერიოდის შემდეგ და არყოფნისას თუ მიიღეთ ერთი წერილი მაინც
-        header: პნგ, გიფ ან ჯპგ. მაქს. %{size}. ზომა დაპატარავდება %{dimensions}პიქს.-ზე
         inbox_url: ურლ დააკოირეთ გამოყენებისთვის სასურველი რილეის წინა გვერდიდან
         irreversible: გაფილტრული ტუტები გაუქმდება აღუდგენლად, იმ შემთხვევაშიც კი თუ ფილტრი სამომავლოდ გაუქმდება
         locale: მომხმარებლის ინტერფეისის, ელ-ფოსტის წერილების და ფუშ შეტყობინებების ენა
diff --git a/config/locales/simple_form.ko.yml b/config/locales/simple_form.ko.yml
index 4da58e6c64507f..1dee6f14317d76 100644
--- a/config/locales/simple_form.ko.yml
+++ b/config/locales/simple_form.ko.yml
@@ -39,14 +39,14 @@ ko:
         text: 처벌에 대해 단 한 번만 이의제기를 할 수 있습니다
       defaults:
         autofollow: 이 초대로 가입한 사람은 나를 팔로우하게 됩니다.
-        avatar: PNG, GIF 혹은 JPG. 최대 %{size}. %{dimensions}px로 축소 됨
+        avatar: WEBP, PNG, GIF 혹은 JPG. 최대 %{size}. %{dimensions}px로 축소됨
         bot: 이 계정이 대부분 자동으로 작업을 수행하고 잘 확인하지 않는다는 것을 알립니다.
         context: 필터를 적용 할 한 개 이상의 컨텍스트
         current_password: 보안을 위해 현재 계정의 암호를 입력해주세요
         current_username: 확인을 위해, 현재 계정의 사용자명을 입력해주세요
         digest: 오랫동안 활동하지 않았을 때 받은 멘션들에 대한 요약 받기
         email: 확인용 이메일을 보냈습니다.
-        header: PNG, GIF 혹은 JPG. 최대 %{size}. %{dimensions}px로 축소 됨
+        header: WEBP, PNG, GIF 혹은 JPG. 최대 %{size}. %{dimensions}px로 축소됨
         inbox_url: 사용 할 릴레이 서버의 프론트페이지에서 URL을 복사합니다
         irreversible: 필터링 된 게시물은 나중에 필터가 사라지더라도 돌아오지 않게 됩니다
         locale: 사용자 인터페이스, 이메일, 푸시 알림 언어
diff --git a/config/locales/simple_form.ku.yml b/config/locales/simple_form.ku.yml
index fb7a45c34b31a3..aa8501bf2477c6 100644
--- a/config/locales/simple_form.ku.yml
+++ b/config/locales/simple_form.ku.yml
@@ -29,14 +29,12 @@ ku:
         text: Tu dikarî tenê carekê îtîraza binpêkirinê bikî
       defaults:
         autofollow: Mirovên ku bi riya vexwendinê xwe tomar kirine ew ên bi xweberî te bişopînin
-        avatar: PNG, GIF an jî JPG. Herî zêde %{size} dê ber bi %{dimensions}px ve were kêmkirin
         bot: Ji yên din re nîşan bike ku ajimêr bi piranî kiryarên xweberî dike û dibe ku neyê çavdêrî kirin
         context: Yek an jî zêdetir girêdan divê parzûn were sepandin
         current_password: Ji bo ewlehiyê ji kerema xwe borînpeyva ajimêrê xwe têxe
         current_username: Ji bo piştrastkirinê, ji kerema xwe navê bikarhêner ya ajimêrê niha binvîse
         digest: Tenê piştî demek dirêj neçalakiyê de û tenê di nebûna te da peyamên teybetî standî be tê şandin
         email: Ji te re e-name ya pejirandinê were
-        header: PNG, GIF an jî JPG. Herî zêde %{size} ber bi %{dimensions}px ve were kêmkirin
         inbox_url: Girêdanê ji rûpela pêşîn a guhêrkera ku tu dixwazî bi kar bînî jê bigire
         irreversible: Şandiyên parzûnkirî êdî bê veger wenda bibe, heger parzûn paşê were rakirin jî nabe
         locale: Zimanê navrûyê bikarhêner, agahdarîyên e-name û pêl kirin
diff --git a/config/locales/simple_form.lad.yml b/config/locales/simple_form.lad.yml
index afa26b7873d6ae..f9ee9a4b9a1fa8 100644
--- a/config/locales/simple_form.lad.yml
+++ b/config/locales/simple_form.lad.yml
@@ -39,14 +39,14 @@ lad:
         text: Solo puedes apelar un amonestamiento una vez
       defaults:
         autofollow: Los utilizadores ke se enrejistren por la envitasyon te segiran otomatikamente
-        avatar: PNG, GIF o JPG. Maksimo %{size}. Sera eskalado a %{dimensions}px
+        avatar: WEBP, PNG, GIF o JPG. Maksimo %{size}. Sera eskalado a %{dimensions}px
         bot: Indika ke este kuento egzekuta prinsipalmente aksyones otomatizadas i podria no ser monitorizada
         context: Uno o multiples kontekstos en los ke deve aplikarse el filtro
         current_password: Por razones de sigurita por favor ingresa el kod del kuento aktual
         current_username: Para konfirmar, por favor ingresa el nombre de utilizador del kuento aktual
         digest: Solo embiado dempues de un eluengo periodo de inaktivita i solo si tienes recibido mesajes personales durante tu ausensya
         email: Se te embiara konfirmasyon por posta elektronika
-        header: PNG, GIF o JPG. Maksimo %{size}. Sera eskalado a %{dimensions}px
+        header: WEBP, PNG, GIF o JPG. Maksimo %{size}. Sera eskalado a %{dimensions}px
         inbox_url: Kopia el URL de la pajina prinsipala del relevo ke keres utilizar
         irreversible: Las publikasyones filtradas dezapareseran irreversivlemente, inkluzo si este filtro es supremido mas adelante
         locale: La lingua de la enterfaz de utilizador, posta i avizos arrepushados
diff --git a/config/locales/simple_form.lt.yml b/config/locales/simple_form.lt.yml
index 6eb90340dc7c64..53b8d672deb133 100644
--- a/config/locales/simple_form.lt.yml
+++ b/config/locales/simple_form.lt.yml
@@ -39,14 +39,14 @@ lt:
         text: Gali pateikti apeliaciją dėl streiko tik vieną kartą
       defaults:
         autofollow: Žmonės, kurie užsiregistruos per kvietimą, automatiškai seks tave
-        avatar: PNG, GIF arba JPG. Ne daugiau kaip %{size}. Bus sumažintas iki %{dimensions} tšk.
+        avatar: WEBP, PNG, GIF arba JPG. Ne daugiau kaip %{size}. Bus sumažintas iki %{dimensions} tšk.
         bot: Signalizuoti kitiems, kad paskyroje daugiausia atliekami automatiniai veiksmai ir kad ji gali būti nestebima
         context: Vienas arba keli kontekstai, kuriems turėtų būti taikomas filtras
         current_password: Saugumo sumetimais įvesk dabartinės paskyros slaptažodį
         current_username: Kad patvirtintum, įvesk dabartinės paskyros naudotojo vardą
         digest: Siunčiama tik po ilgo neaktyvumo laikotarpio ir tik tuo atveju, jei negavai jokių asmeninių žinučių
         email: Tau bus išsiųstas patvirtinimo el. laiškas
-        header: PNG, GIF arba JPG. Ne daugiau kaip %{size}. Bus sumažintas iki %{dimensions} tšk.
+        header: WEBP, PNG, GIF arba JPG. Ne daugiau kaip %{size}. Bus sumažintas iki %{dimensions} tšk.
         inbox_url: Nukopijuok URL adresą iš pradinio puslapio perdavėjo, kurį nori naudoti
         irreversible: Filtruoti įrašai išnyks negrįžtamai, net jei vėliau filtras bus pašalintas
         locale: Naudotojo sąsajos kalba, el. laiškai ir stumiamieji pranešimai
diff --git a/config/locales/simple_form.lv.yml b/config/locales/simple_form.lv.yml
index bf831c946f5adb..5d23a7010069f3 100644
--- a/config/locales/simple_form.lv.yml
+++ b/config/locales/simple_form.lv.yml
@@ -39,14 +39,12 @@ lv:
         text: Brīdinājumu var pārsūdzēt tikai vienu reizi
       defaults:
         autofollow: Cilvēki, kuri reģistrējas, izmantojot uzaicinājumu, automātiski sekos tev
-        avatar: PNG, GIF vai JPG. Ne vairāk kā %{size}. Tiks samazināts līdz %{dimensions} px
         bot: Paziņo citiem, ka kontā galvenokārt tiek veiktas automatizētas darbības un tas var netikt uzraudzīts
         context: Viens vai vairāki konteksti, kur jāpiemēro filtrs
         current_password: Drošības nolūkos, lūdzu, ievadi pašreizējā konta paroli
         current_username: Lai apstiprinātu, lūdzu, ievadi pašreizējā konta paroli
         digest: Sūta tikai pēc ilgstošas neaktivitātes un tikai tad, ja savas prombūtnes laikā neesi saņēmis personiskas ziņas
         email: Tev tiks nosūtīts apstiprinājuma e-pasts
-        header: PNG, GIF vai JPG. Ne vairāk kā %{size}. Tiks samazināts līdz %{dimensions}px
         inbox_url: Nokopē URL no tā releja sākumlapas, kuru vēlies izmantot
         irreversible: Filtrētās ziņas neatgriezeniski pazudīs, pat ja filtrs vēlāk tiks noņemts
         locale: Lietotāja saskarnes, e-pasta ziņojumu un push paziņojumu valoda
diff --git a/config/locales/simple_form.ms.yml b/config/locales/simple_form.ms.yml
index 79929cec5dfa07..9e9931cc3e0547 100644
--- a/config/locales/simple_form.ms.yml
+++ b/config/locales/simple_form.ms.yml
@@ -39,14 +39,12 @@ ms:
         text: Anda boleh membuat rayuan terhadap pelanggaran sekali sahaja
       defaults:
         autofollow: Orang yang mendaftar melalui undangan akan mengikuti anda secara automatik
-        avatar: PNG, GIF atau JPG. Kebanyakannya %{size}. Saiz akan dikecilkan kepada %{dimensions}px
         bot: Memberi isyarat kepada orang lain bahawa akaun itu kebanyakannya melakukan tindakan automatik dan mungkin tidak dipantau
         context: Satu atau berbilang konteks di mana penapis harus digunakan
         current_password: Untuk tujuan keselamatan sila masukkan kata laluan akaun semasa
         current_username: Untuk mengesahkan, sila masukkan nama pengguna akaun semasa
         digest: Hanya dihantar selepas tempoh yang lama tidak aktif dan hanya jika anda telah menerima sebarang mesej peribadi semasa ketiadaan anda
         email: Anda akan dihantar e-mel pengesahan
-        header: PNG, GIF atau JPG. Paling banyak %{size}. Akan diturunkan skala kepada %{dimensions}px
         inbox_url: Salin URL dari muka depan geganti yang anda mahu gunakan
         irreversible: Siaran yang ditapis akan hilang secara tidak dapat dipulihkan, walaupun penapis dialih keluar kemudian
         locale: Bahasa untuk antara muka pengguna, e-mel dan pemberitahuan segera
diff --git a/config/locales/simple_form.my.yml b/config/locales/simple_form.my.yml
index 80b234c17c9e85..4f8a39782a5ae2 100644
--- a/config/locales/simple_form.my.yml
+++ b/config/locales/simple_form.my.yml
@@ -39,14 +39,12 @@ my:
         text: လုပ်ဆောင်ချက်တစ်ကြိမ်သာ အသုံးပြုနိုင်သည်
       defaults:
         autofollow: ဖိတ်ကြားချက်မှတစ်ဆင့် အကောင့်ဖွင့်သူများမှာ သင့်ကို အလိုအလျောက်စောင့်ကြည့်မည်ဖြစ်ပါသည်
-        avatar: PNG၊ GIF သို့မဟုတ် JPG။ အများဆုံး %{size}။ %{dimensions}px သို့ လျှော့ချပါမည်။
         bot: အကောင့်သည် အဓိကအားဖြင့် အလိုအလျောက် လုပ်ဆောင်ချက်များ ဆောင်ရွက်နိုင်ပြီး စောင့်ကြည့်ခြင်းမပြုနိုင်ကြောင်း အခြားသူများအား အသိပေးပါ
         context: စစ်ထုတ်သင့်သည့် အကြောင်းအရာ တစ်ခု သို့မဟုတ် များစွာ
         current_password: လုံခြုံရေးအတွက် ကျေးဇူးပြုပြီး လက်ရှိအကောင့်၏ စကားဝှက်ကို ထည့်ပါ
         current_username: အတည်ပြုရန်အတွက် လက်ရှိအကောင့်၏ အသုံးပြုသူအမည်ကို ရိုက်ထည့်ပါ
         digest: အချိန်အတော်ကြာ အသုံးမပြုသည့်သည့်နောက်တွင်သာ ပေးပို့ပြီး အသုံးမပြုသည့်ကာလအတွင်း ကိုယ်ရေးကိုယ်တာစာများသာ လက်ခံရန်
         email: သင့်ထံ အတည်ပြုချက်အီးမေးလ်တစ်စောင် ပေးပို့ပါမည်
-        header: PNG၊ GIF သို့မဟုတ် JPG။ အများဆုံး %{size}။ %{dimensions}px သို့ လျှော့ချပါမည်
         inbox_url: သင်အသုံးပြုလိုသော relay ၏ ရှေ့စာမျက်နှာမှ URL ကို ကူးယူပါ
         irreversible: စစ်ထုတ်ခြင်းကိုဖယ်ရှားလိုက်ပါက စစ်ထုတ်ထားသော ပို့စ်များမှာ ပျောက်ကွယ်သွားပါမည်
         locale: အသုံးပြုသူမှ လက်ရှိသုံးနေသည့်ဘာသာစကား၊ အီးမေးလ်များနှင့် ရရှိစေရန်ပေးပို့သည့် အသိပေးချက်များ
diff --git a/config/locales/simple_form.nl.yml b/config/locales/simple_form.nl.yml
index f7e917ac3cd733..18a469b55eb82c 100644
--- a/config/locales/simple_form.nl.yml
+++ b/config/locales/simple_form.nl.yml
@@ -39,14 +39,14 @@ nl:
         text: Je kunt maar eenmalig bezwaar indienen tegen een vastgestelde overtreding
       defaults:
         autofollow: Mensen die zich via de uitnodiging hebben geregistreerd, volgen jou automatisch
-        avatar: PNG, GIF of JPG. Maximaal %{size}. Wordt teruggeschaald naar %{dimensions}px
+        avatar: WEBP, PNG, GIF of JPG. Hoogstens %{size}. Wordt verkleind naar %{dimensions}px
         bot: Signaal aan anderen dat het account voornamelijk geautomatiseerde acties uitvoert en mogelijk niet wordt gecontroleerd
         context: Een of meerdere locaties waar de filter actief moet zijn
         current_password: Voer voor veiligheidsredenen het wachtwoord van je huidige account in
         current_username: Voer ter bevestiging de gebruikersnaam van je huidige account in
         digest: Wordt alleen na een lange periode van inactiviteit verzonden en alleen wanneer je tijdens jouw afwezigheid persoonlijke berichten hebt ontvangen
         email: Je krijgt een bevestigingsmail
-        header: PNG, GIF of JPG. Maximaal %{size}. Wordt teruggeschaald naar %{dimensions}px
+        header: WEBP, PNG, GIF of JPG. Hoogstens %{size}. Wordt verkleind naar %{dimensions}px
         inbox_url: Kopieer de URL van de voorpagina van de relayserver die je wil gebruiken
         irreversible: Gefilterde berichten verdwijnen onomkeerbaar, zelfs als de filter later wordt verwijderd
         locale: De taal van de gebruikersomgeving, e-mails en pushmeldingen
diff --git a/config/locales/simple_form.nn.yml b/config/locales/simple_form.nn.yml
index 266ef1fcce6a1b..1991cb2dbb941f 100644
--- a/config/locales/simple_form.nn.yml
+++ b/config/locales/simple_form.nn.yml
@@ -39,14 +39,12 @@ nn:
         text: Ei åtvaring kan kun ankast ein gong
       defaults:
         autofollow: Folk som lagar ein konto gjennom innbydinga fylgjer deg automatisk
-        avatar: PNG, GIF eller JPG. Maksimalt %{size}. Minkast til %{dimensions}px
         bot: Denne kontoen utfører i hovedsak automatiserte handlinger og blir kanskje ikke holdt øye med
         context: En eller flere sammenhenger der filteret skal gjelde
         current_password: For sikkerhetsgrunner, vennligst oppgi passordet til den nåværende bruker
         current_username: Skriv inn brukarnamnet til den noverande kontoen for å stadfesta
         digest: Kun sendt etter en lang periode med inaktivitet og bare dersom du har mottatt noen personlige meldinger mens du var borte
         email: Du får snart ein stadfestings-e-post
-        header: PNG, GIF eller JPG. Maksimalt %{size}. Minkast til %{dimensions}px
         inbox_url: Kopier URLen fra forsiden til overgangen du vil bruke
         irreversible: Filtrerte tut vil verta borte for evig, sjølv om filteret vert fjerna seinare
         locale: Språket til brukargrensesnittet, e-postar og push-varsel
diff --git a/config/locales/simple_form.no.yml b/config/locales/simple_form.no.yml
index 7651792212c764..6c47a9deee2978 100644
--- a/config/locales/simple_form.no.yml
+++ b/config/locales/simple_form.no.yml
@@ -39,14 +39,12 @@
         text: Du kan kun anke en advarsel en gang
       defaults:
         autofollow: Folk som lager en konto gjennom invitasjonen, vil automatisk følge deg
-        avatar: PNG, GIF eller JPG. Maksimalt %{size}. Vil bli nedskalert til %{dimensions}px
         bot: Denne kontoen utfører i hovedsak automatiserte handlinger og blir kanskje ikke holdt øye med
         context: En eller flere sammenhenger der filteret skal gjelde
         current_password: For sikkerhetsgrunner, vennligst oppgi passordet til den nåværende bruker
         current_username: For å bekrefte, vennligst skriv inn brukernavnet til den nåværende kontoen
         digest: Kun sendt etter en lang periode med inaktivitet og bare dersom du har mottatt noen personlige meldinger mens du var borte
         email: Du vil bli tilsendt en bekreftelses-E-post
-        header: PNG, GIF eller JPG. Maksimalt %{size}. Vil bli nedskalert til %{dimensions}px
         inbox_url: Kopier URLen fra forsiden til overgangen du vil bruke
         irreversible: Filtrerte innlegg vil ugjenkallelig forsvinne, selv om filteret senere blir fjernet
         locale: Språket til brukergrensesnittet, e-mailer og push-varsler
diff --git a/config/locales/simple_form.oc.yml b/config/locales/simple_form.oc.yml
index 7159eed3227a30..ba9c260e472e01 100644
--- a/config/locales/simple_form.oc.yml
+++ b/config/locales/simple_form.oc.yml
@@ -25,14 +25,12 @@ oc:
         text: Podètz utilizar la sintaxi dels tuts. Gardatz al cap qu’aquesta anóncia ocuparà la fenèstra de l’utilizaire
       defaults:
         autofollow: Lo mond que se marcan gràcia a l’invitacion vos segràn automaticament
-        avatar: PNG, GIF o JPG. Maximum %{size}. Serà retalhat en %{dimensions}px
         bot: Avisar lo mond qu’aqueste compte es pas d’una persona
         context: Un o mai de contèxtes ont lo filtre deuriá s’aplicar
         current_password: Per de rasons de seguretat volgatz picar lo senhal del compte actual
         current_username: Per confirmar, volgatz picar lo nom d’utilizaire del compte actual
         digest: Solament enviat aprèp un long moment d’inactivitat e solament s’avètz recebut de messatges personals pendent vòstra abséncia
         email: Vos mandarem un corrièl de confirmacion
-        header: PNG, GIF o JPG. Maximum %{size}. Serà retalhada en %{dimensions}px
         inbox_url: Copiatz l’URL de la pagina màger del relai que volètz utilizar
         irreversible: Los tuts filtrats desapareisseràn irreversiblament, encara que lo filtre siá suprimit mai tard
         locale: La lenga de l’interfàcia d’utilizacion, los messatges e las notificacions
diff --git a/config/locales/simple_form.pl.yml b/config/locales/simple_form.pl.yml
index a55a93556f9e3f..4a8208202fa691 100644
--- a/config/locales/simple_form.pl.yml
+++ b/config/locales/simple_form.pl.yml
@@ -39,14 +39,14 @@ pl:
         text: Możesz wysłać odwołanie do ostrzeżenia tylko raz
       defaults:
         autofollow: Osoby, które zarejestrują się z Twojego zaproszenia automatycznie zaczną Cię obserwować
-        avatar: PNG, GIF lub JPG. Maksymalnie %{size}. Zostanie zmniejszony do %{dimensions}px
+        avatar: WEBP, PNG, GIF lub JPG. Maksymalnie %{size}. Zostanie zmniejszony do %{dimensions}px
         bot: To konto wykonuje głównie zautomatyzowane działania i może nie być monitorowane
         context: Jedno lub wiele miejsc, w których filtr zostanie zastosowany
         current_password: Ze względów bezpieczeństwa wprowadź hasło obecnego konta
         current_username: Aby potwierdzić, wprowadź nazwę użytkownika obecnego konta
         digest: Wysyłane tylko po długiej nieaktywności, jeżeli w tym czasie otrzymaleś jakąś wiadomość bezpośrednią
         email: Otrzymasz e-mail potwierdzający
-        header: PNG, GIF lub JPG. Maksymalnie %{size}. Zostanie zmniejszony do %{dimensions}px
+        header: WEBP, PNG, GIF lub JPG. Maksymalnie %{size}. Zostanie zmniejszony do %{dimensions}px
         inbox_url: Skopiuj adres ze strony głównej przekaźnika, którego chcesz użyć
         irreversible: Filtrowane wpisy znikną bezpowrotnie, nawet gdy filtr zostanie usunięty
         locale: Język interfejsu, wiadomości e-mail i powiadomieniach push
diff --git a/config/locales/simple_form.pt-BR.yml b/config/locales/simple_form.pt-BR.yml
index 1c303c0daed80c..3a4e99a0d12793 100644
--- a/config/locales/simple_form.pt-BR.yml
+++ b/config/locales/simple_form.pt-BR.yml
@@ -39,14 +39,12 @@ pt-BR:
         text: Você só pode solicitar uma revisão uma vez
       defaults:
         autofollow: Pessoas que criarem conta através de seu convite te seguirão automaticamente
-        avatar: PNG, GIF or JPG. Arquivos de até %{size}. Serão redimensionados para %{dimensions}px
         bot: Essa conta executa principalmente ações automatizadas e pode não ser monitorada
         context: Um ou mais contextos onde o filtro deve atuar
         current_password: Para fins de segurança, digite a senha da conta atual
         current_username: Para confirmar, digite o nome de usuário da conta atual
         digest: Enviado apenas após um longo período de inatividade com um resumo das menções recebidas durante ausência
         email: Você receberá um e-mail de confirmação
-        header: PNG, GIF ou JPG de até %{size}. Serão redimensionados para %{dimensions}px
         inbox_url: Copie o link da página inicial do repetidor que você deseja usar
         irreversible: As publicações filtradas desaparecerão irreversivelmente, mesmo se o filtro for removido depois
         locale: O idioma da interface do usuário, e-mails e notificações
diff --git a/config/locales/simple_form.pt-PT.yml b/config/locales/simple_form.pt-PT.yml
index 691ecec3a06dfd..9c54e72140fa79 100644
--- a/config/locales/simple_form.pt-PT.yml
+++ b/config/locales/simple_form.pt-PT.yml
@@ -39,14 +39,14 @@ pt-PT:
         text: Só pode recorrer uma única vez de uma reprimenda
       defaults:
         autofollow: As pessoas que aderirem através do convite segui-lo-ão automaticamente
-        avatar: PNG, GIF ou JPG. Ficheiros no máximo de %{size}. Serão reduzidos para %{dimensions}px
+        avatar: WEBP, PNG, GIF ou JPG. No máximo %{size}. Será reduzido para %{dimensions}px
         bot: Esta conta executa essencialmente ações automatizadas e pode não ser monitorizada
         context: Um ou diversos contextos nos quais o filtro deve ser aplicado
         current_password: Para fins de segurança, queira inserir a palavra-passe da conta atual
         current_username: Para confirmar, queira inserir o nome de utilizador da conta atual
         digest: Enviado após um longo período de inatividade e apenas se foste mencionado na tua ausência
         email: Será enviado um e-mail de confirmação
-        header: PNG, GIF ou JPG. Ficheiros no máximo de %{size}. Serão reduzidos para %{dimensions}px
+        header: WEBP, PNG, GIF ou JPG. No máximo %{size}. Será reduzido para %{dimensions}px
         inbox_url: Copie o URL da página inicial do repetidor que quer usar
         irreversible: Publicações filtradas irão desaparecer irremediavelmente, mesmo que o filtro seja removido posteriormente
         locale: O idioma da interface de utilizador, e-mails e notificações push
diff --git a/config/locales/simple_form.ro.yml b/config/locales/simple_form.ro.yml
index cade572f38c0d6..559302270805f3 100644
--- a/config/locales/simple_form.ro.yml
+++ b/config/locales/simple_form.ro.yml
@@ -23,14 +23,12 @@ ro:
         text: Poți folosi sintaxa de postare. Te rugăm să fii atent la spațiul pe care anunțul îl va ocupa pe ecranul utilizatorului
       defaults:
         autofollow: Persoanele care se înregistrează datorită invitației tale te vor urmări automat
-        avatar: PNG, GIF sau JPG. Cel mult %{size}. Va fi redimensionată la %{dimensions}px
         bot: Acest cont performează în cea mai mare parte acțiuni automate și nu poate fi monitorizat
         context: Contextele în care filtrul trebuie aplicat
         current_password: În scopuri de securitate, vă rugăm să introduceţi parola contului curent
         current_username: Pentru a confirma, vă rugăm să introduceţi numele de utilizator al contului curent
         digest: Este trimis doar după o lungă perioadă de inactivitate și numai dacă primești mesaje personale în perioada de absență
         email: Vei primi un e-mail de confirmare
-        header: PNG, GIF sau JPG. Cel mult %{size}. Vor fi redimensionate la %{dimensions}px
         inbox_url: Copiază adresa URL de pe prima pagină a reului pe care vrei să îl utilizezi
         irreversible: Postările sortate vor dispărea ireversibil, chiar dacă filtrul este ulterior șters
         locale: Limba interfaței de utilizator, e-mailurile si notificările push
diff --git a/config/locales/simple_form.ru.yml b/config/locales/simple_form.ru.yml
index 2d82a66358cd99..192a2f96df1f6d 100644
--- a/config/locales/simple_form.ru.yml
+++ b/config/locales/simple_form.ru.yml
@@ -39,14 +39,12 @@ ru:
         text: Вы можете обжаловать замечание только один раз
       defaults:
         autofollow: Люди, пришедшие по этому приглашению, автоматически будут подписаны на вас.
-        avatar: Поддерживается PNG, GIF и JPG. Максимальный размер — %{size}. Будет уменьшен до %{dimensions}px.
         bot: Отметьте, если с этой учётной записи выполняются автоматизированные действия и она может не просматриваться владельцем.
         context: Один или несколько контекстов, к которым должны быть применены фильтры
         current_password: В целях безопасности введите пароль текущей учётной записи
         current_username: Для подтверждения, пожалуйста, введите имя пользователя текущей учётной записи
         digest: Если вы долго не заглядывали, отправим вам дайджест событий, которые происходили в период вашего отсутствия.
         email: Вам будет отправлено электронное письмо с подтверждением.
-        header: Поддерживается PNG, GIF и JPG. Максимальный размер — %{size}. Будет уменьшена до %{dimensions}px.
         inbox_url: Копировать URL с главной страницы ретранслятора, который вы хотите использовать
         irreversible: Отфильтрованные посты будут утеряны навсегда, даже если в будущем фильтр будет убран
         locale: Язык интерфейса, e-mail писем и push-уведомлений
diff --git a/config/locales/simple_form.sc.yml b/config/locales/simple_form.sc.yml
index 5f5d633079f064..792619e6c7b1a1 100644
--- a/config/locales/simple_form.sc.yml
+++ b/config/locales/simple_form.sc.yml
@@ -27,14 +27,12 @@ sc:
         text: Podes impreare sintassi in is tuts. Dae cara a su tretu chi s'annùntziu at a pigare in s'ischermu de s'utente
       defaults:
         autofollow: Is persones chi s'ant a registrare pro mèdiu de s'invitu t'ant a sighire in manera automàtica
-        avatar: PNG, GIF o JPG. Màssimu %{size}. Ant a èssere iscaladas a %{dimensions}px
         bot: Sinnala a àtere chi custu contu faghet pro su prus atziones automatizadas e diat pòdere no èssere monitoradu
         context: Unu o prus cuntestos in ue su filtru si diat dèpere aplicare
         current_password: Pro chistiones de seguresa inserta sa crae de intrada de su contu atuale
         current_username: Pro cunfirmare inserta su nòmine utente de su contu atuale
         digest: Imbiadu isceti a pustis de unu perìodu longu de inatividade, e isceti si as retzidu calicunu messàgiu personale cando non bi fias
         email: As a retzire unu messàgiu eletrònicu de cunfirma
-        header: PNG, GIF o JPG. Màssimu %{size}. Ant a èssere iscaladas a %{dimensions}px
         inbox_url: Còpia s'URL dae sa pàgina printzipale de su ripetidore chi boles impreare
         irreversible: Is tuts filtrados ant a isparèssere in manera irreversìbile, fintzas si prus a tardu s'at a bogare su filtru
         locale: S'idioma de s'interfache de s'utente, de is messàgios de posta eletrònica e de is notìficas push
diff --git a/config/locales/simple_form.sco.yml b/config/locales/simple_form.sco.yml
index 85fa66ddc94e8a..7eeaca375a8868 100644
--- a/config/locales/simple_form.sco.yml
+++ b/config/locales/simple_form.sco.yml
@@ -29,14 +29,12 @@ sco:
         text: Ye kin ainly appeal a strike the wance
       defaults:
         autofollow: Fowk thit signs up throu the invite wull follae ye automatic
-        avatar: PNG, GIF or JPG. At maist %{size}. Wull get doonscaled tae %{dimensions}px
         bot: Signal tae ithers thit the accoont maistly performs automatit actions an mibbie wullnae be monitort
         context: Ae or mair contexts whaur the filter shuid apply
         current_password: Fir security purposes please pit in the passwird o the current accoont
         current_username: Fir tae confirm, please pit in the uisernemm o the current accoont
         digest: Ainly sent efter a lang whilie o inactivity an ainly if ye'v gotten onie personal messages whilst ye wis awa
         email: Ye'll be sent a confirmation email
-        header: PNG, GIF or JPG. At maist %{size}. Wull get doonscaled tae %{dimensions}px
         inbox_url: Copy the URL fae the frontpage o the relay thit ye'r wantin tae uise
         irreversible: Filtert posts wull dizappear irreversibly, even if filter is taen aff efter
         locale: The leid o the uiser interface, emails an push notes
diff --git a/config/locales/simple_form.si.yml b/config/locales/simple_form.si.yml
index ededa85bcce76f..eb41d263bc52be 100644
--- a/config/locales/simple_form.si.yml
+++ b/config/locales/simple_form.si.yml
@@ -27,14 +27,12 @@ si:
         text: ඔබට වර්ජනයකට අභියාචනා කළ හැක්කේ එක් වරක් පමණි
       defaults:
         autofollow: ආරාධනාව හරහා ලියාපදිංචි වන පුද්ගලයින් ස්වයංක්‍රීයව ඔබව අනුගමනය කරනු ඇත
-        avatar: PNG, GIF හෝ JPG. වැඩිම %{size}. %{dimensions}px දක්වා අඩු කරනු ඇත
         bot: ගිණුම ප්‍රධාන වශයෙන් ස්වයංක්‍රීය ක්‍රියා සිදු කරන බවත් නිරීක්ෂණය නොකළ හැකි බවත් අන් අයට සංඥා කරන්න
         context: පෙරහන යෙදිය යුතු සන්දර්භ එකක් හෝ කිහිපයක්
         current_password: ආරක්ෂක අරමුණු සඳහා කරුණාකර ජංගම ගිණුමේ මුරපදය ඇතුළත් කරන්න
         current_username: තහවුරු කිරීමට, කරුණාකර වත්මන් ගිණුමේ පරිශීලක නාමය ඇතුළත් කරන්න
         digest: දිගු කාලයක් අක්‍රියව සිටීමෙන් පසුව පමණක් යවන ලද අතර ඔබ නොමැති විට ඔබට කිසියම් පුද්ගලික පණිවිඩයක් ලැබී ඇත්නම් පමණි
         email: ඔබට තහවුරු කිරීමේ විද්‍යුත් තැපෑලක් එවනු ලැබේ
-        header: PNG, GIF හෝ JPG. වැඩිම %{size}. %{dimensions}px දක්වා අඩු කරනු ඇත
         inbox_url: ඔබට භාවිතා කිරීමට අවශ්‍ය රිලේ හි මුල් පිටුවෙන් URL එක පිටපත් කරන්න
         irreversible: පෙරහන පසුව ඉවත් කළ ද, පෙරූ ලිපි අප්‍රතිවර්ත්‍යව අතුරුදහන් වනු ඇත
         locale: වි-තැපැල්, තල්ලු දැනුම්දීම් සහ පරිශ්‍රීලක අතුරුමුහුණතේ භාෂාව
diff --git a/config/locales/simple_form.sk.yml b/config/locales/simple_form.sk.yml
index 614812a3a96177..71bd25d6dfe0c4 100644
--- a/config/locales/simple_form.sk.yml
+++ b/config/locales/simple_form.sk.yml
@@ -16,14 +16,14 @@ sk:
         warning_preset_id: Voliteľné. Stále môžeš vložiť vlastný text na samý koniec predlohy
       defaults:
         autofollow: Ľudia ktorí sa zaregistrujú prostredníctvom pozvánky, ťa budú inheď následovať
-        avatar: PNG, GIF alebo JPG. Maximálne %{size}. Bude zmenšený na %{dimensions}px
+        avatar: WEBP, PNG, GIF, alebo JPG. Najviac %{size}. Bude zmenšený na %{dimensions}px
         bot: Tento účet vykonáva hlavne automatizované akcie, a je pravdepodobne nespravovaný
         context: Jedno, alebo viac kritérií, v ktorých má byť filtrovanie uplatnené
         current_password: Z bezpečtnostných dôvodov prosím zadaj heslo súčasného účtu
         current_username: Pre potvrdenie prosím zadaj prezývku súčasného účtu
         digest: Odoslané iba v prípade dlhodobej neprítomnosti, a len ak si obdržal/a nejaké osobné správy kým si bol/a preč
         email: Bude ti odoslaný potvrdzujúci email
-        header: PNG, GIF, alebo JPG. Maximálne %{size}. Bude zmenšený na %{dimensions}px
+        header: WEBP, PNG, GIF, alebo JPG. Najviac %{size}. Bude zmenšený na %{dimensions}px
         inbox_url: Skopíruj adresu z hlavnej stránky mostíka, ktorý chceš používať
         irreversible: Vytriedené príspevky zmiznú nenávratne, aj keď triedenie neskôr zrušíš
         locale: Jazyk užívateľského rozhrania, emailových, a nástenkových oboznámení
diff --git a/config/locales/simple_form.sl.yml b/config/locales/simple_form.sl.yml
index ef345f78c39c16..1e56894384e98a 100644
--- a/config/locales/simple_form.sl.yml
+++ b/config/locales/simple_form.sl.yml
@@ -39,14 +39,14 @@ sl:
         text: Na ukrep se lahko pritožite le enkrat
       defaults:
         autofollow: Osebe, ki se prijavijo prek povabila, vas bodo samodejno sledile
-        avatar: PNG, GIF ali JPG. Največ %{size}. Zmanjšana bo na %{dimensions}px
+        avatar: WEBP, PNG, GIF ali JPG. Največ %{size}. Zmanjšana bo na %{dimensions} sl. točk
         bot: Ta račun v glavnem opravlja samodejna dejanja in morda ni pod nadzorom
         context: En ali več kontekstov, kjer naj se uporabi filter
         current_password: Iz varnostnih razlogov vnesite geslo trenutnega računa
         current_username: Za potrditev vnesite uporabniško ime trenutnega računa
         digest: Pošlje se le po dolgem obdobju nedejavnosti in samo, če ste prejeli osebna sporočila v vaši odsotnosti
         email: Poslali vam bomo potrditveno e-pošto
-        header: PNG, GIF ali JPG. Največ %{size}. Zmanjšana bo na %{dimensions}px
+        header: WEBP, PNG, GIF ali JPG. Največ %{size}. Zmanjšana bo na %{dimensions} sl. točk
         inbox_url: Kopirajte URL naslov s prve strani releja, ki ga želite uporabiti
         irreversible: Filtrirane objave bodo nepovratno izginile, tudi če je filter kasneje odstranjen
         locale: Jezik uporabniškega vmesnika, e-poštnih sporočil in potisnih obvestil
diff --git a/config/locales/simple_form.sq.yml b/config/locales/simple_form.sq.yml
index dc07478070cc2a..b8404766f3b71d 100644
--- a/config/locales/simple_form.sq.yml
+++ b/config/locales/simple_form.sq.yml
@@ -39,14 +39,14 @@ sq:
         text: Një paralajmërim mund ta apeloni vetëm një herë
       defaults:
         autofollow: Personat që regjistrohen përmes ftesës do t’ju ndjekin vetvetiu
-        avatar: PNG, GIF ose JPG. Maksimumi %{size}. Do të zvogëlohen në %{dimensions}px
+        avatar: WEBP, PNG, GIF ose JPG. E shumta %{size}. Do të zvogëlohet në %{dimensions}px
         bot: Kjo llogari kryesisht bën veprime të automatizuara dhe mund të mos mbikëqyret dot
         context: Një ose disa kontekste kur duhet të zbatohet filtri
         current_password: Për qëllime sigurie, ju lutemi, jepni fjalëkalimin e llogarisë së tanishme
         current_username: Që ta ripohoni, ju lutemi, jepni emrin e përdoruesit të llogarisë së tanishme
         digest: I dërguar vetëm pas një periudhe të gjatë pasiviteti dhe vetëm nëse keni marrë ndonjë mesazh personal gjatë mungesës tuaj
         email: Do t’ju dërgohet një email ripohimi
-        header: PNG, GIF ose JPG. E shumta %{size}. Do të ripërmasohet në %{dimensions}px
+        header: WEBP, PNG, GIF ose JPG. E shumta %{size}. Do të zvogëlohet në %{dimensions}px
         inbox_url: Kopjoni URL-në prej faqes ballore të relesë që doni të përdorni
         irreversible: Mesazhet e filtruar do të zhduken në mënyrë të pakthyeshme, edhe nëse filtri hiqet më vonë
         locale: Gjuha e ndërfaqes së përdoruesit, email-eve dhe njoftimeve <em>push</em>
diff --git a/config/locales/simple_form.sr-Latn.yml b/config/locales/simple_form.sr-Latn.yml
index 6e6b6ce8b8eb33..62e12201aea668 100644
--- a/config/locales/simple_form.sr-Latn.yml
+++ b/config/locales/simple_form.sr-Latn.yml
@@ -39,14 +39,12 @@ sr-Latn:
         text: Možete podneti samo jednu žalbu na upisan prestup
       defaults:
         autofollow: Osobe koje se prijave kroz pozivnice će vas automatski zapratiti
-        avatar: PNG, GIF ili JPG. Najviše %{size}. Biće smanjeno na %{dimensions}px
         bot: Daje drugima do znanja da ovaj nalog uglavnom vrši automatizovane radnje i možda se ne nadgleda
         context: Jedan ili više konteksta u kojima treba da se primeni filter
         current_password: Iz bezbednosnih razloga molimo Vas unesite lozinku trenutnog naloga
         current_username: Da biste potvrdili, Molimo Vas unesite korisničko ime trenutno aktivnog naloga
         digest: Šalje se samo posle dužeg perioda neaktivnosti i samo u slučaju da ste primili jednu ili više ličnih poruka tokom Vašeg odsustva
         email: Biće Vam poslat mejl sa potvrdom
-        header: PNG, GIF ili JPG. Najviše %{size}. Biće smanjeno na %{dimensions}px
         inbox_url: Kopirajte URL sa naslovne strane releja koji želite koristiti
         irreversible: Filtrirane obajve će nestati nepovratno, čak i ako je filter kasnije uklonjen
         locale: Jezik korisničkog okruženja, e-pošte i mobilnih obaveštenja
diff --git a/config/locales/simple_form.sr.yml b/config/locales/simple_form.sr.yml
index 71fbe299ecebd4..10434be1e40732 100644
--- a/config/locales/simple_form.sr.yml
+++ b/config/locales/simple_form.sr.yml
@@ -39,14 +39,12 @@ sr:
         text: Можете поднети само једну жалбу на уписан преступ
       defaults:
         autofollow: Особе које се пријаве кроз позивнице ће вас аутоматски запратити
-        avatar: PNG, GIF или JPG. Највише %{size}. Биће смањено на %{dimensions}px
         bot: Даје другима до знања да овај налог углавном врши аутоматизоване радње и можда се не надгледа
         context: Један или више контекста у којима треба да се примени филтер
         current_password: Из безбедносних разлога молимо Вас унесите лозинку тренутног налога
         current_username: Да бисте потврдили, Молимо Вас унесите корисничко име тренутно активног налога
         digest: Шаље се само после дужег периода неактивности и само у случају да сте примили једну или више личних порука током Вашег одсуства
         email: Биће Вам послат мејл са потврдом
-        header: PNG, GIF или JPG. Највише %{size}. Биће смањено на %{dimensions}px
         inbox_url: Копирајте URL са насловне стране релеја који желите користити
         irreversible: Филтриранe обајве ће нестати неповратно, чак и ако је филтер касније уклоњен
         locale: Језик корисничког окружења, е-поште и мобилних обавештења
diff --git a/config/locales/simple_form.sv.yml b/config/locales/simple_form.sv.yml
index b01436b415d950..fcf3788027cb22 100644
--- a/config/locales/simple_form.sv.yml
+++ b/config/locales/simple_form.sv.yml
@@ -39,14 +39,12 @@ sv:
         text: Du kan endast överklaga en varning en gång
       defaults:
         autofollow: Användarkonton som skapas genom din inbjudan kommer automatiskt följa dig
-        avatar: PNG, GIF eller JPG. Högst %{size}. Kommer att skalas ner till %{dimensions}px
         bot: Detta konto utför huvudsakligen automatiserade åtgärder och kanske inte övervakas
         context: Ett eller fler sammanhang där filtret ska tillämpas
         current_password: Av säkerhetsskäl krävs lösenordet till det nuvarande kontot
         current_username: Ange det nuvarande kontots användarnamn för att bekräfta
         digest: Skickas endast efter en lång period av inaktivitet och endast om du har fått några personliga meddelanden i din frånvaro
         email: Du kommer att få ett bekräftelsemeddelande via e-post
-        header: PNG, GIF eller JPG. Högst %{size}. Kommer att skalas ner till %{dimensions}px
         inbox_url: Kopiera webbadressen från hemsidan av det ombud du vill använda
         irreversible: Filtrerade inlägg kommer att försvinna oåterkalleligt, även om filter tas bort senare
         locale: Språket för användargränssnittet, e-postmeddelanden och push-aviseringar
diff --git a/config/locales/simple_form.ta.yml b/config/locales/simple_form.ta.yml
index a3819e5eb51a07..fcf031f90eb8da 100644
--- a/config/locales/simple_form.ta.yml
+++ b/config/locales/simple_form.ta.yml
@@ -17,7 +17,6 @@ ta:
         starts_at: கட்டாயமில்லை. உங்கள் அறிவிப்பு ஒரு குறிப்பிட்ட நேரத்தில் வெளியாக வேண்டுமெனில் மட்டும்
       defaults:
         autofollow: அழைப்பின் வாயிலாக புதிய கணக்கை துவங்குவோர் தாமாகவே உங்களை பின்தொடர்வர்
-        avatar: PNG, GIF or JPG. அதிகபட்சம் %{size}, %{dimensions}px க்கு குறைக்கப்படும்
         bot: இந்த கணக்கு முக்கியமாக தானியங்கு செயல்களைச் செய்கிறது மற்றும் கண்காணிக்கப்படாமல் போகலாம்
         current_password: பாதுகாப்பு காரணங்களுக்காக, தங்களின் தற்போதைய கணக்கின் கடவுச்சொல்லை உள்ளீடு செய்க
         current_username: உறுதிசெய்ய, தற்போதைய கணக்கின் பயனர் பெயரை உள்ளிடுக
diff --git a/config/locales/simple_form.th.yml b/config/locales/simple_form.th.yml
index c388001888ef0f..259bb000991291 100644
--- a/config/locales/simple_form.th.yml
+++ b/config/locales/simple_form.th.yml
@@ -18,7 +18,7 @@ th:
         text: คุณสามารถใช้ไวยากรณ์โพสต์ เช่น URL, แฮชแท็ก และการกล่าวถึง
         title: ไม่จำเป็น ไม่ปรากฏแก่ผู้รับ
       admin_account_action:
-        include_statuses: ผู้ใช้จะเห็นว่าโพสต์ใดก่อให้เกิดการกระทำการควบคุมหรือคำเตือน
+        include_statuses: ผู้ใช้จะเห็นว่าโพสต์ใดก่อให้เกิดการกระทำการกลั่นกรองหรือคำเตือน
         send_email_notification: ผู้ใช้จะได้รับคำอธิบายว่าเกิดอะไรขึ้นกับบัญชีของเขา
         text_html: ไม่จำเป็น คุณสามารถใช้ไวยากรณ์โพสต์ คุณสามารถ <a href="%{path}">เพิ่มคำเตือนที่ตั้งไว้ล่วงหน้า</a> เพื่อประหยัดเวลา
         type_html: เลือกสิ่งที่จะทำกับ <strong>%{acct}</strong>
@@ -39,14 +39,14 @@ th:
         text: คุณสามารถอุทธรณ์การดำเนินการได้เพียงครั้งเดียวเท่านั้น
       defaults:
         autofollow: ผู้คนที่ลงทะเบียนผ่านคำเชิญจะติดตามคุณโดยอัตโนมัติ
-        avatar: PNG, GIF หรือ JPG สูงสุด %{size} จะได้รับการย่อขนาดเป็น %{dimensions}px
+        avatar: WEBP, PNG, GIF หรือ JPG สูงสุด %{size} จะได้รับการย่อขนาดเป็น %{dimensions}px
         bot: ส่งสัญญาณให้ผู้อื่นว่าบัญชีทำการกระทำแบบอัตโนมัติเป็นหลักและอาจไม่ได้รับการสังเกตการณ์
         context: หนึ่งหรือหลายบริบทที่ตัวกรองควรนำไปใช้
         current_password: เพื่อวัตถุประสงค์ด้านความปลอดภัย โปรดป้อนรหัสผ่านของบัญชีปัจจุบัน
         current_username: เพื่อยืนยัน โปรดป้อนชื่อผู้ใช้ของบัญชีปัจจุบัน
         digest: ส่งเฉพาะหลังจากไม่มีการใช้งานเป็นเวลานานและในกรณีที่คุณได้รับข้อความส่วนบุคคลใด ๆ เมื่อคุณไม่อยู่เท่านั้น
         email: คุณจะได้รับอีเมลการยืนยัน
-        header: PNG, GIF หรือ JPG สูงสุด %{size} จะได้รับการย่อขนาดเป็น %{dimensions}px
+        header: WEBP, PNG, GIF หรือ JPG สูงสุด %{size} จะได้รับการย่อขนาดเป็น %{dimensions}px
         inbox_url: คัดลอก URL จากหน้าแรกของรีเลย์ที่คุณต้องการใช้
         irreversible: โพสต์ที่กรองอยู่จะหายไปอย่างถาวร แม้ว่าจะเอาตัวกรองออกในภายหลังก็ตาม
         locale: ภาษาของส่วนติดต่อผู้ใช้, อีเมล และการแจ้งเตือนแบบผลัก
@@ -86,7 +86,7 @@ th:
         media_cache_retention_period: จะลบไฟล์สื่อที่ดาวน์โหลดหลังจากจำนวนวันที่ระบุเมื่อตั้งเป็นค่าบวก และดาวน์โหลดใหม่ตามความต้องการ
         peers_api_enabled: รายการชื่อโดเมนที่เซิร์ฟเวอร์นี้พบในจักรวาลสหพันธ์ ไม่มีข้อมูลรวมอยู่ที่นี่เกี่ยวกับว่าคุณติดต่อกับเซิร์ฟเวอร์ที่กำหนดหรือไม่ เพียงแค่ว่าเซิร์ฟเวอร์ของคุณทราบเกี่ยวกับเซิร์ฟเวอร์ที่กำหนด มีการใช้สิ่งนี้โดยบริการที่เก็บรวบรวมสถิติในการติดต่อกับภายนอกในความหมายทั่วไป
         profile_directory: ไดเรกทอรีโปรไฟล์แสดงรายการผู้ใช้ทั้งหมดที่ได้เลือกรับให้สามารถค้นพบได้
-        require_invite_text: เมื่อการลงทะเบียนต้องมีการอนุมัติด้วยตนเอง ทำให้การป้อนข้อความ “ทำไมคุณจึงต้องการเข้าร่วม?” บังคับแทนที่จะไม่จำเป็น
+        require_invite_text: เมื่อการลงทะเบียนต้องการการอนุมัติด้วยตนเอง ทำให้การป้อนข้อความ “ทำไมคุณจึงต้องการเข้าร่วม?” บังคับแทนที่จะไม่จำเป็น
         site_contact_email: วิธีที่ผู้คนสามารถเข้าถึงคุณสำหรับการสอบถามด้านกฎหมายหรือการสนับสนุน
         site_contact_username: วิธีที่ผู้คนสามารถเข้าถึงคุณใน Mastodon
         site_extended_description: ข้อมูลเพิ่มเติมใด ๆ ที่อาจเป็นประโยชน์กับผู้เยี่ยมชมและผู้ใช้ของคุณ สามารถจัดโครงสร้างด้วยไวยากรณ์ Markdown
@@ -113,7 +113,7 @@ th:
         severities:
           no_access: ปิดกั้นการเข้าถึงทรัพยากรทั้งหมด
           sign_up_block: จะไม่สามารถทำการลงทะเบียนใหม่
-          sign_up_requires_approval: การลงทะเบียนใหม่จะต้องมีการอนุมัติของคุณ
+          sign_up_requires_approval: การลงทะเบียนใหม่จะต้องการการอนุมัติของคุณ
         severity: เลือกสิ่งที่จะเกิดขึ้นกับคำขอจาก IP นี้
       rule:
         text: อธิบายกฎหรือข้อกำหนดสำหรับผู้ใช้ในเซิร์ฟเวอร์นี้ พยายามทำให้กฎหรือข้อกำหนดสั้นและเรียบง่าย
@@ -282,7 +282,7 @@ th:
           sign_up_requires_approval: จำกัดการลงทะเบียน
         severity: กฎ
       notification_emails:
-        appeal: ใครสักคนอุทธรณ์การตัดสินใจของผู้ควบคุม
+        appeal: ใครสักคนอุทธรณ์การตัดสินใจของผู้กลั่นกรอง
         digest: ส่งอีเมลสรุป
         favourite: ใครสักคนได้ชื่นชอบโพสต์ของคุณ
         follow: ใครสักคนได้ติดตามคุณ
diff --git a/config/locales/simple_form.tr.yml b/config/locales/simple_form.tr.yml
index 3053c044314590..cc644d4df4bfe6 100644
--- a/config/locales/simple_form.tr.yml
+++ b/config/locales/simple_form.tr.yml
@@ -39,14 +39,14 @@ tr:
         text: Bir eyleme yalnızca bir kere itiraz edebilirsiniz
       defaults:
         autofollow: Davetiyeyle kaydolan kişiler sizi otomatik olarak takip eder
-        avatar: En fazla %{size} olacak şekilde PNG, GIF veya JPG formatında yükleyiniz. %{dimensions}px büyüklüğüne indirgenecektir
+        avatar: En fazla %{size} olacak şekilde WEBP, PNG, GIF veya JPG formatında yükleyiniz. %{dimensions}px boyutuna küçültülecektir
         bot: Bu hesap temelde otomatik eylemler gerçekleştirir ve izlenmeyebilir
         context: Filtrenin geçerli olması gereken bir veya daha fazla içerik
         current_password: Güvenlik nedeniyle lütfen şu anki hesabın parolasını girin
         current_username: Onaylamak için lütfen şu anki hesabın kullanıcı adını girin
         digest: Sadece uzun bir süre hareketsiz kaldıktan sonra ve yalnızca yokluğunuzda herhangi bir kişisel mesaj aldıysanız gönderilir
         email: Onay e-postası gönderilir
-        header: PNG, GIF ya da JPG. En fazla %{size}. %{dimensions}px boyutuna küçültülecek
+        header: WEBP, PNG, GIF veya JPG. En fazla %{size}. %{dimensions}px boyutuna küçültülecektir
         inbox_url: Kullanmak istediğiniz aktarıcının ön sayfasından URL'yi kopyalayın
         irreversible: Süzgeçlenmiş gönderiler, filtre daha sonra kaldırılsa bile, geri dönüşümsüz biçimde kaybolur
         locale: Kullanıcı arayüzünün dili, e-postalar ve push bildirimleri
diff --git a/config/locales/simple_form.uk.yml b/config/locales/simple_form.uk.yml
index aa64ecfdb75608..a85684a0f9eec3 100644
--- a/config/locales/simple_form.uk.yml
+++ b/config/locales/simple_form.uk.yml
@@ -39,14 +39,14 @@ uk:
         text: Ви можете оскаржити рішення лише один раз
       defaults:
         autofollow: Люди, що зареєструвалися за вашим запрошенням, автоматично підпишуться на вас
-        avatar: PNG, GIF, або JPG. Максимум - %{size}. Буде зменшено до %{dimensions}px
+        avatar: WEBP, PNG, GIF, або JPG. Максимальний розмір - %{size}. Буде зменшено до %{dimensions}px
         bot: Цей обліковий запис виконує переважно автоматичні дії та може не відстежуватися
         context: Один або кілька контекстів, до яких повинні бути застосовані фільтри
         current_password: Для цілей безпеки, будь ласка, введіть пароль поточного облікового запису
         current_username: Для підтвердження, будь ласка, введіть ім'я користувача поточного облікового запису
         digest: Буде послано тільки після довгого періоду неактивності, та тільки якщо ви отримаєте персональне повідомлення у цей період
         email: Вам надійде електронний лист з підтвердженням
-        header: PNG, GIF, або JPG. Максимум - %{size}. Буде зменшено до %{dimensions}px
+        header: WEBP, PNG, GIF, або JPG. Максимальний розмір - %{size}. Буде зменшено до %{dimensions}px
         inbox_url: Скопіюйте інтернет-адресу з титульної сторінки ретранслятора
         irreversible: Відфільтровані дописи зникнуть назавжди, навіть якщо фільтр потім буде вилучено
         locale: Мова інтерфейсу, електронних листів та push-сповіщень
diff --git a/config/locales/simple_form.vi.yml b/config/locales/simple_form.vi.yml
index 8943527b16a481..817883941c5a82 100644
--- a/config/locales/simple_form.vi.yml
+++ b/config/locales/simple_form.vi.yml
@@ -39,14 +39,12 @@ vi:
         text: Bạn chỉ có thể khiếu nại mỗi lần một cảnh cáo
       defaults:
         autofollow: Những người đăng ký sẽ tự động theo dõi bạn
-        avatar: PNG, GIF hoặc JPG, tối đa %{size}. Sẽ bị nén xuống %{dimensions}px
         bot: Tài khoản này tự động thực hiện các hành động và không được quản lý bởi người thật
         context: Chọn một hoặc nhiều nơi mà bộ lọc sẽ áp dụng
         current_password: Vì mục đích bảo mật, vui lòng nhập mật khẩu của tài khoản hiện tại
         current_username: Để xác nhận, vui lòng nhập tên người dùng của tài khoản hiện tại
         digest: Chỉ gửi sau một thời gian dài không hoạt động hoặc khi bạn nhận được tin nhắn (trong thời gian vắng mặt)
         email: Bạn sẽ được gửi một email xác minh
-        header: PNG, GIF hoặc JPG, tối đa %{size}. Sẽ bị nén xuống %{dimensions}px
         inbox_url: Sao chép URL của máy chủ mà bạn muốn dùng
         irreversible: Các tút đã lọc sẽ không thể phục hồi, kể cả sau khi xóa bộ lọc
         locale: Ngôn ngữ của giao diện, email và thông báo đẩy
diff --git a/config/locales/simple_form.zh-CN.yml b/config/locales/simple_form.zh-CN.yml
index 7a56fa25594245..d0ca529a4df376 100644
--- a/config/locales/simple_form.zh-CN.yml
+++ b/config/locales/simple_form.zh-CN.yml
@@ -39,14 +39,14 @@ zh-CN:
         text: 你仅能对单次处罚提交一次申诉
       defaults:
         autofollow: 通过邀请链接注册的用户将会自动关注你
-        avatar: 文件大小限制 %{size}，只支持 PNG、GIF 或 JPG 格式。图片分辨率将会压缩至 %{dimensions}px
+        avatar: 支持WEBP、PNG、GIF 或 JPG。最大 %{size}。将缩小到 %{dimensions}px
         bot: 来自这个账户的绝大多数操作都是自动进行的，并且可能无人监控
         context: 过滤器的应用环境
         current_password: 为了安全起见，请输入当前账号的密码
         current_username: 请输入当前账号的用户名以确认
         digest: 仅在你长时间未登录，且收到了私信时发送
         email: 我们会向你发送一封确认邮件
-        header: 文件大小限制 %{size}，只支持 PNG、GIF 或 JPG 格式。图片分辨率将会压缩至 %{dimensions}px
+        header: 支持WEBP、PNG、GIF 或 JPG。最大 %{size}。将缩小到 %{dimensions}px
         inbox_url: 从你想要使用的中继站的主页上复制 URL
         irreversible: 已过滤的嘟文会不可逆转地消失，即便移除过滤器之后也一样
         locale: 用户界面、电子邮件和推送通知中使用的语言
diff --git a/config/locales/simple_form.zh-HK.yml b/config/locales/simple_form.zh-HK.yml
index ad963b32b6395d..6fa052082eaa4f 100644
--- a/config/locales/simple_form.zh-HK.yml
+++ b/config/locales/simple_form.zh-HK.yml
@@ -39,14 +39,12 @@ zh-HK:
         text: 你每次只能提出一次申訴
       defaults:
         autofollow: 通過邀請網址註冊的用戶將會自動關注你
-        avatar: 支援 PNG, GIF 或 JPG 圖片，檔案最大為 %{size}，會縮裁成 %{dimensions}px
         bot: 這個帳號是機械人，所做的事情可能沒有經人為監察
         context: 過濾器應該套用的一項或多項條件
         current_password: 基於保安緣故，請輸入目前帳號的密碼
         current_username: 請輸入目前帳戶的使用者名稱以確認
         digest: 僅在你長時間未登錄，且收到了私信時發送
         email: 你將收到一封確認電郵
-        header: 支援 PNG, GIF 或 JPG 圖片，檔案最大為 %{size}，會縮裁成 %{dimensions}px
         inbox_url: 在你想要使用的中繼站首頁，複製它的網址
         irreversible: 文章過濾是不可還原的，即使日後過濾器被移除，也無法重新看到被它濾走的文章
         locale: 使用者介面、電郵和通知的語言
diff --git a/config/locales/simple_form.zh-TW.yml b/config/locales/simple_form.zh-TW.yml
index 696fd5fed98f9e..c83a7be75ac123 100644
--- a/config/locales/simple_form.zh-TW.yml
+++ b/config/locales/simple_form.zh-TW.yml
@@ -39,14 +39,14 @@ zh-TW:
         text: 您只能對警示提出一次申訴
       defaults:
         autofollow: 通過邀請網址註冊的使用者將自動跟隨您
-        avatar: 支援 PNG、GIF 或 JPG 圖片格式，檔案最大為 %{size}，會等比例縮減至 %{dimensions} 像素
+        avatar: 支援 WEBP、PNG、GIF 或 JPG 圖片格式，檔案最大為 %{size}。將等比例縮減至 %{dimensions} 像素
         bot: 此帳號主要執行自動化操作且可能未受人為監控
         context: 此過濾器應套用於以下一項或多項情境
         current_password: 因安全因素，請輸入目前帳號的密碼
         current_username: 請輸入目前帳號的使用者名稱以確認
         digest: 僅於您長時間未登入且於未登入期間收到私訊時傳送
         email: 您將收到一封確認電子郵件
-        header: 支援 PNG、GIF 或 JPG 圖片格式，檔案最大為 %{size}，會等比例縮減至 %{dimensions} 像素
+        header: 支援 WEBP、PNG、GIF 或 JPG 圖片格式，檔案最大為 %{size}。將等比例縮減至 %{dimensions} 像素
         inbox_url: 從您想要使用的中繼首頁複製網址
         irreversible: 已過濾的嘟文將會不可逆地消失，即便之後移除過濾器也一樣
         locale: 使用者介面、電子郵件與推播通知的語言
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index da82dda9cbf504..3ad76e24296f1f 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -764,6 +764,7 @@ sq:
         disabled: Për askënd
         users: Për përdorues vendorë që kanë bërë hyrjen
       registrations:
+        moderation_recommandation: Ju lutemi, sigurohuni si keni një ekip adekuat dhe reagues moderimi, përpara se të hapni regjistrimet për këdo!
         preamble: Kontrolloni cilët mund të krijojnë llogari në shërbyesin tuaj.
         title: Regjistrime
       registrations_mode:
@@ -771,6 +772,7 @@ sq:
           approved: Për regjistrim, lypset miratimi
           none: S’mund të regjistrohet ndokush
           open: Mund të regjistrohet gjithkush
+        warning_hint: Rekomandojmë përdorimin e “Për regjistrim lypset miratim”. veç nëse jeni i bindur se ekipi juaj i moderimit mund të trajtojë në kohë mesazhe të padëshiruar dhe regjistrime dashakeqe.
       security:
         authorized_fetch: Kërko doemos mirëfilltësim prej shërbyes të federuar
         authorized_fetch_hint: Kërkimi doemos i kryerjes së mirëfilltësimit për shërbyes të federuar aktivizon detyrim më strikt të bllokimeve si në shkallë përdoruesi, ashtu edhe në shkallë shërbyesi. Por kjo vjen me koston e një keqësimi të funksionimit, redukton përhapjen e përgjigjeve tuaja dhe mund të sjellë probleme përputhshmërie me disa shërbime të federuara. Veç kësaj, kjo s’do t’ua pengojë, aktorëve vënë kësaj, të sjellin postimet dhe llogaritë tuaja publike.
diff --git a/config/locales/th.yml b/config/locales/th.yml
index b76f6992ad2c6c..e117c29b4a7590 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -23,11 +23,11 @@ th:
   admin:
     account_actions:
       action: ทำการกระทำ
-      title: ทำการกระทำการควบคุม %{acct}
+      title: ทำการกระทำการกลั่นกรองต่อ %{acct}
     account_moderation_notes:
       create: เขียนหมายเหตุ
-      created_msg: สร้างหมายเหตุการควบคุมสำเร็จ!
-      destroyed_msg: ทำลายหมายเหตุการควบคุมสำเร็จ!
+      created_msg: สร้างหมายเหตุการกลั่นกรองสำเร็จ!
+      destroyed_msg: ทำลายหมายเหตุการกลั่นกรองสำเร็จ!
     accounts:
       add_email_domain_block: ปิดกั้นโดเมนอีเมล
       approve: อนุมัติ
@@ -93,8 +93,8 @@ th:
         pending: รอดำเนินการ
         silenced: จำกัดอยู่
         suspended: ระงับอยู่
-        title: การควบคุม
-      moderation_notes: หมายเหตุการควบคุม
+        title: การกลั่นกรอง
+      moderation_notes: หมายเหตุการกลั่นกรอง
       most_recent_activity: กิจกรรมล่าสุด
       most_recent_ip: IP ล่าสุด
       no_account_selected: ไม่มีการเปลี่ยนแปลงบัญชีเนื่องจากไม่มีการเลือก
@@ -226,7 +226,7 @@ th:
         update_status: อัปเดตโพสต์
         update_user_role: อัปเดตบทบาท
       actions:
-        approve_appeal_html: "%{name} ได้อนุมัติการอุทธรณ์การตัดสินใจในการควบคุมจาก %{target}"
+        approve_appeal_html: "%{name} ได้อนุมัติการอุทธรณ์การตัดสินใจในการกลั่นกรองจาก %{target}"
         approve_user_html: "%{name} ได้อนุมัติการลงทะเบียนจาก %{target}"
         assigned_to_self_report_html: "%{name} ได้มอบหมายรายงาน %{target} ให้กับตนเอง"
         change_email_user_html: "%{name} ได้เปลี่ยนที่อยู่อีเมลของผู้ใช้ %{target}"
@@ -263,7 +263,7 @@ th:
         enable_user_html: "%{name} ได้เปิดใช้งานการเข้าสู่ระบบสำหรับผู้ใช้ %{target}"
         memorialize_account_html: "%{name} ได้เปลี่ยนบัญชีของ %{target} เป็นหน้าอนุสรณ์"
         promote_user_html: "%{name} ได้เลื่อนขั้นผู้ใช้ %{target}"
-        reject_appeal_html: "%{name} ได้ปฏิเสธการอุทธรณ์การตัดสินใจในการควบคุมจาก %{target}"
+        reject_appeal_html: "%{name} ได้ปฏิเสธการอุทธรณ์การตัดสินใจในการกลั่นกรองจาก %{target}"
         reject_user_html: "%{name} ได้ปฏิเสธการลงทะเบียนจาก %{target}"
         remove_avatar_user_html: "%{name} ได้เอาภาพประจำตัวของ %{target} ออก"
         reopen_report_html: "%{name} ได้เปิดรายงาน %{target} ใหม่"
@@ -395,7 +395,7 @@ th:
       import: นำเข้า
       new:
         create: สร้างการปิดกั้น
-        hint: การปิดกั้นโดเมนจะไม่ป้องกันการสร้างรายการบัญชีในฐานข้อมูล แต่จะนำไปใช้วิธีการควบคุมที่เฉพาะเจาะจงกับบัญชีเหล่านั้นย้อนหลังและโดยอัตโนมัติ
+        hint: การปิดกั้นโดเมนจะไม่ป้องกันการสร้างรายการบัญชีในฐานข้อมูล แต่จะนำไปใช้วิธีการกลั่นกรองที่เฉพาะเจาะจงกับบัญชีเหล่านั้นย้อนหลังและโดยอัตโนมัติ
         severity:
           desc_html: "<strong>จำกัด</strong> จะทำให้โพสต์จากบัญชีที่โดเมนนี้ไม่ปรากฏแก่ใครก็ตามที่ไม่ได้กำลังติดตามเขา <strong>ระงับ</strong> จะเอาข้อมูลเนื้อหา, สื่อ และโปรไฟล์ทั้งหมดสำหรับบัญชีของโดเมนนี้ออกจากเซิร์ฟเวอร์ของคุณ ใช้ <strong>ไม่มี</strong> หากคุณแค่ต้องการปฏิเสธไฟล์สื่อ"
           noop: ไม่มี
@@ -407,7 +407,7 @@ th:
       obfuscate: ทำให้ชื่อโดเมนคลุมเครือ
       obfuscate_hint: ทำให้ชื่อโดเมนในรายการคลุมเครือบางส่วนหากมีการเปิดใช้งานการประกาศรายการการจำกัดโดเมน
       private_comment: ความคิดเห็นส่วนตัว
-      private_comment_hint: ความคิดเห็นเกี่ยวกับการจำกัดโดเมนนี้สำหรับการใช้งานภายในโดยผู้ควบคุม
+      private_comment_hint: ความคิดเห็นเกี่ยวกับการจำกัดโดเมนนี้สำหรับการใช้งานภายในโดยผู้กลั่นกรอง
       public_comment: ความคิดเห็นสาธารณะ
       public_comment_hint: ความคิดเห็นเกี่ยวกับการจำกัดโดเมนนี้สำหรับสาธารณชนทั่วไป หากมีการเปิดใช้งานการประกาศรายการการจำกัดโดเมน
       reject_media: ปฏิเสธไฟล์สื่อ
@@ -512,7 +512,7 @@ th:
       moderation:
         all: ทั้งหมด
         limited: จำกัดอยู่
-        title: การควบคุม
+        title: การกลั่นกรอง
       private_comment: ความคิดเห็นส่วนตัว
       public_comment: ความคิดเห็นสาธารณะ
       purge: ล้างข้อมูล
@@ -587,7 +587,7 @@ th:
       add_to_report: เพิ่มข้อมูลเพิ่มเติมไปยังรายงาน
       are_you_sure: คุณแน่ใจหรือไม่?
       assign_to_self: มอบหมายให้ฉัน
-      assigned: ผู้ควบคุมที่ได้รับมอบหมาย
+      assigned: ผู้กลั่นกรองที่ได้รับมอบหมาย
       by_target_domain: โดเมนของบัญชีที่ได้รับการรายงาน
       cancel: ยกเลิก
       category: หมวดหมู่
@@ -596,7 +596,7 @@ th:
         none: ไม่มี
       comment_description_html: 'เพื่อให้ข้อมูลเพิ่มเติม %{name} ได้เขียน:'
       confirm: ยืนยัน
-      confirm_action: ยืนยันการกระทำการควบคุมต่อ @%{acct}
+      confirm_action: ยืนยันการกระทำการกลั่นกรองต่อ @%{acct}
       created_at: รายงานเมื่อ
       delete_and_resolve: ลบโพสต์
       forwarded: ส่งต่อแล้ว
@@ -613,7 +613,7 @@ th:
         delete: ลบ
         placeholder: อธิบายว่ามีการใช้การกระทำใด หรือการอัปเดตที่เกี่ยวข้องอื่นใด...
         title: หมายเหตุ
-      notes_description_html: ดูและฝากหมายเหตุถึงผู้ควบคุมอื่น ๆ และตัวคุณเองในอนาคต
+      notes_description_html: ดูและฝากหมายเหตุถึงผู้กลั่นกรองอื่น ๆ และตัวคุณเองในอนาคต
       processed_msg: 'ประมวลผลรายงาน #%{id} สำเร็จ'
       quick_actions_description_html: 'ดำเนินการอย่างรวดเร็วหรือเลื่อนลงเพื่อดูเนื้อหาที่รายงาน:'
       remote_user_placeholder: ผู้ใช้ระยะไกลจาก %{instance}
@@ -644,7 +644,7 @@ th:
         preview_preamble_html: "<strong>@%{acct}</strong> จะได้รับคำเตือนโดยมีเนื้อหาดังต่อไปนี้:"
         record_strike_html: บันทึกการดำเนินการต่อ <strong>@%{acct}</strong> เพื่อช่วยให้คุณเลื่อนระดับการละเมิดในอนาคตจากบัญชีนี้
         send_email_html: ส่งอีเมลคำเตือนถึง <strong>@%{acct}</strong>
-        warning_placeholder: การให้เหตุผลเพิ่มเติมที่ไม่จำเป็นสำหรับการกระทำการควบคุม
+        warning_placeholder: การให้เหตุผลเพิ่มเติมที่ไม่จำเป็นสำหรับการกระทำการกลั่นกรอง
       target_origin: จุดเริ่มต้นของบัญชีที่ได้รับการรายงาน
       title: รายงาน
       unassign: เลิกมอบหมาย
@@ -660,7 +660,7 @@ th:
         administration: การดูแล
         devops: DevOps
         invites: คำเชิญ
-        moderation: การควบคุม
+        moderation: การกลั่นกรอง
         special: พิเศษ
       delete: ลบ
       description_html: ด้วย <strong>บทบาทผู้ใช้</strong> คุณสามารถปรับแต่งว่าฟังก์ชันและพื้นที่ใดของ Mastodon ที่ผู้ใช้ของคุณสามารถเข้าถึง
@@ -679,7 +679,7 @@ th:
         manage_announcements: จัดการประกาศ
         manage_announcements_description: อนุญาตให้ผู้ใช้จัดการประกาศในเซิร์ฟเวอร์
         manage_appeals: จัดการการอุทธรณ์
-        manage_appeals_description: อนุญาตให้ผู้ใช้ตรวจทานการอุทธรณ์ต่อการกระทำการควบคุม
+        manage_appeals_description: อนุญาตให้ผู้ใช้ตรวจทานการอุทธรณ์ต่อการกระทำการกลั่นกรอง
         manage_blocks: จัดการการปิดกั้น
         manage_blocks_description: อนุญาตให้ผู้ใช้ปิดกั้นผู้ให้บริการอีเมลและที่อยู่ IP
         manage_custom_emojis: จัดการอีโมจิที่กำหนดเอง
@@ -689,7 +689,7 @@ th:
         manage_invites: จัดการคำเชิญ
         manage_invites_description: อนุญาตให้ผู้ใช้เรียกดูและปิดใช้งานลิงก์เชิญ
         manage_reports: จัดการรายงาน
-        manage_reports_description: อนุญาตให้ผู้ใช้ตรวจทานรายงานและทำการกระทำการควบคุมต่อรายงานเหล่านั้น
+        manage_reports_description: อนุญาตให้ผู้ใช้ตรวจทานรายงานและทำการกระทำการกลั่นกรองต่อรายงานเหล่านั้น
         manage_roles: จัดการบทบาท
         manage_roles_description: อนุญาตให้ผู้ใช้จัดการและกำหนดบทบาทที่ต่ำกว่าบทบาทของเขา
         manage_rules: จัดการกฎ
@@ -701,7 +701,7 @@ th:
         manage_user_access: จัดการการเข้าถึงของผู้ใช้
         manage_user_access_description: อนุญาตให้ผู้ใช้ปิดใช้งานการรับรองความถูกต้องด้วยสองปัจจัยของผู้ใช้อื่น เปลี่ยนที่อยู่อีเมลของเขา และตั้งรหัสผ่านของเขาใหม่
         manage_users: จัดการผู้ใช้
-        manage_users_description: อนุญาตให้ผู้ใช้ดูรายละเอียดของผู้ใช้อื่น ๆ และทำการกระทำการควบคุมต่อผู้ใช้เหล่านั้น
+        manage_users_description: อนุญาตให้ผู้ใช้ดูรายละเอียดของผู้ใช้อื่น ๆ และทำการกระทำการกลั่นกรองต่อผู้ใช้เหล่านั้น
         manage_webhooks: จัดการเว็บฮุค
         manage_webhooks_description: อนุญาตให้ผู้ใช้ตั้งค่าเว็บฮุคสำหรับเหตุการณ์การดูแล
         view_audit_log: ดูรายการบันทึกการตรวจสอบ
@@ -721,7 +721,7 @@ th:
     settings:
       about:
         manage_rules: จัดการกฎของเซิร์ฟเวอร์
-        preamble: ให้ข้อมูลเชิงลึกเกี่ยวกับวิธีที่เซิร์ฟเวอร์ได้รับการดำเนินงาน ควบคุม ได้รับทุน
+        preamble: ให้ข้อมูลเชิงลึกเกี่ยวกับวิธีที่เซิร์ฟเวอร์ได้รับการดำเนินงาน กลั่นกรอง ได้รับทุน
         rules_hint: มีพื้นที่เฉพาะสำหรับกฎที่คาดหวังให้ผู้ใช้ของคุณปฏิบัติตาม
         title: เกี่ยวกับ
       appearance:
@@ -753,6 +753,7 @@ th:
         disabled: ให้กับไม่มีใคร
         users: ให้กับผู้ใช้ในเซิร์ฟเวอร์ที่เข้าสู่ระบบ
       registrations:
+        moderation_recommandation: โปรดตรวจสอบให้แน่ใจว่าคุณมีทีมการกลั่นกรองที่เพียงพอและมีปฏิกิริยาตอบสนองก่อนที่คุณจะเปิดการลงทะเบียนให้กับทุกคน!
         preamble: ควบคุมผู้ที่สามารถสร้างบัญชีในเซิร์ฟเวอร์ของคุณ
         title: การลงทะเบียน
       registrations_mode:
@@ -760,6 +761,7 @@ th:
           approved: ต้องการการอนุมัติสำหรับการลงทะเบียน
           none: ไม่มีใครสามารถลงทะเบียน
           open: ใครก็ตามสามารถลงทะเบียน
+        warning_hint: เราแนะนำให้ใช้ “ต้องการการอนุมัติสำหรับการลงทะเบียน” เว้นแต่คุณมั่นใจว่าทีมการกลั่นกรองของคุณสามารถจัดการกับสแปมและการลงทะเบียนที่เป็นอันตรายได้อย่างทันท่วงที
       security:
         authorized_fetch: ต้องมีการรับรองความถูกต้องจากเซิร์ฟเวอร์ที่ติดต่อกับภายนอก
         authorized_fetch_hint: การต้องการการรับรองความถูกต้องจากเซิร์ฟเวอร์ที่ติดต่อกับภายนอกทำให้การบังคับใช้การปิดกั้นทั้งระดับผู้ใช้และระดับเซิร์ฟเวอร์เข้มงวดขึ้น อย่างไรก็ตาม สิ่งนี้มาพร้อมกับต้นทุนที่ต้องแลกด้วยผลเสียด้านประสิทธิภาพ ลดการเข้าถึงการตอบกลับของคุณ และอาจก่อให้เกิดปัญหาความเข้ากันได้กับบริการที่ติดต่อกับภายนอกบางอย่าง นอกจากนี้ สิ่งนี้จะไม่ป้องกันตัวดำเนินการเฉพาะจากการดึงข้อมูลโพสต์และบัญชีสาธารณะของคุณ
@@ -771,7 +773,7 @@ th:
       destroyed_msg: ลบการอัปโหลดไซต์สำเร็จ!
     software_updates:
       critical_update: สำคัญ — โปรดอัปเดตอย่างรวดเร็ว
-      description: ขอแนะนำให้ทำให้การติดตั้ง Mastodon ของคุณทันสมัยอยู่เสมอเพื่อรับประโยชน์จากการแก้ไขและคุณลักษณะล่าสุด ยิ่งไปกว่านั้น บางครั้งก็เป็นสิ่งสำคัญที่จะอัปเดต Mastodon ในเวลาที่เหมาะสมเพื่อหลีกเลี่ยงปัญหาความปลอดภัย ด้วยเหตุผลเหล่านี้ Mastodon จึงตรวจสอบการอัปเดตทุก 30 นาที และจะแจ้งเตือนคุณตามการกำหนดลักษณะการแจ้งเตือนอีเมลของคุณ
+      description: ขอแนะนำให้ทำให้การติดตั้ง Mastodon ของคุณทันสมัยอยู่เสมอเพื่อรับประโยชน์จากการแก้ไขและคุณลักษณะล่าสุด ยิ่งไปกว่านั้น บางครั้งก็เป็นสิ่งสำคัญที่จะอัปเดต Mastodon อย่างทันท่วงทีเพื่อหลีกเลี่ยงปัญหาความปลอดภัย ด้วยเหตุผลเหล่านี้ Mastodon จึงตรวจสอบการอัปเดตทุก 30 นาที และจะแจ้งเตือนคุณตามการกำหนดลักษณะการแจ้งเตือนอีเมลของคุณ
       documentation_link: เรียนรู้เพิ่มเติม
       release_notes: บันทึกประจำรุ่น
       title: การอัปเดตที่พร้อมใช้งาน
@@ -948,6 +950,9 @@ th:
       title: เว็บฮุค
       webhook: เว็บฮุค
   admin_mailer:
+    auto_close_registrations:
+      body: เนื่องจากการขาดกิจกรรมของผู้กลั่นกรองล่าสุด จึงมีการสลับการลงทะเบียนใน %{instance} เป็นการต้องการการตรวจทานด้วยตนเองโดยอัตโนมัติ เพื่อป้องกันไม่ให้มีการใช้ %{instance} เป็นแพลตฟอร์มสำหรับผู้ไม่ประสงค์ดี คุณสามารถสลับการลงทะเบียนกลับเป็นการลงทะเบียนแบบเปิดเมื่อใดก็ได้
+      subject: มีการสลับการลงทะเบียนสำหรับ %{instance} เป็นการต้องการการอนุมัติโดยอัตโนมัติ
     new_appeal:
       actions:
         delete_statuses: เพื่อลบโพสต์ของเขา
@@ -957,9 +962,9 @@ th:
         sensitive: เพื่อทำเครื่องหมายบัญชีของเขาว่าละเอียดอ่อน
         silence: เพื่อจำกัดบัญชีของเขา
         suspend: เพื่อระงับบัญชีของเขา
-      body: "%{target} กำลังอุทธรณ์การตัดสินใจในการควบคุมโดย %{action_taken_by} จาก %{date} ซึ่งเป็น %{type} เขาเขียนว่า:"
-      next_steps: คุณสามารถอนุมัติการอุทธรณ์เพื่อเลิกทำการตัดสินใจในการควบคุม หรือเพิกเฉยต่อการอุทธรณ์
-      subject: "%{username} กำลังอุทธรณ์การตัดสินใจในการควบคุมใน %{instance}"
+      body: "%{target} กำลังอุทธรณ์การตัดสินใจในการกลั่นกรองโดย %{action_taken_by} จาก %{date} ซึ่งก็คือ %{type} เขาเขียนว่า:"
+      next_steps: คุณสามารถอนุมัติการอุทธรณ์เพื่อเลิกทำการตัดสินใจในการกลั่นกรอง หรือเพิกเฉยต่อการอุทธรณ์
+      subject: "%{username} กำลังอุทธรณ์การตัดสินใจในการกลั่นกรองใน %{instance}"
     new_critical_software_updates:
       body: มีการปล่อยรุ่น Mastodon สำคัญใหม่ คุณอาจต้องการอัปเดตโดยเร็วที่สุดเท่าที่จะเป็นไปได้!
       subject: การอัปเดต Mastodon สำคัญพร้อมใช้งานสำหรับ %{instance}!
@@ -1067,8 +1072,8 @@ th:
       accept: ยอมรับ
       back: ย้อนกลับ
       invited_by: 'คุณสามารถเข้าร่วม %{domain} ได้ด้วยคำเชิญที่คุณได้รับจาก:'
-      preamble: มีการตั้งและบังคับใช้กฎโดยผู้ควบคุมของ %{domain}
-      preamble_invited: ก่อนที่คุณจะดำเนินการต่อ โปรดพิจารณากฎพื้นฐานที่ตั้งโดยผู้ควบคุมของ %{domain}
+      preamble: มีการตั้งและบังคับใช้กฎโดยผู้กลั่นกรองของ %{domain}
+      preamble_invited: ก่อนที่คุณจะดำเนินการต่อ โปรดพิจารณากฎพื้นฐานที่ตั้งโดยผู้กลั่นกรองของ %{domain}
       title: กฎพื้นฐานบางประการ
       title_invited: คุณได้รับการเชิญ
     security: ความปลอดภัย
@@ -1083,7 +1088,7 @@ th:
       preamble_html: เข้าสู่ระบบด้วยข้อมูลประจำตัว <strong>%{domain}</strong> ของคุณ หากบัญชีของคุณได้รับการโฮสต์ในเซิร์ฟเวอร์อื่น คุณจะไม่สามารถเข้าสู่ระบบได้ที่นี่
       title: เข้าสู่ระบบ %{domain}
     sign_up:
-      manual_review: การลงทะเบียนใน %{domain} จะผ่านการตรวจทานด้วยตนเองโดยผู้ควบคุมของเรา เพื่อช่วยให้เราประมวลผลการลงทะเบียนของคุณ เขียนสักนิดเกี่ยวกับตัวคุณเองและเหตุผลที่คุณต้องการบัญชีใน %{domain}
+      manual_review: การลงทะเบียนใน %{domain} จะผ่านการตรวจทานด้วยตนเองโดยผู้กลั่นกรองของเรา เพื่อช่วยให้เราประมวลผลการลงทะเบียนของคุณ เขียนสักนิดเกี่ยวกับตัวคุณเองและเหตุผลที่คุณต้องการบัญชีใน %{domain}
       preamble: ด้วยบัญชีในเซิร์ฟเวอร์ Mastodon นี้ คุณจะสามารถติดตามบุคคลอื่นใดในเครือข่าย โดยไม่คำนึงถึงที่ซึ่งบัญชีของเขาได้รับการโฮสต์
       title: มาตั้งค่าของคุณใน %{domain} กันเลย
     status:
@@ -1419,7 +1424,7 @@ th:
       other_data: จะไม่ย้ายข้อมูลอื่น ๆ โดยอัตโนมัติ
       redirect: จะอัปเดตโปรไฟล์ของบัญชีปัจจุบันของคุณด้วยข้อสังเกตการเปลี่ยนเส้นทางและจะไม่รวมอยู่ในการค้นหา
   moderation:
-    title: การควบคุม
+    title: การกลั่นกรอง
   move_handler:
     carry_blocks_over_text: ผู้ใช้นี้ได้ย้ายจาก %{acct} ซึ่งคุณได้ปิดกั้น
     carry_mutes_over_text: ผู้ใช้นี้ได้ย้ายจาก %{acct} ซึ่งคุณได้ซ่อน
@@ -1627,7 +1632,7 @@ th:
     profile: โปรไฟล์สาธารณะ
     relationships: การติดตามและผู้ติดตาม
     statuses_cleanup: การลบโพสต์แบบอัตโนมัติ
-    strikes: การดำเนินการการควบคุม
+    strikes: การดำเนินการการกลั่นกรอง
     two_factor_authentication: การรับรองความถูกต้องด้วยสองปัจจัย
     webauthn_authentication: กุญแจความปลอดภัย
   statuses:
@@ -1781,9 +1786,9 @@ th:
         spam: สแปม
         violation: เนื้อหาละเมิดหลักเกณฑ์ชุมชนดังต่อไปนี้
       explanation:
-        delete_statuses: มีการพบว่าโพสต์บางส่วนของคุณละเมิดหลักเกณฑ์ชุมชนจำนวนหนึ่งหรือมากกว่าและได้รับการเอาออกโดยผู้ควบคุมของ %{instance} ในเวลาต่อมา
+        delete_statuses: มีการพบว่าโพสต์บางส่วนของคุณละเมิดหลักเกณฑ์ชุมชนจำนวนหนึ่งหรือมากกว่าและได้รับการเอาออกโดยผู้กลั่นกรองของ %{instance} ในเวลาต่อมา
         disable: คุณไม่สามารถใช้บัญชีของคุณได้อีกต่อไป แต่โปรไฟล์และข้อมูลอื่น ๆ ของคุณยังคงอยู่ในสภาพเดิม คุณสามารถขอข้อมูลสำรองของข้อมูลของคุณ เปลี่ยนการตั้งค่าบัญชี หรือลบบัญชีของคุณ
-        mark_statuses_as_sensitive: ทำเครื่องหมายโพสต์บางส่วนของคุณว่าละเอียดอ่อนโดยผู้ควบคุมของ %{instance} แล้ว นี่หมายความว่าผู้คนจะต้องแตะสื่อในโพสต์ก่อนที่จะแสดงตัวอย่าง คุณสามารถทำเครื่องหมายสื่อว่าละเอียดอ่อนด้วยตัวคุณเองเมื่อโพสต์ในอนาคต
+        mark_statuses_as_sensitive: ทำเครื่องหมายโพสต์บางส่วนของคุณว่าละเอียดอ่อนโดยผู้กลั่นกรองของ %{instance} แล้ว นี่หมายความว่าผู้คนจะต้องแตะสื่อในโพสต์ก่อนที่จะแสดงตัวอย่าง คุณสามารถทำเครื่องหมายสื่อว่าละเอียดอ่อนด้วยตัวคุณเองเมื่อโพสต์ในอนาคต
         sensitive: จากนี้ไป จะทำเครื่องหมายไฟล์สื่อที่อัปโหลดทั้งหมดของคุณว่าละเอียดอ่อนและซ่อนอยู่หลังการคลิกไปยังคำเตือน
         silence: คุณยังคงสามารถใช้บัญชีของคุณแต่เฉพาะผู้คนที่กำลังติดตามคุณอยู่แล้วเท่านั้นที่จะเห็นโพสต์ของคุณในเซิร์ฟเวอร์นี้ และอาจไม่รวมคุณอยู่ในคุณลักษณะการค้นพบต่าง ๆ อย่างไรก็ตาม ผู้อื่นอาจยังติดตามคุณด้วยตนเอง
         suspend: คุณไม่สามารถใช้บัญชีของคุณได้อีกต่อไป และจะไม่สามารถเข้าถึงโปรไฟล์และข้อมูลอื่น ๆ ของคุณได้อีกต่อไป คุณยังคงสามารถเข้าสู่ระบบเพื่อขอข้อมูลสำรองของข้อมูลของคุณจนกว่าจะเอาข้อมูลออกอย่างสมบูรณ์ในเวลาประมาณ 30 วัน แต่เราจะเก็บรักษาข้อมูลพื้นฐานบางอย่างไว้เพื่อป้องกันไม่ให้คุณหลบเลี่ยงการระงับ
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index f6e00ba520fd6b..4ba9d4275827c8 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -10,7 +10,7 @@ tr:
     follow: Takip et
     followers:
       one: Takipçi
-      other: Takipçi
+      other: Takipçiler
     following: Takip ediliyor
     instance_actor_flash: Bu hesap, herhangi bir bireysel kullanıcı değil, sunucunun kendisini temsil etmek için kullanılan sanal bir aktördür. Birleştirme amacıyla kullanılmaktadır ve askıya alınmamalıdır.
     last_active: son etkinlik

From 8429d074548c34fc171ccaa802bfbb2bfb6d3d06 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 26 Feb 2024 08:45:39 -0500
Subject: [PATCH 0282/2191] Add `RankedTrend` concern for trends classes
 (#29388)

---
 app/models/concerns/ranked_trend.rb | 29 +++++++++++++++++++++++++++++
 app/models/preview_card_trend.rb    |  2 ++
 app/models/status_trend.rb          |  2 ++
 app/models/trends/links.rb          |  4 ++--
 app/models/trends/statuses.rb       |  4 ++--
 5 files changed, 37 insertions(+), 4 deletions(-)
 create mode 100644 app/models/concerns/ranked_trend.rb

diff --git a/app/models/concerns/ranked_trend.rb b/app/models/concerns/ranked_trend.rb
new file mode 100644
index 00000000000000..add36afb0c2829
--- /dev/null
+++ b/app/models/concerns/ranked_trend.rb
@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module RankedTrend
+  extend ActiveSupport::Concern
+
+  included do
+    scope :by_rank, -> { order(rank: :desc) }
+    scope :ranked_below, ->(value) { where(rank: ..value) }
+  end
+
+  class_methods do
+    def recalculate_ordered_rank
+      connection
+        .exec_update(<<~SQL.squish)
+          UPDATE #{table_name}
+          SET rank = inner_ordered.calculated_rank
+          FROM (
+            SELECT id, row_number() OVER w AS calculated_rank
+            FROM #{table_name}
+            WINDOW w AS (
+              PARTITION BY language
+              ORDER BY score DESC
+            )
+          ) inner_ordered
+          WHERE #{table_name}.id = inner_ordered.id
+        SQL
+    end
+  end
+end
diff --git a/app/models/preview_card_trend.rb b/app/models/preview_card_trend.rb
index 018400dfa99753..da2ea2f8c8caba 100644
--- a/app/models/preview_card_trend.rb
+++ b/app/models/preview_card_trend.rb
@@ -12,6 +12,8 @@
 #  language        :string
 #
 class PreviewCardTrend < ApplicationRecord
+  include RankedTrend
+
   belongs_to :preview_card
   scope :allowed, -> { where(allowed: true) }
 end
diff --git a/app/models/status_trend.rb b/app/models/status_trend.rb
index b0f1b6942ddebb..807efec0ff18cf 100644
--- a/app/models/status_trend.rb
+++ b/app/models/status_trend.rb
@@ -14,6 +14,8 @@
 #
 
 class StatusTrend < ApplicationRecord
+  include RankedTrend
+
   belongs_to :status
   belongs_to :account
 
diff --git a/app/models/trends/links.rb b/app/models/trends/links.rb
index b4eae9f7028c8e..76e50aa7a2ecb0 100644
--- a/app/models/trends/links.rb
+++ b/app/models/trends/links.rb
@@ -81,12 +81,12 @@ def refresh(at_time = Time.now.utc)
 
     # Now that all trends have up-to-date scores, and all the ones below the threshold have
     # been removed, we can recalculate their positions
-    PreviewCardTrend.connection.exec_update('UPDATE preview_card_trends SET rank = t0.calculated_rank FROM (SELECT id, row_number() OVER w AS calculated_rank FROM preview_card_trends WINDOW w AS (PARTITION BY language ORDER BY score DESC)) t0 WHERE preview_card_trends.id = t0.id')
+    PreviewCardTrend.recalculate_ordered_rank
   end
 
   def request_review
     PreviewCardTrend.pluck('distinct language').flat_map do |language|
-      score_at_threshold  = PreviewCardTrend.where(language: language, allowed: true).order(rank: :desc).where('rank <= ?', options[:review_threshold]).first&.score || 0
+      score_at_threshold  = PreviewCardTrend.where(language: language, allowed: true).by_rank.ranked_below(options[:review_threshold]).first&.score || 0
       preview_card_trends = PreviewCardTrend.where(language: language, allowed: false).joins(:preview_card)
 
       preview_card_trends.filter_map do |trend|
diff --git a/app/models/trends/statuses.rb b/app/models/trends/statuses.rb
index c47fb8427b55c2..9be6eb13a5c272 100644
--- a/app/models/trends/statuses.rb
+++ b/app/models/trends/statuses.rb
@@ -74,12 +74,12 @@ def refresh(at_time = Time.now.utc)
 
     # Now that all trends have up-to-date scores, and all the ones below the threshold have
     # been removed, we can recalculate their positions
-    StatusTrend.connection.exec_update('UPDATE status_trends SET rank = t0.calculated_rank FROM (SELECT id, row_number() OVER w AS calculated_rank FROM status_trends WINDOW w AS (PARTITION BY language ORDER BY score DESC)) t0 WHERE status_trends.id = t0.id')
+    StatusTrend.recalculate_ordered_rank
   end
 
   def request_review
     StatusTrend.pluck('distinct language').flat_map do |language|
-      score_at_threshold = StatusTrend.where(language: language, allowed: true).order(rank: :desc).where('rank <= ?', options[:review_threshold]).first&.score || 0
+      score_at_threshold = StatusTrend.where(language: language, allowed: true).by_rank.ranked_below(options[:review_threshold]).first&.score || 0
       status_trends      = StatusTrend.where(language: language, allowed: false).joins(:status).includes(status: :account)
 
       status_trends.filter_map do |trend|

From 10fdd882886c9154a532ce0789c5ad7d6eae6b5e Mon Sep 17 00:00:00 2001
From: Roni Laukkarinen <roni@dude.fi>
Date: Mon, 26 Feb 2024 17:28:38 +0200
Subject: [PATCH 0283/2191] Change new explore compass icon CSS class to
 explore (#29395)

---
 app/javascript/mastodon/features/explore/index.jsx              | 2 +-
 app/javascript/mastodon/features/getting_started/index.jsx      | 2 +-
 .../mastodon/features/ui/components/navigation_panel.jsx        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/javascript/mastodon/features/explore/index.jsx b/app/javascript/mastodon/features/explore/index.jsx
index 8cc8a4b009d20e..d77aec7013e5e9 100644
--- a/app/javascript/mastodon/features/explore/index.jsx
+++ b/app/javascript/mastodon/features/explore/index.jsx
@@ -58,7 +58,7 @@ class Explore extends PureComponent {
     return (
       <Column bindToDocument={!multiColumn} ref={this.setRef} label={intl.formatMessage(messages.title)}>
         <ColumnHeader
-          icon={isSearching ? 'search' : 'hashtag'}
+          icon={isSearching ? 'search' : 'explore'}
           iconComponent={isSearching ? SearchIcon : ExploreIcon}
           title={intl.formatMessage(isSearching ? messages.searchResults : messages.title)}
           onClick={this.handleHeaderClick}
diff --git a/app/javascript/mastodon/features/getting_started/index.jsx b/app/javascript/mastodon/features/getting_started/index.jsx
index 21a5c2a519f812..d84c85806e8aed 100644
--- a/app/javascript/mastodon/features/getting_started/index.jsx
+++ b/app/javascript/mastodon/features/getting_started/index.jsx
@@ -112,7 +112,7 @@ class GettingStarted extends ImmutablePureComponent {
 
     if (showTrends) {
       navItems.push(
-        <ColumnLink key='explore' icon='hashtag' iconComponent={TagIcon} text={intl.formatMessage(messages.explore)} to='/explore' />,
+        <ColumnLink key='explore' icon='explore' iconComponent={TagIcon} text={intl.formatMessage(messages.explore)} to='/explore' />,
       );
     }
 
diff --git a/app/javascript/mastodon/features/ui/components/navigation_panel.jsx b/app/javascript/mastodon/features/ui/components/navigation_panel.jsx
index 8fa149d0b7ec56..4a569881911576 100644
--- a/app/javascript/mastodon/features/ui/components/navigation_panel.jsx
+++ b/app/javascript/mastodon/features/ui/components/navigation_panel.jsx
@@ -94,7 +94,7 @@ class NavigationPanel extends Component {
         )}
 
         {trendsEnabled ? (
-          <ColumnLink transparent to='/explore' icon='hashtag' iconComponent={ExploreIcon} text={intl.formatMessage(messages.explore)} />
+          <ColumnLink transparent to='/explore' icon='explore' iconComponent={ExploreIcon} text={intl.formatMessage(messages.explore)} />
         ) : (
           <ColumnLink transparent to='/search' icon='search' iconComponent={SearchIcon} text={intl.formatMessage(messages.search)} />
         )}

From c7555271a6584d9e7648383641f0c2d9b45ef8fd Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 26 Feb 2024 10:30:58 -0500
Subject: [PATCH 0284/2191] Remove unused `media-spoiler-*` JS/CSS (#29407)

---
 app/javascript/packs/admin.jsx            | 12 ------------
 app/javascript/styles/mastodon/admin.scss | 10 ----------
 2 files changed, 22 deletions(-)

diff --git a/app/javascript/packs/admin.jsx b/app/javascript/packs/admin.jsx
index 817a5d46bc9a3b..343678c184e163 100644
--- a/app/javascript/packs/admin.jsx
+++ b/app/javascript/packs/admin.jsx
@@ -94,18 +94,6 @@ Rails.delegate(document, batchCheckboxClassName, 'change', () => {
   }
 });
 
-Rails.delegate(document, '.media-spoiler-show-button', 'click', () => {
-  [].forEach.call(document.querySelectorAll('button.media-spoiler'), (element) => {
-    element.click();
-  });
-});
-
-Rails.delegate(document, '.media-spoiler-hide-button', 'click', () => {
-  [].forEach.call(document.querySelectorAll('.spoiler-button.spoiler-button--visible button'), (element) => {
-    element.click();
-  });
-});
-
 Rails.delegate(document, '.filter-subset--with-select select', 'change', ({ target }) => {
   target.form.submit();
 });
diff --git a/app/javascript/styles/mastodon/admin.scss b/app/javascript/styles/mastodon/admin.scss
index 3f538d08d6426e..5625cdd5ecce13 100644
--- a/app/javascript/styles/mastodon/admin.scss
+++ b/app/javascript/styles/mastodon/admin.scss
@@ -622,16 +622,6 @@ body,
   input.button {
     margin: 0 5px 5px 0;
   }
-
-  .media-spoiler-toggle-buttons {
-    margin-inline-start: auto;
-
-    .button {
-      overflow: visible;
-      margin: 0 0 5px 5px;
-      float: right;
-    }
-  }
 }
 
 .back-link {

From d51c3ac08753912f58391f1240497e83b10e3076 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Fourn=C3=A8s?= <w.wohanka@gmail.com>
Date: Mon, 26 Feb 2024 17:09:40 +0100
Subject: [PATCH 0285/2191] Add a missing spec to
 `SessionsController#webauthn_options`  (#29277)

---
 .../auth/sessions_controller_spec.rb          | 21 ++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/spec/controllers/auth/sessions_controller_spec.rb b/spec/controllers/auth/sessions_controller_spec.rb
index 7adafc6f1418de..e78554ec7dc3e8 100644
--- a/spec/controllers/auth/sessions_controller_spec.rb
+++ b/spec/controllers/auth/sessions_controller_spec.rb
@@ -414,15 +414,17 @@
   end
 
   describe 'GET #webauthn_options' do
+    subject { get :webauthn_options, session: { attempt_user_id: user.id } }
+
+    let!(:user) do
+      Fabricate(:user, email: 'x@y.com', password: 'abcdefgh', otp_required_for_login: true, otp_secret: User.generate_otp_secret(32))
+    end
+
     context 'with WebAuthn and OTP enabled as second factor' do
       let(:domain) { "#{Rails.configuration.x.use_https ? 'https' : 'http'}://#{Rails.configuration.x.web_domain}" }
 
       let(:fake_client) { WebAuthn::FakeClient.new(domain) }
 
-      let!(:user) do
-        Fabricate(:user, email: 'x@y.com', password: 'abcdefgh', otp_required_for_login: true, otp_secret: User.generate_otp_secret(32))
-      end
-
       before do
         user.update(webauthn_id: WebAuthn.generate_user_id)
         public_key_credential = WebAuthn::Credential.from_create(fake_client.create)
@@ -436,9 +438,18 @@
       end
 
       it 'returns http success' do
-        get :webauthn_options
+        subject
+
         expect(response).to have_http_status 200
       end
     end
+
+    context 'when WebAuthn not enabled' do
+      it 'returns http unauthorized' do
+        subject
+
+        expect(response).to have_http_status 401
+      end
+    end
   end
 end

From 1540f42522c819879c72a97b8b72ed3019440a39 Mon Sep 17 00:00:00 2001
From: Damien Mathieu <42@dmathieu.com>
Date: Mon, 26 Feb 2024 17:09:56 +0100
Subject: [PATCH 0286/2191] Better tests for auth/registrations#update (#29303)

---
 .../auth/registrations_controller_spec.rb     | 72 ++++++++++++++++++-
 1 file changed, 69 insertions(+), 3 deletions(-)

diff --git a/spec/controllers/auth/registrations_controller_spec.rb b/spec/controllers/auth/registrations_controller_spec.rb
index 0b7f02f5900b7b..75ab2876523ea7 100644
--- a/spec/controllers/auth/registrations_controller_spec.rb
+++ b/spec/controllers/auth/registrations_controller_spec.rb
@@ -44,27 +44,93 @@
     end
   end
 
-  describe 'GET #update' do
-    let(:user) { Fabricate(:user) }
+  describe 'PUT #update' do
+    let(:current_password) { 'current password' }
+    let(:user) { Fabricate(:user, password: current_password) }
 
     before do
       request.env['devise.mapping'] = Devise.mappings[:user]
       sign_in(user, scope: :user)
-      post :update
     end
 
     it 'returns http success' do
+      put :update
       expect(response).to have_http_status(200)
     end
 
     it 'returns private cache control headers' do
+      put :update
       expect(response.headers['Cache-Control']).to include('private, no-store')
     end
 
+    it 'can update the user email' do
+      expect do
+        put :update, params: {
+          user: {
+            email: 'newemail@example.com',
+            current_password: current_password,
+          },
+        }
+        expect(response).to redirect_to(edit_user_registration_path)
+      end.to change { user.reload.unconfirmed_email }.to('newemail@example.com')
+    end
+
+    it 'requires the current password to update the email' do
+      expect do
+        put :update, params: {
+          user: {
+            email: 'newemail@example.com',
+            current_password: 'something',
+          },
+        }
+        expect(response).to have_http_status(200)
+      end.to_not(change { user.reload.unconfirmed_email })
+    end
+
+    it 'can update the user password' do
+      expect do
+        put :update, params: {
+          user: {
+            password: 'new password',
+            password_confirmation: 'new password',
+            current_password: current_password,
+          },
+        }
+        expect(response).to redirect_to(edit_user_registration_path)
+      end.to(change { user.reload.encrypted_password })
+    end
+
+    it 'requires the password confirmation' do
+      expect do
+        put :update, params: {
+          user: {
+            password: 'new password',
+            password_confirmation: 'something else',
+            current_password: current_password,
+          },
+        }
+        expect(response).to have_http_status(200)
+      end.to_not(change { user.reload.encrypted_password })
+    end
+
+    it 'requires the current password to update the password' do
+      expect do
+        put :update, params: {
+          user: {
+            password: 'new password',
+            password_confirmation: 'new password',
+            current_password: 'something',
+          },
+        }
+        expect(response).to have_http_status(200)
+      end.to_not(change { user.reload.encrypted_password })
+    end
+
     context 'when suspended' do
       let(:user) { Fabricate(:user, account_attributes: { username: 'test', suspended_at: Time.now.utc }) }
 
       it 'returns http forbidden' do
+        put :update
         expect(response).to have_http_status(403)
       end
     end

From 8156113d58db851d00f8052e66459e6dafb71e82 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 26 Feb 2024 11:27:07 -0500
Subject: [PATCH 0287/2191] Use `response_vary_headers` method in
 requests/cache_spec (#29411)

---
 spec/requests/cache_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/requests/cache_spec.rb b/spec/requests/cache_spec.rb
index dbba228740ab61..c56eec16c535d7 100644
--- a/spec/requests/cache_spec.rb
+++ b/spec/requests/cache_spec.rb
@@ -184,7 +184,7 @@ module DisabledAnonymousAPI
         get '/users/alice'
 
         expect(response).to redirect_to('/@alice')
-        expect(response.headers['Vary']&.split(',')&.map { |x| x.strip.downcase }).to include('accept')
+        expect(response_vary_headers).to include('accept')
       end
     end
 

From f6903d9ab03f43468125e1998a8afd332c48d56b Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Tue, 20 Feb 2024 10:10:44 +0100
Subject: [PATCH 0288/2191] [Glitch] Change explore icon from hashtag to
 compass in web UI

Port b8b2f20b16d92274fc3e576f493d19347f9421da to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/features/explore/index.jsx     | 4 ++--
 .../glitch/features/ui/components/navigation_panel.jsx        | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/javascript/flavours/glitch/features/explore/index.jsx b/app/javascript/flavours/glitch/features/explore/index.jsx
index 9a18ccb72cabaf..3f204ce0bb77dd 100644
--- a/app/javascript/flavours/glitch/features/explore/index.jsx
+++ b/app/javascript/flavours/glitch/features/explore/index.jsx
@@ -9,8 +9,8 @@ import { NavLink, Switch, Route } from 'react-router-dom';
 import { connect } from 'react-redux';
 
 
+import ExploreIcon from '@/material-icons/400-24px/explore.svg?react';
 import SearchIcon from '@/material-icons/400-24px/search.svg?react';
-import TagIcon from '@/material-icons/400-24px/tag.svg?react';
 import Column from 'flavours/glitch/components/column';
 import ColumnHeader from 'flavours/glitch/components/column_header';
 import Search from 'flavours/glitch/features/compose/containers/search_container';
@@ -60,7 +60,7 @@ class Explore extends PureComponent {
       <Column bindToDocument={!multiColumn} ref={this.setRef} label={intl.formatMessage(messages.title)}>
         <ColumnHeader
           icon={isSearching ? 'search' : 'hashtag'}
-          iconComponent={isSearching ? SearchIcon : TagIcon}
+          iconComponent={isSearching ? SearchIcon : ExploreIcon}
           title={intl.formatMessage(isSearching ? messages.searchResults : messages.title)}
           onClick={this.handleHeaderClick}
           multiColumn={multiColumn}
diff --git a/app/javascript/flavours/glitch/features/ui/components/navigation_panel.jsx b/app/javascript/flavours/glitch/features/ui/components/navigation_panel.jsx
index 0bde497c63b3d0..4833c5a7c2528f 100644
--- a/app/javascript/flavours/glitch/features/ui/components/navigation_panel.jsx
+++ b/app/javascript/flavours/glitch/features/ui/components/navigation_panel.jsx
@@ -4,6 +4,7 @@ import { Component } from 'react';
 import { defineMessages, injectIntl } from 'react-intl';
 
 import BookmarksIcon from '@/material-icons/400-24px/bookmarks-fill.svg?react';
+import ExploreIcon from '@/material-icons/400-24px/explore.svg?react';
 import HomeIcon from '@/material-icons/400-24px/home-fill.svg?react';
 import ListAltIcon from '@/material-icons/400-24px/list_alt.svg?react';
 import MailIcon from '@/material-icons/400-24px/mail.svg?react';
@@ -13,7 +14,6 @@ import PublicIcon from '@/material-icons/400-24px/public.svg?react';
 import SearchIcon from '@/material-icons/400-24px/search.svg?react';
 import SettingsIcon from '@/material-icons/400-24px/settings-fill.svg?react';
 import StarIcon from '@/material-icons/400-24px/star-fill.svg?react';
-import TagIcon from '@/material-icons/400-24px/tag.svg?react';
 import { NavigationPortal } from 'flavours/glitch/components/navigation_portal';
 import { timelinePreview, trendsEnabled } from 'flavours/glitch/initial_state';
 import { transientSingleColumn } from 'flavours/glitch/is_mobile';
@@ -91,7 +91,7 @@ class NavigationPanel extends Component {
         )}
 
         {trendsEnabled ? (
-          <ColumnLink transparent to='/explore' icon='hashtag' iconComponent={TagIcon} text={intl.formatMessage(messages.explore)} />
+          <ColumnLink transparent to='/explore' icon='hashtag' iconComponent={ExploreIcon} text={intl.formatMessage(messages.explore)} />
         ) : (
           <ColumnLink transparent to='/search' icon='search' iconComponent={SearchIcon} text={intl.formatMessage(messages.search)} />
         )}

From 658911c268a8460440773271a96cfed34bdd896b Mon Sep 17 00:00:00 2001
From: Roni Laukkarinen <roni@dude.fi>
Date: Mon, 26 Feb 2024 02:57:13 +0200
Subject: [PATCH 0289/2191] [Glitch] Improve alt text form accessibility with
 long texts

Port bbf6cb66f63c23daea725cb2b444a7c9f6c46899 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/styles/components.scss | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index 024911139c11ad..4a2e1890c481be 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -6504,6 +6504,7 @@ a.status-card {
 .report-modal__comment {
   box-sizing: border-box;
   width: 50%;
+  min-width: 50%;
 
   @media screen and (width <= 480px) {
     width: 100%;
@@ -6572,6 +6573,14 @@ a.status-card {
     min-height: 100px;
     max-height: 50vh;
     border: 0;
+
+    @media screen and (height <= 600px) {
+      max-height: 20vh;
+    }
+
+    @media screen and (max-width: $no-columns-breakpoint) {
+      max-height: 20vh;
+    }
   }
 
   .setting-toggle {

From 3fc485927903bfe78f4dd59c62265fc7e74cb6f9 Mon Sep 17 00:00:00 2001
From: Roni Laukkarinen <roni@dude.fi>
Date: Mon, 26 Feb 2024 02:57:48 +0200
Subject: [PATCH 0290/2191] [Glitch] Fix search icon position on mobile

Port 1cb74eeec00b413d326308930c48280b4f8325f4 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/styles/components.scss | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index 4a2e1890c481be..e0c4b3768beebc 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -5720,7 +5720,6 @@ a.status-card {
   .icon {
     position: absolute;
     top: 12px + 2px;
-    inset-inline-start: 16px - 2px;
     display: inline-block;
     opacity: 0;
     transition: all 100ms linear;
@@ -5735,6 +5734,10 @@ a.status-card {
       pointer-events: auto;
       opacity: 1;
     }
+
+    @media screen and (min-width: $no-gap-breakpoint) {
+      inset-inline-start: 16px - 2px;
+    }
   }
 
   .icon-search {

From 20bc633b0cd53308e51f59f2f0c7ae2a2f756786 Mon Sep 17 00:00:00 2001
From: Roni Laukkarinen <roni@dude.fi>
Date: Mon, 26 Feb 2024 17:28:38 +0200
Subject: [PATCH 0291/2191] [Glitch] Change new explore compass icon CSS class
 to explore

Port 10fdd882886c9154a532ce0789c5ad7d6eae6b5e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/features/explore/index.jsx       | 2 +-
 .../flavours/glitch/features/getting_started/index.jsx          | 2 +-
 .../flavours/glitch/features/ui/components/navigation_panel.jsx | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/javascript/flavours/glitch/features/explore/index.jsx b/app/javascript/flavours/glitch/features/explore/index.jsx
index 3f204ce0bb77dd..dca2e59c5c3022 100644
--- a/app/javascript/flavours/glitch/features/explore/index.jsx
+++ b/app/javascript/flavours/glitch/features/explore/index.jsx
@@ -59,7 +59,7 @@ class Explore extends PureComponent {
     return (
       <Column bindToDocument={!multiColumn} ref={this.setRef} label={intl.formatMessage(messages.title)}>
         <ColumnHeader
-          icon={isSearching ? 'search' : 'hashtag'}
+          icon={isSearching ? 'search' : 'explore'}
           iconComponent={isSearching ? SearchIcon : ExploreIcon}
           title={intl.formatMessage(isSearching ? messages.searchResults : messages.title)}
           onClick={this.handleHeaderClick}
diff --git a/app/javascript/flavours/glitch/features/getting_started/index.jsx b/app/javascript/flavours/glitch/features/getting_started/index.jsx
index a3464f146af0d5..d27d134b306eeb 100644
--- a/app/javascript/flavours/glitch/features/getting_started/index.jsx
+++ b/app/javascript/flavours/glitch/features/getting_started/index.jsx
@@ -158,7 +158,7 @@ class GettingStarted extends ImmutablePureComponent {
     }
 
     if (showTrends) {
-      navItems.push(<ColumnLink key='explore' icon='hashtag' iconComponent={TagIcon} text={intl.formatMessage(messages.explore)} to='/explore' />);
+      navItems.push(<ColumnLink key='explore' icon='explore' iconComponent={TagIcon} text={intl.formatMessage(messages.explore)} to='/explore' />);
     }
 
     if (signedIn) {
diff --git a/app/javascript/flavours/glitch/features/ui/components/navigation_panel.jsx b/app/javascript/flavours/glitch/features/ui/components/navigation_panel.jsx
index 4833c5a7c2528f..a6c91a3d443f0d 100644
--- a/app/javascript/flavours/glitch/features/ui/components/navigation_panel.jsx
+++ b/app/javascript/flavours/glitch/features/ui/components/navigation_panel.jsx
@@ -91,7 +91,7 @@ class NavigationPanel extends Component {
         )}
 
         {trendsEnabled ? (
-          <ColumnLink transparent to='/explore' icon='hashtag' iconComponent={ExploreIcon} text={intl.formatMessage(messages.explore)} />
+          <ColumnLink transparent to='/explore' icon='explore' iconComponent={ExploreIcon} text={intl.formatMessage(messages.explore)} />
         ) : (
           <ColumnLink transparent to='/search' icon='search' iconComponent={SearchIcon} text={intl.formatMessage(messages.search)} />
         )}

From 8a80ad7fc41057689bbeac454af2c40e7dc6e86d Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 26 Feb 2024 10:30:58 -0500
Subject: [PATCH 0292/2191] [Glitch] Remove unused `media-spoiler-*` JS/CSS

Port c7555271a6584d9e7648383641f0c2d9b45ef8fd to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/styles/admin.scss | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/app/javascript/flavours/glitch/styles/admin.scss b/app/javascript/flavours/glitch/styles/admin.scss
index 5963f3ee6edeb1..97ea6d98bbd04f 100644
--- a/app/javascript/flavours/glitch/styles/admin.scss
+++ b/app/javascript/flavours/glitch/styles/admin.scss
@@ -643,17 +643,6 @@ body,
     margin-bottom: 5px;
     margin-inline-end: 5px;
   }
-
-  .media-spoiler-toggle-buttons {
-    margin-inline-start: auto;
-
-    .button {
-      overflow: visible;
-      margin-bottom: 5px;
-      margin-inline-start: 5px;
-      float: right;
-    }
-  }
 }
 
 .back-link {

From a30cdfd4d4fdde3245174210b9f7c0a0be7bc122 Mon Sep 17 00:00:00 2001
From: zunda <zundan@gmail.com>
Date: Mon, 26 Feb 2024 12:43:07 -1000
Subject: [PATCH 0293/2191] Specify 410 for code when responding as json while
 self-destruction (#29420)

---
 app/controllers/application_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 5f8725f6fc752d..a046ea19c97d43 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -178,7 +178,7 @@ def check_self_destruct!
 
     respond_to do |format|
       format.any  { render 'errors/self_destruct', layout: 'auth', status: 410, formats: [:html] }
-      format.json { render json: { error: Rack::Utils::HTTP_STATUS_CODES[410] }, status: code }
+      format.json { render json: { error: Rack::Utils::HTTP_STATUS_CODES[410] }, status: 410 }
     end
   end
 

From 213c87ae595cc1ddcb618516106712b0aae789bd Mon Sep 17 00:00:00 2001
From: Evan Paterakis <evan@geopjr.dev>
Date: Tue, 27 Feb 2024 12:46:58 +0200
Subject: [PATCH 0294/2191] Fix filters title and keywords overflow (#29396)

---
 app/javascript/styles/mastodon/admin.scss | 1 +
 app/javascript/styles/mastodon/forms.scss | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/javascript/styles/mastodon/admin.scss b/app/javascript/styles/mastodon/admin.scss
index 5625cdd5ecce13..fcd630c23c9ecc 100644
--- a/app/javascript/styles/mastodon/admin.scss
+++ b/app/javascript/styles/mastodon/admin.scss
@@ -1044,6 +1044,7 @@ a.name-tag,
     display: flex;
     justify-content: space-between;
     margin-bottom: 0;
+    word-break: break-word;
   }
 
   &__permissions {
diff --git a/app/javascript/styles/mastodon/forms.scss b/app/javascript/styles/mastodon/forms.scss
index 555d43cc1c4466..3ac5c3df959298 100644
--- a/app/javascript/styles/mastodon/forms.scss
+++ b/app/javascript/styles/mastodon/forms.scss
@@ -1078,6 +1078,7 @@ code {
 
       &__type {
         color: $darker-text-color;
+        word-break: break-word;
       }
     }
 

From 9fa7338b6e5921e184cd23c21df40a08940d03de Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 27 Feb 2024 05:48:38 -0500
Subject: [PATCH 0295/2191] Use `github` reporter on `haml-lint` runs on CI
 (#29375)

---
 .github/workflows/lint-haml.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/lint-haml.yml b/.github/workflows/lint-haml.yml
index 8dcab845ee085c..25615b720d45ad 100644
--- a/.github/workflows/lint-haml.yml
+++ b/.github/workflows/lint-haml.yml
@@ -36,4 +36,4 @@ jobs:
       - name: Run haml-lint
         run: |
           echo "::add-matcher::.github/workflows/haml-lint-problem-matcher.json"
-          bundle exec haml-lint
+          bundle exec haml-lint --reporter github

From 90573c3abbc0783c25cb4e3aa8c298e10259cb57 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 27 Feb 2024 12:41:19 +0100
Subject: [PATCH 0296/2191] Change behavior of privacy dropdown to only change
 value on validation (#29406)

---
 .../compose/components/language_dropdown.jsx  |   1 +
 .../compose/components/privacy_dropdown.jsx   | 124 +----------------
 .../components/privacy_dropdown_menu.jsx      | 128 ++++++++++++++++++
 3 files changed, 131 insertions(+), 122 deletions(-)
 create mode 100644 app/javascript/mastodon/features/compose/components/privacy_dropdown_menu.jsx

diff --git a/app/javascript/mastodon/features/compose/components/language_dropdown.jsx b/app/javascript/mastodon/features/compose/components/language_dropdown.jsx
index 85057799be2fa7..c3bd908a4ebe06 100644
--- a/app/javascript/mastodon/features/compose/components/language_dropdown.jsx
+++ b/app/javascript/mastodon/features/compose/components/language_dropdown.jsx
@@ -141,6 +141,7 @@ class LanguageDropdownMenu extends PureComponent {
     case 'Escape':
       onClose();
       break;
+    case ' ':
     case 'Enter':
       this.handleClick(e);
       break;
diff --git a/app/javascript/mastodon/features/compose/components/privacy_dropdown.jsx b/app/javascript/mastodon/features/compose/components/privacy_dropdown.jsx
index 82f902738891d8..071f0a6fabf399 100644
--- a/app/javascript/mastodon/features/compose/components/privacy_dropdown.jsx
+++ b/app/javascript/mastodon/features/compose/components/privacy_dropdown.jsx
@@ -5,16 +5,16 @@ import { injectIntl, defineMessages } from 'react-intl';
 
 import classNames from 'classnames';
 
-import { supportsPassiveEvents } from 'detect-passive-events';
 import Overlay from 'react-overlays/Overlay';
 
 import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
-import InfoIcon from '@/material-icons/400-24px/info.svg?react';
 import LockIcon from '@/material-icons/400-24px/lock.svg?react';
 import PublicIcon from '@/material-icons/400-24px/public.svg?react';
 import QuietTimeIcon from '@/material-icons/400-24px/quiet_time.svg?react';
 import { Icon }  from 'mastodon/components/icon';
 
+import { PrivacyDropdownMenu } from './privacy_dropdown_menu';
+
 const messages = defineMessages({
   public_short: { id: 'privacy.public.short', defaultMessage: 'Public' },
   public_long: { id: 'privacy.public.long', defaultMessage: 'Anyone on and off Mastodon' },
@@ -28,126 +28,6 @@ const messages = defineMessages({
   unlisted_extra: { id: 'privacy.unlisted.additional', defaultMessage: 'This behaves exactly like public, except the post will not appear in live feeds or hashtags, explore, or Mastodon search, even if you are opted-in account-wide.' },
 });
 
-const listenerOptions = supportsPassiveEvents ? { passive: true, capture: true } : true;
-
-class PrivacyDropdownMenu extends PureComponent {
-
-  static propTypes = {
-    style: PropTypes.object,
-    items: PropTypes.array.isRequired,
-    value: PropTypes.string.isRequired,
-    onClose: PropTypes.func.isRequired,
-    onChange: PropTypes.func.isRequired,
-  };
-
-  handleDocumentClick = e => {
-    if (this.node && !this.node.contains(e.target)) {
-      this.props.onClose();
-      e.stopPropagation();
-    }
-  };
-
-  handleKeyDown = e => {
-    const { items } = this.props;
-    const value = e.currentTarget.getAttribute('data-index');
-    const index = items.findIndex(item => {
-      return (item.value === value);
-    });
-    let element = null;
-
-    switch(e.key) {
-    case 'Escape':
-      this.props.onClose();
-      break;
-    case 'Enter':
-      this.handleClick(e);
-      break;
-    case 'ArrowDown':
-      element = this.node.childNodes[index + 1] || this.node.firstChild;
-      break;
-    case 'ArrowUp':
-      element = this.node.childNodes[index - 1] || this.node.lastChild;
-      break;
-    case 'Tab':
-      if (e.shiftKey) {
-        element = this.node.childNodes[index - 1] || this.node.lastChild;
-      } else {
-        element = this.node.childNodes[index + 1] || this.node.firstChild;
-      }
-      break;
-    case 'Home':
-      element = this.node.firstChild;
-      break;
-    case 'End':
-      element = this.node.lastChild;
-      break;
-    }
-
-    if (element) {
-      element.focus();
-      this.props.onChange(element.getAttribute('data-index'));
-      e.preventDefault();
-      e.stopPropagation();
-    }
-  };
-
-  handleClick = e => {
-    const value = e.currentTarget.getAttribute('data-index');
-
-    e.preventDefault();
-
-    this.props.onClose();
-    this.props.onChange(value);
-  };
-
-  componentDidMount () {
-    document.addEventListener('click', this.handleDocumentClick, { capture: true });
-    document.addEventListener('touchend', this.handleDocumentClick, listenerOptions);
-    if (this.focusedItem) this.focusedItem.focus({ preventScroll: true });
-  }
-
-  componentWillUnmount () {
-    document.removeEventListener('click', this.handleDocumentClick, { capture: true });
-    document.removeEventListener('touchend', this.handleDocumentClick, listenerOptions);
-  }
-
-  setRef = c => {
-    this.node = c;
-  };
-
-  setFocusRef = c => {
-    this.focusedItem = c;
-  };
-
-  render () {
-    const { style, items, value } = this.props;
-
-    return (
-      <div style={{ ...style }} role='listbox' ref={this.setRef}>
-        {items.map(item => (
-          <div role='option' tabIndex={0} key={item.value} data-index={item.value} onKeyDown={this.handleKeyDown} onClick={this.handleClick} className={classNames('privacy-dropdown__option', { active: item.value === value })} aria-selected={item.value === value} ref={item.value === value ? this.setFocusRef : null}>
-            <div className='privacy-dropdown__option__icon'>
-              <Icon id={item.icon} icon={item.iconComponent} />
-            </div>
-
-            <div className='privacy-dropdown__option__content'>
-              <strong>{item.text}</strong>
-              {item.meta}
-            </div>
-
-            {item.extra && (
-              <div className='privacy-dropdown__option__additional' title={item.extra}>
-                <Icon id='info-circle' icon={InfoIcon} />
-              </div>
-            )}
-          </div>
-        ))}
-      </div>
-    );
-  }
-
-}
-
 class PrivacyDropdown extends PureComponent {
 
   static propTypes = {
diff --git a/app/javascript/mastodon/features/compose/components/privacy_dropdown_menu.jsx b/app/javascript/mastodon/features/compose/components/privacy_dropdown_menu.jsx
new file mode 100644
index 00000000000000..1a5ff1fa803b03
--- /dev/null
+++ b/app/javascript/mastodon/features/compose/components/privacy_dropdown_menu.jsx
@@ -0,0 +1,128 @@
+import PropTypes from 'prop-types';
+import { useCallback, useEffect, useRef, useState } from 'react';
+
+import classNames from 'classnames';
+
+import { supportsPassiveEvents } from 'detect-passive-events';
+
+import InfoIcon from '@/material-icons/400-24px/info.svg?react';
+import { Icon } from 'mastodon/components/icon';
+
+const listenerOptions = supportsPassiveEvents ? { passive: true, capture: true } : true;
+
+export const PrivacyDropdownMenu = ({ style, items, value, onClose, onChange }) => {
+  const nodeRef = useRef(null);
+  const focusedItemRef = useRef(null);
+  const [currentValue, setCurrentValue] = useState(value);
+
+  const handleDocumentClick = useCallback((e) => {
+    if (nodeRef.current && !nodeRef.current.contains(e.target)) {
+      onClose();
+      e.stopPropagation();
+    }
+  }, [nodeRef, onClose]);
+
+  const handleClick = useCallback((e) => {
+    const value = e.currentTarget.getAttribute('data-index');
+
+    e.preventDefault();
+
+    onClose();
+    onChange(value);
+  }, [onClose, onChange]);
+
+  const handleKeyDown = useCallback((e) => {
+    const value = e.currentTarget.getAttribute('data-index');
+    const index = items.findIndex(item => (item.value === value));
+
+    let element = null;
+
+    switch (e.key) {
+    case 'Escape':
+      onClose();
+      break;
+    case ' ':
+    case 'Enter':
+      handleClick(e);
+      break;
+    case 'ArrowDown':
+      element = nodeRef.current.childNodes[index + 1] || nodeRef.current.firstChild;
+      break;
+    case 'ArrowUp':
+      element = nodeRef.current.childNodes[index - 1] || nodeRef.current.lastChild;
+      break;
+    case 'Tab':
+      if (e.shiftKey) {
+        element = nodeRef.current.childNodes[index + 1] || nodeRef.current.firstChild;
+      } else {
+        element = nodeRef.current.childNodes[index - 1] || nodeRef.current.lastChild;
+      }
+      break;
+    case 'Home':
+      element = nodeRef.current.firstChild;
+      break;
+    case 'End':
+      element = nodeRef.current.lastChild;
+      break;
+    }
+
+    if (element) {
+      element.focus();
+      setCurrentValue(element.getAttribute('data-index'));
+      e.preventDefault();
+      e.stopPropagation();
+    }
+  }, [nodeRef, items, onClose, handleClick, setCurrentValue]);
+
+  useEffect(() => {
+    document.addEventListener('click', handleDocumentClick, { capture: true });
+    document.addEventListener('touchend', handleDocumentClick, listenerOptions);
+    focusedItemRef.current?.focus({ preventScroll: true });
+
+    return () => {
+      document.removeEventListener('click', handleDocumentClick, { capture: true });
+      document.removeEventListener('touchend', handleDocumentClick, listenerOptions);
+    };
+  }, [handleDocumentClick]);
+
+  return (
+    <ul style={{ ...style }} role='listbox' ref={nodeRef}>
+      {items.map(item => (
+        <li
+          role='option'
+          tabIndex={0}
+          key={item.value}
+          data-index={item.value}
+          onKeyDown={handleKeyDown}
+          onClick={handleClick}
+          className={classNames('privacy-dropdown__option', { active: item.value === currentValue })}
+          aria-selected={item.value === currentValue}
+          ref={item.value === currentValue ? focusedItemRef : null}
+        >
+          <div className='privacy-dropdown__option__icon'>
+            <Icon id={item.icon} icon={item.iconComponent} />
+          </div>
+
+          <div className='privacy-dropdown__option__content'>
+            <strong>{item.text}</strong>
+            {item.meta}
+          </div>
+
+          {item.extra && (
+            <div className='privacy-dropdown__option__additional' title={item.extra}>
+              <Icon id='info-circle' icon={InfoIcon} />
+            </div>
+          )}
+        </li>
+      ))}
+    </ul>
+  );
+};
+
+PrivacyDropdownMenu.propTypes = {
+  style: PropTypes.object,
+  items: PropTypes.array.isRequired,
+  value: PropTypes.string.isRequired,
+  onClose: PropTypes.func.isRequired,
+  onChange: PropTypes.func.isRequired,
+};

From 54e3a82f1d5248ff91a297d6d06de9f86e9cd208 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 27 Feb 2024 12:48:42 +0100
Subject: [PATCH 0297/2191] Update dependency thor to v1.3.1 (#29421)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 090697e709968d..076cf915d05bfd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -744,7 +744,7 @@ GEM
     terrapin (1.0.1)
       climate_control
     test-prof (1.3.1)
-    thor (1.3.0)
+    thor (1.3.1)
     tilt (2.3.0)
     timeout (0.4.1)
     tpm-key_attestation (0.12.0)

From 9e78129e6e45e9485f567a88cb4b3dbc0b25a7d2 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 27 Feb 2024 06:50:21 -0500
Subject: [PATCH 0298/2191] Use "cacheable response" shared example in more
 places (#29419)

---
 spec/controllers/custom_css_controller_spec.rb   | 13 +------------
 .../instance_actors_controller_spec.rb           | 13 ++++---------
 spec/controllers/manifests_controller_spec.rb    | 13 +------------
 spec/controllers/tags_controller_spec.rb         | 16 ++--------------
 spec/support/examples/cache.rb                   |  2 +-
 5 files changed, 9 insertions(+), 48 deletions(-)

diff --git a/spec/controllers/custom_css_controller_spec.rb b/spec/controllers/custom_css_controller_spec.rb
index 99d36d21b9862b..405fa0bcf35c53 100644
--- a/spec/controllers/custom_css_controller_spec.rb
+++ b/spec/controllers/custom_css_controller_spec.rb
@@ -14,17 +14,6 @@
       expect(response).to have_http_status(200)
     end
 
-    it 'returns public cache control header' do
-      expect(response.headers['Cache-Control']).to include('public')
-    end
-
-    it 'does not set cookies' do
-      expect(response.cookies).to be_empty
-      expect(response.headers['Set-Cookies']).to be_nil
-    end
-
-    it 'does not set sessions' do
-      expect(session).to be_empty
-    end
+    it_behaves_like 'cacheable response'
   end
 end
diff --git a/spec/controllers/instance_actors_controller_spec.rb b/spec/controllers/instance_actors_controller_spec.rb
index be1eefa7b22747..70aaff9d65b098 100644
--- a/spec/controllers/instance_actors_controller_spec.rb
+++ b/spec/controllers/instance_actors_controller_spec.rb
@@ -12,23 +12,18 @@
           get :show, params: { format: format }
         end
 
-        it 'returns http success with correct media type, headers, and session values' do
+        it 'returns http success with correct media type and body' do
           expect(response)
             .to have_http_status(200)
             .and have_attributes(
-              media_type: eq('application/activity+json'),
-              cookies: be_empty
+              media_type: eq('application/activity+json')
             )
 
-          expect(response.headers)
-            .to include('Cache-Control' => include('public'))
-            .and not_include('Set-Cookies')
-
-          expect(session).to be_empty
-
           expect(body_as_json)
             .to include(:id, :type, :preferredUsername, :inbox, :publicKey, :inbox, :outbox, :url)
         end
+
+        it_behaves_like 'cacheable response'
       end
 
       before do
diff --git a/spec/controllers/manifests_controller_spec.rb b/spec/controllers/manifests_controller_spec.rb
index d0699c438b81a1..9279fae0245561 100644
--- a/spec/controllers/manifests_controller_spec.rb
+++ b/spec/controllers/manifests_controller_spec.rb
@@ -14,17 +14,6 @@
       expect(response).to have_http_status(200)
     end
 
-    it 'returns public cache control header' do
-      expect(response.headers['Cache-Control']).to include('public')
-    end
-
-    it 'does not set cookies' do
-      expect(response.cookies).to be_empty
-      expect(response.headers['Set-Cookies']).to be_nil
-    end
-
-    it 'does not set sessions' do
-      expect(session).to be_empty
-    end
+    it_behaves_like 'cacheable response'
   end
 end
diff --git a/spec/controllers/tags_controller_spec.rb b/spec/controllers/tags_controller_spec.rb
index d41e707d432302..2bb0c8de3b05d9 100644
--- a/spec/controllers/tags_controller_spec.rb
+++ b/spec/controllers/tags_controller_spec.rb
@@ -20,13 +20,7 @@
           expect(response).to have_http_status(200)
         end
 
-        it 'returns Vary header' do
-          expect(response.headers['Vary']).to eq 'Accept, Accept-Language, Cookie'
-        end
-
-        it 'returns public Cache-Control header' do
-          expect(response.headers['Cache-Control']).to include 'public'
-        end
+        it_behaves_like 'cacheable response', expects_vary: 'Accept, Accept-Language, Cookie'
       end
 
       context 'when requested as JSON' do
@@ -36,13 +30,7 @@
           expect(response).to have_http_status(200)
         end
 
-        it 'returns Vary header' do
-          expect(response.headers['Vary']).to eq 'Accept, Accept-Language, Cookie'
-        end
-
-        it 'returns public Cache-Control header' do
-          expect(response.headers['Cache-Control']).to include 'public'
-        end
+        it_behaves_like 'cacheable response', expects_vary: 'Accept, Accept-Language, Cookie'
       end
     end
 
diff --git a/spec/support/examples/cache.rb b/spec/support/examples/cache.rb
index afbee66b2d357a..60e522f4269311 100644
--- a/spec/support/examples/cache.rb
+++ b/spec/support/examples/cache.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 shared_examples 'cacheable response' do |expects_vary: false|
-  it 'sets correct cache and vary headers and does not set cookies or session' do
+  it 'sets correct cache and vary headers and does not set cookies or session', :aggregate_failures do
     expect(response.cookies).to be_empty
     expect(response.headers['Set-Cookies']).to be_nil
 

From 76d256138e6029d848da7cfdf5b8682832c44033 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 27 Feb 2024 06:52:37 -0500
Subject: [PATCH 0299/2191] Wrap media attachment size calculation in
 `COALESCE` (#29415)

---
 .../admin/metrics/measure/instance_media_attachments_measure.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/lib/admin/metrics/measure/instance_media_attachments_measure.rb b/app/lib/admin/metrics/measure/instance_media_attachments_measure.rb
index 2d4b5f56b01e91..1d2dbbe4146a86 100644
--- a/app/lib/admin/metrics/measure/instance_media_attachments_measure.rb
+++ b/app/lib/admin/metrics/measure/instance_media_attachments_measure.rb
@@ -50,7 +50,7 @@ def sql_query_string
           WHERE date_trunc('day', media_attachments.created_at)::date = axis.period
             AND #{account_domain_sql(params[:include_subdomains])}
         )
-        SELECT SUM(size) FROM new_media_attachments
+        SELECT COALESCE(SUM(size), 0) FROM new_media_attachments
       ) AS value
       FROM (
         SELECT generate_series(date_trunc('day', :start_at::timestamp)::date, date_trunc('day', :end_at::timestamp)::date, interval '1 day') AS period

From bc4c5ed91883439e5de9ef034b6875c36f4b4241 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 27 Feb 2024 15:53:53 +0100
Subject: [PATCH 0300/2191] New Crowdin Translations (automated) (#29423)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/nn.json | 30 ++++++++++++++++---------
 config/locales/devise.nn.yml            | 19 ++++++++--------
 config/locales/nn.yml                   | 22 +++++++++---------
 config/locales/simple_form.nn.yml       | 18 ++++++++-------
 4 files changed, 51 insertions(+), 38 deletions(-)

diff --git a/app/javascript/mastodon/locales/nn.json b/app/javascript/mastodon/locales/nn.json
index 2118eb57398f7c..3cc537f54f0121 100644
--- a/app/javascript/mastodon/locales/nn.json
+++ b/app/javascript/mastodon/locales/nn.json
@@ -40,7 +40,7 @@
   "account.following_counter": "{count, plural, one {Fylgjer {counter}} other {Fylgjer {counter}}}",
   "account.follows.empty": "Denne brukaren fylgjer ikkje nokon enno.",
   "account.go_to_profile": "Gå til profil",
-  "account.hide_reblogs": "Skjul framhevingar frå @{name}",
+  "account.hide_reblogs": "Gøym framhevingar frå @{name}",
   "account.in_memoriam": "Til minne om.",
   "account.joined_short": "Vart med",
   "account.languages": "Endre språktingingar",
@@ -113,7 +113,7 @@
   "column.community": "Lokal tidsline",
   "column.direct": "Private omtaler",
   "column.directory": "Sjå gjennom profilar",
-  "column.domain_blocks": "Skjulte domene",
+  "column.domain_blocks": "Blokkerte domene",
   "column.favourites": "Favorittar",
   "column.firehose": "Tidslinjer",
   "column.follow_requests": "Fylgjeførespurnadar",
@@ -124,7 +124,7 @@
   "column.pins": "Festa tut",
   "column.public": "Samla tidsline",
   "column_back_button.label": "Attende",
-  "column_header.hide_settings": "Gøym innstillingar",
+  "column_header.hide_settings": "Gøym innstillingane",
   "column_header.moveLeft_settings": "Flytt kolonne til venstre",
   "column_header.moveRight_settings": "Flytt kolonne til høgre",
   "column_header.pin": "Fest",
@@ -171,14 +171,14 @@
   "confirmations.delete_list.message": "Er du sikker på at du vil sletta denne lista for alltid?",
   "confirmations.discard_edit_media.confirm": "Forkast",
   "confirmations.discard_edit_media.message": "Du har ulagra endringar i mediaskildringa eller førehandsvisinga. Vil du forkasta dei likevel?",
-  "confirmations.domain_block.confirm": "Skjul alt frå domenet",
+  "confirmations.domain_block.confirm": "Blokker heile domenet",
   "confirmations.domain_block.message": "Er du heilt, heilt sikker på at du vil skjula heile {domain}? I dei fleste tilfelle er det godt nok og føretrekt med nokre få målretta blokkeringar eller målbindingar. Du kjem ikkje til å sjå innhald frå domenet i fødererte tidsliner eller i varsla dine. Fylgjarane dine frå domenet vert fjerna.",
   "confirmations.edit.confirm": "Rediger",
   "confirmations.edit.message": "Å redigera no vil overskriva den meldinga du er i ferd med å skriva. Er du sikker på at du vil halda fram?",
   "confirmations.logout.confirm": "Logg ut",
   "confirmations.logout.message": "Er du sikker på at du vil logga ut?",
   "confirmations.mute.confirm": "Målbind",
-  "confirmations.mute.explanation": "Dette vil skjula innlegg som kjem frå og som nemner dei, men vil framleis la dei sjå innlegga dine og fylgje deg.",
+  "confirmations.mute.explanation": "Dette vil gøyma innlegga deira og innlegg som nemner dei, men dei vil framleis kunna sjå innlegga dine og fylgja deg.",
   "confirmations.mute.message": "Er du sikker på at du vil målbinda {name}?",
   "confirmations.redraft.confirm": "Slett & skriv på nytt",
   "confirmations.redraft.message": "Er du sikker på at du vil sletta denne statusen og skriva han på nytt? Då misser du favorittar og framhevingar, og svar til det opprinnelege innlegget vert foreldrelause.",
@@ -230,7 +230,7 @@
   "empty_column.bookmarked_statuses": "Du har ikkje lagra noko bokmerke enno. Når du set bokmerke på eit innlegg, dukkar det opp her.",
   "empty_column.community": "Den lokale tidslina er tom. Skriv noko offentleg å få ballen til å rulle!",
   "empty_column.direct": "Du har ingen private omtaler enda. Etter du har sendt eller mottatt en, så vil den dukke opp her.",
-  "empty_column.domain_blocks": "Det er ingen skjulte domene til no.",
+  "empty_column.domain_blocks": "Det er ingen blokkerte domene enno.",
   "empty_column.explore_statuses": "Ingenting er i støytet nett no. Prøv igjen seinare!",
   "empty_column.favourited_statuses": "Du har ingen favoritt-statusar ennå. Når du merkjer ein som favoritt, dukkar han opp her.",
   "empty_column.favourites": "Ingen har merkt denne statusen som favoritt enno. Når nokon gjer det, dukkar dei opp her.",
@@ -277,7 +277,13 @@
   "follow_request.authorize": "Autoriser",
   "follow_request.reject": "Avvis",
   "follow_requests.unlocked_explanation": "Sjølv om kontoen din ikkje er låst tenkte dei som driv {domain} at du kanskje ville gå gjennom førespurnadar frå desse kontoane manuelt.",
+  "follow_suggestions.curated_suggestion": "Utvalt av staben",
   "follow_suggestions.dismiss": "Ikkje vis igjen",
+  "follow_suggestions.hints.featured": "Denne profilen er handplukka av folka på {domain}.",
+  "follow_suggestions.hints.friends_of_friends": "Denne profilen er populær hjå dei du fylgjer.",
+  "follow_suggestions.hints.most_followed": "Mange på {domain} fylgjer denne profilen.",
+  "follow_suggestions.hints.most_interactions": "Denne profilen har nyss fått mykje merksemd på {domain}.",
+  "follow_suggestions.hints.similar_to_recently_followed": "Denne profilen liknar på dei andre profilane du har fylgt i det siste.",
   "follow_suggestions.personalized_suggestion": "Personleg forslag",
   "follow_suggestions.popular_suggestion": "Populært forslag",
   "follow_suggestions.view_all": "Vis alle",
@@ -395,7 +401,7 @@
   "media_gallery.toggle_visible": "{number, plural, one {Skjul bilete} other {Skjul bilete}}",
   "moved_to_account_banner.text": "Kontoen din, {disabledAccount} er for tida deaktivert fordi du har flytta til {movedToAccount}.",
   "mute_modal.duration": "Varigheit",
-  "mute_modal.hide_notifications": "Skjul varsel frå denne brukaren?",
+  "mute_modal.hide_notifications": "Gøym varsel frå denne brukaren?",
   "mute_modal.indefinite": "På ubestemt tid",
   "navigation_bar.about": "Om",
   "navigation_bar.advanced_interface": "Opne i avansert nettgrensesnitt",
@@ -479,7 +485,8 @@
   "onboarding.follows.empty": "Me kan ikkje visa deg nokon resultat no. Du kan prøva å søkja eller bla gjennom utforsk-sida for å finna folk å fylgja, eller du kan prøva att seinare.",
   "onboarding.follows.lead": "You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!",
   "onboarding.follows.title": "Popular on Mastodon",
-  "onboarding.profile.discoverable": "Gjør min profil synlig",
+  "onboarding.profile.discoverable": "Gjer profilen min synleg",
+  "onboarding.profile.discoverable_hint": "Når du vel å gjera profilen din synleg på Mastodon, vil innlegga dine syna i søkjeresultat og populære innlegg, og profilen din kan bli føreslegen for folk med liknande interesser som deg.",
   "onboarding.profile.display_name": "Synleg namn",
   "onboarding.profile.display_name_hint": "Det fulle namnet eller kallenamnet ditt…",
   "onboarding.profile.lead": "Du kan alltid fullføra dette seinare i innstillingane, og der er det endå fleire tilpassingsalternativ.",
@@ -528,11 +535,12 @@
   "privacy.private.short": "Følgjarar",
   "privacy.public.long": "Kven som helst på og av Mastodon",
   "privacy.public.short": "Offentleg",
+  "privacy.unlisted.additional": "Dette er akkurat som offentleg, bortsett frå at innlegga ikkje dukkar opp i direktestraumar eller merkelappar, i oppdagingar eller Mastodon-søk, sjølv om du har sagt ja til at kontoen skal vera synleg.",
   "privacy.unlisted.long": "Færre algoritmiske fanfarar",
   "privacy.unlisted.short": "Stille offentleg",
   "privacy_policy.last_updated": "Sist oppdatert {date}",
   "privacy_policy.title": "Personvernsreglar",
-  "recommended": "Anbefalt",
+  "recommended": "Tilrådd",
   "refresh": "Oppdater",
   "regeneration_indicator.label": "Lastar…",
   "regeneration_indicator.sublabel": "Heimetidslina di vert førebudd!",
@@ -605,7 +613,7 @@
   "search.quick_action.status_search": "Innlegg som samsvarer med {x}",
   "search.search_or_paste": "Søk eller lim inn URL",
   "search_popout.full_text_search_disabled_message": "Ikkje tilgjengeleg på {domain}.",
-  "search_popout.full_text_search_logged_out_message": "Bare tilgjengelig når man er logget inn.",
+  "search_popout.full_text_search_logged_out_message": "Berre tilgjengeleg når du er logga inn.",
   "search_popout.language_code": "ISO-språkkode",
   "search_popout.options": "Søkjealternativ",
   "search_popout.quick_actions": "Hurtighandlinger",
@@ -654,7 +662,7 @@
   "status.load_more": "Last inn meir",
   "status.media.open": "Klikk for å opne",
   "status.media.show": "Klikk for å vise",
-  "status.media_hidden": "Medium gøymd",
+  "status.media_hidden": "Mediet er gøymt",
   "status.mention": "Nemn @{name}",
   "status.more": "Meir",
   "status.mute": "Målbind @{name}",
diff --git a/config/locales/devise.nn.yml b/config/locales/devise.nn.yml
index 96920d42b58622..01d6e5a468d390 100644
--- a/config/locales/devise.nn.yml
+++ b/config/locales/devise.nn.yml
@@ -12,6 +12,7 @@ nn:
       last_attempt: Du har eitt forsøk igjen før kontoen din vert låst.
       locked: Kontoen din er låst.
       not_found_in_database: Ugyldig %{authentication_keys} eller passord.
+      omniauth_user_creation_failure: Greidde ikkje laga konto for denne identiteten.
       pending: Kontoen din er vert gjennomgått enno.
       timeout: Økta di er utgått. Logg inn omatt for å halde fram.
       unauthenticated: Du må logge inn eller registere deg før du kan halde fram.
@@ -47,19 +48,19 @@ nn:
         subject: 'Mastodon: Instuksjonar for å endra passord'
         title: Attstilling av passord
       two_factor_disabled:
-        explanation: Innlogging er nå mulig med kun e-postadresse og passord.
+        explanation: No kan du logga inn med berre epostadresse og passord.
         subject: 'Mastodon: To-faktor-autentisering deaktivert'
-        subtitle: To-faktor autentisering for din konto har blitt deaktivert.
+        subtitle: Tofaktorinnlogging for denne kontoen er skrudd av.
         title: 2FA deaktivert
       two_factor_enabled:
-        explanation: En token generert av den sammenkoblede TOTP-appen vil være påkrevd for innlogging.
+        explanation: Du treng ein kode frå den tilkopla tofaktor-appen din for å logga inn.
         subject: 'Mastodon: To-faktor-autentisering aktivert'
-        subtitle: Tofaktorautentisering er aktivert for din konto.
+        subtitle: Tofaktorpålogging er skrudd på for kontoen din.
         title: 2FA aktivert
       two_factor_recovery_codes_changed:
         explanation: Dei førre gjenopprettingskodane er ugyldige og nye er genererte.
         subject: 'Mastodon: To-faktor-gjenopprettingskodar har vorte genererte på nytt'
-        subtitle: De forrige gjenopprettingskodene er gjort ugyldige og nye er generert.
+        subtitle: Dei førre innloggingskodane er ikkje gyldige lenger, og nye kodar er laga.
         title: 2FA-gjenopprettingskodane er endra
       unlock_instructions:
         subject: 'Mastodon: Instruksjonar for å opne kontoen igjen'
@@ -73,13 +74,13 @@ nn:
           subject: 'Mastodon: Sikkerheitsnøkkel sletta'
           title: Ein av sikkerheitsnøklane dine har blitt sletta
       webauthn_disabled:
-        explanation: Autentisering med sikkerhetsnøkler er deaktivert for kontoen din.
-        extra: Innlogging er nå mulig med kun tilgangstoken generert av den sammenkoblede TOTP-appen.
+        explanation: Innlogging med tryggingsnykjel er skrudd av for kontoen din.
+        extra: No kan du logga inn med berre kodane som er laga av den tilkopla tofaktor-appen din.
         subject: 'Mastodon: Autentisering med sikkerheitsnøklar vart skrudd av'
         title: Sikkerheitsnøklar deaktivert
       webauthn_enabled:
-        explanation: Sikkerhetsnøkkelautentisering har blitt aktivert for kontoen din.
-        extra: Sikkerhetsnøkkelen din kan nå bli brukt for innlogging.
+        explanation: Innlogging med tryggingsnyklar er skrudd på for kontoen din.
+        extra: No kan du bruka tryggingsnykjelen din for å logga inn.
         subject: 'Mastodon: Sikkerheitsnøkkelsautentisering vart skrudd på'
         title: Sikkerheitsnøklar aktivert
     omniauth_callbacks:
diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index b1ae928997bb79..1524b6f7c13d2a 100644
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -31,7 +31,7 @@ nn:
       created_msg: Moderatormerknad er laga!
       destroyed_msg: Moderatormerknad er utsletta!
     accounts:
-      add_email_domain_block: Gøym e-postdomene
+      add_email_domain_block: Blokker e-postdomene
       approve: Godtak
       approved_msg: Godkjende %{username} sin registreringssøknad
       are_you_sure: Er du sikker?
@@ -767,13 +767,15 @@ nn:
         disabled: Til ingen
         users: Til lokale brukarar som er logga inn
       registrations:
+        moderation_recommandation: Pass på at du har mange og kjappe redaktørar og moderatorar på laget ditt før du opnar for allmenn registrering!
         preamble: Kontroller kven som kan oppretta konto på tenaren din.
         title: Registreringar
       registrations_mode:
         modes:
-          approved: Godkjenning kreves for påmelding
+          approved: Godkjenning krevst for å registrera seg
           none: Ingen kan melda seg inn
           open: Kven som helst kan melda seg inn
+        warning_hint: Me rår til at du bruker "Godkjenning krevst for å registrera seg" viss du ikkje er sikker på at moderatorane kan handtera søppel og illmeinte registreringar kvikt.
       security:
         authorized_fetch: Krev autentisering frå fødererte tenarar
         authorized_fetch_hint: Krav om autentisering frå fødererte tenarar gjer det mogleg med strengare handheving av blokkering, både på brukar- og tenar-nivå. Likevel, dette har ein kostnad når det gjeld yting, reduserer rekkevidda til svara dine og kan medføra kompabilitetsproblem med enkelte fødererte tenester. Dette vil heller ikkje hindra dei som verkeleg vil i å henta dei offentlege innlegga eller kontoane dine.
@@ -1450,7 +1452,7 @@ nn:
   moderation:
     title: Moderasjon
   move_handler:
-    carry_blocks_over_text: Denne brukaren flytta frå %{acct}, som du gøymde.
+    carry_blocks_over_text: Denne brukaren flytta frå %{acct}, som du hadde blokkert.
     carry_mutes_over_text: Denne brukeren flyttet fra %{acct}, som du hadde dempet.
     copy_account_note_text: 'Denne brukeren flyttet fra %{acct}, her var dine tidligere notater om dem:'
   navigation:
@@ -1537,7 +1539,7 @@ nn:
   privacy:
     hint_html: "<strong>Tilpass korleis du vil at andre skal finna profilen og innlegga dine.</strong> Mastodon har fleire funksjonar du kan ta i bruk for å få kontakt med eit større publikum. Sjå gjerne gjennom innstillingane slik at du er sikker på at dei passar til deg og din bruk."
     privacy: Personvern
-    privacy_hint_html: Ha kontroll over kor mykje du vil dela. Folk finn interessante profilar og fine appar ved å sjå gjennom kva andre fylgjer og kva appar dei legg ut innlegg med, men det kan henda du vil gøyma desse opplysingane.
+    privacy_hint_html: Kontroller kor mykje du vil dela. Folk finn interessante profilar og fine appar ved å sjå gjennom kva andre fylgjer og kva appar dei legg ut innlegg med, men det kan henda du vil gøyma desse opplysingane.
     reach: Nå andre
     reach_hint_html: Hald styring med om du vil at andre skal kunna oppdaga og fylgja deg. Vil du at innlegga dine skal stå på Utforsk-sida? Vil du at andre skal sjå deg i tilrådingane for kven dei skal fylgja? Vil du ta imot nye fylgjarar automatisk, eller vil du kontrollera kvar einskild fylgjar?
     search: Søk
@@ -1550,8 +1552,8 @@ nn:
       limit_reached: Grensen for forskjellige reaksjoner nådd
       unrecognized_emoji: er ikke en gjenkjent emoji
   redirects:
-    prompt: Hvis du stoler på denne lenken, så trykk på den for å fortsette.
-    title: Du forlater %{instance}.
+    prompt: Viss du stolar på denne lenka, klikkar du på ho for å halda fram.
+    title: No forlèt du %{instance}.
   relationships:
     activity: Kontoaktivitet
     confirm_follow_selected_followers: Er du sikker på at du ynskjer å fylgja dei valde fylgjarane?
@@ -1781,7 +1783,7 @@ nn:
     webauthn: Sikkerhetsnøkler
   user_mailer:
     appeal_approved:
-      action: Kontoinnstillinger
+      action: Kontoinnstillingar
       explanation: Apellen på prikken mot din kontor på %{strike_date} som du la inn på %{appeal_date} har blitt godkjend. Din konto er nok ein gong i god stand.
       subject: Din klage fra %{date} er godkjent
       subtitle: Kontoen din er tilbake i god stand.
@@ -1789,11 +1791,11 @@ nn:
     appeal_rejected:
       explanation: Klagen på advarselen mot din konto den %{strike_date} som du sendte inn den %{appeal_date} har blitt avvist.
       subject: Din klage fra %{date} er avvist
-      subtitle: Anken din har blitt avvist.
+      subtitle: Klaga di vart avvist.
       title: Anke avvist
     backup_ready:
-      explanation: Du etterspurte en fullstendig sikkerhetskopi av din Mastodon-konto.
-      extra: Den er nå klar for nedlasting!
+      explanation: Du ba om ein fullstendig tryggingskopi av Mastodon-kontoen din.
+      extra: No kan du lasta han ned!
       subject: Arkivet ditt er klart til å lastes ned
       title: Nedlasting av arkiv
     failed_2fa:
diff --git a/config/locales/simple_form.nn.yml b/config/locales/simple_form.nn.yml
index 1991cb2dbb941f..98cc372be77d29 100644
--- a/config/locales/simple_form.nn.yml
+++ b/config/locales/simple_form.nn.yml
@@ -39,12 +39,14 @@ nn:
         text: Ei åtvaring kan kun ankast ein gong
       defaults:
         autofollow: Folk som lagar ein konto gjennom innbydinga fylgjer deg automatisk
+        avatar: WEBP, PNG, GIF eller JPG. Maks %{size}. Blir forminska til %{dimensions}pkt
         bot: Denne kontoen utfører i hovedsak automatiserte handlinger og blir kanskje ikke holdt øye med
         context: En eller flere sammenhenger der filteret skal gjelde
         current_password: For sikkerhetsgrunner, vennligst oppgi passordet til den nåværende bruker
         current_username: Skriv inn brukarnamnet til den noverande kontoen for å stadfesta
         digest: Kun sendt etter en lang periode med inaktivitet og bare dersom du har mottatt noen personlige meldinger mens du var borte
         email: Du får snart ein stadfestings-e-post
+        header: WEBP, PNG, GIF eller JPG. Maks %{size}. Blir forminska til %{dimensions}pkt
         inbox_url: Kopier URLen fra forsiden til overgangen du vil bruke
         irreversible: Filtrerte tut vil verta borte for evig, sjølv om filteret vert fjerna seinare
         locale: Språket til brukargrensesnittet, e-postar og push-varsel
@@ -53,8 +55,8 @@ nn:
         scopes: API-ane som programmet vil få tilgjenge til. Ettersom du vel eit toppnivåomfang tarv du ikkje velja einskilde API-ar.
         setting_aggregate_reblogs: Ikkje vis nye framhevingar for tut som nyleg har vorte heva fram (Påverkar berre nylege framhevingar)
         setting_always_send_emails: Vanlegvis vil ikkje e-postvarsel bli sendt når du brukar Mastodon aktivt
-        setting_default_sensitive: Nærtakande media vert gøymd som standard og kan synast med eit klikk
-        setting_display_media_default: Gøym media som er merka som nærtakande
+        setting_default_sensitive: Sensitive media vert gøymde som standard, og du syner dei ved å klikka på dei
+        setting_display_media_default: Gøym media som er merka som sensitive
         setting_display_media_hide_all: Alltid skjul alt media
         setting_display_media_show_all: Vis alltid media
         setting_use_blurhash: Overgangar er basert på fargane til skjulte grafikkelement, men gjer detaljar utydelege
@@ -218,7 +220,7 @@ nn:
         setting_theme: Sidetema
         setting_trends: Vis kva som er populært i dag
         setting_unfollow_modal: Vis stadfesting før du sluttar å fylgja nokon
-        setting_use_blurhash: Vis fargerike overgangar for gøymt media
+        setting_use_blurhash: Vis fargerike overgangar for gøymde medium
         setting_use_pending_items: Saktemodus
         severity: Alvorsgrad
         sign_in_token_attempt: Trygdenykel
@@ -233,8 +235,8 @@ nn:
         name: Emneknagg
       filters:
         actions:
-          hide: Gøym totalt
-          warn: Gøym med ei advarsel
+          hide: Gøym heilt
+          warn: Gøym med ei åtvaring
       form_admin_settings:
         activity_api_enabled: Legg ut samla statistikk om brukaraktiviteten i APIet
         backups_retention_period: Arkiveringsperiode for brukararkiv
@@ -264,9 +266,9 @@ nn:
         trends: Aktiver trendar
         trends_as_landing_page: Bruk trendar som startside
       interactions:
-        must_be_follower: Gøym varslingar frå folk som ikkje fylgjer deg
-        must_be_following: Gøym varslingar frå folk du ikkje fylgjer
-        must_be_following_dm: Gøym direktemeldinger frå folk du ikkje fylgjer
+        must_be_follower: Blokker varsel frå folk som ikkje fylgjer deg
+        must_be_following: Blokker varsel frå folk du ikkje fylgjer
+        must_be_following_dm: Blokker direktemeldinger frå folk du ikkje fylgjer
       invite:
         comment: Kommentar
       invite_request:

From 036f5a05e372b9b1899907195e48001eec079854 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Tue, 27 Feb 2024 15:59:20 +0100
Subject: [PATCH 0301/2191] Convert the streaming server to ESM (#29389)

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
---
 streaming/{.eslintrc.js => .eslintrc.cjs} | 12 ++---
 streaming/errors.js                       | 15 ++----
 streaming/index.js                        | 64 +++++++++++++----------
 streaming/logging.js                      | 23 ++++----
 streaming/metrics.js                      |  6 +--
 streaming/package.json                    |  1 +
 streaming/tsconfig.json                   |  6 +--
 streaming/utils.js                        | 20 +++----
 8 files changed, 67 insertions(+), 80 deletions(-)
 rename streaming/{.eslintrc.js => .eslintrc.cjs} (79%)

diff --git a/streaming/.eslintrc.js b/streaming/.eslintrc.cjs
similarity index 79%
rename from streaming/.eslintrc.js
rename to streaming/.eslintrc.cjs
index 188ebb512d19f1..e25cff7df07c27 100644
--- a/streaming/.eslintrc.js
+++ b/streaming/.eslintrc.cjs
@@ -1,4 +1,8 @@
+/* eslint-disable import/no-commonjs */
+
 // @ts-check
+
+// @ts-ignore - This needs to be a CJS file (eslint does not yet support ESM configs), and TS is complaining we use require
 const { defineConfig } = require('eslint-define-config');
 
 module.exports = defineConfig({
@@ -22,22 +26,18 @@ module.exports = defineConfig({
     // to maintain.
     'no-delete-var': 'off',
 
-    // The streaming server is written in commonjs, not ESM for now:
-    'import/no-commonjs': 'off',
-
     // This overrides the base configuration for this rule to pick up
     // dependencies for the streaming server from the correct package.json file.
     'import/no-extraneous-dependencies': [
       'error',
       {
-        devDependencies: [
-          'streaming/.eslintrc.js',
-        ],
+        devDependencies: ['streaming/.eslintrc.cjs'],
         optionalDependencies: false,
         peerDependencies: false,
         includeTypes: true,
         packageDir: __dirname,
       },
     ],
+    'import/extensions': ['error', 'always'],
   },
 });
diff --git a/streaming/errors.js b/streaming/errors.js
index 9a641180ba4624..6c44d2cb8f33fb 100644
--- a/streaming/errors.js
+++ b/streaming/errors.js
@@ -5,15 +5,14 @@
  * override it in let statements.
  * @type {string}
  */
-const UNEXPECTED_ERROR_MESSAGE = 'An unexpected error occurred';
-exports.UNKNOWN_ERROR_MESSAGE = UNEXPECTED_ERROR_MESSAGE;
+export const UNEXPECTED_ERROR_MESSAGE = 'An unexpected error occurred';
 
 /**
  * Extracts the status and message properties from the error object, if
  * available for public use. The `unknown` is for catch statements
  * @param {Error | AuthenticationError | RequestError | unknown} err
  */
-exports.extractStatusAndMessage = function(err) {
+export function extractStatusAndMessage(err) {
   let statusCode = 500;
   let errorMessage = UNEXPECTED_ERROR_MESSAGE;
   if (err instanceof AuthenticationError || err instanceof RequestError) {
@@ -22,9 +21,9 @@ exports.extractStatusAndMessage = function(err) {
   }
 
   return { statusCode, errorMessage };
-};
+}
 
-class RequestError extends Error {
+export class RequestError extends Error {
   /**
    * @param {string} message
    */
@@ -35,9 +34,7 @@ class RequestError extends Error {
   }
 }
 
-exports.RequestError = RequestError;
-
-class AuthenticationError extends Error {
+export class AuthenticationError extends Error {
   /**
    * @param {string} message
    */
@@ -47,5 +44,3 @@ class AuthenticationError extends Error {
     this.status = 401;
   }
 }
-
-exports.AuthenticationError = AuthenticationError;
diff --git a/streaming/index.js b/streaming/index.js
index 1c312ebd70b21b..fa30260a3a4260 100644
--- a/streaming/index.js
+++ b/streaming/index.js
@@ -1,32 +1,36 @@
 // @ts-check
 
-const fs = require('fs');
-const http = require('http');
-const path = require('path');
-const url = require('url');
-
-const cors = require('cors');
-const dotenv = require('dotenv');
-const express = require('express');
-const { Redis } = require('ioredis');
-const { JSDOM } = require('jsdom');
-const pg = require('pg');
-const dbUrlToConfig = require('pg-connection-string').parse;
-const WebSocket = require('ws');
-
-const errors = require('./errors');
-const { AuthenticationError, RequestError } = require('./errors');
-const { logger, httpLogger, initializeLogLevel, attachWebsocketHttpLogger, createWebsocketLogger } = require('./logging');
-const { setupMetrics } = require('./metrics');
-const { isTruthy, normalizeHashtag, firstParam } = require("./utils");
+import fs from 'node:fs';
+import http from 'node:http';
+import path from 'node:path';
+import url from 'node:url';
+
+import cors from 'cors';
+import dotenv from 'dotenv';
+import express from 'express';
+import { Redis } from 'ioredis';
+import { JSDOM } from 'jsdom';
+import pg from 'pg';
+import pgConnectionString from 'pg-connection-string';
+import WebSocket from 'ws';
+
+import { AuthenticationError, RequestError, extractStatusAndMessage as extractErrorStatusAndMessage } from './errors.js';
+import { logger, httpLogger, initializeLogLevel, attachWebsocketHttpLogger, createWebsocketLogger } from './logging.js';
+import { setupMetrics } from './metrics.js';
+import { isTruthy, normalizeHashtag, firstParam } from './utils.js';
 
 const environment = process.env.NODE_ENV || 'development';
 
 // Correctly detect and load .env or .env.production file based on environment:
 const dotenvFile = environment === 'production' ? '.env.production' : '.env';
+const dotenvFilePath = path.resolve(
+  url.fileURLToPath(
+    new URL(path.join('..', dotenvFile), import.meta.url)
+  )
+);
 
 dotenv.config({
-  path: path.resolve(__dirname, path.join('..', dotenvFile))
+  path: dotenvFilePath
 });
 
 initializeLogLevel(process.env, environment);
@@ -143,7 +147,7 @@ const pgConfigFromEnv = (env) => {
   let baseConfig = {};
 
   if (env.DATABASE_URL) {
-    const parsedUrl = dbUrlToConfig(env.DATABASE_URL);
+    const parsedUrl = pgConnectionString.parse(env.DATABASE_URL);
 
     // The result of dbUrlToConfig from pg-connection-string is not type
     // compatible with pg.PoolConfig, since parts of the connection URL may be
@@ -326,7 +330,7 @@ const startServer = async () => {
       // Unfortunately for using the on('upgrade') setup, we need to manually
       // write a HTTP Response to the Socket to close the connection upgrade
       // attempt, so the following code is to handle all of that.
-      const {statusCode, errorMessage } = errors.extractStatusAndMessage(err);
+      const {statusCode, errorMessage } = extractErrorStatusAndMessage(err);
 
       /** @type {Record<string, string | number | import('pino-http').ReqId>} */
       const headers = {
@@ -748,7 +752,7 @@ const startServer = async () => {
       return;
     }
 
-    const {statusCode, errorMessage } = errors.extractStatusAndMessage(err);
+    const {statusCode, errorMessage } = extractErrorStatusAndMessage(err);
 
     res.writeHead(statusCode, { 'Content-Type': 'application/json' });
     res.end(JSON.stringify({ error: errorMessage }));
@@ -1155,7 +1159,7 @@ const startServer = async () => {
       // @ts-ignore
       streamFrom(channelIds, req, req.log, onSend, onEnd, 'eventsource', options.needsFiltering);
     }).catch(err => {
-      const {statusCode, errorMessage } = errors.extractStatusAndMessage(err);
+      const {statusCode, errorMessage } = extractErrorStatusAndMessage(err);
 
       res.log.info({ err }, 'Eventsource subscription error');
 
@@ -1353,7 +1357,7 @@ const startServer = async () => {
         stopHeartbeat,
       };
     }).catch(err => {
-      const {statusCode, errorMessage } = errors.extractStatusAndMessage(err);
+      const {statusCode, errorMessage } = extractErrorStatusAndMessage(err);
 
       logger.error({ err }, 'Websocket subscription error');
 
@@ -1482,13 +1486,15 @@ const startServer = async () => {
       // Decrement the metrics for connected clients:
       connectedClients.labels({ type: 'websocket' }).dec();
 
-      // We need to delete the session object as to ensure it correctly gets
+      // We need to unassign the session object as to ensure it correctly gets
       // garbage collected, without doing this we could accidentally hold on to
       // references to the websocket, the request, and the logger, causing
       // memory leaks.
-      //
-      // @ts-ignore
-      delete session;
+
+      // This is commented out because `delete` only operated on object properties
+      // It needs to be replaced by `session = undefined`, but it requires every calls to
+      // `session` to check for it, thus a significant refactor
+      // delete session;
     });
 
     // Note: immediately after the `error` event is emitted, the `close` event
diff --git a/streaming/logging.js b/streaming/logging.js
index 64ee474875ddde..e1c552c22ed8f1 100644
--- a/streaming/logging.js
+++ b/streaming/logging.js
@@ -1,6 +1,6 @@
-const { pino } = require('pino');
-const { pinoHttp, stdSerializers: pinoHttpSerializers } = require('pino-http');
-const uuid = require('uuid');
+import { pino } from 'pino';
+import { pinoHttp, stdSerializers as pinoHttpSerializers } from 'pino-http';
+import * as uuid from 'uuid';
 
 /**
  * Generates the Request ID for logging and setting on responses
@@ -36,7 +36,7 @@ function sanitizeRequestLog(req) {
   return log;
 }
 
-const logger = pino({
+export const logger = pino({
   name: "streaming",
   // Reformat the log level to a string:
   formatters: {
@@ -59,7 +59,7 @@ const logger = pino({
   }
 });
 
-const httpLogger = pinoHttp({
+export const httpLogger = pinoHttp({
   logger,
   genReqId: generateRequestId,
   serializers: {
@@ -71,7 +71,7 @@ const httpLogger = pinoHttp({
  * Attaches a logger to the request object received by http upgrade handlers
  * @param {http.IncomingMessage} request
  */
-function attachWebsocketHttpLogger(request) {
+export function attachWebsocketHttpLogger(request) {
   generateRequestId(request);
 
   request.log = logger.child({
@@ -84,7 +84,7 @@ function attachWebsocketHttpLogger(request) {
  * @param {http.IncomingMessage} request
  * @param {import('./index.js').ResolvedAccount} resolvedAccount
  */
-function createWebsocketLogger(request, resolvedAccount) {
+export function createWebsocketLogger(request, resolvedAccount) {
   // ensure the request.id is always present.
   generateRequestId(request);
 
@@ -98,17 +98,12 @@ function createWebsocketLogger(request, resolvedAccount) {
   });
 }
 
-exports.logger = logger;
-exports.httpLogger = httpLogger;
-exports.attachWebsocketHttpLogger = attachWebsocketHttpLogger;
-exports.createWebsocketLogger = createWebsocketLogger;
-
 /**
  * Initializes the log level based on the environment
  * @param {Object<string, any>} env
  * @param {string} environment
  */
-exports.initializeLogLevel = function initializeLogLevel(env, environment) {
+export function initializeLogLevel(env, environment) {
   if (env.LOG_LEVEL && Object.keys(logger.levels.values).includes(env.LOG_LEVEL)) {
     logger.level = env.LOG_LEVEL;
   } else if (environment === 'development') {
@@ -116,4 +111,4 @@ exports.initializeLogLevel = function initializeLogLevel(env, environment) {
   } else {
     logger.level = 'info';
   }
-};
+}
diff --git a/streaming/metrics.js b/streaming/metrics.js
index d05b4c9b16affd..a029d778fcf67a 100644
--- a/streaming/metrics.js
+++ b/streaming/metrics.js
@@ -1,6 +1,6 @@
 // @ts-check
 
-const metrics = require('prom-client');
+import metrics from 'prom-client';
 
 /**
  * @typedef StreamingMetrics
@@ -18,7 +18,7 @@ const metrics = require('prom-client');
  * @param {import('pg').Pool} pgPool
  * @returns {StreamingMetrics}
  */
-function setupMetrics(channels, pgPool) {
+export function setupMetrics(channels, pgPool) {
   // Collect metrics from Node.js
   metrics.collectDefaultMetrics();
 
@@ -101,5 +101,3 @@ function setupMetrics(channels, pgPool) {
     messagesSent,
   };
 }
-
-exports.setupMetrics = setupMetrics;
diff --git a/streaming/package.json b/streaming/package.json
index 71f204c0fbfb17..efb692578cb487 100644
--- a/streaming/package.json
+++ b/streaming/package.json
@@ -7,6 +7,7 @@
   },
   "description": "Mastodon's Streaming Server",
   "private": true,
+  "type": "module",
   "repository": {
     "type": "git",
     "url": "https://github.com/mastodon/mastodon.git"
diff --git a/streaming/tsconfig.json b/streaming/tsconfig.json
index a0cf68ef90942f..ba5bd51ff7509d 100644
--- a/streaming/tsconfig.json
+++ b/streaming/tsconfig.json
@@ -2,11 +2,11 @@
   "extends": "../tsconfig.json",
   "compilerOptions": {
     "target": "esnext",
-    "module": "CommonJS",
-    "moduleResolution": "node",
+    "module": "NodeNext",
+    "moduleResolution": "NodeNext",
     "noUnusedParameters": false,
     "tsBuildInfoFile": "../tmp/cache/streaming/tsconfig.tsbuildinfo",
     "paths": {},
   },
-  "include": ["./*.js", "./.eslintrc.js"],
+  "include": ["./*.js", "./.eslintrc.cjs"],
 }
diff --git a/streaming/utils.js b/streaming/utils.js
index 7b87a1d14c9fb8..4610bf660d8930 100644
--- a/streaming/utils.js
+++ b/streaming/utils.js
@@ -16,11 +16,9 @@ const FALSE_VALUES = [
  * @param {any} value
  * @returns {boolean}
  */
-const isTruthy = value =>
-  value && !FALSE_VALUES.includes(value);
-
-exports.isTruthy = isTruthy;
-
+export function isTruthy(value) {
+  return value && !FALSE_VALUES.includes(value);
+}
 
 /**
  * See app/lib/ascii_folder.rb for the canon definitions
@@ -33,7 +31,7 @@ const EQUIVALENT_ASCII_CHARS = 'AAAAAAaaaaaaAaAaAaCcCcCcCcCcDdDdDdEEEEeeeeEeEeEe
  * @param {string} str
  * @returns {string}
  */
-function foldToASCII(str) {
+export function foldToASCII(str) {
   const regex = new RegExp(NON_ASCII_CHARS.split('').join('|'), 'g');
 
   return str.replace(regex, function(match) {
@@ -42,28 +40,22 @@ function foldToASCII(str) {
   });
 }
 
-exports.foldToASCII = foldToASCII;
-
 /**
  * @param {string} str
  * @returns {string}
  */
-function normalizeHashtag(str) {
+export function normalizeHashtag(str) {
   return foldToASCII(str.normalize('NFKC').toLowerCase()).replace(/[^\p{L}\p{N}_\u00b7\u200c]/gu, '');
 }
 
-exports.normalizeHashtag = normalizeHashtag;
-
 /**
  * @param {string|string[]} arrayOrString
  * @returns {string}
  */
-function firstParam(arrayOrString) {
+export function firstParam(arrayOrString) {
   if (Array.isArray(arrayOrString)) {
     return arrayOrString[0];
   } else {
     return arrayOrString;
   }
 }
-
-exports.firstParam = firstParam;

From 6f7615ba86afda56e1d661442286a1d68467a525 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 27 Feb 2024 16:18:06 +0100
Subject: [PATCH 0302/2191] Add basic end-to-end test for admin moderation
 interface (#29424)

---
 spec/support/stories/profile_stories.rb  |  6 +++++
 spec/support/streaming_server_manager.rb |  3 +++
 spec/system/report_interface_spec.rb     | 31 ++++++++++++++++++++++++
 3 files changed, 40 insertions(+)
 create mode 100644 spec/system/report_interface_spec.rb

diff --git a/spec/support/stories/profile_stories.rb b/spec/support/stories/profile_stories.rb
index 74342c337d6688..f5fc9a441fd698 100644
--- a/spec/support/stories/profile_stories.rb
+++ b/spec/support/stories/profile_stories.rb
@@ -21,6 +21,12 @@ def as_a_logged_in_user
     click_on I18n.t('auth.login')
   end
 
+  def as_a_logged_in_admin
+    # This is a bit awkward, but this avoids code duplication.
+    as_a_logged_in_user
+    bob.update!(role: UserRole.find_by!(name: 'Admin'))
+  end
+
   def with_alice_as_local_user
     @alice_bio = '@alice and @bob are fictional characters commonly used as' \
                  'placeholder names in #cryptology, as well as #science and' \
diff --git a/spec/support/streaming_server_manager.rb b/spec/support/streaming_server_manager.rb
index 33819182990940..b702fc77cef597 100644
--- a/spec/support/streaming_server_manager.rb
+++ b/spec/support/streaming_server_manager.rb
@@ -109,6 +109,9 @@ def stop
       # Also needs to be set per-example here because of the database cleaner.
       Setting.registrations_mode = 'open'
 
+      # Load seeds so we have the default roles otherwise cleared by `DatabaseCleaner`
+      Rails.application.load_seed
+
       example.run
     end
 
diff --git a/spec/system/report_interface_spec.rb b/spec/system/report_interface_spec.rb
new file mode 100644
index 00000000000000..6eba5525594f39
--- /dev/null
+++ b/spec/system/report_interface_spec.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'report interface', :paperclip_processing do
+  include ProfileStories
+
+  let(:email)               { 'admin@example.com' }
+  let(:password)            { 'password' }
+  let(:confirmed_at)        { Time.zone.now }
+  let(:finished_onboarding) { true }
+
+  let(:reported_account) { Fabricate(:account) }
+  let(:reported_status) { Fabricate(:status, account: reported_account) }
+  let(:media_attachment) { Fabricate(:media_attachment, account: reported_account, status: reported_status, file: attachment_fixture('attachment.jpg')) }
+  let!(:report) { Fabricate(:report, target_account: reported_account, status_ids: [media_attachment.status.id]) }
+
+  before do
+    as_a_logged_in_admin
+    visit admin_report_path(report)
+  end
+
+  it 'displays the report interface, including the javascript bits' do
+    # The report category selector React component is properly rendered
+    expect(page).to have_css('.report-reason-selector')
+
+    # The media React component is properly rendered
+    page.scroll_to(page.find('.batch-table__row'))
+    expect(page).to have_css('.spoiler-button__overlay__label')
+  end
+end

From 899eac1a92c802c334606a49d538ef37bd47c91a Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Tue, 27 Feb 2024 16:42:05 +0100
Subject: [PATCH 0303/2191] Use modern ES syntax rather than `.call` (#29368)

---
 .../mastodon/containers/media_container.jsx   |  2 +-
 .../features/emoji/emoji_compressed.js        |  4 ++--
 .../mastodon/features/emoji/emoji_utils.js    | 10 ++++----
 app/javascript/packs/admin.jsx                | 24 +++++++++++--------
 app/javascript/packs/public.jsx               | 14 +++++------
 public/embed.js                               |  4 +++-
 streaming/index.js                            |  4 ++--
 7 files changed, 34 insertions(+), 28 deletions(-)

diff --git a/app/javascript/mastodon/containers/media_container.jsx b/app/javascript/mastodon/containers/media_container.jsx
index fba3c5df78bef6..d18602e3b5a46a 100644
--- a/app/javascript/mastodon/containers/media_container.jsx
+++ b/app/javascript/mastodon/containers/media_container.jsx
@@ -80,7 +80,7 @@ export default class MediaContainer extends PureComponent {
     return (
       <IntlProvider>
         <>
-          {[].map.call(components, (component, i) => {
+          {Array.from(components).map((component, i) => {
             const componentName = component.getAttribute('data-component');
             const Component = MEDIA_COMPONENTS[componentName];
             const { media, card, poll, hashtag, ...props } = JSON.parse(component.getAttribute('data-props'));
diff --git a/app/javascript/mastodon/features/emoji/emoji_compressed.js b/app/javascript/mastodon/features/emoji/emoji_compressed.js
index a4863566dad3ac..ed8e9bbe303f64 100644
--- a/app/javascript/mastodon/features/emoji/emoji_compressed.js
+++ b/app/javascript/mastodon/features/emoji/emoji_compressed.js
@@ -36,7 +36,7 @@ Object.keys(emojiIndex.emojis).forEach(key => {
   let emoji = emojiIndex.emojis[key];
 
   // Emojis with skin tone modifiers are stored like this
-  if (Object.prototype.hasOwnProperty.call(emoji, '1')) {
+  if (Object.hasOwn(emoji, '1')) {
     emoji = emoji['1'];
   }
 
@@ -88,7 +88,7 @@ Object.keys(emojiIndex.emojis).forEach(key => {
   let emoji = emojiIndex.emojis[key];
 
   // Emojis with skin tone modifiers are stored like this
-  if (Object.prototype.hasOwnProperty.call(emoji, '1')) {
+  if (Object.hasOwn(emoji, '1')) {
     emoji = emoji['1'];
   }
 
diff --git a/app/javascript/mastodon/features/emoji/emoji_utils.js b/app/javascript/mastodon/features/emoji/emoji_utils.js
index 83bcc9d82f9f14..c13d25056706a4 100644
--- a/app/javascript/mastodon/features/emoji/emoji_utils.js
+++ b/app/javascript/mastodon/features/emoji/emoji_utils.js
@@ -135,19 +135,19 @@ function getData(emoji, skin, set) {
       }
     }
 
-    if (Object.prototype.hasOwnProperty.call(data.short_names, emoji)) {
+    if (Object.hasOwn(data.short_names, emoji)) {
       emoji = data.short_names[emoji];
     }
 
-    if (Object.prototype.hasOwnProperty.call(data.emojis, emoji)) {
+    if (Object.hasOwn(data.emojis, emoji)) {
       emojiData = data.emojis[emoji];
     }
   } else if (emoji.id) {
-    if (Object.prototype.hasOwnProperty.call(data.short_names, emoji.id)) {
+    if (Object.hasOwn(data.short_names, emoji.id)) {
       emoji.id = data.short_names[emoji.id];
     }
 
-    if (Object.prototype.hasOwnProperty.call(data.emojis, emoji.id)) {
+    if (Object.hasOwn(data.emojis, emoji.id)) {
       emojiData = data.emojis[emoji.id];
       skin = skin || emoji.skin;
     }
@@ -216,7 +216,7 @@ function deepMerge(a, b) {
     let originalValue = a[key],
       value = originalValue;
 
-    if (Object.prototype.hasOwnProperty.call(b, key)) {
+    if (Object.hasOwn(b, key)) {
       value = b[key];
     }
 
diff --git a/app/javascript/packs/admin.jsx b/app/javascript/packs/admin.jsx
index 343678c184e163..5f24d6677e949c 100644
--- a/app/javascript/packs/admin.jsx
+++ b/app/javascript/packs/admin.jsx
@@ -46,7 +46,7 @@ const hideSelectAll = () => {
 Rails.delegate(document, '#batch_checkbox_all', 'change', ({ target }) => {
   const selectAllMatchingElement = document.querySelector('.batch-table__select-all');
 
-  [].forEach.call(document.querySelectorAll(batchCheckboxClassName), (content) => {
+  document.querySelectorAll(batchCheckboxClassName).forEach((content) => {
     content.checked = target.checked;
   });
 
@@ -81,8 +81,11 @@ Rails.delegate(document, batchCheckboxClassName, 'change', () => {
   const selectAllMatchingElement = document.querySelector('.batch-table__select-all');
 
   if (checkAllElement) {
-    checkAllElement.checked = [].every.call(document.querySelectorAll(batchCheckboxClassName), (content) => content.checked);
-    checkAllElement.indeterminate = !checkAllElement.checked && [].some.call(document.querySelectorAll(batchCheckboxClassName), (content) => content.checked);
+    const allCheckboxes = Array.from(
+      document.querySelectorAll(batchCheckboxClassName)
+    );
+    checkAllElement.checked = allCheckboxes.every((content) => content.checked);
+    checkAllElement.indeterminate = !checkAllElement.checked && allCheckboxes.some((content) => content.checked);
 
     if (selectAllMatchingElement) {
       if (checkAllElement.checked) {
@@ -133,11 +136,11 @@ Rails.delegate(document, '#form_admin_settings_enable_bootstrap_timeline_account
 const onChangeRegistrationMode = (target) => {
   const enabled = target.value === 'approved';
 
-  [].forEach.call(document.querySelectorAll('.form_admin_settings_registrations_mode .warning-hint'), (warning_hint) => {
+  document.querySelectorAll('.form_admin_settings_registrations_mode .warning-hint').forEach((warning_hint) => {
     warning_hint.style.display = target.value === 'open' ? 'inline' : 'none';
   });
 
-  [].forEach.call(document.querySelectorAll('#form_admin_settings_require_invite_text'), (input) => {
+  document.querySelectorAll('#form_admin_settings_require_invite_text').forEach((input) => {
     input.disabled = !enabled;
     if (enabled) {
       let element = input;
@@ -183,8 +186,9 @@ ready(() => {
 
   const checkAllElement = document.querySelector('#batch_checkbox_all');
   if (checkAllElement) {
-    checkAllElement.checked = [].every.call(document.querySelectorAll(batchCheckboxClassName), (content) => content.checked);
-    checkAllElement.indeterminate = !checkAllElement.checked && [].some.call(document.querySelectorAll(batchCheckboxClassName), (content) => content.checked);
+    const allCheckboxes = Array.from(document.querySelectorAll(batchCheckboxClassName));
+    checkAllElement.checked = allCheckboxes.every( (content) => content.checked);
+    checkAllElement.indeterminate = !checkAllElement.checked && allCheckboxes.some((content) => content.checked);
   }
 
   document.querySelector('a#add-instance-button')?.addEventListener('click', (e) => {
@@ -197,7 +201,7 @@ ready(() => {
     }
   });
 
-  [].forEach.call(document.querySelectorAll('input[type="datetime-local"]'), element => {
+  document.querySelectorAll('input[type="datetime-local"]').forEach(element => {
     if (element.value) {
       element.value = convertUTCDateTimeToLocal(element.value);
     }
@@ -207,7 +211,7 @@ ready(() => {
   });
 
   Rails.delegate(document, 'form', 'submit', ({ target }) => {
-    [].forEach.call(target.querySelectorAll('input[type="datetime-local"]'), element => {
+    target.querySelectorAll('input[type="datetime-local"]').forEach(element => {
       if (element.value && element.validity.valid) {
         element.value = convertLocalDatetimeToUTC(element.value);
       }
@@ -219,7 +223,7 @@ ready(() => {
     setAnnouncementEndsAttributes(announcementStartsAt);
   }
 
-  [].forEach.call(document.querySelectorAll('[data-admin-component]'), element => {
+  document.querySelectorAll('[data-admin-component]').forEach(element => {
     const componentName  = element.getAttribute('data-admin-component');
     const componentProps = JSON.parse(element.getAttribute('data-props'));
 
diff --git a/app/javascript/packs/public.jsx b/app/javascript/packs/public.jsx
index 5edc3553700406..01b57dce398408 100644
--- a/app/javascript/packs/public.jsx
+++ b/app/javascript/packs/public.jsx
@@ -73,11 +73,11 @@ function loaded() {
     return messageFormat.format(values);
   };
 
-  [].forEach.call(document.querySelectorAll('.emojify'), (content) => {
+  document.querySelectorAll('.emojify').forEach((content) => {
     content.innerHTML = emojify(content.innerHTML);
   });
 
-  [].forEach.call(document.querySelectorAll('time.formatted'), (content) => {
+  document.querySelectorAll('time.formatted').forEach((content) => {
     const datetime = new Date(content.getAttribute('datetime'));
     const formattedDate = dateTimeFormat.format(datetime);
 
@@ -94,7 +94,7 @@ function loaded() {
   };
   const todayFormat = new IntlMessageFormat(localeData['relative_format.today'] || 'Today at {time}', locale);
 
-  [].forEach.call(document.querySelectorAll('time.relative-formatted'), (content) => {
+  document.querySelectorAll('time.relative-formatted').forEach((content) => {
     const datetime = new Date(content.getAttribute('datetime'));
 
     let formattedContent;
@@ -111,7 +111,7 @@ function loaded() {
     content.textContent = formattedContent;
   });
 
-  [].forEach.call(document.querySelectorAll('time.time-ago'), (content) => {
+  document.querySelectorAll('time.time-ago').forEach((content) => {
     const datetime = new Date(content.getAttribute('datetime'));
     const now      = new Date();
 
@@ -128,8 +128,8 @@ function loaded() {
   if (reactComponents.length > 0) {
     import(/* webpackChunkName: "containers/media_container" */ '../mastodon/containers/media_container')
       .then(({ default: MediaContainer }) => {
-        [].forEach.call(reactComponents, (component) => {
-          [].forEach.call(component.children, (child) => {
+        reactComponents.forEach((component) => {
+          Array.from(component.children).forEach((child) => {
             component.removeChild(child);
           });
         });
@@ -185,7 +185,7 @@ function loaded() {
     return false;
   });
 
-  [].forEach.call(document.querySelectorAll('.status__content__spoiler-link'), (spoilerLink) => {
+  document.querySelectorAll('.status__content__spoiler-link').forEach((spoilerLink) => {
     const statusEl = spoilerLink.parentNode.parentNode;
     const message = (statusEl.dataset.spoiler === 'expanded') ? (localeData['status.show_less'] || 'Show less') : (localeData['status.show_more'] || 'Show more');
     spoilerLink.textContent = (new IntlMessageFormat(message, locale)).format();
diff --git a/public/embed.js b/public/embed.js
index defba403e47d36..f8e6a22db44114 100644
--- a/public/embed.js
+++ b/public/embed.js
@@ -31,6 +31,8 @@
 
       var iframe = iframes.get(data.id);
 
+      if(!iframe) return;
+
       if ('source' in e && iframe.contentWindow !== e.source) {
         return;
       }
@@ -38,7 +40,7 @@
       iframe.height = data.height;
     });
 
-    [].forEach.call(document.querySelectorAll('iframe.mastodon-embed'), function (iframe) {
+    document.querySelectorAll('iframe.mastodon-embed').forEach(iframe => {
       // select unique id for each iframe
       var id = 0, failCount = 0, idBuffer = new Uint32Array(1);
       while (id === 0 || iframes.has(id)) {
diff --git a/streaming/index.js b/streaming/index.js
index fa30260a3a4260..154ecbc02c5f5a 100644
--- a/streaming/index.js
+++ b/streaming/index.js
@@ -192,7 +192,7 @@ const pgConfigFromEnv = (env) => {
     if (!baseConfig.password && env.DB_PASS) {
       baseConfig.password = env.DB_PASS;
     }
-  } else if (Object.hasOwnProperty.call(pgConfigs, environment)) {
+  } else if (Object.hasOwn(pgConfigs, environment)) {
     baseConfig = pgConfigs[environment];
 
     if (env.DB_SSLMODE) {
@@ -912,7 +912,7 @@ const startServer = async () => {
           // If the payload already contains the `filtered` property, it means
           // that filtering has been applied on the ruby on rails side, as
           // such, we don't need to construct or apply the filters in streaming:
-          if (Object.prototype.hasOwnProperty.call(payload, "filtered")) {
+          if (Object.hasOwn(payload, "filtered")) {
             transmit(event, payload);
             return;
           }

From dc4427dc9ba4d084d96153feb2eef6a32c288e1f Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 27 Feb 2024 17:07:43 +0100
Subject: [PATCH 0304/2191] Update devDependencies (non-major) (#29089)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
---
 .devcontainer/codespaces/devcontainer.json | 18 +++++-----
 .devcontainer/devcontainer.json            | 16 ++++-----
 app/javascript/mastodon/test_helpers.tsx   |  2 +-
 jsconfig.json                              |  4 +--
 streaming/tsconfig.json                    |  4 +--
 tsconfig.json                              |  8 ++---
 yarn.lock                                  | 40 +++++++++++-----------
 7 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/.devcontainer/codespaces/devcontainer.json b/.devcontainer/codespaces/devcontainer.json
index b32e4026d2374d..ca9156fdaa4bf1 100644
--- a/.devcontainer/codespaces/devcontainer.json
+++ b/.devcontainer/codespaces/devcontainer.json
@@ -5,7 +5,7 @@
   "workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
 
   "features": {
-    "ghcr.io/devcontainers/features/sshd:1": {},
+    "ghcr.io/devcontainers/features/sshd:1": {}
   },
 
   "runServices": ["app", "db", "redis"],
@@ -15,16 +15,16 @@
   "portsAttributes": {
     "3000": {
       "label": "web",
-      "onAutoForward": "notify",
+      "onAutoForward": "notify"
     },
     "4000": {
       "label": "stream",
-      "onAutoForward": "silent",
-    },
+      "onAutoForward": "silent"
+    }
   },
 
   "otherPortsAttributes": {
-    "onAutoForward": "silent",
+    "onAutoForward": "silent"
   },
 
   "remoteEnv": {
@@ -33,7 +33,7 @@
     "STREAMING_API_BASE_URL": "https://${localEnv:CODESPACE_NAME}-4000.app.github.dev",
     "DISABLE_FORGERY_REQUEST_PROTECTION": "true",
     "ES_ENABLED": "",
-    "LIBRE_TRANSLATE_ENDPOINT": "",
+    "LIBRE_TRANSLATE_ENDPOINT": ""
   },
 
   "onCreateCommand": "git config --global --add safe.directory ${containerWorkspaceFolder}",
@@ -43,7 +43,7 @@
   "customizations": {
     "vscode": {
       "settings": {},
-      "extensions": ["EditorConfig.EditorConfig", "webben.browserslist"],
-    },
-  },
+      "extensions": ["EditorConfig.EditorConfig", "webben.browserslist"]
+    }
+  }
 }
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index ed71235b3b3001..fa8d6542c18aec 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -5,7 +5,7 @@
   "workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
 
   "features": {
-    "ghcr.io/devcontainers/features/sshd:1": {},
+    "ghcr.io/devcontainers/features/sshd:1": {}
   },
 
   "forwardPorts": [3000, 4000],
@@ -14,17 +14,17 @@
     "3000": {
       "label": "web",
       "onAutoForward": "notify",
-      "requireLocalPort": true,
+      "requireLocalPort": true
     },
     "4000": {
       "label": "stream",
       "onAutoForward": "silent",
-      "requireLocalPort": true,
-    },
+      "requireLocalPort": true
+    }
   },
 
   "otherPortsAttributes": {
-    "onAutoForward": "silent",
+    "onAutoForward": "silent"
   },
 
   "onCreateCommand": "git config --global --add safe.directory ${containerWorkspaceFolder}",
@@ -34,7 +34,7 @@
   "customizations": {
     "vscode": {
       "settings": {},
-      "extensions": ["EditorConfig.EditorConfig", "webben.browserslist"],
-    },
-  },
+      "extensions": ["EditorConfig.EditorConfig", "webben.browserslist"]
+    }
+  }
 }
diff --git a/app/javascript/mastodon/test_helpers.tsx b/app/javascript/mastodon/test_helpers.tsx
index 689589556956b4..69d57b95a0437b 100644
--- a/app/javascript/mastodon/test_helpers.tsx
+++ b/app/javascript/mastodon/test_helpers.tsx
@@ -40,7 +40,7 @@ function render(
   ui: React.ReactElement,
   { locale = 'en', signedIn = true, ...renderOptions } = {},
 ) {
-  const Wrapper = (props: { children: React.ReactElement }) => {
+  const Wrapper = (props: { children: React.ReactNode }) => {
     return (
       <MemoryRouter>
         <IntlProvider locale={locale}>
diff --git a/jsconfig.json b/jsconfig.json
index 7b710de83c4fda..d52816a98b68ef 100644
--- a/jsconfig.json
+++ b/jsconfig.json
@@ -11,7 +11,7 @@
     "noEmit": true,
     "resolveJsonModule": true,
     "strict": false,
-    "target": "ES2022",
+    "target": "ES2022"
   },
-  "exclude": ["**/build/*", "**/node_modules/*", "**/public/*", "**/vendor/*"],
+  "exclude": ["**/build/*", "**/node_modules/*", "**/public/*", "**/vendor/*"]
 }
diff --git a/streaming/tsconfig.json b/streaming/tsconfig.json
index ba5bd51ff7509d..37e9a7fee026e3 100644
--- a/streaming/tsconfig.json
+++ b/streaming/tsconfig.json
@@ -6,7 +6,7 @@
     "moduleResolution": "NodeNext",
     "noUnusedParameters": false,
     "tsBuildInfoFile": "../tmp/cache/streaming/tsconfig.tsbuildinfo",
-    "paths": {},
+    "paths": {}
   },
-  "include": ["./*.js", "./.eslintrc.cjs"],
+  "include": ["./*.js", "./.eslintrc.cjs"]
 }
diff --git a/tsconfig.json b/tsconfig.json
index dc71fc4a9cad8e..a193ea35f2fdac 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -15,12 +15,12 @@
     "paths": {
       "mastodon": ["app/javascript/mastodon"],
       "mastodon/*": ["app/javascript/mastodon/*"],
-      "@/*": ["app/javascript/*"],
-    },
+      "@/*": ["app/javascript/*"]
+    }
   },
   "include": [
     "app/javascript/mastodon",
     "app/javascript/packs",
-    "app/javascript/types",
-  ],
+    "app/javascript/types"
+  ]
 }
diff --git a/yarn.lock b/yarn.lock
index 943c488714735e..442473a0922298 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2881,8 +2881,8 @@ __metadata:
   linkType: hard
 
 "@testing-library/jest-dom@npm:^6.0.0":
-  version: 6.4.0
-  resolution: "@testing-library/jest-dom@npm:6.4.0"
+  version: 6.4.2
+  resolution: "@testing-library/jest-dom@npm:6.4.2"
   dependencies:
     "@adobe/css-tools": "npm:^4.3.2"
     "@babel/runtime": "npm:^7.9.2"
@@ -2909,13 +2909,13 @@ __metadata:
       optional: true
     vitest:
       optional: true
-  checksum: 10c0/6b7eba9ca388986a721fb12f84adf0f5534bf7ec5851982023a889c4a0afac6e9e91291bdac39e1f59a05adefd7727e30463d98b21c3da32fbfec229ccb11ef1
+  checksum: 10c0/e7eba527b34ce30cde94424d2ec685bdfed51daaafb7df9b68b51aec6052e99a50c8bfe654612dacdf857a1eb81d68cf294fc89de558ee3a992bf7a6019fffcc
   languageName: node
   linkType: hard
 
 "@testing-library/react@npm:^14.0.0":
-  version: 14.1.2
-  resolution: "@testing-library/react@npm:14.1.2"
+  version: 14.2.1
+  resolution: "@testing-library/react@npm:14.2.1"
   dependencies:
     "@babel/runtime": "npm:^7.12.5"
     "@testing-library/dom": "npm:^9.0.0"
@@ -2923,7 +2923,7 @@ __metadata:
   peerDependencies:
     react: ^18.0.0
     react-dom: ^18.0.0
-  checksum: 10c0/b5b0990d3aa0ea8b37c55804e0d5d584fc638a5c7d4df90da9a0fdb00bc981b27b6991468b2dc719982a5d0b0107a41596063ce51ad519eeab47b22bc04d6779
+  checksum: 10c0/83b35cf8bf5640f1b63b32223ebc75799dc1a8e034d819120b26838fba0b0ab10bdbe6ad07dd8ae8287365f2b0c52dc9892a6fa11bb24d3e63ad97dfb7f2f296
   languageName: node
   linkType: hard
 
@@ -10903,28 +10903,28 @@ __metadata:
   linkType: hard
 
 "lint-staged@npm:^15.0.0":
-  version: 15.2.0
-  resolution: "lint-staged@npm:15.2.0"
+  version: 15.2.2
+  resolution: "lint-staged@npm:15.2.2"
   dependencies:
     chalk: "npm:5.3.0"
     commander: "npm:11.1.0"
     debug: "npm:4.3.4"
     execa: "npm:8.0.1"
     lilconfig: "npm:3.0.0"
-    listr2: "npm:8.0.0"
+    listr2: "npm:8.0.1"
     micromatch: "npm:4.0.5"
     pidtree: "npm:0.6.0"
     string-argv: "npm:0.3.2"
     yaml: "npm:2.3.4"
   bin:
     lint-staged: bin/lint-staged.js
-  checksum: 10c0/4a1ff25dd06dbd4346fd244c9a0ebb936532ba18c0caedeb895c2e232f3c6c5fd08f6667624716660bc29e3e0f9f0440a9175114394616e991ebd5fab4b1f092
+  checksum: 10c0/a1ba6c7ee53e30a0f6ea9a351d95d3d0d2be916a41b561e22907e9ea513eb18cb3dbe65bff3ec13fad15777999efe56b2e2a95427e31d12a9b7e7948c3630ee2
   languageName: node
   linkType: hard
 
-"listr2@npm:8.0.0":
-  version: 8.0.0
-  resolution: "listr2@npm:8.0.0"
+"listr2@npm:8.0.1":
+  version: 8.0.1
+  resolution: "listr2@npm:8.0.1"
   dependencies:
     cli-truncate: "npm:^4.0.0"
     colorette: "npm:^2.0.20"
@@ -10932,7 +10932,7 @@ __metadata:
     log-update: "npm:^6.0.0"
     rfdc: "npm:^1.3.0"
     wrap-ansi: "npm:^9.0.0"
-  checksum: 10c0/6e356df9127c68b69186c927c993645223557e941a76b0bb210e35786aedc53f577df437251db804606ff37ac509c5d945289a84b3daee7fadf2e3dcb889ecc9
+  checksum: 10c0/b565d6ceb3a4c2dbe0c1735c0fd907afd0d6f89de21aced8e05187b2d88ca2f8f9ebc5d743885396a00f05f13146f6be744d098a56ce0402cf1cd131485a7ff1
   languageName: node
   linkType: hard
 
@@ -13295,11 +13295,11 @@ __metadata:
   linkType: hard
 
 "prettier@npm:^3.0.0":
-  version: 3.2.4
-  resolution: "prettier@npm:3.2.4"
+  version: 3.2.5
+  resolution: "prettier@npm:3.2.5"
   bin:
     prettier: bin/prettier.cjs
-  checksum: 10c0/88dfeb78ac6096522c9a5b81f1413d875f568420d9bb6a5e5103527912519b993f2bcdcac311fcff5718d5869671d44e4f85827d3626f3a6ce32b9abc65d88e0
+  checksum: 10c0/ea327f37a7d46f2324a34ad35292af2ad4c4c3c3355da07313339d7e554320f66f65f91e856add8530157a733c6c4a897dc41b577056be5c24c40f739f5ee8c6
   languageName: node
   linkType: hard
 
@@ -15785,8 +15785,8 @@ __metadata:
   linkType: hard
 
 "stylelint@npm:^16.0.2":
-  version: 16.2.0
-  resolution: "stylelint@npm:16.2.0"
+  version: 16.2.1
+  resolution: "stylelint@npm:16.2.1"
   dependencies:
     "@csstools/css-parser-algorithms": "npm:^2.5.0"
     "@csstools/css-tokenizer": "npm:^2.2.3"
@@ -15828,7 +15828,7 @@ __metadata:
     write-file-atomic: "npm:^5.0.1"
   bin:
     stylelint: bin/stylelint.mjs
-  checksum: 10c0/6fdf0451833c11b18c9aa502f687febd6881a912ac94f39d509b894b0f74ccb636f3dac2991c69cc82dc6190731cc2fa48e307fed477d2a0fce57067cd22b572
+  checksum: 10c0/eeaba06885e542c832e5cffc07b2d0dabdc5a72e6ad4d6cb3d01dcc260c29a712b0b935cbd40e059abd68a100e0563fbc617fc4c9bef3b14ecaf6eea651d9d9d
   languageName: node
   linkType: hard
 

From 3b3144740805c1b404934c0f196d6cddc14dac0b Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Tue, 27 Feb 2024 17:09:27 +0100
Subject: [PATCH 0305/2191] Rework Prettier invocation (#28851)

---
 .eslintrc.js                       |   4 +-
 .github/workflows/format-check.yml |  18 ++
 .github/workflows/lint-css.yml     |   2 +-
 .github/workflows/lint-json.yml    |  38 ----
 .github/workflows/lint-md.yml      |  38 ----
 .github/workflows/lint-yml.yml     |  40 -----
 .prettierignore                    |   8 +
 package.json                       |  20 +--
 yarn.lock                          | 267 ++++-------------------------
 9 files changed, 74 insertions(+), 361 deletions(-)
 create mode 100644 .github/workflows/format-check.yml
 delete mode 100644 .github/workflows/lint-json.yml
 delete mode 100644 .github/workflows/lint-md.yml
 delete mode 100644 .github/workflows/lint-yml.yml

diff --git a/.eslintrc.js b/.eslintrc.js
index ebe07f6e79a25e..bd818c3ce4b171 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -338,7 +338,6 @@ module.exports = defineConfig({
         'plugin:import/typescript',
         'plugin:promise/recommended',
         'plugin:jsdoc/recommended-typescript',
-        'plugin:prettier/recommended',
       ],
 
       parserOptions: {
@@ -347,6 +346,9 @@ module.exports = defineConfig({
       },
 
       rules: {
+        // Disable formatting rules that have been enabled in the base config
+        'indent': 'off',
+
         'import/consistent-type-specifier-style': ['error', 'prefer-top-level'],
 
         '@typescript-eslint/consistent-type-definitions': ['warn', 'interface'],
diff --git a/.github/workflows/format-check.yml b/.github/workflows/format-check.yml
new file mode 100644
index 00000000000000..2d483b50229626
--- /dev/null
+++ b/.github/workflows/format-check.yml
@@ -0,0 +1,18 @@
+name: Check formatting
+on:
+  push:
+  pull_request:
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Clone repository
+        uses: actions/checkout@v4
+
+      - name: Set up Javascript environment
+        uses: ./.github/actions/setup-javascript
+
+      - name: Check formatting with Prettier
+        run: yarn format:check
diff --git a/.github/workflows/lint-css.yml b/.github/workflows/lint-css.yml
index 7229bec582210b..e5f487487719f1 100644
--- a/.github/workflows/lint-css.yml
+++ b/.github/workflows/lint-css.yml
@@ -43,4 +43,4 @@ jobs:
       - run: echo "::add-matcher::.github/stylelint-matcher.json"
 
       - name: Stylelint
-        run: yarn lint:sass
+        run: yarn lint:css
diff --git a/.github/workflows/lint-json.yml b/.github/workflows/lint-json.yml
deleted file mode 100644
index 7796bf92c4aeb1..00000000000000
--- a/.github/workflows/lint-json.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-name: JSON Linting
-on:
-  push:
-    branches-ignore:
-      - 'dependabot/**'
-      - 'renovate/**'
-    paths:
-      - 'package.json'
-      - 'yarn.lock'
-      - '.nvmrc'
-      - '.prettier*'
-      - '**/*.json'
-      - '.github/workflows/lint-json.yml'
-      - '!app/javascript/mastodon/locales/*.json'
-
-  pull_request:
-    paths:
-      - 'package.json'
-      - 'yarn.lock'
-      - '.nvmrc'
-      - '.prettier*'
-      - '**/*.json'
-      - '.github/workflows/lint-json.yml'
-      - '!app/javascript/mastodon/locales/*.json'
-
-jobs:
-  lint:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Clone repository
-        uses: actions/checkout@v4
-
-      - name: Set up Javascript environment
-        uses: ./.github/actions/setup-javascript
-
-      - name: Prettier
-        run: yarn lint:json
diff --git a/.github/workflows/lint-md.yml b/.github/workflows/lint-md.yml
deleted file mode 100644
index 51c59937a30c44..00000000000000
--- a/.github/workflows/lint-md.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-name: Markdown Linting
-on:
-  push:
-    branches-ignore:
-      - 'dependabot/**'
-      - 'renovate/**'
-    paths:
-      - '.github/workflows/lint-md.yml'
-      - '.nvmrc'
-      - '.prettier*'
-      - '**/*.md'
-      - '!AUTHORS.md'
-      - 'package.json'
-      - 'yarn.lock'
-
-  pull_request:
-    paths:
-      - '.github/workflows/lint-md.yml'
-      - '.nvmrc'
-      - '.prettier*'
-      - '**/*.md'
-      - '!AUTHORS.md'
-      - 'package.json'
-      - 'yarn.lock'
-
-jobs:
-  lint:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Clone repository
-        uses: actions/checkout@v4
-
-      - name: Set up Javascript environment
-        uses: ./.github/actions/setup-javascript
-
-      - name: Prettier
-        run: yarn lint:md
diff --git a/.github/workflows/lint-yml.yml b/.github/workflows/lint-yml.yml
deleted file mode 100644
index 908bdef5ccfa6c..00000000000000
--- a/.github/workflows/lint-yml.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-name: YML Linting
-on:
-  push:
-    branches-ignore:
-      - 'dependabot/**'
-      - 'renovate/**'
-    paths:
-      - 'package.json'
-      - 'yarn.lock'
-      - '.nvmrc'
-      - '.prettier*'
-      - '**/*.yaml'
-      - '**/*.yml'
-      - '.github/workflows/lint-yml.yml'
-      - '!config/locales/*.yml'
-
-  pull_request:
-    paths:
-      - 'package.json'
-      - 'yarn.lock'
-      - '.nvmrc'
-      - '.prettier*'
-      - '**/*.yaml'
-      - '**/*.yml'
-      - '.github/workflows/lint-yml.yml'
-      - '!config/locales/*.yml'
-
-jobs:
-  lint:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Clone repository
-        uses: actions/checkout@v4
-
-      - name: Set up Javascript environment
-        uses: ./.github/actions/setup-javascript
-
-      - name: Prettier
-        run: yarn lint:yml
diff --git a/.prettierignore b/.prettierignore
index 51850b2b28ad74..6b2f0c188945a2 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -54,6 +54,13 @@
 # Ignore Docker option files
 docker-compose.override.yml
 
+# Ignore public
+/public/assets
+/public/emoji
+/public/packs
+/public/packs-test
+/public/system
+
 # Ignore emoji map file
 /app/javascript/mastodon/features/emoji/emoji_map.json
 
@@ -74,4 +81,5 @@ app/javascript/styles/mastodon/reset.scss
 # Ignore the generated AUTHORS.md
 AUTHORS.md
 
+# Process a few selected JS files
 !lint-staged.config.js
diff --git a/package.json b/package.json
index af83867fe88c24..4f17b427ee8128 100644
--- a/package.json
+++ b/package.json
@@ -12,20 +12,16 @@
   "scripts": {
     "build:development": "cross-env RAILS_ENV=development NODE_ENV=development ./bin/webpack",
     "build:production": "cross-env RAILS_ENV=production NODE_ENV=production ./bin/webpack",
-    "fix:js": "yarn lint:js --fix",
-    "fix:json": "prettier --write \"**/*.{json,json5}\"",
-    "fix:md": "prettier --write \"**/*.md\"",
-    "fix:sass": "stylelint --fix \"**/*.{css,scss}\" && prettier --write \"**/*.{css,scss}\"",
-    "fix:yml": "prettier --write \"**/*.{yaml,yml}\"",
-    "fix": "yarn fix:js && yarn fix:json && yarn fix:sass && yarn fix:yml",
+    "fix:js": "eslint . --ext=.js,.jsx,.ts,.tsx --cache --report-unused-disable-directives --fix",
+    "fix:css": "stylelint --fix \"**/*.{css,scss}\"",
+    "fix": "yarn fix:js && yarn fix:css",
+    "format": "prettier --write --log-level warn .",
+    "format:check": "prettier --check --ignore-unknown .",
     "i18n:extract": "formatjs extract 'app/javascript/**/*.{js,jsx,ts,tsx}' '--ignore=**/*.d.ts' --out-file app/javascript/mastodon/locales/en.json --format config/formatjs-formatter.js",
     "jest": "cross-env NODE_ENV=test jest",
     "lint:js": "eslint . --ext=.js,.jsx,.ts,.tsx --cache --report-unused-disable-directives",
-    "lint:json": "prettier --check \"**/*.{json,json5}\"",
-    "lint:md": "prettier --check \"**/*.md\"",
-    "lint:sass": "stylelint \"**/*.{css,scss}\" && prettier --check \"**/*.{css,scss}\"",
-    "lint:yml": "prettier --check \"**/*.{yaml,yml}\"",
-    "lint": "yarn lint:js && yarn lint:json && yarn lint:sass && yarn lint:yml",
+    "lint:css": "stylelint \"**/*.{css,scss}\"",
+    "lint": "yarn lint:js && yarn lint:css",
     "postversion": "git push --tags",
     "prepare": "husky",
     "start": "node ./streaming/index.js",
@@ -177,14 +173,12 @@
     "@typescript-eslint/parser": "^7.0.0",
     "babel-jest": "^29.5.0",
     "eslint": "^8.41.0",
-    "eslint-config-prettier": "^9.0.0",
     "eslint-define-config": "^2.0.0",
     "eslint-import-resolver-typescript": "^3.5.5",
     "eslint-plugin-formatjs": "^4.10.1",
     "eslint-plugin-import": "~2.29.0",
     "eslint-plugin-jsdoc": "^48.0.0",
     "eslint-plugin-jsx-a11y": "~6.8.0",
-    "eslint-plugin-prettier": "^5.0.0",
     "eslint-plugin-promise": "~6.1.1",
     "eslint-plugin-react": "^7.33.2",
     "eslint-plugin-react-hooks": "^4.6.0",
diff --git a/yarn.lock b/yarn.lock
index 442473a0922298..dda4ed326e0cbc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -42,7 +42,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.10.4, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.23.5":
+"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.10.4, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.22.13, @babel/code-frame@npm:^7.23.5":
   version: 7.23.5
   resolution: "@babel/code-frame@npm:7.23.5"
   dependencies:
@@ -373,6 +373,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/parser@npm:^7.22.15":
+  version: 7.23.6
+  resolution: "@babel/parser@npm:7.23.6"
+  bin:
+    parser: ./bin/babel-parser.js
+  checksum: 10c0/6f76cd5ccae1fa9bcab3525b0865c6222e9c1d22f87abc69f28c5c7b2c8816a13361f5bd06bddbd5faf903f7320a8feba02545c981468acec45d12a03db7755e
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:^7.23.3":
   version: 7.23.3
   resolution: "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:7.23.3"
@@ -1491,7 +1500,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/template@npm:^7.22.15, @babel/template@npm:^7.23.9, @babel/template@npm:^7.3.3":
+"@babel/template@npm:^7.22.15, @babel/template@npm:^7.3.3":
+  version: 7.22.15
+  resolution: "@babel/template@npm:7.22.15"
+  dependencies:
+    "@babel/code-frame": "npm:^7.22.13"
+    "@babel/parser": "npm:^7.22.15"
+    "@babel/types": "npm:^7.22.15"
+  checksum: 10c0/9312edd37cf1311d738907003f2aa321a88a42ba223c69209abe4d7111db019d321805504f606c7fd75f21c6cf9d24d0a8223104cd21ebd207e241b6c551f454
+  languageName: node
+  linkType: hard
+
+"@babel/template@npm:^7.23.9":
   version: 7.23.9
   resolution: "@babel/template@npm:7.23.9"
   dependencies:
@@ -1520,7 +1540,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/types@npm:^7.0.0, @babel/types@npm:^7.0.0-beta.49, @babel/types@npm:^7.12.11, @babel/types@npm:^7.12.6, @babel/types@npm:^7.20.7, @babel/types@npm:^7.22.10, @babel/types@npm:^7.22.15, @babel/types@npm:^7.22.19, @babel/types@npm:^7.22.5, @babel/types@npm:^7.23.0, @babel/types@npm:^7.23.6, @babel/types@npm:^7.23.9, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3":
+"@babel/types@npm:^7.0.0, @babel/types@npm:^7.0.0-beta.49, @babel/types@npm:^7.12.11, @babel/types@npm:^7.12.6, @babel/types@npm:^7.20.7, @babel/types@npm:^7.22.10, @babel/types@npm:^7.22.15, @babel/types@npm:^7.22.19, @babel/types@npm:^7.22.5, @babel/types@npm:^7.23.0, @babel/types@npm:^7.23.6, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3":
+  version: 7.23.6
+  resolution: "@babel/types@npm:7.23.6"
+  dependencies:
+    "@babel/helper-string-parser": "npm:^7.23.4"
+    "@babel/helper-validator-identifier": "npm:^7.22.20"
+    to-fast-properties: "npm:^2.0.0"
+  checksum: 10c0/42cefce8a68bd09bb5828b4764aa5586c53c60128ac2ac012e23858e1c179347a4aac9c66fc577994fbf57595227611c5ec8270bf0cfc94ff033bbfac0550b70
+  languageName: node
+  linkType: hard
+
+"@babel/types@npm:^7.23.9":
   version: 7.23.9
   resolution: "@babel/types@npm:7.23.9"
   dependencies:
@@ -2360,14 +2391,12 @@ __metadata:
     emoji-mart: "npm:emoji-mart-lazyload@latest"
     escape-html: "npm:^1.0.3"
     eslint: "npm:^8.41.0"
-    eslint-config-prettier: "npm:^9.0.0"
     eslint-define-config: "npm:^2.0.0"
     eslint-import-resolver-typescript: "npm:^3.5.5"
     eslint-plugin-formatjs: "npm:^4.10.1"
     eslint-plugin-import: "npm:~2.29.0"
     eslint-plugin-jsdoc: "npm:^48.0.0"
     eslint-plugin-jsx-a11y: "npm:~6.8.0"
-    eslint-plugin-prettier: "npm:^5.0.0"
     eslint-plugin-promise: "npm:~6.1.1"
     eslint-plugin-react: "npm:^7.33.2"
     eslint-plugin-react-hooks: "npm:^4.6.0"
@@ -2572,20 +2601,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@pkgr/utils@npm:^2.4.2":
-  version: 2.4.2
-  resolution: "@pkgr/utils@npm:2.4.2"
-  dependencies:
-    cross-spawn: "npm:^7.0.3"
-    fast-glob: "npm:^3.3.0"
-    is-glob: "npm:^4.0.3"
-    open: "npm:^9.1.0"
-    picocolors: "npm:^1.0.0"
-    tslib: "npm:^2.6.0"
-  checksum: 10c0/7c3e68f6405a1d4c51f418d8d580e71d7bade2683d5db07e8413d8e57f7e389047eda44a2341f77a1b3085895fca7676a9d45e8812a58312524f8c4c65d501be
-  languageName: node
-  linkType: hard
-
 "@polka/url@npm:^1.0.0-next.20":
   version: 1.0.0-next.21
   resolution: "@polka/url@npm:1.0.0-next.21"
@@ -4939,13 +4954,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"big-integer@npm:^1.6.44":
-  version: 1.6.51
-  resolution: "big-integer@npm:1.6.51"
-  checksum: 10c0/c8139662d57f8833a44802f4b65be911679c569535ea73c5cfd3c1c8994eaead1b84b6f63e1db63833e4d4cacb6b6a9e5522178113dfdc8e4c81ed8436f1e8cc
-  languageName: node
-  linkType: hard
-
 "big.js@npm:^5.2.2":
   version: 5.2.2
   resolution: "big.js@npm:5.2.2"
@@ -5059,15 +5067,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"bplist-parser@npm:^0.2.0":
-  version: 0.2.0
-  resolution: "bplist-parser@npm:0.2.0"
-  dependencies:
-    big-integer: "npm:^1.6.44"
-  checksum: 10c0/ce79c69e0f6efe506281e7c84e3712f7d12978991675b6e3a58a295b16f13ca81aa9b845c335614a545e0af728c8311b6aa3142af76ba1cb616af9bbac5c4a9f
-  languageName: node
-  linkType: hard
-
 "brace-expansion@npm:^1.1.7":
   version: 1.1.11
   resolution: "brace-expansion@npm:1.1.11"
@@ -5290,15 +5289,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"bundle-name@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "bundle-name@npm:3.0.0"
-  dependencies:
-    run-applescript: "npm:^5.0.0"
-  checksum: 10c0/57bc7f8b025d83961b04db2f1eff6a87f2363c2891f3542a4b82471ff8ebb5d484af48e9784fcdb28ef1d48bb01f03d891966dc3ef58758e46ea32d750ce40f8
-  languageName: node
-  linkType: hard
-
 "bytes@npm:3.0.0":
   version: 3.0.0
   resolution: "bytes@npm:3.0.0"
@@ -6524,28 +6514,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"default-browser-id@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "default-browser-id@npm:3.0.0"
-  dependencies:
-    bplist-parser: "npm:^0.2.0"
-    untildify: "npm:^4.0.0"
-  checksum: 10c0/8db3ab882eb3e1e8b59d84c8641320e6c66d8eeb17eb4bb848b7dd549b1e6fd313988e4a13542e95fbaeff03f6e9dedc5ad191ad4df7996187753eb0d45c00b7
-  languageName: node
-  linkType: hard
-
-"default-browser@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "default-browser@npm:4.0.0"
-  dependencies:
-    bundle-name: "npm:^3.0.0"
-    default-browser-id: "npm:^3.0.0"
-    execa: "npm:^7.1.1"
-    titleize: "npm:^3.0.0"
-  checksum: 10c0/7c8848badc139ecf9d878e562bc4e7ab4301e51ba120b24d8dcb14739c30152115cc612065ac3ab73c02aace4afa29db5a044257b2f0cf234f16e3a58f6c925e
-  languageName: node
-  linkType: hard
-
 "default-gateway@npm:^4.2.0":
   version: 4.2.0
   resolution: "default-gateway@npm:4.2.0"
@@ -6567,13 +6535,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"define-lazy-prop@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "define-lazy-prop@npm:3.0.0"
-  checksum: 10c0/5ab0b2bf3fa58b3a443140bbd4cd3db1f91b985cc8a246d330b9ac3fc0b6a325a6d82bddc0b055123d745b3f9931afeea74a5ec545439a1630b9c8512b0eeb49
-  languageName: node
-  linkType: hard
-
 "define-properties@npm:^1.1.3, define-properties@npm:^1.1.4, define-properties@npm:^1.2.0, define-properties@npm:^1.2.1":
   version: 1.2.1
   resolution: "define-properties@npm:1.2.1"
@@ -7298,17 +7259,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint-config-prettier@npm:^9.0.0":
-  version: 9.1.0
-  resolution: "eslint-config-prettier@npm:9.1.0"
-  peerDependencies:
-    eslint: ">=7.0.0"
-  bin:
-    eslint-config-prettier: bin/cli.js
-  checksum: 10c0/6d332694b36bc9ac6fdb18d3ca2f6ac42afa2ad61f0493e89226950a7091e38981b66bac2b47ba39d15b73fff2cd32c78b850a9cf9eed9ca9a96bfb2f3a2f10d
-  languageName: node
-  linkType: hard
-
 "eslint-define-config@npm:^2.0.0":
   version: 2.1.0
   resolution: "eslint-define-config@npm:2.1.0"
@@ -7450,26 +7400,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint-plugin-prettier@npm:^5.0.0":
-  version: 5.1.3
-  resolution: "eslint-plugin-prettier@npm:5.1.3"
-  dependencies:
-    prettier-linter-helpers: "npm:^1.0.0"
-    synckit: "npm:^0.8.6"
-  peerDependencies:
-    "@types/eslint": ">=8.0.0"
-    eslint: ">=8.0.0"
-    eslint-config-prettier: "*"
-    prettier: ">=3.0.0"
-  peerDependenciesMeta:
-    "@types/eslint":
-      optional: true
-    eslint-config-prettier:
-      optional: true
-  checksum: 10c0/f45d5fc1fcfec6b0cf038a7a65ddd10a25df4fe3f9e1f6b7f0d5100e66f046a26a2492e69ee765dddf461b93c114cf2e1eb18d4970aafa6f385448985c136e09
-  languageName: node
-  linkType: hard
-
 "eslint-plugin-promise@npm:~6.1.1":
   version: 6.1.1
   resolution: "eslint-plugin-promise@npm:6.1.1"
@@ -7758,23 +7688,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"execa@npm:^7.1.1":
-  version: 7.2.0
-  resolution: "execa@npm:7.2.0"
-  dependencies:
-    cross-spawn: "npm:^7.0.3"
-    get-stream: "npm:^6.0.1"
-    human-signals: "npm:^4.3.0"
-    is-stream: "npm:^3.0.0"
-    merge-stream: "npm:^2.0.0"
-    npm-run-path: "npm:^5.1.0"
-    onetime: "npm:^6.0.0"
-    signal-exit: "npm:^3.0.7"
-    strip-final-newline: "npm:^3.0.0"
-  checksum: 10c0/098cd6a1bc26d509e5402c43f4971736450b84d058391820c6f237aeec6436963e006fd8423c9722f148c53da86aa50045929c7278b5522197dff802d10f9885
-  languageName: node
-  linkType: hard
-
 "exit@npm:^0.1.2":
   version: 0.1.2
   resolution: "exit@npm:0.1.2"
@@ -7914,14 +7827,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fast-diff@npm:^1.1.2":
-  version: 1.3.0
-  resolution: "fast-diff@npm:1.3.0"
-  checksum: 10c0/5c19af237edb5d5effda008c891a18a585f74bf12953be57923f17a3a4d0979565fc64dbc73b9e20926b9d895f5b690c618cbb969af0cf022e3222471220ad29
-  languageName: node
-  linkType: hard
-
-"fast-glob@npm:^3.2.9, fast-glob@npm:^3.3.0, fast-glob@npm:^3.3.1, fast-glob@npm:^3.3.2":
+"fast-glob@npm:^3.2.9, fast-glob@npm:^3.3.1, fast-glob@npm:^3.3.2":
   version: 3.3.2
   resolution: "fast-glob@npm:3.3.2"
   dependencies:
@@ -8432,7 +8338,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"get-stream@npm:^6.0.0, get-stream@npm:^6.0.1":
+"get-stream@npm:^6.0.0":
   version: 6.0.1
   resolution: "get-stream@npm:6.0.1"
   checksum: 10c0/49825d57d3fd6964228e6200a58169464b8e8970489b3acdc24906c782fb7f01f9f56f8e6653c4a50713771d6658f7cfe051e5eb8c12e334138c9c918b296341
@@ -9032,13 +8938,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"human-signals@npm:^4.3.0":
-  version: 4.3.1
-  resolution: "human-signals@npm:4.3.1"
-  checksum: 10c0/40498b33fe139f5cc4ef5d2f95eb1803d6318ac1b1c63eaf14eeed5484d26332c828de4a5a05676b6c83d7b9e57727c59addb4b1dea19cb8d71e83689e5b336c
-  languageName: node
-  linkType: hard
-
 "human-signals@npm:^5.0.0":
   version: 5.0.0
   resolution: "human-signals@npm:5.0.0"
@@ -9512,24 +9411,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-docker@npm:^2.0.0":
-  version: 2.2.1
-  resolution: "is-docker@npm:2.2.1"
-  bin:
-    is-docker: cli.js
-  checksum: 10c0/e828365958d155f90c409cdbe958f64051d99e8aedc2c8c4cd7c89dcf35329daed42f7b99346f7828df013e27deb8f721cf9408ba878c76eb9e8290235fbcdcc
-  languageName: node
-  linkType: hard
-
-"is-docker@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "is-docker@npm:3.0.0"
-  bin:
-    is-docker: cli.js
-  checksum: 10c0/d2c4f8e6d3e34df75a5defd44991b6068afad4835bb783b902fa12d13ebdb8f41b2a199dcb0b5ed2cb78bfee9e4c0bbdb69c2d9646f4106464674d3e697a5856
-  languageName: node
-  linkType: hard
-
 "is-electron@npm:^2.2.0":
   version: 2.2.2
   resolution: "is-electron@npm:2.2.2"
@@ -9633,17 +9514,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-inside-container@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "is-inside-container@npm:1.0.0"
-  dependencies:
-    is-docker: "npm:^3.0.0"
-  bin:
-    is-inside-container: cli.js
-  checksum: 10c0/a8efb0e84f6197e6ff5c64c52890fa9acb49b7b74fed4da7c95383965da6f0fa592b4dbd5e38a79f87fc108196937acdbcd758fcefc9b140e479b39ce1fcd1cd
-  languageName: node
-  linkType: hard
-
 "is-lambda@npm:^1.0.1":
   version: 1.0.1
   resolution: "is-lambda@npm:1.0.1"
@@ -9887,15 +9757,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-wsl@npm:^2.2.0":
-  version: 2.2.0
-  resolution: "is-wsl@npm:2.2.0"
-  dependencies:
-    is-docker: "npm:^2.0.0"
-  checksum: 10c0/a6fa2d370d21be487c0165c7a440d567274fbba1a817f2f0bfa41cc5e3af25041d84267baa22df66696956038a43973e72fca117918c91431920bdef490fa25e
-  languageName: node
-  linkType: hard
-
 "isarray@npm:0.0.1":
   version: 0.0.1
   resolution: "isarray@npm:0.0.1"
@@ -12146,18 +12007,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"open@npm:^9.1.0":
-  version: 9.1.0
-  resolution: "open@npm:9.1.0"
-  dependencies:
-    default-browser: "npm:^4.0.0"
-    define-lazy-prop: "npm:^3.0.0"
-    is-inside-container: "npm:^1.0.0"
-    is-wsl: "npm:^2.2.0"
-  checksum: 10c0/8073ec0dd8994a7a7d9bac208bd17d093993a65ce10f2eb9b62b6d3a91c9366ae903938a237c275493c130171d339f6dcbdd2a2de7e32953452c0867b97825af
-  languageName: node
-  linkType: hard
-
 "opencollective-postinstall@npm:^2.0.2":
   version: 2.0.3
   resolution: "opencollective-postinstall@npm:2.0.3"
@@ -13285,15 +13134,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"prettier-linter-helpers@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "prettier-linter-helpers@npm:1.0.0"
-  dependencies:
-    fast-diff: "npm:^1.1.2"
-  checksum: 10c0/81e0027d731b7b3697ccd2129470ed9913ecb111e4ec175a12f0fcfab0096516373bf0af2fef132af50cafb0a905b74ff57996d615f59512bb9ac7378fcc64ab
-  languageName: node
-  linkType: hard
-
 "prettier@npm:^3.0.0":
   version: 3.2.5
   resolution: "prettier@npm:3.2.5"
@@ -14553,15 +14393,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"run-applescript@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "run-applescript@npm:5.0.0"
-  dependencies:
-    execa: "npm:^5.0.0"
-  checksum: 10c0/f9977db5770929f3f0db434b8e6aa266498c70dec913c84320c0a06add510cf44e3a048c44da088abee312006f9cbf572fd065cdc8f15d7682afda8755f4114c
-  languageName: node
-  linkType: hard
-
 "run-parallel@npm:^1.1.9":
   version: 1.2.0
   resolution: "run-parallel@npm:1.2.0"
@@ -15960,16 +15791,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"synckit@npm:^0.8.6":
-  version: 0.8.6
-  resolution: "synckit@npm:0.8.6"
-  dependencies:
-    "@pkgr/utils": "npm:^2.4.2"
-    tslib: "npm:^2.6.2"
-  checksum: 10c0/200528062e3915a0190a4c6b1e01436fcfdf812e2e8d977746746f3998bb4182d758af760e51b06a64f8323e705735aff7b4b3efc4a0ab5f75eaccc044a8cfcc
-  languageName: node
-  linkType: hard
-
 "table@npm:^6.8.1":
   version: 6.8.1
   resolution: "table@npm:6.8.1"
@@ -16164,13 +15985,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"titleize@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "titleize@npm:3.0.0"
-  checksum: 10c0/5ae6084ba299b5782f95e3fe85ea9f0fa4d74b8ae722b6b3208157e975589fbb27733aeba4e5080fa9314a856044ef52caa61b87caea4b1baade951a55c06336
-  languageName: node
-  linkType: hard
-
 "tmpl@npm:1.0.5":
   version: 1.0.5
   resolution: "tmpl@npm:1.0.5"
@@ -16313,7 +16127,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tslib@npm:2.6.2, tslib@npm:^2.4.0, tslib@npm:^2.6.0, tslib@npm:^2.6.2":
+"tslib@npm:2.6.2, tslib@npm:^2.4.0":
   version: 2.6.2
   resolution: "tslib@npm:2.6.2"
   checksum: 10c0/e03a8a4271152c8b26604ed45535954c0a45296e32445b4b87f8a5abdb2421f40b59b4ca437c4346af0f28179780d604094eb64546bee2019d903d01c6c19bdb
@@ -16635,13 +16449,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"untildify@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "untildify@npm:4.0.0"
-  checksum: 10c0/d758e624c707d49f76f7511d75d09a8eda7f2020d231ec52b67ff4896bcf7013be3f9522d8375f57e586e9a2e827f5641c7e06ee46ab9c435fc2b2b2e9de517a
-  languageName: node
-  linkType: hard
-
 "upath@npm:^1.1.1, upath@npm:^1.2.0":
   version: 1.2.0
   resolution: "upath@npm:1.2.0"

From ea8e7f3e9d994189bfa3f2e3486fffad9c22adb1 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 27 Feb 2024 11:25:12 -0500
Subject: [PATCH 0306/2191] Align `TagServersMeasure` query style with other
 classes (#29414)

---
 app/lib/admin/metrics/measure/tag_servers_measure.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/lib/admin/metrics/measure/tag_servers_measure.rb b/app/lib/admin/metrics/measure/tag_servers_measure.rb
index e6378b8021c6e7..6eb46bca456b06 100644
--- a/app/lib/admin/metrics/measure/tag_servers_measure.rb
+++ b/app/lib/admin/metrics/measure/tag_servers_measure.rb
@@ -34,10 +34,10 @@ def sql_query_string
         INNER JOIN accounts ON statuses.account_id = accounts.id
         WHERE statuses_tags.tag_id = :tag_id
           AND statuses.id BETWEEN :earliest_status_id AND :latest_status_id
-          AND date_trunc('day', statuses.created_at)::date = axis.day
+          AND date_trunc('day', statuses.created_at)::date = axis.period
       )
       FROM (
-        SELECT generate_series(date_trunc('day', :start_at::timestamp)::date, date_trunc('day', :end_at::timestamp)::date, ('1 day')::interval) AS day
+        SELECT generate_series(date_trunc('day', :start_at::timestamp)::date, date_trunc('day', :end_at::timestamp)::date, interval '1 day') AS period
       ) as axis
     SQL
   end

From 8f3c91fc3c8ff4b150b171c7b3287a8b65e6dd07 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 27 Feb 2024 11:25:58 -0500
Subject: [PATCH 0307/2191] Add `change` block expectation to
 `admin/invites#deactivate_all` spec (#29412)

---
 spec/controllers/admin/invites_controller_spec.rb | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/spec/controllers/admin/invites_controller_spec.rb b/spec/controllers/admin/invites_controller_spec.rb
index c8f566f68ba754..71748cbbec2122 100644
--- a/spec/controllers/admin/invites_controller_spec.rb
+++ b/spec/controllers/admin/invites_controller_spec.rb
@@ -44,14 +44,13 @@
   end
 
   describe 'POST #deactivate_all' do
-    it 'expires all invites, then redirects to admin_invites_path' do
-      invites = Fabricate.times(1, :invite, expires_at: nil)
-
-      post :deactivate_all
+    before { Fabricate(:invite, expires_at: nil) }
 
-      invites.each do |invite|
-        expect(invite.reload).to be_expired
-      end
+    it 'expires all invites, then redirects to admin_invites_path' do
+      expect { post :deactivate_all }
+        .to change { Invite.exists?(expires_at: nil) }
+        .from(true)
+        .to(false)
 
       expect(response).to redirect_to admin_invites_path
     end

From 1b219e709bced7fff87a39f602b159fb6c21b133 Mon Sep 17 00:00:00 2001
From: Evan Paterakis <evan@geopjr.dev>
Date: Tue, 27 Feb 2024 12:46:58 +0200
Subject: [PATCH 0308/2191] [Glitch] Fix filters title and keywords overflow

Port 213c87ae595cc1ddcb618516106712b0aae789bd to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/styles/admin.scss | 1 +
 app/javascript/flavours/glitch/styles/forms.scss | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/javascript/flavours/glitch/styles/admin.scss b/app/javascript/flavours/glitch/styles/admin.scss
index 97ea6d98bbd04f..491b116a504a3b 100644
--- a/app/javascript/flavours/glitch/styles/admin.scss
+++ b/app/javascript/flavours/glitch/styles/admin.scss
@@ -1065,6 +1065,7 @@ a.name-tag,
     display: flex;
     justify-content: space-between;
     margin-bottom: 0;
+    word-break: break-word;
   }
 
   &__permissions {
diff --git a/app/javascript/flavours/glitch/styles/forms.scss b/app/javascript/flavours/glitch/styles/forms.scss
index 33390f49928935..5b7247734fa527 100644
--- a/app/javascript/flavours/glitch/styles/forms.scss
+++ b/app/javascript/flavours/glitch/styles/forms.scss
@@ -1080,6 +1080,7 @@ code {
 
       &__type {
         color: $darker-text-color;
+        word-break: break-word;
       }
     }
 

From 916d78373d84eb3db47ed11f6e6edf78ae918688 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 27 Feb 2024 12:41:19 +0100
Subject: [PATCH 0309/2191] [Glitch] Change behavior of privacy dropdown to
 only change value on validation

Port 90573c3abbc0783c25cb4e3aa8c298e10259cb57 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../compose/components/language_dropdown.jsx  |   1 +
 .../compose/components/privacy_dropdown.jsx   | 124 +----------------
 .../components/privacy_dropdown_menu.jsx      | 128 ++++++++++++++++++
 3 files changed, 131 insertions(+), 122 deletions(-)
 create mode 100644 app/javascript/flavours/glitch/features/compose/components/privacy_dropdown_menu.jsx

diff --git a/app/javascript/flavours/glitch/features/compose/components/language_dropdown.jsx b/app/javascript/flavours/glitch/features/compose/components/language_dropdown.jsx
index db1ce9cecec561..8edf75203facec 100644
--- a/app/javascript/flavours/glitch/features/compose/components/language_dropdown.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/language_dropdown.jsx
@@ -141,6 +141,7 @@ class LanguageDropdownMenu extends PureComponent {
     case 'Escape':
       onClose();
       break;
+    case ' ':
     case 'Enter':
       this.handleClick(e);
       break;
diff --git a/app/javascript/flavours/glitch/features/compose/components/privacy_dropdown.jsx b/app/javascript/flavours/glitch/features/compose/components/privacy_dropdown.jsx
index 8a49f71511e008..c99f18545ba605 100644
--- a/app/javascript/flavours/glitch/features/compose/components/privacy_dropdown.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/privacy_dropdown.jsx
@@ -5,16 +5,16 @@ import { injectIntl, defineMessages } from 'react-intl';
 
 import classNames from 'classnames';
 
-import { supportsPassiveEvents } from 'detect-passive-events';
 import Overlay from 'react-overlays/Overlay';
 
 import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
-import InfoIcon from '@/material-icons/400-24px/info.svg?react';
 import LockIcon from '@/material-icons/400-24px/lock.svg?react';
 import PublicIcon from '@/material-icons/400-24px/public.svg?react';
 import QuietTimeIcon from '@/material-icons/400-24px/quiet_time.svg?react';
 import { Icon }  from 'flavours/glitch/components/icon';
 
+import { PrivacyDropdownMenu } from './privacy_dropdown_menu';
+
 const messages = defineMessages({
   public_short: { id: 'privacy.public.short', defaultMessage: 'Public' },
   public_long: { id: 'privacy.public.long', defaultMessage: 'Anyone on and off Mastodon' },
@@ -28,126 +28,6 @@ const messages = defineMessages({
   unlisted_extra: { id: 'privacy.unlisted.additional', defaultMessage: 'This behaves exactly like public, except the post will not appear in live feeds or hashtags, explore, or Mastodon search, even if you are opted-in account-wide.' },
 });
 
-const listenerOptions = supportsPassiveEvents ? { passive: true, capture: true } : true;
-
-class PrivacyDropdownMenu extends PureComponent {
-
-  static propTypes = {
-    style: PropTypes.object,
-    items: PropTypes.array.isRequired,
-    value: PropTypes.string.isRequired,
-    onClose: PropTypes.func.isRequired,
-    onChange: PropTypes.func.isRequired,
-  };
-
-  handleDocumentClick = e => {
-    if (this.node && !this.node.contains(e.target)) {
-      this.props.onClose();
-      e.stopPropagation();
-    }
-  };
-
-  handleKeyDown = e => {
-    const { items } = this.props;
-    const value = e.currentTarget.getAttribute('data-index');
-    const index = items.findIndex(item => {
-      return (item.value === value);
-    });
-    let element = null;
-
-    switch(e.key) {
-    case 'Escape':
-      this.props.onClose();
-      break;
-    case 'Enter':
-      this.handleClick(e);
-      break;
-    case 'ArrowDown':
-      element = this.node.childNodes[index + 1] || this.node.firstChild;
-      break;
-    case 'ArrowUp':
-      element = this.node.childNodes[index - 1] || this.node.lastChild;
-      break;
-    case 'Tab':
-      if (e.shiftKey) {
-        element = this.node.childNodes[index - 1] || this.node.lastChild;
-      } else {
-        element = this.node.childNodes[index + 1] || this.node.firstChild;
-      }
-      break;
-    case 'Home':
-      element = this.node.firstChild;
-      break;
-    case 'End':
-      element = this.node.lastChild;
-      break;
-    }
-
-    if (element) {
-      element.focus();
-      this.props.onChange(element.getAttribute('data-index'));
-      e.preventDefault();
-      e.stopPropagation();
-    }
-  };
-
-  handleClick = e => {
-    const value = e.currentTarget.getAttribute('data-index');
-
-    e.preventDefault();
-
-    this.props.onClose();
-    this.props.onChange(value);
-  };
-
-  componentDidMount () {
-    document.addEventListener('click', this.handleDocumentClick, { capture: true });
-    document.addEventListener('touchend', this.handleDocumentClick, listenerOptions);
-    if (this.focusedItem) this.focusedItem.focus({ preventScroll: true });
-  }
-
-  componentWillUnmount () {
-    document.removeEventListener('click', this.handleDocumentClick, { capture: true });
-    document.removeEventListener('touchend', this.handleDocumentClick, listenerOptions);
-  }
-
-  setRef = c => {
-    this.node = c;
-  };
-
-  setFocusRef = c => {
-    this.focusedItem = c;
-  };
-
-  render () {
-    const { style, items, value } = this.props;
-
-    return (
-      <div style={{ ...style }} role='listbox' ref={this.setRef}>
-        {items.map(item => (
-          <div role='option' tabIndex={0} key={item.value} data-index={item.value} onKeyDown={this.handleKeyDown} onClick={this.handleClick} className={classNames('privacy-dropdown__option', { active: item.value === value })} aria-selected={item.value === value} ref={item.value === value ? this.setFocusRef : null}>
-            <div className='privacy-dropdown__option__icon'>
-              <Icon id={item.icon} icon={item.iconComponent} />
-            </div>
-
-            <div className='privacy-dropdown__option__content'>
-              <strong>{item.text}</strong>
-              {item.meta}
-            </div>
-
-            {item.extra && (
-              <div className='privacy-dropdown__option__additional' title={item.extra}>
-                <Icon id='info-circle' icon={InfoIcon} />
-              </div>
-            )}
-          </div>
-        ))}
-      </div>
-    );
-  }
-
-}
-
 class PrivacyDropdown extends PureComponent {
 
   static propTypes = {
diff --git a/app/javascript/flavours/glitch/features/compose/components/privacy_dropdown_menu.jsx b/app/javascript/flavours/glitch/features/compose/components/privacy_dropdown_menu.jsx
new file mode 100644
index 00000000000000..03a0b76d23914d
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/compose/components/privacy_dropdown_menu.jsx
@@ -0,0 +1,128 @@
+import PropTypes from 'prop-types';
+import { useCallback, useEffect, useRef, useState } from 'react';
+
+import classNames from 'classnames';
+
+import { supportsPassiveEvents } from 'detect-passive-events';
+
+import InfoIcon from '@/material-icons/400-24px/info.svg?react';
+import { Icon } from 'flavours/glitch/components/icon';
+
+const listenerOptions = supportsPassiveEvents ? { passive: true, capture: true } : true;
+
+export const PrivacyDropdownMenu = ({ style, items, value, onClose, onChange }) => {
+  const nodeRef = useRef(null);
+  const focusedItemRef = useRef(null);
+  const [currentValue, setCurrentValue] = useState(value);
+
+  const handleDocumentClick = useCallback((e) => {
+    if (nodeRef.current && !nodeRef.current.contains(e.target)) {
+      onClose();
+      e.stopPropagation();
+    }
+  }, [nodeRef, onClose]);
+
+  const handleClick = useCallback((e) => {
+    const value = e.currentTarget.getAttribute('data-index');
+
+    e.preventDefault();
+
+    onClose();
+    onChange(value);
+  }, [onClose, onChange]);
+
+  const handleKeyDown = useCallback((e) => {
+    const value = e.currentTarget.getAttribute('data-index');
+    const index = items.findIndex(item => (item.value === value));
+
+    let element = null;
+
+    switch (e.key) {
+    case 'Escape':
+      onClose();
+      break;
+    case ' ':
+    case 'Enter':
+      handleClick(e);
+      break;
+    case 'ArrowDown':
+      element = nodeRef.current.childNodes[index + 1] || nodeRef.current.firstChild;
+      break;
+    case 'ArrowUp':
+      element = nodeRef.current.childNodes[index - 1] || nodeRef.current.lastChild;
+      break;
+    case 'Tab':
+      if (e.shiftKey) {
+        element = nodeRef.current.childNodes[index + 1] || nodeRef.current.firstChild;
+      } else {
+        element = nodeRef.current.childNodes[index - 1] || nodeRef.current.lastChild;
+      }
+      break;
+    case 'Home':
+      element = nodeRef.current.firstChild;
+      break;
+    case 'End':
+      element = nodeRef.current.lastChild;
+      break;
+    }
+
+    if (element) {
+      element.focus();
+      setCurrentValue(element.getAttribute('data-index'));
+      e.preventDefault();
+      e.stopPropagation();
+    }
+  }, [nodeRef, items, onClose, handleClick, setCurrentValue]);
+
+  useEffect(() => {
+    document.addEventListener('click', handleDocumentClick, { capture: true });
+    document.addEventListener('touchend', handleDocumentClick, listenerOptions);
+    focusedItemRef.current?.focus({ preventScroll: true });
+
+    return () => {
+      document.removeEventListener('click', handleDocumentClick, { capture: true });
+      document.removeEventListener('touchend', handleDocumentClick, listenerOptions);
+    };
+  }, [handleDocumentClick]);
+
+  return (
+    <ul style={{ ...style }} role='listbox' ref={nodeRef}>
+      {items.map(item => (
+        <li
+          role='option'
+          tabIndex={0}
+          key={item.value}
+          data-index={item.value}
+          onKeyDown={handleKeyDown}
+          onClick={handleClick}
+          className={classNames('privacy-dropdown__option', { active: item.value === currentValue })}
+          aria-selected={item.value === currentValue}
+          ref={item.value === currentValue ? focusedItemRef : null}
+        >
+          <div className='privacy-dropdown__option__icon'>
+            <Icon id={item.icon} icon={item.iconComponent} />
+          </div>
+
+          <div className='privacy-dropdown__option__content'>
+            <strong>{item.text}</strong>
+            {item.meta}
+          </div>
+
+          {item.extra && (
+            <div className='privacy-dropdown__option__additional' title={item.extra}>
+              <Icon id='info-circle' icon={InfoIcon} />
+            </div>
+          )}
+        </li>
+      ))}
+    </ul>
+  );
+};
+
+PrivacyDropdownMenu.propTypes = {
+  style: PropTypes.object,
+  items: PropTypes.array.isRequired,
+  value: PropTypes.string.isRequired,
+  onClose: PropTypes.func.isRequired,
+  onChange: PropTypes.func.isRequired,
+};

From e8155319c7366f482081a750cd05e01b5a5277ea Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 27 Feb 2024 19:26:26 +0100
Subject: [PATCH 0310/2191] Take advantage of upstream's refactor and reduce
 code duplication

---
 .../components/dropdown_icon_button.jsx       |   4 +-
 .../compose/components/dropdown_menu.jsx      | 125 ------------------
 2 files changed, 2 insertions(+), 127 deletions(-)
 delete mode 100644 app/javascript/flavours/glitch/features/compose/components/dropdown_menu.jsx

diff --git a/app/javascript/flavours/glitch/features/compose/components/dropdown_icon_button.jsx b/app/javascript/flavours/glitch/features/compose/components/dropdown_icon_button.jsx
index 0ced5a04ad0d14..9774d4260eb462 100644
--- a/app/javascript/flavours/glitch/features/compose/components/dropdown_icon_button.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/dropdown_icon_button.jsx
@@ -5,7 +5,7 @@ import Overlay from 'react-overlays/Overlay';
 
 import { IconButton } from 'flavours/glitch/components/icon_button';
 
-import DropdownMenu from './dropdown_menu';
+import { PrivacyDropdownMenu } from './privacy_dropdown_menu';
 
 export const DropdownIconButton = ({ value, disabled, icon, onChange, iconComponent, title, options }) => {
   const containerRef = useRef(null);
@@ -53,7 +53,7 @@ export const DropdownIconButton = ({ value, disabled, icon, onChange, iconCompon
         {({ props, placement }) => (
           <div {...props}>
             <div className={`dropdown-animation privacy-dropdown__dropdown ${placement}`}>
-              <DropdownMenu
+              <PrivacyDropdownMenu
                 items={options}
                 value={value}
                 onClose={handleClose}
diff --git a/app/javascript/flavours/glitch/features/compose/components/dropdown_menu.jsx b/app/javascript/flavours/glitch/features/compose/components/dropdown_menu.jsx
deleted file mode 100644
index 2f1adf2fd152f0..00000000000000
--- a/app/javascript/flavours/glitch/features/compose/components/dropdown_menu.jsx
+++ /dev/null
@@ -1,125 +0,0 @@
-import PropTypes from 'prop-types';
-import { PureComponent } from 'react';
-
-import classNames from 'classnames';
-
-import { supportsPassiveEvents } from 'detect-passive-events';
-
-import { Icon }  from 'flavours/glitch/components/icon';
-
-const listenerOptions = supportsPassiveEvents ? { passive: true, capture: true } : true;
-
-// copied from PrivacyDropdown; will require refactor with upstream down the line
-class DropdownMenu extends PureComponent {
-
-  static propTypes = {
-    style: PropTypes.object,
-    items: PropTypes.array.isRequired,
-    value: PropTypes.string.isRequired,
-    onClose: PropTypes.func.isRequired,
-    onChange: PropTypes.func.isRequired,
-  };
-
-  handleDocumentClick = e => {
-    if (this.node && !this.node.contains(e.target)) {
-      this.props.onClose();
-      e.stopPropagation();
-    }
-  };
-
-  handleKeyDown = e => {
-    const { items } = this.props;
-    const value = e.currentTarget.getAttribute('data-index');
-    const index = items.findIndex(item => {
-      return (item.value === value);
-    });
-    let element = null;
-
-    switch(e.key) {
-    case 'Escape':
-      this.props.onClose();
-      break;
-    case 'Enter':
-      this.handleClick(e);
-      break;
-    case 'ArrowDown':
-      element = this.node.childNodes[index + 1] || this.node.firstChild;
-      break;
-    case 'ArrowUp':
-      element = this.node.childNodes[index - 1] || this.node.lastChild;
-      break;
-    case 'Tab':
-      if (e.shiftKey) {
-        element = this.node.childNodes[index - 1] || this.node.lastChild;
-      } else {
-        element = this.node.childNodes[index + 1] || this.node.firstChild;
-      }
-      break;
-    case 'Home':
-      element = this.node.firstChild;
-      break;
-    case 'End':
-      element = this.node.lastChild;
-      break;
-    }
-
-    if (element) {
-      element.focus();
-      this.props.onChange(element.getAttribute('data-index'));
-      e.preventDefault();
-      e.stopPropagation();
-    }
-  };
-
-  handleClick = e => {
-    const value = e.currentTarget.getAttribute('data-index');
-
-    e.preventDefault();
-
-    this.props.onClose();
-    this.props.onChange(value);
-  };
-
-  componentDidMount () {
-    document.addEventListener('click', this.handleDocumentClick, { capture: true });
-    document.addEventListener('touchend', this.handleDocumentClick, listenerOptions);
-    if (this.focusedItem) this.focusedItem.focus({ preventScroll: true });
-  }
-
-  componentWillUnmount () {
-    document.removeEventListener('click', this.handleDocumentClick, { capture: true });
-    document.removeEventListener('touchend', this.handleDocumentClick, listenerOptions);
-  }
-
-  setRef = c => {
-    this.node = c;
-  };
-
-  setFocusRef = c => {
-    this.focusedItem = c;
-  };
-
-  render () {
-    const { style, items, value } = this.props;
-
-    return (
-      <div style={{ ...style }} role='listbox' ref={this.setRef}>
-        {items.map(item => (
-          <div role='option' tabIndex={0} key={item.value} data-index={item.value} onKeyDown={this.handleKeyDown} onClick={this.handleClick} className={classNames('privacy-dropdown__option', { active: item.value === value })} aria-selected={item.value === value} ref={item.value === value ? this.setFocusRef : null}>
-            <div className='privacy-dropdown__option__icon'>
-              <Icon id={item.icon} icon={item.iconComponent} />
-            </div>
-
-            <div className='privacy-dropdown__option__content'>
-              <strong>{item.text}</strong>
-              {item.meta}
-            </div>
-          </div>
-        ))}
-      </div>
-    );
-  }
-
-}
-
-export default DropdownMenu;

From c19787f3f4c42c35060705041a64905738acf597 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 27 Feb 2024 21:27:51 +0100
Subject: [PATCH 0311/2191] Add doodle feature back (#2652)

---
 .../compose/components/upload_button.jsx      | 45 +++++++++++++++----
 .../containers/upload_button_container.js     |  7 +++
 .../flavours/glitch/locales/en.json           |  1 +
 3 files changed, 44 insertions(+), 9 deletions(-)

diff --git a/app/javascript/flavours/glitch/features/compose/components/upload_button.jsx b/app/javascript/flavours/glitch/features/compose/components/upload_button.jsx
index caa6784cb9a420..ed2cbb04f27223 100644
--- a/app/javascript/flavours/glitch/features/compose/components/upload_button.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/upload_button.jsx
@@ -7,10 +7,14 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
 import PhotoLibraryIcon from '@/material-icons/400-20px/photo_library.svg?react';
-import { IconButton } from 'flavours/glitch/components/icon_button';
+import BrushIcon from '@/material-icons/400-24px/brush.svg?react';
+import UploadFileIcon from '@/material-icons/400-24px/upload_file.svg?react';
+
+import { DropdownIconButton } from './dropdown_icon_button';
 
 const messages = defineMessages({
   upload: { id: 'upload_button.label', defaultMessage: 'Add images, a video or an audio file' },
+  doodle: { id: 'compose.attach.doodle', defaultMessage: 'Draw something' },
 });
 
 const makeMapStateToProps = () => {
@@ -21,16 +25,12 @@ const makeMapStateToProps = () => {
   return mapStateToProps;
 };
 
-const iconStyle = {
-  height: null,
-  lineHeight: '27px',
-};
-
 class UploadButton extends ImmutablePureComponent {
 
   static propTypes = {
     disabled: PropTypes.bool,
     onSelectFile: PropTypes.func.isRequired,
+    onDoodleOpen: PropTypes.func.isRequired,
     style: PropTypes.object,
     resetFileKey: PropTypes.number,
     acceptContentTypes: ImmutablePropTypes.listOf(PropTypes.string).isRequired,
@@ -43,8 +43,12 @@ class UploadButton extends ImmutablePureComponent {
     }
   };
 
-  handleClick = () => {
-    this.fileElement.click();
+  handleSelect = (value) => {
+    if (value === 'upload') {
+      this.fileElement.click();
+    } else {
+      this.props.onDoodleOpen();
+    }
   };
 
   setRef = (c) => {
@@ -56,9 +60,32 @@ class UploadButton extends ImmutablePureComponent {
 
     const message = intl.formatMessage(messages.upload);
 
+    const options = [
+      {
+        icon: 'cloud-upload',
+        iconComponent: UploadFileIcon,
+        value: 'upload',
+        text: intl.formatMessage(messages.upload),
+      },
+      {
+        icon: 'paint-brush',
+        iconComponent: BrushIcon,
+        value: 'doodle',
+        text: intl.formatMessage(messages.doodle),
+      },
+    ];
+
     return (
       <div className='compose-form__upload-button'>
-        <IconButton icon='paperclip' iconComponent={PhotoLibraryIcon} title={message} disabled={disabled} onClick={this.handleClick} className='compose-form__upload-button-icon' size={18} inverted style={iconStyle} />
+        <DropdownIconButton
+          icon='paperclip'
+          iconComponent={PhotoLibraryIcon}
+          title={message}
+          disabled={disabled}
+          onChange={this.handleSelect}
+          value='upload'
+          options={options}
+        />
         <label>
           <span style={{ display: 'none' }}>{message}</span>
           <input
diff --git a/app/javascript/flavours/glitch/features/compose/containers/upload_button_container.js b/app/javascript/flavours/glitch/features/compose/containers/upload_button_container.js
index 7c4757b6c3da0d..2082510f126be5 100644
--- a/app/javascript/flavours/glitch/features/compose/containers/upload_button_container.js
+++ b/app/javascript/flavours/glitch/features/compose/containers/upload_button_container.js
@@ -1,6 +1,7 @@
 import { connect } from 'react-redux';
 
 import { uploadCompose } from '../../../actions/compose';
+import { openModal } from '../../../actions/modal';
 import UploadButton from '../components/upload_button';
 
 const mapStateToProps = state => ({
@@ -14,6 +15,12 @@ const mapDispatchToProps = dispatch => ({
     dispatch(uploadCompose(files));
   },
 
+  onDoodleOpen() {
+    dispatch(openModal({
+      modalType: 'DOODLE',
+      modalProps: { noEsc: true, noClose: true },
+    }));
+  },
 });
 
 export default connect(mapStateToProps, mapDispatchToProps)(UploadButton);
diff --git a/app/javascript/flavours/glitch/locales/en.json b/app/javascript/flavours/glitch/locales/en.json
index 95ea68f93bfe9d..5f64fffdcc0586 100644
--- a/app/javascript/flavours/glitch/locales/en.json
+++ b/app/javascript/flavours/glitch/locales/en.json
@@ -14,6 +14,7 @@
   "column_subheading.lists": "Lists",
   "column_subheading.navigation": "Navigation",
   "community.column_settings.allow_local_only": "Show local-only toots",
+  "compose.attach.doodle": "Draw something",
   "compose.change_federation": "Change federation settings",
   "compose.content-type.change": "Change advanced formatting options",
   "compose.content-type.html": "HTML",

From edfc53856f03e3948c2c6760bb425f74dbb24178 Mon Sep 17 00:00:00 2001
From: Roni Laukkarinen <roni@dude.fi>
Date: Wed, 28 Feb 2024 14:01:18 +0200
Subject: [PATCH 0312/2191] Fix the regression with the search icon position
 (#29417)

---
 app/javascript/styles/mastodon/components.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 93f2c0a48bb131..29c91ef7bc6f82 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -5204,6 +5204,7 @@ a.status-card {
     color: $darker-text-color;
     cursor: default;
     pointer-events: none;
+    margin-inline-start: 16px - 2px;
 
     &.active {
       pointer-events: auto;

From deffb8ecb6d2eb384e4d9237f4918be664f21cf9 Mon Sep 17 00:00:00 2001
From: Jeong Arm <kjwonmail@gmail.com>
Date: Wed, 28 Feb 2024 21:07:06 +0900
Subject: [PATCH 0313/2191] Show comments in the admin/instances page (#29240)

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/styles/mastodon/admin.scss     | 17 +++++++++++++++++
 app/views/admin/instances/_instance.html.haml |  4 ++++
 2 files changed, 21 insertions(+)

diff --git a/app/javascript/styles/mastodon/admin.scss b/app/javascript/styles/mastodon/admin.scss
index fcd630c23c9ecc..ef9c2fd88966ba 100644
--- a/app/javascript/styles/mastodon/admin.scss
+++ b/app/javascript/styles/mastodon/admin.scss
@@ -324,6 +324,23 @@ $content-width: 840px;
       padding-bottom: 0;
       margin-bottom: 0;
       border-bottom: 0;
+
+      .comment {
+        display: block;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        margin-top: 4px;
+
+        &.private-comment {
+          display: block;
+          color: $darker-text-color;
+        }
+
+        &.public-comment {
+          display: block;
+          color: $secondary-text-color;
+        }
+      }
     }
 
     & > p {
diff --git a/app/views/admin/instances/_instance.html.haml b/app/views/admin/instances/_instance.html.haml
index 65cf789ce316df..522a2444bb9d6b 100644
--- a/app/views/admin/instances/_instance.html.haml
+++ b/app/views/admin/instances/_instance.html.haml
@@ -7,6 +7,10 @@
       %small
         - if instance.domain_block
           = instance.domain_block.policies.map { |policy| t(policy, scope: 'admin.instances.content_policies.policies') }.join(' · ')
+          - if instance.domain_block.public_comment.present?
+            %span.comment.public-comment #{t('admin.domain_blocks.public_comment')}: #{instance.domain_block.public_comment}
+          - if instance.domain_block.private_comment.present?
+            %span.comment.private-comment #{t('admin.domain_blocks.private_comment')}: #{instance.domain_block.private_comment}
         - elsif instance.domain_allow
           = t('admin.accounts.whitelisted')
         - else

From 7f84bbfd92377689f84121ec45c5b9d809d94cde Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 28 Feb 2024 13:14:42 +0100
Subject: [PATCH 0314/2191] New Crowdin Translations (automated) (#29430)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/eu.json |  2 +-
 app/javascript/mastodon/locales/fa.json | 25 ++++++--
 app/javascript/mastodon/locales/ko.json |  2 +-
 app/javascript/mastodon/locales/ms.json |  4 ++
 config/locales/devise.fa.yml            | 84 ++++++++++++++-----------
 config/locales/fa.yml                   |  5 +-
 config/locales/simple_form.fi.yml       |  4 +-
 7 files changed, 78 insertions(+), 48 deletions(-)

diff --git a/app/javascript/mastodon/locales/eu.json b/app/javascript/mastodon/locales/eu.json
index da7d03ce4199ea..c21fa1d204d998 100644
--- a/app/javascript/mastodon/locales/eu.json
+++ b/app/javascript/mastodon/locales/eu.json
@@ -500,7 +500,7 @@
   "onboarding.share.message": "{username} naiz #Mastodon-en! Jarrai nazazu hemen: {url}",
   "onboarding.share.next_steps": "Hurrengo urrats posibleak:",
   "onboarding.share.title": "Partekatu zure profila",
-  "onboarding.start.lead": "Zure Mastodoneko kontu berria prest dago. Jakin nola atera diezaioekun etekin handiena hemen:",
+  "onboarding.start.lead": "Mastodonen parte zara orain, bakarra eta deszentralizatua den sare-sozialaren plataforma, non zuk, eta ez algoritmo batek, zeure esperientzia pertsonaliza dezakezun. Igaro ezazu muga soziala:",
   "onboarding.start.skip": "Urrats guztiak saltatu nahi dituzu?",
   "onboarding.start.title": "Lortu duzu!",
   "onboarding.steps.follow_people.body": "Zure jarioa zuk pertsonalizatzen duzu. Bete dezagun jende interesgarriaz.",
diff --git a/app/javascript/mastodon/locales/fa.json b/app/javascript/mastodon/locales/fa.json
index 4050ca9f9f7b8f..9029ba3cb5c3cf 100644
--- a/app/javascript/mastodon/locales/fa.json
+++ b/app/javascript/mastodon/locales/fa.json
@@ -110,7 +110,7 @@
   "column.about": "درباره",
   "column.blocks": "کاربران مسدود شده",
   "column.bookmarks": "نشانک‌ها",
-  "column.community": "خط زمانی محلّی",
+  "column.community": "خط زمانی محلی",
   "column.direct": "اشاره‌های خصوصی",
   "column.directory": "مرور نمایه‌ها",
   "column.domain_blocks": "دامنه‌های مسدود شده",
@@ -131,7 +131,7 @@
   "column_header.show_settings": "نمایش تنظیمات",
   "column_header.unpin": "برداشتن سنجاق",
   "column_subheading.settings": "تنظیمات",
-  "community.column_settings.local_only": "فقط محلّی",
+  "community.column_settings.local_only": "فقط محلی",
   "community.column_settings.media_only": "فقط رسانه",
   "community.column_settings.remote_only": "تنها دوردست",
   "compose.language.change": "تغییر زبان",
@@ -228,7 +228,7 @@
   "empty_column.account_unavailable": "نمایهٔ موجود نیست",
   "empty_column.blocks": "هنوز کسی را مسدود نکرده‌اید.",
   "empty_column.bookmarked_statuses": "هنوز هیچ فرستهٔ نشانه‌گذاری شده‌ای ندارید. هنگامی که فرسته‌ای را نشانه‌گذاری کنید، این‌جا نشان داده خواهد شد.",
-  "empty_column.community": "خط زمانی محلّی خالی است. چیزی بنویسید تا چرخش بچرخد!",
+  "empty_column.community": "خط زمانی محلی خالیست. چیزی نوشته تا چرخش بچرخد!",
   "empty_column.direct": "هنوز هیچ اشاره خصوصی‌ای ندارید. هنگامی که چنین پیامی بگیرید یا بفرستید این‌جا نشان داده خواهد شد.",
   "empty_column.domain_blocks": "هنوز هیچ دامنه‌ای مسدود نشده است.",
   "empty_column.explore_statuses": "الآن چیزی پرطرفدار نیست. بعداً دوباره بررسی کنید!",
@@ -277,6 +277,17 @@
   "follow_request.authorize": "اجازه دهید",
   "follow_request.reject": "رد کنید",
   "follow_requests.unlocked_explanation": "با این که حسابتان قفل نیست، کارکنان {domain} فکر کردند که ممکن است بخواهید درخواست‌ها از این حساب‌ها را به صورت دستی بازبینی کنید.",
+  "follow_suggestions.curated_suggestion": "گزینش سردبیر",
+  "follow_suggestions.dismiss": "دیگر نشان داده نشود",
+  "follow_suggestions.hints.featured": "این نمایه به دست گروه {domain} دستچین شده.",
+  "follow_suggestions.hints.friends_of_friends": "این نمایه بین کسانی که پی می‌گیرید محبوب است.",
+  "follow_suggestions.hints.most_followed": "این نمایه روی {domain} بسیار پی‌گرفته شده.",
+  "follow_suggestions.hints.most_interactions": "این نمایه اخیراُ روی {domain} توجّه زیادی گرفته.",
+  "follow_suggestions.hints.similar_to_recently_followed": "این نمایه شبیه نمایه‌هاییست که اخیراً پی‌گرفته‌اید.",
+  "follow_suggestions.personalized_suggestion": "پیشنهاد شخصی",
+  "follow_suggestions.popular_suggestion": "پیشنهاد محبوب",
+  "follow_suggestions.view_all": "دیدن همه",
+  "follow_suggestions.who_to_follow": "افرادی برای پی‌گیری",
   "followed_tags": "برچسب‌های پی‌گرفته",
   "footer.about": "درباره",
   "footer.directory": "فهرست نمایه‌ها",
@@ -345,7 +356,7 @@
   "keyboard_shortcuts.home": "گشودن خط زمانی خانگی",
   "keyboard_shortcuts.hotkey": "میان‌بر",
   "keyboard_shortcuts.legend": "نمایش این نشانه",
-  "keyboard_shortcuts.local": "گشودن خط زمانی محلّی",
+  "keyboard_shortcuts.local": "گشودن خط زمانی محلی",
   "keyboard_shortcuts.mention": "اشاره به نویسنده",
   "keyboard_shortcuts.muted": "گشودن فهرست کاربران خموش",
   "keyboard_shortcuts.my_profile": "گشودن نمایه‌تان",
@@ -396,7 +407,7 @@
   "navigation_bar.advanced_interface": "بازکردن در رابط کاربری وب پیشرفته",
   "navigation_bar.blocks": "کاربران مسدود شده",
   "navigation_bar.bookmarks": "نشانک‌ها",
-  "navigation_bar.community_timeline": "خط زمانی محلّی",
+  "navigation_bar.community_timeline": "خط زمانی محلی",
   "navigation_bar.compose": "نوشتن فرستهٔ تازه",
   "navigation_bar.direct": "اشاره‌های خصوصی",
   "navigation_bar.discover": "گشت و گذار",
@@ -475,8 +486,10 @@
   "onboarding.follows.lead": "You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!",
   "onboarding.follows.title": "Popular on Mastodon",
   "onboarding.profile.discoverable": "نمایه خود را قابل نمایش کنید",
+  "onboarding.profile.discoverable_hint": "خواسته‌اید روی ماستودون کشف شوید. ممکن است فرسته‌هایتان در نتیحهٔ جست‌وجوها و فرسته‌های داغ ظاهر شده و نمایه‌تان به افرادی با علایق مشابهتان پیشنهاد شود.",
   "onboarding.profile.display_name": "نام نمایشی",
   "onboarding.profile.display_name_hint": "نام کامل یا نام باحالتان…",
+  "onboarding.profile.lead": "همواره می‌توانید این مورد را در تنظیمات که گزینه‌ّای شخصی سازی بیش‌تری نیز دارد کامل کنید.",
   "onboarding.profile.note": "درباره شما",
   "onboarding.profile.note_hint": "می‌توانید افراد دیگر را @نام‌بردن یا #برچسب بزنید…",
   "onboarding.profile.save_and_continue": "ذخیره کن و ادامه بده",
@@ -522,6 +535,7 @@
   "privacy.private.short": "پی‌گیرندگان",
   "privacy.public.long": "هرکسی در و بیرون از ماستودون",
   "privacy.public.short": "عمومی",
+  "privacy.unlisted.additional": "درست مثل عمومی رفتار می‌کند؛ جز این که فرسته در برچسب‌ها یا خوراک‌های زنده، کشف یا جست‌وجوی ماستودون ظاهر نخواهد شد. حتا اگر کلیّت نمایه‌تان اجازه داده باشد.",
   "privacy.unlisted.long": "سروصدای الگوریتمی کم‌تر",
   "privacy.unlisted.short": "عمومی ساکت",
   "privacy_policy.last_updated": "آخرین به‌روز رسانی در {date}",
@@ -541,6 +555,7 @@
   "relative_time.minutes": "{number} دقیقه",
   "relative_time.seconds": "{number} ثانیه",
   "relative_time.today": "امروز",
+  "reply_indicator.attachments": "{count, plural, one {# پیوست} other {# پیوست}}",
   "reply_indicator.cancel": "لغو",
   "reply_indicator.poll": "نظرسنجی",
   "report.block": "انسداد",
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index 36290cbb95d8c6..d9192e5c61b046 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -212,7 +212,7 @@
   "emoji_button.custom": "사용자 지정",
   "emoji_button.flags": "깃발",
   "emoji_button.food": "음식과 마실것",
-  "emoji_button.label": "에모지를 추가",
+  "emoji_button.label": "에모지 추가",
   "emoji_button.nature": "자연",
   "emoji_button.not_found": "해당하는 에모지가 없습니다",
   "emoji_button.objects": "물건",
diff --git a/app/javascript/mastodon/locales/ms.json b/app/javascript/mastodon/locales/ms.json
index 88b4680ae0fb6b..3d6ba920c97765 100644
--- a/app/javascript/mastodon/locales/ms.json
+++ b/app/javascript/mastodon/locales/ms.json
@@ -277,7 +277,11 @@
   "follow_request.authorize": "Benarkan",
   "follow_request.reject": "Tolak",
   "follow_requests.unlocked_explanation": "Walaupun akaun anda tidak dikunci, kakitangan {domain} merasakan anda mungkin ingin menyemak permintaan ikutan daripada akaun ini secara manual.",
+  "follow_suggestions.curated_suggestion": "",
   "follow_suggestions.dismiss": "Jangan papar lagi",
+  "follow_suggestions.hints.featured": "Profil{domain.",
+  "follow_suggestions.hints.friends_of_friends": "This profile is popular among the people you follow.",
+  "follow_suggestions.hints.most_followed": ".",
   "follow_suggestions.personalized_suggestion": "Cadangan peribadi",
   "follow_suggestions.popular_suggestion": "Cadangan terkenal",
   "follow_suggestions.view_all": "Lihat semua",
diff --git a/config/locales/devise.fa.yml b/config/locales/devise.fa.yml
index d4198626d4982a..c441e346a24b44 100644
--- a/config/locales/devise.fa.yml
+++ b/config/locales/devise.fa.yml
@@ -2,16 +2,17 @@
 fa:
   devise:
     confirmations:
-      confirmed: نشانی ایمیل شما با موفقیت تأیید شد.
-      send_instructions: تا دقایقی دیگر ایمیلی خواهید گرفت که به شما می‌گوید چگونه باید نشانی ایمیل خود را تأیید کنید. اگر این ایمیل نیامد، لطفاً پوشهٔ هرزنامه‌هایتان را بررسی کنید.
-      send_paranoid_instructions: اگر ایمیل شما در پایگاه دادهٔ ما موجود باشد، تا دقایقی دیگر ایمیلی خواهید گرفت که به شما می‌گوید چگونه باید نشانی ایمیل خود را تأیید کنید. اگر این ایمیل نیامد، لطفاً پوشهٔ هرزنامه‌هایتان را بررسی کنید.
+      confirmed: نشانی رایانامه‌تان با موفقیت تأیید شد.
+      send_instructions: تا دقایقی دیگر رایانامه‌ای با دستورالعمل تأیید نشانی رایانامه‌تان دریافت خواهید کرد. اگر این رایانامه را نگرفتید، لطفاً پوشهٔ هرزنامه‌هایتان را بررسی کنید.
+      send_paranoid_instructions: اگر نشانی رایانامه‌تان در پایگاه داده‌مان وجود داشته باشد، تا دقایقی دیگر تا دقایقی دیگر رایانامه‌ای با دستورالعمل تأیید نشانی رایانامه‌تان دریافت خواهید کرد. اگر این رایانامه را نگرفتید، لطفاً پوشهٔ هرزنامه‌هایتان را بررسی کنید.
     failure:
-      already_authenticated: همین الآن هم وارد شده‌اید.
-      inactive: حساب شما هنوز فعال نشده است.
+      already_authenticated: از پیش وارد شده‌اید.
+      inactive: هنوز حسابتان فعّال نشده.
       invalid: "%{authentication_keys} یا گذرواژه نامعتبر."
       last_attempt: پیش از آن که حساب شما قفل شود، یک فرصت دیگر دارید.
-      locked: حساب شما قفل شده است.
+      locked: حسابتان قفل شده.
       not_found_in_database: "%{authentication_keys} یا گذرواژه نامعتبر."
+      omniauth_user_creation_failure: خطای ایجاد حسابی برای این هویت.
       pending: حساب شما همچنان در دست بررسی است.
       timeout: مهلت این ورود شما به سر رسید. برای ادامه، دوباره وارد شوید.
       unauthenticated: برای ادامه باید وارد شوید یا ثبت نام کنید.
@@ -24,37 +25,42 @@ fa:
         explanation_when_pending: شما با این نشانی ایمیل برای %{host} درخواست دعوت‌نامه داده‌اید. اگر ایمیل خود را تأیید کنید، ما درخواست شما را بررسی خواهیم کرد. تا وقتی بررسی تمام نشده، شما نمی‌توانید به حساب خود وارد شوید. اگر درخواست شما رد شود، ما اطلاعاتی را که از شما داریم پاک خواهیم کرد پس نیازی به کاری از سمت شما نخواهد بود. اگر شما چنین درخواستی نداده‌اید، لطفاً این ایمیل را نادیده بگیرید.
         extra_html: لطفاً همچنین <a href="%{terms_path}">قوانین کارساز</a> و <a href="%{policy_path}">شرایط خدمتمان</a> را بررسی کنید.
         subject: 'ماستودون: دستورالعمل تأیید برای %{instance}'
-        title: تأیید نشانی ایمیل
+        title: تأیید نشانی رایانامه
       email_changed:
-        explanation: 'نشانی ایمیل حساب شما تغییر می‌کند به:'
-        extra: اگر شما ایمیل خود را عوض نکردید، شاید کسی به حساب شما دسترسی پیدا کرده است. در این صورت لطفاً هر چه زودتر گذرواژه حسابتان را عوض کنید. اگر گذرواژه‌تان دیگر کار نمی‌کند، لطفاً با مدیر سرور تماس بگیرید.
-        subject: 'ماستودون: نشانی ایمیل عوض شد'
-        title: نشانی ایمیل تازه
+        explanation: 'نشانی رایانامهٔ حسابتان تغییر می‌کند به:'
+        extra: اگر رایانامه‌تان را عوض نکرده‌اید، ممکن است کسی به حسابتان دسترسی پیدا کرده باشد. لطفاً فوراُ گذرواژه‌تان را عوض کرده و اگر از حسابتان بیرون مانده‌اید با مدیر کارساز تماس بگیرید.
+        subject: 'ماستودون: رایانامه عوض شد'
+        title: نشانی جدید رایانامه
       password_change:
-        explanation: گذرواژه حساب شما تغییر کرد.
-        extra: اگر شما گذرواژه حسابتان را تغییر ندادید، شاید کسی به حساب شما دسترسی پیدا کرده است. در این صورت لطفاً هر چه زودتر گذرواژه حسابتان را عوض کنید. اگر گذرواژه‌تان دیگر کار نمی‌کند، لطفاً با مدیر سرور تماس بگیرید.
-        subject: 'ماستودون: گذرواژه‌تان عوض شد'
-        title: گذرواژه‌تان عوض شد
+        explanation: گذرواژهٔ حسابتان عوض شده.
+        extra: اگر گذرواژه‌تان را عوض نکرده‌اید، ممکن است کسی به حسابتان دسترسی پیدا کرده باشد. لطفاً فوراُ گذرواژه‌تان را عوض کرده و اگر از حسابتان بیرون مانده‌اید با مدیر کارساز تماس بگیرید.
+        subject: 'ماستودون: گذرواژه عوض شد'
+        title: گذرواژه عوض شد
       reconfirmation_instructions:
-        explanation: نشانی تازه را تأیید کنید تا ایمیل‌تان عوض شود.
-        extra: اگر شما باعث این تغییر نبودید، لطفاً این ایمیل را نادیده بگیرید. تا زمانی که شما پیوند بالا را باز نکنید، نشانی ایمیل مربوط به حساب شما عوض نخواهد شد.
+        explanation: برای تغییر رایانامه‌تان نشانی جدید را تأیید کنید.
+        extra: اگر خودتان چنین درخواستی نداده‌اید لطفاً از این رایانامه چشم بپوشید. نشانی رایانامهٔ حساب ماستودون تا وقتی به پیوند بالا دسترسی پیدا نکنید عوض نخواهد شد.
         subject: 'ماستودون: تأیید رایانامه برای %{instance}'
-        title: تأیید نشانی ایمیل
+        title: تأیید نشانی رایانامه
       reset_password_instructions:
         action: تغییر گذرواژه
-        explanation: شما گذرواژه تازه‌ای برای حسابتان درخواست کردید.
-        extra: اگر شما چنین درخواستی نکردید، لطفاً این ایمیل را نادیده بگیرید. تا زمانی که شما پیوند بالا را باز نکنید و گذرواژه تازه‌ای نسازید، گذرواژه شما عوض نخواهد شد.
-        subject: 'ماستودون: راهنمایی برای بازنشانی گذرواژه'
+        explanation: درخواست گذرواژه‌ای تازه‌ای برای حسابتان کرده‌اید.
+        extra: اگر خودتان چنین درخواستی نداده‌اید لطفاً از این رایانامه چشم بپوشید. گذرواژه‌تان تا وقتی به پیوند بالا دسترسی پیدا نکرده و گذرواژهٔ جدیدی نسازید عوض نخواهد شد.
+        subject: 'ماستودون: دستورالعمل‌های بازنشانی گذرواژه'
         title: بازنشانی گذرواژه
       two_factor_disabled:
-        subject: 'ماستودون: تأیید هویت دو مرحله‌ای از کار افتاد'
-        title: ورود دومرحله‌ای غیرفعال
+        explanation: ورود اکنون تنها با نشانی رایانامه و گذرواژه ممکن است.
+        subject: 'ماستودون: هویت‌سنجی دو مرحله‌ای از کار افتاده'
+        subtitle: هویت‌سنجی دو مرحله‌ای برای حسابتان از کار افتاده.
+        title: ورود دومرحله‌ای از کار افتاده
       two_factor_enabled:
-        subject: 'ماستودون: تأیید هویت دومرحله‌ای به کار افتاد'
-        title: ورود دومرحله‌ای فعال
+        explanation: ورود نیازمند ژتونی تولید شده به دست کارهٔ TOTP جفت‌شده است.
+        subject: 'ماستودون: هویت‌سنجی دومرحله‌ای به کار افتاده'
+        subtitle: هویت‌سنجی دو عاملی برای حسابتان به کار افتاده.
+        title: ورود دومرحله‌ای به کار افتاده
       two_factor_recovery_codes_changed:
         explanation: کدهای بازیابی پیشین نامعتبر شده و کدهای جدیدی ساخته شدند.
         subject: 'ماستودون: کدهای بازیابی برای تأیید هویت دو مرحله‌ای دوباره ساخته شدند'
+        subtitle: کدهای بازیابی پیشین از اعتبار ساقط شده و کدهایی جدید ایجاد شدند.
         title: کدهای بازیابی تأیید هویت دو مرحله‌ای عوض شده‌اند
       unlock_instructions:
         subject: 'ماستودون: دستورالعمل‌های قفل‌گشایی'
@@ -68,9 +74,13 @@ fa:
           subject: 'ماستودون: کلید امنیتی حذف شد'
           title: یکی از کلیدهای امنیتیتان حذف شد
       webauthn_disabled:
+        explanation: هویت‌سنجی با کلیدهای امنیتی برای حسابتان از کار افتاده.
+        extra: ورود اکنون تنها با ژتون تولید شده به دست کارهٔ TOTP جفت‌شده ممکن است.
         subject: 'ماستودون: تأیید هویت با کلیدهای امنیتی از کار افتاد'
         title: کلیدهای امنیتی از کار افتادند
       webauthn_enabled:
+        explanation: هویت‌سنجی با کلیدهای امنیتی برای حسابتان به کار افتاده.
+        extra: کلید امنیتیتان اکنون می‌تواند برای ورود استفاده شود.
         subject: 'ماستودون: تأیید هویت با کلید امنیتی به کار افتاد'
         title: کلیدهای امنیتی به کار افتادند
     omniauth_callbacks:
@@ -86,22 +96,22 @@ fa:
       destroyed: بدرود! حساب شما با موفقیت لغو شد. امیدواریم دوباره شما را ببینیم.
       signed_up: خوش آمدید! شما با موفقیت ثبت نام کردید.
       signed_up_but_inactive: خوش آمدید! با موفقیت ثبت نام کردید. ولی هنوز وارد نشده‌اید؛ چرا که حسابتان هنوز فعال نشده است.
-      signed_up_but_locked: خوش آمدید! با موفقیت ثبت نام کردید. ولی هنوز وارد نشده‌اید؛ چرا که حسابتان قفل است.
-      signed_up_but_pending: پیغامی که دارای یک پیوند برای تأیید است به نشانی ایمیل شما فرستاده شده. پس از این‌که پیوند را باز کردید، ما درخواست شما را بررسی خواهیم کرد. اگر درخواست شما پذیرفته شود، به شما خواهیم گفت.
-      signed_up_but_unconfirmed: پیامی با یک پیوند تأیید به نشانی ایمیل شما فرستاده شده. لطفاً پیوند موجود در ایمیل را دنبال کنید تا حسابتان فعال شود. اگر این ایمیل نیامد، لطفاً پوشهٔ هرزنامه‌هایتان را بررسی کنید.
-      update_needs_confirmation: شما با موفقیت حسابتان را به‌روز کردید، ولی لازم است که ما نشانی ایمیل تازهٔ شما را تأیید کنیم. لطفاً ایمیل خود را ببینید و پیوند موجود در ایمیل را دنبال کنید تا تا نشانی ایمیل تازهٔ شما تأیید شود. اگر این ایمیل نیامد، لطفاً پوشهٔ هرزنامه‌هایتان را بررسی کنید.
-      updated: حسابتان با موفقبت به‌روز شد.
+      signed_up_but_locked: با موفّقیت ثبت‌نام کرده‌اید. با این حال نمی‌توان واردتان کرد؛ چرا که حسابتان قفل است.
+      signed_up_but_pending: پیامی با پیوند تأیید به نشانی رایانامه‌تان فرستاده شده. پس از زدن پیوند درخواستتان را بازبینی خواهیم کرد. در صورت پذیرش آگاه خواهید شد.
+      signed_up_but_unconfirmed: پیامی با پیوند تأیید به نشانی رایانامه‌تان فرستاده شده. لطفاً برای فعّال کردن حسابتان پیوند را بزنید. اگر این رایانامه را نگرفته‌اید شاخهٔ هرزنامه‌ها را بررسی کنید.
+      update_needs_confirmation: حسابتان را با موفّقیت به‌روز کردید؛‌ ولی باید نشانی رایانامهٔ جدیتان را تأیید کنیم. لطفاً رایانامه‌تان را بررسی کرده و برای تأیید نشانی رایانهٔ جدیدتان پیوند را بزنید. اگر این رایانامه را نگرفته‌اید شاخهٔ هرزنامه‌ها را بررسی کنید.
+      updated: حسابتان با موفّقیت به‌روز شد.
     sessions:
-      already_signed_out: با موفقیت خارج شدید.
-      signed_in: با موفقیت وارد شدید.
-      signed_out: با موفقیت خارج شدید.
+      already_signed_out: با موفّقیت خارج شدید.
+      signed_in: با موفّقیت وارد شدید.
+      signed_out: با موفّقیت خارج شدید.
     unlocks:
-      send_instructions: تا دقایقی دیگر ایمیلی خواهید گرفت که به شما می‌گوید چگونه باید قفل حساب خود را باز کنید. اگر این ایمیل نیامد، لطفاً پوشهٔ هرزنامه‌هایتان را بررسی کنید.
-      send_paranoid_instructions: اگر حساب شما موجود باشد، تا دقایقی دیگر ایمیلی خواهید گرفت که به شما می‌گوید چگونه باید قفل آن را باز کنید. اگر این ایمیل نیامد، لطفاً پوشهٔ هرزنامه‌هایتان را بررسی کنید.
-      unlocked: قفل حساب شما با موفقیت باز شد. لطفاً برای ادامه وارد سیستم شوید.
+      send_instructions: تا دقایقی دیگر رایانامه‌ای با دستورالعمل قفل‌گشایی حسابتان دریافت خواهید کرد. اگر این رایانامه را نگرفتید، لطفاً پوشهٔ هرزنامه‌هایتان را بررسی کنید.
+      send_paranoid_instructions: اگر حسابتان وجود داشته باشد تا دقایقی دیگر رایانامه‌ای با دستورالعمل قفل‌گشاییش دریافت خواهید کرد. اگر این رایانامه را نگرفتید، لطفاً پوشهٔ هرزنامه‌هایتان را بررسی کنید.
+      unlocked: حسابتان با موفّقیت قفل‌گشایی شد. لطفاً برای ادامه وارد شوید.
   errors:
     messages:
-      already_confirmed: تأیید شده، لطفاً وارد شوید
+      already_confirmed: از پیش تأیید شده. لطفاً ورود را بیازمایید
       confirmation_period_expired: باید ظرف %{period} تأیید شود، لطفاً دوباره درخواست دهید
       expired: مهلتش به سر رسید، لطفاً دوباره درخواست دهید
       not_found: پیدا نشد
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index bb3368dd9e54e1..f6ff3797455557 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -80,7 +80,7 @@ fa:
       joined: عضو شده در
       location:
         all: همه
-        local: محلّی
+        local: محلی
         remote: کارسازهای دیگر
         title: مکان
       login_status: وضعیت ورود
@@ -415,13 +415,14 @@ fa:
       public_comment: یادداشت عمومی
       public_comment_hint: یادداشتی دربارهٔ محدودیت روی این دامین برای عموم، در صورتی که فهرست دامین‌های محدود شده منتشر شود.
       reject_media: نپذیرفتن پرونده‌های رسانه‌ای
-      reject_media_hint: پرونده‌های رسانه‌ای ذخیره‌شدهٔ محلّی را پاک کرده و از بارگیریشان در آینده خودداری می‌کند. بی‌تأثیر روی معلق‌ها
+      reject_media_hint: پرونده‌های رسانه‌ای ذخیره‌شدهٔ محلی را پاک کرده و از بارگیریشان در آینده خودداری می‌کند. بی‌تأثیر روی معلّق‌ها
       reject_reports: نپذیرفتن گزارش‌ها
       reject_reports_hint: گزارش‌هایی را که از این دامنه می‌آید نادیده می‌گیرد. بی‌تأثیر برای معلق‌شده‌ها
       undo: واگردانی مسدودسازی دامین
       view: دیدن مسدودسازی دامنه
     email_domain_blocks:
       add_new: افزودن تازه
+      allow_registrations_with_approval: اجازهٔ ثبت‌نام با تأیید
       attempts_over_week:
         one: "%{count} تلاش در هفتهٔ گذشته"
         other: "%{count} تلاش ورود در هفتهٔ گذشته"
diff --git a/config/locales/simple_form.fi.yml b/config/locales/simple_form.fi.yml
index d208feed6c5721..96bf11ef2de00f 100644
--- a/config/locales/simple_form.fi.yml
+++ b/config/locales/simple_form.fi.yml
@@ -39,14 +39,14 @@ fi:
         text: Voit valittaa varoituksesta vain kerran
       defaults:
         autofollow: Henkilöt, jotka rekisteröityvät kutsun kautta, seuraavat sinua automaattisesti
-        avatar: PNG, GIF tai JPG. Enintään %{size}. Skaalataan kokoon %{dimensions} px
+        avatar: WEBP, PNG, GIF tai JPG. Enintään %{size}. Skaalataan kokoon %{dimensions} px
         bot: Tämä tili suorittaa enimmäkseen automaattisia toimintoja eikä sitä ehkä valvota
         context: Ainakin yksi konteksti, jossa suodattimen pitäisi olla voimassa
         current_password: Turvallisuussyistä kirjoita nykyisen tilin salasana
         current_username: Vahvista kirjoittamalla nykyisen tilin käyttäjänimi
         digest: Lähetetään vain pitkän poissaolon jälkeen ja vain, jos olet saanut suoria viestejä poissaolosi aikana
         email: Sinulle lähetetään vahvistussähköposti
-        header: PNG, GIF tai JPG. Enintään %{size}. Skaalataan kokoon %{dimensions} px
+        header: WEBP, PNG, GIF tai JPG. Enintään %{size}. Skaalataan kokoon %{dimensions} px
         inbox_url: Kopioi URL-osoite haluamasi välittäjän etusivulta
         irreversible: Suodatetut julkaisut katoavat lopullisesti, vaikka suodatin poistettaisiin myöhemmin
         locale: Käyttöliittymän, sähköpostien ja puskuilmoitusten kieli

From 0ff98009899a60b5fb0aaee35f6f78241b51e5a6 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Tue, 27 Feb 2024 16:42:05 +0100
Subject: [PATCH 0315/2191] [Glitch] Use modern ES syntax rather than `.call`

Port 899eac1a92c802c334606a49d538ef37bd47c91a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/containers/media_container.jsx     |  2 +-
 .../flavours/glitch/features/emoji/emoji_compressed.js |  4 ++--
 .../flavours/glitch/features/emoji/emoji_utils.js      | 10 +++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/javascript/flavours/glitch/containers/media_container.jsx b/app/javascript/flavours/glitch/containers/media_container.jsx
index 52aac5ebe4d887..a7b20bc2495105 100644
--- a/app/javascript/flavours/glitch/containers/media_container.jsx
+++ b/app/javascript/flavours/glitch/containers/media_container.jsx
@@ -80,7 +80,7 @@ export default class MediaContainer extends PureComponent {
     return (
       <IntlProvider>
         <>
-          {[].map.call(components, (component, i) => {
+          {Array.from(components).map((component, i) => {
             const componentName = component.getAttribute('data-component');
             const Component = MEDIA_COMPONENTS[componentName];
             const { media, card, poll, hashtag, ...props } = JSON.parse(component.getAttribute('data-props'));
diff --git a/app/javascript/flavours/glitch/features/emoji/emoji_compressed.js b/app/javascript/flavours/glitch/features/emoji/emoji_compressed.js
index 792137b76f4da8..59978a391b0d75 100644
--- a/app/javascript/flavours/glitch/features/emoji/emoji_compressed.js
+++ b/app/javascript/flavours/glitch/features/emoji/emoji_compressed.js
@@ -36,7 +36,7 @@ Object.keys(emojiIndex.emojis).forEach(key => {
   let emoji = emojiIndex.emojis[key];
 
   // Emojis with skin tone modifiers are stored like this
-  if (Object.prototype.hasOwnProperty.call(emoji, '1')) {
+  if (Object.hasOwn(emoji, '1')) {
     emoji = emoji['1'];
   }
 
@@ -88,7 +88,7 @@ Object.keys(emojiIndex.emojis).forEach(key => {
   let emoji = emojiIndex.emojis[key];
 
   // Emojis with skin tone modifiers are stored like this
-  if (Object.prototype.hasOwnProperty.call(emoji, '1')) {
+  if (Object.hasOwn(emoji, '1')) {
     emoji = emoji['1'];
   }
 
diff --git a/app/javascript/flavours/glitch/features/emoji/emoji_utils.js b/app/javascript/flavours/glitch/features/emoji/emoji_utils.js
index 83bcc9d82f9f14..c13d25056706a4 100644
--- a/app/javascript/flavours/glitch/features/emoji/emoji_utils.js
+++ b/app/javascript/flavours/glitch/features/emoji/emoji_utils.js
@@ -135,19 +135,19 @@ function getData(emoji, skin, set) {
       }
     }
 
-    if (Object.prototype.hasOwnProperty.call(data.short_names, emoji)) {
+    if (Object.hasOwn(data.short_names, emoji)) {
       emoji = data.short_names[emoji];
     }
 
-    if (Object.prototype.hasOwnProperty.call(data.emojis, emoji)) {
+    if (Object.hasOwn(data.emojis, emoji)) {
       emojiData = data.emojis[emoji];
     }
   } else if (emoji.id) {
-    if (Object.prototype.hasOwnProperty.call(data.short_names, emoji.id)) {
+    if (Object.hasOwn(data.short_names, emoji.id)) {
       emoji.id = data.short_names[emoji.id];
     }
 
-    if (Object.prototype.hasOwnProperty.call(data.emojis, emoji.id)) {
+    if (Object.hasOwn(data.emojis, emoji.id)) {
       emojiData = data.emojis[emoji.id];
       skin = skin || emoji.skin;
     }
@@ -216,7 +216,7 @@ function deepMerge(a, b) {
     let originalValue = a[key],
       value = originalValue;
 
-    if (Object.prototype.hasOwnProperty.call(b, key)) {
+    if (Object.hasOwn(b, key)) {
       value = b[key];
     }
 

From 9324fbe98400ad4a563a990cd4af1d7423526fc0 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 27 Feb 2024 17:07:43 +0100
Subject: [PATCH 0316/2191] [Glitch] Update devDependencies (non-major)

Port dc4427dc9ba4d084d96153feb2eef6a32c288e1f to glitch-soc

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/test_helpers.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/flavours/glitch/test_helpers.tsx b/app/javascript/flavours/glitch/test_helpers.tsx
index 689589556956b4..69d57b95a0437b 100644
--- a/app/javascript/flavours/glitch/test_helpers.tsx
+++ b/app/javascript/flavours/glitch/test_helpers.tsx
@@ -40,7 +40,7 @@ function render(
   ui: React.ReactElement,
   { locale = 'en', signedIn = true, ...renderOptions } = {},
 ) {
-  const Wrapper = (props: { children: React.ReactElement }) => {
+  const Wrapper = (props: { children: React.ReactNode }) => {
     return (
       <MemoryRouter>
         <IntlProvider locale={locale}>

From c844817c7882b83a44a9e5bcabc3dcd704524c29 Mon Sep 17 00:00:00 2001
From: Roni Laukkarinen <roni@dude.fi>
Date: Wed, 28 Feb 2024 14:01:18 +0200
Subject: [PATCH 0317/2191] [Glitch] Fix the regression with the search icon
 position

Port edfc53856f03e3948c2c6760bb425f74dbb24178 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/styles/components.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index e0c4b3768beebc..e7a0156a41412e 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -5729,6 +5729,7 @@ a.status-card {
     color: $darker-text-color;
     cursor: default;
     pointer-events: none;
+    margin-inline-start: 16px - 2px;
 
     &.active {
       pointer-events: auto;

From 4004801ee898f0fb857a40da8c48268834125280 Mon Sep 17 00:00:00 2001
From: Jeong Arm <kjwonmail@gmail.com>
Date: Wed, 28 Feb 2024 21:07:06 +0900
Subject: [PATCH 0318/2191] [Glitch] Show comments in the admin/instances page

Port deffb8ecb6d2eb384e4d9237f4918be664f21cf9 to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/styles/admin.scss           | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/app/javascript/flavours/glitch/styles/admin.scss b/app/javascript/flavours/glitch/styles/admin.scss
index 491b116a504a3b..becce27568d14f 100644
--- a/app/javascript/flavours/glitch/styles/admin.scss
+++ b/app/javascript/flavours/glitch/styles/admin.scss
@@ -324,6 +324,23 @@ $content-width: 840px;
       padding-bottom: 0;
       margin-bottom: 0;
       border-bottom: 0;
+
+      .comment {
+        display: block;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        margin-top: 4px;
+
+        &.private-comment {
+          display: block;
+          color: $darker-text-color;
+        }
+
+        &.public-comment {
+          display: block;
+          color: $secondary-text-color;
+        }
+      }
     }
 
     & > p {

From ca9b83b5a3bbade41be212d8da512bc1c6e73210 Mon Sep 17 00:00:00 2001
From: Jeremy Kescher <jeremy@kescher.at>
Date: Wed, 28 Feb 2024 23:10:22 +0100
Subject: [PATCH 0319/2191] Bump Catstodon version

---
 CHANGELOG.md            | 4 ++++
 lib/mastodon/version.rb | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 969bc2468a60bd..26bbdea50ee916 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All changes to Catstodon that aren't Mastodon or glitch-soc Mastodon changes will be documented here.
 
+## [v4.3.0-alpha.3+glitch+cat+1.0.7] - 2024-02-28
+
+- Merged glitch-soc changes (incl. comments on admin/instances page)
+
 ## [v4.3.0-alpha.3+glitch+cat+1.0.6] - 2024-02-25
 
 - Applied changes to emoji reactions PR on glitch-soc
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index 786e2114ce34c5..63dc1fc1da5c10 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -25,7 +25,7 @@ def prerelease
     end
 
     def catstodon_revision
-      '1.0.6'
+      '1.0.7'
     end
 
     def build_metadata

From ab195bcee11f2f940a1b8af5848b317493ab7785 Mon Sep 17 00:00:00 2001
From: GitHub Actions <noreply@github.com>
Date: Thu, 29 Feb 2024 04:27:18 +0000
Subject: [PATCH 0320/2191] New Crowdin translations

---
 .../flavours/glitch/locales/ar.json           | 24 +++----
 .../flavours/glitch/locales/cs.json           | 15 ----
 .../flavours/glitch/locales/cy.json           | 13 ----
 .../flavours/glitch/locales/da.json           |  4 --
 .../flavours/glitch/locales/de.json           | 31 ++++----
 .../flavours/glitch/locales/eo.json           | 15 ----
 .../flavours/glitch/locales/es-AR.json        | 31 ++++----
 .../flavours/glitch/locales/es-MX.json        | 17 -----
 .../flavours/glitch/locales/es.json           | 17 -----
 .../flavours/glitch/locales/fa.json           |  9 +--
 .../flavours/glitch/locales/fr-CA.json        | 19 +----
 .../flavours/glitch/locales/fr.json           | 19 +----
 .../flavours/glitch/locales/hi.json           |  3 -
 .../flavours/glitch/locales/id.json           | 72 ++++++++++++++-----
 .../flavours/glitch/locales/ja.json           | 17 -----
 .../flavours/glitch/locales/ko.json           | 26 +++----
 .../flavours/glitch/locales/nl.json           | 13 ----
 .../flavours/glitch/locales/pl.json           | 17 -----
 .../flavours/glitch/locales/pt-BR.json        | 17 -----
 .../flavours/glitch/locales/pt-PT.json        |  8 ---
 .../flavours/glitch/locales/sv.json           | 15 ----
 .../flavours/glitch/locales/tr.json           | 15 ----
 .../flavours/glitch/locales/uk.json           | 17 -----
 .../flavours/glitch/locales/zh-CN.json        | 37 +++++-----
 .../flavours/glitch/locales/zh-TW.json        | 28 +++-----
 config/locales-glitch/fr-CA.yml               | 43 ++++++++++-
 config/locales-glitch/no.yml                  |  2 +-
 config/locales-glitch/simple_form.fr-CA.yml   | 27 ++++++-
 config/locales-glitch/simple_form.no.yml      |  2 +-
 config/locales-glitch/zh-CN.yml               |  4 +-
 30 files changed, 205 insertions(+), 372 deletions(-)

diff --git a/app/javascript/flavours/glitch/locales/ar.json b/app/javascript/flavours/glitch/locales/ar.json
index a25914632828dd..ae94e216a86b2c 100644
--- a/app/javascript/flavours/glitch/locales/ar.json
+++ b/app/javascript/flavours/glitch/locales/ar.json
@@ -2,16 +2,8 @@
   "about.fork_disclaimer": "جلتش-سوك هو برنامج حر مفتوح المصدر متفرع عن ماستدون.",
   "account.disclaimer_full": "قد لا تعكِس المعلومات أدناه كامل الملف الشخصي للمستخدِم.",
   "account.follows": "يتابِع",
-  "account.joined": "إنضم بتاريخ {date}",
   "account.suspended_disclaimer_full": "تم تعليق هذا المستخدم من قبل المشرف.",
   "account.view_full_profile": "عرض الملف الشخصي كاملاً",
-  "advanced_options.icon_title": "خيارات متقدمة",
-  "advanced_options.local-only.long": "لا تنشر في خوادم أخرى",
-  "advanced_options.local-only.short": "المحلي فقط",
-  "advanced_options.local-only.tooltip": "هذا المنشور محلي فقط",
-  "advanced_options.threaded_mode.long": "تلقائياً يفتح رداً عند النشر",
-  "advanced_options.threaded_mode.short": "وضعُ النقاش الخيطي",
-  "advanced_options.threaded_mode.tooltip": "تم تمكين وضع النقاش الخيطي",
   "boost_modal.missing_description": "هذا المنشور يحتوي على وسائط بلا وصف",
   "column.favourited_by": "المفضلة من قبل",
   "column.heading": "متنوعة",
@@ -21,15 +13,14 @@
   "column_subheading.lists": "القوائم",
   "column_subheading.navigation": "التنقل",
   "community.column_settings.allow_local_only": "إظهار المنشورات المحلية فقط",
-  "compose.attach": "أرفق...",
-  "compose.attach.doodle": "ارسم شيئاً",
-  "compose.attach.upload": "رفع ملف",
+  "compose.change_federation": "تغيير اعدادات الفيديرالية",
+  "compose.content-type.change": "تغيير خيارات التنسيق المتقدمة",
   "compose.content-type.html": "HTML",
+  "compose.content-type.html_meta": "تنسيق منشوراتك باستخدام HTML",
   "compose.content-type.markdown": "ماركداون",
+  "compose.content-type.markdown_meta": "تنسيق منشوراتك باستخدام مارك داون",
   "compose.content-type.plain": "نص عادي",
-  "compose_form.poll.multiple_choices": "السماح بخيارات متعددة",
-  "compose_form.poll.single_choice": "السماح بخيار واحد",
-  "compose_form.spoiler": "إخفاء النص خلف تحذير",
+  "compose.content-type.plain_meta": "كتابة بدون تنسيق متقدم",
   "confirmation_modal.do_not_ask_again": "لا تطلب التأكيد مرة أخرى",
   "confirmations.deprecated_settings.confirm": "استخدام تفضيلات ماستدون",
   "confirmations.deprecated_settings.message": "تم استبدال بعض من الجهاز الخاص بالماستدون {preferences} الذي تستخدمه {app_settings} الخاص بجهاز ماستدون سيتم تجاوزه:",
@@ -39,17 +30,18 @@
   "confirmations.unfilter.confirm": "عرض",
   "confirmations.unfilter.edit_filter": "تعديل عامل التصفية",
   "confirmations.unfilter.filters": "مطابقة {count, plural, zero {}one {فلتر} two {فلاتر} few {فلاتر} many {فلاتر} other {فلاتر}}",
-  "content-type.change": "نوع المحتوى",
   "direct.group_by_conversations": "تجميع حسب المحادثة",
   "endorsed_accounts_editor.endorsed_accounts": "الحسابات المميزة",
   "favourite_modal.combo": "يُمكنك الضّغط على {combo} لتخطي هذا في المرة المُقبلة",
+  "federation.federated.long": "السماح لهذا المنشور الوصول إلى خوادم أخرى",
+  "federation.local_only.long": "منع هذا المنشور من الوصول إلى الخوادم الأخرى",
+  "federation.local_only.short": "محلي فقط",
   "home.column_settings.advanced": "متقدم",
   "home.column_settings.filter_regex": "إزالة باستخدام التعبيرات النمطية",
   "home.settings": "إعدادات العمود",
   "keyboard_shortcuts.bookmark": "لإضافة علامة",
   "keyboard_shortcuts.secondary_toot": "لإرسال التبويق باستخدام إعدادات الخصوصية الثانوية",
   "keyboard_shortcuts.toggle_collapse": "لطي/فتح التبويقات",
-  "media_gallery.sensitive": "حساس",
   "moved_to_warning": "عُلِّم هذا الحساب بأنه انتقل إلى {moved_to_link}، لذا قد لا يقبل متابعات جديدة.",
   "navigation_bar.app_settings": "إعدادات التطبيق",
   "navigation_bar.featured_users": "مستخدمون مميزون",
diff --git a/app/javascript/flavours/glitch/locales/cs.json b/app/javascript/flavours/glitch/locales/cs.json
index 29c8777ede2f45..969e74b3e33457 100644
--- a/app/javascript/flavours/glitch/locales/cs.json
+++ b/app/javascript/flavours/glitch/locales/cs.json
@@ -1,23 +1,9 @@
 {
   "about.fork_disclaimer": "Glitch-soc je svobodný software s otevřeným zdrojovým kódem založený na Mastodonu.",
-  "advanced_options.icon_title": "Pokročilá nastavení",
-  "advanced_options.local-only.long": "Neposílat na jiné servery",
-  "advanced_options.local-only.short": "Lokální příspěvek",
-  "advanced_options.local-only.tooltip": "Tento příspěvek je pouze lokální",
-  "advanced_options.threaded_mode.long": "Po odeslání automaticky otevře pole pro odpověď",
-  "advanced_options.threaded_mode.short": "Režim vlákna",
-  "advanced_options.threaded_mode.tooltip": "Režim vlákna je zapnutý",
   "boost_modal.missing_description": "Příspěvek obsahuje obrázky bez popisků",
   "column.subheading": "Různé",
-  "compose.attach": "Připojit...",
-  "compose.attach.doodle": "Něco namalovat",
-  "compose.attach.upload": "Nahrát soubor",
   "compose.content-type.plain": "Prostý text",
-  "compose_form.poll.multiple_choices": "Povolit více odpovědí",
-  "compose_form.poll.single_choice": "Povolit jednu odpověď",
-  "compose_form.spoiler": "Přidat varování o obsahu",
   "confirmation_modal.do_not_ask_again": "Příště se už neptat",
-  "content-type.change": "Formát příspěvku",
   "direct.group_by_conversations": "Seskupit do konverzací",
   "endorsed_accounts_editor.endorsed_accounts": "Vybrané účty",
   "favourite_modal.combo": "Příště můžete pro přeskočení stisknout {combo}",
@@ -27,7 +13,6 @@
   "keyboard_shortcuts.bookmark": "Přidat do záložek",
   "keyboard_shortcuts.secondary_toot": "Odeslat příspěvek s druhotným nastavením soukromí",
   "keyboard_shortcuts.toggle_collapse": "Sbalit/rozbalit příspěvek",
-  "media_gallery.sensitive": "Citlivý obsah",
   "navigation_bar.app_settings": "Nastavení aplikace",
   "navigation_bar.featured_users": "Vybraní uživatelé",
   "navigation_bar.keyboard_shortcuts": "Klávesové zkratky",
diff --git a/app/javascript/flavours/glitch/locales/cy.json b/app/javascript/flavours/glitch/locales/cy.json
index 93b38d16276093..7b22e67411632d 100644
--- a/app/javascript/flavours/glitch/locales/cy.json
+++ b/app/javascript/flavours/glitch/locales/cy.json
@@ -2,14 +2,8 @@
   "about.fork_disclaimer": "Mae Glitch-Soc yn feddalwedd di-dal a ffynhonnell agored wedi'i fforchio o Mastodon.",
   "account.disclaimer_full": "Mae'n bosib nad yw'r gwybodaeth isod yn rhoi darlun cyfan o broffil y defnyddiwr.",
   "account.follows": "Yn dilyn",
-  "account.joined": "Ymunodd ar {date}",
   "account.suspended_disclaimer_full": "Mae'r defnyddiwr yma wedi'i atal gan gymedrolwr.",
   "account.view_full_profile": "Dangos proffil cyfan",
-  "advanced_options.icon_title": "Dewisiadau uwch",
-  "advanced_options.local-only.short": "Lleol yn unig",
-  "advanced_options.local-only.tooltip": "Mae'r post yma'n lleol yn unig",
-  "advanced_options.threaded_mode.short": "Modd edafau",
-  "advanced_options.threaded_mode.tooltip": "Modd edafau wedi'i alluogi",
   "boost_modal.missing_description": "Mae'r tŵt yma'n cynnwys ychydig gyfryngau heb ddisgrifiad",
   "column.favourited_by": "Wedi'i hoffi gan",
   "column.heading": "Misg",
@@ -19,21 +13,14 @@
   "column_subheading.lists": "Rhestri",
   "column_subheading.navigation": "Llywio",
   "community.column_settings.allow_local_only": "Dangos tŵtiau lleol yn unig",
-  "compose.attach": "Atodi...",
-  "compose.attach.doodle": "Darlinio rhywbeth",
-  "compose.attach.upload": "Uwchlwythio ffeil",
   "compose.content-type.html": "HTML",
   "compose.content-type.markdown": "Markdown",
   "compose.content-type.plain": "Testun plaen",
-  "compose_form.poll.multiple_choices": "Caniatau sawl dewis",
-  "compose_form.poll.single_choice": "Caniatau un dewis",
-  "compose_form.spoiler": "Cuddio testun tu ôl rhybydd",
   "confirmations.missing_media_description.confirm": "Anfon beth bynnag",
   "confirmations.missing_media_description.edit": "Golygu cyfryngau",
   "confirmations.unfilter.author": "Awdur",
   "confirmations.unfilter.confirm": "Dangos",
   "confirmations.unfilter.edit_filter": "Golygi hidlydd",
-  "content-type.change": "Math cynnwys",
   "settings.content_warnings": "Content warnings",
   "settings.preferences": "Preferences"
 }
diff --git a/app/javascript/flavours/glitch/locales/da.json b/app/javascript/flavours/glitch/locales/da.json
index 84941d2797a89b..69dfe0bf5f2cc9 100644
--- a/app/javascript/flavours/glitch/locales/da.json
+++ b/app/javascript/flavours/glitch/locales/da.json
@@ -1,8 +1,4 @@
 {
-  "compose.attach": "Vedhæft...",
-  "compose.attach.doodle": "Tegn noget",
-  "compose.attach.upload": "Upload en fil",
-  "compose_form.poll.multiple_choices": "Tillad flere valg",
   "confirmations.missing_media_description.message": "Mindst én vedhæftet medie mangler en beskrivelse. Overvej at tilføje en beskrivelse af alle vedhæftede medier af hensyn til personer med nedsat syn, før du publicerer dit indlæg.",
   "home.column_settings.advanced": "Avanceret",
   "home.column_settings.show_direct": "Vis private omtaler",
diff --git a/app/javascript/flavours/glitch/locales/de.json b/app/javascript/flavours/glitch/locales/de.json
index 96650a5efa061b..11b04a919eb7e5 100644
--- a/app/javascript/flavours/glitch/locales/de.json
+++ b/app/javascript/flavours/glitch/locales/de.json
@@ -3,16 +3,8 @@
   "account.disclaimer_full": "Die folgenden Informationen könnten das Profil des Nutzers unvollständig wiedergeben.",
   "account.follows": "Folgt",
   "account.follows_you": "Folgt dir",
-  "account.joined": "Beigetreten am {date}",
   "account.suspended_disclaimer_full": "Dieser Nutzer wurde durch einen Moderator gesperrt.",
   "account.view_full_profile": "Vollständiges Profil anzeigen",
-  "advanced_options.icon_title": "Erweiterte Optionen",
-  "advanced_options.local-only.long": "Nicht auf anderen Instanzen posten",
-  "advanced_options.local-only.short": "Nur lokal",
-  "advanced_options.local-only.tooltip": "Dieser Post ist nur lokal",
-  "advanced_options.threaded_mode.long": "Öffnet automatisch eine Antwort beim Schreiben",
-  "advanced_options.threaded_mode.short": "Thread-Modus",
-  "advanced_options.threaded_mode.tooltip": "Thread-Modus aktiviert",
   "boost_modal.missing_description": "Dieser Toot enthält Medien ohne Beschreibung",
   "column.favourited_by": "Favorisiert von",
   "column.heading": "Sonstiges",
@@ -22,15 +14,17 @@
   "column_subheading.lists": "Listen",
   "column_subheading.navigation": "Navigation",
   "community.column_settings.allow_local_only": "Nur-lokale Toots anzeigen",
-  "compose.attach": "Anhängen...",
-  "compose.attach.doodle": "Etwas zeichnen",
-  "compose.attach.upload": "Eine Datei hochladen",
+  "compose.change_federation": "Föderationseinstellungen ändern",
+  "compose.content-type.change": "Erweiterte Formatierungsoptionen ändern",
   "compose.content-type.html": "HTML",
+  "compose.content-type.html_meta": "Deine Beiträge mit HTML formatieren",
   "compose.content-type.markdown": "Markdown",
+  "compose.content-type.markdown_meta": "Deine Beiträge mit Markdown formatieren",
   "compose.content-type.plain": "Unformatierter Text",
-  "compose_form.poll.multiple_choices": "Mehrfachauswahl erlauben",
-  "compose_form.poll.single_choice": "Eine Auswahl erlauben",
-  "compose_form.spoiler": "Text hinter Warnung verbergen",
+  "compose.content-type.plain_meta": "Ohne erweiterte Formatierung verfassen",
+  "compose_form.sensitive.hide": "{count, plural, one {Mit einer Inhaltswarnung versehen} other {Mit einer Inhaltswarnung versehen}}",
+  "compose_form.sensitive.marked": "{count, plural, one {Medien-Datei ist mit einer Inhaltswarnung versehen} other {Medien-Dateien sind mit einer Inhaltswarnung versehen}}",
+  "compose_form.sensitive.unmarked": "{count, plural, one {Medien-Datei ist nicht mit einer Inhaltswarnung versehen} other {Medien-Dateien sind nicht mit einer Inhaltswarnung versehen}}",
   "confirmation_modal.do_not_ask_again": "Nicht erneut nach Bestätigung fragen",
   "confirmations.deprecated_settings.confirm": "Mastodon-Einstellungen verwenden",
   "confirmations.deprecated_settings.message": "Einige der von dir verwendeten, glitch-soc-spezifischen {app_settings} wurden durch Mastodon {preferences} ersetzt und werden überschrieben:",
@@ -41,19 +35,21 @@
   "confirmations.unfilter.confirm": "Anzeigen",
   "confirmations.unfilter.edit_filter": "Filter bearbeiten",
   "confirmations.unfilter.filters": "Passende{count, plural, one {r} other {}} Filter",
-  "content-type.change": "Inhaltstyp",
   "direct.group_by_conversations": "Nach Unterhaltung gruppieren",
   "endorsed_accounts_editor.endorsed_accounts": "Empfohlene Konten",
   "favourite_modal.combo": "Mit {combo} wird dieses Fenster beim nächsten Mal nicht mehr angezeigt",
+  "federation.federated.long": "Erlaube diesem Beitrag, andere Server zu erreichen",
+  "federation.federated.short": "Föderiert",
+  "federation.local_only.long": "Verhindere, dass dieser Post andere Server erreicht",
+  "federation.local_only.short": "Nur lokal",
   "firehose.column_settings.allow_local_only": "Zeige \"nur Lokal\"-Beiträge in \"Alle\"",
   "home.column_settings.advanced": "Erweitert",
   "home.column_settings.filter_regex": "Mit regulären Ausdrücken herausfiltern",
-  "home.column_settings.show_direct": "Direktnachrichten anzeigen",
+  "home.column_settings.show_direct": "Private Erwähnungen anzeigen",
   "home.settings": "Spalteneinstellungen",
   "keyboard_shortcuts.bookmark": "zu Lesezeichen hinzufügen",
   "keyboard_shortcuts.secondary_toot": "Toot mit sekundärer Privatsphäreeinstellung absenden",
   "keyboard_shortcuts.toggle_collapse": "Toots ein-/ausklappen",
-  "media_gallery.sensitive": "Empfindlich",
   "moved_to_warning": "Dieses Konto ist als verschoben zu {moved_to_link} markiert und akzeptiert daher keine neuen Follower.",
   "navigation_bar.app_settings": "App-Einstellungen",
   "navigation_bar.featured_users": "Empfohlene Nutzer",
@@ -154,6 +150,5 @@
   "status.in_reply_to": "Dieser Toot ist eine Antwort",
   "status.is_poll": "Dieser Toot ist eine Umfrage",
   "status.local_only": "Nur auf deiner Instanz sichtbar",
-  "status.sensitive_toggle": "Zum Anzeigen klicken",
   "status.uncollapse": "Ausklappen"
 }
diff --git a/app/javascript/flavours/glitch/locales/eo.json b/app/javascript/flavours/glitch/locales/eo.json
index 7e906d4edeaff9..d36df712027556 100644
--- a/app/javascript/flavours/glitch/locales/eo.json
+++ b/app/javascript/flavours/glitch/locales/eo.json
@@ -2,16 +2,8 @@
   "about.fork_disclaimer": "Glitch-soc estas libera malfermitkoda programo forkigita el Mastodon.",
   "account.disclaimer_full": "Subaj informoj povas nekomplete prezenti la profilon de la uzanto.",
   "account.follows": "Sekvatoj",
-  "account.joined": "Kuniĝis {date}",
   "account.suspended_disclaimer_full": "Ĉi tiu uzanto estis suspendita de moderiganto.",
   "account.view_full_profile": "Vidi plenan profilon",
-  "advanced_options.icon_title": "Pliaj opcioj",
-  "advanced_options.local-only.long": "Ne afiŝi al aliaj instancoj",
-  "advanced_options.local-only.short": "Nur loka",
-  "advanced_options.local-only.tooltip": "Ĉi tiu afiŝo estas nur-loka",
-  "advanced_options.threaded_mode.long": "Aŭtomate komencas respondon post afiŝado",
-  "advanced_options.threaded_mode.short": "Fadena reĝimo",
-  "advanced_options.threaded_mode.tooltip": "Fadena reĝimo ŝaltita",
   "boost_modal.missing_description": "Ĉi tiu afiŝo enhavas plurmedion, ke ne havas priskribon",
   "column.favourited_by": "Stelumita per",
   "column.heading": "Diversaj aferoj",
@@ -21,15 +13,9 @@
   "column_subheading.lists": "Listoj",
   "column_subheading.navigation": "Navigado",
   "community.column_settings.allow_local_only": "Montri nur-lokajn afiŝojn",
-  "compose.attach": "Aldoni…",
-  "compose.attach.doodle": "Desegni ion",
-  "compose.attach.upload": "Alŝuti dosieron",
   "compose.content-type.html": "HTML",
   "compose.content-type.markdown": "Markdown",
   "compose.content-type.plain": "Plata teksto",
-  "compose_form.poll.multiple_choices": "Permesi multajn elekteblojn",
-  "compose_form.poll.single_choice": "Permesi unu elekteblon",
-  "compose_form.spoiler": "Kaŝi tekston malantaŭ averto",
   "confirmation_modal.do_not_ask_again": "Ne peti por konfirmo plue",
   "confirmations.deprecated_settings.confirm": "Uzi la agordojn de Mastodon",
   "confirmations.deprecated_settings.message": "{preferences} de Mastodon anstataŭigis iom da ilo-nivela {app_settings} de glitch-soc, kaj superos ĝin:",
@@ -40,7 +26,6 @@
   "confirmations.unfilter.confirm": "Montri",
   "confirmations.unfilter.edit_filter": "Redakti filtrilon",
   "confirmations.unfilter.filters": "{count, plural, one {# filtrilo} other {# filtriloj}} kongruas",
-  "content-type.change": "Tipo de enhavo",
   "home.column_settings.filter_regex": "Filtri per regulaj esprimoj",
   "navigation_bar.keyboard_shortcuts": "Fulmoklavoj",
   "notification_purge.btn_all": "Selekti ĉiujn",
diff --git a/app/javascript/flavours/glitch/locales/es-AR.json b/app/javascript/flavours/glitch/locales/es-AR.json
index 48ae0f06835265..197ad871387848 100644
--- a/app/javascript/flavours/glitch/locales/es-AR.json
+++ b/app/javascript/flavours/glitch/locales/es-AR.json
@@ -3,16 +3,8 @@
   "account.disclaimer_full": "La información aquí presentada puede reflejar de manera incompleta el perfil del usuario.",
   "account.follows": "Sigue",
   "account.follows_you": "Te sigue",
-  "account.joined": "Unido el {date}",
   "account.suspended_disclaimer_full": "Este usuario ha sido suspendido por un moderador.",
   "account.view_full_profile": "Ver perfil completo",
-  "advanced_options.icon_title": "Opciones avanzadas",
-  "advanced_options.local-only.long": "No publicar a otras instancias",
-  "advanced_options.local-only.short": "Local",
-  "advanced_options.local-only.tooltip": "Este toot es local",
-  "advanced_options.threaded_mode.long": "Al publicar abre automáticamente una respuesta",
-  "advanced_options.threaded_mode.short": "Modo hilo",
-  "advanced_options.threaded_mode.tooltip": "Modo hilo habilitado",
   "boost_modal.missing_description": "Esta publicación contiene medios sin descripción",
   "column.favourited_by": "Marcado como favorito por",
   "column.heading": "Misc",
@@ -22,15 +14,19 @@
   "column_subheading.lists": "Listas",
   "column_subheading.navigation": "Navegación",
   "community.column_settings.allow_local_only": "Mostrar sólo toots locales",
-  "compose.attach": "Adjuntar...",
-  "compose.attach.doodle": "Dibujar algo",
-  "compose.attach.upload": "Subir un archivo",
+  "compose.change_federation": "Cambiar configuración de la federación",
+  "compose.content-type.change": "Cambiar opciones avanzadas de formato",
   "compose.content-type.html": "HTML",
+  "compose.content-type.html_meta": "Formatear tus mensajes con HTML",
   "compose.content-type.markdown": "Markdown",
+  "compose.content-type.markdown_meta": "Formatear tus mensajes con Markdown",
   "compose.content-type.plain": "Texto plano",
-  "compose_form.poll.multiple_choices": "Permitir múltiples opciones",
-  "compose_form.poll.single_choice": "Permitir sólo una opción",
-  "compose_form.spoiler": "Esconder el texto detrás de la advertencia",
+  "compose.content-type.plain_meta": "Escribir sin formato avanzado",
+  "compose.disable_threaded_mode": "Deshabilitar Modo Hilo",
+  "compose.enable_threaded_mode": "Habilitar Modo Hilo",
+  "compose_form.sensitive.hide": "{count, plural, one {Marca medios como sensible} other {Marca los medios como sensibles}}",
+  "compose_form.sensitive.marked": "{count, plural, one {El medio está marcado como sensible} other {Los medios están marcados como sensibles}}",
+  "compose_form.sensitive.unmarked": "{count, plural, one {El medio no está marcado como sensible} other {Los medios no están marcados como sensibles}}",
   "confirmation_modal.do_not_ask_again": "No preguntar por la confirmación de nuevo",
   "confirmations.deprecated_settings.confirm": "Usar las preferencias de Mastodon",
   "confirmations.deprecated_settings.message": "Algunas de las {app_settings} de glitch-soc, específicas para el dispositivo que estás usando han sido reemplazadas en las {preferences} de Mastodon y serán sobreescritas:",
@@ -41,10 +37,13 @@
   "confirmations.unfilter.confirm": "Mostrar",
   "confirmations.unfilter.edit_filter": "Editar filtro",
   "confirmations.unfilter.filters": "Coincidencia con {count, plural, one {filtro} other {filtros}}",
-  "content-type.change": "Tipo de contenido",
   "direct.group_by_conversations": "Agrupar por conversación",
   "endorsed_accounts_editor.endorsed_accounts": "Cuentas destacadas",
   "favourite_modal.combo": "Puedes presionar {combo} para omitir esto la próxima vez",
+  "federation.federated.long": "Permitir que este mensaje llegue a otros servidores",
+  "federation.federated.short": "Federado",
+  "federation.local_only.long": "Evitar que este mensaje llegue a otros servidores",
+  "federation.local_only.short": "Solo local",
   "firehose.column_settings.allow_local_only": "Mostrar sólo mensajes locales en \"Todos\"",
   "home.column_settings.advanced": "Avanzado",
   "home.column_settings.filter_regex": "Filtrar por expresiones regulares",
@@ -53,7 +52,6 @@
   "keyboard_shortcuts.bookmark": "a marcadores",
   "keyboard_shortcuts.secondary_toot": "para enviar un toot usando lac onfiguración de privacidad secundaria",
   "keyboard_shortcuts.toggle_collapse": "para colapsar/descolapsar toots",
-  "media_gallery.sensitive": "Sensible",
   "moved_to_warning": "Esta cuenta está marcada como movida a {moved_to_link}, y por lo tanto no aceptará nuevos seguimientos.",
   "navigation_bar.app_settings": "Ajustes de aplicación",
   "navigation_bar.featured_users": "Usuarios destacados",
@@ -154,7 +152,6 @@
   "status.in_reply_to": "Esta publicación es una respuesta",
   "status.is_poll": "Esta publicación es una encuesta",
   "status.local_only": "Sólo visible para tu instancia",
-  "status.sensitive_toggle": "Haga clic para ver",
   "status.uncollapse": "Descolapsar",
   "suggestions.dismiss": "Descartar sugerencia"
 }
diff --git a/app/javascript/flavours/glitch/locales/es-MX.json b/app/javascript/flavours/glitch/locales/es-MX.json
index bb0a5ab74fed6d..d6d2633d350d68 100644
--- a/app/javascript/flavours/glitch/locales/es-MX.json
+++ b/app/javascript/flavours/glitch/locales/es-MX.json
@@ -3,16 +3,8 @@
   "account.disclaimer_full": "La información aquí presentada puede reflejar de manera incompleta el perfil del usuario.",
   "account.follows": "Seguir",
   "account.follows_you": "Te sigue",
-  "account.joined": "Unido {date}",
   "account.suspended_disclaimer_full": "Este usuario ha sido suspendido por un moderador.",
   "account.view_full_profile": "Ver perfil completo",
-  "advanced_options.icon_title": "Opciones avanzadas",
-  "advanced_options.local-only.long": "No publicar a otras instancias",
-  "advanced_options.local-only.short": "Local",
-  "advanced_options.local-only.tooltip": "Este toot es local",
-  "advanced_options.threaded_mode.long": "Al publicar abre automáticamente una respuesta",
-  "advanced_options.threaded_mode.short": "Modo hilo",
-  "advanced_options.threaded_mode.tooltip": "Modo hilo habilitado",
   "boost_modal.missing_description": "Esta publicación contiene medios sin descripción",
   "column.favourited_by": "Marcado como favorito por",
   "column.heading": "Misc",
@@ -22,15 +14,9 @@
   "column_subheading.lists": "Listas",
   "column_subheading.navigation": "Navegación",
   "community.column_settings.allow_local_only": "Mostrar sólo toots locales",
-  "compose.attach": "Adjuntar...",
-  "compose.attach.doodle": "Dibujar algo",
-  "compose.attach.upload": "Subir un archivo",
   "compose.content-type.html": "HTML",
   "compose.content-type.markdown": "Markdown",
   "compose.content-type.plain": "Texto plano",
-  "compose_form.poll.multiple_choices": "Permitir múltiples opciones",
-  "compose_form.poll.single_choice": "Permitir sólo una opción",
-  "compose_form.spoiler": "Esconder el texto detrás de la advertencia",
   "confirmation_modal.do_not_ask_again": "No preguntar por la confirmación de nuevo",
   "confirmations.deprecated_settings.confirm": "Usar las preferencias de Mastodon",
   "confirmations.deprecated_settings.message": "Algunas de las {app_settings} de glitch-soc, específicas para el dispositivo que estás usando han sido reemplazadas en las {preferences} de Mastodon y serán sobreescritas:",
@@ -41,7 +27,6 @@
   "confirmations.unfilter.confirm": "Mostrar",
   "confirmations.unfilter.edit_filter": "Editar filtro",
   "confirmations.unfilter.filters": "Coincidencia con {count, plural, one {filtro} other {filtros}}",
-  "content-type.change": "Tipo de contenido",
   "direct.group_by_conversations": "Agrupar por conversación",
   "endorsed_accounts_editor.endorsed_accounts": "Cuentas destacadas",
   "favourite_modal.combo": "Puedes presionar {combo} para omitir esto la próxima vez",
@@ -53,7 +38,6 @@
   "keyboard_shortcuts.bookmark": "a marcadores",
   "keyboard_shortcuts.secondary_toot": "para enviar un toot usando lac onfiguración de privacidad secundaria",
   "keyboard_shortcuts.toggle_collapse": "para colapsar/descolapsar toots",
-  "media_gallery.sensitive": "Sensible",
   "moved_to_warning": "Esta cuenta está marcada como movida a {moved_to_link}, y por lo tanto no aceptará nuevos seguimientos.",
   "navigation_bar.app_settings": "Ajustes de aplicación",
   "navigation_bar.featured_users": "Usuarios destacados",
@@ -154,6 +138,5 @@
   "status.in_reply_to": "Esta publicación es una respuesta",
   "status.is_poll": "Esta publicación es una encuesta",
   "status.local_only": "Sólo visible para tu instancia",
-  "status.sensitive_toggle": "Haga clic para ver",
   "status.uncollapse": "Descolapsar"
 }
diff --git a/app/javascript/flavours/glitch/locales/es.json b/app/javascript/flavours/glitch/locales/es.json
index 35f0fa8deb4f70..d6ebd95231b9eb 100644
--- a/app/javascript/flavours/glitch/locales/es.json
+++ b/app/javascript/flavours/glitch/locales/es.json
@@ -3,16 +3,8 @@
   "account.disclaimer_full": "La información que figura a continuación puede reflejar el perfil de la cuenta de forma incompleta.",
   "account.follows": "Sigue",
   "account.follows_you": "Te sigue",
-  "account.joined": "Se unió el {date}",
   "account.suspended_disclaimer_full": "Este usuario ha sido suspendido por un moderador.",
   "account.view_full_profile": "Ver perfil completo",
-  "advanced_options.icon_title": "Opciones avanzadas",
-  "advanced_options.local-only.long": "No publicar a otras instancias",
-  "advanced_options.local-only.short": "Sólo local",
-  "advanced_options.local-only.tooltip": "Esta publicación es sólo local",
-  "advanced_options.threaded_mode.long": "Abre automáticamente una respuesta al publicar",
-  "advanced_options.threaded_mode.short": "Modo hilo",
-  "advanced_options.threaded_mode.tooltip": "Modo hilo habilitado",
   "boost_modal.missing_description": "Esta publicación contiene medios sin descripción",
   "column.favourited_by": "Marcado como favorito por",
   "column.heading": "Misc",
@@ -22,15 +14,9 @@
   "column_subheading.lists": "Listas",
   "column_subheading.navigation": "Navegación",
   "community.column_settings.allow_local_only": "Mostrar toots solo-locales",
-  "compose.attach": "Adjuntar...",
-  "compose.attach.doodle": "Dibujar algo",
-  "compose.attach.upload": "Subir un archivo",
   "compose.content-type.html": "HTML",
   "compose.content-type.markdown": "Markdown",
   "compose.content-type.plain": "Texto plano",
-  "compose_form.poll.multiple_choices": "Permitir múltiples opciones",
-  "compose_form.poll.single_choice": "Permitir sólo una opción",
-  "compose_form.spoiler": "Esconder el texto detrás de la advertencia",
   "confirmation_modal.do_not_ask_again": "No preguntar por la confirmación de nuevo",
   "confirmations.deprecated_settings.confirm": "Usar las preferencias de Mastodon",
   "confirmations.deprecated_settings.message": "Algunas de las {app_settings} de glitch-soc, específicas para el dispositivo que estás usando han sido reemplazadas en las {preferences} de Mastodon y serán sobreescritas:",
@@ -41,7 +27,6 @@
   "confirmations.unfilter.confirm": "Mostrar",
   "confirmations.unfilter.edit_filter": "Editar filtro",
   "confirmations.unfilter.filters": "Coincidiendo {count, plural, one {filtro} other {filtros}}",
-  "content-type.change": "Tipo de contenido",
   "direct.group_by_conversations": "Agrupar por conversación",
   "endorsed_accounts_editor.endorsed_accounts": "Cuentas destacadas",
   "favourite_modal.combo": "Puedes presionar {combo} para omitir esto la próxima vez",
@@ -53,7 +38,6 @@
   "keyboard_shortcuts.bookmark": "a marcadores",
   "keyboard_shortcuts.secondary_toot": "para enviar un toot usando lac onfiguración de privacidad secundaria",
   "keyboard_shortcuts.toggle_collapse": "para colapsar/descolapsar toots",
-  "media_gallery.sensitive": "Sensible",
   "moved_to_warning": "Esta cuenta está marcada como movida a {moved_to_link}, y por lo tanto no aceptará nuevos seguimientos.",
   "navigation_bar.app_settings": "Ajustes de la aplicación",
   "navigation_bar.featured_users": "Usuarios destacados",
@@ -154,6 +138,5 @@
   "status.in_reply_to": "Esta publicación es una respuesta",
   "status.is_poll": "Esta publicación es una encuesta",
   "status.local_only": "Sólo visible para tu instancia",
-  "status.sensitive_toggle": "Haga clic para ver",
   "status.uncollapse": "Descolapsar"
 }
diff --git a/app/javascript/flavours/glitch/locales/fa.json b/app/javascript/flavours/glitch/locales/fa.json
index 62e27581801617..1e6d1d4992bb4b 100644
--- a/app/javascript/flavours/glitch/locales/fa.json
+++ b/app/javascript/flavours/glitch/locales/fa.json
@@ -1,13 +1,8 @@
 {
   "about.fork_disclaimer": "Glitch-Goc یک نرم‌افزار آزاد است که از Mastodon انشعاب گرفته است.",
   "account.disclaimer_full": "اطلاعات زیر ممکن است نمایه کاربر را کامل منعکس نکند.",
-  "account.joined": "در {date} پیوست",
   "account.view_full_profile": "مشاهده کامل نمایه",
-  "advanced_options.icon_title": "گزینه‌های پیشرفته",
-  "advanced_options.local-only.short": "فقط محلی",
-  "advanced_options.local-only.tooltip": "این فرسته فقط محلی است",
   "column_header.profile": "نمایه",
-  "compose.attach.upload": "بارگذاری پرونده",
   "compose.content-type.html": "HTML",
   "compose.content-type.markdown": "مارک‌دون",
   "compose.content-type.plain": "متن ساده",
@@ -15,7 +10,6 @@
   "confirmations.unfilter.author": "نویسنده",
   "confirmations.unfilter.confirm": "نمایش",
   "confirmations.unfilter.edit_filter": "ویرایش پالایه",
-  "content-type.change": "نوع محتوا",
   "endorsed_accounts_editor.endorsed_accounts": "حساب‌های پیشنهاد شده",
   "home.column_settings.advanced": "پیشرفته",
   "navigation_bar.app_settings": "تنظیمات کاره",
@@ -35,6 +29,5 @@
   "settings.side_arm.none": "هیچ یک",
   "settings.status_icons": "نقشک‌های توت",
   "status.in_reply_to": "این توت یک پاسخ است",
-  "status.is_poll": "این توت یک نظرسنجی است",
-  "status.sensitive_toggle": "برای مشاهده کلیک کنید"
+  "status.is_poll": "این توت یک نظرسنجی است"
 }
diff --git a/app/javascript/flavours/glitch/locales/fr-CA.json b/app/javascript/flavours/glitch/locales/fr-CA.json
index 6015f4097d4143..30ca374d205718 100644
--- a/app/javascript/flavours/glitch/locales/fr-CA.json
+++ b/app/javascript/flavours/glitch/locales/fr-CA.json
@@ -3,16 +3,8 @@
   "account.disclaimer_full": "Les informations ci-dessous peuvent être incomplètes.",
   "account.follows": "Abonnements",
   "account.follows_you": "Vous suit",
-  "account.joined": "Ici depuis {date}",
   "account.suspended_disclaimer_full": "Cet utilisateur a été suspendu par un modérateur.",
   "account.view_full_profile": "Voir le profil complet",
-  "advanced_options.icon_title": "Options avancées",
-  "advanced_options.local-only.long": "Ne pas envoyer aux autres instances",
-  "advanced_options.local-only.short": "Uniquement en local",
-  "advanced_options.local-only.tooltip": "Ce post est uniquement local",
-  "advanced_options.threaded_mode.long": "Ouvre automatiquement une réponse lors de la publication",
-  "advanced_options.threaded_mode.short": "Mode thread",
-  "advanced_options.threaded_mode.tooltip": "Mode thread activé",
   "boost_modal.missing_description": "Ce post contient des médias sans description",
   "column.favourited_by": "Ajouté en favori par",
   "column.heading": "Divers",
@@ -22,15 +14,11 @@
   "column_subheading.lists": "Listes",
   "column_subheading.navigation": "Navigation",
   "community.column_settings.allow_local_only": "Afficher seulement les posts locaux",
-  "compose.attach": "Joindre…",
-  "compose.attach.doodle": "Dessiner quelque chose",
-  "compose.attach.upload": "Téléverser un fichier",
   "compose.content-type.html": "HTML",
   "compose.content-type.markdown": "Markdown",
   "compose.content-type.plain": "Text brut",
-  "compose_form.poll.multiple_choices": "Choix multiples",
-  "compose_form.poll.single_choice": "Choix unique",
-  "compose_form.spoiler": "Cacher le texte derrière un avertissement",
+  "compose.disable_threaded_mode": "Désactiver le mode thread",
+  "compose.enable_threaded_mode": "Activer le mode thread",
   "confirmation_modal.do_not_ask_again": "Ne plus demander confirmation",
   "confirmations.deprecated_settings.confirm": "Utiliser les préférences de Mastodon",
   "confirmations.deprecated_settings.message": "Certaines {app_settings} de glitch-soc que vous utilisez ont été remplacées par les {preferences} de Mastodon et seront remplacées :",
@@ -41,7 +29,6 @@
   "confirmations.unfilter.confirm": "Afficher",
   "confirmations.unfilter.edit_filter": "Modifier le filtre",
   "confirmations.unfilter.filters": "Correspondance avec {count, plural, one {un filtre} other {plusieurs filtres}}",
-  "content-type.change": "Type de contenu",
   "direct.group_by_conversations": "Grouper par conversation",
   "endorsed_accounts_editor.endorsed_accounts": "Comptes mis en avant",
   "favourite_modal.combo": "Vous pouvez appuyer sur {combo} pour passer ceci la prochaine fois",
@@ -53,7 +40,6 @@
   "keyboard_shortcuts.bookmark": "ajouter aux marque-pages",
   "keyboard_shortcuts.secondary_toot": "Envoyer le post en utilisant les paramètres secondaires de confidentialité",
   "keyboard_shortcuts.toggle_collapse": "Plier/déplier les posts",
-  "media_gallery.sensitive": "Sensible",
   "moved_to_warning": "Ce compte a déménagé vers {moved_to_link} et ne peut donc plus accepter de nouveaux abonné·e·s.",
   "navigation_bar.app_settings": "Paramètres de l'application",
   "navigation_bar.featured_users": "Utilisateurs mis en avant",
@@ -154,6 +140,5 @@
   "status.in_reply_to": "Ce post est une réponse",
   "status.is_poll": "Ce post est un sondage",
   "status.local_only": "Visible uniquement depuis votre instance",
-  "status.sensitive_toggle": "Cliquer pour voir",
   "status.uncollapse": "Déplier"
 }
diff --git a/app/javascript/flavours/glitch/locales/fr.json b/app/javascript/flavours/glitch/locales/fr.json
index 6015f4097d4143..30ca374d205718 100644
--- a/app/javascript/flavours/glitch/locales/fr.json
+++ b/app/javascript/flavours/glitch/locales/fr.json
@@ -3,16 +3,8 @@
   "account.disclaimer_full": "Les informations ci-dessous peuvent être incomplètes.",
   "account.follows": "Abonnements",
   "account.follows_you": "Vous suit",
-  "account.joined": "Ici depuis {date}",
   "account.suspended_disclaimer_full": "Cet utilisateur a été suspendu par un modérateur.",
   "account.view_full_profile": "Voir le profil complet",
-  "advanced_options.icon_title": "Options avancées",
-  "advanced_options.local-only.long": "Ne pas envoyer aux autres instances",
-  "advanced_options.local-only.short": "Uniquement en local",
-  "advanced_options.local-only.tooltip": "Ce post est uniquement local",
-  "advanced_options.threaded_mode.long": "Ouvre automatiquement une réponse lors de la publication",
-  "advanced_options.threaded_mode.short": "Mode thread",
-  "advanced_options.threaded_mode.tooltip": "Mode thread activé",
   "boost_modal.missing_description": "Ce post contient des médias sans description",
   "column.favourited_by": "Ajouté en favori par",
   "column.heading": "Divers",
@@ -22,15 +14,11 @@
   "column_subheading.lists": "Listes",
   "column_subheading.navigation": "Navigation",
   "community.column_settings.allow_local_only": "Afficher seulement les posts locaux",
-  "compose.attach": "Joindre…",
-  "compose.attach.doodle": "Dessiner quelque chose",
-  "compose.attach.upload": "Téléverser un fichier",
   "compose.content-type.html": "HTML",
   "compose.content-type.markdown": "Markdown",
   "compose.content-type.plain": "Text brut",
-  "compose_form.poll.multiple_choices": "Choix multiples",
-  "compose_form.poll.single_choice": "Choix unique",
-  "compose_form.spoiler": "Cacher le texte derrière un avertissement",
+  "compose.disable_threaded_mode": "Désactiver le mode thread",
+  "compose.enable_threaded_mode": "Activer le mode thread",
   "confirmation_modal.do_not_ask_again": "Ne plus demander confirmation",
   "confirmations.deprecated_settings.confirm": "Utiliser les préférences de Mastodon",
   "confirmations.deprecated_settings.message": "Certaines {app_settings} de glitch-soc que vous utilisez ont été remplacées par les {preferences} de Mastodon et seront remplacées :",
@@ -41,7 +29,6 @@
   "confirmations.unfilter.confirm": "Afficher",
   "confirmations.unfilter.edit_filter": "Modifier le filtre",
   "confirmations.unfilter.filters": "Correspondance avec {count, plural, one {un filtre} other {plusieurs filtres}}",
-  "content-type.change": "Type de contenu",
   "direct.group_by_conversations": "Grouper par conversation",
   "endorsed_accounts_editor.endorsed_accounts": "Comptes mis en avant",
   "favourite_modal.combo": "Vous pouvez appuyer sur {combo} pour passer ceci la prochaine fois",
@@ -53,7 +40,6 @@
   "keyboard_shortcuts.bookmark": "ajouter aux marque-pages",
   "keyboard_shortcuts.secondary_toot": "Envoyer le post en utilisant les paramètres secondaires de confidentialité",
   "keyboard_shortcuts.toggle_collapse": "Plier/déplier les posts",
-  "media_gallery.sensitive": "Sensible",
   "moved_to_warning": "Ce compte a déménagé vers {moved_to_link} et ne peut donc plus accepter de nouveaux abonné·e·s.",
   "navigation_bar.app_settings": "Paramètres de l'application",
   "navigation_bar.featured_users": "Utilisateurs mis en avant",
@@ -154,6 +140,5 @@
   "status.in_reply_to": "Ce post est une réponse",
   "status.is_poll": "Ce post est un sondage",
   "status.local_only": "Visible uniquement depuis votre instance",
-  "status.sensitive_toggle": "Cliquer pour voir",
   "status.uncollapse": "Déplier"
 }
diff --git a/app/javascript/flavours/glitch/locales/hi.json b/app/javascript/flavours/glitch/locales/hi.json
index 26b4b9bb04b224..9c3d7e03df12e8 100644
--- a/app/javascript/flavours/glitch/locales/hi.json
+++ b/app/javascript/flavours/glitch/locales/hi.json
@@ -1,11 +1,8 @@
 {
   "about.fork_disclaimer": "ग्लिच-सोक एक मुफ्त और ओपन सोर्स सॉफ़्टवेर है जो मैस्टोडॉन से फोर्क किया गया है",
   "account.follows": "फ़ॉलोज़",
-  "account.joined": "ज़ोईन करने की {date}",
   "account.suspended_disclaimer_full": "यह यूज़र एक मॉडरेटर द्वारा सस्पेंड कर दिया गया है",
   "account.view_full_profile": "पूरी प्रोफ़ाइल देखें",
-  "advanced_options.icon_title": "एडवांस्ड ऑप्शन्स",
-  "advanced_options.local-only.long": "दूसरे इंस्टेंसों में पोस्ट ना करें",
   "settings.content_warnings": "Content warnings",
   "settings.preferences": "Preferences"
 }
diff --git a/app/javascript/flavours/glitch/locales/id.json b/app/javascript/flavours/glitch/locales/id.json
index f37788bc802eb5..39e85b3d6677c9 100644
--- a/app/javascript/flavours/glitch/locales/id.json
+++ b/app/javascript/flavours/glitch/locales/id.json
@@ -2,16 +2,8 @@
   "about.fork_disclaimer": "Glitch-soc adalah perangkat lunak sumber terbuka yang merupakan fork dari Mastodon.",
   "account.disclaimer_full": "Informasi di bawah ini mungkin tidak mencerminkan profil pengguna secara lengkap.",
   "account.follows": "Mengikuti",
-  "account.joined": "Bergabung {date}",
   "account.suspended_disclaimer_full": "Pengguna ini telah ditangguhkan oleh moderator.",
   "account.view_full_profile": "Tampilkan profil lengkap",
-  "advanced_options.icon_title": "Opsi lanjutan",
-  "advanced_options.local-only.long": "Jangan mengunggah ke instance lain",
-  "advanced_options.local-only.short": "Hanya lokal",
-  "advanced_options.local-only.tooltip": "Postingan ini hanya untuk lokal",
-  "advanced_options.threaded_mode.long": "Secara otomatis membuka balasan pada postingan",
-  "advanced_options.threaded_mode.short": "Mode Utasan",
-  "advanced_options.threaded_mode.tooltip": "Mode utasan dinyalakan",
   "boost_modal.missing_description": "Toot ini berisi beberapa media tanpa deskripsi",
   "column.favourited_by": "Disukai oleh",
   "column.heading": "Lainnya",
@@ -21,15 +13,14 @@
   "column_subheading.lists": "Daftar",
   "column_subheading.navigation": "Penelusuran",
   "community.column_settings.allow_local_only": "Tampilkan toot lokal saja",
-  "compose.attach": "Lampirkan...",
-  "compose.attach.doodle": "Gambar sesuatu",
-  "compose.attach.upload": "Unggah file",
+  "compose.change_federation": "Ubah pengaturan federasi",
+  "compose.content-type.change": "Ubah opsi pemformatan lanjutan",
   "compose.content-type.html": "HTML",
+  "compose.content-type.html_meta": "Format postingan Anda dengan HTML",
   "compose.content-type.markdown": "Bahasa Markdown",
+  "compose.content-type.markdown_meta": "Format postingan Anda dengan Markdown",
   "compose.content-type.plain": "Teks biasa",
-  "compose_form.poll.multiple_choices": "Izinkan beberapa pilihan",
-  "compose_form.poll.single_choice": "Izinkan hanya satu pilihan",
-  "compose_form.spoiler": "Sembunyikan teks di balik peringatan",
+  "compose.content-type.plain_meta": "Tulis tanpa pemformatan lanjutan",
   "confirmation_modal.do_not_ask_again": "Jangan minta konfirmasi lagi",
   "confirmations.deprecated_settings.confirm": "Gunakan preferensi Mastodon",
   "confirmations.deprecated_settings.message": "Beberapa {app_settings} khusus perangkat Glitch-soc yang Anda gunakan telah digantikan oleh {preferences} Mastodon dan akan diganti:",
@@ -39,13 +30,62 @@
   "confirmations.unfilter.author": "Penulis",
   "confirmations.unfilter.confirm": "Tampilkan",
   "confirmations.unfilter.edit_filter": "Ubah saringan",
-  "content-type.change": "Jenis konten",
+  "confirmations.unfilter.filters": "Mencocokkan {count, plural, other {filter}}",
   "direct.group_by_conversations": "Grupkan berdasarkan percakapan",
   "endorsed_accounts_editor.endorsed_accounts": "Akun pilihan",
   "favourite_modal.combo": "Anda dapat menekan {combo} untuk melewati ini lain kali",
+  "federation.federated.long": "Izinkan postingan ini menjangkau server lain",
+  "federation.federated.short": "Difederasi",
+  "federation.local_only.long": "Cegah postingan ini menjangkau server lain",
+  "federation.local_only.short": "Hanya lokal",
   "firehose.column_settings.allow_local_only": "Tampilkan postingan khusus lokal di \"Semua\"",
   "home.column_settings.advanced": "Lanjutan",
   "home.column_settings.filter_regex": "Saring dengan ekspresi reguler",
+  "home.column_settings.show_direct": "Tampilkan sebutan pribadi",
+  "home.settings": "Pengaturan kolom",
+  "keyboard_shortcuts.bookmark": "untuk memarkahi",
+  "keyboard_shortcuts.secondary_toot": "untuk mengirim toot menggunakan pengaturan privasi sekunder",
+  "keyboard_shortcuts.toggle_collapse": "untuk membuka/menutup toot",
+  "moved_to_warning": "Akun ini ditandai sebagai dipindahkan ke {moved_to_link}, dan karenanya tidak menerima pengikut baru.",
+  "navigation_bar.app_settings": "Pengaturan aplikasi",
+  "navigation_bar.featured_users": "Pengguna unggulan",
+  "navigation_bar.keyboard_shortcuts": "Pintasan keyboard",
+  "navigation_bar.misc": "Lainnya",
+  "notification.markForDeletion": "Tandai untuk dihapus",
+  "notification_purge.btn_all": "Pilih semua",
+  "notification_purge.btn_apply": "Hapus yang\ndipilih",
+  "notification_purge.btn_invert": "Balikkan\npilihan",
+  "notification_purge.btn_none": "Pilih tidak\nsatu pun",
+  "notification_purge.start": "Masuk ke mode pembersihan notifikasi",
+  "notifications.marked_clear": "Hapus notifikasi yang dipilih",
+  "notifications.marked_clear_confirmation": "Apakah Anda yakin ingin menghapus secara permanen semua notifikasi yang dipilih?",
+  "settings.always_show_spoilers_field": "Selalu aktifkan bidang Peringatan Konten",
+  "settings.auto_collapse": "Tutup secara otomatis",
+  "settings.auto_collapse_all": "Semua",
+  "settings.auto_collapse_height": "Tinggi (dalam piksel) untuk sebuah toot dianggap panjang",
+  "settings.auto_collapse_lengthy": "Toot panjang",
+  "settings.auto_collapse_media": "Toot dengan media",
+  "settings.auto_collapse_notifications": "Notifikasi",
+  "settings.auto_collapse_reblogs": "Boost",
+  "settings.auto_collapse_replies": "Balasan",
+  "settings.close": "Tutup",
+  "settings.collapsed_statuses": "Toot tertutup",
+  "settings.compose_box_opts": "Kotak tulis",
+  "settings.confirm_before_clearing_draft": "Tampilkan dialog konfirmasi sebelum menimpa pesan yang sedang dibuat",
+  "settings.confirm_boost_missing_media_description": "Tampilkan dialog konfirmasi sebelum memboost toot yang tidak memiliki deskripsi media",
+  "settings.confirm_missing_media_description": "Tampilkan dialog konfirmasi sebelum mengirim toot yang tidak memiliki deskripsi media",
   "settings.content_warnings": "Content warnings",
-  "settings.preferences": "Preferences"
+  "settings.content_warnings.regexp": "Ekspresi reguler",
+  "settings.content_warnings_filter": "Peringatan konten yang tidak akan dibuka secara otomatis:",
+  "settings.content_warnings_media_outside": "Tampilkan lampiran media di luar peringatan konten",
+  "settings.content_warnings_media_outside_hint": "Reproduksi perilaku Mastodon upstream dengan membuat tombol Peringatan Konten tidak memengaruhi lampiran media",
+  "settings.content_warnings_shared_state": "Tampilkan/sembunyikan konten semua salinan sekaligus",
+  "settings.preferences": "Preferences",
+  "settings.status_icons_reply": "Indikator balasan",
+  "settings.status_icons_visibility": "Indikator privasi toot",
+  "settings.swipe_to_change_columns": "Izinkan menggeser untuk mengubah kolom (khusus ponsel)",
+  "settings.tag_misleading_links": "Tandai tautan yang menyesatkan",
+  "settings.tag_misleading_links.hint": "Tambahkan indikasi visual dengan host target tautan ke setiap tautan tanpa menyebutkannya secara eksplisit",
+  "settings.wide_view": "Tampilan lebar (hanya mode desktop)",
+  "settings.wide_view_hint": "Peregangan kolom untuk mengisi ruang yang tersedia dengan lebih baik."
 }
diff --git a/app/javascript/flavours/glitch/locales/ja.json b/app/javascript/flavours/glitch/locales/ja.json
index 25e13300b71bac..44c8642d1cb63b 100644
--- a/app/javascript/flavours/glitch/locales/ja.json
+++ b/app/javascript/flavours/glitch/locales/ja.json
@@ -2,16 +2,8 @@
   "about.fork_disclaimer": "Glitch-socはMastodonからフォークされたフリーなオープンソースソフトウェアです。",
   "account.disclaimer_full": "このユーザー情報は不正確な可能性があります。",
   "account.follows": "フォロー",
-  "account.joined": "{date} に登録",
   "account.suspended_disclaimer_full": "このユーザーはモデレータにより停止されました。",
   "account.view_full_profile": "正確な情報を見る",
-  "advanced_options.icon_title": "高度な設定",
-  "advanced_options.local-only.long": "他のインスタンスには投稿されません",
-  "advanced_options.local-only.short": "ローカル限定",
-  "advanced_options.local-only.tooltip": "この投稿はローカル限定投稿です",
-  "advanced_options.threaded_mode.long": "投稿時に自動的に返信するように設定します",
-  "advanced_options.threaded_mode.short": "スレッドモード",
-  "advanced_options.threaded_mode.tooltip": "スレッドモードを有効にする",
   "boost_modal.missing_description": "このトゥートには少なくとも1つの画像に説明が付与されていません",
   "column.favourited_by": "お気に入りしたユーザー",
   "column.heading": "その他",
@@ -21,15 +13,9 @@
   "column_subheading.lists": "リスト",
   "column_subheading.navigation": "ナビゲーション",
   "community.column_settings.allow_local_only": "ローカル限定投稿を表示する",
-  "compose.attach": "添付...",
-  "compose.attach.doodle": "お絵描きをする",
-  "compose.attach.upload": "ファイルをアップロード",
   "compose.content-type.html": "HTML",
   "compose.content-type.markdown": "マークダウン",
   "compose.content-type.plain": "プレーンテキスト",
-  "compose_form.poll.multiple_choices": "複数回答を許可",
-  "compose_form.poll.single_choice": "単一回答を許可",
-  "compose_form.spoiler": "本文は警告の後ろに隠す",
   "confirmation_modal.do_not_ask_again": "もう１度尋ねない",
   "confirmations.deprecated_settings.confirm": "Mastodonの設定を使用",
   "confirmations.missing_media_description.confirm": "このまま投稿",
@@ -39,7 +25,6 @@
   "confirmations.unfilter.confirm": "見る",
   "confirmations.unfilter.edit_filter": "フィルターを編集",
   "confirmations.unfilter.filters": "適用されたフィルター",
-  "content-type.change": "コンテンツ形式を変更",
   "direct.group_by_conversations": "会話でグループ化",
   "endorsed_accounts_editor.endorsed_accounts": "紹介しているユーザー",
   "favourite_modal.combo": "次からは {combo} を押せば、これをスキップできます。",
@@ -50,7 +35,6 @@
   "keyboard_shortcuts.bookmark": "ブックマーク",
   "keyboard_shortcuts.secondary_toot": "セカンダリートゥートの公開範囲でトゥートする",
   "keyboard_shortcuts.toggle_collapse": "折りたたむ/折りたたみを解除",
-  "media_gallery.sensitive": "閲覧注意",
   "moved_to_warning": "このアカウント{moved_to_link}に引っ越したため、新しいフォロワーを受け入れていません。",
   "navigation_bar.app_settings": "アプリ設定",
   "navigation_bar.featured_users": "紹介しているアカウント",
@@ -140,6 +124,5 @@
   "status.in_reply_to": "このトゥートは返信です",
   "status.is_poll": "このトゥートはアンケートです",
   "status.local_only": "あなたのインスタンスのみに公開",
-  "status.sensitive_toggle": "クリックして表示",
   "status.uncollapse": "折りたたみを解除"
 }
diff --git a/app/javascript/flavours/glitch/locales/ko.json b/app/javascript/flavours/glitch/locales/ko.json
index 49fcb0b46a6f32..ab70ece316150a 100644
--- a/app/javascript/flavours/glitch/locales/ko.json
+++ b/app/javascript/flavours/glitch/locales/ko.json
@@ -3,16 +3,8 @@
   "account.disclaimer_full": "아래에 있는 정보들은 사용자의 프로필을 완벽하게 나타내지 못하고 있을 수도 있습니다.",
   "account.follows": "팔로우",
   "account.follows_you": "날 팔로우합니다",
-  "account.joined": "{date}에 가입함",
   "account.suspended_disclaimer_full": "이 사용자는 중재자에 의해 정지되었습니다.",
   "account.view_full_profile": "전체 프로필 보기",
-  "advanced_options.icon_title": "고급 옵션",
-  "advanced_options.local-only.long": "다른 서버에 게시하지 않기",
-  "advanced_options.local-only.short": "로컬 전용",
-  "advanced_options.local-only.tooltip": "이 게시물은 로컬 전용입니다",
-  "advanced_options.threaded_mode.long": "글을 작성하고 자동으로 답글 열기",
-  "advanced_options.threaded_mode.short": "글타래 모드",
-  "advanced_options.threaded_mode.tooltip": "글타래 모드 활성화됨",
   "boost_modal.missing_description": "이 게시물은 설명이 없는 미디어를 포함하고 있습니다",
   "column.favourited_by": "즐겨찾기 한 사람",
   "column.heading": "기타",
@@ -22,15 +14,14 @@
   "column_subheading.lists": "리스트",
   "column_subheading.navigation": "탐색",
   "community.column_settings.allow_local_only": "로컬 전용 글 보기",
-  "compose.attach": "첨부…",
-  "compose.attach.doodle": "뭔가 그려보세요",
-  "compose.attach.upload": "파일 업로드",
+  "compose.change_federation": "연합 설정 변경",
+  "compose.content-type.change": "고급 양식 옵션 변경",
   "compose.content-type.html": "HTML",
+  "compose.content-type.html_meta": "게시물을 HTML 형식으로 구성",
   "compose.content-type.markdown": "마크다운",
+  "compose.content-type.markdown_meta": "게시물을 마크다운 형식으로 구성",
   "compose.content-type.plain": "일반 텍스트",
-  "compose_form.poll.multiple_choices": "여러 개 선택 가능",
-  "compose_form.poll.single_choice": "하나만 선택 가능",
-  "compose_form.spoiler": "경고 메시지로 숨기기",
+  "compose.content-type.plain_meta": "고급 양식 없이 작성",
   "confirmation_modal.do_not_ask_again": "다음부터 확인창을 띄우지 않기",
   "confirmations.deprecated_settings.confirm": "마스토돈 설정 사용",
   "confirmations.deprecated_settings.message": "사용하던 몇몇 기기별 글리치 {app_settings}은 마스토돈 {preferences}으로 대체되었습니다:",
@@ -41,10 +32,13 @@
   "confirmations.unfilter.confirm": "보기",
   "confirmations.unfilter.edit_filter": "필터 편집",
   "confirmations.unfilter.filters": "적용된 {count, plural, one {필터} other {필터들}}",
-  "content-type.change": "콘텐트 타입",
   "direct.group_by_conversations": "대화별로 묶기",
   "endorsed_accounts_editor.endorsed_accounts": "추천하는 계정들",
   "favourite_modal.combo": "다음엔 {combo}를 눌러 건너뛸 수 있습니다",
+  "federation.federated.long": "이 게시물이 다른 서버에 전달되는 것을 허용",
+  "federation.federated.short": "연합됨",
+  "federation.local_only.long": "이 게시물이 다른 서버에 전달되는 것을 막기",
+  "federation.local_only.short": "로컬 전용",
   "firehose.column_settings.allow_local_only": "\"모두\" 탭에서 로컬 전용 글 보여주기",
   "home.column_settings.advanced": "고급",
   "home.column_settings.filter_regex": "정규표현식으로 필터",
@@ -53,7 +47,6 @@
   "keyboard_shortcuts.bookmark": "북마크",
   "keyboard_shortcuts.secondary_toot": "보조 프라이버시 설정으로 글 보내기",
   "keyboard_shortcuts.toggle_collapse": "글 접거나 펼치기",
-  "media_gallery.sensitive": "민감함",
   "moved_to_warning": "이 계정은 {moved_to_link}로 이동한 것으로 표시되었고, 새 팔로우를 받지 않는 것 같습니다.",
   "navigation_bar.app_settings": "앱 설정",
   "navigation_bar.featured_users": "추천된 계정들",
@@ -154,6 +147,5 @@
   "status.in_reply_to": "이 글은 답글입니다",
   "status.is_poll": "이 글은 설문입니다",
   "status.local_only": "당신의 서버에서만 보입니다",
-  "status.sensitive_toggle": "클릭해서 보기",
   "status.uncollapse": "펼치기"
 }
diff --git a/app/javascript/flavours/glitch/locales/nl.json b/app/javascript/flavours/glitch/locales/nl.json
index 634946fb7655f9..2bb9b2db440772 100644
--- a/app/javascript/flavours/glitch/locales/nl.json
+++ b/app/javascript/flavours/glitch/locales/nl.json
@@ -1,13 +1,6 @@
 {
   "account.follows": "Volgers",
-  "account.joined": "Lid sinds {date}",
   "account.view_full_profile": "Volledig profiel weergeven",
-  "advanced_options.icon_title": "Geavanceerde opties",
-  "advanced_options.local-only.long": "Niet naar andere instanties sturen",
-  "advanced_options.local-only.short": "Alleen lokaal",
-  "advanced_options.local-only.tooltip": "Dit bericht alleen lokaal",
-  "advanced_options.threaded_mode.short": "Thread modus",
-  "advanced_options.threaded_mode.tooltip": "Thread modus ingeschakeld",
   "boost_modal.missing_description": "Deze toot bevat media zonder beschrijving",
   "column.favourited_by": "Favoriet door",
   "column.heading": "Overige",
@@ -17,14 +10,9 @@
   "column_subheading.lists": "Lijsten",
   "column_subheading.navigation": "Navigatie",
   "community.column_settings.allow_local_only": "Toon alleen lokale toots",
-  "compose.attach.doodle": "Teken iets",
-  "compose.attach.upload": "Bestand uploaden",
   "compose.content-type.html": "HTML",
   "compose.content-type.markdown": "Markdown",
   "compose.content-type.plain": "Onopgemaakte tekst",
-  "compose_form.poll.multiple_choices": "Meerdere keuzes toestaan",
-  "compose_form.poll.single_choice": "Eén keuze toestaan",
-  "compose_form.spoiler": "Verberg tekst achter waarschuwing",
   "confirmation_modal.do_not_ask_again": "Vraag niet meer om bevestiging",
   "confirmations.deprecated_settings.confirm": "Gebruik voorkeuren van Mastodon",
   "confirmations.missing_media_description.confirm": "Toch verzenden",
@@ -33,7 +21,6 @@
   "confirmations.unfilter.author": "Auteur",
   "confirmations.unfilter.confirm": "Weergeven",
   "confirmations.unfilter.edit_filter": "Filter bewerken",
-  "content-type.change": "Inhoudstype",
   "direct.group_by_conversations": "Groeperen op gesprek",
   "endorsed_accounts_editor.endorsed_accounts": "Aanbevolen accounts",
   "home.column_settings.advanced": "Geavanceerd",
diff --git a/app/javascript/flavours/glitch/locales/pl.json b/app/javascript/flavours/glitch/locales/pl.json
index 414b641d99dcd5..4f1d126f42cfa6 100644
--- a/app/javascript/flavours/glitch/locales/pl.json
+++ b/app/javascript/flavours/glitch/locales/pl.json
@@ -2,16 +2,8 @@
   "about.fork_disclaimer": "Glitch-soc jest wolnym i otwartym oprogramowaniem wywodzącym się z Mastodonu.",
   "account.disclaimer_full": "Poniższe informacje mogą niekompletnie odzwierciedlać profil tego użytkownika.",
   "account.follows": "Obserwuje",
-  "account.joined": "Konto utworzono {date}",
   "account.suspended_disclaimer_full": "Użytkownik został zawieszony przez moderatora.",
   "account.view_full_profile": "Pokaż pełny profil",
-  "advanced_options.icon_title": "Ustawienia zaawansowane",
-  "advanced_options.local-only.long": "Nie wysyłaj na inne instancje",
-  "advanced_options.local-only.short": "Tylko lokalnie",
-  "advanced_options.local-only.tooltip": "Ten wpis jest widoczny tylko lokalnie",
-  "advanced_options.threaded_mode.long": "Przechodzi do tworzenia odpowiedzi po publikacji wpisu",
-  "advanced_options.threaded_mode.short": "Tryb wątków",
-  "advanced_options.threaded_mode.tooltip": "Włączono tryb wątków",
   "boost_modal.missing_description": "Ten wpis zawiera multimedialne załączniki bez opisu",
   "column.favourited_by": "Polubiony przez",
   "column.heading": "Różne",
@@ -21,15 +13,9 @@
   "column_subheading.lists": "Listy",
   "column_subheading.navigation": "Nawigacja",
   "community.column_settings.allow_local_only": "Pokazuj wyłącznie wpisy lokalne",
-  "compose.attach": "Załącz coś",
-  "compose.attach.doodle": "Narysuj coś",
-  "compose.attach.upload": "Wyślij plik",
   "compose.content-type.html": "HTML",
   "compose.content-type.markdown": "Markdown",
   "compose.content-type.plain": "Czysty tekst",
-  "compose_form.poll.multiple_choices": "Pozwól na wybór wielokrotny",
-  "compose_form.poll.single_choice": "Pozwól na tylko jeden wybór",
-  "compose_form.spoiler": "Ukryj tekst za ostrzeżeniem",
   "confirmation_modal.do_not_ask_again": "Więcej nie pytaj się o potwierdzenie",
   "confirmations.deprecated_settings.confirm": "Użyj preferencji Mastodonu",
   "confirmations.deprecated_settings.message": "Niektóre używane przez Ciebie {app_settings} glitch-soc zostały zastąpione przez {preferences} Mastodona:",
@@ -39,7 +25,6 @@
   "confirmations.unfilter.author": "Autor",
   "confirmations.unfilter.confirm": "Pokaż",
   "confirmations.unfilter.edit_filter": "Edytuj filtr",
-  "content-type.change": "Typ zawartości",
   "direct.group_by_conversations": "Grupuj rozmowami",
   "endorsed_accounts_editor.endorsed_accounts": "Wybrane konta",
   "favourite_modal.combo": "Możesz nacisnąć {combo}, aby pominąć to następnym razem",
@@ -50,7 +35,6 @@
   "keyboard_shortcuts.bookmark": "aby dodać do ulubionych",
   "keyboard_shortcuts.secondary_toot": "aby opublikować wpis używając dodatkowych ustawień prywatności",
   "keyboard_shortcuts.toggle_collapse": "aby zwinąć/rozwinąć wpisy",
-  "media_gallery.sensitive": "Zawartość wrażliwa",
   "moved_to_warning": "To konto oznaczone jest jako przeniesione do {moved_to_link} i może z tego powodu nie akceptować nowych obserwujących.",
   "navigation_bar.app_settings": "Ustawienia aplikacji",
   "navigation_bar.featured_users": "Użytkownicy wyróżnieni",
@@ -151,6 +135,5 @@
   "status.in_reply_to": "Ten wpis jest odpowiedzią",
   "status.is_poll": "Ten wpis zawiera ankietę",
   "status.local_only": "Widoczne tylko na twoim serwerze",
-  "status.sensitive_toggle": "Kliknij, aby zobaczyć",
   "status.uncollapse": "Rozwiń"
 }
diff --git a/app/javascript/flavours/glitch/locales/pt-BR.json b/app/javascript/flavours/glitch/locales/pt-BR.json
index be324a4bb5d80b..48f02e8214e3cf 100644
--- a/app/javascript/flavours/glitch/locales/pt-BR.json
+++ b/app/javascript/flavours/glitch/locales/pt-BR.json
@@ -2,16 +2,8 @@
   "about.fork_disclaimer": "O Glitch-soc é um software gratuito de código aberto bifurcado a partir do Mastodon.",
   "account.disclaimer_full": "As informações abaixo podem refletir o perfil do usuário de forma incompleta.",
   "account.follows": "Segue",
-  "account.joined": "Entrou em {date}",
   "account.suspended_disclaimer_full": "Este usuário foi suspenso por um moderador.",
   "account.view_full_profile": "Ver o perfil completo",
-  "advanced_options.icon_title": "Opções avançadas",
-  "advanced_options.local-only.long": "Não publicar em outras instâncias",
-  "advanced_options.local-only.short": "Apenas localmente",
-  "advanced_options.local-only.tooltip": "Este post é somente local",
-  "advanced_options.threaded_mode.long": "Abrir automaticamente uma resposta ao postar",
-  "advanced_options.threaded_mode.short": "Modo de discussão",
-  "advanced_options.threaded_mode.tooltip": "Modo de discussão ativado",
   "boost_modal.missing_description": "Este toot contém algumas mídias sem descrição",
   "column.favourited_by": "Favoritado por",
   "column.heading": "Diversos",
@@ -21,15 +13,9 @@
   "column_subheading.lists": "Listas",
   "column_subheading.navigation": "Navegação",
   "community.column_settings.allow_local_only": "Mostrar os toots apenas locais",
-  "compose.attach": "Anexar...",
-  "compose.attach.doodle": "Desenhe algo",
-  "compose.attach.upload": "Enviar um arquivo",
   "compose.content-type.html": "HTML",
   "compose.content-type.markdown": "Markdown",
   "compose.content-type.plain": "Texto sem formatação",
-  "compose_form.poll.multiple_choices": "Permitir múltipla escolha",
-  "compose_form.poll.single_choice": "Permitir uma escolha",
-  "compose_form.spoiler": "Ocultar texto atrás do aviso",
   "confirmation_modal.do_not_ask_again": "Não pedir confirmação novamente",
   "confirmations.deprecated_settings.confirm": "Usar preferências do Mastodon",
   "confirmations.deprecated_settings.message": "Alguns dos {app_settings} específicos do dispositivo que você está usando foram substituídos por Mastodon {preferences} e serão substituídos:",
@@ -40,7 +26,6 @@
   "confirmations.unfilter.confirm": "Exibir",
   "confirmations.unfilter.edit_filter": "Editar filtro",
   "confirmations.unfilter.filters": "Correspondência de {count, plural, one {filtro} other {filtros}}",
-  "content-type.change": "Tipo de conteúdo",
   "direct.group_by_conversations": "Agrupar por conversa",
   "endorsed_accounts_editor.endorsed_accounts": "Contas em destaque",
   "favourite_modal.combo": "Você pode pressionar {combo} para pular isso da próxima vez",
@@ -51,7 +36,6 @@
   "keyboard_shortcuts.bookmark": "para marcar",
   "keyboard_shortcuts.secondary_toot": "para enviar toot usando a configuração de privacidade secundária",
   "keyboard_shortcuts.toggle_collapse": "para recolher/mostrar toots",
-  "media_gallery.sensitive": "Sensível",
   "moved_to_warning": "Esta conta foi como movida para {moved_to_link} e, portanto, pode não aceitar novos seguidores.",
   "navigation_bar.app_settings": "Configurações do aplicativo",
   "navigation_bar.featured_users": "Usuários em destaque",
@@ -152,6 +136,5 @@
   "status.in_reply_to": "Este toot é uma resposta",
   "status.is_poll": "Este toot é uma enquete",
   "status.local_only": "Visível apenas em sua instância",
-  "status.sensitive_toggle": "Clique para ver",
   "status.uncollapse": "Revelar"
 }
diff --git a/app/javascript/flavours/glitch/locales/pt-PT.json b/app/javascript/flavours/glitch/locales/pt-PT.json
index 78ea38978fe289..fd0b010159e7fc 100644
--- a/app/javascript/flavours/glitch/locales/pt-PT.json
+++ b/app/javascript/flavours/glitch/locales/pt-PT.json
@@ -2,16 +2,8 @@
   "about.fork_disclaimer": "O Glitch-soc é um software livre de código aberto, derivado (fork) do Mastodon.",
   "account.disclaimer_full": "As informações abaixo podem não refletir completamente o perfil do utilizador.",
   "account.follows": "A seguir",
-  "account.joined": "Juntou-se em {date}",
   "account.suspended_disclaimer_full": "Este utilizador foi suspenso por um elemento da moderação.",
   "account.view_full_profile": "Ver o perfil completo",
-  "advanced_options.icon_title": "Opções avançadas",
-  "advanced_options.local-only.long": "Não publicar noutras instâncias",
-  "advanced_options.local-only.short": "Apenas local",
-  "advanced_options.local-only.tooltip": "Este post é apenas local",
-  "advanced_options.threaded_mode.long": "Abrir automaticamente uma resposta ao publicar",
-  "advanced_options.threaded_mode.short": "Modo de fio",
-  "advanced_options.threaded_mode.tooltip": "Modo de fio ativado",
   "boost_modal.missing_description": "Este post contém alguns media sem descrição",
   "column.favourited_by": "Adicionado aos favoritos de",
   "column.heading": "Diversos",
diff --git a/app/javascript/flavours/glitch/locales/sv.json b/app/javascript/flavours/glitch/locales/sv.json
index 3212f7ff88d725..34526946153832 100644
--- a/app/javascript/flavours/glitch/locales/sv.json
+++ b/app/javascript/flavours/glitch/locales/sv.json
@@ -1,15 +1,7 @@
 {
   "account.follows": "Följer",
-  "account.joined": "Gick med {date}",
   "account.suspended_disclaimer_full": "Denna användare har stängts av av en moderator.",
   "account.view_full_profile": "Visa full profil",
-  "advanced_options.icon_title": "Avancerade inställningar",
-  "advanced_options.local-only.long": "Lägg inte ut på andra instanser",
-  "advanced_options.local-only.short": "Endast lokalt",
-  "advanced_options.local-only.tooltip": "Detta inlägg är endast tillgängligt lokalt",
-  "advanced_options.threaded_mode.long": "Öppnar automatiskt ett svar vid publicering",
-  "advanced_options.threaded_mode.short": "Tråd-läge",
-  "advanced_options.threaded_mode.tooltip": "Tråd-läge på",
   "boost_modal.missing_description": "Denna toot innehåller viss media utan beskrivning",
   "column.favourited_by": "Favoritmarkerad av",
   "column.heading": "Övrigt",
@@ -19,15 +11,9 @@
   "column_subheading.lists": "Listor",
   "column_subheading.navigation": "Navigering",
   "community.column_settings.allow_local_only": "Visa endast lokala toots",
-  "compose.attach": "Bifoga...",
-  "compose.attach.doodle": "Rita något",
-  "compose.attach.upload": "Ladda upp en fil",
   "compose.content-type.html": "HTML",
   "compose.content-type.markdown": "Markdown",
   "compose.content-type.plain": "Klartext",
-  "compose_form.poll.multiple_choices": "Tillåt flera val",
-  "compose_form.poll.single_choice": "Tillåt ett val",
-  "compose_form.spoiler": "Göm text bakom varning",
   "confirmation_modal.do_not_ask_again": "Fråga mig inte igen",
   "confirmations.deprecated_settings.confirm": "Använd Mastodon-preferenser",
   "confirmations.deprecated_settings.message": "Några av de glitch-soc-enhetsspecifika {app_settings} som du använder har ersatts av Mastodon-{preferences} och kommer att åsidosättas:",
@@ -38,7 +24,6 @@
   "confirmations.unfilter.confirm": "Visa",
   "confirmations.unfilter.edit_filter": "Redigera filter",
   "confirmations.unfilter.filters": "Matchande {count, plural, one {filter} other {filters}}",
-  "content-type.change": "Innehållstyp",
   "direct.group_by_conversations": "Sortera efter konversation",
   "endorsed_accounts_editor.endorsed_accounts": "Utvalda konton",
   "favourite_modal.combo": "Du kan trycka på {combo} för att skippa detta nästa gång",
diff --git a/app/javascript/flavours/glitch/locales/tr.json b/app/javascript/flavours/glitch/locales/tr.json
index b77fc511c00a23..06f22bd2911313 100644
--- a/app/javascript/flavours/glitch/locales/tr.json
+++ b/app/javascript/flavours/glitch/locales/tr.json
@@ -1,16 +1,8 @@
 {
   "account.disclaimer_full": "Aşağıdaki bilgi kullanıcının profilini hatalı olarak gösterebilir.",
   "account.follows": "Takip Edilen",
-  "account.joined": "{date} tarihinde katıldı",
   "account.suspended_disclaimer_full": "Bu kullanıcı, bir moderatör tarafından askıya alınmıştır.",
   "account.view_full_profile": "Tam görünüm",
-  "advanced_options.icon_title": "Gelişmiş seçenekler",
-  "advanced_options.local-only.long": "Başka örneklere paylaşım yapmayın",
-  "advanced_options.local-only.short": "Sadece yerel",
-  "advanced_options.local-only.tooltip": "Bu gönderi sadece yerel kullanıcılar içindir",
-  "advanced_options.threaded_mode.long": "Paylaşımda otomatik olarak yanıt oluşturur",
-  "advanced_options.threaded_mode.short": "Başlık modu",
-  "advanced_options.threaded_mode.tooltip": "Başlık modu aktif",
   "boost_modal.missing_description": "Bu gönderi açıklaması olmayan medya içerir",
   "column.favourited_by": "Tarafından favorilere eklendi",
   "column.heading": "Diğer",
@@ -20,15 +12,9 @@
   "column_subheading.lists": "Listeler",
   "column_subheading.navigation": "Gezinme",
   "community.column_settings.allow_local_only": "Sadece yerel gönderileri göster",
-  "compose.attach": "Ekle...",
-  "compose.attach.doodle": "Herhangi bir şey çiz",
-  "compose.attach.upload": "Bir dosya yükle",
   "compose.content-type.html": "HTML",
   "compose.content-type.markdown": "Markdown modu",
   "compose.content-type.plain": "Düz metin",
-  "compose_form.poll.multiple_choices": "Birden fazla seçeneğe izin ver",
-  "compose_form.poll.single_choice": "Bir seçeneğe izin ver",
-  "compose_form.spoiler": "Yazıyı uyarının arkasına gizle",
   "confirmation_modal.do_not_ask_again": "Tekrardan onay istemeyin",
   "confirmations.deprecated_settings.confirm": "Mastadon seçimlerini kullan",
   "confirmations.deprecated_settings.message": "Kullanmakta olduğunuz bazı cihaz özgülü glitch-soc {app_settings} Mastadon {preferences} ile değiştirildi ve üzerine yazılacak:",
@@ -39,7 +25,6 @@
   "confirmations.unfilter.confirm": "Göster",
   "confirmations.unfilter.edit_filter": "Filtreyi düzenle",
   "confirmations.unfilter.filters": "Eşleşen {count, plural, one {filter} other {filters}}",
-  "content-type.change": "İçerik türü",
   "direct.group_by_conversations": "Grup sohbeti",
   "endorsed_accounts_editor.endorsed_accounts": "Öne çıkan hesaplar",
   "favourite_modal.combo": "Bir sonraki sefer {combo} tuşuna basabilirsiniz",
diff --git a/app/javascript/flavours/glitch/locales/uk.json b/app/javascript/flavours/glitch/locales/uk.json
index bceac4c6549633..3ac0b366e12a62 100644
--- a/app/javascript/flavours/glitch/locales/uk.json
+++ b/app/javascript/flavours/glitch/locales/uk.json
@@ -2,16 +2,8 @@
   "about.fork_disclaimer": "Glitch-soc - це вільне програмне забезпечення з відкритим вихідним кодом, форк від Mastodon.",
   "account.disclaimer_full": "Наведена нижче інформація може не повністю відображати профіль користувача.",
   "account.follows": "Підписки",
-  "account.joined": "Приєднався {date}",
   "account.suspended_disclaimer_full": "Цей користувач був призупинений модератором.",
   "account.view_full_profile": "Переглянути повний профіль",
-  "advanced_options.icon_title": "Додаткові налаштування",
-  "advanced_options.local-only.long": "Не дмухати це на інші сервери",
-  "advanced_options.local-only.short": "Лише локальне",
-  "advanced_options.local-only.tooltip": "Цей дмух лише локальний",
-  "advanced_options.threaded_mode.long": "Автоматично відкриває відповідь на публікацію",
-  "advanced_options.threaded_mode.short": "Потоковий режим",
-  "advanced_options.threaded_mode.tooltip": "Потоковий режим увімкнуто",
   "boost_modal.missing_description": "Цей дмух містить деякі медіа без опису",
   "column.favourited_by": "Уподобані",
   "column.heading": "Різне",
@@ -21,15 +13,9 @@
   "column_subheading.lists": "Списки",
   "column_subheading.navigation": "Навігація",
   "community.column_settings.allow_local_only": "Показувати тільки локальні дмухи",
-  "compose.attach": "Вкласти...",
-  "compose.attach.doodle": "Помалювати",
-  "compose.attach.upload": "Завантажити сюди файл",
   "compose.content-type.html": "HTML",
   "compose.content-type.markdown": "Markdown",
   "compose.content-type.plain": "Звичайний текст",
-  "compose_form.poll.multiple_choices": "Дозволити кілька варіантів",
-  "compose_form.poll.single_choice": "Дозволити один вибір",
-  "compose_form.spoiler": "Приховати текст позаду попередження",
   "confirmation_modal.do_not_ask_again": "Більше не запитувати підтвердження",
   "confirmations.deprecated_settings.confirm": "Використовуйте налаштування Mastodon",
   "confirmations.deprecated_settings.message": "Деякі з специфічних для пристрою glitch-soc {app_settings}, які ви використовуєте, було замінено на Mastodon {preferences}, і їх буде перевизначено:",
@@ -40,7 +26,6 @@
   "confirmations.unfilter.confirm": "Показати",
   "confirmations.unfilter.edit_filter": "Редагувати фільтр",
   "confirmations.unfilter.filters": "Відповідність {count, plural, one {filter} other {filters}}",
-  "content-type.change": "Тип вмісту",
   "direct.group_by_conversations": "Групування за розмовами",
   "endorsed_accounts_editor.endorsed_accounts": "Рекомендовані облікові записи",
   "favourite_modal.combo": "Ви можете натиснути {combo}, щоб пропустити це наступного разу",
@@ -52,7 +37,6 @@
   "keyboard_shortcuts.bookmark": "В закладки",
   "keyboard_shortcuts.secondary_toot": "надсилати повідомлення з використанням вторинних налаштувань конфіденційності",
   "keyboard_shortcuts.toggle_collapse": "згорнути/розгорнути дмухи",
-  "media_gallery.sensitive": "Чутливі",
   "moved_to_warning": "Цей обліковий запис позначено як переміщений до {moved_to_link} і тому не може прийняти нових підписок.",
   "navigation_bar.app_settings": "Налаштування програми",
   "navigation_bar.featured_users": "Рекомендовані користувачі",
@@ -153,6 +137,5 @@
   "status.in_reply_to": "Цей дмух є відповіддю",
   "status.is_poll": "Цей дмух є опитуванням",
   "status.local_only": "Видимий лише з вашого інстансу",
-  "status.sensitive_toggle": "Натисніть для перегляду",
   "status.uncollapse": "Розгорнути"
 }
diff --git a/app/javascript/flavours/glitch/locales/zh-CN.json b/app/javascript/flavours/glitch/locales/zh-CN.json
index 742624108c1069..91bd738c193521 100644
--- a/app/javascript/flavours/glitch/locales/zh-CN.json
+++ b/app/javascript/flavours/glitch/locales/zh-CN.json
@@ -1,36 +1,32 @@
 {
-  "about.fork_disclaimer": "Glitch-soc是从Mastodon生成的免费开源软件。",
-  "account.disclaimer_full": "下面的信息可能不完全反映用户的个人资料。",
+  "about.fork_disclaimer": "Glitch-soc是从Mastodon派生的自由开源软件。",
+  "account.disclaimer_full": "以下信息可能无法完整反映该用户的个人资料。",
   "account.follows": "正在关注",
   "account.follows_you": "关注了你",
-  "account.joined": "加入于 {date}",
   "account.suspended_disclaimer_full": "该用户已被管理员封禁。",
   "account.view_full_profile": "查看完整资料",
-  "advanced_options.icon_title": "高级选项",
-  "advanced_options.local-only.long": "不要发布嘟文到其他实例",
-  "advanced_options.local-only.short": "仅本站",
-  "advanced_options.local-only.tooltip": "这条嘟文仅本站可见",
-  "advanced_options.threaded_mode.long": "发嘟时自动打开回复",
-  "advanced_options.threaded_mode.short": "话题模式",
-  "advanced_options.threaded_mode.tooltip": "话题模式已启用",
   "boost_modal.missing_description": "这条嘟文未包含媒体描述",
   "column.favourited_by": "点赞",
   "column.heading": "杂项",
   "column.reblogged_by": "转嘟",
   "column.subheading": "其他选项",
-  "column_header.profile": "个人资料",
+  "column_header.profile": "资料卡",
   "column_subheading.lists": "列表",
   "column_subheading.navigation": "导航",
   "community.column_settings.allow_local_only": "只显示仅本站可见的嘟文",
-  "compose.attach": "附上...",
-  "compose.attach.doodle": "画点什么",
-  "compose.attach.upload": "上传文件",
+  "compose.change_federation": "更改联动设置",
+  "compose.content-type.change": "更改高级格式选项",
   "compose.content-type.html": "HTML",
+  "compose.content-type.html_meta": "使用HTML格式化您的嘟文",
   "compose.content-type.markdown": "Markdown",
+  "compose.content-type.markdown_meta": "使用Markdown格式化您的嘟文",
   "compose.content-type.plain": "纯文本",
-  "compose_form.poll.multiple_choices": "允许多选",
-  "compose_form.poll.single_choice": "允许单选",
-  "compose_form.spoiler": "隐藏并添加内容警告",
+  "compose.content-type.plain_meta": "不使用高级格式写嘟文",
+  "compose.disable_threaded_mode": "禁用嘟文串模式",
+  "compose.enable_threaded_mode": "启用嘟文串模式",
+  "compose_form.sensitive.hide": "{count, plural, other {将媒体标记为敏感}}",
+  "compose_form.sensitive.marked": "{count, plural, other {媒体已被标记为敏感}}",
+  "compose_form.sensitive.unmarked": "{count, plural, other {媒体未被标记为敏感}}",
   "confirmation_modal.do_not_ask_again": "不再要求确认",
   "confirmations.deprecated_settings.confirm": "使用 Mastodon 偏好设置",
   "confirmations.deprecated_settings.message": "您正使用的glitch-soc的特定于此设备的 {app_settings} 已被Mastodon {preferences} 替换，并将被覆盖：",
@@ -41,10 +37,13 @@
   "confirmations.unfilter.confirm": "显示",
   "confirmations.unfilter.edit_filter": "编辑筛选器",
   "confirmations.unfilter.filters": "应用{count, plural, other {筛选器}}",
-  "content-type.change": "内容类型 ",
   "direct.group_by_conversations": "按对话分组",
   "endorsed_accounts_editor.endorsed_accounts": "精选账户",
   "favourite_modal.combo": "下次你可以按 {combo} 跳过这个",
+  "federation.federated.long": "允许此嘟文到达其它服务器",
+  "federation.federated.short": "联动",
+  "federation.local_only.long": "阻止此嘟文到达其它服务器",
+  "federation.local_only.short": "仅本站",
   "firehose.column_settings.allow_local_only": "在“全部”中显示仅本站可见的嘟文",
   "home.column_settings.advanced": "高级",
   "home.column_settings.filter_regex": "按正则表达式筛选",
@@ -53,7 +52,6 @@
   "keyboard_shortcuts.bookmark": "到收藏夹",
   "keyboard_shortcuts.secondary_toot": "使用另一隐私设置发送嘟文",
   "keyboard_shortcuts.toggle_collapse": "折叠或展开嘟文",
-  "media_gallery.sensitive": "敏感内容",
   "moved_to_warning": "此账户已被标记为移至 {moved_to_link}，并且似乎没有收到新粉丝。",
   "navigation_bar.app_settings": "应用设置",
   "navigation_bar.featured_users": "推荐用户",
@@ -154,7 +152,6 @@
   "status.in_reply_to": "此嘟文是回复",
   "status.is_poll": "此嘟文是投票",
   "status.local_only": "此嘟文仅本站可见",
-  "status.sensitive_toggle": "点击查看",
   "status.uncollapse": "展开",
   "suggestions.dismiss": "关闭建议"
 }
diff --git a/app/javascript/flavours/glitch/locales/zh-TW.json b/app/javascript/flavours/glitch/locales/zh-TW.json
index 414bd44f78ea6f..59ad0f44abae36 100644
--- a/app/javascript/flavours/glitch/locales/zh-TW.json
+++ b/app/javascript/flavours/glitch/locales/zh-TW.json
@@ -3,16 +3,8 @@
   "account.disclaimer_full": "下面的資訊可能不完全反映使用者的個人資料。",
   "account.follows": "跟隨",
   "account.follows_you": "跟隨了您",
-  "account.joined": "加入於 {date}",
   "account.suspended_disclaimer_full": "使用者已被管理者停權。",
   "account.view_full_profile": "查看完整個人資料",
-  "advanced_options.icon_title": "進階選項",
-  "advanced_options.local-only.long": "不要傳遞給其他實例",
-  "advanced_options.local-only.short": "僅限本地",
-  "advanced_options.local-only.tooltip": "此貼文僅限本地",
-  "advanced_options.threaded_mode.long": "發佈時自動打開回覆",
-  "advanced_options.threaded_mode.short": "討論串模式",
-  "advanced_options.threaded_mode.tooltip": "已啟用討論串模式",
   "boost_modal.missing_description": "此貼文包含未加說明的媒體檔案",
   "column.favourited_by": "誰按了最愛",
   "column.heading": "雜項",
@@ -22,15 +14,16 @@
   "column_subheading.lists": "列表",
   "column_subheading.navigation": "導覽",
   "community.column_settings.allow_local_only": "顯示僅限本地的貼文",
-  "compose.attach": "附加...",
-  "compose.attach.doodle": "塗鴉",
-  "compose.attach.upload": "上傳檔案",
+  "compose.change_federation": "變更聯邦設定",
+  "compose.content-type.change": "變更進階格式設定",
   "compose.content-type.html": "HTML",
+  "compose.content-type.html_meta": "使用 HTML 格式撰寫貼文",
   "compose.content-type.markdown": "Markdown",
+  "compose.content-type.markdown_meta": "使用 Markdown 格式撰寫貼文",
   "compose.content-type.plain": "純文字",
-  "compose_form.poll.multiple_choices": "允許多重選擇",
-  "compose_form.poll.single_choice": "允許單一選擇",
-  "compose_form.spoiler": "將文字隱藏在內容警告後面",
+  "compose.content-type.plain_meta": "不使用進階格式撰寫",
+  "compose.disable_threaded_mode": "停用貼文串模式",
+  "compose.enable_threaded_mode": "啟用貼文串模式",
   "confirmation_modal.do_not_ask_again": "不要再顯示確認訊息",
   "confirmations.deprecated_settings.confirm": "使用 Mastodon 偏好",
   "confirmations.deprecated_settings.message": "您正在使用的某些特定於 glitch-soc 設備的 {app_settings} 已被 Mastodon {preferences} 所取代，並將被覆蓋：",
@@ -40,10 +33,13 @@
   "confirmations.unfilter.author": "作者",
   "confirmations.unfilter.confirm": "顯示",
   "confirmations.unfilter.edit_filter": "編輯篩選器",
-  "content-type.change": "內容類型",
   "direct.group_by_conversations": "以對話分組",
   "endorsed_accounts_editor.endorsed_accounts": "受推薦帳號",
   "favourite_modal.combo": "下次您可以按 {combo} 跳過",
+  "federation.federated.long": "允許此貼文發布到其他伺服器",
+  "federation.federated.short": "聯邦",
+  "federation.local_only.long": "避免此貼文發布到其他伺服器",
+  "federation.local_only.short": "僅限本地",
   "firehose.column_settings.allow_local_only": "在「全部」顯示僅限本地的貼文",
   "home.column_settings.advanced": "進階設定",
   "home.column_settings.filter_regex": "以正規表達式進行過濾",
@@ -52,7 +48,6 @@
   "keyboard_shortcuts.bookmark": "到書籤",
   "keyboard_shortcuts.secondary_toot": "使用次要隱私設定來發布貼文",
   "keyboard_shortcuts.toggle_collapse": "去折疊/展開貼文",
-  "media_gallery.sensitive": "敏感",
   "moved_to_warning": "此帳戶已標記為移至 {moved_to_link}，因此可能不接受新的追隨者。",
   "navigation_bar.app_settings": "應用程式設定",
   "navigation_bar.featured_users": "被推薦的使用者",
@@ -153,7 +148,6 @@
   "status.in_reply_to": "貼文有回覆",
   "status.is_poll": "貼文有投票",
   "status.local_only": "只在此實例可見",
-  "status.sensitive_toggle": "點擊查看",
   "status.uncollapse": "展開",
   "suggestions.dismiss": "關閉建議"
 }
diff --git a/config/locales-glitch/fr-CA.yml b/config/locales-glitch/fr-CA.yml
index 2fbf0ffd710189..f594483a3b91d4 100644
--- a/config/locales-glitch/fr-CA.yml
+++ b/config/locales-glitch/fr-CA.yml
@@ -1 +1,42 @@
---- {}
+---
+fr-CA:
+  admin:
+    custom_emojis:
+      batch_copy_error: 'Une erreur est survenue lors de la copie de certains des émojis sélectionnés : %{message}'
+      batch_error: 'Une erreur est survenue : %{message}'
+    settings:
+      captcha_enabled:
+        desc_html: Ceci se base sur des scripts externes venant de hCaptcha, ce qui peut engendrer des soucis de sécurité et de confidentialité. De plus, <strong>cela peut rendre l'inscription beaucoup moins accessible pour certaines personnes (comme les personnes handicapées)</strong>. Pour ces raisons, veuillez préférer des mesures alternatives telles que l'inscription sur acceptation ou invitation. <br>Les utilisateurs qui ont été invités via une invitation à usage limité n'auront pas à résoudre un CAPTCHA
+        title: Obliger les nouveaux utilisateurs à résoudre un CAPTCHA pour vérifier leur compte
+      flavour_and_skin:
+        title: Apparence et thèmes
+      hide_followers_count:
+        desc_html: Ne pas afficher le nombre d'abonné·e·s sur les profils des utilisateurs
+        title: Cacher le nombre d'abonné·e·s
+      other:
+        preamble: Divers autres paramètres de glitch-soc.
+        title: Autres
+      outgoing_spoilers:
+        desc_html: Ajouter un avertissement de contenu à tous les messages lorsqu'ils sont fédérés s'ils n'en possèdent pas déjà. Cela peut être utile si votre serveur est spécialisé dans un type de contenu sur lequel les autres serveurs pourraient vouloir un Avertissement de Contenu. Les médias seront également marqués comme sensibles.
+        title: Avertissement de contenu pour les messages sortants
+      show_reblogs_in_public_timelines:
+        desc_html: Afficher les partages publics de posts publics dans le fil local et global.
+        title: Afficher les partages dans les fils publics
+      show_replies_in_public_timelines:
+        desc_html: En plus des réponses à soi-même (threads), afficher les réponses publiques dans le fil local et global.
+        title: Afficher les réponses dans les fils publics
+      trending_status_cw:
+        desc_html: Quand les posts en tendance sont activés, permettre aux posts avec des avertissements de contenu (CW) d'être éligibles. Les changements effectués sur ce paramètre ne sont pas rétroactifs.
+        title: Autoriser les posts avec des avertissements de contenu à être en tendances
+  appearance:
+    localization:
+      glitch_guide_link: https://fr.crowdin.com/project/glitch-soc
+      glitch_guide_link_text: Et c'est pareil avec glitch-soc !
+  auth:
+    captcha_confirmation:
+      hint_html: Plus qu'une étape ! Pour vérifier votre compte sur ce serveur, vous devez résoudre un CAPTCHA. Vous pouvez <a href="/about/more">contacter l'administrateur·ice du serveur</a> si vous avez des questions ou besoin d'assistance dans la vérification de votre compte.
+      title: Vérification de l'utilisateur
+  generic:
+    use_this: Utiliser ceci
+  settings:
+    flavours: Thèmes
diff --git a/config/locales-glitch/no.yml b/config/locales-glitch/no.yml
index d36c60a4ac0a92..d2a4697e5dc65e 100644
--- a/config/locales-glitch/no.yml
+++ b/config/locales-glitch/no.yml
@@ -1 +1 @@
-'no':
+no:
diff --git a/config/locales-glitch/simple_form.fr-CA.yml b/config/locales-glitch/simple_form.fr-CA.yml
index 2fbf0ffd710189..3bc56611e3d650 100644
--- a/config/locales-glitch/simple_form.fr-CA.yml
+++ b/config/locales-glitch/simple_form.fr-CA.yml
@@ -1 +1,26 @@
---- {}
+---
+fr-CA:
+  simple_form:
+    glitch_only: glitch-soc
+    hints:
+      defaults:
+        setting_default_content_type_html: Vos posts sont écrits en HTML brut, sauf indication contraire
+        setting_default_content_type_markdown: Vos posts utilisent Markdown pour un formatage de texte enrichi, sauf indication contraire
+        setting_default_content_type_plain: Vos posts sont écrits en texte brut sans formatage spécial, sauf indication contraire (comportement par défaut de Mastodon)
+        setting_default_language: La langue utilisée pour vos posts peut être automatiquement détectée, cependant cette détection n'est pas toujours fiable
+        setting_show_followers_count: Montrer votre nombre d'abonné·e·s sur votre profil. Si vous cachez votre nombre d'abonné·e·s, il le sera de vous-même également, et certaines applications pourraient indiquer un compte d'abonné·e·s négatif.
+        setting_skin: Relooke le mode de Mastodon choisi
+    labels:
+      defaults:
+        setting_default_content_type: Format par défaut pour les posts
+        setting_default_content_type_html: HTML
+        setting_default_content_type_markdown: Markdown
+        setting_default_content_type_plain: Texte brut
+        setting_favourite_modal: Afficher une fenêtre de confirmation avant de mettre en favori un post (s'applique uniquement au mode Glitch)
+        setting_show_followers_count: Cacher votre nombre d'abonné·e·s
+        setting_skin: Thème
+        setting_system_emoji_font: Utiliser la police par défaut du système pour les émojis (s'applique uniquement au mode Glitch)
+      notification_emails:
+        trending_link: Un nouveau lien en tendances nécessite un examen
+        trending_status: Un nouveau post en tendances nécessite un examen
+        trending_tag: Un nouveau tag en tendances nécessite un examen
diff --git a/config/locales-glitch/simple_form.no.yml b/config/locales-glitch/simple_form.no.yml
index d36c60a4ac0a92..d2a4697e5dc65e 100644
--- a/config/locales-glitch/simple_form.no.yml
+++ b/config/locales-glitch/simple_form.no.yml
@@ -1 +1 @@
-'no':
+no:
diff --git a/config/locales-glitch/zh-CN.yml b/config/locales-glitch/zh-CN.yml
index 41a153ae10236e..aa90d356448125 100644
--- a/config/locales-glitch/zh-CN.yml
+++ b/config/locales-glitch/zh-CN.yml
@@ -11,7 +11,7 @@ zh-CN:
       flavour_and_skin:
         title: 风格与皮肤
       hide_followers_count:
-        desc_html: 不要在用户资料中显示粉丝数
+        desc_html: 不要在用户资料卡中显示粉丝数
         title: 隐藏粉丝数
       other:
         preamble: 各种不适合归类到其他类别的glitch-soc设置。
@@ -23,7 +23,7 @@ zh-CN:
         desc_html: 在本站和跨站时间线中显示公开嘟文的转嘟。
         title: 在公共时间线中显示转嘟
       show_replies_in_public_timelines:
-        desc_html: 除了公开的自我回复（线程模式），在本地和跨站时间轴中显示公开回复。
+        desc_html: 除公开的自我回复（嘟文串）外，在本地和跨站时间轴中显示公开回复。
         title: 在公共时间线中显示回复
       trending_status_cw:
         desc_html: 当热门帖子被启用时，允许带有内容警告的帖子获得资格。此设置的更改不具有追溯性。

From 9242c536d28446c52109c9bd842f61ed0d4bf470 Mon Sep 17 00:00:00 2001
From: Essem <smswessem@gmail.com>
Date: Wed, 28 Feb 2024 23:40:02 -0600
Subject: [PATCH 0321/2191] Use openURL function from upstream

---
 .../flavours/glitch/actions/search.js           | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/app/javascript/flavours/glitch/actions/search.js b/app/javascript/flavours/glitch/actions/search.js
index 7e54740d52a0f7..44344e2fb5b0d9 100644
--- a/app/javascript/flavours/glitch/actions/search.js
+++ b/app/javascript/flavours/glitch/actions/search.js
@@ -143,11 +143,14 @@ export const showSearch = () => ({
   type: SEARCH_SHOW,
 });
 
-export const openURL = routerHistory => (dispatch, getState) => {
-  const value = getState().getIn(['search', 'value']);
+export const openURL = (value, history, onFailure) => (dispatch, getState) => {
   const signedIn = !!getState().getIn(['meta', 'me']);
 
   if (!signedIn) {
+    if (onFailure) {
+      onFailure();
+    }
+
     return;
   }
 
@@ -156,15 +159,21 @@ export const openURL = routerHistory => (dispatch, getState) => {
   api(getState).get('/api/v2/search', { params: { q: value, resolve: true } }).then(response => {
     if (response.data.accounts?.length > 0) {
       dispatch(importFetchedAccounts(response.data.accounts));
-      routerHistory.push(`/@${response.data.accounts[0].acct}`);
+      history.push(`/@${response.data.accounts[0].acct}`);
     } else if (response.data.statuses?.length > 0) {
       dispatch(importFetchedStatuses(response.data.statuses));
-      routerHistory.push(`/@${response.data.statuses[0].account.acct}/${response.data.statuses[0].id}`);
+      history.push(`/@${response.data.statuses[0].account.acct}/${response.data.statuses[0].id}`);
+    } else if (onFailure) {
+      onFailure();
     }
 
     dispatch(fetchSearchSuccess(response.data, value));
   }).catch(err => {
     dispatch(fetchSearchFail(err));
+
+    if (onFailure) {
+      onFailure();
+    }
   });
 };
 

From cdf5098166a7d03efb73fb5d8f0f655fed8ffbce Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 29 Feb 2024 10:38:33 +0100
Subject: [PATCH 0322/2191] New Crowdin Translations (automated) (#29452)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/lt.json    | 5 +++--
 app/javascript/mastodon/locales/nl.json    | 4 ++--
 app/javascript/mastodon/locales/zh-TW.json | 2 +-
 config/locales/cy.yml                      | 5 +++++
 config/locales/is.yml                      | 5 +++++
 config/locales/lt.yml                      | 2 +-
 config/locales/simple_form.cy.yml          | 2 ++
 config/locales/simple_form.is.yml          | 2 ++
 config/locales/simple_form.nl.yml          | 4 ++--
 9 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/app/javascript/mastodon/locales/lt.json b/app/javascript/mastodon/locales/lt.json
index e8c51791ee1143..35722b0e0deb7f 100644
--- a/app/javascript/mastodon/locales/lt.json
+++ b/app/javascript/mastodon/locales/lt.json
@@ -1,6 +1,6 @@
 {
   "about.blocks": "Prižiūrimi serveriai",
-  "about.contact": "Kontaktuoti:",
+  "about.contact": "Kontaktai:",
   "about.disclaimer": "Mastodon – nemokama atvirojo kodo programa ir Mastodon gGmbH prekės ženklas.",
   "about.domain_blocks.no_reason_available": "Priežastis nepateikta",
   "about.domain_blocks.preamble": "Mastodon paprastai leidžia peržiūrėti turinį ir bendrauti su naudotojais iš bet kurio kito fediverse esančio serverio. Šios yra išimtys, kurios buvo padarytos šiame konkrečiame serveryje.",
@@ -424,7 +424,7 @@
   "notifications.column_settings.mention": "Paminėjimai:",
   "notifications.column_settings.poll": "Balsavimo rezultatai:",
   "notifications.column_settings.push": "\"Push\" pranešimai",
-  "notifications.column_settings.reblog": "\"Boost\" kiekis:",
+  "notifications.column_settings.reblog": "Pakėlimai:",
   "notifications.column_settings.show": "Rodyti stulpelyje",
   "notifications.column_settings.sound": "Paleisti garsą",
   "notifications.column_settings.status": "New toots:",
@@ -636,6 +636,7 @@
   "status.translate": "Versti",
   "status.translated_from_with": "Išversta iš {lang} naudojant {provider}",
   "status.uncached_media_warning": "Peržiūra nepasiekiama",
+  "subscribed_languages.lead": "Po pakeitimo tavo pagrindinėje ir sąrašo laiko juostose bus rodomi tik įrašai pasirinktomis kalbomis. Jei nori gauti įrašus visomis kalbomis, pasirink nė vieno.",
   "tabs_bar.home": "Pradžia",
   "tabs_bar.notifications": "Pranešimai",
   "time_remaining.days": "Liko {number, plural, one {# diena} few {# dienos} many {# dieno} other {# dienų}}",
diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json
index df04ded1668e87..f2367f6463f74d 100644
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@@ -529,8 +529,8 @@
   "poll_button.add_poll": "Peiling toevoegen",
   "poll_button.remove_poll": "Peiling verwijderen",
   "privacy.change": "Zichtbaarheid van bericht aanpassen",
-  "privacy.direct.long": "Iedereen die in het bericht wordt vermeld",
-  "privacy.direct.short": "Bepaalde mensen",
+  "privacy.direct.long": "Alleen voor mensen die specifiek in het bericht worden vermeld",
+  "privacy.direct.short": "Specifieke mensen",
   "privacy.private.long": "Alleen jouw volgers",
   "privacy.private.short": "Volgers",
   "privacy.public.long": "Iedereen op Mastodon en daarbuiten",
diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json
index 0ecf1378e3c9c2..4962aedad5be92 100644
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@@ -668,7 +668,7 @@
   "status.mute": "靜音 @{name}",
   "status.mute_conversation": "靜音對話",
   "status.open": "展開此嘟文",
-  "status.pin": "釘選到個人檔案頁面",
+  "status.pin": "釘選至個人檔案頁面",
   "status.pinned": "釘選嘟文",
   "status.read_more": "閱讀更多",
   "status.reblog": "轉嘟",
diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index 5085942fb718ce..1fbcbb225538ce 100644
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@@ -823,6 +823,7 @@ cy:
         disabled: I neb
         users: I ddefnyddwyr lleol wedi'u mewngofnodi
       registrations:
+        moderation_recommandation: Gwnewch yn siŵr bod gennych chi dîm cymedroli digonol ac adweithiol cyn i chi agor cofrestriadau i bawb!
         preamble: Rheoli pwy all greu cyfrif ar eich gweinydd.
         title: Cofrestriadau
       registrations_mode:
@@ -830,6 +831,7 @@ cy:
           approved: Mae angen cymeradwyaeth i gofrestru
           none: Nid oes neb yn gallu cofrestru
           open: Gall unrhyw un cofrestru
+        warning_hint: Rydym yn argymell defnyddio “Mae angen cymeradwyaeth ar gyfer cofrestru” oni bai eich bod yn hyderus y gall eich tîm cymedroli ymdrin â chofrestriadau sbam a rhai maleisus mewn modd amserol.
       security:
         authorized_fetch: Mae angen dilysu gan weinyddion ffederal
         authorized_fetch_hint: Mae gofyn am ddilysiad gan weinyddion ffederal yn galluogi gorfodi llymach ar flociau lefel defnyddiwr a lefel gweinydd. Fodd bynnag, daw hyn ar gost perfformiad arafach, mae'n lleihau cyrhaeddiad eich atebion, a gall gyflwyno materion cydnawsedd gyda rhai gwasanaethau ffederal. Yn ogystal, ni fydd hyn yn atal actorion ymroddedig rhag estyn eich postiadau a'ch cyfrifon cyhoeddus.
@@ -1038,6 +1040,9 @@ cy:
       title: Bachau Gwe
       webhook: Bachyn Gwe
   admin_mailer:
+    auto_close_registrations:
+      body: Oherwydd diffyg gweithgarwch cymedrolwr diweddar, mae cofrestriadau ar %{instance} wedi'u newid yn awtomatig i'r angen i gael adolygiad â llaw, er mwyn atal %{instance} rhag cael ei ddefnyddio fel llwyfan ar gyfer actorion drwg posibl. Gallwch ei newid yn ôl i agor cofrestriadau ar unrhyw adeg.
+      subject: Mae cofrestriadau ar gyfer %{instance} wedi'u newid yn awtomatig i'r angen i gael cymeradwyaeth
     new_appeal:
       actions:
         delete_statuses: i ddileu eu postiadau
diff --git a/config/locales/is.yml b/config/locales/is.yml
index d374c60755c42f..56d71bd9adc75f 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -769,6 +769,7 @@ is:
         disabled: Til engra
         users: Til innskráðra staðværra notenda
       registrations:
+        moderation_recommandation: Tryggðu að þú hafir hæft og aðgengilegt umsjónarteymi til taks áður en þú opnar á skráningar fyrir alla!
         preamble: Stýrðu því hverjir geta útbúið notandaaðgang á netþjóninum þínum.
         title: Nýskráningar
       registrations_mode:
@@ -776,6 +777,7 @@ is:
           approved: Krafist er samþykkt nýskráningar
           none: Enginn getur nýskráð sig
           open: Allir geta nýskráð sig
+        warning_hint: Við mælum með því að nota "Krafist er samþykkt nýskráningar" nema ef þú sért viss um að umsjónarteymið þitt geti brugðist tímanlega við ruslpósti og skráningum í misjöfnum tilgangi.
       security:
         authorized_fetch: Krefjast auðkenningar frá netþjónum í skýjasambandi
         authorized_fetch_hint: Að krefjast auðkenningar frá netþjónum í skýjasambandi kallar fram strangari útfærslu á útilokunum, bæði varðandi notendur og netþjóna. Hins vegar kemur þetta niður á afköstum, minnkar útbreiðslu á svörum þínum og gæti valdið samhæfnivandamálum við sumar sambandsþjónustur. Að auki kemur þetta ekki í veg fyrir að aðilar sem ætla sér að ná í opinberar færslur og notendaaðganga frá þér geri það.
@@ -968,6 +970,9 @@ is:
       title: Webhook-vefkrækjur
       webhook: Webhook-vefkrækja
   admin_mailer:
+    auto_close_registrations:
+      body: Vegna skorts á virkni umsjónaraðila að undanförnu, hafa nýskráningar á %{instance} sjálfkrafa verið stilltar á að þarfnast samþykktar umsjónaraðila, til að koma í veg fyrir að %{instance} verði mögulega misnotað af óprúttnum aðilum. Þú getur skipt hvenær sem er aftur yfir í opnar nýskráningar.
+      subject: Nýskráningar á %{instance} hafa sjálfkrafa verið stilltar á að krefjast samþykktar
     new_appeal:
       actions:
         delete_statuses: að eyða færslum viðkomandi
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 590062f3d94296..6ca6f3b62fcdde 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -319,7 +319,7 @@ lt:
       guide_link_text: Visi gali prisidėti.
   application_mailer:
     notification_preferences: Keisti el pašto parinktis
-    settings: 'Keisti el pašto parinktis: %{link}'
+    settings: 'Keisti el. pašto nuostatas: %{link}'
     view: 'Peržiūra:'
     view_profile: Peržiurėti profilį
     view_status: Peržiūrėti statusą
diff --git a/config/locales/simple_form.cy.yml b/config/locales/simple_form.cy.yml
index 3bba0d71cb72e0..3daedfc86063ce 100644
--- a/config/locales/simple_form.cy.yml
+++ b/config/locales/simple_form.cy.yml
@@ -39,12 +39,14 @@ cy:
         text: Dim ond unwaith y gallwch apelio yn erbyn rhybudd
       defaults:
         autofollow: Bydd pobl sy'n cofrestru drwy'r gwahoddiad yn eich dilyn yn awtomatig
+        avatar: WEBP, PNG, GIF neu JPG. %{size} ar y mwyaf. Bydd yn cael ei leihau i %{dimensions}px
         bot: Mae'r cyfrif hwn yn perfformio gweithredoedd awtomatig yn bennaf ac mae'n bosib nad yw'n cael ei fonitro
         context: Un neu fwy cyd-destun lle dylai'r hidlydd weithio
         current_password: At ddibenion diogelwch, nodwch gyfrinair y cyfrif cyfredol
         current_username: I gadarnhau, nodwch enw defnyddiwr y cyfrif cyfredol
         digest: Ond yn cael eu hanfon ar ôl cyfnod hir o anweithgarwch ac ond os ydych wedi derbyn unrhyw negeseuon personol yn eich absenoldeb
         email: Byddwch yn derbyn e-bost cadarnhau
+        header: WEBP, PNG, GIF neu JPG. %{size} ar y mwyaf. Bydd yn cael ei leihau i %{dimensions}px
         inbox_url: Copïwch yr URL o dudalen flaen y relái yr ydych am ei ddefnyddio
         irreversible: Bydd postiadau wedi'u hidlo'n diflannu'n ddiwrthdro, hyd yn oed os caiff yr hidlydd ei dynnu'n ddiweddarach
         locale: Iaith y rhyngwyneb, e-byst a hysbysiadau gwthiadwy
diff --git a/config/locales/simple_form.is.yml b/config/locales/simple_form.is.yml
index 0e9c50eff6fa73..0859e898971a0c 100644
--- a/config/locales/simple_form.is.yml
+++ b/config/locales/simple_form.is.yml
@@ -39,12 +39,14 @@ is:
         text: Þú getur aðeins áfrýjað refsingu einu sinni
       defaults:
         autofollow: Fólk sem skráir sig í gegnum boðið mun sjálfkrafa fylgjast með þér
+        avatar: WEBP, PNG, GIF eða JPG. Mest %{size}. Verður smækkað í %{dimensions}px
         bot: Þessi aðgangur er aðallega til að framkvæma sjálfvirkar aðgerðir og gæti verið án þess að hann sé vaktaður reglulega
         context: Eitt eða fleiri samhengi þar sem sían ætti að gilda
         current_password: Í öryggisskyni skaltu setja inn lykilorðið fyrir þennan notandaaðgang
         current_username: Til að staðfesta skaltu setja inn notandanafnið fyrir þennan notandaaðgang
         digest: Er aðeins sent eftir lengri tímabil án virkni og þá aðeins ef þú hefur fengið persónuleg skilaboð á meðan þú hefur ekki verið á línunni
         email: Þú munt fá sendan staðfestingarpóst
+        header: WEBP, PNG, GIF eða JPG. Mest %{size}. Verður smækkað í %{dimensions}px
         inbox_url: Afritaðu slóðina af forsíðu endurvarpans sem þú vilt nota
         irreversible: Síaðar færslur munu hverfa óendurkræft, jafnvel þó sían sé seinna fjarlægð
         locale: Tungumál notandaviðmótsins, tölvupósts og ýti-tilkynninga
diff --git a/config/locales/simple_form.nl.yml b/config/locales/simple_form.nl.yml
index 18a469b55eb82c..3f4f339b93a206 100644
--- a/config/locales/simple_form.nl.yml
+++ b/config/locales/simple_form.nl.yml
@@ -39,14 +39,14 @@ nl:
         text: Je kunt maar eenmalig bezwaar indienen tegen een vastgestelde overtreding
       defaults:
         autofollow: Mensen die zich via de uitnodiging hebben geregistreerd, volgen jou automatisch
-        avatar: WEBP, PNG, GIF of JPG. Hoogstens %{size}. Wordt verkleind naar %{dimensions}px
+        avatar: WEBP, PNG, GIF of JPG. Maximaal %{size}. Wordt verkleind naar %{dimensions}px
         bot: Signaal aan anderen dat het account voornamelijk geautomatiseerde acties uitvoert en mogelijk niet wordt gecontroleerd
         context: Een of meerdere locaties waar de filter actief moet zijn
         current_password: Voer voor veiligheidsredenen het wachtwoord van je huidige account in
         current_username: Voer ter bevestiging de gebruikersnaam van je huidige account in
         digest: Wordt alleen na een lange periode van inactiviteit verzonden en alleen wanneer je tijdens jouw afwezigheid persoonlijke berichten hebt ontvangen
         email: Je krijgt een bevestigingsmail
-        header: WEBP, PNG, GIF of JPG. Hoogstens %{size}. Wordt verkleind naar %{dimensions}px
+        header: WEBP, PNG, GIF of JPG. Maximaal %{size}. Wordt verkleind naar %{dimensions}px
         inbox_url: Kopieer de URL van de voorpagina van de relayserver die je wil gebruiken
         irreversible: Gefilterde berichten verdwijnen onomkeerbaar, zelfs als de filter later wordt verwijderd
         locale: De taal van de gebruikersomgeving, e-mails en pushmeldingen

From 4185f3792c84fb81ba74be047a7014be3ab318ec Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Thu, 29 Feb 2024 10:40:13 +0100
Subject: [PATCH 0323/2191] Fix full date display not respecting the locale
 12/24h format (#29448)

---
 app/javascript/mastodon/components/edited_timestamp/index.jsx   | 2 +-
 app/javascript/mastodon/components/relative_timestamp.tsx       | 1 -
 app/javascript/mastodon/components/status.jsx                   | 2 +-
 app/javascript/mastodon/features/account/components/header.jsx  | 1 -
 .../features/getting_started/components/announcements.jsx       | 2 +-
 .../mastodon/features/status/components/detailed_status.jsx     | 2 +-
 app/javascript/packs/public.jsx                                 | 1 -
 7 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/app/javascript/mastodon/components/edited_timestamp/index.jsx b/app/javascript/mastodon/components/edited_timestamp/index.jsx
index 4ca00f8dda9713..7b70f9d6e1dda8 100644
--- a/app/javascript/mastodon/components/edited_timestamp/index.jsx
+++ b/app/javascript/mastodon/components/edited_timestamp/index.jsx
@@ -67,7 +67,7 @@ class EditedTimestamp extends PureComponent {
     return (
       <DropdownMenu statusId={statusId} renderItem={this.renderItem} scrollable renderHeader={this.renderHeader} onItemClick={this.handleItemClick}>
         <button className='dropdown-menu__text-button'>
-          <FormattedMessage id='status.edited' defaultMessage='Edited {date}' values={{ date: intl.formatDate(timestamp, { hour12: false, month: 'short', day: '2-digit', hour: '2-digit', minute: '2-digit' }) }} /> <Icon id='caret-down' icon={ArrowDropDownIcon} />
+          <FormattedMessage id='status.edited' defaultMessage='Edited {date}' values={{ date: intl.formatDate(timestamp, { month: 'short', day: '2-digit', hour: '2-digit', minute: '2-digit' }) }} /> <Icon id='caret-down' icon={ArrowDropDownIcon} />
         </button>
       </DropdownMenu>
     );
diff --git a/app/javascript/mastodon/components/relative_timestamp.tsx b/app/javascript/mastodon/components/relative_timestamp.tsx
index ac3ab0fb4d48f6..12530c2b17bceb 100644
--- a/app/javascript/mastodon/components/relative_timestamp.tsx
+++ b/app/javascript/mastodon/components/relative_timestamp.tsx
@@ -53,7 +53,6 @@ const messages = defineMessages({
 });
 
 const dateFormatOptions = {
-  hour12: false,
   year: 'numeric',
   month: 'short',
   day: '2-digit',
diff --git a/app/javascript/mastodon/components/status.jsx b/app/javascript/mastodon/components/status.jsx
index 1171351c51a3e8..be9a1cec6593db 100644
--- a/app/javascript/mastodon/components/status.jsx
+++ b/app/javascript/mastodon/components/status.jsx
@@ -554,7 +554,7 @@ class Status extends ImmutablePureComponent {
             <div onClick={this.handleClick} className='status__info'>
               <a href={`/@${status.getIn(['account', 'acct'])}/${status.get('id')}`} className='status__relative-time' target='_blank' rel='noopener noreferrer'>
                 <span className='status__visibility-icon'><VisibilityIcon visibility={status.get('visibility')} /></span>
-                <RelativeTimestamp timestamp={status.get('created_at')} />{status.get('edited_at') && <abbr title={intl.formatMessage(messages.edited, { date: intl.formatDate(status.get('edited_at'), { hour12: false, year: 'numeric', month: 'short', day: '2-digit', hour: '2-digit', minute: '2-digit' }) })}> *</abbr>}
+                <RelativeTimestamp timestamp={status.get('created_at')} />{status.get('edited_at') && <abbr title={intl.formatMessage(messages.edited, { date: intl.formatDate(status.get('edited_at'), { year: 'numeric', month: 'short', day: '2-digit', hour: '2-digit', minute: '2-digit' }) })}> *</abbr>}
               </a>
 
               <a onClick={this.handleAccountClick} href={`/@${status.getIn(['account', 'acct'])}`} title={status.getIn(['account', 'acct'])} className='status__display-name' target='_blank' rel='noopener noreferrer'>
diff --git a/app/javascript/mastodon/features/account/components/header.jsx b/app/javascript/mastodon/features/account/components/header.jsx
index 233d208c648233..07ea227c487fb1 100644
--- a/app/javascript/mastodon/features/account/components/header.jsx
+++ b/app/javascript/mastodon/features/account/components/header.jsx
@@ -101,7 +101,6 @@ const dateFormatOptions = {
   month: 'short',
   day: 'numeric',
   year: 'numeric',
-  hour12: false,
   hour: '2-digit',
   minute: '2-digit',
 };
diff --git a/app/javascript/mastodon/features/getting_started/components/announcements.jsx b/app/javascript/mastodon/features/getting_started/components/announcements.jsx
index ea36cefd7dc240..3c0b53b9e72abc 100644
--- a/app/javascript/mastodon/features/getting_started/components/announcements.jsx
+++ b/app/javascript/mastodon/features/getting_started/components/announcements.jsx
@@ -343,7 +343,7 @@ class Announcement extends ImmutablePureComponent {
       <div className='announcements__item'>
         <strong className='announcements__item__range'>
           <FormattedMessage id='announcement.announcement' defaultMessage='Announcement' />
-          {hasTimeRange && <span> · <FormattedDate value={startsAt} hour12={false} year={(skipYear || startsAt.getFullYear() === now.getFullYear()) ? undefined : 'numeric'} month='short' day='2-digit' hour={skipTime ? undefined : '2-digit'} minute={skipTime ? undefined : '2-digit'} /> - <FormattedDate value={endsAt} hour12={false} year={(skipYear || endsAt.getFullYear() === now.getFullYear()) ? undefined : 'numeric'} month={skipEndDate ? undefined : 'short'} day={skipEndDate ? undefined : '2-digit'} hour={skipTime ? undefined : '2-digit'} minute={skipTime ? undefined : '2-digit'} /></span>}
+          {hasTimeRange && <span> · <FormattedDate value={startsAt} year={(skipYear || startsAt.getFullYear() === now.getFullYear()) ? undefined : 'numeric'} month='short' day='2-digit' hour={skipTime ? undefined : '2-digit'} minute={skipTime ? undefined : '2-digit'} /> - <FormattedDate value={endsAt} year={(skipYear || endsAt.getFullYear() === now.getFullYear()) ? undefined : 'numeric'} month={skipEndDate ? undefined : 'short'} day={skipEndDate ? undefined : '2-digit'} hour={skipTime ? undefined : '2-digit'} minute={skipTime ? undefined : '2-digit'} /></span>}
         </strong>
 
         <Content announcement={announcement} />
diff --git a/app/javascript/mastodon/features/status/components/detailed_status.jsx b/app/javascript/mastodon/features/status/components/detailed_status.jsx
index 437e9e86bff294..d10c8966e4ad76 100644
--- a/app/javascript/mastodon/features/status/components/detailed_status.jsx
+++ b/app/javascript/mastodon/features/status/components/detailed_status.jsx
@@ -311,7 +311,7 @@ class DetailedStatus extends ImmutablePureComponent {
 
           <div className='detailed-status__meta'>
             <a className='detailed-status__datetime' href={`/@${status.getIn(['account', 'acct'])}/${status.get('id')}`} target='_blank' rel='noopener noreferrer'>
-              <FormattedDate value={new Date(status.get('created_at'))} hour12={false} year='numeric' month='short' day='2-digit' hour='2-digit' minute='2-digit' />
+              <FormattedDate value={new Date(status.get('created_at'))} year='numeric' month='short' day='2-digit' hour='2-digit' minute='2-digit' />
             </a>{edited}{visibilityLink}{applicationLink}{reblogLink} · {favouriteLink}
           </div>
         </div>
diff --git a/app/javascript/packs/public.jsx b/app/javascript/packs/public.jsx
index 01b57dce398408..d8a4c16034f64a 100644
--- a/app/javascript/packs/public.jsx
+++ b/app/javascript/packs/public.jsx
@@ -65,7 +65,6 @@ function loaded() {
 
   const timeFormat = new Intl.DateTimeFormat(locale, {
     timeStyle: 'short',
-    hour12: false,
   });
 
   const formatMessage = ({ id, defaultMessage }, values) => {

From 14c65180df7d20bbbd5a9b8f80500301d3caca94 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 29 Feb 2024 05:51:11 -0500
Subject: [PATCH 0324/2191] Use sequence in `software_update` fabricator to
 allow multiple (#29438)

---
 spec/fabricators/software_update_fabricator.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/fabricators/software_update_fabricator.rb b/spec/fabricators/software_update_fabricator.rb
index 622fff66e8dd95..f4b607da0a29ee 100644
--- a/spec/fabricators/software_update_fabricator.rb
+++ b/spec/fabricators/software_update_fabricator.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 Fabricator(:software_update) do
-  version '99.99.99'
+  version { sequence(:version) { |point| "99.99.#{point}" } }
   urgent false
   type 'patch'
 end

From e1fcb02867a0103977062ae11b86f80c5e3fd74f Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 29 Feb 2024 06:00:58 -0500
Subject: [PATCH 0325/2191] Align `TagServersMeasure` to use `WITH` query style
 similar to others (#29435)

---
 .../metrics/measure/tag_servers_measure.rb    | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/app/lib/admin/metrics/measure/tag_servers_measure.rb b/app/lib/admin/metrics/measure/tag_servers_measure.rb
index 6eb46bca456b06..e0f1bf3440d745 100644
--- a/app/lib/admin/metrics/measure/tag_servers_measure.rb
+++ b/app/lib/admin/metrics/measure/tag_servers_measure.rb
@@ -28,14 +28,17 @@ def sql_array
   def sql_query_string
     <<~SQL.squish
       SELECT axis.*, (
-        SELECT count(distinct accounts.domain) AS value
-        FROM statuses
-        INNER JOIN statuses_tags ON statuses.id = statuses_tags.status_id
-        INNER JOIN accounts ON statuses.account_id = accounts.id
-        WHERE statuses_tags.tag_id = :tag_id
-          AND statuses.id BETWEEN :earliest_status_id AND :latest_status_id
-          AND date_trunc('day', statuses.created_at)::date = axis.period
-      )
+        WITH tag_servers AS (
+          SELECT DISTINCT accounts.domain
+          FROM statuses
+          INNER JOIN statuses_tags ON statuses.id = statuses_tags.status_id
+          INNER JOIN accounts ON statuses.account_id = accounts.id
+          WHERE statuses_tags.tag_id = :tag_id
+            AND statuses.id BETWEEN :earliest_status_id AND :latest_status_id
+            AND date_trunc('day', statuses.created_at)::date = axis.period
+        )
+        SELECT COUNT(*) FROM tag_servers
+      ) AS value
       FROM (
         SELECT generate_series(date_trunc('day', :start_at::timestamp)::date, date_trunc('day', :end_at::timestamp)::date, interval '1 day') AS period
       ) as axis

From 1c4f36422d856ca26b282b28dab5706115365555 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 29 Feb 2024 12:51:22 +0100
Subject: [PATCH 0326/2191] Fix bogus translation files

---
 config/locales-glitch/no.yml             | 2 +-
 config/locales-glitch/simple_form.no.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/locales-glitch/no.yml b/config/locales-glitch/no.yml
index d2a4697e5dc65e..d36c60a4ac0a92 100644
--- a/config/locales-glitch/no.yml
+++ b/config/locales-glitch/no.yml
@@ -1 +1 @@
-no:
+'no':
diff --git a/config/locales-glitch/simple_form.no.yml b/config/locales-glitch/simple_form.no.yml
index d2a4697e5dc65e..d36c60a4ac0a92 100644
--- a/config/locales-glitch/simple_form.no.yml
+++ b/config/locales-glitch/simple_form.no.yml
@@ -1 +1 @@
-no:
+'no':

From 6675bf574adf6fc898dde84fccdbd7abe17c3072 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 29 Feb 2024 08:47:38 -0500
Subject: [PATCH 0327/2191] Extract `parsed_uri_query_values` helper in
 ap/replies controller spec (#29410)

---
 .../activitypub/replies_controller_spec.rb          | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/spec/controllers/activitypub/replies_controller_spec.rb b/spec/controllers/activitypub/replies_controller_spec.rb
index 6b5a69d42a624e..db7f60d3f873dc 100644
--- a/spec/controllers/activitypub/replies_controller_spec.rb
+++ b/spec/controllers/activitypub/replies_controller_spec.rb
@@ -90,7 +90,7 @@
         context 'when there are few self-replies' do
           it 'points next to replies from other people' do
             expect(page_json).to be_a Hash
-            expect(Addressable::URI.parse(page_json[:next]).query.split('&')).to include('only_other_accounts=true', 'page=true')
+            expect(parsed_uri_query_values(page_json[:next])).to include('only_other_accounts=true', 'page=true')
           end
         end
 
@@ -101,7 +101,7 @@
 
           it 'points next to other self-replies' do
             expect(page_json).to be_a Hash
-            expect(Addressable::URI.parse(page_json[:next]).query.split('&')).to include('only_other_accounts=false', 'page=true')
+            expect(parsed_uri_query_values(page_json[:next])).to include('only_other_accounts=false', 'page=true')
           end
         end
       end
@@ -140,7 +140,7 @@
 
           it 'points next to other replies' do
             expect(page_json).to be_a Hash
-            expect(Addressable::URI.parse(page_json[:next]).query.split('&')).to include('only_other_accounts=true', 'page=true')
+            expect(parsed_uri_query_values(page_json[:next])).to include('only_other_accounts=true', 'page=true')
           end
         end
       end
@@ -196,6 +196,13 @@
 
   private
 
+  def parsed_uri_query_values(uri)
+    Addressable::URI
+      .parse(uri)
+      .query
+      .split('&')
+  end
+
   def ap_public_collection
     ActivityPub::TagManager::COLLECTIONS[:public]
   end

From f24c62a5c809e9d3ec944804a9c28804d9896bbd Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 29 Feb 2024 14:54:02 +0100
Subject: [PATCH 0328/2191] Fix preview card player getting embedded when
 clicking on the external link button (#29457)

---
 app/javascript/mastodon/features/status/components/card.jsx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/features/status/components/card.jsx b/app/javascript/mastodon/features/status/components/card.jsx
index f37b558c4cd50e..f47861f663ba77 100644
--- a/app/javascript/mastodon/features/status/components/card.jsx
+++ b/app/javascript/mastodon/features/status/components/card.jsx
@@ -92,6 +92,10 @@ export default class Card extends PureComponent {
     this.setState({ embedded: true });
   };
 
+  handleExternalLinkClick = (e) => {
+    e.stopPropagation();
+  };
+
   setRef = c => {
     this.node = c;
   };
@@ -201,7 +205,7 @@ export default class Card extends PureComponent {
               <div className='status-card__actions' onClick={this.handleEmbedClick} role='none'>
                 <div>
                   <button type='button' onClick={this.handleEmbedClick}><Icon id='play' icon={PlayArrowIcon} /></button>
-                  <a href={card.get('url')} target='_blank' rel='noopener noreferrer'><Icon id='external-link' icon={OpenInNewIcon} /></a>
+                  <a href={card.get('url')} onClick={this.handleExternalLinkClick} target='_blank' rel='noopener noreferrer'><Icon id='external-link' icon={OpenInNewIcon} /></a>
                 </div>
               </div>
             ) : spoilerButton}

From edd6aa70e1117818669cf0b85b7a3cde06a3c8c1 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 29 Feb 2024 14:54:06 +0100
Subject: [PATCH 0329/2191] Fix regression with search bar icon position
 (#29456)

---
 app/javascript/styles/mastodon/components.scss | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 29c91ef7bc6f82..5bd11c3500497a 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -5210,10 +5210,6 @@ a.status-card {
       pointer-events: auto;
       opacity: 1;
     }
-
-    @media screen and (min-width: $no-gap-breakpoint) {
-      inset-inline-start: 16px - 2px;
-    }
   }
 
   .icon-search {
@@ -8265,7 +8261,7 @@ noscript {
   .search__input {
     border: 1px solid lighten($ui-base-color, 8%);
     padding: 10px;
-    padding-inline-end: 28px;
+    padding-inline-end: 30px;
   }
 
   .search__popout {

From eb1b8f69de70bbf82fcf14663482c57a25161024 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 29 Feb 2024 09:21:56 -0500
Subject: [PATCH 0330/2191] Allow pagination `Link` headers on API
 accounts/statuses when pinned true (#29442)

---
 .../api/v1/accounts/statuses_controller.rb    |  2 +-
 .../v1/accounts/statuses_controller_spec.rb   | 48 ++++++++++++++++++-
 2 files changed, 47 insertions(+), 3 deletions(-)

diff --git a/app/controllers/api/v1/accounts/statuses_controller.rb b/app/controllers/api/v1/accounts/statuses_controller.rb
index fe4279302fc891..6a994ff5419ae2 100644
--- a/app/controllers/api/v1/accounts/statuses_controller.rb
+++ b/app/controllers/api/v1/accounts/statuses_controller.rb
@@ -4,7 +4,7 @@ class Api::V1::Accounts::StatusesController < Api::BaseController
   before_action -> { authorize_if_got_token! :read, :'read:statuses' }
   before_action :set_account
 
-  after_action :insert_pagination_headers, unless: -> { truthy_param?(:pinned) }
+  after_action :insert_pagination_headers
 
   def index
     cache_if_unauthenticated!
diff --git a/spec/controllers/api/v1/accounts/statuses_controller_spec.rb b/spec/controllers/api/v1/accounts/statuses_controller_spec.rb
index 9bf385c03dc1eb..102e3b8e91537f 100644
--- a/spec/controllers/api/v1/accounts/statuses_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/statuses_controller_spec.rb
@@ -18,7 +18,8 @@
       get :index, params: { account_id: user.account.id, limit: 1 }
 
       expect(response).to have_http_status(200)
-      expect(response.headers['Link'].links.size).to eq(2)
+      expect(links_from_header.size)
+        .to eq(2)
     end
 
     context 'with only media' do
@@ -55,10 +56,45 @@
         Fabricate(:status_pin, account: user.account, status: Fabricate(:status, account: user.account))
       end
 
-      it 'returns http success' do
+      it 'returns http success and includes a header link' do
         get :index, params: { account_id: user.account.id, pinned: true }
 
         expect(response).to have_http_status(200)
+        expect(links_from_header.size)
+          .to eq(1)
+        expect(links_from_header)
+          .to contain_exactly(
+            have_attributes(
+              href: /pinned=true/,
+              attr_pairs: contain_exactly(['rel', 'prev'])
+            )
+          )
+      end
+    end
+
+    context 'with enough pinned statuses to paginate' do
+      before do
+        stub_const 'Api::BaseController::DEFAULT_STATUSES_LIMIT', 1
+        2.times { Fabricate(:status_pin, account: user.account) }
+      end
+
+      it 'returns http success and header pagination links to prev and next' do
+        get :index, params: { account_id: user.account.id, pinned: true }
+
+        expect(response).to have_http_status(200)
+        expect(links_from_header.size)
+          .to eq(2)
+        expect(links_from_header)
+          .to contain_exactly(
+            have_attributes(
+              href: /pinned=true/,
+              attr_pairs: contain_exactly(['rel', 'next'])
+            ),
+            have_attributes(
+              href: /pinned=true/,
+              attr_pairs: contain_exactly(['rel', 'prev'])
+            )
+          )
       end
     end
 
@@ -98,4 +134,12 @@
       end
     end
   end
+
+  private
+
+  def links_from_header
+    response
+      .headers['Link']
+      .links
+  end
 end

From 6dfe318f34d69066dc0f453a228fdfc6af84b62e Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 29 Feb 2024 16:20:39 +0100
Subject: [PATCH 0331/2191] Update dependency express to v4.18.3 (#29458)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 67 +++++++++++++++----------------------------------------
 1 file changed, 18 insertions(+), 49 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index dda4ed326e0cbc..b336fef88c6a8f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -42,7 +42,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.10.4, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.22.13, @babel/code-frame@npm:^7.23.5":
+"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.10.4, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.23.5":
   version: 7.23.5
   resolution: "@babel/code-frame@npm:7.23.5"
   dependencies:
@@ -373,15 +373,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/parser@npm:^7.22.15":
-  version: 7.23.6
-  resolution: "@babel/parser@npm:7.23.6"
-  bin:
-    parser: ./bin/babel-parser.js
-  checksum: 10c0/6f76cd5ccae1fa9bcab3525b0865c6222e9c1d22f87abc69f28c5c7b2c8816a13361f5bd06bddbd5faf903f7320a8feba02545c981468acec45d12a03db7755e
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:^7.23.3":
   version: 7.23.3
   resolution: "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:7.23.3"
@@ -1500,18 +1491,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/template@npm:^7.22.15, @babel/template@npm:^7.3.3":
-  version: 7.22.15
-  resolution: "@babel/template@npm:7.22.15"
-  dependencies:
-    "@babel/code-frame": "npm:^7.22.13"
-    "@babel/parser": "npm:^7.22.15"
-    "@babel/types": "npm:^7.22.15"
-  checksum: 10c0/9312edd37cf1311d738907003f2aa321a88a42ba223c69209abe4d7111db019d321805504f606c7fd75f21c6cf9d24d0a8223104cd21ebd207e241b6c551f454
-  languageName: node
-  linkType: hard
-
-"@babel/template@npm:^7.23.9":
+"@babel/template@npm:^7.22.15, @babel/template@npm:^7.23.9, @babel/template@npm:^7.3.3":
   version: 7.23.9
   resolution: "@babel/template@npm:7.23.9"
   dependencies:
@@ -1540,18 +1520,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/types@npm:^7.0.0, @babel/types@npm:^7.0.0-beta.49, @babel/types@npm:^7.12.11, @babel/types@npm:^7.12.6, @babel/types@npm:^7.20.7, @babel/types@npm:^7.22.10, @babel/types@npm:^7.22.15, @babel/types@npm:^7.22.19, @babel/types@npm:^7.22.5, @babel/types@npm:^7.23.0, @babel/types@npm:^7.23.6, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3":
-  version: 7.23.6
-  resolution: "@babel/types@npm:7.23.6"
-  dependencies:
-    "@babel/helper-string-parser": "npm:^7.23.4"
-    "@babel/helper-validator-identifier": "npm:^7.22.20"
-    to-fast-properties: "npm:^2.0.0"
-  checksum: 10c0/42cefce8a68bd09bb5828b4764aa5586c53c60128ac2ac012e23858e1c179347a4aac9c66fc577994fbf57595227611c5ec8270bf0cfc94ff033bbfac0550b70
-  languageName: node
-  linkType: hard
-
-"@babel/types@npm:^7.23.9":
+"@babel/types@npm:^7.0.0, @babel/types@npm:^7.0.0-beta.49, @babel/types@npm:^7.12.11, @babel/types@npm:^7.12.6, @babel/types@npm:^7.20.7, @babel/types@npm:^7.22.10, @babel/types@npm:^7.22.15, @babel/types@npm:^7.22.19, @babel/types@npm:^7.22.5, @babel/types@npm:^7.23.0, @babel/types@npm:^7.23.6, @babel/types@npm:^7.23.9, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3":
   version: 7.23.9
   resolution: "@babel/types@npm:7.23.9"
   dependencies:
@@ -5026,12 +4995,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"body-parser@npm:1.20.1":
-  version: 1.20.1
-  resolution: "body-parser@npm:1.20.1"
+"body-parser@npm:1.20.2":
+  version: 1.20.2
+  resolution: "body-parser@npm:1.20.2"
   dependencies:
     bytes: "npm:3.1.2"
-    content-type: "npm:~1.0.4"
+    content-type: "npm:~1.0.5"
     debug: "npm:2.6.9"
     depd: "npm:2.0.0"
     destroy: "npm:1.2.0"
@@ -5039,10 +5008,10 @@ __metadata:
     iconv-lite: "npm:0.4.24"
     on-finished: "npm:2.4.1"
     qs: "npm:6.11.0"
-    raw-body: "npm:2.5.1"
+    raw-body: "npm:2.5.2"
     type-is: "npm:~1.6.18"
     unpipe: "npm:1.0.0"
-  checksum: 10c0/a202d493e2c10a33fb7413dac7d2f713be579c4b88343cd814b6df7a38e5af1901fc31044e04de176db56b16d9772aa25a7723f64478c20f4d91b1ac223bf3b8
+  checksum: 10c0/06f1438fff388a2e2354c96aa3ea8147b79bfcb1262dfcc2aae68ec13723d01d5781680657b74e9f83c808266d5baf52804032fbde2b7382b89bd8cdb273ace9
   languageName: node
   linkType: hard
 
@@ -5872,7 +5841,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"content-type@npm:~1.0.4":
+"content-type@npm:~1.0.4, content-type@npm:~1.0.5":
   version: 1.0.5
   resolution: "content-type@npm:1.0.5"
   checksum: 10c0/b76ebed15c000aee4678c3707e0860cb6abd4e680a598c0a26e17f0bfae723ec9cc2802f0ff1bc6e4d80603719010431d2231018373d4dde10f9ccff9dadf5af
@@ -7740,12 +7709,12 @@ __metadata:
   linkType: hard
 
 "express@npm:^4.17.1, express@npm:^4.18.2":
-  version: 4.18.2
-  resolution: "express@npm:4.18.2"
+  version: 4.18.3
+  resolution: "express@npm:4.18.3"
   dependencies:
     accepts: "npm:~1.3.8"
     array-flatten: "npm:1.1.1"
-    body-parser: "npm:1.20.1"
+    body-parser: "npm:1.20.2"
     content-disposition: "npm:0.5.4"
     content-type: "npm:~1.0.4"
     cookie: "npm:0.5.0"
@@ -7774,7 +7743,7 @@ __metadata:
     type-is: "npm:~1.6.18"
     utils-merge: "npm:1.0.1"
     vary: "npm:~1.1.2"
-  checksum: 10c0/75af556306b9241bc1d7bdd40c9744b516c38ce50ae3210658efcbf96e3aed4ab83b3432f06215eae5610c123bc4136957dc06e50dfc50b7d4d775af56c4c59c
+  checksum: 10c0/0b9eeafbac549e3c67d92d083bf1773e358359f41ad142b92121935c6348d29079b75054555b3f62de39263fffc8ba06898b09fdd3e213e28e714c03c5d9f44c
   languageName: node
   linkType: hard
 
@@ -13412,15 +13381,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"raw-body@npm:2.5.1":
-  version: 2.5.1
-  resolution: "raw-body@npm:2.5.1"
+"raw-body@npm:2.5.2":
+  version: 2.5.2
+  resolution: "raw-body@npm:2.5.2"
   dependencies:
     bytes: "npm:3.1.2"
     http-errors: "npm:2.0.0"
     iconv-lite: "npm:0.4.24"
     unpipe: "npm:1.0.0"
-  checksum: 10c0/5dad5a3a64a023b894ad7ab4e5c7c1ce34d3497fc7138d02f8c88a3781e68d8a55aa7d4fd3a458616fa8647cc228be314a1c03fb430a07521de78b32c4dd09d2
+  checksum: 10c0/b201c4b66049369a60e766318caff5cb3cc5a900efd89bdac431463822d976ad0670912c931fdbdcf5543207daf6f6833bca57aa116e1661d2ea91e12ca692c4
   languageName: node
   linkType: hard
 

From 958a810553aac6b6cf21d9d107a47b6f68b2a401 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Thu, 29 Feb 2024 16:21:03 +0100
Subject: [PATCH 0332/2191] Convert `packs/admin.jsx` to Typescript (#29425)

---
 app/javascript/packs/admin.jsx | 244 ----------------------
 app/javascript/packs/admin.tsx | 368 +++++++++++++++++++++++++++++++++
 2 files changed, 368 insertions(+), 244 deletions(-)
 delete mode 100644 app/javascript/packs/admin.jsx
 create mode 100644 app/javascript/packs/admin.tsx

diff --git a/app/javascript/packs/admin.jsx b/app/javascript/packs/admin.jsx
deleted file mode 100644
index 5f24d6677e949c..00000000000000
--- a/app/javascript/packs/admin.jsx
+++ /dev/null
@@ -1,244 +0,0 @@
-import './public-path';
-import React from 'react';
-import { createRoot } from 'react-dom/client';
-
-import Rails from '@rails/ujs';
-
-import ready from '../mastodon/ready';
-
-const setAnnouncementEndsAttributes = (target) => {
-  const valid = target?.value && target?.validity?.valid;
-  const element = document.querySelector('input[type="datetime-local"]#announcement_ends_at');
-  if (valid) {
-    element.classList.remove('optional');
-    element.required = true;
-    element.min = target.value;
-  } else {
-    element.classList.add('optional');
-    element.removeAttribute('required');
-    element.removeAttribute('min');
-  }
-};
-
-Rails.delegate(document, 'input[type="datetime-local"]#announcement_starts_at', 'change', ({ target }) => {
-  setAnnouncementEndsAttributes(target);
-});
-
-const batchCheckboxClassName = '.batch-checkbox input[type="checkbox"]';
-
-const showSelectAll = () => {
-  const selectAllMatchingElement = document.querySelector('.batch-table__select-all');
-  selectAllMatchingElement.classList.add('active');
-};
-
-const hideSelectAll = () => {
-  const selectAllMatchingElement = document.querySelector('.batch-table__select-all');
-  const hiddenField = document.querySelector('#select_all_matching');
-  const selectedMsg = document.querySelector('.batch-table__select-all .selected');
-  const notSelectedMsg = document.querySelector('.batch-table__select-all .not-selected');
-
-  selectAllMatchingElement.classList.remove('active');
-  selectedMsg.classList.remove('active');
-  notSelectedMsg.classList.add('active');
-  hiddenField.value = '0';
-};
-
-Rails.delegate(document, '#batch_checkbox_all', 'change', ({ target }) => {
-  const selectAllMatchingElement = document.querySelector('.batch-table__select-all');
-
-  document.querySelectorAll(batchCheckboxClassName).forEach((content) => {
-    content.checked = target.checked;
-  });
-
-  if (selectAllMatchingElement) {
-    if (target.checked) {
-      showSelectAll();
-    } else {
-      hideSelectAll();
-    }
-  }
-});
-
-Rails.delegate(document, '.batch-table__select-all button', 'click', () => {
-  const hiddenField = document.querySelector('#select_all_matching');
-  const active = hiddenField.value === '1';
-  const selectedMsg = document.querySelector('.batch-table__select-all .selected');
-  const notSelectedMsg = document.querySelector('.batch-table__select-all .not-selected');
-
-  if (active) {
-    hiddenField.value = '0';
-    selectedMsg.classList.remove('active');
-    notSelectedMsg.classList.add('active');
-  } else {
-    hiddenField.value = '1';
-    notSelectedMsg.classList.remove('active');
-    selectedMsg.classList.add('active');
-  }
-});
-
-Rails.delegate(document, batchCheckboxClassName, 'change', () => {
-  const checkAllElement = document.querySelector('#batch_checkbox_all');
-  const selectAllMatchingElement = document.querySelector('.batch-table__select-all');
-
-  if (checkAllElement) {
-    const allCheckboxes = Array.from(
-      document.querySelectorAll(batchCheckboxClassName)
-    );
-    checkAllElement.checked = allCheckboxes.every((content) => content.checked);
-    checkAllElement.indeterminate = !checkAllElement.checked && allCheckboxes.some((content) => content.checked);
-
-    if (selectAllMatchingElement) {
-      if (checkAllElement.checked) {
-        showSelectAll();
-      } else {
-        hideSelectAll();
-      }
-    }
-  }
-});
-
-Rails.delegate(document, '.filter-subset--with-select select', 'change', ({ target }) => {
-  target.form.submit();
-});
-
-const onDomainBlockSeverityChange = (target) => {
-  const rejectMediaDiv   = document.querySelector('.input.with_label.domain_block_reject_media');
-  const rejectReportsDiv = document.querySelector('.input.with_label.domain_block_reject_reports');
-
-  if (rejectMediaDiv) {
-    rejectMediaDiv.style.display = (target.value === 'suspend') ? 'none' : 'block';
-  }
-
-  if (rejectReportsDiv) {
-    rejectReportsDiv.style.display = (target.value === 'suspend') ? 'none' : 'block';
-  }
-};
-
-Rails.delegate(document, '#domain_block_severity', 'change', ({ target }) => onDomainBlockSeverityChange(target));
-
-const onEnableBootstrapTimelineAccountsChange = (target) => {
-  const bootstrapTimelineAccountsField = document.querySelector('#form_admin_settings_bootstrap_timeline_accounts');
-
-  if (bootstrapTimelineAccountsField) {
-    bootstrapTimelineAccountsField.disabled = !target.checked;
-    if (target.checked) {
-      bootstrapTimelineAccountsField.parentElement.classList.remove('disabled');
-      bootstrapTimelineAccountsField.parentElement.parentElement.classList.remove('disabled');
-    } else {
-      bootstrapTimelineAccountsField.parentElement.classList.add('disabled');
-      bootstrapTimelineAccountsField.parentElement.parentElement.classList.add('disabled');
-    }
-  }
-};
-
-Rails.delegate(document, '#form_admin_settings_enable_bootstrap_timeline_accounts', 'change', ({ target }) => onEnableBootstrapTimelineAccountsChange(target));
-
-const onChangeRegistrationMode = (target) => {
-  const enabled = target.value === 'approved';
-
-  document.querySelectorAll('.form_admin_settings_registrations_mode .warning-hint').forEach((warning_hint) => {
-    warning_hint.style.display = target.value === 'open' ? 'inline' : 'none';
-  });
-
-  document.querySelectorAll('#form_admin_settings_require_invite_text').forEach((input) => {
-    input.disabled = !enabled;
-    if (enabled) {
-      let element = input;
-      do {
-        element.classList.remove('disabled');
-        element = element.parentElement;
-      } while (element && !element.classList.contains('fields-group'));
-    } else {
-      let element = input;
-      do {
-        element.classList.add('disabled');
-        element = element.parentElement;
-      } while (element && !element.classList.contains('fields-group'));
-    }
-  });
-};
-
-const convertUTCDateTimeToLocal = (value) => {
-  const date = new Date(value + 'Z');
-  const twoChars = (x) => (x.toString().padStart(2, '0'));
-  return `${date.getFullYear()}-${twoChars(date.getMonth()+1)}-${twoChars(date.getDate())}T${twoChars(date.getHours())}:${twoChars(date.getMinutes())}`;
-};
-
-const convertLocalDatetimeToUTC = (value) => {
-  const re = /^([0-9]{4,})-([0-9]{2})-([0-9]{2})T([0-9]{2}):([0-9]{2})/;
-  const match = re.exec(value);
-  const date = new Date(match[1], match[2] - 1, match[3], match[4], match[5]);
-  const fullISO8601 = date.toISOString();
-  return fullISO8601.slice(0, fullISO8601.indexOf('T') + 6);
-};
-
-Rails.delegate(document, '#form_admin_settings_registrations_mode', 'change', ({ target }) => onChangeRegistrationMode(target));
-
-ready(() => {
-  const domainBlockSeverityInput = document.getElementById('domain_block_severity');
-  if (domainBlockSeverityInput) onDomainBlockSeverityChange(domainBlockSeverityInput);
-
-  const enableBootstrapTimelineAccounts = document.getElementById('form_admin_settings_enable_bootstrap_timeline_accounts');
-  if (enableBootstrapTimelineAccounts) onEnableBootstrapTimelineAccountsChange(enableBootstrapTimelineAccounts);
-
-  const registrationMode = document.getElementById('form_admin_settings_registrations_mode');
-  if (registrationMode) onChangeRegistrationMode(registrationMode);
-
-  const checkAllElement = document.querySelector('#batch_checkbox_all');
-  if (checkAllElement) {
-    const allCheckboxes = Array.from(document.querySelectorAll(batchCheckboxClassName));
-    checkAllElement.checked = allCheckboxes.every( (content) => content.checked);
-    checkAllElement.indeterminate = !checkAllElement.checked && allCheckboxes.some((content) => content.checked);
-  }
-
-  document.querySelector('a#add-instance-button')?.addEventListener('click', (e) => {
-    const domain = document.querySelector('input[type="text"]#by_domain')?.value;
-
-    if (domain) {
-      const url = new URL(event.target.href);
-      url.searchParams.set('_domain', domain);
-      e.target.href = url;
-    }
-  });
-
-  document.querySelectorAll('input[type="datetime-local"]').forEach(element => {
-    if (element.value) {
-      element.value = convertUTCDateTimeToLocal(element.value);
-    }
-    if (element.placeholder) {
-      element.placeholder = convertUTCDateTimeToLocal(element.placeholder);
-    }
-  });
-
-  Rails.delegate(document, 'form', 'submit', ({ target }) => {
-    target.querySelectorAll('input[type="datetime-local"]').forEach(element => {
-      if (element.value && element.validity.valid) {
-        element.value = convertLocalDatetimeToUTC(element.value);
-      }
-    });
-  });
-
-  const announcementStartsAt = document.querySelector('input[type="datetime-local"]#announcement_starts_at');
-  if (announcementStartsAt) {
-    setAnnouncementEndsAttributes(announcementStartsAt);
-  }
-
-  document.querySelectorAll('[data-admin-component]').forEach(element => {
-    const componentName  = element.getAttribute('data-admin-component');
-    const componentProps = JSON.parse(element.getAttribute('data-props'));
-
-    import('../mastodon/containers/admin_component').then(({ default: AdminComponent }) => {
-      return import('../mastodon/components/admin/' + componentName).then(({ default: Component }) => {
-        const root = createRoot(element);
-
-        root.render (
-          <AdminComponent>
-            <Component {...componentProps} />
-          </AdminComponent>,
-        );
-      });
-    }).catch(error => {
-      console.error(error);
-    });
-  });
-});
diff --git a/app/javascript/packs/admin.tsx b/app/javascript/packs/admin.tsx
new file mode 100644
index 00000000000000..25e0889cd99b43
--- /dev/null
+++ b/app/javascript/packs/admin.tsx
@@ -0,0 +1,368 @@
+import './public-path';
+import { createRoot } from 'react-dom/client';
+
+import Rails from '@rails/ujs';
+
+import ready from '../mastodon/ready';
+
+const setAnnouncementEndsAttributes = (target: HTMLInputElement) => {
+  const valid = target.value && target.validity.valid;
+  const element = document.querySelector<HTMLInputElement>(
+    'input[type="datetime-local"]#announcement_ends_at',
+  );
+
+  if (!element) return;
+
+  if (valid) {
+    element.classList.remove('optional');
+    element.required = true;
+    element.min = target.value;
+  } else {
+    element.classList.add('optional');
+    element.removeAttribute('required');
+    element.removeAttribute('min');
+  }
+};
+
+Rails.delegate(
+  document,
+  'input[type="datetime-local"]#announcement_starts_at',
+  'change',
+  ({ target }) => {
+    if (target instanceof HTMLInputElement)
+      setAnnouncementEndsAttributes(target);
+  },
+);
+
+const batchCheckboxClassName = '.batch-checkbox input[type="checkbox"]';
+
+const showSelectAll = () => {
+  const selectAllMatchingElement = document.querySelector(
+    '.batch-table__select-all',
+  );
+  selectAllMatchingElement?.classList.add('active');
+};
+
+const hideSelectAll = () => {
+  const selectAllMatchingElement = document.querySelector(
+    '.batch-table__select-all',
+  );
+  const hiddenField = document.querySelector<HTMLInputElement>(
+    'input#select_all_matching',
+  );
+  const selectedMsg = document.querySelector(
+    '.batch-table__select-all .selected',
+  );
+  const notSelectedMsg = document.querySelector(
+    '.batch-table__select-all .not-selected',
+  );
+
+  selectAllMatchingElement?.classList.remove('active');
+  selectedMsg?.classList.remove('active');
+  notSelectedMsg?.classList.add('active');
+  if (hiddenField) hiddenField.value = '0';
+};
+
+Rails.delegate(document, '#batch_checkbox_all', 'change', ({ target }) => {
+  if (!(target instanceof HTMLInputElement)) return;
+
+  const selectAllMatchingElement = document.querySelector(
+    '.batch-table__select-all',
+  );
+
+  document
+    .querySelectorAll<HTMLInputElement>(batchCheckboxClassName)
+    .forEach((content) => {
+      content.checked = target.checked;
+    });
+
+  if (selectAllMatchingElement) {
+    if (target.checked) {
+      showSelectAll();
+    } else {
+      hideSelectAll();
+    }
+  }
+});
+
+Rails.delegate(document, '.batch-table__select-all button', 'click', () => {
+  const hiddenField = document.querySelector<HTMLInputElement>(
+    '#select_all_matching',
+  );
+
+  if (!hiddenField) return;
+
+  const active = hiddenField.value === '1';
+  const selectedMsg = document.querySelector(
+    '.batch-table__select-all .selected',
+  );
+  const notSelectedMsg = document.querySelector(
+    '.batch-table__select-all .not-selected',
+  );
+
+  if (!selectedMsg || !notSelectedMsg) return;
+
+  if (active) {
+    hiddenField.value = '0';
+    selectedMsg.classList.remove('active');
+    notSelectedMsg.classList.add('active');
+  } else {
+    hiddenField.value = '1';
+    notSelectedMsg.classList.remove('active');
+    selectedMsg.classList.add('active');
+  }
+});
+
+Rails.delegate(document, batchCheckboxClassName, 'change', () => {
+  const checkAllElement = document.querySelector<HTMLInputElement>(
+    'input#batch_checkbox_all',
+  );
+  const selectAllMatchingElement = document.querySelector(
+    '.batch-table__select-all',
+  );
+
+  if (checkAllElement) {
+    const allCheckboxes = Array.from(
+      document.querySelectorAll<HTMLInputElement>(batchCheckboxClassName),
+    );
+    checkAllElement.checked = allCheckboxes.every((content) => content.checked);
+    checkAllElement.indeterminate =
+      !checkAllElement.checked &&
+      allCheckboxes.some((content) => content.checked);
+
+    if (selectAllMatchingElement) {
+      if (checkAllElement.checked) {
+        showSelectAll();
+      } else {
+        hideSelectAll();
+      }
+    }
+  }
+});
+
+Rails.delegate(
+  document,
+  '.filter-subset--with-select select',
+  'change',
+  ({ target }) => {
+    if (target instanceof HTMLSelectElement) target.form?.submit();
+  },
+);
+
+const onDomainBlockSeverityChange = (target: HTMLInputElement) => {
+  const rejectMediaDiv = document.querySelector(
+    '.input.with_label.domain_block_reject_media',
+  );
+  const rejectReportsDiv = document.querySelector(
+    '.input.with_label.domain_block_reject_reports',
+  );
+
+  if (rejectMediaDiv && rejectMediaDiv instanceof HTMLElement) {
+    rejectMediaDiv.style.display =
+      target.value === 'suspend' ? 'none' : 'block';
+  }
+
+  if (rejectReportsDiv && rejectReportsDiv instanceof HTMLElement) {
+    rejectReportsDiv.style.display =
+      target.value === 'suspend' ? 'none' : 'block';
+  }
+};
+
+Rails.delegate(document, '#domain_block_severity', 'change', ({ target }) => {
+  if (target instanceof HTMLInputElement) onDomainBlockSeverityChange(target);
+});
+
+const onEnableBootstrapTimelineAccountsChange = (target: HTMLInputElement) => {
+  const bootstrapTimelineAccountsField =
+    document.querySelector<HTMLInputElement>(
+      '#form_admin_settings_bootstrap_timeline_accounts',
+    );
+
+  if (bootstrapTimelineAccountsField) {
+    bootstrapTimelineAccountsField.disabled = !target.checked;
+    if (target.checked) {
+      bootstrapTimelineAccountsField.parentElement?.classList.remove(
+        'disabled',
+      );
+      bootstrapTimelineAccountsField.parentElement?.parentElement?.classList.remove(
+        'disabled',
+      );
+    } else {
+      bootstrapTimelineAccountsField.parentElement?.classList.add('disabled');
+      bootstrapTimelineAccountsField.parentElement?.parentElement?.classList.add(
+        'disabled',
+      );
+    }
+  }
+};
+
+Rails.delegate(
+  document,
+  '#form_admin_settings_enable_bootstrap_timeline_accounts',
+  'change',
+  ({ target }) => {
+    if (target instanceof HTMLInputElement)
+      onEnableBootstrapTimelineAccountsChange(target);
+  },
+);
+
+const onChangeRegistrationMode = (target: HTMLInputElement) => {
+  const enabled = target.value === 'approved';
+
+  document
+    .querySelectorAll<HTMLElement>(
+      '.form_admin_settings_registrations_mode .warning-hint',
+    )
+    .forEach((warning_hint) => {
+      warning_hint.style.display = target.value === 'open' ? 'inline' : 'none';
+    });
+
+  document
+    .querySelectorAll<HTMLInputElement>(
+      'input#form_admin_settings_require_invite_text',
+    )
+    .forEach((input) => {
+      input.disabled = !enabled;
+      if (enabled) {
+        let element: HTMLElement | null = input;
+        do {
+          element.classList.remove('disabled');
+          element = element.parentElement;
+        } while (element && !element.classList.contains('fields-group'));
+      } else {
+        let element: HTMLElement | null = input;
+        do {
+          element.classList.add('disabled');
+          element = element.parentElement;
+        } while (element && !element.classList.contains('fields-group'));
+      }
+    });
+};
+
+const convertUTCDateTimeToLocal = (value: string) => {
+  const date = new Date(value + 'Z');
+  const twoChars = (x: number) => x.toString().padStart(2, '0');
+  return `${date.getFullYear()}-${twoChars(date.getMonth() + 1)}-${twoChars(date.getDate())}T${twoChars(date.getHours())}:${twoChars(date.getMinutes())}`;
+};
+
+function convertLocalDatetimeToUTC(value: string) {
+  const date = new Date(value);
+  const fullISO8601 = date.toISOString();
+  return fullISO8601.slice(0, fullISO8601.indexOf('T') + 6);
+}
+
+Rails.delegate(
+  document,
+  '#form_admin_settings_registrations_mode',
+  'change',
+  ({ target }) => {
+    if (target instanceof HTMLInputElement) onChangeRegistrationMode(target);
+  },
+);
+
+async function mountReactComponent(element: Element) {
+  const componentName = element.getAttribute('data-admin-component');
+  const stringProps = element.getAttribute('data-props');
+
+  if (!stringProps) return;
+
+  const componentProps = JSON.parse(stringProps) as object;
+
+  const { default: AdminComponent } = await import(
+    '@/mastodon/containers/admin_component'
+  );
+
+  const { default: Component } = (await import(
+    `@/mastodon/components/admin/${componentName}`
+  )) as { default: React.ComponentType };
+
+  const root = createRoot(element);
+
+  root.render(
+    <AdminComponent>
+      <Component {...componentProps} />
+    </AdminComponent>,
+  );
+}
+
+ready(() => {
+  const domainBlockSeverityInput = document.querySelector<HTMLInputElement>(
+    'input#domain_block_severity',
+  );
+  if (domainBlockSeverityInput)
+    onDomainBlockSeverityChange(domainBlockSeverityInput);
+
+  const enableBootstrapTimelineAccounts =
+    document.querySelector<HTMLInputElement>(
+      'input#form_admin_settings_enable_bootstrap_timeline_accounts',
+    );
+  if (enableBootstrapTimelineAccounts)
+    onEnableBootstrapTimelineAccountsChange(enableBootstrapTimelineAccounts);
+
+  const registrationMode = document.querySelector<HTMLInputElement>(
+    'input#form_admin_settings_registrations_mode',
+  );
+  if (registrationMode) onChangeRegistrationMode(registrationMode);
+
+  const checkAllElement = document.querySelector<HTMLInputElement>(
+    'input#batch_checkbox_all',
+  );
+  if (checkAllElement) {
+    const allCheckboxes = Array.from(
+      document.querySelectorAll<HTMLInputElement>(batchCheckboxClassName),
+    );
+    checkAllElement.checked = allCheckboxes.every((content) => content.checked);
+    checkAllElement.indeterminate =
+      !checkAllElement.checked &&
+      allCheckboxes.some((content) => content.checked);
+  }
+
+  document
+    .querySelector('a#add-instance-button')
+    ?.addEventListener('click', (e) => {
+      const domain = document.querySelector<HTMLInputElement>(
+        'input[type="text"]#by_domain',
+      )?.value;
+
+      if (domain && e.target instanceof HTMLAnchorElement) {
+        const url = new URL(e.target.href);
+        url.searchParams.set('_domain', domain);
+        e.target.href = url.toString();
+      }
+    });
+
+  document
+    .querySelectorAll<HTMLInputElement>('input[type="datetime-local"]')
+    .forEach((element) => {
+      if (element.value) {
+        element.value = convertUTCDateTimeToLocal(element.value);
+      }
+      if (element.placeholder) {
+        element.placeholder = convertUTCDateTimeToLocal(element.placeholder);
+      }
+    });
+
+  Rails.delegate(document, 'form', 'submit', ({ target }) => {
+    if (target instanceof HTMLFormElement)
+      target
+        .querySelectorAll<HTMLInputElement>('input[type="datetime-local"]')
+        .forEach((element) => {
+          if (element.value && element.validity.valid) {
+            element.value = convertLocalDatetimeToUTC(element.value);
+          }
+        });
+  });
+
+  const announcementStartsAt = document.querySelector<HTMLInputElement>(
+    'input[type="datetime-local"]#announcement_starts_at',
+  );
+  if (announcementStartsAt) {
+    setAnnouncementEndsAttributes(announcementStartsAt);
+  }
+
+  document.querySelectorAll('[data-admin-component]').forEach((element) => {
+    void mountReactComponent(element);
+  });
+}).catch((reason) => {
+  throw reason;
+});

From 5b97fdf84c7d93d8093463afb9ebff14aff2763f Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Thu, 29 Feb 2024 10:40:13 +0100
Subject: [PATCH 0333/2191] [Glitch] Fix full date display not respecting the
 locale 12/24h format

Port 4185f3792c84fb81ba74be047a7014be3ab318ec to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/components/edited_timestamp/index.jsx       | 2 +-
 .../flavours/glitch/components/relative_timestamp.tsx           | 1 -
 app/javascript/flavours/glitch/components/status_action_bar.jsx | 2 +-
 .../flavours/glitch/features/account/components/header.jsx      | 1 -
 .../features/getting_started/components/announcements.jsx       | 2 +-
 .../glitch/features/status/components/detailed_status.jsx       | 2 +-
 app/javascript/flavours/glitch/packs/public.jsx                 | 1 -
 7 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/app/javascript/flavours/glitch/components/edited_timestamp/index.jsx b/app/javascript/flavours/glitch/components/edited_timestamp/index.jsx
index 29a418dfb1c91c..2363f132f1f79b 100644
--- a/app/javascript/flavours/glitch/components/edited_timestamp/index.jsx
+++ b/app/javascript/flavours/glitch/components/edited_timestamp/index.jsx
@@ -68,7 +68,7 @@ class EditedTimestamp extends PureComponent {
     return (
       <DropdownMenu statusId={statusId} renderItem={this.renderItem} scrollable renderHeader={this.renderHeader} onItemClick={this.handleItemClick}>
         <button className='dropdown-menu__text-button'>
-          <FormattedMessage id='status.edited' defaultMessage='Edited {date}' values={{ date: intl.formatDate(timestamp, { hour12: false, month: 'short', day: '2-digit', hour: '2-digit', minute: '2-digit' }) }} /> <Icon id='caret-down' icon={ArrowDropDownIcon} />
+          <FormattedMessage id='status.edited' defaultMessage='Edited {date}' values={{ date: intl.formatDate(timestamp, { month: 'short', day: '2-digit', hour: '2-digit', minute: '2-digit' }) }} /> <Icon id='caret-down' icon={ArrowDropDownIcon} />
         </button>
       </DropdownMenu>
     );
diff --git a/app/javascript/flavours/glitch/components/relative_timestamp.tsx b/app/javascript/flavours/glitch/components/relative_timestamp.tsx
index ac3ab0fb4d48f6..12530c2b17bceb 100644
--- a/app/javascript/flavours/glitch/components/relative_timestamp.tsx
+++ b/app/javascript/flavours/glitch/components/relative_timestamp.tsx
@@ -53,7 +53,6 @@ const messages = defineMessages({
 });
 
 const dateFormatOptions = {
-  hour12: false,
   year: 'numeric',
   month: 'short',
   day: '2-digit',
diff --git a/app/javascript/flavours/glitch/components/status_action_bar.jsx b/app/javascript/flavours/glitch/components/status_action_bar.jsx
index c10122d234d824..f27719a6b9f43c 100644
--- a/app/javascript/flavours/glitch/components/status_action_bar.jsx
+++ b/app/javascript/flavours/glitch/components/status_action_bar.jsx
@@ -351,7 +351,7 @@ class StatusActionBar extends ImmutablePureComponent {
 
         <div className='status__action-bar-spacer' />
         <a href={status.get('url')} className='status__relative-time' target='_blank' rel='noopener'>
-          <RelativeTimestamp timestamp={status.get('created_at')} />{status.get('edited_at') && <abbr title={intl.formatMessage(messages.edited, { date: intl.formatDate(status.get('edited_at'), { hour12: false, year: 'numeric', month: 'short', day: '2-digit', hour: '2-digit', minute: '2-digit' }) })}> *</abbr>}
+          <RelativeTimestamp timestamp={status.get('created_at')} />{status.get('edited_at') && <abbr title={intl.formatMessage(messages.edited, { date: intl.formatDate(status.get('edited_at'), { year: 'numeric', month: 'short', day: '2-digit', hour: '2-digit', minute: '2-digit' }) })}> *</abbr>}
         </a>
       </div>
     );
diff --git a/app/javascript/flavours/glitch/features/account/components/header.jsx b/app/javascript/flavours/glitch/features/account/components/header.jsx
index 29e3aa32f74af7..b2aee7682a0317 100644
--- a/app/javascript/flavours/glitch/features/account/components/header.jsx
+++ b/app/javascript/flavours/glitch/features/account/components/header.jsx
@@ -84,7 +84,6 @@ const dateFormatOptions = {
   month: 'short',
   day: 'numeric',
   year: 'numeric',
-  hour12: false,
   hour: '2-digit',
   minute: '2-digit',
 };
diff --git a/app/javascript/flavours/glitch/features/getting_started/components/announcements.jsx b/app/javascript/flavours/glitch/features/getting_started/components/announcements.jsx
index 27470d99388569..0ff0a863b3b261 100644
--- a/app/javascript/flavours/glitch/features/getting_started/components/announcements.jsx
+++ b/app/javascript/flavours/glitch/features/getting_started/components/announcements.jsx
@@ -343,7 +343,7 @@ class Announcement extends ImmutablePureComponent {
       <div className='announcements__item'>
         <strong className='announcements__item__range'>
           <FormattedMessage id='announcement.announcement' defaultMessage='Announcement' />
-          {hasTimeRange && <span> · <FormattedDate value={startsAt} hour12={false} year={(skipYear || startsAt.getFullYear() === now.getFullYear()) ? undefined : 'numeric'} month='short' day='2-digit' hour={skipTime ? undefined : '2-digit'} minute={skipTime ? undefined : '2-digit'} /> - <FormattedDate value={endsAt} hour12={false} year={(skipYear || endsAt.getFullYear() === now.getFullYear()) ? undefined : 'numeric'} month={skipEndDate ? undefined : 'short'} day={skipEndDate ? undefined : '2-digit'} hour={skipTime ? undefined : '2-digit'} minute={skipTime ? undefined : '2-digit'} /></span>}
+          {hasTimeRange && <span> · <FormattedDate value={startsAt} year={(skipYear || startsAt.getFullYear() === now.getFullYear()) ? undefined : 'numeric'} month='short' day='2-digit' hour={skipTime ? undefined : '2-digit'} minute={skipTime ? undefined : '2-digit'} /> - <FormattedDate value={endsAt} year={(skipYear || endsAt.getFullYear() === now.getFullYear()) ? undefined : 'numeric'} month={skipEndDate ? undefined : 'short'} day={skipEndDate ? undefined : '2-digit'} hour={skipTime ? undefined : '2-digit'} minute={skipTime ? undefined : '2-digit'} /></span>}
         </strong>
 
         <Content announcement={announcement} />
diff --git a/app/javascript/flavours/glitch/features/status/components/detailed_status.jsx b/app/javascript/flavours/glitch/features/status/components/detailed_status.jsx
index 0638d0d646c9c5..2a3ab7001b9832 100644
--- a/app/javascript/flavours/glitch/features/status/components/detailed_status.jsx
+++ b/app/javascript/flavours/glitch/features/status/components/detailed_status.jsx
@@ -331,7 +331,7 @@ class DetailedStatus extends ImmutablePureComponent {
 
           <div className='detailed-status__meta'>
             <a className='detailed-status__datetime' href={status.get('url')} target='_blank' rel='noopener noreferrer'>
-              <FormattedDate value={new Date(status.get('created_at'))} hour12={false} year='numeric' month='short' day='2-digit' hour='2-digit' minute='2-digit' />
+              <FormattedDate value={new Date(status.get('created_at'))} year='numeric' month='short' day='2-digit' hour='2-digit' minute='2-digit' />
             </a>{edited}{visibilityLink}{applicationLink}{reblogLink} · {favouriteLink}
           </div>
         </div>
diff --git a/app/javascript/flavours/glitch/packs/public.jsx b/app/javascript/flavours/glitch/packs/public.jsx
index 5a72f91786e493..dab33b3904ea4d 100644
--- a/app/javascript/flavours/glitch/packs/public.jsx
+++ b/app/javascript/flavours/glitch/packs/public.jsx
@@ -60,7 +60,6 @@ function main() {
 
   const timeFormat = new Intl.DateTimeFormat(locale, {
     timeStyle: 'short',
-    hour12: false,
   });
 
   const formatMessage = ({ id, defaultMessage }, values) => {

From bbfcd71118575d31f4d87b43fcd10900b9283f37 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 29 Feb 2024 14:54:02 +0100
Subject: [PATCH 0334/2191] [Glitch] Fix preview card player getting embedded
 when clicking on the external link button

Port f24c62a5c809e9d3ec944804a9c28804d9896bbd to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/features/status/components/card.jsx     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/javascript/flavours/glitch/features/status/components/card.jsx b/app/javascript/flavours/glitch/features/status/components/card.jsx
index c4461f43781c11..4c535b0a46297c 100644
--- a/app/javascript/flavours/glitch/features/status/components/card.jsx
+++ b/app/javascript/flavours/glitch/features/status/components/card.jsx
@@ -82,6 +82,10 @@ export default class Card extends PureComponent {
     this.setState({ embedded: true });
   };
 
+  handleExternalLinkClick = (e) => {
+    e.stopPropagation();
+  };
+
   setRef = c => {
     this.node = c;
   };
@@ -191,7 +195,7 @@ export default class Card extends PureComponent {
               <div className='status-card__actions' onClick={this.handleEmbedClick} role='none'>
                 <div>
                   <button type='button' onClick={this.handleEmbedClick}><Icon id='play' icon={PlayArrowIcon} /></button>
-                  <a href={card.get('url')} target='_blank' rel='noopener noreferrer'><Icon id='external-link' icon={OpenInNewIcon} /></a>
+                  <a href={card.get('url')} onClick={this.handleExternalLinkClick} target='_blank' rel='noopener noreferrer'><Icon id='external-link' icon={OpenInNewIcon} /></a>
                 </div>
               </div>
             ) : spoilerButton}

From a04b384482d64e02c9b5cda9bd9d36123ba55429 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 29 Feb 2024 14:54:06 +0100
Subject: [PATCH 0335/2191] [Glitch] Fix regression with search bar icon
 position

Port edd6aa70e1117818669cf0b85b7a3cde06a3c8c1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/styles/components.scss | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index e7a0156a41412e..a42bfdc7121f58 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -5735,10 +5735,6 @@ a.status-card {
       pointer-events: auto;
       opacity: 1;
     }
-
-    @media screen and (min-width: $no-gap-breakpoint) {
-      inset-inline-start: 16px - 2px;
-    }
   }
 
   .icon-search {
@@ -8883,7 +8879,7 @@ noscript {
   .search__input {
     border: 1px solid lighten($ui-base-color, 8%);
     padding: 10px;
-    padding-inline-end: 28px;
+    padding-inline-end: 30px;
   }
 
   .search__popout {

From 75b87c100a6c518b9121dcca13c1cd699d0f0f27 Mon Sep 17 00:00:00 2001
From: Jeremy Kescher <jeremy@kescher.at>
Date: Thu, 29 Feb 2024 19:38:54 +0100
Subject: [PATCH 0336/2191] Update changelog and bump version

---
 CHANGELOG.md            | 5 +++++
 lib/mastodon/version.rb | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 26bbdea50ee916..29e872722b43de 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 All changes to Catstodon that aren't Mastodon or glitch-soc Mastodon changes will be documented here.
 
+## [v4.3.0-alpha.3+glitch+cat+1.0.8] - 2024-02-29
+
+- Update translations from glitch-soc
+- glitch-soc now uses openURL function from upstream
+
 ## [v4.3.0-alpha.3+glitch+cat+1.0.7] - 2024-02-28
 
 - Merged glitch-soc changes (incl. comments on admin/instances page)
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index 63dc1fc1da5c10..e67230e9e3edf8 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -25,7 +25,7 @@ def prerelease
     end
 
     def catstodon_revision
-      '1.0.7'
+      '1.0.8'
     end
 
     def build_metadata

From b9940eb9778d9bf26b3bfea002424f1731c34383 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 29 Feb 2024 18:25:04 -0500
Subject: [PATCH 0337/2191] Disable codecov comments on PRs (#29464)

---
 .github/codecov.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/codecov.yml b/.github/codecov.yml
index 5532c49618a823..9d6413a10617e2 100644
--- a/.github/codecov.yml
+++ b/.github/codecov.yml
@@ -1,3 +1,4 @@
+comment: false # Do not leave PR comments
 coverage:
   status:
     project:
@@ -8,6 +9,3 @@ coverage:
       default:
         # Github status check is not blocking
         informational: true
-comment:
-  # Only write a comment in PR if there are changes
-  require_changes: true

From ec953bf378ac6ae9b7dab5db053dca947f3c869b Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 1 Mar 2024 11:16:35 +0100
Subject: [PATCH 0338/2191] Fix regression in handling `select` elements in
 `packs/admin.tsx` (#29469)

---
 app/javascript/packs/admin.tsx | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/javascript/packs/admin.tsx b/app/javascript/packs/admin.tsx
index 25e0889cd99b43..9fee5605659663 100644
--- a/app/javascript/packs/admin.tsx
+++ b/app/javascript/packs/admin.tsx
@@ -149,7 +149,7 @@ Rails.delegate(
   },
 );
 
-const onDomainBlockSeverityChange = (target: HTMLInputElement) => {
+const onDomainBlockSeverityChange = (target: HTMLSelectElement) => {
   const rejectMediaDiv = document.querySelector(
     '.input.with_label.domain_block_reject_media',
   );
@@ -169,7 +169,7 @@ const onDomainBlockSeverityChange = (target: HTMLInputElement) => {
 };
 
 Rails.delegate(document, '#domain_block_severity', 'change', ({ target }) => {
-  if (target instanceof HTMLInputElement) onDomainBlockSeverityChange(target);
+  if (target instanceof HTMLSelectElement) onDomainBlockSeverityChange(target);
 });
 
 const onEnableBootstrapTimelineAccountsChange = (target: HTMLInputElement) => {
@@ -206,7 +206,7 @@ Rails.delegate(
   },
 );
 
-const onChangeRegistrationMode = (target: HTMLInputElement) => {
+const onChangeRegistrationMode = (target: HTMLSelectElement) => {
   const enabled = target.value === 'approved';
 
   document
@@ -256,7 +256,7 @@ Rails.delegate(
   '#form_admin_settings_registrations_mode',
   'change',
   ({ target }) => {
-    if (target instanceof HTMLInputElement) onChangeRegistrationMode(target);
+    if (target instanceof HTMLSelectElement) onChangeRegistrationMode(target);
   },
 );
 
@@ -286,11 +286,11 @@ async function mountReactComponent(element: Element) {
 }
 
 ready(() => {
-  const domainBlockSeverityInput = document.querySelector<HTMLInputElement>(
-    'input#domain_block_severity',
+  const domainBlockSeveritySelect = document.querySelector<HTMLSelectElement>(
+    'select#domain_block_severity',
   );
-  if (domainBlockSeverityInput)
-    onDomainBlockSeverityChange(domainBlockSeverityInput);
+  if (domainBlockSeveritySelect)
+    onDomainBlockSeverityChange(domainBlockSeveritySelect);
 
   const enableBootstrapTimelineAccounts =
     document.querySelector<HTMLInputElement>(
@@ -299,8 +299,8 @@ ready(() => {
   if (enableBootstrapTimelineAccounts)
     onEnableBootstrapTimelineAccountsChange(enableBootstrapTimelineAccounts);
 
-  const registrationMode = document.querySelector<HTMLInputElement>(
-    'input#form_admin_settings_registrations_mode',
+  const registrationMode = document.querySelector<HTMLSelectElement>(
+    'select#form_admin_settings_registrations_mode',
   );
   if (registrationMode) onChangeRegistrationMode(registrationMode);
 

From 3389c41b5899c1da479bfc08e84588184e09902d Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 1 Mar 2024 06:05:24 -0500
Subject: [PATCH 0339/2191] Move `nobody` position in `UserRole` magic number
 to constant (#29465)

---
 app/models/user_role.rb       | 5 +++--
 spec/models/user_role_spec.rb | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/models/user_role.rb b/app/models/user_role.rb
index 9115d91c2442b1..23cc28b9b7ca27 100644
--- a/app/models/user_role.rb
+++ b/app/models/user_role.rb
@@ -39,6 +39,7 @@ class UserRole < ApplicationRecord
   }.freeze
 
   EVERYONE_ROLE_ID = -99
+  NOBODY_POSITION = -1
 
   module Flags
     NONE = 0
@@ -104,7 +105,7 @@ module Flags
   has_many :users, inverse_of: :role, foreign_key: 'role_id', dependent: :nullify
 
   def self.nobody
-    @nobody ||= UserRole.new(permissions: Flags::NONE, position: -1)
+    @nobody ||= UserRole.new(permissions: Flags::NONE, position: NOBODY_POSITION)
   end
 
   def self.everyone
@@ -173,7 +174,7 @@ def in_permissions?(privilege)
   end
 
   def set_position
-    self.position = -1 if everyone?
+    self.position = NOBODY_POSITION if everyone?
   end
 
   def validate_own_role_edition
diff --git a/spec/models/user_role_spec.rb b/spec/models/user_role_spec.rb
index 9dd04a8172e424..96d12263ae8e28 100644
--- a/spec/models/user_role_spec.rb
+++ b/spec/models/user_role_spec.rb
@@ -139,7 +139,7 @@
     end
 
     it 'has negative position' do
-      expect(subject.position).to eq(-1)
+      expect(subject.position).to eq(described_class::NOBODY_POSITION)
     end
   end
 
@@ -159,7 +159,7 @@
     end
 
     it 'has negative position' do
-      expect(subject.position).to eq(-1)
+      expect(subject.position).to eq(described_class::NOBODY_POSITION)
     end
   end
 

From 934cab75083a4ab79003a583881775b6d4a2b58a Mon Sep 17 00:00:00 2001
From: HTeuMeuLeu <remi@hteumeuleu.fr>
Date: Fri, 1 Mar 2024 13:16:53 +0100
Subject: [PATCH 0340/2191] New welcome email (#28883)

Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
---
 .../{step5-off.png => apps_step-off.png}      | Bin
 .../mailer-new/welcome/apps_step-on.png       | Bin 0 -> 1291 bytes
 .../mailer-new/welcome/btn-app-store.png      | Bin 0 -> 2054 bytes
 .../mailer-new/welcome/btn-google-play.png    | Bin 0 -> 4512 bytes
 .../welcome/edit_profile_step-off.png         | Bin 0 -> 2247 bytes
 ...{step1-on.png => edit_profile_step-on.png} | Bin
 .../mailer-new/welcome/feature_audience.png   | Bin 0 -> 96392 bytes
 .../mailer-new/welcome/feature_control.png    | Bin 0 -> 90297 bytes
 .../mailer-new/welcome/feature_creativity.png | Bin 0 -> 130496 bytes
 .../mailer-new/welcome/feature_moderation.png | Bin 0 -> 100525 bytes
 .../{step2-off.png => follow_step-off.png}    | Bin
 .../mailer-new/welcome/follow_step-on.png     | Bin 0 -> 1227 bytes
 .../{step3-off.png => post_step-off.png}      | Bin
 .../mailer-new/welcome/post_step-on.png       | Bin 0 -> 1552 bytes
 .../welcome/purple-extra-soft-spacer.png      | Bin 0 -> 939 bytes
 .../welcome/purple-extra-soft-wave.png        | Bin 0 -> 2531 bytes
 .../{step4-off.png => share_step-off.png}     | Bin
 .../mailer-new/welcome/share_step-on.png      | Bin 0 -> 1639 bytes
 app/javascript/styles/mailer.scss             | 349 +++++++++++++++++-
 app/mailers/user_mailer.rb                    |   6 +
 app/models/user.rb                            |   2 +-
 .../application/mailer/_button.html.haml      |   5 +-
 .../application/mailer/_checklist.html.haml   |  20 +-
 .../application/mailer/_feature.html.haml     |  32 ++
 .../application/mailer/_follow.html.haml      |  15 +
 .../application/mailer/_hashtag.html.haml     |  20 +
 app/views/user_mailer/welcome.html.haml       |  95 +++--
 app/views/user_mailer/welcome.text.erb        |  74 +++-
 config/locales/an.yml                         |   4 -
 config/locales/ar.yml                         |   4 -
 config/locales/ast.yml                        |   1 -
 config/locales/be.yml                         |   4 -
 config/locales/bg.yml                         |   4 -
 config/locales/ca.yml                         |   4 -
 config/locales/ckb.yml                        |   3 -
 config/locales/co.yml                         |   3 -
 config/locales/cs.yml                         |   4 -
 config/locales/cy.yml                         |   4 -
 config/locales/da.yml                         |   4 -
 config/locales/de.yml                         |   4 -
 config/locales/el.yml                         |   4 -
 config/locales/en-GB.yml                      |   4 -
 config/locales/en.yml                         |  41 +-
 config/locales/eo.yml                         |   4 -
 config/locales/es-AR.yml                      |   4 -
 config/locales/es-MX.yml                      |   4 -
 config/locales/es.yml                         |   4 -
 config/locales/et.yml                         |   4 -
 config/locales/eu.yml                         |   4 -
 config/locales/fa.yml                         |   4 -
 config/locales/fi.yml                         |   4 -
 config/locales/fo.yml                         |   4 -
 config/locales/fr-CA.yml                      |   4 -
 config/locales/fr.yml                         |   4 -
 config/locales/fy.yml                         |   4 -
 config/locales/gd.yml                         |   4 -
 config/locales/gl.yml                         |   4 -
 config/locales/he.yml                         |   4 -
 config/locales/hu.yml                         |   4 -
 config/locales/hy.yml                         |   1 -
 config/locales/ia.yml                         |   1 -
 config/locales/id.yml                         |   4 -
 config/locales/ie.yml                         |   4 -
 config/locales/io.yml                         |   4 -
 config/locales/is.yml                         |   4 -
 config/locales/it.yml                         |   4 -
 config/locales/ja.yml                         |   4 -
 config/locales/ka.yml                         |   3 -
 config/locales/kab.yml                        |   2 -
 config/locales/kk.yml                         |   3 -
 config/locales/ko.yml                         |   4 -
 config/locales/ku.yml                         |   4 -
 config/locales/lad.yml                        |   4 -
 config/locales/lt.yml                         |   4 -
 config/locales/lv.yml                         |   4 -
 config/locales/ms.yml                         |   4 -
 config/locales/my.yml                         |   4 -
 config/locales/nl.yml                         |   4 -
 config/locales/nn.yml                         |   4 -
 config/locales/no.yml                         |   4 -
 config/locales/oc.yml                         |   3 -
 config/locales/pl.yml                         |   4 -
 config/locales/pt-BR.yml                      |   4 -
 config/locales/pt-PT.yml                      |   4 -
 config/locales/ro.yml                         |   3 -
 config/locales/ru.yml                         |   4 -
 config/locales/sc.yml                         |   3 -
 config/locales/sco.yml                        |   4 -
 config/locales/si.yml                         |   3 -
 config/locales/sk.yml                         |   3 -
 config/locales/sl.yml                         |   4 -
 config/locales/sq.yml                         |   4 -
 config/locales/sr-Latn.yml                    |   4 -
 config/locales/sr.yml                         |   4 -
 config/locales/sv.yml                         |   4 -
 config/locales/th.yml                         |   4 -
 config/locales/tr.yml                         |   4 -
 config/locales/uk.yml                         |   4 -
 config/locales/vi.yml                         |   4 -
 config/locales/zh-CN.yml                      |   4 -
 config/locales/zh-HK.yml                      |   4 -
 config/locales/zh-TW.yml                      |   4 -
 102 files changed, 616 insertions(+), 315 deletions(-)
 rename app/javascript/images/mailer-new/welcome/{step5-off.png => apps_step-off.png} (100%)
 create mode 100644 app/javascript/images/mailer-new/welcome/apps_step-on.png
 create mode 100644 app/javascript/images/mailer-new/welcome/btn-app-store.png
 create mode 100644 app/javascript/images/mailer-new/welcome/btn-google-play.png
 create mode 100644 app/javascript/images/mailer-new/welcome/edit_profile_step-off.png
 rename app/javascript/images/mailer-new/welcome/{step1-on.png => edit_profile_step-on.png} (100%)
 create mode 100644 app/javascript/images/mailer-new/welcome/feature_audience.png
 create mode 100644 app/javascript/images/mailer-new/welcome/feature_control.png
 create mode 100644 app/javascript/images/mailer-new/welcome/feature_creativity.png
 create mode 100644 app/javascript/images/mailer-new/welcome/feature_moderation.png
 rename app/javascript/images/mailer-new/welcome/{step2-off.png => follow_step-off.png} (100%)
 create mode 100644 app/javascript/images/mailer-new/welcome/follow_step-on.png
 rename app/javascript/images/mailer-new/welcome/{step3-off.png => post_step-off.png} (100%)
 create mode 100644 app/javascript/images/mailer-new/welcome/post_step-on.png
 create mode 100644 app/javascript/images/mailer-new/welcome/purple-extra-soft-spacer.png
 create mode 100644 app/javascript/images/mailer-new/welcome/purple-extra-soft-wave.png
 rename app/javascript/images/mailer-new/welcome/{step4-off.png => share_step-off.png} (100%)
 create mode 100644 app/javascript/images/mailer-new/welcome/share_step-on.png
 create mode 100644 app/views/application/mailer/_feature.html.haml
 create mode 100644 app/views/application/mailer/_follow.html.haml
 create mode 100644 app/views/application/mailer/_hashtag.html.haml

diff --git a/app/javascript/images/mailer-new/welcome/step5-off.png b/app/javascript/images/mailer-new/welcome/apps_step-off.png
similarity index 100%
rename from app/javascript/images/mailer-new/welcome/step5-off.png
rename to app/javascript/images/mailer-new/welcome/apps_step-off.png
diff --git a/app/javascript/images/mailer-new/welcome/apps_step-on.png b/app/javascript/images/mailer-new/welcome/apps_step-on.png
new file mode 100644
index 0000000000000000000000000000000000000000..fd631bf97ecf75b75ab3e8b149519c067f640886
GIT binary patch
literal 1291
zcmV+m1@!ufP)<h;3K|Lk000e1NJLTq002+`002-31^@s6juG;$00009a7bBm000&x
z000&x0ZCFM@Bjb+0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH1fWSoK~#7F?VZhT
z8&wp?&%Jj%b`sfDngAkgSX3$!LEVr=Y1w3Jq3)XW2?|^K27ZIG1&Ie}(jA+Ml~+Va
zq{}X-R3RJ%sX(Eb#GiBLaL>5o*zvgjxWm}Q=O;yuNAscl^1mN5Ik^@vBBfGEe*ei)
zZoyO8(~RTP8x1GtxB@N!b-#(ZY}WT%zVGIB<IdByy7_s7QH~udV5_v{cpEpDs*S%F
zFN&~H@B>|2dH$YPE|vVZ?Ke<Jn7ECje4yPWm}8`Bo*q0~^I$+CRoq5O-OnFhT9qiX
zFy|mDcXg$)uyLc<__bW_lh~KQ&2PTQH1Z3VGeRq1I<!#ftXF$=@a4Cy?(MSs4JD7|
z#Y0ZW%~q-8bZ_s7qCStBEz28>5-3kr8o8G@iZv*gk+yXbNCO7T8xA?zG_Ioep+IW7
z^FG>+1G$Qtawzbx>mTKT84GWt76wk4&QD%>r@jo#SSZ<Wjz0dpDmTsT88BnxYiZm;
zPBzWGEie<2*Z;Uu=%oxW6Y;vGGcqHNdFnDD4rnEVIeNm9G}I4DV60$)masreSfC{i
zObIR3EkJn-l0b-k6*Tu@3ZyQO#Gw{nLm;j~QXqm4nTn9&LE0iyZNj0vKt48!NlxAw
z>lol;E!|{NJtC<lFic)F>qIy<PbeP=#N(cQ0=RAViI;$|FC_ffvq^{oXe^pzuC|ZI
zhvwx|NQu-0hJ9YA*@}t~dRqm$(!Za3h={QQO%vT!*xc>eXr2pep}s?uKNyJxvt^x9
zm{wCxFM-_yhJ+_^@(2>7g-ZvVYv$sxPhNBk=!zEdk#TvyeXZ~paKQw2alYA}XOO73
zpVV{-2&u#KKucJlB`nYq7HA0zw1fp(!U8Q}ftIj9OIV;KEYK1bXbB6ngaul{0xe;I
zmasreSfC{=&=MAC2@AAjrUhzrcIXRcn5h*P4THp?5D(vc4@&ss|EV(tW;cP|#j`V9
zNISC$>{KXVa7kfnCeugEtUzL-3Wb#6QP`5H2n<Wo5<e*<f6fs|PoN0Ss-*(Fr$Mbl
zLeRMov3PbZky@2%YJH#z^uCYs@J%6P0YUEhQau?~sWpstfn{(HI;j?wG|PNb9Yll*
zz6wix+pL=;-nXtuL!`u=T|>eH7-`9zWJt9Sq!bDn+%^5xAta8VBJ;ax7n!F%jUkC3
z^v(a|-yBj*Uc}VqfuTsy$)sfpm8lUt543~@TEYS?VS$!N={Kj?1^>TsR1nA(7Bnyu
z;e*oha^7zOGZC0kE$OK$3!D)3vf7jfPuJ?)4^GCx@5WuYHfVOa3d~qw&Z&~Sa2j(B
zUYr0k7S~(1J$elV?(OX9*J|k$n30gi)!xodID6?#q+dK+@LW_pr5OS_x?@~L?|YVg
z+TPt(zxivcO<oE#7LxaY^Vy$K`iP!eIcmzjS9`@t?1!9?n{IhT?80N5#9rc(7ZLj~
zfs**sFUx=Mz|tNtipE8pJYwk5ca+BGnJalw_ZMMK2yZOR-1r)7o(vKfG4k4h;fE8v
zf0WbjF1mr|xU_KNMOk~0gwaElf;w&0#{4*pe*wEu()#)`4cY(z002ovPDHLkV1fsO
BP#*vQ

literal 0
HcmV?d00001

diff --git a/app/javascript/images/mailer-new/welcome/btn-app-store.png b/app/javascript/images/mailer-new/welcome/btn-app-store.png
new file mode 100644
index 0000000000000000000000000000000000000000..ee3bd9385c4b5cf8feb95d89a25f420e193e6c52
GIT binary patch
literal 2054
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
Zyn~RgNuy{$>FWR9+{xa}uFjT_`d<yww7&oV

literal 0
HcmV?d00001

diff --git a/app/javascript/images/mailer-new/welcome/btn-google-play.png b/app/javascript/images/mailer-new/welcome/btn-google-play.png
new file mode 100644
index 0000000000000000000000000000000000000000..ed43ff29aa391b9c684c844e6897e26a0e7778f7
GIT binary patch
literal 4512
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

literal 0
HcmV?d00001

diff --git a/app/javascript/images/mailer-new/welcome/edit_profile_step-off.png b/app/javascript/images/mailer-new/welcome/edit_profile_step-off.png
new file mode 100644
index 0000000000000000000000000000000000000000..dfcdd04e1661db195103661f4b616161d6d3e09c
GIT binary patch
literal 2247
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
VPR^+Ray$S4002ovPDHLkV1gFW4_E*I

literal 0
HcmV?d00001

diff --git a/app/javascript/images/mailer-new/welcome/step1-on.png b/app/javascript/images/mailer-new/welcome/edit_profile_step-on.png
similarity index 100%
rename from app/javascript/images/mailer-new/welcome/step1-on.png
rename to app/javascript/images/mailer-new/welcome/edit_profile_step-on.png
diff --git a/app/javascript/images/mailer-new/welcome/feature_audience.png b/app/javascript/images/mailer-new/welcome/feature_audience.png
new file mode 100644
index 0000000000000000000000000000000000000000..902de133b45c99585c623b77a36fd461dbacf939
GIT binary patch
literal 96392
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
T#L{8_00000NkvXXu0mjfW^r6>

literal 0
HcmV?d00001

diff --git a/app/javascript/images/mailer-new/welcome/feature_control.png b/app/javascript/images/mailer-new/welcome/feature_control.png
new file mode 100644
index 0000000000000000000000000000000000000000..1afb6c238caa18cdb35d3ce9e500742de2e370ac
GIT binary patch
literal 90297
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
IM6N<$f);lkVgLXD

literal 0
HcmV?d00001

diff --git a/app/javascript/images/mailer-new/welcome/feature_creativity.png b/app/javascript/images/mailer-new/welcome/feature_creativity.png
new file mode 100644
index 0000000000000000000000000000000000000000..3365856699fcaf857a94cce33edd1e70e908a53f
GIT binary patch
literal 130496
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
Vg~;TDEN%b*002ovPDHLkV1i{cafAQ>

literal 0
HcmV?d00001

diff --git a/app/javascript/images/mailer-new/welcome/feature_moderation.png b/app/javascript/images/mailer-new/welcome/feature_moderation.png
new file mode 100644
index 0000000000000000000000000000000000000000..7cee9b29b86721f3ef856e4c9ef48baaa6f9a2e2
GIT binary patch
literal 100525
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

literal 0
HcmV?d00001

diff --git a/app/javascript/images/mailer-new/welcome/step2-off.png b/app/javascript/images/mailer-new/welcome/follow_step-off.png
similarity index 100%
rename from app/javascript/images/mailer-new/welcome/step2-off.png
rename to app/javascript/images/mailer-new/welcome/follow_step-off.png
diff --git a/app/javascript/images/mailer-new/welcome/follow_step-on.png b/app/javascript/images/mailer-new/welcome/follow_step-on.png
new file mode 100644
index 0000000000000000000000000000000000000000..3ac011539bb9dea99d69c66af361273770113129
GIT binary patch
literal 1227
zcmV;+1T_1JP)<h;3K|Lk000e1NJLTq002+`002-31^@s6juG;$00009a7bBm000&x
z000&x0ZCFM@Bjb+0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH1Yk)-K~#7F?VZhT
z+eQ$8XLm_TwxJY`-4=C<9s;C5UF1?9il!G|jUvbR5!!qE0(ybA=k^ieV_!h01_9#S
zl0yOnL1H*S{uA1g__N$_m{5^pQv6wyqNMo%!xSyj=7-sx;n1WQ<fPl}^8bD~Y%kfO
zb!-~O&~c2mVKJBkhQ6!Xt(Nb5zHfD;bM^MdFg)HM&$gKYw!7Pgz4_xx-+8q>FT(QR
z2Xe4>|4X~q?fR46mntNRxXr^(AgvWxV7PFP_wR1lkP?w1X(dM8t#3bD=Zd#r!BI+B
z>ub)^=H(sdVXt>e;;9JS`sY{E=`5W$nG`^b@RX1(d+>7qw|~9y^?dvVMjpva2A!ar
z?QYi?Uq2Fsa~=*`l9!HPiXW{x?WdP_2GHv%TsMk9Oc*3D8+5c4x{6;%0&(ardbTYB
zx{8N#B=E(h?>ayf!rmN20Vl%Ak6-wFxC%re1b2+X?|<p@t?={=h{E`ihwh-w-SFHN
zh*EUqYl}0vVggZ$H=Z=P$=*`wQW68C;K2fQSk4-p2RRU0kU&jHpe7_xlbIAKm9dLo
z&;SgWF;JXh?C%fDVT;MX4pU_IB9ODM6PFXHBT{EB0`uZ4;}2l$cU-PAQfm<yML|Zi
zq!Oruq6a@NF9OS51(i^_z|ovl_5c_I$*spCaBt*!`=|24&Hoh2t!$pGehw@fd8x32
z<mEJZ-d|85_0E9`ZZHo27uy8xj7J|vlVsLtIbI)46E(|2Y88m`&f=gFhh#L*y`LxQ
zl84Mq7EX)Is+p@YrcQA&bS|t(BO<U+otUF8Ox$0IdNL1F7g)GX#JX_8nMLaUGPWzr
z^oMYnI&soAlbY-mG~k<+L?+aUDu64%;HRuze9Xq`6UpqLiX_u0fs^V)$xSTtG6f=a
zW@F02nvg(ENT4Q-ngcOW;9QsXv#gsk;_h>uZT@Cu;V{dlCW;*Lrg5#L0Yms?Pp|Yg
z1+JBxB~y>U^tvsLYU;VNG-3!hNk~yB3u{6GH6ekT%w<2YPUfy3ST_ym2bTB~8uX8~
zR0nE8b)Y7cg*738nvg(EYMlco_503Z-!O$+hU!fsllp!7`<@Cl4B;~UzS;Sml}BLl
zI!~8+>%>}y@GRGPSx^?%gam3r0yQClnsDyB72Sd|{}>_&xTnrZAWGqbko<hdcY!E{
zGKI%&(I<f=5l{Or-@m;vq<OF$`%gl5(X&BYt9>8}q1r|t-9=^0MR;%oL?JGDS8V(q
z3EbP=lW)YzF%Y@np{u>!-KcsQ719sxF4>k6RMKRCj;@BT;@2nIkk_tX6Oa6jb(bCm
znh47K#`yVp9DT@%Q#l;UzCCzJk$4((f^Np;A&HG}io}y7MP5u|GXW#<=DpQtlvv&;
zjGfR$k~}2yQVd4pee*(x4gF<U5TX-{ur|I3TSsZ)Vsc;0iawm+tHZYZV%Z98!@>tQ
p&dak0Q5ZH=&WU4hQ1Ih0-T@>J_*{MRBw_#n002ovPDHLkV1klpLdyUE

literal 0
HcmV?d00001

diff --git a/app/javascript/images/mailer-new/welcome/step3-off.png b/app/javascript/images/mailer-new/welcome/post_step-off.png
similarity index 100%
rename from app/javascript/images/mailer-new/welcome/step3-off.png
rename to app/javascript/images/mailer-new/welcome/post_step-off.png
diff --git a/app/javascript/images/mailer-new/welcome/post_step-on.png b/app/javascript/images/mailer-new/welcome/post_step-on.png
new file mode 100644
index 0000000000000000000000000000000000000000..aa318e66c8573400568c4437d96d5b8baf048582
GIT binary patch
literal 1552
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
COUtDI

literal 0
HcmV?d00001

diff --git a/app/javascript/images/mailer-new/welcome/purple-extra-soft-spacer.png b/app/javascript/images/mailer-new/welcome/purple-extra-soft-spacer.png
new file mode 100644
index 0000000000000000000000000000000000000000..ec1ad5c957f971681f64f60c85cf69ccf15c2bae
GIT binary patch
literal 939
zcmaJ=O^?z*7;fNVNcQa4W$a$uL^^Gulr~fXw75+yA#4*lI<&(wVcV(gAcfQF&BWj0
zAJ9Y(Ui=H*yr~yWyn1lT0_#ESq4Un0_j%s0XI>2lkB%yLDuN&!xu^DspM_nyQR4s7
zaQvMgx0y3$XLQPzD8)i2q!SF>2%X~*M&at&C)^T*@(J<BZ0tQY0~$%Fh>`Lr;b=i<
zweti8bIia5pOe@Uf4qG!0uox{6U~#oq=#qZbe-a}^}r9-^S}tj_CwIhO->MDhCm)&
z#F?2};)d7ccHxF1*o3gTC0-RZ_J*KGQw$7AsRpvF0G(U)hT1d?UDqD~RaR?IZa`J5
zsx?#7O{EUDpU5+&;nW=2{cS#ev&0!=i3#Cyxs;YQiKgdJF$@FBDpb`fkEmv=n4!EH
zXU97R8)rdE5=LkY3Pv=c3ucMD+N(CAWKSDs+fnhM!5k$}k>sMSU7+XvKQxN=(HR@z
z>w5o5ocXH+!x7HtA`STRrpHC9#O$RQF`D|6UhF10oKZ%z8BKtyNeZ~{p@77N=VSx%
zJkyOchT;Ibwk2{BiIC8A8n$kCWZh6ZJw<VxrqeYHtzYjq)u!F;)pl5$28#&CY=;f6
zvCV_nLJ?8IGut>N&vDpKX#_T1o8)jU+Cjc8HauKQ;~*CDVqme`zjnQIaRC+PUcLOX
z*FTQA=u@t4N4Tf+mvPIrJAVFo^84qPb~*m=@$%+tpIi!M;l;bsugTr7--_qsIs^Mn
H_vy<&)hi%y

literal 0
HcmV?d00001

diff --git a/app/javascript/images/mailer-new/welcome/purple-extra-soft-wave.png b/app/javascript/images/mailer-new/welcome/purple-extra-soft-wave.png
new file mode 100644
index 0000000000000000000000000000000000000000..ba8f6dd3d989dc0dd74fe25cc20233375ecc87c8
GIT binary patch
literal 2531
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
U#)Uf}i@#koM>lHW_Wd#c0U#_+bpQYW

literal 0
HcmV?d00001

diff --git a/app/javascript/images/mailer-new/welcome/step4-off.png b/app/javascript/images/mailer-new/welcome/share_step-off.png
similarity index 100%
rename from app/javascript/images/mailer-new/welcome/step4-off.png
rename to app/javascript/images/mailer-new/welcome/share_step-off.png
diff --git a/app/javascript/images/mailer-new/welcome/share_step-on.png b/app/javascript/images/mailer-new/welcome/share_step-on.png
new file mode 100644
index 0000000000000000000000000000000000000000..98782d931739c220410da17bb5a5ddba3ab8e2d1
GIT binary patch
literal 1639
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

literal 0
HcmV?d00001

diff --git a/app/javascript/styles/mailer.scss b/app/javascript/styles/mailer.scss
index a2cbb494b4a05b..e5d0c05f81d97b 100644
--- a/app/javascript/styles/mailer.scss
+++ b/app/javascript/styles/mailer.scss
@@ -192,6 +192,18 @@ table + p {
   }
 }
 
+.email-dir-rtl {
+  direction: rtl;
+
+  [dir='rtl'] & {
+    direction: ltr;
+  }
+}
+
+.email-dir-ltr {
+  direction: ltr;
+}
+
 .email-padding-24 {
   padding: 24px;
 }
@@ -216,6 +228,30 @@ table + p {
   border-bottom: 1px solid #dfdee3;
 }
 
+.email-desktop-flex {
+  font-size: 0;
+  max-width: 740px;
+  margin-left: auto;
+  margin-right: auto;
+
+  &.email-dir-rtl > .email-desktop-column {
+    direction: ltr;
+
+    [dir='rtl'] & {
+      direction: rtl;
+    }
+  }
+}
+
+.email-desktop-column {
+  display: inline-block;
+  width: 100%;
+  max-width: none;
+  text-align: start;
+  vertical-align: top;
+  font-size: 16px;
+}
+
 // Header
 .email-header-td {
   padding: 16px 32px;
@@ -312,6 +348,66 @@ table + p {
   }
 }
 
+.email-header-card-table {
+  width: 100%;
+  border-collapse: separate;
+  overflow: hidden;
+  border-radius: 12px;
+  background-color: #fff;
+  border: 2px solid #fff;
+  box-shadow: 0 4px 16px 0 rgba(23, 6, 59, 8%);
+}
+
+.email-header-card {
+  position: relative;
+  max-height: 100px;
+}
+
+.email-header-card-banner-td {
+  border-radius: 12px 12px 0 0;
+  height: 80px;
+  background-color: #f3f2f5 !important;
+  background-position: center !important;
+  background-size: cover !important;
+}
+
+.email-header-card-body-td {
+  padding: 12px;
+
+  .email-btn-table {
+    width: 100%;
+    max-width: 212px;
+  }
+}
+
+.email-header-card-instance {
+  margin-bottom: 4px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  word-break: break-all;
+  color: #17063b;
+  font-size: 14px;
+  line-height: 20px;
+  font-weight: 600;
+
+  &:only-of-type {
+    margin-bottom: 12px;
+  }
+}
+
+.email-header-card-description {
+  margin-bottom: 12px;
+  color: #746a89;
+  font-size: 12px;
+  line-height: 16px;
+  max-height: 32px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-line-clamp: 2;
+  -webkit-box-orient: vertical;
+}
+
 // To make the design work with images off
 // we create an empty div that overlaps with
 // the rest of the content with a dark background.
@@ -336,6 +432,16 @@ table + p {
   mso-padding-alt: 32px;
 }
 
+.email-body-columns-td {
+  border-top: 1px solid #dfdee3;
+  padding: 32px 24px 8px;
+}
+
+.email-body-huge-padding-td {
+  padding: 110px 32px 32px;
+  mso-padding-alt: 32px;
+}
+
 .email-body-padding-td {
   & > p {
     font-size: 14px;
@@ -353,6 +459,30 @@ table + p {
   }
 }
 
+// Texts
+.email-h2 {
+  margin-bottom: 4px;
+  color: #17063b;
+  font-size: 18px;
+  font-weight: 600;
+  line-height: 28px;
+}
+
+.email-h-sub {
+  margin-bottom: 16px;
+  color: #746a89;
+  font-size: 14px;
+  line-height: 16px;
+}
+
+.email-p {
+  margin-bottom: 16px;
+  color: #746a89;
+  font-size: 14px;
+  font-weight: 400;
+  line-height: 20px;
+}
+
 // Footer
 .email-footer-td {
   padding: 28px 32px 32px;
@@ -539,8 +669,13 @@ table + p {
   background-color: #fff;
 }
 
+.email-checklist-checked {
+  border-color: #c4e6d7;
+  background-color: #eaf6f1;
+}
+
 .email-checklist-td {
-  padding: 16px;
+  padding: 16px 16px 6px;
 }
 
 .email-checklist-icons-td {
@@ -576,10 +711,15 @@ table + p {
     font-size: 14px;
     font-weight: 600;
     line-height: 16.8px;
+
+    .email-checklist-checked & {
+      color: #746a89;
+      text-decoration: line-through;
+    }
   }
 
   p {
-    margin: 0 0 2px;
+    margin: 0 0 12px;
     color: #746a89;
     font-size: 14px;
     line-height: 16.8px;
@@ -597,6 +737,194 @@ table + p {
     padding-left: 10px;
     padding-right: 10px;
   }
+
+  div + div {
+    margin-inline-start: auto;
+    margin-bottom: 12px;
+  }
+}
+
+// Welcome email
+.email-welcome-apps-btns {
+  font-size: 12px;
+  line-height: 44px;
+}
+
+.email-column-td {
+  padding: 0 8px;
+  vertical-align: top;
+}
+
+.email-link-with-arrow {
+  color: #6364ff;
+  font-size: 14px;
+  font-weight: 600;
+  line-height: 16.8px;
+
+  &:hover {
+    color: #563acc !important;
+  }
+
+  span {
+    font-size: 12px;
+    font-weight: 400;
+  }
+}
+
+.email-column-action-td {
+  padding: 24px 0;
+  color: #6364ff;
+  font-size: 14px;
+  font-weight: 600;
+  line-height: 16.8px;
+  text-align: center;
+}
+
+// Follow and hashtags
+.email-mini-wrapper-td {
+  padding: 4px 0;
+
+  table {
+    table-layout: fixed;
+  }
+}
+
+.email-mini-td {
+  border-radius: 12px;
+  border: 1px solid #e8e6eb;
+  background-color: #fff;
+  padding: 15px 16px;
+}
+
+.email-mini-follow-img-td {
+  width: 40px;
+  vertical-align: top;
+
+  img {
+    border-radius: 8px;
+  }
+}
+
+.email-mini-follow-text-td {
+  padding-left: 8px;
+  padding-right: 16px;
+  vertical-align: top;
+
+  h3 {
+    color: #17063b;
+    font-size: 14px;
+    font-weight: 600;
+    line-height: 20px;
+  }
+
+  p {
+    color: #746a89;
+    font-size: 12px;
+    font-weight: 400;
+    line-height: 16px;
+  }
+}
+
+.email-mini-follow-btn-td {
+  width: 68px;
+  vertical-align: top;
+
+  .email-btn-table {
+    width: 100%;
+  }
+
+  .email-btn-td {
+    mso-padding-alt: 10px;
+  }
+
+  .email-btn-a {
+    padding-left: 10px;
+    padding-right: 10px;
+  }
+}
+
+.email-mini-hashtag-td {
+  height: 40px;
+
+  td {
+    vertical-align: middle;
+  }
+
+  h3 {
+    color: #17063b;
+    font-size: 14px;
+    font-weight: 600;
+    line-height: 20px;
+  }
+
+  p {
+    color: #746a89;
+    font-size: 12px;
+    font-weight: 400;
+    line-height: 16px;
+    word-break: break-all;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+}
+
+.email-mini-hashtag-img-td {
+  width: 40px;
+  height: 20px;
+  white-space: nowrap;
+  text-indent: -2px;
+  font-size: 0;
+
+  & + td {
+    padding-left: 8px;
+  }
+}
+
+.email-mini-hashtag-img-span {
+  display: inline-block;
+  max-width: 12px;
+  font-size: 12px;
+
+  img {
+    width: 16px;
+    height: 16px;
+    border-radius: 50%;
+    max-width: none;
+    border: 2px solid #fff;
+    vertical-align: middle;
+  }
+}
+
+// Extra content on light purple background
+.email-extra-wave {
+  height: 42px;
+  background-image: url('../images/mailer-new/welcome/purple-extra-soft-wave.png');
+  background-position: bottom center;
+  background-repeat: no-repeat;
+}
+
+.email-extra-td {
+  padding: 32px 32px 24px;
+  background-color: #f0f0ff;
+  background-image: url('../images/mailer-new/welcome/purple-extra-soft-spacer.png'); // Using an image to maintain the color even in forced dark modes
+
+  .email-column-td {
+    padding-top: 8px;
+    padding-bottom: 8px;
+  }
+}
+
+// Feature card
+.email-feature-wrapper-td {
+  padding: 8px 0;
+}
+
+.email-feature-td {
+  padding: 24px;
+  background-color: #fff;
+  border: 1px solid #e8e6eb;
+  border-radius: 12px;
 }
 
 // Responsive
@@ -617,4 +945,21 @@ table + p {
   .email-desktop-flex {
     display: flex;
   }
+
+  .email-header-left {
+    padding-right: 32px;
+  }
+
+  .email-header-right {
+    width: 240px;
+    margin-inline-start: auto;
+  }
+
+  .email-desktop-column {
+    max-width: 346px !important;
+  }
+
+  .email-desktop-text-right {
+    text-align: right;
+  }
 }
diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb
index 3b1a085cb88ef6..96fcd51efa2ec6 100644
--- a/app/mailers/user_mailer.rb
+++ b/app/mailers/user_mailer.rb
@@ -135,6 +135,12 @@ def welcome(user)
 
     return unless @resource.active_for_authentication?
 
+    @suggestions = AccountSuggestions.new(@resource.account).get(5)
+    @tags = Trends.tags.query.allowed.limit(5)
+    @has_account_fields = @resource.account.display_name.present? || @resource.account.note.present? || @resource.account.avatar.present?
+    @has_active_relationships = @resource.account.active_relationships.exists?
+    @has_statuses = @resource.account.statuses.exists?
+
     I18n.with_locale(locale) do
       mail subject: default_i18n_subject
     end
diff --git a/app/models/user.rb b/app/models/user.rb
index f706c91eff55c4..14c2bb6e0c82bc 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -490,7 +490,7 @@ def prepare_new_user!
     BootstrapTimelineWorker.perform_async(account_id)
     ActivityTracker.increment('activity:accounts:local')
     ActivityTracker.record('activity:logins', id)
-    UserMailer.welcome(self).deliver_later
+    UserMailer.welcome(self).deliver_later(wait: 1.hour)
     TriggerWebhookWorker.perform_async('account.approved', 'Account', account_id)
   end
 
diff --git a/app/views/application/mailer/_button.html.haml b/app/views/application/mailer/_button.html.haml
index 61430732eb3ed3..0bf80b505aa307 100644
--- a/app/views/application/mailer/_button.html.haml
+++ b/app/views/application/mailer/_button.html.haml
@@ -1,4 +1,7 @@
 %table.email-btn-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
   %tr
     %td.email-btn-td
-      = link_to "#{text} ➜", url, class: 'email-btn-a email-btn-hover'
+      - if defined?(has_arrow) && !has_arrow
+        = link_to text, url, class: 'email-btn-a email-btn-hover'
+      - else
+        = link_to "#{text} ➜", url, class: 'email-btn-a email-btn-hover'
diff --git a/app/views/application/mailer/_checklist.html.haml b/app/views/application/mailer/_checklist.html.haml
index 83072bd36b04e2..31cd5bf35df486 100644
--- a/app/views/application/mailer/_checklist.html.haml
+++ b/app/views/application/mailer/_checklist.html.haml
@@ -1,7 +1,7 @@
 %table.email-w-full.email-checklist-wrapper-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
   %tr
     %td.email-checklist-wrapper-td
-      %table.email-w-full.email-checklist-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+      %table.email-w-full.email-checklist-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation', class: ('email-checklist-checked' if defined?(checked) && checked) }
         %tr
           %td.email-checklist-td
             %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
@@ -15,15 +15,25 @@
                         - else
                           = image_tag frontend_asset_url('images/mailer-new/welcome/checkbox-off.png'), alt: '', width: 20, height: 20
                       %td.email-checklist-icons-step-td
-                        - if defined?(step_image_url)
-                          = image_tag step_image_url, alt: '', width: 40, height: 40
+                        - if defined?(key)
+                          = image_tag frontend_asset_url("images/mailer-new/welcome/#{key}-#{checked ? 'on' : 'off'}.png"), alt: '', width: 40, height: 40
                 %td.email-checklist-text-td
                   .email-desktop-flex
+                    /[if mso]
+                      <table border="0" cellpadding="0" cellspacing="0" align="center" style="width:100%;" role="presentation"><tr><td vertical-align:top;">
                     %div
                       - if defined?(title)
                         %h3= title
                       - if defined?(text)
                         %p= text
+                    /[if mso]
+                      </td><td style="vertical-align:top;">
                     %div
-                      - if defined?(button_text) && defined?(button_url) && defined?(checked) && !checked
-                        = render 'application/mailer/button', text: button_text, url: button_url
+                      - if defined?(show_apps_buttons) && show_apps_buttons
+                        .email-welcome-apps-btns
+                          = link_to image_tag(frontend_asset_url('images/mailer-new/welcome/btn-app-store.png'), alt: t('user_mailer.welcome.apps_ios_action'), width: 120, height: 40), 'https://apps.apple.com/app/mastodon-for-iphone-and-ipad/id1571998974'
+                          = link_to image_tag(frontend_asset_url('images/mailer-new/welcome/btn-google-play.png'), alt: t('user_mailer.welcome.apps_android_action'), width: 120, height: 40), 'https://play.google.com/store/apps/details?id=org.joinmastodon.android'
+                      - elsif defined?(button_text) && defined?(button_url) && defined?(checked) && !checked
+                        = render 'application/mailer/button', text: button_text, url: button_url, has_arrow: false
+                    /[if mso]
+                      </td></tr></table>
diff --git a/app/views/application/mailer/_feature.html.haml b/app/views/application/mailer/_feature.html.haml
new file mode 100644
index 00000000000000..d051338a9c27bd
--- /dev/null
+++ b/app/views/application/mailer/_feature.html.haml
@@ -0,0 +1,32 @@
+%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+  %tr
+    %td.email-feature-wrapper-td
+      %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+        %tr
+          %td.email-feature-td
+            .email-desktop-flex{ class: ('email-dir-rtl' if defined?(text_first_on_desktop) && !text_first_on_desktop) }
+              /[if mso]
+                <table border="0" cellpadding="0" cellspacing="0" align="center" style="width:100%;" role="presentation"><tr><td style="width:50%; vertical-align:top;">
+              .email-desktop-column
+                %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+                  %tr
+                    %td.email-column-td
+                      - if defined?(feature_title)
+                        %h2.email-h2= feature_title
+                      - if defined?(feature_text)
+                        %p.email-p= feature_text
+                      - if defined?(feature_btn_url)
+                        = link_to '', href: feature_btn_url, class: 'email-link-with-arrow' do
+                          #{t('user_mailer.welcome.feature_action')} 
+                          %span= '❯'
+              /[if mso]
+                </td><td style="width:50%; vertical-align:top;">
+              .email-desktop-column
+                %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+                  %tr
+                    %td.email-column-td
+                      - if defined?(key)
+                        %p{ class: ('email-desktop-text-right' if defined?(text_first_on_desktop) && text_first_on_desktop) }
+                          = image_tag frontend_asset_url("images/mailer-new/welcome/#{key}.png"), alt: '', width: 240, height: 230
+              /[if mso]
+                </td></tr></table>
diff --git a/app/views/application/mailer/_follow.html.haml b/app/views/application/mailer/_follow.html.haml
new file mode 100644
index 00000000000000..382151a2347656
--- /dev/null
+++ b/app/views/application/mailer/_follow.html.haml
@@ -0,0 +1,15 @@
+%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+  %tr
+    %td.email-mini-wrapper-td
+      %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+        %tr
+          %td.email-mini-td
+            %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+              %tr
+                %td.email-mini-follow-img-td
+                  = image_tag full_asset_url(follow.account.avatar.url), alt: '', width: 40, height: 40
+                %td.email-mini-follow-text-td
+                  %h3= follow.account.display_name.presence || follow.account.username
+                  %p @#{follow.account.pretty_acct}
+                %td.email-mini-follow-btn-td
+                  = render 'application/mailer/button', text: t('user_mailer.welcome.follow_action'), url: web_url("@#{follow.account.acct}"), has_arrow: false
diff --git a/app/views/application/mailer/_hashtag.html.haml b/app/views/application/mailer/_hashtag.html.haml
new file mode 100644
index 00000000000000..524fd7e274b805
--- /dev/null
+++ b/app/views/application/mailer/_hashtag.html.haml
@@ -0,0 +1,20 @@
+- accounts = hashtag.statuses.with_public_visibility.joins(:account).merge(Account.without_suspended.without_silenced).includes(:account).limit(3).map(&:account)
+
+%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+  %tr
+    %td.email-mini-wrapper-td
+      %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+        %tr
+          %td.email-mini-td
+            %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+              %tr
+                %td.email-mini-hashtag-td{ height: 40 }
+                  %h3 ##{hashtag.display_name}
+                  %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+                    %tr
+                      %td.email-mini-hashtag-img-td
+                        - accounts.each do |account|
+                          %span.email-mini-hashtag-img-span
+                            = image_tag full_asset_url(account.avatar.url), alt: '', width: 16, height: 16
+                      %td
+                        %p= t('user_mailer.welcome.hashtags_recent_count', people: number_with_delimiter(hashtag.history.aggregate(2.days.ago.to_date..Time.zone.today).accounts), days: 2)
diff --git a/app/views/user_mailer/welcome.html.haml b/app/views/user_mailer/welcome.html.haml
index b77d40fb058930..e7f9c47e3b86b2 100644
--- a/app/views/user_mailer/welcome.html.haml
+++ b/app/views/user_mailer/welcome.html.haml
@@ -1,25 +1,76 @@
+- instance_presenter = InstancePresenter.new
+
 = content_for :heading do
-  = render 'application/mailer/heading', heading_title: t('user_mailer.welcome.title', name: @resource.account.username), heading_subtitle: t('user_mailer.welcome.explanation')
+  .email-desktop-flex
+    .email-header-left
+      = render 'application/mailer/heading', heading_title: t('user_mailer.welcome.title', name: @resource.account.username), heading_subtitle: t('user_mailer.welcome.explanation')
+    .email-header-right
+      .email-header-card
+        %table.email-header-card-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+          %tr
+            %td
+              %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+                %tr
+                  %td.email-header-card-banner-td{ height: 140, background: full_asset_url(instance_presenter.thumbnail&.file&.url(:'@1x') || frontend_asset_path('images/preview.png')) }
+              %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+                %tr
+                  %td.email-header-card-body-td
+                    %p.email-header-card-instance= @instance
+                    - if instance_presenter.description.present?
+                      %p.email-header-card-description= instance_presenter.description
+                    = render 'application/mailer/button', text: t('user_mailer.welcome.sign_in_action'), url: new_user_session_url, has_arrow: false
+
 %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
   %tr
-    %td.email-body-padding-td
-      %table.email-inner-card-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
-        %tr
-          %td.email-inner-card-td-without-padding
-            %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
-              %tr
-                %td.email-prose.email-padding-24
-                  %p
-                    %b= t 'user_mailer.welcome.full_handle'
-                  = render 'application/mailer/frame', text: "#{@resource.account.username}@#{@instance}"
-                  %p= t 'user_mailer.welcome.full_handle_hint', instance: @instance
-            %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
-              %tr
-                %td.email-border-top.email-prose.email-padding-24
-                  %p= t 'user_mailer.welcome.edit_profile_step'
-                  = render 'application/mailer/button', text: t('user_mailer.welcome.edit_profile_action'), url: settings_profile_url
-            %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
-              %tr
-                %td.email-border-top.email-prose.email-padding-24
-                  %p= t 'user_mailer.welcome.edit_profile_step'
-                  = render 'application/mailer/button', text: t('user_mailer.welcome.final_action'), url: web_url
+    %td.email-body-huge-padding-td
+      %h2.email-h2= t('user_mailer.welcome.checklist_title')
+      %p.email-h-sub= t('user_mailer.welcome.checklist_subtitle')
+      = render 'application/mailer/checklist', key: 'edit_profile_step', title: t('user_mailer.welcome.edit_profile_title'), text: t('user_mailer.welcome.edit_profile_step'), checked: @has_account_fields, button_text: t('user_mailer.welcome.edit_profile_action'), button_url: web_url('start/profile')
+      = render 'application/mailer/checklist', key: 'follow_step', title: t('user_mailer.welcome.follow_title'), text: t('user_mailer.welcome.follow_step'), checked: @has_active_relationships, button_text: t('user_mailer.welcome.follow_action'), button_url: web_url('start/follows')
+      = render 'application/mailer/checklist', key: 'post_step', title: t('user_mailer.welcome.post_title'), text: t('user_mailer.welcome.post_step'), checked: @has_statuses, button_text: t('user_mailer.welcome.post_action'), button_url: web_url
+      = render 'application/mailer/checklist', key: 'share_step', title: t('user_mailer.welcome.share_title'), text: t('user_mailer.welcome.share_step'), checked: false, button_text: t('user_mailer.welcome.share_action'), button_url: web_url('start/share')
+      = render 'application/mailer/checklist', key: 'apps_step', title: t('user_mailer.welcome.apps_title'), text: t('user_mailer.welcome.apps_step'), checked: false, show_apps_buttons: true
+%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+  %tr
+    %td.email-body-columns-td
+      .email-desktop-flex
+        /[if mso]
+          <table border="0" cellpadding="0" cellspacing="0" align="center" style="width:100%;" role="presentation"><tr><td style="width:50%; vertical-align:top;">
+        .email-desktop-column
+          %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+            %tr
+              %td.email-column-td
+                %h2.email-h2= t('user_mailer.welcome.follows_title')
+                %p.email-h-sub= t('user_mailer.welcome.follows_subtitle')
+                = render partial: 'application/mailer/follow', collection: @suggestions
+                %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+                  %tr
+                    %td.email-column-action-td
+                      = link_to '', href: web_url('explore/suggestions'), class: 'email-link-with-arrow' do
+                        = t('user_mailer.welcome.follows_view_more')
+                        %span= '❯'
+        /[if mso]
+          </td><td style="width:50%; vertical-align:top;">
+        .email-desktop-column
+          %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+            %tr
+              %td.email-column-td
+                %h2.email-h2= t('user_mailer.welcome.hashtags_title')
+                %p.email-h-sub= t('user_mailer.welcome.hashtags_subtitle')
+                = render partial: 'application/mailer/hashtag', collection: @tags
+                %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+                  %tr
+                    %td.email-column-action-td
+                      = link_to '', href: web_url('explore/tags'), class: 'email-link-with-arrow' do
+                        = t('user_mailer.welcome.hashtags_view_more')
+                        %span= '❯'
+        /[if mso]
+          </td></tr></table>
+.email-extra-wave
+%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+  %tr
+    %td.email-extra-td
+      = render 'application/mailer/feature', key: 'feature_control', feature_title: t('user_mailer.welcome.feature_control_title'), feature_text: t('user_mailer.welcome.feature_control'), text_first_on_desktop: true
+      = render 'application/mailer/feature', key: 'feature_audience', feature_title: t('user_mailer.welcome.feature_audience_title'), feature_text: t('user_mailer.welcome.feature_audience'), text_first_on_desktop: false
+      = render 'application/mailer/feature', key: 'feature_moderation', feature_title: t('user_mailer.welcome.feature_moderation_title'), feature_text: t('user_mailer.welcome.feature_moderation'), text_first_on_desktop: true
+      = render 'application/mailer/feature', key: 'feature_creativity', feature_title: t('user_mailer.welcome.feature_creativity_title'), feature_text: t('user_mailer.welcome.feature_creativity'), text_first_on_desktop: false
diff --git a/app/views/user_mailer/welcome.text.erb b/app/views/user_mailer/welcome.text.erb
index d78cdb938a678c..150944605f09d8 100644
--- a/app/views/user_mailer/welcome.text.erb
+++ b/app/views/user_mailer/welcome.text.erb
@@ -1,16 +1,78 @@
 <%= t 'user_mailer.welcome.title', name: @resource.account.username %> <%= t 'user_mailer.welcome.explanation' %>
 
+---
+
+<%= t('user_mailer.welcome.sign_in_action') %>
+===
+<%= new_user_session_url %>
+
+---
+
+<%= t('user_mailer.welcome.checklist_title') %>
+===
+<%= t('user_mailer.welcome.checklist_subtitle') %>
+
+1. <%= t('user_mailer.welcome.edit_profile_title') %>
+   <%= t('user_mailer.welcome.edit_profile_step') %>
+   * <%= web_url('start/profile') %>
+
+2. <%= t('user_mailer.welcome.follow_title') %>
+   <%= t('user_mailer.welcome.follow_step') %>
+   * <%= web_url('start/follows') %>
+
+3. <%= t('user_mailer.welcome.post_title') %>
+   <%= t('user_mailer.welcome.post_step') %>
+   * <%= web_url %>
+
+4. <%= t('user_mailer.welcome.share_title') %>
+   <%= t('user_mailer.welcome.share_step') %>
+   * <%= web_url('start/share') %>
+
+5. <%= t('user_mailer.welcome.apps_title') %>
+   <%= t('user_mailer.welcome.apps_step') %>
+   * iOS: https://apps.apple.com/app/mastodon-for-iphone-and-ipad/id1571998974
+   * Android: https://play.google.com/store/apps/details?id=org.joinmastodon.android
+
+---
+
+<%= t('user_mailer.welcome.follows_title') %>
 ===
+<%= t('user_mailer.welcome.follows_subtitle') %>
 
-<%= t 'user_mailer.welcome.full_handle' %> (<%= "@#{@resource.account.local_username_and_domain}" %>)
-<%= t 'user_mailer.welcome.full_handle_hint', instance: @instance %>
+<%- @suggestions.each do |suggestion| %>
+* <%= suggestion.account.display_name.presence || suggestion.account.username %> · @<%= suggestion.account.pretty_acct %>
+  <%= web_url("@#{suggestion.account.acct}") %>
+<%- end %>
+
+<%= web_url('explore/suggestions') %>
 
 ---
 
-<%= t 'user_mailer.welcome.edit_profile_step' %>
+<%= t('user_mailer.welcome.hashtags_title') %>
+===
+<%= t('user_mailer.welcome.hashtags_subtitle') %>
 
-=> <%= settings_profile_url %>
+<%- @tags.each do |tag| %>
+* #<%= tag.display_name %> · <%= t('user_mailer.welcome.hashtags_recent_count', people: number_with_delimiter(tag.history.aggregate(2.days.ago.to_date..Time.zone.today).accounts), days: 2) %>
+  <%= tag_url(tag) %>
+<%- end %>
 
-<%= t 'user_mailer.welcome.final_step' %>
+<%= web_url('explore/tags') %>
 
-=> <%= web_url %>
+---
+
+<%= t('user_mailer.welcome.feature_control_title') %>
+===
+<%= word_wrap t('user_mailer.welcome.feature_control') %>
+
+<%= t('user_mailer.welcome.feature_audience_title') %>
+===
+<%= word_wrap t('user_mailer.welcome.feature_audience') %>
+
+<%= t('user_mailer.welcome.feature_moderation_title') %>
+===
+<%= word_wrap t('user_mailer.welcome.feature_moderation') %>
+
+<%= t('user_mailer.welcome.feature_creativity_title') %>
+===
+<%= word_wrap t('user_mailer.welcome.feature_creativity') %>
diff --git a/config/locales/an.yml b/config/locales/an.yml
index 17077041da5f25..edfdb44b35aa82 100644
--- a/config/locales/an.yml
+++ b/config/locales/an.yml
@@ -1600,10 +1600,6 @@ an:
       edit_profile_action: Configurar lo perfil
       edit_profile_step: Puetz personalizar lo tuyo perfil puyando una foto de perfil, cambiando lo tuyo nombre d'usuario y muito mas. Puetz optar per revisar a los nuevos seguidores antes que puedan seguir-te.
       explanation: Aquí i hai qualques consellos pa empecipiar
-      final_action: Empecipiar a publicar
-      final_step: 'Empecipia a publicar! Mesmo sin seguidores, las tuyas publicacions publicas pueden estar vistas per atros, per eixemplo en a linia de tiempo local u en etiquetas. Tal vegada quieras presentar-te con a etiqueta de #presentacions.'
-      full_handle: Lo suyo sobrenombre completo
-      full_handle_hint: Esto ye lo que le dirías a los tuyos amigos pa que ells puedan ninviar-te mensaches u seguir-te dende unatra instancia.
       subject: Bienveniu a Mastodon
       title: Te damos la bienvenida a bordo, %{name}!
   users:
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 0927fba0af0c44..2b2052172e22fe 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -1969,10 +1969,6 @@ ar:
       edit_profile_action: تهيئة الملف التعريفي
       edit_profile_step: يمكنك تخصيص ملفك الشخصي عن طريق رفع صورة ملفك الشخصي, تغيير اسم العرض الخاص بك والمزيد. يمكنك اختيار مراجعة المتابعين الجدد قبل السماح لهم بمتابعتك.
       explanation: ها هي بعض النصائح قبل بداية الاستخدام
-      final_action: اشرَع في النشر
-      final_step: 'ابدأ في النشر! حتى بدون متابعين، منشوراتك العامة قد يشاهدها آخرون، على سبيل المثال في التوقيت المحلي أو في الوسوم. قد ترغب في تقديم نفسك على وسم #introductions.'
-      full_handle: عنوانك الكامل
-      full_handle_hint: هذا هو ما يجب تقديمه لأصدقائك قصد أن يكون بإمكانهم متابَعتك أو مُراسَلتك حتى و إن كانت حساباتهم على خوادم أخرى.
       subject: أهلًا بك على ماستدون
       title: أهلاً بك، %{name}!
   users:
diff --git a/config/locales/ast.yml b/config/locales/ast.yml
index 7e5a4c88768657..da7e99c2fac5a4 100644
--- a/config/locales/ast.yml
+++ b/config/locales/ast.yml
@@ -903,7 +903,6 @@ ast:
       edit_profile_action: Configurar el perfil
       edit_profile_step: Pues personalizar el perfil pente la xuba d'una semeya, el cambéu del nome visible ya muncho más. Tamién, si lo prefieres, pues revisar los perfiles nuevos enantes de que puedan siguite.
       explanation: Equí tienes dalgunos conseyos pa que comiences
-      final_action: Comenzar a espublizar
       subject: Afáyate en Mastodon
       title: "¡Afáyate, %{name}!"
   users:
diff --git a/config/locales/be.yml b/config/locales/be.yml
index 13cbcd8ffcf2f3..34e0722ba9e373 100644
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -1910,10 +1910,6 @@ be:
       edit_profile_action: Наладзіць профіль
       edit_profile_step: Вы можаце наладзіць свой профіль, запампаваўшы выяву профілю, змяніўшы адлюстраванае імя і іншае. Вы можаце праглядаць новых падпісчыкаў, перш чым ім будзе дазволена падпісацца на вас.
       explanation: Вось некаторыя парады каб пачаць
-      final_action: Пачаць пісаць
-      final_step: 'Пачынайце пісаць! Нават, калі ў вас няма падпісчыкаў, іншыя людзі змогуць пабачыць вашыя допісы, напрыклад, у лакальнай стужцы, або праз хэштэгі. Калі хочаце, вы можаце прадставіцца праз хэштэг #introductions.'
-      full_handle: Ваш поўны маркер
-      full_handle_hint: Гэта тое, што вы дасце сваім сябрам, каб яны маглі адпраўляць паведамленні або падпісацца на вас з іншага сервера.
       subject: Вітаем у Mastodon
       title: Рады вітаць вас, %{name}!
   users:
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index b1229ac906a838..15c671d5392fe3 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -1841,10 +1841,6 @@ bg:
       edit_profile_action: Настройване на профила
       edit_profile_step: Може да настроите профила си, качвайки снимката на профила, променяйки показваното си име и други неща. Може да се включите за преглед на нови последователи преди да бъдат позволени да ви последват.
       explanation: Ето няколко стъпки за начало
-      final_action: Начало на публикуване
-      final_step: 'Публикувайте! Дори без да имате последователи, вашите публични публикации ще бъдат видени от други, например в местната хронология или под хаштагове. Не забравяйте да се представите с хаштаг #introductions.'
-      full_handle: Пълното ви име
-      full_handle_hint: Ето какво бихте казали на приятелите си, за да могат да ви изпращат съобщения или да ви последват от друг сървър.
       subject: Добре дошли в Mastodon
       title: Добре дошли на борда, %{name}!
   users:
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 4b5ec815ca50b0..d80fb598e381ee 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -1846,10 +1846,6 @@ ca:
       edit_profile_action: Configura el perfil
       edit_profile_step: Pots personalitzar el teu perfil pujant-hi un avatar, canviant el teu nom de visualització i molt més. Si ho prefereixes, pots revisar els seguidors nous abans que et puguin seguir.
       explanation: Aquests són alguns consells per a començar
-      final_action: Comença a publicar
-      final_step: 'Comença a publicar! Fins i tot sense seguidors, els altres poden veure els teus missatges públics, per exemple, a la línia de temps local i a les etiquetes. És possible que vulguis presentar-te amb l''etiqueta #introductions.'
-      full_handle: El teu nom d'usuari sencer
-      full_handle_hint: Això és el que has de dir als teus amics perquè puguin enviar-te missatges o seguir-te des d'un altre servidor.
       subject: Et donem la benvinguda a Mastodon
       title: Benvingut a bord, %{name}!
   users:
diff --git a/config/locales/ckb.yml b/config/locales/ckb.yml
index 72a3c08d4d31f8..fec8f73323e71f 100644
--- a/config/locales/ckb.yml
+++ b/config/locales/ckb.yml
@@ -1035,9 +1035,6 @@ ckb:
     welcome:
       edit_profile_action: پرۆفایلی جێگیرکردن
       explanation: ئەمە چەند ئامۆژگارییەکن بۆ دەست پێکردنت
-      final_action: دەست بکە بە بڵاوکردنەوە
-      full_handle: ناوی بەکارهێنەری تەواوی ئێوە
-      full_handle_hint: ئەمە ئەو شتەیە کە بە هاوڕێکانت دەلێی بۆ ئەوەی پەیام یان لە ڕاژەیەکی دیکەی ترەوە بەدوات بکەون.
       subject: بەخێربیت بۆ ماستۆدۆن
       title: بەخێربێیت، بەکارهێنەر %{name}!
   users:
diff --git a/config/locales/co.yml b/config/locales/co.yml
index f5b6b46d920ab6..c3c185c2f5861d 100644
--- a/config/locales/co.yml
+++ b/config/locales/co.yml
@@ -1050,9 +1050,6 @@ co:
     welcome:
       edit_profile_action: Cunfigurazione di u prufile
       explanation: Eccu alcune idee per principià
-      final_action: Principià à pustà
-      full_handle: U vostru identificatore cumplettu
-      full_handle_hint: Quessu ghjè cio chì direte à i vostri amichi per circavi, abbunassi à u vostru contu da altrò, o mandà missaghji.
       subject: Benvenutu·a nant’à Mastodon
       title: Benvenutu·a, %{name}!
   users:
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index e43f671590d64b..69640a261f9ada 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -1910,10 +1910,6 @@ cs:
       edit_profile_action: Nastavit profil
       edit_profile_step: Váš profil si můžete přizpůsobit nahráním profilového obrázku, změnou zobrazovaného jména a dalším. Můžete se přihlásit k přezkoumání nových následovatelů, než vás budou moci následovat.
       explanation: Zde je pár tipů do začátku
-      final_action: Začít psát
-      final_step: 'Začněte psát příspěvky! I bez sledujících mohou vaše veřejné příspěvky vidět ostatní, například na místní časové ose nebo v hashtagu. Možná se budete chtít představit na hashtagu #představení.'
-      full_handle: Vaše celá adresa profilu
-      full_handle_hint: Tohle je, co byste řekli svým přátelům, aby vám mohli posílat zprávy nebo vás sledovat z jiného serveru.
       subject: Vítejte na Mastodonu
       title: Vítejte na palubě, %{name}!
   users:
diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index 1fbcbb225538ce..19343146f3a11d 100644
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@@ -1974,10 +1974,6 @@ cy:
       edit_profile_action: Sefydlu proffil
       edit_profile_step: Gallwch addasu'ch proffil trwy lwytho llun proffil, newid eich enw dangos a mwy. Gallwch ddewis i adolygu dilynwyr newydd cyn iddyn nhw gael caniatâd i'ch dilyn.
       explanation: Dyma ambell nodyn i'ch helpu i ddechrau
-      final_action: Dechrau postio
-      final_step: 'Dechreuwch bostio! Hyd yn oed heb ddilynwyr, efallai y bydd eraill yn gweld eich postiadau cyhoeddus, er enghraifft ar y ffrwd leol neu mewn hashnodau. Efallai y byddwch am gyflwyno eich hun ar yr hashnod #cyflwyniadau neu/a #introductions.'
-      full_handle: Eich enw llawn
-      full_handle_hint: Dyma beth fyddech chi'n ei ddweud wrth eich ffrindiau fel y gallant anfon neges neu eich dilyn o weinydd arall.
       subject: Croeso i Mastodon
       title: Croeso, %{name}!
   users:
diff --git a/config/locales/da.yml b/config/locales/da.yml
index 5ceaad970594d8..62e28cef165beb 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -1846,10 +1846,6 @@ da:
       edit_profile_action: Opsæt profil
       edit_profile_step: Man kan tilpasse sin profil ved at uploade profilfoto, overskrift, ændre visningsnavn mv. Ønskes nye følgere vurderet, før de må følge dig, kan kontoen låses.
       explanation: Her er nogle råd for at få dig i gang
-      final_action: Begynd at poste
-      final_step: 'Begynd at poste! Selv uden følgere vil offentlige indlæg kunne ses af andre f.eks. på den lokale tidslinje og i hashtags. Man kan introducere sig selv via hastagget #introductions.'
-      full_handle: Dit fulde brugernavn
-      full_handle_hint: Dette er, hvad du oplyser til dine venner, så de kan sende dig beskeder eller følge dig fra andre servere.
       subject: Velkommen til Mastodon
       title: Velkommen ombord, %{name}!
   users:
diff --git a/config/locales/de.yml b/config/locales/de.yml
index ae1af7b3087f4f..123942672e78c6 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -1846,10 +1846,6 @@ de:
       edit_profile_action: Profil einrichten
       edit_profile_step: Du kannst dein Profil anpassen, indem du ein Profilbild hochlädst, deinen Anzeigenamen änderst und vieles mehr. Du kannst dich dafür entscheiden, neue Follower zu überprüfen, bevor sie dir folgen dürfen.
       explanation: Hier sind ein paar Tipps, um loszulegen
-      final_action: Mit erstem Beitrag starten
-      final_step: 'Fang jetzt an zu posten! Selbst ohne Follower werden deine öffentlichen Beiträge von anderen gesehen, zum Beispiel in der lokalen Timeline oder über die Hashtags. Möglicherweise möchtest du dich allen mit dem Hashtag #neuhier vorstellen.'
-      full_handle: Dein vollständiger Profilname
-      full_handle_hint: Deinen vollständigen Profilnamen kannst du deinen Freund*innen mitteilen, damit sie dich anschreiben oder dir von einem anderen Server folgen können.
       subject: Willkommen bei Mastodon!
       title: Willkommen an Bord, %{name}!
   users:
diff --git a/config/locales/el.yml b/config/locales/el.yml
index 16c042f1856381..c641d4dca96812 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -1707,10 +1707,6 @@ el:
       edit_profile_action: Στήσιμο προφίλ
       edit_profile_step: Μπορείς να προσαρμόσεις το προφίλ σου ανεβάζοντας μια εικόνα προφίλ, αλλάζοντας το εμφνιζόμενο όνομα και άλλα. Μπορείς να επιλέξεις να αξιολογείς νέους ακόλουθους πριν τους επιτραπεί να σε ακολουθήσουν.
       explanation: Μερικές συμβουλές για να ξεκινήσεις
-      final_action: Ξεκίνα να αναρτάς
-      final_step: 'Ξεκίνα να δημοσιεύεις! Ακόμα και χωρίς ακόλουθους τις δημόσιες δημοσιεύσεις σου μπορεί να τις δουν άλλοι, για παράδειγμα στην τοπική ροή ή στις ετικέτες. Ίσως να θέλεις να μας γνωρίσεις τον εαυτό σου με την ετικέτα #introductions.'
-      full_handle: Το πλήρες όνομά σου
-      full_handle_hint: Αυτό θα εδώ θα πεις στους φίλους σου για να σου μιλήσουν ή να σε ακολουθήσουν από άλλο διακομιστή.
       subject: Καλώς ήρθες στο Mastodon
       title: Καλώς όρισες, %{name}!
   users:
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index d4840c84e99bb1..6b2554fe153eea 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -1841,10 +1841,6 @@ en-GB:
       edit_profile_action: Setup profile
       edit_profile_step: You can customise your profile by uploading a profile picture, changing your display name and more. You can opt-in to review new followers before they’re allowed to follow you.
       explanation: Here are some tips to get you started
-      final_action: Start posting
-      final_step: 'Start posting! Even without followers, your public posts may be seen by others, for example on the local timeline or in hashtags. You may want to introduce yourself on the #introductions hashtag.'
-      full_handle: Your full handle
-      full_handle_hint: This is what you would tell your friends so they can message or follow you from another server.
       subject: Welcome to Mastodon
       title: Welcome aboard, %{name}!
   users:
diff --git a/config/locales/en.yml b/config/locales/en.yml
index efd603740a76cf..cff244a4b9d86c 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1844,13 +1844,42 @@ en:
         silence: Account limited
         suspend: Account suspended
     welcome:
-      edit_profile_action: Setup profile
-      edit_profile_step: You can customize your profile by uploading a profile picture, changing your display name and more. You can opt-in to review new followers before they’re allowed to follow you.
+      apps_android_action: Get it on Google Play
+      apps_ios_action: Download on the App Store
+      apps_step: Download our official apps.
+      apps_title: Mastodon apps
+      checklist_subtitle: 'Let''s get you started on this new social frontier:'
+      checklist_title: Welcome Checklist
+      edit_profile_action: Personalize
+      edit_profile_step: Boost your interactions by having a comprehensive profile.
+      edit_profile_title: Personalize your profile
       explanation: Here are some tips to get you started
-      final_action: Start posting
-      final_step: 'Start posting! Even without followers, your public posts may be seen by others, for example on the local timeline or in hashtags. You may want to introduce yourself on the #introductions hashtag.'
-      full_handle: Your full handle
-      full_handle_hint: This is what you would tell your friends so they can message or follow you from another server.
+      feature_action: Learn more
+      feature_audience: Mastodon provides you with a unique possibility of managing your audience without middlemen. Mastodon deployed on your own infrastructure allows you to follow and be followed from any other Mastodon server online and is under no one's control but yours.
+      feature_audience_title: Build your audience in confidence
+      feature_control: You know best what you want to see on your home feed. No algorithms or ads to waste your time. Follow anyone across any Mastodon server from a single account and receive their posts in chronological order, and make your corner of the internet a little more like you.
+      feature_control_title: Stay in control of your own timeline
+      feature_creativity: Mastodon supports audio, video and picture posts, accessibility descriptions, polls, content warnings, animated avatars, custom emojis, thumbnail crop control, and more, to help you express yourself online. Whether you're publishing your art, your music, or your podcast, Mastodon is there for you.
+      feature_creativity_title: Unparalleled creativity
+      feature_moderation: Mastodon puts decision making back in your hands. Each server creates their own rules and regulations, which are enforced locally and not top-down like corporate social media, making it the most flexible in responding to the needs of different groups of people. Join a server with the rules you agree with, or host your own.
+      feature_moderation_title: Moderating the way it should be
+      follow_action: Follow
+      follow_step: Following interesting people is what Mastodon is all about.
+      follow_title: Personalize your home feed
+      follows_subtitle: Follow well-known accounts
+      follows_title: Who to follow
+      follows_view_more: View more people to follow
+      hashtags_recent_count: "%{people} people in the past %{days} days"
+      hashtags_subtitle: Explore what’s trending since past 2 days
+      hashtags_title: Trending hashtags
+      hashtags_view_more: View more trending hashtags
+      post_action: Compose
+      post_step: Say hello to the world with text, photos, videos, or polls.
+      post_title: Make your first post
+      share_action: Share
+      share_step: Let your friends know how to find you on Mastodon.
+      share_title: Share your Mastodon profile
+      sign_in_action: Sign in
       subject: Welcome to Mastodon
       title: Welcome aboard, %{name}!
   users:
diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index beb6aa6d9f278d..bc694578b74b6d 100644
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -1763,10 +1763,6 @@ eo:
       edit_profile_action: Agordi profilon
       edit_profile_step: Vi povas personecigi vian profilon per alŝuti profilbildon, ŝangi vian montronomo kaj pli.
       explanation: Jen kelkaj konsiloj por helpi vin komenci
-      final_action: Ekmesaĝi
-      final_step: 'Ekmesaĝu! Eĉ sen sekvantoj, viaj publikaj mesaĝoj povas esti vidataj de aliaj, ekzemple en la loka templinio aŭ per kradvortoj. Eble vi ŝatus prezenti vin per la kradvorto #introductions / #konigo.'
-      full_handle: Via kompleta uzantnomo
-      full_handle_hint: Jen kion vi dirus al viaj amikoj, por ke ili mesaĝu aŭ sekvu vin de alia servilo.
       subject: Bonvenon en Mastodon
       title: Bonvenon, %{name}!
   users:
diff --git a/config/locales/es-AR.yml b/config/locales/es-AR.yml
index 1db8e6ecf855d5..37fcc11d782eb0 100644
--- a/config/locales/es-AR.yml
+++ b/config/locales/es-AR.yml
@@ -1846,10 +1846,6 @@ es-AR:
       edit_profile_action: Configurar perfil
       edit_profile_step: Podés personalizar tu perfil subiendo un avatar (imagen de perfil), cambiando tu nombre a mostrar y más. Podés optar por revisar a los nuevos seguidores antes de que puedan seguirte.
       explanation: Aquí hay algunos consejos para empezar
-      final_action: Empezá a enviar mensajes
-      final_step: "¡Empezá a enviar mensajes! Incluso sin seguidores, tus mensajes públicos pueden ser vistos por otros, por ejemplo en la linea temporal local o al usar etiquetas. Capaz que quieras presentarte al mundo con la etiqueta «#presentación»."
-      full_handle: Tu nombre de usuario completo
-      full_handle_hint: Esto es lo que le dirás a tus contactos para que ellos puedan enviarte mensajes o seguirte desde otro servidor.
       subject: Bienvenido a Mastodon
       title: "¡Bienvenido a bordo, %{name}!"
   users:
diff --git a/config/locales/es-MX.yml b/config/locales/es-MX.yml
index db5c05322ba55c..26dbc2dfb8e4de 100644
--- a/config/locales/es-MX.yml
+++ b/config/locales/es-MX.yml
@@ -1846,10 +1846,6 @@ es-MX:
       edit_profile_action: Configurar el perfil
       edit_profile_step: Puedes personalizar tu perfil subiendo una foto de perfil, cambiando tu nombre de usuario y mucho más. Puedes optar por revisar a los nuevos seguidores antes de que puedan seguirte.
       explanation: Aquí hay algunos consejos para empezar
-      final_action: Empezar a publicar
-      final_step: "¡Empieza a publicar! Incluso sin seguidores, tus publicaciones públicas pueden ser vistas por otros, por ejemplo en la línea de tiempo local o en etiquetas. Tal vez quieras presentarte con la etiqueta de #introducciones."
-      full_handle: Su sobrenombre completo
-      full_handle_hint: Esto es lo que le dirías a tus amigos para que ellos puedan enviarte mensajes o seguirte desde otra instancia.
       subject: Bienvenido a Mastodon
       title: Te damos la bienvenida a bordo, %{name}!
   users:
diff --git a/config/locales/es.yml b/config/locales/es.yml
index e5ccee5ee3e354..795658013832d8 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -1846,10 +1846,6 @@ es:
       edit_profile_action: Configurar el perfil
       edit_profile_step: Puedes personalizar tu perfil subiendo una foto de perfil, cambiando tu nombre de usuario y mucho más. Puedes optar por revisar a los nuevos seguidores antes de que puedan seguirte.
       explanation: Aquí hay algunos consejos para empezar
-      final_action: Empezar a publicar
-      final_step: "¡Empieza a publicar! Incluso sin seguidores, tus publicaciones públicas pueden ser vistas por otros, por ejemplo en la línea de tiempo local o en etiquetas. Tal vez quieras presentarte con la etiqueta de #presentación."
-      full_handle: Su sobrenombre completo
-      full_handle_hint: Esto es lo que le dirías a tus amigos para que ellos puedan enviarte mensajes o seguirte desde otra instancia.
       subject: Bienvenido a Mastodon
       title: Te damos la bienvenida a bordo, %{name}!
   users:
diff --git a/config/locales/et.yml b/config/locales/et.yml
index c21ea0b971264a..ed25488ce43966 100644
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -1846,10 +1846,6 @@ et:
 
         Kui mõni asi arusaamatuks jääb, siis võib vaadata juhendvideot: https://youtu.be/J4ItbTOAw7Q
       explanation: Siin on mõned nõuanded, mis aitavad alustada
-      final_action: Alusta postitamist
-      final_step: 'Nüüd tee oma esimene postitus. Hea tava on uues kohas ennast tutvustada ning kindlasti kasuta selles postituses ka silti #tutvustus. Isegi kui sul ei ole veel jälgijaid, siis su postitusi näevad kohalikul ajajoonel ka kõik teised serveri kasutajad.'
-      full_handle: Kasutajanimi Mastodon võrgustikus
-      full_handle_hint: Kui jagad kasutajanime väljaspool serverit, siis kasuta kindlasti pikka nime. Erinevates serverites võib olla sama kasutajanimega liikmeid.
       subject: Tere tulemast Mastodoni
       title: Tere tulemast, %{name}!
   users:
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index 6c625d08bda216..fb3013e0084232 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -1847,10 +1847,6 @@ eu:
       edit_profile_action: Ezarri profila
       edit_profile_step: Pertsonalizatu profila abatar bat igoz, zure pantaila-izena aldatuz eta gehiago. Jarraitzaile berriak onartu aurretik berrikusi nahi badituzu, kontuari giltzarrapoa jarri diezaiokezu.
       explanation: Hona hasteko aholku batzuk
-      final_action: Hasi bidalketak argitaratzen
-      final_step: 'Hasi argitaratzen! Jarraitzailerik ez baduzu ere zure bidalketa publikoak besteek ikusi ditzakete, esaterako denbora-lerro lokalean eta traoletan. Zure burua aurkeztu nahi baduzu #aurkezpenak traola erabili zenezake.'
-      full_handle: Helbide osoa
-      full_handle_hint: Hau da lagunei esango zeniekeena beste zerbitzari batetik zu jarraitzeko edo zuri mezuak bidaltzeko.
       subject: Ongi etorri Mastodon-era
       title: Ongi etorri, %{name}!
   users:
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index f6ff3797455557..4339e06c3471a2 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -1579,10 +1579,6 @@ fa:
       edit_profile_action: تنظیم نمایه
       edit_profile_step: می‌توانید نمایه‌تان را با بارگذاری تصویر نمایه، تغییر نام نمایشی و بیش از این‌‌ها سفارشی کنید. می‌توانید تعیین کنید که پی‌گیران جدید را پیش‌از این که بتوانند دنبالتان کنند بازبینی کنید.
       explanation: نکته‌هایی که برای آغاز کار به شما کمک می‌کنند
-      final_action: چیزی منتشر کنید
-      final_step: 'چیزی بنویسید! حتا بدون پی‌گیر ممکن است فرسته‌های عمومیتان دیده شود. برای مثال روی خط زمانی محلی یا در برچسب‌ها. شاید بخواهید با برچسب #معرفی خودتان را معرّفی کنید.'
-      full_handle: نام کاربری کامل شما
-      full_handle_hint: این چیزی است که باید به دوستانتان بگویید تا بتوانند از کارسازی دیگر به شما پیام داده یا پی‌گیرتان شوند.
       subject: به ماستودون خوش آمدید
       title: خوش آمدید، کاربر %{name}!
   users:
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index ad6d6e9c07ebcc..dc303991bcea68 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -1846,10 +1846,6 @@ fi:
       edit_profile_action: Määritä profiili
       edit_profile_step: Voit mukauttaa profiiliasi muun muassa profiilikuvalla ja uudella näyttönimellä. Voit myös valita, haluatko tarkastaa ja hyväksyä uudet seuraajat itse.
       explanation: Näillä vinkeillä pääset alkuun
-      final_action: Ala julkaista
-      final_step: 'Ala julkaista! Vaikkei sinulla olisi seuraajia, voivat muut nähdä julkisia julkaisujasi esimerkiksi paikallisella aikajanalla tai aihetunnisteissa. Kannattaa myös esitellä itsensä aihetunnisteella #esittely.'
-      full_handle: Koko käyttäjätunnuksesi
-      full_handle_hint: Kerro tämä kavereillesi, niin he voivat lähettää sinulle viestejä tai seurata sinua toiselta palvelimelta.
       subject: Tervetuloa Mastodoniin
       title: Tervetuloa mukaan, %{name}!
   users:
diff --git a/config/locales/fo.yml b/config/locales/fo.yml
index 555b82a79d572b..6a8dd9b2ee69a9 100644
--- a/config/locales/fo.yml
+++ b/config/locales/fo.yml
@@ -1846,10 +1846,6 @@ fo:
       edit_profile_action: Set upp vanga
       edit_profile_step: Tú kanst tillaga vanga tín við at leggja eina vangamynd inn, broyta vísta navnið hjá tær og meira. Tú kanst velja at eftirkanna nýggjar fylgjarar, áðrenn teir sleppa at fylgja tær.
       explanation: Her eru nøkur ráð so tú kann koma gott ígongd
-      final_action: Byrja at posta
-      final_step: 'Byrja at posta! Sjálvt uttan fylgjarar, so kunnu tínir almennu postar vera sæddir av øðrum, til dømis á lokalu tíðarlinjuni ella í frámerkjum. Kanska vilt tú greiða frá um teg sjálva/n við frámerkinum #introductions.'
-      full_handle: Fulla brúkaranavn títt
-      full_handle_hint: Hetta er tað, sum tú fortelur vinum tínum, soleiðis at tey kunnu senda tær boð ella fylgja tær frá einum øðrum ambætara.
       subject: Vælkomin til Mastodon
       title: Vælkomin umborð, %{name}!
   users:
diff --git a/config/locales/fr-CA.yml b/config/locales/fr-CA.yml
index 3676d0b7b5d01b..97cb08c9184b93 100644
--- a/config/locales/fr-CA.yml
+++ b/config/locales/fr-CA.yml
@@ -1841,10 +1841,6 @@ fr-CA:
       edit_profile_action: Configuration du profil
       edit_profile_step: Vous pouvez personnaliser votre profil en téléchargeant une photo de profil, en changant votre nom d'utilisateur, etc. Vous pouvez opter pour le passage en revue de chaque nouvelle demande d'abonnement à chaque fois qu'un utilisateur essaie de s'abonner à votre compte.
       explanation: Voici quelques conseils pour vous aider à démarrer
-      final_action: Commencez à publier
-      final_step: 'Commencez à publier ! Même si vous n''avez pas encore d''abonnés, vos publications sont publiques et sont accessibles par les autres, par exemple grâce à la zone horaire locale ou par les hashtags. Vous pouvez vous présenter sur le hashtag #introductions.'
-      full_handle: Votre identifiant complet
-      full_handle_hint: C’est ce que vous diriez à vos ami·e·s pour leur permettre de vous envoyer un message ou vous suivre à partir d’un autre serveur.
       subject: Bienvenue sur Mastodon
       title: Bienvenue à bord, %{name} !
   users:
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index a3aaf7a26e4d04..b085937c767473 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -1841,10 +1841,6 @@ fr:
       edit_profile_action: Configuration du profil
       edit_profile_step: Vous pouvez personnaliser votre profil en téléchargeant une photo de profil, en changant votre nom d'utilisateur, etc. Vous pouvez opter pour le passage en revue de chaque nouvelle demande d'abonnement à chaque fois qu'un utilisateur essaie de s'abonner à votre compte.
       explanation: Voici quelques conseils pour vous aider à démarrer
-      final_action: Commencez à publier
-      final_step: 'Commencez à publier ! Même si vous n''avez pas encore d''abonnés, vos publications sont publiques et sont accessibles par les autres, par exemple grâce à la zone horaire locale ou par les hashtags. Vous pouvez vous présenter sur le hashtag #introductions.'
-      full_handle: Votre identifiant complet
-      full_handle_hint: C’est ce que vous diriez à vos ami·e·s pour leur permettre de vous envoyer un message ou vous suivre à partir d’un autre serveur.
       subject: Bienvenue sur Mastodon
       title: Bienvenue à bord, %{name} !
   users:
diff --git a/config/locales/fy.yml b/config/locales/fy.yml
index 2cbb69010d45d4..caa88dcfe44fee 100644
--- a/config/locales/fy.yml
+++ b/config/locales/fy.yml
@@ -1841,10 +1841,6 @@ fy:
       edit_profile_action: Profyl ynstelle
       edit_profile_step: Jo kinne jo profyl oanpasse troch in profylfoto op te laden, jo werjeftenamme oan te passen en mear. Jo kinne it hânmjittich goedkarren fan folgers ynstelle.
       explanation: Hjir binne inkelde tips om jo op wei te helpen
-      final_action: Begjin mei berjochten te pleatsen
-      final_step: 'Begjin berjochten te pleatsen! Sels sûnder folgers kinne jo iepenbiere berjochten troch oaren besjoen wurde, bygelyks op de lokale tiidline en ûnder hashtags. Jo kinne josels foarstelle mei it gebrûk fan de hashtag #introductions.'
-      full_handle: Jo folsleine Mastodon-adres
-      full_handle_hint: Dit jouwe jo oan jo freonen, sadat se jo berjochten stjoere kinne of (fan in oare Mastodon-server ôf) folgje kinne.
       subject: Wolkom op Mastodon
       title: Wolkom oan board %{name}!
   users:
diff --git a/config/locales/gd.yml b/config/locales/gd.yml
index d3dab8273da389..e2a43564c0c3a5 100644
--- a/config/locales/gd.yml
+++ b/config/locales/gd.yml
@@ -1880,10 +1880,6 @@ gd:
       edit_profile_action: Suidhich a’ phròifil agad
       edit_profile_step: "’S urrainn dhut a’ phròifil agad a ghnàthachadh is tu a’ luchdadh suas dealbh pròifil, ag atharrachadh d’ ainm-taisbeanaidh is a bharrachd. ’S urrainn dhut lèirmheas a dhèanamh air daoine mus fhaod iad ’gad leantainn ma thogras tu."
       explanation: Seo gliocas no dhà gus tòiseachadh
-      final_action: Tòisich air postadh
-      final_step: 'Tòisich air postadh! Fiù ’s mur eil duine sam bith ’gad leantainn, chì cuid mhath na postaichean poblach agad, can air an loidhne-ama ionadail no le tagaichean hais. Saoil an innis thu beagan mu d’ dhèidhinn air an taga hais #fàilte?'
-      full_handle: D’ ainm-cleachdaiche slàn
-      full_handle_hint: Seo na bheir thu dha na caraidean agad ach an urrainn dhaibh teachdaireachd a chur thugad no ’gad leantainn o fhrithealaiche eile.
       subject: Fàilte gu Mastodon
       title: Fàilte air bòrd, %{name}!
   users:
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 705f0ef4e919cb..8520b90ead0f2c 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -1846,10 +1846,6 @@ gl:
       edit_profile_action: Configurar perfil
       edit_profile_step: Podes personalizar o teu perfil subindo unha imaxe de perfil, cambiar o nome público e moito máis. Podes elexir revisar as solicitudes de seguimento recibidas antes de permitirlles que te sigan.
       explanation: Aquí tes algunhas endereitas para ir aprendendo
-      final_action: Comeza a publicar
-      final_step: 'Publica! Incluso sen seguidoras, as túas mensaxes públicas serán vistas por outras persoas, por exemplo na cronoloxía local e nos cancelos. Poderías presentarte ao #fediverso utilizando o cancelo #introductions.'
-      full_handle: O teu alcume completo
-      full_handle_hint: Compárteo coas túas amizades para que poidan seguirte ou enviarche mensaxes desde outros servidores.
       subject: Benvida a Mastodon
       title: Benvida, %{name}!
   users:
diff --git a/config/locales/he.yml b/config/locales/he.yml
index b5a98dd24d5a56..55ab576142dcb8 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -1910,10 +1910,6 @@ he:
       edit_profile_action: הגדרת פרופיל
       edit_profile_step: תוכל.י להתאים אישית את הפרופיל באמצעות העלאת יצגן (אוואטר), כותרת, שינוי כינוי ועוד. אם תרצה.י לסקור את עוקביך/ייך החדשים לפני שתרשה.י להם לעקוב אחריך/ייך.
       explanation: הנה כמה טיפים לעזור לך להתחיל
-      final_action: התחל/ילי לחצרץ
-      final_step: 'התחל/ילי לחצצר! אפילו ללא עוקבים ייתכן שהחצרוצים הפומביים שלך יראו ע"י אחרים, למשל בציר הזמן המקומי או בתגיות הקבצה (האשתגים). כדאי להציג את עצמך תחת התגית #introductions או #היכרות'
-      full_handle: שם המשתמש המלא שלך
-      full_handle_hint: זה מה שתאמר.י לחברייך כדי שיוכלו לשלוח לך הודעה או לעקוב אחרייך ממופע אחר.
       subject: ברוכים הבאים למסטודון
       title: ברוך/ה הבא/ה, %{name} !
   users:
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 456636d4c5b040..733d883da06c92 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -1846,10 +1846,6 @@ hu:
       edit_profile_action: Készítsd el profilod
       edit_profile_step: Testreszabhatod a profilod egy profilkép feltöltésével, a megjelenített neved megváltoztatásával és így tovább. Bekapcsolhatod az új követőid jóváhagyását, mielőtt követhetnek.
       explanation: Néhány tipp a kezdeti lépésekhez
-      final_action: Kezdj bejegyzéseket írni
-      final_step: 'Kezdj tülkölni! A nyilvános bejegyzéseid még követők híján is megjelennek másoknak, például a helyi idővonalon vagy a hashtageknél. Kezdd azzal, hogy bemutatkozol a #bemutatkozas vagy az #introductions hashtag használatával.'
-      full_handle: Teljes felhasználóneved
-      full_handle_hint: Ez az, amit megadhatsz másoknak, hogy üzenhessenek neked vagy követhessenek téged más szerverekről.
       subject: Üdvözöl a Mastodon
       title: Üdv a fedélzeten, %{name}!
   users:
diff --git a/config/locales/hy.yml b/config/locales/hy.yml
index f3a6392ff09e0d..b0d8f008641ffd 100644
--- a/config/locales/hy.yml
+++ b/config/locales/hy.yml
@@ -875,7 +875,6 @@ hy:
         suspend: Հաշիւը արգելափակուած է
     welcome:
       edit_profile_action: Կարգաւորել հաշիւը
-      final_action: Սկսել գրել
       subject: Բարի գալուստ Մաստոդոն
       title: Բարի գալուստ նաւամատոյց, %{name}
   users:
diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index a85af012f3be7a..52cf861b48e5b1 100644
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -256,7 +256,6 @@ ia:
     disable: Disactivar 2FA
   user_mailer:
     welcome:
-      final_step: 'Comencia a publicar! Mesmo sin sequitores, tu messages public poterea esser reguardate per alteres, per exemplo in le chronologia local o in hashtags. Tu poterea voler introducer te con le hashtag #introductiones.'
       subject: Benvenite in Mastodon
   webauthn_credentials:
     delete: Deler
diff --git a/config/locales/id.yml b/config/locales/id.yml
index ec8cf9e0316659..e7f42e115b0760 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -1560,10 +1560,6 @@ id:
       edit_profile_action: Siapkan profil
       edit_profile_step: Anda dapat mengubah profil Anda dengan mengunggah sebuah foto profil, mengubah nama tampilan Anda dan lain-lain. Anda dapat memilih untuk meninjau pengikut baru sebelum mereka diperbolehkan untuk mengikuti Anda.
       explanation: Beberapa tips sebelum Anda memulai
-      final_action: Mulai mengirim
-      final_step: 'Mulai mengirim! Bahkan tanpa pengikut, kiriman publik Anda dapat dilihat oleh orang lain, misalkan di linimasa lokal atau dalam tagar. Anda dapat memperkenalkan diri Anda dalam tagar #introductions.'
-      full_handle: Penanganan penuh Anda
-      full_handle_hint: Ini yang dapat Anda sampaikan kepada teman agar mereka dapat mengirim pesan atau mengikuti Anda dari server lain.
       subject: Selamat datang di Mastodon
       title: Selamat datang, %{name}!
   users:
diff --git a/config/locales/ie.yml b/config/locales/ie.yml
index 4b84d53bd5481c..eec8569bb28a39 100644
--- a/config/locales/ie.yml
+++ b/config/locales/ie.yml
@@ -1846,10 +1846,6 @@ ie:
       edit_profile_action: Configuration de profil
       edit_profile_step: Tu posse personalisar tui profil por cargar un profil-image, changear tui monstrat nómine e plu. Tu posse optar tractar nov sequitores ante que ili es permisset sequer te.
       explanation: Vi quelc suggestiones por que tu mey comensar
-      final_action: Comensar postar
-      final_step: 'Comensa a postar! Mem sin sequitores, tui public postas posse esser videt de altres, per exemple in li local témpor-linea o in hashtags. Tu fórsan vole introducter te per li hashtag #introductions.'
-      full_handle: Tui plen usator-nómine
-      full_handle_hint: Ti-ci es ti quel tu vell dir a tui amics por que ili mey inviar missages a te o sequer te de un altri servitor.
       subject: Benevenit a Mastodon
       title: Benevenit, %{name}!
   users:
diff --git a/config/locales/io.yml b/config/locales/io.yml
index 341477852f750c..189f616a4e0c48 100644
--- a/config/locales/io.yml
+++ b/config/locales/io.yml
@@ -1799,10 +1799,6 @@ io:
       edit_profile_action: Facez profilo
       edit_profile_step: Vu povas kustumizar vua profilo per adchargar profilimajo, chanjesar vua montronomo e plue. Vu povas selektas kontrolar nova sequanti ante oli permisesas sequar vu.
       explanation: Subo esas guidilo por helpar vu komencar
-      final_action: Komencez postigar
-      final_step: 'Jus postigez! Mem sen sequanti, vua publika posti povas videsar da altra personi, exemplo es en lokala tempolineo e en hashtagi. Vu povas anke introduktar su en #introductions hashtagi.'
-      full_handle: Vua kompleta profilnomo
-      full_handle_hint: Co esas quon vu dicos a amiki por ke oli povas mesajigar o sequar vu de altra servilo.
       subject: Bonveno a Mastodon
       title: Bonveno, %{name}!
   users:
diff --git a/config/locales/is.yml b/config/locales/is.yml
index 56d71bd9adc75f..da6eee9e205dbd 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -1850,10 +1850,6 @@ is:
       edit_profile_action: Setja upp notandasnið
       edit_profile_step: Þú getur sérsniðið notandasniðið þitt með því að setja inn auðkennismynd þína, breyta birtingarnafninu þínu og ýmislegt fleira. Þú getur valið að yfirfara nýja fylgjendur áður en þú leyfir þeim að fylgjast með þér.
       explanation: Hér eru nokkrar ábendingar til að koma þér í gang
-      final_action: Byrjaðu að skrifa
-      final_step: 'Byrjaðu að tjá þig! Jafnvel án fylgjenda geta aðrir séð opinberar færslur frá þér, til dæmis á staðværu tímalínunni eða í myllumerkjum. Þú gætir jafnvel viljað kynna þig á myllumerkinu #introductions.'
-      full_handle: Fullt auðkenni þitt
-      full_handle_hint: Þetta er það sem þú myndir gefa upp við vini þína svo þeir geti sent þér skilaboð eða fylgst með þér af öðrum netþjóni.
       subject: Velkomin í Mastodon
       title: Velkomin/n um borð, %{name}!
   users:
diff --git a/config/locales/it.yml b/config/locales/it.yml
index a0f1ab76976201..3adb4f6c6500ae 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -1848,10 +1848,6 @@ it:
       edit_profile_action: Configura profilo
       edit_profile_step: Puoi personalizzare il tuo profilo caricando un'immagine del profilo, cambiare il tuo nome e altro ancora. Puoi scegliere di esaminare i nuovi seguaci prima che loro siano autorizzati a seguirti.
       explanation: Ecco alcuni suggerimenti per iniziare
-      final_action: Inizia a pubblicare
-      final_step: 'Inizia a pubblicare! Anche senza seguaci, i tuoi post pubblici possono essere visti da altri, ad esempio sulla timeline locale o negli hashtag. Potresti presentarti con l''hashtag #presentazione.'
-      full_handle: Il tuo nome utente completo
-      full_handle_hint: Questo è ciò che diresti ai tuoi amici in modo che possano seguirti o contattarti da un altro server.
       subject: Benvenuto/a su Mastodon
       title: Benvenuto a bordo, %{name}!
   users:
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 1bbda050bbb62d..460f02d0a58eeb 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -1816,10 +1816,6 @@ ja:
         プロフィール画像をアップロードしたり、表示名を変更したりして、プロフィールをカスタマイズできます。
         新しいフォロワーからフォローリクエストを承認する前に、オプトインで確認できます。
       explanation: 始めるにあたってのアドバイスです
-      final_action: 始めましょう
-      final_step: 'さあ、始めましょう！ たとえフォロワーがまだいなくても、あなたの公開した投稿はローカルタイムラインやハッシュタグなどを通じて誰かの目にとまるはずです。自己紹介をしたいときには #introductions ハッシュタグが便利かもしれません。'
-      full_handle: あなたの正式なユーザーID
-      full_handle_hint: 別のサーバーの友達とフォローやメッセージをやり取りする際には、これを伝えることになります。
       subject: Mastodonへようこそ
       title: ようこそ、%{name}さん！
   users:
diff --git a/config/locales/ka.yml b/config/locales/ka.yml
index 926922154f83d6..1b3d48810ee488 100644
--- a/config/locales/ka.yml
+++ b/config/locales/ka.yml
@@ -472,9 +472,6 @@ ka:
     welcome:
       edit_profile_action: პროფილის მოწყობა
       explanation: აქ რამდენიმე რჩევაა დასაწყისისთვის
-      final_action: დაიწყე პოსტვა
-      full_handle: თქვენი სრული სახელური
-      full_handle_hint: ეს არის ის რასაც ეტყვით თქვენს მეგობრებს, რათა მოგწერონ ან გამოგყვნენ სხვა ინსტანციიდან.
       subject: კეთილი იყოს თქვენი მობრძანება მასტოდონში
       title: კეთილი იყოს თქვენი მობრძანება, %{name}!
   users:
diff --git a/config/locales/kab.yml b/config/locales/kab.yml
index a24d8994fd3f9c..d42481092617f3 100644
--- a/config/locales/kab.yml
+++ b/config/locales/kab.yml
@@ -794,8 +794,6 @@ kab:
         silence: Amiḍan yesɛa talast
         suspend: Amiḍan yettwaḥbas
     welcome:
-      final_action: Bdu asuffeɣ
-      full_handle: Tansa umiḍan-ik takemmalit
       subject: Ansuf ɣer Maṣṭudun
       title: Ansuf yessek·em, %{name}!
   users:
diff --git a/config/locales/kk.yml b/config/locales/kk.yml
index 27c76b437891e2..2cd894befb398c 100644
--- a/config/locales/kk.yml
+++ b/config/locales/kk.yml
@@ -721,9 +721,6 @@ kk:
     welcome:
       edit_profile_action: Профиль өңдеу
       explanation: Мына кеңестерді шолып өтіңіз
-      final_action: Жазба жазу
-      full_handle: Желі тұтқасы
-      full_handle_hint: This is what you would tell your friends so they can message or follow you frоm another server.
       subject: Mastodon Желісіне қош келдіңіз
       title: Ортаға қош келдің, %{name}!
   users:
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 851c3c74b809b1..45a95139f04800 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -1816,10 +1816,6 @@ ko:
       edit_profile_action: 프로필 설정
       edit_profile_step: 프로필 사진을 업로드하거나 사람들에게 표시할 이름을 바꾸는 것 등으로 자신의 프로필을 커스텀 할 수 있습니다. 새로운 팔로워를 검토 후에 허용하도록 할 수도 있습니다.
       explanation: 시작하기 전에 몇가지 팁들을 준비했습니다
-      final_action: 포스팅 시작하기
-      final_step: '게시물을 올리세요! 팔로워가 없더라도, 공개 게시물들은 다른 사람에게 보여질 수 있습니다, 예를 들자면 로컬이나 연합 타임라인 등이 있습니다. 사람들에게 자신을 소개하고 싶다면 #툿친소 해시태그를 이용해보세요.'
-      full_handle: 당신의 풀 핸들은 다음과 같습니다
-      full_handle_hint: 이것을 당신의 친구들에게 알려주면 다른 서버에서 팔로우 하거나 메시지를 보낼 수 있습니다.
       subject: 마스토돈에 오신 것을 환영합니다
       title: 환영합니다 %{name} 님!
   users:
diff --git a/config/locales/ku.yml b/config/locales/ku.yml
index e78e7ecfbb7ae7..d744aaa90323c7 100644
--- a/config/locales/ku.yml
+++ b/config/locales/ku.yml
@@ -1594,10 +1594,6 @@ ku:
       edit_profile_action: Profîlê saz bike
       edit_profile_step: Tu dikarî bi barkirina wêneyek profîlê, guhertina navê xwe ya xuyangê û bêtir profîla xwe kesane bikî. Berî ku mafê bidî ku te şopînerên nû te bişopînin, tu dikarî binirxînî.
       explanation: Li vir çend serişte hene ku tu dest pê bike
-      final_action: Dest bi weşandinê bike
-      final_step: 'Dest bi weşandinê bike! Bêyî şopîneran jî dibe ku şandiyên te yên gelemperî ji hêla kesên din ve werin dîtin, mînakî li ser demjimêra herêmî û di hashtagan de. Dibe ku tu bixwazî xwe li ser hashtagê #nasname bidî nasandin.'
-      full_handle: Hemî destikê te
-      full_handle_hint: Ji hevalên xwe re, ji bona ji rajekarekê din peyam bişîne an jî ji bona ku te bikaribe bişopîne tişta ku tu bibêjî ev e.
       subject: Tu bi xêr hatî Mastodon
       title: Bi xêr hatî, %{name}!
   users:
diff --git a/config/locales/lad.yml b/config/locales/lad.yml
index d75d0d44c9b360..13e29f927ee030 100644
--- a/config/locales/lad.yml
+++ b/config/locales/lad.yml
@@ -1846,10 +1846,6 @@ lad:
       edit_profile_action: Konfigurasyon de profil
       edit_profile_step: Puedes personalizar tu profil kargando una foto de profil, trokando tu nombre de utilizador i muncho mas. Puedes optar por revizar a los muevos suivantes antes de ke puedan segirte.
       explanation: Aki ay algunos konsejos para ampesar
-      final_action: Ampesa a publikar
-      final_step: 'Ampesa a publikar! Inkluzo sin suivantes, tus publikasyones publikas pueden ser vistas por otros, por enshemplo en la linya de tiempo lokal o en etiketas. Tal vez keras aprezentarte kon la etiketa de #introduksiones.'
-      full_handle: Tu sovrenombre kompleto
-      full_handle_hint: Esto es lo ke le dirias a tus haverim para ke eyos puedan embiarte mesajes o segirte dizde otra instansya.
       subject: Bienvenido a Mastodon
       title: Bienvenido, %{name}!
   users:
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 6ca6f3b62fcdde..7ffce1a5166950 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -608,10 +608,6 @@ lt:
     welcome:
       edit_profile_action: Nustatyti profilį
       explanation: Štai keletas patarimų, kaip pradėti
-      final_action: Pradėti kelti įrašus
-      final_step: 'Pradėk skelbti! Net jei ir neturi sekėjų, tavo viešus įrašus gali matyti kiti, pavyzdžiui, vietinėje laiko skalėje arba saitažodžiuose. Galbūt norėsi prisistatyti saitažodyje #introductions.'
-      full_handle: Tavo pilnas slapyvardis
-      full_handle_hint: Štai ką pasakytum savo draugams, kad jie galėtų parašyti arba sekti tave iš kito serverio.
       subject: Sveiki atvykę į Mastodon
       title: Sveiki atvykę, %{name}!
   users:
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index fcf478cf9387ab..89bdf5f05f9192 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -1855,10 +1855,6 @@ lv:
       edit_profile_action: Iestatīt profilu
       edit_profile_step: Tu vari pielāgot savu profilu, augšupielādējot profila attēlu, mainot parādāmo vārdu un citas lietas. Vari izvēlēties pārskatīt jaunus sekotājus, pirms atļauj viņiem tev sekot.
       explanation: Šeit ir daži padomi, kā sākt darbu
-      final_action: Sāc publicēt
-      final_step: 'Sāc publicēt! Pat bez sekotājiem tavas publiskās ziņas var redzēt citi, piemēram, vietējā ziņu lentā vai atsaucēs. Iespējams, tu vēlēsies iepazīstināt ar sevi, izmantojot tēmturi #introductions.'
-      full_handle: Tavs pilnais lietotājvārds
-      full_handle_hint: Šis ir tas, ko tu pasaki saviem draugiem, lai viņi varētu tev ziņot vai sekot tev no cita servera.
       subject: Laipni lūgts Mastodon
       title: Laipni lūgts uz borta, %{name}!
   users:
diff --git a/config/locales/ms.yml b/config/locales/ms.yml
index 6625a13b3b8369..81f1851b1e9185 100644
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@@ -1772,10 +1772,6 @@ ms:
       edit_profile_action: Sediakan profil
       edit_profile_step: Anda boleh menyesuaikan profil anda dengan memuat naik gambar profil, menukar nama paparan anda dan banyak lagi. Anda boleh ikut serta untuk menyemak pengikut baharu sebelum mereka dibenarkan mengikuti anda.
       explanation: Berikut ialah beberapa petua untuk anda bermula
-      final_action: Mula menyiarkan
-      final_step: 'Mula menyiarkan! Walaupun tanpa pengikut, pos awam anda mungkin dilihat oleh orang lain, contohnya pada garis masa tempatan atau dalam hashtag. Anda mungkin ingin memperkenalkan diri anda pada hashtag #introductions.'
-      full_handle: Pemegang penuh anda
-      full_handle_hint: Inilah yang anda akan beritahu rakan anda supaya mereka boleh menghantar mesej atau mengikuti anda dari server lain.
       subject: Selamat datang kepada Mastodon
       title: Selamat datang, %{name}!
   users:
diff --git a/config/locales/my.yml b/config/locales/my.yml
index 094f581eb90d4b..18f5c6a2d05fba 100644
--- a/config/locales/my.yml
+++ b/config/locales/my.yml
@@ -1771,10 +1771,6 @@ my:
       edit_profile_action: ပရိုဖိုင်ထည့်သွင်းရန်
       edit_profile_step: ပရိုဖိုင်ဓာတ်ပုံတစ်ပုံ တင်ခြင်း၊ ဖော်ပြမည့်အမည် ပြောင်းလဲခြင်းနှင့် အခြားအရာများပြုလုပ်ခြင်းတို့ဖြင့် သင့်ပရိုဖိုင်ကို စိတ်ကြိုက်ပြင်ဆင်နိုင်ပါသည်။ စောင့်ကြည့်သူအသစ်များ သင့်ကိုစောင့်ကြည့်ခွင့်မပြုမီ ပြန်လည်သုံးသပ်ရန်အတွက် ဆုံးဖြတ်နိုင်ပါသည်။
       explanation: ဤသည်မှာ သင် စတင်အသုံးပြုနိုင်ရန်အတွက် အကြံပြုချက်အချို့ဖြစ်ပါသည်
-      final_action: ပို့စ် တင်ရန်
-      final_step: 'ပို့စ်စပြီး တင်နိုင်ပါပြီ။ စောင့်ကြည့်သူများမရှိသေးသော်လည်း သင့်အများမြင်ပို့စ်များကို ဒေသတွင်းစာမျက်နှာ သို့မဟုတ် ဟက်ရှ်တက်စာမျက်နှာတို့တွင် အခြားသူများက မြင်နိုင်ပါသည်။ #introductions ဟက်ရှ်တက်ဖြင့် သင့်ကိုယ်သင် မိတ်ဆက်နိုင်ပါသည်။'
-      full_handle: ကိုယ်တိုင်ထိန်းချုပ်နိုင်သည်
-      full_handle_hint: ဤသည်မှာ သင့်သူငယ်ချင်းများကို အခြားဆာဗာတစ်ခုမှ မက်ဆေ့ချ်ပို့နိုင်ကြောင်း သို့မဟုတ် စောင့်ကြည့်နိုင်ကြောင်း အသိပေးပါမည်။
       subject: Mastodon မှ လှိုက်လှဲစွာကြိုဆိုပါသည်။
       title: "%{name} က ကြိုဆိုပါတယ်။"
   users:
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 4392c2366e6812..c935e9f4aadb45 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -1846,10 +1846,6 @@ nl:
       edit_profile_action: Profiel instellen
       edit_profile_step: Je kunt jouw profiel aanpassen door een profielfoto te uploaden, jouw weergavenaam aan te passen en meer. Je kunt het handmatig goedkeuren van volgers instellen.
       explanation: Hier zijn enkele tips om je op weg te helpen
-      final_action: Begin berichten te plaatsen
-      final_step: 'Begin berichten te plaatsen! Zelfs zonder volgers kunnen jouw openbare berichten door anderen bekeken worden, bijvoorbeeld op de lokale tijdlijn en onder hashtags. Je kunt jezelf voorstellen met het gebruik van de hashtag #introductions.'
-      full_handle: Jouw volledige Mastodon-adres
-      full_handle_hint: Dit geef je aan jouw vrienden, zodat ze jou berichten kunnen sturen of (vanaf een andere Mastodonserver) kunnen volgen.
       subject: Welkom op Mastodon
       title: Welkom aan boord %{name}!
   users:
diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index 1524b6f7c13d2a..aecd148e28cf1f 100644
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -1846,10 +1846,6 @@ nn:
       edit_profile_action: Lag til profil
       edit_profile_step: Du kan tilpasse profilen din ved å laste opp et profilbilde, endre visningsnavnet ditt og mer. Du kan velge at nye følgere må godkjennes av deg før de får lov til å følge deg.
       explanation: Her er nokre tips for å koma i gang
-      final_action: Kom i gang med å leggja ut
-      final_step: 'Skriv innlegg! Selv uten følgere kan dine offentlige innlegg bli sett av andre, for eksempel på den lokale tidslinjen og i emneknagger. Du kan introdusere deg selv ved å bruke emneknaggen #introduksjon.'
-      full_handle: Det fulle brukarnamnet ditt
-      full_handle_hint: Dette er det du fortel venene dine for at dei skal kunna senda deg meldingar eller fylgja deg frå ein annan tenar.
       subject: Velkomen til Mastodon
       title: Velkomen om bord, %{name}!
   users:
diff --git a/config/locales/no.yml b/config/locales/no.yml
index d26b20379e46d5..481e28e863e099 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -1841,10 +1841,6 @@
       edit_profile_action: Sett opp profil
       edit_profile_step: Du kan tilpasse profilen din ved å laste opp et profilbilde, endre visningsnavnet ditt og mer. Du kan velge at nye følgere må godkjennes av deg før de får lov til å følge deg.
       explanation: Her er noen tips for å komme i gang
-      final_action: Start postingen
-      final_step: 'Skriv innlegg! Selv uten følgere kan dine offentlige innlegg bli sett av andre, for eksempel på den lokale tidslinjen og i emneknagger. Du kan introdusere deg selv ved å bruke emneknaggen #introduksjon.'
-      full_handle: Ditt fullstendige brukernavn
-      full_handle_hint: Dette er hva du forteller venner slik at de kan sende melding eller følge deg fra en annen instanse.
       subject: Velkommen til Mastodon
       title: Velkommen ombord, %{name}!
   users:
diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index 2887fc98b35c68..b8330992c901ce 100644
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -968,9 +968,6 @@ oc:
     welcome:
       edit_profile_action: Configuracion del perfil
       explanation: Vaquí qualques astúcias per vos preparar
-      final_action: Començar de publicar
-      full_handle: Vòstre escais-nom complèt
-      full_handle_hint: Es aquò que vos cal donar a vòstres amics per que pòscan vos escriure o sègre a partir d’un autre servidor.
       subject: Benvengut a Mastodon
       title: Vos desirem la benvenguda a bòrd %{name} !
   users:
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index f0e6a1f60b6b13..f7c5d60f657a7c 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -1910,10 +1910,6 @@ pl:
       edit_profile_action: Skonfiguruj profil
       edit_profile_step: Możesz dostosować profil wysyłając awatar, zmieniając wyświetlaną nazwę i o wiele więcej. Jeżeli chcesz, możesz również włączyć przeglądanie i ręczne akceptowanie nowych próśb o możliwość obserwacji Twojego profilu.
       explanation: Kilka wskazówek, które pomogą Ci rozpocząć
-      final_action: Zacznij pisać
-      final_step: 'Zacznij tworzyć! Nawet jeżeli nikt Cię nie obserwuje, Twoje publiczne wiadomości będą widziane przez innych, na przykład na lokalnej osi czasu i w hashtagach. Możesz też utworzyć wpis wprowadzający używając hashtagu #introductions.'
-      full_handle: Twój pełny adres
-      full_handle_hint: Ten adres możesz podać znajomym, aby mogli skontaktować się z Tobą lub zacząć obserwować z innego serwera.
       subject: Witaj w Mastodonie
       title: Witaj na pokładzie, %{name}!
   users:
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index ea91fd7dfe6446..86972f9ef16bd1 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -1841,10 +1841,6 @@ pt-BR:
       edit_profile_action: Configurar perfil
       edit_profile_step: Você pode personalizar seu perfil enviando uma foto de perfil, mudando seu nome de exibição e mais. Você pode optar por revisar novos seguidores antes que eles possam te seguir.
       explanation: Aqui estão algumas dicas para você começar
-      final_action: Comece a publicar
-      final_step: 'Comece a postar! Mesmo sem seguidores, suas postagens públicas podem ser vistas pelos outros, por exemplo, na linha do tempo local ou nas hashtags. Você pode querer fazer uma introdução usando a hashtag #introduções.'
-      full_handle: Seu nome de usuário completo
-      full_handle_hint: Isso é o que você compartilha com seus amigos para que eles possam te mandar mensagens ou te seguir a partir de outro servidor.
       subject: Boas-vindas ao Mastodon
       title: Boas vindas, %{name}!
   users:
diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index 3007fd2df1c821..0786ba2ed4f5c9 100644
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -1846,10 +1846,6 @@ pt-PT:
       edit_profile_action: Configurar o perfil
       edit_profile_step: Pode personalizar o seu perfil carregando uma imagem de perfil, alterando o nome a exibir, entre outras opções. Pode optar por rever os novos seguidores antes de estes o poderem seguir.
       explanation: Aqui estão algumas dicas para começar
-      final_action: Começar a publicar
-      final_step: 'Comece a publicar! Mesmo sem seguidores, as suas mensagens públicas podem ser vistas por outros, como por exemplo na cronologia local e em etiquetas. Pense em apresentar-se usando a etiqueta #apresentações.'
-      full_handle: O seu nome completo
-      full_handle_hint: Isto é o que tem de facultar aos seus amigos para que eles lhe possam enviar mensagens ou segui-lo a partir de outra instância.
       subject: Bem-vindo ao Mastodon
       title: Bem-vindo a bordo, %{name}!
   users:
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index 1bdc4e8ca5e060..8e4f9e79130f38 100644
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -709,9 +709,6 @@ ro:
     welcome:
       edit_profile_action: Configurare profil
       explanation: Iată câteva sfaturi pentru a începe
-      final_action: Începe să postezi
-      full_handle: Numele tău complet
-      full_handle_hint: Asta este ceea ce vei putea spune prietenilor pentru a te putea contacta sau pentru a te urmării de pe un alt server.
       subject: Bine ai venit
       title: Bine ai venit la bord, %{name}!
   users:
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 04e49e04277268..3f15b064f0f156 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -1905,10 +1905,6 @@ ru:
       edit_profile_action: Настроить профиль
       edit_profile_step: Вы можете настроить свой профиль добавляя аватарку, изменяя отображаемое имя и так далее. Вы можете вручную подтверждать подписчиков, перед тем как им будет разрешено подписаться на вас.
       explanation: Вот несколько советов для новичков
-      final_action: Начать постить
-      final_step: 'Начинайте постить! Даже без подписчиков, ваши публичные посты могут быть увиденными другими, например в локальной ленте или в хештегах. Вы можете представиться с хэштегом #introductions.'
-      full_handle: Ваше обращение
-      full_handle_hint: То, что Вы хотите сообщить своим друзьям, чтобы они могли написать Вам или подписаться с другого узла.
       subject: Добро пожаловать в Mastodon
       title: Добро пожаловать на борт, %{name}!
   users:
diff --git a/config/locales/sc.yml b/config/locales/sc.yml
index 273ef9d2d942e9..533764606bc142 100644
--- a/config/locales/sc.yml
+++ b/config/locales/sc.yml
@@ -1094,9 +1094,6 @@ sc:
     welcome:
       edit_profile_action: Cunfigura su profilu
       explanation: Inoghe ddoe at una paja de impòsitos pro cumintzare
-      final_action: Cumintza a publicare
-      full_handle: Su nòmine utente intreu tuo
-      full_handle_hint: Custu est su chi dias nàrrere a is amistades tuas pro chi ti potzant imbiare messàgios o sighire dae un'àteru serbidore.
       subject: Ti donamus su benebènnidu a Mastodon
       title: Ti donamus su benebènnidu, %{name}!
   users:
diff --git a/config/locales/sco.yml b/config/locales/sco.yml
index a1071197f18aa8..dc273d2d836057 100644
--- a/config/locales/sco.yml
+++ b/config/locales/sco.yml
@@ -1584,10 +1584,6 @@ sco:
       edit_profile_action: Setup profile
       edit_profile_step: Ye kin customize yer profile bi uploadin a profile picture, chyngin yer display nemm an mair. Ye kin opt-in fir tae luik ower new follaers afore they’re allooed tae follae ye.
       explanation: Here some tips fir tae get ye stertit
-      final_action: Stert postin
-      final_step: 'Stert postin! Even athout follaers, yer public posts kin stull be seen bi ithers, fir example on the local timeline or in hashtags. Ye mibbie want tae introduce yersel on the #introductions hashtag.'
-      full_handle: Yer ful haunnle
-      full_handle_hint: This is whit ye wad tell yer pals sae thit they kin message or follae ye fae anither server.
       subject: Welcome tae Mastodon, 'mon in
       title: Welcome aboord, %{name}!
   users:
diff --git a/config/locales/si.yml b/config/locales/si.yml
index 660fd3ba31c080..ac292d6cf8143d 100644
--- a/config/locales/si.yml
+++ b/config/locales/si.yml
@@ -1436,9 +1436,6 @@ si:
     welcome:
       edit_profile_action: පැතිකඩ පිහිටුවන්න
       explanation: ඔබ ආරම්භ කිරීමට උපදෙස් කිහිපයක් මෙන්න
-      final_action: ලිපි පළ කරන්න
-      full_handle: ඔබේ සම්පූර්ණ හසුරුව
-      full_handle_hint: මෙය ඔබ ඔබේ මිතුරන්ට පවසනු ඇත, එවිට ඔවුන්ට වෙනත් සේවාදායකයකින් ඔබට පණිවිඩ යැවීමට හෝ අනුගමනය කිරීමට හැකිය.
       subject: මාස්ටඩන් වෙත පිළිගනිමු
       title: නැවට සාදරයෙන් පිළිගනිමු, %{name}!
   users:
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 66022b10aebdd2..d97cfac0ea8c2f 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -1290,9 +1290,6 @@ sk:
     welcome:
       edit_profile_action: Nastav profil
       explanation: Tu nájdeš nejaké tipy do začiatku
-      final_action: Začni prispievať
-      full_handle: Adresa tvojho profilu v celom formáte
-      full_handle_hint: Toto je čo musíš dať vedieť svojím priateľom aby ti mohli posielať správy, alebo ťa následovať z iného serveru.
       subject: Vitaj na Mastodone
       title: Vitaj na palube, %{name}!
   users:
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 915970f805d12a..c9b2343b693dd5 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -1910,10 +1910,6 @@ sl:
       edit_profile_action: Nastavitve profila
       edit_profile_step: Profil lahko prilagodite tako, da naložite sliko profila, spremenite pojavno ime in drugo. Lahko izberete, da želite pregledati nove sledilce, preden jim dovolite sledenje.
       explanation: Tu je nekaj nasvetov za začetek
-      final_action: Začnite objavljati
-      final_step: 'Začnite objavljati! Tudi brez sledilcev bodo vaše javne objave videli drugi, npr. na krajevni časovnici ali v ključnikih. Morda se želite predstaviti s ključnikom #introductions.'
-      full_handle: Vaša polna ročica
-      full_handle_hint: To bi povedali svojim prijateljem, da vam lahko pošljejo sporočila ali vam sledijo iz drugega strežnika.
       subject: Dobrodošli na Mastodon
       title: Dobrodošli, %{name}!
   users:
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index 3ad76e24296f1f..4293271bb242c4 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -1842,10 +1842,6 @@ sq:
       edit_profile_action: Ujdisje profili
       edit_profile_step: Profilin tuaj mund ta përshtatni duke ngarkuar një figurë, duke ndryshuar emrin tuaj në ekran, etj. Mund të zgjidhni të shqyrtoni ndjekës të rinj, para se të jenë lejuar t’ju ndjekin.
       explanation: Ja disa ndihmëza, sa për t’ia filluar
-      final_action: Filloni të postoni
-      final_step: 'Filloni të postoni! Edhe pa ndjekës, postimet tuaja publike mund të shihen nga të tjerët, për shembull, në rrjedhën kohore vendore, ose në hashtag-ë. Mund të doni të prezantoni veten përmes hashtag-ut #introductions.'
-      full_handle: Identifikuesi juaj i plotë
-      full_handle_hint: Kjo është ajo çka do të duhej t’u tregonit shokëve tuaj, që të mund t’ju dërgojnë mesazhe ose t’ju ndjekin nga një shërbyes tjetër.
       subject: Mirë se vini te Mastodon-i
       title: Mirë se vini, %{name}!
   users:
diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml
index b55b6e0d19117a..a1f6df067fabd6 100644
--- a/config/locales/sr-Latn.yml
+++ b/config/locales/sr-Latn.yml
@@ -1873,10 +1873,6 @@ sr-Latn:
       edit_profile_action: Podesi nalog
       edit_profile_step: Možete prilagoditi svoj profil tako što ćete postaviti profilnu sliku, promeniti ime za prikaz i tako dalje. Možete dati saglasnost da pregledate nove pratioce pre nego što im dozvolite da Vas zaprate.
       explanation: Evo nekoliko saveta za početak
-      final_action: Počnite objavljivati
-      final_step: 'Počnite da objavljujete! Čak i bez pratilaca, Vaše javne objave su vidljive drugim ljudima, na primer na lokalnoj vremenskoj liniji ili u heš oznakama. Možda želite da se predstavite sa heš oznakom #introductions ili #predstavljanja.'
-      full_handle: Vaš pun nadimak
-      full_handle_hint: Ovo biste rekli svojim prijateljima kako bi vam oni poslali poruku, ili zapratili sa druge instance.
       subject: Dobro došli na Mastodon
       title: Dobro došli, %{name}!
   users:
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 9e67e9692d3c3c..494b41a7540a1c 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -1873,10 +1873,6 @@ sr:
       edit_profile_action: Подеси налог
       edit_profile_step: Можете прилагодити свој профил тако што ћете поставити профилну слику, променити име за приказ и тако даље. Можете дати сагласност да прегледате нове пратиоце пре него што им дозволите да Вас запрате.
       explanation: Ево неколико савета за почетак
-      final_action: Почните објављивати
-      final_step: 'Почните да објављујете! Чак и без пратилаца, Ваше јавне објаве су видљиве другим људима, на пример на локалној временској линији или у хеш ознакама. Можда желите да се представите са хеш ознаком #introductions или #представљања.'
-      full_handle: Ваш пун надимак
-      full_handle_hint: Ово бисте рекли својим пријатељима како би вам они послали поруку, или запратили са друге инстанце.
       subject: Добро дошли на Mastodon
       title: Добро дошли, %{name}!
   users:
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index deac7cc63899bd..d0f3994b4e3be9 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -1837,10 +1837,6 @@ sv:
       edit_profile_action: Profilinställning
       edit_profile_step: Du kan anpassa din profil genom att ladda upp en profilbild, ändra ditt visningsnamn med mera. Du kan välja att granska nya följare innan de får följa dig.
       explanation: Här är några tips för att komma igång
-      final_action: Börja göra inlägg
-      final_step: 'Börja skriv inlägg! Även utan följare kan dina offentliga inlägg ses av andra, exempelvis på den lokala tidslinjen eller i hashtaggar. Du kanske vill introducera dig själv under hashtaggen #introduktion eller #introductions.'
-      full_handle: Ditt fullständiga användarnamn/mastodonadress
-      full_handle_hint: Det här är vad du skulle berätta för dina vänner så att de kan meddela eller följa dig från en annan instans.
       subject: Välkommen till Mastodon
       title: Välkommen ombord, %{name}!
   users:
diff --git a/config/locales/th.yml b/config/locales/th.yml
index e117c29b4a7590..5253dd6b787884 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -1814,10 +1814,6 @@ th:
       edit_profile_action: ตั้งค่าโปรไฟล์
       edit_profile_step: คุณสามารถปรับแต่งโปรไฟล์ของคุณได้โดยอัปโหลดรูปภาพโปรไฟล์ เปลี่ยนชื่อที่แสดงของคุณ และอื่น ๆ คุณสามารถเลือกรับการตรวจทานผู้ติดตามใหม่ก่อนที่จะอนุญาตให้เขาติดตามคุณ
       explanation: นี่คือเคล็ดลับบางส่วนที่จะช่วยให้คุณเริ่มต้นใช้งาน
-      final_action: เริ่มโพสต์
-      final_step: 'เริ่มโพสต์! แม้ว่าไม่มีผู้ติดตาม โพสต์สาธารณะของคุณอาจเห็นโดยผู้อื่น ตัวอย่างเช่น ในเส้นเวลาในเซิร์ฟเวอร์หรือในแฮชแท็ก คุณอาจต้องการแนะนำตัวเองในแฮชแท็ก #introductions'
-      full_handle: นามเต็มของคุณ
-      full_handle_hint: นี่คือสิ่งที่คุณจะบอกเพื่อน ๆ ของคุณเพื่อให้เขาสามารถส่งข้อความหรือติดตามคุณจากเซิร์ฟเวอร์อื่น
       subject: ยินดีต้อนรับสู่ Mastodon
       title: ยินดีต้อนรับ %{name}!
   users:
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 4ba9d4275827c8..7dbec9abbdda7a 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -1846,10 +1846,6 @@ tr:
       edit_profile_action: Profil kurulumu
       edit_profile_step: Bir profil resmi yükleyerek, ekran adınızı değiştirerek ve daha fazlasını yaparak profilinizi kişiselleştirebilirsiniz. Sizi takip etmelerine izin verilmeden önce yeni takipçileri incelemeyi tercih edebilirsiniz.
       explanation: İşte sana başlangıç için birkaç ipucu
-      final_action: Gönderi yazmaya başlayın
-      final_step: 'Gönderi yazmaya başlayın! Takipçiler olmadan bile, herkese açık gönderileriniz başkaları tarafından görülebilir, örneğin yerel zaman tünelinde veya etiketlerde. Kendinizi #introductions etiketinde tanıtmak isteyebilirsiniz.'
-      full_handle: Tanıtıcınız
-      full_handle_hint: Arkadaşlarınıza, size başka bir sunucudan mesaj atabilmeleri veya sizi takip edebilmeleri için söyleyeceğiniz şey budur.
       subject: Mastodon'a hoş geldiniz
       title: Gemiye hoşgeldin, %{name}!
   users:
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 4d4097d658f218..7273a0ff2b965f 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -1910,10 +1910,6 @@ uk:
       edit_profile_action: Налаштувати профіль
       edit_profile_step: Ви можете налаштувати свій профіль, завантаживши зображення профілю, змінивши відображуване ім'я та інше. Ви можете включити для перегляду нових підписників до того, як вони матимуть змогу підписатися на вас.
       explanation: Ось кілька порад для початку
-      final_action: Почати писати
-      final_step: 'Почніть дописувати! Навіть не підписавшись на вас, інші зможуть побачити ваші дописи, наприклад, у локальній стрічці та у хештеґах. Якщо ви хочете представитися, можете скористатися хештеґом #introductions.'
-      full_handle: Ваше звернення
-      full_handle_hint: Те, що ви хочете сказати друзям, щоб вони могли написати вам або підписатися з інших сайтів.
       subject: Ласкаво просимо до Mastodon
       title: Ласкаво просимо, %{name}!
   users:
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 99434c35442176..e362c97a41b69e 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -1812,10 +1812,6 @@ vi:
       edit_profile_action: Cài đặt trang hồ sơ
       edit_profile_step: Bạn có thể chỉnh sửa trang hồ sơ của mình bằng cách tải lên ảnh đại diện, ảnh bìa, đổi biệt danh và hơn thế nữa. Bạn cũng có thể tự phê duyệt những người theo dõi mới.
       explanation: Dưới đây là một số mẹo để giúp bạn bắt đầu
-      final_action: Soạn tút mới
-      final_step: 'Viết tút mới! Ngay cả khi chưa có người theo dõi, người khác vẫn có thể xem tút công khai của bạn trên bảng tin máy chủ và qua hashtag. Hãy giới thiệu bản thân với hashtag #introductions.'
-      full_handle: Tên đầy đủ của bạn
-      full_handle_hint: Đây cũng là địa chỉ được dùng để giao tiếp với tất cả mọi người.
       subject: Chào mừng đến với Mastodon
       title: Xin chào %{name}!
   users:
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index cf56a2d227f729..46a0e401524d6f 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -1814,10 +1814,6 @@ zh-CN:
       edit_profile_action: 设置个人资料
       edit_profile_step: 您可以通过上传个人资料图片、更改您的昵称等来自定义您的个人资料。 您可以选择在新关注者关注您之前对其进行审核。
       explanation: 下面是几个小贴士，希望它们能帮到你
-      final_action: 开始嘟嘟
-      final_step: '开始发布嘟文！ 即使没有关注者，您的公开嘟文也可能会被其他人看到，例如在本地时间轴或话题标签中。 您可能想在 #introductions 话题标签上介绍自己。'
-      full_handle: 你的完整用户地址
-      full_handle_hint: 你需要把这个告诉你的朋友们，这样他们就能从另一台服务器向你发送信息或者关注你。
       subject: 欢迎来到 Mastodon
       title: "%{name}，欢迎你的加入！"
   users:
diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml
index b010a75c0473f8..e666e4965d250b 100644
--- a/config/locales/zh-HK.yml
+++ b/config/locales/zh-HK.yml
@@ -1809,10 +1809,6 @@ zh-HK:
       edit_profile_action: 設定個人資料
       edit_profile_step: 你可以透過上傳頭像、更改顯示名稱等來自訂個人檔案。你可以選擇讓新使用者追蹤你之前先審查他們。
       explanation: 下面是幾個小貼士，希望它們能幫到你
-      final_action: 開始發文
-      final_step: '開始發文吧！即使你沒有追蹤者，其他人仍然能在本站時間軸或標籤等地方，看到你的公開帖文。試着用 #introductions 標籤來介紹自己吧。'
-      full_handle: 你的完整 Mastodon 地址
-      full_handle_hint: 這訊息將顯示給你朋友們，讓他們能從另一個服務站發信息給你，或者關注你的。
       subject: 歡迎來到 Mastodon (萬象)
       title: 歡迎 %{name} 加入！
   users:
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index bc8454884cc3e8..3cd358383099ea 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -1816,10 +1816,6 @@ zh-TW:
       edit_profile_action: 設定個人檔案
       edit_profile_step: 您可以設定您的個人檔案，包括上傳大頭貼、變更顯示名稱等等。您也可以選擇於新的跟隨者跟隨前，先對他們進行審核。
       explanation: 以下是幾個小技巧，希望它們能幫到您
-      final_action: 開始嘟嘟
-      final_step: '開始嘟嘟吧！即使您現在沒有跟隨者，其他人仍然能於本站時間軸、主題標籤等地方，看到您的公開嘟文。試著用 #introductions 這個主題標籤介紹一下自己吧。'
-      full_handle: 您的完整帳號名稱
-      full_handle_hint: 您需要將這告訴您的朋友們，這樣他們就能從另一個伺服器向您發送訊息或跟隨您。
       subject: 歡迎來到 Mastodon
       title: "%{name} 誠摯歡迎您的加入！"
   users:

From 1d721b21e1ac89fa1e9c8a845294939d33e55ae9 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 1 Mar 2024 15:51:01 +0100
Subject: [PATCH 0341/2191] Add attribution to Tabler.io icons used in the new
 mailer designs (#29470)

---
 .../images/mailer-new/heading/LICENSE         |  21 ++++++++++++++++++
 .../images/mailer-new/heading/README.md       |   1 +
 .../btn-app-store.png                         | Bin
 .../btn-google-play.png                       | Bin
 .../images/mailer-new/welcome-icons/LICENSE   |  21 ++++++++++++++++++
 .../images/mailer-new/welcome-icons/README.md |   1 +
 .../apps_step-off.png                         | Bin
 .../apps_step-on.png                          | Bin
 .../edit_profile_step-off.png                 | Bin
 .../edit_profile_step-on.png                  | Bin
 .../follow_step-off.png                       | Bin
 .../follow_step-on.png                        | Bin
 .../post_step-off.png                         | Bin
 .../post_step-on.png                          | Bin
 .../share_step-off.png                        | Bin
 .../share_step-on.png                         | Bin
 .../application/mailer/_checklist.html.haml   |   6 ++---
 17 files changed, 47 insertions(+), 3 deletions(-)
 create mode 100644 app/javascript/images/mailer-new/heading/LICENSE
 create mode 100644 app/javascript/images/mailer-new/heading/README.md
 rename app/javascript/images/mailer-new/{welcome => store-icons}/btn-app-store.png (100%)
 rename app/javascript/images/mailer-new/{welcome => store-icons}/btn-google-play.png (100%)
 create mode 100644 app/javascript/images/mailer-new/welcome-icons/LICENSE
 create mode 100644 app/javascript/images/mailer-new/welcome-icons/README.md
 rename app/javascript/images/mailer-new/{welcome => welcome-icons}/apps_step-off.png (100%)
 rename app/javascript/images/mailer-new/{welcome => welcome-icons}/apps_step-on.png (100%)
 rename app/javascript/images/mailer-new/{welcome => welcome-icons}/edit_profile_step-off.png (100%)
 rename app/javascript/images/mailer-new/{welcome => welcome-icons}/edit_profile_step-on.png (100%)
 rename app/javascript/images/mailer-new/{welcome => welcome-icons}/follow_step-off.png (100%)
 rename app/javascript/images/mailer-new/{welcome => welcome-icons}/follow_step-on.png (100%)
 rename app/javascript/images/mailer-new/{welcome => welcome-icons}/post_step-off.png (100%)
 rename app/javascript/images/mailer-new/{welcome => welcome-icons}/post_step-on.png (100%)
 rename app/javascript/images/mailer-new/{welcome => welcome-icons}/share_step-off.png (100%)
 rename app/javascript/images/mailer-new/{welcome => welcome-icons}/share_step-on.png (100%)

diff --git a/app/javascript/images/mailer-new/heading/LICENSE b/app/javascript/images/mailer-new/heading/LICENSE
new file mode 100644
index 00000000000000..974db1ac4bf441
--- /dev/null
+++ b/app/javascript/images/mailer-new/heading/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2020-2024 Paweł Kuna
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/app/javascript/images/mailer-new/heading/README.md b/app/javascript/images/mailer-new/heading/README.md
new file mode 100644
index 00000000000000..ecd4b949e76360
--- /dev/null
+++ b/app/javascript/images/mailer-new/heading/README.md
@@ -0,0 +1 @@
+Images in this folder are based on [Tabler.io icons](https://tabler.io/icons).
diff --git a/app/javascript/images/mailer-new/welcome/btn-app-store.png b/app/javascript/images/mailer-new/store-icons/btn-app-store.png
similarity index 100%
rename from app/javascript/images/mailer-new/welcome/btn-app-store.png
rename to app/javascript/images/mailer-new/store-icons/btn-app-store.png
diff --git a/app/javascript/images/mailer-new/welcome/btn-google-play.png b/app/javascript/images/mailer-new/store-icons/btn-google-play.png
similarity index 100%
rename from app/javascript/images/mailer-new/welcome/btn-google-play.png
rename to app/javascript/images/mailer-new/store-icons/btn-google-play.png
diff --git a/app/javascript/images/mailer-new/welcome-icons/LICENSE b/app/javascript/images/mailer-new/welcome-icons/LICENSE
new file mode 100644
index 00000000000000..974db1ac4bf441
--- /dev/null
+++ b/app/javascript/images/mailer-new/welcome-icons/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2020-2024 Paweł Kuna
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/app/javascript/images/mailer-new/welcome-icons/README.md b/app/javascript/images/mailer-new/welcome-icons/README.md
new file mode 100644
index 00000000000000..ecd4b949e76360
--- /dev/null
+++ b/app/javascript/images/mailer-new/welcome-icons/README.md
@@ -0,0 +1 @@
+Images in this folder are based on [Tabler.io icons](https://tabler.io/icons).
diff --git a/app/javascript/images/mailer-new/welcome/apps_step-off.png b/app/javascript/images/mailer-new/welcome-icons/apps_step-off.png
similarity index 100%
rename from app/javascript/images/mailer-new/welcome/apps_step-off.png
rename to app/javascript/images/mailer-new/welcome-icons/apps_step-off.png
diff --git a/app/javascript/images/mailer-new/welcome/apps_step-on.png b/app/javascript/images/mailer-new/welcome-icons/apps_step-on.png
similarity index 100%
rename from app/javascript/images/mailer-new/welcome/apps_step-on.png
rename to app/javascript/images/mailer-new/welcome-icons/apps_step-on.png
diff --git a/app/javascript/images/mailer-new/welcome/edit_profile_step-off.png b/app/javascript/images/mailer-new/welcome-icons/edit_profile_step-off.png
similarity index 100%
rename from app/javascript/images/mailer-new/welcome/edit_profile_step-off.png
rename to app/javascript/images/mailer-new/welcome-icons/edit_profile_step-off.png
diff --git a/app/javascript/images/mailer-new/welcome/edit_profile_step-on.png b/app/javascript/images/mailer-new/welcome-icons/edit_profile_step-on.png
similarity index 100%
rename from app/javascript/images/mailer-new/welcome/edit_profile_step-on.png
rename to app/javascript/images/mailer-new/welcome-icons/edit_profile_step-on.png
diff --git a/app/javascript/images/mailer-new/welcome/follow_step-off.png b/app/javascript/images/mailer-new/welcome-icons/follow_step-off.png
similarity index 100%
rename from app/javascript/images/mailer-new/welcome/follow_step-off.png
rename to app/javascript/images/mailer-new/welcome-icons/follow_step-off.png
diff --git a/app/javascript/images/mailer-new/welcome/follow_step-on.png b/app/javascript/images/mailer-new/welcome-icons/follow_step-on.png
similarity index 100%
rename from app/javascript/images/mailer-new/welcome/follow_step-on.png
rename to app/javascript/images/mailer-new/welcome-icons/follow_step-on.png
diff --git a/app/javascript/images/mailer-new/welcome/post_step-off.png b/app/javascript/images/mailer-new/welcome-icons/post_step-off.png
similarity index 100%
rename from app/javascript/images/mailer-new/welcome/post_step-off.png
rename to app/javascript/images/mailer-new/welcome-icons/post_step-off.png
diff --git a/app/javascript/images/mailer-new/welcome/post_step-on.png b/app/javascript/images/mailer-new/welcome-icons/post_step-on.png
similarity index 100%
rename from app/javascript/images/mailer-new/welcome/post_step-on.png
rename to app/javascript/images/mailer-new/welcome-icons/post_step-on.png
diff --git a/app/javascript/images/mailer-new/welcome/share_step-off.png b/app/javascript/images/mailer-new/welcome-icons/share_step-off.png
similarity index 100%
rename from app/javascript/images/mailer-new/welcome/share_step-off.png
rename to app/javascript/images/mailer-new/welcome-icons/share_step-off.png
diff --git a/app/javascript/images/mailer-new/welcome/share_step-on.png b/app/javascript/images/mailer-new/welcome-icons/share_step-on.png
similarity index 100%
rename from app/javascript/images/mailer-new/welcome/share_step-on.png
rename to app/javascript/images/mailer-new/welcome-icons/share_step-on.png
diff --git a/app/views/application/mailer/_checklist.html.haml b/app/views/application/mailer/_checklist.html.haml
index 31cd5bf35df486..324fd7e6f864b0 100644
--- a/app/views/application/mailer/_checklist.html.haml
+++ b/app/views/application/mailer/_checklist.html.haml
@@ -16,7 +16,7 @@
                           = image_tag frontend_asset_url('images/mailer-new/welcome/checkbox-off.png'), alt: '', width: 20, height: 20
                       %td.email-checklist-icons-step-td
                         - if defined?(key)
-                          = image_tag frontend_asset_url("images/mailer-new/welcome/#{key}-#{checked ? 'on' : 'off'}.png"), alt: '', width: 40, height: 40
+                          = image_tag frontend_asset_url("images/mailer-new/welcome-icons/#{key}-#{checked ? 'on' : 'off'}.png"), alt: '', width: 40, height: 40
                 %td.email-checklist-text-td
                   .email-desktop-flex
                     /[if mso]
@@ -31,8 +31,8 @@
                     %div
                       - if defined?(show_apps_buttons) && show_apps_buttons
                         .email-welcome-apps-btns
-                          = link_to image_tag(frontend_asset_url('images/mailer-new/welcome/btn-app-store.png'), alt: t('user_mailer.welcome.apps_ios_action'), width: 120, height: 40), 'https://apps.apple.com/app/mastodon-for-iphone-and-ipad/id1571998974'
-                          = link_to image_tag(frontend_asset_url('images/mailer-new/welcome/btn-google-play.png'), alt: t('user_mailer.welcome.apps_android_action'), width: 120, height: 40), 'https://play.google.com/store/apps/details?id=org.joinmastodon.android'
+                          = link_to image_tag(frontend_asset_url('images/mailer-new/store-icons/btn-app-store.png'), alt: t('user_mailer.welcome.apps_ios_action'), width: 120, height: 40), 'https://apps.apple.com/app/mastodon-for-iphone-and-ipad/id1571998974'
+                          = link_to image_tag(frontend_asset_url('images/mailer-new/store-icons/btn-google-play.png'), alt: t('user_mailer.welcome.apps_android_action'), width: 120, height: 40), 'https://play.google.com/store/apps/details?id=org.joinmastodon.android'
                       - elsif defined?(button_text) && defined?(button_url) && defined?(checked) && !checked
                         = render 'application/mailer/button', text: button_text, url: button_url, has_arrow: false
                     /[if mso]

From a25014de8fae061f191c95608aabe3d6d02ac45d Mon Sep 17 00:00:00 2001
From: Daniel M Brasil <danielmbrasil@protonmail.com>
Date: Fri, 1 Mar 2024 13:17:40 -0300
Subject: [PATCH 0342/2191] Improve `IpBlock` model test coverage (#29460)

---
 spec/models/ip_block_spec.rb | 53 +++++++++++++++++++++++++++++++++++-
 1 file changed, 52 insertions(+), 1 deletion(-)

diff --git a/spec/models/ip_block_spec.rb b/spec/models/ip_block_spec.rb
index ed58826672e31e..290b99b28842b6 100644
--- a/spec/models/ip_block_spec.rb
+++ b/spec/models/ip_block_spec.rb
@@ -3,7 +3,32 @@
 require 'rails_helper'
 
 describe IpBlock do
-  describe 'to_log_human_identifier' do
+  describe 'validations' do
+    it 'validates ip presence', :aggregate_failures do
+      ip_block = described_class.new(ip: nil, severity: :no_access)
+
+      expect(ip_block).to_not be_valid
+      expect(ip_block).to model_have_error_on_field(:ip)
+    end
+
+    it 'validates severity presence', :aggregate_failures do
+      ip_block = described_class.new(ip: '127.0.0.1', severity: nil)
+
+      expect(ip_block).to_not be_valid
+      expect(ip_block).to model_have_error_on_field(:severity)
+    end
+
+    it 'validates ip uniqueness', :aggregate_failures do
+      described_class.create!(ip: '127.0.0.1', severity: :no_access)
+
+      ip_block = described_class.new(ip: '127.0.0.1', severity: :no_access)
+
+      expect(ip_block).to_not be_valid
+      expect(ip_block).to model_have_error_on_field(:ip)
+    end
+  end
+
+  describe '#to_log_human_identifier' do
     let(:ip_block) { described_class.new(ip: '192.168.0.1') }
 
     it 'combines the IP and prefix into a string' do
@@ -12,4 +37,30 @@
       expect(result).to eq('192.168.0.1/32')
     end
   end
+
+  describe '.blocked?' do
+    context 'when the IP is blocked' do
+      it 'returns true' do
+        described_class.create!(ip: '127.0.0.1', severity: :no_access)
+
+        expect(described_class.blocked?('127.0.0.1')).to be true
+      end
+    end
+
+    context 'when the IP is not blocked' do
+      it 'returns false' do
+        expect(described_class.blocked?('127.0.0.1')).to be false
+      end
+    end
+  end
+
+  describe 'after_commit' do
+    it 'resets the cache' do
+      allow(Rails.cache).to receive(:delete)
+
+      described_class.create!(ip: '127.0.0.1', severity: :no_access)
+
+      expect(Rails.cache).to have_received(:delete).with(described_class::CACHE_KEY)
+    end
+  end
 end

From 18945f62e07617ac44b7a25a61799b0959fe67f7 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 1 Mar 2024 11:24:45 -0500
Subject: [PATCH 0343/2191] Convert more API specs from controller->request
 style (#29004)

---
 .../api/v1/accounts/statuses_spec.rb}         | 48 ++++++++++---------
 .../api/v1/admin/trends/statuses_spec.rb}     | 21 ++++----
 .../api/v1/admin/trends/tags_spec.rb}         | 21 ++++----
 .../api/v1/announcements/reactions_spec.rb}   | 24 +++++-----
 .../api/v1/announcements_spec.rb}             | 27 +++++------
 .../api/v1/conversations_spec.rb}             | 39 +++++++--------
 .../api/v1/filters_spec.rb}                   | 34 ++++++-------
 .../api/v1/polls/votes_spec.rb}               | 18 +++----
 .../api/v1/push/subscriptions_spec.rb}        | 41 ++++++++--------
 .../api/v1/streaming_spec.rb}                 | 42 ++++++++++------
 10 files changed, 159 insertions(+), 156 deletions(-)
 rename spec/{controllers/api/v1/accounts/statuses_controller_spec.rb => requests/api/v1/accounts/statuses_spec.rb} (71%)
 rename spec/{controllers/api/v1/admin/trends/statuses_controller_spec.rb => requests/api/v1/admin/trends/statuses_spec.rb} (63%)
 rename spec/{controllers/api/v1/admin/trends/tags_controller_spec.rb => requests/api/v1/admin/trends/tags_spec.rb} (64%)
 rename spec/{controllers/api/v1/announcements/reactions_controller_spec.rb => requests/api/v1/announcements/reactions_spec.rb} (64%)
 rename spec/{controllers/api/v1/announcements_controller_spec.rb => requests/api/v1/announcements_spec.rb} (59%)
 rename spec/{controllers/api/v1/conversations_controller_spec.rb => requests/api/v1/conversations_spec.rb} (50%)
 rename spec/{controllers/api/v1/filters_controller_spec.rb => requests/api/v1/filters_spec.rb} (75%)
 rename spec/{controllers/api/v1/polls/votes_controller_spec.rb => requests/api/v1/polls/votes_spec.rb} (61%)
 rename spec/{controllers/api/v1/push/subscriptions_controller_spec.rb => requests/api/v1/push/subscriptions_spec.rb} (67%)
 rename spec/{controllers/api/v1/streaming_controller_spec.rb => requests/api/v1/streaming_spec.rb} (51%)

diff --git a/spec/controllers/api/v1/accounts/statuses_controller_spec.rb b/spec/requests/api/v1/accounts/statuses_spec.rb
similarity index 71%
rename from spec/controllers/api/v1/accounts/statuses_controller_spec.rb
rename to spec/requests/api/v1/accounts/statuses_spec.rb
index 102e3b8e91537f..371867b21572c4 100644
--- a/spec/controllers/api/v1/accounts/statuses_controller_spec.rb
+++ b/spec/requests/api/v1/accounts/statuses_spec.rb
@@ -2,20 +2,16 @@
 
 require 'rails_helper'
 
-describe Api::V1::Accounts::StatusesController do
-  render_views
+describe 'API V1 Accounts Statuses' do
+  let(:user) { Fabricate(:user) }
+  let(:scopes) { 'read:statuses' }
+  let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+  let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
 
-  let(:user)  { Fabricate(:user) }
-  let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read:statuses') }
-
-  before do
-    allow(controller).to receive(:doorkeeper_token) { token }
-  end
-
-  describe 'GET #index' do
+  describe 'GET /api/v1/accounts/:account_id/statuses' do
     it 'returns expected headers', :aggregate_failures do
       Fabricate(:status, account: user.account)
-      get :index, params: { account_id: user.account.id, limit: 1 }
+      get "/api/v1/accounts/#{user.account.id}/statuses", params: { limit: 1 }, headers: headers
 
       expect(response).to have_http_status(200)
       expect(links_from_header.size)
@@ -24,7 +20,7 @@
 
     context 'with only media' do
       it 'returns http success' do
-        get :index, params: { account_id: user.account.id, only_media: true }
+        get "/api/v1/accounts/#{user.account.id}/statuses", params: { only_media: true }, headers: headers
 
         expect(response).to have_http_status(200)
       end
@@ -36,7 +32,7 @@
 
       before do
         Fabricate(:status, account: user.account, thread: Fabricate(:status)) # Reply to another user
-        get :index, params: { account_id: user.account.id, exclude_replies: true }
+        get "/api/v1/accounts/#{user.account.id}/statuses", params: { exclude_replies: true }, headers: headers
       end
 
       it 'returns posts along with self replies', :aggregate_failures do
@@ -57,7 +53,7 @@
       end
 
       it 'returns http success and includes a header link' do
-        get :index, params: { account_id: user.account.id, pinned: true }
+        get "/api/v1/accounts/#{user.account.id}/statuses", params: { pinned: true }, headers: headers
 
         expect(response).to have_http_status(200)
         expect(links_from_header.size)
@@ -79,7 +75,7 @@
       end
 
       it 'returns http success and header pagination links to prev and next' do
-        get :index, params: { account_id: user.account.id, pinned: true }
+        get "/api/v1/accounts/#{user.account.id}/statuses", params: { pinned: true }, headers: headers
 
         expect(response).to have_http_status(200)
         expect(links_from_header.size)
@@ -109,15 +105,19 @@
       end
 
       it 'returns http success' do
-        get :index, params: { account_id: account.id, pinned: true }
+        get "/api/v1/accounts/#{account.id}/statuses", params: { pinned: true }, headers: headers
+
         expect(response).to have_http_status(200)
       end
 
       context 'when user does not follow account' do
         it 'lists the public status only' do
-          get :index, params: { account_id: account.id, pinned: true }
-          json = body_as_json
-          expect(json.map { |item| item[:id].to_i }).to eq [status.id]
+          get "/api/v1/accounts/#{account.id}/statuses", params: { pinned: true }, headers: headers
+
+          expect(body_as_json)
+            .to contain_exactly(
+              a_hash_including(id: status.id.to_s)
+            )
         end
       end
 
@@ -127,9 +127,13 @@
         end
 
         it 'lists both the public and the private statuses' do
-          get :index, params: { account_id: account.id, pinned: true }
-          json = body_as_json
-          expect(json.map { |item| item[:id].to_i }).to contain_exactly(status.id, private_status.id)
+          get "/api/v1/accounts/#{account.id}/statuses", params: { pinned: true }, headers: headers
+
+          expect(body_as_json)
+            .to contain_exactly(
+              a_hash_including(id: status.id.to_s),
+              a_hash_including(id: private_status.id.to_s)
+            )
         end
       end
     end
diff --git a/spec/controllers/api/v1/admin/trends/statuses_controller_spec.rb b/spec/requests/api/v1/admin/trends/statuses_spec.rb
similarity index 63%
rename from spec/controllers/api/v1/admin/trends/statuses_controller_spec.rb
rename to spec/requests/api/v1/admin/trends/statuses_spec.rb
index 4d80055ac0b041..04aa0465f2809e 100644
--- a/spec/controllers/api/v1/admin/trends/statuses_controller_spec.rb
+++ b/spec/requests/api/v1/admin/trends/statuses_spec.rb
@@ -2,31 +2,26 @@
 
 require 'rails_helper'
 
-describe Api::V1::Admin::Trends::StatusesController do
-  render_views
-
+describe 'API V1 Admin Trends Statuses' do
   let(:role)   { UserRole.find_by(name: 'Admin') }
   let(:user)   { Fabricate(:user, role: role) }
   let(:scopes) { 'admin:read admin:write' }
   let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
   let(:account) { Fabricate(:account) }
   let(:status)  { Fabricate(:status) }
+  let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
 
-  before do
-    allow(controller).to receive(:doorkeeper_token) { token }
-  end
-
-  describe 'GET #index' do
+  describe 'GET /api/v1/admin/trends/statuses' do
     it 'returns http success' do
-      get :index, params: { account_id: account.id, limit: 2 }
+      get '/api/v1/admin/trends/statuses', params: { account_id: account.id, limit: 2 }, headers: headers
 
       expect(response).to have_http_status(200)
     end
   end
 
-  describe 'POST #approve' do
+  describe 'POST /api/v1/admin/trends/statuses/:id/approve' do
     before do
-      post :approve, params: { id: status.id }
+      post "/api/v1/admin/trends/statuses/#{status.id}/approve", headers: headers
     end
 
     it_behaves_like 'forbidden for wrong scope', 'write:statuses'
@@ -37,9 +32,9 @@
     end
   end
 
-  describe 'POST #reject' do
+  describe 'POST /api/v1/admin/trends/statuses/:id/unapprove' do
     before do
-      post :reject, params: { id: status.id }
+      post "/api/v1/admin/trends/statuses/#{status.id}/reject", headers: headers
     end
 
     it_behaves_like 'forbidden for wrong scope', 'write:statuses'
diff --git a/spec/controllers/api/v1/admin/trends/tags_controller_spec.rb b/spec/requests/api/v1/admin/trends/tags_spec.rb
similarity index 64%
rename from spec/controllers/api/v1/admin/trends/tags_controller_spec.rb
rename to spec/requests/api/v1/admin/trends/tags_spec.rb
index 0b8eb8c3b8d4fc..b1437dad8dbd0e 100644
--- a/spec/controllers/api/v1/admin/trends/tags_controller_spec.rb
+++ b/spec/requests/api/v1/admin/trends/tags_spec.rb
@@ -2,31 +2,26 @@
 
 require 'rails_helper'
 
-describe Api::V1::Admin::Trends::TagsController do
-  render_views
-
+describe 'API V1 Admin Trends Tags' do
   let(:role)   { UserRole.find_by(name: 'Admin') }
   let(:user)   { Fabricate(:user, role: role) }
   let(:scopes) { 'admin:read admin:write' }
   let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
   let(:account) { Fabricate(:account) }
   let(:tag)     { Fabricate(:tag) }
+  let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
 
-  before do
-    allow(controller).to receive(:doorkeeper_token) { token }
-  end
-
-  describe 'GET #index' do
+  describe 'GET /api/v1/admin/trends/tags' do
     it 'returns http success' do
-      get :index, params: { account_id: account.id, limit: 2 }
+      get '/api/v1/admin/trends/tags', params: { account_id: account.id, limit: 2 }, headers: headers
 
       expect(response).to have_http_status(200)
     end
   end
 
-  describe 'POST #approve' do
+  describe 'POST /api/v1/admin/trends/tags/:id/approve' do
     before do
-      post :approve, params: { id: tag.id }
+      post "/api/v1/admin/trends/tags/#{tag.id}/approve", headers: headers
     end
 
     it_behaves_like 'forbidden for wrong scope', 'write:statuses'
@@ -37,9 +32,9 @@
     end
   end
 
-  describe 'POST #reject' do
+  describe 'POST /api/v1/admin/trends/tags/:id/reject' do
     before do
-      post :reject, params: { id: tag.id }
+      post "/api/v1/admin/trends/tags/#{tag.id}/reject", headers: headers
     end
 
     it_behaves_like 'forbidden for wrong scope', 'write:statuses'
diff --git a/spec/controllers/api/v1/announcements/reactions_controller_spec.rb b/spec/requests/api/v1/announcements/reactions_spec.rb
similarity index 64%
rename from spec/controllers/api/v1/announcements/reactions_controller_spec.rb
rename to spec/requests/api/v1/announcements/reactions_spec.rb
index c1debc33fe22cc..ffacb2b0afa270 100644
--- a/spec/controllers/api/v1/announcements/reactions_controller_spec.rb
+++ b/spec/requests/api/v1/announcements/reactions_spec.rb
@@ -2,27 +2,26 @@
 
 require 'rails_helper'
 
-RSpec.describe Api::V1::Announcements::ReactionsController do
-  render_views
-
+RSpec.describe 'API V1 Announcements Reactions' do
   let(:user)   { Fabricate(:user) }
   let(:scopes) { 'write:favourites' }
   let(:token)  { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+  let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
 
   let!(:announcement) { Fabricate(:announcement) }
 
-  describe 'PUT #update' do
+  describe 'PUT /api/v1/announcements/:announcement_id/reactions/:id' do
     context 'without token' do
       it 'returns http unauthorized' do
-        put :update, params: { announcement_id: announcement.id, id: '😂' }
+        put "/api/v1/announcements/#{announcement.id}/reactions/#{escaped_emoji}"
+
         expect(response).to have_http_status 401
       end
     end
 
     context 'with token' do
       before do
-        allow(controller).to receive(:doorkeeper_token) { token }
-        put :update, params: { announcement_id: announcement.id, id: '😂' }
+        put "/api/v1/announcements/#{announcement.id}/reactions/#{escaped_emoji}", headers: headers
       end
 
       it 'creates reaction', :aggregate_failures do
@@ -32,22 +31,21 @@
     end
   end
 
-  describe 'DELETE #destroy' do
+  describe 'DELETE /api/v1/announcements/:announcement_id/reactions/:id' do
     before do
       announcement.announcement_reactions.create!(account: user.account, name: '😂')
     end
 
     context 'without token' do
       it 'returns http unauthorized' do
-        delete :destroy, params: { announcement_id: announcement.id, id: '😂' }
+        delete "/api/v1/announcements/#{announcement.id}/reactions/#{escaped_emoji}"
         expect(response).to have_http_status 401
       end
     end
 
     context 'with token' do
       before do
-        allow(controller).to receive(:doorkeeper_token) { token }
-        delete :destroy, params: { announcement_id: announcement.id, id: '😂' }
+        delete "/api/v1/announcements/#{announcement.id}/reactions/#{escaped_emoji}", headers: headers
       end
 
       it 'creates reaction', :aggregate_failures do
@@ -56,4 +54,8 @@
       end
     end
   end
+
+  def escaped_emoji
+    CGI.escape('😂')
+  end
 end
diff --git a/spec/controllers/api/v1/announcements_controller_spec.rb b/spec/requests/api/v1/announcements_spec.rb
similarity index 59%
rename from spec/controllers/api/v1/announcements_controller_spec.rb
rename to spec/requests/api/v1/announcements_spec.rb
index 95ce8fd9fc1b01..1624b76012563b 100644
--- a/spec/controllers/api/v1/announcements_controller_spec.rb
+++ b/spec/requests/api/v1/announcements_spec.rb
@@ -2,27 +2,26 @@
 
 require 'rails_helper'
 
-RSpec.describe Api::V1::AnnouncementsController do
-  render_views
-
-  let(:user)   { Fabricate(:user) }
-  let(:scopes) { 'read' }
-  let(:token)  { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+RSpec.describe 'API V1 Announcements' do
+  let(:user)    { Fabricate(:user) }
+  let(:scopes)  { 'read' }
+  let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+  let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
 
   let!(:announcement) { Fabricate(:announcement) }
 
-  describe 'GET #index' do
+  describe 'GET /api/v1/announcements' do
     context 'without token' do
       it 'returns http unprocessable entity' do
-        get :index
+        get '/api/v1/announcements'
+
         expect(response).to have_http_status 422
       end
     end
 
     context 'with token' do
       before do
-        allow(controller).to receive(:doorkeeper_token) { token }
-        get :index
+        get '/api/v1/announcements', headers: headers
       end
 
       it 'returns http success' do
@@ -31,10 +30,11 @@
     end
   end
 
-  describe 'POST #dismiss' do
+  describe 'POST /api/v1/announcements/:id/dismiss' do
     context 'without token' do
       it 'returns http unauthorized' do
-        post :dismiss, params: { id: announcement.id }
+        post "/api/v1/announcements/#{announcement.id}/dismiss"
+
         expect(response).to have_http_status 401
       end
     end
@@ -43,8 +43,7 @@
       let(:scopes) { 'write:accounts' }
 
       before do
-        allow(controller).to receive(:doorkeeper_token) { token }
-        post :dismiss, params: { id: announcement.id }
+        post "/api/v1/announcements/#{announcement.id}/dismiss", headers: headers
       end
 
       it 'dismisses announcement', :aggregate_failures do
diff --git a/spec/controllers/api/v1/conversations_controller_spec.rb b/spec/requests/api/v1/conversations_spec.rb
similarity index 50%
rename from spec/controllers/api/v1/conversations_controller_spec.rb
rename to spec/requests/api/v1/conversations_spec.rb
index 2734e4a07b4d1f..e2327d9a9374bd 100644
--- a/spec/controllers/api/v1/conversations_controller_spec.rb
+++ b/spec/requests/api/v1/conversations_spec.rb
@@ -2,53 +2,48 @@
 
 require 'rails_helper'
 
-RSpec.describe Api::V1::ConversationsController do
-  render_views
-
+RSpec.describe 'API V1 Conversations' do
   let!(:user) { Fabricate(:user, account_attributes: { username: 'alice' }) }
-  let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
-  let(:other) { Fabricate(:user) }
-
-  before do
-    allow(controller).to receive(:doorkeeper_token) { token }
-  end
+  let(:scopes) { 'read:statuses' }
+  let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+  let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
 
-  describe 'GET #index', :sidekiq_inline do
-    let(:scopes) { 'read:statuses' }
+  let(:other) { Fabricate(:user) }
 
+  describe 'GET /api/v1/conversations', :sidekiq_inline do
     before do
       PostStatusService.new.call(other.account, text: 'Hey @alice', visibility: 'direct')
       PostStatusService.new.call(user.account, text: 'Hey, nobody here', visibility: 'direct')
     end
 
     it 'returns pagination headers', :aggregate_failures do
-      get :index, params: { limit: 1 }
+      get '/api/v1/conversations', params: { limit: 1 }, headers: headers
 
       expect(response).to have_http_status(200)
       expect(response.headers['Link'].links.size).to eq(2)
     end
 
     it 'returns conversations', :aggregate_failures do
-      get :index
-      json = body_as_json
-      expect(json.size).to eq 2
-      expect(json[0][:accounts].size).to eq 1
+      get '/api/v1/conversations', headers: headers
+
+      expect(body_as_json.size).to eq 2
+      expect(body_as_json[0][:accounts].size).to eq 1
     end
 
     context 'with since_id' do
       context 'when requesting old posts' do
         it 'returns conversations' do
-          get :index, params: { since_id: Mastodon::Snowflake.id_at(1.hour.ago, with_random: false) }
-          json = body_as_json
-          expect(json.size).to eq 2
+          get '/api/v1/conversations', params: { since_id: Mastodon::Snowflake.id_at(1.hour.ago, with_random: false) }, headers: headers
+
+          expect(body_as_json.size).to eq 2
         end
       end
 
       context 'when requesting posts in the future' do
         it 'returns no conversation' do
-          get :index, params: { since_id: Mastodon::Snowflake.id_at(1.hour.from_now, with_random: false) }
-          json = body_as_json
-          expect(json.size).to eq 0
+          get '/api/v1/conversations', params: { since_id: Mastodon::Snowflake.id_at(1.hour.from_now, with_random: false) }, headers: headers
+
+          expect(body_as_json.size).to eq 0
         end
       end
     end
diff --git a/spec/controllers/api/v1/filters_controller_spec.rb b/spec/requests/api/v1/filters_spec.rb
similarity index 75%
rename from spec/controllers/api/v1/filters_controller_spec.rb
rename to spec/requests/api/v1/filters_spec.rb
index b0f64ccf418aa1..deb6e7421774f5 100644
--- a/spec/controllers/api/v1/filters_controller_spec.rb
+++ b/spec/requests/api/v1/filters_spec.rb
@@ -2,23 +2,18 @@
 
 require 'rails_helper'
 
-RSpec.describe Api::V1::FiltersController do
-  render_views
+RSpec.describe 'API V1 Filters' do
+  let(:user)    { Fabricate(:user) }
+  let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+  let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
 
-  let(:user)  { Fabricate(:user) }
-  let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
-
-  before do
-    allow(controller).to receive(:doorkeeper_token) { token }
-  end
-
-  describe 'GET #index' do
+  describe 'GET /api/v1/filters' do
     let(:scopes) { 'read:filters' }
     let!(:filter) { Fabricate(:custom_filter, account: user.account) }
     let!(:custom_filter_keyword) { Fabricate(:custom_filter_keyword, custom_filter: filter) }
 
     it 'returns http success' do
-      get :index
+      get '/api/v1/filters', headers: headers
       expect(response).to have_http_status(200)
       expect(body_as_json)
         .to contain_exactly(
@@ -27,13 +22,13 @@
     end
   end
 
-  describe 'POST #create' do
+  describe 'POST /api/v1/filters' do
     let(:scopes) { 'write:filters' }
     let(:irreversible) { true }
     let(:whole_word)   { false }
 
     before do
-      post :create, params: { phrase: 'magic', context: %w(home), irreversible: irreversible, whole_word: whole_word }
+      post '/api/v1/filters', params: { phrase: 'magic', context: %w(home), irreversible: irreversible, whole_word: whole_word }, headers: headers
     end
 
     it 'creates a filter', :aggregate_failures do
@@ -64,24 +59,25 @@
     end
   end
 
-  describe 'GET #show' do
+  describe 'GET /api/v1/filters/:id' do
     let(:scopes)  { 'read:filters' }
     let(:filter)  { Fabricate(:custom_filter, account: user.account) }
     let(:keyword) { Fabricate(:custom_filter_keyword, custom_filter: filter) }
 
     it 'returns http success' do
-      get :show, params: { id: keyword.id }
+      get "/api/v1/filters/#{keyword.id}", headers: headers
+
       expect(response).to have_http_status(200)
     end
   end
 
-  describe 'PUT #update' do
+  describe 'PUT /api/v1/filters/:id' do
     let(:scopes)  { 'write:filters' }
     let(:filter)  { Fabricate(:custom_filter, account: user.account) }
     let(:keyword) { Fabricate(:custom_filter_keyword, custom_filter: filter) }
 
     before do
-      put :update, params: { id: keyword.id, phrase: 'updated' }
+      put "/api/v1/filters/#{keyword.id}", headers: headers, params: { phrase: 'updated' }
     end
 
     it 'updates the filter', :aggregate_failures do
@@ -90,13 +86,13 @@
     end
   end
 
-  describe 'DELETE #destroy' do
+  describe 'DELETE /api/v1/filters/:id' do
     let(:scopes)  { 'write:filters' }
     let(:filter)  { Fabricate(:custom_filter, account: user.account) }
     let(:keyword) { Fabricate(:custom_filter_keyword, custom_filter: filter) }
 
     before do
-      delete :destroy, params: { id: keyword.id }
+      delete "/api/v1/filters/#{keyword.id}", headers: headers
     end
 
     it 'removes the filter', :aggregate_failures do
diff --git a/spec/controllers/api/v1/polls/votes_controller_spec.rb b/spec/requests/api/v1/polls/votes_spec.rb
similarity index 61%
rename from spec/controllers/api/v1/polls/votes_controller_spec.rb
rename to spec/requests/api/v1/polls/votes_spec.rb
index 5de225a48796ed..e2b22708be8720 100644
--- a/spec/controllers/api/v1/polls/votes_controller_spec.rb
+++ b/spec/requests/api/v1/polls/votes_spec.rb
@@ -2,30 +2,32 @@
 
 require 'rails_helper'
 
-RSpec.describe Api::V1::Polls::VotesController do
-  render_views
-
+RSpec.describe 'API V1 Polls Votes' do
   let(:user)   { Fabricate(:user) }
   let(:scopes) { 'write:statuses' }
   let(:token)  { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+  let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
 
-  before { allow(controller).to receive(:doorkeeper_token) { token } }
-
-  describe 'POST #create' do
+  describe 'POST /api/v1/polls/:poll_id/votes' do
     let(:poll) { Fabricate(:poll) }
 
     before do
-      post :create, params: { poll_id: poll.id, choices: %w(1) }
+      post "/api/v1/polls/#{poll.id}/votes", params: { choices: %w(1) }, headers: headers
     end
 
     it 'creates a vote', :aggregate_failures do
       expect(response).to have_http_status(200)
-      vote = poll.votes.where(account: user.account).first
 
       expect(vote).to_not be_nil
       expect(vote.choice).to eq 1
 
       expect(poll.reload.cached_tallies).to eq [0, 1]
     end
+
+    private
+
+    def vote
+      poll.votes.where(account: user.account).first
+    end
   end
 end
diff --git a/spec/controllers/api/v1/push/subscriptions_controller_spec.rb b/spec/requests/api/v1/push/subscriptions_spec.rb
similarity index 67%
rename from spec/controllers/api/v1/push/subscriptions_controller_spec.rb
rename to spec/requests/api/v1/push/subscriptions_spec.rb
index 1681914680ab46..d699fd1e08503a 100644
--- a/spec/controllers/api/v1/push/subscriptions_controller_spec.rb
+++ b/spec/requests/api/v1/push/subscriptions_spec.rb
@@ -2,9 +2,7 @@
 
 require 'rails_helper'
 
-describe Api::V1::Push::SubscriptionsController do
-  render_views
-
+describe 'API V1 Push Subscriptions' do
   let(:user) { Fabricate(:user) }
   let(:create_payload) do
     {
@@ -34,15 +32,13 @@
       },
     }.with_indifferent_access
   end
-  let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'push') }
-
-  before do
-    allow(controller).to receive(:doorkeeper_token) { token }
-  end
+  let(:scopes) { 'push' }
+  let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+  let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
 
-  describe 'POST #create' do
+  describe 'POST /api/v1/push/subscription' do
     before do
-      post :create, params: create_payload
+      post '/api/v1/push/subscription', params: create_payload, headers: headers
     end
 
     it 'saves push subscriptions' do
@@ -56,19 +52,23 @@
     end
 
     it 'replaces old subscription on repeat calls' do
-      post :create, params: create_payload
+      post '/api/v1/push/subscription', params: create_payload, headers: headers
+
       expect(Web::PushSubscription.where(endpoint: create_payload[:subscription][:endpoint]).count).to eq 1
     end
 
     it 'returns the expected JSON' do
-      expect(body_as_json.with_indifferent_access).to include({ endpoint: create_payload[:subscription][:endpoint], alerts: {}, policy: 'all' })
+      expect(body_as_json.with_indifferent_access)
+        .to include(
+          { endpoint: create_payload[:subscription][:endpoint], alerts: {}, policy: 'all' }
+        )
     end
   end
 
-  describe 'PUT #update' do
+  describe 'PUT /api/v1/push/subscription' do
     before do
-      post :create, params: create_payload
-      put :update, params: alerts_payload
+      post '/api/v1/push/subscription', params: create_payload, headers: headers
+      put '/api/v1/push/subscription', params: alerts_payload, headers: headers
     end
 
     it 'changes alert settings' do
@@ -82,14 +82,17 @@
     end
 
     it 'returns the expected JSON' do
-      expect(body_as_json.with_indifferent_access).to include({ endpoint: create_payload[:subscription][:endpoint], alerts: alerts_payload[:data][:alerts], policy: alerts_payload[:data][:policy] })
+      expect(body_as_json.with_indifferent_access)
+        .to include(
+          { endpoint: create_payload[:subscription][:endpoint], alerts: alerts_payload[:data][:alerts], policy: alerts_payload[:data][:policy] }
+        )
     end
   end
 
-  describe 'DELETE #destroy' do
+  describe 'DELETE /api/v1/push/subscription' do
     before do
-      post :create, params: create_payload
-      delete :destroy
+      post '/api/v1/push/subscription', params: create_payload, headers: headers
+      delete '/api/v1/push/subscription', headers: headers
     end
 
     it 'removes the subscription' do
diff --git a/spec/controllers/api/v1/streaming_controller_spec.rb b/spec/requests/api/v1/streaming_spec.rb
similarity index 51%
rename from spec/controllers/api/v1/streaming_controller_spec.rb
rename to spec/requests/api/v1/streaming_spec.rb
index 099f68a74ebade..6b550dfa606b8f 100644
--- a/spec/controllers/api/v1/streaming_controller_spec.rb
+++ b/spec/requests/api/v1/streaming_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Api::V1::StreamingController do
+describe 'API V1 Streaming' do
   around do |example|
     before = Rails.configuration.x.streaming_api_base_url
     Rails.configuration.x.streaming_api_base_url = "wss://#{Rails.configuration.x.web_domain}"
@@ -10,14 +10,13 @@
     Rails.configuration.x.streaming_api_base_url = before
   end
 
-  before do
-    request.headers.merge! Host: Rails.configuration.x.web_domain
-  end
+  let(:headers) { { 'Host' => Rails.configuration.x.web_domain } }
 
   context 'with streaming api on same host' do
-    describe 'GET #index' do
+    describe 'GET /api/v1/streaming' do
       it 'raises ActiveRecord::RecordNotFound' do
-        get :index
+        get '/api/v1/streaming', headers: headers
+
         expect(response).to have_http_status(404)
       end
     end
@@ -28,20 +27,33 @@
       Rails.configuration.x.streaming_api_base_url = "wss://streaming-#{Rails.configuration.x.web_domain}"
     end
 
-    describe 'GET #index' do
+    describe 'GET /api/v1/streaming' do
       it 'redirects to streaming host' do
-        get :index, params: { access_token: 'deadbeef', stream: 'public' }
-        expect(response).to have_http_status(301)
-        request_uri = URI.parse(request.url)
-        redirect_to_uri = URI.parse(response.location)
-        [:scheme, :path, :query, :fragment].each do |part|
-          expect(redirect_to_uri.send(part)).to eq(request_uri.send(part)), "redirect target #{part}"
-        end
-        expect(redirect_to_uri.host).to eq(streaming_host), 'redirect target host'
+        get '/api/v1/streaming', headers: headers, params: { access_token: 'deadbeef', stream: 'public' }
+
+        expect(response)
+          .to have_http_status(301)
+
+        expect(redirect_to_uri)
+          .to have_attributes(
+            fragment: request_uri.fragment,
+            host: eq(streaming_host),
+            path: request_uri.path,
+            query: request_uri.query,
+            scheme: request_uri.scheme
+          )
       end
 
       private
 
+      def request_uri
+        URI.parse(request.url)
+      end
+
+      def redirect_to_uri
+        URI.parse(response.location)
+      end
+
       def streaming_host
         URI.parse(Rails.configuration.x.streaming_api_base_url).host
       end

From b4af3639e831c974cba3c4bb6d7253883e79c1ce Mon Sep 17 00:00:00 2001
From: Krzysztof Piwowar <kristoff.brewer@gmail.com>
Date: Fri, 1 Mar 2024 18:35:35 +0100
Subject: [PATCH 0344/2191] Add Kashubian to languages dropdown (#26024)

---
 app/helpers/languages_helper.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/helpers/languages_helper.rb b/app/helpers/languages_helper.rb
index 87f0f288d36335..798f0271678f2c 100644
--- a/app/helpers/languages_helper.rb
+++ b/app/helpers/languages_helper.rb
@@ -191,6 +191,7 @@ module LanguagesHelper
     chr: ['Cherokee', 'ᏣᎳᎩ ᎦᏬᏂᎯᏍᏗ'].freeze,
     ckb: ['Sorani (Kurdish)', 'سۆرانی'].freeze,
     cnr: ['Montenegrin', 'crnogorski'].freeze,
+    csb: ['Kashubian', 'Kaszëbsczi'].freeze,
     jbo: ['Lojban', 'la .lojban.'].freeze,
     kab: ['Kabyle', 'Taqbaylit'].freeze,
     ldn: ['Láadan', 'Láadan'].freeze,

From 8d22599318a3eec7b69df632eab463a85899cf10 Mon Sep 17 00:00:00 2001
From: Helge <helge.krueger@gmail.com>
Date: Fri, 1 Mar 2024 18:36:00 +0100
Subject: [PATCH 0345/2191] Add Pennsylvania Dutch to languages dropdown
 (#26634)

---
 app/helpers/languages_helper.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/helpers/languages_helper.rb b/app/helpers/languages_helper.rb
index 798f0271678f2c..5fc2d96d74ca5c 100644
--- a/app/helpers/languages_helper.rb
+++ b/app/helpers/languages_helper.rb
@@ -196,6 +196,7 @@ module LanguagesHelper
     kab: ['Kabyle', 'Taqbaylit'].freeze,
     ldn: ['Láadan', 'Láadan'].freeze,
     lfn: ['Lingua Franca Nova', 'lingua franca nova'].freeze,
+    pdc: ['Pennsylvania Dutch', 'Pennsilfaani-Deitsch'].freeze,
     sco: ['Scots', 'Scots'].freeze,
     sma: ['Southern Sami', 'Åarjelsaemien Gïele'].freeze,
     smj: ['Lule Sami', 'Julevsámegiella'].freeze,

From 5ab944af95ddf496cde18a6bdae6a1bd87e7a713 Mon Sep 17 00:00:00 2001
From: gunchleoc <fios@foramnagaidhlig.net>
Date: Fri, 1 Mar 2024 17:40:48 +0000
Subject: [PATCH 0346/2191] Rename Panjabi to Punjabi (#27117)

---
 app/helpers/languages_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/helpers/languages_helper.rb b/app/helpers/languages_helper.rb
index 5fc2d96d74ca5c..bea122cad63f9f 100644
--- a/app/helpers/languages_helper.rb
+++ b/app/helpers/languages_helper.rb
@@ -127,7 +127,7 @@ module LanguagesHelper
     om: ['Oromo', 'Afaan Oromoo'].freeze,
     or: ['Oriya', 'ଓଡ଼ିଆ'].freeze,
     os: ['Ossetian', 'ирон æвзаг'].freeze,
-    pa: ['Panjabi', 'ਪੰਜਾਬੀ'].freeze,
+    pa: ['Punjabi', 'ਪੰਜਾਬੀ'].freeze,
     pi: ['Pāli', 'पाऴि'].freeze,
     pl: ['Polish', 'Polski'].freeze,
     ps: ['Pashto', 'پښتو'].freeze,

From 1d5de8b26acb448f58e2ce310c1fe35e0750267b Mon Sep 17 00:00:00 2001
From: gunchleoc <fios@foramnagaidhlig.net>
Date: Fri, 1 Mar 2024 17:41:49 +0000
Subject: [PATCH 0347/2191] Add Vai to posting languages (#27136)

---
 app/helpers/languages_helper.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/helpers/languages_helper.rb b/app/helpers/languages_helper.rb
index bea122cad63f9f..65ade9fd2a7015 100644
--- a/app/helpers/languages_helper.rb
+++ b/app/helpers/languages_helper.rb
@@ -202,6 +202,7 @@ module LanguagesHelper
     smj: ['Lule Sami', 'Julevsámegiella'].freeze,
     szl: ['Silesian', 'ślůnsko godka'].freeze,
     tok: ['Toki Pona', 'toki pona'].freeze,
+    vai: ['Vai', 'ꕙꔤ'].freeze,
     xal: ['Kalmyk', 'Хальмг келн'].freeze,
     zba: ['Balaibalan', 'باليبلن'].freeze,
     zgh: ['Standard Moroccan Tamazight', 'ⵜⴰⵎⴰⵣⵉⵖⵜ'].freeze,

From b6b94c971fa7747aeb7d7588319429d6a5d856c9 Mon Sep 17 00:00:00 2001
From: Dave MacLeod <56599343+Dhghomon@users.noreply.github.com>
Date: Sat, 2 Mar 2024 02:51:22 +0900
Subject: [PATCH 0348/2191] Add Interlingue to available_locales (#28630)

---
 config/initializers/i18n.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/initializers/i18n.rb b/config/initializers/i18n.rb
index 1c1cea1b9453b3..8643060fa663b5 100644
--- a/config/initializers/i18n.rb
+++ b/config/initializers/i18n.rb
@@ -42,6 +42,7 @@
     :hu,
     :hy,
     :id,
+    :ie,
     :ig,
     :io,
     :is,

From 64b8ba36bb1ac97b7c6dc0b259682a9a4f02524f Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Sat, 2 Mar 2024 13:31:43 -0500
Subject: [PATCH 0349/2191] Add `bin/dev` script to launch foreman (#28242)

---
 README.md   | 18 +++++++-----------
 Vagrantfile |  2 +-
 bin/dev     | 20 ++++++++++++++++++++
 3 files changed, 28 insertions(+), 12 deletions(-)
 create mode 100755 bin/dev

diff --git a/README.md b/README.md
index 6cf722b355af8b..7f9b115c4f9341 100644
--- a/README.md
+++ b/README.md
@@ -83,23 +83,19 @@ A **Vagrant** configuration is included for development purposes. To use it, com
 - Install Vagrant and Virtualbox
 - Install the `vagrant-hostsupdater` plugin: `vagrant plugin install vagrant-hostsupdater`
 - Run `vagrant up`
-- Run `vagrant ssh -c "cd /vagrant && foreman start"`
+- Run `vagrant ssh -c "cd /vagrant && bin/dev"`
 - Open `http://mastodon.local` in your browser
 
 ### MacOS
 
 To set up **MacOS** for native development, complete the following steps:
 
-- Install the latest stable Ruby version (use a Ruby version manager for easy installation and management of Ruby versions)
-- Run `brew install postgresql@14`
-- Run `brew install redis`
-- Run `brew install imagemagick`
-- Run `brew install libidn`
-- Install Foreman or a similar tool (such as [overmind](https://github.com/DarthSim/overmind)) to handle multiple process launching.
-- Navigate to Mastodon's root directory and run `brew install nvm` then `nvm use` to use the version from .nvmrc
+- Use a Ruby version manager to install the specified version from `.ruby-version`
+- Run `brew install postgresql@14 redis imagemagick libidn` to install required dependencies
+- Navigate to Mastodon's root directory and run `brew install nvm` then `nvm use` to use the version from `.nvmrc`
 - Run `corepack enable && corepack prepare`
 - Run `bundle exec rails db:setup` (optionally prepend `RAILS_ENV=development` to target the dev environment)
-- Finally, run `overmind start -f Procfile.dev`
+- Finally, run `bin/dev` which will launch the local services via `overmind` (if installed) or `foreman`
 
 ### Docker
 
@@ -108,7 +104,7 @@ For development with **Docker**, complete the following steps:
 - Install Docker Desktop
 - Run `docker compose -f .devcontainer/docker-compose.yml up -d`
 - Run `docker compose -f .devcontainer/docker-compose.yml exec app .devcontainer/post-create.sh`
-- Finally, run `docker compose -f .devcontainer/docker-compose.yml exec app foreman start -f Procfile.dev`
+- Finally, run `docker compose -f .devcontainer/docker-compose.yml exec app bin/dev`
 
 If you are using an IDE with [support for the Development Container specification](https://containers.dev/supporting), it will run the above `docker compose` commands automatically. For **Visual Studio Code** this requires the [Dev Container extension](https://containers.dev/supporting#dev-containers).
 
@@ -119,7 +115,7 @@ To get you coding in just a few minutes, GitHub Codespaces provides a web-based
 - Click this button to create a new codespace:<br>
   [![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://github.com/codespaces/new?hide_repo_select=true&ref=main&repo=52281283&devcontainer_path=.devcontainer%2Fcodespaces%2Fdevcontainer.json)
 - Wait for the environment to build. This will take a few minutes.
-- When the editor is ready, run `foreman start -f Procfile.dev` in the terminal.
+- When the editor is ready, run `bin/dev` in the terminal.
 - After a few seconds, a popup will appear with a button labeled _Open in Browser_. This will open Mastodon.
 - On the _Ports_ tab, right click on the “stream” row and select _Port visibility_ → _Public_.
 
diff --git a/Vagrantfile b/Vagrantfile
index 6f0f5110952aed..12bd1ba67a4655 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -188,7 +188,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
   config.vm.post_up_message = <<MESSAGE
 To start server
-  $ vagrant ssh -c "cd /vagrant && foreman start"
+  $ vagrant ssh -c "cd /vagrant && bin/dev"
 MESSAGE
 
 end
diff --git a/bin/dev b/bin/dev
new file mode 100755
index 00000000000000..9b1d3ac6fcc164
--- /dev/null
+++ b/bin/dev
@@ -0,0 +1,20 @@
+#!/usr/bin/env sh
+
+# Default to port 3000 if not specified
+export PORT="${PORT:-3000}"
+
+# Get around our boot.rb ENV check
+export RAILS_ENV="${RAILS_ENV:-development}"
+
+if command -v overmind &> /dev/null
+then
+  overmind start -f Procfile.dev "$@"
+  exit $?
+fi
+
+if gem list --no-installed --exact --silent foreman; then
+  echo "Installing foreman..."
+  gem install foreman
+fi
+
+foreman start -f Procfile.dev "$@"

From 68600893d2ae41c001cf8449e3dd4ffa75f7f8c9 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 2 Mar 2024 19:33:33 +0100
Subject: [PATCH 0350/2191] Update babel monorepo to v7.24.0 (#29434)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 118 +++++++++++++++++++++++++++---------------------------
 1 file changed, 59 insertions(+), 59 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index b336fef88c6a8f..a6008440227975 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -52,7 +52,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/compat-data@npm:^7.22.6, @babel/compat-data@npm:^7.23.3, @babel/compat-data@npm:^7.23.5":
+"@babel/compat-data@npm:^7.22.6, @babel/compat-data@npm:^7.23.5":
   version: 7.23.5
   resolution: "@babel/compat-data@npm:7.23.5"
   checksum: 10c0/081278ed46131a890ad566a59c61600a5f9557bd8ee5e535890c8548192532ea92590742fd74bd9db83d74c669ef8a04a7e1c85cdea27f960233e3b83c3a957c
@@ -60,25 +60,25 @@ __metadata:
   linkType: hard
 
 "@babel/core@npm:^7.10.4, @babel/core@npm:^7.11.1, @babel/core@npm:^7.11.6, @babel/core@npm:^7.12.3, @babel/core@npm:^7.22.1":
-  version: 7.23.9
-  resolution: "@babel/core@npm:7.23.9"
+  version: 7.24.0
+  resolution: "@babel/core@npm:7.24.0"
   dependencies:
     "@ampproject/remapping": "npm:^2.2.0"
     "@babel/code-frame": "npm:^7.23.5"
     "@babel/generator": "npm:^7.23.6"
     "@babel/helper-compilation-targets": "npm:^7.23.6"
     "@babel/helper-module-transforms": "npm:^7.23.3"
-    "@babel/helpers": "npm:^7.23.9"
-    "@babel/parser": "npm:^7.23.9"
-    "@babel/template": "npm:^7.23.9"
-    "@babel/traverse": "npm:^7.23.9"
-    "@babel/types": "npm:^7.23.9"
+    "@babel/helpers": "npm:^7.24.0"
+    "@babel/parser": "npm:^7.24.0"
+    "@babel/template": "npm:^7.24.0"
+    "@babel/traverse": "npm:^7.24.0"
+    "@babel/types": "npm:^7.24.0"
     convert-source-map: "npm:^2.0.0"
     debug: "npm:^4.1.0"
     gensync: "npm:^1.0.0-beta.2"
     json5: "npm:^2.2.3"
     semver: "npm:^6.3.1"
-  checksum: 10c0/03883300bf1252ab4c9ba5b52f161232dd52873dbe5cde9289bb2bb26e935c42682493acbac9194a59a3b6cbd17f4c4c84030db8d6d482588afe64531532ff9b
+  checksum: 10c0/bb37cbf0bdfd676b246af0a3d9a7932d10573f2d45114fdda02a71889e35530ce13d8930177e78b065d6734b8d45a4fbf7c77f223b1d44b4a28cfe5fefee93ed
   languageName: node
   linkType: hard
 
@@ -250,10 +250,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-plugin-utils@npm:^7.0.0, @babel/helper-plugin-utils@npm:^7.10.4, @babel/helper-plugin-utils@npm:^7.12.13, @babel/helper-plugin-utils@npm:^7.14.5, @babel/helper-plugin-utils@npm:^7.18.6, @babel/helper-plugin-utils@npm:^7.22.5, @babel/helper-plugin-utils@npm:^7.8.0, @babel/helper-plugin-utils@npm:^7.8.3":
-  version: 7.22.5
-  resolution: "@babel/helper-plugin-utils@npm:7.22.5"
-  checksum: 10c0/d2c4bfe2fa91058bcdee4f4e57a3f4933aed7af843acfd169cd6179fab8d13c1d636474ecabb2af107dc77462c7e893199aa26632bac1c6d7e025a17cbb9d20d
+"@babel/helper-plugin-utils@npm:^7.0.0, @babel/helper-plugin-utils@npm:^7.10.4, @babel/helper-plugin-utils@npm:^7.12.13, @babel/helper-plugin-utils@npm:^7.14.5, @babel/helper-plugin-utils@npm:^7.18.6, @babel/helper-plugin-utils@npm:^7.22.5, @babel/helper-plugin-utils@npm:^7.24.0, @babel/helper-plugin-utils@npm:^7.8.0, @babel/helper-plugin-utils@npm:^7.8.3":
+  version: 7.24.0
+  resolution: "@babel/helper-plugin-utils@npm:7.24.0"
+  checksum: 10c0/90f41bd1b4dfe7226b1d33a4bb745844c5c63e400f9e4e8bf9103a7ceddd7d425d65333b564d9daba3cebd105985764d51b4bd4c95822b97c2e3ac1201a8a5da
   languageName: node
   linkType: hard
 
@@ -342,14 +342,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helpers@npm:^7.23.9":
-  version: 7.23.9
-  resolution: "@babel/helpers@npm:7.23.9"
+"@babel/helpers@npm:^7.24.0":
+  version: 7.24.0
+  resolution: "@babel/helpers@npm:7.24.0"
   dependencies:
-    "@babel/template": "npm:^7.23.9"
-    "@babel/traverse": "npm:^7.23.9"
-    "@babel/types": "npm:^7.23.9"
-  checksum: 10c0/f69fd0aca96a6fb8bd6dd044cd8a5c0f1851072d4ce23355345b9493c4032e76d1217f86b70df795e127553cf7f3fcd1587ede9d1b03b95e8b62681ca2165b87
+    "@babel/template": "npm:^7.24.0"
+    "@babel/traverse": "npm:^7.24.0"
+    "@babel/types": "npm:^7.24.0"
+  checksum: 10c0/dd27c9f11c1c5244ef312fae37636f2fcc69c541c46508017b846c4cf680af059f1922ce84e3f778f123a70d027ded75c96070ee8e906f3bc52dc26dc43df608
   languageName: node
   linkType: hard
 
@@ -364,12 +364,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.23.9":
-  version: 7.23.9
-  resolution: "@babel/parser@npm:7.23.9"
+"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.24.0":
+  version: 7.24.0
+  resolution: "@babel/parser@npm:7.24.0"
   bin:
     parser: ./bin/babel-parser.js
-  checksum: 10c0/7df97386431366d4810538db4b9ec538f4377096f720c0591c7587a16f6810e62747e9fbbfa1ff99257fd4330035e4fb1b5b77c7bd3b97ce0d2e3780a6618975
+  checksum: 10c0/77593d0b9de9906823c4d653bb6cda1c7593837598516330f655f70cba6224a37def7dbe5b4dad0038482d407d8d209eb8be5f48ca9a13357d769f829c5adb8e
   languageName: node
   linkType: hard
 
@@ -1004,18 +1004,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-object-rest-spread@npm:^7.23.4":
-  version: 7.23.4
-  resolution: "@babel/plugin-transform-object-rest-spread@npm:7.23.4"
+"@babel/plugin-transform-object-rest-spread@npm:^7.24.0":
+  version: 7.24.0
+  resolution: "@babel/plugin-transform-object-rest-spread@npm:7.24.0"
   dependencies:
-    "@babel/compat-data": "npm:^7.23.3"
-    "@babel/helper-compilation-targets": "npm:^7.22.15"
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/compat-data": "npm:^7.23.5"
+    "@babel/helper-compilation-targets": "npm:^7.23.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
     "@babel/plugin-syntax-object-rest-spread": "npm:^7.8.3"
     "@babel/plugin-transform-parameters": "npm:^7.23.3"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/b56017992ffe7fcd1dd9a9da67c39995a141820316266bcf7d77dc912980d228ccbd3f36191d234f5cc389b09157b5d2a955e33e8fb368319534affd1c72b262
+  checksum: 10c0/02fe8b99ee6329e68b97b1b1b5410e50c6c20470e73dcd1d287c6ddb5623c654dce82327b2a3f6710ee3b512fe4950e43ab81d0bbc33d771f0cad3bc3cef87c6
   languageName: node
   linkType: hard
 
@@ -1200,18 +1200,18 @@ __metadata:
   linkType: hard
 
 "@babel/plugin-transform-runtime@npm:^7.22.4":
-  version: 7.23.9
-  resolution: "@babel/plugin-transform-runtime@npm:7.23.9"
+  version: 7.24.0
+  resolution: "@babel/plugin-transform-runtime@npm:7.24.0"
   dependencies:
     "@babel/helper-module-imports": "npm:^7.22.15"
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
     babel-plugin-polyfill-corejs2: "npm:^0.4.8"
     babel-plugin-polyfill-corejs3: "npm:^0.9.0"
     babel-plugin-polyfill-regenerator: "npm:^0.5.5"
     semver: "npm:^6.3.1"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/3b959c2b88ea0009c288fa190d9f69b0d26cb336b8a7cab54a5e54b844f33cce1996725c15305a40049c8f23ca30082ee27e1f6853ff35fad723543e3d2dba47
+  checksum: 10c0/a632e0c6f4b1be21955646ba4f6e4af323daaa6ab68ce39f92f5186d444402e920b33cabd40759c36f72d8c36f256a35ea03060e407ca69bcf373fdcb450aa42
   languageName: node
   linkType: hard
 
@@ -1333,12 +1333,12 @@ __metadata:
   linkType: hard
 
 "@babel/preset-env@npm:^7.11.0, @babel/preset-env@npm:^7.12.1, @babel/preset-env@npm:^7.22.4":
-  version: 7.23.9
-  resolution: "@babel/preset-env@npm:7.23.9"
+  version: 7.24.0
+  resolution: "@babel/preset-env@npm:7.24.0"
   dependencies:
     "@babel/compat-data": "npm:^7.23.5"
     "@babel/helper-compilation-targets": "npm:^7.23.6"
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
     "@babel/helper-validator-option": "npm:^7.23.5"
     "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "npm:^7.23.3"
     "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "npm:^7.23.3"
@@ -1391,7 +1391,7 @@ __metadata:
     "@babel/plugin-transform-new-target": "npm:^7.23.3"
     "@babel/plugin-transform-nullish-coalescing-operator": "npm:^7.23.4"
     "@babel/plugin-transform-numeric-separator": "npm:^7.23.4"
-    "@babel/plugin-transform-object-rest-spread": "npm:^7.23.4"
+    "@babel/plugin-transform-object-rest-spread": "npm:^7.24.0"
     "@babel/plugin-transform-object-super": "npm:^7.23.3"
     "@babel/plugin-transform-optional-catch-binding": "npm:^7.23.4"
     "@babel/plugin-transform-optional-chaining": "npm:^7.23.4"
@@ -1418,7 +1418,7 @@ __metadata:
     semver: "npm:^6.3.1"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/2837a42089180e51bfd6864b6d197e01fc0abec1920422e71c0513c2fc8fb5f3bfe694ed778cc4e45856c546964945bc53bf8105e4b26f3580ce3685fa50cc0f
+  checksum: 10c0/cb5098bb860aede8418f204d7a693108d7c318edbb227f9842ac6aa71f2154ea1737846994af9bcd0c0b716cd73904f69f09bef635a9679465ec3558144beb4f
   languageName: node
   linkType: hard
 
@@ -1483,28 +1483,28 @@ __metadata:
   linkType: hard
 
 "@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.0, @babel/runtime@npm:^7.12.13, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.13.8, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.2.0, @babel/runtime@npm:^7.20.13, @babel/runtime@npm:^7.22.3, @babel/runtime@npm:^7.23.2, @babel/runtime@npm:^7.3.1, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.6.3, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.8.7, @babel/runtime@npm:^7.9.2":
-  version: 7.23.9
-  resolution: "@babel/runtime@npm:7.23.9"
+  version: 7.24.0
+  resolution: "@babel/runtime@npm:7.24.0"
   dependencies:
     regenerator-runtime: "npm:^0.14.0"
-  checksum: 10c0/e71205fdd7082b2656512cc98e647d9ea7e222e4fe5c36e9e5adc026446fcc3ba7b3cdff8b0b694a0b78bb85db83e7b1e3d4c56ef90726682b74f13249cf952d
+  checksum: 10c0/3495eed727bf4a4f84c35bb51ab53317ae38f4bbc3b1d0a8303751f9dfa0ce6f5fb2afced72b76c3dd0d8bb2ccb84787559a4dee9886291a36b26f02f0f759b4
   languageName: node
   linkType: hard
 
-"@babel/template@npm:^7.22.15, @babel/template@npm:^7.23.9, @babel/template@npm:^7.3.3":
-  version: 7.23.9
-  resolution: "@babel/template@npm:7.23.9"
+"@babel/template@npm:^7.22.15, @babel/template@npm:^7.24.0, @babel/template@npm:^7.3.3":
+  version: 7.24.0
+  resolution: "@babel/template@npm:7.24.0"
   dependencies:
     "@babel/code-frame": "npm:^7.23.5"
-    "@babel/parser": "npm:^7.23.9"
-    "@babel/types": "npm:^7.23.9"
-  checksum: 10c0/0e8b60119433787742bc08ae762bbd8d6755611c4cabbcb7627b292ec901a55af65d93d1c88572326069efb64136ef151ec91ffb74b2df7689bbab237030833a
+    "@babel/parser": "npm:^7.24.0"
+    "@babel/types": "npm:^7.24.0"
+  checksum: 10c0/9d3dd8d22fe1c36bc3bdef6118af1f4b030aaf6d7d2619f5da203efa818a2185d717523486c111de8d99a8649ddf4bbf6b2a7a64962d8411cf6a8fa89f010e54
   languageName: node
   linkType: hard
 
-"@babel/traverse@npm:7, @babel/traverse@npm:^7.23.9":
-  version: 7.23.9
-  resolution: "@babel/traverse@npm:7.23.9"
+"@babel/traverse@npm:7, @babel/traverse@npm:^7.24.0":
+  version: 7.24.0
+  resolution: "@babel/traverse@npm:7.24.0"
   dependencies:
     "@babel/code-frame": "npm:^7.23.5"
     "@babel/generator": "npm:^7.23.6"
@@ -1512,22 +1512,22 @@ __metadata:
     "@babel/helper-function-name": "npm:^7.23.0"
     "@babel/helper-hoist-variables": "npm:^7.22.5"
     "@babel/helper-split-export-declaration": "npm:^7.22.6"
-    "@babel/parser": "npm:^7.23.9"
-    "@babel/types": "npm:^7.23.9"
+    "@babel/parser": "npm:^7.24.0"
+    "@babel/types": "npm:^7.24.0"
     debug: "npm:^4.3.1"
     globals: "npm:^11.1.0"
-  checksum: 10c0/d1615d1d02f04d47111a7ea4446a1a6275668ca39082f31d51f08380de9502e19862be434eaa34b022ce9a17dbb8f9e2b73a746c654d9575f3a680a7ffdf5630
+  checksum: 10c0/55ffd2b0ce0fbd0a09051edc4def4fb1e96f35e0b100c0dc2a7429df569971ae312c290e980e423471f350961705698a257c7eea8c8304918024cc26f02468ba
   languageName: node
   linkType: hard
 
-"@babel/types@npm:^7.0.0, @babel/types@npm:^7.0.0-beta.49, @babel/types@npm:^7.12.11, @babel/types@npm:^7.12.6, @babel/types@npm:^7.20.7, @babel/types@npm:^7.22.10, @babel/types@npm:^7.22.15, @babel/types@npm:^7.22.19, @babel/types@npm:^7.22.5, @babel/types@npm:^7.23.0, @babel/types@npm:^7.23.6, @babel/types@npm:^7.23.9, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3":
-  version: 7.23.9
-  resolution: "@babel/types@npm:7.23.9"
+"@babel/types@npm:^7.0.0, @babel/types@npm:^7.0.0-beta.49, @babel/types@npm:^7.12.11, @babel/types@npm:^7.12.6, @babel/types@npm:^7.20.7, @babel/types@npm:^7.22.10, @babel/types@npm:^7.22.15, @babel/types@npm:^7.22.19, @babel/types@npm:^7.22.5, @babel/types@npm:^7.23.0, @babel/types@npm:^7.23.6, @babel/types@npm:^7.24.0, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3":
+  version: 7.24.0
+  resolution: "@babel/types@npm:7.24.0"
   dependencies:
     "@babel/helper-string-parser": "npm:^7.23.4"
     "@babel/helper-validator-identifier": "npm:^7.22.20"
     to-fast-properties: "npm:^2.0.0"
-  checksum: 10c0/edc7bb180ce7e4d2aea10c6972fb10474341ac39ba8fdc4a27ffb328368dfdfbf40fca18e441bbe7c483774500d5c05e222cec276c242e952853dcaf4eb884f7
+  checksum: 10c0/777a0bb5dbe038ca4c905fdafb1cdb6bdd10fe9d63ce13eca0bd91909363cbad554a53dc1f902004b78c1dcbc742056f877f2c99eeedff647333b1fadf51235d
   languageName: node
   linkType: hard
 

From 9a1c5188a875dc411a4b4870cc9cf81283284b24 Mon Sep 17 00:00:00 2001
From: Jeremy Kescher <jeremy@kescher.at>
Date: Sun, 3 Mar 2024 03:15:51 +0100
Subject: [PATCH 0351/2191] Bump Catstodon version to 1.0.9

---
 CHANGELOG.md            | 4 ++++
 lib/mastodon/version.rb | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 29e872722b43de..b64c0dea0a77c4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All changes to Catstodon that aren't Mastodon or glitch-soc Mastodon changes will be documented here.
 
+## [v4.3.0-alpha.3+glitch+cat+1.0.9] - 2024-03-03
+
+- Glitch-soc changes again (this time, among other stuff, the search bar icon position is fixed)
+
 ## [v4.3.0-alpha.3+glitch+cat+1.0.8] - 2024-02-29
 
 - Update translations from glitch-soc
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index e67230e9e3edf8..4370c21d3173df 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -25,7 +25,7 @@ def prerelease
     end
 
     def catstodon_revision
-      '1.0.8'
+      '1.0.9'
     end
 
     def build_metadata

From 1b418a35503ccaa82730a0ca36c6e83d9ed1833a Mon Sep 17 00:00:00 2001
From: GitHub Actions <noreply@github.com>
Date: Mon, 4 Mar 2024 04:57:12 +0000
Subject: [PATCH 0352/2191] New Crowdin translations

---
 app/javascript/flavours/glitch/locales/es-AR.json | 1 +
 app/javascript/flavours/glitch/locales/zh-CN.json | 1 +
 app/javascript/flavours/glitch/locales/zh-TW.json | 1 +
 config/locales-glitch/no.yml                      | 2 +-
 config/locales-glitch/simple_form.no.yml          | 2 +-
 5 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/javascript/flavours/glitch/locales/es-AR.json b/app/javascript/flavours/glitch/locales/es-AR.json
index 197ad871387848..3bba7f27cf6ea7 100644
--- a/app/javascript/flavours/glitch/locales/es-AR.json
+++ b/app/javascript/flavours/glitch/locales/es-AR.json
@@ -14,6 +14,7 @@
   "column_subheading.lists": "Listas",
   "column_subheading.navigation": "Navegación",
   "community.column_settings.allow_local_only": "Mostrar sólo toots locales",
+  "compose.attach.doodle": "Dibujá algo",
   "compose.change_federation": "Cambiar configuración de la federación",
   "compose.content-type.change": "Cambiar opciones avanzadas de formato",
   "compose.content-type.html": "HTML",
diff --git a/app/javascript/flavours/glitch/locales/zh-CN.json b/app/javascript/flavours/glitch/locales/zh-CN.json
index 91bd738c193521..49ef64a5e1cc37 100644
--- a/app/javascript/flavours/glitch/locales/zh-CN.json
+++ b/app/javascript/flavours/glitch/locales/zh-CN.json
@@ -14,6 +14,7 @@
   "column_subheading.lists": "列表",
   "column_subheading.navigation": "导航",
   "community.column_settings.allow_local_only": "只显示仅本站可见的嘟文",
+  "compose.attach.doodle": "涂鸦",
   "compose.change_federation": "更改联动设置",
   "compose.content-type.change": "更改高级格式选项",
   "compose.content-type.html": "HTML",
diff --git a/app/javascript/flavours/glitch/locales/zh-TW.json b/app/javascript/flavours/glitch/locales/zh-TW.json
index 59ad0f44abae36..715bee8aef1b62 100644
--- a/app/javascript/flavours/glitch/locales/zh-TW.json
+++ b/app/javascript/flavours/glitch/locales/zh-TW.json
@@ -14,6 +14,7 @@
   "column_subheading.lists": "列表",
   "column_subheading.navigation": "導覽",
   "community.column_settings.allow_local_only": "顯示僅限本地的貼文",
+  "compose.attach.doodle": "塗鴉",
   "compose.change_federation": "變更聯邦設定",
   "compose.content-type.change": "變更進階格式設定",
   "compose.content-type.html": "HTML",
diff --git a/config/locales-glitch/no.yml b/config/locales-glitch/no.yml
index d36c60a4ac0a92..d2a4697e5dc65e 100644
--- a/config/locales-glitch/no.yml
+++ b/config/locales-glitch/no.yml
@@ -1 +1 @@
-'no':
+no:
diff --git a/config/locales-glitch/simple_form.no.yml b/config/locales-glitch/simple_form.no.yml
index d36c60a4ac0a92..d2a4697e5dc65e 100644
--- a/config/locales-glitch/simple_form.no.yml
+++ b/config/locales-glitch/simple_form.no.yml
@@ -1 +1 @@
-'no':
+no:

From ee8d0b94473df357677cd1f82581251ce0423c01 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 4 Mar 2024 07:35:20 +0100
Subject: [PATCH 0353/2191] Fix follow suggestions potentially including
 silenced or blocked accounts (#29306)

---
 .../friends_of_friends_source.rb              | 34 ++------
 .../similar_profiles_source.rb                |  3 +-
 app/models/account_suggestions/source.rb      |  2 +
 .../friends_of_friends_source_spec.rb         | 82 +++++++++++++++++++
 .../models/account_suggestions/source_spec.rb | 20 +++--
 5 files changed, 107 insertions(+), 34 deletions(-)
 create mode 100644 spec/models/account_suggestions/friends_of_friends_source_spec.rb

diff --git a/app/models/account_suggestions/friends_of_friends_source.rb b/app/models/account_suggestions/friends_of_friends_source.rb
index 93fb10f3b064c6..0c95d21a3e9edd 100644
--- a/app/models/account_suggestions/friends_of_friends_source.rb
+++ b/app/models/account_suggestions/friends_of_friends_source.rb
@@ -2,31 +2,15 @@
 
 class AccountSuggestions::FriendsOfFriendsSource < AccountSuggestions::Source
   def get(account, limit: DEFAULT_LIMIT)
-    Account.find_by_sql([<<~SQL.squish, { id: account.id, limit: limit }]).map { |row| [row.id, key] }
-      WITH first_degree AS (
-          SELECT target_account_id
-          FROM follows
-          JOIN accounts AS target_accounts ON follows.target_account_id = target_accounts.id
-          WHERE account_id = :id
-            AND NOT target_accounts.hide_collections
-      )
-      SELECT accounts.id, COUNT(*) AS frequency
-      FROM accounts
-      JOIN follows ON follows.target_account_id = accounts.id
-      JOIN account_stats ON account_stats.account_id = accounts.id
-      LEFT OUTER JOIN follow_recommendation_mutes ON follow_recommendation_mutes.target_account_id = accounts.id AND follow_recommendation_mutes.account_id = :id
-      WHERE follows.account_id IN (SELECT * FROM first_degree)
-        AND NOT EXISTS (SELECT 1 FROM follows f WHERE f.target_account_id = follows.target_account_id AND f.account_id = :id)
-        AND follows.target_account_id <> :id
-        AND accounts.discoverable
-        AND accounts.suspended_at IS NULL
-        AND accounts.silenced_at IS NULL
-        AND accounts.moved_to_account_id IS NULL
-        AND follow_recommendation_mutes.target_account_id IS NULL
-      GROUP BY accounts.id, account_stats.id
-      ORDER BY frequency DESC, account_stats.followers_count ASC
-      LIMIT :limit
-    SQL
+    first_degree = account.following.where.not(hide_collections: true).select(:id).reorder(nil)
+    base_account_scope(account)
+      .joins(:account_stat)
+      .where(id: Follow.where(account_id: first_degree).select(:target_account_id))
+      .group('accounts.id, account_stats.id')
+      .reorder('frequency DESC, followers_count DESC')
+      .limit(limit)
+      .pluck(Arel.sql('accounts.id, COUNT(*) AS frequency'))
+      .map { |id, _frequency| [id, key] }
   end
 
   private
diff --git a/app/models/account_suggestions/similar_profiles_source.rb b/app/models/account_suggestions/similar_profiles_source.rb
index 3ece20aa5133eb..7ecdd607e5eef0 100644
--- a/app/models/account_suggestions/similar_profiles_source.rb
+++ b/app/models/account_suggestions/similar_profiles_source.rb
@@ -51,7 +51,8 @@ def get(account, limit: DEFAULT_LIMIT)
     recently_followed_account_ids = account.active_relationships.recent.limit(5).pluck(:target_account_id)
 
     if Chewy.enabled? && !recently_followed_account_ids.empty?
-      QueryBuilder.new(recently_followed_account_ids, account).build.limit(limit).hits.pluck('_id').map(&:to_i).zip([key].cycle)
+      ids_from_es = QueryBuilder.new(recently_followed_account_ids, account).build.limit(limit).hits.pluck('_id').map(&:to_i)
+      base_account_scope(account).where(id: ids_from_es).pluck(:id).zip([key].cycle)
     else
       []
     end
diff --git a/app/models/account_suggestions/source.rb b/app/models/account_suggestions/source.rb
index b2c3c7a3a24af4..7afc4c80edd3ba 100644
--- a/app/models/account_suggestions/source.rb
+++ b/app/models/account_suggestions/source.rb
@@ -12,6 +12,8 @@ def get(_account, **kwargs)
   def base_account_scope(account)
     Account
       .searchable
+      .where(discoverable: true)
+      .without_silenced
       .where.not(follows_sql, id: account.id)
       .where.not(follow_requests_sql, id: account.id)
       .not_excluded_by_account(account)
diff --git a/spec/models/account_suggestions/friends_of_friends_source_spec.rb b/spec/models/account_suggestions/friends_of_friends_source_spec.rb
new file mode 100644
index 00000000000000..56a974add5430d
--- /dev/null
+++ b/spec/models/account_suggestions/friends_of_friends_source_spec.rb
@@ -0,0 +1,82 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe AccountSuggestions::FriendsOfFriendsSource do
+  describe '#get' do
+    subject { described_class.new }
+
+    let!(:bob) { Fabricate(:account, discoverable: true, hide_collections: false) }
+    let!(:alice) { Fabricate(:account, discoverable: true, hide_collections: true) }
+    let!(:eve) { Fabricate(:account, discoverable: true, hide_collections: false) }
+    let!(:mallory) { Fabricate(:account, discoverable: false, hide_collections: false) }
+    let!(:eugen) { Fabricate(:account, discoverable: true, hide_collections: false) }
+    let!(:john) { Fabricate(:account, discoverable: true, hide_collections: false) }
+    let!(:jerk) { Fabricate(:account, discoverable: true, hide_collections: false) }
+    let!(:neil) { Fabricate(:account, discoverable: true, hide_collections: false) }
+    let!(:larry) { Fabricate(:account, discoverable: true, hide_collections: false) }
+
+    context 'with follows and blocks' do
+      before do
+        bob.block!(jerk)
+        FollowRecommendationMute.create!(account: bob, target_account: neil)
+
+        # bob follows eugen, alice and larry
+        [eugen, alice, larry].each { |account| bob.follow!(account) }
+
+        # alice follows eve and mallory
+        [john, mallory].each { |account| alice.follow!(account) }
+
+        # eugen follows eve, john, jerk, larry and neil
+        [eve, mallory, jerk, larry, neil].each { |account| eugen.follow!(account) }
+      end
+
+      it 'returns eligible accounts', :aggregate_failures do
+        results = subject.get(bob)
+
+        # eve is returned through eugen
+        expect(results).to include([eve.id, :friends_of_friends])
+
+        # john is not reachable because alice hides who she follows
+        expect(results).to_not include([john.id, :friends_of_friends])
+
+        # mallory is not discoverable
+        expect(results).to_not include([mallory.id, :friends_of_friends])
+
+        # larry is not included because he's followed already
+        expect(results).to_not include([larry.id, :friends_of_friends])
+
+        # jerk is blocked
+        expect(results).to_not include([jerk.id, :friends_of_friends])
+
+        # the suggestion for neil has already been rejected
+        expect(results).to_not include([neil.id, :friends_of_friends])
+      end
+    end
+
+    context 'with deterministic order' do
+      before do
+        # bob follows eve and mallory
+        [eve, mallory].each { |account| bob.follow!(account) }
+
+        # eve follows eugen, john, and jerk
+        [jerk, eugen, john].each { |account| eve.follow!(account) }
+
+        # mallory follows eugen, john, and neil
+        [neil, eugen, john].each { |account| mallory.follow!(account) }
+
+        john.follow!(eugen)
+        john.follow!(neil)
+      end
+
+      it 'returns eligible accounts in the expected order' do
+        expect(subject.get(bob)).to eq [
+          [eugen.id, :friends_of_friends], # followed by 2 friends, 3 followers total
+          [john.id, :friends_of_friends], # followed by 2 friends, 2 followers total
+          [neil.id, :friends_of_friends], # followed by 1 friend, 2 followers total
+          [jerk.id, :friends_of_friends], # followed by 1 friend, 1 follower total
+        ]
+      end
+    end
+  end
+end
diff --git a/spec/models/account_suggestions/source_spec.rb b/spec/models/account_suggestions/source_spec.rb
index d8227e01bc982a..16660940825a2e 100644
--- a/spec/models/account_suggestions/source_spec.rb
+++ b/spec/models/account_suggestions/source_spec.rb
@@ -11,14 +11,16 @@
     end
 
     context 'with follows and follow requests' do
-      let!(:account_domain_blocked_account) { Fabricate(:account, domain: 'blocked.host') }
-      let!(:account) { Fabricate(:account) }
-      let!(:blocked_account) { Fabricate(:account) }
-      let!(:eligible_account) { Fabricate(:account) }
-      let!(:follow_recommendation_muted_account) { Fabricate(:account) }
-      let!(:follow_requested_account) { Fabricate(:account) }
-      let!(:following_account) { Fabricate(:account) }
-      let!(:moved_account) { Fabricate(:account, moved_to_account: Fabricate(:account)) }
+      let!(:account_domain_blocked_account) { Fabricate(:account, domain: 'blocked.host', discoverable: true) }
+      let!(:account) { Fabricate(:account, discoverable: true) }
+      let!(:blocked_account) { Fabricate(:account, discoverable: true) }
+      let!(:eligible_account) { Fabricate(:account, discoverable: true) }
+      let!(:follow_recommendation_muted_account) { Fabricate(:account, discoverable: true) }
+      let!(:follow_requested_account) { Fabricate(:account, discoverable: true) }
+      let!(:following_account) { Fabricate(:account, discoverable: true) }
+      let!(:moved_account) { Fabricate(:account, moved_to_account: Fabricate(:account), discoverable: true) }
+      let!(:silenced_account) { Fabricate(:account, silenced: true, discoverable: true) }
+      let!(:undiscoverable_account) { Fabricate(:account, discoverable: false) }
 
       before do
         Fabricate :account_domain_block, account: account, domain: account_domain_blocked_account.domain
@@ -40,6 +42,8 @@
           .and not_include(follow_requested_account)
           .and not_include(following_account)
           .and not_include(moved_account)
+          .and not_include(silenced_account)
+          .and not_include(undiscoverable_account)
       end
     end
   end

From a7d9c5e374dccec71af833709ad4008e87e99728 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 4 Mar 2024 11:27:37 +0100
Subject: [PATCH 0354/2191] Fix bogus translations

---
 config/locales-glitch/no.yml             | 2 +-
 config/locales-glitch/simple_form.no.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/locales-glitch/no.yml b/config/locales-glitch/no.yml
index d2a4697e5dc65e..d36c60a4ac0a92 100644
--- a/config/locales-glitch/no.yml
+++ b/config/locales-glitch/no.yml
@@ -1 +1 @@
-no:
+'no':
diff --git a/config/locales-glitch/simple_form.no.yml b/config/locales-glitch/simple_form.no.yml
index d2a4697e5dc65e..d36c60a4ac0a92 100644
--- a/config/locales-glitch/simple_form.no.yml
+++ b/config/locales-glitch/simple_form.no.yml
@@ -1 +1 @@
-no:
+'no':

From 0f7f2571396b3327559c31716af538fb9b34eff6 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 5 Mar 2024 10:39:12 +0100
Subject: [PATCH 0355/2191] Update Yarn to v4.1.1 (#29508)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 package.json           | 2 +-
 streaming/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 4f17b427ee8128..9f20a981aeda85 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@mastodon/mastodon",
   "license": "AGPL-3.0-or-later",
-  "packageManager": "yarn@4.1.0",
+  "packageManager": "yarn@4.1.1",
   "engines": {
     "node": ">=18"
   },
diff --git a/streaming/package.json b/streaming/package.json
index efb692578cb487..6e183a181cb3fd 100644
--- a/streaming/package.json
+++ b/streaming/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@mastodon/streaming",
   "license": "AGPL-3.0-or-later",
-  "packageManager": "yarn@4.1.0",
+  "packageManager": "yarn@4.1.1",
   "engines": {
     "node": ">=18"
   },

From cb0f3ecc28f508af25013834905bb9a11ac87314 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 5 Mar 2024 10:41:31 +0100
Subject: [PATCH 0356/2191] Update eslint (non-major) (#29505)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 725 +++++++++++++++++++++++++++++-------------------------
 1 file changed, 393 insertions(+), 332 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index a6008440227975..c5ec6e5f8c32fa 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1743,10 +1743,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@eslint/js@npm:8.56.0":
-  version: 8.56.0
-  resolution: "@eslint/js@npm:8.56.0"
-  checksum: 10c0/60b3a1cf240e2479cec9742424224465dc50e46d781da1b7f5ef240501b2d1202c225bd456207faac4b34a64f4765833345bc4ddffd00395e1db40fa8c426f5a
+"@eslint/js@npm:8.57.0":
+  version: 8.57.0
+  resolution: "@eslint/js@npm:8.57.0"
+  checksum: 10c0/9a518bb8625ba3350613903a6d8c622352ab0c6557a59fe6ff6178bf882bf57123f9d92aa826ee8ac3ee74b9c6203fe630e9ee00efb03d753962dcf65ee4bd94
   languageName: node
   linkType: hard
 
@@ -1935,14 +1935,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@humanwhocodes/config-array@npm:^0.11.13":
-  version: 0.11.13
-  resolution: "@humanwhocodes/config-array@npm:0.11.13"
+"@humanwhocodes/config-array@npm:^0.11.14":
+  version: 0.11.14
+  resolution: "@humanwhocodes/config-array@npm:0.11.14"
   dependencies:
-    "@humanwhocodes/object-schema": "npm:^2.0.1"
-    debug: "npm:^4.1.1"
+    "@humanwhocodes/object-schema": "npm:^2.0.2"
+    debug: "npm:^4.3.1"
     minimatch: "npm:^3.0.5"
-  checksum: 10c0/d76ca802d853366094d0e98ff0d0994117fc8eff96649cd357b15e469e428228f597cd2e929d54ab089051684949955f16ee905bb19f7b2f0446fb377157be7a
+  checksum: 10c0/66f725b4ee5fdd8322c737cb5013e19fac72d4d69c8bf4b7feb192fcb83442b035b92186f8e9497c220e58b2d51a080f28a73f7899bc1ab288c3be172c467541
   languageName: node
   linkType: hard
 
@@ -1953,10 +1953,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@humanwhocodes/object-schema@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "@humanwhocodes/object-schema@npm:2.0.1"
-  checksum: 10c0/9dba24e59fdb4041829d92b693aacb778add3b6f612aaa9c0774f3b650c11a378cc64f042a59da85c11dae33df456580a3c36837b953541aed6ff94294f97fac
+"@humanwhocodes/object-schema@npm:^2.0.2":
+  version: 2.0.2
+  resolution: "@humanwhocodes/object-schema@npm:2.0.2"
+  checksum: 10c0/6fd83dc320231d71c4541d0244051df61f301817e9f9da9fd4cb7e44ec8aacbde5958c1665b0c419401ab935114fdf532a6ad5d4e7294b1af2f347dd91a6983f
   languageName: node
   linkType: hard
 
@@ -3643,14 +3643,14 @@ __metadata:
   linkType: hard
 
 "@typescript-eslint/eslint-plugin@npm:^7.0.0":
-  version: 7.0.2
-  resolution: "@typescript-eslint/eslint-plugin@npm:7.0.2"
+  version: 7.1.1
+  resolution: "@typescript-eslint/eslint-plugin@npm:7.1.1"
   dependencies:
     "@eslint-community/regexpp": "npm:^4.5.1"
-    "@typescript-eslint/scope-manager": "npm:7.0.2"
-    "@typescript-eslint/type-utils": "npm:7.0.2"
-    "@typescript-eslint/utils": "npm:7.0.2"
-    "@typescript-eslint/visitor-keys": "npm:7.0.2"
+    "@typescript-eslint/scope-manager": "npm:7.1.1"
+    "@typescript-eslint/type-utils": "npm:7.1.1"
+    "@typescript-eslint/utils": "npm:7.1.1"
+    "@typescript-eslint/visitor-keys": "npm:7.1.1"
     debug: "npm:^4.3.4"
     graphemer: "npm:^1.4.0"
     ignore: "npm:^5.2.4"
@@ -3663,25 +3663,25 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 10c0/76727ad48f01c1bb4ef37690e7ed12754930ce3a4bbe5dcd52f24d42f4625fc0b151db8189947f3956b4a09a562eb2da683ff65b57a13a15426eee3b680f80a5
+  checksum: 10c0/041799604176bbee01f6ff029c5e2fcf1196db2737ba219a20b095f095dc0064ea425d15dd6dc22eaef294daa838209601ec7bc19317258dfa89a13afb8126ba
   languageName: node
   linkType: hard
 
 "@typescript-eslint/parser@npm:^7.0.0":
-  version: 7.0.2
-  resolution: "@typescript-eslint/parser@npm:7.0.2"
+  version: 7.1.1
+  resolution: "@typescript-eslint/parser@npm:7.1.1"
   dependencies:
-    "@typescript-eslint/scope-manager": "npm:7.0.2"
-    "@typescript-eslint/types": "npm:7.0.2"
-    "@typescript-eslint/typescript-estree": "npm:7.0.2"
-    "@typescript-eslint/visitor-keys": "npm:7.0.2"
+    "@typescript-eslint/scope-manager": "npm:7.1.1"
+    "@typescript-eslint/types": "npm:7.1.1"
+    "@typescript-eslint/typescript-estree": "npm:7.1.1"
+    "@typescript-eslint/visitor-keys": "npm:7.1.1"
     debug: "npm:^4.3.4"
   peerDependencies:
     eslint: ^8.56.0
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 10c0/acffdbea0bba24398ba8bd1ccf5b59438bc093e41d7a325019383094f39d676b5cf2f5963bfa5e332e54728e5b9e14be3984752ee91da6f0e1a3e0b613422d0e
+  checksum: 10c0/84eb44f3767aaa1d7b26176348c89bd6732bc711f7f24186b1354eba95bf9e9c65b5675838772b831391210e525ff1f3bd4b51a3130ec35413aa362920effc57
   languageName: node
   linkType: hard
 
@@ -3695,22 +3695,22 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/scope-manager@npm:7.0.2":
-  version: 7.0.2
-  resolution: "@typescript-eslint/scope-manager@npm:7.0.2"
+"@typescript-eslint/scope-manager@npm:7.1.1":
+  version: 7.1.1
+  resolution: "@typescript-eslint/scope-manager@npm:7.1.1"
   dependencies:
-    "@typescript-eslint/types": "npm:7.0.2"
-    "@typescript-eslint/visitor-keys": "npm:7.0.2"
-  checksum: 10c0/60241a0dbed7605133b6242d7fc172e8ee649e1033b8a179cebe3e21c60e0c08c12679fd37644cfef57c95a5d75a3927afc9d6365a5f9684c1d043285db23c66
+    "@typescript-eslint/types": "npm:7.1.1"
+    "@typescript-eslint/visitor-keys": "npm:7.1.1"
+  checksum: 10c0/a955c8529f24945d448b95982d06b5f15a74fc5df97307f5821d55e9861d6c26d61cbd118c1ca41634164ed1d4f6c74fcb8388761341c49e6902a6fb72036afc
   languageName: node
   linkType: hard
 
-"@typescript-eslint/type-utils@npm:7.0.2":
-  version: 7.0.2
-  resolution: "@typescript-eslint/type-utils@npm:7.0.2"
+"@typescript-eslint/type-utils@npm:7.1.1":
+  version: 7.1.1
+  resolution: "@typescript-eslint/type-utils@npm:7.1.1"
   dependencies:
-    "@typescript-eslint/typescript-estree": "npm:7.0.2"
-    "@typescript-eslint/utils": "npm:7.0.2"
+    "@typescript-eslint/typescript-estree": "npm:7.1.1"
+    "@typescript-eslint/utils": "npm:7.1.1"
     debug: "npm:^4.3.4"
     ts-api-utils: "npm:^1.0.1"
   peerDependencies:
@@ -3718,7 +3718,7 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 10c0/fa7957aa65cb0d7366c7c9be94e45cc2f1ebe9981cbf393054b505c6d555a01b2a2fe7cd1254d668f30183a275032f909186ce0b9f213f64b776bd7872144a6e
+  checksum: 10c0/6f19dc383718cce42ed7262d134f5f0221bcbf225fea28975cd714c90e57d861608d5187c7ad731f6281813f94b00f22282a99a8a852167366064abc6e256341
   languageName: node
   linkType: hard
 
@@ -3729,10 +3729,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/types@npm:7.0.2":
-  version: 7.0.2
-  resolution: "@typescript-eslint/types@npm:7.0.2"
-  checksum: 10c0/5f95266cc2cd0e6cf1239dcd36b53c7d98b01ba12c61947316f0d879df87b912b4d23f0796324e2ab0fb8780503a338da41a4695fa91d90392b6c6aca5239fa7
+"@typescript-eslint/types@npm:7.1.1":
+  version: 7.1.1
+  resolution: "@typescript-eslint/types@npm:7.1.1"
+  checksum: 10c0/2bef95ec0c60e67fada336db3e82fac2be16c21a9e54fc45c7aeda3291abcceefa12aa970025db88bc2b3e113b1e70abd7f89c2a651c16b816dff1a0c46e7907
   languageName: node
   linkType: hard
 
@@ -3755,12 +3755,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/typescript-estree@npm:7.0.2":
-  version: 7.0.2
-  resolution: "@typescript-eslint/typescript-estree@npm:7.0.2"
+"@typescript-eslint/typescript-estree@npm:7.1.1":
+  version: 7.1.1
+  resolution: "@typescript-eslint/typescript-estree@npm:7.1.1"
   dependencies:
-    "@typescript-eslint/types": "npm:7.0.2"
-    "@typescript-eslint/visitor-keys": "npm:7.0.2"
+    "@typescript-eslint/types": "npm:7.1.1"
+    "@typescript-eslint/visitor-keys": "npm:7.1.1"
     debug: "npm:^4.3.4"
     globby: "npm:^11.1.0"
     is-glob: "npm:^4.0.3"
@@ -3770,24 +3770,24 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 10c0/2f6795b05fced9f2e0887f6735aa1a0b20516952792e4be13cd94c5e56db8ad013ba27aeb56f89fedff8b7af587f854482f00aac75b418611c74e42169c29aeb
+  checksum: 10c0/2cec9d21cfe46e523a6d29aff554e5450edf1ee30ce9cf644ee8f1f5e1cfd44b94afb3632db97a949c86c4a392ae80f264d56d8747b2b0fdbe5c54139433366a
   languageName: node
   linkType: hard
 
-"@typescript-eslint/utils@npm:7.0.2":
-  version: 7.0.2
-  resolution: "@typescript-eslint/utils@npm:7.0.2"
+"@typescript-eslint/utils@npm:7.1.1":
+  version: 7.1.1
+  resolution: "@typescript-eslint/utils@npm:7.1.1"
   dependencies:
     "@eslint-community/eslint-utils": "npm:^4.4.0"
     "@types/json-schema": "npm:^7.0.12"
     "@types/semver": "npm:^7.5.0"
-    "@typescript-eslint/scope-manager": "npm:7.0.2"
-    "@typescript-eslint/types": "npm:7.0.2"
-    "@typescript-eslint/typescript-estree": "npm:7.0.2"
+    "@typescript-eslint/scope-manager": "npm:7.1.1"
+    "@typescript-eslint/types": "npm:7.1.1"
+    "@typescript-eslint/typescript-estree": "npm:7.1.1"
     semver: "npm:^7.5.4"
   peerDependencies:
     eslint: ^8.56.0
-  checksum: 10c0/b4ae9a36393c92b332e99d70219d1ee056271261f7433924db804e5f06d97ca60408b9c7a655afce8a851982e7153243a625d6cc76fea764f767f96c8f3e16da
+  checksum: 10c0/3e70834c5b49e4643ec8da63fa2acaab54283a566af2cedcd4c2f4210833a59bf71c459dde69e738115633c7de9f1339130552ff246e8e1bb4db26910685408b
   languageName: node
   linkType: hard
 
@@ -3818,13 +3818,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/visitor-keys@npm:7.0.2":
-  version: 7.0.2
-  resolution: "@typescript-eslint/visitor-keys@npm:7.0.2"
+"@typescript-eslint/visitor-keys@npm:7.1.1":
+  version: 7.1.1
+  resolution: "@typescript-eslint/visitor-keys@npm:7.1.1"
   dependencies:
-    "@typescript-eslint/types": "npm:7.0.2"
+    "@typescript-eslint/types": "npm:7.1.1"
     eslint-visitor-keys: "npm:^3.4.1"
-  checksum: 10c0/4146d1ad6ce9374e6b5a75677fc709816bdc5fe324b1a857405f21dad23bb28c79cfd0555bc2a01c4af1d9e9ee81ff5e29ec41cc9d05b0b1101cc4264e7f21d1
+  checksum: 10c0/1ab19ec966ff0b86317eddcbfcda645856ec01c3b76a451298031f35e4da0a363e4888ce5ae9e2526e874799a502c49922d83d57d21cb6fef7f3912f51e4a271
   languageName: node
   linkType: hard
 
@@ -4353,13 +4353,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"array-buffer-byte-length@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "array-buffer-byte-length@npm:1.0.0"
+"array-buffer-byte-length@npm:^1.0.0, array-buffer-byte-length@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "array-buffer-byte-length@npm:1.0.1"
   dependencies:
-    call-bind: "npm:^1.0.2"
-    is-array-buffer: "npm:^3.0.1"
-  checksum: 10c0/12f84f6418b57a954caa41654e5e63e019142a4bbb2c6829ba86d1ba65d31ccfaf1461d1743556fd32b091fac34ff44d9dfbdb001402361c45c373b2c86f5c20
+    call-bind: "npm:^1.0.5"
+    is-array-buffer: "npm:^3.0.4"
+  checksum: 10c0/f5cdf54527cd18a3d2852ddf73df79efec03829e7373a8322ef5df2b4ef546fb365c19c71d6b42d641cb6bfe0f1a2f19bc0ece5b533295f86d7c3d522f228917
   languageName: node
   linkType: hard
 
@@ -4420,6 +4420,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"array.prototype.findlast@npm:^1.2.4":
+  version: 1.2.4
+  resolution: "array.prototype.findlast@npm:1.2.4"
+  dependencies:
+    call-bind: "npm:^1.0.5"
+    define-properties: "npm:^1.2.1"
+    es-abstract: "npm:^1.22.3"
+    es-errors: "npm:^1.3.0"
+    es-shim-unscopables: "npm:^1.0.2"
+  checksum: 10c0/4b5145a68ebaa00ef3d61de07c6694cad73d60763079f1e7662b948e5a167b5121b0c1e6feae8df1e42ead07c21699e25242b95cd5c48e094fd530b192aa4150
+  languageName: node
+  linkType: hard
+
 "array.prototype.findlastindex@npm:^1.2.3":
   version: 1.2.3
   resolution: "array.prototype.findlastindex@npm:1.2.3"
@@ -4445,7 +4458,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"array.prototype.flatmap@npm:^1.3.1, array.prototype.flatmap@npm:^1.3.2":
+"array.prototype.flatmap@npm:^1.3.2":
   version: 1.3.2
   resolution: "array.prototype.flatmap@npm:1.3.2"
   dependencies:
@@ -4470,31 +4483,44 @@ __metadata:
   languageName: node
   linkType: hard
 
-"array.prototype.tosorted@npm:^1.1.1":
-  version: 1.1.1
-  resolution: "array.prototype.tosorted@npm:1.1.1"
+"array.prototype.toreversed@npm:^1.1.2":
+  version: 1.1.2
+  resolution: "array.prototype.toreversed@npm:1.1.2"
   dependencies:
     call-bind: "npm:^1.0.2"
-    define-properties: "npm:^1.1.4"
-    es-abstract: "npm:^1.20.4"
+    define-properties: "npm:^1.2.0"
+    es-abstract: "npm:^1.22.1"
     es-shim-unscopables: "npm:^1.0.0"
-    get-intrinsic: "npm:^1.1.3"
-  checksum: 10c0/fd5f57aca3c7ddcd1bb83965457b625f3a67d8f334f5cbdb8ac8ef33d5b0d38281524114db2936f8c08048115d5158af216c94e6ae1eb966241b9b6f4ab8a7e8
+  checksum: 10c0/2b7627ea85eae1e80ecce665a500cc0f3355ac83ee4a1a727562c7c2a1d5f1c0b4dd7b65c468ec6867207e452ba01256910a2c0b41486bfdd11acf875a7a3435
   languageName: node
   linkType: hard
 
-"arraybuffer.prototype.slice@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "arraybuffer.prototype.slice@npm:1.0.2"
+"array.prototype.tosorted@npm:^1.1.3":
+  version: 1.1.3
+  resolution: "array.prototype.tosorted@npm:1.1.3"
   dependencies:
-    array-buffer-byte-length: "npm:^1.0.0"
-    call-bind: "npm:^1.0.2"
-    define-properties: "npm:^1.2.0"
-    es-abstract: "npm:^1.22.1"
-    get-intrinsic: "npm:^1.2.1"
-    is-array-buffer: "npm:^3.0.2"
+    call-bind: "npm:^1.0.5"
+    define-properties: "npm:^1.2.1"
+    es-abstract: "npm:^1.22.3"
+    es-errors: "npm:^1.1.0"
+    es-shim-unscopables: "npm:^1.0.2"
+  checksum: 10c0/a27e1ca51168ecacf6042901f5ef021e43c8fa04b6c6b6f2a30bac3645cd2b519cecbe0bc45db1b85b843f64dc3207f0268f700b4b9fbdec076d12d432cf0865
+  languageName: node
+  linkType: hard
+
+"arraybuffer.prototype.slice@npm:^1.0.3":
+  version: 1.0.3
+  resolution: "arraybuffer.prototype.slice@npm:1.0.3"
+  dependencies:
+    array-buffer-byte-length: "npm:^1.0.1"
+    call-bind: "npm:^1.0.5"
+    define-properties: "npm:^1.2.1"
+    es-abstract: "npm:^1.22.3"
+    es-errors: "npm:^1.2.1"
+    get-intrinsic: "npm:^1.2.3"
+    is-array-buffer: "npm:^3.0.4"
     is-shared-array-buffer: "npm:^1.0.2"
-  checksum: 10c0/96b6e40e439678ffb7fa266398510074d33c3980fbb475490b69980cca60adec3b0777047ef377068a29862157f83edef42efc64ce48ce38977d04d68de5b7fb
+  checksum: 10c0/d32754045bcb2294ade881d45140a5e52bda2321b9e98fa514797b7f0d252c4c5ab0d1edb34112652c62fa6a9398def568da63a4d7544672229afea283358c36
   languageName: node
   linkType: hard
 
@@ -4644,10 +4670,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"available-typed-arrays@npm:^1.0.5":
-  version: 1.0.5
-  resolution: "available-typed-arrays@npm:1.0.5"
-  checksum: 10c0/c4df567ca72d2754a6cbad20088f5f98b1065b3360178169fa9b44ea101af62c0f423fc3854fa820fd6895b6b9171b8386e71558203103ff8fc2ad503fdcc660
+"available-typed-arrays@npm:^1.0.6, available-typed-arrays@npm:^1.0.7":
+  version: 1.0.7
+  resolution: "available-typed-arrays@npm:1.0.7"
+  dependencies:
+    possible-typed-array-names: "npm:^1.0.0"
+  checksum: 10c0/d07226ef4f87daa01bd0fe80f8f310982e345f372926da2e5296aecc25c41cab440916bbaa4c5e1034b453af3392f67df5961124e4b586df1e99793a1374bdb2
   languageName: node
   linkType: hard
 
@@ -5335,14 +5363,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"call-bind@npm:^1.0.0, call-bind@npm:^1.0.2, call-bind@npm:^1.0.4, call-bind@npm:^1.0.5":
-  version: 1.0.5
-  resolution: "call-bind@npm:1.0.5"
+"call-bind@npm:^1.0.0, call-bind@npm:^1.0.2, call-bind@npm:^1.0.5, call-bind@npm:^1.0.6, call-bind@npm:^1.0.7":
+  version: 1.0.7
+  resolution: "call-bind@npm:1.0.7"
   dependencies:
+    es-define-property: "npm:^1.0.0"
+    es-errors: "npm:^1.3.0"
     function-bind: "npm:^1.1.2"
-    get-intrinsic: "npm:^1.2.1"
-    set-function-length: "npm:^1.1.1"
-  checksum: 10c0/a6172c168fd6dacf744fcde745099218056bd755c50415b592655dcd6562157ed29f130f56c3f6db2250f67e4bd62e5c218cdc56d7bfd76e0bda50770fce2d10
+    get-intrinsic: "npm:^1.2.4"
+    set-function-length: "npm:^1.2.1"
+  checksum: 10c0/a3ded2e423b8e2a265983dba81c27e125b48eefb2655e7dfab6be597088da3d47c47976c24bc51b8fd9af1061f8f87b4ab78a314f3c77784b2ae2ba535ad8b8d
   languageName: node
   linkType: hard
 
@@ -6493,14 +6523,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"define-data-property@npm:^1.0.1, define-data-property@npm:^1.1.1":
-  version: 1.1.1
-  resolution: "define-data-property@npm:1.1.1"
+"define-data-property@npm:^1.0.1, define-data-property@npm:^1.1.2":
+  version: 1.1.4
+  resolution: "define-data-property@npm:1.1.4"
   dependencies:
-    get-intrinsic: "npm:^1.2.1"
+    es-define-property: "npm:^1.0.0"
+    es-errors: "npm:^1.3.0"
     gopd: "npm:^1.0.1"
-    has-property-descriptors: "npm:^1.0.0"
-  checksum: 10c0/77ef6e0bceb515e05b5913ab635a84d537cee84f8a7c37c77fdcb31fc5b80f6dbe81b33375e4b67d96aa04e6a0d8d4ea099e431d83f089af8d93adfb584bcb94
+  checksum: 10c0/dea0606d1483eb9db8d930d4eac62ca0fa16738b0b3e07046cddfacf7d8c868bbe13fa0cb263eb91c7d0d527960dc3f2f2471a69ed7816210307f6744fe62e37
   languageName: node
   linkType: hard
 
@@ -7051,50 +7081,52 @@ __metadata:
   languageName: node
   linkType: hard
 
-"es-abstract@npm:^1.17.2, es-abstract@npm:^1.20.4, es-abstract@npm:^1.21.2, es-abstract@npm:^1.22.1":
-  version: 1.22.3
-  resolution: "es-abstract@npm:1.22.3"
+"es-abstract@npm:^1.17.2, es-abstract@npm:^1.20.4, es-abstract@npm:^1.21.2, es-abstract@npm:^1.22.1, es-abstract@npm:^1.22.3, es-abstract@npm:^1.22.4":
+  version: 1.22.5
+  resolution: "es-abstract@npm:1.22.5"
   dependencies:
-    array-buffer-byte-length: "npm:^1.0.0"
-    arraybuffer.prototype.slice: "npm:^1.0.2"
-    available-typed-arrays: "npm:^1.0.5"
-    call-bind: "npm:^1.0.5"
-    es-set-tostringtag: "npm:^2.0.1"
+    array-buffer-byte-length: "npm:^1.0.1"
+    arraybuffer.prototype.slice: "npm:^1.0.3"
+    available-typed-arrays: "npm:^1.0.7"
+    call-bind: "npm:^1.0.7"
+    es-define-property: "npm:^1.0.0"
+    es-errors: "npm:^1.3.0"
+    es-set-tostringtag: "npm:^2.0.3"
     es-to-primitive: "npm:^1.2.1"
     function.prototype.name: "npm:^1.1.6"
-    get-intrinsic: "npm:^1.2.2"
-    get-symbol-description: "npm:^1.0.0"
+    get-intrinsic: "npm:^1.2.4"
+    get-symbol-description: "npm:^1.0.2"
     globalthis: "npm:^1.0.3"
     gopd: "npm:^1.0.1"
-    has-property-descriptors: "npm:^1.0.0"
-    has-proto: "npm:^1.0.1"
+    has-property-descriptors: "npm:^1.0.2"
+    has-proto: "npm:^1.0.3"
     has-symbols: "npm:^1.0.3"
-    hasown: "npm:^2.0.0"
-    internal-slot: "npm:^1.0.5"
-    is-array-buffer: "npm:^3.0.2"
+    hasown: "npm:^2.0.1"
+    internal-slot: "npm:^1.0.7"
+    is-array-buffer: "npm:^3.0.4"
     is-callable: "npm:^1.2.7"
-    is-negative-zero: "npm:^2.0.2"
+    is-negative-zero: "npm:^2.0.3"
     is-regex: "npm:^1.1.4"
-    is-shared-array-buffer: "npm:^1.0.2"
+    is-shared-array-buffer: "npm:^1.0.3"
     is-string: "npm:^1.0.7"
-    is-typed-array: "npm:^1.1.12"
+    is-typed-array: "npm:^1.1.13"
     is-weakref: "npm:^1.0.2"
     object-inspect: "npm:^1.13.1"
     object-keys: "npm:^1.1.1"
-    object.assign: "npm:^4.1.4"
-    regexp.prototype.flags: "npm:^1.5.1"
-    safe-array-concat: "npm:^1.0.1"
-    safe-regex-test: "npm:^1.0.0"
+    object.assign: "npm:^4.1.5"
+    regexp.prototype.flags: "npm:^1.5.2"
+    safe-array-concat: "npm:^1.1.0"
+    safe-regex-test: "npm:^1.0.3"
     string.prototype.trim: "npm:^1.2.8"
     string.prototype.trimend: "npm:^1.0.7"
     string.prototype.trimstart: "npm:^1.0.7"
-    typed-array-buffer: "npm:^1.0.0"
-    typed-array-byte-length: "npm:^1.0.0"
-    typed-array-byte-offset: "npm:^1.0.0"
-    typed-array-length: "npm:^1.0.4"
+    typed-array-buffer: "npm:^1.0.2"
+    typed-array-byte-length: "npm:^1.0.1"
+    typed-array-byte-offset: "npm:^1.0.2"
+    typed-array-length: "npm:^1.0.5"
     unbox-primitive: "npm:^1.0.2"
-    which-typed-array: "npm:^1.1.13"
-  checksum: 10c0/da31ec43b1c8eb47ba8a17693cac143682a1078b6c3cd883ce0e2062f135f532e93d873694ef439670e1f6ca03195118f43567ba6f33fb0d6c7daae750090236
+    which-typed-array: "npm:^1.1.14"
+  checksum: 10c0/4bca5a60f0dff6c0a5690d8e51374cfcb8760d5dbbb1069174b4d41461cf4e0c3e0c1993bccbc5aa0799ff078199f1bcde2122b8709e0d17c2beffafff01010a
   languageName: node
   linkType: hard
 
@@ -7105,6 +7137,22 @@ __metadata:
   languageName: node
   linkType: hard
 
+"es-define-property@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "es-define-property@npm:1.0.0"
+  dependencies:
+    get-intrinsic: "npm:^1.2.4"
+  checksum: 10c0/6bf3191feb7ea2ebda48b577f69bdfac7a2b3c9bcf97307f55fd6ef1bbca0b49f0c219a935aca506c993d8c5d8bddd937766cb760cd5e5a1071351f2df9f9aa4
+  languageName: node
+  linkType: hard
+
+"es-errors@npm:^1.1.0, es-errors@npm:^1.2.1, es-errors@npm:^1.3.0":
+  version: 1.3.0
+  resolution: "es-errors@npm:1.3.0"
+  checksum: 10c0/0a61325670072f98d8ae3b914edab3559b6caa980f08054a3b872052640d91da01d38df55df797fcc916389d77fc92b8d5906cf028f4db46d7e3003abecbca85
+  languageName: node
+  linkType: hard
+
 "es-get-iterator@npm:^1.1.3":
   version: 1.1.3
   resolution: "es-get-iterator@npm:1.1.3"
@@ -7122,45 +7170,46 @@ __metadata:
   languageName: node
   linkType: hard
 
-"es-iterator-helpers@npm:^1.0.12, es-iterator-helpers@npm:^1.0.15":
-  version: 1.0.15
-  resolution: "es-iterator-helpers@npm:1.0.15"
+"es-iterator-helpers@npm:^1.0.15, es-iterator-helpers@npm:^1.0.17":
+  version: 1.0.17
+  resolution: "es-iterator-helpers@npm:1.0.17"
   dependencies:
     asynciterator.prototype: "npm:^1.0.0"
-    call-bind: "npm:^1.0.2"
+    call-bind: "npm:^1.0.7"
     define-properties: "npm:^1.2.1"
-    es-abstract: "npm:^1.22.1"
-    es-set-tostringtag: "npm:^2.0.1"
-    function-bind: "npm:^1.1.1"
-    get-intrinsic: "npm:^1.2.1"
+    es-abstract: "npm:^1.22.4"
+    es-errors: "npm:^1.3.0"
+    es-set-tostringtag: "npm:^2.0.2"
+    function-bind: "npm:^1.1.2"
+    get-intrinsic: "npm:^1.2.4"
     globalthis: "npm:^1.0.3"
-    has-property-descriptors: "npm:^1.0.0"
+    has-property-descriptors: "npm:^1.0.2"
     has-proto: "npm:^1.0.1"
     has-symbols: "npm:^1.0.3"
-    internal-slot: "npm:^1.0.5"
+    internal-slot: "npm:^1.0.7"
     iterator.prototype: "npm:^1.1.2"
-    safe-array-concat: "npm:^1.0.1"
-  checksum: 10c0/b4c83f94bfe624260d5238092de3173989f76f1416b1d02c388aea3b2024174e5f5f0e864057311ac99790b57e836ca3545b6e77256b26066dac944519f5e6d6
+    safe-array-concat: "npm:^1.1.0"
+  checksum: 10c0/d0f281257e7165f068fd4fc3beb63d07ae4f18fbef02a2bbe4a39272b764164c1ce3311ae7c5429ac30003aef290fcdf569050e4a9ba3560e044440f68e9a47c
   languageName: node
   linkType: hard
 
-"es-set-tostringtag@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "es-set-tostringtag@npm:2.0.1"
+"es-set-tostringtag@npm:^2.0.2, es-set-tostringtag@npm:^2.0.3":
+  version: 2.0.3
+  resolution: "es-set-tostringtag@npm:2.0.3"
   dependencies:
-    get-intrinsic: "npm:^1.1.3"
-    has: "npm:^1.0.3"
-    has-tostringtag: "npm:^1.0.0"
-  checksum: 10c0/9af096365e3861bb29755cc5f76f15f66a7eab0e83befca396129090c1d9737e54090278b8e5357e97b5f0a5b0459fca07c40c6740884c2659cbf90ef8e508cc
+    get-intrinsic: "npm:^1.2.4"
+    has-tostringtag: "npm:^1.0.2"
+    hasown: "npm:^2.0.1"
+  checksum: 10c0/f22aff1585eb33569c326323f0b0d175844a1f11618b86e193b386f8be0ea9474cfbe46df39c45d959f7aa8f6c06985dc51dd6bce5401645ec5a74c4ceaa836a
   languageName: node
   linkType: hard
 
-"es-shim-unscopables@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "es-shim-unscopables@npm:1.0.0"
+"es-shim-unscopables@npm:^1.0.0, es-shim-unscopables@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "es-shim-unscopables@npm:1.0.2"
   dependencies:
-    has: "npm:^1.0.3"
-  checksum: 10c0/d54a66239fbd19535b3e50333913260394f14d2d7adb136a95396a13ca584bab400cf9cb2ffd9232f3fe2f0362540bd3a708240c493e46e13fe0b90cfcfedc3d
+    hasown: "npm:^2.0.0"
+  checksum: 10c0/f495af7b4b7601a4c0cfb893581c352636e5c08654d129590386a33a0432cf13a7bdc7b6493801cadd990d838e2839b9013d1de3b880440cb537825e834fe783
   languageName: node
   linkType: hard
 
@@ -7325,8 +7374,8 @@ __metadata:
   linkType: hard
 
 "eslint-plugin-jsdoc@npm:^48.0.0":
-  version: 48.1.0
-  resolution: "eslint-plugin-jsdoc@npm:48.1.0"
+  version: 48.2.0
+  resolution: "eslint-plugin-jsdoc@npm:48.2.0"
   dependencies:
     "@es-joy/jsdoccomment": "npm:~0.42.0"
     are-docs-informative: "npm:^0.0.2"
@@ -7339,7 +7388,7 @@ __metadata:
     spdx-expression-parse: "npm:^4.0.0"
   peerDependencies:
     eslint: ^7.0.0 || ^8.0.0 || ^9.0.0
-  checksum: 10c0/e0fb3fb4479b6ee539b8c1b626de625ff5d24408f695fcbf648e214854fea9ea3e29b77f56b177bf38655e30a6c9a6eaaff93ef990f69c454c74e180747e39e5
+  checksum: 10c0/778f979ca40594269d531767ab29fb2a6c448425f8f732708ac5d3b9c61bbeb8504f1490a1057c7740f3e8f8a75d57ff50c766bc40fb1474f195e6f1aed30814
   languageName: node
   linkType: hard
 
@@ -7388,28 +7437,30 @@ __metadata:
   linkType: hard
 
 "eslint-plugin-react@npm:^7.33.2":
-  version: 7.33.2
-  resolution: "eslint-plugin-react@npm:7.33.2"
+  version: 7.34.0
+  resolution: "eslint-plugin-react@npm:7.34.0"
   dependencies:
-    array-includes: "npm:^3.1.6"
-    array.prototype.flatmap: "npm:^1.3.1"
-    array.prototype.tosorted: "npm:^1.1.1"
+    array-includes: "npm:^3.1.7"
+    array.prototype.findlast: "npm:^1.2.4"
+    array.prototype.flatmap: "npm:^1.3.2"
+    array.prototype.toreversed: "npm:^1.1.2"
+    array.prototype.tosorted: "npm:^1.1.3"
     doctrine: "npm:^2.1.0"
-    es-iterator-helpers: "npm:^1.0.12"
+    es-iterator-helpers: "npm:^1.0.17"
     estraverse: "npm:^5.3.0"
     jsx-ast-utils: "npm:^2.4.1 || ^3.0.0"
     minimatch: "npm:^3.1.2"
-    object.entries: "npm:^1.1.6"
-    object.fromentries: "npm:^2.0.6"
-    object.hasown: "npm:^1.1.2"
-    object.values: "npm:^1.1.6"
+    object.entries: "npm:^1.1.7"
+    object.fromentries: "npm:^2.0.7"
+    object.hasown: "npm:^1.1.3"
+    object.values: "npm:^1.1.7"
     prop-types: "npm:^15.8.1"
-    resolve: "npm:^2.0.0-next.4"
+    resolve: "npm:^2.0.0-next.5"
     semver: "npm:^6.3.1"
-    string.prototype.matchall: "npm:^4.0.8"
+    string.prototype.matchall: "npm:^4.0.10"
   peerDependencies:
     eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8
-  checksum: 10c0/f9b247861024bafc396c4bd3c9ac946604b3b23077251c98f23602aa22027a0c33a69157fd49564e4ff7f17b3678e5dc366a46c7ec42a09454d7cbce786d5001
+  checksum: 10c0/9bf0b959373ace66e799adbbfb493a7ceae54751e8f90fcce1da1a2a67b277ee23ba845571eaa4d4f05d96dba4e4977bf938b350f18bad26201fa616ee6aa4b8
   languageName: node
   linkType: hard
 
@@ -7441,14 +7492,14 @@ __metadata:
   linkType: hard
 
 "eslint@npm:^8.41.0":
-  version: 8.56.0
-  resolution: "eslint@npm:8.56.0"
+  version: 8.57.0
+  resolution: "eslint@npm:8.57.0"
   dependencies:
     "@eslint-community/eslint-utils": "npm:^4.2.0"
     "@eslint-community/regexpp": "npm:^4.6.1"
     "@eslint/eslintrc": "npm:^2.1.4"
-    "@eslint/js": "npm:8.56.0"
-    "@humanwhocodes/config-array": "npm:^0.11.13"
+    "@eslint/js": "npm:8.57.0"
+    "@humanwhocodes/config-array": "npm:^0.11.14"
     "@humanwhocodes/module-importer": "npm:^1.0.1"
     "@nodelib/fs.walk": "npm:^1.2.8"
     "@ungap/structured-clone": "npm:^1.2.0"
@@ -7484,7 +7535,7 @@ __metadata:
     text-table: "npm:^0.2.0"
   bin:
     eslint: bin/eslint.js
-  checksum: 10c0/2be598f7da1339d045ad933ffd3d4742bee610515cd2b0d9a2b8b729395a01d4e913552fff555b559fccaefd89d7b37632825789d1b06470608737ae69ab43fb
+  checksum: 10c0/00bb96fd2471039a312435a6776fe1fd557c056755eaa2b96093ef3a8508c92c8775d5f754768be6b1dddd09fdd3379ddb231eeb9b6c579ee17ea7d68000a529
   languageName: node
   linkType: hard
 
@@ -8218,7 +8269,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"function-bind@npm:^1.1.1, function-bind@npm:^1.1.2":
+"function-bind@npm:^1.1.2":
   version: 1.1.2
   resolution: "function-bind@npm:1.1.2"
   checksum: 10c0/d8680ee1e5fcd4c197e4ac33b2b4dce03c71f4d91717292785703db200f5c21f977c568d28061226f9b5900cbcd2c84463646134fd5337e7925e0942bc3f46d5
@@ -8272,15 +8323,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"get-intrinsic@npm:^1.0.2, get-intrinsic@npm:^1.1.1, get-intrinsic@npm:^1.1.3, get-intrinsic@npm:^1.2.0, get-intrinsic@npm:^1.2.1, get-intrinsic@npm:^1.2.2":
-  version: 1.2.2
-  resolution: "get-intrinsic@npm:1.2.2"
+"get-intrinsic@npm:^1.0.2, get-intrinsic@npm:^1.1.1, get-intrinsic@npm:^1.1.3, get-intrinsic@npm:^1.2.0, get-intrinsic@npm:^1.2.1, get-intrinsic@npm:^1.2.2, get-intrinsic@npm:^1.2.3, get-intrinsic@npm:^1.2.4":
+  version: 1.2.4
+  resolution: "get-intrinsic@npm:1.2.4"
   dependencies:
+    es-errors: "npm:^1.3.0"
     function-bind: "npm:^1.1.2"
     has-proto: "npm:^1.0.1"
     has-symbols: "npm:^1.0.3"
     hasown: "npm:^2.0.0"
-  checksum: 10c0/4e7fb8adc6172bae7c4fe579569b4d5238b3667c07931cd46b4eee74bbe6ff6b91329bec311a638d8e60f5b51f44fe5445693c6be89ae88d4b5c49f7ff12db0b
+  checksum: 10c0/0a9b82c16696ed6da5e39b1267104475c47e3a9bdbe8b509dfe1710946e38a87be70d759f4bb3cda042d76a41ef47fe769660f3b7c0d1f68750299344ffb15b7
   languageName: node
   linkType: hard
 
@@ -8321,13 +8373,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"get-symbol-description@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "get-symbol-description@npm:1.0.0"
+"get-symbol-description@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "get-symbol-description@npm:1.0.2"
   dependencies:
-    call-bind: "npm:^1.0.2"
-    get-intrinsic: "npm:^1.1.1"
-  checksum: 10c0/23bc3b44c221cdf7669a88230c62f4b9e30393b61eb21ba4400cb3e346801bd8f95fe4330ee78dbae37aecd874646d53e3e76a17a654d0c84c77f6690526d6bb
+    call-bind: "npm:^1.0.5"
+    es-errors: "npm:^1.3.0"
+    get-intrinsic: "npm:^1.2.4"
+  checksum: 10c0/867be6d63f5e0eb026cb3b0ef695ec9ecf9310febb041072d2e142f260bd91ced9eeb426b3af98791d1064e324e653424afa6fd1af17dee373bea48ae03162bc
   languageName: node
   linkType: hard
 
@@ -8567,19 +8620,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"has-property-descriptors@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "has-property-descriptors@npm:1.0.0"
+"has-property-descriptors@npm:^1.0.0, has-property-descriptors@npm:^1.0.1, has-property-descriptors@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "has-property-descriptors@npm:1.0.2"
   dependencies:
-    get-intrinsic: "npm:^1.1.1"
-  checksum: 10c0/d4ca882b6960d6257bd28baa3ddfa21f068d260411004a093b30ca357c740e11e985771c85216a6d1eef4161e862657f48c4758ec8ab515223b3895200ad164b
+    es-define-property: "npm:^1.0.0"
+  checksum: 10c0/253c1f59e80bb476cf0dde8ff5284505d90c3bdb762983c3514d36414290475fe3fd6f574929d84de2a8eec00d35cf07cb6776205ff32efd7c50719125f00236
   languageName: node
   linkType: hard
 
-"has-proto@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "has-proto@npm:1.0.1"
-  checksum: 10c0/c8a8fe411f810b23a564bd5546a8f3f0fff6f1b692740eb7a2fdc9df716ef870040806891e2f23ff4653f1083e3895bf12088703dd1a0eac3d9202d3a4768cd0
+"has-proto@npm:^1.0.1, has-proto@npm:^1.0.3":
+  version: 1.0.3
+  resolution: "has-proto@npm:1.0.3"
+  checksum: 10c0/35a6989f81e9f8022c2f4027f8b48a552de714938765d019dbea6bb547bd49ce5010a3c7c32ec6ddac6e48fc546166a3583b128f5a7add8b058a6d8b4afec205
   languageName: node
   linkType: hard
 
@@ -8590,12 +8643,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"has-tostringtag@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "has-tostringtag@npm:1.0.0"
+"has-tostringtag@npm:^1.0.0, has-tostringtag@npm:^1.0.1, has-tostringtag@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "has-tostringtag@npm:1.0.2"
   dependencies:
-    has-symbols: "npm:^1.0.2"
-  checksum: 10c0/1cdba76b7d13f65198a92b8ca1560ba40edfa09e85d182bf436d928f3588a9ebd260451d569f0ed1b849c4bf54f49c862aa0d0a77f9552b1855bb6deb526c011
+    has-symbols: "npm:^1.0.3"
+  checksum: 10c0/a8b166462192bafe3d9b6e420a1d581d93dd867adb61be223a17a8d6dad147aa77a8be32c961bb2f27b3ef893cae8d36f564ab651f5e9b7938ae86f74027c48c
   languageName: node
   linkType: hard
 
@@ -8638,13 +8691,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"has@npm:^1.0.3":
-  version: 1.0.4
-  resolution: "has@npm:1.0.4"
-  checksum: 10c0/82c1220573dc1f0a014a5d6189ae52a1f820f99dfdc00323c3a725b5002dcb7f04e44f460fea7af068474b2dd7c88cbe1846925c84017be9e31e1708936d305b
-  languageName: node
-  linkType: hard
-
 "hash-base@npm:^3.0.0":
   version: 3.1.0
   resolution: "hash-base@npm:3.1.0"
@@ -8666,12 +8712,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"hasown@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "hasown@npm:2.0.0"
+"hasown@npm:^2.0.0, hasown@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "hasown@npm:2.0.1"
   dependencies:
     function-bind: "npm:^1.1.2"
-  checksum: 10c0/5d415b114f410661208c95e7ab4879f1cc2765b8daceff4dc8718317d1cb7b9ffa7c5d1eafd9a4389c9aab7445d6ea88e05f3096cb1e529618b55304956b87fc
+  checksum: 10c0/9e27e70e8e4204f4124c8f99950d1ba2b1f5174864fd39ff26da190f9ea6488c1b3927dcc64981c26d1f637a971783c9489d62c829d393ea509e6f1ba20370bb
   languageName: node
   linkType: hard
 
@@ -9116,14 +9162,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"internal-slot@npm:^1.0.3, internal-slot@npm:^1.0.4, internal-slot@npm:^1.0.5":
-  version: 1.0.5
-  resolution: "internal-slot@npm:1.0.5"
+"internal-slot@npm:^1.0.4, internal-slot@npm:^1.0.5, internal-slot@npm:^1.0.7":
+  version: 1.0.7
+  resolution: "internal-slot@npm:1.0.7"
   dependencies:
-    get-intrinsic: "npm:^1.2.0"
-    has: "npm:^1.0.3"
+    es-errors: "npm:^1.3.0"
+    hasown: "npm:^2.0.0"
     side-channel: "npm:^1.0.4"
-  checksum: 10c0/66d8a66b4b5310c042e8ad00ce895dc55cb25165a3a7da0d7862ca18d69d3b1ba86511b4bf3baf4273d744d3f6e9154574af45189ef11135a444945309e39e4a
+  checksum: 10c0/f8b294a4e6ea3855fc59551bbf35f2b832cf01fd5e6e2a97f5c201a071cc09b49048f856e484b67a6c721da5e55736c5b6ddafaf19e2dbeb4a3ff1821680de6c
   languageName: node
   linkType: hard
 
@@ -9242,14 +9288,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-array-buffer@npm:^3.0.1, is-array-buffer@npm:^3.0.2":
-  version: 3.0.2
-  resolution: "is-array-buffer@npm:3.0.2"
+"is-array-buffer@npm:^3.0.2, is-array-buffer@npm:^3.0.4":
+  version: 3.0.4
+  resolution: "is-array-buffer@npm:3.0.4"
   dependencies:
     call-bind: "npm:^1.0.2"
-    get-intrinsic: "npm:^1.2.0"
-    is-typed-array: "npm:^1.1.10"
-  checksum: 10c0/40ed13a5f5746ac3ae2f2e463687d9b5a3f5fd0086f970fb4898f0253c2a5ec2e3caea2d664dd8f54761b1c1948609702416921a22faebe160c7640a9217c80e
+    get-intrinsic: "npm:^1.2.1"
+  checksum: 10c0/42a49d006cc6130bc5424eae113e948c146f31f9d24460fc0958f855d9d810e6fd2e4519bf19aab75179af9c298ea6092459d8cafdec523cd19e529b26eab860
   languageName: node
   linkType: hard
 
@@ -9322,7 +9367,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-core-module@npm:^2.11.0, is-core-module@npm:^2.13.0, is-core-module@npm:^2.13.1, is-core-module@npm:^2.9.0":
+"is-core-module@npm:^2.11.0, is-core-module@npm:^2.13.0, is-core-module@npm:^2.13.1":
   version: 2.13.1
   resolution: "is-core-module@npm:2.13.1"
   dependencies:
@@ -9504,10 +9549,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-negative-zero@npm:^2.0.2":
-  version: 2.0.2
-  resolution: "is-negative-zero@npm:2.0.2"
-  checksum: 10c0/eda024c158f70f2017f3415e471b818d314da5ef5be68f801b16314d4a4b6304a74cbed778acf9e2f955bb9c1c5f2935c1be0c7c99e1ad12286f45366217b6a3
+"is-negative-zero@npm:^2.0.3":
+  version: 2.0.3
+  resolution: "is-negative-zero@npm:2.0.3"
+  checksum: 10c0/bcdcf6b8b9714063ffcfa9929c575ac69bfdabb8f4574ff557dfc086df2836cf07e3906f5bbc4f2a5c12f8f3ba56af640c843cdfc74da8caed86c7c7d66fd08e
   languageName: node
   linkType: hard
 
@@ -9622,12 +9667,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-shared-array-buffer@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "is-shared-array-buffer@npm:1.0.2"
+"is-shared-array-buffer@npm:^1.0.2, is-shared-array-buffer@npm:^1.0.3":
+  version: 1.0.3
+  resolution: "is-shared-array-buffer@npm:1.0.3"
   dependencies:
-    call-bind: "npm:^1.0.2"
-  checksum: 10c0/cfeee6f171f1b13e6cbc6f3b6cc44e192b93df39f3fcb31aa66ffb1d2df3b91e05664311659f9701baba62f5e98c83b0673c628e7adc30f55071c4874fcdccec
+    call-bind: "npm:^1.0.7"
+  checksum: 10c0/adc11ab0acbc934a7b9e5e9d6c588d4ec6682f6fea8cda5180721704fa32927582ede5b123349e32517fdadd07958973d24716c80e7ab198970c47acc09e59c7
   languageName: node
   linkType: hard
 
@@ -9670,12 +9715,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-typed-array@npm:^1.1.10, is-typed-array@npm:^1.1.12, is-typed-array@npm:^1.1.9":
-  version: 1.1.12
-  resolution: "is-typed-array@npm:1.1.12"
+"is-typed-array@npm:^1.1.13":
+  version: 1.1.13
+  resolution: "is-typed-array@npm:1.1.13"
   dependencies:
-    which-typed-array: "npm:^1.1.11"
-  checksum: 10c0/9863e9cc7223c6fc1c462a2c3898a7beff6b41b1ee0fabb03b7d278ae7de670b5bcbc8627db56bb66ed60902fa37d53fe5cce0fd2f7d73ac64fe5da6f409b6ae
+    which-typed-array: "npm:^1.1.14"
+  checksum: 10c0/fa5cb97d4a80e52c2cc8ed3778e39f175a1a2ae4ddf3adae3187d69586a1fd57cfa0b095db31f66aa90331e9e3da79184cea9c6abdcd1abc722dc3c3edd51cca
   languageName: node
   linkType: hard
 
@@ -11830,19 +11875,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"object.assign@npm:^4.1.4":
-  version: 4.1.4
-  resolution: "object.assign@npm:4.1.4"
+"object.assign@npm:^4.1.4, object.assign@npm:^4.1.5":
+  version: 4.1.5
+  resolution: "object.assign@npm:4.1.5"
   dependencies:
-    call-bind: "npm:^1.0.2"
-    define-properties: "npm:^1.1.4"
+    call-bind: "npm:^1.0.5"
+    define-properties: "npm:^1.2.1"
     has-symbols: "npm:^1.0.3"
     object-keys: "npm:^1.1.1"
-  checksum: 10c0/2f286118c023e557757620e647b02e7c88d3d417e0c568fca0820de8ec9cca68928304854d5b03e99763eddad6e78a6716e2930f7e6372e4b9b843f3fd3056f3
+  checksum: 10c0/60108e1fa2706f22554a4648299b0955236c62b3685c52abf4988d14fffb0e7731e00aa8c6448397e3eb63d087dcc124a9f21e1980f36d0b2667f3c18bacd469
   languageName: node
   linkType: hard
 
-"object.entries@npm:^1.1.6, object.entries@npm:^1.1.7":
+"object.entries@npm:^1.1.7":
   version: 1.1.7
   resolution: "object.entries@npm:1.1.7"
   dependencies:
@@ -11853,7 +11898,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"object.fromentries@npm:^2.0.6, object.fromentries@npm:^2.0.7":
+"object.fromentries@npm:^2.0.7":
   version: 2.0.7
   resolution: "object.fromentries@npm:2.0.7"
   dependencies:
@@ -11889,13 +11934,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"object.hasown@npm:^1.1.2":
-  version: 1.1.2
-  resolution: "object.hasown@npm:1.1.2"
+"object.hasown@npm:^1.1.3":
+  version: 1.1.3
+  resolution: "object.hasown@npm:1.1.3"
   dependencies:
-    define-properties: "npm:^1.1.4"
-    es-abstract: "npm:^1.20.4"
-  checksum: 10c0/419fc1c74a2aea7ebb4d49b79d5b1599a010b26c18eae35bd061ccdd013ccb749c499d8dd6ee21a91e6d7264ccc592573d0f13562970f76e25fc844d8c1b02ce
+    define-properties: "npm:^1.2.0"
+    es-abstract: "npm:^1.22.1"
+  checksum: 10c0/8a41ba4fb1208a85c2275e9b5098071beacc24345b9a71ab98ef0a1c61b34dc74c6b460ff1e1884c33843d8f2553df64a10eec2b74b3ed009e3b2710c826bd2c
   languageName: node
   linkType: hard
 
@@ -12605,6 +12650,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"possible-typed-array-names@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "possible-typed-array-names@npm:1.0.0"
+  checksum: 10c0/d9aa22d31f4f7680e20269db76791b41c3a32c01a373e25f8a4813b4d45f7456bfc2b6d68f752dc4aab0e0bb0721cb3d76fb678c9101cb7a16316664bc2c73fd
+  languageName: node
+  linkType: hard
+
 "postcss-calc@npm:^9.0.1":
   version: 9.0.1
   resolution: "postcss-calc@npm:9.0.1"
@@ -14011,14 +14063,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"regexp.prototype.flags@npm:^1.2.0, regexp.prototype.flags@npm:^1.4.3, regexp.prototype.flags@npm:^1.5.0, regexp.prototype.flags@npm:^1.5.1":
-  version: 1.5.1
-  resolution: "regexp.prototype.flags@npm:1.5.1"
+"regexp.prototype.flags@npm:^1.2.0, regexp.prototype.flags@npm:^1.5.0, regexp.prototype.flags@npm:^1.5.2":
+  version: 1.5.2
+  resolution: "regexp.prototype.flags@npm:1.5.2"
   dependencies:
-    call-bind: "npm:^1.0.2"
-    define-properties: "npm:^1.2.0"
-    set-function-name: "npm:^2.0.0"
-  checksum: 10c0/1de7d214c0a726c7c874a7023e47b0e27b9f7fdb64175bfe1861189de1704aaeca05c3d26c35aa375432289b99946f3cf86651a92a8f7601b90d8c226a23bcd8
+    call-bind: "npm:^1.0.6"
+    define-properties: "npm:^1.2.1"
+    es-errors: "npm:^1.3.0"
+    set-function-name: "npm:^2.0.1"
+  checksum: 10c0/0f3fc4f580d9c349f8b560b012725eb9c002f36daa0041b3fbf6f4238cb05932191a4d7d5db3b5e2caa336d5150ad0402ed2be81f711f9308fe7e1a9bf9bd552
   languageName: node
   linkType: hard
 
@@ -14207,16 +14260,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"resolve@npm:^2.0.0-next.4":
-  version: 2.0.0-next.4
-  resolution: "resolve@npm:2.0.0-next.4"
+"resolve@npm:^2.0.0-next.5":
+  version: 2.0.0-next.5
+  resolution: "resolve@npm:2.0.0-next.5"
   dependencies:
-    is-core-module: "npm:^2.9.0"
+    is-core-module: "npm:^2.13.0"
     path-parse: "npm:^1.0.7"
     supports-preserve-symlinks-flag: "npm:^1.0.0"
   bin:
     resolve: bin/resolve
-  checksum: 10c0/1de92669e7c46cfe125294c66d5405e13288bb87b97e9bdab71693ceebbcc0255c789bde30e2834265257d330d8ff57414d7d88e3097d8f69951f3ce978bf045
+  checksum: 10c0/a6c33555e3482ea2ec4c6e3d3bf0d78128abf69dca99ae468e64f1e30acaa318fd267fb66c8836b04d558d3e2d6ed875fe388067e7d8e0de647d3c21af21c43a
   languageName: node
   linkType: hard
 
@@ -14233,16 +14286,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"resolve@patch:resolve@npm%3A^2.0.0-next.4#optional!builtin<compat/resolve>":
-  version: 2.0.0-next.4
-  resolution: "resolve@patch:resolve@npm%3A2.0.0-next.4#optional!builtin<compat/resolve>::version=2.0.0-next.4&hash=c3c19d"
+"resolve@patch:resolve@npm%3A^2.0.0-next.5#optional!builtin<compat/resolve>":
+  version: 2.0.0-next.5
+  resolution: "resolve@patch:resolve@npm%3A2.0.0-next.5#optional!builtin<compat/resolve>::version=2.0.0-next.5&hash=c3c19d"
   dependencies:
-    is-core-module: "npm:^2.9.0"
+    is-core-module: "npm:^2.13.0"
     path-parse: "npm:^1.0.7"
     supports-preserve-symlinks-flag: "npm:^1.0.0"
   bin:
     resolve: bin/resolve
-  checksum: 10c0/ed2bb51d616b9cd30fe85cf49f7a2240094d9fa01a221d361918462be81f683d1855b7f192391d2ab5325245b42464ca59690db5bd5dad0a326fc0de5974dd10
+  checksum: 10c0/78ad6edb8309a2bfb720c2c1898f7907a37f858866ce11a5974643af1203a6a6e05b2fa9c53d8064a673a447b83d42569260c306d43628bff5bb101969708355
   languageName: node
   linkType: hard
 
@@ -14371,15 +14424,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"safe-array-concat@npm:^1.0.0, safe-array-concat@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "safe-array-concat@npm:1.0.1"
+"safe-array-concat@npm:^1.0.0, safe-array-concat@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "safe-array-concat@npm:1.1.0"
   dependencies:
-    call-bind: "npm:^1.0.2"
-    get-intrinsic: "npm:^1.2.1"
+    call-bind: "npm:^1.0.5"
+    get-intrinsic: "npm:^1.2.2"
     has-symbols: "npm:^1.0.3"
     isarray: "npm:^2.0.5"
-  checksum: 10c0/4b15ce5fce5ce4d7e744a63592cded88d2f27806ed229eadb2e42629cbcd40e770f7478608e75f455e7fe341acd8c0a01bdcd7146b10645ea7411c5e3c1d1dd8
+  checksum: 10c0/833d3d950fc7507a60075f9bfaf41ec6dac7c50c7a9d62b1e6b071ecc162185881f92e594ff95c1a18301c881352dd6fd236d56999d5819559db7b92da9c28af
   languageName: node
   linkType: hard
 
@@ -14397,14 +14450,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"safe-regex-test@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "safe-regex-test@npm:1.0.0"
+"safe-regex-test@npm:^1.0.3":
+  version: 1.0.3
+  resolution: "safe-regex-test@npm:1.0.3"
   dependencies:
-    call-bind: "npm:^1.0.2"
-    get-intrinsic: "npm:^1.1.3"
+    call-bind: "npm:^1.0.6"
+    es-errors: "npm:^1.3.0"
     is-regex: "npm:^1.1.4"
-  checksum: 10c0/14a81a7e683f97b2d6e9c8be61fddcf8ed7a02f4e64a825515f96bb1738eb007145359313741d2704d28b55b703a0f6300c749dde7c1dbc13952a2b85048ede2
+  checksum: 10c0/900bf7c98dc58f08d8523b7012b468e4eb757afa624f198902c0643d7008ba777b0bdc35810ba0b758671ce887617295fb742b3f3968991b178ceca54cb07603
   languageName: node
   linkType: hard
 
@@ -14662,15 +14715,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"set-function-length@npm:^1.1.1":
-  version: 1.1.1
-  resolution: "set-function-length@npm:1.1.1"
+"set-function-length@npm:^1.2.1":
+  version: 1.2.1
+  resolution: "set-function-length@npm:1.2.1"
   dependencies:
-    define-data-property: "npm:^1.1.1"
-    get-intrinsic: "npm:^1.2.1"
+    define-data-property: "npm:^1.1.2"
+    es-errors: "npm:^1.3.0"
+    function-bind: "npm:^1.1.2"
+    get-intrinsic: "npm:^1.2.3"
     gopd: "npm:^1.0.1"
-    has-property-descriptors: "npm:^1.0.0"
-  checksum: 10c0/a29e255c116c29e3323b851c4f46c58c91be9bb8b065f191e2ea1807cb2c839df56e3175732a498e0c6d54626ba6b6fef896bf699feb7ab70c42dc47eb247c95
+    has-property-descriptors: "npm:^1.0.1"
+  checksum: 10c0/1927e296599f2c04d210c1911f1600430a5e49e04a6d8bb03dca5487b95a574da9968813a2ced9a774bd3e188d4a6208352c8f64b8d4674cdb021dca21e190ca
   languageName: node
   linkType: hard
 
@@ -15323,19 +15378,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"string.prototype.matchall@npm:^4.0.6, string.prototype.matchall@npm:^4.0.8":
-  version: 4.0.8
-  resolution: "string.prototype.matchall@npm:4.0.8"
+"string.prototype.matchall@npm:^4.0.10, string.prototype.matchall@npm:^4.0.6":
+  version: 4.0.10
+  resolution: "string.prototype.matchall@npm:4.0.10"
   dependencies:
     call-bind: "npm:^1.0.2"
-    define-properties: "npm:^1.1.4"
-    es-abstract: "npm:^1.20.4"
-    get-intrinsic: "npm:^1.1.3"
+    define-properties: "npm:^1.2.0"
+    es-abstract: "npm:^1.22.1"
+    get-intrinsic: "npm:^1.2.1"
     has-symbols: "npm:^1.0.3"
-    internal-slot: "npm:^1.0.3"
-    regexp.prototype.flags: "npm:^1.4.3"
+    internal-slot: "npm:^1.0.5"
+    regexp.prototype.flags: "npm:^1.5.0"
+    set-function-name: "npm:^2.0.0"
     side-channel: "npm:^1.0.4"
-  checksum: 10c0/644523d05c1ee93bab7474e999a5734ee5f6ad2d7ad24ed6ea8706c270dc92b352bde0f2a5420bfbeed54e28cb6a770c3800e1988a5267a70fd5e677c7750abc
+  checksum: 10c0/cd7495fb0de16d43efeee3887b98701941f3817bd5f09351ad1825b023d307720c86394d56d56380563d97767ab25bf5448db239fcecbb85c28e2180f23e324a
   languageName: node
   linkType: hard
 
@@ -16183,50 +16239,55 @@ __metadata:
   languageName: node
   linkType: hard
 
-"typed-array-buffer@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "typed-array-buffer@npm:1.0.0"
+"typed-array-buffer@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "typed-array-buffer@npm:1.0.2"
   dependencies:
-    call-bind: "npm:^1.0.2"
-    get-intrinsic: "npm:^1.2.1"
-    is-typed-array: "npm:^1.1.10"
-  checksum: 10c0/ebad66cdf00c96b1395dffc7873169cf09801fca5954507a484f41f253feb1388d815db297b0b3bb8ce7421eac6f7ff45e2ec68450a3d68408aa4ae02fcf3a6c
+    call-bind: "npm:^1.0.7"
+    es-errors: "npm:^1.3.0"
+    is-typed-array: "npm:^1.1.13"
+  checksum: 10c0/9e043eb38e1b4df4ddf9dde1aa64919ae8bb909571c1cc4490ba777d55d23a0c74c7d73afcdd29ec98616d91bb3ae0f705fad4421ea147e1daf9528200b562da
   languageName: node
   linkType: hard
 
-"typed-array-byte-length@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "typed-array-byte-length@npm:1.0.0"
+"typed-array-byte-length@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "typed-array-byte-length@npm:1.0.1"
   dependencies:
-    call-bind: "npm:^1.0.2"
+    call-bind: "npm:^1.0.7"
     for-each: "npm:^0.3.3"
-    has-proto: "npm:^1.0.1"
-    is-typed-array: "npm:^1.1.10"
-  checksum: 10c0/6696435d53ce0e704ff6760c57ccc35138aec5f87859e03eb2a3246336d546feae367952dbc918116f3f0dffbe669734e3cbd8960283c2fa79aac925db50d888
+    gopd: "npm:^1.0.1"
+    has-proto: "npm:^1.0.3"
+    is-typed-array: "npm:^1.1.13"
+  checksum: 10c0/fcebeffb2436c9f355e91bd19e2368273b88c11d1acc0948a2a306792f1ab672bce4cfe524ab9f51a0505c9d7cd1c98eff4235c4f6bfef6a198f6cfc4ff3d4f3
   languageName: node
   linkType: hard
 
-"typed-array-byte-offset@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "typed-array-byte-offset@npm:1.0.0"
+"typed-array-byte-offset@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "typed-array-byte-offset@npm:1.0.2"
   dependencies:
-    available-typed-arrays: "npm:^1.0.5"
-    call-bind: "npm:^1.0.2"
+    available-typed-arrays: "npm:^1.0.7"
+    call-bind: "npm:^1.0.7"
     for-each: "npm:^0.3.3"
-    has-proto: "npm:^1.0.1"
-    is-typed-array: "npm:^1.1.10"
-  checksum: 10c0/4036ce007ae9752931bed3dd61e0d6de2a3e5f6a5a85a05f3adb35388d2c0728f9b1a1e638d75579f168e49c289bfb5417f00e96d4ab081f38b647fc854ff7a5
+    gopd: "npm:^1.0.1"
+    has-proto: "npm:^1.0.3"
+    is-typed-array: "npm:^1.1.13"
+  checksum: 10c0/d2628bc739732072e39269389a758025f75339de2ed40c4f91357023c5512d237f255b633e3106c461ced41907c1bf9a533c7e8578066b0163690ca8bc61b22f
   languageName: node
   linkType: hard
 
-"typed-array-length@npm:^1.0.4":
-  version: 1.0.4
-  resolution: "typed-array-length@npm:1.0.4"
+"typed-array-length@npm:^1.0.5":
+  version: 1.0.5
+  resolution: "typed-array-length@npm:1.0.5"
   dependencies:
-    call-bind: "npm:^1.0.2"
+    call-bind: "npm:^1.0.7"
     for-each: "npm:^0.3.3"
-    is-typed-array: "npm:^1.1.9"
-  checksum: 10c0/c5163c0103d07fefc8a2ad0fc151f9ca9a1f6422098c00f695d55f9896e4d63614cd62cf8d8a031c6cee5f418e8980a533796597174da4edff075b3d275a7e23
+    gopd: "npm:^1.0.1"
+    has-proto: "npm:^1.0.3"
+    is-typed-array: "npm:^1.1.13"
+    possible-typed-array-names: "npm:^1.0.0"
+  checksum: 10c0/5cc0f79196e70a92f8f40846cfa62b3de6be51e83f73655e137116cf65e3c29a288502b18cc8faf33c943c2470a4569009e1d6da338441649a2db2f135761ad5
   languageName: node
   linkType: hard
 
@@ -17087,16 +17148,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"which-typed-array@npm:^1.1.11, which-typed-array@npm:^1.1.13, which-typed-array@npm:^1.1.9":
-  version: 1.1.13
-  resolution: "which-typed-array@npm:1.1.13"
+"which-typed-array@npm:^1.1.14, which-typed-array@npm:^1.1.9":
+  version: 1.1.14
+  resolution: "which-typed-array@npm:1.1.14"
   dependencies:
-    available-typed-arrays: "npm:^1.0.5"
-    call-bind: "npm:^1.0.4"
+    available-typed-arrays: "npm:^1.0.6"
+    call-bind: "npm:^1.0.5"
     for-each: "npm:^0.3.3"
     gopd: "npm:^1.0.1"
-    has-tostringtag: "npm:^1.0.0"
-  checksum: 10c0/9f5f1c42918df3d5b91c4315ed0051d5d874370998bf095c9ae0df374f0881f85094e3c384b8fb08ab7b4d4f54ba81c0aff75da6226e7c0589b83dfbec1cd4c9
+    has-tostringtag: "npm:^1.0.1"
+  checksum: 10c0/0960f1e77807058819451b98c51d4cd72031593e8de990b24bd3fc22e176f5eee22921d68d852297c786aec117689f0423ed20aa4fde7ce2704d680677891f56
   languageName: node
   linkType: hard
 

From 4c138ee4eb62505b3a8af53501b5a02872532003 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 5 Mar 2024 10:42:26 +0100
Subject: [PATCH 0357/2191] Update DefinitelyTyped types (non-major) (#29502)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index c5ec6e5f8c32fa..75a725c4ee564b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3266,13 +3266,13 @@ __metadata:
   linkType: hard
 
 "@types/pg@npm:^8.6.6":
-  version: 8.11.1
-  resolution: "@types/pg@npm:8.11.1"
+  version: 8.11.2
+  resolution: "@types/pg@npm:8.11.2"
   dependencies:
     "@types/node": "npm:*"
     pg-protocol: "npm:*"
     pg-types: "npm:^4.0.1"
-  checksum: 10c0/7563075e037c8f7579cfb55e60e0891b742537ac50dc1d802051185513f850725fb05a635418ff26602c7cb6f176f6677a0099d586d51b72c651bb741b05b6e7
+  checksum: 10c0/6d873af7f71785d5d4db49311c5c73628918b2b1ece83f17073c4470b2fce6bd24a37de23a42ea0221df4e1c7dc43ea035bb9d0b6274f86ec692b21503a9a55c
   languageName: node
   linkType: hard
 
@@ -3456,13 +3456,13 @@ __metadata:
   linkType: hard
 
 "@types/react@npm:*, @types/react@npm:16 || 17 || 18, @types/react@npm:>=16.9.11, @types/react@npm:^18.2.7":
-  version: 18.2.58
-  resolution: "@types/react@npm:18.2.58"
+  version: 18.2.63
+  resolution: "@types/react@npm:18.2.63"
   dependencies:
     "@types/prop-types": "npm:*"
     "@types/scheduler": "npm:*"
     csstype: "npm:^3.0.2"
-  checksum: 10c0/80145b707b780d682092b51d520f58a0171c4067ff36cf488d3346d92b715b27fd334acd0fabb8eb21a4eb6c4061f1535e8bfa6642a7f4025e63ebec868fb6d1
+  checksum: 10c0/53d86727b966a3ba097553b5ef75a1f2bea78bd8c54ebcf6d00bd338000112b208ab30536c8c0a9f5fc61055cc3fbabbc7a23910c55092341602845de4c13714
   languageName: node
   linkType: hard
 

From 7265d47342c82721e5f2a8570b69de3b4171a803 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 5 Mar 2024 09:42:49 +0000
Subject: [PATCH 0358/2191] Update peter-evans/create-pull-request action to
 v6.0.1 (#29503)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .github/workflows/crowdin-download.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/crowdin-download.yml b/.github/workflows/crowdin-download.yml
index a676ff12fcdc7e..45580bd06f2ead 100644
--- a/.github/workflows/crowdin-download.yml
+++ b/.github/workflows/crowdin-download.yml
@@ -52,7 +52,7 @@ jobs:
 
       # Create or update the pull request
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v6.0.0
+        uses: peter-evans/create-pull-request@v6.0.1
         with:
           commit-message: 'New Crowdin translations'
           title: 'New Crowdin Translations (automated)'

From f89512fbedb547f66a72eefdff047768fb505eb6 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 5 Mar 2024 15:09:52 +0100
Subject: [PATCH 0359/2191] Update dependency rack-cors to v2.0.2 [SECURITY]
 (#29507)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 076cf915d05bfd..6ee799eab2ca2c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -535,7 +535,7 @@ GEM
     rack (2.2.8.1)
     rack-attack (6.7.0)
       rack (>= 1.0, < 4)
-    rack-cors (2.0.1)
+    rack-cors (2.0.2)
       rack (>= 2.0.0)
     rack-oauth2 (1.21.3)
       activesupport

From b8bd94ca8edb5a675ef70aac9c941ed340efc127 Mon Sep 17 00:00:00 2001
From: Mashiro <moezhx@outlook.com>
Date: Wed, 6 Mar 2024 20:53:54 +0800
Subject: [PATCH 0360/2191] Fix unhandled nullable attachments limitation
 counter (#29183)

---
 .../containers/upload_button_container.js     | 20 ++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/app/javascript/mastodon/features/compose/containers/upload_button_container.js b/app/javascript/mastodon/features/compose/containers/upload_button_container.js
index 7c4757b6c3da0d..066e1853468680 100644
--- a/app/javascript/mastodon/features/compose/containers/upload_button_container.js
+++ b/app/javascript/mastodon/features/compose/containers/upload_button_container.js
@@ -3,14 +3,24 @@ import { connect } from 'react-redux';
 import { uploadCompose } from '../../../actions/compose';
 import UploadButton from '../components/upload_button';
 
-const mapStateToProps = state => ({
-  disabled: state.getIn(['compose', 'poll']) !== null || state.getIn(['compose', 'is_uploading']) || (state.getIn(['compose', 'media_attachments']).size + state.getIn(['compose', 'pending_media_attachments']) > 3 || state.getIn(['compose', 'media_attachments']).some(m => ['video', 'audio'].includes(m.get('type')))),
-  resetFileKey: state.getIn(['compose', 'resetFileKey']),
-});
+const mapStateToProps = state => {
+  const isPoll = state.getIn(['compose', 'poll']) !== null;
+  const isUploading = state.getIn(['compose', 'is_uploading']);
+  const readyAttachmentsSize = state.getIn(['compose', 'media_attachments']).size ?? 0;
+  const pendingAttachmentsSize = state.getIn(['compose', 'pending_media_attachments']).size ?? 0;
+  const attachmentsSize = readyAttachmentsSize + pendingAttachmentsSize;
+  const isOverLimit = attachmentsSize > 3;
+  const hasVideoOrAudio = state.getIn(['compose', 'media_attachments']).some(m => ['video', 'audio'].includes(m.get('type')));
+
+  return {
+    disabled: isPoll || isUploading || isOverLimit || hasVideoOrAudio,
+    resetFileKey: state.getIn(['compose', 'resetFileKey']),
+  };
+};
 
 const mapDispatchToProps = dispatch => ({
 
-  onSelectFile (files) {
+  onSelectFile(files) {
     dispatch(uploadCompose(files));
   },
 

From a11151d58f022194b30da7ff547a52af573a2664 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 6 Mar 2024 22:12:57 +0100
Subject: [PATCH 0361/2191] Update our README and include upstream's (#2663)

---
 README.md | 152 +++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 146 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index f878752fe35c6d..b28b13db85217c 100644
--- a/README.md
+++ b/README.md
@@ -1,14 +1,154 @@
 # Mastodon Glitch Edition
 
-> Now with automated deploys!
+[![Ruby Testing](https://github.com/glitch-soc/mastodon/actions/workflows/test-ruby.yml/badge.svg)](https://github.com/glitch-soc/mastodon/actions/workflows/test-ruby.yml)
+[![Crowdin](https://badges.crowdin.net/glitch-soc/localized.svg)][glitch-crowdin]
 
-[![Build Status](https://img.shields.io/circleci/project/github/glitch-soc/mastodon.svg)][circleci]
-[![Code Climate](https://img.shields.io/codeclimate/maintainability/glitch-soc/mastodon.svg)][code_climate]
-
-[circleci]: https://circleci.com/gh/glitch-soc/mastodon
-[code_climate]: https://codeclimate.com/github/glitch-soc/mastodon
+[glitch-crowdin]: https://crowdin.com/project/glitch-soc
 
 So here's the deal: we all work on this code, and anyone who uses that does so absolutely at their own risk. can you dig it?
 
 - You can view documentation for this project at [glitch-soc.github.io/docs/](https://glitch-soc.github.io/docs/).
 - And contributing guidelines are available [here](CONTRIBUTING.md) and [here](https://glitch-soc.github.io/docs/contributing/).
+
+Mastodon Glitch Edition is a fork of [Mastodon](https://github.com/mastodon/mastodon). Upstream's README file is reproduced below.
+
+---
+
+<h1><picture>
+  <source media="(prefers-color-scheme: dark)" srcset="./lib/assets/wordmark.dark.png?raw=true">
+  <source media="(prefers-color-scheme: light)" srcset="./lib/assets/wordmark.light.png?raw=true">
+  <img alt="Mastodon" src="./lib/assets/wordmark.light.png?raw=true" height="34">
+</picture></h1>
+
+[![GitHub release](https://img.shields.io/github/release/mastodon/mastodon.svg)][releases]
+[![Ruby Testing](https://github.com/mastodon/mastodon/actions/workflows/test-ruby.yml/badge.svg)](https://github.com/mastodon/mastodon/actions/workflows/test-ruby.yml)
+[![Crowdin](https://d322cqt584bo4o.cloudfront.net/mastodon/localized.svg)][crowdin]
+
+[releases]: https://github.com/mastodon/mastodon/releases
+[crowdin]: https://crowdin.com/project/mastodon
+
+Mastodon is a **free, open-source social network server** based on ActivityPub where users can follow friends and discover new ones. On Mastodon, users can publish anything they want: links, pictures, text, and video. All Mastodon servers are interoperable as a federated network (users on one server can seamlessly communicate with users from another one, including non-Mastodon software that implements ActivityPub!)
+
+Click below to **learn more** in a video:
+
+[![Screenshot](https://blog.joinmastodon.org/2018/06/why-activitypub-is-the-future/ezgif-2-60f1b00403.gif)][youtube_demo]
+
+[youtube_demo]: https://www.youtube.com/watch?v=IPSbNdBmWKE
+
+## Navigation
+
+- [Project homepage 🐘](https://joinmastodon.org)
+- [Support the development via Patreon][patreon]
+- [View sponsors](https://joinmastodon.org/sponsors)
+- [Blog](https://blog.joinmastodon.org)
+- [Documentation](https://docs.joinmastodon.org)
+- [Roadmap](https://joinmastodon.org/roadmap)
+- [Official Docker image](https://github.com/mastodon/mastodon/pkgs/container/mastodon)
+- [Browse Mastodon servers](https://joinmastodon.org/communities)
+- [Browse Mastodon apps](https://joinmastodon.org/apps)
+
+[patreon]: https://www.patreon.com/mastodon
+
+## Features
+
+<img src="/app/javascript/images/elephant_ui_working.svg?raw=true" align="right" width="30%" />
+
+### No vendor lock-in: Fully interoperable with any conforming platform
+
+It doesn't have to be Mastodon; whatever implements ActivityPub is part of the social network! [Learn more](https://blog.joinmastodon.org/2018/06/why-activitypub-is-the-future/)
+
+### Real-time, chronological timeline updates
+
+Updates of people you're following appear in real-time in the UI via WebSockets. There's a firehose view as well!
+
+### Media attachments like images and short videos
+
+Upload and view images and WebM/MP4 videos attached to the updates. Videos with no audio track are treated like GIFs; normal videos loop continuously!
+
+### Safety and moderation tools
+
+Mastodon includes private posts, locked accounts, phrase filtering, muting, blocking, and all sorts of other features, along with a reporting and moderation system. [Learn more](https://blog.joinmastodon.org/2018/07/cage-the-mastodon/)
+
+### OAuth2 and a straightforward REST API
+
+Mastodon acts as an OAuth2 provider, so 3rd party apps can use the REST and Streaming APIs. This results in a rich app ecosystem with a lot of choices!
+
+## Deployment
+
+### Tech stack
+
+- **Ruby on Rails** powers the REST API and other web pages
+- **React.js** and Redux are used for the dynamic parts of the interface
+- **Node.js** powers the streaming API
+
+### Requirements
+
+- **PostgreSQL** 12+
+- **Redis** 4+
+- **Ruby** 3.0+
+- **Node.js** 16+
+
+The repository includes deployment configurations for **Docker and docker-compose** as well as specific platforms like **Heroku**, **Scalingo**, and **Nanobox**. For Helm charts, reference the [mastodon/chart repository](https://github.com/mastodon/chart). The [**standalone** installation guide](https://docs.joinmastodon.org/admin/install/) is available in the documentation.
+
+## Development
+
+### Vagrant
+
+A **Vagrant** configuration is included for development purposes. To use it, complete the following steps:
+
+- Install Vagrant and Virtualbox
+- Install the `vagrant-hostsupdater` plugin: `vagrant plugin install vagrant-hostsupdater`
+- Run `vagrant up`
+- Run `vagrant ssh -c "cd /vagrant && bin/dev"`
+- Open `http://mastodon.local` in your browser
+
+### MacOS
+
+To set up **MacOS** for native development, complete the following steps:
+
+- Use a Ruby version manager to install the specified version from `.ruby-version`
+- Run `brew install postgresql@14 redis imagemagick libidn` to install required dependencies
+- Navigate to Mastodon's root directory and run `brew install nvm` then `nvm use` to use the version from `.nvmrc`
+- Run `corepack enable && corepack prepare`
+- Run `bundle exec rails db:setup` (optionally prepend `RAILS_ENV=development` to target the dev environment)
+- Finally, run `bin/dev` which will launch the local services via `overmind` (if installed) or `foreman`
+
+### Docker
+
+For development with **Docker**, complete the following steps:
+
+- Install Docker Desktop
+- Run `docker compose -f .devcontainer/docker-compose.yml up -d`
+- Run `docker compose -f .devcontainer/docker-compose.yml exec app .devcontainer/post-create.sh`
+- Finally, run `docker compose -f .devcontainer/docker-compose.yml exec app bin/dev`
+
+If you are using an IDE with [support for the Development Container specification](https://containers.dev/supporting), it will run the above `docker compose` commands automatically. For **Visual Studio Code** this requires the [Dev Container extension](https://containers.dev/supporting#dev-containers).
+
+### GitHub Codespaces
+
+To get you coding in just a few minutes, GitHub Codespaces provides a web-based version of Visual Studio Code and a cloud-hosted development environment fully configured with the software needed for this project..
+
+- Click this button to create a new codespace:<br>
+  [![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://github.com/codespaces/new?hide_repo_select=true&ref=main&repo=52281283&devcontainer_path=.devcontainer%2Fcodespaces%2Fdevcontainer.json)
+- Wait for the environment to build. This will take a few minutes.
+- When the editor is ready, run `bin/dev` in the terminal.
+- After a few seconds, a popup will appear with a button labeled _Open in Browser_. This will open Mastodon.
+- On the _Ports_ tab, right click on the “stream” row and select _Port visibility_ → _Public_.
+
+## Contributing
+
+Mastodon is **free, open-source software** licensed under **AGPLv3**.
+
+You can open issues for bugs you've found or features you think are missing. You can also submit pull requests to this repository or submit translations using Crowdin. To get started, take a look at [CONTRIBUTING.md](CONTRIBUTING.md). If your contributions are accepted into Mastodon, you can request to be paid through [our OpenCollective](https://opencollective.com/mastodon).
+
+**IRC channel**: #mastodon on irc.libera.chat
+
+## License
+
+Copyright (C) 2016-2024 Eugen Rochko & other Mastodon contributors (see [AUTHORS.md](AUTHORS.md))
+
+This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License along with this program. If not, see <https://www.gnu.org/licenses/>.

From 8c9341a67bd6a84d07d6e1907fa85a75d682e29b Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 6 Mar 2024 22:13:23 +0100
Subject: [PATCH 0362/2191] Further reduce pointless CSS differences with
 upstream (#2665)

---
 .../flavours/glitch/styles/components.scss    | 51 ++++---------------
 .../glitch/styles/mastodon-light/diff.scss    |  6 ---
 2 files changed, 11 insertions(+), 46 deletions(-)

diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index a42bfdc7121f58..8e5c57dab3d7e0 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -1334,19 +1334,19 @@ body > [data-popper-placement] {
 }
 
 .status__content__spoiler-link {
-  display: inline-flex;
+  display: inline-flex; // glitch: media icon in spoiler button
   border-radius: 2px;
   background: transparent;
   border: 0;
   color: $inverted-text-color;
   font-weight: 700;
   font-size: 11px;
-  padding: 0 5px;
+  padding: 0 6px;
   text-transform: uppercase;
-  line-height: inherit;
+  line-height: 20px;
   cursor: pointer;
   vertical-align: top;
-  align-items: center;
+  align-items: center; // glitch: content indicator
 
   &:hover {
     background: lighten($ui-base-color, 33%);
@@ -1867,6 +1867,11 @@ body > [data-popper-placement] {
   .audio-player {
     margin-top: 8px;
   }
+
+  .status__prepend {
+    padding: 0;
+    margin-bottom: 16px;
+  }
 }
 
 .scrollable > div:first-child .detailed-status {
@@ -2069,8 +2074,6 @@ body > [data-popper-placement] {
     position: relative;
 
     & > div {
-      @include avatar-radius;
-
       float: left;
       position: relative;
       box-sizing: border-box;
@@ -2222,7 +2225,7 @@ a.account__display-name {
 
     &:hover,
     &:focus {
-      background: lighten($ui-base-color, 29%);
+      background: lighten($ui-base-lighter-color, 7%);
       text-decoration: none;
     }
   }
@@ -4704,35 +4707,6 @@ a.status-card {
   z-index: 100;
 }
 
-.media-spoiler {
-  background: $base-overlay-background;
-  color: $darker-text-color;
-  border: 0;
-  padding: 0;
-  width: 100%;
-  height: 100%;
-  border-radius: 4px;
-  appearance: none;
-
-  &:hover,
-  &:active,
-  &:focus {
-    padding: 0;
-    color: lighten($darker-text-color, 8%);
-  }
-}
-
-.media-spoiler__warning {
-  display: block;
-  font-size: 14px;
-}
-
-.media-spoiler__trigger {
-  display: block;
-  font-size: 11px;
-  font-weight: 700;
-}
-
 .spoiler-button {
   top: 0;
   inset-inline-start: 0;
@@ -4742,12 +4716,11 @@ a.status-card {
   z-index: 100;
 
   &--minified {
-    display: flex; // glitch: media icon in spoiler button
+    display: block;
     inset-inline-start: 4px;
     top: 4px;
     width: auto;
     height: auto;
-    align-items: center; // glitch: media icon in spoiler button
   }
 
   &--click-thru {
@@ -6650,8 +6623,6 @@ a.status-card {
           }
         }
 
-        & > .react-toggle,
-        & > .icon,
         button:first-child {
           margin-inline-end: 10px;
         }
diff --git a/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss b/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss
index 6bf4a1e48899a9..02a1e7207d7b80 100644
--- a/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss
+++ b/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss
@@ -210,12 +210,6 @@ html {
   }
 }
 
-// Change the background colors of media and video spoilers
-.media-spoiler,
-.video-player__spoiler {
-  background: $ui-base-color;
-}
-
 .account-gallery__item a {
   background-color: $ui-base-color;
 }

From 995e15c24ab24bf153463299ded92db89116fa13 Mon Sep 17 00:00:00 2001
From: gunchleoc <fios@foramnagaidhlig.net>
Date: Thu, 7 Mar 2024 11:03:41 +0000
Subject: [PATCH 0363/2191] Add Jawi Malay to posting languages (#29098)

---
 app/helpers/languages_helper.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/helpers/languages_helper.rb b/app/helpers/languages_helper.rb
index 65ade9fd2a7015..539020ece94c8a 100644
--- a/app/helpers/languages_helper.rb
+++ b/app/helpers/languages_helper.rb
@@ -109,6 +109,7 @@ module LanguagesHelper
     mn: ['Mongolian', 'Монгол хэл'].freeze,
     mr: ['Marathi', 'मराठी'].freeze,
     ms: ['Malay', 'Bahasa Melayu'].freeze,
+    'ms-Arab': ['Jawi Malay', 'بهاس ملايو'].freeze,
     mt: ['Maltese', 'Malti'].freeze,
     my: ['Burmese', 'ဗမာစာ'].freeze,
     na: ['Nauru', 'Ekakairũ Naoero'].freeze,

From c01f4cebed27a1c11085e8aebe7719b3cee7ae7f Mon Sep 17 00:00:00 2001
From: gunchleoc <fios@foramnagaidhlig.net>
Date: Thu, 7 Mar 2024 11:04:31 +0000
Subject: [PATCH 0364/2191] Add Mohawk to posting languages (#27115)

---
 app/helpers/languages_helper.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/helpers/languages_helper.rb b/app/helpers/languages_helper.rb
index 539020ece94c8a..79d8cf794c729f 100644
--- a/app/helpers/languages_helper.rb
+++ b/app/helpers/languages_helper.rb
@@ -197,6 +197,7 @@ module LanguagesHelper
     kab: ['Kabyle', 'Taqbaylit'].freeze,
     ldn: ['Láadan', 'Láadan'].freeze,
     lfn: ['Lingua Franca Nova', 'lingua franca nova'].freeze,
+    moh: ['Mohawk', 'Kanienʼkéha'].freeze,
     pdc: ['Pennsylvania Dutch', 'Pennsilfaani-Deitsch'].freeze,
     sco: ['Scots', 'Scots'].freeze,
     sma: ['Southern Sami', 'Åarjelsaemien Gïele'].freeze,

From 653ce43abe0a928d944a15c433d2c8324f9b5e2a Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Thu, 7 Mar 2024 12:11:14 +0100
Subject: [PATCH 0365/2191] Update `json-jwt` gem to fix CVE-2023-51774
 (#29520)

---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 6ee799eab2ca2c..59b24e1035d4e5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -357,7 +357,7 @@ GEM
     jmespath (1.6.2)
     json (2.7.1)
     json-canonicalization (1.0.0)
-    json-jwt (1.15.3)
+    json-jwt (1.15.3.1)
       activesupport (>= 4.2)
       aes_key_wrap
       bindata

From 3f239facff413120bad5ee877bf5ccc2211402bc Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 7 Mar 2024 12:59:00 +0100
Subject: [PATCH 0366/2191] Update flavor screenshots (#2664)

---
 .../flavours/glitch/images/glitch-preview.jpg  | Bin 197277 -> 0 bytes
 .../flavours/glitch/images/glitch-preview.png  | Bin 0 -> 125180 bytes
 app/javascript/flavours/glitch/theme.yml       |   2 +-
 app/javascript/flavours/vanilla/theme.yml      |   2 +-
 app/javascript/images/screenshot.jpg           | Bin 239221 -> 0 bytes
 app/javascript/images/screenshot.png           | Bin 0 -> 158816 bytes
 6 files changed, 2 insertions(+), 2 deletions(-)
 delete mode 100644 app/javascript/flavours/glitch/images/glitch-preview.jpg
 create mode 100644 app/javascript/flavours/glitch/images/glitch-preview.png
 delete mode 100644 app/javascript/images/screenshot.jpg
 create mode 100644 app/javascript/images/screenshot.png

diff --git a/app/javascript/flavours/glitch/images/glitch-preview.jpg b/app/javascript/flavours/glitch/images/glitch-preview.jpg
deleted file mode 100644
index fc5c4204359659e32ec8d758855891e297f5093c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 197277
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%0AZf$5*<oC
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
KIoqB2DEv269CTIy

diff --git a/app/javascript/flavours/glitch/images/glitch-preview.png b/app/javascript/flavours/glitch/images/glitch-preview.png
new file mode 100644
index 0000000000000000000000000000000000000000..af70d24fc078a6c1a1495ddfd663edb9457bdac6
GIT binary patch
literal 125180
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

literal 0
HcmV?d00001

diff --git a/app/javascript/flavours/glitch/theme.yml b/app/javascript/flavours/glitch/theme.yml
index 49d71e085cdbd3..e6b748da7760c0 100644
--- a/app/javascript/flavours/glitch/theme.yml
+++ b/app/javascript/flavours/glitch/theme.yml
@@ -33,7 +33,7 @@ inherit_locales: vanilla
 
 #  (OPTIONAL) A file to use as the preview screenshot for the flavour,
 #  or an array thereof. These are the full path from `app/javascript/`.
-screenshot: flavours/glitch/images/glitch-preview.jpg
+screenshot: flavours/glitch/images/glitch-preview.png
 
 #  (OPTIONAL) The directory which contains the pack files.
 #  Defaults to the theme directory (`app/javascript/themes/[theme]`),
diff --git a/app/javascript/flavours/vanilla/theme.yml b/app/javascript/flavours/vanilla/theme.yml
index b7678dc441b266..ecfb00729b766b 100644
--- a/app/javascript/flavours/vanilla/theme.yml
+++ b/app/javascript/flavours/vanilla/theme.yml
@@ -28,7 +28,7 @@ locales: ../../mastodon/locales
 
 #  (OPTIONAL) A file to use as the preview screenshot for the flavour,
 #  or an array thereof. These are the full path from `app/javascript/`.
-screenshot: images/screenshot.jpg
+screenshot: images/screenshot.png
 
 #  (OPTIONAL) The directory which contains the pack files.
 #  Defaults to this directory (`app/javascript/flavour/[flavour]`),
diff --git a/app/javascript/images/screenshot.jpg b/app/javascript/images/screenshot.jpg
deleted file mode 100644
index 45b270fbb0a6621e29c75da1702226c69dc0ac3e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 239221
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%0ACbxc(3LY}q!AWdk+*%~v^m3Xg@xWM
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%0Do1W~RjX
zv5Xeg$Hl<Kuv*pHgXD2P*x>bOKT$>J4|ioo0Z0XZtqItzjXLXy!BbPzf>pj1r4uE*
z*kvl*jcuE?7{uFX>^Unhs-Qtq9SWz|1!B#SLe<xY0q=U(rg8>(I-CxY@Z4+vbJY_&
zcrC={3}camG>^5&1{GlDu0=g3oNH&s9rMY3C}sgh#B-rn4~wVx@wUs>n%X4tXW#0g
zp%P-{XDY$Qc^E9!U-CNYBZlZNte{{Y0G>Ys!pONa7vC+RK*GA9Q^441_49pv)xhSa
zq_d(@dxEJx;N^RVw&;Q;@*pR(5G_<^;#*WKzm>hQ*Mr}#1t^I1bqf}6a0^+PUn!nQ
zHZLk%Dru8eScASH`=ABZQ}ygIq7dEuINR+>v}#FR;)rQcxWBbpR8*y|>ad?&58LIY
zW6~w!KXSvefIDU4Y5@sJ5$bvmA4`(9^ezzaj5%60H(S4#$Fa_zQ7aW2&GH@OQ!!hL
zjZsT+eH<EXCN0XZTnwjm1vXqq;uSGgOcHY`SC>RTxiJ;_ix+>7Den?!u*M!<2+os{
zo2ofD<xRDS86YMW)5MAnl1VL*;<wmqe=ayaW;|5lU1~!8aauoz_|=((LWbbmlA^HK
zA}jvPq7EX*RbB9t*ysJM97O#4n+i?(!we?Ir?QTtX&05J-7=4{=5(HnzTR?b{R)cW
zYXwP4k*GTJf)RvVfK04RkL;SmGAWb5=bho;yk8Q0{f&8<%kkE})*lyJGr!gtxAJ(W
zk8!SF9-@yXQbfeFlMp8swkiP|J(6&P@T~1_tIMAIoYZ3RG?l4efI)sZ(N{ifPV0od
zG&IcK0r5IxoA{?@h-A(MF8SW>tdQ{2>)qMCFEKgz+l{aoMT2yUZ$nMfFk?k^w#+1~
z;vBbZuFN7<_sj&XqmU4!dtQMhH?*^u*4AO7x>(Hj%xKWd{L`~>NdsR!fqZ*|9!)V2
zRY4+94jb5jqG~1Z9^W`S_r8I0*B`TF?P)Io8AVvBwIjAa_UXA}MKrY_jqF8BU8H0*
z5>Om#yrUHZttixy=4bzsS-_MJ2bO)w^U^l%Oz(WjQxm*$M<{!mOQOSa-l0XAh}QA)
zu4p^bhfM3a^C8xgVU`pufMr$_=9u}=BRpR~CB<Y3W*7BMtwH1yCId;kTz=DBS6I7b
zq4e37{=3Krme+X>-%_p$2Y7Qv?a8Yh_WW?%&A;(kGq0_=sX`9MY`1hLY^t^S5gmwx
zyx|@g2>_i%p>(-F;X}bd%-QJg5(zcGue_(1ox<Il>FInV<ZleESqlkGdjt%<w;NuW
zkFf8TV-QOCt(g&x;5%$A4KzaUa&{k7j9oKIW>jyiD+JTI&)yC=EbihH`%<B&bNcWm
ze{hQG&S+^xN4cq$@?4L;csoZYDV1iw`EdAyjCV+kbH%T^Vl~yqBC8|rw8Zi|S{PkU
zGY#Etg3-9&kUlY##3;tKV<GU1h<R&aIgVdmrr)A~)D<s~mTBuO^`*csGJ9xBiq9ES
zl+iG}J&VTLjeAHT$*_I6<Sur?w59JX;G~h;Shv`k?Q_xld=tL~dBNO?p0}BL$dsWc
zis(I&c*cFs4aL7;Cu$i3_=vBwW#l)DEd#7-ojMmdB2`XKzdU-F7Hm!mamHLZ_t9|K
zNSu2p71>E#&mM)rd5K7mA7g?_{Mq&@utFVqNk6&sdih`slK!mtgdJKAz%JJ!1N6D)
zO7EJTKyi-7UJN12FPf{DJspYU2h)TF@8*3UU?M3B2?MJXGK&pXGrC%|`=^Av;{3KK
z;x&i%hF*_*wCV#bw?ZmqrQoKHwC!OzB0QQnay>Z*35WTH64p#zl$thG6mIUu($P?9
zT)J5xpEo=)Wes%ydxtKhlk7Nw?^Tg_b~q4T^|dhCRT{leuEWrO2OQ0)MPkX!NLeeg
z;-*|P8|gq|BR0*GUBN7N@&-v6Imy6qmEsI!Ie`mwr!)-H({WoZ$I-K`DxY-rJ44p?
zlxFr%PV;T8r0m(hO7Vks-hQ<`=_z=`&YNhzd5E?3vP+M(?~X|36*ZRgWT#%w+eOg>
z;=I?(6mPYLW!`-Yw_UN!=Ahp<2(iY04IWEz55f?LrlOu$9Br+k^?km(r+720&U3T<
zl+N6o0)GiIYxT8fb8ajWX~~cjUpMzTR0kZDghGnN6yND$_7e)eoTqGYU3%4?)!~zY
zI@$?tE~d?Dd|!%N9JZckGc2SfK4po;%*v|@229!;{gnRE;>cZ2yi;LU0Y`vz`ASTU
z-73YBH32=?A=qN1iJD^gq;iNHFzr4-MofgyXUURO{c$%&w$*><+rjb_YgIl?l{mr?
zf4D)j+39<F1@@p~zPw=CM0OQK9RkNM!Vs4eBkhx7X1br*<l4FX8Q<`usROL^k!IZV
zx$u^dkf=j?hkIYu{nKl-wUMHU!lu>=d3<pVyKO}j6c!Ww`7!aK_jKlo%i;G+wH5Yu
z!sey9^mxJ9pDdC9Q3V}Bj8D^%WR18Jtb30nqT1Z$RK?hs=*Q%R(KuT}dwUfTN3GEi
zvMA#++?p**VPi6Yd>xw7D+FOUt|#HhyoWYk?PB9^1yK4hb)orb3qXQ<kUNl~zM7`q
zeg8vbwn&t7A@S@f-U1)%Ff0g&E)5(yxAI@6Uub`4+N5_hyZ%nvmN!4J*m0yi5S?U2
zlh4L=Us~^la0$9btF#2|A<{!rN1>gGmTQpSBDK^Y_;0pX+;15_xxa{gXRF&~Nc#`U
z>~{4Rs>V0W?Zp~WJ&b<<g4Z4+o5pSzsr~MNn7{CsZ{(}JUy}$`_iR8@Yxao#=CuE2
z8~u+xH44MO)YN%~cRdcweNOx>;Wc^N+Y~T(><Rsv&c+D|`WLO}T?x~oxVCDDC8aAg
zRghU~(6FY}w0nK!DU7su`IX^((I0>&duMzZ6fL@8BEm1WbdpqO%Y9d65*dAsOrwg>
zx>6Xgnp8K>HxHPj?zQlDXY_QKnX2Ln>isN3zmb2Xy11bHpFQfy&<bzb^$lv6KqH65
zl0_F|cLeAMEG^TJm5!tYJ0F^eKr|?lVmv?O6O(i_;}=G3v4K8LitMxjl9+wX#*(%@
zHQ%0(`KR3_T2(pT?xhn)tyfu1uzf`)BEKu@7C{z$>(5r&5}3dzi`cbvQ&HHnWD&6}
zL4aSvm{V!sC1=XOlA##!4LZ-)LZGU`x)3nnOQOK>DGGgV;OYCtQY!6qD#Gk^J7{V}
z^1qA@r}RHRAlMX6m5sD_v0s(xIX0gdJCFD_k`jLYES@^@ee#?V_17Z$Kjh+NNu>P@
zP50LFhTf+quRo~&)i7wRhUtu5Tm%j}eogy%^H<|G24X^G+Ev?H{g(KXRNh~WItS+x
zf4nzm&z%Q3?L<(^oCmVb;szPu@&3#vfvu_dOn(4aKG&#qG>S@1tiGCU($Ng5clTrS
zE^4@T=8I~cZdh8YsPHU0;CPeX#{H>?Iq<I&|FZ|jFH}@4BFtO#Owm($5(ec>PMZP}
z(dFj7O3(--9~=N6AgXB~`M$pP5WT#^eSPv*<8)vlAFnlS?wP#f>EqmO)?l+{sP7IH
zMvZ)7LR>)|k<O8#IN(dLe<Wt)ZY6b=g4P)1GfEv&R`U_;2zc#g^o#9n;IqFP7IQ@h
zu{D2<(LV-D`+{bN<MofAFzEK23fmKf@=o$Hfii>U7sA*W#K9B>5%l5s1t|1Lu6I>s
zN5~W#k9DqCoA4EB{1nwhWl>AM*<R{oYa*GZpGppmyv+AN*P{Y_Op48g{x`f^VPdIQ
zMrVh5zyI5iR9D7?;ORG;+myZDAU~N6sn6W_f*sQ|Fl=*v$YsT@1t61FdKM&yO~-Fu
z0V~o<^^zOXN{{`!In}0Pn>GAxqVAxa*H45)0UJ)+pIF#Eg>Saux-#M1lq_fti$|by
zDv6)%XwgEw<(i9gSm^%S@2Oj4L~{GN!oZ|`0QVz|@BJb_%iGxXT^ujDUx(ICm;KeK
zGJ<aZ&96waUe#AG+PL89U?;PGqBtaABqU3dMu_wu7G$Ku)?#3ge`DpGlT0s=yU^5q
zTPcppMf8PMM4Z^2lg1$^Ye4jac?W!rrO_XsD`2UO%I?j>Uz7IF*;_h^&)*`}WBILW
zP1KDqaL@BW>f%YnQ!nYhEYT+|@zU^9bV6J&!V}f4(Co+mHp>Q$<*k4FpUA-YyNjHZ
zS#QmgZf!S~mV`d73}HM~7A+$`u5cw{!Y#m<%j`i7iQIPue=T_NHzVmN>c8GvZ5tNf
zwoO0Os@3iYe}7jdcc^r*Aseg?VAdv;mfk{&2Y-94y~=y;mZtAywSD?W^M5s#o^rZc
zjDU1s(e6tlg7#Wfw<Q90SswkPOkTVq|MhwjJFWe`?bGtCmP*7~-{+X0g$5&y%Afy5
zV6S}pFE+E@THo!aUNJ$SO<ezc>ikcmq<`}@be92&OU0{%^V60}mPo#h1f+G^qKgSx
z*PduXsJ@Q<(Fz*F*JrP1$=hE2mu0918L;*GKO3+u<<$JAAS74-FL^o|-Z0A*0yE;#
z)e?xt0Py3>7W`O#DY5&FzZu8yP(TSGuofM&(xgXxfmg(gz(h^nNBv@pdQ5aAp|^0R
zQ|v{7Fq9EoIB^!;Wk)sGC!HU!ndjD4Vsz)YxpYwRk&`Pz0-WL{A`&8sOFd#6bTY@p
zt%AQ3QD8FRod;1$V{|Va^fEb4ustKSNb6&J0U9DOVrR^F@kR)V1wxaPb7z61mFjVm
zmn(4bF}=21rEnt#K|YE@I*_he?1I){V6-@J&5V$~I~a)lW3G<J^SrPr0@?_{TP)^X
zR7`#vYgp)-%!mUw6OiL)C60J)iE1<noI`8e`oj5zxZUx&_bCoDd_ThBgs6uSC*&ye
zRS4VWHY3x?uw)q%V-!&MH4ikSr&LoK<&%7R8grOVvO2cKk$teGl^`Xp*BzSd*Jazr
zVd50ErlSWc*k-nBq9cwYTi%b`>gb>I@B^K`o%t{&i}H_|avNQxe6Gk6h9ea5Auc|M
zK2K@1T6R@p<#ni}yyuly<HdpmvyO3=_m?EOQZOklfK>{$Yhe>}ct-pr8owo7uW;ku
zzj9c#vShv0_j9rjN+#t#?>7CVKOp|OtJEDgL_|!NG<phLZ27TvJT^TpkIjRVnh$#v
zk#@e#NON_3c6=B3#in)WxHaF@V+w|O%$OaovthN)`~<FH20&dQ=#$EgbKbp8(6Tg;
ziiRGzUR5P?v0ro|>xk7l(a?HZ-L<`@q-9z5vSamf)MvY!qUXzyA>A5n8Rrs?+2mpn
zb$xQUcJgac=c5}@ypB`Zy|X|c$cC_XctLpc%Q+nHDL+Xqf*<-&_sNbPx3jzZsn&|2
zv?_<4xR13-CQ>#J+ISY(-#jIpWXT!O&U@b4#?Nfts(-JUj<d6eOlgqT7(i3Y|5JVZ
z&pWOpjRwJHuMx@VpSAYRfaX!`C{C8k*8aDd%a70bB9j^eMhZizr4BmCjhSE}o6h@8
zN5K@)8r;QRU2dQ1v3f3N+6!bA7zXGE7D1$b`7i#-wdGgQeOpV9d4ucdSuPW=L<NfM
zO1OZrF9}gd1yLL2gqBfX>FZr;L-|h9-Q4E%--N_%&vUt6^v*^rn7sz776x&C8pAI>
zq5d`e$o{T>^xXhnd>FM?8kLM%n+WGC(ZCJPL8;rk^-iaYN{!QZIFHP)BPw-r3*(dx
zdD49hw<fD<lb561e!he~_^FwD!M%qvUiK7Y6{_xBQ#NXQFe2trzle`$(gk54y+Re4
z#gBnTUr)u_yq4y*)zTAKe{#^|vrI(?(`5C~qJ?TI(#>NzUjb>i(J+daoew-er(m?Y
za4r*T#75iG?KO#&yC)VvFU6ve6;0*)igPSRbD0DDwBf{=#fgMB`YUhA&fop?`RMH&
z+%cAGQ8MpBTD_Hakni51KQEtLw|m#T`b(ve>jFnv%-X7|m7AyjwNNuGkH;GE)juPU
ze!5%O-K{b-t{itm8RW~k5PyUNB-IQPy&|EK$>_{S6G#-5^%`i-J`U`l@v%GSAb_>G
zU7g1`s>z=eh^l3Wa0b)1W^or&jd48*#kXXq9Jz;x42h{XI+9(XrPcbM4o(VCM@3s%
zmU85RUkZTCigXshsc5Lk^v7=Z?5;|o^kh-ot+EXb#+=lGEwY8VQ(+~XGwJfoUFqRs
z;QZ`s?F-WD@v3PCk7rf)BNusgGp173MG|R1NjUj~y$W3}H0c|^gtuJ@k;xE<HtLha
zDK~Ou3fSl&puHV2uS_3GQFGv}J9Z32t1Gsw?&7~*P)${9j`2Bp&V^Nui5^V_7`;y|
zK&SP>hfh<EI$pL<^kuJSF6A^WxUHjFe)Mo_*CJs?L3t8|TaaNR{j7CZ`i}d_P}OO1
zoBfj`qYPKjy<vhynt#dIq2ZYm(2pxuqfPFsCSEuZF94N}%eql}hrZz<iCP3aUe!IA
zw2x#gy-i1|t2iHSuoucA#vu#swHJPpvrdYm)Dq+QKJ@k&%GIkTWN%MLzW`TUN49%|
z32fRfH`{o*W$e2~?WZMUlI#L6tXT5s(33>b1Z5MY2WhdwrQcw5U-=B4VRXJPH}2NT
zuD@82F;u9>X17Iv#3dY}RB8J%{iD<piLR>5wG=o-27hZ+A=;Fi4u0lcR}3=UJZNDR
z-lc9x7;Rey0M{tajH+Ee-k_>fXT`mUp2399I-Seq_fE>4_&es-0GTWFPba*S$e^DS
zHN#b45|+TN-3<SZif?$iLhlgE#3P+?5XoH?HC~IFNdY3YwjPc5tS^a(;o_X`U_kAS
z*E`+R#wTSkFVS7-CWy4VY!dv*at$@FGw%T)w7m3VY1%$!XURszHhFL9wPmGmY=bb@
z^v;$`REPRti}H<5OoXkY0x>6EVhvCTH#m`z0xJ_qE0qSKVm(MYbW^z)#<+xSBGXoL
zAwe;eX(~rp7_b4=;vUr=b5oY6Xms4v;^f55Z^3F?<**LNUp5u%-p%=j)Nja}YVCy#
zl4hm6pUs!I4{z0<a#^IfW=iwZ$l6&+92W5KJ`3l1dc$gRJv31=CNnAoJKk4bRdOCc
z$3}gRJR4pQn7(kS0ipM7d^ltA?ACfu?ehHR<LkOr@|t)fv^o>}yiIf2n&Wn<#>16B
zamFO{u-2-Wlu1x)o8Yb)Zer+u<bH6h4)jZ7V_{8n`)(<>!V`>TuVMyN8hV4qml)bM
znj@b~S(`7IMp7)fv`GQd`XiR&6~OSeGb`QBxKfHLF>Sl_lPu9I=SxghSQ4%lXS7bw
z0|Z5z5)Hu5$V{I-TkXC9V<c*#)#!#k?RXD%q4rTEKjAS02!?4qgO~%5l@wOes3L;Z
zIEKt*oNl(JrsU{wc-d=ztnYG9e>{+Xt|Jd5@GM4=+hXMu;VOSYh3i3n1OgLh?#cq2
zgJn?-;%~f{q}oTh)>T+0F-*~^gky85o-vA377%(;vQOEHu}s{q{}!*Y@T;UQW3uHa
zbGhZ+e)U<=js>l8?9fIPUl!?3hk;pcCV^)qx{T*w>%?I#y!cQEveFU+4V1Zxb3@rJ
zqEw}o2tH!72?R-_qF@l-#HrtZ;BE8ATljf9y>N<k*Gw|SE}S5zs8Cfe+upRhU$XeL
ze#1lw4E?{@JL{OZ{&3CD;H9{GVbH<dp~&D;26uNE+@S@EySonV?o!;PxKq5vi%aFV
z<nHdhyPLgxlT9|cf9&~hl9MyZ`5t@U_jx`Kn>2ZDVXAkk917k6f_ZQR!<h*Q!}Z1&
zE0?qKt{8H>ylysEW&UIlk-!|N0C*QcKFu<jCYg{ES$vT|3m+z!*^h#y^#RHU1V4D|
z>r4+=(QYQ8J%c8yu*m6NfhBg8-LB~B-V%kcU`E8!k4m3REZf9n@b1!C1spFv+P$Io
z=dk_N&f@i2zaLqM|B?MGbhKjPT(LF9`Z9Ovxv!mo?U(gQVogUoM_gu5I5vgvoxs8!
zTU#WEPJ=6^;&U3%o#K$1U~DjROC%J@9$cwIxa#uLzk;fYH<@ga$S-lA3Dc}LSvD0=
z;+h)!Cbh6K<p+6O%47E^Rp$5Vb{$XSzY5s`JLQHNkOcl?<n(N#aek^i4P-14)IuMN
z!M+UZ*9Z153eLyb8pB29X*ztq^n8~+E<76>Pw7Z+Z*odu7=_PL*L-u++1yuV?kVm+
zd-|gbM$iSH?wgC&y+=FV#rDTw<r!+;7U*V07ofxG#piRVFEz@Xr?QVnZErO$L1<l)
z#D<~h#_i9p#LVulZ?%pkyT^Jq_6$czI-8wI`sKl3bv&ohy>Tr>=QBE|BDlN0iNpG7
zds=52Bm;S{r7)MsIyrYxKmnlKQ&V7@Ip`kMc7P15rR;vaoNNtdYgs<1U!rwnY<7DX
zdQAQhaP8oazZ*9N-%z4b3!#VUb46>P{Yet(RA^t-5titpw+6e~hI*!%wPwZ`K+8!K
z#bsIJMR%7;-3Y1O%u{^}G5aBaX8?6VF<;e+=Y<&G-tu+rHgk*egM)gVd>Xyc=6J<X
zF=SdLRAT>~BHs5dnx)Lki}B;gmiq*q8j>(mRwK<$8eP_QK5H(XcybUtPvjV6gAmn)
z3dOiXUzyy|2{`vPXSl3nj8nYU39~=BiDtkee1UH&zna%}1;~fjPHEN7<lZ)&aWrgC
z;dOI-#3Rw0zN^#sI%r&HI9Z-u&JpP|pHSR4k3=vxGp}~#tk}}TWx5^D3YG3cKmcm^
zucvL>*z(ueDfu%mn_3H}P)u7Km~D1QcERKuBOJn@-%XJQ8l@wdBC!_Ua77<=Giuzk
zs1UgvsCuHieS^+R)TM@|>s6*R`2fRciCs|S#@6d|z2NppQtIQ7Z#<Y9`N|WsxINh=
zZ}472Evkb^g!(}ime{$6f!VSx76diQl@k+Rr0e-iR4zy;xt7L9YS1Jy7grjUnzaR#
z)GQ}H*ZIkCq1|g~>dTkWM7SCzD!N>GVx|3BDYIVcZn|?8v6Aj{8Iz<vq>kNLx6dBd
z9kFC)PD+-?0I6-gHt89lTuLo)8pBd>o!`0;@~N@2F04E$FQe(XbGiQrB1Fn`(`hZ3
zVXbI<$+eA@_e%BgEY^KheRRhy$7FRiIK}P|LKt&#=6_@YFtQO)U!X_;ZuMPM;JH?w
zk8OtDpTA*Rqz)gOeo@lepY-NAbuFy3#7K+oIu|L2rZ%x%+!5=>AciUChFlPE2X^2C
zsiUoN@re-t)Br*~*95!vDDAmd^a@*|g%}Dv&Z@S9b~rSVp)rz~wO?MnO%1jCt^tn%
zfPuhg*t?=)oZPX#!!2CtCYX`1ef%s_PC+{5Gzfy}!vlxMGY4N??61n!`tGZkRW+;8
zy)Uq5g$bZCKJg+Rx{$6S74l9|=o-e8bv1KiDw$GEjBIW(OPl?x>`$mM{Ot7jAApIB
z4EwwKw;wr<!xXmz4ZofJs3;w}-*X=M{k5h<pYH14QL}Y3{c5q{z$yKhq@aVIhJ?o*
z&14EjlR8wU-33r3)s-xA(ArRKWR<O2mok=A4KUh`B)v2egH*}-Qj~w7AEDUY#J(j_
zB<auW;Jl!~lHdT#3OC_7OQ+kZJL%8Y>U{O@fB96?<<I6g!?4bX5|?RhsddC;G%N`G
zTnQ1QIRRqh;9zE8_XwUb5_ARMv48DW5z3kqsC$~xPO~2`g+;=kl3ELuWok@Vaty%A
z5pu%>5Vm3`UqTQ&%N@DO$5_9JvKcYOv};lhG3RY)3R_N{v%bs+sv{SOT))5t5Ep<2
z2k>swGEMO!Gs~28DOGe`R9p+om9#b8>JS{{Lktbv6U&TL;AU48udQW*GS19F0003*
z4b&r>fp0_&{rP>S+^WcxB2;Dx&TUV~v7^osK#>rdA=ILIXIW^5mmmqCN*%5@m9bOQ
z{NMGw|NZ9lf8uU93(K6l_?ht2K%c(vrOmdD35mdza&U~|<n7j6*K8lBb9%mi)}!9)
zDCW%~wfRC*&m+%ebA2rNQF;Dx;ELz<=YW=Rl9rl!vFTqmX9p<HcHcV-Jo5rfzp-(n
zu>Jpo|Gzset#q{<|9uHsyQ&xePZFZ_lH_V~b1=#11G?er(Nm~Kk`0qsmMIfj$w7xH
z5F=>U?;fjlAprGcyZ+P3ak)STD5s`Ue^dZ=B73NIF<H^IL$`$hpl!(eG=Y93rWIv_
zTzRW~uBZrFPKDQQmU$u#B7=vEmi!VVsuk6vJ9Q_yD?i88Ifkoqidw4u_4&f~ar~$&
zGHZf@!E&4$MXe086!+)&U-aG@CxnD~0oOOY?b<zcdS38@>D_G_`yAK%YNn!bP@?C9
zUnHi-uy(TD(Sa?7a%lm2frGvJIInfK>`|uDQujD;iCd5=|K2xEM4k68ZvI5B`I_~}
z+6A*3wne;ED5Zz<fx$QvZr&Vi?~NXbT5fMj``148W7{R@(+#TMrw8V%UtK?#R2aW_
zWN46|Qe~IpzeCGSlp|ddjsQh7pddIJc<nRM#9~RH3iTg%q46=_;mqaF{ggheSF*`%
zi}p#EOK5i@Xd|n_@4gdV%x{Oi)rQK8z~3A?EPbq*`K1A`6o1A7&^$>soK=gK!ts*G
z{5|?;K2ZNit`PKW5uoIqU6Y4CMl-*AcN5+@ru50O0(&p~A3zD4eTLs?Vs@p9f~yWM
zZ*>avh`l@H+IS{?xy>2$%@EnXM1-dxKia%q;tGTeWJkP+sBeaTD$<nN^8(Eu)H%`(
zVjMh2zeZWfOy_G}-cta4%v;ll{pG}ab=8k0PPCPGvh0RDVDc4qZ%XNE+e!)34JQyi
zmyeTpOaa}|YWP?H2qZ9Z6!pr(wzR-$MAY*5klU?BH_e^3rCD4fj1$39F^D`D+JDFS
z6zPK^m6QD$kNHKb$n}IOpV#-j)1bVH?<5&T6SCg?0s)p$30KO1BFZfG*LCdPMOxfO
z>co#&R=IM7dx=n@^Yscd1lA)9C+c?yh%EpNGmLNuKorTosg!AQt{OujX+tYUfS8nF
zt?^7S!FQHr_^a3K8zRu>@RQ&%+v0o8xHC5wL_Zg*f+|PkxXIa}pyu6g?YHh4U9yt0
z;~jqR37nxu&rmE4%O|h~RVLQwRsL<R$XYv%ZhU1>oyWX0!}94{(STyhEil7!mwcu$
z%0lHg4{F*S1gEiL5Z_bWVzt=`wfV9;wa!9RO>^mFkq{GIa&+)R2JC=Du|V}F0J}LC
z*<1aro+}E+PxA$DaPe0WNhR8lGN0u6LhKg9-lQT)Wg6wLXzDC!+H*8hQQ@bRUO`Gx
zXQHqXQ0kaPVu07Qn#_XXaCDYJuSTZEKvx0W6!~P|Sw+BYwXT^YGLAVQP_Tt<8GZ7^
zSYhzgP)U|Rmo?i8Ar*hH_lCs%+kIbwCD#hMD<l@_*AFg(thMcm1Rj#@mO;{g0DRhN
zsh$jvoF|G}3jgwMGSOz2Oj$A}tx|H+1V6J7KqC6T+XW$UBc7a6GGV6$V$JM3X#^C@
zpht&uY3NSGFJ^X(1D?>rrNu|3*DFg;+*CW82J$Yb+3D!07%s)KBE(_NE!%+iyU~Fo
z8<~NX0J&kFBu6Ts68A<-ZaaP=%VyZ*I~6y006eETD6^-TxOa(@Hu>%pI;SGwKv<`P
zYqC&2ss9jHb1cj(yM0?!YDFQy^SKMkL!CuTAc4PT%E42%w}XOJNOHIOWPq|`<+`aB
z(|&>M>C$2StZMf;KZ^n<cvoyEM7*7fcU!4GV#}ObvvMg_EQ&<wqu5c8dAg((LE^{c
z(=4eHIYoTCH%S~d9MJv*iP6^^dPz_>J?Z?Yh=v3nGR2%_3>jx?_IxGQ0n*F}@znr+
z!3_uq2mngkla_kd$Y}K%C9knII<_0mwAZZYo1YGSkWrt*D=d1Nc<EqyV@Z4*j@tL1
zDBbr=Dq_qhWL4te4=c2#6b2C=Ym)L=wS?enX9R#!PJA;LV5}uXI9^!u(kk5o*KnbH
z&u+s4eEN3!{T`LsMZVt!y1USJPK)36R-ev>1?)=oN=AY?IVK9cHT1tI5ldlxb<X#9
zn(BKmKil{J+G^u*;CT;SU4FU#biq7c_3huj0*z7wH+V84n>s`s;PryJ&A9tiXZfF-
z2TjW}(%TdZzc|u^W22Ie7~nab{fXXa4E^z(f;fLe1UtHam$-DDz~{G!^ka`&jt)}$
zB0n4_OXsaWmLbj&PHQE<NaXHXPJPKVB>ye_iC@`7JjO3J*J8w=16HX8+e1c*kUye$
z1v+{HfdCwwQ$(Z6GI0|san?ZLZq}H#2e!4F{TN!N%@8f=!c#Q#sAObvFEi!Bavuyv
zoGl9i3=6as0~u1y<W$Ftf%I}dLTjUfDyM|6Usqq>0_+c+TlS2mAoau#i@LOABNv<{
z)n>xfl3Z!q-RVVL-(4l7OK}hBRg!xgCg|yoAO<<gFdUaArjT&uyi5TSbO!c4z<3Z0
z<H=IgA;%|t-{1JDuJ`rkplRj$GtU`Aw?Tb!qCrg;C5i@F1k1nLkOw4`K_DSq+!`Z{
zeN-JE$DZ^hOv3JfDfWHvwEdh2qBnVVol10htH-R`mT^vy0BWIBJ(+s^T*&j9&?g?;
zrEHbD-;^$Aa2*{?Kit3_vNW#h#RkW+cZMtWoY$^3IX#G(z%Pz&p6TKT#2{)z3vm(w
z^(kFLk#C~5XZM-kBg8P<KpuGO+EO#Hn=zE@Sz|#3YGU=>d3pk`ZG4hZq+l)@z`!<U
zA<dzqXiq3ox87O?MTT;2S+|x~a2t~}Fxn9f4GRgeFepr~G1tZQ!`orQ1R~Ctj+5Fy
zTs`#V<YTQgREZ~PJZ06UO3f8n(Nb1C40O0mudPTFxTe93c+(%8*v|Z9msYo*e~3pv
zVLdXW708%;Bc>$}XHiRCWMLg2p@>`W(5qgNILZbryCOs@ks=T%qi`WX`Z#Na+dN<_
z;Y7a;wp_MEWVZ#5>*aYnDD6k$tw3KBOkpNw363)%KU($FQ?lL9Y2rGLfw-r};Ix~#
z>ol$^uezqr<r{ht3-}R>^0ZUO%Jc#H9#2_2Te3>@8q%RqkTMu8L2_0CiIZ0&L6xP$
zKO(K2w^=iKh236_t^{Po_Vmmj?t_@<0--9bvSTS|S1uKhIQz<FG~D&{?1y1{G2{3l
zbe5vSWyQ&4uU(qA?$W%ilP9Lliv5gZmM+5jl(K6UN1l>SOHp%$yBnRFo(b)ZQa4F~
z{onAP;9~EV_P1oAWg)|B7aq+PJYdH@zB_LCGzB9QM|8i$F#aI~y)y*?RqY2oHm@gk
ztSa5T^?V1bk=!yd4{p24l0mXBacoX>e92^#8uRb3$^_Jepwyr&WzBwc5+?J~$Y&Lw
zLur+$QpjoqB2n&}BB)0REusP=m1%z)Yh)n@dcLqJ5eBM6*>RcPpFq)9+2tMA*8BDY
z9oZ*FgU^8=?bR=LVl`ny;8V;ZE7iMe)#ZyfT?kk5yKG8JIS|M(SLjfzI$pD|=fH7-
z%evEAF8*3}MW9-XtlK5seMxR?%R$=mQ49)9hMvF{92BfH!IX*F0zs`HPfHl%AgFTS
zYaS-Oe?_UMJvjB{(zkOQ%f8=rL<^}Pq|%{HEyFWXzZAkS+fJegLUZDEpX3{b1)toC
zu`l#m^PuUDq-)cls&QRu#R?Zv7iHHSb;a=ETYfBY^Td6JJ0rkja`}6d&g(MS_8aEQ
zo1yqjd;Bwe>DpV9jHT|F_4po%zVt-<k?w04j$=ITnOlYoH5ZoaAro^V20cdR+h2=k
z8o||X^v-x>YVt&3FBW=+#Wq_T2W8lFh3plxKaixsgk%-E_jp3FNz-&YD6i?AvK`K{
zzl(lb*s`_k&n@OzsWsLyV6v?<nvp1_5s%{H3oEr3Hoz-GA%h;nW%yVSh~J7=fv<|-
z!6LT;Bg~;Wf<C<iTkuCa5=B4*5oD)x!KkxqJ5TZ-04ZC3f_Z$L^6kstAqx3&(sZ6}
z-hKG5#uDD5+W3~h;YLim#?*_M12<|@75aya%zO+K>RnEa*9fBMnrf$yCK>4!#%_KQ
z6*}aVQ4<-_BB{v%W%q`xt`o6l{{R|<0j96eLWEYnMGANd&#NC^;y)Ui|0nhvb+Lr!
zqt|ZhH)Pr)U%QUCOKI&bTJNw<B#tOYlk!lE3SlSV6RZIM{QxXEK`hUDX+b>sh`qWw
z?#Rm*_b;yu`PH*kR9o#zIh!8J=07CDH?;RW0dM*u9jN<iPIn$LHPreQ)}{fOg<|hF
zuFzlDUa~$S;wn#8R&TVt>c1?=K5~@*y{wm`-ozz07V$|fT7&jy_LE*BLq&bRwTI^$
zK-FA7bPH?5`@UCTy2bv1gYQEi{CzR6c+bedcwNqH&B#~wLEl~6yYWGF^`dXByiud(
zAYQwBo}J^+CGIthkMG7tmz&Dbwd!T^+NnE~Y-VH^@haBkQ@#H0bz=zj>jeB>aD=a1
zm)4NksWR>EP*2h94rMnU2YV>GiM*Br@0ov<hcAgIRDKV{S_V0Z_a8`*2=aIgViD9-
zFe!s)rk0(mX9ghj5q@OfY+q}T!+vsl+4+7a_Wns@?Y>(~mR!rw>$<G=(=R6n-$2E)
z$b_YzE=Hw(GT=ac;p*4aG5a9WN|Wg^rpU-lL<TSk4n+6`<K4%e%vCn#K)8M_R~a52
zvWHJ=%25~C>sB2KV$Nzz>W{)Q43|Sp9AE9NZIziW$7(mq@(_g%SgfZFdvmT2NJt=y
zzDU=(Ug<>jsaY_<*kLIk${mRDx8CEG*85Fj+r^8ws`(1FLLvo;7kM!o?<0Oml?}Bi
z;m1rG?l0KYug?DX_LHL@d0>pPpgN_k^zb^jEK9e_5cezB!}_72;oI<^v;_Upi4(cU
zOavI}RUifc0(Q^}&ldMJt^KJ5C1K}NKp*XEM(L!_rox}HYf=F#{&P}>a%Dm_RI>(p
zrtfyW!FA&|B=&(>W}CUPn>>b!`dvn1o_3P(^UdfVUHH+=Zp@@oWgbghL7R~l1cP)y
zF6sIp>uwD>!HvE5GFP=Y^OT<ZvqQan%*2pOCb^B8xWnovpYK;hj$Shv>5wBXHwYF~
zmjJxD0qlSmqTMT&6f<UMGr_Y(9kTXBqW#^Wx<CF54apXAc3a^R7PEP$I~<l6m61*?
zI9dj4z5VK!3a3P=RV58b-g0vlsKdGg#>c9>X4C()NeieeGH7zG-K5z$3JJkfbt8p>
zC-db2?l}F3UmX^v1ft?7Kh><DWSu<{`mvxJ*bj8ZICd=N`DOY<t-8R;X%8<2*s-eQ
zS=uv^n0H+W`b7%WQx_xaczv83J7V|pa=#Jz=}%OP@pYTRj@a@HNqsujk<pi?7v1hR
z(}=kc&3AJm7;y04wB_`X)>O@fpmQDjj5+^g899t;5-Hg8)}%EfpCD~n+C3T0o{%Nv
z3uZ)BLr;hX3373xAfn9o$2s~W?Rsn8*=W?oIIB9Iz5Hys=qz((=-IJzYyqp@Pckv(
zSmlU($Xs?Obt8yk5?MmT837`{HEOS<kpJ@aFXA0yL>Yza<}ERzm{;-(6WP=<f~cab
z=+$(&(B7gZMz?h8W_t}qv(NpgLvhPgtT+*G#H7M-JArW8$bA@1=_B2JH8HBgs9`KU
zHW!`te7~MYB6B#E5)U9MgUJ*r0!UFBop;!EPh#%NI8=|6ol>1^qc2KgKOJzKqiVP?
z(c~dO*wknwM{trQRbd@Nil6y9oI@}_L=~#JFunQc&=+<MP+?i>749>y)$xn<H-5Ed
z`Ib9RZs-R6oS8g<OF%DVg{=tXLm1V@uudTBK=MUdn5`J|&ArqqRo%6K%{I=_GIGhb
zy@h`xd>)p~ETfwI-9rnRu0a|nMDq2YjPe1b=ML487vROW7V2;7`qU^zmQh}khL=0}
z%91#{67@6;<|}64hqJ^$3OTwMH&bsXWl2^W6pZOA1qDB3LW_{r595o&+qI<|S@kd0
zqvrdKEyufbb`;9GJe<uu^1HdK6|x=n3@S(%79nL&spx>>$Oy&aV?po%^G;GsM8O`T
zhHiJR4;u|xPs5?Qx@15741pRr38<xN^2ts@&e@;j%((noVYn^TVKm;gx>(<7v^Rzl
z%vRahOl00992=wE<O*(e^i~+F(L$;d3dspUm%rR`k0cR!ru=hqM6mEY2bL|dTQnA+
zIoO3!qN|cCI@9hTyTS}KPI=hxB`wpq*$6lf%QX3O=r=3?QLlF7G{L&2*A*)o`jlK8
zw?pUiSuVUSn?=NGE}Qpio1=ngE7jdvr603ZW|%DZB=wjnF&xiy?DDu$MP*^?R_>m`
zK!Fc^J&@c*YMe6V$7*bvjCloO(2IT;xc^nP!mfxw&m~9cu>O})aCKgslD&_}<87p>
z;Q6nOoAxck@LoPFst3AMWq)G%+O>7z6nsZPXM$drNE~$_F4m8P)QvM-nm3~}bML^F
zUo%ot3{?po+%_M9R(fK>p@ihos?i`Vuc#D8NgQw_{V)B6)Kc}*EIoRXwDFVE5}lc9
zqr`~`*yeGwphhO@KL8v}1UHGDpOs(zuuw}s#og^6esWGWX8_-hQFeOGlC+t7Vni^N
z;BvKnr~D9KNHUh7pH{|TJgvTC<u=+5Yhjk5^N-R@;>y1rw@Otj=X4U1zyMh6LOKw>
zSLj^aHW^-*zWw-+U~5^|x((ha8Q+5B-~wD;jb47iq2g<9g21!*nJtV)!gHfems$6o
z354tKHtgRi(<+yah}ZeQQlNgTUnI9bNHuM#aq4>>(*AZC!Ne!Ds8r@Z3K;P7=d+62
z1hVI(U3gHdHVH^)6n)P^)_cTkPw(VsO?*eLlKdD;`h!xoFP&}}p{db*u4H#E%0_XV
z>A_4>aagtR4i;3QoVZIZ5~~qmNDf1Zj&++hw~{fjX8Y=O%|C0xu*{PSxFiCHRz@^Y
zOW<Sg0?B6C+KN*}?A@+QnIr2eHAMCacHbn_;(afQdnmmYfHxc!f53T~*7VwT1uKe<
z#)L%0D<TGQdW_p3o}-~@6FG1n2LH`L_YQTcBo@vInc$TfpkfLtQ^z^NM~k$SLuNwz
zMSHGIIpP3m2y=GbOquMnZZ0KfvcVWY#@8%Fxi54NN>vmB&IY&v4T_E1ZvBtH<y@e%
zF6WAP)hlP4qfp<xA{8)zN$lsp5EIB&wp0s2=MN95qAzatz7ui|La>miGN~wZsYIbL
zaOn0cpA4}K$w80V$Ea)Zk-71m;5J7e{aO(XIfj<}2_ow<caL0lCpriPkAZO~;Ef!$
z8ZP>u_C>ur%gv^AOPE3WC83P`Ba<MaTcibv074G8p?5R`BES#H1+lfgp4>HV#O{kH
zZ7a!I8Z-c=FqU4J)gNSvSYOYfHtzWt-q$8`;v~H}A8TpZY2U7|HbtE5y7875Y4Im;
zR%Nj~q8ung=4*3*_v;Vxp<GniYIc%LHl2bmIuEg3gria>oF+H7@@mHv1Iq>RwQ8g6
z&2ba*OZDSg*R!T<<&GZ4C~Eld1>}h8f#f0<c$zF@%zx$(O?h)80(G#jnsIki6(J(f
zVZtXlTRJ+W6n=VIv1A*wB9zS_pQ`00l3LLgoIkd1OeO4OR4(o)!E>Yt`tBtyh;z4y
zEHHM;K`ZBKXL(5162QZV`HhW+N{;^ga-Neh`I3K+IUGPE{TBy<PK`kG6{TTFweC8F
zq+Wo&gX|&6q@8yCS!j%>;7dlk7*99p$-zP?w0*m70~#A#hQndsszh{<N5%3$9}NJw
zCm!N4N#Z>byX?x9NdP{+*#Tpen|oH^+B4`5NQASssLPQvUlGJ+;UXSfw1-HT3Ph;h
z8z8fP(v&%rrZ;7vp;tkr>!0WXG9k#|@L%*JK$$YAO>tf~T;QDIbXG%M2U289s-25B
zMXZ2F@+fF+j&(OHmhSyC1K=H19t-Fs(5BX(?i5T*#Tl|ik%nbTu!eB!D^Yj_M)Gz-
zL_<RnWw!18V=vpx%*E|`6|0n$Gs<<XCbi{@g#U<PrVNMYNr((OQ-$-(5ylCMY^Qi9
zp{Fdq-KVe2>j`H{jn{w`8T80#;97jQH&>@nM*Sf+j}cLV$QSqCa;t5~tvk~+OPw2@
z!9}dVs?G#VQXb5TYuJ5f?}**2O`wsfgvG7+gLR+;|6X@Sx^!(>M#_mW)|@<B{SPm|
zFUS($x^o5vN33ko=fCVkcD`Y*NljK2iW1P`F3dI!fE^Qb3P!yIy8#mn`MAr`>bG%9
z)(QT_prBbk+^MuQyZF-o?fQ$TJ?X#ts_X1Of)+$jCmIBs_yk=q-{1ArdG8BATE$4G
zV)QL9O4f!e1wAIA9#AzmM_^k-p`Xp#j0Z=G@03?MdpY}wTba~zfor@Yz|&WQQr_9g
zXvHzE?vE_@%CA-VYHElvfN4phpMeWfyh=?)iG(UR>w??jEFd-#aBHkRJH{uRdh!sm
zW0~vpN#sz+d$xr)e-Er6!axPB*-yVEu%wHfJ_(5`Zsa)^eAy3|6LACPcgz|1%d|%A
zRQ&wnWQ=pl<LtuN#$`pBs?FVvp&5FNgO>os5imRuFCbeBM63D!aPCy@@P$Vcw4OvD
zM6Z0zji3fZ44$MHqyTV(C?Pxt21-(27mb8n@|v{fVTY9up-=;J2&WDCq*Smx2=O3j
z+)^yDKIhw_rWI1F&C+CCDXB@Y=Guc-&APCApq*@mR3%gD;v-hA0LH9JsqWTd?kFw}
zp68nBtlStO+q{A=xR*UVko^naoCUK3>uWd~qqq0osJ%V=MdxPL!O9Jcl8i0?_7A6s
zu#}5{8qWRbYeqyQ!2bYRE8-ZVL_|Y?hctD3sL~=vO8pwAl<Tl@9=*&w>C-_M@MT|K
zBaFl#huN9waZNV+AHYf3m(o0U45X=QFW1~(bc@{6xk(<;l@LV+aF7Hl0%CmrxXuS(
zxxPW()qemge1BNaGH5m8^=|B@MD@De$xo_Z>8`m&36hWz;FF|r#$z9?&EGj}nP)tO
zUTtHm{p6E%9OXj-4;^tg>*(D^EyUnQlp|&1;)CRbxWME4x{ok^DNeQ@*5V#U^aaAE
z(}$X;IGaJw_zBQ=auE#x5UmM$^h6U4h-AFI=kPW0y0C5nUlJ#bf?{}JW<$<dJt2s^
z)Xccc+eNR517BNcfBwQK3qg@IYCO6OI414M9(W#Sd!#SGdzsQ*uIWU0{#<9+;(nr6
z7Da8PJ5aGa5Q?EeDu*f*nsxcan21Y}P>gd@tDD(DD^t_ji{3mWz>Ka;8E!-oHp*?r
zzr6;)>{sI#<EwYKm;(!!V16Nafm$Yk!dY~e+k=(WD58)GO#!pqG{M(cA%t~OVxDx1
z(QeZ4q70-|a587+=UgmBU^mS<z&fQ;UH=7{B$?Q+-Ayz<y(7(Xm?$ge94lILuBGyV
z#?APz#2U3vWJH4EldcX6lY8wuy7P+^Jxd+f&x%_Sk<eHMnphKj{K_B+;axX?VE^7r
zbSLFRUqW!`Cy@4Ak{G5HG3W*WL>_C@9hK`t0+4F8RL~+s!j~TvifbtW`$hgDd9d#&
zEA?WHN?Z0XThFrCOK|4ss19*}wE9TeYe@hlfUfPJkG&8KdaN)U41npVeL$`cx63{P
z+rcYBq47pFStB=C=?t-}NHMT4?ucJh^tET=%zD-(bi?IFRFmS(F3q-CGa^+{@hKUK
zk@Hh$Qhl?da6CFijYBVOz*~T)?6qLTw(Ndw?V89?R2lEj3ur%7DN7J$&AcIc_IZ>u
ziYcF&wSZfYy9V*+mg3-^?ErCbFC%qE`Ja<`4_Vr=Qml2GNuoLw8Y)95HF5{d-*oSN
z<FuejzPr92)E@82>9!wPE~ks0i@;da3JK%>2XF&WO8JPfa&jDJlr%XlCt|xh2agYi
z+HYq^Tm%&jcc+X4Lwk`VB#I0CN}WxH>c4ucq&~nQ5@RDxEh&*&)^19o8Z)(qNsZnN
zNC<yKC8fzpaeo4S08c8GFn?a+2{y9RSR5LZd~e}XmE_4utOFp8ths#`#7JFd+T|t;
zRkA)(H+5Ptn2V!^4rHbkJr693H<R~>o&FJMfwjB6g|xQO5qNC%Yi%-2NHb+d?gB;t
z<7f%ZYDenoL{X`yfARy+vVN8{MNWZfXNBZkSH!0;`wyI5gaN4KJEMK}TEpi<mF<=^
zT0XmHOq%@?g%%_b32xfO`eqaU`Kui<RtH%Y=G{|A7LP@IiqTh}96F`@mG;fIM#EYb
zT3nBYfB`R;OUg7tb%N9_DHyxN(d_)MfydVr4MsXSJG~;OEoto2P-?2@FJ3#_>mMd&
zUE`iM53W|19fYr($?P(SYLXqt)uXm4ql2;}B#@9)Vo@X{r0WgCbTB&c9PHHJ^a^#*
zT5L>>jr9a9+qUEjdc@%0Y&y?*jABG6`^1aiI~Z&dvvi~}ZWz?3nWy{KYuLJjlwV=>
z<kHXfE)!N}?kIh6xy<vEu&;QxcxqTG!-yynZlu6*>>ZpD8{X#2@8@xJqbtdJozUZ~
zK~_yJplGD?7BH?8c((U7FnT<F@vIJS#lmNNxF(1Am=jc#Q}Oyq1~<bC0+686p9%rU
z%+lM4<$k%G5>9y%n&zS{6Sz1{399149Z1$^eM9B3|9)%@-8sy*|I9xwx{>Q&EM#r0
z_c6WVVxmX*W$=z7;=>n%@ojOzljfNF->gl)$Bgn4tUlO7`aSie-(YrhhoS+<-GngL
zPxN;izvl>e^lVxD_&d8a#h}AgjVfR_DUIT_+kx-N)c_Dfa--3<FRQ8d_|veIGs~;Z
zqi24pH^1c!&6eX<dbi4ynF$Az1SUIC1)n3c{gLmf4b_mM(hNh&MgNgyZO3YvN?|$7
z9m<&~2h4+$-W@j(v|ZA{-?~%-?i#=Iqd(24zOn^kf!FQ7@9#Zrwx=!TSRYoBWva{p
z#ihCxnv);^O$wSRPvT#-GUj~CN2v^_;o`Cn0YBVosX(kt%7q&AX~>fOL8zM~a`nv#
zSZROfwr?M~6$H}U62SN*6Y%A1l|@8y^0-z|D%`B!a*&k5XT`I!oEUjhT3lP~K$|jY
zaAKS^YC38<+giL|K<d!zV641BoRF%j$6n}~l>C@1$6t0d9h^I$n53WAsBCSUrK%7l
zp?>@Z>6dW)+g!js00^i(>aJp?W@~C^Sx3$*Cu@f2*Nk+gaByN6elDmAF-5^g&>g*M
zt6*cEuN1tdMHir|ubboXjhMAM|5K3E-OM<9`2EyyyJx20@N)A?J3qBbNa0lXKb#73
zv;Ci^g6jVhUFLt|sQRCsAO96X^RK%B4gM_;c6|TsBkj}JgQvkNva`=j@gCv-;Owo_
zsjFC=Ye0Ly>-7cB=Fs$%l?OxFPc8K(`8Tx9zaI6!VX^*wU>43F|36WsUua%D&T`I5
z_^uup(tk&sEY>;KVOH;ONW(Ki8(HROffqvHk8hK{;Ce8%wybsev}xcXYw|{yfb_62
zM+H6aQ1x%)d);q{+uQ2{NnVgmaHjggdZ@pZ?8a?o9@9kLn;}{jf=pB~<HHeNAS}}t
z3R1j9;IjRay7XFCrP<LX@Rhx3Z;tBf!o%c00DPTV!vI&BTDKZQ<sAoEu2^o_gvcna
zBuSbN<QOzbTr-P8oCzivC<wi87Go9|CxJ!jy$?Gc7Kf(LwR?hj@CYd=gFF`H2Yo-V
zUyNQHl~AekMz%oxe$e=5Hv=ZBO|m4?n&b#^`nB~40%OOhkXLyJx`k;e?)X!B*Z#m)
za>Vd%M>Zq;7V?os6>;+!0W71+1Y`HesL;Q0L-~1PFOUBKh@G|*HYp=M*qpzp@@PBh
zuZtM7oo-CMXYeVA@G`1z{AJ_cu6XU;e5=Qpp7A?trUz<AIZw%F|GZ+&CYR9Gz!RG3
zWnLyBzL5DblP2ic@9WsNsxWhQkULKjtVq!ep&~hpra@frZ1D<B>taMJqgGUbd1b5p
z0`*+O+6rCAX|u{>(lJ9MmBue9qEL+VZVB~6K-NY>b*O@e{V(08M$R`AWFgV4=Klav
zIsk}2pL7nCnjR*X>ATD3POv6_L)W&`)~^k;zb3aXdHS^vEn7+i95M0N+!9hUn3G`+
zM(EgH;3dKX`<_GJE>cm7y01?B6(?l=tz$TezY^m!{pozA^#YZQ=%}caYsRB)(ALsm
zY-5UP&#K?IE>%w@Txgma!Qzb~>`Ra^vQO)nnb)<78!^d00MysMeRYn`@<;Mgw)|E_
zww-VJa^Fqj+D?rsTh%tr$SuN_@0(H-zG&8IYSu;Ue)#;0CDuSk+bOk-0e|VO@dWGr
zXQGiodS^OILxT7P!wBWE_X|tZ8D``3IGpjjKPUx;SCh&k;wkr?XY?_(I*(Xc<P<gC
z=1<*J(7UVWg>d6UeF~c2_zMbhNCAc5D1aRV(swnUpi=7qW8%u=3zqpA%^S&|&oGy(
zibqGht~lrI?7*@a*syj_{aeT5bZ{GbWj=CI94(pT7Ik(^1x?~9X+P%7uve_h6r#m7
z@1s8Njkg-Rl8pkZ&J24csv4^iugZdt3cth#PN}sU2~rg^z@0r2=W~nFG@p0lE@$)D
zhK}q{mVvO+(YVi5E9atz*}`cKo6}{iw!@Tkm~_b(p)w~#%Ibs|^q{CHW$6st90u^`
zQqMB@GnJ3q-WN3(n~_CTyJl&O?WQY>L9(%n-L$WFw&Q#>x7vtv%gp$za6n!?O_C|d
z9UuX*T8cFaiSf-hQSa5hN%<KwSb(?jXQZxB&#fzbNW&wauXcoUU-AH7Qa&gNFRO_y
zGQyTR#6W_8`=H~QGKhpt`l^6V4#TT1@>>Rc##4&HLG>I(z@g+)>1JJF_`r<Yd=C%~
z(<&Gaj<z7A-?~ND@Z`dd3lG!gC(%2eaXL3Z_`OVCn-^8)rQACrMD0q8X3Ml}EaGO$
zlqt!p4vu$42#N=w7NV^h`r13@Q}90O-rb-|wrDAd$z{s{=|S3aSr0nY-L729mgJ4n
z>|NM=1Mx7INHm6g;RmeGk{kL;BTZMA&jxLW$$!l3re!AhlB1*4`8rBIx@&gRnMr(T
zkw@zgKf)h)&MS76<f+{54W~HwMfBEtgcWSf)l}cCB!_0kxmeP{t=1~m7qz5E`0&&K
z!<>GKra<&nf@7MXL(bF@iqwH0b=^0*n?u!xs;6#W+w%qxB2O?^siP--yP*3ONjO{v
zf?Buq_!_P*T7)VDsT635>a)zmhdX-_l0KEoQD+>6_n7ClV;h(64EVQ{?*f!I;Syy`
z3<KTkI7Agp)F9XsS|-4S5=m;U*8eAH<Q+J0D@8ee66#g$&WYZ^Yfo9E{3*5pKht^8
zY_6>3{)hUGq6(Vx2-0YFrTJMCl(Wk^Z;Zx4iHeHrfH+)yh@t0pu$)9YcwfhoX3}*_
zJzSpFz)0^##N~2_`7mPM;q=neTlDLLenPnm7R)xwa;r>hT7igJC_ygqNl_(S!Rr*~
zbB7-VA}v-^%1ladzKeR7beu5(FLnewAKXW+rBxV8#C0Oou=F-N5R$GctT3R#bA*SK
zA}@rNrZ%9=z%Or#ANk~Q+~G^&K`7&N<{n|Eq9~)30;M%&>%K8pXWnb8V_;WChMvMe
zDb#Ygg&?=W-F+(nKdO%#=Aql|>&27D^7XZnWqgm2ef&$KCZ5!pQp-WC*qaBXou_){
z&@J|R@eByVi1lmjCe8&RxSb+QQwzxcl?pDHW3;1O&p`Oa%N5yPpkOuM1}hGl*pV)}
z1db8jR*s-)@B%$}0tO|H3w+Rk5$OojK=Sce)?0?O6Q{gGlf46tOQv4q#a}CTm~4sj
z{Ozlm*6i|L8f6~cp9K`(&thrFgvfA*;eKb5c%2$=m~o=1-n|bJM`)qdx@1Uhb2z&e
z+M#4;30>J*{sWuguotqml&@mYOJT&E{;@gfb%l@T_Spwr5$(}nEtd7hIPEO-JGLSD
zwWqm@$xwU^u?DR*hY_FO!jv~`TJFIoHP|W*oF6@-Y-2qk4?Q9T{ICdYAZYA%o>(j=
zn*k2}jXwKZzk@!|u-Ge^sM~fXn10Ho4!*J4*y<lA(2YiW6RX3_9I%T9H>J(o8H?<n
zV?8mBxBUl@?ESe8?1ag;k1FGdsLs~=K3n~W@1ESVC&8aJgbVF9^n6*ei|JCcgMBga
z7i4`RsDtc7G>lkKBw|;6?m!@{w3V&CN=4QmCLH$VsCe5AAGVn@4bJA1bBz_Ghz9^5
z9Td*w&Y<mZB6pdAa{bSCn~AGo%jU|XkS+PD+Am-lqAIpheEEJEtnJt2sYZD-giLu5
zGA@7u^CNpV`b)#_&C~s<^sw6{MefAEUU6DqVCHSUs!7KLLKOveZ54*8n{o((WcQ!K
zr|6Fh?J`i)Z&_BP0Iw(q6?ubM+@$MEEga<|&ho}zI!qVh{F%P~{YYM!#VbV=4lZ$J
z+*=eUI^@44lnmc)z9y4l@N0EDZl>!`B;9tFMjoEjTwAH>@jIexSY(=CYCbE6pa2kc
zUZF}uX>**m2sBG9i`_%x5ksSSYYA*DkJ|KbX9j&3{^U+VE5o`h4t-dMAgfK*w6m}i
zUL+3DI3U62Z7{}jlum3h8=9-_OnN5_d;`io|Fv2QGpZomEUtJH(O@(vh~2BJS*riI
z6s)cox0KvcK1|U2Zy>{>G@h2f4FbQN=g5xB_t`*?dqkds*Bu}oO<!jbnlK);3$Ccy
zQR#k&0M>g<Bg`BK8|SuyIiOv`-J2?ISdHHlBK{8`p?I|OyM%nFfr_vU4Gv@`bPT)Y
zr5^g&o86p}?Jt~YFq4j#wTB^twC!s(=JV-%?u)VYQm$7yRE+JJ_D35A_gX61%0GY{
z);O7r?(@-FL#ZkV-GNHv*jr*WaR^tcD$Q36YT)8JMn=B`ci~fQqfLsWQr|*qLaGc6
zvWO6Rr96TlKNbo`Dx_~z7{#93zw^(Lb89n<!P>~09nmclpL9ZL2^|1jdIFrCTw|+J
zXOP=q5ZT{{^t5QWbb*p1odhiarteGxVG@4F`7=#(J#`&ry&fzEfzgvYc7LtrD}|$2
z*oYjomqPWb+*M{a=qPGXG*5Eu0|7{WSU)k>FEfVb)tMX=*J5LDZE`8#)mFd`VU_i`
zSOyea9L^{RfM=iTb?TPA?dmP+=fyS~V>FKSV>ve{@?FIrj$y7JqewhYEd0zrSYUo9
zN?q0`Ri|&V8o{dSHEJ8KxSFH5mxrQ=;(YOoQe|^?^C=3~ecrdCfAUMbay9ugSzY%W
zvv-&O9-2%txV5%B%402Ag~e0`R#B{TMY>p;-{0L)d_+Hb>3Lf364Q|1gy#^F!{?jE
zOR{5}xjv)CU%#`IkbY*4t=F;0t#X`CZ54cob}iN$WS+ot82ClZ=~cy+4=>6YA&E!N
z4gw{0OMU)q(eFYn_)cOed$)_Wq>fFBCnkz8$z#mXCu^6a`i+i~E#oT6fP`!89k6OP
zZL=rPPxt$v{v1Pb$?<V!YihX9`n<(-v4DDSO4gJFq905kHOM?N@(pG|4~P)A!$>B)
z`e9TDAt5_m0pIIU2^iXsU^K|s4-66xKL?<p*mEdmX}Rr<?#YhSjOq(3s;X2>57$hy
zr){I06q<KCCdi>xF|1XXioq5m(LAtPaf0=+e>BKp)ny==eb>mO50+GrCU&_{QwAo#
z>9SlqNg|8YS(fF1+UFc)RcR7&1rx?*25aKI>;ivMSn?!b%rC*#Z8_IEK*uy7ly5AR
z<bly~Fs*bb$$GOO(zvBClSM`4Z-{Ud1W|Ata9433<ulwEW_|i2oq0R|T46r2DR%^2
zQoi5HD_)rzWrOxSQp;O0@2-RWmAp!KsRa#cK3X#*wjkvzDaFx?(i<ln4@w=yuXBQn
z_Kx7NV}8c+i%?wK;Ze@cfAJ)D<K<Lln%9<^f5xy%CWI&(61XQ~8$wU15?@a=`A**_
z*U)xo7h8sWB?UX&NZj9UtVBazo|G<C*c=3B)Z#;<;|KI&m;yHd;?XNp#!Bf7yO5hk
z<!vIu6xoxZaY_j;#WqM#(X5$fKeRte*|gt65WN<x(U%sEXH<O4h3h^S!){#)Jyf4r
zulQq87Rl`BAvA8D8Dt(D(}Bd*U2(ui%{LsaszS_E+BY5N<o%;f@fGQg4prmU9MPyK
zBpDRKOD(6c=|?Tq=B*knj&<Zr@3~kf^SKf?P`Rj^F748`7OB)4nEa%GKuR_J)>O{R
zE0VEUkTViXw(mwUpX@~TdwQ2%GM|VH9f7$WLi8le8W~9vNI8gL0c--ch`J||RX8vk
z+pGG{8&3&+XM$)z%GT6(LzxJQz9RMm5ZB+Sm;@fm;*EUnDvt5rC~<d%YqMRbNsc}S
zy`eLcQRBi~1%N;RYOw$o{y|?DuLIV(_1=<vLp6MFt7JdSW!(Z-;*cSNvlPrtvm|dG
z5An7EYEd%N>eW$NJutqplr(b6p0PXqSh1+mP4H>x?M6RZP}X2h`~85Mp^f0U#k{^!
zo;CK}F)PV<D_7>EDD%ZHNuYX2ICWyb@+B7p;NOn`JQ;yhUr>_MvR@1S$h^-J)O5-5
zI(ake`WOuW@sUp`7}UKp3m;CZi9tB2@kbPg5YtavsU~m=q=`cjeInwwg6@CT9$qXg
z$X<S-=<3jLNeO2zr*aoTBviX#iX`NkGd}SH1_H0Nyt>}D8eZhWEtmdlE-4B)$mKOL
z6ampBJMMr)$@se4V%330z=_5QQQ+%{qZVPRNh^?_peKK376*|)y6~nyIEW%5&Rk(T
zHqXQzUOE~byV5efjmy)(ZNtgWfX`uwb_KkQFj~J`woz=ZW#CL7^5s{xnel4xIY^FC
zUlM`nQ7M-|X+KLcQbTdK?<H`7qx0ivSP+CNKlN(i%)z)Yu;O&Xt76XVe__?Ax0~n)
zyu2`jUH<qOTz}$a0TV@u>^(l3Jbigcv($3_SE+T~r1%Bt)G*kfS8&ncm(G>#AAyBm
zlE3fnnto^gs2JU^nkqm50o3jQfXK)@01y`kfLr|z`nw>&_C##?oy9j%VMC{5dRofy
zu~A-_jsxp*1)#10w=<qv9T<~D;S&*OLZH!X<v8h;TA3d1@~65-VModCZ}f(-UxqWm
zv4VAAZ?{ve8pFNjR#zy~1&2|gNW@n}?cQe7@P*XEe-Zv0cng2}$lauWsxif2MDBWa
z&}8ERCact~I}F?Mcy-vOTcI1nU-RG)E5cr(=Kmw~>p%MOpIAxQYjJ~VG-a^p2b&S<
z8`MKo;D)LMnQCP2%`RYn6W{WG`XNquc;x+<aw_Y#vY^Cp6{n(}6`EX!3*|6GkekAm
zd~hTD?v>gwAM>~LnMcukG+XR<LBjb|$%zdk*Ywsznw9t|bjJh(bt9pel3Ap7z-0?p
zriry>vZbWjElEzoDXJL;0$5=QUH89Mh#+w)!WQy@v{lE=OHlFe!yT8}C84P#X4_1_
ze&NB|SnulZ8>vCb#BM2Y-`jrx+33fWs#+(LxM?ZNweBl(;d&;)%gi3%nPwFqcz<&8
zU>eX;z88j{5_S;4=T5)`=l~MH?B3i5+;;<ex~@>iwN`@3T@0@?ru@Zs40x&g0NTeP
zM1${Of)uu81@V2S<?ShKtkV9E?|!kw-4{>7$gFA}8KNb0-^hcBZW%m^Kc|jPpjn`N
zr9MD#^m$?N8TB}s7!a_$a_DAly%BmiB9$e{HahPJh)7j}9J1s3R>fhN7r%o=X>z%@
zcNK=u|JrQ~eSf$bO7Rgzu%R<Ztd{s6fOc!W)qTR`TUYzbY(=|+8DW)dH>YP=mz>X;
z6ZgPbev|-F9%HWS-Q8KA>MjCqb3-E0Oit{L2AJVr3hPc0K8=ToR|intA2;6m7Oh&v
zT!yP)Gvn;PW!R{qhNta_8;``pvT?;kJ=6MFIOiI1@y!AXtVt=t_DOvBTro=+Btrhf
z9FdkN25!Cz9XVYcHfejt#@ehazenLLzQP~1qrG+m;PB2Q=8(cfobQpfE%FTCRzC`B
zy@Kcbf;|n~1=8xxrxm0(E8(RBtb=S?IkLDKZ}51+<e|*e?toOdE9M{qFsXJko}we%
zPPDh?O7e=glx(x_lRH^y-FY2eR6lkuMrL_OtqZm29+okZ$nwR8K(|n{F#oTc*|WaF
zjf^|ic5Gqc9UF~{cN&k&C+{436!o<L@|Cz2m76l$RcbU4eg<{4pf{0@0F*M5$&>na
zvH6d4JNh5Wd06j3lTmFj`8Q}8+mSN|QLR-c=RR8UopL=4uRUnF6^l|^!HpX`*S7-?
zrQ4jf9)EAUSRE{902|qPkry?J`^}m}obEwdkQ}UrlJ_bUnfbw#MLNQJ-cjko`YLYz
zL$!Bt$#8l-kpTml6Z7e;2xLJKf=&>WDoCV(Rx8$S<468=&+bsHlm4!Tk=`|OF(%wl
znaA`fvpLTmK0_>H`9M;I%ZJao>y^prG7t%+2$!%*_+8qgH2L#zDx6e6?UL=mFV<m3
zPLW5`SlG`hc2`a9_cr`nzB@}p3AjDp`=C@hs{fHJ+91CMe-BYp1$R=$M40%)VYdLA
zdg=su*2L!L;Bk72-G1{(8yW+jI&?mURsHW4BS?<NiM=rmJ98V;&Qq^|;W}@5))32h
zdpT>!7*y3Y7Dbr==P1F&J+XP9;tKEN9diOMH(6Y5b|FzOd`H8mXfeL)m#BZCN{HS0
zhL;38MB}{+Dsyzvm1fod#iAjL;P<~HOD0aMwp4Vftw_AA7lN#9R;%dVs4RFDMKj{#
z$Y4~c(`i(hQIjZU+wgNjYs;FS1)qlJ^XaWSpyCmR87i9?kwWJWPR-O$30aZ5RQwz^
z%vJ69z)19)ez-XaPa;_znMIHNQ_%tUpZy)ODW}Q@!m=IXskY4lS`TS1mzZa5TLvUZ
z-6Ok)G97>dU4edSbk@(@_3z{-oKKMVaFdENf%ZV8zhPSi0^Ntt1+bluBHEYB3GLfc
z{{Uu|C(8dygAKCHYC8j5F)mk=_%k=XEn@@HLOy;Su=^l*OS_~zJ8mlSNgxwx5Ws*R
ziEfGK-Ek-g+oyA;yZgb5cXuz*@;)yq<evGe4g9V_^TITN!>6bLY3nOyj<nDSemQFf
za7XqaET6gcZK%Tn>}Ao%R%ec}_6@n~zI)sXl$*~l6IUY<Pm2p#0<jAOQhSG&-PEDG
zfB9=qR(Aib+hi+yra>2h`K7=1U9?EWGtsYhVi&q9#l#T-^(;O#nxyO6w|_~VQeqYk
zTSq@cRPXhsc3DBm2S&<%CfVZ*g=E%^h|32hNZ{}z*<)+BSnBZ9y<bn=r`Ky&`DXh!
zL%3;Mmq~A^^pb5%8X;HzH7g3I5NqHoMHN~m7CVxg_)qhNJ?F_R=k4FR>jB!=j2`QL
zrel!vk$oov#t${?6o%)sDIw)V>cOirc!{b~SGp4!uy2N@_^A0U6(0Kr_>B0XQufN_
zxUdemGp8kcIkD>{-FD7NP|ko0ON6u~hMIs1oCGf%iEE)=<R8G~?J)g})3~HvTiQum
zR!44+?lv*SX#VD<eph;`ZMzuZ$^}-2a)-f5h-PFa$@(}NTF^}?v&%@5m#62|k<Y3~
zUg!dUdZe9E^2>RL?({beZL7AE>h3(RI^Y1>`IuLcBrPk&P!d83Dp%ZJ&SNpLBjMHV
z@S|0w(u-nS!Z93ZC3nwws(&FZ-MCXfYmi}Nnd8%~jM`&$ZlyBrAs0_2YXOTlp0;ve
zwG*S&T2uO;_A={6D*fC4!rog(#kHl4x`h+m-QC?S5DF^_D_n!SyCo?c3WvfaxJz&;
zAh^2*4H_gs0s)c`*{Ak*Ztw2Xqx;_e#<=H>`{RtkA7(9BYu22#R?T<5@AC*X(W&ha
zqn6ZmJlgJ~U!Y7d`6p$|qpbSHIELtm<7#!}@td!B(u#$?cQj|es=1hnYu{lddz9Yn
z5+J}MK$u-ndCQITkWx|!0DxHe+<%@+{XG5?k7w_QYjN^LA48Ez!;Z6?BtKtwJ8SWS
zXj#juQ2G$~(m;wbmt9~aO%c$uBTc-m{N4InPIOl1$=16EZg@xIc0P?<ovJ)ZP4wZ<
zQ%8M*5l-e_HYRq|xF)nzvlAM9^bk^*nw7WU3Hw|B2oK>!M9Qy-R`&vd<LnIa*~-EX
z4l0N+zlt`eIrX!m%F<g5WE{(Yi(sD=8(=Uptv~h&*Z3<|e%NpqAw)thYSL}_*<t>3
zuzQb*x&*Y&qKpN2k|dC2vPqhI$f7t%)(rqOkyff+OEn40nw-Djzpc4>QjsLKC9~bu
zu$H;JtsT18HTx*P88c$)^;K!d!{73P@;9Ewo6?6d`IpvxwS|hx(zcr?c@ERhB$qnP
zT-aTwReK>aw#?N+<_%}i<7!HKkt%6J@OgyRY9&F5+#0A*_*j+0|K#flc#R&?su#8T
zo8CY0xTj!C$)jsEWLw-=KcR&iLnJ_NvO}hV>58S=(=KNeOWrN_9F#>)kNs!a$=?aF
zf0u>nPX9%S^ZU~q=6DwHmEK7%&5h-(ChHusRr<?Q<88?g2E@-bYxB@JN0A&KuD)$l
zVq17EoSp+!5${oSMf!6cK~|Plc9E&Xx1#N*&g+}!HSA%|{)HV=)qXL&>l-^DUdrnX
z?wsH-RNCIKae~sbMvbO!Q#J6uV^g=)_?o1-Wwt5ZFR>?3hOfaxZ5wt?FAC!q4H}N#
z)KtNXoqz~4{R~g+t{I;pw$gO@*->zQK}d8km=^6L)bE>{0L@*yk^^OC_?%syAGJ#O
z<&)fz*Th3_yol?Jvf4X?rzPA^Elas(NML;Qq5X|NYDX>nvG~SPwG{OXR`<{l)+j-t
z-snGeUGa%#=6xH>qZ4V1d-S(<8Em7{C;WTxM=mjySxxRU@dX|+P5X9i`?~OrcxrM%
zXi;Ro^jPDa<=SFpW$kM8uC0xFa~D&y1Muy0NynSqUU$sb&!m@ez~cTTS>Ug~(-<{`
zJQxlJ!^73ko*NN8S~7gNO!UCu`pn8o2JpT)#E>}bW=0<+(C8%8{ba938%2Me&neT)
zQf}L3=cX(SZcR{sVkW68DUh3j4xGl`4+;?QW_0Un@@Dm_r8>`(j#3l#CONNDo3kML
zSx$C}7LU1t5`_sM8tP}rzZlb!OX6oy!>w4%bWpj4Xp_3$;)|P7O>iYtAR%(t*jM+6
z$ycwaKAtz&-#zTwZ_JB&zV>}LREET~;3?`(H&l_RN3zpLw2u-CMYL>GLyhwA6}!#N
zlRRQCI8<+LEjxN(dV4sb05yenEEbehQbMyI+_i1j0wK70N2+c}UcA;93}S})vKK;N
z6zCZ0l>j;(Dit2SDvz|iPVk=U`EEM%Ot;ETnfFJf-cSR@^SogYlQ(xJsRwEymOOss
zw{QL*i!RJa!nDdA=bhAt$N8CB<Fg=n%h7weWHCcNh4G#WyOjiG3;<zcnmn;q7<r!`
z#Z@v{MJS&xct6u$TUscSgVdAwWB0HPF+<P!bFRi`MX}HL+t{|RV1{;V`W!5{<Q85m
z5rtG`C`tZj$b_`l0<B1m-qOIh+tSOWIaZ(e7jGT$d^6i#j|`&we2w~K<S+5sRMOl?
z@PJN3ocF#^L<2GLq;M?Q0D4Yvm{!835SZYNigr$uv>g<-ZL}{xLP@vavtp_++xpC3
zv5pMHK3Kp4KwDu^`0eIAfA?fls{5+|m3ewglggAVZa|W*F%wI;{i*PTGr&GD7HvJ&
zwFNFz@%>kn_6Lk@kJireLkKy=m#9wp%3D_|i3&`i+i8>}=p{htSZxC<M&q#5?y57q
zoNei?ljplzU+pr|m$mEOmQy7eyx1H7j0+ArLS=$*Ts_T)Gss;Zn}A&!$XFZCK9jK>
zEJO4bT7m+}MeMO?q)LYbcQ(Pbx?H`a=B5+;3NmfAiA4Z5yIrGk_&p0vD1%^cyFh}6
zr`mi{GsVZ)_hd@>Nhfq-S>9uB`Nj1$M7if#LbjBjsC#cw2`F|0KE6g^)B4`D99?|`
zGK#94>^!M)VOMX-MDF5Vc$1LjUEgn~GUPGRq=H=Cmpnzl%IS%Ik}t~}=X9U)PgkD>
z;2DB#hN7zWpa2#CN_z85qh9u9W4_X`>S%gl+EeAZ$wG7r)FWx#)5)-rML9H-<!W*f
zepdP9JiA?P+(b)LAZXsO&8afH)rmaaR0~>)UV$Hr@<VU;kY0`ax7KDLXtp}Rt(LE#
z21|vfzX!O=3y<;CO;C*CN*lBxh~$_IBmeAF>*T{RhNe6|+Dh$DKZWNPfL3hFD4X0p
zPKOC*f>`%3L>y>#=~KMC&@1YvWSB#2GMhRjZ5P%dxD7}-IQDE%W4%3)>vpwK?$BV3
zPqZ5S!kuM}r){WPO6)92JM+3e0*gl8%7r-AWcq0IwY|rZpT0hBtbcE7G_B8eh-oG{
zK;{8!S%|x;WQw@ilc0SC<$23$qaCd(j+_rVe-O8VILc^5Ty^{73%A=BNxJ*iwM=^}
z{7e|dktQh7MNLtw@@D?-QTG*1wx#G|T^{C(Zx)HATl?A#ivHc&0rxF!=h6BV9+ZF^
zmQv*NE51FsW29m+?c;!DMR^?FQYx6Hv9EMCl-Cz8H|4z<7EkO%$|Au){x^+xM&7cy
z9X7jDAzS!$u)6c1sm)z#!8&*aYDDJU6|rzzN(pr%>c;HtL!SE@Ii~|3wC{rlgLMsa
zl9NK$s81@gbbC`?H!suqEH)uU<v5ZFo>cCSXH1~6!sMQ-PWy&7x{|Aa-Y>moOfBsb
zab0&&PrOUOf>gTwl`_egE4!$13~*3M2_OW3ISr;LH<utOw0E`k$4^-5Tr;E*o@VGe
zZjdL6Ka^=FSmY0Gh(9ls@OpoRa5BmV|1wGjd_pcIOmOnvJRz&#qLST1pcC{fPgEKe
z!b9&lKpz6rx;md*q!M@AkO#lc->pfIRRTQeAT40+5w+iyt-|wQ=w`&(ZB1@H^)OeU
z@t}V8aN11dvT4CV7nwH*pgOcA6jEkh1oT`;6XHZ|ZSZb`>@)ey%UWRh2{nls@l~Y+
zO5Df-Z~}DnaCEHq4Xw|8T^Q)h-#F*l(AOZ?ruDC;;207G9K<A0C?Ei30%;$wjXt8<
zyw4|)&R{Xsdp1o$u-`2!`$~RF(o~<EY#KF<6N;9gsHiQ!Q#cGc#zNVU(R$WlV$LH<
zA?%y<<C&vydYYa%Oo|~^%YGWdqeo~hL#W;H`xoiy_enm!++5=D^U11mA7Sz<st-hi
z9CSG-P~_&sQ6aXCMNU+GLb=H>ur1YbQk#FXh5LbQf@sIR#xED>&A>5eSH;b(?-Te@
zv4td9izB*#MKCkdyTCZjrEYdy7^uVKM=hi#bzkPo_<mgG(TzN|SQ#%<>Qr4r%7AJ5
zQHjlhDM4R)f}K0d7()@N#FUVPc_B4nm2WSOdf?_M+(~38(v_NV)i@7H`K-T)Dt%uf
zO@tSm>&CWKD%C&1?X9k=*2^~>-Ze`B+=(JWFGFIa25lpNmE*{V%}wo?8ed%SZqM=$
z!=kMuzdQ$=wN)+!*NyqcuDX%}FQ%rKWvpq)WPel?DBh~;&#ruPedtgDHASVUFPGzO
zG=Z%nBQoR(sH1!*1pvgAA(ze#^&3;tex9S$y*~ZXOTXZQu=t446BK~LJ`wSmZ7x=c
zJrdGf+jE`MrCCAYyM*x1@8k_kHiHl5b3@~=@Q3XP^@yjU)tZxml{&axmj01rqwCA?
z22HAeLPr=hZmiAy9)Q9A#_gU~`8SHI*8fsm(OVwBkX}9%_>2T_8tABAM{)S3pqIak
zt063LTWMz1P6^>D@z9c3m8Z<<FxZgH58c^d4K!Y<)`9gVXHp_Isi!i*ir;qt>55T{
z!d6Vq^BosRTw?5mVY}}qGlI~kx%jVHGF&lN($szF#X<IK%rF*IW%wA;4N5)6d$?$#
zL-V>>DS6G(n;`UX&B^hM?8ZD|qz=3XHFA_;c#TOYo=nIOP*}`H5})j3mULk?KUOME
zulaFi+wrrxvro#20EN9`7aCMgOEn=897VOP2u6b^q3v4i9vF&1;rJ0}K2ijklP<r1
z=Dq%2-~9*RXGZt=O0}Rx&CO8^g{cGjN50zVap`DZ4q}Ef7KQwL@BdU@HE<0|!F|ut
zjo9EPWVebve@*n$+e{{)KK*=B>2~j_6}fV5DNo>>fk|>$87h+>kqF8mBv)R1C0x$*
zQSyXp88`B|S+{MA*vVLVLw29Pdt;(|R}@Cx<YanVeAag+C6i-tDBZy<8eMrhT?{gO
zIq?U8Tyo}{bO`Pqjre_sNMQq8R-^66vtIYJ7-7&$|1h9|aA4seckZy#0we{swL@*1
zdQ69iExxN`!RWbs*U>fG$&T8#u+Qge(@84ydEjgT2bLd{zMe-vK`SbtCQBwG>kokC
z)16j0q-9In!iA$Fl~P7rdYB+{)7^hu?6ToJe(tI3x+=TKWS~`OiXt?Cz?K8&3;uij
z@hy)s>75t&cQk6#q{7EN1o#a=|Er?-GA_%>t+VWXt!FA(`{1O~sABgzS>bMVX~0AZ
zF9Wk&vy4ly_jXObmc3>E>tL`eEg5T4#~%Q<?VDPa4z8Ts(j65W7fw_N3QpaL0PZRP
z%bPZT=ew5FNl+E$GNsJJ+2Vy_G*1d9eQIGU9b<>8a{4v~pZ^xG9labc*Get>Ol6)E
zSCNf}vvxw?p<9HB@KU{@$&a^MCOy5Ik45hGj)hOi_v%~Sw~l|Iap>a7%d9si@tcH^
zAJ;oLjk#Q9tjh&l9CR&eHD(Nnio5TWan~il(x^FE(6^j0h;+w@xpI{ObSo8B1`0C%
zJkwDtzl1j!MrhsBfmgrR+{fj781feS&e;xT94J^+i7s*(t>eIUl|bdBc{Vi-0eKvs
z8kg=4&z_Dd4qGdw77M)ZdMJAS271JLwMonyY4#&EcNfwF7r|NIUY_`<jy(rKdck8z
zlgxkSQbFzdD}{3{{V$Gw6VBdEf!Z){o!FO4RKjoc&1Z=g&Ht!A-*C7QmD#~Zp66Ql
z-$U^J{VU9mUw@ElzEr+D-;mr;cYA-S#s8gfrP|`X1+8(PRh)|86I)|V@1PUN;nT<&
z=J5iPz}-Bbp_;R6vp0Pus{!xe3X(826?-^9C>B^|M~1}$K(!(MkZ))PnaYCOu{(y6
zP27VDgH=Q?i5@*F8<tQH#I{DJ$!h-qOc6@$%iK@IVBKrJ)QzxCB<d9V<ZIP4QNT8O
zala5ILd9rT0<i77uXMP)^RXIFujS(92n9~u>;4R%sGN2yH<Pe<JPLiCHPwIf2f+OT
z-WuMzqiHI$=HoWxzoC7?;i=!?R5PR8XV_~o2KazJZ5$&U3I*7YpIfAZ&Z@cflFISm
zS+Dc^ufC`Tl+u@NkA=xL>-X=ytcglI)q*SWV=cvgkg<g{B-i}}D@`=vFO2pOhNH_L
zG;yragZssEbU%n|>Yn`YUp+eNO$(UjaS(~UBZ~%b<Df($6LnGHe{vz(#Tt&NCV;Hk
z$RhQKW4ASVhUg9Rwzy(8!QA>FodDN~AS`)qsn5yz5~jjf{8@U2co0tH4IP@Rh;9Ht
znT!dLr24I=KzE-RsRdb|k@(bQevv$Qu%10J#By2GqG{4PEvqyIK|zDj#}B58(gKdU
zq^~zJ#p<T>;Z4q!4tDETdPlsV>j9zeN&bb=B)t1f_L0*9_iUc`*!c>EL$;d*EiFPk
zY<f24g#d#tIs(o?dvsnO`B81S<YDozqd@)S9~9=wp7`WOJdB!peHn74NfoXh%W+h~
zlH#Hq`&GKy_Jfu4K>@_g3@&=T%G8&h#Wx*Qp9l1|L3#=TOk1WcKUvFZ2ykDP723IY
zr!s!_*x6T4iO>~Xe&p^$tMaj!eoGu!G<E#zpon%RzI(w)VqoBDT1Eih=hj;y_c8lb
z)-HSuU5mM|aKd(Ai8ogSP>p;DUTd&SmG`lWn&zfVKy2LT8=^bA#e9dvY{_eepStp~
z=K>~htHc>C)9R+m=Y%^1(;zcIht+B#&VwbvKLgry?*_iCDhRf>sY&&%(1w0oJ6)8d
zPYokQMk#H$NnqVRR3Rk1Gp<M7926IYu|!gUSahIVYNhI@g{E|=l-}EsJtAZ68W(hn
z!0zp>7<NzZU!KD|8|)o^B$gNsv^AfbaGcnM5*E_Y2rj7<PlRIeP$fG`$A3dbZl9Mo
zk$km~**e9ysV$!x%Fs{e`arCf&_IYAL9Q5M&%-*;^+ZXD2!-pIclOcXdY!C?I8nBE
z$|qo40uJ8ZifH)x)G}P5ufq$Uo==8VzJ7T`d^2T<t#9MPo}Md1TVFUV7Bia3j>Y#{
zDmA&i(u{bpfv$-gWC;7e$@9)I@T|zHRA8#S_{$-H_ji|&_@6Ez8c0^H-rw$G9u3m!
zlbY)SRxa{$<_cPB^t<o4sIa8&jwToi4JM>b7^!g~=LwicydLV}SI+<&?V{4so5=iU
z=Diz291XJ^Ft5lY*c^gSTcpHH={tL#HjZ~(!U4d$L&5~LX?odvmz89*zoce}RjjDw
zJ%q3buGV|XW?HLd?a&3ivDu9v$V!#=lT7FTsiuG4WSmMWE2OtbThy_j#A)^L<T99Y
zuhCL!8`7PJ8;fKDCfiANl@veK6S>xt@X)S>J-1gZk-`}>WY;yA6iAQvr2_d<b(6%0
zqRZ#!pD*MmyY^|REnUbwAxr)6Jt2ms3msa1_ZgKdx5k?x7Y!R4Oy*~jpTo>>YWx~B
zF(WDJH_1`wMf*!y2#+iX>)X4#xKuEqSrbNtY?9?in$8FLNe!-bKi%f?rA*&^t({(b
zU-)(sN;d)uc!#o})VzA1;BCIF>cvcPBjFhCcy&x+TdHr4MRF~uw0lqpi2wEY8ay?U
zw*|R1Mh_LRut>I`YViwySO8%Wi=3*D3l}6P`t1pY9^jY4*0Vp@-{TJ2d!lEFCdSmw
zNzX$=VtAvDk0<W|OyA<5VQb~pS`I!5>6Av|)5i1LV@i_>D&;XGqHsGS)Z<9%$tS*g
zc(ICusML7NH*c=ph(`i9=v?D*t42*(sY&5jK8nDi!?@s{p{PZ99>dx$S%-als*#;1
zg-wFo7;u%g5+Xxpo-hI?y$iih*5O!9yqNc~kdNNeW&|qvlcjDYWj`#*z&Xq$#Lo&#
zGl{l)G57Hvd0M0W)Hx;-?A{ku7h;duNuHuw?1KaS&_&x6Xj?WI#P7^V99oKqN0lqa
z(xD6}+qu%HtWdPO>*LUX3A3zovax|kU*RClc74|z9*rI&ApjS`4?9xnHL*0<_GraC
zPxE2hG)a8=`?4p!rlz=`j|5jllCIm%C#>%w?>`-;S5wlyZ)y;heb;>Kk(kX~CV0|#
zI;ZRR`_yzqISqEV;12}gf8+g7!M4oPqvRZ?qL=1yfVVTqg{dgwJrPs`4VciYT}2E7
zRd?o31t~-l=J@i;S6qMA7b$;%?zhCFvScp<;=*w}9{|Gnb3Nm1O@iiGyk+bL9C>6*
zwX7_8*~YwV;W*Z^Flzu^1Qe?p48>jvVtC=SF>1?Vtnm7+M^Ll-7BPfGE_<@Rg$%<1
zfR~QP!u0GLpx|ADdDZL-&mFF9k1^vEO84Do9IA&{q;+{(GpNTvAo});^ar%zYD%%f
zfXO{y)c3ut+r5^~_d_Zb*f7s@tv6&-k+DPqARjaj;*Sw`F)AGqKU`=B>pOB(9^Q@H
z>n-E@;rL~tq9FFtCka!ZJ62V&l5L%SWf4%@olmk%UtlX|r)emt5<c(sgn?Hj-S&J*
zZA38Wps&%O43$J*FXY0E&a|!h*Z8|m(iky09AA3hEi{aOA`ESKGPRChY_UST!K&4o
zjexX?2956dpeR;@6|sD@b|pYeXi(yD-g`!NFAcFc*2IX~qU;43`n(Vu&y0(xr~`~u
zZWud$kz$$cDFz<Ypx1w=p?B6chlJkiJm$t{PP%K$e16$~t|uFr5d(uyLCL@vM5yr*
z$w_4BGVxI3`H7CSZh^z?Or`_CNfQq|mnT}prSKj7pwxv0wrzFFNlCxSQ2A-Ry`M{u
zeMwt7X_t~6xo?)Ro^r0D>=<6|FugBY7n<&_p!YJxZ}4quL0P_fFLSoY$;tI`jqXre
zyRSSzG4!-j6?<GG<W~Yh?25l2{ij)*yT{iV5oNj4_;%?G9R}GH6zES@^^cCnIri;v
zt%2_=fqww5<M6lWj{l3yKtxbHXF>#NSci99cjkmq_@vE}YO7>4!&LN1uwkP-EV5Z2
zPDe|aWZy`QA?casn%SG#P(<!%M~v>__xiXo;2CYP1IDv7Aco~ANh~%d!}U^GCBqAQ
zVG*v%3KjRsp2_2#hR0`mf&E1y*J$oMwz}MkA{@k0k81KVMwQrk#)8QdTf)OB8i+9e
zC7~M25*BwjnmhnYVH~sJ9pZ3F8@rLVM<t=6>KL|mpiOtyzQz+qw*64aXvT4adcDOY
zPQD_kv9%THKtIz3oHLVWwyZkq8*p;c#bK8sz~UH3$Eu09Ez?b5cbeq*BA)CXa=RcJ
z`8x3hl~WN!v}P@O*n%*)0`*$T|A#Kkn1j1ThI>wCA~gJ@-r^ySe~a$C61osPNF}J_
zSZx;Mt6EL({{1inwPyV|FhEwbEFuFu$+<_D`YfSsH5B{90NApgliE|=JZFW<cet$7
zDk?69dC@rE4_2wJ#_Poe7t)pRY4;}E9c$_vI3i`{Yec}b<z1ZLVKvcoAsy#3Dz)?Z
z&u^2EBPNcBd1K?m3M<f@64m5ps2_f#m7B)`j}eZJGY$&Ssw5s?A_NfQtq#*%rts0B
zR}N^p&j7o0o8UQc)7E(2S?MHiU?Leg_n@LTgidWe-WtF|N-fu?mB;;Ib*ro|YPbXu
zy$j%<+_J+_(V>kHrn4VZfO36X!DDT*z5M0UQB5DHE(g-U(j;%QrRHeZAtr4o-OwP(
z37NKqi&XitGZLyLdwFhCth9NFnveuyOtzN-p{kcnY!u{@WO$Yc(_^4wxN!d9(wX?R
z11A$L@l?_UKTAPNhs*^WdedEa0)}!(!Am#>F}=x`v&lQk9)l#piW&BLH!}2kAbMXu
zn&~;nVB&d`N}kz;B17aTX^m%khAiz?o_mgd#T33jXZedSRsy`u)0bzn?N|~W7SqG?
z_g~tO)5Wf4lEmY@EId_6GH`58;V~boSqANQHJ&Evro9}T;ksoWQCQrs2<jU&j8_uc
z*GLCUSoN#cgbue$`n6QB!z6|NiL+j7-dtbs>jgPk_sc&1Z*TL-r&!f92mV23W+=n&
zEgJbH$4x`uFGM!P0p;`i%lI&HnMWq&Fw>1e!TF|M5m;4|lOS<lrStE2qP_Ki&$wS|
z?-XMn+M1!yi_Gj&Mfm1Uc-8)D(J4ch>?jIH{dr-RD(vXRZT9r9h8IN4{S6=YDNpt3
zLJ~zoKuf>=YB-C)zjAsGcq@~8G;3NgZIt>~!)qY6mz&HtjPI)x47Rg-koH%9HT-pv
zRZ?Fl9B;GA|7xgSLZ#iBA3%8-AUu)VCJAq3{HsCXuTG@MjphC8UV(i+{GU$!HBus+
zf32}=*V}jSPQ$l1Neud$0<Ucp<pRS{6~>g@V%z%F>`cC?1gI9jfFe<XXdS<Z-LgLZ
z!&=<jeSpKsJfgdj+j5-cpUN};9}6jwC6?$<t^NSmx_C{#ERy-~c#i)Mm6cJhUlSM4
zDi8QTkSqYw<@L8E{B&eYTK5N<!O;pF>A)5Uuu6yweOQVB3Bg1E7%eqo!f$OdT~;{Z
z%Cq1=4%F(Fh{plq#p0$DzD-IkL38zYHA27^8>*=;{EB$y2c!&EWuFPVR0)`YBt7*+
zVq7_RD!GCSY@(Xv4~W0kwbW@Bo+C6&a;HTWAz2T}DKCUsqQQ1{d<V;88t9sbe!1Q#
z-+->suW1Z_e~PJhUG1QnpJzK%adgT3ipp<9lCZ*1X8+>uSH%4RV$hpB!Oo;mz?JQ^
zcE)Rg<!mzVS(XEyE|Gxf27|m?^`@&O$FloE2t7z3D@$UEYcnT(@=0{^E>|A<9t(yL
z^p%S3hHyzGkEN3{QjdvWF!jtF6v&B*-%M^2%|t0h8kB@;O)vmZAa@>z1j4#K_|=nn
z?$(Q`?5BxS+B>nEa1upIzLRj}I||3slYhdt*V>T!m{w=zi(|V5H=+oYS8Yls!q792
z9h<a&I%iy~TFGsu-rzv(Yzu)mB>tOfSRM_%-V7u7x5%8oR!plRf8T$%SpBI|;qC%5
zs#N(GVIbor%9L%6I(}piDFnt~%JHZ%lLYvev5HvD6}+eaQP>Di@_$W}<uUqaM}-5+
zl0+xr)!V5*0A>}2^lx5y{MLC~W2v7Q26iCR21fr)$NqzAU=;edZ(U#NKX%a9lK=Xl
zfBSl^=E_cxIQZ<}$EwaY!@<*CXg(kaBI#efBmXeVAxO#IUsL{XzhJ-o2dVHf%|8UL
zFxNg&mM&=yo4_l1{{FecdQ>iA%>vFNiDAeeRJ6;r{Esl+tFg%SJ&=+=dw#Fr59jQq
z(-I7#EpH-*2cM0Vl>Trx8p9)q|EHJ>WmtCQW+|QWdy<^;Fte}OydMN{e7_h0V?<cc
zNuAgMlm3IJPoq|}W@^?<jX^DVEKXQtua2+jUgZyX>~uRfOV^!(e}FBgautzD*UaA(
zflu+nFC2{YVUYPzt{Oxs2-3!98J)cp_C=i^0lHk(SLsdE;USi&7K-SFLcap#BhJLz
zmS>uQ{&nu@4NW!Y9M`0}Q?s?SGrmjU0Pw^+RQp+!6|^)VY(iyBE*#@$TkO=FF_xi7
zHi<=sYyT;6xRo{s6aPa?gW|C2WS1*&w$zt(R^J&@+lDSRMFz{l-p;?$j$0aZx#W;m
zUmjJTvafxd)-}f-4}X_8Jy|EeI*-YP0##eTBVH)+*%;)>X)Y6FkW^8<+U3f3BSW#D
zEQv4x&_S_7Lw|_78cGI`!KVN8FbZ4&Q_@z>&po7jsd`_~%_*Z4)ES1Tas}^Wy+axN
zhW$f);(AZ!<+<8IA-zMkRFR>9Q0|0K3J|C^>b!Z>3BqaE<w{6WCK?AH>XF1-D_55&
zm&8>K1XR8#GrW3<VS|SXuk_0&^<Z9C@h_zY>UZhCIu!#ckxHH1e#ZO*z~)Q;iJ+Lg
z+hr7XWz(1oZ6g*kuTNLh?<8D#sIs-AmCf6It)u&=gwf3)$vw|PIHceTJfKtaHM73&
z#=%hl8nHQ9^$P*QxEZupV;K8W!wB)s+Vl`Xeq8=OwUE~U_)k)9T9CJqtiRp5A<%*L
z)R>26_Z-qL?+T~e^bgpp$?sVerNin{uxcNnaV=keihZ%5e$Tf}9c-Q=eGap@)y4vj
ze~n^dem%fMUb3RVEMShg@xq0#tiDUHE`q8QOuN~@Bt^84AiAo&bjXm#c)NY*Wpv;`
z9K`HPqtwks_t2EiLGWDN9tV@_*TL`SI9FpW-D6_29!8%;aCymDvDn&y2yxn8&ysX|
z13ao&LKVB!9|;NAQ}X7)*Md}{jz2G7rOx2}rn6S~rRbJX;XOCzEuPrt$#bzhPceMD
zvL;}jZpZTL*1?FLlu9vLX9G~1(yc4we*sAeS3?1<wUh>_7Im#8W=sw=y_N`Bdlu=6
z$|2l&b%TejFNmw^*!&tc|F~~d#V1WYW&Tr;Rj8;<nqF>Pr=1*;UB_jI%8PwPa!n8k
zc<Ro;yk6RSZ##6pSK8=lUh+nq*8t9Kr0)X-(}%A1?y4!Z&#TC$@O*XhA*&;6Vm-DE
zq9R>bBNk5B)h&<0(wzjv#Y1BmNkc20tyZ{I%!p@=d1S#C&W)OL7VpmTbdtAm&^C|-
zZBb2YWRe08+CQJ#rjI2i7%an^SnWcbT*f}VDtfj>@wgz(0%(ER!YhbBqX<U>o@O_0
z(DA*+r_ibsc1d0}rmuYV<w-iq`Q-beZq)s7AB249nnRiBS2l(!V8(X1y+QE3#K+9h
zx+*&WRTZJSU2~uOv);v=j*^g@4h=tHB!_@yk}fCjYs+iKunBs%#ZBj>TFjI4-{a!!
zTzx50ePR!{Z;ZA2cTwwE`HQu`kc}zGd9x$SDwJ2uTr*sEeocA1;+1tNAMqU^#)!Cr
z$wi0`0g$+or$1TK=~g|vonka<^2Z-$Az6JZiHnb6A)<&W8so^>afW#Z3C}6ufD~Qu
z>2R5Z?`)<TsGa_X2T`+K{B+ff{a)RVYT_zVE~(7mr$o>%&lmKn?Y(Ucbr*1Vuy6L3
zd-!U4!Ypr!b!{5gD;TXZ;$UMOiASs11^od)?aE;x1wmT*{`sNupX`KsxHE3Q%KY77
zlCM&gxwTZ+xtC^kz1fw~>y!_iXl5#fMY>6u)DlfU!LdUDOrQ{><|>Lp8F88}|L31s
z?6AByYRdI7tlG+a0Scrt!M)~CH9cjzxTR&eVkgtLbr7D5BvW$%anM-<)G7lmg(~%3
zs&Sf@d^Hf;9A6e<Ex`34y=qQ+_p6V#PHrKxQn3iBrI5jTk`dM*VgD9-_3q&20(~X1
zko`+T9@VEz=LvYqzF!H&pzJ7g=qx%hFPY6a{ia6F?&rjDou>Ni<o%SkuXn~J^jc;O
z!A=;OHaN6F_CJ8Q5kxrG&V<}pI7?rX2zv0})k%Jt*%DdnsldfMCiSpyDUe-!X~D+g
z*Ra}XR>bt^xr)_I4PdM$?6d#;)OANla&4m#tln-p7SiyYHlcA5kzF&{<F^?p+$MyH
zp<<uKyiN&}L3ClxMgaSG42y6ANY+Jrj}okX0{08;*NR<1ZYG<v6<<^NT6jZvH7Q;~
zj0Tcz+_)|F-&s)yr}ywv$V7O4{vQ4`BEvt^WV6$#V9d1FQbmbuS<AMHO?tj2(t#TY
z94F!e#2;4n_6#zTZ)r4r>h{-H6Tr<lc4El9Wpy=QC??-lPAlIcCQvevQ4x+|Wwa(E
zW1cC@ZXP^*9oM5kK;9up@8^1b=vL0`KGYT$lb760?2k*PNpp4{KPI09KtU$$Eo{jH
z2=li-a+353yRL0FW&c8q(Q0~hHj1_%mo`Ohf1%5+N(Msw$nI)7$fxaSaZu7(CR6$H
z6kd24WYc88=J!IsHfFAHRZHBt^|twVaT(O|xI&D)kl&AV@Ppg?X#+JXC)QK(ca+}e
z7*wV^Ia{9a@}pL5ew&=J+>RqII^cSUj?c}b!^RF8l!30kH|Zwc&}6jy)JU^z`4l0J
z-x$ZkS5e)#Ex%lw(~X5z2Mj5RRhGx|IisHQPkD3WGot-=D@Y<k*+=AJ%76a6gN<}m
zL!Fux|5$zUjeYM$dIqN@drt`g2~Q<J2wsqs9t}k7K0jiNY4l#>Xj?y}nCIgNEbf&<
zAdG7_?Lw>Ud)*%d;w2S_jWq%Th*70^9Jb!XbD?A;j0<?f0xdrx+=|Gl%?%oPlGV8F
zZ_IzR@N|&NnTRe37$xmCmm`vl*fU0ZoJKld<MpY(&rW;)AW4`ry81-VP+tqU<wb|&
zNeaVCzfV=MZRwK@+RWpy6VX|_5ezP$2qK<cBXGsaAzR+(3L@;$!Dmg9Jz4<fEYI{6
zS4Qwz*#~Akj|wzTA!9e8+vqd4*e+-JyYZi|JhvZyS6O9t`3u?wb#gbr^Aja7uoLi9
zX6?y@fy5s?(5T9xbcE8M#~QZ0s(QT|iHubi+uaa#yU89NSq&j;dI5R`j%WK|N*g=_
zi1bJ<8&^W$DGQ1ra)+Ua>~yy`#79d|mfyd>eRdg=(XijHANdxGTC3_VgsXn)GsMi*
zs5hb{|GeUJgMgO)l3VL$O4j50@BJ=%QI*r6pyiZS2cDw6{w0PYw_h=f@&P?!_v?+@
zy}W^wW=Wuufu2os&#Y8W^!vjgcCbFjdu=dMjsm&)KH3@S#*hFK?-VZ<I6+i(;5XDw
zn|Xinah`0~icFy1sh51eAN>+j7#q``MNi-|MF^#LDTV)=f26ruK;5h7g+Nlx_Ky25
z*^0`TmjRBuRP>m-dSWrT6_>`~Y1lM}EsT9iTZ*Wmsdnzh?A6WK#pRD4-qSEk(-zI|
zA;FnmYoIA#t)~0!R?x=$Df`=loCGQa+F3K_$jRrub<Emc+N?iQ?0?1ps<f;Yxo;n+
zkT%mUYsH}mx|s07&nKh2ysk8NAthh)g}#zjn48~Dn_W+D={XFP6$Gfr*VFw0aD`we
z^iwx|SVJOuizpI1?lFID96r=C5WF)_@*k7x!JtSpy|k`KNGf6Do8BRK=@UJTGI(|e
z27+7{R&}^^@bx#AAM;#X>GS6WE{oeJ^P-G4dyR_hqx~KdYYbJ4RTC9y$<Z!lfvX}h
zLTR;dFh^rG)p%b?F~~RZb_Alk5Y?N)*C*NDZH1UFsN{8Rp7<%0b$80qSU-~0oP&BH
zNw{@izLfOg-V5mY(X=o!Rx4^IW!ry@lM^tRCCZnlc!;v9hz{hvoly!{*3`;cH~B@0
zpff%5JhfEcPD!RIUU8?NS1c?ULX>CvGZc%5`%sQy7P}V5x~`QKm-pttyMtl0#al{;
z1W7!j4?$Cbk$Dgg&9dZ~8KEq&2Yxr#;fv}%!_N;^gxj0>35^Zw*@??8&e-t}LYaI5
z9I2EBAJ|^Wze%!tH-;WWWpSX(6>k?PoTYHj$!-6mS=)Pbt;0j%6W*utcFP;h5cF)V
zsi(YJLr>WbTOP&TsuO(OUlYn8CC3hG7Y6gOd-(iQb`|RN5o@jI5<1}K)gkuTT#l00
zSBh2idr9lEmW1oo%gefa?U84ucXF-7zLyzYJ9&<R*#;1mx=~b54F@vrc;GC+j;c%-
zg@~wWb#)Jk8^719D^wbBtFO<KS8p#ZxAD(XcRH)bIlwTj?Fk^)Y>6-nbdY9=j3cGC
zf@+tWkJIUTKeu;HDR<rRA_F_j)NFlp*=;N{-x4_&q-0n&SfCG#;#wsoC&fsig@{1C
z)zQmXJR%zGC?QXd3t*u^UJzoJj?58C?jC`w>>iQyTK>_BjS#aLxgU*hHD%d~y<~kY
z%r>Ha^FP;-?lAT4shI(Z+GcK~*P05>9$-#C84{n*W$&&n)R!VV1n57(kDwzETmK#5
z*0Jpja>cJN>vAu|qlWXX9>3^3cl0^T3*y3U0FEYj5LE3jLocM7Y8}QHvfVI>0!%g-
zDGA$uYbh{g_uE}>EM=t1eWb8WAmOoIV<+P|dm^1s)uPY2;?q}-Aia_~`k`d<Zaro=
zrODjIl0vLwwLUIC#%0G%A?FEY3LW_}e(4@NLs<%`No`$0i@*qF=_~}!TPzCi^tfuc
zqI7EVPI^5q;z=Ma+W@*acit(7tWQ5YPQ8FYbi|sSiVF6Bi7oY8ttY7L-vxo1G+VwH
zgv^_63wbiuWrU1>Ax5PFS=>#=ikjmp$6m7pV7SCSP()f~!pyJnqHnz)+PXNB4a#IQ
zy`NOcWn!+_R}aQ6J@D-BGn$K?YV&`5oLz0y=w!BQ@)FBa*PMQz?MKUIbPX=ar5nZW
zcRZorUXliY?65x(5pk`Z1o&7EcUJG}sdaoC=xzv<(C$&_g*_f5!Go{QY+KB3H&~J(
zy2A%do@LxwdqZT|0w;hVcqpA+Uy@g*v6s1=u7zC1ZnhWhimaVXhwX{;-rUcyjEt^^
zjO06Q&{>6;@>F`m<MzmoQHSy~<aZW-s{}=}ba!`3?R=ix+nx+B2C{=qlbl@NFYy^a
zQeZKI9zrn=wQ`I%yp_EbRjE5N{QkT`E)#ls_AZ`s!j6<)5mIevZ2D4MX`==bIdUD?
zHUKn?=a4?TGqD?fL|%Di*>^f~_2*3`;d`ZUJIpsN(qvOO+*I#Dx_zy5VASV$*x2)Y
z0}AbGK=Spe8r<*6V{!|6&#h=^Ip(>)Lkw42T{{CYv9Q_f!7v;SKUAoqNCFkMUF-_M
zOP<EFhN6zS;Y8P;EAW*siAF}P>*muh-Zf}Ho;TF7eK~+Lic?z-a8j9tVl-`Bq{qM8
zLRyPy+}e|bZ9TfQG5!EJ34@L@XTTwS<y0jvdfssWBt*#bXJW27*q&>ts(t?SLdwsh
zcBZ?a+__&Q-RT5|uz-_Hqs?%qM(qc}wf0fPw{lXc3Q4SbCw$C|u1gw8t#iP1qMc^5
zoD$3A$L-O%Qwp9x(^YuCFzNG8qgDZw6LlvO(92|AN(JvNhOMYHx$!;|PwY?!%eH3v
z7mB&piyhNWjLCRjmN}I;;N=-o>|<CO5?F7^!nf?uw-K}miK{t*A1R#fml=>Qa(1V&
zF=<exyF}~U?nyR=SdV2FlJH+Idomtm6yx?H(P6?>>r;7<fjmNp4Lk3<dB9Ad4seVV
zPHg!M)z!X)1HVifKui!}PQWPjvM)HRpZ<KkczTReDv5TA>fI(M4o5{xK?P4<xkrT%
z^-#S26Kor1tvAZv1b{HgBmohrzztceM<;97u}oUVx>kwL8lpz)y*c?w8ojkt(^BNS
zG|~*yklfODnYxCY-W43abb4q38qS?9l6_)zKTf4OJqg0`C#QPjBY$SKW@c2?DxPo;
zmUzT*5#YBE9g>SZ%`->;(G@sQC#flMtAiV~UsTk+3G+<hYPc+FGrnEnJs)d)jtXhU
zdVJ^cwB?gYJesDuE6ajBXmfFPS0+Djv!%1<OIuYul!+6Kth^g+!#s-HUgnx;kx$=f
z<hEI}{Z{QdK8Ir4-?+PA%KTba&J2`Wp`nH$4bbJD^@Ud{0EVprlkvtjR(&34^JO>v
z4f-G5xDWV#%xLbIuH)~_V=U1QaWJht!*bMM^3K4N(I%DT7k;`j>rsV5^Qd_vIDE2F
zK|;p?@*#u4USJ$uEnkdgz2yiLeBM>~gr(zz_)Q<?Ih$PcstEOU3J4{F?uc8vkRz*w
zck`mP=JIZi>)Fo}$P}-ME!;kHL9Cz)i;LsuG9;@pUl-B8+nsGY-rso6A+++~Urw2k
zOxv66d@B!x2S%QtG1aLED;luG5Rp)oFnJ@P*>f6B-)s(z)(|Z2yybBPA0&Lkyoa7m
zn&}V+v370v63bWzw4A>~gPkRI!2}ribht26-0+(N^S`vU->!ACoUqf3NVz*0*v>Yt
z8N^F*6J}6J$Do|C=nf`(-FcaI`!9zbB+>r?n7BJR!MVAgV~+3c85d5bll7PeE?D?x
zX3V5BR;QPOQBq)3K(LIQL}uy}E#8v=YBNF222HW8E{r)NLmrh)0isvboQX5t%UYIl
z_eKjjPlmflFZQ(CPXy=$S1kC<*$(cWxPL9X>E)rr&W}^h>WdbR#?i+HPyqoVta@SV
zWBqsQ9|9a)#fx~oW?O`nj=`&;jh2$6WOxAoEN*QJxS}!>H44hzhQC`iwVXuf($tKg
zddEv~X?Cd>Hcl<7%gMz`HGSHLS3Dg`8cd=oifz(w9N<HV-BIm8BrxPC%A}#lwYP!#
zhsY_!RK1_I%a*f<Z`YQtRja^v13X*{;(4M4-J^whDMj<jq+-%Z?`aFJe9z8mn_f(%
zcWhh!p|7pyX_2#l&n<phc)~!v5`wh3!7EMvXB7DVml0jlJ(qy5MsMjgPxa>n1}-*^
zYQrzaDn&4j^DSSjHBUgkuYS>N?(O(?@m!|G1ssv}A?JC3+s*1gfZX!O>&BNdIr9x>
z`b-WXl^eTeKLZ4dbi{gp)IU$D{8CQ=pQN_>KmYvygSW-J4oRhI2LG>6Dw#IBLP3u%
z0~iy)<9GkE1EZCfVlHOS`L{&%>B@gKUgjcINU8B(li;rr)fD<ujr_OKuKsIYwEgKo
z{%;(PH8zt&NGV$FR-{5EaYCj$%pvrHMf^)c^WSDn?O$_?Z|F}+^WWxO@!uv9WcE)R
z^MB)TMvA6gVQ*vi!Wvj@ih7wEN$%TV<>9wXWzcFd0*~!BguLJ7y4qho`s<8E`{5Qn
zzBfa=ecoktH6GJkrP1Tai)B6h-+Q_L&EEaLba?GQyEj{(&|}4^BR2<**6HvV7$&h}
zfKC6GlHKlKZg+)xYk0V*9F29pHhVm-_uWcuay$n=jP*Dd2}}CJXqnq%kyuq<D(=|M
zQvBm`0?+pncI}2cOIfPTF_O2&JX^-)Mil9LnW6D>)ns(UE?I5CY<pMwnx$kBc6jF5
zDini`V51~;QmrEhZ?S%i2rdEctiH5_zvJtzPLF60y>(A&|KFlUcHcsK90hn~R7dQ0
z5r*c|Eo>H%H!9$oPH+E|0Yy@d+nhejDk2(?PqMVO8P~MVvJm|8ZQY_v6Qz!Lp1X0~
zd7}^4PfujZ|J4HLgt-0fp9w{th)4mDFY3Fr@M-cM3$UEylnRM;0-VP|&kl}G!d2s&
zhGzpHr7AsSBF}R=ul!Mi=U8!x&^yiy3*@tRqHxVVY<0yU7B*G7qYRBE9JvI<hYDq$
zcli6>x|D6nJ92tk{p8us(LbZ2mw@SaDSVmI3+(j>6OOW$1d@pW1-aq`#VUB9nAm%*
zBQEfil8f~$kwr`Sq~w-vkJPMaA5w=l&r5r{3=9<pt{(lp0H~oZj(hB)?zh3hL(hDF
zA0zJ^49@KS-K)L)SNz*W-<;eZLT8+Z+*_Vj)@%!Sg=gIvg>EYluf5=T+perzDOPX5
z6uu#k*8<6~*~&1_@L|?Q>1U;iz0NJ)6^b)k8B)^PB?VvAJ5sME!J{g+g;H&IW{`&C
zTpZvEvm)3J>72&^5F;5t&8FS(m3D_<=<3I6m;j@D4T3!R+>zUEFSSuZYaQ-gQ9!m^
z;)DoEoeV7dR0ylmt<B<lqK^tSV3=6sPNDF+7biJijF)v#`{_8^(qUiCPr)&YIxYVP
zzz23t3xB6bD&or7UMb=r;)uq9Y9T>2<Gjn0XFKwe!qec$u{h;Rf6*3fAc&V|cm1&E
z7c=+!IWsB!rRk4Ra`Tx<88I0?_@WF5wPZ>ef&5<JR1GYKm^<D#7XbP%0m&q`wcCMJ
zlWD%Z`_tmr2!U&A)l&q;hP2~j9tv%lP-}`_0zl_YnQw34<ePYboe2xZ3MF!~;cDYi
zvg3I?cUpmyw*d`XYLzWH0lS2rJ?83Hv~}X`)y{-c94gxQ+73jaClt1RS#ouHLfG)S
zeO~_Jin^8PiZ;0LTY+Q8wYPH)XP+D#AF|XxY<&CdbSjBE0J`|}Xy*ETJFC_z%{8XK
znufK4rnH{(U<16o8ow*rVqs}?9Fsk@EgR@_^wn7!eY3DiBY(mbe^rK^8>F9$u32a-
z|M_0l{d^<yi(Us8GW0aB-B`2u#)JJj(X;`!)Mz2{G9aeAN!fQ+u5AAWS`@&O8z@;#
zZ8%=;HdfiB)l=g(eI<K)FxcQ~2Pd&&e<jxCS>=|mQSUc-YM$~L;YDuR9ArrXsZLE*
zi9(xF(DQL$W7^8}A3c;MVe;oj!{G7<;H+;n^rn~eNsPVMeW)j(#<`d?)@z9Nzdcja
zw8<N7STk;1F^SE2LfZ3MYsIgAmL;A}{bd!413|u#8CvzNF)|1sB<1+Vy)5TB{e%m`
z-XqYPdq>zIIlPR2{qjVoQ<PF;f{apEtIt?iIu;Gv@D&2KAj#KQtX;I$J=a^ew6=K~
zX4O(ptrGg&&<pRRnfKYohvhEP8PGe~cF#_V71^cx7N#V*%&dZm8NR7!o&K$gN`_)<
zL|cAoWE_Xk_?!^Gq?l06YP09as0-Sw8@pl8*V~T;j94%GRHuxF?1vf(HKo$M*S2f!
zGI?xf0<pB%JK+~Z=!z5DeO%W}0iuxm%&92*J%0bkb#3;hDxFf_M%VL8J2B>2TeYHE
z$xe5DQF3%`YVLSm6p((xU<JV7`uUW~`<P00a;LFV$8JqTSe1)PZ$|Q3Cj96oM)GOq
zlz_|U0gFc8^Zu_+=5LHWR$Tk+X#GU>)&_2d&Go}!u6e9Q!go-*vgdyQbfN1Rh##^1
zf-5l%T2y(0_?MoW+*-7VA{lLt-Q+a5-j-h?TjFu9JOE@f%?%|>Ufp2<Cn%p=lRKLi
zJ~d0*IteqM3wG!@WiMiOrdL}phO18V100r#O`5NQQt(V}c~{zt>YzxeT$$x}d`@lM
zhVwrF24!z&Al`of&bC9mH6()@9NM||K5D+yd-bc;^!uh`h#lw-wzEGk2nk@-G(QiF
z-U=dn(K5O=LSLK0ZvxLr^`g?CP*b5)HTH?AW~z?_nv4set6L<zabX`Tlao?ByYS+l
zXISs%n=q1}Y&;P5IJf70D+wkKQsjiZScT!La4n81XRp?x5EO%SO?2-1c(lbHf>*=!
zv${8*i5lN#^Kw?+w<63{P3k@Gg4|A|l}~raygm=OF3jW`mlo<f&lOvtIW$vQG4lVA
z?h|ix;~D#c;D%N+^;UslQVHFg^>dkey243qPHa+Dw9)8gy7M`a@?4NtO8&*qRf9cR
z@6i^_GJaKcP3{<tXsFnfPunY@(yL5!B)jt`_3oA`JYOLdToK)oxF`sy*8WZDez(Ru
zpecLP`ekwg2|4^+xAMvR2yW5(;j*FUE#EwT<6ImP)>@atV&s`?k}1hHd?K6%i%2v)
z%EHl|imqkTr&2_#*_SacPuQ}MWp3=X8Np8|qY2=)*$edwM40WHEjjnq-!1t_;1y;l
zj-C=7Yn5U0L<@tZ>4&XRQ9|mWxj*vn7Ujd1`I%+vT-m2QfEWmBhJBJ(97EIqh)TW9
zB(*X%eXI!k6r39!fS*Jl47YT`m8bn?Tj<wunHl9}b?y3z)ul(Z(EfHT?u4D9$H~Pd
z`;|y$$Vlv4l^uPf=nqLdORejdIBojrzKb8lyvOB*P-L@6O)7=;@rU*%sw>?#mKv>H
zD>AhGtB%2oE$Y)?a&=A&3Oqw@yv)j0ok|wpn%pd9>nb$3qMEnUBDbYbOhg+MX33W5
zKzLX1b410FyOz}#i=E^O$6M?~Qi8J&7XT^@6;j^lSvKz3XZt1A)E&QM9*vaE1Yek~
ztVp-9eKYN{9P8;Qr+P+XLktppJsFzGj$Jj@s<@{DN>C(aR=2FgS*?vN(h$5p+DM_l
zZy!K3Eca(^dBu9yoap149Xw7anSJ@%*c5o+{<AH}dDor4DyaOUtrArTC$D5`wrNI;
z`?)<dvd*QBx&4%hOKS{;Sm5@Q8t2^>jq%I(+5IyiTWRuj5(~*1zeZ0x*k0RvmPc==
z{m`}+$ul&ViA0H(v{wY6D-Zayyj$#lez2m+r%4F1%xYK)P%7&3+FJpCFt&2G$xF1+
zuy$M%shvZ`d9H~@wvUQMOf)*9@-1LZo_0TJeYa;s%xg(TN9A}Ut@D(hVg`|BB2YE1
zXen;;`hd3z3ZE+L(Uyfh^PRgF-fA$UX8YFA9~8iOxBIiAU63X{i$=fqlMb$NM|r=&
zO$e`Kfe}Q<AeHYU4-Ss!S-z8pxzK!teFZ(oW^@?E2U90rx<Lp>9uBHq;W!Zhxn~&<
z#qh6Y2=(xIb|YLJIQTBRzuITc<l(kA*`pPlzI2nBNHu0DuBVJ)kD9}DK?Jodm~{sv
z2aau*zX_%E-;zAIi`<Ayk2-{G#U<wm#ElKLYO_xnvJ5Wi*BzKr{8(Yme7Rp?QfEI^
zh_!yMno%oNE6XXz_<fvGXI-PA{VgqLL1TE?+n!Xp)*<fA?_2z#+c8_W&$LBA6dI#q
zv!PcEVisq;uIHp2WjtiSD&}cx6r^kksY_vEj%bcCEA*D^H@gX|nY+i?z;=P`HcPjh
zM1sU{UJHeA9<${;;Gg@h?qN(LzDIJ9CdAe^@n^SpCTEk|Hymen@z%e)sHG#PGsax3
z<Ti)@Jy9j){rirm+`r6HR$;$?)qdBxSPg8+iSP6O_gV>mWGbY?|L#=ChnY$GK}zhP
z39O`Vk?ZmVoq`&96AL{P2xj6mE!2v0)$@`JH~1)*4gI0DzyUcrIuHPm(`pXsOEr!+
z8364Hzaq1o=I7?!j(@Iw9(10jcGIKuwf@WdZ|PgKI*t$Y+>0L4hDpAGZv#CzPyCCz
z-yzKn1eb5NCC>FTet+DE_4y@$d|EZUjc|+n7(nRhtx~}&rF^c@rK43g7+G>JJQpon
z!3qBH9e_dyxGL`}kRvp$4}9{H$iMP2C2{_gzgjpFLn3VKf6(@pL2b72zHV@*NN^99
z;O@`>!3pl}?p~xw(ctdIgF|tr6!#W)iWewQph%%_`yS4owfC&E_nJBDd^nlOw<I&k
zGn41OfA{})U0__ac8OSk1coX3Zi#bM(Pa8}^KULU3#t_(Z%&Dg{jnz4z*)a0UszbL
zLd1z@vsz1O>BQEP75y^H^Y9V8tda&;U&Qo=!!=7krJe0tGAOnFR+KITFE_Fq7=I;g
zJ?eOB`&w&|au3!uGR)}v3C44cO2JC+wl8B3qF;PFos`S{?$EixVPQKTc$~MLN<@11
z*c&Wy#q$>R7YQOs>d*rFE?-^{To-V(6!a09ChhG#Iqtpx<M*)e0{KdfQC_y~ahAgV
zHivCDA5(js-%ub-=@N=Iv7j}xy1kq;bnV_}pBVo|eT>te_0?x_?*px4tHJkIhkk!m
z_cr@@JHZ#%^{NepDmE$XAzPA;B?i3ITeRmwdl`Ed@ky2_7VzH>UpQ2};1yH(o07W5
zO+|_<-jhL*lM$2^kJ0E@>(qaPLTk6Bjm$W29&0wKsxFq@Jx7&=O}GmXlz;L?)lK`3
zB9lPY5Dagom#H#mc@T4Y^XaOPev6*Ric@a7onJh5yPuUfsTtmZ0yfBu5}@P(^+8KR
zq5c~d+WC_{{I=LdZxZWwnV8_Oe*t$ixX&Ly^#$zw3lMm5vL%SRXqfb=*hFc3M)Vop
zOL?qsIO(qIyO@ZZF0to+$$A3{;#jZ{<eF!!@YmpBY+W79srfrw(#?a#e_?fmt_QIY
zlVC?hz=$Bpvm7y~St0NC1PST?Nfo`!Z|1%%*69$MG2#xXRyt`alnHpHTbU;>j#-|d
z(W|l9DsavdUnhG+2SUDe)Q!cg`xn6aNNpzSRpsd_9W%Pq9IPUH-dU2|_Ag*E+JtHv
zU26hEgUzSao-vXTqz#Z!rz8S=H-{j1P2Ljt$@z>g{^4C})YMhK`xl^iMPnm<v?O*o
zJE=NV6WKGvQkbS7gfk_o17@RlY`BVfTg-jJ?$IjaA?DVkc+Wh^L@e!kiqDR3roEAo
zn^I@mw5v|?_QY)AYFU9%&urX>Syp3G3xcra?B4SynUE!}!3$>`?Ca?|_yOx4-(Plr
zGCqV>c!d!a2gs?TM&v2s^bsD4@sC1r<?;qTO-1k*+Qx=+Sz=IoV~v<E)RB|dl3#r(
zG*R6N*u|6)4qCf32eFXF+ncl1)OW|HET94bn#=1vPPcCqgtYp(je0>M154jrZ4>sF
zow4X*x*T=56l9N(9t+)Ok0afz5UIEM3WIb@n(j|@!pB$0onFnFg2#$Z{Eq4%X19FF
z%?C;E>@>Y-2?d7&?iFJ>+BzhoFB_C@kDk$rpt0jf_Q3hb{hq(JV5u@VU`dmAubl_W
z@N#p%T)KPii#c;;Ib0vIsF$L>E{>LRRrzv%@i%?VtBI+0PL4E(bHg24m-~dplV`{G
zKdg^dLHNcn;pvo9Xk15cRB*oVg@MoQVqdyva#g*Fqn|NCZM`r?4N0Cq(bUfR4W1vU
zvQC+7UD(b@WF(9zu%HXLG}(zHEb?JT^`PeA)5*IlO7v@ukWM#o2Pv)6<M|(`#f3T8
z&3sNjR)7`3ddW5iWpyGm%+V55*_cK~Siwi==r6W6?)EF<zCdtyQbw9~eu`2m^;DNz
zJ{eOW7?!Dr6ijFIrz_WfjNoJTe4{FM($T$p`1=0SMu6=vQx6^)5gtq#Z8@rq{5Ha~
z)pa&Tur(=mq`DPhWcp3rKSq@+xkY4%f}pWp0SrYQNCLSFxCbpvYJxPDP^Zud>Glfx
z0}zYV8ttukyFC6z4J7^&)3YZPUFuxwa_R^gCsmAq<xn|}d{`JMVZ)RJrI<uSv_aTw
zlLdD5EEeoSH+A+3hah$qLnUAg>$ETM7^1_UqKgt5jH7g^)FcycL2io_@Dhk*%M>NZ
zFP$3+I4hQmqWV!3<wf}5+fJ|~(^qY|d{XhLFXjy%`PhOk<Zz1KKB7m!9Z`ytHFU=x
z{WN5UHX<z`5ze#rJ^ly7@mLi%r5P#Q_6PP|MY$z$&yI}57J~h2dpU*@8=o5yUDZUT
z02R?_(PDlckRji>W^7v#sbAdcviD7^CT|S24($UrE8Q5a$2P!fO0Jbx@?g7AH3+2q
zQX<a`tir-3Dox8G+tr8@k!Qz$rG7t&RsG0bla}hhgM(fmaXkI0e6B}b?x>C;JzX@U
z>}`%GeyY~l1+2^X{__Lfq0!)b85Wle{BH-lbRWSM9S(cnByDOKF-QsLV)5ev7yKWX
zR|mT=^HhgKLtEIHEg|H4#OWSm_V^Xvr0!^h2S9vnQS~e(R7SMOTFxEAh|GjA{Dr%d
z4VF#hB1A5&VI7A|eOL!Ya~aENZ%b8Xk`N|;7;4tp*yC$9Ihy|bqmnf`1#wJ5#)7Rx
zJA#6bNi3E(if>mn6e1(cBh>h|JN*r%o8JKhxax4lrmC=HaX4l&E$URj>Anq4BV&sB
zG)>Q_4Zfqr<g@<OzEoK}uEI(bm4R2orHT6isBBAYON+&dGW06Y=^G=e_RwLYYL7GJ
zNwEgK{ZHVovZTi|YrcW!j2{$5B5s$qgB1T*5a38T6{;vqQ`dNzlTu)6@4e8ccuBZV
z@<&`~-nRxfg3=3Xm#H0nXJII{((O<~;y#`33SH4g48*dUgoAn2gNuVPqKlI$7MHR>
zgdZCwHuNk&=XyP+s3HYdA)n^ju0}CtF+iX7`3<m!v^-u5cLlhM`+_T?33ztuQeP@=
zdL(?65wUt;?2=l9N6b7xzGg4jpcVF^O66mLzMt*wL`OjMv=-VGt@{ho$m1(5q3>x^
zAdQ1rhIvblp6~`q?fy11<pFD3H33cci-J#F6dNT)T0jhi0qTfic~S~hP}*AX<=)%)
z;CE?{DChS~I{Sb$?^DX-0MpLKAC-C!S;6q$cWeB}qSqW(@98paDhdte20EN>5A*1d
zI>p}+lrxIIqN|9UJQxflSfYF;9_a9t;~GN{X8G9k1Q7xykN}=Q6l}mtW(Gk0El%7>
zTjsb1lH8zi;^v9XV^I_KWEM@!x2ecUo}*?{E>tgdmxu_BePbJmTKE-k!_dH1JSyQe
zu0w6tif;k>_3<*=JClSX3e}q++OP&28wcLaC&PLcxduDuEjZq*3jI9$lasXb_#w%+
z3%8<AGUTKF_4n^#e@p6Jb;2}Zt%*N*C0lBKZO<=sg*!n>t~bTDlAe9{m&OwoW*%?<
zOax83BDFmVI-t4M{YTHhMedEKk7pq-@shH==p8MQ7o#@H-9d}7^B2iHSD<ro=>fXk
z7}UME8#e88(=GVjyN~H`Uy(Xtz3T8d^mE^bPwypjH~ByMxRAaLxO+wh++W{(U*h4^
zJ)rDTn5kD#s7#B|5o$_gZILmKw?TOdZK2!4oM;+49KvdRo$+kj@5b8RN#byr9NP+f
zYg6zQ{`1E}w+3=2LUK~B&Rcwz`8yf_m1&KN=oe?XC(ZOjAWvnc8^6u3+V{YrU#hr1
zqs4ie-y?Ry-ikc7oi?!e3%3|Jv=w?8Y!RIFz-E7<`$YgyVBKswVpdoI>Qn&Qpoo3p
z9=8V_v+-5iDB+7exyxK4KLx;6PnBtIJHbQu@gaTEeZ57hA#=a$$$^pLT!C=(0v%Jv
zrJtSpdjM2|b^wOtjfikWMT?})R689l3?Q(S=VWX#n_`(nrpHMN)cFGf=$QDU_0+wj
zVYp07eXH$jbk_#~H>y|6L`+)<+V(X)ef}q?7K+v%^b@*)Lo2}_2FLUD{Cr>{^4lbH
zi6S`_$ImQDhc1<*g#0svC-4%LcTKPzexs|lk0Ta?c8{&Ehn-<|b!r*Q{rFEKZwxMg
zaHktslt21@KXTVCP2`m}fcOCo>93m;Djy_VeOZ{ch}{-s@LATu>>bfK8jgm=Qx{P{
zVa+9du_{$<=)h+jyJ4|#&n~N^#GaEMBq|LX3`Bb+eClpQWz*`gJ%Ie<b4n-&lV}jE
z`<=<xPWLh9FG1H$7C%dTXMKVA7?6;dP3X4Ai^%An@1RjwL)`mUIxXyNWj0MMtD|Ou
z&ws1&Gaa3*;b7gM+L~;XJrh;wn5u45p0YpwGvP(p7FP+yLNWh1Qj$3+vfklAdS0|G
zHN6IWZI^7qGOo{7TQV@uG_P~Cfr^cd6&V`5HvU%NAOH2&kq=_4mpD>7os^Y7xE8Zp
zyZj~lI&$lzo5n8aK6Y`6xqWA?59TT~JS=WVA+Iw2NAbGP+iU%@g0uX&>xd%MmZ}fD
zvO>YCEO@tqZ8wCiO&_^So8n!B9b;{&v|--3@u%y<i2J&WZPjc13};D6d%yS9g&h}#
ziX-h3WQVb8`ZGswGvNyG7M5Atpi8g=f~{O}z0LvBACSjyG4=)=S`f;%zA0Eer~?@=
zboHB-NB;B3T8F3^Og1dq7)FO42`K2do+V6sqoEAJ^2Q1Jn>k*Lb80bo-xNFWrj>~6
zk{gYU%Ug6dI&uWGZ)&s2=e|g=FoHOG%w?HU08mCii3d71yYRqZ&Tp*W-`yqdWD5Uk
zUcTD@yYR=z)8qL1pi}Z!;~z2i_kt4=dbx^LAdfk#4sPd%;<D)M>9P7F@mOAdGFqZI
zo`ZNw0d1leE^jb8XXUThy$Veu?@VXsznNqC$+^B<US4^9`dW_b+2SmCvs&Y?<&f-?
zh1Gmg5{6aOIz`?*0Z%0~9O+37PnJhM(wx;|rTeep{{qaUV%jQ}RtFMX+dB>`$JBZc
zj0FJQY|yF`+?hJ>yQ~;K3Oet!c_B~S(ItmKQf`gK_%|!<e|in^FA_sGrg1bzC6skN
zGPU465#73HMI$))FSo=9z)BYxuz)!XA5yfT+RY*+GVnL<b~Db?g&>{F$tXj0)-<h)
z!X=#k%U2KN@{{}rtbPowVfyi4gQci?wuxN1KOdWVXe>KSMS|yTOm?(A=!F$*!39>A
zFy$Q`4mp%)k$B3j6m3*&KwgJlRRVkVls|J!yS87w$>x5_*$Vks{=4Nu$|axKVpab3
zEoI7P3I*wJGNX$yEhwytAAvxyxtD#HA8ygzH+kXA+xI)OTT5~#0@th^Fot)sT8<g>
zHbgnSz?g(uxt`5Kj&#m_C7{6c69d0`?=H;Xv=eRt@{3M9A8xd7SzNx#_22BNE>2J)
zikdWTG|wW^>Tun^cP*Hlz9$#PbokwIci%9|Z?Th;??HL2=hX}mK`Q7+Ah20LxbCn|
zQIU!1gbxCYJIhC+X(t9*^@ngV@hqW-k}2~??h=;dbAs&&6N_5fj?lB-(oo71W_@v1
zaAv<1S_sC@vOK+Mj2PA?ldB~;-BnWdlCOCRNUKX*FcW1KHH{2?^b%W3pI=Ksz8I>k
zO2wGxLnc{}^U+M^$dkz@waQdro9>(mH{R&cyd$v2HGxuea*KCGYnFingoA7rXBlyh
zMgp{={BC7`=*6Dwr+ir&q-{=Y)%n?R<r+nPlx+2G#zTKPl9rt;(l13HJ6*HS*~<$u
zvqOhGeObU1#on^wslGSqm;9RBQS7<f*%$kYW}Cvww5Cf%0mGqL9fKdmY9lIbOk|HA
zwu9>yVN*H#i?@H-$6(2%+71>l^^KqWIU}Qqlxr&*cno&f(h?!Xkc=qrFHeX@6Vf}E
zCU!qEBq^>kBJF=6Pqq+{aeAY%xu}_^a4)tP+y2~=f{sF-BG5@91xl^P_@lj~r344N
ze~Asa{nps)_ZU!av)$ZU`cb9_U(Ptz|2bX-Nh<X55kOvx`YCzFg*d8r`HK_x#|e~G
zX|y-XvJ1;?<_xU%H~#j(B^wF&;lRVrNlYI+EY<#U8SA2~H?8M)N>P^OkTci$?pvGu
zZ!JV)8%C<VOa$>aL38io@H({WqGIujMXEVsjjF(vELyl0rOjNys6yXZz0MWIfnglW
zN-=nmJM9kvuMN0zQ*3Osvx?$ux!U6RXXkAqbF_4!lO;J=;GzU@c?@A8ELbm7|Cd-|
zOdoNVU$w3+tGI-RDN?<e@U)u4&O<?u1iM{bq_z(N3>iX+L4TLjrOzEg+#hqHbyv?b
zy>F_+yBZK0O&cw)-JhOmUXWs56fuQ~ITB+QC|L#gfjM`;NKbWU!mYE&9&D4OhcFx)
z@K&4?)ixl>`Mv^Ff5Bpj6DnlF^=8ph;u!6)7@1e=`!bR*OlduBm{oP^j9yxh|F8A;
ztVG!6`s)`N8T%iXbiII2f4ZJtf7d%0)!=uX=f=rl_t{XIB8DlKsr9{Jb`lU)<KAf#
zT9bbB@+SPdDoXh#8N-D~F3!4BY9^l)p^G~B$E0$qZ${X-H+t3n0oEn}CPZ{T{hr2L
z9>R&h_qba-rW5WgKQh`1WX_!)%*imX2*lT8(s6IGh7#K3m2({JfmqQ<G4A41;kJrC
zs@s0g_V?y&20GdUzux`}aFBJ@{gy^f-9p}Om*`)S)H<KQ%)F^=B{LFF=#}<L7vRnp
zABigs-4#w0ul|rssXQg5aEsxNujD>maYV=Fn^+E#G=PcJ!I2CAaMljiNWDLoSZ42^
z<|op(_a(;bF^di8+%#{gflWJPGtq>V67@_yBzXtDYLr7*z$BXpY%J(0(_#8htY2)g
zafT>xd$^{!9(cuSRQ{zcX(LKfiCqi7MO7ClK%)b;Ln|#T#ooENU7Bmo&OKRtJ~gBb
zXa5QRtK8tMQ*PRl=6#F9(-%0<WX8<A!`?n7U?)bUzeHcQKLf@N28x<&s&70yk{DNg
zYB-O1m(NK?`ZJ1^g3((KuqTy%e3&JU&mjKF^t8N!9r$C_(*Gwrd3{r>9cH$jg3|@+
zBXeTd{#VM_0zvX-IO9q!wiyK`YW=Q{*EUV2rc<0cp*ny%PmO#%y))agUBaIw-wZL?
z7My_pH3yaTSuO(0tQ;ksAD>2E8jH>}|K>P+<|-;9*uQyw^-QAze)_k1tGC6i!=*pF
zO>9*^iZ_!#UEAS1nGP8gg0N=HD@6s^#K(Fu9U2AB?XZULwox2SW3%0QXpcOqbU+aK
zKx28Z)ys|?TFORi2lGB)KGene?J^RSL5d?U<1#O^=5e`*Ev2mIV^63zNz=oKAp*|?
zvx-0^fSed}3C@ZWje(L>tmSj`8zYJ;-EdKw9Pz34b6f`=TnIxy`VY+A$n??q=%(gB
zYb^auKcDt2S#K0o*UWVO3>pnqvSr&@UI&!f?e4TqO>!*=ObEHG6db9@k_s?A7M(DS
zl&S4uoHHL#HUv_8+MAxE8lo<y^ehdHb+;J{d8KEl$kn)yz79gssJbS;i<Q_km0B(`
z#0xV~`{u_#fgAdFEu2%}W0n19MSPaSNo&LW^_`kjLCT%>VY3%8Of|s)6Pfm4O_IE&
zC^IUjnB&IG6vgN;ATN^!hF^-T$)$si80)6oikfqZhF8y(FJ4XWxZ3nrY5a}ln=x@!
zbqm@#47#H$nrAUN){;obQYBE!*5v`BaKsX$0kELkWElf-9uPrq6Y}BDq?n#Gt>2V!
zIdBnF>#Tj{RyF{@pPGmii4-g+*Nc08@J(RXP?OmH*ih4%?rE}QYttLM4Y_&_guCO`
z#GqhRCVvhH$uA4Lh8`EP(C_`YA-vx6t?hFA?R=+;W4vKsP<i0&kU}=;&S9rq{i=hm
z9OQ-*$B42<huNlAxw2Xk!uxm9W`4&zyaIGri*fJvA@c2Py7~?>v-9_~{(H~`lJ39^
z*(%0SwzLk8I6{|jsGM(4`MSB5#al?(mP{!HAFa^W7dP0+#8t7IOF`AXg7i&Hl*X6{
zxxhDkyH<yFlKhW-da8_wp5NG*dE%WMvlf=Fn$4D=&XZ`J=VsJSmfPTDVZT-pQI+hM
z$7~QGk9o&cWVTN~n3@{UhP)yUy%D4-%CHxQlA{k*LLRgFl4MZ{ebZ`^sZ`AUirb!>
zUo##%I<9_nJd!&zomt&<#*lc2y_!m@GUB%k7hY2tO1Uag)2BZeoAl#D2|nUOCF5gD
zG1Z`JQ42Y#61wI8L8_x&_noqi=<uVBG5G|c(I2kgam}f+l}^h!MVI$o=d>CB{LST*
z(2w+Vo=X;{%{u=~E9~$Ly);dnI&q&}u7rqky>+4}-j#V{2N=Rc9|lpSZalO>61tK~
zD%&cJLB4sjyPznCPZ6bT<{k$y+UI>VJ1+p84{=WpOHchD-Y1#jan`k&pWo$PtA3z&
z#@A`%l!GaA&%p!mXhNb_INY|0&?iWdG#Ze+F%)qn=a(ZP)Q=*&1zQx%y5RLzoa}|2
zq>ySIcWnU3%9@Q>bcyyGC4WLYuJ{lkW@Asy;72vf^UL$R(T}{fC{;!ppy}1=GzC)1
zKjk|JEoe;|7Mm9x09)tk_hII%O2y8H`J&+=bE2grlto<O9-4Nq#9Fo{pcrkn$WOLZ
zgA){WsIFLE@UJ`S){UcMPs#A(=%hE6FKTYJY+;V^*1gNNrtCF$;#=0EX+f`d$MK~J
zkx|u<X;vmLR8(<r#Gdyq^=JrE<S49;a915!cqo@4E1Xr}q?0!erX|80mbys5D*L(o
z)itHVSUbx$ob#WTvWDeZlR^uZ!FSWQVMb9elm?ZT<16gT|H&dyZvL@ZlJ&Py$(1T7
zaYFV#Gc%8a&y%Ho1K$0`a(xD^Db5@?=y%f~bh5W?{`ZRNe+Q2sfB&Bp=xJ*o*9%N<
z8LBmU2D?R?g9Zo@79^w17NNy~{y$y~u_ZWj_x=lL$<%3PPdmx+DEs8p4(B_}tCj4A
zjAFY-VNSu&*RQE>sRv4LJ<b$MT_`d&mA*CVKczGpLvYp|ioR&JbL{#*E{cZLCZTqt
z#FhG@t<#1E9y(pT9)aj>t{mc~yJlopQFhI--O1EnhaM8HWM3AsHcJ&e35Ulqf8pDU
zi&7Q=Pi${G0&a%?jHqaeT@r3{rj&CwSc??}r#5{~ZPC(T5;N@dd#&6=V7Wj1n3Le`
zGG5PN>b~9Dd`Rnq&EbZg%^%Z~oP?S{Sx$8q3$;4l`yEa9_G7g$n(43j-kkTvFdcu7
z9RYYgHMf*)27<F<o8JrL8~ZLFW+3(}bN{&E3xk-+X|J1+aH5|kk*{iS*=e6a7Dg;8
zF5@ZtetS)LJ4|oFhCz}(z7err!pEkCA7zv}+T5kfE+P6p-UGW_E8RO%?SGQz298T&
zlWpeS*LjuIr16$?fxJ$H!ufG16nVW#Xot+pef@Z4ACyoG=9<1v<FK&~C{*RrY`rZa
z|EIkz4i({mALSsSoK?k#mGVW@Qh8O0dTQ*G!s&(Ux?sP}`xa=YfOA~KRTB=S??Y)R
z8}mhkO_^a%+mn8U2VRQm`o7MV4o1N^o_kL<4cGp;l{LW(B`p#hktIN*T>E_JAx}nW
z%W16=+-Bb9v~H_NCK8NG*&Ncvn%QZ%H2=8op!VZ3<YS|&`&`$UNCy3e)n1?JuE9}m
zQH8FqIJo|<m1A8n<z|xQL4$11Fb9^Dd7I*bs@?R-4|fy0mP>p78e0*i;KBG~Hs<u|
zTi`uYO06@jqbhJ~0f{JVyHY$*APd?jK2GP#b*at6ViZTi2BdsNVZaM|?BtmdL?lLS
z4Dz5&s|u&aWAPGN)1E-e5K!WCMmZd1s-eBeG?X**u(;NxztWdf5XGYMrw)j0bJXx(
z$Mnr#j_WQB1~kj68ylMfeTD;#{-M9>sf*F}4Yj%vt@qT=tq#^EZA&!JN7`GT6mn1s
zb+%lZ@;0gRp1qINsW+4N!^+<mhcF)XyT)MN+Tb&nS$WZf#qNh!JeaqHWSqG;eP)wL
zf@xTiZXUiYsV6@Gjgpu?d*!YCuVl{mU1I66Ym&)F(goj?ri&L?=~MXwE-;>@4%z5J
zev4XpF`|kS5#bveIa}nO{^S2R#+KsETunZoclt~uB0<by<b77TtGFYTF;IN-J{<%;
zor%RTbny@uKuT02ejDp~XIhk$-QtS292U1ApA$mlXU#<HV}yAbJle2w(N4QNikK<4
z;qByJK0sB3jkG8&RB%bSs@bf4^I-K-AZ!9NUt)hm!)>M1?~;Oipx*r~Nir58_$|tP
znIq1@c8al_QD2mI7BX*3tEy{<`noaLmZ9n~+7K`J)zNgTuq6EbDd(F^^IZp*Y2)eX
zHnQA&ycpQ5-58ngU8xul+6O@MvI&f~mTIgDemR$nbLZ{twtG`$5Qv?_-RGrn{g>pH
zy!Z_1T*cTr3IiIv$=;haLp>1*ByJtf33HAZfWD^A92w8qF5=nVbhq+KwA~^NxQeRg
zW^&q<aL9DFBU2#(SAORlC@W&S9-luDF+2M)zvTWYf@YcTy}VAJ<kXg}i8d|m_X*N~
z)wr$R%vuBIeX6b1%LTV;kxk*mE>uGSx=6XaL`soJ=r>5D6!sm##;I|#gzD0Mrgry)
z<I!-7`yVToFl2uFU&T#NQR;E&4Ir6gdW?WgA>pDAYFN<`vAk6({4n32>jJ1LBV-t3
zF1HrOzC2*l?qF>??rcV5Y#NEfjz=7b-Sm+q#zTk2r)bZk9E%@~9+i2qUgAOIcA*&D
z=4WcoVzRCs?9LqSwPrhaE?t5<(b~~fNjsHSk8lcJ9by49WB>rND71m~sE_;q0#r-9
zIU7RBw?j#da!wG&y&?xX>&p+F5>Bd&<y=JO{iX9bZ&L7E$Hj0oe1Yp*UA=BA`rnT<
zNGGWc{oc4bw7*oxJzYg(=XmzF;O@$u58NNUdWt$5#%GU9q|74`Wd?qEC@E=I+mJng
zhL+gT265**P2$DwOPnuP450-%itWaa4+vICpKTKIX^5)&WVeE^q*i8P+P6gVaR@qI
zH{ksTc{U#I{;O&mzLPg0s`n$xeu5hA?uPp%v3Rc{`$!%Z2eg)QZVgw<)i#`!C;NPk
z5))SvxLC=k@ZgmsQI1S%`zd9XlBVzI$kGoOqPlm)_aDel+A8VIl07!`xP|D23sl+>
zXO)$R7-i+Xp>$PoQ?Xb07>f6#5w{v$8tvb-^4636RW9R%l3Sml7nIwoV+{s`bVPkA
zk+e8(9QCTsS<rAIB;pNgv~@Pw%Nn|^KdfK-R<uo>cXpY733SVzs&=E7)RE?_Z()gY
z0q5NgC3FKI5u!xIOt?0=Ovc;tt!adK?!{>B?H*qXJ1T<airSMsKC~a0ax~}$hE|%A
z?WZ$#`qZlGDeToLEN^2-AW?{rKPRoFva5oR$8!ocan3Nt8q6fUT#>28MiTWT8+dH4
za#CZ$n01I-6{21^q9P=l48Fr3X^VYCXm&?^TcUl$dhAaath3i%F!b72=*;j7mu(0M
zaXpnS&KBF(zkq~1SVZn73Um<BZy%qagi}=oG2r+=mIwbI;JJoo&b(P1BVYb7wzuzc
ze9n09HCBqglud_<@iLiAshqRNSHrrKM7Vf&Dl@^nIB0vLv`;wlk8SJHMxPF$-wOte
zLjy8{hj1VN%(Bz48vIp$`J!oktB<^)?jjkYVsgozy)^yg=%ElZ##3R^+tIkVncyH6
z6hIOqt2g;1UB_be0xq(lB09BVKp}eI7^vdhxS0Q3wjo`pWK$6ete{kU>Qi88y6tNf
z>ufAXuC>qi-xs=XsdWVe(;da$BCZXGatVXqyQ?o@=}>2bSL8<~A9PCQaV}7qXcYi~
zpqxL`93ByjR`Y+V08dY*{bgpv-UA~VIf9GsU~kfzv<97@g`*qk0^^l>Pp*o2Pus1g
z58(87i~x1a**vVzCI*8u1P`}Yk7vR3T{q`{KV1}d?~i!?aCNom<h1F^Zr<&fd&oBD
ze-NoL4Qy}a1h3M+Dg36=1*Vc`%Q(^+(jo?sVgtR?0iP>5D|s!!bm^jKb@<keDjqxD
zGm<7FZ_j|rPMtq8;p|nqF7G~!gWmAWJ@LnZ=!K_+n$}l}nC(LEYR6yx<#04)?iBu(
znNtuc?0$F~+HM0nyb2<3#N(x{(Al@C9&oRMTizhNL~!Y(_}|s{2RRcwBg;5RvHWR0
zE+rEqZQkh7<U{>7^zr>E#0}1MQQi$|kz#*i<xTc6=hSqnb@gAh4|`u?`Ko0j*D{Mj
z-qCOKyrbOY9F3^Ef%u)ROFFrQU7Yt6swXT)56MRvs=<l|aO@Qa@QOP%)tPR3yIH>E
z6uTUaD~`2f^bWOYV{ltB1*kw_k{KyZsumid_tGK}uD-oVWo02ZH9x|c&b-3R!<pcn
z$ENxbi$5+mC5^pPkDA67yw=992&{n3yFzRft1s_~hC?X(DFU64@>6~6wzeYEuv{<D
z$uPD@QYEje;Oce?*B^0u`Li!z-^&u;eVuu2L2nE)SnC=p@kB7o>swKHV^|(p!yT06
z>$&|EMxOIB_C{ON^;0!fb*UAt#j<b?)#vwcDmY|E^q{r<5urhEgLEra>t}A3+s;Ww
zxVkMYG?;+L!fKij9^%zzby)sxd4*D;1QA0&r6GeQW>4uosb)PC{jW$L@GU+#W0s1=
z=Lt%`?lhiIM=GBA8t5}~u>s`^-vQsm4CN_HW0eMn2YZg$7hA2bc9YQSJrd;B@UR~&
zpp%e$ZZ*$vByd#o5he^(i7Y^XD8%>&H70r-D-;$bHi6pTn+1_q9-`$H&6I_^iz@^M
zJ$(erNoDTerxi%}+_s~v1yEY_lX`w{sg_2CKn2@J_JM=`;c;vdf^W{oGgyN;&M&(2
zRkGI5$P+3Tgw$(p16g`zy$Kx^(9r@btHu>mtJE4rYxK(7B}}6VuMQV3>6hW^C0&oE
zjYi0h!9VMl>O3sBg*Fu>7G50R_#*_Pve3iGC_4N<$~PslO~tK|=UTHgP$cFfR&Tji
zHS}9kB$Xi6#(J}npJa(nfWRsEcOMkJWXNC!LM?9hFpw5r%=kT#n{mYf=HJ*ND&%|m
zN5S8BqT02?ZJ%|?GzYXH&r@fUm!$(njnF+3%s8o#QuJo9bGa{M@-+3<sp0vd%gVzt
z`vgR2xf}~k%VB5Bzv4rGmp1<8>>Ytldrh|UG`9?sPLlb8r`KGQ$lLUBwf5YeX3hZF
z^V8z~6{Mbdx}7Q}nuyQXbZu!5R=`2tFi88eEDBNM%KoTB!Y*GywQFmuJ@@+WUODMM
z-AQWX;~)=eqT}JS$R!R1y$RAhot+QrVvv^AxGK4NR$Asj3eIA4Z||N;fd}aYEC%Kp
zckOPj*Zkuf5ajX)ttJ!@7C$K4iwrQq7KnJs22Spu0NCGoIE1X#PUtUk5WOfAy=Ef*
z>l=NF2M$97s*z?we2p=!tdrSLP5Q}a@%d~|r<&<HJ|%h9QOj2k`$D@L9XR0yBGc}C
z1xpDHNq!k>QsR2d$i1i&9%c6-2<>lmizw^K1NJfcuJzvW;$Ai9_N?e4Q~Md=K=??z
z)q~lD7_PlG8&Vub3U)`!I}z_9^ggR~*3ULp75Uzfs90pn`LglMFa2*iusi+(;Kv;m
zJTGG2|L%^qrhvn9b8bOf*DH7dGAkcpwa#E7J}wayt@<B1FrvMhokqyO_-N`@;uH4H
zQe6Cy8t{rX;9Yp9dO*6HZ9#tM*XY!x+DQz)RBhU|aZbI)Q-@f)Ve%lnS&4+2hC>CQ
zf;=X^-+TbbE=eYn2&!0m*BH1We!r;THCmu_4sRr1C=}r%tz;&fua|#wQ<jvULMi4!
z4zgy72u_2k%A_?!tQ3Ya<Ul(wS^_!*tvrm`7{6w)ZL=H&yqI`*ewZGvO*BH!bO&oc
z*PGtXe6dat$zJ~L<5owaND?$=WSTIoG9LY$psv@_5%0c<$%o1R;~R=GO8pn<p5>^V
zqw=_*T74gdN=iDx8k7YM<BHLU>eNsGzBp~Fb`1e!u)cAeGUJK!U^MH(=3uc1+yd!g
z;~q^78ZOJ?pUbh$#7SNbivUc#fU4*%4P0+uGxr4tjb#QIYJS{$_%v&Tet>y8Q@!%)
z3m;vm1P07md!R(c|5Ioz&<O62<gciZR;72E!JA*!H^{On%Xm3MOj93vV<Raq>4lck
z(_m0g<-wmKWa>oqL0z>JIG*QVPr{MEi&Mh|JBw@;M~w#@g%!M8tPayHF=vWp+3&11
zb(aJ)d(MSN2?^?bQgLuZD`kGKQ<(QksOK8;2ngo4JP)q*sAlW08JYuEWZ@zv8+qnn
z`1#)LMVWlSp{gM(KsRp%8D^E}%N1G*=Z|H%?(IP*A+%e0S759ZqfVPW+s3N<nyXJ)
zs_g@b2N)BuKI#8`*_C*_bTd^Xv0E)cmmK=J3*s%xA2W2wPE2mhU_ysgt%)0_Q+QtV
zJn%0-sHA3ueh^mhwBm~V9h2C>N{e*L6Xi9Cht3v~`Nb@j)@_e1DhM`b#>&5i7DFSn
zh;e_D-?vVA6fC_gjGy|iK1~%omwQI);dKRskcUcBP2B2fWGhdNpOM;W0#~}pnBl-6
z$a|gS_#NG+ja*^aBr6GUI)LB=^@2yhdYq4rlfWI?p6ktcsZ8@OpW_3^uj6hSpq?0H
z7UguNZ}<Do%jd~thute)ZBW{}lGf50MrLV~6^&>DFL%hM^gM+YNU6N8^$rS25OJ?=
zlGD$ngOkH(zvFXOnbz_7Vm}ySnUi#6*(Auy=Q_`_!Xr?+uw-A3iGxl`g^<tHGOfRP
zGbnA>EbMwco?4qIu)8xl+5QE5%3R+NS#sBclU$JoDi@Mu4ZxI2{pmZpm5eVZNC;N4
zBk}}TGGq@^^xlE;^-1~S!C^`9_5{m5AS+VG+5slBMWpb#qM>H;NVHvpvAb~H(!JuY
z{x<r8w#%6#4q5*@IY5mM&YM^!YSK5?GTjrzuk1px%#aPH=hAM!7}<0MVasrI?Hs!T
zM&0LYAYzDA<VWX}Qed?(MwQ}oxxq)1x9{*({KkIRYrfV{RopB-Da}{@nl80L0@6u=
zR)X9jDgm@90JNI;)dhFwL}NJ)zBY6LPvxIJ0_wV?Vqi)XUH4RilOHr7w{OzEi}jm&
zo^{-mBP7l^H4jyTUuJE&r<zo9PO?Qw@mJB8U+hdL{GwdHCW5-@BiBj|$8mqPx=-MV
zC3c*A940;PhL3LPFX{E5S&eEZAUsOZmL;$q%3pq5WEZ842H6T{n6tu3GN~8YOy1wo
z)`ZW(JSV>ag?#u>{&s+1(%sG6+p-ReuMsv$p=Rh)x*k}VCpyL%2o~LM-m1PINP!jU
zQ&1=t^HQU%GyGm7%=PJnZ#17q>r%c$kpEpbilB(XAfA^9%5kOpRIF@{JldKJ^BHkt
zRKXghf2Nm_bM!L&h8{RM#jmdZQpdo6cS?yC_PZstGQaN`(hpHB{$uer-1P68=Okiw
z4PlF~K6M-gxXv>31*7W8#~VoKNt$w5bfpyrf0Fi49u)rL4tK)0mJh2d8Fi7+sLvDu
z&+!H?=pxOID!;Br%BmCm3&6wz5S=Xv6I7`-oA8_^@r#-y)KF;DS+q*Tg-CiFm>5rp
z-_9|oIpr@8Val={f$XlYAyC1!QJAZmssVA5Eij{1AqJwFrsVk_d8dm)_}k@ws_$JS
zjb=tIByj(8*2%f1=lpFQo#9&2a)G>8#FA8?acEm7tLc#Vf9gHJ82<&T_P=1UzPt>T
zp*g%osO#vpMzL?0U+jNkvwrFb89VjUxz1q?m)%vwOr?3^XwSZN??Q|9jZyOcfXVNH
zBb6%?IrJ}}iSy~E`AqU&IwQyb>?mca-k%-+2>3E>H*Z}Q0lb(e;Jf^!E3Py&oN-!1
ze={vp@Z>p8m-tV33v0{a@D^O!ZPn#_`dNU+)<3V^^&3OXO{a>PT*r(GKD$(~2CcWW
z(#GJY@@OMmu_*@xSjDij!uA0S%691JUjA76cW5y=Ee#&9^sX;CT4ya9JX9~xQ7|Ay
zmIRw(RLYA?D#V%{SUR;nDQfqD;w)+U{W5LXHE*NnQ<%~Q$~XtJ@7A+tGyk;7nxHT7
zg>5Rb>jZ^XNO#CfCL=yLI7=Sw0z33at2+%HrCdXcP{v15x6kDpBE^L+jbD3XeyZv9
zH>Z=@*3b&x@O#iGFDwtMiTj;iZBz!zCEk&NhWCYuCxK%EY(rU40WC&HY2Pj`cHn9-
zV3Gc`<EoPMs^VMh`3EnIJ5PN^t!jo)Qtr2IDRk|+N*?83OH_nPfs_1i7|X;HfWJ^c
zVSqrIk!tPhyA(%Vjp}2@o#3okZF@=a7-2FkZ4_EUKsi%7@f{%_efleuJjKde#K+|=
zm&VqMpCgL!rTqk!tNXjBiu{fexhr?)WrIbN$*Zp$M5)d~(*4W7E+e$j346a037n`S
z`4OmcD1m^(B@6l|7j9;wU7a1pj(PWSk0h!j@!z(eK4^u{d;SX`2#2j==9;w<;;M8a
zkO?`Y{a*Xhabk|E_vgO0$o=1c@5814T1aN>^oBMR3^2Q@f^O<~ZSwLRPSAk$opClh
ze$T<mb*e=2Uu<4_lxRzr+!gHsjUQc+dsR-KB&%a3`h*JlJ`1J18l|xpcWVzY@r5g1
zZm#y-9SmrgcXTjlH8`Echp_!q5a;Nnl!$ZE;*%(<p;D8gfQ6wxgvSN~ND`u&#l?8i
zdqYOeViNCo!kfEVA0`#5sL9XQbVv9vR7!%~`^0Kzj<Wt7RChVUmjRfSW^C7QYRxRS
zbr%Bk$2_(cM2b+`4D~mHl#3he<U!b2{Pv`9`J-_nh^idrID?WbQD1o|!VJ1?7}Mo$
zY6f-sCpv7+TGfJIR5v95R3XU}BSXO+Xmo+Fn+1KK#I?Z$Aa_}aHeXlv$Vz?AZchn8
z9Bd)FAtznx45TK}^V&&Zd4UYqU>W#G(3fjF1>73S<dG{Vqh@f+){X3FADmkxw*7$q
zS#?UAl%?u@@#b}lgSrw()(Q6(RxS+_*;8z;_npG3>mqr{R3Soegs9!^f`rel+(j^~
zSwDk>=vy*LD_=g3OAHKXMhwY1eSw(J5{TZa++e(ELE!z?z5Di38dWR1A8;})i1cb&
zx%=mx@Na>$4(5OvQfIR;7Q)&krW8g12o;qdkuQ?2R)~1dK3DY-dg#sYHaUaf_v@OQ
ze)^~8%%a=h?4p@nuU)&y{z@EFCp>PN!C!@phW+ZuD)i~n_-t?;?9^IrX_6;I_J&dG
zj=}@A7fmBHnfgztDS6THLQ{dJ-K52uP}P9PmT2<i4Hbnz%MU%f{TjA+!U=svX%P(J
zy!~cH<yPEQXWugL;%Uaex{3y!U*)a4s_yFK4D?Zin5EEk=VzqqP4=pw$kt6|;nw2k
zQQ20aGA)%xB-tRjnTv%!8u@#|cq|QqdFu@6%J?S*=mR>w(JJ*EQ$p1>T(BUW@ey`{
zkwXS2uU@|8WwKJ*s-$cD?^~Ix98J5b<?-v_q|D(xG?ymT8jez{s#Dun5h1|kM$E9P
zP9gmb@!HOi9tchX<p!P%ht)i5S+>K6a$hNR(qp6oJ}M*+K}%>cz}XT+wfHZ9?U95c
zrg{Vxi2IWQH(dUOirU<8yJi<1Qs{g}(@>YlxWU@TU=Q2NuqV^y&pPoxr~9rl#<|W}
zWXROqd&zZm63*FZ=vwsywxn@mJT`gyt(XZNJthc*G)I8}pulYa(_&kdSjB;huR6&B
zqzTmAm1BaP&f-pC=(_@1Qh%30)Tmxli2;syS#;w2HLcx>KM9GwUE7H9*G%j_W^3e3
z*iK^0`;`4NheK1!Wk-K|@)hHeUh)?Z)FN)Eu4yEAcQ9Z<Y}(*RQ1#^e_i{39g(|v<
z4*t=h34%^lIY+Uym?&i|az^3ely#mrjy_3;t3?Zx0AMI{H?jZ9X}#MSPu|#;x6~GS
zH(X<A(BQs#gS~<%P30q8M?@*2*#+8F6y49sIva3kG|GT~<$v(I8BaIrSFqITEPQ!G
zPCtD6zTIc9dIfNqsYfbu@z|>Uxmq~0I@J8ex>6+FjgIXgMC&pLBu0TA)8(mjQ9!0G
zvady~pp!<>4G6Rq|E_<`!4(O9)3~|7*iIVv+~>zr)y&c!(^|fCrS24$$U{ixwG8_g
zpse>ji%cMT(-sWyCgyW!%{<_Z7iv8FuEHJApGfMjO0994#Qo)hW>%Vi=-_NIbgqf~
zg&4#E#^j3!d}Gqu)Qg(w4*GIPawR2xHP0o?qqX{dSh8!5DQuF9KLwi-H22sbm6?SF
zu(5(lVb-5*Z1k18AJ6%!OQdI{`&HE9V9n#VUgc^H`_`4sgI+q1#C&<M|M5_4afbdM
zk)}=->i-yWb=HiB1phC8ygbMMvV+ZOj+!VGS8QVWxDs^une#O*z-i3uIJ#k5F$(iF
zB{p`bSvyKO;YuwRE7pOtgI!JRL`rdj3e<%;ZGjw7)u0HvJyHs%pl=IHBhASH6q%M6
z?7AOcGW0*Zoar4;sRj4*$I$7hlFP-3ZM47qqwD_yq~U7gVoi=3NbZV&HM~D6gz3&6
zWiH<jx@;70YHGBB7Ox#XvZ@C~(4u*~{S{-%^9y$c^WiX`JkU&SB3d)VU=ma&YY_!9
zi~sfF=Zb4Hkf|}rsguy8sd-Gu(U?h&ayg?E>*$g33FuJ;abSnlV8>}H$0u8m7iACN
zAo&6lj+nQG29sbH>TZ?bEL{{1hizLs@1+T8DbBIlPIsNeA|aFa+W}z((i>d!oQrf=
z9R@3QZefAFSsp8P50ss~Qylwb*9>ZU_*lRpbT8%)pT2}jxmLVh|7RcXUjSHiVuJc#
zz>ce?C;SZg!TETmKHyLJm|E1AZUf_6=js_zMg*m<$YsyA4UtlH{5P5V1Q)X;p5N}t
zpUJJse-xzKJqATk3PwH-4<x6OIR)-I&IfcZ7~0kp3w;<2o!38jjLjotaA5knVaQnv
zhTP?nv!yY~4y%G}P^0;>0Qi(zQJ4VU_*e-$ml+e%748`Z&w%%u9zg}PR~DCrNf<jx
zvEC*4F@9gOLN1u$;de`xi}O7n;X56+HGHWSJ#e6Qwuirg-kwfcX(@Jm{2kzxLocXr
z^`}UcxLyU7%*!-O;MrxmXSY8NUX4Z-8%^)UQ8M?S-%}mRLjv@lk&s`f;@5Y}X4kq2
z#EW(E5)h*r^iW$-J~UtKJ>0j&pI&em-pd@z1FU4M-_O%WV{)82A5lFbgQ|=ZN2=ye
znP;A@p9z&FWSA|DV;Z}`->2boTewf+Z#q*p+Z{m)diq3O?6g_Zl1jCq@@Q#*p;TC{
zB7BRde_hAk>|nN^TIp$HrIw{oTd9EXWdpAZyhZuw6)SR2I7lbI(Ol3uFdHq)gK@bw
zYE>G+_G@+?yHMuSO?!Aw6K9O00KVr|I_FtYrS0j_io;xgM2(%wXH6$6-d{}MKrb-{
z+ojax-(doQbj*To(_73mOhkn~<?R*e0XmmppFUAOW%(?5M)wG<o6p+QdZ6z6ywT~h
z%j`Fb0y?Uyi<urfqyVmc2VA0P;&FgF>yRVUKV_EK%HnvDKWtK%d~|RTHFXiNMaH0_
zaat6pbo%dI5Q@Rdr_k|_gS;%jzAq-yu4-AM$TUd0wicX=sQ9wn?dp`yx8!Z<vrkd*
zhecT0bE=1x0Oe=J(1jE1!^=RQpT9W8byGOmKc5<_tgj5Ty>ZJ4Bk)z6CTj`og(u`d
z7J0n;Tx!$Qsp!kihv<ti9QYQ`94lQSPYz8dWng5sB>T4SVh~Ijhv+0gb^3OEpZL48
zWe$Bwj@m+Ic5(l)9>Le*WO}C4EX~})I;fx*W^^3O10WwF@eQruSC__0Z&NIVS=ru>
z0@qX>N%B#Z`i?_r<)i|7G)JZQ1O_oUix8~@f2GU&qh$|eJPoJKai+`ug?s<gFt_h!
zj%?Yyp7&ull+SX+a-X{|LHTxu1mmor#wJ^o)#a^mv^pyQ%@!5J$VfjK5o7dhbG7PF
z$$2n2mQVf@k7{TZ4vzo8SOh3XFqVmW@FqkPQk}X12&~3;yor|rB6x-JgdN_MimY@I
zmsgv6fuc}~%c+?91tU-%IQqIb%<przi_~NLT0KSZkSq5UU_>IMg=IBW3n|`GT#9N@
zk<$IZ`H$jsf02ZFVu&hSp&*U$n1oMDJsl>1$>%-=m2Xm7FcAKLx0#lPRos(TlI<t1
z+s+JD$khCYQsO7BH5fZS;@7ttM^s_jcRuZZD(J^0&RoX6Q&pME2%e#K@js%5P@vJu
z=do^D4cUEqAGul`NI%Hn9iKF|nX7&fdTQz-yAM@Ib!eC`4fO6?jre6Jcwr}9uojP_
z<Q&zI7<(HZ+-Jz=i=oh)I}#UK-Z(>~c_yjP??VF(Stow{^BnutRme9)t=p>31yq@F
zq5xAz)dlJiqo5E*k*O&1FGSD5A*!<<UP4UH^Rb%2;6zYUhS@Q$hRrmJvU-YuH3Q(4
z@-yn7{+(NanmC+nn+!Nxin7WNgGMkf52K{h2HoL*p?R7SAZQ@1?ejSoinQG&ZkxBI
zSAk8Sxl1VSdRSvw_r?Q5vFKdCQy?<}2`Yy@zA6<QFFg`0!yOY?WY_gZW7uwZ4pR;T
zp)e&nwDDHn5?vL!YCI>4g(l|wJVM1<(Evlj75Z3X_$e@dA~Nu0;YCGE%#b8Kg}(~g
zaOvBrPVFZ1x$bWZ<7NW#c@hqO*g<1n`ii@`d}I9gZ8*umcj{lsGJW5)1mjPOvg)Zw
zvK?_M?e)O^aDk#BdwlwgH1x3Z33umhp5;^(?0r&IF#&v4dt7a8C?8O5Ib;BaHh{>J
z?!K5wQOJ7NS4l}uZ#});CagE^m#~dHCSa<{h{a&S=*<|s@Hrl9lm5ER;l%n1l9(Wt
zp4eR^Wn7m`rZvr0KBgstYfm(31%(b<+6nIK_EmpA?~i4J!K(ukj5^aPQ>*$-GiIy2
z@``<bkYE!PcF|y>pbYt)GJk<8?RyzNVl=_B^IX!{T9WiuJuX?7NGaARd=&YipVFpa
zK2+C@cU2pN?Tww6S(}qjAM<!<MLpOgeetUFUa%rVG`%({QquJIq5in4Ya!IL>CKd4
zX_vV9hw(XxE)Ty^yf#RUP6VWQV_l1f|4<veG<@;5Oq_bujk7k$^EErQ#pjLL9#uyb
z)NvRVYAFlb31#G8z84F`{h6iHrQm>lMP`;Qkvv<yKZSaAPy$c_hC&L)$=ma0bf<sd
zWB!6A%+<m3otmDCNy9<9h8kle5Uz>MA*sEvBp&GdWZS_{jPEXHJEV$|-cWDH%*IB!
z!!ea#*Vu@Wp(E|UiPDK&f%R0$>{@c|N_IJV9nu%HR>QYm*D(X*8ER<SW(UK6Y6ZOg
zyeaY!{j^<lSU9~iyYbgzXYh~n`CAHmB*|d2qMxKvUI;^eh(ytRpu@%AK2P4<hmD=S
zh0ap4qC?74)t=b@-M*vxznROLoT>k-QEfys0}jcuPFDTP_E77;GjjG{ybL|ye{vcs
z4IeKxr^5{@I+FSo4ojPAmOg*Le!Um)v7Fmy;Qyhrs(5inbNv77j@Fw{`IT^hB@6WH
zjCHL#v@gB}GEgt|6i?tqydwBhEay2<AwDKwt6jt6`Jg0KR&sN*>iKt*<m)41Esmbn
zo7`*-CunBHD($tr%ri*kXYv=c+Na<B0BM<sI%IZH?NUyQ=AMZ#I~|Qe&0)%Wk)3IF
zu^&n1div*zDDZ=V7#4eFM)4Ot@)Q0mOX`jAR`Fx}e*vi}ZQ&1Ja{dMM>kFzX7K@#c
z-ICPmm~_r0e9MxbMgc7-lF<6PlALnorP~=SZ|D-s#apQ|^6)V-ol;k?nFp#B&txZ+
zBPiAX@24%L66giI2NHg&GFRZnEzUd&&CBR@xc7~@zZ>80wYrytui6W(&V&wSCV#?E
zEmv!OIT}mfpSBH5gLF}rgXq!THyo72)1lqI89#GKnpd=_6LTN_v*c2X!m<)q0xDLO
zfL&^WqBP#XBZe|!Nyrok<u37QeT0wn)!IGfgni>7Pk5G!7je3a#9AIm7U~XdfqZiA
zX-s2}r^GZcwjX|;Zv+Z;Wo<QQr?Fb(Hm%T;WkZO3^uX)=pIZ0f7D89@8aaMDq9%Ox
zXd>N*S%w9$?ROoE7c*(FQ4Cdmd8Z>)@lBdJk=qrcA9osGm)v2igP;a+Je`9qb8$L>
zv=qOP_u@-!Jxq3l$9gEDF{F7&uL4I%tF0S;<p0IqTSmpTrE8;AcnI$9R#+$qF2SXc
z;O-hARB$IL+}$+<DI9{ky9NsccY+fLPLloA9;f&2-rapp-|v2Z?zs1^UvrI;@y@m8
zeCMmr^K`#T-&pe7Qh@W?5##59O63~8Wj{*q{`+DN?cLgdi9MEPFt3xou>7j#8Jjha
zn@8^)Y>?qMK%4&u5iQrwtvsc9orA-nxTBoYPu?PFCsR}-`42nt>N&+y(#YXdMH850
zyOIT^S7&k3XESd&7N3x)4m-d6#9EnHJ4cc3{OP6sNygBmq$&9PJ^L0)-t#0+&`=Az
z9SVZ;EC+jjiD!rAmEKH+-7{nOWVQ#1fej#{AQ1%-y>><g;1n=OM2Waq5pt?J<!!;w
z!sIVz^(hMo4%1qhb3d(ACpzvc4zUY^zciZ{*nXu_ObEoCpqHUvJKUKQL6EX0hs|!f
zyvMu{6lgYZT?FHMR1z*s#^PN##*RvQ)^UUu&w?3e332A7crk-0<L8Iirk7WCFLzkO
zju|%QO}u7EJu6jb*z~{Xz?qid<#93Zc?dOVy!gA_IvC0n)p7AL)A=stTsGJSuR^#2
zZAS<M`0de0ha8D3_hb!=RFBv}#Y|SGAQ?v3p^~|y#=7y->>x8P?Qq<zT3cC1>`X#u
z`=;DpiO_~z1w_QTTK*&^a!yuMI*bj@%9C&$sCyoF5_u`SwI<(X=3sKp955=`H(0~A
zsjDfm8Y(Rug$%<kZIUcjCAhjSW<$SRNK3UL8(hPWtc7S+N+OJaf1{p$=SxC-@;hPL
zl5a`;Nyln-X7iDs!tnVcvG*vKl=l48+(XaCMYos(xt8e5W8`;3KQ5|$-!jaKqK{US
z*YOLz2>cCDyl3CI66!}{rpk>j!2dDv?2}kxubkX~u69%oxIyI&vi16n+a|sKD!Lh3
zW0m6#eZ6$)w&IL`a_MV4SVr4Od{Kb2JMJE49W%2XR41y}d&p6Oja+e2b;NoisTjM*
z^dfu!fn!2`f!Y763{rBLQpK_6-|)5|ZoEn1)lG!f;8TPB)}v00*Ii*7<<7U1CAU?d
zp4aBd!ZWio2|06I2ftWHkE>+ggrUIk*8%}U$oy8$pUur~n!<<dnMb0al=X?c`|brS
zAeD@A^rePPv?~k`ERWlAMR@sO-+klHFLiR3kCyCW-_WYX1l~&kSVpY<QFtV-KHQdT
z@6Ege{6uBceoa@-qL9I?jv|m#fc6Yg#ddc`N|SYeuTvF{Joa@)Emx@FG>iVtbHkC?
z_ldC$TnHMyNqjkOMn3g}W>3nO4Y+{-o->|J<Y~sd)Zjv%qh9+IS>HaBwG`Z-I{;+|
zfYuwWm{fe=W;imd1Dcs<yYJu9MD_7y7b?%@)0Q<A3!DN*7`HE)qq3dPR%$Md&S?oO
z+Y`j%@uXoN2m*+t6tEnh0~X7c_zTrs*Oi<hC-)lzl;RFo7OlZPO(#+B$HZ^&;oT4R
zHHUV_6(*{Cgq{kXEZI3_Ibj@;b-Dac8wT<CB!Y-1@atT8J|!nd`q%4WWP^mD`3bvJ
zR&@099A5^>MXPXp@l#$6^4lg!5CI9|wqy16P9ObRo4C@ZxbK+>1Mn<-Gv8A|y6>a|
zH?VHo0O)3ty1K<Hx|N7Vaj|%EBqiDGM$YoFk`ZlG&4d9Ypcg4+KiaDBFwC}b?J~e{
zKO-V%y>ug;NI2i-44G|yTSGroikIBtS=BySF)}FrGQ{D9u6Af7kjrz7ndx-=tLn7f
zl9iFD!=xR+9l`>Z9r)tZiEOXPLIrzd026=69&{jZj`g#&FJa2EKAn`}kDv_xFk+6k
zN^^&STN^m2vLm|I{te${^VKmsje{=m!urE{ZrdObd+;hn21x^WU>V_#hqx}vwkZOj
zs%om_+wr@3tYUT4Vf=H}#`ttRKg9^a61j;ZuT_eB!XvENDanzdAA3cei~S4i{6_n@
z-t}Rbd^yO7F#mFeadj0BsXo)FCsnyuGfwh)l1z@Wl%AR!YDW=ld3}M85}}TNxGhZ4
zQ^A%c^;#?;lxWfYbNjsxxu|SCwrQzq**S9HG<GqqWI}JkjqgI!3$;_f-a=B6=rXi|
z$}b9S-=jjb+L#D~2ES<Td{9lo$evlJs4rHxj6|<#@DKh{GODB?#LH2TPtE*fTMHdt
zEcM3z@orcUg@9mRo_U+ee`&6vSy)Nt34)rPpwFsBBn9#|cw4AUu4jEL-s@chhL=;}
zO3N!9ih2VcLMjqLX<SasM1K({0r3a<?1i6pH)K)!z9+e@kSNV+g1zRoQK@>_1eG9*
z(GZM8h;e+8OX9HM!sn>Gcxlf2fdZTy3NE3vcn#>bQoBct%>$BUUH+3W6fDuEYXs`S
zuCIUETs9h5NeKk9izBa%dwmeQV@=8V0jD4vD{`KW9E|rHfUGMJI9!lj9xnivtvNoL
ziC)|nCac%6P~~IGXUNF52Z&_2YyuBy0aa&tOR+Tu&5Gr%Nw$MoacRiHN{nQocmP(g
z6cUlFiux)vaNb!0nLW0V-l>c<x~~fqb@@4gcVb8bL2^V^JcLz1-46^#q6YX&%D^3J
zOF(u#!o<1k1MiCPz#8oItlY9@1f0}2jjZIU66SDBB<c)>Tm)JNrMN=%sz*&$n~w#E
zQ(3&=axdAGC|<+8U=$Nj+Kd_sro+Qx#v1`P1HxqTcNj%8FUS(jW~<QCK9_m5H9HN%
z6F8Hjl^6w`qass@LLy5o1EZJ;X@!o1NojsMI*D_Jw$M{%&d>_FpGJ)r9Qu%yCNqIT
z0I@L)bpzBb>l!!(;v(8-Hh$b~EdvqQ?0%@`U)08(hLoOhtyHsYGwTp1p=8r$xsQp;
z23f%(Wtc~0MXsqf!Q3~x_2PU%8X*KDT^e%*oF`Msh>(dTLP{nyypdZ;)itbeKVi(X
zb;_=W#~4|Il;;D<cDRfMIW2PKerxPeXkd+JcSCqsMB*2f4!O^DiI&-x0yD+gr=T+U
za$5eH32IN$(Fj~G=}@VFUhY(J&Z3U&YM&eFt<Tzh7hITseI6{=!<5*i%`taQlmrO-
zuzAqr(^=pFN6?hD+Q;c5st<LUekJrs%5^wgnnx<~nm>&$W+jhu<Y>TR3pS^5Q7DCx
z$-2@XOQLnTB3hgn9yFI@T)4iX@#O!AqvA{`ut16Ukn{xw*_+JSsdo{+q1eo47^7Ho
zs2flLUG~f!YQUh7G6-7X)^*;=cyEVH{ULrF$!TpGj`QoRfTo$+;bZw2nXUz7yFS`=
z)h3+Mz5YB%Y-rV%?%+ov)mKrz=Hc~93LWnMg9g(77ked|DW!iiND!t9b=7V_ebwl=
zUPScdexTt)xUl^pQqn?^_>6rqZ`PY+SJiTS<di;^Ay?Gv-UO-?S@g1oW2pu&ZKK1y
z+M{y}66^}Eb*kqMSh1rHwROw&mK+MDk&HHq{psVcTjzwQF!4eK{L$M@{l3`^qfYkb
zww7aYj-U^x&2zAs7eX=GLoUwfNWLaoiYpGN3<-}hVF6V#VAsfD?6}}TLBeM2vtupR
zyV!18<9JK$C?99B_Vx06PjoEm4~x779};=oi3a*KaPcaOpFmXFk`%8EIQYVSesOZ;
zVdQ=DD^gl+CVi^3N}xIE{xgY>ksZvcO`Uk5G^x004SSo$Jd!aau!G|$Q$z8l#I*x&
z**Ckm%?<d@(fS$2jXuSC+ctrJ40g4-D-QD)egj7M>7n+h3d>QDpPD*8KB%MXWyCtY
zX8Xz!rs26ynokao?DHH%B7=sW=1G+KM6{b=Ds~Xl9w1O4B8*3<=8`p{nl2y8Hs1Br
z<PD4F^hf64uoQc@cGZ52x|Bf<B5ih<bvA&k2O~uihK4t+QMxvsDHN~y{@ZEstsYkV
z^YW=Jg284eMi*_Lsq|du^U3E$B>E9SQJ;7_$fIG#zqc&tYksQYAuUDE_@QLt_4Bj0
z%*YX1sI>j@&`moL`H-Z+4o3FEAlv0eE+;y_4$O=E9V!nJ4e^Ch)H>U$eZ)c54<)nV
zdaQ7!g~)T#LK4tdQPF3Dsm<ap&E%!0_hoH~<w;KP>lf;F+zK%}v*we#S9PC=rOGAg
zvQT*8JgK~ZxLH7;a$*mvA=qWU;?*&if$P@Sgnkv1cH^VU8a%#m9UUwd@B}B|cdk>}
z0RH=r>NMD5Da~l*!UT<-EeR=_E6sqnm7(PmJ<k@F%@1@ImLnqUn3w6q9g|HQBtA&g
zQXD$2T-rO@!~|~CHtVG5Pf)fAd*-?d61t9*MNg}tB4fDY7cZ6>#s&<@^lgw{&5w(E
zijl3HG8gMQr&y^|1!0eU2*FoDukHhou9x-S$H=Fp6dRZRk2d@7*8Ji^U*oj_66v3&
zd8v)c>5EE4`3mLtp|al-LWBJ(6&YRxQ%Qoem#f6j>S$Gt@7ND@Z{<PVdD8+U4s_-A
z5kJ)>1I%%|x9%L0w`K}StG?p9cXPe`235Mq3D6V1k?E^cMs(0~b5HD9<_aK+;Ums@
zc9FjU-YuEhE);gVZdX0fDlL8anZyy?y+2N<H51%cg~H0!m+Eetf|4g+6=xVu6P)m<
z18|!c!9f>3pf~7Wy)_9d)K|>DQH@5RgUKbmAzDt15(f0#r6b4XQTog9w;A-M70&Q9
zXy{gek}l^#o@6or0D}fnHsf?38SP7TV3q2C=Vjtaie*cyb76QnTUG|KCV}e!#vAJ|
zLSM;%w0_8j@>T4KuJ%3;Yqq*glUfvd0nV)B0+73?_>O7)>IK<?<c4)c97w?6C;$6i
z1a?l~unc;4W{hVgLv}H~PV4k|wM9F~Pf1gea9M*!*B9DjRjlDjlP_LZjHVGJXFxon
z*(SO1t?2PrAXXfQ<5NFlwTL4L^74I4J4{da8E+I`>rd_|1?JbC;>2-l(m4esR4x1u
zIif@Y<$S5+rpnsai@`hTe57NHyoHM-F|HAp6WZ${yhg!?mSskO^!&R$dfI;DMcuE&
zNLw;et<D;tG;}m!oMxUufq6++VVYbK9eDr?bum`N9je!f;En!9<&=1xkU%DPg8)G~
z$GxXZWlm8fq7_{o3PK=9eaG_8W)P;z@CVP<uQ@zlX??Q9OwowSjUp!)%5K{WP}8~<
zT|;NarMjwo@)U9uq0y$<G!d*NDnOCi&y2x=`%xv_Z$L~uYgx{o<->TB_a3F16mPxb
zC$O$%t(^Kg>ayBbE$=uHcTi{4xzYHp%k9hAw)YIzE5-Xx2hAfLyHT;m1@OL11|X(u
zB#svB6sPk9$2UBTzb^fC!{E$O>n+<<>#jDY_6?j8+>j5v$wviTOo>Zm4U&QC%B|7J
z7kOeIrAC(~lL}+LqkyMd@Tk|xD1HjS@_g%UPqt_{3;QB7;n`MX<1h?ZBmlXC9Eg*7
zgsc%&$ja!xp|y*-*Iz~nWxhyD6y24YWq%i3X@Q_yiXw7Jz&Q-*o$DVKSrAM)rfmP*
z=9q9vT{?y1K?np*ygnQC=Mlym{>cBGQupAA96j1f!f9!`Yvm*PebF<u0u^iIQeScY
z`qYo>ys&T`jITo}3EqdO8RYouS}c|@q9@IsXN3t=zcAnLzX+tB196$A+UhFFE`OUy
zw4k$#U|4Ev*(VE<8p)L6fx#ZddB}R)tF%=wL{TXe59;BF0x7}67NmHdsDuLbtDQGy
zK+N9&T$CD)aC?0XXWJu|nZ6ATLNb*kTZsv4k+@aA^`1Mu-qS))`D)ubfq`HT%vC*J
zM_zR}O7NfxhVL{&DfDHO8}77!$Q3TdE#A?NvO}jNiw+00_YE_+-h?8H%C1bk23X5t
zniK<RaWNm%j#L^hY=GWy1S(DG%{3)FA2VE~&s?i)05F7q3>*FkG~~~C0sTxmMb4SU
zE$HbHml3G5EF>`VjS4qTjKhxFmV2LHIMZhcpUW5{SjQSGKkAMOBP9~=D*^0kt>I|`
z-jt+tM!8~6%>1>QI}yl4{-g8Cq~dV(pt~A~JIN~P$wzY@D)j2@NLg{RWBs^i;Zco=
z=CdT?**;7Ja<YcaU@2aBKyQO=9|MB~i%^EbQl)*gsXV>zrX0R^^ru@&I14dGw=n`+
zf`<%6hM5N#OrLN>oXu5IpFmP-%vYIPXFMx8UujauYex{}*Q<7eP7`DGZT1@DEJJtj
z6QhG-mbCbDZT5&vQtZ`|R_0kAuL$$Q1X}OkA%5xjGf2Ouoqcv8gv!;b>hEPndzR9^
z!k0X!bctgHcLst(kf+HG^?6BhKNEN!jv4V{$9$8dAnxZ&(8K?>lyL4H9_H`(Bc%}<
zAyC$t)wEGBC-X$hV2%&2g#c4$0RSoD_vQ3+Vx!k&{a7h<lRU4q(v|Abic$<}V>Sr@
z%fRDSOFB~+0u%zd#}&Ze)^@GhN}b~L>dSXdp4g?BkIm}Ugg8=)9}qkTUl&O|d#P|`
ztcXc<Cp++^DvGO=7~ofXjQm)GlI;6}Fg%xa{40PRf2x=L=QZn2jiOz?pj4t{^)t*h
zNfk`z!*#ICT+(lVF(9s-5wS9_Xvs`kks419f(6!LUN<@pO?AwAvSBn3%Q(9;Q2<K<
z3Ai;|Pk-%cOU+{Y)R%r7&N(sD{#7*&fiZ`MqrbU{kQyMc_T?}uE)Ua*Ut99qR8)a#
zZ(k9gn{^}xASj6Jz!(GP91BBl=5xI(Z<LzHY1cgohgH&rZa6!{t{)w*=NGV4voy58
z?s@mVL052sQoV*4P_lB&k`lcyOsjkSc)out?)|tK>7w5frIV=r4jNpQG)f4%W8bSC
za<?vtCosbn0k{U@U18|LOKL@U>K6GBpxjAGuZD<Ok9}(MgUZQeqg?4s!;vy%*BOu#
z*y6;A;x2u-+diHZu;tFsrFO-(Xlo#_j7UQSX4cuCNVd?ltOSJ@O8m4D?uJt<O^&lI
zHS_u~!oL;MHzi<w(5B8k3r-4;^VMAZc=q(nWImvRXtQUHpBSvI@|9>z9YG<e_|jBp
znHrhphU26u(|9P*3QS6Hza8hN;NY+>w$G=gnT_trw=FS(29_=7_gK`Up8L*K`o@kd
z6Qt}5vV%jliPA)^o(AIq0DQ@>*I<B+dQWlwdm{~&#atg}>Izf0gBj~uDLyBZL7tcN
z>r*F0;tb?hz8n}%iwaSeKTCvd-V19GEyE{O&bZe@1=dRN*N!0!^ax&avnLUtai2wt
z_hIgXPVKGFC^H$YmU?06M6RV=1d=PdaH9e(8Z?kyXdEAYl1}UWz9fQ?wlFx*72&=$
zo%H}PBCOFk3}ny+Ff)PS9v!jmQjxzaaTtwxn7Azpx>p!lw<_0on3U&fhGd6{LMUN_
zDoF`Ao$bH0IDifz1F{ZOb3P|VMAzAflx^Z6_o>fq4qsgV67JL#Uu?$O*12AvJTHWL
zYp1wy(P2v>if#*^e*Csa5`~>}R06>c5B!h$pUNUbmW4n1G76h;PrDJk!-hpV-gk;=
z1qdFl!2cUnxWNDV4P)~kSs#Y(Zily84~^87HrvmrQU8+hNj)xq{`~|A_l~;eAliiT
zS!AZ}CKLqGbBXwmCLp3N=)YpPe@1tKxc>ll&?aO08^F^3&B)tak^P6w<<9LZ5s<es
zK}xaY-%-VnpRtfWF_ao~Dy*L57y4MaVfbL|BWk+cQbP673hjGCLT;@a1N73GE<+a1
z0HfcOp#%u4)5uF8P~7A~>#Lkz&6Z&($G_Zth9NE~zvr&c>T;r^#A@@E`h$+Dc1*1x
zv1|kY`M8sq`qINitA7}0+PB-{f*IdeDC9G?IDeBKiKuQ=+bgSTnM`951734XBs%KT
zJ^*q9y0a-sO)6pVDP6O<yMhv@s*LGy!<EQ+BSUcs8JM#uWa2o4RHJVsaVANsRxN&+
z{X?)<6&0!#0u<Tu7`vXmg_en?bfTE#{+zgtmT2gxg(PBb38dV){mN9Cg$XntPf!OA
z#nax52Rq9alt_*|k##<eXY3~R;=E3Fd{R|<PdR&^(J(P3E!C@vN>8DcJN$;A8LXwK
zi6GJ=B$gcLxf(%*xL3q>J$(~PIV1Wq`q)h?+nC}hQ_IS@{db{TY}O3&8R|rI@iO<g
z`8{=*lm?F$6FwCn!YO0<ml4ZQtx(*xnT0Zc8^5&A{8VOJB(DP_RK#=ogbFiULpq}X
zTL3`L``)KV7GfH#JWoAaG54M^oLD5>jjw*b_4NojIoHedS}UVf0<{^^mpcZPr{h79
z6gj|Bd}N|>N;E>U+#a^G!g$6Fyt=7M*F)}V`>_1_u5+7H0oOFAu`S)&%ZO&tP)&C)
zY>j19IcDwk3^pxd@G=WN8^vwAf0LoGzl&SG?*(&-o)reQa8R1tTZKC4mvO~aUho*d
z>s~8ruVR7Uy)?S|==)b?Yrq2snGhP$23qMmXruc}ZO-gjr3r~{?34S!D$ZAf1m-+p
z=34yT(IE?r0}FWSPa6oq$_;9iAwb`P8OG+}WZt7%n^V)d!L-QE=IY4B>7h=;wW(23
zte@oy>IV|UOYk<)rYDN71+HX$z!qL)15*`K@`h|vkA=JV&(Ruwd%5B8?|Mu&spw4Y
zR%>cYfk1%)9XfVcW^?4Qd7>0jn8XT6IH{QLH}SzrfxN^0a;}O+O=mB{#dOmOWkb(L
z$};^q0b!$|BJ2fTwWz0<b|Mv}TITRxS@~90>2pUv)$3)J%LkSX-56zZR4h{d=#R-0
z(*!yB?#K-c>e`Z$a2yvIG(nATl$@Gz);19bv}}S;m+f9Tj~9xW9lpbzrO-5yQPT+d
z8TKIcJtV<>(i~;2iSIl0Fthap%Xv-@8TZT)|48cGx<;ND-Cezn#o^oRk&XCMF7a4*
z`R~iwf-5B@@7vT%oUadi<uK9C@IvUQdZbAKLR9EHpFc$7SSuSNx(#aoSr`1C-1$>6
z0IC9BbC~HQ(0lMT{Q4;P<IN|EFzr9{J1IZpiWIBb%Wda9?GnxeBF7u0$#}KGyNzxP
z*SvWI`P)7Hdyi~T`2{I|1GJY0u+NsL85TnP<Q!ZYtY<6<BeSpYPLAbdIW@2-v(}_W
z-U;h-T`z3evm2x>%!5hjQHqzNRwU7fO9Y9Z6x*G&zqr$=X?BV?sMB^bZiy+6N)r+5
z7({u5Bz`lFb4GARV*Y6QToL&(GNLy!+&kMPSwiOA{F=1b%<H8x`J?K)3qE@flka-L
zePS8f-OAka$to=%WO0|BUoJI+1-2+{R`DRF3V}V}jLK7F3~GWitQ-_E6fw7hDi03D
zWr5n5VvuOvYC=MY4MDJnnWUib8y2W%ZLVlxF5Ws)U6@D-)}0-t%S{h8hxC}e@Jji2
zsl9=~ltkM-0UVkxkd_vXqB9$t%Q87gf!bLj3O3v1QPTq__|*KS!k7JXWTxi@F)b%b
zXwsVwl+A$>aGbwgkD?_J`j5bx{>%(B(Mbd6W)AIpXSN|(CGsA8VjnxuXEso7F)I2y
zZ&`ppiZj2#Z1$mH|C3kGTb6o;lbDUl>XKr(NJrSN+qW|SU)8aaP_)s}!OHIq8K|9U
zh%cL<Es`I%PlsJc1Ow=vO_OVJBNYOLBO6qI(c=b!Vs{!8kYRWfvnd<OHQ`?@nA;#*
zWJZUY9XSpIgYn*pG`Z8nyliYa#dyMQheIf>p9=ZAB3m@-3QzBpBH?w)_iMem45M3A
zsRE98WmG|~80jqMl&^4AteqKkifyH)Mvan`#s}E5poE{e<R}wW3r}EFC;*vhp%Gm5
zo_TpVF|;Khj4+_0yurq`#CAw%|9SIDFi{F_vk*q6)-PhLH@lcAshV{Lb_uu0-ow&;
zoQ&(--%804Kt*aqDhx<0>tsBHUE-Snst6t9x^ZFsDJpgw1P`DMj>SkupSWzm!?K*|
zEtM$JV6*d@?Ep_E%lXcXyKIQREUXp_<x>fiPm3a&@U_Lrdq(G;9y9UcAK&pAD*|`m
zP>O1~i0LRMOO}sOmZE-rGEUdM<0CNlnjEU=r@S=OPn!<o{cUeuOxUuO7)1A2KvvnS
z_(1Hn6Ld2>B%$)jxzxN?jg??P>4$+~f)q@0T5l2b&6-@nPeEkL0$BUO$nu{|Vr-}&
z#uK{c@=2(!bj(Jq#w)Tueo=JBlxS4fI4P~4F=U~;XB?dsLE{iS^5!>mI-ik=hqkl_
zfP^f}bWi+xkc4||D|(*zx#}>dKr8f|QW(lotvxfs4lJ|ngU=DqH`M>VxEs^8J!$zH
zgFd*1)hS@r3P;wN8oBfV)Ooht|HOXnoQ|N8JB317hFuS~I$=!Wq4110r98dsgGzo1
z96(e2MF!n82*7AY_@b$(5x<|@F*4GknoS#{u%MkjkdP(I7JDlvp~oH3uMl{A9;(v-
ze-sz_bjFirGg^wrmsXfvbX@qAb?PZaJwb+GFfS(uu=d1hujKuu<FzRJBuKg7#LcVL
zhZIaxpmCDquT`F(qdZ1em^*q|yKN4@?&Qm=bUYf3ULpm|if2_5gJmIEpvV|HMEM!|
zM*!n(Q1+p6xCuDq=jc!#SbJ8q>DUdAp*^b-6X=EJ84(^B+#@r9R;jdfz+du}1Y+|c
zqA_U=MMV!4Pb5DH017vS1A%9ESG1NDB07v>BIuM!POP4zRm+wV{?V2#v7SMW!rFu?
zIPN%_fidEkNDRQlL!*)GKsNXd=c`pkxGv$-+zU;AlZf8{A?aNfz#c%lkRU8vok|<y
z#EfMkiJecoYF>Rn)s00I%X|oeyvab06<$bh#-1_nqI-<kYpt(JTn6g{NM2<}aS;==
zu%P6AP#p;*LL!0%gdyXFV<C15cpG_+pJskD5+cG}L5?z3XQQth?Z~Y+xeUnQ0hMY{
zy*Xk~9YRE2kJTSEb-;2J9_e2!I3Hafn+r}AGt=MTYg`U8aV7`!c95m)gX8G)U`$|4
z<X@7Dn>Ad6+=m!w$)|d6D3P);>bTgrvJ}Y*G=!)%GdgE@N}aI>kulH>D-U%yAfx&g
zT$xHuG^JVe)L>|Kraf_X*jpE^x>CB*Gf7fnFBWqE5Si?b%8CJrJj@}n;K$_*TdSKe
z%1$yvDT0!RLk5t2$fTbS_#lZW$jPxIr_zmMAaL09#-9e`ycZ&f3~U$JSKkJ1i$aiu
zs+y+@wYx7Jo!_0<{IX#NX~!wr&@jDCt;?>jezaj)Y~?awyP6l6pSq8V1P*@z@}S8#
zHb$#D==c9K=OnbN`pxx~w&vEux906%uXHuJ2p!FTt^9a@T`s4wf_}5H`x~H2lfA>A
zNm=7RRzdvzp#00J`Cm8qD~~rNdoL<9mJ`kX#=*0|dqEl()K>UXqKED`K;ZJPh{mz&
z&lEm4K=dCti&t{hvFQU770!Z0#T+dI|Gro6Z(hRRP4T~cE&O=nM3w6vcdo>E!-W1H
zy84`*OfP(?i8`1gA)5LBP?=`pw3|IQ$+IneJRgVs%#U}&!`VS6XgABv8B(jHprJL<
zGew!&R>FN1X!#v8AdLGPy`(GIusfxE3t_l@)uK&cv1iTe89kEIkZ8Ced*3&9W+kfb
zGz9Bqz8(kXfwtsXDtJOtmIt^_F{Q)Pu3s1X3H%&6h)Zu<ROt-cvX1+yPo+(>yHrn?
zw9f2dwHI&o*yq*}?HOS?L@_2SJ`dT``C_4~(r|o3QqOPW)q3(Uvm|i!J{QQtswiiG
zvmjPmJ9u7;H-tW<t0yCr*0<AE3>wK>%Wr=Zba1j3i_cuTEPcJp^f|{HAUeoAOKdD?
zZuP!iP!ClYL+gnQ3*cMn26<BhG^w~MNA1=7rwd^f4n)m_ai@>bpPiy|M-<6s1yI$M
z1fq!c6!p}d5ex^SO@T1a?efCG#l+XFiO*{sg9EG4J@`!C{6u?GB+%J*{IZ(kr5058
zw2%@S8?Tdh=&fcBD_eqC5^aCkW@3GH1~Uf}e>SD{mX3~S@Thqyq|kJ>FQ(>@TEl4f
z<>ECNuL~^>f|<NXA1qRkNpbFqrZ@naL**Oi*|hI6j_C2e)tn@m;ga6QynCtEFxa3u
zTi&eU%F5@;6Dg}GIog$XZ><45o-PRJKLFN1S{CN+nhXty2WWA{SPo4likquUUppaH
z2W73MIF!u_l^|V$7^t5NNQxQbYf<{h0Ow`J2HT&wtQjUVB`sLG)Xi!|1FH^3dZF^w
z+WPN$HKD*1SP6BgB61r5^-4D}jY+411m5T)BGkBbi@?edSF5YKs?xU6iq$kF)i5uP
z!kOpZF02jy9Nz*#dhK*TtpHpoeK>i?&exP9@}<pe_j6-jfu(&BxvdArWXh_Zo^~Km
z=hm9<Dnvy#dNH4>7dGfJ$go=I$()Sv$_M^o+5VgA%Es%DRROw^q5rP_s9fuUB(b&_
zWSIK5ePi@g6X;mJX9cCJ)#6)}l_lb_ev)`GTmm$Fc$6RMj7X5y<?l^&Ub94Sc3yyB
zuE;+c!A+dK+|pCEX98y=jk+nylb=?K4rtjk+ojn-<NJj6$Z6(OUJ71P7gQcUjc??V
zf+-`?W@kg)pa{fajmxr(I4xp1a4$rX00T!%b_v(2hrh-{K()`m<&Lc7vh+gmr6?x)
zGY9psRg=d!AvPQZdx3Put*scjb00ezzxB25NB?~4eN5<PP{-6)zY;S$@fT^0t|d+)
zM}vMt0l}|iKh=6L^Nb#q71Y@WCMUffBslw2Z7>93Ih^6aijR~2_~xlWV~u}DBbtIM
z*Sc%F#`vbxu(u?7H6VaS=+Nx6)4x41Qum3z;yogX#Sz3v7a8+}69^Ob%qZNNmUPv)
zf-UxKwik1Alo|E*y(+lSi7LHu|0bQ2PlgA?zu}9=tUBB@9`?h3?q*@MuzRHvLP4OQ
zQa_m_FFU2-I<qAh?p-1aAP`i!oM55Cjlj^G+G;#i^7@|qja?Cb#J#N&7jtk(&L5~V
zVVnR{+e94Fea?6nHyrX`b(qzF`;Tuy5qVOq@u*ptq>b#E%|vQwLV*Z6s0Nt&vHq)#
z?`*8>nUwqk{kv<zqu6W0M8trn>j&gCts^^ghgDRE2cbnu&y;m1BIFG>b9FVw3yo{Y
z1yyUO6~p#Ud8od;1c+~q5alE1Wel5`RyQ{pLWYW=(rgphm@_&MI}{#TS7tmaVqUNA
zAwiS=Mc|g<O44I`8%6o7RJ|*)z0EEbTS5<AdA>T22hXj{D|4}ci^{?cPMd7oT^O`J
z>|1AO)CgQyIM`m%gVzEp0VYI{f}%iv<4~7k;~u2)8{qXgb>|*Iv!#J%x4de(Jon~a
zu!k&!b%-x18>%4G+ri<+STwzP-v=gu5=osTvn*U5WwdA`XcX1_(M^i6aKMZA?9c4i
zwFE5Bsbnzy@@h58S7#$O!>_{CdxOb=SJ(m6X3c~d`VkV-+H)b=M_>)!2sSh@YzhC9
zNddJ88d74am~iE=@BY&D2OGtYX-_o<5{;!Y;Kt`EDg&PBJcQsV%@kC6WHJ;?2LJF9
zdb5+J_cA<L?S+Z12U;)%KR&X((cv6vug6YbGJo*GN0vqgHIrbtqV&+m=Ru*GO8qEm
zI@B5H&d||;V(hikA|zORK^?P)t)W3q5avoP=o#l~nUaKD8?5e8MGH!m1JS}r;cGy=
zj(o<LXD@5wPecd8el=J1rlod3Ykdpd{hrEC>T}9Y6~G;|Fe0b4fDqJYcLfX#G{i-p
z=i~_<URx;jRrY~kC;P<wSnus#!kx`QwTC@0+<Zr}<r1E~xjkkJE7Rr#cEDD2O3EHo
z5hl%MQi7b)L;g(woiSk;^4TO^`LWOJ6E9bGL5ZCzo@%+JG*D5J-kF@r9dKKw>5}C6
z^_Btbs5zGGXamk}H*5-bpN#UH(-M+v8;!`3J)K<bvq7?>Lt;QXPPRIA5WNy=Hiith
z#W}H8`iIbUbGWz%YAZ_a)1}Hyp{nv)x9&d)prdr<FHM>sjpP;mDi3Ce-yyKRaGw(*
z*MwU>Q4{|Gd<;dHl2$W$jgL0vT27RW=9R{NVO86cG=+K?If`uz`DGiuJu9&O1cFEx
z*bf0WL`~6x<*aNu#ZcYp%Ammc4vGKLb=}snyS!3cPhcRwWbXun9YbM~bqV)cVIUqp
zmbRl}Ok^W5p@7ODf_H5%RVFY-^OC3s1BRwRlY<rjtLe+C;k9qMPuXIa#kgVTRmxJG
z(pC$+-3`OOrwQk=MnRuN(6dpiU{9Q_<XuaVOtxwRv@s&1EL4hxRWtzS&;zu?MA~=!
zdTf@uo4*E@lJwg#r%s(08s=J`iKq#vY8y8T1KTz9j^w~71vcW8Ay~$C`8XWkW=HC`
zBMB+Jgpx?-q%BnC*;$@EXMH|OGz5xbD2<F_phHqYFOvVra4l`iRj7%g;(E?FLsV!(
zMQ7nWpX-d;3oC4p^+brl?Q2#1*5aDi5R|Pu-api(E4DA@I6RUw)`%}~c7}t>13d>&
zVF4tF*|pp5-tKfL<IR0DdpT<*bTVj<F34n$%->U9rl>6mNmLNVAC3saB<H!p!V>9g
z{=hxn!C<Z9z80C_+O(^p#V!p`oCl1+fZ=WA2jsV%Xuk2TwW^8gIucgosCmRzM6zS0
zr9?RB$H7FBEqKGmac)_Ik!@?z#!rpGiKm*pk=2q=R6!7LxeT7<hjwv5e@w&!Usfa}
z`xP_iXh5<33U0B}O4x#_RQVfbQrj(7xSU(Ut_l`9Ta*zG-8)0eI21AYM#beDCRulb
z8rE4^7oNy;#xP4Yt>?`dq2LiFLUv)ch(OsET&!5f)1T5=O)JAqmY>U_sp$#_d<J+T
zQ-m?4kj;D7dS%FZzRsB`<|-ven=fU3OspZYWF=dCX_RsFd{y+LF&U;gGDZeqj|UJB
zu`Gdhbi3FSuyHXoFNDXsi1KKEVvkHy{hF60sQN*WtO%T_FC{1Gx$Ak_gM-X~Y!<C{
zkmhJN0us7rSUDjtqseh}@3;C2AzHzrKjgvn*QP<Fb8)G31Dgt8Fll*@Dq^%U@*xM4
z@?uYTPzEA;z_7?LomUy?&_OU1e+~%l=zhHdmRrD(Gv-ZI;UrEFCBQAV(=Eo1en)lJ
zYKz2Qi6uh>I$GRwxWgzSC)A))Z&}Jr9Jyj-or&`y;qcC3CVs2VP5WBhUg!1KG^aY-
zgG%g)kK{6d1koa#d@T%E1T5Tbmi$nMBzJwpfIy8#B+hxW8jl{iu8o16#g#J)vBcfy
zpUJRLqXZ!#>*^hkwszLKzB^U?grMZpowupqf|QJ{7qfPByU!jqrBB)ucMCf}UZ5*c
zSOiVv5N&8HYPka#XdR$INHinvBRXbUlNt+y9^B6-^T3IGsU)&vq6rDmYK#PSRC-9T
zwxme81wK`LsN^xlRCc<X^u^%o2|+VG!G{NSkn>M(ql<UX*>(T9g~e5I_W#o<i?$ZB
zZTQgUhMq*+90f!1j$3~-Z<@%M@sQ;L{awN?x-yeC5ve)A8Ska9B$DwNtt`vLwrB)3
ze>XF~g35K%aTB+2ajK>+bm_ed&EZUnP$~SHGA9fVJfMPbUT4(Xv@Hyy>t274gfbSH
zjK4@&d|dMQT9h@SR@pfJZ8*{MOONLiDZUm5dt#Ipi`(u10W3vQx~@us^RDz`4SB9y
zZA<z*hEdSARzR;Pp^wDtOZ6rE)h+AK$d$tQM=rD!HHXS{N`?Ft2K2UHxnDUMwq_}r
zV3RnyDe~tzXI+kP3LCJpf_laiwgD`lfgXzsU`<R|#ZgLwNjEx2nIJM;AS1^~7s^5^
zqP{YPNm+-d8ul2cnc-t@oRQBs4{&$^NifiRL7ro7I;Y;uyf+9fR#ser`pLD^g8~$V
z47pxA?F$Gm5YqX(uSx-jAt40U9myTR8d~kv<IW^6r{wZDu0_qo_TBtmihBNf!`D4A
zb-L!3*H~H18ThfSdK~`Hvc4|ZIZn^_jA?U<$;QT%x<6f+%+-cSM~aZDPlAOfBG&N`
z@;^Jb2v3)|rYh9&s1Ai2?)iQJ?KeQ|{f_$BpS|sx?;{#wV?mJlf2e~>ZD~9a%{sTC
zXT}<Kd({-~e9;%&5CW1^fCjKox#K>HEabr_Z4n?iFc9R6>~b^KF{!2tn1gdI1CEo<
z=0&jXRJ_VK&HG|>TbwP~7ugJwjuzr@cl{JeW)po}<2YzFx6yhM+eNN&at0HPmxB}y
zfH#6|sGj3ypBO2Q#jcsEDF-qN<y4Lpr5BeLeR<QUP%vL^?F9u)xx^dggt={#l__-s
zONv422pRsH`D6XZ&27UlBk=buB=z6G<rpf4`(zvcv+MLv>A=6F0D#ngWFgCl|3GB7
zdWP?P!0`_WNaLD+L}fo%@>dyaMs|T{w#Uf*x0Cwsr;G9S9}tLUDQ+JLmEX!-9WDwk
zqJ2Im{V=24r=L>H{&y+SAEc?ZQlF2ofWuKi2&dpgC+j$L<+L+sVGAPev6n0I>`^yu
zdY6tFf7Jya=f-7jCa=?<qXks<)YYQ$3X-3l7EP?JVi^d-LQXi4;Gb4&>4@P9TJVX{
zWLNPlD7fL$32B#kg<x#$*=+?pF7-U1_zHMWC;1K835tD8F&Qmc9L!U5nsn&0%{$Gn
zo1AzO@d$Wl$av@Y(u51XD%;~o6_n-Uv25dDkAfrnD|b=}dJvH!2|>~rR=@am<zDTQ
z=8#OTz?mSi&9J#k-<g1b_@37-Q3FA64wK21c4y)tddmWGtFlo9l{lK!OP1x4F_~%r
z%Q#8T3>5U5d`an#-1>^na~_3HiN#$YjAZMIE4q9k1Ah3iae9J3)L(?XotMpjjd8VF
zzeOS~ry(t>MW4flx>ie-;c{|Ci<t+Z)c4?!&0jO*J=OMM_%fJ9`h)?{W{XTDgCxb~
zal^x3IZaKcta^5tcfkR#ABN`Fu|pL-s}re!uoiBg&;tgObtEL39AEZOF(tNkQQN72
z-H**~dAsBs6hFQ9LJB;O$@!l6qd<gc4{Bl|{Gp9WQ$Ktc2K^7`T+1z-5BrM1+WIOC
zP}AA;78-!KTOidAF=_P^1*|L)lAx|wBO%{C0VjOksLFi&=VR0=7E}QAt(si39Qq@U
zlIW@u=!Y4Cg4OY6|0rfqPrf;j{u}if{6In?@RN#Ztk8TZf(2nr-^#Up!HF!OXee5E
zmD=5mkFD}UZIBS)JOO-ggb+R8D0uOWSvolvr3hqS^SLQ;vKGfukEGzv%;L<+<NBma
z?2L<8+t-{`+-WI(s<M{RCRsw2ydD7hN7|48VTu)pLQLMXPH*B8VI^CH8q=fCFIH^`
zdEnKyLDtn&A9GdSpX~S**4rGQ=pXQ=`p_sW%6T4dVMIg<y7Y;)oF0+8I#M%e_Qnx^
zyJ4_MTxo9^d+{vO*i_C6vf*G+sb#7bt{P$4znPnXJ8`j0*;TfFy>wB9ZO0s@%L#&L
z|5a-kK77&bs-TlT`V;2^t1P$VI<R}^t@mfpU9{qt*_0|oPsJZq03JBO4iZ@v#Zmn6
z*4g;swl+2yJ3es$)64ZS*z32rxK=OV51IXHMIu}s*Bw5eU9K9WuJlV1X{EGR)@ZFt
zar`+lDBInqhxqi^Sy)vDgy1d+N;Y$d&=rPvIJ_Gb9APf3fP|btabjehqFKkg#<9Lz
zVpu7k<yIPBRl1WgsobdBKA8-}AxDaMa2Cex)iB&RvN>tWH^t$WNf`u<WW7p#X^cWI
z`Qg34%lj_={A$AtuXvoW#4f5qciYen4YmXKk9~*dJRc9Y=6GBto+pK|`VT#rse~7z
z^-3c5aO51RS{$9;!mD!l8f*xm*~JJ1+(K7SGQb?Y137BWuA(h>$zYgBX+O`{aNJ}4
zpuf+!I{yp2R&7ea!UhE{TbL*rP86O&CrJ|=hzGnu>oztss9su&Tt6PGLosE_!e080
zy^O`gb|$da?isGu-bt?^JjKwcyKRldY&#<iDbrCIw9Hh?3Z+Wf;~{0{!7Y-wg~ckI
z`yK7h3(pw~%B;HuvuF}wniQ#g*whTq7gIQoh=(_%IzW@--pq%RTecz&2V;21jtqsp
zcIT8nwMv|c+Jb9h)S$a1iw-(`F3?$Ap=YTFH^Nt@G<9yA-%;rKPerC5Q`)_}_4||n
zb*hJxvnk)N!k^$R`y-k0&Ct80d)+b4wd8?C4W`<bM+G6Qs|(CV!X1f|r}2$tj(p$s
zuTJFDSEq69GPl|<T+V$RyKSoEbGTlNhiAqrLS8c9SFs(sJuRA{Fdwv}n^#d#!`Vf&
zv}b-}If+AF`eddcInrNY;V}x%Y%OBm!P8(l%VVnpmBkK%Vi*8Ihlf=GE^7KkOO@`#
z9dpso(|_(x&5G6P2ltbSY9w#eqY`>s^W|6#a40|`R!FSVg1e~j94XyKe7j`VOVlh=
zawCu%wg}30CeD0MyPf7alq*EU@-pNHMp!*q8NbTLyfrYo9OMKl{BVQf+{VAe44G|6
zDQnrI^oJ}P4}u^gzk?h6C2nug_R!kBIHRE)e%!Yaeg8qT`LCul2Z$u{54cu_($nC_
zH<#}g%7{%R2$&IehA!P-0`UJ^H~-J%IQeH&1nby!Gof*xAU6sO*&=wKVufBsh^PF%
zi+sfII*5Tm7{3^_i#W`YPjW(nm{4Z?YawPxsZs#UpCpFbQN)@`LZIkeIBIOdh`Gz+
z7ku1){j2=nqp)u{t7KZQuJz)a^pu*NFS?n|P<g;3COzV-S3oN7&43f#xKwsE?gIy<
z?dy0AD}9M5%{}Lf$|QD{(~h8^TGb8|l-?FsEsrTl8OEKg7|m2}&9q7bdIZ<ne`8tv
zTiY?$pn9d)shNIzT3zOy|GpOEhTunY-0wQ}2t_$oY~y*;wcU6J`SI}QV7@FGGIn|z
zFzEO#_5SM50U8$vM|0yXaZR7z*SS9i(_{^m)$5C^y4_FA-mCpFkhGkwYxgsAG5o>&
zHbC@`0r3C-+qVJ#I}d>({jb}U-H7gkj<;JP5*#^hiw|~)(4zN8%ztx-ImrJ{_pqVg
z*(RmK7Z;}YpFK}xyGDoeHQG5oI$@rcr4U8!fx!VTUTD%?nV-~abXxd+Dw!r-u=aAr
zS1o7OG<#H(3L4Yf(BhYaD%bGzIubp}Aa4vB6l&lNf*VJ|E$xA-It}mRp1zeW`&!?e
z5pTjsB@SQ!nB(qMn>oZ2IkwwnTvhjc#+_gAv3JjH-K9HuH2e<Dc=!@obYFt&9oDlb
z=um_DOOqO)J?bckd|N?KGCxHzP+E&3o|Ayq5I3Wmx;7G_S%`BjoI_dN>uuyZJ)Yuh
zU1T+t0sDoA`6+Jxsen4~>?ZWZZpNd+kL!Z6C$C2O8C@Xv`G@sMXVA?k^g0>9;%ue%
zpV|#c^bcrKO^!dZoI|Dz7t?zG0883x`j<@SOx;~(Dim!yrPzz?@8-u}RPq0KgZI<#
zXJm0V{e$~)_HhyaKX5f+SFAsiDM$~g@3`eVtFMWn+$+i34_NTH2=;G`HX-hRiK=^6
zrLV$|bl0+L^nv}`Vf`Bt>k&%?4qs-R6;=31WYlW_z#M?in1iO%6!H4opa9Oh@2j8M
zrn-3Eq~-Z#-Wn_pVP7sb&(M}-Z>nC&7@%I;>E5<DWQ8HA4Vj}10uO&Jdh5-+nIHc~
z7G<lWYWle#<wG*r+(p2PTMzeg4~o{E@n!*xaU8EJG4X%%$2EGt0TLERbInJ5YKJP0
zIR=}~@Eiq6VYpr3-d~-L-)(&G#L~Tj=XZz}a?N9%%bMVNbBPGhrD@6_A;}jw9Km;C
z{atHs3ZqjW6sF(dp1!fX>9($DZ#)k?{FEC{|Kneu%E?Q7+Oo~fcF0wf=0k&r9)gSc
zGk{OCJ2OrLAD;(JMU#gv!sCie;-?R|+EDvZw$ac^g^3CC;KGr0++Fi@zo<Y~htG;J
zkbtTcD-NALvARqd>)VE?@pn&?>bNCz_P3dd8{!j>mB%}1_x4{~-+Scxn{RNL<vjfc
zbaolGJK8-h^AWQH!FAcwQQWZtntVt}k+wQ826-5Yc<qFvP!Z*b5s@%J@FsuEEmnu(
za$Cl*9P};ivxt>3Ro*;-*?0CG@~TU!?PyA6bEw+DFRz~<z%AaG+sBI<AJyXj>m#0D
zwhK7}oleSG72e`vQ^5L8Q)G2x8rKbKk`g^L>{yj*lTfvvNgZiMxKlI=*<32Sj1H`~
zh)$!4fcb4yhkNsMF55z(qeIQF!~N1QG5Cc?Y-CH=edvG_G5}nu!rc1T7Q&04+$4@g
z?s~fnea`IG?99jn$8}S?dum9NxJS<3g|4Z`hP+|2ozn^~A#h|S(_TQyp_XKqV2jus
z7$L)=R6ydd-Bt)()0)XuYvbw^uCF=nn`_$79LW0aQ(QM)EV{^+U*MGX`c%S7XToMg
zlPUjP9ZQA?g@_A$A5HZ2kM-X0=iIAtsJ)rybB%XIW;XkEt-d~AcHK`?P5#hQl^S&<
zRH8CQEc0A{B&UZC2qPq=6P~nlL{I*1a`h|%$=<a1@bh<KhxU1^<!_6RlcH~RX9v*3
zpn9qVNbwHfIks|He339AF9^#B#*o;lOGuIbzpk(a-;!PXZRo=6smkI{J}a<`{<51h
z!Sgs4PVx+c%pzws$9YC$enOTYG;psL+Xp!bjRBcrjqg-M7pZR)2m3#LOD?N4nGz#O
zh&9!B1%c=`3HGDdh(=)LCC|DW@)?^uV>}8<^I|M)eEwWsVt+_c9kkUwsxfp<ASPAV
zZ=_0`TlaO6!s{%3{wWk9T+gzJwp_4{t>!-FMx-e7gvaXEO&bnBw7D;QNaiZa3Vn?z
z)<=M#j9xhoK?-WMfjt3S(kYv0Kx9&8AVEf9TqC=lr;7gkpD+349}C?PD&kv4{M}*E
zn%C8+>ArG`Xdn0+V1O8qlOWi^?vC&u4$XD~gj#7=b~7TQ{4a)~CiP)l8M!j_V;~e2
zr`BPuol-RL&O$@KdUT=IzfP-W-lWxe%B^D*>Ef#$_gCuFviUvIC4p%w^o^Q1N{5{k
z^M*>NuKRx7jk9nze&IP~xZe<<*Vm8V^g@{S#UE1seLGq%E=9Xjcc|8<k2b1&1&D@5
zS+HB2MBt(H-vQ(cPH6v}*x!F*x877vl9TMI%G~Y>%_unJ4{Rw(Q0D~(;?rJ#!yN5&
zzyF*}NN|4@sqMlP6>d<bHEaWxMK+J~%|;@}LPIYxY$E@<D>qZ}=PLbEyDlsXDxXJs
zvMI{<6Kje{j`OS3;O|#UM+AmMM&7<h(ikB^k?wZ7S_mK)I4RDgOxtS@)zB0l!vU-o
zkPTt?z$enFw<BRaG=WrrkMp~O+xGwFEU072Hg%9Ad6me#%Qj&Gr>^Bju%o)VmUR2T
zco1ZY;zE_4H%=paM;Zsi2rt-kevAW;H>_9UN90H9Y5bn++j5@y-68pB|GL+j7fI68
zq?Hx=d7alTXYqGkO{Y!?k$kv!paiAnNJKBTP$UZg4AcNetmjAP<lw09u10}1_Qa2_
z;_s7l+=L(R{oLk6YxDBN*}pj0+dd;S`gbqC5@mp?EPpqHTu_o3pjd#m)&hVq6YOFk
z{eIC29~vYJ5HA7}Ns?l@adr~J&XV*8jL7$L2*DxYzX6zfkay;a^}5vLasO5PraE5>
zf7wR9=7d3l#4&_V<rPtG$?1Qp0+ES?{X}o0Pq>2F)|Q-Pr+tCyxnU8q%WG@yGaNEU
z$pLsl8Cu{bD&$kuz}s@?c|*9|w#EG)>d(*+5sIiwWct4lt$mxMDwo2}2Dc&`0)QY0
zK({NM(0AWDD@2@ZnBN-LR!L<x-GofLb?UZ<06Kbx#AK1%SbFZZyZoOY(tAW}&cfU{
z>sd}#GIzqUdxT*qU`aqbOcLECxD*z~H``WddfHyFJ$JdpyC~~pq*ylQj7U&QtpSBm
zj-KcOfCOO>RP6puOK;rOx3oXFUN(x7zFOgsH{j5+udp<pn_9H@HH(c8{GoK$7LdG>
zEzmEmF}Yq~zwvbLse$Qew~=#e-}T3aQ~Ss5{rLK-R~H`4Y!?ERhC!jv__Z=HHFx_^
z5j~d?F!Umat?idGTt>Py+?&m3?IxMoMzQU(4$qoe67?96+GL0Q;Zt7jBSa45eFI{0
z{R6Sls4s|?zLTcQFy-=j2kIzUPt-~d2xB3kv4u+kfxw!qQ||F)(PvIK4hvldCFKDw
z5*2mrMz*K1;mfZ~mv$HIt6T6M(^j+U&sZ0VhsNs_<=ZtX_P0N%j%kMxWVEtH;Gm%J
zBGK#fuTglRQ(CGxg#Pq#{%$*_e>1qmHntl5K-1v*U~!Qy#PXRLm65D!7VAj}G76g$
zE)X!g>?=xMn)Vg<)`|-=R>Q#YLF;ppMp~<|oC+=Mk}9Q$iYZet1*1edp@0U!KYnr^
zd~`^i{mZe!c!%PF@72E4vI==|r%ejGJs}-s3?mGu>!+7f&$#OIg5}6}#QB~mN%bN>
zS&=s9bhEvvny5=&F}#;tM#TxeKnkw{9P6j=l@#6nFXrCzD~>p9ux#Aj-Ccq^!M$<!
zK;!NN4HDelt#J?T?jGFTJ$N9HY`;4@Gw;lvo!xWx%lrfVp{q_+o!@hxdx2g}de@I!
zGf~dv{0>5Vm*bE&!>xI}1TS*qAhl(*`Dv$9a2J3OF#LzVK&SmVfxR9S`-GrckH*q%
zYWwklYV-Pa8CkAox&ik%QxO5Ml@+UglZjB65NB)O`*cI2)GV~MjIy%&lLhXuVp}IJ
zK2FwP(Ww#5uo8di6c`mO4gi~RTt9Wi(~sV?L{u3FmirpJ+tYoNbmBm{st$F8vTFah
zN3CBUZS@Mqb=l|B8|6O&xKOIf!tkU|F8VwbtVLcEC|=g|o+4^=U7Rh}(k%*mtG9@@
zh8fW2%K>ZG$8?6fk)4PKC+ZqUw4%V}kfi}+GaxKXAs{G1aWXV!fn-yUjf~B2C_KL<
zp^qnF?m?-cRa4o+gs5Q{b?p_BBw+F}3j#uF5b<)gqG{)W_2vOZ2G19(0#>(+EGL5z
zq4`~3fHS2NWSjdsT;~PNZCiA^A%xOBQvLlfw>sfniU^A23i4+bd@1M3$;C0D%6`hr
zRAM$QU$=1;+mY+jVN&4LO3?~kZxJ(5@}De)tjju={V!oH3x+&IKzhb39(noEUIuK&
zVlG*~xR6S;LXk6vwy^<7kbf3kGJkI3$v*BMAVard*psJ|N6~9~;Y?Yz!^y^~w<6NA
zXb;#~mT3Hgbog3WF|kbg1y`J(5uQRqwx*7QXXlfuhpr5#8GmR-Vsjpg;NRu6rVQqg
z;|<F{g`gapN1P)UUdz-ZgCYMjyr>E_%zBzF+t(5l;vKYNsn1@CJ-7xB>c9wQIYC6|
zL_$O}EV8Z$UcLESfgZQF%^UsYn@TqBH`1bVeA?a$)1Pmifc?f#<+Mo_%eoPq8r0E*
z$m#;AWti-8bpW{?;w?M$$ZcOo8|j^tWUNcx%#<YaWxg0jOXOlY2|DS1b6m)6a<eBb
zEh65Fw_rdz&+=<Ur^0kY9l>^s(|3l11iOZ=Ggtnz_yN5>3^+?s8x9Av=MGB18e)xJ
zS%IHysUH;zAn*_`=3KX`U!6}>;hswM4cQtdAq0p6;RU7W{y2d8U3Ii@66&|{JZssz
zXX#5ldvoGqJT~!F$}jU{4SwD1+EK4eEZW)?jvyhvprLBAS{+kq;<OnZ4fd;X`ol^O
zWT%b%x&ya{>TOziEk}8>fzPr{)nl7@W=^GZd0ft-*b?7tHMM!Lp>rq!b)uqnt=_DQ
zm(}l4o~ds3b+r!yUajfM8SZv$n-n1ZhMq<Z^$EiU`&nxLWwbqG2<iU$cO;zWa)P4`
zZ*jSh+q1pON}lXfjLW@i&F6H8id<o0S*?ms;?$Np78nVD(v%Kv1DI{+!kdK4axB(L
z{ah1en_p|Y<L3naH91af9Y6owiNKsDJunM<9o8WaObuuB#Nyk-s*In@?mB*I+lnw`
zuw3~DilHU!iV1869d+2Z=}oZa?~#=;?nzPo^o;=b^19k^t+3=XlNk`FppI;b&VIZz
zU-a6^2ouKx-Dr<FIWX8HS*9=rzKHXCUhujym3ooqFfo<0@l3+|J}!K4K7^L3P%pY}
zmgWgit*V=Y-WhAv)VkyYM$mg8*tpDu$?>r+x{kn2+FJT-t^xmcHHQCIwiE(|r;(7V
z2WvA4NdOOyvFs?7ey>a+fgN)u*q?|i!)s;)aH%!gs?S>M1nKeW8_F=QD@dPeC3@KW
zk{KGr+lPoW9Sbc1h@$hPLAbsiB^8sLePj23B9}GNIuD<jA=AdF|33PJC#kQ_`3S(n
zZ4c~b``wp~$MQe1(2YqpIfnm@c#dBaYyAgc_^?aTKHR4^fW)lK|IdRoEnSThD^NIZ
z43gv+pYN}V?o=-GFAnOMXlu_Ra=)}KSvfmcM545rL3l^+AU53CqLu@*!I%<ctSOJF
zDLyGmsvYuz@Mdpo1b>M&8)C)b-khz9@}+4LhDoh~D|l&fxnE(jOm|TP5!~8}F~t=L
zn<BhTqBdgopS7bCrLwT#a0TLFoFtpbckB$4snEU|Vtf55_FYim<wSP&M@zu?HkdQ+
z&Va(7T0e;bKBlgNAe&jCbb@G!#2?z@|2In7uC`ut)ft;lG|qEiR$-u+XZw0^b~}c9
z%-T*WI38BMM@3lN*P}M3jfvZ?xMij}DiH|s13;Oy1QtJpl(3((N#BQGz;$a&c+)uR
zR|(0Zsxbn{Cd1}R0GjmQCVAbjv4>FHdCEz;^3t4qzVW2fZzTjT>@s9vHDY01Ejmok
zJdR8tXIn7hmI46$K>!`SzzRg5;HMOrD7HR3=c2>>zK;=K;uxKoi77~Tncy8VrRh!U
z_aOiJ576{ip#PQQYs&Uj00!y%<hcFuL$F(By8A@!aIwem=d6E#gOSOigq~)WpLV}R
zQsTZy2)~?x)$X_^gQead$H^T`do`UI;G5+br*z-bH|80UKeUobKQk6Z+%>`&_0{?Y
zyyaf&xD;0pO|;bNxLp#^8+-zqj)C6m_J>(k<KzzAL(yo|rFr?Iw#CA<#j2>NJb08P
zKklPmzGYYB98L`!1vam!cemj`PlrUIqw7_ye)^WEA>A()B%48br>iBBlP`@@cp>mJ
zU%=B;nSxL*dG=SMG3)xLuWPE`RQrs|>-`y3&I~Qfc*<ji5i}3gwUDz}H+!rekFiE?
zG|m7BeY^E%%t}v^`AQul(^Ei?jkmt7$ZKU1Yh_?jyx1rlbJzt#I+3mm20J1KoxXao
zG7XUen|MxqB<w_j5!jk)xX+J9H%>uLlA~Z&f!Fd%VSuD{MZd3bijRZQv~QsVQ@5wy
zb+19=JooS)02buPe~;!(fVpF|7N?UE09D=#{D9#O$vyYkKW@Z`jB1J-5ey0wyGO+6
zGZJHh&RY%WS*p&)C#s1#4R>AtVm>}o>`v(3!V?LAWAufYH%>j)G02?c<V!7ODV&C!
zqy6u?=G%k1r$9{+-X$_g({(=k;r$O_T5saBTAT~B;imCUKodxPrfzTB;Bn_rMvYuy
zizhGLNKO*#a(RZ{a`K#NsgY`i=gmZ$!FQ9yWcNzH3l^OYb&z)adVQb~VI~I+0$8`>
zN#C6Y?hyMp%1DfSzB*SCJo=z5o)#+<SKd>*EKu=E2=iI5HS%|*s&%U|0`Az$a>jDW
zCPYSYCP`4KlAuy0an39XawM3d!bA5UEygS`OhOf<_dM@-fR4VXuRY<;GmQ{YXOP6g
zpV9S0^^4MdM!>uL`{~MQ;mV|6o0)fKiXDSB=Rx<CoMA6J2kqPNkBXuMm=Wu-kGyy@
zr{->@qfMjf73o<ln(vW~SvX~axA3CSP>VZ&ntgS;!0c#qjhsqFvtP(f?cfDru#nyI
zL(Q~70)^ujYb1`V5nxb2DaQwg6x8%nQ9_?K^01Ngi8b}MWa=QCIvtnP7k}5)@*T|j
zVH3uQ^8UX=SAp}!MU9mT-nH4kTh9BN4eesGRLGpVxX!*7hm19`MBbP+g#-m5`#eS%
z9q!cQ_!o`>w~V&wrG>jAd;0ulYVDW%1QpS$MMmTlGQ&e%ik3HorArtKoO{inAIBn8
zNuTb&C4?#V;jMCge**7tQ~cqr4S3n_sViGlS@d?*nM<1+6eD{!nOg6QWDw0~=B#Mo
zX&xzF1TOF9&F0?|+682pZRW~uavLccbQ+6#+Dd@0HlxovaiW>sn299IJeD|vHX}i}
zgS1ebQuRSrU7B(N8~b81x3!q_WS$4JLp{9A1kyK*avL>qN7cW-p5Ed+c+F&_OCNK(
zNu#Ul;W905K(&Jl5r69{zUgadq}}*`xBmVDJ#zq(Gri;uF7y2uF^L{b-}vEVzRAvW
zYEni{?YYGmKK?2kHx*iyjC_3ph1^aG$ANx^Tgr355=TyQ<wPT3ZOuQDpWbLUr|h&w
z(xGIn3va^CCn4Fw&9l|xbu2S2zSd5^Kk*%Q(6Q_`+#jJ-_Sl`_>zoEJO%%Z!MSozB
z%i~bIaG?2~b=`ug42-^Sp<I;wSl(;usfdtWaE6Urj@MIYx-)tEjE7g2YsBDa;;Vu{
z`ay(7d+(1Dp5CMU7W2L9uTx3ii%w{xHv~}Fli}2cCak_-aUG)q68C6Q8%%H)a?++_
zt-Wk!W)MnEOe&0}mUrl{{(wn43!8IlfzDn$25gHm@|6olH_?S9>4@f-^7H_pQd2(+
z<kjU$Rw`uXU?<_ZItf$mTezzskljY#yg*N&fx>L>%S+U3lr^|V6M2;61Vq2CjHHX*
z8z{iB)kzc4nU0lf%GGdXD<!@w&b2#R$#JbWA5&Dab8r~RtcfqCUarYibTlMeaJ|Hn
zV2S?%$zvu9x8)wdqyLrr=IbNF)9XH|UP<h+8aMv+H%Wvf#EzRY{t|3tn7;HDJJqA6
zPX~;VK^0_5Lo1u`%Iv3BqrhU))&i{#U8(T-1rL=IzcCDzt`5!yyCRK|75JIx{E10i
zEh`$@8BUH$Fh9rZB4N-lcZ@(g$f(1DMi!^0+Qz!iF*c{A5?JpzJmwX`zIU^a8mx6P
z4BTU_W++z+DRxzumsYHs=dw7XhU0|ov)3B=Rw@WV4p8Yh<>)wkSrlEjr?9Zo>C7jA
zz@E&~?#bggr)?XpX!#fHN@|ekY2p-Pk;<11w;)2mSbvlY9Atj8d1}#dsEGe@P5yJj
z*uGP<MIos@ijNwwhir!W1cMmx<H!YO6*Eie<|y03OCzSmFe^xVpjho18T4)$lsgoN
zgC4+JUKgS5!aX=;;k1V2u~lzh1nrsBN!o)UGR{2L?%3Tj(O?nud&424`^%j81@B`6
zJtbaROnv|ZyuXr=j)YtjGFXS&6QS4xPSPR*3Tn$dS7>k3g;!mp-2c`OmHubzM!ec}
z<<w|u6?JDR@HSF2i2if4Qhqr9M#k_?^iX=7h}0pc`ljb_DdPh%J2Jf>BRXJUkt!GC
z2PKu>V~rat(BhM@ElMZ)9yg346&d<6Zw{V>-1$U#ti>>&R}RdjGy?g^w~VKC8za70
zVR;W)sCyJ4^;HLd6ePiDC$d4rM09$HM3E{8(o>9=q)_a=*Rd}!Eiz)vHC&BrA3bQ^
z?M&K;bx^G6<)=NIQUmUZb3m=GW>i=R{TVVfq<(BIx;`7_;xcM6tYx%}nGm>!%Z9f7
z4LGGgUmRKts=#BcQt&)~CR7;KK6GkrFWUV?(}LexRkI5DwFWa8w_wir9u<?K#rlLe
zE6FV{buC-h?#@LC3pPto9J!S}k%VC~#6lS@K|e5#?hPq8VJPc*fU9Xa(s>+T>|0Yo
zl(yedHfl9S+E3-8KcdWo0HjBPu+f;(y>MFsSm%iViV*K;DW<hNJ6MCLbPhGD7)RWs
z(aEk68hUB*-+vtU5(&}v7kku@wQft7M{(uZGgf?88&$x`oQH^P0~2Z|P|87{_*0S5
z?-S*`enLb|puw`3-IWr1u3{Vp^54T9S=}HCJXp4|L<upMQQS#prX`qe`nxkoi$?n=
ztW<@TY)!Ern=JNPv^$d7sDd$ECQnFUHBp5}7jZ>}GPogD%3aa4EC@plH3(gJ+m4Ro
zZS#B6uHifZ6`gi+vcecA{Y4pMMHM4%YcPWWOH7SjobxignQN78<g>J9UV-mp?NkeN
zmxm`5$1_U19MnrSaxHV)1ZDBGPH!t-eVq^f|MR-PgRP=YsSHa1LaA?odjo4}OF7O0
zn$}xRILBp8R_|T3I#f-RD8UM&j#X0Tf?rm#$A@2p8aobE;A^Znpz4;Xj<J=<jpIsG
zy8Cg`eVHsyzzYKoht^Ut3mu;FkPbT+7EA^+EFxKEeMk^_m?-Zkd-es=7HomI-a9Iq
z1LH4_nlyT27N(LW;h(DcLtWewb};E#9s}@KczP>K+Bm-*i??H3=mySg8W%MzY+wBW
z?vptZHP@eI%jL9qeX_h>_U=-dL7GyU#7b#nX<iTY-pw%n-NnyuRBtDYFKx556~Ztj
zowZ@IFC{SkM4Hg2hxx$u{8;U?hNR1C%B@$`@^!|Ywu%|oO*8Qr6FU>30ud2W_mv5U
z1^)3aMLnLVL-itVo7!R)@~sU()Dd;ps?}(b({OWhj`4Or@X{<+4C7VF)iQ5Z(Ek)d
zpZG3+hvU?yUfWmiU5uOVRveaM?a?J)#ai@zOijEBUIm1h2^5u<qsbnNSncs>i#!)V
zv*{vCdzk<FyXJ;L0VV=kI1F?x;H)MM@J5#tbypYCcAd&{;5>3JuuCtSq>k|smC1L>
z@sUz!Q}*$Uhv+)otYx71Wxo4H2SW@_KR3!N$28PIc09lGT`g9!Ii}gN;1C^$g+6Y}
zGRtlOIn<D%=Sp}QVTlT^JOi((R-IQp;Z|pgi#!eG?*t0)o0(_y@dP3)^CVO(r6(Ya
zN&GMgzz9Hx?w#Q+*IP5LHl6mgI+67mq>O%$pA%qd!GV}~iN1WkV}w#9gtTx(qhlA!
zaXVr;kDOMPX5?JBp?eFJD=#8!RBzMu{7;+ROy+mqybvm!XW@HmJ*~CYCY$mtE4`sV
z6&L@3^&2kJWv(^&BGpvp@>xC|R_Y5P0kkNym}0C3A!s~J(mub{P_fxyYlWmr<nBrs
z1&6bpw1h4D2F48sJC~249pD9zk_a^tKn5YDu?c7lC;qk?PXRfl$D7g&jy$Z{7CDZF
zsljCjsdB>rad<FK<p{flSptpc*9%#&9o1%K1;N$Qepc$<(js<@5U%*i))xkjp*EK%
z(ys~XHM-u8EAR6s0q*jwoQP?JN%{xjR|=_vZb_^O3zP6z98fL*YMMiXH!X9^nkd%i
zrc1O%UJAFZw|ch;`Qcm)0?NOhgHzlbh=|B?g2NN>;s|t@7f^c0yQ`Z)<|sSKV-NN%
zWU@EOT7J|Qr0AZSx8CR=03px_F%l4Y(!x{5<W4=lWBis^DHKM#WBzxEX<{r6rKP$u
z$}+bi(prEjl_N?@)E6Tzko1DDNYsag^8Qbj{_wqj$H-Eu)>sm~xK|yuLlqGtI!59+
zLW6;wCT>^~RU5CncFmuFnR1&8#~}jT2XBYixNKwi%NtY@Ukd@;b@b3g(y+j5W6Kp3
zeA1Ptq^ea~5uaS>6A+%jekXMWBKk*EE=m_A*_CynA0A1m3X?nJIwhZ{9olbn2CY0U
zk;p8MZ&!Vk%pYgqgFE*eN4TQzm$2Ax$`}DieWMt}A6vdd72I#tR5jy9^)yaMNObuz
zzuOck!3b({U~9(UXo&tt=r=s`Cq?tL8d*HQWCY@-s)SEGPh>l#TgY4ThbbZ@lPA7F
zK#-a1=U->kWC;EChdy>X#dcid?Mp0gc0RHv0&ODGRkN{~1tj0WMRBp$?5>B++<SPX
zrLs&o77)@B`@aDS|9=%xHTqGRXZQ%oscu?HK;cpTN9{<iYST|1;u1I>HC2rN0LdWl
zh+n#Y$~XLKNF_V}0gn7=B>SBPQ_#mLEv4Rr9#<u73*a}z%HP}W)va=q(W^vK$*q*H
zg5?Uo<yR9an&91GyT+Fb$r|1BGjGKRO=hL@7tZMAIN!&!IQ&t1Dm#c(&$-4<<o1jS
z#RB1?z30z(N%5hA5?QQJ7i72|nQhA87y|+I;A(KNH*14D`9xfF>y44V@@bNai&xm4
z)!MF<;mvNcQ#C&_<A}BGi$uqFzVfbhs5w>hI)jmit<SEfeE$HmVS$S&@p@h*uQ(X5
z%n+UG5DC%5fj0{}Q?q_up~2^xFNisY(XjpZqOVf$WO@6P2_*=4%x(IcZv&-w@%4rQ
z)kh^Xi$Z5Y(x@cgd!)JdKL7Tt<bGBzC9EYs>q>ITiY)Y_!|Y$3M92TU73qwCo50p(
z(H~j<mq}_KD0-O^(*??S8VWlPAdqpCT)@i}3IqBitFaKOSRkDXNnIf{9FTv=P?fH$
zjFvKy*BvdhOYOWw?A9&m<K|LZU6yHL9%E;gp$0`X7#X^4M4q>{8LhzDIGS}Q=rg=f
zS1u`%Kg+!@=fopf7W2k7uuew<5FY`h|B=FrokeH|Hq^D{%KR!Zmh7Tn`UjYJL4UP&
z3i0oDz%Cf-N!kL?1XrdsPT=e3`sortyNJ+k8A*?D9-3dIMEy`qu99z$0uC0<!eLSS
zFd{{3k^rcovTHsmoOsJ@Gr7qP(U5NcdCH|8fFxd1PjR3vUm!7uKg%_h%b2F*YOlSB
zC%o6vzmZyLi?7maH05zq^fieV_AgTbTGEiC{eJ*TZ45;%I?FF!pWu6ewL}LG;jeMZ
zwxiqS4m%D057`sBs;QLOW{I3>oc%6eeqpDIi}H?Rqt1|jSi$Q>BQs})fUPE!gGa>!
zs7$$-!JyP7&H%FckwBaJ=_JL=Sxi=Edi-*i9B&C%NJ?nMt744ETIZ?($l&y=Q00J9
z9BMqO6W#SN`^Z}XoKlMI1gVEqP-bV29-I~~F&VF6_Sh95<|xff)M+gx>Qy*#HZ&Js
zM!brZ_4My;K1u#n{6vodWAJUTHH*#DwDI{0O61Yr99BO0Uh!BLX2wX9DKry=i%N8p
z$}$mvx}O!u)>5`Pk2nJUnV9X5w%(oPg2XQ_%>`K(=;xq_7_12t>CPWGdRY4X!Thb_
zxpww^%htH6rS%I3FBYlW(j6v$iD+UCv*wOgljR{Rr|`+`hdz9n@hXa;Qp8`t%tk3$
zTC-tH_R0FR+E7SP5>G=CWTv4JrOKRf5#{OHkYiwgRLY0U{I;qx?zsvSBXfoNjd!rU
zwIY4@+2y<5#Aov&qb99<I<?StSh3{3@>}Yi!e4h|p8zYe9j#570{O~Opt_PJvJ+Vu
zz#8Ox<8eHE?^#^jKD$M96LQm$A|DLjzqw+Yf8h9+%u#Ca*MZE2(mGNw<eepGzkfp-
zElM^~_G5nOL2+``KGyA`r;iJAnLJu@<5zoqbkx>{Wm)~iJeze1Ge`fo+Ax<w4%P9h
zw3$Bgf$K|77@~}(&^bLF>a7r*R@j(PCg)0D9vV&XLYzcX<gt=A&Nx^ktAsWMM@VAc
zmr<MFJ7}{>k*BS0mAX`U7iPH@?nBubj_WFhN5<^NJO|p^sgAB7)BT)WJzDiadtU4)
z?cT{H%(B|wF69z>F3QIEVq#K~M;;~N{a}!u;<%pjv2}0dGYJDu_gCW;qRY<;ow-XJ
zZHel#EF^2{Fo>!BV!p+zm)Cv=_g8!st^-x>1hE68ga)HR9&`zIYUH^k$ih;E2*sag
zY_D24^~#&2&}Nekxu-w_=_x&~B_^tWgf#wUOK{^dlwu*CS@i}9BEp>rphg5aFowgT
z^PZ+RxgrcBU@uy=^B$_FC$ryif0gx-6|L`<4)Q&G2U*B1(3qYQ{nUxYFIzh|n6GF_
zRp%X8Hz<RHvNP`T2KfECdkF_WwFqIxc+U<CC8s(Cs>|S?hse`v;P%2Xxj>m#X>_7O
zh~)pk_v3f}FGI*u^na~CHDp9~d*J<NIf(9mE<kxW^wL`z2Dg_o8IMx`uNHXz`<~4I
zp!$Lp`_G!cbF}}&)`i-=#QZ!f-Dg#Nnj1IS+39%%o#FXQvA^N}3JpvN;dcUMhSMy6
zM@tTh3J~BEB1Acd%-2{}#3+}yT6*})t`>8y=n{ES=y2EI;RNGJuPHwsuE+Y~L-$Rr
z?c~S^t2euw49fFucCGVo8l4XVS)zqJ=aPBeGU~8j!qz!#ghi4O=?BpnyW3*;7_mf0
zIj34g`!z}67~|!JTUPPWgVsoSH_hzM@(Op@qHQ1WZQI?hfxZv9(m;ksC(_6B+vPAZ
ziuDYIg;^C)R!0i+WWZ8!cP}AE3x%wZmbYQZemixHg}!Z?t%A-mb$rk!j@6blV3O4R
z5Q2`NOZ$s3`^hzX<yD()UAw2rkI)v+uCw^`Iv-5iUU9DTt*xvb6w`0-R?qFZf5Ou-
zX}+VaHgwx<rf5*kN@X%`bE;fqYBai03xlkc1U*_Ws*#D_TiXrRVbRT3UxN;Y`x$8M
zkQp0d{;KQ&FoyPx?_gj!mK!-2AF9}k41*O}|0XAi7eWQ0-jF`tVZD>%Md0Dj#Ha)7
z0Ao&#QP-UJW=txS&|>}^y!+}`WZ}w_rQ5H4Z7`RYfjrmS5teae>55E88@hp&eNltm
zHiqfpsbjngT}VYq&J^~n#bFsxC!Ok+e1xYQK}fN5Or3uLXLtvzWMP{lyyHfocXIx}
zb&e+YuhPvblKTYN6+cgyIiJtcqzHulst_G1dQk|a{wjZ!7~2EIpk%^q%zt~bH@LjY
z<|=MmQMMdfq?x)7=oI#vX%bPMkm}xX#!1b2-8sq#>cwfUHU;wv>pi_4w-c^)Dp`MD
zx)fGT)K{Rx(@oxPL@<g_W*eJ5MwNmR7ZExV_M7+^EJq{uqYq@^F*xW&E8WN&O8d2=
z!F(jldvZY9U|glLNL`6Vs|$lGt;x>{=`y}V!uf0t77%P?4YG|1vVaB+9~yLl#6MPz
z%e^4w45KNUC)^BRG<{$=fD<T{I6?t+LCIH~z><Mk2`uw7Rpz<hZCkf(u1!I*lo%9}
zWoC+v8uzvbt9w|6O-yIOYH4f3&|Rq4d%5Q3%f%32U;OA!^=GiZg3q`^D|y)|+UzuS
zH{dt=I2%3j8hKpgDO`n3rP0Q8il)c=KG3X^c?Efg1gX4dk#f6$+pv5|Ml+C_UJeBa
zh{Igg+hkh4wOid?@)tRZeN8^ATgE@H$V$AR!?r-BB#EeXV~_XI63F;jjRJf;=#OpD
zj9Yk6#ullkPBWcDE7j&oAQodvUu&e_Zbp_Y`vO4!73oxarJD8+U{Z70IFPx}L$L6N
z4@Kpe)?(km&kF8Bot>h`rb#BR1CE?*uquQlw{&oX$=BQUr$(Hd=PLHZaC1!p-7d0`
z-dd-6MJ}z$TNn(5pFK`BwF58IB0&`vE+OmtTq1l0B`lUqXMuu10X(Oa%bv7-kJUa)
zh;U!HqsA&b278>MJyo$c&_7^?q(UXLLq$JkRn8`~b<}2?T%u!`BU<hRk>I*XyEoNG
zx;=azjiA{>7pRJczcaDa-}~hh$Ev6xU9O4jM~N#JIB7H5ju1AtkmIznVWG8K{8h0<
z$+$V&UdHUvRN3Ph{i0nnr#oeF4S@}}z*k~Rs)IX%<wemIC&U)o0>*O;T#g2m@hi<a
z`hD+fBZuY7Jg5CsMxc(XqN#@2hLarKeZ6VUl!UuRI@q3#L#!|g8U1wRB%+;-XNofq
z_xWeM!@EpaXFEquP3e^939L?_i6o$KNpdEeM@wd<c$M4Q{YV|5if~ox@@a_I1Dxjm
zcE8WDTSb2p!vHhP=W+L%)#g;Jl7a1?w~aS`YCts2`t60s*a>ReEgBUhori^h!1n0-
zV*6bjEXVy@d-|y_F##F|9}HQbyfPa4DhsMba!~2#q%Ek;%X^yLQ2?Qx`91wzgU{t^
z3PET-!u95*dV6Kh6Z64$>*^}~bQTn(B|o`nYS}Qa;<gBnkP<8=Txe(uCjQKhEj4~`
ziDNNURlNIyt+*EK^~9Vuo%ZYDd|B>9nd}=)9-xmR>4=(3mXu2>P+fix(uN`Nh6*9!
zJq}wn+_8Icuin5bc^MYH^P+MWXmOfyJ&gQasg;w|E?@=sRYr3w3t2Pqf>8=yTq%?g
zKJ!2~`a}63Cd$Wz#aWi)&Re9ZRYgl>*UBTCvRdb?Feyb@vw~_{JRB2;klz{r6%xXk
z&-xk=cIc3x)`GsccdK$cE5_<(D>`Jq_T$HMmHW?D(Ai^{r?AAV##kBZqD+Vt4km0l
zODy`s(PmJvn&D@eI6$w{!bNG(*BwP$yEh7yK+cfVPO9QlT~AtYR57^^f^EqFCJa3_
z3u)#bHO9!G1pZ5kG-pH4qTY&hLwS!2x|IgWQMp|WOjqYc{q@W$OKcAl&@!UTOd`{m
zO`@X4UKnZQu_3u`9qsk#^E*xs`apVHkw<A={<uL3N1bkbex#G2yh%!P@N_$3WJnYl
zB^1_xWOWEw-!qv3S6MZ+ICO@3pZ>0Cs#y2Fk@Ll}5gViSm86W_@}u`xIX2_+P<sRZ
zlrO4gB1+<%O4@v9*HPv^{KmW|FN~5?oLUFXyd)v$NfKR$+HO13cwm901fq$Ob;oM*
ziPk0~RYYKf3i3yY;ysLfMRV#tU_Z;FZg7Cz(<|9vr%`phGv5}CzzHems$%ZEh>BRP
zsT?Z=d=b)K_I>^GJFJUMsfvq6foF8R<5NX?(rQ_uq1WbjdU`b{TI>hu8<n*(e%7wo
zY*?%@3FMwCeY~3!6;GOpgu>Rq8drC7S>rah*hlnLXFBVOu4i!Zh}N-1JuC@;(d73Y
z4s66w#nPd!e+nt(rU83dp{?V56#=a;qZDdjg~a5rvSAZSyO4}W@Fu7HtT~@Er($t&
zl=v}#10!hhE%>--_44md?^=BDIjP7=>0l9=pGl(E;gMy@0J$lfJEL_OuqvnwW*dk|
zO--$So>28!FV3PPU%n}0LG)AWuE}4AgeAYf+b!F4pST7(E0Kb~5HRyYacZKCDs-R<
zoClBSETecU2^)52<s#r{Je`K^P_XwHDQPrY&6^xr-Crffy5jMKx`<!4K~pZ%VGH05
zS~7=g!t()X0jN5Ej6|Yyh0a#;ckrios+7idbOM4;6T9hJsMlC|YAP|QFJzNRBZ#E=
zp<*={T}h+d==w7}5GF~E?QFl<vo{<1GwBI=#kEy3C9}(E7CY+BSf84A*xpKL3Th!r
zW{PWagj&p+Cw5?w|60m!IF??zc4^v{vnzl+Sa`j9TNZ)?Di`qWVpQ4Jxl+T_fZotc
zq>hXLcAdRKQ0Eu&=IF{445azazN3acb{Z{D?ywowE>D-vFwogX#v)PWtIY`2s*q!%
z(R6$=aPr3yJ}NT;yHNQ2X39o4flK+IGn~JXq75l<r3iR&AR;=cu$6++Wp4Pj+>>NR
zy^(DI(*;^1GgC{41M!IOY20P0FHI~`FrV5Po!(e~#n!ssQ9x%h%_i5ccQn;EZeCnl
z9(<;v{R~!zAv~d%_RH*t?OeZKzQb`YS+V^ac1}C8w=>3DQU_Mt`~>f~qzAT;pwm*=
z$Hu`8AymU=iZBzGmZIc1)I<wOb#{|FawZc-V?W5;Xw@$^r2F|K>ymz+%yQU@V2d;v
zR0Ex*g?R=qKv;@3p1QUnZ0Vm(N@ItfOb}&E(8G&H^4U6~Yw{s1qTPf`B$Q~JKshI`
zD{R3|Yt_zOfc(2Mcl>Mw@<|=W*X<>8RNZbAE8Ce256<4&T`nVa{$a&A;<{;V=5YGq
z45iA}Yb=PCIiACTkhR4BhrdKa-`<Tt0QDk1Ur(Rexc;=qNK5DC(jC~8Fyd=+6w%Li
z!89RT!ZEyi>a2iYB#PX_8&m?D+@;+)-54%@PNMV5GRtIqnZ2~UhKkNi*7HrtSQj#K
zwWR8l$d1|xTB8Dq{j>s=sj2LLe|tl7+qsMke#0SG`5<n7be1S}>}pbLd0lQH@lx8F
zzop=rq~nae9#m&r`nnc%gUt&i2eJQt3A(P*5^2~Hm$M_!-sLliId^QGQ!*<Bv;EP*
z-u)^+hH9Y*=e9k7`_)qgrj62^QR+w<2(kjZ1ZwnrY2isyCT@D19EpkpRY>`)ClHQ_
zvQ$edxgvbj3+6?-b>(;oFdsILLXjexbIhrK&1n9XQV^`{9#FX=huRij)sjEol@)53
zwS00fDC<6dk_6A5ZliM@=@p&2882DI9F$>$p-yV;N^vx|XSHKJ91vPa;8e}v<MKkj
zqc9z|Pea`8(8-`x2&R?k(pm-{GX+6OXu^|sA(L&C-+p5m?by1aPik(KQoPDowHzF^
zddqHNYg0Dfx@>VlN0hS?Zb3#O`f@@ViAO0I>wFi%nG-W<TDQu(Uq{gNM`eMgHXw!t
zWrRmh2zI>;;-Y8mH;OECNc~*F9MK~~oacG*2`BGdQD@{oXsG{h%hmZw`b}6h@;mgR
zT(sMrmdd!AXBwDAL5zO=P)1#&@fB><zW)G^WZ&G_D4Y!|X)%zKfKH$=p&QIk3Elwm
zF;lBL`N|<VQRbk)Al^CO&J(_=gJ?<R_J<gs24GI=2B_o=AXOxH4O?`WNcvbm)0&-D
z<<O|s6=?AKfl;?cBTHgotdsokGvkbI@KBPMo|q5!9@&ter!6a8dBfbqa5hLA8RogT
zy(fU`rMk*;^JY%*V3z7BDBb=KT_|rH)d|sPqb42pHRrU%Czp2evmkhXX}LvXx^jO#
zo8ATy74r3VV9YT}GPi#L>j~x^;1MyR$5=E=&Mtm5Px`g`p6l9oleG1uV&XHAI}^It
zA#rPRt3_n6gk{Rt>}XJBw1l)G%q<{ycanGZX(3;251=u>`46x_@z>F4)zo@@ckS@*
zef=Rvt~bC%6uaX+Ur2BmzWb~$+N5(6qr468PvNtFX)#`zFLC2hy7oR<^r&AH2b5cu
z22;8(2(v2a26q8=SlQqX>8SPxPx^4@6Na)tyX;F`%hP;#HqoNJSYz4w;I#a{w+z37
zCYU+u=W)3BL1rep8d;0bd;wc)o^9<siQiT?erI}i#7_ZH_L!`MrGW&miE8S0mhwnO
ztP5mjK{yRmg5F4KVJ*J*beht?n!Wfu8-txZq<>W{OPW_S-r~9)bBsspglH;k!)q0T
zm(=g{Z#|N8yxpD|no-Sf_{62=H-3D>b}PTR<If=MtlSh?+}>T$_<Mu9<Ka@9t!ToE
zCi^mJSe7!yU>C=iw-9R@gRSV}_KNQD4M_i~<f$nkjjg>)Oc&&UpUik}P_N2(cLma&
zU`C?-2VnAap~a5O1XLou9EqpB6x_4w6D#;_DXevy4eVy9B-$xMhKYRN%d!O&LKqdt
zOG4eF%e~;f8j*sl-LB53DOnO>h>?cJ(#4)exVwl0+dgr>Rjhsukl()OYxZ&)zz;<q
z_<KbE@g8q2+|}l_qu<c(w(Dd4)4fLMv})$J)lr54`;@E;s7F7ld)7wIR*=hRcI+?K
z9PTi`qiR~0z-JB-Ke1*5^x`H3{<3P<^aKXqmzHkMmd2hc*_fQ@UoG`4vsGUI0Id+m
z^Wsd`E>Df9^}XEL$XJy@R#o=u$aY`pe9iBmH}bKO^-jKy;#A)zY0?s_nJ8+f(a7jQ
z6a9Ge#LCDASZO4+m%q~Xrt+32$p?Sp1U`i0-dOU78jgt9>gY!IJv4AXDu$H@1L6R1
zi13`T0cATdKMU!j?+}iC-h>U?ND(gm9!#sysSWK4gqN+wk|r%uocTeGI9@(}9j~a?
zqz$98u0B4lJiCVM9b>slzi4-!g5Mai-x{a_qfi=jwgc7|6r|BRm0`)-1e4+5xakWt
za|F+0pTAz??#q6XL1eP^S8(`U`=Q)Z^yy}sozQ8MF1q=JZ>BY;w|2D=GWDdB=&sML
zx%KExe@V<=ZOthhi<;#@GMkpSH`uVnpr9yc0n)!oD`sufXlr_<52sTH1->f%faRj5
zrX*oe9e)6wmz50|cUq2ER#&Rl1X5D6ipsY-DRa7EIgkrOwBgbbUrmK5wPBGxg4AGw
z2>F9NiQhi%mrORQ@~UYnvYA6CV!WeZpY#_`+7Q7hjb$210$^IUX~xv3#P4v!7wE`D
zKsg%I>!jl(#i>qS^h3Gu9araBDykN7lD8k5Yr?QWA`f0S<03m&eD1%DdqtXjH!jxm
z^d`Swh%8ltjxC-84o{0W$W8a-DQ*sC!7=4LX}3(J^<h=N4Hji9==}f8VSA;-7AwA|
zZ3*0I*9%QJs<>7u!P~3W<zy`%QV@VI;QC;QCnY>4JB;#yQEk%4khkT%dt%SbBowM|
zj9#x?g|YPV4*BEB#(|I2nEfN{QMdm>t9a_X{14_6dNqOq6+FdA#Fxe6+p%xX#w{Jk
zKKor~!j+w(6}eCoO8m<`3Q1kg)<56+OAHo7UaABgMx?NLPH_!`C)F4UOVvg=hf8<p
zYV(7993H)8v(GKk#`^iIP$FbDrsZs}HhfF=v-C$l3-!rsV_Lb@RoSvkoszmZAhqJk
zl{3fBlWo_hYOm<`EUgYy#p5?MsiinAs9}#VCwosE{`M{oelyeTBY)Jc%Z-OhwLDqp
z$J*Nd$QxMPZ6j&TloELSsv~NlDEg3^6Gg5w`*ZKYVLPuYmL~Si-=4g)C<b|?vUR@W
zIqIgH-)mLrxX#xd!W>rrFV=1e|0gf9R_*HY%-`PVXd^Kb{CCqC<VhK@qXWg}x0Jsv
z@>RnB)tIcC@IA^dkW@gX3c+n(oY^)N2qO83_h<i7cI%G8m-wOcr&?>S;va)H(qNM+
znDb{v@`9s^^ulb(ldQN!c~9x+NmjB_$q%r^p|Ld>8$U13g1bQjcLOWL4~HZCr{;SR
zg%x;n!Z3tdV~9edKRzCWJt1&58dVrV2VItI37uL<9t0?U#aEA;zWx(ZmgNsLt3?~A
zOjMVT0xcuh2UKd3pZOi|n$8(DuHwY|$HWahS7sC`{bq5`O*ZPRJ9Z~(=~dAe5gbMT
z^>J$scBU&S$kqD#Bm?_xRA5Dv5o6`yTbyKF0|Kqq2n1ZoRwHRwdfN}<z^oh5`g>BZ
zR$1Fp$>|=QmIL<kjJp&cy~(-NHdR?kp}`xhL(X3W+;TR=H^UuyB4(k2!#6a-fo6}o
z1Y5dD&exWm&dsSzIa#M>R^~aB77I5we+H=vhK!L!-HkQ|x0ODrbi{#|7}zxq)WA?}
z{ln6q*9M8ucA(Tr5+**%X5+0}c~`leJFz2t5J;E4??66w$@}g@8q%2z#uo@dmAVVP
zZFP}%SS64eajfiBlxjtHJp1yvsm1W!UtmO^fxXvVXoo!I$n0{=yv`K-GUDg{pn0WG
zo(I_lNWA91cy^&`yXj0N4V{ib$uKq1hS8dE@&#uRI4dTxl6P2MwysAt`lGZSadXZ&
z&9qBpf3zpbj=m!l9s#(|iI+Q_Qbs3vjk+R>V9PKp;CoO%R9oA|j5Zv7UDPYSE8J!p
zkzE<`55plIi1zPGI`VnrVjPeY3TV3=RHR*hn~qXKbq3ApF&$KCSzW(!BWzOdcZR?-
z{uv~P(dXiF)3}L!Gmx-WqF80!R~L-9jf}T%elIhTQ*b0Tk&6mMHp4Z*=sq}ITyk@o
zH3560aVKq_<9173`+7@-e<{~9VnzN4$wMew<gWwnBuDzfGH;(vp|;R-X~fNEQYH3>
zc@tdtzE^iz9u2P;i!c0TU~j`Ru=bLT9YTm|Rd=zcPXxG4N&@1w8N6>3JNgkLU9SDN
zxvU<8az-m_)cC}!Fwue`Ib~0#s-y;+DHPG*gUu&XH_gF|<vo~inJxM+T(&y|cR^84
zs8EY`S>58kFY#X}6zs<<dntKKd%GuHg#%TZJ*hmEQF2;x{jmA$0>8Y(N{<6HBELQY
zYRpqh&`KBqeo%TTcN0odg7JDC%oUk^CsnfF&9axWRPlk=jHlP7pr0ugWsgSG+SvS!
zn(*S^l6#l+Tmrm=x_GFWbSH21qf#x3B8GiHLH_`J%yV@W-Rd1vbYW|UY;tL?KCX1$
zD&vI8Cuvc{!=Zaw$j~qey_7V+W&1Y%0X(^w43(mC2C)WQ^ttJ%*LDwa2X_7eZepo^
zv%J?7k1gliLxf}f|HTyWzo+1&?(cno{H(!-g2nb-WtApJvi2Y|-DQyctJ&G-S;=<z
zPQ%bX<_xTNe0_ADjiJ`7sdzLwIk)AoWBB5_;i9{44IviVLa6UtbU1{Cf|vjt#02{F
zrYV~;a9+&~r@%?t+_|1JysmMRb9;2cLyFH}o7yS6bS3x;Omt`hi2TL$VFCpSUh*2T
z?Dwa?HY~5Nptn*L5$ddG!~nj96`Np}Y)7+WWG%?ZKO)zK%=d6G^sTgyQT&HYq#?0)
z$0wu1nPhWM-_xEfRE&n708YKpIGZVft;;wYMZu$Q;^-Po^oCW*0mGZsUFqaxN<r^p
z&$=X+a;aN9Q~Ec`xIsU#6E)aQfah`uOmWGWqiBT^qp)jtkGeTm-?TBtrhSddI(dsN
z=j!+?UyX8hDV}F5l^CYjhFel<b@96ils#@Vtd507ePf%2M+{4+)zH5HOTTIoQ~=<C
zPHFRK>3NEp+9WF5o9>;fldFQQoy&B=8VaX*uRi{&YEKE1D6V!l*^0J@GeXMQZjP_A
zE;*r@6HidHeDMAv+$NlNdwa8At2=SI%#H9xGC43H+^^AJQmanO(~C%fUXOKY?4JRI
zPM|V6=JAdC;bBtWy{&hp#Fu`l9pVE=^`)sreNS|dRtvgmo3hGh;YtKZLQ<2_SwdbM
zI<b%t0&f7A!~p;ROM&Iusbq0(seg^SN=b{(XAU9n3IgpmZXbhZ*5Opq&TM8Q>}l#{
z{bn;fjwBiZtuSmb0tb>J1LhVbB@yv<`~Fm<Rm#-H>?8SuqIzxD=?iC-!Oi48V=mye
ze<Ip1dKDUG7V~&ds>hh*$bMOr{QIh5Q$#-Pr_5?^RZqJyZv;^$fnRaieEOUSY-#G+
zs2U8R^lm|!;;>o(sPQn*Hk@7!b^=ea?>*uN(Cl8@nrfvdc#G5<XI-kT!p)l5+{0<i
zhCv6xnHV%#@p`12?)ho!OcRPL?BH7WX$2Jmf$Y#l*p^oN2*c~V^iEoBl8$BYlRyiO
zz+MDPF)b1jkeU#a4?&dqb<cDntWs#RmhC!_vDsO(rc36!iSa3{-_O%#LD1{FZvv)t
zOqYX2LihLGW&qIQo(>beWnH%q(?FkMxUS)@$knyUe9M=?*Jd-a%Nj_$t5DC_7{eg}
zKW`O^<4%%=7ww8e8ph<_C3*<DT8&d?)SaxgQBZXib{@Cw7DGRBoG^HorqW1$V6Mz-
zr^uU7n20q4igT2yCSZ-|`p`GCg)^jc`19P6xfeNgwEq6qQ-aeqUFpb6xRHR*x>lb5
zg$KJ#v_v6zduqFl%++8<ZT{MD9wlSRs@c|Y%m(O&+?VYX$&Yp8BZ~!HklKOl2&NPu
z{o=xVfmS=5Ua<SFVbE=1YmK)7avCz;;Co(kEY*FSCv0vdrA@*y*xg$9x|D7){8F(a
zXOltsg(FkC(8=k3$Y?{3gIEr!OlWw+cGwtvE*QhdppM-Is^uo?M<QuWr{Wi24uThe
z9EMx`f=YzCw3$`WX)qEb{i%X4kgusEXQa75`p%oI^ZsB0*R=CmgFP#lSD!YqS<t#2
zJ>4oGcyROFxM`=HHP~CCv{{en-c%6Nu-k6Yp$N%y#Ux<?`vIDWk%)W9g1?BLGUQt{
z!_HV-ySMmp4Rq<8d-l_o5UT8Vjf}I8O|)gDB6qo~e#H?{XGPNigw;6W`>9?KgRXx2
zb!^)A;Xmj1*<|26CpBM_6X`_KXSDSqrj~%do2OFO&Y>ghz`?;}&8|;j_TS8IE&8#`
z{KyyGd}nnP^*V3dn6mqI7^tv*y{IlnU=)!5WU~~hY623ZmP~|l5yawyA+yuxA5ba%
z-01Ole?Agr^iNt3TZX1;;ePXiQFyEj0<83?GN@?EKm8aH-nc!Bi?Ck`5i#R)t_x8$
zDW3uUO5`?rd&)v7^<lH|lI0wCh0w`$_mT*BW|<01BAK<JtnQ#0C61>J2ROd$E`vs@
z?qN8{QRF!di@{~Pp<(-)14al%d7~pA^X64PWGc1DW?U|G)O96egvFuH^oAfcjEL}d
z-pRf4W^!4+wMB2sML3b0#QP-#GC8#SeWKj~tIi$q##&ABW|}UNgi48+TTrnp3!lQ`
z8OnJ^j2*%t7tqIwU;MJ(o40AF5<gq|X^b0O!UUxh52o+;wYxbKHZXs(hD<T19r7!<
z+v~>R+fwYKDoYpLsmP;B)$uLdln24$7SYrN95AjB5`~EPb{4%wDjbDxci~TPJ&v!&
z1ztVIO%dG<${!=LVv$j0o#>1i#=*P`N8(nhUjR#z0v8an6LeH9b8@V+c@@8PQuMFm
zVP>3|O%xl^69xL#+k&mJ>{Tz6Vw@lf0iw?)2Q33ZJ_n@Th~Ay6H!$IKH0*6F@0PWN
z{LLvj4cYP6I(N_2BdJ+Vnfo%?sZo*bRB}bJ`Fl`znDy$vb?;+-4V078pZ%@7fLn&X
zRI|p4Sx~y5Q?LNOru|qxEK>gyLfG#{?R5c$E(&!L7l(Dto@@HrypO+gK%@OttC?4F
z_#2wj8IUZh)EjQXpN$CS)7r3ZV4@PYOI8j{N)6m8o_TO=I4U(%aNWI8)L=)xUh!Z(
zE;_ID8|iNNpI4=2zU?9<k#xWLRAzxW4g<H2ejuWE>tU_`rc2lG)V7AMl>V>F05(6$
z1VMXIVVUz%994iYq_uVm<w7ZleF%+r!6Qb1q;L@$$JWmKExdh!cb;1OEyc15+lf%Q
zkszczC$$UrtI6mS<v^rcyAfC$RlPq5(f`R*j|cuBa#@A!Q8jKe5J!#unySTMaL$N0
zH*|b0xzVFBfvtpHw35EjzbRF*svL(@i-Yj68BlxFfy(%Rmw`m8GhwP>U`jSbUL?>_
zG_P#y=SjkLSHP((1tss96Jj(x2_h_nHV;C~1aK$THg?0`O@=hee;SCd!TfcOr*BT8
zQqr%NsML=7!|iiAv>FZ|2P$YT%vaOp&c4Kp0)s#{t$L)Vp0f(S9*Jf1zO97qC_3LW
zRs9uLB9x)Okm#+VxV=Mul$6jlzkSj6g#;f=oB^rZ5UH?%lqj4xZgH047Xuk4;<N^7
zp(mUS?dY++#R>Ya&&Zg%3#eVjvQ7fCU1o;kn+<R4w#oLNe|J%Xr|FVYS{?ZlHk&yJ
zTtccSv!XMDeP6x{c~%HUn-eOU?@1K~y|Jt-a~<S}TReVKQ7zQfiEPPUG?s10Pj{@y
zo~N?I%L%iX?bL{*p1EM0;#X(O6SU7E>t_s(HMqBqL}_-u_UWlF(xBb(?J6m_35F9!
z>X=Q{WP2@TdKJAnxli5nIs&-i*-T7yM^ETQLR6N>|D#Ll|21$fJDOT*r*+28;Mqe)
z)QIOlFPW`=7R^~n7`P=>IV>6yVcG|wD>26|T8>t(+3r3umn7f7`h@#CIr;wf?iRg8
z^<`;lAKN?C;N@0S9cF8v(as)B99FN4d(!G%mjt|t`v)Zc`gJ+@qY`fuj%JI%Ho7Pj
z9=*`+)nvR>(opzdr^ikB`7Mn`;~mR2{UT|pwKvdXH&wYDz0ZNt6!epPB%oFnN3P>=
z(=bv{c$o}0HhKxnoTZ8AxB+*Wdr0`W#I3}j6Q}i41?{mV!p7;3ItS>@ZsX_FdTmnW
z^Y-&Y*U369S%n#Trm{F^%*!umyla7q!3o=<L!}YF^m07q7Ob)YJx04Mpgy>q5<Nv*
zv<j1J3xM%gN5n3ruI?T@F=8}#Wq$(bx8j~Q?r}2zjlSmuO)-f#$y+v%KShynGJDZ0
zmT_cA>@&pVBp<ojrZqFDk2GrjOuX6T@Gvt`HI7b85M4SeT>++N43<`5;N$**OlkIq
zdtX_Bq-Y57@)v#tZ}}&F61J0+GH_Xff>h0n1-f}w=dmCkX;(bljwT=%mfMBJMW6M{
z+EyFfMhz?3cwX*#%#rz4CvA?vXl{8DQ#7oge1|b+_%S0bV<he<2mIFA(#i*2b6rP!
z1aY)Jr5}aAuz><$TZw!<onadO)uc=kbKw_UMF!4DSf;emedws_GnT7AY)p#$`b?Xm
zMjAt7x_;+YhnA_yA{)HbTB(Nf?WPc-!0*`JKH1x++-~Q2A4aWqNUw%13h^>T@^{#E
z?cu?37Nghc2`fCirc1yCZj>_tObg|0sx%xoNMkpQ?Q4KLZ}Y*`%5C1~NCWlg`Nf)C
zUblH1ByDwmCRPj8AL8O8Ov59OLE3RncGeh8=pOmLe>(Lll$_=~;n-0Bl5K`Gc_E8x
zceO-HLXq<BG*VlPyOWB;!iEr4D$ft|#TAv`=`?t1;A=?a=WjQ}ue3RgP-n%A^+&cU
z(`wp9dF9x~Ok)#NN~^X}(&Q-$vs&_%CcE3s*wlx)cTI`hPmPpRZORg|SS{g9TwImB
z>RaE<4XUGmwOm<wDG3NM6y(RoPAW@EP|t0WL&LW+-pqw5S>|?;??P+;KiGTAsJOaz
zO}B6j?(QiH2@)tQ1ec;9xVyVsAQ0T$J-EBOy9Rf+;0_5yy1u>l_kM4mvwNJ~=SO#+
zF%CZ&jLDj_R;@LkXWsX9@8uG-p3-W+lbAa@h7_(#8sHq*TTG5$1cuBgxo)l@;{wzO
zzw*ziw!ys`<nTj9#a6_rXdhdar(;jjA=47{ETgjUasWF_%Hq9qNueDGS6K3oL1H>o
z;gnJSlH4g$jxCCVQ+n}>^i}C2VQK-HijU46RX&N3y0WkG$3_+pmQJTBf=tAW=mo`a
ze*kwQ3KPc#00(!tiOi|J_$u?RtB5CmroVtyTX1EG2V{I@cE8imF~Pgm+-WanH%02?
z{B3<o-NuO~q3ZI8Lw2P7Fh70rkZ=JhYF83nB0^sQ#SzZYuHV?tZS6~to(GXqz0x&D
zJ=+ljp$XX@)op}V#x%afL}|_eMHT>(jyRA7@DLvyg4?Ext}**Ye}UF>)#~n?uoj5R
zV3yC2kSdCL+u|NkjimlsjS~+&7+3Byhlq$sE5*XCwEDgF+;Roeesfa-?$Vbvq0ux=
z8P5}imD%!9kfbRwONeE$n?l}?2!AXSEQqqdUt0wvnhINku>21ImYv<5Vprw%DSuY)
z(3ZFb?Hx6m9J+q_%&bcS@C+s#GFnJc;v$mIvKUhk@|<HG`s9z~mXV854W$&pSxfV8
z_k-)ih(A##-~;Z7E}L=-vh%whVEkTeb#RvgM)}`55@Z53=%g_KajUYNT>gGz;<T9p
zql=V?b2`ZLb(uCg{EG#8n{uOqv4L^&1Rb^_&9=&SakQ~*BFqx*A+xwMuHYz@4{l%N
zb9Wjkld8tXl_z?rWHyS<ZOH4I1&1RD6@sYDWfB4#Go#2IY2yKu1r6uUYxEx|6BRqF
zE3-0`wLiOGoaKLy2X#nTl`;Nit^97>LdDE@`U_WU^VzYes<^r7dN(Q`q>CZL<m8zF
z@DHvpgo?67r0e=+q9DoSppbhYOVGJFIuVxhGCmc%+jUthxR=DMq|%3edsI_7WIDMa
z6j|jLdDZGi?}v-`og87V?D@`wRWYi{rnI?@H+i`)o3q<y>Sy)EJq#nD`4{@|zo#w3
zw448P5p&)Gl0nY)$-WN^5J3(zRan@%H&3UHlSnsZ6_a+UaGyH+=i(aTP0aazL8+}h
zEG~%3=^L$dL@WpRFDn(-C@a<8i(&(O(V~pYiuHh6GCs0Y=gt`^_^K*e51+Qic($K|
zc&^HR1TP&U>;h<kU*8sAPmSzZD4C{%rVvGhq>`)BnlqtU!+K{)y?xQ8m5fzU^8U#(
z*$R1bPg4d+#dMj!v?cL=D}sde=$cyYh#Y?@!BqUhe4+PC-ju?PY2;qGi1?qQa>ILy
zE4B}G+D&;oXmiG16OEa$=KC3Kq)R|_Q3`Dg+mb;{T!<S!U30O8HYbFLX0KNB_PO5g
z<!3`LvVnR^EEPdN>%ZTkzmvXNY}iw+Hp*+VKlNVOy*RQg>F7Lh8x+Yq-+?c2KgNm|
zxlUL<C{LIm@PGka?M43p5+AoiDy3LShg(?G*~T->u9?NU7j=ck+U~4pD~JxQr`qtK
z!F?*wTmYQGKN9?IzR{}bH(aNeXqTJ4rk}lI-SJ3FGSusc{;egR*Hc^tQ8ObM(@H4Z
z&*1Ytjarb$OK0n-a0*~c;$3oy9;b`Q`>j#SQ!nbOTd1~Pt`gUmkX8^!b~aHy*WzHQ
zR&|!oNF24yzKE;YhTU@og8>v&QV4J93Ja(o)Q@&H6`R=WwNz_`S<Id%vG5jsm?D>g
zXgP75Xx7dv%}=7ylkAi;<$8t|Y>|yu{F}QZ;d*zFq6ek(!&;W~P`X0z;;iPz#rz*Y
zXsoJ8xy35pJ%{%pdbGMwrOQXp!ve}gXB#F4@NQ{p+{62V3U^<k+ve4cTKjnqYNjdh
zD|KkEF$iXs1BTYaBj`hZ7=Ox&aQx*eu#X~=>%Mj?XWvD$me@X}g8fp)73z=Z<A~z-
zGBEe^7TL-0PW2x7Lx|j#bh_h7{-I=g68Phwc7RYKO2Y&Wo_Ak;NBLFb#o6VGkA<F-
zOm}pGwfhxWD-B5mlVPu)-?Cakqw<HsY1KoiqS#~3#Npdl_+GP$0@lP%m<BQ$OC>)o
zuj@E_uL!s@1lm-28rV(VH*A*e07<+GzL*Bi<r0o}PS?Bz8jhL})I=o?u1HrtsMvvI
z)B4|gf<#>$>ClP_=U&ZG1-DXq_(Ww?kC*b%1UZrB$rol9GAb+GUOqoVOk68`i@$V8
zao=#Kd9H=AO4Vz5c$oq20>PL>IQQo`oGw4Few5RzzoBMMbqm?2+}l6~Vs|pW8B<$S
z@;qEdu>7tFgFF9+WLnzcYVAwX?<#3)$$xTBH75r31<+5Ug<b%Gzfo+S>6TfR|HeLT
z=QY6Rs_NZPPO9F={eKY#4^REK@J82=zXc-nHF*zxb5*`hVf?qu3dMi#*8ffAT{G;f
zGR<FbpZX0rp*x*KqT^dKUdOibH37BLq%J7c{316-z!s@4CWjIfSR^ic3ez>j{pD-=
z+c^K7sQf=m*Q?-Vmmg~0G{2cB6?a%OrZa-O%G@fShehorL&on|XWH1i*&Pyc%+jA2
zmxrcq)tk-aQsl<rYPiYhW<-nd0<{@47-VV$;l@u?C(dMC2t}CN0jBQu)H1Q!N5QTM
z>*`8_Ew)~26qRNK%&JUZajB(Uey^o}OtIKVH6R9$ec+mWNjTd(`oWTuGtw}hm_(Ck
zR-~*PLv$I|K`9Vq_^o=@_1iGeq|^D~x7gB7)Eu;!7EuJVww(GP?7N@$V(ou&iR(?H
zGngMqQ;}}m^*EIrQxW&3GsIfBaKnK1XU-(+QE*Qq&j>5%3ria5=00O?H!h!&{u-r7
z8cUW4Or&0OI-Sw1my>lGJmir7Z9S_9<86m>CEqX<jUv}*q(Ph5e)GL+!SS@JmRS;4
zBx~K^uwp+ytck3IOO;Q*Z{YCHX)zyZeR0<Nq`S?iwU<)JNSFsBME~{A{#sR4tppfP
zx^sg2Qm!U4^PuFf>uUH1l6ta1_@MoJTQ}sdRg>fR|Nk7h=>KxKnKDY(;1Md>&jdXj
z-pk5|rv&{S9Bq6(mMh><HGP<Mihz`jN8RvfitlJTZtuYDevuFVUWHxYg~wL@ntY(L
zTt`cXoql0GpnU2!80YCZEc8eD>)!hfA$;$ujfIR?Dt`cQ&nCfuycd(z>X69R9j19C
zqoa&=;CFPEr0uUfo?@9XmgCL|DbU08ZY(zh$&z0ND_9fmy!J}i;89|mAlLv?vHqb{
z!zf#2Jn>#b+c>+-6v)s+-jP?yn7|1CJr$H(n*vbe@)SsYAXB(m6FN1)Ik3p!OuMP}
zz5{@=j#9E(HqbFGfE!7bUyl<R=ejYS$*m+YZdc3+q4%$uDxO@9i2gZkZ)}f_0t&u{
zk1ehS@~Jy2m5uPccFo%Ye;+tsDmK$0Hr1^k0XUH4VLV9&T8aO#)<P?^)$v!$bY&sG
zw7P#Y&ck*64Gw}p8Kml}O%vq(b`JPCLVFa3egB8wC3dsDq@<Z4QZuvt+`MmK=1G8^
z2tMtX)0eI<@(%G@uh9ry37AKn4~l^Yi0?9Vsmoy)q#i8t+zSLA*Kk#Nu?v1IUH`z9
znoS^<;qn#{lkMwjxAzhm=~BhG>gwBX{6fRBX<)#lA0Rl}O->Cts%5Gg&#uL|_u_>P
zhT^k&Ze<hO`v^xD{FY&(0`K26@lzKy1HWg9&(VHEFTBb@R<l8s`=Y=e9O?GDO=Dc(
z{hTQleLNg?(^D7qyk_e-*JWk<*EO#8D=rksY(od7)MS~(wo_<$n!Qg1*dR|qcuaa;
zr<dXZJ#9=*tUswphRuQLcQf07MH25&N6b|s{zoA1!Zlj05@-()KlKN|sIS$1Bh__U
za}=tW>PC(lJ=~|lbj0|KO<rn%mlgpy>M8Ic=$<GS5VSs(MeMnFXdf3@{{&DMi9r3#
zTw#~JrW`wXyhaptM9pS^#<&L#I!>KxpzJ=Wo#dK@FzNr8r7<(@zD}*#siCY|buBT{
z883p>4{2zDE8xQSDLsW&n!_qe_C^Pp$>x`t*~DlR0u&)IJFW1w-|}5Ug@A2y$PIOA
z22GiJiNhuq>LllUoJn|itT&<d&47}ySt;bkCcdhQt&f`CduHfF7fxb^DVrd|?hhbP
z`rSTuElFi$%CV7M6B5xz{wcYMd)b3PF*N{C(Gir5nA9k<uhxW{vmT(>YQM4FnE8xx
zMdI`RH`&lr4uRb#(0MDHjazV$J!iA={Mu%uGF=)<t>W-!>}Xq9R?{*6a%}LEaIHz;
zkZe=(ccc%;YTnAz+(pO+dKWCF1RFA=sn`kzH_*K1&~N?uZV@-at(3Ued9WSfzuklX
z$9k@mlL3FLHMXpl(yY~M^<-eSnUcg*iT(Vvsl1Do<SzoMMVM)j1V+wD04!E_u26#*
zJxg(oI7%veGYf1m>w(mpAKu$1vwEfUk->EYov{723|4KD7YQmnjWA!)SDLqFRmTGs
zxY{m0(kH%omXv1*E^>Bv@*O<Z9o9cCch~fl(V5f;M(<x0QN%)iSz}}Vls;jbA~dtE
z!Cvla;1)1srI7El7BW4R=r;tyqp_wdlwNYmZNQxxV&kIg!Q(<MUcujT*zgu=HeXCs
z;}HudkLzl;_D?uCY<hX^5(5HL`fFtgC|LcIXh<;Aa8Ln8z+W63w5rurj%Y*8sn(Db
z;xoqui&5d$Y)Nh9oLqxKxhQ3>Oogxf=14&&#UOtb&X+bET)>nDg=-t17IdyishzlL
zp5wBbB$}c<Te?150eAms=`I;p47wk{$v-a2tV`krPe<cK4XA0Za{N(~fqa<B=Jxfa
ze?nW9o0%$l-L^fNJD-?5Dvb{s;D{L_(Kal;TA>?24LLj3S2*)l_?hM;WP9qHb=ny{
z<Tb^*w5)(7RAscA;a8k#5j$C-hE;E`$_Gy;UWo1hBp9Y96SfHO<z^dEthA@X<KYij
zrq7vipu6phmzj&SCFHm39rdgB3Fd50q;Jd@2Jol>>utw}lf4~fdlkxWB5UH-q$<_=
zZ2P*h^y#ecc#1okYiCrf>vuMNZzVv(2jQaJKykNe6cQ3xZBsKS>@S<YuI4Iy-?BO?
ztkj7a+-KEcm{t8MARSKA5B(C81Q1{!K=pQrd?lc(NC(Z4aoE|zuEA{jx~jDH$^i|p
zzD3M<B;Fo-5ifisxec=%30kbU4(LaujgA5=j(z+=?N%UNz;pP{wf$!wOTPP0*M_&+
z>z8U~Zn-B;GOCt`BNiMC;>bvfGCNEN#BfoO1RoQFvqB;5t<Sqi>?q&;c|&N+;M|#X
ze0dcUk;2bK9Njl6;P^is`q-b_Z*JZ6daALgf52=1ABCy>*L1i4=maMxqhbBtO|wBF
z$S`-kan9c;ua<}~Npl3e=JS_Zo}+`)Ga9%`3^?&{*r>2c;^Mrb9E!B@!RwSa0qc5i
z=Jv-&=?5soGEZqtG$wq3Kh3^>zV;oja8EWPy0FwUNpO~J9e%O~cV^7eFP&EpT~Mu7
z1)2wXZLaQWfz9vbulb3Rg<zgl9&b^ZO&>Ww`zhi`QeJCD;HJK35*HmJ?cjI7h!PNB
z3h)X;65C5}iA%Ka+o*77hFR<jmL(O(Xp|_>rqSY#@j}Bcn4@C>xF`Bo7LTzOkIfU5
zCB_wGjfaJKjKB`lJNe3-4~YwRkI`Q&S5Dj2cJ>*|tx9gq-+@k-HxcIL--R~LH}eQ=
zyRq&qnx2YLMsV$&YMCwaN0bX4eQN9-O&20Kf^N=I=}Um6cmiQYs)2;)jHZ%pfoRu*
zZ{urs$n>(KZgY5dI(#&7BHTH9JMsm~3~<1dE;N-SH~s=;t~!0?b_=QRMsrhY4I8I{
zIh0KwtExAO5x+?4j*bcVmI8Kpr{+Vj3{5%AFpU}X+k|)4ctT<|d3{FQ^sm^-txobU
zG8NP%J8h0pKx5@lhK-194w_3)c`;Kj0V0H-or?gbg5m<l&x}@C>G9`o2wAc2oy<U2
ze~u{DN@w7F(7#B=^=xp4&rOK#t1Vrn4>N>qqtOVYJ@0YLd&15x<urLdzD+jG^k5s8
z*{lA2Z36_Qsd4&^%fz7u1ij%l`tUUf8VtvaPA{u6K;E+;Rm`kKn9Y*!8NI7DDO@;W
zSsY>2sU11AKK3ppTj5gDOgEI4zH;~INhpLl>9`L}NCTsDp!JGa*S57<FLk_YtT;L2
zD0ILeT9dsCxwT7$YE_r8y+)&C#MD3wf5|ru+EIGwCrAdx+i6M_GBnXNmfgR{6xioy
z2-3k|C{ptFA+1weC{V=}4d_wPGgDP9Ye6u{Q{%*ZC*X$uea3OWig#jc7{6I8dZBqw
zIWdJZC)XG^BZOH+kK2E+B5s%ifG+mwH{6hi8&3mUjL_&i&|ssd^78tHxute9we{QJ
zZhSiz;3CIc&#JNGuxv$m05uJbEeQazAD}oTU&)SUcD0@|RiB)qjC63yRlrQkOixna
zBq&M1L`o3TdnxY3o7pQ~Hqq+GR3VitYZ>OoJfg1HSb?>$YoO~8(5k)Iw9+X_iohv9
z?!oX;$@3sDUbZ|$7yWt#=bK;I9@VJ2Z?t1(g;xm+)%9b*RPKyZ2_enNLZZ1Gx}PIb
zf=CRO3Tqig2O~5T2d6j0OBLisjjV8s5w1R0iBTYSlygJOpSz|!X7w6+oKqJrxj(3)
z=1gO<|C+B@RJb2?hco^gTs)wXTqAVTq$_{#h)sudV9>l+Eh6f$G7Z>KIDZ7x3ozs$
z2s$-G1O(rwaViDq;tWxl@+KR1?TYKKY+N^otuphuIT1PqYemh2+4Le9Ig^=n3+v)H
zL}-H`uMtq{7Pu>Gzxys;D3}m4nrOrSAWd(gqlapYzMl4!_;@6TqL@$ep{rE{T^PWB
z0>z)3G>K`UZ7gHFC~OZbX{q;eautDhi9nZBc$Yb-M*+><2^vS?bHF`m5cKmx1>Bc4
z=%YW(HqGFoxc83?@g!s^unopn0}oY<+u9>+>|BD9*W*DTG%TlAMQ|K@5!uoSqSGwA
z<0;A3x}9{^g}%j`WZpJJyjor5=gK~OR!6VW;{x)+(#q>&_<<lN>{3z%BWW7iII`*B
zogQW4hO4o&b}3$DsS$c7Z8C^agf%}QmLf&krQ8J509;rxreu(NF%wzyWeFWP=||E9
z$UGH0qqFI2bXs;nI^)IHY}uA9@~46!tj~fT+ztx^?i*M4b~BJEqyDW9*_ELMb#>lv
zi*z##;mAs5dgYS=f?4so<ycs8hSDEZ@OHSf+{!OcolW;+xq6D2)nEyB|L9@-S7@~f
zRV4LnFMR`t)yTz;>Yu8$nfUw><$Fr~Jj3ixo`#Dr@4dDyo#Gm)1cE*FZxu*dIYnMw
zg?I%^e|P@1`uokVDovNEtgc|!*@R4WrM8Ilu0WF_E0UoBab}3-1DN9d*?Hx~aB<SM
z{j3|qCM~xWQ+HFJ_~5H^3edjmV#m@rw|ls%tTGw_v@ecRLLgYFlSBXcJ&GMqBNJqr
z?$E5Y27?BW5t${uoOJZC`tslvcc|#+Ozs3FWe%KI`M`HHE;p!7Mvf@p;J!hoUrxRA
ztraD%f_zYiIjiK0VF;!#StE<AqfX40u9F9Y)~H$r$yn>=<F_<{&}}#X+2&$?Z3WI9
zOk6hzTP|2*3T{eBZ54JRog?trUNC-(z7vbul%&~)Y~y#3kMP*`==)2C&!U^1MeIOB
z(m@N?aXSU1<3IpbDMVPLrIztiORpkxoKSP!gG{+A9<hg|=chd<44sOjY*F87aE?rD
z;1ltiI-1&7Fdq>?eLS;idqcN4#p-M@tGj%^&3Y7=yYsL}7e7_7iP!Br5W$mE^Ds{;
zzNnaV8uap49om}z<6~XeGIC*oudtC(VL7aoSkhT4`hxHMy{ZX_z9k((DbRMF*X+P#
z9_OAHRbD?%{*#7?8b4_(wrf{a?`~kY{@dz;6Jq#f7*`AghEHi%dQ(gLxVW4g%X)3H
zPw@^UmRlGfg%-MQD8vF*5aN16mJmLuq_Nq>RF*-xZ04%eAFW56;v8E`!_&s>*VkGQ
z_b66_;Sut}{xi_+eR*@HTj60AsY|B)d<*b-&OdMfPEk*O7a9D)Zh2WRuPgymhX<;l
zt}u>4Apcm14R^|i{UKVTJ9)JlSYNXs=3g1kL2XU)c}oB8BiD9o!Vb3VrT|CU?}Cg(
z`f~!ryx)fC*Ym31eHJ2hB(wFG<sX+*+{+w{GvAe?C2>L!r+wmUygZ2;i08Mk-j2_>
zDuF7`OMg2_a0aHsXZ3wY9MC@hvFIDZv$k2`!e)K_G(KC@(pZx8d>cLwEQB@|VtSWg
zu=*6rNW%MN`Q$WR5`IJ&?ixHjxb5DWBB`c~0nHjmtjq0{FbW4g1<7mM!F1@wu9St_
z@haauP#?Flg%qy4zF<D|`QbS3^g!$#ey)DLAZsmyjB_fD5hrCe7zfZOjz)vp_Ci(X
z=6*56c}+S07`ySNur>pGswr~Dz4XPud@oDvukP2(j&W|c|D3PhwyEux{?sVjXHo#A
zg3r)H6u%0yxL)3BY7U~&S-SI_J<XGAGx;3lbZYclsVdowBE|e_6eddlkMorOQ+c>a
zMI!&ANS}XUh$+-+zNhN6;(BhtFx=93OkpN9+0wx5Ga=(~RP#G+5u8Uw(0Afc<PX9~
z*pco<X*sA#vqPzW`}%{McetFj@J(B*QAbt9dyRMMkE5-tZaMU0@3YY9(wG>4C2Jz<
zXe~$_{tf!FjxU45Esjl|{N0UQ4|i_^zb(=qpf}oBRBiDniYP=(Z8GJv;7H^ODu^SC
z^E~X)N9cL(HJ_Szo-ICGwZuD>jSLk=d7H~?HqnG76Oi-Bzr|&e=A*@kznL-vc@{a3
zt4o*azIEcy)8$%u<{mi4-Oyh3AS!5lFgThL32BedHZctfRFaHiVTg}W_5r`fVGhDW
zFm?Acul0oNu}FRAYkC_BX&u^|8(Y9AY@cNW<Gyp)Mr_SkwN($*OV?w+KmdyQZ<b5)
ziy7ki2P**xo<9;p?Bn@njQI=~Fg!xDdFs!r8Czklua`O7P7Ub|b06x8s6&}0pbkZ-
zd)|+J^^<hvv?I)&tp2MtrXkS>@^Dgi{I@Q;JY+lj5fcj^&jz%2?BCJ*HSyr`53Lg>
zmF1M5=!NjF;#@R?ISJrl`SxizU;~yjr;?}5v0`wgdG6{NkAgDgu5O*uy@^LyvRI4=
zG%$dYQT%5jj0Yj3;x0wM)}^v{7WkXMb8%LOl*S0j%HYGHo5GRjul%qQLQdY%QEAY=
zVbUO-mWERxG7V7WAeXfI?d=!q-I@Lc<RI?UStR=Tg%WN%GOOYGaeZegu&IEwYyRb?
z0E_zRCGa*_nL-svo_aQ=YgJ8lRzV?isvA;kV|Uc~FvL7@k$^#$A;L%t2%^Q8DUzpy
z0m9*NihuxDKxs0)+^aO_w#`TTl5Z;AD4x=_)fa9ih)q4!$}`mi;u8#3GRWqh;iK1M
z1d<X6Ncgzo#FStFIZ5@GJ&*8g@GKSykM;FDo7EiQCDHS;{U$Fr`3K$2jd|{=jBa4$
zi1Eqk3n9M<xG=!VmT8BdHz{A3Z?0&*gCy2cZJ#`l93e&zx$&M_y9%{~_pF=gK~DKK
zhEM?O-a#SVvSf#bjRQPGxflpg?1Vrt0_A|GO=}KwBG1>QU5R(vFm*CAh2gAn7*{v0
zW!Ayv8Y2B8OzFM1EF>ZP8Gc!ZU{(<V%7TPr8Y=O*iZ+S;cfwr{3L9VF;Vu(=kKDH&
zTNFE0DC--uI+v{YjOSzCm7_SFnymB|>cR=IYwT?BhZ?<pLq*!ZAE>^&-((TRk|_6}
z17Y`e(Wq(#JJn<In8n%<omA(j*e`M@PG|Wif;nr`x#Q9}j%g5%+(6@Bs9Jr(20fPX
zauhQ`gL_0roz+|T_YTU{vZX9~ou3*e(yO*#kyFj)p?0W_vx(%k_mV3(M_AL)(2&<6
zQ~B)8g#9MrQJxH}<ulwR%*kr7VZGG1mi<}AP?*)`2mnlhb(3P$fqtk=@lTob@i;hV
z;&YXGBvDY<Q;+ap50!s)d;aTHZbyOC_p8|{##tNQ`R+@YaMs^gc?>w#Bcz!GwaYD=
zG(NU+Pqp$O0SJVKc<LwL`~gJuAiBTbk4{OMT4UE_9vd^V;=OKNyWmansBc=+7}I?0
zAa3EE?yC~$;HhD>y<Du$N!2=Zkebkl`Xv^*F!d>^-ELxXUI~L{!#HKbu9Sh9K$3>p
z4>64|ld%^|!eyC9Z;h!b+*P{FJN_hZ{Dw1;!3n~W4d8G9c?V&%iqpW;`%U|tE-QCk
z4xf*|3txT9i_U&sfZ7MPX(CA8Owe%esMoN_ZoW|Cy{Imp70Oz--?IOqf4LC@d%Ll5
zFQFke#b5N83b*Fy^~wUz=I-A@)PF)4WvbxH;O6aTgT`s-;7k3A;U=!!f^KL(Sr%M)
zey$RL-Zx~|A9!}0`5wh`MNc{^O2nWV+k&PRruT~Nih-$Cy@wPTsYTv+m51b-d#V>K
z8>f-W^0q!EW~U_&U%{*seD1NdmpYM3`E%y^D>UU(eEo2g!?%OOD@aHf_myyR2@75)
z%XZv}ix?-O?UTEmODR8smT}W7(!(W`?cWv3HL3!%BzQ0R06QYXBihFiN=pY}s%;I$
zZ_gC@gy%DP77|_=XOoHbYV(R_NT)08!VYIec}CGmN}^>c`;C};i#Z4|HgQL>-)%`W
zpg9Y?64qCeapJ(>Oqb;1XO=)<e9t-z3-J+mG;suA%^h1>pQt56Wm)KELx{Z_N*S8I
zgbLP#NA^Fawwgefq-Ly_7PGQjh<&J*M0u;`IkVmpM4172fr=ZjBjUd1G!CA|*4F5+
z4?OCl(cYy~j8z_F?t2S8RD){~(sbd3Y9=nq))F#`%uv%LAQN<_8(@TkC0Asy#yCc>
zG5GC7fyQ-0W9zgj(si@DXy1M${<x_)C05V<Vts^UP_%w5UmT=N%9c+qV^@M1rhc9A
zkb9L!Wl8%0933nvvRaRJ2vxj{3Jfjs#Ht6zh3J;L5scHx_eF&}@{Bi@ZjWY9DipUh
zjfmw{g54S0${AC*eQ?R`ItKGL^EJ4roR87XknrJ{C56&3Z2_S%^H^V(PN;FbWUXYs
z$%U_Hos?MeWQiSd*%EQoT|ijT$N?XUkqHp6-#Gf23VCVp%w_&CR+uRH{55*g&c2OO
z#ptX!Rl<s`rZ|cxV<t4N&OGP#==Iylxs%ZrHAl^uRrD&Xa`Yr|c<}(8Aapvz5h#OO
zrZkUJaw1RZ^M)nA9MyeXyw5sYD)QYL7Bxcm*LbpIF^1YOJ1z@O2q`9sh`=2sb5Baj
z&)>hrT_}CGjYqrO_&+ZjF;_gRo@j(TI5rmIh2`f#cLZfhzc`9uZ(({!037*nszaBi
zJm+6=@9DN{o9c_Lm9EuSG9=r_a(afN#Svo>ttefgi{;CPi+3W?`f<HuiM3l#*lT3U
z+(^l~TWKQ--C7dkpZ%(ZZz#^dj|fw_hPhJ1)dazQ8Xk%m4Oma+lc5!%SOoZ`Wt04z
zQAVdmxTkdQB&^8hBHWLi&E#ck7+fD?&r*UNALWR8rBz<JzP0d%1v}(Khr1?v-Y*%t
zGs?f+V3JhD*`5+ch5HKV2x%tcsi5Gugi1!*;OnhT2PqT?r6+wF-iniCAS<JAKfpm!
zLdf#48-;U*w@(Lb>ZU?Kx4OjYcek{&k$ca704^Ub<wwL%-`b7P)6=Y0XeDKp-@dUF
zkSS7qH7Vz5cZAHPx5)*U@hw|^=>m@19ZXxJ8JVyL`DwzGRa9Zq9<JstTMlCV$Pguw
zS$W`PIEEwfs?}p>aYD6xxG;|>-bzKeZoxnTi%fNaQZdb@oapPAZbRAVI+$n3q%F}n
z(2Ph)ay?QqliJ1)fdHJ2kDu$WK)R`wQC0nnU5fu)g->2?Nw;*_kgF7$qP^`L0TM7q
zLysOJNWiCKTA|S;PN5?A<KP*8TXA)0qviAI=g;v=6YtFjhq@*A#|FpKrbW`qIj^sY
z;II>t^++9%h_GOQFbhI6X1PQ#E_A>j0dCN{7hVxF%!aMX^ec*h!ca_}HH)lqZM|x&
z4Z-EAWAqT!H9o(JXl0=4X#AQ3?+)mc91$0oI;-0Q`C^&M`0x@v`LPb7+%^^b@1(i^
zf?5f$Z+GI!;(O0ylLhL2mAVkW@A)49@$aR|)3q=DB&s*{jD^p#7=!W;%#Nq{o0E1w
zu*5Z0y+b$ys~<2aB~Vt-PnM?Q%{O_Y6W21#;EN3mVJYkx2CEI%Eu1ykZ`-i(fyIIl
z&yC1RFD!!>>+{))nCCXOM8TdobB$n4hzcjrAJbsqq%>f_yCy8fv^}ZFQt@B!NL8k8
z%j63}pG=Ln88{5kUp;ir1QBqUJy7`IdyCaSfa}F4NM%7-+60>3b(^UkFLFY2V8`mC
zMW}22uT)R+1eHu0QJni=&7>lzI>}1N<s}U3>JJlWD2mhiqbvKVr`$G>Z3UUnN%jV+
zPmi}xJ>F}|or(DDP<8*ZuOPBF7uXDQ5oA9oZL$nc))L1SOG2Rkps4YjZq~hrq1QMP
z)ZtppmC7?2nQjQ>9y1QRR6Kg}%XRT(^mgov)NDo_u7f$jHt~uh%&uu6BmnGAIDNMt
zc%JS_-Rw4*<8Y<3Qu0=PLTX_Fho?awUj-Afe*%ZWiTL<|8}$A4pK$HINfI%4XO%eN
zJpIa;w}`%C{~QmQ+Z~PFCX2gC+?VVvRla=&)h40T)Dj**=7$#a1s)2Nk~Ol7GUO9%
zyvGg@-{*JHFW4*w2b)5-8*Kb_hDItcTqw2#QJF?|afUwn^lQIiywIwGCO}2K%XeI8
z6FtK*o#6if(m?BKbyC8WRTxc7Is~~f2=q#sBT6KFOy*HoYPu#P@8*1-2N%Y>-$<z^
zIV}hTAE)Ir0As7LZ$h`w_h0JIJu1DztR5DWWYUr`)dffL&wT2?c&}7-*IIunE}UdD
zU3Z8v1sfa76rZ$QN>HCv0>3}j*(Mr}(a^~fTR{k;a=<AeUt=g%A7QGT|7aQgqX$CS
z(_`(c^4vsOM)>PR<@U>B>4nJ~T+eST<!|rK;jzC{)_jZ9t<h70HCS*y_g;LK(Ehgi
z2|C__-~>_bh?4yG@5I0EuK$8k2i5m)Vw^d$rx$!VU-A2sW$-fc;uUe;tXx0r-U9ti
zN0Xe4ghA^x$>Sd`L*RU2To?{D1fm5wQcCx?qb;L4h16>I)+I~w$1JGjjDx~59qn)k
z!bmZR>8L-GQi~ujd|RmUAk5QJ;9NKsP|N=0SXSyDWIPYmZA`M?$Tve@fT}?hZ+Hh#
zbiMoOuhdLbv-#)U6Y4mV%yNrZF32gKjU`djhKIEViXswFQwNVZb`Y+^7SV*?R{Yw=
zP+u&w=FHBL9gLWq=e$JJu4Ke7ekU>da`J+3HsIm6!-6+l$EUj>JEM}aog+CL&lL<B
zC&{JJwWt>ITK-VK&@NxNnsY0Vq{jlXOHgWfLm!8aM&7Q(h1My7ZUp!pF;s0L3Q=vJ
z{yL@5O%6^7YEC*=z$DiP)uD>8J2G97Aofyz0(=6^MipKVI<9HQlc}9l32}@i(NkL4
z;_4C-nTg&qD7~FD!4Y8D!Wqr1c3P%YZ9E_tY64cW-g`ys(b1simwH6TjegFkQI3Wv
zH^ys@bA25wV%8%1&-T}_Pxs#t_vNEF?dfZuHOYU2kE6vw7FNFu9lmep@IZX&=3WbY
zE+oz=?3>X|S;s3KUbmJ!B;qQ1!&-uG2iTyErwl#$Ewezi)2bs5DI>`QznAMJp<*0U
zEFMwB^QiNGdVbj=T;7szOw=A;I9P-h1AlyJHyristd?GGW*Iq)9^c$K*z(fcjxd2~
zLxMoo#!*g8%2^8)mutJ9tD;k~bXrm>CNLS(kprfAFAu9|R0qZ9qx+Vx)x!P&f+)SC
zTQ(Kin#r=J=C{<V4$$)!*b${kuyJ}_?~kf&%KM{Q8h`U@3meHPj7JBH{tODzHd@=N
zY=!eDh}}~T@e2DK9V=<Dq@#+{Kxc-jU}{skkZeNZ5l~v07Ke!G#0e1$;&>-s)1d!O
z;p-a5en?Je17)K5oOTvVVV1z8zQ>&nSk)r2KHf8ovNCWue}|9{R@)%K(ZIF)84kZO
zF!fTq_&sz8Qx}j){Q>-n4E=T4eNmN7-j!?a8QNf?js_%;H%yg`^yln*yMRN8NnRJ2
zgt&rpN<~Fz(LX7@f&0pWE)|JfP^3IJ&vyleU4~(bm#gaeHA+4Tav#5_Sf&gp8Ak7Y
zKXO{e7vi3}-hNLtH8i<q&8|gA5S45lRx(L22q#7oK;JmDq4doJ8I$sp2+KEA3k`yO
zK4b`!T231s8mSTv5Ed~C2V*x0yddbkJEVF+oj3UPcKN=c+GTEg6@>8JsOJPj4_EK(
zV}?r3Z9*!K3)kgbgBDD-diw{^Ldj=d!lwD?pvv{qVuu5t&ViMa1EVA?j(PQtN}Yns
zUwg?OHCt|sRd)5WwBlt8f3CsdAM`^W#TLQz;?z<}>5RfudwK0D9l^@*I=wP{NGz5g
z&e;e*1X0>DY3n`BvP7x*MRM0?rLaOPjl(_S)<OLNcC_crJ8j>RA41g{^jRre>RXSz
z-=Ddo9)><Wpo>Z^4IEuJXUwp<(J8aq#HZM*17k3nB<2s{e)QTNbPV?MKh<GdG~GRW
z{o-11K&R@ysY~E~qY@oqS`dnkg)fU29`*h=;8eI*?bzeP_=KKEQzp$pxfHmuub&Mw
z-aXm4Ff1U4bOWA#ng99`zJiV4e0EaRpV%M)%Yf7T#E=(>cN{3xH<OD9QN(?^IVp$4
zkZS+@9h_9(R+?1L4h)fscMLR(gNhI-MFn7qvVM0s$Xe%mC%AHEU{2=rQFi1t(=<ad
zXpB_qTl$)$mNT-m=^UrOc<8@HahDA?vL+G@CB-)?McQXLTXut3Bf^y(#(^{$`HFD(
zXtj*^2S>PYa8yYSc4U`b#?`Kxa%?yiM6wCmls8JK15D|txus6f9Z{O30sr-HI25mR
zTqtzC_VY+0s*|0pD7@<n$TI22Wu!aPw7|VXbF#e9OuwF8lL?Nh&MuK+ybzR*1si0L
zL0w0K-AK%MmQ#YG?{qaBeKnRYJYBID3E;)4BiGa?zI5Xt`+4G0fv%!R4+msW25w2|
z>DzW-`?@o97w%lVH8oFT-{G>GlXiWgjp1&hSYp>a*KBgEV5XM#{!5C)dJ;izSpZGV
zZy3Lmglfm63M}k!cyfHiN!SEh@pj7C7Btp$)=Q3z+?_=?H%0=58)5CBdKU9j!BUn+
zM0?e|eR=H1pVG`{@ro0aZIa)PlfWktPyoCaW#<P5nROTDk}4<uab(b4sU?u$73D$z
z&7UTK0p1PpNu&YP69%AXUXkgn;)QZ1B_$CcsklFcl)_ZP3*f!KD`H=Aj#8^sAzLCy
z_PvUduwjo=^@!UH5e13&mH-o>v9C42_&~_!r;VY)xDJ~=DihXrx(60&g?rRwZoaBN
z=N6srJ>~CS6Ds<Q4gIgh%@?^XG^Y8wobt+5G&hy|YN}q{9Pp~6xmoz^yYL|!5BTJy
zy`P&edLw}t^6BQ|u@-HMdUHOx7!&M@{UMn5m=3+MJy%OBCJ{50<D2o8XZCw(wjHBk
zDAn=Sq|O!YC5mMz^+o`kH@h_noLtpNt>7rf5?e)?d1EH3kA5P&i6x%SFuBPCSzW5v
zxVi$*VvqYstrV5d+RVoUL}`Epd7m?k>oD#KgaZt04s*~N$bcP*F)w=fDZxZTg=Ukx
z9>8wj3}jjSYDrWYl`ynGOOtj4f2>xlCc)CXGup7~Dcg-8lVk4ntB4f^L=^b1KkGQs
zAaETd(>pjXJG9?wCa1dI+gD0GA(9V+fO=!aH)V62k>`FS2(&89a=B#?ZS&|hvSLhC
zEm5v=^sp91eUKsNxPD&T8vV&I%1Y%s$ep!grHbe&S}XU^f;L;!m;v|$jX?=PFB2Zx
z2tRF<(WPGus5;BBIjxOMVZC)Jl&3!lVO~0JMR2c)FJEbz<Mr^@v#aHc>>{^O>5rSi
zbu=B&G(lz7Brcz?xL{8NN&upC4OA`MO0apYAM99|1PRYraSezmWQtu&)Eq1OjU~bF
zr<}+)EJMRTN=^r7Ag8C8mL8iE(W;dk=`Cqq&UtYNDl1hlhZ`H4-h~tX&_OOO%zvVx
zYLa4V%<^6(6+8Wx;*a3t%qP2x&7_}M$0Xa)Z8JTZZe~Q<ZyAPf$fLhxypwx;19tCs
zX?e6appVa9IeL0BaVX(0Uuwuwb!8Mx`+p+U9K{#Pp@hEK{Id54u(p`37K>%j@qP%#
zQ>qYXF4>VH6tewAmk|k4O#r41^P<CPAQj<p)UvIT2=?lJxr!FQAD&g3h|Bhkotu9S
zhr&998MWnyNPle<34dsrt`~#KZ2=mmb!OVE7kB}}j1(7-mY84{Igp^vlic~U4JCL6
z-S_n9W$_V0crwzB1oYn5n%v85qTJsC*9%7=(Be~!5sY9xZZ$o_B#|t)<z>0?DVjUV
zNo}0bJ8<XAQ$dkvQiVQbH(=CK-Qx1s2n2mssEX9q>dn5VAuafuG{+|)n8|bx91CO)
zYOkqEjiu0Z7{B$J4t%%701h*IrS($#_Mo-d*DR#c*8OJovrhAIf$$*!f18P;tUKuB
zs>5AMv1X9T%QntSavhvu_`xR$|F*<9fORIJCa&1Hk09FOHA(j$Voj?(*w4QCV_J@v
zGF?9$8FMs?RV*5Cw%|=XKYy83>LzQ{2)h)#!dBE~@|bnEQd@P>pT_4@l7HVUk4vrZ
zge~Grf#i+Q|Aeuo(yx%rH8;f)%;H`(*0w+3hdx6z@=@*8<1p@Th?L;fhe?P|kFuV{
zntO4I=Io<g9Yxe92^KuC`6k^3oh(i(0K1n^Pan*+%vzRZDvF1N`=*v^%ASYr@h*Qj
zC{pJqCASaXA#9HXu6rt{YX8<Ga;XbMl;;YMG4TYTge~Wx?n+Y}eu`1P?KuOibaMK<
z+S9*1d}GB>pc7Zz*G6Ys`rezQ+O^r<Tjzsq>$>`zlg;1^D?2EMuAkeP+7+>o?7$7n
zkZaWmw-Xq$SidOb(-{$oOr%(_t%)#4NArG6k-5u7>$mm_(e2Eu-F3YrWr^<Z7G*t1
zADckKZo1v57s32e8L@*cSMN+*qnxJ?OmSn)l@G<k>*iOc6rbEnbp?|0;~p(R<G|s8
za2^D7cB(iUFMv<Ra(iG>TMm)(OS-bCSf;a`k2RXl-t*^IcKFb69DJysa%wI?-ma==
z(LuBcAwCrqWe_=CZLG8v#?NAE*sH0sT)D8eh*{(>f&c#pDkhX?@of5JiRphtxN%Cu
zBb+a0oJFu)3<WH0K}1~{Guq$0Sf<P#=OW>(IpR<~IxWw~bbYcRQ`=W|y$U`Rk4Pz6
z&7%<C#!D^m)_zK1IeLTce5WoE43l5sTQCAfU3-t;2hPh+lrCy%K<Y5*EKmqOA6!y=
z&giz=Xtk{2FF%I9K=sDbL>y^oXupd{ynprS)J$C^LV0=+SlR&-kT$UD1*Ob--^s9b
zK+YFbB-<lDfN*(BIAEqazbA=z{@-{S<|b++T+40aE2~RSm@e@Z$0p0jC!A-YZqShx
zc+*L^d4xC)RBUl%Ai9Rw8YAiJU_Gz&%kR1g)?LTApY#=&XxJX>Dn<IGMq8{UCi9%>
zCsizw6^tliV+2riO-)>jOqls0=d)&U6$OD6F*^zeaV=AfVM#0L<D=#87N(J5G+^na
zd)%2^r{!KyYEAwdDzK!~#U?Prh5*iVG}m7hK;eh#<@Lg2tp;`@h#2Q9FsWs~kcf$!
zKRL1EZzpN@p_mef%Pd#>C<XM~L0N(8{f_#=Gjh2l;CmuHlSOHk!k4Y4%8@q05hEcX
zJ!rYQ-wZ*o+ysV4iQ^1I_muF$48==w#dAZ8yWNU>^3^VUk&G~5<+@7-z8&q7q-!3j
zgi4Fb=i|2!QGC9`+iT=M00w8uE36#CR;$5?3!|zuzXn_mor-u7m1gYu$6{j>a>4Y?
zFCP@khm$L9RHJOubvZv~UO>A)ls+X^bl#Ymv-|n4ju!vwfFRxUno3g*Sz1A+m7SAU
z?YLlqiN6)&FjGsFk1dOVTHOCQ<jfsA(U9BJ+VL~OAAsC=;0;DU1IpLOgN1b;Em^^+
zhRh|}lr2N(5td)N+yaMv&Pb2WZ$OO{Z_}4jsG5EL^cOOg`h0yqL8Pr+d@lePNmIpx
zJUkg%uE+vTfOal*MSm@orl>4M<g<IVh2YowKovk**&HtBv^i`Ad1?`A{GMDQZ51=$
zt-6uBn5oOXyrYpySyQ1wjp5|Zc;ot36#TXHM-x(JGJL-4BPqk8DwH4Al{Cfh$Ha1(
z8{M52zD?SlBbMdCqHf_cp-p7Z-#8fGAb?{QRml6A&JJ*<1PG`;2<{<GlrFGyF+@0r
z$7xlY01`9(s5E06&b{BycYgZ46Pza5f!cf~RlXsiPKc?(P>SkGL9mJd_zrtJK8kgJ
z_R+v7POeG6cPUa}lf9O-qR!(@`64@`P3FY=D+BDLs=Q+?0t$wQQ(a@kC-`WT80P)s
zsp2djH^%6`p6cBgZ#bD>T>3*H?wI%wP8C_f40Uv2=Zki%P1MKA&%LwK{QSN7OsB?4
zP&z?~Vz1jYch-XTWQy(dR5VK?MZQGA9P_eP*?0~_1nvseP$0B~@bpnqy<A>3l`&J;
z;f9c3A&3yzT)kfZwc=C3wh@`lA3$-&?-aN3riCpfX}hfzZR_3o%m@~Fx1Z*2leqO5
zlEMn2?J_{usf6SSXV$d)`?wuO@Ge}9&TD$MoHL7nPpJo=fbcZ@=sEh!WJ4`%w*^SZ
zapRKd(h>9yjkJ^YUO}TIWqxt)NeJz<26i&@FK)7D>6=Yl%2jwJ?*@&XIvZ7F6qF4^
z5!~>?18Hj!M&S7>+CR0AAEiZ8q?C<!`MEgMwdCzXz8A6vhAjy-Q6v?_A$SB8Vfvx^
z19It=GHR($jPbY=CP3$-ywRe$rBSS+%PJ?~a4qm+HDVzsPJ_SczY6To1%+9!-AEBu
zMtY1s9?Z-4GTCbv;iD)4cUI08xDfV8?-!<dxQ4#bhx(USp84*@wNL_g<CT?o5(%=J
z9dqteq0)3J#B-zoiV#FZ0L-O~TvReQ9IFSFlaT{1R>(GK!FExO$GTxVE?r`GToIbr
z6j@%_F(A4*MiiBUU{X~`de&`+k&H{6INugPIXnpED}a<NiYq$2-Qv{QEU7N>Tzvv{
zt|WWN*eujDwop<H>-{JVp})#uBadTzs7Sr@E1mIfL4DIk(zWvR2>JCsPQELeP`^vK
zn-lF@t3a*d$t<nZHx3tEc~mV{=4?M8;T~`Uopxh8nEVvj3PlAaDiJ@!hVbYOET4*F
zJ|*sfC6y#az-;{@t~0Ts5$_N|kg8}K(u_o0aAauIN~b)j600Vz#JCd<C_G86KL{5N
ztC%KKA=_G(+x+AlM!e@i0r6T;H7Lrvne<8OVDt4d$bnEZVX>EK>G%7DoJDM2XSCrs
zHUSs<PLZA|*XISR&5EZ?v*D_1Aae2;y1Z#4Tmayv7j}wYC9j}knR#4)_L}O~`sjg)
z;wKGO<EVyUe4Ql%90afP<9Fu(0%>8=KLFit6P}?Trkpn>q#G=#Hg{FE8Gh~;mp#Hk
z!_p8#;bvSV#J5MZ1>6`j#R+8CSU#F+UOAL4=I2k=CE5o>R_3!o%d_(T03y=8()#HD
zNHbv%IGE9L`Hepgqv>wUB#-ID7UKkv;$peg#u?e?2~J3)9dboPBoI+X20`=+$}@h0
z5lhKJyn!>XkuAo5^j1fbt_KxhmYA$I_)gDfx$r*oUd+g^)<mo+y;>7{Rds5{m=w-(
zpq23!65p$YBq?lu)Ax8xISbqo@QZ<KD;qTqM=R1y5b&|rH9;Y#=2CZ#sd8PG%;0R3
zH$xXslavJXH4d-uH*Qf%u;^KzkfoZU%8rb7a}C><cO(R<PR`*0V%enOX^{B*ywD9t
z{VZ0pC$CI7=|~|N;#Rf{2{>ULU6`8>y&EIO3w8O<aX$y*(DR-`zT&<S2atHhhyb|w
zp5&V>hfX$FJH10q7!C)5HeJa4Wqbk@ac17Gz=!Q1Vr;>UUi2bKU1~ZkW48{5WrIHA
zc|HoT(o*t1RJ6(F*<K|~cBlh!T4hF#{BE!9wpz+UNlw~(xCDIA9E4i)NInz*J9Vu?
zT+Q;QMPv^3xByH-GkRO6MsR>r07CY{=7is%sFlhX8%j=8kn4j}980mSpiV#;R-QJR
zyMIuyGkqWh;1jPOs-GXs{X(h-3^gtIUaXOqCCd?sa%62eOK1MUNWu6H9Qz5dIy?(E
z661y7qGTNcjLT39x3>D#@(RWvKOdtQ_xj>^A~QtqK^K=^7b9|n7J3p4$J}KI!1k{v
z)LS$|lQfsVWN}RX;YN$e!7LM3iVh!gIi4z*L?8blvn9RZXZFfd#Ro_*v$PnjG45y7
z{@m8HJgX!Zde*-k`6Exc#Xtl6{0w4t{N<^0^Z6|cGf}wBb+V<5o^PojdRc12qx?qS
z9{_pwt=bQy!gH-s4ZO>bM{o4C1c?6tmet<Fz5jXsoBj{rm~fV`={-D0*}lagL!u~G
zeuSZN5{Gh<5X%E(C^Oy2VX!qbNhf8qTuR9#HaC~hIYf=cz+ShGSk=nRD9Z(xS0LPx
zcAlp;_g^humA6$?g)PMD&;Ya6DLg}a6Q-Xf@V8NLaa4^cJ8Rj-C0wUlPR?M_ebN5W
zR^dLZ9NI59PyJ20{FcWQ886J93YK|>_TNaD9ql*jBN2FrHpqj*D*R~u^89c)p2e!(
zypBZ`@Tv5&o(a=)wzNr67v<3gODUC!;xUNtr-@+eb&SyKwUyL438;`|vFAuMhnuD<
zH<*SoeYr)s|Gs!~epf-rbRGd|v>Kn_4or94K166Uoia}h3NF}WPFna(&zovQ<B8Vh
ze-^lfP1bH3ODEXzUXFgYh38fb?-GwvE1<<*1J}CJ1g$xqerFIcN=zdhi+*0Jr%&Ur
zoMFoUl5fB$OMfM2ErSpbOe67K6kX#fX(*~T^H^yV%3u5gV5&*tTFX`&Ajg8gw^x2L
z5T8tL3(EU;$mTz@HL3=7y|y_d&5R@W<qpA!VZ(Vdp95wl;OyEXkwB;R?V6MA#~^lQ
zA?Q0#>g9Rapqf(FdG`m<IRV;|xt{L7Ww^O1y-ZX#`9NoPzrg!}-gV>C{I5HPxbU8r
zj58{t_bR(ZDQ^?N8U!snTM7vr6t$dI>5Z1CURdw2O1(F?Kl6MWub>O(j|9Q)0H}#^
zWBppFog^T&=`M!aI#yfSthiM--44Hno^Gz;;+0@?rgn;6=P(s>1Wl$oD|s@360Axp
z0su;@UP{Hjm5cRN-1i`*zFGI~)2=8`Jgf$Ao4)T`k6k11%Djq}uIE`L(L7AL%01iH
z{d{P?&;5<M=!>YHKoVT%<^52*q{QZ<ymWpf);k9U|Epi8b*)GH4IlUf>Y^+_36S%6
zs2qX=-KSDmdIr$(MYZ>n#HUa2odrIe-luvOw3XUT?1jN29J!_S5#)^aqEz8H!V9^S
zoVqXa4zQ=X+y3E8rtQ6xkn{W<&*M}ylEX;8AE&%p1gVl6M(Z%R(3z(l03U)*P~^l=
zkRS*<t^L25vT@g69!n12S17H;8~jIH*b>(baZEsa!3W`9nB&oZ?RQwy_`}~b!=h6M
zCo3Gm1Vt>Zga1><T>sJW2tC_AmuLHdJzt``tw;MePr9R>{*4zUK__GOQL2HP&CNo$
zo6y|ZWtFc$>U5>H3XR#vqUBBPpKfomKfG;!sW6Bsx~m{c8YR`Ya(hzmp_DsTnPTrg
zUEVMIbUIYTg{+aG=d)NdqWojwPOhfC>HDdHK%EuTKly+0;57-AIr-tbtW(Ox4%&H%
zIKW@KHOX?CZW6B}#aaHk;J>D(*;qQ7_@Dm1SY-UKiRAoq%Ia*)aa^7MT&0qKPI)mB
zVv1Sw&s8e>Ys$uR=?MRO2XAbut@2S830|0<f9~DB=@GIfRT2DfhVXg#=S{f^%;@iO
z-N)O=QsxHWiU?RKN4aaIet5LLVBDCdwi`_E-Hhrj8;iM4dglo6rXvMBokr}g@zt}H
zplbX#^4=;cuCLqnt->KVMQ{mH!8Ldw1Pa%}J-E9E3-0dj6chvvP9Ow#g1fs1hY*re
zyX|xK_y5k_=eF~5pYHQ&ZOu8W+FEUmKKl4|DJ6+JM_omG&|iS&5Z>rv6&7k0T&Q6{
zHp5j(q4T?<G1WS)>iw_qPpBV#)uNXv=PNgo#Ztc1KQWlu=OK`_I?LbjNLVdlcdv|=
zNVtlWwcwfJ!%XyvP<kuG>r?IFpu$*O+@yKE!45S)#arTorS3Pj?ucAMB@0RGUo)hV
zqVlhT2qq=H7p9mk9LiCn6J0m;-1@b0<X@x2B^aok1Bg6s+pr%ZO3`IJ-`MZPkR=D(
zRWwY3l+0(4GKs)ryU6pALC;Plr1w?&r?<ts+g%fTtWbCqYtygdp*B#?Ea~D(+*oL6
zjwTkPX11?Lr6UuDYp;z=J32rh67PeG+!q{`&;*UCQPTQ7kuiqYK-an~wL|)jA9SRX
zAIOW{uc0rjze1T&u+RDCfxRxrsDA-$MOy_{OMm1SdykRE)j!e@Q*Y{LSr9p%ff-dt
zz{ttwo{_(hg~$(9JZ&9WoVBiYA9M97o3mZhu;3$0a5sa3Y_6}x>X>gCbEu;&Un#7t
z!Lp)XHC7SVKHh_E_kCKuza*t(xS+mf*qR>DiAO2-IEh)4VL${0x&3ZZ(JrgoSTYOv
zBG^2%wan1|V?}9=`eQ<b$>PTV8%rj~eaHRhH^+`Yak@H4Pqy@B+A~%d9c|w6oZU*V
zs_ot7-uYEZ9*Fq<X`xOakDk|Xf0NsQn=8}2PY@H}TjIoIuYw5Bs<=Hi#zvE=_Jk`0
zjhf4)%?@Q;$6GS8YqqfA^tX?h_oK6qB^xUrfBoX66dUFFL`t3K!P}C3y)ayBg^eLe
zwruypmD1;Q@IBWp0Y0ZXUSwpPjg5?&$~7sJJAU>7HWTlNuJt9jT@5M|mn$<8<01ET
z36#o(zuM!!$@Fl0qE}J1w`%cQ|A9Uy%W>5UY-^Av_A_3d^!Nio_d~?{YAOeY>RN&2
zsSE*!jRWG0*RM0;Kd{M@P52ym)sYUu%0U~wJZw?)R64=oY(89`YQx|Gor_Qd1*}Ro
zGcW^TRGTsN01EQd0-aE`QcFcbwRhvvAUCHFS?Mm3uH<g#H0jrR4&lJ_V<FtM>K68e
z1(93&OqL{&Qso3TE2%g??7dJ(A)WzXXXB3bgVLUoG-<M&-8!j>LC<n}eTnSz@XG*;
z0=K>=6bL+})i4xDK#99Wop+v=<Z7#qh(aW5YPURA@pNnF&c9$LR@^otEvgfN{YBIq
z<qdp9)up02&J(<EV)!dyv*k<6`CsK4B%ChAPe{v%e7ou1^sDJ|w6``0^j03WDb_c5
zZX!OnSS@jLU^lWwv5}EUrZmQ<{16{ZMN$IbxLw-U?Wy?msE8KqwXZ4egq+-$X~KR@
zfTuA!)m8A%LlnRbsx7S0qWXZ*hGR^Pd$^Mq7}%%!Z3n-ffO+&HFjD(s_Ig8|x=IM{
z8L+X$?@0A@=QP0`Yql}r59(KcZ=LnhVcrh<>$r+q+rfxW#A;lzFeNjoP86F;-WVSU
z?B0~@wi9Z)KqtKI`N7{lRQy%`bWEF2q9NEqlCqb=n54Y0jM@KkQZG)evYauApOHxW
zl&^2B2Fxx6N@FE#CJ9UChKfxGVHG7K?JA=JehPvhJdD(ZBBKcIR&x=IC^<Bo6)xVg
z(kw40M9ae*l>>?(P{a~aEd+Dc0)Uqs5>@RZSz#$HyEr5qE6Hv0>SUsO{D6LBbhXF`
zRebX1D^GeX2JZH}{ikf|?Q8H~z?;6bgx8HbIl+`U*DW0<*RgmJah4Lcvx+XJYeP%r
z?spt-Pm?qn!j)dhb{nsaE((g_ih3FQGfwJ-szsMBP`68BF^qW-)yu8$h*_;2dvI|~
zOvO)y#g@mfAJhz%_ln(`j;xKBo$=qDM1~MsCZrp76t|rR5#tl#_pQvj0z-fy7dY0(
zsw;|yjLz%?qFgcVdXRLf71&Yq3X~hm87bBC{GDG>Y@pRle4`qiEyGa93tB6EvZq&F
zo&P<5l8y7@>V{!5sDnE`zeQ-Wyyr{aF>QNJ8yJb+sS-s)C1d&B>QfqB)&!z+ZPxwP
z?LsSC3}<&YdW@EkH(t-S5-K)3#*ANV!WEbU5RnuddIDxY%j!>>8Sfk{XwuU&PV9nU
zRQ-E7*5^lo$D&;H56sb?Co{LN>D^pDB(?~%$ja$Oka^^!G3LLN?T(5CpzdFZ7mEC(
z**TjuY;=LYeae>Dx#ke@6Uw~um6^SYQs2ny^mlX#yd3c7qtO$Bm_buWl*Tk?g@A+{
zP}Lll*}h9ATpx^wO*`uN(xINH5`V2ImOnlpt;lrUAX&kaFBljV_YnSP^^7{-Czt#?
zbmSi>uK4Y0Rm}2w=}m}Fw+cjQf-Ugx<r0h5$?^VQzy~QQ4w~8*0i63`7Iagb%4oZp
zy>(wL7}mfco=5e<qf8EE%#w{B1T{g;HG&-t1f9KD^{KYI9Z9PFgy+~hqIT)t>eHFe
z(2rbc-?<L!?Um<bpw=|DPReiBa=+iCb||ggT->+cLK6ra`}d^qEypXphhtIbEC7GR
z0a){SKQm`9$u#9o0*c6g7yKe#K5?|1Q_J_5HcO5S+{Fj}$$qf?KtSlVeWK$-Srq&J
zT-IQKb2^c;6#gmR=~FkWuC3nGe6B7%{fHUG0!#g`JoSXAP=7jlg`Ht*?OwQ@^^DP^
z6Ps%|mK7;;z@-F?7~WtShv&d&UF2Mt;ZtxGQSDGAQT#8mQ2Ff#X)uyMm6ZIZ*PFSV
zo>mw85f0HfQ^2lV@TSY}CTHzEcXj8eM4dp>%vNrh87LFnR^F3y9pt?{B?<{KD<9!<
zvKr-sRFt4?_AAjFbKj)6Bcpfj7-C3a6nVj%xn;Wh$*+8&_F75P(vDj-`^UJuct@P;
zG~!{7?oUy;VE06LbKPyw@))%HCC5iD@Aw~2szhERG~RPFIK@z{<hIa?0bQ6+iZ}sq
zNE@@~(QM=Bw~gjD9^@s8yz#3t2d`aK5Z42Mwk~z)w+nn1FWoEH1`_!Zo|6t5xE&tW
zx5JFOe|+2h7a(feoXz<(e>*hkqMtNBG$ba@71RF$p?mLqa5Yd5#eNBOIzVe{%Sh7>
z)ILIjyWn<bJ!$S3fsKEoL0E4NMhd!lB`(w>TYEnpF18EYFz`9t(p++8vvySfA-NJ}
z9{ZZpbLRT29#Ll&XSTq+)}=dvQr$PcZ?|u{soI6nt6#$-cBjQ+f!K)pueiPO)D*`O
zcGRtOB`I7ajA26+`Dly#eugg{7j8&!_A0A{``V*|T|E&|8)s3pq~wGM)6cnIcJ-RY
zgFSKuRWT$$Zy^YSfHsj!&|XOW=O8cGSN6iZ1y@YPq<t(h<Gyu@mQOtxzH4I7F5yis
zIQ;@3+f2SmEiE?Pgx2O&d{4`;`_LD&4|j@Snt<X<{3K^3`3dG^gd^d-!VbdNxDRjA
zfTy~C_^^0f-Y_6E`EE$I%4<VArCMb!Ca>?T@As17Nr@v$?{5k8<y6t*kuugiRw_h$
zLH1vYz<<>`NFx7>*rmq$zsjcpBf85U+W(++wHf_e2{qO5kd@|$ww+q$_5Tu?@}E<f
z|K3~p&rTcu^FPv*OZhJD!0Epuj%I3{YH+I7IVFoTLhD)Dx*U(T*Cy%6hd!^p^lM10
z$W=(<2K3O!e{)FquEnRZFnAimjmUDM`9TO1V{njO>36$4PT#rrzZg)tnweuCJb&7V
zE!eB}W|L$x@9u5w>ZlFFfGe9YVch%$u(b56NVZ_@+UKrbM-`%r4m@Dv%<`DC99-nk
z0+ZG*=2;pRdSy#3s142|rLaUk^=fbxbjD}iM0CB<X`t-Wf3cg!L<SNm<8I&8!2TrV
zNXKWpEaFbj@xoA!A<RSsX6eop&YKGyU8uM{ir!wf5*%%H(})vzJDIJW)=%A#6gBkL
znf<cOf|?X%>130R&vc2`Zq>6xE`s?CYMO~nHd)P;@ovAeE$wqkXotdrBdP^N(IFna
zR}^`p+w}9=JJVQ);_+l8hthqARr>@@Y(DFOucq})c79UUTftU7kNASnA7ZS0W@^Q^
zClU*@5C{J^Uc9LGO&I~>GAhZcIYi8v6;jw{2gW3wvujxN(VcwXhF=)Fye<_Meu_9J
z9ql!${&3GwB0z5Q$;dT6MUA`4BIE1;U5@39U<AU1&h{cL5alh7LG5nKPJvP@d8>zn
zuWE6PHkOf|<*$tpy`}d=6-&p9pgC1dL-tT0c2p#o%Lj|^2RZ5<eCmZm3toF|?L6aw
zXl1sb4F>b@ywXZ#?pgB|DiJN#i3m%$cVe_OP&HWHLH(<dr9x^;W=*VF1Wwk(uMfM4
z+XcGr6C~>H$MUlQsdsQ@lfnLvQ|4>2(Y}2r6h44N0cLff7B_)SVSE{&_5wz})WA<a
zJDa$&KII~t0Jsj(f_rtR`=HJ9&(o2HfMver=e%y$<yKkwVp@?D0uF^BN?dg3`;oHU
zotZVlrki&%Z>|k2%uH|V?)w^MCbJ|vgzX4aRVjqyyvC$7CW;iZ{P0G<#{*mdbu^D&
z-V7YIHp<1Li#}C;Lpm*`u_aXq>sjH-Bu|_X-;BnNK3Pt1NP`;*ZRP}sDU!(fLXd=j
zS#vYEN0lTZF~z`9Nj{#6bb*~Jx#<E&JgJ3tU1}ZA=oR)O-RB0ENex!X%ox{c&=pjp
z*cm`{9}Nz*Sx9;pTdmx(2`e<zvu<tW9JbTVRd|%a6q1wet(2KWq#UDzW-ODE1hIns
zdql)B=!}7ljhyir?M+38KizuLbJrTkzYFyhT|BV`OUEr$1c7*yi;H^>v86l{y-2K6
z0LJTL`H@#)AN5Yx$^9zlSKr(B?VWZ|k0yqFd*#rww~rD!@iK)6Z3t{J^NthA1VFG3
zB|M<**SdQdU!M0{>m&bdNSFgt*uodvfc#^|7$LSsHGzQ4Re3pX$H%wl_V83GBK&Ps
zuD~EjNy~x<c8|B^%;8G=M;jr?h-nkId;wRXY55Oj5B|vTEoOy8JlO}2exp@&m(Ctn
zKWxZP^zS%j6-KZ)-zv9N?U&^Q(N1al#!28q*sv5462R;=0g$Szr6STTAo94OUEdXX
z4`nr_B0IMSh7L-l-7R0X4+>dgicr1tLtj2cXpf$uuk}Xt1&Ter^%odU*Nv>wRzN43
zr;h`17wHOGH8mMI+P~u?St+!RiB{k%2Z{#xdyW=sNQG|RsnLK`Ec-}%AWk7g3$BYn
zZ{^ETefet-!fvir&x)W={mdaEp8&gJw;%Al6K0sgl^KhG^;E*|HO4U9Gze3lQ3zi>
z8%IIp=?ZfO83`i+5u!!{yg6MvZen|)xjSA&e*yS`q)eY^0|;tizoAX`e9hJaxL55h
zAC=0iqR)hM#m>@hm6lu{CwoOWRuD!>Saw|Am5b7v-f&s=#QCa&SFf3k?zs7K2|Y_l
zIThTkv_FIqBWZyUgk3ZS@0L%t03uLHPAY+bNPEysW(MzAHb4CUJYVjM)tRPuObA%2
zJxOChu}})jc+#*Fom%Mg35ES$V+@!*UkLgVcTvRQWhC1XPo=YJ6~Qa+k73l8I6;Th
zf<qRZUK0A+yl(km-S*-31m69GoWy7WrFsCM?BYJwF$Cd~>8)}5KwW|gTDlYP;#$?2
zZ(I@jpf+BbRSS9qZ`-^MH6)>!-va=W82Z8|eW^|Z@#^(7PBHs~9t1=@aA=rPP>EPV
z(q5_#GJEcF$0qtjMnneS%$(_Y2v3dLrTtEsa^lkd33IN4kK(`6NN8QdU>xAiE2ct5
z;(JQ({7l0?LJ!LA8BtK8eKcPMXEVx{@r3hO2q~KoT-=Bu|B*F=SGtaQCG>Z|*rPtm
z^vjJ&%L(XS#TgclPltihm{B})Tx11@e71Kx-`W}Fr;oIs!ea7by>l8`Q8XPZb3Rt2
ze4M(#NB0ir4kV2CA#W+4V>J{aJs4$WX8NK%pfgQ~Jw=~71sYS8aZ#pgfdW_E&?CgL
z<LuammtM0OpXKNY^;~^EnDvuL<08aFiHeAKn=xrI=K>yGmcgytXYQ$XjCz&9)b&na
z#Gg^EW$G1Ovn3g%Plx5&J&2Sl^VKm7DJaxGx<9R@Q(mE2*}lwg+<c^6zRsnwCW+wk
z)!2K&TOjVGD-seC@$0sW7>n^0QH)B3mpIdy_0}bXX_75;=s?9iWYR)s0;XL7H1WrA
z8BW%4eq*y86GENO#fu@9$HL6=#hurbgIplUixg64Rf2A_ia85%7hS@7vW2zgZVtiL
z6=~4W;|O~(9O3j)mC{t$O7Z;*@D{r@x7Dn*TS>%!-6E6SQ0AH&GGUxqL#!mulv$Ju
z6n6y%Vg~}^jD=@))g}fFR3l+iWA3JkGdxjA&ip-?C@aeEIaLXcf(E~QIGd@cJ@2sP
zU-x?1Pa}}0PG<QTUncW4za${rVi7=1iyVRnJqF6KcxD(x_|lu8mi?GPiL$KTwY(x?
z({P<?D}f9X*`(r>tKub2vN_YL`)*Rx--gb#MktexNGhhkkLmkB@?00sV=9FhEq_%P
zeG3EvnOo4%`#QOV5A&q14ZebEvmWy;Og&e-rs6%fG`y^wypFr5{GGnd+&b8*zz@@*
z0Tu_Id^8kU%lsE-7)VAGG88Ta%6`J$Q^G<4e?GKckm0zGu+L~!5S|L;7D!}Eb-WXJ
z=CqM_!^DRD2?@qU!J-w*)na8AMt8$8jpJ>k6pziU!1>aGk)>=TfadQgVE)#RsTV2&
z`s!Dkb?-^aJLvi(EpV<R;WV*cpfR!DMJ?)M(QoS~`SP&M!@8m|8NX6GZOXj)^(Z&C
z_&d&Y`mcb++eJ!mz-{@}2Su;A(B||W#Z{NOd5MHEb^W6*|33?uvnzGzA2BqQUkio$
z8yf>4!aH;{sP0NTAB`sVW|JMl***~S_GHpvzE{>s`GWcEOi^1quzu%H92yU6W*M7z
zbHrLP`MSWAm2VuM2mml;pp3|11I~v-Xps}}DZwr5`6CLM%VW;cow*o>4coYpg%n<I
zs$B1ax)vzEnoZ?5*-ahqdd2yzDqt*qk*>?8FXb_;iH%C>#z2?Ms7USqiI2T0?o6*{
z<4=lUMpYeJn7?GrV#oqba~)V}Di`ARmV&vWqvFvkf*`_PKJ(c-U6jh}%!YlYC?YPB
z>DkB8uy;&Y02Z3U+}@V2_Gtdct8H_ZU{oZeb!bevdZZlN<8D%}gGR8)fRM@R@RuVl
zkD(kGE7iQ$gWbYd{+-N&5>srNoU2|&P=TNm%UW<$H8oSBa$&AO>dJUB+V^8xB(ZMy
ziAvYWNGG($=P$10?_WA$EgiCrCYq9Vn=p@V@NeVJcu<whz$N)OGupP;GG*}2?oJ7k
zyxy*D%kkyVZ&MQOW5xx8gybS~0T=;)0no`X2>1dc1K&>nZoIYB2alR~blvUzW4vil
zU>T=#hb%?h4=+3;7^Nl*KFINokUlbDzN?wIwnmra|7`A&KdstU9`-H?XHJ7GFd+?-
zx^$3rAN+Wg^hYmE+68dO?j|C?v07Q6Az*(fcE|6n=_Q{9Er+hlF6YlRLgPv0`x^t8
z)ZG`p$S$JlZ(OIp!<%i#v0Xa(YDShkT4KQ&9P}6PeVjWvDj{y*S4QNf@YDBGO*i?$
z#XFDEfZB8WCj|$e(ZjC3mBa2R4OM6}Kg=u=R$zY{c0)4n!+JzfT~mT>))JuuBZ_Ls
z4b1rIGtq=vX4h73r!%?2pR++SMTjUGRm+_2D_R4T^&Cb_i!-=XVk6BFHY^$7As*KE
zFUzoBCvldDYAsD>7&Ji%R)-aMiwrP#6jT4ap;5B4(UagVH&2&6$SqS-R{Pj++DblJ
zMgINc;c)1@oewX)hZQxfA-4qcia8aYlA07+6db-CFO2uT+Q8%B(}W?(XGw~n$8=T_
zhIq?yGa?GgjAC=JaFD<Qnlt!Ly3$8mvbx~hDzv%!$Qp81(J^AKF0@CUyy~s)!HtE6
z5B<=E>Ds=qV^`6(L?OJU5uO{|GHpdLicb{%yIUkl<}W~GL!I;_kkX^FICbNr$GjP)
zGhb3pl&blD>XKWLmDt;)d0H~lEr}~BRs3JDjmwV3mF$O=FUX8mlC6eIajvqQ^!rgH
z(m-a)sF~w;kG&qu%A!~%!26!EGJ$nNi`yX+aQ2(j2I1%i3jQuOx9u~Rmg28rqMm>9
z#YEbD`M}b)j%2w6d^)3^2a|cc&e|L22?8uxvUK+M%|U&N1_)n;;E^V~rMMyrN~P<%
zo$b$|cy*~QMe}<fY+7{^LF!h5!3G3A_LVwTive=nH3NC0T8|vh%-u;E<m@gtOfmCb
zd2?q><NL$F%0ts@W#XQF?Xe_lF)hASTQ;ccVhqDl`>@+fR|Zv-%(ZPZK%f%=r91xT
zQkss`fX1BLFsW4*i<hb!_GY+{PwCB{Yb`J-W6jsvDA;n;&TOsrG|C}u6F-Dm@Ouy*
z9T)*%Qc;bMKB_)~E?`|Wmhm{&{>IHS>Q||EDTS3e5=<>xa+DuuCY2>vhel73(#P&J
zaka}L0>_59Yb<8$x>>;Wkv{J6WOVKHW+m6XGH!ZvZzLXT?M;wmRGSSTNbUj+;uApr
zIM=c+iRnOpJd;{5rJl1as>XedZZ~jI<u8!(7m&5oGJnt80_sHisRlljQPt!o%~lO^
z%G*+?tMrU7jwrEW^*rm`u&UOqS7Ysy=TEnn$dazXXs}R4x6XtCv3IC=Kxs)vM$oY@
z$)HMMXOC1CV-fKIuE-ssqa@f<$I~A(T#J4mdQlq7Rlv7=l=^Vn&x$D-aAJaGxMc1)
z!we@wCjPM`DHkpBd>79j@2?)1YX$GXn`7q~;DK28BQvtMFbUSL!9v*Pm4Q3cCO7-=
zcId)4+%Hc_p-nX(56LJj_KO;k=yY)s{ZfCC!U+sl>MvU8q@EsYo5lq25C!_%zkmca
zYA5yCzkuq~j&@JS$-|95{Ohf29W$C#ECQ2Bf{IasSxg@45=uo$JVONLBTmhVTgf>W
z7@GC3g!u4WSJ5If+-LnI8r9iz$;2L^;#iKsRFd>Tm)HqkG@e<K;1S|Gt~N!}*Ktma
zS$*>DQdUznks2$l+=}h1A<-s3d<WLHjwU1Y5?Aio=dh*+<JeL{v9C;~7>1mTx(q?s
zQoOU@XI-I31^DBd8t^!6(v=z-lL(RY8S~$Z=ftE#11Fxo$>!C1Z1rkufr?maq}{Yw
z=t^0@3!v@0&*OX1p$cs+S7^?~cIXzlkiuuApb*O52u%z+`bI_6pOk1UFXXc{`(IYi
zOJdq19CtP=++L}zFgJNV#@18Vu_-<_tw+EE<4E^Z3dvZl%*!#!1!))il|B0uofI%`
zZZ#s@h}I3Xf{iZJr>IKgz!c~mr!foPuu1GOxH3<(@ox;6z?@FzsOE`|N|)nK-giTR
z3EKvHLtTTMMSpMwk_uyJkm#(4I=QyIO--JlWTwtaM~@rHDUG0`paeo(3lX`5q7ale
zz|V>_me<-K2jdbGd9`}B{~L45n;$tTS`IVvGz$3xW#hXc+rxBbj)T0GtKMd>CpWM%
z<n&1XlnAkQntXei2q{VKs~=$x^#6$q`^`uFUjx*dTc}KHS;|TZ^jlP9H26Pa>B(Th
z%;6Z>761U;GIu#zY51ko$fwP-@%*Bb@l!3)ax*ytyEIKA9;Gkq8sB&BD<@;)YzW6<
zbs10<g97iLe=QCT;RZz`#(Dmwq9W*N%?B-dt4T1+Hs?>ER76{6PIXM+En(H`*Ecnj
zts30z0Dw=x9m~&3nYh=0vL+JC?<Ds9!?ap9xh1m%PcAfjc;B<5-m>iWo2ErGo{r{e
zx5s&kt?h@ikO^wRehLO|YT@6>Or2`&08h0H^5W=?)0jwN``=6{VnvM@9R-Tg@<nO%
z?9{;igbOFRMCbU_A7;u-n+JarGY`MKR&d%^xYE*O!pp`XZ^o%!hGl+A6vz5yMh%om
z9ps<Rpc4fkq8?yTL*r6ezpGOCgho?|R%ZP#?^vcn%ah-CnG>evIj=N$jwS6d{2<Kj
zYFrONZy*lQ{Ak|&A9|ab2(k);lT4urbBd*;zmUE6)Ax(HG|m#On4$ch;Q}k2vS0ea
zzfPZS8<{3b9i!VA)HJHYh8>2Nrz2ugWo%+jln#ab6RZ7AuZGh>W&XOnZnQ`Iic>t%
zOb(^Yk`-~lt1`ovumt_fpR}PXJgx5auJwawGK+YfniIu3j`nb+&{fYW52^PzpOVF%
z9fWy99Y^3`85?;m#xQ2}an9+WR(aiyAYS5v--Jd;wcqY5e}q=b4+)r}%hxq&%d3a0
zOg68WobKV37aMhm{=Bd3EZt&p{erm~zwtj!9<$MZp5c!w$FrVod)u5;s2<Y!{(<lR
z0+5@Y3GC8N{xRunNWmGErM2nEEU)bn`A^sXf2UIZH~J+IZ{gcww*D1OxpG@qyQI-y
zfT@ksP(YsW{;$pD&g~mvW^V<;N|BrGyk{<F@F^L=%IPz0nxm$IUjl+KLl*GOG2#$Y
zoraKq>G_xsgKF{3(o!@QmEkdsSELVeZ@E0^{NrDMqJ4qtEn*($1Nk%4ZKZyYHY3M|
z0h+3?_OFoUbA`6{y?4J;!UW!2vfX%zVhl5yQR})<A=3q>R(c_SH42)Q;VbebKSO@(
z)>7PO+U-|t?bllsFd&CI+4VuvTi>Tk%n_$Lv8^8Fi6c=FFfj*vMHm-&8;iS&cL(0$
zM(;d@#iQIDkGI?sg|6wcU4IN~7K(AamCD5z?@0ZQ4IH6$U+Dl}0tp7}CYJeQMI=hM
zucyiq;|E!0*C6wHYgH>XpODkH^B9>yG3g_jfu<4OML|G3nX9=di=Y_$Cgy}zXUDr$
zt1do6@%n3bHKiAKZ8V0t=8#WkRpb+s@PWs_0M6@ique95%1--~ldQ?ccY9^~4(du$
zsVs6}Gtz<Y@~T6TPsDHA1vR##2OE_>t$!8x@Z%?gVkNbs+N94~maG^WajGl^KnNSx
zXRc)TXXG26_Ox33;V)|2b@l->)-ltdek+EfWwsgr#%@}=Ko$!C1O>~X<glh8V+P4O
zZqM03*rEKMHKu)SE=O<D%Xip-&~fbp*gJzqF=1NQj9(WO!<boCL()cB9W$0bacuML
zUaPy48oMD^i${9E>gnCu;@0-d-x>ChHMn#+5(i~Nt_FC96!|r?c)-FdX!I@8&fE0-
z!-0gOKgrH>wj1dy)t((iLSCrJa*c^*2j7+65DJHJQ$$SzsZGSo@nuo40cgO9PrVE1
zegez)nip1jvHL_~ZNm~>+>LS7SJ>pQ>Y&jqc0v#`;62R?gs2k==m@bkm!=;jPqLv-
zu|?~!HRnjM(Lm4R5Q!F#E!yc&ll2UnJdqpI*;UNCQ#8g4=zKN(j58IZw=KOJw6&D$
zU+Zg^{NtzR>0Ma*UjAt*D9F<B$*uS`ZV<{b1{p2S3i2m!j8_^FSo4f+Wq%A;>{Qqu
zYI=!qYOvnKS+zp&#p5-Q@Oc*i1^}xXmKxoc@s5L{{Xfn6KKF?guR6Fds>e-x$@70J
z%~#}gT;~2x%p(!VQrS-*7A6rTpNv#A`9mI|NeJ3G=k*Cw^3e}qwVNNlS^KyZu6%ID
zgk}1Z_ohqhk2MJ`<31+8<N5j8bSL^%hGYQ3=-Nu_P2|M1Oe23AY?A)jCfXPK@}{bd
z7{QD$=R|6khj((VB^Ocw#Ia0XEGx(~cAk~q4+AEn*xx|g^%!K)_}>X#6d?VE45adY
zS7-<^AbZabp>*svL%^9PeNN-J@)3`Fa!b6D<;;qmM&n<Ae9@|;5u@sSWiojLQh#4L
zyRz>0mlFlxwm!VIWt0gB7nLNJDF5bPK$M}uHtp(b9bq|!Yt<C*z2f<i1G$C@mQ@%}
zchQ0nks=m~fcF4Wf;f<X%W7Is#0^5{ZM^9r>bte0$;n)y%UlepuiI6VLUVk<wTP`f
z{KA4*9San!2CJmMX#zmp5|cY;6jCA_X<OTONK_wU>m2l_Ezj8#%DtM#WIoel9F16u
zdNZ(^=T%}c{D7AQGIwQWhY@9f@tqhKDtZ!F)wk@7K=n@Jvh3lnh+sV9J5Eh;42zY0
zZMtp(iV@<P`?;v5nK?s}Ae53MtYqfh=N%x$q>}rs|4aAWfm-R;ugdK;QmoY#_yx_&
zhpL;tDHm&o@q&aS0ooO#)*fY*2ClYRSvoBsgRrattxz~GPzV>MoBuH@(xO9<DGQhO
z1+k{9D`-RcCvG88MYZ=dyM5}cG7~w!q!Zdq#vA`i)11!zsbE(AZPmfR4#yhg3XDin
z;RM<B(Tor0T+|9j?^5vMsqEttvuDmol%%;A2!F7MrM4HBsJbyE^+ogBmki1gZ;coe
zKGSMohx0<?#5N<M&r}zL9LZ15h|;z0S{?`T!~D#%9_u2Xp)y#lLWJ+RhWxn>m?78(
z7`wc4Z=Dz0Yx~fV4PLE&eW%BJ4>9xAl3-Dszt%K#<&YF*&R{7_#7OE1zW~Ms@$(>0
zw^zj$=ctu<H%<A2SdxXm<|iyNui==c?tcx);SC%qR7(MC>?!u6%Bw}jZwE&107Zs9
zPE5k6b?mH=-)jE6b<yYVs<0tSHCUHWTeg)LYD#zFauLMGSn5U9k}^BzmNZcY1G&tF
z!(?yEha(1G<7N9ZRtlFFJtw~;Fi+0c<KK%-(qkC$>Glp0VEH^F1o-8G`5(QFG9Tb>
zlgc4UZvifTu0~-gE4&75USKmy5%QZ@>r4f(RmXu@iOR)bgNhmAjXA3*Daul?=_~K?
zMXJdurfMUqif%KaQSZoby64ivxk>ZoMX7-hr-cd&2`;hf)7X2CEqs2-q7e4o$R0Q9
zlt=c5i}^F*m^o3wA0AW?721aRM<WC1XCnnzB1Y~RS(|H4hSbpyHN{P*rg3R^iXcZ;
z!8FkxVY$*OL5Ue1g0>IiBVQtH$m=rYF+Oj<Hz%a)2$W0*Z_M;`<it_2&W{^kMgJUy
z`|&NQU!{kJWm&|fa3jrWlJU#6jc{OTVjw|2N}%xs(osmlzuM~W=}WUl;u18`=F;>E
z=G&q68|36c9PH>Uyhu;wvpLd~Xh)*33K@|%<<aoWd6jk>u74p?O7r(NL!zH#B4GyL
ziNnwypD+gVVE$Ff^!jxIiKxg*d6*kRC7mjFTfZO-kvp6TD2YqJ?^3DZXx00Ya|~`g
zlDFS97$$%FMfIN2y+b1}Rk%e{=l(?+st=yad*%q_z(c-cu_)M|h14JZs2#+-IOYOq
zUgq|S3jIN3;7Q7g=%ngU*!LOzFATdF?=Jx6TvT>hzw^>_2l0Mmoiz3KuVpa<&4!IU
z%>)MoB#9}~#!5aKnZ>KIq@oNe;R98>sjv(%?qzUxqk7yDo<RAkG)03`3b!4?*Pk-q
zJ|f%}VuK%7#uwL?{T7x*JjXmH>3eI#tXuuAyj?>2sgfP!rs5ctb^&ssuDnDf4E73M
zDk$$(52>C)-}e;kmbHre;OX5kwL|*=0dSJTp_iZUD-iwjkJoe1B=zxp*zdV`C+k7h
zFIRsuVs}JWEh|4Td*li9y~Z$jyShrPGkuR5Kdp8Y?>s+mTot;aSjG05i3$`5sjPUv
zDv2rSB2%8A27hhNRgz#Ik0#hStK^fp6+btHX~7xe{qoHXeLsQC{_He>sB+6<0s>V8
z$kP^0pm32EBhea9P8xZGw?o3C>;h=CZ^}F)I$q=$jwz<-S~m24#jNiL$NC&SxM~{S
zldF`1u3ThP<q{qnUbsZ5Xl<F|#?X{i6LPdI;3n7<WK}CWu1*bY#n0l2CMHS*(Sj6d
zT>-xk3F)t$xqmnkKiI`?KPD$`G55PBd(yuM%*&IW`eV-nb{o~eG8Q+=E$Nt#ikCF^
z$Jwn8Xe5R9`qU#@rr#j$$LbolH1B8a2#|tV4N$FIq`N-iXBQ$#c33Wr#Or0$LN$4S
z0V~9hQ;7JJ1uCD*@_L^VnBGe()$8uMmHkhy(lV_XC||zn@q6wut^tgFO0&BC$!flD
zcE~q<llfh=s%)!5aA)vasf5OSJ-^zL18oF6KH`XLVz16pXs@G5@G1pBuu3IaX7{i*
zoo6#|#L=oT%RzGL8>}|&U+(GilJx;>TR9ayo`yRuP6$YAn-&D7t_3lnDg8jl*{wAR
z-DYycYAq@F(a{^lR88yWE247ncJiYf(;muvv~Oy+8WcW@PBo>P6N?!om$dq-(Iuhm
zH_au*=U?m}T?k;ywx83o%8yd--4Am0ilu3dhX4ec^2NRJ#TwBr0Q?~|iO$cFbD}t&
z-w0IIldH97&SbYU*?i+XBan+f3F;5=3TH8ywg1NQUk_r6_mi$%!r_SDtQzjDHd0~O
zpz9oVIP9qU0;LpC1XRh%%7SxDBO}WAtD^yAlt@9dZqTlbS3%V5)6E%SNj^5GOVw4s
zex!yZvoKd$KSth?*Jw<ra$_^779s$ML4htoKp@uK{J!ab7x49OR^R$EX1%okX|T{u
z<f^R^g4Gd}F|~Sc!Wmng0cN;7Vz(yq=GZeQt~Q@<Y@%_=T3O(Z*nycPxp<xG6sBW@
z$VaoRHyV2L9b*q<T~c2oc-}%6v1p803j9`k9FG>PZ*lW{0&0}_BcjZ>KC`b|P0$(=
zGoz?bGo{L#MG1f%w!z=)kdV|KZU}Ho9>t1#>ZB0wH}SFeJG%z5ZVadnn_2h4a`!Jr
z!RMV`c;Y8BHS|^2jd8<&<{WOt>s4+)-HW~4H=DojOpy6<p;hbVbbpd$bopm7U05LD
zoo^e?P-dalC0C`Wj(EVTJd#>!&=CQ@e;|2J>zP3M+WPjS`w>0c+5)W>WojOT%Vbg&
zx6^G)w|VY}jKra}sl0lQhEMZ|s(i?geGCg!Y(UfQu-pCMj(>xp#kb;_yx&P_c+>}u
z<Y?18wWY}x??#iSqa_0lUg3)Vs=fNj@rhu)Pd5Lk)UeEBP^LXow`VWYF(h1#04!dW
zs0?^53mHIFzcCkYL)aSw7am=XeiQ66TCxvMw_+Sk7v4sdguO{-iOwurqz!l!m$VMY
zyl_AHK<r^8+5s{%KJ&<FVXMSTb=+3fQsM=h@b_Uc;L7642(1ftTa_8N%qmN$M?DsZ
z`6NrNBm8lmY%C79ou>z6M+uZZtTHUZoU>kWX;bBO1f^;DnQhTy6_diIYbm5(NI^Wl
zGK?dgJ@;QxdS1=I8w3}QQ&G#E<hY#d*be*k7#mKAd!1i<AAwe`$KR=&Llk~si6Z(c
z3nM?jJ!>}T7G(Rr6ZV)*KcDKL++=cnw)S?oUC(_$_1`d<FZ&T?I4NDRHbY9-B$K{5
zz?v3`szeVIFZzNylmo`6bRP`U(r+`QttaI_OWZ$*5P2B%&3(<ZR+N3!HRsT+DPYy>
z;`}N>)}#7!dXk70?PG{sa_jCl>v?X8qTnvxz}5G-_s;y`G7G-c&vtCAXLFHT*Wst~
zJI&m}sLZJ=BkHsa8p5~`7<R->n7QEWquclH{w8}3tq_+9*6NioH(;RpD(RE>c?5I_
zuQ+LSYtpFw0rz&YG`~PHDK>b1Z{+}W8^k0>XGxbNUhGU;k<^mFRp<gZMxn&OWxZr9
zr*=wfGkbgeZT49IF|UBC<fv4IbZzx^>E=QESX-42x92^D?aZ}XlpDxgi+4+>LwwVP
zPHK^|A*vg_BG;L8++y4|^-VF6GR0CQ{j0Z&@Gf_oS3JhXLbzZ$zq(~4#$yDb;Rb&I
z^><C}!4vLf!?!c0Bi4AegH|gQ>hG2Is?14NlTeHJ#b8usuS70XrpU-l?u-4#>@pHm
zGM^UX*?y^v99_(L%UOUTQV_}r5Je#cPu&>8LqF@!cjsTpJ!31&*Xp3&YW$#Ip>;Uq
zI{V&S4W)ZeJ>9rFLx?G3n##wraiMcMZA*~wPzsrcxRQyWO^X;%m~BDpfe$=E$OSk`
za_TlK1qE3I{e5|24L7%;<Kv{`ZpCw*U2BeR70>(jZd5=5m7{PXMEmF_1IdKLWxm8}
z=B0Fw>3CW9QLhlw`r@z#9d1clh;yns3WmwWIU>aCMc~AR)TiX->}5rUbmcW3Wk!=J
z^TX#aE?zM6!A!MNY(TIv1w^LeKrH&#;Bh<7VpEi_BbgRlJe&Im-Ge$*BD$yM3gKp^
zj6_4hMgj<39&u<`aNh6BcrQbaL_2Z39<zUX(3%^Fe}2rim5OF1!Gzyx^s7Z-L&4&0
zTof<}z)eqy4n?7&BCR2u$9QdnZ3G|7j3g0;B97uLcw_Ez8s|T#u|t>}lW1Wb&9<|x
z887lq5Hq$?W*-oL`PzL^)n`-kRW86ChY{{ZZ)@;fY*}ywCh-}vlIKT?<w_cq;&4oh
zc84r@qhSgwt)845YVqZDB7wO~{9YlU_qfyj7`~?^nqfjz9&(V5#oEe`c{zj1g(gWy
zcJvrG6FC9#(Pp39KWG@>l4(YxgNp;UGs)C1aCHz-CS2&0Xb_}tP@gR7nem2X{&L%l
z2uF>Q4bLe$Z?F_Mls)9DTz)3ETi_5b>orxyWoN#qe)`;X%wh_u*=pL)QYcWc0#zdi
zJrm$UfQ^Zc97IsOdi#lU)hljViy<{V_e)%o&gY!IiFagH(IhVVpfX6w%vmh>P%T0o
z;}<d=fr#*&owp$nkUMAr8LlZZV%rd8vB`Wy<kH0k`E1IN-Td;jzjZYHqBX=aRz=zn
zpVx&7`la7fqn3I^nt4bHJW0A;<Bp!!Z&6UNJkawLqwNVwa!qE}a7)3jgt_;=URhs8
zn+&v~j*b#`sI9oLlx1HNjd0;cWkl!CO(8=c<x_2d1}p2q6R~N{M{2!`(SShYz$aSb
zS`%Z57ig>oUQzT03ZTIR$k=@;3Nj|(g!!wG6cI=q1@HhE+GM@9wS5N<Pjc`ZpS-qj
znDp|D`#OFE$`Q5Rp>WG@n+zlSP-iP$@8r7FpX~Bdl28=t!wh2}!t9PAGQI}DxFU`F
zhH%l}baK@0J;h%(Hs8=W2C(P!Qax%UGspIgo6H*4i(@kaHC-c-j1l4P$i`gsf#iCQ
zB?c=AiP=qbD}4il6)A(!0?fHJH{Fg}{Sbkm7JwI)h<F)SobBkR-ggm}1N)6*mwmQi
zx$Gg?EF>~+u1t&~Krt98DuP1s{h;D}Dr3qEe_12-xIu5td*ttX03d{WWB_H&-_sR1
zGoz@nV^25jlg$1qnSm}v9r0Rkv5HevJc??rNkUz5%~cmD?0L@>K;Dq4zg$%*T-d0b
zX|&+((2BwEEf;K9LqWt1@B*Q9zg`tuCOf8rhzrkY!@M9k4bPja5dFj>I0jTM${>83
zBe@VwaRiLUbafZ$gcyc=F)#$`P+$(k4FsA$e7ewEkA-i^E3dud7258S4LoiHm+5Pb
zbvD7T&I?-2-i+zAxo?i74pRw;-t;ZuGdG7zE^(k&XnxT0Y_>Dksu-xCJ?fd%(rv!D
zOZ_}eXM+G+{sm~XX7;f9b_0lY=85Ze&O5Rt9^AOr{0%lv4lBxfZ?~NKfB%5%*H+~`
z`xAp&1HQ69e9I;trk71$z({xNXuJmqxMxdAHn?G%9xS+heV5#hhNob>gZrY3JCBKG
z=Y}Z&tNZ~IG52b9N%I#VSQA+de;^1`p?Jp(%Vt2CrUjM#WR~ptrcq{qm`e~x-uO4&
zw#GNn2Ug+YeG8?!yfbi7l@+BbQXzQSTK^+n6X<jH5_{fnb46W>mrBwX08Fa!*^(nJ
zE3RRG?@5uC+e*oziQd=8+#K=PZ9BUY->5yfYb5q^lw-5S^jr%qA=O?J%SlfxIiZ32
zS*_(RcX%njUm|ssSEwt!4n5+lSohrJ2Tam=wXuo*C)bMPu<y~vmo>+;W>5k$6QRnk
zF`bTN_Z%?$SaBr<>MO~L+4G|xZRQMKD>5wAvjWwsi=aQM@caUs&mNg8xv;r>CK^S3
zYU-c9bAwd*C23hD$@SGU)$}$1HF;$Oo6kEHcC66_g%4vO<Us8w`I}eDTw2mft5X~N
zZ#<4j*>lm^UBjU|$Z(n6O8%`D^Rp=W0eM;mA%B}rL_Nz|Ql;X(1SQG+WR|F68+IJs
zk9&!}``J!)Fncz0WKeW=<omRcU7E(mD9rM+pYQh&Cd5XlpH-?IXq(t)h)2fzcY<&C
zTYm!YW46?~0Zhh4y6Q{bLyhG_gRwDYxWj@E`+G_Zqrs^~x}Y*Ircz7mix@iL>u6pX
zMx@V1)$>TVue#)m%U?0DAMw$ZP7$(X)rmd$zPiwsMf_ZiXL-kinTctyqezZe&JZki
z2LI#TWv1<MTO*!&sZ^LyU?>7bMF~KM)rd08xayC;5aEb?(I1lx`hH9IL=#Z&J}HYv
z(5<xE_i7b?Lrz?z|MjEfX`GIxVSZT0G+1pj%+4{#QtTvBjpe;qI9^%Kw50DVeHLx=
z;?mESZh4aqLwXIzkfHJrkZ<@6Wmgc^!rW!W9lhNIgS<GiVKEXDbHblp|E&tfnBuEs
z&Y-o4$ig{Z4;j%tXEExZ+Bu^6P`J5$S-K@S-KO$hzh_jQ!E~_LN#!?p$eHB&openo
zRIXj>JxX`!D`&M-VSx5tiS(F0K?y`Y+a|*XLt+!adSp0jJ&>!o$0oC<k)q4X00;DQ
z8TWH}&xut2vh;OuQ|^U<&5OD+KeUm4I;~3Xaw2O^v@LlZnFg6<O5Njf$0ye+BTpho
zCrbLSAm)K>mVQx0KQ*$zP1|6HpZlvM1rPLT39H7gA5KD!2=Wsn_$T#s&*vXe&GRdW
zHp%?|$88e$xC%gYM=+CAd|(&oa(acSO{LMEL3&BC_jLZjBS0=?Qk*bYiYehLFw8<t
z$IMOMwU;%CR0Cr|p>cSSN@FZBs4a^-)FnYydzq}!+~@74^+{9Ic!$$x!h{I<CCoey
z=luqCN3q%Ucj39c0y;e@nxP19jm$5*$=-19PO<Q*W#=lB59((QhDz*9TuGi%LYAt(
zf75p`;$yqh_#we~zKSo|=nnISHorJXKV~0J)`W|fD{0(OhI2-Rz7=0OI@R>+@R}5$
zWkW{;UXY3RTTjHK?=0pCa5;$CUiU-S@9+`iB2(Ek$@QeQBoJlh@3mI$HviS<-*Z)_
zLTBkE+LU!1=f)1q-HScpc;p9L1WZ`~+|3-3&giZ;a1tgRf<AYutykk)+fdaW=%4pk
zC*^w8a(XHZ(Hii0e)b8f+h5yT+mCt&F~KH$WXvxcHOC!BK|Rx^LdF2ih7N>qxd~$)
zp*5up<MK9kFoa$Ojw&xt6gT>K>9c2{ODVM(jM-f;Nsp6~c<Ryx>9tVHp8wR8at6-y
zK|Z#p)dvYT2o`RCP^`W=V;9(_{?)Rb#1baWgL~#Z)drMwR0Y0CV;0ADysV>=so1Y;
zJo(_UBD3IkBF9&G)-;!jPsYf;k~BjkGT<@}(%|In^Y`?VF4ianr$-PPK#opy`T21>
z*AuPBg?Y15P0lkMqMyxt_OwuD0UA3;+zs@4&A;j^9Xv?edluBrQO>u!&dS==vkV%f
zJno%c(e|(3jjnZUR6H|bhGq0ociD7qF<1C_Ro{o=d>0ragAeJa&1fe)M!SIy*pkD9
zJ5n!loa2>dT}ACssf^~*f2G}6NvfYST;K`5xX=vEHel#beW+b-x&9dPN9=6<S;j_O
zpZ_m_hSGf*iWb=9Jw2B>0M@mL9eD>Woq}j+>_gR0={5}qg<=s!y%{OQm5yFDCqc)<
z@v=#^-tkPWb<c!+gp*;JTHdASOwGGB^7Ag7a$DkaVPw=SVAX_RDBe~`K89AY`VYNe
zXyZ%^w8>-nDwZ+d3%xOh#$5#R3cD49gPos=DpLcQ6qosI9gXsUUT@JsXHLWwycyWi
z#Ib2QaH?3^p2eGG$Y3e29yOv3VeYO0;F^&F#raVne$pj3aFiW+!Q5??_a*C)Lnr)<
z{`7e%@wXxR%BLSGb4mcl*hTsk;(|Lc8Btah>*FrC4#|+Me*|0`g>ghP6`|Badd>=v
zA_#~I^0R`J28MRM%w2^lo|%p1`QGW@mh0CrI6hm?ofMy^J0>!OmQ6VeB|2vTTv1tK
zauM`cgh9!&c{#5C14y{nrls!IDT?CPQHZ5!Rw?_Sx2WF~GKdRG$I4;~5*J1Ta8VNj
z%h-a%>L04N6BO+&ZhDoxlfPA;SS;{1uGD#j%*Sf(`#cXZz}5LLlob|c^g3TJI5_>#
z^&&wFw_}{M_~sc&cXV6sA{4J{-tAU*;OI))KWTumUEElfC@`Z}RY^i!NTJ0+C7b`r
zgKUY4eBYO=y#cAsrOD`r8CFg&FvM}lm`jw^smeg^lDHQBMaHn{>b6sXs?}`Nb4__S
zsK)Q3f05+rWI5@$1YBI@o1qivlf*^gr<3Gwol>4g<HzsjLN@rW0```KzUCF|p7r~^
z$%%@mzac0YASda=xv(grGkz1ypErN?CO#GzNDOQbMUF&QZaY$q*3d<gvO7NitaE=c
zr8PSH6it12Q1Pu&wykXC+dhrR<T8;UbL$di{As)l-_4w;-MpcDzVh+>nqFHi86*is
zExElsS5}bDSZEQ8!!7egfwT)WTO-)t&qcqVx?E?-CcMmr@sk1nsL=<@7AsEln#How
z+Z<I*b+BPqEJ=BBIy&)J=#gl4SMHG&q1WvfCt>dXF`RGSU6$j}ceO-x(Pgh%d|avg
z`G93oi3|ko^_8l3dhJdGaBXCLkG=-inC|9GLw<QNS^&XRA~KR`y*L2)9;X{XO1>oT
zLez)7o7T_ESCf%4m=W@3*>EDyU}9Fyp$!0t?BGr%aFqy>2WX;n15~@+vBIZIDXRVg
z)I3Nu&v}i=%RVU?G>p(?v&b6|#=LbkpJ4)p62Ih*Wn>n|0_FnHkQy8RFF0lP2#-OT
z)PIpFL7#_W0v!D)vESO(0CUU)-OWd*7)Hp55XIFmf8vP$L;!Y;XLfn3ljZQGAz_O5
zWScq^n{-=I58dFITjRyCzME~Dd|Lf<$@@Dk@~8@?K=x%|gs#Zn)izPy_&2h;C0-ta
z3&Siw#@G2q2Wbs0UVVJuoqgowOiGpG?A!1I6SnaG=1ci^lM2QE_6^PIaqIS}wzxP0
zZz1d($+bj7l6A($KQS>Azft}IuD?7W<bqsnh}P_HjGpqiXtgxg;D4H5kWx=nzKKiS
zHfzc%(YKaPQ<4d$H79IvygRGB4v%br9ENozAs>%@cl$IVcusQ!Paxc1DO?agAAHhs
zI>L%SgnC-vwkmo<N*<e<M=v(Yk3S%IHJ6O3WvtUoD7@PUfE*iwhVlQvar~!$;y*6^
zM}%3)!{}eY{>J6xDN90CZ|t`}hy-lPKRp${e%{rd;cY!qz4?uyIb(ZCVg7!Fpsr?n
zPqB(0qp&FD{VS%-P^8Fk4csg|W0v$XE9Fx7epISP6KBGLq_J-j_oe%{&hnF@I?<ub
zhxQNab9nMI%eKU8eO>Piae~evgZ<Ng?h0zcyYK1DwvRsfYKStQ@u8hFUj90?$8!aX
zab(;#KD+ayw-M2hC_F6}9jVw<2)O*8Z|<w~z9Y&npq&DFH7X&d?D^~;%T)NNFWcg*
zD(u|;Sft)n^fTnVu=&?AO_J03Gpdf;A87uy8<l^Zp^`fFE<41F@Zlf3`NuM<H|349
z6s;M9|2pc-zm~C$C=-Ph{{QsQ%}oME4lgE#{2inQhQS^AAJ`@c6fr0?nIq`X34SvD
zdTU!&#>zaKCgZ7xi0>n;)#eskaQXS-x{6w2yKygCP5%8|a>jf}IJ|&ngpaCB8mvs@
zt$l}yY{ULW9=Hkk&O$EHBj_Mn5gAd(rdCbG9BCo|@hv|JpFMlIhi6=Wg!(C3aHc7)
zQ=hLsV(E=5y`HT)evczob1r_jtFD8*=`B;JtthKGN#A=(8$AT56|k3aprMu8H$bR)
zy#IRnTnrfC;Xq%jB*+VrHq`AA;_W^ItYw20<1S|v(!>>EE<c<B)JYXMEF+~!q;ero
z`zz?9D0+BdEpOIx4Zz~+mOhT(>vO$#V0JtIbw4Q^&B0e;|2ixDA6FDzUt_*;@X-S^
zqi#>jWs0wMD@9u_3t^kFgu9YWhI3I19o<n3^xVA5{0msJ`SeLuPxF6ldryzbn*13(
zU-F(m5Pu&26UnsD<4OgS;9-htkA&x*tM5}p-v0HQ7V`AXlDDy2cex5g%l_T%XQ@_W
zeEsGceOO$q()OAQoHh2^8*}7$?C}Ho=a#RYF+Y3957wVoMVGo+3b#zH+S&PScYj0t
zTz@1z$rEsBF+7o|8n-T~cHLv3dxNi@@!xu<hUw3%u1hnX7~pnoILy*3UyFs`mdi8j
zw_3DinI(_PYPbn-X9PwC%d{cIpe@YhE7ofEIdf{kP1sl)=3aX=ze!%#{iTmjqNqa4
zuE&p)E~V_!mN;^EqNcN~k1}xao%~X#G8OEeoKvKXWZXQMuYgJDxFQ+hVwLQ-W9`Fp
zM>g&C5<9+Qs<_9aP-o-3yi19CJWMtZPF8g=BpAs3%jV0D`(ZviCxw5>cV^%!^U#^5
zuFAsqUp!{AuVK-i^D<WMW-#xpc%|7ZUe7d|y7#TqNu3BI4~_FPZ0DSt=(CE`R=Q!i
z!1;Sp$Km0yXv-SI6WfqNEaq1Bk?(xl?B>rpSDzN6H>G9<&!M}WJ3e1I-oS6e!WF;u
zgTTiZO3E?!z4lstUaq}bP^)m-a)+hIP0vaj%udsjvFda^=rwb``_fw>4(xA_EI%+m
zzoX%++*XO}vK5=Z>ir3N+1NYDb?2>R^MKb?2fx!us1kX`|M{x7*OqOwF87I@2zfO3
zA|jfQ!gXq&rTC$UYo%|OD3$WAkXy+WAn;^4-_4yZ2Vb6?5@7g)A?reP=R3*p%Rw&_
z*Lv?zJ`r$hW7O8?jNgF=y*y7Yt9?^?%rNG%*DYz6m#bCwxyo9c*r?Ba+w;_}v<<a^
zl7{CkHuFx<?0%CF98mo7Bg0yKSgHdi^|V)>yQkqu)8R6mIAjJ<YDWr2Q1YC(w*1(N
z6?0bTU;i`d&(<YV%Vs}+W#zGqX|}}O#}61IzO2Z5baeG$y`522hR^qh3SQE)d3tlF
zT)wMu?$gi3yDLxk$4MNkwG++yx6fDY@B5f|5$E5po<@aE^>mF`y<F0I^Q!&vYLn}}
zuhZ{R{QK1&iCwf-t9+7jxiB6DntLYPJ@RV(^^;5P?|t3<sH48tABi2a+ACkhywGa(
z*H4+|@2ejDSR{Wx7>OOOb!qlV-aCG){?^R${e5r8K8^P8SCH6OPi<ND$(gVNUc@Fn
zI__u6@3SmtMMdV8xgMKECI+5PaWtB(__}3P$K&@5*Vg-4%-ERAEu?m1O6Rn|!(y6?
zHs0P2oY-bK(7~~SxqlyHNU7G9*H@P7c+9<%o4nXQ_TKF3PRoxe^}vSF?#uaw>UKK)
z-?yFvZhhXhQ+mf-$zSij+`i*^zFQg8dV#B5SG?4A*N(eKUYx&PzU<y3znVySVDkl`
zw0N%O+pEXksk;Fe+L?V9Dt>h0KSQ-YLT&b(m;QO{fFWl5_3q2<J0{N;bN_t{S#8X7
zuj<mm-JKWbuY2#i_sE<do9yphMpFCSD){#5-aCFhf6J?K->E!5IuX=zgDbsmd1>C=
zn7l_N=?G74K~lQ&+>~#xfV*XJ`+xcNaN2ucC%69U>-^A~%daZCpH#DFJTE(PBIf<m
e$I^cJAK5LBFIqh-XlJ@*$TYQB9jz1pZvp`I5p6#J

diff --git a/app/javascript/images/screenshot.png b/app/javascript/images/screenshot.png
new file mode 100644
index 0000000000000000000000000000000000000000..e4401ba6df218b08ec54744bb80918bb4d959e6b
GIT binary patch
literal 158816
zcmb5WbyQUCyYSBp-6dTj-Q6i64bmVrfOI3BgLH?22uKMCQbRY4G$IHn-AH$L{5C$%
z_nh;t^;_?|&L51kXZGy5_jO<Sxvnw#rMdz(1~~=-0s^*@qMQ~20y6Lv@hKV@_~+!>
zpbP=*$fP9qT*qf-x6NBeN5AXg=H^euMdgjrPQ_WvPW#$GCX<G5PWM~nEt8Bf{{vlE
z2(}y^k-rB2XmJ%Jw#|a;sl5dvd+xI+i!Oq9#iLVgiyyK3{$OFr=7ezV)L8G;{FJ=O
z66u<*k*b+}xW0I}WupzllR*O>#<s4^T9N-fkYR@Z=NTGu`adVgpyeSD{yi0Vcmny)
zvoNsg<HsKlUqaFUb2SX^|2&fcG5+ULpot&Bx056}cV~k?9~Sm1A2y$(*-`tvmAqL|
z5m%cLPkT7}&~f)C*zcjVWmI264W0H=I+uU?t%lI&j(~IAG^{W@;I9@p9^;Ti$4usx
zX6TWs!12i4B+0|}LZTHRtx0k9?61|uhvWa8>(Po3d_Kv=!Vy;c%%_N7$|Lx}hKpD=
z%tPS*OjqjP3qGE7->}b5Ec2=c|I%e%K+5A`+xf@a=%k9t-<ID~Lhw3MLXr|lAln$U
z<q7MN355i-CWQZf7`W$0u^0?l4M?M@pa8G_*DDNRu-8xjABSL7Ks<m1%>_O@ehc2C
z-2OL*Par`b@jLA~RZwJrZ-3mj$4w|(KPJWpF2{gK`(%kTQ32AK6xSqzDa0}Bh4B=s
zmY6Fy-#YVSy0qI91EvI8|3F52oxnVDnxC<=v>UiFECEH35|%OG#ghRQA?y$in=aP`
z^}o9*pxl)Ko3vP;?fg#0tZ_RxY1~(A^VZTpo|>97pFN*P01>|_c!MYAC^MG+v249Q
z%!P#GCihkr`k?t&62QIgj}G=*>kL0@#FIwId`2LjE?(3XO~cbfdxl)I(=9A1@TKcu
z<AX$89X^D92kzejnIDaCE|SE6HJDwlv90B2#3Be9j^VczH6)vy&k3v~^H;gsJ+L~;
z^1pu}RN6%LQN(+Hj*tNnY}uzaR)^c1n2h}}8%;gnw82aUsIRvjC<0o-k7%K7Fg@b-
zM%Th)B52uNkudo^Z2?ZS*r66va0}TaH@#&=e9b{|mi)GUtRisFqrokfnMGm>B(}fZ
za>RYFpPxsn$yLMX{E*m5dfA-RO=@)wZ`Z|q!>Tf7TRCaR5-pCU<hB)=l1qMV++FXu
zG#2zF1`lQPe@aBiL(qnzkE(zsj74j0LNn9ih7H+Kih`!QNTWcdQQe$`J0W94G3hwF
zS7p;d%kRbxA^6jpfq8|PBh-{KAZPQ24P5M7yG5#N__xoKtQDnl>X|&aA7Qcrc9Fdc
z>E?twtg#ab?b9a{5E3y_!9+IwN&y{Scu3t3B!;e?$x0J(@LKY_FT>6+21X{Q&iC8M
zOVC9bgP3^@TY}z<C25LiTjP?8=hsP+rxF4Rv@Bb5&%a^!+PcGHyt&2upv~{>>-EIm
zoB+iS_D`3Gg562WmaZxy_=v~``bY-+AC*nK@bT2zSzQ!jw(zWlxc3_tx<Q&H7UHfq
zW=#90vY+h*pt7qbMV`vgo&ZZxHu$mgPjdU_8IQ;!gm(#@5>JDMkK2wX2tK8nN)Rl?
z{h%CT2u+iad&&Fs=wpri5aH6z1x@}d_Re|#k1jLSbi(4MjunP2_yY42*TVc+QGj<S
z=Y+Rmm8%R^+}^Ja%v~*FQwv(3&xLo~9yjhDk1yOgW}Mb~{qAaUxM&AtQ`cJixFKh$
ze#i!=%xRdgC!e*QzGj3s-BE<lrSOuI=ZJgE&0XTZqu}+WEDi;;_lCso&xta_x977d
zu74GY@gt|#;;K`dWA0D{afyn@##o-W3Vf;*ogD^aS&bXB7Ymn1q%03*Hn4WiiG%da
zA42FhxZc-?BM^3`<dugU<>Mt~el>gf#G;mLF!wohHr^VIdo}CPP{e<Gg=FhaBKxHc
zdxoS%JS*kCnjOmcM270sziCF~N_LF0;J26%aWS^c0WV*Jm)~1WGzWgH#fM;KhKPCX
z-R)g4{WNRsm-4d6^@m2~B=P+jFV&aT9%HRsl+JB!eMT?-ZI<g+YisQTm)Sz2ri6t@
z(fcnSQ%{CX{FhfDClj9{dcD|_Tb^J}u9cpF25{pw-sv+R+3#%*+B>U!ZPLh*bU5|q
z*+W%$LMe8&Q`w<(N1=<<xRCO^Ao)Ja<kpYu6&=(kb;aQ*g-EZS6D^KR?D^|WZurf}
zGPpI|EXcPtP$9eN3<2N8b}V>kCLWhsT<)8DT`Sm1{WB9-!p|t6#ddn$Ux4|OvPvaA
zePN6bNuo48g#aU4$I@j^aJwA%iPabd&E|UI#j^^~!SL8bI4)Nng35c7cE5_vR^`>V
zE+695f2Ij)E5x^Wm23UR=zjC%xK^3)_vFo?eUQu@`17zCv;4YHsY_wp51*rzpJlrx
z+mmEc%*eX<yKVj#)asFA@GddAAT2kYHmg_<?AUg*pg-&7i#g(&Tux!6T({0FWuzp&
zD_?#g8s8Pxd_L9=+!5rgF1{3Z#z9U8ml?f-l>9)6Q%hBX6{O>2X)8;jrwL--di=iC
zVtwa1bWf|%=3k>M=Bl7JUAQ*n$bmW$2#RQzQCN%0@sSs3@RrKl(G}XCYl>86Z6B{N
zZacp`s+{nukbx#+nMGc%Q;0c_?ag{?T6KGm#~GUaaoAeb_+r)(<aDqa{vIW;{LnM1
zl5I69S%6GrcQ!bkf!86PwdIgp%<=7Y950pdc>KBc(x#$7!<yAwW2mN`EVlb#y~#Fs
z?&Sc)emN{={j(YM!CV~)C{!}-_$!CSOKmxMLeOQ6F*N?iu7f@GQ<_ylcMsyPi9HM?
z&1C83Byp#vLxJ!4l6eM7^&T$Qhm5!uxrdm*v)=p9dpy>6T~Z?AW`dXc0VlFT5UHYT
zq$u{ar%P)rah;?+_+eq5jkLw@yh_@WY=es5NA6W`cO))N-u?H;4<2t*^6Gr<)`w<1
zGx_OBQw6DUpJe~)Ud3<mI*|1{`!YUeof{FU-$jUFcDL8CsQH0ZD9HVVHBQV^C9Ack
z8ah%hU3(a@WCKwcdRG|OUgAC%FKGU{%?M^BPQXs(7!wc=ymnmALWWtKjiJ~HIxi%|
zW{EouFPU2cdY8M2$2W@_(Vbr_60~AtdsrrdnJpEp4q7LL%)cTfb{7-1;bA9v`qWr|
z8<V5Q<MMS+O0*pxaRZ`D*<8quQ+V3N`+Yci>9~vL=Z9hrH^@B6QUuPEapM5mJmwGU
zojf%j*MAZ>*xpR4faexRwXX*VGqsC;5@puo?8nf!{pw|Fu2;`WQ0*oml@26XwCRjT
ze^jg*a2y=)Y|D1ov8p=w5Nw7}WwYl*T=K(OB(_ZmpNlTH$Jt7oi6@~;q`Sx1QF6kf
z&QYzNYXk4Tyjc${y^_nXLuE+xc%oCkd#qbx-?B8zFcv2{m6gt?EvjtKrcN$?3~17{
zN%*GAz(}(t)c>O9+rrf%dzz@BVn^nmt#{M|Z8td4u0n`46hdDcoM-24No+kq6&L8A
zB;QEJ(3S9$Zc@LjM2JmMCQpmQTxhiOZ!^iIU^VI%h|A$F&*Pk1`MvTLVVjQ`_ZJ`I
zvw%(4Z-5@Vy(wsSe*(dPIitf8=sM)F<5Bfob_)?2!Vww@^qclExs|s^qU1zMC!LeN
zHZgw(JbXXybj?BT<vm_c^JyK)6Y^L!O3seoK**(qxjdNb6eVjd36G$*M0`oG%A2ce
zk*2{mC$arRvXmXjUSU#NR$L|{%?T%0j#x)`4f=Mpl7e}RrHLxQzg4*@GuG!m6Xz?u
zJ<64sBN-S$emF+sE|7!9fZMs^>MQWOyHiugiMC;^VuQ<+{nmL)|9goojpQ}*0h{M<
z;ZbS1DANyEPPA|{u1nK<)##2tOhGT=GHviW=@e{~%r0PNPo56pE&1h)d}=v2<)}<r
z(Ig&cgM+^DxGc8I_aFv2j7%zbkuF7iCq8p{*|ene&W1K5zOCg{z0_r%*y+!O{eI=E
zJGwrE8q8Ww3kwNuNdcxe6RdXo7D%vY#oZJN6CbSz@uIsHX_fL3Y!TS?t{N3DOs^30
zl%1nlI?}rv%V1~|Jm1MPel3a82>2`3qT{wpaB+!mZXp6)X$0fC=9N>bM~D*acw7a>
zvgou-Z_vyRe@ZV7I_vZ`<4VDVMWp2Ug0XJGbte6JD1=-d);{zB377i?#tVt#NwZ)F
z9ViKx;nD5Yo3j$zER^dBqqcjmQC@s6%FP<f$pyfLK1U|^^ux`0DcKrk36+v$|Cysw
zUg8tfleoUNMkE8JvrHMs%tFPbt~ZAE5XRJGU2b`N2D4YJb`NM*nznUTF-sRjW9c9@
z=2aJJg7nCG+3&qJ_ViB)g702!=l{)GF&?v4^7Lc_P8W-3R?JzjmyK1mE6!pXZyC(k
z8%$9rrj=k3ulXg>iJi+5G~SLMXHMgQ%kCDe(GHV8_vsWl&bJ&S8K~*_gNCKN@@sc7
z2>PpFWc@NtZ2C0wh$|bMi=RmbpVrBz>L((RIxaMy{FE}QFsM_{d=!nb>u$mIs;C7@
zh>**|_l@+x)4@M4kbSOyTpdd$K`e$<-HtMl4Yr%fD2Y*-9ssvBjhyk<(Fq5xXZd}~
zE52;SgYeMtXA4|;w~_Xbu!38iZk&Dl2(iKJ0*1J1O8%FJ_^%C2paSnXfMV!}2&Su}
zqR-pgPcZ{k`wOLp)s94uo<cS%)xGD5+7TUNmmP!bj@9c>wX3%hie)QV?j%kPR!KS&
zXXET}897fIGJ0ciejxp}Neki({mm-Hu-Ss}nL1i)!5rGaPrd<^i>sE<I{YP(llD8n
zW$9I4>4-G2md17ZSVpS7ERlO9c5VIB<g+%fDoC)-)$jIla<bCQL7O*99a=gms0Q5#
ztl3-}{4jQ4QLLQbjE*T#<DQndE-%h0ORyB7zWRqI#5KcRF?;F9^s_6{CBM?iEiytj
z*3yE6U(o|}Nn>4NVTl|-bl3J-%1iorg{3@fMgYbt47fg>#$}u6r_$XHV-J2MAl^!z
zJ(9&zv)CTUHc(Ki@Ujiu>UFn{7@44)*_gc;bYl|c-7l)?z-+Wl1i3;+jbLUKXMXnE
zL4bKhSw-rVs4@`-cOQcHAt{7suZDZ}g@o^NGu^RWVL|%2+*IT3Taw=mNsOFW_3WJf
z=U+PKB$qhH{mnB<yo+q-?Lf}u5gvgg5LwHX%<+cqj2E&IiA}Cmr+_)U`w1?O2P{j>
zdq2-w#9meJ^$$ouI6SgYKwXifk~hPksb5SgHZ_E#LTq~#zqiEMLk?PKpC!l;YKz~w
z4CHK2dtYI|J{JD!Qs^*dZHxPyM9W%os9ObQdRE2eKXwYZJPDt}!@HY{;w3@9e2E*J
z{H%}SPU^-huD|_stwSmr{D7?B?Dpz}kV&HlSNS<uX9o!3r@NNl`qB!CnZBh=1uvn=
zxm|s)3yq8)=+D3!fB!QsJn~6Gv&GuXW+N@&xANX61y!U-m6KDOVr$r%S<WhSh*x}V
z{+Rp`G0C?LEH3WJzM@}#kAH^!go|0Cz_*DQZ~z-QTndHpByY?Fbn1Vz!C5DR0cU@p
zk-Y@(Pk-H-zbV~BoAFI^rp&Nq^p_C3@8%{D^fjR@a4L5AOpZ==H6qv4G@J2dIX}*H
z?{ot#DsjlU%l){xoFU@gT>gUQN!V5k0wRUKw+=&&#0?^)h@WZ(ucklfURi{NpVt>q
zj#!f5Y!M?$O6s2kAHl}KUj*pHE@6r&Le>KM-qxtXp4Who5u;+Luspj@5)?U*NuRm}
zeRI?C0*X9VGt?<_sQ2<w4qouZzQhx;;z8w;@AksU&uIp&2K7ImUmdThTsFbXhQ=Lu
z0*ANwHeRac*~iAZouRGpsW8J?5s{Ys0cYk@eOL^vf!|&=P5fKq(L1)vMIf8O&K_bI
z)Kf}Dy888Xd3pRc%<m@rLskb8Vr9Fhn9X-bU(hoq4$GA~hg8J~f~CHAqwwk&EtN7{
zc56rHV#gAFsBXn#Zsj<j{L-0jX))hfTOC-|qDDV9I4?f02U0TYVMA$<H4yI7^_xn9
z7OH;f#SRoMHQZ~m#J4BoWW6%nhDvzM85>-0X7y};h*aDq2o2%0sob6lMg#~%v+6Dk
zUCGkA`m?11Ishb0ay{|3P#Y`X$CBnTpJ2wUI00B;m=S)Ap7w^=`4~-^zlypz^qehX
z_<IY#gYBV0HIA{Rp{$G3Bh45$ek2oA-OU}d@0c_?Olq;VGm{0b_S-V}Y+|p16`A3m
ze2=%Mu{BI3TAXL>sUDi1D{z+OIj;hUNwH-VXMFC9MozR00%*Y%KoTC{71Y8fL^%&9
zKR;X?NX<3+wv>bu9smr+I|!Rv)VZQ|9S=P9`}rBs>tWNgffxm<$&Dt<Wq@!L$bM}C
zveTDlPy`oYTJ}dA0F>hYu$zBK4ZvOgSBJ>yX4YYNdT-GGxf<ak>4Iep0u(0=>+kjd
zeMJS$9AHC_m;QUg|L-B-u2mmN8-Q|X!yd5>z}NoA;U`_F)Ps@tBY;B7W&w~70G$3V
zT8;$yk}LR*BtASzZ?&c)Xn>1P2CcN|FDTp0M|kK94m!G8Y|(s$X7_1*vBUcYKz?uk
z$FfJ|L3+Z6!GTB9BxYKn=yrM6K>#m1;upB?uF`o1Y~FtuSvs)%8NxS4Tr!Fzj|+VK
z+d}}BIR92^5Wmxl`ri{_z)SzV?f-im_P^VL$Bq40!(=>OLLZK=9!N7pKfdx$pY_9+
z$w1A{Z7)g)zPinMl;?lMQjG90x$(eX=YHU@J5v5Z#D$o42u0&1jU_4}8z7$DoLgQx
zU?czTQxqo#_t)LF_&wiDG&`be(%FkGo1g!uj57_If~_FEvvP_%wTKkynFh@#gK_`0
zk<HBT^?K7*g}(su((1+kBz=$Yu8wiy{N7nIx)t}|`yleW*rE9(jx2|h@dS^jcWhXp
zJJZnr>Db6`rGg_YQgZ4XDr%{3L*6eFCH0=gm!!4?Uv5TqD?J~zbo%tRK-?({j34Ur
zaHz?cRuRR+O9P!Nqr5HT=UhO?M<;B#;Khw5W8#!v+RtG(AwY|zIN1N-I5L^>fcQuq
zk<<D2N=-DVNK<h&A4U{j9y||MGOf`>MVC8^dc=xU3~=@RQDU!!3dv|RquHBMG;Veh
z8HedbR1^yG%rzomtmL~NS#+ptKFB!Xe1BZ&>uWD`Z#Q@Gpxo8fUWXSr>d(oO(d8!T
zATZ&r4-%@$xW@Y3{>a!}TS$t)as-#h%+aT_Lu4<dr2m3UCBj$Gv&oS80924f+sX0~
zA^&XUD*TqK5YR=@m(aopGw+Uqk*Oa5fn;a3s}6N&RD`~lfzIEhgj)8RS4KtdT!$4r
z!=wBJVk1tT_sgIaT8)O)D0s+qb~}GRjj$f>pPQS|MuWxbw??RtFA<TD3uXUD5^cc_
zqc5uHPj{S8H=S5GDL{93wy&}y#*G2xW+$6bfa1fgX)OJHF}dS}*qvMBEg=^R#A6}P
zH7%FnG&Q{3p>yZE4)LFpv|=Lfo)y~i^l}oi358J^({&Ltdhl^q5<zmp_S@Kz%+8D3
z=pFo}9M1*3&|;J?biWEb8b339rar)HpR-7f5YlF^=IIfS_aPoIx5w{KKE$L+OF6?n
zKvap)BZ26U!t7r2yyS%AY1$;FA6}y4N53;}CF~|$8fj!tO*0zl>!(&QobpxSL6orU
z+MaO<&F{lGj3WyCYO>RwpxcW;K|0glhY$*l;%SS&J_&~Y1=tP_9TwagUq~S3&C)wY
zW)>x{@CYOlz(4FcksI%N)r7CXpW4I;**;j!s)wArL6{O@;X4U2eD;V0f0De~ncCua
zU4;<9>}0RnkQ?izYC=TLBYLf4&JE--VZqhP&g8G4L=P&?nywH;S)+pI_hUkzY~U~H
zFiD;_WLvMKP@2%e$SB_}lfgmozna<DwmUgx0g-<FN^S*daYQG8cI&fMU>1_f;;w!`
zR52ME_Cy~IFEjiJM1sNdR!F+f2s%3iWK@Hb3qcI1&KorBMF9=+S>z!&w@01b-x-{~
zYqbVK5d_cFAJs+nPj!1rJV=oL%{ea3{LdeT^e}I9S#f@%a|(i!qdvofrR8={pimh$
zw1N;5ykiJ_I2Z8jtU?sG>{_X5Axl>RmziV1%C%qWXyJrqtr7h7_0Df@_N*b)#6k;n
zkf@LGsO`4_vI^TSm@w*TE_({VJP`!Yk7#3XpJYBWO=Ju&0>V+<L3gQGpr1d*G<xbb
zyuO=p+S+JQ$Stj2W$`$eJ{85@@maO(uKu0!tHF@j0Akw)W=x~X8N*yE@G5w&?Ss6n
zW12;H!M!A4qR%zAK*@GyEc$|PGyIUSUbMdRe{Yfc`JTom#Oo-bq59$khn#T;Y%+@}
z%1XrpxQF9*b<>b8)$%#yJJnBXkCzj1G|bL^bmmW%uJ;-=pXykEdr>ljIp&|-<;Fdc
zYFQD};33kU9}D)gF>GF(q9Bl{Xx~a^0_+8S`;$6Z<fc!J>lb`TRrb4p9!4h%K&AO1
zG40i?nN%u3ez9VKH-ZUr-s!dfL<AY#GweD5@7)r<xc+S=>;gbkVJ@IU5apP9^DAfv
z;iA%pYDu#9+%!a%j(~Ax5KWzp73DjBcG7Zxcl2}3oC?HU(kRmIo5)1s8dIgHCJt5h
z`QNBFXyTy}CH%@_%`aAF8lQ0gvnwSCLZWQdg>75}9tTzxw|U-AI|J1yucqtpo!dht
z?*;KQFi?DYl{;QOg(5v}%;`2inEeicwtT8U4GXzZ^M+{11Gt6Zxi$apvmb`-4VK6T
znf_BaCUq3e=|#N_CJh@Awj28+`IU{Y=kwV@{9Ig32p<g^u<B+xl1=J1j=ii<`Ra(7
z5P2@fD&>&mD})}dZ=SMHMT$B^q3hDH)d4>q`bIvCL!>=R4`t{d)WU$vL-Sv0RLA{e
zV{G0B3)&v7LiJq>dt%479V>oIaG6lC?XUb|Dg5YqH&{9o&p~<z=Vj*n?k#~)*l4bj
z$mvNH3~-;z`P)C15o!nt`{u2qVYQ(M!G&kskY#v#UJ1DolqmL|%rJ@=f-2Frd_AT%
z12{$>9qDe;)Vkm*mKVr$A?xisPnPPpz!IQ<ndPQr(oY1CevT&>4U0KIAu$>PaH(^L
zz0KHH82#BTFN_l#1s!89y|VR{GKrVGGK*ADksC|ixz{<6Y&LnC<Zc9wAvcFlz5p@G
zNg+-B%l#uMGlwoQc<S7+qm<*RGpIhK5N0GfACS*EUle}GQ(NgTN!ZUbDFl5VB{|Ty
z>Wm0lACB6UddXA!SzpR1jKLy89W8;(YHf**;T%m-T0Ey1hXk@W8zQh7Srs1Z&Vdwu
z`s!T2EH*d)wdlClSHrV2+bmdK$vam_l|ep|VECOoLD{gH(R(bEKz4xoc-34JvkUR~
z$|<0`%AU{S9ir;c&z$<{*t2*#MO?{1wm;pGM%IQ_G@OWQ&6ugmnqwU5*S&+RmELkG
zd9ngl^T`Z)RLGEhJ7rFoCEh6w^u+SHl;2TK^$y_5AcN{X&-+65LFnjoMLx((+E9T%
z+Z3}{_~Tm8K$%E`8Gld<2y|(S_h*;vIcP!vlqLp?U}V9*9vy;<^K%aJ0Uo6;9a&Vj
z&mYIZpjfGc9eAnunu}z`$>M{lP;0D68#8>*c!)~e5$l$?GWhl=ps%9s`WbwWyT@(&
zGEtk^>ZcLnOa0_B3J^Ws(VpO+_c%a%DFyM1hDpQ>mvrs|OD@19l7?B}fG1yPUyO}3
z>+uXHviWK9D=b+*l(&<hFKGOiYD|d3^Qt)ZS2pbVwHStCK$Y5#d5BP{==(NzO4F^2
zDOyYkG{FKQo+ubgnxg09=cOUV<0<l@g3y^5qZ$kjFI-z0<|7+aUFVm)b5Uf)Gv_&}
z$;NO!2)a9}WL{T#A$?u<7CZ;k0IhAPK#kXxo4A%87$eOk>o9)+j*pSE4ak_9o!EoN
zXVk9_i1NPt_=rd6yoPQ7WAiY9hHp-^1VJx}M}u^0i@zC$jMA<01jgO8T=kF{;UtMF
zqV~kas0>6?r(o|85}rr(viZD{8*9A$J<yL73Ai!ZI;~!;PYB7q4iJyMu_C?m1==Ia
zB#i>axjrod$ZDwUp_fIZ#wj|**ogS<yuaZRI3FdkkBoND3lY3Zen9hag-Vq4s&wk}
z)DBh3?m7+0$E;|}P>UDj86w}C^KcFm6{D#nSvai-bbkGwQCr`rH~psM^Jj{PQVcLZ
z+2vAe^<&fTlIC@L@<0OWdgO!Ij{z!nbU;6pK46xM!D4|oGs4Tqlytqt_JrKNJGA*|
zkHtL6|5+1eAS&}lw!s+#7F}3s1IIf{L`<HN2Yju)GYwrP04-PdM4*R2xrjHP$6^O$
zb!Gx?q%hZ|U0;Wp)0CHX_!9bGfM{v8Ole2YL{M82x#KQm=Y(WH!LvUHjw9C@+a$Ym
zNw(gQ0X(#h9d<qf;g|@rL0O*ufql@*pz2Ndy`0KA!U40AnN%IxMHs$zKv%@8DPPg%
za2YO%Q2R;bBP`{&#4{}@nXg)AaM0ikN-bdp;oV=Rg|93t^FP;p&i^d%n&1k4`m`75
z9;P73Dpw7TEzAzkiA#FMyiZhaad!Q|+*laufW~`-rmEwGh4bNw{#L$h8C3w58r3*5
zsXwZpg5`(sPYSQKtWQTAkAiM8M3;8)Al;eMjkKshs#RhV#KBKX6_NOs$lvW-BT;V}
zV#^tCB;ubvIt`?5Z;=JGV=NWb2KU1%x8qQ|NL+HZJA)A!ke=!Id*|;x?vKtK!*!>f
z#TFKWzSDF2^Z0@Ds#z_fNIl8)DnkSClNIYl3FN3v01|JniOoq2?w)OMx!4!`9Ri;F
z?X~1(q^%(A3V4L$%jQv|t37e_v__5$iYyj5HjA?uChYpX&>0Su%Q7zWW6(%KkR9u8
zG>f8XM}O*Kp*tq(Nr{=5Do9%l_>Oa49e(*vM|0;fPN9xQz|}B-B4B5`4h#-9)PMp$
zbLu1rm%sp>qf@bekeK?Te-@{EuAp3e(5D&jT&d9-QI;aF@pwmv1X4o#YIN(j3~d&k
z9c|WnJ@x!f#E-LGONK>;aQT~>;8j=S7XZe0!~LV>UZ7{j%y|wVKYk79@^&Nr$n4bc
zG#der^Zk*T8x|}G1J?f8io{kzCPfy=)a=^X<jppliJ$@(c9YLRIMHMqo8)=Crw!g6
z_fhZDa8`odXLaA;QV%~IZY=`9=3JnDPa2e_Qdx{!?C2G>9?cS<o26}>&Y$dZvq*z2
zvCa%{ehSx8xN91`ppX9;9SkWU1WAhVASTpSd)RjAJ_lT{9~azbX*~EvYVfyW4<7qg
zja<#(ehv(re%;?mN7jP-`5Kk!LFmftc&0X^i>2zycTdxjLu&wAejBT7v7T4^oaLmQ
z@m%>E=6k~iLo;nuwCrnANECmyR)@?%(rYD{1E%CoVhVcCSuAPAbExk53+&-z4E2=e
zfIn}$2*xa*1j3k<uwjjglu_QO0`eJ^{0X3lT2#40Wg(1i?3~qYl38(38exuTPY=@z
za%DAO%ECJraYu6zf{i2>7eYL-a{`P4(2sn$0Nc5oMxxV?eD*Hz20Pl0Jpd5ZW|$b8
zhDQ$;u=c8Pzkk$_iVfa*w0ee=I&?lMJ_?RIc%CHTjg4nM8Zb$FK1d97oghapzlx_Z
zG)x=!nSo?LoeeI1J6CwDU13Y+Jb)E*_v4cc;aG0vOIypq5LRABn5Q0AyXT31I_unc
z{~Xy@b`m}!kf7$e<#b2(MR6N~ELRu7FDWvw!c%+y4@=f)uC_AGo1xe>;iocxhW5ml
zR;3pZr{N>yE`;@Q{ZR#O$H@6QNCuZ37%7%Qx=@Kw6k2S&_>*Jx`9~vC5OLkG1?EC#
z-Jv#R5o<-{YC!GhKE}(~>Bz?`6}0xzP^2U9=KL_(l8O^P1goq^T(n)0Q~GSv-^234
z(8X?Sj-lMDqnWR{u7qh@3tSd>&(TUSL54Pp2uh3iRq#5HkRS(TtccxdI|U`82nTOC
z$U2AJ&(3}iqo<mJ6zzau-p#zz9qam)_l_0LS}2mT0`_UN9SqsPF4e1=7`Qu_#%5A_
z9^voGUo&|k9Pm-un($AZo`f${iTK=EZbULmalh&MRky{C`P{T10ezep&7ou#Rv`?9
zl2yy;MeVx=1U?FHxf$WBz(PS3Qj&<QwYEN%$7C>SAI<f?itu2ejjw_FX`;Bk$34)Z
ze_?(8WGSMS&+dmR&$WL3{CY4jg7X=np=+Z@6p_~NDZDdeO=Tmx-i!ycHVtQPwpi-)
zCm;9GFUP>`fFD@-#rX*q=?)jB#KJEb;nqOFBPW1_yW$L-Cn_elIQ(8Z>Lo_3C4m6R
zg(AzkIq_0;vQ`|wvko-WLSbNdpAmaMykQX8V3*)N`UZ-)R$l3<Y4?_sWRbKf>N*TN
znwr=2yF#<(*UrVCdQCr$nK-)kmA?@2xs+(UwK^b=Bjq#l#^443P`(3LwN~!cCfXS>
zVE(=WMGO1WRI|v<^LTq?YT(G1&{=J$X35hq{!~GHNQqJMJB9QBJt(6H%)p{gD4@8!
zrlYX!Lyi9H-NR^nr9a)RFGnCf3$VPjyEgV+@c<drKAg;{n#9!2cUXg-$7p>a&w1$N
zznJmVRW~EdvYw6eDe_?QcfuBP(>2xXLHj@vMj(YUS(Jr5(=~6l93t#5>(t5$W*4RJ
z%GpCf>D(?f%<U<*o)TMNspaF8=Rq-un-}1&4LOQnDEdP&^P?A=gi$~^^q%wi%6Iun
z4q0tfN{Wo6gn%ScZvh}61;{g`w*P8;rx=~pCYwU^#`vm7DWdEdd>-q^p_}4-M>xWt
z_<o*xQuqwelmSMnCJc)>XE1C^^@Z`HO|;u*$7s8tv*kN=C@;euQV{8?&fk36Zb8^l
z9FTrTE7yQz(4|rSN|bw*SP-)&ysneTB*4P&yWUFO?g1I47`Ya?SU^g!TnzsS-|dLe
zR#%eNPq<u^mBETZmA(nI2e<7|c9l?qes<{LohQ)1fsE3SF2r^b?I17}#OC$C!r)$b
zs*aJTYlccnLM&-p)=%g{>@TsM(G3L5%Lv>aitbtTyVJNsn<GM~zM{KHu)9J)9_u9G
zFnTnF<=WD(k+UUJAaF0o#l%KaF^EbD(ZkJH7>CaFPHFWk{MnHVka@B{KBA*15UK)T
zW(x>;<V72f{Ld*wU<tJdgnx@m9M`4ccxwqpz$O4j2ar<$mjZ=B2eN_tQvE)YEa>k$
ze`UuQ<^e;94Pjva{TPBD(d*-f0G~F@^*H%v2td()zU{v!;i`cdJO;#nsN_E<KaREi
z03QAh-aQtDkHe0SEBS}H{`1EF@$SFZd?d2}*N^=rCjjQP2B!HQPyEmEe{*5rJ7zSY
zYUOjl&_vZKZGrBlHN@FstrtLwQKG<`ihUR`jhCH3BgEdG+BS-|-~`jv#qtKIec1ya
z0c85rg<!SK<FFtx;6W<T4_CJqrM)k9#qwz*9)%Embr76k&~m}!wdo8Q=8a0S{?+!u
zmxd5kT<zg%TIxRn0uo0&lTFS7ec3pa1mdjQ-17!oCFc{)qS`V_GOck%R5b3(-IHLl
z43Uq9EhpCaV~(oj5?E?k_W)q!zwSO7%m%o(Auu2~V+I9UNz#UaZwdIjZHbpMZg3S6
zKe6{oy~aaM-^}?7jf18M|Cvx!6hniNu9V*8tbc<aj_>G>mlr-JIRA)xt9g8GB+BZ|
zde8`!tHf<T+Nd{(ST>;U;g>jRBQ1zJSrENXJww#YF{s0F4;UlKCw%ej_VUPOM`&L-
zCHNSqL&bfMpO_EcOP*mIUMkhFvAVSSom~&lXCN<@C#@vQE-Z90Y^VUeK?<@DG3mvP
zzu)wbJlvkF-JvEDbDAnm(*a9))P%dz_3ig}7?;WTV;`HP8(a}!cuPQ&dm0xj1?Gu?
z*OIWB<8!*{_5cc@ZXe|`y=`(EbXGDmYx5I$Gn_wCoHz1Hk^L0t&3^e|0A-u54m{|u
z&C+!c{Fb9%u|U6ecz<_;o#|z*p1!tAOir41d)t#EmBUId;dMN=wzJS4DCECzaVqhz
zP)2L)ogG&aMXfp-srB;EwhocUJZunL+ulKlJ{S|U%mwB@T>iO=nTx-{S(OU7jO~Iy
zRWfVXpJH2sIrX(K1_!f}hcJM88B?gl15}k!P=oHS<6~{Y`j_E(i7iQG>-Vx03Q|=~
zYzIs8{uftfa{tbcQX&EqshF+~6$n^n;Z8W@qI%ER{Tge%hbL7`+x+f;TZlX2Tct{$
zbeiIHN*GRm`_2!wdjMJZnILlV6axch0%=_O=?}YYk=yIp18#dGrr?mxKN4`dtnUi{
zeghzDG~~u{J%kBybYhRwt5_)-@c{Znozcl|+AU!_#}(!#1YC-b@rpdw21~2NG3h0I
zBwsfWzUk34Q{rXFt^H@S0JAOF!T76HW}ibt1TYU%XeRED`c5V*7t!3x^`U)MKXp8s
zapFE;y6PCSKGW_~eP4%w`&@OVv1D7M)#qqqcpml7yT1Mqf9<PB`vxxf2pqSX!R!&2
z_79Vr5C}GSmqv6Gh|P-uEdle1vya`uhy#qk@Ji(Y97@si*#ixoUIe4*n`iD9*|J*I
zG<x@!=X*w@Rfh7=U`gFDM2_9o9!4;t#Pq|XFZ_?k@d|Nn1HomWZi?IK(e7_M-&O7W
zm_89IJ&?AdGJcy^25hMc7%SDJIbeR|cUhg3bC(hcmr1!K=IM{7*oBVZj-WpY%b%-1
z+`@<>`)xwfFkN?ZM=Q-bM1qcg6rW}#+lhQpCoyAfQC|EX!U_Y=*&{-CJ|U9_!+u3;
zuhSw>5e*cvPV$or@)~XKEFfM9ANIsb0sN!LoN9@Mk9e-E9lNP5aAV;Xd60Ztjsu0@
zgE6!J*)|ccxKHCq7gt2PLIykh;mFJ^0B9UZJ@_|t+<!);E%04Jzut`nI!T&;z5m~A
zXHXx(S#bMWIf@hQzX!OhfJV!sNPwodQ9BsO9z0k<_q&y5T0qN6{!sOQye$T74$!Z<
zzjc|nV-KsfraN40uKD-VfLa0VE^U1@JI}|?*uM_@ud>ayW;i$<9IU_VXGQ*xkAKWk
zl7`vgZ8v9$>e=AUf5xW&Iso87G#Hbc>c3Rsu{9U9fC)=7;>bh%+r#_2i9qvkiyXWw
z7Udc1)tg%>u-^&*Y^qj4<8+rzw4fJ%75wit<Z_S<N;yYr7l+y46F4AYOw+&V-@n16
zAQt1WPYGt*0VKnZsnb7(4`M9%)qwCTNX!@-D62hx_pa*?Q&{)wX;EY)e>HZKyj+0s
z%UIT+`1N=mSkbPuoK?GeCBAsQnyYlb{25@l^0z>HWzVEjHotE<2_D6hb{B|;-je3m
z1R&Cin>k?maSQ;dtSQr1zpWi0`zu5=*}08aHzDSatN3dG$mz{8ieCtph_N};GYC@o
z4a4wXYAtSB6qKkiD*U2Ve(H1h=E~RH7H9<}M-z^7NzZ0wy76FBj*UzcH8Bk0Xo^uz
zY_E$IXO3BiBOq47^Aenszw!LR6RdarRuN=9oE+*dW5G*h+zH@!`~!S$gE`cnaM~$3
zdav+q>t}{i+BV&@BFJ<LJxt%eFZ|?ke8P!~;bglmKEg+Q<RhT9?zp#9DgFm`k0=u$
z`{Jpi#ae_9(*<+bos7bYGWglAzqs`ud-e=ZQm@0(!bEO7YN|^q;<tOoDZn+vv*|$h
zX|k6ECjU|Bk44I>G@~xNr#V2zpS*%io*{}}BR@qaZQc}x-!gYcgyU$tGNu3V#kRow
z<P<1>hm0G^+(*FcjK>S_ZWa)8JO|2GkC6N7NEUuEW<N)u6ZDq`E&Zgv$EZtC%)%oV
zYR?Q2>6Gv{dYo_gH`@TZxsMeP8zw9O%hhK^Zd6l*-rCq8px%+PvO~+_uBX-NID3q?
z>LV@BM>JByMrjK=0;cE*ldXvXWYXkql2AT!Qq~oT+elZe|I(Z}U;wAe!=TD}u<F;w
zVCg{vpD>GhJZ7#LK89<l_q&Q3?NRK;dd#ZRuL~{0qD^_1DE|1NOX+Th5~-XcKpS!y
zolvq3Ixw>_7Z+=HnUv^aRz6r;P2zzVsX(vlaiX@pFxYAeiui^B!igcLAQv*Vdd5ca
zMOsCS2LF;7&SR*he97^9lFiltP(|V7ypJ_82p7DyM7@|sY25st1mNBM4{|`cOPH_y
zgAWE85+3<6^qXT`{FXumXvP4NNvbD;^xJ3}THTaZQW_&rrF*!6>gzA`$&_X#|AZ-N
zGk*Je_M@FK0R!_)-z(&tCeGE25VZ<(I8KeO1{9?!I6jepx^MX!x9=Q>yoj`Whj?v?
zoKr0~{58<4DV(sRP+0z9ZGJTEYFQH4m{alwXf~Ohb7Lpw;5|v@yql2zyEIHn-c8&L
z4@F#A!phTEXQ`ozy8z;nnNf!7S1is{owLEMUREi7AcEL^TwJ)j)`oiOL3`*8Tql<{
zv3lO?q*cTm!5I_2E5UlFTf&;I>7Ol#`7{bEH}brn3W6BCJe?{opyY8$%jEr7qYxMV
zsezQw(dr=5N1M&NXIIbsa~R?U4c^<K+~TTpMA>9vUbkoJAwCKXidBqhK-Xee{+~7O
z)}PK<ZB5hPoROI&-eJI0Dybg*lscwsq|k$MU|xwqfddBYb%!Hp!VMJB*nGnf*=G~k
zYyBPdBI8xlRb*leWq|>T9n_JG9tm(G;XUz@Eiw*;R!Plg)uc;g6kpRx{0MF*hD91V
z+4zLt$aTscEWMu@{ha^;I!nsmhTYGjh_$u6ckI?zs1jf2x&0x!>W=^NI8w1C&0GB?
zRZnMesu}kwx7RJdQ^GO%Z0?=%-ec9Pn284CoT`Mz$T#OAsGOHFl-c0}<e6Zw{*#s!
z+oj>rwcV}O+559G_;Q^HL|+>RKcMY8*X)uzl?^vq!w7b+Si@B$A|mvsoaHL$WZ;Kk
zDUcHn{#;qb7u<-HII}5S+OT@H;JO7bm-=Z?-8FIbE=RfLqF#02+WM%sv;JO~f6C?T
zu8;L;^{87%%BG*j-dffb7yb)`%rVY8D%^j5j`LV?{4EGR;V(IHKpbTKCRSxv*{6@S
zrTCb(ssYGh<jynnqlwH#tv9KvX3hJ4XFT$iM-Bx74!e{J<VU~Pr7-_XJzo_Qs0!Ox
z0h%?z&bc?$-{41P0>5u#O%$Q8A0=^vemI^fAWh9&nFfB9r)vC5S`T;`<ot@n_OYe`
zmkol&`7PD;2_Zt2c%C;zkPi`v;cF4Yd?z{6xRvf_y3qxXYAFlV4XE=R&Hbjs-l+uR
zSA8oF#M6ct1g`Qu%2|Gg6fZmB*5@I=U87P&*v_vN3W`OwR;I2>&xIZ=GP2+BEo49d
z!MO41p9**;<@8MRfvcNq+tvFU?+a%$*k_Z*>|*PuvC%GHvzAEeu^0k5P<w8<RDvHm
zhKg`tp5tT)o%>l2<Fl$#O%P7H)hbU(q^k)M6c2&~iv{v1J0?)tZyh97XJ8In<;ZVO
zPr|7ws#51Iv|0QQ-j*v%$oFU<NQ29UcoqM8MNwpS@9AxtzIe5}H?csbjIz{2?C<zY
zivl!(@|f#6Ash6VRL(Ve*OxWJF0ZTdzvpo3m^6A(B(IGN=sPo?%lHj`-T%~P9JmrN
zK7gq!ukTD7SUBdMj4+Ud61gNzX=-2`U6v%>lMgr>V0}R5k^kjHN`Eo<c3&YB*XUXa
zLYUm8U~Mlv!Z+W|@`tAV*Nu$Zoz3Yx6hu0x8WIc>Jt^+-z7mNc<{cZH`UhgZRyNN|
zAPUd7Dl7}HHdvpw!R9cDywC4EJn!yLN{?go_Vto7^=p@x!eze<4puA@ImdMizg958
zK_Gi()P(531*Z``SOh8>V5*V7YP0e<?S|CwK4AL?fQ&s)s#)M=>jW}0UtYrmcMyFV
zqAPejC%}#Sv4uGurbqhdj?V~M_$h67U$bIgU}syhd-^=8GAV@q^P_IOgoeM5c`;LC
zH7-WfYn0}FTiw0iS-p4lA-9p~r+)doeznD9)0{+)!+DzG>N*kKaUUXy`iBK^kFS)`
zCkeqRh`e(3{l@%UrM9kszdQ2YJ~d2j2sj+kG->}QT^W;PkbSWljJV*Gp9v1wP+qRg
z41Bn}en3Hk)M$c;*=VoSoq+J<wRJ$Q2q^by2{NhHD^n9~ue$~6!ZM7l)G5!hCr3t!
z##;3kLHX?t+p0c$3n{w3^3rx4!mT>lp{|hET6&%u)2Y|gM$p0zCXJl0t!rZ52mi)V
z*KcvbgE>bot+R5ImwuxdcKfAYHASRnx+`Ab9+=x&Y+0@gc8YTk3G<fHJT{cOE7Xm7
zM_!|imJ=_<7+q+XG*^Aj)tRbnz0%);TfyeWmFIhQwl#pSN(aQUbDrAYrvDwOvY+xx
z@yi{w`5xrUFF6{etw7O;tNj?slQ=oy=#me@d=C#`w8IF(PZk#;w~650C&p{1Zo2fl
zW0EwB!2#Kq4G)NTn-~m;Y7uzz1WOJL`y@|v_t}|s@h46Co+!6&jfBs&J{t(xk*{*l
z;7M^3ao3z)EzKa}mD1DkjR%+YkS=L|`RV>Q&X1)c`@ETWAO^<)gKVQLL30_XlM-+4
z-3`~uciJdH;Kv-wE=OZY>i!uLDd^E??vM<yzPITGK5Tw;5R<CYqpfO5NG&g~Ty8LZ
z3g5ZNscgU}{rKm}<ooX&2gpOd5x~z3@Wy(Or$%6lhj1?5XZIAVMR!utQ<c))QEiG5
z-M46psAE5WEDW)A4}T+ka_R|2i&AX0&q>_-FmLg2{s2Y-Y&r>N6CAj5dq#!)Vbvs8
z9&$6P(xiOjqyyETWFRytk>9B*!#rik%3qlXWvl~q6`%kf;lxY60}naIeiYyVpNGGd
z63F?A-r#~uZ$Z<pNgkqMKAlEKBL84><!YuBF^-BtcU1rR!?EO$0#sY^3!w6UvsdGT
z#>I#wpTFh&OQ?|(S;6C0XIG{Ofnz6!BDrD)a`b~8Q908(-9Z&pD6L<7c9LWLw~-9&
z@8#Et)XY$#AIrdkoj4GV=Z!v~VcPm;auy^9;*aG6GrW8R%x=dm?DI8X<BQ1$B0dPq
zn%7?Y$<BFBU+Fdb$gxQsn0-e%9xHioe4Cu;4478>yQ(r7z)(stxk-@zf+wK*MKahb
zjH#b?7zgfeE}3f?GjZPia^-95v;Mv6y)PT(66bem+71_~{YKC#hk<(Ssc`+UHIrN^
zub_&?H|1WP<u|N2sy)wuMWG=ZSh#(E&?JG#9oGZ0JV#d+*1J6UWfP2m1Y>yypn<1}
zKw3ZNgX!v9_Z$EExp|d^M8S+<8OC5ebyKai#=w}<7n_ZBu0>z3{fxIgnZXf=vL0`U
zER2uuCbVnxH!7!my@t2n_80}3wluu<4=Sk*BdC^%=-2ZI>W!WPXm8&yuG->S@YCEt
zEI@nmJHYIoAupscHhx|TEqKW^HzLS7n>QWzuvD?cdH-yuW90#AG>QXoxlfzh!A$wh
z#-I!4nJ)hVbw?{*#}jo-kZIG++%+PJ-Wn0dwAU;0i<^Opd3lxk>{ktyavu459wB=6
zu1Z%<J;xp2n<}S}Gx($PtCf#}!5!n05rBUl)dqRhZ?O!WJK9d+D%Qwa>TAD=RUOW1
zabL{G4j<0Ock*Dn?Tid;ST;~OHml$J-F>xlsUgn{k9Xg_WMOu88(?5+cnRdB0HaNI
zD@h@WB^{#V5cX~R+FU-~GciCj$+xk?5MRVD?&i0#A6o9YFuqfNe}AKmZ+bW%1K=WH
z;OZAW3w)acUN?9WW8Qod+zhao)IGSB!+SzAr8knXoFmmBIK#1TUS9W@&R9Q^q0)(C
z$t)Lgx-F1krq1*|*06r8kKSb}>#QR%t9g*FD!RW&9V7u~BXAZ8JgV>iW>_@g4BUzF
zoy8Z91!tkB2+Pp^Ct3KFCTh^ki(YhK=0aRs@IfXJzz_KY`i|c-!#&NQ7c}gRdYTMQ
zoW`y0Gi5HbGEjvAwHcT%i9ib2xC222C!qW~XkdJndx{FVQ0$m%Pr}V=c2uR*i$n>h
ztok(B5xZa|wI$YzC~X;!GO8;Xz4|M~ossr|(w0v_GUtd@>e4%$pYc8au7AQhFr%u}
zv=hY&{#_hQID4o^nqD`DII9K)2B);4N*jbrHum6KRb1po&tyzsNJr=ye9U8H(wW7&
zOBC>afD0Maz2MZD!&jjhF!Ix7eA~-L@B8N)roQvUd()0sM7KtZ{ZgZgolmzP!K%XO
z#E*LZBJN`=k}{(K>>SMk3(E=R%g^i_f5>P==fI*f`6gj}|5D?qA|9!P3?-3R0D+)M
zpe0b4Qbwr~SBPEDCn8&Z;oz$&agxn$dd<X3md1m7v=2H;9{4DX6mnWJSiq-l*l4)@
zRKju~;Xv?-x>4=87`>sK*MXCW$L^fVB*_n>CMkQ@G@u#Lf<)*3yFlLJmzW2)pqmqU
zh5i1qgjuB|ednDjRWkKtD7Si;D=^q{@&=bN{v(T2>=e-lUOV7Nu(3kK37Jiu{hfxp
z+tYpaBmH(hnXy7tKMi4SQ2hcA9iWq=*in2=h5bUc%_R%=+O~yrM82oaBp2TnP^=2m
zWPjXMDc|E$faPf1dI&O$8#2~{C<G6#*N!TG=5z@A?~ALm?p^yW;{v~c>;O2a=};(x
zRN44bxcO+;YFD~^my4aD2q${TQq;F+1PA*7{lcY|%n<QTt}(KGzWlQ>TOpBpqhg-j
z%4&MiW;*5!m*)QXc&+r8jS5)i-EU+A>Y&@p2BIbkA*cCx?+XBt)$dO^>@6{^rHPnN
zoPEvo!AzZWNl?s`JK2@tfNLSFymGq%nO5p9a<v3`dz*i(#&49H4`JXjP1X0f^l0jr
z6E)6eLQek+c9y*06Vp<_n4ipHSV#Q8m1!|B82G)+swFpoQI9iFjVjGiQpBs*-R<{p
zc_Z_|dH>9dZ5uJ09@9-4ac;NY{PYp#<fnD`;J5(mha}XHTCc-oq$w}x!x9f4es5`;
zLsVxFU8E(S<#o*Ab27s9a#;f`q68Wq<YgtZhbV{4dLREb4)~j(Da4*|Ryr)g7vz{?
z8rb@UhEUocCDWKX<Xt_S%xvru=H2fLje@DAY~rUFvb<Ic<VR(zH!9{X?$+N4ss}{@
z<&5m@;g2gxbJ;h<j&NFa>gDZ!wo(a}9Vm)E!B+=7u@geqlLce-g!jo<FsXk;rES&I
zJlk>UXt|M#ZR^v>4iW8CR4Ck#7REn6jMemjnAQ?3G%mFe4RrMlWnV~idk)_oP!K=>
z%qx5t{m#Z&Z}B<Ya5}gA8C;kpf&7C6Va6lQHEK9;o~nK0IB_~;bOQ6fEtq~*O4Wi3
zkJ$*S;dh$*&8E)=VE!o)R9j+*@$9#*zNGPtGo$43GT+#qiruUxVf<lUUJjdwZ*PGg
zJjrzzy_9Ux!*q4>-fX5G{i5RXB&(&K<KbPx2rEujrhe<isuew3lb_1=3A<Gf(8u`O
zDVZfyQgcAvx$ccBGAS9X(3rvt<Fnc5r1w9s<E^KJ_M3k^d0!-ivOIFhpDf93O)n_>
zJ`)d8aA0Xs8AP0#4NuZd_o@sMbk$MZS{Y(e*kHf^4#%>_G$eAL?JEv$17iujXpPmt
zatv5*4oGiWFCAltk5TB8KsHNThvw#nyS{%@5T!IYzX;nbQZtM>jM@#C>A@GQ^NJ-G
zU--rW{02g)1>JRzSFumyn>z^H=~>u5qNQ4cOgeM5KQCrbJVm*Le}8)wOCz)=CoJgp
zWH=>Tz(mU`YE5X7Q$d)OQ-IShuC?%bLt9>L8w^NaM0;aWP{Cipq9*syhGlI}>|&`6
z4Jn*y5PO1&n_8a}=l4@Mw>=9`KYZ;{NQ^z~itJD{#}qr*HuCm9kWjtaWd+~5y|6X!
zXxRUtw-7$@)>3}5p1KVUHEq^q9${%kf{BxctD;}Zf6qs$uzxwmeZ~gc34o0M3R?ks
zlOat1Whkrabzi5a0*Q-g#pV?ypVp{4MV{>!&yz&l7%~Qdv6u-<Hh&klvXVMB!MtD@
zsCmIzw)}obgmr>eA0!%Zro7dzFA(ZWe6hIcwQK8E{P3a_$-i8E<;R58eRh!rv+u>c
z#QErT7Jr6G6Cv$7XUnoSmwK~aK2^DyxknE6H>=I#2FwiB?a```0Ak!@hnLICf&<D9
zH%ix1kJDup5-_z*fPi{&usC>w)g?k({7jtD^83e{4TpWHu*eSI6BL<Q0+2ctpXSWj
z_P9fdh5$2XlZWb7SItIX;(O{K9^u%f;ZGTWR`X*XHe=5gmZ{%*)E8e8fN7Iu<-4li
z6YXC3jjMgPAt6{wbgCC};M7}S(Xn^BpLTb>pV@nxuUx`ai?>A7GE60|YZ_2^-T%=&
z`S=Uw<lt9(BdEY*xc=8A;VtbpIhZ?-m<--$FGpK4fcD3K5=)AU@9Y4zHJr9bRkMqC
zoh4INqNmDQ(0MG^m;?BKGu(4KeMp?&@+(gXU!U>mqaF66FA9pH6FXjIjz<Df%e48-
zhERoMNPpZNlt7(QjtA*5047kj*3s6>=eVqJwtD6V)2nW8)R>-j<%59uH}f1y_eV>}
zaR%M|T^blD1*6_4_RPb4C##8e)_BwimM}@Ua)f<fP={gx4VN(ZSAk6O3^P$NoBi2_
zgWM9$Bf5aM1WB^97%=yw6I`}npfl*bG*ZQg&h0J>aaAtz(@Uh5C<^dW0_k}LMf~av
z(J=YitmFG-rQX7w{p$9oPdGwO>q}kVjc-@Svo9Ad<uS}ToBT>!n_qOT{`?=>2UxXM
zf}074*Z6Rt?uL(@cAAVp-v39|TR=s*cJIS8BS;LPbcjKBcPb$bN;gQibhiS6gfvKr
zba!`mcXxL;d=Kb3=l%V^wOlOJdE&nB9oOF1-g_Fq4C{}Qev>DL2ZZnQB1Ufk9?S$E
zq0mnmC}FME?sM|rBNE2TE91#gun=~awon4XBH>rrJ}~Um3<T8{^62#%^BeM#swJn@
z$n9TiW2YSr=^BPIW`P`$Ahu!mod!I)lL^&wui32Sc3ZDn5>9O#BZre=**E(mcwt6{
z!pNIIV5$o+L1HszcyE;Z;@2T6!Vd`>Umqp^%Ay5ZNz8>N^mOlPu@}5fHEKp#Q0#n{
z^S$_p+Wf1J>vWL>+-l^Xna$zA8Wo1CK<JL{o6=4e9CCn4FoFaQ5`978B->r=)g#MW
z9SQ0txUd?n?e3}@@Q*3X+Q-(cjfhnwe&KMM5IR${WP9BorBM%^m6wUF8%+97XLDhd
z7{(9R!U~(oTGQ94r#_JHuWsXVi`aZDvq#8_e_EM88i(m$8MG`*)}AWirRr9D^#kWT
z`<(|+4M(M4ex;xM;oV>#xAi71`_`|)VeHS;0TO+oYd@t3?gIgHn-qVFXu-#nPNM22
zqh_$P@jl;JX^ndjFQCWZwm{VxoN(Nn02EOYk&-_>*YEAiB|y!Iqo-zZeltg4)vU)}
z<xR*-B0dPm1vuCl1_qWW>4^`gY*I>$CBH%LwFhuX6)Y^Mtfq6Y=@F6dju6BeNC{20
zPH_C5^EqCzh2jv+5QFcordJEZ=Bqqgg7V$~HLGd?V5t{zK}f;|5+V9pbylS^0pRxv
zaHy}s)+(wjj}?+3HRo^LgjNG1;VsmLa8h2xL>^n-ZB^Y(NMdTK9Tyw8=iFMxmO$BX
zL&E!M$00c`x4J0nKrEQO$IESVHPxlQo<cj&ZJ*H1r>N|B?ddW`6@ifYPh!YE2c*h%
z(ZKX3P!`)P5Rdz1b?C5h6f6M8wyIx2*Yak__-1<A%yvrjMDBN;M)iK+p)Hs{UHi}u
zU_voc+-E%6fP_BVcceNe3ySkcr%-WqRz~WLCQ54(!{d39kDU7?j>o<?w3iI1wP1FV
z2W%?tu;T0fNxl`o%AyhstqE!jMd~jj{WW&D#9!+CNs=*gm++wgRKQulB$*{wJGha*
z2JALUVN}|(jQjFe5&;v0g6K2lXtU%5>MHW@9EB<7L&ym9CAbL`a8)LJ^c!dK&ZFgf
z`jT<+2^_gQR+pda`9kzPd0op^#^>D<Ijt8DK2COk&8gRBRL+;}437aq+B(fOPyiqs
z>2_4Ufb!L9H&?qACpoNJr-XWe4rT4j&0&LMY-;?tP`~kYx;qRwR(TIFiu?5$!5IoZ
zgByS&DiGLz98F?YzwNHHN?x<s?7ihvkGSH4Ue7w_Na*buVgkV<Q1E5?g4>F1hn(9w
zX;3&B_qD2SkZb|gLs&b%IXC@cDvrZM9)C5zF%V&p0F3o=dL;a4ZV(xvz=>}Qn7Sa*
z2N-(apclR~UVw(Cw%USE9JYgMKWJBMPyU7uiRf^xdjJl$nJFn5zkKJ;ZE_0mE(&LL
zcrZ8yl`f@AK<l=@V{9y018b0*iTlji#^5qQAIr^Fu-LYFt(AhH78ilB<#RQT#|w+e
zGo`8)hY#WetHRH`t5Ik9dG;<8lgnh<O>vcCt!_%*0asg1<95(3_M=|9c1Rvk!-wJD
zMO|edG&$H|A6Uf#jpbJ%p)6dA98~fz9^3~|;vn-t3j=|V15I{SwcY2=BlUHKJxZ0z
zYQyCuXuEixrYx~x$So^ngSOm|OpQ5DYTYj{v74c*p^O%~Q9>T23SPd~lo40LD&;?`
zotFE`$~3`JE&dN<x^79V?e@HEg@MZC&(*SkuX^CP3)1!mqCU@XIb_{5WFC3_?qbqo
z%b&@}ths%gx^AtCa4?n_HI|)8d5Ao@qd?PyJkZ_Y^Hc<E-fC>l#r(i7C_n$hlEW0g
z1+oq1pTUtHhd_$vgXQ(R_>;NMNw-@SpmWx;RIrSPDlio3;Hx#uQDRt0Y;s<RfYP69
zA2?sIIlxy46swkgaE%>;y;{GzX3cIXPk7R=>H3;nALcZ;BpzfE%_;Rf-&R)um57S)
zKVp{#b0HGxe3e)UNFLWoO_ZvhQ<?K+RHSaGzQLM_OenpoQXd&{{&tn6lk@GrS{$}|
zs15$RRze^?Uge{FrwQa;I4tj+?kfG4Nyf$V=FqIW-?`E$&T^?c75~bR;W((f>I(dc
zxZ2=MOkU>%^|ORWX;}<q?IwuEeExeJC=oX@+h50}Z($?G%!em>NIX0)>w(~kqG@Q7
zbFcbPx~;Ss<TVuEE@qEKPEMZHKr6C;b-S*(M=R4)U6*Y*y7wCyjxLT}6PAsZUGa^~
zp4>|yruK89GgJ`#cBgH=jSF=A#d8axXiHG5<8u;oyLpK@{d&XmhbvAoL9noN?tMSq
zp;nqs2hdX3rr<iO<vCzK`orb-JL*fS3#j)m^kBX9-~|lJUsP6DombA(Xcz9-%`QzN
zBF`n{(`&50DHVPL_<~4zB7s6<HlT2)`Zg<@nvg)9h?zatGb!)|*ZM+1#UW791{lXb
zrBbj|<DW-i!EFyz7&eAhYTDQfZd*)NDq@8Ux~2lnZ+SoFMxFg(P0lFw9HbAsW`(AM
zH24{l8u=5RzgN)yXbw>M=L!9kX7vXeqE0}E-=}<5*QDEKVU8-HA}I483c3OdUECMt
zGfW%o0%HciX9a<2Yu)Un<F62}<?A95_9HY%QaWs}#Zr=q9p5W-6qL4s+y`Rnfe<8t
z-Lb2uOWDm47^NcAx(*cmT)!i`ce`A*1V+P9dG$6=&D{^1_oI)TI6#IB`&v4hNUS~t
zc_!t;6TQN3_W-!JkT0YFNw#OQqqU8Jffj}t!rn+_82wHY|1p;*A+nAQw9Wu~K*Q~t
zB;drmJW`@L!~%QK73jRmX0igI=Ellb4c6%DrOGlnrTO@-WqprgE<tk|K8LcQt8X-3
z)T4F&3R!g}s@!0{5w+^}90(#zxD>}=V?BW~0-$V~;n#S}P$^I&y@lYhCczEyskkN+
zXAH=BT?MpQ2GXbj41V)+aV^AGd$^^GhFw1{R+{jyNQlD&$;&6zZ#A>)+)s8&<6#;7
zXsD+hHkv5CS0hDu5>1}Gy5^5s*`t_pxmbFsOhnK4PT{EX7gr4EzQU3Uw&FYJ8t69!
z=vuEQM6ci2I={y;VqO`@PE?nZ2?}X_TM0U6D9YdEUBLO;o8X#jVr~5$DL^6}Q0K>T
z3xqdj?9dX!^jalL;jJEOIlJb@<Lq#n29xv1j%iOJB|*Z*Gy&|C_d1r;MWIEz5|Ept
z)$XQcKII9da7_(&;eMbkT%+DCH}=f=Ttjm0f+7c=wHj85`2Z0v@``_&15UizgQXmV
zdJq8Q9BB4Y0-IAKb;X@EO~ssd;e5PX0v?Euf8Jyof~1^Vak?;)ivRn$!+7Bk&$ERm
z>(&v!tF^~DDuKY`n;?+3PnZI-R_rfgUQ;o^GLtnD0&`K=iJjsM_amg?b~o_epfxD6
z1c2K-pZlTb?A!wP{-Xl?-%upINIJKYWLHb6@F}X_uCHOz%~&kOp0;C~vcKttAg6T9
za0_7@8ug|C)X!?=M-RWdehAMepwih8CQ|wv<}-$;hZEVKuneogNdSdfeaielFJCnT
ztFoDW9ue38sPf!Qk|_*Um{#tD?cQ~6`q+Mbf$nx@#BTxz>CUWKA(<6_b%XNt@w9eN
zgD!K0kv!1Npc_Slp!;*=dTnz`Ot`TElmf_;Vu0yK$qS)m;s<!zKgsN`KY}o{NLaKv
zH;S^HwF$Flz4ZV#rl*%mrCNIM7&jkCDMfq-jlbWc>FlMNvpYdU`(8J!_lnFtFJ!&n
zAAV3%s}g9;ZCWl)YCIwdVV<O0DXS0GK24U6VtF9V{~iPZT|+66XT<P30P2>WuS5XR
zDG(-<($w3m?h#II%uA<vXjE>`>@{`ssps%(zwmlud4Z{?aI~h0NWTf=nv}bH+nOcf
zAfzPFZ=jyNcC<_ckavIT24N@UTqSp=NJ7kK>s^*LCQqy7?O!FZyAwdDZ4`N-CDC_?
zp4L&>`SXt7S`^JkGN@ez|6KTJsYxHohQyaBMX8xD1V#1c4vXZgzgunZDE^2|FPI0g
z%H^f@=x7zGrXvavz5LJ7OO=DVVJ}Q4dy@^igX62q&RbSXZISC8ypi&!6|D|N<aa2k
zvnteVrFpX7Q*c|qv2RAfheI9v2tUXI-ZL;xq<1)p?#T>GbD!OML^}sx9+vb_u`(0_
zq25uH_#|%wM4OvOUe@DoRTj4@r?*4~R4q;Q&$L<x=9i;FkgD@$GK_p~#V{h|hddDm
zDZoBI^`(A}Vr@~urT_X<s07?_(*dl&dQX}5g;&$9`s7O8RHOd**RKq#);{as&v8gy
zaw^b563cM9x%kIBu7ylQJen0h&vY6izNsQ=K=>kDUV4jYLFi`p;CLT4j8n#An_20Q
zlC%`<!M>@a#-TW^?){eZrPVOfnxR7z7s~-mHHl|Q_CXJ<f-F1$*UWv_G&AX#`MCZO
z2F^i9&JHwJ33Jn-^EA+xc4e&eHg8r@M#c^QrSobVk0aEgH5cw%rJSQ8yEV{lyl@og
z+>vs0_M`<q<UOS2bzw@2gC2|bv)SibwzBc;W_1pjA`Ex~N6-G}HS1t;)IL^h^Hgk~
zc@2?F_vOr}ml)d*0*)9u{`Gb&qbJ&SYbdamjCP-vdOBV084hq<*M|+>fGghNb-Q%A
zG;7hqMthBm)*bx#C=9L2x-2HqZ4t+ZV&uP4%}LfU^s}MeKYyRcadl(Tzc?y8)kp0z
zK=~VoeWjD|U8;I}*Fw3&tlP=Z7EddcU3_;h)l==W9D>VK83-|NdXFSCQSnc}j35>e
zXA=S=`nF%JW{VBy5!MAc*>$3P?2Lp+oInL+$<W0WYaSuuLwUtl2sMQ{ut5>_7;-ar
zDf2}z+^qMet$kiYHOu~3S_O8RqUIWd>Dy1SbEg$U(`UZxiUbIJ6$dUI1Uf^FiV67i
zG*r%V29=o(e?~AV#_03**fot@;-aqyyyS!GO8orN@(sgRcdaJ^rE!sRw-ZC_w<gj-
zK%i6t;ai}@<e@SFaDS#?1<P4!1KYa^F*S=kZQ(|eXqpMT6B%=jLtw4iU515Lp;`b>
zB=V(&9T4nqLFFK*tYjj+v(i;blF{%1C$(hb#vxN7bcoAvCA?xJt^x!0Fq1<xIW0x6
z-v__hSx9X2t?utR=+8ugL1>Q|4^RR3txU6qFaW357wFtIADtg3)BURF{whM<HGp8|
zv5A}e3D8^cD5o}Z9;>o!*+`gm0PT5GI{n-EIAK{&6-BdWR<_1&-ci)`IS_!BzpRY5
zuPMW3MyX8Wj?)2ls28C1vv9-KkR)R{xm~9Y3WqUY|Hykb)u@xk?+OIgWC0f<HH4(X
zIQd6Ef`#9NS%$4;u+#H#{l;dmdVk@QCKj6j7GPn6Ors(}rK3Tuz^-W<o%@0Ce{ui?
zR40fpj7>N7fq@HuRoxAu=5krZTKfw>LU%Q%?}4P8QvOi2-m*#~Oq<t5rBbweBDOl9
z+1e#q-3Jh1h#`Q|O(pN#2ee??G8t{^K!ILKyRyE<j3to?b{Ly|vqodWO&bWedrJjw
zGa%@hf54cU>+0J8-+&l@-BP?9ZkSKH-az-D;5@97Ua<z4wfGFELeHaZ06*8M`Qqa`
z`9=NL<0ek2djQ5@(h7_f*Z`m!+WCrdVUDK`&TgAUy9SZwT*!h@ddM>^!98+v`7$)k
zx*Tpn=6fJWDQ(URO%o)MjP%j!^b<>Xp}wE@6y;q?C>8;&xWfG+rNJfhdRlzp>V9Eh
zU&gMpX_vCn=vXF0!=&tb>PY72+*?Xbd>Ku@mXI*t?j1##ADE1$xeN`tM~3BMMguAB
zHFE-9I&Cp3mEH3MGo7Pk42+iA+uUDhT(+tYijA~4fe{(%`^fLO&x|=|8YF}~kR{`v
z=@>3$gbsBy!5*?cR50lf!ATwgt^VT^jbjw##H3V&mR^bj^k3>&|Iuz$mEKaz1H;<)
zTCHjWWPO_Rd2vvcpVwlnXcZ2-b!e$CHTfBh?hMQ#--S||A<K8;rQrG+T3(RZ_KwwN
zu{s44xV5Fld9!8<K)B8B$RN}ZopjW}i5t~vY^N4op?0G|c%VfjcLXxC6>Mkna_B_%
zYrFJCii;iMNK$$olrJ_Y?>TTBudB9RzjTfz1|n0>XDZH71q~f1fDZ@S^??FIF$mJ&
zuECnA=^`3V1WNT8;tPLCV8}#@&9Uf1VbFt@n;A0Bvsf6#w|~j!Tqw_s6IZLIZg;yk
z7pB-UB%FOdVtn8qzmAevr=Vbqjj%Foh;Sm|5e9T4Q#7a>ARUme+9<ptVRcnG+MqZL
zECsa(ci?h68T;2jZKjxYNBwnx&tWW_?cY$t9ReAb6yX4ag=at=UfS48dR6;-T~Uu~
zoXPLHWkK&Ic9hxpCkAQInjVUpfP{~uGisEgoa=|XHy*ulMw+sb51#M0HDrc=g&+y&
z7xbS-1>75lf{ob&e6+(xxb6kuht<lGU#M8hN0i&zbgN&iqiRCcCPU#)PFECFm#&nl
zM`=@6oY#KQQx|EkUdHF_KxnqTaMbS?i;72z#hY<euX)NQaZ6o-B{`vH3gctomwbA2
z?R`CB5t4W;LM0%wvFXc7b5?4Hq7g&tpa?7h;|S$n_>LPt5BX-6;3TWtYZ3&!ez#@W
zd)gg~B1uONQ1)v<6P*wX9%i9j`=l(DPC|B8urTprM|&G2OjXX#-+ArT(tHJ-?~T{9
z&dn*hHUB}V!;)aB{y4k*wMO5kcR)o^hQx#G-!z3#e+K*9CUCp++|QIQWsh<pb}cki
zIts<2YI56Ga^9O>_G4$uVaW`=2hbbAC?rQ|-2Q4@hpZ3K&*t#iXiP{B#%x8n6DR+7
z5n>NeIxs?3A;<Ttgq7~36&m$#d!S;ZMy_sB4y=H*9oQSr3Qz!)cy56NCvqNargNuB
zi}gP_8RiO%$a4K2lG^b=kc{F|xMZh1IvdLpd?cl&9HCeO6bv;R<f#KF;^b;p{GQKw
zpWu~H>HYov<@JP+H)yk#EVh?)($s0c_I!>ig)P+7iND=ycYOQS>2yj+s6eYRucH(q
zBL|bB^h~I#{=7%jr*n_=>yNL`G_D<Z&n(w^Vwl!@OzqZVhV5=M%mKIq(%&Uk^2(vr
zvwnAMq5dnono%q&HL7H=dcw`S<Hk4-T0(C-HWcY*Y5q*hf(5Z)gv5h&(zqcET`R`q
zgF>OqGj(r88wJa#h*|kb2zTA>OTIg}RL6zI`wt%03uKxe>|l6$kX9Z-!LLTH`uol8
zS~ynMf@MuQGuMMl=>(_S@A<-O)l-*W*50%@v_Z7&>^%22)O+zfV>u(E#!>0ER29a<
z6jOWhHpo?`B=`Bb=tc9%i)2NlJ=6MD#XkDT4#DDiWSb+=KaW?#jZ$dtHDAU089s}H
zrAizCuJZ?G7^d30T+`$lKlgzv?l`>WuRmO?-ntwpj8aL7PVu5L5k{we|Iu+dB)L9C
zH&VJ&v=*|onbNH|Fa9a<SIZYZf;NyTuz+U^F(%-(_VbrBWjgbG<L*}zRMQ%c?$_ha
zDBq@i2O&reql69I*%LMcyFA$wf(jAHwWe4bO{vY@1erN*Ek59NMSDweFxyE{-S93p
zsk;VA->Y+!9yhR5r+J#at<p^@VnJXF4|g7MZ2=KWISDysf0vXc3*tc|L))#fM2*wz
z6I1Sk3xI)8n4TaZW#m0aL_An*7A70C;89>$lKtLt5Bp7=*2SoKJLzMLENz21FGD|&
zWK)^~$pQu9AaFt@mX<kd&OVA;oyq;UGwRNiy$JK<Xk#I1NE;Its94scRlrU)oGR<*
zRTkbg-jr|Gmh*9&1_DLCnDS%;Npgz~Ji$aJ>lHQxDGyOZj0n9;M>cyj$>E)He%oiC
z?wDi8oU-{tZ^yXzT4+GGOI@O8nj#pjm5RJU_Pde?7zPIfe{k~K68BSDbxwKlz(n@k
z7S%ytd*U)K)MIiA!fh;?VwXqZpf}#|^GffF4g$UEo6JgUN5y+Q0P;pE!On1j@;Je6
z!20lZ?bpkl+wAo@EzlqmX-@Y7!688j+>Tq#!F=K(G+1_}c1X7u%Z;+>Quq7E`TNcX
z426#RtMcwer^oeooR`B%MB96g(L$sK;W9scUpg-Nx?a2A-?Fz7r$y9Uo?X|!x?c|F
zySupvGc%fuzz`*+$iuGO2KxEt8e^?~MQ>H1Ag1dnez+JNpTAs4&b3(xA>xx=!$1k{
z)JRjiTfX}uch_HkLCTb`(jlf(+XA6RLCvYS-kG!}!IYe~-{G{~!kGQ_`{@0f?1hdK
zWPCQ+SwC!znHBsvn99eKs$;)*T5=3L<8t#gz$8cKP6N@Kz$!gcEPNUUQe-__Q>2o|
zg6Yd&o6C;9!khN}N~&pz0;qAG9eA!Y|C}lTX8X5qxI$^csVCW+hW^}nhou%xs<9cx
z`I+P1Gj(9<=Mjp;uZx<cD(m$=*MmicBWamNpo)Pcn#_pCtnR)sy);n$oaf?R1mdf3
zC-7`xx&2<r{=6AE*EPk3@BU_ctiSG;t~|?bN~vxH@ej{Mqm;Cg?>9dnFWoG|sC?ea
zxy*%LN%?D5uHB`apxJ`cUa;1mYUr4}!VGv3eREU2e{Or0BXgEF=e|IOSnSf4HO>y{
zNn1_>;j*j>T<z}Ri&t~sF5B&2n$HKrsZ7CDUyt7%ZGX=HJO}w_e-hlD<KcUfp%6&L
zEHJ=&D9=Htu@=_)R#|dyZF8T<2fBJEPrE^*>}ZVE>_$tGOU?}qk7~(nX?S2$OM__Z
zDsn+RQednU#SN(Ipa7&vrd?VTpgO8wb%?-r43H<-gaqNKIiiYVg+)u}W$Y*mEtb!@
zC9Vw2+E<V<h4JVo#A-NiFG%|;qqIQj%zuY_fzFX<JC|;~!bAkW5Drc1>ua#=k|fFR
zLwG8+1BPK$fIg+0!(UBYKX;whDv?X5c+x}7>}>K=dcRHVSZ=Y@fuiJ?3r|w^N@C(Z
zzF)jcs?I>nR9<aT?n~s8KJ}XC_W*l<q&qzCPg{=nU2ZN@v*-x;;hNmQ(YFxlqIr3m
zu2mMA+tS=8$h%)KG>17~_dt4)Z_Rd+bxXu`eAoSkhdAKjo@zxx57?JINAaEMC>tm_
zxUX-hF!)N2Ud7$DuKpNj=)g>Lxe}T>1+-%c)2H>zXZOp~^7KS!W%jR_p@LBe7G^q8
z7IKDiq<TlYdA0SoXV;1D3BPJn(zYPnmD&<&9`!fIzCVukoL_M`pT&tSJH9s`Wk1E!
z^zg3h<?t5gc$H_GcCZ~=zB6}R`$JyM>dmgP@wV@LUkQNSr@6YGsB;rq=rzXq@~+E7
zy%k`p=6Kxz@-Pwen08huwaZm%L*3im(o~;jCC6H*DtqVuVpf}a5587xhR!Jt#>U~D
z5zQVosJIMTvf!Y@QE>50jQj5OC$xoII5$el&lumNDYU5&ve#=4N6QVz0a9h}s+|b0
z_ZXPjxg|`Jf(1-k^Lv%KKR&;cWAuSEEkcgk2<Vs~Qw*TM&|*b$$Z=8+1r=jvmARdH
zJ1Ou_vq!%HhFO(cTcVbSRH!O(EkmI_t~v2$#4r2y7Jbs}0Bvm8!CrWdtgwsG8!5Q7
zQ?8;cGtG2Yp?RuK8K&cBKU#XS&<CM6A!|gV8_FK^OxH!rv9;%OIop|RD)PAr<pi@*
zjW#Bt@Ez@^Gyh!oLwDz?cMH3C=GF5-$Rp;k=v^g0oKfK8##e%Z<?}`14<gTb=jwE#
z#1v#psnKB^ezUV*tBTGX$iwDQ<dB%7NVz?{l>7*Un%v~Js4;YE?<S;dzA05bSDmUw
zz+3rkCtRd0sx+KrY?qrk9*w!;y?2i?WObw2(f}Oo4e2pe&{Lm3gpFpwlh(#fsafLW
zv@ohY;!j`QkXZcjxojV8DS{^(=Gf)_i?k?(_s3EU_#g>v48>;)YkE&gVxkoY``$fU
zNJJrUT*^F+l0{<33APk4nO}uJP&)nj6*PYuEPQu!ET|+A=@i(|gHTZH%wCt?zyj}j
z^ac=v>{Qqbud%ay+Wh_Ayp5i01;7SU%%pX?Q4CBp<~~)M98m40116O)pJ0vJV2|4X
zRx*T17HRi4On3m=_u$reSS>8Xf`YvLEn8H0hW6n5q`d~f%6~D92`#Mr*4}9mr~GT)
z>H2owov+S#_g2^Z<Zj)sJ~}zHFCG{wTQ8k2-Jh9bvc+q4g5Ah%{oNRt&VSrj{c4n%
zyi<km!eSd+(+sF|8R83lE7KLU7ZH4O-3d6KL5(8qvUB%DcS#{ay;D@l7&V3#2RPC=
z4(qkkUeyedFsy~bEfxeY3cNUv#lb*AEg!WkEnT+xo6&Uf=V&qD`uLCFw4DPU*t~Ze
zVW{AzAT?V^kL36atJ3I*;xOmHOr=W>Y?z^<qbn*d-6c(J)c9$^+R}}&c_T5aL-fie
zzt`2vNc?WFJ(kBLQ01OXcbQutNMkgrgwg|9X1))iYe=}Wyua&b5)QhN*b{CV8?Lt-
zfz({1Ca@oluWPy#@9p`vt|=>x9ZcTW5vG%v%$`h5Key!Af=Glbmhauz^=Hbam+w!M
zrqo%F@9lrhOfVWxY8K9rG3}i1#1u&7Vp}Z(j4CNjgU+Z4;Hd@M)`v1PMci*~kBZGS
zu_9UDngfUX)&mTHD+ZQmTYdcu<{QLVz>Z;_)<(EM=|5JKd`HH?%Ej+Fjn{Xkz$Hl&
z0E|M96_|8_vtgw?du)zRO4#rW?ddQC1oi<vfu{#hhJ}0?D7$|>XYM}6w5+Di7k#0P
z*R3jtw(u4)oJrJtC%NUpS0aM3UPRM4rR=EpjtzR>LLM)Dz^Q$R1zp_zl*b(9cDY)!
zvDtXe;wH{VQ8t*gyI9$DW-`Q;mU_z;bcUZuX#&6xHkE!G+S~TT#APt=(3uy&S#64#
z9v}f=QHn|)s+@3SL(r?=p*>ZiY}EK!8SA7Kl&jbhU3nYN^6@2NF+?G1t>^A(En<U<
z6~zxL!(zTjMb0nIOqg`4FF`nkeWvw*Js&jpbpznMqUai$_iMAKoD~a|e|2v=TT^mb
zQ*y$SHekF4r-|f2nfahLT<#q(QSZ8FH`mDb`Y8ACP=ZObQ>auY<f#$A4`bLLsx`d{
z=podzu}Up%A$Y|H0t5?!^!Ni*p#nQG*lLf6?>Xt;Xi94s_{3w9SSj2iH1h@fJMhcy
zk971Q%we3w?3AegzYC)|EZ!NJxr+D88Ch7bADtyc$V<BN-y0-hpA1EUr-Tq%wz>g-
z^#UzEIQW&v10n@Z?BU^Rtq_-(3_55}q*#^-K6&0ImI8lQ{vKs6zWIfGkQARKc+H6p
z+uk7ansVGTW`Br#Xq2N`&>Gut(bdZr$=;K8=bKbkf#pF%J1QVck9+@c`#f8)f-+_1
zr%5fd?YG~p935ThIOspBOb^dg)|8dj7rKh*y-D>0b{AMZ=mDJqzXewo3wgAn%#79k
zt~Jm*U-;S8##^L0c3GM2ep-|e(OspOHBI;Dv(L1mzK-0q>A5!PJ4mREH>ilKa!ez^
z2ktAoMU~bP@}%cz8*LNUQRM8-Iz`R1_|_w;&p@WDBDvVFCFot<L?z!T)4*;Jrmu!u
z^^?11TYrz562Z7o_XOVjbptl0mSz6h*_^!i&ueI;&8h;0__os&i|9YkUVu8l37+Ow
zOt*b<7zJAu-$k5PTz@U>4ewc+TBAi&%L1{Lo(q%de)Oo3;wZ2~amO4={Vv&8T4Y@-
z2h_^+q#1;J3^>d;;K&$Ojr{Xa^v~eE9o5mPQo?!_<&u)>s>=FWg9x!#MkRmF36it+
z87<E{k~!Ke)Q`m;sVyCaj{ogYY>cL(BV^~jqXx~q3IFi<$s2eJQyD1-)1L>yK3i9I
zH+g?FT-+GE#>Jm+y1w3mCTZu5r3I`LQ2zF`x>7P;Zzc_ca*u>0uH{hc?x?Z?^%Ge<
zyqF%CilQ<as(LYwg0fs^A%~uV%1O?Obu60A1$PB#_x4W8OT_*kz~bqRW2<v^)RNH{
zDN<{b4L&;77P<Ep?M2{Lu5M)+QCTMERQOR{kFQ|SrAlInUIGP_<K<^|sCl^=MiCv{
zt-=v<tdR;VMfCCUx^r~wK}~Lrg>rORQUa=U-pXD*HU2|cq>Z)|2Ksk$eK$jRoUKD`
zQkH9S+eIY3u&FHSPfRi=<V^NG46U4}QbO6;9cA$pG@WCxyM5)#Ttvms7dScdtL>u)
zdge-Uf@ujNBD;TJYca?j9+C9^v-fy|6#)emwu**31nE#4S8-GT%m7;dx`CEMXjBOE
z6yuwJcTSf2+7ecW54d~9Eya#ekuS~5m1<9_momf|CS5NoR4H^o#^sYTfoO8J@Q)du
zjJ#B?>H>ddDrId`tGv?MSPQJ8x~(d^t~k>lx}g;1(L-DMU5&G3J<VisYT?R+=nHFS
zV9u^?x}s9+Z(@YJl;qqYreVmxko_dmUOC8^ccmCys_P#0nR_B+USgyj1MXv&hw2Ic
zQoP!&JWO=JPg>|GCslo@v7|KW+?|?ehR7tWJm4z45dy`MI*w9la?UGqzi>tP!%X*5
zg=171Sj78-WVu&g;6!@NV?OF(PKejgRH2GT`{qFoM9+&0`bRI>4&}wypTUZJ5yhq`
z$Z>|{(6tamGfMj9#S$onRaU0>1IhVH=tFdk;?hd%l1`Y_ma4N{)m!Kf<WLSM&2P7N
zg-f-4=HQf&yo5$C^dX9lh8Pf3vLakS&un^wb_Q|CRzH|HawSHh+gtzBZ&Oig^TVM-
zSayoq54T+fcAr1x(50d-PB;6tlz9ClO|1e!ZBr1>4vO7{+Vls|{pdxayGVhtj%53K
zvsA?wZfg(b!~<l~GT5r9Lv+xR)J%asqx?tKD;)zw7l|3^hSbMQqKIjDS%OdUOR7Xa
zygS6vs!O+|-kyk4{~*ej-F3$@`(?YsxgBlcSAiho=+@QQML2inR9xq~#TgAtiSq@O
z`UQ5<hL^mH*d^92&9I2w+ehNYO1`@uKO7L5X}1H#>js)640MY)gFsBj05q}8rKpwG
zD$%+|HgnyAP_Ha+V!t~aJM%Az`#3}!0M^&VmK$ZIIQ$L)KLvD>ZtKC<oYL?_Wz_*u
zKm0Z9qm6VJ*}=2ytZX{Ld0x1=Dz2Jk9EHHi772<{u>7Jj*-weP4+L_i9NeUVC~xEy
zHV^Ti;YlOX1Z^%3O9*;U;AYYxq+4m_M(~VdSLLO~!pMufE!BFGm=^#ti1Keg&w{5{
z=Q*8QSlGf`s88Rs1-_cc?EZS_^9oV>!4dS{X1lD|p#RQQNb?%?MGs8|4vWux<L#!w
z7%(luDn~#n?qWMc_?2P|9S>8w?tI;?`!b6VT_AR4`sdaBdV<)?rWagi*9%soB%rh!
zdV{{W*`qx;tMdkvcMtI6LDOVO8!%aNk<DsJBARD?^sM+o7t8Win|20(R0IcE<+g=@
ziSZmPSYwO~ON(mm359CXq--i#aadELO-SI#YSmk3-@&x7?0Z3&Xht$e4Vn3mN(y8F
zZ2HMRVLPc8s^6#UVrgy+QGe_S013CGl^^l+_`+6{ymv*T27zC0pSG=)w_etld>W><
z%mrX5Z9-R``XpaSa+b+^$uql^jsAi$3U@y`D-pq^2w?mwAHtFi_F7?kqSvFtcsR6o
z9$`%W9b><jn1s-!P(oIxL}uEs7pfxnx_+|SCl(w`FuQ#lEZC$m+91y}efD+CE7qi{
zyre2dy91|kvj|a6xK`$BiZr#_9%ofyeyI8Bp_HIUjJynElKkW-Qw5;>41SY<9vxCR
zV%Qxc>dh87`|J_xq)Qg9#yr=;cSFlbIpIfixD>V;{_zbcD<$q5CBmsEf3{Gl5j*c<
zK#On?I)w#)U{l|Med!OiP}3em!dT;z=0*lYPA&Ee5vXFSQX3+{Dqgmh1OH6h>U)&`
zxHyiu$Lh;Q7RjzW&r*5YUE(<4d~(nk$7w1*pUQ;fbgA85oO+Jg9mo<+b5>-BH!5sN
z9d>z^rhKau5;qm>eyuL&(P@;4v?Q8Nk!Gp<Dz;oXTHw2h3vJF4UU`IoZWf?s`foiZ
zQ#4HvQ@W<gLc87rZTfN)E+=mqw(^G!`dq4PW8EzR*xg^<cLej^ot$hAD~=hT?cMU$
zXNalMb7i(O_2==q-2@k+T<%U33g6$tTz{`PIFD8=bMBuzUhi*KNnc4lBt%8Z<*?Z}
z=)qnCzWszsaX$A5j&aqS!|`ZkdcP+90I5xf_74tW-<qnlNQqzK?FT^uL<>M5haOna
zLM#|ao~bo!tgT|dm>#SiVxxch>h%M5T42Bid3=5fh_7|zw}}&AmndRdFHZh~84$>Y
z3G^?%`|q=Wv>fU@1vNZ8bRG%#8-SXgfDWR+19t+|;R5FC5t#kG;NN@vd%?r)0i6N8
zv<8DN^dDXvcoo3x{ddE^xc=Xle*orx02UC;?Zr0E4U$!-#D-`Lyo^`dT-cF5d|7wM
z&n>XDf{mrx(i9^U@28Bs$6H8^PF7w}QSvjuD`;c}>wZAujdj0AOUh1LKvUnv37$du
z2Q1MTT`UR;w#7p~#*(N@L}3y=7E*oIjPQY8uBWdam+{|=MFHOev^Z%M49}Jr-4ehV
zswB<@3p9VvEBPBJO;U8I%UY?BOZ0O;KTK6_RS!CPiw_rk(iF6jBIbXBEJaj#iXgU#
zF-7NT1s_Opa_~J^D(|;LrZ@;)%Re0_5VAv#svXpe1|a|c)(Y&uL@EgCL~$OFA}Jj8
zmb9S^<>gY#N}i~4vsv*Nn!VTp?vITXtoL9tA^7j8@ZE&*X>YCUWaYFuzL%7Qgem&A
zV-`y=B65l(V9pJ0L0(|Q#QsoD1hU&WAy2?hAMF+h#JvUq9rV(-LUtDM4fN7q&mym0
zlTEWb(1XjOE<bR8GTP=OYzQnd(%Iib4;Mp-o8`~l!OV2bMZmSS>W7D_a&$*pEu2j7
zePn+=Nk>4X#B3swmh&E3z|E51%SX*b&&|bBjtN0}glpix0{Ka$4TO&Cz1yP#3^?~~
z!GN!g67~U8b$WVB5H59-lhWh|3W@2~h5M8qGI|kN8|A+SmY%SAxeNZJtPQraL|y0P
z>wco=uZ1{33WM{n1VTX#Y|V0r1@4AE63+>3&&rEr3mixrtolX#$)bOSR+FwX52t;$
zz%$6Yu~CMMq2(z@Ge=uh8$#(}Yo3HMedlx)7=i(#e5aA>HCvsIn<amSrwa4`ZWN7<
z2W;D`C)6*8w>J}?MJW*3xCKe&1&FH~HwJ@)B&hLu#}pDmhw<8=xrVO`xfzmalMCVz
z3L@f7oId%ASu+a(`M8HOE_iyEK$Q<D`Tkrn8!dyl8W&ytfpob!m-E@q{P@9ki(maq
z#}i8@jAxoL33U<mcXp<nR((AbljWc9M;^Yb@Jl5u=2GzlX9eGF&lT|H9a87sKZCXc
zG)t9_qPcEfD9^;p&!iUpMj(2K-<D|yfkEMw6K{4rOMelOGe#wtw6<E<K~sf4AsZxW
z_32>i+c5S5<8ps6<PFKiGjOEGoUUUOl-ME%QuJUXT#$Xh8O@gCo~!MkmI?J&5}y&i
z9Ter!k&PP2^HVg4Ybxjp?P2eF(w;rlVugSG#G-OEt_gLQxGVGU*rF7kzIAv#@{?Zv
zGik3?{2rFGDK00jt}o=zo@-K`2N2_u`XT#w730LfauRdS&$7{SX7Y1GOMdu;5q?#F
zhNi`qsDxN?-CE3QV8@QB<&dydK%GQ9c4qFd1M?`u)?1~(OhwCGjj4jo&ovi{wvxpb
z%KU_A=@bS_9fOJK$v5@)ZZkt?O|tscMea{&M^5Ao;<9>K0mnJ$E<tMf4gRo!kB}vQ
z*UBpP!zbGMpw?kGzoFyl)~Hsd*M~)jOob4bV@j(ed}EhRl66*3bdsQp0H3Ugo)+5#
zLzeV?0cXF{Dis)|0J)d!##n~V<stV36&*Z;OT#9NP_B)tkVC}V44zx`up&GPUf$ZV
zNgjz*Tu0sFXaoy68SgGQzo0;|oDaCE5*=z^4ki#DHD!Io<oqRk!P<D}RHPA_mSvyy
zTMvUYPQV{p9Q%2K`q99o_%UFxRMilKd(c>F-uEmE^8trEZiwR11OD0Ns*@Dydp_RR
z&Ucg?%*W$;byAvBS5Lrowo#v0P^S1Tzo%i~r+_btv~b^~qh9s-4v+iY4Ti#}{ki?)
z?^!Jdg<($I$2(U*0zY~W%0e)TTW?$}=22M})jEsEd1%GMdU+Rz$7!aqkwxkDYW>-J
zmByll4mGH1#9YcJVv#KZO|t0YXz#%v(@KZfe7ZT=%<={jUB+_z5CSaOXpI5h!=?<i
z)Ivo18McZ7BF@Yv{SzE1u1rN!V_W@?>#1@E0ZmBz@}#<BfT*-(PAS=2Hzl@pXRn33
z8IpaJ3QPp1;Qhf~7YtAS$CW)eB*4tHvONL3O9Sxp|JXUu|KpxO{{`=V{oUWZ!hinm
z|G6Fp=fRi(|M))+47kaEe&UZuTy94KOzRThd;fUYe_o3O0ys_M0d#oKg3Lp>4*0&u
z2>0K^13kJr;C7Gq1T4khkNlhT0OaGZ3w_=2;3EIM{GUevYkoxBf1KvSi?KcV<5k8}
zK=(Yh`2cfcc0C{E<~g`@Q+w0IH(Ry4Gg<83A2B|d%*R$rE>Ei?J>RA2&c*7C=(yH1
zNwe?v+8z}HoAD1gmUW2y&uqD1sluJ7Cn~!it#ne!OLDJCb+QTAiIyV*PLO*R&o077
z58FPo-2mHK*yvm0#GB=~kdU9#TZ{PlGFJN@D<wC2VRRCQIIzo|)H3hM6jcDr;<}ca
zP?#xh7?l?0Z#||48a0+$c(&M(lJiuUgZKWQr5!{((>im~Ii6m+(F7EKpW~cx^!xw?
za|;J8gq^GVa$;H9Z@)DpnNPZ1*=~1^idVe4=)Ow<J-Bk1xFIabVG6aAQeleI0kJib
z{Zd__51q@|LN4J##k)O9g1lT5Lkr?dtk1I0jQYoOd4Mz-z;nR&2tQj;KDz2hm+tof
z?ax_z!z!izbm;L0Ntc6s1=ssuf~5dV{f}fS3VKK<avX1tncX!qEZw-?5b<4I3=gME
z_v2pAx-V#ntCn}^y}(hi-WXV%l<feFc-?KEGh+Y3N3k%)_eD-X%Ob^%aKjnFJSp+|
zw|;H1Q-`(5Qy>FvnVRL-KC`(Ep{dC}Jz8~sZo;k`AXS6TrQ5?4^doL~XEA*Wc8ZLg
zgr!_>C$74k4#~Z$u=*{wogkU~1iM4PU5|5Xnt}nAZII<)RU4g$7z>%zx7YUwF{eRC
zuU#(wf{;H#e%Si}>;Bn=hXm7u{OLaZD})aU^gkl{uXO&|gNOgMK!#epRoePaSO5M4
z=qJoyBlRf6TIPrr`WmM}pU(@FuPENe(v$p~*n1FbYoHDNYV3yB3Cul}BGQ5OZ+Z@R
ziU$W_L(cTE60}UZhU*0Xb6vG_|2bty_BhYmm|p@ckLvOdFs^8VQ16{_kC}MQCIR5`
zALV-ZjD994+ur%*HcQCf0I=RiDEe0?i{(7->srQFp%#X6Yu)&4uYed3;8M&S_m=@`
z5{s{3X%EQLvz46f-tNI6?o8dPe^M3zRx>_b&ttnaa?ZE&c^3!m2q{QnzQB@+gX6I2
zd#uZsFfE(EBK&994CFjSHARJ6XB_+aV8LgIA{Tqtu5c(Xw>C5;hj=TFr+Mmcu2dZ)
zSkble@=yC_ch#xFYqQT^U2H~ax^Z0$FS6M4P7LuL47N{8CGw&Jq$35-zXT|`@7`T$
zcr!qpHEcW_1#l=25BC7|XMlojU!yOqX7BUZ@2Oe6rx1UI5puVlNOpHTzYYrylIqZ@
zR^jq7v|jyrJ*ltjLTg4VoA=A&en353)L4OIT8P&5?#6Mg?ZN0g?BnCPA0Qzd+&$sL
zj9~MBU~0TT^`~do0BMc(>S$|wf9J+7_;rH@_>h{nJ|&2C)57wjV(zNT1wdy2d~JdZ
zBk(PsMvAhkd?_gZ=ccB(Pj2e_>*tR4gqLcA`7WCPnt+tNAsiF-kx^^B^4a@3@=zx7
zAg_<oSO)`6xR?WIt!Y)>o1<)krP}=3!@eK{VA?Zy?r5$Zc%|Pk+Wg6kZ*2eXS$qfO
z*Bv(kse(3A%mVehBnp6eO?N;#5QMqNbLTz+wx>zE=&O3tV1eczQF(MHuN#U*JzT$p
zo!vTk<Qk0(3|)_obGhB_Mmu0_06Ahk+l7TB9%px@G&K!{*`pTO?M`0-LZ;Ub&u%Cs
zY;a#r-LyT~=$E7si!d1-E)R7xF_3=KAIDL>I*Yop=efkMzZSkTUG9D*<+L-g|D}6;
zsUPdlDHedx0ZJvm?ym2Z`;BN#?P~Ma5p7^JBmyFREXGep4j{ICs9BgSql1d$|08($
z_5JZ&>x%@GY8gMiwM;7awZC*1a}fxBaqIY03NQADU%lF+oN#+TDhePpfGcu29CuG}
za9V?9r)7Y;SN_@Rzn&0?9~VpS8yX|a%p**I+01JLNzKLSKggsLT(0BKF%lYq6|6_>
z&J~{njOnn=P_uAQo|-G$ohhJ;k9U9T0sN)~<T4)3h2-N={_lA{#D|ZX393MZotT-L
zY?*o2KVX$qws>Jsi8oMvmF;n*fltjkFvh|_U&c@z3gl(}^_OYt9-^+NfjQXJBe4P-
z*83_|P^>MK`hFhT5tEcU=(>|@>DMd7Z_D{kC8rX-IdOm_KZ@T23o}g8pj+?sUg2b=
zR%!g}T)s@kLCy`-HXs_CW{8!QzU)oMuCi88<5uct-BOD}aK7}FlTRek;h1$%-PL<F
zk3GiX`Bs<aOwYl%s#YJ;vb8ZOVB;Pi04&(U=(!dVlk-*68@Rd@x(xC5_wz0KD$<Qv
zzf26@88d5&`wBJ<^+jYS=gwHsGFri@+n)4f)P1*=Fbr$$U%XP8s=|xq>KPv*3Fsv*
z;Xva%-=qGc;(utL1&UjJ`f|ImF(wk*5tfn^dji*E$8x%w&B$r<ibJfnQ=Mj#3Zo14
z7t+4{)#~4iek0-Ta0N=eiOzce-YzieeO!{*iUlST^(H5^Qih44v4Q!rw*IQ1EpbMX
zLJewh@1)N~kQy`CIX&yJ)Ov7~tzO5otSpa0yfcfss+%9>rdp*e@~4zBLvI92ad?bM
zS6e;7P9ioo3T|e8NX*w#5Pl5T0O@zdd#zx#ugbQ`@}CR61JzjCri505fUW=c_`nH2
zKR+d6x^Ar^l^_*W{#@fYcgi;7GK<Wn-d-<z@w9L+ONk-1@~&+=uio#2wDq!N`4&zz
zld^h_L0ax-b3^_7T!S<d!#9yig<VA_D}~|uIq!{<VxrJcKclcwqpoM_Xf;;7#gCpq
zH2!2n#l{+Cysa8$qa4H@;ZZRvXDAi-)l(wt{?a0rh9WMr1Ho5MUbm*Cdq7UxbnWdY
zbnDE@(&2C0Rq!+oUgR<jBVB%3rlzFwAH@_j#Z?uAX$zkxrgsT_sHf(yIdIFoH-2vJ
z>*t*upBz=&Gd;rJMVZY&B0tt4r>##yBti2+*|igg4!$6!Wya~k9W1Au^(_SVypNX1
zK8bomDLo`o9y?GT|BkL<!`PpdCEUFTbA3Ig_{TTQcveZ8R2QV{ozBU4A?RON3`knT
z2(%!mE~YGjf~nK7+(g}dxtDF;>YC<wZJu!-#VP&ZR0rVznQh+Ym^-)is+>-V+dT<o
z9^T~`IXUd3Pmf#t%oi2kyGi$bYf(p*HY}8?r&vye^{YEk*oxNp=_5@(Uw4cJWT#uJ
z(w>sCZlUy~GnbcGi&A8K?<Hp|45uAoKvVHh<|-b5n0}%%F#A&FQ^tE20@yFk%BxNM
z>F+$gJKYU}{9^C-so#zXva)bYSIV(0u}JgV8JO*_E#Ynv#EGP{V&krTyXEZSY1WbH
zenP|)YGtxioFzz8Yo+dLjizO$F8jtnDm^#urNhP`V1RgZxRQ?PTUDp2kT^ct0Busg
zns-z7?%pxXP#d<Lkw!Aky&(wbNmXN%^?jag^UH*PpNN*Nv+HO-E+`F~C29;cas*XB
zqI8noA){ozC`);gihuctFx1~mr|38<T*|!B=6R2!5HqX27DNI(r91v^@%hdw{@x}!
zkX>8c*byN6&DgzChbAno0L@}i6o&5cy>@8`p%fXwy@Zhw$om=OqF0IfW$++vWTGjg
z0Hah$I&V+TjnT2bL5#B454Jkm3cFk|Q<j~hAd@7sF1fHWKCtC`emK$pXttI=tiz)A
zlXo7<$8;RIbs^q)Nw~FiYB~LQo}-ub+n?j|QziSipOPw+$+YH{(`fBBXp7bXS}!6T
z*hBo}oX34%cHi-7>!mlTaC-QU8Gn3-m<rl47RxjEJabi5rQzj;C6o1yN|AOY0ipuG
zUVbwo#Y7-I$jJF&X=#}t?zOr6OOghc?4L=Q#IzJ9=L!43WTpN7GS`<lXz6BJ1XwW`
zQPB}U;_zQ2yk+P^boWOH7E^F|`f*~KkADP*D-aNd-4_@UxKSTJj?u5YN?2QbWkS34
zj7o&DGOXBH<h`ZrTR|uOv(Suip!X#kkv{WhP*Px#^S3SMqmj(7;V)cuxR|Kc_v$b^
zjV=#GC+FOryLo<uZ5@3+n29V&5ZD_pL$+U#p=+R+<)ABPs`9B5Ezv_{zQGVRk>2SX
z8enG$g@+HqygHP+Dxz2J%`^;_phOJp?#<sTDzcWx)*2HLe-&}jLuqx_6N(jM@_P2U
zf+kRg)^aLI07$Ogd7e_;kyKV%kSB{D&nPVg%XkPc@!j)H<yOp5WZX#-o9fN?!|G?q
z0f;E#zf3#hGJ}Lj#5cM=v>IW%vLcFSWscdrrZ^dz!s-g-6$!f#`F53BO-!60D6aIz
zHi<iv6Xh((Q#A8ju+4_6y3P4&MLb?~;rRAT<i*o))k(*{xag7mPE+#eB!mI$?^dM*
zabBght+Ad+ee(Zk1lIpFH0x+j&0HG3ffG$T##DD1Ih|L%n1(M%5yL?@v{+J>^68g_
zk+g$0c+yC_5A6xM>L>04@1z=^lzdi=cfcqmAt75=+u3uUmQ@SaBzaD8eAO_VYA0`4
z!4wYXuPgHQXLH8^@jc&1`Q<%wS639jpHlDF-Y4pQfkU|y+$ZSrbc6<IqcdK^DN<EG
zjj}z#jH21aSDPK1o1SEO%UWS|I_r9yP0T2rM7GQPPR95XRlcdZ<e94UX<#QQ+#2W8
z<2158&Tbg?@**Z`UOvuJW_Hf+j>%OZpe9Ep#pE(y_!Xc1-iy(4W20e0bt-?kGo)N4
z+o&Svf|@K(o5IgpwvKx02ImU^V^Fl3GsAe)mV~)2LS(Wvji(wRFCL2@8{zsS+ZaD`
zl&!3s>e?)I?}o)Pp+$zr3r>cex40<B($R6)KP3*2GTL9pisDiiL0LT1+C*Ua=(nuc
zrbg^R?JpK+L3~Y4QJ$@`w173-?1!pKs4evoB9-hAl(Fc$^R=Q(ZIx4Gx&7JbNGVIH
zU8((<tnF5Yh9rTV3~JRT3_*hGhj;e%*#;RkS#_zov3V0m5%w&{o6Uq_CxN>(!dDn-
zPRIFjgwVX)d91_=O47Xf@%o;Qp0P#>Vp>Z*hj2z_ZDp~mCx@aYm@kb63!iW}-j^0w
zKGuK!#Yz&%ASRPhm7LF?b`KVsgKfy2+l;|=dsq1T14FE(p@!SBI6qbJqm`5=y3AwP
z5;+Pc!b(qj%~H%iX0}pX+6J3n)Kuj0aWiPD_Di^aqnnPiZ`Yn5NLi}l-Cy{+rDrmE
zp?iv@<t;5JCx)O$D+>ejK5ZLU+1MPs1{<xmu_*kK%W?^Z<0Zl;`~CqlXaJ#(jA+<z
z?P23BRdK2<JXKC~87p*ID^bs<Psiot*!+>K@%Ga~Vp_=9DUvHVxOwNvh&!q169SJg
z`?^(7B&kyn6Eh}Gj!v4|a)u%cD!8efTb0y*#TeI}U8%13C#GM84sPO2O^MEm!b1JC
zuYAXViNO@v8C0~{6uB8R)XJgpnsWm)G4Yy_@rrYN6;)+!%AYnvvwrFWMOQ5~UR@(S
z{6pO+s~$bAQPd|^cx^FH))nl2wE2>)U{h~?>^G}`mc$csrhd(e)11YO`uOG?k&Qsu
z1DJ?dhe@R{8xxn1pZl5M*^B9k-zgW7dORs7%9W{r;%AJNo|++aP6D<;GFObzUDXd?
zNJcEnXmlv8&T~|^L!)jHR!H8ApqBXFn`AVc@ip;SgP^u0?s8%v%?{?vP2Kvmn+i=P
zs+im_p9M>X=n97T3K+SwhS`339URdhA!S-yAb$CiMS4WY64uaz!15WZZ33|88+?t)
zi!LgB;LBf?R|ue3B*dhs$hjB$VbZlXM?O&+ZkL(qiR$*_d_`7Ay9DZ3#`uQY_y8^l
z+8!~D2?Q%#yidbsJDoX|6Y8c!7thRV%;3oTdYM>Bk#o{Zu;NB?`s5Ta5pC;*lLd0G
z_e(>`8U15Bf+`pqrgVbAWs7ONLo6jm=DSXNmr>j`0-Em2xlK#P{%>{*%M_mxS0M(!
z20E(o;n-B+?59%fg$)vM3p6d6@{|1HbHDgXJSUD*oPnL{ks%Fn<f4GoenAKR#LajK
z4HIP}7EnY@P?7K?j+7^xyym2hUll;<newd+DP*Lpg2<4)%A(FLjWqxY;(J?ZeuQ?a
zxrk5zWd<+eYK*X3xjJg%R@}B^Wu$-CtrXrZ8d=6fq?Eq<s7yo<%VOhcX9u-BghvkO
z`Qhv{$>D_1ln;DoR+J_TN0z&VgckXDQoJN3sXesB{v@R~$VwC6&&xb}WYU*XL_Y1N
zn{rF6%OtSp#RP1jwMBYupFhYs6K+&xX~T%@^arQ&uy0E*mF|#^2b~0en`GDOTYVF=
z^~T&2liv4&R1S+#Lur{2;jERS^*-sX55(+a#PjfjdlW+51980-8D9lJE(I}j9Cegh
zd0w6;hlQ&vk(qxIOu*FC)wH?hYYAK$^Z$>lcZ{yHjk-p6Y&TY8+fI`PjT_sx&9<>^
zr%7Ymwrw@Got(SR`=0ZS@BGQg$R7EzFRW{=x#pY;%+#_)eKLXQZM@7R+&RJpk$nuD
z!THxd3`Ba|g4CWbLVaYj4lT_SZtYTzo}%_$FO6S$U`f1w^>8HjBzxkY$_^vzZF5%x
z6%w<3xmf{_x|oB;rsizyy~=!Gta~{}bxfN5EXOw)`hq;7{t}&>Czf8hmFI;7Di!U;
zDb+T9bfFt&u66d(LIo=$Ckc23Pb?;K3`SV1m-dY2?q3kiN5$iW5#t2zKj){w$2N-7
zoWB6|OTw6S0XZ$WwJn3$m9rm`47s!4vWzJ`T}!Pqjr&Ow+>LcDtyBH}LDW9eVjx0K
zg@4t^C*q5-IGv3)^EG!nT7C^ivrfxdsZyEBNRycV0eSx+xrGw`5({9exF`5nSi@f%
zUHbwuGjxy;W!0CarutSF<*Rl+1fLQbqqCniyLYmNd7-g(D<SCRWPTgg3P-mZRt>oL
zGt^-nF-*-EfYXQc{i*k^*g)|&FQ;@sVAg_BKb7lQ(rkFXf<#k&OAXZwIcBwu{kzle
zIIra&`0*K5=7}LolE>_c3qt1qz-3D&9Z3}p=YcF;T;}Nd3&`|Q<m+dL%9^W7n_cOb
zQ&aFs5%++KiKu%(-@SVSPT!FxR3#a<!I+^78mJ)2W|1eqiR0Nxlta+l9%Yu^nVf(o
zi8Wx<&HJ*9{;%|)11hEbS3$X%>-rs+j$1D?s~Pq}dvisHK~uJqj=-vlrt15o#Ctz!
zdz+6&K}-blCsvZWyK&Q?e$PTkC@c$nhw-19Ed%?=oXA9~_qGe@4?J)xkyWwohj{86
z)xzoQDaTg57dzli$S2z+9&zUr2U`B)WyZ=ru7vv=Z~xa*R1b2x5p!s1($78rc-y>-
zSha244W)X2nUQ8PGclPpwYR4Z3{6YZB#A64!tPgKl^QdYk{Y4j-wr0mGK6J3NHriq
z!JeAcEa1|UUL2a6h`V^BJ14NRIFVA12y52FJ<2>8aSK?`C^ND)q~WM`W^S<Gf^b4A
z!PeuDfWTM<TrU;RZKG}#v;LZ7tUmw}l>dRk{-xBH2|jG*SESVntM;)C(;vV(xh$?r
z8k_9Jj36T;SIg$r)n)M5+t_4E6(lF4thT+~L%FTHpj3|Yh~SO5nr@ZqH%SgkhSR)>
z2t?}SG}E}28)GRg$<MEtM7WP{0|0HieRXbD?(eMJz={AU;uN$9chf`XUX|HtuGyJ6
zs1?J%idyE!a%H(cSz3huL(zae1T8M$Y(eopi!UU(R{Rb7SF(*aI=%wkD!ZjisjtR}
ztK`?$2sA<8H<$WIecm7};$7i}4^hK%djoM0Is$Dd^>2ulThi3IXIxS$IV`abV_nQM
z&IsD!uy}rWYY)ip=Q-3D#6E?o^ePF4)|sQzuZyjS_tqMhj#mk^N3dwF`r{ATjBZdl
zG*OE0OR_PmWkZH{Vza)xG86ApdSJc3b+3b;AT<6gr{`#MbNAinc^?PGgZ+O<nrpMD
z^kUyy_sl|~u|I}>RvW*Z+ePz%F3G?mlLD&#L;!x8y0@qi+rco|a8jjuKaGQKE-IVT
zxCxn|sCb>^>SYuZuQj3m!m-uv78*|0*>*P2D8$24GPmSuTZw^d#6f8si837{r(6@^
zTl3^U9*!70rP=6S&MwB*i`c$%IrN;trJ0%QnbzDfWxC<0bxu<S%c}fM2Ft94qG4iN
zg`jH9E=9vpwB56CTx%08XI(tXHBjSH0L6#7fqj%lKgX&0$Ed7+Nx|%PWKtyMR$XE<
z1L20v*NXn$9{l}Nue1Puid8WjbM9qW9L<lTs38F|0&Q@hF}{}-`^n<qaQ82kRO=zc
z)+yHh4iU*i&Z9Y1BeRv4+eT#Oc%?7Q|2CNZ1Mu{KG0}>Arf4!6b}dg0f#J>{cT5#%
zO?fqGVv1u*@<RF30T#*X=`^XRq7h_vmZV%1oRVP4f#FEMu=D{sfFcuiv^~6}amPI?
zv6F7%H>Ed`nV+Oi!;uhVj>>S8g*qK1N5Byx@`dY;_0X=dZwOzNX0a8l)(sdY^1U)v
zI<*Mps=#sUbie5O<hIEj=oTTb08c@Nk>%Kr$I#Ww(B<9u7lBTM#pqKhJrocefDG|b
zhx1t1v)f3bKzTQB{8mnFX<}G<pQx|$tc-RHK0CxeMEPP1@*_l<&P%P~z4nn_*<Xxz
zfK$<p7FsJ@ngZ-+)bE59Pt%n)I478Eot%DfYg4i0o_;FsNL$=?7;$4SC~{9|@+at`
z8Kk^bG=fC=3q~R|TfsHLTrJTD7C_fFF`Zui#4lTZ`yY}9{P?dJGED`gOG`qfg5uvM
zT4hg?v@YypTXj&^wN&r}^h{fid0_rkz_6yBpP1ZSie#}SHT{FVGBkM{GUXUdM3VJ$
zx1+`%$Zl2J2}q2660sRM34mE6`(Nnz0`sLoPy`uond>6541~)bK0F#DaImBBu#>9Y
zLiFLTPmsT-`>!q|scNr@6Y0YZ*V>GReBXLmzZLlWQ1baX+YTN_Epsn@FBYuS#l-%z
z<5eU5Mh2FdDalk-k&KOxj?YX<8iumB7e_1JlGh6|cwn#PNsM8Rb7q>07)$dz+r?|(
zvny-mD}|1=p-pw{HBuE8Wzx*rNYqk9*vvp~%ej|ITF4P<&BEA>Dv+OF{`zs45O+9d
z$eTR1nkqlWppJ=^-TFMeShBL9zQm0%`V~QT*4Z`g;76J**QR7DDNxhrk0+}F%8q6L
zrr8zYq;o<_q7ebUF@X;F*^{3ucXQwjVR8$kBH|*L?y=ZEu1O%_-WSy}DEC`G<Nsj)
z{{W}13{3q6s5Ho}!t?_M^*^O{#<@oNo}+C~+p*K+b(Pj@b)MtAN={ZahJ0QUCTf$j
z@<O%SiIEWlg$t|L^pv8u=GGfk21drp^c1Zw8{UeWT6S8(2CVY<p?t-Kk$tjKnxqd!
zP5>T5U#6qYFJeQ$|7jx@kRaU3Ejg|SQB`*T05Q#UeD3;WWJu!TiV`kedUY#L?&jiv
z!d0)Ylau*4F@{cb$2iq{mB%<GBE_iR=Ms~&!uK2_wan{|Om?@kDNt<rR}<hBpi}AL
z!^qo89^V4}0w|pVvxU`0eomJ1+9Dwq3af5IvIc(EqC!to*C?Vu>DKgTV*0Y9P$`;*
z*cLVzEJ*dqDO%q8U$30MbD{{A*ghvk;muPmclFFk?PH|XsV~mW$T2$Ht6G2+-Y%dw
zK9<pbT+Zbj%1C>8I7?lT5*k5FqpXn<Vl=xwLQMKT4oQD_ozB}y9m5RAAbkyzX=u}r
z4X`t3<!Na3bJp0sKE38tjRT&J)=Ql!lh-X>+>`JLvc93m)-85|eYe!f(CL2~-T#5K
z0ilF6))u~9R*{*x@5^id%5z~sJ=X^N<Ra5$s#*4G)0IkIeK{L7`P#_97prPP56ABg
z&8U8Z;5Mwf@=PC3nkxwPNc-y@mkS;UL-OZSGp;w0_XyGsH<8!yQuYtgzumH9$S=0O
zq8qt&;?#WIj4|$<`gD;4d6Dx~s~Dzuzu+a`5_M~vacV6`+e<=kBescXI$!IRk_&FZ
zp1+nR);7}cYh&T>$nQo7mm-81fo5Gm1O)gX&IjucrU#gldd8B5JZr$TAF=Jrz8|la
zChFc<62dZ$wn)u?nv8A?1(Yhgnli#nSjF_e+hp%aUhE+-bOm9F@83Ji%hD4P0(F4H
z@UMO$-GXBBfmDj|f+-e@-_sVqx8a`1yYil@%j)YQ+kWg2>wZ|snGA*n>sFj}BpV`%
zo9+B1N{G?PR9!-iSKY@?vbNnVFw(D(fSLl{@Eypdp)uW*<@C3314Zs}Ibf-^Tfwbu
zF3_@@95n{t_vqfCjlL{WaT+}JRa$<nt10#vBxr?ICM&@P@((~*YmIPeW8B#Sy&qJ#
z@VC0|n`UXg)zZpBwZp7cI%oR;E)$gQ9yoA)`XE!l#~DU#JMN;M5L^zdj$(*5z3CQT
zM`iol6q2>MK9kCB<BM(3J%oKGE|gW&L%=s<rCzzcjHdV`_+2;P3O-xX%B%4kSCXYQ
z7}huh{cMx>wAj3JMmq-6L4hSZD<6y2R`BXyGA7C{u<q|Ha2CrR6efurz5!_A?tGZH
zi3D*Q0LUC<>iV}@xBIF$-$}xBa%O>xt2QZ-tCC)QB~xXkr%#2xE8IoaILtq4KAOT*
ztq7Y7O3VzdNMA^o_j#YZ)MI|+*H}qYL|9u1GC*p9V1hEAT^HI9I1nTqw<U7_Q}IHq
z8IIHs7$AXPZ{)3PT=u=z4CMNU+(L!lHWU2GAY<sdwTK;oAOxaQ#@la3CnTUtwD<?a
z*YdTY?u?<-y_YKo5k+8k3tK_=`;)2D31hL-(j(2;?|1UBJr%pB$K<i<aAA&;;#H~o
zd|rTv_3uic>vJNoGqq<tFwU@$hyEVd+8@t$YfY*y7PGY655p|Y_I=i<xVZ_6loxm#
z8%ZpsD@{^J`D16Emr%CKw)o+(@e1q*we{|nEz?ayQq%HqTluNB#q2=$PZyVl8Z|&k
zr@7Lsd3}Nd)RQx!osoS$GqY$G)?lX1)5RQy!(3?c$IfYL$%JOIi{W8)1CaX!jzsST
z`DbcI*yc7q;ZQ3B#ytowGWCHZ9r;D73wsBHEzE;8=I^xE1^_Tn|25ah+~DA^iN0Ye
zYdagl5^u{%^;6wf!h+z*o^e<k8i#v_J7lLTM29Oxj(SI+5rj&aX?nwhuf@&X43(-b
zb(YzFMj+61jT4;)8Sb3?bww)gGs(fCVoMcb+ybebKgGm5e71VC+NbSfLV-b`En^=E
zZ*O#S|5(7`zLxsA_~;=XEGj$bm6=tXCz(lP;7wWLf4YZP8aaXAsvy;GD!J)pZ2G}P
zQp(>(3r7_<>5k#X8v8VnDknxhMU972l+9UM(zL#QtCB<u)W{isk{nT8oDv`O?;93J
z?8ix$E;0cpk9|NMJ?@)eoylFaD6nGm3khrwY|eyg<SBtl$$nP9p`Us^ZsjcNR}s_Z
zC_^u6;6-cfhz)4&h^@aLLjQW48lp<2I2!NKl(kH%vn$p@32E0^LL_IVQD!9qwXnct
zq-1kcTK?-RryLbt>K9EHTyn3}%2Ktua0y5ffPG1<5$IOelkNp14!z*Vu&vtd1FK$8
z0DZ@v0p4EbRo~*N)P13uyd=4e7;l+(VdJqt1vqZwPvHtmjV`WIg1}8@=7UOc!Nfwi
zq#$wCPt;*+K(1n5XV)O@L}sSyO5$`>LXZGd0N20E>&MqQB1cvV8GnFtMC!OOtP2KA
zj|D&>HPj`R_M*#>D~4bnaQfn31h%Wnsk*|$Pzh-jV?)78ht)Z=-w!e0(s4Ap?7jQw
ziwa&0nO0*Vrb0eOK>_JBzK<;{t(C728D`LdE|G1JipHW_-JYfPt+~uPW@vR)5HoSr
zb_+Y(TogLsy&-2|o$tU=I328B(g5Onq5-lR%y0fj*Z_HLZG%UW7RA9H&JdXf%V?VK
zL3<QAw`wROcor5nEE>JceITn1=x%C<gRiZ%jE=JrPVy!%VDnZPemj!@go6|9S(A7#
zB9jy1`oKBSZ-8SCjSp@9S>KM&b2;9)!D8VKv+)@1x7KK1oyEN|v*0q2L#qy4prw{;
zhAv+6E>+ixXYmGrM=nIf^S(R18TuwfOhtX!yS?el<Ivz`pBdG`L19E`VYqE>eynd?
z_#+`3)^m;#zIMPSvG3C)?p;Vce(DN7&T6C#uYf56vyz+CJ~fKtO{j}2!VR31!&OLK
zwFB$zu$J<Bkb!+<wHX#}W%2Kb8<t7Q{Vs2<7Hzdj>y9MGc}=a&uUeDt)mbdqI7rL8
z6mOt$DMsf2-75P85QcFlNi43c%^TG3JCk{a3f+vpmY0F1r#^+QZi=O4fu3oOuZ6G_
z8EZZKZ#&dkhSZVyR@4+RBQ&zyPi$}MUe8Wm6ulCGim!<O1Y`bI%KpifkN7CO$zkp6
zIjs*kj7O(sH2)42f|ft_Nm`Ydk8R7|J@B$~S$KOxVA0QE4X&};y${WNnMF?A4ACkc
z0@~$qjbt5AOS-vc=J6@2RX4$+T7ob4<??PFSJP3E7k;&SwK{g*bv~2bdY(b&b1YR@
zSfs9wcQ^OZm$yg{*Sp&gL>swvYLpLz8~wXy*alQCfO@%_{d7G(+RX*UxWdZ%Jf)`2
zZmU}&bNy9zz(s$7Dr077XwZ9yU@u_px+hm-fpa3Lqrav2gE_>S>zaYJ-Z584Fo33D
zP%#;_-vz|>m6aCLhB#q-BCX&YgGc6moHQwCq~)f~Qk)X-_LIZ(P%ZyqWq``;TH~K4
zzPBqc_%YO({kl_n7GOa0DPB)8Iqo~96T;|7<vp^Dq$ERB#Asy1=r<WU#&XMhly4*k
z6GP=v6V#(a#RUn1UqYwhJa_^*=IaUJip6kwRGgK)rM?TB!}C;4@!|ak5rBKoHxd8G
z!t)1}{%sHrPj63cx+>KA==^B)h0jGia7vvdS4PvZ1-E1nSO71xGL{B!dwUUO>Uf*S
zNN*5mdyfy+ef%p_>3u(TvfA;qZN7Qk>WpMlc82-4%Tv5zRBfZ#XK(^=dpI7g>>%lQ
zygsSy*m&;_&K_C^SF3y*ygyrG413)Puk3s`mH6VIVl7e_6SrY;!L{nff3p_8fF4*~
z+|JK!aXFg(Kp-%)Fkfk8%s25%tA~HS0a<tA+yMF2SRWvC(P?2Tg*N&s7rA!VQdV5;
zCn?f-aV=b1n-t;Tnx4vld#|2pnqr+l1x{jq>P*qQ75Q@I360IT13po4MTv#(WQAQj
z%!KV6$YMk`Y@;19Mgb5g!nFL44(6vh3aZN9oA2<wpcm?07#|S6H8|W>s?T7hYp29%
zY%K7w*Ij1;8t&BQc^^@?^@pvGQkzqFM0tF5-v`#cYs}IMLQNNWw~sWH6QZVr4vFN-
zj>cNEyRi9(JLHXJzNYhSzqiK1YUyJ<Qs<100jQ=@yK#U=*08%O;CI6WKUG-c#$gQi
zk3OQ-2wI%;DY=vk{!c#Z1RNF8CJ1bN`}H8~V_mnm$Pc%5BqeYYF<iw7HY6H>O`#+V
zeJ>~r8$-+YbK>Z>c9%sXV56oGh(Da(sG{2*hlAWYpWmlgOg>hi!pGGi=-c^P9^Ku8
zTf73BX891@1F89c(l?pVh`X}1iP`{GR~hT=Onp^uW`Ui7<>A%EeFEeLZ&^BaZw{R8
zFN_ePRtD~ukG=lO83t>021%?=bY=)vsm<j*YvQ&Bdqd<g*@q`RRb~}X>XX**;F$p1
zp%+Fo6w{4clvAi-0Bxd{NbO#b^>Af=NrYE#4oY*I(B$Bg!s6T;Kq_kiJT6{@Ci$-~
zs5U(hAOL;BT3*`yc_KyPIK$abB!>2{1{x5!*T*goYK%ICm!ZWLhn6QeB^4(*2_F6R
z1+K<z(kFcBtItO<r?0=qN1xRynuW+3r3zvDar9gK0WR9JR|Ga7hgYBk@>MvnhWKYp
ztjbO)8;xTEIf^3MKYfb}cHy!(Y2UzH<0Og-H>reaj!NLuV`tks&LK}$7dn`z>yZD4
z!NVV@lY?!6e}t#W>U=xCzh2=o%h33bmk=L>TqHwXntDdSw<e^jwJCE5E(=~}XPh3R
zTIKaIUFrJK^t7A#;p=hIdm`kq*KQ}c`rg|?HmJJ(78Bp2w~g83Jl!WU0R0xWHE>%~
zT%h85#ZWzwkKuGAOCRI~kfo*Bk{cMCFW~S!a#925Ui0GhEtW<rz4|I4_z4v7dH7io
z>Y^H=jt+;rl+_Tkwj5<?gSFX%rAIzy99Zj}3wYBsr6f#0xv{Xu({Fu@cSA1C(<vU~
z#ii=4^Ho(;*Eg2B-Nm&;-B(}&q2;y~A1(b1u#?6~IzA;j$BvUR_~9B$6hH0>MeYvO
z*ZMMmPSjETX%{~M=#-_i+{!6L$m^4yIbMad4Ge;W-v1)VI5+y<i>Ym<r4)c;$%6sx
z$A*Wi4?z?waMZ0MO#MI!Px*@rf%ZYBZ|>-E3-l+C)qY#XN~4XrXyv;Fbu~AK%0x-6
z6p@Ktvs7ICB}UJX+$<hC2E)>9pSzqX051ZS-27dTjuyP}fuP_7Zt<Ul+7xNbeYgbx
z90fWKG9Cz34OzwRsvB3S<MHHh;U|}oU2Ej(Nw4JUfPS;pm%rw%72<E#q|N(IDp$wS
z)mwMw=11Lb>rXxJm)_*odmGOa(a?Vk7gGzm18f+q?j#yhn<CeeE3&ir<D;j2ReWsG
zYcnH0C%V-Bz<s?ZoTi8dDJ&cfkzrG3{W`y>2ry2}QCg-*<K6qRCpC3)4NQmDy7G){
zLrqgt8jSs>ea=ChRFA&iB3F)LgO~a`m)c}#ywqh$f}hL4Xg6Ey^Uqn3;V#my&Pdg6
z@ChTL<P!nt$)EW&K<VHs-_fMNsC=>L9QEP(S|zH$+RLQbq$!2HhFx%blxG<8lVn@4
zpi-7Eu6F&(bRW9ZEzGegwg?`Fu|LZJtr#6}nGMN%E#+6zVSEbLIC=Bw%ee@cRX&tw
zC{@W!kzwC&mm*}V1DT3VOCt+5W$g~3bjfqx>^|T!aM}Y47e_=8-rw&qA)BhN@TIi^
zy9%`Y2P=U$9(Zt49KrS%3_0+04OFx?wWU|xNurZr8=55-mD`9;t$${3hidVt0)jvE
zt;&bf568vmbfG8L)hM4&zGuCJlbv^a2zEYC_Y3V8-q*k5OS40v8rx!6gyI*J4J=83
zrVU=YG*g;lt!RxbkOhbU(+W`6x3RVmz)$-cg;tw9O#fmE8j)SG*6v`bb51+!lCgyr
z2a?TauChDXyP~+dqQr7P&5$H)49#s!b9CwM%hoe*YxN9AHs9_mq8oV@x${Xd(Rl?*
zL0r$lRgnrhs3;z<$4;*os+L(~V(WiLV0KatR7*&gXV)5+RG&5XW*j!H+yh+sH9b?`
zO!rlyv*Xa2VTd}J{xNy!oHGOg6%5MDz0iH1lP}3I9tL(I7ZK01w3O+Swn|xJqxa+M
zv#f$F?B!R&AfOAl3%FN)=Gc7?-?yN<Iw$7-c2C#WM^$cXvnmZ{w#dz!pO^^~uIBo2
zimxuW+4kw^I7@`(79&pYkpRxgYcSxj39JG{!SrySjf2BGyMB|-%o{kw<k``-Gu{%!
zl%OLqM3S0nHI@x$Z}|+7IntW|T&B!0)It+MWz{R_a6~veOPiOd2}zGAqtIlUt{=D0
zkI6EZoA5IJDx|%6D<^mzV<T_!ZV#1bnJ^GPlWW{jF4hM23EO@A5)wOgm0CG?EA)(f
zYzV!jM!4>7-{r7r1#SRorczV2hnL<*wn<`oU^pCbEdiOPynlHr?+S0zGqji|%vV&w
z0JM#O-itL;g@RHEP`u0?hh|Z+*h8EgdyRM$)FyZt9sSQw=?ORM@}1~jDDT(3xq6*K
zw<q@($hPhm=`h(Jj~!-0-g|F^c7C_bGUrx(M|w?mk}YluVe$&cV_g$_m@$2_mL_}7
z-_HKv0nE#w@&n_GL-cQ*`#{}SD>r?cuyd4sh><~Aq5~gT+#wgH&{>rL^y$0)i~;zJ
zh^mXOikZ2!t+i*WpSq^6OLD0jq=tjGI7KEMH7y-$F*P+S8@u475I+YyBUf$R{5n&R
zo~$P=et-m4p<@g;v{?T=z;aC0sGg7JfMve;9qag=@9b;J*Bz@`gxfE^Yn4rB$*=db
z<-I;xG@loAqy`2cqM5p2{CLO2O}OgsHXpW(00Qs9gdJdTFi=7jCH?<8oW;|<(xq<{
zWSAu?6@Ri=7eIMH-hi9`1(KgL7!nJtXfW<1mp+y)rgeY9L`KZQ<oZs_KXdrCKnt)|
zxIPOzW@td}s5l=sZp-R;GO7o~gSZ;KtuAmRg)lt=C*u?War;p!N_?u)vggbD?G@8J
z^{;bX4P&3WWM8s)#S0RQEJ`rb4g61<5?M^_AByXP7Vt#U{=rGv(Gf>A4G%I>?db$5
zq%>>GF6<m{f-MmNB=tUTevuSiM;g(}Odgx!J2deUZnP-D;&semw&t&4jCgMqN<nDT
zIsn!Of^>&(6&89w9c_IeesjcL6sO%UT^E{pIpFI=36;^VS_-*9uyL7wpE0`2$r2tx
z5aC;9oXP;*toxg|Dn^&Rj_ia5_0+Vy&ZO;(1Thf%U5#)2l<#Oc>#X#>pWpbYCHT}c
z9f+Zi(%E$RI5U;fQ?;~HwUig@hK1TAmhXlc*;;D8mLDc+)MO9nDeC(&>t}TfL2MQY
z!$viZ?|PEzK(!};Un+xw@&&Egz@gWSoLX4HXWhrpX@oD#>V-{Ovvy=9q^@TGfV}%%
zAaE%dJXEBxqo)95J7@!@;M%{h%u;cuhe9BMvb-wv9^fd@wUK?3DpK}mstb;Pz)RJ*
zx$)xBI|MKP;(xFb|3HtnRnfs=y;g}T%3C4`u>hoxl;rxm0fQEhlwcd}2VM>`K29iv
zBCP!D4Lk@?fSQnL+<+QvIjw4WuBNuyWAG6fP-qmLK6@xr85b#x1pl)125X3QM?%bW
zxRW&Ta=OkQ8+m`=2B$yVk)$&FaDY^&cJkeJN~jel`FHIdj_An9;xR*M+~oAI&1w06
z7n}^k51`ZuR#cZZ46t;`1by>Q*X%F>l$Ge}>%}AM?SsD-9831q!DZsK)joKv4wHs{
zd`k&#6%L-SH3}c)j3xiaOh(-r#nyL}BlK}nk`CtD{II_0)@$%{(;s{gI(xpFnjrRF
zslS+N6nd?DYyH`W5*%&vH)$jHw|t4mpvX@?EVLjD6B2_Q8~tj@#RTvhrX=6$tkf0=
zt5bi5C^a;FPQ#?KZ<AB1i(TRX6r(jcGNpXI50g#Ed%w7l3DfcPe%Y<}@p@aT!`hr3
z8aOr<cLFzdcbdu5<U2%(rFduYhjJBM2AtmEJ2`YPN6oj~zyxnI>yk``FTt^L)96%U
zF{RjxV<-4&G8c}M%xabPf$|0URyls^C4kdJyjF~#df4xBeiAFVeuXwOVS=ZsU_bh!
z>bd^SIYrL;_MCp79tIoj{&-)DPx_ch9i%o5PKy4i=W)=b&cV9v=K=mz%0D=s!XlG-
z*a*2D!0wUc@<h*@FTTTnyxvq6%x2rXTmyQiRFC<27s5I^hE`H?)}Mxbk-rlrll9JW
z{PpZ-{IYfZ{titR$z?vfE^Y)Z2!<7i_JuJL078o<uSqxH?;G_mtrT~e$Nl)~4qRuy
zW$t|+Af#2*7lbLEJYO0UKK@tzfes^4Xt&h#^swuP%GA~rO53wjjD;d_4VienRK4l<
zcD6J-*?zi>T~sZp3{?WlH?q#P9}xWEbXnBvyz$Q%3tQeO$Xd-%a~N>wDono~W$J8i
zb8s?urtG`JL)V{Sb8NVef<XJ8X+*elrq<U8(mSj;<*mljr}ChOf`*nyVsj2UIuwIS
z*%Kz^LIa~bF?udy{6+B_fAFdua3`acF}gu!-N@S5T$YklPR`rG9;MsN8_`unU|x?h
z0NX#YrMp57*IwW^?B7LT*7-Ac3wY|?H@FeWjJwBV=$RneI}AhL3&H+}_<27ubO8)u
za=FU(o9QT@V7(Xn7c1iPrPtvJvyI1{#D@-#lUci?x82J7IQ$|L>`nVxRb}gu)(gMO
ziKK@RhKmlr@9H(<cI~@mm$Kg`eID9THhd3sA_o=!YS}4m5bt3otyh?Q&T^HuZa!8m
zYld1%l1=~GNmGHS$Zh4-pXT-c^g6(mt^092%hd7wN@ut6GC6owKvYP^CZwam*ojcr
zT#vw&vb?67B7S11;ozhfOO&q3jdxS4ev|*B`KtYOZ4sRlvo^N)7h_?4-@388er@j%
zv%UnU#X>?9m}+LI<|iU0|G?bNQ=R_c!11dWo@fG`V#gfu)-2WWEDG?pc)bg?l$+H0
z^AefBegbuK3Q9HO69{>2f2G=yqZq)MFXbpx$nPCU<mC(TaFS?Yna`d956Fv-4>-QQ
zS)ubu48QW`n=kP3?{ChBl3t5|bqp473_lN9V;K6>cdd=LLtwEAKqg`|$uw$JW62A2
zdds)_scdG{fU}6x-ez+;tMdO?Bce;kDe|gGzjR3u+wu84%g7iC(m^!eb`YZ|eE&a|
zh@_9S%h!dA8<y5*UbodnG`-!459ai7>i&AZdy#+|t-Sptcct)rk*m`S5R@LTL^-hj
z&E&b?>K4uRyONdtSyO8^4>+H`0zR1}6;5pkbt4Iq<aT9uaevDT?=eJ7ShVm%<v+T<
zEsVRnW0n3&EaR&lqX_$!CJxrn@IXMoD`7#&3YVnrpZc==?Tuq!=n88q;?xf_v5h{X
zhbzaL7cym;$?63&NPX7j{)#CyLUpEM^pk$e_4;~e%@N}uw!T`l^1?A)yhLN&d8oW5
z5?IIB;96(VftV0EAZLw~9>Wt@`20FszIuplPRf%Z==1!9t=r&s`{^JiRjI~q^L><l
z6<EE-wwHi40s9$~^wj@RK>m@-*qCj+Ufhh5oyDzuOq_O~?M}1-GX-yZYL^#WZT?8*
zdY3qUnY_zJM`^zt-o<YeXnYEny|6og<Su#~(87L#kq~^HlpuD$MBC{Oes=-RwbzB8
z<jx@$I?=;N?ZbwFijLODh0poh!^Xq=`3s+&oSb3)#fBFc=PA-DIN;AqcqB&iBjksA
zwVRPFdpizC(kCN!$^rC9@pyH`x!VkkSsBu`>V-A0>ZM3h>aE)+!4n`uWf@HK`T|Zo
zkYQxI+~BlZSk5^31FfaO#*dbh<Scg3o8VZEtS^&2(qMKDq})2H1C8Um*7S?IW+U+z
zdVsy?njfFkq1OejKD3rC(@NPP%6v^gj8?#i;B0qOcAz!4$}d$!=eXIBPU1$fDsoy3
z6<EB)AaNaX{MI+9MU!TFX3{bjoI`5@0cavJP{e!DnZ4EL;Yjqg7UvsK*J6bq8hR|`
zkLo9iJ8YoDZQS&2>@y~t;j=%4-IIaYimJeLJAcKMGSw(G8w=PJ&fC4o(a~Lxi_w%p
zdV0ENDqXa3YTkHU1;%2%4tzf@eSN~_x}U<bn+01+iwU+ht7rJJ`g@csZ}rckb`w-g
z5GN`hGwl@Lv1NMWr@~)LID-AdC=-e-On#n;o)x_b)FAOEgIhHaxv<8TJ-ojT^w<19
z+73Fs+QQDXXptN&;rd`ZEd|^;963y%xeioX{ng8D^uVUC`VG(uQ*U@bj40(rz!%Ok
zJ`fNg&ua!4)a#lC4N&aAEqB*kH-b#MNjQ9d%IP5v9HvBRFf5{$OoKK3zH`bEjQae?
z_&FEPF^+L}^#NoDHQ5ydZZFJZWA<6uVwU&d177g5^L^=8e|fE41UG2*2wTIS)1Zei
zQ>Zr>iEX~uK3Iqv5z}9Te>~&fE`D~wDUcU-seTK^4WzB%g4oePpM|BnI5rSY{S*P_
zjtI{D{IHy8b!&FE?q~l8tp$rQUjmR95{p~f%Afh36CJn`zjw<k*i?n46|k^g3G&|t
zbm9gx@h(8X=nEBI-nq%?zVEF1TxfgmPX%k~@-+Kg6f<}UE;WDL(%Jdko;Q~+cD}Pv
z)Ls%t%RxN8`n`7!zMpgw6PM_3<;Qz}0KdLeehBy<2vI%B-JB&~{FV}6<3^`cgEzd|
zV>VMxwh{&r#f*!8NUnM%LKw76f*$zVuw#~f#`G#=pTAc8Q6OWA@`<Bg1X&9~4;zP$
z`(7n3PGr2nGQ$x%Kx*R=B;_DQ#{U_c3M$pMinS1qRjkLg%|+@$v~gyR`^C)`%1!&N
zAjBV5AG=h>K9I2~4uv!XFH2059z_(|Jpr_|J=mRCx)?r+M>FH)_z=zr#yyttyr}1w
zi#f#9@w(C+EhsK{Nuk@|h!H~`(eCqtoilYNFL)sX@NvFoHJeQ2eHP_MpJL))p#X_8
zwLl35ujbW2KNp?oe!09nvFmW!J3dgZYx*l<Nmbih<bLo7*g8&nLF<RW^@>`YhME3A
z?>`4W?!oB%*dCNl77~SXiYUV%_Wun}_qk%!rTNfX-_0c#BTf|r!KChP=DT>ohA(7#
zW1|79^q0PiO?c-=p1_nnNdGg-=hgdWp)S#Y4pa(wih=zkEB``*FP{nhOD*N*Cb?mR
zwY2=gM)3ItVL;I6ax%K1CBpgqMXj_`{wL$L73eBCCxWP>`Qi}%0X&57#tNzq1?6Xy
zF7(XYh)pm!kb0kzK{Bd0Bb24W7$zC%raBHVU6-b`B~d?C+dPE!FgsxX0!NJ=;xe)H
z0lo_Xi-DK|v~hQPgX2HApYHIOXA}tq67;@(J8AUwe(0rR>Tq}uO_sOyx|`cimOB@;
zzrXZKX3~B-URf0SZHoDJ;U{-@z3chp(Dvq0(DW14aW@xUeXblv-rh<54AB^2;NvM-
zt@}1@q(uYMW!z=_EVi2FK2O^=S$GxY^b8}sC`a{cKGcjd_K3%f$>!AG;T_wu8&ox;
zJtF8CGH#_mqllM3$Bm+;&XdXTxgiLw+aIr}`aaaLDpUFVJXYI&%LFjeby~_vG*VEG
z>PvySM#|Hq=`IskhrpP^M$2%Cn;iC_*CJTv?Kp}=4x>`Blo!<H!KE}8<iTagF33pB
zG_deO{0RO^4%kCuC3B>dYv@BB*h{BrnkDkt2>F^P3!}jK+pWFg#h@psX-A`X-i}wC
zgKz?fN4$L>)=@%4zA&BfT<%7H*j{KSrKvzGy&Y|SIKXxNP8^>Q3jI9648my#yX7Q!
zAJ?lJp{P`p?pp`DOgfu<eO|qofKljf%scQ0ZM-12J>5(;e!Rb&hd#&wcGLRynM0rm
z#RUI+lRdldso%C5=WdY>y|=)E5y;W%@61d&wS~20B&2RBrXKXj+>xu44St*X3^%^r
z2*^cufVG<3W25Z{y}Y6`gQB^cby{96L>%QlG<UvVWb@x0Wcwjg_Ami5<&ms6@Nb>-
zRm&c;U?pCjp64dEK>a<qDiK`@P8KB4_;PbGFs?Pua6{0c3ku%!zB!{7xB@~>vYvAp
zOB`5-=S^_<qHV_W;|=x(f2YsIQRd48fxyjje<_zxhim*Agf)czWPgUlF%J2GQmk+X
zVgRwy*6636Uto!ZQU>2a{NuWiqpNz{{po!D=?CPDny)hJo=<RHekDxV*Qv+7RAeFM
zXietZb)wYnVZG{_s6@_BkRg;_Jkj+ix7)30KtGEAKy1Ypq#kta`&3KrV<;U!@}jXu
z*M(&uEYC`*bxaB#8|Z36Ji>l>bJYfk=i30kw|&HeDG`<B{xlB(^_$HYZ?vRdODrtp
zx<sS)fN^-DQn%IDYw!oA%}on7lUAp5e-Q9Wjh$$+<QM0A?G*+}FM=~LY1PBg=M*jk
z3b&1_+S*#5{b0Pb&hA7Uvg}Wz;%!kCt`l27`8-$F5NO494wA#7jll4Ns~aU%7utM>
z+QPu>7V(h2wcEvz511@uXeEG`Kxu+;zXb6Y<-Y*ojE=_c*Cs0IuH%&WTIa{RSN9Ib
zEi4f1imIS(GNB58CnV|#Sc9P9+nt}-JlRost1WOqZPxRq*UfOs*fNPDjb5;l<%f*a
zsSf9_gCFk?lkRZ0kTCiQr{(2BV)8-__3O@R6~h|-9miW`v2SO_Js@UOJB@y{V5J{N
zfrCLLA*i1;VTHQ#%FZ%x{LrK#ar_<7=;`Ups^h?X5B?_N3xQ62Z<ix?%_;@2Mquo`
zFNY<veV~$}E7zOu?@)?0`q0gV$3HxrkA;YDNI4>B$UaCR2WU3N3^I(^AAd%f8+vR&
zAl4PLeI2AU*4&*j+F^?+yE?MRPfwvy!-tF$?g4LvOMSk?p;R-7lB&_zVIwW4q0eGv
z?n9i=4+z+z{QfIskC)Wcn-^2cEQEBBa*z`Bsu-r5gO)OJT+QN#EFdxyv9RA%chpz-
z6F97-UiJn(Qv|<wxWwL}9zOCJB?cIc3~mvkj>{Mq9Qqg99G1LKoS{psnlz(|x+eo_
z!Z3z4qF=50$@0aXD+^T#51d_EASA-NmDNKkN<mu8pDK?;`#b8-($7?==d3lmN<+|N
zgV}#f7(}T^n!&fIt7lSTG}$Yyo?0ULKsXC!n;Z4+91;YYn#=s{HMmt~XF-GvHsNWS
zSYvukmh&y;pcWOET6|NNiq$HJ5ablgr;_p76|DLOrV6`^qUnBgj>vr`yA%%MAnatW
z3e8%R;hH=9)s5x#dUshl0|x)wG^ACwo09EmlwKCexoaJ_!Oyw1KaM`O_M)Ld!Fcf(
zYt0Z#9`|cdCCF?(C)VDU)7gISVqljY5O%)L%N!-P3umjHr)ziMK3AML!AM;|-Uflk
zHE8@@M;Xc#rA;auozTB_Xvg4kT~bIPtOI7rr0YKFymYZ62TN{o%)F?Ru?!BOOSuBQ
z3-Ku6!<E$l<j(%dw9Lx#-Pw1s5=l1sXnu$pWCR-M>G9lB$w6s<+epOU)N69wow?Hr
z-fZ>0?4#J)kX{VEy#T^S#l|ZML+jzk+r{ADfPv!%l|+WoFDm79z(^eWQVXp_z4>#D
z&%#<x5-|b6-=XkA=J<r`Y<rV#h<&`D$AZm-USW^MmT&C6-t)r~=aIUS^uIK&He7%=
z3ETp@qX|98(Pk&?C_+D!&mP-xnAAPM=<5j|XBNIrdWO=&wI>97E0nvdG?#R-nytl6
zcl^_$$*g>$+wJD)4IvM_LpR%l9bn=!MbW;=egdkX*+g!DbW(W|t>`9D_Ofn0)e>hF
z?SB*Fc6lzN;PptW1PM+HOXtAlf5nxfM_f?<t7(``+hqn)Bl(VtxkBBO7wMdo@rk=O
z5U)$Eu0s8MAbyDvfrSS?l(k3IeB>NajZ$ws9#RQyszS2~N)wthNP}kWt1An!4Y`8|
z>lrhZnsknhm%o+S#Cpqa>V@Cq)!$;208x;vC~2H>w`%bUL1qjLKSsK;e#8iDV?k;j
z+s|HfQqox?^qcQ^Y^;pI_L7YL0j#p*pON$vH&W2?ViCVMZ->VIWj$hcvP_{sqTeFG
zOvbPdDJrp%RR%$mH2r4s%35CgR{kCc%?pAfh&iCj*1fZby%YdvJ{(%T_+c`9jg+vr
z^ILxVq(lEI?Hm)o^W{7^D=X_jcPYH3!P;*>TIjs4f$57%P1p8C=Y`1Y^>I=XPk6`c
zF=gOLFG&A!qS@mFe`|8#zJInfE!)=?<&xPu+5=iYm}a_EnAr1;`m2Ams>&jC#;F3-
ziiz+e(feKFrhJ<pp02V^@7fJEqtDHmTUw0zSj8@;KVPeFz9pp*lA?Al@{*&s0SUA|
zVwbwQIto8T!~~e2<Id?_rC-bI(_*&o(;1bXuh-px+n=jp>`nix(hEDYec2Da5BCfv
zq_D}7h*4^oezSWT##(xk(wU4Hm`k1=5dY&Vb3J5Q4rNk8ztZ(r&1BO1g_>=Nq97`8
zi)HUbA?Xp!5*iqD2<K^1^P%tNqlrNhh;<${9<-N#Vdo~~10I!8ua&i$1wK6~WTAti
z>86^}$(z1F2D47z8U^q(1|+Q{3y+?O7fa+qjnxG3pRp`68pgRE!2aE_TxAc+0Ruj*
zZ_sHHZkxVp{&qz1M=p_;8!xdzF%Aka5&J$pLOQRmAVz2YGq5bwgyh7C1cr^)532nu
z_VBj77-nq@YDPW@Mh7gG&$5%L?tF-Mofo7&NbR%e^ThU2!4Eh2jOVk)&44a2J(Ny|
zgpxA?+++y%*Ov>wx>dGPLLIsaosS)W=m4&;)^NiE?;H%)^@o~W;RFaKU1UJc|EJ1%
z-yiqi#(}Bh<2CLUA9TLF4+8$`+D-1Md3uvzPT|LLnSv-_e(z8Be1jYE6Dd*ME(8#l
zKr!?s7wXY1lZ2*EK~v}^qjh6oUw%L&$h!{HAnnWiW)CPLFfb6zof&tFhP={t{jMjl
zR4=pTayd1+a>nI(C$ToUqWxi;;wR00cJzzPz2WO*zS8@_bTMS`Ep{`zCtkhYL&tRG
zD5AZ;fZnmfcnT?9&F3U^JYSjXB>E7srxz9qSncl{^_72WN~MPWC}TodGnUFL+1~21
z!_4Gf<W8Xd>Cr)s4uS^jioS)|f_uu`MDZui+);o;$drT3p;N?}PVI7L6obJo)+TV9
z`$%%FnfAwvyJ>>fpE@_w%WZf!r0(ef@rQw|BQy1Mudv>A%p^-ncnm^qofh%4=iZpx
zW>#91zO$U+_*Yj|F@sRh{n5(g(gyUa`r*rUE07bdggw(lx*20EyJ2|Z`zxAk`yAAU
zjs?y9zoV5|bi580)lkXqe*S{5lJ{d^cXlaS-XwQLExs*;aVEY=?tZ7|C7?Q5Hjr!9
zu1Vg1D4E0~gPD{Me>v1pjQ|(%^ntquyK8Ax&)kocBP^022CCwcI|YsbJRO~f3yZsV
zOvlupIQ_3xr5*+0XfO|w*1eF{Q2QGcvPw=d?-;1=P<wNFcjl##1*+>4ME+aXS>~uX
zEk3YgU`sSc%g#I`9#HQtW-%i}8@g(Krv7Rxuiq@62jE`Ow`L>9Z<(O=fkcC)9cC$<
zS}Snk=xxzh$SmNkn&usO)nPsK*ry6tUm22)QZT=utfH!*1y)&8iN9U77*5T+CkJdG
zu0~VZnN=-kg074@OIPV@OQKBW_y~i^Rl>rf^XigfUTMrJ{9NiDtpI!2Da$aoi$kae
zeFZ675hQT2wCuh(VCoUzn1(^|aUj9urgrTvd8@c?+!}t$I2Ya6$5sh5?xvPLO##c=
z8Qdw=;Kz(FBE`dy|0`jHz<zl}$l8SgavKx`<=0P5^j92yFf$n#fQZ0ANz{2-rhbC$
zuaTd9(B6L!IyLW)9PfgBA+S{T!*91#wcMnNn6mVlzy#5}86TZ5aalk{2LJwb1>Kyl
z(vy2F#CPr7Cur3GoLO!Aj7huN@(md36a`$T){9K<hrWMRDkZtuAeD)a{qt$H+a{mW
zz4zcNg=778Bv*9S>lXVXfzXwpGk_^5e1_9(a9mHV?OVdQ@DX;+<oDU{UHjo^rTq+3
zH1T;i^g%uVqN!Zt0n-0`)ayQz_l*SdOZ!D8zsu<(oc=y8Qth^eIUaLC_Qs2UguU<b
zwTofuc~`(92{->qpI1UJ4bI*Bu#z3IKm|(l)ip+oHn=RIZ3G^M7_D=C_IBB|NmvFL
z4h!>qp)Ct2`ZGugr_Jr-1gM*Vu#Dp`LFE61z*paU=9<T;^Ea{cuf3e4<?O*e2Ao%|
z$S?~Sg^Yh|G`$3jgapGuK(NvVRUH&mh`PF!O;-*&`HOA%iZJ;FBxi%%aVpH=*ju20
zQsGrY(O$UyS4a?Q#FQA$aP^$Mo?%l$ix_epw+NFK0m&YOt6mTe{TynGB%cL2nL8O*
z)#I{{dG4$F%onDBAf{?VaC%?y?4BERbF;PIn=^m7OFkI>JEPSwz*B-D{@)cH;08ro
zHIIQ_;#G2%`<5GgM4G>v=cFkjw<jo6-dy?$-Yd9HXIS)p$1MGVctPCFsqihkSqby-
zU98HQq6XId)-1IBZ5iw@Nz2biQw8QG&I!aryK0sB8Uam%bO?{%`)o7EqI!-m?2Eb&
z(#JKhSaD(GTFsmzx!kp+=E75i;mrT72m~`0*8e_n`5lm+uQQdch?mAp=R(9N?#}2C
za4Ujfq^RtLkC*<Hu)E~xy+YqeMms6la^1q*I=BCvWZx^y4tcZMxa%$MDuD@_*h7)^
z0X3LY1VpdT(_ee&vm@a6as;My6<83kqqgX;$f@MK5dZwT&;*^&B-(`?ET*}-%+J94
zV<?)&mFDunD8%O#3Y0|O5k?39^~ut120RBreC7-67jN9l<6nI?{!__qJ+EkN(dKs+
ztKVg;ef6EK&CJz#yis%XyfDoN5t&JKt7l-<WF;dw*^_w3VF|y;@Fj51xJIGzcBDX>
zh9wPtg8nbB{P!S$;r#ph3x6=X@ov!%t7%H2l10(z{p;F#!lIs}_s4XW1f!?gCi;1O
zlodiu-g``naRb4>DU6;@G!ur0ZbXT30(yq=GlBqKy2iR%D;k!JV+z8qndy3VUQXFu
z&ap2>XJ{c66BLQ_kunu|d6tw*fpIy1>%6rH4Do)+AH4o%xx!^l^qp9Py4{|GH05k?
z2t3Z4!FzedK0^Hd38EEJzwUZDna0pz-U2s$ly>76bPRbDoJlTebFMt=PX$|4x*l%u
za%Dmyf~?PrX{=%R`Eg;2*T)<rs#TK821kKNVV@E72nxa_e{gI1$SA1)kTHTs3{SR<
z5KebU#T?m^<V}tK1QP8{CYggYJNPTe5Ucf;LR$A{b(=sx%<gXBuL&I&gI2x8Y|?sC
z3Vi@QKY)aI-2VX3uF#P(xX}5a0o<`-Ad8^YiJ)C7S?K=^h92FG)cfyz1KB$ejt2g%
zvWrldzAQyFtE1n@G|r4NF>(v98Q}es3P~Tz+nUtox^<`aK(y3)@!5RSD!9zyD0U$M
z0%p_PJdI50M9<w~@_i8*L+1sB<ZRsyMBke2`-K`QYkflusfdRF5@9J^s#FAVx-w2D
zp||uU=j3wbPHV|~{<uDUTeX67Zru7TeZY71a_0IuM*)F*DtMLBe(Q3ADmws<Ubh9F
z{~-p#2!plo3H~`#`jixceji>GJx-OJ98f6Nk#mixd%HL*dU$*4Xlu%PdooZnA}PnG
zaFCIcG8B2cYV7Wm9Wn6i+3=XuZl~#SG?qDhyT48PaqI!=8b~?Cz2Su2%e}(I^hgBe
z!SKz(<FQJoInnL^O=>K5Q6=`<4gt5<3uO{2L=^<r4)Fc%xC-XKN8Ti*TsT)&qxL}P
zYxxi^FVslIS?o`T42&VrsWO)JmYU9pI$udWV{pRa7)#q+>1gV(*cjWN;2{M3JNB85
zb<HA1Vq$QOGQfb+>A$4sU)Vb#0oV6yh!|F44T&t4GLL|8uu0n=bs7T6ld*O|O2}UA
ze}}ou`{_50ZoczZ*Aa@9_kHnOUv8`U5vwI1@6sgdy-5ghdJn1hGoQ>gY1BvNX@8)u
zJG=)0%c#L4J3E2Egavqfp~Gv+%<zWx-wzxfr%CCY0CXSl$K#x`f`obP0OY1=RhaO#
zO6d-|z_;HtG5WT-`w6gCsv#`>X^MG`1%YWwWM#{s_U>&sz&PH!n30-ZkftbzY_4E`
zGUOW_1dNk55e@?!)Krp{>?Mu3Gba19za#4&T~U(jYO*kbP8P)4M)PaEsNI>z-B!@J
zJXriqK@i~V0{}8W>C$NJ=c&3%D!e%XMThNHX=M&1l+Fz5yjW#xk9|s}R#=y8uMy(X
z#sB+=0!#Pr+;Utc3wu2|fYF?#Y^Q|R?k=>e-BR>MX@}}7?~f#tq@DKL4}oA}#HyCO
zF(q;e5ik>eK=ZN><swAXX_>DE<r^v^=Ms>{^kTjRub%!{N*vsNBa%fbSX21U$otl!
z0dC`TX%>q1#_Nst68h@cyLw|324)!h8bW74f<H%TkSiojI*Zdyyz&d;2>QAayO5~+
z!s$4DyqP|U4b&U07Tc4eq%b?z0;1*;Y*xViM4^%{yD+wM9dw%kFT8eryl_8ZlC)%P
z<SZ_3YhtMR&E44Zt1|R$)OgF(|L=lwgyC*kbP!Ogg~mV-@`%QuC`p;2|Kjcak=ntZ
zMXZG0g*RMZ0}2+D*)Fh<NfxW3^l<n?s)Af!*7h1w8~%q>-5zK+Nv^(IvBnER)*GxS
zdAlRuTXc8}e=U*3L=2`9<P6-~f=1rroVR#XCN|`@6cS8?igqP<;r@<+;GKcqNff3(
zd?-j3UMSp;$f<(1awW}QgLrECy)K+$Dn!R5O|p1^bXFbYgErDru0TYhiU$_0(yhuI
zmLOid0<Km)Lr#{N%fg9*^k2C7ci<tI|9fx0!|4BN;*Z7pMm|eo3{~weRiPldMfa^|
zD8xL;oY}hZPZ0ASgbh}zI;CQ`3|wDAF%m(pXTeNRAGBK5OfZSF1|-5`gRA)HK9y_P
zW|PbAzKtY4r_Ik*S^3kD(8(#>JTBXfDEckV{AyVsNm^<5jQ4?c{^E7FGH%#h0ZjP5
z!RoQS*{mVs$XCFy&a*Y(PA|&ntil&SJI#qSuB2rqrRuc4Ny;qnp}U?OVuXHaL7Lj&
zF*^s35?<e^9x^xuV%ZN7h7CED!ZkDh-#>$Ad@VfO1n-p+sO1kxeulD1fn-zyTv5R_
zw{)HB2@{Pw#gIn8)B^smtG^Ad&m_bcUL>-Ghl6J!JH#qZIY@2_gP%t+qEMBRrvxra
z`cou7MLX~-TFG>3JuiZGfa%^bvq}z{tqJW<1w2Gi5ZQ0qpBp$RqB#ikY5Hv3qNor!
zqGaDyo!n_m%s}@hVcH<(WYAV>qz#{&z)N2PRpa?mV4caTQckA407h~OE}rRnhtb2r
zS!>t!u+AiB{n*dcO7(h!!Fc(fD2^K)H%Cb6fEO!C|8EZYb5CUcVc7qNtG5h`>I>J0
zhZ(xNySqWUI|QVqhVGDVhHeq*E<sAV5g0;{2Bnb{r5h2+ckAz*^S`e53t#v$d+)W@
zb3e}=OH1m{Tr-*Rr<Vl*tJh|%P_J<b(B>y~!(;ygGLI#-mG<MM9@|6R16u1)V4l<K
z)9vbS;8w-_`DSQ=#ZT&&3jkz6@JkZ!(<5o(B@q$9FRNj1Ku0nD%kp9EF71x@TZ*Lq
zIUti0IZ6`-7}MoPl%?>{{p((V@Z)yu0WzSQ;QZV3|AT4NN+4tg83vG(sV6tDM>ZQB
zJ-?`!lz?a%D?Ptz^&HE)pNT){x_E1tn7NqgI0oJhk)TAd+`u4$o9I$-&#ng2G@*II
z46stOkPyExB=~Ar#1@JuQ$eH4A3+AS2c4LJC6g~de;=Z^L6N-3?#n8Iv&d-tlC#D)
zzB!m3#oVO>2BYrl3=a&&OfxA<?leV8`44yXqZ+$g4rncd9xaIElDCa)ZA>%VBVsn*
zYX;$Vt8d|tE}nSe%cz^Mqv1#TBg!0caUn*y9odn`E^477Q%-Ca!u3R*_a0SbapHfw
z<^M1s4nG9*9f}4<Er<SobQAQA*wVY%99wqC5=5RJ!A-FV+7M?WhMQOah2nd7!n`bV
zJip))E|+1ftVg(DoX49(!WEBrdcqZ4Wg>?ibRmWgi#ac3QlkC{7O^-^?sB>LhCN@C
zMh>gS_7%rCe4?s@-3@6l`TDcWTB~TcSpq7nQc-PPD^H@SX+<;K%=Cz@PIN&>dkm-^
zt#T!jY~-Y&JV_pol1-zTEM{H4s>ae!4J^y^c<E?uH_Gssq~eNbraJ7w&X9gO@VWNu
z;*IZ=3d!`?zH*ooK5y4Z;bhF96kPz6{BL3W5Bx!RU#4leo-39&%v_s!tCLlkfCLIv
z)Lqe(^1^3dICZfQrS)1|N!h?yg1nxDa#R<~(#QZ%d<w!7r0kNZ#9sKWyF6ufMqTme
zqTu*MaCzL7by4@iPm<~O8*(*R(|c5qSW|@(PKQd)pG@{`Cs(EQHE*>~;~qL#@29%l
zo90~Jm6$jpOPRK6D2Jymq7t}Fj*`7LaZ4-@Pw`D9JrwnRQ#bZXa!OW#l}cpfLP7TW
z(-}X@a*_gZU|bN4%0T3+0Gt|sU~2pwjmr8zK#L5mjeTia!p3~!V7H(Z@TbRGnYSo=
zsZ1i3?B63RjDc{7)M5>(ZXa!6JrB`d;>4%YXSd_^N2`|y&h<yjI4kW>+TNyJLQ)X&
z&vM>9w=2N^Ho`W~-k#`Fh6fH-xZatIV-gD<%=e&dk`s~}8;E{~%hHpR|9Eawxk$og
zK1x&#9F4uFt@5nt&9@bVdBkaN&<f|$DIvYS{y(a*H0q8OO#SqWQ&U;zTnPAIROyXy
z`}qc`8Ca^rn`|E>e`vH1R>h7T#hXSemyC>(<@e7WdRBu!v?4TU5U}awFaf#*q!oix
zC&Ey!UK~gJ|Jkn8=8Z_VR}=2TgtuRiyuPDi{@cRLm>>ZON{Yir2MhZ$lqbAe(jzpO
zD7r;VM?*)o^K8>!sLx}xvaIOvIB+u4us7quA?QL}TGL(TjOPEmKEMAb$Dw^2ep%P8
zlFx(%yCDU>uBW!3;8?keJ-wb|fMi~M?yLw!^nv&HZ)jS^OH@{I3k160>2mD;c-YRj
zYNy;Ip0@fke$bgTbwEBgJW3nFmC#1y<xA)1yUQIzQPi(|R$Fq65bBN21)+?83lER+
z2a2|hi*L55z9N6Mo-5wiV0gmTE|18S4xj8eaVcxd$VSMh*IRm;xm&0Idvrym9x=Op
z5;VKGf1NHp!kNeyxO#C<$52jJn(FfO;x9DZ5(3zrjbB5-5Apd>Y97~O;24_B(pq8>
zxK*H8-;f#|Cm#E`x!$~yo*%h7jTIWqo_7x(y|snC$0gewVg5spAt^198f7pG`4e=9
zu}22A)lOHj)KFmy+`YNuSdicgI(eJ*oATTF+-0z%k&WqdpAZw57vV;Z32_>+MFaR5
z@e+574j>imw$iV#@Z@qQff;^NCMOeYGB^3;Q9K<oC$l6yYgvd6iIw9&1PcOsROgoT
zoL_^aD9~(R7W?mLwnm5bfB@@{k%A6K@0hGc9oVMtco+0&)6X(5Q?~b_>#9B0b4~na
z^BUbqjSv?|$C&~NbgJRf@;Pbn;vIHvm7VMLV&X|cYSCXKFHG{(g&pi?y<8!l%x!kq
z`qH}UC&iMkoUSM6!)@AG8MIcrjB!Z*Gs8fzd{<9zaXS3EwA^{TI@jbUXVZ|)2ouRv
zUf)O8^)Cba0vt~Ei&GBnPG;I0BJQIXzkIN~EcK2jeD|CHqSr)k@mm+}eR$L><o`h^
zwX<JH-&-*L{enQT8F`6J`U@a3-~U0c_=C22F#hIEbS+}~#|Onw4YoBow9RFT<Z`qa
zdE8jk&G_vg!i^NRb2MD6ou5|Z*oUK|m<<FVt#j+k`7<I!S?lf5$63KMaw<?Z3m;+D
zGlPYR%*u%>V_TW`Yva#kf&y&?w4IgQm|(AL*N*-q8gLo6mGqPaT`sI~9Ve1-nqSU+
z<zcqhnC7T+F6g#V@?voea9keKq{1)|oHk$TgfhLk1PIXTgB64N)fHanN1!SBQB%ZP
z<A%pZ|NlC_|JrL}<W0VG1Ut_-dZV@R1<Ih`4-D=!;=V@;rgC<HzO#+rPkTbHM2vvh
zROoJmTh)uFmGH$4QQz%jzjdZM<&?-lj-YD{Mp^Z&52DXsM|0a~jdLbxjY;{|@(g@?
zt@y%rFFexyjdeUKcIm(Y=Ip%Bq@IkumYVYMS0F|`>t<W#V!~!*+XiP8-+}%6u_aoI
zHZ{UGjH4A{KgYxTPcjXM!Y71mNqnkE$hrxp6u>p4R+^s^wYZ*Z@Qkw6R#m!cj&n~>
zeBi9fC8ErPz8+0bXG>6>&{APz&s~3`uT53-f;7uC+e|x6S350J*W5sogRMtUxRX}2
ztmR`D(uxS=@0j7{5y8W0c=(fgpd?1{@Tch`58a;U7W~_m<><}^Cv`Cu<9n_$5Vw9{
z=R$Zh#U16hC;6gpB%zj|LMTXsu-{5;JI%A&DQ}F!-oW5lb<0*b-OsVy;fv}VXjPqS
zLcG>4`aFQ1W-u}ns*wkpD;kR{-%c8W4@(=Ps!_WQ><y5VW*8JkDqbPkAbvr`qg06c
z;Ko{$PxlrnHt&1QF+zdlU5sA1^m#}AJ^zh2;nyzY%_@Yao89jZfF6V>1Esb`;%#(y
zXTp}UuOx9v{ajZ6Z~OSogF5sUIcM=&Rxzn(Y-NIMJ&5m~F_#teRLZm{xMn)WarIhd
zpe^aY6D$p!wJJwLF69Q$x>Dm8m9|M=`#g%yI}*`sZGEnfD1W!ZSqK<P+qH753+p&R
z?Aa7hleWcs@mhtokk#9FRdeR^6tB47vx$bXOJ9I=zLG0OXon(VQk!cKTNs-zwp#5T
zaufxZb%Y{x;*6x3)$$5XY_tUaUQH}oBFQqA{q)M7h7D9#b6Wm%_h)y#?DWcD5egb6
zmkDm<?zW+J$mefRaRViP&EnC``*LYAd*{dE0eW_yoPglJq}Wh#dq$l%5a_~=QP+#v
zs0GXJVB&hp1<T*;Rhs9e5-#a<R<TKa4AZo`US<&p0fUBzHf4+}Zc9-)$M&9wYQ$$1
z!Ki1NX=xueEuQJ8#xu=4UB*37Lh;ETj6G>8@<&tq=Zm=B^W;$5k!Nxpim&GQiV41I
z6OhOBg}t~7pMH2Aer+9*@<8bD<*P4o%LjEeZVVDR4e;Wf6hq?#1+pii?CqIaIHMem
zIT73duIyC@=E7;ocn20FVy9O?FH^xo&^WwUG|qT%Vf5=et&S+jS7m6bIl}&3A}ILx
zM8$-MpdN_!C%zc6rh!%IU8DZ2p~#b#MF_704CRt_CHoh=13wL?%$fq+jr5fKz3qOt
zMUs8eEIjtgJa#hg5CU3tzV~*=%_DM2s)ff47;wMSYx7RIy)28kRf=bUi3zb9&FyY@
z*7g%apnF_f*a#0K&pJ`&`_<(8-RWzMK0?U%(-)ZV!BJ3}VgnpyJ_}5jU*?vof&y18
zJ=S&`>yJnpDuOu@6ZZE{mYX6|s-P!?O4`7xykHO*#a6UO`Br%T&xw%?euOl2yOh{G
zbfxi>aI^9QkDGI@H!){SvM#;340CZA$PRF!xqS3KG!MmaiC4JF#qrO%iO1yPlDoml
zDkUfkCdEI|Tdnj-gCk{0;yxM16P9caX6<37?#mgop7BPmWj!h?ONP%nIC8Tu*MH5r
z<%{02$>)cMw|T+vdaI9u6G@308|fQP@6Ca-SX#ffE5kmv)v)o1@}!jZs`O0sUrTX{
z0@5w^4+AYx?Y$-hsS_E*=^DI>(wKgfpg&C0Ie9j=ax#U`1xNT6Lmsev9m(ftTS=8=
zj$M1$Ux)sB<z@iwhA;joqd9YN!uWf?)HdjT)xB-C>0;fzmx<GP(GnE8WcY-Q+{l_-
z-;U5HRq7~jeIM$0vWD`vBgO%_@O-HC)^9gfRh03`9yyaT@*~>}1x;+KJQ#VVs<f0p
zhJ~~}J~>R^kwj_?4?NMA;*W2Cb+XoV-u~i*R=%)8j(z-?p!wmoR(<nOW|XqMJ@K>m
zJBz!9K&*Xsj<FaAQ@vDK2ieO0CrzaJ%cl43#0$O^L{m|1Dvm0jYr*PHkC<mk)0HYy
zAI9r*$MKv9nyR6CfjZWnZd|5cF(@#qf3ktOV69U{*gxJN;R6F=Xcz@IXsP@}tC0AA
z2i1`;Tpy}lPpwMmuom+)ns(lQz@u}zvZJk4%X@wrZIVu)#AC1WaT3n~WEwfJ?RrSm
zs?<R=Ccn1KVAW)JdT=N5ij2tY&>|v6{B92cprG*vF77cDx+~g#N8-e-hdt#rK&TmL
z_8uN%*Tww;>n%>r+VUG<IKSKv7tpZbdOy9ac=)KuK`AvZ)$8fu6<Ao9a8ei_NSwHT
z8(*<u!F9>=Pny<rA#mZsJ(3zt;oaWR@@1CvAD6&@9zJ$F&YAU&fNm|A17(PZAsLj7
z_pAk^=z5TDpZ9c1nD#^{%|wu7+G&KxtfK^bN1I`G)mGhCa72HvuOy?H!#qHmhY_5Y
ztqZ|*em$NzUJHv^&v#0gZm&oOQw-wxIjf=3@<rCfP1i=P@9k`hM1(pwkG-5c|I>?5
zTKk3gEJ>3C61%s9zZX%X0g2-{=tJyE`2!4mn@}^8CU$X9;j`GJ0O0!frZ-CvcpKA%
zLk3a79vxNG5kpMe<ytq?HI}x!CrS!f$8BwSS9-i^_ob7=n;<uNO>q7CLmN{Gye-9$
z47s>wex$1zC6+}dl4qVy{9eKI&raTqhdqrXh@1W7;T~h4$r3W#tIF)tcRQ9z-0Km3
zw%nBA5O%J3+ArVJ_p}ZuntC)RdxEZ)GPNKq(|ONQ5wc4y93(KwHf6cOsokC9bv<)u
zCUl$f{;5PjN2ZA5DQvT`BaDo@Lriv`SZsA8OmLToa(Tl=c)8g)=$J-u@dQ5Ok3mSH
z17$!OZUs!jGw9J)o2nfzy2Bo_t)yeJJFxXJQ+XPtjFmE<wD|(YK*EiFSqyWyhohnn
zSe+5Fbtf@@U{vPTaiY;2b1R0~95d`0pw|;n)$a*$T?;PZx%VqopOJRhJ;Um)`?+o@
zkWm&D8ysqD(Ay&BhB68tj~Og?W5(yF{`DloVjx|zsaX)z?>ML`WPa%$Z445L+q7;i
z#EEKT@Cvcj4D697Db<1H!{Xt(deF&Hgf}LS)bu9iPae#AzRSVS_hzfzX8iGDxSX?>
z+>OL-r8#)SvPE>PJVfvs6n4v2@^l~D@o>_;{$;<XW)b%|MY=8gJegw1_3qpHv-KnO
z%ZTaTkRGp}5}fMA$_b(6)p1c1WMt9J*19z}R%`z6YJ2I8z9)yylHie&TAume%On3~
ziGG)$X14cvBs_Dk#tBmk!y|St<dFvtiA1{u-6fJz>ZKZO>3I6xd5(ZU<Fm%Hp`4;!
zrRYWszeE&D_H?^%tr0BGS+HH-rXe-nQdYL{$VaVU53UgvR8WO*dZ7U6-MoTP7pNrz
zpR;1(Gnj2kt|8((QD#4r3%dUUmDDDnq-x1<*dBV~?{5qs9ArR358MA^jt<+p2A1Y*
zY>*LH^5buY7kj&$VS$5}r*-QOzM=Z!usS2lGbj!pv!8p2>qGNMrdz;=+E?chSoOss
zCr4#ENL}yW{~n<U()ws0xnyWgw<ss=ektJ{*Rj@H=GQ;4-uJ|uUvIj<cIkAQM20g?
zy_s5S!EBh5xrm>`YlcTkR%A|+_fjBK0RBBLRM9h1!xj9gLa&5}{x)KOt0|?d6d1Sy
z+$A??_4*3z5WhBB#B^aD|5+H6x0J$0ZWJZ0*k_FiJMK`4e`nFe=hBIwH++VzL4Jbk
z2TIyAtQJN&_--fcH|22P@J}zwtdmoW@y4j4QQNkt1fd-@DRs}MQ0Leokj~-1W^e=-
zR5rxy;jVLD6Q`~-<;4l%U8%w#sPF|dfRy5wgQ{YL{6nd)@9@TdQI-r7<~0NG39=HN
z_}MCDY+z;THsBDsCFKh>RBgIX##{0(|M>dMa@!Xp=cZu(OVFOj>9Y;oOpCBqzOx}@
zXhJ9oAt-~Nb?j?<%L=9&SQXWHcS0@Q3g2Ov%{KYL#$C-ft>)r$bNq{%;MQ@^F<zUb
z_t7kvpt8&SJr-fC;Rpo(t1KA;V_-DPl1>U7`r1x}FAQ<sUc0MP9S6S>fo4nkh%RKx
ztg7N`Cb<#>q^I7m3q^@gK7)wLV><uFfsRUWh9fT=n>Ji*ZZXuKh<^-NJ*iWy>9h&~
zU>Zl?81y*;X673ffaQX!=_45{UPIDm0{X0&N_f4hHJlN|{kJjya)3)<XofJA2i_Jd
zQv)mncw_o^V`Q+?Msng1G;h=GFMyO5yR?lmlHw&yQbNevwa(#$`dtAF_R+d8Ewk$_
z?Qt0joWt<f@f{cI(ZhxMwy(MJsXEW^-jH-72CQoUadO2fQN-lgOCEtFp!zmGDx4z4
z&612`s16vmf%(N0OgYwxw~xZ9FOkqw#>yY%5U@OCu3zcRI0Hh<Unr;tLlyl-yr7L(
zdZSPc9i@dfW3DWF;o!L?@5Ykz(&H5sQ;N@RWx2QQd8oTeO_I&$a=Mr0fMOsx6+z#Q
z+)KT<>M~UHnj=<C7l-cf@XLllp3|PF%`^lhyYNBxhG3VXn>9kQB8*EmCMvJJSGESY
zj>^9*;2NCC`|jPxS6?&DTCu#EFKYl%^b7v?B$-o{&e<j}*3)&3Fp>{$+p>r52fpNx
ziDr~%XdYi?+5XfIw>N(!i7WIUyd?ODy5In5kU!?ImtAbAu}oEL2vu@Orrx3DT}gyK
zNF=4b8LDoG%RU<Zqs6%q8YedPIns=XlBmG63HmVZx~9e7Ifigth6VqFr0|DB?-afN
zSkY7ZtT#mA?hBLE!zGS1u5-!iF21jft#{1XEf&rxzJss@6=i19w{JhfTT9Sp5_{9}
zZADrX6L>YM%X;<~FD;l@pHq{VM6l3<rl~(7LCzd_!jX-@Hrw%6Rsrco#G>^0qx8`)
z2twQsND-lV5VjzBrB=yLEuyqP(@~b-83|wg3O(RZyQQ$=OGMLa<PMDOM^eTdW_}UQ
z$FI|M4~ma~<wa#YUr{66EpWazT77}rxEH~{!@57gwni9oeiC|}@hh(=fBD;TC-g`D
z>vFH3TxPvamp?yr_cvKyP60BwL-PI>SqgHFW*Q!#C|CJ;Jcaf?s5{yU*s%bRodFHr
z>O&)9FTy5!3jD&rV-B@FN@%RY$yv4KY>KR0UML-ZE|*{>SO1_0GFnw#2p6r}<dMGT
zhXCH|6IT=x_Z8q0h<+j@>|v=D5N0l4+3$&*b?HZ1%I6;!O^g*uF%koRpBz5yzh9Sr
zV*E1TyttAtE*7siyZO;)b<i9UgU`doDFdL}bp~}y<;XT?;$N}_CaI7SMvJi1m91|b
zS#&6NNA&k!uJ~ZW%bF1bg)5&Tb`dzO$zaM?m?o=YTd9&ret;Sa#2r{URK!Fsi`4K5
z803uh_AB%0tpSC95Z|G57$BJ;B8al`YN6w!t;9l(dWTkP@#F(pdrM#}%h^xbN;$bV
z#ypEgb6p7AA_|ZfinDK0Pe3JvD=PkUFMKxg3nJkY0o%~9%po&m5fRR<g~bheP|)S)
zb7R-U4*HOnzKTJ+O%ZR&fNPz92yrnHX$lFfCXSJhIlmmQe)(2FElr?;BufZTAG$g1
zt4(r_b5$dWL%pn>Nk9#N>Z}0-=u-as8pv?eEeU7;`FC;OUpxG0MRvjIz9y1nNy2YV
zKPe|S@I7%0Jh!(mG5b2G@+9Sf6-sphnd^XT_V0#EZpP}_GG2q!(f0HYt>Pr%52-F1
zKb}jLJ&LTbaK5F$g~TfVxW2Pc)8j6+Fh#^5>F-howM80ReEPnXkU;Czgef%uDi(nf
zITV4;1uXzA%gneIFFyUY#^sO5V%cGmlGT1dF7JPu<BJ2Dz;o&>rLAMd9U?$N2p*^b
zF-+TGdh&S2iJ<lpfYkPt96S(LKyCTN5)QO@QfJ!47N0iRkLAHsl(e)OIL!OZwa2==
zooar&pm9NBGym;No)g!+ZkzFI`z}KlL~139$bQ*U{?V4yO$MF3{y1UCc&h>rDm*Wg
zDHv8MMEnu)mRgjonE)6G;XyWa@Wqb&&d8MleSKFa`xTJeEe!{qTppwRb@nMLU5E7^
z$&zM#c)G**Kw1)@3W0{$^mLSan1%9-OFKm-4MPVVqP=RqUeBdLS<Uaj%|`fR`A?qV
zQq11TheP7k`@qx%0n9r}>Ir=O6gEmd)g1&z#wK4IWYRV4kdEwOcoQ9QKYgZ*v$vg>
zx08a+TR!%HcZjnZI&78|i2g0?GjZEEH>f+-3D40MlyS;hnkYb-1fcu4L24-53g4lY
za3!Z$7gf?su8s2dneW<=f-=#oF0Ao`)A&poX|ZT?B=S`DO%B7_UG+iSG5RurA#Br~
z<w@iIzfi#164bi^Ituu4$=fj(@Nl^)1OQ6;Wa%R(BUT(tR4lw1@o;2zQekSZK0x9`
z0mBm#WyFtFh{3m2kW&JZ{Gjn}oL^6)MnSsWs*0WvR^f8=sFli#OA#b!uMx^dLgjOQ
z!OA`ZD5&>|3@T&rn%0OQ{R8&I7sMZxkxfGB5nh5<CM0s$yzCe;&XHdJ^pc2(NvWSd
z@S0Mo+-kp~1b=bc>f|+LY=)n0afRD?B4jF1B^ppk1$s{RxBsRNwSRYYP*QfcA@cZ*
zBi4o;xEv^AapMnYJMtA=XVdrWa}dX(yZu{b!DKz;8=9y5t0hK@gQ2w`=`2?G<QvQB
z0Jz{I4Da4m8D$*M08Rl+V{LUj(&_?U|00TdA28fi=g14|eHh>T{a^)<H6RIokVJOI
z^lyK;)2LKEOQZ$GWoY`Z=v7OahA0I80m#{ql)OVFQ~k)NSTMgrv!Zh$+rB0lgt=>k
z88kjuQ5m&AWr58rM}oYG(u63+`c9iMaR*&q^j@Y;dxRwR{1b8=FCv_j94M6y#N<F*
z8P@`LC2i?PG3!UE1IP1;w2;myG76y_T+k9KKrdSXF$2~vYJ|TWVK^$-moP_O7z*ai
zS57x2#u0)@Oon3Or@h}qou{qS7I;AqMxS#*IPU`4>f9sH$O6&$${dh;84TTxqEZWN
zGHA=(a`;Ock>2Nwpk7Jb2eG3&DqPrx{~@W+0dVmj;MHgbWb;A6X7yCThu_tU){1yE
zcjdM{Qs2ZePQ(IBg9O${ZTC-RgRnFh3&!-N-Fl_-l=HZzDBZ5g_zZOQWjc5O6uglo
zqYlz;?UJyFfoJs_I=t|g>(K&Dr?4RwBe5fw(dZJwGb2-L-OA6HvN(cJ&Wt4BAGJxb
zc`*keOE28RUNeiJaC-WbsyLmaZL-g)B3l<2QOC!q?-&S6<61?4m++h5P2gd$DCF4x
zPb0Kg!4e5W)N+3&0b24k&{*N8NBU3$i&?CM$IQEfPEIoLW|#!O;}=5d*D{g9crw7O
z`g%6%<qfe92pWi=y-r%b5x<Y)`97!!zJ##Zzt~GI0ou5|UG0kLECw{*^?j;m9=eCX
zt$P0mT9>hjTg#-cJQE&Z$XS%Am;<F{iM@^oY2Hi4`EL3Jxm7LD^~Z`3Ot6RA^R)H!
zt%hG&JPYBeVq&OaEE^-34TK`ZAksKPTI`f~6H;;m1XpH5EUXa!*5?-0*khQ_CZl}y
zG-BlnYUe7*=$+DY^#-g8NbITw6x*Um$I^2NL58j#+=%H_+u_y-f%CG)#-du`eKfk9
znTkpy-pKptgUP>S>7p(1T2mK%BO8f_l|D@fDCiA(fb1G2$eDTbCE=#g<G<kC3LN_q
zLoM%mB<F;N<<I@v$#Z%UZ_h`22?QZYz1-+8k(YkqJD_k=HH4g!9+AOVG?4uTK{sRb
z)BBke&-$dUZgu|meI&H>3J)WQ@E_=7!oNp^kIb$>aR5a!3a9tzB{YiLgOsNTsW=2K
ztpOVpxm6%Qg#95;M?k(n{Dy_j78h>;-*$}r#iXR(Eb1ie!NbZNiuX+|<CW!bm&&0j
zU`cFHc)6Qh_7Vh>t%iGB#LOVW$Nb~J9Z<oMo+FP<POKwf^@?zgiII3L;_5iZyCue3
zIK&qcSh|7PW3o%O^ku|7eZW{i3JOAnPTIFW3QV_bnlj&eF;i)D<&K{zW#o_w+9#A#
zf$7Ejr)_>!f!ZWZ4igkdx&OfI#YOAAnA`f^(*N#X;R255D@ph@Bw_Y_w-&k6^SrI=
zhZ&1h!jS!~?$n9=@z0WQx%ME~F$Js&v3AT+v1O3o5$BHyN-h=o_PPMFv>phv{gg7O
zsLM5{c@MyAYn_+7hR@tS7(F1aeKjMYf{oXhJl-DGyNVY@3VZwlB(CmD_j7(54`(AZ
ze#Nfwqi(Jin1f+Y4=G-|(o+*Pr4gJao%^@D7IJ3*d^YZLWU+nPiY+o<^ShZ?PI-L1
zb3c0z@vw2ZUfc-wyPXJdb)fuaFyC(W@rq5M*XJ-#)5O<N&WcwaIPXA7LX_tUKmW3r
zoDT!vmcWw8n~l?O0tU#$&ziw9Pf5yWLd6iEf`(_wT(*RF1zR9*#HzrVV@WH<=T)T;
z5VaD17%*!MZlR#y&b?PCF8xyR3Q-K%q<;&g@sBL3b+#!HZ*vxnNzJ&Tdhw?w756ai
zMz*Y)w^jH^Z&8cMJx9H15mpl%LKKA3YNFo55#uJ<O|S>=c*3clBWFY9DiDKdJ80w;
zl!e6k#uyVkI)^ogkXpiXsI0=1MZwA16~EDN#V}DkiAS*lb(OS@UR3fGFknX6FaK1P
zjL44EJdye&gUM-oDdghG#H&S_l;ESQ@j6rH>otf0HS3Q5hwt0;U(*%XQm0~bI-dTD
zJB~g4yV3-3=c6*eilMgpyy58<&aUL0Epg?FBnWb54Ze=1y9x5rJT<gxWg;uOKO@4V
zAu&TKXE=i0dQ>oVr(Z=_#o*U`bQ}HhilDepIXU6O*qmJ*?;D0<>@0f3c4&IFraxMX
zJ*YSEI1#Y=ekLsFw7g97J6-?aoShiB>+=D&HQm!uZ>My(Ks7D12-q+&mlP2^0-t{Z
z%#eX+XLvS%<F@@-3MF8-3j2}E1&3P%2S8Z;o-6wS*b>;BF~S#7<}wzrgSQD4it3AN
zonH2@ev6^Q0PCc$^rh$JQMBbxJ#-jAfXaLa{PPG(9_r)VPnXku*GH0iI;&ky#|Fi=
zPJzH_2LK1G*l=sB6g#^I!C?cbCqe?hbPhqR3tfQB7#JX@QEV`J@qt^b<T<|Tq+GlX
zV>75W;fD@A+bpa`+X<W-ZN7(Jf=rjF;)MTJsc8{xZ98_eIYUoNA1)#x(z5iECy`KP
zpr6bNeU#3M6ntKiMTxCMPfn)%o(G|eIY&(@$@&ehGC~??8QggGNvxtE!L>EoSb?af
z;WK6D0vP1dV3Stn66F0bN^Zz&N|Ndn&+${;+odqqyl?E8Oyw7ZNJTjY?IKo#D9F!c
z)EsZ?R~ZhM?7*b`_sDENv-(3ee#u1fjMAtOu`4T7{;iQ4Ag^NpwK4RV(&E0)dAQd}
z$lFof0O1ugfDSepL1BnbQjd_73#M2YW~N{jxp@R>1xj2Z>bDd+Vh$`PGeYIc=;`fa
zmN%6H`u#dk6#NP)Yni9ZI^2_CCeG2RkQIEPyl(;AUIEy=r50WqzPl0neDQxkJ$sDr
zWI{|$J;T@2Bc_zTL^C<bTSs4@Hhxi{{8PiPK0g%DM<1<I${(*ErNfHDGKIBZRE)6=
z!#RlNZn9J|#WJKjXQCa;BVduc!}$2Hg@qe+I!y>P`D0j+hFyB2y^Xel=~C`iZe)kF
z0Yh9Ew{|%n`=C4t5`6YNU?cQSG9yJ1bU$y{UfE~$@$5^eKcx(Rmn)EO;KpFxTvCu>
zm|<wDg(U5HHPp@WTn7}qIfEC=Gz01ZOuBauIMM^{lubP5ZPZ7yF^JyXZr`U!ECR3u
z82?GUaa#Y4(UQ~HXYh#)u|T!j?^%V|(6LN)M>%F2I6j4Hmb6xJTM=T$a^%sdct#*@
z=ERjfXO?r+rHWy_9g!XE$0{fl{Am3~`v4!RQHq(O`2h`66XcDFuI_2xJ5KEIF*pG3
z4)1Dl9pqOSP;!>_FltgD!z<9k#ylEH*G{>%j@x`XwhAEqDB}>fV+nWEdnDM?spdZz
z(2d_Ee=A6L4hxo7e|npKIPw;bS<ap&LtLGxq7ysB9$D)v;fn~hsL-It<L0>=iD!B;
zv>s+8PB9Xi+^&HgZ$&C7>{5JCL3+2>-lnABT{!!)@|pcWVzgtP6?(rFjS7vGp|{jk
zZY@&oo2C0|U$5X$PxBCO&sW}RKvG$>P^%zc4ZCoUM17N_XghZ+v_h1dr~Tt3VO|Yd
za{P2<oF+%2CQqUUCuYhNn78of_^)Q2Moe?&y!Z35`fm@5R2f$BU_ZiBoeDBo_~s_E
zF9*i&@?Mg7*DrMdXNhTiiO20kXTdlp-!e!-b-&!zD+}P{D{L}9y(c6q698=H8VeJ&
zA;C(|6<s`K<(yKPm}`o?D}?BH==rG{*qOY#M42&=i8F-s=G&Rx5h;KAp(aEu;|5~K
zLxXb`(z6NiFiA>tvze5lT3+hIu4c+H+qN+qP(Y6d!yoS725LLnUILC`pbEJymd?*)
zq?({vACm9tOpTJ2LvxnD?U!I6oXtC1m_F`|eW>qK{9}X;lkW1!=`w2$rI1Jr9UxGE
zeco&9eMQa7rO**_m(}-pn@Eldy5Bh=p#qT>E`9x)rfVd>44AWMZ-7VyUGp{k%9O#Y
ze{A+&Wf|bkdDVzW&Lmx~K;%#{lR{{Wx6+ecm~`#a2Xtrtz_>c{NQ(9MVZcTeu#~Tl
zN{wn!cTro`AA`;O(FIxKm=>3vRQwaa9uQnrXauzxyTuwcYTJP(BI{&ABHUqbdIRR4
z$slst@Y+{LS`U<Yf?y%4L*@K%P^CuQ7j8f;1wX^ikzi7;w7r}MJEAI+ekMRcYH$^O
zAqFB?eYec-9#dL#R`fpWsp!)ybKQpwXw-X@*!O#yWF^Di9f8DK)>DXA(K>)Or9U4j
zQ+rxoV+c2T0Zd5&ME93=ihuC1dmdmCY(UiD<|KvCGuqiI`lA`cS&X2$#*1S`4oxkd
z)7cdKCST`Uy4gamh3FzwHOpC(|3m!CP0cxcoXwfnBEDlF=Wv0tcTNKE<MoGn!-dI{
zmmdRlev7?kZ7FT@0ZNIgqOPv9;o`QC*DjAmo0G1!x*<?qn8p`Qzx|Q}0!^S$nR-C1
z?;5<#2Fe56k==%FoVn`_fe&qyCVrCzeJ-zl2cG?{Q2pEUAQk)!wA2p@WK#37S#R<m
z2Gr}@{5W$3+-GAnSLr#?z6Sq61bt_kkza;<JcZ|NJe@H#hO}1@4cn1i>6G{9qi4QG
z;*j*F1I1i#>`05HV<W?6g*O+jnPyr;zfRTOA7legz}G#eWUzj+x-|}AvHYCi?T4=b
zA@&CdcIj)`mGQR`vs3xYn>GHUZ-CNuM+OCVW$&m#`Hz{IbgN#=-T6>)Y8V#!no{cF
zuJr1ze%QU@NnQ6YLSRm<s<$DOVNfpKw{TG%+pa;_+96L=aNLQHq&l!Gi7FH(<Z^Bi
zdsp@lXD+Et?@=YpSm?Y8IWnDB^-V!}dNKcD&z`N*1dN4la2_!)ku0}4(n1#EQj_lL
zoZ;x%hWeRlMs5|~!LVma_T$4%s0N<}KIfb0&yY#j9%Tvg$_pPv!*|gpC7cSZI2qLg
zTk6H=uWc~q*v-6+Y><N&5w1KH!>c!0OE?Md712YUo>df+Ja~ej`W}K>Rt^q1eSS|A
zu9ulW4D@5bWmdBy9ep%kdnLC}4X2n?z3mh|)DXUwGf6e+ih+<(vNqdFsm;PD(O7JQ
zd^P1{Vq~z^)DdL1`mG$WQrb_OiPbwRn(J`QxKAcs?`Jf_^6drvK#mMeM5BYjV1@pY
z)N-O<e-!l{bE0G7jKUc|r_c?9B=kV$-IgervoXWAKlEkGs(X_&e->b8l4(*=cj1Db
zZV%mIy+y%+zW^|c6w3s}&`cM0dz_uEa*r-Efd-!qWAGgJdF^5cr-%l_Y2^ndj4uIG
znKI0B;?4g|HvWmQg%$+h2yOTZ^uSpE4Qb~9Zfp{VoU(Mq48pM~vy1Ap9Zn`3tfmZR
z<SQimB2Zz-C|_VDX#p3dOkHlpUe=Pf(}sbXIa6hFS3bf`*yAz}<XaJAc?%AGyVeWL
z^V!U~(9f<sQwm~nrVC=s97KthYP|QM)UtD@r0<le-zPxne*U&(|44>zkqOS|^u28!
zfC?t*cv^Le>qZ=ymDCfi;AptL&bUc!tuMyH#c(Ayu1h&%@tYnX>QTDG-|Iy;Z*dn;
z1{okL#%Bzt*Y1DtB8DuqO&DVmGV0`fZqi4L1~<hhFjjqLHyC=pc?S5lB8>FP9TaJ0
z)Fu4E_$F4(C0J%2z&H<A4Ixif{zEfSK@6%~PWU}-DciaPja69d=W#8WV0(OuwqHQb
z!W+=d=UIaG-bZ3`pga{lJ`_m?;pmv{fcN_b8NNz-&n804Z89IuM+$Z=R-WmBV%T&j
zk|4ic0cdfH47QbrF7q4sT42vIu94}UhToG6BW&#j-R3vH`@)7X<Np!5|6}p8mV_kv
zYt=nZP&Fd7Vg<T0R^8!Jv57f;y$*Jvs+NzGvVFP5F1;d2oCb{TG;jv2xgTU)len?6
zxb<9E7}<hY$SMQh@v}UmOBjFSKW_cZ`B}N(@pWQv>3PYV#>smoLpBUStMYJp^UhM4
zRMTk!qy!@5^c353!l}OwgKx0jq0>03%kN!@T)&Ta$(vZhf23915Rh%EhF+D9X<*Zd
zKfF~I!-{MaEgQK+zolW2;C%8$4jqw%Gmd~Em+z3nCGvTM;s}*uBg1TWhRuS+zl6@{
zw9r?c8ZqoJ7~m5%Xj3REJ<en<hcBCZuS7ZJy^4N`ZCp$-M9=ji1CONt0u$cu7NV=a
zft)Mq{5T$j{bdoK$Ec~|{rlaj_ZHQau4X{%)|1&3%YDnIl9*W+2@?`niA971x^z6S
z+tR%raOeVN{=rCAH9r*iOiUwSL?&tAZlN&gg7@C#WW6^OYM(T@1#lR3=y%rt-x>E6
zq(Nk^re<bMJH_-OHb$Sd)lmxJ9wgk~Lm8@VGhyoL@!V>Ry;_gw4ZD`j=dm^0*SW{z
zo2#$4EK$>Q)0d){tOC6CG?W{9)89Fu(*H!0_qlzcKIh{64g8vxRDaa!5;8ga0mz0b
zb&T{1htm<>-0>^WRqS+Jc{;1b0}zM1j9#o$gxRM{s63rP`z}?PQq&$6av$x|8#Agu
z5S#l(?k)kLomtCT8yL&qp$+e;%f$ElwqUXj7bp8-?Yg5=KRL}jH8<Ft0NFx=$#Y$#
z2L~6M8+fVR%@I^7sKdJ;oI3O?ny_zwu9}@MNj{W{0|_Xv9xizhIQ#AoDh8QN{LH*T
z$W)ToQrb0q?AB)>O3KW$?eY4DyA5d|wek3U(P}e*Sb><NueeCN5(vBwpAJ|~)_X8Y
ziY0-Rld<_j-X0)E?>su|`cRWCn-1uQ{>}#hb_8&C)<Sp#^y=xQ9F1QbtV|rS2sHV9
zo{tB?SznP*t>)zRq7h~-X@;Y3*3gwcr!fairA)e?(u!-Y&^Grm%Wuz|%F5AL#U_lj
z?7TB(YQDV7Os4{eS=@bbXezEFj=59_tm74w^hz`${xObQif`~jQ$g)9>1=Oe=*UUe
z)XnO-CLoPc3zbx^{N)FMuRnr`Ei^&A7K%2zQ723@5-RCGx|?Q_cmAlJfU-a7Y89@a
z0O;iL_bamNhxAo?BR5>{%KNHfx*99on}dE!g*QRq|MV_@)mi@u2K4Ya!2(tU#P98J
zi!pA-=&}1U@LS_L4{qN5U~@dw{j%_hnUhZ4X!Ns&yOY}OFt4?%jdxJ+w&zd_2$*8d
zlCNgGX`$zS6|a#2l1cm$2zTTao-oR?xM~WS7i{DZ5p^wK3iQ=hv9!B>Ud507p_>^)
zsHXMSs8B?Oz=}x4huw_O0w2@0#dr>|wVvf1eaaC`K7OfdtQ+G0+iTx5EVVm#lxtF9
zyTG<t8)XOolpQv5wu{`r7-<aF^!d}sn0~)J)aw@37Ug!uDL7P)R~MP`osRs2A%Awm
zqf1Nfnh<DXdLv%)eORpK=HCbYkMRFjOMcNNKvP>&1L%9SorqPrH0sdjE96Gap)XS>
z=rfIrEm^p&%vy}7x%7>g&}&qjlroA`k%`Y0Evw;}aq_NLie<s0xi4g<K=W}wpoCha
z=<>lia{iT)ajpy;R%Wpr;UjggW#tqbvWHe&(6nklxH`C>zLe^=b~LenW(Lh^_pmhx
zMbh`#4^3d*_@s~i1G(2o*{&o$SSam1A;%!om`ASyiV7eD>5)h88K{ADI3Z(%97qZK
zaz{jG$|Mq5dL}DY2uBvvy^WP6iOQfW8>VMz?<_^`(Zt$Hh%gGy(6DA!NQ9h!O6V22
z($?#qwxS>%B|=#(GuCDm{UuU*<BJ%{5xaSX_IXe09Yw52sqr>9MB+U3lDZl6*9n~y
zpbz9m&3K^wlb4yP)bR;)qTj1yF32<8v?7OI|1-Oi;{X<Tf8!)<1SOO|FE-I(2lnDL
zMp3L;@3iCBSY>=)BG@<bM5c@x&o(5}K0^-g59XK3m{+hzWxHK0xai<tc;Hik79C6`
zt4}>#+!e`M;B{ejoe#Rs0m*Ss!4E~!&+{LQSh18aHKc7SpB&{q{d&>|wMnk<$vhn^
zg#{621c$QgFq7;s1m$wftA!z9;1#}XaQ&O@k+JnF^qMoYF(rbTsG%w!zEHi;CBS`p
zW;q^5%U%|R=vc)LE(C9~r;`;YbDk(*ZK1ZFP0FlalST6rD!X5L)4UH8WC;J-;^2+a
zk+6e&LpX$>(t;*}vV|&0ohcJ!G=20j#7}|01&0E((e-N*=z}na_9sKk0KqTxBars?
zZ)}S4My7&9MgEM3&j=?2u?hD^C;8u*k`HQ#7}Z}M(%}<PQ)7LWNa^6KUnIRaTQsUK
zPU_g>^nTMO^7~3(A0dJpu!KMpJ2e&lukgR3OFdkyVi@*{`JCVW(dv`<y`ROxW7>DN
zY-rCD7JB>ruqgC=vJpq>EvsAznbk!~h9~oTtt%I<^OqgM4D;hh7Q>DzJR2!=$Ok~n
zqj167%Dn)c+D2`G>L3}93Ith^ayDkwd8m!$R`HpwmnepE<|yD%S8Ad2GbRvO!l(D*
zAEpp~YS)x8398N}9=KmI9-QL+CLOVEDT(>jg1Evo8MyRS{5oye8U?0RBr5Iq=s7L5
zc{cjqkneB$fG@{Q4&&FCn_(uLR;Rd+uE@?27@-0LpXIiKsCzH}StOGmm}VGH<Acdu
z7^Uqth}dAs3)`N-WSnFE8=o$$FH~;QyS_m*Y+(d1F6)DTtu;0qnui{i8E*96T$SLo
zA4@)L=j~dA+zk{m&=fo!{XG9lqndFGBv5n{b4dqX-`}xlg?JoregU!^^Tk50Z@O6^
zK0g7M##Fu}N)Pm1;MVm-j+g7P8F2Q<zg&yq%}}JyVMyQCImsH;_l%a6jd{1(z^Dji
zlnuErcFZ(R^Yp!AuSL+nBj}YGim^oVUrCf3rJ6#(CiPNmP_mn~=(B!94McGut<d#z
zC=XGPaxJa|X7n4xCx~pTlmZhUyMJDUu6hvW#W_h_`c^`aI2{&{C4d@wm9S%J{&-*V
zXdm%+!5oI$z~ZeF6bxLoYlJ(5csul|L`<jzO$bCN+*)Ou=fgE!%uzeo=H^#6g}=C7
zZxW$?Nkwl<bituRmEc2VUSQVQxoZwbwgrOjF7-k1ct<2dx8SGYJAey1ysv}Uw;zeN
zhMYQfNIl((Hsp6*{fPfcGL(SJBW;<@#x2mz$koit)%>|4Y2d216tJ1sX%mpUO@8KP
z4q`(o#ZoGu3#{ypJ07ntzy4N{-quXQRl|&~%ohjNxd3HG_2ZWvaS!tC)@DmYe+Eel
zk7iZFer-AhuBCXT05n~l0KA{o%S~}xeNc@fxB75*i18=S%Pwwy?h*XF4;Wf4LpBs;
z{4=TmVF~1qoY4HWfB&;ukw=0wI45l{N^4^i)dMlmgPOep?OU&;8q3?8s-LlBHNYgb
z7wO(s5E0_G|Jm_*!_Ij$Iet1hc{n-AghGsK=#L0!5n^yrl)}RRGm~k_XbM}DBcN3T
zwo>EnF^2ec;rji>-RgDW%GH;<ZgX+3&9xM1VE=u8&mH%JPNu;;G(z>Oh{C8t7b*tH
z3<m0QXI3rG<oPuTa2=#rgLD8oH>9MgXRCufZ|pz+gv$k-aSoVtE6b;fhcf{r-HoI^
zYl=~W4HoRA^uz~<x*BJzMcYKupKGhzXesMy4q6+g637!Psp<5Q^;#WB%2(?Y#{XNs
z|BXKWO0tYZAe@)>Xx87?xmZ8u6<pfuoUiQ`_T3#d`?b4u=j8wyoF_%mihlB#<2GXh
z5d($!rVaN6d47H}KX&jJlP0>&%=~}=E;rrFwR`XYSSx4Ex4rt-&A_*4m9`WQXL9O~
zBJJx-+cRT{R(sIn(eUrAx;2ScCoALbAy-4=EWnQIIiA-=+330I|8!{R9vXI(?ux^k
zRs$tSFF)cL7}#Y0Ebmtkl(DB`e)n=i7QH8otcRU6K#Y(bM+uKVXTNpPm)Xs+)52+y
zuN9H}=QLv^K{6Ukb?LkMulNov=qoOh{Km}_e8#D-MCtHU!N&e}=066?ox>A=A(&vB
z_hil@5IiQ-qT4+F@A&vX3my=_U<*UyYaBsO4E!SS=;U;=+)-seyInY`b(Nk0sdz;4
zEeNgBOD(dPu~uFvM94^6g*;a6OPaL*q6}-_jV1{!4656$GLxK^+_=1@kSw?i`tl{{
z;vxu{AR)<@B)_@I{Zf&SceURJ21E;90@-0KJh+%2e`MfX_jsLudv9Uh6?)lR-wU|l
z(di*aBZPN|sKMZ<GG-GGnGS>+69&093)>cx5y?jGEE$0#?FX5ihUcp#<AWbAMMwAc
z7+SQytpP7!+_02?Rq^PTzC#)K*Q>6xA*j5Zih`8~Y2%IPXI%FtJ0*n*V4m{N<?}zt
z#u9`K%A^BvvmT9pzIV2hpMG5+S!3|qWp!Qm#Q`cDR2qo_5ckF3uqc9vIgcFkzIvT$
z12mQ7-SuyYOBby>Q`j*e&^1Lth6dqr7Jma`^uWlEd(HLc0e1reu~HvBehh!AiK+`$
zw1IuPz;zER;pY|O<X3hd6U=Tl{Ty+W^RDU2uFIs4J2H{mgokhJEfr;<oL(cny3v}K
z4(kZL(IY3~1iwXQ1RCZ9-J%YTX^I+OT$6r6zbNj<gOT)^>WJlwFO|fC+t*J;J(r-A
zZ4sK^%logaMv%VF-TnHypIfKWC7z*s+Vk677FB;vMy}^sl#Cg8PL_}^fem@qB{DfE
zQQeB=b-~W=&=cd?ldqxJ^LagrvzvgT06TkoJ42?io?w9u(k;LE!F-YrXe>ts7#mFN
zy0z9a<&6{Pj-Bev{V%yO1mpM+w2~0qFn#Ji7jk&Ys5aoDBH}|4xA6#|SB7ZeH;xyZ
zz*&0EG_!k7H1&iqKDp{yR(z&pM_khV6#u%Dt-1O~j*_y{+Q$$C11Ap+PJ@`Jbrsbf
z1nz=tMDq{^ZffU`X#owfF;Su27x)hRs13qch}j~@`?q&Ry|>pRBRsuWKYrox-t}Cc
z&}=;3Ouy$b|AD$g3#Z30G|5t-c+X3*>+$LLEAbHGZ9?ocj(molHU!$;->NXA#MiRh
z2dRHx(Qze~P$ymz^aTN{Lo)J1GRyPb0Mbce{9SggHP@53sG|qfNiS@LXI!BZJ4V^4
zwcb}bfiW&%hebYU|LOpjKh2HXAQLKAo;w;graUS^p%-);(UCiv&i8k%rze-M?^?B>
zeK|-#lwa42MDCTou1pQ<c~e5S%~LEoBmCdn0;BOJfEaM&P)HFL1`wChRU&LpMTm)#
z?Q78c$OwZ4c=zl)J|8jp*Dpy-XMZOmexypBMIT#blq(NYVKu<P$}142zrg-UcYB8v
ztY&R|n6_+$xa6?UG(&!azo*rAyE|eLd^uax_xL?4?CGff35L%t{dkdw^K{=n{d9f&
zX>o(@E!0xI7|STot0tX>@P^@J``hL!9+VTNwUyVfoCleU^(;j9n=R+-KsI942R&zM
z@%V&I7W0DWXvwlRm7yh??8YjVscX`_OFM@?CO&#*KvUF7_F3vgfg}AT+QuGrw$1(~
zPy6o-qps28``QAq?RD=pHD36vF?a7P566--&-27zm}-`<%4gD8+K{k>X}#?I#J_J)
zdbrfV=SS+JEjeRpu1dXNT+uI{AuMr*j?G#l1M3WUbKr19(!YQG-+*hC8NRDFU{*2f
zRWL0I=Gv1(&J;xkNVnfIpt5{bh|%NDBY_Jf|CsdYHj8RL+f^&|v`>TLB-`e85U}7!
zwjYv{)o{HAeMJgXVh%3x`Tn}Fu!o=kQf3xuT@Yz)CgOp1g`@S8Fr#L#ax=8Rq<aG0
zvOh$c#IF}b03LN!4LBL}eW3))Z7YGtjg|98U%T;fON~yM$8)c%R?A>)9^_d$(jac|
zMSFD|mb%^8mL_W9r!hd}eJ?fXl(-7VCVA#3#zsb2Rv1{>MBfVwvPnA)3io|Z+U&^B
zPF^htv6d&ejI?Tg+f*}{hB1(a{tbe^@6w$9QLJhpZz{9FpMNkQR^q%r$OqFAnUEmZ
zb>Jh@jG#4|ins|BD?58d!j2X}iS`Y!&QxHj|5jT!O18!`rVGq)_dT-NU!Mg-_|u!A
zJ`A-;;-#5mUs(h;UucyN;-FtMbIK*~&N4O6w-BTATE^chQF2LEv>{+v_;%yEhGe!;
zAFh9I^s{fkfuad6#*KYtx?KB!Rkr5sGT|tu1RhAhYQX)Co{fuwN8n?7cdx@dME0qg
zidX~8MBGNiq42_9yq&isI!)#00MUw(I1(BcWeI(wcbZY>=y3>=-L=8%a1T}6_>jS`
znurG4B%}Gs4ZwYFe>UjD#~QUdK=lT(7G_is=5vgOiP@2R<=b!8|8H0QT_NWnBqQCF
z7?ytg393H~FR?qiJ!5H*`3pqCRAg)uWD@3DlZjCq=n7Qwh73oCy)otqBHcE0NLn~q
z*vH#9p3#`Qp$TRpCXRh&xID*#H^*{4!28NOkeeHS?I<y8_xt{_T8%-IwEMoAwCq3S
z>N3c?W;C#^_N%dwc}QyK&!3uIrgVd3kUSDMiEY|Xd^HWm*9KizTK7B<ezN~vzTq;o
z2!$+gSRGwvmP*mUY>~LnPdbz^t=H7ch)?*$im+D*$bDu9XX^oP&QFn}>9qUPaldzN
zH6JTAOKQeHd`VQ|5`WWC&L6z>=8h2_EFqN=z!UvEn{oZ=nz@gsx;Fhj;Hjx$(}FBL
z>t_113=_$f=aU9t_?sBSu^E08ikcF(Zs0PaWQ%mg&XQL1r}=MF{ry!+w758ai2eqV
zqbbaUKCTJXAm@F7xV3jL1387ba&v{TI7lK}b$u|CWC!P3^(h?5#V|?hsz&svUZV&s
zD^RiXI;~Imo9U9!RF0e8n+A8FN$9vfHn&_E`yCXGE5b75MEtUGrMOss;Gk$3lW%jy
zH2bXIKijGb9c|7C5ZIg$B7c!d1l=wY^|uO&iJzPJqR#mnS0$g(Q>*gw6E-p-_w6`L
z136p<ob=z1Re_Nx!D#mTa@3VzvLeTnJ#quvkccvfycIDnE~Y|k)QCD)0jW!T817X(
z6M5v|_P3r$*&0f-hY0-`3a`meKifP=$R};EH3$T@iIWD@U5XQfKsm#)_y<dCo6Ft2
zqIoPtIc#zR-@y^?SmBGhBL3{t2>c(99ggwAA16Ep?^@mejNDDKDELJ)&CpkM%WShY
zc_97zfl9;-rntFhf7>-#P!#q5k@c2QadykrC^YWD9fF78?vNmX1b3I<?(QzZA$V|i
zcWZ*XySrO(zfbnN_u2P5XN(^GyL+uwRkLQzs)EM*=WPEPBRnPeBl?E8mM?91?Wbcr
zJg$b5Hs{mFpm0@2T{kDlB*sqA>AX&7Mv5XdD!;?#p9H$f&)dK#jtU(w1N}ELoPJ9e
z)lU2S1XZ0{C!oP-!S!Z|@Y7MSC9s9Vk-ESigV6Of(odipDE7Z?yqn2}u|{tL22{bB
zWELgQSj?~aB2<$l>GtYuED_e<lrO>dxzwS$;X`I%i+RGG5GhrVMVfp{UvDB`*jaGa
zAM<yMIJ3=2FmBzR-(KT|HH(Gl)^4fB53rK?{v%7ctFd@m4dbKaGv*>}#NYq;-&^r%
z0hI-r_^F)XaB6*&XP)eEwYV(rYmWH#u{c4=<-G&$n2*JK*-ZYlbTuBR$(of~6&d(8
zZq~LF3{%AD@A_j~L&-$65ZJuSBQbr2wG5$OJ|v0o1P)=u9)hS<d3{J6n3Z>T=tkIv
zPd@P^gpC$>1|Dr!P4$3$+MCUIBs(#J$l9<WGe$w93ZtO%YeTJOo0kDO9Mk`L3J~yX
zpYO$etLZ0zrG62JvNvs%NPjfY8GbHm77TqcGRX<Lz)WD*0R5JzwvKRv3j1<U<@$RO
zS?ww_e<ZtJFOE+GG>W~5z@Q~PT7_l{z>kUn9OQVKntp=O^q@V)VLz`uHV5=?+9}iu
z9~J5A<T!c5^M>4vX>`A5@NB?n>Ag3ek&3nFobB&Y@~npP#Ma6_jho&g717qC2h7sA
zv;|sYJXE>>DJ(akdSnNg=uzt-G~mC7{P(D1Al5%aCrkL}XLqX=e%2}ctPWcf<yS43
zQj2q3TeZB@%W$N|bx>J8PJSfX8U^XR5PkINlXe;^Q&xePqBF%(k|*XCjGl}usQ?8k
z3(wCZ-fO;42uxrW?!_l|NKd+-H@$d_mR-38k|-=1b{R(0zaqQzH?Mae$J3m>8y746
z`MA&+!3)u90fVuKBfkKP%~<eba$EV&GXP%uUw<Oud;T7TY+oe4cMtQ$dT6D_PSN^t
zk6)S7ct?1<U{n+9HiO8I=!lT5st;xr2X$~@xr#QaJBhdXu}jSoi}MP{LenK<BJRL9
zsrh1}Y5@A9A|7!PBC$$_`h(!a^ta7ETy^V}pCRo!dpK`drgF!-Fv)13=ilMS%2A))
z`7s3<1YyH^6Ob6Ry8IydlTUJb9624I;s5VZra&Cy)eO@e%XT>49$XI^^vf2rdYw?2
z^1B^bT0X<3BwSrz4{p0|`&%Og6A9TJ9b6+6=VLA$N)}d`Re#mt#Y9iHG&=r*9AZyk
zvog76Ho|d!y6mvElX7U*bR!UtsTd?iy|mCQvVUl>V5IDnn-M#xU)zoiIR_>OAJ1G{
zTUmOuyR=t~tOV<HL_u0Gg6N?pcO{8njD2gviiyKb3`SI|?m79ZyZzB>0x8E;Y)!le
zKL6X|{(IDbv?`HAQ6!`T^nUQsFsg;qYuEZ)7EK5AlIt2JEE0|Ue740AYu6&XBmNO@
zqrk&+@dn14&tQ*4I0YCh_}x02<quU7uF&*qtOAKlOI9J!iK+P+G{MOhHab!45#i5w
z?@}oh?>`}_?tn4*5Gj*o5gC}3VFPg_)mZ*QTEM&ggK+(z@6n?HXtj~4R1njL!2pLx
zaasPJDf5E`OLz!9*I@cs+wYxWdW602pf>XtcNCG9>WHzpDK!Py<v26_dXS?5&)mcJ
z&lL)cNGNYp2bRrby*~#)<ywD@PIKw;7Bxy~_SE$JfN+6NMM*)@V3>GCnEuprw45Kp
zzz_5diB7fwoQS5v-)KwlH@f}jO#-ixG!wom73Z|q3AS{ekP&u?<0jdq+UEB5X+4R!
zc_=<6F$%&0ufpAK)!hjSvD<%yIYePxqA0t2c4n6WX3koaEtffO;_ADv6j$NIrF}&&
z{FAV?Qx<E!C|4PpVu?+UY9vH=h!Uovrbp7oV*x5!XEHE9Ij#owogV8nISa!)-+NSc
zZZi>*nA&`LnofQzML!!kesNP1^Rqy5;PC#9aQ_AjZ%=YyqcJtYU|On%v&uZ@{9OHq
z;$o}d#J;`swb#w1$G#nLZrT~ZXL6v3yb}Zak~=%14G+*R$241s7!UT9O+~7Usv{;H
zF6MtFL~0WDSn*>BB?BfjAypZQil%lo<ZP`;8fjD|<FFUNxK%`>OWR8ZtFuDY=ygEw
zZGwoDmaC>6WPFhtRRSOau7gDjV8!$N(L_8x+c}xLe|A$IE*L3ihGy{lmyx6Y>*_%W
z7uytI!<J9;G3iO2R+gUjw&NFTUb)|HPl)kX*jRZ50eMnce!u4ojO%Rp0*0wDE=qA+
z>>#G@^Gj>=>vf}$_rvJl>}62*HA=bT8FuJz(jw$_RT)_4$)HVQx*uK8;pp(;^X~_J
z)$E``@W`mvSwE{2)?`mJvNxUxd_I+8jyPLkwPAs=HCFJ0JqQ_N7=3A(8}=F{3dgeC
zdU<hql}kxuO@bxS4X(#{&k8Mi@qqAWOdFZd2YMcEaw;+^xSz=sHT??Tv#BQj-|OH{
z{DhfUR3WWdZrr4j-lno@DrjgrKV!tGX5i@&p7>etp@ip$k0T^CIk<;+^Rk<%{cTYf
zpj{0%BGClBcFUtH+n)xH&wcE7N24n`t}exWUYCPM%2QkT4=OD_%&=jsQa>89NO^k*
zh`n#j+Co~UWe!NOudhW{2HjeipOG;;)Yl;ag*0sT@1Sm_u9%()>D2>r?O-Ki%p%*U
z!~w5Rc}YZOFqcC_#Olus^<Ocmtz@|qgA@^T_8UKls}y!1f=AGoQj(YK#MEGP-}uu|
z|Br2iz*lW*VbHf+PT^N&5uYjG6}bK}q@Tx<@09jl5phYv((~-9!iT@$^Le)abA9|I
z+b(E#6uB0ldMnlLelbG0O`|JhcX=A!dG9W=*HC{%?@<V5GhzDW^*}CP0X}47+c#ls
zJU!vqqzx9Q9#8K?W{|uMEZ&%FzDn|ZHh>Di49gJR9^Pj}Ipf>d%(ONm{ZiHei@%r5
z%PLj2z|W`1#s#~sBb+448aO6p2QBiUP!d_)9<zfu#kdb=0n@!x&G*tEh8fQI(h84=
z4re^Ls~&b+`&r%D?$reApJ4Pq@6;dxT2ebLIK)S_PeLRqTXt^*=0|7e8-Y_z1=*9h
z<HjyD9=+YxK=HiL{nf$c{Ff;0RRO!=WALsvX40pCei<z&l-Gms%4tp;<#|??1a6=Q
z8u*MS(8VOg{MsgbC&`r<BAQ1{S;<Tp-b7Vx%aPPfwPM~yAo6><M}etg!pvEq_8U24
z%=eES=SidN`)ni9czcGw_p^yRC3U<J*twa{8X3up!{M1aU3{2^K#_j~KE*pBdC0^8
z{uAxo7^T0lm9(2ujolK>)>#L@d$zLc86AFJ;fJT|NR6<!$TWq<h&^-Zt5Blbap?&n
zq4IOiXMoobN`$I>4>kzVecZUJjLPtF7>`xu>tl30>s(;*&OQd`Pj0J@>w29>>w3q>
z$(Q912aFvp5up&DS>=>7`I2e4KQA9zN+jUPQ6dq1FC$a76lJ5(ar%tI_&nu55<|ek
zQiOC?(FE<zg60-Q_n&}pNdeEiU?XA40>)fitsFOeMR)7@<*Vx&RjcaHvVL?{u$8<7
zrsS0QE*FBv3mL1q;|$p-v@*&B6HLh95J>IcRTYB-f`n}_#_$q}fe<PHSsKPA*ECm~
ziA#G)YKt7}n-gkmsu(zUxEhkrE9odti?Yu#pxHGRREU}HUQ@vOsbXx1&<H(FuQTet
z9SjWHIG=Uad4Qnrw>okw(_5a;>Rp5$?!zk;xol=<Hm4$Y*%KqW8Vsv;8~vy<*d>Ea
zEMM2i5}B`Z1{uO=K*M|ezlrgnD&LuK$SX&SY5++{r|g=9??0~#W8;Y){Ou`d$m>}O
z7DR-Vz*LI@VW~|Xkc0GD3&`O;u=HS;SJ+JBQxfLek*aJ=Q7<r)K6F$YBukqm&pN;F
zF(=d_uNDP8<7Glcq(7D#*J+H}lJuB?9h^{zTL63q+fvS@l~cHc(GM?FCz;iM34d{e
zCfNQ6>|FolQETzXetnb91h~ObG$Ehu7g?dlD=ss9&3Z?-_c^dw=z0?9Z!uuZgwGp%
zyliH>@E2QRV=mWURq@%qC35=FIw9bK3Lyq!f!Bo&-;+xQMjP-(fJ6;l$Z4yqy7enm
zTY_23g;<A?@KpsTk`mLe;}~h;TWP{zH;L+pLEqCPLn93b^#1;%hb{+5<eezqKguB_
z7q}#IKZZ#9b2uODg!nuXHk}ck`#9g$-|^k)@;dFd18y<6(ev>VcRkM-%i_Q`q8YJR
zI!g*&^rsMng4lb0No&FpY@Tsrrw&q()CuHX7%`79|9I_yPI09qW2DZCwYj&Xdk_vI
z(&O_7!RHI43%`JA2z$!E+$87{9{wVrcD)y5NnRBU$J5k5BCxbd$4$Y^x=zQeZMexx
zXE27IOt}pA5Nrq|w%h7TgMn_K45{<J+xBoT4e{ze(D3&sR;xMt(en1s)==bsPF8aS
zK%9*4^f=eQHS-g`lc=hqku}`kOCrEi-oQ=FwM8vt4vcR9jIdZC7{`C1Q>82Hy9umr
z&?JZSrjPzSHDgp_CO=zeDw+FrmW6qa2AJ!@9MZyx;;5nQ?j!o7{eYJ@89=iJP<Qid
zFFT`Xf_zT9tJ9TjE-wMHl|H@*7xgZ0@YWFsRh<2zdgmJ?=LfOANze!mM*iQt1~tRg
zC#<@D)uMrZwZ(}lFtL(Acep@O*L)J8t-q{sL6PT%0llvdY!wdDV?<|H+5AdW{pH!d
zOZ&nEQ?Zo?Gvo9vS2Tds9<rh4t~Klp4m<DbzaslqHjZBYi#L;X2W`Qg%-sj@#XeMl
z0(X!>bfQ7D^X<2vOZWaA`X14}x8ERPbzuY=?BNljXzg#L)j#`2y4hbCj%P`;24$ve
zvXhN3)aX=0&3FmdZcO#kgx!Bsf=T|3<$wK~5G0q4F9{w8?8Hl?cDDf%^{jegeUdHe
zK&l{ZsrgG+K;r#g4_3D%<AXF(6a%9AAC-}*Q)V=o%R6NC*RUSSwJ!XN`jx%$4?XU5
zcs6;`Fn|j7qb<I^cHjyI!i512B=t1R`^Mdb8<Vk&OkVe`g-gW}DN>KagUNUk-Hvyd
zNz}FW!IC+4pSd=G6abTE964I%A}|pEVM1qz;_IEzsm9(H3(Z1aFHE+2wyQvxdjy;$
z3id|8c&GdMbf@QK^f{+-g6WYhFm)(c=@Jb^Osb<&GRsXLu4-LdJ0P+=z5G<bD<D_h
zZCRb4u&Ebk!GEF#2J!imo`*pPNJ-uL7>a>t#mUYx?CVBFx?~Kn+L=Vw861t;Acnp{
zWwt&m3(u@{=6F(#X=2UzSXq>J>*p<WOu#32e_^mI<oq`x{B=RY_Juq-T?|kZS1CmJ
z5MPdnYw)j;uV-V1;5dRL5gUT#B)AfN-FV%5Xkn5C_HCj_E^P<5h7vLLJR0$mF$EvN
z{J!E~*tZKUQ@HxRy-oEkQj~`bzr*!b=%q<a4;&9h>7)ShGJ9Ayx=N!?29{ozYk@Xk
zQFzEoAF@steq%lB3OS4xZX4H34ZDO2@+Tnf@v;AA$V&p^RVk&KBjmmLCpkywwYiA0
z=h4NW5<^4mPX=R&R?bm6T7E=~Tqd|1Mw>Yq4=FrBgJvnn4WgMNZpkos%vqsqjXz1b
z-JS2jmjGs@fMfY$_k}t-nuNdEW~->(p(-QRG~ZAOErYLS9UB@?Fweh$w+WW3-uV%_
zPkE*;QJDibX^xd!1+m}vKJUbLBCltLNVO7P^?YDp;d&!f=>RG}&Bahus>Mdm)9{4a
zFC|xMbNdjN7$-qRdD+<L91i>mJTesk&q@KQvU@fDCKY;YlKJ+)2z`Gg<W+6w5c^Sv
z<U88+Q%Xy*p58gP{M|)(FxU9NS}-&kKwA3&Yi4Xd8~q3c=CTs^`YG3bf`XKP=utfA
zGY(H5rO?}EfXt|sD~=?s7Ifo*yhR;T<Hrsn1GNShu1}KatxwR;l8HtT42jG8w%f@1
zrjKmp5)b8KC3O9<g2V}eXuwyK$KREMZH&<Yyv%c)p4q{~d=X*!bXM8y`*A3tNnC5Q
zZOJSXP4)pv$L`^qR3#|Hb4K=?j?l9$x5RJ=s7FKkVJyh%52?PUEO`>h#c`T$2|oOA
z9ZVo(b3~BkK9SP&#Mv&Xru?dg!kn6%me}{N)2xWwiuSBm-;f$-EeAdf(Up~znK6``
z4lz}HTvDlR^^g_0swmIDQFh|%VQnm1nc9leu<+=d`tt>M+}6NPUvaMCcJ+ms=LZB+
zR#6@fGzL-f#0DSAnm<J6-K)4z&g@@868Okrlo_?6qastg6{72Hp@qmw80#rP0xVRX
z9d$$!MV+#+#5o8uaT#_4bW-;VqPy<%WRO;Z8^k;9^NmsO?~5*!;DvYm?))_14CcTA
z4r#!dw0?mRwN^JDykxbAs}>u+|9FtELK{NA+;RQKc$UmTR?8Z}G23K<8q;s|^x4-G
z+3rIJbSgXuO3qKxG*DB5DHcM=`fF7YKdW{XB~~ykBw4)L@E@;G$^3A}evpy!D#LSo
zB;B}MtA{UsW19Mp9Q%d|Z3m{Sl}f6Ki#HCU?DTR6J(qR4rGnoDb7REBUdwc8MV2Xz
zK9=src2fEUr7niX)@IIYw>@=jZT^VlUM%;rLw(ON1MC;yi|Y#|j`mK_apJ4o9Av^~
z`jDi!1$jKW_sGLm(nH9>4rZAK@io4ZNtGCDlF7_k7^jUXSne>8!I=XVs+Dg~>+3JT
zN*z91+oh#0QUW&nZyU6F<wNC5x?VR<s^{-!dRgahwO=yd4#Uqoo_v4?IxZ(gKl_i#
z-`{p7=_<8=<uY$bOt3FNQ^GkCj-JnDuWslVVxez9Nc7ta=^J$49ce6WTbOfm`S`@a
zj_&K@tkBzo4=!UnVkg4@0#JznE|lcTAf`xa@<e8-bqPw!5`ub;hj0=)kZ?NEBwCbp
zQxkKr6dn?2H?g5<IIpOJUK*s+N%@T!&QLpw&=15K2y7*i=AE<7@A!~ow@7K4pi^`>
zuLw8$t*JEzSdaK+wn1@J)^OQvy>%3p{#Es4#3RD|B2X46X(IHHMI2%^#t<+O&p18#
zrbk1@(3~z%b>0Q?2Q7c>9mUL%hc&^Hc&22`%BySTU^>2)quQ-s7a$ibNNS)EX`zZx
z$7HIGFU)OIOA|@e-s*NXk6~(5LnpTq_a~S^EMb|B07^JsO3KPjUpy8_4W+NOYD~kR
zlprbwbW)D+ExO1Dok3xk)sSkGy~ZlH4};WQpxzft>-yRwpSSydp|GGWIdxCm;Iel(
zIx@c922*c$oo|s5q(5W_$JT0I;$?+01-)UHM(J0(gpSi(&{uP|SU1qS(2M0V`5loh
zn=7gf42)SEgEzA#zCm`_ZTEpQs!te<=5D=#wTrj#aI(SpCFU-!a6K4TfQ^OtJnyg_
zsB3B5&8~N32zsX`?+i@F>%Q*N-RCbgH6PSl%y&NQojZ?xmO%RV%_&2wIO$~!ST6>C
zy?YOC8l|S&Pg=U)qI2RJ#`2zv%D%Vjdi@4@i!k_;_89>tNS=<e%b(Y-tt#IuW`q+W
z5a$>E@IHM*h~U|)8F_KqZyrxO40>gjh8i@^y`e>ZNqz(soVKuZ3#`|Jynf|hJ!|A*
zB`GPLcvwl@3eaj;UzU|2|1rUd&j*acaRA<A`RXr*c|cHeOt{Rb)n<RYo8rKR>z6dH
z%k5!py!U%|A{3gdGV6*hDGTQP*+;jBm7tXHq!97jX|<e&+p$IbF<q?*tHdkZ?_+?_
zn1<4(rokbkx@R{kN~R#p(A7~$3MTRb%XI}<LN>aKim(1aHxkyqGtAtbP>_hKO%cD0
zr6+}+f)lL7Ml7O845gSeLlK^(4KPNQ>NwqtsKM-P6fMo>!x#c6QcjV9J@&^zY~zvS
zDq7=dCKWj*lr6gGdinv3;H^anOF#d?TG)i%o>|YeX7O-k970p?QZbJGt05>K1@sLl
zxWWWukB1>;Aha~uzc4FhK}}YiH2k@gcn>D^yswtpEQiLzTGDPO|D>DXR$_j%{05jg
zW>S1ebbt@W>8h7Vrsp3XrDqY0P4)cU$e|QnuhYoJHE&s3a7dxdM;lrg*Gml3WXO?4
zCT_o`5vB@|LvWHGFS1`h`l;R+E@KA<cBWt5I|OC`Qg5N-=>7In6*Rpgfx#PIAc|y|
z;P@TTZk(6_Ah0HfJvF}Im`k=0ct}{PThv9*wEp*-Cb;>Z_kBb8;qKJPK@r3OhP$V@
ziBQ%jJ1L)<?(`w|!ihb*YXHEK?XSD!0c{EYqc7@njaymtXHai~n8YVLBlKh_@ejZ}
zdgd(ub&Tys$`7Cj==;lmU4A^z?bzBzOV{^mvQ4{Bws>DmMcXDuf-OFxA*5N6oqZ&G
zbafBWE0xiD3B|{8(PS=6nORG=AR*%QI6T>d^YQ2R63!BQ`dQVK_3l2NDprH1oS9~g
z2ZxuN`{|=WZzCoo>?XTkXYtwhv9s(k>+A}WO%+5^(?+KYmmBy19NfFA-L4SV;43jy
z%Z$iy5AM1R`jfD6BIA8L34_5M&b5o54{QdxS+R6g+whjz`&tIcS0@X$befrbtA5Yz
z`w(>F?7y4YjI=$!UHG>O0R%>9{@BI(>tOEs@!)zZm8%`jL2R{1PdNZsiVqb@y`F*X
zrI+JAZ%=$pM%KHKr-ZDCpT7}niDbQQif20Bo&<e!T17p0pQ%}aY*}gPk7My{Nd0bO
z%`bKtedBPuaNXmL!u6eBt1Q;a=m<lQX5rX~=gsUq_AEmn8pS_MG6@{y>nnxBnVj#r
zKa7VjI@*k17&r4z<Y2K-BLoO+BZ@~HvVTCvVRfjY=d99X&LMuv2+3P%<T};ZQ~L3z
zI@1IF<DxKp+aiZuP*v+OM{!HAr5CHJTXFF)WsPmQ>TMU@MjbC~-^6F5rF@#1DT9)h
zvmp>NZ;6545#hVLM?#y<*FMck?e^ETC(>KAsFVxrkmz5o`{`&EI<2Uu!*-`jX{wbv
ze_O)0FlzbRa@O3B1<H1p(tvemb0EDv;ANjLT(WI6rfYkwd7O)wHgme%edIiP<U99%
zhn0Fl`txFp?_4)MZGY+5MtB@(HP^E}zxU#Y{fe!41(OtgL~|YjXtoZ>tCt?iUDkAM
zZ<(|(TK%)TPYn}6kgwOZLSi(QDqEZ3r{_0+qF*{~-ke;IDC>NK8cq)65v$bpZUM)g
zTUN5j_a27;syi;*PIaE-pmT$&diD3cWg`=~q}pQFhiVtaR<hs%c9GiNtE<xSiwuIj
zFeUgO5D$Q5e7pjXUwjM|x*D`WmrhiD@k*a|f$ioZ0+3BEDkvU6tWMk^0+cH`7z8zR
zGPe9c=-Uh%ehXzF9>gYv>loZZ(t+a2DT$N#?pVdRtapTjry`CQX}qXW4}Nk$_dCff
ze&TRI{SF|s=_b;O?XA{NQDc>+&lWZrj4;J$sU|vd9o8=keeKh-;2ej2-*8^j%-OSx
zvC*i9#gD$HRk3`+FBusmf5!rPmIyz~O@I!!)!TIwhPM5>a4taIb#y@V{Aak65q=*7
zge*mr%<HrHP2}n<TJY7;InuFPrY)e*9v+XiPHpu&^!@cBl1;~rwWwvwN2J?F_s8Cd
zb0PcfJ``Z!{y#3~5_f|Xf)Xr*ywRA*0x-wNfr|<Uj2Ir_Ka=Ey;SPd3RDlCaqng;L
zKyFwFL?fUMiYt2OG{Src!aSJ*F&_5mUwk#FXht|!*<bW?&0HP?wPQWE64Z+h9W3+1
zhDmXmB&(&t6G=heT6PHZ&-l?f`eWFrgATfJ7DQlHrec1aE>S5>hZ=W~FF;DFEtM}$
zCnO$JJ@eNZoEu=2^`f@b;L*9<zN%?@l1>`L$Yk&~y2i3qe<HA6-DZ(^3P$q;fYMJ7
zUmEJ@5=2`7E4)37`>c7Li(DAyP;v9a@M2k(tBlzK{(V*eJdD6xJ)n*c$O{giJKvt>
z);QD_7sp^~bu+<DXhM&af>ddy02dP|56n^ePh<uxm!z7zO2It=Ox5s#pw}CKsK#Hb
z@Ib^++d!bZ1KJAfEo|DnUl=x)j^`^oykB0>1S2A3Zm&_i_S5e+=HN)ZXC~^P9Ph4E
z9BkTO7#o!E&ZVw>wjVVs+nq-TXJsX$zZMA5zp<&`66v)xr`c$@3V)Tbls8?Oo4B{S
z7bYnKCCSkcRAYp2|7M`?5G{b`%=_VU;NW$>PNL^4asJ#c(<+r(O6t&mo=XlE1<;iE
z(bR4!gggza(0VR}&A^91H)=G}ak?^o`|F)ZLaq&kO{`BV*uz?Hw>Ml9TcmM$M64WM
zh%5Cq4GcyGg2-AiFz!5%un90p0CXY9kf7fT2J}t=(N~CcpIqSXq`|)$Wc;$WY&x%A
zNrfKh8?*Sys7wG5`}TU*37P%%|9^0UqhJtCHoY+D6AV>{FhINk@{yF~C0_TX1&<Fz
z{E$Tu4X8Sn6)@AH!gUM0?qMTX?;Gt2Rda$4%E~mCTc#s>do&J0)O`mX9T2-$*qFQN
zOykQX^8ju$*Q71LqbyhaSG#6iyJm#=#uvC~HMl!GzWEPL`L<!c)|@h%U6VnHx7n~*
zlj#{U*CI$)tm;_^H`v1~JqoH9I28kaa_Z#2is-|h)rN3p1?edLzksARj)=dWL=!Kt
z6|`tOi;I)W`=Q>sqS`8-MvcE+_jbO$tQNDeJ@hJ1Ft8uZO}0`Pga|$#M3=l!+25UY
zWHY_}nRQwB`s-zBPhE^4VUN<B{YHE)Hv4<><Hhls*z2B;b>BMv4AmDkEjo>%R*;26
z{kq>v>lAq+oL{F7#Q(Pj>mOl*w`;uKAwf<3b+X1IJwrQB6>mKEw#yj~X3J+2D=&jG
zvFLg{{mcsyM&QyH*!1E{bxYLt80#<D8vi8HK9>^-i{exO+6i&+m)M!nnH4efZMsGj
zEXh?Wdo&~qQYqh4VdUa1aT#BPCyw~mc@AgxhLZ}bg~dsp<ev>eqpDyAgANo`LmPc_
zI4Vs&ixJgi`0O)1eRH7hbJc^Y*9PD!in{GE;!T`7rX(Z+geq3t>oVALVjAbSk8e+F
z&*T58SpG|;;jM?R*Wz2H0wi|Hi?i>BwHO!QHmldM$-%y=6MGZfClfc|qG!G5qATA4
z2FO^qSM=uWYR#8!hwLrf3=txDIPCL{h>Ji4ix6h09|xOt|0W{pms(*PU9N+^6wJ;v
z&a<D;(^}}+m*;cpptBsJR&=dFRs$d#lI$xPdhwZ{yoz(j+G{mykc-ZDF<a4+G?%<^
zlctrq{#BYOnh!dZULP<l1Oh>2{09er5=w_WRpsQ3<#l3+kp8K2{w)&#B+ym4ll<;0
zqhCj>qavM)>i`A#Jvh-h+q%Q7La>-okk*$@hsO3YqxHJC>*-xmf$`ZFrNLZ0$UXQ|
zu#E-5k{4+Eqq&CUFyU2rNm1X_LQmP&RLhG0pP|&b;KbEls(S3%a<OG|4QEHLdPjg-
z=`P=EsF=IW7+T`YF|q2F2~va*H;g6+hr2zc-@RQ%`!M3~1$}9{nd3XBFcSWk)aY-V
z0~p%m%#vae$l=+kY}4`Vpxm(Be0!cJR+sy4k^rq<l6;B=!~n@QOJmXajpS9>T7l}9
zZWmY1a}i9)hFTYdrDl)!<kZB-4Hb6tw|~C;sHXqG55p)qMA(oxm!w)BC}tBHDjglQ
z-qxN&OVdg3){Vow=D$^9wR|i>KK&=0&I@Y0)O?v}RYW?_8ITj{8J%-gxp;OVfL&%F
z|9hUHA*#L{d*77L7?r}&x=wI^IY%<y;CnsRK3?NqAC}%6Slk>O-yE2`8r73n)iWwf
z<6>^W@E^cm-1T|e)Q+R!f7NkEV4r?wl)-E1?KbaRZ-rB%cj*4zCfy3wTXw$frP*h0
zntN}cDS52bMn1B0W}HYuUQFjmF{P!h=JDBVdjrh?cr6njz%)R1{eVFOoXLMhMWLB7
z5STUJ0<G%zLd?THodGj$_fC`+fKW+tTo;nz{{0Tv)SIELe7REcYhOpg>y{^aU*%G@
zGN}@%Dzh^Oh8#^Y;|!jzp8h3B7h*dj7NIIGTRy=k>ie8)adj!^ovLNJbtho1O<ERw
zdukVl(;)*r2M|kN%NhA`veb94C~x&(^4SO0S|n%x#^$@|K^5hqnt=OOF#uV~S5(JG
z&&`1FkI3vlQnP1Kaxj*Y_7Q;qxss$JO(GR0YZ<#H_JfiJOLFZ|U^26X0hI1cKGpN)
z!)>92m2BMO*F1ELL*_8Y7}1t5<X&R#f39e}*Pe%Uj|6U73p2dFkMfq^q{7}|K&lw~
z%}p5;n@vJ^v5L=6Kz}@1a&)pHKqY3ZzgC}+76}o2n`4-{z|hj@_bo3F>wVHocS2cw
z#Hv^-&rr)PV1zObu)nmNz$CbdkRs87PX1k|Mg&PcWB0WP?J{*A8%B-T+bM-8rMMZ%
z4kE6&`Oij<CeJTi0(v{uMQ%;I)bg~^HHDiUQuO~+zWxPYK$l<`*RCZ4Vk?S80;dpV
zi;+3=12cR-*viTL^66ak&)Sg>d``+<PM^g@Ldpsx^NWv5UyhRUHuGjmQ`Vy%JT*<`
zunXnQ9!jmXrzY6)$|>U_9FIF`GM^WbN@o!Y+lS$qy-};m15|C*v_9D)r<stkD?)$2
zF$KMCm^S5C-Q}@LwZHrZiRfpce^b85V3~+F(l=&w34DEZfEqQt1q5(!SqIJ5lb^Gz
zD@gnRO6w;O%a!-Kj`*{w+Ge4CK*Zzk1%4n<p!%Z3Mj+V$ijH|<M2FNV@7mJ%k!KB(
zQ@JnV_2@gNFK{TDBW3vOg8qYIfg(}>mR`b%V$Uvt0I#IB3)|r!GKLxEVOW;#Ti<@l
zzDR~!RHKeX`jq9qM`cO4`S;=EOSAexjinvHv<_v3NdH_{dOIKS-i&j-T|SJa={~pK
z*2;2rT-iSix5kOvmmYhyZ$*CH!j&)=dh2EKzBxg%n5{#$5rS`110u3tl%Ji!)fm^B
z>(vllB~Q!!m)-)c&evN&RL7|84bx<MIdsFdUSVardtuZc)p@-%Yhio*CqY%&&sw#j
z&G~SO&YmzyI<2woVU7=%Q772irsKi+sL#^$*QxCTwrSh#<4wDWL7!H5_GXwxWoOu^
z^TQm!oX^dyg}0x4YRf{aKn&1}0F8$!#@5_Au_D(0DXVyRdTN^~41M$@HWI=B7#1r<
zmS)qtH3VspvHO2?&c2{Bmd4-e(n%!+;?r}itP0cFm6I`VXZvHF?|I@RtSJ?^!+uJU
z?+RV!Jvo%ljq$LBGB#+cCAG+iygeu%+v?_5D9&rv>V&8vNoN&^xMhgClh65IFOf}E
zPyX1>eUgbvOXrcuNU8AIRoYJ5KNf5$xf^SyX+_FtG%htevN&R6Kcf`5*#ekL7y>zf
zGDFp|&+d^^vAw>;kW$Ex<;q-?4_2x;;s+$0P$o1Xi`TS732>{aA$Ufj+pD-w+V*Hw
zkYf4<=jVh!4{(2B5hRejOU1xT{DCegzCiC83&nkr+XC%g9vlUU`PS7no&+V7&d2lT
z$J53C5^0hAgeV<fJmJ+Qkd{`x9l2`ge61gj@3f^6I5ekqu84G6Gu<6|Oy9zf6TaI&
zq*Nde6NNgQ>YWp=)G36iK#DIi!}o{6Bu4~2lfPc-wHH7_B-ER`=M`o=uJ&b_STqV<
zu6I74>`7x>oQ~3TJagWpce3l;7j0d8XiS@Aa5YY-TNGtWPA6+Vc+R8ibuZFSICM>^
z@BcE%Fr@#Eomh(~uC5OGs^w<!vm|M3G+IbTxy7`0x4dv%=69yhGU9kU%;xPdWfv>l
zQ)I+&gyi7ys*A1RpZkum!|a#-pBqVds1@1nUw(@_AzTxnXp0ya<=AWyvckc=siNg*
zJ);q6J=5Gw{~rOYGC8=(s^n0iJX4qWtu|9UULw}Djcdy!PmUv4^H{PXcYoF0g*%A*
z!w}Moznf+T8P)R^?LlR}q?cXfo(9J%4@^G8#cchtlS*e%e)0H(b|FnH(#$<ZxyjsX
zfj*kq#So?yTqY5}1VQ>mDv7nXQQKvCl5}*2m&*Iusflh(>sSuQ^HV%Z-c0yL44xE}
zO^onS`<nqR0g9*!bn$+$=(2Bl`S{!v*W8qe*&)8g;pf3A%8A}C&AJQ8^5&L?4i;2S
zm3|0j$m_vmb$q#pM=WG0L=`UZb()RDCc57D@2slpp}8iZMmtkMevi}|_x$(MksK^)
zsaJFh3~kX3g17JSOh0X+E5PZdmq0)TV};dvxC$@fyu}#uE@NQL`;v3M53i1cs63AE
zUFhmWvs>C<ey5kH;Jc~WwIPv0RLn9S*BkF3g>C6q9|jIK)9+%g&SDj{4e#PKNtHOX
zblB}A{vWjR*QamMd;}l4vu`?-#!KW`V$hm!(2mOsFm*R%@p>v6HEC*AnylNkwzFAt
zl$&vQ8F|GsR9lmczr4Z#BXLVO8(vcy^lBNEW}F7Ha#P*waFORat5l?=heL()O{W%9
zkFQl}>Az+Yk$ZVuCV5axls{>Wcg$WN30ZhBJ~S6rs<2JXP&nf%h9=CqG(x9J_y^JD
ze3DG+a8B^^qh1cA{RwY0XRj&FXTqh5MryMT_61h~s>y+Y<b~w>`=*|}z@49YKWBc<
z)XmJWmq~q<l$MeHD)lu=R_2G~x6rSl(Lcf?L&H!bBaji%kdRR>kr4kNz}w#4qK6t~
z%^}0~M~t)JUi5fY`1WuAxwp*l?ZvGL)NknVr>V!%SWaGE)a2vgb8l*WaD9S)gb9WX
z{t_(O8`#??-b3?+idu|{Mx2I9oQg(_iuy}mzj#j{cv@Ik1PTQ5@_KH=zP(i{@U_*W
zIQk9GY|0Qx6|doj?_h;oY}_QE;aRCUW&=4(`GuBlI3xZ#fc9D#QiqQTWGS)x!{}^J
zWsP+if^&UnWGbGnCSJ{5IQKWLmNlWN^(jT2t)GJ4ULexHT5kST%Kn!oARbFkPMSgc
zsN`meekvYPh(^o<zre|AnBSBCZeZ3wjEn2GbFXeY+2z>r+pv<+y3+Q>X6js6OF;#t
zpycxkftB_U!HPGa{b&i|q|TR3vy+g0T{&x>MJ_oIW1wKLstHCvPC42$sr|+=U*mI(
zaj@i&Mcc{S-pZsW0z?enRMFcqzUQ>&pAZJR6sA*5-mk}n5~awxh8ngbD^}^hUtScq
za~#;FzJ=Eue++kFS9Lx&$2+hhUR!2iS#r|zS<eoD3PC;P@pNT^NEi$Vz=V4g@AJ4r
zb-6iTon@O?n_Qillb@df3YSVM@~!oGIeMDvI_}0FlbD=YOyHI-`OCQ(6SXvHWv$6#
zB*cW9Q{>2!xEIykT6u%+@B3iI3&aZdsQ0Z`l{C^7=N0O5bMp!t?Z-2gVzVE^Ci|ea
zrQ^4y;l2>|ha82#TEKdIY~lO1l!|0gTH9zPxgM9fwRu_~zK6$<3A5x&PCaeMWVDi~
zIi|d~c&<fkQMgjUzb-VNzAn*Ix{t&xsqE{f@8Mu!Qyj?@Pr-(+HXT7lqzI#X@;<Re
zec|38LDG;!7)dp|8L7hrPwbzZ;UAsk{UO2yFN&8maY+l~4O*vH-!X39vt!Z<MWOv&
zXDpX3PwSDXv$KzihNiv3_FP`U<4(cS@7SZG?pb0?j)3W#$KM(lv{#L?>K#qq?Tkk4
ztX|g)C>hd>?K<%?j{;w%9#1zpoWG<7A3GLrfKy93>QpRDODrm})%wsfthsHSk9+Dr
zeLZ-r*C24{r(Z3FP;@hFDNZdQ3%lN_rQ{eQFhHtkE-g0*t<)7(>e)m2D(03pEZHzK
zZwUprwyHC~Jj=SU-eDu#e<8O&V0$+pF+N~=cOfy~u{qY|)%pa>*YdRF?8I@tFgsC~
zThP&*Q_@ja*5azE?k)fIEHP(<p;vuO=5{U7k`!ir^vCgsecC+Fl%QhKk2r&)Vu+G#
z;(T<nxP_l=&IiC%c>_J8m-r86F!^c2=6{aT5SN!Eom~=dZk3R)l}`^V*ZAbx3oFgD
z3Uf^EZngOu8aS|Ll=rQfMhC`aM~7s7{6NWP4&|Tnry7SWsQ%<-lYZ?XX{Q_o6P!`2
z!h?IST(2wAVp-9vKNgY?0Lswno?4}6Hw3%(<LO`<lwYNK(VE6+%%8r)Z}v-nM;t`n
zJb|@o0mFmujJp|-gAd#H*T4LuW&XFK`CW7#M5RV<wT?EL?5orbW$czfpqn_;9!h)M
zymtw+OBH**b${?t7fQkn0+ka26^GrjIj71Db<!+5Y1ta5Qv2=QETw`#n3A|V`Ibv3
z*UW?_($<f2stjqJd`bC!992d3`bcl>ZLv5(hgi{6_eV5~P*itz6t9+4RCV3;ye#K3
z>$g&#fI{u-0SlE<i=$}{aLl<Zv>KqD_x8VTofVq?UhJ?_z>4Ovf8p!9vv6>7{j>Z*
zU3nQP^{C<8vi$6~KiDey<!o7ib4oyPj!$rni*t>OcaDvJsokatiKxjXtG%|dKDV^E
zJh!8`yrrSIt){}z!w8+*cC+D^zg2Suql}JyRHg97_feMytc5`-1|xE$=9Hdq=Ef!z
z4t7fSO|7s`kG;_11z%`PsEu$6a1)G_XZE<*anBc;+iOd6Dl5%xtBlX}P6a<a0Tx>7
z&NuARm{iAsJ3GIZU^PzvVI?L#4TG5QixDC+tro>22D+Y>MLxU1NtG_*UePzEUhB!l
zMEVMpRkg7lwJXXoDa=xy==4Yk!bt|?B32|8Qa;(_FQ(;=j93w)2FANIwFp0#VUZ{+
z-UIraA1d}t=z1TjnKlzk(-f7+!Mw2aA|GR)eu!8?aZ)Pi$Tx-82wWlWv+5PEcoqFG
z8T%a{s7=EwJ-DMq(5s%4LEb>y?2FjKS$MNDoH?trRGupFik1g|?JKxoX=&$lHY}eb
ztK%?|W75c}7)5$_mV?i}l#RG_G^5fjPDz+N|7|PjH^-61&BZ7<t4r+@-Z}!Z%5%=#
z(uL?0mpCVH*$Zjd&t~(}D|dFQtpO^5k}iVu=b59W0M+R}6H5KHlKnY7xc8$BMIBs_
zd$H9Jv^T1GvrDqT;?M#_2Mbc%yP}P(y8DHdQ8TKbMUGuD29(`a=b39qPL$hoyrotP
z$0iHQG84}>7yTR?Pmse#Z1q}p?3sW_`ilo|%ahB=nVH%8>cW)H@`Qr=YE^rVF(LQG
z+^J?m;%;jTug6fcU_-&#T)~)%FrQ>~eL~8L#z#dpb>2lfel4PxcK&XtfURx=&Ypau
zLStMLtfYOVIc)YiORMt_$0sEx$K@nMMXPLTt++$4ORsB385MuD`6M+pe;k`P{!B8$
z#wpm}$?v5U1%!IAJ5=Q0K;CaVf^$*m7?QdKk}~(@C7OtoG6gslef&XkN2t46A?ij(
z)l|m9pXUqqf0Zvt8L$yx>Z(MF`)1PwSQ#0Se&K4^K}<LLp+}Kwc*&`K5(mRj(;5!3
zy+()oRbbJRFKk4U@@5M$9fziCipHUco+XGZk6Bb{Z~K4sb~e4C>(x7H?9^)<&mD6U
zFw;CM64VlCh9BQ0&5$q@XMQZ^Q&8~8s&W=LcN#57O+B#U*yM5I(fr1{1l1>77~QVH
z<(9t(7L~5H$$n*O@LP<_h-t4fe&L7f!xcVOsGB>E8Pody`Z6W9Htj?9B9&)UrIA!p
zF0E5Iz9IOeFDB|fx-*LsqQioMqJ6hgq7K<{M>TOTFQTC_GTS+mZ&Ag-y*D;@>!-7J
zx%oXU4)ag#^l-!8tg@ArMajvM`uzH8jf?I6z{J_*q_y1o%hS^xDIT!7!bjidZ2@`@
z{Pd-z`u)YmSVc#J_UeN0fw3nUJGZS70}dQx>DtlR*%9Nu+j7{dWe+1K1{@)hW{}i(
zlXBa-S_c>B>l;V3+pB0q6xkm#3qO-H8d+Q{_8NY)l|1J3&BYP74)L{?xO<pCK3Tv$
z9mB#|z&)Bjx|g)@((yVcHq=>`m(zV<8mFZn0_LGbOa3TemA<KluhRRBV@i>VpJrll
zjB$FDR$v<yw;X)Y%jmHGvc>qrXfVz`5EZ#$_qn$(t84F3DJ4_D%V$%OZB{6a@xdvs
z(T_~}TdxgzJezbGL)ps>GRy{8PCgO>6WcYX*~vG^$v0p7Lw65i@JbLw_b@zV1%GVq
z2=xFcb2Qn+LX;~PC_LB0hEuR{xNJ%iLHeak|L+XAX&m%S@5$<YbO<1|Y@w&-{mNHn
zaAPK7Si00$`q-kNvKGuOUwykZd1nrFLy^0PwAE)br~Qh@uq4F3O6CwIUewG=VqR4?
z$NasC`rqjs>WHI67_>>E_O7=<PAy6t#3j@n5$ePfg~x40m%~klm!oNK9=T6@4tWjh
zf{ouY3v#8^bH|bIcPk0I<4V!ABI!K$n|pras#MNS<(66)Ty6r2UXc=TOyBf82U+I;
zb3P)ru}X#v<M-Fs!RlCb!np88%Ze492{p}@+WHn3mu)@W<%>1#Z3^wDeh(TnWTIb0
zzxd%#c$j&(?erjsTwRd?rK~SamjYuTES$AzahcV}(h|C2vxT$6!!z^2y9PFgMh=Ji
zdfS?Kz9mgQ?q$9fKE5YcSLnybV7QPz@xHv?e4qmY#}Mo1&QBF=B`#|#b6~YnuD*+j
zldP<juFop?)9NQ5Z694LSr@1Mv!V1;qfrJbr+Ts7T{kh!+6F9Z8Huo5<_pn@>mYPJ
zVMRA#ldzQ}3P*iAOR&WLR$Z;8&!VSh#=zvvZ-B8+Fs7#|J!>#hJCHYIpk?Zq{zfqN
zBrv@&63VE|m;<y!04{|bN!G!_CxzV94jK;`zYSL}bzx<fMDLkOT8dce{+7Hr>C;wU
z5L2K9R82Vnq_N#DfcS)Q!(>Z^k#J*YZZ7Y4BLCm+x3gM^x9{nRfX1OVUGxWeEN7g=
z_ShChFOQ-ajCez$bixb~Z82X<y>nYpNkdaZL3yF^iPFtI-E22*+Ltl7h%sAnlc|t#
zF4W9Y5?<8>mh{!NbYk+cN9<x>(LZl5Z0;JtrI!p{sjeT?G_~K*3icX&UZ;I**4pH;
z?@_}<=cp^E3LR!0HxFmi98#$(gBr9wSo0lEdGF;uE6z6ydHA9f@&7=NmPH?s&aXgx
zf{-0wsM?79YUh?hScNr#-CK@gl+Jhj=#hGddO}2ev?4U;VC(ai9S|Ujb089ON6cS$
z2ksKs0Ouw{-JK905-c>9y4cd3fz^nboJ_0~HI+pqVSehYWsKP?GI<oYrjLxSP0ddB
z&GxR%cK5FKchiCAh3G#}Qj>q=;j~kn>RX9y?o}5v(i}4XVV?Fab!ljsuY{M+qQ&FL
z{pslGiQw_+$iw5frPaduyu^H6er-iTL$$HKjJ30gvM`IAkCq{9h@C?XkU_DHDr0KJ
z;;YSlFsKlA;$y6H2t@T{X{zRsJ?Ys|D?Ndvw%1Q7d^!&1Rpf*-ziJ})B&>QU7XZ_z
zD4|0um>VC`CAx1z>V%6Orn2mrEVOJ3fJ^xNSg3UBpi_B-K*+Zi<aN0zYWhwNCi&P*
zdd<#?4sEL^Dq(-SqcHUT!>V4YAzV0=&bVQ{NFPQOFUINN2E5k&%1y8mZ{YHMlu1yM
zO;D9><dix&E+ytsVRO!Q-Vq)hcsQC&d5lfj+Qc6lh|o7IaCR+lb}Z1_7u9*Oy{y<=
zfnF{%`5Hv2FjeWjeZLa^m<ns*RQ+>oiFapq3G4iEj_LLBX4I$cj`u;m%O+#n;wb24
z?{H|gv-ogPQ_wwS&dwJr;bp7D=_r|P9T=@^$csZ^Gy#)Xz$#9ssjGSy`sr;ad7vy3
zNCfZ`@-<V<C7m0TZcnUNrq?-ZT;_Y!?soiMyW<1IQP0y-2~v4^Jq^w8FJj3iHU<Mc
zXsF@DX&zbNNX|&W^TIB7ji+a3hX>~7>#GxU^2=+B8{5aHA28i`2UdybSJN$5v`+;D
zwAwuRy+EE&-TuGz$#XCbFgdBM29{!!W7Os1R29_K)Emn?n#<h8jh-q}SGAqA+iwJ3
zP};pB+r3Z(1a8u`>sy_HN1)2dku*D-^ivhvhHjK;sey`0AfXR~K#to`%U4&e4o*#(
zI%#A!qCTK?%qT^nnJRxX-ZY*e@<4%iSnKA4UJg`>wXtXd-X!IH$>F(>$vp|sG4V*W
z(F|W@|H3w_hC>v)v`|AR*g$}UC1)>oOO#EVRrf7p0g_)mYpW6IqhunW_4(WH{Xe;Z
z81(%iF8y!v@U_PeH%AtmOwm$%*4(K|f#sgoru@7t%ucS?2Zxy3G+iD{Drn=rFLM#X
zFTytmL4AXg=mxmN!Q=D3P|;c+PLfB=@D}E{e|37W(v2`Y@l4@(^3<JA`{)%N1C-i4
zA!~+q`LxR9-8vzc%}N_jGsjez=n{~rmq_FtN!<Mrsnj_4N>N(7vxru6a?<u(X1?)0
zfy6mbY@#>Fu1!d9thFf0w9yhZbyrxy;eXcDl%JVXYiMn6=qz+I9Ur@ltr!gJ5P^d$
zj5^_ScXV}kH+)?9VC(1}2wb?x2H2yI8LsaR3hnf4eR+~^VQqGOZgIJ$w6wUia&~-u
zUWf74whs2`#<u#(-sR7w-5t^e0wM}xIAXL+=vN6zspVe{JWLdo+$I+4pVe>Xj)JH9
z=6)pJ9;LS)J3Gy~+_F30aos|+N3OP`w6-4eInOto6`7j@E0`B_<lD>h%1n=Mb5QUP
z8_B^0YS6CjEs%S44tDd)A}znQ38sIwj4<pj{%(B9dIDRLn-(aohjs$<Ah@ei@;yw(
z*JK4>p7%!6fT6kH#_0=E1_V5FS!)^}U})ZvAgK^xWnkd9hA~v_h7luR!ctLhwacLo
zuYgmsfzcwkU$vERRsX6)|Is4-EhU7C>jDpr0k;X8#@R?oI+)Zw|F!2{$!%^XYOZ*&
zy0{iM`d0_L*U|5uuq%!ylM=hh@~-W6jsP}}e5TpPj56Y0=q6*p&gZ+@R^jZA;MhtZ
z8<ghuc6yC@svF9l1WaxF;)TNRSEv8Xn%9}AYF8n)*quGPa9N*t9?!rc)TW4*<UJRZ
zwTznV{ILlhkNxN@U}IdG|2->PvQ_a(n-Q2qvX^X2*->HLCAh|tO;&6-xkwlv-l(^^
z-j^B|HCK|cisAw19D#Z&$h_v@YQJ$1+deHG5=BZV;O%+R6Lx9P-(TQokSiXAN($IL
ze?+fe|1DZX#N8?3=^EP#PnC`8+giF;!0GCX71R^&Gt{%yE`|$@g^P)%ESI<qld6zV
zWtQICMCimpQ&Hg0`<d&Rh?DCT|C5}l=c%Fc1gCtb(cMwLk|pOkXUDnoGwXvRtD`fE
zqcfYMGpn;BtCJJ!h33+V^7fYE`jU$3wvq-%kKKl;A92#^X+UiP{=yR4b(R<CGJRg5
zpnqXiY34e(<L~wg`Qc;c*sv0#-(p_hQUVds`fcZo)cbmH=2}wcwHlbMUm3io{mA}R
z-~6nhCiuruqJR19p}M96(h!}+66b#64z`Nnt`!`sgJd>KXVXWvMoL-+G+#29UghGn
zKMsF}zsr!f{d=&$e_}sLIHej>k$Tz$B8KM`#TIA3>OLvI&qmKoHU(VtuXgU6DYuP-
z;uH!R<34ew2()pjh%qVT%*+KJBmMrKz#bd^4s*|~1Upmw6#Ua<BC|E2sV0*=J6ps3
z9SO1Xfw`ki(ev+-G{Il<x+xVX4#QBVFu8hG-k#T=xNO!wyxd=LQ+udpT~=o|+-B1<
zRIOJ_3XK;jP3Kx1#LSvZi~sfck6*M%*6Byaxp>(>P*IyZnCpMO?K|z|sZR*9irm%a
zvw(9?4Y_lcif|(3o$$H7SlgcNriqHq;OBAvlYf~cBmK#3EB~cmHiA@$$L@LOesbGD
zyg(dP8by|5t?_LmqZ$e-_vz^iwR=ck%UzUn)af}ADndgo`<-Jo)YHwSJ<7!uBI+$#
zG<;ZC_&2Gq3stmM4l-YKzRPSjFf0#+4_SP(AQ&QCD$!W7SgyXX5iyZ<aM5*;)wOWZ
zMVgqMZfh;AHgI`~N_QHyn!S-un04C4R$d-19p>CO2Kon@ho~lwIj(7?(1XY**#gye
zs{<l@%#;e$GDp<kLBc|EHvYNai5~}MSmR~>0z~A`g~j!XnIFF{#lVpqAL7>X6y~*9
z!>L^sl$B3RP4cMetk&2$$UA7N0>ZFg{(nvwmXFh%VFD>R>zzLbHPyKwY{8$({d4)i
zx2qD&g4Edp5A);HNGULDt&kMY^#ebF4#Xl7=+YM9qPEoP^w*Cxm)!#6eQH=P(qued
zFT3@_lozH^B0&KMypy}@pyF-Z0&(L4amI~b{X>_E)7A3RQ7qG=)6-8(#KajXXUV^;
z@%}%uzA?PcXbCsAjYf@ayJ>72jcprE(#E!J?bvK=+ji1eceg#~+~>JB*-!HQ_`bc@
zo;5RT&CEOR%CKGGT(5c1*zG)i-pG&i5qCq9Rkh)^5l`RZ(|zJQPN$UM#8CTa^SCWf
z=j_|`<+O70ev4%_F{(a|)FDI6rabSusnGU6@FZ~A!6@YYNN)kwkr``#z{AUh!EPp?
zWjAr#X#1MZ-@pD^vEkJQre^T(@0%hKFS9a^xE;+6JS{hecS#vDGq_wVKaOXiCo%*;
z_N9xFGI&@$j;=PQuQ#@9vwTQ(y+U}QYrE~lH@7A>0toouY}Vf@bvx*RjzYj!z|ko-
zzatR<p7cI4+BdK`$;vduNcR~c9E5VP&{jrna!sLzy}I2~TXp^Z`5^3oV4j!f#LboC
z?7}us(x7o8pfM|8A?rQqVk2qdqDVJ0@|@tV^1MNoe%>WAQMF-TwIOj?+tEU1y5dj2
zyjEqSoa|)G2zX9x3C{L@Q1CCmsc5FWovv~f0dL*M<X=Gctd1XVKMv^wutwK_5cKxj
z3uvHCWpFWJ#-|MLY4Ns(YH4`gkju#dVYY<d0=`jC8J=R`pv9hS<J;^WT@s+262-wp
zM%j}1_WUG?wP4Ug72c+v;^y%Mq!zY02C)6f>i-9vjBXG!DP7(5(pO$ha|JdOfchiU
z3ih{?)gDKcs48#WET<_Yw#~9%>*Ls1WAa3DR@$=5N$*uDJSlM>r72RhUJ71|z47nf
z*x1z4Z71cIYB_dbiug%pU`{4dmz$f#$?-5?x3Z6NB{Z7zl7E5Cxx(YfdUh(cXnU6Z
z1xkuW+Kt060o{dlWBUWMXybL$Puy<fcgORuUlDLU?~7SDJkofcsm@m?c8;fP^|d9{
ztw>n!^X>A|IWCbh-#=?=d8>FjT2B-u<h9G1tU8{Sg=yoD@|g8?@jgVm5M-TY3)CI<
z*KW^J4$5V(AfI^MkL@i3peHj@`P|-zfQLR?YUzA2BtywYLB+==L?<F7z{i8^|NeFG
z`&Th&@vo4ggTXhD-gN<l@xtF&N-3-<Li?~_nu|UMXnd}V0dfi#a=_8zYg-ZdRnOe?
zwibo`S}0q%Z@phfY->&D@zU~q*6JyFv1dZO=xg_Mb8{N3`bEHds=aE7pI&Z-UuKD4
zb_;g{oaJBlAgAbp$})Jha7(1wGJT)!2>tdA2vg7roy$?ZzJo}yEJIY6@I9z;=6z1_
zBASQwkmi?Q`atvYqq-ZS<0nlLSWa<AJSws>Z@2VCqx-Cl8BFf-@N<N*4CoOep1z{d
zK?_t>>%{WMqQGl`pevUw1+Ae`*Il(~<o_(C7ng7bn89O=r2b*P`p172odx2C81>eC
zFAY*1009-?p7OcdifrLtbDlofV_$WfL^a-M-i&dv%eixVPUf;Sby%4-R8E)6ai<r9
zp<6unQzkbLi<7ha!BIeJY5!6Fg|N8zgj<yE*@{O_lSzH<$5*Qtclq7U&V$^HBA=FV
z5mj06%JHCVwu`Q1maFWOj*rvx=lfrX<@lTp^7@bKNi;L>v<10N23=hnts>(?8p^W@
z1P>aKZO`c~^&t3ZKgg2Om3INN@o<hDNmwST$%mYaiLUi(_dpZHHzy$4aIyEBoXhRm
z6@Tb(HvBzS`V(M=)c$(Y13WCC!~5cDIT=~6)w?3MmhLkPl>jpf1p^%m4HXRq8y^c3
zUX#AUW{v&F)es2ER>=}dBkbysP_i7mF>{FwRAL`9)b}p|{W4^U0U+8M%R`v13vj&U
z?SW%OjcFf~8`?sH4i(|8JeM0ylUffOZt@c$HAX+^O-)UQ4K>Hc;v}&&>45*o#z@7&
z$0Z|v64Ze6^710c{eI7i`(+fnpF;NZ@T^vS0{qFs^_a_k?<#Y=QHBp=l^OwzmMqy3
zy4%V6eAD&$W~2Mf#)qV^hy4k2t9#!Wnqh2cTzYg&ZhS;C{70C9T)_LFl^r^0QK+#f
zl0z7Q0rufG`o<*1gp?#Hf0|TujsVtgcNR>^gFRHiZi=DW&wU9hPA~*}NlUa96B7(V
zy%YA73S2`B?mt9Q5|vYEYT$dY67GoGrbxg(?VyCb@bwEPO7gQ6tpH%-M65?S>7WwV
zULEmPKn>%>=Njau!FxY{^<Nb8|3+JwgM2YUS|Ec3p+{R4cM}n~;kdmmr6g}DflJx*
z1qH(Z!vJEr6i7<b*A<~-j)4QQEH+B~cE|33*bz?++0wI3PdMm#LSeoO2-;;8smV;i
z$4SReNg=?2+Rel_Pdg8_VYLoOeNS?Fi_CmW3`QJxx*m5*h169|y$jN`!JbY3Rd*`Q
zil@Vh_Ze_v%8H-NlAgp;c9A^g%b(clZ1dT{;^+RurY4@3=1!Q#v!H>6{^KU7q?g81
z(z%<U&(r20@`o*1H}q1liLt8O%S#9(VK}T{B90diD|Z<&Z)XKnLnBLDOJ@zBp`yCY
zGe%92XO53~0qLICr_s!`$j&thN@nsmeHQ-2gru_z;O@rt{<kX<f`G71P!unh)-taa
z7ngPx*D+$K^_fhDu8qo^$`aBACOYcYzF~Y~EDFY!s!|*_Dk=slCPp$!qH>I)viic5
z(kxE}Ar@|mc1)6XjFyTN;#+0KM0pi0$Z@3|ovk^IrN51lB7cg#jj)T0uZfACriYxQ
zq#6mAy{(p>o|v=D9u$}iH7#;=O#sac?%`rWfd`kzSBd__aQU$GY~nYn5)NR0wEY68
z8VRXx(Bl*cyXv`5D8!PaM5^wUE;D@<>u%kAHi5kacmK#BEuGyy9u-ACIbG>5%Diq$
zI!1<aa;hRSn!?-)n^Ln22D(z3&xOB+84K+$NGeMPNvZl6=@@A$Nj{hUq9qewxeccY
zz+^NNa0;K{*Hq9PUtDgGmYN8G2w224_!TE=P?^&+7LLPDf&(h{KW%9zI7{{i3nE^n
zfz*-{DFz;x#3_)^Nal})E03RbL6n{!Ies5q&BU|1i9B|PJO&01u8?winT?C9QGwIW
zG%a{L+I^;Ewy7k3sU*Irq`j&{X;a!^RhsWq>SbTru^YV*^->?8AHI@Qw_`5d^;*4o
z0q_SmQ>*!k^)VSZ(Ur#22}nNA^f~iVL%7crH0e5J4Eh=kGCEQ!2ATZ>_E!D}lAJWm
z<nRyr3HdTQ+3M<H8ylJn+v=msN&-UjPec}(X-6pntNg69yu7QNoX}uvf~+FEZoXuc
zoWt|u8>6ekgNrWqKa%3p<?>x9DF%N15-lhqcXnwSq!cSI==bpC9q1Q(B6<Kc)!Mr>
z%1g>QySYiqOJDzXez<Z*L=Z5suqi5_t1d+ZtAGN_P)`uce&r6w6Vyr9UsM2@S)J2a
zTT@z_(V3A^T$|IF12NQz*H=x|)=SdW%1}+oR@8{`px_7#wIcvEJ;eI9kFk4*O~ZdZ
zA|6bKdT$q_K(kbx^|PsVUQ#4{S1gG#qC!q#HI!M8S}2`#fzl<)JrK5Ql%^!lvl&2^
zPr)vwsJBnt#>5*9@gjWD5ryk}E4{CNNz49zYlBL!=pbtKfFeR`H|hVCwuu-z+aBJ`
z&#T%V{{clgbXU%I+Ewq{#XGEN6s2y|zzEf`6)tb<r|?>P0h3)+umfxB^HWzAJsGiE
z;x-h?JktnJfgzIa0ZOl!Og|I%+h?%$*v<<b1%FfsNE~4We?{Ph#|YSK(}%CF(1V1I
zl&zcfb9ZV)z|2iR)^tGDbwKX%`}NcNbqgrZTf7r^JOF$SYXs0ewWqV(Z#~{WHnX=j
z(|`6>`m{-Db}2tG4bSQ)Gydjfej~kdHE9IslAC0Z)zgt0xp+5zzVxH3rF**;1hTIS
zj<3IKtKQl$<aXE*XiRvRE?v%|8z9m6Q&TZkyHfBG3(zo;GqACe(+JXbRxlM7@c~L1
zx;hH$n*f$EYMeZCY|IOuu4PuPt!B23ZoW~COq+sTOia9se($~JwzhTY=|Ra&fb489
zH~GP(ehH#VGe^sc^5Tw$%Gia?*_9P0R@TInPxxqPDd~xNN*USN>8ctr+A-P6T3Tzf
zv#N@kdTM%Tgs4S1RQWC%nGD^aPokxe0~Uptnu+W!4R?@{vcWl>m6hb@=Y<$H<TjP$
zHsb^IvZ9f9kS^>V?1|i%g_`8SxP_vc*ACML#iyeFqDw8J54AtNaL#G3Udn4}R`t|i
zk;;@J)D@!SH3H-%0#<CJP$26m`+Ob%u(+QVs^wsQ@?Q)~?F)uG)!npPd^+KI62C2$
z4)joefTy{>mZm0ZoMUzXU7zQ0oSSNzXK{oeQk!8@pJAKjaGhzonqqZQ=eD-Ea90wN
zQB)lqnR{<ei)!fPo@-0xeIgRrL2zRr%PlLhpeQV9LW3^yl@i`s2IhOYMRAS%Im1A@
zmQv{9m;!Tvhd$PULp%mWUx1ATmp9=C(+k^qy9HG#_$Q+tEY_$+f#mqZHIbrVD5ECM
zd_TXy+VXq7Yj9(aq>I0eGn~Q8Q(lc5ZLLf9a!m7r=M7B@fo>ao_8NSKE`~ZfB~es}
z-R3s1_pV9`L!R^z5O^8HFlS<FW8?2~cD1#zym+`iJ`Nj^zPpp2os|y4?vf~j<6FGR
zR=K$)`T%xdbyynQPiR9wT$rr3MZaYRt;rAga>@jlqQ|K#$VVW_g&|7HBTPz0Q;*12
z&`Fk;kJ(xfKTWENyxryZ0pTb%tjd`HR(>ZZAA_!NcyRb|aHrchY{sbleag0$Rj-%k
z$LE#-%CCh*zp{UZOUTOq2t$;W`#CxyDJv1iKsSN}%Wq+AZEl!jVrO$=Zg#wXadu|D
zd%C;5eQ|bjVs2$-Vq;WQK~r5?S>~a^PDevrjRV02%#WA1ax`@^ceNCjR8|%M^6T5s
zsq&Ag&Mj$=&8cmz=&Z|V%}XZAsV5m2CrYS>Wx}ElP&GKgWQZC@=|{$Czl4CYeknCB
zIakY#-ZdHPYtL2{(i9%Qs$t;FhVW6TfuT)a5(dnMzS1BMr786Jw-AlZj7cG0U>f@=
z0K8rD>V7wrelJM;{UnN!0}_hl5F?UM*r#YoPDuzWhLXaJihXQJ3QF-bIVR#qRN4bP
zXQjy<Na_kygnSUvAvw$~)y`+<<*z~dUlNrtU8w3`a;Bc~V$7UyT@@LdxGj0^8*LRK
zs4fqfyZyX$btK!!IO4IA<1*4rGvZuX$muEg`FTi50gbtZel>pP-#K_BD`EMV#cc-7
zO8l=L>1@1RaT<+SeRf#^9fx+)4899ZSEA#O@(uY9tHr*T=^q`2*KJ`=@R;$;rQD%d
zry5BYfT{Rweb~sghZVgMub<Cx<bK)2w;t%A2YZ;ClN1FxC0ULXZ0rJTwB$65w=$Bx
zN~#u~J}z=rM&H!ExGRhCAl$7BJS_8ko~;kpWF}wvY`%RnaQKGu$(<15aYjQ=xUQ{@
zV5vGe8qgM+8D1V)-c}i&9vPlq2`F!f4^NB_FAM?%w<UM{_(8lF!1=iRaN}^Xd+4d|
zpR5{_Eh6zlTt-JoN$abc-WO3>VO?cO5p8m|8Nq6*mKv_Yb`~IbyttOSx)SrExVgBz
zzPc@9L3v|SSMHQ1-zDk3G10jJqalbSh*I5DJ=qkj6jt$6%>TGbqDkQyW5js$*BzO%
zQ2cVi08$Mskpa4)Uky(z%qj_?e`aKMq=n&OLvU!Dmg|bhr!W2P!wk2YW8*1oDT*yx
z{sYEH@yBVwWNZ)v>}tV*ixVcIi9|<L7o_A*q9)3~iH7+*<ASoFrX|$WIv<ZtVZ3wq
zE152aEed`?NEizvtQoyrnbQXI!Fr~kuIeM>99=s5uMUx;#R~qqY-8sU-!q~Lji`RU
z^<s@E0G_C&(iRZDQPkZ2xP$?H@AC5#QPwIHprYXG>TanVDDL7ls5zWF>OQ{CjkvyE
zfF1F&*aex5F=%~=v$^co(Z5{o9Qs}btg;5?@ka)KF}jQEkiF3qooRgz)v0&~(1-7@
zawioEz8hJ<o;`dNnVkEa5+7X<Qe65RQu~-yVS^@db<-4-6vSc?i3R&98^P7>O2NmM
zkFw&GIccYdxAKlqffAMw5!vR7`?r~zd0`z`gx|g$9zajfBTP&p>$J0FWoPdke7ih7
zJviU}vV96hakhWHcf7l|y?b<gezd*6b+Ny-e@aG9PSM|@uH>((<1hQ=hw_*2;!+v<
zQc4nHVlr}iUxX#KBt_+9MHF?VpPc)Dw)gh;#ubE}{9b82J1A<8y3fm+Fw~M?7SbQE
z*MEYkv~F(lu4$|20wRBE+FEit1e!{D+N${StLRAinJwRd3`MvFNhIO0)0EYo);P3i
zinW?N$n6PQ*Aig96U!yT*+kl9O>+_2&Xt1I_@E&lxu2D^#7r3|k}mRQR>o#%$#P*m
z=~{YbD+}7IQX-;C#=a>Yn}lyrDMWxp5L0zib;HyJLAoclb$)D{IjP%5({FszZDw}a
zUI?}#64{?$b=&-i;eng++Fvkpx?IoV^0T_>tqgv+6nepT9u0<?LRjghw*Q<V(C7}{
z8VFTR_iTb?U;`V?wGR7--{^C94SeEJ>ME9rEG@W`{;#U2+C$QyZah!9XVcE!I6MT`
z3A!me2^uOM?BeIU262Sw;ONO;a%0%Cbk32J(Q;$R%B2$k5p<{W9GXEh=*bC0w&>rp
ztrNc77Voo=N!e9(uh*EPGtqQi>n2YRpGP0S>7<i2l6*~b%P;-@^r{h{)jpgDT{3xH
zqKo?w;erZuQxp_bq{iZ8rD90#3mz(f`vWxu-||K)J-lso)S^SR?>7t+%++rUelWhp
zrWzq_og;mXPbvCGUCthKf`ZHAeG`j|m}l7Si|eyJK}Z_4KtItI+EE^w2}o}!53T(1
z!yjdE)o{&A)Z;$<rh~S3l7_CEfufg`;TI!0IbAVvZo%iuGKT7^QXDj2x+dbz9Io6v
zn#xXr@&@ke^8A|WV&j@7=kIC)90~#p`W#~Az?}ra1vTyw)rr;crR9)S`LHdOydB--
zkj#%IDoD?8&tW-wbFyC(4RUWmQgy!>7Ny?G@bY@b#ECw%#yV_VDedXy6g{Wh8$kL*
zXkMdvtqm4uHsC*T)EgZpg6BdyK;m+6xFxEyW5rFO#LiH_zXl#DS%J-}Lt$Yo#;CC=
zDDdW$nC4Yjh$TT5Y3Q+ONS_TL(un;HNFankeMf*i1zoq7>ldlsT{e3xxh{K-FGu^^
zPp8Bk1})fCelx6h!Y-FjGZVpaNMUso!CEW9@2TbLw!TtpICy>3m9+dIQzXu#XWfhd
zki%tNh+TTOW?7}2T#z>I#=~h=w=j_E6<zF1Qo@r-TIFZzYVg-4&bfiaw{R_fN^Bp>
z!-)tP%&4qNy!2AM>{7z?QiANt>=c_%*)};TK{mTAtcc1^h&E=YR`^=JUCC|r{r4|3
zA35O+`>oD7SBr(@r-kGfb{}sajg4KoRc#M<J_*kPHka!v{>h}>sgkIv!?7*6wZSd0
zCZg2rn7EM*EjF@bU^?t<3gW*&<g?E+GLMTWdeWewFZ4BVQqqfc+u5Y#0~#OhT(0jO
z?r$7E_xUT&?!JM)%0WJplMOx+It72xF!pauDuZ|+#FS((vhi>echYpQwPDvJ_h2T6
zgf%g-(DY!2B$vcw*JO8j+EU2QcwGw2YaSWddwz~sNXp2X2n@)|L)AKd6k6U>c$y;~
zF!nokx4V{5-!{<p)mN4?voV$SuyoSYay7)cd`8_0t^2VU>gCb)3G2Wx?72!A%S&P7
zwW3o0G}p6sp1<P6Zy$vg8&|Gf4gyC;Rd=wiwXv|QasR6Uu<QJ1SW*knX*5^Z3Oh73
z1XZWI<%G(kSVu#D9ihQZ(`bFlMBr?=x#Gn|Ma_&$iNi<F-rjLIQL(RRlh27?g{5kC
z&${6!q$tdh$HM)mGXF9jG6e|`7Kc@9w)qhcQiqRT2t2>4>Jjw81~U2l%Igkw9A3ON
z7Y#)pxS>ok!xc1V-M$^%h`-IM=Q<oditr1CPSHEd^^TUax!=C%tiXPBKA&WR3ZrU!
ztOiA%IG$nmc)?dxnWpN2<S1A>5zuU-lpVN=s7TGuT>maJHU*pOn~s!YtK%ywv90wy
zV3kDVQdC=B>OV+mkZz9McK}5t=f*^5Z8M-fRM16dBm`Z?7KHz8Wd~n(eas!IanJze
z5;+i^9gZuA&0dSb--5%>PQ=fR%`Sk=FObg0oDAIPG!E|qhId(q&9LLG%F#lfS$uU^
zo_3?Z7m{bDE_Y!hy;c*h_(es1n0W7eARwR4Ewp|86=r_a@phl<W7i>#_*^LOG{Co$
z3<p_#*f*AlkBF={Kl}{l{UZ#-j9gp^+<(?6+;M00SXqd3E{3_=#AiJ*sD5QSSIiRY
zX!t($xT-~y28K^iK3zX&eBw^GnJX?id+);baQAfQc;9|zGgK>t^V!)&)<acRQ_9oZ
zP2S7#Bz3ArncW4GgrrBDtstsJi);X5Fyuu%_!;`;CF>{b_~a;`>zs&A1~P<(q^g#v
zE(cRTEiETY7jaSE=h|EbV31VaL~B>lWM9$cZdv2(*=%jv?Cn}&?U~~orpC9S%e0oY
zxS6r8oV=kGJEN2omua77w$9w`9Qs`fN$=<Wxt3a#()%!JqmIZ{BC#OOCq5NvSI_iN
zPi=v4MJ%r=@ajjgMXjc6mx}-gxR&ReOu9{+)tjpWmtP=#PGu$ajS+FVZSo4pHq8a?
zoelZ&LNe>WhN~;;n7QeJ46XufEY$1(CN8>-wO^wf`|et%4z|7?w!)&;Uk+-OV}-vt
zDEx?!jO2+YOin;YLBq$-PEAuRaa{sCdnT6;2ywexz3kk4u9h%ID9+&}0WO+>*7-0@
z634*xv3l*bBAlW8t0!)Kv|h+_QIGU*_e+rz?OMa$#PvfdUTl!ox8CFAR4-yAgiM{5
zJ6!(6XF#R6f3oXP*QVcxu9)6!tlbN9#}3V8dSaAY-8f@0-Z=Q2fkAOJEx%na3C4sC
z&I@}Z4`^N+R!L|+ex|u85rnVRHj3f4^K(rtFSGXNZsOK2J7u5a@WicOd-7bO-FvG_
z>XS-!bCNo5!=phyc5PIJFLL(Kr#tQ($TP32QhzefFF$3bdgwYd7&*ML=I#QvcL5f=
zfYMzjAv`8#X;5~v;#tbWNf|x%kE@q@r$y01%+2SQtPZbbNzdC(VDe{^@9IJQp%eB5
zK1%8=nGjTuyxxi+#Uj~B7ur-{KNB2zz9JHYmfFggLLA6Z^E;*Y?6IzQ@1!o``6MGL
zBygf}W}_-BpfhbdH>7s@pcIw{1_6nWca@cMk(YCklXul^yH`R_FE72VvYN<et-8s`
z`-`!mql~rAR~<tYYaMq(B^h_)oJ+;U$9^hgH*8r8S8b6(BU`MZR!1Z(&#HS0jss6U
z!h5lhG(*F7M>xZ<5i}ah8Bk%{)a7p;PqF*^4u~$p=i|pdncRIoPw3#Hvm)exzCtHb
zliL~sy3}LFw3A_?(;-~zk+Vu^n`#M5TKTb`$Oqe-Opsa;b;6|7kl+@geGM_5?u|iC
zqGWTD(qIWs-}knmaqxsRC3FzSl$G?NpXh2dABlt~cJ|`YP!tV+*F0;%g%rqtgGF?;
zb>K>#Mqd6hxz+jwt!&I~v>Dy^o2ad?#mrB(wUin#O=Jrjh!nhi+Uh~l0_)u)PA)!F
z!b}z}HegE8!sOD%`r_mSGbUdD;(!1rJqGhr5^=e8iCh2mSD}Q=Sw;CS19WM(t8Zp*
ze%)g$eM@WPz{876>KA(M`mdE^;Vda~7SJ3ST_7IY25a?0!1Mp3($zq^P~L|kMxP}f
z$J8Z8r^n=rZuM@*(c@P5)tgY#?ufLys)4dBr?HLEBZ$T+Zk?Uyw690WQvOd*n77B&
zQ)Dm*LZGg>Xh^yCwzqp`ra8XopaRxk3x(jNOZqOQl~+MT!i}tTM!^t}uL~kG>R`_t
z;fLt-rAMECG<?8gZ+$#htJ5PQ+=^lE!i%wX^vQc^K!k)82UAjtQhYZ%`06qp_{(fE
zV!R+?vY?8KY1&{(7B_vAFrAy3WuMh$<Ja^<b@ln`=*Y`NkUJfD#|zT+nU8yJzFP|1
zSX=p7a!b#FjZj?j`~%2f2=&xYRN(r~ZNUtw=}-tcM>pl7x;%dOL_j~VPB6!0;ECnD
z+wXolXZ*4Z$ef+kWo6|D06Jz_`41<M_xC9LL0%qbAeTm`f!o3PzKMbHU&{k{jZqUx
zatvw{whI%s9B6s3GZ}u$TYkD>FRB)uoC6*k7>BF0V{P(3+`3Yj+7d9jDk@?E<C??5
z_DVqxBgVGY)@p9*mO@tgqYhNG%oZf<E{y$p#uTPsC9ZqThj%2dUlq2k{d$%!)~=%}
zwu^puuIxqKJl@weuRVh3f&PsA+@0Yar(;j*tyH56Um8k}--H8w=?K(I?vkg~{+7p*
zB(jSUbNNjvC3adfVQHo%aXt8|x+0<jFZX6>0Sh@_M@p5W6sy9lPK=r%icw-vAlY=Y
zZby(QN7hw#Y{U&_?2Lf50WhG*t+b<M5J5zM5{e!sL47tb_yzN=gwNXC%yt*jge!PY
zP|&gNXq~=$uW18d6%7nBU;_D&K|5U!H->s68)HYy`x|@`ly;uq;Y~8(5uo+3PZSnE
zvsry=mq321x`5*$(rtFI;e@*?&R$1^`?>NOZ2$Ae^{4{1x97|T<@~9z4{fFZXbwo5
zg5+^+1O%JN`C1kjUB0=o!2$egCCpVBpCyVesG`Z|ZtpK}1$t7`{%HiBg{gV1!Ku1i
z;rh^zcGX?<l?Nv-2N9ds-&qxze`+$rTKt66ye4R1Mh_y1XB9>V1fT<A(E+9CPSofC
zYILVkmDCm4!kuo`pUSt5BD<jliTCY&BQZ1J)?lGr!4H6&z^E!Tt(}q@{(cgODP#vG
zUi#%P>EIRZp<LgQYi_C?4Gxfy>)^jozHIE9>X<ix#7oxf^v$C80+jP^SSK+K$&;{)
z7gUUALP4=z8x!wb)sdzwL!eIw#nK5Kw~j9Wv+Lo9&`yp!nHhA#KI{Bvz!w#$Ym<{p
zzS<W@*9Hn&5^gSSp0;JFF!&LN4-w5PM9~1weTdB@)Fo2#8u>3*y0G8WU=@*I9T+Su
zK)F3oMadOEl#z~)LAjTEOvqyq=N$+lhu_X|^ZA#R>)V%m0)w}E2V#4j`hwwuo}B8}
z0Q}47=eVTf)b%UhCvKLaW>VUl<B>)E^-c7kB%Q-6Hd6!|FlX&`YR4xGZC@#?1_s!m
z-1~SnH6`6!;uyNCyTGqtX{CmaV@+ayfCMeW{U{9@f%{P&AJAqjW?rL7H5H$lY}67*
z8@ez7kH|ttmfPY=UT`?ZfVGtyJDlERTV3gP&3Cu2uAi>ymFM<%2?l#*gG@mf>2Q77
zm^y1{46RI*uzop89JvGQIt2sMS@-f?CuVX+N^TZYw>_XcO8#2-yKjHJRV8u<L&#xY
zbWAz&z-sNECc%d01i1QtvOK)UFrf0UX1TOg^ly1A-2Up2+Q<9FfAjGapU$(D=DHR(
z)*?3c*a24))}`U64=Hny(=_<)bP%AY4-nAj)YIoADFUGGLzaLHF^z{VcA{X^FiY%g
z%y!xg+X>8OvIdfR5dpxfml!!U!LbbXF-)nh`|d{vQ>JiuASCsSx)Q#`L%QcQ`9OO}
zP<q|h3ZfVgI-r5dMZ?QR!jH=2nF$~ECu32lCl)TMn>DfRH8mwUyQxiimP5UqiiO|<
zwWTM3l5(}Uh-WhE9L)6anTMww*hCpc;Ku8^_IAX~*=1DaE3WJFs?+|KF<h@PCnd3g
zl;z8CGm~ct=C_FDqpbTVi@DvD@b#Vw<}wkTo0xWlhIWFQa=e_1v7~~`(z*f-bvr4}
zn~##Vrk<*zilwMSAYdVlXC{$*IhlVpn^!QQ3kKnU9$|0d!9?E8B%-M>ij91xY|=SN
z)D=T~Z-8)j-wOrw{l&_z<L*A!L~##exfT49c*|v4KWzzA%@+;SSHgeaIVBRiQ6+LM
zh}@fqK_LdrB>i{N?|ft)5_ZNB-=<0s{WjmzlRNFPyRnZf1%E`@%r;Lbc9%-du57)P
zp@u{+Az-!aPjDK6arE<+Q(K&YxmYOv%ji@gOY56}lK-fBTC9pC8o#MjKqo|Uv+v>U
zU>L|Ho{$4Qe8QhU7`Zwp&iP9R6d;h#B%;qG<Pjit+Mrk%$^p7{cvlBt2zgc)D80k9
z4ehj5jX|Hg?OxCCKBnrDd9#u|_yicr$%=|7^XdfiBCvGj!prf(Dhc5$Q^P9Kqij>9
zEmLK4Q>67wu^NBMvTE`tJAaDmdVk*V`K{PFb}x-pVB%^(CB$lIUZImPS>yDRU<U;H
zz}IXb;P`%Ya^g)PCg!3Wc_85DTa^SVTmGk%jCTV915XGIVMTs&3NmsIHhvO1UiMaE
z)+#c_(mbxpMixM=KvQ994WOgGsm(B_+SR-!i;JlN;^yn>o(i=2)t<`X-10^2w3?P5
z_>^?{<#GAtN#*%j>G4si?P-Ped5QTkm7Oi4&3Top1Jm{5rq@cw+Z^gWx;WQc)Rj9P
zd@}*63wxqtt%5y3^}%`i?v@1>sXqLtqqN-B`0y3uIC3d%v~?x#>|z|-TrAH<yh9_S
zmn$*;oLjD-S5^``G&=z`dZlFFotb%}BEi77bJ1caBX5sVm>MSX?n?#KEzXBe#)n09
z$;W;eD4RYtu?-3CWD*dMM99TLmvw`-K>J)(^RMP-1>N`zTxk9#G(TD-Yc6!#uZPQq
z=rLM<Rk0!IkpVN^eLlD>?XCt)Y_^20b5Hhy5X}&~j*QzZ62whpNEO%&lw;MgW={ej
zkV>%H7!&KvP$@y;z5Vxd-$>nnAt8x_D(UF%n2~=|3kZ<=vh!n{v=j#=QAvqNpFcrI
zFl&V=c0nL(fhS3iKTd6#C~h$}X)|@%nWNl;qRk?0WhUT@>8!Kqt+VNFdvNY~y7eco
z2W8k{gcp+qgPm^YmwgYEZ10*zM1CainDmVh^t0qhD;G)xXww3D04wDnTK)kB=&_F%
zH`pu3PmoJ!P&HuX0}e`Q^1CU8XbdqEJEoe4n24;Llaa5Nm4lm^2N6FEAKx4k&kP&K
z!k16(hIKZEc}CXlKHhmohILNf?MBY+KJFDZ=JhTH1;HG1Yn)3<yi-%N`kV9Wv#fJ_
z`<AGtb(azJ;@`;!E#Rw!oHo!80>#G%yy**lY!Y5G*rUCUvUx1A&<xNC4l*zfGc$eL
z$rx*j$SMkXTHBa?Yv?U1XkE%EeTo>3su-P+8Wlp)8vARDnsd{RHg2x&dt(}3b27{s
z^?Zw9uF8R|Vo0={>}qOZ;qq{BZOE2POzmu-xQ`YdcMZT!hpU?wNaND&5$`D>Q_h|N
z$~&|op_eR}Aar``4xF}2AN#lBY~N0=hg)Dm(L&URtN(13`8st<MzXKIwBe=P56Ect
zAUH;^Q{%!Dwi5EE)&+O<JW8zF<z#pBN`FAiw9J8^Ll!TXEcgSQk!55Itep>`*{as!
z%5X6ZgtfP8>gjG!AIf5pxZ-o}1ubnAsYQ}-A<yWl#469D7EcRJn?xUjid4FUFt~Zh
zN=qfg(ijIyqZP>=e&!HmMTt{?U+-~!u*i?bT>M+Qsa4<!UxnT_$d|P+8^2&X!w3V;
zTyw{4w|^=2qzUJ~+D@aTDVPEbETR?q5){_IEAVHANQOO2mY~|Eev`M^ceq(8uJE}6
z;cQqzjBjS)WjdlYXBzgV2wgf}9<`?Rn6QVzt57vR(B<;<PfQlTWa1`kb)7riaBI=`
z+RfaDVQK<;SrQM(hUO~}Vrm{PdI35s6Eb^INlP0OH4y?#hzoPt^W(CdJ5^*P1tdO}
z88)63K8^)AJU)RH9*zwTmK7ep85X`Z9<H@D!MU$qTOBT$9SsEh>^AF(1ocqJW`HYF
zuU+e<&%pf;Jy+m(^V>K?RC+jJL&6O}jqfDKw^x?3d-1WpOI4;s*|EaRb!2+S`r{-o
z<{<2<sx{^P;4${T|L4RWV7+vfpL%wEcs5f~`5bn4+$`iY|E0XQO}fVyT+8Xr>GQhB
z)1Nvfr(^)|<m=SQ-&fT*si3FAaBMyZOmBANSDwM3&-x;+n2aqTefNv{ey2w#4+5?{
zti`|I-(JY~@9IWE6a<;MU#8FHb8^Z|kmxPI^Ywl2T+EGUfH4v_W7o%}pWn+6nI&)`
z5sOJ?02`Y!@aOPpINzQ#v4o;)T~oWys6OFGUTpvfu@Y%v85F5l9-*|pZQZY{p1df*
zGCfx6k|%<lFXhNIu7El|Z{I}dE`9l{B0eCR^UU{bOb@#7bF3=&12@iHxJV8#1WSF-
zoP)$kBdAGmc+$T7(t7mL^GwnM#L^Df(rW0^QsmO6ywcOe((7E(>o`8V6H4-%3sJRf
zG60PEy2tNbq!vRxB;6wg73GZxgk1EB`V6(IHVZ3^PWyeCd@Ay1&nRugq>y;uUv)W1
zxIG$DV&a*L-*!pC;*CUR(EFTb^WXuyC9&Q6$1d~BvWQPM^aGg$CLR2V^_^(}0j;^Y
zA=}@kwhpGJlcr-2Vy6$bV-Iq_g$3juy!R9djQHZWTDWBTG!S&KpRdnX>L#B1++|Ie
zDi&RmE!7Tc)QW34hG<<uXu@RFq3~Of`>d&57vw)vb7mS4?bgI6)fN*d<*ftayu(=J
zRraAdlCo^8qmC-0ajgYdXYd3!vY4i0nU)C!r|~!!KJm_=uxp@is1wepVob$3<#C^C
zxHiKhlY+exL#DMO?;)b<ev=l2{XHK9$_!^at(v_uE9Oo6AQJcrz5H~nE%5pNOlKzo
z!`!p8<FPC|GC4_?2`WX?A6@x2hpyOA25BElrLq2@Djn=?oO4r6g)_FUDz<O!)x!+g
zkB##mpkiQQi4imX&(?F`G@FTW8=i2L%f7bW33RV9$AqHAk*&$0weIkf69f*@KD&G$
z$<mipZpdfho7+42Dth^57rR98E){vQUK+H7-yBM<qaeVr*{EyC6~%z2!Ci2$Jc*DF
z(K**9^_xYunT5WwMOqPEldFGWMRZ|JaA8Gu;Vqi<Bze+B_*~;5i!`H8)9L5YA=RXq
zf+mjw?jgPoMo*}sAnPyHot>BSi}z=|L*S0?{<;cka_lTy?#5f!O9~&~OLFEOr^XV7
z+Q*jiUi)w2=1xXr&>(E>Xpc{5F3(Hzrm3I_KUEOnS$-n4{e)+cS8g}ErEuGAp!^|Z
zMC3ze@20Pd&3`Z5v{{xkF|x4XiA*_*1Lzob{bXj%l~>vPnf~bueQ;o9KUk#+*jWNt
zCR^Z|i~I|Ycm@#fTr2<6c|7WYL55c?c2{2?V@`{3MHPKo9h-d#hkxx8>&z$C6%76r
z9CjTdW(9Pqa+nJSSo2B2>6GKel<j!jlkQPUIh}`dH;s?$l~ub=pBR!zYaPQ-E@};K
zBDh35+w{vi$unMwYld{LH+k4E(96Log36vbi7PY6uyGj9S4y5w!k>9=>s68G=`P`j
zjM2&B`2coQRinwfJMoEefP*cp<RpNuCe(2*%+-ou)D~yo1OfOMUH3i1;N|9rkG*^E
zDC1YPW&3#M?%jBRzTcayp;Xm7syGJ6KmFj00MYLlm-znfZ5^wHY~g`bUP~(*luXk)
zvClb4mVk)eFix%-vB#DH2@N$(pWpweV>|2o<;mV*Rmbp2LT-0?<id%*FBw;wN?09O
zACZpB-u}X92JE&lFmMsn90el>f#bTytgD2;VLM=#9ajh2)#Ju`8ktT}_cqkyCVUvV
zX086jFLK_R;W<FMgBhKp{tCP!@%KpSSDw+}kHAX59qkhepj?RPRBm@nVT<5vwyf;V
zNR9ldH4V|@Vig5^)((HeZvN;tV$OZPo))G~02kjk$)sk`aNT-t%{V9uTu`GyTANp$
zo>iV-)m~pzm(HKRzgwJsK7BTK=@8P_mABJ%leaN*lNEP!!FRV4H*xY3RrV4UvC>pl
zk8F##s6Xx`<Bj67n$V!lqN07bmyVrPLnGm+>v0|FkxL`7ZT+_KOL1^~5@LlSl-s1g
z`H=i6p@67-gnL;5XGsZfM$w_Qji$bdCqfNftQ@IOHS+@UjvoGqj%PW|t%7;BiDDkW
zu}n(8loTreiULjk-5B9Y+Y70(9dqu5nBwzRg`a=AcuHn^!CY8i5uq`9PNPh_^gK+@
zw8&X68q13+`#p$Z+~tKJ8F67jd6AWfqr*=R$7^YV9h3uX#RO$`wD@`B!mh)$*BP2n
zdT#gr;g`t)#_=gdThKC@#wq`xEE43l87a?CzXh7E0>X}P`+0bpO0AxWc2I~{ybVln
z3&1PDkmbKOdM!1Az48r$w7o#cPBOgTj8+T2KPp>^XRmx4b%E4STra4o+rC(z++I87
z6!?uCC2Aw`7uMzehGA~`vTe3_vBv9nXO!2ea^?Ekv9LY5RZrYaPH;Q#gAGhR-=vx0
z?D`V%%+<y$vgyt{MUg2gQ%^Y~3b@@FSw87Muc<TIz_A6MVSpAP4`S{cpzj%CZW-?D
z3;Um<_>3|L*(?u{2oyoRW;o~IQnsP+BKwr-Wnn`%abYR~;j{e=zfVrRfHs)*1`UK!
zl5dz`$Hps1@_DeaY-yZX(16Jxg3CqH4299s=N$BuRS(-*&>fl6UL02)U6$)*!FX19
zc(<Dv1_CX_u*}G@%*L_I$FL5#N%gVL^Kq^?-}b0U^Mp=seL3|KUwP%LP^x@5Y;iQ>
zxi;m3E#e6y<Cdb}8Xjn)%66FjaXT0Jz$(ROk%ecSj(d@SeX5tSryJ{A!LZoXLRFJb
z*IZ1KpoTA?K_sw-Bd~(Q47d6`wY?J4bCUBOrrbe3$a@>zXzJBu;;}EjbPFd@=lIj%
zDvb4W_iyUuevOuX(eJ_1a<6wmI!O|PoZKFzI=}(~H9a`CF1lSNX;!OvyK}Vr7vaGr
z<;^*9;qgy$Yi==JU8LT}FG+<&TIFH#ue*q9$}jmz44`UN0X6Kkyq4R0b|?0|Yr~sk
z+u!r;3Od|UD$Pn7v}+oyP!b>qROocT#y-h|VNDbx;qz*@K@-*T!Zli-I;`|xq@?ct
zByAMmM)|$v&6Xyvko0Zf6pV;UH${}oovdKrMw2^O;)3n0b94kboAHVPU+}DIOq8+{
ze(4=`>yWw|f*aGweuc5?8PC}LRx>AZTz8e%!teDOx=4uhPqGfI-4?>#!$XfnrpfID
z91WsqFrZpxin7yi>`6u`Clv}L+b9bgFCm3Fk<A%Qm-%2>%c=|bTpa<Vy9vU1+gacX
z^7T3YP#?rYU)yQ#TW=SWI+o;)?<s*A8lm@YrQ1WtXor~~C3aIxRBK37NKsZ}V=fRF
z5Ri3@Dgw`HWJRmYiw_U&B~3|*kFCz@<_0Y<PswP9O+=)wug@tc=+>1_C?4(kNN~&L
ziO`tkE6(o|?WyqS;rZg>{^aTY)a>=#?Dg2};ojEb)#CZ+Swb_MI&=n5FlJXaU{&5?
zQrr^A>$a*GvMV4nE+Dfk_-tE2;qp~v;j4C!jQVn~(ENzR`hv>rhR*2lNlkbpkOi+Q
zw4<{)s53b~t0}*;DZi>Is4BUms(AeyGQJHbt*kn{iy13BHmfSUZm=7&!zDk6edql_
zr@H<o_{ztGFOvH(Fze@OMHHR8qaEA$Aui`En2>AwL83?Ez^-UPk18pvNKLOuy=3`C
zQ${OYTnK5SyXm1$vm6RCUHyBCI^OV0`}@7Gz&8&?3l|R;BV0@$RRU>T6Q6IeCgk+2
z!px%7q67}yHlniVk{&ifDpEEd!i1{2(vXp)fjd%CT17jKT2pcQU$=?V{hKS2GSXrb
z;uutbh*D5PmJ|DIFJ$}aOIN3obU&|4VJd}lWQ9b#3vLMkLn;LuB<tGpb9ir_E3sOK
zu(KZ+M~AFX&9yC7?#^KjC3Qtl>2{su`xl+tK+i;GqD=b`ZR@wQjsMkkUo|o}w11B8
zzq=(MEnWz?ew)wb8Z=Q*Ph*shEkWlT|F!S!RN)MeDhRw<>-mQTV!=RMRPcQ*tvy@@
zOtA>%)cnZNX4|PA1|*blV=*vl3pDc2p2XQ|a}$JKHxbjEjnMQ5|1u%e(%6Z($3aK)
z1dR0fnb_py7^$m2o(}cp#K~~e+oVQLd)~ZXhs{W~VY51WfQQ~aTy8ei--<c?$Bp`c
zn#w@?oFlR0FC6to0@FpCZFkGTr`a)u(J7=I<rIM-^b(E)=e;jP>mA;=%3P>&#Rr|O
zPIl|V*?&;AKzMBo0e!bTEu?29A8%`>Mj{viVW#8lf;cd(vzn~$v%a<h9wKvsjK30l
z7eJb)Y@n{a*_h061B@=<*)Kc%&Qts#Eb#;XqH)qi{c#~t7Eg)%kXEglE_GX;EC!b_
zJy9Olw4hCYI9MF^c8{sf!0tL92>j=>|0TM_P>j7q{gY>N)mie)82q?c{3<;jbH5&`
zBIzu&Eb%`PvhhCj5Qt5%=F>*}gMAUV3Hf)uT)Y$xzC!=6q^S(*%S6gnyUF{&u=$8l
zkA<V#4D4b;{gkros}2Ri=qlUJ+3D`%ezEe{f?p8&a6BtuhxQ`+A1H`x(w`-aKM7pK
zhzoKZ78o?47{9<>1*M#eyD@G&8b?$$^f{>q+%5_bYBu)_1yg|OtO>}cceXyhpZ6@6
z7wpdkr>oo2i~Dmn>Hp2%0iTD4{Vyc(0@J|rhLww+>*{x*cCxLv<C~GCBi+GM_BVJi
zK9B8%NO=K4;3}xFISnb5GU;P~cyivBF7y5m<OK5<;0nwQ5i{!frxHANXlHkbPX-s6
z{%ZBHyAI+7mLd8BM%yM5T^Q8vvbun?Jf+JsdQQas8~ZPM8ud>I_*c@6q7W&aKITY=
zr*0SP&%eXpQ?1C)Z-HsXyvC>PCwxwU_Y9APa#eJx|Dfys7C(SfI|O7LH$8YmzMRl`
zF9AALv3J(m&Bkfk@`EV70dz5coAo>@oqTH@(&SNOqg^bEwu@Xuxd161#na5*In3GP
zaygGR+A4tom$%uE{>Zn~*``^{rgym=0NtN&_19_tL32$qL8gJio_9WMo2hmjhOH(U
zbrojLt*M_IT?XLjcf57`Hf@~m!d<l*w%}IDFTCUGUJtjq`24!;gKyc%_v|*){3H4Q
zp~kc0fuZwAr95rhBxb{8ay?^$Gu_;sK8~Q<E#Car&oiKO{{0I7PYv5(n1+pgFZ(9V
zXVqVds-x)EQaWy?Ux+q3uCEWvS+cV;L6ju{Rf?y^t4gJfzhzcj>TDJ#*U8!O_kjpG
z(W;Iekz&4gO!drO??lS>T0w_rj@F&s_V`D-aG)6f<@f&NZ*EZxpbXkM1#+9;uMcTw
zye?tSvH$hd{BQg*HW;8A=C0+GD*x4|e_L}@h~-YOSF%2z|JQ_|3xotoub3hK3gEvp
z{zn*puK)Wi<l``*6ZU3X3&EM2_r+&{BH*B|qJ+ezC8RfTH=+OC27G7ZLs)wc-Bn;f
z*No^b0~FBKIdXOkm}Y`iC{ImJ3S5oIrne%stn}b)dNmOeVh-+mPTqeJnbpx1GuzmN
z5Fz;ftKEYbz|Y^HM%~Ih?bd=~=tlB6q$dyo8c7KFt~~YMgy$cDm?G)uEpiCBT?ZQr
z^c7C~q8b;&T#d%OwP6kz)&MpTfyCa9s|rgkMC0*IJ$6w4EG#Bj>+jd|tr$AIkYo1Y
z1Km)ZRsmx5fVT>P{`&82e`i<0pXghc!sBe_4~a5-?d*C-BzC5UeRQRz+@w2VNYCPZ
zwDe`jI9^Tw;@AK0$?U{8$14d9uJ4~X?opEYt&Kg_x?hjv>MNk*4bItK$ca7!tGQd0
zPgIJ3I~D#Y)!#{2&IEf^IZKB7kg^b_eC-WWNJ?1D7t6bmzMO)&LaNgjX2t}{u)BLK
z+55*Hc(ATgR}e)o5NPxtYyEq%hYQEl=Su_&llVPjf<jl48c&E-P7js}Sd$jf6jJdB
z)mpemzE4|*s^a8#q{7a|sJU<+u^-_;hQGuEr8wngu3oB7#QTp&`rEQ4+!zib=%{9l
zOKxP|-6H~_fj9yr4u9<7C#^@&A$+yzUBgzGtu=cM27{aOpS#R~?Qo3*VSNYb(Wtec
zW&fYC{<*LY$1n%ZjEAc7jCDTOl@x?V9GZb7kgK{E`9c%<dHuB-4MBbbRV2_YA0*Va
z1L{9=`759p8#Y)h2Lo`YO~fMqg`8g?;R-Xrma{G=_55{ViJ@bZXqHBv+LQGVT^1S~
zJnO8sD6m&+r5urfQ1mP!#h||n4sf&g$3+g^qHI+T25?RzBN4(ng&GhTAv@r*z}H{8
zMrGRGuw*Z6jU96Q`7m|@uLI8|^84_3gKaX6|La$&y776gD0Z4!d|{+Z@U=5F^q@5~
zzOAk>dSK#Ls>l??{@9OtT%KaS*Lg{XzhT*)LV70Af0-3M0Md2--`PTeAacrn=LFZ7
zEfd;d2=B5XpBi@$;N4G*gJFtw1!vXwPZ%DX<W=#1`i`+B9{YVKxBJlw5{~J=M)21a
zu2M<5ysTcfqTF&e^7QDywynO32H>(>WIs(LvR85-JO3%=B+kq+-)p>p3X^~OJAn63
zhBGUCfpx}Ny~Rk*@R@z&|LorPUAgxtRpUi)p^kwU-ra@QL;xQG(%lS}35RqSk_7<J
z!!W<1LEk{V6=eNzX0Bc(qbdTM8Erp6|1+wa!!zJ{h_9L-Y`x^Jq2Pblge$q;F$R0=
zRmPq<1`t7W@38^95VHiZj$Mcpl2E9F&WNX~5}l(&On=Tvi_H))1pVESG_~@O_ZwJh
zA#$T*;#Wzaya?fesI<dda9C{M=z*^3Q4|WrmG)71*NDNFl`mhi#&yk))2JLhC;0T4
zPo+2aJbPdqq~I;~+S0rxNDmc`sZQ1%X<J{6f$iV&@fQaSch%^$75UZ5EE4o!Cthi`
zcGI|HUz|fo!9O-R;E)#w5vY7XPw>|SfR{0u)ZNb%a`{GPU2hj&AaFI|0zdyM6VOTj
zosvI#Ws7bwrF*qOUgTF3js(=Szdrn`5zD}bRq&ewJ5bvQK{d%`rSTUf)=9IbQfg;H
z0@HAL8<Gwzs7_PeVZ%y=j6hKf`@}93jEp@HqAZVig*8P-L((iq1%6b__b}%5H^Uu&
zmC<_X*(;Y)i7G6}AY4}Ew;rS<n;fPErHo^fcEpdM)*D)@97`k%LIsW+D6qX?n5&~l
zHi^rf7HJx-0}u=YY#McTQrmV9brI5dX{&e9Uqv>KVHshl^^!8<+Nxsz8mJ&~mKFRf
zGx~Z+Ap2G75!d%rWvLVAomM3LORs(Tc7WA~DKQzX@JQ*g?y<!caxiZVxd8~Ru+dK;
zNh@Nu3I{vMNs4Sb<lXkI!6GncT5aD&z(YXFPkCZuL-9PLynDm!hkCEsS`Z=GosJZA
zLbTQ-Cg(yGVV@C?K3xle0tW%?;R5pO6Y#&npGdpr3I%ri$@yPyyzD%dN|-uFoGJRN
zqoQXIzh>qC>EZxR!+WP6A1D+7WOSk$TfIXh@TD;80#ZyKS8B2aHv{j#h6b9X%H7MP
zA$`asr$;Txt^3C-24JEe7aD8K_m45eT+Bp`fsGAQ!XkFNND>2;IYV9|3x=udM_f(`
z3+ZRX!?M#QR<B1?D?h4o^VK-1DHkAU6681jKRFw}z+AccsrlP&w7zMm`%Qq+73O?6
z!ZGnx>2$unBMZJuxOzYoSe>MGzCY``UHWDv#0CG=5vp!pMo2Ba@r)5>EH#ydy2hMC
z?rJGkAnYbw$|A6iMGgZ^nOt(>rmTp#iGm{`KafnMBZ_%G2#DS^1%={FQWf~3g6kU{
zHhOdwP8A3e<PLBOXYCzOllxXc6cXB}+tV>^vg9=1!OY76$0TsD!wDWpJShn2`OSeF
z5)W>SdP*Aq)k_C7No|giuC&GLGF;#H>Fy2L_AwK|uK>jAM9b{~@y~&Y?~l9k=*mtM
zNwx*=JNpm73PQxJ-}CWd#;aqUmF+GpzdHf{xVHuHn2i!ThVr)C>tZ1J2|+0WTx6HW
zDQR;mKBu7J8iK*4_t}V-y5HMfle|C&K5D$@$GcBlZ)TbzOlEgE@%X28xo!sQ;i|}>
z%hw&z=6J7cztmWuUpoI0jKB5-Jg?>BZgI2QYI+V3G6LkFPrBx~pAnN7og2%O7ifX!
z?|%FKos!Q56bUvmV3Zkxi-81jgi<c}7kQCLM`h4p-SSAu_yj!;VJ*-!bcJJV=)0vS
z4>m8mK78MMO~_UG53Gi%Eg0#tLN}qMCm%M6{9YYy7ee>&J@Pg45$L0&XmK5Gq;6n_
z(w4G5$H7im0AV;1Bd3*&-8-XT6*hZNh#2g2K!<&Ft?fXwF-qI>DT|zX%03}d8bJlO
zs?g>L*a-^_hA@8gG)W6~_J0Wb%BU*au3KW$-Q5k+Ee%Q|-QC^Y4T5xc2-1y!^hQv+
zq#Hz#?#^?g&+~rocg7jx4F9mfea96m=A74B#6z#ZXse<)Sl@5VaF~gp&x?XuC0-2t
zi#7R>1=??qr0cnhv&O6{r2(&WN{Bo^$oXiTo(7fmY{+<hKM^8rj)E92#}9P7-yA;*
zAjM5ZZtyw0tFC>%jBV~>CWcA`5VpW12Y<z|9tJ$tPDPK+q=pSffDE#Q!8cHo^oR;{
zdNrLBCmr%TdhxEgh>l8BEb#u2m&uo`O!EgD%v!`gY$OdRFD~>0$9FbIO0ZF@$ivOl
z!fyCxDJ9Sm<!J3$h=M=;=m8d3&#2cPBO;W7ueXK)Al~Uz$VKG#?Tk}f@{&vvSpY2s
z(pbpSIX~{=q!7gQw*SF}Dz=fa^S8jKb6c+fQ}~mEWfMzHGKRG;x5nP)%$w|J4kKfe
zSTOkRFk%LhkhISc5&appGcyvpK0u3i0Uv!xo(4fw6Ysw7WJ3jA7aL6$M6r;x3=`WI
z*j7w*z+qwWcW^`08<|p~k~)(Ui~KR6x;eU{l5bRUZ^etT_>i!5w8T+B_(K4o2~Z=!
zsn}M~K8T+eWf8f&zC_eeVXL7nv45P3@$J<vz<7y<3{oIiSwp#mQKI2RjaL{7S~8#>
zH>5nVXB6<!@tW!`LtMqq@tMV7Y7N?3qab>5sR{HFKWhru-S(o1%uct6Ei9~%Wf5ey
zi?$Y)pLe3wNXS`1w0{ns+|B%^?)etP$3u~<eEtp35Cu6lxuLjY^-v%`#6z5)xe>mN
zgUg*ZvY-wJGUCH(=QT`k8-QQs2YAGvRuF8MPi!u<o}c7ZDFjDc9|GHopat$)68p{?
z!Abk=Vc)d8iY%@~kmK6zm%1+@DRiY4cXyFMBk!I76a~BW?{TDP5e*3$P%mzgwFm+&
zKE{y@vdi1n9}?DcYdsM?ZF+*oO?CFO38`hfMo_#~?)o|gUYgR}ge!LPEN!DoB9BqG
z85Hwff{{Dr4`4;TR#q$JsQHAAQpVovr}8E!>gNzWq4@a2g-qSZVQ8i!pi0NGTlm4A
zqQ+RED=HKoh4=4L$6T*I`E3#GV7(uHmvR9`&osFbk5Lg$sLp&I3-WS1IDpf1Wb<4V
z;R`stW9Ep%dn5Fk1$w9;E4XwMEYkZi$@u!5wF?xbuNl-MGFX$zok~lBnFo<h74*2;
zafv~^w@YNvRn``_r2)Fx5A>g!UL4&)S?r}icY$f5GJHI@-C?8WGPvB>=&A(aAKgAZ
zt_?F1*%ABY-{BiElO*Q{J`psJK=~c7;@yUu7YhnIdw97)6?@KDrf2F0z3kOt8ZgjH
zW9jQpZ*zD5ZCeKV{gE-|hr9jSaczH~Io~zVu8)_eX^9?2XKgz2RcIeGIaQ@g-y)4)
zqj`dS=OBml1EuWxNX$EGv+^}Esj6~mj(LU@G$QXRCa}?@(!{3^OcFtmKsYK);f-n_
zgCXP2;gxaAGhiYYO^Evi8S{_50Fp0TxHVuKhkuic`4j}4DN(Y1tc$T%4(gHC7gS_t
z<0$(18K8oJ9gO8F_e^dh%}Bf=9mJ~V=V;=RcAK&o;c=p?LP{X8w8Cp=vvs=U*v(*_
z!PD#(N=lT$*R#9Llb4ND*RD9R*pHl~DkRj-$1U{y1?r)nEU@ZuVtzTbFJVKt`|(QP
zWNA0^Et2kWENxG;!a#@5A+6hsl<oJg^yjF-HlDlN%$%(98v9>AljYwH!$L+tMM2=D
zswKf<sd9GuhjJk5)Er4E!bJ4Oek$G))z%+|2mC8~4#@WYT}abC7>$t3^)wq&EWwfv
zTu_j|^5}QoEi3_T)qE+;O9-8lr48yFEXU`x`I+qc9ug?%V2Z_=UaMz*WM*Xbz$gSI
z|E?SGa4`o-t>H*@`<@)c9YS~VcX)<=O;>xBp!u;|`U7#af?8xd;>WV!A^%<gv$EHR
zq!qKXejC~Z^{^Q)(&Rpo;S0Uq#CDgMGUw_d;C=eze$DUvu#I5?8K{B-{(QXFJ)SYU
zj{u{kzvOk;kBBNL#JM&jL1pi-dRJEk)&Ebt@}IDg1;+?;JS-3}p+NcLqa&=o1a^Nc
zy7};-b|xR>*nFiRdt$%B{F5DQ$x$GL%Z`V9_o*S|n5Zg7Qe&3u{^_1<0N?2Q&awbm
zpe$ydc`8bexJcWhGo3$hVigKG_67GE%CeAz_Bu2Jv1+mCsg2JYAL6gC*MaCckNQRU
z(kQ@|rFh_(9v6Z(q;2Hz_d6-NWUI#10c1i1kfmDlK4JuVxn@Dh5=JZ9t>!WJ!TMfw
z`Oy&Ph(q{U^XQC~dq50eNiXW}X2;QCN(cRQ;MK&ehr^#B`%k_F74zr7wE#?p{QZM;
zBTe4JVHS7rbKh(5W9X*H!-=ViPS^2i9RRFKjX_nHIh>u+<*#&|Gh~zoDvhLG*F5cK
z2POl(;PU-^@CZ3)B?(CcklIVBFv%FeOds!k)$Ko|8%j%iLFtusR7B}v*Sw&Sr6Hz@
zu#%x4IYBpd!H2Bf4;(`6@R95G6mkR@kj<X_Py4mqv5I4)=Rhro+&t|Lw=L*BMFc70
zz?)M#zHirW@byR-MV^1kVM<)R_91*X&RRh!G|lTCl=U@xbDIR778#Q?Kj+*nT?{It
zAL9H(PJM>U@A0zxXyu-go&Vf9koE;_0V0f-e=m{j0y|VkDr9H;l8Y;3nleXKnZw;#
zWvv)hk44m@Ll^3av4p_HHV}kB;%8@26xk4PwOj>3b9xkw7eAl&lTlyXNkh^eiahL$
zId(t7s_1Ae3=C*BJ70t@g=UB0iJyIrf`Epkusrg6VEA&>wBIt24~xGKA>ezH-|hr6
zc6YUOYz1xV^n17xv7OjZs{`bMbcvPRSfW81Lw^dM;G1swe4WHw`uXG2>TkmrPR=O`
z*dV3Ab4|g#>^<!D-_e==6E!V{s_hUD1*hzI-2~_$?-Hnv%fNO~uP4xpP)y{X8Sk)7
zOqk-V=WqIOIM=smD6RqbH}8XefvR2*kN*auPO>*zYoPz6N`I22f8ae}!Ti12%gPCf
zZv`aP>^Gx9b}~WUefi_HjPDF&{)O&(;DPVll(PQ{@1Y{U_X{B35PyLh{(SN8CC|R1
zC(j0uiUH!%FX(?W!2kTc!w7C0BVp@Ts-I-$_{8l|-G75;FF=sDHjs<_g9!Z#jQ)d;
zyntVS{_-a&{paVG$^Q5Ef0OFJ--i6&ulE<Ldr8Uuy~1Bh_V364ywd-LME!3_?&bUc
z!QKAXz5WDC|K1b?Op%%9i*tGzj&)NOV3bCKfDiv5GVsFNl<*;I$S;`4AEc4|CgTG+
zd;sU)4*<G~h)Np8+>DK_nwT)t<B8n!@&YG-;r;u#tKLCVjAhy9@B@MkG<f+b4QV)a
z5+wKr40RGBw11&K;M9CJ#0%CZ4P@&7-u~r&Rq<gtsC<XGB={hg->>V^f{|XnB-cMN
zdYHZezM*=|A#*kFyM^>?!FYKM;3a_}^+<&nrYE%C6*%^Rv!FksTF^!v`9}8^8v{|`
zl#`P8`Ir3(`*nFBCrIlU@?=F4{lVfz7YmH(f)G$mSMI>1r6l7C0WLz-V**KS_A_NZ
zIkr;JDf=~p@OE6z?eIxv_j>yyc31c>v`FeS%b6JP6@h+8s1zkjEi+%?f#S8%F^<lJ
zV0DFQcs}0CD7}mu5ET(zA%&+4;@ycMeqKhE3+8D=q9*&8X;1!=X$e>N>(M=WTB<(L
zLBRO+<|oum?>&?>9?@;0Fn8vyr~`zRU&xd+e`_(G7Xr+UVu#bqL%+<a0WM^K&J`17
zxr3emk0JhP@N&AMv~hNX%&tp&BD6>b$hLHW^%lJ+I12W-PsFSM!g0KRIb!`e9-a;R
z1SL?s!A8o|MJG@H*|xNOZ5C>TD(;_56WB?PFPBC_Gr&cqh>R8LGe;xRCgo)lY0HK2
z!h$PF6I<lJLh@u{{Dgp?ahrse=vPoDx92%g3^d(a+F;jIQX04)=z^#e5?vV7gfQs_
zsYt|$b6Ula_24FIOhZ?i8SOa{GtOMv^{U#s?tNDozVC!e@&=i2e83)J_%yuzor)e>
zii&fuaAcJA(1nZkQx$7zfFNb(JB7Kd&y(Elp{Si9N#nnoB+Yq5QMlfZIV36b7<GLt
z2^J#8#MI=+&C6BhM%Lsf%wnLgk$<hsZ-<dRm7^};@w)uX%Iiu85;dANTo&PW>-hUk
z$ko9jJAk;*lht2_%Ke^I?8EcO;LoE*L1ykOc*JPmG6dz70wt3jWTfQ@5XBJ8DWbOc
zQIh?>p2f%|NI+Uf1M|~hBboHUSK%N|=w@%W8D6eD<U>i?)bb<Nz^8Iv4H+_@&?}{5
z&)3kewXefBd7%OG@?v=qPb9AHrA5nl=EN}=n619ER>7OgcnjGu(gy6>GlAo|Suc2y
z|9>cK*5P?Z_Q4fn<Ano=Yf08|gt0*$%PDP<NAY*9P#cS)#}H!~>H0*P;=&%zoI%;{
ztBk^&3JiU7^PWD@TTG<(0&<}AQc-dK92>%-wb|CD2M6k6D2=$>b@HiFnrhM54<3)O
zhEL}V^!HMDq67!ivzu-zGKvnp#Z}Q15<%yLrSBxSbX#FLKpC3v+f016$RS`L*=dw^
zzI5=+H=QH8UVMOBK~X4=xO(^)O`c%1IM#2{5vo#9*#spYHoM52@q|(fZH{hDugiBU
zLBO@TD8%=wDQn{@8;Ok{MldaVcMil4()7HDWve@h8FUEIH)nR`qb{{UuEk5iH@L5_
zdsQZakt(-!a3UKrDA8FT%Ss$_jRgugM3VX+5H-LKlGctx>T}9RNUrr?pD<6tXr>Ea
zkyms~^+P-A{=Wcfk(-0&$1~}6$smHjAfqY(?as2l%oxVMZpY9iL+j|W6t0mM?o>U?
z&f8OOhTvn{Tp_n<dyqmWi0zfiF&>s)h-Ezp3JED;$T2@AK{Y>KSF5waVBiKceq|sy
zgQqU_iC`Z#g9xAuY>h9@w!D#qt)mq}*C-V^5}2V5Nng7SBpQs-;Vy#Fq7fvv-e}uT
z`D4Gp?yV!5%UBOpqQ)v3qU_T$!fQl}JOl0<X~;O~TK(*2dDPt3s(r+qBC>M_Sjyf?
zY3e-Gk#Uoz(;TvQCLB7*IHfE$TMF1Dss;Jw5Fezi33P}XT@X22&{SqW8*n4Qh%F5$
zDEGP?s)lt`EG)|6*b@OtawT#Gxrx-MLk3CV?yQ>7%$2kLA=Zy&mV5SF#10$i9|5f5
z=CbpMnc^Rv`R#v$_jNHz?8G$P^}u+St(pC-Xg7LSWiPzrdEPC{Cg?4NjIbIDMcj6o
zb$FFwTl4L;%Qma+3?Adg#Oysl?*I_ubD?A$MHJ4uwKg{u`Dde~V&U>KCdNt(L?wxk
z&wX?<PVTJ=GKwzFtP(+^niuX^kXOjkdcM9{5m&2X3`!6i%YMjglke(I>ryIWDvaL=
zGbmf5Fya$s_FHZGzJ|5|%kknFMGV&B7;Q@wEGrYB{6dkbCH6y)Ghp|o&yN|3bkPfF
zZx0N~szHf^447R*UWVdG8#DHyUBz^1i{8VXWx+tSvFOurSLgtnA`~<LaAmQb1zxe`
zp2U#fSHxn7*wMpKnM}hs)~OH@1P|V+5Ux%ivKL`9=5vxX*b<aEI2zG7*sfQ8rTycp
z^WE^-oQ=-zEjHonsA<4S)KDGJnB%kVMoF}tR1SGwDfKf^>bB2cSqN~DQ9OncwpRdV
z9Z@jn<l%jmJ^pWmy46OFATm#}^``C2?wqg(D=Po!QoF%eUSV@4O+7h-O*MIs#*VDh
zHXFnUgdapsCDLM3YI+(>^<T0nz;OY}PHk~fNHm>SDHnU0t?c*I7=k|n_Mr~2a$uPO
z<Hl%{#g2}ye1a@r^8I?q#*qbFFr?)88wa-b!w3g6b<J1eAeaYn&H<&3Qc5sjA`>&G
zZ!AxAzh^_^>)x|@qOKxc5gE>lt;lQPBA#$QT9EhVzM)R%#8dlhr}o)Cs>x>Ob&YRy
zRP6I2HZ^dln9V~IfepSo)s-(lL9h`bxgS~5g<v@<t&5YcwokGp>`%x7^?>~ooV^40
za8wA8J@k`P=NIMdU^J$M<}AKwZ=13v)DBfpMhEUsu+3{Ug$t<mz5r*;SAHXpQ@?H=
z?5iOpXu1vqpP0>6RO#Bb7_BoCe{G~R2uExVPGIFFfABpgq#YDgS3zu3auuYs+|rdJ
z`o+&yb2AC>^hiR<90axdfY|6Dgg+tiJMNg8&_!?6nk`I5vLa=t3;OHGq8NrRKXxRX
zT6Y5P!cdc=+c+vBjIZnJvHVAz(5)qDXBPo2y#|}cG@E|{6iK4o`0T9ttey8I75Pa)
z*DrO5(qzWMJo&0`4_{BSHy8pqoz7&k1V8|l1n`9;IsNYt>bkJ#YN>-`_oF~ss%r~<
z+tbFTXcmwflg;%`Is}|h>9lr!a(`kFda$nhx`Mb0FjR2ypa<9=>{mgCrWe`;{w>w)
znBC@A=jx~(Ko7}(=_u>3g(Mf1=7)-SnNvsrmx90ssH72N&Rznbr6)B|MxQj`y21Jq
zs%5)H8I68`FIH)!=}+gdc@MhF8-u8fVLceI&7s74W6uKKuy%Kvp5zsm6@wc=|BODe
zAV3dO%uCq`^y_}9{#TWtEd<qOWp`-0g_!`f)0*Uvrj8<flglnVHU0E#c`OKCDr<;{
zt+p8M{J!f<OuXdWVmj<{te>`QHu(04dDJ=%OTbws5?gEDyc~h~GmJQ5-RH2nS9J+t
zNf70t<mevVj<<L>9_cF(&zY@PW>wpXm1bl@$3>Q0ZLYt^q)A8jU5{IBjTEl)q?od1
z9hWcJUfJsK{_rPm2z;K-R>CyEG~A*GgJt*d+Y8F;kfY_EsGP1<9Ygec@3!<?*ez*k
z+0jsO$8d5+lJ-)a_{@l#W`j3VjooUIDKG|azsXf(-3{&Y&{|ep#zCSYD&hmkU;Cu9
zcO7gV0pu7AQ%woxS7yXmQ;#=KhczuS|4dg7u@+N;mC6G%2W@4si~X}8IB{^>uDi`y
zxfwdyB+cb5Ert>1EQ?wbq*<m}K(i8LL_5I^W0K%t9ax?z7D~{erIi37Sibr9$q9VW
zAS#OEMkZM+1hhMo&$aLkrWMh9^KpAPQH5SyG{2d2JClgktI|S5IV*k7{X?`)zd0;A
zuzu!g&372S#sZt`F1&#Id1n>U4(vB~aZ>TYTOmzJH;rUMgA-Tnc@)+)Y3@ht)L<p#
zRU7?w*9oW7yDQye0hc*d$5oeO3J=a`#`I&Kb#JBp%Ox^$)6iCUww%Z&-2gP*!-Z=~
zzQb4pW*GH}<~5O9x@zl$vfV@n0SM;EDfk%<lGY|v;#%aQfN=<1#0rG5%rsS*Ds_zp
zE|n~W6SR~VrJ&uwV-{tb*9}{jZ-UCn!Xq3opHR}xs4Xk-A!nDU|ELtO*PZu@ZN@so
zGi8Ee!F+XZiLo;%Zk43-En#nN>5yVx>qJ9HecJ{r#5-guX(2ckLc}lGJA{7yUCsjc
z)(66urXwtMSyhxO8QFZ)hLJJ5n)t&|>=$+uVa<rJ&q*K8X5<x3y%)|XFDsPEpyewN
zqogbB4yx@AEaD;KVg}8g>=i)sO3DAp#`qEH%(ud4vjz~kw1&f&DW5s-m%in-AP93L
z7+mEj(t|fWvWZv`NWSY1n9;lzE_J?a79bUpY)~nLP+VY=2%~PSC}-{dqMk$!eO_gC
zF!-vBYF0<7?bU0Rcyx?hb{9xkmEG2qyGBtsxzsFFcYC@6ULG0cGKbJKP$V6p4dy?(
zACoGi&-oiUTHDA}kxootV(b|_A3#2`>AyIt6tpo*$6TsnyW=SRhNH@?1of-qnU{y#
z8+68Jr2zgFu{-CIcy`2-lunL`OkoX8?yItW9*g1q!2>iM(;)L9^CC*{lNkHZ9;yZD
zdcjH9!%vzMU8RKyRkbce`6cOphXNy1rtZ~TupHyu*Xp2EHrA@JmV%&9eq7{-65lHe
zgJ4JiPBw(x%lz-bMWrCR)!<0tpK`?WBT`VIy_Q2Zu^A5uFz6klZ_z=uK!ys0)I|}U
zp^c*Sm`nV8?LP0a*&Vm_3<c@v!D&#L@|a>LJa}U09UL#ID<T^QS7Ya+L)$K`l$2DV
zlGhZtcX3h2jLO5!#q~S~K{mz`;Uz);&&8o)v;<j>42(Kd%H7tw{6|Me6B85Py?eLb
zdxA_jLSHXR--pir=XtY%{Mg`6I$Ce!B`Eym=mTrl4b%SVjHY2vmaaqVTbA_uo16D<
zDDm*{e0_b9F<yAdkQM;FSWks~QFwgl>$OFluS!p!tCb|1t2KN<hRM8tB{nznl&kG+
zZ*Q-!L&&~Dhi7~9hdN$;$<Q?c+yqkc6@-!o5m9!ofajCV&rJZC^}n3abZkFtZfIx-
zN5V@&uP-VpN=;4Gct1b0V!Idi{<I(Yf4yS{73c4}kn-qnKLJMTbPhvA7+~}0^8H+T
zBTyI^7z_*yuCA^e9305M%fHX)-%LiYkDSXHB&7UK#tCHo|1-QMaeREO!Rcu!DG#q<
z<GY_9j~zQszw3LhsH>`CVPk``4#h>h1WAkfl3Cxxh*$uxZV#mXf2X>SxW0M2wXLn|
z{;0h>Zg}(I_IzCMT;9>q(Zl1aO1tsk;9z-Wg@l-xR`or8;0QXXXXyoU7<xf1-Y;xy
z^JC>qt*t%JA^1F;^r8VrYG*sISC@YLz$75p-Pzgs`4dWZ<Xx4yGlj_my97GO(G>&K
z!vy`ZdMqNV=SfN7&`2L<>_`DL|2C0Is@ZX^Mu~oVJm1mQ7D*Vm_XzbY$1^(nQwGJ~
zNsD<HLQmETB7a{FT;cordAVq%8lzCa!_DqgX&`rZzoN*a+u5%{I5NM4k<MRxdx#td
z8yk=&Bd8cl0({wue)umB@IPn`1}Bo*ScYfvZoK#THjT4aQ0*1+<$QPG^JyVzn@+&x
z-i*l8X?(lqu|~O?*%8f&ah-`(cJ;hNa|_vjgI0f5IJ_^METQFi-irNAqSbn0LIOGw
z5mO=A2VCYhYjHAERMdhkU^@MT*LntV{u_;gnLh)0ZR@RBb8dTkjXHZ=Qkx2IY?<W>
zdQhH;=!Ob~Y{e;BZjTG!AIvMo``=%=qg`s%n}n+|qM)K)ot~baow>NUU`D+`dVE0q
z5WVhH<t_LxX!RG?`hc;%up01=h4i4@q={5RV^%y7g`R!r1pZv47rNs@voX-`ZnsoX
z`1aTLSfVYL)|Qs*4)61ZhQ@Se!!FBX`*9NCvyIF~OW`M=(Q5jWgI3|o7WxOFDuB=h
z@~X$PGPrzJbf0(mhnr-?xfz)WpCC-8&hWzJEXJ?hU7Ycj__cIZBapv=w?0b-yvyI>
zwEr%Mj7J3dj{J*>iOENTy`y;G%)zX#<BI?Fid;HNIBwgQFA)(DjH%|i`uadA@8|kC
zMZc3tf`ru%=_2h{hlZ>M9cr4I{SU5vtCN2L(SLP=^Bf>8yWdv!_Cl_CiprNNo5e#z
z%cY~}QFhYu_*@w`jY`x%5b>541cEV(E*kFBl9L-9*Mwc!Rsl%*Y-h4a!1L%8D=Qi>
zx)&Gnva&W-cFXmyzc+yaS}mV4>UjL&yL;B;*bO7`w3TicM<M|GEdy<FG3&RmJ+4JC
zAQ_E@cY5O{E3u!|l&kC8vc|I~+N8vP042irkAJKWACUKOo=Jd`PbepHFu-O+M>J+C
z97v<~aB=gvM2m&e6DpbH>^~bY<KN~~9qaq~^XTo^IY6@WQhdMPh$Is}8=xW~A>rre
zcikR2y}V?mr`PKA8FdW2ZZBf(kakOF?p)Kmzk<{88Qj*{8{Rw>>fF{E5(Imxizk#1
z?jW+2Sz8`6n-+H28R6{!IOHEV()2_1eB3x5U)z`91s6A?k3CZsV;iTpZqyT5hvO$2
zW_lF^-!;gwCpov~vwP+Fx7i+RC5s5iRvz!yo}U0tZO!|4u7ZLBJ3BkD$d#3q)z#HI
zJN?mw9!{b}ItO_SzQT~~(!@XBUyo<=#^07kh>~+KU4DDPi8rwz9jx>@XRqXfNH#1Z
z|K=Hj5%T$4rsgoHwukG#Op>6XDU?si+t%Ou@PbgbPhrU4DLt#9!t@f*22WY$`+ETW
zXnuT>18m81hqtS>b$NdN8eqGAOmU{Y(r@!UUbV~@DywXV24*hXb}ry%BQhUOt~Tv1
z>DLTpV)X**$%_EYtO~}9_-nVkq1D5|KjA}vZ*WgYr$1gMHCR+l9Clt=UN){!w0^G2
zyRTp%V}s#+XfhG8u=K9g?h(M5=U=b-Is)FRQlnZ{QStih3=tXm6$^uQw{dUh^~y8A
zEf8=R$ojCV{J0mAJ{}j@uYPDh?%Lnob@nLnX+GbD@8+*$eK9MWRNywCw!1y6H!YiO
z4A>d#e;&wy!eWHeosF&cVqx{%;fhx!2oYwA#HxQZ7%5uKR-nz}xO4O9{t6~Sl87}Y
zje)3PWT5m}zux3qUF`LXhq~QLzdl;g1^faA#>UT|n0R=anugu}{c&`8etXrPPbPg{
z!RL6a{*STjyXM;{7SriZ9aRU!Im{pLU;lYD2C$v~%%}8oSr3|jKx-g`LXokAiLj}F
zz=BIFCyKR9AcccV!>dFi@qQYv)Lf|2@17i>WtP)SGO6thfC?ip^K#4nwZR?vV7YOz
zJJp*V;raA%ySlpS?d=VW-P56CldA?n+UkdtivW?Z3ywWqeSL*R87Y5e$v=Ww0!v5>
zv(#4?hhM7W17;BqRrcW~&T(zAs%-!kV;B%S2r=@&<^5qa=80kOQ!Ex^yvJ&Qo`<C3
zi3%cLpR8lO+&<Eh#)}|BUZH6dV`OvudL?T{YaGu${L$@Z2MGXTgK&rziam!>tIv$S
z7U84QPCZA2h2bZThr*#b%-2zfhyZOP_V@M(Nl5`Gy*jmYKhYbXb2F9y1)r6s6HnBq
z`?mjj%{9^B41(Db7(zlV{#G9yJv!GH!~9(;sL7<6sO7+V&22cVCii4{rX`!D5pSf~
zcYpO#sD0M114e7D9SN~lwn4^n&A|d|UXLjc2tKrMGaDB7(wIS7FUu9%s1bcV)74*p
zr4y*cEe(<OiwlaWu^#7x-M3~Ff%@Fe`PD>NjYWbXEAyO;lpKCxq{vs2cjBRT@sk-p
zR$5jNVDAT8&*AdC5J#Fnwkcz#+xTHQt@r}!k)uJ?<=lnhXTAj2F3)2F=FP+1T^U(f
z%E#DDDZ{mGOEh86vx|G;SUf(@jh{2M3dshYoJ2h>U%!nGi%V(0#8(`7KuN}m{WeGa
zW{0I8SN10zRk<dk-*ZoJr5&d#nBDFD-I?h3mhQ4N9f3h$`oiwT$}ngLpSp7u@_ih&
z9^M4g9OrU{`U+{h4%s%w5fhylD_yTlsX9hM!>SXfjgPyw?5+MB4U;~HHRxt~H-5gw
z-~>|v5d4$69^=4=JwECf%b1xS?;LbGVQ5*2r<vfJ`o~Iorsi>4xH9Y>wht_3(P1xS
zWxok#tkv&6oj=6_TfGfh5wuJ?SB%kQNl)$=f^OVB%lN`1XtePJN6IGV^L+Z~j`b;B
zumG@d><1QK6tm4It-rqzI|ME8Z0s|ao$YDOj{02=OJ{M1*mZSrn2WPbx?=wOOFX<)
z9b!UFCGq&IorAH}1xYBK?VpM9MFjdNrH9L3skN}Pn$yU|!Ud}~3^5V5i8)v5Huuq@
zV6HpKNSaG1itYaRR^KXSe3~p7<bK>UkpeJ(^|F@cOwCj}G!6Cj7)#8^h>EGHu^*52
zk_-yYvbfVXL0`?bi^~(Rb?7lyijN`5P~ut9mjpt*lM0*Pr26~e;-{>h<JAN_UOwOV
zi_{o)kLgJs17X|ul9I5#;;Mt3*lZpWA)gD8=i7LU%a!iH?#k@!0S#obSvyC=!uNZR
z4wlDeyT1v5C???)XT6h&_drYXz*E%UnBV~KO?q{gooGyY)e7RbJMN5CP+B2l89EGp
zy&L4LPq}6g4N&7<jJ*v?Po-6(Mz7f^@tbF`20hUa*BLz!eze$zb92hP8B7Hs(1Zn_
zI=a7TyBY)j?K;nguQWwO+uY*fY0Ler?@f(;0*tzvxE=8qsy)^`N<V2WjI?&?e7Cjz
zy}r%ftK`Cf2@1GuGPT=%+^cB5Na_b%J7rX2gjD}Gb8Ko0JXuv&i6Sh=E3}Jq!<5|Q
z>xc7k+fh5WCHod{h5U_QKbzU;DK)jFgx~9#Gv|}u*l#xyzXUxd8bHZ%`;|r$QUCkH
z^Z=gXF67us9#+c*R_&mQg0GW=&?CqLW)obFB?Mjz4Xth7jSlsD78Sqhc-b5Jd$M<G
zWshmixrsh*p3O_a9i<dmRoNV{mp|$e8trJskO+@XKWs)vkCvCM6<>#eeZ1!8x5Y4-
zAyMPsMRIQ_TkFtJeOjm!rl@{XzFTIq$6TX@)y&7uu3uiU3#7m-N-Ri-a%{Yi!hstc
z%btMkO`XNbt<Cq6(+o1E>41STx?K(*-rS}W(!F}PtbIN|9~Wt<-WAi8ppAm?^%|wv
zvo&S%xXuDXH+-^V^8uw4=;dJvfmX}jw%<>WBRk8zQid5?b5J;u77tsU$?eyx%1Xr?
zPtWl6okbtA@uWK4oLriko5u!6KNVj;?<N{t6*V+4dO7E;x*~BLkYQpF(0H#0!)3_$
z9}*K=j-3xORn9SXu<=0&!_Ra74W@HIUQ4TDQ1ZC1n_1ZjpMdsZoi3a+&RL+~CXiPO
zB{)LR-YTm<0Bg!qS$S<#xGn7B2Zs8pU`3=zI1C?iX+yCK^ZOc>I?`2cnINnmvSL=M
z4a0Jkv#B$718KY<P(KGyHiw8}Q0vtw%S;t?I}5!&B5To4mqN3ekCRm(uk))V1(H<Q
zZ2a<*rcFl<nvLd@p>$0&L1#AZ_L1oboK)_o>+Wa&-Bhe$O~;`m^@3^&TvqUu<t_Z%
zX18fgKL4u@XQbP>1Q<vPH8LXsDVF|$`Qvsv#n?Npw<RA_x$ia=$DK26GR&5241P2>
z7Y!>J)0+4l%-2)YW>6Fwm*2`#S@N}1@z7I#pB#i?1fdz`Boww}Q1fTAq9cY;{tfC|
z;~@<cN*miK>i3(Qsuom4)IeVX%nkRms+s2X3zk~M)Qk9FU(UpMJqU<2249vSvZX|F
zH~gSUOd8p_@nc)+_=zhSBtfMrUEjw=(}7HkPmz<R3-i@Z7%C^P^64p(OaaGeK5WHY
zM>D9q^=i&NcPZ$S$aC5CIT%P%yU+1h`afZ3O*gMrt1-@w_^BD1sleAIe}K#UGBCN|
z{!r9Kwa-yqz=?Lwx9tIYX|LV(L*B)F_gync!_F@mI$mVZ+`#0lJ0>I~1bFM%QRYdR
z1&O@hg6g^Vp9zqldSk+l?E5_Yx*+~$NO9T)gCJ?%*PK&~OC3H)Q4qX)hYx}YC`f{t
z2!zS@nS%+EG)SLUSHF#Lu0UoSO;wi8$2x#}=lj-4FFTsN-%FwvOuOxP1dpk6X>hq^
zPXyGUkZ127a#TN`C<hI?_{lmKR-oiXGJ|(p3El0}0~5kJ03Rb79E1*>c1d{u>*<mq
z`~WL2Nxi0G!AKa&Z>_8UVztiye6&T%(ChNF6tyR06{@Zf1G3BQ7U?SM3Psl#E5SH<
zvH6<!Ix8y>NeYQ-oBm~qBnXfD1(VAsnThQUi+;?-wb7$C=Q90DtH5pdCP=7bJ7MZ<
z!7`r!Z~grD_&qD)c1}_ID>m_p>+1Q>eqEyQFZ^W))CfD2{OErBV{=@dt_->t!Afi<
zrjd@@zQ)cjyn==}B>Fneqkcj8Z9+kkutrk`2&tYAG6LpA<w{N!CWCNRcWJN#`Gaf`
zRQCr}X1Soj9m8t4GFAaF66@viBmpS`plf5$mYx4q<4YQ`_58SY94GiZw0k|S*B#JV
zQG+sTwYRt`aJkX_ba`yM_H-E6ewC;&mLpW!&e};c%&1#90*xl@yfs`2loW;5URdxS
z{xqEbd@&WsVsPhY?#rs(>Uw=#WBA-^zHp~FuK%!GnqRP3@`*&AD!tj=-)kGI>|t+i
z?x^)ynbrVB#s3%@?&)ss`S!Xy(C7Ec6wRK6Me@>7$8%+ESFnN+E0M3`+x$0>v!Rvk
zcnA-#+kLcT^DQNy>~?q4-y@^(+ubC){tgDB8AIh2tB$(VRPLO#qoX5=P;krRHZKxN
zq=$R5<Gwyw2Va^j=y3fHw1ddjPpuVGRYTcYU|q&CVV}*U%d7s`F3hs|k%MV}3HX)#
zUX^;Tz<d+n3)1Mp8<V>yNh7d=f-k`1G}krzM<#_7+bmu<kggU8-|L}VLZ{wv<!DsL
z*=WA+1`sVmYS^ZI)evxaWX4zr<lI|;rV3hWbU-~lt>s}&<oR-TiEhr#4)zcv*6BWe
zJP5HKN$OA7%vfunQDqat9U+Se`2?hY$2Tio?)po{qa|G{W_Xp0_Xd8uH-Uf_d}tBp
zP0%3Z*RLgA`uTyUG*-+QD{b3N<iBc3eX$t35998iZpQ<AR%JHPNS~-Wmi_OA4vCrr
z&UW9<3o;aeW_ve8iHu5_G(5=yo^a+j&t|ff7?gt?*_M{ZHS82$qrpk`X_ei*3xPkG
z-#FMtDE&4#7&SbRh?1*68AU*KiwzRTc*%c3F!RMM6GBT4RATEuIGfgdt+>~2b~xLH
z<3BU(lcixFY)OlX{9{;WVK^l+9Eh9lv~c2N@vK1gU)aGx9d_Qzw>FIJ>UMDrZB#9F
zQ3TL-Vo+6EU|_?|cqv+MUde%O8pmsk%@`n^cJI=f$O2tRi8&ON6+k!ftleYS0lTTd
zar>*eu+NldXA_C(H39zBB3(ZH{s$}*FGIK*u%9b0GqI>?;2Zi%F8P<CUMphA5WLfH
z!{tHTf_bW((d}r<s%ih{;|^O9eC}8DOgaT4%)Uo^`K%S6pMK{D9xb({6K^lXkF#fk
zNuv?~QPkrV6FQ=pW*B95ecl|Nl3LSt>I`R$!`4KA9G(&Hc;@Wv?1czb)geia)G)<{
zDy^jjkR?h^Ujy0S5`Z-=x4LdHVdSQ8cPJV=i@%<EUib?4M~=vm2PNN_UL1O~+Llh;
zpws0*Gzhiwr6RD6s(K-QfNlM*d30J0yx*MIHMPQ<Bywy%7oSgJ@&r{?u?jKXmH^m(
zCnGC817*3lrtxjfoQ(x6<XX{CRjDvpf-L$^9p2X69w87ScQ=jl8{L7|&w0W(ekMNb
z!NtY2QMI1|6kP^rL-(2|*`$Jzaj~QRTBC$|o|P*I!)U@qrJ=+bXRCLZ7ku{ocy4%4
z7Lc@{>0-g4MwDFzQ5w#1`<7eY-q8PYR8^5In4@LQ`}uNTMC4{bm9UM9Hv~%1YN9q3
zr!1|hu`;sosEW#M1^KPHih;JtyK?F#F#3sujhMHGOl-$TZ)#uUsA#y@7QM?X9#c}G
z_F8V+62luSL8(tJy7ir@sp={!Nfehrg5vDrLOF%h+gP3J-=-%Nqu4X}4TZ<^ItMt-
z@q$2mLRz3L93Cunnmk_NkSxu)ueBBX>*j7`ChTckFdItYgnq3<u$!;syaP^@*29a+
z0wFoljC~u}M^c;lbciilzo2`20_JWN4iz77z0%OoR%a1%n!A=J*btT(@&yQTb0i$(
z(`AO_QB#o%($#d^!@XZxdzwptkhuMlBCa)mpY6*}i(pDQzvS3?zI-b;QP=%AzINR9
zn?k-P9B4r$hI)e&-=EKJ`9$x-D$P1?=ciGRvB@oNCy8N~SL;Cdy(U+GMJ(u$Snt*J
z7rSpBv$KL|inaE>M;g|I_TNlC_J}81{VH7FZS=b+`5KaLZ*LzL7Z>9OVDnfwaBw{Q
z@cFgaO9J3)8_WwLK&*jo=0^n%EqSw7BHrW6bKKGCKgApY${0!bT<AHsP0}J^TwUL%
zvku@fxO8BjWTTgOk|NnCSMU<!njI_&y2*cjm~)LZtZ>vGre*Kc(hNdLoyIi!*wk{+
z`axe_wfo0=h~yzMuM>oo+11l_e*jr`)N6>-*R5}h(x=tcKu`!bSqGP;sOksFj9ZfC
zi@4T|?|9W#P|z5XB$wdlUGH&kAit%#&TtY>3mM1Lx|mQU(iN~Jb$kj5k2DlO5cJsb
za<jvXf`%qFaFx^&kvXlNw8FovuBowj3vfocD;pog5C!;J#Z4bVs1)u9!{m~UnG$1P
zL~B6m4ERF~&1Tq82-f3yjkVcQZVD%VqRZvx0AH!=YWab5{TI=YRvXak5O#Opu?q$z
z;9>B07ip|@LJa(gu4BHS>s1by%oy^*Xp;I43A9~VaT)|&G0x*jZ+yJq6|!%QDTmAa
zdx-Ayqg~)U%|Kqr4dB{-svz!X&536M-P}fW`Og>|PEP552j1VqWnP|Oq7tXNR3Nd<
zv%Vi1Fzt@6m>r=+8Q8P(u4O6csY|EO{kg$CC22>8zNmEpVf6FkH3^?QG5*fM(n}t=
zk|Z@xk~Mw2vvYIMI6k!H;vr>=$IIIJbp#LIHMMEE8}0ltq(IzP3h!?W8HopJfpikF
zs$bdeQFXZ3`q9*PbA8@%vtpEqSIMz@<x8V)WnRK@Le=5&;zS!Q<!cxb4G_B`BrHEj
z|6!&ta#en^7i)d7g!>urCu?5ktd(<@!IoW*W99K<0TutO1diYnV9)m&q*X6}slT2D
zYJFrCyYWzhnTKb4X#@RkFPpiAUbX_+^UYI~2r=z91Ci6&>$PVHcX1gnpmobrrM*2`
zRp8lf@AKVUx93`b;_w-Y(N|y{S-O~0sHz3!>Iv>>+vG&dO=XbRTD=?8jL*Hcc^ewb
z%T3L=IvXczCgh(MzePA_=O{wi)<B6v1*XOpob!cDRM)K+!YU^5cpM4s-)sdEc{6zq
z;1R!y9<4=tBRv%A;CZrQ8^!gNV*h3&Je_@EiQIj}jsfe@)aKd`AT|K75qt@Z9fx*7
zd0{unQXziFr<Pt$&)2?=VsMh^jU>?W4KkS*K??F&u!HX*pkw7`bD!1^0B!=5cl(2h
z?(Boj1!7%cQX3Sq-O6e9xN!Fw0HR(mbpvGxq@G0Y)QB*QAf~UA6<I?}dugwQoyb|<
z_JpO7c^_nUKOP2dR1fFt2WJi5-AsRcL=*8oT<U%V!mJuU@5{KgLy7#HA5ik&LlEEc
ze86fvS3|L==|X0=MwCF!VPx7w0?m@U3U&cJlJR{ZzmerJD2}nY5pH+JWj!TE&qDg7
zE`D;XCtQsZ{k<UnMR{}c_5wd2;Le;M97Zw($QV7(bE2R|CIbMB0z$c-zvz-k&!9VM
z8lh~z4N*2d0%fGgiZPKrQ%R<z3O7vxuM~*7OSjdW);g3{BtOj}C#}a~0Ons15^!lP
zw&zC*7wfB|0uH*3r?|}!wJTmoRm8;X7M@|N!$)}b#SnI@6K${}+AnL*LK2G1e?z^l
zXKu|)cg_pQXy3v@=f8f$h{g(mswzF_#7}WF0%>irf%qhp`J<uz6)1%(wQ3)~Vk`)>
zp1_FH)>$((!@)K7^?)ZVT;LfMsC0u6E~_i=FV*RZ4XTLt@D|>ejvIjMJ1YC#oYn!~
zH^(x8RL(L1z=rhT<wHDN$x~i@(3gsOI+}JUAfHs@z6|~X8%_tX;-S4*authMKjfrX
zz!h065XWhNiIIR3Ea+Lx{WzE+o$}ax3FK-ve#^B-x;lgP^N!Vr%hCC-LNcl$m{L#<
zSVr5RMvgd8!j*G?FA8BDzPGcBQnA3bmX~$qE;03Q1=jauy`i$1oy|KLcQ=(ZV6FN}
zSvDi|wi|s-!@+89EZwHW{BZa=1RREQDAe3+VtdDq`q(K`Yb|A|8E2RThG$r5UnPL?
z5<f_XcY5p3d(Od7gnY%(cM(Ml^1=tQ3wkhB3<T%UV%Kh38n^BqoJltTY<SwQj*>FU
z<KFFrE9l-$iS-V5k*E<e?^ToVGSb1^!8*qMeFt0PH!lint!_PpF!AR)D+@d3^amB{
z6M_0YxdHXr`YGWLha{9gRot_5y69gm_6)wYG99M&c5!oQObMzhOavphthtKHD`arJ
zLw(hN0sQC2XvS7QMH3Yl81clnrIbW)kfZ|lGdSz;GO!2qwPoH$Ks$ge_f!<2PpP)1
z$=GJ*9%4c?gRSZndnoF$LM~eznCuovb!o`G!{RftWu;X<LUuc3^Ny`i1hNTB(RT{1
z;R@eyY(Ine1YhUw=AlUcJU2F1vwK(QV-7URZfj<${1Ynis=!MIEzlw#wSD&2y=+)*
zYwo&h7S>uV8xJrpEQ-uR@w#oZx4#GjgB#qJvNRm64LZ%e`#qd2w4fcuAn9Sl7nXj~
zeIQSx1ed-G>}xhWI0sH$pc!kptx`SxEEbexn8Hbwh`Ui3Vc>?lH%D?Z(__r=vkAyd
zO#7WSdlM-cWoPGoaUt!tqbqne81@}f%F=ViZDJAC&Qe4e_2B2xH$3<vOwLw#r<#T|
z)`Bq}#FK<80qXFI=8QKB!1){&G9~r2s<=gW#-{y{ALfIZj1!tR2hMsdRN(c>g8p6a
znXK(mMD=V8NYoFqFp4bYHj0BPzp;5Rydy4O1T%UXjgSUI!)eJyMo3Pg@3D*Vbl}0_
zMp}Y5K(T=QiV{xlcFNi^n4#b4pOd}<m>z$$<h=4Tg7vDr@w%QEO<n)nLgxcjNJ2Cl
z6vsr4EL>=AF2_myvV{{`-r3$}E?WBl(|8}=eqG?$K=ok4tV4(Sx4T2YtUBzhm|K0N
z_Oi9U*I+X^(e*ND^I$^2n`=?VqD}1SB_HQS{Om~6lt_4z{1#mf1Ax>adBlQbo-KW)
z=$I?Heqg+o(iTvr3b>?H<)t-a5bUsky0xi+&e-HY6to<{MFEA0g>I;2c%#o}z1yRS
zlKa5~-rNOK+b;TzwHB-hb`*5HeJJV~fypqkiL-JV9*W3I7{G>zQPW<541l?7b5iCi
zW9R@Op}?oXhJOns*v4z&fFfoYB<KEx#~Peo_(2sJ!O6jxbDE%y4`&ZDnn@#l&OYq2
zU{*~?*}4w7ovB<;zzlEa0n^5C1KPUnELt~%5c7xJ!uNqKJ#(Dtde1jDL|NO+wEmQ|
z>Aan=9jQQ;`@`r*W@Z7-jk!V1?qX|||B}mVC}gghMR{1{#%+|6yLZW+h4|PJ3NLsx
z5aG}^LWCwySa8T`zQS^qT|lVER<Gv&<i3q{LvsTwCD7^<WEc#MM&<4P&U$niCP0vM
zjgl)P6U%EUubrQd%~8IeUxE{0OxL~g9wk2RyqQG>%)>5JCp~o<@*0eMG<0L5C^Sy2
zkQu9(F+$r%b-nuS2naMSE0>b23q>Aku<YpTl?td3)1DgRW7=3qjTt*5M{$$s6Tt3|
zrOg2ZK{5waRra`c%QNTv!H=uz6bMhd(kXL$izU`x70N-tp}riq1+3BlHJ%a2<FQ}2
z(Pm~Eo#0d|u5tZt<2LJOSEnrQ<Lw*ca@K4=_g=qla-w>YWY$HyepsZplx%~yNVtTU
z>yU8GjoYUn@yYon5V9_P!$uBWhaNe$_^@)2lrVAzA6rIoIfjwT27RT0;lex-ah~)K
zKCI2y6bnxD-5JdF=>tTaAoB<ienqv-p6*Bm9K@u$&Fkr=Tv`OSCIk{8QuKAq`LJJE
zS7_0Lf8Zrf{qRa%WY6G|NEWz=Z;hUyNMw5erzP3>EPpLCdswz?SAh4qUcrGY!p`dF
zHt$uLr|X}|WdiGX=QW-21Ljttjkk7ZezwiR_Hk%5wz9cy2G8KDtkdQe$zx|hro0XS
z?Y(GL%s7zh03XnJrc1RdaJ@}_V&GYux$(m+v&}ecuadjYd%FWhP&mJMz{UNVLkhB}
zy{gyrt#7<DTuJ=bp|Mr#5w&Gl;*9%UcbCfyP-nrYF=6priuw{l3}0k60top#{(BhN
z_e5~vmx@u?7`b9eni!BJ)M*Ba5yynPP|QsFUyJKLMlRA~_5%=Vh4qnXi5?@Pp}lC3
zz)Tage!&ObLU}DUM(<4BdHJR{Nm17-1K1erW2?GfE<#9El4N*y-LoC^XW!9$vH3(N
zUtuuYo5za}ye0r&xjkFbFZVAJ13n+nE+oj%gNrq*0lIbjpmVYuMi|m~>i3PPfW*gS
zm(-@Bolc$N;hA?V4zq%!nQYd?9E{n~^J5qzv%OQpK=RR=_@1#nCU!6s;`}zmPhF@V
zi-<7SD|zcWgwz(&LcmGQF0PP+3d3m8LX+*1&a%QtyL?xAP{s1s+{6@2IwzE#MyD`M
zWez>PojElE?yKb8@F|x{l?EnJtDekqzcJ@lrIIo~bvqYh4Y6DY%va6$rN3>y;+958
zeVUZ1;}Ml}!H&JCN#Bgc=5PmnDRdtlfcf(5y|j8{?<<45^XYKOChdCm)js5Vh+Zgo
zwyNSb(JAeM_FV<OccErF-}#^!_CKq1IWP1{rwRPk4H(rd#E4pqsQR1!_@zA9ns}Ny
zS>7=3_SQiAaUR$QWqq$~ZAmetEj1MzUFra05C}XN6^fkU-i?k>MY7=%qOB3sEyz1?
zQY1dVf)AsVJBATLg_0+pzj@P6g>A%W>Z)oequx$Na-bm1q---gIku3RXn3eN&i@94
zpQ5F`(&J1>?Q`@|UFplm096BJ0E|_gBLBoR)1<%ty&>sSU#B|^-)j~{^(F0v323B?
z;pLyvGwKS{T+*3*D3~1IKzx+1&9OtlX5WpHkaUhAjFLb|h@$M(DEx>g8OTXw8vl9E
zcPCzcr1@m{1eU0Y23~0;Kqo7?q;oYHZ&_=fz_#6A9UO6uSn-sc+aq-6*FmkBGi62`
zG)Y=^*Yky&-$~||`qSaa>O|QjG1fa8ULXCQ>REuvvS)B*RRo;xARjW~3?VddI`|6$
zoAY|aEcaoqu9RFT@5RyHYMUkCfaISoOYkl##sIPs+o+PY=K)5GX_(~28o?vhA@l~>
z+a1!fjS%Il=cJU%rULCbQcheZ+IP<mk`|pc)`%KuKH()O0f1vu_HX&~Ow1@#^qVf|
zNc(RdO7lH~_R}!<BW(p8QTKyx`8?2zcEY7VK@h-VkEjMoy+8U4HmfLZBJ$*^UHv)|
zrnc7H>TVyn-s0%weFP<#&~5+WG{rGOWfn#D_Pae6mG;p;GKJQq6mFbf7Y2N@HAL8{
z*yyAJ{rzk9i^!ImXmpzKJ1KrtTUf5C(L-rb4QoVG^FBV>y1Jnq3kw3VyUXGwPfH<k
z=wG_rxp(1(+BgL>vp`5%*er!~xgLOD4Fs%B-wzlq+lpdf(`rvOH8wiV0gUcCSQMZf
zh<rS&cNZro{VQkR$O81;pJQnCYLFHd(9PSYeo$W{5;OTZ*nz{<%N(ze<MM>o$n-oH
zN4&=z@&H2qL~v@!GfokrW7y7w`c;m;iqOX1FgiX3$qp(rSMs|KYAzu&bbNT^sDf>n
z?RX0*E7EwnW>2nNV#&S|u&2Bk)e8*{l)@nfWgLP5J{`y@EQgs}fRrBfO769Y<Eryg
zNwqJJ{X)^7;*c*omt^fANC98EpWt&iV!kYK*qsV%Jq>3Q2WyuuMs7nP-!9gS>g3AE
z#%ws6HZE6311?K3@Mti`dYhQCOo=Qv&JD>mMz=(gP66dYVRcp2D1`vm;QA;Hyu5o@
zGfupT<PIRTa<iY3e;tglfN1lpPW1gB`03;Zo~>Qe^}6|mDz(yTZS{C-xW8Dva##FM
zbvLsLc(zTjUzbsyV?o%JfwiQupNEV|9A->P372p?A5W3f!JV|+)Gz)|P1_}1p`84!
zNu=Ml+0s&d(eZ~8GJ~Z)A@OF$c|Cm<O@61Z6Fl?-OYDV*Hz~weUp@3~=Q*x%+_%+f
z`eff5cU0}$bSG^JOxBAdu|Z(-N))9pri?c7%A1n-RIW2v_8rp6u9YC>h6M9CJlIUS
zZqv##jc``lh^c;MLd*!f;+mD()YMtDKXASO^9bgM1S8wzhxagZHAb}EddFXFnBWtJ
zQ5)4op2KT8T&4va$-iMqNgl*_&OXu=k}T)&{r2g#0p`spOF4Vsr8#_b%Gr%y60YsX
zDKS+>gS9pvX-I>~RSA<hDzaWXre>^YyD3C9+FY*8w%{DDzbHmOYUdPuV^O<&-JCSu
z&ed4;%^>B=sTi#!2w(Z^!-G8r?1h9|ov7QOR|w%eJUk|vo~#zwOs~K`r18gxMA)1d
zQ{<Vy->*?bjnk8#$`?v=1(z2dlIU-2o@em*OG5&{erHuxl_Wlh7COlOkXT;G^eozf
zROmh79}H=|zNpYWwh+E95p`Tglm@u@fLR*{`2e*MJS6Nm<nh+&hK%S#T2@O$e<Q{c
zLKx-GUI4O#)5-Vp>lqcpz+yvi(h<{0{Qh$~okCID_U&~zE_^uF78sC(CMmkU^+oF^
zKY^EmO8%vb6iO*Cq#s?OQQ!FjOObnJ3zWQhQ@Vo!<qF3WDf<!y10zyT4S9uv950vt
zX>jOF?J_)zCMNh-%50zIki^H$T)pKtJk2Q`2w@*6P5RdY0E=q2rI2RZjZBRSbUjlp
zF9ZzK>}<!*JT;4$(YW=L*bBT8(J7D^o56~1fvb_>^AT}~s2+*y&+Ua#mnYgvI$bNv
z_mHx|5mw!QL}Y1n;MSqS$m#7$B5*PQR)$h;{%n-}uHcW=AlndaOB;O0!PnZRxPBpR
zMri4^?77Z%O@1PMCgMAmA(Rv3txd8U8~?Ih{v)ydt{X%k8fxjimXo5%)4ZCkpQT-#
zsL7>Bdui@;d6Fdxx1EQ$UoX*b|Lv!-;wE(i#`(>|uZ|?+oR0@4D1WGkf8?flWS~qV
zK&frc7%WXKGe|VLJhmHMyxef{b*Q7^P8><z)tr&@H*;M>Gb~;%kLfDkhs^o0$;HJ*
zz?aCe?o5ve)+s41Y=md6l#b%B-pULz;lRKBhot<EW?8-%0;|Jf^uxQMjhZj@1aG}7
z?gZ6CaU0J54_WURUsu$93!k`gV;ha_HfkH&W@9vNtOjjt+qQjT+l_78?{4q?Kli!s
z{nAhA`R%>eTyu>z#~5=`KVY)x>g+NjQFd$p!qFqj(47G8yZX3SWTUsYTayyA)lz{;
z4Gc^<KFpXu|F!7)k3Kmv2uB~>I~w!kqMy`k2Q*=@gY3$d5L>hRp}$$1=GoE+?c3(*
zAtMt2c;0|w-}9H8Ku?pdyurCo=>QV?8>jzyyu<(y)DINdXywJo+Y}A$u;!A4fkqC9
z6EF%zirqY=KRI1NL#cSLh|iIh+7|=j44bJLv9a&O6ugYw%m@LJ$3!}RFBkt&|NaK9
zox-j;emON9I^TP|VlHE8nga(IN`Yg|kNN%2v%jayIA$kMJ*jMQy|URQ2LmO`kv5#`
zYYhQFf_jd-VV)$gL~y&m!3p<&KW7LCs_NiDw`LcQ_)$xphw9h8y|BXUCZ{D60|58_
zVm)#fLc&C8d1zE7NF)~*Me`D!<+i|DJ$XH1y~tFhPhITaDC*gr*8gvTIGzIpEH*Us
zQ-J8!gx++1v&vkvtE{Q+5PgaWm-4s~AP1Y9rttlS0kK-Y_nirnfnE_g2@&6@Zq4f#
z=NTHo{aEC+KCof_ir)T5J{>7R4+e)e34~xc*zPksTb&#u4y8CcSjNbos~7Z=*FcnT
zgaN1Gr=)i^7YodKr0){)L!U<g`H7+fDZKxG|I&LSD;Ra%#b_-}r9#%SHG6H%cA#!q
z|3bYNr_u9%8Gi9Bl=o_j9pSothX8kM53$cpoMlj8RKW*AON%vj{-foE&kF*@)|BYZ
zHUmP!vSUn~h$;AAW48YhTqjn5KJ3LaAO+iArGB?GWv;HeN#>Lz#SA_n+GRTD-ZpO@
zxoqd9q>D<rnIHM}Iy8fPs>?2PxE`rwY`oQaR0|mw1qrW#KyPU|MWk8b5Kaj9ft#Mb
z1lStkkc7DC5Iau4AX=K;qgE%Qw@WAa1es2!kp_X*R)6!w|CZ?EMS(uHxI$jNeEy03
zL6q8vooxB{J;PfiZi6|y>B!B-lnh@%ZJ*_wwiMoD3n{68KMrtN^_{tZ`I#6?SYwfH
zqtBDbdw{}^%}yEhbt1El5Jo-Ed<Gx()6$aM-?3K0p%^tGq8AHg<_`^K|C+-7M{b^2
z1ggnXV>X!LAgI!5FZMDkxkkN3jWfbFAL+QN@vAB6zh2x189;>6lSvsc#X$8Jz=(<)
zkdZQIl41%k-9v8di+&9P!9fSuW3B@gHhJQi*g=ZXEd|$NKpQD~x3D#39HS5Vdu#pA
z>-I>)s3(`RFoB@~45qyJp8fGBr5~NvR}?znb+wn<5_2$?KK}XhabN}+W3{q$vv_fp
zdkr^FTlrx7a4bg*W-0hY)Y62M9DGVV&4X}$az{w&TA4q7N#?89F3;m_uwF>=N|+HK
z&&z@OU;D?!>%CDIG;XD{W4sy%0Zt<Lcj7>!@)eH$+XPMJ(18Ez$SeS50HARS*#U2}
z(3%3}_%`{TIL2ypE6TSMCA^$ME_~;6#L5mZx5f6aOC#BoqCR9eGOTw4(f_kl2E;!C
z<$sb28y@rmv$DN|P@$dgpvv5z#g9oHAX6MQU$fCm-2p-(200h8ePHq4B75D|6qW1l
z@8PasAPuu@qs0t^C?SD^eTxYU;hU9<<9NQ=$jbM8FWn?>)V+1VxZ?F!zxkhR1L$np
zg+uuB$A{<%3|Y>XVO}RCG<MIx4mkH0(A+=4J_D-9$A<#GGRZrhH5XNLym_28drxfm
zNU%p6oTk7GRTA7G9UrJK<W{}6-#&eez1!Y@`@ifQtZEQrG~0$9!2R+bHgGQ<B@Km7
zMRj-g!1xuCL5cfs0T~PX{d;0WNRwBcMu1dVMTF|T4F@jSW8GHPfE+Fw9@WSfWseCA
zFb!60@g!mto;<4GxSy&-5N$tOy!u6ue7Z<L9rLuaPW4UeD$jy&VHNpLayGnxBpep@
zF&(|*G#}afwC0n$Y#4$IFHQ9YCBis-X0lhuYEK`{wbf_`8Mx(tg!^FOQW=L81dk|E
z58&u&KoVRYMLGh&i_>XRR(7(ml@0%|AJnz9mKOfVKt2&ULBKwIa=qQWFJUGy1M#u^
zp9D6@48FpKg%jyZres$LN&*zc4e!Eg>i|N)7=??5F6fYe5Z@RrY+Pk-ERkKXq>+x4
z<IkuAU&Oenn^??1rMwYTIih4KOj3`yYA&0K&(+Xj-@f{QzZ{@=$pjr;PGF47l)j*6
z;<@nupO<ADgmHOHeV}#C%YO_Vn5)ms9(*QZBa?zy-Pt1PBdh?nBBbvGVg6Tq^fmB#
zqa$7m4r{A6E+L>fFyC8;763wZ#pu2&yX{vC$Y#lb+bWt#En;w{->xY0RGIu#!k{CE
z35-GfYW(<l>jv{bJ{h2vv<|!=abGI;x=Gd~JT{sbfFWqBvDg<YyK)b((V+89kkZdA
zbA@y@{z7PG9{WeDGqAY1kl9SOt%Q6o2M^u%F%P<(8(=FY+Cq$}aSjcoq^=aQ4yJcY
z?sH;6FAyFl_{=Lovt}$U12SFAQ7w+ql&1u^9P>r(vOC5(>PjK@8EOuoYMoTA*&zhq
zf(I}t#<NE^$7$b20}0q06JJN0z8kJHgv}8TTX22t->H%d@s^hk&#o%2`sMzuc3iQh
zYCOBRNKUujL&1#Dy+C*aKHxC!9Q&@Dbqd$MQgXEUokU>Omo3$l4Q8-7ssm<6ZMRv$
z>e)XwvlaC8t9Rt`mQ%$F-2OQSgYmPEQ^D8j-=r*sR*f941BRq+WRn+eaDomEYgO;p
zQ>XaMn+eB$C@Y3@uDH8TE&MNOIxRTx`wKE#sEoRJ%=WPfU_}eh<&q7<dtl{?c%UsV
zJR^>6A!~E|8n!X#Q~HzdR`x1bOS(L)J6w|U2#Hv8*d^7p{1@*JJxz=VL?CZbe?c#O
z@FElN63)k$&7xXhc9+a$F>i)}@dW@RJ0krrhTW4E8fq#vXDu6&HF!(_1}Q{KE>=*M
z30dv240d&FQG+wQUXj7NJa;fPVEE>9ZrEbr;2TLe-@h(gAaoIhAohj`mr>0Gr38UY
zhmZP&ec~_}!P=+}$L+Pi5zGd7N6s%$9qy9xuw!CXGl49HV%?EUB@z#a@Ri7;NGlh)
za0PyrZqmtqKif*6qn{3QnQtghXMvbw2pXm%zSsLw92a*(iTD=o2eN!P+&BE{ci|SC
z2nDS1u4v5ZGEW{%;-ULutBBkO-Qs@gl?)}hf>8n;mBn#UF0xo|tD&D5#JRI695~Pt
z4O{g6$;e!ya@K)!sBJ-6H5{7m$`*W%EkXbh2}pyRxJ8c`@GOM9*Vg-po9s1!QoMUX
z=SEP#VSRDFt`bVW(6`666Z#^Hh)5%RUXCvr)O$8t11Jv4{}l$(=n(ljRMulZMNr1d
z0Xzse9^xs%(iQ8Og_J+|%&sypT*QGYd3+o<O0q2t-RcYkI0w*$v2pSaPC3Fv$mNx#
z^UmYIB({LqEhMp-JRTT(u?`=evG}XB)xD!&u^o5txD2>V5zI~i27;C3|EJ{6mM=3}
zOTjKy3(tiB2pCHEhh5UYfNK3WD@=JjA#-BXlvQIheiQz1+%Q0?jh=7!=VQhzm-jMf
z^+K$T^f>OgygT3QArv!hNWlr%iB)z8y3|Oew~z^<tanaj?O)11;nrIL!R6JVqYQmZ
zPLQ}ooM|YBRT|yJ{=xOx&0sd{*<!U_z97x-in3;n6-%Gd`DMGNVvYZ)H%KW#SJ3rh
zoJ9L|{W+oXav5jM;}Y+NN&IYaSg+&h0>|6!?J|W#Ti{_3i^e;uUYiEgn~7uvNzk?X
zK~~4VIMXLy1h{jXh-k_hXElep($Z`28NF98Iv5zJ@O@(ctgifr<+jCE!BN}@fdMnF
zB0PBb1~J-9B=0Y*1_;jZ@L{F-9|2QpmHyX?^6d&}`fr)IjilWov%f(&#eW9ge`iNq
z2O`?c)JS@FAHh~q)z#L8yx?tv8WU5kw8-i>K#r24;*X%Z<c<?!h}>uqZkdiP^bdpr
za!T@~C+a9xjiJNv*Q@wkb!qSG7;PU43<qug);=?A!kT3Cpus?x`ZGXckR3r&QK}oA
zS~k0w@`MDI<A0mukLb8gfs5$6x(pw!+z`JCi&I{^_m)&-iWuL!aETfB>L-JgKE7*<
z=y2H>l}rEV6=-{YpY)|7gZFk7CQ`R@8I{T7rYl2`|9tc5DI#^*IdQX-;sc5IfnUNJ
zuk-Dc%4VNDE*CG4JQN7)bDb3&P}LdH@Tt>1%*)QwN>*n9#&@)RQ&F;sa*Hd@SIXCh
zy<=L0x%rEp6FWe^zUCWk&odwd1sF&2+fD*st?)e(LeI!=&<B%P35=ax3NXO+t!MBC
z_f2B02S1*Qqj2G(r9m7L#Hhc2&w#9zs;S(b9BP9aAzNW_ND!wJS_HtnexT3So2Tqx
zdEztV@h)%91f*Yc{^w>mKd2{Iu^_8n0Cvb!LxqM)?JT@KM1A=n<hcmYzz)NQi4{uH
z&0V5af)Dn3VRax3S}Nf`&f{JegvPC=5v>=j-5VHy73mg@<}~F@&ucqi8kNxPtTU&8
z*z1*}+fPikbEyCIzVoB0fcL|RgZ%vffuDsBLY8J>s((Tq$AZg8@165|Kx+i3w@M3@
z+3)EH@2=T@0e(;KHw*I!@8_*2tsgJ2XRCcDf_GRqDM;HSf1u9}BNU*e>R#8zPb(85
zRkLRteHObI(U!x(6-CAQCDm0x`%4BI2I0L1z2s;e6fNP6cM`i@A`3A1!tZM^*6(A<
zjh*0rtJ?J*ikoBGeQLB-_$CTVT|v&f1o=6a)E_v_ivP$);@Qg}21%<Hs&+{>*(WL1
zgrn(8{4A}tAesT41v1G3CUF)ueOoenkx_<1KN&jw=9(SkTrM;CRw-z8l^U{+Tr7(~
zslx9FU*1S1+{#5&rs3zWmb*-{k9@Q2Tt!CZvj9?7NmXhyFLSxFVkVW&Nk`4KJHH3X
z7}#yDFZq|vVF0~puYDeW%9JVVw9=P(4qeDd$`g;KZ^ll;dW?ge*!i3lMH^g=W!qXA
z9hCH?d+Lfqnu~{r*8m{pEM=}tc=FDn44!i&#2F0=V*TXcZV?5)Y!@IOlCjP%0Gz5D
zRBGX8CxUmyb4;Jfl`<>6<&k10!wzFHafz_wGz)b_I2)UxELbFb3@{3lP-L9<5*U1k
z4ET9?rzhc8gXI_liG-!rjWtHy?pOS=hhm2ZA}BmICq9||_^es<<3s6T`0>xjsi7Y{
zCr!bkmt>IV21S-1H<X6y3Mqa;ttD+sb3P+<>t2Rv4Xzfw0Sd$JhQd-4s8oLYN-GGi
z+B=2!`jwq2P~9@pjz&enjlkte4prL8(T>11LeHUlY<1G%&o$Y}T@Z!$T=iNxQ3no!
z2t}|+0hV;Y*!VXh2v}PFyIyWnW>3%9cop(Cq+hy%P)8YFHxzuUAH_XMh*>to(goYz
z1|)py^%kCyT3|Q9@`FHHoYpDo*d>P8Jq-gaV|}ZYEjIlX@y|Y%?5p4~x#NcaqsM>$
zC{DfQwc$+ky^QVBasZXFNe5~&EYb+fFGjmuJ8MJtSBk%JhvjAFpg{)Nm$zYx`yFE#
z`RU&U62rw9#0jG`G*A*Kg_lTIMvpG)BYbF9pd-@!Wmq!aN2re)=V!2dQ?<Dzq&4h^
zASqf%3P>1oNJ3zr53grOyWlmxPh`;+r!a#H46%@RA#cj=%2Q9K9FL#xw&!4^vw{eW
zGjCFn2dPd0V*xeQToyzOMe#VG@IfZB)++U>9I(o8vFX?O)R0IC`-xvQ0DY=@d_tK|
zAXY4sA3oUTzzPi})NJLQSOGoz0e)scW?CqyTU8#*McFVJ-H6~5UO0*sf<GZ$Q0QQ8
z`NQ?bK0;;GIm1>VcPjfQh+@c?`QVmn3a~ut3@q0X3C$qAg|FY#p8zt5KqX->xQ&tN
zJu<uBeMs2)_sa$`>*rtZA3~%U^N}5}E+jMq-8X7kAWMNZw5W*ExClZuS)hjoL@l2z
zAMZ$L1aQJH4mN>2+%XnHDSdHmg$KIJ4ybz|deTUrd(5*SwxJ-WscWLT*;3&y$I(Q6
zkWV}@p%*@oexgz2JLv8>_UeMy2p;^?@BWuNeDb`_>sY>+xYC4Nt}S+7AnJ0EJX+8z
zIA3rS&|}f~C>Zet`o1g9(#HFGv2)Ax_e*tmM=ewa%&_P0IUN@-Gh66HjjQ!ZrHFRh
z<dZgOs&k~cZYHLEM}J~QKt1oO2w$lxM1YquHtyH*xegC={kM?|H*FgdfQRQ0yu=1i
z5Sw%;oPB4)6q3<(+1^e9TR0lKr-{XIGUS?3x<-Y)2GRePg-2w3g!9DRJXrAL5zh_k
zK{YKx-8(4CNlo@Y1$Gi@yI?RRfzBXss^#S2aJ%rY60vN2OsGRXdHY9@GRR!;;o|<r
zjfX%{+(E&(;a66viKmy{o0Cd1jofJYyC88xZt9rtP=qLG>wvU@G9O`heNQ=*Pk<yo
z?AaMToQN=pPfEdD-_Wf^=!@S54S;S)SEVm)??p(h*(H27BB!s4orrj(R1xP8J{nV|
zGJ<Wj$)aA|kQix8bjKBZ5LK*!gDv+A-Q!WSuVe|A5h5H9mj-%HCL9e#UbjBg-(pZM
zT^9mYBcP9ckaPXp5N<0)v;AUNjm(|@uL@Pez-V6SOFJ<8!=G!lr3I+j!xtZ1pd&Mo
z9M(n9E^79eQ~4l2X+Zd4EiDTE*l)ChXg?cNt3AdUP>n^kG2ABHA$<yyps&p16V#Gv
z9~lRb^<IVcN3Y9GhyHQ1prfpLS}L#09aQ2^_R)6wZSpom{4l+*=ZC)>2h>{V3ZHLc
zaK<BiL2rPUDkHr`UQxAsm4)ZiYmzDI8z76sE@=0DS$aEeI&pTn<9dZ8%uqxUygmPv
z3p!F(6!Gd9Ji))Rak2l>C(E4;cr8kcJ8O#na&Cr9I+;o#!kmN9V@A(qx)9VCT9Lm1
zv@0~d4EKmeJLn%LJq2xoWGj52SZS;nEiD8SY-WbU!dgP9sl5m}5(=TqFq-|j=fZF5
z;7gq*9x}x@SWeiPce+3SRKehS!Tb(mHyLw`nkDw8AN2VG(xC*i@seqJ!E`WWs;tk3
zlEt(|CIEcDOX-Go5W3li)c5GqCWtI6$m%dHN)~*|oH`@SlaY{wgi(oQW<E0OwvJb+
z2VA0JKE~4AHk*;YWOl&$XqzsqI*21t0gCZXW?4g?QUXW*?SN8j*`hD3GCk;V2QuSw
zVyH_ymcU+L0PJypNG61|lL2C(En*B;AGJaQa0Z2seY0~Qm4O+!?x2&|iVUi7Ji&Q~
z5`ov3E3ZMt>35>`-E!~UsO?Q6YtV`FF*Gofp8u`4ZvNH&wW)JXlJa)q$dqIf=YAIP
z-MKH$+B^Yt;E(~%p81Z+-Os)y%pPfIT<rbuQENakE^P>5C2o9)n*~ZSE+&8$&Tj<y
z?fHD0;ERpbn?jHTKoch>kT3!D5TJB{x8<ko)G{HZq5uOvq^u7NbaAvuv&nQ|ZgTLT
z8#!2>t)sC{keqH1w1t2ml}Q1nt7el@g>%~?VIWEeu44p>)j&Jz&lW#m4p7Rt!MH>T
zCFMuW7e_H#D)N#<BIVgp@GK~_;AU_Y%Ui=u4*O?}3?oFAo41gmI?71IJ*5cHwC{zF
zFUsmypBE^q4aW}#k8g;JfCP+^Zp;&@vK*uouhmS+S&*IWg>hls28opMJHH84)7VVx
zcxX#W3YHvPvZWMUD~VmCMwL&S<gayp0-Q>ff|&s!*($(_{9A-S9O8h;AUc;p7P3@$
zgX1GmFNL~lJp&tTK}t^v9Bm#7Fsi5mCS$Qn$+C(GLK1H?zp%2E?fNyleaM%BJ7yw)
z4QoN<&~Uk}iy+QDaTbU0GRwq0kd(>pFJ+n_>11NkewfPztni^JpzagMR-@C5(044$
z7X!npm3rZ_(EmzqS1oKl+=`b;3fRPP@oF=GSI4$adG?wfTAYZpi>ppOn$&N{#clh8
z_;1A;CdFvHl+r@0;}a4n2C{EHT0(4Dm)Vypu|6;o`gwrE!bqAL2O_@@w5Qxz9*6IS
zWE)9I^NCDLSI*=vs~>dt)4iLl(4rZ<DuD>F`&AMM?+b$a(h1%4S#TiYDYt8$Kwm6{
z*Znk-G4Yc=yApZYuhZlzo9yD+YO?iUdZ25*i$+4!kG72;$f7bW7VguZ2O=eyevSna
z2{~|jUr>3R)QnLX=EVP{tIF>@Mxc+fQ0j#kMnVyA>zM(eWs5Fu<~YIhlM)MgMINgb
zLpCAbm7NMK%({b|f<7fFgjV#$@_2F-f(r>Eo_cWOivgQqB@Aw`0$$mEOsd*4IlTsC
z0ZcM<Mvf}8<Dnh_RoS_!?N`Gh6QZPZcv(&l<aLfNyuk5<YmY!Eh7t|blV29>h==Q+
zz#EaQ;K><Q$@LbvjO007{V(n$oB#`GI+D}^UK2F3({5(q;uqv?!0nwP2RZMsJw;`m
zpUtg(vQk9Y|2!IvnIw5MjDd;QzlZ1}Vbk#~1N!LCFPx64;N`BaNet6BAXDbPvAZ`i
zQ*<{&`DLB6S9m%a+44g#z|?%i)bFwH2mKPs>pJ6JX6YRNw7lIJ!Hoy^*S#>1dkl%Z
zTU31Ff23=^qbboUU4qErgjc#G-kkN5#mBq&i0db_@8`%`2}&EtQd;FQhH~}MA;>g2
z>Pnal2qNRpIr8W|i6J1R?$D5g${Hat$(l^6kb_bY($BVbu%kJ24Bz2%U$9H58!F-P
zk$%9*AnP0Z0zz%&`n^BG8krIewkHF*COX=ZXsLueBg?)F6O>-EV^9m`-rqN_6{#Z}
zg%8+xpbL??3}j^`<MCDP4}N22C_?MPWuOo$>ngAZUH{ze)cEOu7>4>Ts>@WkTF#HY
z3!XB1a1{oZB2KW$Kq)*MZ4B4Wizm$1(4f0I894~gIN!u~jvicT8EH+;&ZXtk$-eO(
zv$+11IXW9+j5n2u+OI(sonb<Ur<)gQY&qjRN%lvXd>Q4p8i~8J>cbn#4vs-nSd#br
z0<9`XP=?S86RToMKEB{y_$v=T6W1p<=?wn<e$<sI^7B;Ikl}s3FB@x@fpP4+E)Hut
zhUJRx#0UNiSp$7TLvDXNy_~<J0F&n7lxw?Ry$m0dvbcI3#-U1F?*01S<15EHYz1*j
z0_$--GhN~3;wa>kbk3~o)p>0m`M0A4t{20G22S<rMBsS}GPmxGG6`kL2YSSRLvLcF
z0c}O8{?ZK#?(Nsn90st}6jmJUu22^%*o6De#`DNRsX)LG6@(HLyjRWaD&nB6S~Yh^
zNi9QNjkV?&Gh2(ds?_P#&jC4N#&SNjw3kk>?36U*BQktK!QA?`A9B`R^BvplR_g_F
z<WLeBxLap<U4+Fy0yDlaPzH)ijm)!}WpLChI7^`aF|I(U(SUQ9!MsD7Gg4O>QxY`Q
z7q=Hg_NQxW0+-oj5cOC~4oT>|Y8uQkYG$4i`e8ywP_U<`yq3WWXNd?bCwa<Nx6e59
z0<Gs*?g)D43xche8?O`}gukD8-lp+Kw7xzGw!RD?7A&IayBwXGt_C)&<HaxPWZF1-
zwV%&Ey!va+1Ge~zt^euH)LC8leUVKdQG$J>fHf3^+5#);Bg22rimC4^!j7MxR6|M%
zz3l)<7Q>d#D1OP}R<FeoIP*3&qq6QdSV&k1H=S}rAFG*B1j6z(xycee5goldZ(>di
zpIA%h5gGk8lhJ$Fvsj?_vcHj2aOS$3rbY7U$D701sn`9zj$9iI3R3nHDOF#A_uKVS
zgMj0)@80Ul&BR5^>-ikTc!t;Q0-gy1RUrbMzlFq}=>mYB(f-3Wsbhbm0^4Z>vgvD>
zyqU^a8i+U;xGEVK59d~`0c;3UQ$@P_PTNOfw^aZL^cVPw5FkFs&mO&C`@RGpNJQi(
zzl49mF*|&ysTkL5x_xb84tiAVT;diGa5+ZeVSIPq-hD=NzXb;rQ(B*roD=Oj{8srq
zE>D5UF4qCmxfq<YFv)Z4(|hf?`EPj+dIo^Cj_l2e>oW9j*Q>v(N@cY55%Mr!2_HrY
zG+}3~Ls3_aG;IxcziPho4T;Eyq;GqBaIfdZWKUEt8OSm|%JP$`u{kqOH@_tk0LDRS
z+N)mxFf8#i<K;hXW(ZOV>+_*_+#2v*V8vV|Ir^F)g9Jv$5RoNEa-#z!GwG<u<I7+E
z4wm~LUO%ZB(rWT01F^*H%vkD7A9EdyEpR=*IQoU5p1^)n?~4)%+F`u)#L}CF?qYVs
zxPu_=gNLu}(4RA&zap8vj>aF4)6AXvsKkN}=L=%vZwE1^x=&_r8!@3!mNK3_$xsI~
z?cE<x(|G=B6DoO?Aytq=UtdJeWP!Tuf9N?QIs{wA^eMI{US`@-v#Ibqd=TZLJ&emK
zr1$ywSi8=bA6{J1Pr=*X;h|EqLszNfN(2wzp~a{W{IgTOS6^NyvvZy}dq5{jz<ItR
z#33I6==bgVH7|nM`=v9WVqiw>SiC}&+{^`5!fP`RRp8+{g*~CX3wWHkr^6x6w*NJ`
z^MA-$X>*7%B~JC!M|{)=S!xLCD`I5cYhZ%Qb28e~%0){*3}lq_%A3Ys(P3Cg1&5A+
z>Fa0U&Xs5KDH;5Zr3SR=wlQq8@c?YTG2Ldj`yLIxcOIJazId#w-rL*sXQ>o%EGacd
zUjelgd&lUkjAs!b(a!lmpPz5+;B;le56_-bRCY~0wOt()#g9Hyr*lEutH~%Q$xL6d
z#_`<8L12a}0|>rbtsb%`cy5XPx-bxC={FcXKN`=Mc0m03HE4ig@+Hqi$Db0a<N3G9
zJ6oYj4zbC?;uD71(hwO{d3ry}a~VKlPT;yDvQq-sBrdjy5vS}+E<+O5U2(M_WC8s<
zoxaq_gcq-<=c4+)RbP*n68lwP?OH#|+u-jPwu1`$;X|<dH^*J>sifluaOWV*kI}6Q
zld+q$q1%sRXzQ=16HxrwYrI#B7k6WV4p#DFW{hxN=L1E1YtOjBX|LA^(|bup2ozvI
z5e4~)FuC6YL&iZ*ULA7!c%rw6qBv=3wFcpEVUMn&F+j<>+YIze226E691*${=lgJ`
z2)sPtMWt%-*dWLFRNQFj<f5zzyzHxTzxdz&dlyB$-Q^!>7z8*A437oEdmO2*`n6Uo
zCCat)-R}Wi{NbN57W?2437;7DS>6Dddu~o@$WLGI=bu{@vc9v-dSUH^nM~b#I8o4;
z{V=yywR1A5qHe2X%c-QR5r<-SkhI(=^HAAhIle<>ZnvhqVz1nL^^;d|(e8^}`<2Mi
z<gFemB#!)8=U|(@dH69M(u3mf09E?=G3{0aO~h8O%jf9|&vz&z^=rNm;DYeigDq}Z
z9iH3M2X0wCN=}c@1)g00GeQ*+ecj5n?crS|It(tJ9)R@*gtUdH$SIS6rWNSyLklpW
z_dxR~N!5qUxNoFj(gk0G3*gN^@ewVje=|6}9LHYY4Cb_57Xn<TZn|~N^@y_hs#QSE
z`b{XP3Eo!T#jtSE>>(F@9W%+|_p{<I4rU$0Q=D4e&(nNtWlE!jo<uhKIBzo!8Z&+I
zp2%BEk5!7#UgmWGA^7E#n~!R|a}oL0(%6{4w}oHsH)!qmqSxyvfUx+4El;YP0m)Uy
z+vWXW2++WZ9Q?Pgn%6L%_P8CQ_GTX*`+NnLFs6GN0V4P}+LiT<X=0>CmRYYErz%|r
z$#HY1KB$u)1;oA9oRz*U9oJkxZ9A$J${o0xw!t*<&rwpgbhLin^VvyDMXAC!rhd@{
zsum??m^$=1LAlP)e?5T&PYoh`+*H?Odwv_Iq3h>A_p%1iu#{E_Su-)UNOjgx*uW*>
zxeb8zKI*Dm*Fe>tS`Bx|T?3NvJ;NwqD4KCDDdwiky>T`Pmtc^$;G@HL2ipkC)Zt^0
z4bl{8YfVldyVK5=QUF6Wbm61n5f_7Do9tc9XPbXc<(&g{jEdT7B82V?mfwU$!pW3s
z7IVTc=O2(PfTFLW@UO<KoshgmH&g)V`@S-(e=+{nz@Z`hhFbpi6GVrIyh{n@ZVu>I
zG}X7Wu#zMrq~&OAHNbGt+*Ar)w@HmfLJIQ3z(tQb#-WiIpN$3l4AHh@c&@U;Map*-
zRtWE+sEuPgt6~~5>B`=)x=u4qGzJwLgS+s42M?dTkr)~UXIsIfzE_7gu7yrq!O=XL
z=`8qmSR@3|&e{-`T|8TToX`TIpScOZ8pYs&Pz<kTqHVBpk!ad`fb|V<d%73+v40<V
z`}73GjMuQnf5&f0Uym9h!%cjj#%c<oN9yzPCz!~@{VD5CHWxIVmeFb6>AUv2e<_C3
z(R@x7M;Ma!hL<kvv-Z4x*;~=>`L>*p*<O*6>;G_Fpf=`t5f-&Q{+CWD`u-leiUDvr
z0!<QN&Sb`v(I8-}kix~UQKNlCi!DA1H~*dnsH-UJ&eOzqz}?cXelT_zJD}%tU1b7L
z8&@Z!(NnfUq0!TnjZ-y+YtFF6Dg7m5h>lQ<@9qeLn+##NOF{#$lL}c3i-M$OJZRC`
z7bNJ{!xTOm!1bkD`~|pdu0oMPBGJ7Ql_Y93AzIWilEywJC*?6YuiV3>fJB<jH&O$4
zKEg?Lav5|?edR4Rl11FNGycXbPKy~XN6SQ4@ahao0Ye@W`4grlrFu{3m`R8mv88fo
z97G@gbeqs&QRGRQq1M<zP$6i+t85txB#ssa#nT_QY;bf9DyZ0iS^{ss_8EQd{*8Nt
zP`RpP`mCG@BA^u0u(aFIYesZzQ#iAxDJ87)P=nc#p&lR1)rih743$tqlJf-Eq)++d
z5Qt&nGWb(ozV5^%U0%LcB2AO$6(dW`3v*+{Kj<(Q*MF}CVd>XH0rt<Mh=cYCWs_3o
z^0de6A%OZohx6LsKY)u!b-V5bdQLPWG)qnEc@1R!Q(OVq^mpDn78gwwCFXq$ac0~o
zk`*PK_;2XOxk&GH72WW*Tr%^&+J(JiQ7J8oI6zF(kWYwGL&k@72kQ9{agagCLE`u`
z5<E;e_+M_Qh?ilK8NmQSd&wlO<0S!14&-DY{(<1`?|c=U4CjddRTdd`09(He?lUy5
zV^k@?rO_xiOm?0h0=-kprbRTk>Gfry)u&tWWJy6M2?>m*47IuTW#7kb3u97ifz6oP
zz{}wiw9^$dq`=VyX@&S9xD+W!oLc9bklVC9-2v3(*n2KB=NA$^UrMr$*6$P!l1^<2
z8WZk^p&1C6>jnVw(1KtpwV2Imr$av@+Cdu*S`65j!aUun2`<Sy=vLMvW#C##m*vl!
z;y@{C|B~-%5-mu8@Wv!N0=bC2xX?xX;L)j^zCTb(4!*w1Bpd^7E-fB670ewDUTax*
ziA)oBf_JM`cTBp^ms&sO=*#@4{)Yd*tL6bD|3an_)Qa9m;k?8KWln+tYEfw1)G*o7
z*^fdb7bOFU3>pXMnwV;4H@EYOJX?^dS_@xW(~1Ng?IeLl18(Vkz}%xYxNIsgz_#Qb
zRVYrA%^qA!^=80DoXs9Wmc7}kLn68R-#~O$txxs18_a9KI8mvbREkY)BsuZ|9O!g0
zJ6TyRKpb)4hKpMQ0{umL<%*wOnG?tLy#<&t3C)nDcQbf`STx|rUy1g^4OaEjq;-l#
zmC83DtjjX|Zm%(~&L}`6gHpA*dtbU~P{O=UKuGoeU9Vva+1}I6_YTU38r6GlKHl+u
z!JfXka4{J>#~68<&o`V6OcPcD563CaV;-*ntTlcV#CY;Ny{XY`%BjOOfOaW0Rlz&R
zWq{3>#p|P{NG&z?ci(P)_?m&eRRDQv1GHlW<P4GUXzM^{VxY6mG#oC|0Of!=P?++|
zTbI>jT?J<PMB5JvibuyPh$4prO^Jb4PY}XDtLuZNWNkjhA!_~#zJ|&q2~#Yr6o3aX
zKm^jkB)UF2%@{*riPiDks4?d@?m8I^Zg^Yk_iq+I0$QzjDXwN{*7RwEde9*PyG_x_
zp#ytF`i$7R1GB7iha0k1I;%=7K7K<-%-*t}b<#OrRx`S<Ee9R(JLRVb7cqhLI}pnI
z8hbwPjS-0;45ci8Dqx@9J0t;2ssu6AB=wK5B2-O{?$N>>fAy-EC(bW(YnKl{D;KVD
z`C2~>FR2;PW4{xrWVW=l6f@;MKDP?g$;1;kyW1LX_qy(#M*TET^0eaZKji7O-_uXp
zx7Xfi(6L;?sp8X5fqJrF6u#3OByv3Ifp4zQzq<SPhQLM!NtmDs_znd)*kBmmIllWE
zVkE^S0LxR+D56?z1ZZ9w0m6^!-a41ECfiOw)uQ?*_PX#l9~I6tyV@I(ucq>8dB}(?
z$B?C=;Zc$RZkeDnQ{*YN+6SnY>{gC18mevShk}GjkTTi!GB6U?#J|fyAB>ATSFeJ3
zoF0J(^93X;wrBUT*{@kM#={PnVG|%8LBP&No;~q8HFUfF`|JCg*6iJ7-@#y`A>#=y
z>Y_xTP{g8pIUWGGN@sA_h2TBHNtY@?1(-c49{K-*HOY-GzZR5Y2qdzXbC*xP;+XI8
z<8-w1p1uc5^IP47NslCPIS}s`E{wGUCJdY#&(pX&o<Gbi4r3mGV_(y)$UN-#-5)^7
zmBNZzH%AVQn?A1F{y1<|a3*-Y+WzIk9g)C8&oD`=-Q$#NG5Gg?jYN->AO$;K8exf}
z@kED8Hl>28;IZG~(v&pUmt?mS<c8x?^OOO^W+VN8fwEP3Mmxg<K;;%D;X_-h`xLeJ
zz$@z+Mz1AG$Una=x}%<Rg*&Wi_0}_Jv{gAPXX9l1fgrdlf2Qf5iDV<p7BUqt9iGOg
zEN@~j1)VewRBZv>OzjOn*ljMz%33W3Y5kF~AA2}`ICbub*?x6~Q)hyRB&Urg-`KeF
zzSS5R8yg$>*>ctWH1-i&%-jisU}&L1V=ypKbVsWA5x)fm-zva>0387g9@|at-W{2u
zh174O>Ie#=HQv!DrplBwZujC~c^|(Rt26PtT<9!oBNbvUxwmI7y2v^!0cr_HtsLr+
zO(7G?6Y&yG|LGfGghT!n0ZBCFv~?0(!36pkVlk9Fr;tg7o?Bvwp)^|FHN2}$fZ+{A
zK!M;b0cmdHh35=Rmrb=x*XhL%`N*hKW2kb?IlmdPF%^xlroO2Y#=3hoF(szL=&`TU
zL>>6Y-4q9eA-8)c__`TK^76PD;q|hT;c>rpC-AVo#Vq)IjVhczt^^1ErafS^TvDuk
zk<CECn8uc+RBl!kPv5$UE0+PLjag(&I6??T+Gk0CWWmD1@??|t^GT4V+`~J#w)_!m
z+diE$0`W@c*eea8?`;0Uv$rVP_@GwI^<JR$wi(7}qjFB?-GRTtndh~u6%J#wFY5x6
zZZXF~Xn8g(BX^vRg(EhkTSbf4MzxCNyX$B{XWdC$&-8w&4!H4Uxrv0&XU8!5vZSl1
zg5R!F<lf%<tgh*iy-bm+D=RxDN{NVwWFXaqdM!pOr%#3BsdEQ#)nt2>%xZA)gFeNy
z7>a@_dHc1tj|kuF1)^-A+YJV*>l9dnXw9L;fWd#r=&E?fNe{;BtI^G}ZHxp#^URt(
z8fH~B=KcDL!9J<gMvK9T{v1_Ph0d7%b$9s^vmmQ6s6`u5S+vYZR!z^Kbhihw27&8M
z+=B!j!L82<RkWCTrgbnbx%;YWzuPf=iVA^`794C5D2P{XCZIqWeD9wye=|H&&ngQ}
zs&8hMy7__P)|zIhkr-kR^1y1@EP(-^PCW)S@h5o0v}S(8P!b9P52u`Y)#i33q|&8g
zTsFALC@)lw@bu0vQ>h)?C#i|_ma1dbIrbjr(W}D5IjlG#&hSyl;<XGWOn)2i;AMJb
zEVt;xvQe*2t+u3uIFFOQ%L7S^h(II;2L}t_6&8{c`sh#z*nAo9NmvSFz%g@{IH{Xw
zWNATYjE!y{BZy~+qpuULbv+(&ea|fJ6k7SX;IP(9JAmX5i|Sy%hZXgi>jby;ZgQ_5
zu`QL@<ME~{hq=~ZJ}h(X;c8FGHVhYMpBCLST~T4ufazcC$SaJxf$DeEc2zj^;2%YE
zVQ?E;tadEs=y?>3E5C%qGxYYyID4Eds;#B7q{$Y^SGACM8*5*?-!J<i;xMMOn=++6
zN<k$4jYOhdMFoY)4^UVt{!o<-RSAL4DCkKOQla2^M)mgzi3q;vWg6+z&VtBhtv6XX
zB(HsUCit-4FTLJ)2}|sbx9z5bGiz~{hO~8K>Y&$yCz4U<N6)P?y@@^A|N8COW7ze<
zORcdAD>kEDQCJYOX6yE!qjD)V0->%DZ04J~+kiZ=iQN}D&pm>QXBX-TW*-mjeW~1;
z<VC801Vy8?LC`axKOKVxiE{2=#RdnXI208Y?#K8B2Sc(@WJ#BeREmVcB!+ygvv-;q
zY-tzZ6J33|r<ZFz_bV~GZ+nSK_#o85r3QiDsNeZ{sDz!+hkd12ZRK4kLMHyTtE7m?
zuO?+><?BJAziT?VnKx|Rv??Ba%MeS`*Bg^LA(rm>jSsnNy#4VOctlgkeZ(D1wb8%5
z;-4SjY0>}vAUu@dbx(~=>rF_>=0m8I(qmqBb~j+9rF%5W%+3Z8zDv|T43Uto+EMw6
z1WM63+V5GoT>YTudHuj$;26k);C)Z9MsOCYCp+4<G}+wbu&3~t#`rhL{_EK|l|Vci
zq-aAo@u_SGU?rI@xwhvVcr8!f$F$+s-kt&l#eZS>U;hKbh450jZn@GZX;8;vkTC@J
zvF)@O2J41M?HxGv)a^PBF2n2Pi1}qW&i0IAyq$HGD*SVtmNvi5>L<yLzgzEr?Y)0N
zP6LwriXJB*Qw#%Ix+*b2+;k&wkA_wZqNC_ek5N(AkYCZ9TS!q+E@NAm|JpyA#9ol^
z`eHO`LxZ&Tv|WPgz2&}cKvU{@53Fz^p$M1InZHh&pXw(?i_xo!CX>@;*H|xFkP;A#
z{|Ryh5OD)gElOYlf;>RGw_U?%ca+{{VrkhNz4y<8e_><Kej_FNEpK<U)A5{G{%@~}
z`0uS-7mYnL4<l=wj;qWt`oIG4jQ~rLEeA_ShXBTy{Il=UBoG6tEGV|FukflhyNHe}
z$*DgUB$BvZs{XFOk=;8IEH=-aeGTjnV0Zslpq+n>H5d<)K}UZK01g-tFtmPLr`O6)
zn9o6*J!x`dKd$*5#<{nPLxHseUfy{zm@`)D|9PQZx&2X^!tX?gG}yEC%-XeyIcufa
ze}2P5=qS!7QATDuQO%a^oqB)g%03&#Nw+y%l|<^e+8vFMLRX;qe;4<ikJ8tJ^6W!a
z#m!(9%Q$KrIB;+K*l!5^F$y;s=})**^Yv(-ctiG`SL*$sJ@)|e%jEzeIOpHOlDj9;
z$Kyd8$`}T7@G%)*myEztjlEJ&+<I|hrVu8Oip$1?Ox^tbQxhssKV|N=8V8_Vn4VH0
z4@l2h8(GA7b8VekTAtT!(cd{NZ1<&LC-H0`;_(CAwjXhh-Cw#03OD|pbt*<sEEC+c
zD)n4^tUqIWta8xjL_gd&M3oA;=U}wsZ?5hCw$RkhmXA#r20ppP9LQEeN6pI6!b@Zt
zH%Z>wo)XcR@P%!6t+`wrMt>8HQH9{UdbK04PynU)VO)@NYvRt=#(LS+aq&`xGV%sU
zyqSnZ3ZVS#>|hrV><e{%{<m$S6jJbyc!anQHxc1-RNDS(>h{Tml9F*TY44O2i$kq)
zzQt&GNJ>ga*&m=S>e|!WCBVO+cbnT=eC6a7$$US|Mgv6VC?sf%u2j2mKah3oDIhd_
z`5qH3!%K(C2~D~~cy7Ip^@3D7hu{4y%z5<pP1twu86A0n59e^#VZk!_&k}#b>97O@
zE+WSw=FwlL^~xWNfxculPT8jt$3R!46w2XLxB$TyO^wtl7(|O^Lpo0oX3%J2VBruj
zgT<l+2o7ybI8SdkOF61cWRxLesTH@rk@8=jG5|qdoP-SioaA;4T{xiyb6_FxqG>-w
zPH}&=uv27(KE#QLt=(boq-<wA9rTeT!|Rma>GcTfCan;(u?hsM;xAJKuo`(yx7IYr
z#FRUwV!&Jy5!JP)5S9dpAs%lN-CwBRACtEJLShrEBs+mY%e8yc_-lwLc8tN`M7&i0
z0llh777eC2bg3~@6vKu%XKCY?ob3%Z|J@62GL2v_b%L}=2Ib%#Q3W^HKkp=V`W*9u
zI9y?ay~UVPe61!q>Ye)hDK8G|>>48|KbW(fF`>qRzx##6(RFDnv-O5yNjk~P8+UOo
z_MAAJ$Y2!(!SJY*_K8IkKlbkO8Sth2;DwooLq?K~!t*=j`TH$2-a{W%A3;&&2FrYB
z7V8jIli2QU$4?M;c^H~qm-8`GFy1Q9X^=A?*muB5Uvi&z)zc!`&}Ezao6Uz+OS4Lz
z6hZBuA2glCSYFU)>rb=Kpo+yI*OjB_xP*oD(FdAc4uVCv8FU)W2D=F2^+R3=?i&gG
zd!)yDrA@X8)8RB*ja)t0hQa353ttU9f|W@pH_<N!qkG=_v6HE9-{r792_RU;?vAvA
zSB!i=MX}?<fpK>*aQ2OSe||wM>WZbF>!TWmMkl)UtMs?w+!+bN@QZ|h29X&sBlu%T
z-av2jNbg`Uhvy^Anj0b?2BuTSO8G?Af%^OV5P9T#P%d+-%<9zRJAGMshcxgd42#7v
zjQC8d0~`?-FNNHm8IhM!W@M~w&5^!GDU0C~aDBiJp?*rCn1o5z$A{EMg97`inko4w
zV@6Sn6k>}%Pv%ZQHL99n+{;jq_+8#NyngDu$x!cpvD?kX7q~{Cw8&DHlFzUbId}~6
zy!f|E<U#Sp$mWW1Nv2N$)x-E5)z`y=I*KK13jh+^9q)ksN*7BbX`$Ib((J0p(9OO2
zx*z{i;2>4Jg|76{x9WN|FeJLJYjK$e`lJ!;@<{c+KmR?Yf_8SK&rYz40)QBFnmuMO
z<17LA>Bo4B6976#hIrJewi0pFzC0{!tYd}eX3z+Cu)$47hM}&ywsgcK<aw&Ya2DJ<
zT40K_zzAe#@im&L_-bIbzo;@@PbHEY8iYd$znz5?nrbJp=@?hkZkgF?z%LmRF1Nz~
zW*~TC1k-+|T8Ng{`y5REq2qa((K*SgNy1zb{u{E%vrUi;k4C0s%zmZuj~+gG41=yB
z6MaPi8d=KOVa^{)CRywq$-=6{2KKj#H93XZ248f|m8_TQ597Vk^X6kCDPckVRPUOi
z;c*48&$s-3eWyGLFro{gSs_)^^8KwZQj1nl;+WKwj<7Ap#X<NhGMtZ;y`=(1kvxDu
z7hZn(t3t*i+x^N+OM`R2Oxu!;#fmKm8MS&XIzO+ZG$4*BudeOExQr+z!btsU65bFS
z4WbX)r>YyBVj7jp)R(@1gTAFF?r1h;SsYXRM$|H#t2<~n@^<qTop=`?u}ToiT%6tR
zPHAEH17c$R7R3RwQ6G*;*V-?zjFDI9z}QkK3iMsHyJ`J{V;}k)G0IH8vs}@Hkpz~>
zu@aDjlW#z&YO9qVvzkd`hWN4_;a$m9S`iewz=dI+u`xX*<l|ei<p7F{dJ*S*{jHPr
zYQxd~$*-|x@9ky3XBJIvJr`oyuROt404lP>7Hgf?X;{av=h)n9wU<HK(M14b`usg&
zLE+&tyP(8GZy=9HPf^0tx`>Ha%7uc3uR~65La-}>f~7F%V_*&t%3x}xkHODYQt@Td
z;!!?|vddS`X>zRwc5ysc#Y2blz0~g>V09tOtKfekX|3jaaywh|X0w}GhL$Hn3zK8q
znejj&Zco}3?Urs<Kd#;z1<f7*z?ntc+w-wYgaenVAV(@Gt-ZFadESl#LnPYn1kN#4
z`l$wkB`r%lt?O=xV5m67S(mOPhmKmYkk@Hy7`Z==BPu2*7CCrmQ?g?#*Q#(@A1*o3
zwG^(VD=}^06}nO@rFHI_A1|gUEz8eN=_xLCZ(ZqwVAp#;42Kg7`rW=}yuH0;hOP5w
zo?WDj&2l@bJ!!5q<u#>WuHI-#4HNu0;jMKT7j7F=QPj1m-Zk2bi&NviyR~-Mb94B#
zGj?pa&g%a<$XvSp?DAomu@H95TBD<*wjR!7sr}$Rm<`h>NM-KmsLbk5tk%@;z@yQo
zMvC0FEKukOR12(JYV*!O)pWtw@~-7Rm{GJYN`1?cJ+a2_i`Jj{JDU|hM*N=yVJ)Gs
z*zt4O>XGcX^VSP}$J+^6RkKdkZJt_;x1XHT)hq}8v|oXy;2Gt>kRyxbmPe<hg?woS
zOw&d#(28}E2_do3)j6V4b=@mv?D2fsX}k|w%S|a$aX%2i%E~naK6NI0Kq`<f&nA7W
zbEg|lp?SGf6){<fW;OgBETdb+=hk@>vOAh0XnIc~|6^?D6*vsflR=;STq>Gwn*)I8
z&?FGc0+0%fKJbH>J`aYU4`4xw3r@b_7ZP0@RfJl{6jU=X_*(0yL$i~gi|7P2a8n|i
z9UqDVAiT}Jxo*Enw}SQW9IZdjEqVh)3%^f&ah;$>A?XAGM;riqOdQ-pN<O;(Sgt)e
zPZOC<Tdp-|hvA_X7(J#Lp)Ci*uqi0SEmwGXtHPRSNMJUMdpa%!x7TzyVZV--m4XH0
zPaf03bwxWWGW|Au?&s%0onN?}DwZIB{Bd93U(X_d@aJB0BmOnx24}EdgkknxzSdxT
z@#dqPwV-`MK`B*BrEH$V`>CrZc6O8zQAn^g0bEEipOj~t>#9jt7_g3*guxP#0?z|m
zf4dG(uF7cr*q}g%LtS%xJU$VN$T(f%V5xjsuOb+~wO;mJ-CwJR3z8{oYY!ZoHvRt5
z^>L1I>GpKd+vsX;rRA1bz-x24-uDHn1<tNn(UQWG%{R~O{`*4QXv!RN>emv>KlOod
z`doR%<_^|NTzx3VN4;&>;*J!Ml~c7|Teodb5!vZaa1mR(qWw~TTDTtZKc+0ruQ*<s
z$X{ep0JSlmJ`U@(C{MqB6k^^gPyM%W9Y0Cy-7)@OwrkF3AAc&1t$2KJgJNlQKQlN^
z<#mP&?hOja<CHL`GY1#wL+<L;G1(l|XDF*?Ffs}z@0`kD(fV{^&6);FqGHDr7Fsqo
z6yI{yw5@7+DOo<vH?8ab1HViloZ0$cRD8yP)}37<Y-NM#dU#(u=34D-zA*>r%HoG$
z<nr09w#vWn8upTL+^oj31osIo9${-oq|R$QoIF3w`$Sd+lsCbedGIGb1X2y-FzY}p
z!-!0qxBW|AK#~M~VgiK+%R~=w-08U3o=;5D%s~<!LduMEkS9?yNko!I=e;vlH0}e!
z9DB8r@^=iLvvFNsZTb9s6>zm(TdCZW7B<$>&ZePV=FqoND-CzTnz^<TOy4P5ZGBT^
z6XczNv@&1-A9Xh4=M1aJhb8E^AhIBW^|RoJ-L5;{o;r>QT0s6{;c1#pTy+aa^o$kE
zbY(Ck<x7=Bp=t`#iW<{X%k`(gPR}g5Hcx_0rBgKBRi1M~*>=~ezAQ;|RWXM+vutOt
z5z4M>mS1ZRJk?=5y7Psf#`E4iXPWSz(DgiVf4dTVyZUQuIUaSU&Zh&H-^l2c5qXM*
zXPh3cEVp=RsmXcUtj*n?%E(wB)t@f>`Z8*L6tUux?|qa$wmRyW@*@+Y-fC@Ws=mEG
z3yK#ap6?rW)&#sW;<r)RdB5%9!#ON9ryth5_!dgYjY3+j?Yhf5V~k?-1l-AKy<G|*
zb%Q@u4(~JF?-yt*zgv5Xc~mdQ9j!Dyk$yRAfrYq29_82JPidLAK3HpR$!^B`-D0|C
z;DNVICw15Cl^RaG(CGT%5l%TZNo8TO4()lZ!&=UL9(LXC$0{@<c$wB5J#JF-gi&y8
z>}mG*)Q!Cp_QZVL^xlw$o_y=t!D+9TiK_dLRTCLevVUkD1#Bl_elcj?SL&e@-yg4(
zJ)s4FqwLM-uLwG-c4fRR48OgsU9pT~y?%x82v%rgeCdp!iv~50%vW&l07q*8^|X!;
z+Q7!tp@0!nk)|A*(aytpRn|Ab+cr*u+CD;~Iito9`gyXvY6JRkw;{f&45ft;|34N>
zex81HLTMYj<)0B){{%N;wzQzrV*g6;7-9Uba*&FPu+>xCcOp(UOR9KKeJT0pC;B3-
zgDQ{~^%z0AtyTw@DvP`i%xxZMz_-Ma&~D?(FK)iw9-Nl*dMU!u^Ee0q{y97_{oZsE
zo*$2rM@>P;#Y#;Uki;@F#YPgh$O|UV$*F9&)IUGY0s6&CW0eFwBnZMKF7<toQpOuA
zFYEt7$eXceZRpj9oCJ$h7+);yl=g9m;4zUGY)3H;5zmemimr&6nb}Y5{b!fK<yDK>
z&jDQtlPwMg)!*?)8l@kv){tyeK%`ziTggp$r23E&CtM<_Wv~#f+LB|w)nw)G(Jz5Y
zd1G0e%_oaHT+T^zvFyQ!92ka@85*jKF2{W}K<YvaE(xmBD6dCPoipMAceCYb<PCp~
z5%w9mnof=>uiX!2$~C)230ltN<cZ_^_)+Ok>C7KaJXxmP+qhaB!jzpNh{gEXvT>$j
zR35HhcD{2-_H3mO<v;%*S*CwZ8HDhD4~n7DQ~lMSq_b&@V``iLnvsxaZ5zy+U?~%g
znM80zq*T)~vY?keI6XPrUyY@k$}~p^Lq=9RV6W?AaKtPR$J|z~;`bR#I#0EIU4gzU
zc64RS<9~m`OY#0qn!==B^EL;Cgi3FgW&&1=>?*hcOLm2dB^ylO9WU^95#jUNxlU=g
zYNq7;|M7H|QB}QBw?7=Zkw&_^yF-xf?n8HXgCI&scZYO?bRDHzkd#KcyW{Tv``&xM
zF&unw?EP$>wdVY-xr8|~q)pALeQAyTi9js@OgFbi4N~bDObYmNGVV2#X%=@{@NVqt
zrDcazE&J0}C454=rhSC&j5q2s*dTsy(td6ki*d%veXrelE>$6yJvk5>TPlN+e+;5u
zY>QOv%xF+{b_eF>yWQamNtNVoLctiOfK1uczt%q5a4;MybuQ~);+0ns6T@IPo@cy|
zmyJ`&T)rrr{VIHnd-?ue-_MKTx1|j}|K+^%7IxUWn*5DFa1h^NLXB|uWndO|KJ&9&
z;Npk5|Lj<9#l%WkZLpvhyS({@%1(v(!)ZA#wQ8OX#XZcrl_iVItzJV~p@1Ed>QaM_
z4mY8KfL|J|g_28}*(X8_t6m__W9NLZA#H-YU%tOVp;tlWq>+U(o0w6ll)O*VN07H!
zokilL(g(M($sI<thJ#p3>}gl3vq4osw$Fg&AQ|*a;`7M(3<ZI$_oVB`z-W@MsdR%-
zr2`j(j{JVPHaoW1w66=uU}Ov;q!jn1`ygzCZe&nMmR>fK#s`+4kqw}yqmh2s`I4yF
z=kf(fpyl4g=RR=ERHCTDEsU&UTFya>8egX>#d~c|dHz{0|AYIuU`Vd_Limf57s7%d
zj&tW5Zra+<)`)<<!9QdM&+@^%Fd0u5x;CRbWeYrK(o}21|ClChnce-~*Wv?#4m^CG
zBneEc$#O>i9(k-)fw7sqk&Z4WgM*Wju^#osyt_&Tmb$^+8b=wKpjd<=g@Z6MK4FFF
zO(D%SU2rI?pp}_EzgBIMP;_TuM_TSuOqt*Q7+E+%7fAZRSLg^1`&&r&m#Q+JhO8>g
zLvJtUWGXGB%sVO*U4KuNMhJoz27)VYXjt)vUUpSc`<|=ERAJYQHwSCj_^(T{E;Ncu
zrU4ae6<*nTbmQ;?g{lGd=%6l4i2*o&BErd<i{?{n{f=-<=m8TdSEyGMB|))#>ZCk~
zFkYPXDU=T1E+^Y`W^nKPuoUKa54Sl%dc)sh0S4(_877125=LOU7sEB7%EQbI8D`aK
z8F9D}EnHAgM&ede15PD9yLgMf_ceukjI=|C!^PN?QNPWW#o?LC!zhU%^BY+7)hm=1
zFg+ZKw~#>|yV8yI=$sEKm`ic-iGx{xXppPt`ddNCUZD?IGDY}`VCKhh7Wg#M_nNCx
ze~HautpDJB49>Jb(-y@Mwm}df5&+$%c%wBCJyGR>K(H=Z9hfGppxfr-TF1q~vQcJw
zHXG-fR_{NA0ocV^D@FKfX+};S0q+lm@5YwM_lLB(60l#yuV5A-te`_;CmG!VFv+#4
zxF%>Z=Y+M~xwx8m@Y%sV0l8c9IXQ<8N5QkOmwKxtIMr5DKDcEY^}A2AttQ2Er1xa1
z#a@33i&_N2AeQ{ii0*l~jAfgI@YNw9xkWc~XMIK9jR%H1H-^Z{-M@BZ%N><jB9EwK
z?lr{F<t*z+b(j%3_6l<aDDyW=sPBxGwQe&158kSAOLldeHV_o#5}P34!AUmpog}VL
zoq6`#=gppijtin}Fo(7@_&lpTqD?|+x4?Fa1ax%*rFqvT?0cS|RNE0oyO~U{n(Qdx
z|KTgDC$>!)>5xmxCGvBDAP-_jGw5Ff3kFLxaU%A^x6HnInBC)!cPl2180T3~At+Uz
zI)9Sq986oOpUsCon9J;UR~;-zzhW|AAt21(@Mq3g#*%*gBc;DB)3j=a0$OUF*gx>1
zXv$9@oSszh?uNcZGx@8rj6jL3jUT+^Djb%>)433#1|PiJ>v|iGDC|Go36CI)RhO?D
zsLg*?q|SvD{xm@PjqVW0cI7nKlJjzsP0gl-eNb+bS!Y@@Ms-j+zI8ZA`pp=T>9Ezc
z)W!731Y<9nDS*=e65Mn4-tkZ@;^zm*&F;I;KamHS`mp%RbZUGagn!3ih=gV(&wpkm
z@{Nk05dD()XQzVxN2IwMKDR%k?Y6ahp^dA*_CN0#`oIzGmaR&!?Vfwl-R;4wwA{QI
z3?8DWw)Sn4gh@$E>V__7?gc>$7>MV4rYIP~-iNlbo0F$Y#br*pJ_67OuFr$yn<VKR
z!U{uP!XNFCI%;c!$cbG4uB7(NuMQ^|uDnNqz7Oy0az+(GvC+@9A_0BzW^~rnKPhE~
zhsc_JYc2fJ=&Z-u7HrnG)O)GErK%zh+mu}KG1?-N^9720PR3dK)whF4K))R6#SS{P
zeL#fMqNsYxahI=ob@yK>Sgc5{tHmFW4Tp-!E)sw4+F$ifl?0sW8<X<H_W{3*Uj&r>
z42spoxbnW{*=QL4>!KXnt!uZNZ8PG5CCf?pi}?KlQ{}$)Aqfa#Y4MT|3tI6C#f0XZ
zf85)p2eOa<Js{0Bp8={l-Ua?fdB*l4oS9>h>t+#c&Nb1;tu?gko#&j9La(DIGT#l#
zq<z;mIjVGY`pdB>MO>A5a~wD<Z}Tk;qAQ5jCyDArhvNgLDkY~Fxk9@HBPUg*v|1Bl
zM6{0qJI9pP^jp#f6G{kaR@G*#P$d$^TYTAV<DNs{zfNgV;2Y5R!y2BuO%$C3w3pgK
zJz&Y+V4WInkHohzaRi*P)^^saoQD^oGW<JK-<8=QEOt+dgjR2A*Wukt2}%k>E=lC_
z@bS+(tAv=KZX^(Qa_Zl^FtUlv5*j%~B397VdE+1!_!zEDDp<n|7yEC**67XfM+AgJ
zG{6i1(LjhN!2<9228T*(C7X)jQh#(Z6A819*%g9BqI1)p8bWdY=9$irwIolkC1s(H
z^Kga}uavZI$FG9X+y_Y|#f$f}A6Y7XY5nQ?WBi*UH5;1GfG+z`R;(1?8lJ109}}S9
zo3u0NOjCrhZ{v<QEjagWd1L{zEHsRL8R#|{aPGzuMYl;IKH6YLZGVDtynhnEg^y&!
zC3?jDJ;aWVY{(W)2rDSpvd{@HDUD-rIx)8#qUZ`fNWl=A63%E8*I>~y{D^zkF&jJj
z&lIu+I%c{}o%PWiC6zB_!6Y8{^F6l-LyNx|i-^NjA>Z9JNH-kYj8@7`mg|+aGr!^a
z8=Oi#UDxYj85zZSUJZg=-fhZ~e}RXHXk2`+vJT-M#EE_;5tt!?Y=Mo3IwbhLx!8XD
z-kRkLh%obbcX3@v^k0!q{X|m~dz1Q(l>;9!pM3>_E)Gc~c!bTv85N8)@v?7#zoiqo
zT~PJnBFugJ7*+~+4%Yu<XltVsLII)StL?z(oT|vhHY$79;_S+&_=gAhanE%Ela)p<
z;`E`s0|}HyN^bds6XW=lCw8L^4GN7*&uE!Pn&a<CsTw8vN`bbpmz~2OBl@fV@gUe&
zqk0A^1sY^YhcB2`>P;L==V-tx_xV~3!yA~<y--A@EDL?FLWfeMZH;<um)QB}hUt!E
zr-0CIVTi-pf5P^2qZ(pSpX0gMH?Niaw!Abh7;#zAug;94;2BLBR)%s|XR$e4(fnjl
z2R{HC6%`Ct+rkqlTeOvh1yY<Ku_c>^VTE7|eCq&gNK|WJ`4sE@7p3}N>RpfR9%Dx>
z3D$9>p`5oMHTYzk353Zaq%~BygX&)l@R__}7}C1i_|36>@IvQLa>l}%qDbc>Rv+II
zG8l6}Z!09mB(xZtgsEmJGT1e>?lV<=!ZwS|Z90Ts2vmCT%8>_+Gf$bw?48}V=Us8a
zqi9Lg6bgh|+dgOT4|)l+En}@vTxyeyz;~>)5*3SGPH5SaDt(=IHMSpRvF^|^>p%n9
z;LQo3RMxcPJ<I6|u6?w>>8?(zGvc<H%mEw?zr3l-u^AW0L&O0DVr0dV`mV%A2@}>d
zE%>F7y+6y&9hLmUca)0=LSKBCbJ_G?upEncm;@rtF--m=!lBtV#3)eU)N^voWnYP|
zVO;k7bO_z1#NZ}#p%<nV$Pe{o02O2D29x@wBomRsg(7clIYlSUIbv0Jv~)k)6IR0)
zSam_<ikN%J4q|<K3<1r7Y7X4RN5{w~#>yvI?>cR6-s0qJ7qB@%pqe8vK;*tqbB5Xo
z>k*an&UfyxeEF;mhfyGR>;qcUA4;AuCmAhAuEJstw%-RtK!KX1RGDv|Ax-2md5Gjk
zw+t^tDa1$1shyQUW!4ufPpuYKIzS&)G<X0eZG$H&UKcn7lUf2}#@y}~Yrs8+q68o8
z3aXy5+GLGNXWVFM-{UYzhl8AVAX0~YPRN&lM}$g94<;Nj?Bs-9yu$)3^n)mDF*r>6
z7Za<V^*%YwwH#l<x>9hPoVLv~oDQ`)8$XGa_gIMgMk+n*;t=$RPl%#@#n--ejZhkI
zijW&JgVD+G99$`o&XKBK`QZ7tjT98SMhznjD-?mE1i|2_M4WH#WOhTnFL5LLM^cQh
zTU%#G7Mk$$v=VLWV|X)GE0^!b+F!UR36>RcYM{XvDOp}`(pe0@_%li6HiN>-{<;ib
zNuVaCS&wjAjT_^OFg4Hv=^T<&Px!Gr!wp7Ldojx8VLe%a+UiSFi;m&8*($mL`o?2#
za;MH!pq6*O?C&bUPQ1mfpZ~|1*~mhvz5PKG@-V%C=9OQ4OJPGNsG`iEdmzB$sV?{>
zyYlb+yL8FQRp~UzB!}Zn!8u>Zw-z*PVv2W}7tmjdDa`#jBO<g_*$BfQ((ZXb!$U5y
zS*?Di!a|TRrBf#vwGFsf9xN|8df!_%(59E=v4u<Dq-Mi*@rem4Pd=B{a<Cfr*dJWZ
z{r-R{emSE^5TiIcEL+}PjLIl2?0rfXReLNF*iXqutRjh`vZrx=CL(HnB0^U&!;*3+
zh{{0#|Cbz5(Qcm5og)If<Y*w-Q&?&`rVG7YSFpgrsP5(hQJe396-s04-G;QR`Dj9R
zFc*0ZI8=_ZQR{vW{QuM<p&C;oTO5-0i_QdJ+DYl6LYypdGItnmWi2Kt#8o+Z&8NBw
zY`H0s@R8sowj7p}@uh!fUp?S&Ty_L^DMiuNRN5iJKwNR%$OjBND;yG7Oom}NxG-z}
zLZyoxZSeio3{XZp4i^(L13@i9WA|p|Rm46U(f_~@4(zpi2rCt&MKGdGAep+-z^FaW
z#hvCx`byB@(8{==51|=+a8ZVW1NvA+q-&Uag%S>VX8`LLnF|)hMXq+j{AW3&6J8;K
z#9yRPh!06!!?TAW6GckvEGTU8;*Yx2R_{%{pF%`7C7!<z2@SozcOKe#pJe=7I#>Y-
z6{^u5_3sKT2GLYKm(wSLjkVfgT@l8&GKEfkJd@i7s4YIUm@c)MCRb?gp2j2%iQ+;y
zR5@w$2JJ49V=3XVPg17q>??)oxjsQ;@)$z@>!j<f_eQbF^g0~z)B}WF?{<XGM5apG
zR@&t@e^@{W<jEJ?vp2UTS~Sb1witjHSt=-pZI+$Uh6|$9N6b)OurNy1opJWj#n-Ox
zv(5I!ZWvqUs6s&|wEOVg3`73MvA>8BUsCdtS^C~|7z)R@dHWbriaA;m7wn*hLT+;V
z58U)g%LK#9d<~EZ4lf+kQgpju5mKzl>ES6L=yAmK1-*w<FG@kl+VtumWqGi_OlGLW
zoER?~JD&!l5_SpkWsnX<-uJxVz57mogZij`1P04Z4oe&g3<M}&Kmumc4sQNlyCSjX
zFzQ%?7as!}e(EG-8h<0LCz3!iMM&<3qxNc4N%FnrKHrAraPaVGxC*XX5=aRIA+U#W
zOlJZrz_{u%3kX&-lR{}%WRP(20CD5^)5rO<R*l-mRGquI=92+s7`HHE)X`4CRvVyk
zozKwJn3Dww7~9FHNTe_}36zx+Me+IU$boWd8{uTg5Y}c}Ff622f?Q5MN*M`!=iIGN
zR_TnAtrhAU5V$MC`aF`QjUmz(!uBAVn@egxQjgCECuLo9Y5Sxn#aV1Fp~-_&9V2y~
z3pZ*&V)E$^t@cso!x|HF$1sGIu*6c0C~JyEl{9WX^iNy#m?kDv)1H*f1(CouIwEeU
zTjH%rCrrb;H`>+0ZBFRcYzO)R-<dQC)9}wUvR{Mo%85)D*H#3iSjC?Zj8IX;;K{<x
zy`;Z8UUBmw*o1V0{Idt&GUs~SJK|q398BS!TZVBtKS9+T3qGe)<F!(vbN;*7_oJWB
zG}@5|Iz-WNL(8NA76lgc??%D|b}Q;tP6SWWWaKaq$DdXe88&{JRRj%Iu~~PFH4x6!
z7Fa6#pP|A{kHRAn$3h^T;59Ons?K?VDSC~h=G`|q;kY%rpAk`(7fi<j`wxpeJMo)h
z*vGCP<Grt}dl~+~Fc>@v=f@#B4}1t1>i&&1+&wG;Ip*^w##j{*A=*yr4?OK_$gK9)
z6IZkGXi5WTH(~^DODEUwxM>Z7V;!iY9f@1RwcgwFpAbV$2uqfXcJOU7C$ytr@Ku0o
z9|9L?CW?XVhdQEy4x+~bsaP(2idMu9$Fsm0xER3}1Cr2Wagt~yC5Ss3aU=09tt#qc
z_{!vYsQe;-=DAEU+RR(3kb2`CTkhx*=(Oyl@!;w-Gv8#k*>0Uz6}ZNRa8<W6FwsdS
z3|Gk)V9Zz+N?CZCiStPkrZZgT4|hmh!RVz-K3{K)Uu{N$7om!6jJL;!)gt8138I}$
zKr+hRF9<6fvCYn-YcJH=ujB;yvfxN^shES{Kpd~8Kzsl0iI_Z;o8<ulp@7S10aV!r
za&S%tuS+M!yidaK-}qZB=;hS)Fl&9ihCxqau1EskvZs(4%!?#i&zKpGwu&Si&`ulw
zDu<GrE|X0<li-JbYxza7!pd@nd?~79n-K|;mNY`MZ7}<?Br!B8F}yF85<8~N=QxH0
zr-6`>Xbpy+<^e;YidfXd)%}4>la{N$GH>XzIuO)x9iZ1fT=t)IV58Ix!4T@y<I%bg
zR04u5z{a?J>mmssj?LyoR$EDmz!S+~^xW~!3YCv?KP<7~Vxn%oWoyq5ELlvCM|ZFe
zkDujmf;s-MHP^IQ5eT7pK`pQrXg71+_yy^=0nWF-Dc;EKxYgo&q$@~ix04d{FtiRa
zs)z46{oNos7C){jp$N%Gu1Z9(gUff2$iry;-gvfneswV1BcAb6m79B67fSzM=0N5$
zB`R1{I&;GOj^->n2qETU7==uE0Z8dTa;OwkuQ##Cp$|YmwFWp%fddA`BcoxbfFnal
zT_3{<?j8OUM~Vi^uHS+Ueo2xpUW$(Y&Tx!n1MwbH>aj|9+G|IALR8Xmp8m^Bxe3)T
z-Cx8N2R$7yd?;-+6G*LX+-D_A?v@_@>s5k+Q-CxZ0n^Rhitm2jDmM<xsI5R4GKq~~
z3%evo_MOm4hT$hbF9*?B@620q{T|r<(ODI0c8^5HZIu?w=|6x6=0HqSsL@ZUohCZg
zkU>Cfh@G)?lc&mFHq_}A8`GRnqqWK2$@DA!r{R^BbJMB9SptuhC5*CyS9;XhLUuD>
zceE7zZ~lW14I2Nuf7o2jB@H&|qRU5&E;lKyDZJGmGILtF)7v|&u8d7XJQkGixFd2{
zcDrHzTpY&BW9|B7ceIj@jn_!ze#<1&SU$&xq`C4CIb)#?{wBO(TDq?l(#)GoLFM>>
zq9$G2K#i$UAD-fws!igWRHlkhS(oyu&22_^hxB3(ueqkjBILL977;TFG`TL-p-BFo
zdGJ=4NYx}vnp^(p$ewO<fQ6q1H6?lLfh8|?-HJXYtS%w=OE3i?EG)nW0DvPeI*0|!
z0SUye-$BL1$H*y@lfYuo<L;y$MIiBXIiL%edf9R;uy|Ekk9}X_MPIJ@P5d9IrfXN9
z=A{Q%4SW0{5Pq>VUuKCh0Rm8$xi;=C=e+tM30Da`PZ9r~wcb@&CrXVm6?Yb?jFP91
zPbPKi%;DwVRVxK2I{uPd1&{!pGg9bMdhsNLmEq25#8VeW_9iW`>)o*S*ZeC6smRc>
zAO820yhq>~c+ZhJ@66Hn3Ez$rKKm_V6=Os;f^|+ATR}~`>rH#kRW&Z6!COD-3Z0x-
zKIHZL39zYupAqh8C0h>q10QN7^XKEYX?T+zI!v74TKlDy>5#Vm1y}^{UEKjXlm}}|
z3eNY=-uN|9D!+u)OB+IsAMhavq1yORCo?NUNtr4m2j&|u92<V;H5bpotT|)<&Gy!_
zfZG#UQ@@bDye7$roD@1!;$$?1vt_T*L#BgOH%-km=h+ZkK$q^|eaNK^r|<s#HWrho
z_bN};NFDce=|8~J8Wr?!DZ})yid3=&=#{Cmyd~(BcL5xFk<u%5wY#n2hbPyZeCOOV
za}%9On3sI#4it;EX@>Vmxy4^O0Lk(s%J;FxX;o%DODhot8k1fNdihTn0hu)Od0!;q
zvH6^GPX%6W4Y+)Gx+NdK!yVhsvZWh$m-10vABd@=2s-PL1o94cs<?8O7GVOxL6T#~
zhYA<B$Co)<{%W<{y?@gt>T5g8*~T=pYa1!lYnwYonooZTsijfZp+HztZ0lCQB5=^?
zLL_;v=3FaEQa8UH<6k_LvDB8tD4zzT0wlVEz*pP*T8o4qU<g4(c=WCvsCmAZ2gIs5
z?I)9+*~=XZ{ok=byVY&&wCLYNJ6%oDyyNRE0%Ak3>+&ICorB|_TE2zzwYFMZQO2U&
z?<FnuN>%W+{!lM$GHi^Fap*ALf`8`Fh0c1Ww%e`d9nJ^W)gfjW8?7RPRPbHdee|`A
zDyi!(!(3jfTP&8N0`k_~uARTrT&;yRAWIpxwDvfFKF_wez#{*P1ZEo4!)VmCaABc^
z!1%&=2b!d0y_AOKD=zXkFll=ha&OesdHy9b2$9wuByzj{GUPQ4SS34NFI>$|EwPUP
zpWDb|y_eJOQP+9;C?7&?5>?^B6!?Q~96BQPS&whT!~Hz23*72DvF#HlM<fq&^!9bg
z^7+W|GS7pa!L9gTIa&+v3lLV*0Qm5o$IelT>1d>jON<l#YrsXSE>TzntT21iH7dg3
zB=Gg6v6-T;e4Zbq0Y?HD7ElsK#G_r{KaNjggX%e(ekW;fF`er-DqQ%s3dDpB>F6?w
zWpTxDc`!M$)fqWu*EjG~!)JUbHcJ+fSK$NK>v<FLknZd+9to!9Q2Oa<{WBwuYU1qx
zKnY1CkoO+G?ko>qtM_tFdqeeH%9lC~2u;+-L?(^QT$$GgD9xcZ(?2MSI$=P|`s|Nj
zb^#)h9Dx=1_qLV1R%e0_5`G^{m5=aOmKNdOg|N8=HtMC+x~#eubd>Zq+TrN^)m(c&
zp%*GBmnJ(@qHk2vDtc>NBN(u}Da?P;D;Qnzh9yHSUf=HYFRZ9CZt|5Hu=2|FBDXXB
z5m=z(v(7QH4x@8fm!7+FIDogyWDgV9wG*N{1#|<-p1-tKY5?U)>vx^FO0ybo@N%8|
z%mF_X`iNYu8~8c7h<*@yZS_$`hSwN$91osQS~2eUbn!V(9^Ai0J&Z4G2ac+%y_h{{
z3Vz#5XA`@*<}RDcS#E2{&t(cs%w*~c<jrJ7Gqaidt9LAyYR$pgG`ARPf57C?F+-)P
z?<#1dH8QA=u7uW9d96Z{b>1fqJaJbSV2L};jf*l?Q(x9sde8QY8d_oe1dMFS@!|ex
zBTvGY$VnJ$<+h@IUrDVTh?9|l<5vCo*azX@;@T7eJo<|*U6^oqY`SMJrNAsbvyClo
zdW<RR6nl$g*Fv6iSGg2Bx^OK!E#f9EA`B!Kp?O5%+};B9Xtl62SPCPSDXfuerPLW;
z$$CAVA!S^-W~f)lvke=HCmJmD5Uq7U-+7dUmoqH4`yJhXwJ2^VwL%H{>ecQPA_%n%
zVjKZH%h~C={4kkHx0<@Kx5NMxLIDdSG?oP0vL7BF%^{Cm#YII~aTIz*g%o-@Q0Rvz
zM>Xa=oy$K<%^~e=znQ})u{};J`Uq@kkqCZ#b%u~q|4RjNh@<?-Q0}kdqm;p*EoHb@
zkV`9TtQB36p<f8`DrdETKx)A>Dtge=EM9O-YOJMyS}^*v4-q2=2+ByZ)L3=)sJl-}
z1~$Ow`|j~u%z-wI4td+Ce!l=|YK2PvSrHCT3SZuw7Hs#$T>vLOD^p}#iAhB+(UnB3
znxTbm`x^Mresjq&b)y#8{vh~JI*#2`JiEnW)oS8ljV#Y8oRO=xsrDP=Of94TfZ)Fa
zh5~&@Tg)A@*5wCa^WF+)M8Z2>EE)9qdHZh_=5vGxKJS^r8)T9s#3qu9hQ|Ky`4Yw7
zDDVm$s@g;oIsScJ2aBd)xd3Ag(yQb^?l%ah-8)xq1z4^;oW03>0iU}O51)L2nB1!}
zmrfv>QcU~%<_6BgpHw>Qv8WdYGyDXSV7Y^QgjiCxrj&H?uU@kGbMhF4ukOvtHlx}$
zZ9DHfm8|Fy4pUZ?N8p8Jm^uj^$1g>Q`|Q5{fPq#ma2<i@%SM*+eZqR8DK750b5Z>U
zh=P+NHJ$aOFghJI)U@`XL+{ewlRa20&SiY;KmqxlB*3?!RS#F69x+VR<J&8f<t`QT
zZ4>D?@-9Y?P$EQqaY1jP!jD&MM_W<Hm5aN)@+eoD%tH7d1{_499xbl~e2tR;JyZ7B
zVmv>aDPnw041wJ2?CbJ6rM~-S*1c817mH~F!Tay|R@#y6f^%l1?K4N2v@?jvccUsJ
z%r;_tR=s?b9I3=bjqNhoGWB17)Q?fn0$?E`h?<jA#>9C2VaN1!!6xKYbw8%}d13E&
z@7sdQ+kI>A>sbhiIKZ1E#TrI1%9KZ`rqO?A_&ShrOjF9V`1@sr^5X@gdzkdlQW|U-
z#{mE<iRYHuAki3f$<FluohHgC=u|8ElX+FGze6++ZY}$Hd_KDKm~!mZ5L8#v5ipbE
zgtk4#HT+)DD1vnmUP%219TSX?I31-RofxN(7(ibz%JuiZS4eGAm;r%e=09S>LZo_k
zcyotT*Lu7*&cmo}9QCb2^=zEAt-Wczc?O?BWCQ@Pbap!n4st^xN<gxv^P3$M$;md}
z;I_u6PR#jy!t>{U1}jjYiKPy8hS2^Hl|&W9-I60&zg(ra(K9>hI$Zz}QueUwFXlS;
zoN>{Ub^G5B^U#cq;gd9`ib^uONyip|LeaC7F$XAXv4~q8G-?-?4p(SEFNyM{_rErS
zs#u`9pz}IlrSii1<4u+L<Hi90dcbKwZ{W#LZ_j<-o!Im9dVF3RtC;>r#};sum~dTn
zPeoNr&+5W&n7PK~(JcJT(N7<|jtdR=x@#N$*iKBp&w0)fh`u(ji-)VjmP03%J?(t^
ztedkWQ&BWsWSH#J5DK#qm|gYhCxo7`TAz;pyU<_kpjP_%m88Q%{8HlUT@g#jWrq8R
zxk@nVc~)CLFjO;d+sK<){mt4CCo#&gMj0FxhFmz#iX<W|v!y;nf3XKj53^uZsgp|o
z(;IXiRhHLzzJVhium{A!ye|>!>~zsJ)+C2|t(J=BB}MMWy)v1qI{oWtsbvK=U`?@B
zio5?~brM|`^7pA;ZtHCF2?%SgXaIgexwG|5XlA8>DC%JVoi*1mdd#paKa3GH#iKpz
zGBI9}H>b?8h;k%+8=pjZ{8vu5Tc=RNmfO%jepm~Dd73`@;eE4&`F_CdRr=*;7j9VK
z<3T#ZvHyUbCYFU?tjD0#Kdq)nw-@aS%>1x}u~=aAuJTK}z-RqBTc_v4=8G5tc2n1v
zB6(aC>5)IBbCzG4KLc(D4gN-imW*=HUS06h7lJk4vx^w<&hwRJU_AY{nEmBCb0PTk
z=h<uE^YsaZ<vA;%0H?O!zbKEh=jYYdwbujH;75$>Th-v(Klv}uPcF|`)d7d&PTN@6
z>%mVpz!M{I$_-kJMxfhM&B$5wi%|}F9&s6-P16dSF)<1`U4Olu&VThi-=4T&MESHt
z-5vE+P`9)tEO_p*+OtHa#7F)DLHBPGs&_yC3Of&OOo>6%FF*%f0#U7?s3L&QN43?Z
z8cHf|99W&=`CG*zS=Bw3Ez}g3Ef74~IY`TzyrACr(ccgwN3;LX{B52_4n(aVnRGpf
zWPQqe97L6M>F|O~ak_YYkxKuTQu#>cdUguSzv{jm)Ooi$yV!EDz0`RcavpWk8D~v!
zA4k%=voYONHo4|?++PD^B(xvpeL3qnb10k26%Rb#^=Ms-`B3K4^OPu?ztnQ{b^dts
zxrCZ56m={hnt9<uldGxf=<nT@p{_>L&(m6<S&m|2II=$!Bg}FJBo<z0m;LwE&SV@m
zkq=@N4IOp`4IcGH&M|`-9(XW|nTAIWtKYJK%ntw%qep{kd~UCG!esn;$TC*%%K(y%
zyS{a71kHF_l<CDxOGK+BQfVoBX_Yl7{Zz)OSQ=%}kU6aSy!C;zk4DH7Rg*kXgJRy*
zjIRy@7LiWzKiaz}3jvj5GCEE%DoRnGIJwPrI_ZdDje}82odJthwW%n>Dw^nu0v6g2
zHd?rt-V1r$6efoWJqtOlLCgapKL~;^M|->84)R~GHZDAv7fMT`e&mESrsR%}rIV}e
zAec}kEBEJN^NC+g;@QQX&e*Jn+-(6=VWTm<riN9qYz~I>$S8m^z}#7j62mcn_@w(?
znp%G0Lf3Jt?xep%VrZzptTcM3g32#i4S2^{dXnD#TrVsyzdStZ+sha1%qQOGq5c@q
zul#LuMk?ZWvAixE_`FM>=l^;^pC5E|;scbg#0LCebK!-P#pbg?FJd1TQi0f)AVgKt
z?u)e38(8ZypMPmD%RZzBYxSst*?;-WLe_sKcN2TxxQH+I{(}UK4Whq1f%<sSkFL|C
zOdvH#h>-B+f`%hVhx=Ey(ZCl$8P>(=_l-O6h2b|wuo(ze2vMLY%5=XMeg&c{(O_zP
z;@Ti1IvEK4s2d!ld^HJ-x^A3z+y<dFGbt^>e*>Jld)b((`AuQ&TZ7F`dMg40_KHIf
zzxV&W+pT1HkKJ+omOx(8LG^F@3~U<z`^xet^f)i<a$@WP8+`{V%W21S*bKTHfBiaO
zh(JEiP7@2FdTp?a4Pn^>qk~iww6*4Zg0CO)*L$xYvd;qV7st*-&Yx9HLZ0}~g725k
zUhi8w$peeN7d5nXg=K$bHt*BHTu>Xg?-77QSEfHgD?{P^j4nFyq#{4ZhuxyU1qPWq
z6Vdd3Qo)oCvrdyVAjKm{r%2&|mBo1?W@`#h<jnrlKPnLRIqSZQ^pSJ+t7tow6RzB>
z?YmCeRR<-!iiO5JRJc%16U5xK1<zX-^5diRPQPV{=2L0y4Qw2V^{tDJN$T7|b2~6K
z33kvSin1M8bob*q!hFrqPcmb)`~(rqC^r~{&YII<;Ims^>%xRikMyLi>gf7`_(%Z!
zVwQ;Q7??K}cDI-F*U77^by5v_>H&bYz@_TRMu3*wR`WK~Y<J;a8k&Ai;tPKGUt$7;
z+4i|fuE^kwscN;Kh7Z#<osH#egwg)iu+XE@&Fk2AR0u#d0rN+p>goJlD_Yq`|7FL-
zVd%rV-+HTU#f4X)t=6!I<g?J<n!mTJyMzFEBtg$@M+oE6tJG)^ZP^bLH8%kZ7YeM=
zjc;u#{0H)9<bJx8Gt!$+CD?}vjIlTL!TEqXTH&<1GhTrX4@nh6Jy;p)xa}^G4o2v#
z!j_nPk(-_6El1u}(o`|yK2-_Y3-+Y;d+%BvMTSrT=29o}gx3`~MVhR1T%2F@DrmD8
z6;!Nk46}gQ^l}Pt`x9O{`Wk<qNo1M?h<kx91V$K2V{f9U#$nP%NT%2cR~#UnjL>FV
zqz?F?Pt0kvjtLww+e-jn<3^wcBQ*dQs!p^5&Otpd1&RD=wp>C1xf&IH#rRkLF_)$0
zKT!x!h444pqzgkn&uLj}6K`d6Cq;r8OC~uu6?eZ|AflVSbYxQKX_REbY;?q7ia-59
zBoDb*lg$shy79?>dkyG)SUtPANGA_^T`OT{3wlT=f8I_v_>d-1gy{gY%aTAD1;?dK
zO%&FUOgHoW`zVns>GazYZW`r?P+vr*;G-4#^v`kmT~M7q@f7$Ri_jv1HN}1etlM>O
zNVkTk{EU)-<~YkH+Cs90LMvo$vs)K1{zjN$mbCrmMrmxvuU8qNkvnbh!8{cQl|vi}
zUmq4Zuxfl*o%m9VsNFzQ3<oL8OBVt5i}9%~;bYQE0`ArMTvCsQN2nxjgecO!&a4aN
z6A1_w3MB*D0?&wIHdRrEl8Ps+76FAoA2*~Y3hk8`3QZ<Te1MNA1F2oe$k<7+SIhu%
z7w2q0)sh_O*kKs}`Q&!!Kul`rXptfO^H@R>9B8_Tu*G`yt*zcTZ--{8BY<U)DZvhI
z-M9*sJzYEgM3*^gKgj}bi46kI>c>5bcQo;phpZ2h;^cCfwt;~${$|F@WZ-UrbO-fd
zJ7HTjhf(w+@JaeF%Lyh}5F)Uq+oLDDqt1)}uP{q^8O%$pAt<BHZcQGViU~;1p72YE
z<H?slOH$Dd-DFb?5EmB*J35PD0n6MoJ+9)A(p{(gx0j=f%Qig%Og(pN3m_vuqQjv=
z$&f?CS)jCYN7IX*sWK%~U}D2uE4Wa%vYAw!l=T%4q%RDhDcgx`eoRmfoyH$C5<GNU
zNf{ZhIT!&xNhs^lds22iywo2;LV~eHN%Q^R6CC@}({jz;B_+`YqPm(#ca;_%%@Dl3
zR;l&`zReJb``;zsu?Ib@l}wpF{zO#mdAy=G@!Lxcd1yU*J(}Vkcjl{X!f@q{k_tmp
zjczWsu_#-M&88Gghj^22P=e^LvzgL5J@}m$uY=nE{`A)*hBvEY)4<uca;g!MH7S|c
z;T4YN#Kz-HPUZO@{uq6fR$5^=KQp45Bay)fAsaD#n%SsNkOh<+nWCHL=oHde?@R8R
z=MlDR7}{=?P^~|%@lnTHl6rDRIC@Z~$&?Y5!y;@}P|_;Gnwhx8?J8Ihgm5k7{!$8=
z#rKn=@+aH-!~~EEPPHh%buAWtQc$qmIRWq?R=x?XVlP0b`PZv$_!J%gDh0TqVi1Ro
z+JK6>4CY;OGIK9R3C#DHs%O`)D4{7cet1X$D2G$}Mv0k(S}zd%ay+*%>o{-nt??Sb
z@My305Fl3;Ts}@fZgq-Z%ZV>iqsXkwHoFMjQTxjPiVcP~OZepE=7f}&H~Qc%SUu~y
zoBS!al+@R)hZlg<V&<5Pu7|lI%I{Ti8yO+$@SfCLrGC+A9$x@naE2YJgSwC3A#n!+
zrDrfsCu}X<Iync&-h&7}XfPd%w(5p$awGORn85b-NuFg}@>vz;zKRSc=KsxZn|T7S
zxiS{Lmf6jcfY;}CuJu*|-Kjh0&@dqT??U<lPg!(IL|B=m89_Lys5qxp6aEIAIgE;m
zCVo2q^JSl^`2Bqha3WrhRC}Np*MH;RPG0xcdhW8{9{(DW_gvg|`X@7Me;@QEwGfMM
z#R(rcc-M~qahoeuSwuzHUJr!Ny+15~X2_jwu$<4pL`35e#Th)o>deY;MrNN&pnE12
zP&0X1bT~Pfw`yYQV)ORSbm+F0Rd$S+kLUK7sp8=DumAWlOG`)B#L;a@6^o2^?i}lj
zmDkbO;R1oK52fMqVEFB^`(@KB4Ht(^zl!dnkzf#&HM(WvqZ=WJO#V-=w>phX7+ck<
zrH^ifr+xu}vls^=v}axv!ks{zSm(vwAoR%*W)LVmD9j|P0f3XZp2kDtkR%qb)r*}l
z)>qi3qY6pN<F$MHpA}3-_>WD=u8s$<KCz2+vK?Fy6Ge`T8t+m}I71?cLntCl$Yhg5
z1t)A&z~CR8+{fG~3qII21x4j6mGIOCchh-rtRs3Z;*Y*Qqrxh|VNAVH)b46bK{&#+
zit2}wlMQX7uQ#7g$>2i)oCwR*Sxm0@3VAtP&W+h23z0$#&&MX>;L&=JzTFGcdz&d+
z;p~&Eor8{`x9cDIhcu{9KrASBQra9MC3`Ojy=Tje3?Nbi<>@!>;!fp<pc7`qZI=Hx
zpsGGWNMI}2#wk<od(ccC_^|NydOz0te2W?Kw0#%yv`YRKN$UMpCv7#S>|m~u1b^8^
z189bpT~rxDX*tM@2RNWz3J~2ZP&_l16*LYTnyMXMr2wr6PtR*#{_FDD>-o435N5a#
za#6MZ`a03NHb-O(WlHWIKCv4ft@7AeP>px3sebkcedrh+onY>fLamo5;#v-LA~l^F
z{ck8qZ>$EUZ)p7Zz54*PBs0iIviPUL@88{>UVR01L9!NSd5^WZ5-VvvFBHpvZ=Gs_
z5YhNl&8&t1JIGdfiMPfuVXZMZ#CYfy*jqNNv)nSV#X_kls6+<3>aOP27;v9t6sm^z
zz128XLI7ZjP!uewMaF(`*W76(l8}teD7>?u1OMT~1H@VlebQ@t9;1(@U7q;7aH8H9
zFbus0ji~#i0v>jixq4gct7Dq#BH<wkd;;IDL=l)3mfGt+SO4U${sm-}v<@U1<J5z)
z!~ASfUwJ`;k{~p1D-vg~NjERLb3Dua3-1n*8<tJo^LM#eUXfn5Y3$`wTh|z{vzr&K
zZR<$B9-*s}y<mxc_n6c7@S&NE>rMf__!|(=p!)40-PQ^j9CV*{u#L1F*`j6#{u73K
z7~9>A@Sq*c;E6<L&X*>I^v{<-N6d9lT`TCZ%hDG7j<iqxe-xoCN>C0<0>C|e)|l`K
zKEM5v|MsxD{(PEF9()U20`~(hVlNvrduOJPB*H-64iU7iu-QjjOQTYbF`+yv!UAg~
zlTPOyyOkt`+xMJu`DisVdl-x({|Qx0FvJZ~Q-E72q+jp}TN4i)b^0X!`jG#6^cL`z
zEN=XG$sTea|Mt>^$#$UZTqr%&CJ{56d;~9wP@zv?+t;@51LWab@Xo!DKACI@ovKfa
zh_^N>kTEkVXwbIj=Ka{JaK<ATo#Ovxa6^N*F|?D=3K(r7oaOp*4A1cWM+-q4v+go5
zYU2LQ*kwf1#*)!1?qcRi&tQn!9!GqCfdPMm;%-+TeNZ=O95e%)c5mQwrCYoSB9w-k
z2UI(WcpV#}3-UpJbUDq1UD>6XL-g1iuQoxg%KwKKSd-ZAzo%*P3o~(6h2^eU$S_>*
ziHGRvn2>&rX{fMng9a3Ws(CH>y)m#s9^3P?Eyq;&V}rG@)vDF<Hlt(APJ4By?{0Ck
zI~!ZP2oA#!DaF}Fm3Fi<Bx@|mSnNMHA$`Wzz6Ho^*%}aJ=~z|H;$Z5KZZHrf7}eS$
z51#PN&0jOG7dbcl`<~lDWE|{b(s)ESUY3$X-G~X;R+@d&1g-|MRkNxGz}fGMpjo>x
zzn&#MLcj4@Q~dzS31B#iA5j1<RCyS{BB{a$)JIQsFB|~mK=MI>Z-%gOb4`AS8sVqZ
zmw(t15XGvek1!CUZs33u1_S*RfG&V`@eE|W{$XGVz;Ec&WzNHaOxkRb|Nof+tePZR
zim8RQz@zZ>*NYPJuDcmbG2aWsGjZ>WT$irbG2P(nDwpnywch9F8G1C(9g9(8DbS<*
zQ5ApMPF|PleK|Q}V@^8hix+DVau@D+5_>tmiWh&SIc}Hhx(52skk_43R#@hFnxuL|
z$?LJ|dA0-`bod<<2N<1%dilWuR~^`=xK;Osa2uE2yK$$xwZH}7A99i^Si;~Rl)515
ze@Z#R((C%+-_x)sl>7RjbwPE_B3l08z7sYEjA(jAbZ*82A~{M2u9AinHn5!HVh%Q|
z2Y#nGykz~S;!hXB6iDKTgobpXfG!=iOd{P|7*_W&CKB(ozur@{BtsNu5Dh>cU9A?c
zS3#hsKDt(ps@}ARN5Lx#0J^scf@g%!CF6MB4Yv;KX|CxM44@ds8sEjNA*uKN<SH@U
z2DkriAQH?0$JD1z_r1xbi3{s|DMeoi>=rg5CCq(|+af3i<%kkN>)CSr%P_RiGGy5F
zPWZcdIo=^?Qr79GorO{C&`!mkdDJ&JC`8?8*d@#-jdSc7D9XMJAo$`Cb1e^Im*VCA
z$Kpq_@xsMgeiCf*L0pyD)w+Tqgqj+)W9*Mfhqd5GPSWnOK<}r1DgXSOprJ9hH(rHW
zDerBTT<3+!wSn*rmn!CJpH97CdXCIxhyjG=h@hC>(9plbM9lUr-s>b_1lJsp*p$pa
z$JK^O18GA41y|{Z?!bkbzHKg_J?~xtXCcO>=j!zHUhw5cYq0<3Lo0dbeUnS@oiXHm
zsP|1VNb#;w+l^54#$~m=A_VbAd&owkd7~52{_+oHs)cOF(^sd?k3s}d#QbNA9YL*q
z##qS|Xh++z*MMcC)CF2@qq$(fhsXoN)bS8B+7d<_jcsH`6rIa{E%-04x{4xt-HjA_
zT>o5?_6qz-s>sn7GVTK%Wt72~U%>U#7$9pbEsJqPY)gWBC=`nV5mMcXOXxU2Lzgz7
zuOL7qoVMA}_)O%>Lp*$do^!NQ<mASvX>VU@flyhY`I}_pAoVTLe1eIdyU3;yFeKxE
z`v!1w{@3J!h0$Y}>$=@F1pd&L#fU#|T<ET~zb%oA-`C`?ysa2w_TB?Q=TBp;YyW)_
zZvzXn%|O*ICez`l{d_rx{7*Zuk%vzGN8pXsq;ZRoSXPN?4=RtFFTzEZ<C2annWYb2
zxu?$eSoqKfM>_3{nN(|Y96I5o&9UckC3s*84IctaY4+xwgB_nIDW=8JsgUe8N_%H2
zmm`)0-$uAm$+_cm?fACy)cbnf#D3bbx9JG%Zfu60)}HG$cV0QT%|e)GGEp6CxhNXe
zG`<GqE`_s-eM)Qi&@v2y%<I={#-Y8p$eZ7WxwBV(pfK@v+B9!Y)VDy+Y#?94hXA%s
zGILCyq2By}0Jj4dP^#~sVHPOE2$-i*CH;3Tv2z2~Lnbn`uIJ)keDCv^;aSl0FXA&(
z-%}@qP(XY-SO~s&$q&ANEtwL3eK9>U=+Kp+P2>&Jlo@@;^Ox(_?|nsdoI-^{oY2HJ
zKECGm;yRnY+f(#qKF8I6j1^KS>jXlx@L6ik<(4qlqzY({!_lzT!3wr~c5NQvD2Wxn
za)ckFp0Pg>`qH4Dr(~Jc6@6?3Ws}kpwG>r%9kTa6_l3Ofg*1CRogA(ETpk;1c<C&3
zkba5FWxnRqUbt%$Z6@souv1YJqct#7ZS7f2<r!m*{n>hOeQiZuSLs-)>7VZ4y<211
zM%2InL{+{YPSp;l4)$kvyfr=n_M;9$%K<G;YhrrKZ9NrEP28=OrG*3sKuS*ZFE6}&
zG}dm}@<Cb@s6~pB6)VG0<=LVsaQEmN`rbe40VW|~=%4>df%s2=Y{1`$7kj%x%n!Vn
ztP>Bqn7AW<o>wLBy`PL<>%Io=_h%rq4?1`=v07D}ocZi1P?gxfv2V!|j_a-c9jNpi
zi@tu1VIf6<jwoTVL}mfwrqdTm`*6rjJ1G=V(dplj=D<;L!te8`5IKhEN<A1kku|>4
zlrk3k0(mn(?983i)Z0dXw_p5R_*F=Qi%mZmC6F6pZeEEk>sH7?e;MH)Hvncyd?=>n
zK0<IyviiD%;P{0$j-o+)?Q+LG&WO%Xs?F1Vl<<(_nWb+B)TZS$>~wG(a#^vL?|az(
zhkxD4+ux=AUvTbHQz4)%QriUZpY{Nr!k%-d&-zb*5zX!0d#zgyUI-sjS?O?C|F(Db
z^7kUSm9+a{{_0N5{d7J6lT=i=e$Us$tuN}24=_j{bhz@6Y;!8&dwpEvvl4O_WZHSL
zeFC*h2|VA=)U-MC-`K2kS!^`57%gM_tp%ju04JF`(dfT;te)}m@^Wij5Iy`ZsP}O&
zo;~Q|3@DqPyA|_$ADZIH?&np5@2?ckxWfv1?>GJd2lsOQ$gtxpd<J=xJp&D%I0qhP
zB)yN@Mxw^A4vBE$?7#CT;=X}XJ=6i1B(#5<-WbHl1bn*++WsbGPJKTX{v>i@OuX~n
z;cb5P34`RrXb-Gx>zPQw>|gt%WlWN;cZ>nI<V)hdE4fD#qinzrXyolh?+pWhA#Pyv
zB~5N8R*SF?xz-VBDlaRLaFCLzosx<pkS=)f(bS?$%3_(X-i18bH>HZEF2Vu`GvHcs
z4=42fZk3Qw&cD}$qZ31MyuaAi=pXZi1|S(e3|L!xTfWaWvf#(eC8MK{JDl({PXV^m
z$<r?bIz@$tJ1tfww_@hkpD0b!d?|jo4@Va4X%$Y#)z%1=vM8TQT5)kxd12Mgy7o4K
zsE~XD)0efdzA`HycIYfFa{e1$PpziS6l|nq*Ar$g`1Ewer^{nCj#U^Vx98z`*9j5f
zmPFY5PfgHEz#T^3@w(gZt#gcH!Hzv>)HlQ1RxcN)lNI;-MZp4gMi{?CL%w5D5x1@J
zTwe6<HqY<Cm<o`H1`?6?2&F~&|9_sFSfCppy@|fNguI!GKOd`}1>G<GC#yXgzTNH$
zlbe63j<^OSHsi;wsT<Z+MO|sb)e=M(zh`Ks>}|fEB{0*SbAIugHU5sgO`Bpmw49zG
z6i1fguwWqJ9>ih=kq>z8Z`U;mdKpOXdAS@|_zGZL+JS*P%XL1UPM5ga)Sn;j507kI
zdOkR~iajoB67;@2qOu1)Z85L=?PgCMDYL0DFv8HAJm31*9|<!#WVu}rq?_Il+#DVa
zIg3=y+lamP{}~STJe3;0eQq`3Te|c<CV9SfSijNX(R%uuA;SKk3Mb<5ZL%!S4@1xt
zC1<#fsfE4Em$S8iN~WAB9F-@ze7@7O)ToA2)?pm}rIO1iRJ-}-1RWJ^Y{KMl3cw$g
zR@E3OxVA_j+m|ZgV5Kl8FDs<rQ~a3B*<(*mv6$4fCB^=X-2A@eecz$Q<${fGLOq8^
zXjqIva#@MT*h2vM!$aqp_`~c~<`N!)VPfhxfHlDv@~BE2$~ATHNndUp%@It!|N2th
zWe*6|+v7FnT)y_Cf~g=EM>pI9zFP*Ak<pvIAMK-*+itsBi63UcfKUpPVb6p7XAVHQ
z_W#GKE7cDj5rVq(+{CcIUiSVceX0h(EvUZTljpx4h>JbEtk=I?oV`W&ufLtVIXN1(
znk#>jHmkS9%g&WapmmTt9@;`PWLuZ@cV~sB^I}{X7a;QjMZ~}4olP1=JUcjSW1|fV
z^GXedIl#tlLtBiV;ZA~Q3I>7{&F`#?>;V6IJC<C?XYsR|W24$cUX{gEs>fcDE6Gk-
zL>|V)M6YCG10l$ScpE(Nh^hE+IywmH-Dma;Q?VICI|EP5su2!40K0YVjQ}rOhyjJi
zY$LG1uC!CCa0=!nE0f{(>r%UAE)7i*?&Z6u6*Lo*Nb{up?QLnUa{^T=Mjj-5Jix=R
z9Fwc$1cj!v7|Zu+0JR6-9Mw@-yo`ZGoM2PLE#aIlL8!ietZEvGpxf2h`pae$d++NC
z^SXuSMZi?=ul@Fz^_Th9-nV{!Q?6wXbL@yH#+m)L*^K)iYBED*Ktd39+2EU>5h#aB
zD|!j2q*7&STP|gODVQOC`8q6{ggtC+)~CZMyVIvgu~{5GDjkeHjUr6>#WgxHWWY?;
zk8u%MxA9HQmWKt1f#EZO!nj5R?F|4Jw+V4Fp*JZ6-1iJ0O;_NSD<Jc~8H8ZhZMj-*
z*iZssoGiGce1FVQ0lsu%v`*9ZIDLXqQ@;t7xKMu-TAgk&$<nQi;2`;7=ykf-feN;9
zy6!p!%rR8u7DZ+4&OVmhM}NmfE;;<+=rmFZv^xbyW;J^1X%HI4$R(yvhDX0!B%dg!
zg(ct5$Ei)3aySyK)g_)7(W@Z0If>^{R))m8eO+K4)lNwNsEG0X1GqwrQ5jEe59K;!
zn=K3aaWfht1q&-Vd1O#0o*Vv)LFhmjk{-7oXBlz~FKMyepjKj*3k(L=_+`82;XaVd
zK7<Cq=A@xbib1%}LsZS29zX&laEjU9!du5V9>qzCaU;BEzj6sHKz~?RLO|QcRvW)A
zoo&<BN`dCjLf;IGrUV4%-w)-l(8JomAn+q7H=`3T3o`7_+Nu}Wgu?3;L3Tkdt37u;
zsPQXaufHBT$wN=O-!`9rjdp!PIbQL51!L44Etm2NxU`>~0%QRa(W&`Wj*v&Tl*Q3{
z%NN1BQ&gYzE0ADByjAMAB|npG!6~}6psDcT(CZUnOorL{Y?ZaZ_0Pb3Zpif-;+a55
z{&dpn%KVr%Y}xte9G?c>pF3KA$GP`T+wR0lBh363i=2C}Ose|AKVGmD!GKh7M`!u0
z5$Z;xbBA&4vWzSUN{%kN(ZL%_s2#~*X!7fSxuG2*prdLwlvazx=|rE2<^_{h2<3}{
z`ZqQJul?^CZFpj{S^8+>r+LYUz<PWQ(4SyK0JJo?cMaUcXVZE*YB_*psFJ7wKROb`
zb#7cRG+d=S(EXqQ@`WsH6vvBtZT_qiJ^x+&n>t?XfU$Cvz4F)O3uf@i^icladOr!9
zaqwrc>tUQ>*G);fDc06pM9|ry7l>%lgWLjB^mgCEw65HF@*+k2vYB3PD;!hYJB-!l
zu7?`5(Zs(V_DB8e+dg&tddTLxWZtqG3s}S1;%(fXgya-Zgw7F{OYgtDFTJ<h@Rk7#
z313+MPXL|*Vg2f%M;-^F+nfdA0XRX3_Ck!qFuM~0BHrd?N6h*{OBH5z4sc>v3-Czd
z+k}I5A_IUY{mDQ@MRj=qj!zI2RJTyRy{s(mBJl6E*Dj!6DXP(a%9Z`!_U^BzX()^X
zFn2~j0JsgJ8?G|LKo}#)Fk(VtVn*VH7jj{uiJyW`@9EC^XB`fZp|Cy46LM&KP7B+*
z{L;6l{k3{)_J^)kZzgYgcTc}DT`X#e>0e~v(B%>RfoGq;$5${k1mGpO{M%crznt%x
zp&Wo8TA-a{3G`|`iKWOvXvYWnrVH0!uQrm6v;?}Jmn)AX@!`Ge&F!#3X?fZ`mOxjR
zH<G*ry0R*0k4m7+hcPW5Ve&|-rb?iTdw?q?&|9TjXK$!ng>=I~Zo7+H>W|*fNA1r3
zL<w~5#q<^6N}!!l5uN>d@AvWkn*e+tX9nQ<030+n+Jm$6;kRE>?hGG?U!OdEwz9Hv
z+Xun3BwlrTo5@~nee>E+T>5?1Xtt8w(Cd!rH#C;K7P=^b{_x03pf7%2#uxG8$E5(g
z(9!o`v%UMg(VY94VSxj1yaF62!Rqdvl*Q|cp^?pcmCi5K-5X49R?L-E={}ms>RoKd
z5%P9APQHCMrB-N%fAwe=Cl%%H#R$cb6eHxjo|*(}au(?E+QU(33_*P-dwgzKb@T_>
z`=J}U9JD*V@N;WCm0-GLcJ*w`+w*?UkJE3bJJ{JjYbD!nd!ORIvRR<7xB`59`sMKb
z`Qgd1KN#l8Hnii!&Otso*70ePGh_P!X5jyOW&my!fB^siU;zlg00008zyJUMAOHgZ
z0Du4t00002FaQ7m2*3aU03ZMZ004jh3;+NC0x$po088#SP05=eQLk}300000NkvXX
Hu0mjfAUw)c

literal 0
HcmV?d00001


From 1fc6edfa84188abd64fcd82dfcd941947b82a717 Mon Sep 17 00:00:00 2001
From: Mashiro <moezhx@outlook.com>
Date: Wed, 6 Mar 2024 20:53:54 +0800
Subject: [PATCH 0367/2191] [Glitch] Fix unhandled nullable attachments
 limitation counter

Port b8bd94ca8edb5a675ef70aac9c941ed340efc127 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../containers/upload_button_container.js     | 20 ++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/app/javascript/flavours/glitch/features/compose/containers/upload_button_container.js b/app/javascript/flavours/glitch/features/compose/containers/upload_button_container.js
index 2082510f126be5..2e835464b85119 100644
--- a/app/javascript/flavours/glitch/features/compose/containers/upload_button_container.js
+++ b/app/javascript/flavours/glitch/features/compose/containers/upload_button_container.js
@@ -4,14 +4,24 @@ import { uploadCompose } from '../../../actions/compose';
 import { openModal } from '../../../actions/modal';
 import UploadButton from '../components/upload_button';
 
-const mapStateToProps = state => ({
-  disabled: state.getIn(['compose', 'poll']) !== null || state.getIn(['compose', 'is_uploading']) || (state.getIn(['compose', 'media_attachments']).size + state.getIn(['compose', 'pending_media_attachments']) > 3 || state.getIn(['compose', 'media_attachments']).some(m => ['video', 'audio'].includes(m.get('type')))),
-  resetFileKey: state.getIn(['compose', 'resetFileKey']),
-});
+const mapStateToProps = state => {
+  const isPoll = state.getIn(['compose', 'poll']) !== null;
+  const isUploading = state.getIn(['compose', 'is_uploading']);
+  const readyAttachmentsSize = state.getIn(['compose', 'media_attachments']).size ?? 0;
+  const pendingAttachmentsSize = state.getIn(['compose', 'pending_media_attachments']).size ?? 0;
+  const attachmentsSize = readyAttachmentsSize + pendingAttachmentsSize;
+  const isOverLimit = attachmentsSize > 3;
+  const hasVideoOrAudio = state.getIn(['compose', 'media_attachments']).some(m => ['video', 'audio'].includes(m.get('type')));
+
+  return {
+    disabled: isPoll || isUploading || isOverLimit || hasVideoOrAudio,
+    resetFileKey: state.getIn(['compose', 'resetFileKey']),
+  };
+};
 
 const mapDispatchToProps = dispatch => ({
 
-  onSelectFile (files) {
+  onSelectFile(files) {
     dispatch(uploadCompose(files));
   },
 

From 50b17f7e10fe2576f0526768a9269f3013932d8a Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 7 Mar 2024 15:53:37 +0100
Subject: [PATCH 0368/2191] Add notification policies and notification requests
 (#29366)

---
 .../v1/notifications/policies_controller.rb   |  37 +++
 .../v1/notifications/requests_controller.rb   |  75 +++++
 .../api/v1/notifications_controller.rb        |   7 +-
 app/models/concerns/account/associations.rb   |   7 +-
 app/models/notification.rb                    |  11 +-
 app/models/notification_permission.rb         |  16 ++
 app/models/notification_policy.rb             |  36 +++
 app/models/notification_request.rb            |  53 ++++
 .../rest/notification_policy_serializer.rb    |  16 ++
 .../rest/notification_request_serializer.rb   |  16 ++
 .../accept_notification_request_service.rb    |   8 +
 app/services/notify_service.rb                | 259 +++++++++++-------
 .../preferences/notifications/show.html.haml  |   8 -
 app/workers/unfilter_notifications_worker.rb  |  37 +++
 config/locales/an.yml                         |   1 -
 config/locales/ar.yml                         |   1 -
 config/locales/ast.yml                        |   1 -
 config/locales/be.yml                         |   1 -
 config/locales/bg.yml                         |   1 -
 config/locales/ca.yml                         |   1 -
 config/locales/ckb.yml                        |   1 -
 config/locales/co.yml                         |   1 -
 config/locales/cs.yml                         |   1 -
 config/locales/cy.yml                         |   1 -
 config/locales/da.yml                         |   1 -
 config/locales/de.yml                         |   1 -
 config/locales/el.yml                         |   1 -
 config/locales/en-GB.yml                      |   1 -
 config/locales/en.yml                         |   1 -
 config/locales/eo.yml                         |   1 -
 config/locales/es-AR.yml                      |   1 -
 config/locales/es-MX.yml                      |   1 -
 config/locales/es.yml                         |   1 -
 config/locales/et.yml                         |   1 -
 config/locales/eu.yml                         |   1 -
 config/locales/fa.yml                         |   1 -
 config/locales/fi.yml                         |   1 -
 config/locales/fo.yml                         |   1 -
 config/locales/fr-CA.yml                      |   1 -
 config/locales/fr.yml                         |   1 -
 config/locales/fy.yml                         |   1 -
 config/locales/gd.yml                         |   1 -
 config/locales/gl.yml                         |   1 -
 config/locales/he.yml                         |   1 -
 config/locales/hu.yml                         |   1 -
 config/locales/hy.yml                         |   1 -
 config/locales/id.yml                         |   1 -
 config/locales/ie.yml                         |   1 -
 config/locales/io.yml                         |   1 -
 config/locales/is.yml                         |   1 -
 config/locales/it.yml                         |   1 -
 config/locales/ja.yml                         |   1 -
 config/locales/kab.yml                        |   2 -
 config/locales/kk.yml                         |   1 -
 config/locales/ko.yml                         |   1 -
 config/locales/ku.yml                         |   1 -
 config/locales/lad.yml                        |   1 -
 config/locales/lv.yml                         |   1 -
 config/locales/ms.yml                         |   1 -
 config/locales/my.yml                         |   1 -
 config/locales/nl.yml                         |   1 -
 config/locales/nn.yml                         |   1 -
 config/locales/no.yml                         |   1 -
 config/locales/oc.yml                         |   1 -
 config/locales/pl.yml                         |   1 -
 config/locales/pt-BR.yml                      |   1 -
 config/locales/pt-PT.yml                      |   1 -
 config/locales/ru.yml                         |   1 -
 config/locales/sc.yml                         |   1 -
 config/locales/sco.yml                        |   1 -
 config/locales/si.yml                         |   1 -
 config/locales/sk.yml                         |   1 -
 config/locales/sl.yml                         |   1 -
 config/locales/sq.yml                         |   1 -
 config/locales/sr-Latn.yml                    |   1 -
 config/locales/sr.yml                         |   1 -
 config/locales/sv.yml                         |   1 -
 config/locales/ta.yml                         |   1 -
 config/locales/th.yml                         |   1 -
 config/locales/tr.yml                         |   1 -
 config/locales/uk.yml                         |   1 -
 config/locales/vi.yml                         |   1 -
 config/locales/zh-CN.yml                      |   1 -
 config/locales/zh-HK.yml                      |   1 -
 config/locales/zh-TW.yml                      |   1 -
 config/routes/api.rb                          |  11 +
 ...221195424_add_filtered_to_notifications.rb |   7 +
 ...0221195828_create_notification_requests.rb |  18 ++
 ...tification_request_ids_to_timestamp_ids.rb |  15 +
 ...2193403_create_notification_permissions.rb |  12 +
 ...0222203722_create_notification_policies.rb |  15 +
 ...620_add_filtered_index_on_notifications.rb |   9 +
 ..._migrate_interaction_settings_to_policy.rb |  46 ++++
 db/schema.rb                                  |  44 ++-
 .../notifications_controller_spec.rb          |   4 +-
 .../notification_permission_fabricator.rb     |   6 +
 .../notification_policy_fabricator.rb         |   9 +
 .../notification_request_fabricator.rb        |   8 +
 spec/models/notification_policy_spec.rb       |  25 ++
 spec/models/notification_request_spec.rb      |  44 +++
 spec/requests/api/v1/conversations_spec.rb    |   1 +
 .../api/v1/notifications/policies_spec.rb     |  48 ++++
 .../api/v1/notifications/requests_spec.rb     | 107 ++++++++
 spec/services/notify_service_spec.rb          | 248 ++++++++++++-----
 104 files changed, 1092 insertions(+), 243 deletions(-)
 create mode 100644 app/controllers/api/v1/notifications/policies_controller.rb
 create mode 100644 app/controllers/api/v1/notifications/requests_controller.rb
 create mode 100644 app/models/notification_permission.rb
 create mode 100644 app/models/notification_policy.rb
 create mode 100644 app/models/notification_request.rb
 create mode 100644 app/serializers/rest/notification_policy_serializer.rb
 create mode 100644 app/serializers/rest/notification_request_serializer.rb
 create mode 100644 app/services/accept_notification_request_service.rb
 create mode 100644 app/workers/unfilter_notifications_worker.rb
 create mode 100644 db/migrate/20240221195424_add_filtered_to_notifications.rb
 create mode 100644 db/migrate/20240221195828_create_notification_requests.rb
 create mode 100644 db/migrate/20240221211359_notification_request_ids_to_timestamp_ids.rb
 create mode 100644 db/migrate/20240222193403_create_notification_permissions.rb
 create mode 100644 db/migrate/20240222203722_create_notification_policies.rb
 create mode 100644 db/migrate/20240227191620_add_filtered_index_on_notifications.rb
 create mode 100644 db/migrate/20240304090449_migrate_interaction_settings_to_policy.rb
 create mode 100644 spec/fabricators/notification_permission_fabricator.rb
 create mode 100644 spec/fabricators/notification_policy_fabricator.rb
 create mode 100644 spec/fabricators/notification_request_fabricator.rb
 create mode 100644 spec/models/notification_policy_spec.rb
 create mode 100644 spec/models/notification_request_spec.rb
 create mode 100644 spec/requests/api/v1/notifications/policies_spec.rb
 create mode 100644 spec/requests/api/v1/notifications/requests_spec.rb

diff --git a/app/controllers/api/v1/notifications/policies_controller.rb b/app/controllers/api/v1/notifications/policies_controller.rb
new file mode 100644
index 00000000000000..1ec336f9a594dc
--- /dev/null
+++ b/app/controllers/api/v1/notifications/policies_controller.rb
@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+class Api::V1::Notifications::PoliciesController < Api::BaseController
+  before_action -> { doorkeeper_authorize! :read, :'read:notifications' }, only: :show
+  before_action -> { doorkeeper_authorize! :write, :'write:notifications' }, only: :update
+
+  before_action :require_user!
+  before_action :set_policy
+
+  def show
+    render json: @policy, serializer: REST::NotificationPolicySerializer
+  end
+
+  def update
+    @policy.update!(resource_params)
+    render json: @policy, serializer: REST::NotificationPolicySerializer
+  end
+
+  private
+
+  def set_policy
+    @policy = NotificationPolicy.find_or_initialize_by(account: current_account)
+
+    with_read_replica do
+      @policy.summarize!
+    end
+  end
+
+  def resource_params
+    params.permit(
+      :filter_not_following,
+      :filter_not_followers,
+      :filter_new_accounts,
+      :filter_private_mentions
+    )
+  end
+end
diff --git a/app/controllers/api/v1/notifications/requests_controller.rb b/app/controllers/api/v1/notifications/requests_controller.rb
new file mode 100644
index 00000000000000..dbb987153084b9
--- /dev/null
+++ b/app/controllers/api/v1/notifications/requests_controller.rb
@@ -0,0 +1,75 @@
+# frozen_string_literal: true
+
+class Api::V1::Notifications::RequestsController < Api::BaseController
+  before_action -> { doorkeeper_authorize! :read, :'read:notifications' }, only: :index
+  before_action -> { doorkeeper_authorize! :write, :'write:notifications' }, except: :index
+
+  before_action :require_user!
+  before_action :set_request, except: :index
+
+  after_action :insert_pagination_headers, only: :index
+
+  def index
+    with_read_replica do
+      @requests = load_requests
+      @relationships = relationships
+    end
+
+    render json: @requests, each_serializer: REST::NotificationRequestSerializer, relationships: @relationships
+  end
+
+  def accept
+    AcceptNotificationRequestService.new.call(@request)
+    render_empty
+  end
+
+  def dismiss
+    @request.update!(dismissed: true)
+    render_empty
+  end
+
+  private
+
+  def load_requests
+    requests = NotificationRequest.where(account: current_account).where(dismissed: truthy_param?(:dismissed)).includes(:last_status, from_account: [:account_stat, :user]).to_a_paginated_by_id(
+      limit_param(DEFAULT_ACCOUNTS_LIMIT),
+      params_slice(:max_id, :since_id, :min_id)
+    )
+
+    NotificationRequest.preload_cache_collection(requests) do |statuses|
+      cache_collection(statuses, Status)
+    end
+  end
+
+  def relationships
+    StatusRelationshipsPresenter.new(@requests.map(&:last_status), current_user&.account_id)
+  end
+
+  def set_request
+    @request = NotificationRequest.where(account: current_account).find(params[:id])
+  end
+
+  def insert_pagination_headers
+    set_pagination_headers(next_path, prev_path)
+  end
+
+  def next_path
+    api_v1_notifications_requests_url pagination_params(max_id: pagination_max_id) unless @requests.empty?
+  end
+
+  def prev_path
+    api_v1_notifications_requests_url pagination_params(min_id: pagination_since_id) unless @requests.empty?
+  end
+
+  def pagination_max_id
+    @requests.last.id
+  end
+
+  def pagination_since_id
+    @requests.first.id
+  end
+
+  def pagination_params(core_params)
+    params.slice(:dismissed).permit(:dismissed).merge(core_params)
+  end
+end
diff --git a/app/controllers/api/v1/notifications_controller.rb b/app/controllers/api/v1/notifications_controller.rb
index 406ab97538f245..52280ef6072536 100644
--- a/app/controllers/api/v1/notifications_controller.rb
+++ b/app/controllers/api/v1/notifications_controller.rb
@@ -49,7 +49,8 @@ def browserable_account_notifications
     current_account.notifications.without_suspended.browserable(
       types: Array(browserable_params[:types]),
       exclude_types: Array(browserable_params[:exclude_types]),
-      from_account_id: browserable_params[:account_id]
+      from_account_id: browserable_params[:account_id],
+      include_filtered: truthy_param?(:include_filtered)
     )
   end
 
@@ -78,10 +79,10 @@ def pagination_since_id
   end
 
   def browserable_params
-    params.permit(:account_id, types: [], exclude_types: [])
+    params.permit(:account_id, :include_filtered, types: [], exclude_types: [])
   end
 
   def pagination_params(core_params)
-    params.slice(:limit, :account_id, :types, :exclude_types).permit(:limit, :account_id, types: [], exclude_types: []).merge(core_params)
+    params.slice(:limit, :account_id, :types, :exclude_types, :include_filtered).permit(:limit, :account_id, :include_filtered, types: [], exclude_types: []).merge(core_params)
   end
 end
diff --git a/app/models/concerns/account/associations.rb b/app/models/concerns/account/associations.rb
index 2bb6fed5ad0047..b2e9d255fd8adf 100644
--- a/app/models/concerns/account/associations.rb
+++ b/app/models/concerns/account/associations.rb
@@ -15,10 +15,15 @@ module Account::Associations
     has_many :favourites, inverse_of: :account, dependent: :destroy
     has_many :bookmarks, inverse_of: :account, dependent: :destroy
     has_many :mentions, inverse_of: :account, dependent: :destroy
-    has_many :notifications, inverse_of: :account, dependent: :destroy
     has_many :conversations, class_name: 'AccountConversation', dependent: :destroy, inverse_of: :account
     has_many :scheduled_statuses, inverse_of: :account, dependent: :destroy
 
+    # Notifications
+    has_many :notifications, inverse_of: :account, dependent: :destroy
+    has_one :notification_policy, inverse_of: :account, dependent: :destroy
+    has_many :notification_permissions, inverse_of: :account, dependent: :destroy
+    has_many :notification_requests, inverse_of: :account, dependent: :destroy
+
     # Pinned statuses
     has_many :status_pins, inverse_of: :account, dependent: :destroy
     has_many :pinned_statuses, -> { reorder('status_pins.created_at DESC') }, through: :status_pins, class_name: 'Status', source: :status
diff --git a/app/models/notification.rb b/app/models/notification.rb
index 54212d675f1f9b..e322daea4a9ee2 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -12,6 +12,7 @@
 #  account_id      :bigint(8)        not null
 #  from_account_id :bigint(8)        not null
 #  type            :string
+#  filtered        :boolean          default(FALSE), not null
 #
 
 class Notification < ApplicationRecord
@@ -89,7 +90,7 @@ def target_status
   end
 
   class << self
-    def browserable(types: [], exclude_types: [], from_account_id: nil)
+    def browserable(types: [], exclude_types: [], from_account_id: nil, include_filtered: false)
       requested_types = if types.empty?
                           TYPES
                         else
@@ -99,6 +100,7 @@ def browserable(types: [], exclude_types: [], from_account_id: nil)
       requested_types -= exclude_types.map(&:to_sym)
 
       all.tap do |scope|
+        scope.merge!(where(filtered: false)) unless include_filtered || from_account_id.present?
         scope.merge!(where(from_account_id: from_account_id)) if from_account_id.present?
         scope.merge!(where(type: requested_types)) unless requested_types.size == TYPES.size
       end
@@ -144,6 +146,8 @@ def preload_cache_collection_target_statuses(notifications, &_block)
   after_initialize :set_from_account
   before_validation :set_from_account
 
+  after_destroy :remove_from_notification_request
+
   private
 
   def set_from_account
@@ -158,4 +162,9 @@ def set_from_account
       self.from_account_id = activity&.id
     end
   end
+
+  def remove_from_notification_request
+    notification_request = NotificationRequest.find_by(account_id: account_id, from_account_id: from_account_id)
+    notification_request&.reconsider_existence!
+  end
 end
diff --git a/app/models/notification_permission.rb b/app/models/notification_permission.rb
new file mode 100644
index 00000000000000..e0001473f815a8
--- /dev/null
+++ b/app/models/notification_permission.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+# == Schema Information
+#
+# Table name: notification_permissions
+#
+#  id              :bigint(8)        not null, primary key
+#  account_id      :bigint(8)        not null
+#  from_account_id :bigint(8)        not null
+#  created_at      :datetime         not null
+#  updated_at      :datetime         not null
+#
+class NotificationPermission < ApplicationRecord
+  belongs_to :account
+  belongs_to :from_account, class_name: 'Account'
+end
diff --git a/app/models/notification_policy.rb b/app/models/notification_policy.rb
new file mode 100644
index 00000000000000..f10b0c2a816e9e
--- /dev/null
+++ b/app/models/notification_policy.rb
@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+# == Schema Information
+#
+# Table name: notification_policies
+#
+#  id                      :bigint(8)        not null, primary key
+#  account_id              :bigint(8)        not null
+#  filter_not_following    :boolean          default(FALSE), not null
+#  filter_not_followers    :boolean          default(FALSE), not null
+#  filter_new_accounts     :boolean          default(FALSE), not null
+#  filter_private_mentions :boolean          default(TRUE), not null
+#  created_at              :datetime         not null
+#  updated_at              :datetime         not null
+#
+
+class NotificationPolicy < ApplicationRecord
+  belongs_to :account
+
+  has_many :notification_requests, primary_key: :account_id, foreign_key: :account_id, dependent: nil, inverse_of: false
+
+  attr_reader :pending_requests_count, :pending_notifications_count
+
+  MAX_MEANINGFUL_COUNT = 100
+
+  def summarize!
+    @pending_requests_count = pending_notification_requests.first
+    @pending_notifications_count = pending_notification_requests.last
+  end
+
+  private
+
+  def pending_notification_requests
+    @pending_notification_requests ||= notification_requests.where(dismissed: false).limit(MAX_MEANINGFUL_COUNT).pick(Arel.sql('count(*), coalesce(sum(notifications_count), 0)::bigint'))
+  end
+end
diff --git a/app/models/notification_request.rb b/app/models/notification_request.rb
new file mode 100644
index 00000000000000..7ae7e46d1b8339
--- /dev/null
+++ b/app/models/notification_request.rb
@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+# == Schema Information
+#
+# Table name: notification_requests
+#
+#  id                  :bigint(8)        not null, primary key
+#  account_id          :bigint(8)        not null
+#  from_account_id     :bigint(8)        not null
+#  last_status_id      :bigint(8)        not null
+#  notifications_count :bigint(8)        default(0), not null
+#  dismissed           :boolean          default(FALSE), not null
+#  created_at          :datetime         not null
+#  updated_at          :datetime         not null
+#
+
+class NotificationRequest < ApplicationRecord
+  include Paginable
+
+  MAX_MEANINGFUL_COUNT = 100
+
+  belongs_to :account
+  belongs_to :from_account, class_name: 'Account'
+  belongs_to :last_status, class_name: 'Status'
+
+  before_save :prepare_notifications_count
+
+  def self.preload_cache_collection(requests)
+    cached_statuses_by_id = yield(requests.filter_map(&:last_status)).index_by(&:id) # Call cache_collection in block
+
+    requests.each do |request|
+      request.last_status = cached_statuses_by_id[request.last_status_id] unless request.last_status_id.nil?
+    end
+  end
+
+  def reconsider_existence!
+    return if dismissed?
+
+    prepare_notifications_count
+
+    if notifications_count.positive?
+      save
+    else
+      destroy
+    end
+  end
+
+  private
+
+  def prepare_notifications_count
+    self.notifications_count = Notification.where(account: account, from_account: from_account).limit(MAX_MEANINGFUL_COUNT).count
+  end
+end
diff --git a/app/serializers/rest/notification_policy_serializer.rb b/app/serializers/rest/notification_policy_serializer.rb
new file mode 100644
index 00000000000000..4967c3e3206b09
--- /dev/null
+++ b/app/serializers/rest/notification_policy_serializer.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class REST::NotificationPolicySerializer < ActiveModel::Serializer
+  attributes :filter_not_following,
+             :filter_not_followers,
+             :filter_new_accounts,
+             :filter_private_mentions,
+             :summary
+
+  def summary
+    {
+      pending_requests_count: object.pending_requests_count.to_s,
+      pending_notifications_count: object.pending_notifications_count.to_s,
+    }
+  end
+end
diff --git a/app/serializers/rest/notification_request_serializer.rb b/app/serializers/rest/notification_request_serializer.rb
new file mode 100644
index 00000000000000..581959d8273b4f
--- /dev/null
+++ b/app/serializers/rest/notification_request_serializer.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class REST::NotificationRequestSerializer < ActiveModel::Serializer
+  attributes :id, :created_at, :updated_at, :notifications_count
+
+  belongs_to :from_account, key: :account, serializer: REST::AccountSerializer
+  belongs_to :last_status, serializer: REST::StatusSerializer
+
+  def id
+    object.id.to_s
+  end
+
+  def notifications_count
+    object.notifications_count.to_s
+  end
+end
diff --git a/app/services/accept_notification_request_service.rb b/app/services/accept_notification_request_service.rb
new file mode 100644
index 00000000000000..e49eae6fd300e2
--- /dev/null
+++ b/app/services/accept_notification_request_service.rb
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class AcceptNotificationRequestService < BaseService
+  def call(request)
+    NotificationPermission.create!(account: request.account, from_account: request.from_account)
+    UnfilterNotificationsWorker.perform_async(request.id)
+  end
+end
diff --git a/app/services/notify_service.rb b/app/services/notify_service.rb
index 13eb20986e3e65..428fdb4d47c79b 100644
--- a/app/services/notify_service.rb
+++ b/app/services/notify_service.rb
@@ -11,126 +11,195 @@ class NotifyService < BaseService
     status
   ).freeze
 
-  def call(recipient, type, activity)
-    @recipient    = recipient
-    @activity     = activity
-    @notification = Notification.new(account: @recipient, type: type, activity: @activity)
+  class DismissCondition
+    def initialize(notification)
+      @recipient = notification.account
+      @sender = notification.from_account
+      @notification = notification
+    end
 
-    return if recipient.user.nil? || blocked?
+    def dismiss?
+      blocked   = @recipient.unavailable?
+      blocked ||= from_self? && @notification.type != :poll
 
-    @notification.save!
+      return blocked if message? && from_staff?
 
-    # It's possible the underlying activity has been deleted
-    # between the save call and now
-    return if @notification.activity.nil?
+      blocked ||= domain_blocking?
+      blocked ||= @recipient.blocking?(@sender)
+      blocked ||= @recipient.muting_notifications?(@sender)
+      blocked ||= conversation_muted?
+      blocked ||= blocked_mention? if message?
+      blocked
+    end
 
-    push_notification!
-    push_to_conversation! if direct_message?
-    send_email! if email_needed?
-  rescue ActiveRecord::RecordInvalid
-    nil
-  end
+    private
 
-  private
+    def blocked_mention?
+      FeedManager.instance.filter?(:mentions, @notification.target_status, @recipient)
+    end
 
-  def blocked_mention?
-    FeedManager.instance.filter?(:mentions, @notification.mention.status, @recipient)
-  end
+    def message?
+      @notification.type == :mention
+    end
 
-  def following_sender?
-    return @following_sender if defined?(@following_sender)
+    def from_staff?
+      @sender.local? && @sender.user.present? && @sender.user_role&.overrides?(@recipient.user_role)
+    end
 
-    @following_sender = @recipient.following?(@notification.from_account) || @recipient.requested?(@notification.from_account)
-  end
+    def from_self?
+      @recipient.id == @sender.id
+    end
 
-  def optional_non_follower?
-    @recipient.user.settings['interactions.must_be_follower']  && !@notification.from_account.following?(@recipient)
-  end
+    def domain_blocking?
+      @recipient.domain_blocking?(@sender.domain) && !following_sender?
+    end
 
-  def optional_non_following?
-    @recipient.user.settings['interactions.must_be_following'] && !following_sender?
-  end
+    def conversation_muted?
+      @notification.target_status && @recipient.muting_conversation?(@notification.target_status.conversation)
+    end
 
-  def message?
-    @notification.type == :mention
+    def following_sender?
+      @recipient.following?(@sender)
+    end
   end
 
-  def direct_message?
-    message? && @notification.target_status.direct_visibility?
-  end
+  class FilterCondition
+    NEW_ACCOUNT_THRESHOLD = 30.days.freeze
 
-  # Returns true if the sender has been mentioned by the recipient up the thread
-  def response_to_recipient?
-    return false if @notification.target_status.in_reply_to_id.nil?
+    NEW_FOLLOWER_THRESHOLD = 3.days.freeze
 
-    # Using an SQL CTE to avoid unneeded back-and-forth with SQL server in case of long threads
-    !Status.count_by_sql([<<-SQL.squish, id: @notification.target_status.in_reply_to_id, recipient_id: @recipient.id, sender_id: @notification.from_account.id, depth_limit: 100]).zero?
-      WITH RECURSIVE ancestors(id, in_reply_to_id, mention_id, path, depth) AS (
-          SELECT s.id, s.in_reply_to_id, m.id, ARRAY[s.id], 0
-          FROM statuses s
-          LEFT JOIN mentions m ON m.silent = FALSE AND m.account_id = :sender_id AND m.status_id = s.id
-          WHERE s.id = :id
-        UNION ALL
-          SELECT s.id, s.in_reply_to_id, m.id, st.path || s.id, st.depth + 1
-          FROM ancestors st
-          JOIN statuses s ON s.id = st.in_reply_to_id
-          LEFT JOIN mentions m ON m.silent = FALSE AND m.account_id = :sender_id AND m.status_id = s.id
-          WHERE st.mention_id IS NULL AND NOT s.id = ANY(path) AND st.depth < :depth_limit
-      )
-      SELECT COUNT(*)
-      FROM ancestors st
-      JOIN statuses s ON s.id = st.id
-      WHERE st.mention_id IS NOT NULL AND s.visibility = 3
-    SQL
-  end
+    def initialize(notification)
+      @notification = notification
+      @recipient = notification.account
+      @sender = notification.from_account
+      @policy = NotificationPolicy.find_or_initialize_by(account: @recipient)
+    end
 
-  def from_staff?
-    @notification.from_account.local? && @notification.from_account.user.present? && @notification.from_account.user_role&.overrides?(@recipient.user_role)
-  end
+    def filter?
+      return false if override_for_sender?
 
-  def optional_non_following_and_direct?
-    direct_message? &&
-      @recipient.user.settings['interactions.must_be_following_dm'] &&
-      !following_sender? &&
-      !response_to_recipient?
-  end
+      from_limited? ||
+        filtered_by_not_following_policy? ||
+        filtered_by_not_followers_policy? ||
+        filtered_by_new_accounts_policy? ||
+        filtered_by_private_mentions_policy?
+    end
 
-  def hellbanned?
-    @notification.from_account.silenced? && !following_sender?
-  end
+    private
 
-  def from_self?
-    @recipient.id == @notification.from_account.id
-  end
+    def filtered_by_not_following_policy?
+      @policy.filter_not_following? && not_following?
+    end
 
-  def domain_blocking?
-    @recipient.domain_blocking?(@notification.from_account.domain) && !following_sender?
-  end
+    def filtered_by_not_followers_policy?
+      @policy.filter_not_followers? && not_follower?
+    end
+
+    def filtered_by_new_accounts_policy?
+      @policy.filter_new_accounts? && new_account?
+    end
+
+    def filtered_by_private_mentions_policy?
+      @policy.filter_private_mentions? && not_following? && private_mention_not_in_response?
+    end
 
-  def blocked?
-    blocked   = @recipient.unavailable?
-    blocked ||= from_self? && @notification.type != :poll
+    def not_following?
+      !@recipient.following?(@sender)
+    end
+
+    def not_follower?
+      follow = Follow.find_by(account: @sender, target_account: @recipient)
+      follow.nil? || follow.created_at > NEW_FOLLOWER_THRESHOLD.ago
+    end
+
+    def new_account?
+      @sender.created_at > NEW_ACCOUNT_THRESHOLD.ago
+    end
+
+    def override_for_sender?
+      NotificationPermission.exists?(account: @recipient, from_account: @sender)
+    end
+
+    def from_limited?
+      @sender.silenced? && not_following?
+    end
+
+    def private_mention_not_in_response?
+      @notification.type == :mention && @notification.target_status.direct_visibility? && !response_to_recipient?
+    end
 
-    return blocked if message? && from_staff?
+    def response_to_recipient?
+      return false if @notification.target_status.in_reply_to_id.nil?
 
-    blocked ||= domain_blocking?
-    blocked ||= @recipient.blocking?(@notification.from_account)
-    blocked ||= @recipient.muting_notifications?(@notification.from_account)
-    blocked ||= hellbanned?
-    blocked ||= optional_non_follower?
-    blocked ||= optional_non_following?
-    blocked ||= optional_non_following_and_direct?
-    blocked ||= conversation_muted?
-    blocked ||= blocked_mention? if @notification.type == :mention
-    blocked
+      statuses_that_mention_sender.positive?
+    end
+
+    def statuses_that_mention_sender
+      Status.count_by_sql([<<-SQL.squish, id: @notification.target_status.in_reply_to_id, recipient_id: @recipient.id, sender_id: @sender.id, depth_limit: 100])
+        WITH RECURSIVE ancestors(id, in_reply_to_id, mention_id, path, depth) AS (
+            SELECT s.id, s.in_reply_to_id, m.id, ARRAY[s.id], 0
+            FROM statuses s
+            LEFT JOIN mentions m ON m.silent = FALSE AND m.account_id = :sender_id AND m.status_id = s.id
+            WHERE s.id = :id
+          UNION ALL
+            SELECT s.id, s.in_reply_to_id, m.id, st.path || s.id, st.depth + 1
+            FROM ancestors st
+            JOIN statuses s ON s.id = st.in_reply_to_id
+            LEFT JOIN mentions m ON m.silent = FALSE AND m.account_id = :sender_id AND m.status_id = s.id
+            WHERE st.mention_id IS NULL AND NOT s.id = ANY(path) AND st.depth < :depth_limit
+        )
+        SELECT COUNT(*)
+        FROM ancestors st
+        JOIN statuses s ON s.id = st.id
+        WHERE st.mention_id IS NOT NULL AND s.visibility = 3
+      SQL
+    end
   end
 
-  def conversation_muted?
-    if @notification.target_status
-      @recipient.muting_conversation?(@notification.target_status.conversation)
+  def call(recipient, type, activity)
+    return if recipient.user.nil?
+
+    @recipient    = recipient
+    @activity     = activity
+    @notification = Notification.new(account: @recipient, type: type, activity: @activity)
+
+    # For certain conditions we don't need to create a notification at all
+    return if dismiss?
+
+    @notification.filtered = filter?
+    @notification.save!
+
+    # It's possible the underlying activity has been deleted
+    # between the save call and now
+    return if @notification.activity.nil?
+
+    if @notification.filtered?
+      update_notification_request!
     else
-      false
+      push_notification!
+      push_to_conversation! if direct_message?
+      send_email! if email_needed?
     end
+  rescue ActiveRecord::RecordInvalid
+    nil
+  end
+
+  private
+
+  def dismiss?
+    DismissCondition.new(@notification).dismiss?
+  end
+
+  def filter?
+    FilterCondition.new(@notification).filter?
+  end
+
+  def update_notification_request!
+    return unless @notification.type == :mention
+
+    notification_request = NotificationRequest.find_or_initialize_by(account_id: @recipient.id, from_account_id: @notification.from_account_id)
+    notification_request.last_status_id = @notification.target_status.id
+    notification_request.save
   end
 
   def push_notification!
@@ -150,6 +219,10 @@ def push_to_conversation!
     AccountConversation.add_status(@recipient, @notification.target_status)
   end
 
+  def direct_message?
+    @notification.type == :mention && @notification.target_status.direct_visibility?
+  end
+
   def push_to_web_push_subscriptions!
     ::Web::PushNotificationWorker.push_bulk(web_push_subscriptions.select { |subscription| subscription.pushable?(@notification) }) { |subscription| [subscription.id, @notification.id] }
   end
diff --git a/app/views/settings/preferences/notifications/show.html.haml b/app/views/settings/preferences/notifications/show.html.haml
index d9d496c7fa5f14..de318dda5437c1 100644
--- a/app/views/settings/preferences/notifications/show.html.haml
+++ b/app/views/settings/preferences/notifications/show.html.haml
@@ -40,11 +40,3 @@
                      label_method: ->(setting) { I18n.t("simple_form.labels.notification_emails.software_updates.#{setting}") },
                      label: I18n.t('simple_form.labels.notification_emails.software_updates.label'),
                      wrapper: :with_label
-
-  %h4= t 'notifications.other_settings'
-
-  .fields-group
-    = f.simple_fields_for :settings, current_user.settings do |ff|
-      = ff.input :'interactions.must_be_follower', wrapper: :with_label, label: I18n.t('simple_form.labels.interactions.must_be_follower')
-      = ff.input :'interactions.must_be_following', wrapper: :with_label, label: I18n.t('simple_form.labels.interactions.must_be_following')
-      = ff.input :'interactions.must_be_following_dm', wrapper: :with_label, label: I18n.t('simple_form.labels.interactions.must_be_following_dm')
diff --git a/app/workers/unfilter_notifications_worker.rb b/app/workers/unfilter_notifications_worker.rb
new file mode 100644
index 00000000000000..223654aa165b01
--- /dev/null
+++ b/app/workers/unfilter_notifications_worker.rb
@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+class UnfilterNotificationsWorker
+  include Sidekiq::Worker
+
+  def perform(notification_request_id)
+    @notification_request = NotificationRequest.find(notification_request_id)
+
+    push_to_conversations!
+    unfilter_notifications!
+    remove_request!
+  rescue ActiveRecord::RecordNotFound
+    true
+  end
+
+  private
+
+  def push_to_conversations!
+    notifications_with_private_mentions.find_each { |notification| AccountConversation.add_status(@notification_request.account, notification.target_status) }
+  end
+
+  def unfilter_notifications!
+    filtered_notifications.in_batches.update_all(filtered: false)
+  end
+
+  def remove_request!
+    @notification_request.destroy!
+  end
+
+  def filtered_notifications
+    Notification.where(account: @notification_request.account, from_account: @notification_request.from_account, filtered: true)
+  end
+
+  def notifications_with_private_mentions
+    filtered_notifications.joins(mention: :status).merge(Status.where(visibility: :direct)).includes(mention: :status)
+  end
+end
diff --git a/config/locales/an.yml b/config/locales/an.yml
index edfdb44b35aa82..7ad1986b24a1da 100644
--- a/config/locales/an.yml
+++ b/config/locales/an.yml
@@ -1288,7 +1288,6 @@ an:
   notifications:
     email_events: Eventos pa notificacions per correu electronico
     email_events_hint: 'Tría los eventos pa los quals deseyas recibir notificacions:'
-    other_settings: Atros achustes de notificacions
   number:
     human:
       decimal_units:
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 2b2052172e22fe..8e9338d80ad64a 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -1594,7 +1594,6 @@ ar:
     administration_emails: إشعارات البريد الإلكتروني الإدارية
     email_events: الأحداث للإشعارات عبر البريد الإلكتروني
     email_events_hint: 'اختر الأحداث التي تريد أن تصِلَك اشعارات عنها:'
-    other_settings: إعدادات أخرى للإشعارات
   number:
     human:
       decimal_units:
diff --git a/config/locales/ast.yml b/config/locales/ast.yml
index da7e99c2fac5a4..ee9105b05ff258 100644
--- a/config/locales/ast.yml
+++ b/config/locales/ast.yml
@@ -695,7 +695,6 @@ ast:
   notifications:
     email_events: Unviu d'avisos per corréu electrónicu
     email_events_hint: 'Seleiciona los eventos de los que quies recibir avisos:'
-    other_settings: Configuración d'otros avisos
   number:
     human:
       decimal_units:
diff --git a/config/locales/be.yml b/config/locales/be.yml
index 34e0722ba9e373..bd75870a18c439 100644
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -1547,7 +1547,6 @@ be:
     administration_emails: Апавяшчэнні эл. пошты для адміністратара
     email_events: Падзеі для апавяшчэнняў эл. пошты
     email_events_hint: 'Выберыце падзеі, аб якіх вы хочаце атрымліваць апавяшчэнні:'
-    other_settings: Іншыя налады апавяшчэнняў
   number:
     human:
       decimal_units:
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 15c671d5392fe3..3d1b6d291fd11e 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -1490,7 +1490,6 @@ bg:
     administration_emails: Администраторски известия по имейла
     email_events: Събития за известия по имейл
     email_events_hint: 'Изберете събития, за които искате да получавате известия:'
-    other_settings: Настройки за други известия
   number:
     human:
       decimal_units:
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index d80fb598e381ee..d4213a258ed1b9 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -1495,7 +1495,6 @@ ca:
     administration_emails: Notificacions per correu-e de l'Admin
     email_events: Esdeveniments per a notificacions de correu electrònic
     email_events_hint: 'Selecciona els esdeveniments per als quals vols rebre notificacions:'
-    other_settings: Altres opcions de notificació
   number:
     human:
       decimal_units:
diff --git a/config/locales/ckb.yml b/config/locales/ckb.yml
index fec8f73323e71f..7f1c28defc147f 100644
--- a/config/locales/ckb.yml
+++ b/config/locales/ckb.yml
@@ -840,7 +840,6 @@ ckb:
   notifications:
     email_events: رووداوەکان بۆ ئاگاداری ئیمەیلی
     email_events_hint: 'ئەو ڕووداوانە دیاریبکە کە دەتەوێت ئاگانامەکان وەربگری بۆ:'
-    other_settings: ڕێکبەندەکانی ئاگانامەکانی تر
   otp_authentication:
     code_hint: کۆدێک داخڵ بکە کە دروست کراوە لەلایەن ئەپی ڕەسەنایەتیەوە بۆ دڵنیابوون
     description_html: ئەگەر تۆ <strong> هاتنەژوورەوەی دوو قۆناغی</strong> بە یارمەتی ئەپێکی پەسەندکردن چالاک بکەن، پێویستە بۆ چوونەژوورەوە ، بە تەلەفۆنەکەتان کە کۆدیکتان بۆ دروستدەکات دەستپێگەیشتنتان هەبێت.
diff --git a/config/locales/co.yml b/config/locales/co.yml
index c3c185c2f5861d..ecf860645548cc 100644
--- a/config/locales/co.yml
+++ b/config/locales/co.yml
@@ -809,7 +809,6 @@ co:
   notifications:
     email_events: Avvenimenti da nutificà cù l'e-mail
     email_events_hint: 'Selezziunate l''avvenimenti per quelli vulete riceve nutificazione:'
-    other_settings: Altri parametri di nutificazione
   number:
     human:
       decimal_units:
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 69640a261f9ada..fd24ac05c64d48 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -1547,7 +1547,6 @@ cs:
     administration_emails: E-mailová oznámení administrátora
     email_events: Události pro e-mailová oznámení
     email_events_hint: 'Vyberte události, pro které chcete dostávat oznámení:'
-    other_settings: Další nastavení oznámení
   number:
     human:
       decimal_units:
diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index 19343146f3a11d..241d599464aee0 100644
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@@ -1599,7 +1599,6 @@ cy:
     administration_emails: Hysbysiadau e-bost gweinyddol
     email_events: Digwyddiadau ar gyfer hysbysiadau e-bost
     email_events_hint: 'Dewiswch ddigwyddiadau yr ydych am dderbyn hysbysiadau ar eu cyfer:'
-    other_settings: Gosodiadau hysbysiadau arall
   number:
     human:
       decimal_units:
diff --git a/config/locales/da.yml b/config/locales/da.yml
index 62e28cef165beb..6bc0d967973218 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -1495,7 +1495,6 @@ da:
     administration_emails: Admin e-mailnotifikationer
     email_events: Begivenheder for e-mailnotifikationer
     email_events_hint: 'Vælg begivenheder, for hvilke notifikationer skal modtages:'
-    other_settings: Andre notifikationsindstillinger
   number:
     human:
       decimal_units:
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 123942672e78c6..06361223731738 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -1495,7 +1495,6 @@ de:
     administration_emails: Admin-E-Mail-Benachrichtigungen
     email_events: Benachrichtigungen per E-Mail
     email_events_hint: 'Bitte die Ereignisse auswählen, für die du Benachrichtigungen per E-Mail erhalten möchtest:'
-    other_settings: Weitere Benachrichtigungseinstellungen
   number:
     human:
       decimal_units:
diff --git a/config/locales/el.yml b/config/locales/el.yml
index c641d4dca96812..12d70df976ee50 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -1383,7 +1383,6 @@ el:
   notifications:
     email_events: Συμβάντα για ειδοποιήσεις μέσω email
     email_events_hint: 'Επέλεξε συμβάντα για τα οποία θέλεις να λαμβάνεις ειδοποιήσεις μέσω email:'
-    other_settings: Άλλες ρυθμίσεις ειδοποιήσεων
   number:
     human:
       decimal_units:
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 6b2554fe153eea..ac7e5082760e9f 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -1490,7 +1490,6 @@ en-GB:
     administration_emails: Admin e-mail notifications
     email_events: Events for e-mail notifications
     email_events_hint: 'Select events that you want to receive notifications for:'
-    other_settings: Other notifications settings
   number:
     human:
       decimal_units:
diff --git a/config/locales/en.yml b/config/locales/en.yml
index cff244a4b9d86c..8199fa52c7b06b 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1495,7 +1495,6 @@ en:
     administration_emails: Admin e-mail notifications
     email_events: Events for e-mail notifications
     email_events_hint: 'Select events that you want to receive notifications for:'
-    other_settings: Other notifications settings
   number:
     human:
       decimal_units:
diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index bc694578b74b6d..4e518cd194eeb7 100644
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -1425,7 +1425,6 @@ eo:
     administration_emails: Admin retpoŝtaj sciigoj
     email_events: Eventoj por retpoŝtaj sciigoj
     email_events_hint: 'Elekti la eventojn pri kioj vi volas ricevi sciigojn:'
-    other_settings: Aliaj agordoj de sciigoj
   number:
     human:
       decimal_units:
diff --git a/config/locales/es-AR.yml b/config/locales/es-AR.yml
index 37fcc11d782eb0..06bacc79d1682a 100644
--- a/config/locales/es-AR.yml
+++ b/config/locales/es-AR.yml
@@ -1495,7 +1495,6 @@ es-AR:
     administration_emails: Notificaciones de administración por correo electrónico
     email_events: Eventos para notificaciones por correo electrónico
     email_events_hint: 'Seleccioná los eventos para los que querés recibir notificaciones:'
-    other_settings: Configuración de otras notificaciones
   number:
     human:
       decimal_units:
diff --git a/config/locales/es-MX.yml b/config/locales/es-MX.yml
index 26dbc2dfb8e4de..4d2e8ff2573e00 100644
--- a/config/locales/es-MX.yml
+++ b/config/locales/es-MX.yml
@@ -1495,7 +1495,6 @@ es-MX:
     administration_emails: Notificaciones de administración por correo electrónico
     email_events: Eventos para notificaciones por correo electrónico
     email_events_hint: 'Selecciona los eventos para los que deseas recibir notificaciones:'
-    other_settings: Otros ajustes de notificaciones
   number:
     human:
       decimal_units:
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 795658013832d8..5204b116e349aa 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -1495,7 +1495,6 @@ es:
     administration_emails: Notificaciones de administración por correo electrónico
     email_events: Eventos para notificaciones por correo electrónico
     email_events_hint: 'Selecciona los eventos para los que deseas recibir notificaciones:'
-    other_settings: Otros ajustes de notificaciones
   number:
     human:
       decimal_units:
diff --git a/config/locales/et.yml b/config/locales/et.yml
index ed25488ce43966..6bdb54a50eed51 100644
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -1490,7 +1490,6 @@ et:
     administration_emails: Admini e-postiteavitused
     email_events: E-posti teadete sündmused
     email_events_hint: 'Vali sündmused, mille kohta soovid teavitusi:'
-    other_settings: Muud teadete sätted
   number:
     human:
       decimal_units:
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index fb3013e0084232..f49456afb2d04c 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -1496,7 +1496,6 @@ eu:
     administration_emails: Administratzailearen posta elektroniko bidezko jakinarazpenak
     email_events: E-mail jakinarazpenentzako gertaerak
     email_events_hint: 'Hautatu jaso nahi dituzun gertaeren jakinarazpenak:'
-    other_settings: Bezte jakinarazpen konfigurazioak
   number:
     human:
       decimal_units:
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 4339e06c3471a2..7fab495af81f65 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -1271,7 +1271,6 @@ fa:
   notifications:
     email_events: رویدادها برای آگاهی‌های رایانامه‌ای
     email_events_hint: 'گزینش رویدادهایی که می‌خواهید برایشان آگاهی دریافت کنید:'
-    other_settings: سایر تنظیمات آگاهی‌ها
   number:
     human:
       decimal_units:
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index dc303991bcea68..4cd255c2f4d5a3 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -1495,7 +1495,6 @@ fi:
     administration_emails: Ylläpitäjän sähköposti-ilmoitukset
     email_events: Sähköposti-ilmoitusten tapahtumat
     email_events_hint: 'Valitse tapahtumat, joista haluat saada ilmoituksia:'
-    other_settings: Muut ilmoitusasetukset
   number:
     human:
       decimal_units:
diff --git a/config/locales/fo.yml b/config/locales/fo.yml
index 6a8dd9b2ee69a9..c7dca591f680bf 100644
--- a/config/locales/fo.yml
+++ b/config/locales/fo.yml
@@ -1495,7 +1495,6 @@ fo:
     administration_emails: Fráboðanir um teldupost til umsitarar
     email_events: Hendingar fyri teldupostfráboðanir
     email_events_hint: 'Vel hendingar, sum tú vil hava fráboðanir um:'
-    other_settings: Aðrar fráboðanarstillingar
   number:
     human:
       decimal_units:
diff --git a/config/locales/fr-CA.yml b/config/locales/fr-CA.yml
index 97cb08c9184b93..381a8f582a7ddb 100644
--- a/config/locales/fr-CA.yml
+++ b/config/locales/fr-CA.yml
@@ -1490,7 +1490,6 @@ fr-CA:
     administration_emails: Notifications par e-mail de l’admin
     email_events: Événements pour les notifications par courriel
     email_events_hint: 'Sélectionnez les événements pour lesquels vous souhaitez recevoir des notifications :'
-    other_settings: Autres paramètres de notifications
   number:
     human:
       decimal_units:
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index b085937c767473..0d706accf12388 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -1490,7 +1490,6 @@ fr:
     administration_emails: Notifications par e-mail de l’admin
     email_events: Événements pour les notifications par courriel
     email_events_hint: 'Sélectionnez les événements pour lesquels vous souhaitez recevoir des notifications :'
-    other_settings: Autres paramètres de notifications
   number:
     human:
       decimal_units:
diff --git a/config/locales/fy.yml b/config/locales/fy.yml
index caa88dcfe44fee..2fb9f3e4d2956b 100644
--- a/config/locales/fy.yml
+++ b/config/locales/fy.yml
@@ -1490,7 +1490,6 @@ fy:
     administration_emails: E-mailmeldingen behearder
     email_events: E-mailmeldingen foar eveneminten
     email_events_hint: 'Selektearje eveneminten wêrfoar’t jo meldingen ûntfange wolle:'
-    other_settings: Oare meldingsynstellingen
   number:
     human:
       decimal_units:
diff --git a/config/locales/gd.yml b/config/locales/gd.yml
index e2a43564c0c3a5..ede38df0d9e442 100644
--- a/config/locales/gd.yml
+++ b/config/locales/gd.yml
@@ -1532,7 +1532,6 @@ gd:
     administration_emails: Brathan puist-d na rianachd
     email_events: Tachartasan nam brathan puist-d
     email_events_hint: 'Tagh na tachartasan dhan a bheil thu airson brathan fhaighinn:'
-    other_settings: Roghainnean eile nam brathan
   number:
     human:
       decimal_units:
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 8520b90ead0f2c..c3d0f1d99ae5fa 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -1495,7 +1495,6 @@ gl:
     administration_emails: Notificacións de Admin por correo electrónico
     email_events: Eventos para os correos de notificación
     email_events_hint: 'Escolle os eventos sobre os que queres recibir notificacións:'
-    other_settings: Outros axustes das notificacións
   number:
     human:
       decimal_units:
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 55ab576142dcb8..766a6537731129 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -1547,7 +1547,6 @@ he:
     administration_emails: התראות לדוא"ל חשבון מנהל
     email_events: ארועים להתראות דוא"ל
     email_events_hint: 'בחר/י ארועים עבורים תרצה/י לקבל התראות:'
-    other_settings: הגדרות התראות אחרות
   number:
     human:
       decimal_units:
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 733d883da06c92..00566514c91156 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -1495,7 +1495,6 @@ hu:
     administration_emails: Adminisztrátori e-mail-értesítések
     email_events: Események email értesítésekhez
     email_events_hint: 'Válaszd ki azokat az eseményeket, melyekről értesítést szeretnél:'
-    other_settings: Értesítések egyéb beállításai
   number:
     human:
       decimal_units:
diff --git a/config/locales/hy.yml b/config/locales/hy.yml
index b0d8f008641ffd..d870f5073c38d7 100644
--- a/config/locales/hy.yml
+++ b/config/locales/hy.yml
@@ -672,7 +672,6 @@ hy:
       subject: "%{name}-ը փոխել է գրառումը"
   notifications:
     email_events_hint: Ընտրիր իրադարձութիւնները, որոնց վերաբերեալ ցանկանում ես ստանալ ծանուցումներ․
-    other_settings: Ծանուցումների այլ կարգաւորումներ
   number:
     human:
       decimal_units:
diff --git a/config/locales/id.yml b/config/locales/id.yml
index e7f42e115b0760..a32ee8407a1ae1 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -1257,7 +1257,6 @@ id:
   notifications:
     email_events: Event untuk notifikasi email
     email_events_hint: 'Pilih event yang ingin Anda terima notifikasinya:'
-    other_settings: Pengaturan notifikasi lain
   number:
     human:
       decimal_units:
diff --git a/config/locales/ie.yml b/config/locales/ie.yml
index eec8569bb28a39..55aba94d180901 100644
--- a/config/locales/ie.yml
+++ b/config/locales/ie.yml
@@ -1495,7 +1495,6 @@ ie:
     administration_emails: Email-notificationes pri administration
     email_events: Evenimentes por email-notificationes
     email_events_hint: 'Selecte li evenimentes pri queles tu vole reciver notificationes:'
-    other_settings: Parametres pri altri notificationes
   number:
     human:
       decimal_units:
diff --git a/config/locales/io.yml b/config/locales/io.yml
index 189f616a4e0c48..e85641b9237112 100644
--- a/config/locales/io.yml
+++ b/config/locales/io.yml
@@ -1472,7 +1472,6 @@ io:
     administration_emails: Jerala retpostonotifiki
     email_events: Eventi por retpostoavizi
     email_events_hint: 'Selektez eventi quon vu volas ganar avizi:'
-    other_settings: Altra avizopcioni
   number:
     human:
       decimal_units:
diff --git a/config/locales/is.yml b/config/locales/is.yml
index da6eee9e205dbd..771ed2fbf1fc7b 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -1499,7 +1499,6 @@ is:
     administration_emails: Kerfisstjórnunartilkynningar í tölvupósti
     email_events: Atburðir fyrir tilkynningar í tölvupósti
     email_events_hint: 'Veldu þá atburði sem þú vilt fá tilkynningar í tölvupósti þegar þeir koma upp:'
-    other_settings: Aðrar stillingar varðandi tilkynningar
   number:
     human:
       decimal_units:
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 3adb4f6c6500ae..d85f0359d190f4 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -1497,7 +1497,6 @@ it:
     administration_emails: Notifiche email amministratore
     email_events: Eventi per notifiche via email
     email_events_hint: 'Seleziona gli eventi per i quali vuoi ricevere le notifiche:'
-    other_settings: Altre impostazioni delle notifiche
   number:
     human:
       decimal_units:
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 460f02d0a58eeb..15e66631f55061 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -1469,7 +1469,6 @@ ja:
     administration_emails: 管理にかかわるメール通知
     email_events: メールによる通知
     email_events_hint: '受信する通知を選択:'
-    other_settings: その他の通知設定
   number:
     human:
       decimal_units:
diff --git a/config/locales/kab.yml b/config/locales/kab.yml
index d42481092617f3..d278c15c93f467 100644
--- a/config/locales/kab.yml
+++ b/config/locales/kab.yml
@@ -626,8 +626,6 @@ kab:
       subject: Yuder-ik·ikem-id %{name}
     reblog:
       subject: "%{name} yesselha addad-ik·im"
-  notifications:
-    other_settings: Iɣewwaṛen nniḍen n yilɣa
   number:
     human:
       decimal_units:
diff --git a/config/locales/kk.yml b/config/locales/kk.yml
index 2cd894befb398c..9528c0950f73e5 100644
--- a/config/locales/kk.yml
+++ b/config/locales/kk.yml
@@ -539,7 +539,6 @@ kk:
   notifications:
     email_events: E-mail ескертпелеріне шаралар
     email_events_hint: 'Ескертпе болып келетін шараларды таңда:'
-    other_settings: Ескертпелердің басқа баптаулары
   number:
     human:
       decimal_units:
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 45a95139f04800..1e53006cbbb7df 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -1471,7 +1471,6 @@ ko:
     administration_emails: 관리자 이메일 알림
     email_events: 이메일 알림에 대한 이벤트
     email_events_hint: '알림 받을 이벤트를 선택해주세요:'
-    other_settings: 기타 알림 설정
   number:
     human:
       decimal_units:
diff --git a/config/locales/ku.yml b/config/locales/ku.yml
index d744aaa90323c7..91ab75ceb085a2 100644
--- a/config/locales/ku.yml
+++ b/config/locales/ku.yml
@@ -1285,7 +1285,6 @@ ku:
   notifications:
     email_events: Bûyer bo agahdariyên e-nameyê
     email_events_hint: 'Bûyera ku tu dixwazî agahdariyan jê wergerî hilbijêre:'
-    other_settings: Sazkariya agahdariyên din
   number:
     human:
       decimal_units:
diff --git a/config/locales/lad.yml b/config/locales/lad.yml
index 13e29f927ee030..bed6b44d39890f 100644
--- a/config/locales/lad.yml
+++ b/config/locales/lad.yml
@@ -1495,7 +1495,6 @@ lad:
     administration_emails: Avizos de administrasyon por posta
     email_events: Evenimyentos para avizos por posta
     email_events_hint: 'Eskoje los evenimientos para los kualos keres risivir avizos:'
-    other_settings: Otras preferensyas de avizos
   number:
     human:
       decimal_units:
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index 89bdf5f05f9192..dc4c39083cd86d 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -1513,7 +1513,6 @@ lv:
     administration_emails: Administrators e-pasta paziņojumi
     email_events: E-pasta paziņojumu notikumi
     email_events_hint: 'Atlasi notikumus, par kuriem vēlies saņemt paziņojumus:'
-    other_settings: Citu paziņojumu iestatījumi
   number:
     human:
       decimal_units:
diff --git a/config/locales/ms.yml b/config/locales/ms.yml
index 81f1851b1e9185..e20dfd09e0840d 100644
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@@ -1442,7 +1442,6 @@ ms:
     administration_emails: Notifikasi e-mel pentadbir
     email_events: Acara untuk pemberitahuan e-mel
     email_events_hint: 'Pilih acara yang ingin anda terima pemberitahuan:'
-    other_settings: Tetapan notifikasi lain
   number:
     human:
       decimal_units:
diff --git a/config/locales/my.yml b/config/locales/my.yml
index 18f5c6a2d05fba..f2c115c17c1134 100644
--- a/config/locales/my.yml
+++ b/config/locales/my.yml
@@ -1445,7 +1445,6 @@ my:
     administration_emails: စီမံခန့်ခွဲသူ အီးမေးလ် အသိပေးချက်များ
     email_events: အီးမေးလ်သတိပေးချက်များအတွက်အကြောင်းအရာများ
     email_events_hint: အသိပေးချက်များရယူမည့် အစီအစဉ်များကို ရွေးပါ -
-    other_settings: အခြားအသိပေးချက်များ၏ သတ်မှတ်ချက်များ
   number:
     human:
       decimal_units:
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index c935e9f4aadb45..ac49efddf1f323 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -1495,7 +1495,6 @@ nl:
     administration_emails: E-mailmeldingen beheerder
     email_events: E-mailmeldingen voor gebeurtenissen
     email_events_hint: 'Selecteer gebeurtenissen waarvoor je meldingen wilt ontvangen:'
-    other_settings: Andere meldingsinstellingen
   number:
     human:
       decimal_units:
diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index aecd148e28cf1f..52ed45a675b956 100644
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -1495,7 +1495,6 @@ nn:
     administration_emails: Administrator sine epost-varsler
     email_events: E-postvarslinger for hendelser
     email_events_hint: 'Velg hendelser som du vil motta varslinger for:'
-    other_settings: Andre varslingsinnstillinger
   number:
     human:
       decimal_units:
diff --git a/config/locales/no.yml b/config/locales/no.yml
index 481e28e863e099..db56a065faa5f1 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -1490,7 +1490,6 @@
     administration_emails: Administrators e-postvarslinger
     email_events: E-postvarslinger for hendelser
     email_events_hint: 'Velg hendelser som du vil motta varslinger for:'
-    other_settings: Andre varslingsinnstillinger
   number:
     human:
       decimal_units:
diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index b8330992c901ce..32b7da6272a33d 100644
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -724,7 +724,6 @@ oc:
   notifications:
     email_events: Eveniments per las notificacions per corrièl
     email_events_hint: 'Seleccionatz los eveniments que volètz recebre :'
-    other_settings: Autres paramètres de notificacion
   number:
     human:
       decimal_units:
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index f7c5d60f657a7c..9253f2d020c78a 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -1547,7 +1547,6 @@ pl:
     administration_emails: Administracyjne powiadomienia e-mail
     email_events: 'Powiadamiaj e-mailem o:'
     email_events_hint: 'Wybierz wydarzenia, o których chcesz otrzymywać powiadomienia:'
-    other_settings: Inne ustawienia powiadomień
   number:
     human:
       decimal_units:
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 86972f9ef16bd1..58e734d9eb0c77 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -1491,7 +1491,6 @@ pt-BR:
     administration_emails: Notificações por e-mail sobre administração
     email_events: Eventos para notificações por e-mail
     email_events_hint: 'Selecione os eventos que deseja receber notificações:'
-    other_settings: Outras opções para notificações
   number:
     human:
       decimal_units:
diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index 0786ba2ed4f5c9..ebc7f84f4f0edb 100644
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -1495,7 +1495,6 @@ pt-PT:
     administration_emails: Notificções administrativas por e-mail
     email_events: Eventos para notificações por e-mail
     email_events_hint: 'Selecione os casos para os quais deseja receber notificações:'
-    other_settings: Outras opções de notificações
   number:
     human:
       decimal_units:
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 3f15b064f0f156..1c718c95b2e2ab 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -1542,7 +1542,6 @@ ru:
     administration_emails: Уведомления администратора по электронной почте
     email_events: События для e-mail уведомлений
     email_events_hint: 'Выберите события, для которых вы хотели бы получать уведомления:'
-    other_settings: Остальные настройки уведомлений
   number:
     human:
       decimal_units:
diff --git a/config/locales/sc.yml b/config/locales/sc.yml
index 533764606bc142..33ca7ab1d2f78b 100644
--- a/config/locales/sc.yml
+++ b/config/locales/sc.yml
@@ -865,7 +865,6 @@ sc:
   notifications:
     email_events: Eventos pro notìficas cun posta eletrònica
     email_events_hint: 'Seletziona eventos pro is chi boles retzire notìficas:'
-    other_settings: Àteras configuratziones de notìficas
   number:
     human:
       decimal_units:
diff --git a/config/locales/sco.yml b/config/locales/sco.yml
index dc273d2d836057..d5628c01bc8e9f 100644
--- a/config/locales/sco.yml
+++ b/config/locales/sco.yml
@@ -1275,7 +1275,6 @@ sco:
   notifications:
     email_events: Events fir email notes
     email_events_hint: 'Pick events thit ye''r wantin tae get notes fir:'
-    other_settings: Ither notes settins
   number:
     human:
       decimal_units:
diff --git a/config/locales/si.yml b/config/locales/si.yml
index ac292d6cf8143d..28488197c57c30 100644
--- a/config/locales/si.yml
+++ b/config/locales/si.yml
@@ -1144,7 +1144,6 @@ si:
   notifications:
     email_events: ඊමේල් දැනුම්දීම් සඳහා සිදුවීම්
     email_events_hint: 'ඔබට දැනුම්දීම් ලැබීමට අවශ්‍ය සිදුවීම් තෝරන්න:'
-    other_settings: වෙනත් දැනුම්දීම් සැකසුම්
   number:
     human:
       decimal_units:
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index d97cfac0ea8c2f..e93cec19f6a20e 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -1085,7 +1085,6 @@ sk:
   notifications:
     email_events: Udalosti oznamované emailom
     email_events_hint: 'Vyber si udalosti, pre ktoré chceš dostávať oboznámenia:'
-    other_settings: Ostatné oboznamovacie nastavenia
   otp_authentication:
     enable: Povoľ
   pagination:
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index c9b2343b693dd5..863b3d72496401 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -1547,7 +1547,6 @@ sl:
     administration_emails: E-poštna obvestila skrbnika
     email_events: Dogodki za e-obvestila
     email_events_hint: 'Izberite dogodke, za katere želite prejmati obvestila:'
-    other_settings: Druge nastavitve obvestil
   number:
     human:
       decimal_units:
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index 4293271bb242c4..d3d5a262fd178f 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -1491,7 +1491,6 @@ sq:
     administration_emails: Njoftime email për përgjegjësin
     email_events: Akte për njoftim me email
     email_events_hint: 'Përzgjidhni akte për të cilët doni të merrni njoftime:'
-    other_settings: Rregullimet të tjera njoftimesh
   number:
     human:
       decimal_units:
diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml
index a1f6df067fabd6..7c7fb390fe397b 100644
--- a/config/locales/sr-Latn.yml
+++ b/config/locales/sr-Latn.yml
@@ -1516,7 +1516,6 @@ sr-Latn:
     administration_emails: Obaveštenja e-poštom od administratora
     email_events: Događaji za obaveštenja e-poštom
     email_events_hint: 'Izaberite dešavanja za koja želite da primate obaveštenja:'
-    other_settings: Ostala podešavanja obaveštenja
   number:
     human:
       decimal_units:
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 494b41a7540a1c..c5b42e6b9eaed6 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -1516,7 +1516,6 @@ sr:
     administration_emails: Обавештења е-поштом од администратора
     email_events: Догађаји за обавештења е-поштом
     email_events_hint: 'Изаберите дешавања за која желите да примате обавештења:'
-    other_settings: Остала подешавања обавештења
   number:
     human:
       decimal_units:
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index d0f3994b4e3be9..108c17fc9f39c1 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -1489,7 +1489,6 @@ sv:
     administration_emails: Admin e-postaviseringar
     email_events: Händelser för e-postnotiser
     email_events_hint: 'Välj händelser som du vill ta emot aviseringar för:'
-    other_settings: Andra aviseringsinställningar
   number:
     human:
       decimal_units:
diff --git a/config/locales/ta.yml b/config/locales/ta.yml
index b035a602c262c5..3a22b572b11d46 100644
--- a/config/locales/ta.yml
+++ b/config/locales/ta.yml
@@ -212,7 +212,6 @@ ta:
   notifications:
     email_events: மின்னஞ்சல் அறிவிப்புகளுக்கான நிகழ்வுகள்
     email_events_hint: 'எந்த நிகழ்வுகளுக்கு அறிவிப்புகளைப் பெற வேண்டும் என்று தேர்வு செய்க:'
-    other_settings: அறிவிப்புகள் குறித்த பிற அமைப்புகள்
   polls:
     errors:
       invalid_choice: நீங்கள் தேர்வு செய்த விருப்பம் கிடைக்கவில்லை
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 5253dd6b787884..b212300220e0c9 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -1469,7 +1469,6 @@ th:
     administration_emails: การแจ้งเตือนอีเมลผู้ดูแล
     email_events: เหตุการณ์สำหรับการแจ้งเตือนอีเมล
     email_events_hint: 'เลือกเหตุการณ์ที่คุณต้องการรับการแจ้งเตือน:'
-    other_settings: การตั้งค่าการแจ้งเตือนอื่น ๆ
   number:
     human:
       decimal_units:
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 7dbec9abbdda7a..3732e53ab96d05 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -1495,7 +1495,6 @@ tr:
     administration_emails: Yönetici e-posta bildirimleri
     email_events: E-posta bildirimi gönderilecek etkinlikler
     email_events_hint: 'Bildirim almak istediğiniz olayları seçin:'
-    other_settings: Diğer bildirim ayarları
   number:
     human:
       decimal_units:
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 7273a0ff2b965f..231f0028fd411d 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -1547,7 +1547,6 @@ uk:
     administration_emails: Сповіщення е-пошти адміністратора
     email_events: Події, про які сповіщати електронною поштою
     email_events_hint: 'Оберіть події, про які ви хочете отримувати сповіщення:'
-    other_settings: Інші налаштування сповіщень
   number:
     human:
       decimal_units:
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index e362c97a41b69e..2afb6aa4c15820 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -1467,7 +1467,6 @@ vi:
     administration_emails: Email thông báo admin
     email_events: Email
     email_events_hint: 'Chọn những hoạt động sẽ gửi thông báo qua email:'
-    other_settings: Chặn thông báo từ
   number:
     human:
       decimal_units:
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 46a0e401524d6f..93c741915d279d 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -1469,7 +1469,6 @@ zh-CN:
     administration_emails: 管理员电子邮件通知
     email_events: 电子邮件通知事件
     email_events_hint: 选择你想要收到通知的事件：
-    other_settings: 其它通知设置
   number:
     human:
       decimal_units:
diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml
index e666e4965d250b..62649864c735e0 100644
--- a/config/locales/zh-HK.yml
+++ b/config/locales/zh-HK.yml
@@ -1464,7 +1464,6 @@ zh-HK:
     administration_emails: 管理員電郵通知
     email_events: 電郵通知活動
     email_events_hint: 選擇你想接收通知的活動：
-    other_settings: 其他通知設定
   number:
     human:
       decimal_units:
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 3cd358383099ea..f50f685bb4c2e1 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -1471,7 +1471,6 @@ zh-TW:
     administration_emails: 管理員電子郵件通知
     email_events: 電子郵件通知設定
     email_events_hint: 選取您想接收通知的事件：
-    other_settings: 其他通知設定
   number:
     human:
       decimal_units:
diff --git a/config/routes/api.rb b/config/routes/api.rb
index 853a44e0e10b14..18a247e9fde678 100644
--- a/config/routes/api.rb
+++ b/config/routes/api.rb
@@ -150,6 +150,17 @@
       end
     end
 
+    namespace :notifications do
+      resources :requests, only: :index do
+        member do
+          post :accept
+          post :dismiss
+        end
+      end
+
+      resource :policy, only: [:show, :update]
+    end
+
     resources :notifications, only: [:index, :show] do
       collection do
         post :clear
diff --git a/db/migrate/20240221195424_add_filtered_to_notifications.rb b/db/migrate/20240221195424_add_filtered_to_notifications.rb
new file mode 100644
index 00000000000000..99e98a58b86fea
--- /dev/null
+++ b/db/migrate/20240221195424_add_filtered_to_notifications.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddFilteredToNotifications < ActiveRecord::Migration[7.1]
+  def change
+    add_column :notifications, :filtered, :boolean, default: false, null: false
+  end
+end
diff --git a/db/migrate/20240221195828_create_notification_requests.rb b/db/migrate/20240221195828_create_notification_requests.rb
new file mode 100644
index 00000000000000..98aa630408f950
--- /dev/null
+++ b/db/migrate/20240221195828_create_notification_requests.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+class CreateNotificationRequests < ActiveRecord::Migration[7.1]
+  def change
+    create_table :notification_requests do |t|
+      t.references :account, null: false, foreign_key: { on_delete: :cascade }, index: false
+      t.references :from_account, null: false, foreign_key: { to_table: :accounts, on_delete: :cascade }
+      t.references :last_status, null: false, foreign_key: { to_table: :statuses, on_delete: :nullify }
+      t.bigint :notifications_count, null: false, default: 0
+      t.boolean :dismissed, null: false, default: false
+
+      t.timestamps
+    end
+
+    add_index :notification_requests, [:account_id, :from_account_id], unique: true
+    add_index :notification_requests, [:account_id, :id], where: 'dismissed = false', order: { id: :desc }
+  end
+end
diff --git a/db/migrate/20240221211359_notification_request_ids_to_timestamp_ids.rb b/db/migrate/20240221211359_notification_request_ids_to_timestamp_ids.rb
new file mode 100644
index 00000000000000..8503f452fe2596
--- /dev/null
+++ b/db/migrate/20240221211359_notification_request_ids_to_timestamp_ids.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class NotificationRequestIdsToTimestampIds < ActiveRecord::Migration[7.1]
+  def up
+    safety_assured do
+      execute("ALTER TABLE notification_requests ALTER COLUMN id SET DEFAULT timestamp_id('notification_requests')")
+    end
+  end
+
+  def down
+    execute('LOCK notification_requests')
+    execute("SELECT setval('notification_requests_id_seq', (SELECT MAX(id) FROM notification_requests))")
+    execute("ALTER TABLE notification_requests ALTER COLUMN id SET DEFAULT nextval('notification_requests_id_seq')")
+  end
+end
diff --git a/db/migrate/20240222193403_create_notification_permissions.rb b/db/migrate/20240222193403_create_notification_permissions.rb
new file mode 100644
index 00000000000000..6e2b6196c20b49
--- /dev/null
+++ b/db/migrate/20240222193403_create_notification_permissions.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+class CreateNotificationPermissions < ActiveRecord::Migration[7.1]
+  def change
+    create_table :notification_permissions do |t|
+      t.references :account, null: false, foreign_key: true
+      t.references :from_account, null: false, foreign_key: { to_table: :accounts }
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20240222203722_create_notification_policies.rb b/db/migrate/20240222203722_create_notification_policies.rb
new file mode 100644
index 00000000000000..e9d35510a865ee
--- /dev/null
+++ b/db/migrate/20240222203722_create_notification_policies.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class CreateNotificationPolicies < ActiveRecord::Migration[7.1]
+  def change
+    create_table :notification_policies do |t|
+      t.references :account, null: false, foreign_key: true, index: { unique: true }
+      t.boolean :filter_not_following, null: false, default: false
+      t.boolean :filter_not_followers, null: false, default: false
+      t.boolean :filter_new_accounts, null: false, default: false
+      t.boolean :filter_private_mentions, null: false, default: true
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20240227191620_add_filtered_index_on_notifications.rb b/db/migrate/20240227191620_add_filtered_index_on_notifications.rb
new file mode 100644
index 00000000000000..ca34452472610b
--- /dev/null
+++ b/db/migrate/20240227191620_add_filtered_index_on_notifications.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddFilteredIndexOnNotifications < ActiveRecord::Migration[7.1]
+  disable_ddl_transaction!
+
+  def change
+    add_index :notifications, [:account_id, :id, :type], where: 'filtered = false', order: { id: :desc }, name: 'index_notifications_on_filtered', algorithm: :concurrently
+  end
+end
diff --git a/db/migrate/20240304090449_migrate_interaction_settings_to_policy.rb b/db/migrate/20240304090449_migrate_interaction_settings_to_policy.rb
new file mode 100644
index 00000000000000..a167baadcc8f8b
--- /dev/null
+++ b/db/migrate/20240304090449_migrate_interaction_settings_to_policy.rb
@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+class MigrateInteractionSettingsToPolicy < ActiveRecord::Migration[7.1]
+  disable_ddl_transaction!
+
+  # Dummy classes, to make migration possible across version changes
+  class Account < ApplicationRecord
+    has_one :user, inverse_of: :account
+    has_one :notification_policy, inverse_of: :account
+  end
+
+  class User < ApplicationRecord
+    belongs_to :account
+  end
+
+  class NotificationPolicy < ApplicationRecord
+    belongs_to :account
+  end
+
+  def up
+    User.includes(account: :notification_policy).find_each do |user|
+      deserialized_settings = Oj.load(user.attributes_before_type_cast['settings'])
+      policy = user.account.notification_policy || user.account.build_notification_policy
+      requires_new_policy = false
+
+      if deserialized_settings['interactions.must_be_follower']
+        policy.filter_not_followers = true
+        requires_new_policy = true
+      end
+
+      if deserialized_settings['interactions.must_be_following']
+        policy.filter_not_following = true
+        requires_new_policy = true
+      end
+
+      if deserialized_settings['interactions.must_be_following_dm']
+        policy.filter_private_mentions = true
+        requires_new_policy = true
+      end
+
+      policy.save if requires_new_policy && policy.changed?
+    end
+  end
+
+  def down; end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 50f4e7189dfee1..97917d0456c474 100644
--- 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_01_11_033014) do
+ActiveRecord::Schema[7.1].define(version: 2024_03_04_090449) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -666,6 +666,40 @@
     t.index ["target_account_id"], name: "index_mutes_on_target_account_id"
   end
 
+  create_table "notification_permissions", force: :cascade do |t|
+    t.bigint "account_id", null: false
+    t.bigint "from_account_id", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["account_id"], name: "index_notification_permissions_on_account_id"
+    t.index ["from_account_id"], name: "index_notification_permissions_on_from_account_id"
+  end
+
+  create_table "notification_policies", force: :cascade do |t|
+    t.bigint "account_id", null: false
+    t.boolean "filter_not_following", default: false, null: false
+    t.boolean "filter_not_followers", default: false, null: false
+    t.boolean "filter_new_accounts", default: false, null: false
+    t.boolean "filter_private_mentions", default: true, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["account_id"], name: "index_notification_policies_on_account_id", unique: true
+  end
+
+  create_table "notification_requests", id: :bigint, default: -> { "timestamp_id('notification_requests'::text)" }, force: :cascade do |t|
+    t.bigint "account_id", null: false
+    t.bigint "from_account_id", null: false
+    t.bigint "last_status_id", null: false
+    t.bigint "notifications_count", default: 0, null: false
+    t.boolean "dismissed", default: false, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["account_id", "from_account_id"], name: "index_notification_requests_on_account_id_and_from_account_id", unique: true
+    t.index ["account_id", "id"], name: "index_notification_requests_on_account_id_and_id", order: { id: :desc }, where: "(dismissed = false)"
+    t.index ["from_account_id"], name: "index_notification_requests_on_from_account_id"
+    t.index ["last_status_id"], name: "index_notification_requests_on_last_status_id"
+  end
+
   create_table "notifications", force: :cascade do |t|
     t.bigint "activity_id", null: false
     t.string "activity_type", null: false
@@ -674,7 +708,9 @@
     t.bigint "account_id", null: false
     t.bigint "from_account_id", null: false
     t.string "type"
+    t.boolean "filtered", default: false, null: false
     t.index ["account_id", "id", "type"], name: "index_notifications_on_account_id_and_id_and_type", order: { id: :desc }
+    t.index ["account_id", "id", "type"], name: "index_notifications_on_filtered", order: { id: :desc }, where: "(filtered = false)"
     t.index ["activity_id", "activity_type"], name: "index_notifications_on_activity_id_and_activity_type"
     t.index ["from_account_id"], name: "index_notifications_on_from_account_id"
   end
@@ -1255,6 +1291,12 @@
   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_policies", "accounts"
+  add_foreign_key "notification_requests", "accounts", column: "from_account_id", on_delete: :cascade
+  add_foreign_key "notification_requests", "accounts", on_delete: :cascade
+  add_foreign_key "notification_requests", "statuses", column: "last_status_id", on_delete: :nullify
   add_foreign_key "notifications", "accounts", column: "from_account_id", name: "fk_fbd6b0bf9e", on_delete: :cascade
   add_foreign_key "notifications", "accounts", name: "fk_c141c8ee55", on_delete: :cascade
   add_foreign_key "oauth_access_grants", "oauth_applications", column: "application_id", name: "fk_34d54b0a33", on_delete: :cascade
diff --git a/spec/controllers/settings/preferences/notifications_controller_spec.rb b/spec/controllers/settings/preferences/notifications_controller_spec.rb
index b61d7461ce6900..e0f0bc55a7580d 100644
--- a/spec/controllers/settings/preferences/notifications_controller_spec.rb
+++ b/spec/controllers/settings/preferences/notifications_controller_spec.rb
@@ -24,14 +24,13 @@
 
   describe 'PUT #update' do
     it 'updates notifications settings' do
-      user.settings.update('notification_emails.follow': false, 'interactions.must_be_follower': true)
+      user.settings.update('notification_emails.follow': false)
       user.save
 
       put :update, params: {
         user: {
           settings_attributes: {
             'notification_emails.follow': '1',
-            'interactions.must_be_follower': '0',
           },
         },
       }
@@ -39,7 +38,6 @@
       expect(response).to redirect_to(settings_preferences_notifications_path)
       user.reload
       expect(user.settings['notification_emails.follow']).to be true
-      expect(user.settings['interactions.must_be_follower']).to be false
     end
   end
 end
diff --git a/spec/fabricators/notification_permission_fabricator.rb b/spec/fabricators/notification_permission_fabricator.rb
new file mode 100644
index 00000000000000..d421ddd81f4aac
--- /dev/null
+++ b/spec/fabricators/notification_permission_fabricator.rb
@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+Fabricator(:notification_permission) do
+  account
+  from_account { Fabricate.build(:account) }
+end
diff --git a/spec/fabricators/notification_policy_fabricator.rb b/spec/fabricators/notification_policy_fabricator.rb
new file mode 100644
index 00000000000000..f33438fec7daa9
--- /dev/null
+++ b/spec/fabricators/notification_policy_fabricator.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+Fabricator(:notification_policy) do
+  account
+  filter_not_following false
+  filter_not_followers false
+  filter_new_accounts false
+  filter_private_mentions true
+end
diff --git a/spec/fabricators/notification_request_fabricator.rb b/spec/fabricators/notification_request_fabricator.rb
new file mode 100644
index 00000000000000..05a13b8ef8010d
--- /dev/null
+++ b/spec/fabricators/notification_request_fabricator.rb
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+Fabricator(:notification_request) do
+  account
+  from_account { Fabricate.build(:account) }
+  last_status { Fabricate.build(:status) }
+  dismissed false
+end
diff --git a/spec/models/notification_policy_spec.rb b/spec/models/notification_policy_spec.rb
new file mode 100644
index 00000000000000..bbfa548cf4b5c4
--- /dev/null
+++ b/spec/models/notification_policy_spec.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe NotificationPolicy do
+  describe '#summarize!' do
+    subject { Fabricate(:notification_policy) }
+
+    let(:sender) { Fabricate(:account) }
+
+    before do
+      Fabricate.times(2, :notification, account: subject.account, activity: Fabricate(:status, account: sender))
+      Fabricate(:notification_request, account: subject.account, from_account: sender)
+      subject.summarize!
+    end
+
+    it 'sets pending_requests_count' do
+      expect(subject.pending_requests_count).to eq 1
+    end
+
+    it 'sets pending_notifications_count' do
+      expect(subject.pending_notifications_count).to eq 2
+    end
+  end
+end
diff --git a/spec/models/notification_request_spec.rb b/spec/models/notification_request_spec.rb
new file mode 100644
index 00000000000000..f4613aaedeb3b7
--- /dev/null
+++ b/spec/models/notification_request_spec.rb
@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe NotificationRequest do
+  describe '#reconsider_existence!' do
+    subject { Fabricate(:notification_request, dismissed: dismissed) }
+
+    let(:dismissed) { false }
+
+    context 'when there are remaining notifications' do
+      before do
+        Fabricate(:notification, account: subject.account, activity: Fabricate(:status, account: subject.from_account))
+        subject.reconsider_existence!
+      end
+
+      it 'leaves request intact' do
+        expect(subject.destroyed?).to be false
+      end
+
+      it 'updates notifications_count' do
+        expect(subject.notifications_count).to eq 1
+      end
+    end
+
+    context 'when there are no notifications' do
+      before do
+        subject.reconsider_existence!
+      end
+
+      context 'when dismissed' do
+        let(:dismissed) { true }
+
+        it 'leaves request intact' do
+          expect(subject.destroyed?).to be false
+        end
+      end
+
+      it 'removes the request' do
+        expect(subject.destroyed?).to be true
+      end
+    end
+  end
+end
diff --git a/spec/requests/api/v1/conversations_spec.rb b/spec/requests/api/v1/conversations_spec.rb
index e2327d9a9374bd..caa0f5c52c0975 100644
--- a/spec/requests/api/v1/conversations_spec.rb
+++ b/spec/requests/api/v1/conversations_spec.rb
@@ -12,6 +12,7 @@
 
   describe 'GET /api/v1/conversations', :sidekiq_inline do
     before do
+      user.account.follow!(other.account)
       PostStatusService.new.call(other.account, text: 'Hey @alice', visibility: 'direct')
       PostStatusService.new.call(user.account, text: 'Hey, nobody here', visibility: 'direct')
     end
diff --git a/spec/requests/api/v1/notifications/policies_spec.rb b/spec/requests/api/v1/notifications/policies_spec.rb
new file mode 100644
index 00000000000000..fe6bdbd97355f8
--- /dev/null
+++ b/spec/requests/api/v1/notifications/policies_spec.rb
@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Policies' do
+  let(:user)    { Fabricate(:user, account_attributes: { username: 'alice' }) }
+  let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+  let(:scopes)  { 'read:notifications write:notifications' }
+  let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
+
+  describe 'GET /api/v1/notifications/policy', :sidekiq_inline do
+    subject do
+      get '/api/v1/notifications/policy', headers: headers, params: params
+    end
+
+    let(:params) { {} }
+
+    before do
+      Fabricate(:notification_request, account: user.account)
+    end
+
+    it_behaves_like 'forbidden for wrong scope', 'write write:notifications'
+
+    context 'with no options' do
+      it 'returns http success', :aggregate_failures do
+        subject
+
+        expect(response).to have_http_status(200)
+      end
+    end
+  end
+
+  describe 'PUT /api/v1/notifications/policy' do
+    subject do
+      put '/api/v1/notifications/policy', headers: headers, params: params
+    end
+
+    let(:params) { {} }
+
+    it_behaves_like 'forbidden for wrong scope', 'read read:notifications'
+
+    it 'returns http success' do
+      subject
+
+      expect(response).to have_http_status(200)
+    end
+  end
+end
diff --git a/spec/requests/api/v1/notifications/requests_spec.rb b/spec/requests/api/v1/notifications/requests_spec.rb
new file mode 100644
index 00000000000000..64675d562c6474
--- /dev/null
+++ b/spec/requests/api/v1/notifications/requests_spec.rb
@@ -0,0 +1,107 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Requests' do
+  let(:user)    { Fabricate(:user, account_attributes: { username: 'alice' }) }
+  let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+  let(:scopes)  { 'read:notifications write:notifications' }
+  let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
+
+  describe 'GET /api/v1/notifications/requests', :sidekiq_inline do
+    subject do
+      get '/api/v1/notifications/requests', headers: headers, params: params
+    end
+
+    let(:params) { {} }
+
+    before do
+      Fabricate(:notification_request, account: user.account)
+      Fabricate(:notification_request, account: user.account, dismissed: true)
+    end
+
+    it_behaves_like 'forbidden for wrong scope', 'write write:notifications'
+
+    context 'with no options' do
+      it 'returns http success', :aggregate_failures do
+        subject
+
+        expect(response).to have_http_status(200)
+      end
+    end
+
+    context 'with dismissed' do
+      let(:params) { { dismissed: '1' } }
+
+      it 'returns http success', :aggregate_failures do
+        subject
+
+        expect(response).to have_http_status(200)
+      end
+    end
+  end
+
+  describe 'POST /api/v1/notifications/requests/:id/accept' do
+    subject do
+      post "/api/v1/notifications/requests/#{notification_request.id}/accept", headers: headers
+    end
+
+    let(:notification_request) { Fabricate(:notification_request, account: user.account) }
+
+    it_behaves_like 'forbidden for wrong scope', 'read read:notifications'
+
+    it 'returns http success' do
+      subject
+
+      expect(response).to have_http_status(200)
+    end
+
+    it 'creates notification permission' do
+      subject
+
+      expect(NotificationPermission.find_by(account: notification_request.account, from_account: notification_request.from_account)).to_not be_nil
+    end
+
+    context 'when notification request belongs to someone else' do
+      let(:notification_request) { Fabricate(:notification_request) }
+
+      it 'returns http not found' do
+        subject
+
+        expect(response).to have_http_status(404)
+      end
+    end
+  end
+
+  describe 'POST /api/v1/notifications/requests/:id/dismiss' do
+    subject do
+      post "/api/v1/notifications/requests/#{notification_request.id}/dismiss", headers: headers
+    end
+
+    let(:notification_request) { Fabricate(:notification_request, account: user.account) }
+
+    it_behaves_like 'forbidden for wrong scope', 'read read:notifications'
+
+    it 'returns http success' do
+      subject
+
+      expect(response).to have_http_status(200)
+    end
+
+    it 'dismisses the notification request' do
+      subject
+
+      expect(notification_request.reload.dismissed?).to be true
+    end
+
+    context 'when notification request belongs to someone else' do
+      let(:notification_request) { Fabricate(:notification_request) }
+
+      it 'returns http not found' do
+        subject
+
+        expect(response).to have_http_status(404)
+      end
+    end
+  end
+end
diff --git a/spec/services/notify_service_spec.rb b/spec/services/notify_service_spec.rb
index e818fadcbe8d65..57ff326c732c7c 100644
--- a/spec/services/notify_service_spec.rb
+++ b/spec/services/notify_service_spec.rb
@@ -41,7 +41,8 @@
 
   it 'does not notify when sender is silenced and not followed' do
     sender.silence!
-    expect { subject }.to_not change(Notification, :count)
+    subject
+    expect(Notification.find_by(activity: activity).filtered?).to be true
   end
 
   it 'does not notify when recipient is suspended' do
@@ -49,66 +50,6 @@
     expect { subject }.to_not change(Notification, :count)
   end
 
-  context 'with direct messages' do
-    let(:activity) { Fabricate(:mention, account: recipient, status: Fabricate(:status, account: sender, visibility: :direct)) }
-    let(:type)     { :mention }
-
-    before do
-      user.settings.update('interactions.must_be_following_dm': enabled)
-      user.save
-    end
-
-    context 'when recipient is supposed to be following sender' do
-      let(:enabled) { true }
-
-      it 'does not notify' do
-        expect { subject }.to_not change(Notification, :count)
-      end
-
-      context 'when the message chain is initiated by recipient, but is not direct message' do
-        let(:reply_to) { Fabricate(:status, account: recipient) }
-        let(:activity) { Fabricate(:mention, account: recipient, status: Fabricate(:status, account: sender, visibility: :direct, thread: reply_to)) }
-
-        before { Fabricate(:mention, account: sender, status: reply_to) }
-
-        it 'does not notify' do
-          expect { subject }.to_not change(Notification, :count)
-        end
-      end
-
-      context 'when the message chain is initiated by recipient, but without a mention to the sender, even if the sender sends multiple messages in a row' do
-        let(:reply_to) { Fabricate(:status, account: recipient) }
-        let(:dummy_reply) { Fabricate(:status, account: sender, visibility: :direct, thread: reply_to) }
-        let(:activity) { Fabricate(:mention, account: recipient, status: Fabricate(:status, account: sender, visibility: :direct, thread: dummy_reply)) }
-
-        before { Fabricate(:mention, account: sender, status: reply_to) }
-
-        it 'does not notify' do
-          expect { subject }.to_not change(Notification, :count)
-        end
-      end
-
-      context 'when the message chain is initiated by the recipient with a mention to the sender' do
-        let(:reply_to) { Fabricate(:status, account: recipient, visibility: :direct) }
-        let(:activity) { Fabricate(:mention, account: recipient, status: Fabricate(:status, account: sender, visibility: :direct, thread: reply_to)) }
-
-        before { Fabricate(:mention, account: sender, status: reply_to) }
-
-        it 'does notify' do
-          expect { subject }.to change(Notification, :count)
-        end
-      end
-    end
-
-    context 'when recipient is NOT supposed to be following sender' do
-      let(:enabled) { false }
-
-      it 'does notify' do
-        expect { subject }.to change(Notification, :count)
-      end
-    end
-  end
-
   describe 'reblogs' do
     let(:status)   { Fabricate(:status, account: Fabricate(:account)) }
     let(:activity) { Fabricate(:status, account: sender, reblog: status) }
@@ -187,4 +128,189 @@
       end
     end
   end
+
+  describe NotifyService::FilterCondition do
+    subject { described_class.new(notification) }
+
+    let(:activity) { Fabricate(:mention, status: Fabricate(:status)) }
+    let(:notification) { Fabricate(:notification, type: :mention, activity: activity, from_account: activity.status.account, account: activity.account) }
+
+    describe '#filter?' do
+      context 'when sender is silenced' do
+        before do
+          notification.from_account.silence!
+        end
+
+        it 'returns true' do
+          expect(subject.filter?).to be true
+        end
+
+        context 'when recipient follows sender' do
+          before do
+            notification.account.follow!(notification.from_account)
+          end
+
+          it 'returns false' do
+            expect(subject.filter?).to be false
+          end
+        end
+      end
+
+      context 'when recipient is filtering not-followed senders' do
+        before do
+          Fabricate(:notification_policy, account: notification.account, filter_not_following: true)
+        end
+
+        it 'returns true' do
+          expect(subject.filter?).to be true
+        end
+
+        context 'when sender has permission' do
+          before do
+            Fabricate(:notification_permission, account: notification.account, from_account: notification.from_account)
+          end
+
+          it 'returns false' do
+            expect(subject.filter?).to be false
+          end
+        end
+
+        context 'when sender is followed by recipient' do
+          before do
+            notification.account.follow!(notification.from_account)
+          end
+
+          it 'returns false' do
+            expect(subject.filter?).to be false
+          end
+        end
+      end
+
+      context 'when recipient is filtering not-followers' do
+        before do
+          Fabricate(:notification_policy, account: notification.account, filter_not_followers: true)
+        end
+
+        it 'returns true' do
+          expect(subject.filter?).to be true
+        end
+
+        context 'when sender has permission' do
+          before do
+            Fabricate(:notification_permission, account: notification.account, from_account: notification.from_account)
+          end
+
+          it 'returns false' do
+            expect(subject.filter?).to be false
+          end
+        end
+
+        context 'when sender follows recipient' do
+          before do
+            notification.from_account.follow!(notification.account)
+          end
+
+          it 'returns true' do
+            expect(subject.filter?).to be true
+          end
+        end
+
+        context 'when sender follows recipient for longer than 3 days' do
+          before do
+            follow = notification.from_account.follow!(notification.account)
+            follow.update(created_at: 4.days.ago)
+          end
+
+          it 'returns false' do
+            expect(subject.filter?).to be false
+          end
+        end
+      end
+
+      context 'when recipient is filtering new accounts' do
+        before do
+          Fabricate(:notification_policy, account: notification.account, filter_new_accounts: true)
+        end
+
+        it 'returns true' do
+          expect(subject.filter?).to be true
+        end
+
+        context 'when sender has permission' do
+          before do
+            Fabricate(:notification_permission, account: notification.account, from_account: notification.from_account)
+          end
+
+          it 'returns false' do
+            expect(subject.filter?).to be false
+          end
+        end
+
+        context 'when sender is older than 30 days' do
+          before do
+            notification.from_account.update(created_at: 31.days.ago)
+          end
+
+          it 'returns false' do
+            expect(subject.filter?).to be false
+          end
+        end
+      end
+
+      context 'when recipient is not filtering anyone' do
+        before do
+          Fabricate(:notification_policy, account: notification.account)
+        end
+
+        it 'returns false' do
+          expect(subject.filter?).to be false
+        end
+      end
+
+      context 'when recipient is filtering unsolicited private mentions' do
+        before do
+          Fabricate(:notification_policy, account: notification.account, filter_private_mentions: true)
+        end
+
+        context 'when notification is not a private mention' do
+          it 'returns false' do
+            expect(subject.filter?).to be false
+          end
+        end
+
+        context 'when notification is a private mention' do
+          before do
+            notification.target_status.update(visibility: :direct)
+          end
+
+          it 'returns true' do
+            expect(subject.filter?).to be true
+          end
+
+          context 'when the message chain is initiated by recipient, but sender is not mentioned' do
+            before do
+              original_status = Fabricate(:status, account: notification.account, visibility: :direct)
+              notification.target_status.update(thread: original_status)
+            end
+
+            it 'returns true' do
+              expect(subject.filter?).to be true
+            end
+          end
+
+          context 'when the message chain is initiated by recipient, and sender is mentioned' do
+            before do
+              original_status = Fabricate(:status, account: notification.account, visibility: :direct)
+              notification.target_status.update(thread: original_status)
+              Fabricate(:mention, status: original_status, account: notification.from_account)
+            end
+
+            it 'returns false' do
+              expect(subject.filter?).to be false
+            end
+          end
+        end
+      end
+    end
+  end
 end

From 509528e2dc2f87d59bc385efee82a9a83bb1b63f Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 7 Mar 2024 18:33:54 +0100
Subject: [PATCH 0369/2191] Update dependency pg to v1.5.6 (#29477)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 59b24e1035d4e5..047465fae64c29 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -505,7 +505,7 @@ GEM
     parslet (2.0.0)
     pastel (0.8.0)
       tty-color (~> 0.5)
-    pg (1.5.5)
+    pg (1.5.6)
     pghero (3.4.1)
       activerecord (>= 6)
     posix-spawn (0.3.15)

From e8605a69d22e369e34914548338c15c053db9667 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 7 Mar 2024 19:02:24 +0100
Subject: [PATCH 0370/2191] Update omniauth packages (#25306)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
---
 Gemfile.lock | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 047465fae64c29..73ddfb4cff5eeb 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -465,11 +465,11 @@ GEM
       statsd-ruby (~> 1.4, >= 1.4.0)
     oj (3.16.3)
       bigdecimal (>= 3.0)
-    omniauth (2.1.1)
+    omniauth (2.1.2)
       hashie (>= 3.4.6)
       rack (>= 2.2.3)
       rack-protection
-    omniauth-cas (3.0.0.beta.1)
+    omniauth-cas (3.0.0)
       addressable (~> 2.8)
       nokogiri (~> 1.12)
       omniauth (~> 2.1)
@@ -543,8 +543,9 @@ GEM
       httpclient
       json-jwt (>= 1.11.0)
       rack (>= 2.1.0)
-    rack-protection (3.0.5)
-      rack
+    rack-protection (3.2.0)
+      base64 (>= 0.1.0)
+      rack (~> 2.2, >= 2.2.4)
     rack-proxy (0.7.6)
       rack
     rack-session (1.0.2)

From d002458c7be85bc1b40299d80a7accc554fb2d3b Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 7 Mar 2024 22:39:48 +0100
Subject: [PATCH 0371/2191] New Crowdin Translations (automated) (#2661)

* New Crowdin translations

* Fix bogus translations

---------

Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/locales/kab.json | 4 ++++
 app/javascript/flavours/glitch/locales/ko.json  | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/app/javascript/flavours/glitch/locales/kab.json b/app/javascript/flavours/glitch/locales/kab.json
index d360fed7222d91..d7e1357ce96b80 100644
--- a/app/javascript/flavours/glitch/locales/kab.json
+++ b/app/javascript/flavours/glitch/locales/kab.json
@@ -1,4 +1,8 @@
 {
+  "compose.attach.doodle": "Ssuneɣ-d kra",
+  "navigation_bar.keyboard_shortcuts": "Inezgumen n unasiw",
+  "settings.auto_collapse_notifications": "Ilɣa",
+  "settings.close": "Mdel",
   "settings.content_warnings": "Content warnings",
   "settings.preferences": "Preferences"
 }
diff --git a/app/javascript/flavours/glitch/locales/ko.json b/app/javascript/flavours/glitch/locales/ko.json
index ab70ece316150a..b1da79d102e65c 100644
--- a/app/javascript/flavours/glitch/locales/ko.json
+++ b/app/javascript/flavours/glitch/locales/ko.json
@@ -14,6 +14,7 @@
   "column_subheading.lists": "리스트",
   "column_subheading.navigation": "탐색",
   "community.column_settings.allow_local_only": "로컬 전용 글 보기",
+  "compose.attach.doodle": "뭔가 그려보세요",
   "compose.change_federation": "연합 설정 변경",
   "compose.content-type.change": "고급 양식 옵션 변경",
   "compose.content-type.html": "HTML",
@@ -22,6 +23,8 @@
   "compose.content-type.markdown_meta": "게시물을 마크다운 형식으로 구성",
   "compose.content-type.plain": "일반 텍스트",
   "compose.content-type.plain_meta": "고급 양식 없이 작성",
+  "compose.disable_threaded_mode": "글타래 모드 비활성화",
+  "compose.enable_threaded_mode": "글타래 모드 활성화",
   "confirmation_modal.do_not_ask_again": "다음부터 확인창을 띄우지 않기",
   "confirmations.deprecated_settings.confirm": "마스토돈 설정 사용",
   "confirmations.deprecated_settings.message": "사용하던 몇몇 기기별 글리치 {app_settings}은 마스토돈 {preferences}으로 대체되었습니다:",

From e85a2aa18dfb619e64f6f5acc6c401f72587fc72 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 8 Mar 2024 10:10:07 +0100
Subject: [PATCH 0372/2191] Fix interaction settings migration error when
 encountering no settings (#29529)

---
 .../20240304090449_migrate_interaction_settings_to_policy.rb   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/db/migrate/20240304090449_migrate_interaction_settings_to_policy.rb b/db/migrate/20240304090449_migrate_interaction_settings_to_policy.rb
index a167baadcc8f8b..0e9a42f8df6c3d 100644
--- a/db/migrate/20240304090449_migrate_interaction_settings_to_policy.rb
+++ b/db/migrate/20240304090449_migrate_interaction_settings_to_policy.rb
@@ -20,6 +20,9 @@ class NotificationPolicy < ApplicationRecord
   def up
     User.includes(account: :notification_policy).find_each do |user|
       deserialized_settings = Oj.load(user.attributes_before_type_cast['settings'])
+
+      next if deserialized_settings.nil?
+
       policy = user.account.notification_policy || user.account.build_notification_policy
       requires_new_policy = false
 

From e95f2c2b687e3494229b3a2d6429e93fe801d269 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 8 Mar 2024 11:35:18 +0100
Subject: [PATCH 0373/2191] Add a glitch-soc local setting to make the post
 publish toast optional (#2666)

---
 app/javascript/flavours/glitch/actions/compose.js  | 14 ++++++++------
 .../glitch/features/local_settings/page/index.jsx  |  8 ++++++++
 app/javascript/flavours/glitch/locales/en.json     |  1 +
 .../flavours/glitch/reducers/local_settings.js     |  1 +
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/app/javascript/flavours/glitch/actions/compose.js b/app/javascript/flavours/glitch/actions/compose.js
index 06f0d798742d4c..9e65df7b3902de 100644
--- a/app/javascript/flavours/glitch/actions/compose.js
+++ b/app/javascript/flavours/glitch/actions/compose.js
@@ -266,12 +266,14 @@ export function submitCompose(routerHistory, overridePrivacy = null) {
         insertIfOnline('direct');
       }
 
-      dispatch(showAlert({
-        message: statusId === null ? messages.published : messages.saved,
-        action: messages.open,
-        dismissAfter: 10000,
-        onClick: () => routerHistory.push(`/@${response.data.account.username}/${response.data.id}`),
-      }));
+      if (getState().getIn(['local_settings', 'show_published_toast'])) {
+        dispatch(showAlert({
+          message: statusId === null ? messages.published : messages.saved,
+          action: messages.open,
+          dismissAfter: 10000,
+          onClick: () => routerHistory.push(`/@${response.data.account.username}/${response.data.id}`),
+        }));
+      }
     }).catch(function (error) {
       dispatch(submitComposeFail(error));
     });
diff --git a/app/javascript/flavours/glitch/features/local_settings/page/index.jsx b/app/javascript/flavours/glitch/features/local_settings/page/index.jsx
index 849a553e065abc..ea599afb6a223a 100644
--- a/app/javascript/flavours/glitch/features/local_settings/page/index.jsx
+++ b/app/javascript/flavours/glitch/features/local_settings/page/index.jsx
@@ -224,6 +224,14 @@ class LocalSettingsPage extends PureComponent {
         >
           <FormattedMessage id='settings.show_content_type_choice' defaultMessage='Show content-type choice when authoring toots' />
         </LocalSettingsPageItem>
+        <LocalSettingsPageItem
+          settings={settings}
+          item={['show_published_toast']}
+          id='mastodon-settings--show_published_toast'
+          onChange={onChange}
+        >
+          <FormattedMessage id='settings.show_published_toast' defaultMessage='Display toast when publishing/saving a post' />
+        </LocalSettingsPageItem>
         <LocalSettingsPageItem
           settings={settings}
           item={['side_arm']}
diff --git a/app/javascript/flavours/glitch/locales/en.json b/app/javascript/flavours/glitch/locales/en.json
index 5f64fffdcc0586..8de7059787ed96 100644
--- a/app/javascript/flavours/glitch/locales/en.json
+++ b/app/javascript/flavours/glitch/locales/en.json
@@ -127,6 +127,7 @@
   "settings.shared_settings_link": "user preferences",
   "settings.show_action_bar": "Show action buttons in collapsed toots",
   "settings.show_content_type_choice": "Show content-type choice when authoring toots",
+  "settings.show_published_toast": "Display toast when publishing/saving a post",
   "settings.show_reply_counter": "Display an estimate of the reply count",
   "settings.side_arm": "Secondary toot button:",
   "settings.side_arm.none": "None",
diff --git a/app/javascript/flavours/glitch/reducers/local_settings.js b/app/javascript/flavours/glitch/reducers/local_settings.js
index 712f115d0b502f..f0d8c96c1e93b6 100644
--- a/app/javascript/flavours/glitch/reducers/local_settings.js
+++ b/app/javascript/flavours/glitch/reducers/local_settings.js
@@ -61,6 +61,7 @@ const initialState = ImmutableMap({
     media:      true,
     visibility: true,
   }),
+  show_published_toast: true,
 });
 
 const hydrate = (state, localSettings) => state.mergeDeep(localSettings);

From d09ab957d492fa9101fd9aec77e270d807fb3131 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 8 Mar 2024 11:38:01 +0100
Subject: [PATCH 0374/2191] Remove duplicate `captcha_enabled` key in
 `app/models/form/admin_settings.rb`

---
 app/models/form/admin_settings.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/models/form/admin_settings.rb b/app/models/form/admin_settings.rb
index 095733673e60d8..41a5103f58e34b 100644
--- a/app/models/form/admin_settings.rb
+++ b/app/models/form/admin_settings.rb
@@ -38,7 +38,6 @@ class Form::AdminSettings
     noindex
     outgoing_spoilers
     require_invite_text
-    captcha_enabled
     media_cache_retention_period
     content_cache_retention_period
     backups_retention_period

From a79bd2cd1117512ecc77e97c1d946e7f26fbd439 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 8 Mar 2024 11:45:27 +0100
Subject: [PATCH 0375/2191] Make some CSS differences with upstream more
 explicit

---
 app/javascript/flavours/glitch/styles/components.scss | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index 8e5c57dab3d7e0..efae501756347e 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -1657,6 +1657,7 @@ body > [data-popper-placement] {
   font-size: 15px;
   padding-bottom: 10px;
   display: flex;
+  align-items: start; // glitch: changed because of our different layout
   justify-content: space-between;
   gap: 10px;
   cursor: pointer;
@@ -1865,7 +1866,7 @@ body > [data-popper-placement] {
   .media-gallery,
   .video-player,
   .audio-player {
-    margin-top: 8px;
+    margin-top: 8px; // glitch: reduced margins
   }
 
   .status__prepend {

From 6996b96fab15b050713e06a71ce9abcbc2716d4e Mon Sep 17 00:00:00 2001
From: neetshin <neetshin@neetsh.in>
Date: Mon, 15 Jan 2018 05:51:00 +0000
Subject: [PATCH 0376/2191] [Glitch] Make columns-area unscrollable when modal
 opened

Port 2091ae92be5d04cd4dadb2200c507ce8d8d2623e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/features/ui/components/columns_area.jsx  | 5 +++--
 .../glitch/features/ui/containers/columns_area_container.js  | 1 +
 app/javascript/flavours/glitch/styles/components.scss        | 4 ++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/javascript/flavours/glitch/features/ui/components/columns_area.jsx b/app/javascript/flavours/glitch/features/ui/components/columns_area.jsx
index f3e1bfe4927f1d..9166499c5a08b9 100644
--- a/app/javascript/flavours/glitch/features/ui/components/columns_area.jsx
+++ b/app/javascript/flavours/glitch/features/ui/components/columns_area.jsx
@@ -58,6 +58,7 @@ const TabsBarPortal = () => {
 export default class ColumnsArea extends ImmutablePureComponent {
   static propTypes = {
     columns: ImmutablePropTypes.list.isRequired,
+    isModalOpen: PropTypes.bool.isRequired,
     singleColumn: PropTypes.bool,
     children: PropTypes.node,
     openSettings: PropTypes.func,
@@ -145,7 +146,7 @@ export default class ColumnsArea extends ImmutablePureComponent {
   };
 
   render () {
-    const { columns, children, singleColumn, openSettings } = this.props;
+    const { columns, children, singleColumn, isModalOpen, openSettings } = this.props;
     const { renderComposePanel } = this.state;
 
     if (singleColumn) {
@@ -172,7 +173,7 @@ export default class ColumnsArea extends ImmutablePureComponent {
     }
 
     return (
-      <div className='columns-area' ref={this.setRef}>
+      <div className={`columns-area ${ isModalOpen ? 'unscrollable' : '' }`} ref={this.setRef}>
         {columns.map(column => {
           const params = column.get('params', null) === null ? null : column.get('params').toJS();
           const other  = params && params.other ? params.other : {};
diff --git a/app/javascript/flavours/glitch/features/ui/containers/columns_area_container.js b/app/javascript/flavours/glitch/features/ui/containers/columns_area_container.js
index a69abfb610c672..b11bcade5c8d95 100644
--- a/app/javascript/flavours/glitch/features/ui/containers/columns_area_container.js
+++ b/app/javascript/flavours/glitch/features/ui/containers/columns_area_container.js
@@ -6,6 +6,7 @@ import ColumnsArea from '../components/columns_area';
 
 const mapStateToProps = state => ({
   columns: state.getIn(['settings', 'columns']),
+  isModalOpen: !!state.get('modal').modalType,
 });
 
 const mapDispatchToProps = dispatch => ({
diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index efae501756347e..f08a6017f31316 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -2626,6 +2626,10 @@ a.account__display-name {
   overflow-x: auto;
   position: relative;
 
+  &.unscrollable {
+    overflow-x: hidden;
+  }
+
   &__panels {
     display: flex;
     justify-content: center;

From 98cf4b7ba0fc6cfcd282d8ea9a39f06366225723 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 8 Mar 2024 12:42:03 +0100
Subject: [PATCH 0377/2191] Reduce code differences with upstream

---
 .../flavours/glitch/actions/accounts.js       |   7 --
 .../flavours/glitch/actions/statuses.js       |   4 +-
 .../glitch/components/attachment_list.jsx     |   1 -
 .../glitch/components/column_header.jsx       |   1 -
 .../components/edited_timestamp/index.jsx     |   1 -
 .../components/regeneration_indicator.jsx     |   2 +-
 .../flavours/glitch/features/about/index.jsx  |   1 -
 .../account_gallery/components/media_item.jsx |   1 -
 .../flavours/glitch/features/audio/index.jsx  |   1 -
 .../features/community_timeline/index.jsx     |   1 -
 .../glitch/features/directory/index.jsx       |   1 -
 .../glitch/features/explore/index.jsx         |   1 -
 .../glitch/features/explore/results.jsx       |   1 -
 .../glitch/features/filters/select_filter.jsx |   2 +-
 .../glitch/features/firehose/index.jsx        |   1 -
 .../glitch/features/home_timeline/index.jsx   |   1 -
 .../features/keyboard_shortcuts/index.jsx     |   1 -
 .../features/list_adder/components/list.jsx   |   1 -
 .../list_editor/components/search.jsx         |   1 -
 .../glitch/features/list_timeline/index.jsx   |   2 -
 .../flavours/glitch/features/lists/index.jsx  |   1 -
 .../components/clear_column_button.jsx        |   1 -
 .../notifications/components/filter_bar.jsx   |   1 -
 .../notifications_permission_banner.jsx       |   1 -
 .../features/onboarding/components/step.jsx   |   1 -
 .../glitch/features/onboarding/index.jsx      |   1 -
 .../picture_in_picture/components/footer.jsx  |   1 -
 .../picture_in_picture/components/header.jsx  |   1 -
 .../glitch/features/pinned_statuses/index.jsx |   1 -
 .../glitch/features/public_timeline/index.jsx |   1 -
 .../glitch/features/reblogs/index.jsx         |   1 -
 .../features/report/components/option.jsx     |   1 -
 .../report/components/status_check_box.jsx    |   1 +
 .../features/status/components/action_bar.jsx |   4 +-
 .../subscribed_languages_modal/index.jsx      |   1 -
 .../features/ui/components/embed_modal.jsx    |   1 -
 .../features/ui/components/filter_modal.jsx   |   1 -
 .../components/notifications_counter_icon.js  |   1 +
 .../features/ui/util/async-components.js      | 116 +++++++++---------
 .../glitch/images/elephant_ui_working.svg     |   1 -
 .../flavours/glitch/initial_state.js          |  17 ++-
 .../flavours/glitch/reducers/settings.js      |   3 -
 42 files changed, 74 insertions(+), 116 deletions(-)
 delete mode 100644 app/javascript/flavours/glitch/images/elephant_ui_working.svg

diff --git a/app/javascript/flavours/glitch/actions/accounts.js b/app/javascript/flavours/glitch/actions/accounts.js
index af10af9fe9689b..bb26035e976a8e 100644
--- a/app/javascript/flavours/glitch/actions/accounts.js
+++ b/app/javascript/flavours/glitch/actions/accounts.js
@@ -66,11 +66,9 @@ export const FOLLOW_REQUESTS_EXPAND_SUCCESS = 'FOLLOW_REQUESTS_EXPAND_SUCCESS';
 export const FOLLOW_REQUESTS_EXPAND_FAIL    = 'FOLLOW_REQUESTS_EXPAND_FAIL';
 
 export const FOLLOW_REQUEST_AUTHORIZE_REQUEST = 'FOLLOW_REQUEST_AUTHORIZE_REQUEST';
-export const FOLLOW_REQUEST_AUTHORIZE_SUCCESS = 'FOLLOW_REQUEST_AUTHORIZE_SUCCESS';
 export const FOLLOW_REQUEST_AUTHORIZE_FAIL    = 'FOLLOW_REQUEST_AUTHORIZE_FAIL';
 
 export const FOLLOW_REQUEST_REJECT_REQUEST = 'FOLLOW_REQUEST_REJECT_REQUEST';
-export const FOLLOW_REQUEST_REJECT_SUCCESS = 'FOLLOW_REQUEST_REJECT_SUCCESS';
 export const FOLLOW_REQUEST_REJECT_FAIL    = 'FOLLOW_REQUEST_REJECT_FAIL';
 
 export const PINNED_ACCOUNTS_FETCH_REQUEST = 'PINNED_ACCOUNTS_FETCH_REQUEST';
@@ -93,11 +91,6 @@ export * from './accounts_typed';
 export function fetchAccount(id) {
   return (dispatch, getState) => {
     dispatch(fetchRelationships([id]));
-
-    if (getState().getIn(['accounts', id], null) !== null) {
-      return;
-    }
-
     dispatch(fetchAccountRequest(id));
 
     api(getState).get(`/api/v1/accounts/${id}`).then(response => {
diff --git a/app/javascript/flavours/glitch/actions/statuses.js b/app/javascript/flavours/glitch/actions/statuses.js
index 5bdd31c3438cbe..332057ee67e3e6 100644
--- a/app/javascript/flavours/glitch/actions/statuses.js
+++ b/app/javascript/flavours/glitch/actions/statuses.js
@@ -1,7 +1,7 @@
 import api from '../api';
 
 import { ensureComposeIsVisible, setComposeToStatus } from './compose';
-import { importFetchedStatus, importFetchedStatuses } from './importer';
+import { importFetchedStatus, importFetchedStatuses, importFetchedAccount } from './importer';
 import { deleteFromTimelines } from './timelines';
 
 export const STATUS_FETCH_REQUEST = 'STATUS_FETCH_REQUEST';
@@ -138,10 +138,10 @@ export function deleteStatus(id, routerHistory, withRedraft = false) {
     api(getState).delete(`/api/v1/statuses/${id}`).then(response => {
       dispatch(deleteStatusSuccess(id));
       dispatch(deleteFromTimelines(id));
+      dispatch(importFetchedAccount(response.data.account));
 
       if (withRedraft) {
         dispatch(redraft(status, response.data.text, response.data.content_type));
-
         ensureComposeIsVisible(getState, routerHistory);
       }
     }).catch(error => {
diff --git a/app/javascript/flavours/glitch/components/attachment_list.jsx b/app/javascript/flavours/glitch/components/attachment_list.jsx
index 44b8bf78eebf1e..60800f41ec5460 100644
--- a/app/javascript/flavours/glitch/components/attachment_list.jsx
+++ b/app/javascript/flavours/glitch/components/attachment_list.jsx
@@ -10,7 +10,6 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
 import LinkIcon from '@/material-icons/400-24px/link.svg?react';
 import { Icon }  from 'flavours/glitch/components/icon';
 
-
 const filename = url => url.split('/').pop().split('#')[0].split('?')[0];
 
 export default class AttachmentList extends ImmutablePureComponent {
diff --git a/app/javascript/flavours/glitch/components/column_header.jsx b/app/javascript/flavours/glitch/components/column_header.jsx
index ec99698d0cf6ec..262166d2d1a0ce 100644
--- a/app/javascript/flavours/glitch/components/column_header.jsx
+++ b/app/javascript/flavours/glitch/components/column_header.jsx
@@ -16,7 +16,6 @@ import { Icon }  from 'flavours/glitch/components/icon';
 import { ButtonInTabsBar, useColumnsContext } from 'flavours/glitch/features/ui/util/columns_context';
 import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router';
 
-
 import { useAppHistory } from './router';
 
 const messages = defineMessages({
diff --git a/app/javascript/flavours/glitch/components/edited_timestamp/index.jsx b/app/javascript/flavours/glitch/components/edited_timestamp/index.jsx
index 2363f132f1f79b..5a16f6753086b4 100644
--- a/app/javascript/flavours/glitch/components/edited_timestamp/index.jsx
+++ b/app/javascript/flavours/glitch/components/edited_timestamp/index.jsx
@@ -5,7 +5,6 @@ import { FormattedMessage, injectIntl } from 'react-intl';
 
 import { connect } from 'react-redux';
 
-
 import ArrowDropDownIcon from '@/material-icons/400-24px/arrow_drop_down.svg?react';
 import { openModal } from 'flavours/glitch/actions/modal';
 import { Icon }  from 'flavours/glitch/components/icon';
diff --git a/app/javascript/flavours/glitch/components/regeneration_indicator.jsx b/app/javascript/flavours/glitch/components/regeneration_indicator.jsx
index 78844f389ddf17..d42a7d7c72b204 100644
--- a/app/javascript/flavours/glitch/components/regeneration_indicator.jsx
+++ b/app/javascript/flavours/glitch/components/regeneration_indicator.jsx
@@ -1,6 +1,6 @@
 import { FormattedMessage } from 'react-intl';
 
-import illustration from 'flavours/glitch/images/elephant_ui_working.svg';
+import illustration from '@/images/elephant_ui_working.svg';
 
 const RegenerationIndicator = () => (
   <div className='regeneration-indicator'>
diff --git a/app/javascript/flavours/glitch/features/about/index.jsx b/app/javascript/flavours/glitch/features/about/index.jsx
index e5544c8a74f195..623f89ed3d8c3e 100644
--- a/app/javascript/flavours/glitch/features/about/index.jsx
+++ b/app/javascript/flavours/glitch/features/about/index.jsx
@@ -10,7 +10,6 @@ import { List as ImmutableList } from 'immutable';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { connect } from 'react-redux';
 
-
 import ChevronRightIcon from '@/material-icons/400-24px/chevron_right.svg?react';
 import ExpandMoreIcon from '@/material-icons/400-24px/expand_more.svg?react';
 import { fetchServer, fetchExtendedDescription, fetchDomainBlocks  } from 'flavours/glitch/actions/server';
diff --git a/app/javascript/flavours/glitch/features/account_gallery/components/media_item.jsx b/app/javascript/flavours/glitch/features/account_gallery/components/media_item.jsx
index ebd156a4f9b996..c709e58db1a05b 100644
--- a/app/javascript/flavours/glitch/features/account_gallery/components/media_item.jsx
+++ b/app/javascript/flavours/glitch/features/account_gallery/components/media_item.jsx
@@ -12,7 +12,6 @@ import { Blurhash } from 'flavours/glitch/components/blurhash';
 import { Icon }  from 'flavours/glitch/components/icon';
 import { autoPlayGif, displayMedia, useBlurhash } from 'flavours/glitch/initial_state';
 
-
 export default class MediaItem extends ImmutablePureComponent {
 
   static propTypes = {
diff --git a/app/javascript/flavours/glitch/features/audio/index.jsx b/app/javascript/flavours/glitch/features/audio/index.jsx
index dc9d76222d0f06..6b0c2f6fea4b17 100644
--- a/app/javascript/flavours/glitch/features/audio/index.jsx
+++ b/app/javascript/flavours/glitch/features/audio/index.jsx
@@ -18,7 +18,6 @@ import VolumeUpIcon from '@/material-icons/400-24px/volume_up-fill.svg?react';
 import { Icon }  from 'flavours/glitch/components/icon';
 import { formatTime, getPointerPosition, fileNameFromURL } from 'flavours/glitch/features/video';
 
-
 import { Blurhash } from '../../components/blurhash';
 import { displayMedia, useBlurhash } from '../../initial_state';
 
diff --git a/app/javascript/flavours/glitch/features/community_timeline/index.jsx b/app/javascript/flavours/glitch/features/community_timeline/index.jsx
index e2b982aaf86e60..7be2196511a592 100644
--- a/app/javascript/flavours/glitch/features/community_timeline/index.jsx
+++ b/app/javascript/flavours/glitch/features/community_timeline/index.jsx
@@ -7,7 +7,6 @@ import { Helmet } from 'react-helmet';
 
 import { connect } from 'react-redux';
 
-
 import PeopleIcon from '@/material-icons/400-24px/group.svg?react';
 import { DismissableBanner } from 'flavours/glitch/components/dismissable_banner';
 import { domain } from 'flavours/glitch/initial_state';
diff --git a/app/javascript/flavours/glitch/features/directory/index.jsx b/app/javascript/flavours/glitch/features/directory/index.jsx
index 0d8742b2559082..293b89272aa10a 100644
--- a/app/javascript/flavours/glitch/features/directory/index.jsx
+++ b/app/javascript/flavours/glitch/features/directory/index.jsx
@@ -9,7 +9,6 @@ import { List as ImmutableList } from 'immutable';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { connect } from 'react-redux';
 
-
 import PeopleIcon from '@/material-icons/400-24px/group.svg?react';
 import { addColumn, removeColumn, moveColumn, changeColumnParams } from 'flavours/glitch/actions/columns';
 import { fetchDirectory, expandDirectory } from 'flavours/glitch/actions/directory';
diff --git a/app/javascript/flavours/glitch/features/explore/index.jsx b/app/javascript/flavours/glitch/features/explore/index.jsx
index dca2e59c5c3022..cca9cada47978e 100644
--- a/app/javascript/flavours/glitch/features/explore/index.jsx
+++ b/app/javascript/flavours/glitch/features/explore/index.jsx
@@ -8,7 +8,6 @@ import { NavLink, Switch, Route } from 'react-router-dom';
 
 import { connect } from 'react-redux';
 
-
 import ExploreIcon from '@/material-icons/400-24px/explore.svg?react';
 import SearchIcon from '@/material-icons/400-24px/search.svg?react';
 import Column from 'flavours/glitch/components/column';
diff --git a/app/javascript/flavours/glitch/features/explore/results.jsx b/app/javascript/flavours/glitch/features/explore/results.jsx
index 53285988c39392..e0162f713a958f 100644
--- a/app/javascript/flavours/glitch/features/explore/results.jsx
+++ b/app/javascript/flavours/glitch/features/explore/results.jsx
@@ -9,7 +9,6 @@ import { List as ImmutableList } from 'immutable';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { connect } from 'react-redux';
 
-
 import FindInPageIcon from '@/material-icons/400-24px/find_in_page.svg?react';
 import PeopleIcon from '@/material-icons/400-24px/group.svg?react';
 import TagIcon from '@/material-icons/400-24px/tag.svg?react';
diff --git a/app/javascript/flavours/glitch/features/filters/select_filter.jsx b/app/javascript/flavours/glitch/features/filters/select_filter.jsx
index f409cc2d70d77f..3a46b8bd488d83 100644
--- a/app/javascript/flavours/glitch/features/filters/select_filter.jsx
+++ b/app/javascript/flavours/glitch/features/filters/select_filter.jsx
@@ -180,7 +180,7 @@ class SelectFilter extends PureComponent {
 
         <div className='emoji-mart-search'>
           <input type='search' value={searchValue} onChange={this.handleSearchChange} onKeyDown={this.handleSearchKeyDown} placeholder={intl.formatMessage(messages.search)} autoFocus />
-          <button className='emoji-mart-search-icon' disabled={!isSearching} aria-label={intl.formatMessage(messages.clear)} onClick={this.handleClear}>{!isSearching ? loupeIcon : deleteIcon}</button>
+          <button type='button' className='emoji-mart-search-icon' disabled={!isSearching} aria-label={intl.formatMessage(messages.clear)} onClick={this.handleClear}>{!isSearching ? loupeIcon : deleteIcon}</button>
         </div>
 
         <div className='language-dropdown__dropdown__results emoji-mart-scroll' role='listbox' ref={this.setListRef}>
diff --git a/app/javascript/flavours/glitch/features/firehose/index.jsx b/app/javascript/flavours/glitch/features/firehose/index.jsx
index 29219974a933de..678bc3525a27ce 100644
--- a/app/javascript/flavours/glitch/features/firehose/index.jsx
+++ b/app/javascript/flavours/glitch/features/firehose/index.jsx
@@ -6,7 +6,6 @@ import { useIntl, defineMessages, FormattedMessage } from 'react-intl';
 import { Helmet } from 'react-helmet';
 import { NavLink } from 'react-router-dom';
 
-
 import PublicIcon from '@/material-icons/400-24px/public.svg?react';
 import { addColumn } from 'flavours/glitch/actions/columns';
 import { changeSetting } from 'flavours/glitch/actions/settings';
diff --git a/app/javascript/flavours/glitch/features/home_timeline/index.jsx b/app/javascript/flavours/glitch/features/home_timeline/index.jsx
index f383a6e48cb08b..a2683f587f557f 100644
--- a/app/javascript/flavours/glitch/features/home_timeline/index.jsx
+++ b/app/javascript/flavours/glitch/features/home_timeline/index.jsx
@@ -8,7 +8,6 @@ import { Helmet } from 'react-helmet';
 
 import { connect } from 'react-redux';
 
-
 import CampaignIcon from '@/material-icons/400-24px/campaign.svg?react';
 import HomeIcon from '@/material-icons/400-24px/home-fill.svg?react';
 import { fetchAnnouncements, toggleShowAnnouncements } from 'flavours/glitch/actions/announcements';
diff --git a/app/javascript/flavours/glitch/features/keyboard_shortcuts/index.jsx b/app/javascript/flavours/glitch/features/keyboard_shortcuts/index.jsx
index 98f65d9b507800..858d760c24dbd1 100644
--- a/app/javascript/flavours/glitch/features/keyboard_shortcuts/index.jsx
+++ b/app/javascript/flavours/glitch/features/keyboard_shortcuts/index.jsx
@@ -7,7 +7,6 @@ import { Helmet } from 'react-helmet';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-
 import InfoIcon from '@/material-icons/400-24px/info.svg?react';
 import Column from 'flavours/glitch/components/column';
 import ColumnHeader from 'flavours/glitch/components/column_header';
diff --git a/app/javascript/flavours/glitch/features/list_adder/components/list.jsx b/app/javascript/flavours/glitch/features/list_adder/components/list.jsx
index adbb16fcd61920..e91c8e35bdf11f 100644
--- a/app/javascript/flavours/glitch/features/list_adder/components/list.jsx
+++ b/app/javascript/flavours/glitch/features/list_adder/components/list.jsx
@@ -11,7 +11,6 @@ import CloseIcon from '@/material-icons/400-24px/close.svg?react';
 import ListAltIcon from '@/material-icons/400-24px/list_alt.svg?react';
 import { Icon }  from 'flavours/glitch/components/icon';
 
-
 import { removeFromListAdder, addToListAdder } from '../../../actions/lists';
 import { IconButton }  from '../../../components/icon_button';
 
diff --git a/app/javascript/flavours/glitch/features/list_editor/components/search.jsx b/app/javascript/flavours/glitch/features/list_editor/components/search.jsx
index 6e9cd448355a12..23e4b427dcfdf7 100644
--- a/app/javascript/flavours/glitch/features/list_editor/components/search.jsx
+++ b/app/javascript/flavours/glitch/features/list_editor/components/search.jsx
@@ -11,7 +11,6 @@ import CancelIcon from '@/material-icons/400-24px/cancel.svg?react';
 import SearchIcon from '@/material-icons/400-24px/search.svg?react';
 import { Icon }  from 'flavours/glitch/components/icon';
 
-
 import { fetchListSuggestions, clearListSuggestions, changeListSuggestions } from '../../../actions/lists';
 
 const messages = defineMessages({
diff --git a/app/javascript/flavours/glitch/features/list_timeline/index.jsx b/app/javascript/flavours/glitch/features/list_timeline/index.jsx
index ae9f75318f2309..abc664e0a123aa 100644
--- a/app/javascript/flavours/glitch/features/list_timeline/index.jsx
+++ b/app/javascript/flavours/glitch/features/list_timeline/index.jsx
@@ -222,8 +222,6 @@ class ListTimeline extends PureComponent {
               </div>
             </div>
           )}
-
-          <hr />
         </ColumnHeader>
 
         <StatusListContainer
diff --git a/app/javascript/flavours/glitch/features/lists/index.jsx b/app/javascript/flavours/glitch/features/lists/index.jsx
index 9c24d82f0376da..254447f932b2fe 100644
--- a/app/javascript/flavours/glitch/features/lists/index.jsx
+++ b/app/javascript/flavours/glitch/features/lists/index.jsx
@@ -9,7 +9,6 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-
 import ListAltIcon from '@/material-icons/400-24px/list_alt.svg?react';
 import { fetchLists } from 'flavours/glitch/actions/lists';
 import { LoadingIndicator } from 'flavours/glitch/components/loading_indicator';
diff --git a/app/javascript/flavours/glitch/features/notifications/components/clear_column_button.jsx b/app/javascript/flavours/glitch/features/notifications/components/clear_column_button.jsx
index 6e29709b5953bd..ff4db67886c75e 100644
--- a/app/javascript/flavours/glitch/features/notifications/components/clear_column_button.jsx
+++ b/app/javascript/flavours/glitch/features/notifications/components/clear_column_button.jsx
@@ -6,7 +6,6 @@ import { FormattedMessage } from 'react-intl';
 import DeleteForeverIcon from '@/material-icons/400-24px/delete_forever.svg?react';
 import { Icon }  from 'flavours/glitch/components/icon';
 
-
 export default class ClearColumnButton extends PureComponent {
 
   static propTypes = {
diff --git a/app/javascript/flavours/glitch/features/notifications/components/filter_bar.jsx b/app/javascript/flavours/glitch/features/notifications/components/filter_bar.jsx
index 7d4a28a2ef5c49..7fabe78a949986 100644
--- a/app/javascript/flavours/glitch/features/notifications/components/filter_bar.jsx
+++ b/app/javascript/flavours/glitch/features/notifications/components/filter_bar.jsx
@@ -11,7 +11,6 @@ import ReplyAllIcon from '@/material-icons/400-24px/reply_all.svg?react';
 import StarIcon from '@/material-icons/400-24px/star.svg?react';
 import { Icon }  from 'flavours/glitch/components/icon';
 
-
 const tooltips = defineMessages({
   mentions: { id: 'notifications.filter.mentions', defaultMessage: 'Mentions' },
   favourites: { id: 'notifications.filter.favourites', defaultMessage: 'Favorites' },
diff --git a/app/javascript/flavours/glitch/features/notifications/components/notifications_permission_banner.jsx b/app/javascript/flavours/glitch/features/notifications/components/notifications_permission_banner.jsx
index 82c08ea1751ae7..ba031332f96d8e 100644
--- a/app/javascript/flavours/glitch/features/notifications/components/notifications_permission_banner.jsx
+++ b/app/javascript/flavours/glitch/features/notifications/components/notifications_permission_banner.jsx
@@ -5,7 +5,6 @@ import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
 
 import { connect } from 'react-redux';
 
-
 import CloseIcon from '@/material-icons/400-24px/close.svg?react';
 import TuneIcon from '@/material-icons/400-24px/tune.svg?react';
 import { requestBrowserPermission } from 'flavours/glitch/actions/notifications';
diff --git a/app/javascript/flavours/glitch/features/onboarding/components/step.jsx b/app/javascript/flavours/glitch/features/onboarding/components/step.jsx
index 4dcd3c9ce533ef..32648982a3ed3b 100644
--- a/app/javascript/flavours/glitch/features/onboarding/components/step.jsx
+++ b/app/javascript/flavours/glitch/features/onboarding/components/step.jsx
@@ -6,7 +6,6 @@ import ArrowRightAltIcon from '@/material-icons/400-24px/arrow_right_alt.svg?rea
 import CheckIcon from '@/material-icons/400-24px/done.svg?react';
 import { Icon } from 'flavours/glitch/components/icon';
 
-
 export const Step = ({ label, description, icon, iconComponent, completed, onClick, href, to }) => {
   const content = (
     <>
diff --git a/app/javascript/flavours/glitch/features/onboarding/index.jsx b/app/javascript/flavours/glitch/features/onboarding/index.jsx
index fb9df29aeb7063..187ee3b7703610 100644
--- a/app/javascript/flavours/glitch/features/onboarding/index.jsx
+++ b/app/javascript/flavours/glitch/features/onboarding/index.jsx
@@ -8,7 +8,6 @@ import { Link, Switch, Route, useHistory } from 'react-router-dom';
 import { useDispatch } from 'react-redux';
 
 
-
 import illustration from '@/images/elephant_ui_conversation.svg';
 import AccountCircleIcon from '@/material-icons/400-24px/account_circle.svg?react';
 import ArrowRightAltIcon from '@/material-icons/400-24px/arrow_right_alt.svg?react';
diff --git a/app/javascript/flavours/glitch/features/picture_in_picture/components/footer.jsx b/app/javascript/flavours/glitch/features/picture_in_picture/components/footer.jsx
index 83e53d92630e6e..3bf4f3b8577887 100644
--- a/app/javascript/flavours/glitch/features/picture_in_picture/components/footer.jsx
+++ b/app/javascript/flavours/glitch/features/picture_in_picture/components/footer.jsx
@@ -9,7 +9,6 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-
 import OpenInNewIcon from '@/material-icons/400-24px/open_in_new.svg?react';
 import RepeatIcon from '@/material-icons/400-24px/repeat.svg?react';
 import ReplyIcon from '@/material-icons/400-24px/reply.svg?react';
diff --git a/app/javascript/flavours/glitch/features/picture_in_picture/components/header.jsx b/app/javascript/flavours/glitch/features/picture_in_picture/components/header.jsx
index dd90cd3522a3f2..5996ab240d3bc7 100644
--- a/app/javascript/flavours/glitch/features/picture_in_picture/components/header.jsx
+++ b/app/javascript/flavours/glitch/features/picture_in_picture/components/header.jsx
@@ -8,7 +8,6 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-
 import CloseIcon from '@/material-icons/400-24px/close.svg?react';
 import { Avatar } from 'flavours/glitch/components/avatar';
 import { DisplayName } from 'flavours/glitch/components/display_name';
diff --git a/app/javascript/flavours/glitch/features/pinned_statuses/index.jsx b/app/javascript/flavours/glitch/features/pinned_statuses/index.jsx
index 94d5f6cb4c7366..7b4e36cdafea2e 100644
--- a/app/javascript/flavours/glitch/features/pinned_statuses/index.jsx
+++ b/app/javascript/flavours/glitch/features/pinned_statuses/index.jsx
@@ -11,7 +11,6 @@ import { connect } from 'react-redux';
 import PushPinIcon from '@/material-icons/400-24px/push_pin.svg?react';
 import { getStatusList } from 'flavours/glitch/selectors';
 
-
 import { fetchPinnedStatuses } from '../../actions/pin_statuses';
 import StatusList from '../../components/status_list';
 import Column from '../ui/components/column';
diff --git a/app/javascript/flavours/glitch/features/public_timeline/index.jsx b/app/javascript/flavours/glitch/features/public_timeline/index.jsx
index 0062a9f7199149..8b9503928bb298 100644
--- a/app/javascript/flavours/glitch/features/public_timeline/index.jsx
+++ b/app/javascript/flavours/glitch/features/public_timeline/index.jsx
@@ -7,7 +7,6 @@ import { Helmet } from 'react-helmet';
 
 import { connect } from 'react-redux';
 
-
 import PublicIcon from '@/material-icons/400-24px/public.svg?react';
 import { DismissableBanner } from 'flavours/glitch/components/dismissable_banner';
 import { domain } from 'flavours/glitch/initial_state';
diff --git a/app/javascript/flavours/glitch/features/reblogs/index.jsx b/app/javascript/flavours/glitch/features/reblogs/index.jsx
index 52e9a35833fc46..3c02293e581151 100644
--- a/app/javascript/flavours/glitch/features/reblogs/index.jsx
+++ b/app/javascript/flavours/glitch/features/reblogs/index.jsx
@@ -14,7 +14,6 @@ import RefreshIcon from '@/material-icons/400-24px/refresh.svg?react';
 import RepeatIcon from '@/material-icons/400-24px/repeat.svg?react';
 import { Icon }  from 'flavours/glitch/components/icon';
 
-
 import { fetchReblogs, expandReblogs } from '../../actions/interactions';
 import ColumnHeader from '../../components/column_header';
 import { LoadingIndicator } from '../../components/loading_indicator';
diff --git a/app/javascript/flavours/glitch/features/report/components/option.jsx b/app/javascript/flavours/glitch/features/report/components/option.jsx
index 3b40de8cbae2b3..8edeed28ade11c 100644
--- a/app/javascript/flavours/glitch/features/report/components/option.jsx
+++ b/app/javascript/flavours/glitch/features/report/components/option.jsx
@@ -6,7 +6,6 @@ import classNames from 'classnames';
 import CheckIcon from '@/material-icons/400-24px/done.svg?react';
 import { Icon }  from 'flavours/glitch/components/icon';
 
-
 export default class Option extends PureComponent {
 
   static propTypes = {
diff --git a/app/javascript/flavours/glitch/features/report/components/status_check_box.jsx b/app/javascript/flavours/glitch/features/report/components/status_check_box.jsx
index 0ae20b8f48587d..06ed6ac33c2187 100644
--- a/app/javascript/flavours/glitch/features/report/components/status_check_box.jsx
+++ b/app/javascript/flavours/glitch/features/report/components/status_check_box.jsx
@@ -19,6 +19,7 @@ class StatusCheckBox extends PureComponent {
     status: ImmutablePropTypes.map.isRequired,
     checked: PropTypes.bool,
     onToggle: PropTypes.func.isRequired,
+    intl: PropTypes.object.isRequired,
   };
 
   handleStatusesToggle = (value, checked) => {
diff --git a/app/javascript/flavours/glitch/features/status/components/action_bar.jsx b/app/javascript/flavours/glitch/features/status/components/action_bar.jsx
index 1d8707ccbf0361..ab0009120080f2 100644
--- a/app/javascript/flavours/glitch/features/status/components/action_bar.jsx
+++ b/app/javascript/flavours/glitch/features/status/components/action_bar.jsx
@@ -17,8 +17,8 @@ import ReplyAllIcon from '@/material-icons/400-24px/reply_all.svg?react';
 import StarIcon from '@/material-icons/400-24px/star-fill.svg?react';
 import StarBorderIcon from '@/material-icons/400-24px/star.svg?react';
 import RepeatActiveIcon from '@/svg-icons/repeat_active.svg?react';
-import RepeatDisabledIcon from '@/svg-icons/repeat_disabled.svg';
-import RepeatPrivateIcon from '@/svg-icons/repeat_private.svg';
+import RepeatDisabledIcon from '@/svg-icons/repeat_disabled.svg?react';
+import RepeatPrivateIcon from '@/svg-icons/repeat_private.svg?react';
 import RepeatPrivateActiveIcon from '@/svg-icons/repeat_private_active.svg?react';
 import { PERMISSION_MANAGE_USERS, PERMISSION_MANAGE_FEDERATION } from 'flavours/glitch/permissions';
 import { accountAdminLink, statusAdminLink } from 'flavours/glitch/utils/backend_links';
diff --git a/app/javascript/flavours/glitch/features/subscribed_languages_modal/index.jsx b/app/javascript/flavours/glitch/features/subscribed_languages_modal/index.jsx
index 1edfe700fe3fe4..c02a6ed037479a 100644
--- a/app/javascript/flavours/glitch/features/subscribed_languages_modal/index.jsx
+++ b/app/javascript/flavours/glitch/features/subscribed_languages_modal/index.jsx
@@ -8,7 +8,6 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-
 import CloseIcon from '@/material-icons/400-24px/close.svg?react';
 import { followAccount } from 'flavours/glitch/actions/accounts';
 import { Button } from 'flavours/glitch/components/button';
diff --git a/app/javascript/flavours/glitch/features/ui/components/embed_modal.jsx b/app/javascript/flavours/glitch/features/ui/components/embed_modal.jsx
index edd2fb8940400b..87316b7f23f1e4 100644
--- a/app/javascript/flavours/glitch/features/ui/components/embed_modal.jsx
+++ b/app/javascript/flavours/glitch/features/ui/components/embed_modal.jsx
@@ -4,7 +4,6 @@ import { defineMessages, FormattedMessage, injectIntl } from 'react-intl';
 
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-
 import CloseIcon from '@/material-icons/400-24px/close.svg?react';
 import api from 'flavours/glitch/api';
 import { IconButton } from 'flavours/glitch/components/icon_button';
diff --git a/app/javascript/flavours/glitch/features/ui/components/filter_modal.jsx b/app/javascript/flavours/glitch/features/ui/components/filter_modal.jsx
index 9ce5eec8742677..92f83d8d59480d 100644
--- a/app/javascript/flavours/glitch/features/ui/components/filter_modal.jsx
+++ b/app/javascript/flavours/glitch/features/ui/components/filter_modal.jsx
@@ -5,7 +5,6 @@ import { defineMessages, FormattedMessage, injectIntl } from 'react-intl';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-
 import CloseIcon from '@/material-icons/400-24px/close.svg?react';
 import { fetchFilters, createFilter, createFilterStatus } from 'flavours/glitch/actions/filters';
 import { fetchStatus } from 'flavours/glitch/actions/statuses';
diff --git a/app/javascript/flavours/glitch/features/ui/components/notifications_counter_icon.js b/app/javascript/flavours/glitch/features/ui/components/notifications_counter_icon.js
index 8e38acfe80f100..0816e9660f1c15 100644
--- a/app/javascript/flavours/glitch/features/ui/components/notifications_counter_icon.js
+++ b/app/javascript/flavours/glitch/features/ui/components/notifications_counter_icon.js
@@ -3,6 +3,7 @@ import { connect } from 'react-redux';
 import NotificationsIcon from '@/material-icons/400-24px/notifications-fill.svg?react';
 import { IconWithBadge } from 'flavours/glitch/components/icon_with_badge';
 
+
 const mapStateToProps = state => ({
   count: state.getIn(['local_settings', 'notifications', 'tab_badge']) ? state.getIn(['notifications', 'unread']) : 0,
   id: 'bell',
diff --git a/app/javascript/flavours/glitch/features/ui/util/async-components.js b/app/javascript/flavours/glitch/features/ui/util/async-components.js
index 762df7ecf4140a..c17bb206e32205 100644
--- a/app/javascript/flavours/glitch/features/ui/util/async-components.js
+++ b/app/javascript/flavours/glitch/features/ui/util/async-components.js
@@ -1,25 +1,25 @@
 export function EmojiPicker () {
-  return import(/* webpackChunkName: "flavours/glitch/async/emoji_picker" */'flavours/glitch/features/emoji/emoji_picker');
+  return import(/* webpackChunkName: "flavours/glitch/async/emoji_picker" */'../../emoji/emoji_picker');
 }
 
 export function Compose () {
-  return import(/* webpackChunkName: "flavours/glitch/async/compose" */'flavours/glitch/features/compose');
+  return import(/* webpackChunkName: "flavours/glitch/async/compose" */'../../compose');
 }
 
 export function Notifications () {
-  return import(/* webpackChunkName: "flavours/glitch/async/notifications" */'flavours/glitch/features/notifications');
+  return import(/* webpackChunkName: "flavours/glitch/async/notifications" */'../../notifications');
 }
 
 export function HomeTimeline () {
-  return import(/* webpackChunkName: "flavours/glitch/async/home_timeline" */'flavours/glitch/features/home_timeline');
+  return import(/* webpackChunkName: "flavours/glitch/async/home_timeline" */'../../home_timeline');
 }
 
 export function PublicTimeline () {
-  return import(/* webpackChunkName: "flavours/glitch/async/public_timeline" */'flavours/glitch/features/public_timeline');
+  return import(/* webpackChunkName: "flavours/glitch/async/public_timeline" */'../../public_timeline');
 }
 
 export function CommunityTimeline () {
-  return import(/* webpackChunkName: "flavours/glitch/async/community_timeline" */'flavours/glitch/features/community_timeline');
+  return import(/* webpackChunkName: "flavours/glitch/async/community_timeline" */'../../community_timeline');
 }
 
 export function Firehose () {
@@ -27,177 +27,177 @@ export function Firehose () {
 }
 
 export function HashtagTimeline () {
-  return import(/* webpackChunkName: "flavours/glitch/async/hashtag_timeline" */'flavours/glitch/features/hashtag_timeline');
+  return import(/* webpackChunkName: "flavours/glitch/async/hashtag_timeline" */'../../hashtag_timeline');
 }
 
 export function ListTimeline () {
-  return import(/* webpackChunkName: "flavours/glitch/async/list_timeline" */'flavours/glitch/features/list_timeline');
+  return import(/* webpackChunkName: "flavours/glitch/async/list_timeline" */'../../list_timeline');
 }
 
 export function Lists () {
-  return import(/* webpackChunkName: "flavours/glitch/async/lists" */'flavours/glitch/features/lists');
-}
-
-export function ListEditor () {
-  return import(/* webpackChunkName: "flavours/glitch/async/list_editor" */'flavours/glitch/features/list_editor');
+  return import(/* webpackChunkName: "flavours/glitch/async/lists" */'../../lists');
 }
 
 export function PinnedAccountsEditor () {
-  return import(/* webpackChunkName: "flavours/glitch/async/pinned_accounts_editor" */'flavours/glitch/features/pinned_accounts_editor');
+  return import(/* webpackChunkName: "flavours/glitch/async/pinned_accounts_editor" */'../../pinned_accounts_editor');
 }
 
 export function DirectTimeline() {
-  return import(/* webpackChunkName: "flavours/glitch/async/direct_timeline" */'flavours/glitch/features/direct_timeline');
+  return import(/* webpackChunkName: "flavours/glitch/async/direct_timeline" */'../../direct_timeline');
 }
 
 export function Status () {
-  return import(/* webpackChunkName: "flavours/glitch/async/status" */'flavours/glitch/features/status');
+  return import(/* webpackChunkName: "flavours/glitch/async/status" */'../../status');
 }
 
 export function GettingStarted () {
-  return import(/* webpackChunkName: "flavours/glitch/async/getting_started" */'flavours/glitch/features/getting_started');
+  return import(/* webpackChunkName: "flavours/glitch/async/getting_started" */'../../getting_started');
+}
+
+export function GettingStartedMisc () {
+  return import(/* webpackChunkName: "flavours/glitch/async/getting_started_misc" */'../../getting_started_misc');
 }
 
 export function KeyboardShortcuts () {
-  return import(/* webpackChunkName: "flavours/glitch/async/keyboard_shortcuts" */'flavours/glitch/features/keyboard_shortcuts');
+  return import(/* webpackChunkName: "flavours/glitch/async/keyboard_shortcuts" */'../../keyboard_shortcuts');
 }
 
 export function PinnedStatuses () {
-  return import(/* webpackChunkName: "flavours/glitch/async/pinned_statuses" */'flavours/glitch/features/pinned_statuses');
+  return import(/* webpackChunkName: "flavours/glitch/async/pinned_statuses" */'../../pinned_statuses');
 }
 
 export function AccountTimeline () {
-  return import(/* webpackChunkName: "flavours/glitch/async/account_timeline" */'flavours/glitch/features/account_timeline');
+  return import(/* webpackChunkName: "flavours/glitch/async/account_timeline" */'../../account_timeline');
 }
 
 export function AccountGallery () {
-  return import(/* webpackChunkName: "flavours/glitch/async/account_gallery" */'flavours/glitch/features/account_gallery');
+  return import(/* webpackChunkName: "flavours/glitch/async/account_gallery" */'../../account_gallery');
 }
 
 export function Followers () {
-  return import(/* webpackChunkName: "flavours/glitch/async/followers" */'flavours/glitch/features/followers');
+  return import(/* webpackChunkName: "flavours/glitch/async/followers" */'../../followers');
 }
 
 export function Following () {
-  return import(/* webpackChunkName: "flavours/glitch/async/following" */'flavours/glitch/features/following');
+  return import(/* webpackChunkName: "flavours/glitch/async/following" */'../../following');
 }
 
 export function Reblogs () {
-  return import(/* webpackChunkName: "flavours/glitch/async/reblogs" */'flavours/glitch/features/reblogs');
+  return import(/* webpackChunkName: "flavours/glitch/async/reblogs" */'../../reblogs');
 }
 
 export function Favourites () {
-  return import(/* webpackChunkName: "flavours/glitch/async/favourites" */'flavours/glitch/features/favourites');
+  return import(/* webpackChunkName: "flavours/glitch/async/favourites" */'../../favourites');
 }
 
 export function FollowRequests () {
-  return import(/* webpackChunkName: "flavours/glitch/async/follow_requests" */'flavours/glitch/features/follow_requests');
+  return import(/* webpackChunkName: "flavours/glitch/async/follow_requests" */'../../follow_requests');
 }
 
 export function FavouritedStatuses () {
-  return import(/* webpackChunkName: "flavours/glitch/async/favourited_statuses" */'flavours/glitch/features/favourited_statuses');
+  return import(/* webpackChunkName: "flavours/glitch/async/favourited_statuses" */'../../favourited_statuses');
 }
 
 export function FollowedTags () {
-  return import(/* webpackChunkName: "flavours/glitch/async/followed_tags" */'flavours/glitch/features/followed_tags');
+  return import(/* webpackChunkName: "flavours/glitch/async/followed_tags" */'../../followed_tags');
 }
 
 export function BookmarkedStatuses () {
-  return import(/* webpackChunkName: "flavours/glitch/async/bookmarked_statuses" */'flavours/glitch/features/bookmarked_statuses');
+  return import(/* webpackChunkName: "flavours/glitch/async/bookmarked_statuses" */'../../bookmarked_statuses');
 }
 
 export function Blocks () {
-  return import(/* webpackChunkName: "flavours/glitch/async/blocks" */'flavours/glitch/features/blocks');
+  return import(/* webpackChunkName: "flavours/glitch/async/blocks" */'../../blocks');
 }
 
 export function DomainBlocks () {
-  return import(/* webpackChunkName: "flavours/glitch/async/domain_blocks" */'flavours/glitch/features/domain_blocks');
+  return import(/* webpackChunkName: "flavours/glitch/async/domain_blocks" */'../../domain_blocks');
 }
 
 export function Mutes () {
-  return import(/* webpackChunkName: "flavours/glitch/async/mutes" */'flavours/glitch/features/mutes');
+  return import(/* webpackChunkName: "flavours/glitch/async/mutes" */'../../mutes');
 }
 
 export function MuteModal () {
-  return import(/* webpackChunkName: "flavours/glitch/async/mute_modal" */'flavours/glitch/features/ui/components/mute_modal');
+  return import(/* webpackChunkName: "flavours/glitch/async/mute_modal" */'../components/mute_modal');
 }
 
 export function BlockModal () {
-  return import(/* webpackChunkName: "flavours/glitch/async/block_modal" */'flavours/glitch/features/ui/components/block_modal');
+  return import(/* webpackChunkName: "flavours/glitch/async/block_modal" */'../components/block_modal');
 }
 
 export function ReportModal () {
-  return import(/* webpackChunkName: "flavours/glitch/async/report_modal" */'flavours/glitch/features/ui/components/report_modal');
+  return import(/* webpackChunkName: "flavours/glitch/async/report_modal" */'../components/report_modal');
 }
 
 export function SettingsModal () {
-  return import(/* webpackChunkName: "flavours/glitch/async/settings_modal" */'flavours/glitch/features/local_settings');
+  return import(/* webpackChunkName: "flavours/glitch/async/settings_modal" */'../../local_settings');
 }
 
 export function MediaGallery () {
-  return import(/* webpackChunkName: "flavours/glitch/async/media_gallery" */'flavours/glitch/components/media_gallery');
+  return import(/* webpackChunkName: "flavours/glitch/async/media_gallery" */'../../../components/media_gallery');
 }
 
 export function Video () {
-  return import(/* webpackChunkName: "flavours/glitch/async/video" */'flavours/glitch/features/video');
-}
-
-export function Audio () {
-  return import(/* webpackChunkName: "features/glitch/async/audio" */'flavours/glitch/features/audio');
+  return import(/* webpackChunkName: "flavours/glitch/async/video" */'../../video');
 }
 
 export function EmbedModal () {
-  return import(/* webpackChunkName: "flavours/glitch/async/embed_modal" */'flavours/glitch/features/ui/components/embed_modal');
+  return import(/* webpackChunkName: "flavours/glitch/async/embed_modal" */'../components/embed_modal');
 }
 
-export function GettingStartedMisc () {
-  return import(/* webpackChunkName: "flavours/glitch/async/getting_started_misc" */'flavours/glitch/features/getting_started_misc');
+export function ListEditor () {
+  return import(/* webpackChunkName: "flavours/glitch/async/list_editor" */'../../list_editor');
 }
 
 export function ListAdder () {
-  return import(/* webpackChunkName: "features/glitch/async/list_adder" */'flavours/glitch/features/list_adder');
+  return import(/* webpackChunkName: "features/glitch/async/list_adder" */'../../list_adder');
 }
 
 export function Tesseract () {
   return import(/*webpackChunkName: "tesseract" */'tesseract.js');
 }
 
+export function Audio () {
+  return import(/* webpackChunkName: "features/glitch/async/audio" */'../../audio');
+}
+
 export function Directory () {
-  return import(/* webpackChunkName: "features/glitch/async/directory" */'flavours/glitch/features/directory');
+  return import(/* webpackChunkName: "features/glitch/async/directory" */'../../directory');
 }
 
 export function Onboarding () {
-  return import(/* webpackChunkName: "features/glitch/async/onboarding" */'flavours/glitch/features/onboarding');
+  return import(/* webpackChunkName: "features/glitch/async/onboarding" */'../../onboarding');
 }
 
 export function CompareHistoryModal () {
-  return import(/*webpackChunkName: "flavours/glitch/async/compare_history_modal" */'flavours/glitch/features/ui/components/compare_history_modal');
+  return import(/*webpackChunkName: "flavours/glitch/async/compare_history_modal" */'../components/compare_history_modal');
 }
 
-export function FilterModal () {
-  return import(/*webpackChunkName: "flavours/glitch/async/filter_modal" */'flavours/glitch/features/ui/components/filter_modal');
+export function Explore () {
+  return import(/* webpackChunkName: "flavours/glitch/async/explore" */'../../explore');
 }
 
-export function Explore () {
-  return import(/* webpackChunkName: "flavours/glitch/async/explore" */'flavours/glitch/features/explore');
+export function FilterModal () {
+  return import(/*webpackChunkName: "flavours/glitch/async/filter_modal" */'../components/filter_modal');
 }
 
 export function InteractionModal () {
-  return import(/*webpackChunkName: "flavours/glitch/async/modals/interaction_modal" */'flavours/glitch/features/interaction_modal');
+  return import(/*webpackChunkName: "flavours/glitch/async/modals/interaction_modal" */'../../interaction_modal');
 }
 
 export function SubscribedLanguagesModal () {
-  return import(/*webpackChunkName: "flavours/glitch/async/modals/subscribed_languages_modal" */'flavours/glitch/features/subscribed_languages_modal');
+  return import(/*webpackChunkName: "flavours/glitch/async/modals/subscribed_languages_modal" */'../../subscribed_languages_modal');
 }
 
 export function ClosedRegistrationsModal () {
-  return import(/*webpackChunkName: "flavours/glitch/async/modals/closed_registrations_modal" */'flavours/glitch/features/closed_registrations_modal');
+  return import(/*webpackChunkName: "flavours/glitch/async/modals/closed_registrations_modal" */'../../closed_registrations_modal');
 }
 
 export function About () {
-  return import(/*webpackChunkName: "features/glitch/async/about" */'flavours/glitch/features/about');
+  return import(/*webpackChunkName: "features/glitch/async/about" */'../../about');
 }
 
 export function PrivacyPolicy () {
-  return import(/*webpackChunkName: "features/glitch/async/privacy_policy" */'flavours/glitch/features/privacy_policy');
+  return import(/*webpackChunkName: "features/glitch/async/privacy_policy" */'../../privacy_policy');
 }
diff --git a/app/javascript/flavours/glitch/images/elephant_ui_working.svg b/app/javascript/flavours/glitch/images/elephant_ui_working.svg
deleted file mode 100644
index 8ba475db0a07c4..00000000000000
--- a/app/javascript/flavours/glitch/images/elephant_ui_working.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 124.12477 127.91685" width="124.12476" height="127.91685"><path d="M72.584191 46.815676c-2.3-2.2-4.2-2.5-6.6-.6-2.4 1.9-2.1 4.8.9 7.6 3.1 2.9 4.7 4.1 6.7 5 2.1.9 5.4 2.5 10.5-2s10.2-11.1 9.4-14.7c-.8-3.6-4.1-1.8-6.8 1.2s-3.7 4-5.4 5.2c-1.5 1.3-3.8 3-8.7-1.7z" class="st0" style="fill:#93a1b5;stroke:#000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;fill-opacity:1"/><path d="M116.384191 75.015676c0 6.3-3.9 9.8-9.1 9.8-5.3 0-9.9-3.5-9.9-9.8 0-6.3 4.3-10.3 9.5-10.3s9.5 4 9.5 10.3z" style="fill:#3a434e;stroke:#000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;fill-opacity:1"/><path d="M54.184191 16.615676c-23 1.2-30.5 14.1-32.8 27.8-3 18.2-8.2 44.2-9.2 53.2s-1 16 6 22 11 5 23 7 19 0 20-8l16.8-1.1s14.5 5.5 18.8 6.9c4.3 1.4 10.6.5 12.1-7.1s.2-12.5-6.6-14.4c-6.8-1.9-10.6-2.9-10.6-2.9l4.4-30.1s17.4 1.6 22.6-20c0 0 3.9 1.1 4.8-2.8.9-3.9-2.6-6.2-5.6-4.8l-2.5-1s-.2-3.8-3.5-4.2c-2.1-.2-6 3.4-3 7.4 0 0-3.4 8.9-12 7.8-8.6-1.1-12.5-11.2-15-18.2s-10.7-18.3-27.7-17.5z" class="st2" style="fill:#56606b;stroke:#000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;fill-opacity:1"/><path d="M95.484191 69.915676c-.6 0-1.2 0-1.8-.1-4.2-.2-10.9-2.4-17-7.8-.7-1-.4-2-.2-2.5.5-1.1 1.7-1.8 3-1.8.8 0 1.5.3 2.2.8 3 2.2 7.8 5.1 13.8 5.1.9 0 1.8-.1 2.7-.2 7.2-1 12.1-5.8 14.3-9.9.6-1.2 1.3-2.5 1.8-3.5.2-.5.3-.7.6-.9.3-.2 1 .2 1 .2l2.1.8c-4.5 17.8-17.4 19.2-21.2 19.2h-1.3v.6z" class="st3" style="fill:#3a434e;opacity:.98;fill-opacity:1"/><path d="M48.884191 126.915676c-2.2 0-4.7-.2-7.6-.7-2.8-.5-5.1-.8-7.1-1-6.9-.9-10.3-1.3-15.6-5.9-7-6-6.8-13-5.8-21.6.3-2.3.8-5.9 1.7-11.2 3.1 1.4 6.1 2.2 8.7 2.2 3.1 0 5.4-1.2 6.6-3.4 1.6 1.9 6.9 7.3 13.3 7.3 1 0 1.9-.1 2.8-.4 3.5-1 19.8-2.1 46.9-3.4l-1.7 11.7.4.1s3.8 1 10.6 2.9c6.1 1.7 7.9 5.6 6.3 13.8-1.3 6.6-6.2 7.3-8.2 7.3-1.1 0-2.2-.2-3.3-.5-4.2-1.4-18.6-6.8-18.7-6.9h-.1l-17.3 1.2-.1.4c-.7 5.4-4.5 8.1-11.8 8.1z" class="st3" style="fill:#3a434e;fill-opacity:1"/><path d="M41.184191 103.415676c-3.8-1.4-6-1.4-7.7-1.4-1.8 0-4.6 3.3 1.4 5.4 6 2.1 10.3 3.4 10.3 3.4s1.8-2.1 3.5-2.9c1.6-.8 2.3-.9 2.3-.9l-9.8-3.6z" style="fill:#56606b;fill-opacity:1"/><path d="M27.584191 38.615676c1.2-5-2.1-8.2-5.7-9.2-3.5-1-8.4-1.7-13.9 6.9s-9.5 16.5-6.4 20.6c3.1 4.1 9.3 3.4 11.8-.8 0 0 5.7 3.8 9.5-4.2" class="st2" style="fill:#56606b;stroke:#000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;fill-opacity:1"/><path d="M10.884191 45.115676c-1.6 2.5-.8 5 2 5.9 2.7 1 5-1.5 6.5-3.8 1.6-2.3 3.6-5.9 3.6-5.9s-3.7 1.2-5.6-.2c-2-1.4-1.5-3.8-1.5-3.8l-5 7.8z" class="st3" style="fill:#3a434e;fill-opacity:1"/><path d="M22.684191 41.415676c-2.6 1.1-6.8.6-6.9-4.1 0 0-5.1 7.6-5.9 9.6" class="st5" style="fill:none;stroke:#000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10"/><path d="M67.584191 5.215676c0-3.4-3.9-2.6-3.9-2.6 0-1.2-2-3.5-8.5-.6-6.4 2.9-7.3 6-7.3 6-3.8-1.7-9.6-2.6-13.5.8-3.9 3.4-4.3 10 2.3 13.5 0 0 2.9.9 7.7-.4 4.8-1.3 7.7-3.3 7.7-3.3s3.7 2.3 9 .6c5.3-1.7 9.9-4.5 10.3-10.1.5-5.7-3.8-3.9-3.8-3.9z" style="fill:#56606b;fill-opacity:1"/><path d="M67.084191 16.315676c-1-5.5-7-3-7-3 .5-2.1-3-4.1-5.5-2.7-2.5 1.4-6.6-.1-6.6-.1-6.4-4.4-14.3-2.1-16.1 2-1.1 3.3.2 7.3 4.8 9.7 0 0 2.9.9 7.7-.4 4.8-1.3 7.7-3.3 7.7-3.3s3.7 2.3 9 .6c2.3-.6 4.3-1.5 6-2.8 0 .1 0 0 0 0z" style="fill:#3a434e;fill-opacity:1"/><path d="M36.684191 22.715676c-.1 0-.2 0-.2-.1-3.1-1.6-5-4.1-5.4-7-.3-2.7.8-5.4 3-7.3 3.9-3.3 9.5-2.8 13.6-1.1.5-1.1 2.2-3.5 7.3-5.8 4.5-2 6.9-1.5 8-.8.6.4.9.9 1.1 1.3.7-.1 2-.1 3 .7.5.4.9 1 1 1.8.7-.1 1.8-.2 2.7.4 1 .7 1.4 2.1 1.2 4.1-.4 5-3.9 8.5-10.7 10.6-5.5 1.7-9.3-.6-9.4-.7-.2-.1-.3-.5-.2-.7.1-.2.5-.3.7-.2 0 0 3.6 2.2 8.6.6 6.3-2 9.6-5.1 10-9.7.1-1.6-.2-2.8-.8-3.3-.9-.7-2.3-.1-2.3-.1-.2.1-.3 0-.5 0-.1-.1-.2-.2-.2-.4 0-.8-.2-1.3-.6-1.7-.9-.8-2.6-.4-2.7-.4-.1 0-.3 0-.4-.1-.1-.1-.2-.2-.2-.4 0-.3-.2-.7-.7-1-.6-.4-2.6-1.1-7.1.8-6.1 2.7-7 5.6-7 5.7 0 .1-.1.3-.3.3-.1.1-.3.1-.4 0-3.9-1.7-9.3-2.4-13 .8-1.9 1.7-2.9 4.1-2.6 6.4.3 2.5 2 4.7 4.8 6.2.2.1.3.4.2.7-.1.3-.3.4-.5.4z"/><path d="M40.584191 84.115676s6.3 16.8 7.1 19.3c.8 2.5 1.8 3.4 7.3 3 5.5-.4 6.7-21.5 6.7-21.5l-21.1-.8z" style="fill:#191b22;stroke:#000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;fill-opacity:1"/><path d="M51.084191 103.415676c-1.7-2.1-1.9-4.2-1.9-4.2l2-10.9 3-1.4-3.1 16.5zm33.9-35.3l-23.9 1.9 1.2 8 25.2 1.1 4.6-9c-2.3-.3-4.7-.9-7.1-2z" class="st9" style="fill:#191b22;stroke:#000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;fill-opacity:1"/><path d="M28.484191 82.915676c7.2 9.4 12.7 11.4 21.8 7.7 8.5-3.4 15.4-9 15.1-15-.3-6-2.1-10.3-9.1-9.8-2.3.2-6.8 2.8-9.6 4.4-1.8 1-4.2 2.2-6 .4-1.8-1.8-4.3-4.4-4.3-4.4" class="st2" style="fill:#56606b;stroke:#000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;fill-opacity:1"/><path d="M49.284191 80.515676c-.3-.2-.5-.4-.7-.6-1.2.7-2.3 1.3-2.8 1.6-2 1.2-3.8.5-4.7-.3-.9-.9-2.3-2.4-5.5-1.5-3.7 1-4.5 5.7-2.5 8.4 6.5 6.1 12.8 4.1 15.2 3.3 2.4-.8 6.3-2.7 6.3-2.7l.6-6c-2-.8-4.1-.9-5.9-2.2z" class="st3" style="fill:#3a434e;fill-opacity:1"/><path d="M28.484191 82.915676c7.2 9.4 12.7 11.4 21.8 7.7 8.5-3.4 15.4-9 15.1-15-.3-6-2.1-10.3-9.1-9.8-2.3.2-6.8 2.8-9.6 4.4-1.8 1-4.2 2.2-6 .4-1.8-1.8-4.3-4.4-4.3-4.4m35.4-8.6c6.5 8.3 15.5 12.5 21.8 12.7" class="st5" style="fill:none;stroke:#000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10"/><path d="M53.184191 104.415676c-1.6.1-2.7-1.1-2.4-2.7l4.9-25.9c.3-1.6 1.9-3 3.6-3.1l26.9-1.7c1.6-.1 3.6-1.4 4.4-2.9l.7-1.3c.7-1.5 2.7-2.8 4.4-2.9l4.5-.3c1.6-.1 3.1 1.1 3.3 2.8v.2c.2 1.6.5 3.7.7 4.6.2.9.3 3 .1 4.6l-2.2 21.3c-.2 1.6-1.7 3.1-3.3 3.3l-45.6 4z" style="fill:#191b22;fill-opacity:1"/><path d="M53.184191 104.415676c-1.6.1-2.7-1.1-2.4-2.7l4.9-25.9c.3-1.6 1.9-3 3.6-3.1l26.9-1.7c1.6-.1 3.6-1.4 4.4-2.9l.7-1.3c.7-1.5 2.7-2.8 4.4-2.9l4.5-.3c1.6-.1 3.1 1.1 3.3 2.8v.2c.2 1.6.5 3.7.7 4.6.2.9.3 3 .1 4.6l-2.2 21.3c-.2 1.6-1.7 3.1-3.3 3.3l-45.6 4z" class="st5" style="fill:none;stroke:#000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10"/><path d="M55.684191 105.915676c-1.6.1-2.3-.4-2-2l4.4-25.6c.3-1.6 1.9-3 3.6-3.1l26.9-1.7c1.6-.1 3.6-1.4 4.4-2.9l.7-1.3c.7-1.5 2.7-2.8 4.4-2.9l4.5-.3c1.6-.1 3.1 1.1 3.3 2.8v.2c.2 1.6 1.3 2.9 2.5 2.8 1.2-.1 1.9 1.2 1.6 2.8l-5.2 24.9c-.3 1.6-2 3.1-3.6 3.2l-45.5 3.1z" style="fill:#191b22;fill-opacity:1"/><path d="M53.184191 104.315676l4.9-26c.3-1.6 1.9-3 3.6-3.1l26.9-1.7c1.6-.1 3.6-1.4 4.4-2.9l.7-1.3c.7-1.5 2.7-2.8 4.4-2.9l4.5-.3c1.6-.1 3.1 1.1 3.3 2.8v.2c.2 1.6 1.3 2.9 2.5 2.8 1.2-.1 1.9 1.2 1.6 2.8l-5.2 24.9c-.3 1.6-2 3.1-3.6 3.2l-46.7 3.7m9.2-103.9c-.3 2.9-2.9 4.9-4.1 5.8m8-3.2c-.7 3.5-4 6-4 6" class="st5" style="fill:none;stroke:#000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10"/><path d="M39.884191 53.615676c-2.3-2.2-4.2-2.5-6.6-.6-2.4 1.9-2.1 4.8.9 7.6 3.1 2.9 4.7 4.1 6.7 5 2 .9 5.4 2.5 10.5-2s10.2-11.1 9.4-14.7c-.8-3.6-4.1-1.8-6.8 1.2s-3.7 4-5.4 5.2c-1.7 1.2-3.8 3-8.7-1.7z" class="st0" style="fill:#93a1b5;stroke:#000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;fill-opacity:1"/><path d="M44.384191 61.315676c-2.3 0-4.7-1.2-6.6-3.1-.9-.9-1.1-2-.7-2.9.3-.8 1.1-1.3 1.8-1.3.2 0 .5 0 .7.1 2.3 2.1 4.2 3.2 5.9 3.2 1.6 0 2.7-.8 3.5-1.4 1.7-1.3 2.8-2.3 5.5-5.3.9-1.1 1.9-1.9 2.7-2.4.3.2.6.4.7.8.2.8-.2 2-.7 2.7-.9 1.3-4.9 5.4-9 8.4-1.1.7-2.4 1.2-3.8 1.2z" style="fill:#b3bfcd;fill-opacity:1"/><path d="M45.784191 50.115676c-.7 0-1.4-.6-1.4-1.4v-6.1c0-.7.6-1.4 1.4-1.4.7 0 1.4.6 1.4 1.4v6.1c0 .8-.6 1.4-1.4 1.4z"/><path d="M61.184191 118.215676c.7-7.1-3.5-10.6-9.2-11.1-5.7-.5-10.2 6.8-9.1 13.1 1.1 6.3 6.7 7.2 6.7 7.2" class="st5" style="fill:none;stroke:#000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10"/><path d="M52.084191 107.515676c-2.2-.7-4.3-1.4-6.5-2.2-2.1-.8-4.3-1.5-6.4-2.3-.1 0-.2-.2-.1-.3 0-.1.2-.2.3-.2 2.2.6 4.4 1.3 6.5 1.9 2.2.7 4.3 1.3 6.5 2 .3.1.4.4.3.6-.1.4-.4.6-.6.5zm25.4 10.1c-.2-1.4-.2-2.9.1-4.2.2-1.4.6-2.7 1.1-4-.3 1.3-.5 2.7-.6 4.1 0 1.4.1 2.7.4 4 .1.3-.1.5-.3.6-.2.1-.6-.1-.7-.5 0 .1 0 .1 0 0z"/><path d="M104.284191 103.615676c-3.6-.7-8.5 2.1-9.5 9.7s2.1 10.7 5.3 11.6m15.1-83.5l-.39999 1.4m-1.90001-1.2c2.4 1.7 6.4 3.4 6.4 3.4m-1.6-2.6l-.60001 1.59999" class="st5" style="fill:none;stroke:#000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10"/><path d="M47.484191 79.215676c3.2 2.7 7 3.3 7 3.3" style="fill:none;stroke:#000;stroke-miterlimit:10"/><path d="M69.284191 24.315676c-3.5.4-2.7 2.9-1.2 3.5 1.5.6 3.7.1 4.3-1.6.4-1.6-1.3-2.1-3.1-1.9z" style="fill:#4f5862;fill-opacity:1"/></svg>
\ No newline at end of file
diff --git a/app/javascript/flavours/glitch/initial_state.js b/app/javascript/flavours/glitch/initial_state.js
index 15f2673fa2b880..93991b19cfdaac 100644
--- a/app/javascript/flavours/glitch/initial_state.js
+++ b/app/javascript/flavours/glitch/initial_state.js
@@ -45,20 +45,11 @@
  * @property {boolean=} use_pending_items
  * @property {string} version
  * @property {string} sso_redirect
- * @property {boolean} translation_enabled
  * @property {string} status_page_url
  * @property {boolean} system_emoji_font
  * @property {string} default_content_type
  */
 
-/** @type {string} */
-const initialPath = document.querySelector("head meta[name=initialPath]")?.getAttribute("content") ?? '';
-/** @type {boolean} */
-export const hasMultiColumnPath = initialPath === '/'
-  || initialPath === '/getting-started'
-  || initialPath === '/home'
-  || initialPath.startsWith('/deck');
-
 /**
  * @typedef InitialState
  * @property {Record<string, import("./api_types/accounts").ApiAccountJSON>} accounts
@@ -74,6 +65,14 @@ const element = document.getElementById('initial-state');
 /** @type {InitialState | undefined} */
 const initialState = element?.textContent && JSON.parse(element.textContent);
 
+/** @type {string} */
+const initialPath = document.querySelector("head meta[name=initialPath]")?.getAttribute("content") ?? '';
+/** @type {boolean} */
+export const hasMultiColumnPath = initialPath === '/'
+  || initialPath === '/getting-started'
+  || initialPath === '/home'
+  || initialPath.startsWith('/deck');
+
 // Glitch-soc-specific “local settings”
 if (initialState) {
   try {
diff --git a/app/javascript/flavours/glitch/reducers/settings.js b/app/javascript/flavours/glitch/reducers/settings.js
index 59b2e5dd408628..f5768aedc6d0b5 100644
--- a/app/javascript/flavours/glitch/reducers/settings.js
+++ b/app/javascript/flavours/glitch/reducers/settings.js
@@ -12,9 +12,6 @@ import { uuid } from '../uuid';
 const initialState = ImmutableMap({
   saved: true,
 
-  onboarded: false,
-  layout: 'auto',
-
   skinTone: 1,
 
   trends: ImmutableMap({

From 2b4e9fbc718b04bc035c5d8e6caa05c0e8998acd Mon Sep 17 00:00:00 2001
From: Sunny Ripert <sunny@sunfox.org>
Date: Mon, 7 Nov 2022 15:41:42 +0100
Subject: [PATCH 0378/2191] [Glitch] Add form element on focal point modal

Port 8515bc79628c6e753a09a7da42eff9ce7ed4ade7 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../ui/components/focal_point_modal.jsx       | 27 +++++++++++++------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/app/javascript/flavours/glitch/features/ui/components/focal_point_modal.jsx b/app/javascript/flavours/glitch/features/ui/components/focal_point_modal.jsx
index d584277dc3ba26..bf31c137f19521 100644
--- a/app/javascript/flavours/glitch/features/ui/components/focal_point_modal.jsx
+++ b/app/javascript/flavours/glitch/features/ui/components/focal_point_modal.jsx
@@ -181,14 +181,14 @@ class FocalPointModal extends ImmutablePureComponent {
 
   handleKeyDown = (e) => {
     if (e.keyCode === 13 && (e.ctrlKey || e.metaKey)) {
-      e.preventDefault();
-      e.stopPropagation();
       this.props.onChangeDescription(e.target.value);
-      this.handleSubmit();
+      this.handleSubmit(e);
     }
   };
 
-  handleSubmit = () => {
+  handleSubmit = (e) => {
+    e.preventDefault();
+    e.stopPropagation();
     this.props.onSave(this.props.description, this.props.focusX, this.props.focusY);
   };
 
@@ -318,7 +318,7 @@ class FocalPointModal extends ImmutablePureComponent {
         </div>
 
         <div className='report-modal__container'>
-          <div className='report-modal__comment'>
+          <form className='report-modal__comment' onSubmit={this.handleSubmit} >
             {focals && <p><FormattedMessage id='upload_modal.hint' defaultMessage='Click or drag the circle on the preview to choose the focal point which will always be in view on all thumbnails.' /></p>}
 
             {thumbnailable && (
@@ -367,12 +367,23 @@ class FocalPointModal extends ImmutablePureComponent {
             </div>
 
             <div className='setting-text__toolbar'>
-              <button disabled={detecting || media.get('type') !== 'image' || is_changing_upload} className='link-button' onClick={this.handleTextDetection}><FormattedMessage id='upload_modal.detect_text' defaultMessage='Detect text from picture' /></button>
+              <button
+                type='button'
+                disabled={detecting || media.get('type') !== 'image' || is_changing_upload}
+                className='link-button'
+                onClick={this.handleTextDetection}
+              >
+                <FormattedMessage id='upload_modal.detect_text' defaultMessage='Detect text from picture' />
+              </button>
               <CharacterCounter max={1500} text={detecting ? '' : description} />
             </div>
 
-            <Button disabled={!dirty || detecting || isUploadingThumbnail || length(description) > 1500 || is_changing_upload} text={intl.formatMessage(is_changing_upload ? messages.applying : messages.apply)} onClick={this.handleSubmit} />
-          </div>
+            <Button
+              type='submit'
+              disabled={!dirty || detecting || isUploadingThumbnail || length(description) > 1500 || is_changing_upload}
+              text={intl.formatMessage(is_changing_upload ? messages.applying : messages.apply)}
+            />
+          </form>
 
           <div className='focal-point-modal__content'>
             {focals && (

From 46152a19a6c038fae72e6ef28ad4389838e26672 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 8 Mar 2024 12:46:49 +0100
Subject: [PATCH 0379/2191] Convert logo.jsx to Typescript

---
 .../flavours/glitch/components/{logo.jsx => logo.tsx}       | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
 rename app/javascript/flavours/glitch/components/{logo.jsx => logo.tsx} (72%)

diff --git a/app/javascript/flavours/glitch/components/logo.jsx b/app/javascript/flavours/glitch/components/logo.tsx
similarity index 72%
rename from app/javascript/flavours/glitch/components/logo.jsx
rename to app/javascript/flavours/glitch/components/logo.tsx
index 73a94af9eda41f..b7f8bd6695008a 100644
--- a/app/javascript/flavours/glitch/components/logo.jsx
+++ b/app/javascript/flavours/glitch/components/logo.tsx
@@ -1,14 +1,12 @@
 import logo from '@/images/logo.svg';
 
-export const WordmarkLogo = () => (
+export const WordmarkLogo: React.FC = () => (
   <svg viewBox='0 0 261 66' className='logo logo--wordmark' role='img'>
     <title>Mastodon</title>
     <use xlinkHref='#logo-symbol-wordmark' />
   </svg>
 );
 
-export const SymbolLogo = () => (
+export const SymbolLogo: React.FC = () => (
   <img src={logo} alt='Mastodon' className='logo logo--icon' />
 );
-
-export default WordmarkLogo;

From 81400b02b12115a5f3b6d386f1741b5deedf5cd8 Mon Sep 17 00:00:00 2001
From: gunchleoc <fios@foramnagaidhlig.net>
Date: Sun, 10 Mar 2024 10:25:13 +0000
Subject: [PATCH 0380/2191] Add nds locale to posting languages (#27434)

---
 app/helpers/languages_helper.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/helpers/languages_helper.rb b/app/helpers/languages_helper.rb
index 79d8cf794c729f..9e1c0a7db1d416 100644
--- a/app/helpers/languages_helper.rb
+++ b/app/helpers/languages_helper.rb
@@ -198,6 +198,7 @@ module LanguagesHelper
     ldn: ['Láadan', 'Láadan'].freeze,
     lfn: ['Lingua Franca Nova', 'lingua franca nova'].freeze,
     moh: ['Mohawk', 'Kanienʼkéha'].freeze,
+    nds: ['Low German', 'Plattdüütsch'].freeze,
     pdc: ['Pennsylvania Dutch', 'Pennsilfaani-Deitsch'].freeze,
     sco: ['Scots', 'Scots'].freeze,
     sma: ['Southern Sami', 'Åarjelsaemien Gïele'].freeze,

From f85168b1893722a5fa7d499f5fc5a6b5f5ad3d90 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 11 Mar 2024 08:37:04 +0100
Subject: [PATCH 0381/2191] New Crowdin Translations (automated) (#29467)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/ar.json      |    6 +
 app/javascript/mastodon/locales/bg.json      |    4 +-
 app/javascript/mastodon/locales/br.json      |    5 +-
 app/javascript/mastodon/locales/de.json      |    4 +-
 app/javascript/mastodon/locales/es-AR.json   |    2 +-
 app/javascript/mastodon/locales/es-MX.json   |    6 +-
 app/javascript/mastodon/locales/es.json      |   14 +-
 app/javascript/mastodon/locales/et.json      |   20 +-
 app/javascript/mastodon/locales/fi.json      |   12 +-
 app/javascript/mastodon/locales/gd.json      |   18 +-
 app/javascript/mastodon/locales/ia.json      |    5 +
 app/javascript/mastodon/locales/kab.json     |   56 +-
 app/javascript/mastodon/locales/lt.json      |  554 +++++----
 app/javascript/mastodon/locales/lv.json      |  204 ++--
 app/javascript/mastodon/locales/nl.json      |    4 +-
 app/javascript/mastodon/locales/no.json      |    1 +
 app/javascript/mastodon/locales/ru.json      |    2 +-
 app/javascript/mastodon/locales/ry.json      |   20 +-
 app/javascript/mastodon/locales/sk.json      | 1055 +++++++++---------
 app/javascript/mastodon/locales/sr-Latn.json |    6 +
 app/javascript/mastodon/locales/sr.json      |    3 +-
 app/javascript/mastodon/locales/tok.json     |   44 +-
 app/javascript/mastodon/locales/zh-TW.json   |   28 +-
 config/locales/activerecord.kab.yml          |    2 +-
 config/locales/activerecord.sk.yml           |   12 +-
 config/locales/af.yml                        |    2 -
 config/locales/an.yml                        |    2 -
 config/locales/ar.yml                        |    2 -
 config/locales/ast.yml                       |    2 -
 config/locales/be.yml                        |   37 +-
 config/locales/bg.yml                        |   44 +-
 config/locales/br.yml                        |   11 +-
 config/locales/ca.yml                        |   37 +-
 config/locales/ckb.yml                       |    1 -
 config/locales/co.yml                        |    1 -
 config/locales/cs.yml                        |    2 -
 config/locales/cy.yml                        |   37 +-
 config/locales/da.yml                        |   37 +-
 config/locales/de.yml                        |   39 +-
 config/locales/devise.et.yml                 |    1 +
 config/locales/devise.fi.yml                 |    2 +-
 config/locales/devise.fr-CA.yml              |    1 +
 config/locales/devise.fr.yml                 |    1 +
 config/locales/devise.gd.yml                 |   10 +
 config/locales/devise.lv.yml                 |   12 +-
 config/locales/devise.no.yml                 |    1 +
 config/locales/devise.sk.yml                 |  143 +--
 config/locales/devise.sv.yml                 |    2 +
 config/locales/doorkeeper.lv.yml             |    6 +-
 config/locales/doorkeeper.sk.yml             |  178 +--
 config/locales/doorkeeper.tr.yml             |    4 +-
 config/locales/doorkeeper.zh-TW.yml          |    6 +-
 config/locales/el.yml                        |    2 -
 config/locales/en-GB.yml                     |    2 -
 config/locales/eo.yml                        |    2 -
 config/locales/es-AR.yml                     |   45 +-
 config/locales/es-MX.yml                     |   43 +-
 config/locales/es.yml                        |   41 +-
 config/locales/et.yml                        |   45 +-
 config/locales/eu.yml                        |   37 +-
 config/locales/fa.yml                        |    2 -
 config/locales/fi.yml                        |   42 +-
 config/locales/fo.yml                        |   37 +-
 config/locales/fr-CA.yml                     |   44 +-
 config/locales/fr.yml                        |   42 +-
 config/locales/fy.yml                        |   23 +-
 config/locales/gd.yml                        |   86 +-
 config/locales/gl.yml                        |   37 +-
 config/locales/he.yml                        |   37 +-
 config/locales/hr.yml                        |    1 -
 config/locales/hu.yml                        |   37 +-
 config/locales/hy.yml                        |    1 -
 config/locales/id.yml                        |    2 -
 config/locales/ie.yml                        |   37 +-
 config/locales/io.yml                        |    2 -
 config/locales/is.yml                        |   37 +-
 config/locales/it.yml                        |   37 +-
 config/locales/ja.yml                        |   39 +-
 config/locales/ka.yml                        |    1 -
 config/locales/kab.yml                       |   60 +-
 config/locales/kk.yml                        |    1 -
 config/locales/ko.yml                        |   48 +-
 config/locales/ku.yml                        |    2 -
 config/locales/lad.yml                       |   21 +-
 config/locales/lt.yml                        |  406 +++++--
 config/locales/lv.yml                        |  114 +-
 config/locales/ms.yml                        |    2 -
 config/locales/my.yml                        |    2 -
 config/locales/nl.yml                        |   37 +-
 config/locales/nn.yml                        |   37 +-
 config/locales/no.yml                        |   27 +-
 config/locales/oc.yml                        |    1 -
 config/locales/pl.yml                        |   37 +-
 config/locales/pt-BR.yml                     |    2 -
 config/locales/pt-PT.yml                     |   37 +-
 config/locales/ro.yml                        |    1 -
 config/locales/ru.yml                        |    2 -
 config/locales/sc.yml                        |    1 -
 config/locales/sco.yml                       |    2 -
 config/locales/si.yml                        |    1 -
 config/locales/simple_form.ca.yml            |    4 +-
 config/locales/simple_form.et.yml            |    2 +
 config/locales/simple_form.fi.yml            |    2 +-
 config/locales/simple_form.fy.yml            |    2 +
 config/locales/simple_form.gd.yml            |    4 +-
 config/locales/simple_form.ja.yml            |    2 +
 config/locales/simple_form.kab.yml           |    9 +
 config/locales/simple_form.lv.yml            |   14 +-
 config/locales/simple_form.no.yml            |    2 +
 config/locales/simple_form.sr-Latn.yml       |    2 +
 config/locales/simple_form.sr.yml            |    2 +
 config/locales/simple_form.sv.yml            |    2 +
 config/locales/simple_form.vi.yml            |    2 +
 config/locales/simple_form.zh-TW.yml         |   14 +-
 config/locales/sk.yml                        |   13 +-
 config/locales/sl.yml                        |   37 +-
 config/locales/sq.yml                        |   36 +-
 config/locales/sr-Latn.yml                   |   58 +-
 config/locales/sr.yml                        |   44 +-
 config/locales/sv.yml                        |   46 +-
 config/locales/th.yml                        |   29 +-
 config/locales/tr.yml                        |   37 +-
 config/locales/uk.yml                        |    8 +-
 config/locales/vi.yml                        |   39 +-
 config/locales/zh-CN.yml                     |   37 +-
 config/locales/zh-HK.yml                     |    2 -
 config/locales/zh-TW.yml                     |  129 ++-
 127 files changed, 3437 insertions(+), 1451 deletions(-)

diff --git a/app/javascript/mastodon/locales/ar.json b/app/javascript/mastodon/locales/ar.json
index 2eebd1369cd6b8..914c15ad9536f4 100644
--- a/app/javascript/mastodon/locales/ar.json
+++ b/app/javascript/mastodon/locales/ar.json
@@ -277,7 +277,13 @@
   "follow_request.authorize": "ترخيص",
   "follow_request.reject": "رفض",
   "follow_requests.unlocked_explanation": "حتى وإن كان حسابك غير مقفل، يعتقد فريق {domain} أنك قد ترغب في مراجعة طلبات المتابعة من هذه الحسابات يدوياً.",
+  "follow_suggestions.curated_suggestion": "اختيار الموظفين",
   "follow_suggestions.dismiss": "لا تُظهرها مجدّدًا",
+  "follow_suggestions.hints.featured": "تم اختيار هذا الملف الشخصي يدوياً من قبل فريق {domain}.",
+  "follow_suggestions.hints.friends_of_friends": "هذا الملف الشخصي مشهور بين الأشخاص الذين تتابعهم.",
+  "follow_suggestions.hints.most_followed": "هذا الملف الشخصي هو واحد من الأكثر متابعة على {domain}.",
+  "follow_suggestions.hints.most_interactions": "هذا الملف الشخصي قد حصل مؤخرا على الكثير من الاهتمام على {domain}.",
+  "follow_suggestions.hints.similar_to_recently_followed": "هذا الملف الشخصي مشابه للملفات الشخصية التي تابعتها مؤخرا.",
   "follow_suggestions.personalized_suggestion": "توصية مخصصة",
   "follow_suggestions.popular_suggestion": "توصية رائجة",
   "follow_suggestions.view_all": "عرض الكل",
diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json
index f08ca46af80af5..93823496b755e5 100644
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@@ -480,7 +480,7 @@
   "onboarding.action.back": "Върнете ме обратно",
   "onboarding.actions.back": "Върнете ме обратно",
   "onboarding.actions.go_to_explore": "Виж тенденции",
-  "onboarding.actions.go_to_home": "Към началния ви инфоканал",
+  "onboarding.actions.go_to_home": "Към началния ми инфоканал",
   "onboarding.compose.template": "Здравейте, #Mastodon!",
   "onboarding.follows.empty": "За съжаление, в момента не могат да бъдат показани резултати. Може да опитате да търсите или да разгледате, за да намерите кого да последвате, или опитайте отново по-късно.",
   "onboarding.follows.lead": "Може да бъдете куратор на началния си инфоканал. Последвайки повече хора, по-деен и по-интересен ще става. Тези профили може да са добра начална точка, от която винаги по-късно да спрете да следвате!",
@@ -504,7 +504,7 @@
   "onboarding.start.skip": "Желаете ли да прескочите?",
   "onboarding.start.title": "Успяхте!",
   "onboarding.steps.follow_people.body": "Може да бъдете куратор на инфоканала си. Хайде да го запълним с интересни хора.",
-  "onboarding.steps.follow_people.title": "Последвайте {count, plural, one {един човек} other {# души}}",
+  "onboarding.steps.follow_people.title": "Персонализиране на началния ви инфоканал",
   "onboarding.steps.publish_status.body": "Поздравете целия свят.",
   "onboarding.steps.publish_status.title": "Направете първата си публикация",
   "onboarding.steps.setup_profile.body": "Други са по-вероятно да взаимодействат с вас с попълнения профил.",
diff --git a/app/javascript/mastodon/locales/br.json b/app/javascript/mastodon/locales/br.json
index 5ce52d527a42ee..3b376ac47033e7 100644
--- a/app/javascript/mastodon/locales/br.json
+++ b/app/javascript/mastodon/locales/br.json
@@ -113,6 +113,7 @@
   "column.directory": "Mont a-dreuz ar profiloù",
   "column.domain_blocks": "Domani berzet",
   "column.favourites": "Muiañ-karet",
+  "column.firehose": "Redoù war-eeun",
   "column.follow_requests": "Rekedoù heuliañ",
   "column.home": "Degemer",
   "column.lists": "Listennoù",
@@ -143,6 +144,8 @@
   "compose_form.lock_disclaimer.lock": "prennet",
   "compose_form.placeholder": "Petra emaoc'h o soñjal e-barzh ?",
   "compose_form.poll.duration": "Pad ar sontadeg",
+  "compose_form.poll.multiple": "Meur a choaz",
+  "compose_form.poll.option_placeholder": "Choaz {number}",
   "compose_form.poll.single": "Dibabit unan",
   "compose_form.poll.switch_to_multiple": "Kemmañ ar sontadeg evit aotren meur a zibab",
   "compose_form.poll.switch_to_single": "Kemmañ ar sontadeg evit aotren un dibab hepken",
@@ -441,7 +444,7 @@
   "onboarding.action.back": "Distreiñ",
   "onboarding.actions.back": "Distreiñ",
   "onboarding.actions.go_to_explore": "See what's trending",
-  "onboarding.actions.go_to_home": "Go to your home feed",
+  "onboarding.actions.go_to_home": "Mont d'ho red degemer",
   "onboarding.compose.template": "Salud #Mastodon!",
   "onboarding.follows.lead": "You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!",
   "onboarding.follows.title": "Popular on Mastodon",
diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json
index 2c9431481064ca..3700b5d91d2581 100644
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@@ -151,7 +151,7 @@
   "compose_form.poll.single": "Einfachauswahl",
   "compose_form.poll.switch_to_multiple": "Mehrfachauswahl erlauben",
   "compose_form.poll.switch_to_single": "Nur Einfachauswahl erlauben",
-  "compose_form.poll.type": "Stil",
+  "compose_form.poll.type": "Art",
   "compose_form.publish": "Veröffentlichen",
   "compose_form.publish_form": "Neuer Beitrag",
   "compose_form.reply": "Antworten",
@@ -277,7 +277,7 @@
   "follow_request.authorize": "Genehmigen",
   "follow_request.reject": "Ablehnen",
   "follow_requests.unlocked_explanation": "Auch wenn dein Konto öffentlich bzw. nicht geschützt ist, haben die Moderator*innen von {domain} gedacht, dass du diesen Follower lieber manuell bestätigen solltest.",
-  "follow_suggestions.curated_suggestion": "Vom Server empfohlen",
+  "follow_suggestions.curated_suggestion": "Vom Server-Team empfohlen",
   "follow_suggestions.dismiss": "Nicht mehr anzeigen",
   "follow_suggestions.hints.featured": "Dieses Profil wurde vom {domain}-Team ausgewählt.",
   "follow_suggestions.hints.friends_of_friends": "Dieses Profil ist bei deinen Followern beliebt.",
diff --git a/app/javascript/mastodon/locales/es-AR.json b/app/javascript/mastodon/locales/es-AR.json
index 3b63c505e4424d..ead3355589f76c 100644
--- a/app/javascript/mastodon/locales/es-AR.json
+++ b/app/javascript/mastodon/locales/es-AR.json
@@ -271,7 +271,7 @@
   "filter_modal.select_filter.subtitle": "Usar una categoría existente o crear una nueva",
   "filter_modal.select_filter.title": "Filtrar este mensaje",
   "filter_modal.title.status": "Filtrar un mensaje",
-  "firehose.all": "Todas",
+  "firehose.all": "Todos",
   "firehose.local": "Este servidor",
   "firehose.remote": "Otros servidores",
   "follow_request.authorize": "Autorizar",
diff --git a/app/javascript/mastodon/locales/es-MX.json b/app/javascript/mastodon/locales/es-MX.json
index aa935e410efbfd..ba54843236c4a2 100644
--- a/app/javascript/mastodon/locales/es-MX.json
+++ b/app/javascript/mastodon/locales/es-MX.json
@@ -279,15 +279,15 @@
   "follow_requests.unlocked_explanation": "A pesar de que tu cuenta no es privada, el personal de {domain} ha pensado que quizás deberías revisar manualmente las solicitudes de seguimiento de estas cuentas.",
   "follow_suggestions.curated_suggestion": "Recomendaciones del equipo",
   "follow_suggestions.dismiss": "No mostrar de nuevo",
-  "follow_suggestions.hints.featured": "Este perfil ha sido elegido a mano por el equipo de {domain}.",
+  "follow_suggestions.hints.featured": "Este perfil ha sido seleccionado a mano por el equipo de {domain}.",
   "follow_suggestions.hints.friends_of_friends": "Este perfil es popular entre las personas que sigues.",
   "follow_suggestions.hints.most_followed": "Este perfil es uno de los más seguidos en {domain}.",
-  "follow_suggestions.hints.most_interactions": "Este perfil ha estado recibiendo recientemente mucha atención en {domain}.",
+  "follow_suggestions.hints.most_interactions": "Este perfil ha estado recibiendo mucha atención en {domain}.",
   "follow_suggestions.hints.similar_to_recently_followed": "Este perfil es similar a los perfiles que has seguido recientemente.",
   "follow_suggestions.personalized_suggestion": "Sugerencia personalizada",
   "follow_suggestions.popular_suggestion": "Sugerencia popular",
   "follow_suggestions.view_all": "Ver todo",
-  "follow_suggestions.who_to_follow": "A quién seguir",
+  "follow_suggestions.who_to_follow": "Recomendamos seguir",
   "followed_tags": "Hashtags seguidos",
   "footer.about": "Acerca de",
   "footer.directory": "Directorio de perfiles",
diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json
index 25ff1157fd8d95..b4cc241814716c 100644
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@@ -529,15 +529,15 @@
   "poll_button.add_poll": "Añadir una encuesta",
   "poll_button.remove_poll": "Eliminar encuesta",
   "privacy.change": "Ajustar privacidad",
-  "privacy.direct.long": "Todos los mencionados en el post",
+  "privacy.direct.long": "Visible únicamente por los mencionados en la publicación",
   "privacy.direct.short": "Personas específicas",
-  "privacy.private.long": "Solo tus seguidores",
+  "privacy.private.long": "Visible únicamente por tus seguidores",
   "privacy.private.short": "Seguidores",
-  "privacy.public.long": "Cualquiera dentro y fuera de Mastodon",
-  "privacy.public.short": "Público",
-  "privacy.unlisted.additional": "Esto se comporta exactamente igual que el público, excepto que la publicación no aparecerá en la cronología en directo o en las etiquetas, la exploración o búsqueda de Mastodon, incluso si está optado por activar la cuenta de usuario.",
-  "privacy.unlisted.long": "Menos fanfares algorítmicos",
-  "privacy.unlisted.short": "Público tranquilo",
+  "privacy.public.long": "Visible por todo el mundo, dentro y fuera de Mastodon",
+  "privacy.public.short": "Pública",
+  "privacy.unlisted.additional": "Se comporta exactamente igual que la visibilidad pública, excepto que la publicación no aparecerá en las cronologías públicas o en las etiquetas, la sección de Explorar o la búsqueda de Mastodon, incluso si has habilitado la opción de búsqueda en tu perfil.",
+  "privacy.unlisted.long": "Sin algoritmos de descubrimiento",
+  "privacy.unlisted.short": "Pública silenciosa",
   "privacy_policy.last_updated": "Actualizado por última vez {date}",
   "privacy_policy.title": "Política de Privacidad",
   "recommended": "Recomendado",
diff --git a/app/javascript/mastodon/locales/et.json b/app/javascript/mastodon/locales/et.json
index be8bec616d0c79..be0c262c32c542 100644
--- a/app/javascript/mastodon/locales/et.json
+++ b/app/javascript/mastodon/locales/et.json
@@ -21,7 +21,7 @@
   "account.blocked": "Blokeeritud",
   "account.browse_more_on_origin_server": "Vaata rohkem algsel profiilil",
   "account.cancel_follow_request": "Võta jälgimistaotlus tagasi",
-  "account.copy": "Kopeeri link profiili",
+  "account.copy": "Kopeeri profiili link",
   "account.direct": "Maini privaatselt @{name}",
   "account.disable_notifications": "Peata teavitused @{name} postitustest",
   "account.domain_blocked": "Domeen peidetud",
@@ -277,6 +277,17 @@
   "follow_request.authorize": "Autoriseeri",
   "follow_request.reject": "Hülga",
   "follow_requests.unlocked_explanation": "Kuigi su konto pole lukustatud, soovitab {domain} personal siiski nende kontode jälgimistaotlused käsitsi üle vaadata.",
+  "follow_suggestions.curated_suggestion": "Teiste valitud",
+  "follow_suggestions.dismiss": "Ära enam näita",
+  "follow_suggestions.hints.featured": "Selle kasutajaprofiili on soovitanud {domain} kasutajad.",
+  "follow_suggestions.hints.friends_of_friends": "See kasutajaprofiil on jälgitavate seas populaarne.",
+  "follow_suggestions.hints.most_followed": "See on {domain} enim jälgitud kasutajaprofiil.",
+  "follow_suggestions.hints.most_interactions": "See on {domain} viimasel ajal enim tähelepanu saanud kasutajaprofiil.",
+  "follow_suggestions.hints.similar_to_recently_followed": "See kasutajaprofiil sarnaneb neile, mida oled hiljuti jälgima asunud.",
+  "follow_suggestions.personalized_suggestion": "Isikupärastatud soovitus",
+  "follow_suggestions.popular_suggestion": "Popuplaarne soovitus",
+  "follow_suggestions.view_all": "Vaata kõiki",
+  "follow_suggestions.who_to_follow": "Keda jälgida",
   "followed_tags": "Jälgitavad märksõnad",
   "footer.about": "Teave",
   "footer.directory": "Profiilikataloog",
@@ -473,7 +484,7 @@
   "onboarding.compose.template": "Tere, #Mastodon!",
   "onboarding.follows.empty": "Kahjuks ei saa hetkel tulemusi näidata. Proovi kasutada otsingut või lehitse uurimise lehte, et leida inimesi, keda jälgida, või proovi hiljem uuesti.",
   "onboarding.follows.lead": "Haldad ise oma koduvoogu. Mida rohkemaid inimesi jälgid, seda aktiivsem ja huvitavam see on. Need profiilid võiksid olla head alustamiskohad — saad nende jälgimise alati lõpetada!",
-  "onboarding.follows.title": "Populaarne Mastodonis",
+  "onboarding.follows.title": "Isikupärasta oma koduvoogu",
   "onboarding.profile.discoverable": "Muuda mu profiil avastatavaks",
   "onboarding.profile.discoverable_hint": "Kui nõustud enda avastamisega Mastodonis, võivad sinu postitused ilmuda otsingutulemustes ja trendides ning sinu profiili võidakse soovitada sinuga sarnaste huvidega inimestele.",
   "onboarding.profile.display_name": "Näidatav nimi",
@@ -493,11 +504,11 @@
   "onboarding.start.skip": "Soovid kohe edasi hüpata?",
   "onboarding.start.title": "Said valmis!",
   "onboarding.steps.follow_people.body": "Haldad oma koduvoogu. Täida see huvitavate inimestega.",
-  "onboarding.steps.follow_people.title": "Jälgi {count, plural, one {üht inimest} other {# inimest}}",
+  "onboarding.steps.follow_people.title": "Isikupärasta oma koduvoogu",
   "onboarding.steps.publish_status.body": "Ütle maailmale tere.",
   "onboarding.steps.publish_status.title": "Tee oma esimene postitus",
   "onboarding.steps.setup_profile.body": "Täidetud profiili korral suhtlevad teised sinuga tõenäolisemalt.",
-  "onboarding.steps.setup_profile.title": "Kohanda oma profiili",
+  "onboarding.steps.setup_profile.title": "Isikupärasta oma profiili",
   "onboarding.steps.share_profile.body": "Anna sõpradele teada, kuidas sind Mastodonist leida!",
   "onboarding.steps.share_profile.title": "Jaga oma profiili",
   "onboarding.tips.2fa": "<strong>Kas sa teadsid?</strong> Saad oma kontot muuta turvalisemaks valides konto seadetes kaheastmelise autoriseerimise. See töötab mistahes sinu valitud TOTP-äpiga, telefoninumbrit pole vaja!",
@@ -524,6 +535,7 @@
   "privacy.private.short": "Jälgijad",
   "privacy.public.long": "Nii kasutajad kui mittekasutajad",
   "privacy.public.short": "Avalik",
+  "privacy.unlisted.additional": "See on olemuselt küll avalik, aga postitus ei ilmu voogudes ega märksõnades, lehitsedes ega Mastodoni otsingus, isegi kui konto on seadistustes avalik.",
   "privacy.unlisted.long": "Vähem algoritmilisi teavitusi",
   "privacy.unlisted.short": "Vaikselt avalik",
   "privacy_policy.last_updated": "Viimati uuendatud {date}",
diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index 484baae1228460..7588b084fd670b 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -201,9 +201,9 @@
   "disabled_account_banner.text": "Tilisi {disabledAccount} on tällä hetkellä poissa käytöstä.",
   "dismissable_banner.community_timeline": "Nämä ovat tuoreimpia julkaisuja käyttäjiltä, joiden tili on palvelimella {domain}.",
   "dismissable_banner.dismiss": "Hylkää",
-  "dismissable_banner.explore_links": "Näitä uutisia jaetaan tänään sosiaalisessa verkossa eniten. Uusimmat ja eri käyttäjien eniten lähettämät uutiset nousevat listauksessa korkeimmalle.",
-  "dismissable_banner.explore_statuses": "Tänään nämä sosiaalisen verkon julkaisut keräävät eniten huomiota. Uusimmat, tehostetuimmat ja suosikeiksi lisätyimmät julkaisut nousevat listauksessa korkeammalle.",
-  "dismissable_banner.explore_tags": "Nämä sosiaalisen verkon aihetunnisteet keräävät tänään eniten huomiota. Useimman käyttäjän käyttämät aihetunnisteet nousevat listauksessa korkeimmalle.",
+  "dismissable_banner.explore_links": "Näitä uutisia jaetaan tänään sosiaalisessa verkossa eniten. Uusimmat ja eri käyttäjien eniten lähettämät uutiset nousevat listauksessa korkeammalle.",
+  "dismissable_banner.explore_statuses": "Nämä sosiaalisen verkon julkaisut keräävät tänään eniten huomiota. Uusimmat, tehostetuimmat ja suosikeiksi lisätyimmät julkaisut nousevat listauksessa korkeammalle.",
+  "dismissable_banner.explore_tags": "Nämä sosiaalisen verkon aihetunnisteet keräävät tänään eniten huomiota. Useimman käyttäjän käyttämät aihetunnisteet nousevat listauksessa korkeammalle.",
   "dismissable_banner.public_timeline": "Nämä ovat viimeisimpiä julkaisuja sosiaalisen verkon käyttäjiltä, joita seurataan palvelimella {domain}.",
   "embed.instructions": "Upota julkaisu verkkosivullesi kopioimalla alla oleva koodi.",
   "embed.preview": "Tältä se näyttää:",
@@ -284,7 +284,7 @@
   "follow_suggestions.hints.most_followed": "Tämä profiili on yksi seuratuimmista palvelimella {domain}.",
   "follow_suggestions.hints.most_interactions": "Tämä profiili on viime aikoina saanut paljon huomiota palvelimella {domain}.",
   "follow_suggestions.hints.similar_to_recently_followed": "Tämä profiili on samankaltainen kuin profiilit, joita olet viimeksi seurannut.",
-  "follow_suggestions.personalized_suggestion": "Personoitu ehdotus",
+  "follow_suggestions.personalized_suggestion": "Mukautettu ehdotus",
   "follow_suggestions.popular_suggestion": "Suosittu ehdotus",
   "follow_suggestions.view_all": "Näytä kaikki",
   "follow_suggestions.who_to_follow": "Ehdotuksia seurattavaksi",
@@ -504,7 +504,7 @@
   "onboarding.start.skip": "Haluatko hypätä suoraan eteenpäin ilman alkuunpääsyohjeistuksia?",
   "onboarding.start.title": "Olet tehnyt sen!",
   "onboarding.steps.follow_people.body": "Mastodon perustuu sinua kiinnostavien henkilöjen julkaisujen seuraamiseen.",
-  "onboarding.steps.follow_people.title": "Mukauta kotisyötteesi",
+  "onboarding.steps.follow_people.title": "Mukauta kotisyötettäsi",
   "onboarding.steps.publish_status.body": "Tervehdi maailmaa sanoin, kuvin tai äänestyksin {emoji}",
   "onboarding.steps.publish_status.title": "Laadi ensimmäinen julkaisusi",
   "onboarding.steps.setup_profile.body": "Täydentämällä profiilisi tietoja tehostat vuorovaikutteisuutta.",
@@ -657,7 +657,7 @@
   "status.filter": "Suodata tämä julkaisu",
   "status.filtered": "Suodatettu",
   "status.hide": "Piilota julkaisu",
-  "status.history.created": "{name} luotu {date}",
+  "status.history.created": "{name} loi {date}",
   "status.history.edited": "{name} muokkasi {date}",
   "status.load_more": "Lataa lisää",
   "status.media.open": "Avaa napsauttamalla",
diff --git a/app/javascript/mastodon/locales/gd.json b/app/javascript/mastodon/locales/gd.json
index d775a7b027129d..f4d12d6337c034 100644
--- a/app/javascript/mastodon/locales/gd.json
+++ b/app/javascript/mastodon/locales/gd.json
@@ -145,10 +145,10 @@
   "compose_form.lock_disclaimer": "Chan eil an cunntas agad {locked}. ’S urrainn do dhuine sam bith ’gad leantainn is na postaichean agad a tha ag amas air an luchd-leantainn agad a-mhàin a shealltainn.",
   "compose_form.lock_disclaimer.lock": "glaiste",
   "compose_form.placeholder": "Dè tha air d’ aire?",
-  "compose_form.poll.duration": "Faide a’ chunntais-bheachd",
-  "compose_form.poll.multiple": "Iomadh roghainn",
+  "compose_form.poll.duration": "Faide a’ chunntais",
+  "compose_form.poll.multiple": "Iomadh-roghainn",
   "compose_form.poll.option_placeholder": "Roghainn {number}",
-  "compose_form.poll.single": "Tagh aonan",
+  "compose_form.poll.single": "Aonan",
   "compose_form.poll.switch_to_multiple": "Atharraich an cunntas-bheachd ach an gabh iomadh roghainn a thaghadh",
   "compose_form.poll.switch_to_single": "Atharraich an cunntas-bheachd gus nach gabh ach aon roghainn a thaghadh",
   "compose_form.poll.type": "Stoidhle",
@@ -277,7 +277,13 @@
   "follow_request.authorize": "Ùghdarraich",
   "follow_request.reject": "Diùlt",
   "follow_requests.unlocked_explanation": "Ged nach eil an cunntas agad glaiste, tha sgioba {domain} dhen bheachd gum b’ fheàirrde thu lèirmheas a dhèanamh air na h-iarrtasan leantainn o na cunntasan seo a làimh.",
+  "follow_suggestions.curated_suggestion": "Roghainn an sgioba",
   "follow_suggestions.dismiss": "Na seall seo a-rithist",
+  "follow_suggestions.hints.featured": "Chaidh a’ phròifil seo a thaghadh le sgioba {domain} a làimh.",
+  "follow_suggestions.hints.friends_of_friends": "Tha fèill mhòr air a’ phròifil seo am measg nan daoine a leanas tu.",
+  "follow_suggestions.hints.most_followed": "Tha a’ phròifil seo am measg an fheadhainn a leanar as trice air {domain}.",
+  "follow_suggestions.hints.most_interactions": "Chaidh mòran aire a thoirt air a’ phròifil seo air {domain} o chionn goirid.",
+  "follow_suggestions.hints.similar_to_recently_followed": "Tha a’ phròifil seo coltach ris na pròifilean air an lean thu o chionn goirid.",
   "follow_suggestions.personalized_suggestion": "Moladh pearsanaichte",
   "follow_suggestions.popular_suggestion": "Moladh air a bheil fèill mhòr",
   "follow_suggestions.view_all": "Seall na h-uile",
@@ -479,9 +485,11 @@
   "onboarding.follows.empty": "Gu mì-fhortanach, chan urrainn dhuinn toradh a shealltainn an-dràsta. Feuch gleus an luirg no duilleag an rùrachaidh airson daoine ri leantainn a lorg no feuch ris a-rithist an ceann tamaill.",
   "onboarding.follows.lead": "’S e do prìomh-doras do Mhastodon a th’ ann san dachaigh. Mar as motha an t-uiread de dhaoine a leanas tu ’s ann nas beòthaile inntinniche a bhios i. Seo moladh no dhà dhut airson tòiseachadh:",
   "onboarding.follows.title": "Cuir dreach pearsanta air do dhachaigh",
-  "onboarding.profile.discoverable": "Bu mhath leam gun gabh a’ phròifil agam a lorg",
+  "onboarding.profile.discoverable": "Bu mhath leam gun gabh a’ phròifil agam a rùrachadh",
+  "onboarding.profile.discoverable_hint": "Ma chuir thu romhad gun gabh a’ phròifil agad a rùrachadh air Mastodon, faodaidh na postaichean agad nochdadh ann an toraidhean luirg agus treandaichean agus dh’fhaoidte gun dèid a’ phròifil agad a mholadh dhan fheadhainn aig a bheil ùidhean coltach ri d’ ùidhean-sa.",
   "onboarding.profile.display_name": "Ainm-taisbeanaidh",
   "onboarding.profile.display_name_hint": "D’ ainm slàn no spòrsail…",
+  "onboarding.profile.lead": "’S urrainn dhut seo a choileanadh uair sam bith eile sna roghainnean far am bi roghainnean gnàthachaidh eile ri làimh dhut cuideachd.",
   "onboarding.profile.note": "Cunntas-beatha",
   "onboarding.profile.note_hint": "’S urrainn dhut @iomradh a thoirt air càch no air #tagaicheanHais…",
   "onboarding.profile.save_and_continue": "Sàbhail ’s lean air adhart",
@@ -527,6 +535,8 @@
   "privacy.private.short": "Luchd-leantainn",
   "privacy.public.long": "Duine sam bith taobh a-staigh no a-muigh Mhastodon",
   "privacy.public.short": "Poblach",
+  "privacy.unlisted.additional": "Tha seo coltach ris an fhaicsinneachd phoblach ach cha nochd am post air loidhnichean-ama an t-saoghail phoblaich, nan tagaichean hais no an rùrachaidh no ann an toraidhean luirg Mhastodon fiù ’s ma thug thu ro-aonta airson sin seachad.",
+  "privacy.unlisted.long": "Ìre bheag an algairim",
   "privacy.unlisted.short": "Poblach ach sàmhach",
   "privacy_policy.last_updated": "An t-ùrachadh mu dheireadh {date}",
   "privacy_policy.title": "Poileasaidh prìobhaideachd",
diff --git a/app/javascript/mastodon/locales/ia.json b/app/javascript/mastodon/locales/ia.json
index 599688cc07315c..31c9ef7394c350 100644
--- a/app/javascript/mastodon/locales/ia.json
+++ b/app/javascript/mastodon/locales/ia.json
@@ -197,6 +197,7 @@
   "firehose.all": "Toto",
   "firehose.local": "Iste servitor",
   "firehose.remote": "Altere servitores",
+  "follow_request.reject": "Rejectar",
   "follow_suggestions.dismiss": "Non monstrar novemente",
   "follow_suggestions.personalized_suggestion": "Suggestion personalisate",
   "follow_suggestions.popular_suggestion": "Suggestion personalisate",
@@ -204,6 +205,7 @@
   "footer.about": "A proposito de",
   "footer.directory": "Directorio de profilos",
   "footer.get_app": "Obtene le application",
+  "footer.invite": "Invitar personas",
   "footer.keyboard_shortcuts": "Accessos directe de claviero",
   "footer.privacy_policy": "Politica de confidentialitate",
   "footer.source_code": "Vider le codice fonte",
@@ -244,6 +246,7 @@
   "keyboard_shortcuts.muted": "Aperir lista de usatores silentiate",
   "keyboard_shortcuts.my_profile": "Aperir tu profilo",
   "keyboard_shortcuts.notifications": "Aperir columna de notificationes",
+  "keyboard_shortcuts.open_media": "Aperir medio",
   "keyboard_shortcuts.profile": "Aperir le profilo del autor",
   "keyboard_shortcuts.reply": "Responder al message",
   "keyboard_shortcuts.spoilers": "Monstrar/celar le campo CW",
@@ -273,9 +276,11 @@
   "navigation_bar.blocks": "Usatores blocate",
   "navigation_bar.bookmarks": "Marcapaginas",
   "navigation_bar.community_timeline": "Chronologia local",
+  "navigation_bar.compose": "Componer un nove message",
   "navigation_bar.direct": "Mentiones private",
   "navigation_bar.discover": "Discoperir",
   "navigation_bar.domain_blocks": "Dominios blocate",
+  "navigation_bar.explore": "Explorar",
   "navigation_bar.favourites": "Favoritos",
   "navigation_bar.filters": "Parolas silentiate",
   "navigation_bar.lists": "Listas",
diff --git a/app/javascript/mastodon/locales/kab.json b/app/javascript/mastodon/locales/kab.json
index c45543a80332ed..94f620491fd39f 100644
--- a/app/javascript/mastodon/locales/kab.json
+++ b/app/javascript/mastodon/locales/kab.json
@@ -1,5 +1,8 @@
 {
   "about.contact": "Anermis:",
+  "about.disclaimer": "Mastodon d aseɣẓan ilelli, d aseɣẓan n uɣbalu yeldin, d tnezzut n Mastodon gGmbH.",
+  "about.not_available": "Talɣut-a ur tettwabder ara deg uqeddac-a.",
+  "about.powered_by": "Azeṭṭa inmetti yettwasɣelsen sɣur {mastodon}",
   "about.rules": "Ilugan n uqeddac",
   "account.account_note_header": "Tazmilt",
   "account.add_or_remove_from_list": "Rnu neɣ kkes seg tebdarin",
@@ -10,13 +13,15 @@
   "account.block_short": "Sewḥel",
   "account.blocked": "Yettusewḥel",
   "account.browse_more_on_origin_server": "Snirem ugar deg umeɣnu aneẓli",
-  "account.cancel_follow_request": "Withdraw follow request",
+  "account.cancel_follow_request": "Sefsex taḍfart",
   "account.copy": "Nɣel assaɣ ɣer umaɣnu",
+  "account.direct": "Bder-d @{name} weḥd-s",
   "account.disable_notifications": "Ḥbes ur iyi-d-ttazen ara ilɣa mi ara d-isuffeɣ @{name}",
   "account.domain_blocked": "Taɣult yeffren",
   "account.edit_profile": "Ẓreg amaɣnu",
   "account.enable_notifications": "Azen-iyi-d ilɣa mi ara d-isuffeɣ @{name}",
   "account.endorse": "Welleh fell-as deg umaɣnu-inek",
+  "account.featured_tags.last_status_at": "Tasuffeɣt taneggarut ass n {date}",
   "account.featured_tags.last_status_never": "Ulac tisuffaɣ",
   "account.follow": "Ḍfer",
   "account.followers": "Imeḍfaren",
@@ -27,14 +32,17 @@
   "account.follows.empty": "Ar tura, amseqdac-agi ur yeṭṭafaṛ yiwen.",
   "account.go_to_profile": "Ddu ɣer umaɣnu",
   "account.hide_reblogs": "Ffer ayen i ibeṭṭu @{name}",
-  "account.joined_short": "Izeddi da",
+  "account.joined_short": "Izeddi da seg ass n",
   "account.link_verified_on": "Taɣara n useɣwen-a tettwasenqed ass n {date}",
   "account.locked_info": "Amiḍan-agi uslig isekweṛ. D bab-is kan i izemren ad yeǧǧ, s ufus-is, win ara t-iḍefṛen.",
   "account.media": "Timidyatin",
   "account.mention": "Bder-d @{name}",
+  "account.moved_to": "{name} yenna-d dakken amiḍan-is amaynut yuɣal :",
   "account.mute": "Sgugem @{name}",
+  "account.mute_notifications_short": "Susem ilɣa",
   "account.mute_short": "Sgugem",
   "account.muted": "Yettwasgugem",
+  "account.no_bio": "Ulac aglam i d-yettunefken.",
   "account.open_original_page": "Ldi asebter anasli",
   "account.posts": "Tisuffaɣ",
   "account.posts_with_replies": "Tisuffaɣ d tririyin",
@@ -69,6 +77,7 @@
   "bundle_modal_error.close": "Mdel",
   "bundle_modal_error.message": "Tella-d kra n tuccḍa mi d-yettali ugbur-agi.",
   "bundle_modal_error.retry": "Ɛreḍ tikelt-nniḍen",
+  "closed_registrations_modal.description": "Asnulfu n umiḍan deg {domain} mačči d ayen izemren ad yili, maca ttxil-k·m, err deg lbal-ik·im belli ur teḥwaǧeḍ ara amiḍan s wudem ibanen ɣef {domain} akken ad tesqedceḍ Mastodon.",
   "closed_registrations_modal.find_another_server": "Aff-d aqeddac nniḍen",
   "closed_registrations_modal.title": "Ajerred deg Masṭudun",
   "column.about": "Ɣef",
@@ -99,6 +108,7 @@
   "community.column_settings.remote_only": "Anmeggag kan",
   "compose.language.change": "Beddel tutlayt",
   "compose.language.search": "Nadi tutlayin …",
+  "compose.published.body": "Yeffeɣ-d yizen-nni.",
   "compose.published.open": "Ldi",
   "compose.saved.body": "Tettwasekles tsuffeɣt.",
   "compose_form.direct_message_warning_learn_more": "Issin ugar",
@@ -111,6 +121,7 @@
   "compose_form.poll.multiple": "Aṭas n ufran",
   "compose_form.poll.option_placeholder": "Taxtiṛt {number}",
   "compose_form.poll.single": "Fren yiwen",
+  "compose_form.poll.type": "Aɣanib",
   "compose_form.publish": "Suffeɣ",
   "compose_form.publish_form": "Tasuffeɣt tamaynut",
   "compose_form.reply": "Err",
@@ -128,6 +139,7 @@
   "confirmations.discard_edit_media.confirm": "Sefsex",
   "confirmations.domain_block.confirm": "Ffer taɣult meṛṛa",
   "confirmations.edit.confirm": "Ẓreg",
+  "confirmations.edit.message": "Abeddel tura ad d-yaru izen-nni i d-tegreḍ akka tura. Tetḥeqqeḍ tebɣiḍ ad tkemmleḍ?",
   "confirmations.logout.confirm": "Ffeɣ",
   "confirmations.logout.message": "D tidet tebɣiḍ ad teffɣeḍ?",
   "confirmations.mute.confirm": "Sgugem",
@@ -142,14 +154,18 @@
   "conversation.mark_as_read": "Creḍ yettwaɣṛa",
   "conversation.open": "Ssken adiwenni",
   "conversation.with": "Akked {names}",
+  "copy_icon_button.copied": "Yettwanɣel ɣer ufus",
   "copypaste.copied": "Yettwanɣel",
+  "copypaste.copy_to_clipboard": "Nɣel ɣer afus",
   "directory.federated": "Deg fedivers yettwasnen",
   "directory.local": "Seg {domain} kan",
   "directory.new_arrivals": "Imaynuten id yewḍen",
   "directory.recently_active": "Yermed xas melmi kan",
   "disabled_account_banner.account_settings": "Iɣewwaṛen n umiḍan",
-  "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
-  "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.",
+  "dismissable_banner.dismiss": "Agi",
+  "dismissable_banner.explore_links": "D tiqsiḍin n yisallen i yettwabḍan ass-a deg web inmetti. Tiqsiḍin n yisallen timaynutin i d-yettwassufɣen s wugar n medden yemgaraden, d tid i d-yufraren ugar.",
+  "dismissable_banner.explore_statuses": "Ti d tisufaɣ seg uzeṭṭa anmetti i d-yettawin tamyigawt ass-a. Tisufaɣ timaynutin yesεan aṭas n lǧehd d tid iḥemmlen s waṭas, ttwaεlayit d timezwura.",
+  "dismissable_banner.explore_tags": "D wiyi i d ihacṭagen i d-yettawin tamyigawt deg web anmetti ass-a. Ihacṭagen i sseqdacen ugar n medden, εlayit d imezwura.",
   "embed.instructions": "Ẓẓu addad-agi deg usmel-inek s wenγal n tangalt yellan sdaw-agi.",
   "embed.preview": "Akka ara d-iban:",
   "emoji_button.activity": "Aqeddic",
@@ -221,19 +237,28 @@
   "hashtag.column_settings.tag_mode.any": "Yiwen seg-sen",
   "hashtag.column_settings.tag_mode.none": "Yiwen ala seg-sen",
   "hashtag.column_settings.tag_toggle": "Glu-d s yihacṭagen imerna i ujgu-agi",
+  "hashtag.counter_by_accounts": "{count, plural, one {{counter} imtekki} other {{counter} n imtekkiyen}}",
   "hashtag.counter_by_uses": "{count, plural, one {{counter} n tsuffeɣt} other {{counter} n tsuffaɣ}}",
   "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}}",
   "home.column_settings.basic": "Igejdanen",
   "home.column_settings.show_reblogs": "Ssken-d beṭṭu",
   "home.column_settings.show_replies": "Ssken-d tiririyin",
   "home.hide_announcements": "Ffer ulɣuyen",
   "home.pending_critical_update.body": "Ma ulac aɣilif, leqqem aqeddac-ik Mastodon akken kan tzemreḍ !",
   "home.show_announcements": "Ssken-d ulɣuyen",
+  "interaction_modal.description.favourite": "S umiḍan ɣef Mastodon, tzemreḍ ad tesmenyifeḍ tasuffeɣt-a akken ad teǧǧeḍ amaru ad iẓer belli tḥemmleḍ-tt u ad tt-id-tsellkeḍ i ticki.",
+  "interaction_modal.description.follow": "S umiḍan deg Mastodon, tzemreḍ ad tḍefreḍ {name} akken ad d-teṭṭfeḍ iznan-is deg lxiḍ-ik·im agejdan.",
+  "interaction_modal.description.reblog": "S umiḍan deg Mastodon, tzemreḍ ad tesnerniḍ tasuffeɣt-a akken ad tt-tebḍuḍ d yineḍfaren-ik·im.",
+  "interaction_modal.description.reply": "S umiḍan deg Mastodon, tzemreḍ ad d-terreḍ ɣef tsuffeɣt-a.",
+  "interaction_modal.login.action": "Awi-yi ɣer uqeddac-iw",
+  "interaction_modal.login.prompt": "Taɣult n uqeddac-ik·im agejdan, amedya mastodon.social",
   "interaction_modal.no_account_yet": "Ulac-ik·ikem deg Maṣṭudun?",
   "interaction_modal.on_another_server": "Deg uqeddac nniḍen",
   "interaction_modal.on_this_server": "Deg uqeddac-ayi",
   "interaction_modal.sign_in": "Ur tekcimeḍ ara ɣer uqeddac-a. Anda yella umiḍan-ik·im ?",
+  "interaction_modal.sign_in_hint": "Ihi : Wa d asmel ideg tjerdeḍ. Ma ur tecfiḍ ara, nadi imayl n ummager deg tenkult-ik·im. Tzemreḍ daɣen ad d-tefkeḍ isem-ik·im n useqdac ummid ! (amedya @Mastodon@mastodon.social)",
   "interaction_modal.title.follow": "Ḍfer {name}",
   "intervals.full.days": "{number, plural, one {# n wass} other {# n wussan}}",
   "intervals.full.hours": "{number, plural, one {# n usarag} other {# n yesragen}}",
@@ -311,6 +336,7 @@
   "navigation_bar.lists": "Tibdarin",
   "navigation_bar.logout": "Ffeɣ",
   "navigation_bar.mutes": "Iseqdacen yettwasusmen",
+  "navigation_bar.opened_in_classic_interface": "Tisuffaɣ, imiḍanen akked isebtar-nniḍen igejdanen ldin-d s wudem amezwer deg ugrudem web aklasiki.",
   "navigation_bar.personal": "Udmawan",
   "navigation_bar.pins": "Tisuffaɣ yettwasenṭḍen",
   "navigation_bar.preferences": "Imenyafen",
@@ -361,12 +387,18 @@
   "onboarding.follows.lead": "You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!",
   "onboarding.follows.title": "Popular on Mastodon",
   "onboarding.profile.display_name": "Isem ara d-yettwaskanen",
+  "onboarding.profile.note_hint": "Tzemreḍ ad d-@tbedreḍ imdanen niḍen neɣ #ihacṭagen …",
+  "onboarding.profile.save_and_continue": "Sekles, tkemmleḍ",
+  "onboarding.profile.title": "Asbadu n umaɣnu",
+  "onboarding.profile.upload_avatar": "Sali tugna n umaɣnu",
+  "onboarding.profile.upload_header": "Sali tacacit n umaɣnu",
+  "onboarding.share.lead": "Ini-asen i medden amek ara k·m-id-afen deg Mastodon!",
   "onboarding.share.message": "Nekk d {username} deg #Mastodon! Ḍfer iyi-d sya {url}",
   "onboarding.share.title": "Bḍu amaɣnu-inek·inem",
   "onboarding.start.lead": "Your new Mastodon account is ready to go. Here's how you can make the most of it:",
   "onboarding.start.skip": "Want to skip right ahead?",
   "onboarding.start.title": "Tseggmeḍ-tt !",
-  "onboarding.steps.follow_people.body": "You curate your own feed. Lets fill it with interesting people.",
+  "onboarding.steps.follow_people.body": "Aḍfer n medden yelhan, d tikti n Mastodon.",
   "onboarding.steps.follow_people.title": "Follow {count, plural, one {one person} other {# people}}",
   "onboarding.steps.publish_status.body": "Say hello to the world.",
   "onboarding.steps.publish_status.title": "Aru tasuffeɣt-inek·inem tamezwarutt",
@@ -377,6 +409,7 @@
   "picture_in_picture.restore": "Err-it amkan-is",
   "poll.closed": "Tfukk",
   "poll.refresh": "Smiren",
+  "poll.reveal": "Wali igmaḍ",
   "poll.total_people": "{count, plural, one {# n wemdan} other {# n yemdanen}}",
   "poll.total_votes": "{count, plural, one {# n udɣaṛ} other {# n yedɣaṛen}}",
   "poll.vote": "Dɣeṛ",
@@ -385,10 +418,13 @@
   "poll_button.remove_poll": "Kkes asenqed",
   "privacy.change": "Seggem tabaḍnit n yizen",
   "privacy.direct.long": "Wid akk i d-yettwabdaren deg tuffeɣt",
+  "privacy.direct.short": "Imdanen ulmisen",
   "privacy.private.long": "Ala wid i k-yeṭṭafaṛen",
   "privacy.private.short": "Imeḍfaren",
   "privacy.public.long": "Kra n win yellan deg Masṭudun neɣ berra-s",
   "privacy.public.short": "Azayez",
+  "privacy.unlisted.long": "Kra kan n ilguritmen",
+  "privacy_policy.last_updated": "Aleqqem aneggaru {date}",
   "privacy_policy.title": "Tasertit tabaḍnit",
   "refresh": "Smiren",
   "regeneration_indicator.label": "Yessalay-d…",
@@ -412,9 +448,11 @@
   "report.next": "Uḍfiṛ",
   "report.placeholder": "Iwenniten-nniḍen",
   "report.reasons.dislike": "Ur t-ḥemmleɣ ara",
+  "report.reasons.other": "D ayen nniḍen",
   "report.reasons.spam": "D aspam",
   "report.submit": "Azen",
   "report.target": "Mmel {target}",
+  "report.thanks.title": "Ur tebɣiḍ ara ad twaliḍ aya?",
   "report.unfollow": "Seḥbes aḍfar n @{name}",
   "report_notification.attached_statuses": "{count, plural, one {# post} other {# posts}} attached",
   "report_notification.categories.other": "Ayen nniḍen",
@@ -422,7 +460,13 @@
   "report_notification.open": "Ldi aneqqis",
   "search.no_recent_searches": "Ulac inadiyen ineggura",
   "search.placeholder": "Nadi",
+  "search.quick_action.account_search": "Imaɣnuten mṣadan d {x}",
+  "search.quick_action.go_to_account": "Ddu ɣer umaɣnu {x}",
+  "search.quick_action.go_to_hashtag": "Ddu ɣer uhacṭag {x}",
+  "search.quick_action.open_url": "Ldi tansa URL deg Mastodon",
+  "search.quick_action.status_search": "Tisuffaɣ mṣadan d {x}",
   "search.search_or_paste": "Nadi neɣ senṭeḍ URL",
+  "search_popout.full_text_search_disabled_message": "Ur yelli ara deg {domain}.",
   "search_popout.language_code": "Tangalt ISO n tutlayt",
   "search_popout.options": "Iwellihen n unadi",
   "search_popout.recent": "Inadiyen ineggura",
@@ -471,6 +515,7 @@
   "status.report": "Cetki ɣef @{name}",
   "status.sensitive_warning": "Agbur amḥulfu",
   "status.share": "Bḍu",
+  "status.show_filter_reason": "Ssken-d akken yebɣu yili",
   "status.show_less": "Ssken-d drus",
   "status.show_less_all": "Semẓi akk tisuffɣin",
   "status.show_more": "Ssken-d ugar",
@@ -516,6 +561,7 @@
   "upload_modal.preparing_ocr": "Aheyyi n OCR…",
   "upload_modal.preview_label": "Taskant ({ratio})",
   "upload_progress.label": "Asali iteddu...",
+  "username.taken": "Yettwaṭṭef yisem-a n useqdac. Ɛreḍ wayeḍ",
   "video.close": "Mdel tabidyutt",
   "video.download": "Sidered afaylu",
   "video.exit_fullscreen": "Ffeɣ seg ugdil ačuran",
diff --git a/app/javascript/mastodon/locales/lt.json b/app/javascript/mastodon/locales/lt.json
index 35722b0e0deb7f..8b757484cee3e6 100644
--- a/app/javascript/mastodon/locales/lt.json
+++ b/app/javascript/mastodon/locales/lt.json
@@ -27,8 +27,8 @@
   "account.domain_blocked": "Užblokuotas domenas",
   "account.edit_profile": "Redaguoti profilį",
   "account.enable_notifications": "Pranešti man, kai @{name} paskelbia",
-  "account.endorse": "Rekomenduoti profilyje",
-  "account.featured_tags.last_status_at": "Paskutinį kartą paskelbta {date}",
+  "account.endorse": "Rodyti profilyje",
+  "account.featured_tags.last_status_at": "Paskutinis įrašas {date}",
   "account.featured_tags.last_status_never": "Nėra įrašų",
   "account.featured_tags.title": "{name} rekomenduojami saitažodžiai",
   "account.follow": "Sekti",
@@ -53,7 +53,7 @@
   "account.mute_notifications_short": "Nutildyti pranešimus",
   "account.mute_short": "Nutildyti",
   "account.muted": "Nutildytas",
-  "account.mutual": "Abipusis",
+  "account.mutual": "Bendri",
   "account.no_bio": "Nėra pateikto aprašymo.",
   "account.open_original_page": "Atidaryti originalinį puslapį",
   "account.posts": "Įrašai",
@@ -72,7 +72,7 @@
   "account.unmute": "Atšaukti nutildymą @{name}",
   "account.unmute_notifications_short": "Atšaukti nutildymą pranešimams",
   "account.unmute_short": "Atšaukti nutildymą",
-  "account_note.placeholder": "Spustelėk norėdamas (-a) pridėti pastabą",
+  "account_note.placeholder": "Spustelėk norint pridėti pastabą.",
   "admin.dashboard.daily_retention": "Naudotojų pasilikimo rodiklis pagal dieną po registracijos",
   "admin.dashboard.monthly_retention": "Naudotojų pasilikimo rodiklis pagal mėnesį po registracijos",
   "admin.dashboard.retention.average": "Vidurkis",
@@ -89,21 +89,21 @@
   "announcement.announcement": "Skelbimas",
   "attachments_list.unprocessed": "(neapdorotas)",
   "audio.hide": "Slėpti garsą",
-  "boost_modal.combo": "Gali paspausti {combo}, kad praleisti kitą kartą",
+  "boost_modal.combo": "Galima paspausti {combo}, kad praleisti kitą kartą.",
   "bundle_column_error.copy_stacktrace": "Kopijuoti klaidos ataskaitą",
-  "bundle_column_error.error.body": "Užklausos puslapio nepavyko atvaizduoti. Tai gali būti dėl mūsų kodo klaidos arba naršyklės suderinamumo problemos.",
+  "bundle_column_error.error.body": "Paprašytos puslapio nepavyko atvaizduoti. Tai gali būti dėl mūsų kodo klaidos arba naršyklės suderinamumo problemos.",
   "bundle_column_error.error.title": "O, ne!",
   "bundle_column_error.network.body": "Bandant užkrauti šį puslapį įvyko klaida. Tai galėjo atsitikti dėl laikinos tavo interneto ryšio arba šio serverio problemos.",
   "bundle_column_error.network.title": "Tinklo klaida",
   "bundle_column_error.retry": "Bandyti dar kartą",
-  "bundle_column_error.return": "Grįžti į pradžią",
+  "bundle_column_error.return": "Grįžti į pagrindinį",
   "bundle_column_error.routing.body": "Prašyto puslapio nepavyko rasti. Ar esi tikras (-a), kad adreso juostoje nurodytas URL adresas yra teisingas?",
   "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Uždaryti",
   "bundle_modal_error.message": "Kraunant šį komponentą kažkas nepavyko.",
   "bundle_modal_error.retry": "Bandyti dar kartą",
   "closed_registrations.other_server_instructions": "Kadangi Mastodon yra decentralizuotas, gali susikurti paskyrą kitame serveryje ir vis tiek bendrauti su šiuo serveriu.",
-  "closed_registrations_modal.description": "Sukurti paskyrą {domain} šiuo metu neįmanoma, tačiau nepamiršk, kad norint naudotis Mastodon nebūtina turėti paskyrą domene {domain}.",
+  "closed_registrations_modal.description": "Sukurti paskyrą {domain} šiuo metu neįmanoma, bet nepamiršk, kad norint naudotis Mastodon nebūtina turėti paskyrą domene {domain}.",
   "closed_registrations_modal.find_another_server": "Rasti kitą serverį",
   "closed_registrations_modal.preamble": "Mastodon yra decentralizuotas, todėl nesvarbu, kur susikursi paskyrą, galėsi sekti ir bendrauti su bet kuriuo šiame serveryje esančiu asmeniu. Jį gali net savarankiškai talpinti!",
   "closed_registrations_modal.title": "Užsiregistruoti Mastodon",
@@ -116,7 +116,7 @@
   "column.domain_blocks": "Užblokuoti domenai",
   "column.favourites": "Mėgstamiausi",
   "column.firehose": "Tiesioginiai srautai",
-  "column.follow_requests": "Sekimo prašymus",
+  "column.follow_requests": "Sekimo prašymai",
   "column.home": "Pagrindinis",
   "column.lists": "Sąrašai",
   "column.mutes": "Nutildyti naudotojai",
@@ -131,7 +131,7 @@
   "column_header.show_settings": "Rodyti nustatymus",
   "column_header.unpin": "Atsegti",
   "column_subheading.settings": "Nustatymai",
-  "community.column_settings.local_only": "Tik vietinis",
+  "community.column_settings.local_only": "Tik vietinė",
   "community.column_settings.media_only": "Tik medija",
   "community.column_settings.remote_only": "Tik nuotolinis",
   "compose.language.change": "Keisti kalbą",
@@ -140,17 +140,17 @@
   "compose.published.open": "Atidaryti",
   "compose.saved.body": "Įrašas išsaugotas.",
   "compose_form.direct_message_warning_learn_more": "Sužinoti daugiau",
-  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
+  "compose_form.encryption_warning": "Mastodon įrašai nėra šifruojami nuo galo iki galo. Per Mastodon nesidalyk jokia slapta informacija.",
   "compose_form.hashtag_warning": "Šis įrašas nebus įtraukta į jokį saitažodį, nes ji nėra vieša. Tik viešų įrašų galima ieškoti pagal saitažodį.",
   "compose_form.lock_disclaimer": "Tavo paskyra nėra {locked}. Bet kas gali sekti tave ir peržiūrėti tik sekėjams skirtus įrašus.",
   "compose_form.lock_disclaimer.lock": "užrakinta",
   "compose_form.placeholder": "Kas tavo mintyse?",
   "compose_form.poll.duration": "Apklausos trukmė",
   "compose_form.poll.multiple": "Keli pasirinkimai",
-  "compose_form.poll.option_placeholder": "{number} pasirinkimas",
+  "compose_form.poll.option_placeholder": "{number} parinktis",
   "compose_form.poll.single": "Pasirinkti vieną",
-  "compose_form.poll.switch_to_multiple": "Keisti apklausą, kad būtų galima pasirinkti kelis pasirinkimus",
-  "compose_form.poll.switch_to_single": "Pakeisti apklausą, kad būtų galima pasirinkti vieną variantą",
+  "compose_form.poll.switch_to_multiple": "Keisti apklausą, kad būtų galima pasirinkti kelis pasirinkimus.",
+  "compose_form.poll.switch_to_single": "Keisti apklausą, kad būtų galima pasirinkti vieną pasirinkimą",
   "compose_form.poll.type": "Stilius",
   "compose_form.publish": "Skelbti",
   "compose_form.publish_form": "Naujas įrašas",
@@ -166,24 +166,26 @@
   "confirmations.cancel_follow_request.confirm": "Atšaukti prašymą",
   "confirmations.cancel_follow_request.message": "Ar tikrai nori atšaukti savo prašymą sekti {name}?",
   "confirmations.delete.confirm": "Ištrinti",
-  "confirmations.delete.message": "Are you sure you want to delete this status?",
+  "confirmations.delete.message": "Ar tikrai nori ištrinti šį įrašą?",
   "confirmations.delete_list.confirm": "Ištrinti",
   "confirmations.delete_list.message": "Ar tikrai nori visam laikui ištrinti šį sąrašą?",
   "confirmations.discard_edit_media.confirm": "Atmesti",
   "confirmations.discard_edit_media.message": "Turi neišsaugotų medijos aprašymo ar peržiūros pakeitimų, vis tiek juos atmesti?",
-  "confirmations.domain_block.confirm": "Hide entire domain",
+  "confirmations.domain_block.confirm": "Blokuoti visą domeną",
+  "confirmations.domain_block.message": "Ar tikrai, tikrai nori užblokuoti visą {domain}? Daugeliu atvejų užtenka kelių tikslinių blokavimų arba nutildymų. Šio domeno turinio nematysi jokiose viešose laiko skalėse ar pranešimuose. Tavo sekėjai iš to domeno bus pašalinti.",
   "confirmations.edit.confirm": "Redaguoti",
   "confirmations.edit.message": "Redaguojant dabar, bus perrašyta šiuo metu kuriama žinutė. Ar tikrai nori tęsti?",
   "confirmations.logout.confirm": "Atsijungti",
   "confirmations.logout.message": "Ar tikrai nori atsijungti?",
   "confirmations.mute.confirm": "Nutildyti",
-  "confirmations.mute.explanation": "Tai paslėps jų įrašus ir įrašus, kuriuose jie menėmi, tačiau jie vis tiek galės matyti tavo įrašus ir sekti.",
-  "confirmations.mute.message": "Ar tikrai norite nutildyti {name}?",
-  "confirmations.redraft.confirm": "Ištrinti ir perrašyti",
+  "confirmations.mute.explanation": "Tai paslėps jų įrašus ir įrašus, kuriuose jie menėmi, bet jie vis tiek galės matyti tavo įrašus ir sekti.",
+  "confirmations.mute.message": "Ar tikrai nori nutildyti {name}?",
+  "confirmations.redraft.confirm": "Ištrinti ir parengti iš naujo",
+  "confirmations.redraft.message": "Ar tikrai nori ištrinti šį įrašą ir parengti jį iš naujo kaip juodraštį? Bus prarastos mėgstamiausios ir pakėlimai, o atsakymai į originalinį įrašą taps liekamojais.",
   "confirmations.reply.confirm": "Atsakyti",
   "confirmations.reply.message": "Atsakant dabar, bus perrašyta metu kuriama žinutė. Ar tikrai nori tęsti?",
   "confirmations.unfollow.confirm": "Nebesekti",
-  "confirmations.unfollow.message": "Ar tikrai norite atsisakyti sekimo {name}?",
+  "confirmations.unfollow.message": "Ar tikrai nori nebesekti {name}?",
   "conversation.delete": "Ištrinti pokalbį",
   "conversation.mark_as_read": "Žymėti kaip skaitytą",
   "conversation.open": "Peržiūrėti pokalbį",
@@ -191,87 +193,94 @@
   "copy_icon_button.copied": "Nukopijuota į iškarpinę",
   "copypaste.copied": "Nukopijuota",
   "copypaste.copy_to_clipboard": "Kopijuoti į iškarpinę",
-  "directory.local": "Iš {domain} tik",
-  "directory.new_arrivals": "Naujos prekės",
-  "directory.recently_active": "Neseniai aktyvus",
+  "directory.federated": "Iš žinomų fediversų",
+  "directory.local": "Tik iš {domain}",
+  "directory.new_arrivals": "Nauji atvykėliai",
+  "directory.recently_active": "Neseniai aktyvus (-i)",
   "disabled_account_banner.account_settings": "Paskyros nustatymai",
-  "disabled_account_banner.text": "Jūsų paskyra {disabledAccount} šiuo metu yra išjungta.",
+  "disabled_account_banner.text": "Tavo paskyra {disabledAccount} šiuo metu išjungta.",
+  "dismissable_banner.community_timeline": "Tai – naujausi vieši įrašai, kuriuos paskelbė žmonės, kurių paskyros talpinamos {domain}.",
   "dismissable_banner.dismiss": "Atmesti",
-  "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
-  "dismissable_banner.explore_statuses": "Tai įrašai iš viso socialinio tinklo, kurie šiandien sulaukia vis daugiau dėmesio. Naujesni įrašai, turintys daugiau boosts ir mėgstamiausių įrašų, yra vertinami aukščiau.",
-  "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.",
-  "embed.instructions": "Embed this status on your website by copying the code below.",
-  "embed.preview": "Štai kaip tai atrodys:",
+  "dismissable_banner.explore_links": "Tai – naujienos, kuriomis šiandien daugiausiai bendrinamasi socialiniame žiniatinklyje. Naujesnės naujienų istorijos, kurias paskelbė daugiau skirtingų žmonių, vertinamos aukščiau.",
+  "dismissable_banner.explore_statuses": "Tai – įrašai iš viso socialinio žiniatinklio, kurie šiandien sulaukia daug dėmesio. Naujesni įrašai, turintys daugiau pakėlimų ir mėgstamų, vertinami aukščiau.",
+  "dismissable_banner.explore_tags": "Tai – saitažodžiai, kurie šiandien sulaukia daug dėmesio socialiniame žiniatinklyje. Saitažodžiai, kuriuos naudoja daugiau skirtingų žmonių, vertinami aukščiau.",
+  "dismissable_banner.public_timeline": "Tai – naujausi vieši įrašai, kuriuos socialiniame žiniatinklyje paskelbė žmonės, sekantys {domain}.",
+  "embed.instructions": "Įterpk šį įrašą į savo svetainę nukopijavus (-usi) toliau pateiktą kodą.",
+  "embed.preview": "Štai, kaip tai atrodys:",
   "emoji_button.activity": "Veikla",
   "emoji_button.clear": "Išvalyti",
   "emoji_button.custom": "Pasirinktinis",
   "emoji_button.flags": "Vėliavos",
-  "emoji_button.food": "Maistas ir Gėrimai",
+  "emoji_button.food": "Maistas ir gėrimai",
   "emoji_button.label": "Įterpti veidelius",
   "emoji_button.nature": "Gamta",
-  "emoji_button.not_found": "Nerasta jokių tinkamų jaustukų",
+  "emoji_button.not_found": "Nerasta jokių tinkamų jaustukų.",
   "emoji_button.objects": "Objektai",
   "emoji_button.people": "Žmonės",
-  "emoji_button.recent": "Dažniausiai naudojama",
-  "emoji_button.search": "Paieška...",
+  "emoji_button.recent": "Dažniausiai naudojami",
+  "emoji_button.search": "Ieškoti...",
   "emoji_button.search_results": "Paieškos rezultatai",
   "emoji_button.symbols": "Simboliai",
-  "emoji_button.travel": "Kelionės ir Vietos",
-  "empty_column.account_hides_collections": "Šis naudotojas (-a) pasirinko nepadaryti šią informaciją prieinamą",
-  "empty_column.account_suspended": "Paskyra sustabdyta",
-  "empty_column.account_timeline": "No toots here!",
-  "empty_column.account_unavailable": "Profilis neprieinamas",
-  "empty_column.blocks": "Dar neužblokavote nė vieno naudotojo.",
-  "empty_column.bookmarked_statuses": "You don't have any bookmarked toots yet. When you bookmark one, it will show up here.",
-  "empty_column.community": "Vietinė laiko juosta yra tuščia. Parašykite ką nors viešai, kad pradėtumėte veikti!",
-  "empty_column.direct": "Dar neturite jokių privačių paminėjimų. Kai išsiųsite arba gausite tokį pranešimą, jis bus rodomas čia.",
-  "empty_column.domain_blocks": "There are no hidden domains yet.",
-  "empty_column.favourited_statuses": "Dar neturite mėgstamiausių įrašų. Kai vieną iš jų pamėgsite, jis bus rodomas čia.",
-  "empty_column.follow_requests": "Dar neturite jokių sekimo užklausų. Kai gausite tokį prašymą, jis bus rodomas čia.",
-  "empty_column.followed_tags": "Dar nesekėte jokių grotažymių. Kai tai padarysite, jie bus rodomi čia.",
+  "emoji_button.travel": "Kelionės ir vietos",
+  "empty_column.account_hides_collections": "Šis (-i) naudotojas (-a) pasirinko nepadaryti šią informaciją prieinamą.",
+  "empty_column.account_suspended": "Paskyra sustabdyta.",
+  "empty_column.account_timeline": "Nėra įrašų čia.",
+  "empty_column.account_unavailable": "Profilis neprieinamas.",
+  "empty_column.blocks": "Dar neužblokavai nė vieno naudotojo.",
+  "empty_column.bookmarked_statuses": "Dar neturi nė vienos įrašo žymės. Kai vieną iš jų pridėsi į žymes, jis bus rodomas čia.",
+  "empty_column.community": "Vietinė laiko skalė tuščia. Parašyk ką nors viešai, kad pradėtum bendrauti!",
+  "empty_column.direct": "Dar neturi jokių privačių paminėjimų. Kai išsiųsi arba gausi vieną iš jų, jis bus rodomas čia.",
+  "empty_column.domain_blocks": "Dar nėra užblokuotų domenų.",
+  "empty_column.explore_statuses": "Šiuo metu niekas nėra tendencinga. Patikrink vėliau.",
+  "empty_column.favourited_statuses": "Dar neturi mėgstamų įrašų. Kai vieną iš jų pamėgsi, jis bus rodomas čia.",
+  "empty_column.favourites": "Šio įrašo dar niekas nepamėgo. Kai kas nors tai padarys, jie bus rodomi čia.",
+  "empty_column.follow_requests": "Dar neturi jokių sekimo prašymų. Kai gausi tokį prašymą, jis bus rodomas čia.",
+  "empty_column.followed_tags": "Dar neseki jokių saitažodžių. Kai tai padarysi, jie bus rodomi čia.",
   "empty_column.hashtag": "Nėra nieko šiame saitažodyje kol kas.",
-  "empty_column.home": "Your home timeline is empty! Follow more people to fill it up. {suggestions}",
-  "empty_column.list": "There is nothing in this list yet. When members of this list post new statuses, they will appear here.",
-  "empty_column.lists": "Dar neturite jokių sąrašų. Kai jį sukursite, jis bus rodomas čia.",
-  "empty_column.mutes": "Dar nesate nutildę nė vieno naudotojo.",
-  "empty_column.notifications": "Dar neturite jokių pranešimų. Kai kiti žmonės su jumis bendraus, matysite tai čia.",
-  "empty_column.public": "Čia nieko nėra! Parašykite ką nors viešai arba rankiniu būdu sekite naudotojus iš kitų serverių, kad jį užpildytumėte",
-  "error.unexpected_crash.explanation": "Dėl mūsų kodo klaidos arba naršyklės suderinamumo problemos šis puslapis negalėjo būti rodomas teisingai.",
-  "error.unexpected_crash.explanation_addons": "Šį puslapį nepavyko teisingai parodyti. Šią klaidą greičiausiai sukėlė naršyklės priedas arba automatinio vertimo įrankiai.",
-  "error.unexpected_crash.next_steps": "Pabandykite atnaujinti puslapį. Jei tai nepadeda, galbūt vis dar galėsite naudotis \"Mastodon\" naudodami kitą naršyklę arba vietinę programėlę.",
-  "error.unexpected_crash.next_steps_addons": "Pabandykite juos išjungti ir atnaujinti puslapį. Jei tai nepadeda, galbūt vis dar galėsite naudotis \"Mastodon\" naudodami kitą naršyklę arba vietinę programėlę.",
-  "errors.unexpected_crash.report_issue": "Pranešti apie triktį",
+  "empty_column.home": "Tavo pagrindinio laiko skalė tuščia! Sek daugiau žmonių, kad ją užpildytum.",
+  "empty_column.list": "Nėra nieko šiame sąraše kol kas. Kai šio sąrašo nariai paskelbs naujų įrašų, jie bus rodomi čia.",
+  "empty_column.lists": "Dar neturi jokių sąrašų. Kai jį sukursi, jis bus rodomas čia.",
+  "empty_column.mutes": "Dar nesi nutildęs (-usi) nė vieno naudotojo.",
+  "empty_column.notifications": "Dar neturi jokių pranešimų. Kai kiti žmonės su tavimi bendraus, matysi tai čia.",
+  "empty_column.public": "Čia nieko nėra! Parašyk ką nors viešai arba rankiniu būdu sek naudotojus iš kitų serverių, kad jį užpildytum.",
+  "error.unexpected_crash.explanation": "Dėl mūsų kodo riktos arba naršyklės suderinamumo problemos šis puslapis negalėjo būti rodomas teisingai.",
+  "error.unexpected_crash.explanation_addons": "Šį puslapį nepavyko parodyti teisingai. Šią klaidą greičiausiai sukėlė naršyklės priedas arba automatinio vertimo įrankiai.",
+  "error.unexpected_crash.next_steps": "Pabandyk atnaujinti puslapį. Jei tai nepadeda, galbūt vis dar galėsi naudotis Mastodon per kitą naršyklę arba savąją programėlę.",
+  "error.unexpected_crash.next_steps_addons": "Pabandyk juos išjungti ir atnaujinti puslapį. Jei tai nepadeda, galbūt vis dar galėsi naudotis Mastodon per kitą naršyklę arba savąją programėlę.",
+  "errors.unexpected_crash.copy_stacktrace": "Kopijuoti dėklo eigą į iškarpinę",
+  "errors.unexpected_crash.report_issue": "Pranešti apie problemą",
   "explore.search_results": "Paieškos rezultatai",
   "explore.suggested_follows": "Žmonės",
   "explore.title": "Naršyti",
   "explore.trending_links": "Naujienos",
   "explore.trending_statuses": "Įrašai",
   "explore.trending_tags": "Saitažodžiai",
-  "filter_modal.added.context_mismatch_explanation": "Ši filtro kategorija netaikoma kontekste, kuriame peržiūrėjote šį pranešimą. Jei norite, kad pranešimas būtų filtruojamas ir šiame kontekste, turėsite redaguoti filtrą.",
-  "filter_modal.added.context_mismatch_title": "Konteksto neatitikimas!",
-  "filter_modal.added.expired_explanation": "Ši filtro kategorija nustojo galioti, kad ji būtų taikoma, turėsite pakeisti galiojimo datą.",
-  "filter_modal.added.expired_title": "Pasibaigė filtro galiojimo laikas!",
-  "filter_modal.added.review_and_configure": "Norėdami peržiūrėti ir toliau konfigūruoti šią filtro kategoriją, eikite į {settings_link}.",
-  "filter_modal.added.review_and_configure_title": "Filtro nuostatos",
+  "filter_modal.added.context_mismatch_explanation": "Ši filtro kategorija netaikoma kontekstui, kuriame peržiūrėjai šį įrašą. Jei nori, kad įrašas būtų filtruojamas ir šiame kontekste, turėsi redaguoti filtrą.",
+  "filter_modal.added.context_mismatch_title": "Konteksto neatitikimas.",
+  "filter_modal.added.expired_explanation": "Ši filtro kategorija nustojo galioti. Kad ji būtų taikoma, turėsi pakeisti galiojimo datą.",
+  "filter_modal.added.expired_title": "Baigėsi filtro galiojimas.",
+  "filter_modal.added.review_and_configure": "Norint peržiūrėti ir toliau konfigūruoti šią filtro kategoriją, eik į nuorodą {settings_link}.",
+  "filter_modal.added.review_and_configure_title": "Filtro nustatymai",
   "filter_modal.added.settings_link": "nustatymų puslapis",
-  "filter_modal.added.short_explanation": "Šis pranešimas buvo įtrauktas į šią filtro kategoriją: {title}.",
-  "filter_modal.added.title": "Pridėtas filtras!",
-  "filter_modal.select_filter.context_mismatch": "netaikoma šiame kontekste",
-  "filter_modal.select_filter.expired": "nebegalioja",
+  "filter_modal.added.short_explanation": "Šis įrašas buvo pridėtas į šią filtro kategoriją: {title}.",
+  "filter_modal.added.title": "Pridėtas filtras.",
+  "filter_modal.select_filter.context_mismatch": "netaikoma šiame kontekste.",
+  "filter_modal.select_filter.expired": "nebegalioja.",
   "filter_modal.select_filter.prompt_new": "Nauja kategorija: {name}",
   "filter_modal.select_filter.search": "Ieškoti arba sukurti",
-  "filter_modal.select_filter.subtitle": "Naudoti esamą kategoriją arba sukurti naują",
+  "filter_modal.select_filter.subtitle": "Naudok esamą kategoriją arba sukurk naują.",
   "filter_modal.select_filter.title": "Filtruoti šį įrašą",
-  "filter_modal.title.status": "Filtruoti šį įrašą",
+  "filter_modal.title.status": "Filtruoti įrašą",
   "firehose.all": "Visi",
   "firehose.local": "Šis serveris",
   "firehose.remote": "Kiti serveriai",
-  "follow_request.authorize": "Autorizuoti",
+  "follow_request.authorize": "Leisti",
   "follow_request.reject": "Atmesti",
-  "follow_requests.unlocked_explanation": "Nors tavo paskyra neužrakinta, {domain} personalas mano, kad galbūt norėsi rankiniu būdu patikrinti šių paskyrų sekimo užklausas.",
+  "follow_requests.unlocked_explanation": "Nors tavo paskyra neužrakinta, {domain} personalas mano, kad galbūt norėsi rankiniu būdu patikrinti šių paskyrų sekimo prašymus.",
   "follow_suggestions.curated_suggestion": "Personalo pasirinkimai",
   "follow_suggestions.dismiss": "Daugiau nerodyti",
-  "follow_suggestions.hints.friends_of_friends": "Šis profilis yra populiarus tarp žmonių, kuriuos sekei.",
+  "follow_suggestions.hints.featured": "Šį profilį atrinko {domain} komanda.",
+  "follow_suggestions.hints.friends_of_friends": "Šis profilis yra populiarus tarp žmonių, kuriuos seki.",
   "follow_suggestions.hints.most_followed": "Šis profilis yra vienas iš labiausiai sekamų {domain}.",
   "follow_suggestions.hints.most_interactions": "Pastaruoju metu šis profilis sulaukia daug dėmesio šiame {domain}.",
   "follow_suggestions.hints.similar_to_recently_followed": "Šis profilis panašus į profilius, kuriuos neseniai sekei.",
@@ -279,7 +288,7 @@
   "follow_suggestions.popular_suggestion": "Populiarus pasiūlymas",
   "follow_suggestions.view_all": "Peržiūrėti viską",
   "follow_suggestions.who_to_follow": "Ką sekti",
-  "followed_tags": "Sekamos saitažodžiai",
+  "followed_tags": "Sekami saitažodžiai",
   "footer.about": "Apie",
   "footer.directory": "Profilių katalogas",
   "footer.get_app": "Gauti programėlę",
@@ -289,214 +298,243 @@
   "footer.source_code": "Peržiūrėti šaltinio kodą",
   "footer.status": "Būsena",
   "generic.saved": "Išsaugoti",
-  "getting_started.heading": "Pradedant",
+  "getting_started.heading": "Kaip pradėti",
   "hashtag.column_header.tag_mode.all": "ir {additional}",
   "hashtag.column_header.tag_mode.any": "ar {additional}",
   "hashtag.column_header.tag_mode.none": "be {additional}",
-  "hashtag.column_settings.select.no_options_message": "Pasiūlymų nerasta",
-  "hashtag.column_settings.select.placeholder": "Įvesti grotažymes…",
+  "hashtag.column_settings.select.no_options_message": "Pasiūlymų nerasta.",
+  "hashtag.column_settings.select.placeholder": "Įvesti saitažodžius…",
   "hashtag.column_settings.tag_mode.all": "Visi šie",
-  "hashtag.column_settings.tag_mode.any": "Bet kuris šių",
+  "hashtag.column_settings.tag_mode.any": "Bet kuris iš šių",
   "hashtag.column_settings.tag_mode.none": "Nė vienas iš šių",
-  "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
-  "hashtag.counter_by_accounts": "{count, plural,one {{counter} dalyvis}other {{counter} dalyviai}}",
-  "hashtag.counter_by_uses": "{count, plural, one {{counter} įrašas} other {{counter} įrašų}}",
-  "hashtag.counter_by_uses_today": "{count, plural, one {{counter} įrašas} other {{counter} įrašų}} šiandien",
-  "hashtag.follow": "Sekti grotažymę",
-  "hashtag.unfollow": "Nesekti grotažymės",
-  "hashtags.and_other": "…ir{count, plural,other {#daugiau}}",
-  "home.column_settings.basic": "Pagrindinis",
-  "home.column_settings.show_reblogs": "Rodyti \"boosts\"",
+  "hashtag.column_settings.tag_toggle": "Įtraukti papildomas šio stulpelio žymes",
+  "hashtag.counter_by_accounts": "{count, plural, one {{counter} dalyvis} few {{counter} dalyviai} many {{counter} dalyvio} other {{counter} dalyvių}}",
+  "hashtag.counter_by_uses": "{count, plural, one {{counter} įrašas} few {{counter} įrašai} many {{counter} įrašo} other {{counter} įrašų}}",
+  "hashtag.counter_by_uses_today": "{count, plural, one {{counter} įrašas} few {{counter} įrašai} many {{counter} įrašo} other {{counter} įrašų}} šiandien",
+  "hashtag.follow": "Sekti saitažodį",
+  "hashtag.unfollow": "Nebesekti saitažodį",
+  "hashtags.and_other": "…ir {count, plural, one {# daugiau} few {# daugiau} many {# daugiau}other {# daugiau}}",
+  "home.column_settings.basic": "Paprastas",
+  "home.column_settings.show_reblogs": "Rodyti pakėlimus",
   "home.column_settings.show_replies": "Rodyti atsakymus",
   "home.hide_announcements": "Slėpti skelbimus",
-  "home.pending_critical_update.link": "Žiūrėti atnaujinimus",
-  "home.pending_critical_update.title": "Galimas kritinis saugumo atnaujinimas!",
+  "home.pending_critical_update.body": "Kuo greičiau atnaujink savo Mastodon serverį!",
+  "home.pending_critical_update.link": "Žiūrėti naujinimus",
+  "home.pending_critical_update.title": "Galimas kritinis saugumo naujinimas.",
+  "home.show_announcements": "Rodyti skelbimus",
+  "interaction_modal.description.favourite": "Su Mastodon paskyra gali pamėgti šį įrašą, kad autorius (-ė) žinotų, jog vertinti tai ir išsaugoti jį vėliau.",
+  "interaction_modal.description.follow": "Su Mastodon paskyra gali sekti {name}, kad gautum jų įrašus į pagrindinį srautą.",
+  "interaction_modal.description.reblog": "Su Mastodon paskyra gali pakelti šią įrašą ir pasidalyti juo su savo sekėjais.",
+  "interaction_modal.description.reply": "Su Mastodon paskyra gali atsakyti į šį įrašą.",
+  "interaction_modal.login.action": "Į pagrindinį puslapį",
+  "interaction_modal.login.prompt": "Tavo pagrindinio serverio domenas, pvz., mastodon.social.",
   "interaction_modal.no_account_yet": "Nesi Mastodon?",
   "interaction_modal.on_another_server": "Kitame serveryje",
   "interaction_modal.on_this_server": "Šiame serveryje",
-  "interaction_modal.sign_in": "Nesi prisijungęs (-usi) prie šio serverio. Kur yra laikoma tavo paskyra?",
+  "interaction_modal.sign_in": "Nesi prisijungęs (-usi) prie šio serverio. Kur yra talpinama tavo paskyra?",
   "interaction_modal.sign_in_hint": "Patarimas: tai svetainė, kurioje užsiregistravai. Jei neprisimeni, ieškok sveikinimo el. laiško savo pašto dėžutėje. Taip pat gali įvesti visą savo naudotojo vardą (pvz., @Mastodon@mastodon.social).",
-  "interaction_modal.title.favourite": "Mėgstamiausias {name} įrašas",
+  "interaction_modal.title.favourite": "Pamėgti {name} įrašą",
   "interaction_modal.title.follow": "Sekti {name}",
-  "keyboard_shortcuts.back": "to navigate back",
-  "keyboard_shortcuts.blocked": "to open blocked users list",
-  "keyboard_shortcuts.boost": "to boost",
-  "keyboard_shortcuts.column": "to focus a status in one of the columns",
-  "keyboard_shortcuts.compose": "to focus the compose textarea",
-  "keyboard_shortcuts.direct": "to open direct messages column",
-  "keyboard_shortcuts.down": "to move down in the list",
-  "keyboard_shortcuts.enter": "to open status",
-  "keyboard_shortcuts.federated": "to open federated timeline",
-  "keyboard_shortcuts.heading": "Keyboard Shortcuts",
-  "keyboard_shortcuts.home": "to open home timeline",
+  "interaction_modal.title.reblog": "Pakelti {name} įrašą",
+  "interaction_modal.title.reply": "Atsakyti į {name} įrašą",
+  "intervals.full.days": "{number, plural, one {# diena} few {# dienos} many {# dienos} other {# dienų}}",
+  "intervals.full.hours": "{number, plural, one {# valanda} few {# valandos} many {# valandos} other {# valandų}}",
+  "intervals.full.minutes": "{number, plural, one {# minutė} few {# minutes} many {# minutės} other {# minučių}}",
+  "keyboard_shortcuts.back": "Naršyti atgal",
+  "keyboard_shortcuts.blocked": "Atidaryti užblokuotų naudotojų sąrašą",
+  "keyboard_shortcuts.boost": "Pakelti įrašą",
+  "keyboard_shortcuts.column": "Fokusuoti stulpelį",
+  "keyboard_shortcuts.compose": "Fokusuoti rengykles teksto sritį",
+  "keyboard_shortcuts.description": "Aprašymas",
+  "keyboard_shortcuts.direct": "atidaryti privačių paminėjimų stulpelį",
+  "keyboard_shortcuts.down": "Perkelti žemyn sąraše",
+  "keyboard_shortcuts.enter": "Atidaryti įrašą",
+  "keyboard_shortcuts.favourite": "Pamėgti įrašą",
+  "keyboard_shortcuts.favourites": "Atidaryti mėgstamųjų sąrašą",
+  "keyboard_shortcuts.federated": "Atidaryti federacinę laiko skalę",
+  "keyboard_shortcuts.heading": "Spartieji klavišai",
+  "keyboard_shortcuts.home": "Atidaryti pagrindinį laiko skalę",
   "keyboard_shortcuts.hotkey": "Spartusis klavišas",
-  "keyboard_shortcuts.legend": "to display this legend",
-  "keyboard_shortcuts.local": "to open local timeline",
-  "keyboard_shortcuts.mention": "to mention author",
-  "keyboard_shortcuts.muted": "to open muted users list",
-  "keyboard_shortcuts.my_profile": "to open your profile",
-  "keyboard_shortcuts.notifications": "to open notifications column",
+  "keyboard_shortcuts.legend": "Rodyti šią legendą",
+  "keyboard_shortcuts.local": "Atidaryti vietinę laiko skalę",
+  "keyboard_shortcuts.mention": "Paminėti autorių (-ę)",
+  "keyboard_shortcuts.muted": "Atidaryti nutildytų naudotojų sąrašą",
+  "keyboard_shortcuts.my_profile": "Atidaryti savo profilį",
+  "keyboard_shortcuts.notifications": "Atidaryti pranešimų stulpelį",
   "keyboard_shortcuts.open_media": "Atidaryti mediją",
-  "keyboard_shortcuts.pinned": "to open pinned toots list",
-  "keyboard_shortcuts.profile": "to open author's profile",
-  "keyboard_shortcuts.reply": "to reply",
-  "keyboard_shortcuts.requests": "to open follow requests list",
-  "keyboard_shortcuts.search": "to focus search",
-  "keyboard_shortcuts.spoilers": "to show/hide CW field",
-  "keyboard_shortcuts.start": "to open \"get started\" column",
-  "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
+  "keyboard_shortcuts.pinned": "Atidaryti prisegtų įrašų sąrašą",
+  "keyboard_shortcuts.profile": "Atidaryti autoriaus (-ės) profilį",
+  "keyboard_shortcuts.reply": "Atsakyti į įrašą",
+  "keyboard_shortcuts.requests": "Atidaryti sekimo prašymų sąrašą",
+  "keyboard_shortcuts.search": "Fokusuoti paieškos juostą",
+  "keyboard_shortcuts.spoilers": "Rodyti / slėpti TĮ lauką",
+  "keyboard_shortcuts.start": "Atidarykite stulpelį Kaip pradėti",
+  "keyboard_shortcuts.toggle_hidden": "Rodyti / slėpti tekstą po TĮ",
   "keyboard_shortcuts.toggle_sensitivity": "Rodyti / slėpti mediją",
-  "keyboard_shortcuts.toot": "to start a brand new toot",
-  "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
-  "keyboard_shortcuts.up": "to move up in the list",
+  "keyboard_shortcuts.toot": "Pradėti naują įrašą",
+  "keyboard_shortcuts.unfocus": "Nebefokusuoti rengykles teksto sritį / paiešką",
+  "keyboard_shortcuts.up": "Perkelti į viršų sąraše",
   "lightbox.close": "Uždaryti",
+  "lightbox.compress": "Suspausti vaizdo peržiūros langelį",
+  "lightbox.expand": "Išplėsti vaizdo peržiūros langelį",
   "lightbox.next": "Kitas",
   "lightbox.previous": "Ankstesnis",
   "limited_account_hint.action": "Vis tiek rodyti profilį",
-  "limited_account_hint.title": "Šį profilį paslėpė {domain} moderatoriai.",
+  "limited_account_hint.title": "Šį profilį paslėpė {domain} prižiūrėtojai.",
   "link_preview.author": "Sukūrė {name}",
   "lists.account.add": "Pridėti į sąrašą",
   "lists.account.remove": "Pašalinti iš sąrašo",
   "lists.delete": "Ištrinti sąrašą",
   "lists.edit": "Redaguoti sąrašą",
-  "lists.edit.submit": "Prierašo pakeitimas",
+  "lists.edit.submit": "Keisti pavadinimą",
+  "lists.exclusive": "Slėpti šiuos įrašus iš pagrindinio",
   "lists.new.create": "Pridėti sąrašą",
   "lists.new.title_placeholder": "Naujas sąrašo pavadinimas",
-  "lists.replies_policy.followed": "Bet kuris sekamas naudotojas",
-  "lists.replies_policy.list": "Sąrašo nariai",
-  "lists.replies_policy.none": "Nei vienas",
+  "lists.replies_policy.followed": "Bet kuriam sekamam naudotojui",
+  "lists.replies_policy.list": "Sąrašo nariams",
+  "lists.replies_policy.none": "Nei vienam",
   "lists.replies_policy.title": "Rodyti atsakymus:",
   "lists.search": "Ieškoti tarp sekamų žmonių",
-  "lists.subheading": "Jūsų sąrašai",
+  "lists.subheading": "Tavo sąrašai",
+  "load_pending": "{count, plural, one {# naujas elementas} few {# nauji elementai} many {# naujo elemento} other {# naujų elementų}}",
   "loading_indicator.label": "Kraunama…",
   "media_gallery.toggle_visible": "{number, plural, one {Slėpti vaizdą} few {Slėpti vaizdus} many {Slėpti vaizdo} other {Slėpti vaizdų}}",
-  "moved_to_account_banner.text": "Tavo paskyra {disabledAccount} šiuo metu yra išjungta, nes persikėlei į {movedToAccount}.",
+  "moved_to_account_banner.text": "Tavo paskyra {disabledAccount} šiuo metu išjungta, nes persikėlei į {movedToAccount}.",
   "mute_modal.duration": "Trukmė",
   "mute_modal.hide_notifications": "Slėpti šio naudotojo pranešimus?",
-  "mute_modal.indefinite": "Neribotas",
+  "mute_modal.indefinite": "Neribota",
   "navigation_bar.about": "Apie",
-  "navigation_bar.advanced_interface": "Atidarykite išplėstinę žiniatinklio sąsają",
+  "navigation_bar.advanced_interface": "Atidaryti išplėstinę žiniatinklio sąsają",
   "navigation_bar.blocks": "Užblokuoti naudotojai",
   "navigation_bar.bookmarks": "Žymės",
-  "navigation_bar.compose": "Compose new toot",
+  "navigation_bar.community_timeline": "Vietinė laiko skalė",
+  "navigation_bar.compose": "Sukurti naują įrašą",
   "navigation_bar.direct": "Privatūs paminėjimai",
   "navigation_bar.discover": "Atrasti",
-  "navigation_bar.domain_blocks": "Hidden domains",
+  "navigation_bar.domain_blocks": "Užblokuoti domenai",
   "navigation_bar.explore": "Naršyti",
-  "navigation_bar.favourites": "Mėgstamiausi",
-  "navigation_bar.filters": "Nutylėti žodžiai",
-  "navigation_bar.follow_requests": "Sekti prašymus",
-  "navigation_bar.followed_tags": "Sekti grotažymę",
+  "navigation_bar.favourites": "Mėgstami",
+  "navigation_bar.filters": "Nutildyti žodžiai",
+  "navigation_bar.follow_requests": "Sekimo prašymai",
+  "navigation_bar.followed_tags": "Sekami saitažodžiai",
   "navigation_bar.follows_and_followers": "Sekimai ir sekėjai",
   "navigation_bar.lists": "Sąrašai",
   "navigation_bar.logout": "Atsijungti",
-  "navigation_bar.mutes": "Užtildyti naudotojai",
+  "navigation_bar.mutes": "Nutildyti naudotojai",
   "navigation_bar.opened_in_classic_interface": "Įrašai, paskyros ir kiti konkretūs puslapiai pagal numatytuosius nustatymus atidaromi klasikinėje žiniatinklio sąsajoje.",
   "navigation_bar.personal": "Asmeninis",
-  "navigation_bar.pins": "Pinned toots",
+  "navigation_bar.pins": "Prisegti įrašai",
   "navigation_bar.preferences": "Nuostatos",
-  "navigation_bar.public_timeline": "Federuota laiko juosta",
+  "navigation_bar.public_timeline": "Federacinė laiko skalė",
   "navigation_bar.search": "Ieškoti",
   "navigation_bar.security": "Apsauga",
-  "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
-  "notification.admin.report": "{name} pranešė.{target}",
+  "not_signed_in_indicator.not_signed_in": "Norint pasiekti šį išteklį, reikia prisijungti.",
+  "notification.admin.report": "{name} pranešė {target}",
   "notification.admin.sign_up": "{name} užsiregistravo",
-  "notification.favourite": "{name} pamėgo jūsų įrašą",
-  "notification.follow": "{name} pradėjo jus sekti",
-  "notification.follow_request": "{name} nori tapti jūsų sekėju",
-  "notification.mention": "{name} paminėjo jus",
+  "notification.favourite": "{name} pamėgo tavo įrašą",
+  "notification.follow": "{name} seka tave",
+  "notification.follow_request": "{name} paprašė tave sekti",
+  "notification.mention": "{name} paminėjo tave",
   "notification.own_poll": "Tavo apklausa baigėsi",
   "notification.poll": "Apklausa, kurioje balsavai, pasibaigė",
-  "notification.reblog": "{name} boosted your status",
+  "notification.reblog": "{name} pakėlė tavo įrašą",
   "notification.status": "{name} ką tik paskelbė",
   "notification.update": "{name} redagavo įrašą",
   "notifications.clear": "Išvalyti pranešimus",
   "notifications.clear_confirmation": "Ar tikrai nori visam laikui išvalyti visus pranešimus?",
-  "notifications.column_settings.admin.report": "Nauji ataskaitos:",
-  "notifications.column_settings.admin.sign_up": "Nauji prisiregistravimai:",
+  "notifications.column_settings.admin.report": "Naujos ataskaitos:",
+  "notifications.column_settings.admin.sign_up": "Naujos registracijos:",
   "notifications.column_settings.alert": "Darbalaukio pranešimai",
-  "notifications.column_settings.favourite": "Mėgstamiausi:",
+  "notifications.column_settings.favourite": "Mėgstami:",
   "notifications.column_settings.filter_bar.advanced": "Rodyti visas kategorijas",
-  "notifications.column_settings.filter_bar.category": "Greito filtro juosta",
+  "notifications.column_settings.filter_bar.category": "Spartaus filtro juosta",
   "notifications.column_settings.filter_bar.show_bar": "Rodyti filtro juostą",
   "notifications.column_settings.follow": "Nauji sekėjai:",
-  "notifications.column_settings.follow_request": "Nauji prašymai sekti:",
+  "notifications.column_settings.follow_request": "Nauji sekimo prašymai:",
   "notifications.column_settings.mention": "Paminėjimai:",
   "notifications.column_settings.poll": "Balsavimo rezultatai:",
-  "notifications.column_settings.push": "\"Push\" pranešimai",
+  "notifications.column_settings.push": "Stumdomieji pranešimai",
   "notifications.column_settings.reblog": "Pakėlimai:",
   "notifications.column_settings.show": "Rodyti stulpelyje",
   "notifications.column_settings.sound": "Paleisti garsą",
-  "notifications.column_settings.status": "New toots:",
+  "notifications.column_settings.status": "Nauji įrašai:",
   "notifications.column_settings.unread_notifications.category": "Neperskaityti pranešimai",
   "notifications.column_settings.unread_notifications.highlight": "Paryškinti neperskaitytus pranešimus",
   "notifications.column_settings.update": "Redagavimai:",
   "notifications.filter.all": "Visi",
-  "notifications.filter.boosts": "\"Boost\" kiekis",
-  "notifications.filter.favourites": "Mėgstamiausi",
+  "notifications.filter.boosts": "Pakėlimai",
+  "notifications.filter.favourites": "Mėgstami",
   "notifications.filter.follows": "Sekimai",
   "notifications.filter.mentions": "Paminėjimai",
   "notifications.filter.polls": "Balsavimo rezultatai",
-  "notifications.filter.statuses": "Atnaujinimai iš žmonių kuriuos sekate",
+  "notifications.filter.statuses": "Naujinimai iš žmonių, kuriuos seki",
   "notifications.grant_permission": "Suteikti leidimą.",
   "notifications.group": "{count} pranešimai",
   "notifications.mark_as_read": "Pažymėti kiekvieną pranešimą kaip perskaitytą",
-  "notifications.permission_denied": "Darbalaukio pranešimai nepasiekiami dėl anksčiau atmestos naršyklės leidimų užklausos",
-  "notifications.permission_denied_alert": "Negalima įjungti darbalaukio pranešimų, nes prieš tai naršyklės leidimas buvo atmestas",
-  "notifications.permission_required": "Darbalaukio pranešimai nepasiekiami, nes nesuteiktas reikiamas leidimas.",
+  "notifications.permission_denied": "Darbalaukio pranešimai nepasiekiami dėl anksčiau atmestos naršyklės leidimų užklausos.",
+  "notifications.permission_denied_alert": "Negalima įjungti darbalaukio pranešimų, nes prieš tai naršyklės leidimas buvo atmestas.",
+  "notifications.permission_required": "Darbalaukio pranešimai nepasiekiami, nes nebuvo suteiktas reikiamas leidimas.",
   "notifications_permission_banner.enable": "Įjungti darbalaukio pranešimus",
-  "notifications_permission_banner.how_to_control": "Jei norite gauti pranešimus, kai \"Mastodon\" nėra atidarytas, įjunkite darbalaukio pranešimus. Įjungę darbalaukio pranešimus, galite tiksliai valdyti, kokių tipų sąveikos generuoja darbalaukio pranešimus, naudodamiesi pirmiau esančiu mygtuku {icon}.",
-  "notifications_permission_banner.title": "Niekada nieko nepraleiskite",
-  "onboarding.action.back": "Gražinkite mane atgal",
-  "onboarding.actions.back": "Gražinkite mane atgal",
-  "onboarding.actions.go_to_explore": "See what's trending",
-  "onboarding.actions.go_to_home": "Go to your home feed",
+  "notifications_permission_banner.how_to_control": "Jei nori gauti pranešimus, kai Mastodon nėra atidarytas, įjunk darbalaukio pranešimus. Įjungęs (-usi) darbalaukio pranešimus, gali tiksliai valdyti, kokių tipų sąveikos generuoja darbalaukio pranešimus, naudojant pirmiau esančiu mygtuku {icon}.",
+  "notifications_permission_banner.title": "Niekada nieko nepraleisk",
+  "onboarding.action.back": "Grąžinti mane atgal",
+  "onboarding.actions.back": "Grąžinti mane atgal",
+  "onboarding.actions.go_to_explore": "Į tendencijų puslapį",
+  "onboarding.actions.go_to_home": "Į mano pagrindinį srautų puslapį",
   "onboarding.compose.template": "Sveiki #Mastodon!",
-  "onboarding.follows.empty": "Deja, šiuo metu jokių rezultatų parodyti negalima. Galite pabandyti naudoti paiešką arba naršyti atradimo puslapyje, kad surastumėte žmonių, kuriuos norite sekti, arba pabandyti vėliau.",
-  "onboarding.follows.lead": "You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!",
-  "onboarding.follows.title": "Popular on Mastodon",
+  "onboarding.follows.empty": "Deja, šiuo metu jokių rezultatų parodyti negalima. Gali pabandyti naudoti paiešką arba naršyti atradimo puslapį, kad surastum žmonių, kuriuos nori sekti, arba bandyti vėliau.",
+  "onboarding.follows.lead": "Tavo pagrindinis srautas – pagrindinis būdas patirti Mastodon. Kuo daugiau žmonių seksi, tuo jis bus aktyvesnis ir įdomesnis. Norint pradėti, pateikiame keletą pasiūlymų:",
+  "onboarding.follows.title": "Suasmenink savo pagrindinį srautą",
   "onboarding.profile.discoverable": "Padaryti mano profilį atrandamą",
-  "onboarding.profile.discoverable_hint": "Kai pasirenki Mastodon atrandamumą, tavo įrašai gali būti rodomi paieškos rezultatuose ir trendose, o profilis gali būti siūlomas panašių interesų turintiems žmonėms.",
+  "onboarding.profile.discoverable_hint": "Kai pasirenki Mastodon atrandamumą, tavo įrašai gali būti rodomi paieškos rezultatuose ir tendencijose, o profilis gali būti siūlomas panašių pomėgių turintiems žmonėms.",
   "onboarding.profile.display_name": "Rodomas vardas",
   "onboarding.profile.display_name_hint": "Tavo pilnas vardas arba linksmas vardas…",
   "onboarding.profile.lead": "Gali visada tai užbaigti vėliau nustatymuose, kur yra dar daugiau pritaikymo parinkčių.",
   "onboarding.profile.note": "Biografija",
   "onboarding.profile.note_hint": "Gali @paminėti kitus žmones arba #saitažodžius…",
   "onboarding.profile.save_and_continue": "Išsaugoti ir tęsti",
-  "onboarding.profile.title": "Profilio konfigūravimas",
+  "onboarding.profile.title": "Profilio sąranka",
   "onboarding.profile.upload_avatar": "Įkelti profilio nuotrauką",
   "onboarding.profile.upload_header": "Įkelti profilio antraštę",
-  "onboarding.share.lead": "Praneškite žmonėms, kaip jus rasti \"Mastodon\"!",
-  "onboarding.share.message": "Aš {username} #Mastodon! Ateik sekti manęs adresu {url}",
+  "onboarding.share.lead": "Leisk žmonėms sužinoti, kaip tave rasti Mastodon!",
+  "onboarding.share.message": "Aš {username}, esant #Mastodon! Ateik sekti manęs adresu {url}.",
   "onboarding.share.next_steps": "Galimi kiti žingsniai:",
-  "onboarding.share.title": "Bendrinkite savo profilį",
-  "onboarding.start.lead": "Dabar esi Mastodon dalis – unikalios decentralizuotos socialinės žiniasklaidos platformos, kurioje tu, o ne algoritmas, pats nustatai savo patirtį. Pradėkime tavo kelionę šioje naujoje socialinėje erdvėje:",
-  "onboarding.start.skip": "Want to skip right ahead?",
-  "onboarding.start.title": "Jums pavyko!",
-  "onboarding.steps.follow_people.body": "You curate your own feed. Lets fill it with interesting people.",
-  "onboarding.steps.follow_people.title": "Follow {count, plural, one {one person} other {# people}}",
-  "onboarding.steps.publish_status.body": "Say hello to the world.",
-  "onboarding.steps.publish_status.title": "Susikūrk savo pirmąjį įrašą",
-  "onboarding.steps.setup_profile.body": "Others are more likely to interact with you with a filled out profile.",
-  "onboarding.steps.setup_profile.title": "Customize your profile",
-  "onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
-  "onboarding.steps.share_profile.title": "Share your profile",
-  "picture_in_picture.restore": "Padėkite jį atgal",
-  "poll.closed": "Uždaryti",
+  "onboarding.share.title": "Bendrink savo profilį",
+  "onboarding.start.lead": "Dabar esi Mastodon dalis – unikalios decentralizuotos socialinės medijos platformos, kurioje tu, o ne algoritmas, pats nustatai savo patirtį. Pradėkime tavo kelionę šioje naujoje socialinėje erdvėje:",
+  "onboarding.start.skip": "Nereikia pagalbos pradėti?",
+  "onboarding.start.title": "Tau pavyko!",
+  "onboarding.steps.follow_people.body": "Sekti įdomius žmones – tai, kas yra Mastodon.",
+  "onboarding.steps.follow_people.title": "Suasmenink savo pagrindinį srautą",
+  "onboarding.steps.publish_status.body": "Sakyk labas pasauliui tekstu, nuotraukomis, vaizdo įrašais arba apklausomis {emoji}.",
+  "onboarding.steps.publish_status.title": "Sukūrk savo pirmąjį įrašą",
+  "onboarding.steps.setup_profile.body": "Padidink savo sąveiką turint išsamų profilį.",
+  "onboarding.steps.setup_profile.title": "Suasmenink savo profilį",
+  "onboarding.steps.share_profile.body": "Leisk draugams sužinoti, kaip tave rasti Mastodon.",
+  "onboarding.steps.share_profile.title": "Bendrink savo Mastodon profilį",
+  "onboarding.tips.2fa": "<strong>Ar žinojai?</strong> Savo paskyrą gali apsaugoti nustatęs (-usi) dviejų veiksnių tapatybės nustatymą paskyros nustatymuose. Jis veikia su bet kuria pasirinkta TOTP programėle, telefono numeris nebūtinas.",
+  "onboarding.tips.accounts_from_other_servers": "<strong>Ar žinojai?</strong> Kadangi Mastodon decentralizuotas, kai kurie profiliai, su kuriais susidursi, bus talpinami ne tavo, o kituose serveriuose. Ir vis tiek galėsi su jais sklandžiai bendrauti! Jų serveris yra antroje naudotojo vardo pusėje.",
+  "onboarding.tips.migration": "<strong>Ar žinojai?</strong> Jei manai, kad {domain} serveris ateityje tau netiks, gali persikelti į kitą Mastodon serverį neprarandant savo sekėjų. Gali net talpinti savo paties serverį.",
+  "onboarding.tips.verification": "<strong>Ar žinojai?</strong> Savo paskyrą gali patvirtinti pateikęs (-usi) nuorodą į Mastodon profilį savo interneto svetainėje ir pridėjęs (-usi) svetainę prie savo profilio. Nereikia jokių mokesčių ar dokumentų.",
+  "password_confirmation.exceeds_maxlength": "Slaptažodžio patvirtinimas viršija maksimalų slaptažodžio ilgį.",
+  "password_confirmation.mismatching": "Slaptažodžio patvirtinimas nesutampa.",
+  "picture_in_picture.restore": "Padėti jį atgal",
+  "poll.closed": "Uždaryta",
   "poll.refresh": "Atnaujinti",
   "poll.reveal": "Peržiūrėti rezultatus",
+  "poll.total_people": "{count, plural, one {# žmogus} few {# žmonės} many {# žmogus} other {# žmonių}}",
+  "poll.total_votes": "{count, plural, one {# balsas} few {# balsai} many {# balso} other {# balsų}}",
   "poll.vote": "Balsuoti",
   "poll.voted": "Tu balsavai už šį atsakymą",
   "poll.votes": "{votes, plural, one {# balsas} few {# balsai} many {# balso} other {# balsų}}",
   "poll_button.add_poll": "Pridėti apklausą",
-  "poll_button.remove_poll": "Šalinti apklausą",
-  "privacy.change": "Adjust status privacy",
+  "poll_button.remove_poll": "Pašalinti apklausą",
+  "privacy.change": "Keisti įrašo privatumą",
   "privacy.direct.long": "Visus, paminėtus įraše",
   "privacy.direct.short": "Konkretūs žmonės",
   "privacy.private.long": "Tik sekėjams",
   "privacy.private.short": "Sekėjai",
   "privacy.public.long": "Bet kas iš Mastodon ir ne Mastodon",
-  "privacy.public.short": "Viešas",
+  "privacy.public.short": "Vieša",
   "privacy.unlisted.additional": "Tai veikia lygiai taip pat, kaip ir vieša, tik įrašas nebus rodomas tiesioginiuose srautuose, saitažodžiose, naršyme ar Mastodon paieškoje, net jei esi įtraukęs (-usi) visą paskyrą.",
   "privacy.unlisted.long": "Mažiau algoritminių fanfarų",
   "privacy.unlisted.short": "Tyliai vieša",
@@ -504,8 +542,14 @@
   "privacy_policy.title": "Privatumo politika",
   "recommended": "Rekomenduojama",
   "refresh": "Atnaujinti",
-  "regeneration_indicator.label": "Kraunasi…",
+  "regeneration_indicator.label": "Kraunama…",
+  "regeneration_indicator.sublabel": "Ruošiamas tavo pagrindinis srautas!",
+  "relative_time.days": "{number} d.",
+  "relative_time.full.days": "prieš {number, plural, one {# dieną} few {# dienas} many {# dienos} other {# dienų}}",
+  "relative_time.full.hours": "prieš {number, plural, one {# valandą} few {# valandas} many {# valandos} other {# valandų}}",
   "relative_time.full.just_now": "ką tik",
+  "relative_time.full.minutes": "prieš {number, plural, one {# minutę} few {# minutes} many {# minutės} other {# minučių}}",
+  "relative_time.full.seconds": "prieš {number, plural, one {# sekundę} few {# sekundes} many {# sekundės} other {# sekundžių}}",
   "relative_time.hours": "{number} val.",
   "relative_time.just_now": "dabar",
   "relative_time.minutes": "{number} min.",
@@ -515,15 +559,20 @@
   "reply_indicator.cancel": "Atšaukti",
   "reply_indicator.poll": "Apklausa",
   "report.block": "Blokuoti",
-  "report.categories.legal": "Legalus",
+  "report.block_explanation": "Jų įrašų nematysi. Jie negalės matyti tavo įrašų ar sekti tavęs. Jie galės pamatyti, kad yra užblokuoti.",
+  "report.categories.legal": "Teisinės",
   "report.categories.other": "Kita",
   "report.categories.spam": "Šlamštas",
   "report.categories.violation": "Turinys pažeidžia vieną ar daugiau serverio taisyklių",
-  "report.category.subtitle": "Pasirinkite tinkamiausią variantą",
+  "report.category.subtitle": "Pasirink geriausią atitikmenį.",
+  "report.category.title": "Papasakok mums, kas vyksta su šiuo {type}",
   "report.category.title_account": "profilis",
   "report.category.title_status": "įrašas",
   "report.close": "Atlikta",
-  "report.comment.title": "Ar yra dar kas nors, ką, jūsų manymu, turėtume žinoti?",
+  "report.comment.title": "Ar yra dar kas nors, ką, tavo manymu, turėtume žinoti?",
+  "report.forward": "Persiųsti į {target}",
+  "report.forward_hint": "Paskyra yra iš kito serverio. Siųsti anoniminę šios ataskaitos kopiją ir ten?",
+  "report.mute": "Nutildyti",
   "report.mute_explanation": "Jų įrašų nematysi. Jie vis tiek gali tave sekti ir matyti įrašus, bet nežinos, kad jie nutildyti.",
   "report.next": "Tęsti",
   "report.placeholder": "Papildomi komentarai",
@@ -532,41 +581,42 @@
   "report.reasons.legal": "Tai nelegalu",
   "report.reasons.legal_description": "Manai, kad tai pažeidžia tavo arba serverio šalies įstatymus",
   "report.reasons.other": "Tai kažkas kita",
-  "report.reasons.other_description": "Šis klausimas neatitinka kitų kategorijų",
+  "report.reasons.other_description": "Problema netinka kitoms kategorijoms",
   "report.reasons.spam": "Tai šlamštas",
   "report.reasons.spam_description": "Kenkėjiškos nuorodos, netikras įsitraukimas arba pasikartojantys atsakymai",
   "report.reasons.violation": "Tai pažeidžia serverio taisykles",
   "report.reasons.violation_description": "Žinai, kad tai pažeidžia konkrečias taisykles",
-  "report.rules.subtitle": "Pasirink viską, kas tinka",
+  "report.rules.subtitle": "Pasirink viską, kas tinka.",
   "report.rules.title": "Kokios taisyklės pažeidžiamos?",
-  "report.statuses.subtitle": "Pasirinkti viską, kas tinka",
-  "report.statuses.title": "Ar yra kokių nors įrašų, patvirtinančių šį pranešimą?",
+  "report.statuses.subtitle": "Pasirink viską, kas tinka.",
+  "report.statuses.title": "Ar yra kokių nors įrašų, patvirtinančių šį ataskaitą?",
   "report.submit": "Pateikti",
-  "report.target": "Report {target}",
-  "report.thanks.take_action": "Čia pateikiamos galimybės kontroliuoti, ką matote \"Mastodon\":",
-  "report.thanks.take_action_actionable": "Kol tai peržiūrėsime, galite imtis veiksmų prieš @{name}:",
-  "report.thanks.title": "Nenorite to matyti?",
-  "report.thanks.title_actionable": "Ačiū, kad pranešėte, mes tai išnagrinėsime.",
+  "report.target": "Pranešama apie {target}",
+  "report.thanks.take_action": "Štai parinktys, kaip kontroliuoti, ką matai Mastodon:",
+  "report.thanks.take_action_actionable": "Kol peržiūrėsime, gali imtis veiksmų prieš {name}:",
+  "report.thanks.title": "Nenori to matyti?",
+  "report.thanks.title_actionable": "Ačiū, kad pranešei, mes tai išnagrinėsime.",
   "report.unfollow": "Nebesekti @{name}",
-  "report.unfollow_explanation": "Jūs sekate šią paskyrą. Norėdami nebematyti jų įrašų savo pagrindiniame kanale, panaikinkite jų sekimą.",
-  "report_notification.attached_statuses": "{count, plural, one {# post} other {# posts}} attached",
-  "report_notification.categories.legal": "Legalus",
+  "report.unfollow_explanation": "Tu seki šią paskyrą. Jei nori nebematyti jų įrašų savo pagrindiniame sraute, nebesek jų.",
+  "report_notification.attached_statuses": "Pridėti {count, plural, one {{count} įrašas} few {{count} įrašai} many {{count} įrašo} other {{count} įrašų}}",
+  "report_notification.categories.legal": "Teisinės",
   "report_notification.categories.other": "Kita",
   "report_notification.categories.spam": "Šlamštas",
   "report_notification.categories.violation": "Taisyklės pažeidimas",
-  "search.no_recent_searches": "Paieškos įrašų nėra",
+  "report_notification.open": "Atidaryti ataskaitą",
+  "search.no_recent_searches": "Nėra naujausių paieškų.",
   "search.placeholder": "Paieška",
   "search.quick_action.account_search": "Profiliai, atitinkantys {x}",
   "search.quick_action.go_to_account": "Eiti į profilį {x}",
-  "search.quick_action.go_to_hashtag": "Eiti į hashtag {x}",
+  "search.quick_action.go_to_hashtag": "Eiti į saitažodį {x}",
   "search.quick_action.open_url": "Atidaryti URL adresą Mastodon",
   "search.quick_action.status_search": "Pranešimai, atitinkantys {x}",
-  "search.search_or_paste": "Ieškok arba įklijuok URL",
+  "search.search_or_paste": "Ieškoti arba įklijuoti URL",
   "search_popout.full_text_search_disabled_message": "Nepasiekima {domain}.",
   "search_popout.full_text_search_logged_out_message": "Pasiekiama tik prisijungus.",
   "search_popout.language_code": "ISO kalbos kodas",
   "search_popout.options": "Paieškos nustatymai",
-  "search_popout.quick_actions": "Greiti veiksmai",
+  "search_popout.quick_actions": "Spartūs veiksmai",
   "search_popout.recent": "Naujausios paieškos",
   "search_popout.specific_date": "konkreti data",
   "search_popout.user": "naudotojas",
@@ -575,23 +625,25 @@
   "search_results.hashtags": "Saitažodžiai",
   "search_results.nothing_found": "Nepavyko rasti nieko pagal šiuos paieškos terminus.",
   "search_results.see_all": "Žiūrėti viską",
-  "search_results.statuses": "Toots",
+  "search_results.statuses": "Įrašai",
   "search_results.title": "Ieškoti {q}",
   "server_banner.about_active_users": "Žmonės, kurie naudojosi šiuo serveriu per pastarąsias 30 dienų (mėnesio aktyvūs naudotojai)",
   "server_banner.active_users": "aktyvūs naudotojai",
   "server_banner.administered_by": "Administruoja:",
-  "server_banner.introduction": "{domain} yra decentralizuoto socialinio tinklo, kurį valdo {mastodon}, dalis.",
+  "server_banner.introduction": "{domain} – decentralizuoto socialinio tinklo dalis, kurį palaiko {mastodon}.",
   "server_banner.learn_more": "Sužinoti daugiau",
   "server_banner.server_stats": "Serverio statistika:",
   "sign_in_banner.create_account": "Sukurti paskyrą",
   "sign_in_banner.sign_in": "Prisijungimas",
-  "sign_in_banner.sso_redirect": "Prisijungti arba Registruotis",
+  "sign_in_banner.sso_redirect": "Prisijungti arba užsiregistruoti",
   "sign_in_banner.text": "Prisijunk, kad galėtum sekti profilius arba saitažodžius, mėgsti, bendrinti ir atsakyti į įrašus. Taip pat gali bendrauti iš savo paskyros kitame serveryje.",
-  "status.admin_account": "Atvira moderavimo sąsaja @{name}",
-  "status.admin_domain": "Atvira moderavimo sąsaja {domain}",
-  "status.admin_status": "Open this status in the moderation interface",
+  "status.admin_account": "Atidaryti prižiūrėjimo sąsają @{name}",
+  "status.admin_domain": "Atidaryti prižiūrėjimo sąsają {domain}",
+  "status.admin_status": "Atidaryti šį įrašą prižiūrėjimo sąsajoje",
   "status.block": "Blokuoti @{name}",
-  "status.bookmark": "Žymė",
+  "status.bookmark": "Pridėti į žymės",
+  "status.cancel_reblog_private": "Nebepakelti",
+  "status.cannot_reblog": "Šis įrašas negali būti pakeltas.",
   "status.copy": "Kopijuoti nuorodą į įrašą",
   "status.delete": "Ištrinti",
   "status.detailed_status": "Išsami pokalbio peržiūra",
@@ -599,15 +651,15 @@
   "status.direct_indicator": "Privatus paminėjimas",
   "status.edit": "Redaguoti",
   "status.edited": "Redaguota {date}",
-  "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
-  "status.embed": "Įterptas",
-  "status.favourite": "Mėgstamiausias",
+  "status.edited_x_times": "Redaguota {count, plural, one {{count} kartą} few {{count} kartus} many {{count} karto} other {{count} kartų}}",
+  "status.embed": "Įterpti",
+  "status.favourite": "Pamėgti",
   "status.filter": "Filtruoti šį įrašą",
   "status.filtered": "Filtruota",
   "status.hide": "Slėpti įrašą",
-  "status.history.created": "{name} sukurtas {date}",
-  "status.history.edited": "{name} redaguotas {date}",
-  "status.load_more": "Pakrauti daugiau",
+  "status.history.created": "{name} sukurta {date}",
+  "status.history.edited": "{name} redaguota {date}",
+  "status.load_more": "Krauti daugiau",
   "status.media.open": "Spausk, kad atidaryti",
   "status.media.show": "Spausk, kad matyti",
   "status.media_hidden": "Paslėpta medija",
@@ -615,15 +667,20 @@
   "status.more": "Daugiau",
   "status.mute": "Nutildyti @{name}",
   "status.mute_conversation": "Nutildyti pokalbį",
-  "status.open": "Expand this status",
+  "status.open": "Išplėsti šį įrašą",
   "status.pin": "Prisegti prie profilio",
   "status.pinned": "Prisegtas įrašas",
   "status.read_more": "Skaityti daugiau",
-  "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
-  "status.redraft": "Ištrinti ir iš naujo parengti juodraštį",
+  "status.reblog": "Pakelti",
+  "status.reblog_private": "Pakelti su originaliu matomumu",
+  "status.reblogged_by": "{name} pakėlė",
+  "status.reblogs.empty": "Šio įrašo dar niekas nepakėlė. Kai kas nors tai padarys, jie bus rodomi čia.",
+  "status.redraft": "Ištrinti ir parengti iš naujo",
+  "status.remove_bookmark": "Pašalinti žymę",
+  "status.replied_to": "Atsakyta į {name}",
   "status.reply": "Atsakyti",
   "status.replyAll": "Atsakyti į giją",
-  "status.report": "Pranešti @{name}",
+  "status.report": "Pranešti apie @{name}",
   "status.sensitive_warning": "Jautrus turinys",
   "status.share": "Bendrinti",
   "status.show_filter_reason": "Rodyti vis tiek",
@@ -632,37 +689,62 @@
   "status.show_more": "Rodyti daugiau",
   "status.show_more_all": "Rodyti daugiau visiems",
   "status.show_original": "Rodyti originalą",
-  "status.title.with_attachments": "{user}{attachmentCount, plural, one {priedas} few {{attachmentCount} priedai} many {{attachmentCount} priedo} other {{attachmentCount} priedų}}",
+  "status.title.with_attachments": "{user} paskelbė {attachmentCount, plural, one {priedą} few {{attachmentCount} priedus} many {{attachmentCount} priedo} other {{attachmentCount} priedų}}",
   "status.translate": "Versti",
-  "status.translated_from_with": "Išversta iš {lang} naudojant {provider}",
-  "status.uncached_media_warning": "Peržiūra nepasiekiama",
-  "subscribed_languages.lead": "Po pakeitimo tavo pagrindinėje ir sąrašo laiko juostose bus rodomi tik įrašai pasirinktomis kalbomis. Jei nori gauti įrašus visomis kalbomis, pasirink nė vieno.",
-  "tabs_bar.home": "Pradžia",
+  "status.translated_from_with": "Išversta iš {lang} naudojant {provider}.",
+  "status.uncached_media_warning": "Peržiūra nepasiekiama.",
+  "status.unmute_conversation": "Atšaukti pokalbio nutildymą",
+  "status.unpin": "Atsegti iš profilio",
+  "subscribed_languages.lead": "Po pakeitimo tavo pagrindinėje ir sąrašo laiko skalėje bus rodomi tik įrašai pasirinktomis kalbomis. Jei nori gauti įrašus visomis kalbomis, pasirink nė vieno.",
+  "subscribed_languages.save": "Išsaugoti pakeitimus",
+  "subscribed_languages.target": "Keisti prenumeruojamas kalbas {target}",
+  "tabs_bar.home": "Pagrindinis",
   "tabs_bar.notifications": "Pranešimai",
-  "time_remaining.days": "Liko {number, plural, one {# diena} few {# dienos} many {# dieno} other {# dienų}}",
-  "timeline_hint.remote_resource_not_displayed": "{resource} iš kitų serverių nerodomas.",
+  "time_remaining.days": "liko {number, plural, one {# diena} few {# dienos} many {# dienos} other {# dienų}}",
+  "time_remaining.hours": "liko {number, plural, one {# valanda} few {# valandos} many {# valandos} other {# valandų}}",
+  "time_remaining.minutes": "liko {number, plural, one {# minutė} few {# minutės} many {# minutės} other {# minučių}}",
+  "time_remaining.moments": "liko akimirkos",
+  "time_remaining.seconds": "liko {number, plural, one {# sekundė} few {# sekundės} many {# sekundės} other {# sekundžių}}",
+  "timeline_hint.remote_resource_not_displayed": "{resource} iš kitų serverių nerodomi.",
   "timeline_hint.resources.followers": "Sekėjai",
   "timeline_hint.resources.follows": "Seka",
   "timeline_hint.resources.statuses": "Senesni įrašai",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {# days}}",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} žmogus} few {{counter} žmonės} many {{counter} žmogus} other {{counter} žmonių}} per {days, plural, one {dieną} few {{days} dienas} many {{days} dienas} other {{days} dienų}}",
+  "trends.trending_now": "Tendencinga dabar",
   "ui.beforeunload": "Jei paliksi Mastodon, tavo juodraštis bus prarastas.",
+  "units.short.billion": "{count} mlrd.",
+  "units.short.million": "{count} mln.",
   "units.short.thousand": "{count} tūkst.",
-  "upload_form.audio_description": "Describe for people with hearing loss",
-  "upload_form.description": "Describe for the visually impaired",
+  "upload_area.title": "Nuvilk, kad įkeltum",
+  "upload_button.label": "Pridėti vaizdų, vaizdo įrašą arba garso failą",
+  "upload_error.limit": "Viršyta failo įkėlimo riba.",
+  "upload_error.poll": "Failų įkėlimas neleidžiamas su apklausomis.",
+  "upload_form.audio_description": "Aprašyk žmonėms, kurie yra kurtieji ar neprigirdintys.",
+  "upload_form.description": "Aprašyk žmonėms, kurie yra aklieji arba silpnaregiai.",
   "upload_form.edit": "Redaguoti",
-  "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
+  "upload_form.thumbnail": "Keisti miniatiūrą",
+  "upload_form.video_description": "Aprašyk žmonėms, kurie yra kurtieji, neprigirdintys, aklieji ar silpnaregiai.",
+  "upload_modal.analyzing_picture": "Analizuojamas vaizdas…",
+  "upload_modal.apply": "Taikyti",
+  "upload_modal.applying": "Pritaikoma…",
   "upload_modal.choose_image": "Pasirinkti vaizdą",
   "upload_modal.description_placeholder": "Greita rudoji lapė peršoka tinginį šunį",
+  "upload_modal.detect_text": "Aptikti tekstą iš nuotraukos",
   "upload_modal.edit_media": "Redaguoti mediją",
+  "upload_modal.hint": "Spustelėk arba nuvilk apskritimą peržiūroje, kad pasirinktum centrinį tašką, kuris visada bus matomas visose miniatiūrose.",
+  "upload_modal.preparing_ocr": "Rengimas OCR…",
+  "upload_modal.preview_label": "Peržiūra ({ratio})",
   "upload_progress.label": "Įkeliama...",
   "upload_progress.processing": "Apdorojama…",
   "username.taken": "Šis naudotojo vardas užimtas. Pabandyk kitą.",
   "video.close": "Uždaryti vaizdo įrašą",
   "video.download": "Atsisiųsti failą",
   "video.exit_fullscreen": "Išeiti iš viso ekrano",
+  "video.expand": "Išplėsti vaizdo įrašą",
   "video.fullscreen": "Visas ekranas",
   "video.hide": "Slėpti vaizdo įrašą",
-  "video.mute": "Nutildyti garsą",
+  "video.mute": "Išjungti garsą",
+  "video.pause": "Pristabdyti",
   "video.play": "Leisti",
-  "video.unmute": "Atitildyti garsą"
+  "video.unmute": "Įjungti garsą"
 }
diff --git a/app/javascript/mastodon/locales/lv.json b/app/javascript/mastodon/locales/lv.json
index 07a7b25a799bb5..8044e789230878 100644
--- a/app/javascript/mastodon/locales/lv.json
+++ b/app/javascript/mastodon/locales/lv.json
@@ -21,24 +21,26 @@
   "account.blocked": "Bloķēts",
   "account.browse_more_on_origin_server": "Pārlūkot vairāk sākotnējā profilā",
   "account.cancel_follow_request": "Atsaukt sekošanas pieprasījumu",
+  "account.copy": "Ievietot saiti uz profilu starpliktuvē",
   "account.direct": "Pieminēt @{name} privāti",
   "account.disable_notifications": "Pārtraukt man paziņot, kad @{name} publicē ierakstu",
   "account.domain_blocked": "Domēns ir bloķēts",
-  "account.edit_profile": "Rediģēt profilu",
+  "account.edit_profile": "Labot profilu",
   "account.enable_notifications": "Paziņot man, kad @{name} publicē ierakstu",
   "account.endorse": "Izcelts profilā",
   "account.featured_tags.last_status_at": "Beidzamā ziņa {date}",
   "account.featured_tags.last_status_never": "Ierakstu nav",
   "account.featured_tags.title": "{name} izceltie tēmturi",
   "account.follow": "Sekot",
+  "account.follow_back": "Sekot atpakaļ",
   "account.followers": "Sekotāji",
   "account.followers.empty": "Šim lietotājam vēl nav sekotāju.",
-  "account.followers_counter": "{count, plural, one {{counter} Sekotājs} other {{counter} Sekotāji}}",
+  "account.followers_counter": "{count, plural, zero {{counter} sekotāju} one {{counter} sekotājs} other {{counter} sekotāji}}",
   "account.following": "Seko",
-  "account.following_counter": "{count, plural, one {{counter} sekojamais} other {{counter} sekojamie}}",
+  "account.following_counter": "{count, plural, zero{{counter} sekojamo} one {{counter} sekojamais} other {{counter} sekojamie}}",
   "account.follows.empty": "Šis lietotājs pagaidām nevienam neseko.",
   "account.go_to_profile": "Doties uz profilu",
-  "account.hide_reblogs": "Slēpt @{name} izceltas ziņas",
+  "account.hide_reblogs": "Paslēpt @{name} pastiprinātos ierakstus",
   "account.in_memoriam": "Piemiņai.",
   "account.joined_short": "Pievienojās",
   "account.languages": "Mainīt abonētās valodas",
@@ -51,13 +53,14 @@
   "account.mute_notifications_short": "Izslēgt paziņojumu skaņu",
   "account.mute_short": "Apklusināt",
   "account.muted": "Apklusināts",
+  "account.mutual": "Savstarpējs",
   "account.no_bio": "Apraksts nav sniegts.",
   "account.open_original_page": "Atvērt oriģinālo lapu",
   "account.posts": "Ieraksti",
   "account.posts_with_replies": "Ieraksti un atbildes",
   "account.report": "Sūdzēties par @{name}",
   "account.requested": "Gaida apstiprinājumu. Nospied, lai atceltu sekošanas pieparasījumu",
-  "account.requested_follow": "{name} nosūtīja tev sekošanas pieprasījumu",
+  "account.requested_follow": "{name} nosūtīja Tev sekošanas pieprasījumu",
   "account.share": "Dalīties ar @{name} profilu",
   "account.show_reblogs": "Parādīt @{name} pastiprinātos ierakstus",
   "account.statuses_counter": "{count, plural, zero {{counter} ierakstu} one {{counter} ieraksts} other {{counter} ieraksti}}",
@@ -97,18 +100,18 @@
   "bundle_column_error.routing.body": "Pieprasīto lapu nevarēja atrast. Vai esi pārliecināts, ka URL adreses joslā ir pareizs?",
   "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Aizvērt",
-  "bundle_modal_error.message": "Kaut kas nogāja greizi, ielādējot šo komponenti.",
+  "bundle_modal_error.message": "Kaut kas nogāja greizi šīs sastāvdaļas ielādēšanas laikā.",
   "bundle_modal_error.retry": "Mēģināt vēlreiz",
   "closed_registrations.other_server_instructions": "Tā kā Mastodon ir decentralizēts, tu vari izveidot kontu citā serverī un joprojām mijiedarboties ar šo.",
-  "closed_registrations_modal.description": "Pašlaik nav iespējams izveidot kontu domēnā {domain}, taču ņem vērā, ka tev nav nepieciešams konts tieši {domain}, lai lietotu Mastodon.",
+  "closed_registrations_modal.description": "Pašlaik nav iespējams izveidot kontu {domain}, bet, lūdzu, ņem vērā, ka Tev nav nepieciešams tieši {domain} konts, lai lietotu Mastodon!",
   "closed_registrations_modal.find_another_server": "Atrast citu serveri",
-  "closed_registrations_modal.preamble": "Mastodon ir decentralizēts, tāpēc neatkarīgi no tā, kur tu izveido savu kontu, varēsi sekot līdzi un sazināties ar ikvienu šajā serverī. Tu pat vari vadīt to pats!",
+  "closed_registrations_modal.preamble": "Mastodon ir decentralizēts, tāpēc neatkarīgi no tā, kur Tu izveido savu kontu, varēsi sekot un mijiedarboties ar ikvienu šajā serverī. Tu pat vari to pašizvietot!",
   "closed_registrations_modal.title": "Reģistrēšanās Mastodon",
   "column.about": "Par",
   "column.blocks": "Bloķētie lietotāji",
   "column.bookmarks": "Grāmatzīmes",
   "column.community": "Vietējā laika līnija",
-  "column.direct": "Privāti pieminēti",
+  "column.direct": "Privātas pieminēšanas",
   "column.directory": "Pārlūkot profilus",
   "column.domain_blocks": "Bloķētie domēni",
   "column.favourites": "Iecienītie",
@@ -133,21 +136,28 @@
   "community.column_settings.remote_only": "Tikai attālinātie",
   "compose.language.change": "Mainīt valodu",
   "compose.language.search": "Meklēt valodas...",
-  "compose.published.body": "Ziņa publicēta.",
+  "compose.published.body": "Ieraksts publicēta.",
   "compose.published.open": "Atvērt",
   "compose.saved.body": "Ziņa saglabāta.",
   "compose_form.direct_message_warning_learn_more": "Uzzināt vairāk",
-  "compose_form.encryption_warning": "Ziņas vietnē Mastodon nav pilnībā šifrētas. Nedalies ar sensitīvu informāciju caur Mastodon.",
+  "compose_form.encryption_warning": "Mastodon ieraksti nav pilnībā šifrēti. Nedalies ar jebkādu jutīgu informāciju caur Mastodon!",
   "compose_form.hashtag_warning": "Šī ziņa netiks norādīta zem nevienas atsauces, jo tā nav publiska. Tikai publiskās ziņās var meklēt pēc atsauces.",
-  "compose_form.lock_disclaimer": "Tavs konts nav {locked}. Ikviens var tev piesekot un redzēt tikai sekotājiem paredzētos ziņojumus.",
+  "compose_form.lock_disclaimer": "Tavs konts nav {locked}. Ikviens var Tev sekot, lai redzētu tikai sekotājiem paredzētos ierakstus.",
   "compose_form.lock_disclaimer.lock": "slēgts",
-  "compose_form.placeholder": "Kas tev padomā?",
+  "compose_form.placeholder": "Kas Tev padomā?",
   "compose_form.poll.duration": "Aptaujas ilgums",
+  "compose_form.poll.multiple": "Vairākas izvēles iespējas",
+  "compose_form.poll.option_placeholder": "Izvēle {number}",
+  "compose_form.poll.single": "Jāizvēlas viens",
   "compose_form.poll.switch_to_multiple": "Mainīt aptaujas veidu, lai atļautu vairākas izvēles",
   "compose_form.poll.switch_to_single": "Mainīt aptaujas veidu, lai atļautu vienu izvēli",
+  "compose_form.publish": "Iesūtīt",
   "compose_form.publish_form": "Jauns ieraksts",
+  "compose_form.reply": "Atbildēt",
+  "compose_form.save_changes": "Atjaunināt",
   "compose_form.spoiler.marked": "Noņemt satura brīdinājumu",
   "compose_form.spoiler.unmarked": "Pievienot satura brīdinājumu",
+  "compose_form.spoiler_placeholder": "Satura brīdinājums (pēc izvēles)",
   "confirmation_modal.cancel": "Atcelt",
   "confirmations.block.block_and_report": "Bloķēt un ziņot",
   "confirmations.block.confirm": "Bloķēt",
@@ -157,28 +167,29 @@
   "confirmations.delete.confirm": "Dzēst",
   "confirmations.delete.message": "Vai tiešām vēlies dzēst šo ierakstu?",
   "confirmations.delete_list.confirm": "Dzēst",
-  "confirmations.delete_list.message": "Vai tiešam vēlies neatgriezeniski dzēst šo sarakstu?",
+  "confirmations.delete_list.message": "Vai tiešām neatgriezeniski izdzēst šo sarakstu?",
   "confirmations.discard_edit_media.confirm": "Atmest",
-  "confirmations.discard_edit_media.message": "Tev ir nesaglabātas izmaiņas multivides aprakstā vai priekšskatījumā. Vēlies tās atmest?",
+  "confirmations.discard_edit_media.message": "Ir nesaglabātas izmaiņas informācijas nesēja aprakstā vai priekšskatījumā. Vēlies tās atmest tik un tā?",
   "confirmations.domain_block.confirm": "Bloķēt visu domēnu",
   "confirmations.domain_block.message": "Vai tu tiešām vēlies bloķēt visu domēnu {domain}? Parasti pietiek, ja nobloķē vai apklusini kādu. Tu neredzēsi saturu vai paziņojumus no šī domēna nevienā laika līnijā. Tavi sekotāji no šī domēna tiks noņemti.",
-  "confirmations.edit.confirm": "Rediģēt",
+  "confirmations.edit.confirm": "Labot",
   "confirmations.edit.message": "Rediģējot, tiks pārrakstīts ziņojums, kuru tu šobrīd raksti. Vai tiešām vēlies turpināt?",
   "confirmations.logout.confirm": "Iziet",
   "confirmations.logout.message": "Vai tiešām vēlies izrakstīties?",
   "confirmations.mute.confirm": "Apklusināt",
-  "confirmations.mute.explanation": "Šādi no viņiem tiks slēptas ziņas un ziņas, kurās viņi tiek pieminēti, taču viņi joprojām varēs redzēt tavas ziņas un sekot tev.",
+  "confirmations.mute.explanation": "Šādi tiks slēpti ieraksti no viņiem un ieraksti, kuros viņi tiek pieminēti, taču viņi joprojām varēs redzēt Tavus ierakstus un sekot Tev.",
   "confirmations.mute.message": "Vai tiešām vēlies apklusināt {name}?",
   "confirmations.redraft.confirm": "Dzēst un pārrakstīt",
   "confirmations.redraft.message": "Vai tiešām vēlies dzēst šo ziņu un no jauna noformēt to? Izlase un pastiprinājumi tiks zaudēti, un atbildes uz sākotnējo ziņu tiks atstātas bez autoratlīdzības.",
   "confirmations.reply.confirm": "Atbildēt",
-  "confirmations.reply.message": "Ja tagad atbildēsi, tavs ziņas uzmetums tiks dzēsts. Vai tiešām vēlies turpināt?",
+  "confirmations.reply.message": "Tūlītēja atbildēšana pārrakstīs pašlaik sastādīto ziņu. Vai tiešām turpināt?",
   "confirmations.unfollow.confirm": "Pārstāt sekot",
   "confirmations.unfollow.message": "Vai tiešam vairs nevēlies sekot lietotājam {name}?",
   "conversation.delete": "Dzēst sarunu",
   "conversation.mark_as_read": "Atzīmēt kā izlasītu",
   "conversation.open": "Skatīt sarunu",
   "conversation.with": "Ar {names}",
+  "copy_icon_button.copied": "Ievietots starpliktuvē",
   "copypaste.copied": "Nokopēts",
   "copypaste.copy_to_clipboard": "Kopēt uz starpliktuvi",
   "directory.federated": "No pazīstamas federācijas",
@@ -187,12 +198,12 @@
   "directory.recently_active": "Nesen aktīvie",
   "disabled_account_banner.account_settings": "Konta iestatījumi",
   "disabled_account_banner.text": "Tavs konts {disabledAccount} pašlaik ir atspējots.",
-  "dismissable_banner.community_timeline": "Šīs ir jaunākās publiskās ziņas no personām, kuru kontus mitina {domain}.",
+  "dismissable_banner.community_timeline": "Šie ir jaunākie publiskie ieraksti no cilvēkiem, kuru konti ir mitināti {domain}.",
   "dismissable_banner.dismiss": "Atcelt",
   "dismissable_banner.explore_links": "Par šiem jaunumiem šobrīd runā cilvēki šajā un citos decentralizētā tīkla serveros.",
-  "dismissable_banner.explore_statuses": "Ieraksti, kas šobrīd gūst arvien lielāku ievērību visā sociālajā tīklā. Augstāk tiek kārtoti neseni ieraksti, kas pastiprināti un pievienoti izlasēm.",
+  "dismissable_banner.explore_statuses": "Šie ir ieraksti, kas šodien gūst arvien lielāku ievērību visā sociālajā tīklā. Augstāk tiek kārtoti jaunāki ieraksti, kuri tiek vairāk pastiprināti un ievietoti izlasēs.",
   "dismissable_banner.explore_tags": "Šie tēmturi šobrīd kļūst arvien populārāki cilvēku vidū šajā un citos decentralizētā tīkla serveros.",
-  "dismissable_banner.public_timeline": "Šīs ir jaunākās publiskās ziņas no lietotājiem sociālajā tīmeklī, kurām seko lietotāji domēnā {domain}.",
+  "dismissable_banner.public_timeline": "Šie ir jaunākie publiskie ieraksti no lietotājiem sociālajā tīmeklī, kuriem {domain} seko cilvēki.",
   "embed.instructions": "Iestrādā šo ziņu savā mājaslapā, kopējot zemāk redzamo kodu.",
   "embed.preview": "Tas izskatīsies šādi:",
   "emoji_button.activity": "Aktivitāte",
@@ -215,22 +226,22 @@
   "empty_column.account_timeline": "Šeit ziņojumu nav!",
   "empty_column.account_unavailable": "Profils nav pieejams",
   "empty_column.blocks": "Pašreiz tu neesi nevienu bloķējis.",
-  "empty_column.bookmarked_statuses": "Pašreiz tev nav neviena grāmatzīmēm pievienota ieraksta. Kad tādu pievienosi, tas parādīsies šeit.",
+  "empty_column.bookmarked_statuses": "Pašlaik Tev nav neviena grāmatzīmēs pievienota ieraksta. Kad tādu pievienosi, tas parādīsies šeit.",
   "empty_column.community": "Vietējā laika līnija ir tukša. Uzraksti kaut ko publiski, lai viss notiktu!",
-  "empty_column.direct": "Jums vēl nav nevienas privātas pieminēšanas. Nosūtot vai saņemot to, tas tiks parādīts šeit.",
+  "empty_column.direct": "Tev vēl nav privātu pieminēšanu. Kad Tu nosūtīsi vai saņemsi kādu, tā pārādīsies šeit.",
   "empty_column.domain_blocks": "Vēl nav neviena bloķēta domēna.",
-  "empty_column.explore_statuses": "Pašlaik nekā aktuāla nav. Pārbaudi vēlāk!",
-  "empty_column.favourited_statuses": "Tev vēl nav nevienas iecienītākās ziņas. Kad iecienīsi kādu, tas tiks parādīts šeit.",
+  "empty_column.explore_statuses": "Pašlaik nav nekā aktuāla. Ieskaties šeit vēlāk!",
+  "empty_column.favourited_statuses": "Tev vēl nav iecienītāko ierakstu. Kad pievienosi kādu izlasei, tas tiks parādīts šeit.",
   "empty_column.favourites": "Šo ziņu neviens vēl nav pievienojis izlasei. Kad kāds to izdarīs, tas parādīsies šeit.",
-  "empty_column.follow_requests": "Šobrīd tev nav sekošanas pieprasījumu. Kad kāds pieteiksies tev sekot, pieprasījums parādīsies šeit.",
+  "empty_column.follow_requests": "Šobrīd Tev nav sekošanas pieprasījumu. Kad saņemsi kādu, tas parādīsies šeit.",
   "empty_column.followed_tags": "Tu vēl neesi sekojis nevienam tēmturim. Kad to izdarīsi, tie tiks parādīti šeit.",
   "empty_column.hashtag": "Ar šo tēmturi nekas nav atrodams.",
-  "empty_column.home": "Tava mājas laikrinda ir tukša! Lai to aizpildītu, pieseko vairāk cilvēkiem.",
-  "empty_column.list": "Šis saraksts pašreiz ir tukšs. Kad šī saraksta dalībnieki publicēs jaunas ziņas, tās parādīsies šeit.",
-  "empty_column.lists": "Pašreiz tev nav neviena saraksta. Kad tādu izveidosi, tas parādīsies šeit.",
+  "empty_column.home": "Tava mājas laikjosla ir tukša. Seko vairāk cilvēkiem, lai to piepildītu!",
+  "empty_column.list": "Pagaidām šajā sarakstā nekā nav. Kad šī saraksta dalībnieki ievietos jaunus ierakstus, tie parādīsies šeit.",
+  "empty_column.lists": "Pašlaik Tev nav neviena saraksta. Kad tādu izveidosi, tas parādīsies šeit.",
   "empty_column.mutes": "Neviens lietotājs vēl nav apklusināts.",
-  "empty_column.notifications": "Tev vēl nav paziņojumu. Kad citi cilvēki ar tevi mijiedarbosies, tu to redzēsi šeit.",
-  "empty_column.public": "Šeit vēl nekā nav! Ieraksti ko publiski vai pieseko lietotājiem no citiem serveriem",
+  "empty_column.notifications": "Tev vēl nav paziņojumu. Kad citi cilvēki ar Tevi mijiedarbosies, Tu to redzēsi šeit.",
+  "empty_column.public": "Šeit nekā nav! Ieraksti kaut ko publiski vai seko lietotājiem no citiem serveriem, lai iegūtu saturu",
   "error.unexpected_crash.explanation": "Koda kļūdas vai pārlūkprogrammas saderības problēmas dēļ šo lapu nevarēja parādīt pareizi.",
   "error.unexpected_crash.explanation_addons": "Šo lapu nevarēja parādīt pareizi. Šo kļūdu, iespējams, izraisīja pārlūkprogrammas papildinājums vai automātiskās tulkošanas rīki.",
   "error.unexpected_crash.next_steps": "Mēģini atsvaidzināt lapu. Ja tas nepalīdz, iespējams, varēsi lietot Mastodon, izmantojot citu pārlūkprogrammu vai lietotni.",
@@ -239,13 +250,13 @@
   "errors.unexpected_crash.report_issue": "Ziņot par problēmu",
   "explore.search_results": "Meklēšanas rezultāti",
   "explore.suggested_follows": "Cilvēki",
-  "explore.title": "Pārlūkot",
+  "explore.title": "Izpētīt",
   "explore.trending_links": "Jaunumi",
-  "explore.trending_statuses": "Ziņas",
+  "explore.trending_statuses": "Ieraksti",
   "explore.trending_tags": "Tēmturi",
-  "filter_modal.added.context_mismatch_explanation": "Šī filtra kategorija neattiecas uz kontekstu, kurā esi piekļuvis šai ziņai. Ja vēlies, lai ziņa tiktu filtrēta arī šajā kontekstā, tev būs jārediģē filtrs.",
+  "filter_modal.added.context_mismatch_explanation": "Šī atlases kategorija neattiecas uz kontekstu, kurā esi piekļuvis šim ierakstam. Ja vēlies, lai ieraksts tiktu atlasīts arī šajā kontekstā, Tev būs jālabo atlase.",
   "filter_modal.added.context_mismatch_title": "Konteksta neatbilstība!",
-  "filter_modal.added.expired_explanation": "Šai filtra kategorijai ir beidzies derīguma termiņš. Lai to lietotu, tev būs jāmaina derīguma termiņš.",
+  "filter_modal.added.expired_explanation": "Šai atlases kategorijai ir beidzies derīguma termiņš. Lai to lietotu, Tev būs jāmaina derīguma termiņš.",
   "filter_modal.added.expired_title": "Filtra termiņš beidzies!",
   "filter_modal.added.review_and_configure": "Lai pārskatītu un tālāk konfigurētu šo filtru kategoriju, dodies uz {settings_link}.",
   "filter_modal.added.review_and_configure_title": "Filtra iestatījumi",
@@ -255,7 +266,7 @@
   "filter_modal.select_filter.context_mismatch": "neattiecas uz šo kontekstu",
   "filter_modal.select_filter.expired": "beidzies",
   "filter_modal.select_filter.prompt_new": "Jauna kategorija: {name}",
-  "filter_modal.select_filter.search": "Meklē vai izveido",
+  "filter_modal.select_filter.search": "Meklēt vai izveidot",
   "filter_modal.select_filter.subtitle": "Izmanto esošu kategoriju vai izveido jaunu",
   "filter_modal.select_filter.title": "Filtrēt šo ziņu",
   "filter_modal.title.status": "Filtrēt ziņu",
@@ -264,7 +275,11 @@
   "firehose.remote": "Citi serveri",
   "follow_request.authorize": "Autorizēt",
   "follow_request.reject": "Noraidīt",
-  "follow_requests.unlocked_explanation": "Lai gan tavs konts nav bloķēts, {domain} darbinieki iedomājās, ka, iespējams, vēlēsies pārskatīt pieprasījumus no šiem kontiem.",
+  "follow_requests.unlocked_explanation": "Lai gan Tavs konts nav slēgts, {domain} darbinieki iedomājās, ka Tu varētu vēlēties pašrocīgi pārskatīt sekošanas pieprasījumus no šiem kontiem.",
+  "follow_suggestions.curated_suggestion": "Darbinieku izvēle",
+  "follow_suggestions.dismiss": "Vairs nerādīt",
+  "follow_suggestions.view_all": "Skatīt visu",
+  "follow_suggestions.who_to_follow": "Kam sekot",
   "followed_tags": "Sekojamie tēmturi",
   "footer.about": "Par",
   "footer.directory": "Profilu direktorija",
@@ -286,8 +301,8 @@
   "hashtag.column_settings.tag_mode.none": "Neviens no šiem",
   "hashtag.column_settings.tag_toggle": "Pievienot kolonnai papildu tēmturus",
   "hashtag.counter_by_accounts": "{count, plural, one {{counter} dalībnieks} other {{counter} dalībnieki}}",
-  "hashtag.counter_by_uses": "{count, plural, zero {{counter} ziņa} one {{counter} ieraksts} other {{counter} ziņas}}",
-  "hashtag.counter_by_uses_today": "{count, plural, one {{counter} ziņa} other {{counter} ziņas}} šodien",
+  "hashtag.counter_by_uses": "{count, plural, zero {{counter} ierakstu} one {{counter} ieraksts} other {{counter} ieraksti}}",
+  "hashtag.counter_by_uses_today": "{count, plural, zero {{counter} ierakstu} one {{counter} ieraksts} other {{counter} ieraksti}} šodien",
   "hashtag.follow": "Sekot tēmturim",
   "hashtag.unfollow": "Pārstāt sekot tēmturim",
   "hashtags.and_other": "..un {count, plural, other {# vairāk}}",
@@ -300,16 +315,16 @@
   "home.pending_critical_update.title": "Pieejams kritisks drošības jauninājums!",
   "home.show_announcements": "Rādīt paziņojumus",
   "interaction_modal.description.favourite": "Ar Mastodon kontu tu vari pievienot šo ziņu izlasei, lai informētu autoru, ka to novērtē, un saglabātu to vēlākai lasīšanai.",
-  "interaction_modal.description.follow": "Ar Mastodon kontu tu vari sekot {name}, lai saņemtu viņu ziņas savā mājas plūsmā.",
-  "interaction_modal.description.reblog": "Izmantojot kontu Mastodon, tu vari izcelt šo ziņu, lai kopīgotu to ar saviem sekotājiem.",
+  "interaction_modal.description.follow": "Ar Mastodon kontu Tu vari sekot {name}, lai saņemtu lietotāja ierakstus savā mājas plūsmā.",
+  "interaction_modal.description.reblog": "Ar Mastodon kontu Tu vari izvirzīt šo ierakstu, lai kopīgotu to ar saviem sekotājiem.",
   "interaction_modal.description.reply": "Ar Mastodon kontu tu vari atbildēt uz šo ziņu.",
-  "interaction_modal.login.action": "Nogādā mani mājās",
+  "interaction_modal.login.action": "Nogādāt mani mājās",
   "interaction_modal.login.prompt": "Tavas mājvietas servera domēns, piem., mastodon.social",
   "interaction_modal.no_account_yet": "Neesi Mastodon?",
   "interaction_modal.on_another_server": "Citā serverī",
   "interaction_modal.on_this_server": "Šajā serverī",
-  "interaction_modal.sign_in": "Tu neesi pieteicies šajā serverī. Kur tiek mitināts tavs konts?",
-  "interaction_modal.sign_in_hint": "Padoms: Šī ir vietne, kurā tu piereģistrējies. Ja neatceries, meklē sveiciena e-pastu savā iesūtnē. Vari arī ievadīt pilnu lietotājvārdu! (piem., @Mastodon@mastodon.social)",
+  "interaction_modal.sign_in": "Tu neesi pieteicies šajā serverī. Kur tiek mitināts Tavs konts?",
+  "interaction_modal.sign_in_hint": "Padoms: tā ir tīmekļvietne, kurā Tu reģistrējies. Ja neatceries, jāmeklē sveiciena e-pasts savā iesūtnē. Vari arī ievadīt pilnu lietotājvārdu (piem., @Mastodon@mastodon.social).",
   "interaction_modal.title.favourite": "Pievienot {name} ziņu izlasei",
   "interaction_modal.title.follow": "Sekot {name}",
   "interaction_modal.title.reblog": "Pastiprināt {name} ierakstu",
@@ -361,12 +376,12 @@
   "link_preview.author": "Pēc {name}",
   "lists.account.add": "Pievienot sarakstam",
   "lists.account.remove": "Noņemt no saraksta",
-  "lists.delete": "Dzēst sarakstu",
-  "lists.edit": "Rediģēt sarakstu",
+  "lists.delete": "Izdzēst sarakstu",
+  "lists.edit": "Labot sarakstu",
   "lists.edit.submit": "Mainīt virsrakstu",
-  "lists.exclusive": "Paslēpt šīs ziņas no mājvietas",
+  "lists.exclusive": "Nerādīt šos ierakstus sākumā",
   "lists.new.create": "Pievienot sarakstu",
-  "lists.new.title_placeholder": "Jaunais saraksta nosaukums",
+  "lists.new.title_placeholder": "Jaunā saraksta nosaukums",
   "lists.replies_policy.followed": "Jebkuram sekotajam lietotājam",
   "lists.replies_policy.list": "Saraksta dalībniekiem",
   "lists.replies_policy.none": "Nevienam",
@@ -374,8 +389,9 @@
   "lists.search": "Meklēt starp cilvēkiem, kuriem tu seko",
   "lists.subheading": "Tavi saraksti",
   "load_pending": "{count, plural, one {# jauna lieta} other {# jaunas lietas}}",
+  "loading_indicator.label": "Ielādē…",
   "media_gallery.toggle_visible": "{number, plural, one {Slēpt attēlu} other {Slēpt attēlus}}",
-  "moved_to_account_banner.text": "Tavs konts {disabledAccount} pašlaik ir atspējots, jo pārcēlies uz kontu {movedToAccount}.",
+  "moved_to_account_banner.text": "Tavs konts {disabledAccount} pašlaik ir atspējots, jo Tu pārcēlies uz kontu {movedToAccount}.",
   "mute_modal.duration": "Ilgums",
   "mute_modal.hide_notifications": "Slēpt paziņojumus no šī lietotāja?",
   "mute_modal.indefinite": "Beztermiņa",
@@ -385,10 +401,10 @@
   "navigation_bar.bookmarks": "Grāmatzīmes",
   "navigation_bar.community_timeline": "Vietējā laika līnija",
   "navigation_bar.compose": "Veidot jaunu ziņu",
-  "navigation_bar.direct": "Privāti pieminēti",
+  "navigation_bar.direct": "Privātas pieminēšanas",
   "navigation_bar.discover": "Atklāt",
   "navigation_bar.domain_blocks": "Bloķētie domēni",
-  "navigation_bar.explore": "Pārlūkot",
+  "navigation_bar.explore": "Izpētīt",
   "navigation_bar.favourites": "Izlase",
   "navigation_bar.filters": "Apklusinātie vārdi",
   "navigation_bar.follow_requests": "Sekošanas pieprasījumi",
@@ -397,23 +413,23 @@
   "navigation_bar.lists": "Saraksti",
   "navigation_bar.logout": "Iziet",
   "navigation_bar.mutes": "Apklusinātie lietotāji",
-  "navigation_bar.opened_in_classic_interface": "Ziņas, konti un citas noteiktas lapas pēc noklusējuma tiek atvērtas klasiskajā tīmekļa saskarnē.",
+  "navigation_bar.opened_in_classic_interface": "Ieraksti, konti un citas noteiktas lapas pēc noklusējuma tiek atvērtas klasiskajā tīmekļa saskarnē.",
   "navigation_bar.personal": "Personīgie",
   "navigation_bar.pins": "Piespraustās ziņas",
   "navigation_bar.preferences": "Iestatījumi",
   "navigation_bar.public_timeline": "Apvienotā laika līnija",
   "navigation_bar.search": "Meklēt",
   "navigation_bar.security": "Drošība",
-  "not_signed_in_indicator.not_signed_in": "Lai piekļūtu šim resursam, tev ir jāpierakstās.",
+  "not_signed_in_indicator.not_signed_in": "Ir jāpiesakās, lai piekļūtu šim resursam.",
   "notification.admin.report": "{name} ziņoja par {target}",
   "notification.admin.sign_up": "{name} ir pierakstījies",
   "notification.favourite": "{name} pievienoja tavu ziņu izlasei",
-  "notification.follow": "{name} uzsāka tev sekot",
-  "notification.follow_request": "{name} nosūtīja tev sekošanas pieprasījumu",
-  "notification.mention": "{name} pieminēja tevi",
+  "notification.follow": "{name} uzsāka Tev sekot",
+  "notification.follow_request": "{name} nosūtīja Tev sekošanas pieprasījumu",
+  "notification.mention": "{name} pieminēja Tevi",
   "notification.own_poll": "Tava aptauja ir noslēgusies",
   "notification.poll": "Aptauja, kurā tu piedalījies, ir noslēgusies",
-  "notification.reblog": "{name} pastiprināja tavu ierakstu",
+  "notification.reblog": "{name} pastiprināja Tavu ierakstu",
   "notification.status": "{name} tikko publicēja",
   "notification.update": "{name} rediģēja ierakstu",
   "notifications.clear": "Notīrīt paziņojumus",
@@ -427,7 +443,7 @@
   "notifications.column_settings.filter_bar.show_bar": "Rādīt filtru joslu",
   "notifications.column_settings.follow": "Jauni sekotāji:",
   "notifications.column_settings.follow_request": "Jauni sekošanas pieprasījumi:",
-  "notifications.column_settings.mention": "Pieminējumi:",
+  "notifications.column_settings.mention": "Pieminēšanas:",
   "notifications.column_settings.poll": "Aptaujas rezultāti:",
   "notifications.column_settings.push": "Uznirstošie paziņojumi",
   "notifications.column_settings.reblog": "Pastiprinātie ieraksti:",
@@ -441,7 +457,7 @@
   "notifications.filter.boosts": "Pastiprinātie ieraksti",
   "notifications.filter.favourites": "Izlases",
   "notifications.filter.follows": "Seko",
-  "notifications.filter.mentions": "Pieminējumi",
+  "notifications.filter.mentions": "Pieminēšanas",
   "notifications.filter.polls": "Aptaujas rezultāti",
   "notifications.filter.statuses": "Jaunumi no cilvēkiem, kuriem tu seko",
   "notifications.grant_permission": "Piešķirt atļauju.",
@@ -458,27 +474,36 @@
   "onboarding.actions.go_to_explore": "Skatīt tendences",
   "onboarding.actions.go_to_home": "Dodieties uz manu mājas plūsmu",
   "onboarding.compose.template": "Sveiki, #Mastodon!",
-  "onboarding.follows.empty": "Diemžēl pašlaik nevar parādīt rezultātus. Vari mēģināt izmantot meklēšanu vai pārlūkot izpētes lapu, lai atrastu personas, kurām sekot, vai mēģināt vēlreiz vēlāk.",
+  "onboarding.follows.empty": "Diemžēl pašlaik nevar parādīt rezultātus. Vari mēģināt izmantot meklēšanu vai pārlūkot izpētes lapu, lai atrastu cilvēkus, kuriem sekot, vai vēlāk mēģināt vēlreiz.",
   "onboarding.follows.lead": "Tava mājas plūsma ir galvenais veids, kā izbaudīt Mastodon. Jo vairāk cilvēku sekosi, jo aktīvāk un interesantāk tas būs. Lai sāktu, šeit ir daži ieteikumi:",
   "onboarding.follows.title": "Populārs Mastodon",
-  "onboarding.share.lead": "Paziņo citiem, kā viņi tevi var atrast Mastodon!",
+  "onboarding.profile.discoverable": "Padarīt manu profilu atklājamu",
+  "onboarding.profile.display_name": "Attēlojamais vārds",
+  "onboarding.profile.display_name_hint": "Tavs pilnais vārds vai Tavs joku vārds…",
+  "onboarding.profile.note": "Apraksts",
+  "onboarding.profile.note_hint": "Tu vari @pieminēt citus cilvēkus vai #tēmturus…",
+  "onboarding.profile.save_and_continue": "Saglabāt un turpināt",
+  "onboarding.profile.title": "Profila iestatīšana",
+  "onboarding.profile.upload_avatar": "Augšupielādēt profila attēlu",
+  "onboarding.profile.upload_header": "Augšupielādēt profila galveni",
+  "onboarding.share.lead": "Dari cilvēkiem zināmu, ka viņi var Tevi atrast Mastodon!",
   "onboarding.share.message": "Es esmu {username} #Mastodon! Nāc sekot man uz {url}",
   "onboarding.share.next_steps": "Iespējamie nākamie soļi:",
   "onboarding.share.title": "Kopīgo savu profilu",
-  "onboarding.start.lead": "Tagad tu esat daļa no Mastodon — unikālas, decentralizētas sociālo mediju platformas, kurā tu, nevis algoritms, veido savu pieredzi. Sāksim darbu šajā jaunajā sociālajā jomā:",
+  "onboarding.start.lead": "Tagad Tu esi daļa no Mastodon — vienreizējas, decentralizētas sociālās mediju platformas, kurā Tu, nevis algoritms, veido Tavu pieredzi. Sāksim darbu šajā jaunajā sociālajā jomā:",
   "onboarding.start.skip": "Nav nepieciešama palīdzība darba sākšanai?",
   "onboarding.start.title": "Tev tas izdevās!",
   "onboarding.steps.follow_people.body": "Tu pats veido savu plūsmu. Piepildīsim to ar interesantiem cilvēkiem.",
   "onboarding.steps.follow_people.title": "Sekot {count, plural, one {one person} other {# cilvēkiem}}",
   "onboarding.steps.publish_status.body": "Sveicini pasauli ar tekstu, fotoattēliem, video, vai aptaujām {emoji}",
   "onboarding.steps.publish_status.title": "Izveido savu pirmo ziņu",
-  "onboarding.steps.setup_profile.body": "Citi, visticamāk, sazināsies ar tevi, izmantojot aizpildītu profilu.",
+  "onboarding.steps.setup_profile.body": "Palielini mijiedarbību ar aptverošu profilu!",
   "onboarding.steps.setup_profile.title": "Pielāgo savu profilu",
-  "onboarding.steps.share_profile.body": "Paziņo saviem draugiem, kā tevi atrast Mastodon!",
+  "onboarding.steps.share_profile.body": "Dari saviem draugiem zināmu, kā Tevi atrast Mastodon!",
   "onboarding.steps.share_profile.title": "Kopīgo savu Mastodon profilu",
-  "onboarding.tips.2fa": "<strong>Vai zināji?</strong> Tu vari aizsargāt savu kontu, konta iestatījumos iestatot divu faktoru autentifikāciju. Tas darbojas ar jebkuru tevis izvēlētu TOTP lietotni, nav nepieciešams tālruņa numurs!",
+  "onboarding.tips.2fa": "<strong>Vai zināji?</strong> Tu vari aizsargāt savu kontu, konta iestatījumos iestatot divpakāpju autentifikāciju. Tas darbojas ar jebkuru Tevis izvēlētu TOTP lietotni, nav nepieciešams tālruņa numurs!",
   "onboarding.tips.accounts_from_other_servers": "<strong>Vai zināji?</strong> Tā kā Mastodon ir decentralizēts, daži profili, ar kuriem saskaraties, tiks mitināti citos, nevis tavos serveros. Un tomēr tu varat sazināties ar viņiem nevainojami! Viņu serveris atrodas viņu lietotājvārda otrajā pusē!",
-  "onboarding.tips.migration": "<strong>Vai zināji?</strong> Ja uzskati, ka {domain} nākotnē nav lieliska servera izvēle, vari pāriet uz citu Mastodon serveri, nezaudējot savus sekotājus. Tu pat vari mitināt savu personīgo serveri!",
+  "onboarding.tips.migration": "<strong>Vai zināji?</strong> Ja uzskati, ka {domain} nākotnē nav lieliska servera izvēle, vari pāriet uz citu Mastodon serveri, nezaudējot savus sekotājus. Tu pat vari mitināt savu serveri!",
   "onboarding.tips.verification": "<strong>Vai zināji?</strong> Tu vari verificēt savu kontu, ievietojot saiti uz savu Mastodon profilu savā vietnē un pievienojot vietni savam profilam. Nav nepieciešami nekādi maksājumi vai dokumenti!",
   "password_confirmation.exceeds_maxlength": "Paroles apstiprināšana pārsniedz maksimālo paroles garumu",
   "password_confirmation.mismatching": "Paroles apstiprinājums neatbilst",
@@ -494,9 +519,14 @@
   "poll_button.add_poll": "Pievienot aptauju",
   "poll_button.remove_poll": "Noņemt aptauju",
   "privacy.change": "Mainīt ieraksta privātumu",
+  "privacy.direct.long": "Visi ierakstā pieminētie",
+  "privacy.direct.short": "Noteikti cilvēki",
+  "privacy.private.long": "Tikai Tavi sekotāji",
+  "privacy.private.short": "Sekotāji",
   "privacy.public.short": "Publiska",
   "privacy_policy.last_updated": "Pēdējo reizi atjaunināta {date}",
   "privacy_policy.title": "Privātuma politika",
+  "recommended": "Ieteicams",
   "refresh": "Atsvaidzināt",
   "regeneration_indicator.label": "Ielādē…",
   "regeneration_indicator.sublabel": "Tiek gatavota tava plūsma!",
@@ -512,8 +542,9 @@
   "relative_time.seconds": "{number}s",
   "relative_time.today": "šodien",
   "reply_indicator.cancel": "Atcelt",
+  "reply_indicator.poll": "Aptauja",
   "report.block": "Bloķēt",
-  "report.block_explanation": "Tu neredzēsi viņu ziņas. Viņi nevarēs redzēt tavas ziņas vai sekot tev. Viņi varēs saprast, ka ir bloķēti.",
+  "report.block_explanation": "Tu neredzēsi viņu ierakstus. Viņi nevarēs redzēt Tavus ierakstus vai sekot tev. Viņi varēs saprast, ka ir bloķēti.",
   "report.categories.legal": "Tiesisks",
   "report.categories.other": "Citi",
   "report.categories.spam": "Spams",
@@ -527,7 +558,7 @@
   "report.forward": "Pārsūtīt {target}",
   "report.forward_hint": "Konts ir no cita servera. Vai nosūtīt anonimizētu sūdzības kopiju arī tam?",
   "report.mute": "Apklusināt",
-  "report.mute_explanation": "Tu neredzēsi viņu ziņas. Viņi joprojām var tev sekot un redzēt tavas ziņas un nezinās, ka viņi ir apklusināti.",
+  "report.mute_explanation": "Tu neredzēsi viņu ierakstus. Viņi joprojām var Tev sekot un redzēt Tavus ierakstus un nezinās, ka viņi ir apklusināti.",
   "report.next": "Tālāk",
   "report.placeholder": "Papildu komentāri",
   "report.reasons.dislike": "Man tas nepatīk",
@@ -543,15 +574,15 @@
   "report.rules.subtitle": "Atlasi visus atbilstošos",
   "report.rules.title": "Kuri noteikumi tiek pārkāpti?",
   "report.statuses.subtitle": "Atlasi visus atbilstošos",
-  "report.statuses.title": "Vai ir kādi ieraksti, kas atbalsta šo sūdzību?",
+  "report.statuses.title": "Vai ir kādi ieraksti, kas apstiprina šo ziņojumu?",
   "report.submit": "Iesniegt",
   "report.target": "Ziņošana par: {target}",
-  "report.thanks.take_action": "Tālāk ir norādītas iespējas, kā kontrolēt Mastodon redzamo saturu:",
+  "report.thanks.take_action": "Šeit ir iespējas, lai pārvaldītu Mastodon redzamo saturu:",
   "report.thanks.take_action_actionable": "Kamēr mēs to izskatām, tu vari veikt darbības pret @{name}:",
   "report.thanks.title": "Vai nevēlies to redzēt?",
   "report.thanks.title_actionable": "Paldies, ka ziņoji, mēs to izskatīsim.",
   "report.unfollow": "Pārtraukt sekot @{name}",
-  "report.unfollow_explanation": "Tu seko šim kontam. Lai vairs neredzētu viņu ziņas savā mājas plūsmā, pārtrauc viņiem sekot.",
+  "report.unfollow_explanation": "Tu seko šim kontam. Lai vairs neredzētu tā ierakstus savā mājas plūsmā, pārtrauc sekot tam!",
   "report_notification.attached_statuses": "Pievienoti {count, plural,one {{count} sūtījums} other {{count} sūtījumi}}",
   "report_notification.categories.legal": "Tiesisks",
   "report_notification.categories.other": "Cita",
@@ -564,19 +595,20 @@
   "search.quick_action.go_to_account": "Doties uz profilu {x}",
   "search.quick_action.go_to_hashtag": "Doties uz tēmturi {x}",
   "search.quick_action.open_url": "Atvērt URL Mastodonā",
-  "search.quick_action.status_search": "Ziņas atbilst {x}",
-  "search.search_or_paste": "Meklē vai iekopē URL",
+  "search.quick_action.status_search": "Ieraksti, kas atbilst {x}",
+  "search.search_or_paste": "Meklēt vai ielīmēt URL",
   "search_popout.full_text_search_disabled_message": "Nav pieejams {domain}.",
+  "search_popout.full_text_search_logged_out_message": "Pieejams tikai pēc pieteikšanās.",
   "search_popout.language_code": "ISO valodas kods",
   "search_popout.options": "Meklēšanas iespējas",
   "search_popout.quick_actions": "Ātrās darbības",
   "search_popout.recent": "Nesen meklētais",
-  "search_popout.specific_date": "konkrēts datums",
+  "search_popout.specific_date": "noteikts datums",
   "search_popout.user": "lietotājs",
   "search_results.accounts": "Profili",
   "search_results.all": "Visi",
   "search_results.hashtags": "Tēmturi",
-  "search_results.nothing_found": "Nevarēja atrast neko šiem meklēšanas vienumiem",
+  "search_results.nothing_found": "Nevarēja atrast neko, kas atbilstu šim meklēšanas vaicājumam",
   "search_results.see_all": "Skatīt visus",
   "search_results.statuses": "Ieraksti",
   "search_results.title": "Meklēt {q}",
@@ -587,9 +619,9 @@
   "server_banner.learn_more": "Uzzināt vairāk",
   "server_banner.server_stats": "Servera statistika:",
   "sign_in_banner.create_account": "Izveidot kontu",
-  "sign_in_banner.sign_in": "Pierakstīties",
+  "sign_in_banner.sign_in": "Pieteikties",
   "sign_in_banner.sso_redirect": "Piesakies vai Reģistrējies",
-  "sign_in_banner.text": "Pieraksties, lai sekotu profiliem vai atsaucēm, pievienotu izlasei, kopīgotu ziņas un atbildētu uz tām. Vari arī mijiedarboties no sava konta citā serverī.",
+  "sign_in_banner.text": "Jāpiesakās, lai sekotu profiliem vai tēmturiem, pievienotu izlasei, kopīgotu ierakstus un atbildētu uz tiem. Vari arī mijiedarboties ar savu kontu citā serverī.",
   "status.admin_account": "Atvērt @{name} moderēšanas saskarni",
   "status.admin_domain": "Atvērt {domain} moderēšanas saskarni",
   "status.admin_status": "Atvērt šo ziņu moderācijas saskarnē",
@@ -602,16 +634,16 @@
   "status.detailed_status": "Detalizēts sarunas skats",
   "status.direct": "Pieminēt @{name} privāti",
   "status.direct_indicator": "Pieminēts privāti",
-  "status.edit": "Rediģēt",
-  "status.edited": "Rediģēts {date}",
-  "status.edited_x_times": "Rediģēts {count, plural, one {{count} reize} other {{count} reizes}}",
+  "status.edit": "Labot",
+  "status.edited": "Labots {date}",
+  "status.edited_x_times": "Labots {count, plural, one {{count} reizi} other {{count} reizes}}",
   "status.embed": "Iestrādāt",
   "status.favourite": "Iecienīts",
   "status.filter": "Filtrē šo ziņu",
   "status.filtered": "Filtrēts",
   "status.hide": "Slēpt ierakstu",
   "status.history.created": "{name} izveidoja {date}",
-  "status.history.edited": "{name} rediģēja {date}",
+  "status.history.edited": "{name} laboja {date}",
   "status.load_more": "Ielādēt vairāk",
   "status.media.open": "Noklikšķini, lai atvērtu",
   "status.media.show": "Noklikšķini, lai parādītu",
@@ -648,7 +680,7 @@
   "status.uncached_media_warning": "Priekšskatījums nav pieejams",
   "status.unmute_conversation": "Noņemt sarunas apklusinājumu",
   "status.unpin": "Noņemt profila piespraudumu",
-  "subscribed_languages.lead": "Pēc izmaiņu veikšanas tavā mājas un sarakstu laika līnijā tiks rādītas tikai ziņas atlasītajās valodās. Neatlasi nevienu, lai saņemtu ziņas visās valodās.",
+  "subscribed_languages.lead": "Pēc izmaiņu veikšanas Tavā mājas un sarakstu laika līnijā tiks rādīti tikai tie ieraksti atlasītajās valodās. Neatlasīt nevienu, lai saņemtu ierakstus visās valodās.",
   "subscribed_languages.save": "Saglabāt izmaiņas",
   "subscribed_languages.target": "Mainīt abonētās valodas priekš {target}",
   "tabs_bar.home": "Sākums",
@@ -662,8 +694,8 @@
   "timeline_hint.resources.followers": "Sekotāji",
   "timeline_hint.resources.follows": "Seko",
   "timeline_hint.resources.statuses": "Vecāki ieraksti",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} persona} other {{counter} cilvēki}} par {days, plural, one {# dienu} other {{days} dienām}}",
-  "trends.trending_now": "Aktuālās tendences",
+  "trends.counter_by_accounts": "{count, plural, zero {{counter} cilvēku} one {{counter} cilvēks} other {{counter} cilvēki}} {days, plural, one {{day} dienā} other {{days} dienās}}",
+  "trends.trending_now": "Pašlaik populāri",
   "ui.beforeunload": "Ja pametīsit Mastodonu, jūsu melnraksts tiks zaudēts.",
   "units.short.billion": "{count}Mjd",
   "units.short.million": "{count}M",
@@ -674,7 +706,7 @@
   "upload_error.poll": "Datņu augšupielādes aptaujās nav atļautas.",
   "upload_form.audio_description": "Pievieno aprakstu cilvēkiem ar dzirdes zudumu",
   "upload_form.description": "Pievieno aprakstu vājredzīgajiem",
-  "upload_form.edit": "Rediģēt",
+  "upload_form.edit": "Labot",
   "upload_form.thumbnail": "Nomainīt sīktēlu",
   "upload_form.video_description": "Pievieno aprakstu cilvēkiem ar dzirdes vai redzes traucējumiem",
   "upload_modal.analyzing_picture": "Analizē attēlu…",
@@ -683,7 +715,7 @@
   "upload_modal.choose_image": "Izvēlēties attēlu",
   "upload_modal.description_placeholder": "Raibais runcis rīgā ratu rumbā rūc",
   "upload_modal.detect_text": "Noteikt tekstu no attēla",
-  "upload_modal.edit_media": "Rediģēt multividi",
+  "upload_modal.edit_media": "Labot informācijas nesēju",
   "upload_modal.hint": "Noklikšķini vai velc apli priekšskatījumā, lai izvēlētos fokusa punktu, kas vienmēr būs redzams visos sīktēlos.",
   "upload_modal.preparing_ocr": "Sagatavo OCR…",
   "upload_modal.preview_label": "Priekšskatīt ({ratio})",
diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json
index f2367f6463f74d..a8d42e5ff60db1 100644
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@@ -530,7 +530,7 @@
   "poll_button.remove_poll": "Peiling verwijderen",
   "privacy.change": "Zichtbaarheid van bericht aanpassen",
   "privacy.direct.long": "Alleen voor mensen die specifiek in het bericht worden vermeld",
-  "privacy.direct.short": "Specifieke mensen",
+  "privacy.direct.short": "Privébericht",
   "privacy.private.long": "Alleen jouw volgers",
   "privacy.private.short": "Volgers",
   "privacy.public.long": "Iedereen op Mastodon en daarbuiten",
@@ -666,7 +666,7 @@
   "status.mention": "@{name} vermelden",
   "status.more": "Meer",
   "status.mute": "@{name} negeren",
-  "status.mute_conversation": "Negeer gesprek",
+  "status.mute_conversation": "Gesprek negeren",
   "status.open": "Volledig bericht tonen",
   "status.pin": "Aan profielpagina vastmaken",
   "status.pinned": "Vastgemaakt bericht",
diff --git a/app/javascript/mastodon/locales/no.json b/app/javascript/mastodon/locales/no.json
index 27ca6117225387..a172fc69f4c4e6 100644
--- a/app/javascript/mastodon/locales/no.json
+++ b/app/javascript/mastodon/locales/no.json
@@ -277,6 +277,7 @@
   "follow_request.authorize": "Autoriser",
   "follow_request.reject": "Avvis",
   "follow_requests.unlocked_explanation": "Selv om kontoen din ikke er låst, tror {domain} ansatte at du kanskje vil gjennomgå forespørsler fra disse kontoene manuelt.",
+  "follow_suggestions.view_all": "Vis alle",
   "followed_tags": "Fulgte emneknagger",
   "footer.about": "Om",
   "footer.directory": "Profilkatalog",
diff --git a/app/javascript/mastodon/locales/ru.json b/app/javascript/mastodon/locales/ru.json
index 5fcca414cff3f7..fde170db60d230 100644
--- a/app/javascript/mastodon/locales/ru.json
+++ b/app/javascript/mastodon/locales/ru.json
@@ -375,7 +375,7 @@
   "lightbox.previous": "Назад",
   "limited_account_hint.action": "Все равно показать профиль",
   "limited_account_hint.title": "Этот профиль был скрыт модераторами {domain}.",
-  "link_preview.author": "По алфавиту",
+  "link_preview.author": "Автор: {name}",
   "lists.account.add": "Добавить в список",
   "lists.account.remove": "Убрать из списка",
   "lists.delete": "Удалить список",
diff --git a/app/javascript/mastodon/locales/ry.json b/app/javascript/mastodon/locales/ry.json
index 0967ef424bce67..59de0397777655 100644
--- a/app/javascript/mastodon/locales/ry.json
+++ b/app/javascript/mastodon/locales/ry.json
@@ -1 +1,19 @@
-{}
+{
+  "about.blocks": "Модеровані серверы",
+  "about.contact": "Контакт:",
+  "about.disclaimer": "Mastodon є задарьнов проґрамов из удпертым кодом тай торговов значков Mastodon gGmbH.",
+  "about.domain_blocks.no_reason_available": "Причины не ясні",
+  "about.domain_blocks.silenced.title": "Обмежено",
+  "about.domain_blocks.suspended.explanation": "Ниякі податкы из сього сервера не будут уброблені, усокочені ци поміняні, што чинит невозможнов хоть-яку інтеракцію ци зязок из хосновачами из сього сервера.",
+  "about.domain_blocks.suspended.title": "Заблоковано",
+  "about.rules": "Правила сервера",
+  "account.account_note_header": "Примітка",
+  "account.add_or_remove_from_list": "Дати авадь забрати из исписа",
+  "account.badges.bot": "Автоматічно",
+  "account.badges.group": "Ґрупа",
+  "account.block": "Заблоковати @{name}",
+  "account.block_domain": "Заблоковати домен {domain}",
+  "account.block_short": "Заблоковати",
+  "account.blocked": "Заблоковано",
+  "account.browse_more_on_origin_server": "Позирайте бульше на ориґіналнум профілю"
+}
diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json
index 37c0dd1383fd06..7eee0c29c2a061 100644
--- a/app/javascript/mastodon/locales/sk.json
+++ b/app/javascript/mastodon/locales/sk.json
@@ -1,741 +1,750 @@
 {
   "about.blocks": "Moderované servery",
   "about.contact": "Kontakt:",
-  "about.disclaimer": "Mastodon je bezplatný softvér s otvoreným zdrojovým kódom a ochranná známka spoločnosti Mastodon gGmbH.",
-  "about.domain_blocks.no_reason_available": "Dôvod nie je k dispozícii",
-  "about.domain_blocks.preamble": "Mastodon vo všeobecnosti umožňuje prezerať obsah a komunikovať s používateľmi z akéhokoľvek iného servera vo fediverse. Toto sú výnimky, ktoré boli urobené na tomto konkrétnom serveri.",
-  "about.domain_blocks.silenced.explanation": "Vo všeobecnosti neuvidíte profily a obsah z tohto servera, pokiaľ si ho nevyhľadáte alebo sa neprihlásite k jeho sledovaniu.",
-  "about.domain_blocks.silenced.title": "Obmedzená",
+  "about.disclaimer": "Mastodon je bezplatný open-source softvér s otvoreným zdrojovým kódom a ochranná známka spoločnosti Mastodon gGmbH.",
+  "about.domain_blocks.no_reason_available": "Dôvod nebol uvedený",
+  "about.domain_blocks.preamble": "Mastodon vo všeobecnosti umožňuje prezerať obsah a komunikovať s používateľmi z akéhokoľvek iného servera vo fediverze. Tu sú uvedené výnimky, ktoré boli urobené na tomto konkrétnom serveri.",
+  "about.domain_blocks.silenced.explanation": "Vo všeobecnosti neuvidíte profily a obsah z tohto servera, pokiaľ si ich nevyhľadáte alebo sa neprihlásite k ich sledovaniu.",
+  "about.domain_blocks.silenced.title": "Obmedzený",
   "about.domain_blocks.suspended.explanation": "Žiadne údaje z tohto servera nebudú spracovávané, ukladané ani vymieňané, čo znemožní akúkoľvek interakciu alebo komunikáciu s používateľmi z tohto servera.",
-  "about.domain_blocks.suspended.title": "Vylúčená",
+  "about.domain_blocks.suspended.title": "Vylúčený",
   "about.not_available": "Tieto informácie neboli sprístupnené na tomto serveri.",
-  "about.powered_by": "Decentralizované sociálne médiá poháňané technológiou {mastodon}",
+  "about.powered_by": "Decentralizovaná sociálna sieť na základe technológie {mastodon}",
   "about.rules": "Pravidlá servera",
   "account.account_note_header": "Poznámka",
-  "account.add_or_remove_from_list": "Pridaj alebo odober zo zoznamov",
+  "account.add_or_remove_from_list": "Pridať alebo odobrať zo zoznamov",
   "account.badges.bot": "Bot",
   "account.badges.group": "Skupina",
-  "account.block": "Blokuj @{name}",
-  "account.block_domain": "Skry všetko z {domain}",
-  "account.block_short": "Blokuj",
-  "account.blocked": "Blokovaný/á",
-  "account.browse_more_on_origin_server": "Prehľadávaj viac na pôvodnom profile",
-  "account.cancel_follow_request": "Zruš žiadosť o sledovanie",
-  "account.copy": "Skopíruj odkaz na profil",
-  "account.direct": "Spomeň @{name} súkromne",
-  "account.disable_notifications": "Prestaň mi oznamovať, keď má @{name} príspevky",
-  "account.domain_blocked": "Doména skrytá",
-  "account.edit_profile": "Uprav profil",
-  "account.enable_notifications": "Oznamuj mi, keď má @{name} príspevky",
-  "account.endorse": "Zobrazuj na profile",
+  "account.block": "Blokovať @{name}",
+  "account.block_domain": "Blokovať doménu {domain}",
+  "account.block_short": "Blokovať",
+  "account.blocked": "Účet blokovaný",
+  "account.browse_more_on_origin_server": "Zobraziť viac na pôvodnom profile",
+  "account.cancel_follow_request": "Zrušiť žiadosť o sledovanie",
+  "account.copy": "Skopírovať odkaz na profil",
+  "account.direct": "Súkromne označiť @{name}",
+  "account.disable_notifications": "Zrušiť upozornenia na príspevky od @{name}",
+  "account.domain_blocked": "Doména blokovaná",
+  "account.edit_profile": "Upraviť profil",
+  "account.enable_notifications": "Zapnúť upozornenia na príspevky od @{name}",
+  "account.endorse": "Zobraziť na vlastnom profile",
   "account.featured_tags.last_status_at": "Posledný príspevok dňa {date}",
   "account.featured_tags.last_status_never": "Žiadne príspevky",
-  "account.featured_tags.title": "Odporúčané hashtagy používateľa {name}",
-  "account.follow": "Sleduj",
-  "account.follow_back": "Nasleduj späť",
+  "account.featured_tags.title": "Odporúčané hashtagy účtu {name}",
+  "account.follow": "Sledovať",
+  "account.follow_back": "Sledovať späť",
   "account.followers": "Sledovatelia",
-  "account.followers.empty": "Tohto používateľa ešte nikto nenasleduje.",
-  "account.followers_counter": "{count, plural, one {{counter} Sledujúci} other {{counter} Sledujúci}}",
-  "account.following": "Sledujem",
-  "account.following_counter": "{count, plural, one {{counter} Sledovaných} other {{counter} Sledujúcich}}",
-  "account.follows.empty": "Tento používateľ ešte nikoho nesleduje.",
-  "account.go_to_profile": "Prejdi na profil",
-  "account.hide_reblogs": "Skry zdieľania od @{name}",
-  "account.in_memoriam": "In Memoriam.",
-  "account.joined_short": "Pridal/a sa",
+  "account.followers.empty": "Tento účet ešte nikto nesleduje.",
+  "account.followers_counter": "{count, plural, one {{counter} sledujúci účet} few {{counter} sledujúce účty} many {{counter} sledujúcich účtov} other {{counter} sledujúcich účtov}}",
+  "account.following": "Sledovaný účet",
+  "account.following_counter": "{count, plural, one {{counter} sledovaný účet} few {{counter} sledované účty} many {{counter} sledovaných účtov} other {{counter} sledovaných účtov}}",
+  "account.follows.empty": "Tento účet ešte nikoho nesleduje.",
+  "account.go_to_profile": "Prejsť na profil",
+  "account.hide_reblogs": "Skryť zdieľania od @{name}",
+  "account.in_memoriam": "In memoriam.",
+  "account.joined_short": "Dátum registrácie",
   "account.languages": "Zmeniť odoberané jazyky",
   "account.link_verified_on": "Vlastníctvo tohto odkazu bolo skontrolované {date}",
   "account.locked_info": "Stav súkromia pre tento účet je nastavený na zamknutý. Jeho vlastník sa sám rozhoduje, kto ho môže sledovať.",
   "account.media": "Médiá",
-  "account.mention": "Spomeň @{name}",
-  "account.moved_to": "{name} uvádza, že jeho/jej nový účet je teraz:",
-  "account.mute": "Stíš @{name}",
-  "account.mute_notifications_short": "Stíš oznámenia",
-  "account.mute_short": "Stíš",
-  "account.muted": "Stíšený",
+  "account.mention": "Označiť @{name}",
+  "account.moved_to": "{name} uvádza, že má nový účet:",
+  "account.mute": "Stíšiť @{name}",
+  "account.mute_notifications_short": "Stíšiť upozornenia",
+  "account.mute_short": "Stíšiť",
+  "account.muted": "Účet stíšený",
   "account.mutual": "Spoločné",
   "account.no_bio": "Nie je uvedený žiadny popis.",
-  "account.open_original_page": "Otvor pôvodnú stránku",
+  "account.open_original_page": "Otvoriť pôvodnú stránku",
   "account.posts": "Príspevky",
   "account.posts_with_replies": "Príspevky a odpovede",
-  "account.report": "Nahlás @{name}",
-  "account.requested": "Čaká na schválenie. Klikni pre zrušenie žiadosti",
-  "account.requested_follow": "{name} ti poslal žiadosť na sledovanie",
-  "account.share": "Zdieľaj @{name} profil",
-  "account.show_reblogs": "Ukáž vyzdvihnutia od @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} príspevok} other {{counter} príspevkov}}",
-  "account.unblock": "Odblokuj @{name}",
-  "account.unblock_domain": "Prestaň skrývať {domain}",
-  "account.unblock_short": "Odblokuj",
-  "account.unendorse": "Nezobrazuj na profile",
-  "account.unfollow": "Prestaň nasledovať",
-  "account.unmute": "Prestaň ignorovať @{name}",
-  "account.unmute_notifications_short": "Zruš nevšímanie si obznámení",
-  "account.unmute_short": "Zruš nevšímanie",
-  "account_note.placeholder": "Klikni pre vloženie poznámky",
+  "account.report": "Nahlásiť @{name}",
+  "account.requested": "Čaká na schválenie. Žiadosť zrušíte kliknutím sem",
+  "account.requested_follow": "{name} vás chce sledovať",
+  "account.share": "Zdieľaj profil @{name}",
+  "account.show_reblogs": "Zobrazovať zdieľania od @{name}",
+  "account.statuses_counter": "{count, plural, one {{counter} príspevok} few {{counter} príspevky} many {{counter} príspevkov} other {{counter} príspevkov}}",
+  "account.unblock": "Odblokovať @{name}",
+  "account.unblock_domain": "Odblokovať doménu {domain}",
+  "account.unblock_short": "Odblokovať",
+  "account.unendorse": "Nezobrazovať na vlastnom profile",
+  "account.unfollow": "Zrušiť sledovanie",
+  "account.unmute": "Vypnúť stíšenie @{name}",
+  "account.unmute_notifications_short": "Vypnúť stíšenie upozornení",
+  "account.unmute_short": "Zrušiť stíšenie",
+  "account_note.placeholder": "Kliknutím pridať poznámku",
   "admin.dashboard.daily_retention": "Miera udržania používateľov podľa dňa po registrácii",
   "admin.dashboard.monthly_retention": "Miera udržania používateľov podľa mesiaca po registrácii",
   "admin.dashboard.retention.average": "Priemer",
-  "admin.dashboard.retention.cohort": "Mesiac zaregistrovania sa",
-  "admin.dashboard.retention.cohort_size": "Noví užívatelia",
+  "admin.dashboard.retention.cohort": "Dátum registrácie",
+  "admin.dashboard.retention.cohort_size": "Nové účty",
   "admin.impact_report.instance_accounts": "Profily účtov, ktoré by boli odstránené",
   "admin.impact_report.instance_followers": "Sledovatelia, o ktorých by naši používatelia prišli",
   "admin.impact_report.instance_follows": "Sledovatelia, o ktorých by ich používatelia prišli",
   "admin.impact_report.title": "Zhrnutie dopadu",
-  "alert.rate_limited.message": "Prosím, skús to znova za {retry_time, time, medium}.",
-  "alert.rate_limited.title": "Tempo obmedzené",
+  "alert.rate_limited.message": "Prosím, skúste to znova o {retry_time, time, medium}.",
+  "alert.rate_limited.title": "Priveľa žiadostí",
   "alert.unexpected.message": "Vyskytla sa nečakaná chyba.",
   "alert.unexpected.title": "Ups!",
   "announcement.announcement": "Oznámenie",
   "attachments_list.unprocessed": "(nespracované)",
-  "audio.hide": "Skry zvuk",
-  "boost_modal.combo": "Nabudúce môžeš kliknúť {combo} pre preskočenie",
+  "audio.hide": "Skryť zvuk",
+  "boost_modal.combo": "Nabudúce môžete preskočiť stlačením {combo}",
   "bundle_column_error.copy_stacktrace": "Kopírovať chybovú hlášku",
   "bundle_column_error.error.body": "Požadovanú stránku nebolo možné vykresliť. Môže to byť spôsobené chybou v našom kóde alebo problémom s kompatibilitou prehliadača.",
   "bundle_column_error.error.title": "Ale nie!",
-  "bundle_column_error.network.body": "Pri pokuse o načítanie tejto stránky sa vyskytla chyba. Môže to byť spôsobené dočasným problémom s Vaším internetovým pripojením alebo týmto serverom.",
+  "bundle_column_error.network.body": "Pri pokuse o načítanie tejto stránky sa vyskytla chyba. Môže to byť spôsobené dočasným problémom s vaším internetovým pripojením alebo týmto serverom.",
   "bundle_column_error.network.title": "Chyba siete",
-  "bundle_column_error.retry": "Skús to znova",
-  "bundle_column_error.return": "Prejdi späť na domovskú stránku",
-  "bundle_column_error.routing.body": "Žiadaná stránka nebola nájdená. Ste si istý, že zadaná adresa URL je správna?",
+  "bundle_column_error.retry": "Skúste to znova",
+  "bundle_column_error.return": "Prejdite späť na domovskú stránku",
+  "bundle_column_error.routing.body": "Žiadaná stránka nebola nájdená. Ste si istí, že zadaná adresa URL je správna?",
   "bundle_column_error.routing.title": "404",
-  "bundle_modal_error.close": "Zatvor",
-  "bundle_modal_error.message": "Nastala chyba pri načítaní tohto komponentu.",
+  "bundle_modal_error.close": "Zatvoriť",
+  "bundle_modal_error.message": "Pri načítavaní tohto komponentu nastala chyba.",
   "bundle_modal_error.retry": "Skúsiť znova",
   "closed_registrations.other_server_instructions": "Keďže Mastodon je decentralizovaný, môžete si vytvoriť účet na inom serveri a stále komunikovať s týmto serverom.",
-  "closed_registrations_modal.description": "Vytvorenie účtu na {domain} nie je v súčasnosti možné, ale majte prosím na pamäti, že nepotrebujete účet práve na {domain}, aby bolo možné používať Mastodon.",
-  "closed_registrations_modal.find_another_server": "Nájdi iný server",
+  "closed_registrations_modal.description": "Vytvorenie účtu na {domain} nie je v súčasnosti možné, ale myslite na to, že na používanie Mastodonu nepotrebujete účet práve na {domain}.",
+  "closed_registrations_modal.find_another_server": "Nájsť iný server",
   "closed_registrations_modal.preamble": "Mastodon je decentralizovaný, takže bez ohľadu na to, kde si vytvoríte účet, budete môcť sledovať a komunikovať s kýmkoľvek na tomto serveri. Môžete ho dokonca hostiť sami!",
-  "closed_registrations_modal.title": "Registrácia na Mastodon",
+  "closed_registrations_modal.title": "Registrácia na Mastodone",
   "column.about": "O tomto serveri",
-  "column.blocks": "Blokovaní užívatelia",
+  "column.blocks": "Blokované účty",
   "column.bookmarks": "Záložky",
   "column.community": "Miestna časová os",
-  "column.direct": "Súkromné spomenutia",
-  "column.directory": "Prehľadávaj profily",
-  "column.domain_blocks": "Skryté domény",
+  "column.direct": "Súkromné označenia",
+  "column.directory": "Prehľadávať profily",
+  "column.domain_blocks": "Blokované domény",
   "column.favourites": "Obľúbené",
   "column.firehose": "Živé kanály",
   "column.follow_requests": "Žiadosti o sledovanie",
   "column.home": "Domov",
   "column.lists": "Zoznamy",
-  "column.mutes": "Nevšímaní užívatelia",
-  "column.notifications": "Oznámenia",
+  "column.mutes": "Stíšené účty",
+  "column.notifications": "Upozornenia",
   "column.pins": "Pripnuté príspevky",
   "column.public": "Federovaná časová os",
   "column_back_button.label": "Späť",
   "column_header.hide_settings": "Skryť nastavenia",
-  "column_header.moveLeft_settings": "Presuň stĺpec doľava",
-  "column_header.moveRight_settings": "Presuň stĺpec doprava",
-  "column_header.pin": "Pripni",
-  "column_header.show_settings": "Ukáž nastavenia",
-  "column_header.unpin": "Odopni",
+  "column_header.moveLeft_settings": "Presunúť stĺpec doľava",
+  "column_header.moveRight_settings": "Presunúť stĺpec doprava",
+  "column_header.pin": "Pripnúť",
+  "column_header.show_settings": "Zobraziť nastavenia",
+  "column_header.unpin": "Odopnúť",
   "column_subheading.settings": "Nastavenia",
-  "community.column_settings.local_only": "Iba miestna",
+  "community.column_settings.local_only": "Iba miestne",
   "community.column_settings.media_only": "Iba médiá",
-  "community.column_settings.remote_only": "Iba odľahlé",
-  "compose.language.change": "Zmeň jazyk",
-  "compose.language.search": "Hľadaj medzi jazykmi...",
+  "community.column_settings.remote_only": "Iba vzdialené",
+  "compose.language.change": "Zmeniť jazyk",
+  "compose.language.search": "Vyhľadávať jazyky…",
   "compose.published.body": "Príspevok zverejnený.",
-  "compose.published.open": "Otvor",
+  "compose.published.open": "Otvoriť",
   "compose.saved.body": "Príspevok uložený.",
-  "compose_form.direct_message_warning_learn_more": "Zisti viac",
-  "compose_form.encryption_warning": "Príspevky na Mastodon nie sú end-to-end šifrované. Nezdieľajte cez Mastodon žiadne citlivé informácie.",
-  "compose_form.hashtag_warning": "Tento príspevok nebude zobrazený pod žiadným haštagom, lebo nieje verejne listovaný. Iba verejné príspevky môžu byť nájdené podľa haštagu.",
-  "compose_form.lock_disclaimer": "Tvoj účet nie je {locked}. Ktokoľvek ťa môže nasledovať a vidieť tvoje príspevky pre sledujúcich.",
+  "compose_form.direct_message_warning_learn_more": "Viac informácií",
+  "compose_form.encryption_warning": "Príspevky na Mastodone nie sú šifrované end-to-end. Nezdieľajte cez Mastodon žiadne citlivé informácie.",
+  "compose_form.hashtag_warning": "Tento príspevok nebude zobrazený pod žiadným hashtagom, lebo nie je verejný. Iba verejné príspevky môžu byť nájdené podľa hashtagu.",
+  "compose_form.lock_disclaimer": "Váš účet nie je {locked}. Ktokoľvek vás môže sledovať a vidieť vaše príspevky pre sledujúcich.",
   "compose_form.lock_disclaimer.lock": "zamknutý",
-  "compose_form.placeholder": "Čo máš na mysli?",
+  "compose_form.placeholder": "Na čo práve myslíte?",
   "compose_form.poll.duration": "Trvanie ankety",
   "compose_form.poll.multiple": "Viacero možností",
-  "compose_form.poll.option_placeholder": "Voľba {number}",
-  "compose_form.poll.single": "Vyber jednu",
-  "compose_form.poll.switch_to_multiple": "Zmeň anketu pre povolenie viacerých možností",
-  "compose_form.poll.switch_to_single": "Zmeň anketu na takú s jedinou voľbou",
+  "compose_form.poll.option_placeholder": "Možnosť {number}",
+  "compose_form.poll.single": "Jediný výber",
+  "compose_form.poll.switch_to_multiple": "Zmeniť anketu a povoliť viaceré možnosti",
+  "compose_form.poll.switch_to_single": "Zmeniť anketu na jediný povolený výber",
   "compose_form.poll.type": "Typ",
-  "compose_form.publish": "Prispej",
-  "compose_form.publish_form": "Zverejniť",
-  "compose_form.reply": "Odpovedz",
-  "compose_form.save_changes": "Aktualizácia",
-  "compose_form.spoiler.marked": "Text je ukrytý za varovaním",
-  "compose_form.spoiler.unmarked": "Text nieje ukrytý",
+  "compose_form.publish": "Uverejniť",
+  "compose_form.publish_form": "Nový príspevok",
+  "compose_form.reply": "Odpovedať",
+  "compose_form.save_changes": "Aktualizovať",
+  "compose_form.spoiler.marked": "Odstrániť varovanie o obsahu",
+  "compose_form.spoiler.unmarked": "Pridať varovanie o obsahu",
   "compose_form.spoiler_placeholder": "Varovanie o obsahu (voliteľné)",
   "confirmation_modal.cancel": "Zruš",
-  "confirmations.block.block_and_report": "Zablokuj a nahlás",
-  "confirmations.block.confirm": "Blokuj",
-  "confirmations.block.message": "Si si istý/á, že chceš blokovať {name}?",
-  "confirmations.cancel_follow_request.confirm": "Odvolanie žiadosti",
-  "confirmations.cancel_follow_request.message": "Naozaj chcete stiahnuť svoju žiadosť o sledovanie {name}?",
-  "confirmations.delete.confirm": "Vymaž",
-  "confirmations.delete.message": "Si si istý/á, že chceš vymazať túto správu?",
-  "confirmations.delete_list.confirm": "Vymaž",
-  "confirmations.delete_list.message": "Si si istý/á, že chceš natrvalo vymazať tento zoznam?",
-  "confirmations.discard_edit_media.confirm": "Zahoď",
+  "confirmations.block.block_and_report": "Zablokovať a nahlásiť",
+  "confirmations.block.confirm": "Zablokovať",
+  "confirmations.block.message": "Určite chcete zablokovať {name}?",
+  "confirmations.cancel_follow_request.confirm": "Stiahnuť žiadosť",
+  "confirmations.cancel_follow_request.message": "Určite chcete stiahnuť svoju žiadosť o sledovanie {name}?",
+  "confirmations.delete.confirm": "Vymazať",
+  "confirmations.delete.message": "Určite chcete tento príspevok vymazať?",
+  "confirmations.delete_list.confirm": "Vymazať",
+  "confirmations.delete_list.message": "Určite chcete tento zoznam trvalo vymazať?",
+  "confirmations.discard_edit_media.confirm": "Zahodiť",
   "confirmations.discard_edit_media.message": "Máte neuložené zmeny v popise alebo náhľade média, zahodiť ich aj tak?",
-  "confirmations.domain_block.confirm": "Skry celú doménu",
-  "confirmations.domain_block.message": "Si si naozaj istý/á, že chceš blokovať celú doménu {domain}? Vo väčšine prípadov stačí blokovať alebo ignorovať pár konkrétnych užívateľov, čo sa doporučuje. Neuvidíš obsah z tejto domény v žiadnej verejnej časovej osi, ani v oznámeniach. Tvoji následovníci pochádzajúci z tejto domény budú odstránení.",
-  "confirmations.edit.confirm": "Uprav",
-  "confirmations.edit.message": "Úpravou teraz prepíšeš správu, ktorú práve zostavuješ. Si si istý/á, že chceš pokračovať?",
-  "confirmations.logout.confirm": "Odhlás sa",
-  "confirmations.logout.message": "Si si istý/á, že sa chceš odhlásiť?",
-  "confirmations.mute.confirm": "Nevšímaj si",
-  "confirmations.mute.explanation": "Toto nastavenie skryje ich príspevky, alebo príspevky od iných v ktorých sú spomenutí, ale umožní im vidieť tvoje príspevky, aj ťa nasledovať.",
-  "confirmations.mute.message": "Naozaj si chceš nevšímať {name}?",
-  "confirmations.redraft.confirm": "Vyčisti a prepíš",
-  "confirmations.redraft.message": "Ste si istý, že chcete premazať a prepísať tento príspevok? Jeho nadobudnuté vyzdvihnutia a obľúbenia, ale i odpovede na pôvodný príspevok budú odlúčené.",
-  "confirmations.reply.confirm": "Odpovedz",
+  "confirmations.domain_block.confirm": "Blokovať celú doménu",
+  "confirmations.domain_block.message": "Určite chcete blokovať celú doménu {domain}? Vo väčšine prípadov stačí blokovať alebo ignorovať pár konkrétnych účtov, čo aj odporúčame. Obsah z tejto domény neuvidíte v žiadnej verejnej časovej osi ani v upozorneniach. Vaši sledujúci pochádzajúci z tejto domény budú odstránení.",
+  "confirmations.edit.confirm": "Upraviť",
+  "confirmations.edit.message": "Úpravou prepíšete príspevok, ktorý máte rozpísaný. Určite chcete pokračovať?",
+  "confirmations.logout.confirm": "Odhlásiť sa",
+  "confirmations.logout.message": "Určite sa chcete odhlásiť?",
+  "confirmations.mute.confirm": "Stíšiť",
+  "confirmations.mute.explanation": "Toto nastavenie skryje príspevky od daného účtu alebo príspevky od iných, v ktorých je tento účet spomenutý. Účet bude stále vidieť vaše príspevky a môcť vás sledovať.",
+  "confirmations.mute.message": "Určite chcete stíšiť {name}?",
+  "confirmations.redraft.confirm": "Vymazať a prepísať",
+  "confirmations.redraft.message": "Určite chcete tento príspevok vymazať a prepísať? Prídete o jeho zdieľania a ohviezdičkovania a odpovede na pôvodný príspevok budú odlúčené.",
+  "confirmations.reply.confirm": "Odpovedať",
   "confirmations.reply.message": "Odpovedaním akurát teraz prepíšeš správu, ktorú máš práve rozpísanú. Si si istý/á, že chceš pokračovať?",
-  "confirmations.unfollow.confirm": "Prestaň sledovať",
-  "confirmations.unfollow.message": "Naozaj chceš prestať sledovať {name}?",
-  "conversation.delete": "Vymaž konverzáciu",
-  "conversation.mark_as_read": "Označ za prečítané",
-  "conversation.open": "Ukáž konverzáciu",
+  "confirmations.unfollow.confirm": "Prestať sledovať",
+  "confirmations.unfollow.message": "Určite chcete prestať sledovať {name}?",
+  "conversation.delete": "Vymazať konverzáciu",
+  "conversation.mark_as_read": "Označiť ako prečítanú",
+  "conversation.open": "Zobraziť konverzáciu",
   "conversation.with": "S {names}",
-  "copy_icon_button.copied": "Skopírovaný do schránky",
+  "copy_icon_button.copied": "Skopírované do schránky",
   "copypaste.copied": "Skopírované",
-  "copypaste.copy_to_clipboard": "Skopíruj do schránky",
-  "directory.federated": "Zo známého fedivesmíru",
+  "copypaste.copy_to_clipboard": "Skopírovať do schránky",
+  "directory.federated": "Zo známého fediverza",
   "directory.local": "Iba z {domain}",
   "directory.new_arrivals": "Nové príchody",
-  "directory.recently_active": "Nedávno aktívne",
+  "directory.recently_active": "Nedávna aktivita",
   "disabled_account_banner.account_settings": "Nastavenia účtu",
-  "disabled_account_banner.text": "Vaše konto {disabledAccount} je momentálne vypnuté.",
-  "dismissable_banner.community_timeline": "Toto sú najnovšie verejné príspevky od ľudí, ktorých účty sú hostované na {domain}.",
+  "disabled_account_banner.text": "Váš účet {disabledAccount} je momentálne deaktivovaný.",
+  "dismissable_banner.community_timeline": "Toto sú najnovšie verejné príspevky od účtov hostených na {domain}.",
   "dismissable_banner.dismiss": "Zrušiť",
-  "dismissable_banner.explore_links": "Tieto správy sú dnes najviac zdieľané naprieč sociálnou sieťou. Novšie správy, zdieľané viacerými rôznymi ľudmi sú zoradené vyššie.",
-  "dismissable_banner.explore_statuses": "Toto sú príspevky naprieč celej sociálnej sieti, ktoré dnes naberajú na ťahu. Novšie príspevky s viacerými vyzdvihnutiami sú radené vyššie.",
-  "dismissable_banner.explore_tags": "Tieto haštagy práve teraz získavajú popularitu, medzi ľuďmi na tomto a ďalších serveroch decentralizovanej siete.",
-  "dismissable_banner.public_timeline": "Toto sú najnovšie verejné príspevky od ľudí, ktorí sledujú {domain}, cez celú sociálnu sieť.",
-  "embed.instructions": "Umiestni kód uvedený nižšie pre pridanie tohto statusu na tvoju web stránku.",
-  "embed.preview": "Tu je ako to bude vyzerať:",
+  "dismissable_banner.explore_links": "Toto sú správy zo sociálnej siete, ktoré sú dnes populárne. Novšie správy s viacerými ohviezdičkovaniami a zdieľaniami sú radené vyššie.",
+  "dismissable_banner.explore_statuses": "Toto sú príspevky z celej sociálnej siete, ktoré sú dnes populárne. Novšie príspevky s viacerými ohviezdičkovaniami a zdieľaniami sú radené vyššie.",
+  "dismissable_banner.explore_tags": "Toto sú hashtagy zo sociálnej siete, ktoré sú dnes populárne. Novšie hashtagy používané viacerými ľuďmi sú radené vyššie.",
+  "dismissable_banner.public_timeline": "Toto sú najnovšie verejné príspevky od účtov na sociálnej sieti, ktoré sú sledované účtami z {domain}.",
+  "embed.instructions": "Tento príspevok môžete pridať na svoju webovú stránku použitím tohto kódu.",
+  "embed.preview": "Takto bude vyzerať:",
   "emoji_button.activity": "Aktivita",
-  "emoji_button.clear": "Vyčisti",
+  "emoji_button.clear": "Vyčistiť",
   "emoji_button.custom": "Vlastné",
   "emoji_button.flags": "Vlajky",
   "emoji_button.food": "Jedlá a nápoje",
-  "emoji_button.label": "Vlož emotikony",
-  "emoji_button.nature": "Prírodné",
-  "emoji_button.not_found": "Nie emotikony!! (╯°□°）╯︵ ┻━┻",
+  "emoji_button.label": "Vložiť emotikony",
+  "emoji_button.nature": "Príroda",
+  "emoji_button.not_found": "Žiadne emotikony",
   "emoji_button.objects": "Predmety",
   "emoji_button.people": "Ľudia",
   "emoji_button.recent": "Často používané",
-  "emoji_button.search": "Hľadaj...",
+  "emoji_button.search": "Hľadať…",
   "emoji_button.search_results": "Výsledky hľadania",
   "emoji_button.symbols": "Symboly",
   "emoji_button.travel": "Cestovanie a miesta",
-  "empty_column.account_hides_collections": "Tento užívateľ si zvolil nesprístupniť túto informáciu",
+  "empty_column.account_hides_collections": "Tento účet sa rozhodol túto informáciu nesprístupniť",
   "empty_column.account_suspended": "Účet bol pozastavený",
-  "empty_column.account_timeline": "Nie sú tu žiadne príspevky!",
+  "empty_column.account_timeline": "Nie sú tu žiadne príspevky.",
   "empty_column.account_unavailable": "Profil nedostupný",
-  "empty_column.blocks": "Ešte si nikoho nezablokoval/a.",
-  "empty_column.bookmarked_statuses": "Ešte nemáš žiadné záložky. Keď si pridáš príspevok k záložkám, zobrazí sa tu.",
-  "empty_column.community": "Lokálna časová os je prázdna. Napíšte niečo, aby sa to tu začalo hýbať!",
-  "empty_column.direct": "Ešte nemáš žiadne priame zmienky. Keď nejakú pošleš alebo dostaneš, ukáže sa tu.",
-  "empty_column.domain_blocks": "Žiadne domény ešte niesú skryté.",
-  "empty_column.explore_statuses": "Momentálne nie je nič trendové. Pozrite sa neskôr!",
-  "empty_column.favourited_statuses": "Zatiaľ nemáš žiadne obľúbené príspevky. Akonáhle označíš nejaký ako obľúbený, zobrazí sa tu.",
-  "empty_column.favourites": "Nikto si zatiaľ tento príspevok neobľúbil. Akonáhle tak niekto urobí, zobrazí sa tu.",
-  "empty_column.follow_requests": "Ešte nemáš žiadne požiadavky o následovanie. Keď nejaké dostaneš, budú tu zobrazené.",
-  "empty_column.followed_tags": "Ešte nenasleduješ žiadne haštagy. Keď tak urobíš, zobrazia sa tu.",
+  "empty_column.blocks": "Nemáte blokované žiadne účty.",
+  "empty_column.bookmarked_statuses": "Ešte nemáte záložku v žiadnom príspevku. Keď si ju do nejakého príspevkuk pridáte, zobrazí sa tu.",
+  "empty_column.community": "Miesta časová os je prázdna. Napíšte niečo, aby to tu ožilo!",
+  "empty_column.direct": "Ešte nemáte žiadne súkromné označenia. Keď nejaké pošlete alebo dostanete, zobrazí sa tu.",
+  "empty_column.domain_blocks": "Žiadne domény ešte nie sú blokované.",
+  "empty_column.explore_statuses": "Momentálne nie je nič populárne. Skontrolujte to zas neskôr.",
+  "empty_column.favourited_statuses": "Zatiaľ nemáte žiadne ohviezdičkované príspevky. Akonáhle nejaký ohviezdičkujete, zobrazí sa tu.",
+  "empty_column.favourites": "Zatiaľ tento príspevok nikto neohviezdičkoval. Akonáhle sa tak stane, zobrazí sa tu.",
+  "empty_column.follow_requests": "Zatiaľ nemáte žiadne žiadosti o sledovanie. Keď nejakú dostanete, zobrazí sa tu.",
+  "empty_column.followed_tags": "Zatiaľ nesledujete žiadne hashtagy. Keď tak urobíte, zobrazia sa tu.",
   "empty_column.hashtag": "Pod týmto hashtagom sa ešte nič nenachádza.",
-  "empty_column.home": "Tvoja lokálna osa je zatiaľ prázdna! Pre začiatok navštív {public}, alebo použi vyhľadávanie a nájdi tak aj iných užívateľov.",
-  "empty_column.list": "Tento zoznam je ešte prázdny. Keď ale členovia tohoto zoznamu napíšu nové správy, tak tie sa objavia priamo tu.",
-  "empty_column.lists": "Nemáš ešte žiadne zoznamy. Keď nejaký vytvoríš, bude zobrazený práve tu.",
-  "empty_column.mutes": "Ešte si nestĺmil žiadných užívateľov.",
-  "empty_column.notifications": "Ešte nemáš žiadne oznámenia. Začni komunikovať s ostatnými, aby diskusia mohla začať.",
-  "empty_column.public": "Ešte tu nič nie je. Napíš niečo verejne, alebo začni sledovať užívateľov z iných serverov, aby tu niečo pribudlo",
-  "error.unexpected_crash.explanation": "Kvôli chybe v našom kóde, alebo problému s kompatibilitou prehliadača, túto stránku nebolo možné zobraziť správne.",
-  "error.unexpected_crash.explanation_addons": "Túto stránku sa nepodarilo zobraziť správne. Táto chyba je pravdepodobne spôsobená rozšírením v prehliadači, alebo nástrojmi automatického prekladu.",
-  "error.unexpected_crash.next_steps": "Skús obnoviť stránku. Ak to nepomôže, pravdepodobne budeš stále môcť používať Mastodon cez iný prehliadač, alebo natívnu aplikáciu.",
-  "error.unexpected_crash.next_steps_addons": "Skús ich vypnúť, a obnoviť túto stránku. Ak to nepomôže, pravdepodobne budeš stále môcť Mastodon používať cez iný prehliadač, alebo natívnu aplikáciu.",
-  "errors.unexpected_crash.copy_stacktrace": "Skopíruj stacktrace do schránky",
-  "errors.unexpected_crash.report_issue": "Nahlás problém",
+  "empty_column.home": "Vaša domáca časová os je zatiaľ prázdna. Začnite sledovať ostatných a naplňte si ju.",
+  "empty_column.list": "Tento zoznam je zatiaľ prázdny. Keď ale členovia tohoto zoznamu uverejnia nové príspevky, objavia sa tu.",
+  "empty_column.lists": "Zatiaľ nemáte žiadne zoznamy. Keď nejaký vytvoríte, zobrazí sa tu.",
+  "empty_column.mutes": "Zatiaľ ste si nikoho nestíšili.",
+  "empty_column.notifications": "Zatiaľ nemáte žiadne upozornenia. Začnú vám pribúdať, keď s vami začnú interagovať ostatní.",
+  "empty_column.public": "Zatiaľ tu nič nie je. Napíšte niečo verejné alebo začnite sledovať účty z iných serverov, aby tu niečo pribudlo.",
+  "error.unexpected_crash.explanation": "Pre chybu v našom kóde alebo problém s kompatibilitou prehliadača nebolo túto stránku možné zobraziť správne.",
+  "error.unexpected_crash.explanation_addons": "Túto stránku sa nepodarilo zobraziť správne. Táto chyba je pravdepodobne spôsobená rozšírením v prehliadači alebo nástrojmi automatického prekladu.",
+  "error.unexpected_crash.next_steps": "Skúste stránku obnoviť. Ak to nepomôže, pravdepodobne budete stále môcť používať Mastodon cez iný prehliadač alebo natívnu aplikáciu.",
+  "error.unexpected_crash.next_steps_addons": "Skúste ich vypnúť a stránku obnoviť. Ak to nepomôže, pravdepodobne budete stále môcť Mastodon používať cez iný prehliadač alebo natívnu aplikáciu.",
+  "errors.unexpected_crash.copy_stacktrace": "Kopírovať stacktrace do schránky",
+  "errors.unexpected_crash.report_issue": "Nahlásiť problém",
   "explore.search_results": "Výsledky hľadania",
   "explore.suggested_follows": "Ľudia",
-  "explore.title": "Objavuj",
-  "explore.trending_links": "Novinky",
+  "explore.title": "Objavovať",
+  "explore.trending_links": "Správy",
   "explore.trending_statuses": "Príspevky",
-  "explore.trending_tags": "Haštagy",
+  "explore.trending_tags": "Hashtagy",
   "filter_modal.added.context_mismatch_explanation": "Táto kategória filtrov sa nevzťahuje na kontext, v ktorom ste získali prístup k tomuto príspevku. Ak chcete, aby sa príspevok filtroval aj v tomto kontexte, budete musieť filter upraviť.",
   "filter_modal.added.context_mismatch_title": "Nesúlad kontextu!",
   "filter_modal.added.expired_explanation": "Platnosť tejto kategórie filtra vypršala, aby sa použila, je potrebné zmeniť dátum vypršania platnosti.",
   "filter_modal.added.expired_title": "Vypršala platnosť filtra!",
   "filter_modal.added.review_and_configure": "Ak chcete skontrolovať a ďalej konfigurovať túto kategóriu filtrov, prejdite na odkaz {settings_link}.",
-  "filter_modal.added.review_and_configure_title": "Nastavenie triedenia",
-  "filter_modal.added.settings_link": "stránka s nastaveniami",
+  "filter_modal.added.review_and_configure_title": "Nastavenia filtrov",
+  "filter_modal.added.settings_link": "stránka nastavení",
   "filter_modal.added.short_explanation": "Tento príspevok bol pridaný do nasledujúcej kategórie filtrov: {title}.",
-  "filter_modal.added.title": "Triedenie pridané!",
+  "filter_modal.added.title": "Filter bol pridaný.",
   "filter_modal.select_filter.context_mismatch": "sa na tento kontext nevzťahuje",
-  "filter_modal.select_filter.expired": "vypršalo",
+  "filter_modal.select_filter.expired": "vypršal",
   "filter_modal.select_filter.prompt_new": "Nová kategória: {name}",
-  "filter_modal.select_filter.search": "Vyhľadávať alebo vytvoriť",
+  "filter_modal.select_filter.search": "Vyhľadať alebo vytvoriť",
   "filter_modal.select_filter.subtitle": "Použite existujúcu kategóriu alebo vytvorte novú",
   "filter_modal.select_filter.title": "Filtrovanie tohto príspevku",
   "filter_modal.title.status": "Filtrovanie príspevku",
-  "firehose.all": "Všetky",
+  "firehose.all": "Všetko",
   "firehose.local": "Tento server",
-  "firehose.remote": "Iné servery",
-  "follow_request.authorize": "Povoľ prístup",
-  "follow_request.reject": "Odmietni",
-  "follow_requests.unlocked_explanation": "Síce Váš učet nie je uzamknutý, ale {domain} tím si myslel že môžete chcieť skontrolovať žiadosti o sledovanie z týchto účtov manuálne.",
-  "follow_suggestions.curated_suggestion": "Staff pick",
-  "follow_suggestions.dismiss": "Znovu nezobrazuj",
-  "follow_suggestions.personalized_suggestion": "Prispôsobené odporúčania",
-  "follow_suggestions.popular_suggestion": "Populárne návrhy",
-  "follow_suggestions.view_all": "Zobraz všetky",
-  "follow_suggestions.who_to_follow": "Koho nasledovať",
-  "followed_tags": "Nasledované haštagy",
-  "footer.about": "O",
+  "firehose.remote": "Ostatné servery",
+  "follow_request.authorize": "Povoliť",
+  "follow_request.reject": "Zamietnuť",
+  "follow_requests.unlocked_explanation": "Aj keď váš účet nie je uzamknutý, tím domény {domain} si myslel, že môžete chcieť skontrolovať žiadosti o sledovanie z týchto účtov manuálne.",
+  "follow_suggestions.curated_suggestion": "Výber redakcie",
+  "follow_suggestions.dismiss": "Znova nezobrazovať",
+  "follow_suggestions.hints.featured": "Tento profil bol ručne zvolený tímom domény {domain}.",
+  "follow_suggestions.hints.friends_of_friends": "Tento profil je obľúbený medzi účtami, ktoré sledujete.",
+  "follow_suggestions.hints.most_followed": "Tento profil patrí na doméne {domain} medzi najsledovanejšie.",
+  "follow_suggestions.hints.most_interactions": "Tento profil má v poslednej dobe na doméne {domain} veľa interakcií.",
+  "follow_suggestions.hints.similar_to_recently_followed": "Tento profil je podobný profilom, ktoré ste nedávno začali sledovať.",
+  "follow_suggestions.personalized_suggestion": "Prispôsobený návrh",
+  "follow_suggestions.popular_suggestion": "Obľúbený návrh",
+  "follow_suggestions.view_all": "Zobraziť všetky",
+  "follow_suggestions.who_to_follow": "Koho sledovať",
+  "followed_tags": "Sledované hashtagy",
+  "footer.about": "Viac informácií",
   "footer.directory": "Adresár profilov",
   "footer.get_app": "Stiahnuť aplikáciu",
-  "footer.invite": "Pozvi ľudí",
+  "footer.invite": "Pozvať ľudí",
   "footer.keyboard_shortcuts": "Klávesové skratky",
-  "footer.privacy_policy": "Zásady súkromia",
+  "footer.privacy_policy": "Pravidlá ochrany súkromia",
   "footer.source_code": "Zobraziť zdrojový kód",
   "footer.status": "Stav",
   "generic.saved": "Uložené",
-  "getting_started.heading": "Začni tu",
+  "getting_started.heading": "Začíname",
   "hashtag.column_header.tag_mode.all": "a {additional}",
   "hashtag.column_header.tag_mode.any": "alebo {additional}",
   "hashtag.column_header.tag_mode.none": "bez {additional}",
   "hashtag.column_settings.select.no_options_message": "Žiadne návrhy neboli nájdené",
-  "hashtag.column_settings.select.placeholder": "Zadaj haštagy…",
+  "hashtag.column_settings.select.placeholder": "Zadajte hashtagy…",
   "hashtag.column_settings.tag_mode.all": "Všetky tieto",
-  "hashtag.column_settings.tag_mode.any": "Hociktorý z týchto",
+  "hashtag.column_settings.tag_mode.any": "Ľubovoľné z týchto",
   "hashtag.column_settings.tag_mode.none": "Žiaden z týchto",
-  "hashtag.column_settings.tag_toggle": "Vlož dodatočné haštagy pre tento stĺpec",
-  "hashtag.counter_by_accounts": "{count, plural, one {{counter} účastník} other {{counter} účastníci}}",
+  "hashtag.column_settings.tag_toggle": "Vložte dodatočné hashtagy pre tento stĺpec",
+  "hashtag.counter_by_accounts": "{count, plural, one {{counter} prispievateľ} few {{counter} prispievatelia} many {{counter} prispievateľov} other {{counter} prispievateľov}}",
   "hashtag.counter_by_uses": "{count, plural, one {{counter} príspevok} few {{counter} príspevky} many {{counter} príspevkov} other {{counter} príspevkov}}",
   "hashtag.counter_by_uses_today": "{count, plural, one {{counter} príspevok} few {{counter} príspevky} many {{counter} príspevkov} other {{counter} príspevkov}} dnes",
-  "hashtag.follow": "Sleduj haštag",
-  "hashtag.unfollow": "Nesleduj haštag",
-  "hashtags.and_other": "…a {count, plural, one {} few {# ďalšie} many {# ďalších}other {# ďalších}}",
+  "hashtag.follow": "Sledovať hashtag",
+  "hashtag.unfollow": "Prestať sledovať hashtag",
+  "hashtags.and_other": "…a {count, plural, other {# ďalších}}",
   "home.column_settings.basic": "Základné",
-  "home.column_settings.show_reblogs": "Ukáž vyzdvihnuté",
-  "home.column_settings.show_replies": "Ukáž odpovede",
-  "home.hide_announcements": "Skry oznámenia",
-  "home.pending_critical_update.body": "Prosím aktualizuj si svoj Mastodon server, ako náhle to bude možné!",
-  "home.pending_critical_update.link": "Pozri aktualizácie",
-  "home.pending_critical_update.title": "Je dostupná kritická bezpečnostná aktualizácia!",
-  "home.show_announcements": "Ukáž oznámenia",
-  "interaction_modal.description.favourite": "S účtom na Mastodone si môžeš tento príspevok obľúbiť, aby si dal/a autorovi vedieť, že ho oceňuješ, a uložiť si ho na neskôr.",
-  "interaction_modal.description.follow": "Ak máte konto na Mastodone, môžete sledovať {name} a dostávať príspevky do svojho domovského kanála.",
-  "interaction_modal.description.reblog": "Ak máte účet na Mastodone, môžete tento príspevok posilniť a zdieľať ho s vlastnými sledovateľmi.",
-  "interaction_modal.description.reply": "Ak máte účet na Mastodone, môžete reagovať na tento príspevok.",
+  "home.column_settings.show_reblogs": "Zobraziť zdieľania",
+  "home.column_settings.show_replies": "Zobraziť odpovede",
+  "home.hide_announcements": "Skryť oznámenia",
+  "home.pending_critical_update.body": "Prosíme, aktualizujte si svoj Mastodon server, hneď ako to bude možné.",
+  "home.pending_critical_update.link": "Zobraziť aktualizácie",
+  "home.pending_critical_update.title": "Je dostupná kritická bezpečnostná aktualizácia.",
+  "home.show_announcements": "Zobraziť oznámenia",
+  "interaction_modal.description.favourite": "S účtom na Mastodone môžete tento príspevok ohviezdičkovať, tak dať autorovi vedieť, že sa vám páči, a uložiť si ho na neskôr.",
+  "interaction_modal.description.follow": "S účtom na Mastodone môžete {name} sledovať a vidieť ich príspevky vo svojom domovskom kanáli.",
+  "interaction_modal.description.reblog": "S účtom na Mastodone môžete tento príspevok zdeľať so svojimi sledovateľmi.",
+  "interaction_modal.description.reply": "S účtom na Mastodone môžete na tento príspevok odpovedať.",
   "interaction_modal.login.action": "Prejsť domov",
-  "interaction_modal.login.prompt": "Doména tvojho domovského servera, napr. mastodon.social",
-  "interaction_modal.no_account_yet": "Niesi na Mastodone?",
+  "interaction_modal.login.prompt": "Doména vášho domovského servera, napr. mastodon.social",
+  "interaction_modal.no_account_yet": "Nie ste na Mastodone?",
   "interaction_modal.on_another_server": "Na inom serveri",
   "interaction_modal.on_this_server": "Na tomto serveri",
-  "interaction_modal.sign_in": "Nie si prihláseý/á na tomto serveri. Kde je tvoj účet hostovaný?",
-  "interaction_modal.sign_in_hint": "Tip: Toto je webová stránka, na ktorej ste sa zaregistrovali. Ak si nepamätáte, pohľadajte uvítací e-mail vo svojej schránke. Môžete tiež zadať svoje celé používateľské meno! (napr. @Mastodon@mastodon.social)",
-  "interaction_modal.title.favourite": "Obľúb si {name} ov/in príspevok",
-  "interaction_modal.title.follow": "Nasleduj {name}",
-  "interaction_modal.title.reblog": "Vyzdvihni {name}ov/in príspevok",
-  "interaction_modal.title.reply": "Odpovedz na {name}ov/in príspevok",
-  "intervals.full.days": "{number, plural, one {# deň} few {# dní} many {# dní} other {# dní}}",
-  "intervals.full.hours": "{number, plural, one {# hodina} few {# hodín} many {# hodín} other {# hodín}}",
-  "intervals.full.minutes": "{number, plural, one {# minúta} few {# minút} many {# minút} other {# minút}}",
-  "keyboard_shortcuts.back": "dostať sa naspäť",
-  "keyboard_shortcuts.blocked": "otvor zoznam blokovaných užívateľov",
-  "keyboard_shortcuts.boost": "Vyzdvihni príspevok",
-  "keyboard_shortcuts.column": "zameraj sa na príspevok v jednom zo stĺpcov",
-  "keyboard_shortcuts.compose": "zameraj sa na písaciu plochu",
+  "interaction_modal.sign_in": "Na tomto serveri nie ste prihlásený. Kde je váš účet hostený?",
+  "interaction_modal.sign_in_hint": "Tip: Toto je webová stránka, na ktorej ste sa zaregistrovali. Ak si nepamätáte, pohľadajte uvítací e-mail vo svojej schránke. Môžete tiež zadať svoje celé používateľské meno (napr. @Mastodon@mastodon.social).",
+  "interaction_modal.title.favourite": "Ohviezdičkovať príspevok od {name}",
+  "interaction_modal.title.follow": "Sledovať {name}",
+  "interaction_modal.title.reblog": "Zdieľať príspevok od {name}",
+  "interaction_modal.title.reply": "Odpovedať na príspevok od {name}",
+  "intervals.full.days": "{number, plural, one {# deň} few {# dni} many {# dní} other {# dní}}",
+  "intervals.full.hours": "{number, plural, one {# hodina} few {# hodiny} many {# hodín} other {# hodín}}",
+  "intervals.full.minutes": "{number, plural, one {# minúta} few {# minúty} many {# minút} other {# minút}}",
+  "keyboard_shortcuts.back": "Ísť späť",
+  "keyboard_shortcuts.blocked": "Otvoriť zoznam blokovaných užívateľov",
+  "keyboard_shortcuts.boost": "Zdieľať príspevok",
+  "keyboard_shortcuts.column": "Prejsť na stĺpec",
+  "keyboard_shortcuts.compose": "Prejsť na textové pole",
   "keyboard_shortcuts.description": "Popis",
-  "keyboard_shortcuts.direct": "to open direct messages column",
-  "keyboard_shortcuts.down": "posunúť sa dole v zozname",
-  "keyboard_shortcuts.enter": "Otvor príspevok",
-  "keyboard_shortcuts.favourite": "Obľúb si príspevok",
-  "keyboard_shortcuts.favourites": "Otvor zoznam obľúbených",
-  "keyboard_shortcuts.federated": "otvor federovanú časovú os",
+  "keyboard_shortcuts.direct": "Otvoriť stĺpec súkromných označení",
+  "keyboard_shortcuts.down": "Posunúť sa dole v zozname",
+  "keyboard_shortcuts.enter": "Otvoriť príspevok",
+  "keyboard_shortcuts.favourite": "Ohviezdičkovať príspevok",
+  "keyboard_shortcuts.favourites": "Otvoriť zoznam ohviezdičkovaných",
+  "keyboard_shortcuts.federated": "Otvoriť federovanú časovú os",
   "keyboard_shortcuts.heading": "Klávesové skratky",
-  "keyboard_shortcuts.home": "otvor domácu časovú os",
-  "keyboard_shortcuts.hotkey": "Klávesa",
-  "keyboard_shortcuts.legend": "zobraz túto legendu",
-  "keyboard_shortcuts.local": "otvor miestnu časovú os",
-  "keyboard_shortcuts.mention": "spomeň autora",
-  "keyboard_shortcuts.muted": "otvor zoznam stíšených užívateľov",
-  "keyboard_shortcuts.my_profile": "otvor svoj profil",
-  "keyboard_shortcuts.notifications": "Otvor panel oznámení",
-  "keyboard_shortcuts.open_media": "Otvorenie médií",
-  "keyboard_shortcuts.pinned": "otvor zoznam pripnutých príspevkov",
-  "keyboard_shortcuts.profile": "otvor autorov profil",
-  "keyboard_shortcuts.reply": "odpovedať",
-  "keyboard_shortcuts.requests": "otvor zoznam žiadostí o sledovanie",
-  "keyboard_shortcuts.search": "zameraj sa na vyhľadávanie",
-  "keyboard_shortcuts.spoilers": "to show/hide CW field",
-  "keyboard_shortcuts.start": "otvor panel ''začíname''",
-  "keyboard_shortcuts.toggle_hidden": "ukáž/skry text za CW",
-  "keyboard_shortcuts.toggle_sensitivity": "Ukáž/skry médiá",
-  "keyboard_shortcuts.toot": "začni úplne nový príspevok",
-  "keyboard_shortcuts.unfocus": "nesústreď sa na písaciu plochu, alebo hľadanie",
-  "keyboard_shortcuts.up": "posuň sa vyššie v zozname",
-  "lightbox.close": "Zatvor",
+  "keyboard_shortcuts.home": "Otvoriť domácu časovú os",
+  "keyboard_shortcuts.hotkey": "Kláves",
+  "keyboard_shortcuts.legend": "Zobraziť túto legendu",
+  "keyboard_shortcuts.local": "Otvoriť miestnu časovú os",
+  "keyboard_shortcuts.mention": "Označiť autora",
+  "keyboard_shortcuts.muted": "Otvoriť zoznam stíšených užívateľov",
+  "keyboard_shortcuts.my_profile": "Otvoriť svoj profil",
+  "keyboard_shortcuts.notifications": "Otvoriť panel upozornení",
+  "keyboard_shortcuts.open_media": "Otvoriť médiá",
+  "keyboard_shortcuts.pinned": "Otvoriť zoznam pripnutých príspevkov",
+  "keyboard_shortcuts.profile": "Otvoriť autorov profil",
+  "keyboard_shortcuts.reply": "Odpovedať na príspevok",
+  "keyboard_shortcuts.requests": "Otvoriť zoznam žiadostí o sledovanie",
+  "keyboard_shortcuts.search": "Prejsť na vyhľadávacie pole",
+  "keyboard_shortcuts.spoilers": "Zobraziť/skryť pole varovania o obsahu",
+  "keyboard_shortcuts.start": "Otvoriť panel „Začíname“",
+  "keyboard_shortcuts.toggle_hidden": "Zobraziť/skryť text za varovaním o obsahu",
+  "keyboard_shortcuts.toggle_sensitivity": "Zobraziť/skryť médiá",
+  "keyboard_shortcuts.toot": "Vytvoriť nový príspevok",
+  "keyboard_shortcuts.unfocus": "Odísť z textového poľa",
+  "keyboard_shortcuts.up": "Posunúť sa vyššie v zozname",
+  "lightbox.close": "Zatvoriť",
   "lightbox.compress": "Zmenšiť náhľad obrázku",
   "lightbox.expand": "Rozšíriť náhľad obrázku",
-  "lightbox.next": "Ďalšie",
-  "lightbox.previous": "Predchádzajúci",
-  "limited_account_hint.action": "Ukáž profil aj tak",
-  "limited_account_hint.title": "Tento profil bol skrytý moderátormi stránky {domain}.",
-  "link_preview.author": "Podľa {name}",
-  "lists.account.add": "Pridaj do zoznamu",
-  "lists.account.remove": "Odober zo zoznamu",
-  "lists.delete": "Vymaž list",
-  "lists.edit": "Uprav zoznam",
-  "lists.edit.submit": "Zmeň názov",
+  "lightbox.next": "Ďalej",
+  "lightbox.previous": "Späť",
+  "limited_account_hint.action": "Aj tak zobraziť profil",
+  "limited_account_hint.title": "Tento profil bol skrytý správcami servera {domain}.",
+  "link_preview.author": "Autor: {name}",
+  "lists.account.add": "Pridať do zoznamu",
+  "lists.account.remove": "Odstrániť zo zoznamu",
+  "lists.delete": "Vymazať zoznam",
+  "lists.edit": "Upraviť zoznam",
+  "lists.edit.submit": "Zmeniť názov",
   "lists.exclusive": "Skryť tieto príspevky z domovskej stránky",
-  "lists.new.create": "Pridaj zoznam",
+  "lists.new.create": "Pridať zoznam",
   "lists.new.title_placeholder": "Názov nového zoznamu",
-  "lists.replies_policy.followed": "Akýkoľvek nasledovaný užívateľ",
-  "lists.replies_policy.list": "Členovia na zozname",
-  "lists.replies_policy.none": "Nikto",
-  "lists.replies_policy.title": "Ukáž odpovede na:",
-  "lists.search": "Vyhľadávaj medzi užívateľmi, ktorých sleduješ",
-  "lists.subheading": "Tvoje zoznamy",
-  "load_pending": "{count, plural, one {# nová položka} other {# nových položiek}}",
-  "loading_indicator.label": "Načítam…",
-  "media_gallery.toggle_visible": "Zapni/Vypni viditeľnosť",
-  "moved_to_account_banner.text": "Vaše konto {disabledAccount} je momentálne zablokované, pretože ste sa presunuli na {movedToAccount}.",
+  "lists.replies_policy.followed": "Akémukoľvek sledovanému účtu",
+  "lists.replies_policy.list": "Členom zoznamu",
+  "lists.replies_policy.none": "Nikomu",
+  "lists.replies_policy.title": "Zobraziť odpovede:",
+  "lists.search": "Vyhľadávať medzi účtami, ktoré sledujete",
+  "lists.subheading": "Vaše zoznamy",
+  "load_pending": "{count, plural, one {# nová položka} few {# nové položky} many {# nových položiek} other {# nových položiek}}",
+  "loading_indicator.label": "Načítavanie…",
+  "media_gallery.toggle_visible": "{number, plural, one {Skryť obrázok} other {Skryť obrázky}}",
+  "moved_to_account_banner.text": "Váš účet {disabledAccount} je momentálne deaktivovaný, pretože ste sa presunuli na {movedToAccount}.",
   "mute_modal.duration": "Trvanie",
-  "mute_modal.hide_notifications": "Skry oznámenia od tohto používateľa?",
+  "mute_modal.hide_notifications": "Skryť upozornenia od tohto účtu?",
   "mute_modal.indefinite": "Bez obmedzenia",
   "navigation_bar.about": "O tomto serveri",
-  "navigation_bar.advanced_interface": "Otvor v pokročilom webovom rozhraní",
-  "navigation_bar.blocks": "Blokovaní užívatelia",
+  "navigation_bar.advanced_interface": "Otvoriť v pokročilom webovom rozhraní",
+  "navigation_bar.blocks": "Blokované účty",
   "navigation_bar.bookmarks": "Záložky",
   "navigation_bar.community_timeline": "Miestna časová os",
-  "navigation_bar.compose": "Napíš nový príspevok",
-  "navigation_bar.direct": "Súkromné spomenutia",
-  "navigation_bar.discover": "Objavuj",
-  "navigation_bar.domain_blocks": "Skryté domény",
-  "navigation_bar.explore": "Objavuj",
-  "navigation_bar.favourites": "Obľúbené",
+  "navigation_bar.compose": "Vytvoriť nový príspevok",
+  "navigation_bar.direct": "Súkromné označenia",
+  "navigation_bar.discover": "Objavovanie",
+  "navigation_bar.domain_blocks": "Blokované domény",
+  "navigation_bar.explore": "Objavovať",
+  "navigation_bar.favourites": "Ohviezdičkované",
   "navigation_bar.filters": "Filtrované slová",
   "navigation_bar.follow_requests": "Žiadosti o sledovanie",
-  "navigation_bar.followed_tags": "Nasledované haštagy",
-  "navigation_bar.follows_and_followers": "Sledovania a následovatelia",
+  "navigation_bar.followed_tags": "Sledované hashtagy",
+  "navigation_bar.follows_and_followers": "Sledovania a sledovatelia",
   "navigation_bar.lists": "Zoznamy",
-  "navigation_bar.logout": "Odhlás sa",
-  "navigation_bar.mutes": "Stíšení užívatelia",
-  "navigation_bar.opened_in_classic_interface": "Príspevky, účty a iné špeciálne stránky, sú z východiska otvárané v klasickom webovom rozhraní.",
+  "navigation_bar.logout": "Odhlásiť sa",
+  "navigation_bar.mutes": "Stíšené účty",
+  "navigation_bar.opened_in_classic_interface": "Príspevky, účty a iné špeciálne stránky sú predvolene otvárané v klasickom webovom rozhraní.",
   "navigation_bar.personal": "Osobné",
   "navigation_bar.pins": "Pripnuté príspevky",
   "navigation_bar.preferences": "Nastavenia",
   "navigation_bar.public_timeline": "Federovaná časová os",
-  "navigation_bar.search": "Hľadaj",
-  "navigation_bar.security": "Zabezbečenie",
-  "not_signed_in_indicator.not_signed_in": "Ak chcete získať prístup k tomuto zdroju, musíte sa prihlásiť.",
-  "notification.admin.report": "{name} nahlásil/a {target}",
-  "notification.admin.sign_up": "{name} sa zaregistroval/a",
-  "notification.favourite": "{name} si obľúbil/a tvoj príspevok",
-  "notification.follow": "{name} ťa začal/a nasledovať",
-  "notification.follow_request": "{name} ťa žiada nasledovať",
-  "notification.mention": "{name} ťa spomenul/a",
-  "notification.own_poll": "Tvoja anketa sa skončila",
-  "notification.poll": "Anketa v ktorej si hlasoval/a sa skončila",
-  "notification.reblog": "{name} zdieľal/a tvoj príspevok",
-  "notification.status": "{name} práve uverejnil/a",
-  "notification.update": "{name} upravil/a príspevok",
-  "notifications.clear": "Vyčisti oznámenia",
-  "notifications.clear_confirmation": "Naozaj chceš nenávratne odstrániť všetky tvoje oznámenia?",
+  "navigation_bar.search": "Hľadať",
+  "navigation_bar.security": "Zabezpečenie",
+  "not_signed_in_indicator.not_signed_in": "Ak chcete získať prístup k tomuto zdroju, prihláste sa.",
+  "notification.admin.report": "Účet {name} nahlásil {target}",
+  "notification.admin.sign_up": "Nová registráciu účtu {name}",
+  "notification.favourite": "{name} hviezdičkuje váš príspevok",
+  "notification.follow": "{name} vás sleduje",
+  "notification.follow_request": "{name} vás žiada sledovať",
+  "notification.mention": "{name} vás spomína",
+  "notification.own_poll": "Vaša anketa sa skončila",
+  "notification.poll": "Anketa, v ktorej ste hlasovali, sa skončila",
+  "notification.reblog": "{name} zdieľa váš príspevok",
+  "notification.status": "{name} uverejňuje niečo nové",
+  "notification.update": "{name} upravuje príspevok",
+  "notifications.clear": "Vyčistiť upozornenia",
+  "notifications.clear_confirmation": "Určite chcete nenávratne odstrániť všetky svoje upozornenia?",
   "notifications.column_settings.admin.report": "Nové hlásenia:",
   "notifications.column_settings.admin.sign_up": "Nové registrácie:",
-  "notifications.column_settings.alert": "Oznámenia na ploche",
-  "notifications.column_settings.favourite": "Obľúbené:",
-  "notifications.column_settings.filter_bar.advanced": "Zobraz všetky kategórie",
-  "notifications.column_settings.filter_bar.category": "Rýchle triedenie",
-  "notifications.column_settings.filter_bar.show_bar": "Ukáž filtrovací panel",
-  "notifications.column_settings.follow": "Noví sledujúci:",
-  "notifications.column_settings.follow_request": "Nové žiadosti o následovanie:",
-  "notifications.column_settings.mention": "Zmienenia:",
-  "notifications.column_settings.poll": "Výsledky ankiet:",
-  "notifications.column_settings.push": "Push notifikácie",
-  "notifications.column_settings.reblog": "Vyzdvihnutia:",
-  "notifications.column_settings.show": "Ukáž v stĺpci",
-  "notifications.column_settings.sound": "Prehraj zvuk",
+  "notifications.column_settings.alert": "Upozornenia na ploche",
+  "notifications.column_settings.favourite": "Ohviezdičkované:",
+  "notifications.column_settings.filter_bar.advanced": "Zobraziť všetky kategórie",
+  "notifications.column_settings.filter_bar.category": "Rýchly filter",
+  "notifications.column_settings.filter_bar.show_bar": "Zobraziť filter",
+  "notifications.column_settings.follow": "Nové sledovania od:",
+  "notifications.column_settings.follow_request": "Nové žiadosti o sledovanie od:",
+  "notifications.column_settings.mention": "Označenia:",
+  "notifications.column_settings.poll": "Výsledky ankety:",
+  "notifications.column_settings.push": "Upozornenia push",
+  "notifications.column_settings.reblog": "Zdieľania:",
+  "notifications.column_settings.show": "Zobraziť v stĺpci",
+  "notifications.column_settings.sound": "Prehrať zvuk",
   "notifications.column_settings.status": "Nové príspevky:",
-  "notifications.column_settings.unread_notifications.category": "Neprečítané oznámenia",
-  "notifications.column_settings.unread_notifications.highlight": "Zdôrazni neprečítané oznámenia",
+  "notifications.column_settings.unread_notifications.category": "Neprečítané upozornenia",
+  "notifications.column_settings.unread_notifications.highlight": "Zvýrazniť neprečítané upozornenia",
   "notifications.column_settings.update": "Úpravy:",
   "notifications.filter.all": "Všetky",
-  "notifications.filter.boosts": "Vyzdvihnutia",
-  "notifications.filter.favourites": "Obľúbené",
+  "notifications.filter.boosts": "Zdieľania",
+  "notifications.filter.favourites": "Ohviezdičkovania",
   "notifications.filter.follows": "Sledovania",
-  "notifications.filter.mentions": "Iba spomenutia",
+  "notifications.filter.mentions": "Označenia",
   "notifications.filter.polls": "Výsledky ankiet",
-  "notifications.filter.statuses": "Aktualizácie od ľudí, ktorých nasleduješ",
-  "notifications.grant_permission": "Udeľ povolenie.",
-  "notifications.group": "{count} Oznámení",
-  "notifications.mark_as_read": "Označ každé oznámenie za prečítané",
-  "notifications.permission_denied": "Oznámenia na ploche sú nedostupné, kvôli predtým zamietnutej požiadavke prehliadača",
-  "notifications.permission_denied_alert": "Oznámenia na ploche nemôžu byť zapnuté, pretože požiadavka prehliadača bola už skôr zamietnutá",
-  "notifications.permission_required": "Oznámenia na ploche sú nedostupné, pretože potrebné povolenia neboli udelené.",
-  "notifications_permission_banner.enable": "Povoliť oznámenia na ploche",
+  "notifications.filter.statuses": "Novinky od ľudí, ktorých sledujete",
+  "notifications.grant_permission": "Udeliť povolenie.",
+  "notifications.group": "{count} upozornení",
+  "notifications.mark_as_read": "Označiť všetky upozornenia ako prečítané",
+  "notifications.permission_denied": "Upozornenia na ploche sú nedostupné pre už skôr zamietnutú požiadavku prehliadača",
+  "notifications.permission_denied_alert": "Upozornenia na ploche nemôžu byť zapnuté, pretože požiadavka prehliadača bola už skôr zamietnutá",
+  "notifications.permission_required": "Upozornenia na ploche sú nedostupné, pretože neboli udelené potrebné povolenia.",
+  "notifications_permission_banner.enable": "Povoliť upozornenia na ploche",
   "notifications_permission_banner.how_to_control": "Ak chcete dostávať upozornenia, keď Mastodon nie je otvorený, povoľte upozornenia na ploche. Po ich zapnutí môžete presne kontrolovať, ktoré typy interakcií generujú upozornenia na ploche, a to prostredníctvom tlačidla {icon} vyššie.",
-  "notifications_permission_banner.title": "Nikdy nezmeškaj jedinú vec",
-  "onboarding.action.back": "Vziať ma späť",
-  "onboarding.actions.back": "Vziať ma späť",
-  "onboarding.actions.go_to_explore": "See what's trending",
-  "onboarding.actions.go_to_home": "Go to your home feed",
-  "onboarding.compose.template": "Nazdar #Mastodon!",
+  "notifications_permission_banner.title": "Nenechajte si nič ujsť",
+  "onboarding.action.back": "Ísť späť",
+  "onboarding.actions.back": "Ísť späť",
+  "onboarding.actions.go_to_explore": "Prejsť na populárne",
+  "onboarding.actions.go_to_home": "Prejsť na domovský kanál",
+  "onboarding.compose.template": "Ahoj, #Mastodon!",
   "onboarding.follows.empty": "Žiaľ, momentálne sa nedajú zobraziť žiadne výsledky. Môžete skúsiť použiť vyhľadávanie alebo navštíviť stránku objavovania a nájsť ľudí, ktorých chcete sledovať, alebo to skúste znova neskôr.",
-  "onboarding.follows.lead": "You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!",
-  "onboarding.follows.title": "Popular on Mastodon",
-  "onboarding.profile.discoverable": "Urob môj profil objaviteľný",
-  "onboarding.profile.display_name": "Zobrazované meno",
-  "onboarding.profile.display_name_hint": "Tvoje plné meno, alebo tvoje zábavné meno…",
-  "onboarding.profile.lead": "Toto môžeš vždy dokončiť neskôr v nastaveniach, kde je dostupných ešte viac volieb na prispôsobenie.",
-  "onboarding.profile.note": "O tebe",
-  "onboarding.profile.note_hint": "Môžeš @spomenúť iných ľudí, alebo #haštagy…",
-  "onboarding.profile.save_and_continue": "Ulož a pokračuj",
+  "onboarding.follows.lead": "Váš domovský kanál je váš hlavný spôsob objavovania Mastodonu. Čím viac ľudí sledujete, tým bude aktívnejší a zaujímavejší. Tu je pár tipov na začiatok:",
+  "onboarding.follows.title": "Prispôsobte si svoj domovský kanál",
+  "onboarding.profile.discoverable": "Nastavte svoj profil ako objaviteľný",
+  "onboarding.profile.discoverable_hint": "Keď si na Mastodone zapnete objaviteľnosť, vaše príspevky sa môžu zobrazovať vo výsledkoch vyhľadávania a v populárnych. Váš profil môže byť navyše navrhovaný ľuďom, s ktorými máte podobné záujmy.",
+  "onboarding.profile.display_name": "Používateľské meno",
+  "onboarding.profile.display_name_hint": "Vaše celé meno alebo pokojne aj vtipná prezývka…",
+  "onboarding.profile.lead": "Vždy si to môžete doplniť neskôr v nastaveniach, kde nájdete aj ďalšie možnosti prispôsobenia.",
+  "onboarding.profile.note": "Niečo o vás",
+  "onboarding.profile.note_hint": "Môžete @označiť iných ľudí alebo #hashtagy…",
+  "onboarding.profile.save_and_continue": "Uložiť a pokračovať",
   "onboarding.profile.title": "Nastavenie profilu",
-  "onboarding.profile.upload_avatar": "Nahraj profilový obrázok",
-  "onboarding.profile.upload_header": "Nahraj profilové záhlavie",
-  "onboarding.share.lead": "Daj ľudom vedieť, ako ťa môžu na Mastodone nájsť!",
-  "onboarding.share.message": "Na Mastodone som {username}. Príď ma nasledovať na {url}",
+  "onboarding.profile.upload_avatar": "Nahrať profilový obrázok",
+  "onboarding.profile.upload_header": "Nahrať obrázok záhlavia profilu",
+  "onboarding.share.lead": "Dajte ostatným vedieť, ako vás môžu na Mastodone nájsť.",
+  "onboarding.share.message": "Na #Mastodon⁠e som {username}. Príď ma sledovať na {url}!",
   "onboarding.share.next_steps": "Ďalšie možné kroky:",
-  "onboarding.share.title": "Zdieľaj svoj profil",
-  "onboarding.start.lead": "Teraz si súčasťou Mastodonu, unikátnej, decentralizovanej sociálnej platformy, kde ty, nie algoritmus, spravuješ svoj vlastný zážitok. Poďme ťa naštartovať na tomto novom sociálnom pomedzí:",
-  "onboarding.start.skip": "Want to skip right ahead?",
+  "onboarding.share.title": "Zdieľajte svoj profil",
+  "onboarding.start.lead": "Teraz ste súčasťou Mastodonu, jedinečnej decentralizovanej sociálnej platformy, kde o všetkom rozhodujete vy, nie algoritmus. Poďme sa pozrieť, ako môžete začať:",
+  "onboarding.start.skip": "Nepotrebujete pomoc so začiatkom?",
   "onboarding.start.title": "Zvládli ste to!",
-  "onboarding.steps.follow_people.body": "You curate your own feed. Lets fill it with interesting people.",
-  "onboarding.steps.follow_people.title": "Follow {count, plural, one {one person} other {# people}}",
-  "onboarding.steps.publish_status.body": "Say hello to the world.",
-  "onboarding.steps.publish_status.title": "Vytvor svoj prvý príspevok",
-  "onboarding.steps.setup_profile.body": "Others are more likely to interact with you with a filled out profile.",
-  "onboarding.steps.setup_profile.title": "Customize your profile",
-  "onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
-  "onboarding.steps.share_profile.title": "Share your profile",
+  "onboarding.steps.follow_people.body": "Mastodon je vybudovaný okolo sledovania zaujímavých ľudí.",
+  "onboarding.steps.follow_people.title": "Prispôsobte si svoj domovský kanál",
+  "onboarding.steps.publish_status.body": "Predstavte sa svetu textom, fotkami, videami či anketami {emoji}",
+  "onboarding.steps.publish_status.title": "Vytvorte svoj prvý príspevok",
+  "onboarding.steps.setup_profile.body": "Plnší profil vám pomôže mať viac interakcií.",
+  "onboarding.steps.setup_profile.title": "Upravte si profil",
+  "onboarding.steps.share_profile.body": "Dajte svojej partii vedieť, ako vás môžu na Mastodone nájsť.",
+  "onboarding.steps.share_profile.title": "Zdieľajte svoj profil na Mastodone",
   "onboarding.tips.2fa": "<strong>Vedeli ste?</strong> Svoj účet môžete zabezpečiť nastavením dvojfaktorového overenia v nastaveniach účtu. Funguje to s akoukoľvek aplikáciou TOTP podľa vášho výberu, nie je potrebné žiadne telefónne číslo!",
   "onboarding.tips.accounts_from_other_servers": "<strong>Vedeli ste?</strong> Keďže Mastodon je decentralizovaný, niektoré profily, s ktorými sa stretnete, budú na iných serveroch, ako je váš. Aj napriek tomu s nimi môžete bezproblémovo komunikovať! Ich server je v druhej časti ich používateľského mena!",
-  "onboarding.tips.migration": "<strong>Vedeli ste?</strong> Ak máte pocit, že doména {domain} pre vás v budúcnosti nebude skvelou voľbou, môžete prejsť na iný server Mastodon bez straty svojich sledovateľov. Môžete dokonca hostovať svoj vlastný server!",
-  "onboarding.tips.verification": "<strong>Vedeli ste?</strong> Svoj účet môžete overiť umiestnením odkazu na svoj profil Mastodon na svoju vlastnú webovú lokalitu a pridaním webovej lokality do svojho profilu. Nie sú potrebné žiadne poplatky ani doklady!",
+  "onboarding.tips.migration": "<strong>Vedeli ste?</strong> Ak máte pocit, že doména {domain} pre vás v budúcnosti nebude skvelou voľbou, môžete prejsť na iný server Mastodon bez straty svojich sledovateľov. Môžete dokonca hostiť svoj vlastný server!",
+  "onboarding.tips.verification": "<strong>Vedeli ste?</strong> Svoj účet môžete overiť umiestnením odkazu na svoj profil na Mastodone na svoju vlastnú webovú lokalitu a pridaním webovej lokality do svojho profilu. Nie sú potrebné žiadne poplatky ani doklady!",
   "password_confirmation.exceeds_maxlength": "Potvrdené heslo presahuje maximálnu dĺžku hesla",
   "password_confirmation.mismatching": "Zadané heslá sa nezhodujú",
   "picture_in_picture.restore": "Vrátiť späť",
   "poll.closed": "Uzatvorená",
   "poll.refresh": "Obnoviť",
-  "poll.reveal": "Pozri výsledky",
-  "poll.total_people": "{count, plural, one {# človek} few {# ľudia} other {# ľudí}}",
-  "poll.total_votes": "{count, plural, one {# hlas} few {# hlasov} many {# hlasov} other {# hlasov}}",
-  "poll.vote": "Hlasuj",
-  "poll.voted": "Hlasoval/a si za túto voľbu",
-  "poll.votes": "{votes, plural, one {# hlas} few {# hlasov} many {# hlasov} other {# hlasy}}",
-  "poll_button.add_poll": "Pridaj anketu",
-  "poll_button.remove_poll": "Odstráň anketu",
-  "privacy.change": "Uprav súkromie príspevku",
+  "poll.reveal": "Zobraziť výsledky",
+  "poll.total_people": "{count, plural, one {# človek} few {# ľudia} many {# ľudí} other {# ľudí}}",
+  "poll.total_votes": "{count, plural, one {# hlas} few {# hlasy} many {# hlasov} other {# hlasov}}",
+  "poll.vote": "Hlasovať",
+  "poll.voted": "Hlasovali ste za túto voľbu",
+  "poll.votes": "{votes, plural, one {# hlas} few {# hlasy} many {# hlasov} other {# hlasov}}",
+  "poll_button.add_poll": "Pridať anketu",
+  "poll_button.remove_poll": "Odstrániť anketu",
+  "privacy.change": "Zmeniť nastavenia súkromia príspevku",
   "privacy.direct.long": "Všetci spomenutí v príspevku",
   "privacy.direct.short": "Konkrétni ľudia",
-  "privacy.private.long": "Iba tvoji nasledovatelia",
+  "privacy.private.long": "Iba vaši sledovatelia",
   "privacy.private.short": "Sledovatelia",
-  "privacy.public.long": "Ktokoľvek na, aj mimo Mastodonu",
+  "privacy.public.long": "Ktokoľvek na Mastodone aj mimo neho",
   "privacy.public.short": "Verejné",
-  "privacy.unlisted.short": "Verejný v tichosti",
+  "privacy.unlisted.additional": "Presne ako verejné, s tým rozdielom, že sa príspevok nezobrazí v živých kanáloch, hashtagoch, objavovaní či vo vyhľadávaní na Mastodone, aj keď máte pre účet objaviteľnosť zapnutú.",
+  "privacy.unlisted.long": "Menej algoritmických výmyslov",
+  "privacy.unlisted.short": "Tiché verejné",
   "privacy_policy.last_updated": "Posledná úprava {date}",
-  "privacy_policy.title": "Zásady súkromia",
+  "privacy_policy.title": "Pravidlá ochrany súkromia",
   "recommended": "Odporúčané",
   "refresh": "Obnoviť",
-  "regeneration_indicator.label": "Načítava sa…",
-  "regeneration_indicator.sublabel": "Tvoja domovská nástenka sa pripravuje!",
-  "relative_time.days": "{number}dní",
-  "relative_time.full.days": "Ostáva {number, plural, one {# deň} few {# dní} many {# dní} other {# dni}}",
-  "relative_time.full.hours": "Pred {number, plural, one {# hodinou} few {# hodinami} many {# hodinami} other {# hodinami}}",
-  "relative_time.full.just_now": "práve teraz",
-  "relative_time.full.minutes": "Pred {number, plural, one {# minútou} few {# minútami} many {# minútami} other {# minútami}}",
-  "relative_time.full.seconds": "Pred {number, plural, one {# sekundou} few {# sekundami} many {# sekundami} other {# sekundami}}",
-  "relative_time.hours": "{number}hod",
-  "relative_time.just_now": "teraz",
-  "relative_time.minutes": "{number}min",
-  "relative_time.seconds": "{number}sek",
-  "relative_time.today": "dnes",
+  "regeneration_indicator.label": "Načítavanie…",
+  "regeneration_indicator.sublabel": "Váš domovský kanál sa pripravuje.",
+  "relative_time.days": "{number} dní",
+  "relative_time.full.days": "Pred {number, plural, one {# dňom} other {# dňami}}",
+  "relative_time.full.hours": "Pred {number, plural, one {# hodinou} other {# hodinami}}",
+  "relative_time.full.just_now": "Práve teraz",
+  "relative_time.full.minutes": "Pred {number, plural, one {# minútou} other {# minútami}}",
+  "relative_time.full.seconds": "Pred {number, plural, one {# sekundou} other {# sekundami}}",
+  "relative_time.hours": "{number} hod",
+  "relative_time.just_now": "Teraz",
+  "relative_time.minutes": "{number} min",
+  "relative_time.seconds": "{number} sek",
+  "relative_time.today": "Dnes",
+  "reply_indicator.attachments": "{count, plural, one {# príloha} few {# prílohy} other {# príloh}}",
   "reply_indicator.cancel": "Zrušiť",
   "reply_indicator.poll": "Anketa",
-  "report.block": "Blokuj",
+  "report.block": "Blokovať",
   "report.block_explanation": "Ich príspevky neuvidíte. Nebudú môcť vidieť vaše príspevky ani vás sledovať. Budú môcť zistiť, že sú zablokovaní.",
-  "report.categories.legal": "Právne ujednania",
+  "report.categories.legal": "Právne",
   "report.categories.other": "Ostatné",
   "report.categories.spam": "Spam",
   "report.categories.violation": "Obsah porušuje jedno alebo viacero pravidiel servera",
-  "report.category.subtitle": "Vyberte si najlepšiu voľbu",
-  "report.category.title": "Povedzte nám, čo sa deje s týmto {type}",
-  "report.category.title_account": "profilom",
-  "report.category.title_status": "príspevkom",
+  "report.category.subtitle": "Vyberte najlepšiu voľbu",
+  "report.category.title": "Povedzte nám, čo je zlé na tomto {type}",
+  "report.category.title_account": "profile",
+  "report.category.title_status": "príspevku",
   "report.close": "Hotovo",
   "report.comment.title": "Je ešte niečo, čo by sme podľa vás mali vedieť?",
-  "report.forward": "Posuň ku {target}",
-  "report.forward_hint": "Tento účet je z iného serveru. Chceš poslať anonymnú kópiu hlásenia aj tam?",
-  "report.mute": "Nevšímaj si",
-  "report.mute_explanation": "Ich príspevky neuvidíte. Stále vás môžu sledovať a vidieť vaše príspevky a nebudú vedieť, že sú stlmené.",
+  "report.forward": "Preposlať na {target}",
+  "report.forward_hint": "Tento účet je z iného serveru. Chcete poslať anonymnú kópiu hlásenia aj tam?",
+  "report.mute": "Stíšiť",
+  "report.mute_explanation": "Ich príspevky neuvidíte. Stále vás môžu sledovať a vidieť vaše príspevky a nebudú vedieť, že ste ich stíšili.",
   "report.next": "Ďalej",
   "report.placeholder": "Ďalšie komentáre",
   "report.reasons.dislike": "Nepáči sa mi",
-  "report.reasons.dislike_description": "Nieje to niečo, čo chceš vidieť",
-  "report.reasons.legal": "Je to nelegálne",
+  "report.reasons.dislike_description": "Nie je to niečo, čo chcete vidieť",
+  "report.reasons.legal": "Je nelegálny",
   "report.reasons.legal_description": "Domnievate sa, že porušuje zákony vašej krajiny alebo krajiny servera",
-  "report.reasons.other": "Je to niečo iné",
+  "report.reasons.other": "Ide o niečo iné",
   "report.reasons.other_description": "Tento problém nepatrí do iných kategórií",
   "report.reasons.spam": "Je to spam",
   "report.reasons.spam_description": "Škodlivé odkazy, falošné zapojenie alebo opakované odpovede",
   "report.reasons.violation": "Porušuje pravidlá servera",
   "report.reasons.violation_description": "Ste si vedomí, že porušuje špecifické pravidlá",
-  "report.rules.subtitle": "Vyberte všetky, ktoré sa vzťahujú",
-  "report.rules.title": "Ktoré pravidlá sa porušujú?",
-  "report.statuses.subtitle": "Vyberte všetky, ktoré sa vzťahujú",
+  "report.rules.subtitle": "Vyberte všetky príslušné možnosti",
+  "report.rules.title": "Ktoré pravidlá sú porušované?",
+  "report.statuses.subtitle": "Vyberte všetky príslušné možnosti",
   "report.statuses.title": "Sú k dispozícii príspevky podporujúce toto hlásenie?",
-  "report.submit": "Odošli",
-  "report.target": "Nahlás {target}",
-  "report.thanks.take_action": "Tu sú tvoje možnosti kontrolovať, čo vidíš na Mastodone:",
-  "report.thanks.take_action_actionable": "Kým to vyhodnotíme, môžeš podniknúť kroky voči @{name}:",
-  "report.thanks.title": "Nechceš to vidieť?",
-  "report.thanks.title_actionable": "Vďaka za nahlásenie, pozrieme sa na to.",
-  "report.unfollow": "Nesleduj @{name}",
-  "report.unfollow_explanation": "Tento účet sledujete. Ak už nechcete vidieť jeho príspevky vo svojom domovskom kanáli, zrušte jeho sledovanie.",
-  "report_notification.attached_statuses": "{count, plural, one {# post} other {# posts}} attached",
-  "report_notification.categories.legal": "Právne ujednania",
+  "report.submit": "Odoslať",
+  "report.target": "Nahlásiť {target}",
+  "report.thanks.take_action": "Tu sú vaše možnosti kontrolovať to, čo vidíte na Mastodone:",
+  "report.thanks.take_action_actionable": "Kým to vyhodnotíme, môžete podniknúť kroky voči @{name}:",
+  "report.thanks.title": "Nechcete to vidieť?",
+  "report.thanks.title_actionable": "Ďakujeme za nahlásenie, pozrieme sa na to.",
+  "report.unfollow": "Prestať sledovať @{name}",
+  "report.unfollow_explanation": "Tento účet sledujete. Ak už nechcete vidieť jeho príspevky vo svojom domovskom kanáli, prestaňte ho sledovať.",
+  "report_notification.attached_statuses": "{count, plural, one {{count} príspevok} few {{count} príspevky} other {{count} príspevkov}} ako príloha",
+  "report_notification.categories.legal": "Právne",
   "report_notification.categories.other": "Ostatné",
   "report_notification.categories.spam": "Spam",
   "report_notification.categories.violation": "Porušenie pravidla",
-  "report_notification.open": "Otvor hlásenie",
+  "report_notification.open": "Otvoriť hlásenie",
   "search.no_recent_searches": "Žiadne nedávne vyhľadávania",
-  "search.placeholder": "Hľadaj",
+  "search.placeholder": "Hľadať",
   "search.quick_action.account_search": "Profily zodpovedajúce {x}",
-  "search.quick_action.go_to_account": "Prejdi na profil {x}",
-  "search.quick_action.go_to_hashtag": "Choď na haštag {x}",
-  "search.quick_action.open_url": "Otvor URL v rámci Mastodonu",
+  "search.quick_action.go_to_account": "Prejsť na profil {x}",
+  "search.quick_action.go_to_hashtag": "Prejsť na hashtag {x}",
+  "search.quick_action.open_url": "Otvoriť URL v rámci Mastodonu",
   "search.quick_action.status_search": "Príspevky zodpovedajúce {x}",
-  "search.search_or_paste": "Hľadaj, alebo vlož URL adresu",
+  "search.search_or_paste": "Hľadať alebo vložiť adresu URL",
   "search_popout.full_text_search_disabled_message": "Nie je k dispozícii v doméne {domain}.",
-  "search_popout.full_text_search_logged_out_message": "Dostupné iba keď si prihlásený/á.",
-  "search_popout.language_code": "ISO kód jazyka",
+  "search_popout.full_text_search_logged_out_message": "Dostupné iba po prihlásení.",
+  "search_popout.language_code": "Kód jazyka ISO",
   "search_popout.options": "Možnosti vyhľadávania",
   "search_popout.quick_actions": "Rýchle akcie",
   "search_popout.recent": "Nedávne vyhľadávania",
-  "search_popout.specific_date": "presný dátum",
-  "search_popout.user": "užívateľ",
+  "search_popout.specific_date": "Presný dátum",
+  "search_popout.user": "Účet",
   "search_results.accounts": "Profily",
   "search_results.all": "Všetky",
-  "search_results.hashtags": "Haštagy",
-  "search_results.nothing_found": "Pre tieto výrazy nemožno nič nájsť",
-  "search_results.see_all": "Ukáž všetky",
+  "search_results.hashtags": "Hashtagy",
+  "search_results.nothing_found": "Pre tieto výrazy nebolo možné nič nájsť",
+  "search_results.see_all": "Zobraziť všetky",
   "search_results.statuses": "Príspevky",
-  "search_results.title": "Hľadaj {q}",
-  "server_banner.about_active_users": "Ľudia používajúci tento server za posledných 30 dní (Aktívni používatelia za mesiac)",
-  "server_banner.active_users": "aktívni užívatelia",
-  "server_banner.administered_by": "Správcom je:",
+  "search_results.title": "Hľadať {q}",
+  "server_banner.about_active_users": "Ľudia používajúci tento server za posledných 30 dní (aktívni používatelia za mesiac)",
+  "server_banner.active_users": "Aktívne účty",
+  "server_banner.administered_by": "Správa servera:",
   "server_banner.introduction": "{domain} je súčasťou decentralizovanej sociálnej siete využívajúcej technológiu {mastodon}.",
-  "server_banner.learn_more": "Zisti viac",
-  "server_banner.server_stats": "Serverové štatistiky:",
-  "sign_in_banner.create_account": "Vytvor účet",
-  "sign_in_banner.sign_in": "Prihlás sa",
-  "sign_in_banner.sso_redirect": "Prihlás sa, alebo zaregistruj",
-  "sign_in_banner.text": "Prihláste sa, aby ste mohli sledovať profily alebo haštagy, obľúbené veci, zdieľať ich a odpovedať na príspevky. Môžete tiež komunikovať zo svojho účtu na inom serveri.",
-  "status.admin_account": "Otvor moderovacie rozhranie užívateľa @{name}",
-  "status.admin_domain": "Otvor rozhranie na moderovanie domény {domain}",
-  "status.admin_status": "Otvor tento príspevok v moderovacom rozhraní",
-  "status.block": "Blokuj @{name}",
-  "status.bookmark": "Záložka",
-  "status.cancel_reblog_private": "Nezdieľaj",
-  "status.cannot_reblog": "Tento príspevok nemôže byť zdieľaný",
-  "status.copy": "Skopíruj odkaz na príspevok",
-  "status.delete": "Zmazať",
+  "server_banner.learn_more": "Viac informácií",
+  "server_banner.server_stats": "Štatistiky servera:",
+  "sign_in_banner.create_account": "Vytvoriť účet",
+  "sign_in_banner.sign_in": "Prihlásiť sa",
+  "sign_in_banner.sso_redirect": "Prihlásenie alebo registrácia",
+  "sign_in_banner.text": "Prihláste sa, aby ste mohli sledovať profily alebo hashtagy, hviezdičkovať, zdieľať a odpovedať na príspevky. Môžete tiež komunikovať zo svojho účtu na inom serveri.",
+  "status.admin_account": "Moderovať @{name}",
+  "status.admin_domain": "Moderovať {domain}",
+  "status.admin_status": "Moderovať príspevok",
+  "status.block": "Blokovať @{name}",
+  "status.bookmark": "Pridať záložku",
+  "status.cancel_reblog_private": "Zrušiť zdieľanie",
+  "status.cannot_reblog": "Tento príspevok nie je možné zdieľať",
+  "status.copy": "Kopírovať odkaz na príspevok",
+  "status.delete": "Vymazať",
   "status.detailed_status": "Podrobný náhľad celej konverzácie",
-  "status.direct": "Spomeň @{name} v súkromí",
-  "status.direct_indicator": "Súkromné spomenutie",
-  "status.edit": "Uprav",
+  "status.direct": "Súkromne označiť @{name}",
+  "status.direct_indicator": "Súkromné označenie",
+  "status.edit": "Upraviť",
   "status.edited": "Upravené {date}",
-  "status.edited_x_times": "Upravený {count, plural, one {{count} krát} other {{count} krát}}",
+  "status.edited_x_times": "Upravený {count, plural, other {{count}×}}",
   "status.embed": "Vložiť",
-  "status.favourite": "Páči sa mi",
+  "status.favourite": "Ohviezdičkované",
   "status.filter": "Filtrovanie tohto príspevku",
   "status.filtered": "Filtrované",
-  "status.hide": "Skry príspevok",
-  "status.history.created": "{name} vytvoril/a {date}",
-  "status.history.edited": "{name} upravil/a {date}",
-  "status.load_more": "Ukáž viac",
-  "status.media.open": "Klikni pre otvorenie",
-  "status.media.show": "Kliknutím zobrazíš",
+  "status.hide": "Skryť príspevok",
+  "status.history.created": "Vytvorené účtom {name} {date}",
+  "status.history.edited": "Upravené účtom {name} {date}",
+  "status.load_more": "Načitať viac",
+  "status.media.open": "Otvoriť kliknutím",
+  "status.media.show": "Zobraziť kliknutím",
   "status.media_hidden": "Skryté médiá",
-  "status.mention": "Spomeň @{name}",
+  "status.mention": "Označiť @{name}",
   "status.more": "Viac",
-  "status.mute": "Nevšímaj si @{name}",
-  "status.mute_conversation": "Nevšímaj si konverzáciu",
-  "status.open": "Otvor tento príspevok",
-  "status.pin": "Pripni na profil",
+  "status.mute": "Stíšiť @{name}",
+  "status.mute_conversation": "Stíšiť konverzáciu",
+  "status.open": "Rozbaliť príspevok",
+  "status.pin": "Pripnúť na profil",
   "status.pinned": "Pripnutý príspevok",
   "status.read_more": "Čítaj ďalej",
-  "status.reblog": "Vyzdvihni",
-  "status.reblog_private": "Vyzdvihni k pôvodnému publiku",
-  "status.reblogged_by": "{name} vyzdvihli",
-  "status.reblogs.empty": "Nikto ešte nevyzdvihol tento príspevok. Keď tak niekto urobí, bude to zobrazené práve tu.",
-  "status.redraft": "Vymaž a prepíš",
-  "status.remove_bookmark": "Odstráň záložku",
+  "status.reblog": "Zdieľať",
+  "status.reblog_private": "Zdieľať pôvodnému publiku",
+  "status.reblogged_by": "{name} zdieľa",
+  "status.reblogs.empty": "Nikto ešte tento príspevok nezdieľal. Keď tak niekto urobí, zobrazí sa to tu.",
+  "status.redraft": "Vymazať a prepísať",
+  "status.remove_bookmark": "Odstrániť záložku",
   "status.replied_to": "Odpoveď na {name}",
   "status.reply": "Odpovedať",
-  "status.replyAll": "Odpovedz na diskusiu",
-  "status.report": "Nahlás @{name}",
-  "status.sensitive_warning": "Chúlostivý obsah",
-  "status.share": "Zdieľaj",
-  "status.show_filter_reason": "Ukáž aj tak",
-  "status.show_less": "Zobraz menej",
-  "status.show_less_all": "Všetkým ukáž menej",
-  "status.show_more": "Ukáž viac",
-  "status.show_more_all": "Všetkým ukáž viac",
-  "status.show_original": "Ukáž pôvodný",
-  "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
+  "status.replyAll": "Odpovedať vo vlákne",
+  "status.report": "Nahlásiť @{name}",
+  "status.sensitive_warning": "Citlivý obsah",
+  "status.share": "Zdieľať",
+  "status.show_filter_reason": "Aj tak zobraziť",
+  "status.show_less": "Zobraziť menej",
+  "status.show_less_all": "Všetkým zobraziť menej",
+  "status.show_more": "Zobraziť viac",
+  "status.show_more_all": "Všetkým zobraziť viac",
+  "status.show_original": "Zobraziť originál",
+  "status.title.with_attachments": "Účet {user} nahral {attachmentCount, plural, one {prílohu} few {{attachmentCount} prílohy} many {{attachmentCount} príloh} other {{attachmentCount} príloh}}",
   "status.translate": "Preložiť",
   "status.translated_from_with": "Preložené z {lang} pomocou {provider}",
   "status.uncached_media_warning": "Náhľad nie je k dispozícii",
-  "status.unmute_conversation": "Prestaň si nevšímať konverzáciu",
-  "status.unpin": "Odopni z profilu",
+  "status.unmute_conversation": "Zrušiť stíšenie konverzácie",
+  "status.unpin": "Odopnúť z profilu",
   "subscribed_languages.lead": "Po zmene sa na vašej domovskej stránke a časovej osi zoznamu zobrazia iba príspevky vo vybraných jazykoch. Ak chcete dostávať príspevky vo všetkých jazykoch, vyberte možnosť žiadne.",
-  "subscribed_languages.save": "Ulož zmeny",
+  "subscribed_languages.save": "Uložiť zmeny",
   "subscribed_languages.target": "Zmeniť prihlásené jazyky pre {target}",
   "tabs_bar.home": "Domov",
-  "tabs_bar.notifications": "Oznámenia",
-  "time_remaining.days": "Ostáva {number, plural, one {# deň} few {# dní} many {# dní} other {# dní}}",
-  "time_remaining.hours": "Ostáva {number, plural, one {# hodina} few {# hodín} many {# hodín} other {# hodiny}}",
-  "time_remaining.minutes": "Ostáva {number, plural, one {# minúta} few {# minút} many {# minút} other {# minúty}}",
+  "tabs_bar.notifications": "Upozornenia",
+  "time_remaining.days": "Ostáva{number, plural, one { # deň} few {jú # dni} many { # dní} other { # dní}}",
+  "time_remaining.hours": "Ostáva{number, plural, one { # hodina} few {jú # hodiny} many { # hodín} other { # hodín}}",
+  "time_remaining.minutes": "Ostáva{number, plural, one { # minúta} few {jú # minúty} many { # minút} other { # minút}}",
   "time_remaining.moments": "Ostáva už iba chviľka",
-  "time_remaining.seconds": "Ostáva {number, plural, one {# sekunda} few {# sekúnd} many {# sekúnd} other {# sekúnd}}",
-  "timeline_hint.remote_resource_not_displayed": "{resource} z iných serverov sa nezobrazí.",
+  "time_remaining.seconds": "Ostáva{number, plural, one { # sekunda} few {jú # sekundy} many { # sekúnd} other { # sekúnd}}",
+  "timeline_hint.remote_resource_not_displayed": "{resource} z iných serverov sa nezobrazia.",
   "timeline_hint.resources.followers": "Sledujúci",
-  "timeline_hint.resources.follows": "Nasleduje",
+  "timeline_hint.resources.follows": "Sledovaní",
   "timeline_hint.resources.statuses": "Staršie príspevky",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {# days}}",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} osoba} few {{counter} ľudia} many {{counter} ľudí} other {{counter} ľudí}} za posledn{days, plural, one {ý deň} few {é {days} dni} many {ých {days} dní} other {ých {days} dní}}",
   "trends.trending_now": "Teraz populárne",
-  "ui.beforeunload": "Čo máš rozpísané sa stratí, ak opustíš Mastodon.",
-  "units.short.billion": "{count}mld.",
-  "units.short.million": "{count}mil.",
-  "units.short.thousand": "{count}tis.",
-  "upload_area.title": "Pretiahni a pusť pre nahratie",
-  "upload_button.label": "Pridaj obrázky, video, alebo zvukový súbor",
+  "ui.beforeunload": "Po opustení Mastodonu prídete o to, čo máte rozpísané.",
+  "units.short.billion": "{count} mld.",
+  "units.short.million": "{count} mil.",
+  "units.short.thousand": "{count} tis.",
+  "upload_area.title": "Nahráte potiahnutím a pustením",
+  "upload_button.label": "Pridať obrázky, video alebo zvukový súbor",
   "upload_error.limit": "Limit pre nahrávanie súborov bol prekročený.",
-  "upload_error.poll": "Nahrávanie súborov pri anketách nieje možné.",
-  "upload_form.audio_description": "Popíš, pre ľudí so stratou sluchu",
-  "upload_form.description": "Opis pre slabo vidiacich",
-  "upload_form.edit": "Uprav",
+  "upload_error.poll": "Nahrávanie súborov nie je pri anketách možné.",
+  "upload_form.audio_description": "Popis pre sluchovo postihnutých ľudí",
+  "upload_form.description": "Popis pre zrakovo postihnutých ľudí",
+  "upload_form.edit": "Upraviť",
   "upload_form.thumbnail": "Zmeniť miniatúru",
-  "upload_form.video_description": "Popíš, pre ľudí so stratou sluchu, alebo očným znevýhodnením",
-  "upload_modal.analyzing_picture": "Analyzujem obrázok…",
-  "upload_modal.apply": "Použi",
-  "upload_modal.applying": "Nastavovanie…",
-  "upload_modal.choose_image": "Vyber obrázok",
-  "upload_modal.description_placeholder": "Rýchla hnedá líška skáče ponad lenivého psa",
-  "upload_modal.detect_text": "Rozpoznaj text z obrázka",
-  "upload_modal.edit_media": "Uprav médiá",
-  "upload_modal.hint": "Klikni, alebo potiahni okruh ukážky pre zvolenie z ktorého východzieho bodu bude vždy v dohľadne na všetkých náhľadoch.",
-  "upload_modal.preparing_ocr": "Pripravujem OCR…",
+  "upload_form.video_description": "Popís pre ľudí so zrakovým alebo sluchovým postihnutím",
+  "upload_modal.analyzing_picture": "Prebieha analýza obrázka…",
+  "upload_modal.apply": "Použiť",
+  "upload_modal.applying": "Ukladanie…",
+  "upload_modal.choose_image": "Vybrať obrázok",
+  "upload_modal.description_placeholder": "Kde bolo, tam bolo, bol raz jeden Mastodon",
+  "upload_modal.detect_text": "Rozpoznať text z obrázka",
+  "upload_modal.edit_media": "Upraviť médiá",
+  "upload_modal.hint": "Kliknite alebo potiahnite kruh na ukážke, a tak vyberte bod, ktorý bude viditeľný na všetkých náhľadoch.",
+  "upload_modal.preparing_ocr": "Pripravujem rozpoznávanie…",
   "upload_modal.preview_label": "Náhľad ({ratio})",
-  "upload_progress.label": "Nahráva sa...",
+  "upload_progress.label": "Nahráva sa…",
   "upload_progress.processing": "Spracovávanie…",
   "username.taken": "Používateľské meno je obsadené. Skúste iné",
-  "video.close": "Zavri video",
-  "video.download": "Stiahni súbor",
-  "video.exit_fullscreen": "Vypni zobrazenie na celú obrazovku",
-  "video.expand": "Zväčši video",
-  "video.fullscreen": "Zobraz na celú obrazovku",
-  "video.hide": "Skry video",
-  "video.mute": "Stlm zvuk",
-  "video.pause": "Pauza",
-  "video.play": "Prehraj",
-  "video.unmute": "Zapni zvuk"
+  "video.close": "Zatvoriť video",
+  "video.download": "Stiahnuť súbor",
+  "video.exit_fullscreen": "Ukončiť režim celej obrazovky",
+  "video.expand": "Zväčšiť video",
+  "video.fullscreen": "Zobraziť na celú obrazovku",
+  "video.hide": "Skryť video",
+  "video.mute": "Stlmiť zvuk",
+  "video.pause": "Pozastaviť",
+  "video.play": "Prehrať",
+  "video.unmute": "Zapnúť zvuk"
 }
diff --git a/app/javascript/mastodon/locales/sr-Latn.json b/app/javascript/mastodon/locales/sr-Latn.json
index e6be3f37957e65..35bfc79f2ee1cc 100644
--- a/app/javascript/mastodon/locales/sr-Latn.json
+++ b/app/javascript/mastodon/locales/sr-Latn.json
@@ -277,7 +277,13 @@
   "follow_request.authorize": "Odobri",
   "follow_request.reject": "Odbij",
   "follow_requests.unlocked_explanation": "Iako vaš nalog nije zaključan, osoblje {domain} smatra da biste možda želeli da ručno pregledate zahteve za praćenje sa ovih naloga.",
+  "follow_suggestions.curated_suggestion": "Izbor osoblja",
   "follow_suggestions.dismiss": "Ne prikazuj ponovo",
+  "follow_suggestions.hints.featured": "Ovaj profil je ručno izabrao tim {domain}.",
+  "follow_suggestions.hints.friends_of_friends": "Ovaj profil je popularan među ljudima koje pratite.",
+  "follow_suggestions.hints.most_followed": "Ovaj profil je jedan od najpraćenijih na {domain}.",
+  "follow_suggestions.hints.most_interactions": "Ovaj profil je nedavno dobio veliku pažnju na {domain}.",
+  "follow_suggestions.hints.similar_to_recently_followed": "Ovaj profil je sličan profilima koje ste nedavno zapratili.",
   "follow_suggestions.personalized_suggestion": "Personalizovani predlog",
   "follow_suggestions.popular_suggestion": "Popularni predlog",
   "follow_suggestions.view_all": "Prikaži sve",
diff --git a/app/javascript/mastodon/locales/sr.json b/app/javascript/mastodon/locales/sr.json
index 3143b5215eeefa..dc20585c9279fe 100644
--- a/app/javascript/mastodon/locales/sr.json
+++ b/app/javascript/mastodon/locales/sr.json
@@ -277,6 +277,7 @@
   "follow_request.authorize": "Одобри",
   "follow_request.reject": "Одбиј",
   "follow_requests.unlocked_explanation": "Иако ваш налог није закључан, особље {domain} сматра да бисте можда желели да ручно прегледате захтеве за праћење са ових налога.",
+  "follow_suggestions.curated_suggestion": "Избор особља",
   "follow_suggestions.dismiss": "Не приказуј поново",
   "follow_suggestions.hints.featured": "Овај профил је ручно изабрао тим {domain}.",
   "follow_suggestions.hints.friends_of_friends": "Овај профил је популаран међу људима које пратите.",
@@ -507,7 +508,7 @@
   "onboarding.steps.publish_status.body": "Поздравите свет текстом, сликама, видео снимцима или анкетама {emoji}",
   "onboarding.steps.publish_status.title": "Напишите своју прву објаву",
   "onboarding.steps.setup_profile.body": "Појачајте своје интеракције тако што ћете имати свеобухватан профил.",
-  "onboarding.steps.setup_profile.title": "Персонализујтее свој профил",
+  "onboarding.steps.setup_profile.title": "Персонализујте свој профил",
   "onboarding.steps.share_profile.body": "Нека ваши пријатељи знају како да вас пронађу на Mastodon-у!",
   "onboarding.steps.share_profile.title": "Поделите свој Mastodon профил",
   "onboarding.tips.2fa": "<strong>Да ли сте знали?</strong> Можете да заштитите свој налог подешавањем двоструке потврде идентитета у подешавањима налога. Ради са било којом TOTP апликацијом по вашем избору, није потребан број телефона!",
diff --git a/app/javascript/mastodon/locales/tok.json b/app/javascript/mastodon/locales/tok.json
index 4d2cc3d1dc6c72..64c3f98db7f62f 100644
--- a/app/javascript/mastodon/locales/tok.json
+++ b/app/javascript/mastodon/locales/tok.json
@@ -119,6 +119,7 @@
   "compose_form.save_changes": "o sin e ni",
   "compose_form.spoiler.marked": "o weka e toki pi ijo ike ken",
   "confirmation_modal.cancel": "o pini",
+  "confirmations.block.block_and_report": "o weka e jan o toki e jan tawa lawa",
   "confirmations.block.confirm": "o weka",
   "confirmations.block.message": "sina o wile ala wile weka e jan {name}?",
   "confirmations.cancel_follow_request.confirm": "o weka e wile sina",
@@ -132,20 +133,24 @@
   "confirmations.domain_block.confirm": "o weka.",
   "confirmations.domain_block.message": "sina wile ala a wile a len e ma {domain} ꞏ ken suli la len jan taso li pona ꞏ len pi ma ni la sina ken ala lukin e ijo pi ma ni lon lipu toki ale anu lukin toki ꞏ len ni la jan kute sina pi ma ni li weka",
   "confirmations.edit.confirm": "o ante",
+  "confirmations.edit.message": "sina ante e toki sina la toki pali sina li weka. sina wile ala wile e ni?",
   "confirmations.logout.confirm": "o weka",
   "confirmations.logout.message": "sina wile ala wile weka",
   "confirmations.mute.confirm": "o len",
+  "confirmations.mute.explanation": "ni la sina lukin ala e toki ona e toki kepeken nimi ona. taso la ona li ken lukin e toki sina li ken kute e ona.",
   "confirmations.mute.message": "sina awen ala awen wile kute ala e {name}?",
   "confirmations.redraft.confirm": "o weka o pali sin e toki",
   "confirmations.redraft.message": "pali sin e toki ni la sina wile ala wile weka e ona? sina ni la suli pi toki ni en wawa pi toki ni li weka. kin la toki lon toki ni li jo e mama ala.",
   "confirmations.reply.confirm": "toki lon toki ni",
-  "confirmations.reply.message": "toki tawa ona li weka e toki pali sina ꞏ sina wile ala wile ni",
+  "confirmations.reply.message": "sina toki lon toki ni la toki pali sina li weka. sina wile ala wile e ni?",
   "confirmations.unfollow.confirm": "o pini kute",
   "confirmations.unfollow.message": "sina o wile ala wile pini kute e jan {name}?",
   "conversation.delete": "o weka e toki ni",
   "conversation.mark_as_read": "ni o sin ala",
   "conversation.open": "o lukin e toki",
   "conversation.with": "lon {names}",
+  "copy_icon_button.copied": "toki li awen lon ilo sina",
+  "copypaste.copy_to_clipboard": "o awen lon ilo sina",
   "directory.local": "tan {domain} taso",
   "directory.new_arrivals": "jan pi kama sin",
   "directory.recently_active": "jan lon tenpo poka",
@@ -154,6 +159,9 @@
   "dismissable_banner.community_timeline": "ni li toki pi tenpo poka tawa ale tan jan lon ma lawa pi nimi {domain}.",
   "dismissable_banner.dismiss": "o weka",
   "dismissable_banner.explore_links": "ni li toki pi ijo sin ꞏ jan mute li pana e ni lon tenpo suno ni ꞏ sin la jan mute li pana la ni li kama suli",
+  "dismissable_banner.explore_statuses": "suni ni la jan mute li lukin e toki ni. jan mute li wawa e toki li suli e toki la toki ni li lon sewi. toki li sin la toki ni li lon sewi.",
+  "dismissable_banner.explore_tags": "suni ni la jan mute li lukin e toki pi toki ni. jan mute li kepeken toki la toki ni li lon sewi.",
+  "dismissable_banner.public_timeline": "toki ni li sin. jan li pali e toki ni la jan ante mute pi ma {domain} li kute e jan ni.",
   "embed.preview": "ni li jo e sitelen ni:",
   "emoji_button.activity": "musi",
   "emoji_button.flags": "len ma",
@@ -171,15 +179,25 @@
   "empty_column.account_timeline": "toki ala li lon!",
   "empty_column.account_unavailable": "ken ala lukin e lipu jan",
   "empty_column.blocks": "jan ala li weka tawa sina.",
+  "empty_column.direct": "jan ala li toki len e sina. jan li toki len e sina la sina ken lukin e ni lon ni.",
+  "empty_column.domain_blocks": "ma ala li weka tawa sina.",
+  "empty_column.favourited_statuses": "sina suli ala e toki. sina suli e toki la sina ken lukin e toki ni lon ni.",
+  "empty_column.favourites": "jan ala li suli e toki ni. jan li suli e toki ni la sina ken lukin e ona lon ni.",
+  "empty_column.follow_requests": "jan ala li toki pi wile kute tawa sina. jan li toki pi wile kute tawa sina la sina ken lukin e toki ni lon ni.",
   "empty_column.followed_tags": "sina alasa ala e toki ꞏ sina alasa e toki la toki li lon ni",
   "empty_column.hashtag": "ala li lon toki ni",
+  "empty_column.home": "ala a li lon lipu open sina! sina wile lon e ijo lon ni la o kute e jan pi toki suli.",
+  "empty_column.list": "ala li lon kulupu lipu ni. jan pi kulupu lipu ni li toki sin la toki ni li lon ni.",
+  "empty_column.lists": "sina jo ala e kulupu lipu. sina pali sin e kulupu lipu la ona li lon ni.",
   "empty_column.mutes": "jan ala li len tawa sina.",
+  "error.unexpected_crash.explanation": "ilo li ken ala pana e lipu ni. ni li ken tan pakala mi tan pakala pi ilo sina.",
   "errors.unexpected_crash.report_issue": "o toki e pakala tawa lawa",
   "explore.search_results": "ijo pi alasa ni",
   "explore.suggested_follows": "jan",
   "explore.title": "o alasa",
   "explore.trending_links": "sin",
   "explore.trending_statuses": "toki",
+  "filter_modal.added.settings_link": "lipu lawa",
   "filter_modal.select_filter.expired": "tenpo pini",
   "filter_modal.select_filter.search": "o alasa anu pali",
   "firehose.all": "ale",
@@ -187,6 +205,10 @@
   "firehose.remote": "kulupu ante",
   "follow_request.authorize": "o ken",
   "follow_request.reject": "o ala",
+  "follow_suggestions.hints.friends_of_friends": "jan kute sina li lukin mute e toki pi jan ni.",
+  "follow_suggestions.hints.most_followed": "jan mute lon ma {domain} li kute e jan ni.",
+  "follow_suggestions.hints.most_interactions": "tenpo poka la jan mute pi ma {domain} li lukin mute e toki pi jan ni.",
+  "follow_suggestions.hints.similar_to_recently_followed": "sina kute e jan lon tenpo poka la jan ni li sama ona.",
   "follow_suggestions.view_all": "o lukin e ale",
   "follow_suggestions.who_to_follow": "sina o kute e ni",
   "footer.about": "sona",
@@ -203,11 +225,14 @@
   "hashtag.column_settings.tag_mode.any": "wan ni",
   "hashtag.column_settings.tag_mode.none": "ala ni",
   "home.pending_critical_update.link": "o lukin e ijo ilo sin",
+  "interaction_modal.login.action": "o lon tomo",
   "interaction_modal.on_another_server": "lon ma ante",
   "interaction_modal.on_this_server": "lon ma ni",
   "interaction_modal.title.favourite": "o suli e toki {name}",
   "interaction_modal.title.follow": "o kute e {name}",
   "interaction_modal.title.reblog": "o wawa e toki {name}",
+  "interaction_modal.title.reply": "o toki lon toki pi jan {name}",
+  "intervals.full.days": "{number, plural, other {suni #}}",
   "keyboard_shortcuts.blocked": "o lukin e lipu sina pi jan weka",
   "keyboard_shortcuts.boost": "o pana sin e toki",
   "keyboard_shortcuts.down": "o tawa anpa lon lipu",
@@ -253,25 +278,42 @@
   "navigation_bar.pins": "toki sewi",
   "navigation_bar.preferences": "wile sina",
   "navigation_bar.search": "o alasa",
+  "notification.admin.report": "jan {name} li toki e jan {target} tawa lawa",
   "notification.admin.sign_up": "{name} li kama",
   "notification.favourite": "{name} li suli e toki sina",
   "notification.follow": " {name} li kute e sina",
   "notification.follow_request": "{name} li wile kute e sina",
   "notification.mention": "jan {name} li toki e sina",
+  "notification.poll": "sina pana lon pana la pana ni li pini",
   "notification.reblog": "{name} li wawa e toki sina",
   "notification.status": "{name} li toki",
   "notification.update": "{name} li ante e toki",
   "notifications.column_settings.follow": "jan kute sin",
+  "notifications.column_settings.poll": "pana lon pana ni:",
+  "notifications.column_settings.reblog": "wawa:",
+  "notifications.column_settings.update": "ante toki:",
   "notifications.filter.all": "ale",
+  "notifications.filter.polls": "pana lon pana ni",
   "onboarding.compose.template": "toki a, #Mastodon o!",
+  "onboarding.profile.display_name": "nimi tawa jan ante",
+  "onboarding.share.lead": "o toki lon nasin Masoton pi alasa sina tawa jan",
+  "onboarding.share.message": "ilo #Mastodon la mi jan {username} a! o kute e mi lon ni: {url}",
   "onboarding.start.title": "sina o kama pona a!",
+  "onboarding.tips.migration": "<strong>sina sona ala sona e ni?</strong> tenpo kama la sina pilin ike tawa ma {domain} la, sina ken tawa ma ante lon ilo Masoton. jan li kute e sina la jan ni li awen kute e sina. kin la sina ken lawa e ma pi sina taso a!",
   "poll.total_people": "{count, plural, other {jan #}}",
+  "poll.total_votes": "{count, plural, other {pana #}}",
+  "poll.vote": "o pana",
+  "poll.voted": "sina pana e ni",
+  "poll.votes": "{votes, plural, other {pana #}}",
+  "privacy.direct.long": "jan ale lon toki",
   "privacy.public.short": "tawa ale",
   "relative_time.full.just_now": "tenpo ni",
   "relative_time.just_now": "tenpo ni",
   "relative_time.today": "tenpo suno ni",
   "report.block": "o weka e jan",
   "report.block_explanation": "sina kama lukin ala e toki ona. ona li kama ala ken lukin e toki sina li kama ala ken kute e sina. ona li ken sona e kama ni.",
+  "report.categories.other": "ante",
+  "report.categories.spam": "ike tan toki mute",
   "report.category.title": "ike seme li lon {type} ni",
   "report.category.title_account": "lipu",
   "report.category.title_status": "toki",
diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json
index 4962aedad5be92..f52f28381082aa 100644
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@@ -6,7 +6,7 @@
   "about.domain_blocks.preamble": "Mastodon 基本上允許您瀏覽聯邦宇宙中任何伺服器的內容並與使用者互動。以下是在本伺服器上設定的例外。",
   "about.domain_blocks.silenced.explanation": "一般來說您不會看到來自這個伺服器的個人檔案和內容，除非您明確搜尋或主動跟隨對方。",
   "about.domain_blocks.silenced.title": "已受限",
-  "about.domain_blocks.suspended.explanation": "來自此伺服器的資料都不會被處理、儲存或交換，也無法與此伺服器上的使用者互動或交流。",
+  "about.domain_blocks.suspended.explanation": "來自此伺服器的資料都不會被處理、儲存或交換，也無法和此伺服器上的使用者互動與交流。",
   "about.domain_blocks.suspended.title": "已停權",
   "about.not_available": "無法於本伺服器上使用此資訊。",
   "about.powered_by": "由 {mastodon} 提供的去中心化社群媒體",
@@ -212,7 +212,7 @@
   "emoji_button.custom": "自訂",
   "emoji_button.flags": "旗幟",
   "emoji_button.food": "食物 & 飲料",
-  "emoji_button.label": "插入表情符號",
+  "emoji_button.label": "插入 emoji 表情符號",
   "emoji_button.nature": "自然",
   "emoji_button.not_found": "啊就沒這表情符號吼！！ (╯°□°）╯︵ ┻━┻",
   "emoji_button.objects": "物件",
@@ -227,7 +227,7 @@
   "empty_column.account_timeline": "這裡還沒有嘟文！",
   "empty_column.account_unavailable": "無法取得個人檔案",
   "empty_column.blocks": "您還沒有封鎖任何使用者。",
-  "empty_column.bookmarked_statuses": "您還沒有建立任何書籤。當您建立書籤時，它將於此顯示。",
+  "empty_column.bookmarked_statuses": "您還沒有新增任何書籤。當您新增書籤時，它將於此顯示。",
   "empty_column.community": "本站時間軸是空的。快公開嘟些文搶頭香啊！",
   "empty_column.direct": "您還沒有收到任何私訊。當您私訊別人或收到私訊時，它將於此顯示。",
   "empty_column.domain_blocks": "尚未封鎖任何網域。",
@@ -239,7 +239,7 @@
   "empty_column.hashtag": "這個主題標籤下什麼也沒有。",
   "empty_column.home": "您的首頁時間軸是空的！跟隨更多人來將它填滿吧！",
   "empty_column.list": "這份列表下什麼也沒有。當此列表的成員嘟出新的嘟文時，它們將顯示於此。",
-  "empty_column.lists": "您還沒有建立任何列表。當您建立列表時，它將於此顯示。",
+  "empty_column.lists": "您還沒有新增任何列表。當您新增列表時，它將於此顯示。",
   "empty_column.mutes": "您尚未靜音任何使用者。",
   "empty_column.notifications": "您還沒有收到任何通知，當您與別人開始互動時，它將於此顯示。",
   "empty_column.public": "這裡什麼都沒有！嘗試寫些公開的嘟文，或者跟隨其他伺服器的使用者後，就會有嘟文出現了",
@@ -322,10 +322,10 @@
   "home.pending_critical_update.link": "檢視更新內容",
   "home.pending_critical_update.title": "有可取得的重要安全性更新！",
   "home.show_announcements": "顯示公告",
-  "interaction_modal.description.favourite": "在 Mastodon 上有個帳號的話，您可以將此嘟文加入最愛以讓作者知道您欣賞它且將它儲存下來。",
-  "interaction_modal.description.follow": "在 Mastodon 上有個帳號的話，您可以跟隨 {name} 以於首頁時間軸接收他們的嘟文。",
-  "interaction_modal.description.reblog": "在 Mastodon 上有個帳號的話，您可以轉嘟此嘟文以分享給您的跟隨者們。",
-  "interaction_modal.description.reply": "在 Mastodon 上有個帳號的話，您可以回覆此嘟文。",
+  "interaction_modal.description.favourite": "若於 Mastodon 上有個帳號，您可以將此嘟文加入最愛使作者知道您欣賞它且將它儲存下來。",
+  "interaction_modal.description.follow": "若於 Mastodon 上有個帳號，您可以跟隨 {name} 以於首頁時間軸接收他們的嘟文。",
+  "interaction_modal.description.reblog": "若於 Mastodon 上有個帳號，您可以轉嘟此嘟文以分享給您的跟隨者們。",
+  "interaction_modal.description.reply": "若於 Mastodon 上有個帳號，您可以回覆此嘟文。",
   "interaction_modal.login.action": "返回首頁",
   "interaction_modal.login.prompt": "您帳號所屬伺服器之網域，例如：mastodon.social",
   "interaction_modal.no_account_yet": "還沒有 Mastodon 帳號嗎？",
@@ -347,7 +347,7 @@
   "keyboard_shortcuts.compose": "將游標移至文字撰寫區塊",
   "keyboard_shortcuts.description": "說明",
   "keyboard_shortcuts.direct": "開啟私訊對話欄",
-  "keyboard_shortcuts.down": "往下移動",
+  "keyboard_shortcuts.down": "向下移動",
   "keyboard_shortcuts.enter": "檢視嘟文",
   "keyboard_shortcuts.favourite": "加到最愛",
   "keyboard_shortcuts.favourites": "開啟最愛列表",
@@ -373,7 +373,7 @@
   "keyboard_shortcuts.toggle_sensitivity": "顯示或隱藏媒體",
   "keyboard_shortcuts.toot": "發個新嘟文",
   "keyboard_shortcuts.unfocus": "跳離文字撰寫區塊或搜尋框",
-  "keyboard_shortcuts.up": "往上移動",
+  "keyboard_shortcuts.up": "向上移動",
   "lightbox.close": "關閉",
   "lightbox.compress": "折疊圖片檢視框",
   "lightbox.expand": "展開圖片檢視框",
@@ -483,7 +483,7 @@
   "onboarding.actions.go_to_home": "前往您的首頁時間軸",
   "onboarding.compose.template": "哈囉 #Mastodon！",
   "onboarding.follows.empty": "很遺憾，目前未能顯示任何結果。您可以嘗試使用搜尋、瀏覽探索頁面以找尋人們跟隨、或稍候再試。",
-  "onboarding.follows.lead": "您的首頁時間軸是 Mastodon 的核心體驗。若您跟隨更多人的話，它將會變得更活躍有趣。這些個人檔案也許是個好起點，您可以隨時取消跟隨他們！",
+  "onboarding.follows.lead": "您的首頁時間軸是 Mastodon 的核心體驗。若您跟隨更多人，它將會變得更活躍有趣。這些個人檔案也許是個好起點，您可以隨時取消跟隨他們！",
   "onboarding.follows.title": "客製化您的首頁時間軸",
   "onboarding.profile.discoverable": "使我的個人檔案可以被找到",
   "onboarding.profile.discoverable_hint": "當您於 Mastodon 上選擇加入可發現性時，您的嘟文可能會出現於搜尋結果與趨勢中。您的個人檔案可能會被推薦給與您志趣相投的人。",
@@ -505,7 +505,7 @@
   "onboarding.start.title": "噹噹！完成啦！",
   "onboarding.steps.follow_people.body": "Mastodon 的趣味就是跟隨些有趣的人們！",
   "onboarding.steps.follow_people.title": "客製化您的首頁時間軸",
-  "onboarding.steps.publish_status.body": "向新世界打聲招呼吧。",
+  "onboarding.steps.publish_status.body": "透過文字、照片、影片或投票 {emoji} 向新世界打聲招呼吧。",
   "onboarding.steps.publish_status.title": "撰寫您第一則嘟文",
   "onboarding.steps.setup_profile.body": "若您完整填寫個人檔案，其他人比較願意與您互動。",
   "onboarding.steps.setup_profile.title": "客製化您的個人檔案",
@@ -526,7 +526,7 @@
   "poll.vote": "投票",
   "poll.voted": "您已對此問題投票",
   "poll.votes": "{votes, plural, one {# 張票} other {# 張票}}",
-  "poll_button.add_poll": "建立投票",
+  "poll_button.add_poll": "新增投票",
   "poll_button.remove_poll": "移除投票",
   "privacy.change": "調整嘟文隱私狀態",
   "privacy.direct.long": "此嘟文提及之所有人",
@@ -716,7 +716,7 @@
   "units.short.million": "{count}M",
   "units.short.thousand": "{count}K",
   "upload_area.title": "拖放來上傳",
-  "upload_button.label": "上傳圖片、影片、或者音樂檔案",
+  "upload_button.label": "上傳圖片、影片、或者音訊檔案",
   "upload_error.limit": "已達到檔案上傳限制。",
   "upload_error.poll": "不允許於投票時上傳檔案。",
   "upload_form.audio_description": "為聽障人士增加文字說明",
diff --git a/config/locales/activerecord.kab.yml b/config/locales/activerecord.kab.yml
index 909ff68c24e206..b3ca90069b50ed 100644
--- a/config/locales/activerecord.kab.yml
+++ b/config/locales/activerecord.kab.yml
@@ -19,7 +19,7 @@ kab:
         account:
           attributes:
             username:
-              invalid: isekkilen, uṭṭunen d yijerriden n wadda kan
+              invalid: ilaq ad ilin isekkilen, uṭṭunen d yijerriden n wadda kan
               reserved: yettwaṭṭef
         status:
           attributes:
diff --git a/config/locales/activerecord.sk.yml b/config/locales/activerecord.sk.yml
index d13c416e516a63..809d00647146db 100644
--- a/config/locales/activerecord.sk.yml
+++ b/config/locales/activerecord.sk.yml
@@ -7,11 +7,11 @@ sk:
         options: Voľby
       user:
         agreement: Dohoda o poskytovaní služieb
-        email: Emailová adresa
+        email: E-mailová adresa
         locale: Jazyk
         password: Heslo
       user/account:
-        username: Meno používateľa
+        username: Používateľské meno
       user/invite_request:
         text: Dôvod
     errors:
@@ -41,9 +41,9 @@ sk:
           attributes:
             email:
               blocked: používa nepovoleného poskytovateľa e-mailu
-              unreachable: zdá sa, že neexistuje
+              unreachable: vyzerá, že neexistuje
             role_id:
-              elevated: nemôže byť vyššia ako vaša súčasná rola
+              elevated: nemôže byť viac ako vaša súčasná rola
         user_role:
           attributes:
             permissions_as_keys:
@@ -51,9 +51,9 @@ sk:
               elevated: nemôže obsahovať povolenia, ktoré vaša aktuálna rola nemá
               own_role: nie je možné zmeniť s vašou aktuálnou rolou
             position:
-              elevated: nemôže byť vyššia ako vaša súčasná rola
+              elevated: nemôže byť viac ako vaša súčasná rola
               own_role: nie je možné zmeniť s vašou aktuálnou rolou
         webhook:
           attributes:
             events:
-              invalid_permissions: nemožno zahrnúť udalosti, ku ktorým nemáte práva
+              invalid_permissions: nemôže zahrnúť udalosti, ku ktorým nemáte práva
diff --git a/config/locales/af.yml b/config/locales/af.yml
index 62c52fa493b943..adc9d5dbd5d0f9 100644
--- a/config/locales/af.yml
+++ b/config/locales/af.yml
@@ -173,5 +173,3 @@ af:
     warning:
       title:
         silence: Rekening beperk
-    welcome:
-      edit_profile_action: Stel profiel op
diff --git a/config/locales/an.yml b/config/locales/an.yml
index 7ad1986b24a1da..27abf2203a8c91 100644
--- a/config/locales/an.yml
+++ b/config/locales/an.yml
@@ -1596,8 +1596,6 @@ an:
         silence: Cuenta limitada
         suspend: Cuenta suspendida
     welcome:
-      edit_profile_action: Configurar lo perfil
-      edit_profile_step: Puetz personalizar lo tuyo perfil puyando una foto de perfil, cambiando lo tuyo nombre d'usuario y muito mas. Puetz optar per revisar a los nuevos seguidores antes que puedan seguir-te.
       explanation: Aquí i hai qualques consellos pa empecipiar
       subject: Bienveniu a Mastodon
       title: Te damos la bienvenida a bordo, %{name}!
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 8e9338d80ad64a..2e227f53a7a35f 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -1965,8 +1965,6 @@ ar:
         silence: الحساب محدود
         suspend: الحساب مُعلَّق
     welcome:
-      edit_profile_action: تهيئة الملف التعريفي
-      edit_profile_step: يمكنك تخصيص ملفك الشخصي عن طريق رفع صورة ملفك الشخصي, تغيير اسم العرض الخاص بك والمزيد. يمكنك اختيار مراجعة المتابعين الجدد قبل السماح لهم بمتابعتك.
       explanation: ها هي بعض النصائح قبل بداية الاستخدام
       subject: أهلًا بك على ماستدون
       title: أهلاً بك، %{name}!
diff --git a/config/locales/ast.yml b/config/locales/ast.yml
index ee9105b05ff258..9b9d5510c08062 100644
--- a/config/locales/ast.yml
+++ b/config/locales/ast.yml
@@ -899,8 +899,6 @@ ast:
         none: Alvertencia
         suspend: Cuenta suspendida
     welcome:
-      edit_profile_action: Configurar el perfil
-      edit_profile_step: Pues personalizar el perfil pente la xuba d'una semeya, el cambéu del nome visible ya muncho más. Tamién, si lo prefieres, pues revisar los perfiles nuevos enantes de que puedan siguite.
       explanation: Equí tienes dalgunos conseyos pa que comiences
       subject: Afáyate en Mastodon
       title: "¡Afáyate, %{name}!"
diff --git a/config/locales/be.yml b/config/locales/be.yml
index bd75870a18c439..d0cc96d6d89206 100644
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -1906,9 +1906,42 @@ be:
         silence: Уліковы запіс абмежаваны
         suspend: Уліковы запіс выключаны
     welcome:
-      edit_profile_action: Наладзіць профіль
-      edit_profile_step: Вы можаце наладзіць свой профіль, запампаваўшы выяву профілю, змяніўшы адлюстраванае імя і іншае. Вы можаце праглядаць новых падпісчыкаў, перш чым ім будзе дазволена падпісацца на вас.
+      apps_android_action: Спампаваць з Google Play
+      apps_ios_action: Спампваваць з App Store
+      apps_step: Спампуйце нашыя афіцыйныя праграмы.
+      apps_title: Кліенты Mastodon
+      checklist_subtitle: 'Давайце паспрабуем разабрацца ў гэтай новай сацыяльнай сетцы:'
+      checklist_title: З чаго пачаць
+      edit_profile_action: Персаналізаваць
+      edit_profile_step: Узмацніце ўзаемадзеянне, запоўніўшы поўны профіль.
+      edit_profile_title: Наладзьце свой профіль
       explanation: Вось некаторыя парады каб пачаць
+      feature_action: Даведацца больш
+      feature_audience: Mastodon дае ўнікальную магчымасць кіраваць сваёй аўдыторыяй без пасрэднікаў. Маючы сервер Mastodon, разгорнуты на ўласнай інфраструктуры, яго карыстальнікі могуць узаемадзейнічаць з любым іншым серверам Mastodon, не аддаючы кантроль у чужыя рукі.
+      feature_audience_title: Фармуйце сваю аўдыторыю з упэўненасцю
+      feature_control: Толькі вы дакладна ведаеце, што хочаце бачыць на сваім серверы. Ніякіх алгарытмаў або рэкламы, якія марнуюць ваш час. Сачыце за любым серверам Mastodon з аднаго ўліковага запісу і атрымлівайце паведамленні ў храналагічным парадку, каб ваш куток Інтэрнэту быў крыху падобны на вас.
+      feature_control_title: Кіруйце сваёй стужкай
+      feature_creativity: Mastodon падтрымлівае публікацыі з аўдыя, відэа і малюнкамі, апісаннем даступнасці, апытаннямі, папярэджаннямі аб змесце, аніміраванымі аватарамі, карыстальніцкімі эмодзі, мініяцюрамі, элементамі кіравання абрэзкай мініяцюр і іншым. Незалежна ад таго, дзеліцеся вы сваім мастацтвам, музыкай або падкастам, Mastodon тут для вас.
+      feature_creativity_title: Неабмежаваны творчы патэнцыял
+      feature_moderation: Mastodon вяртае прыняцце рашэнняў у вашыя рукі. У адрозненне ад сацыяльных сетак, якія належаць карпарацыям, якія спускаюць свае правілы зверху, кожны сервер Mastodon усталёўвае свае правілы і нормы, якія выконваюцца на мясцовым узроўні, што робіць іх найболей гнуткімі ў задавальненні запатрабаванняў розных груп людзей. Далучайцеся да сервера з правіламі, з якімі вы згодны, ці стварыце свой уласны.
+      feature_moderation_title: Мадэрацыя, якой яна павінна быць
+      follow_action: Падпісацца
+      follow_step: Падпіска на цікавых людзей - гэта галоўнае ў Mastodon.
+      follow_title: Наладзьце сваю хатнюю стужку
+      follows_subtitle: Падпішыцеся на папулярных карыстальнікаў
+      follows_title: На каго падпісацца
+      follows_view_more: Прагледзець больш людзей, на якіх варта падпісацца
+      hashtags_recent_count: "%{people} людзей за апошнія %{days} дні"
+      hashtags_subtitle: Даведайцеся што было папулярна ў апошнія 2 дні
+      hashtags_title: Папулярныя хэштэгі
+      hashtags_view_more: Прагледзець іншыя папулярныя хэштэгі
+      post_action: Стварыць
+      post_step: Скажыце ўсім прывітанне з дапамогай тэксту, фатаграфій, відэа і апытанняў.
+      post_title: Стварыце свой першы допіс
+      share_action: Абагуліць
+      share_step: Няхай вашыя сябры ведаюць, як знайсці вас у Mastodon.
+      share_title: Абагульце ваш профіль у Mastodon
+      sign_in_action: Увайсці
       subject: Вітаем у Mastodon
       title: Рады вітаць вас, %{name}!
   users:
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 3d1b6d291fd11e..8689b0359ec47c 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -767,6 +767,7 @@ bg:
         disabled: До никого
         users: До влезнали локални потребители
       registrations:
+        moderation_recommandation: Уверете се, че имате адекватен и реактивен модераторски екип преди да отворите регистриранията за всеки!
         preamble: Управлява кой може да създава акаунт на сървъра ви.
         title: Регистрации
       registrations_mode:
@@ -774,6 +775,7 @@ bg:
           approved: Изисква се одобрение за регистриране
           none: Никой не може да се регистрира
           open: Всеки може да се регистрира
+        warning_hint: Препоръчваме употребата на „Изисква се одобрение за регистриране“, освен ако сте уверени, че екипът ви за модериране може да се справи със спама и зловредните регистрирания своевременно.
       security:
         authorized_fetch: Изисква се удостоверяване от федеративни сървъри
         authorized_fetch_hint: Изискването удостоверяване от феративните сървъри позволява по-строго прилагане на блокирания както на ниво потребител, така и на ниво сървър. Това обаче снижава производителността, намалява обхвата на вашите отговори и може да възникнат проблеми със съвместимостта с някои федеративни услуги. Освен това, то не пречи на посветени участници да извличат вашите обществени публикации и акаунти.
@@ -966,6 +968,9 @@ bg:
       title: Уебкуки
       webhook: Уебкука
   admin_mailer:
+    auto_close_registrations:
+      body: Поради липса на скорошна дейност по модериране, регистрациите на %{instance} бяха самодейно превключени в режим, изискващ ръчна проверка, за да се предотврати употребата на %{instance} като платформа за потенциални зложелатели. Може да превключите обратно в режим „отворено регистриране“ по всяко време.
+      subject: Регистриранията за %{instance} са самодейно превключени към изискване на одобрение
     new_appeal:
       actions:
         delete_statuses: за изтриване на публикациите им
@@ -1009,7 +1014,7 @@ bg:
     remove: Разкачвне на псевдонима
   appearance:
     advanced_web_interface: Разширен уеб интерфейс
-    advanced_web_interface_hint: 'Ако желаете да се възползвате от цялата ширина на своя екран, разширеният уеб интерфейс ще ви позволи да настроите няколко различни колони, за да виждате едновременно различна информация: Начало, известия, федерирана хронология, множество списъци и хаштагове.'
+    advanced_web_interface_hint: 'Ако искате да употребявате цялата ширина на екрана си, разширеният уеб интерфейс ви позволява да настроите най-различни колони, за да виждате едновременно множество сведения, колкото искате: Начало, известия, федеративен инфоканал, произволен брой списъци и хаштагове.'
     animations_and_accessibility: Анимация и достъпност
     confirmation_dialogs: Диалогов прозорец за потвърждение
     discovery: Откриване
@@ -1837,9 +1842,42 @@ bg:
         silence: Акаунтът има ограничение
         suspend: Акаунтът е спрян
     welcome:
-      edit_profile_action: Настройване на профила
-      edit_profile_step: Може да настроите профила си, качвайки снимката на профила, променяйки показваното си име и други неща. Може да се включите за преглед на нови последователи преди да бъдат позволени да ви последват.
+      apps_android_action: Вземане от Google Play
+      apps_ios_action: Изтегляне в App Store
+      apps_step: Изтегляне на служебните ни приложения.
+      apps_title: Приложения на Mastodon
+      checklist_subtitle: 'Нека започнем приключение в тази нова социална граница:'
+      checklist_title: Добре дошли при контролния списък
+      edit_profile_action: Персонализиране
+      edit_profile_step: Подсилете взаимодействията си, изграждайки цялостен профил.
+      edit_profile_title: Пригодете профила си
       explanation: Ето няколко стъпки за начало
+      feature_action: Научете повече
+      feature_audience: Mastodon ви осигурява с неповторимата възможност на управление на публиката ви без посредници. Mastodon се разгръща на ваша собствена инфраструктура, позволяваща ви да следвате и да бъдете последвани от всеки друг сървър на Mastodon в мрежата и не е под ничий контрол освен ваш.
+      feature_audience_title: Изградете публиката си с увереност
+      feature_control: Вие знаете най-добре какво искате да виждате на началния си инфоканал. Няма алгоритми или реклами, за да ви губят времето. Последвате всекиго през всеки сървър на Mastodon от един акаунт и получавате публикациите им в хронологичен ред, а и правете свое кътче в интернет малко по-подобно на вас.
+      feature_control_title: Поддържайте управлението на часовата си ос
+      feature_creativity: Mastodon поддържа публикации със звук, картина и видео, описания на достъпността, анкети, предупреждения за съдържание, анимирани аватари, потребителски емоджита, контрол на изрязване на миниобрази и още, за да ви помогнат да се изразите в мрежата. Независимо дали публикувате свое изкуство, музика или свой подкаст, то Mastodon е там за вас.
+      feature_creativity_title: Несравнимо творчество
+      feature_moderation: Mastodon връща вземането на решения в ръцете ви. Всеки сървър сътворява свои правила и регулации, прилагащи се локално, а не отгоре надолу като корпоративна социална медия, което го прави най-гъвкав в отговор на нуждите на различни групи хора. Присъединете се към сървър, с който сте съгласни, или пък си хоствайте свой.
+      feature_moderation_title: Модерирайте начина, по който трябва да е
+      follow_action: Последване
+      follow_step: Последването на интересни хора е основната цел на Mastodon.
+      follow_title: Персонализиране на началния ви инфоканал
+      follows_subtitle: Следвайте добре известни акаунти
+      follows_title: Кого да се последва
+      follows_view_more: Преглед на още хора за последване
+      hashtags_recent_count: "%{people} души за последните %{days} дни"
+      hashtags_subtitle: Проучете какво изгрява от последните 2 дни
+      hashtags_title: Изгряващи хаштагове
+      hashtags_view_more: Преглед на още изгряващи хаштагове
+      post_action: Съставяне
+      post_step: Поздравете света с текст, снимки, видео или анкети.
+      post_title: Направете първата си публикация
+      share_action: Споделяне
+      share_step: Позволете на приятелите си да знаят как да ви намират в Mastodon.
+      share_title: Споделете профила си в Mastodon
+      sign_in_action: Вход
       subject: Добре дошли в Mastodon
       title: Добре дошли на борда, %{name}!
   users:
diff --git a/config/locales/br.yml b/config/locales/br.yml
index 01c6db4ef56ddc..fa6d266f627890 100644
--- a/config/locales/br.yml
+++ b/config/locales/br.yml
@@ -560,7 +560,16 @@ br:
       title:
         none: Diwall
     welcome:
-      edit_profile_action: Kefluniañ ar profil
+      apps_android_action: Tapit anezhañ war Google Play
+      apps_ios_action: Pellgargañ war an App Store
+      apps_step: Pellgargit hon arloadoù ofisiel.
+      apps_title: Arloadoù Mastodon
+      edit_profile_action: Personelaat
+      edit_profile_title: Personelaat ho profil
+      feature_action: Gouzout hiroc'h
+      follow_action: Heuliañ
+      share_action: Rannañ
+      sign_in_action: Kevreañ
       subject: Donemat e Mastodon
       title: Degemer mat e bourzh, %{name}!
   users:
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index d4213a258ed1b9..15a06559be9c14 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -1842,9 +1842,42 @@ ca:
         silence: Compte limitat
         suspend: Compte suspès
     welcome:
-      edit_profile_action: Configura el perfil
-      edit_profile_step: Pots personalitzar el teu perfil pujant-hi un avatar, canviant el teu nom de visualització i molt més. Si ho prefereixes, pots revisar els seguidors nous abans que et puguin seguir.
+      apps_android_action: Obteniu-lo a Google Play
+      apps_ios_action: Descarregueu-la de la botiga d'aplicacions
+      apps_step: Descarregueu-vos les aplicacions oficials.
+      apps_title: Aplicacions de Mastodon
+      checklist_subtitle: 'Inicieu-vos en aquesta nova frontera social:'
+      checklist_title: Control inicial
+      edit_profile_action: Personalitzeu
+      edit_profile_step: Augmenteu les vostres interaccions amb un perfil complet.
+      edit_profile_title: Personalitzeu el perfil
       explanation: Aquests són alguns consells per a començar
+      feature_action: Per a saber-ne més
+      feature_audience: Mastodon us proporciona una possibilitat única de gestionar la vostra audiència sense intermediaris. Instal·lat a la vostra pròpia infraestructura us permet seguir i ser seguit només per altres servidors Mastodon i ningú més que vosaltres el controla.
+      feature_audience_title: Construïu la vostra audiència en confiança
+      feature_control: Sabeu perfectament què voleu veure a la línia temporal. Sense algorismes ni anuncis que us facin malbaratar el temps. Seguiu qualsevol persona de qualsevol servidor Mastodon des d'un sol compte en ordre cronològic i feu-vos a mida un racó d'internet.
+      feature_control_title: Tingueu el control de la vostra línia temporal
+      feature_creativity: Mastodon us permet de publicar àudio, vídeo i imatges, descripcions d'accessibilitat, enquestes, avisos de contingut, avatars animats, emojis personalitzats, retallar miniatures i més, a fi d'ajudar-vos a expressar-vos en línia. Tant si publiqueu el vostre art, música o un podcast, Mastodon us ajudarà.
+      feature_creativity_title: Creativitat incomparable
+      feature_moderation: Mastodon posa les decisions a les vostres mans. Cada servidor crea les seves pròpies regles, que només s'apliquen als usuaris locals, a diferència de les xarxes socials corporatives, permetent una flexibilitat que s'adapta a tota mena de grups. Uniu-vos a un servidor si esteu d'acord amb les seves regles, o creeu-ne un.
+      feature_moderation_title: Moderant com ha de ser
+      follow_action: Seguiu
+      follow_step: Mastodon va de seguir gent interessant.
+      follow_title: Personalitzeu la pantalla d'inici
+      follows_subtitle: Seguiu comptes populars
+      follows_title: A qui seguir
+      follows_view_more: Més persones a qui seguir
+      hashtags_recent_count: "%{people} persones en els últims %{days} dies"
+      hashtags_subtitle: Exploreu què és tendència des de fa 2 dies
+      hashtags_title: Etiquetes en tendència
+      hashtags_view_more: Més etiquetes en tendència
+      post_action: Redacteu
+      post_step: Saludeu el món amb text, fotos, vídeos o enquestes.
+      post_title: Feu la primera publicació
+      share_action: Compartiu
+      share_step: Permeteu als vostres amics de saber com trobar-vos a Mastodon.
+      share_title: Compartiu el perfil
+      sign_in_action: Inicieu sessió
       subject: Et donem la benvinguda a Mastodon
       title: Benvingut a bord, %{name}!
   users:
diff --git a/config/locales/ckb.yml b/config/locales/ckb.yml
index 7f1c28defc147f..f4733c27e5fbb0 100644
--- a/config/locales/ckb.yml
+++ b/config/locales/ckb.yml
@@ -1032,7 +1032,6 @@ ckb:
         silence: هەژماری سنووردار
         suspend: هەژمار ڕاگیرا
     welcome:
-      edit_profile_action: پرۆفایلی جێگیرکردن
       explanation: ئەمە چەند ئامۆژگارییەکن بۆ دەست پێکردنت
       subject: بەخێربیت بۆ ماستۆدۆن
       title: بەخێربێیت، بەکارهێنەر %{name}!
diff --git a/config/locales/co.yml b/config/locales/co.yml
index ecf860645548cc..8668cc69539283 100644
--- a/config/locales/co.yml
+++ b/config/locales/co.yml
@@ -1047,7 +1047,6 @@ co:
         silence: Contu limitatu
         suspend: Contu suspesu
     welcome:
-      edit_profile_action: Cunfigurazione di u prufile
       explanation: Eccu alcune idee per principià
       subject: Benvenutu·a nant’à Mastodon
       title: Benvenutu·a, %{name}!
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index fd24ac05c64d48..2ecc3606662f68 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -1906,8 +1906,6 @@ cs:
         silence: Účet omezen
         suspend: Účet pozastaven
     welcome:
-      edit_profile_action: Nastavit profil
-      edit_profile_step: Váš profil si můžete přizpůsobit nahráním profilového obrázku, změnou zobrazovaného jména a dalším. Můžete se přihlásit k přezkoumání nových následovatelů, než vás budou moci následovat.
       explanation: Zde je pár tipů do začátku
       subject: Vítejte na Mastodonu
       title: Vítejte na palubě, %{name}!
diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index 241d599464aee0..17c4280508ea69 100644
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@@ -1970,9 +1970,42 @@ cy:
         silence: Cyfrif cyfyngedig
         suspend: Cyfrif wedi'i atal
     welcome:
-      edit_profile_action: Sefydlu proffil
-      edit_profile_step: Gallwch addasu'ch proffil trwy lwytho llun proffil, newid eich enw dangos a mwy. Gallwch ddewis i adolygu dilynwyr newydd cyn iddyn nhw gael caniatâd i'ch dilyn.
+      apps_android_action: Ar gael ar Google Play
+      apps_ios_action: Ei lwytho i lawr o'r App Store
+      apps_step: Llwythwch i awr ein apiau swyddogol.
+      apps_title: Apiau Mastodon
+      checklist_subtitle: 'Gadewch i ni eich rhoi ar ben ffordd ar y datblygiad cymdeithasol newydd hon:'
+      checklist_title: Rhestr Wirio Croeso
+      edit_profile_action: Personoli
+      edit_profile_step: Rhowch hwb i'ch rhyngweithiadau trwy gael proffil cynhwysfawr.
+      edit_profile_title: Personoli'ch proffil
       explanation: Dyma ambell nodyn i'ch helpu i ddechrau
+      feature_action: Dysgu mwy
+      feature_audience: Mae Mastodon yn rhoi posibilrwydd unigryw i chi reoli'ch cynulleidfa'n ddirwystr. Mae'r Mastodon sy'n cael ei ddefnyddio ar eich seilwaith eich hun yn caniatáu ichi ddilyn a chael eich dilyn o unrhyw weinydd Mastodon arall ar-lein ac nid yw o dan reolaeth neb ond eich un chi.
+      feature_audience_title: Adeiladu eich cynulleidfa gyda hyder
+      feature_control: Chi sy'n gwybod orau beth rydych chi am ei weld ar eich llif cartref. Dim algorithmau na hysbysebion i wastraffu'ch amser. Dilynwch unrhyw un ar draws unrhyw weinydd Mastodon o gyfrif sengl a derbyn eu postiadau mewn trefn gronolegol, a gwnewch eich cornel chi o'r rhyngrwyd ychydig yn debycach i chi.
+      feature_control_title: Cadwch reolaeth ar eich llinell amser eich hun
+      feature_creativity: Mae Mastodon yn cefnogi postiadau sain, fideo a llun, disgrifiadau hygyrchedd, arolygon barn, rhybuddion cynnwys, afatarau animeiddiedig, emojis wedi'u teilwra, rheolaeth lluniau bach a mwy, i'ch helpu chi i fynegi'ch hun ar-lein. P'un a ydych chi'n cyhoeddi'ch celf, eich cerddoriaeth, neu'ch podlediad, mae Mastodon yno i chi.
+      feature_creativity_title: Creadigrwydd heb ei ail
+      feature_moderation: Mae Mastodon yn gosod penderfyniadau'n ôl yn eich dwylo chi. Mae pob gweinydd yn creu eu rheolau a'u rheoliadau eu hunain, sy'n cael eu gorfodi'n lleol ac nid o'r top i lawr fel cyfryngau cymdeithasol corfforaethol, gan ei wneud yn fwyaf hyblyg wrth ymateb i anghenion gwahanol grwpiau o bobl. Ymunwch â gweinydd gyda'r rheolau rydych chi'n cytuno â nhw, neu gwesteiwch eich un chi.
+      feature_moderation_title: Cymedroli'r ffordd y dylai fod
+      follow_action: Dilyn
+      follow_step: Dilyn pobl ddiddorol yw hanfod Mastodon.
+      follow_title: Personoli eich llif cartref
+      follows_subtitle: Dilynwch gyfrifon adnabyddus
+      follows_title: Pwy i ddilyn
+      follows_view_more: Gweld mwy o bobl i ddilyn
+      hashtags_recent_count: "%{people} person yn y %{days} diwrnod diwethaf"
+      hashtags_subtitle: Gweld beth sy'n tueddu dros y 2 ddiwrnod diwethaf
+      hashtags_title: Hashnodau tuedd
+      hashtags_view_more: Gweld mwy o hashnodau tuedd
+      post_action: Creu
+      post_step: Dywedwch helo wrth y byd gyda thestun, lluniau, fideos neu arolygon barn.
+      post_title: Creu'ch postiad cyntaf
+      share_action: Rhannu
+      share_step: Gadewch i'ch ffrindiau wybod sut i ddod o hyd i chi ar Mastodon!
+      share_title: Rhannwch eich proffil Mastodon
+      sign_in_action: Mewngofnodi
       subject: Croeso i Mastodon
       title: Croeso, %{name}!
   users:
diff --git a/config/locales/da.yml b/config/locales/da.yml
index 6bc0d967973218..527f2240c7c1ba 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -1842,9 +1842,42 @@ da:
         silence: Konto begrænset
         suspend: Konto suspenderet
     welcome:
-      edit_profile_action: Opsæt profil
-      edit_profile_step: Man kan tilpasse sin profil ved at uploade profilfoto, overskrift, ændre visningsnavn mv. Ønskes nye følgere vurderet, før de må følge dig, kan kontoen låses.
+      apps_android_action: Hent den fra Google Play
+      apps_ios_action: Download i App Store
+      apps_step: Download vores officielle apps.
+      apps_title: Mastodon apps
+      checklist_subtitle: 'Kom i gang på denne nye sociale frontløber:'
+      checklist_title: Velkomsttjekliste
+      edit_profile_action: Personliggør
+      edit_profile_step: Andre er mere tilbøjelige til at interagere med brugere med udfyldte profiler.
+      edit_profile_title: Personliggør din profil
       explanation: Her er nogle råd for at få dig i gang
+      feature_action: Læs mere
+      feature_audience: Mastodon giver brugeren en unik mulighed for at styre sit publikum uden mellemled. Mastodon udrullet på egen infrastruktur giver mulighed for at følge og blive fulgt fra enhver anden Mastodon-server online, kontrolleret/styret alene af brugen selv.
+      feature_audience_title: Opbyg et publikum i tillid
+      feature_control: Man ved selv bedst, hvad man ønsker at se på sit hjemmefeed. Ingen algoritmer eller annoncer til at spilde tiden. Følg alle på tværs af enhver Mastodon-server fra en enkelt konto og modtag deres indlæg i kronologisk rækkefølge, og gør dette hjørne af internet lidt mere personligt.
+      feature_control_title: Hold styr på egen tidslinje
+      feature_creativity: Mastodon understøtter indlæg med lyd, video og billede, tilgængelighedsbeskrivelser, meningsmålinger, indhold advarsler, animerede avatarer, tilpassede emojis, miniaturebeskæringskontrol og mere, for at gøre det lettere at udtrykke sig online. Uanset om man udgiver sin kunst, musik eller podcast, så står Mastodon til rådighed.
+      feature_creativity_title: Uovertruffen kreativitet
+      feature_moderation: Mastodon lægger beslutningstagning tilbage i brugerens hænder. Hver server opretter deres egne regler og reguleringer, som håndhæves lokalt og ikke ovenfra som virksomhedernes sociale medier, hvilket gør det til den mest fleksible mht. at reagere på behovene hos forskellige persongrupper. Deltag på en server med de regler, man er enige med, eller driv en egen server.
+      feature_moderation_title: Moderering af måden, tingene bør være på
+      follow_action: Følg
+      follow_step: At følge interessante personer, det er, hvad Mastodon handler om.
+      follow_title: Personliggør hjemmefeedet
+      follows_subtitle: Følg velkendte konti
+      follows_title: Hvem, som skal følges
+      follows_view_more: Vis nogle personer at følge
+      hashtags_recent_count: "%{people} personer de seneste %{days} dage"
+      hashtags_subtitle: Udforsk de seneste 2 dages tendenser
+      hashtags_title: Populære hashtags
+      hashtags_view_more: Se flere populære hashtags
+      post_action: Skriv
+      post_step: Sig hej til verden med tekst, fotos, videoer eller afstemninger.
+      post_title: Opret det første indlæg
+      share_action: Del
+      share_step: Lad vennerne vide, hvor man kan findes på Mastodon.
+      share_title: Del Mastodon-profilen
+      sign_in_action: Log ind
       subject: Velkommen til Mastodon
       title: Velkommen ombord, %{name}!
   users:
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 06361223731738..262c0166c92086 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -425,7 +425,7 @@ de:
       view: Domain-Sperre ansehen
     email_domain_blocks:
       add_new: Neue hinzufügen
-      allow_registrations_with_approval: Registrierungen mit Genehmigung erlauben
+      allow_registrations_with_approval: Registrierungen mit Genehmigung zulassen
       attempts_over_week:
         one: "%{count} Registrierungsversuch in der vergangenen Woche"
         other: "%{count} Registrierungsversuche in der vergangenen Woche"
@@ -1842,9 +1842,42 @@ de:
         silence: Konto stummgeschaltet
         suspend: Konto gesperrt
     welcome:
-      edit_profile_action: Profil einrichten
-      edit_profile_step: Du kannst dein Profil anpassen, indem du ein Profilbild hochlädst, deinen Anzeigenamen änderst und vieles mehr. Du kannst dich dafür entscheiden, neue Follower zu überprüfen, bevor sie dir folgen dürfen.
+      apps_android_action: Aus dem Google Play Store herunterladen
+      apps_ios_action: Im App Store herunterladen
+      apps_step: Lade unsere offiziellen Apps herunter.
+      apps_title: Mastodon-Apps
+      checklist_subtitle: 'Fangen wir an, diese neue soziale Dimension zu erkunden:'
+      checklist_title: Willkommensleitfaden
+      edit_profile_action: Personalisieren
+      edit_profile_step: Mit einem vollständigen Profil interagieren andere eher mit dir.
+      edit_profile_title: Personalisiere dein Profil
       explanation: Hier sind ein paar Tipps, um loszulegen
+      feature_action: Mehr erfahren
+      feature_audience: Mastodon bietet dir eine einzigartige Möglichkeit, deine Reichweite ohne Mittelsperson zu verwalten. Auf deiner eigenen Infrastruktur bereitgestellt, ermöglicht Mastodon es dir, jedem anderen Mastodon-Server zu folgen und von jedem anderen Server aus gefolgt zu werden. Ebenso steht Mastodon unter deiner Kontrolle.
+      feature_audience_title: Baue deine Reichweite mit Vertrauen auf
+      feature_control: Du weißt am besten, was du auf deiner Startseite sehen möchtest. Keine Algorithmen oder Werbung, die deine Zeit verschwenden. Folge Nutzer*innen von jedem Mastodon-Server von einem einzelnen Konto aus und empfange deren Beiträge in chronologischer Reihenfolge. Mache Mastodon zu deinem ganz persönlichen Fleckchen im Internet.
+      feature_control_title: Behalte die Kontrolle über deine eigene Timeline
+      feature_creativity: Mastodon unterstützt Audio-, Video- und Bildbeiträge, Beschreibungen, Umfragen, Inhaltswarnungen, animierte Avatare, benutzerdefinierte Emojis, das Zuschneiden von Vorschaubildern und vieles mehr, um dir zu helfen, dich online zu entfalten. Egal, ob du deine Kunst, deine Musik oder deinen Podcast veröffentlichst – Mastodon ist für dich da.
+      feature_creativity_title: Einzigartige Kreativität
+      feature_moderation: Mastodon legt die Entscheidungskraft zurück in deine Hände. Jeder Server erstellt eigene Regeln und Vorschriften, die nur lokal, pro einzelnem Server durchgesetzt werden – und nicht von oben herab, wie es bei den kommerziellen sozialen Medien der Fall ist. Dadurch ist Mastodon viel anpassungsfähiger für verschiedene Gruppen von Menschen. Registriere dich bei einem Server, dessen Regeln du magst, oder hoste deinen eigenen Server.
+      feature_moderation_title: Moderation so, wie sie sein sollte
+      follow_action: Folgen
+      follow_step: Interessanten Profilen zu folgen ist das, was Mastodon ausmacht.
+      follow_title: Personalisiere deine Startseite
+      follows_subtitle: Folge bekannten Profilen
+      follows_title: Empfohlene Profile
+      follows_view_more: Weitere Profile zum Folgen entdecken
+      hashtags_recent_count: "%{people} Personen in den letzten %{days} Tagen"
+      hashtags_subtitle: Entdecke, was in den letzten 2 Tagen angesagt war
+      hashtags_title: Angesagte Hashtags
+      hashtags_view_more: Weitere angesagte Hashtags entdecken
+      post_action: Verfassen
+      post_step: Begrüße die Welt mit Text, Fotos, Videos oder Umfragen.
+      post_title: Erstelle deinen ersten Beitrag
+      share_action: Teilen
+      share_step: Lass deine Freund*innen wissen, wie sie dich auf Mastodon finden können.
+      share_title: Teile dein Mastodon-Profil
+      sign_in_action: Anmelden
       subject: Willkommen bei Mastodon!
       title: Willkommen an Bord, %{name}!
   users:
diff --git a/config/locales/devise.et.yml b/config/locales/devise.et.yml
index 3e749f9a0b8098..76fbf619cc5e74 100644
--- a/config/locales/devise.et.yml
+++ b/config/locales/devise.et.yml
@@ -12,6 +12,7 @@ et:
       last_attempt: Sul on veel üks katse, enne kui konto lukustatakse.
       locked: Konto on lukustatud.
       not_found_in_database: Valed %{authentication_keys} või salasõna.
+      omniauth_user_creation_failure: Sellele identiteedile konto loomine nurjus.
       pending: Sinu konto on siiani läbivaatamisel.
       timeout: Sinu sessioon on aegunud. Jätkamiseks palun sisene uuesti.
       unauthenticated: Pead sisenema või looma konto enne kui jätkad.
diff --git a/config/locales/devise.fi.yml b/config/locales/devise.fi.yml
index 003d48417b6869..8963bf5a45b021 100644
--- a/config/locales/devise.fi.yml
+++ b/config/locales/devise.fi.yml
@@ -58,7 +58,7 @@ fi:
         subtitle: Kaksivaiheinen todennus on otettu käyttöön tilillesi.
         title: Kaksivaiheinen todennus käytössä
       two_factor_recovery_codes_changed:
-        explanation: Uudet palautuskoodit on nyt luotu, ja vanhat mitätöity.
+        explanation: Uudet palautuskoodit on nyt luotu ja vanhat mitätöity.
         subject: 'Mastodon: Kaksivaihetodennuksen palautuskoodit luotiin uudelleen'
         subtitle: Aiemmat palautuskoodit on mitätöity, ja korvaavat uudet koodit on luotu.
         title: 2-vaiheisen todennuksen palautuskoodit vaihdettiin
diff --git a/config/locales/devise.fr-CA.yml b/config/locales/devise.fr-CA.yml
index 7f13f67828b8f4..69ee177e3345fb 100644
--- a/config/locales/devise.fr-CA.yml
+++ b/config/locales/devise.fr-CA.yml
@@ -12,6 +12,7 @@ fr-CA:
       last_attempt: Vous avez droit à une dernière tentative avant que votre compte ne soit verrouillé.
       locked: Votre compte est verrouillé.
       not_found_in_database: "%{authentication_keys} ou mot de passe invalide."
+      omniauth_user_creation_failure: Erreur lors de la création d'un compte pour cette identité.
       pending: Votre compte est toujours en cours d'approbation.
       timeout: Votre session a expiré. Veuillez vous reconnecter pour continuer.
       unauthenticated: Vous devez vous connecter ou vous inscrire pour continuer.
diff --git a/config/locales/devise.fr.yml b/config/locales/devise.fr.yml
index 8a5b8384e0f249..631a2eee6f2e65 100644
--- a/config/locales/devise.fr.yml
+++ b/config/locales/devise.fr.yml
@@ -12,6 +12,7 @@ fr:
       last_attempt: Vous avez droit à une dernière tentative avant que votre compte ne soit verrouillé.
       locked: Votre compte est verrouillé.
       not_found_in_database: "%{authentication_keys} ou mot de passe invalide."
+      omniauth_user_creation_failure: Erreur lors de la création d'un compte pour cette identité.
       pending: Votre compte est toujours en cours d'approbation.
       timeout: Votre session a expiré. Veuillez vous reconnecter pour continuer.
       unauthenticated: Vous devez vous connecter ou vous inscrire pour continuer.
diff --git a/config/locales/devise.gd.yml b/config/locales/devise.gd.yml
index 1bf489cfbb308b..ca9dcc49694348 100644
--- a/config/locales/devise.gd.yml
+++ b/config/locales/devise.gd.yml
@@ -12,6 +12,7 @@ gd:
       last_attempt: Tha aon oidhirp eile agad mus dèid an cunntas agad a ghlasadh.
       locked: Tha an cunntas agad glaiste.
       not_found_in_database: "%{authentication_keys} no facal-faire mì-dhligheach."
+      omniauth_user_creation_failure: Thachair mearachd le cruthachadh cunntais dhan dearbh-aithne seo.
       pending: Tha an cunntas agad fo lèirmheas fhathast.
       timeout: Dh’fhalbh an ùine air an t-seisean agad. Clàraich a-steach a-rithist airson leantainn air adhart.
       unauthenticated: Feumaidh tu clàradh a-steach no clàradh leinn mus lean thu air adhart.
@@ -47,14 +48,19 @@ gd:
         subject: 'Mastodon: Stiùireadh air ath-shuidheachadh an fhacail-fhaire'
         title: Ath-shuidheachadh an fhacail-fhaire
       two_factor_disabled:
+        explanation: "’S urrainn dhut clàradh a-steach le seòladh puist-d is facal-faire a-mhàin a-nis."
         subject: 'Mastodon: Tha an dearbhadh dà-cheumnach à comas'
+        subtitle: Chaidh an dearbhadh dà-cheumnach a chur à comas dhan chunntas agad.
         title: Dearbhadh dà-cheumnach à comas
       two_factor_enabled:
+        explanation: Bidh feum air tòcan a ghineas an aplacaid TOTP a chaidh a phaidhreachadh airson clàradh a-steach.
         subject: 'Mastodon: Tha an dearbhadh dà-cheumnach an comas'
+        subtitle: Chaidh an dearbhadh dà-cheumnach a chur an comas dhan chunntas agad.
         title: Dearbhadh dà-cheumnach an comas
       two_factor_recovery_codes_changed:
         explanation: Tha na còdan aisig a bh’ agad cheana mì-dhligheach a-nis agus chaidh feadhainn ùra a ghintinn.
         subject: 'Mastodon: Chaidh còdan aisig dà-cheumnach ath-ghintinn'
+        subtitle: Tha na còdan aisig a bh’ agad cheana mì-dhligheach a-nis agus chaidh feadhainn ùra a ghintinn.
         title: Dh’atharraich còdan aisig an dearbhaidh dà-cheumnaich
       unlock_instructions:
         subject: 'Mastodon: Stiùireadh neo-ghlasaidh'
@@ -68,9 +74,13 @@ gd:
           subject: 'Mastodon: Chaidh iuchair tèarainteachd a sguabadh às'
           title: Chaidh tè dhe na h-iuchraichean tèarainteachd agad a sguabadh às
       webauthn_disabled:
+        explanation: Chaidh an dearbhadh le iuchraichean tèarainteachd a chur à comas dhan chunntas agad.
+        extra: "’S urrainn dhut clàradh a-steach leis an tòcan a ghineas an aplacaid TOTP paidhrichte a-mhàin a-nis."
         subject: 'Mastodon: Tha dearbhadh le iuchraichean tèarainteachd à comas'
         title: Chaidh na h-iuchraichean tèarainteachd a chur à comas
       webauthn_enabled:
+        explanation: Chaidh an dearbhadh le iuchair tèarainteachd a chur an comas dhan chunntas agad.
+        extra: "’S urrainn dhut an iuchair tèarainteachd agad a chleachdadh airson clàradh a-steach a-nis."
         subject: 'Mastodon: Tha dearbhadh le iuchair tèarainteachd an comas'
         title: Chaidh na h-iuchraichean tèarainteachd a chur an comas
     omniauth_callbacks:
diff --git a/config/locales/devise.lv.yml b/config/locales/devise.lv.yml
index ed4b4fb8c6e5c7..6746e813d84573 100644
--- a/config/locales/devise.lv.yml
+++ b/config/locales/devise.lv.yml
@@ -12,6 +12,7 @@ lv:
       last_attempt: Tev ir vēl viens mēģinājums, pirms tavs konts tiks bloķēts.
       locked: Tavs konts ir bloķēts.
       not_found_in_database: Nederīga %{authentication_keys} vai parole.
+      omniauth_user_creation_failure: Kļūda šīs identitātes konta izveidošanā.
       pending: Tavs konts joprojām tiek pārskatīts.
       timeout: Tava sesija ir beigusies. Lūdzu, pieraksties vēlreiz, lai turpinātu.
       unauthenticated: Lai turpinātu, tev ir jāpierakstās vai jāreģistrējas.
@@ -37,7 +38,7 @@ lv:
         title: Parole nomainīta
       reconfirmation_instructions:
         explanation: Apstiprini jauno adresi, lai mainītu savu e-pastu.
-        extra: Ja šīs izmaiņas neesi veicis tu, lūdzu, ignorē šo e-pasta ziņojumu. Mastodon konta e-pasta adrese nemainīsies, kamēr nebūsi piekļuvis iepriekš norādītajai saitei.
+        extra: Ja šīs izmaiņas neveici Tu, lūgums neņemt vērā šo e-pasta ziņojumu. Mastodon konta e-pasta adrese netiks mainīta, līdz Tu izmantosi augstāk esošo saiti.
         subject: 'Mastodon: Apstiprini e-pastu %{instance}'
         title: Apstiprini e-pasta adresi
       reset_password_instructions:
@@ -47,14 +48,19 @@ lv:
         subject: 'Mastodon: Norādījumi paroles atiestatīšanai'
         title: Paroles atiestatīšana
       two_factor_disabled:
+        explanation: Pieteikšanās tagad ir iespējama izmantojot tikai e-pasta adresi un paroli.
         subject: 'Mastodon: Divfaktoru autentifikācija atspējota'
+        subtitle: Tavam kontam tika atspējota divpakāpju autentifikācija.
         title: 2FA atspējota
       two_factor_enabled:
+        explanation: Būs nepieciešams TOTP lietotnes izveidots kods, lai pieteiktos.
         subject: 'Mastodon: Divfaktoru autentifikācija iespējota'
+        subtitle: Tavam kontam tika iespējota divpakāpju autentifikācija.
         title: 2FA iespējota
       two_factor_recovery_codes_changed:
         explanation: Iepriekšējie atkopšanas kodi ir atzīti par nederīgiem un ģenerēti jauni.
         subject: 'Mastodon: Divfaktoru atkopšanas kodi pārģenerēti'
+        subtitle: Iepriekšējie atkopšanas kodi tika padarīti par nederīgiem, un tika izveidoti jauni.
         title: 2FA atkopšanas kodi mainīti
       unlock_instructions:
         subject: 'Mastodon: Norādījumi atbloķēšanai'
@@ -68,9 +74,13 @@ lv:
           subject: 'Mastodon: Drošības atslēga izdzēsta'
           title: Viena no tavām drošības atslēgām tika izdzēsta
       webauthn_disabled:
+        explanation: Tavam kontam tika atspējota autentifikācija ar drošības atslēgām.
+        extra: Pieteikšanās tagad ir iespējama izmantojot tikai TOTP lietotnes izveidotu kodu.
         subject: 'Mastodon: Autentifikācija ar drošības atslēgām ir atspējota'
         title: Drošības atslēgas atspējotas
       webauthn_enabled:
+        explanation: Tavam kontam tika iespējota drošības atslēgas autentifikācija.
+        extra: Drošības atslēgu tagad var izmantot, lai pieteiktos.
         subject: 'Mastodon: Drošības atslēgas autentifikācija iespējota'
         title: Drošības atslēgas iespējotas
     omniauth_callbacks:
diff --git a/config/locales/devise.no.yml b/config/locales/devise.no.yml
index 961778eaa50caf..2cd433c6e044c7 100644
--- a/config/locales/devise.no.yml
+++ b/config/locales/devise.no.yml
@@ -12,6 +12,7 @@
       last_attempt: Du har ett forsøk igjen før kontoen din låses.
       locked: Kontoen din er låst.
       not_found_in_database: Ugyldig %{authentication_keys} eller passord.
+      omniauth_user_creation_failure: Feil ved opprettelse av konto for denne identiteten.
       pending: Kontoen din er fortsatt under gjennomgang.
       timeout: Økten din har utløpt. Logg inn igjen for å fortsette.
       unauthenticated: Du må logge inn eller registrere deg før du kan fortsette.
diff --git a/config/locales/devise.sk.yml b/config/locales/devise.sk.yml
index bc01b73ccfca26..b36416b31798ef 100644
--- a/config/locales/devise.sk.yml
+++ b/config/locales/devise.sk.yml
@@ -2,63 +2,66 @@
 sk:
   devise:
     confirmations:
-      confirmed: Tvoja emailová adresa bola úspešne overená.
-      send_instructions: O niekoľko minút obdržíš email s pokynmi ako potvrdiť svoj účet. Prosím, skontroluj si aj zložku spam, ak sa k tebe toto potvrdenie nedostalo.
-      send_paranoid_instructions: Ak sa tvoja emailová adresa nachádza v našej databázi, o niekoľko minút obdržíš email s pokynmi ako potvrdiť svoj účet. Prosím, skontroluj aj zložku spam, ak sa k tebe toto potvrdenie nedostalo.
+      confirmed: Vaša e-mailová adresa bola úspešne potvrdená.
+      send_instructions: O niekoľko minút obdržíte e-mail s pokynmi na potvrdenie svojho účtu. Prosíme, skontrolujte si aj zložku spam, ak ste tento e-mail nedostali.
+      send_paranoid_instructions: Ak sa vaša e-mailová adresa nachádza v našej databáze, o niekoľko minút obdržíte e-mail s pokynmi na potvrdenie svojho účtu. Prosíme, skontrolujte aj zložku spam, ste tento e-mail nedostali.
     failure:
-      already_authenticated: Už si prihlásený/á.
-      inactive: Tvoj účet ešte nebol potvrdený.
-      invalid: Nesprávny %{authentication_keys}, alebo heslo.
-      last_attempt: Máš posledný pokus pred zamknutím tvojho účtu.
-      locked: Tvoj účet je zamknutý.
-      not_found_in_database: Nesprávny %{authentication_keys}, alebo heslo.
+      already_authenticated: Už ste sa prihlásili.
+      inactive: Váš účet ešte nie je aktivovaný.
+      invalid: Nesprávny %{authentication_keys} alebo heslo.
+      last_attempt: Máte posledný pokus, potom bude váš účet uzamknutý.
+      locked: Váš účet bol uzamknutý.
+      not_found_in_database: Nesprávny %{authentication_keys} alebo heslo.
       omniauth_user_creation_failure: Chyba pri vytváraní účtu pre túto identitu.
-      pending: Tvoj účet je stále prehodnocovaný.
-      timeout: Tvoja aktívna sezóna vypršala. Pre pokračovanie sa prosím prihlás znovu.
-      unauthenticated: K pokračovaniu sa musíš zaregistrovať alebo prihlásiť.
-      unconfirmed: Pred pokračovaním musíš potvrdiť svoj email.
+      pending: Váš účet stále kontrolujeme.
+      timeout: Vaše aktívne prihlásenie vypršalo. Pre pokračovanie sa, prosím, prihláste znovu.
+      unauthenticated: Pred pokračovaním sa musíte prihlásiť alebo zaregistrovať.
+      unconfirmed: Pred pokračovaním musíte potvrdiť svoj e-mail.
     mailer:
       confirmation_instructions:
-        action: Potvrď emailovú adresu
-        action_with_app: Potvrď a vráť sa na %{app}
-        explanation: S touto emailovou adresou si si vytvoril/a účet na %{host}. Si iba jeden klik od jeho aktivácie. Pokiaľ si to ale nebol/a ty, prosím ignoruj tento email.
+        action: Overiť e-mailovú adresu
+        action_with_app: Potvrdiť a vrátiť sa do %{app}
+        explanation: S touto e-mailovou adresou ste si vytvorili účet na %{host}. Od aktivácie vás delí jediné kliknutie. Ak ste to neboli vy, tento e-mail ignorujte.
         explanation_when_pending: S touto e-mailovou adresou ste požiadali o pozvánku na %{host}. Po potvrdení vašej e-mailovej adresy vašu žiadosť skontrolujeme. Môžete sa prihlásiť, aby ste zmenili svoje údaje alebo vymazali svoje konto, ale kým nebude vaše konto schválené, nebudete mať prístup k väčšine funkcií. Ak bude vaša žiadosť zamietnutá, vaše údaje budú odstránené, takže sa od vás nebudú vyžadovať žiadne ďalšie kroky. Ak ste to neboli vy, tento e-mail ignorujte.
-        extra_html: Prosím, pozri sa aj na <a href="%{terms_path}"> pravidlá tohto servera,</a> a <a href="%{policy_path}"> naše užívaťeľské podiemky</a>.
+        extra_html: Prosím, pozrite sa aj na <a href="%{terms_path}"> pravidlá tohto servera</a> a <a href="%{policy_path}">naše pravidlá používania</a>.
         subject: 'Mastodon: Potvrdzovacie pokyny pre %{instance}'
-        title: Potvrď emailovú adresu
+        title: Overte svoj e-mail
       email_changed:
-        explanation: 'Emailová adresa tvojho účtu bude zmenená na:'
-        extra: Ak si nezmenil/a svoj email, je pravdepodobné, že niekto iný získal prístup k tvojmu účtu. Naliehavo preto prosím zmeň svoje heslo, alebo kontaktuj administrátora tohto serveru, pokiaľ si vymknutý/á zo svojho účtu.
-        subject: 'Mastodon: Emailová adresa bola zmenená'
-        title: Nová emailová adresa
+        explanation: 'E-mailová adresa vášho účtu bude zmenená na:'
+        extra: Ak ste svoj e-mail nezmenili vy, je pravdepodobné, že niekto iný získal prístup k vášmu účtu. Čo najskôr zmeňte svoje heslo alebo, pokiaľ sa neviete prihlásiť, kontaktujte administrátora serveru.
+        subject: 'Mastodon: E-mailová adresa bola zmenená'
+        title: Nová e-mailová adresa
       password_change:
-        explanation: Heslo k tvojmu účtu bolo zmenené.
-        extra: Ak si heslo nezmenil/a, je pravdepodobné, že niekto iný získal prístup k tvojmu účtu. Naliehavo preto prosím zmeň svoje heslo, alebo kontaktuj administrátora tohto serveru, pokiaľ si vymknutý/á zo svojho účtu.
+        explanation: Heslo k vášmu účtu bolo zmenené.
+        extra: Ak ste si heslo nezmenili vy, je pravdepodobné, že niekto iný získal prístup k vášmu účtu. Čo najskôr zmeňte svoje heslo alebo, pokiaľ sa neviete prihlásiť, kontaktujte administrátora serveru.
         subject: 'Mastodon: Heslo bolo zmenené'
         title: Heslo bolo zmenené
       reconfirmation_instructions:
-        explanation: Potvrď novú emailovú adresu na ktorú chceš zmeniť svoj email.
-        extra: Pokiaľ si túto akciu nevyžiadal/a, prosím ignoruj tento email. Emailová adresa pre tvoj Mastodon účet totiž nebude zmenená pokiaľ nepostúpiš na adresu uvedenú vyššie.
-        subject: 'Mastodon: Potvrď email pre %{instance}'
-        title: Over emailovú adresu
+        explanation: E-mail zmeníte potvrdením novej e-mailovej adresy.
+        extra: Pokiaľ ste túto akciu nevyžiadali vy, ignorujte tento email. E-mailová adresa pre váš účet na Mastodone totiž nebude zmenená, pokiaľ neprejdete na odkaz uvedený vyššie.
+        subject: 'Mastodon: Overte e-mail pre %{instance}'
+        title: Overte e-mailovú adresu
       reset_password_instructions:
-        action: Zmeň svoje heslo
-        explanation: Vyžiadal/a si si nové heslo pre svoj účet.
-        extra: Ak si túto akciu nevyžiadal/a, prosím ignoruj tento email. Tvoje heslo nebude zmenené pokiaľ nepostúpiš na adresu uvedenú vyššie a vytvoríš si nové.
+        action: Zmeniť heslo
+        explanation: Vyžiadali ste si pre svoj účet nové heslo.
+        extra: Ak ste túto akciu nevyžiadali vy, ignorujte tento email. Vaše heslo nebude zmenené, pokiaľ neprejdete na odkaz uvedený vyššie a nevytvoríte si nové heslo.
         subject: 'Mastodon: Pokyny pre obnovu hesla'
-        title: Nastav nové heslo
+        title: Obnova hesla
       two_factor_disabled:
-        explanation: Prihlásenie je teraz možné iba pomocou emailu a hesla.
+        explanation: Prihlásenie je teraz možné iba pomocou e-mailu a hesla.
         subject: 'Mastodon: Dvojfázové overovanie vypnuté'
-        subtitle: Dvoj-faktorové overenie bolo pre tvoj účet vypnuté.
-        title: Dvoj-faktorové overovanie vypnuté
+        subtitle: Dvojfázové overenie bolo pre váš účet vypnuté.
+        title: Dvojfaktorové overovanie vypnuté
       two_factor_enabled:
+        explanation: Na prihlásenie budete potrebovať kód vygenerovaný spárovanou aplikáciou pre overovanie.
         subject: 'Mastodon: Dvojfázové overovanie zapnuté'
-        title: Dvoj-faktorové overovanie zapnuté
+        subtitle: Dvojfázové overenie bolo pre váš účet zapnuté.
+        title: Dvojfaktorové overovanie zapnuté
       two_factor_recovery_codes_changed:
-        explanation: Predošlé obnovovacie kódy boli urobené neplatnými a boli vygenerované nové.
-        subject: 'Mastodon: dvojfázové zálohové kódy boli znovu vygenerované'
-        title: Obnovovacie kódy pre dvoj-faktorové overovanie zmenené
+        explanation: Predošlé obnovovacie kódy boli zneplatnené a boli vygenerované nové.
+        subject: 'Mastodon: Dvojfázové obnovovacie kódy boli znovu vygenerované'
+        subtitle: Predošlé obnovovacie kódy boli zneplatnené a boli vygenerované nové.
+        title: Obnovovacie kódy pre dvojfaktorové overovanie zmenené
       unlock_instructions:
         subject: 'Mastodon: Pokyny na odomknutie účtu'
       webauthn_credential:
@@ -71,46 +74,50 @@ sk:
           subject: 'Mastodon: Bezpečnostný kľúč odstránený'
           title: Jeden z vašich bezpečnostných kľúčov bol odstránený
       webauthn_disabled:
-        subject: 'Mastodon: Overovanie s vypnutými bezpečnostnými kľúčmi'
+        explanation: Overenie bezpečnostnými kľúčmi bolo pre váš účet vypnuté.
+        extra: Odteraz sa môžete prihlásiť iba pomocou kódu vygenerovaného spárovanou aplikáciou pre overovanie.
+        subject: 'Mastodon: Overovanie s bezpečnostnými kľúčmi vypnuté'
         title: Bezpečnostné kľúče sú vypnuté
       webauthn_enabled:
-        subject: 'Mastodon: Povolené overovanie bezpečnostného kľúča'
+        explanation: Overenie bezpečnostnými kľúčmi bolo pre váš účet zapnuté.
+        extra: Odteraz môžete na prihlásenie použiť svoj bezpečnostný kľúč.
+        subject: 'Mastodon: Povolené overovanie bezpečnostným kľúčom'
         title: Povolené bezpečnostné kľúče
     omniauth_callbacks:
-      failure: Nebolo možné ťa overiť z %{kind}, lebo "%{reason}".
+      failure: 'Nebolo možné vás overiť z %{kind}, uvedený dôvod: „%{reason}“.'
       success: Úspešné overenie z účtu %{kind}.
     passwords:
-      no_token: Túto stránku nemôžeš navštíviť, ak neprichádzaš z emailu s pokynmi na obnovu hesla. Pokiaľ prichádzaš z tohto emailu, prosím uisti sa že si použil/a celú URL adresu z emailu.
-      send_instructions: Ak sa tvoja emailová adresa nachádza v databázi, tak o niekoľko minút obdržíš email s pokynmi ako nastaviť nové heslo. Ak máš pocit, že si email neobdržal/a, prosím skontroluj aj svoju spam zložku.
-      send_paranoid_instructions: Ak sa tvoja emailová adresa nachádza v databázi, za chvíľu obdržíš odkaz pre obnovu hesla na svoj email. Skontroluj ale prosím aj svoj spam, ak tento email nevidíš.
-      updated: Tvoje heslo bolo úspešne zmenené. Teraz si prihlásený/á.
-      updated_not_active: Tvoje heslo bolo úspešne zmenené.
+      no_token: Túto stránku nemôžete navštíviť, ak vás sem nepresmeroval e-mail s pokynmi na obnovu hesla. Pokiaľ prichádzate z tohto e-mailu, uistite sa, že ste použili celú adresu URL z e-mailu.
+      send_instructions: Ak sa vaša emailová adresa nachádza v databáze, o niekoľko minút dostanete e-mail s pokynmi na nastavenie nového hesla. Ak ste ho nedostali, skontrolujte aj priečinok pre spam.
+      send_paranoid_instructions: Ak sa vaša emailová adresa nachádza v databáze, o niekoľko minút dostanete e-mail s pokynmi na nastavenie nového hesla. Ak ste ho nedostali, skontrolujte aj priečinok pre spam.
+      updated: Vaše heslo bolo úspešne zmenené. Teraz ste sa prihlásili.
+      updated_not_active: Vaše heslo bolo úspešne zmenené.
     registrations:
-      destroyed: Dovidenia! Tvoj účet bol úspešne zrušený. Dúfame ale, že ťa tu opäť niekedy uvidíme.
-      signed_up: Vitaj! Tvoja registrácia bola úspešná.
-      signed_up_but_inactive: Registrácia bola úspešná. Avšak, účet ešte nebol aktivovaný, takže ťa nemožno prihlásiť.
-      signed_up_but_locked: Registroval/a si sa úspešné. Avšak, tvoj účet je zamknutý, takže ťa nemožno prihlásiť.
-      signed_up_but_pending: Na tvoj email bola odoslaná správa s odkazom na potvrdenie. Po tom, čo naňho klikneš, bude tvoje uchádzanie posúdené. Budeš informovaný, ak sa tvoja požiadavka schváli.
-      signed_up_but_unconfirmed: Správa s odkazom na potvrdenie registrácie bola odoslaná na tvoj email. Pre aktváciu účtu, následuj prosím daný odkaz. Takisto ale skontroluj aj svoju spam zložku, pokiaľ sa ti zdá, že si tento email nedostal/a.
-      update_needs_confirmation: Účet bol úspešne pozmenený, ale ešte potrebujeme overiť tvoju novú emailovú adresu. Pre overenie prosím klikni na link v správe ktorú si dostal/a na email. Takisto ale skontroluj aj svoju spam zložku, ak sa ti zdá, že si tento email nedostal/a.
-      updated: Tvoj účet bol úspešne aktualizovaný.
+      destroyed: Dovidenia! Váš účet bol úspešne zrušený. Dúfame ale, že vás tu opäť niekedy uvidíme.
+      signed_up: Vitajte! Vaša registrácia bola úspešná.
+      signed_up_but_inactive: Registrácia bola úspešná. Avšak váš účet ešte nebol aktivovaný, takže sa nemôžete prihlásiť.
+      signed_up_but_locked: Registrácia bola úspešná. Avšak váš účet je zamknutý, takže sa nemôžete prihlásiť.
+      signed_up_but_pending: Na váš e-mail bola odoslaná správa s odkazom na overenie. Po kliknutí na odkaz vašu prihlášku skontrolujeme. O jej schválení vás budeme informovať.
+      signed_up_but_unconfirmed: Na váš e-mail bola odoslaná správa s odkazom na overenie. Svoj účet aktivujte kliknutím na odkaz. Ak ste e-mail nedostali, skontrolujte svoj priečinok pre spam.
+      update_needs_confirmation: Váš účet bol úspešne zmenený, ale ešte potrebujeme overiť vašu novú e-mailovú adresu. Overíte ju kliknutím na potvrdzovací odkaz zaslaný na váš e-mail. Ak ste e-mail nedostali, skontrolujte svoj priečinok pre spam.
+      updated: Váš účet bol úspešne aktualizovaný.
     sessions:
-      already_signed_out: Už si sa úspešne odhlásil/a.
-      signed_in: Prihlásil/a si sa úspešne.
-      signed_out: Odhlásil/a si sa úspešne.
+      already_signed_out: Úspešne ste sa odhlásili.
+      signed_in: Úspešne ste sa prihlásili.
+      signed_out: Úspešne ste sa odhlásili.
     unlocks:
-      send_instructions: O niekoľko minút obdržíš email s pokynmi, ako nastaviť nové heslo. Prosím, skontroluj ale aj svoju spam zložku, pokiaľ sa ti zdá, že si tento email nedostal/a.
-      send_paranoid_instructions: Ak tvoj účet existuje, o niekoľko minút obdržíš email s pokynmi ako si ho odomknúť. Prosím, skontroluj ale aj svoju spam zložku, pokiaľ sa ti zdá, že si tento email nedostal/a.
-      unlocked: Tvoj účet bol úspešne odomknutý. Pre pokračovanie sa prosím prihlás.
+      send_instructions: O niekoľko minút obdržíte e-mail s pokynmi na odomknutie svojho účtu. Prosíme, skontrolujte si aj zložku spam, ak ste tento e-mail nedostali.
+      send_paranoid_instructions: Ak váš účet existuje, o niekoľko minút obdržíte e-mail s pokynmi na jeho odomknutie. Prosíme, skontrolujte si aj zložku spam, ak ste tento e-mail nedostali.
+      unlocked: Váš účet bol úspešne odomknutý. Ak chcete pokračovať, prihláste sa.
   errors:
     messages:
-      already_confirmed: bol už potvrdený, skús sa prihlásiť
-      confirmation_period_expired: musí byť potvrdený do %{period}, prosím požiadaj o nový
-      expired: vypŕšal, prosím, vyžiadaj si nový
+      already_confirmed: bol už potvrdený, skúste sa prihlásiť
+      confirmation_period_expired: musí byť potvrdený do %{period}, požiadajte o nový
+      expired: vypršal, vyžiadajte si nový
       not_found: nenájdený
       not_locked: nebol zamknutý
       not_saved:
-        few: "%{count} chýb zabránilo uloženiu tohto %{resource}:"
-        many: "%{count} chýb zabránilo uloženiu tohto %{resource}:"
-        one: '1 chyba zabránila uloženiu tohto %{resource}:'
-        other: "%{count} chyby zabránili uloženiu tohto %{resource}:"
+        few: "%{count} chyby zabránili uloženiu tohto parametra %{resource}:"
+        many: "%{count} chýb zabránilo uloženiu tohto parametra %{resource}:"
+        one: '1 chyba zabránila uloženiu parametra %{resource}:'
+        other: "%{count} chýb zabránilo uloženiu tohto parametra %{resource}:"
diff --git a/config/locales/devise.sv.yml b/config/locales/devise.sv.yml
index 9300493fa0e3a7..27d424f6189463 100644
--- a/config/locales/devise.sv.yml
+++ b/config/locales/devise.sv.yml
@@ -12,6 +12,7 @@ sv:
       last_attempt: Du har ytterligare ett försök innan ditt konto är låst.
       locked: Ditt konto är låst.
       not_found_in_database: Ogiltigt %{authentication_keys} eller lösenord.
+      omniauth_user_creation_failure: Fel vid skapande av ett konto för denna identitet.
       pending: Ditt konto granskas fortfarande.
       timeout: Din session har avslutats. Vänligen logga in igen för att fortsätta.
       unauthenticated: Du måste logga in eller registrera dig innan du fortsätter.
@@ -74,6 +75,7 @@ sv:
           title: En av dina säkerhetsnycklar har raderats
       webauthn_disabled:
         explanation: Autentisering med säkerhetsnycklar har inaktiverats för ditt konto.
+        extra: Inloggning är nu möjligt med endast den token som genereras av den parade TOTP-appen.
         subject: 'Mastodon: Autentisering med säkerhetsnycklar är inaktiverat'
         title: Säkerhetsnycklar inaktiverade
       webauthn_enabled:
diff --git a/config/locales/doorkeeper.lv.yml b/config/locales/doorkeeper.lv.yml
index 0356c22ecbec51..5aa5daef3f6d16 100644
--- a/config/locales/doorkeeper.lv.yml
+++ b/config/locales/doorkeeper.lv.yml
@@ -22,12 +22,12 @@ lv:
         authorize: Autorizēt
         cancel: Atcelt
         destroy: Iznīcināt
-        edit: Rediģēt
+        edit: Labot
         submit: Apstiprināt
       confirmations:
         destroy: Vai esi pārliecināts?
       edit:
-        title: Rediģēt pieteikumu
+        title: Labot lietotni
       form:
         error: Hmm! Pārbaudi, vai tavā veidlapā nav kļūdu
       help:
@@ -72,7 +72,7 @@ lv:
         revoke: Vai esi pārliecināts?
       index:
         authorized_at: Autorizētas %{date}
-        description_html: Šīs ir lietojumprogrammas, kas var piekļūt tavam kontam, izmantojot API. Ja ir lietojumprogrammas, kuras šeit neatpazīsti, vai lietojumprogramma nedarbojas pareizi, vari atsaukt tām piekļuvi.
+        description_html: Šīs ir lietotnes, kas var piekļūt Tavam kontam ar API. Ja šeit ir lietotnes, kuras neatpazīsti, vai lietotne darbojas ne tā, kā paredzēts, vari atsaukt tās piekļuvi.
         last_used_at: Pēdējo reizi lietotas %{date}
         never_used: Nekad nav lietotas
         scopes: Atļaujas
diff --git a/config/locales/doorkeeper.sk.yml b/config/locales/doorkeeper.sk.yml
index 91c9430b3029c5..face9db96668f5 100644
--- a/config/locales/doorkeeper.sk.yml
+++ b/config/locales/doorkeeper.sk.yml
@@ -5,7 +5,7 @@ sk:
       doorkeeper/application:
         name: Názov aplikácie
         redirect_uri: Presmerovacia URI
-        scopes: Pôsobnosť
+        scopes: Povolenia
         website: Webstránka aplikácie
     errors:
       models:
@@ -19,85 +19,85 @@ sk:
   doorkeeper:
     applications:
       buttons:
-        authorize: Autorizuj
-        cancel: Zruš
+        authorize: Povoliť
+        cancel: Zrušiť
         destroy: Zničiť
-        edit: Uprav
-        submit: Pošli
+        edit: Upraviť
+        submit: Odoslať
       confirmations:
-        destroy: Si si istý/á?
+        destroy: Naozaj chcete pokračovať?
       edit:
-        title: Uprav aplikáciu
+        title: Upraviť aplikáciu
       form:
-        error: No teda! Skontroluj formulár pre prípadné chyby
+        error: Ups! Skontrolujte formulár pre prípadné chyby
       help:
-        native_redirect_uri: Použi %{native_redirect_uri} pre lokálne testy
-        redirect_uri: Použi jeden riadok pre každú URI
-        scopes: Oprávnenia oddeľuj medzerami. Nechaj prázdne pre štandardné oprávnenia.
+        native_redirect_uri: Použite %{native_redirect_uri} pre lokálne testy
+        redirect_uri: Použite jeden riadok pre každú URI
+        scopes: Povolenia oddeľujte medzerami. Nechajte prázdne pre štandardné povolenia.
       index:
         application: Aplikácia
         callback_url: Návratová URL
-        delete: Vymaž
+        delete: Vymazať
         empty: Nemáte žiadne aplikácie.
         name: Názov
         new: Nová aplikácia
-        scopes: Oprávnenia
-        show: Ukáž
-        title: Tvoje aplikácie
+        scopes: Povolenia
+        show: Zobraziť
+        title: Vaše aplikácie
       new:
         title: Nová aplikácia
       show:
-        actions: Úkony
+        actions: Akcie
         application_id: Kľúč klienta
-        callback_urls: Návratové URL adresy
-        scopes: Oprávnenia
+        callback_urls: Návratové adresy URL
+        scopes: Povolenia
         secret: Tajné slovo klienta
         title: 'Aplikácia: %{name}'
     authorizations:
       buttons:
-        authorize: Over
-        deny: Zamietni
+        authorize: Povoliť
+        deny: Zakázať
       error:
         title: Nastala chyba
       new:
-        prompt_html: "%{client_name} žiada o povolenie na prístup k vášmu účtu. Ide o aplikáciu tretej strany. <strong>Ak jej nedôverujete, nemali by ste ju autorizovať.</strong>"
+        prompt_html: "%{client_name} žiada o povolenie na prístup k vášmu účtu. Ide o aplikáciu tretej strany. <strong>Ak jej nedôverujete, nemali by ste ju povoliť.</strong>"
         review_permissions: Preskúmať povolenia
-        title: Je potrebná autorizácia
+        title: Je potrebné schválenie
       show:
-        title: Skopíruj tento autorizačný kód a vlož ho do aplikácie.
+        title: Skopírujte tento overovací kód a vložte ho do aplikácie.
     authorized_applications:
       buttons:
         revoke: Zrušiť oprávnenie
       confirmations:
-        revoke: Si si istý?
+        revoke: Naozaj chcete pokračovať?
       index:
-        authorized_at: Autorizované dňa %{date}
+        authorized_at: Povolené dňa %{date}
         description_html: Ide o aplikácie, ktoré môžu pristupovať k vášmu účtu pomocou rozhrania API. Ak sa tu nachádzajú aplikácie, ktoré nepoznáte, alebo ak sa niektorá aplikácia správa nesprávne, môžete jej zrušiť prístup.
         last_used_at: Posledne použitý dňa %{date}
         never_used: Nikdy nepoužité
-        scopes: Oprávnenia
-        superapp: Interný
-        title: Tvoje povolené aplikácie
+        scopes: Povolenia
+        superapp: Interné
+        title: Vaše povolené aplikácie
     errors:
       messages:
-        access_denied: Prístup zamietnutý.
-        credential_flow_not_configured: Resource Owner Password Credentials zlyhal lebo Doorkeeper.configure.resource_owner_from_credentials nebol nakonfigurovaný.
-        invalid_client: Overenie klienta zlyhalo. Neznámy klient, chýbajú údaje o klientovi alebo nepodporovaná metóda overovania.
-        invalid_grant: Dané oprávnenie je neplatné, vypršané, zrušené, nesúhlasí s presmerovacou URI použitou v autorizačnej požiadavke, alebo bolo vydané pre iný klient.
+        access_denied: Vlastník zdroja alebo autorizačný server žiadosť zamietol.
+        credential_flow_not_configured: Protokol poverení vlastníka prostriedkov narazil na chybu z dôvodu nesprávnej konfigurácie Doorkeeper.configure.resource_owner_from_credentials.
+        invalid_client: Overenie klienta zlyhalo z dôvodu neznámeho klienta, nebolo zahrnuté overenie klienta alebo nie je podporovaná metóda overovania.
+        invalid_grant: Dané povolenie je neplatné, vypršalo, bolo zrušené, nesúhlasí s presmerovacou URI použitou v autorizačnej požiadavke alebo bolo vydané pre iného klienta.
         invalid_redirect_uri: Presmerovacia URI je neplatná.
         invalid_request:
           missing_param: 'Chýba požadovaný parameter: %{value}.'
-          request_not_authorized: Žiadosť je potrebné autorizovať. Chýba požadovaný parameter pre autorizáciu žiadosti alebo je neplatný.
+          request_not_authorized: Žiadosť je potrebné schváliť. Chýba požadovaný parameter pre schválenie žiadosti alebo je neplatný.
           unknown: V požiadavke chýba požadovaný parameter, obsahuje nepodporovanú hodnotu parametra alebo je inak chybne vytvorená.
         invalid_resource_owner: Uvedené prihlasovacie údaje sú neplatné alebo nenájdené
         invalid_scope: Požadovaný rozsah je neplatný, neznámy alebo poškodený.
         invalid_token:
           expired: Prístupový token expiroval
-          revoked: Prístupový token bol odňatý
+          revoked: Prístupový token bol odvolaný
           unknown: Prístupový token je neplatný
-        resource_owner_authenticator_not_configured: Resource Owner zlyhal pretože Doorkeeper.configure.resource_owner_authenticator nebol nakonfigurovaný.
-        server_error: Nastala neočakávaná chyba na autorizačnom serveri ktorá zabránila vykonať požiadavku.
-        temporarily_unavailable: Autorizačný server ťa teraz nemôže obslúžiť, pretože prebieha údržba alebo je dočasne preťažený.
+        resource_owner_authenticator_not_configured: Vyhľadávanie vlastníkov zdrojov zlyhalo, pretože Doorkeeper.configure.resource_owner_authenticator nie je nakonfigurovaný.
+        server_error: Nastala neočakávaná chyba na autorizačnom serveri, ktorá zabránila vykonať požiadavku.
+        temporarily_unavailable: Autorizačný server požiadavku teraz nemôže spracovať, pretože prebieha údržba alebo je dočasne preťažený.
         unauthorized_client: Klient nie je autorizovaný vykonať danú požiadavku týmto spôsobom.
         unsupported_grant_type: Tento typ oprávnenia nie je podporovaný autorizačným serverom.
         unsupported_response_type: Overovací server nepodporuje tento druh odpovede.
@@ -122,22 +122,22 @@ sk:
         admin/accounts: Správa účtov
         admin/all: Všetky administratívne funkcie
         admin/reports: Správa reportov
-        all: Plný prístup k tvojmu Mastodon účtu
+        all: Plný prístup k vášmu Mastodon účtu
         blocks: Blokovania
         bookmarks: Záložky
         conversations: Konverzácie
-        crypto: Šifrovanie End-to-end
-        favourites: Obľúbené
+        crypto: Šifrovanie end-to-end
+        favourites: Ohviezdičkované
         filters: Filtre
-        follow: Sledovanie, stlmenie a blokovanie
+        follow: Sledovania, stíšenia a blokovania
         follows: Sledovania
         lists: Zoznamy
         media: Mediálne prílohy
-        mutes: Nevšímané
-        notifications: Oznámenia
-        push: Push notifikácie
-        reports: Reporty
-        search: Hľadať
+        mutes: Stíšenia
+        notifications: Upozornenia
+        push: Upozornenia push
+        reports: Hlásenia
+        search: Vyhľadávanie
         statuses: Príspevky
     layouts:
       admin:
@@ -145,51 +145,51 @@ sk:
           applications: Aplikácie
           oauth2_provider: Poskytovateľ OAuth2
       application:
-        title: Požadovaná OAuth autorizácia
+        title: Požadovaná autorizácia OAuth
     scopes:
-      admin:read: prezeraj všetky dáta na serveri
-      admin:read:accounts: prezeraj chúlostivé informácie na všetkých účtoch
+      admin:read: čítať všetky dáta na serveri
+      admin:read:accounts: čítať citlivé informácie všetkých účtov
       admin:read:canonical_email_blocks: čítať citlivé informácie všetkých kanonických e-mailových blokov
       admin:read:domain_allows: čítať citlivé informácie zo všetkých povolených domén
       admin:read:domain_blocks: čítať citlivé informácie zo všetkých blokov domén
-      admin:read:email_domain_blocks: čítať citlivé informácie zo všetkých blokov emailových domén
+      admin:read:email_domain_blocks: čítať citlivé informácie zo všetkých blokov e-mailových domén
       admin:read:ip_blocks: čítať citlivé informácie zo všetkých blokov IP
-      admin:read:reports: čítaj chulostivé informácie o všetkých hláseniach a nahlásených účtoch
-      admin:write: uprav všetky dáta na serveri
-      admin:write:accounts: urob moderovacie úkony na účtoch
-      admin:write:canonical_email_blocks: vykonať akcie moderácie na kanonických emailových blokoch
-      admin:write:domain_allows: vykonať akcie moderácie na povolených doménach
-      admin:write:domain_blocks: vykonať akcie moderácie na doménových blokoch
-      admin:write:email_domain_blocks: vykonať akcie moderácie na blokoch emailových domén
-      admin:write:ip_blocks: vykonať akcie moderácie na blokoch IP
-      admin:write:reports: urob moderovacie úkony voči hláseniam
-      crypto: používať end-to-end šifrovanie
-      follow: uprav vzťahy svojho účtu
-      push: dostávaj oboznámenia ohľadom tvojho účtu na obrazovku
-      read: prezri si všetky dáta ohľadom svojho účetu
-      read:accounts: prezri si informácie o účte
-      read:blocks: prezri svoje bloky
-      read:bookmarks: pozri svoje záložky
-      read:favourites: zobraziť vaše obľúbené
-      read:filters: prezri svoje filtrovanie
-      read:follows: prezri si svoje sledovania
-      read:lists: prezri si svoje zoznamy
-      read:mutes: prezri svoje utíšenia
-      read:notifications: zhliadni svoje oboznámenia
-      read:reports: prezri svoje reporty
-      read:search: vyhľadvávaj v rámci seba
-      read:statuses: zhliadni všetky príspevky
-      write: upraviť všetky dáta tvojho účtu
-      write:accounts: uprav svoj profil
-      write:blocks: blokuj účty a domény
-      write:bookmarks: pridaj si príspevky k záložkám
-      write:conversations: stíš a vymaž konverzácie
-      write:favourites: obľúbené príspevky
-      write:filters: vytvor roztriedenie
-      write:follows: následuj ľudí
-      write:lists: vytvor listy
-      write:media: nahraj mediálne súbory
-      write:mutes: stíš diskusie, aj zapojených užívateľov
-      write:notifications: vyčisti oboznámenia
-      write:reports: nahlás iných užívateľov
-      write:statuses: publikuj príspevky
+      admin:read:reports: čítať citlivé informácie o všetkých hláseniach a nahlásených účtoch
+      admin:write: upravovať všetky dáta na serveri
+      admin:write:accounts: vykonávať moderovacie úkony na účtoch
+      admin:write:canonical_email_blocks: vykonávať moderovacie akcie na kanonických e-mailových blokoch
+      admin:write:domain_allows: vykonávať moderovacie akcie na povolených doménach
+      admin:write:domain_blocks: vykonávať moderovacie akcie na doménových blokoch
+      admin:write:email_domain_blocks: vykonávať moderovacie akcie na blokoch e-mailových domén
+      admin:write:ip_blocks: vykonávať moderovacie akcie na blokoch IP
+      admin:write:reports: vykonávať moderovacie akcie voči hláseniam
+      crypto: používať šifrovanie end-to-end
+      follow: upravovať vzťahy medzi účtami
+      push: dostávať vaše upozornenia push
+      read: čítať všetky údaje vášho účtu
+      read:accounts: čítať informácie o účtoch
+      read:blocks: čítať blokovania
+      read:bookmarks: čítať vaše záložky
+      read:favourites: čítať vaše ohviezdičkované
+      read:filters: čítať vaše filtre
+      read:follows: čítať vaše sledovania
+      read:lists: čítať vaše zoznamy
+      read:mutes: čítať vaše stíšenia
+      read:notifications: čítať vaše upozornenia
+      read:reports: čítať vaše hlásenia
+      read:search: vyhľadávať vo vašom mene
+      read:statuses: čítať všetky príspevky
+      write: upravovať všetky údaje vášho účtu
+      write:accounts: upravovať váš profil
+      write:blocks: blokovať účty a domény
+      write:bookmarks: pridávať príspevky k záložkám
+      write:conversations: stíšiť a mazať konverzácie
+      write:favourites: hviezdičkovať príspevky
+      write:filters: vytvárať filtre
+      write:follows: sledovať účty
+      write:lists: vytvárať zoznamy
+      write:media: nahrávať mediálne súbory
+      write:mutes: stíšiť účty a konverzácie
+      write:notifications: vyčistiť vaše upozornenia
+      write:reports: nahlasovať ostatných
+      write:statuses: zverejňovať príspevky
diff --git a/config/locales/doorkeeper.tr.yml b/config/locales/doorkeeper.tr.yml
index 2dde5f63227619..47a15e1b8a7bad 100644
--- a/config/locales/doorkeeper.tr.yml
+++ b/config/locales/doorkeeper.tr.yml
@@ -15,7 +15,7 @@ tr:
               fragment_present: parça içeremez.
               invalid_uri: geçerli bir URL olmalıdır.
               relative_uri: mutlaka bir URL olmalıdır.
-              secured_uri: HTTPS/SSL URI olması gerekir.
+              secured_uri: bir HTTPS/SSL URI olması gerekir.
   doorkeeper:
     applications:
       buttons:
@@ -161,7 +161,7 @@ tr:
       admin:write:domain_allows: alan adı izinleri için denetleme eylemleri gerçekleştirin
       admin:write:domain_blocks: alan adı engellemeleri için denetleme eylemleri gerçekleştirin
       admin:write:email_domain_blocks: e-posta alan adı engellemeleri için denetleme eylemleri gerçekleştirin
-      admin:write:ip_blocks: IP blokları üzerinde moderasyon eylemleri gerçekleştir
+      admin:write:ip_blocks: ıp blokları üzerinde moderasyon eylemleri gerçekleştir
       admin:write:reports: raporlarda denetleme eylemleri gerçekleştirin
       crypto: uçtan uca şifreleme kullan
       follow: hesap ilişkilerini değiştirin
diff --git a/config/locales/doorkeeper.zh-TW.yml b/config/locales/doorkeeper.zh-TW.yml
index 8ceaf36f3c6019..65926dfeef364a 100644
--- a/config/locales/doorkeeper.zh-TW.yml
+++ b/config/locales/doorkeeper.zh-TW.yml
@@ -104,7 +104,7 @@ zh-TW:
     flash:
       applications:
         create:
-          notice: 已建立應用程式。
+          notice: 已新增應用程式。
         destroy:
           notice: 已刪除應用程式。
         update:
@@ -185,9 +185,9 @@ zh-TW:
       write:bookmarks: 書籤狀態
       write:conversations: 靜音及刪除對話
       write:favourites: 加到最愛
-      write:filters: 建立過濾條件
+      write:filters: 新增過濾條件
       write:follows: 跟隨其他人
-      write:lists: 建立列表
+      write:lists: 新增列表
       write:media: 上傳媒體檔案
       write:mutes: 靜音使用者及對話
       write:notifications: 清除您的通知
diff --git a/config/locales/el.yml b/config/locales/el.yml
index 12d70df976ee50..1b7dcddc6fc39c 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -1703,8 +1703,6 @@ el:
         silence: Περιορισμένος λογαριασμός
         suspend: Λογαριασμός σε αναστολή
     welcome:
-      edit_profile_action: Στήσιμο προφίλ
-      edit_profile_step: Μπορείς να προσαρμόσεις το προφίλ σου ανεβάζοντας μια εικόνα προφίλ, αλλάζοντας το εμφνιζόμενο όνομα και άλλα. Μπορείς να επιλέξεις να αξιολογείς νέους ακόλουθους πριν τους επιτραπεί να σε ακολουθήσουν.
       explanation: Μερικές συμβουλές για να ξεκινήσεις
       subject: Καλώς ήρθες στο Mastodon
       title: Καλώς όρισες, %{name}!
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index ac7e5082760e9f..292365ed560c10 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -1837,8 +1837,6 @@ en-GB:
         silence: Account limited
         suspend: Account suspended
     welcome:
-      edit_profile_action: Setup profile
-      edit_profile_step: You can customise your profile by uploading a profile picture, changing your display name and more. You can opt-in to review new followers before they’re allowed to follow you.
       explanation: Here are some tips to get you started
       subject: Welcome to Mastodon
       title: Welcome aboard, %{name}!
diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index 4e518cd194eeb7..9d27dace972cf7 100644
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -1759,8 +1759,6 @@ eo:
         silence: Konto limigita
         suspend: Konto suspendita
     welcome:
-      edit_profile_action: Agordi profilon
-      edit_profile_step: Vi povas personecigi vian profilon per alŝuti profilbildon, ŝangi vian montronomo kaj pli.
       explanation: Jen kelkaj konsiloj por helpi vin komenci
       subject: Bonvenon en Mastodon
       title: Bonvenon, %{name}!
diff --git a/config/locales/es-AR.yml b/config/locales/es-AR.yml
index 06bacc79d1682a..398345d8c8239a 100644
--- a/config/locales/es-AR.yml
+++ b/config/locales/es-AR.yml
@@ -1726,10 +1726,10 @@ es-AR:
     keep_pinned_hint: No elimina ninguno de tus mensajes fijados
     keep_polls: Conservar encuestas
     keep_polls_hint: No elimina ninguna de tus encuestas
-    keep_self_bookmark: Conservar mensajes que marcaste como favoritos
-    keep_self_bookmark_hint: No elimina tus propios mensajes si los marcaste como favoritos
-    keep_self_fav: Conservar mensajes marcados como favoritos
-    keep_self_fav_hint: No elimina tus propios mensajes si los marcaste como favoritos
+    keep_self_bookmark: Conservar mensajes que enviaste a Marcadores
+    keep_self_bookmark_hint: No elimina tus propios mensajes si los enviaste a Marcadores
+    keep_self_fav: Conservar mensajes que enviaste a Favoritos
+    keep_self_fav_hint: No elimina tus propios mensajes si los enviaste a Favoritos
     min_age:
       '1209600': 2 semanas
       '15778476': 6 meses
@@ -1842,9 +1842,42 @@ es-AR:
         silence: Cuenta limitada
         suspend: Cuenta suspendida
     welcome:
-      edit_profile_action: Configurar perfil
-      edit_profile_step: Podés personalizar tu perfil subiendo un avatar (imagen de perfil), cambiando tu nombre a mostrar y más. Podés optar por revisar a los nuevos seguidores antes de que puedan seguirte.
+      apps_android_action: Conseguila en Google Play
+      apps_ios_action: Descargala desde la App Store
+      apps_step: Descargá nuestras aplicaciones oficiales.
+      apps_title: Aplicaciones de Mastodon
+      checklist_subtitle: 'Vamos a iniciarte en esta nueva experiencia social:'
+      checklist_title: Repaso de bienvenida
+      edit_profile_action: Personalizar
+      edit_profile_step: Completá tu perfil para aumentar las posibilidades de interacción.
+      edit_profile_title: Personalizá tu perfil
       explanation: Aquí hay algunos consejos para empezar
+      feature_action: Aprendé más
+      feature_audience: Mastodon te ofrece la posibilidad única de gestionar tu audiencia sin intermediarios. Mastodon desplegado en tu propia infraestructura te permite seguir a otras cuentas, y que te sigan desde cualquier otro servidor en línea de Mastodon y no estar bajo el control de nadie más, excepto el tuyo.
+      feature_audience_title: Construí tu audiencia en confianza
+      feature_control: Vos sabés bien que querés tener en tu línea temporal principal. Nada de algoritmos o publicidades que desperdicien tu tiempo. Seguí cualquier cuenta de cualquier servidor de Mastodon desde la tuya propia y recibí sus mensajes en orden cronológico, haciendo tu espacio de Internet un lugar más personalizado.
+      feature_control_title: Tené el control de tu propia línea temporal
+      feature_creativity: Mastodon soporta mensajes con audio, videos e imágenes, descripciones de accesibilidad, encuestas, advertencias de contenido, avatares animados, emojis personalizables, control de recorte de miniaturas, y más; todo para ayudarte a expresarte en línea. Ya sea que estés publicando tu arte, tu música o tu podcast, Mastodon está ahí para vos.
+      feature_creativity_title: Creatividad sin paralelos
+      feature_moderation: Mastodon vuelve a poner el poder de decisión en tus manos. Cada servidor crea sus propias reglas y regulaciones, las cuales se aplican localmente y no de arriba hacia abajo como las redes sociales corporativas, volviendo a Mastodon la red social más flexible en respuesta a las necesidades de diferentes grupos de personas. Unite a un servidor con cuyas reglas estés de acuerdo, o montá tu propio servidor.
+      feature_moderation_title: Moderando como debería ser
+      follow_action: Seguir
+      follow_step: Seguir cuentas interesantes es de lo que se trata Mastodon.
+      follow_title: Personalizá tu línea de tiempo principal
+      follows_subtitle: Seguí cuentas populares
+      follows_title: A quién seguir
+      follows_view_more: Encontrá más cuentas para seguir
+      hashtags_recent_count: "%{people} cuentas en los últimos %{days} días"
+      hashtags_subtitle: Explora las tendencias de los últimos 2 días
+      hashtags_title: Etiquetas en tendencia
+      hashtags_view_more: Ver más etiquetas en tendencias
+      post_action: Redactar
+      post_step: Decile "Hola" al mundo con textos, fotos, videos o encuestas.
+      post_title: Escribí tu primer mensaje
+      share_action: Compartir
+      share_step: Hacé que tus amistades sepan cómo encontrarte en Mastodon.
+      share_title: Compartí tu perfil de Mastodon
+      sign_in_action: Iniciá sesión
       subject: Bienvenido a Mastodon
       title: "¡Bienvenido a bordo, %{name}!"
   users:
diff --git a/config/locales/es-MX.yml b/config/locales/es-MX.yml
index 4d2e8ff2573e00..0948e8d434142c 100644
--- a/config/locales/es-MX.yml
+++ b/config/locales/es-MX.yml
@@ -767,7 +767,7 @@ es-MX:
         disabled: A nadie
         users: Para los usuarios locales que han iniciado sesión
       registrations:
-        moderation_recommandation: Por favor, ¡asegúrate de tener un equipo de moderación adecuado y reactivo antes de abrir los registros a todo el mundo!
+        moderation_recommandation: "¡Por favor, asegúrate de contar con un equipo de moderación adecuado y activo antes de abrir el registro al público!"
         preamble: Controla quién puede crear una cuenta en tu servidor.
         title: Registros
       registrations_mode:
@@ -775,7 +775,7 @@ es-MX:
           approved: Se requiere aprobación para registrarse
           none: Nadie puede registrarse
           open: Cualquiera puede registrarse
-        warning_hint: Recomendamos el uso de “Se requiere aprobación para registrarse” a menos que estés seguro de que tu equipo de moderación puede manejar el spam y los registros maliciosos en un tiempo razonable.
+        warning_hint: Recomendamos el uso de la "Aprobación requerida para el registro", a menos de que confíes en que tu equipo de moderación puede manejar el spam y los registros maliciosos en un tiempo razonable.
       security:
         authorized_fetch: Requerir autenticación de servidores federados
         authorized_fetch_hint: Requerir autenticación de servidores federados permite un cumplimiento más estricto tanto de los bloqueos a nivel de usuario como a nivel de servidor. Sin embargo, esto se produce a costa de una penalización en el rendimiento, reduce el alcance de tus respuestas y puede introducir problemas de compatibilidad con algunos servicios federados. Además, esto no impedirá que actores dedicados obtengan tus cuentas y publicaciones públicas.
@@ -969,7 +969,7 @@ es-MX:
       webhook: Webhook
   admin_mailer:
     auto_close_registrations:
-      body: Debido a la falta de moderadores activos, los registros en %{instance} han sido cambiados automáticamente para requerir revisión manual, para evitar que %{instance} se utilice potencialmente como plataforma por malos actores. Puedes volver a cambiarlo para abrir los registros en cualquier momento.
+      body: Debido al faltante de actividad reciente de moderación, los registros en %{instance} han cambiado automáticamente para requerir la revisión manial, para evitar que %{instance} se utilice como una plataforma para potenciales malos actores. Puedes revertir este cambio en los registros en cualquier momento.
       subject: Se ha cambiado automáticamente el registro de %{instance} para requerir aprobación
     new_appeal:
       actions:
@@ -1842,9 +1842,42 @@ es-MX:
         silence: Cuenta limitada
         suspend: Cuenta suspendida
     welcome:
-      edit_profile_action: Configurar el perfil
-      edit_profile_step: Puedes personalizar tu perfil subiendo una foto de perfil, cambiando tu nombre de usuario y mucho más. Puedes optar por revisar a los nuevos seguidores antes de que puedan seguirte.
+      apps_android_action: Consíguela en Google Play
+      apps_ios_action: Descargar en el App Store
+      apps_step: Descarga nuestras aplicaciones oficiales.
+      apps_title: Aplicaciones de Mastodon
+      checklist_subtitle: 'Comencemos en esta nueva frontera social:'
+      checklist_title: Lista de bienvenida
+      edit_profile_action: Personalizar
+      edit_profile_step: Aumenta tus interacciones con un perfil completo.
+      edit_profile_title: Personaliza tu perfil
       explanation: Aquí hay algunos consejos para empezar
+      feature_action: Leer más
+      feature_audience: Mastodon te proporciona una posibilidad única de gestionar tu audiencia sin intermediarios. El despliegue de Mastodon en tu propia infraestructura te permite seguir y ser seguido desde cualquier servidor de Mastodon que se encuentre en línea y no está bajo el control de nadie más que tú.
+      feature_audience_title: Construye tu audiencia con confianza
+      feature_control: Tú sabes lo que quieres ver en tu página principal. Nada de algoritmos y publicidad para desperdiciar tu tiempo. Sigue a quien quieras a través de cualquier servidor de Mastodon y recibe sus publicaciones en orden cronológico. Haz tu rincón de internet un poco más como tú.
+      feature_control_title: Mantente en control de tu línea de tiempo
+      feature_creativity: Mastodon soporta mensajes de audio, vídeo e imágenes, descripciones de accesibilidad, encuestas, advertencias de contenido, avatares animados, emojis personalizados, recortes de miniatura, y más, para ayudarte a expresarte en línea. Ya sea publicando tu arte, tu música o tu podcast, Mastodon está ahí para ti.
+      feature_creativity_title: Creatividad inigualable
+      feature_moderation: Mastodon vuelve a poner la toma de decisiones en tus manos. Cada servidor crea sus propias reglas y reglamentos, que se aplican localmente y no globalmente como en redes sociales corporativas, lo que resulta en la mayor flexibilidad para responder a las necesidades de diferentes grupos de personas. Únete a un servidor con las reglas con las que esté sde acuerdo, o aloja el tuyo propio.
+      feature_moderation_title: La moderación como debería ser
+      follow_action: Seguir
+      follow_step: Seguir a personas interesantes es de lo que trata Mastodon.
+      follow_title: Personaliza tu línea de inicio
+      follows_subtitle: Seguir cuentas conocidas
+      follows_title: A quién seguir
+      follows_view_more: Ver más personas para seguir
+      hashtags_recent_count: "%{people} personas en los últimos %{days} días"
+      hashtags_subtitle: Explora las tendencias de los últimos 2 días
+      hashtags_title: Etiquetas en tendencia
+      hashtags_view_more: Ver más etiquetas en tendencia
+      post_action: Redactar
+      post_step: Di hola al mundo con texto, fotos, vídeos o encuestas.
+      post_title: Escribe tu primera publicación
+      share_action: Compartir
+      share_step: Dile a tus amigos cómo encontrarte en Mastodon.
+      share_title: Comparte tu perfil de Mastodon
+      sign_in_action: Regístrate
       subject: Bienvenido a Mastodon
       title: Te damos la bienvenida a bordo, %{name}!
   users:
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 5204b116e349aa..946ba1cbebeb6f 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -1705,9 +1705,9 @@ es:
       direct: Directa
       private: Sólo mostrar a seguidores
       private_long: Solo mostrar a tus seguidores
-      public: Público
+      public: Pública
       public_long: Todos pueden ver
-      unlisted: Público, pero no mostrar en la historia federada
+      unlisted: Pública, pero no mostrar en la historia federada
       unlisted_long: Todos pueden ver, pero no está listado en las líneas de tiempo públicas
   statuses_cleanup:
     enabled: Borrar automáticamente publicaciones antiguas
@@ -1842,9 +1842,42 @@ es:
         silence: Cuenta limitada
         suspend: Cuenta suspendida
     welcome:
-      edit_profile_action: Configurar el perfil
-      edit_profile_step: Puedes personalizar tu perfil subiendo una foto de perfil, cambiando tu nombre de usuario y mucho más. Puedes optar por revisar a los nuevos seguidores antes de que puedan seguirte.
+      apps_android_action: Consíguela en Google Play
+      apps_ios_action: Descargar en la App Store
+      apps_step: Descarga nuestras aplicaciones oficiales.
+      apps_title: Aplicaciones para Mastodon
+      checklist_subtitle: 'Vamos a empezar en esta nueva frontera social:'
+      checklist_title: Lista de bienvenida
+      edit_profile_action: Personalizar
+      edit_profile_step: Aumenta tus interacciones completando tu perfil.
+      edit_profile_title: Personaliza tu perfil
       explanation: Aquí hay algunos consejos para empezar
+      feature_action: Saber más
+      feature_audience: Mastodon te ofrece una posibilidad única de gestionar tu audiencia sin intermediarios. Mastodon desplegado en tu propia infraestructura te permite seguir y ser seguido desde cualquier otro servidor Mastodon en línea y no está bajo el control de ningún tercero.
+      feature_audience_title: Construye tu audiencia con confianza
+      feature_control: Tú sabes lo que quieres ver en tu página principal. Nada de algoritmos y publicidad para desperdiciar tu tiempo. Sigue a quien quieras a través de cualquier servidor de Mastodon y recibe sus publicaciones en orden cronológico. Haz tu rincón de internet un poco más como tú.
+      feature_control_title: Mantente en control de tu línea de tiempo
+      feature_creativity: Mastodon soporta mensajes de audio, vídeo e imágenes, descripciones de accesibilidad, encuestas, advertencias de contenido, avatares animados, emojis personalizados, recortes de miniatura, y más, para ayudarte a expresarte en línea. Ya sea publicando tu arte, tu música o tu podcast, Mastodon está ahí para ti.
+      feature_creativity_title: Creatividad inigualable
+      feature_moderation: Mastodon vuelve a poner la toma de decisiones en tus manos. Cada servidor crea sus propias reglas y reglamentos, que se aplican localmente y no globalmente como en redes sociales corporativas, lo que resulta en la mayor flexibilidad para responder a las necesidades de diferentes grupos de personas. Únete a un servidor con las reglas con las que esté sde acuerdo, o aloja el tuyo propio.
+      feature_moderation_title: La moderación como debería ser
+      follow_action: Seguir
+      follow_step: Seguir a personas interesantes es de lo que trata Mastodon.
+      follow_title: Personaliza tu línea de inicio
+      follows_subtitle: Seguir cuentas conocidas
+      follows_title: A quién seguir
+      follows_view_more: Ver más personas para seguir
+      hashtags_recent_count: "%{people} personas en los últimos %{days} días"
+      hashtags_subtitle: Explora las tendencias de los últimos 2 días
+      hashtags_title: Etiquetas en tendencia
+      hashtags_view_more: Ver más etiquetas en tendencia
+      post_action: Redactar
+      post_step: Di hola al mundo con texto, fotos, vídeos o encuestas.
+      post_title: Escribe tu primera publicación
+      share_action: Compartir
+      share_step: Dile a tus amigos cómo encontrarte en Mastodon.
+      share_title: Comparte tu perfil de Mastodon
+      sign_in_action: Regístrate
       subject: Bienvenido a Mastodon
       title: Te damos la bienvenida a bordo, %{name}!
   users:
diff --git a/config/locales/et.yml b/config/locales/et.yml
index 6bdb54a50eed51..cd944d9c199f26 100644
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -767,6 +767,7 @@ et:
         disabled: Mitte kellelegi
         users: Sisseloginud kohalikele kasutajatele
       registrations:
+        moderation_recommandation: Enne registreeringute avamist kõigile veendu, et oleks olemas adekvaatne ja reageerimisvalmis modereerijaskond!
         preamble: Kes saab serveril konto luua.
         title: Registreerimised
       registrations_mode:
@@ -774,6 +775,7 @@ et:
           approved: Kinnitus vajalik konto loomisel
           none: Keegi ei saa kontoid luua
           open: Kõik võivad kontoid luua
+        warning_hint: Soovitame liitumisel kasutada heakskiitmise nõuet, kui just pole kindel, et modereerijaskond suudab õigeaegselt käsitleda rämpsu ja pahatahtlikke liitumisi.
       security:
         authorized_fetch: Nõua föderatiivse serveripoolset autoriseerimist
         authorized_fetch_hint: Föderatiivsete serverite poolse autoriseerimise nõudmine võimaldab nii kasutaja- kui ka serveritasandi blokeeringute rangemat jõustamist. See toob aga kaasa jõudluse vähenemise, vähendab vastuste ulatust ja võib tekitada ühilduvusprobleeme mõne ühendatud teenusega. Lisaks ei takista see teatud kasutajatel sinu avalike postituste ja kontode kättesaamist.
@@ -966,6 +968,9 @@ et:
       title: Veebikonksud
       webhook: Veebikonks
   admin_mailer:
+    auto_close_registrations:
+      body: Hiljutise vähese modereerimistegevuse tõttu on %{instance} liitumised automaatselt muudetud heakskiitu nõudvaks, et %{instance} ei muutuks võimalike pahategijate tegevusplatvormiks. Registreerumine on võimalik tagasi avatuks muuta igal ajal.
+      subject: Serveri %{instance} registreeringud on automaatselt muudetud heakskiitu nõudvaks
     new_appeal:
       actions:
         delete_statuses: kustutada postitused
@@ -1839,12 +1844,42 @@ et:
         silence: Konto limiteeritud
         suspend: Konto kustutatud
     welcome:
-      edit_profile_action: Seadista oma profiil
-      edit_profile_step: |-
-        Esmalt seadista oma profiil. Saad lisada profiilipildi, muuta ekraaninime, lisada lühikirjelduse ja teha paljut muud. Vaata üle oma konto seaded. Saad ise otsustada, kui nähtav on konto teiste jaoks, mis keeltes postitusi oma ajavoos näha soovid ning kui privaatne peaks konto olema.
-
-        Kui mõni asi arusaamatuks jääb, siis võib vaadata juhendvideot: https://youtu.be/J4ItbTOAw7Q
+      apps_android_action: Google Play poest
+      apps_ios_action: Allalaadimine App Store'ist
+      apps_step: Meie ametlikud rakendused.
+      apps_title: Mastodoni rakendused
+      checklist_subtitle: 'Kuidas sel uudsel sotsiaalmeediarindel pihta hakata:'
+      checklist_title: Millest alustada
+      edit_profile_action: Isikupärasta
+      edit_profile_step: Anna oma tegevustele hoogu, luues põhjalik kasutajaprofiil.
+      edit_profile_title: Isikupärasta oma profiili
       explanation: Siin on mõned nõuanded, mis aitavad alustada
+      feature_action: Vaata lisa
+      feature_audience: Mastodon pakub unikaalset võimalust oma jälgijaskonda hallata ilma vahendajateta. Mastodoni käitamine enda serveris võimaldab jälgida kasutajaid ja olla jälgitav ükskõik millisest Mastodoni serverist võrgus ja see pole kellegi teise poolt kontrollitav.
+      feature_audience_title: Kogu enesekindlalt jälgijaid
+      feature_control: Tead ise kõige paremini, mida soovid oma koduvoos näha. Ei aega raiskavaid algoritme ega reklaame. Jälgi ühe kasutajakonto kaudu keda iganes mistahes Mastodoni serveris ja näe postitusi ajalises järjestuses, muutes oma nurgakese Internetist rohkem endale meelepärasemaks.
+      feature_control_title: Säilita oma ajajoone üle kontroll
+      feature_creativity: Mastodon toetab audiot, video- ja pildipostitusi, liigipääsetavuse kirjeldusi, küsitlusi, sisuhoiatusi, animeeritud avatare, kohandatud emotikone, pisipiltide lõikeeelistusi ja enamatki, et end võrgus väljendada. Kas avaldad kunsti, muusikat või taskuhäälingusaadet, Mastodon on mõeldud Sinu jaoks.
+      feature_creativity_title: Võrreldamatu loovus
+      feature_moderation: Mastodon annab otsustusõiguse tagasi Sinu kätte. Igal serveril on oma reeglid ja regulatsioonid, mida hallatakse kohapeal, mitte nagu ülalt-alla korporatiivses sotsiaalmeedias, võimaldades enim paindlikku vastavust erinevate vajadustega gruppide ja inimeste eelistustele. Liitu sobivate reeglitega serveriga, või käivita oma server.
+      feature_moderation_title: Modereerimine, nagu see olema peab
+      follow_action: Jälgi
+      follow_step: Huvipakkuvate inimeste jälgimine ongi Mastodoni olemuseks.
+      follow_title: Isikupärasta oma koduvoogu
+      follows_subtitle: Jälgi teada-tuntud kasutajaid
+      follows_title: Keda jälgida
+      follows_view_more: Vaata lähemalt, keda jälgida
+      hashtags_recent_count: "%{people} inimest viimase %{days} päeva jooksul"
+      hashtags_subtitle: Avasta, mis viimase 2 päeva jooksul on toimunud
+      hashtags_title: Populaarsed märksõnad
+      hashtags_view_more: Vaata teisi trendikaid märksõnu
+      post_action: Postita
+      post_step: Tervita maailma teksti, fotode, videote või küsitlustega.
+      post_title: Tee oma esimene postitus
+      share_action: Jaga
+      share_step: Anna sõpradele teada, kuidas Sind Mastodonis leida.
+      share_title: Jaga oma Mastodoni profiili
+      sign_in_action: Sisene
       subject: Tere tulemast Mastodoni
       title: Tere tulemast, %{name}!
   users:
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index f49456afb2d04c..bd46e4aa884ca9 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -1843,9 +1843,42 @@ eu:
         silence: Kontu murriztua
         suspend: Kontu kanporatua
     welcome:
-      edit_profile_action: Ezarri profila
-      edit_profile_step: Pertsonalizatu profila abatar bat igoz, zure pantaila-izena aldatuz eta gehiago. Jarraitzaile berriak onartu aurretik berrikusi nahi badituzu, kontuari giltzarrapoa jarri diezaiokezu.
+      apps_android_action: Eskuratu Google Play-en
+      apps_ios_action: Deskargatu App Store-n
+      apps_step: Deskargatu gure aplikazio ofizialak.
+      apps_title: Mastodon-en aplikazioak
+      checklist_subtitle: 'Murgil zaitez sare sozialen aro berri honetan:'
+      checklist_title: Ongietorrien kontrol-zerrenda
+      edit_profile_action: Pertsonalizatu
+      edit_profile_step: Handiagotu elkarreragina profil ulerkor bat sortuz.
+      edit_profile_title: Pertsonalizatu profila
       explanation: Hona hasteko aholku batzuk
+      feature_action: Informazio gehiago
+      feature_audience: Mastodon-ek hartzaileak kudeatzeko aukera paregabea eskaintzen dizu tartean inor egon gabe. Mastodon zeure azpiegituran inplementatua izanik, lineako beste edozein Mastodon zerbitzarko edonor jarrai dezakezu, baita edonork zeu jarraitu ere. Soilik zeure kontrolpean.
+      feature_audience_title: Bildu hartzaileak uste osoarekin
+      feature_control: Aski ondo dakizu zer ikusi nahi duzun hasierako jarioan. Denbora galarazten duten algoritmorik edo iragarkirik gabe. Jarraitu beste Mastodon zerbitzarietako edozein kontu bakarretik eta jaso bere argitalpenak ordena kronologikoan. Zure interneteko txokoa zu bezala izan dadila.
+      feature_control_title: Egon zure denbora-lerroaren kontrolpean
+      feature_creativity: Mastodon-ek audioa, bideoa edo irudia duen argitalpenak, erabilerraztasun-azalpenak, inkestak, edukiaren abisuak, abatar animatuak, emoji pertsonalizatuak, miniaturen mozketaren kontrola eta funtzio gehiago onartzen ditu, linean aditzera eman zaitezen laguntzeko. Artea, musika edo podcastak partekatzen badituzu, Mastodon hortxe duzu.
+      feature_creativity_title: Sormen paregabea
+      feature_moderation: Mastodon-ek erabakiak hartzeko ahalmena dakar bueltan. Zerbitzari bakoitzak bere arau eta murrizketa propioak sortzen ditu, lokalki indarrean jartzen dira eta ez orokorki korporazioen sare-sozialen gisa. Era honetara, jende talde ezberdinen mesedeak asetzeko malguago bilakatzen da. Batu bertako arauekin ados zauden zerbitzari batera edo ostatatu zeurea.
+      feature_moderation_title: Moderazioa behar lukeen bezalaxe
+      follow_action: Jarraitu
+      follow_step: Jende interesgarria jarraitzean datza Mastodon.
+      follow_title: Pertsonalizatu hasierako jarioa
+      follows_subtitle: Jarraitu kontu ospetsuak
+      follows_title: Nor jarraitu
+      follows_view_more: Ikusi jarrai dezakezun jende gehiago
+      hashtags_recent_count: "%{people} pertsona azken %{days} egunetan"
+      hashtags_subtitle: Arakatu azken 2 egunetan pil-pilean dagoena
+      hashtags_title: Pil-pilean dauden traolak
+      hashtags_view_more: Ikusi pil-pilean dauden traol gehiago
+      post_action: Idatzi
+      post_step: Agurtu munduari testu, argazki, bideo zein inkesta batekin.
+      post_title: Idatzi zeure lehen argitalpena
+      share_action: Partekatu
+      share_step: Esaiezu lagunei nola aurki zaitzaketen Mastodon-en.
+      share_title: Partekatu Mastodon profila
+      sign_in_action: Hasi saioa
       subject: Ongi etorri Mastodon-era
       title: Ongi etorri, %{name}!
   users:
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 7fab495af81f65..5d62f9143e120f 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -1575,8 +1575,6 @@ fa:
         silence: حساب محدود شده است
         suspend: حساب معلق شده است
     welcome:
-      edit_profile_action: تنظیم نمایه
-      edit_profile_step: می‌توانید نمایه‌تان را با بارگذاری تصویر نمایه، تغییر نام نمایشی و بیش از این‌‌ها سفارشی کنید. می‌توانید تعیین کنید که پی‌گیران جدید را پیش‌از این که بتوانند دنبالتان کنند بازبینی کنید.
       explanation: نکته‌هایی که برای آغاز کار به شما کمک می‌کنند
       subject: به ماستودون خوش آمدید
       title: خوش آمدید، کاربر %{name}!
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 4cd255c2f4d5a3..bc73e3ee0e81d8 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -772,10 +772,10 @@ fi:
         title: Rekisteröityminen
       registrations_mode:
         modes:
-          approved: Rekisteröinti vaatii hyväksynnän
+          approved: Rekisteröityminen vaatii hyväksynnän
           none: Kukaan ei voi rekisteröityä
           open: Kaikki voivat rekisteröityä
-        warning_hint: Suosittelemme käyttämään asetusta “Rekisteröinti vaatii hyväksynnän” ellet ole varma siitä, että moderaattorit ovat valmiina käsittelemään roskapostia ja haittarekisteröitymisiä oikea-aikaisesti.
+        warning_hint: Suosittelemme käyttämään asetusta ”Rekisteröityminen vaatii hyväksynnän”, ellet ole varma siitä, että moderaattorit ovat valmiina käsittelemään roskapostia ja haittarekisteröitymisiä oikea-aikaisesti.
       security:
         authorized_fetch: Vaadi todennus liittoutuvilta palvelimilta
         authorized_fetch_hint: Todennuksen vaatiminen liittoutuvilta palvelimilta mahdollistaa sekä käyttäjä- että palvelintason estojen tiukemman valvonnan. Tämä tapahtuu kuitenkin suorituskyvyn kustannuksella, vähentää vastauksiesi tavoittavuutta ja voi aiheuttaa yhteensopivuusongelmia joidenkin liittoutuvien palvelujen kanssa. Tämä ei myöskään estä omistautuneita toimijoita hakemasta julkisia julkaisujasi ja tilejäsi.
@@ -969,8 +969,8 @@ fi:
       webhook: Webhook
   admin_mailer:
     auto_close_registrations:
-      body: Viimeaikaisen moderaattoritoiminnan puutteen vuoksi %{instance} rekisteröinnit on vaihdettu automaattisesti manuaaliseen tarkasteluun, jotta %{instance} ei käytetä mahdollisien huonojen toimijoiden alustana. Voit vaihtaa sen takaisin avaamalla rekisteröinnit milloin tahansa.
-      subject: Rekisteröinnit %{instance} on automaattisesti vaihdettu vaatimaan hyväksyntää
+      body: Viimeaikaisen moderaattoritoiminnan puutteen vuoksi palvelimen %{instance} rekisteröitymiset on vaihdettu automaattisesti manuaaliseen tarkasteluun, jotta palvelinta %{instance} ei käytetä mahdollisten huonojen toimijoiden alustana. Voit vaihtaa takaisin avoimiin rekisteröitymisiin milloin tahansa.
+      subject: Rekisteröitymiset palvelimelle %{instance} on automaattisesti vaihdettu vaatimaan hyväksyntää
     new_appeal:
       actions:
         delete_statuses: poistaa hänen julkaisunsa
@@ -1842,9 +1842,39 @@ fi:
         silence: Tiliä rajoitettu
         suspend: Tili jäädytetty
     welcome:
-      edit_profile_action: Määritä profiili
-      edit_profile_step: Voit mukauttaa profiiliasi muun muassa profiilikuvalla ja uudella näyttönimellä. Voit myös valita, haluatko tarkastaa ja hyväksyä uudet seuraajat itse.
+      apps_android_action: Hanki Google Playstä
+      apps_ios_action: Lataa App Storesta
+      apps_step: Lataa viralliset sovelluksemme.
+      apps_title: Mastodon-sovellukset
+      edit_profile_action: Mukauta
+      edit_profile_title: Mukauta profiiliasi
       explanation: Näillä vinkeillä pääset alkuun
+      feature_action: Lue lisää
+      feature_audience: Mastodon tarjoaa sinulle ainutlaatuisen mahdollisuuden hallita yleisöäsi ilman välikäsiä. Omassa infrastruktuurissasi käytössä oleva Mastodon antaa sinulle mahdollisuuden seurata ja tulla seuratuksi miltä tahansa muulta verkon Mastodon-palvelimelta, ja se on vain sinun hallinnassasi.
+      feature_audience_title: Rakenna yleisöäsi luottavaisin mielin
+      feature_control: Tiedät itse parhaiten, mitä haluat nähdä kotisyötteessäsi. Ei algoritmeja eikä mainoksia tuhlaamassa aikaasi. Seuraa yhdellä tilillä ketä tahansa, miltä tahansa Mastodon-palvelimelta, vastaanota heidän julkaisunsa aikajärjestyksessä ja tee omasta internetin nurkastasi hieman enemmän omanlaisesi.
+      feature_control_title: Pidä aikajanasi hallussasi
+      feature_creativity: Mastodon tukee ääni-, video- ja kuvajulkaisuja, saavutettavuuskuvauksia, äänestyksiä, sisältövaroituksia, animoituja avattaria, mukautettuja emojeita, pikkukuvien rajauksen hallintaa ja paljon muuta, mikä auttaa ilmaisemaan itseäsi verkossa. Julkaisetpa sitten taidetta, musiikkia tai podcastia, Mastodon on sinua varten.
+      feature_creativity_title: Luovuutta vertaansa vailla
+      feature_moderation: Mastodon palauttaa päätöksenteon käsiisi. Jokainen palvelin luo omat sääntönsä ja määräyksensä, joita valvotaan paikallisesti eikä ylhäältä alas kuten kaupallisessa sosiaalisessa mediassa, mikä tekee siitä joustavimman vastaamaan eri ihmisryhmien tarpeisiin. Liity palvelimelle, jonka säännöt sopivat sinulle, tai ylläpidä omaa palvelinta.
+      feature_moderation_title: Moderointi niin kuin kuuluukin
+      follow_action: Seuraa
+      follow_step: Mastodonissa on kyse kiinnostavien ihmisten seuraamisesta.
+      follow_title: Mukauta kotisyötettäsi
+      follows_subtitle: Seuraa tunnettuja tilejä
+      follows_title: Ehdotuksia seurattavaksi
+      follows_view_more: Näytä lisää seurattavia henkilöitä
+      hashtags_recent_count: "%{people} henkilöä viimeisenä %{days} päivänä"
+      hashtags_subtitle: Tutki, mikä on ollut suosittua viimeisenä 2 päivänä
+      hashtags_title: Suositut aihetunnisteet
+      hashtags_view_more: Näytä lisää suosittuja aihetunnisteita
+      post_action: Kirjoita
+      post_step: Tervehdi maailmaa sanoin, kuvin, videoin ja äänestyksin.
+      post_title: Tee ensimmäinen julkaisusi
+      share_action: Jaa
+      share_step: Kerro ystävillesi, kuinka sinut voi löytää Mastodonista.
+      share_title: Jaa Mastodon-profiilisi
+      sign_in_action: Kirjaudu sisään
       subject: Tervetuloa Mastodoniin
       title: Tervetuloa mukaan, %{name}!
   users:
diff --git a/config/locales/fo.yml b/config/locales/fo.yml
index c7dca591f680bf..64c26a62f20b1e 100644
--- a/config/locales/fo.yml
+++ b/config/locales/fo.yml
@@ -1842,9 +1842,42 @@ fo:
         silence: Kontoin er avmarkað
         suspend: Konta ógildað
     welcome:
-      edit_profile_action: Set upp vanga
-      edit_profile_step: Tú kanst tillaga vanga tín við at leggja eina vangamynd inn, broyta vísta navnið hjá tær og meira. Tú kanst velja at eftirkanna nýggjar fylgjarar, áðrenn teir sleppa at fylgja tær.
+      apps_android_action: Fá hana á Google Play
+      apps_ios_action: Tak niður á App Store
+      apps_step: Tak okkara almennu appir niður.
+      apps_title: Mastodon appir
+      checklist_subtitle: 'Kom í gongd á hesum nýggja miðli:'
+      checklist_title: Vælkomukekklisti
+      edit_profile_action: Ger persónligt
+      edit_profile_step: Stimbra títt samvirkni við einum fullfíggjaðum vanga.
+      edit_profile_title: Ger vangan hjá tær persónligan
       explanation: Her eru nøkur ráð so tú kann koma gott ígongd
+      feature_action: Lær meira
+      feature_audience: Mastodon gevur við ein einastandandi høvi at stýra tínar áskoðarar uttan millumfólk. Mastodon á tínum egnu ambætarum gevur tær høvi at fylgja og at blíva fylgd ella fylgdur frá einum og hvørjum Mastodon ambætara á netinum og er bert undir tínum ræði.
+      feature_audience_title: Uppbygg tína áskoðarafjøld í treysti
+      feature_control: Tú veitst best, hvat tú vilt síggja á tíni heimarás. Ongar algoritmur ella lýsingar at oyðsla tíðina hjá tær við. Fylg hvønn tú vilt á øllum Mastodon ambætarum umvegis eina kontu og móttak teirra postar í tíðarrað, og ger tín part av internetinum eitt sindur meira sum teg.
+      feature_control_title: Varðveit ræði á tíni egnu tíðarrás
+      feature_creativity: Mastodon hevur postar við ljóði, video og myndum, atkomulýsingar, spurnarkanningar, innihaldsávarðingar, livandi avatarar, sergjørd kenslutekn, klipping av smámyndum og annað, sum hjálpir tær at bera teg fram á netinum. Sama um tú útgevur list, tónleik ella poddvarp, Mastodon er har fyri teg.
+      feature_creativity_title: Makaleys skapan
+      feature_moderation: Mastodon leggur avgerðirnar aftur í tínar hendur. Hvør ambætari hevur sínar egnu reglur og fyriskipanir, sum vera útinnaðar lokalt og ikki frá í erva og niðureftir sum sosialir miðlar hjá stórfyritøkum. Hetta ger tað til tað smidliga at svara tørvinum hjá ymsum bólkum av fólki. Luttak á einum ambætara við reglum, sum tú er samd ella samdur við, ella hýs tín egna ambætara.
+      feature_moderation_title: Umsjón, sum hon eigur at vera
+      follow_action: Fylg
+      follow_step: At fylgja áhugaverdum fólki er tað, sum Mastodon snýr seg um.
+      follow_title: Ger tína heimarás persónliga
+      follows_subtitle: Fylg vælkendar kontur
+      follows_title: Hvørji tú átti at fylgt
+      follows_view_more: Sí fleiri fólk at fylgja
+      hashtags_recent_count: "%{people} fólk seinastu %{days} dagarnar"
+      hashtags_subtitle: Kanna rákið seinastu 2 dagarnar
+      hashtags_title: Vælumtókt frámerki
+      hashtags_view_more: Sí fleiri vælumtókt frámerki
+      post_action: Skriva
+      post_step: Sig hey við verðina við teksti, myndum, video ella spurnarkanningum.
+      post_title: Stovna tín fyrsta post
+      share_action: Deil
+      share_step: Lat vinir tínar vita, hvussu tey finna teg á Mastodon.
+      share_title: Deil tín Mastodon vanga
+      sign_in_action: Rita inn
       subject: Vælkomin til Mastodon
       title: Vælkomin umborð, %{name}!
   users:
diff --git a/config/locales/fr-CA.yml b/config/locales/fr-CA.yml
index 381a8f582a7ddb..860c591a0a9857 100644
--- a/config/locales/fr-CA.yml
+++ b/config/locales/fr-CA.yml
@@ -425,7 +425,7 @@ fr-CA:
       view: Afficher les blocages de domaines
     email_domain_blocks:
       add_new: Ajouter
-      allow_registrations_with_approval: Autoriser les inscriptions avec approbation
+      allow_registrations_with_approval: Permettre les inscriptions avec l'approuvement
       attempts_over_week:
         one: "%{count} tentative au cours de la dernière semaine"
         other: "%{count} tentatives au cours de la dernière semaine"
@@ -767,6 +767,7 @@ fr-CA:
         disabled: À personne
         users: Aux utilisateur·rice·s connecté·e·s localement
       registrations:
+        moderation_recommandation: Veuillez vous assurer d'avoir une équipe de modération adéquate et réactive avant d'ouvrir les inscriptions à tout le monde!
         preamble: Affecte qui peut créer un compte sur votre serveur.
         title: Inscriptions
       registrations_mode:
@@ -774,6 +775,7 @@ fr-CA:
           approved: Approbation requise pour s’inscrire
           none: Personne ne peut s’inscrire
           open: N’importe qui peut s’inscrire
+        warning_hint: Nous vous recommandons d’utiliser « Approbation requise pour s’inscrire » à moins que vous n’ayez confiance dans la capacité de votre équipe de modération à gérer les messages indésirables et les inscriptions malveillantes suffisamment rapidement.
       security:
         authorized_fetch: Exiger une authentification de la part des serveurs fédérés
         authorized_fetch_hint: Exiger l’authentification des serveurs fédérés permet une application plus stricte des blocages définis par les utilisateurs et le serveur. Cependant, cela entraîne une baisse des performances, réduit la portée de vos réponses et peut poser des problèmes de compatibilité avec certains services fédérés. En outre, cela n’empêchera pas les acteurs déterminés d’aller chercher vos messages et comptes publics.
@@ -966,6 +968,9 @@ fr-CA:
       title: Points d’ancrage web
       webhook: Point d’ancrage web
   admin_mailer:
+    auto_close_registrations:
+      body: En raison du manque d'activité récente des modérateurs, les inscriptions à %{instance} ont été automatiquement changées pour nécessiter une revue manuelle afin d'éviter que votre instance %{instance} ne soit utilisée comme plate-forme pour des acteurs potentiellement malveillants. Vous pouvez ré-ouvrir les inscriptions à tout moment.
+      subject: Les inscriptions à %{instance} ont été automatiquement changées pour requérir une approbation
     new_appeal:
       actions:
         delete_statuses: effacer les messages
@@ -1837,9 +1842,42 @@ fr-CA:
         silence: Compte limité
         suspend: Compte suspendu
     welcome:
-      edit_profile_action: Configuration du profil
-      edit_profile_step: Vous pouvez personnaliser votre profil en téléchargeant une photo de profil, en changant votre nom d'utilisateur, etc. Vous pouvez opter pour le passage en revue de chaque nouvelle demande d'abonnement à chaque fois qu'un utilisateur essaie de s'abonner à votre compte.
+      apps_android_action: Disponible sur Google Play
+      apps_ios_action: Télécharger sur l'App Store
+      apps_step: Téléchargez nos applications officielles.
+      apps_title: Applications Mastodon
+      checklist_subtitle: 'Commencez votre aventure sur le web social:'
+      checklist_title: Premières étapes
+      edit_profile_action: Personnaliser
+      edit_profile_step: Améliorez vos interactions avec un profil plus complet.
+      edit_profile_title: Personnaliser votre profil
       explanation: Voici quelques conseils pour vous aider à démarrer
+      feature_action: En savoir plus
+      feature_audience: Mastodon vous offre une possibilité unique de gérer votre audience sans intermédiaires. Mastodon peut être déployé sur votre propre infrastructure, ce qui vous permet de suivre et d'être suivi depuis n'importe quel autre serveur Mastodon et de n'être contrôlé par personne d'autre que vous.
+      feature_audience_title: Construisez votre audience en toute confiance
+      feature_control: Vous savez mieux que quiconque ce que vous voulez voir sur votre fil principal. Personne ne veut d'un algorithme qui décide à vote place ou de publicité qui vous fera perdre votre temps. Suivez n'importe qui, sur n'importe quel serveur Mastodon, depuis votre compte. Recevez les publications du monde entier dans l'ordre chronologique et créez-vous votre chez-vous numérique qui vous ressemble.
+      feature_control_title: Gardez le contrôle de votre fil
+      feature_creativity: Mastodon prend en charge les messages audio, vidéo et photo, les descriptions d'accessibilité, les sondages, les avertissements de contenu, les avatars animés, les émojis personnalisés, le contrôle des vignettes et bien plus encore pour vous aider à vous exprimer en ligne. Que vous publiiez votre art, votre musique ou votre podcast, Mastodon est là pour vous.
+      feature_creativity_title: Créativité inégalée
+      feature_moderation: Mastodon vous redonne le contrôle. Chaque serveur établit ses propres règles, appliquées localement et non pas de manière verticale comme sur les médias sociaux commerciaux, donnant davantage de souplesse pour répondre aux besoins de différentes communautés. Rejoignez un serveur avec des règles qui vous conviennent, ou bien hébergez le vôtre.
+      feature_moderation_title: La modération comme elle doit être
+      follow_action: Suivre
+      follow_step: Suivre des personnes intéressantes est l'essence de Mastodon.
+      follow_title: Personnaliser votre fil principal
+      follows_subtitle: Suivez des comptes populaires
+      follows_title: Qui suivre
+      follows_view_more: Voir plus de personnes à suivre
+      hashtags_recent_count: "%{people} personnes dans les %{days} derniers jours"
+      hashtags_subtitle: Explorez les tendances depuis les 2 derniers jours
+      hashtags_title: Hashtags populaires
+      hashtags_view_more: Voir plus de hashtags populaires
+      post_action: Rédiger
+      post_step: Dites bonjour au monde avec du texte, des photos, des vidéos ou des sondages.
+      post_title: Rédiger votre premier message
+      share_action: Partager
+      share_step: Faites savoir à vos ami·e·s comment vous trouver sur Mastodon.
+      share_title: Partager votre profil Mastodon
+      sign_in_action: Se connecter
       subject: Bienvenue sur Mastodon
       title: Bienvenue à bord, %{name} !
   users:
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 0d706accf12388..46b22cf8b368aa 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -767,6 +767,7 @@ fr:
         disabled: À personne
         users: Aux utilisateur·rice·s connecté·e·s localement
       registrations:
+        moderation_recommandation: Veuillez vous assurer d'avoir une équipe de modération adéquate et réactive avant d'ouvrir les inscriptions à tout le monde!
         preamble: Affecte qui peut créer un compte sur votre serveur.
         title: Inscriptions
       registrations_mode:
@@ -774,6 +775,7 @@ fr:
           approved: Approbation requise pour s’inscrire
           none: Personne ne peut s’inscrire
           open: N’importe qui peut s’inscrire
+        warning_hint: Nous vous recommandons d’utiliser « Approbation requise pour s’inscrire » à moins que vous n’ayez confiance dans la capacité de votre équipe de modération à gérer les messages indésirables et les inscriptions malveillantes suffisamment rapidement.
       security:
         authorized_fetch: Exiger une authentification de la part des serveurs fédérés
         authorized_fetch_hint: Exiger l’authentification des serveurs fédérés permet une application plus stricte des blocages définis par les utilisateurs et le serveur. Cependant, cela entraîne une baisse des performances, réduit la portée de vos réponses et peut poser des problèmes de compatibilité avec certains services fédérés. En outre, cela n’empêchera pas les acteurs déterminés d’aller chercher vos messages et comptes publics.
@@ -966,6 +968,9 @@ fr:
       title: Points d’ancrage web
       webhook: Point d’ancrage web
   admin_mailer:
+    auto_close_registrations:
+      body: En raison du manque d'activité récente des modérateurs, les inscriptions à %{instance} ont été automatiquement changées pour nécessiter une revue manuelle afin d'éviter que votre instance %{instance} ne soit utilisée comme plate-forme pour des acteurs potentiellement malveillants. Vous pouvez ré-ouvrir les inscriptions à tout moment.
+      subject: Les inscriptions à %{instance} ont été automatiquement changées pour requérir une approbation
     new_appeal:
       actions:
         delete_statuses: effacer les messages
@@ -1837,9 +1842,42 @@ fr:
         silence: Compte limité
         suspend: Compte suspendu
     welcome:
-      edit_profile_action: Configuration du profil
-      edit_profile_step: Vous pouvez personnaliser votre profil en téléchargeant une photo de profil, en changant votre nom d'utilisateur, etc. Vous pouvez opter pour le passage en revue de chaque nouvelle demande d'abonnement à chaque fois qu'un utilisateur essaie de s'abonner à votre compte.
+      apps_android_action: Disponible sur Google Play
+      apps_ios_action: Télécharger sur l'App Store
+      apps_step: Téléchargez nos applications officielles.
+      apps_title: Applications Mastodon
+      checklist_subtitle: 'Commencez votre aventure sur le web social:'
+      checklist_title: Premières étapes
+      edit_profile_action: Personnaliser
+      edit_profile_step: Améliorez vos interactions avec un profil plus complet.
+      edit_profile_title: Personnaliser votre profil
       explanation: Voici quelques conseils pour vous aider à démarrer
+      feature_action: En savoir plus
+      feature_audience: Mastodon vous offre une possibilité unique de gérer votre audience sans intermédiaires. Mastodon peut être déployé sur votre propre infrastructure, ce qui vous permet de suivre et d'être suivi depuis n'importe quel autre serveur Mastodon et de n'être contrôlé par personne d'autre que vous.
+      feature_audience_title: Construisez votre audience en toute confiance
+      feature_control: Vous savez mieux que quiconque ce que vous voulez voir sur votre fil principal. Personne ne veut d'un algorithme qui décide à vote place ou de publicité qui vous fera perdre votre temps. Suivez n'importe qui, sur n'importe quel serveur Mastodon, depuis votre compte. Recevez les publications du monde entier dans l'ordre chronologique et créez-vous votre chez-vous numérique qui vous ressemble.
+      feature_control_title: Gardez le contrôle de votre fil
+      feature_creativity: Mastodon prend en charge les messages audio, vidéo et photo, les descriptions d'accessibilité, les sondages, les avertissements de contenu, les avatars animés, les émojis personnalisés, le contrôle des vignettes et bien plus encore pour vous aider à vous exprimer en ligne. Que vous publiiez votre art, votre musique ou votre podcast, Mastodon est là pour vous.
+      feature_creativity_title: Créativité inégalée
+      feature_moderation: Mastodon vous redonne le contrôle. Chaque serveur établit ses propres règles, appliquées localement et non pas de manière verticale comme sur les médias sociaux commerciaux, donnant davantage de souplesse pour répondre aux besoins de différentes communautés. Rejoignez un serveur avec des règles qui vous conviennent, ou bien hébergez le vôtre.
+      feature_moderation_title: La modération comme elle doit être
+      follow_action: Suivre
+      follow_step: Suivre des personnes intéressantes est l'essence de Mastodon.
+      follow_title: Personnaliser votre fil principal
+      follows_subtitle: Suivez des comptes populaires
+      follows_title: Qui suivre
+      follows_view_more: Voir plus de personnes à suivre
+      hashtags_recent_count: "%{people} personnes dans les %{days} derniers jours"
+      hashtags_subtitle: Explorez les tendances depuis les 2 derniers jours
+      hashtags_title: Hashtags populaires
+      hashtags_view_more: Voir plus de hashtags populaires
+      post_action: Rédiger
+      post_step: Dites bonjour au monde avec du texte, des photos, des vidéos ou des sondages.
+      post_title: Rédiger votre premier message
+      share_action: Partager
+      share_step: Faites savoir à vos ami·e·s comment vous trouver sur Mastodon.
+      share_title: Partager votre profil Mastodon
+      sign_in_action: Se connecter
       subject: Bienvenue sur Mastodon
       title: Bienvenue à bord, %{name} !
   users:
diff --git a/config/locales/fy.yml b/config/locales/fy.yml
index 2fb9f3e4d2956b..ad2c37e23f17c4 100644
--- a/config/locales/fy.yml
+++ b/config/locales/fy.yml
@@ -1837,9 +1837,28 @@ fy:
         silence: Account beheind
         suspend: Account beskoattele
     welcome:
-      edit_profile_action: Profyl ynstelle
-      edit_profile_step: Jo kinne jo profyl oanpasse troch in profylfoto op te laden, jo werjeftenamme oan te passen en mear. Jo kinne it hânmjittich goedkarren fan folgers ynstelle.
+      apps_android_action: Fia Google Play downloade
+      apps_ios_action: Fia de App Store downloade
+      apps_step: Us offisjele apps downloade
+      apps_title: Mastodon-apps
+      edit_profile_action: Personalisearje
+      edit_profile_title: Jo profyl personalisearje
       explanation: Hjir binne inkelde tips om jo op wei te helpen
+      feature_action: Mear ynfo
+      follow_action: Folgje
+      follows_title: Wa te folgjen
+      follows_view_more: Mear minsken om te folgjen besjen
+      hashtags_recent_count: "%{people} minsken yn de ôfrûne %{days} dagen"
+      hashtags_subtitle: Wat der yn de ôfrûne 2 dagen bard is ferkenne
+      hashtags_title: Populêre hashtags
+      hashtags_view_more: Mear populêre hashtags besjen
+      post_action: Opstelle
+      post_step: Sis hallo tsjin de wrâld mei tekst, foto’s, fideo’s of peilingen.
+      post_title: Jo earste berjocht meitsje
+      share_action: Diele
+      share_step: Lit jo freonen witte hoe’t jo te finen binne op Mastodon.
+      share_title: Jo Mastodon-profyl diele
+      sign_in_action: Oanmelde
       subject: Wolkom op Mastodon
       title: Wolkom oan board %{name}!
   users:
diff --git a/config/locales/gd.yml b/config/locales/gd.yml
index ede38df0d9e442..16f046baab8fff 100644
--- a/config/locales/gd.yml
+++ b/config/locales/gd.yml
@@ -505,14 +505,14 @@ gd:
       by_domain: Àrainn
       confirm_purge: A bheil thu cinnteach gu bheil thu airson an dàta on àrainn seo a sguabadh às gu buan?
       content_policies:
-        comment: Nòta taobh a-staigh
+        comment: Nòta
         description_html: "’S urrainn dhut poileasaidhean susbainte a mhìneachadh a thèid a chur an sàs air a h-uile cunntas on àrainn seo ’s a fo-àrainnean-se."
         limited_federation_mode_description_html: "’S urrainn dhut taghadh an ceadaich thu co-nasgadh leis an àrainn seo gus nach ceadaich."
         policies:
-          reject_media: Diùlt meadhanan
-          reject_reports: Diùlt gearanan
-          silence: Cuingich
-          suspend: Cuir à rèim
+          reject_media: A’ diùltadh meadhanan
+          reject_reports: A’ diùltadh gearanan
+          silence: Cuingichte
+          suspend: À rèim
         policy: Poileasaidh
         reason: Adhbhar poblach
         title: Poileasaidhean susbainte
@@ -636,6 +636,7 @@ gd:
       created_at: Chaidh an gearan a dhèanamh
       delete_and_resolve: Sguab às na postaichean
       forwarded: Chaidh a shìneadh air adhart
+      forwarded_replies_explanation: Tha an gearan seo o chleachdaiche cèin agus mu shusbaint chèin. Chaidh a shìneadh air adhart thugad on as e freagairt do neach-cleachdaidh agad-sa a tha san t-susbaint a tha na cois.
       forwarded_to: Chaidh a shìneadh air adhart gu %{domain}
       mark_as_resolved: Cuir comharra gun deach fhuasgladh
       mark_as_sensitive: Cuir comharra gu bheil e frionasach
@@ -782,10 +783,10 @@ gd:
         title: Thoir air falbh ro-aonta nan cleachdaichean air inneacsadh le einnseanan-luirg mar a’ bhun-roghainn
       discovery:
         follow_recommendations: Molaidhean leantainn
-        preamble: Tha tighinn an uachdar susbainte inntinniche fìor-chudromach airson toiseach-tòiseachaidh an luchd-cleachdaidh ùr nach eil eòlach air duine sam bith air Mastodon, ma dh’fhaoidte. Stiùirich mar a dh’obraicheas gleusan an rannsachaidh air an fhrithealaiche agad.
+        preamble: Tha tighinn an uachdar susbainte inntinniche fìor-chudromach airson toiseach-tòiseachaidh an luchd-cleachdaidh ùr nach eil eòlach air duine sam bith air Mastodon, ma dh’fhaoidte. Stiùirich mar a dh’obraicheas gleusan an rùrachaidh air an fhrithealaiche agad.
         profile_directory: Eòlaire nam pròifil
         public_timelines: Loidhnichean-ama poblach
-        publish_discovered_servers: Foillsich na frithealaichean a chaidh a lorg
+        publish_discovered_servers: Foillsich na frithealaichean a chaidh a rùrachadh
         publish_statistics: Foillsich an stadastaireachd
         title: Rùrachadh
         trends: Treandaichean
@@ -794,6 +795,7 @@ gd:
         disabled: Na seall idir
         users: Dhan luchd-chleachdaidh a clàraich a-steach gu h-ionadail
       registrations:
+        moderation_recommandation: Dèan cinnteach gu bheil sgioba maoir deiseil is deònach agad mus fhosgail thu an clàradh dhan a h-uile duine!
         preamble: Stiùirich cò dh’fhaodas cunntas a chruthachadh air an fhrithealaiche agad.
         title: Clàraidhean
       registrations_mode:
@@ -801,6 +803,7 @@ gd:
           approved: Tha aontachadh riatanach airson clàradh
           none: Chan fhaod neach sam bith clàradh
           open: "’S urrainn do neach sam bith clàradh"
+        warning_hint: Mholamaid gun chleachd thu “Tha aontachadh riatanach airson clàradh” mur eil earbsa agad gur urrainn dhan sgioba agad spama agus clàraidhean droch-rùnach a làimhseachadh gu sgiobalta.
       security:
         authorized_fetch: Iarr dearbhadh o fhrithealaichean co-naisgte
         authorized_fetch_hint: Ma dh’iarras tu dearbhadh o fhrithealaichean cho-naisgte, gheibh thu an comas gus bacaidhean èigneachadh nas teinne an dà chuid air ìre an luchd-cleachdaidh ’s an fhrithealaiche. Gidheadh, ceannaichidh tu an comas seo le dèanadas nas miosa is ruigsinn nas lugha nam freagairtean agad agus dh’fhaoidte gun èirich duilgheadasan co-chòrdalachd le cuid a sheirbheisean cho-naisgte. A bharrachd air sin, cha bhac seo an fheadhainn dian o fhaighinn nam postaichean is cunntasan poblach agad.
@@ -1001,6 +1004,9 @@ gd:
       title: Webhooks
       webhook: Webhook
   admin_mailer:
+    auto_close_registrations:
+      body: Ri linn dìth gnìomhachd nam maor o chionn goirid, dh’atharraich Mastodon modh nan clàraidhean aig %{instance} ach am feum cunntasan ùra aontachadh a làimh leis an amas gun dèid %{instance} a dhìon o chleachdadh air dòighean droch-rùnach. ’S urrainn dhut na clàraidhean fhosgladh a-rithist uair sam bith.
+      subject: Feumaidh clàradh le %{instance} aontachadh a-nis
     new_appeal:
       actions:
         delete_statuses: sguabadh às nam postaichean aca
@@ -1076,6 +1082,14 @@ gd:
       hint_html: Dìreach aon rud eile! Feumaidh sinn dearbhadh gu bheil thu daonna (ach am fàg sinn an spama aig an doras!). Fuasgail an CAPTCHA gu h-ìosal is briog air “Lean air adhart”.
       title: Deuchainn tèarainteachd
     confirmations:
+      awaiting_review: Chaidh am post-d agad a dhearbhadh! Nì an sgioba aig %{domain} lèirmheas air a’ chlàradh agad a-nis. Gheibh thu post-d nuair a bhios iad air aontachadh ris a’ chunntas agad!
+      awaiting_review_title: Tha an cunntas agad ’ga sgrùdadh
+      clicking_this_link: briogadh air a’ cheangal seo
+      login_link: clàradh a-steach
+      proceed_to_login_html: "’S urrainn dhut %{login_link} a-nis."
+      redirect_to_app_html: Bu chòir dhuinn d’ ath-stiùireadh gu aplacaid <strong>%{app_name}</strong>. Mur an do dh’obraich sin, feuch %{clicking_this_link} no till dhan aplacaid a làimh.
+      registration_complete: Tha an clàradh agad air %{domain} deiseil a-nis!
+      welcome_title: Fàilte ort, %{name}!
       wrong_email_hint: Mur eil an seòladh puist-d seo mar bu chòir, ’s urrainn dhut atharrachadh ann an roghainnean a’ chunntais.
     delete_account: Sguab às an cunntas
     delete_account_html: Nam bu mhiann leat an cunntas agad a sguabadh às, <a href="%{path}">nì thu an-seo e</a>. Thèid dearbhadh iarraidh ort.
@@ -1409,6 +1423,7 @@ gd:
       '86400': Latha
     expires_in_prompt: Chan ann idir
     generate: Gin ceangal cuiridh
+    invalid: Chan eil an cuireadh dligheach
     invited_by: 'Fhuair thu cuireadh o:'
     max_uses:
       few: "%{count} cleachdaichean"
@@ -1577,7 +1592,7 @@ gd:
     privacy: Prìobhaideachd
     privacy_hint_html: Stiùirich na tha thu airson foillseachadh do chàch. Gheibh daoine lorg air pròifilean inntinneach is deagh aplacaidean a’ brabhsadh cò tha daoine eile a’ leantainn ’s a’ faicinn nan aplacaidean a chleachdas iad airson postadh ach dh’fhaoidte gum b’ fheàrr leat seo a chumail falaichte.
     reach: Ruigse
-    reach_hint_html: Stiùirich am bu mhiann leat gun lorg ’s gun lean daoine ùra thu gus nach bu mhiann. A bheil thu airson ’s gun nochd na postaichean agad air duilleag an rùrachaidh? No gum faic càch thu am measg nam molaidhean leantainn aca? An gabh thu ri luchd-leantainn ùr sam bith gu fèin-obrachail no an cùm thu fhèin smachd air gach neach fa leth?
+    reach_hint_html: Stiùirich am bu mhiann leat gun rùraich ’s gun lean daoine ùra thu gus nach bu mhiann. A bheil thu airson ’s gun nochd na postaichean agad air duilleag an rùrachaidh? No gum faic càch thu am measg nam molaidhean leantainn aca? An gabh thu ri luchd-leantainn ùr sam bith gu fèin-obrachail no an cùm thu fhèin smachd air gach neach fa leth?
     search: Lorg
     search_hint_html: Stiùirich an dòigh air an dèid do lorg. Am bu mhiann leat gun lorg daoine thu leis na phostaich thu gu poblach? Am bu mhiann leat gun lorg daoine taobh a-muigh Mastodon a’ phròifil agad nuair a bhios iad a lorg an lìn? Thoir an aire nach urrainn dhuinn gealladh le cinnt gun dèid am fiosrachadh poblach agad a dhùnadh a-mach gu tur às gach einnsean-luirg poblach.
     title: Prìobhaideachd ’s ruigse
@@ -1587,6 +1602,9 @@ gd:
     errors:
       limit_reached: Ràinig thu crìoch nam freagairtean eadar-dhealaichte
       unrecognized_emoji: "– chan aithne dhuinn an Emoji seo"
+  redirects:
+    prompt: Ma tha earbsa agad sa cheangal seo, briog airson leantainn air adhart.
+    title: Tha thu a’ fàgail %{instance}.
   relationships:
     activity: Gnìomhachd a’ chunntais
     confirm_follow_selected_followers: A bheil thu cinnteach gu bheil thu airson an luchd-leantainn a thagh thu a leantainn?
@@ -1649,6 +1667,7 @@ gd:
       unknown_browser: Brabhsair nach aithne dhuinn
       weibo: Weibo
     current_session: An seisean làithreach
+    date: Ceann-là
     description: "%{browser} air %{platform}"
     explanation: Seo na bhrabhsairean-lìn a tha clàraichte a-staigh sa chunntas Mastodon agad aig an àm seo.
     ip: IP
@@ -1827,16 +1846,27 @@ gd:
     webauthn: Iuchraichean tèarainteachd
   user_mailer:
     appeal_approved:
-      explanation: Chaidh aontachadh ris an ath-thagradh agad air an rabhadh o %{strike_date} a chuir thu a-null %{appeal_date}. Tha deagh chliù air a’ chunntas agad a-rithist.
+      action: Roghainnean a’ chunntais
+      explanation: Chaidh aontachadh ris an ath-thagradh agad air an rabhadh o %{strike_date} a chuir thu a-null %{appeal_date}. Tha an cunntas agad ann an deagh-chor a-rithist.
       subject: Chaidh aontachadh ris an ath-thagradh agad o %{date}
+      subtitle: Tha an cunntas agad ann an deagh-chor a-rithist.
       title: Chaidh aontachadh ri ath-thagradh
     appeal_rejected:
       explanation: Chaidh an t-ath-thagradh agad air an rabhadh o %{strike_date} a chuir thu a-null %{appeal_date} a dhiùltadh.
       subject: Chaidh an t-ath-thagradh agad o %{date} a dhiùltadh
+      subtitle: Chaidh an t-ath-thagradh agad a dhiùltadh.
       title: Chaidh ath-thagradh a dhiùltadh
     backup_ready:
+      explanation: Dh’iarr thu lethbhreac-glèidhidh slàn dhen chunntas Mastodon agad.
+      extra: Tha e deis ri luchdadh a-nuas a-nis!
       subject: Tha an tasg-lann agad deis ri luchdadh a-nuas
       title: Tasg-lann dhut
+    failed_2fa:
+      details: 'Seo mion-fhiosrachadh mun oidhirp air clàradh a-steach:'
+      explanation: Dh’fheuch cuideigin ri clàradh a-steach dhan chunntas agad ach thug iad seachad dàrna ceum mì-dhligheach dhan dearbhadh.
+      further_actions_html: Mur e thu fhèin a bh’ ann, mholamaid gun %{action} sa bhad on a chaidh briseadh a-steach dha ma dh’fhaoidte.
+      subject: Dh’fhàillig dàrna ceum an dearbhaidh
+      title: Dh’fhàillig dàrna ceum an dearbhaidh
     suspicious_sign_in:
       change_password: atharraich thu am facal-faire agad
       details: 'Seo mion-fhiosrachadh mun chlàradh a-steach:'
@@ -1876,9 +1906,42 @@ gd:
         silence: Cunntas cuingichte
         suspend: Cunntas à rèim
     welcome:
-      edit_profile_action: Suidhich a’ phròifil agad
-      edit_profile_step: "’S urrainn dhut a’ phròifil agad a ghnàthachadh is tu a’ luchdadh suas dealbh pròifil, ag atharrachadh d’ ainm-taisbeanaidh is a bharrachd. ’S urrainn dhut lèirmheas a dhèanamh air daoine mus fhaod iad ’gad leantainn ma thogras tu."
+      apps_android_action: Faigh aplacaid air Google Play
+      apps_ios_action: Luchdaich a-nuas aplacaid on App Store
+      apps_step: Luchdaich a-nuas na h-aplacaidean oifigeil againn.
+      apps_title: Aplacaidean Mastodon
+      checklist_subtitle: 'Seo toiseach-tòiseachaidh dhut air an t-saoghal shòisealta ùr:'
+      checklist_title: Liosta-chromagan fàilteachaidh
+      edit_profile_action: Cuir dreach pearsanta air
+      edit_profile_step: Brosnaich an conaltradh a gheibh thu le pròifil shlàn.
+      edit_profile_title: Cuir dreach pearsanta air a’ phròifil agad
       explanation: Seo gliocas no dhà gus tòiseachadh
+      feature_action: Barrachd fiosrachaidh
+      feature_audience: Bheir Mastodon comas sònraichte dhut gun stiùirich thu d’ èisteachd gun eadar-mheadhanaich. Ma ruitheas tu Mastodon air a’ bhun-structar agad fhèin, ’s urrainn dhut frithealaiche Mastodon sam bith a leantainn air loidhne ’s an caochladh agus cha bhi smachd aig duine sam bith air ach agad fhèin.
+      feature_audience_title: Stèidhich d’ èisteachd le misneachd
+      feature_control: Chan eil duine sam bith nas eòlaiche air na bu mhiann leat fhaicinn air do dhachaigh na thu fhèin. Cha chaith algairim no sanasachd d’ ùine. Lean duine sam bith air frithealaiche Mastodon sam bith on aon chunntas agus faigh na postaichean aca ann an òrdugh na h-ama agus cuir dreach nas pearsanta air an oisean agad-sa dhen eadar-lìon.
+      feature_control_title: Cùm smachd air an loidhne-ama agad
+      feature_creativity: Cuiridh Mastodon taic ri postaichean le faidhlichean fuaime, videothan is dealbhan, tuairisgeulan so-ruigsinneachd, cunntasan-bheachd, rabhaidhean susbainte, avataran beòthaichte, emojis gnàthaichte, smachd air bearradh nan dealbhagan is mòran a bharrachd ach an cuir thu do bheachdan an cèill air loidhne. Ge b’ e a bheil thu a’ foillseachadh an obair-ealain, an ceòl no am pod-chraoladh agad, tha Mastodon ri làimh dhut.
+      feature_creativity_title: Cho cruthachail ’s a ghabhas
+      feature_moderation: Cuiridh Mastodon na co-dhùnaidhean ’nad làmhan fhèin. Cruthaichidh gach frithealaiche na riaghailtean aige fhèin a thèid a chur an gnìomh gu h-ionadail seach on àirde mar a thachras air meadhanan sòisealta corporra agus mar sin dheth, ’s urrainnear freagairt gu sùbailte do dh’fheumalachdan choimhearsnachdan eadar-dhealaichte. Faigh ballrachd air frithealaiche far a bheil thu ag aontachadh ris na riaghailtean ann no òstaich fear agad fhèin.
+      feature_moderation_title: Maorsainneachd mar gu chòir
+      follow_action: Lean
+      follow_step: Tha leantainn dhaoine inntinneach air cridhe Mhastodon.
+      follow_title: Cuir dreach pearsanta air do dhachaigh
+      follows_subtitle: Lean cunntasan cliùiteach
+      follows_title: Cò a leanas tu
+      follows_view_more: Seall barrachd dhaoine ri leantainn
+      hashtags_recent_count: 'Daoine sna %{days} là(ithean) seo chaidh: %{people}'
+      hashtags_subtitle: Rùraich na tha a’ treandadh san 2 latha seo chaidh
+      hashtags_title: Tagaichean hais a’ treandadh
+      hashtags_view_more: Seall barrachd thagaichean hais a’ treandadh
+      post_action: Sgrìobh
+      post_step: Cuir an aithne air an t-saoghal le teacsa, dealbhan, videothan no cunntasan-bheachd.
+      post_title: Cruthaich a’ chiad phost agad
+      share_action: Co-roinn
+      share_step: Leig fios dha do charaidean mar a gheibh iad grèim ort air Mastodon.
+      share_title: Co-roinn a’ phròifil Mastodon agad
+      sign_in_action: Clàraich a-steach
       subject: Fàilte gu Mastodon
       title: Fàilte air bòrd, %{name}!
   users:
@@ -1886,6 +1949,7 @@ gd:
     go_to_sso_account_settings: Tadhail air roghainnean cunntas solaraiche na dearbh-aithne agad
     invalid_otp_token: Còd dà-cheumnach mì-dhligheach
     otp_lost_help_html: Ma chaill thu an t-inntrigeadh dhan dà chuid diubh, ’s urrainn dhut fios a chur gu %{email}
+    rate_limited: Cus oidhirpean dearbhaidh, feuch ris a-rithist an ceann greis.
     seamless_external_login: Rinn thu clàradh a-steach le seirbheis on taobh a-muigh, mar sin chan eil roghainnean an fhacail-fhaire ’s a’ phuist-d ri làimh dhut.
     signed_in_as: 'Chlàraich thu a-steach mar:'
   verification:
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index c3d0f1d99ae5fa..a6543005b2bf57 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -1842,9 +1842,42 @@ gl:
         silence: Conta limitada
         suspend: Conta suspendida
     welcome:
-      edit_profile_action: Configurar perfil
-      edit_profile_step: Podes personalizar o teu perfil subindo unha imaxe de perfil, cambiar o nome público e moito máis. Podes elexir revisar as solicitudes de seguimento recibidas antes de permitirlles que te sigan.
+      apps_android_action: Descarga desde Google Play
+      apps_ios_action: Descarga desde App Store
+      apps_step: Descarga as apps oficiais.
+      apps_title: Apps de Mastodon
+      checklist_subtitle: 'Ímoste guiar no comezo nesta nova experiencia social:'
+      checklist_title: Lista de comprobación
+      edit_profile_action: Personalizar
+      edit_profile_step: Aumenta as túas interaccións grazas a un perfil descriptivo.
+      edit_profile_title: Personaliza o teu perfil
       explanation: Aquí tes algunhas endereitas para ir aprendendo
+      feature_action: Saber máis
+      feature_audience: Mastodon dache a oportunidade de xestionar sen intermediarios as túas relacións. Incluso se usas o teu propio servidor Mastodon poderás seguir e ser seguida desde calquera outro servidor Mastodon conectado á rede e estará baixo o teu control exclusivo.
+      feature_audience_title: Crea a túa audiencia con tranquilidade
+      feature_control: Sabes mellor ca ninguén o que queres ver na cronoloxía. Non hai algoritmos nin publicidade facéndoche perder o tempo. Segue cunha soa conta a outras persoas en servidores Mastodon diferentes ao teu, recibirás as publicacións en orde cronolóxica, e farás deste curruchiño de internet un lugar para ti.
+      feature_control_title: Tes o control da túa cronoloxía
+      feature_creativity: Mastodon ten soporte para audio, vídeo e imaxes nas publicacións, descricións para mellorar a accesibilidade, enquisas, avisos sobre o contido, avatares animados, emojis personalizados, control sobre o recorte de miniaturas, e moito máis, para axudarche a expresarte en internet. Tanto se publicas o teu arte, música ou podcast, Mastodon está aquí para ti.
+      feature_creativity_title: Creatividade incomparable
+      feature_moderation: Mastodon pon nas túas mans a toma de decisións. Cada servidor crea as súas propia regras e normas, que son de cumprimento nel e non impostas como nos medios sociais corporativos, facéndoo máis flexible e respondendo ás necesidades dos diferentes grupos de persoas. Únete a un servidor con normas que compartes, ou instala o teu propio servidor.
+      feature_moderation_title: A moderación tal como debe ser
+      follow_action: Seguir
+      follow_step: Mastodon consiste en seguir a persoas interesantes.
+      follow_title: Personaliza a túa cronoloxía
+      follows_subtitle: Sigue estas contas populares
+      follows_title: A quen seguir
+      follows_view_more: Ver máis persoas para seguir
+      hashtags_recent_count: "%{people} persoas nos últimos %{days} días"
+      hashtags_subtitle: Descubre os temas en voga nos últimos 2 días
+      hashtags_title: Cancelos en voga
+      hashtags_view_more: Ver máis cancelos en voga
+      post_action: Escribir
+      post_step: Saúda a todo o mundo con texto, fotos, vídeos ou enquisas.
+      post_title: Escribe a túa primeira publicación
+      share_action: Compartir
+      share_step: Dille ás amizades como poden atoparte en Mastodon.
+      share_title: Comparte o teu perfil en Mastodon
+      sign_in_action: Acceder
       subject: Benvida a Mastodon
       title: Benvida, %{name}!
   users:
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 766a6537731129..59f562c2c94715 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -1906,9 +1906,42 @@ he:
         silence: חשבון מוגבל
         suspend: חשבון מושעה
     welcome:
-      edit_profile_action: הגדרת פרופיל
-      edit_profile_step: תוכל.י להתאים אישית את הפרופיל באמצעות העלאת יצגן (אוואטר), כותרת, שינוי כינוי ועוד. אם תרצה.י לסקור את עוקביך/ייך החדשים לפני שתרשה.י להם לעקוב אחריך/ייך.
+      apps_android_action: זמין ב־Google Play
+      apps_ios_action: זמין ב־App Store
+      apps_step: התקינו את היישומונים הרשמיים.
+      apps_title: יישומונים של מסטודון
+      checklist_subtitle: 'נעזור לך לצאת למסע אל האופק החברתי החדש:'
+      checklist_title: רשימת פריטים לקבלת הפנים
+      edit_profile_action: התאמה אישית
+      edit_profile_step: כדאי להשלים את הפרופיל כדי לעודד אחרים ליצירת קשר.
+      edit_profile_title: התאמה אישית של הפרופיל
       explanation: הנה כמה טיפים לעזור לך להתחיל
+      feature_action: מידע נוסף
+      feature_audience: מסטודון מספקת לך אפשרות ייחודית של ניהול הקהל ללא מתווכים. מסטודון מותקן על שרת משלך יאפשר לך לעקוב ולהעקב מכל שרת מסטודון ברשת בשליטתך הבלעדית.
+      feature_audience_title: בנו את הקהל שלכםן בבטחה
+      feature_control: אתםן יודעיםות בדיוק מה תרצו לראות בפיד הבית. אין פה פרסומות ואלגוריתמים שיבזבזו את זמנכם. עקבו אחרי כל משתמשי מסטודון משלל שרתים מתוך חשבון אחד וקבלו את ההודעות שלהםן לפי סדר הפרסום, וכך תצרו לכם את פינת האינטרנט המתאימה לכן אישית.
+      feature_control_title: השארו בשליטה על ציר הזמן שלכם
+      feature_creativity: מסטודון תומך בהודעות עם שמע, חוזי ותמונות, עם תאורים למוגבלי ראייה, משאלים, אזהרות תוכן, אווטרים מונפשים, אמוג'י מותאמים אישית, שליטה בחיתוך תמונות מוקטנות ועוד, כדי שתוכלו לבטא את עצמכןם ברשת. בין אם תפרסמו אמנות, מוזיקה או פודקסטים אישיים, מסטודון פה בשבילכם.
+      feature_creativity_title: יצירתיות ללא פשרות
+      feature_moderation: מסטודון מחזיר לידיכן את ההחלטות. כל שרת יוצר לעצמו את חוקיו, שנאכפים מקומית ולא "מלמעלה" כמו באתרים מסחריים, מה שהופך אותו לגמיש ביותר בשירות הרצונות והצרכים של קבוצות שונות. הצטרפו לשרת שאתםן מסכימותים עם חוקיו, או הקימו משלכןם.
+      feature_moderation_title: ניהול דיונים כמו שצריך
+      follow_action: לעקוב
+      follow_step: עקיבה אחרי אנשים מעניינים זו מטרתו של מסטודון.
+      follow_title: התאימו אישית את ציר זמן הבית שלכםן
+      follows_subtitle: לעקיבה אחרי חלשבונות ידועים
+      follows_title: אחרי מי לעקוב
+      follows_view_more: ראו עוד א.נשים לעקוב אחריהן.ם
+      hashtags_recent_count: "%{people} אנשים ב־%{days} ימים"
+      hashtags_subtitle: לחקור מהם הנושאים החמים ביומיים האחרונים
+      hashtags_title: תגיות חמות
+      hashtags_view_more: צפיה בעוד תגיות שכרגע חוזרות הרבה
+      post_action: חיבור הודעה
+      post_step: ברכו לשלום את העולם עם מלל, תמונות, חוזי או משאלים.
+      post_title: כתבו את הפוסט הראשון שלכםן
+      share_action: שיתוף
+      share_step: ספרו לחברים איך למצוא אתכם במסטודון.
+      share_title: שיתוף פרופיל מסטודון
+      sign_in_action: התחברות
       subject: ברוכים הבאים למסטודון
       title: ברוך/ה הבא/ה, %{name} !
   users:
diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index 4f6cdf480fcc98..c5020f6f9f665b 100644
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -251,7 +251,6 @@ hr:
         silence: Račun je ograničen
         suspend: Račun je suspendiran
     welcome:
-      edit_profile_action: Postavi profil
       subject: Dobro došli na Mastodon
   users:
     invalid_otp_token: Nevažeći dvo-faktorski kôd
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 00566514c91156..76fef4633aada4 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -1842,9 +1842,42 @@ hu:
         silence: Lekorlátozott fiók
         suspend: Felfüggesztett fiók
     welcome:
-      edit_profile_action: Készítsd el profilod
-      edit_profile_step: Testreszabhatod a profilod egy profilkép feltöltésével, a megjelenített neved megváltoztatásával és így tovább. Bekapcsolhatod az új követőid jóváhagyását, mielőtt követhetnek.
+      apps_android_action: Beszerzés a Google Play-en
+      apps_ios_action: Letöltés az App Store-ból
+      apps_step: Hivatalos alkalmazásaink letöltése.
+      apps_title: Mastodon alkalmazások
+      checklist_subtitle: 'Indulás a közösségi érintkezés új élvonalába:'
+      checklist_title: Üdvözlő ellenőrzőlista
+      edit_profile_action: Személyre szabás
+      edit_profile_step: Növeld az interakciószámot egy átfogó profillal.
+      edit_profile_title: Profil testreszabása
       explanation: Néhány tipp a kezdeti lépésekhez
+      feature_action: További információk
+      feature_audience: A Mastodon egyedülálló lehetőséget biztosít arra, hogy közvetítők nélkül kezeld a közönségedet. A saját infrastruktúrádra telepített Mastodon lehetővé teszi, hogy kövess másokat, és ők is tudjanak követni bármely más online Mastodon-kiszolgálóról, és ez ne legyen saját magadon kívül senki más irányítása alatt.
+      feature_audience_title: Építsd magabiztosan a közönségedet
+      feature_control: Te tudod legjobban, hogy mit szeretnél látni a kezdőlapodon. Nincsenek algoritmusok vagy reklámok, melyek pazarolnák az idődet. Kövess bárkit, bármelyik Mastodon-kiszolgálón, egyetlen fiókkal, és fogadd a bejegyzéseiket időrendi sorrendben, így a saját ízlésednek tetszővé teheted az internet egy kis szegletét.
+      feature_control_title: Vedd kézbe az idővonalad feletti irányítást
+      feature_creativity: A Mastodon támogatja a hangot, a videót és a képeket tartalmazó bejegyzéseket, az akadálymentesítési leírásokat, a szavazásokat, a tartalmi figyelmeztetéseket, az animált profilképeket, az egyéni emodzsikat, a bélyegképek körbevágását és még több mindent, hogy segítsen az online önkifejezésben. Tegyél közzé műalkotásokat, zenét vagy podcastet, a Mastodonra számíthatsz.
+      feature_creativity_title: Páratlan kreativitás
+      feature_moderation: A Mastodon visszaadja a döntést a te kezedbe. Minden kiszolgáló saját szabályokkal rendelkezik, melyeket helyben tartatnak be, és nem központilag, mint a céges közösségi médiánál, így a lehető legrugalmasabban lehet válaszolni emberek különböző csoportjainak igényeire. Csatlakozz egy kiszolgálóhoz, melynek egyetértesz a szabályaival, vagy készíts egy sajátot.
+      feature_moderation_title: Moderálás, ahogy annak lennie kell
+      follow_action: Követés
+      follow_step: A Mastodon az érdekes emberek követéséről szól.
+      follow_title: Saját hírfolyam testreszabása
+      follows_subtitle: Jól ismert fiókok követése
+      follows_title: Kit érdemes követni
+      follows_view_more: További követendő személyek megtekintése
+      hashtags_recent_count: "%{people} személy az elmúlt %{days} napban"
+      hashtags_subtitle: Fedezd fel, mi felkapott az elmúlt 2 napban
+      hashtags_title: Felkapott hashtagek
+      hashtags_view_more: További felkapott hashtagek megtekintése
+      post_action: Bejegyzés írása
+      post_step: Köszöntsd a világot szöveggel, fotókkal, videókkal vagy szavazásokkal.
+      post_title: Az első bejegyzés létrehozása
+      share_action: Megosztás
+      share_step: Tudasd az ismerőseiddel, hogyan találhatnak meg a Mastodonon.
+      share_title: Oszd meg a Mastodon profilodat
+      sign_in_action: Bejelentkezés
       subject: Üdvözöl a Mastodon
       title: Üdv a fedélzeten, %{name}!
   users:
diff --git a/config/locales/hy.yml b/config/locales/hy.yml
index d870f5073c38d7..4125c1110e1af3 100644
--- a/config/locales/hy.yml
+++ b/config/locales/hy.yml
@@ -873,7 +873,6 @@ hy:
         silence: Հաշիւը սահմանափակուած է
         suspend: Հաշիւը արգելափակուած է
     welcome:
-      edit_profile_action: Կարգաւորել հաշիւը
       subject: Բարի գալուստ Մաստոդոն
       title: Բարի գալուստ նաւամատոյց, %{name}
   users:
diff --git a/config/locales/id.yml b/config/locales/id.yml
index a32ee8407a1ae1..1655b744ff5715 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -1556,8 +1556,6 @@ id:
         silence: Akun dibatasi
         suspend: Akun ditangguhkan
     welcome:
-      edit_profile_action: Siapkan profil
-      edit_profile_step: Anda dapat mengubah profil Anda dengan mengunggah sebuah foto profil, mengubah nama tampilan Anda dan lain-lain. Anda dapat memilih untuk meninjau pengikut baru sebelum mereka diperbolehkan untuk mengikuti Anda.
       explanation: Beberapa tips sebelum Anda memulai
       subject: Selamat datang di Mastodon
       title: Selamat datang, %{name}!
diff --git a/config/locales/ie.yml b/config/locales/ie.yml
index 55aba94d180901..222b82ba8080ce 100644
--- a/config/locales/ie.yml
+++ b/config/locales/ie.yml
@@ -1842,9 +1842,42 @@ ie:
         silence: Conto limitat
         suspend: Conto suspendet
     welcome:
-      edit_profile_action: Configuration de profil
-      edit_profile_step: Tu posse personalisar tui profil por cargar un profil-image, changear tui monstrat nómine e plu. Tu posse optar tractar nov sequitores ante que ili es permisset sequer te.
+      apps_android_action: Obtener it sur Google Play
+      apps_ios_action: Descargar sur li App Store
+      apps_step: Descargar nor aplis oficial.
+      apps_title: Aplis de Mastodon
+      checklist_subtitle: 'Lass nos auxiliar te comensar sur ti-ci frontiera social:'
+      checklist_title: Lista de benevenit
+      edit_profile_action: Personalisar
+      edit_profile_step: Agranda tui interactiones per un profil detalliat.
+      edit_profile_title: Personalisar tui profil
       explanation: Vi quelc suggestiones por que tu mey comensar
+      feature_action: Aprender plu
+      feature_audience: Mastodon te da un possibilitá unic de administrar tui audientie sin intervenitores. Mastodon, desplegat che tui propri servitor, permisse que tu sequeye e esseye sequet de quelcunc altri Mastodon-servitores in li internet, e ne es controlat de quicunc quam tu.
+      feature_audience_title: Agrandar tui audientie in confidentie
+      feature_control: Tu save max bon ti quel tu vole vider sur tui initial témpor-linea. Null algoritmes o reclames por prodigar tui témpor. Seque quicunc che quelcunc Mastodon-servitor de un singul conto e recive lor postas in órdine cronologic, e fa que tui parte del internet esseye un poc plu quam tu.
+      feature_control_title: Resta in control de tui propri témpor-linea
+      feature_creativity: Mastodon permisse postas con audio, video e images, descriptiones de accessibilitá, avises de contenete, animat profil-images, personalisat emojis, control del acurtation de images de previse, a plu, por auxiliar te expresser te. Si tu publica tui art, tui musica, o tui podcast, Mastodon va apoyar te.
+      feature_creativity_title: Ínparalelat creativitá
+      feature_moderation: Mastodon retromette li potentie de far decisiones in tui manus. Chascun servitor crea su propri regules, queles es infortiat localmen e ne universalmen quam che social medies corporat, dunc it es li max flexibil pri responder al besones de diferent gruppes de gente. Adhere a un servitor con regules con queles tu concorda, o mantene tui propri.
+      feature_moderation_title: Moderandi moderation
+      follow_action: Sequer
+      follow_step: Sequer interessant gente es to quo importa in Mastodon.
+      follow_title: Personalisar tui hemal témpor-linea
+      follows_subtitle: Sequer famosi contos
+      follows_title: Persones a sequer
+      follows_view_more: Vider plu persones a sequer
+      hashtags_recent_count: "%{people} persones in li passat %{days} dies"
+      hashtags_subtitle: Explorar li postas de tendentie durant li passat 2 dies
+      hashtags_title: Populari hashtags
+      hashtags_view_more: Vider plu hashtags in tendentie
+      post_action: Composir
+      post_step: Saluta li munde con textu, images, videos o balotationes.
+      post_title: Crear tui unesim posta
+      share_action: Compartir
+      share_step: Informar tui amics qualmen trovar te che Mastodon.
+      share_title: Partir tui profil Mastodon
+      sign_in_action: Intrar
       subject: Benevenit a Mastodon
       title: Benevenit, %{name}!
   users:
diff --git a/config/locales/io.yml b/config/locales/io.yml
index e85641b9237112..32769effa4dbf5 100644
--- a/config/locales/io.yml
+++ b/config/locales/io.yml
@@ -1795,8 +1795,6 @@ io:
         silence: Konto limitizesis
         suspend: Konto restriktigesis
     welcome:
-      edit_profile_action: Facez profilo
-      edit_profile_step: Vu povas kustumizar vua profilo per adchargar profilimajo, chanjesar vua montronomo e plue. Vu povas selektas kontrolar nova sequanti ante oli permisesas sequar vu.
       explanation: Subo esas guidilo por helpar vu komencar
       subject: Bonveno a Mastodon
       title: Bonveno, %{name}!
diff --git a/config/locales/is.yml b/config/locales/is.yml
index 771ed2fbf1fc7b..df0391bfa3ea7b 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -1846,9 +1846,42 @@ is:
         silence: Notandaaðgangur takmarkaður
         suspend: Notandaaðgangur í frysti
     welcome:
-      edit_profile_action: Setja upp notandasnið
-      edit_profile_step: Þú getur sérsniðið notandasniðið þitt með því að setja inn auðkennismynd þína, breyta birtingarnafninu þínu og ýmislegt fleira. Þú getur valið að yfirfara nýja fylgjendur áður en þú leyfir þeim að fylgjast með þér.
+      apps_android_action: Fáðu það á Google Play
+      apps_ios_action: Sækja í App Store
+      apps_step: Sæktu opinberu forritin okkar.
+      apps_title: Mastodon-forrit
+      checklist_subtitle: 'Komum þér í gang á þessum nýja samfélagsmiðli:'
+      checklist_title: Til minnis í upphafi
+      edit_profile_action: Sérsníða
+      edit_profile_step: Annað fólk er líklegra til að eiga samskipti við þig ef þý setur einhverjar áhugaverðar upplýsingar í notandasniðið þitt.
+      edit_profile_title: Sérsníddu notandasniðið þitt
       explanation: Hér eru nokkrar ábendingar til að koma þér í gang
+      feature_action: Kanna nánar
+      feature_audience: Mastodon gefur þér einstakt tækifæri til að eiga í samskiptum við áhorfendur þína milliliðalaust. Mastodon-netþjónn sem settur er upp á þínu eigin kerfi er ekki undir neins stjórn nema þinnar og gerir þér kleift að fylgjast með og eiga fylgjendur á hverjum þeim Mastodon-netþjóni sem er tengdur við internetið.
+      feature_audience_title: Byggðu upp orðspor þitt og áheyrendafjölda
+      feature_control: Þú veist best hvað þú vilt sjá í heimastreyminu þínu. Engin reiknirit eða auglýsingar að þvælast fyrir. Fylgstu af einum aðgangi með hverjum sem er á milli Mastodon-netþjóna og fáðu færslurnar þeirra í tímaröð, þannig geturðu útbúið þitt eigið lítið horn á internetinu þar sem hlutirnir eru að þínu skapi.
+      feature_control_title: Hafðu stjórn á þinni eigin tímalínu
+      feature_creativity: Mastodon styður færslur með hljóði, myndum og myndskeiðum, lýsingum fyrir aukið aðgengi, kannanir, aðvörunum vegna efnis, hreyanlegum auðkennismyndum, sérsniðnum tjáningartáknum, utanskurði smámynda ásamt fleiru; til að hjálpa þér við að tjá þig á netinu. Hvort sem þú sért að gefa út listina þína, tónlist eða hlaðvarp, þá er Mastodon til staðar fyrir þig.
+      feature_creativity_title: Óviðjafnanleg sköpunargleði
+      feature_moderation: Mastodon setur ákvarðanatökur aftur í þínar hendur. Hver netþjónn býr til sínar eigin reglur og venjur, sem gilda fyrir þann netþjón en eru ekki boðaðar með valdi að ofan og niður líkt og á samfélagsnetum stórfyrirtækja. Á þennan hátt svarar samfélagsmiðillinn þörfum mismunandi hópa. Taktu þátt á netþjóni með reglum sem þú samþykkir, eða hýstu þinn eigin.
+      feature_moderation_title: Umsjón með efni eins og slík á að vera
+      follow_action: Fylgjast með
+      follow_step: Að fylgjast með áhugaverðu fólki er það sem Mastodon snýst um.
+      follow_title: Aðlagaðu heimastreymið þitt eftir þínu höfði
+      follows_subtitle: Fylgstu með vel þekktum notendum
+      follows_title: Hverjum ætti að fylgjast með
+      follows_view_more: Skoða fleira fólk til að fylgjast með
+      hashtags_recent_count: "%{people} manns á síðustu %{days} dögum"
+      hashtags_subtitle: Skoðaðu hvað sé búið að vera í umræðunni síðustu 2 dagana
+      hashtags_title: Vinsæl myllumerki
+      hashtags_view_more: Sjá fleiri vinsæl myllumerki
+      post_action: Skrifa
+      post_step: Heilsaðu heiminum með texta, ljósmyndum, myndskeiðum eða könnunum.
+      post_title: Gerðu fyrstu færsluna þína
+      share_action: Deila
+      share_step: Láttu vini þína vita hvernig þeir geta fundið þig á Mastodon.
+      share_title: Deildu notandasniðinu þínu
+      sign_in_action: Skrá inn
       subject: Velkomin í Mastodon
       title: Velkomin/n um borð, %{name}!
   users:
diff --git a/config/locales/it.yml b/config/locales/it.yml
index d85f0359d190f4..64015bd98d54dc 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -1844,9 +1844,42 @@ it:
         silence: Account limitato
         suspend: Account sospeso
     welcome:
-      edit_profile_action: Configura profilo
-      edit_profile_step: Puoi personalizzare il tuo profilo caricando un'immagine del profilo, cambiare il tuo nome e altro ancora. Puoi scegliere di esaminare i nuovi seguaci prima che loro siano autorizzati a seguirti.
+      apps_android_action: Scaricalo da Google Play
+      apps_ios_action: Scarica dall'App Store
+      apps_step: Scarica le nostre app ufficiali.
+      apps_title: App di Mastodon
+      checklist_subtitle: 'Iniziamo su questa nuova frontiera sociale:'
+      checklist_title: Lista di controllo di Benvenuto
+      edit_profile_action: Personalizza
+      edit_profile_step: Gli altri hanno maggiori probabilità di interagire con te se completi il tuo profilo.
+      edit_profile_title: Personalizza il tuo profilo
       explanation: Ecco alcuni suggerimenti per iniziare
+      feature_action: Scopri di più
+      feature_audience: Mastodon ti offre una possibilità unica di gestire il tuo pubblico senza intermediari. Mastodon, distribuito sulla tua stessa infrastruttura, ti permette di seguire e di essere seguito da qualsiasi altro server Mastodon online, e non è controllato da nessun altro, eccetto te.
+      feature_audience_title: Costruisci il tuo pubblico in sicurezza
+      feature_control: Tu sai cosa sia meglio vedere sul tuo home feed. Nessun algoritmo o annunci che sprechino il tuo tempo. Segui chiunque attraverso qualsiasi server Mastodon da un singolo account e ricevi i loro messaggi in ordine cronologico, e rendi il tuo angolo di internet un po' più come te.
+      feature_control_title: Rimani in controllo della tua timeline
+      feature_creativity: Mastodon supporta audio, filmati e post, descrizioni di accessibilità, sondaggi, avvisi di contenuto, avatar animati, emoji personalizzate, controllo del ritaglio delle miniature e altro ancora, per aiutarti a esprimerti online. Che tu stia pubblicando la tua arte, la tua musica o il tuo podcast, Mastodon è lì per te.
+      feature_creativity_title: Creatività senza precedenti
+      feature_moderation: Mastodon rimette il processo decisionale nelle tue mani. Ogni server crea le proprie regole che vengono applicate localmente e non dall'alto verso il basso come i social media aziendali, rendendo più flessibile il rispondere alle esigenze di diversi gruppi di persone. Unisciti a un server con regole con cui sei d'accordo o ospita il tuo.
+      feature_moderation_title: Moderazione come dovrebbe essere
+      follow_action: Segui
+      follow_step: Seguire persone interessanti è ciò che fa Mastodon.
+      follow_title: Personalizza il tuo home feed
+      follows_subtitle: Segui account ben noti
+      follows_title: Chi seguire
+      follows_view_more: Visualizza più persone da seguire
+      hashtags_recent_count: "%{people} persone negli ultimi %{days} giorni"
+      hashtags_subtitle: Esplora le tendenze degli ultimi 2 giorni
+      hashtags_title: Hashtag di tendenza
+      hashtags_view_more: Visualizza altri hashtag di tendenza
+      post_action: Scrivi
+      post_step: Salutate il mondo con testo, foto, video o sondaggi.
+      post_title: Scrivi il tuo primo post
+      share_action: Condividi
+      share_step: Fai sapere ai tuoi amici come trovarti su Mastodon.
+      share_title: Condividi il tuo profilo Mastodon
+      sign_in_action: Accedi
       subject: Benvenuto/a su Mastodon
       title: Benvenuto a bordo, %{name}!
   users:
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 15e66631f55061..ae5203baee9778 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -1810,11 +1810,42 @@ ja:
         silence: アカウントがサイレンスにされました
         suspend: アカウントが停止されました
     welcome:
-      edit_profile_action: プロフィールを設定
-      edit_profile_step: |-
-        プロフィール画像をアップロードしたり、表示名を変更したりして、プロフィールをカスタマイズできます。
-        新しいフォロワーからフォローリクエストを承認する前に、オプトインで確認できます。
+      apps_android_action: Google Play で手に入れよう
+      apps_ios_action: App Store からダウンロード
+      apps_step: 公式アプリのダウンロード
+      apps_title: Mastodon アプリ
+      checklist_subtitle: 新世代のSNSが始まります
+      checklist_title: 最初のステップはここから
+      edit_profile_action: プロフィール設定
+      edit_profile_step: ほかのユーザーが親しみやすいように、プロフィールを整えましょう。
+      edit_profile_title: プロフィールを設定しましょう
       explanation: 始めるにあたってのアドバイスです
+      feature_action: もっと詳しく
+      feature_audience: Mastodonでは、誰の仲介もなく、あなた自身でオーディエンスの管理を行うことができます。あなたのインフラストラクチャー上にデプロイされたMastodon上でも、ほかのどんなMastodonサーバーのアカウントをフォローすることも、フォローされることもでき、それらはもちろんあなた自身で制御できます。
+      feature_audience_title: 自信を持ってオーディエンスを構築
+      feature_control: ホームフィードで見たいものは、あなたが一番よく知っています。時間を無駄にするアルゴリズムや広告はありません。ひとつのアカウントからすべてのMastodonサーバーの投稿を時系列で受け取り、インターネットの隅っこをもう少しあなたらしくしましょう。
+      feature_control_title: 自分のタイムラインを管理
+      feature_creativity: Mastodonでは、自己表現を多様にするため、音声・動画・画像の投稿や、アクセシビリティ用説明、投票・コンテンツ警告・動くアバター・カスタム絵文字・サムネイル切り抜き設定などをサポートしています。アートや音楽、ポッドキャストを投稿したいあなたにもMastodonはピッタリです。
+      feature_creativity_title: 比類なきクリエイティビティ
+      feature_moderation: Mastodonでは意思決定はあなたの手にあります。それぞれのサーバーで適用されるルールや規則を策定できます。これらは、企業運営のソーシャルメディアとは違いサーバー単位でローカルに適用されるため、さまざまなグループのニーズに最も柔軟に対応することができるのです。
+      feature_moderation_title: サーバー運営をあるべき姿で
+      follow_action: フォロー
+      follow_step: ユーザーをフォローしてみましょう。これがMastodonを楽しむ基本です。
+      follow_title: 自分のホームタイムラインを作る
+      follows_subtitle: 人気アカウントをフォロー
+      follows_title: フォローを増やしてみませんか？
+      follows_view_more: フォローするユーザーを探す
+      hashtags_recent_count: "%{days} 日間で %{people} 人が共有"
+      hashtags_subtitle: 過去2日間のトレンドを見る
+      hashtags_title: トレンドのハッシュタグ
+      hashtags_view_more: トレンドのハッシュタグをもっと見る
+      post_action: 作成
+      post_step: 試しになにか書いてみましょう。写真、ビデオ、アンケートなど、なんでも大丈夫です.
+      post_title: はじめての投稿
+      share_action: 共有
+      share_step: Mastodon アカウントをほかの人に紹介しましょう。
+      share_title: プロフィールをシェアする
+      sign_in_action: ログイン
       subject: Mastodonへようこそ
       title: ようこそ、%{name}さん！
   users:
diff --git a/config/locales/ka.yml b/config/locales/ka.yml
index 1b3d48810ee488..74b86346002279 100644
--- a/config/locales/ka.yml
+++ b/config/locales/ka.yml
@@ -470,7 +470,6 @@ ka:
       subject: თქვენი არქივი გადმოსაწერად მზადაა
       title: არქივის მიღება
     welcome:
-      edit_profile_action: პროფილის მოწყობა
       explanation: აქ რამდენიმე რჩევაა დასაწყისისთვის
       subject: კეთილი იყოს თქვენი მობრძანება მასტოდონში
       title: კეთილი იყოს თქვენი მობრძანება, %{name}!
diff --git a/config/locales/kab.yml b/config/locales/kab.yml
index d278c15c93f467..b25a4e3a1d0fa4 100644
--- a/config/locales/kab.yml
+++ b/config/locales/kab.yml
@@ -61,7 +61,7 @@ kab:
       invite_request_text: Timental n tmerna
       invited_by: Inced-it-id
       ip: Tansa IP
-      joined: Ikcemed deg
+      joined: Izeddi da seg ass n
       location:
         all: Akk
         local: Adigan
@@ -95,6 +95,7 @@ kab:
       remove_header: Kkes tacacit
       resend_confirmation:
         already_confirmed: Amseqdac-agi yettwasentem yakan
+        send: Ɛawed-iyi-d aseɣwen n usentem
       reset: Wennez
       reset_password: Beddel awal uffir
       resubscribe: Ales ajerred
@@ -229,6 +230,7 @@ kab:
       enable: Rmed
       enabled: Yermed
       enabled_msg: Imuji yermed mebla ugur
+      image_hint: PNG neɣ GIF arma d %{size}
       list: Tabdart
       new:
         title: Timerna n imuji udmawan amaynut
@@ -279,6 +281,8 @@ kab:
         create: Rnu taɣult
         title: Timerna n taɣult tamaynut n imayl ɣer tebdart taberkant
       title: Tabdart taberkant n imayl
+    export_domain_blocks:
+      no_file: Ulac afaylu yettwafernen
     follow_recommendations:
       language: I tutlayt
       status: Addad
@@ -290,6 +294,8 @@ kab:
       by_domain: Taɣult
       content_policies:
         policy: Tasertit
+      dashboard:
+        instance_languages_dimension: Tutlayin ifazen
       delivery:
         all: Akk
         clear: Sfeḍ tuccḍiwin n usiweḍ
@@ -409,6 +415,7 @@ kab:
         modes:
           none: Yiwen·t ur yzmir ad izeddi
           open: Zemren akk ad jerden
+      title: Iɣewwaṛen n uqeddac
     site_uploads:
       delete: Kkes afaylu yulin
     software_updates:
@@ -421,15 +428,22 @@ kab:
       language: Tutlayt
       media:
         title: Amidya
+      open: Ldi tasuffeɣt
       title: Tisuffaɣ n umiḍan
       trending: Ayen mucaɛen
       visibility: Abani
       with_media: S umidya
+    system_checks:
+      rules_check:
+        action: Sefrek ilugan n uqeddac
     title: Tadbelt
     trends:
       allow: Sireg
       statuses:
         title: Tisuffaɣ mucaɛen
+      tags:
+        dashboard:
+          tag_languages_dimension: Tutlayin ifazen
       trending: Ayen mucaɛen
     warning_presets:
       add_new: Rnu amaynut
@@ -468,29 +482,50 @@ kab:
     description:
       prefix_invited_by_user: "@%{name} inced-ik·ikem ad ternuḍ ɣer uqeddac-a n Mastodon!"
       prefix_sign_up: Zeddi di Maṣṭudun assa!
+      suffix: S umiḍan, tzemreḍ ad tḍefreḍ imdanen, ad d-tessufɣeḍ tisuffaɣ d wembadal n yiznan akked yiseqdacen n yal aqeddac Mastodon d wayen-nniḍen!
+    didnt_get_confirmation: Ur d-teṭṭifeḍ ara aseɣwen n usentem ?
+    dont_have_your_security_key: Ulac ɣur-k·m tasarut-ik·im n tɣellist?
     forgot_password: Tettud awal-ik uffir?
     log_in_with: Qqen s
     login: Qqen
     logout: Ffeɣ
     migrate_account: Gujj ɣer umiḍan nniḍen
     or_log_in_with: Neɣ eqqen s
+    privacy_policy_agreement_html: Ɣriɣ yerna qebleɣ <a href="%{privacy_policy_path}" target="_blank">tasertit n tbaḍnit</a>
     progress:
       confirm: Sentem imayl
+      details: Isalli-inek
+      review: Tamuɣli-nneɣ
+      rules: Qbel ilugan
     providers:
       cas: CAS
       saml: SAML
     register: Jerred
     registration_closed: "%{instance} ur yeqbil ara imttekkiyen imaynuten"
+    resend_confirmation: Ɛawed-iyi-d aseɣwen n usentem
     reset_password: Wennez awal uffir
     rules:
+      accept: Qbel
       back: Tuɣalin
+      preamble_invited: Uqbel ad tkemmleḍ, ttxil-k·m ẓer ilugan i d-sbedden yimkariyen n %{domain}.
+      title: Kra n yilugan igejdanen.
+      title_invited: Tettwaɛerḍeḍ.
     security: Taɣellist
     set_new_password: Egr-d awal uffir amaynut
+    setup:
+      email_below_hint_html: Ssefqed akaram-inek·inem n uspam neɣ ssuter wayeḍ. Tzemreḍ ad tesseɣtiḍ tansa-inek·inem imayl ma yella ur tṣeḥḥa ara.
+      email_settings_hint_html: Sit ɣef useɣwen i ak-d-nceyyeε akken ad tesfeqdeḍ %{email}. Ad nerǧu da kan.
+      link_not_received: Ur k-id-iṣaḥ ara wassaɣ ?
+      new_confirmation_instructions_sent: Ad d-teṭṭfeḍ imayl amaynut s useɣwen n usentem ssya ɣef kra n ddqayeq!
     sign_in:
       preamble_html: Kcem ar <strong>%{domain}</strong> s inekcam-inek n tuqqna. Ma yella yezga-d umiḍan-ik deg uqeddac-nniḍen, ur tezmireḍ ara ad tkecmeḍ sya.
       title: Akeččum ɣer %{domain}
+    sign_up:
+      preamble: S umiḍan deg uqeddac-a n Mastodon, ad tizmireḍ ad tḍefreḍ win i ak-yehwan deg uẓeṭṭa, anida yebɣu yili umiḍan-nsen.
+      title: Iyya ad d-nessewjed tiɣawsiwin i %{domain}.
     status:
       account_status: Addad n umiḍan
+      functional: Amiḍan-inek·inem yetteddu s lekmal-is.
     use_security_key: Seqdec tasarut n teɣlist
   challenge:
     confirm: Kemmel
@@ -515,6 +550,7 @@ kab:
       x_months: "%{count}agu"
       x_seconds: "%{count}tas"
   deletes:
+    confirm_password: Sekcem awal-ik·im uffir n tura akken ad tesfeqdeḍ tamagit-ik·im
     proceed: Kkes amiḍan
     warning:
       username_available: Isem-ik·im n useqdac ad yuɣal yella i tikkelt-nniḍen
@@ -524,6 +560,9 @@ kab:
       status: 'Tasuffeɣt #%{id}'
       title_actions:
         none: Ɣur-wat
+  edit_profile:
+    basic_information: Talɣut tamatut
+    hint_html: "<strong>Mudd udem i wayen ttwalin medden deg umaɣnu-inek azayez ɣer yidis n yiznan-ik.</strong> Imdanen niḍen zemren ad k-ḍefren yernu ad gen assaɣ yid-k mi ara tesɛuḍ amaɣnu yeccuṛen ed tugna n umaɣnu."
   errors:
     '500':
       title: Asebter-ayi d arameɣtu
@@ -550,6 +589,9 @@ kab:
     index:
       delete: Kkes
       empty: Ur tesɛid ara imzizdigen.
+      statuses:
+        one: "%{count} n tsuffeɣt"
+        other: "%{count} n tsuffaɣ"
       title: Imzizdigen
     new:
       save: Sekles amsizdeg amaynut
@@ -590,6 +632,7 @@ kab:
       '86400': 1 wass
     expires_in_prompt: Werǧin
     generate: Slaled aseɣwen n uɛraḍ
+    invalid: Aneɛruḍ-a ur iṣeḥḥa ara
     invited_by: 'Tettwaɛraḍeḍ s ɣur:'
     max_uses:
       one: 1 uuseqdec
@@ -649,6 +692,9 @@ kab:
     search: Anadi
   privacy_policy:
     title: Tasertit tabaḍnit
+  redirects:
+    prompt: Ma tumneḍ aseɣwen-a, sit fell-as akken ad tkemmleḍ.
+    title: Aql-ik·em ad teffɣeḍ seg %{instance}.
   relationships:
     activity: Armud n umiḍan
     followers: Imeḍfaṛen
@@ -742,6 +788,7 @@ kab:
       vote: Dɣeṛ
     show_more: Ssken-d ugar
     show_newer: Ssken-d timaynutin
+    show_older: Ssken-d tiqburin
     show_thread: Ssken-d lxiḍ
     title: '%{name} : "%{quote}"'
     visibilities:
@@ -771,6 +818,8 @@ kab:
     formats:
       default: "%d %b %Y, %H:%M"
       month: "%b %Y"
+      time: "%H:%M"
+      with_time_zone: "%d %b %Y, %H:%M %Z"
   two_factor_authentication:
     add: Rnu
     disable: Gdel
@@ -792,6 +841,15 @@ kab:
         silence: Amiḍan yesɛa talast
         suspend: Amiḍan yettwaḥbas
     welcome:
+      apps_step: Zdem-d isnasen-nneɣ unṣiben.
+      apps_title: Isnasen n Mastodon
+      feature_action: Issin ugar
+      follow_action: Ḍfeṛ
+      follows_title: Anwa ara ḍefṛeḍ
+      follows_view_more: Ssken-d ugar n medden ay tzemred ad tḍefred
+      post_step: Ini-as azul i umaḍal s uḍris, s tiwlafin, s tividyutin neɣ s tefranin.
+      share_action: Bḍu
+      share_step: Init-asen i yimeddukal-nwen amek ara ken-id-afen deg Mastodon.
       subject: Ansuf ɣer Maṣṭudun
       title: Ansuf yessek·em, %{name}!
   users:
diff --git a/config/locales/kk.yml b/config/locales/kk.yml
index 9528c0950f73e5..1dcbce97eb4b7c 100644
--- a/config/locales/kk.yml
+++ b/config/locales/kk.yml
@@ -718,7 +718,6 @@ kk:
         silence: Аккаунт шектеулі
         suspend: Аккаунт тоқтатылды
     welcome:
-      edit_profile_action: Профиль өңдеу
       explanation: Мына кеңестерді шолып өтіңіз
       subject: Mastodon Желісіне қош келдіңіз
       title: Ортаға қош келдің, %{name}!
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 1e53006cbbb7df..40af97c6287a96 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -1,7 +1,7 @@
 ---
 ko:
   about:
-    about_mastodon_html: '미래의 소셜 네트워크: 광고 없음, 기업 감시 없음, 윤리적 설계, 탈중앙화! 여러분만의 데이터를 Mastodon으로 소유하세요!'
+    about_mastodon_html: '미래의 소셜 네트워크: 광고 없음, 기업 감시 없음, 윤리적 설계, 탈중앙화! 여러분만의 데이터를 Mastodon으로 보호하고 누리세요!'
     contact_missing: 미설정
     contact_unavailable: 없음
     hosted_on: "%{domain}에서 호스팅 되는 마스토돈"
@@ -14,7 +14,7 @@ ko:
     instance_actor_flash: 이 계정은 서버 자신을 나타내기 위한 가상의 계정이며 개인 사용자가 아닙니다. 이 계정은 연합을 위해 사용되며 정지되지 않아야 합니다.
     last_active: 최근 활동
     link_verified_on: "%{date}에 이 링크의 소유가 확인되었습니다"
-    nothing_here: 아무 것도 없습니다!
+    nothing_here: 텅 비어있네요!
     pin_errors:
       following: 추천하려는 사람을 팔로우 하고 있어야 합니다
     posts:
@@ -67,7 +67,7 @@ ko:
       enable: 동결 해제
       enable_sign_in_token_auth: 이메일 토큰 인증 활성화
       enabled: 활성
-      enabled_msg: "%{username}의 계정을 성공적으로 얼리기 해제하였습니다"
+      enabled_msg: "%{username}의 동결을 성공적으로 해제 했습니다."
       followers: 팔로워
       follows: 팔로우
       header: 헤더
@@ -75,7 +75,7 @@ ko:
       invite_request_text: 가입하려는 이유
       invited_by: 초대자
       ip: IP
-      joined: 가입
+      joined: 가입 날짜
       location:
         all: 전체
         local: 로컬
@@ -93,7 +93,7 @@ ko:
         pending: 대기 중
         silenced: 제한됨
         suspended: 정지
-        title: 중재
+        title: 관리
       moderation_notes: 중재 참고사항
       most_recent_activity: 최근 활동
       most_recent_ip: 최근 IP
@@ -103,7 +103,7 @@ ko:
       not_subscribed: 구독하지 않음
       pending: 심사 대기
       perform_full_suspension: 정지
-      previous_strikes: 이전의 처벌들
+      previous_strikes: 과거 처벌
       previous_strikes_description_html:
         other: 이 계정에는 <strong>%{count}</strong>번의 처벌이 있었습니다.
       promote: 승급
@@ -116,7 +116,7 @@ ko:
       rejected_msg: 성공적으로 %{username}의 가입 신청서를 반려하였습니다
       remote_suspension_irreversible: 이 계정의 데이터는 되돌릴 수 없도록 삭제되었습니다.
       remote_suspension_reversible_hint_html: 이 계정은 계정이 속한 서버에서 정지되었습니다, 그리고 %{date}에 데이터가 완전히 삭제될 것입니다. 그 때까지는 해당 서버에서 계정을 그대로 복구할 수 있습니다. 만약 지금 당장 이 계정의 모든 데이터를 삭제하고 싶다면, 아래에서 실행할 수 있습니다.
-      remove_avatar: 아바타 지우기
+      remove_avatar: 아바타 삭제
       remove_header: 헤더 삭제
       removed_avatar_msg: 성공적으로 %{username}의 아바타 이미지를 삭제하였습니다
       removed_header_msg: 성공적으로 %{username}의 헤더 이미지를 삭제하였습니다
@@ -1812,9 +1812,39 @@ ko:
         silence: 계정 제한 됨
         suspend: 계정 정지 됨
     welcome:
-      edit_profile_action: 프로필 설정
-      edit_profile_step: 프로필 사진을 업로드하거나 사람들에게 표시할 이름을 바꾸는 것 등으로 자신의 프로필을 커스텀 할 수 있습니다. 새로운 팔로워를 검토 후에 허용하도록 할 수도 있습니다.
+      apps_android_action: Google Play에서 다운로드
+      apps_ios_action: App Store에서 다운로드
+      apps_step: 공식 앱을 다운로드해보세요.
+      apps_title: Mastodon 앱
+      checklist_subtitle: '이 새로운 소셜미디어를 시작해봅시다:'
+      checklist_title: 환영 체크리스트
+      edit_profile_action: 개인 맞춤
+      edit_profile_step: 의미있는 프로필을 작성해 상호작용을 늘려보세요.
+      edit_profile_title: 프로필 꾸미기
       explanation: 시작하기 전에 몇가지 팁들을 준비했습니다
+      feature_action: 더 알아보기
+      feature_audience: 마스토돈은 중개자 없이 청중을 관리할 수 있는 특별한 가능성을 제공합니다. 자체 인프라에 배포된 마스토돈을 사용하면 온라인에 있는 다른 마스토돈 서버에도 팔로우하거나 팔로우할 수 있으며, 본인 외에는 누구의 통제도 받지 않습니다.
+      feature_control_title: 내 타임라인에 대해 통제권을 유지하세요
+      feature_creativity: 마스토돈은 오디오, 비디오, 사진, 접근성 설명(alt),  투표, 콘텐츠 주의 (블라인드), 움직이는 아바타, 커스텀 이모티콘, 썸네일 자르기, 그리고 더 많은 것들을 당신이 온라인에서 당신을 더 잘 드러낼 수 있도록 돕기위해 지원합니다. 당신이 그림이나 음악을 올리던, 팟캐스트 같은것을 진행하던 마스토돈이 함께합니다.
+      feature_moderation: 마스토돈은 의사 결정권을 사용자에게 돌려줍니다. 각 서버는 기업 소셜 미디어처럼 하향식이 아닌 로컬에서 시행되는 자체 규칙과 규정을 만들 수 있어 다양한 그룹의 요구에 가장 유연하게 대응할 수 있습니다. 동의하는 규칙이 있는 서버에 가입하거나 직접 서버를 호스팅하세요.
+      feature_moderation_title: 올바른 중재
+      follow_action: 팔로우
+      follow_step: 흥미로운 사람들을 팔로우하는 것이 마스토돈의 전부입니다.
+      follow_title: 내게 맞는 홈 피드 꾸미기
+      follows_subtitle: 잘 알려진 계정들을 팔로우
+      follows_title: 누구를 팔로우 할 지
+      follows_view_more: 팔로우 할 사람들 더 보기
+      hashtags_recent_count: 최근 %{days}일동안 %{people} 명
+      hashtags_subtitle: 최근 2일간 무엇이 유행했는지 둘러보기
+      hashtags_title: 유행하는 해시태그
+      hashtags_view_more: 유행하는 해시태그 더 보기
+      post_action: 작성
+      post_step: 글, 사진, 영상, 또는 투표로 세상에 인사해보세요.
+      post_title: 첫번째 게시물 쓰기
+      share_action: 공유
+      share_step: 친구에게 마스토돈에서 나를 찾을 수 있는 방법을 알려주세요.
+      share_title: 마스토돈 프로필을 공유하세요
+      sign_in_action: 로그인
       subject: 마스토돈에 오신 것을 환영합니다
       title: 환영합니다 %{name} 님!
   users:
diff --git a/config/locales/ku.yml b/config/locales/ku.yml
index 91ab75ceb085a2..0c44b7555bb21c 100644
--- a/config/locales/ku.yml
+++ b/config/locales/ku.yml
@@ -1590,8 +1590,6 @@ ku:
         silence: Ajimêr sînor kiriye
         suspend: Ajimêr hatiye rawestandin
     welcome:
-      edit_profile_action: Profîlê saz bike
-      edit_profile_step: Tu dikarî bi barkirina wêneyek profîlê, guhertina navê xwe ya xuyangê û bêtir profîla xwe kesane bikî. Berî ku mafê bidî ku te şopînerên nû te bişopînin, tu dikarî binirxînî.
       explanation: Li vir çend serişte hene ku tu dest pê bike
       subject: Tu bi xêr hatî Mastodon
       title: Bi xêr hatî, %{name}!
diff --git a/config/locales/lad.yml b/config/locales/lad.yml
index bed6b44d39890f..22930453754cd8 100644
--- a/config/locales/lad.yml
+++ b/config/locales/lad.yml
@@ -1842,9 +1842,26 @@ lad:
         silence: Kuento limitado
         suspend: Kuento suspendido
     welcome:
-      edit_profile_action: Konfigurasyon de profil
-      edit_profile_step: Puedes personalizar tu profil kargando una foto de profil, trokando tu nombre de utilizador i muncho mas. Puedes optar por revizar a los muevos suivantes antes de ke puedan segirte.
+      apps_android_action: Abasha en Google Play
+      apps_ios_action: Abasha en App Store
+      apps_step: Abasha muestras aplikasyones ofisyalas.
+      apps_title: Aplikasyones de Mastodon
+      edit_profile_action: Personaliza
+      edit_profile_step: Kompleta tu profil para aumentar tus enteraksyones.
+      edit_profile_title: Personaliza tu profil
       explanation: Aki ay algunos konsejos para ampesar
+      feature_action: Ambezate mas
+      follow_action: Sige
+      follow_title: Personaliza tu linya prinsipala
+      follows_title: A ken segir
+      hashtags_title: Etiketas en trend
+      post_action: Eskrive
+      post_step: Puedes introdusirte al mundo kon teksto, fotos, videos o anketas.
+      post_title: Eskrive tu primera publikasyon
+      share_action: Partaja
+      share_step: Informa a tus amigos komo toparte en Mastodon.
+      share_title: Partaja tu profil de Mastodon
+      sign_in_action: Konektate
       subject: Bienvenido a Mastodon
       title: Bienvenido, %{name}!
   users:
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 7ffce1a5166950..62336d89d41c6a 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -1,7 +1,7 @@
 ---
 lt:
   about:
-    about_mastodon_html: 'Ateities socialinis tinklas: jokių reklamų, jokių įmonių sekimo, etiškas dizainas ir decentralizacija. Turėk savo duomenis su Mastodon!'
+    about_mastodon_html: 'Ateities socialinis tinklas: jokių reklamų, jokių įmonių sekimo, etiškas dizainas ir decentralizacija! Turėk savo duomenis su Mastodon.'
     contact_missing: Nenustatyta
     contact_unavailable: Nėra
     hosted_on: Mastodon talpinamas %{domain}
@@ -15,11 +15,11 @@ lt:
       other: Sekėjų
     following: Seka
     instance_actor_flash: Ši paskyra yra virtualus veikėjas (-a), naudojamas atstovauti pačiam serveriui, o ne atskiram naudotojui. Tai naudojama federacijos tikslais ir neturėtų būti pristabdyta.
-    last_active: paskutinis aktyumas
+    last_active: paskutinį kartą aktyvus
     link_verified_on: Šios nuorodos nuosavybė buvo patikrinta %{date}
-    nothing_here: Nieko čia nėra!
+    nothing_here: Nieko čia nėra.
     pin_errors:
-      following: Privalai sekti asmenį, kurį nori patvirtinti.
+      following: Privalai sekti žmogų, kurį nori patvirtinti.
     posts:
       few: Įrašai
       many: Įrašo
@@ -37,39 +37,43 @@ lt:
     accounts:
       add_email_domain_block: Blokuoti el. pašto domeną
       approve: Patvirtinti
-      approved_msg: Sėkmingai patvirtinta %{username} registracijos paraiška
+      approved_msg: Sėkmingai patvirtinta %{username} registracijos paraiška.
       are_you_sure: Ar esi įsitikinęs (-usi)?
       avatar: Avataras
       by_domain: Domenas
       change_email:
-        changed_msg: El. paštas sėkmingai pakeistas!
-        current_email: Dabartinis el paštas
-        label: Pakeisti el pašto adresą
-        new_email: Naujas el pašto adresas
-        submit: Pakeisti el pašto adresą
-        title: Pakeisti el pašto adresą vartotojui %{username}
+        changed_msg: El. paštas sėkmingai pakeistas.
+        current_email: Dabartinis el. paštas
+        label: Keisti el. paštą
+        new_email: Naujas el. paštas
+        submit: Keisti el. paštą
+        title: Keisti el. paštą %{username}
       change_role:
+        changed_msg: Vaidmuo sėkmingai pakeistas.
         label: Keisti vaidmenį
         no_role: Jokios vaidmenį
         title: Keisti vaidmenį %{username}
       confirm: Patvirtinti
       confirmed: Patvirtinta
-      confirming: Tvirtinama
+      confirming: Patvirtinama
       custom: Pasirinktinis
       delete: Ištrinti duomenis
-      deleted: Ištrinti
+      deleted: Ištrinta
       demote: Pažeminti
-      disable: Išjungti
+      destroyed_msg: "%{username} duomenys dabar laukia eilėje, kad būtų netrukus ištrinti."
+      disable: Sustabdyti
       disable_sign_in_token_auth: Išjungti el. pašto prieigos rakto tapatybės nustatymą
       disable_two_factor_authentication: Išjungti 2FA
-      disabled: Išjungta
+      disabled: Pristabdyta
       display_name: Rodomas vardas
       domain: Domenas
-      edit: Keisti
-      email: El paštas
-      email_status: El pašto statusas
-      enable: Įjungti
+      edit: Redaguoti
+      email: El. paštas
+      email_status: El. pašto būsena
+      enable: Panaikinti sustabdymą
+      enable_sign_in_token_auth: Įjungti el. pašto prieigos rakto tapatybės nustatymą
       enabled: Įjungta
+      enabled_msg: Sėkmingai panaikintas %{username} paskyros sustabdymas.
       followers: Sekėjai
       follows: Seka
       header: Antraštė
@@ -80,94 +84,264 @@ lt:
       joined: Prisijungė
       location:
         all: Visi
-        local: Lokali
+        local: Vietinis
         remote: Nuotolinis
-        title: Lokacija
-      login_status: Prisijungimo statusas
-      media_attachments: Prisegti medijos failai
-      memorialize: Paversti į memorija
+        title: Vieta
+      login_status: Prisijungimo būsena
+      media_attachments: Medijos priedai
+      memorialize: Paversti į memorialinį
+      memorialized: Memorializuota
+      memorialized_msg: Sėkmingai paversta %{username} į memorialinę paskyrą.
       moderation:
         active: Aktyvus
         all: Visi
+        disabled: Išjungta
+        pending: Laukiama
+        silenced: Ribotas
         suspended: Užrakintas
-        title: Moderacija
-      moderation_notes: Medaracijos žinutės
-      most_recent_activity: Paskutinioji veikla
-      most_recent_ip: Paskutinis IP
-      no_limits_imposed: Be limitu
-      not_subscribed: Ne prenumeruota
-      perform_full_suspension: Užrakinti
+        title: Prižiūrėjimas
+      moderation_notes: Prižiūrėjimo pastabos
+      most_recent_activity: Naujausia veikla
+      most_recent_ip: Naujausias IP
+      no_account_selected: Nebuvo pakeistos jokios paskyros, nes nebuvo pasirinkta nė viena.
+      no_limits_imposed: Nėra nustatytų ribojimų.
+      no_role_assigned: Nėra priskirto vaidmens.
+      not_subscribed: Neužprenumeruota
+      pending: Laukiama peržiūros
+      perform_full_suspension: Pristabdyti
+      previous_strikes: Ankstesni pažeidimai
+      previous_strikes_description_html:
+        few: Šioje paskyroje yra <strong>%{count}</strong> pažeidimai.
+        many: Šioje paskyroje yra <strong>%{count}</strong> pažeidimas.
+        one: Šioje paskyroje yra <strong>vienas</strong> pažeidimas.
+        other: Šioje paskyroje yra <strong>%{count}</strong> pažeidimų.
       promote: Paaukštinti
       protocol: Protokolas
       public: Viešas
-      push_subscription_expires: PuSH prenumeramivas pasibaigė
-      redownload: Perkrauti profilį
-      rejected_msg: Sėkmingai patvirtinta %{username} registracijos paraiška
+      push_subscription_expires: PuSH prenumerata baigiasi
+      redownload: Atnaujinti profilį
+      redownloaded_msg: Sėkmingai atnaujintas %{username} profilis iš kilmės šaltinio.
+      reject: Atmesti
+      rejected_msg: Sėkmingai atmesta %{username} registracijos paraiška.
       remote_suspension_irreversible: Šios paskyros duomenys negrįžtamai ištrinti.
-      remote_suspension_reversible_hint_html: Paskyra jų serveryje buvo sustabdyta, o duomenys bus visiškai pašalinti %{date}. Iki to laiko nuotolinis serveris gali atkurti šią paskyrą be jokių neigiamų pasekmių. Jei norite iš karto pašalinti visus paskyros duomenis, galite tai padaryti toliau.
-      remove_avatar: Panaikinti profilio nuotrauką
-      remove_header: Panaikinti antraštę
-      removed_header_msg: Sėkmingai pašalintas %{username} antraštės paveikslėlis
+      remote_suspension_reversible_hint_html: Paskyra jų serveryje buvo pristabdyta, o duomenys bus visiškai pašalinti %{date}. Iki to laiko nuotolinis serveris gali atkurti šią paskyrą be jokių neigiamų pasekmių. Jei nori iš karto pašalinti visus paskyros duomenis, gali tai padaryti toliau.
+      remove_avatar: Pašalinti avatarą
+      remove_header: Pašalinti antraštę
+      removed_avatar_msg: Sėkmingai pašalintas %{username} avataro vaizdas.
+      removed_header_msg: Sėkmingai pašalintas %{username} antraštės vaizdas.
       resend_confirmation:
-        already_confirmed: Šis vartotojas jau patvirtintas
-        send: Dar kartą išsiųsti patvirtinimo nuorodą
-        success: Patvirtinimo laiškas sėkmingai išsiųstas!
-      reset: Iš naujo
-      reset_password: Atkurti slaptažodį
-      resubscribe: Per prenumeruoti
+        already_confirmed: Šis naudotojas jau patvirtintas.
+        send: Iš naujo siųsti patvirtinimo nuorodą
+        success: Patvirtinimo nuoroda sėkmingai išsiųsta.
+      reset: Nustatyti iš naujo
+      reset_password: Nustatyti iš naujo slaptažodį
+      resubscribe: Prenumeruoti iš naujo
       role: Vaidmuo
       search: Ieškoti
-      search_same_email_domain: Kiti tą patį el. pašto domeną turintys naudotojai
-      search_same_ip: Kiti tą patį IP turintys naudotojai
-      security: Apsauga
+      search_same_email_domain: Kiti naudotojai su tuo pačiu el. pašto domenu
+      search_same_ip: Kiti naudotojai su tuo pačiu IP
+      security: Saugumas
       security_measures:
         only_password: Tik slaptažodis
         password_and_2fa: Slaptažodis ir 2FA
-      sensitized: Pažymėti kaip jautrią informaciją
-      shared_inbox_url: Bendroji gautųjų URL
+      sensitive: Priversti žymėti kaip jautrią
+      sensitized: Pažymėta kaip jautri
+      shared_inbox_url: Bendras gautiejų URL
       show:
-        created_reports: Parašyti raportai
-        targeted_reports: Reportuotas kitų
-      silence: Tyla
-      silenced: Užtildytas
-      statuses: Statusai
+        created_reports: Sukurtos ataskaitos
+        targeted_reports: Pranešė kiti
+      silence: Riboti
+      silenced: Ribotas
+      statuses: Įrašai
+      strikes: Ankstesni pažeidimai
       subscribe: Prenumeruoti
-      suspended: Užrakintas
-      suspension_irreversible: Šios paskyros duomenys negrįžtamai ištrinti. Galite atšaukti paskyros sustabdymą, kad ja būtų galima naudotis, tačiau nebus atkurti jokie anksčiau turėti duomenys.
-      suspension_reversible_hint_html: Paskyra sustabdyta, o duomenys bus visiškai pašalinti %{date}. Iki to laiko paskyrą galima atkurti be jokių neigiamų pasekmių. Jei norite iš karto pašalinti visus paskyros duomenis, galite tai padaryti toliau.
-      title: Vartotojai
-      unblock_email: El. pašto adreso atblokavimas
-      unblocked_email_msg: Sėkmingai atblokuotas %{username} el. pašto adresas
-      unconfirmed_email: Nepatvirtintas el pašto adresas
-      undo_silenced: Atšaukti užtildymą
-      undo_suspension: Atšaukti užrakinimą
-      unsilenced_msg: Sėkmingai panaikintas %{username} paskyros apribojimas
-      unsubscribe: Nebeprenumeruoti
-      unsuspended_msg: Sėkmingai panaikintas %{username} paskyros apribojimas
-      username: Slapyvardis
+      suspend: Pristabdyti
+      suspended: Pristabdyta
+      suspension_irreversible: Šios paskyros duomenys negrįžtamai ištrinti. Gali atšaukti paskyros pristabdymą, kad ja būtų galima naudotis, bet nebus atkurti jokie anksčiau turėti duomenys.
+      suspension_reversible_hint_html: Paskyra pristabdyta, o duomenys bus visiškai pašalinti %{date}. Iki to laiko paskyrą galima atkurti be jokių neigiamų pasekmių. Jei nori iš karto pašalinti visus paskyros duomenis, gali tai padaryti toliau.
+      title: Naudotojai
+      unblock_email: Atblokuoti el. pašto adresą
+      unblocked_email_msg: Sėkmingai atblokuotas %{username} el. pašto adresas.
+      unconfirmed_email: Nepatvirtintas el. pašto adresas.
+      undo_sensitized: Atšaukti privertimą žymėti kaip jautrią
+      undo_silenced: Atšaukti ribojimą
+      undo_suspension: Atšaukti pristabdymą
+      unsilenced_msg: Sėkmingai atšauktas %{username} paskyros ribojimas.
+      unsubscribe: Atšaukti prenumeratą
+      unsuspended_msg: Sėkmingai panaikintas %{username} paskyros pristabdymas.
+      username: Naudotojo vardas
       view_domain: Peržiūrėti domeno santrauką
       warn: Įspėti
+      web: Žiniatinklis
       whitelisted: Leidžiama federacijai
     action_logs:
+      action_types:
+        approve_appeal: Patvirtinti apeliaciją
+        approve_user: Patvirtinti naudotoją
+        assigned_to_self_report: Priskirti ataskaitą
+        change_email_user: Keisti el. paštą naudotojui
+        change_role_user: Keisti naudotojo vaidmenį
+        confirm_user: Patvirtinti naudotoją
+        create_account_warning: Kurti įspėjimą
+        create_announcement: Kurti skelbimą
+        create_canonical_email_block: Kurti el. pašto bloką
+        create_custom_emoji: Kurti pasirinktinį jaustuką
+        create_domain_allow: Kurti domeno leidimą
+        create_domain_block: Kurti domeno bloką
+        create_email_domain_block: Kurti el. pašto domeno bloką
+        create_ip_block: Kurti IP taisyklę
+        create_unavailable_domain: Kurti nepasiekiamą domeną
+        create_user_role: Kurti vaidmenį
+        demote_user: Pažeminti naudotoją
+        destroy_announcement: Ištrinti skelbimą
+        destroy_canonical_email_block: Ištrinti el. pašto bloką
+        destroy_custom_emoji: Ištrinti pasirinktinį jaustuką
+        destroy_domain_allow: Ištrinti domeno leidimą
+        destroy_domain_block: Ištrinti domeno bloką
+        destroy_email_domain_block: Ištrinti el. pašto domeno bloką
+        destroy_instance: Išvalyti domeną
+        destroy_ip_block: Ištrinti IP taisyklę
+        destroy_status: Ištrinti įrašą
+        destroy_unavailable_domain: Ištrinti nepasiekiamą domeną
+        destroy_user_role: Sunaikinti vaidmenį
+        disable_2fa_user: Išjungti 2FA
+        disable_custom_emoji: Išjungti pasirinktinį jaustuką
+        disable_sign_in_token_auth_user: Išjungti el. pašto prieigos rakto tapatybės nustatymą naudotojui
+        disable_user: Išjungti naudotoją
+        enable_custom_emoji: Įjungti pasirinktinį jaustuką
+        enable_sign_in_token_auth_user: Įjungti el. pašto prieigos rakto tapatybės nustatymą naudotojui
+        enable_user: Įjungti naudotoją
+        memorialize_account: Memorializuoti paskyrą
+        promote_user: Paaukštinti naudotoją
+        reject_appeal: Atmesti apeliaciją
+        reject_user: Atmesti naudotoją
+        remove_avatar_user: Pašalinti avatarą
+        reopen_report: Iš naujo atidaryti ataskaitą
+        resend_user: Iš naujo siųsti patvirtinimo laišką
+        reset_password_user: Nustatyti iš naujo slaptažodį
+        resolve_report: Išspręsti ataskaitą
+        sensitive_account: Priversti žymėti kaip jautrią paskyrai
+        silence_account: Riboti paskyrą
+        suspend_account: Pristabdyti paskyrą
+        unassigned_report: Panaikinti priskyrimą ataskaitą
+        unblock_email_account: Atblokuoti el. pašto adresą
+        unsensitive_account: Atšaukti privertimą žymėti kaip jautrią paskyrai
+        unsilence_account: Atšaukti riboti paskyrą
+        unsuspend_account: Atšaukti paskyros pristabdymą
+        update_announcement: Atnaujinti skelbimą
+        update_custom_emoji: Atnaujinti pasirinktinį jaustuką
+        update_domain_block: Atnaujinti domeno bloką
+        update_ip_block: Atnaujinti IP taisyklę
+        update_status: Atnaujinti įrašą
+        update_user_role: Atnaujinti vaidmenį
+      actions:
+        approve_appeal_html: "%{name} patvirtino prižiūjimo veiksmo apeliaciją iš %{target}"
+        approve_user_html: "%{name} patvirtino registraciją iš %{target}"
+        assigned_to_self_report_html: "%{name} paskyrė ataskaitą %{target} saviems"
+        change_email_user_html: "%{name} pakeitė el. paštą naudotojui %{target}"
+        change_role_user_html: "%{name} pakeitė vaidmenį %{target}"
+        confirm_user_html: "%{name} patvirtino el. paštą naudotojui %{target}"
+        create_account_warning_html: "%{name} išsiuntė įspėjimą %{target}"
+        create_announcement_html: "%{name} sukūrė naują skelbimą %{target}"
+        create_canonical_email_block_html: "%{name} užblokavo el. paštą su maišu %{target}"
+        create_custom_emoji_html: "%{name} įkėlė naują jaustuką %{target}"
+        create_domain_allow_html: "%{name} leido federaciją su domenu %{target}"
+        create_domain_block_html: "%{name} užblokavo domeną %{target}"
+        create_email_domain_block_html: "%{name} užblokavo el. pašto domeną %{target}"
+        create_ip_block_html: "%{name} sukūrė taisyklę IP %{target}"
+        create_unavailable_domain_html: "%{name} sustabdė tiekimą į domeną %{target}"
+        create_user_role_html: "%{name} sukūrė %{target} vaidmenį"
+        demote_user_html: "%{name} pažemino naudotoją %{target}"
+        destroy_announcement_html: "%{name} ištrynė skelbimą %{target}"
+        destroy_canonical_email_block_html: "%{name} atblokavo el. paštą su maišu %{target}"
+        destroy_custom_emoji_html: "%{name} ištrynė jaustuką %{target}"
+        destroy_domain_allow_html: "%{name} neleido federacijos su domenu %{target}"
+        destroy_domain_block_html: "%{name} atblokavo domeną %{target}"
+        destroy_email_domain_block_html: "%{name} atblokavo el. pašto domeną %{target}"
+        destroy_instance_html: "%{name} išvalė domeną %{target}"
+        destroy_ip_block_html: "%{name} ištrynė taisyklę IP %{target}"
+        destroy_status_html: "%{name} pašalino įrašą %{target}"
+        destroy_unavailable_domain_html: "%{name} pratęsė tiekimą į domeną %{target}"
+        destroy_user_role_html: "%{name} ištrynė %{target} vaidmenį"
+        disable_2fa_user_html: "%{name} išjungė dviejų veiksnių reikalavimą naudotojui %{target}"
+        disable_custom_emoji_html: "%{name} išjungė jaustuką %{target}"
+        disable_sign_in_token_auth_user_html: "%{name} išjungė el. pašto prieigos tapatybės nustatymą %{target}"
+        disable_user_html: "%{name} išjungė prisijungimą naudotojui %{target}"
+        enable_custom_emoji_html: "%{name} įjungė jaustuką %{target}"
+        enable_sign_in_token_auth_user_html: "%{name} įjungė el. pašto prieigos tapatybės nustatymą %{target}"
+        enable_user_html: "%{name} įjungė prisijungimą naudotojui %{target}"
+        memorialize_account_html: "%{name} pavertė %{target} paskyrą į atminimo puslapį"
+        promote_user_html: "%{name} paaukštino naudotoją %{target}"
+        reject_appeal_html: "%{name} atmetė prižiūjimo veiksmo apeliaciją iš %{target}"
+        reject_user_html: "%{name} atmetė registraciją iš %{target}"
+        remove_avatar_user_html: "%{name} pašalino %{target} avatarą"
+        reopen_report_html: "%{name} atidarė ataskaitą %{target}"
+        resend_user_html: "%{name} iš naujo išsiuntė patvirtinimo el. laišką %{target}"
+        reset_password_user_html: "%{name} iš naujo nustatė naudotojo slaptažodį %{target}"
+        resolve_report_html: "%{name} išsprendė ataskaitą %{target}"
+        sensitive_account_html: "%{name} pažymėjo %{target} mediją kaip jautrią"
+        silence_account_html: "%{name} apribojo %{target} paskyrą"
+        suspend_account_html: "%{name} pristabdė %{target} paskyrą"
+        unassigned_report_html: "%{name} panaikino priskyrimą ataskaitui %{target}"
+        unblock_email_account_html: "%{name} atblokavo %{target} el. pašto adresą"
+        unsensitive_account_html: "%{name} panaikino %{target} medijos žymėjimą kaip jautrią"
+        unsilence_account_html: "%{name} panaikino %{target} paskyros ribojimą"
+        unsuspend_account_html: "%{name} atšaukė %{target} paskyros pristabdymą"
+        update_announcement_html: "%{name} atnaujino skelbimą %{target}"
+        update_custom_emoji_html: "%{name} atnaujino jaustuką %{target}"
+        update_domain_block_html: "%{name} atnaujino domeno bloką %{target}"
+        update_ip_block_html: "%{name} pakeitė taisyklę IP %{target}"
+        update_status_html: "%{name} atnaujino įrašą %{target}"
+        update_user_role_html: "%{name} pakeitė %{target} vaidmenį"
+      deleted_account: ištrinta paskyra
+      empty: Žurnalų nerasta.
+      filter_by_action: Filtruoti pagal veiksmą
+      filter_by_user: Filtruoti pagal naudotoją
       title: Audito žurnalas
+    announcements:
+      destroyed_msg: Skelbimas sėkmingai ištrintas.
+      edit:
+        title: Redaguoti skelbimą
+      empty: Skelbimų nerasta.
+      live: Tiesiogiai
+      new:
+        create: Sukurti skelbimą
+        title: Naujas skelbimas
+      publish: Skelbti
+      published_msg: Skelbimas sėkmingai paskelbtas.
+      scheduled_for: Suplanuota %{time}
+      scheduled_msg: Skelbimas suplanuotas paskelbti.
+      title: Skelbimai
+      unpublish: Panaikinti skelbimą
+      unpublished_msg: Skelbimas sėkmingai panaikintas.
+      updated_msg: Skelbimas sėkmingai atnaujintas.
+    critical_update_pending: Laukiama kritinio naujinimo
     custom_emojis:
+      assign_category: Priskirti kategoriją
       by_domain: Domenas
-      copied_msg: Sėkmingai sukurta lokali jaustuko kopija
+      copied_msg: Sėkmingai sukurta vietinė jaustuko kopija.
       copy: Kopijuoti
-      copy_failed_msg: Lokali jaustuko kopija negalėjo būti sukurta
-      created_msg: Jaustukas sukurtas sėkmingai!
+      copy_failed_msg: Nepavyko sukurti vietinės šios jaustuko kopijos.
+      create_new_category: Sukurti naują kategoriją
+      created_msg: Jaustukas sėkmingai sukurtas.
       delete: Ištrinti
       destroyed_msg: Jaustukas sėkmingai sunaikintas!
       disable: Išjungti
-      disabled_msg: Šis jaustukas sėkmingai išjungtas
+      disabled: Išjungta
+      disabled_msg: Sėkmingai išjungtas tas jaustukas.
       emoji: Jaustukas
       enable: Įjungti
-      enabled_msg: Šis jaustukas sėkmingai įjungtas
+      enabled: Įjungta
+      enabled_msg: Sėkmingai įjungtas tas jaustukas.
+      image_hint: PNG arba GIF iki %{size}
+      list: Sąrašas
       listed: Įtrauktas į sąrašą
       new:
-        title: Pridėti naują jaustuką
+        title: Pridėti naują pasirinktinį jaustuką
+      no_emoji_selected: Jaustukos nebuvo pakeistos, nes nebuvo pasirinktos.
+      not_permitted: Tau neleidžiama atlikti šio veiksmo.
       overwrite: Perrašyti
-      shortcode: Trumpas-kodas
+      shortcode: Trumpas kodas
       shortcode_hint: Bent du ženklai, tik raidiniai skaitmeniniai ženklai bei akcentai(_)
       title: Asmeniniai jaustukai
       unlisted: Neįtrauktas į sąrašą
@@ -175,14 +349,58 @@ lt:
       updated_msg: Jaustukas sėkmingai pakeistas!
       upload: Įkelti
     dashboard:
+      active_users: aktyvūs naudotojai
+      interactions: sąveikos
+      media_storage: Medijos saugykla
+      new_users: nauji naudotojai
+      opened_reports: atidaryti ataskaitos
+      pending_appeals_html:
+        few: "<strong>%{count}</strong> laukiantys apeliacijos"
+        many: "<strong>%{count}</strong> laukiama apeliacija"
+        one: "<strong>%{count}</strong> laukiama apeliacija"
+        other: "<strong>%{count}</strong> laukiančių apeliacijų"
+      pending_reports_html:
+        few: "<strong>%{count}</strong> laukiami ataskaitos"
+        many: "<strong>%{count}</strong> laukiama ataskaita"
+        one: "<strong>%{count}</strong> laukiama ataskaita"
+        other: "<strong>%{count}</strong> laukiančių ataskaitų"
+      pending_tags_html:
+        few: "<strong>%{count}</strong> laukiantys saitažodžiai"
+        many: "<strong>%{count}</strong> laukiama saitažodis"
+        one: "<strong>%{count}</strong> laukiama saitažodis"
+        other: "<strong>%{count}</strong> laukiančių saitažodžių"
+      pending_users_html:
+        few: "<strong>%{count}</strong> laukiami naudotojai"
+        many: "<strong>%{count}</strong> laukiama naudotojas"
+        one: "<strong>%{count}</strong> laukiama naudotojas"
+        other: "<strong>%{count}</strong> laukiančių naudotojų"
+      resolved_reports: išspręstos ataskaitos
       software: Programinė įranga
-      space: Naudojama atmintis
-      title: Pagrindinis puslapis
+      sources: Registracijos šaltiniai
+      space: Vietos naudojimas
+      title: Sąvadas
+      top_languages: Populiariausios aktyvios kalbos
+      top_servers: Populiariausi aktyvūs serveriai
+      website: Svetainė
+    disputes:
+      appeals:
+        empty: Apeliacijų nerasta.
+        title: Apeliacijos
+    domain_allows:
+      add_new: Leisti federaciją su domenu
+      created_msg: Domenas buvo sėkmingai leistas federacijai.
+      destroyed_msg: Domenas buvo neleistas federacijai.
+      export: Eksportuoti
     domain_blocks:
       add_new: Pridėti naują domeno bloką
       created_msg: Domeno užblokavimas nagrinėjamas
       destroyed_msg: Domeno blokas pašalintas
       domain: Domenas
+      edit: Redaguoti domeno bloką
+      existing_domain_block: Tu jau nustatei griežtesnius apribojimus %{name}.
+      existing_domain_block_html: Tu jau nustatei griežtesnius apribojimus %{name}, pirmiausia turi <a href="%{unblock_url}">atblokuoti jį</a>.
+      export: Eksportuoti
+      import: Importuoti
       new:
         create: Sukurti bloką
         hint: Domeno blokavimas nesustabdys vartotojų paskyrų sukūrimo duomenų sistemoje, tačiau automatiškai pritaikys atitinkamus moderavimo metodus šioms paskyroms.
@@ -606,8 +824,42 @@ lt:
         silence: Paskyra limituota
         suspend: Paskyra užrakinta
     welcome:
-      edit_profile_action: Nustatyti profilį
+      apps_android_action: Gauti per Google Play
+      apps_ios_action: Atsisiųsti per App Store
+      apps_step: Atsisiųsk oficialias programėles.
+      apps_title: Mastodon programėlės
+      checklist_subtitle: 'Pradėkime pažintį su šia nauja socialine sritimi:'
+      checklist_title: Pasveikinimo sąrašas
+      edit_profile_action: Suasmeninti
+      edit_profile_step: Padidink savo sąveiką turint išsamų profilį.
+      edit_profile_title: Suasmenink savo profilį
       explanation: Štai keletas patarimų, kaip pradėti
+      feature_action: Sužinoti daugiau
+      feature_audience: Mastodon suteikia unikalią galimybę valdyti savo auditoriją be tarpininkų. Tavo infrastruktūroje įdiegtas Mastodon leidžia sekti ir būti sekamam iš bet kurio kito Mastodon serverio internete ir yra kontroliuojamas tik tavęs.
+      feature_audience_title: Užtikrintai kurk savo auditoriją
+      feature_control: Tu geriausiai žinai, ką nori matyti savo pagrindiniame sraute. Jokių algoritmų ar reklamų, kurios gaištų tavo laiką. Iš vienos paskyros sek bet kurį asmenį bet kuriame Mastodon serveryje, gauk jo įrašus chronologine tvarka ir padaryk savo interneto kampelį šiek tiek panašesnį į save.
+      feature_control_title: Kontroliuok savo laiko skalę
+      feature_creativity: Mastodon palaiko garso, vaizdo įrašus ir paveikslėlių įrašus, prieinamumus aprašymus, apklausas, turinio įspėjimus, animuotus avatarus, pasirinktinius jaustukus, miniatiūrų apkarpymo valdymą ir dar daugiau, kad galėtum išreikšti save internete. Nesvarbu, ar publikuoji savo kūrybą, muziką, ar tinklalaidę, Mastodon tau padės.
+      feature_creativity_title: Neprilygstamas kūrybiškumas
+      feature_moderation: Mastodon grąžina sprendimų priėmimą į tavo rankas. Kiekvienas serveris kuria savo taisykles ir nuostatus, kurie yra įgyvendinami vietoje, o ne iš viršaus į apačią, kaip įmonių socialinėje medijoje, todėl ši sistema lanksčiausiai reaguoja į skirtingų žmonių grupių poreikius. Prisijunk prie serverio su taisyklėmis, su kuriomis sutinki, arba talpink savo serverį.
+      feature_moderation_title: Prižiūrėjimas taip, kaip turėtų būti
+      follow_action: Sekti
+      follow_step: Sekti įdomius žmones – tai, kas yra Mastodon.
+      follow_title: Suasmenink savo pagrindinį srautą
+      follows_subtitle: Sek gerai žinomas paskyras.
+      follows_title: Ką sekti
+      follows_view_more: Peržiūrėti daugiau sekamų žmonių
+      hashtags_recent_count: "%{people} žmonių per pastarąsias %{days} dienas"
+      hashtags_subtitle: Naršyk, kas tendencinga per pastarąsias 2 dienas.
+      hashtags_title: Tendencijos saitažodžiai
+      hashtags_view_more: Peržiūrėti daugiau tendencingų saitažodžių
+      post_action: Sukurti
+      post_step: Sakyk labas pasauliui tekstu, nuotraukomis, vaizdo įrašais arba apklausomis.
+      post_title: Sukūrk savo pirmąjį įrašą
+      share_action: Bendrinti
+      share_step: Leisk draugams sužinoti, kaip tave rasti Mastodon.
+      share_title: Bendrink savo Mastodon profilį
+      sign_in_action: Prisijungti
       subject: Sveiki atvykę į Mastodon
       title: Sveiki atvykę, %{name}!
   users:
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index dc4c39083cd86d..d6d0f05c50a104 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -37,7 +37,7 @@ lv:
       approve: Apstiprināt
       approved_msg: Veiksmīgi apstiprināts %{username} reģistrēšanās pieteikums
       are_you_sure: Vai esi pārliecināts?
-      avatar: Avatars
+      avatar: Profila attēls
       by_domain: Domēns
       change_email:
         changed_msg: E-pasts veiksmīgi nomainīts!
@@ -65,7 +65,7 @@ lv:
       disabled: Iesaldēts
       display_name: Parādāmais vārds
       domain: Domēns
-      edit: Rediģēt
+      edit: Labot
       email: E-pasts
       email_status: E-pasta statuss
       enable: Atsaldēt
@@ -122,9 +122,9 @@ lv:
       rejected_msg: Veiksmīgi noraidīts %{username} reģistrēšanās pieteikums
       remote_suspension_irreversible: Šī konta dati ir neatgriezeniski dzēsti.
       remote_suspension_reversible_hint_html: Konts ir apturēts viņu serverī, un dati tiks pilnībā noņemti %{date}. Līdz tam attālais serveris var atjaunot šo kontu bez jebkādām negatīvām sekām. Ja vēlaties nekavējoties noņemt visus konta datus, varat to izdarīt tālāk.
-      remove_avatar: Noņemt avatāru
+      remove_avatar: Noņemt profila attēlu
       remove_header: Noņemt galveni
-      removed_avatar_msg: Veiksmīgi noņemts %{username} avatāra attēls
+      removed_avatar_msg: Veiksmīgi noņemts %{username} profila attēls
       removed_header_msg: Veiksmīgi noņemts %{username} galvenes attēls
       resend_confirmation:
         already_confirmed: Šis lietotājs jau ir apstiprināts
@@ -212,7 +212,7 @@ lv:
         promote_user: Izceltt Lietotāju
         reject_appeal: Noraidīt Apelāciju
         reject_user: Noraidīt lietotāju
-        remove_avatar_user: Noņemt Avatāru
+        remove_avatar_user: Noņemt profila attēlu
         reopen_report: Atkārtoti Atvērt Ziņojumu
         resend_user: Atkārtoti nosūtīt Apstiprinājuma Pastu
         reset_password_user: Atiestatīt Paroli
@@ -260,7 +260,7 @@ lv:
         destroy_status_html: "%{name} noņēma ziņu %{target}"
         destroy_unavailable_domain_html: "%{name} atjaunoja piegādi uz domēnu %{target}"
         destroy_user_role_html: "%{name} izdzēsa %{target} lomu"
-        disable_2fa_user_html: "%{name} atspējoja divfaktoru prasības lietotājam %{target}"
+        disable_2fa_user_html: "%{name} atspējoja divpakāpju prasības lietotājam %{target}"
         disable_custom_emoji_html: "%{name} atspējoja emocijzīmi %{target}"
         disable_sign_in_token_auth_user_html: "%{name} atspējoja e-pasta marķiera autentifikāciju %{target}"
         disable_user_html: "%{name} atspējoja pieteikšanos lietotājam %{target}"
@@ -271,7 +271,7 @@ lv:
         promote_user_html: "%{name} paaugstināja lietotāju %{target}"
         reject_appeal_html: "%{name} noraidīja moderācijas lēmuma apelāciju no %{target}"
         reject_user_html: "%{name} noraidīja reģistrēšanos no %{target}"
-        remove_avatar_user_html: "%{name} noņēma %{target} avatāru"
+        remove_avatar_user_html: "%{name} noņēma %{target} profila attēlu"
         reopen_report_html: "%{name} atkārtoti atvēra ziņojumu %{target}"
         resend_user_html: "%{name} atkārtoti nosūtīja apstiprinājuma e-pastu %{target}"
         reset_password_user_html: "%{name} atiestatīja paroli lietotājam %{target}"
@@ -298,7 +298,7 @@ lv:
     announcements:
       destroyed_msg: Paziņojums ir veiksmīgi izdzēsts!
       edit:
-        title: Rediģēt paziņojumu
+        title: Labot paziņojumu
       empty: Neviens paziņojums netika atrasts.
       live: Dzīvajā
       new:
@@ -402,7 +402,7 @@ lv:
       created_msg: Domēna bloķēšana tagad tiek apstrādāta
       destroyed_msg: Domēna bloķēšana ir atsaukta
       domain: Domēns
-      edit: Rediģēt domēna bloķēšanu
+      edit: Labot domēna aizturēšanu
       existing_domain_block: Tu jau esi noteicis stingrākus ierobežojumus %{name}.
       existing_domain_block_html: Tu jau esi noteicis stingrākus ierobežojumus %{name}, vispirms tev <a href="%{unblock_url}">jāatbloķē</a>.
       export: Eksportēt
@@ -432,6 +432,7 @@ lv:
       view: Skatīt domēna bloķēšanu
     email_domain_blocks:
       add_new: Pievienot jaunu
+      allow_registrations_with_approval: Atļaut reģistrāciju ar apstiprināšanu
       attempts_over_week:
         one: "%{count} mēģinājums pagājušajā nedēļā"
         other: "%{count} reģistrēšanās mēģinājumi pagājušajā nedēļā"
@@ -467,7 +468,7 @@ lv:
         title: Importēt bloķētos domēnus
       no_file: Nav atlasīts neviens fails
     follow_recommendations:
-      description_html: "<strong>Sekošana rekomendācijām palīdz jaunajiem lietotājiem ātri atrast interesantu saturu</strong>. Ja lietotājs nav pietiekami mijiedarbojies ar citiem, lai izveidotu personalizētus ieteikumus, ieteicams izmantot šos kontus. Tie tiek pārrēķināti katru dienu, izmantojot vairākus kontus ar visaugstākajām pēdējā laika saistībām un vislielāko vietējo sekotāju skaitu noteiktā valodā."
+      description_html: "<strong>Sekošanas ieteikumi palīdz jauniem lietotājiem ātri arast saistošu saturu</strong>. Kad lietotājs nav pietiekami mijiedarbojies ar citiem, lai veidotos pielāgoti sekošanas iteikumi, tiek ieteikti šie konti. Tie tiek pārskaitļoti ik dienas, izmantojot kontu, kuriem ir augstākās nesenās iesaistīšanās un lielākais vietējo sekotāju skaits norādītajā valodā."
       language: Valodai
       status: Statuss
       suppress: Apspiest sekošanas rekomendāciju
@@ -688,7 +689,7 @@ lv:
         special: Īpašās
       delete: Dzēst
       description_html: Izmantojot <strong>lietotāju lomas</strong>, vari pielāgot, kurām Mastodon funkcijām un apgabaliem var piekļūt tavi lietotāji.
-      edit: Rediģēt lomu '%{name}'
+      edit: Labot lomu '%{name}'
       everyone: Noklusētās atļaujas
       everyone_full_description_html: Šī ir <strong>pamata loma</strong>, kas ietekmē <strong>visus lietotājus</strong>, pat tos, kuriem nav piešķirta loma. Visas pārējās lomas manto atļaujas no šīs.
       permissions_count:
@@ -741,7 +742,7 @@ lv:
       add_new: Pievienot noteikumu
       delete: Dzēst
       description_html: Lai gan lielākā daļa apgalvo, ka ir izlasījuši pakalpojumu sniegšanas noteikumus un piekrīt tiem, parasti cilvēki to izlasa tikai pēc problēmas rašanās. <strong>Padariet vienkāršāku sava servera noteikumu uztveršanu, veidojot tos vienkāršā sarakstā pa punktiem.</strong> Centieties, lai atsevišķi noteikumi būtu īsi un vienkārši, taču arī nesadaliet tos daudzos atsevišķos vienumos.
-      edit: Rediģēt noteikumu
+      edit: Labot nosacījumu
       empty: Servera noteikumi vēl nav definēti.
       title: Servera noteikumi
     settings:
@@ -829,7 +830,7 @@ lv:
       reblogs: Reblogi
       status_changed: Ziņa mainīta
       title: Konta ziņas
-      trending: Populārākie
+      trending: Aktuāli
       visibility: Redzamība
       with_media: Ar multividi
     strikes:
@@ -884,7 +885,7 @@ lv:
         action: Pārbaudi šeit, lai iegūtu plašāku informāciju
         message_html: "<strong>Tava objektu krātuve ir nepareizi konfigurēta. Tavu lietotāju privātums ir apdraudēts.</strong>"
     tags:
-      review: Pārskatīt statusu
+      review: Pārskatīt stāvokli
       updated_msg: Tēmtura iestatījumi ir veiksmīgi atjaunināti
     title: Administrēšana
     trends:
@@ -894,7 +895,7 @@ lv:
       links:
         allow: Atļaut saiti
         allow_provider: Atļaut publicētāju
-        description_html: Šīs ir saites, kuras pašlaik bieži koplieto konti, no kuriem tavs serveris redz ziņas. Tas var palīdzēt taviem lietotājiem uzzināt, kas notiek pasaulē. Kamēr tu neapstiprini izdevēju, neviena saite netiek rādīta publiski. Vari arī atļaut vai noraidīt atsevišķas saites.
+        description_html: Šīs ir saites, kuras pašlaik bieži koplieto konti, no kuriem Tavs serveris redz ziņas. Tas var palīdzēt Taviem lietotājiem uzzināt, kas notiek pasaulē. Neviena saite netiek publiski rādīta, līdz tu apstiprini izdevēju. Tu vari arī atļaut vai noraidīt atsevišķas saites.
         disallow: Neatļaut saiti
         disallow_provider: Neatļaut publicētāju
         no_link_selected: Neviena saite netika mainīta, jo neviena netika atlasīta
@@ -902,7 +903,7 @@ lv:
           no_publisher_selected: Neviens publicētājs netika mainīts, jo neviens netika atlasīts
         shared_by_over_week:
           one: Pēdējās nedēļas laikā kopīgoja viena persona
-          other: Pēdējās nedēļas laikā kopīgoja %{count} personas
+          other: Pēdējās nedēļas laikā kopīgoja %{count} cilvēki
           zero: Pēdējās nedēļas laikā kopīgoja %{count} personas
         title: Populārākās saites
         usage_comparison: Šodien kopīgots %{today} reizes, salīdzinot ar %{yesterday} vakar
@@ -916,10 +917,10 @@ lv:
         title: Publicētāji
       rejected: Noraidīts
       statuses:
-        allow: Atļaut publicēt
+        allow: Ļaut veikt ierakstus
         allow_account: Atļaut autoru
-        description_html: Šīs ir ziņas, par kurām tavs serveris zina un kuras pašlaik tiek koplietotas un pašlaik ir daudz izlasē. Tas var palīdzēt taviem jaunajiem un atkārtotiem lietotājiem atrast vairāk cilvēku, kam sekot. Neviena ziņa netiek publiski rādīta, kamēr neesi apstiprinājis autoru un autors atļauj savu kontu ieteikt citiem. Vari arī atļaut vai noraidīt atsevišķas ziņas.
-        disallow: Neatļaut publicēt
+        description_html: Šie ir ieraksti, par kuriem zina Tavs serveris un kuri pašlaik tiek daudz kopīgoti un pievienoti izlasēm. Tas var palīdzēt jaunajiem lietotājiem un tiem, kuri atgriežas, atrast vairāk cilvēku, kam sekot. Neviens ieraksts netiek publiski rādīts, līdz apstiprināsi autoru un ja autors ļauj savu kontu ieteikt citiem. Tu vari arī atļaut vai noraidīt atsevišķus ierakstus.
+        disallow: Neļaut veikt ierakstus
         disallow_account: Neatļaut autoru
         no_status_selected: Neviena populāra ziņa netika mainīta, jo neviena netika atlasīta
         not_discoverable: Autors nav izvēlējies būt atklājams
@@ -936,7 +937,7 @@ lv:
           tag_servers_dimension: Populārākie serveri
           tag_servers_measure: dažādi serveri
           tag_uses_measure: lietojumi pavisam
-        description_html: Šīs ir atsauces, kas pašlaik tiek rādītas daudzās ziņās, kuras redz tavs serveris. Tas var palīdzēt taviem lietotājiem uzzināt, par ko cilvēki šobrīd runā visvairāk. Neviena atsauce netiek rādīta publiski, kamēr tu neesi tās apstiprinājis.
+        description_html: Šie ir tēmturi, kas pašlaik parādās daudzos ierakstos, kurus redz Tavs serveris. Tas var palīdzēt Taviem lietotājiem uzzināt, par ko cilvēki šobrīd runā visvairāk. Neviens tēmturis netiek publiski parādīts, līdz apstiprināsi tos.
         listable: Var tikt ieteikts
         no_tag_selected: Neviena atzīme netika mainīta, jo neviena netika atlasīta
         not_listable: Nevar tikt ieteikts
@@ -947,10 +948,10 @@ lv:
         trendable: Var parādīsies pie tendencēm
         trending_rank: 'Populārākie #%{rank}'
         usable: Var tikt lietots
-        usage_comparison: Šodien lietots %{today} reizes, salīdzinot ar %{yesterday} vakar
+        usage_comparison: Šodien izmantots %{today} reizes, salīdzinot ar %{yesterday} vakar
         used_by_over_week:
           one: Pēdējās nedēļas laikā izmantoja viens cilvēks
-          other: Pēdējās nedēļas laikā izmantoja %{count} personas
+          other: Pēdējās nedēļas laikā izmantoja %{count} cilvēki
           zero: Pēdējās nedēļas laikā izmantoja %{count} personas
       title: Tendences
       trending: Populārākie
@@ -966,7 +967,7 @@ lv:
       description_html: Izmantojot <strong>tīmekļa aizķeri</strong>, Mastodon var nosūtīt jūsu lietojumprogrammai <strong>reāllaika paziņojumus</strong> par izvēlētajiem notikumiem, lai tava lietojumprogramma varētu <strong>automātiski izraisīt reakcijas</strong>.
       disable: Atspējot
       disabled: Atspējots
-      edit: Rediģēt galapunktu
+      edit: Labot galapunktu
       empty: Tev vēl nav konfigurēts neviens tīmekļa aizķeres galapunkts.
       enable: Iespējot
       enabled: Aktīvie
@@ -1053,7 +1054,7 @@ lv:
   auth:
     apply_for_account: Pieprasīt kontu
     captcha_confirmation:
-      help_html: Ja tev ir problēmas ar CAPTCHA risināšanu, vari sazināties ar mums, izmantojot %{email}, un mēs varam tev palīdzēt.
+      help_html: Ja Tev ir sarežģījumi ar CAPTCHA risināšanu, Tu vari sazināties ar mums e-pasta adresē %{email}, un mēs varēsim Tev palīdzēt.
       hint_html: Vēl tikai viena lieta! Mums ir jāapstiprina, ka tu esi cilvēks (tas ir tāpēc, lai mēs varētu nepieļaut surogātpasta izsūtīšanu!). Atrisini tālāk norādīto CAPTCHA un noklikšķini uz "Turpināt".
       title: Drošības pārbaude
     confirmations:
@@ -1065,7 +1066,7 @@ lv:
       redirect_to_app_html: Tev vajadzētu būt novirzītam uz lietotni <strong>%{app_name}</strong>. Ja tas nenotika, mēģini %{clicking_this_link} vai manuāli atgriezieties lietotnē.
       registration_complete: Tava reģistrācija domēnā %{domain} tagad ir pabeigta!
       welcome_title: Laipni lūdzam, %{name}!
-      wrong_email_hint: Ja šī e-pasta adrese nav pareiza, varat to mainīt konta iestatījumos.
+      wrong_email_hint: Ja šī e-pasta adrese nav pareiza, to var mainīt konta iestatījumos.
     delete_account: Dzēst kontu
     delete_account_html: Ja vēlies dzēst savu kontu, tu vari <a href="%{path}">turpināt šeit</a>. Tev tiks lūgts apstiprinājums.
     description:
@@ -1076,7 +1077,7 @@ lv:
     dont_have_your_security_key: Vai tev nav drošības atslēgas?
     forgot_password: Aizmirsi paroli?
     invalid_reset_password_token: Paroles atiestatīšanas pilnvara nav derīga, vai tai ir beidzies derīgums. Lūdzu, pieprasi jaunu.
-    link_to_otp: Ievadi divfaktoru kodu no tālruņa vai atkopšanas kodu
+    link_to_otp: Jāievada divpakāpju kods no tālruņa vai atkopšanas kods
     link_to_webauth: Lieto savu drošības atslēgas iekārtu
     log_in_with: Pieslēgties ar
     login: Pieteikties
@@ -1108,13 +1109,13 @@ lv:
     security: Drošība
     set_new_password: Iestatīt jaunu paroli
     setup:
-      email_below_hint_html: Pārbaudi savu surogātpasta mapi vai pieprasiet citu. Tu vari labot savu e-pasta adresi, ja tā ir nepareiza.
+      email_below_hint_html: Pārbaudi savu surogātpasta mapi vai pieprasi vēl vienu! Tu vari labot savu e-pasta adresi, ja tā ir nepareiza.
       email_settings_hint_html: Noklikšķini uz saites, kuru mēs tev nosūtījām, lai apstiprinātu %{email}. Mēs tepat pagaidīsim.
       link_not_received: Vai nesaņēmi sati?
       new_confirmation_instructions_sent: Pēc dažām minūtēm saņemsi jaunu e-pastu ar apstiprinājuma saiti!
       title: Pārbaudi savu iesūtni
     sign_in:
-      preamble_html: Piesakies ar saviem <strong>%{domain}</strong> akreditācijas datiem. Ja tavs konts ir mitināts citā serverī, tu nevarēsi pieteikties šeit.
+      preamble_html: Jāpiesakās ar saviem <strong>%{domain}</strong> piekļuves datiem. Ja Tavs konts tiek mitināts citā serverī, Tu nevarēsi šeit pieteikties.
       title: Pierakstīties %{domain}
     sign_up:
       manual_review: Reģistrācijas domēnā %{domain} manuāli pārbauda mūsu moderatori. Lai palīdzētu mums apstrādāt tavu reģistrāciju, uzraksti mazliet par sevi un to, kāpēc vēlies kontu %{domain}.
@@ -1123,7 +1124,7 @@ lv:
     status:
       account_status: Konta statuss
       confirming: Gaida e-pasta apstiprinājuma pabeigšanu.
-      functional: Tavs konts ir pilnībā darboties spējīgs.
+      functional: Tavs konts ir pilnā darba kārtībā.
       pending: Tavu pieteikumu gaida mūsu darbinieku izskatīšana. Tas var aizņemt kādu laiku. Ja tavs pieteikums tiks apstiprināts, tu saņemsi e-pastu.
       redirecting_to: Tavs konts ir neaktīvs, jo pašlaik tas tiek novirzīts uz %{acct}.
       self_destruct: Tā kā %{domain} tiek slēgts, tu iegūsi tikai ierobežotu piekļuvi savam kontam.
@@ -1164,7 +1165,7 @@ lv:
     proceed: Dzēst kontu
     success_msg: Tavs konts tika veiksmīgi dzēsts
     warning:
-      before: 'Pirms turpināt, lūdzu, uzmanīgi izlasi šīs piezīmes:'
+      before: 'Pirms turpināšanas lūgums uzmanīgi izlasīt šīs piezīmes:'
       caches: Citu serveru kešatmiņā saglabātais saturs var saglabāties
       data_removal: Tavas ziņas un citi dati tiks neatgriezeniski noņemti
       email_change_html: Tu vari <a href="%{path}">mainīt savu e-pasta adresi</a>, neizdzēšot savu kontu
@@ -1187,7 +1188,7 @@ lv:
       approve_appeal: Apstiprināt apelāciju
       associated_report: Saistītais ziņojums
       created_at: Datēts
-      description_html: Šīs ir darbības, kas veiktas pret tavu kontu, un brīdinājumi, ko tev ir nosūtījuši %{instance} darbinieki.
+      description_html: Šīs ir darbības, kas veiktas pret Tavu kontu, un brīdinājumi, kurus Tev ir nosūtījuši %{instance} darbinieki.
       recipient: Adresēts
       reject_appeal: Noraidīt apelāciju
       status: 'Publikācija #%{id}'
@@ -1208,7 +1209,7 @@ lv:
     invalid_domain: nav derīgs domēna nosaukums
   edit_profile:
     basic_information: Pamata informācija
-    hint_html: "<strong>Pielāgo to, ko cilvēki redz tavā publiskajā profilā un blakus tavām ziņām.</strong> Citas personas, visticamāk, sekos tev un sazināsies ar tevi, ja tev būs aizpildīts profils un profila attēls."
+    hint_html: "<strong>Pielāgo, ko cilvēki redz Tavā publiskajā profilā un blakus Taviem ierakstiem.</strong> Ir lielāka iespējamība, ka citi clivēki sekos Tev un mijiedarbosies ar Tevi, ja Tev ir aizpildīts profils un profila attēls."
     other: Cits
   errors:
     '400': Tevis iesniegtais pieprasījums bija nederīgs vai nepareizi izveidots.
@@ -1221,7 +1222,7 @@ lv:
       title: Drošības pārbaude neizdevās
     '429': Pārāk daudz pieprasījumu
     '500':
-      content: Atvaino, bet kaut kas mūsu pusē nogāja greizi.
+      content: Atvainojamies, bet mūsu pusē kaut kas nogāja greizi.
       title: Šī lapa nav pareiza
     '503': Lapu nevarēja apkalpot īslaicīgas servera kļūmes dēļ.
     noscript_html: Lai izmantotu Mastodon web lietojumu, lūdzu, iespējo JavaScript. Vai arī izmēģini kādu no <a href="%{apps_path}">vietējām lietotnēm</a> Mastodon savai platformai.
@@ -1247,7 +1248,7 @@ lv:
     add_new: Pievienot jaunu
     errors:
       limit: Tu jau esi piedāvājis maksimālo tēmturu skaitu
-    hint_html: "<strong>Kas ir piedāvātie tēmturi?</strong> Tie ir redzami tavā publiskajā profilā un ļauj cilvēkiem pārlūkot tavas publiskās ziņas tieši zem šiem tēmturiem. Tie ir lielisks līdzeklis radošu darbu vai ilgtermiņa projektu izsekošanai."
+    hint_html: "<strong>Izcel savus vissvarīgākos tēmturus savā profilā!</strong> Lielisks rīks, lai izsekotu saviem radošajiem darbiem un ilgtermiņa projektiem, izceltie tēmturi tiek attēloti pamanāmi attēloti Tavā profilā un ļauj ātru piekļuvi saviem ierakstiem."
   filters:
     contexts:
       account: Profili
@@ -1260,7 +1261,7 @@ lv:
       keywords: Atslēgvārdi
       statuses: Individuālās ziņas
       statuses_hint_html: Šis filtrs attiecas uz atsevišķām ziņām neatkarīgi no tā, vai tās atbilst tālāk norādītajiem atslēgvārdiem. <a href="%{path}">Pārskatīt vai noņemt ziņas no filtra</a>.
-      title: Rediģēt filtru
+      title: Labot atlasi
     errors:
       deprecated_api_multiple_keywords: Šos parametrus šajā lietojumprogrammā nevar mainīt, jo tie attiecas uz vairāk nekā vienu filtra atslēgvārdu. Izmanto jaunāku lietojumprogrammu vai tīmekļa saskarni.
       invalid_context: Nav, vai piegādāts nederīgs konteksts
@@ -1330,7 +1331,7 @@ lv:
       too_large: Fails ir pārāk liels
     failures: Kļūmes
     imported: Importēti
-    mismatched_types_warning: Šķiet, ka šim importam esi izvēlējies nepareizu veidu. Lūdzu, pārbaudi vēlreiz.
+    mismatched_types_warning: Izskatās, ka varētu būt atlasīts nepareizs veids šai ievietošanai. Lūgums pārbaudīt vēlreiz.
     modes:
       merge: Apvienot
       merge_long: Saglabāt esošos ierakstus un pievienot jaunus
@@ -1407,11 +1408,11 @@ lv:
       limit: Jūs esat sasniedzis maksimālo sarakstu skaitu
   login_activities:
     authentication_methods:
-      otp: divfaktoru autentifikācijas lietotne
+      otp: divpakāpju autentifikācijas lietotne
       password: parole
       sign_in_token: e-pasta drošības kods
       webauthn: drošības atslēgas
-    description_html: Ja pamani darbības, kuras tu neatpazīsti, apsver iespēju nomainīt savu paroli un iespējot divfaktoru autentifikāciju.
+    description_html: Ja pamani darbības, kuras neatpazīsti, jāapsver iespēja nomainīt savu paroli un iespējot divpakāpju autentifikāciju.
     empty: Nav pieejama autentifikācijas vēsture
     failed_sign_in_html: Neizdevies pierakstīšanās mēģinājums ar %{method} no %{ip} (%{browser})
     successful_sign_in_html: Veiksmīga pierakstīšanās ar %{method} no %{ip} (%{browser})
@@ -1460,7 +1461,7 @@ lv:
     set_redirect: Iestatīt novirzīšanu
     warning:
       backreference_required: Jaunais konts vispirms ir jākonfigurē, lai tas atsauktos uz šo kontu
-      before: 'Pirms turpināt, lūdzu, uzmanīgi izlasi šīs piezīmes:'
+      before: 'Pirms turpināšanas lūgums uzmanīgi izlasīt šīs piezīmes:'
       cooldown: Pēc pārcelšanās ir gaidīšanas periods, kura laikā tu vairs nevarēsi pārvietoties
       disabled_account: Tavs pašreizējais konts pēc tam nebūs pilnībā lietojams. Tomēr tev būs piekļuve datu eksportēšanai, kā arī atkārtotai aktivizēšanai.
       followers: Veicot šo darbību, visi sekotāji tiks pārvietoti no pašreizējā konta uz jauno kontu
@@ -1508,7 +1509,7 @@ lv:
     status:
       subject: "%{name} tikko publicēja"
     update:
-      subject: "%{name} rediģējis rakstu"
+      subject: "%{name} laboja ierakstu"
   notifications:
     administration_emails: Administrators e-pasta paziņojumi
     email_events: E-pasta paziņojumu notikumi
@@ -1525,12 +1526,12 @@ lv:
           trillion: T
   otp_authentication:
     code_hint: Lai apstiprinātu, ievadi autentifikācijas lietotnes ģenerēto kodu
-    description_html: Ja iespējosi <strong>divfaktoru autentifikāciju</strong>, izmantojot autentifikatora lietotni, lai pieteiktos, tev būs nepieciešams tālrunis, kas ģenerēs ievadāmos marķierus.
+    description_html: Jā iespējo <strong>divpakāpju autentifikāciju</strong> ar autentificēšanas lietotni, pieteikšanās laikā būs nepieciešams tālrunis, kurā tiks izveidoti ievadāmie kodi.
     enable: Iespējot
     instructions_html: "<strong>Skenē šo QR kodu Google Authenticator vai līdzīgā TOTP lietotnē savā tālrunī</strong>. No šī brīža šī lietotne ģenerēs marķierus, kas tev būs jāievada, piesakoties."
     manual_instructions: 'Ja nevari noskenēt QR kodu un tas ir jāievada manuāli, šeit ir noslēpums vienkāršā tekstā:'
     setup: Iestatīt
-    wrong_code: Ievadītais kods nebija derīgs! Vai servera laiks un ierīces laiks ir pareizs?
+    wrong_code: Ievadītais kods bija nederīgs. Vai servera un ierīces laiks ir pareizs?
   pagination:
     newer: Jaunāks
     next: Nākamais
@@ -1631,7 +1632,7 @@ lv:
       weibo: Weibo
     current_session: Pašreizējā sesija
     description: "%{browser} uz %{platform}"
-    explanation: Šīs ir tīmekļa pārlūkprogrammas, kurās pašlaik esi pieteicies savā Mastodon kontā.
+    explanation: Šie ir tīmekļa pārlūki, kuros šobrīd esi pieteicies savā Mastodon kontā.
     ip: IP
     platforms:
       adobe_air: Adobe Air
@@ -1660,7 +1661,7 @@ lv:
     back: Atgriezties Mastodon
     delete: Konta dzēšana
     development: Izstrāde
-    edit_profile: Rediģēt profilu
+    edit_profile: Labot profilu
     export: Datu eksports
     featured_tags: Piedāvātie tēmturi
     import: Imports
@@ -1672,7 +1673,7 @@ lv:
     relationships: Sekojamie un sekotāji
     statuses_cleanup: Automātiska ziņu dzēšana
     strikes: Moderācijas aizrādījumi
-    two_factor_authentication: Divfaktoru Aut
+    two_factor_authentication: Divpakāpju autentifikācija
     webauthn_authentication: Drošības atslēgas
   statuses:
     attached:
@@ -1696,7 +1697,7 @@ lv:
       one: 'saturēja neatļautu tēmturi: %{tags}'
       other: 'saturēja neatļautus tēmturus: %{tags}'
       zero: 'neatļauti tēmturi: %{tags}'
-    edited_at_html: Rediģēts %{date}
+    edited_at_html: Labots %{date}
     errors:
       in_reply_not_found: Šķiet, ka ziņa, uz kuru tu mēģini atbildēt, nepastāv.
     open_in_web: Atvērt webā
@@ -1704,12 +1705,12 @@ lv:
     pin_errors:
       direct: Ziņojumus, kas ir redzami tikai minētajiem lietotājiem, nevar piespraust
       limit: Tu jau esi piespraudis maksimālo ziņu skaitu
-      ownership: Citas personas ziņu nevar piespraust
+      ownership: Kāda cita ierakstu nevar piespraust
       reblog: Izceltu ierakstu nevar piespraust
     poll:
       total_people:
         one: "%{count} persona"
-        other: "%{count} personas"
+        other: "%{count} cilvēki"
         zero: "%{count} personu"
       total_votes:
         one: "%{count} balss"
@@ -1788,13 +1789,13 @@ lv:
   two_factor_authentication:
     add: Pievienot
     disable: Atspējot 2FA
-    disabled_success: Divfaktoru autentifikācija veiksmīgi atspējota
-    edit: Rediģēt
-    enabled: Divfaktoru autentifikācija ir iespējota
-    enabled_success: Divfaktoru autentifikācija veiksmīgi iespējota
+    disabled_success: Divpakāpju autentifikācija veiksmīgi atspējota
+    edit: Labot
+    enabled: Divpakāpju autentifikācija ir iespējota
+    enabled_success: Divpakāpju autentifikācija veiksmīgi iespējota
     generate_recovery_codes: Ģenerēt atkopšanas kodus
     lost_recovery_codes: Atkopšanas kodi ļauj atgūt piekļuvi tavam kontam, ja pazaudē tālruni. Ja esi pazaudējis atkopšanas kodus, tu vari tos ģenerēt šeit. Tavi vecie atkopšanas kodi tiks anulēti.
-    methods: Divfaktoru metodes
+    methods: Divpakāpju veidi
     otp: Autentifikātora lietotne
     recovery_codes: Veidot atkopšanas kodu rezerves kopijas
     recovery_codes_regenerated: Atkopšanas kodi veiksmīgi atjaunoti
@@ -1851,9 +1852,8 @@ lv:
         silence: Konts ierobežots
         suspend: Konts apturēts
     welcome:
-      edit_profile_action: Iestatīt profilu
-      edit_profile_step: Tu vari pielāgot savu profilu, augšupielādējot profila attēlu, mainot parādāmo vārdu un citas lietas. Vari izvēlēties pārskatīt jaunus sekotājus, pirms atļauj viņiem tev sekot.
       explanation: Šeit ir daži padomi, kā sākt darbu
+      feature_creativity: Mastodon nodrošina skaņas, video un attēlu ierakstus, pieejamības aprakstus, aptaujas, satura brīdinājumus, animētus profila attēlus, pielāgotas emocijzīmes, sīktēlu apgriešanas vadīklas un vēl, lai palīdzētu Tev sevi izpaust tiešsaistē. Vai Tu izplati savu mākslu, mūziku vai aplādes, Mastodon ir šeit ar Tevi.
       subject: Laipni lūgts Mastodon
       title: Laipni lūgts uz borta, %{name}!
   users:
@@ -1867,7 +1867,7 @@ lv:
     extra_instructions_html: <strong>Padoms.</strong> saite tavā vietnē var būt neredzama. Svarīga daļa ir <code>rel="me"</code>, kas novērš uzdošanos vietnēs ar lietotāju ģenerētu saturu. Tu vari pat lapas galvenē izmantot tagu <code>link</code>, nevis <code>a</code>, taču HTML ir jābūt pieejamam, neizpildot JavaScript.
     here_is_how: Lūk, kā
     hint_html: "<strong>Ikviens var apliecināt savu identitāti Mastodon.</strong> Pamatojoties uz atvērtiem tīmekļa standartiem, tagad un uz visiem laikiem bez maksas. Viss, kas tev nepieciešams, ir personīga vietne, pēc kuras cilvēki tevi atpazīst. Kad no sava profila izveidosi saiti uz šo vietni, mēs pārbaudīsim, vai vietne novirza atpakaļ uz tavu profilu, un tajā tiks parādīts vizuāls indikators."
-    instructions_html: Nokopē un ielīmē tālāk norādīto kodu savas vietnes HTML. Pēc tam pievieno savas vietnes adresi vienā no papildu laukiem savā profilā no cilnes "Rediģēt profilu" un saglabā izmaiņas.
+    instructions_html: Ievieto starpliktuvē un ielīmē tālāk norādīto kodu savas tīmekļvietnes HTML! Tad pievieno savas tīmekļvietnes adresi vienā no papildu laukiem savā profila cilnē "Labot profilu" un saglabā izmaiņas!
     verification: Pārbaude
     verified_links: Tavas verifikācijas saites
   webauthn_credentials:
@@ -1885,5 +1885,5 @@ lv:
     nickname_hint: Ievadi savas jaunās drošības atslēgas segvārdu
     not_enabled: Tu vel neesi iespējojis WebAuthn
     not_supported: Šī pārlūkprogramma neatbalsta drošības atslēgas
-    otp_required: Lai izmantotu drošības atslēgas, lūdzu, vispirms iespējo divfaktoru autentifikāciju.
+    otp_required: Lai izmantotu drošības atslēgas, lūgums vispirms iespējot divpakāpju autentifikāciju.
     registered_on: Reģistrēts %{date}
diff --git a/config/locales/ms.yml b/config/locales/ms.yml
index e20dfd09e0840d..1704aed3e07f88 100644
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@@ -1768,8 +1768,6 @@ ms:
         silence: Akaun terhad
         suspend: Akaun digantung
     welcome:
-      edit_profile_action: Sediakan profil
-      edit_profile_step: Anda boleh menyesuaikan profil anda dengan memuat naik gambar profil, menukar nama paparan anda dan banyak lagi. Anda boleh ikut serta untuk menyemak pengikut baharu sebelum mereka dibenarkan mengikuti anda.
       explanation: Berikut ialah beberapa petua untuk anda bermula
       subject: Selamat datang kepada Mastodon
       title: Selamat datang, %{name}!
diff --git a/config/locales/my.yml b/config/locales/my.yml
index f2c115c17c1134..a01755b6c48a43 100644
--- a/config/locales/my.yml
+++ b/config/locales/my.yml
@@ -1767,8 +1767,6 @@ my:
         silence: အကောင့်ကန့်သတ်ထားသည်
         suspend: အကောင့်ရပ်ဆိုင်းထားသည်
     welcome:
-      edit_profile_action: ပရိုဖိုင်ထည့်သွင်းရန်
-      edit_profile_step: ပရိုဖိုင်ဓာတ်ပုံတစ်ပုံ တင်ခြင်း၊ ဖော်ပြမည့်အမည် ပြောင်းလဲခြင်းနှင့် အခြားအရာများပြုလုပ်ခြင်းတို့ဖြင့် သင့်ပရိုဖိုင်ကို စိတ်ကြိုက်ပြင်ဆင်နိုင်ပါသည်။ စောင့်ကြည့်သူအသစ်များ သင့်ကိုစောင့်ကြည့်ခွင့်မပြုမီ ပြန်လည်သုံးသပ်ရန်အတွက် ဆုံးဖြတ်နိုင်ပါသည်။
       explanation: ဤသည်မှာ သင် စတင်အသုံးပြုနိုင်ရန်အတွက် အကြံပြုချက်အချို့ဖြစ်ပါသည်
       subject: Mastodon မှ လှိုက်လှဲစွာကြိုဆိုပါသည်။
       title: "%{name} က ကြိုဆိုပါတယ်။"
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index ac49efddf1f323..8f7cb06b66a440 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -1842,9 +1842,42 @@ nl:
         silence: Account beperkt
         suspend: Account opgeschort
     welcome:
-      edit_profile_action: Profiel instellen
-      edit_profile_step: Je kunt jouw profiel aanpassen door een profielfoto te uploaden, jouw weergavenaam aan te passen en meer. Je kunt het handmatig goedkeuren van volgers instellen.
+      apps_android_action: Via Google Play downloaden
+      apps_ios_action: Via de App Store downloaden
+      apps_step: Onze officiële apps downloaden.
+      apps_title: Mastodon-apps
+      checklist_subtitle: 'Laten we aan dit nieuwe sociale avontuur beginnen:'
+      checklist_title: Welkomstchecklist
+      edit_profile_action: Personaliseren
+      edit_profile_step: Anderen zullen eerder met je in contact treden als je wat over jezelf vertelt.
+      edit_profile_title: Je profiel aanpassen
       explanation: Hier zijn enkele tips om je op weg te helpen
+      feature_action: Meer informatie
+      feature_audience: Mastodon biedt je een unieke mogelijkheid om je publiek te beheren zonder tussenpersonen. Mastodon, geïmplementeerd in jouw eigen infrastructuur, stelt je in staat om elke andere Mastodon-server online te volgen en door hen gevolgd te worden, en staat onder controle van niemand, behalve die van jou.
+      feature_audience_title: Bouw jouw publiek in vertrouwen op
+      feature_control: Je weet zelf het beste wat je op jouw tijdlijn wilt zien. Geen algoritmen of advertenties om je tijd te verspillen. Volg iedereen op elke Mastodon-server vanaf één account en ontvang hun berichten in chronologische volgorde, en maak jouw hoekje op het internet een beetje meer zoals jezelf.
+      feature_control_title: Houd controle over je eigen tijdlijn
+      feature_creativity: Mastodon ondersteunt audio-, video- en fotoberichten, toegankelijkheidsbeschrijvingen, peilingen, inhoudswaarschuwingen, geanimeerde profielfoto's, aangepaste lokale emoji's, controle over het bijwerken van thumbnails en meer, om je te helpen jezelf online uit te drukken. Of je nu jouw kunst, jouw muziek of jouw podcast publiceert, Mastodon staat voor je klaar.
+      feature_creativity_title: Ongeëvenaarde creativiteit
+      feature_moderation: Mastodon legt de besluitvorming weer in jouw handen. Elke server creëert diens eigen regels en voorschriften, die lokaal worden gehandhaafd en niet van bovenaf zoals sociale media van bedrijven, waardoor het het meest flexibel is in het reageren op de behoeften van verschillende groepen mensen. Word lid van een server met de regels waarmee je akkoord gaat, of host jouw eigen.
+      feature_moderation_title: Moderatie zoals het hoort
+      follow_action: Volgen
+      follow_step: Op Mastodon draait het helemaal om het volgen van interessante mensen.
+      follow_title: Personaliseer je starttijdlijn
+      follows_subtitle: Volg bekende accounts
+      follows_title: Wie te volgen
+      follows_view_more: Meer mensen om te volgen bekijken
+      hashtags_recent_count: "%{people} mensen in de afgelopen %{days} dagen"
+      hashtags_subtitle: Wat er in de afgelopen 2 dagen is gebeurd verkennen
+      hashtags_title: Populaire hashtags
+      hashtags_view_more: Meer populaire hashtags bekijken
+      post_action: Opstellen
+      post_step: Zeg hallo tegen de wereld met tekst, foto's, video's of peilingen.
+      post_title: Je eerste bericht schrijven
+      share_action: Delen
+      share_step: Laat je vrienden weten waar je op Mastodon bent te vinden.
+      share_title: Je Mastodonprofiel delen
+      sign_in_action: Inloggen
       subject: Welkom op Mastodon
       title: Welkom aan boord %{name}!
   users:
diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index 52ed45a675b956..73821e5e28b04f 100644
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -1842,9 +1842,42 @@ nn:
         silence: Konto avgrensa
         suspend: Konto utvist
     welcome:
-      edit_profile_action: Lag til profil
-      edit_profile_step: Du kan tilpasse profilen din ved å laste opp et profilbilde, endre visningsnavnet ditt og mer. Du kan velge at nye følgere må godkjennes av deg før de får lov til å følge deg.
+      apps_android_action: Få det på Google Play
+      apps_ios_action: Last ned på App Store
+      apps_step: Last ned dei offisielle appane våre.
+      apps_title: Mastodon-appar
+      checklist_subtitle: 'La oss hjelpa deg i gang på denne nye sosiale reisa:'
+      checklist_title: Kom i gang
+      edit_profile_action: Tilpass til deg
+      edit_profile_step: Få fleire samhandlingar ved å fylla ut profilen din.
+      edit_profile_title: Tilpass profilen din
       explanation: Her er nokre tips for å koma i gang
+      feature_action: Lær meir
+      feature_audience: Mastodon gjev deg eit unikt høve til å styra kven som ser innhaldet ditt, utan mellommenn. Viss du installerer Mastodon på din eigen tenar, kan du fylgja og bli fylgt frå alle andre Mastodon-tenarar på nett, og det er ingen andre enn du som har kontrollen.
+      feature_audience_title: Få tilhengjarar på ein trygg måte
+      feature_control: Du veit best kva du vil ha på tidslina di. Her er ingen algoritmar eller reklame som kastar bort tida. Du kan fylgja folk på ein kvar Mastodon-tenar frå brukarkontoen din, få innlegga deira i kronologisk rekkjefylgje, og gjera ditt eige hjørne av internett litt meir ditt.
+      feature_control_title: Hald kontroll over tidslina di
+      feature_creativity: På Mastodon kan du laga innlegg med lyd, film og bilete, du kan skildra media for betre tilgjenge, du kan laga avrøystingar, innhaldsåtvaringar og eigne smilefjes, du kan klyppa til småbilete og endå meir for å uttrykkja deg på nettet. Mastodon passar for deg, anten du vil skriva eller leggja ut kunst, musikk eller podkastar.
+      feature_creativity_title: Ustoppeleg kreativt
+      feature_moderation: Med Mastodon bestemmer du sjølv. Kvar tenar har sine eigne reglar og retningsliner som blir laga lokalt og ikkje sentralt i eit stort firma, slik det er med andre sosiale nettverk. Det gjer at alle slags grupper kan få ein Mastodon-tenar som passar til dei. Du kan bli med på ein tenar som har reglar du er samd med, eller du kan laga din eigen tenar.
+      feature_moderation_title: Moderering slik det bør vera
+      follow_action: Fylg
+      follow_step: Å fylgja interessante folk er det det handlar om på Mastodon.
+      follow_title: Tilpass tidslina di
+      follows_subtitle: Fylg kjende folk
+      follows_title: Kven du kan fylgja
+      follows_view_more: Sjå fleire du kan fylgja
+      hashtags_recent_count: "%{people} folk dei siste %{days} dagane"
+      hashtags_subtitle: Sjå kva som har vore populært dei siste to dagane
+      hashtags_title: Populære emneknaggar
+      hashtags_view_more: Sjå fleire populære emneknaggar
+      post_action: Skriv
+      post_step: Sei hei til verda med tekst, bilete, filmar eller meiningsmålingar.
+      post_title: Skriv ditt fyrste innlegg
+      share_action: Del
+      share_step: Fortel venene dine korleis dei finn deg på Mastodon.
+      share_title: Del Mastodon-profilen din
+      sign_in_action: Logg inn
       subject: Velkomen til Mastodon
       title: Velkomen om bord, %{name}!
   users:
diff --git a/config/locales/no.yml b/config/locales/no.yml
index db56a065faa5f1..ba3d40a522efb2 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -966,6 +966,8 @@
       title: Webhooks
       webhook: Webhook
   admin_mailer:
+    auto_close_registrations:
+      subject: Registreringer for %{instance} har blitt automatisk byttet til å kreve godkjenning
     new_appeal:
       actions:
         delete_statuses: å slette sine innlegg
@@ -1837,9 +1839,30 @@
         silence: Kontoen er begrenset
         suspend: Kontoen er suspendert
     welcome:
-      edit_profile_action: Sett opp profil
-      edit_profile_step: Du kan tilpasse profilen din ved å laste opp et profilbilde, endre visningsnavnet ditt og mer. Du kan velge at nye følgere må godkjennes av deg før de får lov til å følge deg.
+      apps_android_action: Få den på Google Play
+      apps_ios_action: Last ned på App Store
+      apps_step: Last ned våre offisielle apper.
+      apps_title: Mastodon-apper
+      checklist_title: Velkomst-sjekkliste
+      edit_profile_action: Tilpass
+      edit_profile_title: Tilpass profilen din
       explanation: Her er noen tips for å komme i gang
+      feature_action: Lær mer
+      feature_moderation_title: Moderering slik det burde være
+      follow_action: Følg
+      follow_title: Tilpass tidslinjen din
+      follows_subtitle: Følg godt kjente kontoer
+      follows_title: Hvem å følge
+      follows_view_more: Vis flere personer å følge
+      hashtags_recent_count: "%{people} personer i de siste %{days} dagene"
+      hashtags_title: Populære emneknagger
+      hashtags_view_more: Vis flere populære emneknagger
+      post_step: Si hallo til verdenen med tekst, bilder, videoer, eller meningsmålinger.
+      post_title: Lag ditt første innlegg
+      share_action: Del
+      share_step: La vennene dine vite hvordan finne deg på Mastodon.
+      share_title: Del Mastadon-profilen din
+      sign_in_action: Logg inn
       subject: Velkommen til Mastodon
       title: Velkommen ombord, %{name}!
   users:
diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index 32b7da6272a33d..9f9f04ba9be0ac 100644
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -965,7 +965,6 @@ oc:
         silence: Compte limitat
         suspend: Compte suspendut
     welcome:
-      edit_profile_action: Configuracion del perfil
       explanation: Vaquí qualques astúcias per vos preparar
       subject: Benvengut a Mastodon
       title: Vos desirem la benvenguda a bòrd %{name} !
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 9253f2d020c78a..70e772c4c71569 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -1906,9 +1906,42 @@ pl:
         silence: Konto ograniczone
         suspend: Konto zawieszone
     welcome:
-      edit_profile_action: Skonfiguruj profil
-      edit_profile_step: Możesz dostosować profil wysyłając awatar, zmieniając wyświetlaną nazwę i o wiele więcej. Jeżeli chcesz, możesz również włączyć przeglądanie i ręczne akceptowanie nowych próśb o możliwość obserwacji Twojego profilu.
+      apps_android_action: Pobierz z Google Play
+      apps_ios_action: Pobierz z App Store
+      apps_step: Pobierz oficjalne aplikacje.
+      apps_title: Aplikacje Mastodon
+      checklist_subtitle: 'Aby porządnie rozpocząć użytkowanie Mastodona:'
+      checklist_title: Powitalna lista kontrolna
+      edit_profile_action: Personalizuj
+      edit_profile_step: Inni użytkownicy są bardziej skłonni do interakcji z Tobą jeśli posiadasz wypełniony profil.
+      edit_profile_title: Spersonalizuj swój profil
       explanation: Kilka wskazówek, które pomogą Ci rozpocząć
+      feature_action: Dowiedz się więcej
+      feature_audience: Mastodon zapewnia ci unikalne możliwości docierania do twojego grona odbiorców bez żadnych pośredników. Postawiony na własnej infrastrukturze, Mastodon pozwala ci obserwować i być obserwowanym z dowolnego innego serwera Mastodona. Nikt, poza tobą samym(-ą), nie ma nad tym kontroli.
+      feature_audience_title: Buduj swoją publiczność z pewnością
+      feature_control: Sam(a) wiesz najlepiej, co chcesz widzieć na swojej osi czasu. Brak algorytmów i reklam, które marnują twój cenny czas. Obserwuj dowolne osoby z dowolnego serwera Mastodona przy pomocy jednego konta i otrzymuj ich wpisy w kolejności chronologicznej. Każdy zasługuje na własny kąt w internecie.
+      feature_control_title: Miej kontrolę nad swoją osią czasu
+      feature_creativity: Mastodon obsługuje wpisy audio, wideo oraz zdjęcia, jak również opisy zdjęć na potrzeby dostępności, ankiety, ostrzeżenia dotyczące treści, animowane awatary, niestandardowe emoji, kontrolę miniatur zdjęć i więcej, aby pomóc Ci wyrażać siebie. Bez względu na to, czy dzielisz się swoją sztuką, muzyką czy podcastem, Mastodon jest dla ciebie.
+      feature_creativity_title: Niezrównana kreatywność
+      feature_moderation: Mastodon oddaje w twoje ręce prawo podejmowania decyzji. Każdy serwer tworzy własne zasady i regulacje, które są egzekwowane lokalnie a nie odgórnie jak w przypadku korporacyjnych mediów społecznościowych. Czyni to Mastodona najbardziej elastyczną platformą dla różnych grup ludzi z różnymi potrzebami. Dołącz do serwera, z którego zasadami zgadzasz się najbardziej, lub stwórz swój własny.
+      feature_moderation_title: Moderacja we właściwy sposób
+      follow_action: Obserwuj
+      follow_step: Zarządzasz swoim własnym kanałem. Wypełnij go interesującymi ludźmi.
+      follow_title: Spersonalizuj swoją stronę główną
+      follows_subtitle: Obserwuj dobrze znane konta
+      follows_title: Kogo obserwować
+      follows_view_more: Zobacz więcej osób do obserwowania
+      hashtags_recent_count: "%{people} osób w ostatnie %{days} dni"
+      hashtags_subtitle: Zobacz, co było popularne przez ostatnie 2 dni
+      hashtags_title: Popularne hashtagi
+      hashtags_view_more: Zobacz więcej popularnych hashtagów
+      post_action: Utwórz wpis
+      post_step: Przywitaj się ze światem.
+      post_title: Utwórz swój pierwszy post
+      share_action: Udostępnij
+      share_step: Poinformuj swoich przyjaciół jak znaleźć cię na Mastodonie.
+      share_title: Udostępnij swój profil
+      sign_in_action: Zaloguj się
       subject: Witaj w Mastodonie
       title: Witaj na pokładzie, %{name}!
   users:
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 58e734d9eb0c77..a521af185ed312 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -1837,8 +1837,6 @@ pt-BR:
         silence: Conta silenciada
         suspend: Conta banida
     welcome:
-      edit_profile_action: Configurar perfil
-      edit_profile_step: Você pode personalizar seu perfil enviando uma foto de perfil, mudando seu nome de exibição e mais. Você pode optar por revisar novos seguidores antes que eles possam te seguir.
       explanation: Aqui estão algumas dicas para você começar
       subject: Boas-vindas ao Mastodon
       title: Boas vindas, %{name}!
diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index ebc7f84f4f0edb..bd635d12b670c9 100644
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -1842,9 +1842,42 @@ pt-PT:
         silence: Conta limitada
         suspend: Conta suspensa
     welcome:
-      edit_profile_action: Configurar o perfil
-      edit_profile_step: Pode personalizar o seu perfil carregando uma imagem de perfil, alterando o nome a exibir, entre outras opções. Pode optar por rever os novos seguidores antes de estes o poderem seguir.
+      apps_android_action: Baixe no Google Play
+      apps_ios_action: Baixar na App Store
+      apps_step: Baixe nossos aplicativos oficiais.
+      apps_title: Apps Mastodon
+      checklist_subtitle: 'Vamos começar nesta nova fronteira social:'
+      checklist_title: Checklist de Boas-vindas
+      edit_profile_action: Personalizar
+      edit_profile_step: Aumente suas interações tendo um perfil completo.
+      edit_profile_title: Personalize seu perfil
       explanation: Aqui estão algumas dicas para começar
+      feature_action: Mais informações
+      feature_audience: Mastodon oferece uma possibilidade única de gerenciar seu público sem intermediários. O Mastodon implantado em sua própria infraestrutura permite que você siga e seja seguido de qualquer outro servidor Mastodon online e não esteja sob o controle de ninguém além do seu.
+      feature_audience_title: Construa seu público em confiança
+      feature_control: Você sabe melhor o que deseja ver no feed da sua casa. Sem algoritmos ou anúncios para desperdiçar seu tempo. Siga qualquer pessoa em qualquer servidor Mastodon a partir de uma única conta e receba suas postagens em ordem cronológica, deixando seu canto da internet um pouco mais parecido com você.
+      feature_control_title: Fique no controle da sua própria linha do tempo
+      feature_creativity: Mastodon suporta postagens de áudio, vídeo e imagens, descrições de acessibilidade, enquetes, avisos de conteúdo, avatares animados, emojis personalizados, controle de corte de miniaturas e muito mais, para ajudá-lo a se expressar online. Esteja você publicando sua arte, sua música ou seu podcast, o Mastodon está lá para você.
+      feature_creativity_title: Criatividade inigualável
+      feature_moderation: Mastodon coloca a tomada de decisões de volta em suas mãos. Cada servidor cria as suas próprias regras e regulamentos, que são aplicados localmente e não de cima para baixo como as redes sociais corporativas, tornando-o mais flexível na resposta às necessidades de diferentes grupos de pessoas. Junte-se a um servidor com as regras com as quais você concorda ou hospede as suas próprias.
+      feature_moderation_title: Moderando como deve ser
+      follow_action: Seguir
+      follow_step: Seguir pessoas interessantes é do que trata Mastodon.
+      follow_title: Personalize seu feed residencial
+      follows_subtitle: Siga contas bem conhecidas
+      follows_title: Quem seguir
+      follows_view_more: Veja mais pessoas para seguir
+      hashtags_recent_count: "%{people} pessoas nos últimos %{days} dias"
+      hashtags_subtitle: Explore o que está em tendência desde os últimos 2 dias
+      hashtags_title: Trending hashtags
+      hashtags_view_more: Ver mais hashtags em alta
+      post_action: Compor
+      post_step: Diga olá para o mundo com texto, fotos, vídeos ou enquetes.
+      post_title: Faça a sua primeira publicação
+      share_action: Compartilhar
+      share_step: Diga aos seus amigos como te encontrar no Mastodon.
+      share_title: Compartilhe seu perfil de Mastodon
+      sign_in_action: Iniciar sessão
       subject: Bem-vindo ao Mastodon
       title: Bem-vindo a bordo, %{name}!
   users:
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index 8e4f9e79130f38..747402bb1e6299 100644
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -707,7 +707,6 @@ ro:
         silence: Cont limitat
         suspend: Cont suspendat
     welcome:
-      edit_profile_action: Configurare profil
       explanation: Iată câteva sfaturi pentru a începe
       subject: Bine ai venit
       title: Bine ai venit la bord, %{name}!
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 1c718c95b2e2ab..83fbe373a01dc1 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -1901,8 +1901,6 @@ ru:
         silence: На учётную запись наложены ограничения
         suspend: Учётная запись заблокирована
     welcome:
-      edit_profile_action: Настроить профиль
-      edit_profile_step: Вы можете настроить свой профиль добавляя аватарку, изменяя отображаемое имя и так далее. Вы можете вручную подтверждать подписчиков, перед тем как им будет разрешено подписаться на вас.
       explanation: Вот несколько советов для новичков
       subject: Добро пожаловать в Mastodon
       title: Добро пожаловать на борт, %{name}!
diff --git a/config/locales/sc.yml b/config/locales/sc.yml
index 33ca7ab1d2f78b..ec16c6027d82fb 100644
--- a/config/locales/sc.yml
+++ b/config/locales/sc.yml
@@ -1091,7 +1091,6 @@ sc:
         silence: Contu limitadu
         suspend: Contu suspèndidu
     welcome:
-      edit_profile_action: Cunfigura su profilu
       explanation: Inoghe ddoe at una paja de impòsitos pro cumintzare
       subject: Ti donamus su benebènnidu a Mastodon
       title: Ti donamus su benebènnidu, %{name}!
diff --git a/config/locales/sco.yml b/config/locales/sco.yml
index d5628c01bc8e9f..5b452fc6bb7d38 100644
--- a/config/locales/sco.yml
+++ b/config/locales/sco.yml
@@ -1580,8 +1580,6 @@ sco:
         silence: Accoont limitit
         suspend: Accoont suspendit
     welcome:
-      edit_profile_action: Setup profile
-      edit_profile_step: Ye kin customize yer profile bi uploadin a profile picture, chyngin yer display nemm an mair. Ye kin opt-in fir tae luik ower new follaers afore they’re allooed tae follae ye.
       explanation: Here some tips fir tae get ye stertit
       subject: Welcome tae Mastodon, 'mon in
       title: Welcome aboord, %{name}!
diff --git a/config/locales/si.yml b/config/locales/si.yml
index 28488197c57c30..6afa8f8ef3b839 100644
--- a/config/locales/si.yml
+++ b/config/locales/si.yml
@@ -1433,7 +1433,6 @@ si:
         silence: ගිණුම සීමා කර ඇත
         suspend: ගිණුම අත්හිටුවා ඇත
     welcome:
-      edit_profile_action: පැතිකඩ පිහිටුවන්න
       explanation: ඔබ ආරම්භ කිරීමට උපදෙස් කිහිපයක් මෙන්න
       subject: මාස්ටඩන් වෙත පිළිගනිමු
       title: නැවට සාදරයෙන් පිළිගනිමු, %{name}!
diff --git a/config/locales/simple_form.ca.yml b/config/locales/simple_form.ca.yml
index 12a6ac1fe88153..7d0f799d0cee4a 100644
--- a/config/locales/simple_form.ca.yml
+++ b/config/locales/simple_form.ca.yml
@@ -39,14 +39,14 @@ ca:
         text: Només pots emetre una apel·lació per cada acció
       defaults:
         autofollow: Qui es registri a través de la invitació et seguirà automàticament
-        avatar: PNG, GIF o JPG de com a màxim %{size}. S'escalarà a %{dimensions}px
+        avatar: WEBP, PNG, GIF o JPG. De com a màxim %{size}. S'escalarà a %{dimensions} px
         bot: Notifica que aquest compte realitza principalment accions automatitzades i que pot estar no monitorat
         context: Un o diversos contextos en què s'ha d'aplicar el filtre
         current_password: Per motius de seguretat, introduïu la contrasenya del compte actual
         current_username: Per a confirmar, entreu el nom d'usuari del compte actual
         digest: Només s'envia després d'un llarg període d'inactivitat i només si has rebut algun missatge personal durant la teva absència
         email: Se t'enviarà un correu electrònic de confirmació
-        header: PNG, GIF o JPG de com a màxim %{size}. S'escalarà a %{dimensions}px
+        header: WEBP, PNG, GIF o JPG. De com a màxim %{size}. S'escalarà a %{dimensions} px
         inbox_url: Copia l'enllaç de la pàgina principal del relay que vols usar
         irreversible: Els tuts filtrats desapareixeran de manera irreversible, fins i tot si el filtre es retira més tard
         locale: L'idioma de la interfície d’usuari, els correus i les notificacions push
diff --git a/config/locales/simple_form.et.yml b/config/locales/simple_form.et.yml
index 15cf403cf2e831..c2df26c1240080 100644
--- a/config/locales/simple_form.et.yml
+++ b/config/locales/simple_form.et.yml
@@ -39,12 +39,14 @@ et:
         text: Otsust on võimalik vaidlustada vaid 1 kord
       defaults:
         autofollow: Inimesed, kes loovad konto selle kutse läbi, automaatselt jälgivad sind
+        avatar: WEBP, PNG, GIF või JPG. Kõige rohkem %{size}. Vähendatakse %{dimensions} pikslini
         bot: Teavita teisi, et see konto teeb enamjaolt automatiseeritud tegevusi ja ei pruugi olla järelvalve all
         context: Üks või mitu konteksti, mille vastu see filter peaks rakenduma
         current_password: Sisesta turvalisuse huvides oma siinse konto salasõna
         current_username: Kinnitamiseks palun sisesta oma konto kasutajanimi
         digest: Saadetakse ainult pärast pikka tegevusetuse perioodi ja ainult siis, kui on saadetud otsesõnumeid
         email: Sulle saadetakse e-posti teel kinnituskiri
+        header: WEBP, PNG, GIF või JPG. Kõige rohkem %{size}. Vähendatakse %{dimensions} pikslini
         inbox_url: Kopeeri soovitud vahendaja avalehe URL
         irreversible: Filtreeritud postitused kaovad taastamatult, isegi kui filter on hiljem eemaldatud
         locale: Kasutajaliidese, e-kirjade ja tõuketeadete keel
diff --git a/config/locales/simple_form.fi.yml b/config/locales/simple_form.fi.yml
index 96bf11ef2de00f..3d79f76e8a66e9 100644
--- a/config/locales/simple_form.fi.yml
+++ b/config/locales/simple_form.fi.yml
@@ -192,7 +192,7 @@ fi:
         honeypot: "%{label} (älä täytä)"
         inbox_url: Välittäjän postilaatikon URL-osoite
         irreversible: Pudota piilottamisen sijaan
-        locale: Kieli
+        locale: Käyttöliittymän kieli
         max_uses: Käyttökertoja enintään
         new_password: Uusi salasana
         note: Elämäkerta
diff --git a/config/locales/simple_form.fy.yml b/config/locales/simple_form.fy.yml
index 8cedc3b1d5aedf..5dc5ab2c90ee7e 100644
--- a/config/locales/simple_form.fy.yml
+++ b/config/locales/simple_form.fy.yml
@@ -39,12 +39,14 @@ fy:
         text: Jo kinne mar ien kear beswier yntsjinje tsjin in fêststelde oertrêding
       defaults:
         autofollow: Minsken dy’t harren fia de útnûging registrearre hawwe, folgje jo automatysk
+        avatar: WEBP, PNG, GIF of JPG. Maksimaal %{size}. Wurdt ferlytse nei %{dimensions}px
         bot: Sinjaal nei oare brûkers ta dat dizze account yn haadsaak automatisearre berjochten stjoert en mooglik net kontrolearre wurdt
         context: Ien of meardere lokaasjes wêr’t it filter aktyf wêze moat
         current_password: Fier foar feilichheidsredenen it wachtwurd fan jo aktuele account yn
         current_username: Fier ta befêstiging de brûkersnamme fan jo aktuele account yn
         digest: Wurdt allinnich nei in lange perioade fan ynaktiviteit ferstjoerd en allinnich wannear’t jo wylst jo ôfwêzigens persoanlike berjochten ûntfongen hawwe
         email: Jo krije in befêstigings-e-mailberjocht
+        header: WEBP, PNG, GIF of JPG. Maksimaal %{size}. Wurdt ferlytse nei %{dimensions}px
         inbox_url: Kopiearje de URL fan de foarside fan de relayserver dy’t jo brûke wolle
         irreversible: Filtere berjochten ferdwine definityf, sels as it filter letter fuortsmiten wurdt
         locale: De taal fan de brûkersomjouwing, e-mailberjochten en pushmeldingen
diff --git a/config/locales/simple_form.gd.yml b/config/locales/simple_form.gd.yml
index 7941ac334da736..bd7e44455aca15 100644
--- a/config/locales/simple_form.gd.yml
+++ b/config/locales/simple_form.gd.yml
@@ -39,12 +39,14 @@ gd:
         text: Chan urrainn dhut ath-thagradh a dhèanamh air rabhadh ach aon turas
       defaults:
         autofollow: Leanaidh na daoine a chlàraicheas leis a cuireadh thu gu fèin-obrachail
+        avatar: WEBP, PNG, GIF or JPG. %{size} air a char as motha. Thèid a sgèileadh sìos gu %{dimensions}px
         bot: Comharraich do chàch gu bheil an cunntas seo ri gnìomhan fèin-obrachail gu h-àraidh is dh’fhaoidte nach doir duine sam bith sùil air idir
         context: Na co-theacsaichean air am bi a’ chriathrag an sàs
         current_password: A chùm tèarainteachd, cuir a-steach facal-faire a’ chunntais làithrich
         current_username: Airson seo a dhearbhadh, cuir a-steach ainm-cleachdaiche a’ chunntais làithrich
         digest: Cha dèid seo a chur ach nuair a bhios tu air ùine mhòr gun ghnìomh a ghabhail agus ma fhuair thu teachdaireachd phearsanta fhad ’s a bha thu air falbh
         email: Thèid post-d dearbhaidh a chur thugad
+        header: WEBP, PNG, GIF no JPG. %{size} air a char as motha. Thèid a sgèileadh sìos gu %{dimensions}px
         inbox_url: Dèan lethbhreac dhen URL o phrìomh-dhuilleag an ath-sheachadain a bu mhiann leat cleachdadh
         irreversible: Thèid postaichean criathraichte à sealladh gu buan fiù ’s ma bheir thu a’ chriathrag air falbh às dèidh làimhe
         locale: Cànan eadar-aghaidh a’ chleachdaiche, nam post-d ’s nam brathan putaidh
@@ -138,7 +140,7 @@ gd:
         url: Far an dèid na tachartasan a chur
     labels:
       account:
-        discoverable: Brosnaich a’ phròifil is postaichean agad sna h-algairimean luirg
+        discoverable: Brosnaich a’ phròifil is postaichean agad sna h-algairimean rùrachaidh
         fields:
           name: Leubail
           value: Susbaint
diff --git a/config/locales/simple_form.ja.yml b/config/locales/simple_form.ja.yml
index eae1ea21793e0e..e7b8e156167b20 100644
--- a/config/locales/simple_form.ja.yml
+++ b/config/locales/simple_form.ja.yml
@@ -39,12 +39,14 @@ ja:
         text: 一度だけ異議を申し立てることができます
       defaults:
         autofollow: 招待から登録した人が自動的にあなたをフォローするようになります
+        avatar: "%{size}までのWEBP、PNG、GIF、JPGが利用可能です。%{dimensions}pxまで縮小されます"
         bot: このアカウントは主に自動で動作し、人が見ていない可能性があります
         context: フィルターを適用する対象 (複数選択可)
         current_password: 現在のアカウントのパスワードを入力してください
         current_username: 確認のため、現在のアカウントのユーザー名を入力してください
         digest: 長期間使用していない場合と不在時に返信を受けた場合のみ送信されます
         email: 確認のメールが送信されます
+        header: "%{size}までのWEBP、PNG、GIF、JPGが利用可能です。%{dimensions}pxまで縮小されます"
         inbox_url: 使用したいリレーサーバーのトップページからURLをコピーします
         irreversible: フィルターが後で削除されても、除外された投稿は元に戻せなくなります
         locale: ユーザーインターフェース、メールやプッシュ通知の言語
diff --git a/config/locales/simple_form.kab.yml b/config/locales/simple_form.kab.yml
index c7370aedf61702..a9b040b0585140 100644
--- a/config/locales/simple_form.kab.yml
+++ b/config/locales/simple_form.kab.yml
@@ -2,6 +2,9 @@
 kab:
   simple_form:
     hints:
+      account:
+        display_name: Isem-ik·im ummid neɣ isem-ik·im n uqeṣṣer.
+        fields: Asebter-ik·im agejdan, imqimen, leεmer, ayen tebɣiḍ.
       account_alias:
         acct: Sekcem isem n umseqdac@domain n umiḍan s wansa itebγiḍ ad gujjeḍ
       account_migration:
@@ -11,6 +14,7 @@ kab:
         type_html: Fren d acu ara txedmeḍ s <strong>%{acct}</strong>
       defaults:
         autofollow: Imdanen ara ijerrden s usnebgi-inek, ad k-ḍefṛen s wudem awurman
+        bot: Smekti-d wiyaḍ dakken amiḍan-a ixeddem s wudem amezwer tigawin tiwurmanin yernu ur yezmir ara ad yettwaɛass
         email: Ad n-teṭṭfeḍ imayl i usentem
         irreversible: Tisuffaɣ i tessazedgeḍ ad ttwakksent i lebda, ula ma tekkseḍ imsizdeg-nni ar zdat
         locale: Tutlayt n ugrudem, imaylen d tilγa
@@ -18,6 +22,7 @@ kab:
         setting_display_media_default: Ffer teywalt yettwacreḍ d tanafrit
         setting_display_media_hide_all: Ffer yal tikkelt akk taywalt
         setting_display_media_show_all: Ffer yal tikkelt teywalt yettwacreḍ d tanafrit
+        username: Tzemreḍ ad tesqedceḍ isekkilen, uṭṭunen akked yijerriden n wadda
       imports:
         data: Afaylu CSV id yusan seg uqeddac-nniḍen n Maṣṭudun
       ip_block:
@@ -82,6 +87,10 @@ kab:
       form_admin_settings:
         site_terms: Tasertit tabaḍnit
         site_title: Isem n uqeddac
+      interactions:
+        must_be_follower: Ssewḥel ilɣa seg wid akked tid ur yellin ara d imeḍfaren-ik·im
+        must_be_following: Ssewḥel ilɣa seg wid akked tid ur tettḍafareḍ ara
+        must_be_following_dm: Sewḥel iznan usriden sɣur wid akked tid ur tettḍafareḍ ara
       invite:
         comment: Awennit
       invite_request:
diff --git a/config/locales/simple_form.lv.yml b/config/locales/simple_form.lv.yml
index 5d23a7010069f3..133a225405a230 100644
--- a/config/locales/simple_form.lv.yml
+++ b/config/locales/simple_form.lv.yml
@@ -8,7 +8,7 @@ lv:
         fields: Tava mājas lapa, vietniekvārdi, vecums, viss, ko vēlies.
         indexable: Tavas publiskās ziņas var tikt parādītas Mastodon meklēšanas rezultātos. Personas, kuras ir mijiedarbojušās ar tavām ziņām, var tās meklēt neatkarīgi no tā.
         note: 'Tu vari @minēt citus cilvēkus vai #mirkļbirkas.'
-        show_collections: Cilvēki varēs pārlūkot tavus sekotājus un kam tu seko. Cilvēki, kuriem seko, redzēs, ka tu seko viņiem neatkarīgi no tā.
+        show_collections: Cilvēki varēs pārlūkot Tavus sekotājus un sekojamos. Cilvēki, kuriem Tu seko, redzēs, ka Tu seko viņiem neatkarīgi no tā.
         unlocked: Cilvēki varēs tev sekot, neprasot apstiprinājumu. Noņem atzīmi, ja vēlies pārskatīt sekošanas pieprasījumus un izvēlēties, pieņemt vai noraidīt jaunus sekotājus.
       account_alias:
         acct: Norādi konta lietotājvārdu@domēnu, no kura vēlies pārvākties
@@ -39,12 +39,14 @@ lv:
         text: Brīdinājumu var pārsūdzēt tikai vienu reizi
       defaults:
         autofollow: Cilvēki, kuri reģistrējas, izmantojot uzaicinājumu, automātiski sekos tev
+        avatar: WEBP, PNG, GIF vai JPG. Ne vairāk kā %{size}. Tiks samazināts līdz %{dimensions}px
         bot: Paziņo citiem, ka kontā galvenokārt tiek veiktas automatizētas darbības un tas var netikt uzraudzīts
         context: Viens vai vairāki konteksti, kur jāpiemēro filtrs
         current_password: Drošības nolūkos, lūdzu, ievadi pašreizējā konta paroli
         current_username: Lai apstiprinātu, lūdzu, ievadi pašreizējā konta paroli
         digest: Sūta tikai pēc ilgstošas neaktivitātes un tikai tad, ja savas prombūtnes laikā neesi saņēmis personiskas ziņas
         email: Tev tiks nosūtīts apstiprinājuma e-pasts
+        header: WEBP, PNG, GIF vai JPG. Ne vairāk kā %{size}. Tiks samazināts līdz %{dimensions}px
         inbox_url: Nokopē URL no tā releja sākumlapas, kuru vēlies izmantot
         irreversible: Filtrētās ziņas neatgriezeniski pazudīs, pat ja filtrs vēlāk tiks noņemts
         locale: Lietotāja saskarnes, e-pasta ziņojumu un push paziņojumu valoda
@@ -57,7 +59,7 @@ lv:
         setting_display_media_default: Paslēpt multividi, kas atzīmēta kā sensitīva
         setting_display_media_hide_all: Vienmēr slēpt multividi
         setting_display_media_show_all: Vienmēr rādīt multividi
-        setting_use_blurhash: Gradientu pamatā ir paslēpto vizuālo attēlu krāsas, bet neskaidras visas detaļas
+        setting_use_blurhash: Pāreju pamatā ir paslēpto uzskatāmo līdzekļu krāsas, bet saturs tiek padarīts neskaidrs
         setting_use_pending_items: Paslēpt laika skalas atjauninājumus aiz klikšķa, nevis automātiski ritini plūsmu
         username: Tu vari lietot burtus, ciparus un zemsvītras
         whole_word: Ja atslēgvārds vai frāze ir tikai burtciparu, tas tiks lietots tikai tad, ja tas atbilst visam vārdam
@@ -94,7 +96,7 @@ lv:
         status_page_url: Tās lapas URL, kurā lietotāji var redzēt šī servera statusu pārtraukuma laikā
         theme: Tēma, kuru redz apmeklētāji, kuri ir atteikušies, un jaunie lietotāji.
         thumbnail: Aptuveni 2:1 attēls, kas tiek parādīts kopā ar tava servera informāciju.
-        timeline_preview: Atteikušies apmeklētāji varēs pārlūkot jaunākās serverī pieejamās publiskās ziņas.
+        timeline_preview: Atteikušies apmeklētāji varēs pārlūkot jaunākos serverī pieejamos publiskos ierakstus.
         trendable_by_default: Izlaist aktuālā satura manuālu pārskatīšanu. Atsevišķas preces joprojām var noņemt no tendencēm pēc fakta.
         trends: Tendences parāda, kuras ziņas, atsauces un ziņu stāsti gūst panākumus tavā serverī.
         trends_as_landing_page: Šī servera apraksta vietā rādīt aktuālo saturu lietotājiem un apmeklētājiem, kuri ir atteikušies. Nepieciešams iespējot tendences.
@@ -174,8 +176,8 @@ lv:
         text: Paskaidrojiet, kāpēc šis lēmums ir jāatceļ
       defaults:
         autofollow: Uzaicini sekot tavam kontam
-        avatar: Avatars
-        bot: Šis ir bot konts
+        avatar: Profila attēls
+        bot: Šis ir automatizēts konts
         chosen_languages: Filtrēt valodas
         confirm_new_password: Apstiprināt jauno paroli
         confirm_password: Apstiprināt paroli
@@ -218,7 +220,7 @@ lv:
         setting_theme: Vietnes motīvs
         setting_trends: Parādīt šodienas tendences
         setting_unfollow_modal: Parādīt apstiprinājuma dialogu pirms pārtraukt kādam sekot
-        setting_use_blurhash: Rādīt krāsainus gradientus slēptajiem multivides materiāliem
+        setting_use_blurhash: Rādīt krāsainas pārejas paslēptajiem informācijas nesējiem
         setting_use_pending_items: Lēnais režīms
         severity: Smagums
         sign_in_token_attempt: Drošības kods
diff --git a/config/locales/simple_form.no.yml b/config/locales/simple_form.no.yml
index 6c47a9deee2978..a1050c9f91ed82 100644
--- a/config/locales/simple_form.no.yml
+++ b/config/locales/simple_form.no.yml
@@ -39,12 +39,14 @@
         text: Du kan kun anke en advarsel en gang
       defaults:
         autofollow: Folk som lager en konto gjennom invitasjonen, vil automatisk følge deg
+        avatar: WEBP, PNG, GIF eller JPG. Maksimalt %{size}. Vil bli nedskalert til %{dimensions}px
         bot: Denne kontoen utfører i hovedsak automatiserte handlinger og blir kanskje ikke holdt øye med
         context: En eller flere sammenhenger der filteret skal gjelde
         current_password: For sikkerhetsgrunner, vennligst oppgi passordet til den nåværende bruker
         current_username: For å bekrefte, vennligst skriv inn brukernavnet til den nåværende kontoen
         digest: Kun sendt etter en lang periode med inaktivitet og bare dersom du har mottatt noen personlige meldinger mens du var borte
         email: Du vil bli tilsendt en bekreftelses-E-post
+        header: WEBP, PNG, GIF eller JPG. Maksimalt %{size}. Vil bli nedskalert til %{dimensions}px
         inbox_url: Kopier URLen fra forsiden til overgangen du vil bruke
         irreversible: Filtrerte innlegg vil ugjenkallelig forsvinne, selv om filteret senere blir fjernet
         locale: Språket til brukergrensesnittet, e-mailer og push-varsler
diff --git a/config/locales/simple_form.sr-Latn.yml b/config/locales/simple_form.sr-Latn.yml
index 62e12201aea668..3214a722dfc1ad 100644
--- a/config/locales/simple_form.sr-Latn.yml
+++ b/config/locales/simple_form.sr-Latn.yml
@@ -39,12 +39,14 @@ sr-Latn:
         text: Možete podneti samo jednu žalbu na upisan prestup
       defaults:
         autofollow: Osobe koje se prijave kroz pozivnice će vas automatski zapratiti
+        avatar: WEBP, PNG, GIF ili JPG. Najviše %{size}. Biće smanjeno na %{dimensions}px
         bot: Daje drugima do znanja da ovaj nalog uglavnom vrši automatizovane radnje i možda se ne nadgleda
         context: Jedan ili više konteksta u kojima treba da se primeni filter
         current_password: Iz bezbednosnih razloga molimo Vas unesite lozinku trenutnog naloga
         current_username: Da biste potvrdili, Molimo Vas unesite korisničko ime trenutno aktivnog naloga
         digest: Šalje se samo posle dužeg perioda neaktivnosti i samo u slučaju da ste primili jednu ili više ličnih poruka tokom Vašeg odsustva
         email: Biće Vam poslat mejl sa potvrdom
+        header: WEBP, PNG, GIF ili JPG. Najviše %{size}. Biće smanjeno na %{dimensions}px
         inbox_url: Kopirajte URL sa naslovne strane releja koji želite koristiti
         irreversible: Filtrirane obajve će nestati nepovratno, čak i ako je filter kasnije uklonjen
         locale: Jezik korisničkog okruženja, e-pošte i mobilnih obaveštenja
diff --git a/config/locales/simple_form.sr.yml b/config/locales/simple_form.sr.yml
index 10434be1e40732..9631efc0531e1b 100644
--- a/config/locales/simple_form.sr.yml
+++ b/config/locales/simple_form.sr.yml
@@ -39,12 +39,14 @@ sr:
         text: Можете поднети само једну жалбу на уписан преступ
       defaults:
         autofollow: Особе које се пријаве кроз позивнице ће вас аутоматски запратити
+        avatar: WEBP, PNG, GIF или JPG. Највише %{size}. Биће смањено на %{dimensions}px
         bot: Даје другима до знања да овај налог углавном врши аутоматизоване радње и можда се не надгледа
         context: Један или више контекста у којима треба да се примени филтер
         current_password: Из безбедносних разлога молимо Вас унесите лозинку тренутног налога
         current_username: Да бисте потврдили, Молимо Вас унесите корисничко име тренутно активног налога
         digest: Шаље се само после дужег периода неактивности и само у случају да сте примили једну или више личних порука током Вашег одсуства
         email: Биће Вам послат мејл са потврдом
+        header: WEBP, PNG, GIF или JPG. Највише %{size}. Биће смањено на %{dimensions}px
         inbox_url: Копирајте URL са насловне стране релеја који желите користити
         irreversible: Филтриранe обајве ће нестати неповратно, чак и ако је филтер касније уклоњен
         locale: Језик корисничког окружења, е-поште и мобилних обавештења
diff --git a/config/locales/simple_form.sv.yml b/config/locales/simple_form.sv.yml
index fcf3788027cb22..02806e711fc7d3 100644
--- a/config/locales/simple_form.sv.yml
+++ b/config/locales/simple_form.sv.yml
@@ -39,12 +39,14 @@ sv:
         text: Du kan endast överklaga en varning en gång
       defaults:
         autofollow: Användarkonton som skapas genom din inbjudan kommer automatiskt följa dig
+        avatar: WEBP, PNG, GIF eller JPG. Högst %{size}. Kommer nedskalas till %{dimensions} pixlar
         bot: Detta konto utför huvudsakligen automatiserade åtgärder och kanske inte övervakas
         context: Ett eller fler sammanhang där filtret ska tillämpas
         current_password: Av säkerhetsskäl krävs lösenordet till det nuvarande kontot
         current_username: Ange det nuvarande kontots användarnamn för att bekräfta
         digest: Skickas endast efter en lång period av inaktivitet och endast om du har fått några personliga meddelanden i din frånvaro
         email: Du kommer att få ett bekräftelsemeddelande via e-post
+        header: WEBP, PNG, GIF eller JPG. Högst %{size}. Kommer nedskalas till %{dimensions} pixlar
         inbox_url: Kopiera webbadressen från hemsidan av det ombud du vill använda
         irreversible: Filtrerade inlägg kommer att försvinna oåterkalleligt, även om filter tas bort senare
         locale: Språket för användargränssnittet, e-postmeddelanden och push-aviseringar
diff --git a/config/locales/simple_form.vi.yml b/config/locales/simple_form.vi.yml
index 817883941c5a82..ae0a5ea560cb5f 100644
--- a/config/locales/simple_form.vi.yml
+++ b/config/locales/simple_form.vi.yml
@@ -39,12 +39,14 @@ vi:
         text: Bạn chỉ có thể khiếu nại mỗi lần một cảnh cáo
       defaults:
         autofollow: Những người đăng ký sẽ tự động theo dõi bạn
+        avatar: WEBP, PNG, GIF hoặc JPG, tối đa %{size}. Sẽ bị nén xuống %{dimensions}px
         bot: Tài khoản này tự động thực hiện các hành động và không được quản lý bởi người thật
         context: Chọn một hoặc nhiều nơi mà bộ lọc sẽ áp dụng
         current_password: Vì mục đích bảo mật, vui lòng nhập mật khẩu của tài khoản hiện tại
         current_username: Để xác nhận, vui lòng nhập tên người dùng của tài khoản hiện tại
         digest: Chỉ gửi sau một thời gian dài không hoạt động hoặc khi bạn nhận được tin nhắn (trong thời gian vắng mặt)
         email: Bạn sẽ được gửi một email xác minh
+        header: WEBP, PNG, GIF hoặc JPG, tối đa %{size}. Sẽ bị nén xuống %{dimensions}px
         inbox_url: Sao chép URL của máy chủ mà bạn muốn dùng
         irreversible: Các tút đã lọc sẽ không thể phục hồi, kể cả sau khi xóa bộ lọc
         locale: Ngôn ngữ của giao diện, email và thông báo đẩy
diff --git a/config/locales/simple_form.zh-TW.yml b/config/locales/simple_form.zh-TW.yml
index c83a7be75ac123..fe938712e3e9b0 100644
--- a/config/locales/simple_form.zh-TW.yml
+++ b/config/locales/simple_form.zh-TW.yml
@@ -11,9 +11,9 @@ zh-TW:
         show_collections: 人們將能瀏覽您跟隨中及跟隨者帳號。您所跟隨之人能得知您正在跟隨其帳號。
         unlocked: 人們將無需額外請求您的同意便能跟隨您的帳號。取消勾選以審查跟隨請求並選擇是否同意或拒絕新跟隨者。
       account_alias:
-        acct: 指定要移動的帳號的「使用者名稱@網域名稱」
+        acct: 指定要移動的帳號之「使用者名稱@網域名稱」
       account_migration:
-        acct: 指定要移動至的帳號的「使用者名稱@網域名稱」
+        acct: 指定欲移動至帳號之「使用者名稱@網域名稱」
       account_warning_preset:
         text: 您可使用嘟文語法，例如網址、「#」標籤與提及功能
         title: 可選。不會向收件者顯示
@@ -33,7 +33,7 @@ zh-TW:
         all_day: 當選取時，僅顯示出時間範圍中的日期部分
         ends_at: 可選的。公告會於該時間點自動取消發布
         scheduled_at: 空白則立即發布公告
-        starts_at: 可選的。讓公告於特定時間範圍內顯示
+        starts_at: 可選的。使公告於特定時間範圍內顯示
         text: 您可以使用嘟文語法，但請小心別讓公告太鴨霸而佔據使用者的整個版面。
       appeal:
         text: 您只能對警示提出一次申訴
@@ -52,7 +52,7 @@ zh-TW:
         locale: 使用者介面、電子郵件與推播通知的語言
         password: 使用至少 8 個字元
         phrase: 無論是嘟文的本文或是內容警告都會被過濾
-        scopes: 允許讓應用程式存取的 API。 若您選擇最高階範圍，則無須選擇個別項目。
+        scopes: 允許使應用程式存取的 API。 若您選擇最高階範圍，則無須選擇個別項目。
         setting_aggregate_reblogs: 請勿顯示最近已被轉嘟之嘟文的最新轉嘟（只影響最新收到的嘟文）
         setting_always_send_emails: 一般情況下若您活躍使用 Mastodon ，我們不會寄送電子郵件通知
         setting_default_sensitive: 敏感內容媒體預設隱藏，且按一下即可重新顯示
@@ -119,7 +119,7 @@ zh-TW:
         text: 說明使用者於此伺服器上需遵守的規則或條款。試著維持各項條款簡短而明瞭。
       sessions:
         otp: 請輸入產生自您手機 App 的兩階段驗證碼，或輸入其中一個備用驗證碼：
-        webauthn: 如果它是 USB 安全金鑰的話，請確認已正確插入，如有需要請觸擊。
+        webauthn: 若它是 USB 安全金鑰，請確認已正確插入，如有需要請觸擊。
       settings:
         indexable: 個人檔案可能出現於 Google、Bing、或其他搜尋引擎。
         show_application: 將總是顯示您發嘟文之應用程式
@@ -130,7 +130,7 @@ zh-TW:
         role: 角色控制使用者有哪些權限
       user_role:
         color: 於整個使用者介面中用於角色的顏色，十六進位格式的 RGB
-        highlighted: 這會讓角色公開可見
+        highlighted: 這會使角色公開可見
         name: 角色的公開名稱，如果角色設定為顯示為徽章
         permissions_as_keys: 有此角色的使用者將有權存取...
         position: 某些情況下，衝突的解決方式由更高階的角色決定。某些動作只能由優先程度較低的角色執行
@@ -164,7 +164,7 @@ zh-TW:
           none: 什麼也不做
           sensitive: 敏感内容
           silence: 安靜
-          suspend: 停權並不可逆的刪除帳號資料
+          suspend: 停權並不可逆地刪除帳號資料
         warning_preset_id: 使用警告預設
       announcement:
         all_day: 全天活動
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index e93cec19f6a20e..1d8866645c2bd8 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -733,7 +733,7 @@ sk:
       edit_preset: Uprav varovnú predlohu
       title: Spravuj varovné predlohy
     webhooks:
-      delete: Zmazať
+      delete: Vymaž
       disable: Vypni
       disabled: Vypnuté
       enable: Povoľ
@@ -744,6 +744,7 @@ sk:
       subject: Registrácie na %{instance} boli automaticky prepnuté na vyžadujúce schválenie
     new_appeal:
       actions:
+        delete_statuses: vymazať ich príspevky
         none: varovanie
         silence: obmedziť ich účet
     new_pending_account:
@@ -804,6 +805,7 @@ sk:
       prefix_invited_by_user: "@%{name} ťa pozýva na tento Mastodon server!"
       prefix_sign_up: Zaregistruj sa na Mastodone už dnes!
       suffix: S pomocou účtu budeš môcť nasledovať ľudí, posielať príspevky, a vymieňať si správy s užívateľmi na hocijakom Mastodon serveri, ale aj na iných serveroch!
+    dont_have_your_security_key: Nemáš svoj bezpečnostný kľúč?
     forgot_password: Zabudnuté heslo?
     invalid_reset_password_token: Token na obnovu hesla vypršal. Prosím vypítaj si nový.
     log_in_with: Prihlás sa s
@@ -814,6 +816,7 @@ sk:
     or_log_in_with: Alebo prihlás s
     progress:
       confirm: Potvrď email
+      rules: Súhlas s pravidlami
     register: Zaregistruj sa
     registration_closed: "%{instance} neprijíma nových členov"
     resend_confirmation: Odošli potvrdzovací odkaz znovu
@@ -1287,8 +1290,14 @@ sk:
         silence: Účet bol obmedzený
         suspend: Tvoj účet bol vylúčený
     welcome:
-      edit_profile_action: Nastav profil
+      apps_title: Mastodon aplikácie
+      edit_profile_action: Prispôsob
       explanation: Tu nájdeš nejaké tipy do začiatku
+      feature_action: Zisti viac
+      follow_action: Nasleduj
+      post_title: Vytvor svoj prvý príspevok
+      share_action: Zdieľaj
+      sign_in_action: Prihlás sa
       subject: Vitaj na Mastodone
       title: Vitaj na palube, %{name}!
   users:
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 863b3d72496401..103e16a1f5fb73 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -1906,9 +1906,42 @@ sl:
         silence: Račun je omejen
         suspend: Račun je suspendiran
     welcome:
-      edit_profile_action: Nastavitve profila
-      edit_profile_step: Profil lahko prilagodite tako, da naložite sliko profila, spremenite pojavno ime in drugo. Lahko izberete, da želite pregledati nove sledilce, preden jim dovolite sledenje.
+      apps_android_action: Na voljo v Google Play
+      apps_ios_action: Prenesi iz trgovine App Store
+      apps_step: Prenesite naše uradne aplikacije.
+      apps_title: Programi za Mastodon
+      checklist_subtitle: 'Naj vas pripravimo na doživetja na tej novi družabni meji:'
+      checklist_title: Seznam dobrodošlice
+      edit_profile_action: Poosebite
+      edit_profile_step: Okrepite svoje interakcije z razumljivim profilom.
+      edit_profile_title: Prilagodite svoj profil
       explanation: Tu je nekaj nasvetov za začetek
+      feature_action: Več o tem
+      feature_audience: Mastodon zagotavlja enkratno možnost upravljanja s svojim občinstvom brez posrednika. Mastodon na lastni infrastrukturi omogoča sledenje drugih in drugim na in s poljubljnega povezanega strežnika Masodon in je zgolj pod vašim nadzorom.
+      feature_audience_title: Zaupno razvijajte svoje občinstvo
+      feature_control: Sami najbolje veste, kaj želite videti v svojem viru. Brez algoritmov ali oglasov, ki bi predstavljali izgubo vašega časa. Sledite komur koli prek poljubnega strežnika Mastodon na enem samem računu in prejmite njihove objave v kronološkem zaporedju ter ustvarite svoj kotiček interneta malce bolj po svoji meri in okusu.
+      feature_control_title: Ohranite nadzor nad svojo časovnico
+      feature_creativity: Mastodon podpira zvokovne, video in slikovne objave, opise za dostopnost, ankete, opozorila za vsebino, animirane avatarje, čustvenčke po meri, nadzor na obrezavo oglednih sličic in še veliko drugega. Tako se lahko povsem izrazite na spletu. Najsi želite objaviti svoja likovna dela, glasbo ali podkast, Mastodon vam stoji ob strani.
+      feature_creativity_title: Edinstvena ustvarjalnost
+      feature_moderation: Mastodon vrača odločanje v vaše roke. Vsak strežnik ustvari lastna pravila in predpise, ki se uveljavljajo krajevno in ne od zgoraj navzdol, kot to velja za korporacijske družabne medije. Zato je kar se da prilagodljiv pri odzivanju na potrebe različnih skupin ljudi. Pridružite se strežniku s pravili, s katerimi se strinjate, ali gostite lastnega.
+      feature_moderation_title: Moderiranje, kot bi moralo biti
+      follow_action: Sledite
+      follow_step: Sledenje zanimivim osebam je bistvo Mastodona.
+      follow_title: Poosebite svoj domači vir
+      follows_subtitle: Sledite dobro znanim računom
+      follows_title: Komu slediti
+      follows_view_more: Pokaži več oseb za sledenje
+      hashtags_recent_count: "%{people} oseb v zadnjih %{days} dneh"
+      hashtags_subtitle: Raziščite, kaj je v trendu zadnja dva dni
+      hashtags_title: Ključniki v trendu
+      hashtags_view_more: Pokaži več ključnikov v trendu
+      post_action: Sestavi
+      post_step: Pozdravite cel svet z besedilom, fotografijami, videoposnetki ali anketami.
+      post_title: Ustvarite svojo prvo objavo
+      share_action: Delite
+      share_step: Naj prijatelji izvejo, kako vas najdejo na Mastodonu.
+      share_title: Delite svoj profil Mastodon z drugimi
+      sign_in_action: Prijava
       subject: Dobrodošli na Mastodon
       title: Dobrodošli, %{name}!
   users:
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index d3d5a262fd178f..ecf79da51a4a37 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -1838,9 +1838,41 @@ sq:
         silence: Llogari e kufizuar
         suspend: Llogari e pezulluar
     welcome:
-      edit_profile_action: Ujdisje profili
-      edit_profile_step: Profilin tuaj mund ta përshtatni duke ngarkuar një figurë, duke ndryshuar emrin tuaj në ekran, etj. Mund të zgjidhni të shqyrtoni ndjekës të rinj, para se të jenë lejuar t’ju ndjekin.
+      apps_android_action: Merreni në Google Play
+      apps_ios_action: Shkarkojeni nga App Store
+      apps_step: Shkarkoni aplikacionet tona zyrtare.
+      apps_title: Aplikacione Mastodon
+      checklist_subtitle: 'Le t’ju vëmë në udhë drejt këtij horizonti të ri rrjetesh shoqërorë:'
+      edit_profile_action: Personalizojeni
+      edit_profile_step: Përforconi ndërveprimet tuaja, duke pasur një profil shterues.
+      edit_profile_title: Personalizoni profilin tuaj
       explanation: Ja disa ndihmëza, sa për t’ia filluar
+      feature_action: Mësoni më tepër
+      feature_audience: Mastodon-i ju sjell një mundësi unike për administrimin e publikut tuaj pa të tjerë në mes. Mastodon-i i sendërtuar në infrastrukturë tuajën ju lejon të ndiqni dhe të ndiqeni nga cilido shërbyes tjetër Mastodon në internet dhe është nën kontroll vetëm nga ju dhe askush tjetër.
+      feature_audience_title: Krijoni me vetëbesim publikun tuaj
+      feature_control: E dini më mirë se kushdo se ç’doni të shihni në prurjen tuaj të kreut. Pa algoritme apo reklama që ju hanë kot kohën. Ndiqni këdo, në çfarëdo shërbyesi Mastodon, që nga një llogari e vetme dhe merrni postimet e tyre në rend kohor dhe bëjeni këndin tuaj të internetit pak më tepër si ju.
+      feature_control_title: Mbani kontrollin e rrjedhës tuaj kohore
+      feature_creativity: Mastodon-i mbulon postime audio, video dhe foto, përshkrime për persona me aftësi të kufizuara, pyetësorë, sinjalizime rreth lënde, avatarë të animuar, emoxhi vetjake, kontroll qethjeje miniaturash, etj, për t’ju ndihmuar të shpreheni në internet. Qoftë kur po botoni art tuajin, muzikë tuajën apo podkastin tuaj, Mastodon-i është gati.
+      feature_creativity_title: Frymë krijuese e pashoqe
+      feature_moderation: Mastodon-i e rikthen marrjen e vendimeve në duart tuaja. Çdo shërbyes krijon rregullat dhe rregulloren e vet, të cilat vihen në zbatim lokalisht dhe jo nga sipër, si me mediat shoqërore të korporatave, duke e bërë më të zhdërvjellëtin për t’iu përgjigjur nevojave të grupeve të ndryshme të personave. Bëhuni pjesë e një shërbyesi me rregullat e të cilit pajtoheni, ose strehojeni ju vetë një të tillë.
+      feature_moderation_title: Moderim ashtu si duhet bërë
+      follow_action: Ndiqeni
+      follow_step: Ndjekje personash interesantë është ajo çka përbën thelbin e Mastodon-it.
+      follow_title: Personalizoni prurjen tuaj të kreut
+      follows_subtitle: Ndiqni llogari të mirënjohura
+      follows_title: Cilët të ndiqen
+      follows_view_more: Shihni më tepër vetë për ndjekje
+      hashtags_recent_count: "%{people} vetë në %{days} ditët e shkuara"
+      hashtags_subtitle: Eksploroni ç’është në modëë që prej 2 ditëve të fundit
+      hashtags_title: Hashtag-ë në modë
+      hashtags_view_more: Shihni më tepër hashtagë në modë
+      post_action: Hartoni
+      post_step: Përshëndetni botën me tekst, foto, video, ose pyetësorë.
+      post_title: Shkruani postimin tuaj të parë
+      share_action: Ndajeni me të tjerë
+      share_step: Bëjuni të ditur shokëve si t’ju gjejnë në Mastodon.
+      share_title: Ndani me të tjerët profilin tuaj Mastodon
+      sign_in_action: Hyni
       subject: Mirë se vini te Mastodon-i
       title: Mirë se vini, %{name}!
   users:
diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml
index 7c7fb390fe397b..c2f9295f1cf867 100644
--- a/config/locales/sr-Latn.yml
+++ b/config/locales/sr-Latn.yml
@@ -781,13 +781,15 @@ sr-Latn:
         disabled: Nikome
         users: Prijavljenim lokalnim korisnicima
       registrations:
+        moderation_recommandation: Uverite se da imate adekvatan i reaktivan moderatorski tim pre nego što otvorite registraciju za sve!
         preamble: Kontrolišite ko sme da napravi nalog na Vašem serveru.
         title: Registracije
       registrations_mode:
         modes:
-          approved: Odobrenje neophodno za registraciju
+          approved: Neophodno je odobrenje za registraciju
           none: Niko ne može da se registruje
           open: Bilo ko može da se registruje
+        warning_hint: Preporučujemo da koristite „Neophodno je odobrenje za registraciju” osim ako niste sigurni da vaš moderatorski tim može blagovremeno da obradi neželjenu poštu i zlonamerne registracije.
       security:
         authorized_fetch: Zahtevaj autentifikaciju sa združenih servera
         authorized_fetch_hint: Zahtevanje autentifikacije sa združenih servera omogućuje strožiju primenu blokova i na nivou korisnika i na nivou servera. Međutim, ovo dolazi po cenu smanjenja performansi, smanjuje domet vaših odgovora i može dovesti do problema kompatibilnosti sa nekim združenim uslugama. Pored toga, ovo neće sprečiti posvećene aktere da preuzimaju vaše javne objave i naloge.
@@ -984,6 +986,9 @@ sr-Latn:
       title: Veb-presretač
       webhook: Veb-presretač
   admin_mailer:
+    auto_close_registrations:
+      body: Zbog nedostatka nedavnih aktivnosti moderatora, registracije na %{instance} su automatski prebačene na zahtevanje ručnog pregleda, kako bi se sprečilo da se %{instance} koristi kao platforma za potencijalne loše aktere. Možete ih vratiti na otvorene registracije u bilo kom trenutku.
+      subject: Registracije za %{instance} su automatski prebačene na zahtevanje odobrenja
     new_appeal:
       actions:
         delete_statuses: obrisati objave korisnika
@@ -1059,7 +1064,7 @@ sr-Latn:
       hint_html: Samo još jedna stvar! Moramo da potvrdimo da ste ljudsko biće (ovo je da bismo sprečili neželjenu poštu!). Rešite CAPTCHA ispod i kliknite na „Nastavi”.
       title: Bezbedonosna provera
     confirmations:
-      awaiting_review: Vaša adresa e-pošte je potvrđena! Osoblje %{domain} sada pregleda vašu registraciju. Dobićete e-poštu ako odobre vaš nalog!
+      awaiting_review: Vaša adresa e-pošte je potvrđena! Osoblje %{domain} sada pregleda vašu registraciju. Dobićete e-poštu ako odobre vaš nalog!
       awaiting_review_title: Vaša registracija se pregleda
       clicking_this_link: klikom na ovu vezu
       login_link: prijavi se
@@ -1128,7 +1133,7 @@ sr-Latn:
       functional: Vaš nalog je potpuno operativan.
       pending: Vaš zahtev je na čekanju za pregled od strane našeg osoblja. Ovo može potrajati neko vreme. Primićete imejl poruku ukoliko Vam zahtev bude odobren.
       redirecting_to: Vaš nalog je neaktivan jer preusmerava na %{acct}.
-      self_destruct: Pošto se %{domain} zatvara, dobićete samo ograničen pristup svom nalogu.
+      self_destruct: Pošto se %{domain} zatvara, dobićete samo ograničen pristup svom nalogu.
       view_strikes: Pogledajte prethodne prestupe upisane na Vaše ime
     too_fast: Formular je podnet prebrzo, pokušajte ponovo.
     use_security_key: Koristite sigurnosni ključ
@@ -1393,7 +1398,7 @@ sr-Latn:
       '86400': 1 dan
     expires_in_prompt: Nikad
     generate: Generiši
-    invalid: Ova pozivnica nije važeća
+    invalid: Ova pozivnica nije važeća
     invited_by: 'Pozvao Vas je:'
     max_uses:
       few: "%{count} korišćenja"
@@ -1610,7 +1615,7 @@ sr-Latn:
     over_total_limit: Prekoračili ste granicu od %{limit} planiranih objava
     too_soon: Planirani datum mora biti u budućnosti
   self_destruct:
-    lead_html: Nažalost, <strong>%{domain}</strong> se trajno zatvara. Ako ste tamo imali nalog, nećete moći da nastavite da ga koristite, ali i dalje možete da zatražite rezervnu kopiju svojih podataka.
+    lead_html: Nažalost, <strong>%{domain}</strong> se trajno zatvara. Ako ste tamo imali nalog, nećete moći da nastavite da ga koristite, ali i dalje možete da zatražite rezervnu kopiju svojih podataka.
     title: Ovaj server se zatvara
   sessions:
     activity: Poslednja aktivnost
@@ -1780,8 +1785,8 @@ sr-Latn:
     does_not_match_previous_name: ne poklapa se sa prethodnim imenom
   themes:
     contrast: Veliki kontrast
-    default: Mastodon (tamno)
-    mastodon-light: Mastodon (svetlo)
+    default: Mastodon (tamna)
+    mastodon-light: Mastodon (svetla)
   time:
     formats:
       default: "%d %b %Y, %H:%M"
@@ -1826,7 +1831,7 @@ sr-Latn:
       title: Izvoz arhive
     failed_2fa:
       details: 'Evo detalja o pokušaju prijavljivanja:'
-      explanation: Neko je pokušao da se prijavi na vaš nalog ali je dao nevažeći drugi faktor autentifikacije.
+      explanation: Neko je pokušao da se prijavi na vaš nalog ali je dao nevažeći drugi faktor autentifikacije.
       further_actions_html: Ako to niste bili vi, preporučujemo vam da odmah %{action} jer može biti ugrožena.
       subject: Neuspeh drugog faktora autentifikacije
       title: Nije uspeo drugi faktor autentifikacije
@@ -1869,9 +1874,42 @@ sr-Latn:
         silence: Nalog ograničen
         suspend: Nalog suspendovan
     welcome:
-      edit_profile_action: Podesi nalog
-      edit_profile_step: Možete prilagoditi svoj profil tako što ćete postaviti profilnu sliku, promeniti ime za prikaz i tako dalje. Možete dati saglasnost da pregledate nove pratioce pre nego što im dozvolite da Vas zaprate.
+      apps_android_action: Nabavite na Google Play
+      apps_ios_action: Preuzmite sa App Store
+      apps_step: Preuzmite naše zvanične aplikacije.
+      apps_title: Mastodon aplikacije
+      checklist_subtitle: 'Započnimo na ovoj novoj društvenoj granici:'
+      checklist_title: Koraci dobrodošlice
+      edit_profile_action: Personalizujte
+      edit_profile_step: Povećajte svoje interakcije tako što ćete imati sveobuhvatan profil.
+      edit_profile_title: Personalizujte svoj profil
       explanation: Evo nekoliko saveta za početak
+      feature_action: Saznajte više
+      feature_audience: Mastodon vam pruža jedinstvenu mogućnost upravljanja svojom publikom bez posrednika. Mastodon raspoređen na vašoj sopstvenoj infrastrukturi vam omogućuje da pratite i budete praćeni sa bilo kog drugog Mastodon servera na mreži i nije ni pod čijom kontrolom osim vaše.
+      feature_audience_title: Izgradite svoju publiku u poverenju
+      feature_control: Vi najbolje znate šta želite da vidite na svojoj poetnoj stranici. Nema algoritama ili reklama da troše vaše vreme. Pratite bilo koga na bilo kom Mastodon serveru sa jednog naloga i primajte njihove objave hronološkim redosledom i učinite svoj kutak interneta malo sličnijim vama.
+      feature_control_title: Držite kontrolu nad sopstvenom vremenskom linijom
+      feature_creativity: Mastodon podržava audio, video i slikovne objave, opise pristupačnosti, ankete, upozorenja o sadržaju, animirane avatare, prilagođene emodžije, kontrolu isecanja sličica i još mnogo toga, kako bi vam pomogao da se izrazite na mreži. Bilo da objavljujete svoju umetnost, muziku ili podkast, Mastodon je tu za vas.
+      feature_creativity_title: Kreativnost bez premca
+      feature_moderation: Mastodon vraća donošenje odluka u vaše ruke. Svaki server kreira sopstvena pravila i propise, koji se primenjuju lokalno, a ne odozgo prema dole kao korporativni društveni mediji, što ga čini najfleksibilnijim u odgovaranju na potrebe različitih grupa ljudi. Pridružite se serveru sa pravilima sa kojima se slažete ili hostujte svoja.
+      feature_moderation_title: Moderacija onakva kakva bi trebalo da bude
+      follow_action: Pratite
+      follow_step: Praćenje zanimljivih ljudi je ono o čemu se radi u Mastodon-u.
+      follow_title: Personalizujte svoju početnu stranicu
+      follows_subtitle: Pratite dobro poznate naloge
+      follows_title: Koga pratiti
+      follows_view_more: Pogledajte još ljudi za praćenje
+      hashtags_recent_count: "%{people} ljudi u prošlih %{days} dana"
+      hashtags_subtitle: Istražite šta je u trendu u poslednja 2 dana
+      hashtags_title: Heš oznake u trendu
+      hashtags_view_more: Pogledajte još heš oznaka u trendu
+      post_action: Napišite
+      post_step: Pozdravite svet tekstom, fotografijama, video zapisima ili anketama.
+      post_title: Napišite svoju prvu objavu
+      share_action: Podelite
+      share_step: Neka vaši prijatelji znaju kako da vas pronađu na Mastodon-u.
+      share_title: Podelite svoj Mastodon profil
+      sign_in_action: Prijavite se
       subject: Dobro došli na Mastodon
       title: Dobro došli, %{name}!
   users:
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index c5b42e6b9eaed6..19b6b66dd8800d 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -781,13 +781,15 @@ sr:
         disabled: Никоме
         users: Пријављеним локалним корисницима
       registrations:
+        moderation_recommandation: Уверите се да имате адекватан и реактиван модераторски тим пре него што отворите регистрацију за све!
         preamble: Контролишите ко сме да направи налог на Вашем серверу.
         title: Регистрације
       registrations_mode:
         modes:
-          approved: Одобрење неопходно за регистрацију
+          approved: Неопходно је одобрење за регистрацију
           none: Нико не може да се региструје
           open: Било ко може да се региструје
+        warning_hint: Препоручујемо да користите „Неопходно је одобрење за регистрацију” осим ако нисте сигурни да ваш модераторски тим може благовремено да обради нежељену пошту и злонамерне регистрације.
       security:
         authorized_fetch: Захтевај аутентификацију са здружених сервера
         authorized_fetch_hint: Захтевање аутентификације са здружених сервера омогућује строжију примену блокова и на нивоу корисника и на нивоу сервера. Међутим, ово долази по цену смањења перформанси, смањује домет ваших одговора и може довести до проблема компатибилности са неким здруженим услугама. Поред тога, ово неће спречити посвећене актере да преузимају ваше јавне објаве и налоге.
@@ -984,6 +986,9 @@ sr:
       title: Веб-пресретач
       webhook: Веб-пресретач
   admin_mailer:
+    auto_close_registrations:
+      body: Због недостатка недавних активности модератора, регистрације на %{instance} су аутоматски пребачене на захтевање ручног прегледа, како би се спречило да се %{instance} користи као платформа за потенцијалне лоше актере. Можете их вратити на отворене регистрације у било ком тренутку.
+      subject: Регистрације за %{instance} су аутоматски пребачене на захтевање одобрења
     new_appeal:
       actions:
         delete_statuses: обрисати објаве корисника
@@ -1869,9 +1874,42 @@ sr:
         silence: Налог ограничен
         suspend: Налог суспендован
     welcome:
-      edit_profile_action: Подеси налог
-      edit_profile_step: Можете прилагодити свој профил тако што ћете поставити профилну слику, променити име за приказ и тако даље. Можете дати сагласност да прегледате нове пратиоце пре него што им дозволите да Вас запрате.
+      apps_android_action: Набавите на Google Play
+      apps_ios_action: Преузмите са App Store
+      apps_step: Преузмите наше званичне апликације.
+      apps_title: Mastodon апликације
+      checklist_subtitle: 'Започнимо на овој новој друштвеној граници:'
+      checklist_title: Кораци добродошлице
+      edit_profile_action: Персонализујте
+      edit_profile_step: Повећајте своје интеракције тако што ћете имати свеобухватан профил.
+      edit_profile_title: Персонализујте свој профил
       explanation: Ево неколико савета за почетак
+      feature_action: Сазнајте више
+      feature_audience: Mastodon вам пружа јединствену могућност управљања својом публиком без посредника. Mastodon распоређен на вашој сопственој инфраструктури вам омогућује да пратите и будете праћени са било ког другог Mastodon сервера на мрежи и није ни под чијом контролом осим ваше.
+      feature_audience_title: Изградите своју публику у поверењу
+      feature_control: Ви најбоље знате шта желите да видите на својој поетној страници. Нема алгоритама или реклама да троше ваше време. Пратите било кога на било ком Mastodon серверу са једног налога и примајте њихове објаве хронолошким редоследом и учините свој кутак интернета мало сличнијим вама.
+      feature_control_title: Држите контролу над сопственом временском линијом
+      feature_creativity: Mastodon подржава аудио, видео и сликовне објаве, описе приступачности, анкете, упозорења о садржају, анимиране аватаре, прилагођене емоџије, контролу исецања сличица и још много тога, како би вам помогао да се изразите на мрежи. Било да објављујете своју уметност, музику или подкаст, Mastodon је ту за вас.
+      feature_creativity_title: Креативност без премца
+      feature_moderation: Mastodon враћа доношење одлука у ваше руке. Сваки сервер креира сопствена правила и прописе, који се примењују локално, а не одозго према доле као корпоративни друштвени медији, што га чини најфлексибилнијим у одговарању на потребе различитих група људи. Придружите се серверу са правилима са којима се слажете или хостујте своја.
+      feature_moderation_title: Модерација онаква каква би требало да буде
+      follow_action: Пратите
+      follow_step: Праћење занимљивих људи је оно о чему се ради у Mastodon-у.
+      follow_title: Персонализујте своју почетну страницу
+      follows_subtitle: Пратите добро познате налоге
+      follows_title: Кога пратити
+      follows_view_more: Погледајте још људи за праћење
+      hashtags_recent_count: "%{people} људи у прошлих %{days} дана"
+      hashtags_subtitle: Истражите шта је у тренду у последња 2 дана
+      hashtags_title: Хеш ознаке у тренду
+      hashtags_view_more: Погледајте још хеш ознака у тренду
+      post_action: Напишите
+      post_step: Поздравите свет текстом, фотографијама, видео записима или анкетама.
+      post_title: Напишите своју прву објаву
+      share_action: Поделите
+      share_step: Нека ваши пријатељи знају како да вас пронађу на Mastodon-у.
+      share_title: Поделите свој Mastodon профил
+      sign_in_action: Пријавите се
       subject: Добро дошли на Mastodon
       title: Добро дошли, %{name}!
   users:
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 108c17fc9f39c1..a40808eed60f89 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -612,6 +612,7 @@ sv:
       created_at: Anmäld
       delete_and_resolve: Ta bort inlägg
       forwarded: Vidarebefordrad
+      forwarded_replies_explanation: Den här rapporten är från en annans instans användare och handlar om annans instans inlägg. Det har vidarebefordrats till dig eftersom det rapporterade innehållet är som svar till en av dina användare.
       forwarded_to: Vidarebefordrad till %{domain}
       mark_as_resolved: Markera som löst
       mark_as_sensitive: Markera som känslig
@@ -766,6 +767,7 @@ sv:
         disabled: För ingen
         users: För inloggade lokala användare
       registrations:
+        moderation_recommandation: Se till att du har ett tillräckligt och reaktivt modereringsteam innan du öppnar registreringar till alla!
         preamble: Kontrollera vem som kan skapa ett konto på din server.
         title: Registreringar
       registrations_mode:
@@ -773,6 +775,7 @@ sv:
           approved: Godkännande krävs för registrering
           none: Ingen kan registrera
           open: Alla kan registrera
+        warning_hint: Vi rekommenderar att du använder “Godkännande krävs för registrering” om du inte är säker på att ditt moderatorsteam kan hantera skräppost och skadliga registreringar i tid.
       security:
         authorized_fetch: Kräv autentisering från federerade servrar
         authorized_fetch_hint: Att kräva autentisering från federerade servrar möjliggör striktare tillämpning av både blockering på användarnivå och servernivå. Detta sker dock på bekostnad av prestanda, minskar räckvidden på dina svar, och kan införa kompatibilitet problem med vissa federerade tjänster. Dessutom kommer detta inte att hindra dedikerade aktörer från att hämta dina offentliga inlägg och konton.
@@ -965,6 +968,9 @@ sv:
       title: Webhooks
       webhook: Webhook
   admin_mailer:
+    auto_close_registrations:
+      body: På grund av brist på moderatoraktivitet har registreringar på %{instance} automatiskt bytts till att kräva manuell granskning, för att förhindra att %{instance} används som plattform för potentiella dåliga aktörer. Du kan när som helst byta tillbaka den till öppna registreringar.
+      subject: Registreringar för %{instance} har automatiskt bytts till att kräva godkännande
     new_appeal:
       actions:
         delete_statuses: att radera deras inlägg
@@ -1792,7 +1798,10 @@ sv:
       subject: Ditt arkiv är klart för nedladdning
       title: Arkivuttagning
     failed_2fa:
+      details: 'Här är detaljerna för inloggningsförsöket:'
+      explanation: Någon har försökt att logga in på ditt konto men tillhandahållit en ogiltig andra autentiseringsfaktor.
       further_actions_html: Om detta inte var du, rekommenderar vi att du %{action} omedelbart eftersom ditt konto kan ha äventyrats.
+      subject: Andra faktorns autentiseringsfel
       title: Misslyckad tvåfaktorsautentisering
     suspicious_sign_in:
       change_password: Ändra ditt lösenord
@@ -1833,9 +1842,42 @@ sv:
         silence: Kontot begränsat
         suspend: Konto avstängt
     welcome:
-      edit_profile_action: Profilinställning
-      edit_profile_step: Du kan anpassa din profil genom att ladda upp en profilbild, ändra ditt visningsnamn med mera. Du kan välja att granska nya följare innan de får följa dig.
+      apps_android_action: Ladda ned på Google Play
+      apps_ios_action: Ladda ner på App Store
+      apps_step: Ladda ner våra officiella appar.
+      apps_title: Mastodon-appar
+      checklist_subtitle: 'Låt oss komma igång med denna nya sociala upplevelse:'
+      checklist_title: Välkomstchecklista
+      edit_profile_action: Gör mer personlig
+      edit_profile_step: Öka din interaktion genom att ha en omfattande profil.
+      edit_profile_title: Anpassa din profil
       explanation: Här är några tips för att komma igång
+      feature_action: Lär dig mer
+      feature_audience: Mastodon ger dig en unik möjlighet att hantera din publik utan mellanhänder. Mastodon distribueras på din egen infrastruktur gör att du kan följa och följas från någon annan Mastodon-server online och är under ingen kontroll men din.
+      feature_audience_title: Skapa förtroende hos din publik
+      feature_control: Du vet bäst vad du vill se i ditt hemflöde. Inga algoritmer eller annonser som slösar din tid. Följ vem som helst på vilken Mastodon-server som helst från ett enda konto, få deras inlägg i kronologisk ordning och gör ditt hörn av internet lite mer du.
+      feature_control_title: Håll kontroll över din egen tidslinje
+      feature_creativity: Mastodon stöder ljud-, video- och bildinlägg, tillgänglighetsbeskrivningar, omröstningar, innehållsvarningar, animerade avatarer, anpassade emojis, miniatyrbildskontroll och mer, för att hjälpa dig att uttrycka dig själv online. Oavsett om du publicerar din konst, din musik eller din podcast finns Mastodon där för dig.
+      feature_creativity_title: Oöverträffad kreativitet
+      feature_moderation: Mastodon lägger tillbaka beslutsfattandet i dina händer. Varje server skapar sina egna regler och förordningar som tillämpas lokalt istället för toppstyrt som i företagens sociala medier vilket gör det maximalt flexibelt i att tillgodose behoven hos olika grupper av människor. Gå med i en server med de regler du samtycker till eller var värd för din egen.
+      feature_moderation_title: Moderering som det borde vara
+      follow_action: Följ
+      follow_step: Att följa intressanta människor är vad Mastodon handlar om.
+      follow_title: Anpassa ditt hemflöde
+      follows_subtitle: Följ välkända konton
+      follows_title: Rekommenderade profiler
+      follows_view_more: Visa fler personer att följa
+      hashtags_recent_count: "%{people} personer under de senaste %{days} dagarna"
+      hashtags_subtitle: Utforska vad som har trendat de senaste 2 dagarna
+      hashtags_title: Trendande hashtaggar
+      hashtags_view_more: Visa fler trendande hashtaggar
+      post_action: Skriv
+      post_step: Säg hej till världen med text, foton, videor eller omröstningar.
+      post_title: Skapa ditt första inlägg
+      share_action: Dela
+      share_step: Låt dina vänner veta hur de hittar dig på Mastodon.
+      share_title: Dela din Mastodon-profil
+      sign_in_action: Logga in
       subject: Välkommen till Mastodon
       title: Välkommen ombord, %{name}!
   users:
diff --git a/config/locales/th.yml b/config/locales/th.yml
index b212300220e0c9..1b4ce0d6abef74 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -1810,9 +1810,34 @@ th:
         silence: จำกัดบัญชีอยู่
         suspend: ระงับบัญชีอยู่
     welcome:
-      edit_profile_action: ตั้งค่าโปรไฟล์
-      edit_profile_step: คุณสามารถปรับแต่งโปรไฟล์ของคุณได้โดยอัปโหลดรูปภาพโปรไฟล์ เปลี่ยนชื่อที่แสดงของคุณ และอื่น ๆ คุณสามารถเลือกรับการตรวจทานผู้ติดตามใหม่ก่อนที่จะอนุญาตให้เขาติดตามคุณ
+      apps_android_action: รับแอปใน Google Play
+      apps_ios_action: ดาวน์โหลดใน App Store
+      apps_step: ดาวน์โหลดแอปอย่างเป็นทางการของเรา
+      apps_title: แอป Mastodon
+      checklist_subtitle: 'มาช่วยให้คุณเริ่มต้นใช้งานพรมแดนทางสังคมใหม่นี้กันเลย:'
+      checklist_title: รายการตรวจสอบยินดีต้อนรับ
+      edit_profile_action: ปรับแต่ง
+      edit_profile_step: เพิ่มการโต้ตอบของคุณโดยการมีโปรไฟล์ที่ครอบคลุม
+      edit_profile_title: ปรับแต่งโปรไฟล์ของคุณ
       explanation: นี่คือเคล็ดลับบางส่วนที่จะช่วยให้คุณเริ่มต้นใช้งาน
+      feature_action: เรียนรู้เพิ่มเติม
+      follow_action: ติดตาม
+      follow_step: การติดตามผู้คนที่น่าสนใจคือสิ่งที่ Mastodon ให้ความสำคัญ
+      follow_title: ปรับแต่งฟีดหน้าแรกของคุณ
+      follows_subtitle: ติดตามบัญชีที่มีชื่อเสียง
+      follows_title: ติดตามใครดี
+      follows_view_more: ดูผู้คนที่จะติดตามเพิ่มเติม
+      hashtags_recent_count: "%{people} คนใน %{days} วันที่ผ่านมา"
+      hashtags_subtitle: สำรวจสิ่งที่กำลังนิยมตั้งแต่ 2 วันที่ผ่านมา
+      hashtags_title: แฮชแท็กที่กำลังนิยม
+      hashtags_view_more: ดูแฮชแท็กที่กำลังนิยมเพิ่มเติม
+      post_action: เขียน
+      post_step: กล่าวสวัสดีชาวโลกด้วยข้อความ, รูปภาพ, วิดีโอ หรือการสำรวจความคิดเห็น
+      post_title: สร้างโพสต์แรกของคุณ
+      share_action: แชร์
+      share_step: แจ้งให้เพื่อน ๆ ของคุณทราบวิธีค้นหาคุณใน Mastodon
+      share_title: แชร์โปรไฟล์ Mastodon ของคุณ
+      sign_in_action: ลงชื่อเข้า
       subject: ยินดีต้อนรับสู่ Mastodon
       title: ยินดีต้อนรับ %{name}!
   users:
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 3732e53ab96d05..58436690ca362a 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -1842,9 +1842,42 @@ tr:
         silence: Hesap sınırlandırıldı
         suspend: Hesap askıya alındı
     welcome:
-      edit_profile_action: Profil kurulumu
-      edit_profile_step: Bir profil resmi yükleyerek, ekran adınızı değiştirerek ve daha fazlasını yaparak profilinizi kişiselleştirebilirsiniz. Sizi takip etmelerine izin verilmeden önce yeni takipçileri incelemeyi tercih edebilirsiniz.
+      apps_android_action: Google Play'den edinin
+      apps_ios_action: App Store'dan İndirin
+      apps_step: Resmi uygulamalarımızı indirin.
+      apps_title: Mastodon uygulamaları
+      checklist_subtitle: 'Bu yeni sosyal sınırda başlamanızı sağlar:'
+      checklist_title: Hoşgeldiniz Yapılacaklar Listesi
+      edit_profile_action: Kişiselleştir
+      edit_profile_step: Kapsamlı bir profille etkileşimlerinizi arttırın.
+      edit_profile_title: Profilinizi kişiselleştirin
       explanation: İşte sana başlangıç için birkaç ipucu
+      feature_action: Daha fazlası
+      feature_audience: Mastodon, hedef kitlenizi aracılar olmadan yönetmeniz için size eşsiz bir olanak sağlar. Kendi altyapınızda barındırdığınız Mastodon sunucusu, çevrimiçi olarak başka bir Mastodon sunucusundan takip etmenizi ve takip edilmenizi sağlar ve sizden başka kimsenin kontrolü altında değildir.
+      feature_audience_title: Kitlenizi güvenle oluşturun
+      feature_control: Ana akışınızda ne görmek istediğinizi en iyi siz biliyorsunuz. Algoritma veya zamanınızı harcayan reklamlar yok. Tek bir hesapla herhangi bir Mastodon sunucusunda olan bir kimseyi takip edin ve gönderilere zamana göre sıralanmış şekilde erişin. Kendi internet köşenizi biraz daha kendinize benzetin.
+      feature_control_title: Zaman akışınızın denetimi sizde kalsın
+      feature_creativity: Mastodon kendinizi çevrimiçi ifade edebilmenize yardımcı olmak için ses, video ve görsel, erişilebilirlik açıklamaları, anketler, içerik uyarıları, hareketli avatarlar, özel emojiler, önizleme resmini kesme denetimi ve daha fazlasını destekliyor. Kendi sanatınızı, müziğinizi veya podcastinizi yayınlıyorsanız Mastodon kullanımınıza açık.
+      feature_creativity_title: Benzersiz yaratıcılık
+      feature_moderation: Mastodon karar vermeyi yeniden size bırakıyor. Her sunucu kendi kurallarını ve düzenlemelerini oluşturur. Bu kurallar da kurumsal sosyal medyalar gibi tepeden değil, yerel olarak uygulanıyor; bu da Mastodon'u farklı insan gruplarının ihtiyaçlarına yanıt vermede esnek kılıyor. Kurallarına katıldığınız bir sunucuya katılın veya kendi sunucunuzu barındırın.
+      feature_moderation_title: Olması gerektiği gibi moderasyon
+      follow_action: Takip et
+      follow_step: Kendi akışınızı düzenliyorsunuz. Hadi onu ilginç kullanıcılarla dolduralım.
+      follow_title: Anasayfa akışınızı kişiselleştirin
+      follows_subtitle: Tanınmış hesapları takip edin
+      follows_title: Takip edebileceklerin
+      follows_view_more: Takip edecek daha fazla kişi görüntüleyin
+      hashtags_recent_count: "%{days} günde %{people} kişi"
+      hashtags_subtitle: Son 2 günde öne çıkanları keşfedin
+      hashtags_title: Öne çıkan etiketler
+      hashtags_view_more: Daha fazla öne çıkan etiket görüntüleyin
+      post_action: Oluştur
+      post_step: Dünyaya metin, fotoğraf, video ve anketlerle merhaba deyin.
+      post_title: İlk gönderinizi oluşturun
+      share_action: Paylaş
+      share_step: Arkadaşlarınıza Mastodon'da size nasıl ulaşabileceklerini söyleyin.
+      share_title: Mastodon profilinizi paylaşın
+      sign_in_action: Oturum aç
       subject: Mastodon'a hoş geldiniz
       title: Gemiye hoşgeldin, %{name}!
   users:
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 231f0028fd411d..eb3ca2a4ae153b 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -1906,9 +1906,13 @@ uk:
         silence: Ообліковий запис обмежено
         suspend: Обліковий запис призупинено
     welcome:
-      edit_profile_action: Налаштувати профіль
-      edit_profile_step: Ви можете налаштувати свій профіль, завантаживши зображення профілю, змінивши відображуване ім'я та інше. Ви можете включити для перегляду нових підписників до того, як вони матимуть змогу підписатися на вас.
+      apps_android_action: Завантажити з Google Play
+      apps_ios_action: Завантажити з App Store
+      apps_step: Завантажити наші офіційні застосунки.
+      apps_title: Застосунки Mastodon
       explanation: Ось кілька порад для початку
+      feature_action: Докладніше
+      sign_in_action: Увійти
       subject: Ласкаво просимо до Mastodon
       title: Ласкаво просимо, %{name}!
   users:
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 2afb6aa4c15820..3ceaad92efa939 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -753,6 +753,7 @@ vi:
         disabled: Không ai
         users: Để đăng nhập người cục bộ
       registrations:
+        moderation_recommandation: Vui lòng đảm bảo rằng bạn có một đội ngũ kiểm duyệt và phản ứng nhanh trước khi mở đăng ký cho mọi người!
         preamble: Kiểm soát những ai có thể tạo tài khoản trên máy chủ của bạn.
         title: Đăng ký
       registrations_mode:
@@ -760,6 +761,7 @@ vi:
           approved: Yêu cầu phê duyệt để đăng ký
           none: Không ai có thể đăng ký
           open: Bất cứ ai cũng có thể đăng ký
+        warning_hint: Chúng tôi khuyên bạn nên sử dụng "Duyệt đăng ký thủ công" trừ khi bạn tin tưởng đội ngũ kiểm duyệt của mình có thể xử lý kịp thời các đăng ký spam và độc hại.
       security:
         authorized_fetch: Yêu cầu xác thực từ các máy chủ liên hợp
         authorized_fetch_hint: Yêu cầu xác thực từ các máy chủ liên hợp cho phép thực thi chặt chẽ hơn việc chặn cấp độ người dùng và cấp độ máy chủ. Tuy nhiên, điều này phải trả giá bằng một hình phạt về hiệu suất, làm giảm phạm vi tiếp cận của các lượt trả lời của bạn và có thể gây ra các vấn đề về khả năng tương thích với một số dịch vụ được liên hợp. Ngoài ra, điều này sẽ không ngăn cản các tác nhân chuyên dụng tìm nạp các tút và tài khoản công khai của bạn.
@@ -1808,9 +1810,42 @@ vi:
         silence: Tài khoản bị hạn chế
         suspend: Tài khoản bị vô hiệu hóa
     welcome:
-      edit_profile_action: Cài đặt trang hồ sơ
-      edit_profile_step: Bạn có thể chỉnh sửa trang hồ sơ của mình bằng cách tải lên ảnh đại diện, ảnh bìa, đổi biệt danh và hơn thế nữa. Bạn cũng có thể tự phê duyệt những người theo dõi mới.
+      apps_android_action: Tải trên Google Play
+      apps_ios_action: Tải trên App Store
+      apps_step: Tải ứng dụng chính thức.
+      apps_title: Ứng dụng Mastodon
+      checklist_subtitle: 'Hãy bắt đầu trên mạng xã hội mới này:'
+      checklist_title: Danh sách việc cần làm
+      edit_profile_action: Cá nhân hoá
+      edit_profile_step: Tạo sự tương tác bằng một hồ sơ hoàn chỉnh.
+      edit_profile_title: Tùy biến hồ sơ
       explanation: Dưới đây là một số mẹo để giúp bạn bắt đầu
+      feature_action: Tìm hiểu
+      feature_audience: Mastodon cung cấp cho bạn khả năng độc đáo để quản lý người theo dõi của bạn mà không cần bên trung gian. Mastodon có thể triển khai trên cơ sở hạ tầng của riêng bạn, cho phép bạn theo dõi và được theo dõi từ bất kỳ máy chủ Mastodon nào khác và không nằm dưới sự kiểm soát của ai ngoài bạn.
+      feature_audience_title: Tạo cộng đồng của riêng bạn
+      feature_control: Bạn biết rõ nhất những gì bạn muốn xem trên bảng tin. Không có thuật toán hoặc quảng cáo để lãng phí thời gian của bạn. Theo dõi bất kỳ ai trên bất kỳ máy chủ Mastodon nào từ một tài khoản và nhận các tút của họ theo thứ tự thời gian — làm cho góc internet của bạn là của bạn.
+      feature_control_title: Kiểm soát bảng tin của bạn
+      feature_creativity: Mastodon hỗ trợ đăng âm thanh, video, hình ảnh, mô tả trợ năng, thăm dò ý kiến, cảnh báo nội dung, hình đại diện Gif, emoji tùy chỉnh, kiểm soát cắt hình thu nhỏ... để giúp bạn thể hiện cá tính. Cho dù bạn đang xuất bản tác phẩm nghệ thuật, âm nhạc hay podcast của mình, Mastodon luôn hợp cho bạn.
+      feature_creativity_title: Sáng tạo không giới hạn
+      feature_moderation: Mastodon giành quyền tự quyết về tay bạn. Mỗi máy chủ tạo ra các nội quy của riêng họ, được thực thi nội bộ chứ không phải từ trên xuống như dịch vụ mạng xã hội của Big Tech, giúp linh hoạt trong việc đáp ứng nhu cầu của các nhóm người dùng khác nhau. Tham gia một máy chủ với các quy tắc bạn đồng ý hoặc tự chạy máy chủ của riêng bạn.
+      feature_moderation_title: Kiểm duyệt đúng nghĩa
+      follow_action: Theo dõi
+      follow_step: Theo dõi những người thú vị trên Mastodon.
+      follow_title: Cá nhân hóa bảng tin của bạn
+      follows_subtitle: Theo dõi những người thú vị
+      follows_title: Gợi ý theo dõi
+      follows_view_more: Xem thêm những người khác
+      hashtags_recent_count: "%{people} người dùng trong %{days} ngày qua"
+      hashtags_subtitle: Khám phá xu hướng 2 ngày qua
+      hashtags_title: Hashtag xu hướng
+      hashtags_view_more: Xem thêm hashtag xu hướng
+      post_action: Soạn tút
+      post_step: Chào cộng đồng bằng lời nói, ảnh hoặc video.
+      post_title: Đăng tút đầu tiên
+      share_action: Chia sẻ
+      share_step: Hãy để bạn bè của bạn biết cách tìm thấy bạn trên Mastodon.
+      share_title: Chia sẻ hồ sơ Mastodon của bạn
+      sign_in_action: Đăng nhập
       subject: Chào mừng đến với Mastodon
       title: Xin chào %{name}!
   users:
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 93c741915d279d..6296a4bb7cbc1b 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -1810,9 +1810,42 @@ zh-CN:
         silence: 账户被隐藏
         suspend: 账号被封禁
     welcome:
-      edit_profile_action: 设置个人资料
-      edit_profile_step: 您可以通过上传个人资料图片、更改您的昵称等来自定义您的个人资料。 您可以选择在新关注者关注您之前对其进行审核。
+      apps_android_action: 从 Google Play 下载
+      apps_ios_action: 从 App Store 下载
+      apps_step: 下载我们的官方应用。
+      apps_title: Mastodon应用
+      checklist_subtitle: 让我们带您开启这片社交新天地：
+      checklist_title: 欢迎清单
+      edit_profile_action: 个性化
+      edit_profile_step: 完善个人资料，提升您的互动体验。
+      edit_profile_title: 个性化您的个人资料
       explanation: 下面是几个小贴士，希望它们能帮到你
+      feature_action: 了解更多
+      feature_audience: Mastodon为您提供了无需中间商即可管理受众的独特可能。Mastodon可被部署在您自己的基础设施上，允许您关注其它任何Mastodon在线服务器的用户，或被任何其他在线 Mastodon 服务器的用户关注，并且不受您之外的任何人控制。
+      feature_audience_title: 放手去建立起您的受众
+      feature_control: 您最清楚您想在你自己的主页中看到什么动态。没有算法或广告浪费您的时间。您可以用一个账号关注任何 Mastodon 服务器上的任何人，并按时间顺序获得他们发布的嘟文，让您的互联网的角落更合自己的心意。
+      feature_control_title: 掌控自己的时间线
+      feature_creativity: Mastodon支持音频、视频和图片、无障碍描述、投票、内容警告， 动画头像、自定义表情包、缩略图裁剪控制等功能，帮助您在网上尽情表达自己。无论您是要发布您的艺术作品、音乐还是播客，Mastodon 都能为您服务。
+      feature_creativity_title: 无与伦比的创造力
+      feature_moderation: Mastodon将决策权交还给您。每个服务器都会创建自己的规则和条例，并在站点内施行，而不是像企业社交媒体那样居高临下，这使得它可以最灵活地响应不同人群的需求。加入一个您认同其规则的服务器，或托管您自己的服务器。
+      feature_moderation_title: 管理，本应如此
+      follow_action: 关注
+      follow_step: 关注有趣的人，这就是Mastodon的意义所在。
+      follow_title: 个性化您的首页动态
+      follows_subtitle: 关注知名账户
+      follows_title: 推荐关注
+      follows_view_more: 查看更多可关注的人
+      hashtags_recent_count: 在过去的 %{days} 天中有 %{people} 人
+      hashtags_subtitle: 探索过去2天以来的热门内容
+      hashtags_title: 热门话题标签
+      hashtags_view_more: 查看更多热门话题标签
+      post_action: 撰写
+      post_step: 向世界打个招呼吧。
+      post_title: 发布您的第一条嘟文
+      share_action: 分享
+      share_step: 让您的朋友知道如何在Mastodon找到你。
+      share_title: 分享您的Mastodon个人资料
+      sign_in_action: 登录
       subject: 欢迎来到 Mastodon
       title: "%{name}，欢迎你的加入！"
   users:
diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml
index 62649864c735e0..0d3e109b19733e 100644
--- a/config/locales/zh-HK.yml
+++ b/config/locales/zh-HK.yml
@@ -1805,8 +1805,6 @@ zh-HK:
         silence: 賬戶已被限制
         suspend: 帳號已停用
     welcome:
-      edit_profile_action: 設定個人資料
-      edit_profile_step: 你可以透過上傳頭像、更改顯示名稱等來自訂個人檔案。你可以選擇讓新使用者追蹤你之前先審查他們。
       explanation: 下面是幾個小貼士，希望它們能幫到你
       subject: 歡迎來到 Mastodon (萬象)
       title: 歡迎 %{name} 加入！
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index f50f685bb4c2e1..d8952edec91f66 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -148,8 +148,8 @@ zh-TW:
       subscribe: 訂閱
       suspend: 停權
       suspended: 已停權
-      suspension_irreversible: 已永久刪除此帳號的資料。您可以取消這個帳號的停權狀態，但無法還原已刪除的資料。
-      suspension_reversible_hint_html: 這個帳號已被暫停，所有數據將於 %{date} 被刪除。於此之前，您可以完全回復您的帳號。如果您想即時刪除這個帳號的數據，您能於下面進行操作。
+      suspension_irreversible: 已永久刪除此帳號的資料。您可以取消這個帳號之停權狀態，但無法還原已刪除的資料。
+      suspension_reversible_hint_html: 這個帳號已被停權，所有資料將於 %{date} 被刪除。於此之前，您可以完全回復您的帳號。如果您想即時刪除這個帳號的資料，您能於下面進行操作。
       title: 帳號
       unblock_email: 解除封鎖電子郵件地址
       unblocked_email_msg: 成功解除封鎖 %{username} 的電子郵件地址
@@ -176,7 +176,7 @@ zh-TW:
         create_account_warning: 新增警告
         create_announcement: 新增公告
         create_canonical_email_block: 新增 E-mail 封鎖
-        create_custom_emoji: 新增自訂顏文字
+        create_custom_emoji: 新增自訂 emoji 表情符號
         create_domain_allow: 新增允許網域
         create_domain_block: 新增網域封鎖
         create_email_domain_block: 新增電子郵件網域封鎖
@@ -186,7 +186,7 @@ zh-TW:
         demote_user: 將用戶降級
         destroy_announcement: 刪除公告
         destroy_canonical_email_block: 刪除 E-mail 封鎖
-        destroy_custom_emoji: 刪除自訂顏文字
+        destroy_custom_emoji: 刪除自訂 emoji 表情符號
         destroy_domain_allow: 刪除允許網域
         destroy_domain_block: 刪除網域封鎖
         destroy_email_domain_block: 刪除電子郵件網域封鎖
@@ -196,10 +196,10 @@ zh-TW:
         destroy_unavailable_domain: 刪除無法存取的網域
         destroy_user_role: 移除角色
         disable_2fa_user: 停用兩階段驗證
-        disable_custom_emoji: 停用自訂顏文字
+        disable_custom_emoji: 停用自訂 emoji 表情符號
         disable_sign_in_token_auth_user: 停用使用者電子郵件 token 驗證
         disable_user: 停用帳號
-        enable_custom_emoji: 啓用自訂顏文字
+        enable_custom_emoji: 啟用自訂 emoji 表情符號
         enable_sign_in_token_auth_user: 啟用使用者電子郵件 token 驗證
         enable_user: 啓用帳號
         memorialize_account: 設定成追悼帳號
@@ -218,9 +218,9 @@ zh-TW:
         unblock_email_account: 解除封鎖電子郵件地址
         unsensitive_account: 取消將媒體強制標記為敏感內容
         unsilence_account: 取消帳號的靜音狀態
-        unsuspend_account: 取消帳號的暫停狀態
+        unsuspend_account: 取消帳號之停權狀態
         update_announcement: 更新公告
-        update_custom_emoji: 更新自訂顏文字
+        update_custom_emoji: 更新自訂 emoji 表情符號
         update_domain_block: 更新網域封鎖
         update_ip_block: 更新 IP 規則
         update_status: 更新狀態
@@ -235,7 +235,7 @@ zh-TW:
         create_account_warning_html: "%{name} 已對 %{target} 送出警告"
         create_announcement_html: "%{name} 已新增公告 %{target}"
         create_canonical_email_block_html: "%{name} 已封鎖 hash 為 %{target} 的 e-mail"
-        create_custom_emoji_html: "%{name} 已上傳新自訂表情符號 %{target}"
+        create_custom_emoji_html: "%{name} 已上傳新自訂 emoji 表情符號 %{target}"
         create_domain_allow_html: "%{name} 允許 %{target} 網域加入聯邦宇宙"
         create_domain_block_html: "%{name} 已封鎖網域 %{target}"
         create_email_domain_block_html: "%{name} 已封鎖電子郵件網域 %{target}"
@@ -245,7 +245,7 @@ zh-TW:
         demote_user_html: "%{name} 將使用者 %{target} 降級"
         destroy_announcement_html: "%{name} 已刪除公告 %{target}"
         destroy_canonical_email_block_html: "%{name} 已解除封鎖 hash 為 %{target} 的電子郵件"
-        destroy_custom_emoji_html: "%{name} 已刪除表情符號 %{target}"
+        destroy_custom_emoji_html: "%{name} 已刪除 emoji 表情符號 %{target}"
         destroy_domain_allow_html: "%{name} 不允許與網域 %{target} 加入聯邦宇宙"
         destroy_domain_block_html: "%{name} 已解除封鎖網域 %{target}"
         destroy_email_domain_block_html: "%{name} 已解除封鎖電子郵件網域 %{target}"
@@ -255,10 +255,10 @@ zh-TW:
         destroy_unavailable_domain_html: "%{name} 已恢復對網域 %{target} 的發送"
         destroy_user_role_html: "%{name} 已刪除 %{target} 角色"
         disable_2fa_user_html: "%{name} 已停用使用者 %{target} 的兩階段驗證 (2FA) "
-        disable_custom_emoji_html: "%{name} 已停用自訂表情符號 %{target}"
+        disable_custom_emoji_html: "%{name} 已停用自訂 emoji 表情符號 %{target}"
         disable_sign_in_token_auth_user_html: "%{name} 已停用 %{target} 之使用者電子郵件 token 驗證"
         disable_user_html: "%{name} 將使用者 %{target} 設定為禁止登入"
-        enable_custom_emoji_html: "%{name} 已啟用自訂表情符號 %{target}"
+        enable_custom_emoji_html: "%{name} 已啟用自訂 emoji 表情符號 %{target}"
         enable_sign_in_token_auth_user_html: "%{name} 已啟用 %{target} 之使用者電子郵件 token 驗證"
         enable_user_html: "%{name} 將使用者 %{target} 設定為允許登入"
         memorialize_account_html: "%{name} 將 %{target} 設定為追悼帳號"
@@ -279,7 +279,7 @@ zh-TW:
         unsilence_account_html: "%{name} 已取消使用者 %{target} 的靜音狀態"
         unsuspend_account_html: "%{name} 已取消停權 %{target} 的帳號"
         update_announcement_html: "%{name} 已更新公告 %{target}"
-        update_custom_emoji_html: "%{name} 已更新自訂表情符號 %{target}"
+        update_custom_emoji_html: "%{name} 已更新自訂 emoji 表情符號 %{target}"
         update_domain_block_html: "%{name} 已更新 %{target} 之網域封鎖"
         update_ip_block_html: "%{name} 已變更 IP %{target} 之規則"
         update_status_html: "%{name} 已更新 %{target} 的嘟文"
@@ -309,37 +309,37 @@ zh-TW:
     critical_update_pending: 重要更新待升級
     custom_emojis:
       assign_category: 指定分類
-      by_domain: 站點
+      by_domain: 伺服器
       copied_msg: 成功建立 emoji 表情符號之本地備份
       copy: 複製
-      copy_failed_msg: 無法將表情複製到本地
+      copy_failed_msg: 無法將該 emoji 表情符號複製至本地
       create_new_category: 建立新分類
-      created_msg: 已新增表情符號！
+      created_msg: 已新增 emoji 表情符號！
       delete: 刪除
-      destroyed_msg: 已刪除表情符號！
+      destroyed_msg: 已刪除 emoji 表情符號！
       disable: 停用
       disabled: 已停用
-      disabled_msg: 已停用該表情符號
-      emoji: 表情符號
+      disabled_msg: 已停用該 emoji 表情符號
+      emoji: emoji 表情符號
       enable: 啟用
       enabled: 已啟用
-      enabled_msg: 已啟用該表情符號
+      enabled_msg: 已啟用該 emoji 表情符號
       image_hint: 檔案大小最大至 %{size} 之 PNG 或 GIF
       list: 列表
       listed: 已顯示
       new:
-        title: 加入新的自訂表情符號
-      no_emoji_selected: 未選取任何 emoji，所以什麼事都沒發生
+        title: 新增自訂 emoji 表情符號
+      no_emoji_selected: 未選取任何 emoji 表情符號，所以什麼事都沒發生
       not_permitted: 您無權執行此操作
       overwrite: 覆蓋
-      shortcode: 短代碼
-      shortcode_hint: 至少 2 個字元，只能使用字母、數字與下劃線
-      title: 自訂表情符號
+      shortcode: 短碼
+      shortcode_hint: 至少 2 個字元，只能使用字母、數字與底線
+      title: 自訂 emoji 表情符號
       uncategorized: 未分類
       unlist: 不公開
       unlisted: 已隱藏
-      update_failed_msg: 無法更新表情符號
-      updated_msg: 已更新表情符號！
+      update_failed_msg: 無法更新該 emoji 表情符號
+      updated_msg: 已更新 emoji 表情符號！
       upload: 上傳新的表情符號
     dashboard:
       active_users: 活躍使用者
@@ -640,7 +640,7 @@ zh-TW:
           suspend_html: 停權 <strong>@%{acct}</strong>，將他們的個人檔案與內容標記為無法存取及無法與之互動
         close_report: '將檢舉報告 #%{id} 標記為已處理'
         close_reports_html: 將 <strong>所有</strong> 對於 <strong>@%{acct}</strong> 之檢舉報告標記為已處理
-        delete_data_html: 於即日起 30 天後刪除 <strong>@%{acct}</strong>之個人檔案與內容，除非他們於期限前被解除暫停
+        delete_data_html: 於即日起 30 天後刪除 <strong>@%{acct}</strong>之個人檔案與內容，除非他們於期限前被解除停權
         preview_preamble_html: "<strong>@%{acct}</strong> 將收到關於以下內容之警告："
         record_strike_html: 紀錄關於 <strong>@%{acct}</strong>之警示有助於您升級對此帳號未來違規處理
         send_email_html: 寄一封警告 e-mail 給 <strong>@%{acct}</strong>
@@ -682,8 +682,8 @@ zh-TW:
         manage_appeals_description: 允許使用者審閱針對站務動作之申訴
         manage_blocks: 管理封鎖
         manage_blocks_description: 允許使用者封鎖電子郵件提供者與 IP 位置
-        manage_custom_emojis: 管理自訂表情符號
-        manage_custom_emojis_description: 允許使用者管理伺服器上的自訂表情符號
+        manage_custom_emojis: 管理自訂 emoji 表情符號
+        manage_custom_emojis_description: 允許使用者管理伺服器上之自訂 emoji 表情符號
         manage_federation: 管理聯邦宇宙
         manage_federation_description: 允許使用者封鎖或允許與其他網域的聯邦宇宙，並控制傳遞能力
         manage_invites: 管理邀請
@@ -714,7 +714,7 @@ zh-TW:
     rules:
       add_new: 新增規則
       delete: 刪除
-      description_html: 雖然大多數人皆宣稱已閱讀並同意服務條款，通常直到某些問題發生時人們從未讀過。<strong>以透過提供條列式規則的方式讓您的伺服器規則可以一目了然。</strong>試著維持各項條款簡短而明瞭，但也試著不要將條款切割為許多分開的項目。
+      description_html: 雖然大多數人皆宣稱已閱讀並同意服務條款，通常直到某些問題發生時人們從未讀過。<strong>以透過提供條列式規則的方式使您的伺服器規則可以一目了然。</strong>試著維持各項條款簡短而明瞭，但也試著不要將條款切割為許多分開的項目。
       edit: 編輯規則
       empty: 未曾定義任何伺服器規則
       title: 伺服器規則
@@ -935,7 +935,7 @@ zh-TW:
     webhooks:
       add_new: 新增端點
       delete: 刪除
-      description_html: "<strong>Webhook</strong> 讓 Mastodon 可以將關於選定的事件的<strong>即時通知</strong>推送到您自己的應用程式，如此您的應用程式就可以<strong>自動觸發反應</strong>。"
+      description_html: "<strong>Webhook</strong> 使 Mastodon 可以將關於選定的事件的<strong>即時通知</strong>推送到您自己的應用程式，如此您的應用程式就可以<strong>自動觸發反應</strong>。"
       disable: 停用
       disabled: 已停用
       edit: 編輯端點
@@ -990,15 +990,15 @@ zh-TW:
         title: 熱門主題標籤
       subject: "%{instance} 有待審核之新熱門"
   aliases:
-    add_new: 建立別名
-    created_msg: 成功建立別名。您可以自舊帳號開始轉移。
+    add_new: 新增別名
+    created_msg: 成功新增別名。您可以自舊帳號開始轉移。
     deleted_msg: 成功移除別名。您將無法再由舊帳號轉移至目前的帳號。
     empty: 您目前沒有任何別名。
     hint_html: 如果想由其他帳號轉移至此帳號，您能於此處新增別名，稍後系統將容許您將跟隨者由舊帳號轉移至此。此項作業是<strong>無害且可復原的</strong>。 <strong>帳號的遷移程序需要於舊帳號啟動</strong>。
     remove: 取消連結別名
   appearance:
     advanced_web_interface: 進階網頁介面
-    advanced_web_interface_hint: 進階網頁介面可讓您設定許多不同的欄位來善用螢幕空間，依需要同時查看許多不同的資訊如：首頁、通知、聯邦宇宙時間軸、任意數量的列表與主題標籤。
+    advanced_web_interface_hint: 進階網頁介面能使您設定許多不同的欄位來善用螢幕空間，依需要同時查看許多不同的資訊如：首頁、通知、聯邦宇宙時間軸、任意數量的列表與主題標籤。
     animations_and_accessibility: 動畫與無障礙設定
     confirmation_dialogs: 確認對話框
     discovery: 探索
@@ -1016,7 +1016,7 @@ zh-TW:
     view_profile: 檢視個人檔案
     view_status: 檢視嘟文
   applications:
-    created: 已建立應用程式
+    created: 已新增應用程式
     destroyed: 已刪除應用程式
     logout: 登出
     regenerate_token: 重新產生存取 token
@@ -1091,7 +1091,7 @@ zh-TW:
       title: 登入 %{domain}
     sign_up:
       manual_review: "%{domain} 上的註冊由我們的管理員進行人工審核。為協助我們處理您的註冊，請寫一些關於您自己的資訊以及您欲於 %{domain} 上註冊帳號之原因。"
-      preamble: 於此 Mastodon 伺服器擁有帳號的話，您將能跟隨聯邦宇宙網路中任何一份子，無論他們的帳號託管於何處。
+      preamble: 若於此 Mastodon 伺服器擁有帳號，您將能跟隨聯邦宇宙網路中任何一份子，無論他們的帳號託管於何處。
       title: 讓我們一起設定 %{domain} 吧！
     status:
       account_status: 帳號狀態
@@ -1349,20 +1349,20 @@ zh-TW:
       '604800': 1 週後
       '86400': 1 天後
     expires_in_prompt: 永不過期
-    generate: 建立邀請連結
+    generate: 產生邀請連結
     invalid: 此邀請是無效的
     invited_by: 您的邀請人是：
     max_uses:
       other: "%{count} 則"
     max_uses_prompt: 無限制
-    prompt: 建立分享連結，邀請他人於本伺服器註冊
+    prompt: 產生分享連結，邀請他人於本伺服器註冊
     table:
       expires_at: 失效時間
       uses: 已使用次數
     title: 邀請使用者
   lists:
     errors:
-      limit: 您所建立的列表數量已達上限
+      limit: 您所建立之列表數量已達上限
   login_activities:
     authentication_methods:
       otp: 兩階段驗證應用程式
@@ -1407,7 +1407,7 @@ zh-TW:
       on_cooldown: 您正在處於冷卻（CD）狀態
     followers_count: 轉移時的跟隨者
     incoming_migrations: 自另一個帳號轉移
-    incoming_migrations_html: 要從其他帳號移動到此帳號的話，首先您必須<a href="%{path}">建立帳號別名</a>。
+    incoming_migrations_html: 若欲自其他帳號移動至此帳號，首先您必須<a href="%{path}">新增帳號別名</a>。
     moved_msg: 您的帳號正被重新導向到 %{acct}，您的跟隨者也會同步轉移至該帳號。
     not_redirecting: 您的帳號目前尚未重新導向到任何其他帳號。
     on_cooldown: 您最近已轉移過您的帳號。此功能將於 %{count} 天後可再度使用。
@@ -1512,11 +1512,11 @@ zh-TW:
     posting_defaults: 嘟文預設值
     public_timelines: 公開時間軸
   privacy:
-    hint_html: "<strong>自訂您希望如何讓您的個人檔案及嘟文被發現。</strong>藉由啟用一系列 Mastodon 功能以幫助您觸及更廣的受眾。煩請花些時間確認您是否欲啟用這些設定。"
+    hint_html: "<strong>自訂您希望如何使您的個人檔案及嘟文被發現。</strong>藉由啟用一系列 Mastodon 功能以幫助您觸及更廣的受眾。煩請花些時間確認您是否欲啟用這些設定。"
     privacy: 隱私權
     privacy_hint_html: 控制您希望向其他人揭露之內容。人們透過瀏覽其他人的跟隨者與其發嘟之應用程式發現有趣的個人檔案與酷炫的 Mastodon 應用程式，但您能選擇將其隱藏。
     reach: 觸及
-    reach_hint_html: 控制您希望被新使用者探索或跟隨之方式。想讓您的嘟文出現於探索頁面嗎？想讓其他人透過他們的跟隨建議找到您嗎？想自動接受所有新跟隨者嗎？或是想逐一控制跟隨請求嗎？
+    reach_hint_html: 控制您希望被新使用者探索或跟隨之方式。想使您的嘟文出現於探索頁面嗎？想使其他人透過他們的跟隨建議找到您嗎？想自動接受所有新跟隨者嗎？或是想逐一控制跟隨請求嗎？
     search: 搜尋
     search_hint_html: 控制您希望如何被發現。您想透過您的公開嘟文被人們發現嗎？您想透過網頁搜尋被 Mastodon 以外的人找到您的個人檔案嗎？請注意，公開資訊可能無法全面地被所有搜尋引擎所排除。
     title: 隱私權及觸及
@@ -1525,7 +1525,7 @@ zh-TW:
   reactions:
     errors:
       limit_reached: 達到可回應之上限
-      unrecognized_emoji: 並非一個可識別的 emoji
+      unrecognized_emoji: 並非可識別之 emoji 表情符號
   redirects:
     prompt: 若您信任此連結，請點擊以繼續。
     title: 您將要離開 %{instance} 。
@@ -1743,7 +1743,7 @@ zh-TW:
     enabled: 兩階段驗證已啟用
     enabled_success: 兩階段驗證已成功啟用
     generate_recovery_codes: 產生備用驗證碼
-    lost_recovery_codes: 讓您能於遺失手機時，使用備用驗證碼登入。若您已遺失備用驗證碼，可於此產生一批新的，舊有的備用驗證碼將會失效。
+    lost_recovery_codes: 使您能於遺失手機時，透過備用驗證碼登入。若您已遺失備用驗證碼，可於此產生一批新的，舊有的備用驗證碼將會失效。
     methods: 兩階段驗證
     otp: 驗證應用程式
     recovery_codes: 備份備用驗證碼
@@ -1812,9 +1812,42 @@ zh-TW:
         silence: 帳號已被限制
         suspend: 帳號己被停權
     welcome:
-      edit_profile_action: 設定個人檔案
-      edit_profile_step: 您可以設定您的個人檔案，包括上傳大頭貼、變更顯示名稱等等。您也可以選擇於新的跟隨者跟隨前，先對他們進行審核。
+      apps_android_action: 於 Google Play 下載
+      apps_ios_action: 於 App Store 下載
+      apps_step: 下載官方應用程式。
+      apps_title: Mastodon APP
+      checklist_subtitle: 讓我們協助您於這個嶄新的社交平台上啟程：
+      checklist_title: 新手任務清單
+      edit_profile_action: 個人化設定
+      edit_profile_step: 若您完整填寫個人檔案，其他人比較願意與您互動。
+      edit_profile_title: 客製化您的個人檔案
       explanation: 以下是幾個小技巧，希望它們能幫到您
+      feature_action: 了解更多
+      feature_audience: Mastodon 為您打開了一扇獨特的門，使您不受平台干擾，自由地管理您的受眾。只需將 Mastodon 部署於您自己的基礎設施上，您便能與線上任何 Mastodon 伺服器互動，而且控制權只在您手中。
+      feature_audience_title: 自信地建立您的受眾
+      feature_control: 您最清楚自己想於首頁動態看到什麼內容，別讓演算法與廣告浪費您寶貴的時間。自同一帳號跟隨任何 Mastodon 伺服器上的任何一個人，依時間順序接收他們的嘟文，建立屬於自己的網路小角落。
+      feature_control_title: 掌控自己的時間軸
+      feature_creativity: Mastodon 支援音訊、影片及圖片嘟文、無障礙說明文字、投票、內容警告、動畫大頭貼、自訂 emoji 表情符號、縮圖裁剪控制等等，協助您表達自我。無論是發佈藝術作品、音樂，或是 podcast，Mastodon 將隨時陪伴著您。
+      feature_creativity_title: 無與倫比的創意
+      feature_moderation: Mastodon 將決策權交還於您。每台伺服器皆能制定自己的規則與管理規範，並於該伺服器上實施。這與社交媒體公司由上而下的規範大不相同，因此能更有彈性地滿足不同群體的需求。您可以加入認同其規則之伺服器，或者自行架設伺服器。
+      feature_moderation_title: 管理方式，如您所願
+      follow_action: 跟隨
+      follow_step: Mastodon 的趣味就是跟隨那些有趣的人們！
+      follow_title: 客製化您的首頁時間軸
+      follows_subtitle: 跟隨家喻戶曉的熱門帳號
+      follows_title: 推薦跟隨帳號
+      follows_view_more: 檢視更多人以跟隨
+      hashtags_recent_count: 於過去 %{days} 天 %{people} 人
+      hashtags_subtitle: 探索過去兩天內的熱門主題標籤
+      hashtags_title: 熱門主題標籤
+      hashtags_view_more: 檢視更多熱門主題標籤
+      post_action: 撰寫
+      post_step: 透過文字、照片、影片或投票向新世界打聲招呼吧。
+      post_title: 撰寫您第一則嘟文
+      share_action: 分享
+      share_step: 讓您的朋友們知道如何於 Mastodon 找到您。
+      share_title: 分享您 Mastodon 個人檔案
+      sign_in_action: 登入
       subject: 歡迎來到 Mastodon
       title: "%{name} 誠摯歡迎您的加入！"
   users:
@@ -1839,7 +1872,7 @@ zh-TW:
       success: 您已成功加入安全金鑰。
     delete: 刪除
     delete_confirmation: 您確定要移除這把安全金鑰嗎？
-    description_html: 如果您啟用<strong>安全金鑰驗證</strong>的話，您將於登入時需要使用其中一把安全金鑰。
+    description_html: 若您啟用<strong>安全金鑰驗證</strong>，您將於登入時需要使用其中一把安全金鑰。
     destroy:
       error: 移除安全金鑰時出現了問題。請再試一次。
       success: 您已成功將安全金鑰移除。

From df3798a6fa65208e6d323c6856041b87e4feae19 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 11 Mar 2024 09:49:04 +0100
Subject: [PATCH 0382/2191] Update dependency eslint-plugin-jsdoc to v48.2.1
 (#29544)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 75a725c4ee564b..75e6d472e480c7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7374,8 +7374,8 @@ __metadata:
   linkType: hard
 
 "eslint-plugin-jsdoc@npm:^48.0.0":
-  version: 48.2.0
-  resolution: "eslint-plugin-jsdoc@npm:48.2.0"
+  version: 48.2.1
+  resolution: "eslint-plugin-jsdoc@npm:48.2.1"
   dependencies:
     "@es-joy/jsdoccomment": "npm:~0.42.0"
     are-docs-informative: "npm:^0.0.2"
@@ -7388,7 +7388,7 @@ __metadata:
     spdx-expression-parse: "npm:^4.0.0"
   peerDependencies:
     eslint: ^7.0.0 || ^8.0.0 || ^9.0.0
-  checksum: 10c0/778f979ca40594269d531767ab29fb2a6c448425f8f732708ac5d3b9c61bbeb8504f1490a1057c7740f3e8f8a75d57ff50c766bc40fb1474f195e6f1aed30814
+  checksum: 10c0/92237f08b7dadb21f9eda50eda00bf69ac5e0bfcb9d179bf118e096178d7dc4a62b34fd01b3b7b0ba1142ff6e13814cfe2cf9a60c6cfcc879559b6b509d0d4e1
   languageName: node
   linkType: hard
 

From 7b89d6842e49ad9dd2b9018dc41b01db3fef14cb Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 11 Mar 2024 09:49:07 +0100
Subject: [PATCH 0383/2191] Update DefinitelyTyped types (non-major) (#29543)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 75e6d472e480c7..5112721f08b4b5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3326,11 +3326,11 @@ __metadata:
   linkType: hard
 
 "@types/react-dom@npm:^18.0.0, @types/react-dom@npm:^18.2.4":
-  version: 18.2.19
-  resolution: "@types/react-dom@npm:18.2.19"
+  version: 18.2.21
+  resolution: "@types/react-dom@npm:18.2.21"
   dependencies:
     "@types/react": "npm:*"
-  checksum: 10c0/88d7c6daa4659f661d0c97985d9fca492f24b421a34bb614dcd94c343aed7bea121463149e97fb01ecaa693be17b7d1542cf71ddb1705f3889a81eb2639a88aa
+  checksum: 10c0/a887b4b647071df48173f054854713b68fdacfceeba7fa14f64ba26688d7d43574d7dc88a2a346e28f2e667eeab1b9bdbcad8a54353869835e52638607f61ff5
   languageName: node
   linkType: hard
 
@@ -3456,13 +3456,13 @@ __metadata:
   linkType: hard
 
 "@types/react@npm:*, @types/react@npm:16 || 17 || 18, @types/react@npm:>=16.9.11, @types/react@npm:^18.2.7":
-  version: 18.2.63
-  resolution: "@types/react@npm:18.2.63"
+  version: 18.2.64
+  resolution: "@types/react@npm:18.2.64"
   dependencies:
     "@types/prop-types": "npm:*"
     "@types/scheduler": "npm:*"
     csstype: "npm:^3.0.2"
-  checksum: 10c0/53d86727b966a3ba097553b5ef75a1f2bea78bd8c54ebcf6d00bd338000112b208ab30536c8c0a9f5fc61055cc3fbabbc7a23910c55092341602845de4c13714
+  checksum: 10c0/ab3ba9597990d08ffd419a5ad28fd22393c7a9a241ae455fb1d5d193d209471aa1909fa7ad016fd8d161eab6d0babba77b013b56a5170bedf78833085b9ee424
   languageName: node
   linkType: hard
 

From 6f8ec6d7f85ed4250d171a7e9df1b3f6134f73d6 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 11 Mar 2024 09:50:54 +0100
Subject: [PATCH 0384/2191] Update dependency test-prof to v1.3.2 (#29528)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 73ddfb4cff5eeb..cb76abafccecb9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -744,7 +744,7 @@ GEM
       unicode-display_width (>= 1.1.1, < 3)
     terrapin (1.0.1)
       climate_control
-    test-prof (1.3.1)
+    test-prof (1.3.2)
     thor (1.3.1)
     tilt (2.3.0)
     timeout (0.4.1)

From 98ef38e34ebc7f296a818e8cb454219f997529c2 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 11 Mar 2024 04:53:24 -0400
Subject: [PATCH 0385/2191] Ensure unique values in fabricators (#29515)

---
 spec/fabrication/fabricators_spec.rb       | 6 +++---
 spec/fabricators/identity_fabricator.rb    | 2 +-
 spec/fabricators/relay_fabricator.rb       | 2 +-
 spec/fabricators/site_upload_fabricator.rb | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/spec/fabrication/fabricators_spec.rb b/spec/fabrication/fabricators_spec.rb
index 53193378c84f0b..2cf45041a4a80d 100644
--- a/spec/fabrication/fabricators_spec.rb
+++ b/spec/fabrication/fabricators_spec.rb
@@ -6,9 +6,9 @@
 
 Fabrication.manager.schematics.map(&:first).each do |factory_name|
   describe "The #{factory_name} factory" do
-    it 'is valid' do
-      factory = Fabricate(factory_name)
-      expect(factory).to be_valid
+    it 'is able to create valid records' do
+      records = Fabricate.times(2, factory_name) # Create multiple of each to uncover uniqueness issues
+      expect(records).to all(be_valid)
     end
   end
 end
diff --git a/spec/fabricators/identity_fabricator.rb b/spec/fabricators/identity_fabricator.rb
index 83655ee8396762..6e125a4e7213f9 100644
--- a/spec/fabricators/identity_fabricator.rb
+++ b/spec/fabricators/identity_fabricator.rb
@@ -3,5 +3,5 @@
 Fabricator(:identity) do
   user { Fabricate.build(:user) }
   provider 'MyString'
-  uid      'MyString'
+  uid { sequence(:uid) { |i| "uid_string_#{i}" } }
 end
diff --git a/spec/fabricators/relay_fabricator.rb b/spec/fabricators/relay_fabricator.rb
index ad8ba86fcfe8e3..07fc6f88c55bbf 100644
--- a/spec/fabricators/relay_fabricator.rb
+++ b/spec/fabricators/relay_fabricator.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 Fabricator(:relay) do
-  inbox_url 'https://example.com/inbox'
+  inbox_url { sequence(:inbox_url) { |i| "https://example.com/inboxes/#{i}" } }
   state :idle
 end
diff --git a/spec/fabricators/site_upload_fabricator.rb b/spec/fabricators/site_upload_fabricator.rb
index 87553ccb8a0b8f..cbe42d3b4cf9d3 100644
--- a/spec/fabricators/site_upload_fabricator.rb
+++ b/spec/fabricators/site_upload_fabricator.rb
@@ -2,5 +2,5 @@
 
 Fabricator(:site_upload) do
   file { Rails.root.join('spec', 'fabricators', 'assets', 'utah_teapot.png').open }
-  var 'thumbnail'
+  var { sequence(:var) { |i| "thumbnail_#{i}" } }
 end

From 5b3a8737d6fa84c91e5158c34170f488df9ad313 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 11 Mar 2024 09:57:07 +0100
Subject: [PATCH 0386/2191] Add hints for rules (#29539)

---
 app/controllers/admin/rules_controller.rb        | 2 +-
 app/javascript/mastodon/features/about/index.jsx | 3 ++-
 app/javascript/styles/mastodon/about.scss        | 6 ++++++
 app/models/rule.rb                               | 1 +
 app/serializers/rest/rule_serializer.rb          | 2 +-
 app/views/admin/rules/edit.html.haml             | 3 +++
 app/views/admin/rules/index.html.haml            | 3 +++
 app/views/auth/registrations/rules.html.haml     | 1 +
 config/locales/simple_form.en.yml                | 2 ++
 db/migrate/20240310123453_add_hint_to_rules.rb   | 7 +++++++
 db/schema.rb                                     | 3 ++-
 11 files changed, 29 insertions(+), 4 deletions(-)
 create mode 100644 db/migrate/20240310123453_add_hint_to_rules.rb

diff --git a/app/controllers/admin/rules_controller.rb b/app/controllers/admin/rules_controller.rb
index d31aec6ea88b54..b8def22ba371f9 100644
--- a/app/controllers/admin/rules_controller.rb
+++ b/app/controllers/admin/rules_controller.rb
@@ -53,7 +53,7 @@ def set_rule
     end
 
     def resource_params
-      params.require(:rule).permit(:text, :priority)
+      params.require(:rule).permit(:text, :hint, :priority)
     end
   end
 end
diff --git a/app/javascript/mastodon/features/about/index.jsx b/app/javascript/mastodon/features/about/index.jsx
index 3287631ed1ba88..5197d338cd6fc9 100644
--- a/app/javascript/mastodon/features/about/index.jsx
+++ b/app/javascript/mastodon/features/about/index.jsx
@@ -170,7 +170,8 @@ class About extends PureComponent {
               <ol className='rules-list'>
                 {server.get('rules').map(rule => (
                   <li key={rule.get('id')}>
-                    <span className='rules-list__text'>{rule.get('text')}</span>
+                    <div className='rules-list__text'>{rule.get('text')}</div>
+                    {rule.get('hint').length > 0 && (<div className='rules-list__hint'>{rule.get('hint')}</div>)}
                   </li>
                 ))}
               </ol>
diff --git a/app/javascript/styles/mastodon/about.scss b/app/javascript/styles/mastodon/about.scss
index 0f02563b48d31e..9d23ef41abdb47 100644
--- a/app/javascript/styles/mastodon/about.scss
+++ b/app/javascript/styles/mastodon/about.scss
@@ -53,4 +53,10 @@ $fluid-breakpoint: $maximum-width + 20px;
       border-bottom: 0;
     }
   }
+
+  &__hint {
+    font-size: 14px;
+    font-weight: 400;
+    color: $darker-text-color;
+  }
 }
diff --git a/app/models/rule.rb b/app/models/rule.rb
index 602e5d5874ee0e..f28dc2ffeb4995 100644
--- a/app/models/rule.rb
+++ b/app/models/rule.rb
@@ -10,6 +10,7 @@
 #  text       :text             default(""), not null
 #  created_at :datetime         not null
 #  updated_at :datetime         not null
+#  hint       :text             default(""), not null
 #
 class Rule < ApplicationRecord
   include Discard::Model
diff --git a/app/serializers/rest/rule_serializer.rb b/app/serializers/rest/rule_serializer.rb
index fc925925a98d95..9e2bcda15e32ea 100644
--- a/app/serializers/rest/rule_serializer.rb
+++ b/app/serializers/rest/rule_serializer.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class REST::RuleSerializer < ActiveModel::Serializer
-  attributes :id, :text
+  attributes :id, :text, :hint
 
   def id
     object.id.to_s
diff --git a/app/views/admin/rules/edit.html.haml b/app/views/admin/rules/edit.html.haml
index ba7e6451a149b3..77815588d220b9 100644
--- a/app/views/admin/rules/edit.html.haml
+++ b/app/views/admin/rules/edit.html.haml
@@ -7,5 +7,8 @@
   .fields-group
     = f.input :text, wrapper: :with_block_label
 
+  .fields-group
+    = f.input :hint, wrapper: :with_block_label
+
   .actions
     = f.button :button, t('generic.save_changes'), type: :submit
diff --git a/app/views/admin/rules/index.html.haml b/app/views/admin/rules/index.html.haml
index aa6a4c1b6a68a8..dd15ce03c0298a 100644
--- a/app/views/admin/rules/index.html.haml
+++ b/app/views/admin/rules/index.html.haml
@@ -12,6 +12,9 @@
     .fields-group
       = f.input :text, wrapper: :with_block_label
 
+    .fields-group
+      = f.input :hint, wrapper: :with_block_label
+
     .actions
       = f.button :button, t('admin.rules.add_new'), type: :submit
 
diff --git a/app/views/auth/registrations/rules.html.haml b/app/views/auth/registrations/rules.html.haml
index 234f4a601da6d2..3a05ed54f06c35 100644
--- a/app/views/auth/registrations/rules.html.haml
+++ b/app/views/auth/registrations/rules.html.haml
@@ -20,6 +20,7 @@
     - @rules.each do |rule|
       %li
         .rules-list__text= rule.text
+        .rules-list__hint= rule.hint
 
   .stacked-actions
     - accept_path = @invite_code.present? ? public_invite_url(invite_code: @invite_code, accept: @accept_token) : new_user_registration_path(accept: @accept_token)
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml
index 7ece81290f4a28..4ba6e88f418183 100644
--- a/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@@ -116,6 +116,7 @@ en:
           sign_up_requires_approval: New sign-ups will require your approval
         severity: Choose what will happen with requests from this IP
       rule:
+        hint: Optional. Provide more details about the rule
         text: Describe a rule or requirement for users on this server. Try to keep it short and simple
       sessions:
         otp: 'Enter the two-factor code generated by your phone app or use one of your recovery codes:'
@@ -299,6 +300,7 @@ en:
           patch: Notify on bugfix updates
         trending_tag: New trend requires review
       rule:
+        hint: Additional information
         text: Rule
       settings:
         indexable: Include profile page in search engines
diff --git a/db/migrate/20240310123453_add_hint_to_rules.rb b/db/migrate/20240310123453_add_hint_to_rules.rb
new file mode 100644
index 00000000000000..06822ad96a4254
--- /dev/null
+++ b/db/migrate/20240310123453_add_hint_to_rules.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddHintToRules < ActiveRecord::Migration[7.1]
+  def change
+    add_column :rules, :hint, :text, null: false, default: ''
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 97917d0456c474..b98253a6c15f15 100644
--- 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_03_04_090449) do
+ActiveRecord::Schema[7.1].define(version: 2024_03_10_123453) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -915,6 +915,7 @@
     t.text "text", default: "", null: false
     t.datetime "created_at", precision: nil, null: false
     t.datetime "updated_at", precision: nil, null: false
+    t.text "hint", default: "", null: false
   end
 
   create_table "scheduled_statuses", force: :cascade do |t|

From 2347ea813e5be2ecf762c8a275373a3e2bea56e8 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 11 Mar 2024 09:57:23 +0100
Subject: [PATCH 0387/2191] Change dropdown menu icon to not be replaced by
 close icon when open in web UI (#29532)

---
 app/javascript/mastodon/components/dropdown_menu.jsx | 3 +--
 app/javascript/mastodon/features/ui/index.jsx        | 6 ++----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/app/javascript/mastodon/components/dropdown_menu.jsx b/app/javascript/mastodon/components/dropdown_menu.jsx
index f6c08dd43b3c06..524dbb927b426a 100644
--- a/app/javascript/mastodon/components/dropdown_menu.jsx
+++ b/app/javascript/mastodon/components/dropdown_menu.jsx
@@ -9,7 +9,6 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import { supportsPassiveEvents } from 'detect-passive-events';
 import Overlay from 'react-overlays/Overlay';
 
-import CloseIcon from '@/material-icons/400-24px/close.svg?react';
 import { CircularProgress } from 'mastodon/components/circular_progress';
 import { WithRouterPropTypes } from 'mastodon/utils/react_router';
 
@@ -298,7 +297,7 @@ class Dropdown extends PureComponent {
     }) : (
       <IconButton
         icon={!open ? icon : 'close'}
-        iconComponent={!open ? iconComponent : CloseIcon}
+        iconComponent={iconComponent}
         title={title}
         active={open}
         disabled={disabled}
diff --git a/app/javascript/mastodon/features/ui/index.jsx b/app/javascript/mastodon/features/ui/index.jsx
index b17b59a0e663ff..da554f684fad73 100644
--- a/app/javascript/mastodon/features/ui/index.jsx
+++ b/app/javascript/mastodon/features/ui/index.jsx
@@ -80,7 +80,6 @@ const mapStateToProps = state => ({
   hasComposingText: state.getIn(['compose', 'text']).trim().length !== 0,
   hasMediaAttachments: state.getIn(['compose', 'media_attachments']).size > 0,
   canUploadMore: !state.getIn(['compose', 'media_attachments']).some(x => ['audio', 'video'].includes(x.get('type'))) && state.getIn(['compose', 'media_attachments']).size < 4,
-  dropdownMenuIsOpen: state.dropdownMenu.openId !== null,
   firstLaunch: state.getIn(['settings', 'introductionVersion'], 0) < INTRODUCTION_VERSION,
   username: state.getIn(['accounts', me, 'username']),
 });
@@ -262,7 +261,6 @@ class UI extends PureComponent {
     hasMediaAttachments: PropTypes.bool,
     canUploadMore: PropTypes.bool,
     intl: PropTypes.object.isRequired,
-    dropdownMenuIsOpen: PropTypes.bool,
     layout: PropTypes.string.isRequired,
     firstLaunch: PropTypes.bool,
     username: PropTypes.string,
@@ -555,7 +553,7 @@ class UI extends PureComponent {
 
   render () {
     const { draggingOver } = this.state;
-    const { children, isComposing, location, dropdownMenuIsOpen, layout } = this.props;
+    const { children, isComposing, location, layout } = this.props;
 
     const handlers = {
       help: this.handleHotkeyToggleHelp,
@@ -581,7 +579,7 @@ class UI extends PureComponent {
 
     return (
       <HotKeys keyMap={keyMap} handlers={handlers} ref={this.setHotkeysRef} attach={window} focused>
-        <div className={classNames('ui', { 'is-composing': isComposing })} ref={this.setRef} style={{ pointerEvents: dropdownMenuIsOpen ? 'none' : null }}>
+        <div className={classNames('ui', { 'is-composing': isComposing })} ref={this.setRef}>
           <Header />
 
           <SwitchingColumnsArea location={location} singleColumn={layout === 'mobile' || layout === 'single-column'}>

From 6984f94044a313f675891f3b1338afd0e7fe3032 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 11 Mar 2024 10:05:07 +0100
Subject: [PATCH 0388/2191] Update dependency autoprefixer to v10.4.18 (#29475)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 5112721f08b4b5..1412e6d606d9be 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4653,11 +4653,11 @@ __metadata:
   linkType: hard
 
 "autoprefixer@npm:^10.4.14":
-  version: 10.4.17
-  resolution: "autoprefixer@npm:10.4.17"
+  version: 10.4.18
+  resolution: "autoprefixer@npm:10.4.18"
   dependencies:
-    browserslist: "npm:^4.22.2"
-    caniuse-lite: "npm:^1.0.30001578"
+    browserslist: "npm:^4.23.0"
+    caniuse-lite: "npm:^1.0.30001591"
     fraction.js: "npm:^4.3.7"
     normalize-range: "npm:^0.1.2"
     picocolors: "npm:^1.0.0"
@@ -4666,7 +4666,7 @@ __metadata:
     postcss: ^8.1.0
   bin:
     autoprefixer: bin/autoprefixer
-  checksum: 10c0/1d21cc8edb7bf993682094ceed03a32c18f5293f071182a64c2c6defb44bbe91d576ad775d2347469a81997b80cea0bbc4ad3eeb5b12710f9feacf2e6c04bb51
+  checksum: 10c0/b6e1c1ba2fc6c09360cdcd75b00ce809c5dbe1ad4c30f0186764609a982aa5563d45965cb9e6a9d195c639a9fb1dcac2594484fc41624050195f626e9add666e
   languageName: node
   linkType: hard
 
@@ -5409,10 +5409,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001578, caniuse-lite@npm:^1.0.30001587":
-  version: 1.0.30001589
-  resolution: "caniuse-lite@npm:1.0.30001589"
-  checksum: 10c0/20debfb949413f603011bc7dacaf050010778bc4f8632c86fafd1bd0c43180c95ae7c31f6c82348f6309e5e221934e327c3607a216e3f09640284acf78cd6d4d
+"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001587, caniuse-lite@npm:^1.0.30001591":
+  version: 1.0.30001591
+  resolution: "caniuse-lite@npm:1.0.30001591"
+  checksum: 10c0/21937d341c3d75994504db21340f65573a1e847a8ab33ee4964ed493994d6552864c494ba144485459abd9c711c75c0708bc9fa19f2bff525bff75ffb0a42c3b
   languageName: node
   linkType: hard
 

From b9722dfe2bdb024e5e98b96d2fc5712d6cb5f747 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Mon, 11 Mar 2024 10:13:35 +0100
Subject: [PATCH 0389/2191] Use the server setting to get the max number of
 poll options in UI (#29490)

---
 app/javascript/mastodon/actions/compose.js                  | 3 ++-
 .../mastodon/features/compose/components/poll_form.jsx      | 5 +++--
 app/javascript/mastodon/reducers/compose.js                 | 6 +++---
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/javascript/mastodon/actions/compose.js b/app/javascript/mastodon/actions/compose.js
index 6abfd6157e0a2b..12bd43f807553f 100644
--- a/app/javascript/mastodon/actions/compose.js
+++ b/app/javascript/mastodon/actions/compose.js
@@ -786,11 +786,12 @@ export function addPollOption(title) {
   };
 }
 
-export function changePollOption(index, title) {
+export function changePollOption(index, title, maxOptions) {
   return {
     type: COMPOSE_POLL_OPTION_CHANGE,
     index,
     title,
+    maxOptions,
   };
 }
 
diff --git a/app/javascript/mastodon/features/compose/components/poll_form.jsx b/app/javascript/mastodon/features/compose/components/poll_form.jsx
index b3566fd6f5ad7f..d2adc58cc08ad9 100644
--- a/app/javascript/mastodon/features/compose/components/poll_form.jsx
+++ b/app/javascript/mastodon/features/compose/components/poll_form.jsx
@@ -58,10 +58,11 @@ const Option = ({ multipleChoice, index, title, autoFocus }) => {
   const dispatch = useDispatch();
   const suggestions = useSelector(state => state.getIn(['compose', 'suggestions']));
   const lang = useSelector(state => state.getIn(['compose', 'language']));
+  const maxOptions = useSelector(state => state.getIn(['server', 'server', 'configuration', 'polls', 'max_options']));
 
   const handleChange = useCallback(({ target: { value } }) => {
-    dispatch(changePollOption(index, value));
-  }, [dispatch, index]);
+    dispatch(changePollOption(index, value, maxOptions));
+  }, [dispatch, index, maxOptions]);
 
   const handleSuggestionsFetchRequested = useCallback(token => {
     dispatch(fetchComposeSuggestions(token));
diff --git a/app/javascript/mastodon/reducers/compose.js b/app/javascript/mastodon/reducers/compose.js
index f1bc0cbaef4616..8dc28018571224 100644
--- a/app/javascript/mastodon/reducers/compose.js
+++ b/app/javascript/mastodon/reducers/compose.js
@@ -280,12 +280,12 @@ const updateSuggestionTags = (state, token) => {
   });
 };
 
-const updatePoll = (state, index, value) => state.updateIn(['poll', 'options'], options => {
+const updatePoll = (state, index, value, maxOptions) => state.updateIn(['poll', 'options'], options => {
   const tmp = options.set(index, value).filterNot(x => x.trim().length === 0);
 
   if (tmp.size === 0) {
     return tmp.push('').push('');
-  } else if (tmp.size < 4) {
+  } else if (tmp.size < maxOptions) {
     return tmp.push('');
   }
 
@@ -529,7 +529,7 @@ export default function compose(state = initialState, action) {
   case COMPOSE_POLL_REMOVE:
     return state.set('poll', null);
   case COMPOSE_POLL_OPTION_CHANGE:
-    return updatePoll(state, action.index, action.title);
+    return updatePoll(state, action.index, action.title, action.maxOptions);
   case COMPOSE_POLL_SETTINGS_CHANGE:
     return state.update('poll', poll => poll.set('expires_in', action.expiresIn).set('multiple', action.isMultiple));
   case COMPOSE_LANGUAGE_CHANGE:

From a7284690fc595fa7d71528f8cdd67ddf2540a62a Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 11 Mar 2024 05:16:19 -0400
Subject: [PATCH 0390/2191] Add coverage for admin/metrics base classes,
 simplify subclass generation (#29527)

---
 app/lib/admin/metrics/dimension.rb       | 18 +++++++--------
 app/lib/admin/metrics/measure.rb         | 28 ++++++++++++------------
 spec/lib/admin/metrics/dimension_spec.rb | 22 +++++++++++++++++++
 spec/lib/admin/metrics/measure_spec.rb   | 22 +++++++++++++++++++
 4 files changed, 67 insertions(+), 23 deletions(-)
 create mode 100644 spec/lib/admin/metrics/dimension_spec.rb
 create mode 100644 spec/lib/admin/metrics/measure_spec.rb

diff --git a/app/lib/admin/metrics/dimension.rb b/app/lib/admin/metrics/dimension.rb
index e0122a65b5eee7..824cb6d7c1c6e4 100644
--- a/app/lib/admin/metrics/dimension.rb
+++ b/app/lib/admin/metrics/dimension.rb
@@ -2,15 +2,15 @@
 
 class Admin::Metrics::Dimension
   DIMENSIONS = {
-    languages: Admin::Metrics::Dimension::LanguagesDimension,
-    sources: Admin::Metrics::Dimension::SourcesDimension,
-    servers: Admin::Metrics::Dimension::ServersDimension,
-    space_usage: Admin::Metrics::Dimension::SpaceUsageDimension,
-    software_versions: Admin::Metrics::Dimension::SoftwareVersionsDimension,
-    tag_servers: Admin::Metrics::Dimension::TagServersDimension,
-    tag_languages: Admin::Metrics::Dimension::TagLanguagesDimension,
-    instance_accounts: Admin::Metrics::Dimension::InstanceAccountsDimension,
-    instance_languages: Admin::Metrics::Dimension::InstanceLanguagesDimension,
+    languages: LanguagesDimension,
+    sources: SourcesDimension,
+    servers: ServersDimension,
+    space_usage: SpaceUsageDimension,
+    software_versions: SoftwareVersionsDimension,
+    tag_servers: TagServersDimension,
+    tag_languages: TagLanguagesDimension,
+    instance_accounts: InstanceAccountsDimension,
+    instance_languages: InstanceLanguagesDimension,
   }.freeze
 
   def self.retrieve(dimension_keys, start_at, end_at, limit, params)
diff --git a/app/lib/admin/metrics/measure.rb b/app/lib/admin/metrics/measure.rb
index fe7e04929041c8..d23162dfabfdbd 100644
--- a/app/lib/admin/metrics/measure.rb
+++ b/app/lib/admin/metrics/measure.rb
@@ -2,20 +2,20 @@
 
 class Admin::Metrics::Measure
   MEASURES = {
-    active_users: Admin::Metrics::Measure::ActiveUsersMeasure,
-    new_users: Admin::Metrics::Measure::NewUsersMeasure,
-    interactions: Admin::Metrics::Measure::InteractionsMeasure,
-    opened_reports: Admin::Metrics::Measure::OpenedReportsMeasure,
-    resolved_reports: Admin::Metrics::Measure::ResolvedReportsMeasure,
-    tag_accounts: Admin::Metrics::Measure::TagAccountsMeasure,
-    tag_uses: Admin::Metrics::Measure::TagUsesMeasure,
-    tag_servers: Admin::Metrics::Measure::TagServersMeasure,
-    instance_accounts: Admin::Metrics::Measure::InstanceAccountsMeasure,
-    instance_media_attachments: Admin::Metrics::Measure::InstanceMediaAttachmentsMeasure,
-    instance_reports: Admin::Metrics::Measure::InstanceReportsMeasure,
-    instance_statuses: Admin::Metrics::Measure::InstanceStatusesMeasure,
-    instance_follows: Admin::Metrics::Measure::InstanceFollowsMeasure,
-    instance_followers: Admin::Metrics::Measure::InstanceFollowersMeasure,
+    active_users: ActiveUsersMeasure,
+    new_users: NewUsersMeasure,
+    interactions: InteractionsMeasure,
+    opened_reports: OpenedReportsMeasure,
+    resolved_reports: ResolvedReportsMeasure,
+    tag_accounts: TagAccountsMeasure,
+    tag_uses: TagUsesMeasure,
+    tag_servers: TagServersMeasure,
+    instance_accounts: InstanceAccountsMeasure,
+    instance_media_attachments: InstanceMediaAttachmentsMeasure,
+    instance_reports: InstanceReportsMeasure,
+    instance_statuses: InstanceStatusesMeasure,
+    instance_follows: InstanceFollowsMeasure,
+    instance_followers: InstanceFollowersMeasure,
   }.freeze
 
   def self.retrieve(measure_keys, start_at, end_at, params)
diff --git a/spec/lib/admin/metrics/dimension_spec.rb b/spec/lib/admin/metrics/dimension_spec.rb
new file mode 100644
index 00000000000000..109250b72b73ff
--- /dev/null
+++ b/spec/lib/admin/metrics/dimension_spec.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe Admin::Metrics::Dimension do
+  describe '.retrieve' do
+    subject { described_class.retrieve(reports, start_at, end_at, 5, params) }
+
+    let(:start_at) { 2.days.ago }
+    let(:end_at) { Time.now.utc }
+    let(:params) { ActionController::Parameters.new({ instance_accounts: [123], instance_languages: ['en'] }) }
+    let(:reports) { [:instance_accounts, :instance_languages] }
+
+    it 'returns instances of provided classes' do
+      expect(subject)
+        .to contain_exactly(
+          be_a(Admin::Metrics::Dimension::InstanceAccountsDimension),
+          be_a(Admin::Metrics::Dimension::InstanceLanguagesDimension)
+        )
+    end
+  end
+end
diff --git a/spec/lib/admin/metrics/measure_spec.rb b/spec/lib/admin/metrics/measure_spec.rb
new file mode 100644
index 00000000000000..c9809b0f792d30
--- /dev/null
+++ b/spec/lib/admin/metrics/measure_spec.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe Admin::Metrics::Measure do
+  describe '.retrieve' do
+    subject { described_class.retrieve(reports, start_at, end_at, params) }
+
+    let(:start_at) { 2.days.ago }
+    let(:end_at) { Time.now.utc }
+    let(:params) { ActionController::Parameters.new({ instance_accounts: [123], instance_followers: [123] }) }
+    let(:reports) { [:instance_accounts, :instance_followers] }
+
+    it 'returns instances of provided classes' do
+      expect(subject)
+        .to contain_exactly(
+          be_a(Admin::Metrics::Measure::InstanceAccountsMeasure),
+          be_a(Admin::Metrics::Measure::InstanceFollowersMeasure)
+        )
+    end
+  end
+end

From 4a6ddbc9c0f01f7160153e33a1a91eb1f2b86028 Mon Sep 17 00:00:00 2001
From: Jeong Arm <kjwonmail@gmail.com>
Date: Mon, 11 Mar 2024 18:28:08 +0900
Subject: [PATCH 0391/2191] Normalize idna domain before account unblock domain
 (#29530)

---
 app/models/concerns/account/interactions.rb   |  6 ++-
 .../concerns/account/interactions_spec.rb     | 40 +++++++++++++++++++
 2 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/app/models/concerns/account/interactions.rb b/app/models/concerns/account/interactions.rb
index 5b05c31e03f3c5..0ed0dc060b3b68 100644
--- a/app/models/concerns/account/interactions.rb
+++ b/app/models/concerns/account/interactions.rb
@@ -178,7 +178,7 @@ def unmute_conversation!(conversation)
   end
 
   def unblock_domain!(other_domain)
-    block = domain_blocks.find_by(domain: other_domain)
+    block = domain_blocks.find_by(domain: normalized_domain(other_domain))
     block&.destroy
   end
 
@@ -300,4 +300,8 @@ def relations_map(account_ids, domains = nil, **options)
       domain_blocking_by_domain: Account.domain_blocking_map_by_domain(domains, id),
     })
   end
+
+  def normalized_domain(domain)
+    TagManager.instance.normalize_domain(domain)
+  end
 end
diff --git a/spec/models/concerns/account/interactions_spec.rb b/spec/models/concerns/account/interactions_spec.rb
index 6fac41e07115eb..3f2c601f387694 100644
--- a/spec/models/concerns/account/interactions_spec.rb
+++ b/spec/models/concerns/account/interactions_spec.rb
@@ -250,6 +250,24 @@
     end
   end
 
+  describe '#block_idna_domain!' do
+    subject do
+      [
+        account.block_domain!(idna_domain),
+        account.block_domain!(punycode_domain),
+      ]
+    end
+
+    let(:idna_domain) { '대한민국.한국' }
+    let(:punycode_domain) { 'xn--3e0bs9hfvinn1a.xn--3e0b707e' }
+
+    it 'creates single AccountDomainBlock' do
+      expect do
+        expect(subject).to all(be_a AccountDomainBlock)
+      end.to change { account.domain_blocks.count }.by 1
+    end
+  end
+
   describe '#unfollow!' do
     subject { account.unfollow!(target_account) }
 
@@ -345,6 +363,28 @@
     end
   end
 
+  describe '#unblock_idna_domain!' do
+    subject { account.unblock_domain!(punycode_domain) }
+
+    let(:idna_domain) { '대한민국.한국' }
+    let(:punycode_domain) { 'xn--3e0bs9hfvinn1a.xn--3e0b707e' }
+
+    context 'when blocking the domain' do
+      it 'returns destroyed AccountDomainBlock' do
+        account_domain_block = Fabricate(:account_domain_block, domain: idna_domain)
+        account.domain_blocks << account_domain_block
+        expect(subject).to be_a AccountDomainBlock
+        expect(subject).to be_destroyed
+      end
+    end
+
+    context 'when unblocking idna domain' do
+      it 'returns nil' do
+        expect(subject).to be_nil
+      end
+    end
+  end
+
   describe '#following?' do
     subject { account.following?(target_account) }
 

From 16c856729bfa400422825b06c843efe7b85c72f8 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 11 Mar 2024 14:35:23 +0100
Subject: [PATCH 0392/2191] Change icons in navigation panel to be filled when
 active in web UI (#29537)

---
 .../features/ui/components/column_link.jsx    | 15 ++--
 .../follow_requests_column_link.jsx           | 55 -------------
 .../features/ui/components/list_panel.jsx     | 54 +++++--------
 .../ui/components/navigation_panel.jsx        | 81 +++++++++++++++----
 .../components/notifications_counter_icon.js  | 13 ---
 5 files changed, 95 insertions(+), 123 deletions(-)
 delete mode 100644 app/javascript/mastodon/features/ui/components/follow_requests_column_link.jsx
 delete mode 100644 app/javascript/mastodon/features/ui/components/notifications_counter_icon.js

diff --git a/app/javascript/mastodon/features/ui/components/column_link.jsx b/app/javascript/mastodon/features/ui/components/column_link.jsx
index e58fde48b52a65..6ef122c07be844 100644
--- a/app/javascript/mastodon/features/ui/components/column_link.jsx
+++ b/app/javascript/mastodon/features/ui/components/column_link.jsx
@@ -1,27 +1,30 @@
 import PropTypes from 'prop-types';
 
 import classNames from 'classnames';
-import { NavLink } from 'react-router-dom';
+import { useRouteMatch, NavLink } from 'react-router-dom';
 
 import { Icon }  from 'mastodon/components/icon';
 
-const ColumnLink = ({ icon, iconComponent, text, to, href, method, badge, transparent, ...other }) => {
+const ColumnLink = ({ icon, activeIcon, iconComponent, activeIconComponent, text, to, href, method, badge, transparent, ...other }) => {
+  const match = useRouteMatch(to);
   const className = classNames('column-link', { 'column-link--transparent': transparent });
   const badgeElement = typeof badge !== 'undefined' ? <span className='column-link__badge'>{badge}</span> : null;
   const iconElement = (typeof icon === 'string' || iconComponent) ? <Icon id={icon} icon={iconComponent} className='column-link__icon' /> : icon;
+  const activeIconElement = activeIcon ?? (activeIconComponent ? <Icon id={icon} icon={activeIconComponent} className='column-link__icon' /> : iconElement);
+  const active = match?.isExact;
 
   if (href) {
     return (
       <a href={href} className={className} data-method={method} title={text} {...other}>
-        {iconElement}
+        {active ? activeIconElement : iconElement}
         <span>{text}</span>
         {badgeElement}
       </a>
     );
   } else {
     return (
-      <NavLink to={to} className={className} title={text} {...other}>
-        {iconElement}
+      <NavLink to={to} className={className} title={text} exact {...other}>
+        {active ? activeIconElement : iconElement}
         <span>{text}</span>
         {badgeElement}
       </NavLink>
@@ -32,6 +35,8 @@ const ColumnLink = ({ icon, iconComponent, text, to, href, method, badge, transp
 ColumnLink.propTypes = {
   icon: PropTypes.oneOfType([PropTypes.string, PropTypes.node]).isRequired,
   iconComponent: PropTypes.func,
+  activeIcon: PropTypes.node,
+  activeIconComponent: PropTypes.func,
   text: PropTypes.string.isRequired,
   to: PropTypes.string,
   href: PropTypes.string,
diff --git a/app/javascript/mastodon/features/ui/components/follow_requests_column_link.jsx b/app/javascript/mastodon/features/ui/components/follow_requests_column_link.jsx
deleted file mode 100644
index 4aa009263150cd..00000000000000
--- a/app/javascript/mastodon/features/ui/components/follow_requests_column_link.jsx
+++ /dev/null
@@ -1,55 +0,0 @@
-import PropTypes from 'prop-types';
-import { Component } from 'react';
-
-import { injectIntl, defineMessages } from 'react-intl';
-
-import { List as ImmutableList } from 'immutable';
-import { connect } from 'react-redux';
-
-import PersonAddIcon from '@/material-icons/400-24px/person_add.svg?react';
-import { fetchFollowRequests } from 'mastodon/actions/accounts';
-import { IconWithBadge } from 'mastodon/components/icon_with_badge';
-import ColumnLink from 'mastodon/features/ui/components/column_link';
-
-const messages = defineMessages({
-  text: { id: 'navigation_bar.follow_requests', defaultMessage: 'Follow requests' },
-});
-
-const mapStateToProps = state => ({
-  count: state.getIn(['user_lists', 'follow_requests', 'items'], ImmutableList()).size,
-});
-
-class FollowRequestsColumnLink extends Component {
-
-  static propTypes = {
-    dispatch: PropTypes.func.isRequired,
-    count: PropTypes.number.isRequired,
-    intl: PropTypes.object.isRequired,
-  };
-
-  componentDidMount () {
-    const { dispatch } = this.props;
-
-    dispatch(fetchFollowRequests());
-  }
-
-  render () {
-    const { count, intl } = this.props;
-
-    if (count === 0) {
-      return null;
-    }
-
-    return (
-      <ColumnLink
-        transparent
-        to='/follow_requests'
-        icon={<IconWithBadge className='column-link__icon' id='user-plus' icon={PersonAddIcon} count={count} />}
-        text={intl.formatMessage(messages.text)}
-      />
-    );
-  }
-
-}
-
-export default injectIntl(connect(mapStateToProps)(FollowRequestsColumnLink));
diff --git a/app/javascript/mastodon/features/ui/components/list_panel.jsx b/app/javascript/mastodon/features/ui/components/list_panel.jsx
index fec21f14ca15c8..03c8fce9e878b3 100644
--- a/app/javascript/mastodon/features/ui/components/list_panel.jsx
+++ b/app/javascript/mastodon/features/ui/components/list_panel.jsx
@@ -1,10 +1,9 @@
-import PropTypes from 'prop-types';
+import { useEffect } from 'react';
 
 import { createSelector } from '@reduxjs/toolkit';
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import ImmutablePureComponent from 'react-immutable-pure-component';
-import { connect } from 'react-redux';
+import { useDispatch, useSelector } from 'react-redux';
 
+import ListAltActiveIcon from '@/material-icons/400-24px/list_alt-fill.svg?react';
 import ListAltIcon from '@/material-icons/400-24px/list_alt.svg?react';
 import { fetchLists } from 'mastodon/actions/lists';
 
@@ -18,40 +17,25 @@ const getOrderedLists = createSelector([state => state.get('lists')], lists => {
   return lists.toList().filter(item => !!item).sort((a, b) => a.get('title').localeCompare(b.get('title'))).take(4);
 });
 
-const mapStateToProps = state => ({
-  lists: getOrderedLists(state),
-});
-
-class ListPanel extends ImmutablePureComponent {
+export const ListPanel = () => {
+  const dispatch = useDispatch();
+  const lists = useSelector(state => getOrderedLists(state));
 
-  static propTypes = {
-    dispatch: PropTypes.func.isRequired,
-    lists: ImmutablePropTypes.list,
-  };
-
-  componentDidMount () {
-    const { dispatch } = this.props;
+  useEffect(() => {
     dispatch(fetchLists());
-  }
-
-  render () {
-    const { lists } = this.props;
-
-    if (!lists || lists.isEmpty()) {
-      return null;
-    }
-
-    return (
-      <div className='list-panel'>
-        <hr />
+  }, [dispatch]);
 
-        {lists.map(list => (
-          <ColumnLink icon='list-ul' iconComponent={ListAltIcon} key={list.get('id')} strict text={list.get('title')} to={`/lists/${list.get('id')}`} transparent />
-        ))}
-      </div>
-    );
+  if (!lists || lists.isEmpty()) {
+    return null;
   }
 
-}
+  return (
+    <div className='list-panel'>
+      <hr />
 
-export default connect(mapStateToProps)(ListPanel);
+      {lists.map(list => (
+        <ColumnLink icon='list-ul' key={list.get('id')} iconComponent={ListAltIcon} activeIconComponent={ListAltActiveIcon} text={list.get('title')} to={`/lists/${list.get('id')}`} transparent />
+      ))}
+    </div>
+  );
+};
diff --git a/app/javascript/mastodon/features/ui/components/navigation_panel.jsx b/app/javascript/mastodon/features/ui/components/navigation_panel.jsx
index 4a569881911576..deda3258b92b7e 100644
--- a/app/javascript/mastodon/features/ui/components/navigation_panel.jsx
+++ b/app/javascript/mastodon/features/ui/components/navigation_panel.jsx
@@ -1,20 +1,33 @@
 import PropTypes from 'prop-types';
-import { Component } from 'react';
+import { Component, useEffect } from 'react';
 
-import { defineMessages, injectIntl } from 'react-intl';
+import { defineMessages, injectIntl, useIntl } from 'react-intl';
 
 import { Link } from 'react-router-dom';
 
+import { useSelector, useDispatch } from 'react-redux';
+
+
 import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
-import BookmarksIcon from '@/material-icons/400-24px/bookmarks-fill.svg?react';
+import BookmarksActiveIcon from '@/material-icons/400-24px/bookmarks-fill.svg?react';
+import BookmarksIcon from '@/material-icons/400-24px/bookmarks.svg?react';
 import ExploreIcon from '@/material-icons/400-24px/explore.svg?react';
-import HomeIcon from '@/material-icons/400-24px/home-fill.svg?react';
+import HomeActiveIcon from '@/material-icons/400-24px/home-fill.svg?react';
+import HomeIcon from '@/material-icons/400-24px/home.svg?react';
+import ListAltActiveIcon from '@/material-icons/400-24px/list_alt-fill.svg?react';
 import ListAltIcon from '@/material-icons/400-24px/list_alt.svg?react';
 import MoreHorizIcon from '@/material-icons/400-24px/more_horiz.svg?react';
+import NotificationsActiveIcon from '@/material-icons/400-24px/notifications-fill.svg?react';
+import NotificationsIcon from '@/material-icons/400-24px/notifications.svg?react';
+import PersonAddActiveIcon from '@/material-icons/400-24px/person_add-fill.svg?react';
+import PersonAddIcon from '@/material-icons/400-24px/person_add.svg?react';
 import PublicIcon from '@/material-icons/400-24px/public.svg?react';
 import SearchIcon from '@/material-icons/400-24px/search.svg?react';
-import SettingsIcon from '@/material-icons/400-24px/settings-fill.svg?react';
-import StarIcon from '@/material-icons/400-24px/star-fill.svg?react';
+import SettingsIcon from '@/material-icons/400-24px/settings.svg?react';
+import StarActiveIcon from '@/material-icons/400-24px/star-fill.svg?react';
+import StarIcon from '@/material-icons/400-24px/star.svg?react';
+import { fetchFollowRequests } from 'mastodon/actions/accounts';
+import { IconWithBadge } from 'mastodon/components/icon_with_badge';
 import { WordmarkLogo } from 'mastodon/components/logo';
 import { NavigationPortal } from 'mastodon/components/navigation_portal';
 import { timelinePreview, trendsEnabled } from 'mastodon/initial_state';
@@ -22,9 +35,7 @@ import { transientSingleColumn } from 'mastodon/is_mobile';
 
 import ColumnLink from './column_link';
 import DisabledAccountBanner from './disabled_account_banner';
-import FollowRequestsColumnLink from './follow_requests_column_link';
-import ListPanel from './list_panel';
-import NotificationsCounterIcon from './notifications_counter_icon';
+import { ListPanel } from './list_panel';
 import SignInBanner from './sign_in_banner';
 
 const messages = defineMessages({
@@ -42,8 +53,48 @@ const messages = defineMessages({
   search: { id: 'navigation_bar.search', defaultMessage: 'Search' },
   advancedInterface: { id: 'navigation_bar.advanced_interface', defaultMessage: 'Open in advanced web interface' },
   openedInClassicInterface: { id: 'navigation_bar.opened_in_classic_interface', defaultMessage: 'Posts, accounts, and other specific pages are opened by default in the classic web interface.' },
+  followRequests: { id: 'navigation_bar.follow_requests', defaultMessage: 'Follow requests' },
 });
 
+const NotificationsLink = () => {
+  const count = useSelector(state => state.getIn(['notifications', 'unread']));
+  const intl = useIntl();
+
+  return (
+    <ColumnLink
+      transparent
+      to='/notifications'
+      icon={<IconWithBadge icon={NotificationsIcon} count={count} className='column-link__icon' />}
+      activeIcon={<IconWithBadge icon={NotificationsActiveIcon} count={count} className='column-link__icon' />}
+      text={intl.formatMessage(messages.notifications)}
+    />
+  );
+};
+
+const FollowRequestsLink = () => {
+  const count = useSelector(state => state.getIn(['user_lists', 'follow_requests', 'items'])?.size ?? 0);
+  const intl = useIntl();
+  const dispatch = useDispatch();
+
+  useEffect(() => {
+    dispatch(fetchFollowRequests());
+  }, [dispatch]);
+
+  if (count === 0) {
+    return null;
+  }
+
+  return (
+    <ColumnLink
+      transparent
+      to='/follow_requests'
+      icon={<IconWithBadge icon={PersonAddIcon} count={count} className='column-link__icon' />}
+      activeIcon={<IconWithBadge icon={PersonAddActiveIcon} count={count} className='column-link__icon' />}
+      text={intl.formatMessage(messages.followRequests)}
+    />
+  );
+};
+
 class NavigationPanel extends Component {
 
   static contextTypes = {
@@ -87,9 +138,9 @@ class NavigationPanel extends Component {
 
         {signedIn && (
           <>
-            <ColumnLink transparent to='/home' icon='home' iconComponent={HomeIcon} text={intl.formatMessage(messages.home)} />
-            <ColumnLink transparent to='/notifications' icon={<NotificationsCounterIcon className='column-link__icon' />} text={intl.formatMessage(messages.notifications)} />
-            <FollowRequestsColumnLink />
+            <ColumnLink transparent to='/home' icon='home' iconComponent={HomeIcon} activeIconComponent={HomeActiveIcon} text={intl.formatMessage(messages.home)} />
+            <NotificationsLink />
+            <FollowRequestsLink />
           </>
         )}
 
@@ -113,9 +164,9 @@ class NavigationPanel extends Component {
         {signedIn && (
           <>
             <ColumnLink transparent to='/conversations' icon='at' iconComponent={AlternateEmailIcon} text={intl.formatMessage(messages.direct)} />
-            <ColumnLink transparent to='/bookmarks' icon='bookmarks' iconComponent={BookmarksIcon} text={intl.formatMessage(messages.bookmarks)} />
-            <ColumnLink transparent to='/favourites' icon='star' iconComponent={StarIcon} text={intl.formatMessage(messages.favourites)} />
-            <ColumnLink transparent to='/lists' icon='list-ul' iconComponent={ListAltIcon} text={intl.formatMessage(messages.lists)} />
+            <ColumnLink transparent to='/bookmarks' icon='bookmarks' iconComponent={BookmarksIcon} activeIconComponent={BookmarksActiveIcon} text={intl.formatMessage(messages.bookmarks)} />
+            <ColumnLink transparent to='/favourites' icon='star' iconComponent={StarIcon} activeIconComponent={StarActiveIcon} text={intl.formatMessage(messages.favourites)} />
+            <ColumnLink transparent to='/lists' icon='list-ul' iconComponent={ListAltIcon} activeIconComponent={ListAltActiveIcon} text={intl.formatMessage(messages.lists)} />
 
             <ListPanel />
 
diff --git a/app/javascript/mastodon/features/ui/components/notifications_counter_icon.js b/app/javascript/mastodon/features/ui/components/notifications_counter_icon.js
deleted file mode 100644
index 7d59d616d83003..00000000000000
--- a/app/javascript/mastodon/features/ui/components/notifications_counter_icon.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import { connect } from 'react-redux';
-
-import NotificationsIcon from '@/material-icons/400-24px/notifications-fill.svg?react';
-import { IconWithBadge } from 'mastodon/components/icon_with_badge';
-
-
-const mapStateToProps = state => ({
-  count: state.getIn(['notifications', 'unread']),
-  id: 'bell',
-  icon: NotificationsIcon,
-});
-
-export default connect(mapStateToProps)(IconWithBadge);

From 19efa1b9f1486ffe95c14582017d9e9ede48d597 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 11 Mar 2024 15:33:48 +0100
Subject: [PATCH 0393/2191] Change action button to be last on profiles in web
 UI (#29533)

---
 .../features/account/components/header.jsx         | 14 +++++---------
 app/javascript/styles/mastodon/components.scss     |  5 +----
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/app/javascript/mastodon/features/account/components/header.jsx b/app/javascript/mastodon/features/account/components/header.jsx
index 07ea227c487fb1..c6295d7c4a7105 100644
--- a/app/javascript/mastodon/features/account/components/header.jsx
+++ b/app/javascript/mastodon/features/account/components/header.jsx
@@ -22,6 +22,7 @@ import { CopyIconButton } from 'mastodon/components/copy_icon_button';
 import { FollowersCounter, FollowingCounter, StatusesCounter } from 'mastodon/components/counters';
 import { Icon }  from 'mastodon/components/icon';
 import { IconButton } from 'mastodon/components/icon_button';
+import { LoadingIndicator } from 'mastodon/components/loading_indicator';
 import { ShortNumber } from 'mastodon/components/short_number';
 import DropdownMenuContainer from 'mastodon/containers/dropdown_menu_container';
 import { autoPlayGif, me, domain } from 'mastodon/initial_state';
@@ -289,7 +290,7 @@ class Header extends ImmutablePureComponent {
 
     if (me !== account.get('id')) {
       if (signedIn && !account.get('relationship')) { // Wait until the relationship is loaded
-        actionBtn = '';
+        actionBtn = <Button disabled><LoadingIndicator /></Button>;
       } else if (account.getIn(['relationship', 'requested'])) {
         actionBtn = <Button text={intl.formatMessage(messages.cancel_follow_request)} title={intl.formatMessage(messages.requested)} onClick={this.props.onFollow} />;
       } else if (!account.getIn(['relationship', 'blocking'])) {
@@ -426,15 +427,10 @@ class Header extends ImmutablePureComponent {
             </a>
 
             <div className='account__header__tabs__buttons'>
-              {!hidden && (
-                <>
-                  {actionBtn}
-                  {bellBtn}
-                  {shareBtn}
-                </>
-              )}
-
+              {!hidden && bellBtn}
+              {!hidden && shareBtn}
               <DropdownMenuContainer disabled={menu.length === 0} items={menu} icon='ellipsis-v' iconComponent={MoreHorizIcon} size={24} direction='right' />
+              {!hidden && actionBtn}
             </div>
           </div>
 
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 5bd11c3500497a..6d79a843d8f4a3 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -7455,10 +7455,7 @@ noscript {
       .button {
         flex-shrink: 1;
         white-space: nowrap;
-
-        @media screen and (max-width: $no-gap-breakpoint) {
-          min-width: 0;
-        }
+        min-width: 80px;
       }
 
       .icon-button {

From c10bbf5fe3800f933c33fa19cf23b5ec4fb778ea Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 11 Mar 2024 16:02:21 +0100
Subject: [PATCH 0394/2191] Add notification policies and notification requests
 in web UI (#29433)

---
 .../v1/notifications/requests_controller.rb   |   6 +-
 .../mastodon/actions/notifications.js         | 293 ++++++++++++++++++
 .../mastodon/components/column_header.jsx     |  53 ++--
 .../components/column_settings.jsx            |   2 +-
 .../mastodon/features/firehose/index.jsx      |  20 +-
 .../components/column_settings.jsx            |  40 +--
 .../components/column_settings.tsx            |  67 ++--
 .../mastodon/features/list_timeline/index.jsx |  59 ++--
 .../components/checkbox_with_label.jsx        |  31 ++
 .../components/column_settings.jsx            | 142 +++++----
 .../filtered_notifications_banner.jsx         |  49 +++
 .../components/notification_request.jsx       |  65 ++++
 .../containers/column_settings_container.js   |   9 +-
 .../containers/filter_bar_container.js        |   2 +-
 .../mastodon/features/notifications/index.jsx |  10 +-
 .../features/notifications/request.jsx        | 144 +++++++++
 .../features/notifications/requests.jsx       |  85 +++++
 .../components/column_settings.jsx            |  12 +-
 app/javascript/mastodon/features/ui/index.jsx |   6 +-
 .../features/ui/util/async-components.js      |   8 +
 app/javascript/mastodon/locales/en.json       |  20 +-
 app/javascript/mastodon/reducers/index.ts     |   4 +
 .../mastodon/reducers/notification_policy.js  |  12 +
 .../reducers/notification_requests.js         |  96 ++++++
 .../mastodon/reducers/notifications.js        |   2 +-
 app/javascript/mastodon/utils/numbers.ts      |   8 +
 .../material-icons/400-24px/archive-fill.svg  |   1 +
 .../material-icons/400-24px/archive.svg       |   1 +
 .../styles/mastodon/components.scss           | 271 ++++++++++++----
 app/javascript/styles/mastodon/forms.scss     |   6 +
 app/models/notification_request.rb            |   2 +-
 config/routes.rb                              |   2 +-
 config/routes/api.rb                          |   2 +-
 spec/models/notification_policy_spec.rb       |   2 +-
 spec/models/notification_request_spec.rb      |   2 +-
 35 files changed, 1280 insertions(+), 254 deletions(-)
 create mode 100644 app/javascript/mastodon/features/notifications/components/checkbox_with_label.jsx
 create mode 100644 app/javascript/mastodon/features/notifications/components/filtered_notifications_banner.jsx
 create mode 100644 app/javascript/mastodon/features/notifications/components/notification_request.jsx
 create mode 100644 app/javascript/mastodon/features/notifications/request.jsx
 create mode 100644 app/javascript/mastodon/features/notifications/requests.jsx
 create mode 100644 app/javascript/mastodon/reducers/notification_policy.js
 create mode 100644 app/javascript/mastodon/reducers/notification_requests.js
 create mode 100644 app/javascript/material-icons/400-24px/archive-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/archive.svg

diff --git a/app/controllers/api/v1/notifications/requests_controller.rb b/app/controllers/api/v1/notifications/requests_controller.rb
index dbb987153084b9..35f5d58a814752 100644
--- a/app/controllers/api/v1/notifications/requests_controller.rb
+++ b/app/controllers/api/v1/notifications/requests_controller.rb
@@ -18,6 +18,10 @@ def index
     render json: @requests, each_serializer: REST::NotificationRequestSerializer, relationships: @relationships
   end
 
+  def show
+    render json: @request, serializer: REST::NotificationRequestSerializer
+  end
+
   def accept
     AcceptNotificationRequestService.new.call(@request)
     render_empty
@@ -31,7 +35,7 @@ def dismiss
   private
 
   def load_requests
-    requests = NotificationRequest.where(account: current_account).where(dismissed: truthy_param?(:dismissed)).includes(:last_status, from_account: [:account_stat, :user]).to_a_paginated_by_id(
+    requests = NotificationRequest.where(account: current_account).where(dismissed: truthy_param?(:dismissed) || false).includes(:last_status, from_account: [:account_stat, :user]).to_a_paginated_by_id(
       limit_param(DEFAULT_ACCOUNTS_LIMIT),
       params_slice(:max_id, :since_id, :min_id)
     )
diff --git a/app/javascript/mastodon/actions/notifications.js b/app/javascript/mastodon/actions/notifications.js
index eafbf42d1b1f7a..30b7601d5df06c 100644
--- a/app/javascript/mastodon/actions/notifications.js
+++ b/app/javascript/mastodon/actions/notifications.js
@@ -44,6 +44,38 @@ export const NOTIFICATIONS_MARK_AS_READ = 'NOTIFICATIONS_MARK_AS_READ';
 export const NOTIFICATIONS_SET_BROWSER_SUPPORT    = 'NOTIFICATIONS_SET_BROWSER_SUPPORT';
 export const NOTIFICATIONS_SET_BROWSER_PERMISSION = 'NOTIFICATIONS_SET_BROWSER_PERMISSION';
 
+export const NOTIFICATION_POLICY_FETCH_REQUEST = 'NOTIFICATION_POLICY_FETCH_REQUEST';
+export const NOTIFICATION_POLICY_FETCH_SUCCESS = 'NOTIFICATION_POLICY_FETCH_SUCCESS';
+export const NOTIFICATION_POLICY_FETCH_FAIL    = 'NOTIFICATION_POLICY_FETCH_FAIL';
+
+export const NOTIFICATION_REQUESTS_FETCH_REQUEST = 'NOTIFICATION_REQUESTS_FETCH_REQUEST';
+export const NOTIFICATION_REQUESTS_FETCH_SUCCESS = 'NOTIFICATION_REQUESTS_FETCH_SUCCESS';
+export const NOTIFICATION_REQUESTS_FETCH_FAIL    = 'NOTIFICATION_REQUESTS_FETCH_FAIL';
+
+export const NOTIFICATION_REQUESTS_EXPAND_REQUEST = 'NOTIFICATION_REQUESTS_EXPAND_REQUEST';
+export const NOTIFICATION_REQUESTS_EXPAND_SUCCESS = 'NOTIFICATION_REQUESTS_EXPAND_SUCCESS';
+export const NOTIFICATION_REQUESTS_EXPAND_FAIL    = 'NOTIFICATION_REQUESTS_EXPAND_FAIL';
+
+export const NOTIFICATION_REQUEST_FETCH_REQUEST = 'NOTIFICATION_REQUEST_FETCH_REQUEST';
+export const NOTIFICATION_REQUEST_FETCH_SUCCESS = 'NOTIFICATION_REQUEST_FETCH_SUCCESS';
+export const NOTIFICATION_REQUEST_FETCH_FAIL    = 'NOTIFICATION_REQUEST_FETCH_FAIL';
+
+export const NOTIFICATION_REQUEST_ACCEPT_REQUEST = 'NOTIFICATION_REQUEST_ACCEPT_REQUEST';
+export const NOTIFICATION_REQUEST_ACCEPT_SUCCESS = 'NOTIFICATION_REQUEST_ACCEPT_SUCCESS';
+export const NOTIFICATION_REQUEST_ACCEPT_FAIL    = 'NOTIFICATION_REQUEST_ACCEPT_FAIL';
+
+export const NOTIFICATION_REQUEST_DISMISS_REQUEST = 'NOTIFICATION_REQUEST_DISMISS_REQUEST';
+export const NOTIFICATION_REQUEST_DISMISS_SUCCESS = 'NOTIFICATION_REQUEST_DISMISS_SUCCESS';
+export const NOTIFICATION_REQUEST_DISMISS_FAIL    = 'NOTIFICATION_REQUEST_DISMISS_FAIL';
+
+export const NOTIFICATIONS_FOR_REQUEST_FETCH_REQUEST = 'NOTIFICATIONS_FOR_REQUEST_FETCH_REQUEST';
+export const NOTIFICATIONS_FOR_REQUEST_FETCH_SUCCESS = 'NOTIFICATIONS_FOR_REQUEST_FETCH_SUCCESS';
+export const NOTIFICATIONS_FOR_REQUEST_FETCH_FAIL    = 'NOTIFICATIONS_FOR_REQUEST_FETCH_FAIL';
+
+export const NOTIFICATIONS_FOR_REQUEST_EXPAND_REQUEST = 'NOTIFICATIONS_FOR_REQUEST_EXPAND_REQUEST';
+export const NOTIFICATIONS_FOR_REQUEST_EXPAND_SUCCESS = 'NOTIFICATIONS_FOR_REQUEST_EXPAND_SUCCESS';
+export const NOTIFICATIONS_FOR_REQUEST_EXPAND_FAIL    = 'NOTIFICATIONS_FOR_REQUEST_EXPAND_FAIL';
+
 defineMessages({
   mention: { id: 'notification.mention', defaultMessage: '{name} mentioned you' },
   group: { id: 'notifications.group', defaultMessage: '{count} notifications' },
@@ -313,3 +345,264 @@ export function setBrowserPermission (value) {
     value,
   };
 }
+
+export const fetchNotificationPolicy = () => (dispatch, getState) => {
+  dispatch(fetchNotificationPolicyRequest());
+
+  api(getState).get('/api/v1/notifications/policy').then(({ data }) => {
+    dispatch(fetchNotificationPolicySuccess(data));
+  }).catch(err => {
+    dispatch(fetchNotificationPolicyFail(err));
+  });
+};
+
+export const fetchNotificationPolicyRequest = () => ({
+  type: NOTIFICATION_POLICY_FETCH_REQUEST,
+});
+
+export const fetchNotificationPolicySuccess = policy => ({
+  type: NOTIFICATION_POLICY_FETCH_SUCCESS,
+  policy,
+});
+
+export const fetchNotificationPolicyFail = error => ({
+  type: NOTIFICATION_POLICY_FETCH_FAIL,
+  error,
+});
+
+export const updateNotificationsPolicy = params => (dispatch, getState) => {
+  dispatch(fetchNotificationPolicyRequest());
+
+  api(getState).put('/api/v1/notifications/policy', params).then(({ data }) => {
+    dispatch(fetchNotificationPolicySuccess(data));
+  }).catch(err => {
+    dispatch(fetchNotificationPolicyFail(err));
+  });
+};
+
+export const fetchNotificationRequests = () => (dispatch, getState) => {
+  const params = {};
+
+  if (getState().getIn(['notificationRequests', 'isLoading'])) {
+    return;
+  }
+
+  if (getState().getIn(['notificationRequests', 'items'])?.size > 0) {
+    params.since_id = getState().getIn(['notificationRequests', 'items', 0, 'id']);
+  }
+
+  dispatch(fetchNotificationRequestsRequest());
+
+  api(getState).get('/api/v1/notifications/requests', { params }).then(response => {
+    const next = getLinks(response).refs.find(link => link.rel === 'next');
+    dispatch(importFetchedAccounts(response.data.map(x => x.account)));
+    dispatch(fetchNotificationRequestsSuccess(response.data, next ? next.uri : null));
+  }).catch(err => {
+    dispatch(fetchNotificationRequestsFail(err));
+  });
+};
+
+export const fetchNotificationRequestsRequest = () => ({
+  type: NOTIFICATION_REQUESTS_FETCH_REQUEST,
+});
+
+export const fetchNotificationRequestsSuccess = (requests, next) => ({
+  type: NOTIFICATION_REQUESTS_FETCH_SUCCESS,
+  requests,
+  next,
+});
+
+export const fetchNotificationRequestsFail = error => ({
+  type: NOTIFICATION_REQUESTS_FETCH_FAIL,
+  error,
+});
+
+export const expandNotificationRequests = () => (dispatch, getState) => {
+  const url = getState().getIn(['notificationRequests', 'next']);
+
+  if (!url || getState().getIn(['notificationRequests', 'isLoading'])) {
+    return;
+  }
+
+  dispatch(expandNotificationRequestsRequest());
+
+  api(getState).get(url).then(response => {
+    const next = getLinks(response).refs.find(link => link.rel === 'next');
+    dispatch(importFetchedAccounts(response.data.map(x => x.account)));
+    dispatch(expandNotificationRequestsSuccess(response.data, next?.uri));
+  }).catch(err => {
+    dispatch(expandNotificationRequestsFail(err));
+  });
+};
+
+export const expandNotificationRequestsRequest = () => ({
+  type: NOTIFICATION_REQUESTS_EXPAND_REQUEST,
+});
+
+export const expandNotificationRequestsSuccess = (requests, next) => ({
+  type: NOTIFICATION_REQUESTS_EXPAND_SUCCESS,
+  requests,
+  next,
+});
+
+export const expandNotificationRequestsFail = error => ({
+  type: NOTIFICATION_REQUESTS_EXPAND_FAIL,
+  error,
+});
+
+export const fetchNotificationRequest = id => (dispatch, getState) => {
+  const current = getState().getIn(['notificationRequests', 'current']);
+
+  if (current.getIn(['item', 'id']) === id || current.get('isLoading')) {
+    return;
+  }
+
+  dispatch(fetchNotificationRequestRequest(id));
+
+  api(getState).get(`/api/v1/notifications/requests/${id}`).then(({ data }) => {
+    dispatch(fetchNotificationRequestSuccess(data));
+  }).catch(err => {
+    dispatch(fetchNotificationRequestFail(id, err));
+  });
+};
+
+export const fetchNotificationRequestRequest = id => ({
+  type: NOTIFICATION_REQUEST_FETCH_REQUEST,
+  id,
+});
+
+export const fetchNotificationRequestSuccess = request => ({
+  type: NOTIFICATION_REQUEST_FETCH_SUCCESS,
+  request,
+});
+
+export const fetchNotificationRequestFail = (id, error) => ({
+  type: NOTIFICATION_REQUEST_FETCH_FAIL,
+  id,
+  error,
+});
+
+export const acceptNotificationRequest = id => (dispatch, getState) => {
+  dispatch(acceptNotificationRequestRequest(id));
+
+  api(getState).post(`/api/v1/notifications/requests/${id}/accept`).then(() => {
+    dispatch(acceptNotificationRequestSuccess(id));
+  }).catch(err => {
+    dispatch(acceptNotificationRequestFail(id, err));
+  });
+};
+
+export const acceptNotificationRequestRequest = id => ({
+  type: NOTIFICATION_REQUEST_ACCEPT_REQUEST,
+  id,
+});
+
+export const acceptNotificationRequestSuccess = id => ({
+  type: NOTIFICATION_REQUEST_ACCEPT_SUCCESS,
+  id,
+});
+
+export const acceptNotificationRequestFail = (id, error) => ({
+  type: NOTIFICATION_REQUEST_ACCEPT_FAIL,
+  id,
+  error,
+});
+
+export const dismissNotificationRequest = id => (dispatch, getState) => {
+  dispatch(dismissNotificationRequestRequest(id));
+
+  api(getState).post(`/api/v1/notifications/requests/${id}/dismiss`).then(() =>{
+    dispatch(dismissNotificationRequestSuccess(id));
+  }).catch(err => {
+    dispatch(dismissNotificationRequestFail(id, err));
+  });
+};
+
+export const dismissNotificationRequestRequest = id => ({
+  type: NOTIFICATION_REQUEST_DISMISS_REQUEST,
+  id,
+});
+
+export const dismissNotificationRequestSuccess = id => ({
+  type: NOTIFICATION_REQUEST_DISMISS_SUCCESS,
+  id,
+});
+
+export const dismissNotificationRequestFail = (id, error) => ({
+  type: NOTIFICATION_REQUEST_DISMISS_FAIL,
+  id,
+  error,
+});
+
+export const fetchNotificationsForRequest = accountId => (dispatch, getState) => {
+  const current = getState().getIn(['notificationRequests', 'current']);
+  const params = { account_id: accountId };
+
+  if (current.getIn(['item', 'account']) === accountId) {
+    if (current.getIn(['notifications', 'isLoading'])) {
+      return;
+    }
+
+    if (current.getIn(['notifications', 'items'])?.size > 0) {
+      params.since_id = current.getIn(['notifications', 'items', 0, 'id']);
+    }
+  }
+
+  dispatch(fetchNotificationsForRequestRequest());
+
+  api(getState).get('/api/v1/notifications', { params }).then(response => {
+    const next = getLinks(response).refs.find(link => link.rel === 'next');
+    dispatch(importFetchedStatuses(response.data.map(item => item.status).filter(status => !!status)));
+    dispatch(fetchNotificationsForRequestSuccess(response.data, next?.uri));
+  }).catch(err => {
+    dispatch(fetchNotificationsForRequestFail(err));
+  });
+};
+
+export const fetchNotificationsForRequestRequest = () => ({
+  type: NOTIFICATIONS_FOR_REQUEST_FETCH_REQUEST,
+});
+
+export const fetchNotificationsForRequestSuccess = (notifications, next) => ({
+  type: NOTIFICATIONS_FOR_REQUEST_FETCH_SUCCESS,
+  notifications,
+  next,
+});
+
+export const fetchNotificationsForRequestFail = (error) => ({
+  type: NOTIFICATIONS_FOR_REQUEST_FETCH_FAIL,
+  error,
+});
+
+export const expandNotificationsForRequest = () => (dispatch, getState) => {
+  const url = getState().getIn(['notificationRequests', 'current', 'notifications', 'next']);
+
+  if (!url || getState().getIn(['notificationRequests', 'current', 'notifications', 'isLoading'])) {
+    return;
+  }
+
+  dispatch(expandNotificationsForRequestRequest());
+
+  api(getState).get(url).then(response => {
+    const next = getLinks(response).refs.find(link => link.rel === 'next');
+    dispatch(importFetchedStatuses(response.data.map(item => item.status).filter(status => !!status)));
+    dispatch(expandNotificationsForRequestSuccess(response.data, next?.uri));
+  }).catch(err => {
+    dispatch(expandNotificationsForRequestFail(err));
+  });
+};
+
+export const expandNotificationsForRequestRequest = () => ({
+  type: NOTIFICATIONS_FOR_REQUEST_EXPAND_REQUEST,
+});
+
+export const expandNotificationsForRequestSuccess = (notifications, next) => ({
+  type: NOTIFICATIONS_FOR_REQUEST_EXPAND_SUCCESS,
+  notifications,
+  next,
+});
+
+export const expandNotificationsForRequestFail = (error) => ({
+  type: NOTIFICATIONS_FOR_REQUEST_EXPAND_FAIL,
+  error,
+});
diff --git a/app/javascript/mastodon/components/column_header.jsx b/app/javascript/mastodon/components/column_header.jsx
index 901888e7504c3d..8b7dcebc6713c9 100644
--- a/app/javascript/mastodon/components/column_header.jsx
+++ b/app/javascript/mastodon/components/column_header.jsx
@@ -1,7 +1,7 @@
 import PropTypes from 'prop-types';
 import { PureComponent, useCallback } from 'react';
 
-import { FormattedMessage, injectIntl, defineMessages } from 'react-intl';
+import { FormattedMessage, injectIntl, defineMessages, useIntl } from 'react-intl';
 
 import classNames from 'classnames';
 import { withRouter } from 'react-router-dom';
@@ -11,7 +11,7 @@ import ArrowBackIcon from '@/material-icons/400-24px/arrow_back.svg?react';
 import ChevronLeftIcon from '@/material-icons/400-24px/chevron_left.svg?react';
 import ChevronRightIcon from '@/material-icons/400-24px/chevron_right.svg?react';
 import CloseIcon from '@/material-icons/400-24px/close.svg?react';
-import TuneIcon from '@/material-icons/400-24px/tune.svg?react';
+import SettingsIcon from '@/material-icons/400-24px/settings.svg?react';
 import { Icon }  from 'mastodon/components/icon';
 import { ButtonInTabsBar, useColumnsContext } from 'mastodon/features/ui/util/columns_context';
 import { WithRouterPropTypes } from 'mastodon/utils/react_router';
@@ -23,10 +23,12 @@ const messages = defineMessages({
   hide: { id: 'column_header.hide_settings', defaultMessage: 'Hide settings' },
   moveLeft: { id: 'column_header.moveLeft_settings', defaultMessage: 'Move column to the left' },
   moveRight: { id: 'column_header.moveRight_settings', defaultMessage: 'Move column to the right' },
+  back: { id: 'column_back_button.label', defaultMessage: 'Back' },
 });
 
-const BackButton = ({ pinned, show }) => {
+const BackButton = ({ pinned, show, onlyIcon }) => {
   const history = useAppHistory();
+  const intl = useIntl();
   const { multiColumn } = useColumnsContext();
 
   const handleBackClick = useCallback(() => {
@@ -39,18 +41,20 @@ const BackButton = ({ pinned, show }) => {
 
   const showButton = history && !pinned && ((multiColumn && history.location?.state?.fromMastodon) || show);
 
-  if(!showButton) return null;
-
-  return (<button onClick={handleBackClick} className='column-header__back-button'>
-    <Icon id='chevron-left' icon={ArrowBackIcon} className='column-back-button__icon' />
-    <FormattedMessage id='column_back_button.label' defaultMessage='Back' />
-  </button>);
+  if (!showButton) return null;
 
+  return (
+    <button onClick={handleBackClick} className={classNames('column-header__back-button', { 'compact': onlyIcon })} aria-label={intl.formatMessage(messages.back)}>
+      <Icon id='chevron-left' icon={ArrowBackIcon} className='column-back-button__icon' />
+      {!onlyIcon && <FormattedMessage id='column_back_button.label' defaultMessage='Back' />}
+    </button>
+  );
 };
 
 BackButton.propTypes = {
   pinned: PropTypes.bool,
   show: PropTypes.bool,
+  onlyIcon: PropTypes.bool,
 };
 
 class ColumnHeader extends PureComponent {
@@ -145,27 +149,31 @@ class ColumnHeader extends PureComponent {
     }
 
     if (multiColumn && pinned) {
-      pinButton = <button key='pin-button' className='text-btn column-header__setting-btn' onClick={this.handlePin}><Icon id='times' icon={CloseIcon} /> <FormattedMessage id='column_header.unpin' defaultMessage='Unpin' /></button>;
+      pinButton = <button className='text-btn column-header__setting-btn' onClick={this.handlePin}><Icon id='times' icon={CloseIcon} /> <FormattedMessage id='column_header.unpin' defaultMessage='Unpin' /></button>;
 
       moveButtons = (
-        <div key='move-buttons' className='column-header__setting-arrows'>
+        <div className='column-header__setting-arrows'>
           <button title={formatMessage(messages.moveLeft)} aria-label={formatMessage(messages.moveLeft)} className='icon-button column-header__setting-btn' onClick={this.handleMoveLeft}><Icon id='chevron-left' icon={ChevronLeftIcon} /></button>
           <button title={formatMessage(messages.moveRight)} aria-label={formatMessage(messages.moveRight)} className='icon-button column-header__setting-btn' onClick={this.handleMoveRight}><Icon id='chevron-right' icon={ChevronRightIcon} /></button>
         </div>
       );
     } else if (multiColumn && this.props.onPin) {
-      pinButton = <button key='pin-button' className='text-btn column-header__setting-btn' onClick={this.handlePin}><Icon id='plus' icon={AddIcon} /> <FormattedMessage id='column_header.pin' defaultMessage='Pin' /></button>;
+      pinButton = <button className='text-btn column-header__setting-btn' onClick={this.handlePin}><Icon id='plus' icon={AddIcon} /> <FormattedMessage id='column_header.pin' defaultMessage='Pin' /></button>;
     }
 
-    backButton = <BackButton pinned={pinned} show={showBackButton} />;
+    backButton = <BackButton pinned={pinned} show={showBackButton} onlyIcon={!!title} />;
 
     const collapsedContent = [
       extraContent,
     ];
 
     if (multiColumn) {
-      collapsedContent.push(pinButton);
-      collapsedContent.push(moveButtons);
+      collapsedContent.push(
+        <div key='buttons' className='column-header__advanced-buttons'>
+          {pinButton}
+          {moveButtons}
+        </div>
+      );
     }
 
     if (this.context.identity.signedIn && (children || (multiColumn && this.props.onPin))) {
@@ -177,7 +185,7 @@ class ColumnHeader extends PureComponent {
           onClick={this.handleToggleClick}
         >
           <i className='icon-with-badge'>
-            <Icon id='sliders' icon={TuneIcon} />
+            <Icon id='sliders' icon={SettingsIcon} />
             {collapseIssues && <i className='icon-with-badge__issue-badge' />}
           </i>
         </button>
@@ -190,16 +198,19 @@ class ColumnHeader extends PureComponent {
       <div className={wrapperClassName}>
         <h1 className={buttonClassName}>
           {hasTitle && (
-            <button onClick={this.handleTitleClick}>
-              <Icon id={icon} icon={iconComponent} className='column-header__icon' />
-              {title}
-            </button>
+            <>
+              {backButton}
+
+              <button onClick={this.handleTitleClick} className='column-header__title'>
+                {!showBackButton && <Icon id={icon} icon={iconComponent} className='column-header__icon' />}
+                {title}
+              </button>
+            </>
           )}
 
           {!hasTitle && backButton}
 
           <div className='column-header__buttons'>
-            {hasTitle && backButton}
             {extraButton}
             {collapseButton}
           </div>
diff --git a/app/javascript/mastodon/features/community_timeline/components/column_settings.jsx b/app/javascript/mastodon/features/community_timeline/components/column_settings.jsx
index 69959c176058fd..15381b589df2a0 100644
--- a/app/javascript/mastodon/features/community_timeline/components/column_settings.jsx
+++ b/app/javascript/mastodon/features/community_timeline/components/column_settings.jsx
@@ -20,7 +20,7 @@ class ColumnSettings extends PureComponent {
     const { settings, onChange } = this.props;
 
     return (
-      <div>
+      <div className='column-settings'>
         <div className='column-settings__row'>
           <SettingToggle settings={settings} settingPath={['other', 'onlyMedia']} onChange={onChange} label={<FormattedMessage id='community.column_settings.media_only' defaultMessage='Media only' />} />
         </div>
diff --git a/app/javascript/mastodon/features/firehose/index.jsx b/app/javascript/mastodon/features/firehose/index.jsx
index 6355efbfe00865..c65fe48eace9f9 100644
--- a/app/javascript/mastodon/features/firehose/index.jsx
+++ b/app/javascript/mastodon/features/firehose/index.jsx
@@ -42,15 +42,17 @@ const ColumnSettings = () => {
   );
 
   return (
-    <div>
-      <div className='column-settings__row'>
-        <SettingToggle
-          settings={settings}
-          settingPath={['onlyMedia']}
-          onChange={onChange}
-          label={<FormattedMessage id='community.column_settings.media_only' defaultMessage='Media only' />}
-        />
-      </div>
+    <div className='column-settings'>
+      <section>
+        <div className='column-settings__row'>
+          <SettingToggle
+            settings={settings}
+            settingPath={['onlyMedia']}
+            onChange={onChange}
+            label={<FormattedMessage id='community.column_settings.media_only' defaultMessage='Media only' />}
+          />
+        </div>
+      </section>
     </div>
   );
 };
diff --git a/app/javascript/mastodon/features/hashtag_timeline/components/column_settings.jsx b/app/javascript/mastodon/features/hashtag_timeline/components/column_settings.jsx
index c60de4c5189469..3412e5d1bde626 100644
--- a/app/javascript/mastodon/features/hashtag_timeline/components/column_settings.jsx
+++ b/app/javascript/mastodon/features/hashtag_timeline/components/column_settings.jsx
@@ -107,28 +107,28 @@ class ColumnSettings extends PureComponent {
     const { settings, onChange } = this.props;
 
     return (
-      <div>
-        <div className='column-settings__row'>
-          <div className='setting-toggle'>
-            <Toggle id='hashtag.column_settings.tag_toggle' onChange={this.onToggle} checked={this.state.open} />
-
-            <span className='setting-toggle__label'>
-              <FormattedMessage id='hashtag.column_settings.tag_toggle' defaultMessage='Include additional tags in this column' />
-            </span>
+      <div className='column-settings'>
+        <section>
+          <div className='column-settings__row'>
+            <SettingToggle settings={settings} settingPath={['local']} onChange={onChange} label={<FormattedMessage id='community.column_settings.local_only' defaultMessage='Local only' />} />
+
+            <div className='setting-toggle'>
+              <Toggle id='hashtag.column_settings.tag_toggle' onChange={this.onToggle} checked={this.state.open} />
+
+              <span className='setting-toggle__label'>
+                <FormattedMessage id='hashtag.column_settings.tag_toggle' defaultMessage='Include additional tags in this column' />
+              </span>
+            </div>
           </div>
-        </div>
 
-        {this.state.open && (
-          <div className='column-settings__hashtags'>
-            {this.modeSelect('any')}
-            {this.modeSelect('all')}
-            {this.modeSelect('none')}
-          </div>
-        )}
-
-        <div className='column-settings__row'>
-          <SettingToggle settings={settings} settingPath={['local']} onChange={onChange} label={<FormattedMessage id='community.column_settings.local_only' defaultMessage='Local only' />} />
-        </div>
+          {this.state.open && (
+            <div className='column-settings__hashtags'>
+              {this.modeSelect('any')}
+              {this.modeSelect('all')}
+              {this.modeSelect('none')}
+            </div>
+          )}
+        </section>
       </div>
     );
   }
diff --git a/app/javascript/mastodon/features/home_timeline/components/column_settings.tsx b/app/javascript/mastodon/features/home_timeline/components/column_settings.tsx
index ca09d46c7e6254..3f0525fe5758f9 100644
--- a/app/javascript/mastodon/features/home_timeline/components/column_settings.tsx
+++ b/app/javascript/mastodon/features/home_timeline/components/column_settings.tsx
@@ -24,43 +24,36 @@ export const ColumnSettings: React.FC = () => {
   );
 
   return (
-    <div>
-      <span className='column-settings__section'>
-        <FormattedMessage
-          id='home.column_settings.basic'
-          defaultMessage='Basic'
-        />
-      </span>
-
-      <div className='column-settings__row'>
-        <SettingToggle
-          prefix='home_timeline'
-          settings={settings}
-          settingPath={['shows', 'reblog']}
-          onChange={onChange}
-          label={
-            <FormattedMessage
-              id='home.column_settings.show_reblogs'
-              defaultMessage='Show boosts'
-            />
-          }
-        />
-      </div>
-
-      <div className='column-settings__row'>
-        <SettingToggle
-          prefix='home_timeline'
-          settings={settings}
-          settingPath={['shows', 'reply']}
-          onChange={onChange}
-          label={
-            <FormattedMessage
-              id='home.column_settings.show_replies'
-              defaultMessage='Show replies'
-            />
-          }
-        />
-      </div>
+    <div className='column-settings'>
+      <section>
+        <div className='column-settings__row'>
+          <SettingToggle
+            prefix='home_timeline'
+            settings={settings}
+            settingPath={['shows', 'reblog']}
+            onChange={onChange}
+            label={
+              <FormattedMessage
+                id='home.column_settings.show_reblogs'
+                defaultMessage='Show boosts'
+              />
+            }
+          />
+
+          <SettingToggle
+            prefix='home_timeline'
+            settings={settings}
+            settingPath={['shows', 'reply']}
+            onChange={onChange}
+            label={
+              <FormattedMessage
+                id='home.column_settings.show_replies'
+                defaultMessage='Show replies'
+              />
+            }
+          />
+        </div>
+      </section>
     </div>
   );
 };
diff --git a/app/javascript/mastodon/features/list_timeline/index.jsx b/app/javascript/mastodon/features/list_timeline/index.jsx
index 24bf122facb347..f640e503c270e4 100644
--- a/app/javascript/mastodon/features/list_timeline/index.jsx
+++ b/app/javascript/mastodon/features/list_timeline/index.jsx
@@ -193,35 +193,38 @@ class ListTimeline extends PureComponent {
           pinned={pinned}
           multiColumn={multiColumn}
         >
-          <div className='column-settings__row column-header__links'>
-            <button type='button' className='text-btn column-header__setting-btn' tabIndex={0} onClick={this.handleEditClick}>
-              <Icon id='pencil' icon={EditIcon} /> <FormattedMessage id='lists.edit' defaultMessage='Edit list' />
-            </button>
-
-            <button type='button' className='text-btn column-header__setting-btn' tabIndex={0} onClick={this.handleDeleteClick}>
-              <Icon id='trash' icon={DeleteIcon} /> <FormattedMessage id='lists.delete' defaultMessage='Delete list' />
-            </button>
-          </div>
-
-          <div className='setting-toggle'>
-            <Toggle id={`list-${id}-exclusive`} checked={isExclusive} onChange={this.onExclusiveToggle} />
-            <label htmlFor={`list-${id}-exclusive`} className='setting-toggle__label'>
-              <FormattedMessage id='lists.exclusive' defaultMessage='Hide these posts from home' />
-            </label>
-          </div>
-
-          { replies_policy !== undefined && (
-            <div role='group' aria-labelledby={`list-${id}-replies-policy`}>
-              <span id={`list-${id}-replies-policy`} className='column-settings__section'>
-                <FormattedMessage id='lists.replies_policy.title' defaultMessage='Show replies to:' />
-              </span>
-              <div className='column-settings__row'>
-                { ['none', 'list', 'followed'].map(policy => (
-                  <RadioButton name='order' key={policy} value={policy} label={intl.formatMessage(messages[policy])} checked={replies_policy === policy} onChange={this.handleRepliesPolicyChange} />
-                ))}
+          <div className='column-settings'>
+            <section className='column-header__links'>
+              <button type='button' className='text-btn column-header__setting-btn' tabIndex={0} onClick={this.handleEditClick}>
+                <Icon id='pencil' icon={EditIcon} /> <FormattedMessage id='lists.edit' defaultMessage='Edit list' />
+              </button>
+
+              <button type='button' className='text-btn column-header__setting-btn' tabIndex={0} onClick={this.handleDeleteClick}>
+                <Icon id='trash' icon={DeleteIcon} /> <FormattedMessage id='lists.delete' defaultMessage='Delete list' />
+              </button>
+            </section>
+
+            <section>
+              <div className='setting-toggle'>
+                <Toggle id={`list-${id}-exclusive`} checked={isExclusive} onChange={this.onExclusiveToggle} />
+                <label htmlFor={`list-${id}-exclusive`} className='setting-toggle__label'>
+                  <FormattedMessage id='lists.exclusive' defaultMessage='Hide these posts from home' />
+                </label>
               </div>
-            </div>
-          )}
+            </section>
+
+            {replies_policy !== undefined && (
+              <section aria-labelledby={`list-${id}-replies-policy`}>
+                <h3 id={`list-${id}-replies-policy`}><FormattedMessage id='lists.replies_policy.title' defaultMessage='Show replies to:' /></h3>
+
+                <div className='column-settings__row'>
+                  { ['none', 'list', 'followed'].map(policy => (
+                    <RadioButton name='order' key={policy} value={policy} label={intl.formatMessage(messages[policy])} checked={replies_policy === policy} onChange={this.handleRepliesPolicyChange} />
+                  ))}
+                </div>
+              </section>
+            )}
+          </div>
         </ColumnHeader>
 
         <StatusListContainer
diff --git a/app/javascript/mastodon/features/notifications/components/checkbox_with_label.jsx b/app/javascript/mastodon/features/notifications/components/checkbox_with_label.jsx
new file mode 100644
index 00000000000000..5a7bb2307be3bc
--- /dev/null
+++ b/app/javascript/mastodon/features/notifications/components/checkbox_with_label.jsx
@@ -0,0 +1,31 @@
+import PropTypes from 'prop-types';
+import { useCallback } from 'react';
+
+import Toggle from 'react-toggle';
+
+export const CheckboxWithLabel = ({ checked, disabled, children, onChange }) => {
+  const handleChange = useCallback(({ target }) => {
+    onChange(target.checked);
+  }, [onChange]);
+
+  return (
+    <label className='app-form__toggle'>
+      <div className='app-form__toggle__label'>
+        {children}
+      </div>
+
+      <div className='app-form__toggle__toggle'>
+        <div>
+          <Toggle checked={checked} onChange={handleChange} disabled={disabled} />
+        </div>
+      </div>
+    </label>
+  );
+};
+
+CheckboxWithLabel.propTypes = {
+  checked: PropTypes.bool,
+  disabled: PropTypes.bool,
+  children: PropTypes.children,
+  onChange: PropTypes.func,
+};
diff --git a/app/javascript/mastodon/features/notifications/components/column_settings.jsx b/app/javascript/mastodon/features/notifications/components/column_settings.jsx
index 09154f257ada5b..2a9425b82b3398 100644
--- a/app/javascript/mastodon/features/notifications/components/column_settings.jsx
+++ b/app/javascript/mastodon/features/notifications/components/column_settings.jsx
@@ -7,6 +7,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 
 import { PERMISSION_MANAGE_USERS, PERMISSION_MANAGE_REPORTS } from 'mastodon/permissions';
 
+import { CheckboxWithLabel } from './checkbox_with_label';
 import ClearColumnButton from './clear_column_button';
 import GrantPermissionButton from './grant_permission_button';
 import SettingToggle from './setting_toggle';
@@ -26,18 +27,34 @@ export default class ColumnSettings extends PureComponent {
     alertsEnabled: PropTypes.bool,
     browserSupport: PropTypes.bool,
     browserPermission: PropTypes.string,
+    notificationPolicy: ImmutablePropTypes.map,
+    onChangePolicy: PropTypes.func.isRequired,
   };
 
   onPushChange = (path, checked) => {
     this.props.onChange(['push', ...path], checked);
   };
 
+  handleFilterNotFollowing = checked => {
+    this.props.onChangePolicy('filter_not_following', checked);
+  };
+
+  handleFilterNotFollowers = checked => {
+    this.props.onChangePolicy('filter_not_followers', checked);
+  };
+
+  handleFilterNewAccounts = checked => {
+    this.props.onChangePolicy('filter_new_accounts', checked);
+  };
+
+  handleFilterPrivateMentions = checked => {
+    this.props.onChangePolicy('filter_private_mentions', checked);
+  };
+
   render () {
-    const { settings, pushSettings, onChange, onClear, alertsEnabled, browserSupport, browserPermission, onRequestNotificationPermission } = this.props;
+    const { settings, pushSettings, onChange, onClear, alertsEnabled, browserSupport, browserPermission, onRequestNotificationPermission, notificationPolicy } = this.props;
 
     const unreadMarkersShowStr = <FormattedMessage id='notifications.column_settings.unread_notifications.highlight' defaultMessage='Highlight unread notifications' />;
-    const filterBarShowStr = <FormattedMessage id='notifications.column_settings.filter_bar.show_bar' defaultMessage='Show filter bar' />;
-    const filterAdvancedStr = <FormattedMessage id='notifications.column_settings.filter_bar.advanced' defaultMessage='Display all categories' />;
     const alertStr = <FormattedMessage id='notifications.column_settings.alert' defaultMessage='Desktop notifications' />;
     const showStr = <FormattedMessage id='notifications.column_settings.show' defaultMessage='Show in column' />;
     const soundStr = <FormattedMessage id='notifications.column_settings.sound' defaultMessage='Play sound' />;
@@ -46,48 +63,59 @@ export default class ColumnSettings extends PureComponent {
     const pushStr = showPushSettings && <FormattedMessage id='notifications.column_settings.push' defaultMessage='Push notifications' />;
 
     return (
-      <div>
+      <div className='column-settings'>
         {alertsEnabled && browserSupport && browserPermission === 'denied' && (
-          <div className='column-settings__row column-settings__row--with-margin'>
-            <span className='warning-hint'><FormattedMessage id='notifications.permission_denied' defaultMessage='Desktop notifications are unavailable due to previously denied browser permissions request' /></span>
-          </div>
+          <span className='warning-hint'><FormattedMessage id='notifications.permission_denied' defaultMessage='Desktop notifications are unavailable due to previously denied browser permissions request' /></span>
         )}
 
         {alertsEnabled && browserSupport && browserPermission === 'default' && (
-          <div className='column-settings__row column-settings__row--with-margin'>
-            <span className='warning-hint'>
-              <FormattedMessage id='notifications.permission_required' defaultMessage='Desktop notifications are unavailable because the required permission has not been granted.' /> <GrantPermissionButton onClick={onRequestNotificationPermission} />
-            </span>
-          </div>
+          <span className='warning-hint'>
+            <FormattedMessage id='notifications.permission_required' defaultMessage='Desktop notifications are unavailable because the required permission has not been granted.' /> <GrantPermissionButton onClick={onRequestNotificationPermission} />
+          </span>
         )}
 
-        <div className='column-settings__row'>
+        <section>
           <ClearColumnButton onClick={onClear} />
-        </div>
+        </section>
 
-        <div role='group' aria-labelledby='notifications-unread-markers'>
-          <span id='notifications-unread-markers' className='column-settings__section'>
-            <FormattedMessage id='notifications.column_settings.unread_notifications.category' defaultMessage='Unread notifications' />
-          </span>
+        <section>
+          <h3><FormattedMessage id='notifications.policy.title' defaultMessage='Filter out notifications from…' /></h3>
 
           <div className='column-settings__row'>
-            <SettingToggle id='unread-notification-markers' prefix='notifications' settings={settings} settingPath={['showUnread']} onChange={onChange} label={unreadMarkersShowStr} />
+            <CheckboxWithLabel checked={notificationPolicy.get('filter_not_following')} onChange={this.handleFilterNotFollowing}>
+              <strong><FormattedMessage id='notifications.policy.filter_not_following_title' defaultMessage="People you don't follow" /></strong>
+              <span className='hint'><FormattedMessage id='notifications.policy.filter_not_following_hint' defaultMessage='Until you manually approve them' /></span>
+            </CheckboxWithLabel>
+
+            <CheckboxWithLabel checked={notificationPolicy.get('filter_not_followers')} onChange={this.handleFilterNotFollowers}>
+              <strong><FormattedMessage id='notifications.policy.filter_not_followers_title' defaultMessage='People not following you' /></strong>
+              <span className='hint'><FormattedMessage id='notifications.policy.filter_not_followers_hint' defaultMessage='Including people who have been following you fewer than {days, plural, one {one day} other {# days}}' values={{ days: 3 }} /></span>
+            </CheckboxWithLabel>
+
+            <CheckboxWithLabel checked={notificationPolicy.get('filter_new_accounts')} onChange={this.handleFilterNewAccounts}>
+              <strong><FormattedMessage id='notifications.policy.filter_new_accounts_title' defaultMessage='New accounts' /></strong>
+              <span className='hint'><FormattedMessage id='notifications.policy.filter_new_accounts.hint' defaultMessage='Created within the past {days, plural, one {one day} other {# days}}' values={{ days: 30 }} /></span>
+            </CheckboxWithLabel>
+
+            <CheckboxWithLabel checked={notificationPolicy.get('filter_private_mentions')} onChange={this.handleFilterPrivateMentions}>
+              <strong><FormattedMessage id='notifications.policy.filter_private_mentions_title' defaultMessage='Unsolicited private mentions' /></strong>
+              <span className='hint'><FormattedMessage id='notifications.policy.filter_private_mentions_hint' defaultMessage="Filtered unless it's in reply to your own mention or if you follow the sender" /></span>
+            </CheckboxWithLabel>
           </div>
-        </div>
+        </section>
 
-        <div role='group' aria-labelledby='notifications-filter-bar'>
-          <span id='notifications-filter-bar' className='column-settings__section'>
-            <FormattedMessage id='notifications.column_settings.filter_bar.category' defaultMessage='Quick filter bar' />
-          </span>
+        <section role='group' aria-labelledby='notifications-unread-markers'>
+          <h3 id='notifications-unread-markers'>
+            <FormattedMessage id='notifications.column_settings.unread_notifications.category' defaultMessage='Unread notifications' />
+          </h3>
 
           <div className='column-settings__row'>
-            <SettingToggle id='show-filter-bar' prefix='notifications' settings={settings} settingPath={['quickFilter', 'show']} onChange={onChange} label={filterBarShowStr} />
-            <SettingToggle id='show-filter-bar' prefix='notifications' settings={settings} settingPath={['quickFilter', 'advanced']} onChange={onChange} label={filterAdvancedStr} />
+            <SettingToggle id='unread-notification-markers' prefix='notifications' settings={settings} settingPath={['showUnread']} onChange={onChange} label={unreadMarkersShowStr} />
           </div>
-        </div>
+        </section>
 
-        <div role='group' aria-labelledby='notifications-follow'>
-          <span id='notifications-follow' className='column-settings__section'><FormattedMessage id='notifications.column_settings.follow' defaultMessage='New followers:' /></span>
+        <section role='group' aria-labelledby='notifications-follow'>
+          <h3 id='notifications-follow'><FormattedMessage id='notifications.column_settings.follow' defaultMessage='New followers:' /></h3>
 
           <div className='column-settings__row'>
             <SettingToggle disabled={browserPermission === 'denied'} prefix='notifications_desktop' settings={settings} settingPath={['alerts', 'follow']} onChange={onChange} label={alertStr} />
@@ -95,10 +123,10 @@ export default class ColumnSettings extends PureComponent {
             <SettingToggle prefix='notifications' settings={settings} settingPath={['shows', 'follow']} onChange={onChange} label={showStr} />
             <SettingToggle prefix='notifications' settings={settings} settingPath={['sounds', 'follow']} onChange={onChange} label={soundStr} />
           </div>
-        </div>
+        </section>
 
-        <div role='group' aria-labelledby='notifications-follow-request'>
-          <span id='notifications-follow-request' className='column-settings__section'><FormattedMessage id='notifications.column_settings.follow_request' defaultMessage='New follow requests:' /></span>
+        <section role='group' aria-labelledby='notifications-follow-request'>
+          <h3 id='notifications-follow-request'><FormattedMessage id='notifications.column_settings.follow_request' defaultMessage='New follow requests:' /></h3>
 
           <div className='column-settings__row'>
             <SettingToggle disabled={browserPermission === 'denied'} prefix='notifications_desktop' settings={settings} settingPath={['alerts', 'follow_request']} onChange={onChange} label={alertStr} />
@@ -106,10 +134,10 @@ export default class ColumnSettings extends PureComponent {
             <SettingToggle prefix='notifications' settings={settings} settingPath={['shows', 'follow_request']} onChange={onChange} label={showStr} />
             <SettingToggle prefix='notifications' settings={settings} settingPath={['sounds', 'follow_request']} onChange={onChange} label={soundStr} />
           </div>
-        </div>
+        </section>
 
-        <div role='group' aria-labelledby='notifications-favourite'>
-          <span id='notifications-favourite' className='column-settings__section'><FormattedMessage id='notifications.column_settings.favourite' defaultMessage='Favorites:' /></span>
+        <section role='group' aria-labelledby='notifications-favourite'>
+          <h3 id='notifications-favourite'><FormattedMessage id='notifications.column_settings.favourite' defaultMessage='Favorites:' /></h3>
 
           <div className='column-settings__row'>
             <SettingToggle disabled={browserPermission === 'denied'} prefix='notifications_desktop' settings={settings} settingPath={['alerts', 'favourite']} onChange={onChange} label={alertStr} />
@@ -117,10 +145,10 @@ export default class ColumnSettings extends PureComponent {
             <SettingToggle prefix='notifications' settings={settings} settingPath={['shows', 'favourite']} onChange={onChange} label={showStr} />
             <SettingToggle prefix='notifications' settings={settings} settingPath={['sounds', 'favourite']} onChange={onChange} label={soundStr} />
           </div>
-        </div>
+        </section>
 
-        <div role='group' aria-labelledby='notifications-mention'>
-          <span id='notifications-mention' className='column-settings__section'><FormattedMessage id='notifications.column_settings.mention' defaultMessage='Mentions:' /></span>
+        <section role='group' aria-labelledby='notifications-mention'>
+          <h3 id='notifications-mention'><FormattedMessage id='notifications.column_settings.mention' defaultMessage='Mentions:' /></h3>
 
           <div className='column-settings__row'>
             <SettingToggle disabled={browserPermission === 'denied'} prefix='notifications_desktop' settings={settings} settingPath={['alerts', 'mention']} onChange={onChange} label={alertStr} />
@@ -128,10 +156,10 @@ export default class ColumnSettings extends PureComponent {
             <SettingToggle prefix='notifications' settings={settings} settingPath={['shows', 'mention']} onChange={onChange} label={showStr} />
             <SettingToggle prefix='notifications' settings={settings} settingPath={['sounds', 'mention']} onChange={onChange} label={soundStr} />
           </div>
-        </div>
+        </section>
 
-        <div role='group' aria-labelledby='notifications-reblog'>
-          <span id='notifications-reblog' className='column-settings__section'><FormattedMessage id='notifications.column_settings.reblog' defaultMessage='Boosts:' /></span>
+        <section role='group' aria-labelledby='notifications-reblog'>
+          <h3 id='notifications-reblog'><FormattedMessage id='notifications.column_settings.reblog' defaultMessage='Boosts:' /></h3>
 
           <div className='column-settings__row'>
             <SettingToggle disabled={browserPermission === 'denied'} prefix='notifications_desktop' settings={settings} settingPath={['alerts', 'reblog']} onChange={onChange} label={alertStr} />
@@ -139,10 +167,10 @@ export default class ColumnSettings extends PureComponent {
             <SettingToggle prefix='notifications' settings={settings} settingPath={['shows', 'reblog']} onChange={onChange} label={showStr} />
             <SettingToggle prefix='notifications' settings={settings} settingPath={['sounds', 'reblog']} onChange={onChange} label={soundStr} />
           </div>
-        </div>
+        </section>
 
-        <div role='group' aria-labelledby='notifications-poll'>
-          <span id='notifications-poll' className='column-settings__section'><FormattedMessage id='notifications.column_settings.poll' defaultMessage='Poll results:' /></span>
+        <section role='group' aria-labelledby='notifications-poll'>
+          <h3 id='notifications-poll'><FormattedMessage id='notifications.column_settings.poll' defaultMessage='Poll results:' /></h3>
 
           <div className='column-settings__row'>
             <SettingToggle disabled={browserPermission === 'denied'} prefix='notifications_desktop' settings={settings} settingPath={['alerts', 'poll']} onChange={onChange} label={alertStr} />
@@ -150,10 +178,10 @@ export default class ColumnSettings extends PureComponent {
             <SettingToggle prefix='notifications' settings={settings} settingPath={['shows', 'poll']} onChange={onChange} label={showStr} />
             <SettingToggle prefix='notifications' settings={settings} settingPath={['sounds', 'poll']} onChange={onChange} label={soundStr} />
           </div>
-        </div>
+        </section>
 
-        <div role='group' aria-labelledby='notifications-status'>
-          <span id='notifications-status' className='column-settings__section'><FormattedMessage id='notifications.column_settings.status' defaultMessage='New posts:' /></span>
+        <section role='group' aria-labelledby='notifications-status'>
+          <h3 id='notifications-status'><FormattedMessage id='notifications.column_settings.status' defaultMessage='New posts:' /></h3>
 
           <div className='column-settings__row'>
             <SettingToggle disabled={browserPermission === 'denied'} prefix='notifications_desktop' settings={settings} settingPath={['alerts', 'status']} onChange={onChange} label={alertStr} />
@@ -161,10 +189,10 @@ export default class ColumnSettings extends PureComponent {
             <SettingToggle prefix='notifications' settings={settings} settingPath={['shows', 'status']} onChange={onChange} label={showStr} />
             <SettingToggle prefix='notifications' settings={settings} settingPath={['sounds', 'status']} onChange={onChange} label={soundStr} />
           </div>
-        </div>
+        </section>
 
-        <div role='group' aria-labelledby='notifications-update'>
-          <span id='notifications-update' className='column-settings__section'><FormattedMessage id='notifications.column_settings.update' defaultMessage='Edits:' /></span>
+        <section role='group' aria-labelledby='notifications-update'>
+          <h3 id='notifications-update'><FormattedMessage id='notifications.column_settings.update' defaultMessage='Edits:' /></h3>
 
           <div className='column-settings__row'>
             <SettingToggle disabled={browserPermission === 'denied'} prefix='notifications_desktop' settings={settings} settingPath={['alerts', 'update']} onChange={onChange} label={alertStr} />
@@ -172,11 +200,11 @@ export default class ColumnSettings extends PureComponent {
             <SettingToggle prefix='notifications' settings={settings} settingPath={['shows', 'update']} onChange={onChange} label={showStr} />
             <SettingToggle prefix='notifications' settings={settings} settingPath={['sounds', 'update']} onChange={onChange} label={soundStr} />
           </div>
-        </div>
+        </section>
 
         {((this.context.identity.permissions & PERMISSION_MANAGE_USERS) === PERMISSION_MANAGE_USERS) && (
-          <div role='group' aria-labelledby='notifications-admin-sign-up'>
-            <span id='notifications-status' className='column-settings__section'><FormattedMessage id='notifications.column_settings.admin.sign_up' defaultMessage='New sign-ups:' /></span>
+          <section role='group' aria-labelledby='notifications-admin-sign-up'>
+            <h3 id='notifications-status'><FormattedMessage id='notifications.column_settings.admin.sign_up' defaultMessage='New sign-ups:' /></h3>
 
             <div className='column-settings__row'>
               <SettingToggle disabled={browserPermission === 'denied'} prefix='notifications_desktop' settings={settings} settingPath={['alerts', 'admin.sign_up']} onChange={onChange} label={alertStr} />
@@ -184,12 +212,12 @@ export default class ColumnSettings extends PureComponent {
               <SettingToggle prefix='notifications' settings={settings} settingPath={['shows', 'admin.sign_up']} onChange={onChange} label={showStr} />
               <SettingToggle prefix='notifications' settings={settings} settingPath={['sounds', 'admin.sign_up']} onChange={onChange} label={soundStr} />
             </div>
-          </div>
+          </section>
         )}
 
         {((this.context.identity.permissions & PERMISSION_MANAGE_REPORTS) === PERMISSION_MANAGE_REPORTS) && (
-          <div role='group' aria-labelledby='notifications-admin-report'>
-            <span id='notifications-status' className='column-settings__section'><FormattedMessage id='notifications.column_settings.admin.report' defaultMessage='New reports:' /></span>
+          <section role='group' aria-labelledby='notifications-admin-report'>
+            <h3 id='notifications-status'><FormattedMessage id='notifications.column_settings.admin.report' defaultMessage='New reports:' /></h3>
 
             <div className='column-settings__row'>
               <SettingToggle disabled={browserPermission === 'denied'} prefix='notifications_desktop' settings={settings} settingPath={['alerts', 'admin.report']} onChange={onChange} label={alertStr} />
@@ -197,7 +225,7 @@ export default class ColumnSettings extends PureComponent {
               <SettingToggle prefix='notifications' settings={settings} settingPath={['shows', 'admin.report']} onChange={onChange} label={showStr} />
               <SettingToggle prefix='notifications' settings={settings} settingPath={['sounds', 'admin.report']} onChange={onChange} label={soundStr} />
             </div>
-          </div>
+          </section>
         )}
       </div>
     );
diff --git a/app/javascript/mastodon/features/notifications/components/filtered_notifications_banner.jsx b/app/javascript/mastodon/features/notifications/components/filtered_notifications_banner.jsx
new file mode 100644
index 00000000000000..dddb9d64120851
--- /dev/null
+++ b/app/javascript/mastodon/features/notifications/components/filtered_notifications_banner.jsx
@@ -0,0 +1,49 @@
+import { useEffect } from 'react';
+
+import { FormattedMessage } from 'react-intl';
+
+import { Link } from 'react-router-dom';
+
+import { useDispatch, useSelector } from 'react-redux';
+
+
+import ArchiveIcon from '@/material-icons/400-24px/archive.svg?react';
+import { fetchNotificationPolicy } from 'mastodon/actions/notifications';
+import { Icon } from 'mastodon/components/icon';
+import { toCappedNumber } from 'mastodon/utils/numbers';
+
+export const FilteredNotificationsBanner = () => {
+  const dispatch = useDispatch();
+  const policy = useSelector(state => state.get('notificationPolicy'));
+
+  useEffect(() => {
+    dispatch(fetchNotificationPolicy());
+
+    const interval = setInterval(() => {
+      dispatch(fetchNotificationPolicy());
+    }, 120000);
+
+    return () => {
+      clearInterval(interval);
+    };
+  }, [dispatch]);
+
+  if (policy === null || policy.getIn(['summary', 'pending_notifications_count']) * 1 === 0) {
+    return null;
+  }
+
+  return (
+    <Link className='filtered-notifications-banner' to='/notifications/requests'>
+      <Icon icon={ArchiveIcon} />
+
+      <div className='filtered-notifications-banner__text'>
+        <strong><FormattedMessage id='filtered_notifications_banner.title' defaultMessage='Filtered notifications' /></strong>
+        <span><FormattedMessage id='filtered_notifications_banner.pending_requests' defaultMessage='Notifications from {count, plural, =0 {no} one {one person} other {# people}} you may know' values={{ count: policy.getIn(['summary', 'pending_requests_count']) }} /></span>
+      </div>
+
+      <div className='filtered-notifications-banner__badge'>
+        {toCappedNumber(policy.getIn(['summary', 'pending_notifications_count']))}
+      </div>
+    </Link>
+  );
+};
diff --git a/app/javascript/mastodon/features/notifications/components/notification_request.jsx b/app/javascript/mastodon/features/notifications/components/notification_request.jsx
new file mode 100644
index 00000000000000..e24124ca6a2f6f
--- /dev/null
+++ b/app/javascript/mastodon/features/notifications/components/notification_request.jsx
@@ -0,0 +1,65 @@
+import PropTypes from 'prop-types';
+import { useCallback } from 'react';
+
+import { defineMessages, useIntl } from 'react-intl';
+
+import { Link } from 'react-router-dom';
+
+import { useSelector, useDispatch } from 'react-redux';
+
+import DoneIcon from '@/material-icons/400-24px/done.svg?react';
+import VolumeOffIcon from '@/material-icons/400-24px/volume_off.svg?react';
+import { acceptNotificationRequest, dismissNotificationRequest } from 'mastodon/actions/notifications';
+import { Avatar } from 'mastodon/components/avatar';
+import { IconButton } from 'mastodon/components/icon_button';
+import { makeGetAccount } from 'mastodon/selectors';
+import { toCappedNumber } from 'mastodon/utils/numbers';
+
+const getAccount = makeGetAccount();
+
+const messages = defineMessages({
+  accept: { id: 'notification_requests.accept', defaultMessage: 'Accept' },
+  dismiss: { id: 'notification_requests.dismiss', defaultMessage: 'Dismiss' },
+});
+
+export const NotificationRequest = ({ id, accountId, notificationsCount }) => {
+  const dispatch = useDispatch();
+  const account = useSelector(state => getAccount(state, accountId));
+  const intl = useIntl();
+
+  const handleDismiss = useCallback(() => {
+    dispatch(dismissNotificationRequest(id));
+  }, [dispatch, id]);
+
+  const handleAccept = useCallback(() => {
+    dispatch(acceptNotificationRequest(id));
+  }, [dispatch, id]);
+
+  return (
+    <div className='notification-request'>
+      <Link to={`/notifications/requests/${id}`} className='notification-request__link'>
+        <Avatar account={account} size={36} />
+
+        <div className='notification-request__name'>
+          <div className='notification-request__name__display-name'>
+            <bdi><strong dangerouslySetInnerHTML={{ __html: account?.get('display_name_html') }} /></bdi>
+            <span className='filtered-notifications-banner__badge'>{toCappedNumber(notificationsCount)}</span>
+          </div>
+
+          <span>@{account?.get('acct')}</span>
+        </div>
+      </Link>
+
+      <div className='notification-request__actions'>
+        <IconButton iconComponent={VolumeOffIcon} onClick={handleDismiss} title={intl.formatMessage(messages.dismiss)} />
+        <IconButton iconComponent={DoneIcon} onClick={handleAccept} title={intl.formatMessage(messages.accept)} />
+      </div>
+    </div>
+  );
+};
+
+NotificationRequest.propTypes = {
+  id: PropTypes.string.isRequired,
+  accountId: PropTypes.string.isRequired,
+  notificationsCount: PropTypes.string.isRequired,
+};
diff --git a/app/javascript/mastodon/features/notifications/containers/column_settings_container.js b/app/javascript/mastodon/features/notifications/containers/column_settings_container.js
index 1e62ed9a5a45b6..de266160f8511c 100644
--- a/app/javascript/mastodon/features/notifications/containers/column_settings_container.js
+++ b/app/javascript/mastodon/features/notifications/containers/column_settings_container.js
@@ -4,7 +4,7 @@ import { connect } from 'react-redux';
 
 import { showAlert } from '../../../actions/alerts';
 import { openModal } from '../../../actions/modal';
-import { setFilter, clearNotifications, requestBrowserPermission } from '../../../actions/notifications';
+import { setFilter, clearNotifications, requestBrowserPermission, updateNotificationsPolicy } from '../../../actions/notifications';
 import { changeAlerts as changePushNotifications } from '../../../actions/push_notifications';
 import { changeSetting } from '../../../actions/settings';
 import ColumnSettings from '../components/column_settings';
@@ -21,6 +21,7 @@ const mapStateToProps = state => ({
   alertsEnabled: state.getIn(['settings', 'notifications', 'alerts']).includes(true),
   browserSupport: state.getIn(['notifications', 'browserSupport']),
   browserPermission: state.getIn(['notifications', 'browserPermission']),
+  notificationPolicy: state.get('notificationPolicy'),
 });
 
 const mapDispatchToProps = (dispatch, { intl }) => ({
@@ -73,6 +74,12 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
     dispatch(requestBrowserPermission());
   },
 
+  onChangePolicy (param, checked) {
+    dispatch(updateNotificationsPolicy({
+      [param]: checked,
+    }));
+  },
+
 });
 
 export default injectIntl(connect(mapStateToProps, mapDispatchToProps)(ColumnSettings));
diff --git a/app/javascript/mastodon/features/notifications/containers/filter_bar_container.js b/app/javascript/mastodon/features/notifications/containers/filter_bar_container.js
index 4e0184cef30534..e448cd26ad9ea5 100644
--- a/app/javascript/mastodon/features/notifications/containers/filter_bar_container.js
+++ b/app/javascript/mastodon/features/notifications/containers/filter_bar_container.js
@@ -5,7 +5,7 @@ import FilterBar from '../components/filter_bar';
 
 const makeMapStateToProps = state => ({
   selectedFilter: state.getIn(['settings', 'notifications', 'quickFilter', 'active']),
-  advancedMode: state.getIn(['settings', 'notifications', 'quickFilter', 'advanced']),
+  advancedMode: false,
 });
 
 const mapDispatchToProps = (dispatch) => ({
diff --git a/app/javascript/mastodon/features/notifications/index.jsx b/app/javascript/mastodon/features/notifications/index.jsx
index 30c63ed32ac0d3..e062957ff89a19 100644
--- a/app/javascript/mastodon/features/notifications/index.jsx
+++ b/app/javascript/mastodon/features/notifications/index.jsx
@@ -33,6 +33,7 @@ import ColumnHeader from '../../components/column_header';
 import { LoadGap } from '../../components/load_gap';
 import ScrollableList from '../../components/scrollable_list';
 
+import { FilteredNotificationsBanner } from './components/filtered_notifications_banner';
 import NotificationsPermissionBanner from './components/notifications_permission_banner';
 import ColumnSettingsContainer from './containers/column_settings_container';
 import FilterBarContainer from './containers/filter_bar_container';
@@ -65,7 +66,6 @@ const getNotifications = createSelector([
 });
 
 const mapStateToProps = state => ({
-  showFilterBar: state.getIn(['settings', 'notifications', 'quickFilter', 'show']),
   notifications: getNotifications(state),
   isLoading: state.getIn(['notifications', 'isLoading'], 0) > 0,
   isUnread: state.getIn(['notifications', 'unread']) > 0 || state.getIn(['notifications', 'pendingItems']).size > 0,
@@ -85,7 +85,6 @@ class Notifications extends PureComponent {
   static propTypes = {
     columnId: PropTypes.string,
     notifications: ImmutablePropTypes.list.isRequired,
-    showFilterBar: PropTypes.bool.isRequired,
     dispatch: PropTypes.func.isRequired,
     intl: PropTypes.object.isRequired,
     isLoading: PropTypes.bool,
@@ -188,14 +187,14 @@ class Notifications extends PureComponent {
   };
 
   render () {
-    const { intl, notifications, isLoading, isUnread, columnId, multiColumn, hasMore, numPending, showFilterBar, lastReadId, canMarkAsRead, needsNotificationPermission } = this.props;
+    const { intl, notifications, isLoading, isUnread, columnId, multiColumn, hasMore, numPending, lastReadId, canMarkAsRead, needsNotificationPermission } = this.props;
     const pinned = !!columnId;
     const emptyMessage = <FormattedMessage id='empty_column.notifications' defaultMessage="You don't have any notifications yet. When other people interact with you, you will see it here." />;
     const { signedIn } = this.context.identity;
 
     let scrollableContent = null;
 
-    const filterBarContainer = (signedIn && showFilterBar)
+    const filterBarContainer = signedIn
       ? (<FilterBarContainer />)
       : null;
 
@@ -285,6 +284,9 @@ class Notifications extends PureComponent {
         </ColumnHeader>
 
         {filterBarContainer}
+
+        <FilteredNotificationsBanner />
+
         {scrollContainer}
 
         <Helmet>
diff --git a/app/javascript/mastodon/features/notifications/request.jsx b/app/javascript/mastodon/features/notifications/request.jsx
new file mode 100644
index 00000000000000..5977a6ce96ab56
--- /dev/null
+++ b/app/javascript/mastodon/features/notifications/request.jsx
@@ -0,0 +1,144 @@
+import PropTypes from 'prop-types';
+import { useRef, useCallback, useEffect } from 'react';
+
+import { defineMessages, useIntl } from 'react-intl';
+
+import { Helmet } from 'react-helmet';
+
+import { useSelector, useDispatch } from 'react-redux';
+
+import ArchiveIcon from '@/material-icons/400-24px/archive.svg?react';
+import DoneIcon from '@/material-icons/400-24px/done.svg?react';
+import VolumeOffIcon from '@/material-icons/400-24px/volume_off.svg?react';
+import { fetchNotificationRequest, fetchNotificationsForRequest, expandNotificationsForRequest, acceptNotificationRequest, dismissNotificationRequest } from 'mastodon/actions/notifications';
+import Column from 'mastodon/components/column';
+import ColumnHeader from 'mastodon/components/column_header';
+import { IconButton } from 'mastodon/components/icon_button';
+import ScrollableList from 'mastodon/components/scrollable_list';
+
+import NotificationContainer from './containers/notification_container';
+
+const messages = defineMessages({
+  title: { id: 'notification_requests.notifications_from', defaultMessage: 'Notifications from {name}' },
+  accept: { id: 'notification_requests.accept', defaultMessage: 'Accept' },
+  dismiss: { id: 'notification_requests.dismiss', defaultMessage: 'Dismiss' },
+});
+
+const selectChild = (ref, index, alignTop) => {
+  const container = ref.current.node;
+  const element = container.querySelector(`article:nth-of-type(${index + 1}) .focusable`);
+
+  if (element) {
+    if (alignTop && container.scrollTop > element.offsetTop) {
+      element.scrollIntoView(true);
+    } else if (!alignTop && container.scrollTop + container.clientHeight < element.offsetTop + element.offsetHeight) {
+      element.scrollIntoView(false);
+    }
+
+    element.focus();
+  }
+};
+
+export const NotificationRequest = ({ multiColumn, params: { id } }) => {
+  const columnRef = useRef();
+  const intl = useIntl();
+  const dispatch = useDispatch();
+  const notificationRequest = useSelector(state => state.getIn(['notificationRequests', 'current', 'item', 'id']) === id ? state.getIn(['notificationRequests', 'current', 'item']) : null);
+  const accountId = notificationRequest?.get('account');
+  const account = useSelector(state => state.getIn(['accounts', accountId]));
+  const notifications = useSelector(state => state.getIn(['notificationRequests', 'current', 'notifications', 'items']));
+  const isLoading = useSelector(state => state.getIn(['notificationRequests', 'current', 'notifications', 'isLoading']));
+  const hasMore = useSelector(state => !!state.getIn(['notificationRequests', 'current', 'notifications', 'next']));
+  const removed = useSelector(state => state.getIn(['notificationRequests', 'current', 'removed']));
+
+  const handleHeaderClick = useCallback(() => {
+    columnRef.current?.scrollTop();
+  }, [columnRef]);
+
+  const handleLoadMore = useCallback(() => {
+    dispatch(expandNotificationsForRequest());
+  }, [dispatch]);
+
+  const handleDismiss = useCallback(() => {
+    dispatch(dismissNotificationRequest(id));
+  }, [dispatch, id]);
+
+  const handleAccept = useCallback(() => {
+    dispatch(acceptNotificationRequest(id));
+  }, [dispatch, id]);
+
+  const handleMoveUp = useCallback(id => {
+    const elementIndex = notifications.findIndex(item => item !== null && item.get('id') === id) - 1;
+    selectChild(columnRef, elementIndex, true);
+  }, [columnRef, notifications]);
+
+  const handleMoveDown = useCallback(id => {
+    const elementIndex = notifications.findIndex(item => item !== null && item.get('id') === id) + 1;
+    selectChild(columnRef, elementIndex, false);
+  }, [columnRef, notifications]);
+
+  useEffect(() => {
+    dispatch(fetchNotificationRequest(id));
+  }, [dispatch, id]);
+
+  useEffect(() => {
+    if (accountId) {
+      dispatch(fetchNotificationsForRequest(accountId));
+    }
+  }, [dispatch, accountId]);
+
+  const columnTitle = intl.formatMessage(messages.title, { name: account?.get('display_name') });
+
+  return (
+    <Column bindToDocument={!multiColumn} ref={columnRef} label={columnTitle}>
+      <ColumnHeader
+        icon='archive'
+        iconComponent={ArchiveIcon}
+        title={columnTitle}
+        onClick={handleHeaderClick}
+        multiColumn={multiColumn}
+        showBackButton
+        extraButton={!removed && (
+          <>
+            <IconButton className='column-header__button' iconComponent={VolumeOffIcon} onClick={handleDismiss} title={intl.formatMessage(messages.dismiss)} />
+            <IconButton className='column-header__button' iconComponent={DoneIcon} onClick={handleAccept} title={intl.formatMessage(messages.accept)} />
+          </>
+        )}
+      />
+
+      <ScrollableList
+        scrollKey={`notification_requests/${id}`}
+        trackScroll={!multiColumn}
+        bindToDocument={!multiColumn}
+        isLoading={isLoading}
+        showLoading={isLoading && notifications.size === 0}
+        hasMore={hasMore}
+        onLoadMore={handleLoadMore}
+      >
+        {notifications.map(item => (
+          item && <NotificationContainer
+            key={item.get('id')}
+            notification={item}
+            accountId={item.get('account')}
+            onMoveUp={handleMoveUp}
+            onMoveDown={handleMoveDown}
+          />
+        ))}
+      </ScrollableList>
+
+      <Helmet>
+        <title>{columnTitle}</title>
+        <meta name='robots' content='noindex' />
+      </Helmet>
+    </Column>
+  );
+};
+
+NotificationRequest.propTypes = {
+  multiColumn: PropTypes.bool,
+  params: PropTypes.shape({
+    id: PropTypes.string.isRequired,
+  }),
+};
+
+export default NotificationRequest;
diff --git a/app/javascript/mastodon/features/notifications/requests.jsx b/app/javascript/mastodon/features/notifications/requests.jsx
new file mode 100644
index 00000000000000..46e3c428a6ea83
--- /dev/null
+++ b/app/javascript/mastodon/features/notifications/requests.jsx
@@ -0,0 +1,85 @@
+import PropTypes from 'prop-types';
+import { useRef, useCallback, useEffect } from 'react';
+
+import { defineMessages, useIntl, FormattedMessage } from 'react-intl';
+
+import { Helmet } from 'react-helmet';
+
+import { useSelector, useDispatch } from 'react-redux';
+
+import ArchiveIcon from '@/material-icons/400-24px/archive.svg?react';
+import { fetchNotificationRequests, expandNotificationRequests } from 'mastodon/actions/notifications';
+import Column from 'mastodon/components/column';
+import ColumnHeader from 'mastodon/components/column_header';
+import ScrollableList from 'mastodon/components/scrollable_list';
+
+import { NotificationRequest } from './components/notification_request';
+
+const messages = defineMessages({
+  title: { id: 'notification_requests.title', defaultMessage: 'Filtered notifications' },
+});
+
+export const NotificationRequests = ({ multiColumn }) => {
+  const columnRef = useRef();
+  const intl = useIntl();
+  const dispatch = useDispatch();
+  const isLoading = useSelector(state => state.getIn(['notificationRequests', 'isLoading']));
+  const notificationRequests = useSelector(state => state.getIn(['notificationRequests', 'items']));
+  const hasMore = useSelector(state => !!state.getIn(['notificationRequests', 'next']));
+
+  const handleHeaderClick = useCallback(() => {
+    columnRef.current?.scrollTop();
+  }, [columnRef]);
+
+  const handleLoadMore = useCallback(() => {
+    dispatch(expandNotificationRequests());
+  }, [dispatch]);
+
+  useEffect(() => {
+    dispatch(fetchNotificationRequests());
+  }, [dispatch]);
+
+  return (
+    <Column bindToDocument={!multiColumn} ref={columnRef} label={intl.formatMessage(messages.title)}>
+      <ColumnHeader
+        icon='archive'
+        iconComponent={ArchiveIcon}
+        title={intl.formatMessage(messages.title)}
+        onClick={handleHeaderClick}
+        multiColumn={multiColumn}
+        showBackButton
+      />
+
+      <ScrollableList
+        scrollKey='notification_requests'
+        trackScroll={!multiColumn}
+        bindToDocument={!multiColumn}
+        isLoading={isLoading}
+        showLoading={isLoading && notificationRequests.size === 0}
+        hasMore={hasMore}
+        onLoadMore={handleLoadMore}
+        emptyMessage={<FormattedMessage id='empty_column.notification_requests' defaultMessage='All clear! There is nothing here. When you receive new notifications, they will appear here according to your settings.' />}
+      >
+        {notificationRequests.map(request => (
+          <NotificationRequest
+            key={request.get('id')}
+            id={request.get('id')}
+            accountId={request.get('account')}
+            notificationsCount={request.get('notifications_count')}
+          />
+        ))}
+      </ScrollableList>
+
+      <Helmet>
+        <title>{intl.formatMessage(messages.title)}</title>
+        <meta name='robots' content='noindex' />
+      </Helmet>
+    </Column>
+  );
+};
+
+NotificationRequests.propTypes = {
+  multiColumn: PropTypes.bool,
+};
+
+export default NotificationRequests;
diff --git a/app/javascript/mastodon/features/public_timeline/components/column_settings.jsx b/app/javascript/mastodon/features/public_timeline/components/column_settings.jsx
index 1ceec1ba66ad3b..c865f1bb025866 100644
--- a/app/javascript/mastodon/features/public_timeline/components/column_settings.jsx
+++ b/app/javascript/mastodon/features/public_timeline/components/column_settings.jsx
@@ -20,11 +20,13 @@ class ColumnSettings extends PureComponent {
     const { settings, onChange } = this.props;
 
     return (
-      <div>
-        <div className='column-settings__row'>
-          <SettingToggle settings={settings} settingPath={['other', 'onlyMedia']} onChange={onChange} label={<FormattedMessage id='community.column_settings.media_only' defaultMessage='Media only' />} />
-          <SettingToggle settings={settings} settingPath={['other', 'onlyRemote']} onChange={onChange} label={<FormattedMessage id='community.column_settings.remote_only' defaultMessage='Remote only' />} />
-        </div>
+      <div className='column-settings'>
+        <section>
+          <div className='column-settings__row'>
+            <SettingToggle settings={settings} settingPath={['other', 'onlyMedia']} onChange={onChange} label={<FormattedMessage id='community.column_settings.media_only' defaultMessage='Media only' />} />
+            <SettingToggle settings={settings} settingPath={['other', 'onlyRemote']} onChange={onChange} label={<FormattedMessage id='community.column_settings.remote_only' defaultMessage='Remote only' />} />
+          </div>
+        </section>
       </div>
     );
   }
diff --git a/app/javascript/mastodon/features/ui/index.jsx b/app/javascript/mastodon/features/ui/index.jsx
index da554f684fad73..34c5dd30253637 100644
--- a/app/javascript/mastodon/features/ui/index.jsx
+++ b/app/javascript/mastodon/features/ui/index.jsx
@@ -48,6 +48,8 @@ import {
   DirectTimeline,
   HashtagTimeline,
   Notifications,
+  NotificationRequests,
+  NotificationRequest,
   FollowRequests,
   FavouritedStatuses,
   BookmarkedStatuses,
@@ -203,7 +205,9 @@ class SwitchingColumnsArea extends PureComponent {
             <WrappedRoute path={['/conversations', '/timelines/direct']} component={DirectTimeline} content={children} />
             <WrappedRoute path='/tags/:id' component={HashtagTimeline} content={children} />
             <WrappedRoute path='/lists/:id' component={ListTimeline} content={children} />
-            <WrappedRoute path='/notifications' component={Notifications} content={children} />
+            <WrappedRoute path='/notifications' component={Notifications} content={children} exact />
+            <WrappedRoute path='/notifications/requests' component={NotificationRequests} content={children} exact />
+            <WrappedRoute path='/notifications/requests/:id' component={NotificationRequest} content={children} exact />
             <WrappedRoute path='/favourites' component={FavouritedStatuses} content={children} />
 
             <WrappedRoute path='/bookmarks' component={BookmarkedStatuses} content={children} />
diff --git a/app/javascript/mastodon/features/ui/util/async-components.js b/app/javascript/mastodon/features/ui/util/async-components.js
index 7b968204be3797..de9b6b40104308 100644
--- a/app/javascript/mastodon/features/ui/util/async-components.js
+++ b/app/javascript/mastodon/features/ui/util/async-components.js
@@ -189,3 +189,11 @@ export function About () {
 export function PrivacyPolicy () {
   return import(/*webpackChunkName: "features/privacy_policy" */'../../privacy_policy');
 }
+
+export function NotificationRequests () {
+  return import(/*webpackChunkName: "features/notifications/requests" */'../../notifications/requests');
+}
+
+export function NotificationRequest () {
+  return import(/*webpackChunkName: "features/notifications/request" */'../../notifications/request');
+}
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index 342b4c6e2599b2..aed3a3a6006979 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -241,6 +241,7 @@
   "empty_column.list": "There is nothing in this list yet. When members of this list publish new posts, they will appear here.",
   "empty_column.lists": "You don't have any lists yet. When you create one, it will show up here.",
   "empty_column.mutes": "You haven't muted any users yet.",
+  "empty_column.notification_requests": "All clear! There is nothing here. When you receive new notifications, they will appear here according to your settings.",
   "empty_column.notifications": "You don't have any notifications yet. When other people interact with you, you will see it here.",
   "empty_column.public": "There is nothing here! Write something publicly, or manually follow users from other servers to fill it up",
   "error.unexpected_crash.explanation": "Due to a bug in our code or a browser compatibility issue, this page could not be displayed correctly.",
@@ -271,6 +272,8 @@
   "filter_modal.select_filter.subtitle": "Use an existing category or create a new one",
   "filter_modal.select_filter.title": "Filter this post",
   "filter_modal.title.status": "Filter a post",
+  "filtered_notifications_banner.pending_requests": "Notifications from {count, plural, =0 {no} one {one person} other {# people}} you may know",
+  "filtered_notifications_banner.title": "Filtered notifications",
   "firehose.all": "All",
   "firehose.local": "This server",
   "firehose.remote": "Other servers",
@@ -314,7 +317,6 @@
   "hashtag.follow": "Follow hashtag",
   "hashtag.unfollow": "Unfollow hashtag",
   "hashtags.and_other": "…and {count, plural, other {# more}}",
-  "home.column_settings.basic": "Basic",
   "home.column_settings.show_reblogs": "Show boosts",
   "home.column_settings.show_replies": "Show replies",
   "home.hide_announcements": "Hide announcements",
@@ -440,15 +442,16 @@
   "notification.reblog": "{name} boosted your post",
   "notification.status": "{name} just posted",
   "notification.update": "{name} edited a post",
+  "notification_requests.accept": "Accept",
+  "notification_requests.dismiss": "Dismiss",
+  "notification_requests.notifications_from": "Notifications from {name}",
+  "notification_requests.title": "Filtered notifications",
   "notifications.clear": "Clear notifications",
   "notifications.clear_confirmation": "Are you sure you want to permanently clear all your notifications?",
   "notifications.column_settings.admin.report": "New reports:",
   "notifications.column_settings.admin.sign_up": "New sign-ups:",
   "notifications.column_settings.alert": "Desktop notifications",
   "notifications.column_settings.favourite": "Favorites:",
-  "notifications.column_settings.filter_bar.advanced": "Display all categories",
-  "notifications.column_settings.filter_bar.category": "Quick filter bar",
-  "notifications.column_settings.filter_bar.show_bar": "Show filter bar",
   "notifications.column_settings.follow": "New followers:",
   "notifications.column_settings.follow_request": "New follow requests:",
   "notifications.column_settings.mention": "Mentions:",
@@ -474,6 +477,15 @@
   "notifications.permission_denied": "Desktop notifications are unavailable due to previously denied browser permissions request",
   "notifications.permission_denied_alert": "Desktop notifications can't be enabled, as browser permission has been denied before",
   "notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
+  "notifications.policy.filter_new_accounts.hint": "Created within the past {days, plural, one {one day} other {# days}}",
+  "notifications.policy.filter_new_accounts_title": "New accounts",
+  "notifications.policy.filter_not_followers_hint": "Including people who have been following you fewer than {days, plural, one {one day} other {# days}}",
+  "notifications.policy.filter_not_followers_title": "People not following you",
+  "notifications.policy.filter_not_following_hint": "Until you manually approve them",
+  "notifications.policy.filter_not_following_title": "People you don't follow",
+  "notifications.policy.filter_private_mentions_hint": "Filtered unless it's in reply to your own mention or if you follow the sender",
+  "notifications.policy.filter_private_mentions_title": "Unsolicited private mentions",
+  "notifications.policy.title": "Filter out notifications from…",
   "notifications_permission_banner.enable": "Enable desktop notifications",
   "notifications_permission_banner.how_to_control": "To receive notifications when Mastodon isn't open, enable desktop notifications. You can control precisely which types of interactions generate desktop notifications through the {icon} button above once they're enabled.",
   "notifications_permission_banner.title": "Never miss a thing",
diff --git a/app/javascript/mastodon/reducers/index.ts b/app/javascript/mastodon/reducers/index.ts
index ecef63387377b5..51a76d191e57d3 100644
--- a/app/javascript/mastodon/reducers/index.ts
+++ b/app/javascript/mastodon/reducers/index.ts
@@ -27,6 +27,8 @@ import media_attachments from './media_attachments';
 import meta from './meta';
 import { modalReducer } from './modal';
 import mutes from './mutes';
+import { notificationPolicyReducer } from './notification_policy';
+import { notificationRequestsReducer } from './notification_requests';
 import notifications from './notifications';
 import picture_in_picture from './picture_in_picture';
 import polls from './polls';
@@ -84,6 +86,8 @@ const reducers = {
   history,
   tags,
   followed_tags,
+  notificationPolicy: notificationPolicyReducer,
+  notificationRequests: notificationRequestsReducer,
 };
 
 // We want the root state to be an ImmutableRecord, which is an object with a defined list of keys,
diff --git a/app/javascript/mastodon/reducers/notification_policy.js b/app/javascript/mastodon/reducers/notification_policy.js
new file mode 100644
index 00000000000000..8edb4d12a151ef
--- /dev/null
+++ b/app/javascript/mastodon/reducers/notification_policy.js
@@ -0,0 +1,12 @@
+import { fromJS } from 'immutable';
+
+import { NOTIFICATION_POLICY_FETCH_SUCCESS } from 'mastodon/actions/notifications';
+
+export const notificationPolicyReducer = (state = null, action) => {
+  switch(action.type) {
+  case NOTIFICATION_POLICY_FETCH_SUCCESS:
+    return fromJS(action.policy);
+  default:
+    return state;
+  }
+};
diff --git a/app/javascript/mastodon/reducers/notification_requests.js b/app/javascript/mastodon/reducers/notification_requests.js
new file mode 100644
index 00000000000000..4247062a582704
--- /dev/null
+++ b/app/javascript/mastodon/reducers/notification_requests.js
@@ -0,0 +1,96 @@
+import { Map as ImmutableMap, List as ImmutableList, fromJS } from 'immutable';
+
+import {
+  NOTIFICATION_REQUESTS_EXPAND_REQUEST,
+  NOTIFICATION_REQUESTS_EXPAND_SUCCESS,
+  NOTIFICATION_REQUESTS_EXPAND_FAIL,
+  NOTIFICATION_REQUESTS_FETCH_REQUEST,
+  NOTIFICATION_REQUESTS_FETCH_SUCCESS,
+  NOTIFICATION_REQUESTS_FETCH_FAIL,
+  NOTIFICATION_REQUEST_FETCH_REQUEST,
+  NOTIFICATION_REQUEST_FETCH_SUCCESS,
+  NOTIFICATION_REQUEST_FETCH_FAIL,
+  NOTIFICATION_REQUEST_ACCEPT_REQUEST,
+  NOTIFICATION_REQUEST_DISMISS_REQUEST,
+  NOTIFICATIONS_FOR_REQUEST_FETCH_REQUEST,
+  NOTIFICATIONS_FOR_REQUEST_FETCH_SUCCESS,
+  NOTIFICATIONS_FOR_REQUEST_FETCH_FAIL,
+  NOTIFICATIONS_FOR_REQUEST_EXPAND_REQUEST,
+  NOTIFICATIONS_FOR_REQUEST_EXPAND_SUCCESS,
+  NOTIFICATIONS_FOR_REQUEST_EXPAND_FAIL,
+} from 'mastodon/actions/notifications';
+
+import { notificationToMap } from './notifications';
+
+const initialState = ImmutableMap({
+  items: ImmutableList(),
+  isLoading: false,
+  next: null,
+  current: ImmutableMap({
+    isLoading: false,
+    item: null,
+    removed: false,
+    notifications: ImmutableMap({
+      items: ImmutableList(),
+      isLoading: false,
+      next: null,
+    }),
+  }),
+});
+
+const normalizeRequest = request => fromJS({
+  ...request,
+  account: request.account.id,
+});
+
+const removeRequest = (state, id) => {
+  if (state.getIn(['current', 'item', 'id']) === id) {
+    state = state.setIn(['current', 'removed'], true);
+  }
+
+  return state.update('items', list => list.filterNot(item => item.get('id') === id));
+};
+
+export const notificationRequestsReducer = (state = initialState, action) => {
+  switch(action.type) {
+  case NOTIFICATION_REQUESTS_FETCH_SUCCESS:
+    return state.withMutations(map => {
+      map.update('items', list => ImmutableList(action.requests.map(normalizeRequest)).concat(list));
+      map.set('isLoading', false);
+      map.update('next', next => next ?? action.next);
+    });
+  case NOTIFICATION_REQUESTS_EXPAND_SUCCESS:
+    return state.withMutations(map => {
+      map.update('items', list => list.concat(ImmutableList(action.requests.map(normalizeRequest))));
+      map.set('isLoading', false);
+      map.set('next', action.next);
+    });
+  case NOTIFICATION_REQUESTS_EXPAND_REQUEST:
+  case NOTIFICATION_REQUESTS_FETCH_REQUEST:
+    return state.set('isLoading', true);
+  case NOTIFICATION_REQUESTS_EXPAND_FAIL:
+  case NOTIFICATION_REQUESTS_FETCH_FAIL:
+    return state.set('isLoading', false);
+  case NOTIFICATION_REQUEST_ACCEPT_REQUEST:
+  case NOTIFICATION_REQUEST_DISMISS_REQUEST:
+    return removeRequest(state, action.id);
+  case NOTIFICATION_REQUEST_FETCH_REQUEST:
+    return state.set('current', initialState.get('current').set('isLoading', true));
+  case NOTIFICATION_REQUEST_FETCH_SUCCESS:
+    return state.update('current', map => map.set('isLoading', false).set('item', normalizeRequest(action.request)));
+  case NOTIFICATION_REQUEST_FETCH_FAIL:
+    return state.update('current', map => map.set('isLoading', false));
+  case NOTIFICATIONS_FOR_REQUEST_FETCH_REQUEST:
+  case NOTIFICATIONS_FOR_REQUEST_EXPAND_REQUEST:
+    return state.setIn(['current', 'notifications', 'isLoading'], true);
+  case NOTIFICATIONS_FOR_REQUEST_FETCH_SUCCESS:
+    return state.updateIn(['current', 'notifications'], map => map.set('isLoading', false).update('items', list => ImmutableList(action.notifications.map(notificationToMap)).concat(list)).update('next', next => next ?? action.next));
+  case NOTIFICATIONS_FOR_REQUEST_EXPAND_SUCCESS:
+    return state.updateIn(['current', 'notifications'], map => map.set('isLoading', false).update('items', list => list.concat(ImmutableList(action.notifications.map(notificationToMap)))).set('next', action.next));
+  case NOTIFICATIONS_FOR_REQUEST_FETCH_FAIL:
+  case NOTIFICATIONS_FOR_REQUEST_EXPAND_FAIL:
+    return state.setIn(['current', 'notifications', 'isLoading'], false);
+  default:
+    return state;
+  }
+};
diff --git a/app/javascript/mastodon/reducers/notifications.js b/app/javascript/mastodon/reducers/notifications.js
index 2ca301b19a6718..b1c80b3d4fdd47 100644
--- a/app/javascript/mastodon/reducers/notifications.js
+++ b/app/javascript/mastodon/reducers/notifications.js
@@ -48,7 +48,7 @@ const initialState = ImmutableMap({
   browserPermission: 'default',
 });
 
-const notificationToMap = notification => ImmutableMap({
+export const notificationToMap = notification => ImmutableMap({
   id: notification.id,
   type: notification.type,
   account: notification.account.id,
diff --git a/app/javascript/mastodon/utils/numbers.ts b/app/javascript/mastodon/utils/numbers.ts
index 0a73061f69b616..ee2dabf56684b4 100644
--- a/app/javascript/mastodon/utils/numbers.ts
+++ b/app/javascript/mastodon/utils/numbers.ts
@@ -69,3 +69,11 @@ export function pluralReady(
 export function roundTo10(num: number): number {
   return Math.round(num * 0.1) / 0.1;
 }
+
+export function toCappedNumber(num: string): string {
+  if (parseInt(num) > 99) {
+    return '99+';
+  } else {
+    return num;
+  }
+}
diff --git a/app/javascript/material-icons/400-24px/archive-fill.svg b/app/javascript/material-icons/400-24px/archive-fill.svg
new file mode 100644
index 00000000000000..bb604288f5bd9b
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/archive-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="m480-240 160-160-56-56-64 64v-168h-80v168l-64-64-56 56 160 160ZM200-120q-33 0-56.5-23.5T120-200v-499q0-14 4.5-27t13.5-24l50-61q11-14 27.5-21.5T250-840h460q18 0 34.5 7.5T772-811l50 61q9 11 13.5 24t4.5 27v499q0 33-23.5 56.5T760-120H200Zm16-600h528l-34-40H250l-34 40Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/archive.svg b/app/javascript/material-icons/400-24px/archive.svg
new file mode 100644
index 00000000000000..6b72fca4ee700d
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/archive.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="m480-240 160-160-56-56-64 64v-168h-80v168l-64-64-56 56 160 160ZM200-640v440h560v-440H200Zm0 520q-33 0-56.5-23.5T120-200v-499q0-14 4.5-27t13.5-24l50-61q11-14 27.5-21.5T250-840h460q18 0 34.5 7.5T772-811l50 61q9 11 13.5 24t4.5 27v499q0 33-23.5 56.5T760-120H200Zm16-600h528l-34-40H250l-34 40Zm264 300Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 6d79a843d8f4a3..faa775ec4b583f 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -3289,12 +3289,13 @@ $ui-header-height: 55px;
   border: 0;
   border-bottom: 1px solid lighten($ui-base-color, 8%);
   text-align: unset;
-  padding: 15px;
+  padding: 13px;
   margin: 0;
   z-index: 3;
   outline: 0;
   display: flex;
   align-items: center;
+  gap: 5px;
 
   &:hover {
     text-decoration: underline;
@@ -3304,6 +3305,7 @@ $ui-header-height: 55px;
 .column-header__back-button {
   display: flex;
   align-items: center;
+  gap: 5px;
   background: $ui-base-color;
   border: 0;
   font-family: inherit;
@@ -3311,23 +3313,19 @@ $ui-header-height: 55px;
   cursor: pointer;
   white-space: nowrap;
   font-size: 16px;
-  padding: 0 5px 0 0;
+  padding: 13px;
   z-index: 3;
 
   &:hover {
     text-decoration: underline;
   }
 
-  &:last-child {
-    padding: 0 15px 0 0;
+  &.compact {
+    padding-inline-end: 5px;
+    flex: 0 0 auto;
   }
 }
 
-.column-back-button__icon {
-  display: inline-block;
-  margin-inline-end: 5px;
-}
-
 .react-toggle {
   display: inline-block;
   position: relative;
@@ -4013,7 +4011,7 @@ a.status-card {
   z-index: 2;
   outline: 0;
 
-  & > button {
+  &__title {
     display: flex;
     align-items: center;
     gap: 5px;
@@ -4035,8 +4033,18 @@ a.status-card {
     }
   }
 
-  & > .column-header__back-button {
+  .column-header__back-button + &__title {
+    padding-inline-start: 0;
+  }
+
+  .column-header__back-button {
+    flex: 1;
     color: $highlight-text-color;
+
+    &.compact {
+      flex: 0 0 auto;
+      color: $primary-text-color;
+    }
   }
 
   &.active {
@@ -4050,6 +4058,18 @@ a.status-card {
   &:active {
     outline: 0;
   }
+
+  &__advanced-buttons {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 16px;
+    padding-top: 0;
+
+    &:first-child {
+      padding-top: 16px;
+    }
+  }
 }
 
 .column-header__buttons {
@@ -4136,7 +4156,6 @@ a.status-card {
 
 .column-header__collapsible-inner {
   background: $ui-base-color;
-  padding: 15px;
 }
 
 .column-header__setting-btn {
@@ -4158,20 +4177,8 @@ a.status-card {
 }
 
 .column-header__setting-arrows {
-  float: right;
-
-  .column-header__setting-btn {
-    padding: 5px;
-
-    &:first-child {
-      padding-inline-end: 7px;
-    }
-
-    &:last-child {
-      padding-inline-start: 7px;
-      margin-inline-start: 5px;
-    }
-  }
+  display: flex;
+  align-items: center;
 }
 
 .text-btn {
@@ -4408,24 +4415,56 @@ a.status-card {
   text-align: center;
 }
 
-.column-settings__outer {
-  background: lighten($ui-base-color, 8%);
-  padding: 15px;
-}
+.column-settings {
+  display: flex;
+  flex-direction: column;
 
-.column-settings__section {
-  color: $darker-text-color;
-  cursor: default;
-  display: block;
-  font-weight: 500;
-  margin-bottom: 10px;
-}
+  &__section {
+    // FIXME: Legacy
+    color: $darker-text-color;
+    cursor: default;
+    display: block;
+    font-weight: 500;
+  }
 
-.column-settings__row--with-margin {
-  margin-bottom: 15px;
+  .column-header__links {
+    margin: 0;
+  }
+
+  section {
+    padding: 16px;
+    border-bottom: 1px solid lighten($ui-base-color, 8%);
+
+    &:last-child {
+      border-bottom: 0;
+    }
+  }
+
+  h3 {
+    font-size: 16px;
+    line-height: 24px;
+    letter-spacing: 0.5px;
+    font-weight: 500;
+    color: $primary-text-color;
+    margin-bottom: 16px;
+  }
+
+  &__row {
+    display: flex;
+    flex-direction: column;
+    gap: 12px;
+  }
+
+  .app-form__toggle {
+    &__toggle > div {
+      border: 0;
+    }
+  }
 }
 
 .column-settings__hashtags {
+  margin-top: 15px;
+
   .column-settings__row {
     margin-bottom: 15px;
   }
@@ -4549,16 +4588,13 @@ a.status-card {
 }
 
 .setting-toggle {
-  display: block;
-  line-height: 24px;
+  display: flex;
+  align-items: center;
+  gap: 8px;
 }
 
 .setting-toggle__label {
   color: $darker-text-color;
-  display: inline-block;
-  margin-bottom: 14px;
-  margin-inline-start: 8px;
-  vertical-align: middle;
 }
 
 .limited-account-hint {
@@ -6949,29 +6985,33 @@ a.status-card {
   background: $ui-base-color;
 
   &__column {
-    padding: 10px 15px;
-    padding-bottom: 0;
+    display: flex;
+    flex-direction: column;
+    gap: 15px;
+    padding: 15px;
   }
 
   .radio-button {
-    display: block;
+    display: flex;
   }
 }
 
 .column-settings__row .radio-button {
-  display: block;
+  display: flex;
 }
 
 .radio-button {
   font-size: 14px;
   position: relative;
-  display: inline-block;
-  padding: 6px 0;
+  display: inline-flex;
+  align-items: center;
   line-height: 18px;
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
   cursor: pointer;
+  gap: 10px;
+  color: $secondary-text-color;
 
   input[type='radio'],
   input[type='checkbox'] {
@@ -6979,21 +7019,29 @@ a.status-card {
   }
 
   &__input {
-    display: inline-block;
+    display: block;
     position: relative;
-    border: 1px solid $ui-primary-color;
+    border: 2px solid $secondary-text-color;
     box-sizing: border-box;
     width: 18px;
     height: 18px;
     flex: 0 0 auto;
-    margin-inline-end: 10px;
-    top: -1px;
     border-radius: 50%;
-    vertical-align: middle;
 
     &.checked {
-      border-color: lighten($ui-highlight-color, 4%);
-      background: lighten($ui-highlight-color, 4%);
+      border-color: $secondary-text-color;
+
+      &::before {
+        position: absolute;
+        left: 2px;
+        top: 2px;
+        content: '';
+        display: block;
+        border-radius: 50%;
+        width: 10px;
+        height: 10px;
+        background: $secondary-text-color;
+      }
     }
   }
 }
@@ -9588,3 +9636,110 @@ noscript {
     }
   }
 }
+
+.filtered-notifications-banner {
+  display: flex;
+  align-items: center;
+  background: $ui-base-color;
+  border-bottom: 1px solid lighten($ui-base-color, 8%);
+  padding: 15px;
+  gap: 15px;
+  color: $darker-text-color;
+  text-decoration: none;
+
+  &:hover,
+  &:active,
+  &:focus {
+    color: $secondary-text-color;
+
+    .filtered-notifications-banner__badge {
+      background: $secondary-text-color;
+    }
+  }
+
+  .icon {
+    width: 24px;
+    height: 24px;
+  }
+
+  &__text {
+    flex: 1 1 auto;
+    font-style: 14px;
+    line-height: 20px;
+
+    strong {
+      font-size: 16px;
+      line-height: 24px;
+      display: block;
+    }
+  }
+
+  &__badge {
+    background: $darker-text-color;
+    color: $ui-base-color;
+    border-radius: 100px;
+    padding: 2px 8px;
+    font-weight: 500;
+    font-size: 11px;
+    line-height: 16px;
+  }
+}
+
+.notification-request {
+  display: flex;
+  align-items: center;
+  gap: 16px;
+  padding: 15px;
+  border-bottom: 1px solid lighten($ui-base-color, 8%);
+
+  &__link {
+    display: flex;
+    align-items: center;
+    gap: 12px;
+    flex: 1 1 auto;
+    text-decoration: none;
+    color: inherit;
+    overflow: hidden;
+
+    .account__avatar {
+      flex-shrink: 0;
+    }
+  }
+
+  &__name {
+    flex: 1 1 auto;
+    color: $darker-text-color;
+    font-style: 14px;
+    line-height: 20px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+
+    &__display-name {
+      display: flex;
+      align-items: center;
+      gap: 6px;
+      font-size: 16px;
+      letter-spacing: 0.5px;
+      line-height: 24px;
+      color: $secondary-text-color;
+    }
+
+    .filtered-notifications-banner__badge {
+      background-color: $highlight-text-color;
+      border-radius: 4px;
+      padding: 1px 6px;
+    }
+  }
+
+  &__actions {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+
+    .icon-button {
+      border-radius: 4px;
+      border: 1px solid lighten($ui-base-color, 8%);
+      padding: 5px;
+    }
+  }
+}
diff --git a/app/javascript/styles/mastodon/forms.scss b/app/javascript/styles/mastodon/forms.scss
index 3ac5c3df959298..f6ec44fb5380fa 100644
--- a/app/javascript/styles/mastodon/forms.scss
+++ b/app/javascript/styles/mastodon/forms.scss
@@ -1313,6 +1313,12 @@ code {
         font-weight: 600;
       }
 
+      .hint {
+        display: block;
+        font-size: 14px;
+        color: $darker-text-color;
+      }
+
       .recommended {
         position: absolute;
         margin: 0 4px;
diff --git a/app/models/notification_request.rb b/app/models/notification_request.rb
index 7ae7e46d1b8339..6901b3985b9118 100644
--- a/app/models/notification_request.rb
+++ b/app/models/notification_request.rb
@@ -48,6 +48,6 @@ def reconsider_existence!
   private
 
   def prepare_notifications_count
-    self.notifications_count = Notification.where(account: account, from_account: from_account).limit(MAX_MEANINGFUL_COUNT).count
+    self.notifications_count = Notification.where(account: account, from_account: from_account, filtered: true).limit(MAX_MEANINGFUL_COUNT).count
   end
 end
diff --git a/config/routes.rb b/config/routes.rb
index 51c10a14f6e6a6..2ec7494969fa89 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -27,7 +27,7 @@ def redirect_with_vary(path)
     /public/remote
     /conversations
     /lists/(*any)
-    /notifications
+    /notifications/(*any)
     /favourites
     /bookmarks
     /pinned
diff --git a/config/routes/api.rb b/config/routes/api.rb
index 18a247e9fde678..07340a634063c6 100644
--- a/config/routes/api.rb
+++ b/config/routes/api.rb
@@ -151,7 +151,7 @@
     end
 
     namespace :notifications do
-      resources :requests, only: :index do
+      resources :requests, only: [:index, :show] do
         member do
           post :accept
           post :dismiss
diff --git a/spec/models/notification_policy_spec.rb b/spec/models/notification_policy_spec.rb
index bbfa548cf4b5c4..cfd8e85edad4df 100644
--- a/spec/models/notification_policy_spec.rb
+++ b/spec/models/notification_policy_spec.rb
@@ -9,7 +9,7 @@
     let(:sender) { Fabricate(:account) }
 
     before do
-      Fabricate.times(2, :notification, account: subject.account, activity: Fabricate(:status, account: sender))
+      Fabricate.times(2, :notification, account: subject.account, activity: Fabricate(:status, account: sender), filtered: true)
       Fabricate(:notification_request, account: subject.account, from_account: sender)
       subject.summarize!
     end
diff --git a/spec/models/notification_request_spec.rb b/spec/models/notification_request_spec.rb
index f4613aaedeb3b7..07bbc3e0a8e7e9 100644
--- a/spec/models/notification_request_spec.rb
+++ b/spec/models/notification_request_spec.rb
@@ -10,7 +10,7 @@
 
     context 'when there are remaining notifications' do
       before do
-        Fabricate(:notification, account: subject.account, activity: Fabricate(:status, account: subject.from_account))
+        Fabricate(:notification, account: subject.account, activity: Fabricate(:status, account: subject.from_account), filtered: true)
         subject.reconsider_existence!
       end
 

From a38e4241851b71a979200e0090b014d13aae2908 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 11 Mar 2024 11:14:55 -0400
Subject: [PATCH 0395/2191] Use unchanging github links in docs/comments
 (#29545)

---
 .eslintrc.js                                 |  4 ++--
 Dockerfile                                   |  2 +-
 config/initializers/open_redirects.rb        | 11 ++++-------
 lib/mastodon/migration_helpers.rb            |  3 ++-
 spec/config/initializers/rack/attack_spec.rb |  2 +-
 spec/controllers/.rubocop.yml                |  4 ++--
 6 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index bd818c3ce4b171..502b9cefed87c6 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -123,7 +123,7 @@ module.exports = defineConfig({
     'react/react-in-jsx-scope': 'off', // not needed with new JSX transform
     'react/self-closing-comp': 'error',
 
-    // recommended values found in https://github.com/jsx-eslint/eslint-plugin-jsx-a11y/blob/main/src/index.js
+    // recommended values found in https://github.com/jsx-eslint/eslint-plugin-jsx-a11y/blob/v6.8.0/src/index.js#L46
     'jsx-a11y/accessible-emoji': 'warn',
     'jsx-a11y/click-events-have-key-events': 'off',
     'jsx-a11y/label-has-associated-control': 'off',
@@ -176,7 +176,7 @@ module.exports = defineConfig({
       },
     ],
 
-    // See https://github.com/import-js/eslint-plugin-import/blob/main/config/recommended.js
+    // See https://github.com/import-js/eslint-plugin-import/blob/v2.29.1/config/recommended.js
     'import/extensions': [
       'error',
       'always',
diff --git a/Dockerfile b/Dockerfile
index 119c266b890da9..facd9b8aa0c77d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -29,7 +29,7 @@ ARG MASTODON_VERSION_METADATA=""
 # See: https://docs.joinmastodon.org/admin/config/#rails_serve_static_files
 ARG RAILS_SERVE_STATIC_FILES="true"
 # Allow to use YJIT compiler
-# See: https://github.com/ruby/ruby/blob/master/doc/yjit/yjit.md
+# See: https://github.com/ruby/ruby/blob/v3_2_3/doc/yjit/yjit.md
 ARG RUBY_YJIT_ENABLE="1"
 # Timezone used by the Docker container and runtime, change with [--build-arg TZ=Europe/Berlin]
 ARG TZ="Etc/UTC"
diff --git a/config/initializers/open_redirects.rb b/config/initializers/open_redirects.rb
index c953a990c6646b..1c5a66e07dc4b7 100644
--- a/config/initializers/open_redirects.rb
+++ b/config/initializers/open_redirects.rb
@@ -1,10 +1,7 @@
 # frozen_string_literal: true
 
-# TODO
-# Starting with Rails 7.0, the framework default here is to set this true.
-# However, we have a location in devise that redirects where we don't have an
-# easy ability to override the method or set a config option, and where the
-# redirect does not supply this option itself.
-# https://github.com/heartcombo/devise/blob/v4.9.2/app/controllers/devise/confirmations_controller.rb#L28
-# Once a solution is found, this line can be removed.
+# TODO: Starting with Rails 7.0, the framework default is true for this setting.
+# This location in devise redirects and we can't hook in or override:
+# https://github.com/heartcombo/devise/blob/v4.9.3/app/controllers/devise/confirmations_controller.rb#L28
+# When solution is found, this setting can go back to default.
 Rails.application.config.action_controller.raise_on_open_redirects = false
diff --git a/lib/mastodon/migration_helpers.rb b/lib/mastodon/migration_helpers.rb
index a713f42d419e50..9997e4252318e2 100644
--- a/lib/mastodon/migration_helpers.rb
+++ b/lib/mastodon/migration_helpers.rb
@@ -743,7 +743,8 @@ def check_trigger_permissions!(table)
 
     private
 
-    # https://github.com/rails/rails/blob/v5.2.0/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb#L678-L684
+    # Private method copied from:
+    # https://github.com/rails/rails/blob/v7.1.3.2/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb#L974-L980
     def extract_foreign_key_action(specifier)
       case specifier
       when 'c'; :cascade
diff --git a/spec/config/initializers/rack/attack_spec.rb b/spec/config/initializers/rack/attack_spec.rb
index c9ce9e27d023a9..e25b7dfde9422e 100644
--- a/spec/config/initializers/rack/attack_spec.rb
+++ b/spec/config/initializers/rack/attack_spec.rb
@@ -13,7 +13,7 @@ def app
       # to avoid crossing period boundaries.
 
       # The code Rack::Attack uses to set periods is the following:
-      # https://github.com/rack/rack-attack/blob/v6.6.1/lib/rack/attack/cache.rb#L64-L66
+      # https://github.com/rack/rack-attack/blob/v6.7.0/lib/rack/attack/cache.rb#L70-L72
       # So we want to minimize `Time.now.to_i % period`
 
       travel_to Time.zone.at(counter_prefix * period.seconds)
diff --git a/spec/controllers/.rubocop.yml b/spec/controllers/.rubocop.yml
index 525479be81c5f3..51d7c23de1b40e 100644
--- a/spec/controllers/.rubocop.yml
+++ b/spec/controllers/.rubocop.yml
@@ -1,6 +1,6 @@
 inherit_from: ../../.rubocop.yml
 
-# Anonymous controllers in specs cannot access described_class
-# https://github.com/rubocop/rubocop-rspec/blob/master/lib/rubocop/cop/rspec/described_class.rb#L36-L39
+# Anonymous controllers in specs cannot access `described_class`, explanation:
+# https://github.com/rubocop/rubocop-rspec/blob/v2.26.1/lib/rubocop/cop/rspec/described_class.rb#L36-L56
 RSpec/DescribedClass:
   SkipBlocks: true

From 24319836de6046fb2985ec1a24c30ad7d47584d7 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 11 Mar 2024 11:46:25 -0400
Subject: [PATCH 0396/2191] Convert request-based setup into factory setup in
 push/subscriptions request spec (#29489)

---
 .../api/v1/push/subscriptions_spec.rb         | 94 ++++++++++++-------
 1 file changed, 58 insertions(+), 36 deletions(-)

diff --git a/spec/requests/api/v1/push/subscriptions_spec.rb b/spec/requests/api/v1/push/subscriptions_spec.rb
index d699fd1e08503a..700250ee2ac0b9 100644
--- a/spec/requests/api/v1/push/subscriptions_spec.rb
+++ b/spec/requests/api/v1/push/subscriptions_spec.rb
@@ -37,66 +37,88 @@
   let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
 
   describe 'POST /api/v1/push/subscription' do
-    before do
-      post '/api/v1/push/subscription', params: create_payload, headers: headers
-    end
-
-    it 'saves push subscriptions' do
-      push_subscription = Web::PushSubscription.find_by(endpoint: create_payload[:subscription][:endpoint])
-
-      expect(push_subscription.endpoint).to eq(create_payload[:subscription][:endpoint])
-      expect(push_subscription.key_p256dh).to eq(create_payload[:subscription][:keys][:p256dh])
-      expect(push_subscription.key_auth).to eq(create_payload[:subscription][:keys][:auth])
-      expect(push_subscription.user_id).to eq user.id
-      expect(push_subscription.access_token_id).to eq token.id
-    end
-
-    it 'replaces old subscription on repeat calls' do
-      post '/api/v1/push/subscription', params: create_payload, headers: headers
-
-      expect(Web::PushSubscription.where(endpoint: create_payload[:subscription][:endpoint]).count).to eq 1
-    end
+    subject { post '/api/v1/push/subscription', params: create_payload, headers: headers }
+
+    it 'saves push subscriptions and returns expected JSON' do
+      subject
+
+      expect(endpoint_push_subscription)
+        .to have_attributes(
+          endpoint: eq(create_payload[:subscription][:endpoint]),
+          key_p256dh: eq(create_payload[:subscription][:keys][:p256dh]),
+          key_auth: eq(create_payload[:subscription][:keys][:auth]),
+          user_id: eq(user.id),
+          access_token_id: eq(token.id)
+        )
 
-    it 'returns the expected JSON' do
       expect(body_as_json.with_indifferent_access)
         .to include(
           { endpoint: create_payload[:subscription][:endpoint], alerts: {}, policy: 'all' }
         )
     end
+
+    it 'replaces old subscription on repeat calls' do
+      2.times { subject }
+
+      expect(endpoint_push_subscriptions.count)
+        .to eq(1)
+    end
   end
 
   describe 'PUT /api/v1/push/subscription' do
-    before do
-      post '/api/v1/push/subscription', params: create_payload, headers: headers
-      put '/api/v1/push/subscription', params: alerts_payload, headers: headers
-    end
+    subject { put '/api/v1/push/subscription', params: alerts_payload, headers: headers }
 
-    it 'changes alert settings' do
-      push_subscription = Web::PushSubscription.find_by(endpoint: create_payload[:subscription][:endpoint])
+    before { create_subscription_with_token }
 
-      expect(push_subscription.data['policy']).to eq(alerts_payload[:data][:policy])
+    it 'changes data policy and alert settings and returns expected JSON' do
+      expect { subject }
+        .to change { endpoint_push_subscription.reload.data }
+        .from(nil)
+        .to(include('policy' => alerts_payload[:data][:policy]))
 
       %w(follow follow_request favourite reblog mention poll status).each do |type|
-        expect(push_subscription.data['alerts'][type]).to eq(alerts_payload[:data][:alerts][type.to_sym].to_s)
+        expect(endpoint_push_subscription.data['alerts']).to include(
+          type.to_s => eq(alerts_payload[:data][:alerts][type.to_sym].to_s)
+        )
       end
-    end
 
-    it 'returns the expected JSON' do
       expect(body_as_json.with_indifferent_access)
         .to include(
-          { endpoint: create_payload[:subscription][:endpoint], alerts: alerts_payload[:data][:alerts], policy: alerts_payload[:data][:policy] }
+          endpoint: create_payload[:subscription][:endpoint],
+          alerts: alerts_payload[:data][:alerts],
+          policy: alerts_payload[:data][:policy]
         )
     end
   end
 
   describe 'DELETE /api/v1/push/subscription' do
-    before do
-      post '/api/v1/push/subscription', params: create_payload, headers: headers
-      delete '/api/v1/push/subscription', headers: headers
-    end
+    subject { delete '/api/v1/push/subscription', headers: headers }
+
+    before { create_subscription_with_token }
 
     it 'removes the subscription' do
-      expect(Web::PushSubscription.find_by(endpoint: create_payload[:subscription][:endpoint])).to be_nil
+      expect { subject }
+        .to change { endpoint_push_subscription }.to(nil)
     end
   end
+
+  private
+
+  def endpoint_push_subscriptions
+    Web::PushSubscription.where(
+      endpoint: create_payload[:subscription][:endpoint]
+    )
+  end
+
+  def endpoint_push_subscription
+    endpoint_push_subscriptions.first
+  end
+
+  def create_subscription_with_token
+    Fabricate(
+      :web_push_subscription,
+      endpoint: create_payload[:subscription][:endpoint],
+      access_token_id: token.id
+    )
+  end
 end

From 777510a69640b86ee76be83b3bad76ecb63e385e Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 11 Mar 2024 09:57:07 +0100
Subject: [PATCH 0397/2191] [Glitch] Add hints for rules

Port 5b3a8737d6fa84c91e5158c34170f488df9ad313 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/features/about/index.jsx | 3 ++-
 app/javascript/flavours/glitch/styles/about.scss        | 6 ++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/javascript/flavours/glitch/features/about/index.jsx b/app/javascript/flavours/glitch/features/about/index.jsx
index 623f89ed3d8c3e..a201dd5f2810fe 100644
--- a/app/javascript/flavours/glitch/features/about/index.jsx
+++ b/app/javascript/flavours/glitch/features/about/index.jsx
@@ -170,7 +170,8 @@ class About extends PureComponent {
               <ol className='rules-list'>
                 {server.get('rules').map(rule => (
                   <li key={rule.get('id')}>
-                    <span className='rules-list__text'>{rule.get('text')}</span>
+                    <div className='rules-list__text'>{rule.get('text')}</div>
+                    {rule.get('hint').length > 0 && (<div className='rules-list__hint'>{rule.get('hint')}</div>)}
                   </li>
                 ))}
               </ol>
diff --git a/app/javascript/flavours/glitch/styles/about.scss b/app/javascript/flavours/glitch/styles/about.scss
index 0f02563b48d31e..9d23ef41abdb47 100644
--- a/app/javascript/flavours/glitch/styles/about.scss
+++ b/app/javascript/flavours/glitch/styles/about.scss
@@ -53,4 +53,10 @@ $fluid-breakpoint: $maximum-width + 20px;
       border-bottom: 0;
     }
   }
+
+  &__hint {
+    font-size: 14px;
+    font-weight: 400;
+    color: $darker-text-color;
+  }
 }

From efbc8cba17a680ac983b64236b030f814b27ab2c Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 11 Mar 2024 09:57:23 +0100
Subject: [PATCH 0398/2191] [Glitch] Change dropdown menu icon to not be
 replaced by close icon when open in web UI

Port 2347ea813e5be2ecf762c8a275373a3e2bea56e8 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/components/dropdown_menu.jsx | 3 +--
 app/javascript/flavours/glitch/features/ui/index.jsx        | 6 ++----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/app/javascript/flavours/glitch/components/dropdown_menu.jsx b/app/javascript/flavours/glitch/components/dropdown_menu.jsx
index 4d9c34a7628227..26c828fd64f96c 100644
--- a/app/javascript/flavours/glitch/components/dropdown_menu.jsx
+++ b/app/javascript/flavours/glitch/components/dropdown_menu.jsx
@@ -9,7 +9,6 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import { supportsPassiveEvents } from 'detect-passive-events';
 import Overlay from 'react-overlays/Overlay';
 
-import CloseIcon from '@/material-icons/400-24px/close.svg?react';
 import { CircularProgress } from 'flavours/glitch/components/circular_progress';
 import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router';
 
@@ -298,7 +297,7 @@ class Dropdown extends PureComponent {
     }) : (
       <IconButton
         icon={!open ? icon : 'close'}
-        iconComponent={!open ? iconComponent : CloseIcon}
+        iconComponent={iconComponent}
         title={title}
         active={open}
         disabled={disabled}
diff --git a/app/javascript/flavours/glitch/features/ui/index.jsx b/app/javascript/flavours/glitch/features/ui/index.jsx
index 88829662136c3b..f847bf644875e0 100644
--- a/app/javascript/flavours/glitch/features/ui/index.jsx
+++ b/app/javascript/flavours/glitch/features/ui/index.jsx
@@ -83,7 +83,6 @@ const mapStateToProps = state => ({
   hasMediaAttachments: state.getIn(['compose', 'media_attachments']).size > 0,
   canUploadMore: !state.getIn(['compose', 'media_attachments']).some(x => ['audio', 'video'].includes(x.get('type'))) && state.getIn(['compose', 'media_attachments']).size < 4,
   isWide: state.getIn(['local_settings', 'stretch']),
-  dropdownMenuIsOpen: state.dropdownMenu.openId !== null,
   unreadNotifications: state.getIn(['notifications', 'unread']),
   showFaviconBadge: state.getIn(['local_settings', 'notifications', 'favicon_badge']),
   hicolorPrivacyIcons: state.getIn(['local_settings', 'hicolor_privacy_icons']),
@@ -274,7 +273,6 @@ class UI extends PureComponent {
     hasMediaAttachments: PropTypes.bool,
     canUploadMore: PropTypes.bool,
     intl: PropTypes.object.isRequired,
-    dropdownMenuIsOpen: PropTypes.bool,
     unreadNotifications: PropTypes.number,
     showFaviconBadge: PropTypes.bool,
     hicolorPrivacyIcons: PropTypes.bool,
@@ -600,7 +598,7 @@ class UI extends PureComponent {
 
   render () {
     const { draggingOver } = this.state;
-    const { children, isWide, location, dropdownMenuIsOpen, layout, moved } = this.props;
+    const { children, isWide, location, layout, moved } = this.props;
 
     const className = classNames('ui', {
       'wide': isWide,
@@ -632,7 +630,7 @@ class UI extends PureComponent {
 
     return (
       <HotKeys keyMap={keyMap} handlers={handlers} ref={this.setHotkeysRef} attach={window} focused>
-        <div className={className} ref={this.setRef} style={{ pointerEvents: dropdownMenuIsOpen ? 'none' : null }}>
+        <div className={className} ref={this.setRef}>
           {moved && (<div className='flash-message alert'>
             <FormattedMessage
               id='moved_to_warning'

From 64406519769684e5a6aa9d188708af16a78b5a19 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Mon, 11 Mar 2024 10:13:35 +0100
Subject: [PATCH 0399/2191] [Glitch] Use the server setting to get the max
 number of poll options in UI

Port b9722dfe2bdb024e5e98b96d2fc5712d6cb5f747 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/actions/compose.js         | 3 ++-
 .../glitch/features/compose/components/poll_form.jsx      | 5 +++--
 app/javascript/flavours/glitch/reducers/compose.js        | 8 ++++----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/javascript/flavours/glitch/actions/compose.js b/app/javascript/flavours/glitch/actions/compose.js
index 9e65df7b3902de..2646aa7b02471f 100644
--- a/app/javascript/flavours/glitch/actions/compose.js
+++ b/app/javascript/flavours/glitch/actions/compose.js
@@ -822,11 +822,12 @@ export function addPollOption(title) {
   };
 }
 
-export function changePollOption(index, title) {
+export function changePollOption(index, title, maxOptions) {
   return {
     type: COMPOSE_POLL_OPTION_CHANGE,
     index,
     title,
+    maxOptions,
   };
 }
 
diff --git a/app/javascript/flavours/glitch/features/compose/components/poll_form.jsx b/app/javascript/flavours/glitch/features/compose/components/poll_form.jsx
index e757b9162a4c13..361522d7b48d57 100644
--- a/app/javascript/flavours/glitch/features/compose/components/poll_form.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/poll_form.jsx
@@ -59,10 +59,11 @@ const Option = ({ multipleChoice, index, title, autoFocus }) => {
   const dispatch = useDispatch();
   const suggestions = useSelector(state => state.getIn(['compose', 'suggestions']));
   const lang = useSelector(state => state.getIn(['compose', 'language']));
+  const maxOptions = useSelector(state => state.getIn(['server', 'server', 'configuration', 'polls', 'max_options']));
 
   const handleChange = useCallback(({ target: { value } }) => {
-    dispatch(changePollOption(index, value));
-  }, [dispatch, index]);
+    dispatch(changePollOption(index, value, maxOptions));
+  }, [dispatch, index, maxOptions]);
 
   const handleSuggestionsFetchRequested = useCallback(token => {
     dispatch(fetchComposeSuggestions(token));
diff --git a/app/javascript/flavours/glitch/reducers/compose.js b/app/javascript/flavours/glitch/reducers/compose.js
index 787e7ee2db6d66..f96d9e959f16cb 100644
--- a/app/javascript/flavours/glitch/reducers/compose.js
+++ b/app/javascript/flavours/glitch/reducers/compose.js
@@ -54,7 +54,7 @@ import {
 import { REDRAFT } from '../actions/statuses';
 import { STORE_HYDRATE } from '../actions/store';
 import { TIMELINE_DELETE } from '../actions/timelines';
-import { me, defaultContentType, pollLimits } from '../initial_state';
+import { me, defaultContentType } from '../initial_state';
 import { recoverHashtags } from '../utils/hashtag';
 import { unescapeHTML } from '../utils/html';
 import { overwrite } from '../utils/js_helpers';
@@ -356,12 +356,12 @@ const updateSuggestionTags = (state, token) => {
   });
 };
 
-const updatePoll = (state, index, value) => state.updateIn(['poll', 'options'], options => {
+const updatePoll = (state, index, value, maxOptions) => state.updateIn(['poll', 'options'], options => {
   const tmp = options.set(index, value).filterNot(x => x.trim().length === 0);
 
   if (tmp.size === 0) {
     return tmp.push('').push('');
-  } else if (tmp.size < pollLimits.max_options) {
+  } else if (tmp.size < maxOptions) {
     return tmp.push('');
   }
 
@@ -649,7 +649,7 @@ export default function compose(state = initialState, action) {
   case COMPOSE_POLL_REMOVE:
     return state.set('poll', null);
   case COMPOSE_POLL_OPTION_CHANGE:
-    return updatePoll(state, action.index, action.title);
+    return updatePoll(state, action.index, action.title, action.maxOptions);
   case COMPOSE_POLL_SETTINGS_CHANGE:
     return state.update('poll', poll => poll.set('expires_in', action.expiresIn).set('multiple', action.isMultiple));
   case COMPOSE_LANGUAGE_CHANGE:

From 3631ddbfc9f412f2801f91911931952ea0780d4d Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 11 Mar 2024 14:35:23 +0100
Subject: [PATCH 0400/2191] [Glitch] Change icons in navigation panel to be
 filled when active in web UI

Port 16c856729bfa400422825b06c843efe7b85c72f8

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../features/ui/components/column_link.jsx    | 15 ++--
 .../follow_requests_column_link.jsx           | 55 ------------
 .../features/ui/components/list_panel.jsx     | 54 +++++-------
 .../ui/components/navigation_panel.jsx        | 84 +++++++++++++++----
 .../components/notifications_counter_icon.js  | 13 ---
 5 files changed, 97 insertions(+), 124 deletions(-)
 delete mode 100644 app/javascript/flavours/glitch/features/ui/components/follow_requests_column_link.jsx
 delete mode 100644 app/javascript/flavours/glitch/features/ui/components/notifications_counter_icon.js

diff --git a/app/javascript/flavours/glitch/features/ui/components/column_link.jsx b/app/javascript/flavours/glitch/features/ui/components/column_link.jsx
index f42ff5a6e6e7b8..4445435309d8ee 100644
--- a/app/javascript/flavours/glitch/features/ui/components/column_link.jsx
+++ b/app/javascript/flavours/glitch/features/ui/components/column_link.jsx
@@ -1,27 +1,30 @@
 import PropTypes from 'prop-types';
 
 import classNames from 'classnames';
-import { NavLink } from 'react-router-dom';
+import { useRouteMatch, NavLink } from 'react-router-dom';
 
 import { Icon }  from 'flavours/glitch/components/icon';
 
-const ColumnLink = ({ icon, iconComponent, text, to, onClick, href, method, badge, transparent, ...other }) => {
+const ColumnLink = ({ icon, activeIcon, iconComponent, activeIconComponent, text, to, onClick, href, method, badge, transparent, ...other }) => {
+  const match = useRouteMatch(to);
   const className = classNames('column-link', { 'column-link--transparent': transparent });
   const badgeElement = typeof badge !== 'undefined' ? <span className='column-link__badge'>{badge}</span> : null;
   const iconElement = (typeof icon === 'string' || iconComponent) ? <Icon id={icon} icon={iconComponent} className='column-link__icon' /> : icon;
+  const activeIconElement = activeIcon ?? (activeIconComponent ? <Icon id={icon} icon={activeIconComponent} className='column-link__icon' /> : iconElement);
+  const active = match?.isExact;
 
   if (href) {
     return (
       <a href={href} className={className} data-method={method} title={text} {...other}>
-        {iconElement}
+        {active ? activeIconElement : iconElement}
         <span>{text}</span>
         {badgeElement}
       </a>
     );
   } else if (to) {
     return (
-      <NavLink to={to} className={className} title={text} {...other}>
-        {iconElement}
+      <NavLink to={to} className={className} title={text} exact {...other}>
+        {active ? activeIconElement : iconElement}
         <span>{text}</span>
         {badgeElement}
       </NavLink>
@@ -46,6 +49,8 @@ const ColumnLink = ({ icon, iconComponent, text, to, onClick, href, method, badg
 ColumnLink.propTypes = {
   icon: PropTypes.oneOfType([PropTypes.string, PropTypes.node]).isRequired,
   iconComponent: PropTypes.func,
+  activeIcon: PropTypes.node,
+  activeIconComponent: PropTypes.func,
   text: PropTypes.string.isRequired,
   to: PropTypes.string,
   onClick: PropTypes.func,
diff --git a/app/javascript/flavours/glitch/features/ui/components/follow_requests_column_link.jsx b/app/javascript/flavours/glitch/features/ui/components/follow_requests_column_link.jsx
deleted file mode 100644
index 24fd5b64425b3c..00000000000000
--- a/app/javascript/flavours/glitch/features/ui/components/follow_requests_column_link.jsx
+++ /dev/null
@@ -1,55 +0,0 @@
-import PropTypes from 'prop-types';
-import { Component } from 'react';
-
-import { injectIntl, defineMessages } from 'react-intl';
-
-import { List as ImmutableList } from 'immutable';
-import { connect } from 'react-redux';
-
-import PersonAddIcon from '@/material-icons/400-24px/person_add.svg?react';
-import { fetchFollowRequests } from 'flavours/glitch/actions/accounts';
-import { IconWithBadge } from 'flavours/glitch/components/icon_with_badge';
-import ColumnLink from 'flavours/glitch/features/ui/components/column_link';
-
-const messages = defineMessages({
-  text: { id: 'navigation_bar.follow_requests', defaultMessage: 'Follow requests' },
-});
-
-const mapStateToProps = state => ({
-  count: state.getIn(['user_lists', 'follow_requests', 'items'], ImmutableList()).size,
-});
-
-class FollowRequestsColumnLink extends Component {
-
-  static propTypes = {
-    dispatch: PropTypes.func.isRequired,
-    count: PropTypes.number.isRequired,
-    intl: PropTypes.object.isRequired,
-  };
-
-  componentDidMount () {
-    const { dispatch } = this.props;
-
-    dispatch(fetchFollowRequests());
-  }
-
-  render () {
-    const { count, intl } = this.props;
-
-    if (count === 0) {
-      return null;
-    }
-
-    return (
-      <ColumnLink
-        transparent
-        to='/follow_requests'
-        icon={<IconWithBadge className='column-link__icon' id='user-plus' icon={PersonAddIcon} count={count} />}
-        text={intl.formatMessage(messages.text)}
-      />
-    );
-  }
-
-}
-
-export default injectIntl(connect(mapStateToProps)(FollowRequestsColumnLink));
diff --git a/app/javascript/flavours/glitch/features/ui/components/list_panel.jsx b/app/javascript/flavours/glitch/features/ui/components/list_panel.jsx
index 1baedfb8b0f0ce..2eba2bdbe2dedb 100644
--- a/app/javascript/flavours/glitch/features/ui/components/list_panel.jsx
+++ b/app/javascript/flavours/glitch/features/ui/components/list_panel.jsx
@@ -1,10 +1,9 @@
-import PropTypes from 'prop-types';
+import { useEffect } from 'react';
 
 import { createSelector } from '@reduxjs/toolkit';
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import ImmutablePureComponent from 'react-immutable-pure-component';
-import { connect } from 'react-redux';
+import { useDispatch, useSelector } from 'react-redux';
 
+import ListAltActiveIcon from '@/material-icons/400-24px/list_alt-fill.svg?react';
 import ListAltIcon from '@/material-icons/400-24px/list_alt.svg?react';
 import { fetchLists } from 'flavours/glitch/actions/lists';
 
@@ -18,40 +17,25 @@ const getOrderedLists = createSelector([state => state.get('lists')], lists => {
   return lists.toList().filter(item => !!item).sort((a, b) => a.get('title').localeCompare(b.get('title'))).take(4);
 });
 
-const mapStateToProps = state => ({
-  lists: getOrderedLists(state),
-});
-
-class ListPanel extends ImmutablePureComponent {
+export const ListPanel = () => {
+  const dispatch = useDispatch();
+  const lists = useSelector(state => getOrderedLists(state));
 
-  static propTypes = {
-    dispatch: PropTypes.func.isRequired,
-    lists: ImmutablePropTypes.list,
-  };
-
-  componentDidMount () {
-    const { dispatch } = this.props;
+  useEffect(() => {
     dispatch(fetchLists());
-  }
-
-  render () {
-    const { lists } = this.props;
-
-    if (!lists || lists.isEmpty()) {
-      return null;
-    }
-
-    return (
-      <div className='list-panel'>
-        <hr />
+  }, [dispatch]);
 
-        {lists.map(list => (
-          <ColumnLink icon='list-ul' iconComponent={ListAltIcon} key={list.get('id')} strict text={list.get('title')} to={`/lists/${list.get('id')}`} transparent />
-        ))}
-      </div>
-    );
+  if (!lists || lists.isEmpty()) {
+    return null;
   }
 
-}
+  return (
+    <div className='list-panel'>
+      <hr />
 
-export default connect(mapStateToProps)(ListPanel);
+      {lists.map(list => (
+        <ColumnLink icon='list-ul' key={list.get('id')} iconComponent={ListAltIcon} activeIconComponent={ListAltActiveIcon} text={list.get('title')} to={`/lists/${list.get('id')}`} transparent />
+      ))}
+    </div>
+  );
+};
diff --git a/app/javascript/flavours/glitch/features/ui/components/navigation_panel.jsx b/app/javascript/flavours/glitch/features/ui/components/navigation_panel.jsx
index a6c91a3d443f0d..8ee848e4196d69 100644
--- a/app/javascript/flavours/glitch/features/ui/components/navigation_panel.jsx
+++ b/app/javascript/flavours/glitch/features/ui/components/navigation_panel.jsx
@@ -1,19 +1,33 @@
 import PropTypes from 'prop-types';
-import { Component } from 'react';
+import { Component, useEffect } from 'react';
 
-import { defineMessages, injectIntl } from 'react-intl';
+import { defineMessages, injectIntl, useIntl } from 'react-intl';
 
-import BookmarksIcon from '@/material-icons/400-24px/bookmarks-fill.svg?react';
+import { useSelector, useDispatch } from 'react-redux';
+
+
+import BookmarksActiveIcon from '@/material-icons/400-24px/bookmarks-fill.svg?react';
+import BookmarksIcon from '@/material-icons/400-24px/bookmarks.svg?react';
 import ExploreIcon from '@/material-icons/400-24px/explore.svg?react';
-import HomeIcon from '@/material-icons/400-24px/home-fill.svg?react';
+import HomeActiveIcon from '@/material-icons/400-24px/home-fill.svg?react';
+import HomeIcon from '@/material-icons/400-24px/home.svg?react';
+import ListAltActiveIcon from '@/material-icons/400-24px/list_alt-fill.svg?react';
 import ListAltIcon from '@/material-icons/400-24px/list_alt.svg?react';
+import MailActiveIcon from '@/material-icons/400-24px/mail-fill.svg?react';
 import MailIcon from '@/material-icons/400-24px/mail.svg?react';
 import ManufacturingIcon from '@/material-icons/400-24px/manufacturing.svg?react';
 import MoreHorizIcon from '@/material-icons/400-24px/more_horiz.svg?react';
+import NotificationsActiveIcon from '@/material-icons/400-24px/notifications-fill.svg?react';
+import NotificationsIcon from '@/material-icons/400-24px/notifications.svg?react';
+import PersonAddActiveIcon from '@/material-icons/400-24px/person_add-fill.svg?react';
+import PersonAddIcon from '@/material-icons/400-24px/person_add.svg?react';
 import PublicIcon from '@/material-icons/400-24px/public.svg?react';
 import SearchIcon from '@/material-icons/400-24px/search.svg?react';
-import SettingsIcon from '@/material-icons/400-24px/settings-fill.svg?react';
-import StarIcon from '@/material-icons/400-24px/star-fill.svg?react';
+import SettingsIcon from '@/material-icons/400-24px/settings.svg?react';
+import StarActiveIcon from '@/material-icons/400-24px/star-fill.svg?react';
+import StarIcon from '@/material-icons/400-24px/star.svg?react';
+import { fetchFollowRequests } from 'flavours/glitch/actions/accounts';
+import { IconWithBadge } from 'flavours/glitch/components/icon_with_badge';
 import { NavigationPortal } from 'flavours/glitch/components/navigation_portal';
 import { timelinePreview, trendsEnabled } from 'flavours/glitch/initial_state';
 import { transientSingleColumn } from 'flavours/glitch/is_mobile';
@@ -21,9 +35,7 @@ import { preferencesLink } from 'flavours/glitch/utils/backend_links';
 
 import ColumnLink from './column_link';
 import DisabledAccountBanner from './disabled_account_banner';
-import FollowRequestsColumnLink from './follow_requests_column_link';
-import ListPanel from './list_panel';
-import NotificationsCounterIcon from './notifications_counter_icon';
+import { ListPanel } from './list_panel';
 import SignInBanner from './sign_in_banner';
 
 const messages = defineMessages({
@@ -42,8 +54,48 @@ const messages = defineMessages({
   advancedInterface: { id: 'navigation_bar.advanced_interface', defaultMessage: 'Open in advanced web interface' },
   openedInClassicInterface: { id: 'navigation_bar.opened_in_classic_interface', defaultMessage: 'Posts, accounts, and other specific pages are opened by default in the classic web interface.' },
   app_settings: { id: 'navigation_bar.app_settings', defaultMessage: 'App settings' },
+  followRequests: { id: 'navigation_bar.follow_requests', defaultMessage: 'Follow requests' },
 });
 
+const NotificationsLink = () => {
+  const count = useSelector(state => state.getIn(['local_settings', 'notifications', 'tab_badge']) ? state.getIn(['notifications', 'unread']) : 0);
+  const intl = useIntl();
+
+  return (
+    <ColumnLink
+      transparent
+      to='/notifications'
+      icon={<IconWithBadge icon={NotificationsIcon} count={count} className='column-link__icon' />}
+      activeIcon={<IconWithBadge icon={NotificationsActiveIcon} count={count} className='column-link__icon' />}
+      text={intl.formatMessage(messages.notifications)}
+    />
+  );
+};
+
+const FollowRequestsLink = () => {
+  const count = useSelector(state => state.getIn(['user_lists', 'follow_requests', 'items'])?.size ?? 0);
+  const intl = useIntl();
+  const dispatch = useDispatch();
+
+  useEffect(() => {
+    dispatch(fetchFollowRequests());
+  }, [dispatch]);
+
+  if (count === 0) {
+    return null;
+  }
+
+  return (
+    <ColumnLink
+      transparent
+      to='/follow_requests'
+      icon={<IconWithBadge icon={PersonAddIcon} count={count} className='column-link__icon' />}
+      activeIcon={<IconWithBadge icon={PersonAddActiveIcon} count={count} className='column-link__icon' />}
+      text={intl.formatMessage(messages.followRequests)}
+    />
+  );
+};
+
 class NavigationPanel extends Component {
 
   static contextTypes = {
@@ -84,9 +136,9 @@ class NavigationPanel extends Component {
 
         {signedIn && (
           <>
-            <ColumnLink transparent to='/home' icon='home' iconComponent={HomeIcon} text={intl.formatMessage(messages.home)} />
-            <ColumnLink transparent to='/notifications' icon={<NotificationsCounterIcon className='column-link__icon' />} text={intl.formatMessage(messages.notifications)} />
-            <FollowRequestsColumnLink />
+            <ColumnLink transparent to='/home' icon='home' iconComponent={HomeIcon} activeIconComponent={HomeActiveIcon} text={intl.formatMessage(messages.home)} />
+            <NotificationsLink />
+            <FollowRequestsLink />
           </>
         )}
 
@@ -109,10 +161,10 @@ class NavigationPanel extends Component {
 
         {signedIn && (
           <>
-            <ColumnLink transparent to='/conversations' icon='at' iconComponent={MailIcon} text={intl.formatMessage(messages.direct)} />
-            <ColumnLink transparent to='/bookmarks' icon='bookmark' iconComponent={BookmarksIcon} text={intl.formatMessage(messages.bookmarks)} />
-            <ColumnLink transparent to='/favourites' icon='star' iconComponent={StarIcon} text={intl.formatMessage(messages.favourites)} />
-            <ColumnLink transparent to='/lists' icon='list-ul' iconComponent={ListAltIcon} text={intl.formatMessage(messages.lists)} />
+            <ColumnLink transparent to='/conversations' icon='at' iconComponent={MailIcon} activeIconComponent={MailActiveIcon} text={intl.formatMessage(messages.direct)} />
+            <ColumnLink transparent to='/bookmarks' icon='bookmarks' iconComponent={BookmarksIcon} activeIconComponent={BookmarksActiveIcon} text={intl.formatMessage(messages.bookmarks)} />
+            <ColumnLink transparent to='/favourites' icon='star' iconComponent={StarIcon} activeIconComponent={StarActiveIcon} text={intl.formatMessage(messages.favourites)} />
+            <ColumnLink transparent to='/lists' icon='list-ul' iconComponent={ListAltIcon} activeIconComponent={ListAltActiveIcon} text={intl.formatMessage(messages.lists)} />
 
             <ListPanel />
 
diff --git a/app/javascript/flavours/glitch/features/ui/components/notifications_counter_icon.js b/app/javascript/flavours/glitch/features/ui/components/notifications_counter_icon.js
deleted file mode 100644
index 0816e9660f1c15..00000000000000
--- a/app/javascript/flavours/glitch/features/ui/components/notifications_counter_icon.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import { connect } from 'react-redux';
-
-import NotificationsIcon from '@/material-icons/400-24px/notifications-fill.svg?react';
-import { IconWithBadge } from 'flavours/glitch/components/icon_with_badge';
-
-
-const mapStateToProps = state => ({
-  count: state.getIn(['local_settings', 'notifications', 'tab_badge']) ? state.getIn(['notifications', 'unread']) : 0,
-  id: 'bell',
-  icon: NotificationsIcon,
-});
-
-export default connect(mapStateToProps)(IconWithBadge);

From 216cea1e277530d39eefddbfccb519d2eca72b8b Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 12 Mar 2024 04:38:32 -0400
Subject: [PATCH 0401/2191] Fix incorrect frequency value in
 `FriendsOfFriendsSource` data (#29550)

---
 .../friends_of_friends_source.rb              | 12 +++++---
 .../friends_of_friends_source_spec.rb         | 30 +++++++++++++++----
 2 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/app/models/account_suggestions/friends_of_friends_source.rb b/app/models/account_suggestions/friends_of_friends_source.rb
index 0c95d21a3e9edd..b4f549bf314ed7 100644
--- a/app/models/account_suggestions/friends_of_friends_source.rb
+++ b/app/models/account_suggestions/friends_of_friends_source.rb
@@ -2,15 +2,19 @@
 
 class AccountSuggestions::FriendsOfFriendsSource < AccountSuggestions::Source
   def get(account, limit: DEFAULT_LIMIT)
+    source_query(account, limit: limit)
+      .map { |id, _frequency, _followers_count| [id, key] }
+  end
+
+  def source_query(account, limit: DEFAULT_LIMIT)
     first_degree = account.following.where.not(hide_collections: true).select(:id).reorder(nil)
     base_account_scope(account)
       .joins(:account_stat)
-      .where(id: Follow.where(account_id: first_degree).select(:target_account_id))
+      .joins(:passive_relationships).where(passive_relationships: { account_id: first_degree })
       .group('accounts.id, account_stats.id')
-      .reorder('frequency DESC, followers_count DESC')
+      .reorder(frequency: :desc, followers_count: :desc)
       .limit(limit)
-      .pluck(Arel.sql('accounts.id, COUNT(*) AS frequency'))
-      .map { |id, _frequency| [id, key] }
+      .pluck(Arel.sql('accounts.id, COUNT(*) AS frequency, followers_count'))
   end
 
   private
diff --git a/spec/models/account_suggestions/friends_of_friends_source_spec.rb b/spec/models/account_suggestions/friends_of_friends_source_spec.rb
index 56a974add5430d..d7915985f8c1f5 100644
--- a/spec/models/account_suggestions/friends_of_friends_source_spec.rb
+++ b/spec/models/account_suggestions/friends_of_friends_source_spec.rb
@@ -11,9 +11,9 @@
     let!(:eve) { Fabricate(:account, discoverable: true, hide_collections: false) }
     let!(:mallory) { Fabricate(:account, discoverable: false, hide_collections: false) }
     let!(:eugen) { Fabricate(:account, discoverable: true, hide_collections: false) }
+    let!(:neil) { Fabricate(:account, discoverable: true, hide_collections: false) }
     let!(:john) { Fabricate(:account, discoverable: true, hide_collections: false) }
     let!(:jerk) { Fabricate(:account, discoverable: true, hide_collections: false) }
-    let!(:neil) { Fabricate(:account, discoverable: true, hide_collections: false) }
     let!(:larry) { Fabricate(:account, discoverable: true, hide_collections: false) }
 
     context 'with follows and blocks' do
@@ -70,13 +70,31 @@
       end
 
       it 'returns eligible accounts in the expected order' do
-        expect(subject.get(bob)).to eq [
-          [eugen.id, :friends_of_friends], # followed by 2 friends, 3 followers total
-          [john.id, :friends_of_friends], # followed by 2 friends, 2 followers total
-          [neil.id, :friends_of_friends], # followed by 1 friend, 2 followers total
-          [jerk.id, :friends_of_friends], # followed by 1 friend, 1 follower total
+        expect(subject.get(bob)).to eq expected_results
+      end
+
+      it 'contains correct underlying source data' do
+        expect(source_query_values)
+          .to contain_exactly(
+            [eugen.id, 2, 3], # Followed by 2 friends of bob (eve, mallory), 3 followers total (breaks tie)
+            [john.id, 2, 2],  # Followed by 2 friends of bob (eve, mallory), 2 followers total
+            [neil.id, 1, 2],  # Followed by 1 friends of bob (mallory), 2 followers total (breaks tie)
+            [jerk.id, 1, 1]   # Followed by 1 friends of bob (eve), 1 followers total
+          )
+      end
+
+      def expected_results
+        [
+          [eugen.id, :friends_of_friends],
+          [john.id, :friends_of_friends],
+          [neil.id, :friends_of_friends],
+          [jerk.id, :friends_of_friends],
         ]
       end
+
+      def source_query_values
+        subject.source_query(bob).to_a
+      end
     end
   end
 end

From dc36b961aa1bb293c5f78cd8382033d9e143c4f5 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 12 Mar 2024 10:03:51 +0100
Subject: [PATCH 0402/2191] New Crowdin Translations (automated) (#29554)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/an.json      |  4 ---
 app/javascript/mastodon/locales/ar.json      |  4 ---
 app/javascript/mastodon/locales/ast.json     |  4 ---
 app/javascript/mastodon/locales/be.json      |  4 ---
 app/javascript/mastodon/locales/bg.json      |  6 ++---
 app/javascript/mastodon/locales/bn.json      |  3 ---
 app/javascript/mastodon/locales/br.json      |  5 +---
 app/javascript/mastodon/locales/ca.json      | 20 ++++++++++++---
 app/javascript/mastodon/locales/ckb.json     |  4 ---
 app/javascript/mastodon/locales/co.json      |  3 ---
 app/javascript/mastodon/locales/cs.json      |  4 ---
 app/javascript/mastodon/locales/cy.json      |  4 ---
 app/javascript/mastodon/locales/da.json      | 19 +++++++++++---
 app/javascript/mastodon/locales/de.json      | 20 ++++++++++++---
 app/javascript/mastodon/locales/el.json      |  4 ---
 app/javascript/mastodon/locales/en-GB.json   |  4 ---
 app/javascript/mastodon/locales/eo.json      |  4 ---
 app/javascript/mastodon/locales/es-AR.json   | 20 ++++++++++++---
 app/javascript/mastodon/locales/es-MX.json   | 20 ++++++++++++---
 app/javascript/mastodon/locales/es.json      | 20 ++++++++++++---
 app/javascript/mastodon/locales/et.json      |  4 ---
 app/javascript/mastodon/locales/eu.json      | 20 ++++++++++++---
 app/javascript/mastodon/locales/fa.json      |  4 ---
 app/javascript/mastodon/locales/fi.json      |  4 ---
 app/javascript/mastodon/locales/fo.json      | 20 ++++++++++++---
 app/javascript/mastodon/locales/fr-CA.json   |  4 ---
 app/javascript/mastodon/locales/fr.json      |  4 ---
 app/javascript/mastodon/locales/fy.json      |  4 ---
 app/javascript/mastodon/locales/ga.json      |  4 ---
 app/javascript/mastodon/locales/gd.json      |  4 ---
 app/javascript/mastodon/locales/gl.json      |  4 ---
 app/javascript/mastodon/locales/he.json      | 20 ++++++++++++---
 app/javascript/mastodon/locales/hi.json      |  3 ---
 app/javascript/mastodon/locales/hr.json      |  3 ---
 app/javascript/mastodon/locales/hu.json      | 20 ++++++++++++---
 app/javascript/mastodon/locales/hy.json      |  4 ---
 app/javascript/mastodon/locales/ia.json      |  1 -
 app/javascript/mastodon/locales/id.json      |  4 ---
 app/javascript/mastodon/locales/ie.json      |  4 ---
 app/javascript/mastodon/locales/io.json      |  4 ---
 app/javascript/mastodon/locales/is.json      | 20 ++++++++++++---
 app/javascript/mastodon/locales/it.json      | 20 ++++++++++++---
 app/javascript/mastodon/locales/ja.json      |  4 ---
 app/javascript/mastodon/locales/ka.json      |  1 -
 app/javascript/mastodon/locales/kab.json     |  3 ---
 app/javascript/mastodon/locales/kk.json      |  3 ---
 app/javascript/mastodon/locales/ko.json      | 19 ++++++++++----
 app/javascript/mastodon/locales/ku.json      |  4 ---
 app/javascript/mastodon/locales/kw.json      |  3 ---
 app/javascript/mastodon/locales/lad.json     |  9 ++++---
 app/javascript/mastodon/locales/lt.json      |  4 ---
 app/javascript/mastodon/locales/lv.json      |  4 ---
 app/javascript/mastodon/locales/mk.json      |  1 -
 app/javascript/mastodon/locales/ml.json      |  2 --
 app/javascript/mastodon/locales/mr.json      |  1 -
 app/javascript/mastodon/locales/ms.json      |  4 ---
 app/javascript/mastodon/locales/my.json      |  4 ---
 app/javascript/mastodon/locales/nl.json      | 20 ++++++++++++---
 app/javascript/mastodon/locales/nn.json      |  4 ---
 app/javascript/mastodon/locales/no.json      |  4 ---
 app/javascript/mastodon/locales/oc.json      |  4 ---
 app/javascript/mastodon/locales/pa.json      |  1 -
 app/javascript/mastodon/locales/pl.json      | 20 ++++++++++++---
 app/javascript/mastodon/locales/pt-BR.json   |  4 ---
 app/javascript/mastodon/locales/pt-PT.json   | 17 ++++++++++---
 app/javascript/mastodon/locales/ro.json      |  4 ---
 app/javascript/mastodon/locales/ru.json      |  4 ---
 app/javascript/mastodon/locales/sa.json      |  4 ---
 app/javascript/mastodon/locales/sc.json      |  3 ---
 app/javascript/mastodon/locales/sco.json     |  4 ---
 app/javascript/mastodon/locales/si.json      |  4 ---
 app/javascript/mastodon/locales/sk.json      |  4 ---
 app/javascript/mastodon/locales/sl.json      | 17 ++++++++++---
 app/javascript/mastodon/locales/sq.json      |  4 ---
 app/javascript/mastodon/locales/sr-Latn.json |  4 ---
 app/javascript/mastodon/locales/sr.json      |  4 ---
 app/javascript/mastodon/locales/sv.json      |  7 +++---
 app/javascript/mastodon/locales/ta.json      |  3 ---
 app/javascript/mastodon/locales/te.json      |  3 ---
 app/javascript/mastodon/locales/th.json      | 18 +++++++++++---
 app/javascript/mastodon/locales/tr.json      |  4 ---
 app/javascript/mastodon/locales/tt.json      |  1 -
 app/javascript/mastodon/locales/uk.json      |  9 ++++---
 app/javascript/mastodon/locales/ur.json      |  2 --
 app/javascript/mastodon/locales/uz.json      |  1 -
 app/javascript/mastodon/locales/vi.json      |  4 ---
 app/javascript/mastodon/locales/zh-CN.json   | 20 ++++++++++++---
 app/javascript/mastodon/locales/zh-HK.json   |  4 ---
 app/javascript/mastodon/locales/zh-TW.json   | 26 ++++++++++++++------
 config/locales/doorkeeper.zh-TW.yml          |  2 +-
 config/locales/lt.yml                        |  8 +++---
 config/locales/lv.yml                        |  2 +-
 config/locales/simple_form.bg.yml            |  2 ++
 config/locales/simple_form.br.yml            |  1 +
 config/locales/simple_form.ca.yml            |  2 ++
 config/locales/simple_form.cy.yml            |  2 ++
 config/locales/simple_form.da.yml            |  2 ++
 config/locales/simple_form.de.yml            |  2 ++
 config/locales/simple_form.es-AR.yml         |  2 ++
 config/locales/simple_form.es-MX.yml         |  2 ++
 config/locales/simple_form.es.yml            |  2 ++
 config/locales/simple_form.eu.yml            |  2 ++
 config/locales/simple_form.fo.yml            |  2 ++
 config/locales/simple_form.fy.yml            |  2 ++
 config/locales/simple_form.gd.yml            |  2 ++
 config/locales/simple_form.gl.yml            |  2 ++
 config/locales/simple_form.he.yml            |  2 ++
 config/locales/simple_form.hu.yml            |  2 ++
 config/locales/simple_form.is.yml            |  2 ++
 config/locales/simple_form.it.yml            |  2 ++
 config/locales/simple_form.ko.yml            |  2 ++
 config/locales/simple_form.lad.yml           |  1 +
 config/locales/simple_form.lt.yml            |  3 +++
 config/locales/simple_form.nl.yml            |  2 ++
 config/locales/simple_form.nn.yml            |  2 ++
 config/locales/simple_form.pl.yml            |  2 ++
 config/locales/simple_form.pt-PT.yml         |  2 ++
 config/locales/simple_form.sl.yml            |  2 ++
 config/locales/simple_form.sq.yml            |  2 ++
 config/locales/simple_form.sr-Latn.yml       |  1 +
 config/locales/simple_form.sr.yml            |  1 +
 config/locales/simple_form.sv.yml            |  1 +
 config/locales/simple_form.th.yml            |  2 ++
 config/locales/simple_form.uk.yml            |  2 ++
 config/locales/simple_form.vi.yml            |  2 ++
 config/locales/simple_form.zh-CN.yml         |  2 ++
 config/locales/simple_form.zh-TW.yml         |  6 +++--
 config/locales/zh-TW.yml                     |  2 +-
 128 files changed, 404 insertions(+), 333 deletions(-)

diff --git a/app/javascript/mastodon/locales/an.json b/app/javascript/mastodon/locales/an.json
index e9d609a1ce30ae..bf3a1a43a90060 100644
--- a/app/javascript/mastodon/locales/an.json
+++ b/app/javascript/mastodon/locales/an.json
@@ -253,7 +253,6 @@
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
   "hashtag.follow": "Seguir etiqueta",
   "hashtag.unfollow": "Deixar de seguir etiqueta",
-  "home.column_settings.basic": "Basico",
   "home.column_settings.show_reblogs": "Amostrar retutz",
   "home.column_settings.show_replies": "Amostrar respuestas",
   "home.hide_announcements": "Amagar anuncios",
@@ -363,9 +362,6 @@
   "notifications.column_settings.admin.report": "Nuevos informes:",
   "notifications.column_settings.admin.sign_up": "Nuevos rechistros:",
   "notifications.column_settings.alert": "Notificacions d'escritorio",
-  "notifications.column_settings.filter_bar.advanced": "Amostrar totas las categorías",
-  "notifications.column_settings.filter_bar.category": "Barra de filtrau rapido",
-  "notifications.column_settings.filter_bar.show_bar": "Amostrar barra de filtros",
   "notifications.column_settings.follow": "Nuevos seguidores:",
   "notifications.column_settings.follow_request": "Nuevas solicitutz de seguimiento:",
   "notifications.column_settings.mention": "Mencions:",
diff --git a/app/javascript/mastodon/locales/ar.json b/app/javascript/mastodon/locales/ar.json
index 914c15ad9536f4..38653b4a34e471 100644
--- a/app/javascript/mastodon/locales/ar.json
+++ b/app/javascript/mastodon/locales/ar.json
@@ -314,7 +314,6 @@
   "hashtag.follow": "اتبع الوسم",
   "hashtag.unfollow": "ألغِ متابعة الوسم",
   "hashtags.and_other": "…و {count, plural, zero {} one {# واحد آخر} two {# اثنان آخران} few {# آخرون} many {# آخَرًا}other {# آخرون}}",
-  "home.column_settings.basic": "الأساسية",
   "home.column_settings.show_reblogs": "اعرض المعاد نشرها",
   "home.column_settings.show_replies": "اعرض الردود",
   "home.hide_announcements": "إخفاء الإعلانات",
@@ -446,9 +445,6 @@
   "notifications.column_settings.admin.sign_up": "التسجيلات الجديدة:",
   "notifications.column_settings.alert": "إشعارات سطح المكتب",
   "notifications.column_settings.favourite": "المفضلة:",
-  "notifications.column_settings.filter_bar.advanced": "اعرض كافة الفئات",
-  "notifications.column_settings.filter_bar.category": "شريط الفلترة السريعة",
-  "notifications.column_settings.filter_bar.show_bar": "إظهار شريط التصفية",
   "notifications.column_settings.follow": "متابعُون جُدُد:",
   "notifications.column_settings.follow_request": "الطلبات الجديد لِمتابَعتك:",
   "notifications.column_settings.mention": "الإشارات:",
diff --git a/app/javascript/mastodon/locales/ast.json b/app/javascript/mastodon/locales/ast.json
index 8e69d434b478dd..76fa44202d4e2b 100644
--- a/app/javascript/mastodon/locales/ast.json
+++ b/app/javascript/mastodon/locales/ast.json
@@ -221,7 +221,6 @@
   "hashtag.counter_by_accounts": "{count, plural, one {{counter} participante} other {{counter} participantes}}",
   "hashtag.follow": "Siguir a la etiqueta",
   "hashtag.unfollow": "Dexar de siguir a la etiqueta",
-  "home.column_settings.basic": "Configuración básica",
   "home.column_settings.show_reblogs": "Amosar los artículos compartíos",
   "home.column_settings.show_replies": "Amosar les rempuestes",
   "home.pending_critical_update.body": "¡Anueva'l sirvidor de Mastodon namás que puedas!",
@@ -311,9 +310,6 @@
   "notifications.clear": "Borrar los avisos",
   "notifications.column_settings.admin.report": "Informes nuevos:",
   "notifications.column_settings.admin.sign_up": "Rexistros nuevos:",
-  "notifications.column_settings.filter_bar.advanced": "Amosar toles categoríes",
-  "notifications.column_settings.filter_bar.category": "Barra de peñera rápida",
-  "notifications.column_settings.filter_bar.show_bar": "Amosar la barra de peñera",
   "notifications.column_settings.follow": "Siguidores nuevos:",
   "notifications.column_settings.follow_request": "Solicitúes de siguimientu nueves:",
   "notifications.column_settings.mention": "Menciones:",
diff --git a/app/javascript/mastodon/locales/be.json b/app/javascript/mastodon/locales/be.json
index c0b744fbaf7160..bbe21f0569309f 100644
--- a/app/javascript/mastodon/locales/be.json
+++ b/app/javascript/mastodon/locales/be.json
@@ -314,7 +314,6 @@
   "hashtag.follow": "Падпісацца на хэштэг",
   "hashtag.unfollow": "Адпісацца ад хэштэга",
   "hashtags.and_other": "…і яшчэ {count, plural,  other {#}}",
-  "home.column_settings.basic": "Асноўныя",
   "home.column_settings.show_reblogs": "Паказаць пашырэнні",
   "home.column_settings.show_replies": "Паказваць адказы",
   "home.hide_announcements": "Схаваць аб'явы",
@@ -446,9 +445,6 @@
   "notifications.column_settings.admin.sign_up": "Новыя ўваходы:",
   "notifications.column_settings.alert": "Апавяшчэнні на працоўным стале",
   "notifications.column_settings.favourite": "Упадабанае:",
-  "notifications.column_settings.filter_bar.advanced": "Паказваць усе катэгорыі",
-  "notifications.column_settings.filter_bar.category": "Панэль хуткай фільтрацыі",
-  "notifications.column_settings.filter_bar.show_bar": "Паказваць панэль фільтрацыі",
   "notifications.column_settings.follow": "Новыя падпісчыкі:",
   "notifications.column_settings.follow_request": "Новыя запыты на падпіску:",
   "notifications.column_settings.mention": "Згадванні:",
diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json
index 93823496b755e5..ab3eda9cd3c75a 100644
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@@ -314,7 +314,6 @@
   "hashtag.follow": "Следване на хаштаг",
   "hashtag.unfollow": "Спиране на следване на хаштаг",
   "hashtags.and_other": "…и {count, plural, other {# още}}",
-  "home.column_settings.basic": "Основно",
   "home.column_settings.show_reblogs": "Показване на подсилванията",
   "home.column_settings.show_replies": "Показване на отговорите",
   "home.hide_announcements": "Скриване на оповестяванията",
@@ -440,15 +439,13 @@
   "notification.reblog": "{name} подсили ваша публикация",
   "notification.status": "{name} току-що публикува",
   "notification.update": "{name} промени публикация",
+  "notification_requests.notifications_from": "Известия от {name}",
   "notifications.clear": "Изчистване на известията",
   "notifications.clear_confirmation": "Наистина ли искате да изчистите завинаги всичките си известия?",
   "notifications.column_settings.admin.report": "Нови доклади:",
   "notifications.column_settings.admin.sign_up": "Нови регистрации:",
   "notifications.column_settings.alert": "Известия на работния плот",
   "notifications.column_settings.favourite": "Любими:",
-  "notifications.column_settings.filter_bar.advanced": "Показване на всички категории",
-  "notifications.column_settings.filter_bar.category": "Лента за бърз филтър",
-  "notifications.column_settings.filter_bar.show_bar": "Показване на лентата с филтри",
   "notifications.column_settings.follow": "Нови последователи:",
   "notifications.column_settings.follow_request": "Нови заявки за последване:",
   "notifications.column_settings.mention": "Споменавания:",
@@ -474,6 +471,7 @@
   "notifications.permission_denied": "Известията на работния плот не са налични поради предварително отказана заявка за разрешение в браузъра",
   "notifications.permission_denied_alert": "Известията на работния плот не могат да се включат, тъй като разрешението на браузъра е отказвано преди",
   "notifications.permission_required": "Известията на работния плот ги няма, щото няма дадено нужното позволение.",
+  "notifications.policy.filter_new_accounts_title": "Нови акаунти",
   "notifications_permission_banner.enable": "Включване на известията на работния плот",
   "notifications_permission_banner.how_to_control": "За да получавате известия, когато Mastodon не е отворен, включете известията на работния плот. Може да управлявате точно кои видове взаимодействия пораждат известия на работния плот чрез бутона {icon} по-горе, след като бъдат включени.",
   "notifications_permission_banner.title": "Никога не пропускайте нищо",
diff --git a/app/javascript/mastodon/locales/bn.json b/app/javascript/mastodon/locales/bn.json
index 508caa2f42708d..85f1598889ab0d 100644
--- a/app/javascript/mastodon/locales/bn.json
+++ b/app/javascript/mastodon/locales/bn.json
@@ -248,7 +248,6 @@
   "hashtag.column_settings.tag_mode.any": "এর ভেতরে যেকোনোটা",
   "hashtag.column_settings.tag_mode.none": "এগুলোর একটাও না",
   "hashtag.column_settings.tag_toggle": "আরো ট্যাগ এই কলামে যুক্ত করতে",
-  "home.column_settings.basic": "সাধারণ",
   "home.column_settings.show_reblogs": "সমর্থনগুলো দেখান",
   "home.column_settings.show_replies": "মতামত দেখান",
   "home.hide_announcements": "ঘোষণা লুকান",
@@ -338,8 +337,6 @@
   "notifications.clear_confirmation": "আপনি কি নির্চিত প্রজ্ঞাপনগুলো মুছে ফেলতে চান ?",
   "notifications.column_settings.alert": "কম্পিউটারে প্রজ্ঞাপনগুলি",
   "notifications.column_settings.favourite": "পছন্দসমূহ:",
-  "notifications.column_settings.filter_bar.advanced": "সব শ্রেণীগুলো দেখানো",
-  "notifications.column_settings.filter_bar.category": "সংক্ষিপ্ত ছাঁকনি অংশ",
   "notifications.column_settings.follow": "নতুন অনুসরণকারীরা:",
   "notifications.column_settings.follow_request": "অনুসরণের অনুরোধগুলি:",
   "notifications.column_settings.mention": "প্রজ্ঞাপনগুলো:",
diff --git a/app/javascript/mastodon/locales/br.json b/app/javascript/mastodon/locales/br.json
index 3b376ac47033e7..9e0979641e9893 100644
--- a/app/javascript/mastodon/locales/br.json
+++ b/app/javascript/mastodon/locales/br.json
@@ -289,7 +289,6 @@
   "hashtag.follow": "Heuliañ ar ger-klik",
   "hashtag.unfollow": "Paouez heuliañ an hashtag",
   "hashtags.and_other": "…{count, plural, one {hag # all} other {ha # all}}",
-  "home.column_settings.basic": "Diazez",
   "home.column_settings.show_reblogs": "Diskouez ar skignadennoù",
   "home.column_settings.show_replies": "Diskouez ar respontoù",
   "home.hide_announcements": "Kuzhat ar c'hemennoù",
@@ -410,9 +409,6 @@
   "notifications.column_settings.admin.sign_up": "Enskrivadurioù nevez :",
   "notifications.column_settings.alert": "Kemennoù war ar burev",
   "notifications.column_settings.favourite": "Muiañ-karet:",
-  "notifications.column_settings.filter_bar.advanced": "Skrammañ an-holl rummadoù",
-  "notifications.column_settings.filter_bar.category": "Barrenn siloù prim",
-  "notifications.column_settings.filter_bar.show_bar": "Diskouezh barrenn siloù",
   "notifications.column_settings.follow": "Heulierien nevez:",
   "notifications.column_settings.follow_request": "Pedadoù heuliañ nevez :",
   "notifications.column_settings.mention": "Menegoù:",
@@ -438,6 +434,7 @@
   "notifications.permission_denied": "Kemennoù war ar burev n'int ket hegerz rak pedadenn aotren ar merdeer a zo bet nullet araok",
   "notifications.permission_denied_alert": "Kemennoù wa ar burev na c'hellont ket bezañ lezelet, rak aotre ar merdeer a zo bet nac'het a-raok",
   "notifications.permission_required": "Kemennoù war ar burev n'int ket hegerz abalamour d'an aotre rekis n'eo ket bet roet.",
+  "notifications.policy.filter_new_accounts_title": "Kontoù nevez",
   "notifications_permission_banner.enable": "Lezel kemennoù war ar burev",
   "notifications_permission_banner.how_to_control": "Evit reseviñ kemennoù pa ne vez ket digoret Mastodon, lezelit kemennoù war ar burev. Gallout a rit kontrollañ peseurt eskemmoù a c'henel kemennoù war ar burev gant ar {icon} nozelenn a-us kentre ma'z int lezelet.",
   "notifications_permission_banner.title": "Na vankit netra morse",
diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index 23454247286f1b..0c237ccda05e75 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -241,6 +241,7 @@
   "empty_column.list": "Encara no hi ha res en aquesta llista. Quan els membres facin nous tuts, apareixeran aquí.",
   "empty_column.lists": "Encara no tens cap llista. Quan en facis una, apareixerà aquí.",
   "empty_column.mutes": "Encara no has silenciat cap usuari.",
+  "empty_column.notification_requests": "Tot net, ja no hi ha res aquí! Quan rebeu notificacions noves, segons la vostra configuració, apareixeran aquí.",
   "empty_column.notifications": "Encara no tens notificacions. Quan altre gent interactuï amb tu, les veuràs aquí.",
   "empty_column.public": "Aquí no hi ha res! Escriu públicament alguna cosa o segueix manualment usuaris d'altres servidors per omplir-ho",
   "error.unexpected_crash.explanation": "A causa d'un error en el nostre codi o d'un problema de compatibilitat amb el navegador, aquesta pàgina no s'ha pogut mostrar correctament.",
@@ -271,6 +272,8 @@
   "filter_modal.select_filter.subtitle": "Usa una categoria existent o crea'n una de nova",
   "filter_modal.select_filter.title": "Filtra aquest tut",
   "filter_modal.title.status": "Filtra un tut",
+  "filtered_notifications_banner.pending_requests": "Notificacions de {count, plural, =0 {no} one {una persona} other {# persones}} que potser coneixeu",
+  "filtered_notifications_banner.title": "Notificacions filtrades",
   "firehose.all": "Tots",
   "firehose.local": "Aquest servidor",
   "firehose.remote": "Altres servidors",
@@ -314,7 +317,6 @@
   "hashtag.follow": "Segueix l'etiqueta",
   "hashtag.unfollow": "Deixa de seguir l'etiqueta",
   "hashtags.and_other": "…i {count, plural, other {# més}}",
-  "home.column_settings.basic": "Bàsic",
   "home.column_settings.show_reblogs": "Mostra els impulsos",
   "home.column_settings.show_replies": "Mostra les respostes",
   "home.hide_announcements": "Amaga els anuncis",
@@ -440,15 +442,16 @@
   "notification.reblog": "{name} t'ha impulsat",
   "notification.status": "{name} acaba de publicar",
   "notification.update": "{name} ha editat un tut",
+  "notification_requests.accept": "Accepta",
+  "notification_requests.dismiss": "Ignora",
+  "notification_requests.notifications_from": "Notificacions de {name}",
+  "notification_requests.title": "Notificacions filtrades",
   "notifications.clear": "Esborra les notificacions",
   "notifications.clear_confirmation": "Segur que vols esborrar permanentment totes les teves notificacions?",
   "notifications.column_settings.admin.report": "Nous informes:",
   "notifications.column_settings.admin.sign_up": "Registres nous:",
   "notifications.column_settings.alert": "Notificacions d'escriptori",
   "notifications.column_settings.favourite": "Favorits:",
-  "notifications.column_settings.filter_bar.advanced": "Mostra totes les categories",
-  "notifications.column_settings.filter_bar.category": "Barra ràpida de filtres",
-  "notifications.column_settings.filter_bar.show_bar": "Mostra la barra de filtres",
   "notifications.column_settings.follow": "Nous seguidors:",
   "notifications.column_settings.follow_request": "Noves sol·licituds de seguiment:",
   "notifications.column_settings.mention": "Mencions:",
@@ -474,6 +477,15 @@
   "notifications.permission_denied": "Les notificacions d’escriptori no estan disponibles perquè prèviament s’ha denegat el permís al navegador",
   "notifications.permission_denied_alert": "No es poden activar les notificacions de l'escriptori perquè abans s'ha denegat el permís del navegador",
   "notifications.permission_required": "Les notificacions d'escriptori no estan disponibles perquè el permís requerit no ha estat concedit.",
+  "notifications.policy.filter_new_accounts.hint": "Creat durant els passats {days, plural, one {un dia} other {# dies}}",
+  "notifications.policy.filter_new_accounts_title": "Comptes nous",
+  "notifications.policy.filter_not_followers_hint": "Incloent les persones que us segueixen fa menys de {days, plural, one {un dia} other {# dies}}",
+  "notifications.policy.filter_not_followers_title": "Persones que no us segueixen",
+  "notifications.policy.filter_not_following_hint": "Fins que no ho aproveu de forma manual",
+  "notifications.policy.filter_not_following_title": "Persones que no seguiu",
+  "notifications.policy.filter_private_mentions_hint": "Filtra-ho excepte si és en resposta a una menció vostra o si seguiu el remitent",
+  "notifications.policy.filter_private_mentions_title": "Mencions privades no sol·licitades",
+  "notifications.policy.title": "Filtra les notificacions de…",
   "notifications_permission_banner.enable": "Activa les notificacions d’escriptori",
   "notifications_permission_banner.how_to_control": "Per a rebre notificacions quan Mastodon no és obert cal activar les notificacions d’escriptori. Pots controlar amb precisió quins tipus d’interaccions generen notificacions d’escriptori després d’activar el botó {icon} de dalt.",
   "notifications_permission_banner.title": "No et perdis mai res",
diff --git a/app/javascript/mastodon/locales/ckb.json b/app/javascript/mastodon/locales/ckb.json
index 62195b72dc1a36..a78a45c8de1a94 100644
--- a/app/javascript/mastodon/locales/ckb.json
+++ b/app/javascript/mastodon/locales/ckb.json
@@ -300,7 +300,6 @@
   "hashtag.counter_by_accounts": "{count, plural, one {{counter} participant} other {{counter} participants}}",
   "hashtag.follow": "شوێنکەوتنی هاشتاگ",
   "hashtag.unfollow": "شوێن نەکەوتنی هاشتاگ",
-  "home.column_settings.basic": "بنەڕەتی",
   "home.column_settings.show_reblogs": "پیشاندانی بەهێزکردن",
   "home.column_settings.show_replies": "وەڵامدانەوەکان پیشان بدە",
   "home.hide_announcements": "شاردنەوەی راگەیەنراوەکان",
@@ -412,9 +411,6 @@
   "notifications.column_settings.admin.report": "ڕاپۆرتە نوێیەکان:",
   "notifications.column_settings.admin.sign_up": "چوونەژوورەوەی نوێ:",
   "notifications.column_settings.alert": "ئاگانامەکانی پیشانگەرر ڕومێزی",
-  "notifications.column_settings.filter_bar.advanced": "هەموو پۆلەکان پیشان بدە",
-  "notifications.column_settings.filter_bar.category": "شریتی پاڵێوەری خێرا",
-  "notifications.column_settings.filter_bar.show_bar": "نیشاندانی شریتی پاڵافتن",
   "notifications.column_settings.follow": "شوێنکەوتوانی نوێ:",
   "notifications.column_settings.follow_request": "شوینکەوتنی داواکاری نوێ:",
   "notifications.column_settings.mention": "ئاماژەکان:",
diff --git a/app/javascript/mastodon/locales/co.json b/app/javascript/mastodon/locales/co.json
index 9d0b0306c8e5c4..e547382a7cb56d 100644
--- a/app/javascript/mastodon/locales/co.json
+++ b/app/javascript/mastodon/locales/co.json
@@ -167,7 +167,6 @@
   "hashtag.column_settings.tag_mode.any": "Unu di quessi",
   "hashtag.column_settings.tag_mode.none": "Nisunu di quessi",
   "hashtag.column_settings.tag_toggle": "Inchjude tag addiziunali per sta colonna",
-  "home.column_settings.basic": "Bàsichi",
   "home.column_settings.show_reblogs": "Vede e spartere",
   "home.column_settings.show_replies": "Vede e risposte",
   "home.hide_announcements": "Piattà annunzii",
@@ -258,8 +257,6 @@
   "notifications.clear": "Purgà e nutificazione",
   "notifications.clear_confirmation": "Site sicuru·a che vulete toglie tutte ste nutificazione?",
   "notifications.column_settings.alert": "Nutificazione nant'à l'urdinatore",
-  "notifications.column_settings.filter_bar.advanced": "Affissà tutte e categurie",
-  "notifications.column_settings.filter_bar.category": "Barra di ricerca pronta",
   "notifications.column_settings.follow": "Abbunati novi:",
   "notifications.column_settings.follow_request": "Nove dumande d'abbunamentu:",
   "notifications.column_settings.mention": "Minzione:",
diff --git a/app/javascript/mastodon/locales/cs.json b/app/javascript/mastodon/locales/cs.json
index 00b27e05216d93..5beb06d9b24fbf 100644
--- a/app/javascript/mastodon/locales/cs.json
+++ b/app/javascript/mastodon/locales/cs.json
@@ -314,7 +314,6 @@
   "hashtag.follow": "Sledovat hashtag",
   "hashtag.unfollow": "Přestat sledovat hashtag",
   "hashtags.and_other": "…a {count, plural, one {# další} few {# další} other {# dalších}}",
-  "home.column_settings.basic": "Základní",
   "home.column_settings.show_reblogs": "Zobrazit boosty",
   "home.column_settings.show_replies": "Zobrazit odpovědi",
   "home.hide_announcements": "Skrýt oznámení",
@@ -446,9 +445,6 @@
   "notifications.column_settings.admin.sign_up": "Nové registrace:",
   "notifications.column_settings.alert": "Oznámení na počítači",
   "notifications.column_settings.favourite": "Oblíbené:",
-  "notifications.column_settings.filter_bar.advanced": "Zobrazit všechny kategorie",
-  "notifications.column_settings.filter_bar.category": "Panel rychlého filtrování",
-  "notifications.column_settings.filter_bar.show_bar": "Zobrazit panel filtrů",
   "notifications.column_settings.follow": "Noví sledující:",
   "notifications.column_settings.follow_request": "Nové žádosti o sledování:",
   "notifications.column_settings.mention": "Zmínky:",
diff --git a/app/javascript/mastodon/locales/cy.json b/app/javascript/mastodon/locales/cy.json
index 0c1472dcad91fe..583660b28315d4 100644
--- a/app/javascript/mastodon/locales/cy.json
+++ b/app/javascript/mastodon/locales/cy.json
@@ -314,7 +314,6 @@
   "hashtag.follow": "Dilyn hashnod",
   "hashtag.unfollow": "Dad-ddilyn hashnod",
   "hashtags.and_other": "…a {count, plural, other {# more}}",
-  "home.column_settings.basic": "Syml",
   "home.column_settings.show_reblogs": "Dangos hybiau",
   "home.column_settings.show_replies": "Dangos atebion",
   "home.hide_announcements": "Cuddio cyhoeddiadau",
@@ -446,9 +445,6 @@
   "notifications.column_settings.admin.sign_up": "Cofrestriadau newydd:",
   "notifications.column_settings.alert": "Hysbysiadau bwrdd gwaith",
   "notifications.column_settings.favourite": "Ffefrynnau:",
-  "notifications.column_settings.filter_bar.advanced": "Dangos pob categori",
-  "notifications.column_settings.filter_bar.category": "Bar hidlo cyflym",
-  "notifications.column_settings.filter_bar.show_bar": "Dangos y bar hidlo",
   "notifications.column_settings.follow": "Dilynwyr newydd:",
   "notifications.column_settings.follow_request": "Ceisiadau dilyn newydd:",
   "notifications.column_settings.mention": "Crybwylliadau:",
diff --git a/app/javascript/mastodon/locales/da.json b/app/javascript/mastodon/locales/da.json
index b9ef82bf0c68ea..ddc0440abcbbf6 100644
--- a/app/javascript/mastodon/locales/da.json
+++ b/app/javascript/mastodon/locales/da.json
@@ -241,6 +241,7 @@
   "empty_column.list": "Der er ikke noget på denne liste endnu. Når medlemmer af listen udgiver nye indlæg vil de fremgå hér.",
   "empty_column.lists": "Du har endnu ingen lister. Når du opretter én, vil den fremgå hér.",
   "empty_column.mutes": "Du har endnu ikke skjult (muted) nogle brugere.",
+  "empty_column.notification_requests": "Alt er klar! Der er intet her. Når der modtages nye notifikationer, fremgår de her jf. dine indstillinger.",
   "empty_column.notifications": "Du har endnu ingen notifikationer. Når andre interagerer med dig, vil det fremgå hér.",
   "empty_column.public": "Der er intet hér! Skriv noget offentligt eller følg manuelt brugere fra andre servere for at se indhold",
   "error.unexpected_crash.explanation": "Grundet en fejl i vores kode, eller en browser-kompatibilitetsfejl, kunne siden ikke vises korrekt.",
@@ -271,6 +272,7 @@
   "filter_modal.select_filter.subtitle": "Vælg en eksisterende kategori eller opret en ny",
   "filter_modal.select_filter.title": "Filtrér dette indlæg",
   "filter_modal.title.status": "Filtrér et indlæg",
+  "filtered_notifications_banner.title": "Filtrerede notifikationer",
   "firehose.all": "Alle",
   "firehose.local": "Denne server",
   "firehose.remote": "Andre servere",
@@ -314,7 +316,6 @@
   "hashtag.follow": "Følg hashtag",
   "hashtag.unfollow": "Stop med at følge hashtag",
   "hashtags.and_other": "…og {count, plural, one {}other {# flere}}",
-  "home.column_settings.basic": "Grundlæggende",
   "home.column_settings.show_reblogs": "Vis boosts",
   "home.column_settings.show_replies": "Vis svar",
   "home.hide_announcements": "Skjul bekendtgørelser",
@@ -440,15 +441,16 @@
   "notification.reblog": "{name} boostede dit indlæg",
   "notification.status": "{name} har netop postet",
   "notification.update": "{name} redigerede et indlæg",
+  "notification_requests.accept": "Acceptér",
+  "notification_requests.dismiss": "Afvis",
+  "notification_requests.notifications_from": "Notifikationer fra {name}",
+  "notification_requests.title": "Filtrerede notifikationer",
   "notifications.clear": "Ryd notifikationer",
   "notifications.clear_confirmation": "Er du sikker på, at du vil rydde alle dine notifikationer permanent?",
   "notifications.column_settings.admin.report": "Nye anmeldelser:",
   "notifications.column_settings.admin.sign_up": "Nye tilmeldinger:",
   "notifications.column_settings.alert": "Computernotifikationer",
   "notifications.column_settings.favourite": "Favoritter:",
-  "notifications.column_settings.filter_bar.advanced": "Vis alle kategorier",
-  "notifications.column_settings.filter_bar.category": "Hurtigfilterbjælke",
-  "notifications.column_settings.filter_bar.show_bar": "Vis filterbjælke",
   "notifications.column_settings.follow": "Nye følgere:",
   "notifications.column_settings.follow_request": "Nye følgeanmodninger:",
   "notifications.column_settings.mention": "Omtaler:",
@@ -474,6 +476,15 @@
   "notifications.permission_denied": "Computernotifikationer er utilgængelige grundet tidligere afvist browsertilladelsesanmodning",
   "notifications.permission_denied_alert": "Computernotifikationer kan ikke aktiveres, da browsertilladelse tidligere blev nægtet",
   "notifications.permission_required": "Computernotifikationer er utilgængelige, da den krævede tilladelse ikke er tildelt.",
+  "notifications.policy.filter_new_accounts.hint": "Oprettet indenfor {days, plural, one {den seneste dag} other {de seneste # dage}}",
+  "notifications.policy.filter_new_accounts_title": "Ny konti",
+  "notifications.policy.filter_not_followers_hint": "Inklusiv personer, som har fulgt dig {days, plural, one {mindre end én dag} other {færre end # dage}}",
+  "notifications.policy.filter_not_followers_title": "Folk, som ikke følger dig",
+  "notifications.policy.filter_not_following_hint": "Indtil de manuelt godkendes",
+  "notifications.policy.filter_not_following_title": "Folk, du ikke følger",
+  "notifications.policy.filter_private_mentions_hint": "Filtreret, medmindre det er i svar på egen omtale, eller hvis afsenderen følges",
+  "notifications.policy.filter_private_mentions_title": "Uopfordrede private omtaler",
+  "notifications.policy.title": "Bortfiltrér notifikationer fra…",
   "notifications_permission_banner.enable": "Aktivér computernotifikationer",
   "notifications_permission_banner.how_to_control": "Aktivér computernotifikationer for at få besked, når Mastodon ikke er åben. Når de er aktiveret, kan man via knappen {icon} ovenfor præcist styre, hvilke typer af interaktioner, som genererer computernotifikationer.",
   "notifications_permission_banner.title": "Gå aldrig glip af noget",
diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json
index 3700b5d91d2581..70537cdb05760b 100644
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@@ -241,6 +241,7 @@
   "empty_column.list": "Diese Liste ist derzeit leer. Wenn Konten auf dieser Liste neue Beiträge veröffentlichen, werden sie hier erscheinen.",
   "empty_column.lists": "Du hast noch keine Listen. Sobald du eine anlegst, wird sie hier erscheinen.",
   "empty_column.mutes": "Du hast keine Profile stummgeschaltet.",
+  "empty_column.notification_requests": "Alles klar! Hier gibt es nichts. Wenn Sie neue Mitteilungen erhalten, werden diese entsprechend Ihren Einstellungen hier angezeigt.",
   "empty_column.notifications": "Du hast noch keine Benachrichtigungen. Sobald andere Personen mit dir interagieren, wirst du hier darüber informiert.",
   "empty_column.public": "Hier ist nichts zu sehen! Schreibe etwas öffentlich oder folge Profilen von anderen Servern, um die Timeline aufzufüllen",
   "error.unexpected_crash.explanation": "Wegen eines Fehlers in unserem Code oder aufgrund einer Browser-Inkompatibilität kann diese Seite nicht korrekt angezeigt werden.",
@@ -271,6 +272,8 @@
   "filter_modal.select_filter.subtitle": "Einem vorhandenen Filter hinzufügen oder einen neuen erstellen",
   "filter_modal.select_filter.title": "Diesen Beitrag filtern",
   "filter_modal.title.status": "Beitrag per Filter ausblenden",
+  "filtered_notifications_banner.pending_requests": "Benachrichtigungen von {count, plural, =0 {keinem Profil, das du möglicherweise kennst} one {einem Profil, das du möglicherweise kennst} other {# Profilen, die du möglicherweise kennst}}",
+  "filtered_notifications_banner.title": "Gefilterte Benachrichtigungen",
   "firehose.all": "Alles",
   "firehose.local": "Dieser Server",
   "firehose.remote": "Andere Server",
@@ -314,7 +317,6 @@
   "hashtag.follow": "Hashtag folgen",
   "hashtag.unfollow": "Hashtag entfolgen",
   "hashtags.and_other": "… und {count, plural, one{# weiterer} other {# weitere}}",
-  "home.column_settings.basic": "Allgemein",
   "home.column_settings.show_reblogs": "Geteilte Beiträge anzeigen",
   "home.column_settings.show_replies": "Antworten anzeigen",
   "home.hide_announcements": "Ankündigungen ausblenden",
@@ -440,15 +442,16 @@
   "notification.reblog": "{name} teilte deinen Beitrag",
   "notification.status": "{name} hat gerade etwas gepostet",
   "notification.update": "{name} bearbeitete einen Beitrag",
+  "notification_requests.accept": "Akzeptieren",
+  "notification_requests.dismiss": "Ablehnen",
+  "notification_requests.notifications_from": "Benachrichtigungen von {name}",
+  "notification_requests.title": "Gefilterte Benachrichtigungen",
   "notifications.clear": "Benachrichtigungen löschen",
   "notifications.clear_confirmation": "Möchtest du wirklich alle Benachrichtigungen für immer löschen?",
   "notifications.column_settings.admin.report": "Neue Meldungen:",
   "notifications.column_settings.admin.sign_up": "Neue Registrierungen:",
   "notifications.column_settings.alert": "Desktop-Benachrichtigungen",
   "notifications.column_settings.favourite": "Favoriten:",
-  "notifications.column_settings.filter_bar.advanced": "Alle Filterkategorien anzeigen",
-  "notifications.column_settings.filter_bar.category": "Filterleiste:",
-  "notifications.column_settings.filter_bar.show_bar": "Filterleiste anzeigen",
   "notifications.column_settings.follow": "Neue Follower:",
   "notifications.column_settings.follow_request": "Neue Follower-Anfragen:",
   "notifications.column_settings.mention": "Erwähnungen:",
@@ -474,6 +477,15 @@
   "notifications.permission_denied": "Desktop-Benachrichtigungen können aufgrund einer zuvor verweigerten Berechtigung nicht aktiviert werden",
   "notifications.permission_denied_alert": "Desktop-Benachrichtigungen können nicht aktiviert werden, da die Browser-Berechtigung zuvor verweigert wurde",
   "notifications.permission_required": "Desktop-Benachrichtigungen sind nicht verfügbar, da die erforderliche Berechtigung nicht erteilt wurde.",
+  "notifications.policy.filter_new_accounts.hint": "Innerhalb {days, plural, one {des letzten Tages} other {der letzten # Tagen}} erstellt",
+  "notifications.policy.filter_new_accounts_title": "Neuen Konten",
+  "notifications.policy.filter_not_followers_hint": "Einschließlich Profilen, die dir seit weniger als {days, plural, one {einem Tag} other {# Tagen}} folgen",
+  "notifications.policy.filter_not_followers_title": "Profilen, die mir nicht folgen",
+  "notifications.policy.filter_not_following_hint": "Solange du sie nicht manuell akzeptierst",
+  "notifications.policy.filter_not_following_title": "Profilen, denen ich nicht folge",
+  "notifications.policy.filter_private_mentions_hint": "Solange sie keine Antwort auf deine Erwähnung ist oder du dem Profil nicht folgst",
+  "notifications.policy.filter_private_mentions_title": "Unerwünschten privaten Erwähnungen",
+  "notifications.policy.title": "Benachrichtigungen herausfiltern von …",
   "notifications_permission_banner.enable": "Aktiviere Desktop-Benachrichtigungen",
   "notifications_permission_banner.how_to_control": "Um Benachrichtigungen zu erhalten, wenn Mastodon nicht geöffnet ist, aktiviere die Desktop-Benachrichtigungen. Du kannst genau bestimmen, welche Arten von Interaktionen Desktop-Benachrichtigungen über die {icon} -Taste erzeugen, sobald diese aktiviert sind.",
   "notifications_permission_banner.title": "Nichts verpassen",
diff --git a/app/javascript/mastodon/locales/el.json b/app/javascript/mastodon/locales/el.json
index a5ed320831c7e7..5d1f03b0907588 100644
--- a/app/javascript/mastodon/locales/el.json
+++ b/app/javascript/mastodon/locales/el.json
@@ -289,7 +289,6 @@
   "hashtag.column_settings.tag_toggle": "Προσθήκη επιπλέον ταμπελών για την κολώνα",
   "hashtag.follow": "Παρακολούθηση ετικέτας",
   "hashtag.unfollow": "Διακοπή παρακολούθησης ετικέτας",
-  "home.column_settings.basic": "Βασικές ρυθμίσεις",
   "home.column_settings.show_reblogs": "Εμφάνιση προωθήσεων",
   "home.column_settings.show_replies": "Εμφάνιση απαντήσεων",
   "home.hide_announcements": "Απόκρυψη ανακοινώσεων",
@@ -411,9 +410,6 @@
   "notifications.column_settings.admin.sign_up": "Νέες εγγραφές:",
   "notifications.column_settings.alert": "Ειδοποιήσεις επιφάνειας εργασίας",
   "notifications.column_settings.favourite": "Αγαπημένα:",
-  "notifications.column_settings.filter_bar.advanced": "Εμφάνιση όλων των κατηγοριών",
-  "notifications.column_settings.filter_bar.category": "Μπάρα γρήγορου φίλτρου",
-  "notifications.column_settings.filter_bar.show_bar": "Εμφάνιση μπάρας φίλτρου",
   "notifications.column_settings.follow": "Νέοι ακόλουθοι:",
   "notifications.column_settings.follow_request": "Νέο αίτημα ακολούθησης:",
   "notifications.column_settings.mention": "Επισημάνσεις:",
diff --git a/app/javascript/mastodon/locales/en-GB.json b/app/javascript/mastodon/locales/en-GB.json
index 6232207af2f865..e88209625f3bc5 100644
--- a/app/javascript/mastodon/locales/en-GB.json
+++ b/app/javascript/mastodon/locales/en-GB.json
@@ -308,7 +308,6 @@
   "hashtag.follow": "Follow hashtag",
   "hashtag.unfollow": "Unfollow hashtag",
   "hashtags.and_other": "…and {count, plural, one {one more} other {# more}}",
-  "home.column_settings.basic": "Basic",
   "home.column_settings.show_reblogs": "Show boosts",
   "home.column_settings.show_replies": "Show replies",
   "home.hide_announcements": "Hide announcements",
@@ -440,9 +439,6 @@
   "notifications.column_settings.admin.sign_up": "New sign-ups:",
   "notifications.column_settings.alert": "Desktop notifications",
   "notifications.column_settings.favourite": "Favourites:",
-  "notifications.column_settings.filter_bar.advanced": "Display all categories",
-  "notifications.column_settings.filter_bar.category": "Quick filter bar",
-  "notifications.column_settings.filter_bar.show_bar": "Show filter bar",
   "notifications.column_settings.follow": "New followers:",
   "notifications.column_settings.follow_request": "New follow requests:",
   "notifications.column_settings.mention": "Mentions:",
diff --git a/app/javascript/mastodon/locales/eo.json b/app/javascript/mastodon/locales/eo.json
index 911502d85ff891..5d2dc61135c6fc 100644
--- a/app/javascript/mastodon/locales/eo.json
+++ b/app/javascript/mastodon/locales/eo.json
@@ -295,7 +295,6 @@
   "hashtag.follow": "Sekvi la kradvorton",
   "hashtag.unfollow": "Ne plu sekvi la kradvorton",
   "hashtags.and_other": "…kaj {count, plural,other {# pli}}",
-  "home.column_settings.basic": "Bazaj agordoj",
   "home.column_settings.show_reblogs": "Montri diskonigojn",
   "home.column_settings.show_replies": "Montri respondojn",
   "home.hide_announcements": "Kaŝi la anoncojn",
@@ -427,9 +426,6 @@
   "notifications.column_settings.admin.sign_up": "Novaj registriĝoj:",
   "notifications.column_settings.alert": "Sciigoj de la retumilo",
   "notifications.column_settings.favourite": "Stelumoj:",
-  "notifications.column_settings.filter_bar.advanced": "Montri ĉiujn kategoriojn",
-  "notifications.column_settings.filter_bar.category": "Rapida filtra breto",
-  "notifications.column_settings.filter_bar.show_bar": "Montri la breton de filtrilo",
   "notifications.column_settings.follow": "Novaj sekvantoj:",
   "notifications.column_settings.follow_request": "Novaj petoj de sekvado:",
   "notifications.column_settings.mention": "Mencioj:",
diff --git a/app/javascript/mastodon/locales/es-AR.json b/app/javascript/mastodon/locales/es-AR.json
index ead3355589f76c..48d458005636db 100644
--- a/app/javascript/mastodon/locales/es-AR.json
+++ b/app/javascript/mastodon/locales/es-AR.json
@@ -241,6 +241,7 @@
   "empty_column.list": "Todavía no hay nada en esta lista. Cuando miembros de esta lista envíen nuevos mensaje, se mostrarán acá.",
   "empty_column.lists": "Todavía no tenés ninguna lista. Cuando creés una, se mostrará acá.",
   "empty_column.mutes": "Todavía no silenciaste a ningún usuario.",
+  "empty_column.notification_requests": "¡Todo limpio! No hay nada acá. Cuando recibás nuevas notificaciones, aparecerán acá, acorde a tu configuración.",
   "empty_column.notifications": "Todavía no tenés ninguna notificación. Cuando otras cuentas interactúen con vos, vas a ver la notificación acá.",
   "empty_column.public": "¡Naranja! Escribí algo públicamente, o seguí usuarios manualmente de otros servidores para ir llenando esta línea temporal",
   "error.unexpected_crash.explanation": "Debido a un error en nuestro código o a un problema de compatibilidad con el navegador web, esta página no se pudo mostrar correctamente.",
@@ -271,6 +272,8 @@
   "filter_modal.select_filter.subtitle": "Usar una categoría existente o crear una nueva",
   "filter_modal.select_filter.title": "Filtrar este mensaje",
   "filter_modal.title.status": "Filtrar un mensaje",
+  "filtered_notifications_banner.pending_requests": "Notificaciones de {count, plural, =0 {ninguna cuenta} one {una cuenta} other {# cuentas}} que podrías conocer",
+  "filtered_notifications_banner.title": "Notificaciones filtradas",
   "firehose.all": "Todos",
   "firehose.local": "Este servidor",
   "firehose.remote": "Otros servidores",
@@ -314,7 +317,6 @@
   "hashtag.follow": "Seguir etiqueta",
   "hashtag.unfollow": "Dejar de seguir etiqueta",
   "hashtags.and_other": "…y {count, plural, other {# más}}",
-  "home.column_settings.basic": "Básico",
   "home.column_settings.show_reblogs": "Mostrar adhesiones",
   "home.column_settings.show_replies": "Mostrar respuestas",
   "home.hide_announcements": "Ocultar anuncios",
@@ -440,15 +442,16 @@
   "notification.reblog": "{name} adhirió a tu mensaje",
   "notification.status": "{name} acaba de enviar un mensaje",
   "notification.update": "{name} editó un mensaje",
+  "notification_requests.accept": "Aceptar",
+  "notification_requests.dismiss": "Descartar",
+  "notification_requests.notifications_from": "Notificaciones de {name}",
+  "notification_requests.title": "Notificaciones filtradas",
   "notifications.clear": "Limpiar notificaciones",
   "notifications.clear_confirmation": "¿Estás seguro que querés limpiar todas tus notificaciones permanentemente?",
   "notifications.column_settings.admin.report": "Nuevas denuncias:",
   "notifications.column_settings.admin.sign_up": "Nuevos registros:",
   "notifications.column_settings.alert": "Notificaciones de escritorio",
   "notifications.column_settings.favourite": "Favoritos:",
-  "notifications.column_settings.filter_bar.advanced": "Mostrar todas las categorías",
-  "notifications.column_settings.filter_bar.category": "Barra de filtrado rápido",
-  "notifications.column_settings.filter_bar.show_bar": "Mostrar barra de filtros",
   "notifications.column_settings.follow": "Nuevos seguidores:",
   "notifications.column_settings.follow_request": "Nuevas solicitudes de seguimiento:",
   "notifications.column_settings.mention": "Menciones:",
@@ -474,6 +477,15 @@
   "notifications.permission_denied": "Las notificaciones de escritorio no están disponibles, debido a una solicitud de permiso del navegador web previamente denegada",
   "notifications.permission_denied_alert": "No se pueden habilitar las notificaciones de escritorio, ya que el permiso del navegador fue denegado antes",
   "notifications.permission_required": "Las notificaciones de escritorio no están disponibles porque no se concedió el permiso requerido.",
+  "notifications.policy.filter_new_accounts.hint": "Creada hace {days, plural, one {un día} other {# días}}",
+  "notifications.policy.filter_new_accounts_title": "Nuevas cuentas",
+  "notifications.policy.filter_not_followers_hint": "Incluyendo cuentas que te han estado siguiendo menos de {days, plural, one {un día} other {# días}}",
+  "notifications.policy.filter_not_followers_title": "Cuentas que no te siguen",
+  "notifications.policy.filter_not_following_hint": "Hasta que las aprobés manualmente",
+  "notifications.policy.filter_not_following_title": "Cuentas que no seguís",
+  "notifications.policy.filter_private_mentions_hint": "Filtradas, a menos que sea en respuesta a tu propia mención o si seguís al remitente",
+  "notifications.policy.filter_private_mentions_title": "Menciones privadas no solicitadas",
+  "notifications.policy.title": "Filtrar notificaciones de…",
   "notifications_permission_banner.enable": "Habilitar notificaciones de escritorio",
   "notifications_permission_banner.how_to_control": "Para recibir notificaciones cuando Mastodon no está abierto, habilitá las notificaciones de escritorio. Podés controlar con precisión qué tipos de interacciones generan notificaciones de escritorio a través del botón {icon} de arriba, una vez que estén habilitadas.",
   "notifications_permission_banner.title": "No te pierdas nada",
diff --git a/app/javascript/mastodon/locales/es-MX.json b/app/javascript/mastodon/locales/es-MX.json
index ba54843236c4a2..b1a7757081e48b 100644
--- a/app/javascript/mastodon/locales/es-MX.json
+++ b/app/javascript/mastodon/locales/es-MX.json
@@ -241,6 +241,7 @@
   "empty_column.list": "No hay nada en esta lista aún. Cuando miembros de esta lista publiquen nuevos estatus, estos aparecerán qui.",
   "empty_column.lists": "No tienes ninguna lista. cuando crees una, se mostrará aquí.",
   "empty_column.mutes": "Aún no has silenciado a ningún usuario.",
+  "empty_column.notification_requests": "¡Todo limpio! No hay nada aquí. Cuando recibas nuevas notificaciones, aparecerán aquí conforme a tu configuración.",
   "empty_column.notifications": "No tienes ninguna notificación aún. Interactúa con otros para empezar una conversación.",
   "empty_column.public": "¡No hay nada aquí! Escribe algo públicamente, o sigue usuarios de otras instancias manualmente para llenarlo",
   "error.unexpected_crash.explanation": "Debido a un error en nuestro código o a un problema de compatibilidad con el navegador, esta página no se ha podido mostrar correctamente.",
@@ -271,6 +272,8 @@
   "filter_modal.select_filter.subtitle": "Usar una categoría existente o crear una nueva",
   "filter_modal.select_filter.title": "Filtrar esta publicación",
   "filter_modal.title.status": "Filtrar una publicación",
+  "filtered_notifications_banner.pending_requests": "Notificaciones de {count, plural, =0 {nadie} one {una persona} other {# personas}} que podrías conocer",
+  "filtered_notifications_banner.title": "Notificaciones filtradas",
   "firehose.all": "Todas",
   "firehose.local": "Este servidor",
   "firehose.remote": "Otros servidores",
@@ -314,7 +317,6 @@
   "hashtag.follow": "Seguir etiqueta",
   "hashtag.unfollow": "Dejar de seguir etiqueta",
   "hashtags.and_other": "…y {count, plural, other {# más}}",
-  "home.column_settings.basic": "Básico",
   "home.column_settings.show_reblogs": "Mostrar retoots",
   "home.column_settings.show_replies": "Mostrar respuestas",
   "home.hide_announcements": "Ocultar anuncios",
@@ -440,15 +442,16 @@
   "notification.reblog": "{name} ha retooteado tu estado",
   "notification.status": "{name} acaba de publicar",
   "notification.update": "{name} editó una publicación",
+  "notification_requests.accept": "Aceptar",
+  "notification_requests.dismiss": "Descartar",
+  "notification_requests.notifications_from": "Notificaciones de {name}",
+  "notification_requests.title": "Notificaciones filtradas",
   "notifications.clear": "Limpiar notificaciones",
   "notifications.clear_confirmation": "¿Seguro de querer borrar permanentemente todas tus notificaciones?",
   "notifications.column_settings.admin.report": "Nuevas denuncias:",
   "notifications.column_settings.admin.sign_up": "Registros nuevos:",
   "notifications.column_settings.alert": "Notificaciones de escritorio",
   "notifications.column_settings.favourite": "Favoritos:",
-  "notifications.column_settings.filter_bar.advanced": "Mostrar todas las categorías",
-  "notifications.column_settings.filter_bar.category": "Barra de filtrado rápido",
-  "notifications.column_settings.filter_bar.show_bar": "Mostrar barra de filtros",
   "notifications.column_settings.follow": "Nuevos seguidores:",
   "notifications.column_settings.follow_request": "Nuevas solicitudes de seguimiento:",
   "notifications.column_settings.mention": "Menciones:",
@@ -474,6 +477,15 @@
   "notifications.permission_denied": "No se pueden habilitar las notificaciones de escritorio ya que se denegó el permiso.",
   "notifications.permission_denied_alert": "No se pueden habilitar las notificaciones de escritorio, ya que el permiso del navegador fue denegado anteriormente",
   "notifications.permission_required": "Las notificaciones de escritorio no están disponibles porque no se ha concedido el permiso requerido.",
+  "notifications.policy.filter_new_accounts.hint": "Creadas durante {days, plural, one {el último día} other {los últimos # días}}",
+  "notifications.policy.filter_new_accounts_title": "Cuentas nuevas",
+  "notifications.policy.filter_not_followers_hint": "Incluyendo personas que te han estado siguiendo desde hace menos de {days, plural, one {un día} other {# días}}",
+  "notifications.policy.filter_not_followers_title": "Personas que no te siguen",
+  "notifications.policy.filter_not_following_hint": "Hasta que las apruebes manualmente",
+  "notifications.policy.filter_not_following_title": "Personas que no sigues",
+  "notifications.policy.filter_private_mentions_hint": "Filtrada, a menos que sea en respuesta a tu propia mención, o si sigues al remitente",
+  "notifications.policy.filter_private_mentions_title": "Menciones privadas no solicitadas",
+  "notifications.policy.title": "Filtrar notificaciones de…",
   "notifications_permission_banner.enable": "Habilitar notificaciones de escritorio",
   "notifications_permission_banner.how_to_control": "Para recibir notificaciones cuando Mastodon no esté abierto, habilite las notificaciones de escritorio. Puedes controlar con precisión qué tipos de interacciones generan notificaciones de escritorio a través del botón {icon} de arriba una vez que estén habilitadas.",
   "notifications_permission_banner.title": "Nunca te pierdas nada",
diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json
index b4cc241814716c..d7f54a3e2a5a23 100644
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@@ -241,6 +241,7 @@
   "empty_column.list": "No hay nada en esta lista aún. Cuando miembros de esta lista publiquen nuevos estatus, estos aparecerán qui.",
   "empty_column.lists": "No tienes ninguna lista. cuando crees una, se mostrará aquí.",
   "empty_column.mutes": "Aún no has silenciado a ningún usuario.",
+  "empty_column.notification_requests": "¡Todo limpio! No hay nada aquí. Cuando recibas nuevas notificaciones, aparecerán aquí conforme a tu configuración.",
   "empty_column.notifications": "No tienes ninguna notificación aún. Interactúa con otros para empezar una conversación.",
   "empty_column.public": "¡No hay nada aquí! Escribe algo públicamente, o sigue usuarios de otras instancias manualmente para llenarlo",
   "error.unexpected_crash.explanation": "Debido a un error en nuestro código o a un problema de compatibilidad con el navegador, esta página no se ha podido mostrar correctamente.",
@@ -271,6 +272,8 @@
   "filter_modal.select_filter.subtitle": "Usar una categoría existente o crear una nueva",
   "filter_modal.select_filter.title": "Filtrar esta publicación",
   "filter_modal.title.status": "Filtrar una publicación",
+  "filtered_notifications_banner.pending_requests": "Notificaciones de {count, plural, =0 {nadie} one {una persona} other {# personas}} que podrías conocer",
+  "filtered_notifications_banner.title": "Notificaciones filtradas",
   "firehose.all": "Todas",
   "firehose.local": "Este servidor",
   "firehose.remote": "Otros servidores",
@@ -314,7 +317,6 @@
   "hashtag.follow": "Seguir etiqueta",
   "hashtag.unfollow": "Dejar de seguir etiqueta",
   "hashtags.and_other": "…y {count, plural, other {# más}}",
-  "home.column_settings.basic": "Básico",
   "home.column_settings.show_reblogs": "Mostrar impulsos",
   "home.column_settings.show_replies": "Mostrar respuestas",
   "home.hide_announcements": "Ocultar anuncios",
@@ -440,15 +442,16 @@
   "notification.reblog": "{name} ha impulsado tu publicación",
   "notification.status": "{name} acaba de publicar",
   "notification.update": "{name} editó una publicación",
+  "notification_requests.accept": "Aceptar",
+  "notification_requests.dismiss": "Descartar",
+  "notification_requests.notifications_from": "Notificaciones de {name}",
+  "notification_requests.title": "Notificaciones filtradas",
   "notifications.clear": "Limpiar notificaciones",
   "notifications.clear_confirmation": "¿Seguro que quieres limpiar permanentemente todas tus notificaciones?",
   "notifications.column_settings.admin.report": "Nuevos informes:",
   "notifications.column_settings.admin.sign_up": "Nuevos registros:",
   "notifications.column_settings.alert": "Notificaciones de escritorio",
   "notifications.column_settings.favourite": "Favoritos:",
-  "notifications.column_settings.filter_bar.advanced": "Mostrar todas las categorías",
-  "notifications.column_settings.filter_bar.category": "Barra de filtrado rápido",
-  "notifications.column_settings.filter_bar.show_bar": "Mostrar barra de filtros",
   "notifications.column_settings.follow": "Nuevos seguidores:",
   "notifications.column_settings.follow_request": "Nuevas solicitudes de seguimiento:",
   "notifications.column_settings.mention": "Menciones:",
@@ -474,6 +477,15 @@
   "notifications.permission_denied": "No se pueden habilitar las notificaciones de escritorio ya que se denegó el permiso.",
   "notifications.permission_denied_alert": "No se pueden habilitar las notificaciones de escritorio, ya que el permiso del navegador fue denegado anteriormente",
   "notifications.permission_required": "Las notificaciones de escritorio no están disponibles porque no se ha concedido el permiso requerido.",
+  "notifications.policy.filter_new_accounts.hint": "Creadas durante {days, plural, one {el último día} other {los últimos # días}}",
+  "notifications.policy.filter_new_accounts_title": "Cuentas nuevas",
+  "notifications.policy.filter_not_followers_hint": "Incluyendo personas que te han estado siguiendo desde hace menos de {days, plural, one {un día} other {# días}}",
+  "notifications.policy.filter_not_followers_title": "Personas que no te siguen",
+  "notifications.policy.filter_not_following_hint": "Hasta que las apruebes manualmente",
+  "notifications.policy.filter_not_following_title": "Personas que no sigues",
+  "notifications.policy.filter_private_mentions_hint": "Filtrada, a menos que sea en respuesta a tu propia mención, o si sigues al remitente",
+  "notifications.policy.filter_private_mentions_title": "Menciones privadas no solicitadas",
+  "notifications.policy.title": "Filtrar notificaciones de…",
   "notifications_permission_banner.enable": "Habilitar notificaciones de escritorio",
   "notifications_permission_banner.how_to_control": "Para recibir notificaciones cuando Mastodon no esté abierto, habilite las notificaciones de escritorio. Puedes controlar con precisión qué tipos de interacciones generan notificaciones de escritorio a través del botón {icon} de arriba una vez que estén habilitadas.",
   "notifications_permission_banner.title": "Nunca te pierdas nada",
diff --git a/app/javascript/mastodon/locales/et.json b/app/javascript/mastodon/locales/et.json
index be0c262c32c542..2759c96a10a4c6 100644
--- a/app/javascript/mastodon/locales/et.json
+++ b/app/javascript/mastodon/locales/et.json
@@ -314,7 +314,6 @@
   "hashtag.follow": "Jälgi silti",
   "hashtag.unfollow": "Lõpeta sildi jälgimine",
   "hashtags.and_other": "…ja {count, plural, one {}other {# veel}}",
-  "home.column_settings.basic": "Peamine",
   "home.column_settings.show_reblogs": "Näita jagamisi",
   "home.column_settings.show_replies": "Näita vastuseid",
   "home.hide_announcements": "Peida teadaanded",
@@ -446,9 +445,6 @@
   "notifications.column_settings.admin.sign_up": "Uued kasutajad:",
   "notifications.column_settings.alert": "Töölauateated",
   "notifications.column_settings.favourite": "Lemmikud:",
-  "notifications.column_settings.filter_bar.advanced": "Kuva kõik kategooriad",
-  "notifications.column_settings.filter_bar.category": "Kiirfiltri riba",
-  "notifications.column_settings.filter_bar.show_bar": "Näita filtririba",
   "notifications.column_settings.follow": "Uued jälgijad:",
   "notifications.column_settings.follow_request": "Uued jälgimistaotlused:",
   "notifications.column_settings.mention": "Mainimised:",
diff --git a/app/javascript/mastodon/locales/eu.json b/app/javascript/mastodon/locales/eu.json
index c21fa1d204d998..4af5aaaaf5f954 100644
--- a/app/javascript/mastodon/locales/eu.json
+++ b/app/javascript/mastodon/locales/eu.json
@@ -241,6 +241,7 @@
   "empty_column.list": "Ez dago ezer zerrenda honetan. Zerrenda honetako kideek bidalketa berriak argitaratzean, hemen agertuko dira.",
   "empty_column.lists": "Ez duzu zerrendarik oraindik. Baten bat sortzen duzunean hemen agertuko da.",
   "empty_column.mutes": "Ez duzu erabiltzailerik mututu oraindik.",
+  "empty_column.notification_requests": "Garbi-garbi! Ezertxo ere ez hemen. Jakinarazpenak jasotzen dituzunean, hemen agertuko dira zure ezarpenen arabera.",
   "empty_column.notifications": "Ez duzu jakinarazpenik oraindik. Jarri besteekin harremanetan elkarrizketa abiatzeko.",
   "empty_column.public": "Ez dago ezer hemen! Idatzi zerbait publikoki edo jarraitu eskuz beste zerbitzari batzuetako erabiltzaileei hau betetzen joateko",
   "error.unexpected_crash.explanation": "Gure kodean arazoren bat dela eta, edo nabigatzailearekin bateragarritasun arazoren bat dela eta, orri hau ezin izan da ongi bistaratu.",
@@ -271,6 +272,8 @@
   "filter_modal.select_filter.subtitle": "Hautatu lehendik dagoen kategoria bat edo sortu berria",
   "filter_modal.select_filter.title": "Iragazi bidalketa hau",
   "filter_modal.title.status": "Iragazi bidalketa bat",
+  "filtered_notifications_banner.pending_requests": "Ezagutu {count, plural, =0 {dezakezun inoren} one {dezakezun pertsona baten} other {ditzakezun # pertsonen}} jakinarazpenak",
+  "filtered_notifications_banner.title": "Iragazitako jakinarazpenak",
   "firehose.all": "Guztiak",
   "firehose.local": "Zerbitzari hau",
   "firehose.remote": "Beste zerbitzariak",
@@ -314,7 +317,6 @@
   "hashtag.follow": "Jarraitu traolari",
   "hashtag.unfollow": "Utzi traola jarraitzeari",
   "hashtags.and_other": "…eta {count, plural, one {}other {# gehiago}}",
-  "home.column_settings.basic": "Oinarrizkoa",
   "home.column_settings.show_reblogs": "Erakutsi bultzadak",
   "home.column_settings.show_replies": "Erakutsi erantzunak",
   "home.hide_announcements": "Ezkutatu iragarpenak",
@@ -440,15 +442,16 @@
   "notification.reblog": "{name}(e)k bultzada eman dio zure bidalketari",
   "notification.status": "{name} erabiltzaileak bidalketa egin berri du",
   "notification.update": "{name} erabiltzaileak bidalketa bat editatu du",
+  "notification_requests.accept": "Onartu",
+  "notification_requests.dismiss": "Baztertu",
+  "notification_requests.notifications_from": "{name} erabiltzailearen jakinarazpenak",
+  "notification_requests.title": "Iragazitako jakinarazpenak",
   "notifications.clear": "Garbitu jakinarazpenak",
   "notifications.clear_confirmation": "Ziur zure jakinarazpen guztiak behin betirako garbitu nahi dituzula?",
   "notifications.column_settings.admin.report": "Txosten berriak:",
   "notifications.column_settings.admin.sign_up": "Izen-emate berriak:",
   "notifications.column_settings.alert": "Mahaigaineko jakinarazpenak",
   "notifications.column_settings.favourite": "Gogokoak:",
-  "notifications.column_settings.filter_bar.advanced": "Erakutsi kategoria guztiak",
-  "notifications.column_settings.filter_bar.category": "Iragazki azkarraren barra",
-  "notifications.column_settings.filter_bar.show_bar": "Erakutsi iragazki-barra",
   "notifications.column_settings.follow": "Jarraitzaile berriak:",
   "notifications.column_settings.follow_request": "Jarraitzeko eskaera berriak:",
   "notifications.column_settings.mention": "Aipamenak:",
@@ -474,6 +477,15 @@
   "notifications.permission_denied": "Mahaigaineko jakinarazpenak ez daude erabilgarri, nabigatzaileari baimen eskaera ukatu zitzaiolako",
   "notifications.permission_denied_alert": "Mahaigaineko jakinarazpenak ezin dira gaitu, nabigatzaileari baimena ukatu zitzaiolako",
   "notifications.permission_required": "Mahaigaineko jakinarazpenak ez daude erabilgarri, horretarako behar den baimena ez delako eman.",
+  "notifications.policy.filter_new_accounts.hint": "Azken {days, plural, one {egunean} other {# egunetan}} sortua",
+  "notifications.policy.filter_new_accounts_title": "Kontu berriak",
+  "notifications.policy.filter_not_followers_hint": "{days, plural, one {Egun batez} other {# egunez}} baino gutxiago jarraitu zaituen jendea barne",
+  "notifications.policy.filter_not_followers_title": "Jarraitzen ez zaituen jendea",
+  "notifications.policy.filter_not_following_hint": "Eskuz onartzen dituzun arte",
+  "notifications.policy.filter_not_following_title": "Jarraitzen ez duzun jendea",
+  "notifications.policy.filter_private_mentions_hint": "Iragazita, baldin eta zure aipamenaren erantzuna bada edo bidaltzailea jarraitzen baduzu",
+  "notifications.policy.filter_private_mentions_title": "Eskatu gabeko aipamen pribatuak",
+  "notifications.policy.title": "Ez iragazi hemengo jakinarazpenak…",
   "notifications_permission_banner.enable": "Gaitu mahaigaineko jakinarazpenak",
   "notifications_permission_banner.how_to_control": "Mastodon irekita ez dagoenean jakinarazpenak jasotzeko, gaitu mahaigaineko jakinarazpenak. Mahaigaineko jakinarazpenak ze elkarrekintzak eragingo dituzten zehazki kontrolatu dezakezu goiko {icon} botoia erabiliz, gaituta daudenean.",
   "notifications_permission_banner.title": "Ez galdu ezer inoiz",
diff --git a/app/javascript/mastodon/locales/fa.json b/app/javascript/mastodon/locales/fa.json
index 9029ba3cb5c3cf..9e6128b873218d 100644
--- a/app/javascript/mastodon/locales/fa.json
+++ b/app/javascript/mastodon/locales/fa.json
@@ -314,7 +314,6 @@
   "hashtag.follow": "پی‌گرفتن برچسب",
   "hashtag.unfollow": "پی‌نگرفتن برچسب",
   "hashtags.and_other": "…و {count, plural, other {# بیش‌تر}}",
-  "home.column_settings.basic": "پایه‌ای",
   "home.column_settings.show_reblogs": "نمایش تقویت‌ها",
   "home.column_settings.show_replies": "نمایش پاسخ‌ها",
   "home.hide_announcements": "نهفتن اعلامیه‌ها",
@@ -446,9 +445,6 @@
   "notifications.column_settings.admin.sign_up": "ثبت نام‌های جدید:",
   "notifications.column_settings.alert": "آگاهی‌های میزکار",
   "notifications.column_settings.favourite": "برگزیده‌ها:",
-  "notifications.column_settings.filter_bar.advanced": "نمایش همۀ دسته‌ها",
-  "notifications.column_settings.filter_bar.category": "نوار پالایش سریع",
-  "notifications.column_settings.filter_bar.show_bar": "نمایش نوار پالایه",
   "notifications.column_settings.follow": "پی‌گیرندگان جدید:",
   "notifications.column_settings.follow_request": "درخواست‌های جدید پی‌گیری:",
   "notifications.column_settings.mention": "اشاره‌ها:",
diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index 7588b084fd670b..3f964a71015918 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -314,7 +314,6 @@
   "hashtag.follow": "Seuraa aihetunnistetta",
   "hashtag.unfollow": "Lopeta aihetunnisteen seuraaminen",
   "hashtags.and_other": "…ja {count, plural, other {# lisää}}",
-  "home.column_settings.basic": "Perusasetukset",
   "home.column_settings.show_reblogs": "Näytä tehostukset",
   "home.column_settings.show_replies": "Näytä vastaukset",
   "home.hide_announcements": "Piilota tiedotteet",
@@ -446,9 +445,6 @@
   "notifications.column_settings.admin.sign_up": "Uudet rekisteröitymiset:",
   "notifications.column_settings.alert": "Työpöytäilmoitukset",
   "notifications.column_settings.favourite": "Suosikit:",
-  "notifications.column_settings.filter_bar.advanced": "Näytä kaikki luokat",
-  "notifications.column_settings.filter_bar.category": "Pikasuodatuspalkki",
-  "notifications.column_settings.filter_bar.show_bar": "Näytä suodatinpalkki",
   "notifications.column_settings.follow": "Uudet seuraajat:",
   "notifications.column_settings.follow_request": "Uudet seuraamispyynnöt:",
   "notifications.column_settings.mention": "Maininnat:",
diff --git a/app/javascript/mastodon/locales/fo.json b/app/javascript/mastodon/locales/fo.json
index 13e49eb314a4dc..67b323e2cf967f 100644
--- a/app/javascript/mastodon/locales/fo.json
+++ b/app/javascript/mastodon/locales/fo.json
@@ -241,6 +241,7 @@
   "empty_column.list": "Einki er í hesum listanum enn. Tá limir í hesum listanum posta nýggjar postar, so síggjast teir her.",
   "empty_column.lists": "Tú hevur ongar goymdar listar enn. Tá tú gert ein lista, so sært tú hann her.",
   "empty_column.mutes": "Tú hevur enn ikki doyvt nakran brúkara.",
+  "empty_column.notification_requests": "Alt er klárt! Her er einki. Tá tú fært nýggjar fráboðanir, síggjast tær her sambært tínum stillingum.",
   "empty_column.notifications": "Tú hevur ongar fráboðanir enn. Tá onnur samskifta við teg, so sær tú fráboðaninar her.",
   "empty_column.public": "Einki er her! Skriva okkurt alment ella fylg brúkarum frá øðrum ambætarum fyri at fylla tilfar í",
   "error.unexpected_crash.explanation": "Orsakað av einum feili í okkara kotu ella orsakað av at kagin hjá tær ikki er sambæriligur við skipanina, so bar ikki til at vísa hesa síðuna rætt.",
@@ -271,6 +272,8 @@
   "filter_modal.select_filter.subtitle": "Brúka ein verandi bólk ella skapa ein nýggjan",
   "filter_modal.select_filter.title": "Filtrera hendan postin",
   "filter_modal.title.status": "Filtrera ein post",
+  "filtered_notifications_banner.pending_requests": "Fráboðanir frá {count, plural, =0 {ongum} one {einum persóni} other {# persónum}}, sum tú møguliga kennir",
+  "filtered_notifications_banner.title": "Sáldaðar fráboðanir",
   "firehose.all": "Allar",
   "firehose.local": "Hesin ambætarin",
   "firehose.remote": "Aðrir ambætarar",
@@ -314,7 +317,6 @@
   "hashtag.follow": "Fylg frámerki",
   "hashtag.unfollow": "Gevst at fylgja frámerki",
   "hashtags.and_other": "…og {count, plural, other {# afturat}}",
-  "home.column_settings.basic": "Grundleggjandi",
   "home.column_settings.show_reblogs": "Vís lyft",
   "home.column_settings.show_replies": "Vís svar",
   "home.hide_announcements": "Fjal kunngerðir",
@@ -440,15 +442,16 @@
   "notification.reblog": "{name} lyfti tín post",
   "notification.status": "{name} hevur júst postað",
   "notification.update": "{name} rættaði ein post",
+  "notification_requests.accept": "Góðtak",
+  "notification_requests.dismiss": "Avvís",
+  "notification_requests.notifications_from": "Fráboðanir frá {name}",
+  "notification_requests.title": "Sáldaðar fráboðanir",
   "notifications.clear": "Rudda fráboðanir",
   "notifications.clear_confirmation": "Ert tú vís/ur í, at tú vilt strika allar tínar fráboðanir?",
   "notifications.column_settings.admin.report": "Nýggjar fráboðanir:",
   "notifications.column_settings.admin.sign_up": "Nýggjar tilmeldingar:",
   "notifications.column_settings.alert": "Skriviborðsfráboðanir",
   "notifications.column_settings.favourite": "Dámdir postar:",
-  "notifications.column_settings.filter_bar.advanced": "Vís allar bólkar",
-  "notifications.column_settings.filter_bar.category": "Skjótfilturbjálki",
-  "notifications.column_settings.filter_bar.show_bar": "Vís filturbjálka",
   "notifications.column_settings.follow": "Nýggir fylgjarar:",
   "notifications.column_settings.follow_request": "Nýggjar umbønir um at fylgja:",
   "notifications.column_settings.mention": "Umrøður:",
@@ -474,6 +477,15 @@
   "notifications.permission_denied": "Skriviborðsfráboðanir eru ikki tøkar tí at ein kaga-umbøn áður bleiv noktað",
   "notifications.permission_denied_alert": "Tað ber ikki til at sláa skriviborðsfráboðanir til, tí at kagarættindi áður eru noktaði",
   "notifications.permission_required": "Skriviborðsfráboðanir eru ikki tøkar, tí at neyðugu rættindini eru ikki latin.",
+  "notifications.policy.filter_new_accounts.hint": "Stovnaðar {days, plural, one {seinasta dagin} other {seinastu # dagarnar}}",
+  "notifications.policy.filter_new_accounts_title": "Nýggjar kontur",
+  "notifications.policy.filter_not_followers_hint": "Íroknað fólk, sum hava fylgt tær styttri enn {days, plural, one {ein dag} other {# dagar}}",
+  "notifications.policy.filter_not_followers_title": "Fólk, sum ikki fylgja tær",
+  "notifications.policy.filter_not_following_hint": "Til tú góðkennir tey manuelt",
+  "notifications.policy.filter_not_following_title": "Fólk, sum tú ikki fylgir",
+  "notifications.policy.filter_private_mentions_hint": "Sáldaði, uttan so at tað er í svari til tínar egnu nevningar ella um tú fylgir sendaranum",
+  "notifications.policy.filter_private_mentions_title": "Óbidnar privatar umrøður",
+  "notifications.policy.title": "Sálda burtur fráboðanir frá…",
   "notifications_permission_banner.enable": "Ger skriviborðsfráboðanir virknar",
   "notifications_permission_banner.how_to_control": "Ger skriviborðsfráboðanir virknar fyri at móttaka fráboðanir, tá Mastodon ikki er opið. Tá tær eru gjørdar virknar, kanst tú stýra, hvørji sløg av samvirkni geva skriviborðsfráboðanir. Hetta umvegis {icon} knøttin omanfyri.",
   "notifications_permission_banner.title": "Miss einki",
diff --git a/app/javascript/mastodon/locales/fr-CA.json b/app/javascript/mastodon/locales/fr-CA.json
index fc969b02f436f8..8aff0b5afeb854 100644
--- a/app/javascript/mastodon/locales/fr-CA.json
+++ b/app/javascript/mastodon/locales/fr-CA.json
@@ -314,7 +314,6 @@
   "hashtag.follow": "Suivre ce hashtag",
   "hashtag.unfollow": "Ne plus suivre ce hashtag",
   "hashtags.and_other": "…et {count, plural, other {# de plus}}",
-  "home.column_settings.basic": "Basique",
   "home.column_settings.show_reblogs": "Afficher boosts",
   "home.column_settings.show_replies": "Afficher réponses",
   "home.hide_announcements": "Masquer les annonces",
@@ -446,9 +445,6 @@
   "notifications.column_settings.admin.sign_up": "Nouvelles inscriptions:",
   "notifications.column_settings.alert": "Notifications navigateur",
   "notifications.column_settings.favourite": "Favoris:",
-  "notifications.column_settings.filter_bar.advanced": "Afficher toutes les catégories",
-  "notifications.column_settings.filter_bar.category": "Barre de filtrage rapide",
-  "notifications.column_settings.filter_bar.show_bar": "Afficher la barre de filtre",
   "notifications.column_settings.follow": "Nouveaux⋅elles abonné⋅e⋅s:",
   "notifications.column_settings.follow_request": "Nouvelles demandes d’abonnement:",
   "notifications.column_settings.mention": "Mentions:",
diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json
index 8396679d06265d..223878f6f9656c 100644
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@@ -314,7 +314,6 @@
   "hashtag.follow": "Suivre le hashtag",
   "hashtag.unfollow": "Ne plus suivre le hashtag",
   "hashtags.and_other": "…et {count, plural, other {# de plus}}",
-  "home.column_settings.basic": "Basique",
   "home.column_settings.show_reblogs": "Afficher les partages",
   "home.column_settings.show_replies": "Afficher les réponses",
   "home.hide_announcements": "Masquer les annonces",
@@ -446,9 +445,6 @@
   "notifications.column_settings.admin.sign_up": "Nouvelles inscriptions :",
   "notifications.column_settings.alert": "Notifications du navigateur",
   "notifications.column_settings.favourite": "Favoris :",
-  "notifications.column_settings.filter_bar.advanced": "Afficher toutes les catégories",
-  "notifications.column_settings.filter_bar.category": "Barre de filtrage rapide",
-  "notifications.column_settings.filter_bar.show_bar": "Afficher la barre de filtre",
   "notifications.column_settings.follow": "Nouveaux·elles abonné·e·s :",
   "notifications.column_settings.follow_request": "Nouvelles demandes d’abonnement :",
   "notifications.column_settings.mention": "Mentions :",
diff --git a/app/javascript/mastodon/locales/fy.json b/app/javascript/mastodon/locales/fy.json
index bc4fecb93d476c..5757f2cde741b6 100644
--- a/app/javascript/mastodon/locales/fy.json
+++ b/app/javascript/mastodon/locales/fy.json
@@ -314,7 +314,6 @@
   "hashtag.follow": "Hashtag folgje",
   "hashtag.unfollow": "Hashtag ûntfolgje",
   "hashtags.and_other": "…en {count, plural, one {}other {# mear}}",
-  "home.column_settings.basic": "Algemien",
   "home.column_settings.show_reblogs": "Boosts toane",
   "home.column_settings.show_replies": "Reaksjes toane",
   "home.hide_announcements": "Meidielingen ferstopje",
@@ -446,9 +445,6 @@
   "notifications.column_settings.admin.sign_up": "Nije registraasjes:",
   "notifications.column_settings.alert": "Desktopmeldingen",
   "notifications.column_settings.favourite": "Favoriten:",
-  "notifications.column_settings.filter_bar.advanced": "Alle kategoryen toane",
-  "notifications.column_settings.filter_bar.category": "Flugge filterbalke",
-  "notifications.column_settings.filter_bar.show_bar": "Filterbalke toane",
   "notifications.column_settings.follow": "Nije folgers:",
   "notifications.column_settings.follow_request": "Nij folchfersyk:",
   "notifications.column_settings.mention": "Fermeldingen:",
diff --git a/app/javascript/mastodon/locales/ga.json b/app/javascript/mastodon/locales/ga.json
index a708088fbb3608..44af2fb4f6887a 100644
--- a/app/javascript/mastodon/locales/ga.json
+++ b/app/javascript/mastodon/locales/ga.json
@@ -249,7 +249,6 @@
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
   "hashtag.follow": "Lean haischlib",
   "hashtag.unfollow": "Ná lean haischlib",
-  "home.column_settings.basic": "Bunúsach",
   "home.column_settings.show_reblogs": "Taispeáin moltaí",
   "home.column_settings.show_replies": "Taispeán freagraí",
   "home.hide_announcements": "Cuir fógraí i bhfolach",
@@ -349,9 +348,6 @@
   "notifications.clear": "Glan fógraí",
   "notifications.column_settings.admin.report": "Tuairiscí nua:",
   "notifications.column_settings.alert": "Fógraí deisce",
-  "notifications.column_settings.filter_bar.advanced": "Taispeáin na catagóirí go léir",
-  "notifications.column_settings.filter_bar.category": "Barra scagaire tapa",
-  "notifications.column_settings.filter_bar.show_bar": "Taispeáin barra scagaire",
   "notifications.column_settings.follow": "Leantóirí nua:",
   "notifications.column_settings.follow_request": "Iarratais leanúnaí nua:",
   "notifications.column_settings.mention": "Tráchtanna:",
diff --git a/app/javascript/mastodon/locales/gd.json b/app/javascript/mastodon/locales/gd.json
index f4d12d6337c034..ae190a51b015e2 100644
--- a/app/javascript/mastodon/locales/gd.json
+++ b/app/javascript/mastodon/locales/gd.json
@@ -314,7 +314,6 @@
   "hashtag.follow": "Lean an taga hais",
   "hashtag.unfollow": "Na lean an taga hais tuilleadh",
   "hashtags.and_other": "…agus {count, plural, one {# eile} two {# eile} few {# eile} other {# eile}}",
-  "home.column_settings.basic": "Bunasach",
   "home.column_settings.show_reblogs": "Seall na brosnachaidhean",
   "home.column_settings.show_replies": "Seall na freagairtean",
   "home.hide_announcements": "Falaich na brathan-fios",
@@ -446,9 +445,6 @@
   "notifications.column_settings.admin.sign_up": "Clàraidhean ùra:",
   "notifications.column_settings.alert": "Brathan deasga",
   "notifications.column_settings.favourite": "Annsachdan:",
-  "notifications.column_settings.filter_bar.advanced": "Seall a h-uile roinn-seòrsa",
-  "notifications.column_settings.filter_bar.category": "Bàr-criathraidh luath",
-  "notifications.column_settings.filter_bar.show_bar": "Seall am bàr-criathraidh",
   "notifications.column_settings.follow": "Luchd-leantainn ùr:",
   "notifications.column_settings.follow_request": "Iarrtasan leantainn ùra:",
   "notifications.column_settings.mention": "Iomraidhean:",
diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json
index 91b6870be7f13b..52e0ee6f6d8c6c 100644
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@@ -314,7 +314,6 @@
   "hashtag.follow": "Seguir cancelo",
   "hashtag.unfollow": "Deixar de seguir cancelo",
   "hashtags.and_other": "…e {count, plural, one {}other {# máis}}",
-  "home.column_settings.basic": "Básico",
   "home.column_settings.show_reblogs": "Amosar compartidos",
   "home.column_settings.show_replies": "Amosar respostas",
   "home.hide_announcements": "Agochar anuncios",
@@ -446,9 +445,6 @@
   "notifications.column_settings.admin.sign_up": "Novas usuarias:",
   "notifications.column_settings.alert": "Notificacións de escritorio",
   "notifications.column_settings.favourite": "Favoritas:",
-  "notifications.column_settings.filter_bar.advanced": "Amosar todas as categorías",
-  "notifications.column_settings.filter_bar.category": "Barra de filtrado rápido",
-  "notifications.column_settings.filter_bar.show_bar": "Amosar barra de filtros",
   "notifications.column_settings.follow": "Novas seguidoras:",
   "notifications.column_settings.follow_request": "Novas peticións de seguimento:",
   "notifications.column_settings.mention": "Mencións:",
diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json
index 2eef70f0feff56..dcbc30308c9169 100644
--- a/app/javascript/mastodon/locales/he.json
+++ b/app/javascript/mastodon/locales/he.json
@@ -241,6 +241,7 @@
   "empty_column.list": "אין עדיין פריטים ברשימה. כאשר חברים ברשימה הזאת יפרסמו הודעות חדשות, הן יופיעו פה.",
   "empty_column.lists": "אין לך שום רשימות עדיין. לכשיהיו, הן תופענה כאן.",
   "empty_column.mutes": "עוד לא השתקת שום משתמש.",
+  "empty_column.notification_requests": "בום! אין פה כלום. כשיווצרו עוד התראות, הן יופיעו כאן על בסיס ההעדפות שלך.",
   "empty_column.notifications": "אין התראות עדיין. יאללה, הגיע הזמן להתחיל להתערבב.",
   "empty_column.public": "אין פה כלום! כדי למלא את הטור הזה אפשר לכתוב משהו, או להתחיל לעקוב אחרי אנשים מקהילות אחרות",
   "error.unexpected_crash.explanation": "עקב תקלה בקוד שלנו או בעיית תאימות דפדפן, לא ניתן להציג דף זה כראוי.",
@@ -271,6 +272,8 @@
   "filter_modal.select_filter.subtitle": "שימוש בקטגורייה קיימת או יצירת אחת חדשה",
   "filter_modal.select_filter.title": "סינון ההודעה הזו",
   "filter_modal.title.status": "סנן הודעה",
+  "filtered_notifications_banner.pending_requests": "{count, plural,=0 {אין התראות ממשתמשים ה}one {התראה אחת ממישהו/מישהי ה}other {יש # התראות ממשתמשים }}מוכרים לך",
+  "filtered_notifications_banner.title": "התראות מסוננות",
   "firehose.all": "הכל",
   "firehose.local": "שרת זה",
   "firehose.remote": "שרתים אחרים",
@@ -314,7 +317,6 @@
   "hashtag.follow": "לעקוב אחרי תגית",
   "hashtag.unfollow": "להפסיק לעקוב אחרי תגית",
   "hashtags.and_other": "…{count, plural,other {ועוד #}}",
-  "home.column_settings.basic": "למתחילים",
   "home.column_settings.show_reblogs": "הצגת הדהודים",
   "home.column_settings.show_replies": "הצגת תגובות",
   "home.hide_announcements": "הסתר הכרזות",
@@ -440,15 +442,16 @@
   "notification.reblog": "הודעתך הודהדה על ידי {name}",
   "notification.status": "{name} הרגע פרסמו",
   "notification.update": "{name} ערכו הודעה",
+  "notification_requests.accept": "לקבל",
+  "notification_requests.dismiss": "לבטל",
+  "notification_requests.notifications_from": "התראות מ־ {name}",
+  "notification_requests.title": "התראות מסוננות",
   "notifications.clear": "הסרת התראות",
   "notifications.clear_confirmation": "להסיר את כל ההתראות לצמיתות ? ",
   "notifications.column_settings.admin.report": "דו\"חות חדשים",
   "notifications.column_settings.admin.sign_up": "הרשמות חדשות:",
   "notifications.column_settings.alert": "התראות לשולחן העבודה",
   "notifications.column_settings.favourite": "חיבובים:",
-  "notifications.column_settings.filter_bar.advanced": "הצג את כל הקטגוריות",
-  "notifications.column_settings.filter_bar.category": "שורת סינון מהיר",
-  "notifications.column_settings.filter_bar.show_bar": "הצג שורת סינון",
   "notifications.column_settings.follow": "עוקבים חדשים:",
   "notifications.column_settings.follow_request": "בקשות מעקב חדשות:",
   "notifications.column_settings.mention": "פניות:",
@@ -474,6 +477,15 @@
   "notifications.permission_denied": "לא ניתן להציג התראות מסך כיוון כיוון שהרשאות דפדפן נשללו בעבר",
   "notifications.permission_denied_alert": "לא ניתן לאפשר נוטיפיקציות מסך שכן הדפדפן סורב הרשאה בעבר",
   "notifications.permission_required": "לא ניתן לאפשר נוטיפיקציות מסך כיוון שהרשאה דרושה לא ניתנה.",
+  "notifications.policy.filter_new_accounts.hint": "נוצר {days, plural,one {ביום האחרון} two {ביומיים האחרונים} other {ב־# הימים האחרונים}}",
+  "notifications.policy.filter_new_accounts_title": "חשבונות חדשים",
+  "notifications.policy.filter_not_followers_hint": "כולל משתמשים שעקבו אחריך פחות מ{days, plural,one {יום} two {יומיים} other {־# ימים}}",
+  "notifications.policy.filter_not_followers_title": "משתמשים שלא עוקבות.ים אחריך",
+  "notifications.policy.filter_not_following_hint": "עד שיאושרו ידנית על ידיך",
+  "notifications.policy.filter_not_following_title": "משתמשים שאינך עוקב(ת) אחריהםן",
+  "notifications.policy.filter_private_mentions_hint": "מסונן אלא אם זו תשובה למינשון שלך או אם אתם עוקבים אחרי העונה",
+  "notifications.policy.filter_private_mentions_title": "מינשונים בפרטי שלא הוזמנו",
+  "notifications.policy.title": "להסתיר התראות מ…",
   "notifications_permission_banner.enable": "לאפשר נוטיפיקציות מסך",
   "notifications_permission_banner.how_to_control": "כדי לקבל התראות גם כאשר מסטודון סגור יש לאפשר התראות מסך. ניתן לשלוט בדיוק איזה סוג של אינטראקציות יביא להתראות מסך דרך כפתור ה- {icon} מרגע שהן מאופשרות.",
   "notifications_permission_banner.title": "לעולם אל תחמיץ דבר",
diff --git a/app/javascript/mastodon/locales/hi.json b/app/javascript/mastodon/locales/hi.json
index f88fe195691374..edab89a84ae34c 100644
--- a/app/javascript/mastodon/locales/hi.json
+++ b/app/javascript/mastodon/locales/hi.json
@@ -277,7 +277,6 @@
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
   "hashtag.follow": "हैशटैग को फॉलो करें",
   "hashtag.unfollow": "हैशटैग को उनफ़ोल्लोव करें",
-  "home.column_settings.basic": "बुनियादी",
   "home.column_settings.show_reblogs": "बूस्ट दिखाए",
   "home.column_settings.show_replies": "जवाबों को दिखाए",
   "home.hide_announcements": "घोषणाएँ छिपाएँ",
@@ -376,8 +375,6 @@
   "notifications.clear": "सूचनाएं हटाए",
   "notifications.column_settings.admin.report": "नई रिपोर्ट:",
   "notifications.column_settings.favourite": "पसंदीदा:",
-  "notifications.column_settings.filter_bar.advanced": "सभी श्रेणियाँ दिखाएं",
-  "notifications.column_settings.filter_bar.category": "फ़िल्टर बार",
   "notifications.column_settings.follow": "नए फ़ॉलोअर्स",
   "notifications.column_settings.mention": "उल्लेख:",
   "notifications.column_settings.poll": "चुनाव परिणाम",
diff --git a/app/javascript/mastodon/locales/hr.json b/app/javascript/mastodon/locales/hr.json
index 9fe15f5a2d497d..45d1b53268bcbc 100644
--- a/app/javascript/mastodon/locales/hr.json
+++ b/app/javascript/mastodon/locales/hr.json
@@ -261,7 +261,6 @@
   "hashtag.column_settings.tag_toggle": "Uključi dodatne oznake za ovaj stupac",
   "hashtag.follow": "Prati hashtag",
   "hashtag.unfollow": "Prestani pratiti hashtag",
-  "home.column_settings.basic": "Osnovno",
   "home.column_settings.show_reblogs": "Pokaži boostove",
   "home.column_settings.show_replies": "Pokaži odgovore",
   "home.hide_announcements": "Sakrij najave",
@@ -358,8 +357,6 @@
   "notifications.clear": "Očisti obavijesti",
   "notifications.clear_confirmation": "Želite li zaista trajno očistiti sve Vaše obavijesti?",
   "notifications.column_settings.alert": "Obavijesti radne površine",
-  "notifications.column_settings.filter_bar.advanced": "Prikaži sve kategorije",
-  "notifications.column_settings.filter_bar.category": "Brza traka filtera",
   "notifications.column_settings.follow": "Novi pratitelji:",
   "notifications.column_settings.follow_request": "Novi zahtjevi za praćenje:",
   "notifications.column_settings.mention": "Spominjanja:",
diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json
index f499e08f6d2b94..5dd0e7aee567cf 100644
--- a/app/javascript/mastodon/locales/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@@ -241,6 +241,7 @@
   "empty_column.list": "A lista jelenleg üres. Ha a listatagok bejegyzést tesznek közzé, itt fog megjelenni.",
   "empty_column.lists": "Még nincs egyetlen listád sem. Ha létrehozol egyet, itt fog megjelenni.",
   "empty_column.mutes": "Még egy felhasználót sem némítottál le.",
+  "empty_column.notification_requests": "Minden tiszta! Itt nincs semmi. Ha új értesítéseket kapsz, azok itt jelennek meg a beállításoknak megfelelően.",
   "empty_column.notifications": "Jelenleg még nincsenek értesítéseid. Ha mások kapcsolatba lépnek veled, ezek itt lesznek láthatóak.",
   "empty_column.public": "Jelenleg itt nincs semmi! Írj valamit nyilvánosan vagy kövess más kiszolgálón levő felhasználókat, hogy megtöltsd.",
   "error.unexpected_crash.explanation": "Egy kód- vagy böngészőkompatibilitási hiba miatt ez az oldal nem jeleníthető meg helyesen.",
@@ -271,6 +272,8 @@
   "filter_modal.select_filter.subtitle": "Válassz egy meglévő kategóriát, vagy hozz létre egy újat",
   "filter_modal.select_filter.title": "E bejegyzés szűrése",
   "filter_modal.title.status": "Egy bejegyzés szűrése",
+  "filtered_notifications_banner.pending_requests": "Értesítések {count, plural, =0 {0 személytől} one {egy feltehetőleg ismert személytől} other {# feltehetőleg ismert személytől}}",
+  "filtered_notifications_banner.title": "Szűrt értesítések",
   "firehose.all": "Összes",
   "firehose.local": "Ez a kiszolgáló",
   "firehose.remote": "Egyéb kiszolgálók",
@@ -314,7 +317,6 @@
   "hashtag.follow": "Hashtag követése",
   "hashtag.unfollow": "Hashtag követésének megszüntetése",
   "hashtags.and_other": "…és {count, plural, other {# további}}",
-  "home.column_settings.basic": "Általános",
   "home.column_settings.show_reblogs": "Megtolások megjelenítése",
   "home.column_settings.show_replies": "Válaszok megjelenítése",
   "home.hide_announcements": "Közlemények elrejtése",
@@ -440,15 +442,16 @@
   "notification.reblog": "{name} megtolta a bejegyzésedet",
   "notification.status": "{name} bejegyzést tett közzé",
   "notification.update": "{name} szerkesztett egy bejegyzést",
+  "notification_requests.accept": "Elfogadás",
+  "notification_requests.dismiss": "Elvetés",
+  "notification_requests.notifications_from": "{name} értesítései",
+  "notification_requests.title": "Szűrt értesítések",
   "notifications.clear": "Értesítések törlése",
   "notifications.clear_confirmation": "Biztos, hogy véglegesen törölni akarod az összes értesítésed?",
   "notifications.column_settings.admin.report": "Új jelentések:",
   "notifications.column_settings.admin.sign_up": "Új regisztrálók:",
   "notifications.column_settings.alert": "Asztali értesítések",
   "notifications.column_settings.favourite": "Kedvencek:",
-  "notifications.column_settings.filter_bar.advanced": "Minden kategória megjelenítése",
-  "notifications.column_settings.filter_bar.category": "Gyorsszűrő sáv",
-  "notifications.column_settings.filter_bar.show_bar": "Szűrősáv megjelenítése",
   "notifications.column_settings.follow": "Új követők:",
   "notifications.column_settings.follow_request": "Új követési kérelmek:",
   "notifications.column_settings.mention": "Megemlítések:",
@@ -474,6 +477,15 @@
   "notifications.permission_denied": "Az asztali értesítések nem érhetők el a korábban elutasított böngészőengedély-kérelem miatt",
   "notifications.permission_denied_alert": "Az asztali értesítések nem engedélyezhetők a korábban elutasított böngésző engedély miatt",
   "notifications.permission_required": "Az asztali értesítések nem érhetőek el, mivel a szükséges engedély nem lett megadva.",
+  "notifications.policy.filter_new_accounts.hint": "Az elmúlt {days, plural, one {napban} other {# napban}} létrehozva",
+  "notifications.policy.filter_new_accounts_title": "Új fiókok",
+  "notifications.policy.filter_not_followers_hint": "Beleértve azokat, akik kevesebb mint {days, plural, one {egy napja} other {# napja}} követnek",
+  "notifications.policy.filter_not_followers_title": "Olyan emberek, akik nem követnek",
+  "notifications.policy.filter_not_following_hint": "Amíg kézileg jóvá nem hagyod őket",
+  "notifications.policy.filter_not_following_title": "Nem követett emberek",
+  "notifications.policy.filter_private_mentions_hint": "Kiszűrve, hacsak nem a saját említésedre válaszol, vagy ha nem követed a feladót",
+  "notifications.policy.filter_private_mentions_title": "Kéretlen személyes említések",
+  "notifications.policy.title": "Feladó értesítéseinek kiszűrése…",
   "notifications_permission_banner.enable": "Asztali értesítések engedélyezése",
   "notifications_permission_banner.how_to_control": "Ahhoz, hogy értesítéseket kapj akkor, amikor a Mastodon nincs megnyitva, engedélyezd az asztali értesítéseket. Pontosan be tudod állítani, hogy milyen interakciókról értesülj a fenti {icon} gombon keresztül, ha egyszer már engedélyezted őket.",
   "notifications_permission_banner.title": "Soha ne mulassz el semmit",
diff --git a/app/javascript/mastodon/locales/hy.json b/app/javascript/mastodon/locales/hy.json
index 6ddcfcdb2175da..67a7aa49ffb0ec 100644
--- a/app/javascript/mastodon/locales/hy.json
+++ b/app/javascript/mastodon/locales/hy.json
@@ -235,7 +235,6 @@
   "hashtag.column_settings.tag_toggle": "Ներառել լրացուցիչ պիտակները այս սիւնակում ",
   "hashtag.follow": "Հետեւել պիտակին",
   "hashtag.unfollow": "Չհետեւել պիտակին",
-  "home.column_settings.basic": "Հիմնական",
   "home.column_settings.show_reblogs": "Ցուցադրել տարածածները",
   "home.column_settings.show_replies": "Ցուցադրել պատասխանները",
   "home.hide_announcements": "Թաքցնել յայտարարութիւնները",
@@ -345,9 +344,6 @@
   "notifications.column_settings.admin.sign_up": "Նոր գրանցումներ՝",
   "notifications.column_settings.alert": "Աշխատատիրոյթի ծանուցումներ",
   "notifications.column_settings.favourite": "Հաւանածներ՝",
-  "notifications.column_settings.filter_bar.advanced": "Ցուցադրել բոլոր կատեգորիաները",
-  "notifications.column_settings.filter_bar.category": "Արագ զտման վահանակ",
-  "notifications.column_settings.filter_bar.show_bar": "Ցոյց տալ զտման պանելը",
   "notifications.column_settings.follow": "Նոր հետեւողներ՝",
   "notifications.column_settings.follow_request": "Նոր հետեւելու հայցեր:",
   "notifications.column_settings.mention": "Նշումներ՝",
diff --git a/app/javascript/mastodon/locales/ia.json b/app/javascript/mastodon/locales/ia.json
index 31c9ef7394c350..a935bf1112cf59 100644
--- a/app/javascript/mastodon/locales/ia.json
+++ b/app/javascript/mastodon/locales/ia.json
@@ -297,7 +297,6 @@
   "notifications.clear": "Rader notificationes",
   "notifications.column_settings.alert": "Notificationes de scriptorio",
   "notifications.column_settings.favourite": "Favoritos:",
-  "notifications.column_settings.filter_bar.advanced": "Monstrar tote le categorias",
   "notifications.column_settings.follow": "Nove sequitores:",
   "notifications.column_settings.mention": "Mentiones:",
   "notifications.column_settings.poll": "Resultatos del inquesta:",
diff --git a/app/javascript/mastodon/locales/id.json b/app/javascript/mastodon/locales/id.json
index 88e99a7086a757..9b841a08bb0bbc 100644
--- a/app/javascript/mastodon/locales/id.json
+++ b/app/javascript/mastodon/locales/id.json
@@ -270,7 +270,6 @@
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
   "hashtag.follow": "Ikuti tagar",
   "hashtag.unfollow": "Batalkan pengikutan tagar",
-  "home.column_settings.basic": "Dasar",
   "home.column_settings.show_reblogs": "Tampilkan boost",
   "home.column_settings.show_replies": "Tampilkan balasan",
   "home.hide_announcements": "Sembunyikan pengumuman",
@@ -381,9 +380,6 @@
   "notifications.column_settings.admin.report": "Laporan baru:",
   "notifications.column_settings.admin.sign_up": "Pendaftaran baru:",
   "notifications.column_settings.alert": "Notifikasi desktop",
-  "notifications.column_settings.filter_bar.advanced": "Tampilkan semua kategori",
-  "notifications.column_settings.filter_bar.category": "Bilah penyaring cepat",
-  "notifications.column_settings.filter_bar.show_bar": "Tampilkan bilah filter",
   "notifications.column_settings.follow": "Pengikut baru:",
   "notifications.column_settings.follow_request": "Permintaan mengikuti baru:",
   "notifications.column_settings.mention": "Balasan:",
diff --git a/app/javascript/mastodon/locales/ie.json b/app/javascript/mastodon/locales/ie.json
index 7bd938c1bf447e..1f60b42400347c 100644
--- a/app/javascript/mastodon/locales/ie.json
+++ b/app/javascript/mastodon/locales/ie.json
@@ -314,7 +314,6 @@
   "hashtag.follow": "Sequer hashtag",
   "hashtag.unfollow": "Dessequer hashtag",
   "hashtags.and_other": "…e {count, plural, other {# in plu}}",
-  "home.column_settings.basic": "Basic",
   "home.column_settings.show_reblogs": "Monstrar boosts",
   "home.column_settings.show_replies": "Monstrar responses",
   "home.hide_announcements": "Celar proclamationes",
@@ -446,9 +445,6 @@
   "notifications.column_settings.admin.sign_up": "Nov registrationes:",
   "notifications.column_settings.alert": "Notificationes sur li computator",
   "notifications.column_settings.favourite": "Favorites:",
-  "notifications.column_settings.filter_bar.advanced": "Monstrar omni categories",
-  "notifications.column_settings.filter_bar.category": "Rapid filtre-barre",
-  "notifications.column_settings.filter_bar.show_bar": "Monstrar filtre-barre",
   "notifications.column_settings.follow": "Nov sequitores:",
   "notifications.column_settings.follow_request": "Nov petitiones de sequer:",
   "notifications.column_settings.mention": "Mentiones:",
diff --git a/app/javascript/mastodon/locales/io.json b/app/javascript/mastodon/locales/io.json
index c468f689ab776e..235b6b92af66d0 100644
--- a/app/javascript/mastodon/locales/io.json
+++ b/app/javascript/mastodon/locales/io.json
@@ -292,7 +292,6 @@
   "hashtag.follow": "Sequez hashtago",
   "hashtag.unfollow": "Desequez hashtago",
   "hashtags.and_other": "…e {count, plural, one {# plusa}other {# plusa}}",
-  "home.column_settings.basic": "Simpla",
   "home.column_settings.show_reblogs": "Montrar repeti",
   "home.column_settings.show_replies": "Montrar respondi",
   "home.hide_announcements": "Celez anunci",
@@ -424,9 +423,6 @@
   "notifications.column_settings.admin.sign_up": "Nova registranti:",
   "notifications.column_settings.alert": "Desktopavizi",
   "notifications.column_settings.favourite": "Favoriziti:",
-  "notifications.column_settings.filter_bar.advanced": "Montrez omna kategorii",
-  "notifications.column_settings.filter_bar.category": "Rapidfiltrobaro",
-  "notifications.column_settings.filter_bar.show_bar": "Montrez filtrobaro",
   "notifications.column_settings.follow": "Nova sequanti:",
   "notifications.column_settings.follow_request": "Nova sequodemandi:",
   "notifications.column_settings.mention": "Mencioni:",
diff --git a/app/javascript/mastodon/locales/is.json b/app/javascript/mastodon/locales/is.json
index 1f42180159958c..2310325b7c36ee 100644
--- a/app/javascript/mastodon/locales/is.json
+++ b/app/javascript/mastodon/locales/is.json
@@ -241,6 +241,7 @@
   "empty_column.list": "Það er ennþá ekki neitt á þessum lista. Þegar meðlimir á listanum senda inn nýjar færslur, munu þær birtast hér.",
   "empty_column.lists": "Þú ert ennþá ekki með neina lista. Þegar þú býrð til einhvern lista, munu hann birtast hér.",
   "empty_column.mutes": "Þú hefur ekki þaggað niður í neinum notendum ennþá.",
+  "empty_column.notification_requests": "Allt hreint! Það er ekkert hér. Þegar þú færð nýjar tilkynningar, munu þær birtast hér í samræmi við stillingarnar þínar.",
   "empty_column.notifications": "Þú ert ekki ennþá með neinar tilkynningar. Vertu í samskiptum við aðra til að umræður fari af stað.",
   "empty_column.public": "Það er ekkert hér! Skrifaðu eitthvað opinberlega, eða fylgstu með notendum á öðrum netþjónum til að fylla upp í þetta",
   "error.unexpected_crash.explanation": "Vegna villu í kóðanum okkar eða samhæfnivandamála í vafra er ekki hægt að birta þessa síðu svo vel sé.",
@@ -271,6 +272,8 @@
   "filter_modal.select_filter.subtitle": "Notaðu fyrirliggjandi flokk eða útbúðu nýjan",
   "filter_modal.select_filter.title": "Sía þessa færslu",
   "filter_modal.title.status": "Sía færslu",
+  "filtered_notifications_banner.pending_requests": "Tilkynningar frá {count, plural, =0 {engum} one {einum aðila} other {# aðilum}} sem þú gætir þekkt",
+  "filtered_notifications_banner.title": "Síaðar tilkynningar",
   "firehose.all": "Allt",
   "firehose.local": "þessum netþjóni",
   "firehose.remote": "öðrum netþjónum",
@@ -314,7 +317,6 @@
   "hashtag.follow": "Fylgjast með myllumerki",
   "hashtag.unfollow": "Hætta að fylgjast með myllumerki",
   "hashtags.and_other": "…og {count, plural, other {# til viðbótar}}",
-  "home.column_settings.basic": "Einfalt",
   "home.column_settings.show_reblogs": "Sýna endurbirtingar",
   "home.column_settings.show_replies": "Birta svör",
   "home.hide_announcements": "Fela auglýsingar",
@@ -440,15 +442,16 @@
   "notification.reblog": "{name} endurbirti færsluna þína",
   "notification.status": "{name} sendi inn rétt í þessu",
   "notification.update": "{name} breytti færslu",
+  "notification_requests.accept": "Samþykkja",
+  "notification_requests.dismiss": "Afgreiða",
+  "notification_requests.notifications_from": "Tilkynningar frá {name}",
+  "notification_requests.title": "Síaðar tilkynningar",
   "notifications.clear": "Hreinsa tilkynningar",
   "notifications.clear_confirmation": "Ertu viss um að þú viljir endanlega eyða öllum tilkynningunum þínum?",
   "notifications.column_settings.admin.report": "Nýjar kærur:",
   "notifications.column_settings.admin.sign_up": "Nýjar skráningar:",
   "notifications.column_settings.alert": "Tilkynningar á skjáborði",
   "notifications.column_settings.favourite": "Eftirlæti:",
-  "notifications.column_settings.filter_bar.advanced": "Birta alla flokka",
-  "notifications.column_settings.filter_bar.category": "Skyndisíustika",
-  "notifications.column_settings.filter_bar.show_bar": "Birta síustikuna",
   "notifications.column_settings.follow": "Nýir fylgjendur:",
   "notifications.column_settings.follow_request": "Nýjar beiðnir um að fylgjast með:",
   "notifications.column_settings.mention": "Tilvísanir:",
@@ -474,6 +477,15 @@
   "notifications.permission_denied": "Tilkynningar á skjáborði eru ekki aðgengilegar megna áður hafnaðra beiðna fyrir vafra",
   "notifications.permission_denied_alert": "Ekki var hægt að virkja tilkynningar á skjáborði, þar sem heimildum fyrir vafra var áður hafnað",
   "notifications.permission_required": "Tilkynningar á skjáborði eru ekki aðgengilegar þar sem nauðsynlegar heimildir hafa ekki verið veittar.",
+  "notifications.policy.filter_new_accounts.hint": "Útbúið {days, plural, one {síðasta daginn} other {síðustu # daga}}",
+  "notifications.policy.filter_new_accounts_title": "Nýir notendur",
+  "notifications.policy.filter_not_followers_hint": "Þar með talið fólk sem hefur fylgst með þér í minna en {days, plural, one {einn dag} other {# daga}}",
+  "notifications.policy.filter_not_followers_title": "Fólk sem fylgist ekki með þér",
+  "notifications.policy.filter_not_following_hint": "Þar til þú samþykkir viðkomandi handvirkt",
+  "notifications.policy.filter_not_following_title": "Fólk sem þú fylgist ekki með",
+  "notifications.policy.filter_private_mentions_hint": "Síað nema það sé í svari við einhverju þar sem þú minntist á viðkomandi eða ef þú fylgist með sendandanum",
+  "notifications.policy.filter_private_mentions_title": "Óumbeðið einkaspjall",
+  "notifications.policy.title": "Sía út tilkynningar frá…",
   "notifications_permission_banner.enable": "Virkja tilkynningar á skjáborði",
   "notifications_permission_banner.how_to_control": "Til að taka á móti tilkynningum þegar Mastodon er ekki opið, skaltu virkja tilkynningar á skjáborði. Þegar þær eru orðnar virkar geturðu stýrt nákvæmlega hverskonar atvik framleiða tilkynningar með því að nota {icon}-hnappinn hér fyrir ofan.",
   "notifications_permission_banner.title": "Aldrei missa af neinu",
diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json
index 9e68216a332dda..303abd49822e33 100644
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@@ -241,6 +241,7 @@
   "empty_column.list": "Non c'è ancora nulla in questa lista. Quando i membri di questa lista pubblicheranno dei nuovi post, appariranno qui.",
   "empty_column.lists": "Non hai ancora alcuna lista. Quando ne creerai una, apparirà qui.",
   "empty_column.mutes": "Non hai ancora silenziato alcun utente.",
+  "empty_column.notification_requests": "Tutto chiaro! Non c'è niente qui. Quando ricevi nuove notifiche, verranno visualizzate qui in base alle tue impostazioni.",
   "empty_column.notifications": "Non hai ancora nessuna notifica. Quando altre persone interagiranno con te, le vedrai qui.",
   "empty_column.public": "Non c'è nulla qui! Scrivi qualcosa pubblicamente o segui manualmente gli utenti dagli altri server per riempire questo spazio",
   "error.unexpected_crash.explanation": "A causa di un bug nel nostro codice o di un problema di compatibilità del browser, non è stato possibile visualizzare correttamente questa pagina.",
@@ -271,6 +272,8 @@
   "filter_modal.select_filter.subtitle": "Usa una categoria esistente o creane una nuova",
   "filter_modal.select_filter.title": "Filtra questo post",
   "filter_modal.title.status": "Filtra un post",
+  "filtered_notifications_banner.pending_requests": "Notifiche da {count, plural, =0 {nessuna persona} one {una persona} other {# persone}} che potresti conoscere",
+  "filtered_notifications_banner.title": "Notifiche filtrate",
   "firehose.all": "Tutto",
   "firehose.local": "Questo server",
   "firehose.remote": "Altri server",
@@ -314,7 +317,6 @@
   "hashtag.follow": "Segui l'hashtag",
   "hashtag.unfollow": "Smetti di seguire l'hashtag",
   "hashtags.and_other": "…e {count, plural, other {# in più}}",
-  "home.column_settings.basic": "Base",
   "home.column_settings.show_reblogs": "Mostra reblog",
   "home.column_settings.show_replies": "Mostra risposte",
   "home.hide_announcements": "Nascondi annunci",
@@ -440,15 +442,16 @@
   "notification.reblog": "{name} ha rebloggato il tuo post",
   "notification.status": "{name} ha appena pubblicato un post",
   "notification.update": "{name} ha modificato un post",
+  "notification_requests.accept": "Accetta",
+  "notification_requests.dismiss": "Ignora",
+  "notification_requests.notifications_from": "Notifiche da {name}",
+  "notification_requests.title": "Notifiche filtrate",
   "notifications.clear": "Cancella le notifiche",
   "notifications.clear_confirmation": "Sei sicuro di voler cancellare permanentemente tutte le tue notifiche?",
   "notifications.column_settings.admin.report": "Nuove segnalazioni:",
   "notifications.column_settings.admin.sign_up": "Nuove iscrizioni:",
   "notifications.column_settings.alert": "Notifiche desktop",
   "notifications.column_settings.favourite": "Preferiti:",
-  "notifications.column_settings.filter_bar.advanced": "Mostra tutte le categorie",
-  "notifications.column_settings.filter_bar.category": "Barra rapida del filtro",
-  "notifications.column_settings.filter_bar.show_bar": "Mostra la barra del filtro",
   "notifications.column_settings.follow": "Nuovi seguaci:",
   "notifications.column_settings.follow_request": "Nuove richieste di seguirti:",
   "notifications.column_settings.mention": "Menzioni:",
@@ -474,6 +477,15 @@
   "notifications.permission_denied": "Notifiche desktop non disponibili a causa della precedentemente negata richiesta di autorizzazioni del browser",
   "notifications.permission_denied_alert": "Impossibile abilitare le notifiche desktop, poiché l'autorizzazione del browser è stata precedentemente negata",
   "notifications.permission_required": "Notifiche destkop non disponibili poiché l'autorizzazione richiesta non è stata concessa.",
+  "notifications.policy.filter_new_accounts.hint": "Creato {days, plural, one {un giorno} other {# giorni}} fa",
+  "notifications.policy.filter_new_accounts_title": "Nuovi account",
+  "notifications.policy.filter_not_followers_hint": "Incluse le persone che ti seguono da meno di {days, plural, one {un giorno} other {# giorni}}",
+  "notifications.policy.filter_not_followers_title": "Persone che non ti seguono",
+  "notifications.policy.filter_not_following_hint": "Fino a quando non le approvi manualmente",
+  "notifications.policy.filter_not_following_title": "Persone che non segui",
+  "notifications.policy.filter_private_mentions_hint": "Filtrate, a meno che non sia in risposta alla tua menzione o se segui il mittente",
+  "notifications.policy.filter_private_mentions_title": "Menzioni private indesiderate",
+  "notifications.policy.title": "Filtra le notifiche da…",
   "notifications_permission_banner.enable": "Abilita le notifiche desktop",
   "notifications_permission_banner.how_to_control": "Per ricevere le notifiche quando Mastodon non è aperto, abilita le notifiche desktop. Puoi controllare precisamente quali tipi di interazioni generano le notifiche destkop, tramite il pulsante {icon} sopra, una volta abilitate.",
   "notifications_permission_banner.title": "Non perderti mai nulla",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index 27ed9816a79ee9..872293b2304318 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -314,7 +314,6 @@
   "hashtag.follow": "ハッシュタグをフォローする",
   "hashtag.unfollow": "ハッシュタグのフォローを解除",
   "hashtags.and_other": "ほか{count, plural, other {#個}}",
-  "home.column_settings.basic": "基本設定",
   "home.column_settings.show_reblogs": "ブースト表示",
   "home.column_settings.show_replies": "返信表示",
   "home.hide_announcements": "お知らせを隠す",
@@ -446,9 +445,6 @@
   "notifications.column_settings.admin.sign_up": "新規登録:",
   "notifications.column_settings.alert": "デスクトップ通知",
   "notifications.column_settings.favourite": "お気に入り:",
-  "notifications.column_settings.filter_bar.advanced": "すべてのカテゴリを表示",
-  "notifications.column_settings.filter_bar.category": "クイックフィルターバー:",
-  "notifications.column_settings.filter_bar.show_bar": "フィルターバーを表示",
   "notifications.column_settings.follow": "新しいフォロワー:",
   "notifications.column_settings.follow_request": "新しいフォローリクエスト:",
   "notifications.column_settings.mention": "返信:",
diff --git a/app/javascript/mastodon/locales/ka.json b/app/javascript/mastodon/locales/ka.json
index 8628cb38a227cd..964a764a93e4d2 100644
--- a/app/javascript/mastodon/locales/ka.json
+++ b/app/javascript/mastodon/locales/ka.json
@@ -114,7 +114,6 @@
   "follow_request.reject": "უარყოფა",
   "getting_started.heading": "დაწყება",
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
-  "home.column_settings.basic": "ძირითადი",
   "home.column_settings.show_reblogs": "ბუსტების ჩვენება",
   "home.column_settings.show_replies": "პასუხების ჩვენება",
   "keyboard_shortcuts.back": "უკან გადასასვლელად",
diff --git a/app/javascript/mastodon/locales/kab.json b/app/javascript/mastodon/locales/kab.json
index 94f620491fd39f..4ffae68bd0bd4a 100644
--- a/app/javascript/mastodon/locales/kab.json
+++ b/app/javascript/mastodon/locales/kab.json
@@ -242,7 +242,6 @@
   "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}}",
-  "home.column_settings.basic": "Igejdanen",
   "home.column_settings.show_reblogs": "Ssken-d beṭṭu",
   "home.column_settings.show_replies": "Ssken-d tiririyin",
   "home.hide_announcements": "Ffer ulɣuyen",
@@ -355,8 +354,6 @@
   "notifications.clear_confirmation": "Tebɣiḍ s tidet ad tekkseḍ akk tilɣa-inek·em i lebda?",
   "notifications.column_settings.alert": "Tilɣa n tnarit",
   "notifications.column_settings.favourite": "Imenyafen:",
-  "notifications.column_settings.filter_bar.advanced": "Ssken-d meṛṛa tiggayin",
-  "notifications.column_settings.filter_bar.category": "Iri n usizdeg uzrib",
   "notifications.column_settings.follow": "Imeḍfaṛen imaynuten:",
   "notifications.column_settings.follow_request": "Isuturen imaynuten n teḍfeṛt:",
   "notifications.column_settings.mention": "Abdar:",
diff --git a/app/javascript/mastodon/locales/kk.json b/app/javascript/mastodon/locales/kk.json
index 1f6cc78a57efd2..f71c10f9169ce7 100644
--- a/app/javascript/mastodon/locales/kk.json
+++ b/app/javascript/mastodon/locales/kk.json
@@ -181,7 +181,6 @@
   "hashtag.column_settings.tag_mode.any": "Осылардың біреуін",
   "hashtag.column_settings.tag_mode.none": "Бұлардың ешқайсысын",
   "hashtag.column_settings.tag_toggle": "Осы бағанға қосымша тегтерді қосыңыз",
-  "home.column_settings.basic": "Негізгі",
   "home.column_settings.show_reblogs": "Бөлісулерді көрсету",
   "home.column_settings.show_replies": "Жауаптарды көрсету",
   "home.hide_announcements": "Анонстарды жасыр",
@@ -263,8 +262,6 @@
   "notifications.clear": "Ескертпелерді тазарт",
   "notifications.clear_confirmation": "Шынымен барлық ескертпелерді өшіресіз бе?",
   "notifications.column_settings.alert": "Үстел ескертпелері",
-  "notifications.column_settings.filter_bar.advanced": "Барлық категорияны көрсет",
-  "notifications.column_settings.filter_bar.category": "Жедел сүзгі",
   "notifications.column_settings.follow": "Жаңа оқырмандар:",
   "notifications.column_settings.follow_request": "Жазылуға жаңа сұранымдар:",
   "notifications.column_settings.mention": "Аталымдар:",
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index d9192e5c61b046..7dd7636089a9f2 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -271,10 +271,12 @@
   "filter_modal.select_filter.subtitle": "기존의 카테고리를 사용하거나 새로 하나를 만듧니다",
   "filter_modal.select_filter.title": "이 게시물을 필터",
   "filter_modal.title.status": "게시물 필터",
+  "filtered_notifications_banner.pending_requests": "알 수도 있는 {count, plural, =0 {0명} one {한 명} other {# 명}}의 사람들로부터의 알림",
+  "filtered_notifications_banner.title": "걸러진 알림",
   "firehose.all": "모두",
   "firehose.local": "이 서버",
   "firehose.remote": "다른 서버",
-  "follow_request.authorize": "허가",
+  "follow_request.authorize": "승인",
   "follow_request.reject": "거부",
   "follow_requests.unlocked_explanation": "귀하의 계정이 잠긴 계정이 아닐지라도, {domain} 스태프는 이 계정들의 팔로우 요청을 수동으로 처리해 주시면 좋겠다고 생각했습니다.",
   "follow_suggestions.curated_suggestion": "스태프의 추천",
@@ -314,7 +316,6 @@
   "hashtag.follow": "팔로우",
   "hashtag.unfollow": "팔로우 해제",
   "hashtags.and_other": "…그리고 {count, plural,other {#개 더}}",
-  "home.column_settings.basic": "기본",
   "home.column_settings.show_reblogs": "부스트 표시",
   "home.column_settings.show_replies": "답글 표시",
   "home.hide_announcements": "공지사항 숨기기",
@@ -440,15 +441,16 @@
   "notification.reblog": "{name} 님이 부스트했습니다",
   "notification.status": "{name} 님이 방금 게시물을 올렸습니다",
   "notification.update": "{name} 님이 게시물을 수정했습니다",
+  "notification_requests.accept": "수락",
+  "notification_requests.dismiss": "지우기",
+  "notification_requests.notifications_from": "{name} 님으로부터의 알림",
+  "notification_requests.title": "걸러진 알림",
   "notifications.clear": "알림 비우기",
   "notifications.clear_confirmation": "정말로 알림을 삭제하시겠습니까?",
   "notifications.column_settings.admin.report": "새 신고:",
   "notifications.column_settings.admin.sign_up": "새로운 가입:",
   "notifications.column_settings.alert": "데스크탑 알림",
   "notifications.column_settings.favourite": "좋아요:",
-  "notifications.column_settings.filter_bar.advanced": "모든 범주 표시하기",
-  "notifications.column_settings.filter_bar.category": "빠른 필터 막대",
-  "notifications.column_settings.filter_bar.show_bar": "필터 막대 보이기",
   "notifications.column_settings.follow": "새 팔로워:",
   "notifications.column_settings.follow_request": "새 팔로우 요청:",
   "notifications.column_settings.mention": "멘션:",
@@ -474,6 +476,13 @@
   "notifications.permission_denied": "권한이 거부되었기 때문에 데스크탑 알림을 활성화할 수 없음",
   "notifications.permission_denied_alert": "이전에 브라우저 권한이 거부되었기 때문에, 데스크탑 알림이 활성화 될 수 없습니다.",
   "notifications.permission_required": "필요한 권한이 승인되지 않아 데스크탑 알림을 사용할 수 없습니다.",
+  "notifications.policy.filter_new_accounts.hint": "{days, plural, one {하루} other {#일}} 안에 만들어진",
+  "notifications.policy.filter_new_accounts_title": "새 계정",
+  "notifications.policy.filter_not_followers_title": "나를 팔로우하지 않는 사람들",
+  "notifications.policy.filter_not_following_hint": "내가 수동으로 승인하기 전까지",
+  "notifications.policy.filter_not_following_title": "내가 팔로우하지 않는 사람들",
+  "notifications.policy.filter_private_mentions_title": "청하지 않은 개인적인 멘션",
+  "notifications.policy.title": "알림을 거를 사람들…",
   "notifications_permission_banner.enable": "데스크탑 알림 활성화",
   "notifications_permission_banner.how_to_control": "마스토돈이 열려 있지 않을 때에도 알림을 받으려면, 데스크탑 알림을 활성화 하세요. 당신은 어떤 종류의 반응이 데스크탑 알림을 발생할 지를 {icon} 버튼을 통해 세세하게 설정할 수 있습니다.",
   "notifications_permission_banner.title": "아무것도 놓치지 마세요",
diff --git a/app/javascript/mastodon/locales/ku.json b/app/javascript/mastodon/locales/ku.json
index 4a0fd671db993c..a10610108135c5 100644
--- a/app/javascript/mastodon/locales/ku.json
+++ b/app/javascript/mastodon/locales/ku.json
@@ -258,7 +258,6 @@
   "hashtag.column_settings.tag_toggle": "Ji bo vê stûnê hin pêvekan tevlî bike",
   "hashtag.follow": "Hashtagê bişopîne",
   "hashtag.unfollow": "Hashtagê neşopîne",
-  "home.column_settings.basic": "Bingehîn",
   "home.column_settings.show_reblogs": "Bilindkirinan nîşan bike",
   "home.column_settings.show_replies": "Bersivan nîşan bide",
   "home.hide_announcements": "Reklaman veşêre",
@@ -370,9 +369,6 @@
   "notifications.column_settings.admin.report": "Ragihandinên nû:",
   "notifications.column_settings.admin.sign_up": "Tomarkirinên nû:",
   "notifications.column_settings.alert": "Agahdariyên sermaseyê",
-  "notifications.column_settings.filter_bar.advanced": "Hemû beşan nîşan bide",
-  "notifications.column_settings.filter_bar.category": "Şivika parzûna bilêz",
-  "notifications.column_settings.filter_bar.show_bar": "Darika parzûnê nîşan bide",
   "notifications.column_settings.follow": "Şopînerên nû:",
   "notifications.column_settings.follow_request": "Daxwazên şopandinê nû:",
   "notifications.column_settings.mention": "Qalkirin:",
diff --git a/app/javascript/mastodon/locales/kw.json b/app/javascript/mastodon/locales/kw.json
index e42f50aeffcb62..f9c70db53ef8c9 100644
--- a/app/javascript/mastodon/locales/kw.json
+++ b/app/javascript/mastodon/locales/kw.json
@@ -166,7 +166,6 @@
   "hashtag.column_settings.tag_mode.any": "Pynag a'n re ma",
   "hashtag.column_settings.tag_mode.none": "Travyth a'n re ma",
   "hashtag.column_settings.tag_toggle": "Yssynsi taggys ynwedhek rag an goloven ma",
-  "home.column_settings.basic": "Selyek",
   "home.column_settings.show_reblogs": "Diskwedhes kenerthow",
   "home.column_settings.show_replies": "Diskwedhes gorthebow",
   "home.hide_announcements": "Kudha deklaryansow",
@@ -257,8 +256,6 @@
   "notifications.clear": "Dilea gwarnyansow",
   "notifications.clear_confirmation": "Owgh hwi sur a vynnes dilea agas gwarnyansow oll yn fast?",
   "notifications.column_settings.alert": "Gwarnyansow pennskrin",
-  "notifications.column_settings.filter_bar.advanced": "Displetya rummow oll",
-  "notifications.column_settings.filter_bar.category": "Barr sidhla skav",
   "notifications.column_settings.follow": "Holyoryon nowydh:",
   "notifications.column_settings.follow_request": "Govynnow holya nowydh:",
   "notifications.column_settings.mention": "Menegow:",
diff --git a/app/javascript/mastodon/locales/lad.json b/app/javascript/mastodon/locales/lad.json
index 91540d58ca8070..de84becca3ed95 100644
--- a/app/javascript/mastodon/locales/lad.json
+++ b/app/javascript/mastodon/locales/lad.json
@@ -271,6 +271,7 @@
   "filter_modal.select_filter.subtitle": "Kulanea una kategoria egzistente o kriya mueva",
   "filter_modal.select_filter.title": "Filtra esta publikasyon",
   "filter_modal.title.status": "Filtra una publikasyon",
+  "filtered_notifications_banner.title": "Avizos filtrados",
   "firehose.all": "Todo",
   "firehose.local": "Este sirvidor",
   "firehose.remote": "Otros sirvidores",
@@ -314,7 +315,6 @@
   "hashtag.follow": "Sige etiketa",
   "hashtag.unfollow": "Desige etiketa",
   "hashtags.and_other": "…i {count, plural, one {}other {# mas}}",
-  "home.column_settings.basic": "Opsyones bazikas",
   "home.column_settings.show_reblogs": "Amostra repartajasyones",
   "home.column_settings.show_replies": "Amostra repuestas",
   "home.hide_announcements": "Eskonde pregones",
@@ -440,15 +440,15 @@
   "notification.reblog": "{name} repartajo tu publikasyon",
   "notification.status": "{name} publiko algo",
   "notification.update": "{name} edito una publikasyon",
+  "notification_requests.accept": "Acheta",
+  "notification_requests.dismiss": "Kita",
+  "notification_requests.title": "Avizos filtrados",
   "notifications.clear": "Efasa avizos",
   "notifications.clear_confirmation": "Estas siguro ke keres permanentemente efasar todos tus avizos?",
   "notifications.column_settings.admin.report": "Muveos raportos:",
   "notifications.column_settings.admin.sign_up": "Muevas enrejistrasyones:",
   "notifications.column_settings.alert": "Avizos de ensimameza",
   "notifications.column_settings.favourite": "Te plazen:",
-  "notifications.column_settings.filter_bar.advanced": "Amostra todas las kategorias",
-  "notifications.column_settings.filter_bar.category": "Vara de filtrado rapido",
-  "notifications.column_settings.filter_bar.show_bar": "Amostra vara de filtros",
   "notifications.column_settings.follow": "Muevos suivantes:",
   "notifications.column_settings.follow_request": "Muevas solisitudes de segimiento:",
   "notifications.column_settings.mention": "Enmentaduras:",
@@ -474,6 +474,7 @@
   "notifications.permission_denied": "Avizos de ensimameza no estan desponivles porke ya se tiene refuzado el permiso",
   "notifications.permission_denied_alert": "\"No se pueden kapasitar los avizos de ensimameza, porke ya se tiene refuzado el permiso de navigador",
   "notifications.permission_required": "Avizos de ensimameza no estan desponivles porke los nesesarios permisos no tienen sido risividos.",
+  "notifications.policy.filter_new_accounts_title": "Muevos kuentos",
   "notifications_permission_banner.enable": "Kapasita avizos de ensimameza",
   "notifications_permission_banner.how_to_control": "Para risivir avizos kuando Mastodon no esta avierto, kapasita avizos de ensimameza. Puedes kontrolar presizamente kualos tipos de enteraksiones djeneren avizos de ensimameza kon el boton {icon} arriva kuando esten kapasitadas.",
   "notifications_permission_banner.title": "Nunkua te piedres niente",
diff --git a/app/javascript/mastodon/locales/lt.json b/app/javascript/mastodon/locales/lt.json
index 8b757484cee3e6..6963c43a3ada14 100644
--- a/app/javascript/mastodon/locales/lt.json
+++ b/app/javascript/mastodon/locales/lt.json
@@ -314,7 +314,6 @@
   "hashtag.follow": "Sekti saitažodį",
   "hashtag.unfollow": "Nebesekti saitažodį",
   "hashtags.and_other": "…ir {count, plural, one {# daugiau} few {# daugiau} many {# daugiau}other {# daugiau}}",
-  "home.column_settings.basic": "Paprastas",
   "home.column_settings.show_reblogs": "Rodyti pakėlimus",
   "home.column_settings.show_replies": "Rodyti atsakymus",
   "home.hide_announcements": "Slėpti skelbimus",
@@ -446,9 +445,6 @@
   "notifications.column_settings.admin.sign_up": "Naujos registracijos:",
   "notifications.column_settings.alert": "Darbalaukio pranešimai",
   "notifications.column_settings.favourite": "Mėgstami:",
-  "notifications.column_settings.filter_bar.advanced": "Rodyti visas kategorijas",
-  "notifications.column_settings.filter_bar.category": "Spartaus filtro juosta",
-  "notifications.column_settings.filter_bar.show_bar": "Rodyti filtro juostą",
   "notifications.column_settings.follow": "Nauji sekėjai:",
   "notifications.column_settings.follow_request": "Nauji sekimo prašymai:",
   "notifications.column_settings.mention": "Paminėjimai:",
diff --git a/app/javascript/mastodon/locales/lv.json b/app/javascript/mastodon/locales/lv.json
index 8044e789230878..47f10d94c1f317 100644
--- a/app/javascript/mastodon/locales/lv.json
+++ b/app/javascript/mastodon/locales/lv.json
@@ -306,7 +306,6 @@
   "hashtag.follow": "Sekot tēmturim",
   "hashtag.unfollow": "Pārstāt sekot tēmturim",
   "hashtags.and_other": "..un {count, plural, other {# vairāk}}",
-  "home.column_settings.basic": "Pamata",
   "home.column_settings.show_reblogs": "Rādīt pastiprinātos ierakstus",
   "home.column_settings.show_replies": "Rādīt atbildes",
   "home.hide_announcements": "Slēpt paziņojumus",
@@ -438,9 +437,6 @@
   "notifications.column_settings.admin.sign_up": "Jaunas pierakstīšanās:",
   "notifications.column_settings.alert": "Darbvirsmas paziņojumi",
   "notifications.column_settings.favourite": "Izlase:",
-  "notifications.column_settings.filter_bar.advanced": "Rādīt visas kategorijas",
-  "notifications.column_settings.filter_bar.category": "Ātro filtru josla",
-  "notifications.column_settings.filter_bar.show_bar": "Rādīt filtru joslu",
   "notifications.column_settings.follow": "Jauni sekotāji:",
   "notifications.column_settings.follow_request": "Jauni sekošanas pieprasījumi:",
   "notifications.column_settings.mention": "Pieminēšanas:",
diff --git a/app/javascript/mastodon/locales/mk.json b/app/javascript/mastodon/locales/mk.json
index f7080842b710df..cd30e29493d227 100644
--- a/app/javascript/mastodon/locales/mk.json
+++ b/app/javascript/mastodon/locales/mk.json
@@ -137,7 +137,6 @@
   "hashtag.column_settings.tag_mode.any": "Било кои",
   "hashtag.column_settings.tag_mode.none": "Никои",
   "hashtag.column_settings.tag_toggle": "Стави додатни тагови за оваа колона",
-  "home.column_settings.basic": "Основно",
   "home.column_settings.show_reblogs": "Прикажи бустирања",
   "home.column_settings.show_replies": "Прикажи одговори",
   "intervals.full.days": "{number, plural, one {# ден} other {# дена}}",
diff --git a/app/javascript/mastodon/locales/ml.json b/app/javascript/mastodon/locales/ml.json
index 0059dd333bbdb8..6f1ec3c117536c 100644
--- a/app/javascript/mastodon/locales/ml.json
+++ b/app/javascript/mastodon/locales/ml.json
@@ -181,7 +181,6 @@
   "hashtag.column_settings.tag_mode.any": "ഇവയിലേതെങ്കിലും",
   "hashtag.column_settings.tag_mode.none": "ഇതിലൊന്നുമല്ല",
   "hashtag.column_settings.tag_toggle": "ഈ എഴുത്തുപംക്തിക്ക് കൂടുതൽ ഉപനാമങ്ങൾ ചേർക്കുക",
-  "home.column_settings.basic": "അടിസ്ഥാനം",
   "home.column_settings.show_reblogs": "ബൂസ്റ്റുകൾ കാണിക്കുക",
   "home.column_settings.show_replies": "മറുപടികൾ കാണിക്കുക",
   "home.hide_announcements": "പ്രഖ്യാപനങ്ങൾ മറയ്‌ക്കുക",
@@ -255,7 +254,6 @@
   "notifications.clear": "അറിയിപ്പ് മായ്ക്കുക",
   "notifications.clear_confirmation": "നിങ്ങളുടെ എല്ലാ അറിയിപ്പുകളും ശാശ്വതമായി മായ്‌ക്കണമെന്ന് നിങ്ങൾക്ക് ഉറപ്പാണോ?",
   "notifications.column_settings.alert": "ഡെസ്ക്ടോപ്പ് അറിയിപ്പുകൾ",
-  "notifications.column_settings.filter_bar.advanced": "എല്ലാ വിഭാഗങ്ങളും പ്രദർശിപ്പിക്കുക",
   "notifications.column_settings.follow": "പുതിയ പിന്തുടരുന്നവർ:",
   "notifications.column_settings.follow_request": "പുതിയ പിന്തുടരൽ അഭ്യർത്ഥനകൾ:",
   "notifications.column_settings.mention": "സൂചനകൾ:",
diff --git a/app/javascript/mastodon/locales/mr.json b/app/javascript/mastodon/locales/mr.json
index 20231f0bbfd6d4..0cd5e7ef7835fc 100644
--- a/app/javascript/mastodon/locales/mr.json
+++ b/app/javascript/mastodon/locales/mr.json
@@ -122,7 +122,6 @@
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
   "hashtag.follow": "हॅशटॅग फॉलो करा",
   "hashtag.unfollow": "हॅशटॅग अनफॉलो करा",
-  "home.column_settings.basic": "मूळ",
   "home.column_settings.show_reblogs": "बूस्ट दाखवा",
   "home.column_settings.show_replies": "उत्तरे दाखवा",
   "home.hide_announcements": "घोषणा लपवा",
diff --git a/app/javascript/mastodon/locales/ms.json b/app/javascript/mastodon/locales/ms.json
index 3d6ba920c97765..20bd248c3af629 100644
--- a/app/javascript/mastodon/locales/ms.json
+++ b/app/javascript/mastodon/locales/ms.json
@@ -311,7 +311,6 @@
   "hashtag.follow": "Ikuti hashtag",
   "hashtag.unfollow": "Nyahikut tanda pagar",
   "hashtags.and_other": "…dan {count, plural, other {# more}}",
-  "home.column_settings.basic": "Asas",
   "home.column_settings.show_reblogs": "Tunjukkan galakan",
   "home.column_settings.show_replies": "Tunjukkan balasan",
   "home.hide_announcements": "Sembunyikan pengumuman",
@@ -443,9 +442,6 @@
   "notifications.column_settings.admin.sign_up": "Pendaftaran baru:",
   "notifications.column_settings.alert": "Pemberitahuan atas meja",
   "notifications.column_settings.favourite": "Kegemaran:",
-  "notifications.column_settings.filter_bar.advanced": "Papar semua kategori",
-  "notifications.column_settings.filter_bar.category": "Bar penapis pantas",
-  "notifications.column_settings.filter_bar.show_bar": "Paparkan bar penapis",
   "notifications.column_settings.follow": "Pengikut baharu:",
   "notifications.column_settings.follow_request": "Permintaan ikutan baharu:",
   "notifications.column_settings.mention": "Sebutan:",
diff --git a/app/javascript/mastodon/locales/my.json b/app/javascript/mastodon/locales/my.json
index 0d5985b1ce5a7b..1b129aaa0fe302 100644
--- a/app/javascript/mastodon/locales/my.json
+++ b/app/javascript/mastodon/locales/my.json
@@ -292,7 +292,6 @@
   "hashtag.follow": "Hashtag ကို စောင့်ကြည့်မယ်",
   "hashtag.unfollow": "Hashtag ကို မစောင့်ကြည့်ပါ",
   "hashtags.and_other": "{count, plural, other {# more}} နှင့်",
-  "home.column_settings.basic": "အခြေခံ",
   "home.column_settings.show_reblogs": "Boost များကို ပြပါ",
   "home.column_settings.show_replies": "ပြန်စာများကို ပြပါ",
   "home.hide_announcements": "ကြေညာချက်များကို ဖျောက်ပါ",
@@ -424,9 +423,6 @@
   "notifications.column_settings.admin.sign_up": "အကောင့်အသစ်များ -",
   "notifications.column_settings.alert": "Desktop သတိပေးချက်များ",
   "notifications.column_settings.favourite": "Favorites:",
-  "notifications.column_settings.filter_bar.advanced": "ခေါင်းစဥ်အားလုံးများကိုဖော်ပြပါ",
-  "notifications.column_settings.filter_bar.category": "အမြန်စစ်ထုတ်မှုဘား",
-  "notifications.column_settings.filter_bar.show_bar": "စစ်ထုတ်မှုဘားကို ပြပါ",
   "notifications.column_settings.follow": "စောင့်ကြည့်သူအသစ်များ -",
   "notifications.column_settings.follow_request": "စောင့်ကြည့်ရန် တောင်းဆိုမှုအသစ်များ -",
   "notifications.column_settings.mention": "ဖော်ပြချက်များ -",
diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json
index a8d42e5ff60db1..da5c4d8643605d 100644
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@@ -241,6 +241,7 @@
   "empty_column.list": "Er is nog niks te zien in deze lijst. Wanneer lijstleden nieuwe berichten plaatsen, zijn deze hier te zien.",
   "empty_column.lists": "Je hebt nog geen lijsten. Wanneer je er een aanmaakt, zal dat hier verschijnen.",
   "empty_column.mutes": "Jij hebt nog geen gebruikers genegeerd.",
+  "empty_column.notification_requests": "Helemaal leeg! Er is hier niets. Wanneer je nieuwe meldingen ontvangt, verschijnen deze hier volgens jouw instellingen.",
   "empty_column.notifications": "Je hebt nog geen meldingen. Begin met iemand een gesprek.",
   "empty_column.public": "Er is hier helemaal niks! Plaatst een openbaar bericht of volg mensen van andere servers om het te vullen",
   "error.unexpected_crash.explanation": "Als gevolg van een bug in onze broncode of als gevolg van een compatibiliteitsprobleem met jouw webbrowser, kan deze pagina niet goed worden weergegeven.",
@@ -271,6 +272,8 @@
   "filter_modal.select_filter.subtitle": "Een bestaande categorie gebruiken of een nieuwe aanmaken",
   "filter_modal.select_filter.title": "Dit bericht filteren",
   "filter_modal.title.status": "Een bericht filteren",
+  "filtered_notifications_banner.pending_requests": "Meldingen van {count, plural, =0 {no} one {één persoon} other {# mensen}} die je misschien kent",
+  "filtered_notifications_banner.title": "Gefilterde meldingen",
   "firehose.all": "Alles",
   "firehose.local": "Deze server",
   "firehose.remote": "Andere servers",
@@ -314,7 +317,6 @@
   "hashtag.follow": "Hashtag volgen",
   "hashtag.unfollow": "Hashtag ontvolgen",
   "hashtags.and_other": "…en {count, plural, one {}other {# meer}}",
-  "home.column_settings.basic": "Algemeen",
   "home.column_settings.show_reblogs": "Boosts tonen",
   "home.column_settings.show_replies": "Reacties tonen",
   "home.hide_announcements": "Mededelingen verbergen",
@@ -440,15 +442,16 @@
   "notification.reblog": "{name} boostte jouw bericht",
   "notification.status": "{name} heeft zojuist een bericht geplaatst",
   "notification.update": "{name} heeft een bericht bewerkt",
+  "notification_requests.accept": "Accepteren",
+  "notification_requests.dismiss": "Afwijzen",
+  "notification_requests.notifications_from": "Meldingen van {name}",
+  "notification_requests.title": "Gefilterde meldingen",
   "notifications.clear": "Meldingen verwijderen",
   "notifications.clear_confirmation": "Weet je het zeker dat je al jouw meldingen wilt verwijderen?",
   "notifications.column_settings.admin.report": "Nieuwe rapportages:",
   "notifications.column_settings.admin.sign_up": "Nieuwe registraties:",
   "notifications.column_settings.alert": "Desktopmeldingen",
   "notifications.column_settings.favourite": "Favorieten:",
-  "notifications.column_settings.filter_bar.advanced": "Alle categorieën tonen",
-  "notifications.column_settings.filter_bar.category": "Snelle filterbalk",
-  "notifications.column_settings.filter_bar.show_bar": "Filterbalk tonen",
   "notifications.column_settings.follow": "Nieuwe volgers:",
   "notifications.column_settings.follow_request": "Nieuw volgverzoek:",
   "notifications.column_settings.mention": "Vermeldingen:",
@@ -474,6 +477,15 @@
   "notifications.permission_denied": "Desktopmeldingen zijn niet beschikbaar omdat een eerdere browsertoestemming werd geweigerd",
   "notifications.permission_denied_alert": "Desktopmeldingen kunnen niet worden ingeschakeld, omdat een eerdere browsertoestemming werd geweigerd",
   "notifications.permission_required": "Desktopmeldingen zijn niet beschikbaar omdat de benodigde toestemming niet is verleend.",
+  "notifications.policy.filter_new_accounts.hint": "In de afgelopen {days, plural, one {24 uur} other {# dagen}} geregistreerd",
+  "notifications.policy.filter_new_accounts_title": "Nieuwe accounts",
+  "notifications.policy.filter_not_followers_hint": "Inclusief mensen die jou korter dan {days, plural, one {24 uur} other {# dagen}} volgen",
+  "notifications.policy.filter_not_followers_title": "Mensen die jou niet volgen",
+  "notifications.policy.filter_not_following_hint": "Totdat je ze handmatig goedkeurt",
+  "notifications.policy.filter_not_following_title": "Mensen die jij niet volgt",
+  "notifications.policy.filter_private_mentions_hint": "Onzichtbaar tenzij het een antwoord is op een privébericht van jou of wanneer je de afzender volgt",
+  "notifications.policy.filter_private_mentions_title": "Ongevraagde privéberichten",
+  "notifications.policy.title": "Meldingen verbergen van…",
   "notifications_permission_banner.enable": "Desktopmeldingen inschakelen",
   "notifications_permission_banner.how_to_control": "Om meldingen te ontvangen wanneer Mastodon niet open staat. Je kunt precies bepalen welke soort interacties wel of geen desktopmeldingen geven via de bovenstaande {icon} knop.",
   "notifications_permission_banner.title": "Mis nooit meer iets",
diff --git a/app/javascript/mastodon/locales/nn.json b/app/javascript/mastodon/locales/nn.json
index 3cc537f54f0121..b8a0512b8c7b8d 100644
--- a/app/javascript/mastodon/locales/nn.json
+++ b/app/javascript/mastodon/locales/nn.json
@@ -314,7 +314,6 @@
   "hashtag.follow": "Fylg emneknagg",
   "hashtag.unfollow": "Slutt å fylgje emneknaggen",
   "hashtags.and_other": "…og {count, plural, one {}other {# fleire}}",
-  "home.column_settings.basic": "Grunnleggjande",
   "home.column_settings.show_reblogs": "Vis framhevingar",
   "home.column_settings.show_replies": "Vis svar",
   "home.hide_announcements": "Skjul kunngjeringar",
@@ -446,9 +445,6 @@
   "notifications.column_settings.admin.sign_up": "Nyleg registrerte:",
   "notifications.column_settings.alert": "Skrivebordsvarsel",
   "notifications.column_settings.favourite": "Favorittar:",
-  "notifications.column_settings.filter_bar.advanced": "Vis alle kategoriar",
-  "notifications.column_settings.filter_bar.category": "Snarfilterlinje",
-  "notifications.column_settings.filter_bar.show_bar": "Vis filterlinja",
   "notifications.column_settings.follow": "Nye fylgjarar:",
   "notifications.column_settings.follow_request": "Ny fylgjarførespurnader:",
   "notifications.column_settings.mention": "Omtalar:",
diff --git a/app/javascript/mastodon/locales/no.json b/app/javascript/mastodon/locales/no.json
index a172fc69f4c4e6..14e33e9f18b562 100644
--- a/app/javascript/mastodon/locales/no.json
+++ b/app/javascript/mastodon/locales/no.json
@@ -304,7 +304,6 @@
   "hashtag.follow": "Følg emneknagg",
   "hashtag.unfollow": "Slutt å følge emneknagg",
   "hashtags.and_other": "…og {count, plural, one{en til} other {# til}}",
-  "home.column_settings.basic": "Enkelt",
   "home.column_settings.show_reblogs": "Vis fremhevinger",
   "home.column_settings.show_replies": "Vis svar",
   "home.hide_announcements": "Skjul kunngjøring",
@@ -436,9 +435,6 @@
   "notifications.column_settings.admin.sign_up": "Nye registreringer:",
   "notifications.column_settings.alert": "Skrivebordsvarslinger",
   "notifications.column_settings.favourite": "Favoritter:",
-  "notifications.column_settings.filter_bar.advanced": "Vis alle kategorier",
-  "notifications.column_settings.filter_bar.category": "Hurtigfiltreringslinje",
-  "notifications.column_settings.filter_bar.show_bar": "Vis filterlinjen",
   "notifications.column_settings.follow": "Nye følgere:",
   "notifications.column_settings.follow_request": "Nye følgerforespørsler:",
   "notifications.column_settings.mention": "Nevnt:",
diff --git a/app/javascript/mastodon/locales/oc.json b/app/javascript/mastodon/locales/oc.json
index 5e122064fc747d..09276b3b326b83 100644
--- a/app/javascript/mastodon/locales/oc.json
+++ b/app/javascript/mastodon/locales/oc.json
@@ -262,7 +262,6 @@
   "hashtag.follow": "Sègre l’etiqueta",
   "hashtag.unfollow": "Quitar de sègre l’etiqueta",
   "hashtags.and_other": "…e {count, plural, one {}other {# de mai}}",
-  "home.column_settings.basic": "Basic",
   "home.column_settings.show_reblogs": "Mostrar los partatges",
   "home.column_settings.show_replies": "Mostrar las responsas",
   "home.hide_announcements": "Rescondre las anóncias",
@@ -379,9 +378,6 @@
   "notifications.column_settings.admin.sign_up": "Nòus inscrits :",
   "notifications.column_settings.alert": "Notificacions localas",
   "notifications.column_settings.favourite": "Favorits :",
-  "notifications.column_settings.filter_bar.advanced": "Mostrar totas las categorias",
-  "notifications.column_settings.filter_bar.category": "Barra de recèrca rapida",
-  "notifications.column_settings.filter_bar.show_bar": "Afichar la barra de filtres",
   "notifications.column_settings.follow": "Nòus seguidors :",
   "notifications.column_settings.follow_request": "Novèla demanda d’abonament :",
   "notifications.column_settings.mention": "Mencions :",
diff --git a/app/javascript/mastodon/locales/pa.json b/app/javascript/mastodon/locales/pa.json
index ee47c1872db689..69360184fc095f 100644
--- a/app/javascript/mastodon/locales/pa.json
+++ b/app/javascript/mastodon/locales/pa.json
@@ -153,7 +153,6 @@
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
   "hashtag.follow": "ਹੈਸ਼ਟੈਗ ਨੂੰ ਫ਼ਾਲੋ ਕਰੋ",
   "hashtag.unfollow": "ਹੈਸ਼ਟੈਗ ਨੂੰ ਅਣ-ਫ਼ਾਲੋ ਕਰੋ",
-  "home.column_settings.basic": "ਆਮ",
   "home.pending_critical_update.link": "ਅੱਪਡੇਟ ਵੇਖੋ",
   "interaction_modal.title.follow": "{name} ਨੂੰ ਫ਼ਾਲੋ ਕਰੋ",
   "keyboard_shortcuts.back": "ਪਿੱਛੇ ਜਾਓ",
diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json
index 01b88eacdc0f5a..51f705b692fe64 100644
--- a/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@@ -241,6 +241,7 @@
   "empty_column.list": "Nie ma nic na tej liście. Kiedy członkowie listy dodadzą nowe wpisy, pojawia się one tutaj.",
   "empty_column.lists": "Nie masz żadnych list. Kiedy utworzysz jedną, pojawi się tutaj.",
   "empty_column.mutes": "Nie wyciszyłeś(-aś) jeszcze żadnego użytkownika.",
+  "empty_column.notification_requests": "To wszystko – kiedy otrzymasz nowe powiadomienia, pokażą się tutaj zgodnie z twoimi ustawieniami.",
   "empty_column.notifications": "Nie masz żadnych powiadomień. Rozpocznij interakcje z innymi użytkownikami.",
   "empty_column.public": "Tu nic nie ma! Napisz coś publicznie, lub dodaj ludzi z innych serwerów, aby to wyświetlić",
   "error.unexpected_crash.explanation": "W związku z błędem w naszym kodzie lub braku kompatybilności przeglądarki, ta strona nie może być poprawnie wyświetlona.",
@@ -271,6 +272,8 @@
   "filter_modal.select_filter.subtitle": "Użyj istniejącej kategorii lub utwórz nową",
   "filter_modal.select_filter.title": "Filtruj ten wpis",
   "filter_modal.title.status": "Filtruj wpis",
+  "filtered_notifications_banner.pending_requests": "Powiadomienia od {count, plural, =0 {żadnej osoby którą możesz znać} one {# osoby którą możesz znać} other {# osób które możesz znać}}",
+  "filtered_notifications_banner.title": "Powiadomienia filtrowane",
   "firehose.all": "Wszystko",
   "firehose.local": "Ten serwer",
   "firehose.remote": "Inne serwery",
@@ -314,7 +317,6 @@
   "hashtag.follow": "Obserwuj hasztag",
   "hashtag.unfollow": "Przestań obserwować hashtag",
   "hashtags.and_other": "…i {count, plural, other {jeszcze #}}",
-  "home.column_settings.basic": "Podstawowe",
   "home.column_settings.show_reblogs": "Pokazuj podbicia",
   "home.column_settings.show_replies": "Pokazuj odpowiedzi",
   "home.hide_announcements": "Ukryj ogłoszenia",
@@ -440,15 +442,16 @@
   "notification.reblog": "Twój post został podbity przez {name}",
   "notification.status": "{name} opublikował(a) nowy wpis",
   "notification.update": "{name} edytował(a) post",
+  "notification_requests.accept": "Akceptuj",
+  "notification_requests.dismiss": "Odrzuć",
+  "notification_requests.notifications_from": "Powiadomienia od {name}",
+  "notification_requests.title": "Powiadomienia filtrowane",
   "notifications.clear": "Wyczyść powiadomienia",
   "notifications.clear_confirmation": "Czy na pewno chcesz bezpowrotnie usunąć wszystkie powiadomienia?",
   "notifications.column_settings.admin.report": "Nowe zgłoszenia:",
   "notifications.column_settings.admin.sign_up": "Nowe rejestracje:",
   "notifications.column_settings.alert": "Powiadomienia na pulpicie",
   "notifications.column_settings.favourite": "Ulubione:",
-  "notifications.column_settings.filter_bar.advanced": "Wyświetl wszystkie kategorie",
-  "notifications.column_settings.filter_bar.category": "Szybkie filtrowanie",
-  "notifications.column_settings.filter_bar.show_bar": "Pokaż filtry",
   "notifications.column_settings.follow": "Nowi obserwujący:",
   "notifications.column_settings.follow_request": "Nowe prośby o możliwość obserwacji:",
   "notifications.column_settings.mention": "Wspomnienia:",
@@ -474,6 +477,15 @@
   "notifications.permission_denied": "Powiadomienia na pulpicie nie są dostępne, ponieważ wcześniej nie udzielono uprawnień w przeglądarce",
   "notifications.permission_denied_alert": "Powiadomienia na pulpicie nie mogą zostać włączone, ponieważ wcześniej odmówiono uprawnień",
   "notifications.permission_required": "Powiadomienia na pulpicie nie są dostępne, ponieważ nie przyznano wymaganego uprawnienia.",
+  "notifications.policy.filter_new_accounts.hint": "Utworzone w ciągu {days, plural, one {ostatniego dnia} other {ostatnich # dni}}",
+  "notifications.policy.filter_new_accounts_title": "Nowe konta",
+  "notifications.policy.filter_not_followers_hint": "Zawierające osoby które obserwują cię krócej niż {days, plural, one {dzień} other {# dni}}",
+  "notifications.policy.filter_not_followers_title": "Ludzie, którzy cię nie obserwują",
+  "notifications.policy.filter_not_following_hint": "Aż ich ręcznie nie zatwierdzisz",
+  "notifications.policy.filter_not_following_title": "Ludzie, których nie obserwujesz",
+  "notifications.policy.filter_private_mentions_hint": "Odfiltrowane, chyba że są odpowiedzią na twoją własną wzmiankę, lub obserwujesz wysyłającego",
+  "notifications.policy.filter_private_mentions_title": "Nieproszone prywatne wzmianki",
+  "notifications.policy.title": "Odfiltruj powiadomienia od…",
   "notifications_permission_banner.enable": "Włącz powiadomienia na pulpicie",
   "notifications_permission_banner.how_to_control": "Aby otrzymywać powiadomienia, gdy Mastodon nie jest otwarty, włącz powiadomienia pulpitu. Możesz dokładnie kontrolować, októrych działaniach będziesz powiadomienia na pulpicie za pomocą przycisku {icon} powyżej, jeżeli tylko zostaną włączone.",
   "notifications_permission_banner.title": "Nie przegap niczego",
diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json
index 8911afe946192f..a0b66e74e7ee56 100644
--- a/app/javascript/mastodon/locales/pt-BR.json
+++ b/app/javascript/mastodon/locales/pt-BR.json
@@ -308,7 +308,6 @@
   "hashtag.follow": "Seguir hashtag",
   "hashtag.unfollow": "Parar de seguir hashtag",
   "hashtags.and_other": "…e {count, plural, one {}other {outros #}}",
-  "home.column_settings.basic": "Básico",
   "home.column_settings.show_reblogs": "Mostrar boosts",
   "home.column_settings.show_replies": "Mostrar respostas",
   "home.hide_announcements": "Ocultar comunicados",
@@ -440,9 +439,6 @@
   "notifications.column_settings.admin.sign_up": "Novas inscrições:",
   "notifications.column_settings.alert": "Notificações no computador",
   "notifications.column_settings.favourite": "Favoritos:",
-  "notifications.column_settings.filter_bar.advanced": "Mostrar todas as categorias",
-  "notifications.column_settings.filter_bar.category": "Barra de filtro rápido das notificações",
-  "notifications.column_settings.filter_bar.show_bar": "Mostrar barra de filtro",
   "notifications.column_settings.follow": "Seguidores:",
   "notifications.column_settings.follow_request": "Seguidores pendentes:",
   "notifications.column_settings.mention": "Menções:",
diff --git a/app/javascript/mastodon/locales/pt-PT.json b/app/javascript/mastodon/locales/pt-PT.json
index 26aa0f0b5f932c..da947f9bf48da5 100644
--- a/app/javascript/mastodon/locales/pt-PT.json
+++ b/app/javascript/mastodon/locales/pt-PT.json
@@ -241,6 +241,7 @@
   "empty_column.list": "Ainda não existem publicações nesta lista. Quando membros desta lista fizerem novas publicações, elas aparecerão aqui.",
   "empty_column.lists": "Ainda não tem qualquer lista. Quando criar uma, ela irá aparecer aqui.",
   "empty_column.mutes": "Ainda não silenciaste qualquer utilizador.",
+  "empty_column.notification_requests": "Tudo limpo! Não há nada aqui. Quando você receber novas notificações, elas aparecerão aqui conforme as suas configurações.",
   "empty_column.notifications": "Não tens notificações. Interage com outros utilizadores para iniciar uma conversa.",
   "empty_column.public": "Não há nada aqui! Escreve algo publicamente ou segue outros utilizadores para veres aqui os conteúdos públicos",
   "error.unexpected_crash.explanation": "Devido a um erro no nosso código ou a uma compatilidade com o seu navegador, esta página não pôde ser apresentada correctamente.",
@@ -271,6 +272,7 @@
   "filter_modal.select_filter.subtitle": "Utilize uma categoria existente ou crie uma nova",
   "filter_modal.select_filter.title": "Filtrar esta publicação",
   "filter_modal.title.status": "Filtrar uma publicação",
+  "filtered_notifications_banner.title": "Notificações filtradas",
   "firehose.all": "Todas",
   "firehose.local": "Este servidor",
   "firehose.remote": "Outros servidores",
@@ -314,7 +316,6 @@
   "hashtag.follow": "Seguir #etiqueta",
   "hashtag.unfollow": "Deixar de seguir #etiqueta",
   "hashtags.and_other": "…e {count, plural, other {mais #}}",
-  "home.column_settings.basic": "Básico",
   "home.column_settings.show_reblogs": "Mostrar impulsos",
   "home.column_settings.show_replies": "Mostrar respostas",
   "home.hide_announcements": "Ocultar comunicações",
@@ -440,15 +441,16 @@
   "notification.reblog": "{name} reforçou a tua publicação",
   "notification.status": "{name} acabou de publicar",
   "notification.update": "{name} editou uma publicação",
+  "notification_requests.accept": "Aceitar",
+  "notification_requests.dismiss": "Descartar",
+  "notification_requests.notifications_from": "Notificações de {name}",
+  "notification_requests.title": "Notificações filtradas",
   "notifications.clear": "Limpar notificações",
   "notifications.clear_confirmation": "Queres mesmo limpar todas as notificações?",
   "notifications.column_settings.admin.report": "Novas denúncias:",
   "notifications.column_settings.admin.sign_up": "Novas inscrições:",
   "notifications.column_settings.alert": "Notificações no ambiente de trabalho",
   "notifications.column_settings.favourite": "Favoritos:",
-  "notifications.column_settings.filter_bar.advanced": "Mostrar todas as categorias",
-  "notifications.column_settings.filter_bar.category": "Barra de filtros rápidos",
-  "notifications.column_settings.filter_bar.show_bar": "Mostrar barra de filtros",
   "notifications.column_settings.follow": "Novos seguidores:",
   "notifications.column_settings.follow_request": "Novos pedidos de seguidor:",
   "notifications.column_settings.mention": "Menções:",
@@ -474,6 +476,13 @@
   "notifications.permission_denied": "Notificações no ambiente de trabalho não estão disponíveis porque a permissão, solicitada pelo navegador, foi recusada anteriormente",
   "notifications.permission_denied_alert": "Notificações no ambiente de trabalho não podem ser ativadas, pois a permissão do navegador foi recusada anteriormente",
   "notifications.permission_required": "Notificações no ambiente de trabalho não estão disponíveis porque a permissão necessária não foi concedida.",
+  "notifications.policy.filter_new_accounts_title": "Novas contas",
+  "notifications.policy.filter_not_followers_title": "Pessoas não te seguem",
+  "notifications.policy.filter_not_following_hint": "Até que você os aprove manualmente",
+  "notifications.policy.filter_not_following_title": "Pessoas que você não segue",
+  "notifications.policy.filter_private_mentions_hint": "Filtrado, a menos que seja em resposta à sua própria menção ou se você seguir o remetente",
+  "notifications.policy.filter_private_mentions_title": "Menções privadas não solicitadas",
+  "notifications.policy.title": "Filtrar notificações de…",
   "notifications_permission_banner.enable": "Ativar notificações no ambiente de trabalho",
   "notifications_permission_banner.how_to_control": "Para receber notificações quando o Mastodon não estiver aberto, ative as notificações no ambiente de trabalho. Depois da sua ativação, pode controlar precisamente quais tipos de interações geram notificações, através do botão {icon} acima.",
   "notifications_permission_banner.title": "Nunca perca nada",
diff --git a/app/javascript/mastodon/locales/ro.json b/app/javascript/mastodon/locales/ro.json
index b8bb779f85db12..f31499f8454004 100644
--- a/app/javascript/mastodon/locales/ro.json
+++ b/app/javascript/mastodon/locales/ro.json
@@ -292,7 +292,6 @@
   "hashtag.column_settings.tag_toggle": "Adaugă etichete suplimentare pentru această coloană",
   "hashtag.follow": "Urmărește haștagul",
   "hashtag.unfollow": "Nu mai urmări haștagul",
-  "home.column_settings.basic": "De bază",
   "home.column_settings.show_reblogs": "Afișează distribuirile",
   "home.column_settings.show_replies": "Afișează răspunsurile",
   "home.hide_announcements": "Ascunde anunțurile",
@@ -414,9 +413,6 @@
   "notifications.column_settings.admin.report": "Raportări noi:",
   "notifications.column_settings.admin.sign_up": "Înscrieri noi:",
   "notifications.column_settings.alert": "Notificări pe desktop",
-  "notifications.column_settings.filter_bar.advanced": "Afișează toate categoriile",
-  "notifications.column_settings.filter_bar.category": "Bară de filtrare rapidă",
-  "notifications.column_settings.filter_bar.show_bar": "Arată bara de filtrare",
   "notifications.column_settings.follow": "Noi urmăritori:",
   "notifications.column_settings.follow_request": "Noi cereri de abonare:",
   "notifications.column_settings.mention": "Mențiuni:",
diff --git a/app/javascript/mastodon/locales/ru.json b/app/javascript/mastodon/locales/ru.json
index fde170db60d230..000d485edaf499 100644
--- a/app/javascript/mastodon/locales/ru.json
+++ b/app/javascript/mastodon/locales/ru.json
@@ -308,7 +308,6 @@
   "hashtag.follow": "Подписаться на новые посты",
   "hashtag.unfollow": "Отписаться",
   "hashtags.and_other": "...и {count, plural, other {# ещё}}",
-  "home.column_settings.basic": "Основные",
   "home.column_settings.show_reblogs": "Показывать продвижения",
   "home.column_settings.show_replies": "Показывать ответы",
   "home.hide_announcements": "Скрыть объявления",
@@ -440,9 +439,6 @@
   "notifications.column_settings.admin.sign_up": "Новые регистрации:",
   "notifications.column_settings.alert": "Уведомления на рабочем столе",
   "notifications.column_settings.favourite": "Избранные:",
-  "notifications.column_settings.filter_bar.advanced": "Отображать все категории",
-  "notifications.column_settings.filter_bar.category": "Панель сортировки",
-  "notifications.column_settings.filter_bar.show_bar": "Отображать панель сортировки",
   "notifications.column_settings.follow": "У вас новый подписчик:",
   "notifications.column_settings.follow_request": "Новые запросы на подписку:",
   "notifications.column_settings.mention": "Вас упомянули в посте:",
diff --git a/app/javascript/mastodon/locales/sa.json b/app/javascript/mastodon/locales/sa.json
index 469930c3ed121d..36dae25c172708 100644
--- a/app/javascript/mastodon/locales/sa.json
+++ b/app/javascript/mastodon/locales/sa.json
@@ -264,7 +264,6 @@
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
   "hashtag.follow": "प्रचलितवस्तु अनुसर",
   "hashtag.unfollow": "प्रचलितवस्तु अनुसरणं वारय",
-  "home.column_settings.basic": "मूलभूतम्",
   "home.column_settings.show_reblogs": "बुस्त् दर्शय",
   "home.column_settings.show_replies": "उत्तराणि दर्शय",
   "home.hide_announcements": "विज्ञापनानि प्रच्छादय",
@@ -376,9 +375,6 @@
   "notifications.column_settings.admin.report": "नूतनावेदनानि",
   "notifications.column_settings.admin.sign_up": "नूतनपञ्जीकरणम्:",
   "notifications.column_settings.alert": "देस्क्टप्विज्ञापनानि",
-  "notifications.column_settings.filter_bar.advanced": "सर्वाणि वर्गाणि प्रदर्शय",
-  "notifications.column_settings.filter_bar.category": "द्रुतशोधकशलाका",
-  "notifications.column_settings.filter_bar.show_bar": "शोधकशालकां दर्शय",
   "notifications.column_settings.follow": "नूतनानुसारिणः:",
   "notifications.column_settings.follow_request": "नूतनानुसरणानुरोधाः:",
   "notifications.column_settings.mention": "उल्लिखितानि :",
diff --git a/app/javascript/mastodon/locales/sc.json b/app/javascript/mastodon/locales/sc.json
index 90b663aea79fc6..a3d11d7dbddee3 100644
--- a/app/javascript/mastodon/locales/sc.json
+++ b/app/javascript/mastodon/locales/sc.json
@@ -200,7 +200,6 @@
   "hashtag.column_settings.tag_mode.none": "Perunu de custos",
   "hashtag.column_settings.tag_toggle": "Include etichetas additzionales pro custa colunna",
   "hashtag.follow": "Sighi su hashtag",
-  "home.column_settings.basic": "Bàsicu",
   "home.column_settings.show_reblogs": "Ammustra is cumpartziduras",
   "home.column_settings.show_replies": "Ammustra rispostas",
   "home.hide_announcements": "Cua annùntzios",
@@ -300,8 +299,6 @@
   "notifications.clear": "Lìmpia notìficas",
   "notifications.clear_confirmation": "Seguru chi boles isboidare in manera permanente totu is notìficas tuas?",
   "notifications.column_settings.alert": "Notìficas de iscrivania",
-  "notifications.column_settings.filter_bar.advanced": "Ammustra totu is categorias",
-  "notifications.column_settings.filter_bar.category": "Barra lestra de filtros",
   "notifications.column_settings.follow": "Sighiduras noas:",
   "notifications.column_settings.follow_request": "Rechestas noas de sighidura:",
   "notifications.column_settings.mention": "Mèntovos:",
diff --git a/app/javascript/mastodon/locales/sco.json b/app/javascript/mastodon/locales/sco.json
index b7563022a93594..7e9778b57cf97b 100644
--- a/app/javascript/mastodon/locales/sco.json
+++ b/app/javascript/mastodon/locales/sco.json
@@ -249,7 +249,6 @@
   "hashtag.column_settings.tag_toggle": "Pit in mair hashtags fir this column",
   "hashtag.follow": "Follae hashtag",
   "hashtag.unfollow": "Unfollae hashtag",
-  "home.column_settings.basic": "Basic",
   "home.column_settings.show_reblogs": "Shaw boosts",
   "home.column_settings.show_replies": "Shaw replies",
   "home.hide_announcements": "Hide annooncements",
@@ -359,9 +358,6 @@
   "notifications.column_settings.admin.report": "New reports:",
   "notifications.column_settings.admin.sign_up": "New sign-ups:",
   "notifications.column_settings.alert": "Desktap notes",
-  "notifications.column_settings.filter_bar.advanced": "Shaw aw caitegories",
-  "notifications.column_settings.filter_bar.category": "Quick filter baur",
-  "notifications.column_settings.filter_bar.show_bar": "Shaw filter baur",
   "notifications.column_settings.follow": "New follaers:",
   "notifications.column_settings.follow_request": "New follae requests:",
   "notifications.column_settings.mention": "Menshies:",
diff --git a/app/javascript/mastodon/locales/si.json b/app/javascript/mastodon/locales/si.json
index 2058d1415be921..a2194b56cb2597 100644
--- a/app/javascript/mastodon/locales/si.json
+++ b/app/javascript/mastodon/locales/si.json
@@ -201,7 +201,6 @@
   "hashtag.column_settings.tag_mode.all": "මේ සියල්ලම",
   "hashtag.column_settings.tag_mode.none": "මේ කිසිවක් නැත",
   "hashtag.column_settings.tag_toggle": "මෙම තීරුවේ අමතර ටැග් ඇතුළත් කරන්න",
-  "home.column_settings.basic": "මූලික",
   "home.column_settings.show_replies": "පිළිතුරු පෙන්වන්න",
   "home.hide_announcements": "නිවේදන සඟවන්න",
   "home.pending_critical_update.link": "යාවත්කාල බලන්න",
@@ -285,9 +284,6 @@
   "notifications.column_settings.admin.sign_up": "නව ලියාපදිංචි:",
   "notifications.column_settings.alert": "වැඩතල දැනුම්දීම්",
   "notifications.column_settings.favourite": "ප්‍රියතමයන්:",
-  "notifications.column_settings.filter_bar.advanced": "සියළු ප්‍රවර්ග පෙන්වන්න",
-  "notifications.column_settings.filter_bar.category": "ඉක්මන් පෙරහන් තීරුව",
-  "notifications.column_settings.filter_bar.show_bar": "පෙරහන් තීරුව පෙන්වන්න",
   "notifications.column_settings.follow": "නව අනුගාමිකයින්:",
   "notifications.column_settings.follow_request": "නව අනුගමන ඉල්ලීම්:",
   "notifications.column_settings.mention": "සැඳහුම්:",
diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json
index 7eee0c29c2a061..a9c7affab10bca 100644
--- a/app/javascript/mastodon/locales/sk.json
+++ b/app/javascript/mastodon/locales/sk.json
@@ -314,7 +314,6 @@
   "hashtag.follow": "Sledovať hashtag",
   "hashtag.unfollow": "Prestať sledovať hashtag",
   "hashtags.and_other": "…a {count, plural, other {# ďalších}}",
-  "home.column_settings.basic": "Základné",
   "home.column_settings.show_reblogs": "Zobraziť zdieľania",
   "home.column_settings.show_replies": "Zobraziť odpovede",
   "home.hide_announcements": "Skryť oznámenia",
@@ -446,9 +445,6 @@
   "notifications.column_settings.admin.sign_up": "Nové registrácie:",
   "notifications.column_settings.alert": "Upozornenia na ploche",
   "notifications.column_settings.favourite": "Ohviezdičkované:",
-  "notifications.column_settings.filter_bar.advanced": "Zobraziť všetky kategórie",
-  "notifications.column_settings.filter_bar.category": "Rýchly filter",
-  "notifications.column_settings.filter_bar.show_bar": "Zobraziť filter",
   "notifications.column_settings.follow": "Nové sledovania od:",
   "notifications.column_settings.follow_request": "Nové žiadosti o sledovanie od:",
   "notifications.column_settings.mention": "Označenia:",
diff --git a/app/javascript/mastodon/locales/sl.json b/app/javascript/mastodon/locales/sl.json
index 8396e02a68bc2e..df150fc291ffe4 100644
--- a/app/javascript/mastodon/locales/sl.json
+++ b/app/javascript/mastodon/locales/sl.json
@@ -241,6 +241,7 @@
   "empty_column.list": "Na tem seznamu ni ničesar. Ko bodo člani tega seznama objavili nove statuse, se bodo pojavili tukaj.",
   "empty_column.lists": "Nimate seznamov. Ko ga boste ustvarili, se bo prikazal tukaj.",
   "empty_column.mutes": "Niste utišali še nobenega uporabnika.",
+  "empty_column.notification_requests": "Vse prebrano! Tu ni ničesar več. Ko prejmete nova obvestila, se bodo pojavila tu glede na vaše nastavitve.",
   "empty_column.notifications": "Nimate še nobenih obvestil. Povežite se z drugimi, da začnete pogovor.",
   "empty_column.public": "Tukaj ni ničesar! Da ga napolnite, napišite nekaj javnega ali pa ročno sledite uporabnikom iz drugih strežnikov",
   "error.unexpected_crash.explanation": "Zaradi hrošča v naši kodi ali težave z združljivostjo brskalnika te strani ni mogoče ustrezno prikazati.",
@@ -271,6 +272,7 @@
   "filter_modal.select_filter.subtitle": "Uporabite obstoječo kategorijo ali ustvarite novo",
   "filter_modal.select_filter.title": "Filtriraj to objavo",
   "filter_modal.title.status": "Filtrirajte objavo",
+  "filtered_notifications_banner.title": "Filtrirana obvestila",
   "firehose.all": "Vse",
   "firehose.local": "Ta strežnik",
   "firehose.remote": "Drugi strežniki",
@@ -314,7 +316,6 @@
   "hashtag.follow": "Sledi ključniku",
   "hashtag.unfollow": "Nehaj slediti ključniku",
   "hashtags.and_other": "…in še {count, plural, other {#}}",
-  "home.column_settings.basic": "Osnovno",
   "home.column_settings.show_reblogs": "Pokaži izpostavitve",
   "home.column_settings.show_replies": "Pokaži odgovore",
   "home.hide_announcements": "Skrij obvestila",
@@ -440,15 +441,16 @@
   "notification.reblog": "{name} je izpostavila/a vašo objavo",
   "notification.status": "{name} je pravkar objavil/a",
   "notification.update": "{name} je uredil(a) objavo",
+  "notification_requests.accept": "Sprejmi",
+  "notification_requests.dismiss": "Zavrni",
+  "notification_requests.notifications_from": "Obvestila od {name}",
+  "notification_requests.title": "Filtrirana obvestila",
   "notifications.clear": "Počisti obvestila",
   "notifications.clear_confirmation": "Ali ste prepričani, da želite trajno izbrisati vsa svoja obvestila?",
   "notifications.column_settings.admin.report": "Nove prijave:",
   "notifications.column_settings.admin.sign_up": "Novi vpisi:",
   "notifications.column_settings.alert": "Namizna obvestila",
   "notifications.column_settings.favourite": "Priljubljeni:",
-  "notifications.column_settings.filter_bar.advanced": "Prikaži vse kategorije",
-  "notifications.column_settings.filter_bar.category": "Vrstica za hitro filtriranje",
-  "notifications.column_settings.filter_bar.show_bar": "Pokaži vrstico s filtri",
   "notifications.column_settings.follow": "Novi sledilci:",
   "notifications.column_settings.follow_request": "Nove prošnje za sledenje:",
   "notifications.column_settings.mention": "Omembe:",
@@ -474,6 +476,13 @@
   "notifications.permission_denied": "Namizna obvestila niso na voljo zaradi poprej zavrnjene zahteve dovoljenja brskalnika.",
   "notifications.permission_denied_alert": "Namiznih obvestil ni mogoče omogočiti, ker je bilo dovoljenje brskalnika že prej zavrnjeno",
   "notifications.permission_required": "Namizna obvestila niso na voljo, ker zahtevano dovoljenje ni bilo podeljeno.",
+  "notifications.policy.filter_new_accounts_title": "Novi računi",
+  "notifications.policy.filter_not_followers_title": "Ljudje, ki vam ne sledijo",
+  "notifications.policy.filter_not_following_hint": "Dokler jih ročno ne odobrite",
+  "notifications.policy.filter_not_following_title": "Ljudje, ki jim ne sledite",
+  "notifications.policy.filter_private_mentions_hint": "Filtrirano, razen če je odgovor na vašo lastno omembo ali če sledite pošiljatelju",
+  "notifications.policy.filter_private_mentions_title": "Neželene zasebne omembe",
+  "notifications.policy.title": "Skrij obvestila od …",
   "notifications_permission_banner.enable": "Omogoči obvestila na namizju",
   "notifications_permission_banner.how_to_control": "Če želite prejemati obvestila, ko Mastodon ni odprt, omogočite namizna obvestila. Natančno lahko nadzirate, katere vrste interakcij naj tvorijo namizna obvestila; ko so omogočena, za to uporabite gumb {icon} zgoraj.",
   "notifications_permission_banner.title": "Nikoli ne zamudite ničesar",
diff --git a/app/javascript/mastodon/locales/sq.json b/app/javascript/mastodon/locales/sq.json
index c388ebb8657946..00d517de721fe5 100644
--- a/app/javascript/mastodon/locales/sq.json
+++ b/app/javascript/mastodon/locales/sq.json
@@ -314,7 +314,6 @@
   "hashtag.follow": "Ndiqe hashtag-un",
   "hashtag.unfollow": "Hiqe ndjekjen e hashtag-ut",
   "hashtags.and_other": "…dhe {count, plural, one {}other {# më tepër}}",
-  "home.column_settings.basic": "Bazë",
   "home.column_settings.show_reblogs": "Shfaq përforcime",
   "home.column_settings.show_replies": "Shfaq përgjigje",
   "home.hide_announcements": "Fshihi lajmërimet",
@@ -446,9 +445,6 @@
   "notifications.column_settings.admin.sign_up": "Regjistrime të reja:",
   "notifications.column_settings.alert": "Njoftime desktopi",
   "notifications.column_settings.favourite": "Të parapëlqyer:",
-  "notifications.column_settings.filter_bar.advanced": "Shfaq krejt kategoritë",
-  "notifications.column_settings.filter_bar.category": "Shtyllë filtrimesh të shpejta",
-  "notifications.column_settings.filter_bar.show_bar": "Shfaq shtyllë filtrash",
   "notifications.column_settings.follow": "Ndjekës të rinj:",
   "notifications.column_settings.follow_request": "Kërkesa të reja për ndjekje:",
   "notifications.column_settings.mention": "Përmendje:",
diff --git a/app/javascript/mastodon/locales/sr-Latn.json b/app/javascript/mastodon/locales/sr-Latn.json
index 35bfc79f2ee1cc..4c0264465d4ae3 100644
--- a/app/javascript/mastodon/locales/sr-Latn.json
+++ b/app/javascript/mastodon/locales/sr-Latn.json
@@ -314,7 +314,6 @@
   "hashtag.follow": "Zaprati heš oznaku",
   "hashtag.unfollow": "Otprati heš oznaku",
   "hashtags.and_other": "…i {count, plural, one {još #} few {još #}other {još #}}",
-  "home.column_settings.basic": "Osnovna",
   "home.column_settings.show_reblogs": "Prikaži podržavanja",
   "home.column_settings.show_replies": "Prikaži odgovore",
   "home.hide_announcements": "Sakrij najave",
@@ -446,9 +445,6 @@
   "notifications.column_settings.admin.sign_up": "Nove ragistracije:",
   "notifications.column_settings.alert": "Obaveštenja na radnoj površini",
   "notifications.column_settings.favourite": "Omiljeno:",
-  "notifications.column_settings.filter_bar.advanced": "Prikaži sve kategorije",
-  "notifications.column_settings.filter_bar.category": "Traka za brzo filtriranje",
-  "notifications.column_settings.filter_bar.show_bar": "Prikaži traku sa filterima",
   "notifications.column_settings.follow": "Novi pratioci:",
   "notifications.column_settings.follow_request": "Novi zahtevi za praćenje:",
   "notifications.column_settings.mention": "Pominjanja:",
diff --git a/app/javascript/mastodon/locales/sr.json b/app/javascript/mastodon/locales/sr.json
index dc20585c9279fe..d00e322b42a9d1 100644
--- a/app/javascript/mastodon/locales/sr.json
+++ b/app/javascript/mastodon/locales/sr.json
@@ -314,7 +314,6 @@
   "hashtag.follow": "Запрати хеш ознаку",
   "hashtag.unfollow": "Отпрати хеш ознаку",
   "hashtags.and_other": "…и {count, plural, one {још #} few {још #}other {још #}}",
-  "home.column_settings.basic": "Основна",
   "home.column_settings.show_reblogs": "Прикажи подржавања",
   "home.column_settings.show_replies": "Прикажи одговоре",
   "home.hide_announcements": "Сакриј најаве",
@@ -446,9 +445,6 @@
   "notifications.column_settings.admin.sign_up": "Нове рагистрације:",
   "notifications.column_settings.alert": "Обавештења на радној површини",
   "notifications.column_settings.favourite": "Омиљено:",
-  "notifications.column_settings.filter_bar.advanced": "Прикажи све категорије",
-  "notifications.column_settings.filter_bar.category": "Трака за брзо филтрирање",
-  "notifications.column_settings.filter_bar.show_bar": "Прикажи траку са филтерима",
   "notifications.column_settings.follow": "Нови пратиоци:",
   "notifications.column_settings.follow_request": "Нови захтеви за праћење:",
   "notifications.column_settings.mention": "Помињања:",
diff --git a/app/javascript/mastodon/locales/sv.json b/app/javascript/mastodon/locales/sv.json
index 55503ddf50a398..37886cd80fad7e 100644
--- a/app/javascript/mastodon/locales/sv.json
+++ b/app/javascript/mastodon/locales/sv.json
@@ -314,7 +314,6 @@
   "hashtag.follow": "Följ hashtagg",
   "hashtag.unfollow": "Avfölj hashtagg",
   "hashtags.and_other": "…och {count, plural, one {}other {# mer}}",
-  "home.column_settings.basic": "Grundläggande",
   "home.column_settings.show_reblogs": "Visa boostar",
   "home.column_settings.show_replies": "Visa svar",
   "home.hide_announcements": "Dölj notiser",
@@ -446,9 +445,6 @@
   "notifications.column_settings.admin.sign_up": "Nya registreringar:",
   "notifications.column_settings.alert": "Skrivbordsaviseringar",
   "notifications.column_settings.favourite": "Favoriter:",
-  "notifications.column_settings.filter_bar.advanced": "Visa alla kategorier",
-  "notifications.column_settings.filter_bar.category": "Snabbfilter",
-  "notifications.column_settings.filter_bar.show_bar": "Visa filterfält",
   "notifications.column_settings.follow": "Nya följare:",
   "notifications.column_settings.follow_request": "Ny följ-förfrågan:",
   "notifications.column_settings.mention": "Omnämningar:",
@@ -474,6 +470,9 @@
   "notifications.permission_denied": "Skrivbordsaviseringar är otillgängliga på grund av tidigare nekade förfrågningar om behörighet i webbläsaren",
   "notifications.permission_denied_alert": "Skrivbordsaviseringar kan inte aktiveras, eftersom att webbläsarens behörighet har nekats innan",
   "notifications.permission_required": "Skrivbordsaviseringar är otillgängliga eftersom att rättigheten som krävs inte har godkänts.",
+  "notifications.policy.filter_new_accounts_title": "Nya konton",
+  "notifications.policy.filter_not_followers_title": "Personer som inte följer dig",
+  "notifications.policy.filter_not_following_title": "Personer du inte följer",
   "notifications_permission_banner.enable": "Aktivera skrivbordsaviseringar",
   "notifications_permission_banner.how_to_control": "För att ta emot aviseringar när Mastodon inte är öppet, aktivera skrivbordsaviseringar. När de är aktiverade kan du styra exakt vilka typer av interaktioner som aviseras via {icon} -knappen ovan.",
   "notifications_permission_banner.title": "Missa aldrig något",
diff --git a/app/javascript/mastodon/locales/ta.json b/app/javascript/mastodon/locales/ta.json
index 6210c3d0b11e06..7de7146bf66cec 100644
--- a/app/javascript/mastodon/locales/ta.json
+++ b/app/javascript/mastodon/locales/ta.json
@@ -211,7 +211,6 @@
   "hashtag.column_settings.tag_mode.any": "இவற்றில் எவையேனும்",
   "hashtag.column_settings.tag_mode.none": "இவற்றில் ஏதுமில்லை",
   "hashtag.column_settings.tag_toggle": "இந்த நெடுவரிசையில் கூடுதல் சிட்டைகளைச் சேர்க்கவும்",
-  "home.column_settings.basic": "அடிப்படையானவை",
   "home.column_settings.show_reblogs": "பகிர்வுகளைக் காண்பி",
   "home.column_settings.show_replies": "மறுமொழிகளைக் காண்பி",
   "home.hide_announcements": "அறிவிப்புகளை மறை",
@@ -293,8 +292,6 @@
   "notifications.clear": "அறிவிப்புகளை அழிக்கவும்",
   "notifications.clear_confirmation": "உங்கள் எல்லா அறிவிப்புகளையும் நிரந்தரமாக அழிக்க விரும்புகிறீர்களா?",
   "notifications.column_settings.alert": "டெஸ்க்டாப் அறிவிப்புகள்",
-  "notifications.column_settings.filter_bar.advanced": "எல்லா வகைகளையும் காட்டு",
-  "notifications.column_settings.filter_bar.category": "விரைவு வடிகட்டி பட்டை",
   "notifications.column_settings.follow": "புதிய பின்பற்றுபவர்கள்:",
   "notifications.column_settings.follow_request": "புதிய பின்தொடர் கோரிக்கைகள்:",
   "notifications.column_settings.mention": "குறிப்பிடுகிறது:",
diff --git a/app/javascript/mastodon/locales/te.json b/app/javascript/mastodon/locales/te.json
index 24a67247c03fce..1202de15567a03 100644
--- a/app/javascript/mastodon/locales/te.json
+++ b/app/javascript/mastodon/locales/te.json
@@ -127,7 +127,6 @@
   "hashtag.column_settings.tag_mode.any": "వీటిలో ఏవైనా",
   "hashtag.column_settings.tag_mode.none": "ఇవేవీ కావు",
   "hashtag.column_settings.tag_toggle": "ఈ నిలువు వరుసలో మరికొన్ని ట్యాగులను చేర్చండి",
-  "home.column_settings.basic": "ప్రాథమిక",
   "home.column_settings.show_reblogs": "బూస్ట్ లను చూపించు",
   "home.column_settings.show_replies": "ప్రత్యుత్తరాలను చూపించు",
   "keyboard_shortcuts.back": "వెనక్కి తిరిగి వెళ్ళడానికి",
@@ -198,8 +197,6 @@
   "notifications.clear": "ప్రకటనలను తుడిచివేయు",
   "notifications.clear_confirmation": "మీరు మీ అన్ని నోటిఫికేషన్లను శాశ్వతంగా తొలగించాలనుకుంటున్నారా?",
   "notifications.column_settings.alert": "డెస్క్టాప్ నోటిఫికేషన్లు",
-  "notifications.column_settings.filter_bar.advanced": "అన్ని విభాగాలను చూపించు",
-  "notifications.column_settings.filter_bar.category": "క్విక్ ఫిల్టర్ బార్",
   "notifications.column_settings.follow": "క్రొత్త అనుచరులు:",
   "notifications.column_settings.mention": "ప్రస్తావనలు:",
   "notifications.column_settings.poll": "ఎన్నిక ఫలితాలు:",
diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json
index 0865b18542dcae..d92cbcda1f0d90 100644
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@@ -271,6 +271,7 @@
   "filter_modal.select_filter.subtitle": "ใช้หมวดหมู่ที่มีอยู่หรือสร้างหมวดหมู่ใหม่",
   "filter_modal.select_filter.title": "กรองโพสต์นี้",
   "filter_modal.title.status": "กรองโพสต์",
+  "filtered_notifications_banner.title": "การแจ้งเตือนที่กรองอยู่",
   "firehose.all": "ทั้งหมด",
   "firehose.local": "เซิร์ฟเวอร์นี้",
   "firehose.remote": "เซิร์ฟเวอร์อื่น ๆ",
@@ -314,7 +315,6 @@
   "hashtag.follow": "ติดตามแฮชแท็ก",
   "hashtag.unfollow": "เลิกติดตามแฮชแท็ก",
   "hashtags.and_other": "…และอีก {count, plural, other {# เพิ่มเติม}}",
-  "home.column_settings.basic": "พื้นฐาน",
   "home.column_settings.show_reblogs": "แสดงการดัน",
   "home.column_settings.show_replies": "แสดงการตอบกลับ",
   "home.hide_announcements": "ซ่อนประกาศ",
@@ -440,15 +440,16 @@
   "notification.reblog": "{name} ได้ดันโพสต์ของคุณ",
   "notification.status": "{name} เพิ่งโพสต์",
   "notification.update": "{name} ได้แก้ไขโพสต์",
+  "notification_requests.accept": "ยอมรับ",
+  "notification_requests.dismiss": "ปิด",
+  "notification_requests.notifications_from": "การแจ้งเตือนจาก {name}",
+  "notification_requests.title": "การแจ้งเตือนที่กรองอยู่",
   "notifications.clear": "ล้างการแจ้งเตือน",
   "notifications.clear_confirmation": "คุณแน่ใจหรือไม่ว่าต้องการล้างการแจ้งเตือนทั้งหมดของคุณอย่างถาวร?",
   "notifications.column_settings.admin.report": "รายงานใหม่:",
   "notifications.column_settings.admin.sign_up": "การลงทะเบียนใหม่:",
   "notifications.column_settings.alert": "การแจ้งเตือนบนเดสก์ท็อป",
   "notifications.column_settings.favourite": "รายการโปรด:",
-  "notifications.column_settings.filter_bar.advanced": "แสดงหมวดหมู่ทั้งหมด",
-  "notifications.column_settings.filter_bar.category": "แถบตัวกรองด่วน",
-  "notifications.column_settings.filter_bar.show_bar": "แสดงแถบตัวกรอง",
   "notifications.column_settings.follow": "ผู้ติดตามใหม่:",
   "notifications.column_settings.follow_request": "คำขอติดตามใหม่:",
   "notifications.column_settings.mention": "การกล่าวถึง:",
@@ -474,6 +475,15 @@
   "notifications.permission_denied": "การแจ้งเตือนบนเดสก์ท็อปไม่พร้อมใช้งานเนื่องจากมีการปฏิเสธคำขอสิทธิอนุญาตเบราว์เซอร์ก่อนหน้านี้",
   "notifications.permission_denied_alert": "ไม่สามารถเปิดใช้งานการแจ้งเตือนบนเดสก์ท็อป เนื่องจากมีการปฏิเสธสิทธิอนุญาตเบราว์เซอร์ก่อนหน้านี้",
   "notifications.permission_required": "การแจ้งเตือนบนเดสก์ท็อปไม่พร้อมใช้งานเนื่องจากไม่ได้ให้สิทธิอนุญาตที่จำเป็น",
+  "notifications.policy.filter_new_accounts.hint": "สร้างขึ้นภายใน {days, plural, other {# วัน}}ที่ผ่านมา",
+  "notifications.policy.filter_new_accounts_title": "บัญชีใหม่",
+  "notifications.policy.filter_not_followers_hint": "รวมถึงผู้คนที่ได้ติดตามคุณน้อยกว่า {days, plural, other {# วัน}}",
+  "notifications.policy.filter_not_followers_title": "ผู้คนที่ไม่ได้ติดตามคุณ",
+  "notifications.policy.filter_not_following_hint": "จนกว่าคุณจะอนุมัติเขาด้วยตนเอง",
+  "notifications.policy.filter_not_following_title": "ผู้คนที่คุณไม่ได้ติดตาม",
+  "notifications.policy.filter_private_mentions_hint": "กรองไว้เว้นแต่การกล่าวถึงแบบส่วนตัวอยู่ในการตอบกลับการกล่าวถึงของคุณเองหรือหากคุณติดตามผู้ส่ง",
+  "notifications.policy.filter_private_mentions_title": "การกล่าวถึงแบบส่วนตัวที่ไม่พึงประสงค์",
+  "notifications.policy.title": "กรองการแจ้งเตือนจาก…",
   "notifications_permission_banner.enable": "เปิดใช้งานการแจ้งเตือนบนเดสก์ท็อป",
   "notifications_permission_banner.how_to_control": "เพื่อรับการแจ้งเตือนเมื่อ Mastodon ไม่ได้เปิด เปิดใช้งานการแจ้งเตือนบนเดสก์ท็อป คุณสามารถควบคุมชนิดของการโต้ตอบที่สร้างการแจ้งเตือนบนเดสก์ท็อปได้อย่างแม่นยำผ่านปุ่ม {icon} ด้านบนเมื่อเปิดใช้งานการแจ้งเตือน",
   "notifications_permission_banner.title": "ไม่พลาดสิ่งใด",
diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json
index 02c9159be5503d..6774ad48e1750a 100644
--- a/app/javascript/mastodon/locales/tr.json
+++ b/app/javascript/mastodon/locales/tr.json
@@ -314,7 +314,6 @@
   "hashtag.follow": "Etiketi takip et",
   "hashtag.unfollow": "Etiketi takibi bırak",
   "hashtags.and_other": "…ve {count, plural, one {}other {# fazlası}}",
-  "home.column_settings.basic": "Temel",
   "home.column_settings.show_reblogs": "Yeniden paylaşımları göster",
   "home.column_settings.show_replies": "Yanıtları göster",
   "home.hide_announcements": "Duyuruları gizle",
@@ -446,9 +445,6 @@
   "notifications.column_settings.admin.sign_up": "Yeni kayıtlar:",
   "notifications.column_settings.alert": "Masaüstü bildirimleri",
   "notifications.column_settings.favourite": "Favorilerin:",
-  "notifications.column_settings.filter_bar.advanced": "Tüm kategorileri görüntüle",
-  "notifications.column_settings.filter_bar.category": "Hızlı süzgeç çubuğu",
-  "notifications.column_settings.filter_bar.show_bar": "Süzgeç çubuğunu göster",
   "notifications.column_settings.follow": "Yeni takipçiler:",
   "notifications.column_settings.follow_request": "Yeni takip istekleri:",
   "notifications.column_settings.mention": "Değinmeler:",
diff --git a/app/javascript/mastodon/locales/tt.json b/app/javascript/mastodon/locales/tt.json
index 17de9884e79675..49c7e9a1453855 100644
--- a/app/javascript/mastodon/locales/tt.json
+++ b/app/javascript/mastodon/locales/tt.json
@@ -236,7 +236,6 @@
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
   "hashtag.follow": "Хэштегка язылу",
   "hashtag.unfollow": "Хэштегка язылу юк",
-  "home.column_settings.basic": "Төп",
   "home.column_settings.show_reblogs": "Табышмаклау",
   "home.column_settings.show_replies": "Җаваплар күрсәтү",
   "home.hide_announcements": "Игъланнарны яшерү",
diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json
index d14654d17c8956..49d79d32d1a5d4 100644
--- a/app/javascript/mastodon/locales/uk.json
+++ b/app/javascript/mastodon/locales/uk.json
@@ -314,7 +314,6 @@
   "hashtag.follow": "Стежити за хештегом",
   "hashtag.unfollow": "Не стежити за хештегом",
   "hashtags.and_other": "…і {count, plural, other {ще #}}",
-  "home.column_settings.basic": "Основні",
   "home.column_settings.show_reblogs": "Показувати поширення",
   "home.column_settings.show_replies": "Показувати відповіді",
   "home.hide_announcements": "Приховати оголошення",
@@ -440,15 +439,16 @@
   "notification.reblog": "{name} поширює ваш допис",
   "notification.status": "{name} щойно дописує",
   "notification.update": "{name} змінює допис",
+  "notification_requests.accept": "Прийняти",
+  "notification_requests.dismiss": "Відхилити",
+  "notification_requests.notifications_from": "Сповіщення від {name}",
+  "notification_requests.title": "Відфільтровані сповіщення",
   "notifications.clear": "Очистити сповіщення",
   "notifications.clear_confirmation": "Ви впевнені, що хочете назавжди видалити всі сповіщення?",
   "notifications.column_settings.admin.report": "Нові скарги:",
   "notifications.column_settings.admin.sign_up": "Нові реєстрації:",
   "notifications.column_settings.alert": "Сповіщення стільниці",
   "notifications.column_settings.favourite": "Уподобане:",
-  "notifications.column_settings.filter_bar.advanced": "Показати всі категорії",
-  "notifications.column_settings.filter_bar.category": "Панель швидкого фільтру",
-  "notifications.column_settings.filter_bar.show_bar": "Показати панель фільтра",
   "notifications.column_settings.follow": "Нові підписники:",
   "notifications.column_settings.follow_request": "Нові запити на підписку:",
   "notifications.column_settings.mention": "Згадки:",
@@ -474,6 +474,7 @@
   "notifications.permission_denied": "Сповіщення стільниці недоступні через раніше відхилений запит дозволів для браузера",
   "notifications.permission_denied_alert": "Сповіщення не можна ввімкнути оскільки у дозволі вже було відмовлено раніше",
   "notifications.permission_required": "Сповіщення на стільниці не доступні, оскільки необхідний дозвіл не надано.",
+  "notifications.policy.filter_new_accounts_title": "Нові облікові записи",
   "notifications_permission_banner.enable": "Увімкнути сповіщення стільниці",
   "notifications_permission_banner.how_to_control": "Щоб отримувати сповіщення, коли Mastodon не відкрито, увімкніть сповіщення стільниці. Ви можете контролювати, які типи взаємодій створюють сповіщення через кнопку {icon} вгорі після їхнього увімкнення.",
   "notifications_permission_banner.title": "Не проґавте нічого",
diff --git a/app/javascript/mastodon/locales/ur.json b/app/javascript/mastodon/locales/ur.json
index fee2cc3a9817e2..d344f00c87ff3c 100644
--- a/app/javascript/mastodon/locales/ur.json
+++ b/app/javascript/mastodon/locales/ur.json
@@ -189,7 +189,6 @@
   "hashtag.column_settings.tag_mode.any": "ان میں سے کوئی",
   "hashtag.column_settings.tag_mode.none": "ان میں سے کوئی بھی نہیں",
   "hashtag.column_settings.tag_toggle": "اس کالم کے لئے مزید ٹیگز شامل کریں",
-  "home.column_settings.basic": "بنیادی",
   "home.column_settings.show_reblogs": "افزائشات دکھائیں",
   "home.column_settings.show_replies": "جوابات دکھائیں",
   "intervals.full.days": "{number, plural, one {# روز} other {# روز}}",
@@ -253,7 +252,6 @@
   "notifications.clear": "اطلاعات ہٹائیں",
   "notifications.clear_confirmation": "کیا آپ واقعی اپنی تمام اطلاعات کو صاف کرنا چاہتے ہیں؟",
   "notifications.column_settings.alert": "ڈیسک ٹاپ اطلاعات",
-  "notifications.column_settings.filter_bar.advanced": "تمام زمرے دکھائیں",
   "notifications.column_settings.status": "New toots:",
   "onboarding.actions.go_to_explore": "See what's trending",
   "onboarding.actions.go_to_home": "Go to your home feed",
diff --git a/app/javascript/mastodon/locales/uz.json b/app/javascript/mastodon/locales/uz.json
index 8f231c8c77ab9e..b307d917fad0b7 100644
--- a/app/javascript/mastodon/locales/uz.json
+++ b/app/javascript/mastodon/locales/uz.json
@@ -255,7 +255,6 @@
   "hashtag.column_settings.tag_toggle": "Ushbu ustun uchun qo'shimcha teglarni qo'shing",
   "hashtag.follow": "Hashtagni kuzatish",
   "hashtag.unfollow": "Hashtagni kuzatishni to'xtatish",
-  "home.column_settings.basic": "Asos",
   "home.column_settings.show_reblogs": "Boostlarni ko'rish",
   "home.column_settings.show_replies": "Javoblarni ko'rish",
   "home.hide_announcements": "E'lonlarni yashirish",
diff --git a/app/javascript/mastodon/locales/vi.json b/app/javascript/mastodon/locales/vi.json
index 9a4182e540197d..b1785ca5d0e114 100644
--- a/app/javascript/mastodon/locales/vi.json
+++ b/app/javascript/mastodon/locales/vi.json
@@ -314,7 +314,6 @@
   "hashtag.follow": "Theo dõi hashtag",
   "hashtag.unfollow": "Bỏ theo dõi hashtag",
   "hashtags.and_other": "…và {count, plural, other {# nữa}}",
-  "home.column_settings.basic": "Tùy chỉnh",
   "home.column_settings.show_reblogs": "Hiện những lượt đăng lại",
   "home.column_settings.show_replies": "Hiện những tút dạng trả lời",
   "home.hide_announcements": "Ẩn thông báo máy chủ",
@@ -446,9 +445,6 @@
   "notifications.column_settings.admin.sign_up": "Người mới tham gia:",
   "notifications.column_settings.alert": "Báo trên máy tính",
   "notifications.column_settings.favourite": "Lượt thích:",
-  "notifications.column_settings.filter_bar.advanced": "Toàn bộ",
-  "notifications.column_settings.filter_bar.category": "Phân loại",
-  "notifications.column_settings.filter_bar.show_bar": "Hiện bộ lọc",
   "notifications.column_settings.follow": "Người theo dõi:",
   "notifications.column_settings.follow_request": "Yêu cầu theo dõi:",
   "notifications.column_settings.mention": "Lượt nhắc đến:",
diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json
index 3e714987c077e8..6d6cd4b6c7eb60 100644
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@@ -241,6 +241,7 @@
   "empty_column.list": "列表中还没有任何内容。当列表成员发布新嘟文时，它们将出现在这里。",
   "empty_column.lists": "你还没有创建过列表。你创建的列表会在这里显示。",
   "empty_column.mutes": "你没有隐藏任何用户。",
+  "empty_column.notification_requests": "都看完了！这里没有任何未读通知。当收到新的通知时，它们将根据您的设置显示在这里。",
   "empty_column.notifications": "你还没有收到过任何通知，快和其他用户互动吧。",
   "empty_column.public": "这里什么都没有！写一些公开的嘟文，或者关注其他服务器的用户后，这里就会有嘟文出现了",
   "error.unexpected_crash.explanation": "此页面无法正确显示，这可能是因为我们的代码中有错误，也可能是因为浏览器兼容问题。",
@@ -271,6 +272,8 @@
   "filter_modal.select_filter.subtitle": "使用一个已存在类别，或创建一个新类别",
   "filter_modal.select_filter.title": "过滤此嘟文",
   "filter_modal.title.status": "过滤一条嘟文",
+  "filtered_notifications_banner.pending_requests": "来自你可能认识的 {count, plural, =0 {0 个人} other {# 个人}}的通知",
+  "filtered_notifications_banner.title": "通知（已过滤）",
   "firehose.all": "全部",
   "firehose.local": "此服务器",
   "firehose.remote": "其他服务器",
@@ -314,7 +317,6 @@
   "hashtag.follow": "关注话题标签",
   "hashtag.unfollow": "取消关注话题标签",
   "hashtags.and_other": "… 和另外 {count, plural, other {# 个话题}}",
-  "home.column_settings.basic": "基本设置",
   "home.column_settings.show_reblogs": "显示转嘟",
   "home.column_settings.show_replies": "显示回复",
   "home.hide_announcements": "隐藏公告",
@@ -440,15 +442,16 @@
   "notification.reblog": "{name} 转发了你的嘟文",
   "notification.status": "{name} 刚刚发布嘟文",
   "notification.update": "{name} 编辑了嘟文",
+  "notification_requests.accept": "接受",
+  "notification_requests.dismiss": "拒绝",
+  "notification_requests.notifications_from": "来自 {name} 的通知",
+  "notification_requests.title": "通知（已过滤）",
   "notifications.clear": "清空通知列表",
   "notifications.clear_confirmation": "你确定要永久清空通知列表吗？",
   "notifications.column_settings.admin.report": "新举报：",
   "notifications.column_settings.admin.sign_up": "新注册：",
   "notifications.column_settings.alert": "桌面通知",
   "notifications.column_settings.favourite": "喜欢：",
-  "notifications.column_settings.filter_bar.advanced": "显示所有类别",
-  "notifications.column_settings.filter_bar.category": "快速筛选栏",
-  "notifications.column_settings.filter_bar.show_bar": "显示过滤栏",
   "notifications.column_settings.follow": "新粉丝：",
   "notifications.column_settings.follow_request": "新关注请求：",
   "notifications.column_settings.mention": "提及：",
@@ -474,6 +477,15 @@
   "notifications.permission_denied": "由于权限被拒绝，无法启用桌面通知。",
   "notifications.permission_denied_alert": "由于在此之前浏览器权限请求就已被拒绝，所以启用桌面通知失败",
   "notifications.permission_required": "所需权限未被授予，所以桌面通知不可用",
+  "notifications.policy.filter_new_accounts.hint": "在 {days, plural, other {# 天}}内创建的账户",
+  "notifications.policy.filter_new_accounts_title": "新账户",
+  "notifications.policy.filter_not_followers_hint": "包括关注你少于 {days, plural, other {# 天}}的人",
+  "notifications.policy.filter_not_followers_title": "未关注你的人",
+  "notifications.policy.filter_not_following_hint": "直到你手动批准",
+  "notifications.policy.filter_not_following_title": "你没有关注的人",
+  "notifications.policy.filter_private_mentions_hint": "过滤通知，除非通知是在回复提及你自己的内容，或发送者是你关注的人",
+  "notifications.policy.filter_private_mentions_title": "不请自来的提及",
+  "notifications.policy.title": "通知过滤范围",
   "notifications_permission_banner.enable": "启用桌面通知",
   "notifications_permission_banner.how_to_control": "启用桌面通知以在 Mastodon 未打开时接收通知。你可以通过交互通过上面的 {icon} 按钮来精细控制可以发送桌面通知的交互类型。",
   "notifications_permission_banner.title": "精彩不容错过",
diff --git a/app/javascript/mastodon/locales/zh-HK.json b/app/javascript/mastodon/locales/zh-HK.json
index 2382e3c61ce2c2..74a5c5a2d64fc0 100644
--- a/app/javascript/mastodon/locales/zh-HK.json
+++ b/app/javascript/mastodon/locales/zh-HK.json
@@ -308,7 +308,6 @@
   "hashtag.follow": "追蹤主題標籤",
   "hashtag.unfollow": "取消追蹤主題標籤",
   "hashtags.and_other": "…及{count, plural, other {其他 # 個}}",
-  "home.column_settings.basic": "基本",
   "home.column_settings.show_reblogs": "顯示被轉推的文章",
   "home.column_settings.show_replies": "顯示回應文章",
   "home.hide_announcements": "隱藏公告",
@@ -440,9 +439,6 @@
   "notifications.column_settings.admin.sign_up": "新註冊：",
   "notifications.column_settings.alert": "顯示桌面通知",
   "notifications.column_settings.favourite": "最愛：",
-  "notifications.column_settings.filter_bar.advanced": "顯示所有分類",
-  "notifications.column_settings.filter_bar.category": "快速過濾欄",
-  "notifications.column_settings.filter_bar.show_bar": "顯示篩選欄",
   "notifications.column_settings.follow": "新追蹤者：",
   "notifications.column_settings.follow_request": "新的追蹤請求：",
   "notifications.column_settings.mention": "提及你：",
diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json
index f52f28381082aa..ff0bd4c8ffaa32 100644
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@@ -241,6 +241,7 @@
   "empty_column.list": "這份列表下什麼也沒有。當此列表的成員嘟出新的嘟文時，它們將顯示於此。",
   "empty_column.lists": "您還沒有新增任何列表。當您新增列表時，它將於此顯示。",
   "empty_column.mutes": "您尚未靜音任何使用者。",
+  "empty_column.notification_requests": "清空啦！已經沒有任何通知。當您收到新通知時，它們將依照您的設定於此顯示。",
   "empty_column.notifications": "您還沒有收到任何通知，當您與別人開始互動時，它將於此顯示。",
   "empty_column.public": "這裡什麼都沒有！嘗試寫些公開的嘟文，或者跟隨其他伺服器的使用者後，就會有嘟文出現了",
   "error.unexpected_crash.explanation": "由於發生系統故障或瀏覽器相容性問題，無法正常顯示此頁面。",
@@ -271,6 +272,8 @@
   "filter_modal.select_filter.subtitle": "使用既有的類別或是新增",
   "filter_modal.select_filter.title": "過濾此嘟文",
   "filter_modal.title.status": "過濾一則嘟文",
+  "filtered_notifications_banner.pending_requests": "來自您可能認識的 {count, plural, =0 {0 人} other {# 人}} 之通知",
+  "filtered_notifications_banner.title": "已過濾之通知",
   "firehose.all": "全部",
   "firehose.local": "本站",
   "firehose.remote": "聯邦宇宙",
@@ -314,7 +317,6 @@
   "hashtag.follow": "跟隨主題標籤",
   "hashtag.unfollow": "取消跟隨主題標籤",
   "hashtags.and_other": "…及其他 {count, plural, other {# 個}}",
-  "home.column_settings.basic": "基本設定",
   "home.column_settings.show_reblogs": "顯示轉嘟",
   "home.column_settings.show_replies": "顯示回覆",
   "home.hide_announcements": "隱藏公告",
@@ -394,7 +396,7 @@
   "lists.replies_policy.list": "列表成員",
   "lists.replies_policy.none": "沒有人",
   "lists.replies_policy.title": "顯示回覆：",
-  "lists.search": "搜尋您跟隨的使用者",
+  "lists.search": "搜尋您跟隨之使用者",
   "lists.subheading": "您的列表",
   "load_pending": "{count, plural, one {# 個新項目} other {# 個新項目}}",
   "loading_indicator.label": "正在載入...",
@@ -440,15 +442,16 @@
   "notification.reblog": "{name} 已轉嘟您的嘟文",
   "notification.status": "{name} 剛剛嘟文",
   "notification.update": "{name} 已編輯嘟文",
+  "notification_requests.accept": "接受",
+  "notification_requests.dismiss": "關閉",
+  "notification_requests.notifications_from": "來自 {name} 之通知",
+  "notification_requests.title": "已過濾之通知",
   "notifications.clear": "清除通知",
   "notifications.clear_confirmation": "您確定要永久清除您的通知嗎？",
   "notifications.column_settings.admin.report": "新檢舉報告：",
   "notifications.column_settings.admin.sign_up": "新註冊帳號：",
   "notifications.column_settings.alert": "桌面通知",
   "notifications.column_settings.favourite": "最愛：",
-  "notifications.column_settings.filter_bar.advanced": "顯示所有分類",
-  "notifications.column_settings.filter_bar.category": "快速過濾器",
-  "notifications.column_settings.filter_bar.show_bar": "顯示過濾器",
   "notifications.column_settings.follow": "新的跟隨者：",
   "notifications.column_settings.follow_request": "新的跟隨請求：",
   "notifications.column_settings.mention": "提及：",
@@ -474,6 +477,15 @@
   "notifications.permission_denied": "由於之前已拒絕瀏覽器請求，因此無法使用桌面通知",
   "notifications.permission_denied_alert": "由於之前瀏覽器權限被拒絕，無法啟用桌面通知",
   "notifications.permission_required": "由於尚未授予所需的權限，因此無法使用桌面通知。",
+  "notifications.policy.filter_new_accounts.hint": "新增於過去 {days, plural, other {# 日}}",
+  "notifications.policy.filter_new_accounts_title": "新帳號",
+  "notifications.policy.filter_not_followers_hint": "包含最近 {days, plural, other {# 日}} 內跟隨您之使用者",
+  "notifications.policy.filter_not_followers_title": "未跟隨您之使用者",
+  "notifications.policy.filter_not_following_hint": "直至您手動核准他們",
+  "notifications.policy.filter_not_following_title": "您未跟隨之使用者",
+  "notifications.policy.filter_private_mentions_hint": "過濾通知，除非嘟文包含於您的提及，或您跟隨該發嘟帳號",
+  "notifications.policy.filter_private_mentions_title": "不請自來的私訊",
+  "notifications.policy.title": "過濾通知來自...",
   "notifications_permission_banner.enable": "啟用桌面通知",
   "notifications_permission_banner.how_to_control": "啟用桌面通知以於 Mastodon 沒有開啟的時候接收通知。啟用桌面通知後，您可以透過上面的 {icon} 按鈕準確的控制哪些類型的互動會產生桌面通知。",
   "notifications_permission_banner.title": "不要錯過任何東西！",
@@ -486,7 +498,7 @@
   "onboarding.follows.lead": "您的首頁時間軸是 Mastodon 的核心體驗。若您跟隨更多人，它將會變得更活躍有趣。這些個人檔案也許是個好起點，您可以隨時取消跟隨他們！",
   "onboarding.follows.title": "客製化您的首頁時間軸",
   "onboarding.profile.discoverable": "使我的個人檔案可以被找到",
-  "onboarding.profile.discoverable_hint": "當您於 Mastodon 上選擇加入可發現性時，您的嘟文可能會出現於搜尋結果與趨勢中。您的個人檔案可能會被推薦給與您志趣相投的人。",
+  "onboarding.profile.discoverable_hint": "當您於 Mastodon 上選擇加入可發現性時，您的嘟文可能會顯示於搜尋結果與趨勢中。您的個人檔案可能會被推薦給與您志趣相投的人。",
   "onboarding.profile.display_name": "顯示名稱",
   "onboarding.profile.display_name_hint": "完整名稱或暱稱...",
   "onboarding.profile.lead": "您隨時可以稍候於設定中完成此操作，將有更多自訂選項可使用。",
@@ -531,7 +543,7 @@
   "privacy.change": "調整嘟文隱私狀態",
   "privacy.direct.long": "此嘟文提及之所有人",
   "privacy.direct.short": "指定使用者",
-  "privacy.private.long": "只有跟隨您的人能看到",
+  "privacy.private.long": "只有跟隨您之使用者能看到",
   "privacy.private.short": "跟隨者",
   "privacy.public.long": "所有人 (無論在 Mastodon 上與否)",
   "privacy.public.short": "公開",
diff --git a/config/locales/doorkeeper.zh-TW.yml b/config/locales/doorkeeper.zh-TW.yml
index 65926dfeef364a..f9813b13196044 100644
--- a/config/locales/doorkeeper.zh-TW.yml
+++ b/config/locales/doorkeeper.zh-TW.yml
@@ -172,7 +172,7 @@ zh-TW:
       read:bookmarks: 檢視您的書籤
       read:favourites: 檢視您收藏之最愛嘟文
       read:filters: 檢視您的過濾條件
-      read:follows: 檢視您跟隨的人
+      read:follows: 檢視您跟隨之使用者
       read:lists: 檢視您的列表
       read:mutes: 檢視您靜音的人
       read:notifications: 檢視您的通知
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 62336d89d41c6a..52321b87bcebd3 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -403,10 +403,12 @@ lt:
       import: Importuoti
       new:
         create: Sukurti bloką
-        hint: Domeno blokavimas nesustabdys vartotojų paskyrų sukūrimo duomenų sistemoje, tačiau automatiškai pritaikys atitinkamus moderavimo metodus šioms paskyroms.
+        hint: Domeno blokas netrukdys kurti paskyrų įrašų duomenų bazėje, bet atgaline data ir automatiškai taikys tam tikrus tų paskyrų prižiūrėjimo būdus.
         severity:
+          desc_html: "<strong>Ribojimas</strong> padarys šio domeno paskyrų įrašus nematomus visiems, kurie jų neseka. <strong>Pristabdymas</strong> iš tavo serverio pašalins visą šio domeno paskyrų turinį, mediją ir profilio duomenis. Naudok <strong>Nieko</strong>, jei nori tik atmesti medijos failus."
           noop: Nieko
-          suspend: Draudimas
+          silence: Riboti
+          suspend: Pristabdyti
         title: Naujos domeno blokas
       reject_media: Atmesti medijos failai
       reject_media_hint: Panaikina lokaliai saugomus medijos failus bei atsisako jų parsisiuntimo ateityje. Neliečia užblokavimu
@@ -468,7 +470,7 @@ lt:
       assign_to_self: Paskirti man
       assigned: Paskirtas moderatorius
       comment:
-        none: Nėra
+        none: Nieko
       created_at: Reportuotas
       forwarded_replies_explanation: Šis ataskaita yra iš nuotolinio naudotojo ir susijusi su nuotoliniu turiniu. Jis buvo persiųstas tau, nes turinys, apie kurį pranešta, yra atsakymas vienam iš tavo naudotojų.
       mark_as_resolved: Pažymėti kaip išsprestą
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index d6d0f05c50a104..83489f7e7b582f 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -473,7 +473,7 @@ lv:
       status: Statuss
       suppress: Apspiest sekošanas rekomendāciju
       suppressed: Apspiestie
-      title: Sekošanas rekomendācijas
+      title: Sekošanas ieteikumi
       unsuppress: Atjaunot sekošanas rekomendāciju
     instances:
       availability:
diff --git a/config/locales/simple_form.bg.yml b/config/locales/simple_form.bg.yml
index 831e1a2f8c5443..e85e753e887773 100644
--- a/config/locales/simple_form.bg.yml
+++ b/config/locales/simple_form.bg.yml
@@ -116,6 +116,7 @@ bg:
           sign_up_requires_approval: Новите регистрации ще изискват одобрението ви
         severity: Изберете какво да се случва със заявките от този IP
       rule:
+        hint: По избор. Дайте по-подробно за правилото
         text: Опишете правило или изискване за потребителите на този сървър. Опитайте се да го направите кратко и просто
       sessions:
         otp: 'Въведете двуфакторния код, породен от приложението на телефона си или използвайте един от кодовете си за възстановяване:'
@@ -299,6 +300,7 @@ bg:
           patch: Известие за обновявания на оправени грешки
         trending_tag: Изискване на преглед за новонашумели
       rule:
+        hint: Допълнителни сведения
         text: Правило
       settings:
         indexable: Включване на страницата на профила в търсачките
diff --git a/config/locales/simple_form.br.yml b/config/locales/simple_form.br.yml
index 529e3224e67c4d..196711aee97b1a 100644
--- a/config/locales/simple_form.br.yml
+++ b/config/locales/simple_form.br.yml
@@ -67,6 +67,7 @@ br:
       notification_emails:
         follow: Heuliañ a ra {name} ac'hanoc'h
       rule:
+        hint: Titouroù ouzhpenn
         text: Reolenn
       tag:
         name: Hashtag
diff --git a/config/locales/simple_form.ca.yml b/config/locales/simple_form.ca.yml
index 7d0f799d0cee4a..357f482b8339ff 100644
--- a/config/locales/simple_form.ca.yml
+++ b/config/locales/simple_form.ca.yml
@@ -116,6 +116,7 @@ ca:
           sign_up_requires_approval: Els nous registres requeriran la teva aprovació
         severity: Tria què passarà amb les sol·licituds des d’aquesta IP
       rule:
+        hint: Opcional. Proporciona més detalls de la regla
         text: Descriu una norma o requeriment pels usuaris d'aquest servidor. Intenta fer-la curta i senzilla
       sessions:
         otp: 'Introdueix el codi de dos factors generat per el teu telèfon o utilitza un dels teus codis de recuperació:'
@@ -299,6 +300,7 @@ ca:
           patch: Notificar sobre les actualitzacions de correcció d'errors
         trending_tag: Nova tendència requereix revisió
       rule:
+        hint: Informació addicional
         text: Norma
       settings:
         indexable: Inclou la pàgina del perfil en els motors de cerca
diff --git a/config/locales/simple_form.cy.yml b/config/locales/simple_form.cy.yml
index 3daedfc86063ce..21cd1ddc0afd54 100644
--- a/config/locales/simple_form.cy.yml
+++ b/config/locales/simple_form.cy.yml
@@ -116,6 +116,7 @@ cy:
           sign_up_requires_approval: Bydd angen eich cymeradwyaeth ar gyfer cofrestriadau newydd
         severity: Dewiswch beth fydd yn digwydd gyda cheisiadau o'r IP hwn
       rule:
+        hint: Dewisol. Darparwch ragor o fanylion am y rheol
         text: Disgrifiwch reol neu ofyniad ar gyfer defnyddwyr ar y gweinydd hwn. Ceisiwch ei gadw'n fyr ac yn syml
       sessions:
         otp: 'Mewnbynnwch y cod dau gam a gynhyrchwyd gan eich ap ffôn neu defnyddiwch un o''ch codau adfer:'
@@ -299,6 +300,7 @@ cy:
           patch: Rhoi gwybod am ddiweddariadau trwsio byg
         trending_tag: Mae pwnc llosg newydd angen adolygiad
       rule:
+        hint: Gwybodaeth ychwanegol
         text: Rheol
       settings:
         indexable: Cynnwys tudalen proffil mewn peiriannau chwilio
diff --git a/config/locales/simple_form.da.yml b/config/locales/simple_form.da.yml
index fde0bcc2485364..6c8d995bfdb1a9 100644
--- a/config/locales/simple_form.da.yml
+++ b/config/locales/simple_form.da.yml
@@ -116,6 +116,7 @@ da:
           sign_up_requires_approval: Nye tilmeldinger kræver din godkendelse
         severity: Afgør, hvordan forespørgsler fra denne IP behandles
       rule:
+        hint: Valgfrit. Oplys yderligere detaljer om reglen
         text: Beskriv på en kort og enkel form en regel/krav for brugere på denne server
       sessions:
         otp: 'Angiv tofaktorkoden generet af din mobil-app eller brug en af genoprettelseskoderne:'
@@ -299,6 +300,7 @@ da:
           patch: Notificér om fejlrettelsesopdateringer
         trending_tag: Ny tendens kræver revidering
       rule:
+        hint: Yderligere oplysninger
         text: Regel
       settings:
         indexable: Inkludér profilside i søgemaskiner
diff --git a/config/locales/simple_form.de.yml b/config/locales/simple_form.de.yml
index b8fec42d66f746..1d608af08b5159 100644
--- a/config/locales/simple_form.de.yml
+++ b/config/locales/simple_form.de.yml
@@ -116,6 +116,7 @@ de:
           sign_up_requires_approval: Neue Registrierungen müssen genehmigt werden
         severity: Wähle aus, was mit Anfragen von dieser IP-Adresse geschehen soll
       rule:
+        hint: "(Optional) Gib weitere Details zu dieser Regel an"
         text: Führe eine Regel oder Auflage für Profile auf diesem Server ein. Bleib dabei kurz und knapp
       sessions:
         otp: 'Gib den Zwei-Faktor-Code von deinem Smartphone ein oder verwende einen deiner Wiederherstellungscodes:'
@@ -299,6 +300,7 @@ de:
           patch: Über Fehlerbehebungen informieren
         trending_tag: Neuer Trend erfordert eine Überprüfung
       rule:
+        hint: Zusätzliche Informationen
         text: Regel
       settings:
         indexable: Profilseite in Suchmaschinen einbeziehen
diff --git a/config/locales/simple_form.es-AR.yml b/config/locales/simple_form.es-AR.yml
index a074091313c8f1..0111624082a8c2 100644
--- a/config/locales/simple_form.es-AR.yml
+++ b/config/locales/simple_form.es-AR.yml
@@ -116,6 +116,7 @@ es-AR:
           sign_up_requires_approval: Los nuevos registros requerirán tu aprobación
         severity: Elegí lo que pasará con las solicitudes desde esta dirección IP
       rule:
+        hint: Opcional. Ofrecé más detalles sobre la regla
         text: Describí una regla o requisito para los usuarios de este servidor. Intentá hacerla corta y sencilla
       sessions:
         otp: 'Ingresá el código de autenticación de dos factores generado por la aplicación en tu dispositivo, o usá uno de tus códigos de recuperación:'
@@ -299,6 +300,7 @@ es-AR:
           patch: Notificar sobre actualizaciones de corrección de errores
         trending_tag: Una nueva tendencia requiere revisión
       rule:
+        hint: Información adicional
         text: Regla
       settings:
         indexable: Incluir la página de perfil en los motores de búsqueda
diff --git a/config/locales/simple_form.es-MX.yml b/config/locales/simple_form.es-MX.yml
index d8f1cf95a00c9d..28253d385b6520 100644
--- a/config/locales/simple_form.es-MX.yml
+++ b/config/locales/simple_form.es-MX.yml
@@ -116,6 +116,7 @@ es-MX:
           sign_up_requires_approval: Nuevos registros requerirán su aprobación
         severity: Elegir lo que pasará con las peticiones desde esta IP
       rule:
+        hint: Opcional. Proporciona más detalles sobre la regla
         text: Describe una norma o requisito para los usuarios de este servidor. Intenta hacerla corta y sencilla
       sessions:
         otp: 'Introduce el código de autenticación de dos factores generado por tu aplicación de teléfono o usa uno de tus códigos de recuperación:'
@@ -299,6 +300,7 @@ es-MX:
           patch: Notificar en actualizaciones de errores
         trending_tag: La nueva tendencia requiere de revisión
       rule:
+        hint: Información adicional
         text: Norma
       settings:
         indexable: Incluir la página de perfil en los motores de búsqueda
diff --git a/config/locales/simple_form.es.yml b/config/locales/simple_form.es.yml
index fee260aa8992f7..008ac16073d1f3 100644
--- a/config/locales/simple_form.es.yml
+++ b/config/locales/simple_form.es.yml
@@ -116,6 +116,7 @@ es:
           sign_up_requires_approval: Nuevos registros requerirán su aprobación
         severity: Elegir lo que pasará con las peticiones desde esta IP
       rule:
+        hint: Opcional. Proporciona más detalles sobre la regla
         text: Describe una norma o requisito para los usuarios de este servidor. Intenta hacerla corta y sencilla
       sessions:
         otp: 'Introduce el código de autenticación de dos factores generado por tu aplicación de teléfono o usa uno de tus códigos de recuperación:'
@@ -299,6 +300,7 @@ es:
           patch: Notificar de actualizaciones de errores
         trending_tag: Una nueva tendencia requiere revisión
       rule:
+        hint: Información adicional
         text: Norma
       settings:
         indexable: Incluye la página de perfil en los buscadores
diff --git a/config/locales/simple_form.eu.yml b/config/locales/simple_form.eu.yml
index b417b45fa9ed75..03ba1aea6cc527 100644
--- a/config/locales/simple_form.eu.yml
+++ b/config/locales/simple_form.eu.yml
@@ -116,6 +116,7 @@ eu:
           sign_up_requires_approval: Izen emate berriek zure onarpena beharko dute
         severity: Aukeratu zer gertatuko den IP honetatik datozen eskaerekin
       rule:
+        hint: Aukerakoa. Eman arauari buruzko xehetasun gehiago.
         text: Deskribatu zerbitzari honetako erabiltzaileentzako arau edo betekizun bat. Saiatu labur eta sinple idazten
       sessions:
         otp: 'Sartu zure telefonoko aplikazioak sortutako bi faktoreetako kodea, edo erabili zure berreskuratze kodeetako bat:'
@@ -299,6 +300,7 @@ eu:
           patch: Jakinarazi akats zuzenketa eguneraketa guztiak
         trending_tag: Joera berriak berrikuspena behar du
       rule:
+        hint: Informazio gehigarria
         text: Araua
       settings:
         indexable: Gehitu profila bilaketa-motorretan
diff --git a/config/locales/simple_form.fo.yml b/config/locales/simple_form.fo.yml
index 003eede25b92f6..599e79ea2f64ff 100644
--- a/config/locales/simple_form.fo.yml
+++ b/config/locales/simple_form.fo.yml
@@ -116,6 +116,7 @@ fo:
           sign_up_requires_approval: Nýggjar tilmeldingar fara at krevja tína góðkenning
         severity: Vel, hvat skal henda við umbønum frá hesari IP adressuni
       rule:
+        hint: Valfrítt. Gev fleiri smálutir um regluna
         text: Lýs eina reglu ella eitt krav fyri brúkarar á hesum ambætaranum. Ger tað stutt og einfalt
       sessions:
         otp: 'Skriva tvey-faktor koduna frá telefon-appini ella brúka eina av tínum endurgerðskodum:'
@@ -299,6 +300,7 @@ fo:
           patch: Gev fráboðan um feilrættingardagføringar
         trending_tag: Broytt rák skal kannast
       rule:
+        hint: Fleiri upplýsingar
         text: Regla
       settings:
         indexable: Lat vangasíðu vera tøka í leitimaskinum
diff --git a/config/locales/simple_form.fy.yml b/config/locales/simple_form.fy.yml
index 5dc5ab2c90ee7e..e2e40f04dd53a9 100644
--- a/config/locales/simple_form.fy.yml
+++ b/config/locales/simple_form.fy.yml
@@ -116,6 +116,7 @@ fy:
           sign_up_requires_approval: Nije registraasjes fereaskje jo goedkarring
         severity: Kies wat der barre moat mei oanfragen fan dit IP-adres
       rule:
+        hint: Opsjoneel. Jou mear details oer de rigel
         text: Omskriuw in rigel of eask foar brûkers op dizze server. Probearje it koart en simpel te hâlden
       sessions:
         otp: 'Fier de twa-stapstagongskoade fan jo mobile telefoan ôf yn of brûk ien fan jo werstelkoaden:'
@@ -299,6 +300,7 @@ fy:
           patch: Meldingen by bugfix-fernijingen
         trending_tag: Nije trend beoardieling fereasket
       rule:
+        hint: Oanfoljende ynformaasje
         text: Regel
       settings:
         indexable: Sykmasinen jo profylside fine litte
diff --git a/config/locales/simple_form.gd.yml b/config/locales/simple_form.gd.yml
index bd7e44455aca15..168e7168ed5eef 100644
--- a/config/locales/simple_form.gd.yml
+++ b/config/locales/simple_form.gd.yml
@@ -116,6 +116,7 @@ gd:
           sign_up_requires_approval: Bidh cleachdaichean air an ùr-chlàradh feumach air d’ aonta
         severity: Tagh na thachras le iarrtasan on IP seo
       rule:
+        hint: Roghainneil. Thoir seachad barrachd fiosrachaidh mun riaghailt
         text: Mìnich riaghailt no riatanas do chleachdaichean an fhrithealaiche seo. Feuch an cùm thu sìmplidh goirid e
       sessions:
         otp: 'Cuir a-steach an còd dà-cheumnach a ghin aplacaid an fhòn agad no cleachd fear dhe na còdan aisig agad:'
@@ -299,6 +300,7 @@ gd:
           patch: Thoir brathan dhomh do dh’ùrachaidhean càraidh
         trending_tag: Tha treand ùr ri lèirmheasadh
       rule:
+        hint: Barrachd fiosrachaidh
         text: Riaghailt
       settings:
         indexable: Gabh a-staigh duilleag na pròifil sna h-einnseanan-luirg
diff --git a/config/locales/simple_form.gl.yml b/config/locales/simple_form.gl.yml
index 719da8eefa8bb3..ffb12d31bcefce 100644
--- a/config/locales/simple_form.gl.yml
+++ b/config/locales/simple_form.gl.yml
@@ -116,6 +116,7 @@ gl:
           sign_up_requires_approval: Os novos rexistros requerirán a túa aprobación
         severity: Escolle que acontecerá coas peticións desde este IP
       rule:
+        hint: Optativo. Proporciona máis detalles acerca da regra
         text: Describe unha regra ou requerimento para as usuarias deste servidor. Intenta que sexa curta e simple
       sessions:
         otp: 'Escribe o código do segundo factor creado pola aplicación do teu móbil ou usa un dos códigos de recuperación:'
@@ -299,6 +300,7 @@ gl:
           patch: Notificar as actualizacións de arranxos
         trending_tag: Hai que revisar unha nova tendencia
       rule:
+        hint: Información adicional
         text: Regra
       settings:
         indexable: Incluír páxina de perfil nos motores de busca
diff --git a/config/locales/simple_form.he.yml b/config/locales/simple_form.he.yml
index 3d7512c5f5461d..4f2611666afb21 100644
--- a/config/locales/simple_form.he.yml
+++ b/config/locales/simple_form.he.yml
@@ -116,6 +116,7 @@ he:
           sign_up_requires_approval: הרשמות חדשות ידרשו את אישורך
         severity: נא לבחור מה יקרה לבקשות מכתובת IP זו
       rule:
+        hint: לא חובה. פירוט נוסף לגבי הכלל
         text: נא לתאר את הכלל או הדרישה למשתמשים משרת זה. על התיאור להיות קצר ובהיר
       sessions:
         otp: 'נא להקליד קוד אימות דו-שלבי ממכשירך או להשתמש באחד מקודי אחזור הגישה שלך:'
@@ -299,6 +300,7 @@ he:
           patch: קבלת הודעה על עדכוני תיקון שקצים
         trending_tag: נושאים חמים חדשים דורשים סקירה
       rule:
+        hint: מידע נוסף
         text: כלל
       settings:
         indexable: חשיפת דף המשתמש במנועי החיפוש
diff --git a/config/locales/simple_form.hu.yml b/config/locales/simple_form.hu.yml
index 573809c73a5904..8855494fdf7e53 100644
--- a/config/locales/simple_form.hu.yml
+++ b/config/locales/simple_form.hu.yml
@@ -116,6 +116,7 @@ hu:
           sign_up_requires_approval: Új regisztrációk csak a jóváhagyásoddal történhetnek majd meg
         severity: Válaszd ki, mi történjen a kérésekkel erről az IP-ről
       rule:
+        hint: Nem kötelező. Adj meg további részleteket a szabályról.
         text: Írd le, mi a szabály vagy elvárás ezen a kiszolgálón a felhasználók felé. Próbálj röviden, egyszerűen fogalmazni.
       sessions:
         otp: 'Add meg a telefonodon generált kétlépcsős azonosító kódodat vagy használd az egyik tartalék bejelentkező kódot:'
@@ -299,6 +300,7 @@ hu:
           patch: Értesítés hibajavítási frissítésekről
         trending_tag: Új trend felülvizsgálatra vár
       rule:
+        hint: További információk
         text: Szabály
       settings:
         indexable: A profiloldal szerepeltetése a keresőmotorokban
diff --git a/config/locales/simple_form.is.yml b/config/locales/simple_form.is.yml
index 0859e898971a0c..cae9bbed5fa7cc 100644
--- a/config/locales/simple_form.is.yml
+++ b/config/locales/simple_form.is.yml
@@ -116,6 +116,7 @@ is:
           sign_up_requires_approval: Nýskráningar munu þurfa samþykki þitt
         severity: Veldu hvað munir gerast við beiðnir frá þessu IP-vistfangi
       rule:
+        hint: Valkvætt. Gefðu nánari upplýsingar um regluna
         text: Lýstu reglum eða kröfum sem gerðar eru til notenda á þessum netþjóni. Reyndu að hafa þetta skýrt og skorinort
       sessions:
         otp: 'Settu inn tveggja-þátta kóðann sem farsímaforritið útbjó eða notaðu einn af endurheimtukóðunum þínum:'
@@ -299,6 +300,7 @@ is:
           patch: Láta vita við uppfærslur með lagfæringum
         trending_tag: Nýtt vinsælt efni krefst yfirferðar
       rule:
+        hint: Viðbótarupplýsingar
         text: Regla
       settings:
         indexable: Hafa notandasnið með í leitarvélum
diff --git a/config/locales/simple_form.it.yml b/config/locales/simple_form.it.yml
index 244cf7c44ad849..bf294a48c660b6 100644
--- a/config/locales/simple_form.it.yml
+++ b/config/locales/simple_form.it.yml
@@ -116,6 +116,7 @@ it:
           sign_up_requires_approval: Le nuove iscrizioni richiederanno la tua approvazione
         severity: Scegli cosa accadrà con le richieste da questo IP
       rule:
+        hint: Opzionale. Fornisce maggiori dettagli sulla regola
         text: Descrivi una regola o un requisito per gli utenti su questo server. Prova a mantenerla breve e semplice
       sessions:
         otp: 'Inserisci il codice a due fattori generato dall''app del tuo telefono o usa uno dei codici di recupero:'
@@ -299,6 +300,7 @@ it:
           patch: Notifica sulle correzioni di bug
         trending_tag: La nuova tendenza richiede un controllo
       rule:
+        hint: Informazioni aggiuntive
         text: Regola
       settings:
         indexable: Includi la pagina del profilo nei motori di ricerca
diff --git a/config/locales/simple_form.ko.yml b/config/locales/simple_form.ko.yml
index 1dee6f14317d76..d948a88ed16282 100644
--- a/config/locales/simple_form.ko.yml
+++ b/config/locales/simple_form.ko.yml
@@ -116,6 +116,7 @@ ko:
           sign_up_requires_approval: 새 가입이 승인을 필요로 하도록 합니다
         severity: 해당 IP로부터의 요청에 대해 무엇이 일어나게 할 지 고르세요
       rule:
+        hint: 옵션사항. 규칙에 대한 더 상세한 정보를 제공하세요
         text: 이 서버 사용자들이 지켜야 할 규칙과 요구사항을 설명해주세요. 짧고 간단하게 작성해주세요
       sessions:
         otp: '휴대전화에서 생성된 이중 인증 코드를 입력하거나, 복구 코드 중 하나를 사용하세요:'
@@ -299,6 +300,7 @@ ko:
           patch: 버그픽스 업데이트에 대해 알림
         trending_tag: 검토해야 할 새 유행
       rule:
+        hint: 추가 정보
         text: 규칙
       settings:
         indexable: 검색 엔진에 프로필 페이지 기재하기
diff --git a/config/locales/simple_form.lad.yml b/config/locales/simple_form.lad.yml
index f9ee9a4b9a1fa8..2de24c38ff6eb2 100644
--- a/config/locales/simple_form.lad.yml
+++ b/config/locales/simple_form.lad.yml
@@ -299,6 +299,7 @@ lad:
           patch: Avizame de aktualizasyones de yerros
         trending_tag: Un muevo trend nesesita revizyon
       rule:
+        hint: Enformasyon adisyonala
         text: Regla
       settings:
         indexable: Inkluye la pajina de profil en los bushkadores
diff --git a/config/locales/simple_form.lt.yml b/config/locales/simple_form.lt.yml
index 53b8d672deb133..5431ea1b100877 100644
--- a/config/locales/simple_form.lt.yml
+++ b/config/locales/simple_form.lt.yml
@@ -82,6 +82,8 @@ lt:
         thumbnail: Maždaug 2:1 dydžio vaizdas, rodomas šalia tavo serverio informacijos.
         timeline_preview: Atsijungę lankytojai galės naršyti naujausius viešus įrašus, esančius serveryje.
         trends: Trendai rodo, kurios įrašai, saitažodžiai ir naujienų istorijos tavo serveryje sulaukia didžiausio susidomėjimo.
+      rule:
+        hint: Pasirinktinai. Pateik daugiau informacijos apie taisyklę.
       sessions:
         otp: 'Įvesk telefono programėlėje sugeneruotą dviejų tapatybės kodą arba naudok vieną iš atkūrimo kodų:'
         webauthn: Jei tai USB raktas, būtinai jį įkišk ir, jei reikia, paspausk.
@@ -168,6 +170,7 @@ lt:
           label: Yra nauja Mastodon versija
           patch: Pranešti apie klaidų ištaisymo atnaujinimus
       rule:
+        hint: Papildoma informacija
         text: Taisyklė
       settings:
         show_application: Rodyti, iš kurios programėles išsiuntei įrašą
diff --git a/config/locales/simple_form.nl.yml b/config/locales/simple_form.nl.yml
index 3f4f339b93a206..df108a2fecc99d 100644
--- a/config/locales/simple_form.nl.yml
+++ b/config/locales/simple_form.nl.yml
@@ -116,6 +116,7 @@ nl:
           sign_up_requires_approval: Nieuwe registraties vereisen jouw goedkeuring
         severity: Kies wat er moet gebeuren met aanvragen van dit IP-adres
       rule:
+        hint: Optioneel. Verstrek meer details over de regel
         text: Omschrijf een regel of vereiste voor gebruikers op deze server. Probeer het kort en simpel te houden
       sessions:
         otp: 'Voer de tweestaps-toegangscode vanaf jouw mobiele telefoon in of gebruik een van jouw herstelcodes:'
@@ -299,6 +300,7 @@ nl:
           patch: Meldingen bij bugfix-updates
         trending_tag: Nieuwe trend vereist beoordeling
       rule:
+        hint: Aanvullende informatie
         text: Regel
       settings:
         indexable: Zoekmachines jouw profielpagina laten vinden
diff --git a/config/locales/simple_form.nn.yml b/config/locales/simple_form.nn.yml
index 98cc372be77d29..72525619c7d9cd 100644
--- a/config/locales/simple_form.nn.yml
+++ b/config/locales/simple_form.nn.yml
@@ -116,6 +116,7 @@ nn:
           sign_up_requires_approval: Du må godkjenna nye registreringar
         severity: Vel kva som skal skje ved førespurnader frå denne IP
       rule:
+        hint: Valfritt. Gje meir informasjon om regelen
         text: Forklar ein regel eller eit krav for brukarar på denne tenaren. Prøv å skriva kort og lettfattleg
       sessions:
         otp: Angi tofaktorkoden fra din telefon eller bruk en av dine gjenopprettingskoder.
@@ -299,6 +300,7 @@ nn:
           patch: Varsle om feilrettingsoppdateringar
         trending_tag: Ny trend krev gjennomgang
       rule:
+        hint: Meir informasjon
         text: Regler
       settings:
         indexable: Ta med profilsida i søkjemotorar
diff --git a/config/locales/simple_form.pl.yml b/config/locales/simple_form.pl.yml
index 4a8208202fa691..3a1c619f70652d 100644
--- a/config/locales/simple_form.pl.yml
+++ b/config/locales/simple_form.pl.yml
@@ -116,6 +116,7 @@ pl:
           sign_up_requires_approval: Nowe rejestracje będą wymagać twojej zgody
         severity: Wybierz co ma się stać z żadaniami z tego adresu IP
       rule:
+        hint: Opcjonalne. Dodaj więcej szczegółów dot. tej zasady
         text: Opisz wymóg lub regułę dla użytkowników na tym serwerze. Postaraj się, aby była krótka i prosta
       sessions:
         otp: 'Wprowadź kod weryfikacji dwuetapowej z telefonu lub wykorzystaj jeden z kodów zapasowych:'
@@ -299,6 +300,7 @@ pl:
           patch: Powiadamiaj o aktualizacjach naprawiających błędy
         trending_tag: Nowe popularne wymagają przeglądu
       rule:
+        hint: Informacje dodatkowe
         text: Zasada
       settings:
         indexable: Udostępniaj profil wyszukiwarkom
diff --git a/config/locales/simple_form.pt-PT.yml b/config/locales/simple_form.pt-PT.yml
index 9c54e72140fa79..a84f97f88d7e6d 100644
--- a/config/locales/simple_form.pt-PT.yml
+++ b/config/locales/simple_form.pt-PT.yml
@@ -116,6 +116,7 @@ pt-PT:
           sign_up_requires_approval: Novas inscrições requererão a sua aprovação
         severity: Escolha o que acontecerá com as solicitações deste IP
       rule:
+        hint: Opcional. Forneça mais detalhes sobre a regra
         text: Descreva uma regra ou requisito para os utilizadores nesta instância. Tente mantê-la curta e simples
       sessions:
         otp: 'Insira o código de autenticação em duas etapas gerado pelo seu telemóvel ou use um dos seus códigos de recuperação:'
@@ -299,6 +300,7 @@ pt-PT:
           patch: Notificar sobre atualizações de correções de problemas
         trending_tag: Uma nova publicação em alta requer avaliação
       rule:
+        hint: Informação Adicional
         text: Regra
       settings:
         indexable: Incluir página de perfil nos motores de busca
diff --git a/config/locales/simple_form.sl.yml b/config/locales/simple_form.sl.yml
index 1e56894384e98a..cbf0570187117f 100644
--- a/config/locales/simple_form.sl.yml
+++ b/config/locales/simple_form.sl.yml
@@ -116,6 +116,7 @@ sl:
           sign_up_requires_approval: Za nove registracije bo potrebna vaša odobritev
         severity: Izberite, kaj se bo zgodilo z zahtevami iz tega IP-naslova
       rule:
+        hint: Neobvezno. Vnesite dodatne podrobnosti o pravilu
         text: Opišite pravilo ali zahtevo za uporabnike na tem strežniku. Poskusite biti kratki in jasni
       sessions:
         otp: 'Vnesite dvomestno kodo, ki je ustvarjena z aplikacijo na telefonu, ali uporabite eno od vaših obnovitvenih kod:'
@@ -299,6 +300,7 @@ sl:
           patch: Obveščaj o posodobitvah z odpravljenimi hrošči
         trending_tag: Nov trend zahteva pregled
       rule:
+        hint: Dodatne informacije
         text: Pravilo
       settings:
         indexable: V iskalnike vključi stran profila
diff --git a/config/locales/simple_form.sq.yml b/config/locales/simple_form.sq.yml
index b8404766f3b71d..41ee3d9bd5bcdf 100644
--- a/config/locales/simple_form.sq.yml
+++ b/config/locales/simple_form.sq.yml
@@ -116,6 +116,7 @@ sq:
           sign_up_requires_approval: Regjistrime të reja do të duan miratimin tuaj
         severity: Zgjidhni ç’do të ndodhë me kërkesa nga kjo IP
       rule:
+        hint: Opsionale. Jepni më tepër hollësi rreth këtij rregulli
         text: Përshkruani një rregull ose një domosdoshmëri për përdoruesit në këtë shërbyes. Përpiquni të jetë i shkurtër dhe i thjeshtë
       sessions:
         otp: 'Jepni kodin dyfaktorësh të prodhuar nga aplikacioni i telefonit tuaj ose përdorni një nga kodet tuaj të rikthimeve:'
@@ -299,6 +300,7 @@ sq:
           patch: Njofto për ndreqje të metash
         trending_tag: Për gjëra të reja në modë lypset shqyrtim
       rule:
+        hint: Informacion shtesë
         text: Rregull
       settings:
         indexable: Përfshi faqe profili në motorë kërkimesh
diff --git a/config/locales/simple_form.sr-Latn.yml b/config/locales/simple_form.sr-Latn.yml
index 3214a722dfc1ad..6ed095e2a27b9a 100644
--- a/config/locales/simple_form.sr-Latn.yml
+++ b/config/locales/simple_form.sr-Latn.yml
@@ -299,6 +299,7 @@ sr-Latn:
           patch: Obavesti o ispravkama grešaka
         trending_tag: Novi trend treba pregledati
       rule:
+        hint: Dodatne informacije
         text: Pravilo
       settings:
         indexable: Uključi stranicu profila u pretraživače
diff --git a/config/locales/simple_form.sr.yml b/config/locales/simple_form.sr.yml
index 9631efc0531e1b..4fb32000b7684b 100644
--- a/config/locales/simple_form.sr.yml
+++ b/config/locales/simple_form.sr.yml
@@ -299,6 +299,7 @@ sr:
           patch: Обавести о исправкама грешака
         trending_tag: Нови тренд треба прегледати
       rule:
+        hint: Додатне информације
         text: Правило
       settings:
         indexable: Укључи страницу профила у претраживаче
diff --git a/config/locales/simple_form.sv.yml b/config/locales/simple_form.sv.yml
index 02806e711fc7d3..c3b8625c8eed2c 100644
--- a/config/locales/simple_form.sv.yml
+++ b/config/locales/simple_form.sv.yml
@@ -299,6 +299,7 @@ sv:
           patch: Meddela vid buggfix-uppdateringar
         trending_tag: En ny trend kräver granskning
       rule:
+        hint: Ytterligare information
         text: Regel
       settings:
         indexable: Inkludera profilsidan i sökmotorer
diff --git a/config/locales/simple_form.th.yml b/config/locales/simple_form.th.yml
index 259bb000991291..b41cf0bea68fcb 100644
--- a/config/locales/simple_form.th.yml
+++ b/config/locales/simple_form.th.yml
@@ -116,6 +116,7 @@ th:
           sign_up_requires_approval: การลงทะเบียนใหม่จะต้องการการอนุมัติของคุณ
         severity: เลือกสิ่งที่จะเกิดขึ้นกับคำขอจาก IP นี้
       rule:
+        hint: ไม่จำเป็น ให้รายละเอียดเพิ่มเติมเกี่ยวกับกฎ
         text: อธิบายกฎหรือข้อกำหนดสำหรับผู้ใช้ในเซิร์ฟเวอร์นี้ พยายามทำให้กฎหรือข้อกำหนดสั้นและเรียบง่าย
       sessions:
         otp: 'ป้อนรหัสสองปัจจัยที่สร้างโดยแอปในโทรศัพท์ของคุณหรือใช้หนึ่งในรหัสกู้คืนของคุณ:'
@@ -299,6 +300,7 @@ th:
           patch: แจ้งเตือนการอัปเดตการแก้ไขข้อบกพร่อง
         trending_tag: แนวโน้มใหม่ต้องการการตรวจทาน
       rule:
+        hint: ข้อมูลเพิ่มเติม
         text: กฎ
       settings:
         indexable: รวมหน้าโปรไฟล์ในเครื่องมือค้นหา
diff --git a/config/locales/simple_form.uk.yml b/config/locales/simple_form.uk.yml
index a85684a0f9eec3..db8e4b4d27713e 100644
--- a/config/locales/simple_form.uk.yml
+++ b/config/locales/simple_form.uk.yml
@@ -119,6 +119,7 @@ uk:
           sign_up_requires_approval: Нові реєстрації потребуватимуть затвердження вами
         severity: Виберіть, що буде відбуватися з запитами з цієї IP
       rule:
+        hint: Необов'язково. Докладніше про правило
         text: Опис правила або вимоги для користувачів на цьому сервері. Спробуйте зробити його коротким і простим
       sessions:
         otp: 'Введіть код двофакторної автентифікації, згенерований вашим мобільним застосунком, або скористайтеся одним з ваших кодів відновлення:'
@@ -302,6 +303,7 @@ uk:
           patch: Сповіщати про оновлення з виправленнями
         trending_tag: Нове популярне вимагає розгляду
       rule:
+        hint: Додаткова інформація
         text: Правило
       settings:
         indexable: Включити сторінку профілю в пошукові системи
diff --git a/config/locales/simple_form.vi.yml b/config/locales/simple_form.vi.yml
index ae0a5ea560cb5f..f4d9f526b6988a 100644
--- a/config/locales/simple_form.vi.yml
+++ b/config/locales/simple_form.vi.yml
@@ -116,6 +116,7 @@ vi:
           sign_up_requires_approval: Bạn sẽ phê duyệt những đăng ký mới từ IP này
         severity: Chọn hành động nếu nhận được yêu cầu từ IP này
       rule:
+        hint: Tùy chọn. Cung cấp chi tiết hơn về nội quy
         text: Mô tả một nội quy bắt buộc trên máy chủ này. Nên để ngắn và đơn giản
       sessions:
         otp: 'Nhập mã xác minh 2 bước được tạo bởi ứng dụng điện thoại của bạn hoặc dùng một trong các mã khôi phục của bạn:'
@@ -299,6 +300,7 @@ vi:
           patch: Thông báo bản cập sửa lỗi
         trending_tag: Phê duyệt nội dung nổi bật mới
       rule:
+        hint: Thông tin thêm
         text: Nội quy
       settings:
         indexable: Cho phép hiện hồ sơ trong công cụ tìm kiếm
diff --git a/config/locales/simple_form.zh-CN.yml b/config/locales/simple_form.zh-CN.yml
index d0ca529a4df376..7f2eee023cfddc 100644
--- a/config/locales/simple_form.zh-CN.yml
+++ b/config/locales/simple_form.zh-CN.yml
@@ -116,6 +116,7 @@ zh-CN:
           sign_up_requires_approval: 新注册需要你的批准
         severity: 选择如何处理来自此 IP 的请求。
       rule:
+        hint: 选填。提供关于这条规则的更多详情
         text: 描述这个服务器上的用户规则或要求。尽量确保简洁、清晰易懂
       sessions:
         otp: 输入你手机应用上生成的双因素认证代码，或者任意一个恢复代码：
@@ -299,6 +300,7 @@ zh-CN:
           patch: 通知错误修复更新
         trending_tag: 新热门待审核
       rule:
+        hint: 补充信息
         text: 规则
       settings:
         indexable: 允许搜索引擎索引个人资料页面
diff --git a/config/locales/simple_form.zh-TW.yml b/config/locales/simple_form.zh-TW.yml
index fe938712e3e9b0..69a2794e6c406f 100644
--- a/config/locales/simple_form.zh-TW.yml
+++ b/config/locales/simple_form.zh-TW.yml
@@ -8,7 +8,7 @@ zh-TW:
         fields: 烘培雞、自我認同代稱、年齡，及任何您想分享的。
         indexable: 您的公開嘟文可能會顯示於 Mastodon 之搜尋結果中。曾與您嘟文互動過的人可能無論如何都能搜尋它們。
         note: '您可以 @mention 其他人或者使用 #主題標籤。'
-        show_collections: 人們將能瀏覽您跟隨中及跟隨者帳號。您所跟隨之人能得知您正在跟隨其帳號。
+        show_collections: 人們將能瀏覽您跟隨中及跟隨者帳號。您所跟隨之使用者能得知您正在跟隨其帳號。
         unlocked: 人們將無需額外請求您的同意便能跟隨您的帳號。取消勾選以審查跟隨請求並選擇是否同意或拒絕新跟隨者。
       account_alias:
         acct: 指定要移動的帳號之「使用者名稱@網域名稱」
@@ -16,7 +16,7 @@ zh-TW:
         acct: 指定欲移動至帳號之「使用者名稱@網域名稱」
       account_warning_preset:
         text: 您可使用嘟文語法，例如網址、「#」標籤與提及功能
-        title: 可選。不會向收件者顯示
+        title: 可選的。不會向收件者顯示
       admin_account_action:
         include_statuses: 使用者可看到導致檢舉或警告的嘟文
         send_email_notification: 使用者將收到帳號發生之事情的解釋
@@ -116,6 +116,7 @@ zh-TW:
           sign_up_requires_approval: 新註冊申請需要先經過您的審核
         severity: 請選擇將如何處理來自這個 IP 位址的請求
       rule:
+        hint: 可選的。提供關於此規則更多細節
         text: 說明使用者於此伺服器上需遵守的規則或條款。試著維持各項條款簡短而明瞭。
       sessions:
         otp: 請輸入產生自您手機 App 的兩階段驗證碼，或輸入其中一個備用驗證碼：
@@ -299,6 +300,7 @@ zh-TW:
           patch: 通知錯誤修正更新
         trending_tag: 新熱門趨勢需要審核
       rule:
+        hint: 其他資訊
         text: 規則
       settings:
         indexable: 於搜尋引擎中包含個人檔案頁面
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index d8952edec91f66..2eecfa7b465045 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -397,7 +397,7 @@ zh-TW:
         create: 新增封鎖
         hint: 站點封鎖動作並不會阻止帳號紀錄被新增至資料庫，但會自動回溯性地對那些帳號套用特定管理設定。
         severity:
-          desc_html: "「<strong>靜音</strong>」令該站點下使用者的嘟文，設定為只對跟隨者顯示，沒有跟隨的人會看不到。「<strong>停權</strong>」會刪除將該站點下使用者的嘟文、媒體檔案與個人檔案。「<strong>無</strong>」則會拒絕接收來自該站點的媒體檔案。"
+          desc_html: "「<strong>靜音</strong>」令該站點下使用者的嘟文，設定為只對跟隨者顯示，沒有跟隨之使用者會看不到。「<strong>停權</strong>」會刪除將該站點下使用者的嘟文、媒體檔案與個人檔案。「<strong>無</strong>」則會拒絕接收來自該站點的媒體檔案。"
           noop: 無
           silence: 靜音
           suspend: 停權

From 0ba9f58e171035e531e86e829975e55955390ae2 Mon Sep 17 00:00:00 2001
From: cuithon <65674308+cuithon@users.noreply.github.com>
Date: Tue, 12 Mar 2024 17:40:29 +0800
Subject: [PATCH 0403/2191] chore: fix some typos (#29555)

Signed-off-by: cuithon <dscs@outlook.com>
---
 Dockerfile | 2 +-
 Gemfile    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index facd9b8aa0c77d..8778133e0d17cb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -20,7 +20,7 @@ FROM docker.io/ruby:${RUBY_VERSION}-slim-${DEBIAN_VERSION} as ruby
 
 # Resulting version string is vX.X.X-MASTODON_VERSION_PRERELEASE+MASTODON_VERSION_METADATA
 # Example: v4.2.0-nightly.2023.11.09+something
-# Overwrite existance of 'alpha.0' in version.rb [--build-arg MASTODON_VERSION_PRERELEASE="nightly.2023.11.09"]
+# Overwrite existence of 'alpha.0' in version.rb [--build-arg MASTODON_VERSION_PRERELEASE="nightly.2023.11.09"]
 ARG MASTODON_VERSION_PRERELEASE=""
 # Append build metadata or fork information to version.rb [--build-arg MASTODON_VERSION_METADATA="something"]
 ARG MASTODON_VERSION_METADATA=""
diff --git a/Gemfile b/Gemfile
index 355e69b0c467b3..d3bfeb44870733 100644
--- a/Gemfile
+++ b/Gemfile
@@ -112,7 +112,7 @@ group :test do
   # RSpec helpers for email specs
   gem 'email_spec'
 
-  # Extra RSpec extenion methods and helpers for sidekiq
+  # Extra RSpec extension methods and helpers for sidekiq
   gem 'rspec-sidekiq', '~> 4.0'
 
   # Browser integration testing

From af4e44e30a6a2701102a7d573e47e9db42025821 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Tue, 12 Mar 2024 10:42:51 +0100
Subject: [PATCH 0404/2191] Fix i18n typo (#29557)

---
 .../notifications/components/filtered_notifications_banner.jsx  | 2 +-
 app/javascript/mastodon/locales/en.json                         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/javascript/mastodon/features/notifications/components/filtered_notifications_banner.jsx b/app/javascript/mastodon/features/notifications/components/filtered_notifications_banner.jsx
index dddb9d64120851..bf9467bd634c8a 100644
--- a/app/javascript/mastodon/features/notifications/components/filtered_notifications_banner.jsx
+++ b/app/javascript/mastodon/features/notifications/components/filtered_notifications_banner.jsx
@@ -38,7 +38,7 @@ export const FilteredNotificationsBanner = () => {
 
       <div className='filtered-notifications-banner__text'>
         <strong><FormattedMessage id='filtered_notifications_banner.title' defaultMessage='Filtered notifications' /></strong>
-        <span><FormattedMessage id='filtered_notifications_banner.pending_requests' defaultMessage='Notifications from {count, plural, =0 {no} one {one person} other {# people}} you may know' values={{ count: policy.getIn(['summary', 'pending_requests_count']) }} /></span>
+        <span><FormattedMessage id='filtered_notifications_banner.pending_requests' defaultMessage='Notifications from {count, plural, =0 {no one} one {one person} other {# people}} you may know' values={{ count: policy.getIn(['summary', 'pending_requests_count']) }} /></span>
       </div>
 
       <div className='filtered-notifications-banner__badge'>
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index aed3a3a6006979..2f202bfe155e66 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -272,7 +272,7 @@
   "filter_modal.select_filter.subtitle": "Use an existing category or create a new one",
   "filter_modal.select_filter.title": "Filter this post",
   "filter_modal.title.status": "Filter a post",
-  "filtered_notifications_banner.pending_requests": "Notifications from {count, plural, =0 {no} one {one person} other {# people}} you may know",
+  "filtered_notifications_banner.pending_requests": "Notifications from {count, plural, =0 {no one} one {one person} other {# people}} you may know",
   "filtered_notifications_banner.title": "Filtered notifications",
   "firehose.all": "All",
   "firehose.local": "This server",

From 5b60d4b696cd5fd58ca77eca3365c2a0761c0f57 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Tue, 12 Mar 2024 10:51:30 +0100
Subject: [PATCH 0405/2191] Change background color in web UI (#29522)

---
 .../mastodon/features/about/index.jsx         |  24 +-
 .../styles/mastodon-light/diff.scss           |  88 ------
 .../styles/mastodon-light/variables.scss      |   4 +
 app/javascript/styles/mastodon/about.scss     |   2 +-
 app/javascript/styles/mastodon/admin.scss     |   2 +-
 app/javascript/styles/mastodon/basics.scss    |   2 +-
 .../styles/mastodon/components.scss           | 250 +++++++++---------
 app/javascript/styles/mastodon/variables.scss |   8 +-
 8 files changed, 147 insertions(+), 233 deletions(-)

diff --git a/app/javascript/mastodon/features/about/index.jsx b/app/javascript/mastodon/features/about/index.jsx
index 5197d338cd6fc9..65a36520d6c022 100644
--- a/app/javascript/mastodon/features/about/index.jsx
+++ b/app/javascript/mastodon/features/about/index.jsx
@@ -189,18 +189,20 @@ class About extends PureComponent {
               <>
                 <p><FormattedMessage id='about.domain_blocks.preamble' defaultMessage='Mastodon generally allows you to view content from and interact with users from any other server in the fediverse. These are the exceptions that have been made on this particular server.' /></p>
 
-                <div className='about__domain-blocks'>
-                  {domainBlocks.get('items').map(block => (
-                    <div className='about__domain-blocks__domain' key={block.get('domain')}>
-                      <div className='about__domain-blocks__domain__header'>
-                        <h6><span title={`SHA-256: ${block.get('digest')}`}>{block.get('domain')}</span></h6>
-                        <span className='about__domain-blocks__domain__type' title={intl.formatMessage(severityMessages[block.get('severity')].explanation)}>{intl.formatMessage(severityMessages[block.get('severity')].title)}</span>
+                {domainBlocks.get('items').size > 0 && (
+                  <div className='about__domain-blocks'>
+                    {domainBlocks.get('items').map(block => (
+                      <div className='about__domain-blocks__domain' key={block.get('domain')}>
+                        <div className='about__domain-blocks__domain__header'>
+                          <h6><span title={`SHA-256: ${block.get('digest')}`}>{block.get('domain')}</span></h6>
+                          <span className='about__domain-blocks__domain__type' title={intl.formatMessage(severityMessages[block.get('severity')].explanation)}>{intl.formatMessage(severityMessages[block.get('severity')].title)}</span>
+                        </div>
+
+                        <p>{(block.get('comment') || '').length > 0 ? block.get('comment') : <FormattedMessage id='about.domain_blocks.no_reason_available' defaultMessage='Reason not available' />}</p>
                       </div>
-
-                      <p>{(block.get('comment') || '').length > 0 ? block.get('comment') : <FormattedMessage id='about.domain_blocks.no_reason_available' defaultMessage='Reason not available' />}</p>
-                    </div>
-                  ))}
-                </div>
+                    ))}
+                  </div>
+                )}
               </>
             ) : (
               <p><FormattedMessage id='about.not_available' defaultMessage='This information has not been made available on this server.' /></p>
diff --git a/app/javascript/styles/mastodon-light/diff.scss b/app/javascript/styles/mastodon-light/diff.scss
index e3872283e14033..675a01dd3617f8 100644
--- a/app/javascript/styles/mastodon-light/diff.scss
+++ b/app/javascript/styles/mastodon-light/diff.scss
@@ -21,25 +21,6 @@ html {
 }
 
 // Change default background colors of columns
-.column > .scrollable,
-.getting-started,
-.column-inline-form,
-.regeneration-indicator {
-  background: $white;
-  border: 1px solid lighten($ui-base-color, 8%);
-  border-top: 0;
-}
-
-.error-column {
-  border: 1px solid lighten($ui-base-color, 8%);
-}
-
-.column > .scrollable.about {
-  border-top: 1px solid lighten($ui-base-color, 8%);
-}
-
-.about__meta,
-.about__section__title,
 .interaction-modal {
   background: $white;
   border: 1px solid lighten($ui-base-color, 8%);
@@ -53,37 +34,10 @@ html {
   background: lighten($ui-base-color, 12%);
 }
 
-.filter-form {
-  background: $white;
-  border-bottom: 1px solid lighten($ui-base-color, 8%);
-}
-
-.column-back-button,
-.column-header {
-  background: $white;
-  border: 1px solid lighten($ui-base-color, 8%);
-
-  @media screen and (max-width: $no-gap-breakpoint) {
-    border-top: 0;
-  }
-
-  &--slim-button {
-    top: -50px;
-    right: 0;
-  }
-}
-
-.column-header__back-button,
-.column-header__button,
-.column-header__button.active,
 .account__header {
   background: $white;
 }
 
-.column-header {
-  border-bottom: 0;
-}
-
 .column-header__button.active {
   color: $ui-highlight-color;
 
@@ -91,7 +45,6 @@ html {
   &:active,
   &:focus {
     color: $ui-highlight-color;
-    background: $white;
   }
 }
 
@@ -117,25 +70,6 @@ html {
   }
 }
 
-.column-subheading {
-  background: darken($ui-base-color, 4%);
-  border-bottom: 1px solid lighten($ui-base-color, 8%);
-}
-
-.getting-started,
-.scrollable {
-  .column-link {
-    background: $white;
-    border-bottom: 1px solid lighten($ui-base-color, 8%);
-
-    &:hover,
-    &:active,
-    &:focus {
-      background: $ui-base-color;
-    }
-  }
-}
-
 .getting-started .navigation-bar {
   border-top: 1px solid lighten($ui-base-color, 8%);
   border-bottom: 1px solid lighten($ui-base-color, 8%);
@@ -168,23 +102,6 @@ html {
   border-bottom: 0;
 }
 
-.notification__filter-bar {
-  border: 1px solid lighten($ui-base-color, 8%);
-  border-top: 0;
-}
-
-.drawer__header,
-.drawer__inner {
-  background: $white;
-  border: 1px solid lighten($ui-base-color, 8%);
-}
-
-.drawer__inner__mastodon {
-  background: $white
-    url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 234.80078 31.757813" width="234.80078" height="31.757812"><path d="M19.599609 0c-1.05 0-2.10039.375-2.90039 1.125L0 16.925781v14.832031h234.80078V17.025391l-16.5-15.900391c-1.6-1.5-4.20078-1.5-5.80078 0l-13.80078 13.099609c-1.6 1.5-4.19883 1.5-5.79883 0L179.09961 1.125c-1.6-1.5-4.19883-1.5-5.79883 0L159.5 14.224609c-1.6 1.5-4.20078 1.5-5.80078 0L139.90039 1.125c-1.6-1.5-4.20078-1.5-5.80078 0l-13.79883 13.099609c-1.6 1.5-4.20078 1.5-5.80078 0L100.69922 1.125c-1.600001-1.5-4.198829-1.5-5.798829 0l-13.59961 13.099609c-1.6 1.5-4.200781 1.5-5.800781 0L61.699219 1.125c-1.6-1.5-4.198828-1.5-5.798828 0L42.099609 14.224609c-1.6 1.5-4.198828 1.5-5.798828 0L22.5 1.125C21.7.375 20.649609 0 19.599609 0z" fill="#{hex-color($ui-base-color)}"/></svg>')
-    no-repeat bottom / 100% auto;
-}
-
 .upload-progress__backdrop {
   background: $ui-base-color;
 }
@@ -194,11 +111,6 @@ html {
   background: lighten($white, 4%);
 }
 
-.detailed-status,
-.detailed-status__action-bar {
-  background: $white;
-}
-
 // Change the background colors of status__content__spoiler-link
 .reply-indicator__content .status__content__spoiler-link,
 .status__content .status__content__spoiler-link {
diff --git a/app/javascript/styles/mastodon-light/variables.scss b/app/javascript/styles/mastodon-light/variables.scss
index 3cf5561ca3b962..09a75a834b17db 100644
--- a/app/javascript/styles/mastodon-light/variables.scss
+++ b/app/javascript/styles/mastodon-light/variables.scss
@@ -59,4 +59,8 @@ $emojis-requiring-inversion: 'chains';
 .theme-mastodon-light {
   --dropdown-border-color: #d9e1e8;
   --dropdown-background-color: #fff;
+  --background-border-color: #d9e1e8;
+  --background-color: #fff;
+  --background-color-tint: rgba(255, 255, 255, 90%);
+  --background-filter: blur(10px);
 }
diff --git a/app/javascript/styles/mastodon/about.scss b/app/javascript/styles/mastodon/about.scss
index 9d23ef41abdb47..48fe9449f0d477 100644
--- a/app/javascript/styles/mastodon/about.scss
+++ b/app/javascript/styles/mastodon/about.scss
@@ -26,7 +26,7 @@ $fluid-breakpoint: $maximum-width + 20px;
 
   li {
     position: relative;
-    border-bottom: 1px solid lighten($ui-base-color, 8%);
+    border-bottom: 1px solid var(--background-border-color);
     padding: 1em 1.75em;
     padding-inline-start: 3em;
     font-weight: 500;
diff --git a/app/javascript/styles/mastodon/admin.scss b/app/javascript/styles/mastodon/admin.scss
index ef9c2fd88966ba..60e3cc19dde09a 100644
--- a/app/javascript/styles/mastodon/admin.scss
+++ b/app/javascript/styles/mastodon/admin.scss
@@ -1378,8 +1378,8 @@ a.sparkline {
 }
 
 .account-card {
-  background: $ui-base-color;
   border-radius: 4px;
+  border: 1px solid lighten($ui-base-color, 8%);
 
   &__permalink {
     color: inherit;
diff --git a/app/javascript/styles/mastodon/basics.scss b/app/javascript/styles/mastodon/basics.scss
index 28dad81da5414b..2e7d5e5e9c5287 100644
--- a/app/javascript/styles/mastodon/basics.scss
+++ b/app/javascript/styles/mastodon/basics.scss
@@ -8,7 +8,7 @@
 
 body {
   font-family: $font-sans-serif, sans-serif;
-  background: darken($ui-base-color, 8%);
+  background: var(--background-color);
   font-size: 13px;
   line-height: 18px;
   font-weight: 400;
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index faa775ec4b583f..047d9d9739d7af 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -1311,7 +1311,7 @@ body > [data-popper-placement] {
   box-sizing: border-box;
   width: 100%;
   clear: both;
-  border-bottom: 1px solid lighten($ui-base-color, 8%);
+  border-bottom: 1px solid var(--background-border-color);
 
   &__button {
     display: inline;
@@ -1332,19 +1332,14 @@ body > [data-popper-placement] {
 .focusable {
   &:focus {
     outline: 0;
-    background: lighten($ui-base-color, 4%);
-
-    .detailed-status,
-    .detailed-status__action-bar {
-      background: lighten($ui-base-color, 8%);
-    }
+    background: rgba($ui-highlight-color, 0.05);
   }
 }
 
 .status {
   padding: 16px;
   min-height: 54px;
-  border-bottom: 1px solid lighten($ui-base-color, 8%);
+  border-bottom: 1px solid var(--background-border-color);
   cursor: auto;
 
   @keyframes fade {
@@ -1588,10 +1583,10 @@ body > [data-popper-placement] {
 }
 
 .status__wrapper-direct {
-  background: mix($ui-base-color, $ui-highlight-color, 95%);
+  background: rgba($ui-highlight-color, 0.05);
 
   &:focus {
-    background: mix(lighten($ui-base-color, 4%), $ui-highlight-color, 95%);
+    background: rgba($ui-highlight-color, 0.05);
   }
 
   .status__prepend {
@@ -1616,9 +1611,8 @@ body > [data-popper-placement] {
 }
 
 .detailed-status {
-  background: lighten($ui-base-color, 4%);
   padding: 16px;
-  border-top: 1px solid lighten($ui-base-color, 8%);
+  border-top: 1px solid var(--background-border-color);
 
   &--flex {
     display: flex;
@@ -1678,9 +1672,8 @@ body > [data-popper-placement] {
 }
 
 .detailed-status__action-bar {
-  background: lighten($ui-base-color, 4%);
-  border-top: 1px solid lighten($ui-base-color, 8%);
-  border-bottom: 1px solid lighten($ui-base-color, 8%);
+  border-top: 1px solid var(--background-border-color);
+  border-bottom: 1px solid var(--background-border-color);
   display: flex;
   flex-direction: row;
   padding: 10px 0;
@@ -1735,7 +1728,7 @@ body > [data-popper-placement] {
 
 .domain {
   padding: 10px;
-  border-bottom: 1px solid lighten($ui-base-color, 8%);
+  border-bottom: 1px solid var(--background-border-color);
 
   .domain__domain-name {
     flex: 1 1 auto;
@@ -1759,7 +1752,7 @@ body > [data-popper-placement] {
 
 .account {
   padding: 16px;
-  border-bottom: 1px solid lighten($ui-base-color, 8%);
+  border-bottom: 1px solid var(--background-border-color);
 
   .account__display-name {
     flex: 1 1 auto;
@@ -2017,7 +2010,7 @@ a.account__display-name {
 
 .notification__report {
   padding: 16px;
-  border-bottom: 1px solid lighten($ui-base-color, 8%);
+  border-bottom: 1px solid var(--background-border-color);
   display: flex;
   gap: 10px;
 
@@ -2276,6 +2269,7 @@ a.account__display-name {
 
 .dropdown-menu {
   background: var(--dropdown-background-color);
+  backdrop-filter: var(--background-filter);
   border: 1px solid var(--dropdown-border-color);
   padding: 4px;
   border-radius: 4px;
@@ -2466,6 +2460,7 @@ $ui-header-height: 55px;
   z-index: 3;
   justify-content: space-between;
   align-items: center;
+  backdrop-filter: var(--background-filter);
 
   &__logo {
     display: inline-flex;
@@ -2514,7 +2509,8 @@ $ui-header-height: 55px;
 }
 
 .tabs-bar__wrapper {
-  background: darken($ui-base-color, 8%);
+  background: var(--background-color-tint);
+  backdrop-filter: var(--background-filter);
   position: sticky;
   top: $ui-header-height;
   z-index: 2;
@@ -2550,8 +2546,15 @@ $ui-header-height: 55px;
   flex-direction: column;
 
   > .scrollable {
-    background: $ui-base-color;
+    border: 1px solid var(--background-border-color);
+    border-top: 0;
     border-radius: 0 0 4px 4px;
+
+    &.about,
+    &.privacy-policy {
+      border-top: 1px solid var(--background-border-color);
+      border-radius: 4px;
+    }
   }
 }
 
@@ -2581,7 +2584,6 @@ $ui-header-height: 55px;
   font-size: 16px;
   align-items: center;
   justify-content: center;
-  border-bottom: 2px solid transparent;
 }
 
 .column,
@@ -2710,8 +2712,7 @@ $ui-header-height: 55px;
 
     .navigation-panel {
       margin: 0;
-      background: $ui-base-color;
-      border-inline-start: 1px solid lighten($ui-base-color, 8%);
+      border-inline-start: 1px solid var(--background-border-color);
       height: 100vh;
     }
 
@@ -2729,8 +2730,15 @@ $ui-header-height: 55px;
 
   .layout-single-column .ui__header {
     display: flex;
-    background: $ui-base-color;
-    border-bottom: 1px solid lighten($ui-base-color, 8%);
+    background: var(--background-color-tint);
+    border-bottom: 1px solid var(--background-border-color);
+  }
+
+  .column > .scrollable,
+  .tabs-bar__wrapper .column-header,
+  .tabs-bar__wrapper .column-back-button {
+    border-left: 0;
+    border-right: 0;
   }
 
   .column-header,
@@ -2788,7 +2796,7 @@ $ui-header-height: 55px;
     inset-inline-start: 9px;
     top: -13px;
     background: $ui-highlight-color;
-    border: 2px solid lighten($ui-base-color, 8%);
+    border: 2px solid var(--background-color);
     padding: 1px 6px;
     border-radius: 6px;
     font-size: 10px;
@@ -2810,7 +2818,7 @@ $ui-header-height: 55px;
 }
 
 .column-link--transparent .icon-with-badge__badge {
-  border-color: darken($ui-base-color, 8%);
+  border-color: var(--background-color);
 }
 
 .column-title {
@@ -3160,7 +3168,7 @@ $ui-header-height: 55px;
     flex: 0 0 auto;
     border: 0;
     background: transparent;
-    border-top: 1px solid lighten($ui-base-color, 4%);
+    border-top: 1px solid var(--background-border-color);
     margin: 10px 0;
   }
 
@@ -3177,13 +3185,14 @@ $ui-header-height: 55px;
   overflow: hidden;
   display: flex;
   border-radius: 4px;
+  border: 1px solid var(--background-border-color);
 }
 
 .drawer__inner {
   position: absolute;
   top: 0;
   inset-inline-start: 0;
-  background: darken($ui-base-color, 4%);
+  background: var(--background-color);
   box-sizing: border-box;
   padding: 0;
   display: flex;
@@ -3192,15 +3201,11 @@ $ui-header-height: 55px;
   overflow-y: auto;
   width: 100%;
   height: 100%;
-
-  &.darker {
-    background: $ui-base-color;
-  }
 }
 
 .drawer__inner__mastodon {
-  background: darken($ui-base-color, 4%)
-    url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 234.80078 31.757813" width="234.80078" height="31.757812"><path d="M19.599609 0c-1.05 0-2.10039.375-2.90039 1.125L0 16.925781v14.832031h234.80078V17.025391l-16.5-15.900391c-1.6-1.5-4.20078-1.5-5.80078 0l-13.80078 13.099609c-1.6 1.5-4.19883 1.5-5.79883 0L179.09961 1.125c-1.6-1.5-4.19883-1.5-5.79883 0L159.5 14.224609c-1.6 1.5-4.20078 1.5-5.80078 0L139.90039 1.125c-1.6-1.5-4.20078-1.5-5.80078 0l-13.79883 13.099609c-1.6 1.5-4.20078 1.5-5.80078 0L100.69922 1.125c-1.600001-1.5-4.198829-1.5-5.798829 0l-13.59961 13.099609c-1.6 1.5-4.200781 1.5-5.800781 0L61.699219 1.125c-1.6-1.5-4.198828-1.5-5.798828 0L42.099609 14.224609c-1.6 1.5-4.198828 1.5-5.798828 0L22.5 1.125C21.7.375 20.649609 0 19.599609 0z" fill="#{hex-color($ui-base-color)}"/></svg>')
+  background: var(--background-color)
+    url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 234.80078 31.757813" width="234.80078" height="31.757812"><path d="M19.599609 0c-1.05 0-2.10039.375-2.90039 1.125L0 16.925781v14.832031h234.80078V17.025391l-16.5-15.900391c-1.6-1.5-4.20078-1.5-5.80078 0l-13.80078 13.099609c-1.6 1.5-4.19883 1.5-5.79883 0L179.09961 1.125c-1.6-1.5-4.19883-1.5-5.79883 0L159.5 14.224609c-1.6 1.5-4.20078 1.5-5.80078 0L139.90039 1.125c-1.6-1.5-4.20078-1.5-5.80078 0l-13.79883 13.099609c-1.6 1.5-4.20078 1.5-5.80078 0L100.69922 1.125c-1.600001-1.5-4.198829-1.5-5.798829 0l-13.59961 13.099609c-1.6 1.5-4.200781 1.5-5.800781 0L61.699219 1.125c-1.6-1.5-4.198828-1.5-5.798828 0L42.099609 14.224609c-1.6 1.5-4.198828 1.5-5.798828 0L22.5 1.125C21.7.375 20.649609 0 19.599609 0z" fill="#{hex-color(darken($ui-base-color, 4%))}"/></svg>')
     no-repeat bottom / 100% auto;
   flex: 1;
   min-height: 47px;
@@ -3224,7 +3229,7 @@ $ui-header-height: 55px;
 .drawer__header {
   flex: 0 0 auto;
   font-size: 16px;
-  background: darken($ui-base-color, 4%);
+  border: 1px solid var(--background-border-color);
   margin-bottom: 10px;
   display: flex;
   flex-direction: row;
@@ -3234,7 +3239,7 @@ $ui-header-height: 55px;
   a:hover,
   a:focus,
   a:active {
-    background: $ui-base-color;
+    color: $primary-text-color;
   }
 }
 
@@ -3279,15 +3284,14 @@ $ui-header-height: 55px;
 .column-back-button {
   box-sizing: border-box;
   width: 100%;
-  background: $ui-base-color;
+  background: transparent;
+  border: 1px solid var(--background-border-color);
   border-radius: 4px 4px 0 0;
   color: $highlight-text-color;
   cursor: pointer;
   flex: 0 0 auto;
   font-size: 16px;
   line-height: inherit;
-  border: 0;
-  border-bottom: 1px solid lighten($ui-base-color, 8%);
   text-align: unset;
   padding: 13px;
   margin: 0;
@@ -3300,13 +3304,17 @@ $ui-header-height: 55px;
   &:hover {
     text-decoration: underline;
   }
+
+  @media screen and (max-width: $no-gap-breakpoint) {
+    border-top: 0;
+  }
 }
 
 .column-header__back-button {
   display: flex;
   align-items: center;
   gap: 5px;
-  background: $ui-base-color;
+  background: transparent;
   border: 0;
   font-family: inherit;
   color: $highlight-text-color;
@@ -3412,8 +3420,6 @@ $ui-header-height: 55px;
 }
 
 .column-link {
-  background: lighten($ui-base-color, 8%);
-  color: $primary-text-color;
   display: flex;
   align-items: center;
   gap: 5px;
@@ -3423,12 +3429,18 @@ $ui-header-height: 55px;
   overflow: hidden;
   white-space: nowrap;
   border: 0;
+  background: transparent;
+  color: $secondary-text-color;
   border-left: 4px solid transparent;
 
   &:hover,
   &:focus,
   &:active {
-    background: lighten($ui-base-color, 11%);
+    color: $primary-text-color;
+  }
+
+  &.active {
+    color: $highlight-text-color;
   }
 
   &:focus {
@@ -3440,22 +3452,6 @@ $ui-header-height: 55px;
     border-radius: 0;
   }
 
-  &--transparent {
-    background: transparent;
-    color: $secondary-text-color;
-
-    &:hover,
-    &:focus,
-    &:active {
-      background: transparent;
-      color: $primary-text-color;
-    }
-
-    &.active {
-      color: $highlight-text-color;
-    }
-  }
-
   &--logo {
     background: transparent;
     padding: 10px;
@@ -3480,8 +3476,8 @@ $ui-header-height: 55px;
 }
 
 .column-subheading {
-  background: $ui-base-color;
-  color: $dark-text-color;
+  background: darken($ui-base-color, 4%);
+  color: $darker-text-color;
   padding: 8px 20px;
   font-size: 12px;
   font-weight: 500;
@@ -3489,12 +3485,6 @@ $ui-header-height: 55px;
   cursor: default;
 }
 
-.getting-started__wrapper,
-.getting-started,
-.flex-spacer {
-  background: $ui-base-color;
-}
-
 .getting-started__wrapper {
   flex: 0 0 auto;
 }
@@ -3506,6 +3496,8 @@ $ui-header-height: 55px;
 .getting-started {
   color: $dark-text-color;
   overflow: auto;
+  border: 1px solid var(--background-border-color);
+  border-top: 0;
 
   &__trends {
     flex: 0 1 auto;
@@ -3514,7 +3506,7 @@ $ui-header-height: 55px;
     margin-top: 10px;
 
     h4 {
-      border-bottom: 1px solid lighten($ui-base-color, 8%);
+      border-bottom: 1px solid var(--background-border-color);
       padding: 10px;
       font-size: 12px;
       text-transform: uppercase;
@@ -3636,7 +3628,7 @@ $ui-header-height: 55px;
   margin-top: 14px;
   text-decoration: none;
   overflow: hidden;
-  border: 1px solid lighten($ui-base-color, 8%);
+  border: 1px solid var(--background-border-color);
   border-radius: 8px;
 
   &__actions {
@@ -3893,7 +3885,7 @@ a.status-card {
 }
 
 .load-gap {
-  border-bottom: 1px solid lighten($ui-base-color, 8%);
+  border-bottom: 1px solid var(--background-border-color);
 }
 
 .timeline-hint {
@@ -3926,7 +3918,8 @@ a.status-card {
   font-size: 16px;
   font-weight: 500;
   color: $dark-text-color;
-  background: $ui-base-color;
+  border: 1px solid var(--background-border-color);
+  border-top: 0;
   cursor: default;
   display: flex;
   flex: 1 1 auto;
@@ -4002,8 +3995,7 @@ a.status-card {
 .column-header {
   display: flex;
   font-size: 16px;
-  background: $ui-base-color;
-  border-bottom: 1px solid lighten($ui-base-color, 8%);
+  border: 1px solid var(--background-border-color);
   border-radius: 4px 4px 0 0;
   flex: 0 0 auto;
   cursor: pointer;
@@ -4070,6 +4062,10 @@ a.status-card {
       padding-top: 16px;
     }
   }
+
+  @media screen and (max-width: $no-gap-breakpoint) {
+    border-top: 0;
+  }
 }
 
 .column-header__buttons {
@@ -4089,9 +4085,9 @@ a.status-card {
   display: flex;
   justify-content: center;
   align-items: center;
-  background: $ui-base-color;
   border: 0;
   color: $darker-text-color;
+  background: transparent;
   cursor: pointer;
   font-size: 16px;
   padding: 0 15px;
@@ -4110,7 +4106,6 @@ a.status-card {
 
   &.active {
     color: $primary-text-color;
-    background: lighten($ui-base-color, 4%);
 
     &:hover {
       color: $primary-text-color;
@@ -4127,7 +4122,6 @@ a.status-card {
   max-height: 70vh;
   overflow: hidden;
   overflow-y: auto;
-  border-bottom: 1px solid lighten($ui-base-color, 8%);
   color: $darker-text-color;
   transition:
     max-height 150ms ease-in-out,
@@ -4149,13 +4143,14 @@ a.status-card {
     height: 0;
     background: transparent;
     border: 0;
-    border-top: 1px solid lighten($ui-base-color, 8%);
+    border-top: 1px solid var(--background-border-color);
     margin: 10px 0;
   }
 }
 
 .column-header__collapsible-inner {
-  background: $ui-base-color;
+  border: 1px solid var(--background-border-color);
+  border-top: 0;
 }
 
 .column-header__setting-btn {
@@ -4401,9 +4396,8 @@ a.status-card {
 }
 
 .account--panel {
-  background: lighten($ui-base-color, 4%);
-  border-top: 1px solid lighten($ui-base-color, 8%);
-  border-bottom: 1px solid lighten($ui-base-color, 8%);
+  border-top: 1px solid var(--background-border-color);
+  border-bottom: 1px solid var(--background-border-color);
   display: flex;
   flex-direction: row;
   padding: 10px 0;
@@ -4609,7 +4603,6 @@ a.status-card {
 .empty-column-indicator,
 .follow_requests-unlocked_explanation {
   color: $dark-text-color;
-  background: $ui-base-color;
   text-align: center;
   padding: 20px;
   font-size: 15px;
@@ -4636,14 +4629,14 @@ a.status-card {
 
 .follow_requests-unlocked_explanation {
   background: darken($ui-base-color, 4%);
-  border-bottom: 1px solid lighten($ui-base-color, 8%);
+  border-bottom: 1px solid var(--background-border-color);
   contain: initial;
   flex-grow: 0;
 }
 
 .error-column {
   padding: 20px;
-  background: $ui-base-color;
+  border: 1px solid var(--background-border-color);
   border-radius: 4px;
   display: flex;
   flex: 1 1 auto;
@@ -4858,7 +4851,7 @@ a.status-card {
   width: 100%;
   height: 6px;
   border-radius: 6px;
-  background: darken($ui-base-color, 8%);
+  background: var(--background-color);
   position: relative;
   margin-top: 5px;
 }
@@ -5280,7 +5273,7 @@ a.status-card {
 }
 
 .search-results__section {
-  border-bottom: 1px solid lighten($ui-base-color, 8%);
+  border-bottom: 1px solid var(--background-border-color);
 
   &:last-child {
     border-bottom: 0;
@@ -5288,7 +5281,7 @@ a.status-card {
 
   &__header {
     background: darken($ui-base-color, 4%);
-    border-bottom: 1px solid lighten($ui-base-color, 8%);
+    border-bottom: 1px solid var(--background-border-color);
     padding: 15px;
     font-weight: 500;
     font-size: 14px;
@@ -6335,7 +6328,7 @@ a.status-card {
 .attachment-list {
   display: flex;
   font-size: 14px;
-  border: 1px solid lighten($ui-base-color, 8%);
+  border: 1px solid var(--background-border-color);
   border-radius: 4px;
   margin-top: 16px;
   overflow: hidden;
@@ -6345,7 +6338,7 @@ a.status-card {
     color: $dark-text-color;
     padding: 8px 18px;
     cursor: default;
-    border-inline-end: 1px solid lighten($ui-base-color, 8%);
+    border-inline-end: 1px solid var(--background-border-color);
     display: flex;
     flex-direction: column;
     align-items: center;
@@ -6497,7 +6490,7 @@ a.status-card {
   overflow: hidden;
   box-sizing: border-box;
   position: relative;
-  background: darken($ui-base-color, 8%);
+  background: var(--background-color);
   border-radius: 8px;
   padding-bottom: 44px;
   width: 100%;
@@ -6893,7 +6886,6 @@ a.status-card {
 
 .scrollable .account-card {
   margin: 10px;
-  background: lighten($ui-base-color, 8%);
 }
 
 .scrollable .account-card__title__avatar {
@@ -6904,11 +6896,7 @@ a.status-card {
 }
 
 .scrollable .account-card__bio::after {
-  background: linear-gradient(
-    to left,
-    lighten($ui-base-color, 8%),
-    transparent
-  );
+  background: linear-gradient(to left, var(--background-color), transparent);
 }
 
 .account-gallery__container {
@@ -6937,8 +6925,8 @@ a.status-card {
 
 .notification__filter-bar,
 .account__section-headline {
-  background: $ui-base-color;
-  border-bottom: 1px solid lighten($ui-base-color, 8%);
+  border: 1px solid var(--background-border-color);
+  border-top: 0;
   cursor: default;
   display: flex;
   flex-shrink: 0;
@@ -6979,10 +6967,15 @@ a.status-card {
       }
     }
   }
+
+  .scrollable & {
+    border-left: 0;
+    border-right: 0;
+  }
 }
 
 .filter-form {
-  background: $ui-base-color;
+  border-bottom: 1px solid var(--background-border-color);
 
   &__column {
     display: flex;
@@ -7200,7 +7193,8 @@ noscript {
   justify-content: flex-start;
   gap: 15px;
   align-items: center;
-  background: lighten($ui-base-color, 4%);
+  border: 1px solid var(--background-border-color);
+  border-top: 0;
 
   label {
     flex: 1 1 auto;
@@ -7301,7 +7295,7 @@ noscript {
 
   .list {
     padding: 10px;
-    border-bottom: 1px solid lighten($ui-base-color, 8%);
+    border-bottom: 1px solid var(--background-border-color);
   }
 
   .list__wrapper {
@@ -7445,7 +7439,7 @@ noscript {
     height: 145px;
     position: relative;
     background: darken($ui-base-color, 4%);
-    border-bottom: 1px solid lighten($ui-base-color, 8%);
+    border-bottom: 1px solid var(--background-border-color);
 
     img {
       object-fit: cover;
@@ -7459,7 +7453,7 @@ noscript {
   &__bar {
     position: relative;
     padding: 0 20px;
-    border-bottom: 1px solid lighten($ui-base-color, 8%);
+    border-bottom: 1px solid var(--background-border-color);
 
     .avatar {
       display: block;
@@ -7467,8 +7461,8 @@ noscript {
       width: 94px;
 
       .account__avatar {
-        background: darken($ui-base-color, 8%);
-        border: 2px solid $ui-base-color;
+        background: var(--background-color);
+        border: 2px solid var(--background-border-color);
       }
     }
   }
@@ -7583,13 +7577,12 @@ noscript {
       margin: 0;
       margin-top: 16px;
       border-radius: 4px;
-      background: darken($ui-base-color, 4%);
-      border: 0;
+      border: 1px solid var(--background-border-color);
 
       dl {
         display: block;
         padding: 11px 16px;
-        border-bottom-color: lighten($ui-base-color, 4%);
+        border-bottom-color: var(--background-border-color);
       }
 
       dd,
@@ -7764,7 +7757,7 @@ noscript {
     display: flex;
     align-items: center;
     padding: 15px;
-    border-bottom: 1px solid lighten($ui-base-color, 8%);
+    border-bottom: 1px solid var(--background-border-color);
     gap: 15px;
 
     &:last-child {
@@ -7882,7 +7875,7 @@ noscript {
 
 .conversation {
   display: flex;
-  border-bottom: 1px solid lighten($ui-base-color, 8%);
+  border-bottom: 1px solid var(--background-border-color);
   padding: 5px;
   padding-bottom: 0;
 
@@ -8237,7 +8230,7 @@ noscript {
 
 .picture-in-picture-placeholder {
   box-sizing: border-box;
-  border: 2px dashed lighten($ui-base-color, 8%);
+  border: 2px dashed var(--background-border-color);
   background: $base-shadow-color;
   display: flex;
   flex-direction: column;
@@ -8265,7 +8258,7 @@ noscript {
 
 .notifications-permission-banner {
   padding: 30px;
-  border-bottom: 1px solid lighten($ui-base-color, 8%);
+  border-bottom: 1px solid var(--background-border-color);
   display: flex;
   flex-direction: column;
   align-items: center;
@@ -8335,7 +8328,7 @@ noscript {
   color: $primary-text-color;
   text-decoration: none;
   padding: 15px;
-  border-bottom: 1px solid lighten($ui-base-color, 8%);
+  border-bottom: 1px solid var(--background-border-color);
   gap: 15px;
 
   &:last-child {
@@ -8714,7 +8707,6 @@ noscript {
 }
 
 .privacy-policy {
-  background: $ui-base-color;
   padding: 20px;
 
   @media screen and (min-width: $no-gap-breakpoint) {
@@ -9083,6 +9075,7 @@ noscript {
 
 .about {
   padding: 20px;
+  border-top: 1px solid var(--background-border-color);
 
   @media screen and (min-width: $no-gap-breakpoint) {
     border-radius: 4px;
@@ -9129,7 +9122,7 @@ noscript {
   }
 
   &__meta {
-    background: lighten($ui-base-color, 4%);
+    border: 1px solid var(--background-border-color);
     border-radius: 4px;
     display: flex;
     margin-bottom: 30px;
@@ -9145,7 +9138,7 @@ noscript {
       width: 0;
       border: 0;
       border-style: solid;
-      border-color: lighten($ui-base-color, 8%);
+      border-color: var(--background-border-color);
       border-left-width: 1px;
       min-height: calc(100% - 60px);
       flex: 0 0 auto;
@@ -9253,7 +9246,7 @@ noscript {
       line-height: 22px;
       padding: 20px;
       border-radius: 4px;
-      background: lighten($ui-base-color, 4%);
+      border: 1px solid var(--background-border-color);
       color: $highlight-text-color;
       cursor: pointer;
     }
@@ -9263,7 +9256,7 @@ noscript {
     }
 
     &__body {
-      border: 1px solid lighten($ui-base-color, 4%);
+      border: 1px solid var(--background-border-color);
       border-top: 0;
       padding: 20px;
       font-size: 15px;
@@ -9273,18 +9266,17 @@ noscript {
 
   &__domain-blocks {
     margin-top: 30px;
-    background: darken($ui-base-color, 4%);
-    border: 1px solid lighten($ui-base-color, 4%);
+    border: 1px solid var(--background-border-color);
     border-radius: 4px;
 
     &__domain {
-      border-bottom: 1px solid lighten($ui-base-color, 4%);
+      border-bottom: 1px solid var(--background-border-color);
       padding: 10px;
       font-size: 15px;
       color: $darker-text-color;
 
       &:nth-child(2n) {
-        background: darken($ui-base-color, 2%);
+        background: darken($ui-base-color, 4%);
       }
 
       &:last-child {
@@ -9380,7 +9372,7 @@ noscript {
 }
 
 .hashtag-header {
-  border-bottom: 1px solid lighten($ui-base-color, 8%);
+  border-bottom: 1px solid var(--background-border-color);
   padding: 15px;
   font-size: 17px;
   line-height: 22px;
@@ -9442,8 +9434,8 @@ noscript {
   gap: 12px;
   padding: 16px 0;
   padding-bottom: 0;
-  border-bottom: 1px solid mix($ui-base-color, $ui-highlight-color, 75%);
-  background: mix($ui-base-color, $ui-highlight-color, 95%);
+  border-bottom: 1px solid var(--background-border-color);
+  background: rgba($ui-highlight-color, 0.05);
 
   &__header {
     display: flex;
@@ -9527,8 +9519,8 @@ noscript {
       overflow-x: scroll;
 
       &__card {
-        background: darken($ui-base-color, 4%);
-        border: 1px solid lighten($ui-base-color, 8%);
+        background: var(--background-color);
+        border: 1px solid var(--background-border-color);
         border-radius: 4px;
         display: flex;
         flex-direction: column;
@@ -9565,7 +9557,7 @@ noscript {
         .account__avatar {
           flex-shrink: 0;
           align-self: flex-end;
-          border: 1px solid lighten($ui-base-color, 8%);
+          border: 1px solid var(--background-border-color);
           background-color: $ui-base-color;
         }
 
diff --git a/app/javascript/styles/mastodon/variables.scss b/app/javascript/styles/mastodon/variables.scss
index 611c8bb5d18abe..94078d960d694c 100644
--- a/app/javascript/styles/mastodon/variables.scss
+++ b/app/javascript/styles/mastodon/variables.scss
@@ -94,10 +94,14 @@ $font-display: 'mastodon-font-display' !default;
 $font-monospace: 'mastodon-font-monospace' !default;
 
 :root {
-  --dropdown-border-color: #{lighten($ui-base-color, 12%)};
-  --dropdown-background-color: #{lighten($ui-base-color, 4%)};
+  --dropdown-border-color: #{lighten($ui-base-color, 4%)};
+  --dropdown-background-color: #{rgba(darken($ui-base-color, 8%), 0.9)};
   --dropdown-shadow: 0 20px 25px -5px #{rgba($base-shadow-color, 0.25)},
     0 8px 10px -6px #{rgba($base-shadow-color, 0.25)};
   --modal-background-color: #{darken($ui-base-color, 4%)};
   --modal-border-color: #{lighten($ui-base-color, 4%)};
+  --background-border-color: #{lighten($ui-base-color, 4%)};
+  --background-filter: blur(10px) saturate(180%) contrast(75%) brightness(70%);
+  --background-color: #{darken($ui-base-color, 8%)};
+  --background-color-tint: #{rgba(darken($ui-base-color, 8%), 0.9)};
 }

From d4ed7e466c41f19e5f9352700c76e7ffc4d28119 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 12 Mar 2024 09:09:11 -0400
Subject: [PATCH 0406/2191] Extract `by_domain_length` scope in
 `DomainNormalizable` concern (#29517)

---
 app/models/concerns/domain_normalizable.rb | 12 ++++++++++++
 app/models/domain_block.rb                 |  2 +-
 app/models/email_domain_block.rb           |  2 +-
 app/models/preview_card_provider.rb        |  2 +-
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/app/models/concerns/domain_normalizable.rb b/app/models/concerns/domain_normalizable.rb
index 8e244c1d87c2a5..76f91c5b64029c 100644
--- a/app/models/concerns/domain_normalizable.rb
+++ b/app/models/concerns/domain_normalizable.rb
@@ -5,6 +5,18 @@ module DomainNormalizable
 
   included do
     before_validation :normalize_domain
+
+    scope :by_domain_length, -> { order(domain_char_length.desc) }
+  end
+
+  class_methods do
+    def domain_char_length
+      Arel.sql(
+        <<~SQL.squish
+          CHAR_LENGTH(domain)
+        SQL
+      )
+    end
   end
 
   private
diff --git a/app/models/domain_block.rb b/app/models/domain_block.rb
index e310918e9b436e..b5d1f2e0796645 100644
--- a/app/models/domain_block.rb
+++ b/app/models/domain_block.rb
@@ -70,7 +70,7 @@ def rule_for(domain)
       segments = uri.normalized_host.split('.')
       variants = segments.map.with_index { |_, i| segments[i..].join('.') }
 
-      where(domain: variants).order(Arel.sql('char_length(domain) desc')).first
+      where(domain: variants).by_domain_length.first
     rescue Addressable::URI::InvalidURIError, IDN::Idna::IdnaError
       nil
     end
diff --git a/app/models/email_domain_block.rb b/app/models/email_domain_block.rb
index 40be59420aeb44..f3a86eae8f3533 100644
--- a/app/models/email_domain_block.rb
+++ b/app/models/email_domain_block.rb
@@ -56,7 +56,7 @@ def invalid_uri?
     end
 
     def blocking?(allow_with_approval: false)
-      blocks = EmailDomainBlock.where(domain: domains_with_variants, allow_with_approval: allow_with_approval).order(Arel.sql('char_length(domain) desc'))
+      blocks = EmailDomainBlock.where(domain: domains_with_variants, allow_with_approval: allow_with_approval).by_domain_length
       blocks.each { |block| block.history.add(@attempt_ip) } if @attempt_ip.present?
       blocks.any?
     end
diff --git a/app/models/preview_card_provider.rb b/app/models/preview_card_provider.rb
index 8ba24331bbabfb..756707e3f1aed8 100644
--- a/app/models/preview_card_provider.rb
+++ b/app/models/preview_card_provider.rb
@@ -54,6 +54,6 @@ def requires_review_notification?
 
   def self.matching_domain(domain)
     segments = domain.split('.')
-    where(domain: segments.map.with_index { |_, i| segments[i..].join('.') }).order(Arel.sql('char_length(domain) desc')).first
+    where(domain: segments.map.with_index { |_, i| segments[i..].join('.') }).by_domain_length.first
   end
 end

From 00d94f3ffabda89a2f955212e763cdba3f1f54c6 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 12 Mar 2024 13:10:37 -0400
Subject: [PATCH 0407/2191] Use vanilla JS to get Rails CSRF values (#29403)

---
 app/javascript/mastodon/utils/log_out.ts | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/app/javascript/mastodon/utils/log_out.ts b/app/javascript/mastodon/utils/log_out.ts
index 3a4cc8ecb1e52a..b08a61a6a28162 100644
--- a/app/javascript/mastodon/utils/log_out.ts
+++ b/app/javascript/mastodon/utils/log_out.ts
@@ -1,5 +1,3 @@
-import Rails from '@rails/ujs';
-
 export const logOut = () => {
   const form = document.createElement('form');
 
@@ -9,13 +7,18 @@ export const logOut = () => {
   methodInput.setAttribute('type', 'hidden');
   form.appendChild(methodInput);
 
-  const csrfToken = Rails.csrfToken();
-  const csrfParam = Rails.csrfParam();
+  const csrfToken = document.querySelector<HTMLMetaElement>(
+    'meta[name=csrf-token]',
+  );
+
+  const csrfParam = document.querySelector<HTMLMetaElement>(
+    'meta[name=csrf-param]',
+  );
 
   if (csrfParam && csrfToken) {
     const csrfInput = document.createElement('input');
-    csrfInput.setAttribute('name', csrfParam);
-    csrfInput.setAttribute('value', csrfToken);
+    csrfInput.setAttribute('name', csrfParam.content);
+    csrfInput.setAttribute('value', csrfToken.content);
     csrfInput.setAttribute('type', 'hidden');
     form.appendChild(csrfInput);
   }

From 96013cd576ec51a41a7fe06a28225a3e43ca8496 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 13 Mar 2024 04:22:32 -0400
Subject: [PATCH 0408/2191] Reduce `RSpec/ExampleLength` in CSP request spec
 (#29104)

---
 spec/requests/content_security_policy_spec.rb | 49 ++++++++++++-------
 1 file changed, 31 insertions(+), 18 deletions(-)

diff --git a/spec/requests/content_security_policy_spec.rb b/spec/requests/content_security_policy_spec.rb
index d4cc40bce5d976..d4447dca4befc5 100644
--- a/spec/requests/content_security_policy_spec.rb
+++ b/spec/requests/content_security_policy_spec.rb
@@ -3,25 +3,38 @@
 require 'rails_helper'
 
 describe 'Content-Security-Policy' do
-  it 'sets the expected CSP headers' do
-    allow(SecureRandom).to receive(:base64).with(16).and_return('ZbA+JmE7+bK8F5qvADZHuQ==')
+  before { allow(SecureRandom).to receive(:base64).with(16).and_return('ZbA+JmE7+bK8F5qvADZHuQ==') }
 
+  it 'sets the expected CSP headers' do
     get '/'
-    expect(response.headers['Content-Security-Policy'].split(';').map(&:strip)).to contain_exactly(
-      "base-uri 'none'",
-      "default-src 'none'",
-      "frame-ancestors 'none'",
-      "font-src 'self' https://cb6e6126.ngrok.io",
-      "img-src 'self' data: blob: https://cb6e6126.ngrok.io",
-      "style-src 'self' https://cb6e6126.ngrok.io 'nonce-ZbA+JmE7+bK8F5qvADZHuQ=='",
-      "media-src 'self' data: https://cb6e6126.ngrok.io",
-      "frame-src 'self' https:",
-      "manifest-src 'self' https://cb6e6126.ngrok.io",
-      "form-action 'self'",
-      "child-src 'self' blob: https://cb6e6126.ngrok.io",
-      "worker-src 'self' blob: https://cb6e6126.ngrok.io",
-      "connect-src 'self' data: blob: https://cb6e6126.ngrok.io ws://cb6e6126.ngrok.io:4000",
-      "script-src 'self' https://cb6e6126.ngrok.io 'wasm-unsafe-eval'"
-    )
+
+    expect(response_csp_headers)
+      .to match_array(expected_csp_headers)
+  end
+
+  def response_csp_headers
+    response
+      .headers['Content-Security-Policy']
+      .split(';')
+      .map(&:strip)
+  end
+
+  def expected_csp_headers
+    <<~CSP.split("\n").map(&:strip)
+      base-uri 'none'
+      child-src 'self' blob: https://cb6e6126.ngrok.io
+      connect-src 'self' data: blob: https://cb6e6126.ngrok.io ws://cb6e6126.ngrok.io:4000
+      default-src 'none'
+      font-src 'self' https://cb6e6126.ngrok.io
+      form-action 'self'
+      frame-ancestors 'none'
+      frame-src 'self' https:
+      img-src 'self' data: blob: https://cb6e6126.ngrok.io
+      manifest-src 'self' https://cb6e6126.ngrok.io
+      media-src 'self' data: https://cb6e6126.ngrok.io
+      script-src 'self' https://cb6e6126.ngrok.io 'wasm-unsafe-eval'
+      style-src 'self' https://cb6e6126.ngrok.io 'nonce-ZbA+JmE7+bK8F5qvADZHuQ=='
+      worker-src 'self' blob: https://cb6e6126.ngrok.io
+    CSP
   end
 end

From 19f0590795500c2a93baa317b79b53efaca2ec88 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 13 Mar 2024 04:33:03 -0400
Subject: [PATCH 0409/2191] Add basic coverage for `TagSearchService` class
 (#29319)

---
 spec/services/tag_search_service_spec.rb | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 spec/services/tag_search_service_spec.rb

diff --git a/spec/services/tag_search_service_spec.rb b/spec/services/tag_search_service_spec.rb
new file mode 100644
index 00000000000000..de42e54071e823
--- /dev/null
+++ b/spec/services/tag_search_service_spec.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe TagSearchService do
+  describe '#call' do
+    let!(:one) { Fabricate(:tag, name: 'one') }
+
+    before { Fabricate(:tag, name: 'two') }
+
+    it 'runs a search for tags' do
+      results = subject.call('#one', limit: 5)
+
+      expect(results)
+        .to have_attributes(
+          size: 1,
+          first: eq(one)
+        )
+    end
+  end
+end

From 3eaac3af73eac44accf4abefb273486e90c4c9dd Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 13 Mar 2024 04:38:57 -0400
Subject: [PATCH 0410/2191] Use `before_all` block to setup
 `requests/cache_spec` data (#29437)

---
 spec/rails_helper.rb        |  1 +
 spec/requests/cache_spec.rb | 22 +++++++++++-----------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 3e84d687383551..89fc25bcbdfb09 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -21,6 +21,7 @@
 require 'capybara/rspec'
 require 'chewy/rspec'
 require 'email_spec/rspec'
+require 'test_prof/recipes/rspec/before_all'
 
 Dir[Rails.root.join('spec', 'support', '**', '*.rb')].each { |f| require f }
 
diff --git a/spec/requests/cache_spec.rb b/spec/requests/cache_spec.rb
index c56eec16c535d7..91e5b022e3951a 100644
--- a/spec/requests/cache_spec.rb
+++ b/spec/requests/cache_spec.rb
@@ -39,7 +39,7 @@ module TestEndpoints
     /api/v1/accounts/lookup?acct=alice
     /api/v1/statuses/110224538612341312
     /api/v1/statuses/110224538612341312/context
-    /api/v1/polls/12345
+    /api/v1/polls/123456789
     /api/v1/trends/statuses
     /api/v1/directory
   ).freeze
@@ -166,14 +166,18 @@ module DisabledAnonymousAPI
     ActionController::Base.allow_forgery_protection = old
   end
 
-  let(:alice) { Fabricate(:account, username: 'alice') }
-  let(:user)  { Fabricate(:user, role: UserRole.find_by(name: 'Moderator')) }
+  let(:alice) { Account.find_by(username: 'alice') }
+  let(:user) { User.find_by(email: 'user@host.example') }
+  let(:token) { Doorkeeper::AccessToken.find_by(resource_owner_id: user.id) }
 
-  before do
-    status = Fabricate(:status, account: alice, id: '110224538612341312')
-    Fabricate(:status, account: alice, id: '110224538643211312', visibility: :private)
+  before_all do
+    alice = Fabricate(:account, username: 'alice')
+    user = Fabricate(:user, email: 'user@host.example', role: UserRole.find_by(name: 'Moderator'))
+    status = Fabricate(:status, account: alice, id: 110_224_538_612_341_312)
+    Fabricate(:status, account: alice, id: 110_224_538_643_211_312, visibility: :private)
     Fabricate(:invite, code: 'abcdef')
-    Fabricate(:poll, status: status, account: alice, id: '12345')
+    Fabricate(:poll, status: status, account: alice, id: 123_456_789)
+    Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read')
 
     user.account.follow!(alice)
   end
@@ -321,8 +325,6 @@ module DisabledAnonymousAPI
   end
 
   context 'with an auth token' do
-    let!(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read') }
-
     TestEndpoints::ALWAYS_CACHED.each do |endpoint|
       describe endpoint do
         before do
@@ -585,8 +587,6 @@ module DisabledAnonymousAPI
     end
 
     context 'with an auth token' do
-      let!(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read') }
-
       TestEndpoints::ALWAYS_CACHED.each do |endpoint|
         describe endpoint do
           before do

From 469028b6d3788c1b1e535d6d0b1f9f6e91e26c33 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 13 Mar 2024 04:39:26 -0400
Subject: [PATCH 0411/2191] Remove unneeded `type: :service` from spec/services
 files (#29304)

---
 spec/services/account_search_service_spec.rb                    | 2 +-
 spec/services/account_statuses_cleanup_service_spec.rb          | 2 +-
 .../activitypub/fetch_featured_collection_service_spec.rb       | 2 +-
 .../activitypub/fetch_featured_tags_collection_service_spec.rb  | 2 +-
 spec/services/activitypub/fetch_remote_account_service_spec.rb  | 2 +-
 spec/services/activitypub/fetch_remote_actor_service_spec.rb    | 2 +-
 spec/services/activitypub/fetch_remote_key_service_spec.rb      | 2 +-
 spec/services/activitypub/fetch_remote_status_service_spec.rb   | 2 +-
 spec/services/activitypub/fetch_replies_service_spec.rb         | 2 +-
 spec/services/activitypub/process_account_service_spec.rb       | 2 +-
 spec/services/activitypub/process_collection_service_spec.rb    | 2 +-
 spec/services/activitypub/process_status_update_service_spec.rb | 2 +-
 spec/services/activitypub/synchronize_followers_service_spec.rb | 2 +-
 spec/services/after_block_domain_from_account_service_spec.rb   | 2 +-
 spec/services/after_block_service_spec.rb                       | 2 +-
 spec/services/app_sign_up_service_spec.rb                       | 2 +-
 spec/services/authorize_follow_service_spec.rb                  | 2 +-
 spec/services/backup_service_spec.rb                            | 2 +-
 spec/services/batched_remove_status_service_spec.rb             | 2 +-
 spec/services/block_domain_service_spec.rb                      | 2 +-
 spec/services/block_service_spec.rb                             | 2 +-
 spec/services/bootstrap_timeline_service_spec.rb                | 2 +-
 spec/services/clear_domain_media_service_spec.rb                | 2 +-
 spec/services/delete_account_service_spec.rb                    | 2 +-
 spec/services/fan_out_on_write_service_spec.rb                  | 2 +-
 spec/services/favourite_service_spec.rb                         | 2 +-
 spec/services/fetch_link_card_service_spec.rb                   | 2 +-
 spec/services/fetch_oembed_service_spec.rb                      | 2 +-
 spec/services/fetch_remote_status_service_spec.rb               | 2 +-
 spec/services/fetch_resource_service_spec.rb                    | 2 +-
 spec/services/follow_service_spec.rb                            | 2 +-
 spec/services/import_service_spec.rb                            | 2 +-
 spec/services/mute_service_spec.rb                              | 2 +-
 spec/services/notify_service_spec.rb                            | 2 +-
 spec/services/post_status_service_spec.rb                       | 2 +-
 spec/services/precompute_feed_service_spec.rb                   | 2 +-
 spec/services/process_mentions_service_spec.rb                  | 2 +-
 spec/services/purge_domain_service_spec.rb                      | 2 +-
 spec/services/reblog_service_spec.rb                            | 2 +-
 spec/services/reject_follow_service_spec.rb                     | 2 +-
 spec/services/remove_from_followers_service_spec.rb             | 2 +-
 spec/services/remove_status_service_spec.rb                     | 2 +-
 spec/services/report_service_spec.rb                            | 2 +-
 spec/services/resolve_account_service_spec.rb                   | 2 +-
 spec/services/resolve_url_service_spec.rb                       | 2 +-
 spec/services/search_service_spec.rb                            | 2 +-
 spec/services/software_update_check_service_spec.rb             | 2 +-
 spec/services/suspend_account_service_spec.rb                   | 2 +-
 spec/services/translate_status_service_spec.rb                  | 2 +-
 spec/services/unallow_domain_service_spec.rb                    | 2 +-
 spec/services/unblock_domain_service_spec.rb                    | 2 +-
 spec/services/unblock_service_spec.rb                           | 2 +-
 spec/services/unfollow_service_spec.rb                          | 2 +-
 spec/services/unsuspend_account_service_spec.rb                 | 2 +-
 spec/services/update_account_service_spec.rb                    | 2 +-
 spec/services/update_status_service_spec.rb                     | 2 +-
 spec/services/verify_link_service_spec.rb                       | 2 +-
 57 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/spec/services/account_search_service_spec.rb b/spec/services/account_search_service_spec.rb
index 4f89cd220c8df8..5ec08859031759 100644
--- a/spec/services/account_search_service_spec.rb
+++ b/spec/services/account_search_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe AccountSearchService, type: :service do
+describe AccountSearchService do
   describe '#call' do
     context 'with a query to ignore' do
       it 'returns empty array for missing query' do
diff --git a/spec/services/account_statuses_cleanup_service_spec.rb b/spec/services/account_statuses_cleanup_service_spec.rb
index 0ac113f1055eb7..403c4632d74303 100644
--- a/spec/services/account_statuses_cleanup_service_spec.rb
+++ b/spec/services/account_statuses_cleanup_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe AccountStatusesCleanupService, type: :service do
+describe AccountStatusesCleanupService do
   let(:account)           { Fabricate(:account, username: 'alice', domain: nil) }
   let(:account_policy)    { Fabricate(:account_statuses_cleanup_policy, account: account) }
   let!(:unrelated_status) { Fabricate(:status, created_at: 3.years.ago) }
diff --git a/spec/services/activitypub/fetch_featured_collection_service_spec.rb b/spec/services/activitypub/fetch_featured_collection_service_spec.rb
index dab204406bbb23..7ea87922acc02b 100644
--- a/spec/services/activitypub/fetch_featured_collection_service_spec.rb
+++ b/spec/services/activitypub/fetch_featured_collection_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe ActivityPub::FetchFeaturedCollectionService, type: :service do
+RSpec.describe ActivityPub::FetchFeaturedCollectionService do
   subject { described_class.new }
 
   let(:actor) { Fabricate(:account, domain: 'example.com', uri: 'https://example.com/account', featured_collection_url: 'https://example.com/account/pinned') }
diff --git a/spec/services/activitypub/fetch_featured_tags_collection_service_spec.rb b/spec/services/activitypub/fetch_featured_tags_collection_service_spec.rb
index 638278a10e5375..59367b1e32c5e8 100644
--- a/spec/services/activitypub/fetch_featured_tags_collection_service_spec.rb
+++ b/spec/services/activitypub/fetch_featured_tags_collection_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe ActivityPub::FetchFeaturedTagsCollectionService, type: :service do
+RSpec.describe ActivityPub::FetchFeaturedTagsCollectionService do
   subject { described_class.new }
 
   let(:collection_url) { 'https://example.com/account/tags' }
diff --git a/spec/services/activitypub/fetch_remote_account_service_spec.rb b/spec/services/activitypub/fetch_remote_account_service_spec.rb
index 799a70d0916d3f..789a705c41e880 100644
--- a/spec/services/activitypub/fetch_remote_account_service_spec.rb
+++ b/spec/services/activitypub/fetch_remote_account_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe ActivityPub::FetchRemoteAccountService, type: :service do
+RSpec.describe ActivityPub::FetchRemoteAccountService do
   subject { described_class.new }
 
   let!(:actor) do
diff --git a/spec/services/activitypub/fetch_remote_actor_service_spec.rb b/spec/services/activitypub/fetch_remote_actor_service_spec.rb
index 4ce42ea5609f0c..025051e9fa7ef0 100644
--- a/spec/services/activitypub/fetch_remote_actor_service_spec.rb
+++ b/spec/services/activitypub/fetch_remote_actor_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe ActivityPub::FetchRemoteActorService, type: :service do
+RSpec.describe ActivityPub::FetchRemoteActorService do
   subject { described_class.new }
 
   let!(:actor) do
diff --git a/spec/services/activitypub/fetch_remote_key_service_spec.rb b/spec/services/activitypub/fetch_remote_key_service_spec.rb
index 478778cc9f5762..b6fcf3f479a23b 100644
--- a/spec/services/activitypub/fetch_remote_key_service_spec.rb
+++ b/spec/services/activitypub/fetch_remote_key_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe ActivityPub::FetchRemoteKeyService, type: :service do
+RSpec.describe ActivityPub::FetchRemoteKeyService do
   subject { described_class.new }
 
   let(:webfinger) { { subject: 'acct:alice@example.com', links: [{ rel: 'self', href: 'https://example.com/alice' }] } }
diff --git a/spec/services/activitypub/fetch_remote_status_service_spec.rb b/spec/services/activitypub/fetch_remote_status_service_spec.rb
index 0fb32d20b1901a..a86f141fe0b747 100644
--- a/spec/services/activitypub/fetch_remote_status_service_spec.rb
+++ b/spec/services/activitypub/fetch_remote_status_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe ActivityPub::FetchRemoteStatusService, type: :service do
+RSpec.describe ActivityPub::FetchRemoteStatusService do
   include ActionView::Helpers::TextHelper
 
   subject { described_class.new }
diff --git a/spec/services/activitypub/fetch_replies_service_spec.rb b/spec/services/activitypub/fetch_replies_service_spec.rb
index 8e1f606e26e794..e7d8d3528a97eb 100644
--- a/spec/services/activitypub/fetch_replies_service_spec.rb
+++ b/spec/services/activitypub/fetch_replies_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe ActivityPub::FetchRepliesService, type: :service do
+RSpec.describe ActivityPub::FetchRepliesService do
   subject { described_class.new }
 
   let(:actor)          { Fabricate(:account, domain: 'example.com', uri: 'http://example.com/account') }
diff --git a/spec/services/activitypub/process_account_service_spec.rb b/spec/services/activitypub/process_account_service_spec.rb
index b13869f357bba3..8b80dafe45a924 100644
--- a/spec/services/activitypub/process_account_service_spec.rb
+++ b/spec/services/activitypub/process_account_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe ActivityPub::ProcessAccountService, type: :service do
+RSpec.describe ActivityPub::ProcessAccountService do
   subject { described_class.new }
 
   context 'with property values, an avatar, and a profile header' do
diff --git a/spec/services/activitypub/process_collection_service_spec.rb b/spec/services/activitypub/process_collection_service_spec.rb
index 63502c546e29c6..74df0f91063f53 100644
--- a/spec/services/activitypub/process_collection_service_spec.rb
+++ b/spec/services/activitypub/process_collection_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe ActivityPub::ProcessCollectionService, type: :service do
+RSpec.describe ActivityPub::ProcessCollectionService do
   subject { described_class.new }
 
   let(:actor) { Fabricate(:account, domain: 'example.com', uri: 'http://example.com/account') }
diff --git a/spec/services/activitypub/process_status_update_service_spec.rb b/spec/services/activitypub/process_status_update_service_spec.rb
index 67f2f27276537d..e451d15dc0359c 100644
--- a/spec/services/activitypub/process_status_update_service_spec.rb
+++ b/spec/services/activitypub/process_status_update_service_spec.rb
@@ -6,7 +6,7 @@ def poll_option_json(name, votes)
   { type: 'Note', name: name, replies: { type: 'Collection', totalItems: votes } }
 end
 
-RSpec.describe ActivityPub::ProcessStatusUpdateService, type: :service do
+RSpec.describe ActivityPub::ProcessStatusUpdateService do
   subject { described_class.new }
 
   let!(:status) { Fabricate(:status, text: 'Hello world', account: Fabricate(:account, domain: 'example.com')) }
diff --git a/spec/services/activitypub/synchronize_followers_service_spec.rb b/spec/services/activitypub/synchronize_followers_service_spec.rb
index f62376ab95b24e..648f9a33212c3e 100644
--- a/spec/services/activitypub/synchronize_followers_service_spec.rb
+++ b/spec/services/activitypub/synchronize_followers_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe ActivityPub::SynchronizeFollowersService, type: :service do
+RSpec.describe ActivityPub::SynchronizeFollowersService do
   subject { described_class.new }
 
   let(:actor)          { Fabricate(:account, domain: 'example.com', uri: 'http://example.com/account', inbox_url: 'http://example.com/inbox') }
diff --git a/spec/services/after_block_domain_from_account_service_spec.rb b/spec/services/after_block_domain_from_account_service_spec.rb
index 05af125997c750..2fce424b1acab7 100644
--- a/spec/services/after_block_domain_from_account_service_spec.rb
+++ b/spec/services/after_block_domain_from_account_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe AfterBlockDomainFromAccountService, type: :service do
+RSpec.describe AfterBlockDomainFromAccountService do
   subject { described_class.new }
 
   let!(:wolf) { Fabricate(:account, username: 'wolf', domain: 'evil.org', inbox_url: 'https://evil.org/inbox', protocol: :activitypub) }
diff --git a/spec/services/after_block_service_spec.rb b/spec/services/after_block_service_spec.rb
index d81bba1d8d917b..82825dad982290 100644
--- a/spec/services/after_block_service_spec.rb
+++ b/spec/services/after_block_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe AfterBlockService, type: :service do
+RSpec.describe AfterBlockService do
   subject { described_class.new.call(account, target_account) }
 
   let(:account)              { Fabricate(:account) }
diff --git a/spec/services/app_sign_up_service_spec.rb b/spec/services/app_sign_up_service_spec.rb
index b37b6da1f018ee..ec7b7516f95372 100644
--- a/spec/services/app_sign_up_service_spec.rb
+++ b/spec/services/app_sign_up_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe AppSignUpService, type: :service do
+RSpec.describe AppSignUpService do
   subject { described_class.new }
 
   let(:app) { Fabricate(:application, scopes: 'read write') }
diff --git a/spec/services/authorize_follow_service_spec.rb b/spec/services/authorize_follow_service_spec.rb
index 602250ee96fdaa..be2a8641854054 100644
--- a/spec/services/authorize_follow_service_spec.rb
+++ b/spec/services/authorize_follow_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe AuthorizeFollowService, type: :service do
+RSpec.describe AuthorizeFollowService do
   subject { described_class.new }
 
   let(:sender) { Fabricate(:account, username: 'alice') }
diff --git a/spec/services/backup_service_spec.rb b/spec/services/backup_service_spec.rb
index 806ba18323ea56..b4cb60083b7ff1 100644
--- a/spec/services/backup_service_spec.rb
+++ b/spec/services/backup_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe BackupService, type: :service do
+RSpec.describe BackupService do
   subject(:service_call) { described_class.new.call(backup) }
 
   let!(:user)           { Fabricate(:user) }
diff --git a/spec/services/batched_remove_status_service_spec.rb b/spec/services/batched_remove_status_service_spec.rb
index 1c59d5ed06fbdc..e501b9ba84a94c 100644
--- a/spec/services/batched_remove_status_service_spec.rb
+++ b/spec/services/batched_remove_status_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe BatchedRemoveStatusService, :sidekiq_inline, type: :service do
+RSpec.describe BatchedRemoveStatusService, :sidekiq_inline do
   subject { described_class.new }
 
   let!(:alice)  { Fabricate(:account) }
diff --git a/spec/services/block_domain_service_spec.rb b/spec/services/block_domain_service_spec.rb
index 7ad00fff68a8cc..0f278293a86676 100644
--- a/spec/services/block_domain_service_spec.rb
+++ b/spec/services/block_domain_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe BlockDomainService, type: :service do
+RSpec.describe BlockDomainService do
   subject { described_class.new }
 
   let!(:bad_account) { Fabricate(:account, username: 'badguy666', domain: 'evil.org') }
diff --git a/spec/services/block_service_spec.rb b/spec/services/block_service_spec.rb
index 9e4ff8e598ab50..e72e5282598ce8 100644
--- a/spec/services/block_service_spec.rb
+++ b/spec/services/block_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe BlockService, type: :service do
+RSpec.describe BlockService do
   subject { described_class.new }
 
   let(:sender) { Fabricate(:account, username: 'alice') }
diff --git a/spec/services/bootstrap_timeline_service_spec.rb b/spec/services/bootstrap_timeline_service_spec.rb
index 721a0337fd3094..c99813bceba89f 100644
--- a/spec/services/bootstrap_timeline_service_spec.rb
+++ b/spec/services/bootstrap_timeline_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe BootstrapTimelineService, type: :service do
+RSpec.describe BootstrapTimelineService do
   subject { described_class.new }
 
   context 'when the new user has registered from an invite' do
diff --git a/spec/services/clear_domain_media_service_spec.rb b/spec/services/clear_domain_media_service_spec.rb
index 9766e62de8cd0d..f1e5097a99fec8 100644
--- a/spec/services/clear_domain_media_service_spec.rb
+++ b/spec/services/clear_domain_media_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe ClearDomainMediaService, type: :service do
+RSpec.describe ClearDomainMediaService do
   subject { described_class.new }
 
   let!(:bad_account) { Fabricate(:account, username: 'badguy666', domain: 'evil.org') }
diff --git a/spec/services/delete_account_service_spec.rb b/spec/services/delete_account_service_spec.rb
index 1965b7daabe2d3..de93862435afbe 100644
--- a/spec/services/delete_account_service_spec.rb
+++ b/spec/services/delete_account_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe DeleteAccountService, type: :service do
+RSpec.describe DeleteAccountService do
   shared_examples 'common behavior' do
     subject { described_class.new.call(account) }
 
diff --git a/spec/services/fan_out_on_write_service_spec.rb b/spec/services/fan_out_on_write_service_spec.rb
index 77237dffbddab7..b51d802a5b9ae2 100644
--- a/spec/services/fan_out_on_write_service_spec.rb
+++ b/spec/services/fan_out_on_write_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe FanOutOnWriteService, type: :service do
+RSpec.describe FanOutOnWriteService do
   subject { described_class.new }
 
   let(:last_active_at) { Time.now.utc }
diff --git a/spec/services/favourite_service_spec.rb b/spec/services/favourite_service_spec.rb
index 3143e7b669ad09..d0f1ff17c1ebd9 100644
--- a/spec/services/favourite_service_spec.rb
+++ b/spec/services/favourite_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe FavouriteService, type: :service do
+RSpec.describe FavouriteService do
   subject { described_class.new }
 
   let(:sender) { Fabricate(:account, username: 'alice') }
diff --git a/spec/services/fetch_link_card_service_spec.rb b/spec/services/fetch_link_card_service_spec.rb
index d8ca310b2824d9..63ebc3b978d0fb 100644
--- a/spec/services/fetch_link_card_service_spec.rb
+++ b/spec/services/fetch_link_card_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe FetchLinkCardService, type: :service do
+RSpec.describe FetchLinkCardService do
   subject { described_class.new }
 
   let(:html) { '<!doctype html><title>Hello world</title>' }
diff --git a/spec/services/fetch_oembed_service_spec.rb b/spec/services/fetch_oembed_service_spec.rb
index 777cbae3fbd1bf..c9f84048b615f4 100644
--- a/spec/services/fetch_oembed_service_spec.rb
+++ b/spec/services/fetch_oembed_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe FetchOEmbedService, type: :service do
+describe FetchOEmbedService do
   subject { described_class.new }
 
   before do
diff --git a/spec/services/fetch_remote_status_service_spec.rb b/spec/services/fetch_remote_status_service_spec.rb
index 798740c9b31023..a9c61e7b4e54e5 100644
--- a/spec/services/fetch_remote_status_service_spec.rb
+++ b/spec/services/fetch_remote_status_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe FetchRemoteStatusService, type: :service do
+RSpec.describe FetchRemoteStatusService do
   let(:account) { Fabricate(:account, domain: 'example.org', uri: 'https://example.org/foo') }
   let(:prefetched_body) { nil }
 
diff --git a/spec/services/fetch_resource_service_spec.rb b/spec/services/fetch_resource_service_spec.rb
index 78037a06ce4fdb..ee4810571bed95 100644
--- a/spec/services/fetch_resource_service_spec.rb
+++ b/spec/services/fetch_resource_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe FetchResourceService, type: :service do
+RSpec.describe FetchResourceService do
   describe '#call' do
     subject { described_class.new.call(url) }
 
diff --git a/spec/services/follow_service_spec.rb b/spec/services/follow_service_spec.rb
index cf4de34c89d52f..bea2412a3d36fe 100644
--- a/spec/services/follow_service_spec.rb
+++ b/spec/services/follow_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe FollowService, type: :service do
+RSpec.describe FollowService do
   subject { described_class.new }
 
   let(:sender) { Fabricate(:account, username: 'alice') }
diff --git a/spec/services/import_service_spec.rb b/spec/services/import_service_spec.rb
index 7d005c8a111d1f..90877d99975200 100644
--- a/spec/services/import_service_spec.rb
+++ b/spec/services/import_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe ImportService, :sidekiq_inline, type: :service do
+RSpec.describe ImportService, :sidekiq_inline do
   include RoutingHelper
 
   let!(:account) { Fabricate(:account, locked: false) }
diff --git a/spec/services/mute_service_spec.rb b/spec/services/mute_service_spec.rb
index a2ca2ffe135e02..681afc0b16ec39 100644
--- a/spec/services/mute_service_spec.rb
+++ b/spec/services/mute_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe MuteService, type: :service do
+RSpec.describe MuteService do
   subject { described_class.new.call(account, target_account) }
 
   let(:account) { Fabricate(:account) }
diff --git a/spec/services/notify_service_spec.rb b/spec/services/notify_service_spec.rb
index 57ff326c732c7c..514f634d7fde5d 100644
--- a/spec/services/notify_service_spec.rb
+++ b/spec/services/notify_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe NotifyService, type: :service do
+RSpec.describe NotifyService do
   subject { described_class.new.call(recipient, type, activity) }
 
   let(:user) { Fabricate(:user) }
diff --git a/spec/services/post_status_service_spec.rb b/spec/services/post_status_service_spec.rb
index acbebc5056b794..ee68092a36704e 100644
--- a/spec/services/post_status_service_spec.rb
+++ b/spec/services/post_status_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe PostStatusService, type: :service do
+RSpec.describe PostStatusService do
   subject { described_class.new }
 
   it 'creates a new status' do
diff --git a/spec/services/precompute_feed_service_spec.rb b/spec/services/precompute_feed_service_spec.rb
index 663babae8a9c02..9b2c6c280f3a4f 100644
--- a/spec/services/precompute_feed_service_spec.rb
+++ b/spec/services/precompute_feed_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe PrecomputeFeedService, type: :service do
+RSpec.describe PrecomputeFeedService do
   subject { described_class.new }
 
   describe 'call' do
diff --git a/spec/services/process_mentions_service_spec.rb b/spec/services/process_mentions_service_spec.rb
index 0db73c41fabdbb..2c202d3e57af18 100644
--- a/spec/services/process_mentions_service_spec.rb
+++ b/spec/services/process_mentions_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe ProcessMentionsService, type: :service do
+RSpec.describe ProcessMentionsService do
   subject { described_class.new }
 
   let(:account) { Fabricate(:account, username: 'alice') }
diff --git a/spec/services/purge_domain_service_spec.rb b/spec/services/purge_domain_service_spec.rb
index 6d8af14deb78c3..a5c49160db2396 100644
--- a/spec/services/purge_domain_service_spec.rb
+++ b/spec/services/purge_domain_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe PurgeDomainService, type: :service do
+RSpec.describe PurgeDomainService do
   subject { described_class.new }
 
   let(:domain) { 'obsolete.org' }
diff --git a/spec/services/reblog_service_spec.rb b/spec/services/reblog_service_spec.rb
index e5d0a2d6ced999..f807536a2e0d36 100644
--- a/spec/services/reblog_service_spec.rb
+++ b/spec/services/reblog_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe ReblogService, type: :service do
+RSpec.describe ReblogService do
   let(:alice)  { Fabricate(:account, username: 'alice') }
 
   context 'when creates a reblog with appropriate visibility' do
diff --git a/spec/services/reject_follow_service_spec.rb b/spec/services/reject_follow_service_spec.rb
index 48316a6c4d9573..98aaf70478539b 100644
--- a/spec/services/reject_follow_service_spec.rb
+++ b/spec/services/reject_follow_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe RejectFollowService, type: :service do
+RSpec.describe RejectFollowService do
   subject { described_class.new }
 
   let(:sender) { Fabricate(:account, username: 'alice') }
diff --git a/spec/services/remove_from_followers_service_spec.rb b/spec/services/remove_from_followers_service_spec.rb
index 21da38a97bd208..d6420f76742dfe 100644
--- a/spec/services/remove_from_followers_service_spec.rb
+++ b/spec/services/remove_from_followers_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe RemoveFromFollowersService, type: :service do
+RSpec.describe RemoveFromFollowersService do
   subject { described_class.new }
 
   let(:bob) { Fabricate(:account, username: 'bob') }
diff --git a/spec/services/remove_status_service_spec.rb b/spec/services/remove_status_service_spec.rb
index 109acfb09a72bd..b385cfa55be775 100644
--- a/spec/services/remove_status_service_spec.rb
+++ b/spec/services/remove_status_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe RemoveStatusService, :sidekiq_inline, type: :service do
+RSpec.describe RemoveStatusService, :sidekiq_inline do
   subject { described_class.new }
 
   let!(:alice)  { Fabricate(:account) }
diff --git a/spec/services/report_service_spec.rb b/spec/services/report_service_spec.rb
index 2caeb189d99551..141dc8c3be5623 100644
--- a/spec/services/report_service_spec.rb
+++ b/spec/services/report_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe ReportService, type: :service do
+RSpec.describe ReportService do
   subject { described_class.new }
 
   let(:source_account) { Fabricate(:account) }
diff --git a/spec/services/resolve_account_service_spec.rb b/spec/services/resolve_account_service_spec.rb
index b82e5b3865a6cb..316266c8f8e539 100644
--- a/spec/services/resolve_account_service_spec.rb
+++ b/spec/services/resolve_account_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe ResolveAccountService, type: :service do
+RSpec.describe ResolveAccountService do
   subject { described_class.new }
 
   before do
diff --git a/spec/services/resolve_url_service_spec.rb b/spec/services/resolve_url_service_spec.rb
index 5270cc10dd8f12..3d59a55f105855 100644
--- a/spec/services/resolve_url_service_spec.rb
+++ b/spec/services/resolve_url_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe ResolveURLService, type: :service do
+describe ResolveURLService do
   subject { described_class.new }
 
   describe '#call' do
diff --git a/spec/services/search_service_spec.rb b/spec/services/search_service_spec.rb
index 39adf43876d7a3..394ee7c3a660e7 100644
--- a/spec/services/search_service_spec.rb
+++ b/spec/services/search_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe SearchService, type: :service do
+describe SearchService do
   subject { described_class.new }
 
   describe '#call' do
diff --git a/spec/services/software_update_check_service_spec.rb b/spec/services/software_update_check_service_spec.rb
index c8821348ac237f..a1eb9d86e96a59 100644
--- a/spec/services/software_update_check_service_spec.rb
+++ b/spec/services/software_update_check_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe SoftwareUpdateCheckService, type: :service do
+RSpec.describe SoftwareUpdateCheckService do
   subject { described_class.new }
 
   shared_examples 'when the feature is enabled' do
diff --git a/spec/services/suspend_account_service_spec.rb b/spec/services/suspend_account_service_spec.rb
index 4a5f8a0b6b3d8e..d62f7ef0d60943 100644
--- a/spec/services/suspend_account_service_spec.rb
+++ b/spec/services/suspend_account_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe SuspendAccountService, :sidekiq_inline, type: :service do
+RSpec.describe SuspendAccountService, :sidekiq_inline do
   shared_examples 'common behavior' do
     subject { described_class.new.call(account) }
 
diff --git a/spec/services/translate_status_service_spec.rb b/spec/services/translate_status_service_spec.rb
index 5f6418f5d6f61f..0779fbbe6c52bc 100644
--- a/spec/services/translate_status_service_spec.rb
+++ b/spec/services/translate_status_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe TranslateStatusService, type: :service do
+RSpec.describe TranslateStatusService do
   subject(:service) { described_class.new }
 
   let(:status) { Fabricate(:status, text: text, spoiler_text: spoiler_text, language: 'en', preloadable_poll: poll, media_attachments: media_attachments) }
diff --git a/spec/services/unallow_domain_service_spec.rb b/spec/services/unallow_domain_service_spec.rb
index 383977d352a795..caec3d596ff144 100644
--- a/spec/services/unallow_domain_service_spec.rb
+++ b/spec/services/unallow_domain_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe UnallowDomainService, type: :service do
+RSpec.describe UnallowDomainService do
   subject { described_class.new }
 
   let(:bad_domain) { 'evil.org' }
diff --git a/spec/services/unblock_domain_service_spec.rb b/spec/services/unblock_domain_service_spec.rb
index 3d6d82ff6823da..289ddfc218bcaa 100644
--- a/spec/services/unblock_domain_service_spec.rb
+++ b/spec/services/unblock_domain_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe UnblockDomainService, type: :service do
+describe UnblockDomainService do
   subject { described_class.new }
 
   describe 'call' do
diff --git a/spec/services/unblock_service_spec.rb b/spec/services/unblock_service_spec.rb
index 9813c5e7fae087..4c9fcb9aeecdd0 100644
--- a/spec/services/unblock_service_spec.rb
+++ b/spec/services/unblock_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe UnblockService, type: :service do
+RSpec.describe UnblockService do
   subject { described_class.new }
 
   let(:sender) { Fabricate(:account, username: 'alice') }
diff --git a/spec/services/unfollow_service_spec.rb b/spec/services/unfollow_service_spec.rb
index 18a25a676ddaec..bba17a8d2709a2 100644
--- a/spec/services/unfollow_service_spec.rb
+++ b/spec/services/unfollow_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe UnfollowService, type: :service do
+RSpec.describe UnfollowService do
   subject { described_class.new }
 
   let(:sender) { Fabricate(:account, username: 'alice') }
diff --git a/spec/services/unsuspend_account_service_spec.rb b/spec/services/unsuspend_account_service_spec.rb
index c848767cd1017e..79a4441d3ec9ef 100644
--- a/spec/services/unsuspend_account_service_spec.rb
+++ b/spec/services/unsuspend_account_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe UnsuspendAccountService, type: :service do
+RSpec.describe UnsuspendAccountService do
   shared_context 'with common context' do
     subject { described_class.new.call(account) }
 
diff --git a/spec/services/update_account_service_spec.rb b/spec/services/update_account_service_spec.rb
index 9f4e36862d3f9c..5204f1f34d469d 100644
--- a/spec/services/update_account_service_spec.rb
+++ b/spec/services/update_account_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe UpdateAccountService, type: :service do
+RSpec.describe UpdateAccountService do
   subject { described_class.new }
 
   describe 'switching form locked to unlocked accounts', :sidekiq_inline do
diff --git a/spec/services/update_status_service_spec.rb b/spec/services/update_status_service_spec.rb
index 55651c305d7df8..930f673e10a75c 100644
--- a/spec/services/update_status_service_spec.rb
+++ b/spec/services/update_status_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe UpdateStatusService, type: :service do
+RSpec.describe UpdateStatusService do
   subject { described_class.new }
 
   context 'when nothing changes' do
diff --git a/spec/services/verify_link_service_spec.rb b/spec/services/verify_link_service_spec.rb
index 28950724208013..0ce8c9a9041727 100644
--- a/spec/services/verify_link_service_spec.rb
+++ b/spec/services/verify_link_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe VerifyLinkService, type: :service do
+RSpec.describe VerifyLinkService do
   subject { described_class.new }
 
   context 'when given a local account' do

From 8349b45d6038c4d029b6371ea1caa40c48a8ea3b Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 13 Mar 2024 04:46:11 -0400
Subject: [PATCH 0412/2191] Accept extra args that we wont verify in
 `ap/activity/add_spec` (#29005)

---
 spec/lib/activitypub/activity/add_spec.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/lib/activitypub/activity/add_spec.rb b/spec/lib/activitypub/activity/add_spec.rb
index ec6df0171666df..c0abd9f39376d4 100644
--- a/spec/lib/activitypub/activity/add_spec.rb
+++ b/spec/lib/activitypub/activity/add_spec.rb
@@ -50,7 +50,7 @@
         end
 
         it 'fetches the status and pins it' do
-          allow(service_stub).to receive(:call) do |uri, id: true, on_behalf_of: nil, request_id: nil| # rubocop:disable Lint/UnusedBlockArgument
+          allow(service_stub).to receive(:call) do |uri, id: true, on_behalf_of: nil, **|
             expect(uri).to eq 'https://example.com/unknown'
             expect(id).to be true
             expect(on_behalf_of&.following?(sender)).to be true
@@ -64,7 +64,7 @@
 
       context 'when there is no local follower' do
         it 'tries to fetch the status' do
-          allow(service_stub).to receive(:call) do |uri, id: true, on_behalf_of: nil, request_id: nil| # rubocop:disable Lint/UnusedBlockArgument
+          allow(service_stub).to receive(:call) do |uri, id: true, on_behalf_of: nil, **|
             expect(uri).to eq 'https://example.com/unknown'
             expect(id).to be true
             expect(on_behalf_of).to be_nil

From 71eecbfa1fa5a8c2a06d232260ac9d3a4bd77ddb Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 13 Mar 2024 04:47:09 -0400
Subject: [PATCH 0413/2191] Move `api/v2/filters/*` to request spec (#28956)

---
 .../api/v2/filters/keywords_spec.rb}          | 31 ++++++++-----------
 .../api/v2/filters/statuses_spec.rb}          | 25 ++++++---------
 2 files changed, 23 insertions(+), 33 deletions(-)
 rename spec/{controllers/api/v2/filters/keywords_controller_spec.rb => requests/api/v2/filters/keywords_spec.rb} (79%)
 rename spec/{controllers/api/v2/filters/statuses_controller_spec.rb => requests/api/v2/filters/statuses_spec.rb} (81%)

diff --git a/spec/controllers/api/v2/filters/keywords_controller_spec.rb b/spec/requests/api/v2/filters/keywords_spec.rb
similarity index 79%
rename from spec/controllers/api/v2/filters/keywords_controller_spec.rb
rename to spec/requests/api/v2/filters/keywords_spec.rb
index 9f25237bcf1459..55fb2afd955e70 100644
--- a/spec/controllers/api/v2/filters/keywords_controller_spec.rb
+++ b/spec/requests/api/v2/filters/keywords_spec.rb
@@ -2,25 +2,20 @@
 
 require 'rails_helper'
 
-RSpec.describe Api::V2::Filters::KeywordsController do
-  render_views
-
+RSpec.describe 'API V2 Filters Keywords' do
   let(:user)         { Fabricate(:user) }
   let(:token)        { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
   let(:filter)       { Fabricate(:custom_filter, account: user.account) }
   let(:other_user)   { Fabricate(:user) }
   let(:other_filter) { Fabricate(:custom_filter, account: other_user.account) }
+  let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
 
-  before do
-    allow(controller).to receive(:doorkeeper_token) { token }
-  end
-
-  describe 'GET #index' do
+  describe 'GET /api/v2/filters/:filter_id/keywords' do
     let(:scopes) { 'read:filters' }
     let!(:keyword) { Fabricate(:custom_filter_keyword, custom_filter: filter) }
 
     it 'returns http success' do
-      get :index, params: { filter_id: filter.id }
+      get "/api/v2/filters/#{filter.id}/keywords", headers: headers
       expect(response).to have_http_status(200)
       expect(body_as_json)
         .to contain_exactly(
@@ -30,18 +25,18 @@
 
     context "when trying to access another's user filters" do
       it 'returns http not found' do
-        get :index, params: { filter_id: other_filter.id }
+        get "/api/v2/filters/#{other_filter.id}/keywords", headers: headers
         expect(response).to have_http_status(404)
       end
     end
   end
 
-  describe 'POST #create' do
+  describe 'POST /api/v2/filters/:filter_id/keywords' do
     let(:scopes)    { 'write:filters' }
     let(:filter_id) { filter.id }
 
     before do
-      post :create, params: { filter_id: filter_id, keyword: 'magic', whole_word: false }
+      post "/api/v2/filters/#{filter_id}/keywords", headers: headers, params: { keyword: 'magic', whole_word: false }
     end
 
     it 'creates a filter', :aggregate_failures do
@@ -65,12 +60,12 @@
     end
   end
 
-  describe 'GET #show' do
+  describe 'GET /api/v2/filters/keywords/:id' do
     let(:scopes)  { 'read:filters' }
     let(:keyword) { Fabricate(:custom_filter_keyword, keyword: 'foo', whole_word: false, custom_filter: filter) }
 
     before do
-      get :show, params: { id: keyword.id }
+      get "/api/v2/filters/keywords/#{keyword.id}", headers: headers
     end
 
     it 'responds with the keyword', :aggregate_failures do
@@ -90,12 +85,12 @@
     end
   end
 
-  describe 'PUT #update' do
+  describe 'PUT /api/v2/filters/keywords/:id' do
     let(:scopes)  { 'write:filters' }
     let(:keyword) { Fabricate(:custom_filter_keyword, custom_filter: filter) }
 
     before do
-      get :update, params: { id: keyword.id, keyword: 'updated' }
+      put "/api/v2/filters/keywords/#{keyword.id}", headers: headers, params: { keyword: 'updated' }
     end
 
     it 'updates the keyword', :aggregate_failures do
@@ -113,12 +108,12 @@
     end
   end
 
-  describe 'DELETE #destroy' do
+  describe 'DELETE /api/v2/filters/keywords/:id' do
     let(:scopes)  { 'write:filters' }
     let(:keyword) { Fabricate(:custom_filter_keyword, custom_filter: filter) }
 
     before do
-      delete :destroy, params: { id: keyword.id }
+      delete "/api/v2/filters/keywords/#{keyword.id}", headers: headers
     end
 
     it 'destroys the keyword', :aggregate_failures do
diff --git a/spec/controllers/api/v2/filters/statuses_controller_spec.rb b/spec/requests/api/v2/filters/statuses_spec.rb
similarity index 81%
rename from spec/controllers/api/v2/filters/statuses_controller_spec.rb
rename to spec/requests/api/v2/filters/statuses_spec.rb
index d9df803971b789..26d2fb00e13fe9 100644
--- a/spec/controllers/api/v2/filters/statuses_controller_spec.rb
+++ b/spec/requests/api/v2/filters/statuses_spec.rb
@@ -2,25 +2,20 @@
 
 require 'rails_helper'
 
-RSpec.describe Api::V2::Filters::StatusesController do
-  render_views
-
+RSpec.describe 'API V2 Filters Statuses' do
   let(:user)         { Fabricate(:user) }
   let(:token)        { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
   let(:filter)       { Fabricate(:custom_filter, account: user.account) }
   let(:other_user)   { Fabricate(:user) }
   let(:other_filter) { Fabricate(:custom_filter, account: other_user.account) }
+  let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
 
-  before do
-    allow(controller).to receive(:doorkeeper_token) { token }
-  end
-
-  describe 'GET #index' do
+  describe 'GET /api/v2/filters/:filter_id/statuses' do
     let(:scopes) { 'read:filters' }
     let!(:status_filter) { Fabricate(:custom_filter_status, custom_filter: filter) }
 
     it 'returns http success' do
-      get :index, params: { filter_id: filter.id }
+      get "/api/v2/filters/#{filter.id}/statuses", headers: headers
       expect(response).to have_http_status(200)
       expect(body_as_json)
         .to contain_exactly(
@@ -30,7 +25,7 @@
 
     context "when trying to access another's user filters" do
       it 'returns http not found' do
-        get :index, params: { filter_id: other_filter.id }
+        get "/api/v2/filters/#{other_filter.id}/statuses", headers: headers
         expect(response).to have_http_status(404)
       end
     end
@@ -42,7 +37,7 @@
     let!(:status)   { Fabricate(:status) }
 
     before do
-      post :create, params: { filter_id: filter_id, status_id: status.id }
+      post "/api/v2/filters/#{filter_id}/statuses", headers: headers, params: { status_id: status.id }
     end
 
     it 'creates a filter', :aggregate_failures do
@@ -65,12 +60,12 @@
     end
   end
 
-  describe 'GET #show' do
+  describe 'GET /api/v2/filters/statuses/:id' do
     let(:scopes) { 'read:filters' }
     let!(:status_filter) { Fabricate(:custom_filter_status, custom_filter: filter) }
 
     before do
-      get :show, params: { id: status_filter.id }
+      get "/api/v2/filters/statuses/#{status_filter.id}", headers: headers
     end
 
     it 'responds with the filter', :aggregate_failures do
@@ -89,12 +84,12 @@
     end
   end
 
-  describe 'DELETE #destroy' do
+  describe 'DELETE /api/v2/filters/statuses/:id' do
     let(:scopes) { 'write:filters' }
     let(:status_filter) { Fabricate(:custom_filter_status, custom_filter: filter) }
 
     before do
-      delete :destroy, params: { id: status_filter.id }
+      delete "/api/v2/filters/statuses/#{status_filter.id}", headers: headers
     end
 
     it 'destroys the filter', :aggregate_failures do

From 01b624c4a0d17ec24f6acf56298fe9e5e8a6dd49 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 13 Mar 2024 04:50:21 -0400
Subject: [PATCH 0414/2191] Use `normalizes` on `CustomFilter#context` value
 (#27602)

---
 app/models/custom_filter.rb       | 6 +-----
 spec/models/custom_filter_spec.rb | 8 ++++++++
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/models/custom_filter.rb b/app/models/custom_filter.rb
index 5e2d152e34895e..7c148e877ff198 100644
--- a/app/models/custom_filter.rb
+++ b/app/models/custom_filter.rb
@@ -41,7 +41,7 @@ class CustomFilter < ApplicationRecord
   validates :title, :context, presence: true
   validate :context_must_be_valid
 
-  before_validation :clean_up_contexts
+  normalizes :context, with: ->(context) { context.map(&:strip).filter_map(&:presence) }
 
   before_save :prepare_cache_invalidation!
   before_destroy :prepare_cache_invalidation!
@@ -114,10 +114,6 @@ def invalidate_cache!
 
   private
 
-  def clean_up_contexts
-    self.context = Array(context).map(&:strip).filter_map(&:presence)
-  end
-
   def context_must_be_valid
     errors.add(:context, I18n.t('filters.errors.invalid_context')) if invalid_context_value?
   end
diff --git a/spec/models/custom_filter_spec.rb b/spec/models/custom_filter_spec.rb
index 94049363373098..8ac9dbb896434e 100644
--- a/spec/models/custom_filter_spec.rb
+++ b/spec/models/custom_filter_spec.rb
@@ -32,4 +32,12 @@
       expect(record).to model_have_error_on_field(:context)
     end
   end
+
+  describe 'Normalizations' do
+    it 'cleans up context values' do
+      record = described_class.new(context: ['home', 'notifications', 'public    ', ''])
+
+      expect(record.context).to eq(%w(home notifications public))
+    end
+  end
 end

From 9754967d5fd37cf35b362d4429d320c1e5f94428 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 13 Mar 2024 04:51:44 -0400
Subject: [PATCH 0415/2191] Move `pagination_max_id` and `pagination_since_id`
 into api/base controller (#28844)

---
 app/controllers/api/base_controller.rb                    | 8 ++++++++
 app/controllers/api/v1/accounts/statuses_controller.rb    | 8 ++------
 app/controllers/api/v1/admin/accounts_controller.rb       | 8 ++------
 .../api/v1/admin/canonical_email_blocks_controller.rb     | 8 ++------
 app/controllers/api/v1/admin/domain_allows_controller.rb  | 8 ++------
 app/controllers/api/v1/admin/domain_blocks_controller.rb  | 8 ++------
 .../api/v1/admin/email_domain_blocks_controller.rb        | 8 ++------
 app/controllers/api/v1/admin/ip_blocks_controller.rb      | 8 ++------
 app/controllers/api/v1/admin/reports_controller.rb        | 8 ++------
 app/controllers/api/v1/admin/tags_controller.rb           | 8 ++------
 .../trends/links/preview_card_providers_controller.rb     | 8 ++------
 app/controllers/api/v1/blocks_controller.rb               | 8 ++------
 app/controllers/api/v1/bookmarks_controller.rb            | 8 ++------
 .../api/v1/crypto/encrypted_messages_controller.rb        | 8 ++------
 app/controllers/api/v1/domain_blocks_controller.rb        | 8 ++------
 app/controllers/api/v1/endorsements_controller.rb         | 8 ++------
 app/controllers/api/v1/favourites_controller.rb           | 8 ++------
 app/controllers/api/v1/followed_tags_controller.rb        | 8 ++------
 app/controllers/api/v1/lists/accounts_controller.rb       | 8 ++------
 app/controllers/api/v1/mutes_controller.rb                | 8 ++------
 app/controllers/api/v1/notifications_controller.rb        | 8 ++------
 app/controllers/api/v1/scheduled_statuses_controller.rb   | 8 ++------
 app/controllers/api/v1/timelines/base_controller.rb       | 8 ++------
 23 files changed, 52 insertions(+), 132 deletions(-)

diff --git a/app/controllers/api/base_controller.rb b/app/controllers/api/base_controller.rb
index 98fa1897ef0f6e..8bf9da2cfd2371 100644
--- a/app/controllers/api/base_controller.rb
+++ b/app/controllers/api/base_controller.rb
@@ -73,6 +73,14 @@ def doorkeeper_forbidden_render_options(*)
 
   protected
 
+  def pagination_max_id
+    pagination_collection.last.id
+  end
+
+  def pagination_since_id
+    pagination_collection.first.id
+  end
+
   def set_pagination_headers(next_path = nil, prev_path = nil)
     links = []
     links << [next_path, [%w(rel next)]] if next_path
diff --git a/app/controllers/api/v1/accounts/statuses_controller.rb b/app/controllers/api/v1/accounts/statuses_controller.rb
index 6a994ff5419ae2..56d4e6909113fd 100644
--- a/app/controllers/api/v1/accounts/statuses_controller.rb
+++ b/app/controllers/api/v1/accounts/statuses_controller.rb
@@ -51,11 +51,7 @@ def records_continue?
     @statuses.size == limit_param(DEFAULT_STATUSES_LIMIT)
   end
 
-  def pagination_max_id
-    @statuses.last.id
-  end
-
-  def pagination_since_id
-    @statuses.first.id
+  def pagination_collection
+    @statuses
   end
 end
diff --git a/app/controllers/api/v1/admin/accounts_controller.rb b/app/controllers/api/v1/admin/accounts_controller.rb
index ff9cae63989d6e..06cebffcb6a6e7 100644
--- a/app/controllers/api/v1/admin/accounts_controller.rb
+++ b/app/controllers/api/v1/admin/accounts_controller.rb
@@ -137,12 +137,8 @@ def prev_path
     api_v1_admin_accounts_url(pagination_params(min_id: pagination_since_id)) unless @accounts.empty?
   end
 
-  def pagination_max_id
-    @accounts.last.id
-  end
-
-  def pagination_since_id
-    @accounts.first.id
+  def pagination_collection
+    @accounts
   end
 
   def records_continue?
diff --git a/app/controllers/api/v1/admin/canonical_email_blocks_controller.rb b/app/controllers/api/v1/admin/canonical_email_blocks_controller.rb
index 7b192b979fd493..f81e480bd76d17 100644
--- a/app/controllers/api/v1/admin/canonical_email_blocks_controller.rb
+++ b/app/controllers/api/v1/admin/canonical_email_blocks_controller.rb
@@ -77,12 +77,8 @@ def prev_path
     api_v1_admin_canonical_email_blocks_url(pagination_params(min_id: pagination_since_id)) unless @canonical_email_blocks.empty?
   end
 
-  def pagination_max_id
-    @canonical_email_blocks.last.id
-  end
-
-  def pagination_since_id
-    @canonical_email_blocks.first.id
+  def pagination_collection
+    @canonical_email_blocks
   end
 
   def records_continue?
diff --git a/app/controllers/api/v1/admin/domain_allows_controller.rb b/app/controllers/api/v1/admin/domain_allows_controller.rb
index dd54d6710660dc..18412928437232 100644
--- a/app/controllers/api/v1/admin/domain_allows_controller.rb
+++ b/app/controllers/api/v1/admin/domain_allows_controller.rb
@@ -73,12 +73,8 @@ def prev_path
     api_v1_admin_domain_allows_url(pagination_params(min_id: pagination_since_id)) unless @domain_allows.empty?
   end
 
-  def pagination_max_id
-    @domain_allows.last.id
-  end
-
-  def pagination_since_id
-    @domain_allows.first.id
+  def pagination_collection
+    @domain_allows
   end
 
   def records_continue?
diff --git a/app/controllers/api/v1/admin/domain_blocks_controller.rb b/app/controllers/api/v1/admin/domain_blocks_controller.rb
index 2538c7c7c2a48b..8cd90b7c527bbf 100644
--- a/app/controllers/api/v1/admin/domain_blocks_controller.rb
+++ b/app/controllers/api/v1/admin/domain_blocks_controller.rb
@@ -84,12 +84,8 @@ def prev_path
     api_v1_admin_domain_blocks_url(pagination_params(min_id: pagination_since_id)) unless @domain_blocks.empty?
   end
 
-  def pagination_max_id
-    @domain_blocks.last.id
-  end
-
-  def pagination_since_id
-    @domain_blocks.first.id
+  def pagination_collection
+    @domain_blocks
   end
 
   def records_continue?
diff --git a/app/controllers/api/v1/admin/email_domain_blocks_controller.rb b/app/controllers/api/v1/admin/email_domain_blocks_controller.rb
index df54b9f0a404d1..34489e19b49646 100644
--- a/app/controllers/api/v1/admin/email_domain_blocks_controller.rb
+++ b/app/controllers/api/v1/admin/email_domain_blocks_controller.rb
@@ -70,12 +70,8 @@ def prev_path
     api_v1_admin_email_domain_blocks_url(pagination_params(min_id: pagination_since_id)) unless @email_domain_blocks.empty?
   end
 
-  def pagination_max_id
-    @email_domain_blocks.last.id
-  end
-
-  def pagination_since_id
-    @email_domain_blocks.first.id
+  def pagination_collection
+    @email_domain_blocks
   end
 
   def records_continue?
diff --git a/app/controllers/api/v1/admin/ip_blocks_controller.rb b/app/controllers/api/v1/admin/ip_blocks_controller.rb
index 61c1912344f9a9..0f666476c59da3 100644
--- a/app/controllers/api/v1/admin/ip_blocks_controller.rb
+++ b/app/controllers/api/v1/admin/ip_blocks_controller.rb
@@ -75,12 +75,8 @@ def prev_path
     api_v1_admin_ip_blocks_url(pagination_params(min_id: pagination_since_id)) unless @ip_blocks.empty?
   end
 
-  def pagination_max_id
-    @ip_blocks.last.id
-  end
-
-  def pagination_since_id
-    @ip_blocks.first.id
+  def pagination_collection
+    @ip_blocks
   end
 
   def records_continue?
diff --git a/app/controllers/api/v1/admin/reports_controller.rb b/app/controllers/api/v1/admin/reports_controller.rb
index 7129a5f6ca30fc..f0598aa81ef750 100644
--- a/app/controllers/api/v1/admin/reports_controller.rb
+++ b/app/controllers/api/v1/admin/reports_controller.rb
@@ -101,12 +101,8 @@ def prev_path
     api_v1_admin_reports_url(pagination_params(min_id: pagination_since_id)) unless @reports.empty?
   end
 
-  def pagination_max_id
-    @reports.last.id
-  end
-
-  def pagination_since_id
-    @reports.first.id
+  def pagination_collection
+    @reports
   end
 
   def records_continue?
diff --git a/app/controllers/api/v1/admin/tags_controller.rb b/app/controllers/api/v1/admin/tags_controller.rb
index 6a7c9f5bf3e297..989e7e610ae076 100644
--- a/app/controllers/api/v1/admin/tags_controller.rb
+++ b/app/controllers/api/v1/admin/tags_controller.rb
@@ -56,12 +56,8 @@ def prev_path
     api_v1_admin_tags_url(pagination_params(min_id: pagination_since_id)) unless @tags.empty?
   end
 
-  def pagination_max_id
-    @tags.last.id
-  end
-
-  def pagination_since_id
-    @tags.first.id
+  def pagination_collection
+    @tags
   end
 
   def records_continue?
diff --git a/app/controllers/api/v1/admin/trends/links/preview_card_providers_controller.rb b/app/controllers/api/v1/admin/trends/links/preview_card_providers_controller.rb
index 5d9fcc82c0ff99..7ab7e6bd048779 100644
--- a/app/controllers/api/v1/admin/trends/links/preview_card_providers_controller.rb
+++ b/app/controllers/api/v1/admin/trends/links/preview_card_providers_controller.rb
@@ -54,12 +54,8 @@ def prev_path
     api_v1_admin_trends_links_preview_card_providers_url(pagination_params(min_id: pagination_since_id)) unless @providers.empty?
   end
 
-  def pagination_max_id
-    @providers.last.id
-  end
-
-  def pagination_since_id
-    @providers.first.id
+  def pagination_collection
+    @providers
   end
 
   def records_continue?
diff --git a/app/controllers/api/v1/blocks_controller.rb b/app/controllers/api/v1/blocks_controller.rb
index 0934622f88446a..7826a3c6813bc1 100644
--- a/app/controllers/api/v1/blocks_controller.rb
+++ b/app/controllers/api/v1/blocks_controller.rb
@@ -40,12 +40,8 @@ def prev_path
     api_v1_blocks_url pagination_params(since_id: pagination_since_id) unless paginated_blocks.empty?
   end
 
-  def pagination_max_id
-    paginated_blocks.last.id
-  end
-
-  def pagination_since_id
-    paginated_blocks.first.id
+  def pagination_collection
+    paginated_blocks
   end
 
   def records_continue?
diff --git a/app/controllers/api/v1/bookmarks_controller.rb b/app/controllers/api/v1/bookmarks_controller.rb
index 498eb16f44ca20..08d3cf8344fb46 100644
--- a/app/controllers/api/v1/bookmarks_controller.rb
+++ b/app/controllers/api/v1/bookmarks_controller.rb
@@ -43,12 +43,8 @@ def prev_path
     api_v1_bookmarks_url pagination_params(min_id: pagination_since_id) unless results.empty?
   end
 
-  def pagination_max_id
-    results.last.id
-  end
-
-  def pagination_since_id
-    results.first.id
+  def pagination_collection
+    results
   end
 
   def records_continue?
diff --git a/app/controllers/api/v1/crypto/encrypted_messages_controller.rb b/app/controllers/api/v1/crypto/encrypted_messages_controller.rb
index 68cf4384f79bd0..c70ae46d1818f7 100644
--- a/app/controllers/api/v1/crypto/encrypted_messages_controller.rb
+++ b/app/controllers/api/v1/crypto/encrypted_messages_controller.rb
@@ -41,12 +41,8 @@ def prev_path
     api_v1_crypto_encrypted_messages_url pagination_params(min_id: pagination_since_id) unless @encrypted_messages.empty?
   end
 
-  def pagination_max_id
-    @encrypted_messages.last.id
-  end
-
-  def pagination_since_id
-    @encrypted_messages.first.id
+  def pagination_collection
+    @encrypted_messages
   end
 
   def records_continue?
diff --git a/app/controllers/api/v1/domain_blocks_controller.rb b/app/controllers/api/v1/domain_blocks_controller.rb
index 34def3c44a80d2..5774c4d1c70e45 100644
--- a/app/controllers/api/v1/domain_blocks_controller.rb
+++ b/app/controllers/api/v1/domain_blocks_controller.rb
@@ -50,12 +50,8 @@ def prev_path
     api_v1_domain_blocks_url pagination_params(since_id: pagination_since_id) unless @blocks.empty?
   end
 
-  def pagination_max_id
-    @blocks.last.id
-  end
-
-  def pagination_since_id
-    @blocks.first.id
+  def pagination_collection
+    @blocks
   end
 
   def records_continue?
diff --git a/app/controllers/api/v1/endorsements_controller.rb b/app/controllers/api/v1/endorsements_controller.rb
index 2216a9860d9efb..449a9ac245cac5 100644
--- a/app/controllers/api/v1/endorsements_controller.rb
+++ b/app/controllers/api/v1/endorsements_controller.rb
@@ -44,12 +44,8 @@ def prev_path
     api_v1_endorsements_url pagination_params(since_id: pagination_since_id) unless @accounts.empty?
   end
 
-  def pagination_max_id
-    @accounts.last.id
-  end
-
-  def pagination_since_id
-    @accounts.first.id
+  def pagination_collection
+    @accounts
   end
 
   def records_continue?
diff --git a/app/controllers/api/v1/favourites_controller.rb b/app/controllers/api/v1/favourites_controller.rb
index faf1bda96ad074..85e46b1166a77c 100644
--- a/app/controllers/api/v1/favourites_controller.rb
+++ b/app/controllers/api/v1/favourites_controller.rb
@@ -43,12 +43,8 @@ def prev_path
     api_v1_favourites_url pagination_params(min_id: pagination_since_id) unless results.empty?
   end
 
-  def pagination_max_id
-    results.last.id
-  end
-
-  def pagination_since_id
-    results.first.id
+  def pagination_collection
+    results
   end
 
   def records_continue?
diff --git a/app/controllers/api/v1/followed_tags_controller.rb b/app/controllers/api/v1/followed_tags_controller.rb
index eae2bdc0101091..0ea4a95ef56957 100644
--- a/app/controllers/api/v1/followed_tags_controller.rb
+++ b/app/controllers/api/v1/followed_tags_controller.rb
@@ -34,12 +34,8 @@ def prev_path
     api_v1_followed_tags_url pagination_params(since_id: pagination_since_id) unless @results.empty?
   end
 
-  def pagination_max_id
-    @results.last.id
-  end
-
-  def pagination_since_id
-    @results.first.id
+  def pagination_collection
+    @results
   end
 
   def records_continue?
diff --git a/app/controllers/api/v1/lists/accounts_controller.rb b/app/controllers/api/v1/lists/accounts_controller.rb
index 0604ad60fc4635..5ae74bf04d8142 100644
--- a/app/controllers/api/v1/lists/accounts_controller.rb
+++ b/app/controllers/api/v1/lists/accounts_controller.rb
@@ -71,12 +71,8 @@ def prev_path
     api_v1_list_accounts_url pagination_params(since_id: pagination_since_id) unless @accounts.empty?
   end
 
-  def pagination_max_id
-    @accounts.last.id
-  end
-
-  def pagination_since_id
-    @accounts.first.id
+  def pagination_collection
+    @accounts
   end
 
   def records_continue?
diff --git a/app/controllers/api/v1/mutes_controller.rb b/app/controllers/api/v1/mutes_controller.rb
index 2fb685ac397a8d..9542d96110052d 100644
--- a/app/controllers/api/v1/mutes_controller.rb
+++ b/app/controllers/api/v1/mutes_controller.rb
@@ -40,12 +40,8 @@ def prev_path
     api_v1_mutes_url pagination_params(since_id: pagination_since_id) unless paginated_mutes.empty?
   end
 
-  def pagination_max_id
-    paginated_mutes.last.id
-  end
-
-  def pagination_since_id
-    paginated_mutes.first.id
+  def pagination_collection
+    paginated_mutes
   end
 
   def records_continue?
diff --git a/app/controllers/api/v1/notifications_controller.rb b/app/controllers/api/v1/notifications_controller.rb
index 52280ef6072536..777740751f4308 100644
--- a/app/controllers/api/v1/notifications_controller.rb
+++ b/app/controllers/api/v1/notifications_controller.rb
@@ -70,12 +70,8 @@ def prev_path
     api_v1_notifications_url pagination_params(min_id: pagination_since_id) unless @notifications.empty?
   end
 
-  def pagination_max_id
-    @notifications.last.id
-  end
-
-  def pagination_since_id
-    @notifications.first.id
+  def pagination_collection
+    @notifications
   end
 
   def browserable_params
diff --git a/app/controllers/api/v1/scheduled_statuses_controller.rb b/app/controllers/api/v1/scheduled_statuses_controller.rb
index 2220b6d22e44d8..f6c0703833a7f6 100644
--- a/app/controllers/api/v1/scheduled_statuses_controller.rb
+++ b/app/controllers/api/v1/scheduled_statuses_controller.rb
@@ -63,11 +63,7 @@ def records_continue?
     @statuses.size == limit_param(DEFAULT_STATUSES_LIMIT)
   end
 
-  def pagination_max_id
-    @statuses.last.id
-  end
-
-  def pagination_since_id
-    @statuses.first.id
+  def pagination_collection
+    @statuses
   end
 end
diff --git a/app/controllers/api/v1/timelines/base_controller.rb b/app/controllers/api/v1/timelines/base_controller.rb
index 173e173cc9e0b5..7735cf1dc08706 100644
--- a/app/controllers/api/v1/timelines/base_controller.rb
+++ b/app/controllers/api/v1/timelines/base_controller.rb
@@ -9,12 +9,8 @@ def insert_pagination_headers
     set_pagination_headers(next_path, prev_path)
   end
 
-  def pagination_max_id
-    @statuses.last.id
-  end
-
-  def pagination_since_id
-    @statuses.first.id
+  def pagination_collection
+    @statuses
   end
 
   def next_path_params

From 7e6eb64f1e89179f49ebdaddab7f96ac3f53ad05 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 13 Mar 2024 04:56:37 -0400
Subject: [PATCH 0416/2191] Use full snowflake range in `admin/metrics` classes
 (#29416)

---
 .../admin/metrics/dimension/instance_languages_dimension.rb   | 4 ++--
 app/lib/admin/metrics/dimension/servers_dimension.rb          | 4 ++--
 app/lib/admin/metrics/dimension/tag_languages_dimension.rb    | 4 ++--
 app/lib/admin/metrics/dimension/tag_servers_dimension.rb      | 4 ++--
 app/lib/admin/metrics/measure/instance_statuses_measure.rb    | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/lib/admin/metrics/dimension/instance_languages_dimension.rb b/app/lib/admin/metrics/dimension/instance_languages_dimension.rb
index b478213808e842..661e6d93b751ca 100644
--- a/app/lib/admin/metrics/dimension/instance_languages_dimension.rb
+++ b/app/lib/admin/metrics/dimension/instance_languages_dimension.rb
@@ -37,11 +37,11 @@ def sql_query_string
   end
 
   def earliest_status_id
-    Mastodon::Snowflake.id_at(@start_at, with_random: false)
+    Mastodon::Snowflake.id_at(@start_at.beginning_of_day, with_random: false)
   end
 
   def latest_status_id
-    Mastodon::Snowflake.id_at(@end_at, with_random: false)
+    Mastodon::Snowflake.id_at(@end_at.end_of_day, with_random: false)
   end
 
   def params
diff --git a/app/lib/admin/metrics/dimension/servers_dimension.rb b/app/lib/admin/metrics/dimension/servers_dimension.rb
index 42aba8e2132480..2c8406d52fd614 100644
--- a/app/lib/admin/metrics/dimension/servers_dimension.rb
+++ b/app/lib/admin/metrics/dimension/servers_dimension.rb
@@ -30,10 +30,10 @@ def sql_query_string
   end
 
   def earliest_status_id
-    Mastodon::Snowflake.id_at(@start_at)
+    Mastodon::Snowflake.id_at(@start_at.beginning_of_day, with_random: false)
   end
 
   def latest_status_id
-    Mastodon::Snowflake.id_at(@end_at)
+    Mastodon::Snowflake.id_at(@end_at.end_of_day, with_random: false)
   end
 end
diff --git a/app/lib/admin/metrics/dimension/tag_languages_dimension.rb b/app/lib/admin/metrics/dimension/tag_languages_dimension.rb
index cd077ff863d697..6e283d2c655797 100644
--- a/app/lib/admin/metrics/dimension/tag_languages_dimension.rb
+++ b/app/lib/admin/metrics/dimension/tag_languages_dimension.rb
@@ -40,11 +40,11 @@ def tag_id
   end
 
   def earliest_status_id
-    Mastodon::Snowflake.id_at(@start_at, with_random: false)
+    Mastodon::Snowflake.id_at(@start_at.beginning_of_day, with_random: false)
   end
 
   def latest_status_id
-    Mastodon::Snowflake.id_at(@end_at, with_random: false)
+    Mastodon::Snowflake.id_at(@end_at.end_of_day, with_random: false)
   end
 
   def params
diff --git a/app/lib/admin/metrics/dimension/tag_servers_dimension.rb b/app/lib/admin/metrics/dimension/tag_servers_dimension.rb
index fc5e49a966a867..db820e965c5b3d 100644
--- a/app/lib/admin/metrics/dimension/tag_servers_dimension.rb
+++ b/app/lib/admin/metrics/dimension/tag_servers_dimension.rb
@@ -40,11 +40,11 @@ def tag_id
   end
 
   def earliest_status_id
-    Mastodon::Snowflake.id_at(@start_at, with_random: false)
+    Mastodon::Snowflake.id_at(@start_at.beginning_of_day, with_random: false)
   end
 
   def latest_status_id
-    Mastodon::Snowflake.id_at(@end_at, with_random: false)
+    Mastodon::Snowflake.id_at(@end_at.end_of_day, with_random: false)
   end
 
   def params
diff --git a/app/lib/admin/metrics/measure/instance_statuses_measure.rb b/app/lib/admin/metrics/measure/instance_statuses_measure.rb
index 8c71c6614545d5..b918a30a57cc09 100644
--- a/app/lib/admin/metrics/measure/instance_statuses_measure.rb
+++ b/app/lib/admin/metrics/measure/instance_statuses_measure.rb
@@ -51,11 +51,11 @@ def sql_query_string
   end
 
   def earliest_status_id
-    Mastodon::Snowflake.id_at(@start_at, with_random: false)
+    Mastodon::Snowflake.id_at(@start_at.beginning_of_day, with_random: false)
   end
 
   def latest_status_id
-    Mastodon::Snowflake.id_at(@end_at, with_random: false)
+    Mastodon::Snowflake.id_at(@end_at.end_of_day, with_random: false)
   end
 
   def time_period

From 2c0441acd7f943a9873b650cf75d33c73d545acf Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 13 Mar 2024 05:19:54 -0400
Subject: [PATCH 0417/2191] Use rails built-in `tag` methods in
 `TextFormatter.shortened_link` (#28976)

---
 app/lib/text_formatter.rb | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/lib/text_formatter.rb b/app/lib/text_formatter.rb
index 581ee835b3fcdf..2b3febc219bac4 100644
--- a/app/lib/text_formatter.rb
+++ b/app/lib/text_formatter.rb
@@ -50,6 +50,7 @@ def to_s
 
   class << self
     include ERB::Util
+    include ActionView::Helpers::TagHelper
 
     def shortened_link(url, rel_me: false)
       url = Addressable::URI.parse(url).to_s
@@ -60,9 +61,11 @@ def shortened_link(url, rel_me: false)
       suffix      = url[prefix.length + 30..]
       cutoff      = url[prefix.length..].length > 30
 
-      <<~HTML.squish.html_safe # rubocop:disable Rails/OutputSafety
-        <a href="#{h(url)}" target="_blank" rel="#{rel.join(' ')}" translate="no"><span class="invisible">#{h(prefix)}</span><span class="#{cutoff ? 'ellipsis' : ''}">#{h(display_url)}</span><span class="invisible">#{h(suffix)}</span></a>
-      HTML
+      tag.a href: url, target: '_blank', rel: rel.join(' '), translate: 'no' do
+        tag.span(prefix, class: 'invisible') +
+          tag.span(display_url, class: (cutoff ? 'ellipsis' : '')) +
+          tag.span(suffix, class: 'invisible')
+      end
     rescue Addressable::URI::InvalidURIError, IDN::Idna::IdnaError
       h(url)
     end

From 46e902f1f373210f75e24bbbdcf0850b20bb1c53 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 13 Mar 2024 05:22:43 -0400
Subject: [PATCH 0418/2191] Merge `api/v1/accounts/credentials` controller spec
 into existing request spec (#29006)

---
 .../accounts/credentials_controller_spec.rb   | 105 ------------------
 .../api/v1/accounts/credentials_spec.rb       |  74 +++++++++---
 2 files changed, 61 insertions(+), 118 deletions(-)
 delete mode 100644 spec/controllers/api/v1/accounts/credentials_controller_spec.rb

diff --git a/spec/controllers/api/v1/accounts/credentials_controller_spec.rb b/spec/controllers/api/v1/accounts/credentials_controller_spec.rb
deleted file mode 100644
index a62fa54e60735e..00000000000000
--- a/spec/controllers/api/v1/accounts/credentials_controller_spec.rb
+++ /dev/null
@@ -1,105 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe Api::V1::Accounts::CredentialsController do
-  render_views
-
-  let(:user)  { Fabricate(:user) }
-  let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
-
-  context 'with an oauth token' do
-    before do
-      allow(controller).to receive(:doorkeeper_token) { token }
-    end
-
-    describe 'GET #show' do
-      let(:scopes) { 'read:accounts' }
-
-      it 'returns http success' do
-        get :show
-        expect(response).to have_http_status(200)
-      end
-    end
-
-    describe 'PATCH #update' do
-      let(:scopes) { 'write:accounts' }
-
-      describe 'with valid data' do
-        before do
-          allow(ActivityPub::UpdateDistributionWorker).to receive(:perform_async)
-
-          patch :update, params: {
-            display_name: "Alice Isn't Dead",
-            note: "Hi!\n\nToot toot!",
-            avatar: fixture_file_upload('avatar.gif', 'image/gif'),
-            header: fixture_file_upload('attachment.jpg', 'image/jpeg'),
-            source: {
-              privacy: 'unlisted',
-              sensitive: true,
-            },
-          }
-        end
-
-        it 'updates account info', :aggregate_failures do
-          expect(response).to have_http_status(200)
-
-          user.reload
-          user.account.reload
-
-          expect(user.account.display_name).to eq("Alice Isn't Dead")
-          expect(user.account.note).to eq("Hi!\n\nToot toot!")
-          expect(user.account.avatar).to exist
-          expect(user.account.header).to exist
-          expect(user.setting_default_privacy).to eq('unlisted')
-          expect(user.setting_default_sensitive).to be(true)
-
-          expect(ActivityPub::UpdateDistributionWorker).to have_received(:perform_async).with(user.account_id)
-        end
-      end
-
-      describe 'with empty source list' do
-        before do
-          patch :update, params: {
-            display_name: "I'm a cat",
-            source: {},
-          }, as: :json
-        end
-
-        it 'returns http success' do
-          expect(response).to have_http_status(200)
-        end
-      end
-
-      describe 'with invalid data' do
-        before do
-          patch :update, params: { note: 'This is too long. ' * 30 }
-        end
-
-        it 'returns http unprocessable entity' do
-          expect(response).to have_http_status(422)
-        end
-      end
-    end
-  end
-
-  context 'without an oauth token' do
-    before do
-      allow(controller).to receive(:doorkeeper_token).and_return(nil)
-    end
-
-    describe 'GET #show' do
-      it 'returns http unauthorized' do
-        get :show
-        expect(response).to have_http_status(401)
-      end
-    end
-
-    describe 'PATCH #update' do
-      it 'returns http unauthorized' do
-        patch :update, params: { note: 'Foo' }
-        expect(response).to have_http_status(401)
-      end
-    end
-  end
-end
diff --git a/spec/requests/api/v1/accounts/credentials_spec.rb b/spec/requests/api/v1/accounts/credentials_spec.rb
index b13e79b12b9137..737348c2dddff8 100644
--- a/spec/requests/api/v1/accounts/credentials_spec.rb
+++ b/spec/requests/api/v1/accounts/credentials_spec.rb
@@ -15,15 +15,11 @@
 
     it_behaves_like 'forbidden for wrong scope', 'write write:accounts'
 
-    it 'returns http success' do
-      subject
-
-      expect(response).to have_http_status(200)
-    end
-
-    it 'returns the expected content' do
+    it 'returns http success with expected content' do
       subject
 
+      expect(response)
+        .to have_http_status(200)
       expect(body_as_json).to include({
         source: hash_including({
           discoverable: false,
@@ -34,24 +30,55 @@
     end
   end
 
-  describe 'POST /api/v1/accounts/update_credentials' do
+  describe 'PATCH /api/v1/accounts/update_credentials' do
     subject do
       patch '/api/v1/accounts/update_credentials', headers: headers, params: params
     end
 
-    let(:params) { { discoverable: true, locked: false, indexable: true } }
+    before { allow(ActivityPub::UpdateDistributionWorker).to receive(:perform_async) }
+
+    let(:params) do
+      {
+        avatar: fixture_file_upload('avatar.gif', 'image/gif'),
+        discoverable: true,
+        display_name: "Alice Isn't Dead",
+        header: fixture_file_upload('attachment.jpg', 'image/jpeg'),
+        indexable: true,
+        locked: false,
+        note: 'Hello!',
+        source: {
+          privacy: 'unlisted',
+          sensitive: true,
+        },
+      }
+    end
 
     it_behaves_like 'forbidden for wrong scope', 'read read:accounts'
 
-    it 'returns http success' do
-      subject
+    describe 'with empty source list' do
+      let(:params) { { display_name: "I'm a cat", source: {} } }
 
-      expect(response).to have_http_status(200)
+      it 'returns http success' do
+        subject
+        expect(response).to have_http_status(200)
+      end
     end
 
-    it 'returns JSON with updated attributes' do
+    describe 'with invalid data' do
+      let(:params) { { note: 'This is too long. ' * 30 } }
+
+      it 'returns http unprocessable entity' do
+        subject
+        expect(response).to have_http_status(422)
+      end
+    end
+
+    it 'returns http success with updated JSON attributes' do
       subject
 
+      expect(response)
+        .to have_http_status(200)
+
       expect(body_as_json).to include({
         source: hash_including({
           discoverable: true,
@@ -59,6 +86,27 @@
         }),
         locked: false,
       })
+
+      expect(ActivityPub::UpdateDistributionWorker)
+        .to have_received(:perform_async).with(user.account_id)
+    end
+
+    def expect_account_updates
+      expect(user.account.reload)
+        .to have_attributes(
+          display_name: eq("Alice Isn't Dead"),
+          note: 'Hello!',
+          avatar: exist,
+          header: exist
+        )
+    end
+
+    def expect_user_updates
+      expect(user.reload)
+        .to have_attributes(
+          setting_default_privacy: eq('unlisted'),
+          setting_default_sensitive: be(true)
+        )
     end
   end
 end

From 27fd084cb5ccb4bf6b2a3eb28b0b123063230c10 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 13 Mar 2024 11:17:55 +0100
Subject: [PATCH 0419/2191] Exempt some notification types from notification
 filtering (#29565)

---
 app/services/notify_service.rb | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/app/services/notify_service.rb b/app/services/notify_service.rb
index 428fdb4d47c79b..66cbff0ef8eb1c 100644
--- a/app/services/notify_service.rb
+++ b/app/services/notify_service.rb
@@ -68,6 +68,13 @@ class FilterCondition
 
     NEW_FOLLOWER_THRESHOLD = 3.days.freeze
 
+    NON_FILTERABLE_TYPES = %i(
+      admin.sign_up
+      admin.report
+      poll
+      update
+    ).freeze
+
     def initialize(notification)
       @notification = notification
       @recipient = notification.account
@@ -76,6 +83,7 @@ def initialize(notification)
     end
 
     def filter?
+      return false if NON_FILTERABLE_TYPES.include?(@notification.type)
       return false if override_for_sender?
 
       from_limited? ||

From b43eaa4517107326c7e73b949cec759f841b4a30 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 13 Mar 2024 11:35:49 +0100
Subject: [PATCH 0420/2191] Refactor notification filtering behavior definition
 (#29567)

---
 app/models/notification.rb     | 46 +++++++++++++++++++++++++---------
 app/services/notify_service.rb |  2 +-
 2 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/app/models/notification.rb b/app/models/notification.rb
index e322daea4a9ee2..861a1543696655 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -29,18 +29,40 @@ class Notification < ApplicationRecord
     'Poll' => :poll,
   }.freeze
 
-  TYPES = %i(
-    mention
-    status
-    reblog
-    follow
-    follow_request
-    favourite
-    poll
-    update
-    admin.sign_up
-    admin.report
-  ).freeze
+  PROPERTIES = {
+    mention: {
+      filterable: true,
+    }.freeze,
+    status: {
+      filterable: false,
+    }.freeze,
+    reblog: {
+      filterable: true,
+    }.freeze,
+    follow: {
+      filterable: true,
+    }.freeze,
+    follow_request: {
+      filterable: true,
+    }.freeze,
+    favourite: {
+      filterable: true,
+    }.freeze,
+    poll: {
+      filterable: false,
+    }.freeze,
+    update: {
+      filterable: false,
+    }.freeze,
+    'admin.sign_up': {
+      filterable: false,
+    }.freeze,
+    'admin.report': {
+      filterable: false,
+    }.freeze,
+  }.freeze
+
+  TYPES = PROPERTIES.keys.freeze
 
   TARGET_STATUS_INCLUDES_BY_TYPE = {
     status: :status,
diff --git a/app/services/notify_service.rb b/app/services/notify_service.rb
index 66cbff0ef8eb1c..f3d16f1be7fa13 100644
--- a/app/services/notify_service.rb
+++ b/app/services/notify_service.rb
@@ -83,7 +83,7 @@ def initialize(notification)
     end
 
     def filter?
-      return false if NON_FILTERABLE_TYPES.include?(@notification.type)
+      return false unless Notification::PROPERTIES[@notification.type][:filterable]
       return false if override_for_sender?
 
       from_limited? ||

From 268856d5d9f72f003a08a53c7d094ed4df7c16bc Mon Sep 17 00:00:00 2001
From: Erik Uden <erik@uden.ai>
Date: Wed, 13 Mar 2024 12:45:20 +0100
Subject: [PATCH 0421/2191] Fix toggle button color for light (and
 dark/default) theme (#29553)

---
 app/javascript/styles/mastodon-light/diff.scss |  4 ++--
 app/javascript/styles/mastodon/components.scss | 13 +++++++++++--
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/app/javascript/styles/mastodon-light/diff.scss b/app/javascript/styles/mastodon-light/diff.scss
index 675a01dd3617f8..493e377d610023 100644
--- a/app/javascript/styles/mastodon-light/diff.scss
+++ b/app/javascript/styles/mastodon-light/diff.scss
@@ -263,11 +263,11 @@ html {
 }
 
 .react-toggle-track {
-  background: $ui-secondary-color;
+  background: $ui-primary-color;
 }
 
 .react-toggle:hover:not(.react-toggle--disabled) .react-toggle-track {
-  background: darken($ui-secondary-color, 10%);
+  background: lighten($ui-primary-color, 10%);
 }
 
 .react-toggle.react-toggle--checked:hover:not(.react-toggle--disabled)
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 047d9d9739d7af..b6dc1abc998a94 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -3369,7 +3369,7 @@ $ui-header-height: 55px;
   height: 20px;
   padding: 0;
   border-radius: 10px;
-  background-color: #626982;
+  background-color: $ui-primary-color;
 }
 
 .react-toggle--focus {
@@ -3392,7 +3392,7 @@ $ui-header-height: 55px;
   width: 16px;
   height: 16px;
   border-radius: 50%;
-  background-color: $primary-text-color;
+  background-color: $ui-button-color;
   box-sizing: border-box;
   transition: all 0.25s ease;
   transition-property: border-color, left;
@@ -3403,6 +3403,15 @@ $ui-header-height: 55px;
   border-color: $ui-highlight-color;
 }
 
+.react-toggle:hover:not(.react-toggle--disabled) .react-toggle-track {
+  background: darken($ui-primary-color, 5%);
+}
+
+.react-toggle.react-toggle--checked:hover:not(.react-toggle--disabled)
+  .react-toggle-track {
+  background: lighten($ui-highlight-color, 5%);
+}
+
 .switch-to-advanced {
   color: $light-text-color;
   background-color: $ui-base-color;

From 171948b910684cb5b3f7ac0e2da169c527196ed1 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 13 Mar 2024 13:42:44 +0100
Subject: [PATCH 0422/2191] New Crowdin Translations (automated) (#29563)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/be.json      | 16 ++++++++++++++++
 app/javascript/mastodon/locales/ca.json      |  1 -
 app/javascript/mastodon/locales/cy.json      | 15 +++++++++++++++
 app/javascript/mastodon/locales/da.json      |  1 +
 app/javascript/mastodon/locales/es-AR.json   |  2 +-
 app/javascript/mastodon/locales/et.json      |  1 +
 app/javascript/mastodon/locales/fa.json      |  4 ++--
 app/javascript/mastodon/locales/fi.json      | 11 +++++++++++
 app/javascript/mastodon/locales/fil.json     |  1 +
 app/javascript/mastodon/locales/fo.json      |  2 +-
 app/javascript/mastodon/locales/gl.json      | 16 ++++++++++++++++
 app/javascript/mastodon/locales/he.json      |  1 -
 app/javascript/mastodon/locales/hu.json      |  2 +-
 app/javascript/mastodon/locales/it.json      |  2 +-
 app/javascript/mastodon/locales/ko.json      |  3 ++-
 app/javascript/mastodon/locales/lad.json     |  8 ++++++++
 app/javascript/mastodon/locales/lt.json      | 10 ++++++++++
 app/javascript/mastodon/locales/nl.json      |  2 +-
 app/javascript/mastodon/locales/sk.json      |  7 +++++++
 app/javascript/mastodon/locales/sl.json      |  3 +++
 app/javascript/mastodon/locales/sq.json      | 13 +++++++++++++
 app/javascript/mastodon/locales/sr-Latn.json | 16 ++++++++++++++++
 app/javascript/mastodon/locales/sr.json      | 16 ++++++++++++++++
 app/javascript/mastodon/locales/th.json      |  1 +
 app/javascript/mastodon/locales/tr.json      | 20 ++++++++++++++++++--
 app/javascript/mastodon/locales/vi.json      | 16 ++++++++++++++++
 config/locales/fa.yml                        |  8 ++++----
 config/locales/fi.yml                        |  4 ++--
 config/locales/lad.yml                       | 10 ++++++++++
 config/locales/simple_form.be.yml            |  2 ++
 config/locales/simple_form.ca.yml            |  2 +-
 config/locales/simple_form.fa.yml            |  2 +-
 config/locales/simple_form.fi.yml            |  2 ++
 config/locales/simple_form.ja.yml            |  2 ++
 config/locales/simple_form.lad.yml           |  1 +
 config/locales/simple_form.sr-Latn.yml       |  1 +
 config/locales/simple_form.sr.yml            |  1 +
 config/locales/simple_form.tr.yml            |  2 ++
 config/locales/sq.yml                        |  1 +
 39 files changed, 208 insertions(+), 20 deletions(-)

diff --git a/app/javascript/mastodon/locales/be.json b/app/javascript/mastodon/locales/be.json
index bbe21f0569309f..6e0c5afb6079eb 100644
--- a/app/javascript/mastodon/locales/be.json
+++ b/app/javascript/mastodon/locales/be.json
@@ -241,6 +241,7 @@
   "empty_column.list": "У гэтым спісе пакуль што нічога няма. Калі члены лісту апублікуюць новыя запісы, яны з'явяцца тут.",
   "empty_column.lists": "Як толькі вы створыце новы спіс ён будзе захоўвацца тут, але пакуль што тут пуста.",
   "empty_column.mutes": "Вы яшчэ нікога не ігнаруеце.",
+  "empty_column.notification_requests": "Чысціня! Тут нічога няма. Калі вы будзеце атрымліваць новыя апавяшчэння, яны будуць з'яўляцца тут у адпаведнасці з вашымі наладамі.",
   "empty_column.notifications": "У вас няма ніякіх апавяшчэнняў. Калі іншыя людзі ўзаемадзейнічаюць з вамі, вы ўбачыце гэта тут.",
   "empty_column.public": "Тут нічога няма! Апублікуйце што-небудзь, або падпішыцеся на карыстальнікаў з другіх сервераў",
   "error.unexpected_crash.explanation": "Гэта старонка не можа быць адлюстравана карэктна з-за памылкі ў нашым кодзе, або праблемы з сумяшчальнасцю браўзера.",
@@ -271,6 +272,8 @@
   "filter_modal.select_filter.subtitle": "Скарыстайцеся існуючай катэгорыяй або стварыце новую",
   "filter_modal.select_filter.title": "Фільтраваць гэты допіс",
   "filter_modal.title.status": "Фільтраваць допіс",
+  "filtered_notifications_banner.pending_requests": "Апавяшчэнні ад {count, plural, =0 {# людзей якіх} one {# чалавека якіх} few {# чалавек якіх} many {# людзей якіх} other {# чалавека якіх}} вы магчыма ведаеце",
+  "filtered_notifications_banner.title": "Адфільтраваныя апавяшчэнні",
   "firehose.all": "Усе",
   "firehose.local": "Гэты сервер",
   "firehose.remote": "Іншыя серверы",
@@ -439,6 +442,10 @@
   "notification.reblog": "{name} пашырыў ваш допіс",
   "notification.status": "Новы допіс ад {name}",
   "notification.update": "Допіс {name} адрэдагаваны",
+  "notification_requests.accept": "Прыняць",
+  "notification_requests.dismiss": "Адхіліць",
+  "notification_requests.notifications_from": "Апавяшчэнні ад {name}",
+  "notification_requests.title": "Адфільтраваныя апавяшчэнні",
   "notifications.clear": "Ачысціць апавяшчэнні",
   "notifications.clear_confirmation": "Вы ўпэўнены, што жадаеце назаўсёды сцерці ўсё паведамленні?",
   "notifications.column_settings.admin.report": "Новыя скаргі:",
@@ -470,6 +477,15 @@
   "notifications.permission_denied": "Апавяшчэнні на працоўным стале недаступныя з-за папярэдне адхіленага запыта праў браўзера",
   "notifications.permission_denied_alert": "Апавяшчэнні на працоўным стале не могуць быць уключаныя, з-за таго што запыт браўзера быў адхілены",
   "notifications.permission_required": "Апавяшчэнні на працоўным стале недаступныя, з-за таго што неабходны дазвол не быў дадзены.",
+  "notifications.policy.filter_new_accounts.hint": "Створаныя на працягу {days, plural, one {апошняга # дня} few {апошніх # дзён} many {апошніх # дзён} other {апошняй # дня}}",
+  "notifications.policy.filter_new_accounts_title": "Новыя ўліковыя запісы",
+  "notifications.policy.filter_not_followers_hint": "Уключаючы людзей, якія падпісаны на вас менш, чым {days, plural, one {# дзень} few {# дні} many {# дзён} other {# дня}}",
+  "notifications.policy.filter_not_followers_title": "Людзі, якія не падпісаны на вас",
+  "notifications.policy.filter_not_following_hint": "Пакуль вы не пацвердзіце іх уручную",
+  "notifications.policy.filter_not_following_title": "Людзі, на якіх вы не падпісаны",
+  "notifications.policy.filter_private_mentions_hint": "Фільтруецца за выключэннем адказу на вашае згадванне ці калі вы падпісаны на адпраўніка",
+  "notifications.policy.filter_private_mentions_title": "Непажаданыя асаблівыя згадванні",
+  "notifications.policy.title": "Адфільтроўваць апавяшчэнні ад…",
   "notifications_permission_banner.enable": "Уключыць апавяшчэнні на працоўным стале",
   "notifications_permission_banner.how_to_control": "Каб атрымліваць апавяшчэнні, калі Mastodon не адкрыты, уключыце апавяшчэнні працоўнага стала. Вы зможаце дакладна кантраляваць, якія падзеі будуць ствараць апавяшчэнні з дапамогай {icon} кнопкі, як толькі яны будуць уключаны.",
   "notifications_permission_banner.title": "Не прапусціце нічога",
diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index 0c237ccda05e75..8ba140d207d52a 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -272,7 +272,6 @@
   "filter_modal.select_filter.subtitle": "Usa una categoria existent o crea'n una de nova",
   "filter_modal.select_filter.title": "Filtra aquest tut",
   "filter_modal.title.status": "Filtra un tut",
-  "filtered_notifications_banner.pending_requests": "Notificacions de {count, plural, =0 {no} one {una persona} other {# persones}} que potser coneixeu",
   "filtered_notifications_banner.title": "Notificacions filtrades",
   "firehose.all": "Tots",
   "firehose.local": "Aquest servidor",
diff --git a/app/javascript/mastodon/locales/cy.json b/app/javascript/mastodon/locales/cy.json
index 583660b28315d4..e55dff92549c19 100644
--- a/app/javascript/mastodon/locales/cy.json
+++ b/app/javascript/mastodon/locales/cy.json
@@ -241,6 +241,7 @@
   "empty_column.list": "Does dim yn y rhestr yma eto. Pan fydd aelodau'r rhestr yn cyhoeddi postiad newydd, mi fydd yn ymddangos yma.",
   "empty_column.lists": "Nid oes gennych unrhyw restrau eto. Pan fyddwch yn creu un, mi fydd yn ymddangos yma.",
   "empty_column.mutes": "Nid ydych wedi tewi unrhyw ddefnyddwyr eto.",
+  "empty_column.notification_requests": "Dim i boeni amdano! Does dim byd yma. Pan fyddwch yn derbyn hysbysiadau newydd, byddan nhw'n ymddangos yma yn ôl eich gosodiadau.",
   "empty_column.notifications": "Nid oes gennych unrhyw hysbysiadau eto. Rhyngweithiwch ag eraill i ddechrau'r sgwrs.",
   "empty_column.public": "Does dim byd yma! Ysgrifennwch rywbeth cyhoeddus, neu dilynwch ddefnyddwyr o weinyddion eraill i'w lanw",
   "error.unexpected_crash.explanation": "Oherwydd gwall yn ein cod neu oherwydd problem cysondeb porwr, nid oedd y dudalen hon gallu cael ei dangos yn gywir.",
@@ -271,6 +272,7 @@
   "filter_modal.select_filter.subtitle": "Defnyddiwch gategori sy'n bodoli eisoes neu crëu un newydd",
   "filter_modal.select_filter.title": "Hidlo'r postiad hwn",
   "filter_modal.title.status": "Hidlo postiad",
+  "filtered_notifications_banner.title": "Hysbysiadau wedi'u hidlo",
   "firehose.all": "Popeth",
   "firehose.local": "Gweinydd hwn",
   "firehose.remote": "Gweinyddion eraill",
@@ -439,6 +441,10 @@
   "notification.reblog": "Hybodd {name} eich post",
   "notification.status": "{name} newydd ei bostio",
   "notification.update": "Golygodd {name} bostiad",
+  "notification_requests.accept": "Derbyn",
+  "notification_requests.dismiss": "Cau",
+  "notification_requests.notifications_from": "Hysbysiadau gan {name}",
+  "notification_requests.title": "Hysbysiadau wedi'u hidlo",
   "notifications.clear": "Clirio hysbysiadau",
   "notifications.clear_confirmation": "Ydych chi'n siŵr eich bod am glirio'ch holl hysbysiadau am byth?",
   "notifications.column_settings.admin.report": "Adroddiadau newydd:",
@@ -470,6 +476,15 @@
   "notifications.permission_denied": "Nid oes hysbysiadau bwrdd gwaith ar gael oherwydd cais am ganiatâd porwr a wrthodwyd yn flaenorol",
   "notifications.permission_denied_alert": "Nid oes modd galluogi hysbysiadau bwrdd gwaith, gan fod caniatâd porwr wedi'i wrthod o'r blaen",
   "notifications.permission_required": "Nid oes hysbysiadau bwrdd gwaith ar gael oherwydd na roddwyd y caniatâd gofynnol.",
+  "notifications.policy.filter_new_accounts.hint": "Crëwyd o fewn {days, lluosog, un {yr un diwrnod} arall {y # diwrnod}} diwethaf",
+  "notifications.policy.filter_new_accounts_title": "Cyfrifon newydd",
+  "notifications.policy.filter_not_followers_hint": "Gan gynnwys pobl sydd wedi bod yn eich dilyn am llai  {days, plural, un {nag un diwrnod} arall {na # diwrnod}}",
+  "notifications.policy.filter_not_followers_title": "Pobl sydd ddim yn eich dilyn",
+  "notifications.policy.filter_not_following_hint": "Hyd nes i chi eu cymeradwyo â llaw",
+  "notifications.policy.filter_not_following_title": "Pobl nad ydych yn eu dilyn",
+  "notifications.policy.filter_private_mentions_hint": "Wedi'i hidlo oni bai ei fod mewn ymateb i'ch crybwylliad eich hun neu os ydych yn dilyn yr anfonwr",
+  "notifications.policy.filter_private_mentions_title": "Crybwylliadau preifat digymell",
+  "notifications.policy.title": "Hidlo hysbysiadau gan…",
   "notifications_permission_banner.enable": "Galluogi hysbysiadau bwrdd gwaith",
   "notifications_permission_banner.how_to_control": "I dderbyn hysbysiadau pan nad yw Mastodon ar agor, galluogwch hysbysiadau bwrdd gwaith. Gallwch reoli'n union pa fathau o ryngweithiadau sy'n cynhyrchu hysbysiadau bwrdd gwaith trwy'r botwm {icon} uchod unwaith y byddan nhw wedi'u galluogi.",
   "notifications_permission_banner.title": "Peidiwch â cholli dim",
diff --git a/app/javascript/mastodon/locales/da.json b/app/javascript/mastodon/locales/da.json
index ddc0440abcbbf6..4f03c55bd48b5f 100644
--- a/app/javascript/mastodon/locales/da.json
+++ b/app/javascript/mastodon/locales/da.json
@@ -272,6 +272,7 @@
   "filter_modal.select_filter.subtitle": "Vælg en eksisterende kategori eller opret en ny",
   "filter_modal.select_filter.title": "Filtrér dette indlæg",
   "filter_modal.title.status": "Filtrér et indlæg",
+  "filtered_notifications_banner.pending_requests": "Notifikationer fra {count, plural, =0 {ingen} one {én person} other {# personer}} du måske kender",
   "filtered_notifications_banner.title": "Filtrerede notifikationer",
   "firehose.all": "Alle",
   "firehose.local": "Denne server",
diff --git a/app/javascript/mastodon/locales/es-AR.json b/app/javascript/mastodon/locales/es-AR.json
index 48d458005636db..35802420d0416f 100644
--- a/app/javascript/mastodon/locales/es-AR.json
+++ b/app/javascript/mastodon/locales/es-AR.json
@@ -272,7 +272,7 @@
   "filter_modal.select_filter.subtitle": "Usar una categoría existente o crear una nueva",
   "filter_modal.select_filter.title": "Filtrar este mensaje",
   "filter_modal.title.status": "Filtrar un mensaje",
-  "filtered_notifications_banner.pending_requests": "Notificaciones de {count, plural, =0 {ninguna cuenta} one {una cuenta} other {# cuentas}} que podrías conocer",
+  "filtered_notifications_banner.pending_requests": "Notificaciones de {count, plural, =0 {nadie} one {una persona} other {# personas}} que podrías conocer",
   "filtered_notifications_banner.title": "Notificaciones filtradas",
   "firehose.all": "Todos",
   "firehose.local": "Este servidor",
diff --git a/app/javascript/mastodon/locales/et.json b/app/javascript/mastodon/locales/et.json
index 2759c96a10a4c6..79e376693e4f2e 100644
--- a/app/javascript/mastodon/locales/et.json
+++ b/app/javascript/mastodon/locales/et.json
@@ -271,6 +271,7 @@
   "filter_modal.select_filter.subtitle": "Kasuta olemasolevat kategooriat või loo uus",
   "filter_modal.select_filter.title": "Filtreeri seda postitust",
   "filter_modal.title.status": "Postituse filtreerimine",
+  "filtered_notifications_banner.pending_requests": "Teateid {count, plural, =0 {mitte üheltki} one {ühelt} other {#}} inimeselt, keda võid teada",
   "firehose.all": "Kõik",
   "firehose.local": "See server",
   "firehose.remote": "Teised serverid",
diff --git a/app/javascript/mastodon/locales/fa.json b/app/javascript/mastodon/locales/fa.json
index 9e6128b873218d..2ca44a41aa45d3 100644
--- a/app/javascript/mastodon/locales/fa.json
+++ b/app/javascript/mastodon/locales/fa.json
@@ -325,8 +325,8 @@
   "interaction_modal.description.follow": "با حسابی روی ماستودون می‌توانید {name} را برای دریافت فرسته‌هایش در خوراک خانگیتان دنبال کنید.",
   "interaction_modal.description.reblog": "با حسابی روی ماستودون می‌توانید این فرسته را با پی‌گیران خودتان هم‌رسانی کنید.",
   "interaction_modal.description.reply": "با حسابی روی ماستودون می‌توانید به این فرسته پاسخ دهید.",
-  "interaction_modal.login.action": "من رو ببر خونه",
-  "interaction_modal.login.prompt": "دامنه سرور شخصی شما، به عنوان مثال. mastodon.social",
+  "interaction_modal.login.action": "رفتن به خانه",
+  "interaction_modal.login.prompt": "دامنهٔ کارساز شخصیتان چون mastodon.social",
   "interaction_modal.no_account_yet": "در ماستودون نیست؟",
   "interaction_modal.on_another_server": "روی کارسازی دیگر",
   "interaction_modal.on_this_server": "روی این کارساز",
diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index 3f964a71015918..93e758dd406bb0 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -271,6 +271,7 @@
   "filter_modal.select_filter.subtitle": "Käytä olemassa olevaa luokkaa tai luo uusi",
   "filter_modal.select_filter.title": "Suodata tämä julkaisu",
   "filter_modal.title.status": "Suodata julkaisu",
+  "filtered_notifications_banner.title": "Suodatetut ilmoitukset",
   "firehose.all": "Kaikki",
   "firehose.local": "Tämä palvelin",
   "firehose.remote": "Muut palvelimet",
@@ -439,6 +440,10 @@
   "notification.reblog": "{name} tehosti julkaisuasi",
   "notification.status": "{name} julkaisi juuri",
   "notification.update": "{name} muokkasi julkaisua",
+  "notification_requests.accept": "Hyväksy",
+  "notification_requests.dismiss": "Hylkää",
+  "notification_requests.notifications_from": "Ilmoitukset käyttäjältä {name}",
+  "notification_requests.title": "Suodatetut ilmoitukset",
   "notifications.clear": "Tyhjennä ilmoitukset",
   "notifications.clear_confirmation": "Haluatko varmasti poistaa kaikki ilmoitukset pysyvästi?",
   "notifications.column_settings.admin.report": "Uudet ilmoitukset:",
@@ -470,6 +475,12 @@
   "notifications.permission_denied": "Työpöytäilmoitukset eivät ole käytettävissä, koska selaimen käyttöoikeuspyyntö on aiemmin evätty",
   "notifications.permission_denied_alert": "Työpöytäilmoituksia ei voi ottaa käyttöön, koska selaimen käyttöoikeus on aiemmin estetty",
   "notifications.permission_required": "Työpöytäilmoitukset eivät ole käytettävissä, koska siihen tarvittavaa lupaa ei ole myönnetty.",
+  "notifications.policy.filter_new_accounts.hint": "Luotu {days, plural, one {viime päivänä} other {viimeisenä # päivänä}}",
+  "notifications.policy.filter_new_accounts_title": "Uudet tilit",
+  "notifications.policy.filter_not_followers_title": "Henkilöt, jotka eivät seuraa sinua",
+  "notifications.policy.filter_not_following_title": "Henkilöt, joita et seuraa",
+  "notifications.policy.filter_private_mentions_title": "Ei-toivotut yksityismaininnat",
+  "notifications.policy.title": "Suodata ilmoitukset pois kohteesta…",
   "notifications_permission_banner.enable": "Ota työpöytäilmoitukset käyttöön",
   "notifications_permission_banner.how_to_control": "Saadaksesi ilmoituksia, kun Mastodon ei ole auki, ota työpöytäilmoitukset käyttöön. Voit hallita tarkasti, mistä saat työpöytäilmoituksia kun ilmoitukset on otettu käyttöön yllä olevan {icon}-painikkeen kautta.",
   "notifications_permission_banner.title": "Älä anna minkään mennä ohi",
diff --git a/app/javascript/mastodon/locales/fil.json b/app/javascript/mastodon/locales/fil.json
index 04208c5544fb64..14bf1af222da90 100644
--- a/app/javascript/mastodon/locales/fil.json
+++ b/app/javascript/mastodon/locales/fil.json
@@ -169,6 +169,7 @@
   "empty_column.list": "Wala pang laman ang listahang ito. Kapag naglathala ng mga bagong post ang mga miyembro ng listahang ito, makikita iyon dito.",
   "empty_column.lists": "Wala ka pang mga listahan. Kapag gumawa ka ng isa, makikita yun dito.",
   "explore.search_results": "Mga resulta ng paghahanap",
+  "filter_modal.select_filter.search": "Hanapin o gumawa",
   "firehose.all": "Lahat",
   "firehose.local": "Itong serbiro",
   "firehose.remote": "Ibang mga serbiro",
diff --git a/app/javascript/mastodon/locales/fo.json b/app/javascript/mastodon/locales/fo.json
index 67b323e2cf967f..daaefea86d416b 100644
--- a/app/javascript/mastodon/locales/fo.json
+++ b/app/javascript/mastodon/locales/fo.json
@@ -272,7 +272,7 @@
   "filter_modal.select_filter.subtitle": "Brúka ein verandi bólk ella skapa ein nýggjan",
   "filter_modal.select_filter.title": "Filtrera hendan postin",
   "filter_modal.title.status": "Filtrera ein post",
-  "filtered_notifications_banner.pending_requests": "Fráboðanir frá {count, plural, =0 {ongum} one {einum persóni} other {# persónum}}, sum tú møguliga kennir",
+  "filtered_notifications_banner.pending_requests": "Fráboðanir frá {count, plural, =0 {ongum} one {einum persóni} other {# persónum}}, sum tú kanska kennir",
   "filtered_notifications_banner.title": "Sáldaðar fráboðanir",
   "firehose.all": "Allar",
   "firehose.local": "Hesin ambætarin",
diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json
index 52e0ee6f6d8c6c..e3928b5f3b0074 100644
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@@ -241,6 +241,7 @@
   "empty_column.list": "Aínda non hai nada nesta listaxe. Cando as usuarias incluídas na listaxe publiquen mensaxes, amosaranse aquí.",
   "empty_column.lists": "Aínda non tes listaxes. Cando crees unha, amosarase aquí.",
   "empty_column.mutes": "Aínda non silenciaches a ningúnha usuaria.",
+  "empty_column.notification_requests": "Todo ben! Nada por aquí. Cando recibas novas notificación aparecerán aquí seguindo o criterio dos teus axustes.",
   "empty_column.notifications": "Aínda non tes notificacións. Aparecerán cando outras persoas interactúen contigo.",
   "empty_column.public": "Nada por aquí! Escribe algo de xeito público, ou segue de xeito manual usuarias doutros servidores para ir enchéndoo",
   "error.unexpected_crash.explanation": "Debido a un erro no noso código ou a unha compatilidade co teu navegador, esta páxina non pode ser amosada correctamente.",
@@ -271,6 +272,8 @@
   "filter_modal.select_filter.subtitle": "Usar unha categoría existente ou crear unha nova",
   "filter_modal.select_filter.title": "Filtrar esta publicación",
   "filter_modal.title.status": "Filtrar unha publicación",
+  "filtered_notifications_banner.pending_requests": "Notificacións de {count, plural, =0 {ninguén} one {unha persoa} other {# persoas}} que poderías coñecer",
+  "filtered_notifications_banner.title": "Notificacións filtradas",
   "firehose.all": "Todo",
   "firehose.local": "Este servidor",
   "firehose.remote": "Outros servidores",
@@ -439,6 +442,10 @@
   "notification.reblog": "{name} compartiu a túa publicación",
   "notification.status": "{name} publicou",
   "notification.update": "{name} editou unha publicación",
+  "notification_requests.accept": "Aceptar",
+  "notification_requests.dismiss": "Desbotar",
+  "notification_requests.notifications_from": "Notificacións de {name}",
+  "notification_requests.title": "Notificacións filtradas",
   "notifications.clear": "Limpar notificacións",
   "notifications.clear_confirmation": "Tes a certeza de querer limpar de xeito permanente todas as túas notificacións?",
   "notifications.column_settings.admin.report": "Novas denuncias:",
@@ -470,6 +477,15 @@
   "notifications.permission_denied": "Non se activaron as notificacións de escritorio porque se denegou o permiso",
   "notifications.permission_denied_alert": "Non se poden activar as notificacións de escritorio, xa que o permiso para o navegador foi denegado previamente",
   "notifications.permission_required": "As notificacións de escritorio non están dispoñibles porque non se concedeu o permiso necesario.",
+  "notifications.policy.filter_new_accounts.hint": "Creadas desde {days, plural, one {onte} other {fai # días}}",
+  "notifications.policy.filter_new_accounts_title": "Novas contas",
+  "notifications.policy.filter_not_followers_hint": "Inclúe a persoas que te seguen desde fai menos de {days, plural, one {1 día} other {# días}}",
+  "notifications.policy.filter_not_followers_title": "Persoas que non te seguen",
+  "notifications.policy.filter_not_following_hint": "Ata que as autorices",
+  "notifications.policy.filter_not_following_title": "Persoas que ti non segues",
+  "notifications.policy.filter_private_mentions_hint": "Filtradas a non ser que sexa unha resposta á túa propia mención ou se ti segues á remitente",
+  "notifications.policy.filter_private_mentions_title": "Mencións privadas non solicitadas",
+  "notifications.policy.title": "Desbotar notificacións de…",
   "notifications_permission_banner.enable": "Activar notificacións de escritorio",
   "notifications_permission_banner.how_to_control": "Activa as notificacións de escritorio para recibir notificacións mentras Mastodon non está aberto. Podes controlar de xeito preciso o tipo de interaccións que crean as notificacións de escritorio a través da {icon} superior unha vez están activadas.",
   "notifications_permission_banner.title": "Non perder nada",
diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json
index dcbc30308c9169..af6b1c6118730a 100644
--- a/app/javascript/mastodon/locales/he.json
+++ b/app/javascript/mastodon/locales/he.json
@@ -272,7 +272,6 @@
   "filter_modal.select_filter.subtitle": "שימוש בקטגורייה קיימת או יצירת אחת חדשה",
   "filter_modal.select_filter.title": "סינון ההודעה הזו",
   "filter_modal.title.status": "סנן הודעה",
-  "filtered_notifications_banner.pending_requests": "{count, plural,=0 {אין התראות ממשתמשים ה}one {התראה אחת ממישהו/מישהי ה}other {יש # התראות ממשתמשים }}מוכרים לך",
   "filtered_notifications_banner.title": "התראות מסוננות",
   "firehose.all": "הכל",
   "firehose.local": "שרת זה",
diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json
index 5dd0e7aee567cf..1cbca5654bcfbb 100644
--- a/app/javascript/mastodon/locales/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@@ -272,7 +272,7 @@
   "filter_modal.select_filter.subtitle": "Válassz egy meglévő kategóriát, vagy hozz létre egy újat",
   "filter_modal.select_filter.title": "E bejegyzés szűrése",
   "filter_modal.title.status": "Egy bejegyzés szűrése",
-  "filtered_notifications_banner.pending_requests": "Értesítések {count, plural, =0 {0 személytől} one {egy feltehetőleg ismert személytől} other {# feltehetőleg ismert személytől}}",
+  "filtered_notifications_banner.pending_requests": "Értesítések {count, plural, =0 {nincsenek} one {egy valósztínűleg ismerős személytől} other {# valószínűleg ismerős személytől}}",
   "filtered_notifications_banner.title": "Szűrt értesítések",
   "firehose.all": "Összes",
   "firehose.local": "Ez a kiszolgáló",
diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json
index 303abd49822e33..56b637612d7927 100644
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@@ -272,7 +272,7 @@
   "filter_modal.select_filter.subtitle": "Usa una categoria esistente o creane una nuova",
   "filter_modal.select_filter.title": "Filtra questo post",
   "filter_modal.title.status": "Filtra un post",
-  "filtered_notifications_banner.pending_requests": "Notifiche da {count, plural, =0 {nessuna persona} one {una persona} other {# persone}} che potresti conoscere",
+  "filtered_notifications_banner.pending_requests": "Notifiche da {count, plural, =0 {nessuno} one {una persona} other {# persone}} che potresti conoscere",
   "filtered_notifications_banner.title": "Notifiche filtrate",
   "firehose.all": "Tutto",
   "firehose.local": "Questo server",
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index 7dd7636089a9f2..642a3f4ae14e0d 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -271,7 +271,7 @@
   "filter_modal.select_filter.subtitle": "기존의 카테고리를 사용하거나 새로 하나를 만듧니다",
   "filter_modal.select_filter.title": "이 게시물을 필터",
   "filter_modal.title.status": "게시물 필터",
-  "filtered_notifications_banner.pending_requests": "알 수도 있는 {count, plural, =0 {0명} one {한 명} other {# 명}}의 사람들로부터의 알림",
+  "filtered_notifications_banner.pending_requests": "알 수도 있는 {count, plural, =0 {0 명} one {한 명} other {# 명}}의 사람들로부터의 알림",
   "filtered_notifications_banner.title": "걸러진 알림",
   "firehose.all": "모두",
   "firehose.local": "이 서버",
@@ -478,6 +478,7 @@
   "notifications.permission_required": "필요한 권한이 승인되지 않아 데스크탑 알림을 사용할 수 없습니다.",
   "notifications.policy.filter_new_accounts.hint": "{days, plural, one {하루} other {#일}} 안에 만들어진",
   "notifications.policy.filter_new_accounts_title": "새 계정",
+  "notifications.policy.filter_not_followers_hint": "나를 팔로우 한 지 {days, plural, other {# 일}}이 되지 않은 사람들을 포함",
   "notifications.policy.filter_not_followers_title": "나를 팔로우하지 않는 사람들",
   "notifications.policy.filter_not_following_hint": "내가 수동으로 승인하기 전까지",
   "notifications.policy.filter_not_following_title": "내가 팔로우하지 않는 사람들",
diff --git a/app/javascript/mastodon/locales/lad.json b/app/javascript/mastodon/locales/lad.json
index de84becca3ed95..e23f2259282044 100644
--- a/app/javascript/mastodon/locales/lad.json
+++ b/app/javascript/mastodon/locales/lad.json
@@ -271,6 +271,7 @@
   "filter_modal.select_filter.subtitle": "Kulanea una kategoria egzistente o kriya mueva",
   "filter_modal.select_filter.title": "Filtra esta publikasyon",
   "filter_modal.title.status": "Filtra una publikasyon",
+  "filtered_notifications_banner.pending_requests": "Avizos de {count, plural, =0 {dingun} one {una persona} other {# personas}} ke puedes koneser",
   "filtered_notifications_banner.title": "Avizos filtrados",
   "firehose.all": "Todo",
   "firehose.local": "Este sirvidor",
@@ -442,6 +443,7 @@
   "notification.update": "{name} edito una publikasyon",
   "notification_requests.accept": "Acheta",
   "notification_requests.dismiss": "Kita",
+  "notification_requests.notifications_from": "Avizos de {name}",
   "notification_requests.title": "Avizos filtrados",
   "notifications.clear": "Efasa avizos",
   "notifications.clear_confirmation": "Estas siguro ke keres permanentemente efasar todos tus avizos?",
@@ -474,7 +476,13 @@
   "notifications.permission_denied": "Avizos de ensimameza no estan desponivles porke ya se tiene refuzado el permiso",
   "notifications.permission_denied_alert": "\"No se pueden kapasitar los avizos de ensimameza, porke ya se tiene refuzado el permiso de navigador",
   "notifications.permission_required": "Avizos de ensimameza no estan desponivles porke los nesesarios permisos no tienen sido risividos.",
+  "notifications.policy.filter_new_accounts.hint": "Kriyadas durante {days, plural, one {el ultimo diya} other {los ultimos # diyas}}",
   "notifications.policy.filter_new_accounts_title": "Muevos kuentos",
+  "notifications.policy.filter_not_followers_title": "Personas ke te no sigen",
+  "notifications.policy.filter_not_following_hint": "Asta ke las aproves manualmente",
+  "notifications.policy.filter_not_following_title": "Personas ke no siges",
+  "notifications.policy.filter_private_mentions_title": "Enmentaduras privadas no solisitadas",
+  "notifications.policy.title": "Filtra avizos de…",
   "notifications_permission_banner.enable": "Kapasita avizos de ensimameza",
   "notifications_permission_banner.how_to_control": "Para risivir avizos kuando Mastodon no esta avierto, kapasita avizos de ensimameza. Puedes kontrolar presizamente kualos tipos de enteraksiones djeneren avizos de ensimameza kon el boton {icon} arriva kuando esten kapasitadas.",
   "notifications_permission_banner.title": "Nunkua te piedres niente",
diff --git a/app/javascript/mastodon/locales/lt.json b/app/javascript/mastodon/locales/lt.json
index 6963c43a3ada14..326560c8886ea7 100644
--- a/app/javascript/mastodon/locales/lt.json
+++ b/app/javascript/mastodon/locales/lt.json
@@ -439,6 +439,10 @@
   "notification.reblog": "{name} pakėlė tavo įrašą",
   "notification.status": "{name} ką tik paskelbė",
   "notification.update": "{name} redagavo įrašą",
+  "notification_requests.accept": "Priimti",
+  "notification_requests.dismiss": "Atmesti",
+  "notification_requests.notifications_from": "Pranešimai iš {name}",
+  "notification_requests.title": "Filtruojami pranešimai",
   "notifications.clear": "Išvalyti pranešimus",
   "notifications.clear_confirmation": "Ar tikrai nori visam laikui išvalyti visus pranešimus?",
   "notifications.column_settings.admin.report": "Naujos ataskaitos:",
@@ -470,6 +474,12 @@
   "notifications.permission_denied": "Darbalaukio pranešimai nepasiekiami dėl anksčiau atmestos naršyklės leidimų užklausos.",
   "notifications.permission_denied_alert": "Negalima įjungti darbalaukio pranešimų, nes prieš tai naršyklės leidimas buvo atmestas.",
   "notifications.permission_required": "Darbalaukio pranešimai nepasiekiami, nes nebuvo suteiktas reikiamas leidimas.",
+  "notifications.policy.filter_new_accounts.hint": "Sukurta per {days, plural, one {vieną dieną} few {# dienas} many {# dienos} other {# dienų}}",
+  "notifications.policy.filter_new_accounts_title": "Naujos paskyros",
+  "notifications.policy.filter_not_following_hint": "Kol jų nepatvirtinsi rankiniu būdu",
+  "notifications.policy.filter_not_following_title": "Žmonių, kuriuos neseki",
+  "notifications.policy.filter_private_mentions_title": "Nepageidaujami privatūs paminėjimai",
+  "notifications.policy.title": "Filtruoti pranešimus iš…",
   "notifications_permission_banner.enable": "Įjungti darbalaukio pranešimus",
   "notifications_permission_banner.how_to_control": "Jei nori gauti pranešimus, kai Mastodon nėra atidarytas, įjunk darbalaukio pranešimus. Įjungęs (-usi) darbalaukio pranešimus, gali tiksliai valdyti, kokių tipų sąveikos generuoja darbalaukio pranešimus, naudojant pirmiau esančiu mygtuku {icon}.",
   "notifications_permission_banner.title": "Niekada nieko nepraleisk",
diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json
index da5c4d8643605d..34a0c5ea5a4045 100644
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@@ -272,7 +272,7 @@
   "filter_modal.select_filter.subtitle": "Een bestaande categorie gebruiken of een nieuwe aanmaken",
   "filter_modal.select_filter.title": "Dit bericht filteren",
   "filter_modal.title.status": "Een bericht filteren",
-  "filtered_notifications_banner.pending_requests": "Meldingen van {count, plural, =0 {no} one {één persoon} other {# mensen}} die je misschien kent",
+  "filtered_notifications_banner.pending_requests": "Meldingen van {count, plural, =0 {niemand} one {één persoon} other {# mensen}} die je misschien kent",
   "filtered_notifications_banner.title": "Gefilterde meldingen",
   "firehose.all": "Alles",
   "firehose.local": "Deze server",
diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json
index a9c7affab10bca..07f7617358b290 100644
--- a/app/javascript/mastodon/locales/sk.json
+++ b/app/javascript/mastodon/locales/sk.json
@@ -271,6 +271,7 @@
   "filter_modal.select_filter.subtitle": "Použite existujúcu kategóriu alebo vytvorte novú",
   "filter_modal.select_filter.title": "Filtrovanie tohto príspevku",
   "filter_modal.title.status": "Filtrovanie príspevku",
+  "filtered_notifications_banner.pending_requests": "Oboznámenia od {count, plural, =0 {nikoho} one {jedného človeka} other {# ľudí}} čo môžeš poznať",
   "firehose.all": "Všetko",
   "firehose.local": "Tento server",
   "firehose.remote": "Ostatné servery",
@@ -439,6 +440,9 @@
   "notification.reblog": "{name} zdieľa váš príspevok",
   "notification.status": "{name} uverejňuje niečo nové",
   "notification.update": "{name} upravuje príspevok",
+  "notification_requests.accept": "Prijať",
+  "notification_requests.notifications_from": "Oboznámenia od {name}",
+  "notification_requests.title": "Filtrované oboznámenia",
   "notifications.clear": "Vyčistiť upozornenia",
   "notifications.clear_confirmation": "Určite chcete nenávratne odstrániť všetky svoje upozornenia?",
   "notifications.column_settings.admin.report": "Nové hlásenia:",
@@ -470,6 +474,9 @@
   "notifications.permission_denied": "Upozornenia na ploche sú nedostupné pre už skôr zamietnutú požiadavku prehliadača",
   "notifications.permission_denied_alert": "Upozornenia na ploche nemôžu byť zapnuté, pretože požiadavka prehliadača bola už skôr zamietnutá",
   "notifications.permission_required": "Upozornenia na ploche sú nedostupné, pretože neboli udelené potrebné povolenia.",
+  "notifications.policy.filter_new_accounts_title": "Nové účty",
+  "notifications.policy.filter_not_followers_title": "Ľudia, ktorí ťa nenasledujú",
+  "notifications.policy.filter_not_following_title": "Ľudia, ktorých nenasleduješ",
   "notifications_permission_banner.enable": "Povoliť upozornenia na ploche",
   "notifications_permission_banner.how_to_control": "Ak chcete dostávať upozornenia, keď Mastodon nie je otvorený, povoľte upozornenia na ploche. Po ich zapnutí môžete presne kontrolovať, ktoré typy interakcií generujú upozornenia na ploche, a to prostredníctvom tlačidla {icon} vyššie.",
   "notifications_permission_banner.title": "Nenechajte si nič ujsť",
diff --git a/app/javascript/mastodon/locales/sl.json b/app/javascript/mastodon/locales/sl.json
index df150fc291ffe4..1fe7dd07865206 100644
--- a/app/javascript/mastodon/locales/sl.json
+++ b/app/javascript/mastodon/locales/sl.json
@@ -272,6 +272,7 @@
   "filter_modal.select_filter.subtitle": "Uporabite obstoječo kategorijo ali ustvarite novo",
   "filter_modal.select_filter.title": "Filtriraj to objavo",
   "filter_modal.title.status": "Filtrirajte objavo",
+  "filtered_notifications_banner.pending_requests": "Obvestila od {count, plural, =0 {nikogar, ki bi ga} one {# človeka, ki bi ga} two {# ljudi, ki bi ju} few {# ljudi, ki bi jih} other {# ljudi, ki bi jih}} lahko poznali",
   "filtered_notifications_banner.title": "Filtrirana obvestila",
   "firehose.all": "Vse",
   "firehose.local": "Ta strežnik",
@@ -476,7 +477,9 @@
   "notifications.permission_denied": "Namizna obvestila niso na voljo zaradi poprej zavrnjene zahteve dovoljenja brskalnika.",
   "notifications.permission_denied_alert": "Namiznih obvestil ni mogoče omogočiti, ker je bilo dovoljenje brskalnika že prej zavrnjeno",
   "notifications.permission_required": "Namizna obvestila niso na voljo, ker zahtevano dovoljenje ni bilo podeljeno.",
+  "notifications.policy.filter_new_accounts.hint": "Ustvarjen v {days, plural, one {zadnjem # dnevu} two {zadnjih # dnevih} few {zadnjih # dnevih} other {zadnjih # dnevih}}",
   "notifications.policy.filter_new_accounts_title": "Novi računi",
+  "notifications.policy.filter_not_followers_hint": "Vključujoč ljudi, ki vam sledijo manj kot {days, plural, one {# dan} two {# dneva} few {# dni} other {# dni}}",
   "notifications.policy.filter_not_followers_title": "Ljudje, ki vam ne sledijo",
   "notifications.policy.filter_not_following_hint": "Dokler jih ročno ne odobrite",
   "notifications.policy.filter_not_following_title": "Ljudje, ki jim ne sledite",
diff --git a/app/javascript/mastodon/locales/sq.json b/app/javascript/mastodon/locales/sq.json
index 00d517de721fe5..beba09d59be89c 100644
--- a/app/javascript/mastodon/locales/sq.json
+++ b/app/javascript/mastodon/locales/sq.json
@@ -241,6 +241,7 @@
   "empty_column.list": "Në këtë listë ende s’ka gjë. Kur anëtarë të kësaj liste postojnë gjendje të reja, ato do të shfaqen këtu.",
   "empty_column.lists": "Ende s’keni ndonjë listë. Kur të krijoni një të tillë, do të duket këtu.",
   "empty_column.mutes": "S’keni heshtuar ende ndonjë përdorues.",
+  "empty_column.notification_requests": "Gjithçka si duhet! S’ka ç’bëhet këtu. Kur merrni njoftime të reja, do të shfaqen këtu, në përputhje me rregullimet tuaja.",
   "empty_column.notifications": "Ende s’keni ndonjë njoftim. Ndërveproni me të tjerët që të nisë biseda.",
   "empty_column.public": "S’ka gjë këtu! Shkruani diçka publikisht, ose ndiqni dorazi përdorues prej instancash të tjera, që kjo të mbushet",
   "error.unexpected_crash.explanation": "Për shkak të një të mete në kodin tonë ose të një problemi përputhshmërie të shfletuesit, kjo faqe s’mund të shfaqet saktë.",
@@ -271,6 +272,7 @@
   "filter_modal.select_filter.subtitle": "Përdorni një kategori ekzistuese, ose krijoni një të re",
   "filter_modal.select_filter.title": "Filtroje këtë postim",
   "filter_modal.title.status": "Filtroni një postim",
+  "filtered_notifications_banner.title": "Njoftime të filtruar",
   "firehose.all": "Krejt",
   "firehose.local": "Këtë shërbyes",
   "firehose.remote": "Shërbyes të tjerë",
@@ -439,6 +441,10 @@
   "notification.reblog": "{name} përforcoi mesazhin tuaj",
   "notification.status": "{name} sapo postoi",
   "notification.update": "{name} përpunoi një postim",
+  "notification_requests.accept": "Pranoje",
+  "notification_requests.dismiss": "Hidhe tej",
+  "notification_requests.notifications_from": "Njoftime prej {name}",
+  "notification_requests.title": "Njoftime të filtruar",
   "notifications.clear": "Spastroji njoftimet",
   "notifications.clear_confirmation": "Jeni i sigurt se doni të spastrohen përgjithmonë krejt njoftimet tuaja?",
   "notifications.column_settings.admin.report": "Raportime të reja:",
@@ -470,6 +476,13 @@
   "notifications.permission_denied": "S’merren dot njoftime në desktop, ngaqë më herët shfletuesit i janë mohuar lejet për këtë",
   "notifications.permission_denied_alert": "S’mund të aktivizohen njoftimet në desktop, ngaqë lejet e shfletuesit për këtë janë mohuar më herët",
   "notifications.permission_required": "S’merren dot njoftime desktop, ngaqë s’është akorduar leja përkatëse.",
+  "notifications.policy.filter_new_accounts_title": "Llogari të reja",
+  "notifications.policy.filter_not_followers_title": "Persona që s’ju ndjekin",
+  "notifications.policy.filter_not_following_hint": "Deri sa t’i miratoni dorazi",
+  "notifications.policy.filter_not_following_title": "Persona që s’i ndiqni",
+  "notifications.policy.filter_private_mentions_hint": "Filtruar, hiq rastin nëse gjendet te përgjigje ndaj përmendjes tuaj, ose nëse dërguesin e ndiqni",
+  "notifications.policy.filter_private_mentions_title": "Përmendje private të pakërkuara",
+  "notifications.policy.title": "Filtroni njoftime nga…",
   "notifications_permission_banner.enable": "Aktivizo njoftime në desktop",
   "notifications_permission_banner.how_to_control": "Për të marrë njoftime, kur Mastodon-i s’është i hapur, aktivizoni njoftime në desktop. Përmes butoni {icon} më sipër, mund të kontrolloni me përpikëri cilat lloje ndërveprimesh prodhojnë njoftime në desktop, pasi të jenë aktivizuar.",
   "notifications_permission_banner.title": "Mos t’ju shpëtojë gjë",
diff --git a/app/javascript/mastodon/locales/sr-Latn.json b/app/javascript/mastodon/locales/sr-Latn.json
index 4c0264465d4ae3..6a5ad998d4b6f6 100644
--- a/app/javascript/mastodon/locales/sr-Latn.json
+++ b/app/javascript/mastodon/locales/sr-Latn.json
@@ -241,6 +241,7 @@
   "empty_column.list": "U ovoj listi još nema ničega. Kada članovi ove liste objave nešto novo, pojaviće se ovde.",
   "empty_column.lists": "Još uvek nemate nijednu listu. Kada napravite jednu, ona će se pojaviti ovde.",
   "empty_column.mutes": "Još uvek ne ignorišete nijednog korisnika.",
+  "empty_column.notification_requests": "Sve je čisto! Ovde nema ničega. Kada dobijete nova obaveštenja, ona će se pojaviti ovde u skladu sa vašim podešavanjima.",
   "empty_column.notifications": "Još uvek nemate nikakva obaveštenja. Kada drugi ljudi budu u interakciji sa vama, videćete to ovde.",
   "empty_column.public": "Ovde nema ničega! Napišite nešto javno ili ručno pratite korisnike sa drugih servera da biste ovo popunili",
   "error.unexpected_crash.explanation": "Zbog greške u našem kodu ili problema sa kompatibilnošću pregledača, ova stranica se nije mogla pravilno prikazati.",
@@ -271,6 +272,8 @@
   "filter_modal.select_filter.subtitle": "Koristite postojeću kategoriju ili kreirajte novu",
   "filter_modal.select_filter.title": "Filtriraj ovu objavu",
   "filter_modal.title.status": "Filtriraj objavu",
+  "filtered_notifications_banner.pending_requests": "Obaveštenja od {count, plural, =0 {nikoga koga možda poznajete} one {# osobe koju možda poznajete} few {# osobe koje možda poznajete} other {# osoba koje možda poznajete}}",
+  "filtered_notifications_banner.title": "Filtrirana obaveštenja",
   "firehose.all": "Sve",
   "firehose.local": "Ovaj server",
   "firehose.remote": "Ostali serveri",
@@ -439,6 +442,10 @@
   "notification.reblog": "{name} je podržao vašu objavu",
   "notification.status": "{name} je upravo objavio",
   "notification.update": "{name} je uredio objavu",
+  "notification_requests.accept": "Prihvati",
+  "notification_requests.dismiss": "Odbaci",
+  "notification_requests.notifications_from": "Obaveštenja od {name}",
+  "notification_requests.title": "Filtrirana obaveštenja",
   "notifications.clear": "Obriši obaveštenja",
   "notifications.clear_confirmation": "Da li ste sigurni da želite trajno da obrišete sva vaša obaveštenja?",
   "notifications.column_settings.admin.report": "Nove prijave:",
@@ -470,6 +477,15 @@
   "notifications.permission_denied": "Obaveštenja na radnoj površini nisu dostupna zbog prethodno odbijenog zahteva za dozvolu pregledača",
   "notifications.permission_denied_alert": "Obaveštenja na radnoj površini ne mogu biti omogućena, jer je dozvola pregledača ranije bila odbijena",
   "notifications.permission_required": "Obaveštenja na radnoj površini nisu dostupna jer potrebna dozvola nije dodeljena.",
+  "notifications.policy.filter_new_accounts.hint": "Kreirano {days, plural, one {u poslednjeg # dana} few {u poslednja # dana} other {u poslednjih # dana}}",
+  "notifications.policy.filter_new_accounts_title": "Novi nalozi",
+  "notifications.policy.filter_not_followers_hint": "Uključujući ljude koji su vas pratili manje od {days, plural, one {# dana} few {# dana} other {# dana}}",
+  "notifications.policy.filter_not_followers_title": "Ljudi koji vas ne prate",
+  "notifications.policy.filter_not_following_hint": "Dok ih ručno ne odobrite",
+  "notifications.policy.filter_not_following_title": "Ljudi koje ne pratite",
+  "notifications.policy.filter_private_mentions_hint": "Filtrirano osim ako je odgovor na vaše pominjanje ili ako pratite pošiljaoca",
+  "notifications.policy.filter_private_mentions_title": "Neželjena privatna pominjanja",
+  "notifications.policy.title": "Filtriraj obaveštenja od…",
   "notifications_permission_banner.enable": "Omogućiti obaveštenja na radnoj površini",
   "notifications_permission_banner.how_to_control": "Da biste primali obaveštenja kada Mastodon nije otvoren, omogućite obaveštenja na radnoj površini. Kada su obaveštenja na radnoj površini omogućena vrste interakcija koje ona generišu mogu se podešavati pomoću dugmeta {icon}.",
   "notifications_permission_banner.title": "Nikada ništa ne propustite",
diff --git a/app/javascript/mastodon/locales/sr.json b/app/javascript/mastodon/locales/sr.json
index d00e322b42a9d1..9f96a2ccc05016 100644
--- a/app/javascript/mastodon/locales/sr.json
+++ b/app/javascript/mastodon/locales/sr.json
@@ -241,6 +241,7 @@
   "empty_column.list": "У овој листи још нема ничега. Када чланови ове листе објаве нешто ново, појавиће се овде.",
   "empty_column.lists": "Још увек немате ниједну листу. Када направите једну, она ће се појавити овде.",
   "empty_column.mutes": "Још увек не игноришете ниједног корисника.",
+  "empty_column.notification_requests": "Све је чисто! Овде нема ничега. Када добијете нова обавештења, она ће се појавити овде у складу са вашим подешавањима.",
   "empty_column.notifications": "Још увек немате никаква обавештења. Када други људи буду у интеракцији са вама, видећете то овде.",
   "empty_column.public": "Овде нема ничега! Напишите нешто јавно или ручно пратите кориснике са других сервера да бисте ово попунили",
   "error.unexpected_crash.explanation": "Због грешке у нашем коду или проблема са компатибилношћу прегледача, ова страница се није могла правилно приказати.",
@@ -271,6 +272,8 @@
   "filter_modal.select_filter.subtitle": "Користите постојећу категорију или креирајте нову",
   "filter_modal.select_filter.title": "Филтрирај ову објаву",
   "filter_modal.title.status": "Филтрирај објаву",
+  "filtered_notifications_banner.pending_requests": "Обавештења од {count, plural, =0 {никога кога можда познајете} one {# особе коју можда познајете} few {# особе које можда познајете} other {# особа које можда познајете}}",
+  "filtered_notifications_banner.title": "Филтрирана обавештења",
   "firehose.all": "Све",
   "firehose.local": "Овај сервер",
   "firehose.remote": "Остали сервери",
@@ -439,6 +442,10 @@
   "notification.reblog": "{name} је подржао вашу објаву",
   "notification.status": "{name} је управо објавио",
   "notification.update": "{name} је уредио објаву",
+  "notification_requests.accept": "Прихвати",
+  "notification_requests.dismiss": "Одбаци",
+  "notification_requests.notifications_from": "Обавештења од {name}",
+  "notification_requests.title": "Филтрирана обавештења",
   "notifications.clear": "Обриши обавештења",
   "notifications.clear_confirmation": "Да ли сте сигурни да желите трајно да обришете сва ваша обавештења?",
   "notifications.column_settings.admin.report": "Нове пријаве:",
@@ -470,6 +477,15 @@
   "notifications.permission_denied": "Обавештења на радној површини нису доступна због претходно одбијеног захтева за дозволу прегледача",
   "notifications.permission_denied_alert": "Обавештења на радној површини не могу бити омогућена, јер је дозвола прегледача раније била одбијена",
   "notifications.permission_required": "Обавештења на радној површини нису доступна јер потребна дозвола није додељена.",
+  "notifications.policy.filter_new_accounts.hint": "Креирано {days, plural, one {у последњег # дана} few {у последња # дана} other {у последњих # дана}}",
+  "notifications.policy.filter_new_accounts_title": "Нови налози",
+  "notifications.policy.filter_not_followers_hint": "Укључујући људе који су вас пратили мање од {days, plural, one {# дана} few {# дана} other {# дана}}",
+  "notifications.policy.filter_not_followers_title": "Људи који вас не прате",
+  "notifications.policy.filter_not_following_hint": "Док их ручно не одобрите",
+  "notifications.policy.filter_not_following_title": "Људи које не пратите",
+  "notifications.policy.filter_private_mentions_hint": "Филтрирано осим ако је одговор на ваше помињање или ако пратите пошиљаоца",
+  "notifications.policy.filter_private_mentions_title": "Нежељена приватна помињања",
+  "notifications.policy.title": "Филтрирај обавештења од…",
   "notifications_permission_banner.enable": "Омогућити обавештења на радној површини",
   "notifications_permission_banner.how_to_control": "Да бисте примали обавештења када Mastodon није отворен, омогућите обавештења на радној површини. Kада су обавештења на радној површини омогућена врсте интеракција које она генеришу могу се подешавати помоћу дугмета {icon}.",
   "notifications_permission_banner.title": "Никада ништа не пропустите",
diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json
index d92cbcda1f0d90..30a9601d67acc4 100644
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@@ -271,6 +271,7 @@
   "filter_modal.select_filter.subtitle": "ใช้หมวดหมู่ที่มีอยู่หรือสร้างหมวดหมู่ใหม่",
   "filter_modal.select_filter.title": "กรองโพสต์นี้",
   "filter_modal.title.status": "กรองโพสต์",
+  "filtered_notifications_banner.pending_requests": "การแจ้งเตือนจาก {count, plural, =0 {ไม่มีใคร} other {# คน}} ที่คุณอาจรู้จัก",
   "filtered_notifications_banner.title": "การแจ้งเตือนที่กรองอยู่",
   "firehose.all": "ทั้งหมด",
   "firehose.local": "เซิร์ฟเวอร์นี้",
diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json
index 6774ad48e1750a..08fe40fe455f52 100644
--- a/app/javascript/mastodon/locales/tr.json
+++ b/app/javascript/mastodon/locales/tr.json
@@ -241,6 +241,7 @@
   "empty_column.list": "Henüz bu listede bir şey yok. Bu listenin üyeleri bir şey paylaşığında burada gözükecek.",
   "empty_column.lists": "Henüz listen yok. Liste oluşturduğunda burada görünür.",
   "empty_column.mutes": "Henüz bir kullanıcıyı sessize almadınız.",
+  "empty_column.notification_requests": "Hepsi tamam! Burada yeni bir şey yok. Yeni bildirim aldığınızda, ayarlarınıza göre burada görüntülenecekler.",
   "empty_column.notifications": "Henüz bildiriminiz yok. Sohbete başlamak için başkalarıyla etkileşim kurun.",
   "empty_column.public": "Burada hiçbir şey yok! Herkese açık bir şeyler yazın veya burayı doldurmak için diğer sunuculardaki kullanıcıları takip edin",
   "error.unexpected_crash.explanation": "Bizim kodumuzdaki bir hatadan ya da tarayıcı uyumluluk sorunundan dolayı, bu sayfa düzgün görüntülenemedi.",
@@ -271,6 +272,8 @@
   "filter_modal.select_filter.subtitle": "Mevcut bir kategoriyi kullan veya yeni bir tane oluştur",
   "filter_modal.select_filter.title": "Bu gönderiyi süzgeçle",
   "filter_modal.title.status": "Bir gönderi süzgeçle",
+  "filtered_notifications_banner.pending_requests": "Bildiğiniz {count, plural, =0 {hiç kimseden} one {bir kişiden} other {# kişiden}} bildirim",
+  "filtered_notifications_banner.title": "Filtrelenmiş bildirimler",
   "firehose.all": "Tümü",
   "firehose.local": "Bu sunucu",
   "firehose.remote": "Diğer sunucular",
@@ -356,7 +359,7 @@
   "keyboard_shortcuts.hotkey": "Kısayol tuşu",
   "keyboard_shortcuts.legend": "Bu efsaneyi görüntülemek için",
   "keyboard_shortcuts.local": "Yerel akışı aç",
-  "keyboard_shortcuts.mention": "Yazandan bahsetmek için",
+  "keyboard_shortcuts.mention": "Yazana değinmek için",
   "keyboard_shortcuts.muted": "Sessize alınmış kullanıcı listesini açmak için",
   "keyboard_shortcuts.my_profile": "Profilinizi açmak için",
   "keyboard_shortcuts.notifications": "Bildirimler sütununu açmak için",
@@ -433,12 +436,16 @@
   "notification.favourite": "{name} gönderinizi beğendi",
   "notification.follow": "{name} seni takip etti",
   "notification.follow_request": "{name} size takip isteği gönderdi",
-  "notification.mention": "{name} senden bahsetti",
+  "notification.mention": "{name} sana değindi",
   "notification.own_poll": "Anketiniz sona erdi",
   "notification.poll": "Oy verdiğiniz bir anket sona erdi",
   "notification.reblog": "{name} gönderini yeniden paylaştı",
   "notification.status": "{name} az önce gönderdi",
   "notification.update": "{name} bir gönderiyi düzenledi",
+  "notification_requests.accept": "Onayla",
+  "notification_requests.dismiss": "Yoksay",
+  "notification_requests.notifications_from": "{name} bildirimleri",
+  "notification_requests.title": "Filtrelenmiş bildirimler",
   "notifications.clear": "Bildirimleri temizle",
   "notifications.clear_confirmation": "Tüm bildirimlerinizi kalıcı olarak temizlemek ister misiniz?",
   "notifications.column_settings.admin.report": "Yeni bildirimler:",
@@ -470,6 +477,15 @@
   "notifications.permission_denied": "Daha önce reddedilen tarayıcı izinleri isteği nedeniyle masaüstü bildirimleri kullanılamıyor",
   "notifications.permission_denied_alert": "Tarayıcı izni daha önce reddedildiğinden, masaüstü bildirimleri etkinleştirilemez",
   "notifications.permission_required": "Masaüstü bildirimleri, gereksinim duyulan izin verilmediği için mevcut değil.",
+  "notifications.policy.filter_new_accounts.hint": "Son {days, plural, one {bir gün} other {# gün}}de oluşturuldu",
+  "notifications.policy.filter_new_accounts_title": "Yeni hesaplar",
+  "notifications.policy.filter_not_followers_hint": "Sizi {days, plural, one {bir gün} other {# gün}}den azdır takip eden kişileri de içeriyor",
+  "notifications.policy.filter_not_followers_title": "Seni takip etmeyen kullanıcılar",
+  "notifications.policy.filter_not_following_hint": "Onları manuel olarak onaylayana kadar",
+  "notifications.policy.filter_not_following_title": "Takip etmediğin kullanıcılar",
+  "notifications.policy.filter_private_mentions_hint": "Kendi değinmenize yanıt veya takip ettiğiniz kullanıcıdan değilse filtrelenir",
+  "notifications.policy.filter_private_mentions_title": "İstenmeyen özel değinmeler",
+  "notifications.policy.title": "Şundan bildirimleri filtrele…",
   "notifications_permission_banner.enable": "Masaüstü bildirimlerini etkinleştir",
   "notifications_permission_banner.how_to_control": "Mastodon açık olmadığında bildirim almak için masaüstü bildirimlerini etkinleştirin. Etkinleştirildikten sonra yukarıdaki {icon} düğmesini kullanarak hangi etkileşim türlerinin masaüstü bildirimleri oluşturduğunu tam olarak kontrol edebilirsiniz.",
   "notifications_permission_banner.title": "Hiçbir şeyi kaçırmayın",
diff --git a/app/javascript/mastodon/locales/vi.json b/app/javascript/mastodon/locales/vi.json
index b1785ca5d0e114..c74c780127c7aa 100644
--- a/app/javascript/mastodon/locales/vi.json
+++ b/app/javascript/mastodon/locales/vi.json
@@ -241,6 +241,7 @@
   "empty_column.list": "Chưa có tút. Khi những người trong danh sách này đăng tút mới, chúng sẽ xuất hiện ở đây.",
   "empty_column.lists": "Bạn chưa tạo danh sách nào.",
   "empty_column.mutes": "Bạn chưa ẩn bất kỳ ai.",
+  "empty_column.notification_requests": "Sạch sẽ! Không còn gì ở đây. Khi bạn nhận được thông báo mới, chúng sẽ xuất hiện ở đây theo cài đặt của bạn.",
   "empty_column.notifications": "Bạn chưa có thông báo nào. Hãy thử theo dõi hoặc nhắn riêng cho ai đó.",
   "empty_column.public": "Trống trơn! Bạn hãy viết gì đó hoặc bắt đầu theo dõi những người khác",
   "error.unexpected_crash.explanation": "Trang này có thể không hiển thị chính xác do lỗi lập trình Mastodon hoặc vấn đề tương thích trình duyệt.",
@@ -271,6 +272,8 @@
   "filter_modal.select_filter.subtitle": "Sử dụng một danh mục hiện có hoặc tạo một danh mục mới",
   "filter_modal.select_filter.title": "Lọc tút này",
   "filter_modal.title.status": "Lọc một tút",
+  "filtered_notifications_banner.pending_requests": "{count, plural, =0 {} other {#}}",
+  "filtered_notifications_banner.title": "Thông báo đã lọc",
   "firehose.all": "Toàn bộ",
   "firehose.local": "Máy chủ này",
   "firehose.remote": "Máy chủ khác",
@@ -439,6 +442,10 @@
   "notification.reblog": "{name} đăng lại tút của bạn",
   "notification.status": "{name} đăng tút mới",
   "notification.update": "{name} đã sửa tút",
+  "notification_requests.accept": "Chấp nhận",
+  "notification_requests.dismiss": "Bỏ qua",
+  "notification_requests.notifications_from": "Thông báo từ {name}",
+  "notification_requests.title": "Thông báo đã lọc",
   "notifications.clear": "Xóa hết thông báo",
   "notifications.clear_confirmation": "Bạn thật sự muốn xóa vĩnh viễn tất cả thông báo của mình?",
   "notifications.column_settings.admin.report": "Báo cáo mới:",
@@ -470,6 +477,15 @@
   "notifications.permission_denied": "Trình duyệt không cho phép hiển thị thông báo trên màn hình.",
   "notifications.permission_denied_alert": "Không thể bật thông báo trên màn hình bởi vì trình duyệt đã cấm trước đó",
   "notifications.permission_required": "Không hiện thông báo trên màn hình bởi vì chưa cho phép.",
+  "notifications.policy.filter_new_accounts.hint": "Đã tạo trong vòng {days, plural, other {# ngày}}",
+  "notifications.policy.filter_new_accounts_title": "Tài khoản mới",
+  "notifications.policy.filter_not_followers_hint": "Bao gồm những người đã theo dõi bạn ít hơn {days, plural, other {# ngày}}",
+  "notifications.policy.filter_not_followers_title": "Những người không theo dõi bạn",
+  "notifications.policy.filter_not_following_hint": "Cho tới khi bạn duyệt họ",
+  "notifications.policy.filter_not_following_title": "Những người bạn không theo dõi",
+  "notifications.policy.filter_private_mentions_hint": "Được lọc trừ khi nó trả lời lượt nhắc từ bạn hoặc nếu bạn theo dõi người gửi",
+  "notifications.policy.filter_private_mentions_title": "Lượt nhắc riêng tư không được yêu cầu",
+  "notifications.policy.title": "Lọc ra thông báo từ…",
   "notifications_permission_banner.enable": "Cho phép thông báo trên màn hình",
   "notifications_permission_banner.how_to_control": "Hãy bật thông báo trên màn hình để không bỏ lỡ những thông báo từ Mastodon. Một khi đã bật, bạn có thể lựa chọn từng loại thông báo khác nhau thông qua {icon} nút bên dưới.",
   "notifications_permission_banner.title": "Không bỏ lỡ điều thú vị nào",
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 5d62f9143e120f..af5e1cfea8b31e 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -508,7 +508,7 @@ fa:
       private_comment: یادداشت خصوصی
       public_comment: یادداشت عمومی
       purge: پاکسازی
-      title: ارتباط میان‌سروری
+      title: ارتباط همگانی
       total_blocked_by_us: مسدودشده از طرف ما
       total_followed_by_them: ما را پی می‌گیرند
       total_followed_by_us: ما پیگیرشان هستیم
@@ -673,7 +673,7 @@ fa:
         follow_recommendations: پیروی از پیشنهادها
         profile_directory: شاخهٔ نمایه
         public_timelines: خط زمانی‌های عمومی
-        publish_discovered_servers: انتشار سرورهای یافته‌شده
+        publish_discovered_servers: انتشار کارسازهای کشف شده
         publish_statistics: انتشار آمار
         title: کشف
         trends: پرطرفدارها
@@ -898,7 +898,7 @@ fa:
     description:
       prefix_invited_by_user: "@%{name} شما را به عضویت در این کارساز ماستودون دعوت کرده است!"
       prefix_sign_up: همین امروز عضو ماستودون شوید!
-      suffix: با داشتن حساب می‌توانید دیگران را پی بگیرید، نوشته‌های تازه منتشر کنید، و با کاربران دیگر از هر سرور ماستودون دیگری و حتی سرورهای دیگر در ارتباط باشید!
+      suffix: با داشتن حساب می‌توانید دیگران را پی گرفته، نوشته‌هایی منتشر کرده و با کاربرانی از هر کارساز ماستودن دیگری در ارتباط باشید!
     didnt_get_confirmation: یک پیوند تأیید را دریافت نکردید؟
     dont_have_your_security_key: کلید امنیتیتان را ندارید؟
     forgot_password: گذرواژه خود را فراموش کرده‌اید؟
@@ -921,7 +921,7 @@ fa:
       cas: CAS
       saml: SAML
     register: عضو شوید
-    registration_closed: سرور %{instance} عضو تازه‌ای نمی‌پذیرد
+    registration_closed: کارساز %{instance} عضو تازه‌ای نمی‌پذیرد
     resend_confirmation: ارسال مجدد پیوند تایید
     reset_password: بازنشانی گذرواژه
     rules:
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index bc73e3ee0e81d8..156a4700eb2291 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -1551,7 +1551,7 @@ fi:
       limit_reached: Erilaisten reaktioiden raja saavutettu
       unrecognized_emoji: ei ole tunnistettu emoji
   redirects:
-    prompt: Mikäli luotat linkkiin, jatka napsauttaen sitä.
+    prompt: Jos luotat linkkiin, jatka napsauttamalla sitä.
     title: Olet poistumassa palvelimelta %{instance}.
   relationships:
     activity: Tilin aktiivisuus
@@ -1802,7 +1802,7 @@ fi:
       explanation: Joku on yrittänyt kirjautua tilillesi antaen väärän toisen todennustunnisteen.
       further_actions_html: Jos se et ollut sinä, suosittelemme, että %{action} välittömästi, sillä se on saattanut vaarantua.
       subject: Kaksivaiheisen todennuksen virhe
-      title: Kaksivaihekirjautumisen toinen vaihe epäonnistui
+      title: Kaksivaiheisen kirjautumisen toinen vaihe epäonnistui
     suspicious_sign_in:
       change_password: vaihda salasanasi
       details: 'Tässä on tiedot kirjautumisesta:'
diff --git a/config/locales/lad.yml b/config/locales/lad.yml
index 22930453754cd8..8affb2a88b94a1 100644
--- a/config/locales/lad.yml
+++ b/config/locales/lad.yml
@@ -1846,15 +1846,25 @@ lad:
       apps_ios_action: Abasha en App Store
       apps_step: Abasha muestras aplikasyones ofisyalas.
       apps_title: Aplikasyones de Mastodon
+      checklist_title: Lista de bienvenida
       edit_profile_action: Personaliza
       edit_profile_step: Kompleta tu profil para aumentar tus enteraksyones.
       edit_profile_title: Personaliza tu profil
       explanation: Aki ay algunos konsejos para ampesar
       feature_action: Ambezate mas
+      feature_audience_title: Konstruye tu audyensya kon konfyansa
+      feature_control_title: Manten kontrol de tu linya de tyempo
+      feature_creativity_title: Kreativita sin paralelas
+      feature_moderation_title: La moderasyon komo deveria ser
       follow_action: Sige
       follow_title: Personaliza tu linya prinsipala
+      follows_subtitle: Sige kuentos konesidos
       follows_title: A ken segir
+      follows_view_more: Ve mas personas para segir
+      hashtags_recent_count: "%{people} personas en los ultimos %{days} diyas"
+      hashtags_subtitle: Eksplora los trendes de los ultimos 2 diyas
       hashtags_title: Etiketas en trend
+      hashtags_view_more: Ve mas etiketas en trend
       post_action: Eskrive
       post_step: Puedes introdusirte al mundo kon teksto, fotos, videos o anketas.
       post_title: Eskrive tu primera publikasyon
diff --git a/config/locales/simple_form.be.yml b/config/locales/simple_form.be.yml
index e72d16a1878b7a..245c1e8528ea90 100644
--- a/config/locales/simple_form.be.yml
+++ b/config/locales/simple_form.be.yml
@@ -116,6 +116,7 @@ be:
           sign_up_requires_approval: Новыя рэгістрацыі запатрабуюць вашага ўзгаднення
         severity: Абярыце, што будзе адбывацца з запытамі з гэтага IP
       rule:
+        hint: Неабавязкова. Пазначце дадатковыя звесткі аб правіле
         text: Апішыце правіла ці патрабаванне для карыстальнікаў на гэтым серверы. Імкніцеся зрабіць яго простым ды кароткім
       sessions:
         otp: 'Увядзіце код двухфактарнай аўтэнтыфікацыі з вашага тэлефона або адзін з кодаў аднаўлення:'
@@ -299,6 +300,7 @@ be:
           patch: Апавяшчаць аб абнаўленнях з выпраўленнем памылак
         trending_tag: Новы трэнд патрабуе разгляду
       rule:
+        hint: Дадатковая інфармацыя
         text: Правіла
       settings:
         indexable: Індэксаваць профіль у пошукавых сістэмах
diff --git a/config/locales/simple_form.ca.yml b/config/locales/simple_form.ca.yml
index 357f482b8339ff..e4bee0214c0349 100644
--- a/config/locales/simple_form.ca.yml
+++ b/config/locales/simple_form.ca.yml
@@ -116,7 +116,7 @@ ca:
           sign_up_requires_approval: Els nous registres requeriran la teva aprovació
         severity: Tria què passarà amb les sol·licituds des d’aquesta IP
       rule:
-        hint: Opcional. Proporciona més detalls de la regla
+        hint: Opcional. Proporcioneu més detalls de la regla
         text: Descriu una norma o requeriment pels usuaris d'aquest servidor. Intenta fer-la curta i senzilla
       sessions:
         otp: 'Introdueix el codi de dos factors generat per el teu telèfon o utilitza un dels teus codis de recuperació:'
diff --git a/config/locales/simple_form.fa.yml b/config/locales/simple_form.fa.yml
index a312e5aa1c641a..03f18754519162 100644
--- a/config/locales/simple_form.fa.yml
+++ b/config/locales/simple_form.fa.yml
@@ -62,7 +62,7 @@ fa:
         username: تنها می‌توانید از حروف، اعداد، و زیرخط استفاده کنید
         whole_word: اگر کلیدواژه فقط دارای حروف و اعداد باشد، تنها وقتی پیدا می‌شود که با کل یک واژه در متن منطبق باشد، نه با بخشی از یک واژه
       domain_allow:
-        domain: این دامین خواهد توانست داده‌ها از این سرور را دریافت کند و داده‌های از این دامین در این‌جا پردازش و ذخیره خواهند شد
+        domain: این دامنه خواهد توانست داده‌ها را از این کارساز واکشی کرده و داده‌های ورودی از آن پردازش و ذخیره خواهند شد
       email_domain_block:
         domain: این می‌تواند نام دامنه‌ای باشد که در نشانی رایانامه یا رکورد MX استفاده می‌شود. پس از ثبت نام بررسی خواهند شد.
         with_dns_records: تلاشی برای resolve کردن رکوردهای ساناد دامنهٔ داده‌شده انجام شده و نتیجه نیز مسدود خواهد شد
diff --git a/config/locales/simple_form.fi.yml b/config/locales/simple_form.fi.yml
index 3d79f76e8a66e9..b1c2e91a1ee3e7 100644
--- a/config/locales/simple_form.fi.yml
+++ b/config/locales/simple_form.fi.yml
@@ -116,6 +116,7 @@ fi:
           sign_up_requires_approval: Uudet rekisteröitymiset edellyttävät hyväksyntääsi
         severity: Valitse, mitä tapahtuu tämän IP-osoitteen pyynnöille
       rule:
+        hint: Valinnainen. Anna lisätietoja säännöstä
         text: Kuvaile sääntöä tai edellytystä palvelimesi käyttäjille. Suosi tiivistä, yksinkertaista ilmaisua
       sessions:
         otp: 'Näppäile mobiilisovelluksessa näkyvä kaksivaiheisen todennuksen tunnusluku, tai käytä tarvittaessa palautuskoodia:'
@@ -299,6 +300,7 @@ fi:
           patch: Ilmoita virhekorjauspäivityksistä
         trending_tag: Uusi trendi vaatii tarkistusta
       rule:
+        hint: Lisätietoja
         text: Sääntö
       settings:
         indexable: Sisällytä profiilisivu hakukoneisiin
diff --git a/config/locales/simple_form.ja.yml b/config/locales/simple_form.ja.yml
index e7b8e156167b20..81615c134420e9 100644
--- a/config/locales/simple_form.ja.yml
+++ b/config/locales/simple_form.ja.yml
@@ -116,6 +116,7 @@ ja:
           sign_up_requires_approval: 承認するまで新規登録が完了しなくなります
         severity: このIPに対する措置を選択してください
       rule:
+        hint: ルールについての具体的な説明を追加できます (任意)
         text: ユーザーのためのルールや要件を記述してください。短くシンプルにしてください。
       sessions:
         otp: '携帯電話のアプリで生成された二要素認証コードを入力するか、リカバリーコードを使用してください:'
@@ -299,6 +300,7 @@ ja:
           patch: 緊急のアップデートとバグ修正アップデートを通知する
         trending_tag: 新しいトレンドのレビューをする必要がある時
       rule:
+        hint: ルールの補足説明
         text: ルール
       settings:
         indexable: 検索エンジンからアクセスできるようにする
diff --git a/config/locales/simple_form.lad.yml b/config/locales/simple_form.lad.yml
index 2de24c38ff6eb2..75113be18b6669 100644
--- a/config/locales/simple_form.lad.yml
+++ b/config/locales/simple_form.lad.yml
@@ -116,6 +116,7 @@ lad:
           sign_up_requires_approval: Muevas enrejistrasyones rekeriran tu achetasyon
         severity: Eskoje lo ke pasara kon las petisyones dizde este IP
       rule:
+        hint: Opsyonal. Adjusta mas detalyos sovre la regla
         text: Deskrive una norma o rekerensya para los utilizadores de este sirvidor. Aprova fazerla kurta i kolay
       sessions:
         otp: 'Introduse el kodiche de autentifikasyon de dos pasos djenerado por tu aplikasyon de telefon o uza uno de tus kodiches de recuperasyon:'
diff --git a/config/locales/simple_form.sr-Latn.yml b/config/locales/simple_form.sr-Latn.yml
index 6ed095e2a27b9a..13296a04ce9984 100644
--- a/config/locales/simple_form.sr-Latn.yml
+++ b/config/locales/simple_form.sr-Latn.yml
@@ -116,6 +116,7 @@ sr-Latn:
           sign_up_requires_approval: Nove registracije će zahtevati Vaše odobrenje
         severity: Izaberite šta će se desiti sa zahtevima sa ove IP adrese
       rule:
+        hint: Opcionalno. Pružite više detalja o pravilu
         text: Opišite pravilo ili uslov za korisnike na ovom serveru. Potrudite se da opis bude kratak i jednostavan
       sessions:
         otp: 'Unesite dvofaktorski kod sa Vašeg telefona ili koristite jedan od kodova za oporavak:'
diff --git a/config/locales/simple_form.sr.yml b/config/locales/simple_form.sr.yml
index 4fb32000b7684b..9820482182cca6 100644
--- a/config/locales/simple_form.sr.yml
+++ b/config/locales/simple_form.sr.yml
@@ -116,6 +116,7 @@ sr:
           sign_up_requires_approval: Нове регистрације ће захтевати Ваше одобрење
         severity: Изаберите шта ће се десити са захтевима са ове IP адресе
       rule:
+        hint: Опционално. Пружите више детаља о правилу
         text: Опишите правило или услов за кориснике на овом серверу. Потрудите се да опис буде кратак и једноставан
       sessions:
         otp: 'Унесите двофакторски код са Вашег телефона или користите један од кодова за опоравак:'
diff --git a/config/locales/simple_form.tr.yml b/config/locales/simple_form.tr.yml
index cc644d4df4bfe6..16c23caeb0bd59 100644
--- a/config/locales/simple_form.tr.yml
+++ b/config/locales/simple_form.tr.yml
@@ -116,6 +116,7 @@ tr:
           sign_up_requires_approval: Yeni kayıt onayınızı gerektirir
         severity: Bu IP'den gelen isteklere ne olacağını seçin
       rule:
+        hint: İsteğe bağlı. Kural hakkında daha fazla ayrıntı verin
         text: Bu sunucu üzerindeki kullanıcılar için bir kural veya gereksinimi tanımlayın. Kuralı kısa ve yalın tutmaya çalışın
       sessions:
         otp: 'Telefonunuzdaki two-factor kodunuzu giriniz veya kurtarma kodlarınızdan birini giriniz:'
@@ -299,6 +300,7 @@ tr:
           patch: Yama güncellemelerini bildir
         trending_tag: Yeni eğilimin gözden geçmesi gerekiyor
       rule:
+        hint: Ek bilgi
         text: Kural
       settings:
         indexable: Arama motorları profil sayfasını içersin
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index ecf79da51a4a37..0aa7ad34bcb261 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -1843,6 +1843,7 @@ sq:
       apps_step: Shkarkoni aplikacionet tona zyrtare.
       apps_title: Aplikacione Mastodon
       checklist_subtitle: 'Le t’ju vëmë në udhë drejt këtij horizonti të ri rrjetesh shoqërorë:'
+      checklist_title: Listë hapash mirëseardhjeje
       edit_profile_action: Personalizojeni
       edit_profile_step: Përforconi ndërveprimet tuaja, duke pasur një profil shterues.
       edit_profile_title: Personalizoni profilin tuaj

From acf3f410aef3cfb9e8f5f73042526de9b2f96d13 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Wed, 13 Mar 2024 13:54:50 +0100
Subject: [PATCH 0423/2191] Fix navigation panel icons missing classes (#29569)

---
 .../mastodon/features/ui/components/navigation_panel.jsx  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/javascript/mastodon/features/ui/components/navigation_panel.jsx b/app/javascript/mastodon/features/ui/components/navigation_panel.jsx
index deda3258b92b7e..f2b40af72b1872 100644
--- a/app/javascript/mastodon/features/ui/components/navigation_panel.jsx
+++ b/app/javascript/mastodon/features/ui/components/navigation_panel.jsx
@@ -64,8 +64,8 @@ const NotificationsLink = () => {
     <ColumnLink
       transparent
       to='/notifications'
-      icon={<IconWithBadge icon={NotificationsIcon} count={count} className='column-link__icon' />}
-      activeIcon={<IconWithBadge icon={NotificationsActiveIcon} count={count} className='column-link__icon' />}
+      icon={<IconWithBadge id='bell' icon={NotificationsIcon} count={count} className='column-link__icon' />}
+      activeIcon={<IconWithBadge id='bell' icon={NotificationsActiveIcon} count={count} className='column-link__icon' />}
       text={intl.formatMessage(messages.notifications)}
     />
   );
@@ -88,8 +88,8 @@ const FollowRequestsLink = () => {
     <ColumnLink
       transparent
       to='/follow_requests'
-      icon={<IconWithBadge icon={PersonAddIcon} count={count} className='column-link__icon' />}
-      activeIcon={<IconWithBadge icon={PersonAddActiveIcon} count={count} className='column-link__icon' />}
+      icon={<IconWithBadge id='user-plus' icon={PersonAddIcon} count={count} className='column-link__icon' />}
+      activeIcon={<IconWithBadge id='user-plus' icon={PersonAddActiveIcon} count={count} className='column-link__icon' />}
       text={intl.formatMessage(messages.followRequests)}
     />
   );

From c09b8a716473ff251ecd81fe6050a38133ddabb0 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 13 Mar 2024 10:11:23 -0400
Subject: [PATCH 0424/2191] Add `Account.without_internal` scope (#29559)

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
---
 app/controllers/application_controller.rb | 2 +-
 app/helpers/application_helper.rb         | 2 +-
 app/models/account.rb                     | 1 +
 spec/models/account_spec.rb               | 8 ++++----
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index a046ea19c97d43..8ba10d64c006f4 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -129,7 +129,7 @@ def too_many_requests
   end
 
   def single_user_mode?
-    @single_user_mode ||= Rails.configuration.x.single_user_mode && Account.where('id > 0').exists?
+    @single_user_mode ||= Rails.configuration.x.single_user_mode && Account.without_internal.exists?
   end
 
   def use_seamless_external_login?
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 4f7f66985db534..a4f92743c5829d 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -213,7 +213,7 @@ def render_initial_state
       state_params[:moved_to_account] = current_account.moved_to_account
     end
 
-    state_params[:owner] = Account.local.without_suspended.where('id > 0').first if single_user_mode?
+    state_params[:owner] = Account.local.without_suspended.without_internal.first if single_user_mode?
 
     json = ActiveModelSerializers::SerializableResource.new(InitialStatePresenter.new(state_params), serializer: InitialStateSerializer).to_json
     # rubocop:disable Rails/OutputSafety
diff --git a/app/models/account.rb b/app/models/account.rb
index d627fd6b64422f..0a4c0f34788f9a 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -111,6 +111,7 @@ class Account < ApplicationRecord
 
   normalizes :username, with: ->(username) { username.squish }
 
+  scope :without_internal, -> { where(id: 1...) }
   scope :remote, -> { where.not(domain: nil) }
   scope :local, -> { where(domain: nil) }
   scope :partitioned, -> { order(Arel.sql('row_number() over (partition by domain)')) }
diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb
index f6376eb36e7789..bdb33e53cee248 100644
--- a/spec/models/account_spec.rb
+++ b/spec/models/account_spec.rb
@@ -888,7 +888,7 @@
           { username: 'b', domain: 'b' },
         ].map(&method(:Fabricate).curry(2).call(:account))
 
-        expect(described_class.where('id > 0').alphabetic).to eq matches
+        expect(described_class.without_internal.alphabetic).to eq matches
       end
     end
 
@@ -939,7 +939,7 @@
       it 'returns an array of accounts who do not have a domain' do
         local_account = Fabricate(:account, domain: nil)
         _account_with_domain = Fabricate(:account, domain: 'example.com')
-        expect(described_class.where('id > 0').local).to contain_exactly(local_account)
+        expect(described_class.without_internal.local).to contain_exactly(local_account)
       end
     end
 
@@ -950,14 +950,14 @@
           matches[index] = Fabricate(:account, domain: matches[index])
         end
 
-        expect(described_class.where('id > 0').partitioned).to match_array(matches)
+        expect(described_class.without_internal.partitioned).to match_array(matches)
       end
     end
 
     describe 'recent' do
       it 'returns a relation of accounts sorted by recent creation' do
         matches = Array.new(2) { Fabricate(:account) }
-        expect(described_class.where('id > 0').recent).to match_array(matches)
+        expect(described_class.without_internal.recent).to match_array(matches)
       end
     end
 

From 6262ceeb704c9636f09c25e856638ee4441b58d9 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 13 Mar 2024 11:42:39 -0400
Subject: [PATCH 0425/2191] Fix `RSpec/DescribedClass` cop (#29472)

---
 spec/lib/feed_manager_spec.rb                 | 12 +++++-----
 spec/lib/sanitize/config_spec.rb              |  2 +-
 spec/lib/signature_parser_spec.rb             |  2 +-
 spec/lib/webfinger_resource_spec.rb           |  4 ++--
 spec/models/account_spec.rb                   |  2 +-
 spec/models/form/import_spec.rb               |  2 +-
 spec/models/privacy_policy_spec.rb            |  2 +-
 spec/models/tag_spec.rb                       |  2 +-
 spec/models/user_role_spec.rb                 | 22 +++++++++----------
 spec/models/user_settings_spec.rb             |  4 ++--
 spec/services/post_status_service_spec.rb     |  2 +-
 .../validators/follow_limit_validator_spec.rb |  2 +-
 12 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/spec/lib/feed_manager_spec.rb b/spec/lib/feed_manager_spec.rb
index 618b6167bdb9c0..613bcb3045da32 100644
--- a/spec/lib/feed_manager_spec.rb
+++ b/spec/lib/feed_manager_spec.rb
@@ -11,7 +11,7 @@
   end
 
   it 'tracks at least as many statuses as reblogs', :skip_stub do
-    expect(FeedManager::REBLOG_FALLOFF).to be <= FeedManager::MAX_ITEMS
+    expect(described_class::REBLOG_FALLOFF).to be <= described_class::MAX_ITEMS
   end
 
   describe '#key' do
@@ -225,12 +225,12 @@
     it 'trims timelines if they will have more than FeedManager::MAX_ITEMS' do
       account = Fabricate(:account)
       status = Fabricate(:status)
-      members = Array.new(FeedManager::MAX_ITEMS) { |count| [count, count] }
+      members = Array.new(described_class::MAX_ITEMS) { |count| [count, count] }
       redis.zadd("feed:home:#{account.id}", members)
 
       described_class.instance.push_to_home(account, status)
 
-      expect(redis.zcard("feed:home:#{account.id}")).to eq FeedManager::MAX_ITEMS
+      expect(redis.zcard("feed:home:#{account.id}")).to eq described_class::MAX_ITEMS
     end
 
     context 'with reblogs' do
@@ -260,7 +260,7 @@
         described_class.instance.push_to_home(account, reblogged)
 
         # Fill the feed with intervening statuses
-        FeedManager::REBLOG_FALLOFF.times do
+        described_class::REBLOG_FALLOFF.times do
           described_class.instance.push_to_home(account, Fabricate(:status))
         end
 
@@ -321,7 +321,7 @@
         described_class.instance.push_to_home(account, reblogs.first)
 
         # Fill the feed with intervening statuses
-        FeedManager::REBLOG_FALLOFF.times do
+        described_class::REBLOG_FALLOFF.times do
           described_class.instance.push_to_home(account, Fabricate(:status))
         end
 
@@ -467,7 +467,7 @@
       status    = Fabricate(:status, reblog: reblogged)
 
       described_class.instance.push_to_home(receiver, reblogged)
-      FeedManager::REBLOG_FALLOFF.times { described_class.instance.push_to_home(receiver, Fabricate(:status)) }
+      described_class::REBLOG_FALLOFF.times { described_class.instance.push_to_home(receiver, Fabricate(:status)) }
       described_class.instance.push_to_home(receiver, status)
 
       # The reblogging status should show up under normal conditions.
diff --git a/spec/lib/sanitize/config_spec.rb b/spec/lib/sanitize/config_spec.rb
index 550ad1c52b0643..2d8dc2f63be6fb 100644
--- a/spec/lib/sanitize/config_spec.rb
+++ b/spec/lib/sanitize/config_spec.rb
@@ -4,7 +4,7 @@
 
 describe Sanitize::Config do
   describe '::MASTODON_STRICT' do
-    subject { Sanitize::Config::MASTODON_STRICT }
+    subject { described_class::MASTODON_STRICT }
 
     it 'converts h1 to p strong' do
       expect(Sanitize.fragment('<h1>Foo</h1>', subject)).to eq '<p><strong>Foo</strong></p>'
diff --git a/spec/lib/signature_parser_spec.rb b/spec/lib/signature_parser_spec.rb
index 08e9bea66c6e9e..3f398e8dd0dfa9 100644
--- a/spec/lib/signature_parser_spec.rb
+++ b/spec/lib/signature_parser_spec.rb
@@ -27,7 +27,7 @@
       let(:header) { 'hello this is malformed!' }
 
       it 'raises an error' do
-        expect { subject }.to raise_error(SignatureParser::ParsingError)
+        expect { subject }.to raise_error(described_class::ParsingError)
       end
     end
   end
diff --git a/spec/lib/webfinger_resource_spec.rb b/spec/lib/webfinger_resource_spec.rb
index 0e2bdcb71ad6d9..442f91aad02095 100644
--- a/spec/lib/webfinger_resource_spec.rb
+++ b/spec/lib/webfinger_resource_spec.rb
@@ -46,7 +46,7 @@
 
         expect do
           described_class.new(resource).username
-        end.to raise_error(WebfingerResource::InvalidRequest)
+        end.to raise_error(described_class::InvalidRequest)
       end
 
       it 'finds the username in a valid https route' do
@@ -137,7 +137,7 @@
 
         expect do
           described_class.new(resource).username
-        end.to raise_error(WebfingerResource::InvalidRequest)
+        end.to raise_error(described_class::InvalidRequest)
       end
     end
   end
diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb
index bdb33e53cee248..2c5df198d97f88 100644
--- a/spec/models/account_spec.rb
+++ b/spec/models/account_spec.rb
@@ -678,7 +678,7 @@
   end
 
   describe 'MENTION_RE' do
-    subject { Account::MENTION_RE }
+    subject { described_class::MENTION_RE }
 
     it 'matches usernames in the middle of a sentence' do
       expect(subject.match('Hello to @alice from me')[1]).to eq 'alice'
diff --git a/spec/models/form/import_spec.rb b/spec/models/form/import_spec.rb
index 872697485ed269..c2f41d442c96a6 100644
--- a/spec/models/form/import_spec.rb
+++ b/spec/models/form/import_spec.rb
@@ -30,7 +30,7 @@
 
       it 'has errors' do
         subject.validate
-        expect(subject.errors[:data]).to include(I18n.t('imports.errors.over_rows_processing_limit', count: Form::Import::ROWS_PROCESSING_LIMIT))
+        expect(subject.errors[:data]).to include(I18n.t('imports.errors.over_rows_processing_limit', count: described_class::ROWS_PROCESSING_LIMIT))
       end
     end
 
diff --git a/spec/models/privacy_policy_spec.rb b/spec/models/privacy_policy_spec.rb
index 0d7471375509ab..03bbe7264b6ee9 100644
--- a/spec/models/privacy_policy_spec.rb
+++ b/spec/models/privacy_policy_spec.rb
@@ -8,7 +8,7 @@
       it 'has the privacy text' do
         policy = described_class.current
 
-        expect(policy.text).to eq(PrivacyPolicy::DEFAULT_PRIVACY_POLICY)
+        expect(policy.text).to eq(described_class::DEFAULT_PRIVACY_POLICY)
       end
     end
 
diff --git a/spec/models/tag_spec.rb b/spec/models/tag_spec.rb
index 69aaeed0afece6..5a1d620884864a 100644
--- a/spec/models/tag_spec.rb
+++ b/spec/models/tag_spec.rb
@@ -22,7 +22,7 @@
   end
 
   describe 'HASHTAG_RE' do
-    subject { Tag::HASHTAG_RE }
+    subject { described_class::HASHTAG_RE }
 
     it 'does not match URLs with anchors with non-hashtag characters' do
       expect(subject.match('Check this out https://medium.com/@alice/some-article#.abcdef123')).to be_nil
diff --git a/spec/models/user_role_spec.rb b/spec/models/user_role_spec.rb
index 96d12263ae8e28..4ab66c32601951 100644
--- a/spec/models/user_role_spec.rb
+++ b/spec/models/user_role_spec.rb
@@ -8,7 +8,7 @@
   describe '#can?' do
     context 'with a single flag' do
       it 'returns true if any of them are present' do
-        subject.permissions = UserRole::FLAGS[:manage_reports]
+        subject.permissions = described_class::FLAGS[:manage_reports]
         expect(subject.can?(:manage_reports)).to be true
       end
 
@@ -19,7 +19,7 @@
 
     context 'with multiple flags' do
       it 'returns true if any of them are present' do
-        subject.permissions = UserRole::FLAGS[:manage_users]
+        subject.permissions = described_class::FLAGS[:manage_users]
         expect(subject.can?(:manage_reports, :manage_users)).to be true
       end
 
@@ -51,7 +51,7 @@
 
   describe '#permissions_as_keys' do
     before do
-      subject.permissions = UserRole::FLAGS[:invite_users] | UserRole::FLAGS[:view_dashboard] | UserRole::FLAGS[:manage_reports]
+      subject.permissions = described_class::FLAGS[:invite_users] | described_class::FLAGS[:view_dashboard] | described_class::FLAGS[:manage_reports]
     end
 
     it 'returns an array' do
@@ -70,7 +70,7 @@
       let(:input) { %w(manage_users) }
 
       it 'sets permission flags' do
-        expect(subject.permissions).to eq UserRole::FLAGS[:manage_users]
+        expect(subject.permissions).to eq described_class::FLAGS[:manage_users]
       end
     end
 
@@ -78,7 +78,7 @@
       let(:input) { %w(manage_users manage_reports) }
 
       it 'sets permission flags' do
-        expect(subject.permissions).to eq UserRole::FLAGS[:manage_users] | UserRole::FLAGS[:manage_reports]
+        expect(subject.permissions).to eq described_class::FLAGS[:manage_users] | described_class::FLAGS[:manage_reports]
       end
     end
 
@@ -86,7 +86,7 @@
       let(:input) { %w(foo) }
 
       it 'does not set permission flags' do
-        expect(subject.permissions).to eq UserRole::Flags::NONE
+        expect(subject.permissions).to eq described_class::Flags::NONE
       end
     end
   end
@@ -96,7 +96,7 @@
       subject { described_class.nobody }
 
       it 'returns none' do
-        expect(subject.computed_permissions).to eq UserRole::Flags::NONE
+        expect(subject.computed_permissions).to eq described_class::Flags::NONE
       end
     end
 
@@ -110,11 +110,11 @@
 
     context 'when role has the administrator flag' do
       before do
-        subject.permissions = UserRole::FLAGS[:administrator]
+        subject.permissions = described_class::FLAGS[:administrator]
       end
 
       it 'returns all permissions' do
-        expect(subject.computed_permissions).to eq UserRole::Flags::ALL
+        expect(subject.computed_permissions).to eq described_class::Flags::ALL
       end
     end
 
@@ -135,7 +135,7 @@
     end
 
     it 'has default permissions' do
-      expect(subject.permissions).to eq UserRole::FLAGS[:invite_users]
+      expect(subject.permissions).to eq described_class::FLAGS[:invite_users]
     end
 
     it 'has negative position' do
@@ -155,7 +155,7 @@
     end
 
     it 'has no permissions' do
-      expect(subject.permissions).to eq UserRole::Flags::NONE
+      expect(subject.permissions).to eq described_class::Flags::NONE
     end
 
     it 'has negative position' do
diff --git a/spec/models/user_settings_spec.rb b/spec/models/user_settings_spec.rb
index 653597c90de597..dfc4910d6e9e58 100644
--- a/spec/models/user_settings_spec.rb
+++ b/spec/models/user_settings_spec.rb
@@ -24,7 +24,7 @@
 
     context 'when setting was not defined' do
       it 'raises error' do
-        expect { subject[:foo] }.to raise_error UserSettings::KeyError
+        expect { subject[:foo] }.to raise_error described_class::KeyError
       end
     end
   end
@@ -93,7 +93,7 @@
   describe '.definition_for' do
     context 'when key is defined' do
       it 'returns a setting' do
-        expect(described_class.definition_for(:always_send_emails)).to be_a UserSettings::Setting
+        expect(described_class.definition_for(:always_send_emails)).to be_a described_class::Setting
       end
     end
 
diff --git a/spec/services/post_status_service_spec.rb b/spec/services/post_status_service_spec.rb
index ee68092a36704e..3c2e4f3a79c193 100644
--- a/spec/services/post_status_service_spec.rb
+++ b/spec/services/post_status_service_spec.rb
@@ -150,7 +150,7 @@
 
     expect do
       subject.call(account, text: '@alice hm, @bob is really annoying lately', allowed_mentions: [mentioned_account.id])
-    end.to raise_error(an_instance_of(PostStatusService::UnexpectedMentionsError).and(having_attributes(accounts: [unexpected_mentioned_account])))
+    end.to raise_error(an_instance_of(described_class::UnexpectedMentionsError).and(having_attributes(accounts: [unexpected_mentioned_account])))
   end
 
   it 'processes duplicate mentions correctly' do
diff --git a/spec/validators/follow_limit_validator_spec.rb b/spec/validators/follow_limit_validator_spec.rb
index 51b0683d2708f7..e069b0ed3ab217 100644
--- a/spec/validators/follow_limit_validator_spec.rb
+++ b/spec/validators/follow_limit_validator_spec.rb
@@ -56,7 +56,7 @@
 
             follow.valid?
 
-            expect(follow.errors[:base]).to include(I18n.t('users.follow_limit_reached', limit: FollowLimitValidator::LIMIT))
+            expect(follow.errors[:base]).to include(I18n.t('users.follow_limit_reached', limit: described_class::LIMIT))
           end
         end
 

From 71e5f0f48c3bc95a894fa3ad2c5a34f05c584482 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 13 Mar 2024 11:43:40 -0400
Subject: [PATCH 0426/2191] Add coverage for suspended instance actor scenario
 (#29571)

---
 spec/controllers/instance_actors_controller_spec.rb | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/spec/controllers/instance_actors_controller_spec.rb b/spec/controllers/instance_actors_controller_spec.rb
index 70aaff9d65b098..42ffb679884e08 100644
--- a/spec/controllers/instance_actors_controller_spec.rb
+++ b/spec/controllers/instance_actors_controller_spec.rb
@@ -41,6 +41,14 @@
 
         it_behaves_like 'shared behavior'
       end
+
+      context 'with a suspended instance actor' do
+        let(:authorized_fetch_mode) { false }
+
+        before { Account.representative.update(suspended_at: 10.days.ago) }
+
+        it_behaves_like 'shared behavior'
+      end
     end
   end
 end

From a32a126cac42c73236236b5a9bd660765b9c58ee Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 13 Mar 2024 17:47:48 +0100
Subject: [PATCH 0427/2191] Hide media by default in notification requests
 (#29572)

---
 app/javascript/mastodon/components/status.jsx | 25 ++++++-----
 .../features/notifications/request.jsx        | 41 ++++++++++---------
 .../ui/util/sensitive_media_context.tsx       | 28 +++++++++++++
 3 files changed, 65 insertions(+), 29 deletions(-)
 create mode 100644 app/javascript/mastodon/features/ui/util/sensitive_media_context.tsx

diff --git a/app/javascript/mastodon/components/status.jsx b/app/javascript/mastodon/components/status.jsx
index be9a1cec6593db..7b97e4576670dc 100644
--- a/app/javascript/mastodon/components/status.jsx
+++ b/app/javascript/mastodon/components/status.jsx
@@ -22,6 +22,7 @@ import Card from '../features/status/components/card';
 // to use the progress bar to show download progress
 import Bundle from '../features/ui/components/bundle';
 import { MediaGallery, Video, Audio } from '../features/ui/util/async-components';
+import { SensitiveMediaContext } from '../features/ui/util/sensitive_media_context';
 import { displayMedia } from '../initial_state';
 
 import { Avatar } from './avatar';
@@ -78,6 +79,8 @@ const messages = defineMessages({
 
 class Status extends ImmutablePureComponent {
 
+  static contextType = SensitiveMediaContext;
+
   static propTypes = {
     status: ImmutablePropTypes.map,
     account: ImmutablePropTypes.record,
@@ -133,19 +136,21 @@ class Status extends ImmutablePureComponent {
   ];
 
   state = {
-    showMedia: defaultMediaVisibility(this.props.status),
-    statusId: undefined,
+    showMedia: defaultMediaVisibility(this.props.status) && !(this.context?.hideMediaByDefault),
     forceFilter: undefined,
   };
 
-  static getDerivedStateFromProps(nextProps, prevState) {
-    if (nextProps.status && nextProps.status.get('id') !== prevState.statusId) {
-      return {
-        showMedia: defaultMediaVisibility(nextProps.status),
-        statusId: nextProps.status.get('id'),
-      };
-    } else {
-      return null;
+  componentDidUpdate (prevProps) {
+    // This will potentially cause a wasteful redraw, but in most cases `Status` components are used
+    // with a `key` directly depending on their `id`, preventing re-use of the component across
+    // different IDs.
+    // But just in case this does change, reset the state on status change.
+
+    if (this.props.status?.get('id') !== prevProps.status?.get('id')) {
+      this.setState({
+        showMedia: defaultMediaVisibility(this.props.status) && !(this.context?.hideMediaByDefault),
+        forceFilter: undefined,
+      });
     }
   }
 
diff --git a/app/javascript/mastodon/features/notifications/request.jsx b/app/javascript/mastodon/features/notifications/request.jsx
index 5977a6ce96ab56..da9ed21e55f3c0 100644
--- a/app/javascript/mastodon/features/notifications/request.jsx
+++ b/app/javascript/mastodon/features/notifications/request.jsx
@@ -15,6 +15,7 @@ import Column from 'mastodon/components/column';
 import ColumnHeader from 'mastodon/components/column_header';
 import { IconButton } from 'mastodon/components/icon_button';
 import ScrollableList from 'mastodon/components/scrollable_list';
+import { SensitiveMediaContextProvider } from 'mastodon/features/ui/util/sensitive_media_context';
 
 import NotificationContainer from './containers/notification_container';
 
@@ -106,25 +107,27 @@ export const NotificationRequest = ({ multiColumn, params: { id } }) => {
         )}
       />
 
-      <ScrollableList
-        scrollKey={`notification_requests/${id}`}
-        trackScroll={!multiColumn}
-        bindToDocument={!multiColumn}
-        isLoading={isLoading}
-        showLoading={isLoading && notifications.size === 0}
-        hasMore={hasMore}
-        onLoadMore={handleLoadMore}
-      >
-        {notifications.map(item => (
-          item && <NotificationContainer
-            key={item.get('id')}
-            notification={item}
-            accountId={item.get('account')}
-            onMoveUp={handleMoveUp}
-            onMoveDown={handleMoveDown}
-          />
-        ))}
-      </ScrollableList>
+      <SensitiveMediaContextProvider hideMediaByDefault>
+        <ScrollableList
+          scrollKey={`notification_requests/${id}`}
+          trackScroll={!multiColumn}
+          bindToDocument={!multiColumn}
+          isLoading={isLoading}
+          showLoading={isLoading && notifications.size === 0}
+          hasMore={hasMore}
+          onLoadMore={handleLoadMore}
+        >
+          {notifications.map(item => (
+            item && <NotificationContainer
+              key={item.get('id')}
+              notification={item}
+              accountId={item.get('account')}
+              onMoveUp={handleMoveUp}
+              onMoveDown={handleMoveDown}
+            />
+          ))}
+        </ScrollableList>
+      </SensitiveMediaContextProvider>
 
       <Helmet>
         <title>{columnTitle}</title>
diff --git a/app/javascript/mastodon/features/ui/util/sensitive_media_context.tsx b/app/javascript/mastodon/features/ui/util/sensitive_media_context.tsx
new file mode 100644
index 00000000000000..408154c31bf122
--- /dev/null
+++ b/app/javascript/mastodon/features/ui/util/sensitive_media_context.tsx
@@ -0,0 +1,28 @@
+import { createContext, useContext, useMemo } from 'react';
+
+export const SensitiveMediaContext = createContext<{
+  hideMediaByDefault: boolean;
+}>({
+  hideMediaByDefault: false,
+});
+
+export function useSensitiveMediaContext() {
+  return useContext(SensitiveMediaContext);
+}
+
+type ContextValue = React.ContextType<typeof SensitiveMediaContext>;
+
+export const SensitiveMediaContextProvider: React.FC<
+  React.PropsWithChildren<{ hideMediaByDefault: boolean }>
+> = ({ hideMediaByDefault, children }) => {
+  const contextValue = useMemo<ContextValue>(
+    () => ({ hideMediaByDefault }),
+    [hideMediaByDefault],
+  );
+
+  return (
+    <SensitiveMediaContext.Provider value={contextValue}>
+      {children}
+    </SensitiveMediaContext.Provider>
+  );
+};

From 13c95244361e45cd983fab02c711f9b51f4477c3 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 11 Mar 2024 16:02:21 +0100
Subject: [PATCH 0428/2191] [Glitch] Add notification policies and notification
 requests in web UI

Port c10bbf5fe3800f933c33fa19cf23b5ec4fb778ea to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/actions/notifications.js  | 293 ++++++++++++++++++
 .../glitch/components/column_header.jsx       |  53 ++--
 .../components/column_settings.jsx            |   2 +-
 .../components/column_settings.jsx            |  26 +-
 .../glitch/features/firehose/index.jsx        |  53 ++--
 .../components/column_settings.jsx            |  40 +--
 .../components/column_settings.tsx            | 123 ++++----
 .../glitch/features/list_timeline/index.jsx   |  59 ++--
 .../components/checkbox_with_label.jsx        |  31 ++
 .../components/column_settings.jsx            | 147 +++++----
 .../filtered_notifications_banner.jsx         |  49 +++
 .../components/notification_request.jsx       |  65 ++++
 .../containers/column_settings_container.js   |   9 +-
 .../glitch/features/notifications/index.jsx   |   4 +
 .../glitch/features/notifications/request.jsx | 144 +++++++++
 .../features/notifications/requests.jsx       |  85 +++++
 .../components/column_settings.jsx            |  28 +-
 .../flavours/glitch/features/ui/index.jsx     |   6 +-
 .../features/ui/util/async-components.js      |   8 +
 .../flavours/glitch/locales/en.json           |   3 +
 .../flavours/glitch/reducers/index.ts         |   4 +
 .../glitch/reducers/notification_policy.js    |  12 +
 .../glitch/reducers/notification_requests.js  |  96 ++++++
 .../flavours/glitch/reducers/notifications.js |   2 +-
 .../flavours/glitch/styles/components.scss    | 273 ++++++++++++----
 .../flavours/glitch/styles/forms.scss         |   6 +
 .../flavours/glitch/utils/numbers.ts          |   8 +
 27 files changed, 1331 insertions(+), 298 deletions(-)
 create mode 100644 app/javascript/flavours/glitch/features/notifications/components/checkbox_with_label.jsx
 create mode 100644 app/javascript/flavours/glitch/features/notifications/components/filtered_notifications_banner.jsx
 create mode 100644 app/javascript/flavours/glitch/features/notifications/components/notification_request.jsx
 create mode 100644 app/javascript/flavours/glitch/features/notifications/request.jsx
 create mode 100644 app/javascript/flavours/glitch/features/notifications/requests.jsx
 create mode 100644 app/javascript/flavours/glitch/reducers/notification_policy.js
 create mode 100644 app/javascript/flavours/glitch/reducers/notification_requests.js

diff --git a/app/javascript/flavours/glitch/actions/notifications.js b/app/javascript/flavours/glitch/actions/notifications.js
index 4179cfa56a8492..d5f7477f689866 100644
--- a/app/javascript/flavours/glitch/actions/notifications.js
+++ b/app/javascript/flavours/glitch/actions/notifications.js
@@ -57,6 +57,38 @@ export const NOTIFICATIONS_MARK_AS_READ = 'NOTIFICATIONS_MARK_AS_READ';
 export const NOTIFICATIONS_SET_BROWSER_SUPPORT    = 'NOTIFICATIONS_SET_BROWSER_SUPPORT';
 export const NOTIFICATIONS_SET_BROWSER_PERMISSION = 'NOTIFICATIONS_SET_BROWSER_PERMISSION';
 
+export const NOTIFICATION_POLICY_FETCH_REQUEST = 'NOTIFICATION_POLICY_FETCH_REQUEST';
+export const NOTIFICATION_POLICY_FETCH_SUCCESS = 'NOTIFICATION_POLICY_FETCH_SUCCESS';
+export const NOTIFICATION_POLICY_FETCH_FAIL    = 'NOTIFICATION_POLICY_FETCH_FAIL';
+
+export const NOTIFICATION_REQUESTS_FETCH_REQUEST = 'NOTIFICATION_REQUESTS_FETCH_REQUEST';
+export const NOTIFICATION_REQUESTS_FETCH_SUCCESS = 'NOTIFICATION_REQUESTS_FETCH_SUCCESS';
+export const NOTIFICATION_REQUESTS_FETCH_FAIL    = 'NOTIFICATION_REQUESTS_FETCH_FAIL';
+
+export const NOTIFICATION_REQUESTS_EXPAND_REQUEST = 'NOTIFICATION_REQUESTS_EXPAND_REQUEST';
+export const NOTIFICATION_REQUESTS_EXPAND_SUCCESS = 'NOTIFICATION_REQUESTS_EXPAND_SUCCESS';
+export const NOTIFICATION_REQUESTS_EXPAND_FAIL    = 'NOTIFICATION_REQUESTS_EXPAND_FAIL';
+
+export const NOTIFICATION_REQUEST_FETCH_REQUEST = 'NOTIFICATION_REQUEST_FETCH_REQUEST';
+export const NOTIFICATION_REQUEST_FETCH_SUCCESS = 'NOTIFICATION_REQUEST_FETCH_SUCCESS';
+export const NOTIFICATION_REQUEST_FETCH_FAIL    = 'NOTIFICATION_REQUEST_FETCH_FAIL';
+
+export const NOTIFICATION_REQUEST_ACCEPT_REQUEST = 'NOTIFICATION_REQUEST_ACCEPT_REQUEST';
+export const NOTIFICATION_REQUEST_ACCEPT_SUCCESS = 'NOTIFICATION_REQUEST_ACCEPT_SUCCESS';
+export const NOTIFICATION_REQUEST_ACCEPT_FAIL    = 'NOTIFICATION_REQUEST_ACCEPT_FAIL';
+
+export const NOTIFICATION_REQUEST_DISMISS_REQUEST = 'NOTIFICATION_REQUEST_DISMISS_REQUEST';
+export const NOTIFICATION_REQUEST_DISMISS_SUCCESS = 'NOTIFICATION_REQUEST_DISMISS_SUCCESS';
+export const NOTIFICATION_REQUEST_DISMISS_FAIL    = 'NOTIFICATION_REQUEST_DISMISS_FAIL';
+
+export const NOTIFICATIONS_FOR_REQUEST_FETCH_REQUEST = 'NOTIFICATIONS_FOR_REQUEST_FETCH_REQUEST';
+export const NOTIFICATIONS_FOR_REQUEST_FETCH_SUCCESS = 'NOTIFICATIONS_FOR_REQUEST_FETCH_SUCCESS';
+export const NOTIFICATIONS_FOR_REQUEST_FETCH_FAIL    = 'NOTIFICATIONS_FOR_REQUEST_FETCH_FAIL';
+
+export const NOTIFICATIONS_FOR_REQUEST_EXPAND_REQUEST = 'NOTIFICATIONS_FOR_REQUEST_EXPAND_REQUEST';
+export const NOTIFICATIONS_FOR_REQUEST_EXPAND_SUCCESS = 'NOTIFICATIONS_FOR_REQUEST_EXPAND_SUCCESS';
+export const NOTIFICATIONS_FOR_REQUEST_EXPAND_FAIL    = 'NOTIFICATIONS_FOR_REQUEST_EXPAND_FAIL';
+
 defineMessages({
   mention: { id: 'notification.mention', defaultMessage: '{name} mentioned you' },
 });
@@ -401,3 +433,264 @@ export function setBrowserPermission (value) {
     value,
   };
 }
+
+export const fetchNotificationPolicy = () => (dispatch, getState) => {
+  dispatch(fetchNotificationPolicyRequest());
+
+  api(getState).get('/api/v1/notifications/policy').then(({ data }) => {
+    dispatch(fetchNotificationPolicySuccess(data));
+  }).catch(err => {
+    dispatch(fetchNotificationPolicyFail(err));
+  });
+};
+
+export const fetchNotificationPolicyRequest = () => ({
+  type: NOTIFICATION_POLICY_FETCH_REQUEST,
+});
+
+export const fetchNotificationPolicySuccess = policy => ({
+  type: NOTIFICATION_POLICY_FETCH_SUCCESS,
+  policy,
+});
+
+export const fetchNotificationPolicyFail = error => ({
+  type: NOTIFICATION_POLICY_FETCH_FAIL,
+  error,
+});
+
+export const updateNotificationsPolicy = params => (dispatch, getState) => {
+  dispatch(fetchNotificationPolicyRequest());
+
+  api(getState).put('/api/v1/notifications/policy', params).then(({ data }) => {
+    dispatch(fetchNotificationPolicySuccess(data));
+  }).catch(err => {
+    dispatch(fetchNotificationPolicyFail(err));
+  });
+};
+
+export const fetchNotificationRequests = () => (dispatch, getState) => {
+  const params = {};
+
+  if (getState().getIn(['notificationRequests', 'isLoading'])) {
+    return;
+  }
+
+  if (getState().getIn(['notificationRequests', 'items'])?.size > 0) {
+    params.since_id = getState().getIn(['notificationRequests', 'items', 0, 'id']);
+  }
+
+  dispatch(fetchNotificationRequestsRequest());
+
+  api(getState).get('/api/v1/notifications/requests', { params }).then(response => {
+    const next = getLinks(response).refs.find(link => link.rel === 'next');
+    dispatch(importFetchedAccounts(response.data.map(x => x.account)));
+    dispatch(fetchNotificationRequestsSuccess(response.data, next ? next.uri : null));
+  }).catch(err => {
+    dispatch(fetchNotificationRequestsFail(err));
+  });
+};
+
+export const fetchNotificationRequestsRequest = () => ({
+  type: NOTIFICATION_REQUESTS_FETCH_REQUEST,
+});
+
+export const fetchNotificationRequestsSuccess = (requests, next) => ({
+  type: NOTIFICATION_REQUESTS_FETCH_SUCCESS,
+  requests,
+  next,
+});
+
+export const fetchNotificationRequestsFail = error => ({
+  type: NOTIFICATION_REQUESTS_FETCH_FAIL,
+  error,
+});
+
+export const expandNotificationRequests = () => (dispatch, getState) => {
+  const url = getState().getIn(['notificationRequests', 'next']);
+
+  if (!url || getState().getIn(['notificationRequests', 'isLoading'])) {
+    return;
+  }
+
+  dispatch(expandNotificationRequestsRequest());
+
+  api(getState).get(url).then(response => {
+    const next = getLinks(response).refs.find(link => link.rel === 'next');
+    dispatch(importFetchedAccounts(response.data.map(x => x.account)));
+    dispatch(expandNotificationRequestsSuccess(response.data, next?.uri));
+  }).catch(err => {
+    dispatch(expandNotificationRequestsFail(err));
+  });
+};
+
+export const expandNotificationRequestsRequest = () => ({
+  type: NOTIFICATION_REQUESTS_EXPAND_REQUEST,
+});
+
+export const expandNotificationRequestsSuccess = (requests, next) => ({
+  type: NOTIFICATION_REQUESTS_EXPAND_SUCCESS,
+  requests,
+  next,
+});
+
+export const expandNotificationRequestsFail = error => ({
+  type: NOTIFICATION_REQUESTS_EXPAND_FAIL,
+  error,
+});
+
+export const fetchNotificationRequest = id => (dispatch, getState) => {
+  const current = getState().getIn(['notificationRequests', 'current']);
+
+  if (current.getIn(['item', 'id']) === id || current.get('isLoading')) {
+    return;
+  }
+
+  dispatch(fetchNotificationRequestRequest(id));
+
+  api(getState).get(`/api/v1/notifications/requests/${id}`).then(({ data }) => {
+    dispatch(fetchNotificationRequestSuccess(data));
+  }).catch(err => {
+    dispatch(fetchNotificationRequestFail(id, err));
+  });
+};
+
+export const fetchNotificationRequestRequest = id => ({
+  type: NOTIFICATION_REQUEST_FETCH_REQUEST,
+  id,
+});
+
+export const fetchNotificationRequestSuccess = request => ({
+  type: NOTIFICATION_REQUEST_FETCH_SUCCESS,
+  request,
+});
+
+export const fetchNotificationRequestFail = (id, error) => ({
+  type: NOTIFICATION_REQUEST_FETCH_FAIL,
+  id,
+  error,
+});
+
+export const acceptNotificationRequest = id => (dispatch, getState) => {
+  dispatch(acceptNotificationRequestRequest(id));
+
+  api(getState).post(`/api/v1/notifications/requests/${id}/accept`).then(() => {
+    dispatch(acceptNotificationRequestSuccess(id));
+  }).catch(err => {
+    dispatch(acceptNotificationRequestFail(id, err));
+  });
+};
+
+export const acceptNotificationRequestRequest = id => ({
+  type: NOTIFICATION_REQUEST_ACCEPT_REQUEST,
+  id,
+});
+
+export const acceptNotificationRequestSuccess = id => ({
+  type: NOTIFICATION_REQUEST_ACCEPT_SUCCESS,
+  id,
+});
+
+export const acceptNotificationRequestFail = (id, error) => ({
+  type: NOTIFICATION_REQUEST_ACCEPT_FAIL,
+  id,
+  error,
+});
+
+export const dismissNotificationRequest = id => (dispatch, getState) => {
+  dispatch(dismissNotificationRequestRequest(id));
+
+  api(getState).post(`/api/v1/notifications/requests/${id}/dismiss`).then(() =>{
+    dispatch(dismissNotificationRequestSuccess(id));
+  }).catch(err => {
+    dispatch(dismissNotificationRequestFail(id, err));
+  });
+};
+
+export const dismissNotificationRequestRequest = id => ({
+  type: NOTIFICATION_REQUEST_DISMISS_REQUEST,
+  id,
+});
+
+export const dismissNotificationRequestSuccess = id => ({
+  type: NOTIFICATION_REQUEST_DISMISS_SUCCESS,
+  id,
+});
+
+export const dismissNotificationRequestFail = (id, error) => ({
+  type: NOTIFICATION_REQUEST_DISMISS_FAIL,
+  id,
+  error,
+});
+
+export const fetchNotificationsForRequest = accountId => (dispatch, getState) => {
+  const current = getState().getIn(['notificationRequests', 'current']);
+  const params = { account_id: accountId };
+
+  if (current.getIn(['item', 'account']) === accountId) {
+    if (current.getIn(['notifications', 'isLoading'])) {
+      return;
+    }
+
+    if (current.getIn(['notifications', 'items'])?.size > 0) {
+      params.since_id = current.getIn(['notifications', 'items', 0, 'id']);
+    }
+  }
+
+  dispatch(fetchNotificationsForRequestRequest());
+
+  api(getState).get('/api/v1/notifications', { params }).then(response => {
+    const next = getLinks(response).refs.find(link => link.rel === 'next');
+    dispatch(importFetchedStatuses(response.data.map(item => item.status).filter(status => !!status)));
+    dispatch(fetchNotificationsForRequestSuccess(response.data, next?.uri));
+  }).catch(err => {
+    dispatch(fetchNotificationsForRequestFail(err));
+  });
+};
+
+export const fetchNotificationsForRequestRequest = () => ({
+  type: NOTIFICATIONS_FOR_REQUEST_FETCH_REQUEST,
+});
+
+export const fetchNotificationsForRequestSuccess = (notifications, next) => ({
+  type: NOTIFICATIONS_FOR_REQUEST_FETCH_SUCCESS,
+  notifications,
+  next,
+});
+
+export const fetchNotificationsForRequestFail = (error) => ({
+  type: NOTIFICATIONS_FOR_REQUEST_FETCH_FAIL,
+  error,
+});
+
+export const expandNotificationsForRequest = () => (dispatch, getState) => {
+  const url = getState().getIn(['notificationRequests', 'current', 'notifications', 'next']);
+
+  if (!url || getState().getIn(['notificationRequests', 'current', 'notifications', 'isLoading'])) {
+    return;
+  }
+
+  dispatch(expandNotificationsForRequestRequest());
+
+  api(getState).get(url).then(response => {
+    const next = getLinks(response).refs.find(link => link.rel === 'next');
+    dispatch(importFetchedStatuses(response.data.map(item => item.status).filter(status => !!status)));
+    dispatch(expandNotificationsForRequestSuccess(response.data, next?.uri));
+  }).catch(err => {
+    dispatch(expandNotificationsForRequestFail(err));
+  });
+};
+
+export const expandNotificationsForRequestRequest = () => ({
+  type: NOTIFICATIONS_FOR_REQUEST_EXPAND_REQUEST,
+});
+
+export const expandNotificationsForRequestSuccess = (notifications, next) => ({
+  type: NOTIFICATIONS_FOR_REQUEST_EXPAND_SUCCESS,
+  notifications,
+  next,
+});
+
+export const expandNotificationsForRequestFail = (error) => ({
+  type: NOTIFICATIONS_FOR_REQUEST_EXPAND_FAIL,
+  error,
+});
diff --git a/app/javascript/flavours/glitch/components/column_header.jsx b/app/javascript/flavours/glitch/components/column_header.jsx
index 262166d2d1a0ce..22e73f5211b31c 100644
--- a/app/javascript/flavours/glitch/components/column_header.jsx
+++ b/app/javascript/flavours/glitch/components/column_header.jsx
@@ -1,7 +1,7 @@
 import PropTypes from 'prop-types';
 import { PureComponent, useCallback } from 'react';
 
-import { FormattedMessage, injectIntl, defineMessages } from 'react-intl';
+import { FormattedMessage, injectIntl, defineMessages, useIntl } from 'react-intl';
 
 import classNames from 'classnames';
 import { withRouter } from 'react-router-dom';
@@ -11,7 +11,7 @@ import ArrowBackIcon from '@/material-icons/400-24px/arrow_back.svg?react';
 import ChevronLeftIcon from '@/material-icons/400-24px/chevron_left.svg?react';
 import ChevronRightIcon from '@/material-icons/400-24px/chevron_right.svg?react';
 import CloseIcon from '@/material-icons/400-24px/close.svg?react';
-import TuneIcon from '@/material-icons/400-24px/tune.svg?react';
+import SettingsIcon from '@/material-icons/400-24px/settings.svg?react';
 import { Icon }  from 'flavours/glitch/components/icon';
 import { ButtonInTabsBar, useColumnsContext } from 'flavours/glitch/features/ui/util/columns_context';
 import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router';
@@ -23,10 +23,12 @@ const messages = defineMessages({
   hide: { id: 'column_header.hide_settings', defaultMessage: 'Hide settings' },
   moveLeft: { id: 'column_header.moveLeft_settings', defaultMessage: 'Move column to the left' },
   moveRight: { id: 'column_header.moveRight_settings', defaultMessage: 'Move column to the right' },
+  back: { id: 'column_back_button.label', defaultMessage: 'Back' },
 });
 
-const BackButton = ({ pinned, show }) => {
+const BackButton = ({ pinned, show, onlyIcon }) => {
   const history = useAppHistory();
+  const intl = useIntl();
   const { multiColumn } = useColumnsContext();
 
   const handleBackClick = useCallback(() => {
@@ -39,18 +41,20 @@ const BackButton = ({ pinned, show }) => {
 
   const showButton = history && !pinned && ((multiColumn && history.location?.state?.fromMastodon) || show);
 
-  if(!showButton) return null;
-
-  return (<button onClick={handleBackClick} className='column-header__back-button'>
-    <Icon id='chevron-left' icon={ArrowBackIcon} className='column-back-button__icon' />
-    <FormattedMessage id='column_back_button.label' defaultMessage='Back' />
-  </button>);
+  if (!showButton) return null;
 
+  return (
+    <button onClick={handleBackClick} className={classNames('column-header__back-button', { 'compact': onlyIcon })} aria-label={intl.formatMessage(messages.back)}>
+      <Icon id='chevron-left' icon={ArrowBackIcon} className='column-back-button__icon' />
+      {!onlyIcon && <FormattedMessage id='column_back_button.label' defaultMessage='Back' />}
+    </button>
+  );
 };
 
 BackButton.propTypes = {
   pinned: PropTypes.bool,
   show: PropTypes.bool,
+  onlyIcon: PropTypes.bool,
 };
 
 class ColumnHeader extends PureComponent {
@@ -145,27 +149,31 @@ class ColumnHeader extends PureComponent {
     }
 
     if (multiColumn && pinned) {
-      pinButton = <button key='pin-button' className='text-btn column-header__setting-btn' onClick={this.handlePin}><Icon id='times' icon={CloseIcon} /> <FormattedMessage id='column_header.unpin' defaultMessage='Unpin' /></button>;
+      pinButton = <button className='text-btn column-header__setting-btn' onClick={this.handlePin}><Icon id='times' icon={CloseIcon} /> <FormattedMessage id='column_header.unpin' defaultMessage='Unpin' /></button>;
 
       moveButtons = (
-        <div key='move-buttons' className='column-header__setting-arrows'>
+        <div className='column-header__setting-arrows'>
           <button title={formatMessage(messages.moveLeft)} aria-label={formatMessage(messages.moveLeft)} className='icon-button column-header__setting-btn' onClick={this.handleMoveLeft}><Icon id='chevron-left' icon={ChevronLeftIcon} /></button>
           <button title={formatMessage(messages.moveRight)} aria-label={formatMessage(messages.moveRight)} className='icon-button column-header__setting-btn' onClick={this.handleMoveRight}><Icon id='chevron-right' icon={ChevronRightIcon} /></button>
         </div>
       );
     } else if (multiColumn && this.props.onPin) {
-      pinButton = <button key='pin-button' className='text-btn column-header__setting-btn' onClick={this.handlePin}><Icon id='plus' icon={AddIcon} /> <FormattedMessage id='column_header.pin' defaultMessage='Pin' /></button>;
+      pinButton = <button className='text-btn column-header__setting-btn' onClick={this.handlePin}><Icon id='plus' icon={AddIcon} /> <FormattedMessage id='column_header.pin' defaultMessage='Pin' /></button>;
     }
 
-    backButton = <BackButton pinned={pinned} show={showBackButton} />;
+    backButton = <BackButton pinned={pinned} show={showBackButton} onlyIcon={!!title} />;
 
     const collapsedContent = [
       extraContent,
     ];
 
     if (multiColumn) {
-      collapsedContent.push(pinButton);
-      collapsedContent.push(moveButtons);
+      collapsedContent.push(
+        <div key='buttons' className='column-header__advanced-buttons'>
+          {pinButton}
+          {moveButtons}
+        </div>
+      );
     }
 
     if (this.context.identity.signedIn && (children || (multiColumn && this.props.onPin))) {
@@ -177,7 +185,7 @@ class ColumnHeader extends PureComponent {
           onClick={this.handleToggleClick}
         >
           <i className='icon-with-badge'>
-            <Icon id='sliders' icon={TuneIcon} />
+            <Icon id='sliders' icon={SettingsIcon} />
             {collapseIssues && <i className='icon-with-badge__issue-badge' />}
           </i>
         </button>
@@ -190,16 +198,19 @@ class ColumnHeader extends PureComponent {
       <div className={wrapperClassName}>
         <h1 className={buttonClassName}>
           {hasTitle && (
-            <button onClick={this.handleTitleClick}>
-              <Icon id={icon} icon={iconComponent} className='column-header__icon' />
-              {title}
-            </button>
+            <>
+              {backButton}
+
+              <button onClick={this.handleTitleClick} className='column-header__title'>
+                {!showBackButton && <Icon id={icon} icon={iconComponent} className='column-header__icon' />}
+                {title}
+              </button>
+            </>
           )}
 
           {!hasTitle && backButton}
 
           <div className='column-header__buttons'>
-            {hasTitle && backButton}
             {extraButton}
             {collapseButton}
           </div>
diff --git a/app/javascript/flavours/glitch/features/community_timeline/components/column_settings.jsx b/app/javascript/flavours/glitch/features/community_timeline/components/column_settings.jsx
index 1e93125d59f6c3..a13081e82b35d9 100644
--- a/app/javascript/flavours/glitch/features/community_timeline/components/column_settings.jsx
+++ b/app/javascript/flavours/glitch/features/community_timeline/components/column_settings.jsx
@@ -26,7 +26,7 @@ class ColumnSettings extends PureComponent {
     const { settings, onChange, intl } = this.props;
 
     return (
-      <div>
+      <div className='column-settings'>
         <div className='column-settings__row'>
           <SettingToggle settings={settings} settingPath={['other', 'onlyMedia']} onChange={onChange} label={<FormattedMessage id='community.column_settings.media_only' defaultMessage='Media only' />} />
         </div>
diff --git a/app/javascript/flavours/glitch/features/direct_timeline/components/column_settings.jsx b/app/javascript/flavours/glitch/features/direct_timeline/components/column_settings.jsx
index 9c8e23ce73058e..45de7010b641e8 100644
--- a/app/javascript/flavours/glitch/features/direct_timeline/components/column_settings.jsx
+++ b/app/javascript/flavours/glitch/features/direct_timeline/components/column_settings.jsx
@@ -26,18 +26,20 @@ class ColumnSettings extends PureComponent {
     const { settings, onChange, intl } = this.props;
 
     return (
-      <div>
-        <span className='column-settings__section'><FormattedMessage id='home.column_settings.basic' defaultMessage='Basic' /></span>
-
-        <div className='column-settings__row'>
-          <SettingToggle settings={settings} settingPath={['conversations']} onChange={onChange} label={<FormattedMessage id='direct.group_by_conversations' defaultMessage='Group by conversation' />} />
-        </div>
-
-        <span className='column-settings__section'><FormattedMessage id='home.column_settings.advanced' defaultMessage='Advanced' /></span>
-
-        <div className='column-settings__row'>
-          <SettingText settings={settings} settingPath={['regex', 'body']} onChange={onChange} label={intl.formatMessage(messages.filter_regex)} />
-        </div>
+      <div className='column-settings'>
+        <section>
+          <div className='column-settings__row'>
+            <SettingToggle settings={settings} settingPath={['conversations']} onChange={onChange} label={<FormattedMessage id='direct.group_by_conversations' defaultMessage='Group by conversation' />} />
+          </div>
+        </section>
+
+        <section>
+          <h3><FormattedMessage id='home.column_settings.advanced' defaultMessage='Advanced' /></h3>
+
+          <div className='column-settings__row'>
+            <SettingText settings={settings} settingPath={['regex', 'body']} onChange={onChange} label={intl.formatMessage(messages.filter_regex)} />
+          </div>
+        </section>
       </div>
     );
   }
diff --git a/app/javascript/flavours/glitch/features/firehose/index.jsx b/app/javascript/flavours/glitch/features/firehose/index.jsx
index 678bc3525a27ce..dc6a38ae2e75c4 100644
--- a/app/javascript/flavours/glitch/features/firehose/index.jsx
+++ b/app/javascript/flavours/glitch/features/firehose/index.jsx
@@ -45,28 +45,37 @@ const ColumnSettings = () => {
   );
 
   return (
-    <div>
-      <div className='column-settings__row'>
-        <SettingToggle
-          settings={settings}
-          settingPath={['onlyMedia']}
-          onChange={onChange}
-          label={<FormattedMessage id='community.column_settings.media_only' defaultMessage='Media only' />}
-        />
-        <SettingToggle
-          settings={settings}
-          settingPath={['allowLocalOnly']}
-          onChange={onChange}
-          label={<FormattedMessage id='firehose.column_settings.allow_local_only' defaultMessage='Show local-only posts in "All"' />}
-        />
-        <span className='column-settings__section'><FormattedMessage id='home.column_settings.advanced' defaultMessage='Advanced' /></span>
-        <SettingText
-          settings={settings}
-          settingPath={['regex', 'body']}
-          onChange={onChange}
-          label={intl.formatMessage(messages.filter_regex)}
-        />
-      </div>
+    <div className='column-settings'>
+      <section>
+        <div className='column-settings__row'>
+          <SettingToggle
+            settings={settings}
+            settingPath={['onlyMedia']}
+            onChange={onChange}
+            label={<FormattedMessage id='community.column_settings.media_only' defaultMessage='Media only' />}
+          />
+
+          <SettingToggle
+            settings={settings}
+            settingPath={['allowLocalOnly']}
+            onChange={onChange}
+            label={<FormattedMessage id='firehose.column_settings.allow_local_only' defaultMessage='Show local-only posts in "All"' />}
+          />
+        </div>
+      </section>
+
+      <section>
+        <h3><FormattedMessage id='home.column_settings.advanced' defaultMessage='Advanced' /></h3>
+
+        <div className='column-settings__row'>
+          <SettingText
+            settings={settings}
+            settingPath={['regex', 'body']}
+            onChange={onChange}
+            label={intl.formatMessage(messages.filter_regex)}
+          />
+        </div>
+      </section>
     </div>
   );
 };
diff --git a/app/javascript/flavours/glitch/features/hashtag_timeline/components/column_settings.jsx b/app/javascript/flavours/glitch/features/hashtag_timeline/components/column_settings.jsx
index 4488c5b2a0e26e..94ee7bb1191e6c 100644
--- a/app/javascript/flavours/glitch/features/hashtag_timeline/components/column_settings.jsx
+++ b/app/javascript/flavours/glitch/features/hashtag_timeline/components/column_settings.jsx
@@ -109,28 +109,28 @@ class ColumnSettings extends PureComponent {
     const { settings, onChange } = this.props;
 
     return (
-      <div>
-        <div className='column-settings__row'>
-          <div className='setting-toggle'>
-            <Toggle id='hashtag.column_settings.tag_toggle' onChange={this.onToggle} checked={this.state.open} />
-
-            <span className='setting-toggle__label'>
-              <FormattedMessage id='hashtag.column_settings.tag_toggle' defaultMessage='Include additional tags in this column' />
-            </span>
+      <div className='column-settings'>
+        <section>
+          <div className='column-settings__row'>
+            <SettingToggle settings={settings} settingPath={['local']} onChange={onChange} label={<FormattedMessage id='community.column_settings.local_only' defaultMessage='Local only' />} />
+
+            <div className='setting-toggle'>
+              <Toggle id='hashtag.column_settings.tag_toggle' onChange={this.onToggle} checked={this.state.open} />
+
+              <span className='setting-toggle__label'>
+                <FormattedMessage id='hashtag.column_settings.tag_toggle' defaultMessage='Include additional tags in this column' />
+              </span>
+            </div>
           </div>
-        </div>
 
-        {this.state.open && (
-          <div className='column-settings__hashtags'>
-            {this.modeSelect('any')}
-            {this.modeSelect('all')}
-            {this.modeSelect('none')}
-          </div>
-        )}
-
-        <div className='column-settings__row'>
-          <SettingToggle settings={settings} settingPath={['local']} onChange={onChange} label={<FormattedMessage id='community.column_settings.local_only' defaultMessage='Local only' />} />
-        </div>
+          {this.state.open && (
+            <div className='column-settings__hashtags'>
+              {this.modeSelect('any')}
+              {this.modeSelect('all')}
+              {this.modeSelect('none')}
+            </div>
+          )}
+        </section>
       </div>
     );
   }
diff --git a/app/javascript/flavours/glitch/features/home_timeline/components/column_settings.tsx b/app/javascript/flavours/glitch/features/home_timeline/components/column_settings.tsx
index 5438ba6f754614..5b8fe5ccc8ecb7 100644
--- a/app/javascript/flavours/glitch/features/home_timeline/components/column_settings.tsx
+++ b/app/javascript/flavours/glitch/features/home_timeline/components/column_settings.tsx
@@ -35,75 +35,68 @@ export const ColumnSettings: React.FC = () => {
   );
 
   return (
-    <div>
-      <span className='column-settings__section'>
-        <FormattedMessage
-          id='home.column_settings.basic'
-          defaultMessage='Basic'
-        />
-      </span>
+    <div className='column-settings'>
+      <section>
+        <div className='column-settings__row'>
+          <SettingToggle
+            prefix='home_timeline'
+            settings={settings}
+            settingPath={['shows', 'reblog']}
+            onChange={onChange}
+            label={
+              <FormattedMessage
+                id='home.column_settings.show_reblogs'
+                defaultMessage='Show boosts'
+              />
+            }
+          />
 
-      <div className='column-settings__row'>
-        <SettingToggle
-          prefix='home_timeline'
-          settings={settings}
-          settingPath={['shows', 'reblog']}
-          onChange={onChange}
-          label={
-            <FormattedMessage
-              id='home.column_settings.show_reblogs'
-              defaultMessage='Show boosts'
-            />
-          }
-        />
-      </div>
+          <SettingToggle
+            prefix='home_timeline'
+            settings={settings}
+            settingPath={['shows', 'reply']}
+            onChange={onChange}
+            label={
+              <FormattedMessage
+                id='home.column_settings.show_replies'
+                defaultMessage='Show replies'
+              />
+            }
+          />
 
-      <div className='column-settings__row'>
-        <SettingToggle
-          prefix='home_timeline'
-          settings={settings}
-          settingPath={['shows', 'reply']}
-          onChange={onChange}
-          label={
-            <FormattedMessage
-              id='home.column_settings.show_replies'
-              defaultMessage='Show replies'
-            />
-          }
-        />
-      </div>
+          <SettingToggle
+            prefix='home_timeline'
+            settings={settings}
+            settingPath={['shows', 'direct']}
+            onChange={onChange}
+            label={
+              <FormattedMessage
+                id='home.column_settings.show_direct'
+                defaultMessage='Show private mentions'
+              />
+            }
+          />
+        </div>
+      </section>
 
-      <div className='column-settings__row'>
-        <SettingToggle
-          prefix='home_timeline'
-          settings={settings}
-          settingPath={['shows', 'direct']}
-          onChange={onChange}
-          label={
-            <FormattedMessage
-              id='home.column_settings.show_direct'
-              defaultMessage='Show private mentions'
-            />
-          }
-        />
-      </div>
+      <section aria-labelledby='home-column-advanced'>
+        <h3 id='home-column-advanced'>
+          <FormattedMessage
+            id='home.column_settings.advanced'
+            defaultMessage='Advanced'
+          />
+        </h3>
 
-      <span className='column-settings__section'>
-        <FormattedMessage
-          id='home.column_settings.advanced'
-          defaultMessage='Advanced'
-        />
-      </span>
-
-      <div className='column-settings__row'>
-        <SettingText
-          prefix='home_timeline'
-          settings={settings}
-          settingPath={['regex', 'body']}
-          onChange={onChange}
-          label={intl.formatMessage(messages.filter_regex)}
-        />
-      </div>
+        <div className='column-settings__row'>
+          <SettingText
+            prefix='home_timeline'
+            settings={settings}
+            settingPath={['regex', 'body']}
+            onChange={onChange}
+            label={intl.formatMessage(messages.filter_regex)}
+          />
+        </div>
+      </section>
     </div>
   );
 };
diff --git a/app/javascript/flavours/glitch/features/list_timeline/index.jsx b/app/javascript/flavours/glitch/features/list_timeline/index.jsx
index abc664e0a123aa..08ce97f1ba75b0 100644
--- a/app/javascript/flavours/glitch/features/list_timeline/index.jsx
+++ b/app/javascript/flavours/glitch/features/list_timeline/index.jsx
@@ -193,35 +193,38 @@ class ListTimeline extends PureComponent {
           pinned={pinned}
           multiColumn={multiColumn}
         >
-          <div className='column-settings__row column-header__links'>
-            <button type='button' className='text-btn column-header__setting-btn' tabIndex={0} onClick={this.handleEditClick}>
-              <Icon id='pencil' icon={EditIcon} /> <FormattedMessage id='lists.edit' defaultMessage='Edit list' />
-            </button>
-
-            <button type='button' className='text-btn column-header__setting-btn' tabIndex={0} onClick={this.handleDeleteClick}>
-              <Icon id='trash' icon={DeleteIcon} /> <FormattedMessage id='lists.delete' defaultMessage='Delete list' />
-            </button>
-          </div>
-
-          <div className='setting-toggle'>
-            <Toggle id={`list-${id}-exclusive`} checked={isExclusive} onChange={this.onExclusiveToggle} />
-            <label htmlFor={`list-${id}-exclusive`} className='setting-toggle__label'>
-              <FormattedMessage id='lists.exclusive' defaultMessage='Hide these posts from home' />
-            </label>
-          </div>
-
-          { replies_policy !== undefined && (
-            <div role='group' aria-labelledby={`list-${id}-replies-policy`}>
-              <span id={`list-${id}-replies-policy`} className='column-settings__section'>
-                <FormattedMessage id='lists.replies_policy.title' defaultMessage='Show replies to:' />
-              </span>
-              <div className='column-settings__row'>
-                { ['none', 'list', 'followed'].map(policy => (
-                  <RadioButton name='order' key={policy} value={policy} label={intl.formatMessage(messages[policy])} checked={replies_policy === policy} onChange={this.handleRepliesPolicyChange} />
-                ))}
+          <div className='column-settings'>
+            <section className='column-header__links'>
+              <button type='button' className='text-btn column-header__setting-btn' tabIndex={0} onClick={this.handleEditClick}>
+                <Icon id='pencil' icon={EditIcon} /> <FormattedMessage id='lists.edit' defaultMessage='Edit list' />
+              </button>
+
+              <button type='button' className='text-btn column-header__setting-btn' tabIndex={0} onClick={this.handleDeleteClick}>
+                <Icon id='trash' icon={DeleteIcon} /> <FormattedMessage id='lists.delete' defaultMessage='Delete list' />
+              </button>
+            </section>
+
+            <section>
+              <div className='setting-toggle'>
+                <Toggle id={`list-${id}-exclusive`} checked={isExclusive} onChange={this.onExclusiveToggle} />
+                <label htmlFor={`list-${id}-exclusive`} className='setting-toggle__label'>
+                  <FormattedMessage id='lists.exclusive' defaultMessage='Hide these posts from home' />
+                </label>
               </div>
-            </div>
-          )}
+            </section>
+
+            {replies_policy !== undefined && (
+              <section aria-labelledby={`list-${id}-replies-policy`}>
+                <h3 id={`list-${id}-replies-policy`}><FormattedMessage id='lists.replies_policy.title' defaultMessage='Show replies to:' /></h3>
+
+                <div className='column-settings__row'>
+                  { ['none', 'list', 'followed'].map(policy => (
+                    <RadioButton name='order' key={policy} value={policy} label={intl.formatMessage(messages[policy])} checked={replies_policy === policy} onChange={this.handleRepliesPolicyChange} />
+                  ))}
+                </div>
+              </section>
+            )}
+          </div>
         </ColumnHeader>
 
         <StatusListContainer
diff --git a/app/javascript/flavours/glitch/features/notifications/components/checkbox_with_label.jsx b/app/javascript/flavours/glitch/features/notifications/components/checkbox_with_label.jsx
new file mode 100644
index 00000000000000..5a7bb2307be3bc
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/notifications/components/checkbox_with_label.jsx
@@ -0,0 +1,31 @@
+import PropTypes from 'prop-types';
+import { useCallback } from 'react';
+
+import Toggle from 'react-toggle';
+
+export const CheckboxWithLabel = ({ checked, disabled, children, onChange }) => {
+  const handleChange = useCallback(({ target }) => {
+    onChange(target.checked);
+  }, [onChange]);
+
+  return (
+    <label className='app-form__toggle'>
+      <div className='app-form__toggle__label'>
+        {children}
+      </div>
+
+      <div className='app-form__toggle__toggle'>
+        <div>
+          <Toggle checked={checked} onChange={handleChange} disabled={disabled} />
+        </div>
+      </div>
+    </label>
+  );
+};
+
+CheckboxWithLabel.propTypes = {
+  checked: PropTypes.bool,
+  disabled: PropTypes.bool,
+  children: PropTypes.children,
+  onChange: PropTypes.func,
+};
diff --git a/app/javascript/flavours/glitch/features/notifications/components/column_settings.jsx b/app/javascript/flavours/glitch/features/notifications/components/column_settings.jsx
index 63e03c65f11f69..6b3df02e73f449 100644
--- a/app/javascript/flavours/glitch/features/notifications/components/column_settings.jsx
+++ b/app/javascript/flavours/glitch/features/notifications/components/column_settings.jsx
@@ -7,6 +7,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 
 import { PERMISSION_MANAGE_USERS, PERMISSION_MANAGE_REPORTS } from 'flavours/glitch/permissions';
 
+import { CheckboxWithLabel } from './checkbox_with_label';
 import ClearColumnButton from './clear_column_button';
 import GrantPermissionButton from './grant_permission_button';
 import PillBarButton from './pill_bar_button';
@@ -27,14 +28,32 @@ export default class ColumnSettings extends PureComponent {
     alertsEnabled: PropTypes.bool,
     browserSupport: PropTypes.bool,
     browserPermission: PropTypes.string,
+    notificationPolicy: ImmutablePropTypes.map,
+    onChangePolicy: PropTypes.func.isRequired,
   };
 
   onPushChange = (path, checked) => {
     this.props.onChange(['push', ...path], checked);
   };
 
+  handleFilterNotFollowing = checked => {
+    this.props.onChangePolicy('filter_not_following', checked);
+  };
+
+  handleFilterNotFollowers = checked => {
+    this.props.onChangePolicy('filter_not_followers', checked);
+  };
+
+  handleFilterNewAccounts = checked => {
+    this.props.onChangePolicy('filter_new_accounts', checked);
+  };
+
+  handleFilterPrivateMentions = checked => {
+    this.props.onChangePolicy('filter_private_mentions', checked);
+  };
+
   render () {
-    const { settings, pushSettings, onChange, onClear, alertsEnabled, browserSupport, browserPermission, onRequestNotificationPermission } = this.props;
+    const { settings, pushSettings, onChange, onClear, alertsEnabled, browserSupport, browserPermission, onRequestNotificationPermission, notificationPolicy } = this.props;
 
     const unreadMarkersShowStr = <FormattedMessage id='notifications.column_settings.unread_notifications.highlight' defaultMessage='Highlight unread notifications' />;
     const filterBarShowStr = <FormattedMessage id='notifications.column_settings.filter_bar.show_bar' defaultMessage='Show filter bar' />;
@@ -47,48 +66,68 @@ export default class ColumnSettings extends PureComponent {
     const pushStr = showPushSettings && <FormattedMessage id='notifications.column_settings.push' defaultMessage='Push notifications' />;
 
     return (
-      <div>
+      <div className='column-settings'>
         {alertsEnabled && browserSupport && browserPermission === 'denied' && (
-          <div className='column-settings__row column-settings__row--with-margin'>
-            <span className='warning-hint'><FormattedMessage id='notifications.permission_denied' defaultMessage='Desktop notifications are unavailable due to previously denied browser permissions request' /></span>
-          </div>
+          <span className='warning-hint'><FormattedMessage id='notifications.permission_denied' defaultMessage='Desktop notifications are unavailable due to previously denied browser permissions request' /></span>
         )}
 
         {alertsEnabled && browserSupport && browserPermission === 'default' && (
-          <div className='column-settings__row column-settings__row--with-margin'>
-            <span className='warning-hint'>
-              <FormattedMessage id='notifications.permission_required' defaultMessage='Desktop notifications are unavailable because the required permission has not been granted.' /> <GrantPermissionButton onClick={onRequestNotificationPermission} />
-            </span>
-          </div>
+          <span className='warning-hint'>
+            <FormattedMessage id='notifications.permission_required' defaultMessage='Desktop notifications are unavailable because the required permission has not been granted.' /> <GrantPermissionButton onClick={onRequestNotificationPermission} />
+          </span>
         )}
 
-        <div className='column-settings__row'>
+        <section>
           <ClearColumnButton onClick={onClear} />
-        </div>
+        </section>
 
-        <div role='group' aria-labelledby='notifications-unread-markers'>
-          <span id='notifications-unread-markers' className='column-settings__section'>
-            <FormattedMessage id='notifications.column_settings.unread_notifications.category' defaultMessage='Unread notifications' />
-          </span>
+        <section>
+          <h3><FormattedMessage id='notifications.policy.title' defaultMessage='Filter out notifications from…' /></h3>
 
           <div className='column-settings__row'>
-            <SettingToggle id='unread-notification-markers' prefix='notifications' settings={settings} settingPath={['showUnread']} onChange={onChange} label={unreadMarkersShowStr} />
+            <CheckboxWithLabel checked={notificationPolicy.get('filter_not_following')} onChange={this.handleFilterNotFollowing}>
+              <strong><FormattedMessage id='notifications.policy.filter_not_following_title' defaultMessage="People you don't follow" /></strong>
+              <span className='hint'><FormattedMessage id='notifications.policy.filter_not_following_hint' defaultMessage='Until you manually approve them' /></span>
+            </CheckboxWithLabel>
+
+            <CheckboxWithLabel checked={notificationPolicy.get('filter_not_followers')} onChange={this.handleFilterNotFollowers}>
+              <strong><FormattedMessage id='notifications.policy.filter_not_followers_title' defaultMessage='People not following you' /></strong>
+              <span className='hint'><FormattedMessage id='notifications.policy.filter_not_followers_hint' defaultMessage='Including people who have been following you fewer than {days, plural, one {one day} other {# days}}' values={{ days: 3 }} /></span>
+            </CheckboxWithLabel>
+
+            <CheckboxWithLabel checked={notificationPolicy.get('filter_new_accounts')} onChange={this.handleFilterNewAccounts}>
+              <strong><FormattedMessage id='notifications.policy.filter_new_accounts_title' defaultMessage='New accounts' /></strong>
+              <span className='hint'><FormattedMessage id='notifications.policy.filter_new_accounts.hint' defaultMessage='Created within the past {days, plural, one {one day} other {# days}}' values={{ days: 30 }} /></span>
+            </CheckboxWithLabel>
+
+            <CheckboxWithLabel checked={notificationPolicy.get('filter_private_mentions')} onChange={this.handleFilterPrivateMentions}>
+              <strong><FormattedMessage id='notifications.policy.filter_private_mentions_title' defaultMessage='Unsolicited private mentions' /></strong>
+              <span className='hint'><FormattedMessage id='notifications.policy.filter_private_mentions_hint' defaultMessage="Filtered unless it's in reply to your own mention or if you follow the sender" /></span>
+            </CheckboxWithLabel>
           </div>
-        </div>
-
-        <div role='group' aria-labelledby='notifications-filter-bar'>
-          <span id='notifications-filter-bar' className='column-settings__section'>
-            <FormattedMessage id='notifications.column_settings.filter_bar.category' defaultMessage='Quick filter bar' />
-          </span>
+        </section>
 
+        <section role='group' aria-labelledby='notifications-filter-bar'>
+          <h3 id='notifications-filter-bar'><FormattedMessage id='notifications.column_settings.filter_bar.category' defaultMessage='Quick filter bar' /></h3>
+ 
           <div className='column-settings__row'>
             <SettingToggle id='show-filter-bar' prefix='notifications' settings={settings} settingPath={['quickFilter', 'show']} onChange={onChange} label={filterBarShowStr} />
             <SettingToggle id='show-filter-bar' prefix='notifications' settings={settings} settingPath={['quickFilter', 'advanced']} onChange={onChange} label={filterAdvancedStr} />
           </div>
-        </div>
+        </section>
+
+        <section role='group' aria-labelledby='notifications-unread-markers'>
+          <h3 id='notifications-unread-markers'>
+            <FormattedMessage id='notifications.column_settings.unread_notifications.category' defaultMessage='Unread notifications' />
+          </h3>
+
+          <div className='column-settings__row'>
+            <SettingToggle id='unread-notification-markers' prefix='notifications' settings={settings} settingPath={['showUnread']} onChange={onChange} label={unreadMarkersShowStr} />
+          </div>
+        </section>
 
-        <div role='group' aria-labelledby='notifications-follow'>
-          <span id='notifications-follow' className='column-settings__section'><FormattedMessage id='notifications.column_settings.follow' defaultMessage='New followers:' /></span>
+        <section role='group' aria-labelledby='notifications-follow'>
+          <h3 id='notifications-follow'><FormattedMessage id='notifications.column_settings.follow' defaultMessage='New followers:' /></h3>
 
           <div className='column-settings__pillbar'>
             <PillBarButton disabled={browserPermission === 'denied'} prefix='notifications_desktop' settings={settings} settingPath={['alerts', 'follow']} onChange={onChange} label={alertStr} />
@@ -96,10 +135,10 @@ export default class ColumnSettings extends PureComponent {
             <PillBarButton prefix='notifications' settings={settings} settingPath={['shows', 'follow']} onChange={onChange} label={showStr} />
             <PillBarButton prefix='notifications' settings={settings} settingPath={['sounds', 'follow']} onChange={onChange} label={soundStr} />
           </div>
-        </div>
+        </section>
 
-        <div role='group' aria-labelledby='notifications-follow-request'>
-          <span id='notifications-follow-request' className='column-settings__section'><FormattedMessage id='notifications.column_settings.follow_request' defaultMessage='New follow requests:' /></span>
+        <section role='group' aria-labelledby='notifications-follow-request'>
+          <h3 id='notifications-follow-request'><FormattedMessage id='notifications.column_settings.follow_request' defaultMessage='New follow requests:' /></h3>
 
           <div className='column-settings__pillbar'>
             <PillBarButton disabled={browserPermission === 'denied'} prefix='notifications_desktop' settings={settings} settingPath={['alerts', 'follow_request']} onChange={onChange} label={alertStr} />
@@ -107,10 +146,10 @@ export default class ColumnSettings extends PureComponent {
             <PillBarButton prefix='notifications' settings={settings} settingPath={['shows', 'follow_request']} onChange={onChange} label={showStr} />
             <PillBarButton prefix='notifications' settings={settings} settingPath={['sounds', 'follow_request']} onChange={onChange} label={soundStr} />
           </div>
-        </div>
+        </section>
 
-        <div role='group' aria-labelledby='notifications-favourite'>
-          <span id='notifications-favourite' className='column-settings__section'><FormattedMessage id='notifications.column_settings.favourite' defaultMessage='Favorites:' /></span>
+        <section role='group' aria-labelledby='notifications-favourite'>
+          <h3 id='notifications-favourite'><FormattedMessage id='notifications.column_settings.favourite' defaultMessage='Favorites:' /></h3>
 
           <div className='column-settings__pillbar'>
             <PillBarButton disabled={browserPermission === 'denied'} prefix='notifications_desktop' settings={settings} settingPath={['alerts', 'favourite']} onChange={onChange} label={alertStr} />
@@ -118,10 +157,10 @@ export default class ColumnSettings extends PureComponent {
             <PillBarButton prefix='notifications' settings={settings} settingPath={['shows', 'favourite']} onChange={onChange} label={showStr} />
             <PillBarButton prefix='notifications' settings={settings} settingPath={['sounds', 'favourite']} onChange={onChange} label={soundStr} />
           </div>
-        </div>
+        </section>
 
-        <div role='group' aria-labelledby='notifications-mention'>
-          <span id='notifications-mention' className='column-settings__section'><FormattedMessage id='notifications.column_settings.mention' defaultMessage='Mentions:' /></span>
+        <section role='group' aria-labelledby='notifications-mention'>
+          <h3 id='notifications-mention'><FormattedMessage id='notifications.column_settings.mention' defaultMessage='Mentions:' /></h3>
 
           <div className='column-settings__pillbar'>
             <PillBarButton disabled={browserPermission === 'denied'} prefix='notifications_desktop' settings={settings} settingPath={['alerts', 'mention']} onChange={onChange} label={alertStr} />
@@ -129,10 +168,10 @@ export default class ColumnSettings extends PureComponent {
             <PillBarButton prefix='notifications' settings={settings} settingPath={['shows', 'mention']} onChange={onChange} label={showStr} />
             <PillBarButton prefix='notifications' settings={settings} settingPath={['sounds', 'mention']} onChange={onChange} label={soundStr} />
           </div>
-        </div>
+        </section>
 
-        <div role='group' aria-labelledby='notifications-reblog'>
-          <span id='notifications-reblog' className='column-settings__section'><FormattedMessage id='notifications.column_settings.reblog' defaultMessage='Boosts:' /></span>
+        <section role='group' aria-labelledby='notifications-reblog'>
+          <h3 id='notifications-reblog'><FormattedMessage id='notifications.column_settings.reblog' defaultMessage='Boosts:' /></h3>
 
           <div className='column-settings__pillbar'>
             <PillBarButton disabled={browserPermission === 'denied'} prefix='notifications_desktop' settings={settings} settingPath={['alerts', 'reblog']} onChange={onChange} label={alertStr} />
@@ -140,10 +179,10 @@ export default class ColumnSettings extends PureComponent {
             <PillBarButton prefix='notifications' settings={settings} settingPath={['shows', 'reblog']} onChange={onChange} label={showStr} />
             <PillBarButton prefix='notifications' settings={settings} settingPath={['sounds', 'reblog']} onChange={onChange} label={soundStr} />
           </div>
-        </div>
+        </section>
 
-        <div role='group' aria-labelledby='notifications-poll'>
-          <span id='notifications-poll' className='column-settings__section'><FormattedMessage id='notifications.column_settings.poll' defaultMessage='Poll results:' /></span>
+        <section role='group' aria-labelledby='notifications-poll'>
+          <h3 id='notifications-poll'><FormattedMessage id='notifications.column_settings.poll' defaultMessage='Poll results:' /></h3>
 
           <div className='column-settings__pillbar'>
             <PillBarButton disabled={browserPermission === 'denied'} prefix='notifications_desktop' settings={settings} settingPath={['alerts', 'poll']} onChange={onChange} label={alertStr} />
@@ -151,10 +190,10 @@ export default class ColumnSettings extends PureComponent {
             <PillBarButton prefix='notifications' settings={settings} settingPath={['shows', 'poll']} onChange={onChange} label={showStr} />
             <PillBarButton prefix='notifications' settings={settings} settingPath={['sounds', 'poll']} onChange={onChange} label={soundStr} />
           </div>
-        </div>
+        </section>
 
-        <div role='group' aria-labelledby='notifications-status'>
-          <span id='notifications-status' className='column-settings__section'><FormattedMessage id='notifications.column_settings.status' defaultMessage='New posts:' /></span>
+        <section role='group' aria-labelledby='notifications-status'>
+          <h3 id='notifications-status'><FormattedMessage id='notifications.column_settings.status' defaultMessage='New posts:' /></h3>
 
           <div className='column-settings__pillbar'>
             <PillBarButton disabled={browserPermission === 'denied'} prefix='notifications_desktop' settings={settings} settingPath={['alerts', 'status']} onChange={onChange} label={alertStr} />
@@ -162,10 +201,10 @@ export default class ColumnSettings extends PureComponent {
             <PillBarButton prefix='notifications' settings={settings} settingPath={['shows', 'status']} onChange={onChange} label={showStr} />
             <PillBarButton prefix='notifications' settings={settings} settingPath={['sounds', 'status']} onChange={onChange} label={soundStr} />
           </div>
-        </div>
+        </section>
 
-        <div role='group' aria-labelledby='notifications-update'>
-          <span id='notifications-update' className='column-settings__section'><FormattedMessage id='notifications.column_settings.update' defaultMessage='Edits:' /></span>
+        <section role='group' aria-labelledby='notifications-update'>
+          <h3 id='notifications-update'><FormattedMessage id='notifications.column_settings.update' defaultMessage='Edits:' /></h3>
 
           <div className='column-settings__pillbar'>
             <PillBarButton disabled={browserPermission === 'denied'} prefix='notifications_desktop' settings={settings} settingPath={['alerts', 'update']} onChange={onChange} label={alertStr} />
@@ -173,11 +212,11 @@ export default class ColumnSettings extends PureComponent {
             <PillBarButton prefix='notifications' settings={settings} settingPath={['shows', 'update']} onChange={onChange} label={showStr} />
             <PillBarButton prefix='notifications' settings={settings} settingPath={['sounds', 'update']} onChange={onChange} label={soundStr} />
           </div>
-        </div>
+        </section>
 
         {((this.context.identity.permissions & PERMISSION_MANAGE_USERS) === PERMISSION_MANAGE_USERS) && (
-          <div role='group' aria-labelledby='notifications-admin-sign-up'>
-            <span id='notifications-status' className='column-settings__section'><FormattedMessage id='notifications.column_settings.admin.sign_up' defaultMessage='New sign-ups:' /></span>
+          <section role='group' aria-labelledby='notifications-admin-sign-up'>
+            <h3 id='notifications-status'><FormattedMessage id='notifications.column_settings.admin.sign_up' defaultMessage='New sign-ups:' /></h3>
 
             <div className='column-settings__pillbar'>
               <PillBarButton disabled={browserPermission === 'denied'} prefix='notifications_desktop' settings={settings} settingPath={['alerts', 'admin.sign_up']} onChange={onChange} label={alertStr} />
@@ -185,12 +224,12 @@ export default class ColumnSettings extends PureComponent {
               <PillBarButton prefix='notifications' settings={settings} settingPath={['shows', 'admin.sign_up']} onChange={onChange} label={showStr} />
               <PillBarButton prefix='notifications' settings={settings} settingPath={['sounds', 'admin.sign_up']} onChange={onChange} label={soundStr} />
             </div>
-          </div>
+          </section>
         )}
 
         {((this.context.identity.permissions & PERMISSION_MANAGE_REPORTS) === PERMISSION_MANAGE_REPORTS) && (
-          <div role='group' aria-labelledby='notifications-admin-report'>
-            <span id='notifications-status' className='column-settings__section'><FormattedMessage id='notifications.column_settings.admin.report' defaultMessage='New reports:' /></span>
+          <section role='group' aria-labelledby='notifications-admin-report'>
+            <h3 id='notifications-status'><FormattedMessage id='notifications.column_settings.admin.report' defaultMessage='New reports:' /></h3>
 
             <div className='column-settings__pillbar'>
               <PillBarButton disabled={browserPermission === 'denied'} prefix='notifications_desktop' settings={settings} settingPath={['alerts', 'admin.report']} onChange={onChange} label={alertStr} />
@@ -198,7 +237,7 @@ export default class ColumnSettings extends PureComponent {
               <PillBarButton prefix='notifications' settings={settings} settingPath={['shows', 'admin.report']} onChange={onChange} label={showStr} />
               <PillBarButton prefix='notifications' settings={settings} settingPath={['sounds', 'admin.report']} onChange={onChange} label={soundStr} />
             </div>
-          </div>
+          </section>
         )}
       </div>
     );
diff --git a/app/javascript/flavours/glitch/features/notifications/components/filtered_notifications_banner.jsx b/app/javascript/flavours/glitch/features/notifications/components/filtered_notifications_banner.jsx
new file mode 100644
index 00000000000000..20d650132914fc
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/notifications/components/filtered_notifications_banner.jsx
@@ -0,0 +1,49 @@
+import { useEffect } from 'react';
+
+import { FormattedMessage } from 'react-intl';
+
+import { Link } from 'react-router-dom';
+
+import { useDispatch, useSelector } from 'react-redux';
+
+
+import ArchiveIcon from '@/material-icons/400-24px/archive.svg?react';
+import { fetchNotificationPolicy } from 'flavours/glitch/actions/notifications';
+import { Icon } from 'flavours/glitch/components/icon';
+import { toCappedNumber } from 'flavours/glitch/utils/numbers';
+
+export const FilteredNotificationsBanner = () => {
+  const dispatch = useDispatch();
+  const policy = useSelector(state => state.get('notificationPolicy'));
+
+  useEffect(() => {
+    dispatch(fetchNotificationPolicy());
+
+    const interval = setInterval(() => {
+      dispatch(fetchNotificationPolicy());
+    }, 120000);
+
+    return () => {
+      clearInterval(interval);
+    };
+  }, [dispatch]);
+
+  if (policy === null || policy.getIn(['summary', 'pending_notifications_count']) * 1 === 0) {
+    return null;
+  }
+
+  return (
+    <Link className='filtered-notifications-banner' to='/notifications/requests'>
+      <Icon icon={ArchiveIcon} />
+
+      <div className='filtered-notifications-banner__text'>
+        <strong><FormattedMessage id='filtered_notifications_banner.title' defaultMessage='Filtered notifications' /></strong>
+        <span><FormattedMessage id='filtered_notifications_banner.pending_requests' defaultMessage='Notifications from {count, plural, =0 {no} one {one person} other {# people}} you may know' values={{ count: policy.getIn(['summary', 'pending_requests_count']) }} /></span>
+      </div>
+
+      <div className='filtered-notifications-banner__badge'>
+        {toCappedNumber(policy.getIn(['summary', 'pending_notifications_count']))}
+      </div>
+    </Link>
+  );
+};
diff --git a/app/javascript/flavours/glitch/features/notifications/components/notification_request.jsx b/app/javascript/flavours/glitch/features/notifications/components/notification_request.jsx
new file mode 100644
index 00000000000000..6ba97066ce8eb0
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/notifications/components/notification_request.jsx
@@ -0,0 +1,65 @@
+import PropTypes from 'prop-types';
+import { useCallback } from 'react';
+
+import { defineMessages, useIntl } from 'react-intl';
+
+import { Link } from 'react-router-dom';
+
+import { useSelector, useDispatch } from 'react-redux';
+
+import DoneIcon from '@/material-icons/400-24px/done.svg?react';
+import VolumeOffIcon from '@/material-icons/400-24px/volume_off.svg?react';
+import { acceptNotificationRequest, dismissNotificationRequest } from 'flavours/glitch/actions/notifications';
+import { Avatar } from 'flavours/glitch/components/avatar';
+import { IconButton } from 'flavours/glitch/components/icon_button';
+import { makeGetAccount } from 'flavours/glitch/selectors';
+import { toCappedNumber } from 'flavours/glitch/utils/numbers';
+
+const getAccount = makeGetAccount();
+
+const messages = defineMessages({
+  accept: { id: 'notification_requests.accept', defaultMessage: 'Accept' },
+  dismiss: { id: 'notification_requests.dismiss', defaultMessage: 'Dismiss' },
+});
+
+export const NotificationRequest = ({ id, accountId, notificationsCount }) => {
+  const dispatch = useDispatch();
+  const account = useSelector(state => getAccount(state, accountId));
+  const intl = useIntl();
+
+  const handleDismiss = useCallback(() => {
+    dispatch(dismissNotificationRequest(id));
+  }, [dispatch, id]);
+
+  const handleAccept = useCallback(() => {
+    dispatch(acceptNotificationRequest(id));
+  }, [dispatch, id]);
+
+  return (
+    <div className='notification-request'>
+      <Link to={`/notifications/requests/${id}`} className='notification-request__link'>
+        <Avatar account={account} size={36} />
+
+        <div className='notification-request__name'>
+          <div className='notification-request__name__display-name'>
+            <bdi><strong dangerouslySetInnerHTML={{ __html: account?.get('display_name_html') }} /></bdi>
+            <span className='filtered-notifications-banner__badge'>{toCappedNumber(notificationsCount)}</span>
+          </div>
+
+          <span>@{account?.get('acct')}</span>
+        </div>
+      </Link>
+
+      <div className='notification-request__actions'>
+        <IconButton iconComponent={VolumeOffIcon} onClick={handleDismiss} title={intl.formatMessage(messages.dismiss)} />
+        <IconButton iconComponent={DoneIcon} onClick={handleAccept} title={intl.formatMessage(messages.accept)} />
+      </div>
+    </div>
+  );
+};
+
+NotificationRequest.propTypes = {
+  id: PropTypes.string.isRequired,
+  accountId: PropTypes.string.isRequired,
+  notificationsCount: PropTypes.string.isRequired,
+};
diff --git a/app/javascript/flavours/glitch/features/notifications/containers/column_settings_container.js b/app/javascript/flavours/glitch/features/notifications/containers/column_settings_container.js
index 1e62ed9a5a45b6..de266160f8511c 100644
--- a/app/javascript/flavours/glitch/features/notifications/containers/column_settings_container.js
+++ b/app/javascript/flavours/glitch/features/notifications/containers/column_settings_container.js
@@ -4,7 +4,7 @@ import { connect } from 'react-redux';
 
 import { showAlert } from '../../../actions/alerts';
 import { openModal } from '../../../actions/modal';
-import { setFilter, clearNotifications, requestBrowserPermission } from '../../../actions/notifications';
+import { setFilter, clearNotifications, requestBrowserPermission, updateNotificationsPolicy } from '../../../actions/notifications';
 import { changeAlerts as changePushNotifications } from '../../../actions/push_notifications';
 import { changeSetting } from '../../../actions/settings';
 import ColumnSettings from '../components/column_settings';
@@ -21,6 +21,7 @@ const mapStateToProps = state => ({
   alertsEnabled: state.getIn(['settings', 'notifications', 'alerts']).includes(true),
   browserSupport: state.getIn(['notifications', 'browserSupport']),
   browserPermission: state.getIn(['notifications', 'browserPermission']),
+  notificationPolicy: state.get('notificationPolicy'),
 });
 
 const mapDispatchToProps = (dispatch, { intl }) => ({
@@ -73,6 +74,12 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
     dispatch(requestBrowserPermission());
   },
 
+  onChangePolicy (param, checked) {
+    dispatch(updateNotificationsPolicy({
+      [param]: checked,
+    }));
+  },
+
 });
 
 export default injectIntl(connect(mapStateToProps, mapDispatchToProps)(ColumnSettings));
diff --git a/app/javascript/flavours/glitch/features/notifications/index.jsx b/app/javascript/flavours/glitch/features/notifications/index.jsx
index 783c35a43e7dcd..e84ef70b05cd15 100644
--- a/app/javascript/flavours/glitch/features/notifications/index.jsx
+++ b/app/javascript/flavours/glitch/features/notifications/index.jsx
@@ -37,6 +37,7 @@ import { LoadGap } from '../../components/load_gap';
 import ScrollableList from '../../components/scrollable_list';
 import NotificationPurgeButtonsContainer from '../../containers/notification_purge_buttons_container';
 
+import { FilteredNotificationsBanner } from './components/filtered_notifications_banner';
 import NotificationsPermissionBanner from './components/notifications_permission_banner';
 import ColumnSettingsContainer from './containers/column_settings_container';
 import FilterBarContainer from './containers/filter_bar_container';
@@ -357,6 +358,9 @@ class Notifications extends PureComponent {
         </ColumnHeader>
 
         {filterBarContainer}
+
+        <FilteredNotificationsBanner />
+
         {scrollContainer}
 
         <Helmet>
diff --git a/app/javascript/flavours/glitch/features/notifications/request.jsx b/app/javascript/flavours/glitch/features/notifications/request.jsx
new file mode 100644
index 00000000000000..d89527f69a6a45
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/notifications/request.jsx
@@ -0,0 +1,144 @@
+import PropTypes from 'prop-types';
+import { useRef, useCallback, useEffect } from 'react';
+
+import { defineMessages, useIntl } from 'react-intl';
+
+import { Helmet } from 'react-helmet';
+
+import { useSelector, useDispatch } from 'react-redux';
+
+import ArchiveIcon from '@/material-icons/400-24px/archive.svg?react';
+import DoneIcon from '@/material-icons/400-24px/done.svg?react';
+import VolumeOffIcon from '@/material-icons/400-24px/volume_off.svg?react';
+import { fetchNotificationRequest, fetchNotificationsForRequest, expandNotificationsForRequest, acceptNotificationRequest, dismissNotificationRequest } from 'flavours/glitch/actions/notifications';
+import Column from 'flavours/glitch/components/column';
+import ColumnHeader from 'flavours/glitch/components/column_header';
+import { IconButton } from 'flavours/glitch/components/icon_button';
+import ScrollableList from 'flavours/glitch/components/scrollable_list';
+
+import NotificationContainer from './containers/notification_container';
+
+const messages = defineMessages({
+  title: { id: 'notification_requests.notifications_from', defaultMessage: 'Notifications from {name}' },
+  accept: { id: 'notification_requests.accept', defaultMessage: 'Accept' },
+  dismiss: { id: 'notification_requests.dismiss', defaultMessage: 'Dismiss' },
+});
+
+const selectChild = (ref, index, alignTop) => {
+  const container = ref.current.node;
+  const element = container.querySelector(`article:nth-of-type(${index + 1}) .focusable`);
+
+  if (element) {
+    if (alignTop && container.scrollTop > element.offsetTop) {
+      element.scrollIntoView(true);
+    } else if (!alignTop && container.scrollTop + container.clientHeight < element.offsetTop + element.offsetHeight) {
+      element.scrollIntoView(false);
+    }
+
+    element.focus();
+  }
+};
+
+export const NotificationRequest = ({ multiColumn, params: { id } }) => {
+  const columnRef = useRef();
+  const intl = useIntl();
+  const dispatch = useDispatch();
+  const notificationRequest = useSelector(state => state.getIn(['notificationRequests', 'current', 'item', 'id']) === id ? state.getIn(['notificationRequests', 'current', 'item']) : null);
+  const accountId = notificationRequest?.get('account');
+  const account = useSelector(state => state.getIn(['accounts', accountId]));
+  const notifications = useSelector(state => state.getIn(['notificationRequests', 'current', 'notifications', 'items']));
+  const isLoading = useSelector(state => state.getIn(['notificationRequests', 'current', 'notifications', 'isLoading']));
+  const hasMore = useSelector(state => !!state.getIn(['notificationRequests', 'current', 'notifications', 'next']));
+  const removed = useSelector(state => state.getIn(['notificationRequests', 'current', 'removed']));
+
+  const handleHeaderClick = useCallback(() => {
+    columnRef.current?.scrollTop();
+  }, [columnRef]);
+
+  const handleLoadMore = useCallback(() => {
+    dispatch(expandNotificationsForRequest());
+  }, [dispatch]);
+
+  const handleDismiss = useCallback(() => {
+    dispatch(dismissNotificationRequest(id));
+  }, [dispatch, id]);
+
+  const handleAccept = useCallback(() => {
+    dispatch(acceptNotificationRequest(id));
+  }, [dispatch, id]);
+
+  const handleMoveUp = useCallback(id => {
+    const elementIndex = notifications.findIndex(item => item !== null && item.get('id') === id) - 1;
+    selectChild(columnRef, elementIndex, true);
+  }, [columnRef, notifications]);
+
+  const handleMoveDown = useCallback(id => {
+    const elementIndex = notifications.findIndex(item => item !== null && item.get('id') === id) + 1;
+    selectChild(columnRef, elementIndex, false);
+  }, [columnRef, notifications]);
+
+  useEffect(() => {
+    dispatch(fetchNotificationRequest(id));
+  }, [dispatch, id]);
+
+  useEffect(() => {
+    if (accountId) {
+      dispatch(fetchNotificationsForRequest(accountId));
+    }
+  }, [dispatch, accountId]);
+
+  const columnTitle = intl.formatMessage(messages.title, { name: account?.get('display_name') });
+
+  return (
+    <Column bindToDocument={!multiColumn} ref={columnRef} label={columnTitle}>
+      <ColumnHeader
+        icon='archive'
+        iconComponent={ArchiveIcon}
+        title={columnTitle}
+        onClick={handleHeaderClick}
+        multiColumn={multiColumn}
+        showBackButton
+        extraButton={!removed && (
+          <>
+            <IconButton className='column-header__button' iconComponent={VolumeOffIcon} onClick={handleDismiss} title={intl.formatMessage(messages.dismiss)} />
+            <IconButton className='column-header__button' iconComponent={DoneIcon} onClick={handleAccept} title={intl.formatMessage(messages.accept)} />
+          </>
+        )}
+      />
+
+      <ScrollableList
+        scrollKey={`notification_requests/${id}`}
+        trackScroll={!multiColumn}
+        bindToDocument={!multiColumn}
+        isLoading={isLoading}
+        showLoading={isLoading && notifications.size === 0}
+        hasMore={hasMore}
+        onLoadMore={handleLoadMore}
+      >
+        {notifications.map(item => (
+          item && <NotificationContainer
+            key={item.get('id')}
+            notification={item}
+            accountId={item.get('account')}
+            onMoveUp={handleMoveUp}
+            onMoveDown={handleMoveDown}
+          />
+        ))}
+      </ScrollableList>
+
+      <Helmet>
+        <title>{columnTitle}</title>
+        <meta name='robots' content='noindex' />
+      </Helmet>
+    </Column>
+  );
+};
+
+NotificationRequest.propTypes = {
+  multiColumn: PropTypes.bool,
+  params: PropTypes.shape({
+    id: PropTypes.string.isRequired,
+  }),
+};
+
+export default NotificationRequest;
diff --git a/app/javascript/flavours/glitch/features/notifications/requests.jsx b/app/javascript/flavours/glitch/features/notifications/requests.jsx
new file mode 100644
index 00000000000000..6cb77b997b3836
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/notifications/requests.jsx
@@ -0,0 +1,85 @@
+import PropTypes from 'prop-types';
+import { useRef, useCallback, useEffect } from 'react';
+
+import { defineMessages, useIntl, FormattedMessage } from 'react-intl';
+
+import { Helmet } from 'react-helmet';
+
+import { useSelector, useDispatch } from 'react-redux';
+
+import ArchiveIcon from '@/material-icons/400-24px/archive.svg?react';
+import { fetchNotificationRequests, expandNotificationRequests } from 'flavours/glitch/actions/notifications';
+import Column from 'flavours/glitch/components/column';
+import ColumnHeader from 'flavours/glitch/components/column_header';
+import ScrollableList from 'flavours/glitch/components/scrollable_list';
+
+import { NotificationRequest } from './components/notification_request';
+
+const messages = defineMessages({
+  title: { id: 'notification_requests.title', defaultMessage: 'Filtered notifications' },
+});
+
+export const NotificationRequests = ({ multiColumn }) => {
+  const columnRef = useRef();
+  const intl = useIntl();
+  const dispatch = useDispatch();
+  const isLoading = useSelector(state => state.getIn(['notificationRequests', 'isLoading']));
+  const notificationRequests = useSelector(state => state.getIn(['notificationRequests', 'items']));
+  const hasMore = useSelector(state => !!state.getIn(['notificationRequests', 'next']));
+
+  const handleHeaderClick = useCallback(() => {
+    columnRef.current?.scrollTop();
+  }, [columnRef]);
+
+  const handleLoadMore = useCallback(() => {
+    dispatch(expandNotificationRequests());
+  }, [dispatch]);
+
+  useEffect(() => {
+    dispatch(fetchNotificationRequests());
+  }, [dispatch]);
+
+  return (
+    <Column bindToDocument={!multiColumn} ref={columnRef} label={intl.formatMessage(messages.title)}>
+      <ColumnHeader
+        icon='archive'
+        iconComponent={ArchiveIcon}
+        title={intl.formatMessage(messages.title)}
+        onClick={handleHeaderClick}
+        multiColumn={multiColumn}
+        showBackButton
+      />
+
+      <ScrollableList
+        scrollKey='notification_requests'
+        trackScroll={!multiColumn}
+        bindToDocument={!multiColumn}
+        isLoading={isLoading}
+        showLoading={isLoading && notificationRequests.size === 0}
+        hasMore={hasMore}
+        onLoadMore={handleLoadMore}
+        emptyMessage={<FormattedMessage id='empty_column.notification_requests' defaultMessage='All clear! There is nothing here. When you receive new notifications, they will appear here according to your settings.' />}
+      >
+        {notificationRequests.map(request => (
+          <NotificationRequest
+            key={request.get('id')}
+            id={request.get('id')}
+            accountId={request.get('account')}
+            notificationsCount={request.get('notifications_count')}
+          />
+        ))}
+      </ScrollableList>
+
+      <Helmet>
+        <title>{intl.formatMessage(messages.title)}</title>
+        <meta name='robots' content='noindex' />
+      </Helmet>
+    </Column>
+  );
+};
+
+NotificationRequests.propTypes = {
+  multiColumn: PropTypes.bool,
+};
+
+export default NotificationRequests;
diff --git a/app/javascript/flavours/glitch/features/public_timeline/components/column_settings.jsx b/app/javascript/flavours/glitch/features/public_timeline/components/column_settings.jsx
index 82684c83685439..63c14b897bf345 100644
--- a/app/javascript/flavours/glitch/features/public_timeline/components/column_settings.jsx
+++ b/app/javascript/flavours/glitch/features/public_timeline/components/column_settings.jsx
@@ -25,18 +25,22 @@ class ColumnSettings extends PureComponent {
     const { settings, onChange, intl } = this.props;
 
     return (
-      <div>
-        <div className='column-settings__row'>
-          <SettingToggle settings={settings} settingPath={['other', 'onlyMedia']} onChange={onChange} label={<FormattedMessage id='community.column_settings.media_only' defaultMessage='Media only' />} />
-          <SettingToggle settings={settings} settingPath={['other', 'onlyRemote']} onChange={onChange} label={<FormattedMessage id='community.column_settings.remote_only' defaultMessage='Remote only' />} />
-          {!settings.getIn(['other', 'onlyRemote']) && <SettingToggle settings={settings} settingPath={['other', 'allowLocalOnly']} onChange={onChange} label={<FormattedMessage id='community.column_settings.allow_local_only' defaultMessage='Show local-only toots' />} />}
-        </div>
-
-        <span className='column-settings__section'><FormattedMessage id='home.column_settings.advanced' defaultMessage='Advanced' /></span>
-
-        <div className='column-settings__row'>
-          <SettingText settings={settings} settingPath={['regex', 'body']} onChange={onChange} label={intl.formatMessage(messages.filter_regex)} />
-        </div>
+      <div className='column-settings'>
+        <section>
+          <div className='column-settings__row'>
+            <SettingToggle settings={settings} settingPath={['other', 'onlyMedia']} onChange={onChange} label={<FormattedMessage id='community.column_settings.media_only' defaultMessage='Media only' />} />
+            <SettingToggle settings={settings} settingPath={['other', 'onlyRemote']} onChange={onChange} label={<FormattedMessage id='community.column_settings.remote_only' defaultMessage='Remote only' />} />
+            {!settings.getIn(['other', 'onlyRemote']) && <SettingToggle settings={settings} settingPath={['other', 'allowLocalOnly']} onChange={onChange} label={<FormattedMessage id='community.column_settings.allow_local_only' defaultMessage='Show local-only toots' />} />}
+          </div>
+        </section>
+
+        <section>
+          <span className='column-settings__section'><FormattedMessage id='home.column_settings.advanced' defaultMessage='Advanced' /></span>
+
+          <div className='column-settings__row'>
+            <SettingText settings={settings} settingPath={['regex', 'body']} onChange={onChange} label={intl.formatMessage(messages.filter_regex)} />
+          </div>
+        </section>
       </div>
     );
   }
diff --git a/app/javascript/flavours/glitch/features/ui/index.jsx b/app/javascript/flavours/glitch/features/ui/index.jsx
index f847bf644875e0..51ac4ac145ae1a 100644
--- a/app/javascript/flavours/glitch/features/ui/index.jsx
+++ b/app/javascript/flavours/glitch/features/ui/index.jsx
@@ -50,6 +50,8 @@ import {
   DirectTimeline,
   HashtagTimeline,
   Notifications,
+  NotificationRequests,
+  NotificationRequest,
   FollowRequests,
   FavouritedStatuses,
   BookmarkedStatuses,
@@ -212,7 +214,9 @@ class SwitchingColumnsArea extends PureComponent {
             <WrappedRoute path={['/conversations', '/timelines/direct']} component={DirectTimeline} content={children} />
             <WrappedRoute path='/tags/:id' component={HashtagTimeline} content={children} />
             <WrappedRoute path='/lists/:id' component={ListTimeline} content={children} />
-            <WrappedRoute path='/notifications' component={Notifications} content={children} />
+            <WrappedRoute path='/notifications' component={Notifications} content={children} exact />
+            <WrappedRoute path='/notifications/requests' component={NotificationRequests} content={children} exact />
+            <WrappedRoute path='/notifications/requests/:id' component={NotificationRequest} content={children} exact />
             <WrappedRoute path='/favourites' component={FavouritedStatuses} content={children} />
 
             <WrappedRoute path='/bookmarks' component={BookmarkedStatuses} content={children} />
diff --git a/app/javascript/flavours/glitch/features/ui/util/async-components.js b/app/javascript/flavours/glitch/features/ui/util/async-components.js
index c17bb206e32205..14d46d70434d99 100644
--- a/app/javascript/flavours/glitch/features/ui/util/async-components.js
+++ b/app/javascript/flavours/glitch/features/ui/util/async-components.js
@@ -201,3 +201,11 @@ export function About () {
 export function PrivacyPolicy () {
   return import(/*webpackChunkName: "features/glitch/async/privacy_policy" */'../../privacy_policy');
 }
+
+export function NotificationRequests () {
+  return import(/*webpackChunkName: "features/glitch/notifications/requests" */'../../notifications/requests');
+}
+
+export function NotificationRequest () {
+  return import(/*webpackChunkName: "features/glitch/notifications/request" */'../../notifications/request');
+}
diff --git a/app/javascript/flavours/glitch/locales/en.json b/app/javascript/flavours/glitch/locales/en.json
index 8de7059787ed96..990c8afe4ca169 100644
--- a/app/javascript/flavours/glitch/locales/en.json
+++ b/app/javascript/flavours/glitch/locales/en.json
@@ -64,6 +64,9 @@
   "notification_purge.btn_invert": "Invert\nselection",
   "notification_purge.btn_none": "Select\nnone",
   "notification_purge.start": "Enter notification cleaning mode",
+  "notifications.column_settings.filter_bar.advanced": "Display all categories",
+  "notifications.column_settings.filter_bar.category": "Quick filter bar",
+  "notifications.column_settings.filter_bar.show_bar": "Show filter bar",
   "notifications.marked_clear": "Clear selected notifications",
   "notifications.marked_clear_confirmation": "Are you sure you want to permanently clear all selected notifications?",
   "settings.always_show_spoilers_field": "Always enable the Content Warning field",
diff --git a/app/javascript/flavours/glitch/reducers/index.ts b/app/javascript/flavours/glitch/reducers/index.ts
index 4775c076e7837d..1049a39900e992 100644
--- a/app/javascript/flavours/glitch/reducers/index.ts
+++ b/app/javascript/flavours/glitch/reducers/index.ts
@@ -28,6 +28,8 @@ import media_attachments from './media_attachments';
 import meta from './meta';
 import { modalReducer } from './modal';
 import mutes from './mutes';
+import { notificationPolicyReducer } from './notification_policy';
+import { notificationRequestsReducer } from './notification_requests';
 import notifications from './notifications';
 import picture_in_picture from './picture_in_picture';
 import pinnedAccountsEditor from './pinned_accounts_editor';
@@ -88,6 +90,8 @@ const reducers = {
   history,
   tags,
   followed_tags,
+  notificationPolicy: notificationPolicyReducer,
+  notificationRequests: notificationRequestsReducer,
 };
 
 // We want the root state to be an ImmutableRecord, which is an object with a defined list of keys,
diff --git a/app/javascript/flavours/glitch/reducers/notification_policy.js b/app/javascript/flavours/glitch/reducers/notification_policy.js
new file mode 100644
index 00000000000000..579f2afdb26495
--- /dev/null
+++ b/app/javascript/flavours/glitch/reducers/notification_policy.js
@@ -0,0 +1,12 @@
+import { fromJS } from 'immutable';
+
+import { NOTIFICATION_POLICY_FETCH_SUCCESS } from 'flavours/glitch/actions/notifications';
+
+export const notificationPolicyReducer = (state = null, action) => {
+  switch(action.type) {
+  case NOTIFICATION_POLICY_FETCH_SUCCESS:
+    return fromJS(action.policy);
+  default:
+    return state;
+  }
+};
diff --git a/app/javascript/flavours/glitch/reducers/notification_requests.js b/app/javascript/flavours/glitch/reducers/notification_requests.js
new file mode 100644
index 00000000000000..c1da951f6c515f
--- /dev/null
+++ b/app/javascript/flavours/glitch/reducers/notification_requests.js
@@ -0,0 +1,96 @@
+import { Map as ImmutableMap, List as ImmutableList, fromJS } from 'immutable';
+
+import {
+  NOTIFICATION_REQUESTS_EXPAND_REQUEST,
+  NOTIFICATION_REQUESTS_EXPAND_SUCCESS,
+  NOTIFICATION_REQUESTS_EXPAND_FAIL,
+  NOTIFICATION_REQUESTS_FETCH_REQUEST,
+  NOTIFICATION_REQUESTS_FETCH_SUCCESS,
+  NOTIFICATION_REQUESTS_FETCH_FAIL,
+  NOTIFICATION_REQUEST_FETCH_REQUEST,
+  NOTIFICATION_REQUEST_FETCH_SUCCESS,
+  NOTIFICATION_REQUEST_FETCH_FAIL,
+  NOTIFICATION_REQUEST_ACCEPT_REQUEST,
+  NOTIFICATION_REQUEST_DISMISS_REQUEST,
+  NOTIFICATIONS_FOR_REQUEST_FETCH_REQUEST,
+  NOTIFICATIONS_FOR_REQUEST_FETCH_SUCCESS,
+  NOTIFICATIONS_FOR_REQUEST_FETCH_FAIL,
+  NOTIFICATIONS_FOR_REQUEST_EXPAND_REQUEST,
+  NOTIFICATIONS_FOR_REQUEST_EXPAND_SUCCESS,
+  NOTIFICATIONS_FOR_REQUEST_EXPAND_FAIL,
+} from 'flavours/glitch/actions/notifications';
+
+import { notificationToMap } from './notifications';
+
+const initialState = ImmutableMap({
+  items: ImmutableList(),
+  isLoading: false,
+  next: null,
+  current: ImmutableMap({
+    isLoading: false,
+    item: null,
+    removed: false,
+    notifications: ImmutableMap({
+      items: ImmutableList(),
+      isLoading: false,
+      next: null,
+    }),
+  }),
+});
+
+const normalizeRequest = request => fromJS({
+  ...request,
+  account: request.account.id,
+});
+
+const removeRequest = (state, id) => {
+  if (state.getIn(['current', 'item', 'id']) === id) {
+    state = state.setIn(['current', 'removed'], true);
+  }
+
+  return state.update('items', list => list.filterNot(item => item.get('id') === id));
+};
+
+export const notificationRequestsReducer = (state = initialState, action) => {
+  switch(action.type) {
+  case NOTIFICATION_REQUESTS_FETCH_SUCCESS:
+    return state.withMutations(map => {
+      map.update('items', list => ImmutableList(action.requests.map(normalizeRequest)).concat(list));
+      map.set('isLoading', false);
+      map.update('next', next => next ?? action.next);
+    });
+  case NOTIFICATION_REQUESTS_EXPAND_SUCCESS:
+    return state.withMutations(map => {
+      map.update('items', list => list.concat(ImmutableList(action.requests.map(normalizeRequest))));
+      map.set('isLoading', false);
+      map.set('next', action.next);
+    });
+  case NOTIFICATION_REQUESTS_EXPAND_REQUEST:
+  case NOTIFICATION_REQUESTS_FETCH_REQUEST:
+    return state.set('isLoading', true);
+  case NOTIFICATION_REQUESTS_EXPAND_FAIL:
+  case NOTIFICATION_REQUESTS_FETCH_FAIL:
+    return state.set('isLoading', false);
+  case NOTIFICATION_REQUEST_ACCEPT_REQUEST:
+  case NOTIFICATION_REQUEST_DISMISS_REQUEST:
+    return removeRequest(state, action.id);
+  case NOTIFICATION_REQUEST_FETCH_REQUEST:
+    return state.set('current', initialState.get('current').set('isLoading', true));
+  case NOTIFICATION_REQUEST_FETCH_SUCCESS:
+    return state.update('current', map => map.set('isLoading', false).set('item', normalizeRequest(action.request)));
+  case NOTIFICATION_REQUEST_FETCH_FAIL:
+    return state.update('current', map => map.set('isLoading', false));
+  case NOTIFICATIONS_FOR_REQUEST_FETCH_REQUEST:
+  case NOTIFICATIONS_FOR_REQUEST_EXPAND_REQUEST:
+    return state.setIn(['current', 'notifications', 'isLoading'], true);
+  case NOTIFICATIONS_FOR_REQUEST_FETCH_SUCCESS:
+    return state.updateIn(['current', 'notifications'], map => map.set('isLoading', false).update('items', list => ImmutableList(action.notifications.map(notificationToMap)).concat(list)).update('next', next => next ?? action.next));
+  case NOTIFICATIONS_FOR_REQUEST_EXPAND_SUCCESS:
+    return state.updateIn(['current', 'notifications'], map => map.set('isLoading', false).update('items', list => list.concat(ImmutableList(action.notifications.map(notificationToMap)))).set('next', action.next));
+  case NOTIFICATIONS_FOR_REQUEST_FETCH_FAIL:
+  case NOTIFICATIONS_FOR_REQUEST_EXPAND_FAIL:
+    return state.setIn(['current', 'notifications', 'isLoading'], false);
+  default:
+    return state;
+  }
+};
diff --git a/app/javascript/flavours/glitch/reducers/notifications.js b/app/javascript/flavours/glitch/reducers/notifications.js
index 37aed873480acf..c6d70945ba9a79 100644
--- a/app/javascript/flavours/glitch/reducers/notifications.js
+++ b/app/javascript/flavours/glitch/reducers/notifications.js
@@ -54,7 +54,7 @@ const initialState = ImmutableMap({
   markNewForDelete: false,
 });
 
-const notificationToMap = (notification, markForDelete) => ImmutableMap({
+export const notificationToMap = (notification, markForDelete = false) => ImmutableMap({
   id: notification.id,
   type: notification.type,
   account: notification.account.id,
diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index f08a6017f31316..9098591764d0b2 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -3506,12 +3506,13 @@ $ui-header-height: 55px;
   border: 0;
   border-bottom: 1px solid lighten($ui-base-color, 8%);
   text-align: unset;
-  padding: 15px;
+  padding: 13px;
   margin: 0;
   z-index: 3;
   outline: 0;
   display: flex;
   align-items: center;
+  gap: 5px;
 
   &:hover {
     text-decoration: underline;
@@ -3521,6 +3522,7 @@ $ui-header-height: 55px;
 .column-header__back-button {
   display: flex;
   align-items: center;
+  gap: 5px;
   background: $ui-base-color;
   border: 0;
   font-family: inherit;
@@ -3528,25 +3530,19 @@ $ui-header-height: 55px;
   cursor: pointer;
   white-space: nowrap;
   font-size: 16px;
-  padding: 0;
-  padding-inline-end: 5px;
+  padding: 13px;
   z-index: 3;
 
   &:hover {
     text-decoration: underline;
   }
 
-  &:last-child {
-    padding: 0;
-    padding-inline-end: 15px;
+  &.compact {
+    padding-inline-end: 5px;
+    flex: 0 0 auto;
   }
 }
 
-.column-back-button__icon {
-  display: inline-block;
-  margin-inline-end: 5px;
-}
-
 .react-toggle {
   display: inline-block;
   position: relative;
@@ -4255,7 +4251,7 @@ a.status-card {
   z-index: 2;
   outline: 0;
 
-  & > button {
+  &__title {
     display: flex;
     align-items: center;
     gap: 5px;
@@ -4277,8 +4273,18 @@ a.status-card {
     }
   }
 
-  & > .column-header__back-button {
+  .column-header__back-button + &__title {
+    padding-inline-start: 0;
+  }
+
+  .column-header__back-button {
+    flex: 1;
     color: $highlight-text-color;
+
+    &.compact {
+      flex: 0 0 auto;
+      color: $primary-text-color;
+    }
   }
 
   &.active {
@@ -4292,6 +4298,18 @@ a.status-card {
   &:active {
     outline: 0;
   }
+
+  &__advanced-buttons {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 16px;
+    padding-top: 0;
+
+    &:first-child {
+      padding-top: 16px;
+    }
+  }
 }
 
 .column-header__buttons {
@@ -4427,7 +4445,6 @@ a.status-card {
 
 .column-header__collapsible-inner {
   background: $ui-base-color;
-  padding: 15px;
 }
 
 .column-header__setting-btn {
@@ -4449,20 +4466,8 @@ a.status-card {
 }
 
 .column-header__setting-arrows {
-  float: right;
-
-  .column-header__setting-btn {
-    padding: 5px;
-
-    &:first-child {
-      padding-inline-end: 7px;
-    }
-
-    &:last-child {
-      padding-inline-start: 7px;
-      margin-inline-start: 5px;
-    }
-  }
+  display: flex;
+  align-items: center;
 }
 
 .column-settings__pillbar {
@@ -4795,24 +4800,56 @@ a.status-card {
   text-align: center;
 }
 
-.column-settings__outer {
-  background: lighten($ui-base-color, 8%);
-  padding: 15px;
-}
+.column-settings {
+  display: flex;
+  flex-direction: column;
 
-.column-settings__section {
-  color: $darker-text-color;
-  cursor: default;
-  display: block;
-  font-weight: 500;
-  margin-bottom: 10px;
-}
+  &__section {
+    // FIXME: Legacy
+    color: $darker-text-color;
+    cursor: default;
+    display: block;
+    font-weight: 500;
+  }
 
-.column-settings__row--with-margin {
-  margin-bottom: 15px;
+  .column-header__links {
+    margin: 0;
+  }
+
+  section {
+    padding: 16px;
+    border-bottom: 1px solid lighten($ui-base-color, 8%);
+
+    &:last-child {
+      border-bottom: 0;
+    }
+  }
+
+  h3 {
+    font-size: 16px;
+    line-height: 24px;
+    letter-spacing: 0.5px;
+    font-weight: 500;
+    color: $primary-text-color;
+    margin-bottom: 16px;
+  }
+
+  &__row {
+    display: flex;
+    flex-direction: column;
+    gap: 12px;
+  }
+
+  .app-form__toggle {
+    &__toggle > div {
+      border: 0;
+    }
+  }
 }
 
 .column-settings__hashtags {
+  margin-top: 15px;
+
   .column-settings__row {
     margin-bottom: 15px;
   }
@@ -4940,16 +4977,13 @@ a.status-card {
 }
 
 .setting-toggle {
-  display: block;
-  line-height: 24px;
+  display: flex;
+  align-items: center;
+  gap: 8px;
 }
 
 .setting-toggle__label {
   color: $darker-text-color;
-  display: inline-block;
-  margin-bottom: 14px;
-  margin-inline-start: 8px;
-  vertical-align: middle;
 }
 
 .limited-account-hint {
@@ -7536,29 +7570,33 @@ img.modal-warning {
   background: $ui-base-color;
 
   &__column {
-    padding: 10px 15px;
-    padding-bottom: 0;
+    display: flex;
+    flex-direction: column;
+    gap: 15px;
+    padding: 15px;
   }
 
   .radio-button {
-    display: block;
+    display: flex;
   }
 }
 
 .column-settings__row .radio-button {
-  display: block;
+  display: flex;
 }
 
 .radio-button {
   font-size: 14px;
   position: relative;
-  display: inline-block;
-  padding: 6px 0;
+  display: inline-flex;
+  align-items: center;
   line-height: 18px;
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
   cursor: pointer;
+  gap: 10px;
+  color: $secondary-text-color;
 
   input[type='radio'],
   input[type='checkbox'] {
@@ -7566,21 +7604,29 @@ img.modal-warning {
   }
 
   &__input {
-    display: inline-block;
+    display: block;
     position: relative;
-    border: 1px solid $ui-primary-color;
+    border: 2px solid $secondary-text-color;
     box-sizing: border-box;
     width: 18px;
     height: 18px;
     flex: 0 0 auto;
-    margin-inline-end: 10px;
-    top: -1px;
     border-radius: 50%;
-    vertical-align: middle;
 
     &.checked {
-      border-color: lighten($ui-highlight-color, 4%);
-      background: lighten($ui-highlight-color, 4%);
+      border-color: $secondary-text-color;
+
+      &::before {
+        position: absolute;
+        left: 2px;
+        top: 2px;
+        content: '';
+        display: block;
+        border-radius: 50%;
+        width: 10px;
+        height: 10px;
+        background: $secondary-text-color;
+      }
     }
   }
 }
@@ -10185,3 +10231,110 @@ noscript {
     }
   }
 }
+
+.filtered-notifications-banner {
+  display: flex;
+  align-items: center;
+  background: $ui-base-color;
+  border-bottom: 1px solid lighten($ui-base-color, 8%);
+  padding: 15px;
+  gap: 15px;
+  color: $darker-text-color;
+  text-decoration: none;
+
+  &:hover,
+  &:active,
+  &:focus {
+    color: $secondary-text-color;
+
+    .filtered-notifications-banner__badge {
+      background: $secondary-text-color;
+    }
+  }
+
+  .icon {
+    width: 24px;
+    height: 24px;
+  }
+
+  &__text {
+    flex: 1 1 auto;
+    font-style: 14px;
+    line-height: 20px;
+
+    strong {
+      font-size: 16px;
+      line-height: 24px;
+      display: block;
+    }
+  }
+
+  &__badge {
+    background: $darker-text-color;
+    color: $ui-base-color;
+    border-radius: 100px;
+    padding: 2px 8px;
+    font-weight: 500;
+    font-size: 11px;
+    line-height: 16px;
+  }
+}
+
+.notification-request {
+  display: flex;
+  align-items: center;
+  gap: 16px;
+  padding: 15px;
+  border-bottom: 1px solid lighten($ui-base-color, 8%);
+
+  &__link {
+    display: flex;
+    align-items: center;
+    gap: 12px;
+    flex: 1 1 auto;
+    text-decoration: none;
+    color: inherit;
+    overflow: hidden;
+
+    .account__avatar {
+      flex-shrink: 0;
+    }
+  }
+
+  &__name {
+    flex: 1 1 auto;
+    color: $darker-text-color;
+    font-style: 14px;
+    line-height: 20px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+
+    &__display-name {
+      display: flex;
+      align-items: center;
+      gap: 6px;
+      font-size: 16px;
+      letter-spacing: 0.5px;
+      line-height: 24px;
+      color: $secondary-text-color;
+    }
+
+    .filtered-notifications-banner__badge {
+      background-color: $highlight-text-color;
+      border-radius: 4px;
+      padding: 1px 6px;
+    }
+  }
+
+  &__actions {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+
+    .icon-button {
+      border-radius: 4px;
+      border: 1px solid lighten($ui-base-color, 8%);
+      padding: 5px;
+    }
+  }
+}
diff --git a/app/javascript/flavours/glitch/styles/forms.scss b/app/javascript/flavours/glitch/styles/forms.scss
index 5b7247734fa527..a279715fca73df 100644
--- a/app/javascript/flavours/glitch/styles/forms.scss
+++ b/app/javascript/flavours/glitch/styles/forms.scss
@@ -1315,6 +1315,12 @@ code {
         font-weight: 600;
       }
 
+      .hint {
+        display: block;
+        font-size: 14px;
+        color: $darker-text-color;
+      }
+
       .recommended {
         position: absolute;
         margin: 0 4px;
diff --git a/app/javascript/flavours/glitch/utils/numbers.ts b/app/javascript/flavours/glitch/utils/numbers.ts
index 35bcde83e2491a..03235cea810009 100644
--- a/app/javascript/flavours/glitch/utils/numbers.ts
+++ b/app/javascript/flavours/glitch/utils/numbers.ts
@@ -69,3 +69,11 @@ export function pluralReady(
 export function roundTo10(num: number): number {
   return Math.round(num * 0.1) / 0.1;
 }
+
+export function toCappedNumber(num: string): string {
+  if (parseInt(num) > 99) {
+    return '99+';
+  } else {
+    return num;
+  }
+}

From b36e96ec9079fd6f82657eb33c1d5280a818ffa6 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 11 Mar 2024 15:33:48 +0100
Subject: [PATCH 0429/2191] [Glitch] Change action button to be last on
 profiles in web UI

Port 19efa1b9f1486ffe95c14582017d9e9ede48d597 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../glitch/features/account/components/header.jsx  | 14 +++++---------
 .../flavours/glitch/styles/components.scss         |  5 +----
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/app/javascript/flavours/glitch/features/account/components/header.jsx b/app/javascript/flavours/glitch/features/account/components/header.jsx
index b2aee7682a0317..c693e85f41fce8 100644
--- a/app/javascript/flavours/glitch/features/account/components/header.jsx
+++ b/app/javascript/flavours/glitch/features/account/components/header.jsx
@@ -21,6 +21,7 @@ import { Button } from 'flavours/glitch/components/button';
 import { CopyIconButton } from 'flavours/glitch/components/copy_icon_button';
 import { Icon }  from 'flavours/glitch/components/icon';
 import { IconButton } from 'flavours/glitch/components/icon_button';
+import { LoadingIndicator } from 'flavours/glitch/components/loading_indicator';
 import DropdownMenuContainer from 'flavours/glitch/containers/dropdown_menu_container';
 import { autoPlayGif, me, domain } from 'flavours/glitch/initial_state';
 import { PERMISSION_MANAGE_USERS, PERMISSION_MANAGE_FEDERATION } from 'flavours/glitch/permissions';
@@ -206,7 +207,7 @@ class Header extends ImmutablePureComponent {
 
     if (me !== account.get('id')) {
       if (signedIn && !account.get('relationship')) { // Wait until the relationship is loaded
-        actionBtn = '';
+        actionBtn = <Button disabled><LoadingIndicator /></Button>;
       } else if (account.getIn(['relationship', 'requested'])) {
         actionBtn = <Button text={intl.formatMessage(messages.cancel_follow_request)} title={intl.formatMessage(messages.requested)} onClick={this.props.onFollow} />;
       } else if (!account.getIn(['relationship', 'blocking'])) {
@@ -347,15 +348,10 @@ class Header extends ImmutablePureComponent {
             </a>
 
             <div className='account__header__tabs__buttons'>
-              {!hidden && (
-                <>
-                  {actionBtn}
-                  {bellBtn}
-                  {shareBtn}
-                </>
-              )}
-
+              {!hidden && bellBtn}
+              {!hidden && shareBtn}
               <DropdownMenuContainer disabled={menu.length === 0} items={menu} icon='ellipsis-v' iconComponent={MoreHorizIcon} size={24} direction='right' />
+              {!hidden && actionBtn}
             </div>
           </div>
 
diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index 9098591764d0b2..eab3f3358b690c 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -8089,10 +8089,7 @@ noscript {
       .button {
         flex-shrink: 1;
         white-space: nowrap;
-
-        @media screen and (max-width: $no-gap-breakpoint) {
-          min-width: 0;
-        }
+        min-width: 80px;
       }
 
       .icon-button {

From 435c46b316579e98f57b8ea76f88311812a8ab86 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Tue, 12 Mar 2024 10:42:51 +0100
Subject: [PATCH 0430/2191] [Glitch] Fix i18n typo

Port af4e44e30a6a2701102a7d573e47e9db42025821 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../notifications/components/filtered_notifications_banner.jsx  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/flavours/glitch/features/notifications/components/filtered_notifications_banner.jsx b/app/javascript/flavours/glitch/features/notifications/components/filtered_notifications_banner.jsx
index 20d650132914fc..2cd843ebc99239 100644
--- a/app/javascript/flavours/glitch/features/notifications/components/filtered_notifications_banner.jsx
+++ b/app/javascript/flavours/glitch/features/notifications/components/filtered_notifications_banner.jsx
@@ -38,7 +38,7 @@ export const FilteredNotificationsBanner = () => {
 
       <div className='filtered-notifications-banner__text'>
         <strong><FormattedMessage id='filtered_notifications_banner.title' defaultMessage='Filtered notifications' /></strong>
-        <span><FormattedMessage id='filtered_notifications_banner.pending_requests' defaultMessage='Notifications from {count, plural, =0 {no} one {one person} other {# people}} you may know' values={{ count: policy.getIn(['summary', 'pending_requests_count']) }} /></span>
+        <span><FormattedMessage id='filtered_notifications_banner.pending_requests' defaultMessage='Notifications from {count, plural, =0 {no one} one {one person} other {# people}} you may know' values={{ count: policy.getIn(['summary', 'pending_requests_count']) }} /></span>
       </div>
 
       <div className='filtered-notifications-banner__badge'>

From 8c0673037a4fcc8e1f27faccecc2c9fc32559027 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Tue, 12 Mar 2024 10:51:30 +0100
Subject: [PATCH 0431/2191] [Glitch] Change background color in web UI

Port 5b60d4b696cd5fd58ca77eca3365c2a0761c0f57

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/features/about/index.jsx  |  24 +-
 .../flavours/glitch/styles/about.scss         |   2 +-
 .../flavours/glitch/styles/admin.scss         |   2 +-
 .../flavours/glitch/styles/basics.scss        |   2 +-
 .../flavours/glitch/styles/components.scss    | 251 +++++++++---------
 .../glitch/styles/mastodon-light/diff.scss    |  88 ------
 .../styles/mastodon-light/variables.scss      |   4 +
 .../flavours/glitch/styles/variables.scss     |   8 +-
 8 files changed, 147 insertions(+), 234 deletions(-)

diff --git a/app/javascript/flavours/glitch/features/about/index.jsx b/app/javascript/flavours/glitch/features/about/index.jsx
index a201dd5f2810fe..4fde1f04738a64 100644
--- a/app/javascript/flavours/glitch/features/about/index.jsx
+++ b/app/javascript/flavours/glitch/features/about/index.jsx
@@ -189,18 +189,20 @@ class About extends PureComponent {
               <>
                 <p><FormattedMessage id='about.domain_blocks.preamble' defaultMessage='Mastodon generally allows you to view content from and interact with users from any other server in the fediverse. These are the exceptions that have been made on this particular server.' /></p>
 
-                <div className='about__domain-blocks'>
-                  {domainBlocks.get('items').map(block => (
-                    <div className='about__domain-blocks__domain' key={block.get('domain')}>
-                      <div className='about__domain-blocks__domain__header'>
-                        <h6><span title={`SHA-256: ${block.get('digest')}`}>{block.get('domain')}</span></h6>
-                        <span className='about__domain-blocks__domain__type' title={intl.formatMessage(severityMessages[block.get('severity')].explanation)}>{intl.formatMessage(severityMessages[block.get('severity')].title)}</span>
+                {domainBlocks.get('items').size > 0 && (
+                  <div className='about__domain-blocks'>
+                    {domainBlocks.get('items').map(block => (
+                      <div className='about__domain-blocks__domain' key={block.get('domain')}>
+                        <div className='about__domain-blocks__domain__header'>
+                          <h6><span title={`SHA-256: ${block.get('digest')}`}>{block.get('domain')}</span></h6>
+                          <span className='about__domain-blocks__domain__type' title={intl.formatMessage(severityMessages[block.get('severity')].explanation)}>{intl.formatMessage(severityMessages[block.get('severity')].title)}</span>
+                        </div>
+
+                        <p>{(block.get('comment') || '').length > 0 ? block.get('comment') : <FormattedMessage id='about.domain_blocks.no_reason_available' defaultMessage='Reason not available' />}</p>
                       </div>
-
-                      <p>{(block.get('comment') || '').length > 0 ? block.get('comment') : <FormattedMessage id='about.domain_blocks.no_reason_available' defaultMessage='Reason not available' />}</p>
-                    </div>
-                  ))}
-                </div>
+                    ))}
+                  </div>
+                )}
               </>
             ) : (
               <p><FormattedMessage id='about.not_available' defaultMessage='This information has not been made available on this server.' /></p>
diff --git a/app/javascript/flavours/glitch/styles/about.scss b/app/javascript/flavours/glitch/styles/about.scss
index 9d23ef41abdb47..48fe9449f0d477 100644
--- a/app/javascript/flavours/glitch/styles/about.scss
+++ b/app/javascript/flavours/glitch/styles/about.scss
@@ -26,7 +26,7 @@ $fluid-breakpoint: $maximum-width + 20px;
 
   li {
     position: relative;
-    border-bottom: 1px solid lighten($ui-base-color, 8%);
+    border-bottom: 1px solid var(--background-border-color);
     padding: 1em 1.75em;
     padding-inline-start: 3em;
     font-weight: 500;
diff --git a/app/javascript/flavours/glitch/styles/admin.scss b/app/javascript/flavours/glitch/styles/admin.scss
index becce27568d14f..ca4346558c7eb0 100644
--- a/app/javascript/flavours/glitch/styles/admin.scss
+++ b/app/javascript/flavours/glitch/styles/admin.scss
@@ -1399,8 +1399,8 @@ a.sparkline {
 }
 
 .account-card {
-  background: $ui-base-color;
   border-radius: 4px;
+  border: 1px solid lighten($ui-base-color, 8%);
 
   &__permalink {
     color: inherit;
diff --git a/app/javascript/flavours/glitch/styles/basics.scss b/app/javascript/flavours/glitch/styles/basics.scss
index 7dc8e340c3256b..5f9708a8a25831 100644
--- a/app/javascript/flavours/glitch/styles/basics.scss
+++ b/app/javascript/flavours/glitch/styles/basics.scss
@@ -8,7 +8,7 @@
 
 body {
   font-family: $font-sans-serif, sans-serif;
-  background: darken($ui-base-color, 8%);
+  background: var(--background-color);
   font-size: 13px;
   line-height: 18px;
   font-weight: 400;
diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index eab3f3358b690c..0a446447f68ba2 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -1375,7 +1375,7 @@ body > [data-popper-placement] {
   box-sizing: border-box;
   width: 100%;
   clear: both;
-  border-bottom: 1px solid lighten($ui-base-color, 8%);
+  border-bottom: 1px solid var(--background-border-color);
 
   &__button {
     display: inline;
@@ -1396,19 +1396,14 @@ body > [data-popper-placement] {
 .focusable {
   &:focus {
     outline: 0;
-    background: lighten($ui-base-color, 4%);
-
-    .detailed-status,
-    .detailed-status__action-bar {
-      background: lighten($ui-base-color, 8%);
-    }
+    background: rgba($ui-highlight-color, 0.05);
   }
 }
 
 .status {
   padding: 10px 14px; // glitch: reduced padding
   min-height: 54px;
-  border-bottom: 1px solid lighten($ui-base-color, 8%);
+  border-bottom: 1px solid var(--background-border-color);
   cursor: auto;
 
   @keyframes fade {
@@ -1800,10 +1795,10 @@ body > [data-popper-placement] {
 }
 
 .status__wrapper-direct {
-  background: mix($ui-base-color, $ui-highlight-color, 95%);
+  background: rgba($ui-highlight-color, 0.05);
 
   &:focus {
-    background: mix(lighten($ui-base-color, 4%), $ui-highlight-color, 95%);
+    background: rgba($ui-highlight-color, 0.05);
   }
 
   .status__prepend {
@@ -1831,9 +1826,8 @@ body > [data-popper-placement] {
 }
 
 .detailed-status {
-  background: lighten($ui-base-color, 4%);
   padding: 14px 10px; // glitch: reduced padding
-  border-top: 1px solid lighten($ui-base-color, 8%);
+  border-top: 1px solid var(--background-border-color);
 
   &--flex {
     display: flex;
@@ -1893,9 +1887,8 @@ body > [data-popper-placement] {
 }
 
 .detailed-status__action-bar {
-  background: lighten($ui-base-color, 4%);
-  border-top: 1px solid lighten($ui-base-color, 8%);
-  border-bottom: 1px solid lighten($ui-base-color, 8%);
+  border-top: 1px solid var(--background-border-color);
+  border-bottom: 1px solid var(--background-border-color);
   display: flex;
   flex-direction: row;
   padding: 8px 0; // glitch: reduced padding
@@ -1950,7 +1943,7 @@ body > [data-popper-placement] {
 
 .domain {
   padding: 10px;
-  border-bottom: 1px solid lighten($ui-base-color, 8%);
+  border-bottom: 1px solid var(--background-border-color);
 
   .domain__domain-name {
     flex: 1 1 auto;
@@ -1974,7 +1967,7 @@ body > [data-popper-placement] {
 
 .account {
   padding: 10px; // glitch: reduced padding
-  border-bottom: 1px solid lighten($ui-base-color, 8%);
+  border-bottom: 1px solid var(--background-border-color);
 
   .account__display-name {
     flex: 1 1 auto;
@@ -2234,7 +2227,7 @@ a.account__display-name {
 
 .notification__report {
   padding: 10px; // glitch: reduced padding
-  border-bottom: 1px solid lighten($ui-base-color, 8%);
+  border-bottom: 1px solid var(--background-border-color);
   display: flex;
   gap: 10px;
 
@@ -2493,6 +2486,7 @@ a.account__display-name {
 
 .dropdown-menu {
   background: var(--dropdown-background-color);
+  backdrop-filter: var(--background-filter);
   border: 1px solid var(--dropdown-border-color);
   padding: 2px; // glitch: reduced padding
   border-radius: 4px;
@@ -2683,6 +2677,7 @@ $ui-header-height: 55px;
   z-index: 3;
   justify-content: space-between;
   align-items: center;
+  backdrop-filter: var(--background-filter);
 
   &__logo {
     display: inline-flex;
@@ -2731,7 +2726,8 @@ $ui-header-height: 55px;
 }
 
 .tabs-bar__wrapper {
-  background: darken($ui-base-color, 8%);
+  background: var(--background-color-tint);
+  backdrop-filter: var(--background-filter);
   position: sticky;
   top: $ui-header-height;
   z-index: 2;
@@ -2767,8 +2763,15 @@ $ui-header-height: 55px;
   flex-direction: column;
 
   > .scrollable {
-    background: $ui-base-color;
+    border: 1px solid var(--background-border-color);
+    border-top: 0;
     border-radius: 0 0 4px 4px;
+
+    &.about,
+    &.privacy-policy {
+      border-top: 1px solid var(--background-border-color);
+      border-radius: 4px;
+    }
   }
 }
 
@@ -2798,7 +2801,6 @@ $ui-header-height: 55px;
   font-size: 16px;
   align-items: center;
   justify-content: center;
-  border-bottom: 2px solid transparent;
 }
 
 .column,
@@ -2927,8 +2929,7 @@ $ui-header-height: 55px;
 
     .navigation-panel {
       margin: 0;
-      background: $ui-base-color;
-      border-inline-start: 1px solid lighten($ui-base-color, 8%);
+      border-inline-start: 1px solid var(--background-border-color);
       height: 100vh;
     }
 
@@ -2946,8 +2947,15 @@ $ui-header-height: 55px;
 
   .layout-single-column .ui__header {
     display: flex;
-    background: $ui-base-color;
-    border-bottom: 1px solid lighten($ui-base-color, 8%);
+    background: var(--background-color-tint);
+    border-bottom: 1px solid var(--background-border-color);
+  }
+
+  .column > .scrollable,
+  .tabs-bar__wrapper .column-header,
+  .tabs-bar__wrapper .column-back-button {
+    border-left: 0;
+    border-right: 0;
   }
 
   .column-header,
@@ -3005,7 +3013,7 @@ $ui-header-height: 55px;
     inset-inline-start: 9px;
     top: -13px;
     background: $ui-highlight-color;
-    border: 2px solid lighten($ui-base-color, 8%);
+    border: 2px solid var(--background-color);
     padding: 1px 6px;
     border-radius: 6px;
     font-size: 10px;
@@ -3027,7 +3035,7 @@ $ui-header-height: 55px;
 }
 
 .column-link--transparent .icon-with-badge__badge {
-  border-color: darken($ui-base-color, 8%);
+  border-color: var(--background-color);
 }
 
 .column-title {
@@ -3377,7 +3385,7 @@ $ui-header-height: 55px;
     flex: 0 0 auto;
     border: 0;
     background: transparent;
-    border-top: 1px solid lighten($ui-base-color, 4%);
+    border-top: 1px solid var(--background-border-color);
     margin: 10px 0;
   }
 
@@ -3394,13 +3402,14 @@ $ui-header-height: 55px;
   overflow: hidden;
   display: flex;
   border-radius: 4px;
+  border: 1px solid var(--background-border-color);
 }
 
 .drawer__inner {
   position: absolute;
   top: 0;
   inset-inline-start: 0;
-  background: darken($ui-base-color, 4%);
+  background: var(--background-color);
   box-sizing: border-box;
   padding: 0;
   display: flex;
@@ -3409,15 +3418,11 @@ $ui-header-height: 55px;
   overflow-y: auto;
   width: 100%;
   height: 100%;
-
-  &.darker {
-    background: $ui-base-color;
-  }
 }
 
 .drawer__inner__mastodon {
-  background: darken($ui-base-color, 4%)
-    url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 234.80078 31.757813" width="234.80078" height="31.757812"><path d="M19.599609 0c-1.05 0-2.10039.375-2.90039 1.125L0 16.925781v14.832031h234.80078V17.025391l-16.5-15.900391c-1.6-1.5-4.20078-1.5-5.80078 0l-13.80078 13.099609c-1.6 1.5-4.19883 1.5-5.79883 0L179.09961 1.125c-1.6-1.5-4.19883-1.5-5.79883 0L159.5 14.224609c-1.6 1.5-4.20078 1.5-5.80078 0L139.90039 1.125c-1.6-1.5-4.20078-1.5-5.80078 0l-13.79883 13.099609c-1.6 1.5-4.20078 1.5-5.80078 0L100.69922 1.125c-1.600001-1.5-4.198829-1.5-5.798829 0l-13.59961 13.099609c-1.6 1.5-4.200781 1.5-5.800781 0L61.699219 1.125c-1.6-1.5-4.198828-1.5-5.798828 0L42.099609 14.224609c-1.6 1.5-4.198828 1.5-5.798828 0L22.5 1.125C21.7.375 20.649609 0 19.599609 0z" fill="#{hex-color($ui-base-color)}"/></svg>')
+  background: var(--background-color)
+    url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 234.80078 31.757813" width="234.80078" height="31.757812"><path d="M19.599609 0c-1.05 0-2.10039.375-2.90039 1.125L0 16.925781v14.832031h234.80078V17.025391l-16.5-15.900391c-1.6-1.5-4.20078-1.5-5.80078 0l-13.80078 13.099609c-1.6 1.5-4.19883 1.5-5.79883 0L179.09961 1.125c-1.6-1.5-4.19883-1.5-5.79883 0L159.5 14.224609c-1.6 1.5-4.20078 1.5-5.80078 0L139.90039 1.125c-1.6-1.5-4.20078-1.5-5.80078 0l-13.79883 13.099609c-1.6 1.5-4.20078 1.5-5.80078 0L100.69922 1.125c-1.600001-1.5-4.198829-1.5-5.798829 0l-13.59961 13.099609c-1.6 1.5-4.200781 1.5-5.800781 0L61.699219 1.125c-1.6-1.5-4.198828-1.5-5.798828 0L42.099609 14.224609c-1.6 1.5-4.198828 1.5-5.798828 0L22.5 1.125C21.7.375 20.649609 0 19.599609 0z" fill="#{hex-color(darken($ui-base-color, 4%))}"/></svg>')
     no-repeat bottom / 100% auto;
   flex: 1;
   min-height: 47px;
@@ -3441,7 +3446,7 @@ $ui-header-height: 55px;
 .drawer__header {
   flex: 0 0 auto;
   font-size: 16px;
-  background: darken($ui-base-color, 4%);
+  border: 1px solid var(--background-border-color);
   margin-bottom: 10px;
   display: flex;
   flex-direction: row;
@@ -3451,7 +3456,7 @@ $ui-header-height: 55px;
   a:hover,
   a:focus,
   a:active {
-    background: $ui-base-color;
+    color: $primary-text-color;
   }
 }
 
@@ -3496,15 +3501,14 @@ $ui-header-height: 55px;
 .column-back-button {
   box-sizing: border-box;
   width: 100%;
-  background: $ui-base-color;
+  background: transparent;
+  border: 1px solid var(--background-border-color);
   border-radius: 4px 4px 0 0;
   color: $highlight-text-color;
   cursor: pointer;
   flex: 0 0 auto;
   font-size: 16px;
   line-height: inherit;
-  border: 0;
-  border-bottom: 1px solid lighten($ui-base-color, 8%);
   text-align: unset;
   padding: 13px;
   margin: 0;
@@ -3517,13 +3521,17 @@ $ui-header-height: 55px;
   &:hover {
     text-decoration: underline;
   }
+
+  @media screen and (max-width: $no-gap-breakpoint) {
+    border-top: 0;
+  }
 }
 
 .column-header__back-button {
   display: flex;
   align-items: center;
   gap: 5px;
-  background: $ui-base-color;
+  background: transparent;
   border: 0;
   font-family: inherit;
   color: $highlight-text-color;
@@ -3629,8 +3637,6 @@ $ui-header-height: 55px;
 }
 
 .column-link {
-  background: lighten($ui-base-color, 8%);
-  color: $primary-text-color;
   display: flex;
   align-items: center;
   gap: 5px;
@@ -3640,12 +3646,18 @@ $ui-header-height: 55px;
   overflow: hidden;
   white-space: nowrap;
   border: 0;
+  background: transparent;
+  color: $secondary-text-color;
   border-left: 4px solid transparent;
 
   &:hover,
   &:focus,
   &:active {
-    background: lighten($ui-base-color, 11%);
+    color: $primary-text-color;
+  }
+
+  &.active {
+    color: $highlight-text-color;
   }
 
   &:focus {
@@ -3657,22 +3669,6 @@ $ui-header-height: 55px;
     border-radius: 0;
   }
 
-  &--transparent {
-    background: transparent;
-    color: $secondary-text-color;
-
-    &:hover,
-    &:focus,
-    &:active {
-      background: transparent;
-      color: $primary-text-color;
-    }
-
-    &.active {
-      color: $highlight-text-color;
-    }
-  }
-
   &--logo {
     background: transparent;
     padding: 10px;
@@ -3697,8 +3693,8 @@ $ui-header-height: 55px;
 }
 
 .column-subheading {
-  background: $ui-base-color;
-  color: $dark-text-color;
+  background: darken($ui-base-color, 4%);
+  color: $darker-text-color;
   padding: 8px 20px;
   font-size: 12px;
   font-weight: 500;
@@ -3706,12 +3702,6 @@ $ui-header-height: 55px;
   cursor: default;
 }
 
-.getting-started__wrapper,
-.getting-started,
-.flex-spacer {
-  background: $ui-base-color;
-}
-
 .getting-started__wrapper {
   flex: 0 0 auto;
 }
@@ -3723,6 +3713,8 @@ $ui-header-height: 55px;
 .getting-started {
   color: $dark-text-color;
   overflow: auto;
+  border: 1px solid var(--background-border-color);
+  border-top: 0;
 
   &__trends {
     flex: 0 1 auto;
@@ -3731,7 +3723,7 @@ $ui-header-height: 55px;
     margin-top: 10px;
 
     h4 {
-      border-bottom: 1px solid lighten($ui-base-color, 8%);
+      border-bottom: 1px solid var(--background-border-color);
       padding: 10px;
       font-size: 12px;
       text-transform: uppercase;
@@ -3876,7 +3868,7 @@ input.glitch-setting-text {
   margin-top: 14px;
   text-decoration: none;
   overflow: hidden;
-  border: 1px solid lighten($ui-base-color, 8%);
+  border: 1px solid var(--background-border-color);
   border-radius: 8px;
 
   &__actions {
@@ -4133,7 +4125,7 @@ a.status-card {
 }
 
 .load-gap {
-  border-bottom: 1px solid lighten($ui-base-color, 8%);
+  border-bottom: 1px solid var(--background-border-color);
 }
 
 .timeline-hint {
@@ -4166,7 +4158,8 @@ a.status-card {
   font-size: 16px;
   font-weight: 500;
   color: $dark-text-color;
-  background: $ui-base-color;
+  border: 1px solid var(--background-border-color);
+  border-top: 0;
   cursor: default;
   display: flex;
   flex: 1 1 auto;
@@ -4242,8 +4235,7 @@ a.status-card {
 .column-header {
   display: flex;
   font-size: 16px;
-  background: $ui-base-color;
-  border-bottom: 1px solid lighten($ui-base-color, 8%);
+  border: 1px solid var(--background-border-color);
   border-radius: 4px 4px 0 0;
   flex: 0 0 auto;
   cursor: pointer;
@@ -4310,6 +4302,10 @@ a.status-card {
       padding-top: 16px;
     }
   }
+
+  @media screen and (max-width: $no-gap-breakpoint) {
+    border-top: 0;
+  }
 }
 
 .column-header__buttons {
@@ -4329,9 +4325,9 @@ a.status-card {
   display: flex;
   justify-content: center;
   align-items: center;
-  background: $ui-base-color;
   border: 0;
   color: $darker-text-color;
+  background: transparent;
   cursor: pointer;
   font-size: 16px;
   padding: 0 15px;
@@ -4350,7 +4346,6 @@ a.status-card {
 
   &.active {
     color: $primary-text-color;
-    background: lighten($ui-base-color, 4%);
 
     &:hover {
       color: $primary-text-color;
@@ -4406,7 +4401,6 @@ a.status-card {
   max-height: 70vh;
   overflow: hidden;
   overflow-y: auto;
-  border-bottom: 1px solid lighten($ui-base-color, 8%);
   color: $darker-text-color;
   transition:
     max-height 150ms ease-in-out,
@@ -4428,7 +4422,7 @@ a.status-card {
     height: 0;
     background: transparent;
     border: 0;
-    border-top: 1px solid lighten($ui-base-color, 8%);
+    border-top: 1px solid var(--background-border-color);
     margin: 10px 0;
   }
 
@@ -4444,7 +4438,8 @@ a.status-card {
 }
 
 .column-header__collapsible-inner {
-  background: $ui-base-color;
+  border: 1px solid var(--background-border-color);
+  border-top: 0;
 }
 
 .column-header__setting-btn {
@@ -4786,9 +4781,8 @@ a.status-card {
 }
 
 .account--panel {
-  background: lighten($ui-base-color, 4%);
-  border-top: 1px solid lighten($ui-base-color, 8%);
-  border-bottom: 1px solid lighten($ui-base-color, 8%);
+  border-top: 1px solid var(--background-border-color);
+  border-bottom: 1px solid var(--background-border-color);
   display: flex;
   flex-direction: row;
   padding: 10px 0;
@@ -4998,7 +4992,6 @@ a.status-card {
 .empty-column-indicator,
 .follow_requests-unlocked_explanation {
   color: $dark-text-color;
-  background: $ui-base-color;
   text-align: center;
   padding: 20px;
   font-size: 15px;
@@ -5025,14 +5018,14 @@ a.status-card {
 
 .follow_requests-unlocked_explanation {
   background: darken($ui-base-color, 4%);
-  border-bottom: 1px solid lighten($ui-base-color, 8%);
+  border-bottom: 1px solid var(--background-border-color);
   contain: initial;
   flex-grow: 0;
 }
 
 .error-column {
   padding: 20px;
-  background: $ui-base-color;
+  border: 1px solid var(--background-border-color);
   border-radius: 4px;
   display: flex;
   flex: 1 1 auto;
@@ -5247,7 +5240,7 @@ a.status-card {
   width: 100%;
   height: 6px;
   border-radius: 6px;
-  background: darken($ui-base-color, 8%);
+  background: var(--background-color);
   position: relative;
   margin-top: 5px;
 }
@@ -5781,7 +5774,7 @@ a.status-card {
 }
 
 .search-results__section {
-  border-bottom: 1px solid lighten($ui-base-color, 8%);
+  border-bottom: 1px solid var(--background-border-color);
 
   &:last-child {
     border-bottom: 0;
@@ -5789,7 +5782,7 @@ a.status-card {
 
   &__header {
     background: darken($ui-base-color, 4%);
-    border-bottom: 1px solid lighten($ui-base-color, 8%);
+    border-bottom: 1px solid var(--background-border-color);
     padding: 15px;
     font-weight: 500;
     font-size: 14px;
@@ -6885,7 +6878,7 @@ img.modal-warning {
 .attachment-list {
   display: flex;
   font-size: 14px;
-  border: 1px solid lighten($ui-base-color, 8%);
+  border: 1px solid var(--background-border-color);
   border-radius: 4px;
   margin-top: 14px; // glitch: reduced margins
   overflow: hidden;
@@ -6895,7 +6888,7 @@ img.modal-warning {
     color: $dark-text-color;
     padding: 8px 18px;
     cursor: default;
-    border-inline-end: 1px solid lighten($ui-base-color, 8%);
+    border-inline-end: 1px solid var(--background-border-color);
     display: flex;
     flex-direction: column;
     align-items: center;
@@ -7066,7 +7059,7 @@ img.modal-warning {
   overflow: hidden;
   box-sizing: border-box;
   position: relative;
-  background: darken($ui-base-color, 8%);
+  background: var(--background-color);
   border-radius: 8px;
   padding-bottom: 44px;
   width: 100%;
@@ -7479,7 +7472,6 @@ img.modal-warning {
 
 .scrollable .account-card {
   margin: 10px;
-  background: lighten($ui-base-color, 8%);
 }
 
 .scrollable .account-card__title__avatar {
@@ -7490,11 +7482,7 @@ img.modal-warning {
 }
 
 .scrollable .account-card__bio::after {
-  background: linear-gradient(
-    to left,
-    lighten($ui-base-color, 8%),
-    transparent
-  );
+  background: linear-gradient(to left, var(--background-color), transparent);
 }
 
 .account-gallery__container {
@@ -7523,9 +7511,8 @@ img.modal-warning {
 
 .notification__filter-bar,
 .account__section-headline {
-  // deliberate glitch-soc choice for now
-  background: darken($ui-base-color, 4%);
-  border-bottom: 1px solid lighten($ui-base-color, 8%);
+  border: 1px solid var(--background-border-color);
+  border-top: 0;
   cursor: default;
   display: flex;
   flex-shrink: 0;
@@ -7564,10 +7551,15 @@ img.modal-warning {
       }
     }
   }
+
+  .scrollable & {
+    border-left: 0;
+    border-right: 0;
+  }
 }
 
 .filter-form {
-  background: $ui-base-color;
+  border-bottom: 1px solid var(--background-border-color);
 
   &__column {
     display: flex;
@@ -7785,7 +7777,8 @@ noscript {
   justify-content: flex-start;
   gap: 15px;
   align-items: center;
-  background: lighten($ui-base-color, 4%);
+  border: 1px solid var(--background-border-color);
+  border-top: 0;
 
   label {
     flex: 1 1 auto;
@@ -7886,7 +7879,7 @@ noscript {
 
   .list {
     padding: 10px;
-    border-bottom: 1px solid lighten($ui-base-color, 8%);
+    border-bottom: 1px solid var(--background-border-color);
   }
 
   .list__wrapper {
@@ -8030,7 +8023,7 @@ noscript {
     height: 145px;
     position: relative;
     background: darken($ui-base-color, 4%);
-    border-bottom: 1px solid lighten($ui-base-color, 8%);
+    border-bottom: 1px solid var(--background-border-color);
 
     img {
       object-fit: cover;
@@ -8045,7 +8038,7 @@ noscript {
     position: relative;
     padding: 0 20px;
     padding-bottom: 16px; // glitch-soc addition for the different tabs design
-    border-bottom: 1px solid lighten($ui-base-color, 8%);
+    border-bottom: 1px solid var(--background-border-color);
 
     .avatar {
       display: block;
@@ -8053,8 +8046,8 @@ noscript {
       width: 94px;
 
       .account__avatar {
-        background: darken($ui-base-color, 8%);
-        border: 2px solid $ui-base-color;
+        background: var(--background-color);
+        border: 2px solid var(--background-border-color);
       }
     }
   }
@@ -8169,13 +8162,12 @@ noscript {
       margin: 0;
       margin-top: 16px;
       border-radius: 4px;
-      background: darken($ui-base-color, 4%);
-      border: 0;
+      border: 1px solid var(--background-border-color);
 
       dl {
         display: block;
         padding: 8px 16px; // glitch-soc: padding purposefuly reduced
-        border-bottom-color: lighten($ui-base-color, 4%);
+        border-bottom-color: var(--background-border-color);
       }
 
       dd,
@@ -8350,7 +8342,7 @@ noscript {
     display: flex;
     align-items: center;
     padding: 15px;
-    border-bottom: 1px solid lighten($ui-base-color, 8%);
+    border-bottom: 1px solid var(--background-border-color);
     gap: 15px;
 
     &:last-child {
@@ -8468,7 +8460,7 @@ noscript {
 
 .conversation {
   display: flex;
-  border-bottom: 1px solid lighten($ui-base-color, 8%);
+  border-bottom: 1px solid var(--background-border-color);
   padding: 5px;
   padding-bottom: 0;
 
@@ -8829,7 +8821,7 @@ noscript {
 
 .picture-in-picture-placeholder {
   box-sizing: border-box;
-  border: 2px dashed lighten($ui-base-color, 8%);
+  border: 2px dashed var(--background-border-color);
   background: $base-shadow-color;
   display: flex;
   flex-direction: column;
@@ -8857,7 +8849,7 @@ noscript {
 
 .notifications-permission-banner {
   padding: 30px;
-  border-bottom: 1px solid lighten($ui-base-color, 8%);
+  border-bottom: 1px solid var(--background-border-color);
   display: flex;
   flex-direction: column;
   align-items: center;
@@ -8927,7 +8919,7 @@ noscript {
   color: $primary-text-color;
   text-decoration: none;
   padding: 15px;
-  border-bottom: 1px solid lighten($ui-base-color, 8%);
+  border-bottom: 1px solid var(--background-border-color);
   gap: 15px;
 
   &:last-child {
@@ -9306,7 +9298,6 @@ noscript {
 }
 
 .privacy-policy {
-  background: $ui-base-color;
   padding: 20px;
 
   @media screen and (min-width: $no-gap-breakpoint) {
@@ -9675,6 +9666,7 @@ noscript {
 
 .about {
   padding: 20px;
+  border-top: 1px solid var(--background-border-color);
 
   @media screen and (min-width: $no-gap-breakpoint) {
     border-radius: 4px;
@@ -9721,7 +9713,7 @@ noscript {
   }
 
   &__meta {
-    background: lighten($ui-base-color, 4%);
+    border: 1px solid var(--background-border-color);
     border-radius: 4px;
     display: flex;
     margin-bottom: 30px;
@@ -9737,7 +9729,7 @@ noscript {
       width: 0;
       border: 0;
       border-style: solid;
-      border-color: lighten($ui-base-color, 8%);
+      border-color: var(--background-border-color);
       border-left-width: 1px;
       min-height: calc(100% - 60px);
       flex: 0 0 auto;
@@ -9845,7 +9837,7 @@ noscript {
       line-height: 22px;
       padding: 20px;
       border-radius: 4px;
-      background: lighten($ui-base-color, 4%);
+      border: 1px solid var(--background-border-color);
       color: $highlight-text-color;
       cursor: pointer;
     }
@@ -9855,7 +9847,7 @@ noscript {
     }
 
     &__body {
-      border: 1px solid lighten($ui-base-color, 4%);
+      border: 1px solid var(--background-border-color);
       border-top: 0;
       padding: 20px;
       font-size: 15px;
@@ -9865,18 +9857,17 @@ noscript {
 
   &__domain-blocks {
     margin-top: 30px;
-    background: darken($ui-base-color, 4%);
-    border: 1px solid lighten($ui-base-color, 4%);
+    border: 1px solid var(--background-border-color);
     border-radius: 4px;
 
     &__domain {
-      border-bottom: 1px solid lighten($ui-base-color, 4%);
+      border-bottom: 1px solid var(--background-border-color);
       padding: 10px;
       font-size: 15px;
       color: $darker-text-color;
 
       &:nth-child(2n) {
-        background: darken($ui-base-color, 2%);
+        background: darken($ui-base-color, 4%);
       }
 
       &:last-child {
@@ -9972,7 +9963,7 @@ noscript {
 }
 
 .hashtag-header {
-  border-bottom: 1px solid lighten($ui-base-color, 8%);
+  border-bottom: 1px solid var(--background-border-color);
   padding: 15px;
   font-size: 17px;
   line-height: 22px;
@@ -10034,8 +10025,8 @@ noscript {
   gap: 12px;
   padding: 16px 0;
   padding-bottom: 0;
-  border-bottom: 1px solid mix($ui-base-color, $ui-highlight-color, 75%);
-  background: mix($ui-base-color, $ui-highlight-color, 95%);
+  border-bottom: 1px solid var(--background-border-color);
+  background: rgba($ui-highlight-color, 0.05);
 
   &__header {
     display: flex;
@@ -10119,8 +10110,8 @@ noscript {
       overflow-x: scroll;
 
       &__card {
-        background: darken($ui-base-color, 4%);
-        border: 1px solid lighten($ui-base-color, 8%);
+        background: var(--background-color);
+        border: 1px solid var(--background-border-color);
         border-radius: 4px;
         display: flex;
         flex-direction: column;
@@ -10157,7 +10148,7 @@ noscript {
         .account__avatar {
           flex-shrink: 0;
           align-self: flex-end;
-          border: 1px solid lighten($ui-base-color, 8%);
+          border: 1px solid var(--background-border-color);
           background-color: $ui-base-color;
         }
 
diff --git a/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss b/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss
index 02a1e7207d7b80..0ab1c8f8713c9b 100644
--- a/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss
+++ b/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss
@@ -21,25 +21,6 @@ html {
 }
 
 // Change default background colors of columns
-.column > .scrollable,
-.getting-started,
-.column-inline-form,
-.regeneration-indicator {
-  background: $white;
-  border: 1px solid lighten($ui-base-color, 8%);
-  border-top: 0;
-}
-
-.error-column {
-  border: 1px solid lighten($ui-base-color, 8%);
-}
-
-.column > .scrollable.about {
-  border-top: 1px solid lighten($ui-base-color, 8%);
-}
-
-.about__meta,
-.about__section__title,
 .interaction-modal {
   background: $white;
   border: 1px solid lighten($ui-base-color, 8%);
@@ -53,37 +34,10 @@ html {
   background: lighten($ui-base-color, 12%);
 }
 
-.filter-form {
-  background: $white;
-  border-bottom: 1px solid lighten($ui-base-color, 8%);
-}
-
-.column-back-button,
-.column-header {
-  background: $white;
-  border: 1px solid lighten($ui-base-color, 8%);
-
-  @media screen and (max-width: $no-gap-breakpoint) {
-    border-top: 0;
-  }
-
-  &--slim-button {
-    top: -50px;
-    right: 0;
-  }
-}
-
-.column-header__back-button,
-.column-header__button,
-.column-header__button.active,
 .account__header {
   background: $white;
 }
 
-.column-header {
-  border-bottom: 0;
-}
-
 .column-header__button.active {
   color: $ui-highlight-color;
 
@@ -91,7 +45,6 @@ html {
   &:active,
   &:focus {
     color: $ui-highlight-color;
-    background: $white;
   }
 }
 
@@ -117,25 +70,6 @@ html {
   }
 }
 
-.column-subheading {
-  background: darken($ui-base-color, 4%);
-  border-bottom: 1px solid lighten($ui-base-color, 8%);
-}
-
-.getting-started,
-.scrollable {
-  .column-link {
-    background: $white;
-    border-bottom: 1px solid lighten($ui-base-color, 8%);
-
-    &:hover,
-    &:active,
-    &:focus {
-      background: $ui-base-color;
-    }
-  }
-}
-
 .getting-started .navigation-bar {
   border-top: 1px solid lighten($ui-base-color, 8%);
   border-bottom: 1px solid lighten($ui-base-color, 8%);
@@ -168,23 +102,6 @@ html {
   border-bottom: 0;
 }
 
-.notification__filter-bar {
-  border: 1px solid lighten($ui-base-color, 8%);
-  border-top: 0;
-}
-
-.drawer__header,
-.drawer__inner {
-  background: $white;
-  border: 1px solid lighten($ui-base-color, 8%);
-}
-
-.drawer__inner__mastodon {
-  background: $white
-    url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 234.80078 31.757813" width="234.80078" height="31.757812"><path d="M19.599609 0c-1.05 0-2.10039.375-2.90039 1.125L0 16.925781v14.832031h234.80078V17.025391l-16.5-15.900391c-1.6-1.5-4.20078-1.5-5.80078 0l-13.80078 13.099609c-1.6 1.5-4.19883 1.5-5.79883 0L179.09961 1.125c-1.6-1.5-4.19883-1.5-5.79883 0L159.5 14.224609c-1.6 1.5-4.20078 1.5-5.80078 0L139.90039 1.125c-1.6-1.5-4.20078-1.5-5.80078 0l-13.79883 13.099609c-1.6 1.5-4.20078 1.5-5.80078 0L100.69922 1.125c-1.600001-1.5-4.198829-1.5-5.798829 0l-13.59961 13.099609c-1.6 1.5-4.200781 1.5-5.800781 0L61.699219 1.125c-1.6-1.5-4.198828-1.5-5.798828 0L42.099609 14.224609c-1.6 1.5-4.198828 1.5-5.798828 0L22.5 1.125C21.7.375 20.649609 0 19.599609 0z" fill="#{hex-color($ui-base-color)}"/></svg>')
-    no-repeat bottom / 100% auto;
-}
-
 .upload-progress__backdrop {
   background: $ui-base-color;
 }
@@ -194,11 +111,6 @@ html {
   background: lighten($white, 4%);
 }
 
-.detailed-status,
-.detailed-status__action-bar {
-  background: $white;
-}
-
 // Change the background colors of status__content__spoiler-link
 .reply-indicator__content .status__content__spoiler-link,
 .status__content .status__content__spoiler-link {
diff --git a/app/javascript/flavours/glitch/styles/mastodon-light/variables.scss b/app/javascript/flavours/glitch/styles/mastodon-light/variables.scss
index 3cf5561ca3b962..09a75a834b17db 100644
--- a/app/javascript/flavours/glitch/styles/mastodon-light/variables.scss
+++ b/app/javascript/flavours/glitch/styles/mastodon-light/variables.scss
@@ -59,4 +59,8 @@ $emojis-requiring-inversion: 'chains';
 .theme-mastodon-light {
   --dropdown-border-color: #d9e1e8;
   --dropdown-background-color: #fff;
+  --background-border-color: #d9e1e8;
+  --background-color: #fff;
+  --background-color-tint: rgba(255, 255, 255, 90%);
+  --background-filter: blur(10px);
 }
diff --git a/app/javascript/flavours/glitch/styles/variables.scss b/app/javascript/flavours/glitch/styles/variables.scss
index ed5b1b64884d2d..b96699abdaee06 100644
--- a/app/javascript/flavours/glitch/styles/variables.scss
+++ b/app/javascript/flavours/glitch/styles/variables.scss
@@ -100,10 +100,14 @@ $ui-avatar-border-size: 8%;
 $dismiss-overlay-width: 4rem;
 
 :root {
-  --dropdown-border-color: #{lighten($ui-base-color, 12%)};
-  --dropdown-background-color: #{lighten($ui-base-color, 4%)};
+  --dropdown-border-color: #{lighten($ui-base-color, 4%)};
+  --dropdown-background-color: #{rgba(darken($ui-base-color, 8%), 0.9)};
   --dropdown-shadow: 0 20px 25px -5px #{rgba($base-shadow-color, 0.25)},
     0 8px 10px -6px #{rgba($base-shadow-color, 0.25)};
   --modal-background-color: #{darken($ui-base-color, 4%)};
   --modal-border-color: #{lighten($ui-base-color, 4%)};
+  --background-border-color: #{lighten($ui-base-color, 4%)};
+  --background-filter: blur(10px) saturate(180%) contrast(75%) brightness(70%);
+  --background-color: #{darken($ui-base-color, 8%)};
+  --background-color-tint: #{rgba(darken($ui-base-color, 8%), 0.9)};
 }

From 00d72866a378481bb6cd49acce4b3b516e615302 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 12 Mar 2024 13:10:37 -0400
Subject: [PATCH 0432/2191] [Glitch] Use vanilla JS to get Rails CSRF values

Port 00d94f3ffabda89a2f955212e763cdba3f1f54c6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/utils/log_out.ts | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/app/javascript/flavours/glitch/utils/log_out.ts b/app/javascript/flavours/glitch/utils/log_out.ts
index a7c7ef54549267..d4db471a6e7417 100644
--- a/app/javascript/flavours/glitch/utils/log_out.ts
+++ b/app/javascript/flavours/glitch/utils/log_out.ts
@@ -1,5 +1,3 @@
-import Rails from '@rails/ujs';
-
 import { signOutLink } from 'flavours/glitch/utils/backend_links';
 
 export const logOut = () => {
@@ -11,13 +9,18 @@ export const logOut = () => {
   methodInput.setAttribute('type', 'hidden');
   form.appendChild(methodInput);
 
-  const csrfToken = Rails.csrfToken();
-  const csrfParam = Rails.csrfParam();
+  const csrfToken = document.querySelector<HTMLMetaElement>(
+    'meta[name=csrf-token]',
+  );
+
+  const csrfParam = document.querySelector<HTMLMetaElement>(
+    'meta[name=csrf-param]',
+  );
 
   if (csrfParam && csrfToken) {
     const csrfInput = document.createElement('input');
-    csrfInput.setAttribute('name', csrfParam);
-    csrfInput.setAttribute('value', csrfToken);
+    csrfInput.setAttribute('name', csrfParam.content);
+    csrfInput.setAttribute('value', csrfToken.content);
     csrfInput.setAttribute('type', 'hidden');
     form.appendChild(csrfInput);
   }

From e1b64151a2e81f9dcb77c44e82b68ef7e075ba96 Mon Sep 17 00:00:00 2001
From: Erik Uden <erik@uden.ai>
Date: Wed, 13 Mar 2024 12:45:20 +0100
Subject: [PATCH 0433/2191] [Glitch] Fix toggle button color for light (and
 dark/default) theme

Port 268856d5d9f72f003a08a53c7d094ed4df7c16bc to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/styles/components.scss          | 13 +++++++++++--
 .../flavours/glitch/styles/mastodon-light/diff.scss |  4 ++--
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index 0a446447f68ba2..5c0d721aabf3b7 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -3586,7 +3586,7 @@ $ui-header-height: 55px;
   height: 20px;
   padding: 0;
   border-radius: 10px;
-  background-color: #626982;
+  background-color: $ui-primary-color;
 }
 
 .react-toggle--focus {
@@ -3609,7 +3609,7 @@ $ui-header-height: 55px;
   width: 16px;
   height: 16px;
   border-radius: 50%;
-  background-color: $primary-text-color;
+  background-color: $ui-button-color;
   box-sizing: border-box;
   transition: all 0.25s ease;
   transition-property: border-color, left;
@@ -3620,6 +3620,15 @@ $ui-header-height: 55px;
   border-color: $ui-highlight-color;
 }
 
+.react-toggle:hover:not(.react-toggle--disabled) .react-toggle-track {
+  background: darken($ui-primary-color, 5%);
+}
+
+.react-toggle.react-toggle--checked:hover:not(.react-toggle--disabled)
+  .react-toggle-track {
+  background: lighten($ui-highlight-color, 5%);
+}
+
 .switch-to-advanced {
   color: $light-text-color;
   background-color: $ui-base-color;
diff --git a/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss b/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss
index 0ab1c8f8713c9b..50cd0aded56f0c 100644
--- a/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss
+++ b/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss
@@ -263,11 +263,11 @@ html {
 }
 
 .react-toggle-track {
-  background: $ui-secondary-color;
+  background: $ui-primary-color;
 }
 
 .react-toggle:hover:not(.react-toggle--disabled) .react-toggle-track {
-  background: darken($ui-secondary-color, 10%);
+  background: lighten($ui-primary-color, 10%);
 }
 
 .react-toggle.react-toggle--checked:hover:not(.react-toggle--disabled)

From 663dd49a85627eb4f7b956400c0eb458a6f5656a Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Wed, 13 Mar 2024 13:54:50 +0100
Subject: [PATCH 0434/2191] [Glitch] Fix navigation panel icons missing classes

Port acf3f410aef3cfb9e8f5f73042526de9b2f96d13 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../glitch/features/ui/components/navigation_panel.jsx    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/javascript/flavours/glitch/features/ui/components/navigation_panel.jsx b/app/javascript/flavours/glitch/features/ui/components/navigation_panel.jsx
index 8ee848e4196d69..7ac748e4389ab6 100644
--- a/app/javascript/flavours/glitch/features/ui/components/navigation_panel.jsx
+++ b/app/javascript/flavours/glitch/features/ui/components/navigation_panel.jsx
@@ -65,8 +65,8 @@ const NotificationsLink = () => {
     <ColumnLink
       transparent
       to='/notifications'
-      icon={<IconWithBadge icon={NotificationsIcon} count={count} className='column-link__icon' />}
-      activeIcon={<IconWithBadge icon={NotificationsActiveIcon} count={count} className='column-link__icon' />}
+      icon={<IconWithBadge id='bell' icon={NotificationsIcon} count={count} className='column-link__icon' />}
+      activeIcon={<IconWithBadge id='bell' icon={NotificationsActiveIcon} count={count} className='column-link__icon' />}
       text={intl.formatMessage(messages.notifications)}
     />
   );
@@ -89,8 +89,8 @@ const FollowRequestsLink = () => {
     <ColumnLink
       transparent
       to='/follow_requests'
-      icon={<IconWithBadge icon={PersonAddIcon} count={count} className='column-link__icon' />}
-      activeIcon={<IconWithBadge icon={PersonAddActiveIcon} count={count} className='column-link__icon' />}
+      icon={<IconWithBadge id='user-plus' icon={PersonAddIcon} count={count} className='column-link__icon' />}
+      activeIcon={<IconWithBadge id='user-plus' icon={PersonAddActiveIcon} count={count} className='column-link__icon' />}
       text={intl.formatMessage(messages.followRequests)}
     />
   );

From e7b49181afcc043c5f35061d26b3c68c30a03d41 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 13 Mar 2024 17:47:48 +0100
Subject: [PATCH 0435/2191] [Glitch] Hide media by default in notification
 requests

Port a32a126cac42c73236236b5a9bd660765b9c58ee to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/components/status.jsx     | 24 +++++++----
 .../glitch/features/notifications/request.jsx | 41 ++++++++++---------
 .../ui/util/sensitive_media_context.tsx       | 28 +++++++++++++
 3 files changed, 66 insertions(+), 27 deletions(-)
 create mode 100644 app/javascript/flavours/glitch/features/ui/util/sensitive_media_context.tsx

diff --git a/app/javascript/flavours/glitch/components/status.jsx b/app/javascript/flavours/glitch/components/status.jsx
index 42076f089076f5..32a34a086a0f97 100644
--- a/app/javascript/flavours/glitch/components/status.jsx
+++ b/app/javascript/flavours/glitch/components/status.jsx
@@ -20,6 +20,7 @@ import Card from '../features/status/components/card';
 // to use the progress bar to show download progress
 import Bundle from '../features/ui/components/bundle';
 import { MediaGallery, Video, Audio } from '../features/ui/util/async-components';
+import { SensitiveMediaContext } from '../features/ui/util/sensitive_media_context';
 import { displayMedia } from '../initial_state';
 
 import AttachmentList from './attachment_list';
@@ -72,6 +73,8 @@ export const defaultMediaVisibility = (status, settings) => {
 
 class Status extends ImmutablePureComponent {
 
+  static contextType = SensitiveMediaContext;
+
   static propTypes = {
     containerId: PropTypes.string,
     id: PropTypes.string,
@@ -125,8 +128,7 @@ class Status extends ImmutablePureComponent {
     isCollapsed: false,
     autoCollapsed: false,
     isExpanded: undefined,
-    showMedia: undefined,
-    statusId: undefined,
+    showMedia: defaultMediaVisibility(this.props.status, this.props.settings) && !(this.context?.hideMediaByDefault),
     revealBehindCW: undefined,
     showCard: false,
     forceFilter: undefined,
@@ -211,12 +213,6 @@ class Status extends ImmutablePureComponent {
       updated = true;
     }
 
-    if (nextProps.status && nextProps.status.get('id') !== prevState.statusId) {
-      update.showMedia = defaultMediaVisibility(nextProps.status, nextProps.settings);
-      update.statusId = nextProps.status.get('id');
-      updated = true;
-    }
-
     if (nextProps.settings.getIn(['media', 'reveal_behind_cw']) !== prevState.revealBehindCW) {
       update.revealBehindCW = nextProps.settings.getIn(['media', 'reveal_behind_cw']);
       if (update.revealBehindCW) {
@@ -312,6 +308,18 @@ class Status extends ImmutablePureComponent {
     if (snapshot !== null && this.props.updateScrollBottom && this.node.offsetTop < snapshot.top) {
       this.props.updateScrollBottom(snapshot.height - snapshot.top);
     }
+
+    // This will potentially cause a wasteful redraw, but in most cases `Status` components are used
+    // with a `key` directly depending on their `id`, preventing re-use of the component across
+    // different IDs.
+    // But just in case this does change, reset the state on status change.
+
+    if (this.props.status?.get('id') !== prevProps.status?.get('id')) {
+      this.setState({
+        showMedia: defaultMediaVisibility(this.props.status, this.props.settings) && !(this.context?.hideMediaByDefault),
+        forceFilter: undefined,
+      });
+    }
   }
 
   componentWillUnmount() {
diff --git a/app/javascript/flavours/glitch/features/notifications/request.jsx b/app/javascript/flavours/glitch/features/notifications/request.jsx
index d89527f69a6a45..4aca0af7f6b1d2 100644
--- a/app/javascript/flavours/glitch/features/notifications/request.jsx
+++ b/app/javascript/flavours/glitch/features/notifications/request.jsx
@@ -15,6 +15,7 @@ import Column from 'flavours/glitch/components/column';
 import ColumnHeader from 'flavours/glitch/components/column_header';
 import { IconButton } from 'flavours/glitch/components/icon_button';
 import ScrollableList from 'flavours/glitch/components/scrollable_list';
+import { SensitiveMediaContextProvider } from 'flavours/glitch/features/ui/util/sensitive_media_context';
 
 import NotificationContainer from './containers/notification_container';
 
@@ -106,25 +107,27 @@ export const NotificationRequest = ({ multiColumn, params: { id } }) => {
         )}
       />
 
-      <ScrollableList
-        scrollKey={`notification_requests/${id}`}
-        trackScroll={!multiColumn}
-        bindToDocument={!multiColumn}
-        isLoading={isLoading}
-        showLoading={isLoading && notifications.size === 0}
-        hasMore={hasMore}
-        onLoadMore={handleLoadMore}
-      >
-        {notifications.map(item => (
-          item && <NotificationContainer
-            key={item.get('id')}
-            notification={item}
-            accountId={item.get('account')}
-            onMoveUp={handleMoveUp}
-            onMoveDown={handleMoveDown}
-          />
-        ))}
-      </ScrollableList>
+      <SensitiveMediaContextProvider hideMediaByDefault>
+        <ScrollableList
+          scrollKey={`notification_requests/${id}`}
+          trackScroll={!multiColumn}
+          bindToDocument={!multiColumn}
+          isLoading={isLoading}
+          showLoading={isLoading && notifications.size === 0}
+          hasMore={hasMore}
+          onLoadMore={handleLoadMore}
+        >
+          {notifications.map(item => (
+            item && <NotificationContainer
+              key={item.get('id')}
+              notification={item}
+              accountId={item.get('account')}
+              onMoveUp={handleMoveUp}
+              onMoveDown={handleMoveDown}
+            />
+          ))}
+        </ScrollableList>
+      </SensitiveMediaContextProvider>
 
       <Helmet>
         <title>{columnTitle}</title>
diff --git a/app/javascript/flavours/glitch/features/ui/util/sensitive_media_context.tsx b/app/javascript/flavours/glitch/features/ui/util/sensitive_media_context.tsx
new file mode 100644
index 00000000000000..408154c31bf122
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/ui/util/sensitive_media_context.tsx
@@ -0,0 +1,28 @@
+import { createContext, useContext, useMemo } from 'react';
+
+export const SensitiveMediaContext = createContext<{
+  hideMediaByDefault: boolean;
+}>({
+  hideMediaByDefault: false,
+});
+
+export function useSensitiveMediaContext() {
+  return useContext(SensitiveMediaContext);
+}
+
+type ContextValue = React.ContextType<typeof SensitiveMediaContext>;
+
+export const SensitiveMediaContextProvider: React.FC<
+  React.PropsWithChildren<{ hideMediaByDefault: boolean }>
+> = ({ hideMediaByDefault, children }) => {
+  const contextValue = useMemo<ContextValue>(
+    () => ({ hideMediaByDefault }),
+    [hideMediaByDefault],
+  );
+
+  return (
+    <SensitiveMediaContext.Provider value={contextValue}>
+      {children}
+    </SensitiveMediaContext.Provider>
+  );
+};

From 369e72853639ab23e1eef5d71734e00bca568bb9 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 13 Mar 2024 20:17:58 +0100
Subject: [PATCH 0436/2191] Fix collapsed posts background color

---
 app/javascript/flavours/glitch/styles/components.scss | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index 5c0d721aabf3b7..7b4bc0678498c9 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -1557,10 +1557,7 @@ body > [data-popper-placement] {
         bottom: 0;
         inset-inline-start: 0;
         inset-inline-end: 0;
-        background: linear-gradient(
-          rgba($ui-base-color, 0),
-          rgba($ui-base-color, 1)
-        );
+        background: linear-gradient(transparent, var(--background-color));
         pointer-events: none;
       }
 

From 3156d04ec12294b4b211b191b22d245e18aba024 Mon Sep 17 00:00:00 2001
From: mogaminsk <mgmnjp@icloud.com>
Date: Thu, 14 Mar 2024 17:58:44 +0900
Subject: [PATCH 0437/2191] Use sender's `username` to column title in
 notification request if it's `display_name` is not set (#29575)

---
 app/javascript/mastodon/features/notifications/request.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/features/notifications/request.jsx b/app/javascript/mastodon/features/notifications/request.jsx
index da9ed21e55f3c0..d1f449844067cd 100644
--- a/app/javascript/mastodon/features/notifications/request.jsx
+++ b/app/javascript/mastodon/features/notifications/request.jsx
@@ -88,7 +88,7 @@ export const NotificationRequest = ({ multiColumn, params: { id } }) => {
     }
   }, [dispatch, accountId]);
 
-  const columnTitle = intl.formatMessage(messages.title, { name: account?.get('display_name') });
+  const columnTitle = intl.formatMessage(messages.title, { name: account?.get('display_name') || account?.get('username') });
 
   return (
     <Column bindToDocument={!multiColumn} ref={columnRef} label={columnTitle}>

From 42875fee52857ddf9745d056f5da7159cf4f22e6 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 14 Mar 2024 04:58:53 -0400
Subject: [PATCH 0438/2191] Add coverage for bad args/options in
 `CLI::Domains#purge` (#29578)

---
 spec/lib/mastodon/cli/domains_spec.rb | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/spec/lib/mastodon/cli/domains_spec.rb b/spec/lib/mastodon/cli/domains_spec.rb
index 24f341c1247ebe..448e6fe42b34e7 100644
--- a/spec/lib/mastodon/cli/domains_spec.rb
+++ b/spec/lib/mastodon/cli/domains_spec.rb
@@ -15,6 +15,23 @@
   describe '#purge' do
     let(:action) { :purge }
 
+    context 'with invalid limited federation mode argument' do
+      let(:arguments) { ['example.host'] }
+      let(:options) { { limited_federation_mode: true } }
+
+      it 'warns about usage and exits' do
+        expect { subject }
+          .to raise_error(Thor::Error, /DOMAIN parameter not supported/)
+      end
+    end
+
+    context 'without a domains argument' do
+      it 'warns about usage and exits' do
+        expect { subject }
+          .to raise_error(Thor::Error, 'No domain(s) given')
+      end
+    end
+
     context 'with accounts from the domain' do
       let(:domain) { 'host.example' }
       let!(:account) { Fabricate(:account, domain: domain) }

From 5aea35de13a74a3d3cfec734cc1fbe176c84cfa1 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 14 Mar 2024 10:00:42 +0100
Subject: [PATCH 0439/2191] New Crowdin Translations (automated) (#29587)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/ca.json    |  7 ++++---
 app/javascript/mastodon/locales/fi.json    |  5 +++++
 app/javascript/mastodon/locales/he.json    |  1 +
 app/javascript/mastodon/locales/kab.json   |  2 +-
 app/javascript/mastodon/locales/nn.json    | 16 ++++++++++++++++
 app/javascript/mastodon/locales/pt-PT.json |  3 +++
 app/javascript/mastodon/locales/th.json    |  1 +
 app/javascript/mastodon/locales/vi.json    |  4 ++--
 config/locales/fi.yml                      |  3 +++
 config/locales/kab.yml                     |  2 ++
 config/locales/simple_form.kab.yml         |  4 ++++
 11 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index 8ba140d207d52a..27c15327689dc5 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -272,6 +272,7 @@
   "filter_modal.select_filter.subtitle": "Usa una categoria existent o crea'n una de nova",
   "filter_modal.select_filter.title": "Filtra aquest tut",
   "filter_modal.title.status": "Filtra un tut",
+  "filtered_notifications_banner.pending_requests": "Notificacions {count, plural, =0 {de ningú} one {d'una persona} other {de # persones}} que potser coneixes",
   "filtered_notifications_banner.title": "Notificacions filtrades",
   "firehose.all": "Tots",
   "firehose.local": "Aquest servidor",
@@ -476,13 +477,13 @@
   "notifications.permission_denied": "Les notificacions d’escriptori no estan disponibles perquè prèviament s’ha denegat el permís al navegador",
   "notifications.permission_denied_alert": "No es poden activar les notificacions de l'escriptori perquè abans s'ha denegat el permís del navegador",
   "notifications.permission_required": "Les notificacions d'escriptori no estan disponibles perquè el permís requerit no ha estat concedit.",
-  "notifications.policy.filter_new_accounts.hint": "Creat durant els passats {days, plural, one {un dia} other {# dies}}",
+  "notifications.policy.filter_new_accounts.hint": "Creat {days, plural, one {ahir} other {durant els # dies passats}}",
   "notifications.policy.filter_new_accounts_title": "Comptes nous",
-  "notifications.policy.filter_not_followers_hint": "Incloent les persones que us segueixen fa menys de {days, plural, one {un dia} other {# dies}}",
+  "notifications.policy.filter_not_followers_hint": "Incloent les persones que us segueixen fa menys {days, plural, one {d'un dia} other {de # dies}}",
   "notifications.policy.filter_not_followers_title": "Persones que no us segueixen",
   "notifications.policy.filter_not_following_hint": "Fins que no ho aproveu de forma manual",
   "notifications.policy.filter_not_following_title": "Persones que no seguiu",
-  "notifications.policy.filter_private_mentions_hint": "Filtra-ho excepte si és en resposta a una menció vostra o si seguiu el remitent",
+  "notifications.policy.filter_private_mentions_hint": "Filtrat si no és que és en resposta a una menció vostra o si seguiu el remitent",
   "notifications.policy.filter_private_mentions_title": "Mencions privades no sol·licitades",
   "notifications.policy.title": "Filtra les notificacions de…",
   "notifications_permission_banner.enable": "Activa les notificacions d’escriptori",
diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index 93e758dd406bb0..9acae62de463aa 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -241,6 +241,7 @@
   "empty_column.list": "Tällä listalla ei ole vielä mitään. Kun tämän listan jäsenet lähettävät uusia julkaisuja, ne näkyvät tässä.",
   "empty_column.lists": "Sinulla ei ole vielä yhtään listaa. Kun luot sellaisen, näkyy se tässä.",
   "empty_column.mutes": "Et ole mykistänyt vielä yhtään käyttäjää.",
+  "empty_column.notification_requests": "Kaikki kunnossa! Täällä ei ole mitään. Kun saat uusia ilmoituksia, ne näkyvät täällä asetustesi mukaisesti.",
   "empty_column.notifications": "Sinulla ei ole vielä ilmoituksia. Kun keskustelet muille, näet sen täällä.",
   "empty_column.public": "Täällä ei ole mitään! Kirjoita jotain julkisesti. Voit myös seurata muiden palvelimien käyttäjiä",
   "error.unexpected_crash.explanation": "Sivua ei voida näyttää oikein ohjelmointivirheen tai selaimen yhteensopivuusvajeen vuoksi.",
@@ -271,6 +272,7 @@
   "filter_modal.select_filter.subtitle": "Käytä olemassa olevaa luokkaa tai luo uusi",
   "filter_modal.select_filter.title": "Suodata tämä julkaisu",
   "filter_modal.title.status": "Suodata julkaisu",
+  "filtered_notifications_banner.pending_requests": "Ilmoitukset, {count, plural, =0 {ei tänään} one {1 henkilö} other {# henkilöä}}",
   "filtered_notifications_banner.title": "Suodatetut ilmoitukset",
   "firehose.all": "Kaikki",
   "firehose.local": "Tämä palvelin",
@@ -477,8 +479,11 @@
   "notifications.permission_required": "Työpöytäilmoitukset eivät ole käytettävissä, koska siihen tarvittavaa lupaa ei ole myönnetty.",
   "notifications.policy.filter_new_accounts.hint": "Luotu {days, plural, one {viime päivänä} other {viimeisenä # päivänä}}",
   "notifications.policy.filter_new_accounts_title": "Uudet tilit",
+  "notifications.policy.filter_not_followers_hint": "Mukaan lukien ne, jotka ovat seuranneet sinua vähemmän kuin {days, plural, one {päivän} other {# päivää}}",
   "notifications.policy.filter_not_followers_title": "Henkilöt, jotka eivät seuraa sinua",
+  "notifications.policy.filter_not_following_hint": "Kunnes hyväksyt ne manuaalisesti",
   "notifications.policy.filter_not_following_title": "Henkilöt, joita et seuraa",
+  "notifications.policy.filter_private_mentions_hint": "Suodatetaan, ellei se vastaa omaan mainintaan tai jos seuraat lähettäjää",
   "notifications.policy.filter_private_mentions_title": "Ei-toivotut yksityismaininnat",
   "notifications.policy.title": "Suodata ilmoitukset pois kohteesta…",
   "notifications_permission_banner.enable": "Ota työpöytäilmoitukset käyttöön",
diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json
index af6b1c6118730a..53e2653130a79a 100644
--- a/app/javascript/mastodon/locales/he.json
+++ b/app/javascript/mastodon/locales/he.json
@@ -272,6 +272,7 @@
   "filter_modal.select_filter.subtitle": "שימוש בקטגורייה קיימת או יצירת אחת חדשה",
   "filter_modal.select_filter.title": "סינון ההודעה הזו",
   "filter_modal.title.status": "סנן הודעה",
+  "filtered_notifications_banner.pending_requests": "{count, plural,=0 {אין התראות ממשתמשים ה}one {התראה אחת ממישהו/מישהי ה}two {יש התראותיים ממשתמשים }other {יש # התראות ממשתמשים }}מוכרים לך",
   "filtered_notifications_banner.title": "התראות מסוננות",
   "firehose.all": "הכל",
   "firehose.local": "שרת זה",
diff --git a/app/javascript/mastodon/locales/kab.json b/app/javascript/mastodon/locales/kab.json
index 4ffae68bd0bd4a..db770b427a1054 100644
--- a/app/javascript/mastodon/locales/kab.json
+++ b/app/javascript/mastodon/locales/kab.json
@@ -320,7 +320,7 @@
   "mute_modal.hide_notifications": "Tebɣiḍ ad teffreḍ talɣutin n umseqdac-a?",
   "mute_modal.indefinite": "Ur yettwasbadu ara",
   "navigation_bar.about": "Ɣef",
-  "navigation_bar.blocks": "Imseqdacen yettusḥebsen",
+  "navigation_bar.blocks": "Iseqdacen yettusḥebsen",
   "navigation_bar.bookmarks": "Ticraḍ",
   "navigation_bar.community_timeline": "Tasuddemt tadigant",
   "navigation_bar.compose": "Aru tajewwiqt tamaynut",
diff --git a/app/javascript/mastodon/locales/nn.json b/app/javascript/mastodon/locales/nn.json
index b8a0512b8c7b8d..94fee3498de0bf 100644
--- a/app/javascript/mastodon/locales/nn.json
+++ b/app/javascript/mastodon/locales/nn.json
@@ -241,6 +241,7 @@
   "empty_column.list": "Det er ingenting i denne lista enno. Når medlemer av denne lista legg ut nye statusar, så dukkar dei opp her.",
   "empty_column.lists": "Du har ingen lister enno. Når du lagar ei, så dukkar ho opp her.",
   "empty_column.mutes": "Du har ikkje målbunde nokon enno.",
+  "empty_column.notification_requests": "Ferdig! Her er det ingenting. Når du får nye varsel, kjem dei opp her slik du har valt.",
   "empty_column.notifications": "Du har ingen varsel enno. Kommuniser med andre for å starte samtalen.",
   "empty_column.public": "Det er ingenting her! Skriv noko offentleg, eller følg brukarar frå andre tenarar manuelt for å fylle det opp",
   "error.unexpected_crash.explanation": "På grunn av eit nettlesarkompatibilitetsproblem eller ein feil i koden vår, kunne ikkje denne sida bli vist slik den skal.",
@@ -271,6 +272,8 @@
   "filter_modal.select_filter.subtitle": "Bruk ein eksisterande kategori eller opprett ein ny",
   "filter_modal.select_filter.title": "Filtrer dette innlegget",
   "filter_modal.title.status": "Filtrer eit innlegg",
+  "filtered_notifications_banner.pending_requests": "Varsel frå {count, plural, =0 {ingen} one {ein person} other {# folk}} du kanskje kjenner",
+  "filtered_notifications_banner.title": "Filtrerte varslingar",
   "firehose.all": "Alle",
   "firehose.local": "Denne tenaren",
   "firehose.remote": "Andre tenarar",
@@ -439,6 +442,10 @@
   "notification.reblog": "{name} framheva innlegget ditt",
   "notification.status": "{name} la nettopp ut",
   "notification.update": "{name} redigerte eit innlegg",
+  "notification_requests.accept": "Godkjenn",
+  "notification_requests.dismiss": "Avvis",
+  "notification_requests.notifications_from": "Varslingar frå {name}",
+  "notification_requests.title": "Filtrerte varslingar",
   "notifications.clear": "Tøm varsel",
   "notifications.clear_confirmation": "Er du sikker på at du vil fjerna alle varsla dine for alltid?",
   "notifications.column_settings.admin.report": "Nye rapportar:",
@@ -470,6 +477,15 @@
   "notifications.permission_denied": "Skrivebordsvarsel er ikkje tilgjengelege på grunn av at nettlesaren tidlegare ikkje har fått naudsynte rettar til å vise dei",
   "notifications.permission_denied_alert": "Sidan nettlesaren tidlegare har blitt nekta naudsynte rettar, kan ikkje skrivebordsvarsel aktiverast",
   "notifications.permission_required": "Skrivebordsvarsel er utilgjengelege fordi naudsynte rettar ikkje er gitt.",
+  "notifications.policy.filter_new_accounts.hint": "Skrive siste {days, plural, one {dag} other {# dagar}}",
+  "notifications.policy.filter_new_accounts_title": "Nye brukarkontoar",
+  "notifications.policy.filter_not_followers_hint": "Inkludert folk som har fylgt deg mindre enn {days, plural, one {ein dag} other {# dagar}}",
+  "notifications.policy.filter_not_followers_title": "Folk som ikkje fylgjer deg",
+  "notifications.policy.filter_not_following_hint": "Til du godkjenner dei manuelt",
+  "notifications.policy.filter_not_following_title": "Folk du ikkje fylgjer",
+  "notifications.policy.filter_private_mentions_hint": "Filtrert viss det ikkje er eit svar på dine eigne nemningar eller viss du fylgjer avsendaren",
+  "notifications.policy.filter_private_mentions_title": "Masseutsende private nemningar",
+  "notifications.policy.title": "Filtrer ut varslingar frå…",
   "notifications_permission_banner.enable": "Skru på skrivebordsvarsel",
   "notifications_permission_banner.how_to_control": "Aktiver skrivebordsvarsel for å få varsel når Mastodon ikkje er open. Du kan nøye bestemme kva samhandlingar som skal føre til skrivebordsvarsel gjennom {icon}-knappen ovanfor etter at varsel er aktivert.",
   "notifications_permission_banner.title": "Gå aldri glipp av noko",
diff --git a/app/javascript/mastodon/locales/pt-PT.json b/app/javascript/mastodon/locales/pt-PT.json
index da947f9bf48da5..18a550d641ca77 100644
--- a/app/javascript/mastodon/locales/pt-PT.json
+++ b/app/javascript/mastodon/locales/pt-PT.json
@@ -272,6 +272,7 @@
   "filter_modal.select_filter.subtitle": "Utilize uma categoria existente ou crie uma nova",
   "filter_modal.select_filter.title": "Filtrar esta publicação",
   "filter_modal.title.status": "Filtrar uma publicação",
+  "filtered_notifications_banner.pending_requests": "Notificações de {count, plural, =0 {ninguém} one {uma pessoa} other {# pessoas}} que talvez conheça",
   "filtered_notifications_banner.title": "Notificações filtradas",
   "firehose.all": "Todas",
   "firehose.local": "Este servidor",
@@ -476,7 +477,9 @@
   "notifications.permission_denied": "Notificações no ambiente de trabalho não estão disponíveis porque a permissão, solicitada pelo navegador, foi recusada anteriormente",
   "notifications.permission_denied_alert": "Notificações no ambiente de trabalho não podem ser ativadas, pois a permissão do navegador foi recusada anteriormente",
   "notifications.permission_required": "Notificações no ambiente de trabalho não estão disponíveis porque a permissão necessária não foi concedida.",
+  "notifications.policy.filter_new_accounts.hint": "Criada nos últimos {days, plural, one {um dia} other {# dias}}",
   "notifications.policy.filter_new_accounts_title": "Novas contas",
+  "notifications.policy.filter_not_followers_hint": "Incluindo pessoas que o seguem há menos de {days, plural, one {um dia} other {# dias}}",
   "notifications.policy.filter_not_followers_title": "Pessoas não te seguem",
   "notifications.policy.filter_not_following_hint": "Até que você os aprove manualmente",
   "notifications.policy.filter_not_following_title": "Pessoas que você não segue",
diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json
index 30a9601d67acc4..28b176451063ad 100644
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@@ -241,6 +241,7 @@
   "empty_column.list": "ยังไม่มีสิ่งใดในรายการนี้ เมื่อสมาชิกของรายการนี้โพสต์โพสต์ใหม่ โพสต์จะปรากฏที่นี่",
   "empty_column.lists": "คุณยังไม่มีรายการใด ๆ เมื่อคุณสร้างรายการ รายการจะปรากฏที่นี่",
   "empty_column.mutes": "คุณยังไม่ได้ซ่อนผู้ใช้ใด ๆ",
+  "empty_column.notification_requests": "โล่งทั้งหมด! ไม่มีสิ่งใดที่นี่ เมื่อคุณได้รับการแจ้งเตือนใหม่ การแจ้งเตือนจะปรากฏที่นี่ตามการตั้งค่าของคุณ",
   "empty_column.notifications": "คุณยังไม่มีการแจ้งเตือนใด ๆ เมื่อผู้คนอื่น ๆ โต้ตอบกับคุณ คุณจะเห็นการแจ้งเตือนที่นี่",
   "empty_column.public": "ไม่มีสิ่งใดที่นี่! เขียนบางอย่างเป็นสาธารณะ หรือติดตามผู้ใช้จากเซิร์ฟเวอร์อื่น ๆ ด้วยตนเองเพื่อเติมเส้นเวลาให้เต็ม",
   "error.unexpected_crash.explanation": "เนื่องจากข้อบกพร่องในโค้ดของเราหรือปัญหาความเข้ากันได้ของเบราว์เซอร์ จึงไม่สามารถแสดงหน้านี้ได้อย่างถูกต้อง",
diff --git a/app/javascript/mastodon/locales/vi.json b/app/javascript/mastodon/locales/vi.json
index c74c780127c7aa..998aecd2750480 100644
--- a/app/javascript/mastodon/locales/vi.json
+++ b/app/javascript/mastodon/locales/vi.json
@@ -272,7 +272,7 @@
   "filter_modal.select_filter.subtitle": "Sử dụng một danh mục hiện có hoặc tạo một danh mục mới",
   "filter_modal.select_filter.title": "Lọc tút này",
   "filter_modal.title.status": "Lọc một tút",
-  "filtered_notifications_banner.pending_requests": "{count, plural, =0 {} other {#}}",
+  "filtered_notifications_banner.pending_requests": "Thông báo từ {count, plural, =0 {không ai} other {# người}} bạn có thể biết",
   "filtered_notifications_banner.title": "Thông báo đã lọc",
   "firehose.all": "Toàn bộ",
   "firehose.local": "Máy chủ này",
@@ -364,7 +364,7 @@
   "keyboard_shortcuts.my_profile": "mở hồ sơ của bạn",
   "keyboard_shortcuts.notifications": "mở thông báo",
   "keyboard_shortcuts.open_media": "mở ảnh hoặc video",
-  "keyboard_shortcuts.pinned": "Open pinned posts list",
+  "keyboard_shortcuts.pinned": "mở những tút đã ghim",
   "keyboard_shortcuts.profile": "mở trang của người đăng tút",
   "keyboard_shortcuts.reply": "trả lời",
   "keyboard_shortcuts.requests": "mở danh sách yêu cầu theo dõi",
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 156a4700eb2291..93dbd0162790da 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -1846,7 +1846,10 @@ fi:
       apps_ios_action: Lataa App Storesta
       apps_step: Lataa viralliset sovelluksemme.
       apps_title: Mastodon-sovellukset
+      checklist_subtitle: 'Aloitetaan, sinä aloitat uudella sosiaalisella seudulla:'
+      checklist_title: Tervetuloa tarkistuslista
       edit_profile_action: Mukauta
+      edit_profile_step: Täydentämällä profiilisi tietoja tehostat vaikutemaa.
       edit_profile_title: Mukauta profiiliasi
       explanation: Näillä vinkeillä pääset alkuun
       feature_action: Lue lisää
diff --git a/config/locales/kab.yml b/config/locales/kab.yml
index b25a4e3a1d0fa4..66c544f9e788ff 100644
--- a/config/locales/kab.yml
+++ b/config/locales/kab.yml
@@ -705,6 +705,7 @@ kab:
     moved: Igujj
     primary: Agejdan
     relationship: Assaɣ
+    remove_selected_follows: Ur ṭṭafar ara iseqdacen yettwafernen
     status: Addad n umiḍan
   sessions:
     activity: Armud aneggaru
@@ -729,6 +730,7 @@ kab:
     current_session: Tiɣimit tamirant
     date: Azemz
     description: "%{browser} s %{platform}"
+    explanation: Ha-t-en yiminigen web ikecmen akka tura ɣer umiḍan-ik·im Mastodon.
     ip: IP
     platforms:
       adobe_air: Adobe Air
diff --git a/config/locales/simple_form.kab.yml b/config/locales/simple_form.kab.yml
index a9b040b0585140..8e63211b65e66c 100644
--- a/config/locales/simple_form.kab.yml
+++ b/config/locales/simple_form.kab.yml
@@ -23,6 +23,8 @@ kab:
         setting_display_media_hide_all: Ffer yal tikkelt akk taywalt
         setting_display_media_show_all: Ffer yal tikkelt teywalt yettwacreḍ d tanafrit
         username: Tzemreḍ ad tesqedceḍ isekkilen, uṭṭunen akked yijerriden n wadda
+      featured_tag:
+        name: 'Ha-t-an kra seg ihacṭagen i tesseqdaceḍ ussan-a ineggura maḍi :'
       imports:
         data: Afaylu CSV id yusan seg uqeddac-nniḍen n Maṣṭudun
       ip_block:
@@ -102,7 +104,9 @@ kab:
           no_access: Sewḥel anekcum
         severity: Alugen
       notification_emails:
+        favourite: Ma yella walbɛaḍ i iḥemmlen tasuffeɣt-ik·im
         follow: Yeḍfer-ik·im-id walbɛaḍ
+        follow_request: Ma yella win i d-yessutren ad k·em-yeḍfer
         mention: Yuder-ik·em-id walbɛaḍ
         reblog: Yella win yesselhan adda-dik·im
       rule:

From 1e1d97a78727570bb3343aa4008b93edae3dde1d Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 14 Mar 2024 10:07:29 +0100
Subject: [PATCH 0440/2191] Fix wrong background color on search results in web
 UI (#29584)

---
 .../compose/components/search_results.jsx     |  6 -----
 .../styles/mastodon/components.scss           | 23 +++++--------------
 app/javascript/styles/mastodon/variables.scss |  1 +
 3 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/app/javascript/mastodon/features/compose/components/search_results.jsx b/app/javascript/mastodon/features/compose/components/search_results.jsx
index 694deea04efb96..667662781e0345 100644
--- a/app/javascript/mastodon/features/compose/components/search_results.jsx
+++ b/app/javascript/mastodon/features/compose/components/search_results.jsx
@@ -7,7 +7,6 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
 
 import FindInPageIcon from '@/material-icons/400-24px/find_in_page.svg?react';
 import PeopleIcon from '@/material-icons/400-24px/group.svg?react';
-import SearchIcon from '@/material-icons/400-24px/search.svg?react';
 import TagIcon from '@/material-icons/400-24px/tag.svg?react';
 import { Icon }  from 'mastodon/components/icon';
 import { LoadMore } from 'mastodon/components/load_more';
@@ -76,11 +75,6 @@ class SearchResults extends ImmutablePureComponent {
 
     return (
       <div className='search-results'>
-        <div className='search-results__header'>
-          <Icon id='search' icon={SearchIcon} />
-          <FormattedMessage id='explore.search_results' defaultMessage='Search results' />
-        </div>
-
         {accounts}
         {hashtags}
         {statuses}
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index b6dc1abc998a94..6aa3588501064b 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -3485,7 +3485,7 @@ $ui-header-height: 55px;
 }
 
 .column-subheading {
-  background: darken($ui-base-color, 4%);
+  background: var(--surface-background-color);
   color: $darker-text-color;
   padding: 8px 20px;
   font-size: 12px;
@@ -4637,7 +4637,7 @@ a.status-card {
 }
 
 .follow_requests-unlocked_explanation {
-  background: darken($ui-base-color, 4%);
+  background: var(--surface-background-color);
   border-bottom: 1px solid var(--background-border-color);
   contain: initial;
   flex-grow: 0;
@@ -5269,18 +5269,6 @@ a.status-card {
   }
 }
 
-.search-results__header {
-  color: $dark-text-color;
-  background: lighten($ui-base-color, 2%);
-  padding: 15px;
-  font-weight: 500;
-  font-size: 16px;
-  cursor: default;
-  display: flex;
-  align-items: center;
-  gap: 5px;
-}
-
 .search-results__section {
   border-bottom: 1px solid var(--background-border-color);
 
@@ -5289,8 +5277,8 @@ a.status-card {
   }
 
   &__header {
-    background: darken($ui-base-color, 4%);
     border-bottom: 1px solid var(--background-border-color);
+    background: var(--surface-background-color);
     padding: 15px;
     font-weight: 500;
     font-size: 14px;
@@ -7159,7 +7147,7 @@ noscript {
 .follow-request-banner,
 .account-memorial-banner {
   padding: 20px;
-  background: lighten($ui-base-color, 4%);
+  background: var(--surface-background-color);
   display: flex;
   align-items: center;
   flex-direction: column;
@@ -8326,7 +8314,8 @@ noscript {
   flex: 1 1 auto;
   display: flex;
   flex-direction: column;
-  background: $ui-base-color;
+  border: 1px solid var(--background-border-color);
+  border-top: 0;
   border-bottom-left-radius: 4px;
   border-bottom-right-radius: 4px;
 }
diff --git a/app/javascript/styles/mastodon/variables.scss b/app/javascript/styles/mastodon/variables.scss
index 94078d960d694c..2b2a2957914f5c 100644
--- a/app/javascript/styles/mastodon/variables.scss
+++ b/app/javascript/styles/mastodon/variables.scss
@@ -104,4 +104,5 @@ $font-monospace: 'mastodon-font-monospace' !default;
   --background-filter: blur(10px) saturate(180%) contrast(75%) brightness(70%);
   --background-color: #{darken($ui-base-color, 8%)};
   --background-color-tint: #{rgba(darken($ui-base-color, 8%), 0.9)};
+  --surface-background-color: #{darken($ui-base-color, 4%)};
 }

From f9100743ecec65cdeeabdaa29ed94afc4b2e3aa5 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 14 Mar 2024 05:09:47 -0400
Subject: [PATCH 0441/2191] Add `Api::ErrorHandling` concern for api/base
 controller (#29574)

---
 app/controllers/api/base_controller.rb        | 46 +---------------
 .../concerns/api/error_handling.rb            | 52 +++++++++++++++++++
 spec/controllers/api/base_controller_spec.rb  | 36 -------------
 .../concerns/api/error_handling_spec.rb       | 51 ++++++++++++++++++
 4 files changed, 104 insertions(+), 81 deletions(-)
 create mode 100644 app/controllers/concerns/api/error_handling.rb
 create mode 100644 spec/controllers/concerns/api/error_handling_spec.rb

diff --git a/app/controllers/api/base_controller.rb b/app/controllers/api/base_controller.rb
index 8bf9da2cfd2371..bf7deac5cfc857 100644
--- a/app/controllers/api/base_controller.rb
+++ b/app/controllers/api/base_controller.rb
@@ -8,6 +8,7 @@ class Api::BaseController < ApplicationController
   include Api::AccessTokenTrackingConcern
   include Api::CachingConcern
   include Api::ContentSecurityPolicy
+  include Api::ErrorHandling
 
   skip_before_action :require_functional!, unless: :limited_federation_mode?
 
@@ -18,51 +19,6 @@ class Api::BaseController < ApplicationController
 
   protect_from_forgery with: :null_session
 
-  rescue_from ActiveRecord::RecordInvalid, Mastodon::ValidationError do |e|
-    render json: { error: e.to_s }, status: 422
-  end
-
-  rescue_from ActiveRecord::RecordNotUnique do
-    render json: { error: 'Duplicate record' }, status: 422
-  end
-
-  rescue_from Date::Error do
-    render json: { error: 'Invalid date supplied' }, status: 422
-  end
-
-  rescue_from ActiveRecord::RecordNotFound do
-    render json: { error: 'Record not found' }, status: 404
-  end
-
-  rescue_from HTTP::Error, Mastodon::UnexpectedResponseError do
-    render json: { error: 'Remote data could not be fetched' }, status: 503
-  end
-
-  rescue_from OpenSSL::SSL::SSLError do
-    render json: { error: 'Remote SSL certificate could not be verified' }, status: 503
-  end
-
-  rescue_from Mastodon::NotPermittedError do
-    render json: { error: 'This action is not allowed' }, status: 403
-  end
-
-  rescue_from Seahorse::Client::NetworkingError do |e|
-    Rails.logger.warn "Storage server error: #{e}"
-    render json: { error: 'There was a temporary problem serving your request, please try again' }, status: 503
-  end
-
-  rescue_from Mastodon::RaceConditionError, Stoplight::Error::RedLight do
-    render json: { error: 'There was a temporary problem serving your request, please try again' }, status: 503
-  end
-
-  rescue_from Mastodon::RateLimitExceededError do
-    render json: { error: I18n.t('errors.429') }, status: 429
-  end
-
-  rescue_from ActionController::ParameterMissing, Mastodon::InvalidParameterError do |e|
-    render json: { error: e.to_s }, status: 400
-  end
-
   def doorkeeper_unauthorized_render_options(error: nil)
     { json: { error: error.try(:description) || 'Not authorized' } }
   end
diff --git a/app/controllers/concerns/api/error_handling.rb b/app/controllers/concerns/api/error_handling.rb
new file mode 100644
index 00000000000000..ad559fe2d713e1
--- /dev/null
+++ b/app/controllers/concerns/api/error_handling.rb
@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+module Api::ErrorHandling
+  extend ActiveSupport::Concern
+
+  included do
+    rescue_from ActiveRecord::RecordInvalid, Mastodon::ValidationError do |e|
+      render json: { error: e.to_s }, status: 422
+    end
+
+    rescue_from ActiveRecord::RecordNotUnique do
+      render json: { error: 'Duplicate record' }, status: 422
+    end
+
+    rescue_from Date::Error do
+      render json: { error: 'Invalid date supplied' }, status: 422
+    end
+
+    rescue_from ActiveRecord::RecordNotFound do
+      render json: { error: 'Record not found' }, status: 404
+    end
+
+    rescue_from HTTP::Error, Mastodon::UnexpectedResponseError do
+      render json: { error: 'Remote data could not be fetched' }, status: 503
+    end
+
+    rescue_from OpenSSL::SSL::SSLError do
+      render json: { error: 'Remote SSL certificate could not be verified' }, status: 503
+    end
+
+    rescue_from Mastodon::NotPermittedError do
+      render json: { error: 'This action is not allowed' }, status: 403
+    end
+
+    rescue_from Seahorse::Client::NetworkingError do |e|
+      Rails.logger.warn "Storage server error: #{e}"
+      render json: { error: 'There was a temporary problem serving your request, please try again' }, status: 503
+    end
+
+    rescue_from Mastodon::RaceConditionError, Stoplight::Error::RedLight do
+      render json: { error: 'There was a temporary problem serving your request, please try again' }, status: 503
+    end
+
+    rescue_from Mastodon::RateLimitExceededError do
+      render json: { error: I18n.t('errors.429') }, status: 429
+    end
+
+    rescue_from ActionController::ParameterMissing, Mastodon::InvalidParameterError do |e|
+      render json: { error: e.to_s }, status: 400
+    end
+  end
+end
diff --git a/spec/controllers/api/base_controller_spec.rb b/spec/controllers/api/base_controller_spec.rb
index f8e014be2feae0..659d55f8012d0e 100644
--- a/spec/controllers/api/base_controller_spec.rb
+++ b/spec/controllers/api/base_controller_spec.rb
@@ -3,10 +3,6 @@
 require 'rails_helper'
 
 describe Api::BaseController do
-  before do
-    stub_const('FakeService', Class.new)
-  end
-
   controller do
     def success
       head 200
@@ -72,36 +68,4 @@ def failure
       expect(response).to have_http_status(403)
     end
   end
-
-  describe 'error handling' do
-    before do
-      routes.draw { get 'failure' => 'api/base#failure' }
-    end
-
-    {
-      ActiveRecord::RecordInvalid => 422,
-      ActiveRecord::RecordNotFound => 404,
-      ActiveRecord::RecordNotUnique => 422,
-      Date::Error => 422,
-      HTTP::Error => 503,
-      Mastodon::InvalidParameterError => 400,
-      Mastodon::NotPermittedError => 403,
-      Mastodon::RaceConditionError => 503,
-      Mastodon::RateLimitExceededError => 429,
-      Mastodon::UnexpectedResponseError => 503,
-      Mastodon::ValidationError => 422,
-      OpenSSL::SSL::SSLError => 503,
-      Seahorse::Client::NetworkingError => 503,
-      Stoplight::Error::RedLight => 503,
-    }.each do |error, code|
-      it "Handles error class of #{error}" do
-        allow(FakeService).to receive(:new).and_raise(error)
-
-        get :failure
-
-        expect(response).to have_http_status(code)
-        expect(FakeService).to have_received(:new)
-      end
-    end
-  end
 end
diff --git a/spec/controllers/concerns/api/error_handling_spec.rb b/spec/controllers/concerns/api/error_handling_spec.rb
new file mode 100644
index 00000000000000..9b36fc20a32403
--- /dev/null
+++ b/spec/controllers/concerns/api/error_handling_spec.rb
@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe Api::ErrorHandling do
+  before do
+    stub_const('FakeService', Class.new)
+  end
+
+  controller(Api::BaseController) do
+    def failure
+      FakeService.new
+    end
+  end
+
+  describe 'error handling' do
+    before do
+      routes.draw { get 'failure' => 'api/base#failure' }
+    end
+
+    {
+      ActiveRecord::RecordInvalid => 422,
+      ActiveRecord::RecordNotFound => 404,
+      ActiveRecord::RecordNotUnique => 422,
+      Date::Error => 422,
+      HTTP::Error => 503,
+      Mastodon::InvalidParameterError => 400,
+      Mastodon::NotPermittedError => 403,
+      Mastodon::RaceConditionError => 503,
+      Mastodon::RateLimitExceededError => 429,
+      Mastodon::UnexpectedResponseError => 503,
+      Mastodon::ValidationError => 422,
+      OpenSSL::SSL::SSLError => 503,
+      Seahorse::Client::NetworkingError => 503,
+      Stoplight::Error::RedLight => 503,
+    }.each do |error, code|
+      it "Handles error class of #{error}" do
+        allow(FakeService)
+          .to receive(:new)
+          .and_raise(error)
+
+        get :failure
+
+        expect(response)
+          .to have_http_status(code)
+        expect(FakeService)
+          .to have_received(:new)
+      end
+    end
+  end
+end

From 4991198b703f5020ab136062fe7d5ef44e8f0aec Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 14 Mar 2024 10:18:24 +0100
Subject: [PATCH 0442/2191] Change design of metadata underneath posts in web
 UI (#29585)

---
 .../components/edited_timestamp/index.jsx     |  4 +-
 .../status/components/detailed_status.jsx     | 72 +++++++++----------
 app/javascript/mastodon/locales/en.json       |  4 +-
 .../styles/mastodon/components.scss           | 45 +++++++-----
 4 files changed, 65 insertions(+), 60 deletions(-)

diff --git a/app/javascript/mastodon/components/edited_timestamp/index.jsx b/app/javascript/mastodon/components/edited_timestamp/index.jsx
index 7b70f9d6e1dda8..fbf14ec4bde347 100644
--- a/app/javascript/mastodon/components/edited_timestamp/index.jsx
+++ b/app/javascript/mastodon/components/edited_timestamp/index.jsx
@@ -5,9 +5,7 @@ import { FormattedMessage, injectIntl } from 'react-intl';
 
 import { connect } from 'react-redux';
 
-import ArrowDropDownIcon from '@/material-icons/400-24px/arrow_drop_down.svg?react';
 import { openModal } from 'mastodon/actions/modal';
-import { Icon }  from 'mastodon/components/icon';
 import InlineAccount from 'mastodon/components/inline_account';
 import { RelativeTimestamp } from 'mastodon/components/relative_timestamp';
 
@@ -67,7 +65,7 @@ class EditedTimestamp extends PureComponent {
     return (
       <DropdownMenu statusId={statusId} renderItem={this.renderItem} scrollable renderHeader={this.renderHeader} onItemClick={this.handleItemClick}>
         <button className='dropdown-menu__text-button'>
-          <FormattedMessage id='status.edited' defaultMessage='Edited {date}' values={{ date: intl.formatDate(timestamp, { month: 'short', day: '2-digit', hour: '2-digit', minute: '2-digit' }) }} /> <Icon id='caret-down' icon={ArrowDropDownIcon} />
+          <FormattedMessage id='status.edited' defaultMessage='Edited {date}' values={{ date: <span className='animated-number'>{intl.formatDate(timestamp, { month: 'short', day: '2-digit', hour: '2-digit', minute: '2-digit' })}</span> }} />
         </button>
       </DropdownMenu>
     );
diff --git a/app/javascript/mastodon/features/status/components/detailed_status.jsx b/app/javascript/mastodon/features/status/components/detailed_status.jsx
index d10c8966e4ad76..45935716ca4335 100644
--- a/app/javascript/mastodon/features/status/components/detailed_status.jsx
+++ b/app/javascript/mastodon/features/status/components/detailed_status.jsx
@@ -9,8 +9,6 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
 import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
-import RepeatIcon from '@/material-icons/400-24px/repeat.svg?react';
-import StarIcon from '@/material-icons/400-24px/star-fill.svg?react';
 import { AnimatedNumber } from 'mastodon/components/animated_number';
 import EditedTimestamp from 'mastodon/components/edited_timestamp';
 import { getHashtagBarForStatus } from 'mastodon/components/hashtag_bar';
@@ -143,10 +141,7 @@ class DetailedStatus extends ImmutablePureComponent {
     let media           = '';
     let applicationLink = '';
     let reblogLink = '';
-    const reblogIcon = 'retweet';
-    const reblogIconComponent = RepeatIcon;
     let favouriteLink = '';
-    let edited = '';
 
     if (this.props.measureHeight) {
       outerStyle.height = `${this.state.height}px`;
@@ -218,68 +213,53 @@ class DetailedStatus extends ImmutablePureComponent {
     }
 
     if (status.get('application')) {
-      applicationLink = <> · <a className='detailed-status__application' href={status.getIn(['application', 'website'])} target='_blank' rel='noopener noreferrer'>{status.getIn(['application', 'name'])}</a></>;
+      applicationLink = <>·<a className='detailed-status__application' href={status.getIn(['application', 'website'])} target='_blank' rel='noopener noreferrer'>{status.getIn(['application', 'name'])}</a></>;
     }
 
-    const visibilityLink = <> · <VisibilityIcon visibility={status.get('visibility')} /></>;
+    const visibilityLink = <>·<VisibilityIcon visibility={status.get('visibility')} /></>;
 
     if (['private', 'direct'].includes(status.get('visibility'))) {
       reblogLink = '';
     } else if (this.props.history) {
       reblogLink = (
-        <>
-          {' · '}
-          <Link to={`/@${status.getIn(['account', 'acct'])}/${status.get('id')}/reblogs`} className='detailed-status__link'>
-            <Icon id={reblogIcon} icon={reblogIconComponent} />
-            <span className='detailed-status__reblogs'>
-              <AnimatedNumber value={status.get('reblogs_count')} />
-            </span>
-          </Link>
-        </>
+        <Link to={`/@${status.getIn(['account', 'acct'])}/${status.get('id')}/reblogs`} className='detailed-status__link'>
+          <span className='detailed-status__reblogs'>
+            <AnimatedNumber value={status.get('reblogs_count')} />
+          </span>
+          <FormattedMessage id='status.reblogs' defaultMessage='{count, plural, one {boost} other {boosts}}' values={{ count: status.get('reblogs_count') }} />
+        </Link>
       );
     } else {
       reblogLink = (
-        <>
-          {' · '}
-          <a href={`/interact/${status.get('id')}?type=reblog`} className='detailed-status__link' onClick={this.handleModalLink}>
-            <Icon id={reblogIcon} icon={reblogIconComponent} />
-            <span className='detailed-status__reblogs'>
-              <AnimatedNumber value={status.get('reblogs_count')} />
-            </span>
-          </a>
-        </>
+        <a href={`/interact/${status.get('id')}?type=reblog`} className='detailed-status__link' onClick={this.handleModalLink}>
+          <span className='detailed-status__reblogs'>
+            <AnimatedNumber value={status.get('reblogs_count')} />
+          </span>
+          <FormattedMessage id='status.reblogs' defaultMessage='{count, plural, one {boost} other {boosts}}' values={{ count: status.get('reblogs_count') }} />
+        </a>
       );
     }
 
     if (this.props.history) {
       favouriteLink = (
         <Link to={`/@${status.getIn(['account', 'acct'])}/${status.get('id')}/favourites`} className='detailed-status__link'>
-          <Icon id='star' icon={StarIcon} />
           <span className='detailed-status__favorites'>
             <AnimatedNumber value={status.get('favourites_count')} />
           </span>
+          <FormattedMessage id='status.favourites' defaultMessage='{count, plural, one {favorite} other {favorites}}' values={{ count: status.get('favourites_count') }} />
         </Link>
       );
     } else {
       favouriteLink = (
         <a href={`/interact/${status.get('id')}?type=favourite`} className='detailed-status__link' onClick={this.handleModalLink}>
-          <Icon id='star' icon={StarIcon} />
           <span className='detailed-status__favorites'>
             <AnimatedNumber value={status.get('favourites_count')} />
           </span>
+          <FormattedMessage id='status.favourites' defaultMessage='{count, plural, one {favorite} other {favorites}}' values={{ count: status.get('favourites_count') }} />
         </a>
       );
     }
 
-    if (status.get('edited_at')) {
-      edited = (
-        <>
-          {' · '}
-          <EditedTimestamp statusId={status.get('id')} timestamp={status.get('edited_at')} />
-        </>
-      );
-    }
-
     const {statusContentProps, hashtagBar} = getHashtagBarForStatus(status);
     const expanded = !status.get('hidden') || status.get('spoiler_text').length === 0;
 
@@ -310,9 +290,23 @@ class DetailedStatus extends ImmutablePureComponent {
           {expanded && hashtagBar}
 
           <div className='detailed-status__meta'>
-            <a className='detailed-status__datetime' href={`/@${status.getIn(['account', 'acct'])}/${status.get('id')}`} target='_blank' rel='noopener noreferrer'>
-              <FormattedDate value={new Date(status.get('created_at'))} year='numeric' month='short' day='2-digit' hour='2-digit' minute='2-digit' />
-            </a>{edited}{visibilityLink}{applicationLink}{reblogLink} · {favouriteLink}
+            <div className='detailed-status__meta__line'>
+              <a className='detailed-status__datetime' href={`/@${status.getIn(['account', 'acct'])}/${status.get('id')}`} target='_blank' rel='noopener noreferrer'>
+                <FormattedDate value={new Date(status.get('created_at'))} year='numeric' month='short' day='2-digit' hour='2-digit' minute='2-digit' />
+              </a>
+
+              {visibilityLink}
+
+              {applicationLink}
+            </div>
+
+            {status.get('edited_at') && <div className='detailed-status__meta__line'><EditedTimestamp statusId={status.get('id')} timestamp={status.get('edited_at')} /></div>}
+
+            <div className='detailed-status__meta__line'>
+              {reblogLink}
+              ·
+              {favouriteLink}
+            </div>
           </div>
         </div>
       </div>
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index 2f202bfe155e66..8a66695f322090 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -662,10 +662,11 @@
   "status.direct": "Privately mention @{name}",
   "status.direct_indicator": "Private mention",
   "status.edit": "Edit",
-  "status.edited": "Edited {date}",
+  "status.edited": "Last edited {date}",
   "status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",
   "status.embed": "Embed",
   "status.favourite": "Favorite",
+  "status.favourites": "{count, plural, one {favorite} other {favorites}}",
   "status.filter": "Filter this post",
   "status.filtered": "Filtered",
   "status.hide": "Hide post",
@@ -686,6 +687,7 @@
   "status.reblog": "Boost",
   "status.reblog_private": "Boost with original visibility",
   "status.reblogged_by": "{name} boosted",
+  "status.reblogs": "{count, plural, one {boost} other {boosts}}",
   "status.reblogs.empty": "No one has boosted this post yet. When someone does, they will show up here.",
   "status.redraft": "Delete & re-draft",
   "status.remove_bookmark": "Remove bookmark",
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 6aa3588501064b..398babb2593bf7 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -1659,15 +1659,35 @@ body > [data-popper-placement] {
 }
 
 .detailed-status__meta {
-  margin-top: 16px;
+  margin-top: 24px;
   color: $dark-text-color;
   font-size: 14px;
   line-height: 18px;
 
+  &__line {
+    border-bottom: 1px solid var(--background-border-color);
+    padding: 8px 0;
+    display: flex;
+    align-items: center;
+    gap: 8px;
+
+    &:first-child {
+      padding-top: 0;
+    }
+
+    &:last-child {
+      padding-bottom: 0;
+      border-bottom: 0;
+    }
+  }
+
   .icon {
-    width: 15px;
-    height: 15px;
-    vertical-align: middle;
+    width: 18px;
+    height: 18px;
+  }
+
+  .animated-number {
+    color: $secondary-text-color;
   }
 }
 
@@ -1711,19 +1731,6 @@ body > [data-popper-placement] {
   color: inherit;
   text-decoration: none;
   gap: 6px;
-  position: relative;
-  top: 0.145em;
-
-  .icon {
-    top: 0;
-  }
-}
-
-.detailed-status__favorites,
-.detailed-status__reblogs {
-  font-weight: 500;
-  font-size: 12px;
-  line-height: 18px;
 }
 
 .domain {
@@ -2292,6 +2299,10 @@ a.account__display-name {
       outline: 1px dotted;
     }
 
+    &:hover {
+      text-decoration: underline;
+    }
+
     .icon {
       width: 15px;
       height: 15px;

From 01ecc8011899949c19a1f58d715eb020bea4f387 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 14 Mar 2024 05:18:31 -0400
Subject: [PATCH 0443/2191] Add module `accounts` route scope in api routes
 (#29582)

---
 config/routes/api.rb | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/config/routes/api.rb b/config/routes/api.rb
index 07340a634063c6..d2d0e3900cfd1a 100644
--- a/config/routes/api.rb
+++ b/config/routes/api.rb
@@ -181,12 +181,14 @@
     end
 
     resources :accounts, only: [:create, :show] do
-      resources :statuses, only: :index, controller: 'accounts/statuses'
-      resources :followers, only: :index, controller: 'accounts/follower_accounts'
-      resources :following, only: :index, controller: 'accounts/following_accounts'
-      resources :lists, only: :index, controller: 'accounts/lists'
-      resources :identity_proofs, only: :index, controller: 'accounts/identity_proofs'
-      resources :featured_tags, only: :index, controller: 'accounts/featured_tags'
+      scope module: :accounts do
+        resources :statuses, only: :index
+        resources :followers, only: :index, controller: :follower_accounts
+        resources :following, only: :index, controller: :following_accounts
+        resources :lists, only: :index
+        resources :identity_proofs, only: :index
+        resources :featured_tags, only: :index
+      end
 
       member do
         post :follow

From 18ffd4d925030a3d3a3826bc7156d3a22a44d78e Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 14 Mar 2024 05:18:36 -0400
Subject: [PATCH 0444/2191] Add module `instances` route scope in api routes
 (#29581)

---
 config/routes/api.rb | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/config/routes/api.rb b/config/routes/api.rb
index d2d0e3900cfd1a..60fb0394e769f3 100644
--- a/config/routes/api.rb
+++ b/config/routes/api.rb
@@ -125,14 +125,16 @@
     end
 
     resource :instance, only: [:show] do
-      resources :peers, only: [:index], controller: 'instances/peers'
-      resources :rules, only: [:index], controller: 'instances/rules'
-      resources :domain_blocks, only: [:index], controller: 'instances/domain_blocks'
-      resource :privacy_policy, only: [:show], controller: 'instances/privacy_policies'
-      resource :extended_description, only: [:show], controller: 'instances/extended_descriptions'
-      resource :translation_languages, only: [:show], controller: 'instances/translation_languages'
-      resource :languages, only: [:show], controller: 'instances/languages'
-      resource :activity, only: [:show], controller: 'instances/activity'
+      scope module: :instances do
+        resources :peers, only: [:index]
+        resources :rules, only: [:index]
+        resources :domain_blocks, only: [:index]
+        resource :privacy_policy, only: [:show]
+        resource :extended_description, only: [:show]
+        resource :translation_languages, only: [:show]
+        resource :languages, only: [:show]
+        resource :activity, only: [:show], controller: :activity
+      end
     end
 
     namespace :peers do

From 65e8349980d2f09eee63c7dde7edb1e5ebc0e5d5 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 14 Mar 2024 05:18:41 -0400
Subject: [PATCH 0445/2191] Clean up `activitypub` module route scope near
 collections/boxes (#29580)

---
 config/routes.rb | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/config/routes.rb b/config/routes.rb
index 2ec7494969fa89..a3e3f368b1087f 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -126,11 +126,13 @@ def redirect_with_vary(path)
     resources :followers, only: [:index], controller: :follower_accounts
     resources :following, only: [:index], controller: :following_accounts
 
-    resource :outbox, only: [:show], module: :activitypub
-    resource :inbox, only: [:create], module: :activitypub
-    resource :claim, only: [:create], module: :activitypub
-    resources :collections, only: [:show], module: :activitypub
-    resource :followers_synchronization, only: [:show], module: :activitypub
+    scope module: :activitypub do
+      resource :outbox, only: [:show]
+      resource :inbox, only: [:create]
+      resource :claim, only: [:create]
+      resources :collections, only: [:show]
+      resource :followers_synchronization, only: [:show]
+    end
   end
 
   resource :inbox, only: [:create], module: :activitypub

From 79e7590578770c906d7a30e6ce7e0b654f725972 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 14 Mar 2024 05:18:46 -0400
Subject: [PATCH 0446/2191] Clean up `activitypub` module route scope near
 instance actor (#29579)

---
 config/routes.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/config/routes.rb b/config/routes.rb
index a3e3f368b1087f..8d658b4de19a0a 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -77,8 +77,10 @@ def redirect_with_vary(path)
   get 'remote_interaction_helper', to: 'remote_interaction_helper#index'
 
   resource :instance_actor, path: 'actor', only: [:show] do
-    resource :inbox, only: [:create], module: :activitypub
-    resource :outbox, only: [:show], module: :activitypub
+    scope module: :activitypub do
+      resource :inbox, only: [:create]
+      resource :outbox, only: [:show]
+    end
   end
 
   get '/invite/:invite_code', constraints: ->(req) { req.format == :json }, to: 'api/v1/invites#show'

From 681a89f684a54f2686324ecfddca250356da338b Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 14 Mar 2024 05:24:00 -0400
Subject: [PATCH 0447/2191] Readability clean up in `ImportVacuum` spec
 (#28955)

---
 spec/lib/vacuum/imports_vacuum_spec.rb | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/spec/lib/vacuum/imports_vacuum_spec.rb b/spec/lib/vacuum/imports_vacuum_spec.rb
index c712b7b9b26712..3a273d827635ac 100644
--- a/spec/lib/vacuum/imports_vacuum_spec.rb
+++ b/spec/lib/vacuum/imports_vacuum_spec.rb
@@ -13,7 +13,26 @@
 
   describe '#perform' do
     it 'cleans up the expected imports' do
-      expect { subject.perform }.to change { BulkImport.pluck(:id) }.from([old_unconfirmed, new_unconfirmed, recent_ongoing, recent_finished, old_finished].map(&:id)).to([new_unconfirmed, recent_ongoing, recent_finished].map(&:id))
+      expect { subject.perform }
+        .to change { ordered_bulk_imports.pluck(:id) }
+        .from(original_import_ids)
+        .to(remaining_import_ids)
+    end
+
+    def ordered_bulk_imports
+      BulkImport.order(id: :asc)
+    end
+
+    def original_import_ids
+      [old_unconfirmed, new_unconfirmed, recent_ongoing, recent_finished, old_finished].map(&:id)
+    end
+
+    def vacuumed_import_ids
+      [old_unconfirmed, old_finished].map(&:id)
+    end
+
+    def remaining_import_ids
+      original_import_ids - vacuumed_import_ids
     end
   end
 end

From 19cbadfbd66be628a9c544debe752f92b293d345 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 14 Mar 2024 05:31:15 -0400
Subject: [PATCH 0448/2191] Use enum-generated scope for `IpBlock` in CLI
 (#28144)

---
 app/models/ip_block.rb        | 2 +-
 app/models/user.rb            | 2 +-
 lib/mastodon/cli/ip_blocks.rb | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/models/ip_block.rb b/app/models/ip_block.rb
index 9def5b0cde1016..d6242efbf7db24 100644
--- a/app/models/ip_block.rb
+++ b/app/models/ip_block.rb
@@ -23,7 +23,7 @@ class IpBlock < ApplicationRecord
     sign_up_requires_approval: 5000,
     sign_up_block: 5500,
     no_access: 9999,
-  }
+  }, prefix: true
 
   validates :ip, :severity, presence: true
   validates :ip, uniqueness: true
diff --git a/app/models/user.rb b/app/models/user.rb
index 14c2bb6e0c82bc..ee9116b9f4555d 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -446,7 +446,7 @@ def wrap_email_confirmation
   end
 
   def sign_up_from_ip_requires_approval?
-    sign_up_ip.present? && IpBlock.sign_up_requires_approval.exists?(['ip >>= ?', sign_up_ip.to_s])
+    sign_up_ip.present? && IpBlock.severity_sign_up_requires_approval.exists?(['ip >>= ?', sign_up_ip.to_s])
   end
 
   def sign_up_email_requires_approval?
diff --git a/lib/mastodon/cli/ip_blocks.rb b/lib/mastodon/cli/ip_blocks.rb
index 100bf7bada587a..3c5fdb275c5105 100644
--- a/lib/mastodon/cli/ip_blocks.rb
+++ b/lib/mastodon/cli/ip_blocks.rb
@@ -105,7 +105,7 @@ def remove(*addresses)
       tools. Only blocks with no_access severity are returned.
     LONG_DESC
     def export
-      IpBlock.where(severity: :no_access).find_each do |ip_block|
+      IpBlock.severity_no_access.find_each do |ip_block|
         case options[:format]
         when 'nginx'
           say "deny #{ip_block.ip}/#{ip_block.ip.prefix};"

From 0bc17a3d48eeed102af3b4d733f0ff8ad2f9f62b Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 14 Mar 2024 05:31:57 -0400
Subject: [PATCH 0449/2191] Use enum-generated `public_visibility` scope on
 Status (#28156)

---
 app/models/concerns/account/statuses_search.rb              | 2 +-
 app/models/concerns/status/search_concern.rb                | 2 +-
 app/models/public_feed.rb                                   | 2 +-
 app/models/status.rb                                        | 1 -
 spec/search/models/concerns/account/statuses_search_spec.rb | 4 ++--
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/models/concerns/account/statuses_search.rb b/app/models/concerns/account/statuses_search.rb
index 334b7145043cc2..93452b78b06ce0 100644
--- a/app/models/concerns/account/statuses_search.rb
+++ b/app/models/concerns/account/statuses_search.rb
@@ -31,7 +31,7 @@ def enqueue_remove_from_public_statuses_index
   def add_to_public_statuses_index!
     return unless Chewy.enabled?
 
-    statuses.without_reblogs.where(visibility: :public).reorder(nil).find_in_batches do |batch|
+    statuses.without_reblogs.public_visibility.reorder(nil).find_in_batches do |batch|
       PublicStatusesIndex.import(batch)
     end
   end
diff --git a/app/models/concerns/status/search_concern.rb b/app/models/concerns/status/search_concern.rb
index c16db8bd8c40aa..3f31b3b6750991 100644
--- a/app/models/concerns/status/search_concern.rb
+++ b/app/models/concerns/status/search_concern.rb
@@ -4,7 +4,7 @@ module Status::SearchConcern
   extend ActiveSupport::Concern
 
   included do
-    scope :indexable, -> { without_reblogs.where(visibility: :public).joins(:account).where(account: { indexable: true }) }
+    scope :indexable, -> { without_reblogs.public_visibility.joins(:account).where(account: { indexable: true }) }
   end
 
   def searchable_by
diff --git a/app/models/public_feed.rb b/app/models/public_feed.rb
index c208d6f6640093..1e2cca4d383832 100644
--- a/app/models/public_feed.rb
+++ b/app/models/public_feed.rb
@@ -61,7 +61,7 @@ def media_only?
   end
 
   def public_scope
-    Status.with_public_visibility.joins(:account).merge(Account.without_suspended.without_silenced)
+    Status.public_visibility.joins(:account).merge(Account.without_suspended.without_silenced)
   end
 
   def local_only_scope
diff --git a/app/models/status.rb b/app/models/status.rb
index 0ec69c8dd14123..a9c0ea70f171f7 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -108,7 +108,6 @@ class Status < ApplicationRecord
   scope :with_accounts, ->(ids) { where(id: ids).includes(:account) }
   scope :without_replies, -> { where('statuses.reply = FALSE OR statuses.in_reply_to_account_id = statuses.account_id') }
   scope :without_reblogs, -> { where(statuses: { reblog_of_id: nil }) }
-  scope :with_public_visibility, -> { where(visibility: :public) }
   scope :tagged_with, ->(tag_ids) { joins(:statuses_tags).where(statuses_tags: { tag_id: tag_ids }) }
   scope :not_excluded_by_account, ->(account) { where.not(account_id: account.excluded_from_timeline_account_ids) }
   scope :not_domain_blocked_by_account, ->(account) { account.excluded_from_timeline_domains.blank? ? left_outer_joins(:account) : left_outer_joins(:account).where('accounts.domain IS NULL OR accounts.domain NOT IN (?)', account.excluded_from_timeline_domains) }
diff --git a/spec/search/models/concerns/account/statuses_search_spec.rb b/spec/search/models/concerns/account/statuses_search_spec.rb
index 915bc094cb5957..a1b0bf405c5133 100644
--- a/spec/search/models/concerns/account/statuses_search_spec.rb
+++ b/spec/search/models/concerns/account/statuses_search_spec.rb
@@ -21,7 +21,7 @@
         account.indexable = true
         account.save!
 
-        expect(PublicStatusesIndex.filter(term: { account_id: account.id }).count).to eq(account.statuses.where(visibility: :public).count)
+        expect(PublicStatusesIndex.filter(term: { account_id: account.id }).count).to eq(account.statuses.public_visibility.count)
         expect(StatusesIndex.filter(term: { account_id: account.id }).count).to eq(account.statuses.count)
       end
     end
@@ -32,7 +32,7 @@
 
     context 'when picking an indexable account' do
       it 'has statuses in the PublicStatusesIndex' do
-        expect(PublicStatusesIndex.filter(term: { account_id: account.id }).count).to eq(account.statuses.where(visibility: :public).count)
+        expect(PublicStatusesIndex.filter(term: { account_id: account.id }).count).to eq(account.statuses.public_visibility.count)
       end
 
       it 'has statuses in the StatusesIndex' do

From 95a5713ff73787bdea8a2d5cb848386bf8c4fe80 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 14 Mar 2024 10:34:36 +0100
Subject: [PATCH 0450/2191] Fix accounts not getting imported into redux store
 for some filtered notification types (#29588)

---
 app/javascript/mastodon/actions/notifications.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/javascript/mastodon/actions/notifications.js b/app/javascript/mastodon/actions/notifications.js
index 30b7601d5df06c..b54cbe27b99ff2 100644
--- a/app/javascript/mastodon/actions/notifications.js
+++ b/app/javascript/mastodon/actions/notifications.js
@@ -552,7 +552,10 @@ export const fetchNotificationsForRequest = accountId => (dispatch, getState) =>
 
   api(getState).get('/api/v1/notifications', { params }).then(response => {
     const next = getLinks(response).refs.find(link => link.rel === 'next');
+    dispatch(importFetchedAccounts(response.data.map(item => item.account)));
     dispatch(importFetchedStatuses(response.data.map(item => item.status).filter(status => !!status)));
+    dispatch(importFetchedAccounts(response.data.filter(item => item.report).map(item => item.report.target_account)));
+
     dispatch(fetchNotificationsForRequestSuccess(response.data, next?.uri));
   }).catch(err => {
     dispatch(fetchNotificationsForRequestFail(err));
@@ -585,7 +588,10 @@ export const expandNotificationsForRequest = () => (dispatch, getState) => {
 
   api(getState).get(url).then(response => {
     const next = getLinks(response).refs.find(link => link.rel === 'next');
+    dispatch(importFetchedAccounts(response.data.map(item => item.account)));
     dispatch(importFetchedStatuses(response.data.map(item => item.status).filter(status => !!status)));
+    dispatch(importFetchedAccounts(response.data.filter(item => item.report).map(item => item.report.target_account)));
+
     dispatch(expandNotificationsForRequestSuccess(response.data, next?.uri));
   }).catch(err => {
     dispatch(expandNotificationsForRequestFail(err));

From 30483d618f94ed85ac90c78ae24fc40349891208 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 14 Mar 2024 11:01:55 +0100
Subject: [PATCH 0451/2191] Fix back button appearing in column header
 unexpectedly in web UI (#29551)

---
 app/javascript/mastodon/components/column_header.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/javascript/mastodon/components/column_header.jsx b/app/javascript/mastodon/components/column_header.jsx
index 8b7dcebc6713c9..7fd646690d2aaa 100644
--- a/app/javascript/mastodon/components/column_header.jsx
+++ b/app/javascript/mastodon/components/column_header.jsx
@@ -199,7 +199,7 @@ class ColumnHeader extends PureComponent {
         <h1 className={buttonClassName}>
           {hasTitle && (
             <>
-              {backButton}
+              {showBackButton && backButton}
 
               <button onClick={this.handleTitleClick} className='column-header__title'>
                 {!showBackButton && <Icon id={icon} icon={iconComponent} className='column-header__icon' />}
@@ -208,7 +208,7 @@ class ColumnHeader extends PureComponent {
             </>
           )}
 
-          {!hasTitle && backButton}
+          {!hasTitle && showBackButton && backButton}
 
           <div className='column-header__buttons'>
             {extraButton}

From 049d9171ebeb8af02f89f24df982a2ce4c638015 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 14 Mar 2024 06:03:38 -0400
Subject: [PATCH 0452/2191] Use `with_options` for shared option in
 `accounts#show` routing block (#28914)

---
 config/routes.rb | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/config/routes.rb b/config/routes.rb
index 8d658b4de19a0a..55f2de6a14cb28 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -142,10 +142,12 @@ def redirect_with_vary(path)
   get '/:encoded_at(*path)', to: redirect("/@%{path}"), constraints: { encoded_at: /%40/ }
 
   constraints(username: %r{[^@/.]+}) do
-    get '/@:username', to: 'accounts#show', as: :short_account
-    get '/@:username/with_replies', to: 'accounts#show', as: :short_account_with_replies
-    get '/@:username/media', to: 'accounts#show', as: :short_account_media
-    get '/@:username/tagged/:tag', to: 'accounts#show', as: :short_account_tag
+    with_options to: 'accounts#show' do
+      get '/@:username', as: :short_account
+      get '/@:username/with_replies', as: :short_account_with_replies
+      get '/@:username/media', as: :short_account_media
+      get '/@:username/tagged/:tag', as: :short_account_tag
+    end
   end
 
   constraints(account_username: %r{[^@/.]+}) do

From 14aa7f1e15f4bbd0439f2dff1c6dcddd3a8131e5 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 14 Mar 2024 09:19:20 -0400
Subject: [PATCH 0453/2191] Use `Account.activitypub` generated scope (#28157)

---
 app/models/account.rb        | 2 +-
 lib/mastodon/cli/accounts.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/account.rb b/app/models/account.rb
index 0a4c0f34788f9a..322a29248eca40 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -442,7 +442,7 @@ def readonly_attributes
     end
 
     def inboxes
-      urls = reorder(nil).where(protocol: :activitypub).group(:preferred_inbox_url).pluck(Arel.sql("coalesce(nullif(accounts.shared_inbox_url, ''), accounts.inbox_url) AS preferred_inbox_url"))
+      urls = reorder(nil).activitypub.group(:preferred_inbox_url).pluck(Arel.sql("coalesce(nullif(accounts.shared_inbox_url, ''), accounts.inbox_url) AS preferred_inbox_url"))
       DeliveryFailureTracker.without_unavailable(urls)
     end
 
diff --git a/lib/mastodon/cli/accounts.rb b/lib/mastodon/cli/accounts.rb
index b5308e2b7625ac..d3b7ebe5805709 100644
--- a/lib/mastodon/cli/accounts.rb
+++ b/lib/mastodon/cli/accounts.rb
@@ -295,7 +295,7 @@ def cull(*domains)
       skip_threshold = 7.days.ago
       skip_domains   = Concurrent::Set.new
 
-      query = Account.remote.where(protocol: :activitypub)
+      query = Account.remote.activitypub
       query = query.where(domain: domains) unless domains.empty?
 
       processed, culled = parallelize_with_progress(query.partitioned) do |account|

From 974c7672e57ada0142db1abec12c2a9e5da1cdcc Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 14 Mar 2024 09:42:59 -0400
Subject: [PATCH 0454/2191] Extract shared behavior methods in oauth feature
 spec (#28360)

---
 spec/features/oauth_spec.rb | 57 ++++++++++++++++---------------------
 1 file changed, 25 insertions(+), 32 deletions(-)

diff --git a/spec/features/oauth_spec.rb b/spec/features/oauth_spec.rb
index 70356784d2c831..720c262890d5db 100644
--- a/spec/features/oauth_spec.rb
+++ b/spec/features/oauth_spec.rb
@@ -61,15 +61,11 @@
       expect(page).to have_content(I18n.t('auth.login'))
 
       # Failing to log-in presents the form again
-      fill_in 'user_email', with: email
-      fill_in 'user_password', with: 'wrong password'
-      click_on I18n.t('auth.login')
+      fill_in_auth_details(email, 'wrong password')
       expect(page).to have_content(I18n.t('auth.login'))
 
       # Logging in redirects to an authorization page
-      fill_in 'user_email', with: email
-      fill_in 'user_password', with: password
-      click_on I18n.t('auth.login')
+      fill_in_auth_details(email, password)
       expect(page).to have_content(I18n.t('doorkeeper.authorizations.buttons.authorize'))
 
       # Upon authorizing, it redirects to the apps' callback URL
@@ -88,15 +84,11 @@
       expect(page).to have_content(I18n.t('auth.login'))
 
       # Failing to log-in presents the form again
-      fill_in 'user_email', with: email
-      fill_in 'user_password', with: 'wrong password'
-      click_on I18n.t('auth.login')
+      fill_in_auth_details(email, 'wrong password')
       expect(page).to have_content(I18n.t('auth.login'))
 
       # Logging in redirects to an authorization page
-      fill_in 'user_email', with: email
-      fill_in 'user_password', with: password
-      click_on I18n.t('auth.login')
+      fill_in_auth_details(email, password)
       expect(page).to have_content(I18n.t('doorkeeper.authorizations.buttons.authorize'))
 
       # Upon denying, it redirects to the apps' callback URL
@@ -118,25 +110,19 @@
         expect(page).to have_content(I18n.t('auth.login'))
 
         # Failing to log-in presents the form again
-        fill_in 'user_email', with: email
-        fill_in 'user_password', with: 'wrong password'
-        click_on I18n.t('auth.login')
+        fill_in_auth_details(email, 'wrong password')
         expect(page).to have_content(I18n.t('auth.login'))
 
         # Logging in redirects to a two-factor authentication page
-        fill_in 'user_email', with: email
-        fill_in 'user_password', with: password
-        click_on I18n.t('auth.login')
+        fill_in_auth_details(email, password)
         expect(page).to have_content(I18n.t('simple_form.hints.sessions.otp'))
 
         # Filling in an incorrect two-factor authentication code presents the form again
-        fill_in 'user_otp_attempt', with: 'wrong'
-        click_on I18n.t('auth.login')
+        fill_in_otp_details('wrong')
         expect(page).to have_content(I18n.t('simple_form.hints.sessions.otp'))
 
         # Filling in the correct TOTP code redirects to an app authorization page
-        fill_in 'user_otp_attempt', with: user.current_otp
-        click_on I18n.t('auth.login')
+        fill_in_otp_details(user.current_otp)
         expect(page).to have_content(I18n.t('doorkeeper.authorizations.buttons.authorize'))
 
         # Upon authorizing, it redirects to the apps' callback URL
@@ -155,25 +141,19 @@
         expect(page).to have_content(I18n.t('auth.login'))
 
         # Failing to log-in presents the form again
-        fill_in 'user_email', with: email
-        fill_in 'user_password', with: 'wrong password'
-        click_on I18n.t('auth.login')
+        fill_in_auth_details(email, 'wrong password')
         expect(page).to have_content(I18n.t('auth.login'))
 
         # Logging in redirects to a two-factor authentication page
-        fill_in 'user_email', with: email
-        fill_in 'user_password', with: password
-        click_on I18n.t('auth.login')
+        fill_in_auth_details(email, password)
         expect(page).to have_content(I18n.t('simple_form.hints.sessions.otp'))
 
         # Filling in an incorrect two-factor authentication code presents the form again
-        fill_in 'user_otp_attempt', with: 'wrong'
-        click_on I18n.t('auth.login')
+        fill_in_otp_details('wrong')
         expect(page).to have_content(I18n.t('simple_form.hints.sessions.otp'))
 
         # Filling in the correct TOTP code redirects to an app authorization page
-        fill_in 'user_otp_attempt', with: user.current_otp
-        click_on I18n.t('auth.login')
+        fill_in_otp_details(user.current_otp)
         expect(page).to have_content(I18n.t('doorkeeper.authorizations.buttons.authorize'))
 
         # Upon denying, it redirects to the apps' callback URL
@@ -185,6 +165,19 @@
       end
     end
 
+    private
+
+    def fill_in_auth_details(email, password)
+      fill_in 'user_email', with: email
+      fill_in 'user_password', with: password
+      click_on I18n.t('auth.login')
+    end
+
+    def fill_in_otp_details(value)
+      fill_in 'user_otp_attempt', with: value
+      click_on I18n.t('auth.login')
+    end
+
     # TODO: external auth
   end
 end

From 6c3e718b863c086f2df4152548531d91073ca087 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 14 Mar 2024 09:56:59 -0400
Subject: [PATCH 0455/2191] Remove setting of `sensitive` value (default false,
 not null) in Status model (#29589)

---
 app/models/status.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/models/status.rb b/app/models/status.rb
index a9c0ea70f171f7..c8effd3da7c698 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -442,7 +442,6 @@ def set_poll_id
   def set_visibility
     self.visibility = reblog.visibility if reblog? && visibility.nil?
     self.visibility = (account.locked? ? :private : :public) if visibility.nil?
-    self.sensitive  = false if sensitive.nil?
   end
 
   def set_conversation

From df6086d4027910fb160d531b4fe7ffdec26b0cd7 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 14 Mar 2024 11:22:52 -0400
Subject: [PATCH 0456/2191] Extract file size sql calc from media storage cli
 (#29577)

---
 lib/mastodon/cli/media.rb | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/lib/mastodon/cli/media.rb b/lib/mastodon/cli/media.rb
index ac8f219807284c..e26b4f24afa272 100644
--- a/lib/mastodon/cli/media.rb
+++ b/lib/mastodon/cli/media.rb
@@ -277,7 +277,7 @@ def refresh
 
     desc 'usage', 'Calculate disk space consumed by Mastodon'
     def usage
-      say("Attachments:\t#{number_to_human_size(MediaAttachment.sum(Arel.sql('COALESCE(file_file_size, 0) + COALESCE(thumbnail_file_size, 0)')))} (#{number_to_human_size(MediaAttachment.where(account: Account.local).sum(Arel.sql('COALESCE(file_file_size, 0) + COALESCE(thumbnail_file_size, 0)')))} local)")
+      say("Attachments:\t#{number_to_human_size(media_attachment_storage_size)} (#{number_to_human_size(local_media_attachment_storage_size)} local)")
       say("Custom emoji:\t#{number_to_human_size(CustomEmoji.sum(:image_file_size))} (#{number_to_human_size(CustomEmoji.local.sum(:image_file_size))} local)")
       say("Preview cards:\t#{number_to_human_size(PreviewCard.sum(:image_file_size))}")
       say("Avatars:\t#{number_to_human_size(Account.sum(:avatar_file_size))} (#{number_to_human_size(Account.local.sum(:avatar_file_size))} local)")
@@ -317,6 +317,22 @@ def lookup(url)
 
     private
 
+    def media_attachment_storage_size
+      MediaAttachment.sum(file_and_thumbnail_size_sql)
+    end
+
+    def local_media_attachment_storage_size
+      MediaAttachment.where(account: Account.local).sum(file_and_thumbnail_size_sql)
+    end
+
+    def file_and_thumbnail_size_sql
+      Arel.sql(
+        <<~SQL.squish
+          COALESCE(file_file_size, 0) + COALESCE(thumbnail_file_size, 0)
+        SQL
+      )
+    end
+
     PRELOAD_MODEL_WHITELIST = %w(
       Account
       Backup

From 88f477749c39b59d489fff27dae45aa39c3b83bb Mon Sep 17 00:00:00 2001
From: mogaminsk <mgmnjp@icloud.com>
Date: Thu, 14 Mar 2024 17:58:44 +0900
Subject: [PATCH 0457/2191] [Glitch] Use sender's `username` to column title in
 notification request if it's `display_name` is not set

Port 3156d04ec12294b4b211b191b22d245e18aba024 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/features/notifications/request.jsx          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/flavours/glitch/features/notifications/request.jsx b/app/javascript/flavours/glitch/features/notifications/request.jsx
index 4aca0af7f6b1d2..ea13a2ed6fe31e 100644
--- a/app/javascript/flavours/glitch/features/notifications/request.jsx
+++ b/app/javascript/flavours/glitch/features/notifications/request.jsx
@@ -88,7 +88,7 @@ export const NotificationRequest = ({ multiColumn, params: { id } }) => {
     }
   }, [dispatch, accountId]);
 
-  const columnTitle = intl.formatMessage(messages.title, { name: account?.get('display_name') });
+  const columnTitle = intl.formatMessage(messages.title, { name: account?.get('display_name') || account?.get('username') });
 
   return (
     <Column bindToDocument={!multiColumn} ref={columnRef} label={columnTitle}>

From 042d17ddf1196048882638e8feb2eecf0285a4cb Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 14 Mar 2024 10:07:29 +0100
Subject: [PATCH 0458/2191] [Glitch] Fix wrong background color on search
 results in web UI

Port 1e1d97a78727570bb3343aa4008b93edae3dde1d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../compose/components/search_results.jsx     |  6 -----
 .../flavours/glitch/styles/components.scss    | 23 +++++--------------
 .../flavours/glitch/styles/variables.scss     |  1 +
 3 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/app/javascript/flavours/glitch/features/compose/components/search_results.jsx b/app/javascript/flavours/glitch/features/compose/components/search_results.jsx
index b759eac90b25de..3df025db558e7e 100644
--- a/app/javascript/flavours/glitch/features/compose/components/search_results.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/search_results.jsx
@@ -7,7 +7,6 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
 
 import FindInPageIcon from '@/material-icons/400-24px/find_in_page.svg?react';
 import PeopleIcon from '@/material-icons/400-24px/group.svg?react';
-import SearchIcon from '@/material-icons/400-24px/search.svg?react';
 import TagIcon from '@/material-icons/400-24px/tag.svg?react';
 import { Icon }  from 'flavours/glitch/components/icon';
 import { LoadMore } from 'flavours/glitch/components/load_more';
@@ -76,11 +75,6 @@ class SearchResults extends ImmutablePureComponent {
 
     return (
       <div className='search-results'>
-        <div className='search-results__header'>
-          <Icon id='search' icon={SearchIcon} />
-          <FormattedMessage id='explore.search_results' defaultMessage='Search results' />
-        </div>
-
         {accounts}
         {hashtags}
         {statuses}
diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index 7b4bc0678498c9..9befdb62249e43 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -3699,7 +3699,7 @@ $ui-header-height: 55px;
 }
 
 .column-subheading {
-  background: darken($ui-base-color, 4%);
+  background: var(--surface-background-color);
   color: $darker-text-color;
   padding: 8px 20px;
   font-size: 12px;
@@ -5023,7 +5023,7 @@ a.status-card {
 }
 
 .follow_requests-unlocked_explanation {
-  background: darken($ui-base-color, 4%);
+  background: var(--surface-background-color);
   border-bottom: 1px solid var(--background-border-color);
   contain: initial;
   flex-grow: 0;
@@ -5767,18 +5767,6 @@ a.status-card {
   }
 }
 
-.search-results__header {
-  color: $dark-text-color;
-  background: lighten($ui-base-color, 2%);
-  padding: 15px;
-  font-weight: 500;
-  font-size: 16px;
-  cursor: default;
-  display: flex;
-  align-items: center;
-  gap: 5px;
-}
-
 .search-results__section {
   border-bottom: 1px solid var(--background-border-color);
 
@@ -5787,8 +5775,8 @@ a.status-card {
   }
 
   &__header {
-    background: darken($ui-base-color, 4%);
     border-bottom: 1px solid var(--background-border-color);
+    background: var(--surface-background-color);
     padding: 15px;
     font-weight: 500;
     font-size: 14px;
@@ -7740,7 +7728,7 @@ noscript {
 .follow-request-banner,
 .account-memorial-banner {
   padding: 20px;
-  background: lighten($ui-base-color, 4%);
+  background: var(--surface-background-color);
   display: flex;
   align-items: center;
   flex-direction: column;
@@ -8914,7 +8902,8 @@ noscript {
   flex: 1 1 auto;
   display: flex;
   flex-direction: column;
-  background: $ui-base-color;
+  border: 1px solid var(--background-border-color);
+  border-top: 0;
   border-bottom-left-radius: 4px;
   border-bottom-right-radius: 4px;
 }
diff --git a/app/javascript/flavours/glitch/styles/variables.scss b/app/javascript/flavours/glitch/styles/variables.scss
index b96699abdaee06..70bd86d33cba81 100644
--- a/app/javascript/flavours/glitch/styles/variables.scss
+++ b/app/javascript/flavours/glitch/styles/variables.scss
@@ -110,4 +110,5 @@ $dismiss-overlay-width: 4rem;
   --background-filter: blur(10px) saturate(180%) contrast(75%) brightness(70%);
   --background-color: #{darken($ui-base-color, 8%)};
   --background-color-tint: #{rgba(darken($ui-base-color, 8%), 0.9)};
+  --surface-background-color: #{darken($ui-base-color, 4%)};
 }

From 4b2a935c4afffa107a04504dda7d57eb86c1e119 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 14 Mar 2024 10:18:24 +0100
Subject: [PATCH 0459/2191] [Glitch] Change design of metadata underneath posts
 in web UI

Port 4991198b703f5020ab136062fe7d5ef44e8f0aec to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../components/edited_timestamp/index.jsx     |  4 +-
 .../status/components/detailed_status.jsx     | 76 +++++++++----------
 .../flavours/glitch/styles/components.scss    | 45 ++++++-----
 3 files changed, 63 insertions(+), 62 deletions(-)

diff --git a/app/javascript/flavours/glitch/components/edited_timestamp/index.jsx b/app/javascript/flavours/glitch/components/edited_timestamp/index.jsx
index 5a16f6753086b4..0849c069d150ba 100644
--- a/app/javascript/flavours/glitch/components/edited_timestamp/index.jsx
+++ b/app/javascript/flavours/glitch/components/edited_timestamp/index.jsx
@@ -5,9 +5,7 @@ import { FormattedMessage, injectIntl } from 'react-intl';
 
 import { connect } from 'react-redux';
 
-import ArrowDropDownIcon from '@/material-icons/400-24px/arrow_drop_down.svg?react';
 import { openModal } from 'flavours/glitch/actions/modal';
-import { Icon }  from 'flavours/glitch/components/icon';
 import InlineAccount from 'flavours/glitch/components/inline_account';
 import { RelativeTimestamp } from 'flavours/glitch/components/relative_timestamp';
 
@@ -67,7 +65,7 @@ class EditedTimestamp extends PureComponent {
     return (
       <DropdownMenu statusId={statusId} renderItem={this.renderItem} scrollable renderHeader={this.renderHeader} onItemClick={this.handleItemClick}>
         <button className='dropdown-menu__text-button'>
-          <FormattedMessage id='status.edited' defaultMessage='Edited {date}' values={{ date: intl.formatDate(timestamp, { month: 'short', day: '2-digit', hour: '2-digit', minute: '2-digit' }) }} /> <Icon id='caret-down' icon={ArrowDropDownIcon} />
+          <FormattedMessage id='status.edited' defaultMessage='Edited {date}' values={{ date: <span className='animated-number'>{intl.formatDate(timestamp, { month: 'short', day: '2-digit', hour: '2-digit', minute: '2-digit' })}</span> }} />
         </button>
       </DropdownMenu>
     );
diff --git a/app/javascript/flavours/glitch/features/status/components/detailed_status.jsx b/app/javascript/flavours/glitch/features/status/components/detailed_status.jsx
index 2a3ab7001b9832..31d90dd8159687 100644
--- a/app/javascript/flavours/glitch/features/status/components/detailed_status.jsx
+++ b/app/javascript/flavours/glitch/features/status/components/detailed_status.jsx
@@ -1,6 +1,6 @@
 import PropTypes from 'prop-types';
 
-import { FormattedDate } from 'react-intl';
+import { FormattedDate, FormattedMessage } from 'react-intl';
 
 import classNames from 'classnames';
 import { Link, withRouter } from 'react-router-dom';
@@ -8,14 +8,10 @@ import { Link, withRouter } from 'react-router-dom';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-
-import RepeatIcon from '@/material-icons/400-24px/repeat.svg?react';
-import StarIcon from '@/material-icons/400-24px/star-fill.svg?react';
 import { AnimatedNumber } from 'flavours/glitch/components/animated_number';
 import AttachmentList from 'flavours/glitch/components/attachment_list';
 import EditedTimestamp from 'flavours/glitch/components/edited_timestamp';
 import { getHashtagBarForStatus } from 'flavours/glitch/components/hashtag_bar';
-import { Icon }  from 'flavours/glitch/components/icon';
 import PictureInPicturePlaceholder from 'flavours/glitch/components/picture_in_picture_placeholder';
 import { VisibilityIcon } from 'flavours/glitch/components/visibility_icon';
 import PollContainer from 'flavours/glitch/containers/poll_container';
@@ -133,10 +129,7 @@ class DetailedStatus extends ImmutablePureComponent {
 
     let applicationLink = '';
     let reblogLink = '';
-    const reblogIcon = 'retweet';
-    const reblogIconComponent = RepeatIcon;
     let favouriteLink = '';
-    let edited = '';
 
     //  Depending on user settings, some media are considered as parts of the
     //  contents (affected by CW) while other will be displayed outside of the
@@ -239,68 +232,53 @@ class DetailedStatus extends ImmutablePureComponent {
     }
 
     if (status.get('application')) {
-      applicationLink = <> · <a className='detailed-status__application' href={status.getIn(['application', 'website'])} target='_blank' rel='noopener noreferrer'>{status.getIn(['application', 'name'])}</a></>;
+      applicationLink = <>·<a className='detailed-status__application' href={status.getIn(['application', 'website'])} target='_blank' rel='noopener noreferrer'>{status.getIn(['application', 'name'])}</a></>;
     }
 
-    const visibilityLink = <> · <VisibilityIcon visibility={status.get('visibility')} /></>;
+    const visibilityLink = <>·<VisibilityIcon visibility={status.get('visibility')} /></>;
 
     if (!['unlisted', 'public'].includes(status.get('visibility'))) {
       reblogLink = null;
     } else if (this.props.history) {
       reblogLink = (
-        <>
-          {' · '}
-          <Link to={`/@${status.getIn(['account', 'acct'])}/${status.get('id')}/reblogs`} className='detailed-status__link'>
-            <Icon id={reblogIcon} icon={reblogIconComponent} />
-            <span className='detailed-status__reblogs'>
-              <AnimatedNumber value={status.get('reblogs_count')} />
-            </span>
-          </Link>
-        </>
+        <Link to={`/@${status.getIn(['account', 'acct'])}/${status.get('id')}/reblogs`} className='detailed-status__link'>
+          <span className='detailed-status__reblogs'>
+            <AnimatedNumber value={status.get('reblogs_count')} />
+          </span>
+          <FormattedMessage id='status.reblogs' defaultMessage='{count, plural, one {boost} other {boosts}}' values={{ count: status.get('reblogs_count') }} />
+        </Link>
       );
     } else {
       reblogLink = (
-        <>
-          {' · '}
-          <a href={`/interact/${status.get('id')}?type=reblog`} className='detailed-status__link' onClick={this.handleModalLink}>
-            <Icon id={reblogIcon} icon={reblogIconComponent} />
-            <span className='detailed-status__reblogs'>
-              <AnimatedNumber value={status.get('reblogs_count')} />
-            </span>
-          </a>
-        </>
+        <a href={`/interact/${status.get('id')}?type=reblog`} className='detailed-status__link' onClick={this.handleModalLink}>
+          <span className='detailed-status__reblogs'>
+            <AnimatedNumber value={status.get('reblogs_count')} />
+          </span>
+          <FormattedMessage id='status.reblogs' defaultMessage='{count, plural, one {boost} other {boosts}}' values={{ count: status.get('reblogs_count') }} />
+        </a>
       );
     }
 
     if (this.props.history) {
       favouriteLink = (
         <Link to={`/@${status.getIn(['account', 'acct'])}/${status.get('id')}/favourites`} className='detailed-status__link'>
-          <Icon id='star' icon={StarIcon} />
           <span className='detailed-status__favorites'>
             <AnimatedNumber value={status.get('favourites_count')} />
           </span>
+          <FormattedMessage id='status.favourites' defaultMessage='{count, plural, one {favorite} other {favorites}}' values={{ count: status.get('favourites_count') }} />
         </Link>
       );
     } else {
       favouriteLink = (
         <a href={`/interact/${status.get('id')}?type=favourite`} className='detailed-status__link' onClick={this.handleModalLink}>
-          <Icon id='star' icon={StarIcon} />
           <span className='detailed-status__favorites'>
             <AnimatedNumber value={status.get('favourites_count')} />
           </span>
+          <FormattedMessage id='status.favourites' defaultMessage='{count, plural, one {favorite} other {favorites}}' values={{ count: status.get('favourites_count') }} />
         </a>
       );
     }
 
-    if (status.get('edited_at')) {
-      edited = (
-        <>
-          {' · '}
-          <EditedTimestamp statusId={status.get('id')} timestamp={status.get('edited_at')} />
-        </>
-      );
-    }
-
     const {statusContentProps, hashtagBar} = getHashtagBarForStatus(status);
     contentMedia.push(hashtagBar);
 
@@ -330,9 +308,23 @@ class DetailedStatus extends ImmutablePureComponent {
           />
 
           <div className='detailed-status__meta'>
-            <a className='detailed-status__datetime' href={status.get('url')} target='_blank' rel='noopener noreferrer'>
-              <FormattedDate value={new Date(status.get('created_at'))} year='numeric' month='short' day='2-digit' hour='2-digit' minute='2-digit' />
-            </a>{edited}{visibilityLink}{applicationLink}{reblogLink} · {favouriteLink}
+            <div className='detailed-status__meta__line'>
+              <a className='detailed-status__datetime' href={status.get('url')} target='_blank' rel='noopener noreferrer'>
+                <FormattedDate value={new Date(status.get('created_at'))} year='numeric' month='short' day='2-digit' hour='2-digit' minute='2-digit' />
+              </a>
+
+              {visibilityLink}
+
+              {applicationLink}
+            </div>
+
+            {status.get('edited_at') && <div className='detailed-status__meta__line'><EditedTimestamp statusId={status.get('id')} timestamp={status.get('edited_at')} /></div>}
+
+            <div className='detailed-status__meta__line'>
+              {reblogLink}
+              ·
+              {favouriteLink}
+            </div>
           </div>
         </div>
       </div>
diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index 9befdb62249e43..6c4b6649b27462 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -1871,15 +1871,35 @@ body > [data-popper-placement] {
 }
 
 .detailed-status__meta {
-  margin-top: 16px;
+  margin-top: 24px;
   color: $dark-text-color;
   font-size: 14px;
   line-height: 18px;
 
+  &__line {
+    border-bottom: 1px solid var(--background-border-color);
+    padding: 8px 0;
+    display: flex;
+    align-items: center;
+    gap: 8px;
+
+    &:first-child {
+      padding-top: 0;
+    }
+
+    &:last-child {
+      padding-bottom: 0;
+      border-bottom: 0;
+    }
+  }
+
   .icon {
-    width: 15px;
-    height: 15px;
-    vertical-align: middle;
+    width: 18px;
+    height: 18px;
+  }
+
+  .animated-number {
+    color: $secondary-text-color;
   }
 }
 
@@ -1923,19 +1943,6 @@ body > [data-popper-placement] {
   color: inherit;
   text-decoration: none;
   gap: 6px;
-  position: relative;
-  top: 0.145em;
-
-  .icon {
-    top: 0;
-  }
-}
-
-.detailed-status__favorites,
-.detailed-status__reblogs {
-  font-weight: 500;
-  font-size: 12px;
-  line-height: 18px;
 }
 
 .domain {
@@ -2506,6 +2513,10 @@ a.account__display-name {
       outline: 1px dotted;
     }
 
+    &:hover {
+      text-decoration: underline;
+    }
+
     .icon {
       width: 15px;
       height: 15px;

From 84c7b272e1b74290bf85e26d7cf3c620bf3eddf8 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 14 Mar 2024 10:34:36 +0100
Subject: [PATCH 0460/2191] [Glitch] Fix accounts not getting imported into
 redux store for some filtered notification types

Port 95a5713ff73787bdea8a2d5cb848386bf8c4fe80 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/actions/notifications.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/javascript/flavours/glitch/actions/notifications.js b/app/javascript/flavours/glitch/actions/notifications.js
index d5f7477f689866..5b274ff94c2e75 100644
--- a/app/javascript/flavours/glitch/actions/notifications.js
+++ b/app/javascript/flavours/glitch/actions/notifications.js
@@ -640,7 +640,10 @@ export const fetchNotificationsForRequest = accountId => (dispatch, getState) =>
 
   api(getState).get('/api/v1/notifications', { params }).then(response => {
     const next = getLinks(response).refs.find(link => link.rel === 'next');
+    dispatch(importFetchedAccounts(response.data.map(item => item.account)));
     dispatch(importFetchedStatuses(response.data.map(item => item.status).filter(status => !!status)));
+    dispatch(importFetchedAccounts(response.data.filter(item => item.report).map(item => item.report.target_account)));
+
     dispatch(fetchNotificationsForRequestSuccess(response.data, next?.uri));
   }).catch(err => {
     dispatch(fetchNotificationsForRequestFail(err));
@@ -673,7 +676,10 @@ export const expandNotificationsForRequest = () => (dispatch, getState) => {
 
   api(getState).get(url).then(response => {
     const next = getLinks(response).refs.find(link => link.rel === 'next');
+    dispatch(importFetchedAccounts(response.data.map(item => item.account)));
     dispatch(importFetchedStatuses(response.data.map(item => item.status).filter(status => !!status)));
+    dispatch(importFetchedAccounts(response.data.filter(item => item.report).map(item => item.report.target_account)));
+
     dispatch(expandNotificationsForRequestSuccess(response.data, next?.uri));
   }).catch(err => {
     dispatch(expandNotificationsForRequestFail(err));

From 000a900d3b212f24ee226174fad9c95a1a47e349 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 14 Mar 2024 11:01:55 +0100
Subject: [PATCH 0461/2191] [Glitch] Fix back button appearing in column header
 unexpectedly in web UI

Port 30483d618f94ed85ac90c78ae24fc40349891208 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/components/column_header.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/javascript/flavours/glitch/components/column_header.jsx b/app/javascript/flavours/glitch/components/column_header.jsx
index 22e73f5211b31c..c2524b6dd9e9bf 100644
--- a/app/javascript/flavours/glitch/components/column_header.jsx
+++ b/app/javascript/flavours/glitch/components/column_header.jsx
@@ -199,7 +199,7 @@ class ColumnHeader extends PureComponent {
         <h1 className={buttonClassName}>
           {hasTitle && (
             <>
-              {backButton}
+              {showBackButton && backButton}
 
               <button onClick={this.handleTitleClick} className='column-header__title'>
                 {!showBackButton && <Icon id={icon} icon={iconComponent} className='column-header__icon' />}
@@ -208,7 +208,7 @@ class ColumnHeader extends PureComponent {
             </>
           )}
 
-          {!hasTitle && backButton}
+          {!hasTitle && showBackButton && backButton}
 
           <div className='column-header__buttons'>
             {extraButton}

From d39d6255613b146a8a68d0873afa8180fba8dfc7 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 14 Mar 2024 17:21:01 -0400
Subject: [PATCH 0462/2191] Use inclusive range in `ActivityTracker#get`
 (#29413)

---
 app/lib/activity_tracker.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/lib/activity_tracker.rb b/app/lib/activity_tracker.rb
index 9160ef22a69229..d0e675f07d2cda 100644
--- a/app/lib/activity_tracker.rb
+++ b/app/lib/activity_tracker.rb
@@ -24,7 +24,7 @@ def add(value = 1, at_time = Time.now.utc)
   end
 
   def get(start_at, end_at = Time.now.utc)
-    (start_at.to_date...end_at.to_date).map do |date|
+    (start_at.to_date..end_at.to_date).map do |date|
       key = key_at(date.to_time(:utc))
 
       value = case @type

From 838b0bdf2dfb167b80f121e37fbb1bf66ee1ad0f Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 15 Mar 2024 05:00:26 -0400
Subject: [PATCH 0463/2191] Remove unused `Account::Interactions#endorsed?`
 method (#29463)

---
 app/models/concerns/account/interactions.rb | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app/models/concerns/account/interactions.rb b/app/models/concerns/account/interactions.rb
index 0ed0dc060b3b68..85363febfb2a43 100644
--- a/app/models/concerns/account/interactions.rb
+++ b/app/models/concerns/account/interactions.rb
@@ -242,10 +242,6 @@ def pinned?(status)
     status_pins.exists?(status: status)
   end
 
-  def endorsed?(account)
-    account_pins.exists?(target_account: account)
-  end
-
   def status_matches_filters(status)
     active_filters = CustomFilter.cached_filters_for(id)
     CustomFilter.apply_cached_filters(active_filters, status)

From e75b55a6d7acabe0d70eac96ff773ac1ca681855 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 15 Mar 2024 05:31:25 -0400
Subject: [PATCH 0464/2191] Extract target account on list method in bulk
 import row service spec (#29601)

---
 spec/services/bulk_import_row_service_spec.rb | 23 +++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/spec/services/bulk_import_row_service_spec.rb b/spec/services/bulk_import_row_service_spec.rb
index a77acc073212a3..d295c280676f89 100644
--- a/spec/services/bulk_import_row_service_spec.rb
+++ b/spec/services/bulk_import_row_service_spec.rb
@@ -110,7 +110,7 @@
           end
 
           it 'adds the target account to the list' do
-            expect { subject.call(import_row) }.to change { ListAccount.joins(:list).exists?(account_id: target_account.id, list: { title: 'my list' }) }.from(false).to(true)
+            expect { subject.call(import_row) }.to add_target_account_to_list
           end
         end
 
@@ -124,7 +124,7 @@
           end
 
           it 'adds the target account to the list' do
-            expect { subject.call(import_row) }.to change { ListAccount.joins(:list).exists?(account_id: target_account.id, list: { title: 'my list' }) }.from(false).to(true)
+            expect { subject.call(import_row) }.to add_target_account_to_list
           end
         end
 
@@ -134,7 +134,7 @@
           end
 
           it 'adds the target account to the list' do
-            expect { subject.call(import_row) }.to change { ListAccount.joins(:list).exists?(account_id: target_account.id, list: { title: 'my list' }) }.from(false).to(true)
+            expect { subject.call(import_row) }.to add_target_account_to_list
           end
         end
 
@@ -146,9 +146,24 @@
           end
 
           it 'adds the target account to the list' do
-            expect { subject.call(import_row) }.to change { ListAccount.joins(:list).exists?(account_id: target_account.id, list: { title: 'my list' }) }.from(false).to(true)
+            expect { subject.call(import_row) }.to add_target_account_to_list
           end
         end
+
+        def add_target_account_to_list
+          change { target_account_on_list? }
+            .from(false)
+            .to(true)
+        end
+
+        def target_account_on_list?
+          ListAccount
+            .joins(:list)
+            .exists?(
+              account_id: target_account.id,
+              list: { title: 'my list' }
+            )
+        end
       end
 
       context 'when the list does not exist yet' do

From 6865fda5938c730ad750be20f8338daf0d678437 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 15 Mar 2024 11:02:10 +0100
Subject: [PATCH 0465/2191] New Crowdin Translations (automated) (#29603)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/an.json      |  1 -
 app/javascript/mastodon/locales/ar.json      |  1 -
 app/javascript/mastodon/locales/ast.json     |  1 -
 app/javascript/mastodon/locales/be.json      |  4 +-
 app/javascript/mastodon/locales/bg.json      |  1 -
 app/javascript/mastodon/locales/br.json      |  2 +-
 app/javascript/mastodon/locales/ca.json      |  1 -
 app/javascript/mastodon/locales/ckb.json     |  1 -
 app/javascript/mastodon/locales/cs.json      |  1 -
 app/javascript/mastodon/locales/cy.json      |  1 -
 app/javascript/mastodon/locales/da.json      |  4 +-
 app/javascript/mastodon/locales/de.json      |  4 +-
 app/javascript/mastodon/locales/el.json      |  1 -
 app/javascript/mastodon/locales/en-GB.json   |  1 -
 app/javascript/mastodon/locales/eo.json      |  1 -
 app/javascript/mastodon/locales/es-AR.json   |  4 +-
 app/javascript/mastodon/locales/es-MX.json   |  4 +-
 app/javascript/mastodon/locales/es.json      | 12 +++---
 app/javascript/mastodon/locales/et.json      |  1 -
 app/javascript/mastodon/locales/eu.json      |  4 +-
 app/javascript/mastodon/locales/fa.json      |  1 -
 app/javascript/mastodon/locales/fi.json      |  6 ++-
 app/javascript/mastodon/locales/fil.json     |  1 -
 app/javascript/mastodon/locales/fo.json      |  4 +-
 app/javascript/mastodon/locales/fr-CA.json   |  1 -
 app/javascript/mastodon/locales/fr.json      |  1 -
 app/javascript/mastodon/locales/fy.json      |  1 -
 app/javascript/mastodon/locales/ga.json      |  1 -
 app/javascript/mastodon/locales/gd.json      |  1 -
 app/javascript/mastodon/locales/gl.json      |  4 +-
 app/javascript/mastodon/locales/he.json      |  4 +-
 app/javascript/mastodon/locales/hr.json      |  1 -
 app/javascript/mastodon/locales/hu.json      |  4 +-
 app/javascript/mastodon/locales/hy.json      |  1 -
 app/javascript/mastodon/locales/ia.json      |  1 -
 app/javascript/mastodon/locales/id.json      |  1 -
 app/javascript/mastodon/locales/ie.json      |  1 -
 app/javascript/mastodon/locales/io.json      |  1 -
 app/javascript/mastodon/locales/is.json      |  4 +-
 app/javascript/mastodon/locales/it.json      |  4 +-
 app/javascript/mastodon/locales/ja.json      | 17 ++++++++-
 app/javascript/mastodon/locales/kab.json     | 38 ++++++++++++++-----
 app/javascript/mastodon/locales/ko.json      |  1 -
 app/javascript/mastodon/locales/ku.json      |  1 -
 app/javascript/mastodon/locales/la.json      |  1 -
 app/javascript/mastodon/locales/lad.json     |  1 -
 app/javascript/mastodon/locales/lt.json      |  3 +-
 app/javascript/mastodon/locales/lv.json      |  5 +--
 app/javascript/mastodon/locales/ms.json      |  1 -
 app/javascript/mastodon/locales/my.json      |  1 -
 app/javascript/mastodon/locales/nl.json      |  4 +-
 app/javascript/mastodon/locales/nn.json      |  1 -
 app/javascript/mastodon/locales/no.json      |  1 -
 app/javascript/mastodon/locales/oc.json      |  1 -
 app/javascript/mastodon/locales/pa.json      |  1 -
 app/javascript/mastodon/locales/pl.json      |  4 +-
 app/javascript/mastodon/locales/pt-BR.json   | 24 +++++++++++-
 app/javascript/mastodon/locales/pt-PT.json   |  4 +-
 app/javascript/mastodon/locales/ro.json      |  1 -
 app/javascript/mastodon/locales/ru.json      |  1 -
 app/javascript/mastodon/locales/sa.json      |  1 -
 app/javascript/mastodon/locales/sco.json     |  1 -
 app/javascript/mastodon/locales/si.json      |  1 -
 app/javascript/mastodon/locales/sk.json      |  1 -
 app/javascript/mastodon/locales/sl.json      |  4 +-
 app/javascript/mastodon/locales/sq.json      |  1 -
 app/javascript/mastodon/locales/sr-Latn.json |  4 +-
 app/javascript/mastodon/locales/sr.json      |  4 +-
 app/javascript/mastodon/locales/sv.json      |  3 +-
 app/javascript/mastodon/locales/th.json      |  1 -
 app/javascript/mastodon/locales/tok.json     |  1 -
 app/javascript/mastodon/locales/tr.json      |  4 +-
 app/javascript/mastodon/locales/tt.json      |  1 -
 app/javascript/mastodon/locales/uk.json      | 11 +++++-
 app/javascript/mastodon/locales/vi.json      |  1 -
 app/javascript/mastodon/locales/zh-CN.json   |  4 +-
 app/javascript/mastodon/locales/zh-HK.json   |  1 -
 app/javascript/mastodon/locales/zh-TW.json   |  4 +-
 config/locales/devise.kab.yml                |  4 +-
 config/locales/devise.pt-BR.yml              |  2 +
 config/locales/doorkeeper.gl.yml             |  2 +-
 config/locales/doorkeeper.kab.yml            | 16 ++++----
 config/locales/es-MX.yml                     | 20 +++++-----
 config/locales/eu.yml                        |  3 ++
 config/locales/gl.yml                        | 12 +++---
 config/locales/kab.yml                       | 28 +++++++++++++-
 config/locales/pt-BR.yml                     | 39 ++++++++++++++++++++
 config/locales/simple_form.kab.yml           |  1 +
 config/locales/simple_form.lv.yml            |  2 +-
 89 files changed, 259 insertions(+), 122 deletions(-)

diff --git a/app/javascript/mastodon/locales/an.json b/app/javascript/mastodon/locales/an.json
index bf3a1a43a90060..31642e604bcfed 100644
--- a/app/javascript/mastodon/locales/an.json
+++ b/app/javascript/mastodon/locales/an.json
@@ -500,7 +500,6 @@
   "status.delete": "Borrar",
   "status.detailed_status": "Vista de conversación detallada",
   "status.edit": "Editar",
-  "status.edited": "Editau {date}",
   "status.edited_x_times": "Editau {count, plural, one {{count} vez} other {{count} veces}}",
   "status.embed": "Incrustado",
   "status.filter": "Filtrar esta publicación",
diff --git a/app/javascript/mastodon/locales/ar.json b/app/javascript/mastodon/locales/ar.json
index 38653b4a34e471..17071aae48f056 100644
--- a/app/javascript/mastodon/locales/ar.json
+++ b/app/javascript/mastodon/locales/ar.json
@@ -646,7 +646,6 @@
   "status.direct": "إشارة خاصة لـ @{name}",
   "status.direct_indicator": "إشارة خاصة",
   "status.edit": "تعديل",
-  "status.edited": "عُدّل في {date}",
   "status.edited_x_times": "عُدّل {count, plural, zero {} one {مرةً واحدة} two {مرّتان} few {{count} مرات} many {{count} مرة} other {{count} مرة}}",
   "status.embed": "إدماج",
   "status.favourite": "فضّل",
diff --git a/app/javascript/mastodon/locales/ast.json b/app/javascript/mastodon/locales/ast.json
index 76fa44202d4e2b..de5e310d5af317 100644
--- a/app/javascript/mastodon/locales/ast.json
+++ b/app/javascript/mastodon/locales/ast.json
@@ -429,7 +429,6 @@
   "status.delete": "Desaniciar",
   "status.direct": "Mentar a @{name} per privao",
   "status.direct_indicator": "Mención privada",
-  "status.edited": "Editóse'l {date}",
   "status.edited_x_times": "Editóse {count, plural, one {{count} vegada} other {{count} vegaes}}",
   "status.embed": "Empotrar",
   "status.filter": "Peñerar esti artículu",
diff --git a/app/javascript/mastodon/locales/be.json b/app/javascript/mastodon/locales/be.json
index 6e0c5afb6079eb..21e2622ba9c920 100644
--- a/app/javascript/mastodon/locales/be.json
+++ b/app/javascript/mastodon/locales/be.json
@@ -662,10 +662,11 @@
   "status.direct": "Згадаць асабіста @{name}",
   "status.direct_indicator": "Асабістае згадванне",
   "status.edit": "Рэдагаваць",
-  "status.edited": "Адрэдагавана {date}",
+  "status.edited": "Апошняе рэдагаванне {date}",
   "status.edited_x_times": "Рэдагавана {count, plural, one {{count} раз} few {{count} разы} many {{count} разоў} other {{count} разу}}",
   "status.embed": "Убудаваць",
   "status.favourite": "Упадабанае",
+  "status.favourites": "{count, plural, one {# упадабанае} few {# упадабаныя} many {# упадабаных} other {# упадабанага}}",
   "status.filter": "Фільтраваць гэты допіс",
   "status.filtered": "Адфільтравана",
   "status.hide": "Схаваць допіс",
@@ -686,6 +687,7 @@
   "status.reblog": "Пашырыць",
   "status.reblog_private": "Пашырыць з першапачатковай бачнасцю",
   "status.reblogged_by": "{name} пашырыў(-ла)",
+  "status.reblogs": "{count, plural, one {# пашырэнне} few {# пашырэнні} many {# пашырэнняў} other {# пашырэння}}",
   "status.reblogs.empty": "Гэты допіс яшчэ ніхто не пашырыў. Калі гэта адбудзецца, гэтых людзей будзе бачна тут.",
   "status.redraft": "Выдаліць і паправіць",
   "status.remove_bookmark": "Выдаліць закладку",
diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json
index ab3eda9cd3c75a..ab6468d8e8fa08 100644
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@@ -648,7 +648,6 @@
   "status.direct": "Частно споменаване на @{name}",
   "status.direct_indicator": "Частно споменаване",
   "status.edit": "Редактиране",
-  "status.edited": "Редактирано на {date}",
   "status.edited_x_times": "Редактирано {count, plural,one {{count} път} other {{count} пъти}}",
   "status.embed": "Вграждане",
   "status.favourite": "Любимо",
diff --git a/app/javascript/mastodon/locales/br.json b/app/javascript/mastodon/locales/br.json
index 9e0979641e9893..77d42f3536c277 100644
--- a/app/javascript/mastodon/locales/br.json
+++ b/app/javascript/mastodon/locales/br.json
@@ -584,7 +584,7 @@
   "status.direct": "Menegiñ @{name} ent-prevez",
   "status.direct_indicator": "Meneg prevez",
   "status.edit": "Kemmañ",
-  "status.edited": "Aozet {date}",
+  "status.edited": "Kemmet da ziwezhañ d'an {date}",
   "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
   "status.embed": "Enframmañ",
   "status.favourite": "Muiañ-karet",
diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index 27c15327689dc5..fde638411e4a19 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -662,7 +662,6 @@
   "status.direct": "Menciona privadament @{name}",
   "status.direct_indicator": "Menció privada",
   "status.edit": "Edita",
-  "status.edited": "Editat {date}",
   "status.edited_x_times": "Editat {count, plural, one {{count} vegada} other {{count} vegades}}",
   "status.embed": "Incrusta",
   "status.favourite": "Favorit",
diff --git a/app/javascript/mastodon/locales/ckb.json b/app/javascript/mastodon/locales/ckb.json
index a78a45c8de1a94..27526e34549243 100644
--- a/app/javascript/mastodon/locales/ckb.json
+++ b/app/javascript/mastodon/locales/ckb.json
@@ -559,7 +559,6 @@
   "status.direct": "بە شێوەیەکی تایبەت باسی @{name} بکە",
   "status.direct_indicator": "ئاماژەی تایبەت",
   "status.edit": "دەستکاری",
-  "status.edited": "بەشداری {date}",
   "status.edited_x_times": "دەستکاریکراوە {count, plural, one {{count} کات} other {{count} کات}}",
   "status.embed": "نیشتەجێ بکە",
   "status.filter": "ئەم پۆستە فلتەر بکە",
diff --git a/app/javascript/mastodon/locales/cs.json b/app/javascript/mastodon/locales/cs.json
index 5beb06d9b24fbf..5a8493fa07de7f 100644
--- a/app/javascript/mastodon/locales/cs.json
+++ b/app/javascript/mastodon/locales/cs.json
@@ -646,7 +646,6 @@
   "status.direct": "Soukromě zmínit @{name}",
   "status.direct_indicator": "Soukromá zmínka",
   "status.edit": "Upravit",
-  "status.edited": "Upraveno {date}",
   "status.edited_x_times": "Upraveno {count, plural, one {{count}krát} few {{count}krát} many {{count}krát} other {{count}krát}}",
   "status.embed": "Vložit na web",
   "status.favourite": "Oblíbit",
diff --git a/app/javascript/mastodon/locales/cy.json b/app/javascript/mastodon/locales/cy.json
index e55dff92549c19..0106df18778fdb 100644
--- a/app/javascript/mastodon/locales/cy.json
+++ b/app/javascript/mastodon/locales/cy.json
@@ -661,7 +661,6 @@
   "status.direct": "Crybwyll yn breifat @{name}",
   "status.direct_indicator": "Crybwyll preifat",
   "status.edit": "Golygu",
-  "status.edited": "Golygwyd {date}",
   "status.edited_x_times": "Golygwyd {count, plural, one {count} two {count} other {{count} gwaith}}",
   "status.embed": "Mewnblannu",
   "status.favourite": "Hoffi",
diff --git a/app/javascript/mastodon/locales/da.json b/app/javascript/mastodon/locales/da.json
index 4f03c55bd48b5f..df17791f1d13c8 100644
--- a/app/javascript/mastodon/locales/da.json
+++ b/app/javascript/mastodon/locales/da.json
@@ -662,10 +662,11 @@
   "status.direct": "Privat omtale @{name}",
   "status.direct_indicator": "Privat omtale",
   "status.edit": "Redigér",
-  "status.edited": "Redigeret {date}",
+  "status.edited": "Senest redigeret {date}",
   "status.edited_x_times": "Redigeret {count, plural, one {{count} gang} other {{count} gange}}",
   "status.embed": "Indlejr",
   "status.favourite": "Favorit",
+  "status.favourites": "{count, plural, one {# favorit} other {# favoritter}}",
   "status.filter": "Filtrér dette indlæg",
   "status.filtered": "Filtreret",
   "status.hide": "Skjul indlæg",
@@ -686,6 +687,7 @@
   "status.reblog": "Fremhæv",
   "status.reblog_private": "Boost med oprindelig synlighed",
   "status.reblogged_by": "{name} fremhævede",
+  "status.reblogs": "{count, plural, one {# boost} other {# boosts}}",
   "status.reblogs.empty": "Ingen har endnu fremhævet dette indlæg. Når nogen gør, vil det fremgå hér.",
   "status.redraft": "Slet og omformulér",
   "status.remove_bookmark": "Fjern bogmærke",
diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json
index 70537cdb05760b..17e1ca1dd0204c 100644
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@@ -662,10 +662,11 @@
   "status.direct": "@{name} privat erwähnen",
   "status.direct_indicator": "Private Erwähnung",
   "status.edit": "Beitrag bearbeiten",
-  "status.edited": "Bearbeitet {date}",
+  "status.edited": "Zuletzt am {date} bearbeitet",
   "status.edited_x_times": "{count, plural, one {{count}-mal} other {{count}-mal}} bearbeitet",
   "status.embed": "Beitrag per iFrame einbetten",
   "status.favourite": "Favorisieren",
+  "status.favourites": "{count, plural, one {Favorit} other {Favoriten}}",
   "status.filter": "Beitrag filtern",
   "status.filtered": "Gefiltert",
   "status.hide": "Beitrag ausblenden",
@@ -686,6 +687,7 @@
   "status.reblog": "Teilen",
   "status.reblog_private": "Mit der ursprünglichen Zielgruppe teilen",
   "status.reblogged_by": "{name} teilte",
+  "status.reblogs": "{count, plural, one {geteilt} other {geteilt}}",
   "status.reblogs.empty": "Diesen Beitrag hat bisher noch niemand geteilt. Sobald es jemand tut, wird das Profil hier erscheinen.",
   "status.redraft": "Löschen und neu erstellen",
   "status.remove_bookmark": "Lesezeichen entfernen",
diff --git a/app/javascript/mastodon/locales/el.json b/app/javascript/mastodon/locales/el.json
index 5d1f03b0907588..c8d90bf0c5cdbe 100644
--- a/app/javascript/mastodon/locales/el.json
+++ b/app/javascript/mastodon/locales/el.json
@@ -586,7 +586,6 @@
   "status.direct": "Ιδιωτική επισήμανση @{name}",
   "status.direct_indicator": "Ιδιωτική επισήμανση",
   "status.edit": "Επεξεργασία",
-  "status.edited": "Επεξεργάστηκε στις {date}",
   "status.edited_x_times": "Επεξεργάστηκε {count, plural, one {{count} φορά} other {{count} φορές}}",
   "status.embed": "Ενσωμάτωσε",
   "status.favourite": "Αγαπημένα",
diff --git a/app/javascript/mastodon/locales/en-GB.json b/app/javascript/mastodon/locales/en-GB.json
index e88209625f3bc5..c9b280f84e1886 100644
--- a/app/javascript/mastodon/locales/en-GB.json
+++ b/app/javascript/mastodon/locales/en-GB.json
@@ -640,7 +640,6 @@
   "status.direct": "Privately mention @{name}",
   "status.direct_indicator": "Private mention",
   "status.edit": "Edit",
-  "status.edited": "Edited {date}",
   "status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",
   "status.embed": "Embed",
   "status.favourite": "Favourite",
diff --git a/app/javascript/mastodon/locales/eo.json b/app/javascript/mastodon/locales/eo.json
index 5d2dc61135c6fc..1fb4e2bd1115c7 100644
--- a/app/javascript/mastodon/locales/eo.json
+++ b/app/javascript/mastodon/locales/eo.json
@@ -617,7 +617,6 @@
   "status.direct": "Private mencii @{name}",
   "status.direct_indicator": "Privata mencio",
   "status.edit": "Redakti",
-  "status.edited": "Redaktita {date}",
   "status.edited_x_times": "Redactita {count, plural, one {{count} fojon} other {{count} fojojn}}",
   "status.embed": "Enkorpigi",
   "status.favourite": "Ŝatata",
diff --git a/app/javascript/mastodon/locales/es-AR.json b/app/javascript/mastodon/locales/es-AR.json
index 35802420d0416f..a573419f4014ba 100644
--- a/app/javascript/mastodon/locales/es-AR.json
+++ b/app/javascript/mastodon/locales/es-AR.json
@@ -662,10 +662,11 @@
   "status.direct": "Mención privada a @{name}",
   "status.direct_indicator": "Mención privada",
   "status.edit": "Editar",
-  "status.edited": "Editado {date}",
+  "status.edited": "Última edición: {date}",
   "status.edited_x_times": "Editado {count, plural, one {{count} vez} other {{count} veces}}",
   "status.embed": "Insertar",
   "status.favourite": "Marcar como favorito",
+  "status.favourites": "{count, plural, one {# voto} other {# votos}}",
   "status.filter": "Filtrar este mensaje",
   "status.filtered": "Filtrado",
   "status.hide": "Ocultar mensaje",
@@ -686,6 +687,7 @@
   "status.reblog": "Adherir",
   "status.reblog_private": "Adherir a la audiencia original",
   "status.reblogged_by": "{name} adhirió",
+  "status.reblogs": "{count, plural, one {adhesión} other {adhesiones}}",
   "status.reblogs.empty": "Todavía nadie adhirió a este mensaje. Cuando alguien lo haga, se mostrará acá.",
   "status.redraft": "Eliminar mensaje original y editarlo",
   "status.remove_bookmark": "Quitar marcador",
diff --git a/app/javascript/mastodon/locales/es-MX.json b/app/javascript/mastodon/locales/es-MX.json
index b1a7757081e48b..7df5a384a8f06e 100644
--- a/app/javascript/mastodon/locales/es-MX.json
+++ b/app/javascript/mastodon/locales/es-MX.json
@@ -662,10 +662,11 @@
   "status.direct": "Mención privada @{name}",
   "status.direct_indicator": "Mención privada",
   "status.edit": "Editar",
-  "status.edited": "Editado {date}",
+  "status.edited": "Última edición {date}",
   "status.edited_x_times": "Editado {count, plural, one {{count} time} other {{count} veces}}",
   "status.embed": "Incrustado",
   "status.favourite": "Favorito",
+  "status.favourites": "{count, plural, one {favorito} other {favoritos}}",
   "status.filter": "Filtrar esta publicación",
   "status.filtered": "Filtrado",
   "status.hide": "Ocultar toot",
@@ -686,6 +687,7 @@
   "status.reblog": "Retootear",
   "status.reblog_private": "Implusar a la audiencia original",
   "status.reblogged_by": "Retooteado por {name}",
+  "status.reblogs": "{count, plural, one {impulso} other {impulsos}}",
   "status.reblogs.empty": "Nadie retooteó este toot todavía. Cuando alguien lo haga, aparecerá aquí.",
   "status.redraft": "Borrar y volver a borrador",
   "status.remove_bookmark": "Eliminar marcador",
diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json
index d7f54a3e2a5a23..5ba7179cba31a1 100644
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@@ -238,11 +238,11 @@
   "empty_column.followed_tags": "No has seguido ninguna etiqueta todavía. Cuando lo hagas, se mostrarán aquí.",
   "empty_column.hashtag": "No hay nada en este hashtag aún.",
   "empty_column.home": "¡Tu línea temporal está vacía! Sigue a más personas para rellenarla.",
-  "empty_column.list": "No hay nada en esta lista aún. Cuando miembros de esta lista publiquen nuevos estatus, estos aparecerán qui.",
-  "empty_column.lists": "No tienes ninguna lista. cuando crees una, se mostrará aquí.",
+  "empty_column.list": "Aún no hay nada en esta lista. Cuando los miembros de esta lista publiquen nuevos estados, estos aparecerán aquí.",
+  "empty_column.lists": "No tienes ninguna lista. Cuando crees una, se mostrará aquí.",
   "empty_column.mutes": "Aún no has silenciado a ningún usuario.",
   "empty_column.notification_requests": "¡Todo limpio! No hay nada aquí. Cuando recibas nuevas notificaciones, aparecerán aquí conforme a tu configuración.",
-  "empty_column.notifications": "No tienes ninguna notificación aún. Interactúa con otros para empezar una conversación.",
+  "empty_column.notifications": "Aún no tienes ninguna notificación. Cuando otras personas interactúen contigo, aparecerán aquí.",
   "empty_column.public": "¡No hay nada aquí! Escribe algo públicamente, o sigue usuarios de otras instancias manualmente para llenarlo",
   "error.unexpected_crash.explanation": "Debido a un error en nuestro código o a un problema de compatibilidad con el navegador, esta página no se ha podido mostrar correctamente.",
   "error.unexpected_crash.explanation_addons": "No se pudo mostrar correctamente esta página. Este error probablemente fue causado por un complemento del navegador web o por herramientas de traducción automática.",
@@ -258,7 +258,7 @@
   "explore.trending_tags": "Etiquetas",
   "filter_modal.added.context_mismatch_explanation": "Esta categoría de filtro no se aplica al contexto en el que ha accedido a esta publlicación. Si quieres que la publicación sea filtrada también en este contexto, tendrás que editar el filtro.",
   "filter_modal.added.context_mismatch_title": "¡El contexto no coincide!",
-  "filter_modal.added.expired_explanation": "Esta categoría de filtro ha caducado, necesitará cambiar la fecha de caducidad para que se aplique.",
+  "filter_modal.added.expired_explanation": "Esta categoría de filtro ha caducado, tendrás que cambiar la fecha de caducidad para que se aplique.",
   "filter_modal.added.expired_title": "¡Filtro caducado!",
   "filter_modal.added.review_and_configure": "Para revisar y configurar esta categoría de filtros, vaya a {settings_link}.",
   "filter_modal.added.review_and_configure_title": "Ajustes de filtro",
@@ -662,10 +662,11 @@
   "status.direct": "Mención privada @{name}",
   "status.direct_indicator": "Mención privada",
   "status.edit": "Editar",
-  "status.edited": "Editado {date}",
+  "status.edited": "Última edición {date}",
   "status.edited_x_times": "Editado {count, plural, one {{count} vez} other {{count} veces}}",
   "status.embed": "Incrustado",
   "status.favourite": "Favorito",
+  "status.favourites": "{count, plural, one {favorito} other {favoritos}}",
   "status.filter": "Filtrar esta publicación",
   "status.filtered": "Filtrado",
   "status.hide": "Ocultar publicación",
@@ -686,6 +687,7 @@
   "status.reblog": "Impulsar",
   "status.reblog_private": "Impulsar a la audiencia original",
   "status.reblogged_by": "Impulsado por {name}",
+  "status.reblogs": "{count, plural, one {impulso} other {impulsos}}",
   "status.reblogs.empty": "Nadie ha impulsado esta publicación todavía. Cuando alguien lo haga, aparecerá aquí.",
   "status.redraft": "Borrar y volver a borrador",
   "status.remove_bookmark": "Eliminar marcador",
diff --git a/app/javascript/mastodon/locales/et.json b/app/javascript/mastodon/locales/et.json
index 79e376693e4f2e..69c59f101a4886 100644
--- a/app/javascript/mastodon/locales/et.json
+++ b/app/javascript/mastodon/locales/et.json
@@ -647,7 +647,6 @@
   "status.direct": "Maini privaatselt @{name}",
   "status.direct_indicator": "Privaatne mainimine",
   "status.edit": "Muuda",
-  "status.edited": "{date} muudetud",
   "status.edited_x_times": "Muudetud {count, plural, one{{count} kord} other {{count} korda}}",
   "status.embed": "Manustamine",
   "status.favourite": "Lemmik",
diff --git a/app/javascript/mastodon/locales/eu.json b/app/javascript/mastodon/locales/eu.json
index 4af5aaaaf5f954..90b691ceb647c6 100644
--- a/app/javascript/mastodon/locales/eu.json
+++ b/app/javascript/mastodon/locales/eu.json
@@ -662,10 +662,11 @@
   "status.direct": "Aipatu pribatuki @{name}",
   "status.direct_indicator": "Aipamen pribatua",
   "status.edit": "Editatu",
-  "status.edited": "Editatua {date}",
+  "status.edited": "Azken edizioa: {date}",
   "status.edited_x_times": "{count, plural, one {behin} other {{count} aldiz}} editatua",
   "status.embed": "Txertatu",
   "status.favourite": "Gogokoa",
+  "status.favourites": "{count, plural, one {gogoko} other {gogoko}}",
   "status.filter": "Iragazi bidalketa hau",
   "status.filtered": "Iragazita",
   "status.hide": "Tuta ezkutatu",
@@ -686,6 +687,7 @@
   "status.reblog": "Bultzada",
   "status.reblog_private": "Bultzada jatorrizko hartzaileei",
   "status.reblogged_by": "{name}(r)en bultzada",
+  "status.reblogs": "{count, plural, one {bultzada} other {bultzada}}",
   "status.reblogs.empty": "Inork ez dio bultzada eman bidalketa honi oraindik. Inork egiten badu, hemen agertuko da.",
   "status.redraft": "Ezabatu eta berridatzi",
   "status.remove_bookmark": "Kendu laster-marka",
diff --git a/app/javascript/mastodon/locales/fa.json b/app/javascript/mastodon/locales/fa.json
index 2ca44a41aa45d3..aaa01a5dc707d2 100644
--- a/app/javascript/mastodon/locales/fa.json
+++ b/app/javascript/mastodon/locales/fa.json
@@ -646,7 +646,6 @@
   "status.direct": "اشارهٔ خصوصی به ‪@{name}‬",
   "status.direct_indicator": "اشارهٔ خصوصی",
   "status.edit": "ویرایش",
-  "status.edited": "ویرایش شده در {date}",
   "status.edited_x_times": "{count, plural, one {{count} مرتبه} other {{count} مرتبه}} ویرایش شد",
   "status.embed": "جاسازی",
   "status.favourite": "برگزیده‌",
diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index 9acae62de463aa..703992a0e7a566 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -483,7 +483,7 @@
   "notifications.policy.filter_not_followers_title": "Henkilöt, jotka eivät seuraa sinua",
   "notifications.policy.filter_not_following_hint": "Kunnes hyväksyt ne manuaalisesti",
   "notifications.policy.filter_not_following_title": "Henkilöt, joita et seuraa",
-  "notifications.policy.filter_private_mentions_hint": "Suodatetaan, ellei se vastaa omaan mainintaan tai jos seuraat lähettäjää",
+  "notifications.policy.filter_private_mentions_hint": "Suodatetaan, ellei se vastaa omaan mainintaasi tai ellet seuraa lähettäjää",
   "notifications.policy.filter_private_mentions_title": "Ei-toivotut yksityismaininnat",
   "notifications.policy.title": "Suodata ilmoitukset pois kohteesta…",
   "notifications_permission_banner.enable": "Ota työpöytäilmoitukset käyttöön",
@@ -662,10 +662,11 @@
   "status.direct": "Mainitse @{name} yksityisesti",
   "status.direct_indicator": "Yksityinen maininta",
   "status.edit": "Muokkaa",
-  "status.edited": "Muokattu {date}",
+  "status.edited": "Viimeksi muokattu {date}",
   "status.edited_x_times": "Muokattu {count, plural, one {{count} kerran} other {{count} kertaa}}",
   "status.embed": "Upota",
   "status.favourite": "Suosikki",
+  "status.favourites": "{count, plural, one {suosikki} other {suosikkia}}",
   "status.filter": "Suodata tämä julkaisu",
   "status.filtered": "Suodatettu",
   "status.hide": "Piilota julkaisu",
@@ -686,6 +687,7 @@
   "status.reblog": "Tehosta",
   "status.reblog_private": "Tehosta alkuperäiselle yleisölle",
   "status.reblogged_by": "{name} tehosti",
+  "status.reblogs": "{count, plural, one {tehostus} other {tehostusta}}",
   "status.reblogs.empty": "Kukaan ei ole vielä tehostanut tätä julkaisua. Kun joku tekee niin, tulee hän tähän näkyviin.",
   "status.redraft": "Poista ja palauta muokattavaksi",
   "status.remove_bookmark": "Poista kirjanmerkki",
diff --git a/app/javascript/mastodon/locales/fil.json b/app/javascript/mastodon/locales/fil.json
index 14bf1af222da90..387a65c7857db8 100644
--- a/app/javascript/mastodon/locales/fil.json
+++ b/app/javascript/mastodon/locales/fil.json
@@ -273,7 +273,6 @@
   "status.direct": "Palihim na banggitin si/ang @{name}",
   "status.direct_indicator": "Palihim na banggit",
   "status.edit": "Baguhin",
-  "status.edited": "Binago noong {date}",
   "status.edited_x_times": "Binago {count, plural, one {{count} beses} other {{count} na beses}}",
   "status.history.created": "Nilikha ni/ng {name} {date}",
   "status.history.edited": "Binago ni/ng {name} {date}",
diff --git a/app/javascript/mastodon/locales/fo.json b/app/javascript/mastodon/locales/fo.json
index daaefea86d416b..53677e23834968 100644
--- a/app/javascript/mastodon/locales/fo.json
+++ b/app/javascript/mastodon/locales/fo.json
@@ -662,10 +662,11 @@
   "status.direct": "Umrøð @{name} privat",
   "status.direct_indicator": "Privat umrøða",
   "status.edit": "Rætta",
-  "status.edited": "Rættað {date}",
+  "status.edited": "Seinast broytt {date}",
   "status.edited_x_times": "Rættað {count, plural, one {{count} ferð} other {{count} ferð}}",
   "status.embed": "Legg inní",
   "status.favourite": "Dámdur postur",
+  "status.favourites": "{count, plural, one {yndispostur} other {yndispostar}}",
   "status.filter": "Filtrera hendan postin",
   "status.filtered": "Filtrerað",
   "status.hide": "Fjal post",
@@ -686,6 +687,7 @@
   "status.reblog": "Stimbra",
   "status.reblog_private": "Stimbra við upprunasýni",
   "status.reblogged_by": "{name} stimbrað",
+  "status.reblogs": "{count, plural, one {stimbran} other {stimbranir}}",
   "status.reblogs.empty": "Eingin hevur stimbrað hendan postin enn. Tá onkur stimbrar postin, verður hann sjónligur her.",
   "status.redraft": "Strika & ger nýggja kladdu",
   "status.remove_bookmark": "Gloym",
diff --git a/app/javascript/mastodon/locales/fr-CA.json b/app/javascript/mastodon/locales/fr-CA.json
index 8aff0b5afeb854..6f517fb34e3533 100644
--- a/app/javascript/mastodon/locales/fr-CA.json
+++ b/app/javascript/mastodon/locales/fr-CA.json
@@ -646,7 +646,6 @@
   "status.direct": "Mention privée @{name}",
   "status.direct_indicator": "Mention privée",
   "status.edit": "Modifier",
-  "status.edited": "Modifiée le {date}",
   "status.edited_x_times": "Modifiée {count, plural, one {{count} fois} other {{count} fois}}",
   "status.embed": "Intégrer",
   "status.favourite": "Ajouter aux favoris",
diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json
index 223878f6f9656c..81c6719ea56c2c 100644
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@@ -646,7 +646,6 @@
   "status.direct": "Mention privée @{name}",
   "status.direct_indicator": "Mention privée",
   "status.edit": "Modifier",
-  "status.edited": "Modifié le {date}",
   "status.edited_x_times": "Modifié {count, plural, one {{count} fois} other {{count} fois}}",
   "status.embed": "Intégrer",
   "status.favourite": "Ajouter aux favoris",
diff --git a/app/javascript/mastodon/locales/fy.json b/app/javascript/mastodon/locales/fy.json
index 5757f2cde741b6..02b3833701c246 100644
--- a/app/javascript/mastodon/locales/fy.json
+++ b/app/javascript/mastodon/locales/fy.json
@@ -646,7 +646,6 @@
   "status.direct": "Privee fermelde @{name}",
   "status.direct_indicator": "Priveefermelding",
   "status.edit": "Bewurkje",
-  "status.edited": "Bewurke op {date}",
   "status.edited_x_times": "{count, plural, one {{count} kear} other {{count} kearen}} bewurke",
   "status.embed": "Ynslute",
   "status.favourite": "Favoryt",
diff --git a/app/javascript/mastodon/locales/ga.json b/app/javascript/mastodon/locales/ga.json
index 44af2fb4f6887a..50ea6bbf6cc6d0 100644
--- a/app/javascript/mastodon/locales/ga.json
+++ b/app/javascript/mastodon/locales/ga.json
@@ -458,7 +458,6 @@
   "status.copy": "Copy link to status",
   "status.delete": "Scrios",
   "status.edit": "Cuir in eagar",
-  "status.edited": "Curtha in eagar in {date}",
   "status.edited_x_times": "Curtha in eagar {count, plural, one {{count} uair amháin} two {{count} uair} few {{count} uair} many {{count} uair} other {{count} uair}}",
   "status.embed": "Leabaigh",
   "status.filter": "Déan scagadh ar an bpostáil seo",
diff --git a/app/javascript/mastodon/locales/gd.json b/app/javascript/mastodon/locales/gd.json
index ae190a51b015e2..5d263c0fe638f8 100644
--- a/app/javascript/mastodon/locales/gd.json
+++ b/app/javascript/mastodon/locales/gd.json
@@ -646,7 +646,6 @@
   "status.direct": "Thoir iomradh air @{name} gu prìobhaideach",
   "status.direct_indicator": "Iomradh prìobhaideach",
   "status.edit": "Deasaich",
-  "status.edited": "Air a dheasachadh {date}",
   "status.edited_x_times": "Chaidh a dheasachadh {count, plural, one {{counter} turas} two {{counter} thuras} few {{counter} tursan} other {{counter} turas}}",
   "status.embed": "Leabaich",
   "status.favourite": "Cuir ris na h-annsachdan",
diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json
index e3928b5f3b0074..02f57570a52acf 100644
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@@ -662,10 +662,11 @@
   "status.direct": "Mencionar de xeito privado a @{name}",
   "status.direct_indicator": "Mención privada",
   "status.edit": "Editar",
-  "status.edited": "Editado {date}",
+  "status.edited": "Última edición {date}",
   "status.edited_x_times": "Editado {count, plural, one {{count} vez} other {{count} veces}}",
   "status.embed": "Incrustar",
   "status.favourite": "Favorecer",
+  "status.favourites": "{count, plural, one {favorecemento} other {favorecementos}}",
   "status.filter": "Filtrar esta publicación",
   "status.filtered": "Filtrado",
   "status.hide": "Agochar publicación",
@@ -686,6 +687,7 @@
   "status.reblog": "Promover",
   "status.reblog_private": "Compartir coa audiencia orixinal",
   "status.reblogged_by": "{name} promoveu",
+  "status.reblogs": "{count, plural, one {promoción} other {promocións}}",
   "status.reblogs.empty": "Aínda ninguén promoveu esta publicación. Cando alguén o faga, amosarase aquí.",
   "status.redraft": "Eliminar e reescribir",
   "status.remove_bookmark": "Eliminar marcador",
diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json
index 53e2653130a79a..6cf7fc9283b7c5 100644
--- a/app/javascript/mastodon/locales/he.json
+++ b/app/javascript/mastodon/locales/he.json
@@ -662,10 +662,11 @@
   "status.direct": "הודעה פרטית אל @{name}",
   "status.direct_indicator": "הודעה פרטית",
   "status.edit": "עריכה",
-  "status.edited": "נערך ב{date}",
+  "status.edited": "נערך לאחרונה {date}",
   "status.edited_x_times": "נערך {count, plural, one {פעם {count}} other {{count} פעמים}}",
   "status.embed": "הטמעה",
   "status.favourite": "חיבוב",
+  "status.favourites": "{count, plural, one {חיבוב אחד} two {זוג חיבובים} other {# חיבובים}}",
   "status.filter": "סנן הודעה זו",
   "status.filtered": "סונן",
   "status.hide": "הסתרת חיצרוץ",
@@ -686,6 +687,7 @@
   "status.reblog": "הדהוד",
   "status.reblog_private": "להדהד ברמת הנראות המקורית",
   "status.reblogged_by": "{name} הידהד/ה:",
+  "status.reblogs": "{count, plural, one {הדהוד אחד} two {שני הדהודים} other {# הדהודים}}",
   "status.reblogs.empty": "עוד לא הידהדו את ההודעה הזו. כאשר זה יקרה, ההדהודים יופיעו כאן.",
   "status.redraft": "מחיקה ועריכה מחדש",
   "status.remove_bookmark": "הסרת סימניה",
diff --git a/app/javascript/mastodon/locales/hr.json b/app/javascript/mastodon/locales/hr.json
index 45d1b53268bcbc..1e68854c12fd36 100644
--- a/app/javascript/mastodon/locales/hr.json
+++ b/app/javascript/mastodon/locales/hr.json
@@ -475,7 +475,6 @@
   "status.copy": "Copy link to status",
   "status.delete": "Obriši",
   "status.edit": "Uredi",
-  "status.edited": "Uređeno {date}",
   "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
   "status.embed": "Umetni",
   "status.filter": "Filtriraj ovu objavu",
diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json
index 1cbca5654bcfbb..f658fe4656b3a4 100644
--- a/app/javascript/mastodon/locales/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@@ -662,10 +662,11 @@
   "status.direct": "@{name} személyes említése",
   "status.direct_indicator": "Személyes említés",
   "status.edit": "Szerkesztés",
-  "status.edited": "Szerkesztve: {date}",
+  "status.edited": "Utoljára szerkesztve {date}",
   "status.edited_x_times": "{count, plural, one {{count} alkalommal} other {{count} alkalommal}} szerkesztve",
   "status.embed": "Beágyazás",
   "status.favourite": "Kedvenc",
+  "status.favourites": "{count, plural, one {kedvenc} other {kedvenc}}",
   "status.filter": "E bejegyzés szűrése",
   "status.filtered": "Megszűrt",
   "status.hide": "Bejegyzés elrejtése",
@@ -686,6 +687,7 @@
   "status.reblog": "Megtolás",
   "status.reblog_private": "Megtolás az eredeti közönségnek",
   "status.reblogged_by": "{name} megtolta",
+  "status.reblogs": "{count, plural, one {megtolás} other {megtolás}}",
   "status.reblogs.empty": "Senki sem tolta még meg ezt a bejegyzést. Ha valaki megteszi, itt fog megjelenni.",
   "status.redraft": "Törlés és újraírás",
   "status.remove_bookmark": "Könyvjelző eltávolítása",
diff --git a/app/javascript/mastodon/locales/hy.json b/app/javascript/mastodon/locales/hy.json
index 67a7aa49ffb0ec..2ef6d4c777aaf7 100644
--- a/app/javascript/mastodon/locales/hy.json
+++ b/app/javascript/mastodon/locales/hy.json
@@ -467,7 +467,6 @@
   "status.direct": "Մասնաւոր յիշատակում @{name}",
   "status.direct_indicator": "Մասնաւոր յիշատակում",
   "status.edit": "Խմբագրել",
-  "status.edited": "Խմբագրուել է՝ {date}",
   "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
   "status.embed": "Ներդնել",
   "status.favourite": "Հավանել",
diff --git a/app/javascript/mastodon/locales/ia.json b/app/javascript/mastodon/locales/ia.json
index a935bf1112cf59..89285271ffa306 100644
--- a/app/javascript/mastodon/locales/ia.json
+++ b/app/javascript/mastodon/locales/ia.json
@@ -366,7 +366,6 @@
   "status.direct": "Mentionar privatemente a @{name}",
   "status.direct_indicator": "Mention private",
   "status.edit": "Modificar",
-  "status.edited": "Modificate le {date}",
   "status.edited_x_times": "Modificate {count, plural, one {{count} tempore} other {{count} tempores}}",
   "status.favourite": "Adder al favoritos",
   "status.filter": "Filtrar iste message",
diff --git a/app/javascript/mastodon/locales/id.json b/app/javascript/mastodon/locales/id.json
index 9b841a08bb0bbc..ae2051a376c67c 100644
--- a/app/javascript/mastodon/locales/id.json
+++ b/app/javascript/mastodon/locales/id.json
@@ -523,7 +523,6 @@
   "status.delete": "Hapus",
   "status.detailed_status": "Tampilan detail percakapan",
   "status.edit": "Edit",
-  "status.edited": "Diedit {date}",
   "status.edited_x_times": "Diedit {count, plural, other {{count} kali}}",
   "status.embed": "Tanam",
   "status.filter": "Saring kiriman ini",
diff --git a/app/javascript/mastodon/locales/ie.json b/app/javascript/mastodon/locales/ie.json
index 1f60b42400347c..d0a42b0b359fd4 100644
--- a/app/javascript/mastodon/locales/ie.json
+++ b/app/javascript/mastodon/locales/ie.json
@@ -646,7 +646,6 @@
   "status.direct": "Privatmen mentionar @{name}",
   "status.direct_indicator": "Privat mention",
   "status.edit": "Modificar",
-  "status.edited": "Modificat ye {date}",
   "status.edited_x_times": "Modificat {count, plural, one {{count} vez} other {{count} vezes}}",
   "status.embed": "Inbedar",
   "status.favourite": "Favoritisar",
diff --git a/app/javascript/mastodon/locales/io.json b/app/javascript/mastodon/locales/io.json
index 235b6b92af66d0..5d0b231ed1cf79 100644
--- a/app/javascript/mastodon/locales/io.json
+++ b/app/javascript/mastodon/locales/io.json
@@ -610,7 +610,6 @@
   "status.direct": "Private mencionez @{name}",
   "status.direct_indicator": "Privata menciono",
   "status.edit": "Modifikez",
-  "status.edited": "Modifikesis ye {date}",
   "status.edited_x_times": "Modifikesis {count, plural, one {{count} foyo} other {{count} foyi}}",
   "status.embed": "Eninsertez",
   "status.favourite": "Favorizar",
diff --git a/app/javascript/mastodon/locales/is.json b/app/javascript/mastodon/locales/is.json
index 2310325b7c36ee..cf2d0281f89136 100644
--- a/app/javascript/mastodon/locales/is.json
+++ b/app/javascript/mastodon/locales/is.json
@@ -662,10 +662,11 @@
   "status.direct": "Einkaspjall við @{name}",
   "status.direct_indicator": "Einkaspjall",
   "status.edit": "Breyta",
-  "status.edited": "Breytt {date}",
+  "status.edited": "Síðast breytt {date}",
   "status.edited_x_times": "Breytt {count, plural, one {{count} sinni} other {{count} sinnum}}",
   "status.embed": "Ívefja",
   "status.favourite": "Eftirlæti",
+  "status.favourites": "{count, plural, one {eftirlæti} other {eftirlæti}}",
   "status.filter": "Sía þessa færslu",
   "status.filtered": "Síað",
   "status.hide": "Fela færslu",
@@ -686,6 +687,7 @@
   "status.reblog": "Endurbirting",
   "status.reblog_private": "Endurbirta til upphaflegra lesenda",
   "status.reblogged_by": "{name} endurbirti",
+  "status.reblogs": "{count, plural, one {endurbirting} other {endurbirtingar}}",
   "status.reblogs.empty": "Enginn hefur ennþá endurbirt þessa færslu. Þegar einhver gerir það, mun það birtast hér.",
   "status.redraft": "Eyða og endurvinna drög",
   "status.remove_bookmark": "Fjarlægja bókamerki",
diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json
index 56b637612d7927..06825f40ddb1fc 100644
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@@ -662,10 +662,11 @@
   "status.direct": "Menziona privatamente @{name}",
   "status.direct_indicator": "Menzione privata",
   "status.edit": "Modifica",
-  "status.edited": "Modificato il {date}",
+  "status.edited": "Ultima modifica {date}",
   "status.edited_x_times": "Modificato {count, plural, one {{count} volta} other {{count} volte}}",
   "status.embed": "Incorpora",
   "status.favourite": "Preferito",
+  "status.favourites": "{count, plural, one {preferito} other {preferiti}}",
   "status.filter": "Filtra questo post",
   "status.filtered": "Filtrato",
   "status.hide": "Nascondi il post",
@@ -686,6 +687,7 @@
   "status.reblog": "Reblog",
   "status.reblog_private": "Reblog con visibilità originale",
   "status.reblogged_by": "Rebloggato da {name}",
+  "status.reblogs": "{count, plural, one {boost} other {boost}}",
   "status.reblogs.empty": "Ancora nessuno ha rebloggato questo post. Quando qualcuno lo farà, apparirà qui.",
   "status.redraft": "Elimina e riscrivi",
   "status.remove_bookmark": "Rimuovi segnalibro",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index 872293b2304318..ba32c7c4928890 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -241,6 +241,7 @@
   "empty_column.list": "このリストにはまだなにもありません。このリストのメンバーが新しい投稿をするとここに表示されます。",
   "empty_column.lists": "まだリストがありません。リストを作るとここに表示されます。",
   "empty_column.mutes": "まだ誰もミュートしていません。",
+  "empty_column.notification_requests": "ここに表示するものはありません。新しい通知を受け取ったとき、フィルタリング設定で通知がブロックされたアカウントがある場合はここに表示されます。",
   "empty_column.notifications": "まだ通知がありません。他の人とふれ合って会話を始めましょう。",
   "empty_column.public": "ここにはまだ何もありません！ 公開で何かを投稿したり、他のサーバーのユーザーをフォローしたりしていっぱいにしましょう",
   "error.unexpected_crash.explanation": "不具合かブラウザの互換性問題のため、このページを正しく表示できませんでした。",
@@ -271,6 +272,8 @@
   "filter_modal.select_filter.subtitle": "既存のカテゴリーを使用するか新規作成します",
   "filter_modal.select_filter.title": "この投稿をフィルターする",
   "filter_modal.title.status": "投稿をフィルターする",
+  "filtered_notifications_banner.pending_requests": "{count, plural, =0 {アカウント} other {#アカウント}}からの通知がブロックされています",
+  "filtered_notifications_banner.title": "ブロック済みの通知",
   "firehose.all": "すべて",
   "firehose.local": "このサーバー",
   "firehose.remote": "ほかのサーバー",
@@ -439,6 +442,10 @@
   "notification.reblog": "{name}さんがあなたの投稿をブーストしました",
   "notification.status": "{name}さんが投稿しました",
   "notification.update": "{name}さんが投稿を編集しました",
+  "notification_requests.accept": "受け入れる",
+  "notification_requests.dismiss": "無視",
+  "notification_requests.notifications_from": "{name}からの通知",
+  "notification_requests.title": "ブロック済みの通知",
   "notifications.clear": "通知を消去",
   "notifications.clear_confirmation": "本当に通知を消去しますか？",
   "notifications.column_settings.admin.report": "新しい通報:",
@@ -470,6 +477,15 @@
   "notifications.permission_denied": "ブラウザの通知が拒否されているためデスクトップ通知は利用できません",
   "notifications.permission_denied_alert": "ブラウザの通知が拒否されているためデスクトップ通知を有効にできません",
   "notifications.permission_required": "必要な権限が付与されていないため、デスクトップ通知は利用できません。",
+  "notifications.policy.filter_new_accounts.hint": "作成から{days, plural, other {#日}}以内のアカウントからの通知がブロックされます",
+  "notifications.policy.filter_new_accounts_title": "新しいアカウントからの通知をブロックする",
+  "notifications.policy.filter_not_followers_hint": "フォローされていても、フォローから{days, plural, other {#日}}経っていない場合はブロックされます",
+  "notifications.policy.filter_not_followers_title": "フォローされていないアカウントからの通知をブロックする",
+  "notifications.policy.filter_not_following_hint": "手動で受け入れたアカウントはブロックされません",
+  "notifications.policy.filter_not_following_title": "フォローしていないアカウントからの通知をブロックする",
+  "notifications.policy.filter_private_mentions_hint": "あなたがメンションした相手からの返信、およびフォローしているアカウントからの返信以外がブロックされます",
+  "notifications.policy.filter_private_mentions_title": "外部からの非公開の返信をブロックする",
+  "notifications.policy.title": "通知のフィルタリング",
   "notifications_permission_banner.enable": "デスクトップ通知を有効にする",
   "notifications_permission_banner.how_to_control": "Mastodonを閉じている間でも通知を受信するにはデスクトップ通知を有効にしてください。有効にすると上の {icon} ボタンから通知の内容を細かくカスタマイズできます。",
   "notifications_permission_banner.title": "お見逃しなく",
@@ -646,7 +662,6 @@
   "status.direct": "@{name}さんに非公開で投稿",
   "status.direct_indicator": "非公開の返信",
   "status.edit": "編集",
-  "status.edited": "{date}に編集",
   "status.edited_x_times": "{count}回編集",
   "status.embed": "埋め込み",
   "status.favourite": "お気に入り",
diff --git a/app/javascript/mastodon/locales/kab.json b/app/javascript/mastodon/locales/kab.json
index db770b427a1054..0d719b71b1efe6 100644
--- a/app/javascript/mastodon/locales/kab.json
+++ b/app/javascript/mastodon/locales/kab.json
@@ -48,7 +48,7 @@
   "account.posts_with_replies": "Tisuffaɣ d tririyin",
   "account.report": "Cetki ɣef @{name}",
   "account.requested": "Di laɛḍil ad yettwaqbel. Ssit i wakken ad yefsex usuter n uḍfar",
-  "account.requested_follow": "{name} yessuter ad k-yeḍfer",
+  "account.requested_follow": "{name} yessuter ad k·m-yeḍfer",
   "account.share": "Bḍu amaɣnu n @{name}",
   "account.show_reblogs": "Ssken-d inebḍa n @{name}",
   "account.statuses_counter": "{count, plural, one {{counter} n tsuffeɣt} other {{counter} n tsuffaɣ}}",
@@ -190,13 +190,13 @@
   "empty_column.bookmarked_statuses": "Ulac kra n tsuffeɣt i terniḍ ɣer yismenyifen-ik·im ar tura. Ticki terniḍ yiwet, ad d-tettwasken da.",
   "empty_column.community": "Tasuddemt tazayezt tadigant n yisallen d tilemt. Aru ihi kra akken ad tt-teččareḍ!",
   "empty_column.domain_blocks": "Ulac kra n taɣult yettwaffren ar tura.",
-  "empty_column.follow_requests": "Ulac ɣur-k ula yiwen n usuter n teḍfeṛt. Ticki teṭṭfeḍ-d yiwen ad d-yettwasken da.",
+  "empty_column.follow_requests": "Ulac ɣur-k·m ula yiwen n usuter n teḍfeṛt. Ticki teṭṭfeḍ-d yiwen ad d-yettwasken da.",
   "empty_column.hashtag": "Ar tura ulac kra n ugbur yesɛan assaɣ ɣer uhacṭag-agi.",
   "empty_column.home": "Tasuddemt tagejdant n yisallen d tilemt! Ẓer {public} neɣ nadi ad tafeḍ imseqdacen-nniḍen ad ten-ḍefṛeḍ.",
   "empty_column.list": "Ar tura ur yelli kra deg umuɣ-a. Ad d-yettwasken da ticki iɛeggalen n wumuɣ-a suffɣen-d kra.",
-  "empty_column.lists": "Ulac ɣur-k kra n wumuɣ yakan. Ad d-tettwasken da ticki tesluleḍ-d yiwet.",
-  "empty_column.mutes": "Ulac ɣur-k imseqdacen i yettwasgugmen.",
-  "empty_column.notifications": "Ulac ɣur-k tilɣa. Sedmer akked yemdanen-nniḍen akken ad tebduḍ adiwenni.",
+  "empty_column.lists": "Ulac ɣur-k·m kra n wumuɣ yakan. Ad d-tettwasken da ticki tesluleḍ-d yiwet.",
+  "empty_column.mutes": "Ulac ɣur-k·m imseqdacen i yettwasgugmen.",
+  "empty_column.notifications": "Ulac ɣur-k·m tilɣa. Sedmer akked yemdanen-nniḍen akken ad tebduḍ adiwenni.",
   "empty_column.public": "Ulac kra da! Aru kra, neɣ ḍfeṛ imdanen i yellan deg yiqeddacen-nniḍen akken ad d-teččar tsuddemt tazayezt",
   "error.unexpected_crash.next_steps": "Smiren asebter-a, ma ur yekkis ara wugur, ẓer d akken tzemreḍ ad tesqedceḍ Maṣṭudun deg yiminig-nniḍen neɣ deg usnas anaṣli.",
   "errors.unexpected_crash.copy_stacktrace": "Nɣel stacktrace ɣef wafus",
@@ -209,6 +209,7 @@
   "explore.trending_tags": "Ihacṭagen",
   "filter_modal.added.review_and_configure_title": "Iɣewwaṛen n imzizdig",
   "filter_modal.added.settings_link": "asebter n yiɣewwaṛen",
+  "filter_modal.select_filter.expired": "yemmut",
   "filter_modal.select_filter.prompt_new": "Taggayt tamaynutt : {name}",
   "filter_modal.select_filter.search": "Nadi neɣ snulfu-d",
   "firehose.all": "Akk",
@@ -217,6 +218,7 @@
   "follow_request.authorize": "Ssireg",
   "follow_request.reject": "Agi",
   "follow_suggestions.dismiss": "Ur ttɛawad ara ad t-id-sekneṭ",
+  "follow_suggestions.view_all": "Wali-ten akk",
   "follow_suggestions.who_to_follow": "Menhu ara ḍefṛeḍ",
   "followed_tags": "Ihacṭagen yettwaḍfaren",
   "footer.about": "Ɣef",
@@ -259,6 +261,7 @@
   "interaction_modal.sign_in": "Ur tekcimeḍ ara ɣer uqeddac-a. Anda yella umiḍan-ik·im ?",
   "interaction_modal.sign_in_hint": "Ihi : Wa d asmel ideg tjerdeḍ. Ma ur tecfiḍ ara, nadi imayl n ummager deg tenkult-ik·im. Tzemreḍ daɣen ad d-tefkeḍ isem-ik·im n useqdac ummid ! (amedya @Mastodon@mastodon.social)",
   "interaction_modal.title.follow": "Ḍfer {name}",
+  "interaction_modal.title.reply": "Tiririt i tsuffeɣt n {name}",
   "intervals.full.days": "{number, plural, one {# n wass} other {# n wussan}}",
   "intervals.full.hours": "{number, plural, one {# n usarag} other {# n yesragen}}",
   "intervals.full.minutes": "{number, plural, one {# n tesdat} other {# n tesdatin}}",
@@ -271,6 +274,7 @@
   "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "i kennu ɣer wadda n tebdart",
   "keyboard_shortcuts.enter": "i tildin n tsuffeɣt",
+  "keyboard_shortcuts.favourites": "Ldi tabdert n yismenyifen",
   "keyboard_shortcuts.federated": "i tildin n tsuddemt tamatut n yisallen",
   "keyboard_shortcuts.heading": "Inegzumen n unasiw",
   "keyboard_shortcuts.home": "i tildin n tsuddemt tagejdant n yisallen",
@@ -299,6 +303,7 @@
   "lightbox.expand": "Simeɣer tamnaḍt n uskan n tugna",
   "lightbox.next": "Ɣer zdat",
   "lightbox.previous": "Ɣer deffir",
+  "limited_account_hint.action": "Wali amaɣnu akken yebɣu yili",
   "link_preview.author": "S-ɣur {name}",
   "lists.account.add": "Rnu ɣer tebdart",
   "lists.account.remove": "Kkes seg tebdart",
@@ -344,12 +349,15 @@
   "navigation_bar.security": "Taɣellist",
   "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
   "notification.follow": "iṭṭafar-ik·em-id {name}",
-  "notification.follow_request": "{name} yessuter-d ad k-yeḍfeṛ",
+  "notification.follow_request": "{name} yessuter-d ad k·m-yeḍfeṛ",
   "notification.mention": "{name} yebder-ik-id",
   "notification.own_poll": "Tafrant-ik·im tfuk",
   "notification.poll": "Tfukk tefrant ideg tettekkaḍ",
   "notification.reblog": "{name} yebḍa tajewwiqt-ik i tikelt-nniḍen",
   "notification.status": "{name} akken i d-yessufeɣ",
+  "notification_requests.accept": "Qbel",
+  "notification_requests.dismiss": "Agi",
+  "notification_requests.notifications_from": "Ilɣa sɣur {name}",
   "notifications.clear": "Sfeḍ tilɣa",
   "notifications.clear_confirmation": "Tebɣiḍ s tidet ad tekkseḍ akk tilɣa-inek·em i lebda?",
   "notifications.column_settings.alert": "Tilɣa n tnarit",
@@ -374,6 +382,14 @@
   "notifications.group": "{count} n tilɣa",
   "notifications.mark_as_read": "Creḍ meṛṛa iilɣa am wakken ttwaɣran",
   "notifications.permission_denied": "D awezɣi ad yili wermad n yilɣa n tnarit axateṛ turagt tettwagdel.",
+  "notifications.policy.filter_new_accounts.hint": "Imiḍanen imaynuten i d-yennulfan deg {days, plural, one {yiwen n wass} other {# n wussan}} yezrin",
+  "notifications.policy.filter_new_accounts_title": "Imiḍan imaynuten",
+  "notifications.policy.filter_not_followers_hint": "Ula d wid akked tid i k·m-id-iḍefren, ur wwiḍen ara {days, plural, one {yiwen n wass} other {# n wussan}}",
+  "notifications.policy.filter_not_followers_title": "Wid akked tid ur k·m-id-yeṭṭafaren ara",
+  "notifications.policy.filter_not_following_hint": "Alamma tqebleḍ-ten s ufus",
+  "notifications.policy.filter_not_following_title": "Wid akked tid ur tettḍafareḍ ara",
+  "notifications.policy.filter_private_mentions_title": "Abdar uslig ur yettwasferken ara",
+  "notifications.policy.title": "Sizdeg ilɣa seg …",
   "notifications_permission_banner.enable": "Rmed talɣutin n tnarit",
   "notifications_permission_banner.title": "Ur zeggel acemma",
   "onboarding.action.back": "Tuɣalin ɣer deffir",
@@ -384,6 +400,7 @@
   "onboarding.follows.lead": "You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!",
   "onboarding.follows.title": "Popular on Mastodon",
   "onboarding.profile.display_name": "Isem ara d-yettwaskanen",
+  "onboarding.profile.note": "Tameddurt",
   "onboarding.profile.note_hint": "Tzemreḍ ad d-@tbedreḍ imdanen niḍen neɣ #ihacṭagen …",
   "onboarding.profile.save_and_continue": "Sekles, tkemmleḍ",
   "onboarding.profile.title": "Asbadu n umaɣnu",
@@ -414,15 +431,16 @@
   "poll_button.add_poll": "Rnu asenqed",
   "poll_button.remove_poll": "Kkes asenqed",
   "privacy.change": "Seggem tabaḍnit n yizen",
-  "privacy.direct.long": "Wid akk i d-yettwabdaren deg tuffeɣt",
-  "privacy.direct.short": "Imdanen ulmisen",
-  "privacy.private.long": "Ala wid i k-yeṭṭafaṛen",
+  "privacy.direct.long": "Wid akk i d-yettwabdaren deg tsuffeɣt",
+  "privacy.direct.short": "Imdanen yettwafernen",
+  "privacy.private.long": "Ala wid i k·m-yeṭṭafaṛen",
   "privacy.private.short": "Imeḍfaren",
   "privacy.public.long": "Kra n win yellan deg Masṭudun neɣ berra-s",
   "privacy.public.short": "Azayez",
   "privacy.unlisted.long": "Kra kan n ilguritmen",
   "privacy_policy.last_updated": "Aleqqem aneggaru {date}",
   "privacy_policy.title": "Tasertit tabaḍnit",
+  "recommended": "Yettuwelleh",
   "refresh": "Smiren",
   "regeneration_indicator.label": "Yessalay-d…",
   "regeneration_indicator.sublabel": "Tasuddemt tagejdant ara d-tettwaheggay!",
@@ -487,7 +505,6 @@
   "status.copy": "Nɣel assaɣ ɣer tasuffeɣt",
   "status.delete": "Kkes",
   "status.edit": "Ẓreg",
-  "status.edited": "Tettwaẓreg deg {date}",
   "status.edited_x_times": "Tettwaẓreg {count, plural, one {{count} n tikkelt} other {{count} n tikkal}}",
   "status.embed": "Seddu",
   "status.filtered": "Yettwasizdeg",
@@ -507,6 +524,7 @@
   "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_to": "Y·terra-yas i {name}",
   "status.reply": "Err",
   "status.replyAll": "Err i lxiḍ",
   "status.report": "Cetki ɣef @{name}",
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index 642a3f4ae14e0d..a96b146ac2a7b0 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -660,7 +660,6 @@
   "status.direct": "@{name} 님에게 개인적으로 멘션",
   "status.direct_indicator": "개인적인 멘션",
   "status.edit": "수정",
-  "status.edited": "{date}에 수정함",
   "status.edited_x_times": "{count}번 수정됨",
   "status.embed": "임베드",
   "status.favourite": "좋아요",
diff --git a/app/javascript/mastodon/locales/ku.json b/app/javascript/mastodon/locales/ku.json
index a10610108135c5..0702fa0003d154 100644
--- a/app/javascript/mastodon/locales/ku.json
+++ b/app/javascript/mastodon/locales/ku.json
@@ -518,7 +518,6 @@
   "status.direct": "Bi taybetî qale @{name} bike",
   "status.direct_indicator": "Qalkirinê taybet",
   "status.edit": "Serrast bike",
-  "status.edited": "Di {date} de hate serrastkirin",
   "status.edited_x_times": "{count, plural, one {{count} car} other {{count} car}} hate serrastkirin",
   "status.embed": "Bi cih bike",
   "status.filter": "Vê şandiyê parzûn bike",
diff --git a/app/javascript/mastodon/locales/la.json b/app/javascript/mastodon/locales/la.json
index 698b3da4c33cbf..99aac2ef1374c9 100644
--- a/app/javascript/mastodon/locales/la.json
+++ b/app/javascript/mastodon/locales/la.json
@@ -139,7 +139,6 @@
   "status.copy": "Copy link to status",
   "status.delete": "Oblitterare",
   "status.edit": "Recolere",
-  "status.edited": "Recultum {date}",
   "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
   "status.open": "Expand this status",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
diff --git a/app/javascript/mastodon/locales/lad.json b/app/javascript/mastodon/locales/lad.json
index e23f2259282044..9a85344923839a 100644
--- a/app/javascript/mastodon/locales/lad.json
+++ b/app/javascript/mastodon/locales/lad.json
@@ -659,7 +659,6 @@
   "status.direct": "Enmenta a @{name} en privado",
   "status.direct_indicator": "Enmentadura privada",
   "status.edit": "Edita",
-  "status.edited": "Editado {date}",
   "status.edited_x_times": "Editado {count, plural, one {{count} vez} other {{count} vezes}}",
   "status.embed": "Inkrusta",
   "status.favourite": "Te plaze",
diff --git a/app/javascript/mastodon/locales/lt.json b/app/javascript/mastodon/locales/lt.json
index 326560c8886ea7..15034609780134 100644
--- a/app/javascript/mastodon/locales/lt.json
+++ b/app/javascript/mastodon/locales/lt.json
@@ -656,10 +656,11 @@
   "status.direct": "Privačiai paminėti @{name}",
   "status.direct_indicator": "Privatus paminėjimas",
   "status.edit": "Redaguoti",
-  "status.edited": "Redaguota {date}",
+  "status.edited": "Paskutinį kartą redaguota {date}",
   "status.edited_x_times": "Redaguota {count, plural, one {{count} kartą} few {{count} kartus} many {{count} karto} other {{count} kartų}}",
   "status.embed": "Įterpti",
   "status.favourite": "Pamėgti",
+  "status.favourites": "{count, plural, one {mėgstamas} few {mėgstamai} many {mėgstamų} other {mėgstamų}}",
   "status.filter": "Filtruoti šį įrašą",
   "status.filtered": "Filtruota",
   "status.hide": "Slėpti įrašą",
diff --git a/app/javascript/mastodon/locales/lv.json b/app/javascript/mastodon/locales/lv.json
index 47f10d94c1f317..726ae655c21264 100644
--- a/app/javascript/mastodon/locales/lv.json
+++ b/app/javascript/mastodon/locales/lv.json
@@ -623,15 +623,14 @@
   "status.admin_status": "Atvērt šo ziņu moderācijas saskarnē",
   "status.block": "Bloķēt @{name}",
   "status.bookmark": "Grāmatzīme",
-  "status.cancel_reblog_private": "Neizcelt",
+  "status.cancel_reblog_private": "Nepastiprināt",
   "status.cannot_reblog": "Šo ziņu nevar izcelt",
-  "status.copy": "Kopēt saiti uz ziņu",
+  "status.copy": "Ievietot ieraksta saiti starpliktuvē",
   "status.delete": "Dzēst",
   "status.detailed_status": "Detalizēts sarunas skats",
   "status.direct": "Pieminēt @{name} privāti",
   "status.direct_indicator": "Pieminēts privāti",
   "status.edit": "Labot",
-  "status.edited": "Labots {date}",
   "status.edited_x_times": "Labots {count, plural, one {{count} reizi} other {{count} reizes}}",
   "status.embed": "Iestrādāt",
   "status.favourite": "Iecienīts",
diff --git a/app/javascript/mastodon/locales/ms.json b/app/javascript/mastodon/locales/ms.json
index 20bd248c3af629..155eeccee67d16 100644
--- a/app/javascript/mastodon/locales/ms.json
+++ b/app/javascript/mastodon/locales/ms.json
@@ -632,7 +632,6 @@
   "status.direct": "Sebut secara peribadi @{name}",
   "status.direct_indicator": "Sebutan peribadi",
   "status.edit": "Sunting",
-  "status.edited": "Disunting {date}",
   "status.edited_x_times": "Disunting {count, plural, other {{count} kali}}",
   "status.embed": "Benaman",
   "status.favourite": "Kegemaran",
diff --git a/app/javascript/mastodon/locales/my.json b/app/javascript/mastodon/locales/my.json
index 1b129aaa0fe302..001e15e0d119e7 100644
--- a/app/javascript/mastodon/locales/my.json
+++ b/app/javascript/mastodon/locales/my.json
@@ -610,7 +610,6 @@
   "status.direct": "@{name} ကို သီးသန့်ဖော်ပြမည်\n",
   "status.direct_indicator": "သီးသန့်ဖော်ပြခြင်း။",
   "status.edit": "ပြင်ဆင်ရန်",
-  "status.edited": "{date} ကို ပြင်ဆင်ပြီးပါပြီ",
   "status.edited_x_times": "{count, plural, one {{count} time} other {{count} times}} ပြင်ဆင်ခဲ့သည်",
   "status.embed": "Embed",
   "status.favourite": "Favorite",
diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json
index 34a0c5ea5a4045..cdb5562e90cc3a 100644
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@@ -662,10 +662,11 @@
   "status.direct": "@{name} een privébericht sturen",
   "status.direct_indicator": "Privébericht",
   "status.edit": "Bewerken",
-  "status.edited": "Bewerkt op {date}",
+  "status.edited": "Laatste bewerking op {date}",
   "status.edited_x_times": "{count, plural, one {{count} keer} other {{count} keer}} bewerkt",
   "status.embed": "Embedden",
   "status.favourite": "Favoriet",
+  "status.favourites": "{count, plural, one {# favoriet} other {# favorieten}}",
   "status.filter": "Dit bericht filteren",
   "status.filtered": "Gefilterd",
   "status.hide": "Bericht verbergen",
@@ -686,6 +687,7 @@
   "status.reblog": "Boosten",
   "status.reblog_private": "Boost naar oorspronkelijke ontvangers",
   "status.reblogged_by": "{name} boostte",
+  "status.reblogs": "{count, plural, one {boost} other {boosts}}",
   "status.reblogs.empty": "Niemand heeft dit bericht nog geboost. Wanneer iemand dit doet, valt dat hier te zien.",
   "status.redraft": "Verwijderen en herschrijven",
   "status.remove_bookmark": "Bladwijzer verwijderen",
diff --git a/app/javascript/mastodon/locales/nn.json b/app/javascript/mastodon/locales/nn.json
index 94fee3498de0bf..4235f579162d32 100644
--- a/app/javascript/mastodon/locales/nn.json
+++ b/app/javascript/mastodon/locales/nn.json
@@ -662,7 +662,6 @@
   "status.direct": "Nevn @{name} privat",
   "status.direct_indicator": "Privat omtale",
   "status.edit": "Rediger",
-  "status.edited": "Redigert {date}",
   "status.edited_x_times": "Redigert {count, plural, one {{count} gong} other {{count} gonger}}",
   "status.embed": "Bygg inn",
   "status.favourite": "Favoritt",
diff --git a/app/javascript/mastodon/locales/no.json b/app/javascript/mastodon/locales/no.json
index 14e33e9f18b562..4834100a915aef 100644
--- a/app/javascript/mastodon/locales/no.json
+++ b/app/javascript/mastodon/locales/no.json
@@ -634,7 +634,6 @@
   "status.direct": "Nevn @{name} privat",
   "status.direct_indicator": "Privat omtale",
   "status.edit": "Rediger",
-  "status.edited": "Redigert {date}",
   "status.edited_x_times": "Redigert {count, plural,one {{count} gang} other {{count} ganger}}",
   "status.embed": "Bygge inn",
   "status.favourite": "Favoritt",
diff --git a/app/javascript/mastodon/locales/oc.json b/app/javascript/mastodon/locales/oc.json
index 09276b3b326b83..2a5d05aac72b0c 100644
--- a/app/javascript/mastodon/locales/oc.json
+++ b/app/javascript/mastodon/locales/oc.json
@@ -525,7 +525,6 @@
   "status.direct": "Mencionar @{name} en privat",
   "status.direct_indicator": "Mencion privada",
   "status.edit": "Modificar",
-  "status.edited": "Modificat {date}",
   "status.edited_x_times": "Modificat {count, plural, un {{count} còp} other {{count} còps}}",
   "status.embed": "Embarcar",
   "status.favourite": "Apondre als favorits",
diff --git a/app/javascript/mastodon/locales/pa.json b/app/javascript/mastodon/locales/pa.json
index 69360184fc095f..f86a6933fcf4cc 100644
--- a/app/javascript/mastodon/locales/pa.json
+++ b/app/javascript/mastodon/locales/pa.json
@@ -310,7 +310,6 @@
   "status.copy": "ਪੋਸਟ ਲਈ ਲਿੰਕ ਕਾਪੀ ਕਰੋ",
   "status.delete": "ਹਟਾਓ",
   "status.edit": "ਸੋਧ",
-  "status.edited": "{date} ਨੂੰ ਸੋਧਿਆ",
   "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
   "status.embed": "ਮੜ੍ਹੋ",
   "status.favourite": "ਪਸੰਦ",
diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json
index 51f705b692fe64..acd389da1c2166 100644
--- a/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@@ -662,10 +662,11 @@
   "status.direct": "Prywatna wzmianka @{name}",
   "status.direct_indicator": "Prywatna wzmianka",
   "status.edit": "Edytuj",
-  "status.edited": "Edytowano {date}",
+  "status.edited": "Ostatnio edytowane {date}",
   "status.edited_x_times": "Edytowano {count, plural, one {{count} raz} other {{count} razy}}",
   "status.embed": "Osadź",
   "status.favourite": "Dodaj do ulubionych",
+  "status.favourites": "{count, plural, one {polubienie} few {polubienia} other {polubień}}",
   "status.filter": "Filtruj ten wpis",
   "status.filtered": "Filtrowany(-a)",
   "status.hide": "Ukryj post",
@@ -686,6 +687,7 @@
   "status.reblog": "Podbij",
   "status.reblog_private": "Podbij dla odbiorców oryginalnego wpisu",
   "status.reblogged_by": "Podbite przez {name}",
+  "status.reblogs": "{count, plural, one {podbicie} few {podbicia} other {podbić}}",
   "status.reblogs.empty": "Nikt nie podbił jeszcze tego wpisu. Gdy ktoś to zrobi, pojawi się tutaj.",
   "status.redraft": "Usuń i przeredaguj",
   "status.remove_bookmark": "Usuń zakładkę",
diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json
index a0b66e74e7ee56..585052de918413 100644
--- a/app/javascript/mastodon/locales/pt-BR.json
+++ b/app/javascript/mastodon/locales/pt-BR.json
@@ -241,6 +241,7 @@
   "empty_column.list": "Nada aqui. Quando membros da lista tootarem, eles aparecerão aqui.",
   "empty_column.lists": "Nada aqui. Quando você criar listas, elas aparecerão aqui.",
   "empty_column.mutes": "Nada aqui.",
+  "empty_column.notification_requests": "Tudo limpo! Não há nada aqui. Quando você receber novas notificações, elas aparecerão aqui de acordo com suas configurações.",
   "empty_column.notifications": "Interaja com outros usuários para começar a conversar.",
   "empty_column.public": "Publique algo ou siga manualmente usuários de outros servidores",
   "error.unexpected_crash.explanation": "Esta página não pôde ser mostrada corretamente. Este erro provavelmente é devido a um bug em nosso código ou um problema de compatibilidade de navegador.",
@@ -271,13 +272,20 @@
   "filter_modal.select_filter.subtitle": "Use uma categoria existente ou crie uma nova",
   "filter_modal.select_filter.title": "Filtrar esta publicação",
   "filter_modal.title.status": "Filtrar uma publicação",
+  "filtered_notifications_banner.title": "Notificações filtradas",
   "firehose.all": "Tudo",
   "firehose.local": "Este servidor",
   "firehose.remote": "Outros servidores",
   "follow_request.authorize": "Aprovar",
   "follow_request.reject": "Recusar",
   "follow_requests.unlocked_explanation": "Apesar de seu perfil não ser trancado, {domain} exige que você revise a solicitação para te seguir destes perfis manualmente.",
+  "follow_suggestions.curated_suggestion": "Escolha da equipe",
   "follow_suggestions.dismiss": "Não mostrar novamente",
+  "follow_suggestions.hints.featured": "Este perfil foi escolhido a dedo pela equipe {domain}.",
+  "follow_suggestions.hints.friends_of_friends": "Este perfil é popular entre as pessoas que você segue.",
+  "follow_suggestions.hints.most_followed": "Este perfil é um dos mais seguidos em {domain}.",
+  "follow_suggestions.hints.most_interactions": "Este perfil tem recebido recentemente muita atenção em {domain}.",
+  "follow_suggestions.hints.similar_to_recently_followed": "Este perfil é semelhante aos perfis que você seguiu recentemente.",
   "follow_suggestions.personalized_suggestion": "Sugestão personalizada",
   "follow_suggestions.popular_suggestion": "Sugestão popular",
   "follow_suggestions.view_all": "Visualizar tudo",
@@ -433,6 +441,10 @@
   "notification.reblog": "{name} deu boost no teu toot",
   "notification.status": "{name} acabou de tootar",
   "notification.update": "{name} editou uma publicação",
+  "notification_requests.accept": "Aceitar",
+  "notification_requests.dismiss": "Rejeitar",
+  "notification_requests.notifications_from": "Notificações de {name}",
+  "notification_requests.title": "Notificações filtradas",
   "notifications.clear": "Limpar notificações",
   "notifications.clear_confirmation": "Você tem certeza de que deseja limpar todas as suas notificações?",
   "notifications.column_settings.admin.report": "Novas denúncias:",
@@ -464,6 +476,13 @@
   "notifications.permission_denied": "Navegador não tem permissão para ativar notificações no computador.",
   "notifications.permission_denied_alert": "Verifique a permissão do navegador para ativar notificações no computador.",
   "notifications.permission_required": "Ativar notificações no computador exige permissão do navegador.",
+  "notifications.policy.filter_new_accounts_title": "Novas contas",
+  "notifications.policy.filter_not_followers_title": "Pessoas que não estão te seguindo",
+  "notifications.policy.filter_not_following_hint": "Até que você os aprove manualmente",
+  "notifications.policy.filter_not_following_title": "Pessoas que você não segue",
+  "notifications.policy.filter_private_mentions_hint": "Filtrado, a menos que respondido em sua própria menção ou se você segue o remetente",
+  "notifications.policy.filter_private_mentions_title": "Menções privadas não solicitadas",
+  "notifications.policy.title": "Filtrar notificações de…",
   "notifications_permission_banner.enable": "Ativar notificações no computador",
   "notifications_permission_banner.how_to_control": "Para receber notificações quando o Mastodon não estiver aberto, ative as notificações no computador. Você pode controlar precisamente quais tipos de interações geram notificações no computador através do botão {icon}.",
   "notifications_permission_banner.title": "Nunca perca nada",
@@ -525,6 +544,9 @@
   "privacy.private.short": "Seguidores",
   "privacy.public.long": "Qualquer um dentro ou fora do Mastodon",
   "privacy.public.short": "Público",
+  "privacy.unlisted.additional": "Isso se comporta exatamente como público, exceto que a publicação não aparecerá nos _feeds ao vivo_ ou nas _hashtags_, explorar, ou barra de busca, mesmo que você seja escolhido em toda a conta.",
+  "privacy.unlisted.long": "Menos notificações e recomendações do algoritmo",
+  "privacy.unlisted.short": "Público (silencioso)",
   "privacy_policy.last_updated": "Atualizado {date}",
   "privacy_policy.title": "Política de privacidade",
   "recommended": "Recomendado",
@@ -636,7 +658,7 @@
   "status.direct": "Mencione em privado @{name}",
   "status.direct_indicator": "Menção privada",
   "status.edit": "Editar",
-  "status.edited": "Editado em {date}",
+  "status.edited": "Última edição em {date}",
   "status.edited_x_times": "Editado {count, plural, one {{count} hora} other {{count} vezes}}",
   "status.embed": "Incorporar",
   "status.favourite": "Favorita",
diff --git a/app/javascript/mastodon/locales/pt-PT.json b/app/javascript/mastodon/locales/pt-PT.json
index 18a550d641ca77..c5a837a34c2ed0 100644
--- a/app/javascript/mastodon/locales/pt-PT.json
+++ b/app/javascript/mastodon/locales/pt-PT.json
@@ -662,10 +662,11 @@
   "status.direct": "Mencionar @{name} em privado",
   "status.direct_indicator": "Menção privada",
   "status.edit": "Editar",
-  "status.edited": "Editado em {date}",
+  "status.edited": "Última edição em {date}",
   "status.edited_x_times": "Editado {count, plural,one {{count} vez} other {{count} vezes}}",
   "status.embed": "Embutir",
   "status.favourite": "Assinalar como favorito",
+  "status.favourites": "{count, plural, one {favorito} other {favoritos}}",
   "status.filter": "Filtrar esta publicação",
   "status.filtered": "Filtrada",
   "status.hide": "Ocultar publicação",
@@ -686,6 +687,7 @@
   "status.reblog": "Partilhar",
   "status.reblog_private": "Partilhar com a visibilidade original",
   "status.reblogged_by": "{name} reforçou",
+  "status.reblogs": "{count, plural, one {partilha} other {partilhas}}",
   "status.reblogs.empty": "Ainda ninguém reforçou esta publicação. Quando alguém o fizer, ele irá aparecer aqui.",
   "status.redraft": "Apagar & reescrever",
   "status.remove_bookmark": "Retirar dos marcadores",
diff --git a/app/javascript/mastodon/locales/ro.json b/app/javascript/mastodon/locales/ro.json
index f31499f8454004..37e999053cead9 100644
--- a/app/javascript/mastodon/locales/ro.json
+++ b/app/javascript/mastodon/locales/ro.json
@@ -576,7 +576,6 @@
   "status.direct": "Menționează @{name} în privat",
   "status.direct_indicator": "Mențiune privată",
   "status.edit": "Modifică",
-  "status.edited": "Modificat în data de {date}",
   "status.edited_x_times": "Modificată {count, plural, one {o dată} few {de {count} ori} other {de {count} de ori}}",
   "status.embed": "Înglobează",
   "status.filter": "Filtrează această postare",
diff --git a/app/javascript/mastodon/locales/ru.json b/app/javascript/mastodon/locales/ru.json
index 000d485edaf499..917b8f49654319 100644
--- a/app/javascript/mastodon/locales/ru.json
+++ b/app/javascript/mastodon/locales/ru.json
@@ -640,7 +640,6 @@
   "status.direct": "Лично упоминать @{name}",
   "status.direct_indicator": "Личные упоминания",
   "status.edit": "Изменить",
-  "status.edited": "Последнее изменение: {date}",
   "status.edited_x_times": "{count, plural, one {{count} изменение} many {{count} изменений} other {{count} изменения}}",
   "status.embed": "Встроить на свой сайт",
   "status.favourite": "Избранное",
diff --git a/app/javascript/mastodon/locales/sa.json b/app/javascript/mastodon/locales/sa.json
index 36dae25c172708..8620b348e340a6 100644
--- a/app/javascript/mastodon/locales/sa.json
+++ b/app/javascript/mastodon/locales/sa.json
@@ -523,7 +523,6 @@
   "status.delete": "मार्जय",
   "status.detailed_status": "विस्तृतसंभाषणदृश्यम्",
   "status.edit": "सम्पादय",
-  "status.edited": "सम्पादितं {date}",
   "status.edited_x_times": "Edited {count, plural, one {{count} वारम्} other {{count} वारम्}}",
   "status.embed": "निहितम्",
   "status.filter": "पत्रमिदं फिल्तरं कुरु",
diff --git a/app/javascript/mastodon/locales/sco.json b/app/javascript/mastodon/locales/sco.json
index 7e9778b57cf97b..7d6997131ef906 100644
--- a/app/javascript/mastodon/locales/sco.json
+++ b/app/javascript/mastodon/locales/sco.json
@@ -494,7 +494,6 @@
   "status.delete": "Delete",
   "status.detailed_status": "Detailt conversation view",
   "status.edit": "Edit",
-  "status.edited": "Editit {date}",
   "status.edited_x_times": "Editit {count, plural, one {{count} time} other {{count} times}}",
   "status.embed": "Embed",
   "status.filter": "Filter this post",
diff --git a/app/javascript/mastodon/locales/si.json b/app/javascript/mastodon/locales/si.json
index a2194b56cb2597..e310a63edceac2 100644
--- a/app/javascript/mastodon/locales/si.json
+++ b/app/javascript/mastodon/locales/si.json
@@ -404,7 +404,6 @@
   "status.delete": "මකන්න",
   "status.detailed_status": "විස්තරාත්මක සංවාද දැක්ම",
   "status.edit": "සංස්කරණය",
-  "status.edited": "සංශෝධිතයි {date}",
   "status.edited_x_times": "සංශෝධිතයි {count, plural, one {වාර {count}} other {වාර {count}}}",
   "status.embed": "කාවැද්දූ",
   "status.filter": "මෙම ලිපිය පෙරන්න",
diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json
index 07f7617358b290..499ce9794ceff7 100644
--- a/app/javascript/mastodon/locales/sk.json
+++ b/app/javascript/mastodon/locales/sk.json
@@ -653,7 +653,6 @@
   "status.direct": "Súkromne označiť @{name}",
   "status.direct_indicator": "Súkromné označenie",
   "status.edit": "Upraviť",
-  "status.edited": "Upravené {date}",
   "status.edited_x_times": "Upravený {count, plural, other {{count}×}}",
   "status.embed": "Vložiť",
   "status.favourite": "Ohviezdičkované",
diff --git a/app/javascript/mastodon/locales/sl.json b/app/javascript/mastodon/locales/sl.json
index 1fe7dd07865206..c96e9291636325 100644
--- a/app/javascript/mastodon/locales/sl.json
+++ b/app/javascript/mastodon/locales/sl.json
@@ -662,10 +662,11 @@
   "status.direct": "Zasebno omeni @{name}",
   "status.direct_indicator": "Zasebna omemba",
   "status.edit": "Uredi",
-  "status.edited": "Urejeno {date}",
+  "status.edited": "Zadnje urejanje {date}",
   "status.edited_x_times": "Urejeno {count, plural, one {#-krat} two {#-krat} few {#-krat} other {#-krat}}",
   "status.embed": "Vdelaj",
   "status.favourite": "Priljubljen_a",
+  "status.favourites": "{count, plural, one {priljubitev} two {priljubitvi} few {priljubitve} other {priljubitev}}",
   "status.filter": "Filtriraj to objavo",
   "status.filtered": "Filtrirano",
   "status.hide": "Skrij objavo",
@@ -686,6 +687,7 @@
   "status.reblog": "Izpostavi",
   "status.reblog_private": "Izpostavi z izvirno vidljivostjo",
   "status.reblogged_by": "{name} je izpostavil/a",
+  "status.reblogs": "{count, plural, one {izpostavitev} two {izpostavitvi} few {izpostavitve} other {izpostavitev}}",
   "status.reblogs.empty": "Nihče še ni izpostavil te objave. Ko se bo to zgodilo, se bodo pojavile tukaj.",
   "status.redraft": "Izbriši in preoblikuj",
   "status.remove_bookmark": "Odstrani zaznamek",
diff --git a/app/javascript/mastodon/locales/sq.json b/app/javascript/mastodon/locales/sq.json
index beba09d59be89c..8c710555944686 100644
--- a/app/javascript/mastodon/locales/sq.json
+++ b/app/javascript/mastodon/locales/sq.json
@@ -659,7 +659,6 @@
   "status.direct": "Përmendje private për @{name}",
   "status.direct_indicator": "Përmendje private",
   "status.edit": "Përpunojeni",
-  "status.edited": "Përpunuar më {date}",
   "status.edited_x_times": "Përpunuar {count, plural, one {{count} herë} other {{count} herë}}",
   "status.embed": "Trupëzim",
   "status.favourite": "I vini shenjë si të parapëlqyer",
diff --git a/app/javascript/mastodon/locales/sr-Latn.json b/app/javascript/mastodon/locales/sr-Latn.json
index 6a5ad998d4b6f6..6281f729f77aca 100644
--- a/app/javascript/mastodon/locales/sr-Latn.json
+++ b/app/javascript/mastodon/locales/sr-Latn.json
@@ -662,10 +662,11 @@
   "status.direct": "Privatno pomeni @{name}",
   "status.direct_indicator": "Privatno pominjanje",
   "status.edit": "Uredi",
-  "status.edited": "Uređeno {date}",
+  "status.edited": "Poslednje uređivanje {date}",
   "status.edited_x_times": "Uređeno {count, plural, one {{count} put} other {{count} puta}}",
   "status.embed": "Ugradi",
   "status.favourite": "Omiljeno",
+  "status.favourites": "{count, plural, one {# omiljeno} few {# omiljena} other {# omiljenih}}",
   "status.filter": "Filtriraj ovu objavu",
   "status.filtered": "Filtrirano",
   "status.hide": "Sakrij objavu",
@@ -686,6 +687,7 @@
   "status.reblog": "Podrži",
   "status.reblog_private": "Podrži sa originalnom vidljivošću",
   "status.reblogged_by": "{name} je podržao/la",
+  "status.reblogs": "{count, plural, one {# podržavanje} few {# podržavanja} other {# podržavanja}}",
   "status.reblogs.empty": "Još uvek niko nije podržao ovu objavu. Kada bude podržana, pojaviće se ovde.",
   "status.redraft": "Izbriši i preoblikuj",
   "status.remove_bookmark": "Ukloni obeleživač",
diff --git a/app/javascript/mastodon/locales/sr.json b/app/javascript/mastodon/locales/sr.json
index 9f96a2ccc05016..ae550315e44319 100644
--- a/app/javascript/mastodon/locales/sr.json
+++ b/app/javascript/mastodon/locales/sr.json
@@ -662,10 +662,11 @@
   "status.direct": "Приватно помени @{name}",
   "status.direct_indicator": "Приватно помињање",
   "status.edit": "Уреди",
-  "status.edited": "Уређено {date}",
+  "status.edited": "Последње уређивање {date}",
   "status.edited_x_times": "Уређено {count, plural, one {{count} пут} other {{count} пута}}",
   "status.embed": "Угради",
   "status.favourite": "Омиљено",
+  "status.favourites": "{count, plural, one {# омиљено} few {# омиљена} other {# омиљених}}",
   "status.filter": "Филтрирај ову објаву",
   "status.filtered": "Филтрирано",
   "status.hide": "Сакриј објаву",
@@ -686,6 +687,7 @@
   "status.reblog": "Подржи",
   "status.reblog_private": "Подржи са оригиналном видљивошћу",
   "status.reblogged_by": "{name} је подржао/ла",
+  "status.reblogs": "{count, plural, one {# подржавање} few {# подржавања} other {# подржавања}}",
   "status.reblogs.empty": "Још увек нико није подржао ову објаву. Када буде подржана, појавиће се овде.",
   "status.redraft": "Избриши и преобликуј",
   "status.remove_bookmark": "Уклони обележивач",
diff --git a/app/javascript/mastodon/locales/sv.json b/app/javascript/mastodon/locales/sv.json
index 37886cd80fad7e..6bf7471359e967 100644
--- a/app/javascript/mastodon/locales/sv.json
+++ b/app/javascript/mastodon/locales/sv.json
@@ -649,10 +649,11 @@
   "status.direct": "Nämn @{name} privat",
   "status.direct_indicator": "Privat nämning",
   "status.edit": "Redigera",
-  "status.edited": "Ändrad {date}",
+  "status.edited": "Senast ändrad {date}",
   "status.edited_x_times": "Redigerad {count, plural, one {{count} gång} other {{count} gånger}}",
   "status.embed": "Bädda in",
   "status.favourite": "Favoritmarkera",
+  "status.favourites": "{count, plural, one {favorit} other {favoriter}}",
   "status.filter": "Filtrera detta inlägg",
   "status.filtered": "Filtrerat",
   "status.hide": "Dölj inlägg",
diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json
index 28b176451063ad..d3a04209fd8c74 100644
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@@ -662,7 +662,6 @@
   "status.direct": "กล่าวถึง @{name} แบบส่วนตัว",
   "status.direct_indicator": "การกล่าวถึงแบบส่วนตัว",
   "status.edit": "แก้ไข",
-  "status.edited": "แก้ไขเมื่อ {date}",
   "status.edited_x_times": "แก้ไข {count, plural, other {{count} ครั้ง}}",
   "status.embed": "ฝัง",
   "status.favourite": "ชื่นชอบ",
diff --git a/app/javascript/mastodon/locales/tok.json b/app/javascript/mastodon/locales/tok.json
index 64c3f98db7f62f..f6bf927b948e21 100644
--- a/app/javascript/mastodon/locales/tok.json
+++ b/app/javascript/mastodon/locales/tok.json
@@ -339,7 +339,6 @@
   "status.cancel_reblog_private": "o pini e pana",
   "status.delete": "o weka",
   "status.edit": "o ante",
-  "status.edited": "ni li ante lon {date}",
   "status.embed": "ni o lon insa pi lipu ante",
   "status.favourite": "o suli",
   "status.hide": "o len",
diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json
index 08fe40fe455f52..b5209c2dad9492 100644
--- a/app/javascript/mastodon/locales/tr.json
+++ b/app/javascript/mastodon/locales/tr.json
@@ -662,10 +662,11 @@
   "status.direct": "@{name} kullanıcısına özelden değin",
   "status.direct_indicator": "Özel değinme",
   "status.edit": "Düzenle",
-  "status.edited": "{date} tarihinde düzenlenmiş",
+  "status.edited": "Son düzenleme {date}",
   "status.edited_x_times": "{count, plural, one {{count} kez} other {{count} kez}} düzenlendi",
   "status.embed": "Gömülü",
   "status.favourite": "Favori",
+  "status.favourites": "{count, plural, one {beğeni} other {beğeni}}",
   "status.filter": "Bu gönderiyi süzgeçle",
   "status.filtered": "Süzgeçlenmiş",
   "status.hide": "Gönderiyi gizle",
@@ -686,6 +687,7 @@
   "status.reblog": "Yeniden paylaş",
   "status.reblog_private": "Özgün görünürlük ile yeniden paylaş",
   "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.remove_bookmark": "Yer işaretini kaldır",
diff --git a/app/javascript/mastodon/locales/tt.json b/app/javascript/mastodon/locales/tt.json
index 49c7e9a1453855..ccddd82490c086 100644
--- a/app/javascript/mastodon/locales/tt.json
+++ b/app/javascript/mastodon/locales/tt.json
@@ -425,7 +425,6 @@
   "status.delete": "Бетерү",
   "status.direct_indicator": "Хосусый искә алу",
   "status.edit": "Үзгәртү",
-  "status.edited": "{date} көнне төзәтте",
   "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
   "status.embed": "Веб-биткә кертү",
   "status.filtered": "Сөзелгән",
diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json
index 49d79d32d1a5d4..14cff9d82fad2b 100644
--- a/app/javascript/mastodon/locales/uk.json
+++ b/app/javascript/mastodon/locales/uk.json
@@ -241,6 +241,7 @@
   "empty_column.list": "Цей список порожній. Коли його учасники додадуть нові дописи, вони з'являться тут.",
   "empty_column.lists": "У вас ще немає списків. Коли ви їх створите, вони з'являться тут.",
   "empty_column.mutes": "Ви ще не приховали жодного користувача.",
+  "empty_column.notification_requests": "Усе чисто! Тут нічого немає. Коли ви отримаєте нові сповіщення, вони з'являться тут відповідно до ваших налаштувань.",
   "empty_column.notifications": "У вас ще немає сповіщень. Коли інші люди почнуть взаємодіяти з вами, ви побачите їх тут.",
   "empty_column.public": "Тут поки нічого немає! Опублікуйте щось, або вручну підпишіться на користувачів інших серверів, щоб заповнити стрічку",
   "error.unexpected_crash.explanation": "Через помилку у нашому коді або несумісність браузера, ця сторінка не може бути зображена коректно.",
@@ -271,6 +272,8 @@
   "filter_modal.select_filter.subtitle": "Використати наявну категорію або створити нову",
   "filter_modal.select_filter.title": "Фільтрувати цей допис",
   "filter_modal.title.status": "Фільтрувати допис",
+  "filtered_notifications_banner.pending_requests": "Сповіщення від {count, plural, =0 {жодної особи} one {однієї особи} few {# осіб} many {# осіб} other {# особи}}, котрих ви можете знати",
+  "filtered_notifications_banner.title": "Відфільтровані сповіщення",
   "firehose.all": "Всі",
   "firehose.local": "Цей сервер",
   "firehose.remote": "Інші сервери",
@@ -474,7 +477,11 @@
   "notifications.permission_denied": "Сповіщення стільниці недоступні через раніше відхилений запит дозволів для браузера",
   "notifications.permission_denied_alert": "Сповіщення не можна ввімкнути оскільки у дозволі вже було відмовлено раніше",
   "notifications.permission_required": "Сповіщення на стільниці не доступні, оскільки необхідний дозвіл не надано.",
+  "notifications.policy.filter_new_accounts.hint": "Створено впродовж {days, plural, one {одного} few {# днів} many {# днів} other {# дня}}",
   "notifications.policy.filter_new_accounts_title": "Нові облікові записи",
+  "notifications.policy.filter_not_followers_title": "Люди не підписані на вас",
+  "notifications.policy.filter_not_following_hint": "Доки ви не схвалюєте їх вручну",
+  "notifications.policy.filter_not_following_title": "Люди, на яких ви не підписані",
   "notifications_permission_banner.enable": "Увімкнути сповіщення стільниці",
   "notifications_permission_banner.how_to_control": "Щоб отримувати сповіщення, коли Mastodon не відкрито, увімкніть сповіщення стільниці. Ви можете контролювати, які типи взаємодій створюють сповіщення через кнопку {icon} вгорі після їхнього увімкнення.",
   "notifications_permission_banner.title": "Не проґавте нічого",
@@ -651,10 +658,11 @@
   "status.direct": "Особиста згадка @{name}",
   "status.direct_indicator": "Особиста згадка",
   "status.edit": "Редагувати",
-  "status.edited": "Відредаговано {date}",
+  "status.edited": "Востаннє змінено {date}",
   "status.edited_x_times": "Відредаговано {count, plural, one {{count} раз} few {{count} рази} many {{counter} разів} other {{counter} разів}}",
   "status.embed": "Вбудувати",
   "status.favourite": "Уподобане",
+  "status.favourites": "{count, plural, one {вподобання} few {вподобання} many {вподобань} other {вподобання}}",
   "status.filter": "Фільтрувати цей допис",
   "status.filtered": "Відфільтровано",
   "status.hide": "Сховати допис",
@@ -675,6 +683,7 @@
   "status.reblog": "Поширити",
   "status.reblog_private": "Поширити для початкової аудиторії",
   "status.reblogged_by": "{name} поширює",
+  "status.reblogs": "{count, plural, one {поширення} few {поширення} many {поширень} other {поширення}}",
   "status.reblogs.empty": "Ніхто ще не поширив цей допис. Коли хтось це зроблять, вони будуть зображені тут.",
   "status.redraft": "Видалити та виправити",
   "status.remove_bookmark": "Видалити закладку",
diff --git a/app/javascript/mastodon/locales/vi.json b/app/javascript/mastodon/locales/vi.json
index 998aecd2750480..afd912556ea503 100644
--- a/app/javascript/mastodon/locales/vi.json
+++ b/app/javascript/mastodon/locales/vi.json
@@ -662,7 +662,6 @@
   "status.direct": "Nhắn riêng @{name}",
   "status.direct_indicator": "Nhắn riêng",
   "status.edit": "Sửa",
-  "status.edited": "Đã sửa {date}",
   "status.edited_x_times": "Đã sửa {count, plural, other {{count} lần}}",
   "status.embed": "Nhúng",
   "status.favourite": "Thích",
diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json
index 6d6cd4b6c7eb60..7694270d1026b2 100644
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@@ -662,10 +662,11 @@
   "status.direct": "私下提及 @{name}",
   "status.direct_indicator": "私下提及",
   "status.edit": "编辑",
-  "status.edited": "编辑于 {date}",
+  "status.edited": "最近编辑于 {date}",
   "status.edited_x_times": "共编辑 {count, plural, one {{count} 次} other {{count} 次}}",
   "status.embed": "嵌入",
   "status.favourite": "喜欢",
+  "status.favourites": "{count, plural, other {次喜欢}}",
   "status.filter": "过滤此嘟文",
   "status.filtered": "已过滤",
   "status.hide": "隐藏嘟文",
@@ -686,6 +687,7 @@
   "status.reblog": "转嘟",
   "status.reblog_private": "转嘟（可见者不变）",
   "status.reblogged_by": "{name} 转嘟了",
+  "status.reblogs": "{count, plural, other {次转嘟}}",
   "status.reblogs.empty": "没有人转嘟过此条嘟文。如果有人转嘟了，就会显示在这里。",
   "status.redraft": "删除并重新编辑",
   "status.remove_bookmark": "移除书签",
diff --git a/app/javascript/mastodon/locales/zh-HK.json b/app/javascript/mastodon/locales/zh-HK.json
index 74a5c5a2d64fc0..3ec1085ec23599 100644
--- a/app/javascript/mastodon/locales/zh-HK.json
+++ b/app/javascript/mastodon/locales/zh-HK.json
@@ -640,7 +640,6 @@
   "status.direct": "私下提及 @{name}",
   "status.direct_indicator": "私人提及",
   "status.edit": "編輯",
-  "status.edited": "編輯於 {date}",
   "status.edited_x_times": "Edited {count, plural, one {{count} 次} other {{count} 次}}",
   "status.embed": "嵌入",
   "status.favourite": "最愛",
diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json
index ff0bd4c8ffaa32..c2450ac0156684 100644
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@@ -662,10 +662,11 @@
   "status.direct": "私訊 @{name}",
   "status.direct_indicator": "私訊",
   "status.edit": "編輯",
-  "status.edited": "編輯於 {date}",
+  "status.edited": "上次編輯於 {date}",
   "status.edited_x_times": "已編輯 {count, plural, one {{count} 次} other {{count} 次}}",
   "status.embed": "內嵌嘟文",
   "status.favourite": "最愛",
+  "status.favourites": "{count, plural, other {# 則最愛}}",
   "status.filter": "過濾此嘟文",
   "status.filtered": "已過濾",
   "status.hide": "隱藏嘟文",
@@ -686,6 +687,7 @@
   "status.reblog": "轉嘟",
   "status.reblog_private": "依照原嘟可見性轉嘟",
   "status.reblogged_by": "{name} 已轉嘟",
+  "status.reblogs": "{count, plural, other {# 則轉嘟}}",
   "status.reblogs.empty": "還沒有人轉嘟過這則嘟文。當有人轉嘟時，它將於此顯示。",
   "status.redraft": "刪除並重新編輯",
   "status.remove_bookmark": "移除書籤",
diff --git a/config/locales/devise.kab.yml b/config/locales/devise.kab.yml
index f878a5b5039058..438c1df2b9a46f 100644
--- a/config/locales/devise.kab.yml
+++ b/config/locales/devise.kab.yml
@@ -81,9 +81,9 @@ kab:
       update_needs_confirmation: Tleqmeḍ akken iwata amiḍan-ik·im, maca nesra ad nsenqed tansa-ik·im imayl tamaynut. Ttxil-k·m senqed imayl-k·m sakin ḍfer aseɣwen i usentem n n tansa imayl tamaynut. Ttxil senqed akaram n spam ma yella ur tufiḍ ara imayl-nni.
       updated: Amiḍan-ik·im yettwalqem akken iwata.
     sessions:
-      already_signed_out: Aqla-k teffγeḍ.
+      already_signed_out: Aqla-k teffɣeḍ.
       signed_in: Aqla-k teqqneḍ.
-      signed_out: Aqla-k teffγeḍ.
+      signed_out: Aqla-k teffɣeḍ.
     unlocks:
       send_instructions: Deg kra n tesdatin, ad teṭṭfeḍ imayl deg-s iwellihen i yilaqen i userreḥ n umiḍan-ik·im. Ma yella ur tufiḍ ara izen-agi, ttxil-k·m ẓer deg ukaram spam.
       send_paranoid_instructions: Ma yella umiḍan-ik·im yella, ad teṭṭfeḍ imayl deg tesdatin i d-iteddun, deg-s iwellihen i yilaqen i userreḥ n umiḍan-ik·im. Ma yella ur tufiḍ ara izen-agi, ttxil-k·m ẓer deg ukaram spam.
diff --git a/config/locales/devise.pt-BR.yml b/config/locales/devise.pt-BR.yml
index e79a83c4314760..4a7f346fabcf85 100644
--- a/config/locales/devise.pt-BR.yml
+++ b/config/locales/devise.pt-BR.yml
@@ -53,6 +53,7 @@ pt-BR:
         subtitle: A autenticação de dois fatores foi desativada.
         title: 2FA desativada
       two_factor_enabled:
+        explanation: Será necessário um código gerado pelo aplicativo de autenticação para fazer login.
         subject: 'Mastodon: Autenticação de dois fatores ativada'
         subtitle: A autenticação de dois fatores foi ativada para sua conta.
         title: 2FA ativada
@@ -74,6 +75,7 @@ pt-BR:
           title: Uma das suas chaves de segurança foi excluída
       webauthn_disabled:
         explanation: A autenticação por chaves de segurança foi desativada para sua conta.
+        extra: O login agora é possível usando o código gerado por um aplicativo de autenticação de dois fatores.
         subject: 'Mastodon: Autenticação por chaves de segurança desativada'
         title: Chaves de segurança desativadas
       webauthn_enabled:
diff --git a/config/locales/doorkeeper.gl.yml b/config/locales/doorkeeper.gl.yml
index 7564bc2dc63bb7..aa0eae2844e8c7 100644
--- a/config/locales/doorkeeper.gl.yml
+++ b/config/locales/doorkeeper.gl.yml
@@ -184,7 +184,7 @@ gl:
       write:blocks: bloquear contas e dominios
       write:bookmarks: marcar publicacións
       write:conversations: acalar e eliminar conversas
-      write:favourites: marcar como favorita
+      write:favourites: favorecer publicacións
       write:filters: crear filtros
       write:follows: seguir usuarias
       write:lists: crear listaxes
diff --git a/config/locales/doorkeeper.kab.yml b/config/locales/doorkeeper.kab.yml
index d7f8904a35e9b1..1b1a7df957645f 100644
--- a/config/locales/doorkeeper.kab.yml
+++ b/config/locales/doorkeeper.kab.yml
@@ -12,7 +12,7 @@ kab:
           attributes:
             redirect_uri:
               fragment_present: ur yezmir ad yegber afrur.
-              invalid_uri: ilaq ad tili d tansa URL tameγtut.
+              invalid_uri: ilaq ad tili d tansa URL tameɣtut.
               relative_uri: ilaq ad yili d URI amagdaz.
               secured_uri: ilaq URI ad yili HTTPS/SSL.
   doorkeeper:
@@ -40,7 +40,7 @@ kab:
         name: Isem
         new: Asnas amaynut
         show: Ẓer
-        title: Isnasen-ik
+        title: Isnasen-ik·im
       new:
         title: Asnas amaynut
       show:
@@ -64,6 +64,8 @@ kab:
       confirmations:
         revoke: Tetḥeqqeḍ?
       index:
+        description_html: Ha-t-an yisnasen i izemren ad kecmen ɣer umiḍan-ik·im, s useqdec n API. Ma llan yisnasen ur teεqileḍ ara da, neɣ kra n wesnas ur iteddu ara akken ilaq, tzemreḍ ad tekkseḍ anekcum-is.
+        last_used_at: Yettwaseqdec i tikkelt taneggarut ass n %{date}
         title: Isnasen-ik·im yettusirgen
     errors:
       messages:
@@ -98,7 +100,7 @@ kab:
       application:
         title: Tlaq tsiregt n OAuth
     scopes:
-      admin:read: γeṛ akk isefka γef uqeddac
+      admin:read: ad iɣeṛ akk isefka ɣef uqeddac
       admin:write: ẓreg akk isefka γef uqeddac
       follow: beddel assaγen n umiḍan
       push: ṭṭef-d tilγa-ik yettwademren
@@ -106,19 +108,19 @@ kab:
       read:accounts: ẓer isallen n yimiḍanen
       read:blocks: ẓer imiḍanen i tesḥebseḍ
       read:bookmarks: ẓer ticraḍ-ik
-      read:filters: ẓer imsizedgen-ik
+      read:filters: ad iẓer imsizdigen-ik·im
       read:follows: ẓer imeḍfaṛen-ik
       read:lists: ẓer tibdarin-ik·im
       read:mutes: ẓer wid i tesgugmeḍ
-      read:notifications: ẓer tilγa-ik
+      read:notifications: ad ẓer tilɣa-inek·inem
       read:reports: ẓer ineqqisen-ik·im
       read:search: anadi deg umkan-ik·im
       read:statuses: ẓer meṛṛa tisuffaɣ
       write: beddel meṛṛa isefka n umiḍan-ik
-      write:accounts: ẓreg amaγnu-ik
+      write:accounts: ad iẓreg amaɣnu-ik·im
       write:blocks: seḥbes imiḍanen d tγula
       write:bookmarks: ad yernu tisuffaɣ ɣer ticraḍ
-      write:filters: rnu-d imsizedgen
+      write:filters: ad isnulfu imsizedgen
       write:follows: ḍfeṛ imdanen
       write:lists: ad yesnulfu tibdarin
       write:media: ad yessali ifuyla n umidya
diff --git a/config/locales/es-MX.yml b/config/locales/es-MX.yml
index 0948e8d434142c..3d7c8b9ea4180a 100644
--- a/config/locales/es-MX.yml
+++ b/config/locales/es-MX.yml
@@ -970,7 +970,7 @@ es-MX:
   admin_mailer:
     auto_close_registrations:
       body: Debido al faltante de actividad reciente de moderación, los registros en %{instance} han cambiado automáticamente para requerir la revisión manial, para evitar que %{instance} se utilice como una plataforma para potenciales malos actores. Puedes revertir este cambio en los registros en cualquier momento.
-      subject: Se ha cambiado automáticamente el registro de %{instance} para requerir aprobación
+      subject: Los registros para %{instance} han sido cambiados automáticamente para requerir aprobación
     new_appeal:
       actions:
         delete_statuses: para eliminar sus mensajes
@@ -1855,15 +1855,15 @@ es-MX:
       feature_action: Leer más
       feature_audience: Mastodon te proporciona una posibilidad única de gestionar tu audiencia sin intermediarios. El despliegue de Mastodon en tu propia infraestructura te permite seguir y ser seguido desde cualquier servidor de Mastodon que se encuentre en línea y no está bajo el control de nadie más que tú.
       feature_audience_title: Construye tu audiencia con confianza
-      feature_control: Tú sabes lo que quieres ver en tu página principal. Nada de algoritmos y publicidad para desperdiciar tu tiempo. Sigue a quien quieras a través de cualquier servidor de Mastodon y recibe sus publicaciones en orden cronológico. Haz tu rincón de internet un poco más como tú.
-      feature_control_title: Mantente en control de tu línea de tiempo
-      feature_creativity: Mastodon soporta mensajes de audio, vídeo e imágenes, descripciones de accesibilidad, encuestas, advertencias de contenido, avatares animados, emojis personalizados, recortes de miniatura, y más, para ayudarte a expresarte en línea. Ya sea publicando tu arte, tu música o tu podcast, Mastodon está ahí para ti.
+      feature_control: Tú sabes mejor lo que quieres ver en tu página principal. Nada de algoritmos o publicidad para desperdiciar tu tiempo. Sigue a quien quieras a través de cualquier servidor de Mastodon y recibe sus publicaciones en orden cronológico. Haz tu rincón de internet un poco más como tú.
+      feature_control_title: Mantén el control de tu línea de tiempo
+      feature_creativity: Mastodon soporta publicaciones con audio, vídeo e imágenes, descripciones de accesibilidad, encuestas, advertencias de contenido, avatares animados, emojis personalizados, recortes de miniatura, y más, para ayudarte a expresarte en línea. Ya sea publicando tu arte, tu música o tu podcast, Mastodon está ahí para ti.
       feature_creativity_title: Creatividad inigualable
-      feature_moderation: Mastodon vuelve a poner la toma de decisiones en tus manos. Cada servidor crea sus propias reglas y reglamentos, que se aplican localmente y no globalmente como en redes sociales corporativas, lo que resulta en la mayor flexibilidad para responder a las necesidades de diferentes grupos de personas. Únete a un servidor con las reglas con las que esté sde acuerdo, o aloja el tuyo propio.
+      feature_moderation: Mastodon vuelve a poner la toma de decisiones en tus manos. Cada servidor crea sus propias reglas y reglamentos, las cuales se aplican localmente y no globalmente como en redes sociales corporativas, haciéndolos más flexibles para responder a las necesidades de diferentes grupos de personas. Únete a un servidor con las reglas que estés de acuerdo, o aloja el tuyo propio.
       feature_moderation_title: La moderación como debería ser
       follow_action: Seguir
-      follow_step: Seguir a personas interesantes es de lo que trata Mastodon.
-      follow_title: Personaliza tu línea de inicio
+      follow_step: Seguir a personas interesantes es de lo que se trata Mastodon.
+      follow_title: Personaliza tu inicio
       follows_subtitle: Seguir cuentas conocidas
       follows_title: A quién seguir
       follows_view_more: Ver más personas para seguir
@@ -1871,10 +1871,10 @@ es-MX:
       hashtags_subtitle: Explora las tendencias de los últimos 2 días
       hashtags_title: Etiquetas en tendencia
       hashtags_view_more: Ver más etiquetas en tendencia
-      post_action: Redactar
+      post_action: Redacta
       post_step: Di hola al mundo con texto, fotos, vídeos o encuestas.
-      post_title: Escribe tu primera publicación
-      share_action: Compartir
+      post_title: Haz tu primera publicación
+      share_action: Comparte
       share_step: Dile a tus amigos cómo encontrarte en Mastodon.
       share_title: Comparte tu perfil de Mastodon
       sign_in_action: Regístrate
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index bd46e4aa884ca9..4c88ac0e59590a 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -970,6 +970,9 @@ eu:
       title: Webhook-ak
       webhook: Webhook
   admin_mailer:
+    auto_close_registrations:
+      body: Duela gutxi moderatzaile gutxi aritu direla eta, %{instance} instantziako izen-emateek eskuzko berrikuspena beharko dute automatikoki, %{instance} instantzia eragile okerren plataforma gisa erabili dadin ekiditeko. Izen-emate irekiak berriro gai ditzakezu nahi duzunean.
+      subject: "%{instance} instantziako izen-emateek onarpena beharko dute orain"
     new_appeal:
       actions:
         delete_statuses: bidalketak ezabatzea
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index a6543005b2bf57..61a6086c5ebec1 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -907,7 +907,7 @@ gl:
       statuses:
         allow: Permitir publicación
         allow_account: Permitir autora
-        description_html: Estas son publicacións que o teu servidor coñece que están sendo compartidas e favorecidas en gran número neste intre. Pode ser útil para as persoas recén chegadas e as que retornan para que atopen persoas a quen seguir. Non se mostran publicamente a menos que aprobes a autora, e a autora permita que a súa conta sexa suxerida a outras. Tamén podes rexeitar ou aprobar publicacións individuais.
+        description_html: Estas son publicacións que o teu servidor coñece que están sendo compartidas e favorecidas en gran número neste intre. Pode ser útil para as persoas recén chegadas e para as que retornan para que atopen persoas a quen seguir. Non se mostran publicamente a menos que aprobes a autora, e a autora permita que a súa conta sexa suxerida a outras. Tamén podes rexeitar ou aprobar publicacións individuais.
         disallow: Rexeitar publicación
         disallow_account: Rexeitar autora
         no_status_selected: Non se cambiou ningunha publicación en voga xa que non había ningunha seleccionada
@@ -1405,7 +1405,7 @@ gl:
       confirmation_html: Tes a certeza de querer retirar a subscrición a Mastodon en %{domain} para recibir %{type} no teu correo electrónico en %{email}? Poderás volver a subscribirte desde os <a href="%{settings_path}">axustes de notificacións por correo</a>.
       emails:
         notification_emails:
-          favourite: notificacións de favoritos
+          favourite: notificacións de favorecidas
           follow: notificacións de seguimentos
           follow_request: notificacións de solicitudes de seguimento
           mention: notificacións de mencións
@@ -1464,7 +1464,7 @@ gl:
       sign_up:
         subject: "%{name} rexistrouse"
     favourite:
-      body: 'A túa publicación foi marcada como favorita por %{name}:'
+      body: 'A túa publicación foi favorecida por %{name}:'
       subject: "%{name} marcou como favorita a túa publicación"
       title: Nova favorita
     follow:
@@ -1717,7 +1717,7 @@ gl:
     ignore_favs: Ignorar favoritas
     ignore_reblogs: Ignorar promocións
     interaction_exceptions: Excepcións baseadas en interaccións
-    interaction_exceptions_explanation: Ten en conta de que non hai garantía de que se eliminen as túas publicacións se non superan o límite de promocións e favorecementos aínda que algunha vez o tivesen superado.
+    interaction_exceptions_explanation: Ten en conta que non hai garantía de que se eliminen as túas publicacións se baixan do límite de promocións e favorecementos se nalgún momento o superaron.
     keep_direct: Manter mensaxes directas
     keep_direct_hint: Non borrar ningunha das túas mensaxes directas
     keep_media: Manter publicacións que conteñen multimedia
@@ -1728,7 +1728,7 @@ gl:
     keep_polls_hint: Non eliminar ningunha das túas enquisas
     keep_self_bookmark: Manter as publicacións engadidas a marcadores
     keep_self_bookmark_hint: Non elimina as publicacións se as engadiches aos marcadores
-    keep_self_fav: Manter as publicacións que marcaches como favoritas
+    keep_self_fav: Manter as publicacións que favoreceches
     keep_self_fav_hint: Non elimina as túas propias publicacións se as marcaches como favoritas
     min_age:
       '1209600': 2 semanas
@@ -1740,7 +1740,7 @@ gl:
       '63113904': 2 anos
       '7889238': 3 meses
     min_age_label: Límite temporal
-    min_favs: Manter as publicacións favoritas máis de
+    min_favs: Manter as publicacións favorecidas polo menos
     min_favs_hint: Non elimina ningunha das túas publicacións que recibiron alomenos esta cantidade de favorecementos. Deixa en branco para eliminar publicacións independentemente do número de favorecementos
     min_reblogs: Manter publicacións promovidas máis de
     min_reblogs_hint: Non elimina ningunha das túas publicacións se foron promovidas máis deste número de veces. Deixa en branco para eliminar publicacións independentemente do seu número de promocións
diff --git a/config/locales/kab.yml b/config/locales/kab.yml
index 66c544f9e788ff..b19424c0fac28a 100644
--- a/config/locales/kab.yml
+++ b/config/locales/kab.yml
@@ -252,6 +252,7 @@ kab:
       add_new: Timerna n taɣult ɣer tabdert tamellalt
       created_msg: Taγult-a tettwarna γer wumuγ amellal mebla ugur
       destroyed_msg: Taγult-a tettwakkes seg umuγ amellal
+      export: Sifeḍ
       import: Kter
       undo: Kkes seg tebdart tamellalt
     domain_blocks:
@@ -387,6 +388,7 @@ kab:
     roles:
       categories:
         administration: Tadbelt
+        invites: Iɛeṛṛuḍen
         moderation: Aseɣyed
       delete: Kkes
       privileges:
@@ -420,7 +422,10 @@ kab:
       delete: Kkes afaylu yulin
     software_updates:
       documentation_link: Issin ugar
+      type: Anaw
+      version: Lqem
     statuses:
+      account: Ameskar
       application: Asnas
       back_to_account: Tuɣalin ɣer usebter n umiḍan
       deleted: Yettwakkes
@@ -462,6 +467,7 @@ kab:
     advanced_web_interface: Agrudem n web leqqayen
     discovery: Asnirem
     localization:
+      body: Mastodon suqqlen-t-id yiwiziwen.
       guide_link: https://crowdin.com/project/mastodon
       guide_link_text: Yal yiwen·t y·tezmer a ttekki.
     sensitive_content: Agbur amḥulfu
@@ -471,12 +477,18 @@ kab:
     view_profile: Ssken-d amaɣnu
     view_status: Ssken-d tasuffiɣt
   applications:
+    created: Yennulfa-d wesnas akken iwata
+    destroyed: Yettwakkes wesnas-nni akken iwata
     logout: Ffeɣ
     token_regenerated: Ajuṭu n unekcum yettusirew i tikkelt-nniḍen akken iwata
     your_token: Ajiṭun-ik·im n unekcum
   auth:
     apply_for_account: Suter amiḍan
+    captcha_confirmation:
+      title: Asefqed n tɣellist
     confirmations:
+      clicking_this_link: tekki ɣef wassaɣ-a
+      proceed_to_login_html: Tzemreḍ tura ad tkemmleḍ ɣer %{login_link}.
       welcome_title: Ansuf yessek·em, %{name}!
     delete_account: Kkes amiḍan
     description:
@@ -507,6 +519,7 @@ kab:
     rules:
       accept: Qbel
       back: Tuɣalin
+      invited_by: 'Tzemreḍ ad tkecmeḍ ɣer %{domain} s tanemmirt i tinnubga i d-teṭṭfeḍ sɣur :'
       preamble_invited: Uqbel ad tkemmleḍ, ttxil-k·m ẓer ilugan i d-sbedden yimkariyen n %{domain}.
       title: Kra n yilugan igejdanen.
       title_invited: Tettwaɛerḍeḍ.
@@ -521,7 +534,7 @@ kab:
       preamble_html: Kcem ar <strong>%{domain}</strong> s inekcam-inek n tuqqna. Ma yella yezga-d umiḍan-ik deg uqeddac-nniḍen, ur tezmireḍ ara ad tkecmeḍ sya.
       title: Akeččum ɣer %{domain}
     sign_up:
-      preamble: S umiḍan deg uqeddac-a n Mastodon, ad tizmireḍ ad tḍefreḍ win i ak-yehwan deg uẓeṭṭa, anida yebɣu yili umiḍan-nsen.
+      preamble: S umiḍan deg uqeddac-a n Mastodon, ad tizmireḍ ad tḍefreḍ win i ak·kem-yehwan deg uẓeṭṭa, anida yebɣu yili umiḍan-nnsen.
       title: Iyya ad d-nessewjed tiɣawsiwin i %{domain}.
     status:
       account_status: Addad n umiḍan
@@ -531,6 +544,9 @@ kab:
     confirm: Kemmel
     invalid_password: Yir awal uffir
     prompt: Sentem awal uffir send ad tkemleḍ
+  crypto:
+    errors:
+      invalid_key: maci d tasarut tameɣtut n Ed25519 neɣ Curve25519
   date:
     formats:
       default: "%d %b %Y"
@@ -550,6 +566,7 @@ kab:
       x_months: "%{count}agu"
       x_seconds: "%{count}tas"
   deletes:
+    challenge_not_passed: Ur iṣeḥḥa ara yisalli-nni i teskecmeḍ
     confirm_password: Sekcem awal-ik·im uffir n tura akken ad tesfeqdeḍ tamagit-ik·im
     proceed: Kkes amiḍan
     warning:
@@ -607,10 +624,15 @@ kab:
     confirm: Sentem
     copy: Nɣel
     delete: Kkes
+    none: Ula yiwen
     order_by: Sizwer s
     save_changes: Sekles ibeddilen
     today: ass-a
   imports:
+    errors:
+      empty: Afaylu CSV d ilem
+      too_large: Bezzaf meqqer ufaylu
+    failures: Tuccḍiwin
     modes:
       merge: Smezdi
       overwrite: Semselsi
@@ -707,6 +729,8 @@ kab:
     relationship: Assaɣ
     remove_selected_follows: Ur ṭṭafar ara iseqdacen yettwafernen
     status: Addad n umiḍan
+  rss:
+    content_warning: 'Alɣu n ugbur :'
   sessions:
     activity: Armud aneggaru
     browser: Iminig
@@ -843,6 +867,8 @@ kab:
         silence: Amiḍan yesɛa talast
         suspend: Amiḍan yettwaḥbas
     welcome:
+      apps_android_action: Awi-t-id seg Google Play
+      apps_ios_action: Sader-it-id seg App Store
       apps_step: Zdem-d isnasen-nneɣ unṣiben.
       apps_title: Isnasen n Mastodon
       feature_action: Issin ugar
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index a521af185ed312..82b970ce58cd3e 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -775,6 +775,7 @@ pt-BR:
           approved: Aprovação necessária para criar conta
           none: Ninguém pode criar conta
           open: Qualquer um pode criar conta
+        warning_hint: Recomendamos o uso de "Aprovação necessária para se cadastrar", a menos que você esteja confiante de que sua equipe de moderação pode lidar com spam e registros maliciosos em tempo hábil.
       security:
         authorized_fetch: Exigir autenticação por parte de servidores federados
         authorized_fetch_hint: Exigir autenticação de servidores federados permite uma aplicação mais rigorosa de bloqueios tanto de nível de usuário como de servidor. No entanto, isso traz como custo uma penalidade no desempenho, reduz o alcance das suas respostas e pode introduzir problemas de compatibilidade com alguns serviços federados. Além disso, não impedirá atores dedicados de consultar suas publicações e contas públicas.
@@ -967,6 +968,9 @@ pt-BR:
       title: Webhooks
       webhook: Webhook
   admin_mailer:
+    auto_close_registrations:
+      body: Devido à falta de atividade recente dos moderadores, as inscrições em %{instance} foram automaticamente alteradas para exigir revisão manual, para evitar que %{instance} seja usada como uma plataforma para potenciais atores mal-intencionados. Você pode alterá-la de volta para inscrições abertas a qualquer momento.
+      subject: As inscrições para %{instance} foram automaticamente alteradas para requerer aprovação
     new_appeal:
       actions:
         delete_statuses: para excluir suas publicações
@@ -1781,6 +1785,7 @@ pt-BR:
       action: Configurações da conta
       explanation: A revisão da punição na sua conta em %{strike_date} que você enviou em %{appeal_date} foi aprovada. Sua conta está novamente em situação regular.
       subject: Sua revisão de %{date} foi aprovada
+      subtitle: Sua conta está novamente em boa situação.
       title: Revisão aprovada
     appeal_rejected:
       explanation: A revisão da punição na sua conta em %{strike_date} que você enviou em %{appeal_date} foi rejeitada.
@@ -1837,7 +1842,41 @@ pt-BR:
         silence: Conta silenciada
         suspend: Conta banida
     welcome:
+      apps_android_action: Disponível no Google Play
+      apps_ios_action: Disponível na App Store
+      apps_step: Baixe nossos aplicativos oficiais.
+      apps_title: Apps Mastodon
+      checklist_subtitle: 'Vamos começar nesta nova fronteira social:'
+      checklist_title: Lista de verificação de boas-vindas
+      edit_profile_action: Personalizar
+      edit_profile_step: Aumente suas interações tendo um perfil completo.
+      edit_profile_title: Customize seu perfil
       explanation: Aqui estão algumas dicas para você começar
+      feature_action: Saiba mais
+      feature_audience: O Mastodon oferece a você uma oportunidade única de gerenciar seu público sem intermediários. O Mastodon implantado em sua própria infraestrutura permite que você siga e seja seguido por qualquer outro servidor Mastodon online e está única e exclusivamente sob o seu controle.
+      feature_audience_title: Construa confiança com seu público
+      feature_control: Você sabe o que deseja ver na sua página inicial. Sem algoritmos ou anúncios para desperdiçar seu tempo. Siga qualquer pessoa em qualquer servidor Mastodon a partir de uma única conta e receba suas postagens em ordem cronológica, e faça o seu cantinho na internet um pouco mais a sua cara.
+      feature_control_title: Fique no controle da sua própria linha do tempo
+      feature_creativity: Mastodon oferece suporte a postagens de áudio, vídeo e imagem, descrições de acessibilidade, enquetes, avisos de conteúdo, avatares animados, emojis personalizados, recorte de miniaturas e muito mais, para ajudá-lo a se expressar online. Seja você publicando sua arte, sua música ou seu podcast, o Mastodon está lá para você.
+      feature_creativity_title: Criatividade inigualável
+      feature_moderation: Mastodon devolve a tomada de decisão para suas mãos. Cada servidor cria suas próprias regras e regulamentos, que são aplicados localmente e não de cima para baixo como nas redes sociais corporativas, tornando-o o mais flexível em responder às necessidades de diferentes grupos de pessoas. Junte-se a um servidor com as regras com as quais você concorda, ou hospede o seu próprio.
+      feature_moderation_title: Moderando como deve ser
+      follow_action: Seguir
+      follow_step: Seguir pessoas interessantes é do que trata Mastodon.
+      follow_title: Personalize sua página inicial
+      follows_subtitle: Siga contas conhecidas
+      follows_title: Quem seguir
+      follows_view_more: Veja mais pessoas para seguir
+      hashtags_subtitle: Explorar o que está em alta nos últimos 2 dias
+      hashtags_title: Hashtags em alta
+      hashtags_view_more: Ver mais hashtags em alta
+      post_action: Escrever
+      post_step: Diga olá para o mundo com texto, fotos, vídeos ou enquetes.
+      post_title: Crie sua primeira publicação
+      share_action: Compartilhar
+      share_step: Deixe seus amigos saberem como te encontrar no Mastodon.
+      share_title: Compartilhe seu perfil do Mastodon
+      sign_in_action: Entrar
       subject: Boas-vindas ao Mastodon
       title: Boas vindas, %{name}!
   users:
diff --git a/config/locales/simple_form.kab.yml b/config/locales/simple_form.kab.yml
index 8e63211b65e66c..4f7357c5728fa3 100644
--- a/config/locales/simple_form.kab.yml
+++ b/config/locales/simple_form.kab.yml
@@ -53,6 +53,7 @@ kab:
         ends_at: Tagara n tedyant
         text: Alɣu
       defaults:
+        autofollow: Ɛreḍ-it-id ad yeḍfer amiḍan-ik·im
         avatar: Avaṭar
         bot: Wagi d amiḍan aṛubut
         chosen_languages: Sizdeg tutlayin
diff --git a/config/locales/simple_form.lv.yml b/config/locales/simple_form.lv.yml
index 133a225405a230..596fbe3e3417b6 100644
--- a/config/locales/simple_form.lv.yml
+++ b/config/locales/simple_form.lv.yml
@@ -26,7 +26,7 @@ lv:
           disable: Neļauj lietotājam izmantot savu kontu, bet neizdzēs vai neslēp tā saturu.
           none: Izmanto šo, lai nosūtītu lietotājam brīdinājumu, neradot nekādas citas darbības.
           sensitive: Piespiest visus šī lietotāja multivides pielikumus atzīmēt kā sensitīvus.
-          silence: Neļauj lietotājam publicēt ziņas ar publisku redzamību, paslēp viņa ziņas un paziņojumus no personām, kas viņiem neseko. Tiek aizvērti visi šī konta pārskati.
+          silence: Neļaut lietotājam veikt ierakstus ar publisku redzamību, paslēpt viņa ierakstus un paziņojumus no cilvēkiem, kas tam neseko. Tiek aizvērti visi ziņojumi par šo kontu.
           suspend: Novērs jebkādu mijiedarbību no šī konta vai uz to un dzēs tā saturu. Atgriežams 30 dienu laikā. Tiek aizvērti visi šī konta pārskati.
         warning_preset_id: Neobligāts. Tu joprojām vari pievienot pielāgotu tekstu sākotnējās iestatīšanas beigās
       announcement:

From 2e91a9bd3487ad5137688dd5260a5f216c5a4ef8 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 15 Mar 2024 06:17:45 -0400
Subject: [PATCH 0466/2191] Add `include_pagination_headers` matcher to check
 `Link` header in api specs (#29596)

---
 spec/requests/api/v1/blocks_spec.rb           | 14 ++++++--------
 spec/requests/api/v1/bookmarks_spec.rb        | 11 ++++++++---
 spec/requests/api/v1/favourites_spec.rb       | 14 ++++++--------
 spec/requests/api/v1/followed_tags_spec.rb    | 14 ++++++--------
 spec/requests/api/v1/mutes_spec.rb            |  9 +++++----
 spec/requests/api/v1/notifications_spec.rb    | 11 ++++++++---
 spec/requests/api/v1/timelines/home_spec.rb   |  9 +++++----
 spec/requests/api/v1/timelines/public_spec.rb |  9 +++++----
 spec/requests/api/v1/timelines/tag_spec.rb    |  9 +++++----
 spec/support/matchers/api_pagination.rb       | 13 +++++++++++++
 10 files changed, 67 insertions(+), 46 deletions(-)
 create mode 100644 spec/support/matchers/api_pagination.rb

diff --git a/spec/requests/api/v1/blocks_spec.rb b/spec/requests/api/v1/blocks_spec.rb
index 62543157c32df4..c6c2d56f364ca1 100644
--- a/spec/requests/api/v1/blocks_spec.rb
+++ b/spec/requests/api/v1/blocks_spec.rb
@@ -38,16 +38,14 @@
         expect(body_as_json.size).to eq(params[:limit])
       end
 
-      it 'sets the correct pagination header for the prev path' do
+      it 'sets correct link header pagination' do
         subject
 
-        expect(response.headers['Link'].find_link(%w(rel prev)).href).to eq(api_v1_blocks_url(limit: params[:limit], since_id: blocks.last.id))
-      end
-
-      it 'sets the correct pagination header for the next path' do
-        subject
-
-        expect(response.headers['Link'].find_link(%w(rel next)).href).to eq(api_v1_blocks_url(limit: params[:limit], max_id: blocks[1].id))
+        expect(response)
+          .to include_pagination_headers(
+            prev: api_v1_blocks_url(limit: params[:limit], since_id: blocks.last.id),
+            next: api_v1_blocks_url(limit: params[:limit], max_id: blocks.second.id)
+          )
       end
     end
 
diff --git a/spec/requests/api/v1/bookmarks_spec.rb b/spec/requests/api/v1/bookmarks_spec.rb
index 18f4fddc29f2b0..dc32820c8983ad 100644
--- a/spec/requests/api/v1/bookmarks_spec.rb
+++ b/spec/requests/api/v1/bookmarks_spec.rb
@@ -42,9 +42,14 @@
       it 'paginates correctly', :aggregate_failures do
         subject
 
-        expect(body_as_json.size).to eq(params[:limit])
-        expect(response.headers['Link'].find_link(%w(rel prev)).href).to eq(api_v1_bookmarks_url(limit: params[:limit], min_id: bookmarks.last.id))
-        expect(response.headers['Link'].find_link(%w(rel next)).href).to eq(api_v1_bookmarks_url(limit: params[:limit], max_id: bookmarks[1].id))
+        expect(body_as_json.size)
+          .to eq(params[:limit])
+
+        expect(response)
+          .to include_pagination_headers(
+            prev: api_v1_bookmarks_url(limit: params[:limit], min_id: bookmarks.last.id),
+            next: api_v1_bookmarks_url(limit: params[:limit], max_id: bookmarks.second.id)
+          )
       end
     end
 
diff --git a/spec/requests/api/v1/favourites_spec.rb b/spec/requests/api/v1/favourites_spec.rb
index 2d8a42e7162c87..b988ac99dbe129 100644
--- a/spec/requests/api/v1/favourites_spec.rb
+++ b/spec/requests/api/v1/favourites_spec.rb
@@ -45,16 +45,14 @@
         expect(body_as_json.size).to eq(params[:limit])
       end
 
-      it 'sets the correct pagination header for the prev path' do
+      it 'sets the correct pagination headers' do
         subject
 
-        expect(response.headers['Link'].find_link(%w(rel prev)).href).to eq(api_v1_favourites_url(limit: params[:limit], min_id: favourites.last.id))
-      end
-
-      it 'sets the correct pagination header for the next path' do
-        subject
-
-        expect(response.headers['Link'].find_link(%w(rel next)).href).to eq(api_v1_favourites_url(limit: params[:limit], max_id: favourites[1].id))
+        expect(response)
+          .to include_pagination_headers(
+            prev: api_v1_favourites_url(limit: params[:limit], min_id: favourites.last.id),
+            next: api_v1_favourites_url(limit: params[:limit], max_id: favourites.second.id)
+          )
       end
     end
 
diff --git a/spec/requests/api/v1/followed_tags_spec.rb b/spec/requests/api/v1/followed_tags_spec.rb
index 52ed1ba4bb51f0..3d2d82d5db1c28 100644
--- a/spec/requests/api/v1/followed_tags_spec.rb
+++ b/spec/requests/api/v1/followed_tags_spec.rb
@@ -49,16 +49,14 @@
         expect(body_as_json.size).to eq(params[:limit])
       end
 
-      it 'sets the correct pagination header for the prev path' do
+      it 'sets the correct pagination headers' do
         subject
 
-        expect(response.headers['Link'].find_link(%w(rel prev)).href).to eq(api_v1_followed_tags_url(limit: params[:limit], since_id: tag_follows.last.id))
-      end
-
-      it 'sets the correct pagination header for the next path' do
-        subject
-
-        expect(response.headers['Link'].find_link(%w(rel next)).href).to eq(api_v1_followed_tags_url(limit: params[:limit], max_id: tag_follows.last.id))
+        expect(response)
+          .to include_pagination_headers(
+            prev: api_v1_followed_tags_url(limit: params[:limit], since_id: tag_follows.last.id),
+            next: api_v1_followed_tags_url(limit: params[:limit], max_id: tag_follows.last.id)
+          )
       end
     end
   end
diff --git a/spec/requests/api/v1/mutes_spec.rb b/spec/requests/api/v1/mutes_spec.rb
index b2782a0c22f6ba..019bf16584e11e 100644
--- a/spec/requests/api/v1/mutes_spec.rb
+++ b/spec/requests/api/v1/mutes_spec.rb
@@ -44,10 +44,11 @@
       it 'sets the correct pagination headers', :aggregate_failures do
         subject
 
-        headers = response.headers['Link']
-
-        expect(headers.find_link(%w(rel prev)).href).to eq(api_v1_mutes_url(limit: params[:limit], since_id: mutes.last.id.to_s))
-        expect(headers.find_link(%w(rel next)).href).to eq(api_v1_mutes_url(limit: params[:limit], max_id: mutes.last.id.to_s))
+        expect(response)
+          .to include_pagination_headers(
+            prev: api_v1_mutes_url(limit: params[:limit], since_id: mutes.last.id),
+            next: api_v1_mutes_url(limit: params[:limit], max_id: mutes.last.id)
+          )
       end
     end
 
diff --git a/spec/requests/api/v1/notifications_spec.rb b/spec/requests/api/v1/notifications_spec.rb
index 222ff67fc876f7..55d3cdac948896 100644
--- a/spec/requests/api/v1/notifications_spec.rb
+++ b/spec/requests/api/v1/notifications_spec.rb
@@ -98,9 +98,14 @@ def body_json_account_ids
 
         notifications = user.account.notifications
 
-        expect(body_as_json.size).to eq(params[:limit])
-        expect(response.headers['Link'].find_link(%w(rel prev)).href).to eq(api_v1_notifications_url(limit: params[:limit], min_id: notifications.last.id.to_s))
-        expect(response.headers['Link'].find_link(%w(rel next)).href).to eq(api_v1_notifications_url(limit: params[:limit], max_id: notifications[2].id.to_s))
+        expect(body_as_json.size)
+          .to eq(params[:limit])
+
+        expect(response)
+          .to include_pagination_headers(
+            prev: api_v1_notifications_url(limit: params[:limit], min_id: notifications.last.id),
+            next: api_v1_notifications_url(limit: params[:limit], max_id: notifications[2].id)
+          )
       end
     end
 
diff --git a/spec/requests/api/v1/timelines/home_spec.rb b/spec/requests/api/v1/timelines/home_spec.rb
index e57e9643bf647a..2bebe8cf452847 100644
--- a/spec/requests/api/v1/timelines/home_spec.rb
+++ b/spec/requests/api/v1/timelines/home_spec.rb
@@ -55,10 +55,11 @@
         it 'sets the correct pagination headers', :aggregate_failures do
           subject
 
-          headers = response.headers['Link']
-
-          expect(headers.find_link(%w(rel prev)).href).to eq(api_v1_timelines_home_url(limit: 1, min_id: ana.statuses.first.id.to_s))
-          expect(headers.find_link(%w(rel next)).href).to eq(api_v1_timelines_home_url(limit: 1, max_id: ana.statuses.first.id.to_s))
+          expect(response)
+            .to include_pagination_headers(
+              prev: api_v1_timelines_home_url(limit: params[:limit], min_id: ana.statuses.first.id),
+              next: api_v1_timelines_home_url(limit: params[:limit], max_id: ana.statuses.first.id)
+            )
         end
       end
     end
diff --git a/spec/requests/api/v1/timelines/public_spec.rb b/spec/requests/api/v1/timelines/public_spec.rb
index c436262407d04f..30d1bc00cbbb7f 100644
--- a/spec/requests/api/v1/timelines/public_spec.rb
+++ b/spec/requests/api/v1/timelines/public_spec.rb
@@ -83,10 +83,11 @@
         it 'sets the correct pagination headers', :aggregate_failures do
           subject
 
-          headers = response.headers['Link']
-
-          expect(headers.find_link(%w(rel prev)).href).to eq(api_v1_timelines_public_url(limit: 1, min_id: media_status.id.to_s))
-          expect(headers.find_link(%w(rel next)).href).to eq(api_v1_timelines_public_url(limit: 1, max_id: media_status.id.to_s))
+          expect(response)
+            .to include_pagination_headers(
+              prev: api_v1_timelines_public_url(limit: params[:limit], min_id: media_status.id),
+              next: api_v1_timelines_public_url(limit: params[:limit], max_id: media_status.id)
+            )
         end
       end
     end
diff --git a/spec/requests/api/v1/timelines/tag_spec.rb b/spec/requests/api/v1/timelines/tag_spec.rb
index a118af13e2ff69..8611341702d95c 100644
--- a/spec/requests/api/v1/timelines/tag_spec.rb
+++ b/spec/requests/api/v1/timelines/tag_spec.rb
@@ -71,10 +71,11 @@
       it 'sets the correct pagination headers', :aggregate_failures do
         subject
 
-        headers = response.headers['Link']
-
-        expect(headers.find_link(%w(rel prev)).href).to eq(api_v1_timelines_tag_url(limit: 1, min_id: love_status.id.to_s))
-        expect(headers.find_link(%w(rel next)).href).to eq(api_v1_timelines_tag_url(limit: 1, max_id: love_status.id.to_s))
+        expect(response)
+          .to include_pagination_headers(
+            prev: api_v1_timelines_tag_url(limit: params[:limit], min_id: love_status.id),
+            next: api_v1_timelines_tag_url(limit: params[:limit], max_id: love_status.id)
+          )
       end
     end
 
diff --git a/spec/support/matchers/api_pagination.rb b/spec/support/matchers/api_pagination.rb
new file mode 100644
index 00000000000000..81e27e44b80a86
--- /dev/null
+++ b/spec/support/matchers/api_pagination.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+RSpec::Matchers.define :include_pagination_headers do |links|
+  match do |response|
+    links.map do |key, value|
+      response.headers['Link'].find_link(['rel', key.to_s]).href == value
+    end.all?
+  end
+
+  failure_message do |header|
+    "expected that #{header} would have the same values as #{links}."
+  end
+end

From 7720c684c5bf54e73e8815defe15473777d1c201 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 15 Mar 2024 06:40:21 -0400
Subject: [PATCH 0467/2191] Move common module inclusion in sub classes to
 `ActivityPub::BaseController` (#29560)

---
 app/controllers/activitypub/base_controller.rb             | 3 +++
 app/controllers/activitypub/claims_controller.rb           | 3 ---
 app/controllers/activitypub/collections_controller.rb      | 3 ---
 .../activitypub/followers_synchronizations_controller.rb   | 3 ---
 app/controllers/activitypub/inboxes_controller.rb          | 2 --
 app/controllers/activitypub/outboxes_controller.rb         | 3 ---
 app/controllers/activitypub/replies_controller.rb          | 2 --
 app/controllers/instance_actors_controller.rb              | 7 +++++++
 8 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/app/controllers/activitypub/base_controller.rb b/app/controllers/activitypub/base_controller.rb
index 388d4b9e1dcdae..c2563c492ef1ee 100644
--- a/app/controllers/activitypub/base_controller.rb
+++ b/app/controllers/activitypub/base_controller.rb
@@ -1,6 +1,9 @@
 # frozen_string_literal: true
 
 class ActivityPub::BaseController < Api::BaseController
+  include SignatureVerification
+  include AccountOwnedConcern
+
   skip_before_action :require_authenticated_user!
   skip_before_action :require_not_suspended!
   skip_around_action :set_locale
diff --git a/app/controllers/activitypub/claims_controller.rb b/app/controllers/activitypub/claims_controller.rb
index 339333e462ccc3..480baaf2bcce0f 100644
--- a/app/controllers/activitypub/claims_controller.rb
+++ b/app/controllers/activitypub/claims_controller.rb
@@ -1,9 +1,6 @@
 # frozen_string_literal: true
 
 class ActivityPub::ClaimsController < ActivityPub::BaseController
-  include SignatureVerification
-  include AccountOwnedConcern
-
   skip_before_action :authenticate_user!
 
   before_action :require_account_signature!
diff --git a/app/controllers/activitypub/collections_controller.rb b/app/controllers/activitypub/collections_controller.rb
index 2188eb72a3e82b..d5632902fe974b 100644
--- a/app/controllers/activitypub/collections_controller.rb
+++ b/app/controllers/activitypub/collections_controller.rb
@@ -1,9 +1,6 @@
 # frozen_string_literal: true
 
 class ActivityPub::CollectionsController < ActivityPub::BaseController
-  include SignatureVerification
-  include AccountOwnedConcern
-
   vary_by -> { 'Signature' if authorized_fetch_mode? }
 
   before_action :require_account_signature!, if: :authorized_fetch_mode?
diff --git a/app/controllers/activitypub/followers_synchronizations_controller.rb b/app/controllers/activitypub/followers_synchronizations_controller.rb
index d2942104e5056f..392dd36bcd6c75 100644
--- a/app/controllers/activitypub/followers_synchronizations_controller.rb
+++ b/app/controllers/activitypub/followers_synchronizations_controller.rb
@@ -1,9 +1,6 @@
 # frozen_string_literal: true
 
 class ActivityPub::FollowersSynchronizationsController < ActivityPub::BaseController
-  include SignatureVerification
-  include AccountOwnedConcern
-
   vary_by -> { 'Signature' if authorized_fetch_mode? }
 
   before_action :require_account_signature!
diff --git a/app/controllers/activitypub/inboxes_controller.rb b/app/controllers/activitypub/inboxes_controller.rb
index e8b0f47cdecbf5..49cfc8ad1cbd8c 100644
--- a/app/controllers/activitypub/inboxes_controller.rb
+++ b/app/controllers/activitypub/inboxes_controller.rb
@@ -1,9 +1,7 @@
 # frozen_string_literal: true
 
 class ActivityPub::InboxesController < ActivityPub::BaseController
-  include SignatureVerification
   include JsonLdHelper
-  include AccountOwnedConcern
 
   before_action :skip_unknown_actor_activity
   before_action :require_actor_signature!
diff --git a/app/controllers/activitypub/outboxes_controller.rb b/app/controllers/activitypub/outboxes_controller.rb
index bf10ba762a5758..8079e011dd0084 100644
--- a/app/controllers/activitypub/outboxes_controller.rb
+++ b/app/controllers/activitypub/outboxes_controller.rb
@@ -3,9 +3,6 @@
 class ActivityPub::OutboxesController < ActivityPub::BaseController
   LIMIT = 20
 
-  include SignatureVerification
-  include AccountOwnedConcern
-
   vary_by -> { 'Signature' if authorized_fetch_mode? || page_requested? }
 
   before_action :require_account_signature!, if: :authorized_fetch_mode?
diff --git a/app/controllers/activitypub/replies_controller.rb b/app/controllers/activitypub/replies_controller.rb
index c38ff89d1c4215..3f43e89a5e0798 100644
--- a/app/controllers/activitypub/replies_controller.rb
+++ b/app/controllers/activitypub/replies_controller.rb
@@ -1,9 +1,7 @@
 # frozen_string_literal: true
 
 class ActivityPub::RepliesController < ActivityPub::BaseController
-  include SignatureVerification
   include Authorization
-  include AccountOwnedConcern
 
   DESCENDANTS_LIMIT = 60
 
diff --git a/app/controllers/instance_actors_controller.rb b/app/controllers/instance_actors_controller.rb
index 8422d74bc33025..f2b1eaa3e703db 100644
--- a/app/controllers/instance_actors_controller.rb
+++ b/app/controllers/instance_actors_controller.rb
@@ -6,6 +6,8 @@ class InstanceActorsController < ActivityPub::BaseController
   serialization_scope nil
 
   before_action :set_account
+
+  skip_before_action :authenticate_user! # From `AccountOwnedConcern`
   skip_before_action :require_functional!
   skip_before_action :update_user_sign_in
 
@@ -16,6 +18,11 @@ def show
 
   private
 
+  # Skips various `before_action` from `AccountOwnedConcern`
+  def account_required?
+    false
+  end
+
   def set_account
     @account = Account.representative
   end

From f445d33fd6aa492df319f4cc4efbd255d7a84f0e Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 15 Mar 2024 07:19:00 -0400
Subject: [PATCH 0468/2191] Fix haml-lint `LineLength` cops in app/views/admin
 (#28680)

---
 .haml-lint_todo.yml                           | 13 -----
 app/views/admin/account_actions/new.html.haml | 33 ++++++++---
 app/views/admin/accounts/index.html.haml      | 33 ++++++++---
 app/views/admin/announcements/edit.html.haml  | 25 +++++++--
 app/views/admin/announcements/new.html.haml   | 29 ++++++++--
 app/views/admin/custom_emojis/index.html.haml | 11 +++-
 app/views/admin/custom_emojis/new.html.haml   | 14 ++++-
 app/views/admin/domain_blocks/edit.html.haml  | 49 +++++++++++++---
 app/views/admin/domain_blocks/new.html.haml   | 47 +++++++++++++---
 .../admin/email_domain_blocks/index.html.haml |  6 +-
 .../admin/email_domain_blocks/new.html.haml   | 16 +++++-
 .../admin/export_domain_allows/new.html.haml  |  5 +-
 .../export_domain_blocks/import.html.haml     |  6 +-
 .../admin/export_domain_blocks/new.html.haml  |  5 +-
 .../follow_recommendations/show.html.haml     | 14 ++++-
 app/views/admin/ip_blocks/index.html.haml     |  6 +-
 app/views/admin/ip_blocks/new.html.haml       | 22 ++++++--
 app/views/admin/relationships/index.html.haml |  6 +-
 app/views/admin/reports/_status.html.haml     |  4 +-
 app/views/admin/reports/show.html.haml        |  4 +-
 app/views/admin/roles/_form.html.haml         | 27 +++++++--
 app/views/admin/settings/about/show.html.haml | 30 ++++++++--
 .../admin/settings/appearance/show.html.haml  | 15 ++++-
 .../admin/settings/branding/show.html.haml    | 18 ++++--
 .../settings/content_retention/show.html.haml | 14 ++++-
 .../admin/settings/discovery/show.html.haml   | 49 ++++++++++++----
 .../settings/registrations/show.html.haml     | 23 ++++++--
 app/views/admin/statuses/index.html.haml      |  6 +-
 app/views/admin/trends/links/index.html.haml  | 28 ++++++++--
 .../preview_card_providers/index.html.haml    | 12 +++-
 .../admin/trends/statuses/_status.html.haml   |  4 +-
 .../admin/trends/statuses/index.html.haml     | 24 ++++++--
 app/views/admin/trends/tags/index.html.haml   | 12 +++-
 app/views/admin/users/roles/show.html.haml    | 10 +++-
 app/views/admin/webhooks/_form.html.haml      | 17 +++++-
 app/views/filters/_filter_fields.html.haml    | 29 ++++++++--
 app/views/statuses_cleanup/show.html.haml     | 56 +++++++++++++++----
 37 files changed, 576 insertions(+), 146 deletions(-)
 delete mode 100644 .haml-lint_todo.yml

diff --git a/.haml-lint_todo.yml b/.haml-lint_todo.yml
deleted file mode 100644
index af2d2e8f4eb68a..00000000000000
--- a/.haml-lint_todo.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-# This configuration was generated by
-# `haml-lint --auto-gen-config`
-# on 2024-01-09 11:30:07 -0500 using Haml-Lint version 0.53.0.
-# The point is for the user to remove these configuration records
-# one by one as the lints are removed from the code base.
-# Note that changes in the inspected code, or installation of new
-# versions of Haml-Lint, may require this file to be generated again.
-
-linters:
-  # Offense count: 1
-  LineLength:
-    exclude:
-      - 'app/views/admin/roles/_form.html.haml'
diff --git a/app/views/admin/account_actions/new.html.haml b/app/views/admin/account_actions/new.html.haml
index 4cb4401c70542d..bce1c31760d6e8 100644
--- a/app/views/admin/account_actions/new.html.haml
+++ b/app/views/admin/account_actions/new.html.haml
@@ -2,29 +2,48 @@
   = t('admin.account_actions.title', acct: @account.pretty_acct)
 
 = simple_form_for @account_action, url: admin_account_action_path(@account.id) do |f|
-  = f.input :report_id, as: :hidden
+  = f.input :report_id,
+            as: :hidden
 
   .fields-group
-    = f.input :type, as: :radio_buttons, collection: Admin::AccountAction.types_for_account(@account), include_blank: false, wrapper: :with_block_label, label_method: ->(type) { account_action_type_label(type) }, hint: t('simple_form.hints.admin_account_action.type_html', acct: @account.pretty_acct)
+    = f.input :type,
+              as: :radio_buttons,
+              collection: Admin::AccountAction.types_for_account(@account),
+              hint: t('simple_form.hints.admin_account_action.type_html', acct: @account.pretty_acct),
+              include_blank: false,
+              label_method: ->(type) { account_action_type_label(type) },
+              wrapper: :with_block_label
 
   - if @account.local?
     %hr.spacer/
 
     .fields-group
-      = f.input :send_email_notification, as: :boolean, wrapper: :with_label
+      = f.input :send_email_notification,
+                as: :boolean,
+                wrapper: :with_label
 
     - if params[:report_id].present?
       .fields-group
-        = f.input :include_statuses, as: :boolean, wrapper: :with_label
+        = f.input :include_statuses,
+                  as: :boolean,
+                  wrapper: :with_label
 
     %hr.spacer/
 
     - unless @warning_presets.empty?
       .fields-group
-        = f.input :warning_preset_id, collection: @warning_presets, label_method: ->(warning_preset) { [warning_preset.title.presence, truncate(warning_preset.text)].compact.join(' - ') }, wrapper: :with_block_label
+        = f.input :warning_preset_id,
+                  collection: @warning_presets,
+                  label_method: ->(warning_preset) { [warning_preset.title.presence, truncate(warning_preset.text)].compact.join(' - ') },
+                  wrapper: :with_block_label
 
     .fields-group
-      = f.input :text, as: :text, wrapper: :with_block_label, hint: t('simple_form.hints.admin_account_action.text_html', path: admin_warning_presets_path)
+      = f.input :text,
+                as: :text,
+                hint: t('simple_form.hints.admin_account_action.text_html', path: admin_warning_presets_path),
+                wrapper: :with_block_label
 
   .actions
-    = f.button :button, t('admin.account_actions.action'), type: :submit
+    = f.button :button,
+               t('admin.account_actions.action'),
+               type: :submit
diff --git a/app/views/admin/accounts/index.html.haml b/app/views/admin/accounts/index.html.haml
index 8354441895deb8..0ca457f39eeb54 100644
--- a/app/views/admin/accounts/index.html.haml
+++ b/app/views/admin/accounts/index.html.haml
@@ -6,19 +6,26 @@
     .filter-subset.filter-subset--with-select
       %strong= t('admin.accounts.location.title')
       .input.select.optional
-        = select_tag :origin, options_for_select([[t('admin.accounts.location.local'), 'local'], [t('admin.accounts.location.remote'), 'remote']], params[:origin]), prompt: I18n.t('generic.all')
+        = select_tag :origin,
+                     options_for_select([[t('admin.accounts.location.local'), 'local'], [t('admin.accounts.location.remote'), 'remote']], params[:origin]),
+                     prompt: I18n.t('generic.all')
     .filter-subset.filter-subset--with-select
       %strong= t('admin.accounts.moderation.title')
       .input.select.optional
-        = select_tag :status, options_for_select(admin_accounts_moderation_options, params[:status]), prompt: I18n.t('generic.all')
+        = select_tag :status,
+                     options_for_select(admin_accounts_moderation_options, params[:status]),
+                     prompt: I18n.t('generic.all')
     .filter-subset.filter-subset--with-select
       %strong= t('admin.accounts.role')
       .input.select.optional
-        = select_tag :role_ids, options_from_collection_for_select(UserRole.assignable, :id, :name, params[:role_ids]), prompt: I18n.t('admin.accounts.moderation.all')
+        = select_tag :role_ids,
+                     options_from_collection_for_select(UserRole.assignable, :id, :name, params[:role_ids]),
+                     prompt: I18n.t('admin.accounts.moderation.all')
     .filter-subset.filter-subset--with-select
       %strong= t 'generic.order_by'
       .input.select
-        = select_tag :order, options_for_select([[t('relationships.most_recent'), 'recent'], [t('relationships.last_active'), 'active']], params[:order])
+        = select_tag :order,
+                     options_for_select([[t('relationships.most_recent'), 'recent'], [t('relationships.last_active'), 'active']], params[:order])
 
   .fields-group
     - %i(username by_domain display_name email ip).each do |key|
@@ -46,11 +53,23 @@
         = check_box_tag :batch_checkbox_all, nil, false
       .batch-table__toolbar__actions
         - if @accounts.any?(&:user_pending?)
-          = f.button safe_join([fa_icon('check'), t('admin.accounts.approve')]), name: :approve, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
+          = f.button safe_join([fa_icon('check'), t('admin.accounts.approve')]),
+                     class: 'table-action-link',
+                     data: { confirm: t('admin.reports.are_you_sure') },
+                     name: :approve,
+                     type: :submit
 
-          = f.button safe_join([fa_icon('times'), t('admin.accounts.reject')]), name: :reject, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
+          = f.button safe_join([fa_icon('times'), t('admin.accounts.reject')]),
+                     class: 'table-action-link',
+                     data: { confirm: t('admin.reports.are_you_sure') },
+                     name: :reject,
+                     type: :submit
 
-        = f.button safe_join([fa_icon('lock'), t('admin.accounts.perform_full_suspension')]), name: :suspend, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
+        = f.button safe_join([fa_icon('lock'), t('admin.accounts.perform_full_suspension')]),
+                   class: 'table-action-link',
+                   data: { confirm: t('admin.reports.are_you_sure') },
+                   name: :suspend,
+                   type: :submit
     - if @accounts.total_count > @accounts.size
       .batch-table__select-all
         .not-selected.active
diff --git a/app/views/admin/announcements/edit.html.haml b/app/views/admin/announcements/edit.html.haml
index 150d98272fcd65..23c568a885d99a 100644
--- a/app/views/admin/announcements/edit.html.haml
+++ b/app/views/admin/announcements/edit.html.haml
@@ -5,18 +5,33 @@
   = render 'shared/error_messages', object: @announcement
 
   .fields-group
-    = f.input :starts_at, include_blank: true, wrapper: :with_block_label, html5: true, input_html: { pattern: datetime_pattern, placeholder: datetime_placeholder }
-    = f.input :ends_at, include_blank: true, wrapper: :with_block_label, html5: true, input_html: { pattern: datetime_pattern, placeholder: datetime_placeholder }
+    = f.input :starts_at,
+              html5: true,
+              include_blank: true,
+              input_html: { pattern: datetime_pattern, placeholder: datetime_placeholder },
+              wrapper: :with_block_label
+    = f.input :ends_at,
+              html5: true,
+              include_blank: true,
+              input_html: { pattern: datetime_pattern, placeholder: datetime_placeholder },
+              wrapper: :with_block_label
 
   .fields-group
-    = f.input :all_day, as: :boolean, wrapper: :with_label
+    = f.input :all_day,
+              as: :boolean,
+              wrapper: :with_label
 
   .fields-group
-    = f.input :text, wrapper: :with_block_label
+    = f.input :text,
+              wrapper: :with_block_label
 
   - unless @announcement.published?
     .fields-group
-      = f.input :scheduled_at, include_blank: true, wrapper: :with_block_label, html5: true, input_html: { pattern: datetime_pattern, placeholder: datetime_placeholder }
+      = f.input :scheduled_at,
+                html5: true,
+                include_blank: true,
+                input_html: { pattern: datetime_pattern, placeholder: datetime_placeholder },
+                wrapper: :with_block_label
 
   .actions
     = f.button :button, t('generic.save_changes'), type: :submit
diff --git a/app/views/admin/announcements/new.html.haml b/app/views/admin/announcements/new.html.haml
index 0123632ff47a53..a681ed789ec149 100644
--- a/app/views/admin/announcements/new.html.haml
+++ b/app/views/admin/announcements/new.html.haml
@@ -5,17 +5,34 @@
   = render 'shared/error_messages', object: @announcement
 
   .fields-group
-    = f.input :starts_at, include_blank: true, wrapper: :with_block_label, html5: true, input_html: { pattern: datetime_pattern, placeholder: datetime_placeholder }
-    = f.input :ends_at, include_blank: true, wrapper: :with_block_label, html5: true, input_html: { pattern: datetime_pattern, placeholder: datetime_placeholder }
+    = f.input :starts_at,
+              html5: true,
+              include_blank: true,
+              input_html: { pattern: datetime_pattern, placeholder: datetime_placeholder },
+              wrapper: :with_block_label
+    = f.input :ends_at,
+              html5: true,
+              include_blank: true,
+              input_html: { pattern: datetime_pattern, placeholder: datetime_placeholder },
+              wrapper: :with_block_label
 
   .fields-group
-    = f.input :all_day, as: :boolean, wrapper: :with_label
+    = f.input :all_day,
+              as: :boolean,
+              wrapper: :with_label
 
   .fields-group
-    = f.input :text, wrapper: :with_block_label
+    = f.input :text,
+              wrapper: :with_block_label
 
   .fields-group
-    = f.input :scheduled_at, include_blank: true, wrapper: :with_block_label, html5: true, input_html: { pattern: datetime_pattern, placeholder: datetime_placeholder }
+    = f.input :scheduled_at,
+              html5: true,
+              include_blank: true,
+              input_html: { pattern: datetime_pattern, placeholder: datetime_placeholder },
+              wrapper: :with_block_label
 
   .actions
-    = f.button :button, t('.create'), type: :submit
+    = f.button :button,
+               t('.create'),
+               type: :submit
diff --git a/app/views/admin/custom_emojis/index.html.haml b/app/views/admin/custom_emojis/index.html.haml
index 8b4e93ac3594ff..bea6a7cd21e1f4 100644
--- a/app/views/admin/custom_emojis/index.html.haml
+++ b/app/views/admin/custom_emojis/index.html.haml
@@ -68,12 +68,19 @@
           .fields-group.fields-row__column.fields-row__column-6
             .input.select.optional
               .label_input
-                = f.select :category_id, options_from_collection_for_select(CustomEmojiCategory.all, 'id', 'name'), prompt: t('admin.custom_emojis.assign_category'), class: 'select optional', 'aria-label': t('admin.custom_emojis.assign_category')
+                = f.select :category_id,
+                           options_from_collection_for_select(CustomEmojiCategory.all, 'id', 'name'),
+                           'aria-label': t('admin.custom_emojis.assign_category'),
+                           class: 'select optional',
+                           prompt: t('admin.custom_emojis.assign_category')
 
           .fields-group.fields-row__column.fields-row__column-6
             .input.string.optional
               .label_input
-                = f.text_field :category_name, class: 'string optional', placeholder: t('admin.custom_emojis.create_new_category'), 'aria-label': t('admin.custom_emojis.create_new_category')
+                = f.text_field :category_name,
+                               'aria-label': t('admin.custom_emojis.create_new_category'),
+                               class: 'string optional',
+                               placeholder: t('admin.custom_emojis.create_new_category')
 
     .batch-table__body
       - if @custom_emojis.empty?
diff --git a/app/views/admin/custom_emojis/new.html.haml b/app/views/admin/custom_emojis/new.html.haml
index a03676b001c9e3..e59ae02b3bc365 100644
--- a/app/views/admin/custom_emojis/new.html.haml
+++ b/app/views/admin/custom_emojis/new.html.haml
@@ -5,9 +5,17 @@
   = render 'shared/error_messages', object: @custom_emoji
 
   .fields-group
-    = f.input :shortcode, wrapper: :with_label, label: t('admin.custom_emojis.shortcode'), hint: t('admin.custom_emojis.shortcode_hint')
+    = f.input :shortcode,
+              wrapper: :with_label,
+              label: t('admin.custom_emojis.shortcode'),
+              hint: t('admin.custom_emojis.shortcode_hint')
   .fields-group
-    = f.input :image, wrapper: :with_label, input_html: { accept: CustomEmoji::IMAGE_MIME_TYPES.join(',') }, hint: t('admin.custom_emojis.image_hint', size: number_to_human_size(CustomEmoji::LIMIT))
+    = f.input :image,
+              wrapper: :with_label,
+              input_html: { accept: CustomEmoji::IMAGE_MIME_TYPES.join(',') },
+              hint: t('admin.custom_emojis.image_hint', size: number_to_human_size(CustomEmoji::LIMIT))
 
   .actions
-    = f.button :button, t('admin.custom_emojis.upload'), type: :submit
+    = f.button :button,
+               t('admin.custom_emojis.upload'),
+               type: :submit
diff --git a/app/views/admin/domain_blocks/edit.html.haml b/app/views/admin/domain_blocks/edit.html.haml
index ae76b6777a22ca..7c0a9823a0e472 100644
--- a/app/views/admin/domain_blocks/edit.html.haml
+++ b/app/views/admin/domain_blocks/edit.html.haml
@@ -6,25 +6,58 @@
 
   .fields-row
     .fields-row__column.fields-row__column-6.fields-group
-      = f.input :domain, wrapper: :with_label, label: t('admin.domain_blocks.domain'), hint: t('admin.domain_blocks.new.hint'), required: true, readonly: true, disabled: true
+      = f.input :domain,
+                disabled: true,
+                hint: t('admin.domain_blocks.new.hint'),
+                label: t('admin.domain_blocks.domain'),
+                readonly: true,
+                required: true,
+                wrapper: :with_label
 
     .fields-row__column.fields-row__column-6.fields-group
-      = f.input :severity, collection: DomainBlock.severities.keys, wrapper: :with_label, include_blank: false, label_method: ->(type) { t("admin.domain_blocks.new.severity.#{type}") }, hint: t('admin.domain_blocks.new.severity.desc_html')
+      = f.input :severity,
+                collection: DomainBlock.severities.keys,
+                hint: t('admin.domain_blocks.new.severity.desc_html'),
+                include_blank: false,
+                label_method: ->(type) { t("admin.domain_blocks.new.severity.#{type}") },
+                wrapper: :with_label
 
   .fields-group
-    = f.input :reject_media, as: :boolean, wrapper: :with_label, label: I18n.t('admin.domain_blocks.reject_media'), hint: I18n.t('admin.domain_blocks.reject_media_hint')
+    = f.input :reject_media,
+              as: :boolean,
+              hint: I18n.t('admin.domain_blocks.reject_media_hint'),
+              label: I18n.t('admin.domain_blocks.reject_media'),
+              wrapper: :with_label
 
   .fields-group
-    = f.input :reject_reports, as: :boolean, wrapper: :with_label, label: I18n.t('admin.domain_blocks.reject_reports'), hint: I18n.t('admin.domain_blocks.reject_reports_hint')
+    = f.input :reject_reports,
+              as: :boolean,
+              hint: I18n.t('admin.domain_blocks.reject_reports_hint'),
+              label: I18n.t('admin.domain_blocks.reject_reports'),
+              wrapper: :with_label
 
   .fields-group
-    = f.input :obfuscate, as: :boolean, wrapper: :with_label, label: I18n.t('admin.domain_blocks.obfuscate'), hint: I18n.t('admin.domain_blocks.obfuscate_hint')
+    = f.input :obfuscate,
+              as: :boolean,
+              hint: I18n.t('admin.domain_blocks.obfuscate_hint'),
+              label: I18n.t('admin.domain_blocks.obfuscate'),
+              wrapper: :with_label
 
   .field-group
-    = f.input :private_comment, wrapper: :with_label, label: I18n.t('admin.domain_blocks.private_comment'), hint: t('admin.domain_blocks.private_comment_hint'), as: :string
+    = f.input :private_comment,
+              as: :string,
+              hint: t('admin.domain_blocks.private_comment_hint'),
+              label: I18n.t('admin.domain_blocks.private_comment'),
+              wrapper: :with_label
 
   .field-group
-    = f.input :public_comment, wrapper: :with_label, label: I18n.t('admin.domain_blocks.public_comment'), hint: t('admin.domain_blocks.public_comment_hint'), as: :string
+    = f.input :public_comment,
+              as: :string,
+              hint: t('admin.domain_blocks.public_comment_hint'),
+              label: I18n.t('admin.domain_blocks.public_comment'),
+              wrapper: :with_label
 
   .actions
-    = f.button :button, t('generic.save_changes'), type: :submit
+    = f.button :button,
+               t('generic.save_changes'),
+               type: :submit
diff --git a/app/views/admin/domain_blocks/new.html.haml b/app/views/admin/domain_blocks/new.html.haml
index 86e519f451bdff..6a9855529f6d79 100644
--- a/app/views/admin/domain_blocks/new.html.haml
+++ b/app/views/admin/domain_blocks/new.html.haml
@@ -6,25 +6,56 @@
 
   .fields-row
     .fields-row__column.fields-row__column-6.fields-group
-      = f.input :domain, wrapper: :with_label, label: t('admin.domain_blocks.domain'), hint: t('.hint'), required: true
+      = f.input :domain,
+                hint: t('.hint'),
+                label: t('admin.domain_blocks.domain'),
+                required: true,
+                wrapper: :with_label
 
     .fields-row__column.fields-row__column-6.fields-group
-      = f.input :severity, collection: DomainBlock.severities.keys, wrapper: :with_label, include_blank: false, label_method: ->(type) { t(".severity.#{type}") }, hint: t('.severity.desc_html')
+      = f.input :severity,
+                collection: DomainBlock.severities.keys,
+                hint: t('.severity.desc_html'),
+                include_blank: false,
+                label_method: ->(type) { t(".severity.#{type}") },
+                wrapper: :with_label
 
   .fields-group
-    = f.input :reject_media, as: :boolean, wrapper: :with_label, label: I18n.t('admin.domain_blocks.reject_media'), hint: I18n.t('admin.domain_blocks.reject_media_hint')
+    = f.input :reject_media,
+              as: :boolean,
+              hint: I18n.t('admin.domain_blocks.reject_media_hint'),
+              label: I18n.t('admin.domain_blocks.reject_media'),
+              wrapper: :with_label
 
   .fields-group
-    = f.input :reject_reports, as: :boolean, wrapper: :with_label, label: I18n.t('admin.domain_blocks.reject_reports'), hint: I18n.t('admin.domain_blocks.reject_reports_hint')
+    = f.input :reject_reports,
+              as: :boolean,
+              hint: I18n.t('admin.domain_blocks.reject_reports_hint'),
+              label: I18n.t('admin.domain_blocks.reject_reports'),
+              wrapper: :with_label
 
   .fields-group
-    = f.input :obfuscate, as: :boolean, wrapper: :with_label, label: I18n.t('admin.domain_blocks.obfuscate'), hint: I18n.t('admin.domain_blocks.obfuscate_hint')
+    = f.input :obfuscate,
+              as: :boolean,
+              hint: I18n.t('admin.domain_blocks.obfuscate_hint'),
+              label: I18n.t('admin.domain_blocks.obfuscate'),
+              wrapper: :with_label
 
   .field-group
-    = f.input :private_comment, wrapper: :with_label, label: I18n.t('admin.domain_blocks.private_comment'), hint: t('admin.domain_blocks.private_comment_hint'), as: :string
+    = f.input :private_comment,
+              as: :string,
+              hint: t('admin.domain_blocks.private_comment_hint'),
+              label: I18n.t('admin.domain_blocks.private_comment'),
+              wrapper: :with_label
 
   .field-group
-    = f.input :public_comment, wrapper: :with_label, label: I18n.t('admin.domain_blocks.public_comment'), hint: t('admin.domain_blocks.public_comment_hint'), as: :string
+    = f.input :public_comment,
+              as: :string,
+              hint: t('admin.domain_blocks.public_comment_hint'),
+              label: I18n.t('admin.domain_blocks.public_comment'),
+              wrapper: :with_label
 
   .actions
-    = f.button :button, t('.create'), type: :submit
+    = f.button :button,
+               t('.create'),
+               type: :submit
diff --git a/app/views/admin/email_domain_blocks/index.html.haml b/app/views/admin/email_domain_blocks/index.html.haml
index 9f16e0d5c36460..59036f899f9faa 100644
--- a/app/views/admin/email_domain_blocks/index.html.haml
+++ b/app/views/admin/email_domain_blocks/index.html.haml
@@ -12,7 +12,11 @@
       %label.batch-table__toolbar__select.batch-checkbox-all
         = check_box_tag :batch_checkbox_all, nil, false
       .batch-table__toolbar__actions
-        = f.button safe_join([fa_icon('times'), t('admin.email_domain_blocks.delete')]), name: :delete, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
+        = f.button safe_join([fa_icon('times'), t('admin.email_domain_blocks.delete')]),
+                   class: 'table-action-link',
+                   data: { confirm: t('admin.reports.are_you_sure') },
+                   name: :delete,
+                   type: :submit
     .batch-table__body
       - if @email_domain_blocks.empty?
         = nothing_here 'nothing-here--under-tabs'
diff --git a/app/views/admin/email_domain_blocks/new.html.haml b/app/views/admin/email_domain_blocks/new.html.haml
index 3d31487733ee34..dd4b83ee3f2832 100644
--- a/app/views/admin/email_domain_blocks/new.html.haml
+++ b/app/views/admin/email_domain_blocks/new.html.haml
@@ -5,10 +5,16 @@
   = render 'shared/error_messages', object: @email_domain_block
 
   .fields-group
-    = f.input :domain, wrapper: :with_block_label, label: t('admin.email_domain_blocks.domain'), input_html: { readonly: defined?(@resolved_records) }
+    = f.input :domain,
+              input_html: { readonly: defined?(@resolved_records) },
+              label: t('admin.email_domain_blocks.domain'),
+              wrapper: :with_block_label
 
   .fields-group
-    = f.input :allow_with_approval, wrapper: :with_label, hint: false, label: I18n.t('admin.email_domain_blocks.allow_registrations_with_approval')
+    = f.input :allow_with_approval,
+              hint: false,
+              label: I18n.t('admin.email_domain_blocks.allow_registrations_with_approval'),
+              wrapper: :with_label
 
   - if defined?(@resolved_records)
     %p.hint= t('admin.email_domain_blocks.resolved_dns_records_hint_html')
@@ -22,7 +28,11 @@
         - @resolved_records.each do |record|
           .batch-table__row
             %label.batch-table__row__select.batch-table__row__select--aligned.batch-checkbox
-              = f.input_field :other_domains, as: :boolean, checked_value: record.exchange.to_s, include_hidden: false, multiple: true
+              = f.input_field :other_domains,
+                              as: :boolean,
+                              checked_value: record.exchange.to_s,
+                              include_hidden: false,
+                              multiple: true
             .batch-table__row__content.pending-account
               .pending-account__header
                 %samp= record.exchange.to_s
diff --git a/app/views/admin/export_domain_allows/new.html.haml b/app/views/admin/export_domain_allows/new.html.haml
index dc0cf8c52a1ff2..66c6aa8d8ac688 100644
--- a/app/views/admin/export_domain_allows/new.html.haml
+++ b/app/views/admin/export_domain_allows/new.html.haml
@@ -4,7 +4,10 @@
 = simple_form_for @import, url: import_admin_export_domain_allows_path, html: { multipart: true } do |f|
   .fields-row
     .fields-group.fields-row__column.fields-row__column-6
-      = f.input :data, wrapper: :with_block_label, hint: t('simple_form.hints.imports.data'), as: :file
+      = f.input :data,
+                as: :file,
+                hint: t('simple_form.hints.imports.data'),
+                wrapper: :with_block_label
 
   .actions
     = f.button :button, t('imports.upload'), type: :submit
diff --git a/app/views/admin/export_domain_blocks/import.html.haml b/app/views/admin/export_domain_blocks/import.html.haml
index 01add232d16d1d..48016a9abe1f5e 100644
--- a/app/views/admin/export_domain_blocks/import.html.haml
+++ b/app/views/admin/export_domain_blocks/import.html.haml
@@ -12,7 +12,11 @@
       %label.batch-table__toolbar__select.batch-checkbox-all
         = check_box_tag :batch_checkbox_all, nil, false
       .batch-table__toolbar__actions
-        = f.button safe_join([fa_icon('copy'), t('admin.domain_blocks.import')]), name: :save, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
+        = f.button safe_join([fa_icon('copy'), t('admin.domain_blocks.import')]),
+                   class: 'table-action-link',
+                   data: { confirm: t('admin.reports.are_you_sure') },
+                   name: :save,
+                   type: :submit
     .batch-table__body
       - if @domain_blocks.empty?
         = nothing_here 'nothing-here--under-tabs'
diff --git a/app/views/admin/export_domain_blocks/new.html.haml b/app/views/admin/export_domain_blocks/new.html.haml
index 0291aeed776e2d..9c960d47fe50e4 100644
--- a/app/views/admin/export_domain_blocks/new.html.haml
+++ b/app/views/admin/export_domain_blocks/new.html.haml
@@ -4,7 +4,10 @@
 = simple_form_for @import, url: import_admin_export_domain_blocks_path, html: { multipart: true } do |f|
   .fields-row
     .fields-group.fields-row__column.fields-row__column-6
-      = f.input :data, wrapper: :with_block_label, hint: t('simple_form.hints.imports.data'), as: :file
+      = f.input :data,
+                as: :file,
+                hint: t('simple_form.hints.imports.data'),
+                wrapper: :with_block_label
 
   .actions
     = f.button :button, t('imports.upload'), type: :submit
diff --git a/app/views/admin/follow_recommendations/show.html.haml b/app/views/admin/follow_recommendations/show.html.haml
index 9c2063d3c577ee..9d23f9ba5160a5 100644
--- a/app/views/admin/follow_recommendations/show.html.haml
+++ b/app/views/admin/follow_recommendations/show.html.haml
@@ -13,7 +13,8 @@
     .filter-subset.filter-subset--with-select
       %strong= t('admin.follow_recommendations.language')
       .input.select.optional
-        = select_tag :language, options_for_select(Trends.available_locales.map { |key| [standard_locale_name(key), key] }, @language)
+        = select_tag :language,
+                     options_for_select(Trends.available_locales.map { |key| [standard_locale_name(key), key] }, @language)
     .filter-subset
       %strong= t('admin.follow_recommendations.status')
       %ul
@@ -30,9 +31,16 @@
         = check_box_tag :batch_checkbox_all, nil, false
       .batch-table__toolbar__actions
         - if params[:status].blank? && can?(:suppress, :follow_recommendation)
-          = f.button safe_join([fa_icon('times'), t('admin.follow_recommendations.suppress')]), name: :suppress, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
+          = f.button safe_join([fa_icon('times'), t('admin.follow_recommendations.suppress')]),
+                     class: 'table-action-link',
+                     data: { confirm: t('admin.reports.are_you_sure') },
+                     name: :suppress,
+                     type: :submit
         - if params[:status] == 'suppressed' && can?(:unsuppress, :follow_recommendation)
-          = f.button safe_join([fa_icon('plus'), t('admin.follow_recommendations.unsuppress')]), name: :unsuppress, class: 'table-action-link', type: :submit
+          = f.button safe_join([fa_icon('plus'), t('admin.follow_recommendations.unsuppress')]),
+                     class: 'table-action-link',
+                     name: :unsuppress,
+                     type: :submit
     .batch-table__body
       - if @accounts.empty?
         = nothing_here 'nothing-here--under-tabs'
diff --git a/app/views/admin/ip_blocks/index.html.haml b/app/views/admin/ip_blocks/index.html.haml
index a48e4791a36344..f1d2b3dc477d7e 100644
--- a/app/views/admin/ip_blocks/index.html.haml
+++ b/app/views/admin/ip_blocks/index.html.haml
@@ -14,7 +14,11 @@
         = check_box_tag :batch_checkbox_all, nil, false
       .batch-table__toolbar__actions
         - if can?(:destroy, :ip_block)
-          = f.button safe_join([fa_icon('times'), t('admin.ip_blocks.delete')]), name: :delete, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
+          = f.button safe_join([fa_icon('times'), t('admin.ip_blocks.delete')]),
+                     class: 'table-action-link',
+                     data: { confirm: t('admin.reports.are_you_sure') },
+                     name: :delete,
+                     type: :submit
     .batch-table__body
       - if @ip_blocks.empty?
         = nothing_here 'nothing-here--under-tabs'
diff --git a/app/views/admin/ip_blocks/new.html.haml b/app/views/admin/ip_blocks/new.html.haml
index ecaf04315bc674..81493012c60405 100644
--- a/app/views/admin/ip_blocks/new.html.haml
+++ b/app/views/admin/ip_blocks/new.html.haml
@@ -5,16 +5,30 @@
   = render 'shared/error_messages', object: @ip_block
 
   .fields-group
-    = f.input :ip, as: :string, wrapper: :with_block_label, input_html: { placeholder: '192.0.2.0/24' }
+    = f.input :ip,
+              as: :string,
+              input_html: { placeholder: '192.0.2.0/24' },
+              wrapper: :with_block_label
 
   .fields-group
-    = f.input :expires_in, wrapper: :with_block_label, collection: [1.day, 2.weeks, 1.month, 6.months, 1.year, 3.years].map(&:to_i), label_method: ->(i) { I18n.t("admin.ip_blocks.expires_in.#{i}") }, prompt: I18n.t('invites.expires_in_prompt')
+    = f.input :expires_in,
+              collection: [1.day, 2.weeks, 1.month, 6.months, 1.year, 3.years].map(&:to_i),
+              label_method: ->(i) { I18n.t("admin.ip_blocks.expires_in.#{i}") },
+              prompt: I18n.t('invites.expires_in_prompt'),
+              wrapper: :with_block_label
 
   .fields-group
-    = f.input :severity, as: :radio_buttons, collection: IpBlock.severities.keys, include_blank: false, wrapper: :with_block_label, label_method: ->(severity) { ip_blocks_severity_label(severity) }
+    = f.input :severity,
+              as: :radio_buttons,
+              collection: IpBlock.severities.keys,
+              include_blank: false,
+              label_method: ->(severity) { ip_blocks_severity_label(severity) },
+              wrapper: :with_block_label
 
   .fields-group
-    = f.input :comment, as: :string, wrapper: :with_block_label
+    = f.input :comment,
+              as: :string,
+              wrapper: :with_block_label
 
   .actions
     = f.button :button, t('admin.ip_blocks.add_new'), type: :submit
diff --git a/app/views/admin/relationships/index.html.haml b/app/views/admin/relationships/index.html.haml
index f82cf26a38e0cc..8260430d80fb6e 100644
--- a/app/views/admin/relationships/index.html.haml
+++ b/app/views/admin/relationships/index.html.haml
@@ -30,7 +30,11 @@
       %label.batch-table__toolbar__select.batch-checkbox-all
         = check_box_tag :batch_checkbox_all, nil, false
       .batch-table__toolbar__actions
-        = f.button safe_join([fa_icon('lock'), t('admin.accounts.perform_full_suspension')]), name: :suspend, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
+        = f.button safe_join([fa_icon('lock'), t('admin.accounts.perform_full_suspension')]),
+                   class: 'table-action-link',
+                   data: { confirm: t('admin.reports.are_you_sure') },
+                   name: :suspend,
+                   type: :submit
     .batch-table__body
       - if @accounts.empty?
         = nothing_here 'nothing-here--under-tabs'
diff --git a/app/views/admin/reports/_status.html.haml b/app/views/admin/reports/_status.html.haml
index b2982a42bf5107..3775a1101cb0a8 100644
--- a/app/views/admin/reports/_status.html.haml
+++ b/app/views/admin/reports/_status.html.haml
@@ -22,7 +22,9 @@
         %time.formatted{ datetime: status.created_at.iso8601, title: l(status.created_at) }= l(status.created_at)
       - if status.edited?
         ·
-        = link_to t('statuses.edited_at_html', date: content_tag(:time, l(status.edited_at), datetime: status.edited_at.iso8601, title: l(status.edited_at), class: 'formatted')), admin_account_status_path(status.account_id, status), class: 'detailed-status__datetime'
+        = link_to t('statuses.edited_at_html', date: content_tag(:time, l(status.edited_at), datetime: status.edited_at.iso8601, title: l(status.edited_at), class: 'formatted')),
+                  admin_account_status_path(status.account_id, status),
+                  class: 'detailed-status__datetime'
       - if status.discarded?
         ·
         %span.negative-hint= t('admin.statuses.deleted')
diff --git a/app/views/admin/reports/show.html.haml b/app/views/admin/reports/show.html.haml
index 4376e5af4d7a75..e20dd38c4f8c07 100644
--- a/app/views/admin/reports/show.html.haml
+++ b/app/views/admin/reports/show.html.haml
@@ -37,7 +37,9 @@
 %p
   = t 'admin.reports.statuses_description_html'
   —
-  = link_to safe_join([fa_icon('plus'), t('admin.reports.add_to_report')]), admin_account_statuses_path(@report.target_account_id, report_id: @report.id), class: 'table-action-link'
+  = link_to safe_join([fa_icon('plus'), t('admin.reports.add_to_report')]),
+            admin_account_statuses_path(@report.target_account_id, report_id: @report.id),
+            class: 'table-action-link'
 
 = form_for(@form, url: batch_admin_account_statuses_path(@report.target_account_id, report_id: @report.id)) do |f|
   .batch-table
diff --git a/app/views/admin/roles/_form.html.haml b/app/views/admin/roles/_form.html.haml
index 46a1c537a75a0f..0b1c3101624c30 100644
--- a/app/views/admin/roles/_form.html.haml
+++ b/app/views/admin/roles/_form.html.haml
@@ -5,19 +5,25 @@
     = t('admin.roles.everyone_full_description_html')
 - else
   .fields-group
-    = form.input :name, wrapper: :with_label
+    = form.input :name,
+                 wrapper: :with_label
 
   - unless current_user.role == form.object
     .fields-group
-      = form.input :position, wrapper: :with_label, input_html: { max: current_user.role.position - 1 }
+      = form.input :position,
+                   input_html: { max: current_user.role.position - 1 },
+                   wrapper: :with_label
 
   .fields-group
-    = form.input :color, wrapper: :with_label, input_html: { placeholder: '#000000', type: 'color' }
+    = form.input :color,
+                 input_html: { placeholder: '#000000', type: 'color' },
+                 wrapper: :with_label
 
   %hr.spacer/
 
   .fields-group
-    = form.input :highlighted, wrapper: :with_label
+    = form.input :highlighted,
+                 wrapper: :with_label
 
   %hr.spacer/
 
@@ -31,6 +37,17 @@
     - (form.object.everyone? ? UserRole::Flags::CATEGORIES.slice(:invites) : UserRole::Flags::CATEGORIES).each do |category, permissions|
       %h4= t(category, scope: 'admin.roles.categories')
 
-      = form.input :permissions_as_keys, collection: permissions, wrapper: :with_block_label, include_blank: false, label_method: ->(privilege) { privilege_label(privilege) }, required: false, as: :check_boxes, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li', label: false, hint: false, disabled: disable_permissions?(permissions)
+      = form.input :permissions_as_keys,
+                   as: :check_boxes,
+                   collection_wrapper_tag: 'ul',
+                   collection: permissions,
+                   disabled: disable_permissions?(permissions),
+                   hint: false,
+                   include_blank: false,
+                   item_wrapper_tag: 'li',
+                   label_method: ->(privilege) { privilege_label(privilege) },
+                   label: false,
+                   required: false,
+                   wrapper: :with_block_label
 
   %hr.spacer/
diff --git a/app/views/admin/settings/about/show.html.haml b/app/views/admin/settings/about/show.html.haml
index 1237c20fa8e36b..1eb47a0b54e865 100644
--- a/app/views/admin/settings/about/show.html.haml
+++ b/app/views/admin/settings/about/show.html.haml
@@ -11,7 +11,10 @@
   %p.lead= t('admin.settings.about.preamble')
 
   .fields-group
-    = f.input :site_extended_description, wrapper: :with_block_label, as: :text, input_html: { rows: 8 }
+    = f.input :site_extended_description,
+              as: :text,
+              input_html: { rows: 8 },
+              wrapper: :with_block_label
 
     %p.hint
       = t 'admin.settings.about.rules_hint'
@@ -19,15 +22,32 @@
 
   .fields-row
     .fields-row__column.fields-row__column-6.fields-group
-      = f.input :show_domain_blocks, wrapper: :with_label, collection: %i(disabled users all), label_method: ->(value) { t("admin.settings.domain_blocks.#{value}") }, include_blank: false, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li'
+      = f.input :show_domain_blocks,
+                collection_wrapper_tag: 'ul',
+                collection: %i(disabled users all),
+                include_blank: false,
+                item_wrapper_tag: 'li',
+                label_method: ->(value) { t("admin.settings.domain_blocks.#{value}") },
+                wrapper: :with_label
     .fields-row__column.fields-row__column-6.fields-group
-      = f.input :show_domain_blocks_rationale, wrapper: :with_label, collection: %i(disabled users all), label_method: ->(value) { t("admin.settings.domain_blocks.#{value}") }, include_blank: false, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li'
+      = f.input :show_domain_blocks_rationale,
+                collection_wrapper_tag: 'ul',
+                collection: %i(disabled users all),
+                include_blank: false,
+                item_wrapper_tag: 'li',
+                label_method: ->(value) { t("admin.settings.domain_blocks.#{value}") },
+                wrapper: :with_label
 
   .fields-group
-    = f.input :status_page_url, wrapper: :with_block_label, input_html: { placeholder: "https://status.#{Rails.configuration.x.local_domain}" }
+    = f.input :status_page_url,
+              input_html: { placeholder: "https://status.#{Rails.configuration.x.local_domain}" },
+              wrapper: :with_block_label
 
   .fields-group
-    = f.input :site_terms, wrapper: :with_block_label, as: :text, input_html: { rows: 8 }
+    = f.input :site_terms,
+              as: :text,
+              input_html: { rows: 8 },
+              wrapper: :with_block_label
 
   .actions
     = f.button :button, t('generic.save_changes'), type: :submit
diff --git a/app/views/admin/settings/appearance/show.html.haml b/app/views/admin/settings/appearance/show.html.haml
index ed61774c9b0379..3ef4920cd50d5a 100644
--- a/app/views/admin/settings/appearance/show.html.haml
+++ b/app/views/admin/settings/appearance/show.html.haml
@@ -11,14 +11,23 @@
   %p.lead= t('admin.settings.appearance.preamble')
 
   .fields-group
-    = f.input :theme, collection: Themes.instance.names, label_method: ->(theme) { I18n.t("themes.#{theme}", default: theme) }, wrapper: :with_label, include_blank: false
+    = f.input :theme,
+              collection: Themes.instance.names,
+              include_blank: false,
+              label_method: ->(theme) { I18n.t("themes.#{theme}", default: theme) },
+              wrapper: :with_label
 
   .fields-group
-    = f.input :custom_css, wrapper: :with_block_label, as: :text, input_html: { rows: 8 }
+    = f.input :custom_css,
+              as: :text,
+              input_html: { rows: 8 },
+              wrapper: :with_block_label
 
   .fields-row
     .fields-row__column.fields-row__column-6.fields-group
-      = f.input :mascot, as: :file, wrapper: :with_block_label
+      = f.input :mascot,
+                as: :file,
+                wrapper: :with_block_label
 
     .fields-row__column.fields-row__column-6.fields-group
       - if @admin_settings.mascot.persisted?
diff --git a/app/views/admin/settings/branding/show.html.haml b/app/views/admin/settings/branding/show.html.haml
index aee730689227e9..769c0dafe81d5f 100644
--- a/app/views/admin/settings/branding/show.html.haml
+++ b/app/views/admin/settings/branding/show.html.haml
@@ -11,20 +11,28 @@
   %p.lead= t('admin.settings.branding.preamble')
 
   .fields-group
-    = f.input :site_title, wrapper: :with_label
+    = f.input :site_title,
+              wrapper: :with_label
 
   .fields-row
     .fields-row__column.fields-row__column-6.fields-group
-      = f.input :site_contact_username, wrapper: :with_label
+      = f.input :site_contact_username,
+                wrapper: :with_label
     .fields-row__column.fields-row__column-6.fields-group
-      = f.input :site_contact_email, wrapper: :with_label
+      = f.input :site_contact_email,
+                wrapper: :with_label
 
   .fields-group
-    = f.input :site_short_description, wrapper: :with_block_label, as: :text, input_html: { rows: 2, maxlength: 200 }
+    = f.input :site_short_description,
+              as: :text,
+              input_html: { rows: 2, maxlength: 200 },
+              wrapper: :with_block_label
 
   .fields-row
     .fields-row__column.fields-row__column-6.fields-group
-      = f.input :thumbnail, as: :file, wrapper: :with_block_label
+      = f.input :thumbnail,
+                as: :file,
+                wrapper: :with_block_label
     .fields-row__column.fields-row__column-6.fields-group
       - if @admin_settings.thumbnail.persisted?
         = image_tag @admin_settings.thumbnail.file.url(:'@1x'), class: 'fields-group__thumbnail'
diff --git a/app/views/admin/settings/content_retention/show.html.haml b/app/views/admin/settings/content_retention/show.html.haml
index 5a67016148d021..4b2ee572e31fc3 100644
--- a/app/views/admin/settings/content_retention/show.html.haml
+++ b/app/views/admin/settings/content_retention/show.html.haml
@@ -11,9 +11,17 @@
   %p.lead= t('admin.settings.content_retention.preamble')
 
   .fields-group
-    = f.input :media_cache_retention_period, wrapper: :with_block_label, input_html: { pattern: '[0-9]+' }
-    = f.input :content_cache_retention_period, wrapper: :with_block_label, input_html: { pattern: '[0-9]+' }, hint: false, warning_hint: t('simple_form.hints.form_admin_settings.content_cache_retention_period')
-    = f.input :backups_retention_period, wrapper: :with_block_label, input_html: { pattern: '[0-9]+' }
+    = f.input :media_cache_retention_period,
+              input_html: { pattern: '[0-9]+' },
+              wrapper: :with_block_label
+    = f.input :content_cache_retention_period,
+              hint: false,
+              input_html: { pattern: '[0-9]+' },
+              warning_hint: t('simple_form.hints.form_admin_settings.content_cache_retention_period'),
+              wrapper: :with_block_label
+    = f.input :backups_retention_period,
+              input_html: { pattern: '[0-9]+' },
+              wrapper: :with_block_label
 
   .actions
     = f.button :button, t('generic.save_changes'), type: :submit
diff --git a/app/views/admin/settings/discovery/show.html.haml b/app/views/admin/settings/discovery/show.html.haml
index 59fc3226ac0713..82ce01aaed6273 100644
--- a/app/views/admin/settings/discovery/show.html.haml
+++ b/app/views/admin/settings/discovery/show.html.haml
@@ -13,46 +13,75 @@
   %h4= t('admin.settings.discovery.trends')
 
   .fields-group
-    = f.input :trends, as: :boolean, wrapper: :with_label
+    = f.input :trends,
+              as: :boolean,
+              wrapper: :with_label
 
   .fields-group
-    = f.input :trends_as_landing_page, as: :boolean, wrapper: :with_label
+    = f.input :trends_as_landing_page,
+              as: :boolean,
+              wrapper: :with_label
 
   .fields-group
-    = f.input :trendable_by_default, as: :boolean, wrapper: :with_label, recommended: :not_recommended
+    = f.input :trendable_by_default,
+              as: :boolean,
+              wrapper: :with_label,
+              recommended: :not_recommended
 
   %h4= t('admin.settings.discovery.public_timelines')
 
   .fields-group
-    = f.input :timeline_preview, as: :boolean, wrapper: :with_label
+    = f.input :timeline_preview,
+              as: :boolean,
+              wrapper: :with_label
 
   .fields-group
-    = f.input :noindex, as: :boolean, wrapper: :with_label, label: t('admin.settings.default_noindex.title'), hint: t('admin.settings.default_noindex.desc_html')
+    = f.input :noindex,
+              as: :boolean,
+              hint: t('admin.settings.default_noindex.desc_html'),
+              label: t('admin.settings.default_noindex.title'),
+              wrapper: :with_label
 
   %h4= t('admin.settings.discovery.publish_statistics')
 
   .fields-group
-    = f.input :activity_api_enabled, as: :boolean, wrapper: :with_label, recommended: :recommended
+    = f.input :activity_api_enabled,
+              as: :boolean,
+              wrapper: :with_label,
+              recommended: :recommended
 
   %h4= t('admin.settings.discovery.publish_discovered_servers')
 
   .fields-group
-    = f.input :peers_api_enabled, as: :boolean, wrapper: :with_label, recommended: :recommended
+    = f.input :peers_api_enabled,
+              as: :boolean,
+              wrapper: :with_label,
+              recommended: :recommended
 
   %h4= t('admin.settings.security.federation_authentication')
 
   .fields-group
-    = f.input :authorized_fetch, as: :boolean, wrapper: :with_label, label: t('admin.settings.security.authorized_fetch'), warning_hint: discovery_warning_hint_text, hint: discovery_hint_text, disabled: authorized_fetch_overridden?, recommended: discovery_recommended_value
+    = f.input :authorized_fetch,
+              as: :boolean,
+              disabled: authorized_fetch_overridden?,
+              hint: discovery_hint_text,
+              label: t('admin.settings.security.authorized_fetch'),
+              recommended: discovery_recommended_value,
+              warning_hint: discovery_warning_hint_text,
+              wrapper: :with_label
 
   %h4= t('admin.settings.discovery.follow_recommendations')
 
   .fields-group
-    = f.input :bootstrap_timeline_accounts, wrapper: :with_block_label
+    = f.input :bootstrap_timeline_accounts,
+              wrapper: :with_block_label
 
   %h4= t('admin.settings.discovery.profile_directory')
 
   .fields-group
-    = f.input :profile_directory, as: :boolean, wrapper: :with_label
+    = f.input :profile_directory,
+              as: :boolean,
+              wrapper: :with_label
 
   .actions
     = f.button :button, t('generic.save_changes'), type: :submit
diff --git a/app/views/admin/settings/registrations/show.html.haml b/app/views/admin/settings/registrations/show.html.haml
index 4ece27bf4e708f..4dbc5fbecfc437 100644
--- a/app/views/admin/settings/registrations/show.html.haml
+++ b/app/views/admin/settings/registrations/show.html.haml
@@ -14,17 +14,32 @@
 
   .fields-row
     .fields-row__column.fields-row__column-6.fields-group
-      = f.input :registrations_mode, collection: %w(open approved none), wrapper: :with_label, include_blank: false, label_method: ->(mode) { I18n.t("admin.settings.registrations_mode.modes.#{mode}") }, warning_hint: I18n.t('admin.settings.registrations_mode.warning_hint')
+      = f.input :registrations_mode,
+                collection: %w(open approved none),
+                include_blank: false,
+                label_method: ->(mode) { I18n.t("admin.settings.registrations_mode.modes.#{mode}") },
+                warning_hint: I18n.t('admin.settings.registrations_mode.warning_hint'),
+                wrapper: :with_label
 
     .fields-row__column.fields-row__column-6.fields-group
-      = f.input :require_invite_text, as: :boolean, wrapper: :with_label, disabled: !approved_registrations?
+      = f.input :require_invite_text,
+                as: :boolean,
+                disabled: !approved_registrations?,
+                wrapper: :with_label
 
   - if captcha_available?
     .fields-group
-      = f.input :captcha_enabled, as: :boolean, wrapper: :with_label, label: t('admin.settings.captcha_enabled.title'), hint: t('admin.settings.captcha_enabled.desc_html')
+      = f.input :captcha_enabled,
+                as: :boolean,
+                hint: t('admin.settings.captcha_enabled.desc_html'),
+                label: t('admin.settings.captcha_enabled.title'),
+                wrapper: :with_label
 
   .fields-group
-    = f.input :closed_registrations_message, as: :text, wrapper: :with_block_label, input_html: { rows: 2 }
+    = f.input :closed_registrations_message,
+              as: :text,
+              input_html: { rows: 2 },
+              wrapper: :with_block_label
 
   .actions
     = f.button :button, t('generic.save_changes'), type: :submit
diff --git a/app/views/admin/statuses/index.html.haml b/app/views/admin/statuses/index.html.haml
index a2e3cbc0daf09a..33a41bd36520ab 100644
--- a/app/views/admin/statuses/index.html.haml
+++ b/app/views/admin/statuses/index.html.haml
@@ -33,7 +33,11 @@
         = check_box_tag :batch_checkbox_all, nil, false
       .batch-table__toolbar__actions
         - unless @statuses.empty?
-          = f.button safe_join([fa_icon('flag'), t('admin.statuses.batch.report')]), name: :report, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
+          = f.button safe_join([fa_icon('flag'), t('admin.statuses.batch.report')]),
+                     class: 'table-action-link',
+                     data: { confirm: t('admin.reports.are_you_sure') },
+                     name: :report,
+                     type: :submit
     .batch-table__body
       - if @statuses.empty?
         = nothing_here 'nothing-here--under-tabs'
diff --git a/app/views/admin/trends/links/index.html.haml b/app/views/admin/trends/links/index.html.haml
index e6ed9d95f6601b..965d2b2e5684fa 100644
--- a/app/views/admin/trends/links/index.html.haml
+++ b/app/views/admin/trends/links/index.html.haml
@@ -13,7 +13,9 @@
     .filter-subset.filter-subset--with-select
       %strong= t('admin.follow_recommendations.language')
       .input.select.optional
-        = select_tag :locale, options_for_select(@locales.map { |key| [standard_locale_name(key), key] }, params[:locale]), include_blank: true
+        = select_tag :locale,
+                     options_for_select(@locales.map { |key| [standard_locale_name(key), key] }, params[:locale]),
+                     include_blank: true
     .filter-subset
       %strong= t('admin.trends.trending')
       %ul
@@ -35,10 +37,26 @@
       %label.batch-table__toolbar__select.batch-checkbox-all
         = check_box_tag :batch_checkbox_all, nil, false
       .batch-table__toolbar__actions
-        = f.button safe_join([fa_icon('check'), t('admin.trends.links.allow')]), name: :approve, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
-        = f.button safe_join([fa_icon('check'), t('admin.trends.links.allow_provider')]), name: :approve_providers, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
-        = f.button safe_join([fa_icon('times'), t('admin.trends.links.disallow')]), name: :reject, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
-        = f.button safe_join([fa_icon('times'), t('admin.trends.links.disallow_provider')]), name: :reject_providers, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
+        = f.button safe_join([fa_icon('check'), t('admin.trends.links.allow')]),
+                   class: 'table-action-link',
+                   data: { confirm: t('admin.reports.are_you_sure') },
+                   name: :approve,
+                   type: :submit
+        = f.button safe_join([fa_icon('check'), t('admin.trends.links.allow_provider')]),
+                   class: 'table-action-link',
+                   data: { confirm: t('admin.reports.are_you_sure') },
+                   name: :approve_providers,
+                   type: :submit
+        = f.button safe_join([fa_icon('times'), t('admin.trends.links.disallow')]),
+                   class: 'table-action-link',
+                   data: { confirm: t('admin.reports.are_you_sure') },
+                   name: :reject,
+                   type: :submit
+        = f.button safe_join([fa_icon('times'), t('admin.trends.links.disallow_provider')]),
+                   class: 'table-action-link',
+                   data: { confirm: t('admin.reports.are_you_sure') },
+                   name: :reject_providers,
+                   type: :submit
     .batch-table__body
       - if @preview_cards.empty?
         = nothing_here 'nothing-here--under-tabs'
diff --git a/app/views/admin/trends/links/preview_card_providers/index.html.haml b/app/views/admin/trends/links/preview_card_providers/index.html.haml
index d9ad12fc966ac4..c91822fb7491b6 100644
--- a/app/views/admin/trends/links/preview_card_providers/index.html.haml
+++ b/app/views/admin/trends/links/preview_card_providers/index.html.haml
@@ -31,8 +31,16 @@
       %label.batch-table__toolbar__select.batch-checkbox-all
         = check_box_tag :batch_checkbox_all, nil, false
       .batch-table__toolbar__actions
-        = f.button safe_join([fa_icon('check'), t('admin.trends.allow')]), name: :approve, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
-        = f.button safe_join([fa_icon('times'), t('admin.trends.disallow')]), name: :reject, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
+        = f.button safe_join([fa_icon('check'), t('admin.trends.allow')]),
+                   class: 'table-action-link',
+                   data: { confirm: t('admin.reports.are_you_sure') },
+                   name: :approve,
+                   type: :submit
+        = f.button safe_join([fa_icon('times'), t('admin.trends.disallow')]),
+                   class: 'table-action-link',
+                   data: { confirm: t('admin.reports.are_you_sure') },
+                   name: :reject,
+                   type: :submit
 
     .batch-table__body
       - if @preview_card_providers.empty?
diff --git a/app/views/admin/trends/statuses/_status.html.haml b/app/views/admin/trends/statuses/_status.html.haml
index 98f2e770908ea9..095f3f2187c983 100644
--- a/app/views/admin/trends/statuses/_status.html.haml
+++ b/app/views/admin/trends/statuses/_status.html.haml
@@ -14,7 +14,9 @@
             = fa_icon 'link'
             = media_attachment.file_file_name
 
-    = t('admin.trends.statuses.shared_by', count: status.reblogs_count + status.favourites_count, friendly_count: friendly_number_to_human(status.reblogs_count + status.favourites_count))
+    = t 'admin.trends.statuses.shared_by',
+        count: status.reblogs_count + status.favourites_count,
+        friendly_count: friendly_number_to_human(status.reblogs_count + status.favourites_count)
 
     - if status.account.domain.present?
       ·
diff --git a/app/views/admin/trends/statuses/index.html.haml b/app/views/admin/trends/statuses/index.html.haml
index bf04772f2280c2..0891d15fcf0bfb 100644
--- a/app/views/admin/trends/statuses/index.html.haml
+++ b/app/views/admin/trends/statuses/index.html.haml
@@ -31,10 +31,26 @@
       %label.batch-table__toolbar__select.batch-checkbox-all
         = check_box_tag :batch_checkbox_all, nil, false
       .batch-table__toolbar__actions
-        = f.button safe_join([fa_icon('check'), t('admin.trends.statuses.allow')]), name: :approve, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
-        = f.button safe_join([fa_icon('check'), t('admin.trends.statuses.allow_account')]), name: :approve_accounts, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
-        = f.button safe_join([fa_icon('times'), t('admin.trends.statuses.disallow')]), name: :reject, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
-        = f.button safe_join([fa_icon('times'), t('admin.trends.statuses.disallow_account')]), name: :reject_accounts, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
+        = f.button safe_join([fa_icon('check'), t('admin.trends.statuses.allow')]),
+                   class: 'table-action-link',
+                   data: { confirm: t('admin.reports.are_you_sure') },
+                   name: :approve,
+                   type: :submit
+        = f.button safe_join([fa_icon('check'), t('admin.trends.statuses.allow_account')]),
+                   class: 'table-action-link',
+                   data: { confirm: t('admin.reports.are_you_sure') },
+                   name: :approve_accounts,
+                   type: :submit
+        = f.button safe_join([fa_icon('times'), t('admin.trends.statuses.disallow')]),
+                   class: 'table-action-link',
+                   data: { confirm: t('admin.reports.are_you_sure') },
+                   name: :reject,
+                   type: :submit
+        = f.button safe_join([fa_icon('times'), t('admin.trends.statuses.disallow_account')]),
+                   class: 'table-action-link',
+                   data: { confirm: t('admin.reports.are_you_sure') },
+                   name: :reject_accounts,
+                   type: :submit
     .batch-table__body
       - if @statuses.empty?
         = nothing_here 'nothing-here--under-tabs'
diff --git a/app/views/admin/trends/tags/index.html.haml b/app/views/admin/trends/tags/index.html.haml
index 4730d20c180af0..effde7b0ec69f9 100644
--- a/app/views/admin/trends/tags/index.html.haml
+++ b/app/views/admin/trends/tags/index.html.haml
@@ -25,8 +25,16 @@
       %label.batch-table__toolbar__select.batch-checkbox-all
         = check_box_tag :batch_checkbox_all, nil, false
       .batch-table__toolbar__actions
-        = f.button safe_join([fa_icon('check'), t('admin.trends.allow')]), name: :approve, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
-        = f.button safe_join([fa_icon('times'), t('admin.trends.disallow')]), name: :reject, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
+        = f.button safe_join([fa_icon('check'), t('admin.trends.allow')]),
+                   class: 'table-action-link',
+                   data: { confirm: t('admin.reports.are_you_sure') },
+                   name: :approve,
+                   type: :submit
+        = f.button safe_join([fa_icon('times'), t('admin.trends.disallow')]),
+                   class: 'table-action-link',
+                   data: { confirm: t('admin.reports.are_you_sure') },
+                   name: :reject,
+                   type: :submit
 
     .batch-table__body
       - if @tags.empty?
diff --git a/app/views/admin/users/roles/show.html.haml b/app/views/admin/users/roles/show.html.haml
index 8216180607b909..f26640f2a1af8f 100644
--- a/app/views/admin/users/roles/show.html.haml
+++ b/app/views/admin/users/roles/show.html.haml
@@ -3,7 +3,13 @@
 
 = simple_form_for @user, url: admin_user_role_path(@user) do |f|
   .fields-group
-    = f.association :role, wrapper: :with_block_label, collection: UserRole.assignable, label_method: :name, include_blank: I18n.t('admin.accounts.change_role.no_role')
+    = f.association :role,
+                    collection: UserRole.assignable,
+                    include_blank: I18n.t('admin.accounts.change_role.no_role'),
+                    label_method: :name,
+                    wrapper: :with_block_label
 
   .actions
-    = f.button :button, t('generic.save_changes'), type: :submit
+    = f.button :button,
+               t('generic.save_changes'),
+               type: :submit
diff --git a/app/views/admin/webhooks/_form.html.haml b/app/views/admin/webhooks/_form.html.haml
index 6c4574fd3bc087..2b948b9a6aa210 100644
--- a/app/views/admin/webhooks/_form.html.haml
+++ b/app/views/admin/webhooks/_form.html.haml
@@ -1,10 +1,21 @@
 = render 'shared/error_messages', object: form.object
 
 .fields-group
-  = form.input :url, wrapper: :with_block_label, input_html: { placeholder: 'https://' }
+  = form.input :url,
+               wrapper: :with_block_label,
+               input_html: { placeholder: 'https://' }
 
 .fields-group
-  = form.input :events, collection: Webhook::EVENTS, wrapper: :with_block_label, include_blank: false, as: :check_boxes, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li', disabled: Webhook::EVENTS.filter { |event| !current_user.role.can?(Webhook.permission_for_event(event)) }
+  = form.input :events,
+               collection: Webhook::EVENTS,
+               wrapper: :with_block_label,
+               include_blank: false,
+               as: :check_boxes,
+               collection_wrapper_tag: 'ul',
+               item_wrapper_tag: 'li',
+               disabled: Webhook::EVENTS.filter { |event| !current_user.role.can?(Webhook.permission_for_event(event)) }
 
 .fields-group
-  = form.input :template, wrapper: :with_block_label, input_html: { placeholder: '{ "content": "Hello {{object.username}}" }' }
+  = form.input :template,
+               wrapper: :with_block_label,
+               input_html: { placeholder: '{ "content": "Hello {{object.username}}" }' }
diff --git a/app/views/filters/_filter_fields.html.haml b/app/views/filters/_filter_fields.html.haml
index a3260816ed9c0c..5b297a6a9eb81e 100644
--- a/app/views/filters/_filter_fields.html.haml
+++ b/app/views/filters/_filter_fields.html.haml
@@ -1,16 +1,37 @@
 .fields-row
   .fields-row__column.fields-row__column-6.fields-group
-    = f.input :title, as: :string, wrapper: :with_label, hint: false
+    = f.input :title,
+              as: :string,
+              hint: false,
+              wrapper: :with_label
   .fields-row__column.fields-row__column-6.fields-group
-    = f.input :expires_in, wrapper: :with_label, collection: [30.minutes, 1.hour, 6.hours, 12.hours, 1.day, 1.week].map(&:to_i), label_method: ->(i) { I18n.t("invites.expires_in.#{i}") }, include_blank: I18n.t('invites.expires_in_prompt')
+    = f.input :expires_in,
+              collection: [30.minutes, 1.hour, 6.hours, 12.hours, 1.day, 1.week].map(&:to_i),
+              include_blank: I18n.t('invites.expires_in_prompt'),
+              label_method: ->(i) { I18n.t("invites.expires_in.#{i}") },
+              wrapper: :with_label
 
 .fields-group
-  = f.input :context, wrapper: :with_block_label, collection: CustomFilter::VALID_CONTEXTS, as: :check_boxes, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li', label_method: ->(context) { I18n.t("filters.contexts.#{context}") }, include_blank: false
+  = f.input :context,
+            as: :check_boxes,
+            collection_wrapper_tag: 'ul',
+            collection: CustomFilter::VALID_CONTEXTS,
+            include_blank: false,
+            item_wrapper_tag: 'li',
+            label_method: ->(context) { I18n.t("filters.contexts.#{context}") },
+            wrapper: :with_block_label
 
 %hr.spacer/
 
 .fields-group
-  = f.input :filter_action, as: :radio_buttons, collection: %i(warn hide), include_blank: false, wrapper: :with_block_label, label_method: ->(action) { filter_action_label(action) }, hint: t('simple_form.hints.filters.action'), required: true
+  = f.input :filter_action,
+            as: :radio_buttons,
+            collection: %i(warn hide),
+            hint: t('simple_form.hints.filters.action'),
+            include_blank: false,
+            label_method: ->(action) { filter_action_label(action) },
+            required: true,
+            wrapper: :with_block_label
 
 %hr.spacer/
 
diff --git a/app/views/statuses_cleanup/show.html.haml b/app/views/statuses_cleanup/show.html.haml
index bd4cc1d86c7a42..07e833537ecad5 100644
--- a/app/views/statuses_cleanup/show.html.haml
+++ b/app/views/statuses_cleanup/show.html.haml
@@ -7,9 +7,19 @@
 = simple_form_for @policy, url: statuses_cleanup_path, method: :put, html: { id: 'edit_policy' } do |f|
   .fields-row
     .fields-row__column.fields-row__column-6.fields-group
-      = f.input :enabled, as: :boolean, wrapper: :with_label, label: t('statuses_cleanup.enabled'), hint: t('statuses_cleanup.enabled_hint')
+      = f.input :enabled,
+                as: :boolean,
+                hint: t('statuses_cleanup.enabled_hint'),
+                label: t('statuses_cleanup.enabled'),
+                wrapper: :with_label
     .fields-row__column.fields-row__column-6.fields-group
-      = f.input :min_status_age, wrapper: :with_label, label: t('statuses_cleanup.min_age_label'), collection: AccountStatusesCleanupPolicy::ALLOWED_MIN_STATUS_AGE.map(&:to_i), label_method: ->(i) { t("statuses_cleanup.min_age.#{i}") }, include_blank: false, hint: false
+      = f.input :min_status_age,
+                collection: AccountStatusesCleanupPolicy::ALLOWED_MIN_STATUS_AGE.map(&:to_i),
+                hint: false,
+                include_blank: false,
+                label_method: ->(i) { t("statuses_cleanup.min_age.#{i}") },
+                label: t('statuses_cleanup.min_age_label'),
+                wrapper: :with_label
 
   .flash-message= t('statuses_cleanup.explanation')
 
@@ -17,28 +27,54 @@
 
   .fields-row
     .fields-row__column.fields-row__column-6.fields-group
-      = f.input :keep_pinned, wrapper: :with_label, label: t('statuses_cleanup.keep_pinned'), hint: t('statuses_cleanup.keep_pinned_hint')
+      = f.input :keep_pinned,
+                hint: t('statuses_cleanup.keep_pinned_hint'),
+                label: t('statuses_cleanup.keep_pinned'),
+                wrapper: :with_label
     .fields-row__column.fields-row__column-6.fields-group
-      = f.input :keep_direct, wrapper: :with_label, label: t('statuses_cleanup.keep_direct'), hint: t('statuses_cleanup.keep_direct_hint')
+      = f.input :keep_direct,
+                hint: t('statuses_cleanup.keep_direct_hint'),
+                label: t('statuses_cleanup.keep_direct'),
+                wrapper: :with_label
 
   .fields-row
     .fields-row__column.fields-row__column-6.fields-group
-      = f.input :keep_self_fav, wrapper: :with_label, label: t('statuses_cleanup.keep_self_fav'), hint: t('statuses_cleanup.keep_self_fav_hint')
+      = f.input :keep_self_fav,
+                hint: t('statuses_cleanup.keep_self_fav_hint'),
+                label: t('statuses_cleanup.keep_self_fav'),
+                wrapper: :with_label
     .fields-row__column.fields-row__column-6.fields-group
-      = f.input :keep_self_bookmark, wrapper: :with_label, label: t('statuses_cleanup.keep_self_bookmark'), hint: t('statuses_cleanup.keep_self_bookmark_hint')
+      = f.input :keep_self_bookmark,
+                hint: t('statuses_cleanup.keep_self_bookmark_hint'),
+                label: t('statuses_cleanup.keep_self_bookmark'),
+                wrapper: :with_label
 
   .fields-row
     .fields-row__column.fields-row__column-6.fields-group
-      = f.input :keep_polls, wrapper: :with_label, label: t('statuses_cleanup.keep_polls'), hint: t('statuses_cleanup.keep_polls_hint')
+      = f.input :keep_polls,
+                hint: t('statuses_cleanup.keep_polls_hint'),
+                label: t('statuses_cleanup.keep_polls'),
+                wrapper: :with_label
     .fields-row__column.fields-row__column-6.fields-group
-      = f.input :keep_media, wrapper: :with_label, label: t('statuses_cleanup.keep_media'), hint: t('statuses_cleanup.keep_media_hint')
+      = f.input :keep_media,
+                hint: t('statuses_cleanup.keep_media_hint'),
+                label: t('statuses_cleanup.keep_media'),
+                wrapper: :with_label
 
   %h4= t('statuses_cleanup.interaction_exceptions')
 
   .fields-row
     .fields-row__column.fields-row__column-6.fields-group
-      = f.input :min_favs, wrapper: :with_label, label: t('statuses_cleanup.min_favs'), hint: t('statuses_cleanup.min_favs_hint'), input_html: { min: 1, placeholder: t('statuses_cleanup.ignore_favs') }
+      = f.input :min_favs,
+                hint: t('statuses_cleanup.min_favs_hint'),
+                input_html: { min: 1, placeholder: t('statuses_cleanup.ignore_favs') },
+                label: t('statuses_cleanup.min_favs'),
+                wrapper: :with_label
     .fields-row__column.fields-row__column-6.fields-group
-      = f.input :min_reblogs, wrapper: :with_label, label: t('statuses_cleanup.min_reblogs'), hint: t('statuses_cleanup.min_reblogs_hint'), input_html: { min: 1, placeholder: t('statuses_cleanup.ignore_reblogs') }
+      = f.input :min_reblogs,
+                hint: t('statuses_cleanup.min_reblogs_hint'),
+                input_html: { min: 1, placeholder: t('statuses_cleanup.ignore_reblogs') },
+                label: t('statuses_cleanup.min_reblogs'),
+                wrapper: :with_label
 
   .flash-message= t('statuses_cleanup.interaction_exceptions_explanation')

From 52200b6bbf014b4576fe9f402bf46998871986c2 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 15 Mar 2024 12:41:55 +0100
Subject: [PATCH 0469/2191] Update dependency sass to v1.72.0 (#29586)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 1412e6d606d9be..f185ad8d68805e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -14510,15 +14510,15 @@ __metadata:
   linkType: hard
 
 "sass@npm:^1.62.1":
-  version: 1.71.1
-  resolution: "sass@npm:1.71.1"
+  version: 1.72.0
+  resolution: "sass@npm:1.72.0"
   dependencies:
     chokidar: "npm:>=3.0.0 <4.0.0"
     immutable: "npm:^4.0.0"
     source-map-js: "npm:>=0.6.2 <2.0.0"
   bin:
     sass: sass.js
-  checksum: 10c0/59d79a6e106747746792b0c71908ae0aecdaf9b794d5724ee64e5249412f0d8ebe7ee2bf12946618848f14f949c4f6b530d82da3e62ab31c71198c6f73002130
+  checksum: 10c0/7df1bb470648edc4b528976b1b165c78d4c6731f680afac7cdc8324142f1ef4304598d317d98dac747a2ae8eee17271d760def90bba072021a8b19b459336ccd
   languageName: node
   linkType: hard
 

From 407287573c9c602c5490224c43639b39edf7d48a Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 15 Mar 2024 14:08:38 +0100
Subject: [PATCH 0470/2191] Add domain information to profiles in web UI
 (#29602)

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
---
 .../account/components/domain_pill.jsx        |  86 ++++++++++++
 .../features/account/components/header.jsx    |  15 ++-
 app/javascript/mastodon/locales/en.json       |  13 ++
 .../material-icons/400-24px/badge-fill.svg    |   1 +
 .../material-icons/400-24px/badge.svg         |   1 +
 .../material-icons/400-24px/globe-fill.svg    |   1 +
 .../material-icons/400-24px/globe.svg         |   1 +
 .../material-icons/400-24px/star-fill.svg     |   2 +-
 .../material-icons/400-24px/star.svg          |   2 +-
 .../styles/mastodon/components.scss           | 127 +++++++++++++++++-
 10 files changed, 235 insertions(+), 14 deletions(-)
 create mode 100644 app/javascript/mastodon/features/account/components/domain_pill.jsx
 create mode 100644 app/javascript/material-icons/400-24px/badge-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/badge.svg
 create mode 100644 app/javascript/material-icons/400-24px/globe-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/globe.svg

diff --git a/app/javascript/mastodon/features/account/components/domain_pill.jsx b/app/javascript/mastodon/features/account/components/domain_pill.jsx
new file mode 100644
index 00000000000000..0dadb947f9cd38
--- /dev/null
+++ b/app/javascript/mastodon/features/account/components/domain_pill.jsx
@@ -0,0 +1,86 @@
+import PropTypes from 'prop-types';
+import { useState, useRef, useCallback } from 'react';
+
+import { FormattedMessage } from 'react-intl';
+
+import classNames from 'classnames';
+
+import Overlay from 'react-overlays/Overlay';
+
+
+
+import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
+import BadgeIcon from '@/material-icons/400-24px/badge.svg?react';
+import GlobeIcon from '@/material-icons/400-24px/globe.svg?react';
+import { Icon } from 'mastodon/components/icon';
+
+export const DomainPill = ({ domain, username, isSelf }) => {
+  const [open, setOpen] = useState(false);
+  const [expanded, setExpanded] = useState(false);
+  const triggerRef = useRef(null);
+
+  const handleClick = useCallback(() => {
+    setOpen(!open);
+  }, [open, setOpen]);
+
+  const handleExpandClick = useCallback(() => {
+    setExpanded(!expanded);
+  }, [expanded, setExpanded]);
+
+  return (
+    <>
+      <button className={classNames('account__domain-pill', { active: open })} ref={triggerRef} onClick={handleClick}>{domain}</button>
+
+      <Overlay show={open} rootClose onHide={handleClick} offset={[5, 5]} target={triggerRef}>
+        {({ props }) => (
+          <div {...props} className='account__domain-pill__popout dropdown-animation'>
+            <div className='account__domain-pill__popout__header'>
+              <div className='account__domain-pill__popout__header__icon'><Icon icon={BadgeIcon} /></div>
+              <h3><FormattedMessage id='domain_pill.whats_in_a_handle' defaultMessage="What's in a handle?" /></h3>
+            </div>
+
+            <div className='account__domain-pill__popout__handle'>
+              <div className='account__domain-pill__popout__handle__label'>{isSelf ? <FormattedMessage id='domain_pill.your_handle' defaultMessage='Your handle:' /> : <FormattedMessage id='domain_pill.their_handle' defaultMessage='Their handle:' />}</div>
+              <div className='account__domain-pill__popout__handle__handle'>@{username}@{domain}</div>
+            </div>
+
+            <div className='account__domain-pill__popout__parts'>
+              <div>
+                <div className='account__domain-pill__popout__parts__icon'><Icon icon={AlternateEmailIcon} /></div>
+
+                <div>
+                  <h6><FormattedMessage id='domain_pill.username' defaultMessage='Username' /></h6>
+                  <p>{isSelf ? <FormattedMessage id='domain_pill.your_username' defaultMessage='Your unique identifier on this server. It’s possible to find users with the same username on different servers.' /> : <FormattedMessage id='domain_pill.their_username' defaultMessage='Their unique identifier on their server. It’s possible to find users with the same username on different servers.' />}</p>
+                </div>
+              </div>
+
+              <div>
+                <div className='account__domain-pill__popout__parts__icon'><Icon icon={GlobeIcon} /></div>
+
+                <div>
+                  <h6><FormattedMessage id='domain_pill.server' defaultMessage='Server' /></h6>
+                  <p>{isSelf ? <FormattedMessage id='domain_pill.your_server' defaultMessage='Your digital home, where all of your posts live. Don’t like this one? Transfer servers at any time and bring your followers, too.' /> : <FormattedMessage id='domain_pill.their_server' defaultMessage='Their digital home, where all of their posts live.' />}</p>
+                </div>
+              </div>
+            </div>
+
+            <p>{isSelf ? <FormattedMessage id='domain_pill.who_you_are' defaultMessage='Because your handle says who you are and where you are, people can interact with you across the social web of <button>ActivityPub-powered platforms</button>.' values={{ button: x => <button onClick={handleExpandClick} className='link-button'>{x}</button> }} /> : <FormattedMessage id='domain_pill.who_they_are' defaultMessage='Since handles say who someone is and where they are, you can interact with people across the social web of <button>ActivityPub-powered platforms</button>.' values={{ button: x => <button onClick={handleExpandClick} className='link-button'>{x}</button> }} />}</p>
+
+            {expanded && (
+              <>
+                <p><FormattedMessage id='domain_pill.activitypub_like_language' defaultMessage='ActivityPub is like the language Mastodon speaks with other social networks.' /></p>
+                <p><FormattedMessage id='domain_pill.activitypub_lets_connect' defaultMessage='It lets you connect and interact with people not just on Mastodon, but across different social apps too.' /></p>
+              </>
+            )}
+          </div>
+        )}
+      </Overlay>
+    </>
+  );
+};
+
+DomainPill.propTypes = {
+  username: PropTypes.string.isRequired,
+  domain: PropTypes.string.isRequired,
+  isSelf: PropTypes.bool,
+};
diff --git a/app/javascript/mastodon/features/account/components/header.jsx b/app/javascript/mastodon/features/account/components/header.jsx
index c6295d7c4a7105..ecb1108dedc223 100644
--- a/app/javascript/mastodon/features/account/components/header.jsx
+++ b/app/javascript/mastodon/features/account/components/header.jsx
@@ -25,13 +25,15 @@ import { IconButton } from 'mastodon/components/icon_button';
 import { LoadingIndicator } from 'mastodon/components/loading_indicator';
 import { ShortNumber } from 'mastodon/components/short_number';
 import DropdownMenuContainer from 'mastodon/containers/dropdown_menu_container';
-import { autoPlayGif, me, domain } from 'mastodon/initial_state';
+import { autoPlayGif, me, domain as localDomain } from 'mastodon/initial_state';
 import { PERMISSION_MANAGE_USERS, PERMISSION_MANAGE_FEDERATION } from 'mastodon/permissions';
 import { WithRouterPropTypes } from 'mastodon/utils/react_router';
 
 import AccountNoteContainer from '../containers/account_note_container';
 import FollowRequestNoteContainer from '../containers/follow_request_note_container';
 
+import { DomainPill } from './domain_pill';
+
 const messages = defineMessages({
   unfollow: { id: 'account.unfollow', defaultMessage: 'Unfollow' },
   follow: { id: 'account.follow', defaultMessage: 'Follow' },
@@ -78,7 +80,7 @@ const messages = defineMessages({
 
 const titleFromAccount = account => {
   const displayName = account.get('display_name');
-  const acct = account.get('acct') === account.get('username') ? `${account.get('username')}@${domain}` : account.get('acct');
+  const acct = account.get('acct') === account.get('username') ? `${account.get('username')}@${localDomain}` : account.get('acct');
   const prefix = displayName.trim().length === 0 ? account.get('username') : displayName;
 
   return `${prefix} (@${acct})`;
@@ -252,7 +254,7 @@ class Header extends ImmutablePureComponent {
   }
 
   render () {
-    const { account, hidden, intl, domain } = this.props;
+    const { account, hidden, intl } = this.props;
     const { signedIn, permissions } = this.context.identity;
 
     if (!account) {
@@ -393,7 +395,8 @@ class Header extends ImmutablePureComponent {
     const displayNameHtml = { __html: account.get('display_name_html') };
     const fields          = account.get('fields');
     const isLocal         = account.get('acct').indexOf('@') === -1;
-    const acct            = isLocal && domain ? `${account.get('acct')}@${domain}` : account.get('acct');
+    const username        = account.get('acct').split('@')[0];
+    const domain          = isLocal ? localDomain : account.get('acct').split('@')[1];
     const isIndexable     = !account.get('noindex');
 
     const badges = [];
@@ -438,7 +441,9 @@ class Header extends ImmutablePureComponent {
             <h1>
               <span dangerouslySetInnerHTML={displayNameHtml} />
               <small>
-                <span>@{acct}</span> {lockedIcon}
+                <span>@{username}<span className='invisible'>@{domain}</span></span>
+                <DomainPill username={username} domain={domain} isSelf={me === account.get('id')} />
+                {lockedIcon}
               </small>
             </h1>
           </div>
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index 8a66695f322090..e05cf8c4c1e4c3 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -205,6 +205,19 @@
   "dismissable_banner.explore_statuses": "These are posts from across the social web that are gaining traction today. Newer posts with more boosts and favorites are ranked higher.",
   "dismissable_banner.explore_tags": "These are hashtags that are gaining traction on the social web today. Hashtags that are used by more different people are ranked higher.",
   "dismissable_banner.public_timeline": "These are the most recent public posts from people on the social web that people on {domain} follow.",
+  "domain_pill.activitypub_lets_connect": "It lets you connect and interact with people not just on Mastodon, but across different social apps too.",
+  "domain_pill.activitypub_like_language": "ActivityPub is like the language Mastodon speaks with other social networks.",
+  "domain_pill.server": "Server",
+  "domain_pill.their_handle": "Their handle:",
+  "domain_pill.their_server": "Their digital home, where all of their posts live.",
+  "domain_pill.their_username": "Their unique identifier on their server. It’s possible to find users with the same username on different servers.",
+  "domain_pill.username": "Username",
+  "domain_pill.whats_in_a_handle": "What's in a handle?",
+  "domain_pill.who_they_are": "Since handles say who someone is and where they are, you can interact with people across the social web of <button>ActivityPub-powered platforms</button>.",
+  "domain_pill.who_you_are": "Because your handle says who you are and where you are, people can interact with you across the social web of <button>ActivityPub-powered platforms</button>.",
+  "domain_pill.your_handle": "Your handle:",
+  "domain_pill.your_server": "Your digital home, where all of your posts live. Don’t like this one? Transfer servers at any time and bring your followers, too.",
+  "domain_pill.your_username": "Your unique identifier on this server. It’s possible to find users with the same username on different servers.",
   "embed.instructions": "Embed this post on your website by copying the code below.",
   "embed.preview": "Here is what it will look like:",
   "emoji_button.activity": "Activity",
diff --git a/app/javascript/material-icons/400-24px/badge-fill.svg b/app/javascript/material-icons/400-24px/badge-fill.svg
new file mode 100644
index 00000000000000..2f7175b7f12b88
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/badge-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M160-80q-33 0-56.5-23.5T80-160v-440q0-33 23.5-56.5T160-680h200v-120q0-33 23.5-56.5T440-880h80q33 0 56.5 23.5T600-800v120h200q33 0 56.5 23.5T880-600v440q0 33-23.5 56.5T800-80H160Zm80-160h240v-18q0-17-9.5-31.5T444-312q-20-9-40.5-13.5T360-330q-23 0-43.5 4.5T276-312q-17 8-26.5 22.5T240-258v18Zm320-60h160v-60H560v60Zm-200-60q25 0 42.5-17.5T420-420q0-25-17.5-42.5T360-480q-25 0-42.5 17.5T300-420q0 25 17.5 42.5T360-360Zm200-60h160v-60H560v60ZM440-600h80v-200h-80v200Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/badge.svg b/app/javascript/material-icons/400-24px/badge.svg
new file mode 100644
index 00000000000000..d413363a4cc91a
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/badge.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M160-80q-33 0-56.5-23.5T80-160v-440q0-33 23.5-56.5T160-680h200v-120q0-33 23.5-56.5T440-880h80q33 0 56.5 23.5T600-800v120h200q33 0 56.5 23.5T880-600v440q0 33-23.5 56.5T800-80H160Zm0-80h640v-440H600q0 33-23.5 56.5T520-520h-80q-33 0-56.5-23.5T360-600H160v440Zm80-80h240v-18q0-17-9.5-31.5T444-312q-20-9-40.5-13.5T360-330q-23 0-43.5 4.5T276-312q-17 8-26.5 22.5T240-258v18Zm320-60h160v-60H560v60Zm-200-60q25 0 42.5-17.5T420-420q0-25-17.5-42.5T360-480q-25 0-42.5 17.5T300-420q0 25 17.5 42.5T360-360Zm200-60h160v-60H560v60ZM440-600h80v-200h-80v200Zm40 220Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/globe-fill.svg b/app/javascript/material-icons/400-24px/globe-fill.svg
new file mode 100644
index 00000000000000..c931f53c744fd3
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/globe-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M480-80q-83 0-156-31.5T197-197q-54-54-85.5-127T80-480q0-83 31.5-156T197-763q54-54 127-85.5T480-880q83 0 156 31.5T763-763q54 54 85.5 127T880-480q0 83-31.5 156T763-197q-54 54-127 85.5T480-80Zm0-80q134 0 227-93t93-227q0-7-.5-14.5T799-507q-5 29-27 48t-52 19h-80q-33 0-56.5-23.5T560-520v-40H400v-80q0-33 23.5-56.5T480-720h40q0-23 12.5-40.5T563-789q-20-5-40.5-8t-42.5-3q-134 0-227 93t-93 227h200q66 0 113 47t47 113v40H400v110q20 5 39.5 7.5T480-160Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/globe.svg b/app/javascript/material-icons/400-24px/globe.svg
new file mode 100644
index 00000000000000..c931f53c744fd3
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/globe.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M480-80q-83 0-156-31.5T197-197q-54-54-85.5-127T80-480q0-83 31.5-156T197-763q54-54 127-85.5T480-880q83 0 156 31.5T763-763q54 54 85.5 127T880-480q0 83-31.5 156T763-197q-54 54-127 85.5T480-80Zm0-80q134 0 227-93t93-227q0-7-.5-14.5T799-507q-5 29-27 48t-52 19h-80q-33 0-56.5-23.5T560-520v-40H400v-80q0-33 23.5-56.5T480-720h40q0-23 12.5-40.5T563-789q-20-5-40.5-8t-42.5-3q-134 0-227 93t-93 227h200q66 0 113 47t47 113v40H400v110q20 5 39.5 7.5T480-160Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/star-fill.svg b/app/javascript/material-icons/400-24px/star-fill.svg
index cb2231e63436ba..84e8230ab75aa6 100644
--- a/app/javascript/material-icons/400-24px/star-fill.svg
+++ b/app/javascript/material-icons/400-24px/star-fill.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="m233-80 65-281L80-550l288-25 112-265 112 265 288 25-218 189 65 281-247-149L233-80Z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="m233-120 65-281L80-590l288-25 112-265 112 265 288 25-218 189 65 281-247-149-247 149Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/star.svg b/app/javascript/material-icons/400-24px/star.svg
index 1736e085d0683a..6a72ecc226ddb4 100644
--- a/app/javascript/material-icons/400-24px/star.svg
+++ b/app/javascript/material-icons/400-24px/star.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="m354-247 126-76 126 77-33-144 111-96-146-13-58-136-58 135-146 13 111 97-33 143ZM233-80l65-281L80-550l288-25 112-265 112 265 288 25-218 189 65 281-247-149L233-80Zm247-350Z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="m354-287 126-76 126 77-33-144 111-96-146-13-58-136-58 135-146 13 111 97-33 143ZM233-120l65-281L80-590l288-25 112-265 112 265 288 25-218 189 65 281-247-149-247 149Zm247-350Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 398babb2593bf7..8e0859038d3949 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -1792,6 +1792,118 @@ body > [data-popper-placement] {
     }
   }
 
+  &__domain-pill {
+    display: inline-flex;
+    background: rgba($highlight-text-color, 0.2);
+    border-radius: 4px;
+    border: 0;
+    color: $highlight-text-color;
+    font-weight: 500;
+    font-size: 12px;
+    line-height: 16px;
+    padding: 4px 8px;
+
+    &.active {
+      color: $white;
+      background: $ui-highlight-color;
+    }
+
+    &__popout {
+      background: var(--dropdown-background-color);
+      backdrop-filter: var(--background-filter);
+      border: 1px solid var(--dropdown-border-color);
+      box-shadow: var(--dropdown-shadow);
+      max-width: 320px;
+      padding: 16px;
+      border-radius: 8px;
+      display: flex;
+      flex-direction: column;
+      gap: 24px;
+      font-size: 14px;
+      line-height: 20px;
+      color: $darker-text-color;
+
+      .link-button {
+        display: inline;
+        font-size: inherit;
+        line-height: inherit;
+      }
+
+      &__header {
+        display: flex;
+        align-items: center;
+        gap: 12px;
+
+        &__icon {
+          width: 40px;
+          height: 40px;
+          background: $ui-highlight-color;
+          color: $white;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          border-radius: 50%;
+          flex-shrink: 0;
+        }
+
+        h3 {
+          font-size: 17px;
+          line-height: 22px;
+          color: $primary-text-color;
+        }
+      }
+
+      &__handle {
+        border: 2px dashed $highlight-text-color;
+        background: rgba($highlight-text-color, 0.1);
+        padding: 12px 8px;
+        color: $highlight-text-color;
+        border-radius: 4px;
+
+        &__label {
+          font-size: 11px;
+          line-height: 16px;
+          font-weight: 500;
+        }
+
+        &__handle {
+          user-select: all;
+        }
+      }
+
+      &__parts {
+        display: flex;
+        flex-direction: column;
+        gap: 8px;
+        font-size: 12px;
+        line-height: 16px;
+
+        & > div {
+          display: flex;
+          align-items: flex-start;
+          gap: 12px;
+        }
+
+        &__icon {
+          width: 40px;
+          height: 40px;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          flex-shrink: 0;
+          color: $highlight-text-color;
+        }
+
+        h6 {
+          font-size: 14px;
+          line-height: 20px;
+          font-weight: 500;
+          color: $primary-text-color;
+        }
+      }
+    }
+  }
+
   &__note {
     font-size: 14px;
     font-weight: 400;
@@ -7544,14 +7656,17 @@ noscript {
         font-size: 17px;
         line-height: 22px;
         color: $primary-text-color;
-        font-weight: 700;
+        font-weight: 600;
         overflow: hidden;
         white-space: nowrap;
         text-overflow: ellipsis;
 
         small {
-          display: block;
-          font-size: 15px;
+          display: flex;
+          align-items: center;
+          gap: 4px;
+          font-size: 14px;
+          line-height: 20px;
           color: $darker-text-color;
           font-weight: 400;
           overflow: hidden;
@@ -7562,10 +7677,8 @@ noscript {
           }
 
           .icon-lock {
-            height: 16px;
-            width: 16px;
-            position: relative;
-            top: 3px;
+            height: 18px;
+            width: 18px;
           }
         }
       }

From c76ae7a5c0d247264afa896f081db9d1fd278711 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Fri, 15 Mar 2024 14:16:45 +0100
Subject: [PATCH 0471/2191] Convert `packs/public.jsx` to Typescript (#29501)

---
 .../components/relative_timestamp.tsx         |   2 +-
 app/javascript/packs/public.jsx               | 285 -----------
 app/javascript/packs/public.tsx               | 462 ++++++++++++++++++
 3 files changed, 463 insertions(+), 286 deletions(-)
 delete mode 100644 app/javascript/packs/public.jsx
 create mode 100644 app/javascript/packs/public.tsx

diff --git a/app/javascript/mastodon/components/relative_timestamp.tsx b/app/javascript/mastodon/components/relative_timestamp.tsx
index 12530c2b17bceb..b9e1e4f8fd1ff7 100644
--- a/app/javascript/mastodon/components/relative_timestamp.tsx
+++ b/app/javascript/mastodon/components/relative_timestamp.tsx
@@ -102,7 +102,7 @@ const getUnitDelay = (units: string) => {
 };
 
 export const timeAgoString = (
-  intl: IntlShape,
+  intl: Pick<IntlShape, 'formatDate' | 'formatMessage'>,
   date: Date,
   now: number,
   year: number,
diff --git a/app/javascript/packs/public.jsx b/app/javascript/packs/public.jsx
deleted file mode 100644
index d8a4c16034f64a..00000000000000
--- a/app/javascript/packs/public.jsx
+++ /dev/null
@@ -1,285 +0,0 @@
-import { createRoot }  from 'react-dom/client';
-
-import './public-path';
-
-import { IntlMessageFormat }  from 'intl-messageformat';
-import { defineMessages } from 'react-intl';
-
-import Rails from '@rails/ujs';
-import axios from 'axios';
-import { throttle } from 'lodash';
-
-import { start } from '../mastodon/common';
-import { timeAgoString }  from '../mastodon/components/relative_timestamp';
-import emojify  from '../mastodon/features/emoji/emoji';
-import loadKeyboardExtensions from '../mastodon/load_keyboard_extensions';
-import { loadLocale, getLocale } from '../mastodon/locales';
-import { loadPolyfills } from '../mastodon/polyfills';
-import ready from '../mastodon/ready';
-
-import 'cocoon-js-vanilla';
-
-start();
-
-const messages = defineMessages({
-  usernameTaken: { id: 'username.taken', defaultMessage: 'That username is taken. Try another' },
-  passwordExceedsLength: { id: 'password_confirmation.exceeds_maxlength', defaultMessage: 'Password confirmation exceeds the maximum password length' },
-  passwordDoesNotMatch: { id: 'password_confirmation.mismatching', defaultMessage: 'Password confirmation does not match' },
-});
-
-window.addEventListener('message', e => {
-  const data = e.data || {};
-
-  if (!window.parent || data.type !== 'setHeight') {
-    return;
-  }
-
-  ready(() => {
-    window.parent.postMessage({
-      type: 'setHeight',
-      id: data.id,
-      height: document.getElementsByTagName('html')[0].scrollHeight,
-    }, '*');
-  });
-});
-
-function loaded() {
-  const { messages: localeData } = getLocale();
-
-  const locale = document.documentElement.lang;
-
-  const dateTimeFormat = new Intl.DateTimeFormat(locale, {
-    year: 'numeric',
-    month: 'long',
-    day: 'numeric',
-    hour: 'numeric',
-    minute: 'numeric',
-  });
-
-  const dateFormat = new Intl.DateTimeFormat(locale, {
-    year: 'numeric',
-    month: 'short',
-    day: 'numeric',
-    timeFormat: false,
-  });
-
-  const timeFormat = new Intl.DateTimeFormat(locale, {
-    timeStyle: 'short',
-  });
-
-  const formatMessage = ({ id, defaultMessage }, values) => {
-    const messageFormat = new IntlMessageFormat(localeData[id] || defaultMessage, locale);
-    return messageFormat.format(values);
-  };
-
-  document.querySelectorAll('.emojify').forEach((content) => {
-    content.innerHTML = emojify(content.innerHTML);
-  });
-
-  document.querySelectorAll('time.formatted').forEach((content) => {
-    const datetime = new Date(content.getAttribute('datetime'));
-    const formattedDate = dateTimeFormat.format(datetime);
-
-    content.title = formattedDate;
-    content.textContent = formattedDate;
-  });
-
-  const isToday = date => {
-    const today = new Date();
-
-    return date.getDate() === today.getDate() &&
-      date.getMonth() === today.getMonth() &&
-      date.getFullYear() === today.getFullYear();
-  };
-  const todayFormat = new IntlMessageFormat(localeData['relative_format.today'] || 'Today at {time}', locale);
-
-  document.querySelectorAll('time.relative-formatted').forEach((content) => {
-    const datetime = new Date(content.getAttribute('datetime'));
-
-    let formattedContent;
-
-    if (isToday(datetime)) {
-      const formattedTime = timeFormat.format(datetime);
-
-      formattedContent = todayFormat.format({ time: formattedTime });
-    } else {
-      formattedContent = dateFormat.format(datetime);
-    }
-
-    content.title = formattedContent;
-    content.textContent = formattedContent;
-  });
-
-  document.querySelectorAll('time.time-ago').forEach((content) => {
-    const datetime = new Date(content.getAttribute('datetime'));
-    const now      = new Date();
-
-    const timeGiven = content.getAttribute('datetime').includes('T');
-    content.title = timeGiven ? dateTimeFormat.format(datetime) : dateFormat.format(datetime);
-    content.textContent = timeAgoString({
-      formatMessage,
-      formatDate: (date, options) => (new Intl.DateTimeFormat(locale, options)).format(date),
-    }, datetime, now, now.getFullYear(), timeGiven);
-  });
-
-  const reactComponents = document.querySelectorAll('[data-component]');
-
-  if (reactComponents.length > 0) {
-    import(/* webpackChunkName: "containers/media_container" */ '../mastodon/containers/media_container')
-      .then(({ default: MediaContainer }) => {
-        reactComponents.forEach((component) => {
-          Array.from(component.children).forEach((child) => {
-            component.removeChild(child);
-          });
-        });
-
-        const content = document.createElement('div');
-
-        const root = createRoot(content);
-        root.render(<MediaContainer locale={locale} components={reactComponents} />);
-        document.body.appendChild(content);
-      })
-      .catch(error => {
-        console.error(error);
-      });
-  }
-
-  Rails.delegate(document, '#user_account_attributes_username', 'input', throttle(({ target }) => {
-    if (target.value && target.value.length > 0) {
-      axios.get('/api/v1/accounts/lookup', { params: { acct: target.value } }).then(() => {
-        target.setCustomValidity(formatMessage(messages.usernameTaken));
-      }).catch(() => {
-        target.setCustomValidity('');
-      });
-    } else {
-      target.setCustomValidity('');
-    }
-  }, 500, { leading: false, trailing: true }));
-
-  Rails.delegate(document, '#user_password,#user_password_confirmation', 'input', () => {
-    const password = document.getElementById('user_password');
-    const confirmation = document.getElementById('user_password_confirmation');
-    if (!confirmation) return;
-
-    if (confirmation.value && confirmation.value.length > password.maxLength) {
-      confirmation.setCustomValidity(formatMessage(messages.passwordExceedsLength));
-    } else if (password.value && password.value !== confirmation.value) {
-      confirmation.setCustomValidity(formatMessage(messages.passwordDoesNotMatch));
-    } else {
-      confirmation.setCustomValidity('');
-    }
-  });
-
-  Rails.delegate(document, '.status__content__spoiler-link', 'click', function() {
-    const statusEl = this.parentNode.parentNode;
-
-    if (statusEl.dataset.spoiler === 'expanded') {
-      statusEl.dataset.spoiler = 'folded';
-      this.textContent = (new IntlMessageFormat(localeData['status.show_more'] || 'Show more', locale)).format();
-    } else {
-      statusEl.dataset.spoiler = 'expanded';
-      this.textContent = (new IntlMessageFormat(localeData['status.show_less'] || 'Show less', locale)).format();
-    }
-
-    return false;
-  });
-
-  document.querySelectorAll('.status__content__spoiler-link').forEach((spoilerLink) => {
-    const statusEl = spoilerLink.parentNode.parentNode;
-    const message = (statusEl.dataset.spoiler === 'expanded') ? (localeData['status.show_less'] || 'Show less') : (localeData['status.show_more'] || 'Show more');
-    spoilerLink.textContent = (new IntlMessageFormat(message, locale)).format();
-  });
-}
-
-Rails.delegate(document, '#edit_profile input[type=file]', 'change', ({ target }) => {
-  const avatar = document.getElementById(target.id + '-preview');
-  const [file] = target.files || [];
-  const url = file ? URL.createObjectURL(file) : avatar.dataset.originalSrc;
-
-  avatar.src = url;
-});
-
-Rails.delegate(document, '.input-copy input', 'click', ({ target }) => {
-  target.focus();
-  target.select();
-  target.setSelectionRange(0, target.value.length);
-});
-
-Rails.delegate(document, '.input-copy button', 'click', ({ target }) => {
-  const input = target.parentNode.querySelector('.input-copy__wrapper input');
-
-  const oldReadOnly = input.readonly;
-
-  input.readonly = false;
-  input.focus();
-  input.select();
-  input.setSelectionRange(0, input.value.length);
-
-  try {
-    if (document.execCommand('copy')) {
-      input.blur();
-      target.parentNode.classList.add('copied');
-
-      setTimeout(() => {
-        target.parentNode.classList.remove('copied');
-      }, 700);
-    }
-  } catch (err) {
-    console.error(err);
-  }
-
-  input.readonly = oldReadOnly;
-});
-
-const toggleSidebar = () => {
-  const sidebar = document.querySelector('.sidebar ul');
-  const toggleButton = document.querySelector('.sidebar__toggle__icon');
-
-  if (sidebar.classList.contains('visible')) {
-    document.body.style.overflow = null;
-    toggleButton.setAttribute('aria-expanded', 'false');
-  } else {
-    document.body.style.overflow = 'hidden';
-    toggleButton.setAttribute('aria-expanded', 'true');
-  }
-
-  toggleButton.classList.toggle('active');
-  sidebar.classList.toggle('visible');
-};
-
-Rails.delegate(document, '.sidebar__toggle__icon', 'click', () => {
-  toggleSidebar();
-});
-
-Rails.delegate(document, '.sidebar__toggle__icon', 'keydown', e => {
-  if (e.key === ' ' || e.key === 'Enter') {
-    e.preventDefault();
-    toggleSidebar();
-  }
-});
-
-Rails.delegate(document, '.custom-emoji', 'mouseover', ({ target }) => target.src = target.getAttribute('data-original'));
-Rails.delegate(document, '.custom-emoji', 'mouseout', ({ target }) => target.src = target.getAttribute('data-static'));
-
-// Empty the honeypot fields in JS in case something like an extension
-// automatically filled them.
-Rails.delegate(document, '#registration_new_user,#new_user', 'submit', () => {
-  ['user_website', 'user_confirm_password', 'registration_user_website', 'registration_user_confirm_password'].forEach(id => {
-    const field = document.getElementById(id);
-    if (field) {
-      field.value = '';
-    }
-  });
-});
-
-function main() {
-  ready(loaded);
-}
-
-loadPolyfills()
-  .then(loadLocale)
-  .then(main)
-  .then(loadKeyboardExtensions)
-  .catch(error => {
-    console.error(error);
-  });
diff --git a/app/javascript/packs/public.tsx b/app/javascript/packs/public.tsx
new file mode 100644
index 00000000000000..044faeb29605cb
--- /dev/null
+++ b/app/javascript/packs/public.tsx
@@ -0,0 +1,462 @@
+import { createRoot } from 'react-dom/client';
+
+import './public-path';
+
+import { IntlMessageFormat } from 'intl-messageformat';
+import type { MessageDescriptor, PrimitiveType } from 'react-intl';
+import { defineMessages } from 'react-intl';
+
+import Rails from '@rails/ujs';
+import axios from 'axios';
+import { throttle } from 'lodash';
+
+import { start } from '../mastodon/common';
+import { timeAgoString } from '../mastodon/components/relative_timestamp';
+import emojify from '../mastodon/features/emoji/emoji';
+import loadKeyboardExtensions from '../mastodon/load_keyboard_extensions';
+import { loadLocale, getLocale } from '../mastodon/locales';
+import { loadPolyfills } from '../mastodon/polyfills';
+import ready from '../mastodon/ready';
+
+import 'cocoon-js-vanilla';
+
+start();
+
+const messages = defineMessages({
+  usernameTaken: {
+    id: 'username.taken',
+    defaultMessage: 'That username is taken. Try another',
+  },
+  passwordExceedsLength: {
+    id: 'password_confirmation.exceeds_maxlength',
+    defaultMessage: 'Password confirmation exceeds the maximum password length',
+  },
+  passwordDoesNotMatch: {
+    id: 'password_confirmation.mismatching',
+    defaultMessage: 'Password confirmation does not match',
+  },
+});
+
+interface SetHeightMessage {
+  type: 'setHeight';
+  id: string;
+  height: number;
+}
+
+function isSetHeightMessage(data: unknown): data is SetHeightMessage {
+  if (
+    data &&
+    typeof data === 'object' &&
+    'type' in data &&
+    data.type === 'setHeight'
+  )
+    return true;
+  else return false;
+}
+
+window.addEventListener('message', (e) => {
+  // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition -- typings are not correct, it can be null in very rare cases
+  if (!e.data || !isSetHeightMessage(e.data) || !window.parent) return;
+
+  const data = e.data;
+
+  ready(() => {
+    window.parent.postMessage(
+      {
+        type: 'setHeight',
+        id: data.id,
+        height: document.getElementsByTagName('html')[0].scrollHeight,
+      },
+      '*',
+    );
+  }).catch((e) => {
+    console.error('Error in setHeightMessage postMessage', e);
+  });
+});
+
+function loaded() {
+  const { messages: localeData } = getLocale();
+
+  const locale = document.documentElement.lang;
+
+  const dateTimeFormat = new Intl.DateTimeFormat(locale, {
+    year: 'numeric',
+    month: 'long',
+    day: 'numeric',
+    hour: 'numeric',
+    minute: 'numeric',
+  });
+
+  const dateFormat = new Intl.DateTimeFormat(locale, {
+    year: 'numeric',
+    month: 'short',
+    day: 'numeric',
+  });
+
+  const timeFormat = new Intl.DateTimeFormat(locale, {
+    timeStyle: 'short',
+  });
+
+  const formatMessage = (
+    { id, defaultMessage }: MessageDescriptor,
+    values?: Record<string, PrimitiveType>,
+  ) => {
+    let message: string | undefined = undefined;
+
+    if (id) message = localeData[id];
+
+    if (!message) message = defaultMessage as string;
+
+    const messageFormat = new IntlMessageFormat(message, locale);
+    return messageFormat.format(values) as string;
+  };
+
+  document.querySelectorAll('.emojify').forEach((content) => {
+    content.innerHTML = emojify(content.innerHTML);
+  });
+
+  document
+    .querySelectorAll<HTMLTimeElement>('time.formatted')
+    .forEach((content) => {
+      const datetime = new Date(content.dateTime);
+      const formattedDate = dateTimeFormat.format(datetime);
+
+      content.title = formattedDate;
+      content.textContent = formattedDate;
+    });
+
+  const isToday = (date: Date) => {
+    const today = new Date();
+
+    return (
+      date.getDate() === today.getDate() &&
+      date.getMonth() === today.getMonth() &&
+      date.getFullYear() === today.getFullYear()
+    );
+  };
+  const todayFormat = new IntlMessageFormat(
+    localeData['relative_format.today'] || 'Today at {time}',
+    locale,
+  );
+
+  document
+    .querySelectorAll<HTMLTimeElement>('time.relative-formatted')
+    .forEach((content) => {
+      const datetime = new Date(content.dateTime);
+
+      let formattedContent: string;
+
+      if (isToday(datetime)) {
+        const formattedTime = timeFormat.format(datetime);
+
+        formattedContent = todayFormat.format({
+          time: formattedTime,
+        }) as string;
+      } else {
+        formattedContent = dateFormat.format(datetime);
+      }
+
+      content.title = formattedContent;
+      content.textContent = formattedContent;
+    });
+
+  document
+    .querySelectorAll<HTMLTimeElement>('time.time-ago')
+    .forEach((content) => {
+      const datetime = new Date(content.dateTime);
+      const now = new Date();
+
+      const timeGiven = content.dateTime.includes('T');
+      content.title = timeGiven
+        ? dateTimeFormat.format(datetime)
+        : dateFormat.format(datetime);
+      content.textContent = timeAgoString(
+        {
+          formatMessage,
+          formatDate: (date: Date, options) =>
+            new Intl.DateTimeFormat(locale, options).format(date),
+        },
+        datetime,
+        now.getTime(),
+        now.getFullYear(),
+        timeGiven,
+      );
+    });
+
+  const reactComponents = document.querySelectorAll('[data-component]');
+
+  if (reactComponents.length > 0) {
+    import(
+      /* webpackChunkName: "containers/media_container" */ '../mastodon/containers/media_container'
+    )
+      .then(({ default: MediaContainer }) => {
+        reactComponents.forEach((component) => {
+          Array.from(component.children).forEach((child) => {
+            component.removeChild(child);
+          });
+        });
+
+        const content = document.createElement('div');
+
+        const root = createRoot(content);
+        root.render(
+          <MediaContainer locale={locale} components={reactComponents} />,
+        );
+        document.body.appendChild(content);
+
+        return true;
+      })
+      .catch((error) => {
+        console.error(error);
+      });
+  }
+
+  Rails.delegate(
+    document,
+    'input#user_account_attributes_username',
+    'input',
+    throttle(
+      ({ target }) => {
+        if (!(target instanceof HTMLInputElement)) return;
+
+        if (target.value && target.value.length > 0) {
+          axios
+            .get('/api/v1/accounts/lookup', { params: { acct: target.value } })
+            .then(() => {
+              target.setCustomValidity(formatMessage(messages.usernameTaken));
+              return true;
+            })
+            .catch(() => {
+              target.setCustomValidity('');
+            });
+        } else {
+          target.setCustomValidity('');
+        }
+      },
+      500,
+      { leading: false, trailing: true },
+    ),
+  );
+
+  Rails.delegate(
+    document,
+    '#user_password,#user_password_confirmation',
+    'input',
+    () => {
+      const password = document.querySelector<HTMLInputElement>(
+        'input#user_password',
+      );
+      const confirmation = document.querySelector<HTMLInputElement>(
+        'input#user_password_confirmation',
+      );
+      if (!confirmation || !password) return;
+
+      if (
+        confirmation.value &&
+        confirmation.value.length > password.maxLength
+      ) {
+        confirmation.setCustomValidity(
+          formatMessage(messages.passwordExceedsLength),
+        );
+      } else if (password.value && password.value !== confirmation.value) {
+        confirmation.setCustomValidity(
+          formatMessage(messages.passwordDoesNotMatch),
+        );
+      } else {
+        confirmation.setCustomValidity('');
+      }
+    },
+  );
+
+  Rails.delegate(
+    document,
+    'button.status__content__spoiler-link',
+    'click',
+    function () {
+      if (!(this instanceof HTMLButtonElement)) return;
+
+      const statusEl = this.parentNode?.parentNode;
+
+      if (
+        !(
+          statusEl instanceof HTMLDivElement &&
+          statusEl.classList.contains('.status__content')
+        )
+      )
+        return;
+
+      if (statusEl.dataset.spoiler === 'expanded') {
+        statusEl.dataset.spoiler = 'folded';
+        this.textContent = new IntlMessageFormat(
+          localeData['status.show_more'] || 'Show more',
+          locale,
+        ).format() as string;
+      } else {
+        statusEl.dataset.spoiler = 'expanded';
+        this.textContent = new IntlMessageFormat(
+          localeData['status.show_less'] || 'Show less',
+          locale,
+        ).format() as string;
+      }
+    },
+  );
+
+  document
+    .querySelectorAll<HTMLButtonElement>('button.status__content__spoiler-link')
+    .forEach((spoilerLink) => {
+      const statusEl = spoilerLink.parentNode?.parentNode;
+
+      if (
+        !(
+          statusEl instanceof HTMLDivElement &&
+          statusEl.classList.contains('.status__content')
+        )
+      )
+        return;
+
+      const message =
+        statusEl.dataset.spoiler === 'expanded'
+          ? localeData['status.show_less'] || 'Show less'
+          : localeData['status.show_more'] || 'Show more';
+      spoilerLink.textContent = new IntlMessageFormat(
+        message,
+        locale,
+      ).format() as string;
+    });
+}
+
+Rails.delegate(
+  document,
+  '#edit_profile input[type=file]',
+  'change',
+  ({ target }) => {
+    if (!(target instanceof HTMLInputElement)) return;
+
+    const avatar = document.querySelector<HTMLImageElement>(
+      `img#${target.id}-preview`,
+    );
+
+    if (!avatar) return;
+
+    let file: File | undefined;
+    if (target.files) file = target.files[0];
+
+    const url = file ? URL.createObjectURL(file) : avatar.dataset.originalSrc;
+
+    if (url) avatar.src = url;
+  },
+);
+
+Rails.delegate(document, '.input-copy input', 'click', ({ target }) => {
+  if (!(target instanceof HTMLInputElement)) return;
+
+  target.focus();
+  target.select();
+  target.setSelectionRange(0, target.value.length);
+});
+
+Rails.delegate(document, '.input-copy button', 'click', ({ target }) => {
+  if (!(target instanceof HTMLButtonElement)) return;
+
+  const input = target.parentNode?.querySelector<HTMLInputElement>(
+    '.input-copy__wrapper input',
+  );
+
+  if (!input) return;
+
+  const oldReadOnly = input.readOnly;
+
+  input.readOnly = false;
+  input.focus();
+  input.select();
+  input.setSelectionRange(0, input.value.length);
+
+  try {
+    if (document.execCommand('copy')) {
+      input.blur();
+
+      const parent = target.parentElement;
+
+      if (!parent) return;
+      parent.classList.add('copied');
+
+      setTimeout(() => {
+        parent.classList.remove('copied');
+      }, 700);
+    }
+  } catch (err) {
+    console.error(err);
+  }
+
+  input.readOnly = oldReadOnly;
+});
+
+const toggleSidebar = () => {
+  const sidebar = document.querySelector<HTMLUListElement>('.sidebar ul');
+  const toggleButton = document.querySelector<HTMLAnchorElement>(
+    'a.sidebar__toggle__icon',
+  );
+
+  if (!sidebar || !toggleButton) return;
+
+  if (sidebar.classList.contains('visible')) {
+    document.body.style.overflow = '';
+    toggleButton.setAttribute('aria-expanded', 'false');
+  } else {
+    document.body.style.overflow = 'hidden';
+    toggleButton.setAttribute('aria-expanded', 'true');
+  }
+
+  toggleButton.classList.toggle('active');
+  sidebar.classList.toggle('visible');
+};
+
+Rails.delegate(document, '.sidebar__toggle__icon', 'click', () => {
+  toggleSidebar();
+});
+
+Rails.delegate(document, '.sidebar__toggle__icon', 'keydown', (e) => {
+  if (e.key === ' ' || e.key === 'Enter') {
+    e.preventDefault();
+    toggleSidebar();
+  }
+});
+
+Rails.delegate(document, 'img.custom-emoji', 'mouseover', ({ target }) => {
+  if (target instanceof HTMLImageElement && target.dataset.original)
+    target.src = target.dataset.original;
+});
+Rails.delegate(document, 'img.custom-emoji', 'mouseout', ({ target }) => {
+  if (target instanceof HTMLImageElement && target.dataset.static)
+    target.src = target.dataset.static;
+});
+
+// Empty the honeypot fields in JS in case something like an extension
+// automatically filled them.
+Rails.delegate(document, '#registration_new_user,#new_user', 'submit', () => {
+  [
+    'user_website',
+    'user_confirm_password',
+    'registration_user_website',
+    'registration_user_confirm_password',
+  ].forEach((id) => {
+    const field = document.querySelector<HTMLInputElement>(`input#${id}`);
+    if (field) {
+      field.value = '';
+    }
+  });
+});
+
+function main() {
+  ready(loaded).catch((error) => {
+    console.error(error);
+  });
+}
+
+loadPolyfills()
+  .then(loadLocale)
+  .then(main)
+  .then(loadKeyboardExtensions)
+  .catch((error) => {
+    console.error(error);
+  });

From 4f4132f1a11797bf1aecc66ae5735257845953ae Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 15 Mar 2024 10:26:23 -0400
Subject: [PATCH 0472/2191] Add diagnostic message for failure during CLI
 search deploy (#29462)

---
 lib/mastodon/cli/search.rb           |  8 ++++++++
 spec/lib/mastodon/cli/search_spec.rb | 11 +++++++++++
 2 files changed, 19 insertions(+)

diff --git a/lib/mastodon/cli/search.rb b/lib/mastodon/cli/search.rb
index 5901c07776b337..3a73c9c04741e3 100644
--- a/lib/mastodon/cli/search.rb
+++ b/lib/mastodon/cli/search.rb
@@ -100,6 +100,14 @@ def deploy
       progress.finish
 
       say("Indexed #{added} records, de-indexed #{removed}", :green, true)
+    rescue Elasticsearch::Transport::Transport::ServerError => e
+      fail_with_message <<~ERROR
+        There was an issue connecting to the search server. Make sure the
+        server is configured and running correctly, and that the environment
+        variable settings match what the server is expecting.
+
+        #{e.message}
+      ERROR
     end
 
     private
diff --git a/spec/lib/mastodon/cli/search_spec.rb b/spec/lib/mastodon/cli/search_spec.rb
index 8cce2c6ee22a96..ed3789c3e7d282 100644
--- a/spec/lib/mastodon/cli/search_spec.rb
+++ b/spec/lib/mastodon/cli/search_spec.rb
@@ -33,6 +33,17 @@
       end
     end
 
+    context 'when server communication raises an error' do
+      let(:options) { { reset_chewy: true } }
+
+      before { allow(Chewy::Stash::Specification).to receive(:reset!).and_raise(Elasticsearch::Transport::Transport::Errors::InternalServerError) }
+
+      it 'Exits with error message' do
+        expect { subject }
+          .to raise_error(Thor::Error, /issue connecting to the search/)
+      end
+    end
+
     context 'without options' do
       before { stub_search_indexes }
 

From be7a68b09590a553d607b1fe99adf6916618d5d3 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 15 Mar 2024 17:06:48 +0100
Subject: [PATCH 0473/2191] Change Explore icon to compass in advanced
 interface (#29610)

---
 app/javascript/mastodon/features/getting_started/index.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/javascript/mastodon/features/getting_started/index.jsx b/app/javascript/mastodon/features/getting_started/index.jsx
index d84c85806e8aed..a686a0a8497ab3 100644
--- a/app/javascript/mastodon/features/getting_started/index.jsx
+++ b/app/javascript/mastodon/features/getting_started/index.jsx
@@ -11,6 +11,7 @@ import { connect } from 'react-redux';
 
 import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
 import BookmarksIcon from '@/material-icons/400-24px/bookmarks-fill.svg?react';
+import ExploreIcon from '@/material-icons/400-24px/explore.svg?react';
 import PeopleIcon from '@/material-icons/400-24px/group.svg?react';
 import HomeIcon from '@/material-icons/400-24px/home-fill.svg?react';
 import ListAltIcon from '@/material-icons/400-24px/list_alt.svg?react';
@@ -19,7 +20,6 @@ import PersonAddIcon from '@/material-icons/400-24px/person_add.svg?react';
 import PublicIcon from '@/material-icons/400-24px/public.svg?react';
 import SettingsIcon from '@/material-icons/400-24px/settings-fill.svg?react';
 import StarIcon from '@/material-icons/400-24px/star.svg?react';
-import TagIcon from '@/material-icons/400-24px/tag.svg?react';
 import { fetchFollowRequests } from 'mastodon/actions/accounts';
 import Column from 'mastodon/components/column';
 import ColumnHeader from 'mastodon/components/column_header';
@@ -112,7 +112,7 @@ class GettingStarted extends ImmutablePureComponent {
 
     if (showTrends) {
       navItems.push(
-        <ColumnLink key='explore' icon='explore' iconComponent={TagIcon} text={intl.formatMessage(messages.explore)} to='/explore' />,
+        <ColumnLink key='explore' icon='explore' iconComponent={ExploreIcon} text={intl.formatMessage(messages.explore)} to='/explore' />,
       );
     }
 

From ec19d0a14bd8f5e76293ca52cf67972e01c2135f Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 15 Mar 2024 18:36:41 +0100
Subject: [PATCH 0474/2191] Change mute, block and domain block confirmations
 in web UI (#29576)

---
 app/javascript/mastodon/actions/blocks.js     |  15 +-
 .../mastodon/actions/domain_blocks.js         |  11 +
 app/javascript/mastodon/actions/mutes.js      |  32 +--
 .../mastodon/components/check_box.tsx         |  39 +++
 .../mastodon/components/status_action_bar.jsx |   2 +-
 .../mastodon/containers/status_container.jsx  |  15 +-
 .../account_timeline/components/header.jsx    |   6 +-
 .../containers/header_container.jsx           |  13 +-
 .../features/status/components/action_bar.jsx |   2 +-
 .../mastodon/features/status/index.jsx        |  15 +-
 .../features/ui/components/block_modal.jsx    | 165 ++++++------
 .../ui/components/domain_block_modal.jsx      | 106 ++++++++
 .../features/ui/components/modal_root.jsx     |   2 +
 .../features/ui/components/mute_modal.jsx     | 238 ++++++++++--------
 .../features/ui/util/async-components.js      |   4 +
 app/javascript/mastodon/locales/en.json       |  31 ++-
 app/javascript/mastodon/reducers/blocks.js    |  22 --
 app/javascript/mastodon/reducers/index.ts     |   4 -
 app/javascript/mastodon/reducers/mutes.js     |  31 ---
 .../400-24px/domain_disabled-fill.svg         |   1 +
 .../400-24px/domain_disabled.svg              |   1 +
 .../material-icons/400-24px/history-fill.svg  |   1 +
 .../material-icons/400-24px/history.svg       |   1 +
 .../400-24px/person_remove-fill.svg           |   1 +
 .../material-icons/400-24px/person_remove.svg |   1 +
 .../styles/mastodon/components.scss           | 223 ++++++++++++++--
 app/javascript/styles/mastodon/variables.scss |  11 +-
 27 files changed, 632 insertions(+), 361 deletions(-)
 create mode 100644 app/javascript/mastodon/components/check_box.tsx
 create mode 100644 app/javascript/mastodon/features/ui/components/domain_block_modal.jsx
 delete mode 100644 app/javascript/mastodon/reducers/blocks.js
 delete mode 100644 app/javascript/mastodon/reducers/mutes.js
 create mode 100644 app/javascript/material-icons/400-24px/domain_disabled-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/domain_disabled.svg
 create mode 100644 app/javascript/material-icons/400-24px/history-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/history.svg
 create mode 100644 app/javascript/material-icons/400-24px/person_remove-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/person_remove.svg

diff --git a/app/javascript/mastodon/actions/blocks.js b/app/javascript/mastodon/actions/blocks.js
index e293657ad36ef9..54296d0905c9a9 100644
--- a/app/javascript/mastodon/actions/blocks.js
+++ b/app/javascript/mastodon/actions/blocks.js
@@ -12,8 +12,6 @@ export const BLOCKS_EXPAND_REQUEST = 'BLOCKS_EXPAND_REQUEST';
 export const BLOCKS_EXPAND_SUCCESS = 'BLOCKS_EXPAND_SUCCESS';
 export const BLOCKS_EXPAND_FAIL    = 'BLOCKS_EXPAND_FAIL';
 
-export const BLOCKS_INIT_MODAL = 'BLOCKS_INIT_MODAL';
-
 export function fetchBlocks() {
   return (dispatch, getState) => {
     dispatch(fetchBlocksRequest());
@@ -90,11 +88,12 @@ export function expandBlocksFail(error) {
 
 export function initBlockModal(account) {
   return dispatch => {
-    dispatch({
-      type: BLOCKS_INIT_MODAL,
-      account,
-    });
-
-    dispatch(openModal({ modalType: 'BLOCK' }));
+    dispatch(openModal({
+      modalType: 'BLOCK',
+      modalProps: {
+        accountId: account.get('id'),
+        acct: account.get('acct'),
+      },
+    }));
   };
 }
diff --git a/app/javascript/mastodon/actions/domain_blocks.js b/app/javascript/mastodon/actions/domain_blocks.js
index 718002613f4053..55c0a6ce9d0ab7 100644
--- a/app/javascript/mastodon/actions/domain_blocks.js
+++ b/app/javascript/mastodon/actions/domain_blocks.js
@@ -1,6 +1,8 @@
 import api, { getLinks } from '../api';
 
 import { blockDomainSuccess, unblockDomainSuccess } from "./domain_blocks_typed";
+import { openModal } from './modal';
+
 
 export * from "./domain_blocks_typed";
 
@@ -150,3 +152,12 @@ export function expandDomainBlocksFail(error) {
     error,
   };
 }
+
+export const initDomainBlockModal = account => dispatch => dispatch(openModal({
+  modalType: 'DOMAIN_BLOCK',
+  modalProps: {
+    domain: account.get('acct').split('@')[1],
+    acct: account.get('acct'),
+    accountId: account.get('id'),
+  },
+}));
diff --git a/app/javascript/mastodon/actions/mutes.js b/app/javascript/mastodon/actions/mutes.js
index fb041078b84488..99c113f4147302 100644
--- a/app/javascript/mastodon/actions/mutes.js
+++ b/app/javascript/mastodon/actions/mutes.js
@@ -12,10 +12,6 @@ export const MUTES_EXPAND_REQUEST = 'MUTES_EXPAND_REQUEST';
 export const MUTES_EXPAND_SUCCESS = 'MUTES_EXPAND_SUCCESS';
 export const MUTES_EXPAND_FAIL    = 'MUTES_EXPAND_FAIL';
 
-export const MUTES_INIT_MODAL = 'MUTES_INIT_MODAL';
-export const MUTES_TOGGLE_HIDE_NOTIFICATIONS = 'MUTES_TOGGLE_HIDE_NOTIFICATIONS';
-export const MUTES_CHANGE_DURATION = 'MUTES_CHANGE_DURATION';
-
 export function fetchMutes() {
   return (dispatch, getState) => {
     dispatch(fetchMutesRequest());
@@ -92,26 +88,12 @@ export function expandMutesFail(error) {
 
 export function initMuteModal(account) {
   return dispatch => {
-    dispatch({
-      type: MUTES_INIT_MODAL,
-      account,
-    });
-
-    dispatch(openModal({ modalType: 'MUTE' }));
-  };
-}
-
-export function toggleHideNotifications() {
-  return dispatch => {
-    dispatch({ type: MUTES_TOGGLE_HIDE_NOTIFICATIONS });
-  };
-}
-
-export function changeMuteDuration(duration) {
-  return dispatch => {
-    dispatch({
-      type: MUTES_CHANGE_DURATION,
-      duration,
-    });
+    dispatch(openModal({
+      modalType: 'MUTE',
+      modalProps: {
+        accountId: account.get('id'),
+        acct: account.get('acct'),
+      },
+    }));
   };
 }
diff --git a/app/javascript/mastodon/components/check_box.tsx b/app/javascript/mastodon/components/check_box.tsx
new file mode 100644
index 00000000000000..7da8ef0ac5602d
--- /dev/null
+++ b/app/javascript/mastodon/components/check_box.tsx
@@ -0,0 +1,39 @@
+import classNames from 'classnames';
+
+import DoneIcon from '@/material-icons/400-24px/done.svg?react';
+
+import { Icon } from './icon';
+
+interface Props {
+  value: string;
+  checked: boolean;
+  name: string;
+  onChange: (event: React.ChangeEvent<HTMLInputElement>) => void;
+  label: React.ReactNode;
+}
+
+export const CheckBox: React.FC<Props> = ({
+  name,
+  value,
+  checked,
+  onChange,
+  label,
+}) => {
+  return (
+    <label className='check-box'>
+      <input
+        name={name}
+        type='checkbox'
+        value={value}
+        checked={checked}
+        onChange={onChange}
+      />
+
+      <span className={classNames('check-box__input', { checked })}>
+        {checked && <Icon id='check' icon={DoneIcon} />}
+      </span>
+
+      <span>{label}</span>
+    </label>
+  );
+};
diff --git a/app/javascript/mastodon/components/status_action_bar.jsx b/app/javascript/mastodon/components/status_action_bar.jsx
index b111a653859358..3c6d26e34951ec 100644
--- a/app/javascript/mastodon/components/status_action_bar.jsx
+++ b/app/javascript/mastodon/components/status_action_bar.jsx
@@ -209,7 +209,7 @@ class StatusActionBar extends ImmutablePureComponent {
     const { status, onBlockDomain } = this.props;
     const account = status.get('account');
 
-    onBlockDomain(account.get('acct').split('@')[1]);
+    onBlockDomain(account);
   };
 
   handleUnblockDomain = () => {
diff --git a/app/javascript/mastodon/containers/status_container.jsx b/app/javascript/mastodon/containers/status_container.jsx
index 7a7cd9880f0325..7bd91c8c9d7c06 100644
--- a/app/javascript/mastodon/containers/status_container.jsx
+++ b/app/javascript/mastodon/containers/status_container.jsx
@@ -1,4 +1,4 @@
-import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 
 import { connect } from 'react-redux';
 
@@ -15,7 +15,7 @@ import {
   directCompose,
 } from '../actions/compose';
 import {
-  blockDomain,
+  initDomainBlockModal,
   unblockDomain,
 } from '../actions/domain_blocks';
 import {
@@ -253,15 +253,8 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
     dispatch(toggleStatusCollapse(status.get('id'), isCollapsed));
   },
 
-  onBlockDomain (domain) {
-    dispatch(openModal({
-      modalType: 'CONFIRM',
-      modalProps: {
-        message: <FormattedMessage id='confirmations.domain_block.message' defaultMessage='Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable. You will not see content from that domain in any public timelines or your notifications. Your followers from that domain will be removed.' values={{ domain: <strong>{domain}</strong> }} />,
-        confirm: intl.formatMessage(messages.blockDomainConfirm),
-        onConfirm: () => dispatch(blockDomain(domain)),
-      },
-    }));
+  onBlockDomain (account) {
+    dispatch(initDomainBlockModal(account));
   },
 
   onUnblockDomain (domain) {
diff --git a/app/javascript/mastodon/features/account_timeline/components/header.jsx b/app/javascript/mastodon/features/account_timeline/components/header.jsx
index 7de8d3771b4683..a2463b87649b82 100644
--- a/app/javascript/mastodon/features/account_timeline/components/header.jsx
+++ b/app/javascript/mastodon/features/account_timeline/components/header.jsx
@@ -72,11 +72,7 @@ class Header extends ImmutablePureComponent {
   };
 
   handleBlockDomain = () => {
-    const domain = this.props.account.get('acct').split('@')[1];
-
-    if (!domain) return;
-
-    this.props.onBlockDomain(domain);
+    this.props.onBlockDomain(this.props.account);
   };
 
   handleUnblockDomain = () => {
diff --git a/app/javascript/mastodon/features/account_timeline/containers/header_container.jsx b/app/javascript/mastodon/features/account_timeline/containers/header_container.jsx
index 84a303c37a2309..071dbdbfb72aa4 100644
--- a/app/javascript/mastodon/features/account_timeline/containers/header_container.jsx
+++ b/app/javascript/mastodon/features/account_timeline/containers/header_container.jsx
@@ -17,7 +17,7 @@ import {
   mentionCompose,
   directCompose,
 } from '../../../actions/compose';
-import { blockDomain, unblockDomain } from '../../../actions/domain_blocks';
+import { initDomainBlockModal, unblockDomain } from '../../../actions/domain_blocks';
 import { openModal } from '../../../actions/modal';
 import { initMuteModal } from '../../../actions/mutes';
 import { initReport } from '../../../actions/reports';
@@ -140,15 +140,8 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
     }
   },
 
-  onBlockDomain (domain) {
-    dispatch(openModal({
-      modalType: 'CONFIRM',
-      modalProps: {
-        message: <FormattedMessage id='confirmations.domain_block.message' defaultMessage='Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable. You will not see content from that domain in any public timelines or your notifications. Your followers from that domain will be removed.' values={{ domain: <strong>{domain}</strong> }} />,
-        confirm: intl.formatMessage(messages.blockDomainConfirm),
-        onConfirm: () => dispatch(blockDomain(domain)),
-      },
-    }));
+  onBlockDomain (account) {
+    dispatch(initDomainBlockModal(account));
   },
 
   onUnblockDomain (domain) {
diff --git a/app/javascript/mastodon/features/status/components/action_bar.jsx b/app/javascript/mastodon/features/status/components/action_bar.jsx
index c243a49129eb4e..a4951260abb4e2 100644
--- a/app/javascript/mastodon/features/status/components/action_bar.jsx
+++ b/app/javascript/mastodon/features/status/components/action_bar.jsx
@@ -159,7 +159,7 @@ class ActionBar extends PureComponent {
     const { status, onBlockDomain } = this.props;
     const account = status.get('account');
 
-    onBlockDomain(account.get('acct').split('@')[1]);
+    onBlockDomain(account);
   };
 
   handleUnblockDomain = () => {
diff --git a/app/javascript/mastodon/features/status/index.jsx b/app/javascript/mastodon/features/status/index.jsx
index a3034bb5707180..44db9d9c3ffb03 100644
--- a/app/javascript/mastodon/features/status/index.jsx
+++ b/app/javascript/mastodon/features/status/index.jsx
@@ -1,6 +1,6 @@
 import PropTypes from 'prop-types';
 
-import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 
 import classNames from 'classnames';
 import { Helmet } from 'react-helmet';
@@ -34,7 +34,7 @@ import {
   directCompose,
 } from '../../actions/compose';
 import {
-  blockDomain,
+  initDomainBlockModal,
   unblockDomain,
 } from '../../actions/domain_blocks';
 import {
@@ -463,15 +463,8 @@ class Status extends ImmutablePureComponent {
     this.props.dispatch(unblockAccount(account.get('id')));
   };
 
-  handleBlockDomainClick = domain => {
-    this.props.dispatch(openModal({
-      modalType: 'CONFIRM',
-      modalProps: {
-        message: <FormattedMessage id='confirmations.domain_block.message' defaultMessage='Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable. You will not see content from that domain in any public timelines or your notifications. Your followers from that domain will be removed.' values={{ domain: <strong>{domain}</strong> }} />,
-        confirm: this.props.intl.formatMessage(messages.blockDomainConfirm),
-        onConfirm: () => this.props.dispatch(blockDomain(domain)),
-      },
-    }));
+  handleBlockDomainClick = account => {
+    this.props.dispatch(initDomainBlockModal(account));
   };
 
   handleUnblockDomainClick = domain => {
diff --git a/app/javascript/mastodon/features/ui/components/block_modal.jsx b/app/javascript/mastodon/features/ui/components/block_modal.jsx
index cfac692324aa23..d18adaa5eb7f09 100644
--- a/app/javascript/mastodon/features/ui/components/block_modal.jsx
+++ b/app/javascript/mastodon/features/ui/components/block_modal.jsx
@@ -1,100 +1,87 @@
 import PropTypes from 'prop-types';
-import { PureComponent } from 'react';
-
-import { injectIntl, FormattedMessage } from 'react-intl';
-
-import { connect } from 'react-redux';
-
-import { blockAccount } from '../../../actions/accounts';
-import { closeModal } from '../../../actions/modal';
-import { initReport } from '../../../actions/reports';
-import { Button } from '../../../components/button';
-import { makeGetAccount } from '../../../selectors';
-
-const makeMapStateToProps = () => {
-  const getAccount = makeGetAccount();
-
-  const mapStateToProps = state => ({
-    account: getAccount(state, state.getIn(['blocks', 'new', 'account_id'])),
-  });
-
-  return mapStateToProps;
-};
-
-const mapDispatchToProps = dispatch => {
-  return {
-    onConfirm(account) {
-      dispatch(blockAccount(account.get('id')));
-    },
-
-    onBlockAndReport(account) {
-      dispatch(blockAccount(account.get('id')));
-      dispatch(initReport(account));
-    },
-
-    onClose() {
-      dispatch(closeModal({
-        modalType: undefined,
-        ignoreFocus: false,
-      }));
-    },
-  };
-};
+import { useCallback } from 'react';
+
+import { FormattedMessage } from 'react-intl';
+
+import { useDispatch } from 'react-redux';
+
+import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
+import BlockIcon from '@/material-icons/400-24px/block.svg?react';
+import CampaignIcon from '@/material-icons/400-24px/campaign.svg?react';
+import ReplyIcon from '@/material-icons/400-24px/reply.svg?react';
+import VisibilityOffIcon from '@/material-icons/400-24px/visibility_off.svg?react';
+import { blockAccount } from 'mastodon/actions/accounts';
+import { closeModal } from 'mastodon/actions/modal';
+import { Button } from 'mastodon/components/button';
+import { Icon } from 'mastodon/components/icon';
+
+export const BlockModal = ({ accountId, acct }) => {
+  const dispatch = useDispatch();
+
+  const handleClick = useCallback(() => {
+    dispatch(closeModal({ modalType: undefined, ignoreFocus: false }));
+    dispatch(blockAccount(accountId));
+  }, [dispatch, accountId]);
+
+  const handleCancel = useCallback(() => {
+    dispatch(closeModal({ modalType: undefined, ignoreFocus: false }));
+  }, [dispatch]);
+
+  return (
+    <div className='modal-root__modal safety-action-modal'>
+      <div className='safety-action-modal__top'>
+        <div className='safety-action-modal__header'>
+          <div className='safety-action-modal__header__icon'>
+            <Icon icon={BlockIcon} />
+          </div>
+
+          <div>
+            <h1><FormattedMessage id='block_modal.title' defaultMessage='Block user?' /></h1>
+            <div>@{acct}</div>
+          </div>
+        </div>
 
-class BlockModal extends PureComponent {
-
-  static propTypes = {
-    account: PropTypes.object.isRequired,
-    onClose: PropTypes.func.isRequired,
-    onBlockAndReport: PropTypes.func.isRequired,
-    onConfirm: PropTypes.func.isRequired,
-    intl: PropTypes.object.isRequired,
-  };
-
-  handleClick = () => {
-    this.props.onClose();
-    this.props.onConfirm(this.props.account);
-  };
-
-  handleSecondary = () => {
-    this.props.onClose();
-    this.props.onBlockAndReport(this.props.account);
-  };
-
-  handleCancel = () => {
-    this.props.onClose();
-  };
-
-  render () {
-    const { account } = this.props;
-
-    return (
-      <div className='modal-root__modal block-modal'>
-        <div className='block-modal__container'>
-          <p>
-            <FormattedMessage
-              id='confirmations.block.message'
-              defaultMessage='Are you sure you want to block {name}?'
-              values={{ name: <strong>@{account.get('acct')}</strong> }}
-            />
-          </p>
+        <div className='safety-action-modal__bullet-points'>
+          <div>
+            <div className='safety-action-modal__bullet-points__icon'><Icon icon={CampaignIcon} /></div>
+            <div><FormattedMessage id='block_modal.they_will_know' defaultMessage="They can see that they're blocked." /></div>
+          </div>
+
+          <div>
+            <div className='safety-action-modal__bullet-points__icon'><Icon icon={VisibilityOffIcon} /></div>
+            <div><FormattedMessage id='block_modal.they_cant_see_posts' defaultMessage="They can't see your posts and you won't see theirs." /></div>
+          </div>
+
+          <div>
+            <div className='safety-action-modal__bullet-points__icon'><Icon icon={AlternateEmailIcon} /></div>
+            <div><FormattedMessage id='block_modal.you_wont_see_mentions' defaultMessage="You won't see posts that mentions them." /></div>
+          </div>
+
+          <div>
+            <div className='safety-action-modal__bullet-points__icon'><Icon icon={ReplyIcon} /></div>
+            <div><FormattedMessage id='block_modal.they_cant_mention' defaultMessage="They can't mention or follow you." /></div>
+          </div>
         </div>
+      </div>
 
-        <div className='block-modal__action-bar'>
-          <Button onClick={this.handleCancel} className='block-modal__cancel-button'>
+      <div className='safety-action-modal__bottom'>
+        <div className='safety-action-modal__actions'>
+          <button onClick={handleCancel} className='link-button'>
             <FormattedMessage id='confirmation_modal.cancel' defaultMessage='Cancel' />
-          </Button>
-          <Button onClick={this.handleSecondary} className='confirmation-modal__secondary-button'>
-            <FormattedMessage id='confirmations.block.block_and_report' defaultMessage='Block & Report' />
-          </Button>
-          <Button onClick={this.handleClick} autoFocus>
+          </button>
+
+          <Button onClick={handleClick}>
             <FormattedMessage id='confirmations.block.confirm' defaultMessage='Block' />
           </Button>
         </div>
       </div>
-    );
-  }
+    </div>
+  );
+};
 
-}
+BlockModal.propTypes = {
+  accountId: PropTypes.string.isRequired,
+  acct: PropTypes.string.isRequired,
+};
 
-export default connect(makeMapStateToProps, mapDispatchToProps)(injectIntl(BlockModal));
+export default BlockModal;
diff --git a/app/javascript/mastodon/features/ui/components/domain_block_modal.jsx b/app/javascript/mastodon/features/ui/components/domain_block_modal.jsx
new file mode 100644
index 00000000000000..e69db6348959a1
--- /dev/null
+++ b/app/javascript/mastodon/features/ui/components/domain_block_modal.jsx
@@ -0,0 +1,106 @@
+import PropTypes from 'prop-types';
+import { useCallback } from 'react';
+
+import { FormattedMessage } from 'react-intl';
+
+import { useDispatch } from 'react-redux';
+
+import CampaignIcon from '@/material-icons/400-24px/campaign.svg?react';
+import DomainDisabledIcon from '@/material-icons/400-24px/domain_disabled.svg?react';
+import HistoryIcon from '@/material-icons/400-24px/history.svg?react';
+import PersonRemoveIcon from '@/material-icons/400-24px/person_remove.svg?react';
+import ReplyIcon from '@/material-icons/400-24px/reply.svg?react';
+import VisibilityOffIcon from '@/material-icons/400-24px/visibility_off.svg?react';
+import { blockAccount } from 'mastodon/actions/accounts';
+import { blockDomain } from 'mastodon/actions/domain_blocks';
+import { closeModal } from 'mastodon/actions/modal';
+import { Button } from 'mastodon/components/button';
+import { Icon } from 'mastodon/components/icon';
+
+export const DomainBlockModal = ({ domain, accountId, acct }) => {
+  const dispatch = useDispatch();
+
+  const handleClick = useCallback(() => {
+    dispatch(closeModal({ modalType: undefined, ignoreFocus: false }));
+    dispatch(blockDomain(domain));
+  }, [dispatch, domain]);
+
+  const handleSecondaryClick = useCallback(() => {
+    dispatch(closeModal({ modalType: undefined, ignoreFocus: false }));
+    dispatch(blockAccount(accountId));
+  }, [dispatch, accountId]);
+
+  const handleCancel = useCallback(() => {
+    dispatch(closeModal({ modalType: undefined, ignoreFocus: false }));
+  }, [dispatch]);
+
+  return (
+    <div className='modal-root__modal safety-action-modal'>
+      <div className='safety-action-modal__top'>
+        <div className='safety-action-modal__header'>
+          <div className='safety-action-modal__header__icon'>
+            <Icon icon={DomainDisabledIcon} />
+          </div>
+
+          <div>
+            <h1><FormattedMessage id='domain_block_modal.title' defaultMessage='Block domain?' /></h1>
+            <div>{domain}</div>
+          </div>
+        </div>
+
+        <div className='safety-action-modal__bullet-points'>
+          <div>
+            <div className='safety-action-modal__bullet-points__icon'><Icon icon={CampaignIcon} /></div>
+            <div><FormattedMessage id='domain_block_modal.they_wont_know' defaultMessage="They won't know they've been blocked." /></div>
+          </div>
+
+          <div>
+            <div className='safety-action-modal__bullet-points__icon'><Icon icon={VisibilityOffIcon} /></div>
+            <div><FormattedMessage id='domain_block_modal.you_wont_see_posts' defaultMessage="You won't see posts or notifications from users on this server." /></div>
+          </div>
+
+          <div>
+            <div className='safety-action-modal__bullet-points__icon'><Icon icon={PersonRemoveIcon} /></div>
+            <div><FormattedMessage id='domain_block_modal.you_will_lose_followers' defaultMessage='All your followers from this server will be removed.' /></div>
+          </div>
+
+          <div>
+            <div className='safety-action-modal__bullet-points__icon'><Icon icon={ReplyIcon} /></div>
+            <div><FormattedMessage id='domain_block_modal.they_cant_follow' defaultMessage='Nobody from this server can follow you.' /></div>
+          </div>
+
+          <div>
+            <div className='safety-action-modal__bullet-points__icon'><Icon icon={HistoryIcon} /></div>
+            <div><FormattedMessage id='domain_block_modal.they_can_interact_with_old_posts' defaultMessage='People from this server can interact with your old posts.' /></div>
+          </div>
+        </div>
+      </div>
+
+      <div className='safety-action-modal__bottom'>
+        <div className='safety-action-modal__actions'>
+          <Button onClick={handleSecondaryClick} secondary>
+            <FormattedMessage id='domain_block_modal.block_account_instead' defaultMessage='Block @{name} instead' values={{ name: acct.split('@')[0] }} />
+          </Button>
+
+          <div className='spacer' />
+
+          <button onClick={handleCancel} className='link-button'>
+            <FormattedMessage id='confirmation_modal.cancel' defaultMessage='Cancel' />
+          </button>
+
+          <Button onClick={handleClick}>
+            <FormattedMessage id='domain_block_modal.block' defaultMessage='Block server' />
+          </Button>
+        </div>
+      </div>
+    </div>
+  );
+};
+
+DomainBlockModal.propTypes = {
+  domain: PropTypes.string.isRequired,
+  accountId: PropTypes.string.isRequired,
+  acct: PropTypes.string.isRequired,
+};
+
+export default DomainBlockModal;
diff --git a/app/javascript/mastodon/features/ui/components/modal_root.jsx b/app/javascript/mastodon/features/ui/components/modal_root.jsx
index 46f0dc706f48df..97d7706da44add 100644
--- a/app/javascript/mastodon/features/ui/components/modal_root.jsx
+++ b/app/javascript/mastodon/features/ui/components/modal_root.jsx
@@ -7,6 +7,7 @@ import Base from 'mastodon/components/modal_root';
 import {
   MuteModal,
   BlockModal,
+  DomainBlockModal,
   ReportModal,
   EmbedModal,
   ListEditor,
@@ -41,6 +42,7 @@ export const MODAL_COMPONENTS = {
   'CONFIRM': () => Promise.resolve({ default: ConfirmationModal }),
   'MUTE': MuteModal,
   'BLOCK': BlockModal,
+  'DOMAIN_BLOCK': DomainBlockModal,
   'REPORT': ReportModal,
   'ACTIONS': () => Promise.resolve({ default: ActionsModal }),
   'EMBED': EmbedModal,
diff --git a/app/javascript/mastodon/features/ui/components/mute_modal.jsx b/app/javascript/mastodon/features/ui/components/mute_modal.jsx
index fa81ea81a31d53..e9dc1a7c2ec38c 100644
--- a/app/javascript/mastodon/features/ui/components/mute_modal.jsx
+++ b/app/javascript/mastodon/features/ui/components/mute_modal.jsx
@@ -1,138 +1,154 @@
 import PropTypes from 'prop-types';
-import { PureComponent } from 'react';
+import { useCallback, useState } from 'react';
 
-import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
+import { defineMessages, useIntl, FormattedMessage } from 'react-intl';
 
-import { connect } from 'react-redux';
+import classNames from 'classnames';
 
-import Toggle from 'react-toggle';
+import { useDispatch } from 'react-redux';
 
-import { muteAccount } from '../../../actions/accounts';
-import { closeModal } from '../../../actions/modal';
-import { toggleHideNotifications, changeMuteDuration } from '../../../actions/mutes';
-import { Button } from '../../../components/button';
+
+import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
+import CampaignIcon from '@/material-icons/400-24px/campaign.svg?react';
+import ReplyIcon from '@/material-icons/400-24px/reply.svg?react';
+import VisibilityOffIcon from '@/material-icons/400-24px/visibility_off.svg?react';
+import VolumeOffIcon from '@/material-icons/400-24px/volume_off.svg?react';
+import { muteAccount } from 'mastodon/actions/accounts';
+import { closeModal } from 'mastodon/actions/modal';
+import { Button } from 'mastodon/components/button';
+import { CheckBox } from 'mastodon/components/check_box';
+import { Icon } from 'mastodon/components/icon';
+import { RadioButton } from 'mastodon/components/radio_button';
 
 const messages = defineMessages({
   minutes: { id: 'intervals.full.minutes', defaultMessage: '{number, plural, one {# minute} other {# minutes}}' },
   hours: { id: 'intervals.full.hours', defaultMessage: '{number, plural, one {# hour} other {# hours}}' },
   days: { id: 'intervals.full.days', defaultMessage: '{number, plural, one {# day} other {# days}}' },
-  indefinite: { id: 'mute_modal.indefinite', defaultMessage: 'Indefinite' },
+  indefinite: { id: 'mute_modal.indefinite', defaultMessage: 'Until I unmute them' },
+  hideFromNotifications: { id: 'mute_modal.hide_from_notifications', defaultMessage: 'Hide from notifications' },
 });
 
-const mapStateToProps = state => {
-  return {
-    account: state.getIn(['mutes', 'new', 'account']),
-    notifications: state.getIn(['mutes', 'new', 'notifications']),
-    muteDuration: state.getIn(['mutes', 'new', 'duration']),
-  };
+const RadioButtonLabel = ({ name, value, currentValue, onChange, label }) => (
+  <RadioButton
+    name={name}
+    value={value}
+    checked={value === currentValue}
+    onChange={onChange}
+    label={label}
+  />
+);
+
+RadioButtonLabel.propTypes = {
+  name: PropTypes.string,
+  value: PropTypes.oneOf([PropTypes.string, PropTypes.number, PropTypes.bool]),
+  currentValue: PropTypes.oneOf([PropTypes.string, PropTypes.number, PropTypes.bool]),
+  checked: PropTypes.bool,
+  onChange: PropTypes.func,
+  label: PropTypes.node,
 };
 
-const mapDispatchToProps = dispatch => {
-  return {
-    onConfirm(account, notifications, muteDuration) {
-      dispatch(muteAccount(account.get('id'), notifications, muteDuration));
-    },
-
-    onClose() {
-      dispatch(closeModal({
-        modalType: undefined,
-        ignoreFocus: false,
-      }));
-    },
-
-    onToggleNotifications() {
-      dispatch(toggleHideNotifications());
-    },
-
-    onChangeMuteDuration(e) {
-      dispatch(changeMuteDuration(e.target.value));
-    },
-  };
-};
+export const MuteModal = ({ accountId, acct }) => {
+  const intl = useIntl();
+  const dispatch = useDispatch();
+  const [notifications, setNotifications] = useState(true);
+  const [muteDuration, setMuteDuration] = useState('0');
+  const [expanded, setExpanded] = useState(false);
+
+  const handleClick = useCallback(() => {
+    dispatch(closeModal({ modalType: undefined, ignoreFocus: false }));
+    dispatch(muteAccount(accountId, notifications, muteDuration));
+  }, [dispatch, accountId, notifications, muteDuration]);
+
+  const handleCancel = useCallback(() => {
+    dispatch(closeModal({ modalType: undefined, ignoreFocus: false }));
+  }, [dispatch]);
+
+  const handleToggleNotifications = useCallback(({ target }) => {
+    setNotifications(target.checked);
+  }, [setNotifications]);
+
+  const handleChangeMuteDuration = useCallback(({ target }) => {
+    setMuteDuration(target.value);
+  }, [setMuteDuration]);
+
+  const handleToggleSettings = useCallback(() => {
+    setExpanded(!expanded);
+  }, [expanded, setExpanded]);
+
+  return (
+    <div className='modal-root__modal safety-action-modal'>
+      <div className='safety-action-modal__top'>
+        <div className='safety-action-modal__header'>
+          <div className='safety-action-modal__header__icon'>
+            <Icon icon={VolumeOffIcon} />
+          </div>
+
+          <div>
+            <h1><FormattedMessage id='mute_modal.title' defaultMessage='Mute user?' /></h1>
+            <div>@{acct}</div>
+          </div>
+        </div>
 
-class MuteModal extends PureComponent {
-
-  static propTypes = {
-    account: PropTypes.object.isRequired,
-    notifications: PropTypes.bool.isRequired,
-    onClose: PropTypes.func.isRequired,
-    onConfirm: PropTypes.func.isRequired,
-    onToggleNotifications: PropTypes.func.isRequired,
-    intl: PropTypes.object.isRequired,
-    muteDuration: PropTypes.number.isRequired,
-    onChangeMuteDuration: PropTypes.func.isRequired,
-  };
-
-  handleClick = () => {
-    this.props.onClose();
-    this.props.onConfirm(this.props.account, this.props.notifications, this.props.muteDuration);
-  };
-
-  handleCancel = () => {
-    this.props.onClose();
-  };
-
-  toggleNotifications = () => {
-    this.props.onToggleNotifications();
-  };
-
-  changeMuteDuration = (e) => {
-    this.props.onChangeMuteDuration(e);
-  };
-
-  render () {
-    const { account, notifications, muteDuration, intl } = this.props;
-
-    return (
-      <div className='modal-root__modal mute-modal'>
-        <div className='mute-modal__container'>
-          <p>
-            <FormattedMessage
-              id='confirmations.mute.message'
-              defaultMessage='Are you sure you want to mute {name}?'
-              values={{ name: <strong>@{account.get('acct')}</strong> }}
-            />
-          </p>
-          <p className='mute-modal__explanation'>
-            <FormattedMessage
-              id='confirmations.mute.explanation'
-              defaultMessage='This will hide posts from them and posts mentioning them, but it will still allow them to see your posts and follow you.'
-            />
-          </p>
-          <div className='setting-toggle'>
-            <Toggle id='mute-modal__hide-notifications-checkbox' checked={notifications} onChange={this.toggleNotifications} />
-            <label className='setting-toggle__label' htmlFor='mute-modal__hide-notifications-checkbox'>
-              <FormattedMessage id='mute_modal.hide_notifications' defaultMessage='Hide notifications from this user?' />
-            </label>
+        <div className='safety-action-modal__bullet-points'>
+          <div>
+            <div className='safety-action-modal__bullet-points__icon'><Icon icon={CampaignIcon} /></div>
+            <div><FormattedMessage id='mute_modal.they_wont_know' defaultMessage="They won't know they've been muted." /></div>
           </div>
+
           <div>
-            <span><FormattedMessage id='mute_modal.duration' defaultMessage='Duration' />: </span>
-
-            <select value={muteDuration} onChange={this.changeMuteDuration}>
-              <option value={0}>{intl.formatMessage(messages.indefinite)}</option>
-              <option value={300}>{intl.formatMessage(messages.minutes, { number: 5 })}</option>
-              <option value={1800}>{intl.formatMessage(messages.minutes, { number: 30 })}</option>
-              <option value={3600}>{intl.formatMessage(messages.hours, { number: 1 })}</option>
-              <option value={21600}>{intl.formatMessage(messages.hours, { number: 6 })}</option>
-              <option value={86400}>{intl.formatMessage(messages.days, { number: 1 })}</option>
-              <option value={259200}>{intl.formatMessage(messages.days, { number: 3 })}</option>
-              <option value={604800}>{intl.formatMessage(messages.days, { number: 7 })}</option>
-            </select>
+            <div className='safety-action-modal__bullet-points__icon'><Icon icon={VisibilityOffIcon} /></div>
+            <div><FormattedMessage id='mute_modal.you_wont_see_posts' defaultMessage="They can still see your posts, but you won't see theirs." /></div>
+          </div>
+
+          <div>
+            <div className='safety-action-modal__bullet-points__icon'><Icon icon={AlternateEmailIcon} /></div>
+            <div><FormattedMessage id='mute_modal.you_wont_see_mentions' defaultMessage="You won't see posts that mention them." /></div>
+          </div>
+
+          <div>
+            <div className='safety-action-modal__bullet-points__icon'><Icon icon={ReplyIcon} /></div>
+            <div><FormattedMessage id='mute_modal.they_can_mention_and_follow' defaultMessage="They can mention and follow you, but you won't see them." /></div>
+          </div>
+        </div>
+      </div>
+
+      <div className={classNames('safety-action-modal__bottom', { active: expanded })}>
+        <div className='safety-action-modal__bottom__collapsible'>
+          <div className='safety-action-modal__field-group'>
+            <RadioButtonLabel name='duration' value='0' label={intl.formatMessage(messages.indefinite)} currentValue={muteDuration} onChange={handleChangeMuteDuration} />
+            <RadioButtonLabel name='duration' value='86400' label={intl.formatMessage(messages.hours, { number: 24 })} currentValue={muteDuration} onChange={handleChangeMuteDuration} />
+            <RadioButtonLabel name='duration' value='604800' label={intl.formatMessage(messages.days, { number: 7 })} currentValue={muteDuration} onChange={handleChangeMuteDuration} />
+            <RadioButtonLabel name='duration' value='x' label={intl.formatMessage(messages.days, { number: 30 })} currentValue={muteDuration} onChange={handleChangeMuteDuration} />
+          </div>
+
+          <div className='safety-action-modal__field-group'>
+            <CheckBox label={intl.formatMessage(messages.hideFromNotifications)} checked={notifications} onChange={handleToggleNotifications} />
           </div>
         </div>
 
-        <div className='mute-modal__action-bar'>
-          <Button onClick={this.handleCancel} className='mute-modal__cancel-button'>
+        <div className='safety-action-modal__actions'>
+          <button onClick={handleToggleSettings} className='link-button'>
+            {expanded ? <FormattedMessage id='mute_modal.hide_options' defaultMessage='Hide options' /> : <FormattedMessage id='mute_modal.show_options' defaultMessage='Show options' />}
+          </button>
+
+          <div className='spacer' />
+
+          <button onClick={handleCancel} className='link-button'>
             <FormattedMessage id='confirmation_modal.cancel' defaultMessage='Cancel' />
-          </Button>
-          <Button onClick={this.handleClick} autoFocus>
+          </button>
+
+          <Button onClick={handleClick}>
             <FormattedMessage id='confirmations.mute.confirm' defaultMessage='Mute' />
           </Button>
         </div>
       </div>
-    );
-  }
+    </div>
+  );
+};
 
-}
+MuteModal.propTypes = {
+  accountId: PropTypes.string.isRequired,
+  acct: PropTypes.string.isRequired,
+};
 
-export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(MuteModal));
+export default MuteModal;
diff --git a/app/javascript/mastodon/features/ui/util/async-components.js b/app/javascript/mastodon/features/ui/util/async-components.js
index de9b6b40104308..e1f5bfdaf60f66 100644
--- a/app/javascript/mastodon/features/ui/util/async-components.js
+++ b/app/javascript/mastodon/features/ui/util/async-components.js
@@ -118,6 +118,10 @@ export function BlockModal () {
   return import(/* webpackChunkName: "modals/block_modal" */'../components/block_modal');
 }
 
+export function DomainBlockModal () {
+  return import(/* webpackChunkName: "modals/domain_block_modal" */'../components/domain_block_modal');
+}
+
 export function ReportModal () {
   return import(/* webpackChunkName: "modals/report_modal" */'../components/report_modal');
 }
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index e05cf8c4c1e4c3..f893c98a3c6461 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -89,6 +89,11 @@
   "announcement.announcement": "Announcement",
   "attachments_list.unprocessed": "(unprocessed)",
   "audio.hide": "Hide audio",
+  "block_modal.they_cant_mention": "They can't mention or follow you.",
+  "block_modal.they_cant_see_posts": "They can't see your posts and you won't see theirs.",
+  "block_modal.they_will_know": "They can see that they're blocked.",
+  "block_modal.title": "Block user?",
+  "block_modal.you_wont_see_mentions": "You won't see posts that mention them.",
   "boost_modal.combo": "You can press {combo} to skip this next time",
   "bundle_column_error.copy_stacktrace": "Copy error report",
   "bundle_column_error.error.body": "The requested page could not be rendered. It could be due to a bug in our code, or a browser compatibility issue.",
@@ -160,9 +165,7 @@
   "compose_form.spoiler.unmarked": "Add content warning",
   "compose_form.spoiler_placeholder": "Content warning (optional)",
   "confirmation_modal.cancel": "Cancel",
-  "confirmations.block.block_and_report": "Block & Report",
   "confirmations.block.confirm": "Block",
-  "confirmations.block.message": "Are you sure you want to block {name}?",
   "confirmations.cancel_follow_request.confirm": "Withdraw request",
   "confirmations.cancel_follow_request.message": "Are you sure you want to withdraw your request to follow {name}?",
   "confirmations.delete.confirm": "Delete",
@@ -171,15 +174,13 @@
   "confirmations.delete_list.message": "Are you sure you want to permanently delete this list?",
   "confirmations.discard_edit_media.confirm": "Discard",
   "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
-  "confirmations.domain_block.confirm": "Block entire domain",
+  "confirmations.domain_block.confirm": "Block server",
   "confirmations.domain_block.message": "Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable. You will not see content from that domain in any public timelines or your notifications. Your followers from that domain will be removed.",
   "confirmations.edit.confirm": "Edit",
   "confirmations.edit.message": "Editing now will overwrite the message you are currently composing. Are you sure you want to proceed?",
   "confirmations.logout.confirm": "Log out",
   "confirmations.logout.message": "Are you sure you want to log out?",
   "confirmations.mute.confirm": "Mute",
-  "confirmations.mute.explanation": "This will hide posts from them and posts mentioning them, but it will still allow them to see your posts and follow you.",
-  "confirmations.mute.message": "Are you sure you want to mute {name}?",
   "confirmations.redraft.confirm": "Delete & redraft",
   "confirmations.redraft.message": "Are you sure you want to delete this post and re-draft it? Favorites and boosts will be lost, and replies to the original post will be orphaned.",
   "confirmations.reply.confirm": "Reply",
@@ -205,6 +206,14 @@
   "dismissable_banner.explore_statuses": "These are posts from across the social web that are gaining traction today. Newer posts with more boosts and favorites are ranked higher.",
   "dismissable_banner.explore_tags": "These are hashtags that are gaining traction on the social web today. Hashtags that are used by more different people are ranked higher.",
   "dismissable_banner.public_timeline": "These are the most recent public posts from people on the social web that people on {domain} follow.",
+  "domain_block_modal.block": "Block server",
+  "domain_block_modal.block_account_instead": "Block @{name} instead",
+  "domain_block_modal.they_can_interact_with_old_posts": "People from this server can interact with your old posts.",
+  "domain_block_modal.they_cant_follow": "Nobody from this server can follow you.",
+  "domain_block_modal.they_wont_know": "They won't know they've been blocked.",
+  "domain_block_modal.title": "Block domain?",
+  "domain_block_modal.you_will_lose_followers": "All your followers from this server will be removed.",
+  "domain_block_modal.you_wont_see_posts": "You won't see posts or notifications from users on this server.",
   "domain_pill.activitypub_lets_connect": "It lets you connect and interact with people not just on Mastodon, but across different social apps too.",
   "domain_pill.activitypub_like_language": "ActivityPub is like the language Mastodon speaks with other social networks.",
   "domain_pill.server": "Server",
@@ -415,9 +424,15 @@
   "loading_indicator.label": "Loading…",
   "media_gallery.toggle_visible": "{number, plural, one {Hide image} other {Hide images}}",
   "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.",
-  "mute_modal.duration": "Duration",
-  "mute_modal.hide_notifications": "Hide notifications from this user?",
-  "mute_modal.indefinite": "Indefinite",
+  "mute_modal.hide_from_notifications": "Hide from notifications",
+  "mute_modal.hide_options": "Hide options",
+  "mute_modal.indefinite": "Until I unmute them",
+  "mute_modal.show_options": "Show options",
+  "mute_modal.they_can_mention_and_follow": "They can mention and follow you, but you won't see them.",
+  "mute_modal.they_wont_know": "They won't know they've been muted.",
+  "mute_modal.title": "Mute user?",
+  "mute_modal.you_wont_see_mentions": "You won't see posts that mention them.",
+  "mute_modal.you_wont_see_posts": "They can still see your posts, but you won't see theirs.",
   "navigation_bar.about": "About",
   "navigation_bar.advanced_interface": "Open in advanced web interface",
   "navigation_bar.blocks": "Blocked users",
diff --git a/app/javascript/mastodon/reducers/blocks.js b/app/javascript/mastodon/reducers/blocks.js
deleted file mode 100644
index 1b65071634fb16..00000000000000
--- a/app/javascript/mastodon/reducers/blocks.js
+++ /dev/null
@@ -1,22 +0,0 @@
-import Immutable from 'immutable';
-
-import {
-  BLOCKS_INIT_MODAL,
-} from '../actions/blocks';
-
-const initialState = Immutable.Map({
-  new: Immutable.Map({
-    account_id: null,
-  }),
-});
-
-export default function mutes(state = initialState, action) {
-  switch (action.type) {
-  case BLOCKS_INIT_MODAL:
-    return state.withMutations((state) => {
-      state.setIn(['new', 'account_id'], action.account.get('id'));
-    });
-  default:
-    return state;
-  }
-}
diff --git a/app/javascript/mastodon/reducers/index.ts b/app/javascript/mastodon/reducers/index.ts
index 51a76d191e57d3..3d42cc83f82b80 100644
--- a/app/javascript/mastodon/reducers/index.ts
+++ b/app/javascript/mastodon/reducers/index.ts
@@ -7,7 +7,6 @@ import { accountsReducer } from './accounts';
 import accounts_map from './accounts_map';
 import alerts from './alerts';
 import announcements from './announcements';
-import blocks from './blocks';
 import boosts from './boosts';
 import compose from './compose';
 import contexts from './contexts';
@@ -26,7 +25,6 @@ import markers from './markers';
 import media_attachments from './media_attachments';
 import meta from './meta';
 import { modalReducer } from './modal';
-import mutes from './mutes';
 import { notificationPolicyReducer } from './notification_policy';
 import { notificationRequestsReducer } from './notification_requests';
 import notifications from './notifications';
@@ -62,8 +60,6 @@ const reducers = {
   relationships: relationshipsReducer,
   settings,
   push_notifications,
-  mutes,
-  blocks,
   boosts,
   server,
   contexts,
diff --git a/app/javascript/mastodon/reducers/mutes.js b/app/javascript/mastodon/reducers/mutes.js
deleted file mode 100644
index a9eb61ff834cbc..00000000000000
--- a/app/javascript/mastodon/reducers/mutes.js
+++ /dev/null
@@ -1,31 +0,0 @@
-import Immutable from 'immutable';
-
-import {
-  MUTES_INIT_MODAL,
-  MUTES_TOGGLE_HIDE_NOTIFICATIONS,
-  MUTES_CHANGE_DURATION,
-} from '../actions/mutes';
-
-const initialState = Immutable.Map({
-  new: Immutable.Map({
-    account: null,
-    notifications: true,
-    duration: 0,
-  }),
-});
-
-export default function mutes(state = initialState, action) {
-  switch (action.type) {
-  case MUTES_INIT_MODAL:
-    return state.withMutations((state) => {
-      state.setIn(['new', 'account'], action.account);
-      state.setIn(['new', 'notifications'], true);
-    });
-  case MUTES_TOGGLE_HIDE_NOTIFICATIONS:
-    return state.updateIn(['new', 'notifications'], (old) => !old);
-  case MUTES_CHANGE_DURATION:
-    return state.setIn(['new', 'duration'], Number(action.duration));
-  default:
-    return state;
-  }
-}
diff --git a/app/javascript/material-icons/400-24px/domain_disabled-fill.svg b/app/javascript/material-icons/400-24px/domain_disabled-fill.svg
new file mode 100644
index 00000000000000..2f16593d38e5fe
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/domain_disabled-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="m880-194-80-80v-326H474l-74-74v-86h-86l-80-80h246v160h400v486ZM820-28l-94-92H80v-648l-52-52 56-56L876-84l-56 56ZM160-200h80v-80h-80v80Zm0-160h80v-80h-80v80Zm0-160h80v-80h-80v80Zm160 320h80v-80h-80v80Zm0-160h80v-80h-80v80Zm160 160h166l-80-80h-86v80Zm240-240h-80v-80h80v80Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/domain_disabled.svg b/app/javascript/material-icons/400-24px/domain_disabled.svg
new file mode 100644
index 00000000000000..2f16593d38e5fe
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/domain_disabled.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="m880-194-80-80v-326H474l-74-74v-86h-86l-80-80h246v160h400v486ZM820-28l-94-92H80v-648l-52-52 56-56L876-84l-56 56ZM160-200h80v-80h-80v80Zm0-160h80v-80h-80v80Zm0-160h80v-80h-80v80Zm160 320h80v-80h-80v80Zm0-160h80v-80h-80v80Zm160 160h166l-80-80h-86v80Zm240-240h-80v-80h80v80Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/history-fill.svg b/app/javascript/material-icons/400-24px/history-fill.svg
new file mode 100644
index 00000000000000..2d8124b474acac
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/history-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M480-120q-138 0-240.5-91.5T122-440h82q14 104 92.5 172T480-200q117 0 198.5-81.5T760-480q0-117-81.5-198.5T480-760q-69 0-129 32t-101 88h110v80H120v-240h80v94q51-64 124.5-99T480-840q75 0 140.5 28.5t114 77q48.5 48.5 77 114T840-480q0 75-28.5 140.5t-77 114q-48.5 48.5-114 77T480-120Zm112-192L440-464v-216h80v184l128 128-56 56Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/history.svg b/app/javascript/material-icons/400-24px/history.svg
new file mode 100644
index 00000000000000..2d8124b474acac
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/history.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M480-120q-138 0-240.5-91.5T122-440h82q14 104 92.5 172T480-200q117 0 198.5-81.5T760-480q0-117-81.5-198.5T480-760q-69 0-129 32t-101 88h110v80H120v-240h80v94q51-64 124.5-99T480-840q75 0 140.5 28.5t114 77q48.5 48.5 77 114T840-480q0 75-28.5 140.5t-77 114q-48.5 48.5-114 77T480-120Zm112-192L440-464v-216h80v184l128 128-56 56Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/person_remove-fill.svg b/app/javascript/material-icons/400-24px/person_remove-fill.svg
new file mode 100644
index 00000000000000..239c7a49dcb7c0
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/person_remove-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M640-520v-80h240v80H640Zm-280 40q-66 0-113-47t-47-113q0-66 47-113t113-47q66 0 113 47t47 113q0 66-47 113t-113 47ZM40-160v-112q0-34 17.5-62.5T104-378q62-31 126-46.5T360-440q66 0 130 15.5T616-378q29 15 46.5 43.5T680-272v112H40Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/person_remove.svg b/app/javascript/material-icons/400-24px/person_remove.svg
new file mode 100644
index 00000000000000..725da3649b62a3
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/person_remove.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M640-520v-80h240v80H640Zm-280 40q-66 0-113-47t-47-113q0-66 47-113t113-47q66 0 113 47t47 113q0 66-47 113t-113 47ZM40-160v-112q0-34 17.5-62.5T104-378q62-31 126-46.5T360-440q66 0 130 15.5T616-378q29 15 46.5 43.5T680-272v112H40Zm80-80h480v-32q0-11-5.5-20T580-306q-54-27-109-40.5T360-360q-56 0-111 13.5T140-306q-9 5-14.5 14t-5.5 20v32Zm240-320q33 0 56.5-23.5T440-640q0-33-23.5-56.5T360-720q-33 0-56.5 23.5T280-640q0 33 23.5 56.5T360-560Zm0-80Zm0 400Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 8e0859038d3949..805ffb963a0509 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -106,17 +106,17 @@
   }
 
   &.button-secondary {
-    color: $ui-button-secondary-color;
+    color: $highlight-text-color;
     background: transparent;
     padding: 6px 17px;
-    border: 1px solid $ui-button-secondary-border-color;
+    border: 1px solid $highlight-text-color;
 
     &:active,
     &:focus,
     &:hover {
-      border-color: $ui-button-secondary-focus-background-color;
-      color: $ui-button-secondary-focus-color;
-      background-color: $ui-button-secondary-focus-background-color;
+      border-color: lighten($highlight-text-color, 4%);
+      color: lighten($highlight-text-color, 4%);
+      background-color: transparent;
       text-decoration: none;
     }
 
@@ -5480,6 +5480,10 @@ a.status-card {
   pointer-events: auto;
   user-select: text;
   display: flex;
+
+  @media screen and (max-width: $no-gap-breakpoint) {
+    margin-top: auto;
+  }
 }
 
 .video-modal .video-player {
@@ -5811,6 +5815,145 @@ a.status-card {
   margin-inline-start: 10px;
 }
 
+.safety-action-modal {
+  width: 600px;
+  flex-direction: column;
+
+  &__top,
+  &__bottom {
+    display: flex;
+    gap: 8px;
+    padding: 24px;
+    flex-direction: column;
+    background: var(--modal-background-color);
+    backdrop-filter: var(--background-filter);
+    border: 1px solid var(--modal-border-color);
+  }
+
+  &__top {
+    border-radius: 16px 16px 0 0;
+    border-bottom: 0;
+    gap: 16px;
+  }
+
+  &__bottom {
+    border-radius: 0 0 16px 16px;
+    border-top: 0;
+
+    @media screen and (max-width: $no-gap-breakpoint) {
+      border-radius: 0;
+      border-bottom: 0;
+      padding-bottom: 32px;
+    }
+  }
+
+  &__header {
+    display: flex;
+    gap: 16px;
+    align-items: center;
+    font-size: 14px;
+    line-height: 20px;
+    color: $darker-text-color;
+
+    &__icon {
+      border-radius: 64px;
+      background: $ui-highlight-color;
+      color: $white;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      width: 40px;
+      height: 40px;
+      flex-shrink: 0;
+
+      .icon {
+        width: 24px;
+        height: 24px;
+      }
+    }
+
+    h1 {
+      font-size: 22px;
+      line-height: 28px;
+      color: $primary-text-color;
+    }
+  }
+
+  &__bullet-points {
+    display: flex;
+    flex-direction: column;
+    gap: 8px;
+    font-size: 16px;
+    line-height: 24px;
+
+    & > div {
+      display: flex;
+      gap: 16px;
+      align-items: center;
+    }
+
+    &__icon {
+      width: 40px;
+      height: 40px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      flex-shrink: 0;
+
+      .icon {
+        width: 24px;
+        height: 24px;
+      }
+    }
+  }
+
+  &__field-group {
+    display: flex;
+    flex-direction: column;
+
+    label {
+      display: flex;
+      gap: 16px;
+      align-items: center;
+      font-size: 16px;
+      line-height: 24px;
+      height: 32px;
+      padding: 0 12px;
+    }
+  }
+
+  &__bottom {
+    padding-top: 0;
+
+    &__collapsible {
+      display: none;
+      flex-direction: column;
+      gap: 16px;
+    }
+
+    &.active {
+      background: var(--modal-background-variant-color);
+      padding-top: 24px;
+
+      .safety-action-modal__bottom__collapsible {
+        display: flex;
+      }
+    }
+  }
+
+  &__actions {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    justify-content: flex-end;
+
+    .link-button {
+      padding: 10px 12px;
+      font-weight: 600;
+    }
+  }
+}
+
 .boost-modal,
 .confirmation-modal,
 .report-modal,
@@ -7113,7 +7256,8 @@ a.status-card {
   display: flex;
 }
 
-.radio-button {
+.radio-button,
+.check-box {
   font-size: 14px;
   position: relative;
   display: inline-flex;
@@ -7132,17 +7276,19 @@ a.status-card {
   }
 
   &__input {
-    display: block;
+    display: flex;
+    align-items: center;
+    justify-content: center;
     position: relative;
     border: 2px solid $secondary-text-color;
     box-sizing: border-box;
-    width: 18px;
-    height: 18px;
+    width: 20px;
+    height: 20px;
     flex: 0 0 auto;
     border-radius: 50%;
 
     &.checked {
-      border-color: $secondary-text-color;
+      border-color: $ui-highlight-color;
 
       &::before {
         position: absolute;
@@ -7151,9 +7297,31 @@ a.status-card {
         content: '';
         display: block;
         border-radius: 50%;
-        width: 10px;
-        height: 10px;
-        background: $secondary-text-color;
+        width: 12px;
+        height: 12px;
+        background: $ui-highlight-color;
+      }
+    }
+
+    .icon {
+      width: 18px;
+      height: 18px;
+    }
+  }
+}
+
+.check-box {
+  &__input {
+    width: 18px;
+    height: 18px;
+    border-radius: 2px;
+
+    &.checked {
+      background: $ui-highlight-color;
+      color: $white;
+
+      &::before {
+        display: none;
       }
     }
   }
@@ -8632,22 +8800,36 @@ noscript {
   }
 }
 
+.safety-action-modal,
 .interaction-modal {
   max-width: 90vw;
   width: 600px;
-  background: var(--modal-background-color);
-  border: 1px solid var(--modal-border-color);
-  border-radius: 8px;
+}
+
+.interaction-modal {
   overflow: visible;
   position: relative;
   display: block;
-  padding: 40px;
+  border-radius: 16px;
+  background: var(--modal-background-color);
+  backdrop-filter: var(--background-filter);
+  border: 1px solid var(--modal-border-color);
+  padding: 24px;
+
+  @media screen and (max-width: $no-gap-breakpoint) {
+    border-radius: 16px 16px 0 0;
+    border-bottom: 0;
+    padding-bottom: 32px;
+  }
 
   h3 {
     font-size: 22px;
     line-height: 33px;
     font-weight: 700;
-    text-align: center;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    gap: 8px;
   }
 
   p {
@@ -8668,7 +8850,9 @@ noscript {
 
   &__icon {
     color: $highlight-text-color;
-    margin: 0 5px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
   }
 
   &__lead {
@@ -8701,6 +8885,7 @@ noscript {
         border: 0;
         padding: 15px - 4px 15px - 6px;
         flex: 1 1 auto;
+        min-width: 0;
 
         &::placeholder {
           color: lighten($darker-text-color, 4%);
diff --git a/app/javascript/styles/mastodon/variables.scss b/app/javascript/styles/mastodon/variables.scss
index 2b2a2957914f5c..58b9dd9b61b101 100644
--- a/app/javascript/styles/mastodon/variables.scss
+++ b/app/javascript/styles/mastodon/variables.scss
@@ -46,10 +46,10 @@ $ui-button-focus-background-color: $blurple-600 !default;
 $ui-button-focus-outline-color: $blurple-400 !default;
 $ui-button-focus-outline: solid 2px $ui-button-focus-outline-color !default;
 
-$ui-button-secondary-color: $grey-100 !default;
-$ui-button-secondary-border-color: $grey-100 !default;
-$ui-button-secondary-focus-background-color: $grey-600 !default;
-$ui-button-secondary-focus-color: $white !default;
+$ui-button-secondary-color: $blurple-500 !default;
+$ui-button-secondary-border-color: $blurple-500 !default;
+$ui-button-secondary-focus-border-color: $blurple-300 !default;
+$ui-button-secondary-focus-color: $blurple-300 !default;
 
 $ui-button-tertiary-color: $blurple-300 !default;
 $ui-button-tertiary-border-color: $blurple-300 !default;
@@ -98,7 +98,8 @@ $font-monospace: 'mastodon-font-monospace' !default;
   --dropdown-background-color: #{rgba(darken($ui-base-color, 8%), 0.9)};
   --dropdown-shadow: 0 20px 25px -5px #{rgba($base-shadow-color, 0.25)},
     0 8px 10px -6px #{rgba($base-shadow-color, 0.25)};
-  --modal-background-color: #{darken($ui-base-color, 4%)};
+  --modal-background-color: #{rgba(darken($ui-base-color, 8%), 0.7)};
+  --modal-background-variant-color: #{rgba($ui-base-color, 0.7)};
   --modal-border-color: #{lighten($ui-base-color, 4%)};
   --background-border-color: #{lighten($ui-base-color, 4%)};
   --background-filter: blur(10px) saturate(180%) contrast(75%) brightness(70%);

From a32f992182a4c4441fea917bce0794ae562cdbe0 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 15 Mar 2024 14:08:38 +0100
Subject: [PATCH 0475/2191] [Glitch] Add domain information to profiles in web
 UI

Port 407287573c9c602c5490224c43639b39edf7d48a to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../account/components/domain_pill.jsx        |  86 ++++++++++++
 .../features/account/components/header.jsx    |  15 ++-
 .../flavours/glitch/styles/components.scss    | 127 +++++++++++++++++-
 3 files changed, 216 insertions(+), 12 deletions(-)
 create mode 100644 app/javascript/flavours/glitch/features/account/components/domain_pill.jsx

diff --git a/app/javascript/flavours/glitch/features/account/components/domain_pill.jsx b/app/javascript/flavours/glitch/features/account/components/domain_pill.jsx
new file mode 100644
index 00000000000000..9cd028fa686bc7
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/account/components/domain_pill.jsx
@@ -0,0 +1,86 @@
+import PropTypes from 'prop-types';
+import { useState, useRef, useCallback } from 'react';
+
+import { FormattedMessage } from 'react-intl';
+
+import classNames from 'classnames';
+
+import Overlay from 'react-overlays/Overlay';
+
+
+
+import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
+import BadgeIcon from '@/material-icons/400-24px/badge.svg?react';
+import GlobeIcon from '@/material-icons/400-24px/globe.svg?react';
+import { Icon } from 'flavours/glitch/components/icon';
+
+export const DomainPill = ({ domain, username, isSelf }) => {
+  const [open, setOpen] = useState(false);
+  const [expanded, setExpanded] = useState(false);
+  const triggerRef = useRef(null);
+
+  const handleClick = useCallback(() => {
+    setOpen(!open);
+  }, [open, setOpen]);
+
+  const handleExpandClick = useCallback(() => {
+    setExpanded(!expanded);
+  }, [expanded, setExpanded]);
+
+  return (
+    <>
+      <button className={classNames('account__domain-pill', { active: open })} ref={triggerRef} onClick={handleClick}>{domain}</button>
+
+      <Overlay show={open} rootClose onHide={handleClick} offset={[5, 5]} target={triggerRef}>
+        {({ props }) => (
+          <div {...props} className='account__domain-pill__popout dropdown-animation'>
+            <div className='account__domain-pill__popout__header'>
+              <div className='account__domain-pill__popout__header__icon'><Icon icon={BadgeIcon} /></div>
+              <h3><FormattedMessage id='domain_pill.whats_in_a_handle' defaultMessage="What's in a handle?" /></h3>
+            </div>
+
+            <div className='account__domain-pill__popout__handle'>
+              <div className='account__domain-pill__popout__handle__label'>{isSelf ? <FormattedMessage id='domain_pill.your_handle' defaultMessage='Your handle:' /> : <FormattedMessage id='domain_pill.their_handle' defaultMessage='Their handle:' />}</div>
+              <div className='account__domain-pill__popout__handle__handle'>@{username}@{domain}</div>
+            </div>
+
+            <div className='account__domain-pill__popout__parts'>
+              <div>
+                <div className='account__domain-pill__popout__parts__icon'><Icon icon={AlternateEmailIcon} /></div>
+
+                <div>
+                  <h6><FormattedMessage id='domain_pill.username' defaultMessage='Username' /></h6>
+                  <p>{isSelf ? <FormattedMessage id='domain_pill.your_username' defaultMessage='Your unique identifier on this server. It’s possible to find users with the same username on different servers.' /> : <FormattedMessage id='domain_pill.their_username' defaultMessage='Their unique identifier on their server. It’s possible to find users with the same username on different servers.' />}</p>
+                </div>
+              </div>
+
+              <div>
+                <div className='account__domain-pill__popout__parts__icon'><Icon icon={GlobeIcon} /></div>
+
+                <div>
+                  <h6><FormattedMessage id='domain_pill.server' defaultMessage='Server' /></h6>
+                  <p>{isSelf ? <FormattedMessage id='domain_pill.your_server' defaultMessage='Your digital home, where all of your posts live. Don’t like this one? Transfer servers at any time and bring your followers, too.' /> : <FormattedMessage id='domain_pill.their_server' defaultMessage='Their digital home, where all of their posts live.' />}</p>
+                </div>
+              </div>
+            </div>
+
+            <p>{isSelf ? <FormattedMessage id='domain_pill.who_you_are' defaultMessage='Because your handle says who you are and where you are, people can interact with you across the social web of <button>ActivityPub-powered platforms</button>.' values={{ button: x => <button onClick={handleExpandClick} className='link-button'>{x}</button> }} /> : <FormattedMessage id='domain_pill.who_they_are' defaultMessage='Since handles say who someone is and where they are, you can interact with people across the social web of <button>ActivityPub-powered platforms</button>.' values={{ button: x => <button onClick={handleExpandClick} className='link-button'>{x}</button> }} />}</p>
+
+            {expanded && (
+              <>
+                <p><FormattedMessage id='domain_pill.activitypub_like_language' defaultMessage='ActivityPub is like the language Mastodon speaks with other social networks.' /></p>
+                <p><FormattedMessage id='domain_pill.activitypub_lets_connect' defaultMessage='It lets you connect and interact with people not just on Mastodon, but across different social apps too.' /></p>
+              </>
+            )}
+          </div>
+        )}
+      </Overlay>
+    </>
+  );
+};
+
+DomainPill.propTypes = {
+  username: PropTypes.string.isRequired,
+  domain: PropTypes.string.isRequired,
+  isSelf: PropTypes.bool,
+};
diff --git a/app/javascript/flavours/glitch/features/account/components/header.jsx b/app/javascript/flavours/glitch/features/account/components/header.jsx
index c693e85f41fce8..b97de5aeabe720 100644
--- a/app/javascript/flavours/glitch/features/account/components/header.jsx
+++ b/app/javascript/flavours/glitch/features/account/components/header.jsx
@@ -23,7 +23,7 @@ import { Icon }  from 'flavours/glitch/components/icon';
 import { IconButton } from 'flavours/glitch/components/icon_button';
 import { LoadingIndicator } from 'flavours/glitch/components/loading_indicator';
 import DropdownMenuContainer from 'flavours/glitch/containers/dropdown_menu_container';
-import { autoPlayGif, me, domain } from 'flavours/glitch/initial_state';
+import { autoPlayGif, me, domain as localDomain } from 'flavours/glitch/initial_state';
 import { PERMISSION_MANAGE_USERS, PERMISSION_MANAGE_FEDERATION } from 'flavours/glitch/permissions';
 import { preferencesLink, profileLink, accountAdminLink } from 'flavours/glitch/utils/backend_links';
 import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router';
@@ -31,6 +31,8 @@ import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router';
 import AccountNoteContainer from '../containers/account_note_container';
 import FollowRequestNoteContainer from '../containers/follow_request_note_container';
 
+import { DomainPill } from './domain_pill';
+
 const messages = defineMessages({
   unfollow: { id: 'account.unfollow', defaultMessage: 'Unfollow' },
   follow: { id: 'account.follow', defaultMessage: 'Follow' },
@@ -75,7 +77,7 @@ const messages = defineMessages({
 
 const titleFromAccount = account => {
   const displayName = account.get('display_name');
-  const acct = account.get('acct') === account.get('username') ? `${account.get('username')}@${domain}` : account.get('acct');
+  const acct = account.get('acct') === account.get('username') ? `${account.get('username')}@${localDomain}` : account.get('acct');
   const prefix = displayName.trim().length === 0 ? account.get('username') : displayName;
 
   return `${prefix} (@${acct})`;
@@ -167,7 +169,7 @@ class Header extends ImmutablePureComponent {
   };
 
   render () {
-    const { account, hidden, intl, domain } = this.props;
+    const { account, hidden, intl } = this.props;
     const { signedIn, permissions } = this.context.identity;
 
     if (!account) {
@@ -314,7 +316,8 @@ class Header extends ImmutablePureComponent {
     const displayNameHtml = { __html: account.get('display_name_html') };
     const fields          = account.get('fields');
     const isLocal         = account.get('acct').indexOf('@') === -1;
-    const acct            = isLocal && domain ? `${account.get('acct')}@${domain}` : account.get('acct');
+    const username        = account.get('acct').split('@')[0];
+    const domain          = isLocal ? localDomain : account.get('acct').split('@')[1];
     const isIndexable     = !account.get('noindex');
 
     const badges = [];
@@ -359,7 +362,9 @@ class Header extends ImmutablePureComponent {
             <h1>
               <span dangerouslySetInnerHTML={displayNameHtml} />
               <small>
-                <span>@{acct}</span> {lockedIcon}
+                <span>@{username}<span className='invisible'>@{domain}</span></span>
+                <DomainPill username={username} domain={domain} isSelf={me === account.get('id')} />
+                {lockedIcon}
               </small>
             </h1>
           </div>
diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index 6c4b6649b27462..147a88cf144475 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -2004,6 +2004,118 @@ body > [data-popper-placement] {
     }
   }
 
+  &__domain-pill {
+    display: inline-flex;
+    background: rgba($highlight-text-color, 0.2);
+    border-radius: 4px;
+    border: 0;
+    color: $highlight-text-color;
+    font-weight: 500;
+    font-size: 12px;
+    line-height: 16px;
+    padding: 4px 8px;
+
+    &.active {
+      color: $white;
+      background: $ui-highlight-color;
+    }
+
+    &__popout {
+      background: var(--dropdown-background-color);
+      backdrop-filter: var(--background-filter);
+      border: 1px solid var(--dropdown-border-color);
+      box-shadow: var(--dropdown-shadow);
+      max-width: 320px;
+      padding: 16px;
+      border-radius: 8px;
+      display: flex;
+      flex-direction: column;
+      gap: 24px;
+      font-size: 14px;
+      line-height: 20px;
+      color: $darker-text-color;
+
+      .link-button {
+        display: inline;
+        font-size: inherit;
+        line-height: inherit;
+      }
+
+      &__header {
+        display: flex;
+        align-items: center;
+        gap: 12px;
+
+        &__icon {
+          width: 40px;
+          height: 40px;
+          background: $ui-highlight-color;
+          color: $white;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          border-radius: 50%;
+          flex-shrink: 0;
+        }
+
+        h3 {
+          font-size: 17px;
+          line-height: 22px;
+          color: $primary-text-color;
+        }
+      }
+
+      &__handle {
+        border: 2px dashed $highlight-text-color;
+        background: rgba($highlight-text-color, 0.1);
+        padding: 12px 8px;
+        color: $highlight-text-color;
+        border-radius: 4px;
+
+        &__label {
+          font-size: 11px;
+          line-height: 16px;
+          font-weight: 500;
+        }
+
+        &__handle {
+          user-select: all;
+        }
+      }
+
+      &__parts {
+        display: flex;
+        flex-direction: column;
+        gap: 8px;
+        font-size: 12px;
+        line-height: 16px;
+
+        & > div {
+          display: flex;
+          align-items: flex-start;
+          gap: 12px;
+        }
+
+        &__icon {
+          width: 40px;
+          height: 40px;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          flex-shrink: 0;
+          color: $highlight-text-color;
+        }
+
+        h6 {
+          font-size: 14px;
+          line-height: 20px;
+          font-weight: 500;
+          color: $primary-text-color;
+        }
+      }
+    }
+  }
+
   &__note {
     font-size: 14px;
     font-weight: 400;
@@ -8126,14 +8238,17 @@ noscript {
         font-size: 17px;
         line-height: 22px;
         color: $primary-text-color;
-        font-weight: 700;
+        font-weight: 600;
         overflow: hidden;
         white-space: nowrap;
         text-overflow: ellipsis;
 
         small {
-          display: block;
-          font-size: 15px;
+          display: flex;
+          align-items: center;
+          gap: 4px;
+          font-size: 14px;
+          line-height: 20px;
           color: $darker-text-color;
           font-weight: 400;
           overflow: hidden;
@@ -8144,10 +8259,8 @@ noscript {
           }
 
           .icon-lock {
-            height: 16px;
-            width: 16px;
-            position: relative;
-            top: 3px;
+            height: 18px;
+            width: 18px;
           }
         }
       }

From d702a03a0c35fc631a0fa456532946e6751cbbfd Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 15 Mar 2024 20:09:21 +0100
Subject: [PATCH 0476/2191] =?UTF-8?q?Add=20=E2=80=9CLearn=20more=E2=80=9D?=
 =?UTF-8?q?=20on=20block=20modal=20to=20inform=20of=20federation=20caveats?=
 =?UTF-8?q?=20(#29614)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../features/ui/components/block_modal.jsx    | 33 +++++++++++++++++--
 app/javascript/mastodon/locales/en.json       |  3 ++
 .../styles/mastodon/components.scss           |  9 +++++
 3 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/app/javascript/mastodon/features/ui/components/block_modal.jsx b/app/javascript/mastodon/features/ui/components/block_modal.jsx
index d18adaa5eb7f09..fc9233a9cc6367 100644
--- a/app/javascript/mastodon/features/ui/components/block_modal.jsx
+++ b/app/javascript/mastodon/features/ui/components/block_modal.jsx
@@ -1,8 +1,10 @@
 import PropTypes from 'prop-types';
-import { useCallback } from 'react';
+import { useCallback, useState } from 'react';
 
 import { FormattedMessage } from 'react-intl';
 
+import classNames from 'classnames';
+
 import { useDispatch } from 'react-redux';
 
 import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
@@ -17,6 +19,9 @@ import { Icon } from 'mastodon/components/icon';
 
 export const BlockModal = ({ accountId, acct }) => {
   const dispatch = useDispatch();
+  const [expanded, setExpanded] = useState(false);
+
+  const domain = acct.split('@')[1];
 
   const handleClick = useCallback(() => {
     dispatch(closeModal({ modalType: undefined, ignoreFocus: false }));
@@ -27,6 +32,10 @@ export const BlockModal = ({ accountId, acct }) => {
     dispatch(closeModal({ modalType: undefined, ignoreFocus: false }));
   }, [dispatch]);
 
+  const handleToggleLearnMore = useCallback(() => {
+    setExpanded(!expanded);
+  }, [expanded, setExpanded]);
+
   return (
     <div className='modal-root__modal safety-action-modal'>
       <div className='safety-action-modal__top'>
@@ -64,8 +73,28 @@ export const BlockModal = ({ accountId, acct }) => {
         </div>
       </div>
 
-      <div className='safety-action-modal__bottom'>
+      <div className={classNames('safety-action-modal__bottom', { active: expanded })}>
+        {domain && (
+          <div className='safety-action-modal__bottom__collapsible'>
+            <div className='safety-action-modal__caveats'>
+              <FormattedMessage
+                id='block_modal.remote_users_caveat'
+                defaultMessage='We will ask the server {domain} to respect your decision. However, compliance is not guaranteed since some servers may handle blocks differently. Public posts may still be visible to non-logged-in users.'
+                values={{ domain: <strong>{domain}</strong> }}
+              />
+            </div>
+          </div>
+        )}
+
         <div className='safety-action-modal__actions'>
+          {domain && (
+            <button onClick={handleToggleLearnMore} className='link-button'>
+              {expanded ? <FormattedMessage id='block_modal.show_less' defaultMessage='Show less' /> : <FormattedMessage id='block_modal.show_more' defaultMessage='Show more' />}
+            </button>
+          )}
+
+          <div className='spacer' />
+
           <button onClick={handleCancel} className='link-button'>
             <FormattedMessage id='confirmation_modal.cancel' defaultMessage='Cancel' />
           </button>
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index f893c98a3c6461..376dfb7e4b6b0f 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -89,6 +89,9 @@
   "announcement.announcement": "Announcement",
   "attachments_list.unprocessed": "(unprocessed)",
   "audio.hide": "Hide audio",
+  "block_modal.remote_users_caveat": "We will ask the server {domain} to respect your decision. However, compliance is not guaranteed since some servers may handle blocks differently. Public posts may still be visible to non-logged-in users.",
+  "block_modal.show_less": "Show less",
+  "block_modal.show_more": "Show more",
   "block_modal.they_cant_mention": "They can't mention or follow you.",
   "block_modal.they_cant_see_posts": "They can't see your posts and you won't see theirs.",
   "block_modal.they_will_know": "They can see that they're blocked.",
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 805ffb963a0509..8b7e5f5e84ac07 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -5922,6 +5922,15 @@ a.status-card {
     }
   }
 
+  &__caveats {
+    font-size: 14px;
+    padding: 0 12px;
+
+    strong {
+      font-weight: 500;
+    }
+  }
+
   &__bottom {
     padding-top: 0;
 

From 6ee7a644653c2b5fd312b242e453623537d0cc0d Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 15 Mar 2024 22:21:57 +0100
Subject: [PATCH 0477/2191] =?UTF-8?q?Reduce=20differences=20with=20upstrea?=
 =?UTF-8?q?m=20in=20=E2=80=9Cpublic=E2=80=9D=20pack=20(#2680)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Reduce differences with upstream

* Further reduce pack differences with upstream
---
 .../flavours/glitch/packs/public.jsx          | 115 ++++++++----------
 .../flavours/glitch/packs/settings.js         |  42 -------
 app/javascript/flavours/glitch/theme.yml      |   2 +-
 app/javascript/packs/public.jsx               |   4 +-
 4 files changed, 53 insertions(+), 110 deletions(-)
 delete mode 100644 app/javascript/flavours/glitch/packs/settings.js

diff --git a/app/javascript/flavours/glitch/packs/public.jsx b/app/javascript/flavours/glitch/packs/public.jsx
index dab33b3904ea4d..53854e70fb11d4 100644
--- a/app/javascript/flavours/glitch/packs/public.jsx
+++ b/app/javascript/flavours/glitch/packs/public.jsx
@@ -1,12 +1,12 @@
-import 'packs/public-path';
 import { createRoot }  from 'react-dom/client';
 
-import { IntlMessageFormat } from 'intl-messageformat';
+import 'packs/public-path';
+
+import { IntlMessageFormat }  from 'intl-messageformat';
 import { defineMessages } from 'react-intl';
 
 import Rails from '@rails/ujs';
 import axios from 'axios';
-import { createBrowserHistory }  from 'history';
 import { throttle } from 'lodash';
 
 import { timeAgoString }  from 'flavours/glitch/components/relative_timestamp';
@@ -14,6 +14,9 @@ import emojify  from 'flavours/glitch/features/emoji/emoji';
 import loadKeyboardExtensions from 'flavours/glitch/load_keyboard_extensions';
 import { loadLocale, getLocale } from 'flavours/glitch/locales';
 import { loadPolyfills } from 'flavours/glitch/polyfills';
+import ready from 'flavours/glitch/ready';
+
+import 'cocoon-js-vanilla';
 
 const messages = defineMessages({
   usernameTaken: { id: 'username.taken', defaultMessage: 'That username is taken. Try another' },
@@ -21,26 +24,9 @@ const messages = defineMessages({
   passwordDoesNotMatch: { id: 'password_confirmation.mismatching', defaultMessage: 'Password confirmation does not match' },
 });
 
-function main() {
+function loaded() {
   const { messages: localeData } = getLocale();
 
-  const scrollToDetailedStatus = () => {
-    const history = createBrowserHistory();
-    const detailedStatuses = document.querySelectorAll('.public-layout .detailed-status');
-    const location = history.location;
-
-    if (detailedStatuses.length === 1 && (!location.state || !location.state.scrolledToDetailedStatus)) {
-      detailedStatuses[0].scrollIntoView();
-      history.replace(location.pathname, { ...location.state, scrolledToDetailedStatus: true });
-    }
-  };
-
-  const getEmojiAnimationHandler = (swapTo) => {
-    return ({ target }) => {
-      target.src = target.getAttribute(swapTo);
-    };
-  };
-
   const locale = document.documentElement.lang;
 
   const dateTimeFormat = new Intl.DateTimeFormat(locale, {
@@ -118,6 +104,7 @@ function main() {
   });
 
   const reactComponents = document.querySelectorAll('[data-component]');
+
   if (reactComponents.length > 0) {
     import(/* webpackChunkName: "containers/media_container" */ 'flavours/glitch/containers/media_container')
       .then(({ default: MediaContainer }) => {
@@ -132,27 +119,21 @@ function main() {
         const root = createRoot(content);
         root.render(<MediaContainer locale={locale} components={reactComponents} />);
         document.body.appendChild(content);
-        scrollToDetailedStatus();
       })
       .catch(error => {
         console.error(error);
-        scrollToDetailedStatus();
       });
-  } else {
-    scrollToDetailedStatus();
   }
 
-  Rails.delegate(document, '#user_account_attributes_username', 'input', throttle(() => {
-    const username = document.getElementById('user_account_attributes_username');
-
-    if (username.value && username.value.length > 0) {
-      axios.get('/api/v1/accounts/lookup', { params: { acct: username.value } }).then(() => {
-        username.setCustomValidity(formatMessage(messages.usernameTaken));
+  Rails.delegate(document, '#user_account_attributes_username', 'input', throttle(({ target }) => {
+    if (target.value && target.value.length > 0) {
+      axios.get('/api/v1/accounts/lookup', { params: { acct: target.value } }).then(() => {
+        target.setCustomValidity(formatMessage(messages.usernameTaken));
       }).catch(() => {
-        username.setCustomValidity('');
+        target.setCustomValidity('');
       });
     } else {
-      username.setCustomValidity('');
+      target.setCustomValidity('');
     }
   }, 500, { leading: false, trailing: true }));
 
@@ -170,9 +151,6 @@ function main() {
     }
   });
 
-  Rails.delegate(document, '.custom-emoji', 'mouseover', getEmojiAnimationHandler('data-original'));
-  Rails.delegate(document, '.custom-emoji', 'mouseout', getEmojiAnimationHandler('data-static'));
-
   Rails.delegate(document, '.status__content__spoiler-link', 'click', function() {
     const statusEl = this.parentNode.parentNode;
 
@@ -192,44 +170,51 @@ function main() {
     const message = (statusEl.dataset.spoiler === 'expanded') ? (localeData['status.show_less'] || 'Show less') : (localeData['status.show_more'] || 'Show more');
     spoilerLink.textContent = (new IntlMessageFormat(message, locale)).format();
   });
+}
 
-  const toggleSidebar = () => {
-    const sidebar = document.querySelector('.sidebar ul');
-    const toggleButton = document.querySelector('.sidebar__toggle__icon');
+const toggleSidebar = () => {
+  const sidebar = document.querySelector('.sidebar ul');
+  const toggleButton = document.querySelector('.sidebar__toggle__icon');
 
-    if (sidebar.classList.contains('visible')) {
-      document.body.style.overflow = null;
-      toggleButton.setAttribute('aria-expanded', 'false');
-    } else {
-      document.body.style.overflow = 'hidden';
-      toggleButton.setAttribute('aria-expanded', 'true');
-    }
+  if (sidebar.classList.contains('visible')) {
+    document.body.style.overflow = null;
+    toggleButton.setAttribute('aria-expanded', 'false');
+  } else {
+    document.body.style.overflow = 'hidden';
+    toggleButton.setAttribute('aria-expanded', 'true');
+  }
 
-    toggleButton.classList.toggle('active');
-    sidebar.classList.toggle('visible');
-  };
+  toggleButton.classList.toggle('active');
+  sidebar.classList.toggle('visible');
+};
+
+Rails.delegate(document, '.sidebar__toggle__icon', 'click', () => {
+  toggleSidebar();
+});
 
-  Rails.delegate(document, '.sidebar__toggle__icon', 'click', () => {
+Rails.delegate(document, '.sidebar__toggle__icon', 'keydown', e => {
+  if (e.key === ' ' || e.key === 'Enter') {
+    e.preventDefault();
     toggleSidebar();
-  });
+  }
+});
+
+Rails.delegate(document, '.custom-emoji', 'mouseover', ({ target }) => target.src = target.getAttribute('data-original'));
+Rails.delegate(document, '.custom-emoji', 'mouseout', ({ target }) => target.src = target.getAttribute('data-static'));
 
-  Rails.delegate(document, '.sidebar__toggle__icon', 'keydown', e => {
-    if (e.key === ' ' || e.key === 'Enter') {
-      e.preventDefault();
-      toggleSidebar();
+// Empty the honeypot fields in JS in case something like an extension
+// automatically filled them.
+Rails.delegate(document, '#registration_new_user,#new_user', 'submit', () => {
+  ['user_website', 'user_confirm_password', 'registration_user_website', 'registration_user_confirm_password'].forEach(id => {
+    const field = document.getElementById(id);
+    if (field) {
+      field.value = '';
     }
   });
+});
 
-  // Empty the honeypot fields in JS in case something like an extension
-  // automatically filled them.
-  Rails.delegate(document, '#registration_new_user,#new_user', 'submit', () => {
-    ['user_website', 'user_confirm_password', 'registration_user_website', 'registration_user_confirm_password'].forEach(id => {
-      const field = document.getElementById(id);
-      if (field) {
-        field.value = '';
-      }
-    });
-  });
+function main() {
+  ready(loaded);
 }
 
 loadPolyfills()
diff --git a/app/javascript/flavours/glitch/packs/settings.js b/app/javascript/flavours/glitch/packs/settings.js
deleted file mode 100644
index d9f3b686022ea0..00000000000000
--- a/app/javascript/flavours/glitch/packs/settings.js
+++ /dev/null
@@ -1,42 +0,0 @@
-import 'packs/public-path';
-import Rails from '@rails/ujs';
-
-import loadKeyboardExtensions from 'flavours/glitch/load_keyboard_extensions';
-import { loadPolyfills } from 'flavours/glitch/polyfills';
-import 'cocoon-js-vanilla';
-
-function main() {
-  const toggleSidebar = () => {
-    const sidebar = document.querySelector('.sidebar ul');
-    const toggleButton = document.querySelector('.sidebar__toggle__icon');
-
-    if (sidebar.classList.contains('visible')) {
-      document.body.style.overflow = null;
-      toggleButton.setAttribute('aria-expanded', 'false');
-    } else {
-      document.body.style.overflow = 'hidden';
-      toggleButton.setAttribute('aria-expanded', 'true');
-    }
-
-    toggleButton.classList.toggle('active');
-    sidebar.classList.toggle('visible');
-  };
-
-  Rails.delegate(document, '.sidebar__toggle__icon', 'click', () => {
-    toggleSidebar();
-  });
-
-  Rails.delegate(document, '.sidebar__toggle__icon', 'keydown', e => {
-    if (e.key === ' ' || e.key === 'Enter') {
-      e.preventDefault();
-      toggleSidebar();
-    }
-  });
-}
-
-loadPolyfills()
-  .then(main)
-  .then(loadKeyboardExtensions)
-  .catch(error => {
-    console.error(error);
-  });
diff --git a/app/javascript/flavours/glitch/theme.yml b/app/javascript/flavours/glitch/theme.yml
index e6b748da7760c0..33399c3746305a 100644
--- a/app/javascript/flavours/glitch/theme.yml
+++ b/app/javascript/flavours/glitch/theme.yml
@@ -18,7 +18,7 @@ pack:
   mailer:
   modal:
   public: packs/public.jsx
-  settings: packs/settings.js
+  settings: packs/public.jsx
   sign_up: packs/sign_up.js
   share: packs/share.jsx
 
diff --git a/app/javascript/packs/public.jsx b/app/javascript/packs/public.jsx
index be66683986e26f..661a41ee1d3753 100644
--- a/app/javascript/packs/public.jsx
+++ b/app/javascript/packs/public.jsx
@@ -1,7 +1,7 @@
-import './public-path';
-
 import { createRoot }  from 'react-dom/client';
 
+import './public-path';
+
 import { IntlMessageFormat }  from 'intl-messageformat';
 import { defineMessages } from 'react-intl';
 

From 7fe848b161d8d3a3878680d3c1c14532f5ffeb0c Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Fri, 15 Mar 2024 14:16:45 +0100
Subject: [PATCH 0478/2191] [Glitch] Convert `packs/public.jsx` to Typescript

Port c76ae7a5c0d247264afa896f081db9d1fd278711 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../glitch/components/relative_timestamp.tsx  |   2 +-
 .../flavours/glitch/packs/public.jsx          | 226 -----------
 .../flavours/glitch/packs/public.tsx          | 356 ++++++++++++++++++
 app/javascript/flavours/glitch/theme.yml      |  10 +-
 4 files changed, 362 insertions(+), 232 deletions(-)
 delete mode 100644 app/javascript/flavours/glitch/packs/public.jsx
 create mode 100644 app/javascript/flavours/glitch/packs/public.tsx

diff --git a/app/javascript/flavours/glitch/components/relative_timestamp.tsx b/app/javascript/flavours/glitch/components/relative_timestamp.tsx
index 12530c2b17bceb..b9e1e4f8fd1ff7 100644
--- a/app/javascript/flavours/glitch/components/relative_timestamp.tsx
+++ b/app/javascript/flavours/glitch/components/relative_timestamp.tsx
@@ -102,7 +102,7 @@ const getUnitDelay = (units: string) => {
 };
 
 export const timeAgoString = (
-  intl: IntlShape,
+  intl: Pick<IntlShape, 'formatDate' | 'formatMessage'>,
   date: Date,
   now: number,
   year: number,
diff --git a/app/javascript/flavours/glitch/packs/public.jsx b/app/javascript/flavours/glitch/packs/public.jsx
deleted file mode 100644
index 53854e70fb11d4..00000000000000
--- a/app/javascript/flavours/glitch/packs/public.jsx
+++ /dev/null
@@ -1,226 +0,0 @@
-import { createRoot }  from 'react-dom/client';
-
-import 'packs/public-path';
-
-import { IntlMessageFormat }  from 'intl-messageformat';
-import { defineMessages } from 'react-intl';
-
-import Rails from '@rails/ujs';
-import axios from 'axios';
-import { throttle } from 'lodash';
-
-import { timeAgoString }  from 'flavours/glitch/components/relative_timestamp';
-import emojify  from 'flavours/glitch/features/emoji/emoji';
-import loadKeyboardExtensions from 'flavours/glitch/load_keyboard_extensions';
-import { loadLocale, getLocale } from 'flavours/glitch/locales';
-import { loadPolyfills } from 'flavours/glitch/polyfills';
-import ready from 'flavours/glitch/ready';
-
-import 'cocoon-js-vanilla';
-
-const messages = defineMessages({
-  usernameTaken: { id: 'username.taken', defaultMessage: 'That username is taken. Try another' },
-  passwordExceedsLength: { id: 'password_confirmation.exceeds_maxlength', defaultMessage: 'Password confirmation exceeds the maximum password length' },
-  passwordDoesNotMatch: { id: 'password_confirmation.mismatching', defaultMessage: 'Password confirmation does not match' },
-});
-
-function loaded() {
-  const { messages: localeData } = getLocale();
-
-  const locale = document.documentElement.lang;
-
-  const dateTimeFormat = new Intl.DateTimeFormat(locale, {
-    year: 'numeric',
-    month: 'long',
-    day: 'numeric',
-    hour: 'numeric',
-    minute: 'numeric',
-  });
-
-  const dateFormat = new Intl.DateTimeFormat(locale, {
-    year: 'numeric',
-    month: 'short',
-    day: 'numeric',
-    timeFormat: false,
-  });
-
-  const timeFormat = new Intl.DateTimeFormat(locale, {
-    timeStyle: 'short',
-  });
-
-  const formatMessage = ({ id, defaultMessage }, values) => {
-    const messageFormat = new IntlMessageFormat(localeData[id] || defaultMessage, locale);
-    return messageFormat.format(values);
-  };
-
-  document.querySelectorAll('.emojify').forEach((content) => {
-    content.innerHTML = emojify(content.innerHTML);
-  });
-
-  document.querySelectorAll('time.formatted').forEach((content) => {
-    const datetime = new Date(content.getAttribute('datetime'));
-    const formattedDate = dateTimeFormat.format(datetime);
-
-    content.title = formattedDate;
-    content.textContent = formattedDate;
-  });
-
-  const isToday = date => {
-    const today = new Date();
-
-    return date.getDate() === today.getDate() &&
-      date.getMonth() === today.getMonth() &&
-      date.getFullYear() === today.getFullYear();
-  };
-  const todayFormat = new IntlMessageFormat(localeData['relative_format.today'] || 'Today at {time}', locale);
-
-  document.querySelectorAll('time.relative-formatted').forEach((content) => {
-    const datetime = new Date(content.getAttribute('datetime'));
-
-    let formattedContent;
-
-    if (isToday(datetime)) {
-      const formattedTime = timeFormat.format(datetime);
-
-      formattedContent = todayFormat.format({ time: formattedTime });
-    } else {
-      formattedContent = dateFormat.format(datetime);
-    }
-
-    content.title = formattedContent;
-    content.textContent = formattedContent;
-  });
-
-  document.querySelectorAll('time.time-ago').forEach((content) => {
-    const datetime = new Date(content.getAttribute('datetime'));
-    const now      = new Date();
-
-    const timeGiven = content.getAttribute('datetime').includes('T');
-    content.title = timeGiven ? dateTimeFormat.format(datetime) : dateFormat.format(datetime);
-    content.textContent = timeAgoString({
-      formatMessage,
-      formatDate: (date, options) => (new Intl.DateTimeFormat(locale, options)).format(date),
-    }, datetime, now, now.getFullYear(), timeGiven);
-  });
-
-  const reactComponents = document.querySelectorAll('[data-component]');
-
-  if (reactComponents.length > 0) {
-    import(/* webpackChunkName: "containers/media_container" */ 'flavours/glitch/containers/media_container')
-      .then(({ default: MediaContainer }) => {
-        reactComponents.forEach((component) => {
-          Array.from(component.children).forEach((child) => {
-            component.removeChild(child);
-          });
-        });
-
-        const content = document.createElement('div');
-
-        const root = createRoot(content);
-        root.render(<MediaContainer locale={locale} components={reactComponents} />);
-        document.body.appendChild(content);
-      })
-      .catch(error => {
-        console.error(error);
-      });
-  }
-
-  Rails.delegate(document, '#user_account_attributes_username', 'input', throttle(({ target }) => {
-    if (target.value && target.value.length > 0) {
-      axios.get('/api/v1/accounts/lookup', { params: { acct: target.value } }).then(() => {
-        target.setCustomValidity(formatMessage(messages.usernameTaken));
-      }).catch(() => {
-        target.setCustomValidity('');
-      });
-    } else {
-      target.setCustomValidity('');
-    }
-  }, 500, { leading: false, trailing: true }));
-
-  Rails.delegate(document, '#user_password,#user_password_confirmation', 'input', () => {
-    const password = document.getElementById('user_password');
-    const confirmation = document.getElementById('user_password_confirmation');
-    if (!confirmation) return;
-
-    if (confirmation.value && confirmation.value.length > password.maxLength) {
-      confirmation.setCustomValidity(formatMessage(messages.passwordExceedsLength));
-    } else if (password.value && password.value !== confirmation.value) {
-      confirmation.setCustomValidity(formatMessage(messages.passwordDoesNotMatch));
-    } else {
-      confirmation.setCustomValidity('');
-    }
-  });
-
-  Rails.delegate(document, '.status__content__spoiler-link', 'click', function() {
-    const statusEl = this.parentNode.parentNode;
-
-    if (statusEl.dataset.spoiler === 'expanded') {
-      statusEl.dataset.spoiler = 'folded';
-      this.textContent = (new IntlMessageFormat(localeData['status.show_more'] || 'Show more', locale)).format();
-    } else {
-      statusEl.dataset.spoiler = 'expanded';
-      this.textContent = (new IntlMessageFormat(localeData['status.show_less'] || 'Show less', locale)).format();
-    }
-
-    return false;
-  });
-
-  document.querySelectorAll('.status__content__spoiler-link').forEach((spoilerLink) => {
-    const statusEl = spoilerLink.parentNode.parentNode;
-    const message = (statusEl.dataset.spoiler === 'expanded') ? (localeData['status.show_less'] || 'Show less') : (localeData['status.show_more'] || 'Show more');
-    spoilerLink.textContent = (new IntlMessageFormat(message, locale)).format();
-  });
-}
-
-const toggleSidebar = () => {
-  const sidebar = document.querySelector('.sidebar ul');
-  const toggleButton = document.querySelector('.sidebar__toggle__icon');
-
-  if (sidebar.classList.contains('visible')) {
-    document.body.style.overflow = null;
-    toggleButton.setAttribute('aria-expanded', 'false');
-  } else {
-    document.body.style.overflow = 'hidden';
-    toggleButton.setAttribute('aria-expanded', 'true');
-  }
-
-  toggleButton.classList.toggle('active');
-  sidebar.classList.toggle('visible');
-};
-
-Rails.delegate(document, '.sidebar__toggle__icon', 'click', () => {
-  toggleSidebar();
-});
-
-Rails.delegate(document, '.sidebar__toggle__icon', 'keydown', e => {
-  if (e.key === ' ' || e.key === 'Enter') {
-    e.preventDefault();
-    toggleSidebar();
-  }
-});
-
-Rails.delegate(document, '.custom-emoji', 'mouseover', ({ target }) => target.src = target.getAttribute('data-original'));
-Rails.delegate(document, '.custom-emoji', 'mouseout', ({ target }) => target.src = target.getAttribute('data-static'));
-
-// Empty the honeypot fields in JS in case something like an extension
-// automatically filled them.
-Rails.delegate(document, '#registration_new_user,#new_user', 'submit', () => {
-  ['user_website', 'user_confirm_password', 'registration_user_website', 'registration_user_confirm_password'].forEach(id => {
-    const field = document.getElementById(id);
-    if (field) {
-      field.value = '';
-    }
-  });
-});
-
-function main() {
-  ready(loaded);
-}
-
-loadPolyfills()
-  .then(loadLocale)
-  .then(main)
-  .then(loadKeyboardExtensions)
-  .catch(error => {
-    console.error(error);
-  });
diff --git a/app/javascript/flavours/glitch/packs/public.tsx b/app/javascript/flavours/glitch/packs/public.tsx
new file mode 100644
index 00000000000000..1ecc3fa42f43df
--- /dev/null
+++ b/app/javascript/flavours/glitch/packs/public.tsx
@@ -0,0 +1,356 @@
+import { createRoot } from 'react-dom/client';
+
+import 'packs/public-path';
+
+import { IntlMessageFormat } from 'intl-messageformat';
+import type { MessageDescriptor, PrimitiveType } from 'react-intl';
+import { defineMessages } from 'react-intl';
+
+import Rails from '@rails/ujs';
+import axios from 'axios';
+import { throttle } from 'lodash';
+
+import { timeAgoString } from 'flavours/glitch/components/relative_timestamp';
+import emojify from 'flavours/glitch/features/emoji/emoji';
+import loadKeyboardExtensions from 'flavours/glitch/load_keyboard_extensions';
+import { loadLocale, getLocale } from 'flavours/glitch/locales';
+import { loadPolyfills } from 'flavours/glitch/polyfills';
+import ready from 'flavours/glitch/ready';
+
+import 'cocoon-js-vanilla';
+
+const messages = defineMessages({
+  usernameTaken: {
+    id: 'username.taken',
+    defaultMessage: 'That username is taken. Try another',
+  },
+  passwordExceedsLength: {
+    id: 'password_confirmation.exceeds_maxlength',
+    defaultMessage: 'Password confirmation exceeds the maximum password length',
+  },
+  passwordDoesNotMatch: {
+    id: 'password_confirmation.mismatching',
+    defaultMessage: 'Password confirmation does not match',
+  },
+});
+
+function loaded() {
+  const { messages: localeData } = getLocale();
+
+  const locale = document.documentElement.lang;
+
+  const dateTimeFormat = new Intl.DateTimeFormat(locale, {
+    year: 'numeric',
+    month: 'long',
+    day: 'numeric',
+    hour: 'numeric',
+    minute: 'numeric',
+  });
+
+  const dateFormat = new Intl.DateTimeFormat(locale, {
+    year: 'numeric',
+    month: 'short',
+    day: 'numeric',
+  });
+
+  const timeFormat = new Intl.DateTimeFormat(locale, {
+    timeStyle: 'short',
+  });
+
+  const formatMessage = (
+    { id, defaultMessage }: MessageDescriptor,
+    values?: Record<string, PrimitiveType>,
+  ) => {
+    let message: string | undefined = undefined;
+
+    if (id) message = localeData[id];
+
+    if (!message) message = defaultMessage as string;
+
+    const messageFormat = new IntlMessageFormat(message, locale);
+    return messageFormat.format(values) as string;
+  };
+
+  document.querySelectorAll('.emojify').forEach((content) => {
+    content.innerHTML = emojify(content.innerHTML);
+  });
+
+  document
+    .querySelectorAll<HTMLTimeElement>('time.formatted')
+    .forEach((content) => {
+      const datetime = new Date(content.dateTime);
+      const formattedDate = dateTimeFormat.format(datetime);
+
+      content.title = formattedDate;
+      content.textContent = formattedDate;
+    });
+
+  const isToday = (date: Date) => {
+    const today = new Date();
+
+    return (
+      date.getDate() === today.getDate() &&
+      date.getMonth() === today.getMonth() &&
+      date.getFullYear() === today.getFullYear()
+    );
+  };
+  const todayFormat = new IntlMessageFormat(
+    localeData['relative_format.today'] || 'Today at {time}',
+    locale,
+  );
+
+  document
+    .querySelectorAll<HTMLTimeElement>('time.relative-formatted')
+    .forEach((content) => {
+      const datetime = new Date(content.dateTime);
+
+      let formattedContent: string;
+
+      if (isToday(datetime)) {
+        const formattedTime = timeFormat.format(datetime);
+
+        formattedContent = todayFormat.format({
+          time: formattedTime,
+        }) as string;
+      } else {
+        formattedContent = dateFormat.format(datetime);
+      }
+
+      content.title = formattedContent;
+      content.textContent = formattedContent;
+    });
+
+  document
+    .querySelectorAll<HTMLTimeElement>('time.time-ago')
+    .forEach((content) => {
+      const datetime = new Date(content.dateTime);
+      const now = new Date();
+
+      const timeGiven = content.dateTime.includes('T');
+      content.title = timeGiven
+        ? dateTimeFormat.format(datetime)
+        : dateFormat.format(datetime);
+      content.textContent = timeAgoString(
+        {
+          formatMessage,
+          formatDate: (date: Date, options) =>
+            new Intl.DateTimeFormat(locale, options).format(date),
+        },
+        datetime,
+        now.getTime(),
+        now.getFullYear(),
+        timeGiven,
+      );
+    });
+
+  const reactComponents = document.querySelectorAll('[data-component]');
+
+  if (reactComponents.length > 0) {
+    import(
+      /* webpackChunkName: "containers/media_container" */ 'flavours/glitch/containers/media_container'
+    )
+      .then(({ default: MediaContainer }) => {
+        reactComponents.forEach((component) => {
+          Array.from(component.children).forEach((child) => {
+            component.removeChild(child);
+          });
+        });
+
+        const content = document.createElement('div');
+
+        const root = createRoot(content);
+        root.render(
+          <MediaContainer locale={locale} components={reactComponents} />,
+        );
+        document.body.appendChild(content);
+
+        return true;
+      })
+      .catch((error) => {
+        console.error(error);
+      });
+  }
+
+  Rails.delegate(
+    document,
+    'input#user_account_attributes_username',
+    'input',
+    throttle(
+      ({ target }) => {
+        if (!(target instanceof HTMLInputElement)) return;
+
+        if (target.value && target.value.length > 0) {
+          axios
+            .get('/api/v1/accounts/lookup', { params: { acct: target.value } })
+            .then(() => {
+              target.setCustomValidity(formatMessage(messages.usernameTaken));
+              return true;
+            })
+            .catch(() => {
+              target.setCustomValidity('');
+            });
+        } else {
+          target.setCustomValidity('');
+        }
+      },
+      500,
+      { leading: false, trailing: true },
+    ),
+  );
+
+  Rails.delegate(
+    document,
+    '#user_password,#user_password_confirmation',
+    'input',
+    () => {
+      const password = document.querySelector<HTMLInputElement>(
+        'input#user_password',
+      );
+      const confirmation = document.querySelector<HTMLInputElement>(
+        'input#user_password_confirmation',
+      );
+      if (!confirmation || !password) return;
+
+      if (
+        confirmation.value &&
+        confirmation.value.length > password.maxLength
+      ) {
+        confirmation.setCustomValidity(
+          formatMessage(messages.passwordExceedsLength),
+        );
+      } else if (password.value && password.value !== confirmation.value) {
+        confirmation.setCustomValidity(
+          formatMessage(messages.passwordDoesNotMatch),
+        );
+      } else {
+        confirmation.setCustomValidity('');
+      }
+    },
+  );
+
+  Rails.delegate(
+    document,
+    'button.status__content__spoiler-link',
+    'click',
+    function () {
+      if (!(this instanceof HTMLButtonElement)) return;
+
+      const statusEl = this.parentNode?.parentNode;
+
+      if (
+        !(
+          statusEl instanceof HTMLDivElement &&
+          statusEl.classList.contains('.status__content')
+        )
+      )
+        return;
+
+      if (statusEl.dataset.spoiler === 'expanded') {
+        statusEl.dataset.spoiler = 'folded';
+        this.textContent = new IntlMessageFormat(
+          localeData['status.show_more'] || 'Show more',
+          locale,
+        ).format() as string;
+      } else {
+        statusEl.dataset.spoiler = 'expanded';
+        this.textContent = new IntlMessageFormat(
+          localeData['status.show_less'] || 'Show less',
+          locale,
+        ).format() as string;
+      }
+    },
+  );
+
+  document
+    .querySelectorAll<HTMLButtonElement>('button.status__content__spoiler-link')
+    .forEach((spoilerLink) => {
+      const statusEl = spoilerLink.parentNode?.parentNode;
+
+      if (
+        !(
+          statusEl instanceof HTMLDivElement &&
+          statusEl.classList.contains('.status__content')
+        )
+      )
+        return;
+
+      const message =
+        statusEl.dataset.spoiler === 'expanded'
+          ? localeData['status.show_less'] || 'Show less'
+          : localeData['status.show_more'] || 'Show more';
+      spoilerLink.textContent = new IntlMessageFormat(
+        message,
+        locale,
+      ).format() as string;
+    });
+}
+
+const toggleSidebar = () => {
+  const sidebar = document.querySelector<HTMLUListElement>('.sidebar ul');
+  const toggleButton = document.querySelector<HTMLAnchorElement>(
+    'a.sidebar__toggle__icon',
+  );
+
+  if (!sidebar || !toggleButton) return;
+
+  if (sidebar.classList.contains('visible')) {
+    document.body.style.overflow = '';
+    toggleButton.setAttribute('aria-expanded', 'false');
+  } else {
+    document.body.style.overflow = 'hidden';
+    toggleButton.setAttribute('aria-expanded', 'true');
+  }
+
+  toggleButton.classList.toggle('active');
+  sidebar.classList.toggle('visible');
+};
+
+Rails.delegate(document, '.sidebar__toggle__icon', 'click', () => {
+  toggleSidebar();
+});
+
+Rails.delegate(document, '.sidebar__toggle__icon', 'keydown', (e) => {
+  if (e.key === ' ' || e.key === 'Enter') {
+    e.preventDefault();
+    toggleSidebar();
+  }
+});
+
+Rails.delegate(document, 'img.custom-emoji', 'mouseover', ({ target }) => {
+  if (target instanceof HTMLImageElement && target.dataset.original)
+    target.src = target.dataset.original;
+});
+Rails.delegate(document, 'img.custom-emoji', 'mouseout', ({ target }) => {
+  if (target instanceof HTMLImageElement && target.dataset.static)
+    target.src = target.dataset.static;
+});
+
+// Empty the honeypot fields in JS in case something like an extension
+// automatically filled them.
+Rails.delegate(document, '#registration_new_user,#new_user', 'submit', () => {
+  [
+    'user_website',
+    'user_confirm_password',
+    'registration_user_website',
+    'registration_user_confirm_password',
+  ].forEach((id) => {
+    const field = document.querySelector<HTMLInputElement>(`input#${id}`);
+    if (field) {
+      field.value = '';
+    }
+  });
+});
+
+function main() {
+  ready(loaded).catch((error) => {
+    console.error(error);
+  });
+}
+
+loadPolyfills()
+  .then(loadLocale)
+  .then(main)
+  .then(loadKeyboardExtensions)
+  .catch((error) => {
+    console.error(error);
+  });
diff --git a/app/javascript/flavours/glitch/theme.yml b/app/javascript/flavours/glitch/theme.yml
index 33399c3746305a..1aa31df187bf55 100644
--- a/app/javascript/flavours/glitch/theme.yml
+++ b/app/javascript/flavours/glitch/theme.yml
@@ -2,12 +2,12 @@
 pack:
   admin:
     - packs/admin.tsx
-    - packs/public.jsx
-  auth: packs/public.jsx
+    - packs/public.tsx
+  auth: packs/public.tsx
   common:
     filename: packs/common.js
     stylesheet: true
-  embed: packs/public.jsx
+  embed: packs/public.tsx
   error: packs/error.js
   home:
     filename: packs/home.js
@@ -17,8 +17,8 @@ pack:
       - flavours/glitch/async/notifications
   mailer:
   modal:
-  public: packs/public.jsx
-  settings: packs/public.jsx
+  public: packs/public.tsx
+  settings: packs/public.tsx
   sign_up: packs/sign_up.js
   share: packs/share.jsx
 

From 3beba00c4e273d028d39473b39c564228143f793 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 15 Mar 2024 17:06:48 +0100
Subject: [PATCH 0479/2191] [Glitch] Change Explore icon to compass in advanced
 interface

Port be7a68b09590a553d607b1fe99adf6916618d5d3 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/features/getting_started/index.jsx        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/javascript/flavours/glitch/features/getting_started/index.jsx b/app/javascript/flavours/glitch/features/getting_started/index.jsx
index d27d134b306eeb..585abb8b6c56e0 100644
--- a/app/javascript/flavours/glitch/features/getting_started/index.jsx
+++ b/app/javascript/flavours/glitch/features/getting_started/index.jsx
@@ -11,6 +11,7 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
 import BookmarksIcon from '@/material-icons/400-24px/bookmarks-fill.svg?react';
+import ExploreIcon from '@/material-icons/400-24px/explore.svg?react';
 import PeopleIcon from '@/material-icons/400-24px/group.svg?react';
 import HomeIcon from '@/material-icons/400-24px/home-fill.svg?react';
 import ListAltIcon from '@/material-icons/400-24px/list_alt.svg?react';
@@ -22,7 +23,6 @@ import NotificationsIcon from '@/material-icons/400-24px/notifications.svg?react
 import PersonAddIcon from '@/material-icons/400-24px/person_add.svg?react';
 import PublicIcon from '@/material-icons/400-24px/public.svg?react';
 import SettingsIcon from '@/material-icons/400-24px/settings-fill.svg?react';
-import TagIcon from '@/material-icons/400-24px/tag.svg?react';
 import { fetchFollowRequests } from 'flavours/glitch/actions/accounts';
 import { fetchLists } from 'flavours/glitch/actions/lists';
 import { openModal } from 'flavours/glitch/actions/modal';
@@ -158,7 +158,7 @@ class GettingStarted extends ImmutablePureComponent {
     }
 
     if (showTrends) {
-      navItems.push(<ColumnLink key='explore' icon='explore' iconComponent={TagIcon} text={intl.formatMessage(messages.explore)} to='/explore' />);
+      navItems.push(<ColumnLink key='explore' icon='explore' iconComponent={ExploreIcon} text={intl.formatMessage(messages.explore)} to='/explore' />);
     }
 
     if (signedIn) {

From 80fda17868018785564ce828d2ce522a815f775c Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 15 Mar 2024 18:36:41 +0100
Subject: [PATCH 0480/2191] [Glitch] Change mute, block and domain block
 confirmations in web UI

Port ec19d0a14bd8f5e76293ca52cf67972e01c2135f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/actions/blocks.js         |  15 +-
 .../flavours/glitch/actions/domain_blocks.js  |  11 +
 .../flavours/glitch/actions/mutes.js          |  32 +--
 .../flavours/glitch/components/check_box.tsx  |  39 +++
 .../account_timeline/components/header.jsx    |   6 +-
 .../containers/header_container.jsx           |  13 +-
 .../features/ui/components/block_modal.jsx    | 165 ++++++------
 .../ui/components/domain_block_modal.jsx      | 106 ++++++++
 .../features/ui/components/modal_root.jsx     |   2 +
 .../features/ui/components/mute_modal.jsx     | 238 ++++++++++--------
 .../features/ui/util/async-components.js      |   4 +
 .../flavours/glitch/reducers/blocks.js        |  22 --
 .../flavours/glitch/reducers/index.ts         |   4 -
 .../flavours/glitch/reducers/mutes.js         |  31 ---
 .../flavours/glitch/styles/components.scss    | 223 ++++++++++++++--
 .../flavours/glitch/styles/variables.scss     |  11 +-
 16 files changed, 593 insertions(+), 329 deletions(-)
 create mode 100644 app/javascript/flavours/glitch/components/check_box.tsx
 create mode 100644 app/javascript/flavours/glitch/features/ui/components/domain_block_modal.jsx
 delete mode 100644 app/javascript/flavours/glitch/reducers/blocks.js
 delete mode 100644 app/javascript/flavours/glitch/reducers/mutes.js

diff --git a/app/javascript/flavours/glitch/actions/blocks.js b/app/javascript/flavours/glitch/actions/blocks.js
index e293657ad36ef9..54296d0905c9a9 100644
--- a/app/javascript/flavours/glitch/actions/blocks.js
+++ b/app/javascript/flavours/glitch/actions/blocks.js
@@ -12,8 +12,6 @@ export const BLOCKS_EXPAND_REQUEST = 'BLOCKS_EXPAND_REQUEST';
 export const BLOCKS_EXPAND_SUCCESS = 'BLOCKS_EXPAND_SUCCESS';
 export const BLOCKS_EXPAND_FAIL    = 'BLOCKS_EXPAND_FAIL';
 
-export const BLOCKS_INIT_MODAL = 'BLOCKS_INIT_MODAL';
-
 export function fetchBlocks() {
   return (dispatch, getState) => {
     dispatch(fetchBlocksRequest());
@@ -90,11 +88,12 @@ export function expandBlocksFail(error) {
 
 export function initBlockModal(account) {
   return dispatch => {
-    dispatch({
-      type: BLOCKS_INIT_MODAL,
-      account,
-    });
-
-    dispatch(openModal({ modalType: 'BLOCK' }));
+    dispatch(openModal({
+      modalType: 'BLOCK',
+      modalProps: {
+        accountId: account.get('id'),
+        acct: account.get('acct'),
+      },
+    }));
   };
 }
diff --git a/app/javascript/flavours/glitch/actions/domain_blocks.js b/app/javascript/flavours/glitch/actions/domain_blocks.js
index 718002613f4053..55c0a6ce9d0ab7 100644
--- a/app/javascript/flavours/glitch/actions/domain_blocks.js
+++ b/app/javascript/flavours/glitch/actions/domain_blocks.js
@@ -1,6 +1,8 @@
 import api, { getLinks } from '../api';
 
 import { blockDomainSuccess, unblockDomainSuccess } from "./domain_blocks_typed";
+import { openModal } from './modal';
+
 
 export * from "./domain_blocks_typed";
 
@@ -150,3 +152,12 @@ export function expandDomainBlocksFail(error) {
     error,
   };
 }
+
+export const initDomainBlockModal = account => dispatch => dispatch(openModal({
+  modalType: 'DOMAIN_BLOCK',
+  modalProps: {
+    domain: account.get('acct').split('@')[1],
+    acct: account.get('acct'),
+    accountId: account.get('id'),
+  },
+}));
diff --git a/app/javascript/flavours/glitch/actions/mutes.js b/app/javascript/flavours/glitch/actions/mutes.js
index fb041078b84488..99c113f4147302 100644
--- a/app/javascript/flavours/glitch/actions/mutes.js
+++ b/app/javascript/flavours/glitch/actions/mutes.js
@@ -12,10 +12,6 @@ export const MUTES_EXPAND_REQUEST = 'MUTES_EXPAND_REQUEST';
 export const MUTES_EXPAND_SUCCESS = 'MUTES_EXPAND_SUCCESS';
 export const MUTES_EXPAND_FAIL    = 'MUTES_EXPAND_FAIL';
 
-export const MUTES_INIT_MODAL = 'MUTES_INIT_MODAL';
-export const MUTES_TOGGLE_HIDE_NOTIFICATIONS = 'MUTES_TOGGLE_HIDE_NOTIFICATIONS';
-export const MUTES_CHANGE_DURATION = 'MUTES_CHANGE_DURATION';
-
 export function fetchMutes() {
   return (dispatch, getState) => {
     dispatch(fetchMutesRequest());
@@ -92,26 +88,12 @@ export function expandMutesFail(error) {
 
 export function initMuteModal(account) {
   return dispatch => {
-    dispatch({
-      type: MUTES_INIT_MODAL,
-      account,
-    });
-
-    dispatch(openModal({ modalType: 'MUTE' }));
-  };
-}
-
-export function toggleHideNotifications() {
-  return dispatch => {
-    dispatch({ type: MUTES_TOGGLE_HIDE_NOTIFICATIONS });
-  };
-}
-
-export function changeMuteDuration(duration) {
-  return dispatch => {
-    dispatch({
-      type: MUTES_CHANGE_DURATION,
-      duration,
-    });
+    dispatch(openModal({
+      modalType: 'MUTE',
+      modalProps: {
+        accountId: account.get('id'),
+        acct: account.get('acct'),
+      },
+    }));
   };
 }
diff --git a/app/javascript/flavours/glitch/components/check_box.tsx b/app/javascript/flavours/glitch/components/check_box.tsx
new file mode 100644
index 00000000000000..7da8ef0ac5602d
--- /dev/null
+++ b/app/javascript/flavours/glitch/components/check_box.tsx
@@ -0,0 +1,39 @@
+import classNames from 'classnames';
+
+import DoneIcon from '@/material-icons/400-24px/done.svg?react';
+
+import { Icon } from './icon';
+
+interface Props {
+  value: string;
+  checked: boolean;
+  name: string;
+  onChange: (event: React.ChangeEvent<HTMLInputElement>) => void;
+  label: React.ReactNode;
+}
+
+export const CheckBox: React.FC<Props> = ({
+  name,
+  value,
+  checked,
+  onChange,
+  label,
+}) => {
+  return (
+    <label className='check-box'>
+      <input
+        name={name}
+        type='checkbox'
+        value={value}
+        checked={checked}
+        onChange={onChange}
+      />
+
+      <span className={classNames('check-box__input', { checked })}>
+        {checked && <Icon id='check' icon={DoneIcon} />}
+      </span>
+
+      <span>{label}</span>
+    </label>
+  );
+};
diff --git a/app/javascript/flavours/glitch/features/account_timeline/components/header.jsx b/app/javascript/flavours/glitch/features/account_timeline/components/header.jsx
index eb2ddbdd80ea5b..37258d9d83ea29 100644
--- a/app/javascript/flavours/glitch/features/account_timeline/components/header.jsx
+++ b/app/javascript/flavours/glitch/features/account_timeline/components/header.jsx
@@ -72,11 +72,7 @@ class Header extends ImmutablePureComponent {
   };
 
   handleBlockDomain = () => {
-    const domain = this.props.account.get('acct').split('@')[1];
-
-    if (!domain) return;
-
-    this.props.onBlockDomain(domain);
+    this.props.onBlockDomain(this.props.account);
   };
 
   handleUnblockDomain = () => {
diff --git a/app/javascript/flavours/glitch/features/account_timeline/containers/header_container.jsx b/app/javascript/flavours/glitch/features/account_timeline/containers/header_container.jsx
index c3a3de71ed9c3b..d42bb2c251eddc 100644
--- a/app/javascript/flavours/glitch/features/account_timeline/containers/header_container.jsx
+++ b/app/javascript/flavours/glitch/features/account_timeline/containers/header_container.jsx
@@ -15,7 +15,7 @@ import {
   mentionCompose,
   directCompose,
 } from '../../../actions/compose';
-import { blockDomain, unblockDomain } from '../../../actions/domain_blocks';
+import { initDomainBlockModal, unblockDomain } from '../../../actions/domain_blocks';
 import { openModal } from '../../../actions/modal';
 import { initMuteModal } from '../../../actions/mutes';
 import { initReport } from '../../../actions/reports';
@@ -138,15 +138,8 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
     }
   },
 
-  onBlockDomain (domain) {
-    dispatch(openModal({
-      modalType: 'CONFIRM',
-      modalProps: {
-        message: <FormattedMessage id='confirmations.domain_block.message' defaultMessage='Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable. You will not see content from that domain in any public timelines or your notifications. Your followers from that domain will be removed.' values={{ domain: <strong>{domain}</strong> }} />,
-        confirm: intl.formatMessage(messages.blockDomainConfirm),
-        onConfirm: () => dispatch(blockDomain(domain)),
-      },
-    }));
+  onBlockDomain (account) {
+    dispatch(initDomainBlockModal(account));
   },
 
   onUnblockDomain (domain) {
diff --git a/app/javascript/flavours/glitch/features/ui/components/block_modal.jsx b/app/javascript/flavours/glitch/features/ui/components/block_modal.jsx
index cfac692324aa23..af5479b5fa4774 100644
--- a/app/javascript/flavours/glitch/features/ui/components/block_modal.jsx
+++ b/app/javascript/flavours/glitch/features/ui/components/block_modal.jsx
@@ -1,100 +1,87 @@
 import PropTypes from 'prop-types';
-import { PureComponent } from 'react';
-
-import { injectIntl, FormattedMessage } from 'react-intl';
-
-import { connect } from 'react-redux';
-
-import { blockAccount } from '../../../actions/accounts';
-import { closeModal } from '../../../actions/modal';
-import { initReport } from '../../../actions/reports';
-import { Button } from '../../../components/button';
-import { makeGetAccount } from '../../../selectors';
-
-const makeMapStateToProps = () => {
-  const getAccount = makeGetAccount();
-
-  const mapStateToProps = state => ({
-    account: getAccount(state, state.getIn(['blocks', 'new', 'account_id'])),
-  });
-
-  return mapStateToProps;
-};
-
-const mapDispatchToProps = dispatch => {
-  return {
-    onConfirm(account) {
-      dispatch(blockAccount(account.get('id')));
-    },
-
-    onBlockAndReport(account) {
-      dispatch(blockAccount(account.get('id')));
-      dispatch(initReport(account));
-    },
-
-    onClose() {
-      dispatch(closeModal({
-        modalType: undefined,
-        ignoreFocus: false,
-      }));
-    },
-  };
-};
+import { useCallback } from 'react';
+
+import { FormattedMessage } from 'react-intl';
+
+import { useDispatch } from 'react-redux';
+
+import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
+import BlockIcon from '@/material-icons/400-24px/block.svg?react';
+import CampaignIcon from '@/material-icons/400-24px/campaign.svg?react';
+import ReplyIcon from '@/material-icons/400-24px/reply.svg?react';
+import VisibilityOffIcon from '@/material-icons/400-24px/visibility_off.svg?react';
+import { blockAccount } from 'flavours/glitch/actions/accounts';
+import { closeModal } from 'flavours/glitch/actions/modal';
+import { Button } from 'flavours/glitch/components/button';
+import { Icon } from 'flavours/glitch/components/icon';
+
+export const BlockModal = ({ accountId, acct }) => {
+  const dispatch = useDispatch();
+
+  const handleClick = useCallback(() => {
+    dispatch(closeModal({ modalType: undefined, ignoreFocus: false }));
+    dispatch(blockAccount(accountId));
+  }, [dispatch, accountId]);
+
+  const handleCancel = useCallback(() => {
+    dispatch(closeModal({ modalType: undefined, ignoreFocus: false }));
+  }, [dispatch]);
+
+  return (
+    <div className='modal-root__modal safety-action-modal'>
+      <div className='safety-action-modal__top'>
+        <div className='safety-action-modal__header'>
+          <div className='safety-action-modal__header__icon'>
+            <Icon icon={BlockIcon} />
+          </div>
+
+          <div>
+            <h1><FormattedMessage id='block_modal.title' defaultMessage='Block user?' /></h1>
+            <div>@{acct}</div>
+          </div>
+        </div>
 
-class BlockModal extends PureComponent {
-
-  static propTypes = {
-    account: PropTypes.object.isRequired,
-    onClose: PropTypes.func.isRequired,
-    onBlockAndReport: PropTypes.func.isRequired,
-    onConfirm: PropTypes.func.isRequired,
-    intl: PropTypes.object.isRequired,
-  };
-
-  handleClick = () => {
-    this.props.onClose();
-    this.props.onConfirm(this.props.account);
-  };
-
-  handleSecondary = () => {
-    this.props.onClose();
-    this.props.onBlockAndReport(this.props.account);
-  };
-
-  handleCancel = () => {
-    this.props.onClose();
-  };
-
-  render () {
-    const { account } = this.props;
-
-    return (
-      <div className='modal-root__modal block-modal'>
-        <div className='block-modal__container'>
-          <p>
-            <FormattedMessage
-              id='confirmations.block.message'
-              defaultMessage='Are you sure you want to block {name}?'
-              values={{ name: <strong>@{account.get('acct')}</strong> }}
-            />
-          </p>
+        <div className='safety-action-modal__bullet-points'>
+          <div>
+            <div className='safety-action-modal__bullet-points__icon'><Icon icon={CampaignIcon} /></div>
+            <div><FormattedMessage id='block_modal.they_will_know' defaultMessage="They can see that they're blocked." /></div>
+          </div>
+
+          <div>
+            <div className='safety-action-modal__bullet-points__icon'><Icon icon={VisibilityOffIcon} /></div>
+            <div><FormattedMessage id='block_modal.they_cant_see_posts' defaultMessage="They can't see your posts and you won't see theirs." /></div>
+          </div>
+
+          <div>
+            <div className='safety-action-modal__bullet-points__icon'><Icon icon={AlternateEmailIcon} /></div>
+            <div><FormattedMessage id='block_modal.you_wont_see_mentions' defaultMessage="You won't see posts that mentions them." /></div>
+          </div>
+
+          <div>
+            <div className='safety-action-modal__bullet-points__icon'><Icon icon={ReplyIcon} /></div>
+            <div><FormattedMessage id='block_modal.they_cant_mention' defaultMessage="They can't mention or follow you." /></div>
+          </div>
         </div>
+      </div>
 
-        <div className='block-modal__action-bar'>
-          <Button onClick={this.handleCancel} className='block-modal__cancel-button'>
+      <div className='safety-action-modal__bottom'>
+        <div className='safety-action-modal__actions'>
+          <button onClick={handleCancel} className='link-button'>
             <FormattedMessage id='confirmation_modal.cancel' defaultMessage='Cancel' />
-          </Button>
-          <Button onClick={this.handleSecondary} className='confirmation-modal__secondary-button'>
-            <FormattedMessage id='confirmations.block.block_and_report' defaultMessage='Block & Report' />
-          </Button>
-          <Button onClick={this.handleClick} autoFocus>
+          </button>
+
+          <Button onClick={handleClick}>
             <FormattedMessage id='confirmations.block.confirm' defaultMessage='Block' />
           </Button>
         </div>
       </div>
-    );
-  }
+    </div>
+  );
+};
 
-}
+BlockModal.propTypes = {
+  accountId: PropTypes.string.isRequired,
+  acct: PropTypes.string.isRequired,
+};
 
-export default connect(makeMapStateToProps, mapDispatchToProps)(injectIntl(BlockModal));
+export default BlockModal;
diff --git a/app/javascript/flavours/glitch/features/ui/components/domain_block_modal.jsx b/app/javascript/flavours/glitch/features/ui/components/domain_block_modal.jsx
new file mode 100644
index 00000000000000..b1ab81dab50c64
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/ui/components/domain_block_modal.jsx
@@ -0,0 +1,106 @@
+import PropTypes from 'prop-types';
+import { useCallback } from 'react';
+
+import { FormattedMessage } from 'react-intl';
+
+import { useDispatch } from 'react-redux';
+
+import CampaignIcon from '@/material-icons/400-24px/campaign.svg?react';
+import DomainDisabledIcon from '@/material-icons/400-24px/domain_disabled.svg?react';
+import HistoryIcon from '@/material-icons/400-24px/history.svg?react';
+import PersonRemoveIcon from '@/material-icons/400-24px/person_remove.svg?react';
+import ReplyIcon from '@/material-icons/400-24px/reply.svg?react';
+import VisibilityOffIcon from '@/material-icons/400-24px/visibility_off.svg?react';
+import { blockAccount } from 'flavours/glitch/actions/accounts';
+import { blockDomain } from 'flavours/glitch/actions/domain_blocks';
+import { closeModal } from 'flavours/glitch/actions/modal';
+import { Button } from 'flavours/glitch/components/button';
+import { Icon } from 'flavours/glitch/components/icon';
+
+export const DomainBlockModal = ({ domain, accountId, acct }) => {
+  const dispatch = useDispatch();
+
+  const handleClick = useCallback(() => {
+    dispatch(closeModal({ modalType: undefined, ignoreFocus: false }));
+    dispatch(blockDomain(domain));
+  }, [dispatch, domain]);
+
+  const handleSecondaryClick = useCallback(() => {
+    dispatch(closeModal({ modalType: undefined, ignoreFocus: false }));
+    dispatch(blockAccount(accountId));
+  }, [dispatch, accountId]);
+
+  const handleCancel = useCallback(() => {
+    dispatch(closeModal({ modalType: undefined, ignoreFocus: false }));
+  }, [dispatch]);
+
+  return (
+    <div className='modal-root__modal safety-action-modal'>
+      <div className='safety-action-modal__top'>
+        <div className='safety-action-modal__header'>
+          <div className='safety-action-modal__header__icon'>
+            <Icon icon={DomainDisabledIcon} />
+          </div>
+
+          <div>
+            <h1><FormattedMessage id='domain_block_modal.title' defaultMessage='Block domain?' /></h1>
+            <div>{domain}</div>
+          </div>
+        </div>
+
+        <div className='safety-action-modal__bullet-points'>
+          <div>
+            <div className='safety-action-modal__bullet-points__icon'><Icon icon={CampaignIcon} /></div>
+            <div><FormattedMessage id='domain_block_modal.they_wont_know' defaultMessage="They won't know they've been blocked." /></div>
+          </div>
+
+          <div>
+            <div className='safety-action-modal__bullet-points__icon'><Icon icon={VisibilityOffIcon} /></div>
+            <div><FormattedMessage id='domain_block_modal.you_wont_see_posts' defaultMessage="You won't see posts or notifications from users on this server." /></div>
+          </div>
+
+          <div>
+            <div className='safety-action-modal__bullet-points__icon'><Icon icon={PersonRemoveIcon} /></div>
+            <div><FormattedMessage id='domain_block_modal.you_will_lose_followers' defaultMessage='All your followers from this server will be removed.' /></div>
+          </div>
+
+          <div>
+            <div className='safety-action-modal__bullet-points__icon'><Icon icon={ReplyIcon} /></div>
+            <div><FormattedMessage id='domain_block_modal.they_cant_follow' defaultMessage='Nobody from this server can follow you.' /></div>
+          </div>
+
+          <div>
+            <div className='safety-action-modal__bullet-points__icon'><Icon icon={HistoryIcon} /></div>
+            <div><FormattedMessage id='domain_block_modal.they_can_interact_with_old_posts' defaultMessage='People from this server can interact with your old posts.' /></div>
+          </div>
+        </div>
+      </div>
+
+      <div className='safety-action-modal__bottom'>
+        <div className='safety-action-modal__actions'>
+          <Button onClick={handleSecondaryClick} secondary>
+            <FormattedMessage id='domain_block_modal.block_account_instead' defaultMessage='Block @{name} instead' values={{ name: acct.split('@')[0] }} />
+          </Button>
+
+          <div className='spacer' />
+
+          <button onClick={handleCancel} className='link-button'>
+            <FormattedMessage id='confirmation_modal.cancel' defaultMessage='Cancel' />
+          </button>
+
+          <Button onClick={handleClick}>
+            <FormattedMessage id='domain_block_modal.block' defaultMessage='Block server' />
+          </Button>
+        </div>
+      </div>
+    </div>
+  );
+};
+
+DomainBlockModal.propTypes = {
+  domain: PropTypes.string.isRequired,
+  accountId: PropTypes.string.isRequired,
+  acct: PropTypes.string.isRequired,
+};
+
+export default DomainBlockModal;
diff --git a/app/javascript/flavours/glitch/features/ui/components/modal_root.jsx b/app/javascript/flavours/glitch/features/ui/components/modal_root.jsx
index 4ecf07b0303e82..3f7e291e7b72c4 100644
--- a/app/javascript/flavours/glitch/features/ui/components/modal_root.jsx
+++ b/app/javascript/flavours/glitch/features/ui/components/modal_root.jsx
@@ -7,6 +7,7 @@ import Base from 'flavours/glitch/components/modal_root';
 import {
   MuteModal,
   BlockModal,
+  DomainBlockModal,
   ReportModal,
   SettingsModal,
   EmbedModal,
@@ -48,6 +49,7 @@ export const MODAL_COMPONENTS = {
   'CONFIRM': () => Promise.resolve({ default: ConfirmationModal }),
   'MUTE': MuteModal,
   'BLOCK': BlockModal,
+  'DOMAIN_BLOCK': DomainBlockModal,
   'REPORT': ReportModal,
   'SETTINGS': SettingsModal,
   'DEPRECATED_SETTINGS': () => Promise.resolve({ default: DeprecatedSettingsModal }),
diff --git a/app/javascript/flavours/glitch/features/ui/components/mute_modal.jsx b/app/javascript/flavours/glitch/features/ui/components/mute_modal.jsx
index fa81ea81a31d53..a161e2486156c3 100644
--- a/app/javascript/flavours/glitch/features/ui/components/mute_modal.jsx
+++ b/app/javascript/flavours/glitch/features/ui/components/mute_modal.jsx
@@ -1,138 +1,154 @@
 import PropTypes from 'prop-types';
-import { PureComponent } from 'react';
+import { useCallback, useState } from 'react';
 
-import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
+import { defineMessages, useIntl, FormattedMessage } from 'react-intl';
 
-import { connect } from 'react-redux';
+import classNames from 'classnames';
 
-import Toggle from 'react-toggle';
+import { useDispatch } from 'react-redux';
 
-import { muteAccount } from '../../../actions/accounts';
-import { closeModal } from '../../../actions/modal';
-import { toggleHideNotifications, changeMuteDuration } from '../../../actions/mutes';
-import { Button } from '../../../components/button';
+
+import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
+import CampaignIcon from '@/material-icons/400-24px/campaign.svg?react';
+import ReplyIcon from '@/material-icons/400-24px/reply.svg?react';
+import VisibilityOffIcon from '@/material-icons/400-24px/visibility_off.svg?react';
+import VolumeOffIcon from '@/material-icons/400-24px/volume_off.svg?react';
+import { muteAccount } from 'flavours/glitch/actions/accounts';
+import { closeModal } from 'flavours/glitch/actions/modal';
+import { Button } from 'flavours/glitch/components/button';
+import { CheckBox } from 'flavours/glitch/components/check_box';
+import { Icon } from 'flavours/glitch/components/icon';
+import { RadioButton } from 'flavours/glitch/components/radio_button';
 
 const messages = defineMessages({
   minutes: { id: 'intervals.full.minutes', defaultMessage: '{number, plural, one {# minute} other {# minutes}}' },
   hours: { id: 'intervals.full.hours', defaultMessage: '{number, plural, one {# hour} other {# hours}}' },
   days: { id: 'intervals.full.days', defaultMessage: '{number, plural, one {# day} other {# days}}' },
-  indefinite: { id: 'mute_modal.indefinite', defaultMessage: 'Indefinite' },
+  indefinite: { id: 'mute_modal.indefinite', defaultMessage: 'Until I unmute them' },
+  hideFromNotifications: { id: 'mute_modal.hide_from_notifications', defaultMessage: 'Hide from notifications' },
 });
 
-const mapStateToProps = state => {
-  return {
-    account: state.getIn(['mutes', 'new', 'account']),
-    notifications: state.getIn(['mutes', 'new', 'notifications']),
-    muteDuration: state.getIn(['mutes', 'new', 'duration']),
-  };
+const RadioButtonLabel = ({ name, value, currentValue, onChange, label }) => (
+  <RadioButton
+    name={name}
+    value={value}
+    checked={value === currentValue}
+    onChange={onChange}
+    label={label}
+  />
+);
+
+RadioButtonLabel.propTypes = {
+  name: PropTypes.string,
+  value: PropTypes.oneOf([PropTypes.string, PropTypes.number, PropTypes.bool]),
+  currentValue: PropTypes.oneOf([PropTypes.string, PropTypes.number, PropTypes.bool]),
+  checked: PropTypes.bool,
+  onChange: PropTypes.func,
+  label: PropTypes.node,
 };
 
-const mapDispatchToProps = dispatch => {
-  return {
-    onConfirm(account, notifications, muteDuration) {
-      dispatch(muteAccount(account.get('id'), notifications, muteDuration));
-    },
-
-    onClose() {
-      dispatch(closeModal({
-        modalType: undefined,
-        ignoreFocus: false,
-      }));
-    },
-
-    onToggleNotifications() {
-      dispatch(toggleHideNotifications());
-    },
-
-    onChangeMuteDuration(e) {
-      dispatch(changeMuteDuration(e.target.value));
-    },
-  };
-};
+export const MuteModal = ({ accountId, acct }) => {
+  const intl = useIntl();
+  const dispatch = useDispatch();
+  const [notifications, setNotifications] = useState(true);
+  const [muteDuration, setMuteDuration] = useState('0');
+  const [expanded, setExpanded] = useState(false);
+
+  const handleClick = useCallback(() => {
+    dispatch(closeModal({ modalType: undefined, ignoreFocus: false }));
+    dispatch(muteAccount(accountId, notifications, muteDuration));
+  }, [dispatch, accountId, notifications, muteDuration]);
+
+  const handleCancel = useCallback(() => {
+    dispatch(closeModal({ modalType: undefined, ignoreFocus: false }));
+  }, [dispatch]);
+
+  const handleToggleNotifications = useCallback(({ target }) => {
+    setNotifications(target.checked);
+  }, [setNotifications]);
+
+  const handleChangeMuteDuration = useCallback(({ target }) => {
+    setMuteDuration(target.value);
+  }, [setMuteDuration]);
+
+  const handleToggleSettings = useCallback(() => {
+    setExpanded(!expanded);
+  }, [expanded, setExpanded]);
+
+  return (
+    <div className='modal-root__modal safety-action-modal'>
+      <div className='safety-action-modal__top'>
+        <div className='safety-action-modal__header'>
+          <div className='safety-action-modal__header__icon'>
+            <Icon icon={VolumeOffIcon} />
+          </div>
+
+          <div>
+            <h1><FormattedMessage id='mute_modal.title' defaultMessage='Mute user?' /></h1>
+            <div>@{acct}</div>
+          </div>
+        </div>
 
-class MuteModal extends PureComponent {
-
-  static propTypes = {
-    account: PropTypes.object.isRequired,
-    notifications: PropTypes.bool.isRequired,
-    onClose: PropTypes.func.isRequired,
-    onConfirm: PropTypes.func.isRequired,
-    onToggleNotifications: PropTypes.func.isRequired,
-    intl: PropTypes.object.isRequired,
-    muteDuration: PropTypes.number.isRequired,
-    onChangeMuteDuration: PropTypes.func.isRequired,
-  };
-
-  handleClick = () => {
-    this.props.onClose();
-    this.props.onConfirm(this.props.account, this.props.notifications, this.props.muteDuration);
-  };
-
-  handleCancel = () => {
-    this.props.onClose();
-  };
-
-  toggleNotifications = () => {
-    this.props.onToggleNotifications();
-  };
-
-  changeMuteDuration = (e) => {
-    this.props.onChangeMuteDuration(e);
-  };
-
-  render () {
-    const { account, notifications, muteDuration, intl } = this.props;
-
-    return (
-      <div className='modal-root__modal mute-modal'>
-        <div className='mute-modal__container'>
-          <p>
-            <FormattedMessage
-              id='confirmations.mute.message'
-              defaultMessage='Are you sure you want to mute {name}?'
-              values={{ name: <strong>@{account.get('acct')}</strong> }}
-            />
-          </p>
-          <p className='mute-modal__explanation'>
-            <FormattedMessage
-              id='confirmations.mute.explanation'
-              defaultMessage='This will hide posts from them and posts mentioning them, but it will still allow them to see your posts and follow you.'
-            />
-          </p>
-          <div className='setting-toggle'>
-            <Toggle id='mute-modal__hide-notifications-checkbox' checked={notifications} onChange={this.toggleNotifications} />
-            <label className='setting-toggle__label' htmlFor='mute-modal__hide-notifications-checkbox'>
-              <FormattedMessage id='mute_modal.hide_notifications' defaultMessage='Hide notifications from this user?' />
-            </label>
+        <div className='safety-action-modal__bullet-points'>
+          <div>
+            <div className='safety-action-modal__bullet-points__icon'><Icon icon={CampaignIcon} /></div>
+            <div><FormattedMessage id='mute_modal.they_wont_know' defaultMessage="They won't know they've been muted." /></div>
           </div>
+
           <div>
-            <span><FormattedMessage id='mute_modal.duration' defaultMessage='Duration' />: </span>
-
-            <select value={muteDuration} onChange={this.changeMuteDuration}>
-              <option value={0}>{intl.formatMessage(messages.indefinite)}</option>
-              <option value={300}>{intl.formatMessage(messages.minutes, { number: 5 })}</option>
-              <option value={1800}>{intl.formatMessage(messages.minutes, { number: 30 })}</option>
-              <option value={3600}>{intl.formatMessage(messages.hours, { number: 1 })}</option>
-              <option value={21600}>{intl.formatMessage(messages.hours, { number: 6 })}</option>
-              <option value={86400}>{intl.formatMessage(messages.days, { number: 1 })}</option>
-              <option value={259200}>{intl.formatMessage(messages.days, { number: 3 })}</option>
-              <option value={604800}>{intl.formatMessage(messages.days, { number: 7 })}</option>
-            </select>
+            <div className='safety-action-modal__bullet-points__icon'><Icon icon={VisibilityOffIcon} /></div>
+            <div><FormattedMessage id='mute_modal.you_wont_see_posts' defaultMessage="They can still see your posts, but you won't see theirs." /></div>
+          </div>
+
+          <div>
+            <div className='safety-action-modal__bullet-points__icon'><Icon icon={AlternateEmailIcon} /></div>
+            <div><FormattedMessage id='mute_modal.you_wont_see_mentions' defaultMessage="You won't see posts that mention them." /></div>
+          </div>
+
+          <div>
+            <div className='safety-action-modal__bullet-points__icon'><Icon icon={ReplyIcon} /></div>
+            <div><FormattedMessage id='mute_modal.they_can_mention_and_follow' defaultMessage="They can mention and follow you, but you won't see them." /></div>
+          </div>
+        </div>
+      </div>
+
+      <div className={classNames('safety-action-modal__bottom', { active: expanded })}>
+        <div className='safety-action-modal__bottom__collapsible'>
+          <div className='safety-action-modal__field-group'>
+            <RadioButtonLabel name='duration' value='0' label={intl.formatMessage(messages.indefinite)} currentValue={muteDuration} onChange={handleChangeMuteDuration} />
+            <RadioButtonLabel name='duration' value='86400' label={intl.formatMessage(messages.hours, { number: 24 })} currentValue={muteDuration} onChange={handleChangeMuteDuration} />
+            <RadioButtonLabel name='duration' value='604800' label={intl.formatMessage(messages.days, { number: 7 })} currentValue={muteDuration} onChange={handleChangeMuteDuration} />
+            <RadioButtonLabel name='duration' value='x' label={intl.formatMessage(messages.days, { number: 30 })} currentValue={muteDuration} onChange={handleChangeMuteDuration} />
+          </div>
+
+          <div className='safety-action-modal__field-group'>
+            <CheckBox label={intl.formatMessage(messages.hideFromNotifications)} checked={notifications} onChange={handleToggleNotifications} />
           </div>
         </div>
 
-        <div className='mute-modal__action-bar'>
-          <Button onClick={this.handleCancel} className='mute-modal__cancel-button'>
+        <div className='safety-action-modal__actions'>
+          <button onClick={handleToggleSettings} className='link-button'>
+            {expanded ? <FormattedMessage id='mute_modal.hide_options' defaultMessage='Hide options' /> : <FormattedMessage id='mute_modal.show_options' defaultMessage='Show options' />}
+          </button>
+
+          <div className='spacer' />
+
+          <button onClick={handleCancel} className='link-button'>
             <FormattedMessage id='confirmation_modal.cancel' defaultMessage='Cancel' />
-          </Button>
-          <Button onClick={this.handleClick} autoFocus>
+          </button>
+
+          <Button onClick={handleClick}>
             <FormattedMessage id='confirmations.mute.confirm' defaultMessage='Mute' />
           </Button>
         </div>
       </div>
-    );
-  }
+    </div>
+  );
+};
 
-}
+MuteModal.propTypes = {
+  accountId: PropTypes.string.isRequired,
+  acct: PropTypes.string.isRequired,
+};
 
-export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(MuteModal));
+export default MuteModal;
diff --git a/app/javascript/flavours/glitch/features/ui/util/async-components.js b/app/javascript/flavours/glitch/features/ui/util/async-components.js
index 14d46d70434d99..6a140e3fd7e036 100644
--- a/app/javascript/flavours/glitch/features/ui/util/async-components.js
+++ b/app/javascript/flavours/glitch/features/ui/util/async-components.js
@@ -126,6 +126,10 @@ export function BlockModal () {
   return import(/* webpackChunkName: "flavours/glitch/async/block_modal" */'../components/block_modal');
 }
 
+export function DomainBlockModal () {
+  return import(/* webpackChunkName: "flavours/glitch/async/modals/domain_block_modal" */'../components/domain_block_modal');
+}
+
 export function ReportModal () {
   return import(/* webpackChunkName: "flavours/glitch/async/report_modal" */'../components/report_modal');
 }
diff --git a/app/javascript/flavours/glitch/reducers/blocks.js b/app/javascript/flavours/glitch/reducers/blocks.js
deleted file mode 100644
index 1b65071634fb16..00000000000000
--- a/app/javascript/flavours/glitch/reducers/blocks.js
+++ /dev/null
@@ -1,22 +0,0 @@
-import Immutable from 'immutable';
-
-import {
-  BLOCKS_INIT_MODAL,
-} from '../actions/blocks';
-
-const initialState = Immutable.Map({
-  new: Immutable.Map({
-    account_id: null,
-  }),
-});
-
-export default function mutes(state = initialState, action) {
-  switch (action.type) {
-  case BLOCKS_INIT_MODAL:
-    return state.withMutations((state) => {
-      state.setIn(['new', 'account_id'], action.account.get('id'));
-    });
-  default:
-    return state;
-  }
-}
diff --git a/app/javascript/flavours/glitch/reducers/index.ts b/app/javascript/flavours/glitch/reducers/index.ts
index 1049a39900e992..c67349e51f8491 100644
--- a/app/javascript/flavours/glitch/reducers/index.ts
+++ b/app/javascript/flavours/glitch/reducers/index.ts
@@ -7,7 +7,6 @@ import { accountsReducer } from './accounts';
 import accounts_map from './accounts_map';
 import alerts from './alerts';
 import announcements from './announcements';
-import blocks from './blocks';
 import boosts from './boosts';
 import compose from './compose';
 import contexts from './contexts';
@@ -27,7 +26,6 @@ import markers from './markers';
 import media_attachments from './media_attachments';
 import meta from './meta';
 import { modalReducer } from './modal';
-import mutes from './mutes';
 import { notificationPolicyReducer } from './notification_policy';
 import { notificationRequestsReducer } from './notification_requests';
 import notifications from './notifications';
@@ -65,8 +63,6 @@ const reducers = {
   settings,
   local_settings,
   push_notifications,
-  mutes,
-  blocks,
   boosts,
   server,
   contexts,
diff --git a/app/javascript/flavours/glitch/reducers/mutes.js b/app/javascript/flavours/glitch/reducers/mutes.js
deleted file mode 100644
index a9eb61ff834cbc..00000000000000
--- a/app/javascript/flavours/glitch/reducers/mutes.js
+++ /dev/null
@@ -1,31 +0,0 @@
-import Immutable from 'immutable';
-
-import {
-  MUTES_INIT_MODAL,
-  MUTES_TOGGLE_HIDE_NOTIFICATIONS,
-  MUTES_CHANGE_DURATION,
-} from '../actions/mutes';
-
-const initialState = Immutable.Map({
-  new: Immutable.Map({
-    account: null,
-    notifications: true,
-    duration: 0,
-  }),
-});
-
-export default function mutes(state = initialState, action) {
-  switch (action.type) {
-  case MUTES_INIT_MODAL:
-    return state.withMutations((state) => {
-      state.setIn(['new', 'account'], action.account);
-      state.setIn(['new', 'notifications'], true);
-    });
-  case MUTES_TOGGLE_HIDE_NOTIFICATIONS:
-    return state.updateIn(['new', 'notifications'], (old) => !old);
-  case MUTES_CHANGE_DURATION:
-    return state.setIn(['new', 'duration'], Number(action.duration));
-  default:
-    return state;
-  }
-}
diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index 147a88cf144475..35017778737e6e 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -106,17 +106,17 @@
   }
 
   &.button-secondary {
-    color: $ui-button-secondary-color;
+    color: $highlight-text-color;
     background: transparent;
     padding: 6px 17px;
-    border: 1px solid $ui-button-secondary-border-color;
+    border: 1px solid $highlight-text-color;
 
     &:active,
     &:focus,
     &:hover {
-      border-color: $ui-button-secondary-focus-background-color;
-      color: $ui-button-secondary-focus-color;
-      background-color: $ui-button-secondary-focus-background-color;
+      border-color: lighten($highlight-text-color, 4%);
+      color: lighten($highlight-text-color, 4%);
+      background-color: transparent;
       text-decoration: none;
     }
 
@@ -5978,6 +5978,10 @@ a.status-card {
   pointer-events: auto;
   user-select: text;
   display: flex;
+
+  @media screen and (max-width: $no-gap-breakpoint) {
+    margin-top: auto;
+  }
 }
 
 .video-modal .video-player {
@@ -6309,6 +6313,145 @@ a.status-card {
   margin-inline-start: 10px;
 }
 
+.safety-action-modal {
+  width: 600px;
+  flex-direction: column;
+
+  &__top,
+  &__bottom {
+    display: flex;
+    gap: 8px;
+    padding: 24px;
+    flex-direction: column;
+    background: var(--modal-background-color);
+    backdrop-filter: var(--background-filter);
+    border: 1px solid var(--modal-border-color);
+  }
+
+  &__top {
+    border-radius: 16px 16px 0 0;
+    border-bottom: 0;
+    gap: 16px;
+  }
+
+  &__bottom {
+    border-radius: 0 0 16px 16px;
+    border-top: 0;
+
+    @media screen and (max-width: $no-gap-breakpoint) {
+      border-radius: 0;
+      border-bottom: 0;
+      padding-bottom: 32px;
+    }
+  }
+
+  &__header {
+    display: flex;
+    gap: 16px;
+    align-items: center;
+    font-size: 14px;
+    line-height: 20px;
+    color: $darker-text-color;
+
+    &__icon {
+      border-radius: 64px;
+      background: $ui-highlight-color;
+      color: $white;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      width: 40px;
+      height: 40px;
+      flex-shrink: 0;
+
+      .icon {
+        width: 24px;
+        height: 24px;
+      }
+    }
+
+    h1 {
+      font-size: 22px;
+      line-height: 28px;
+      color: $primary-text-color;
+    }
+  }
+
+  &__bullet-points {
+    display: flex;
+    flex-direction: column;
+    gap: 8px;
+    font-size: 16px;
+    line-height: 24px;
+
+    & > div {
+      display: flex;
+      gap: 16px;
+      align-items: center;
+    }
+
+    &__icon {
+      width: 40px;
+      height: 40px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      flex-shrink: 0;
+
+      .icon {
+        width: 24px;
+        height: 24px;
+      }
+    }
+  }
+
+  &__field-group {
+    display: flex;
+    flex-direction: column;
+
+    label {
+      display: flex;
+      gap: 16px;
+      align-items: center;
+      font-size: 16px;
+      line-height: 24px;
+      height: 32px;
+      padding: 0 12px;
+    }
+  }
+
+  &__bottom {
+    padding-top: 0;
+
+    &__collapsible {
+      display: none;
+      flex-direction: column;
+      gap: 16px;
+    }
+
+    &.active {
+      background: var(--modal-background-variant-color);
+      padding-top: 24px;
+
+      .safety-action-modal__bottom__collapsible {
+        display: flex;
+      }
+    }
+  }
+
+  &__actions {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    justify-content: flex-end;
+
+    .link-button {
+      padding: 10px 12px;
+      font-weight: 600;
+    }
+  }
+}
+
 .doodle-modal,
 .boost-modal,
 .confirmation-modal,
@@ -7694,7 +7837,8 @@ img.modal-warning {
   display: flex;
 }
 
-.radio-button {
+.radio-button,
+.check-box {
   font-size: 14px;
   position: relative;
   display: inline-flex;
@@ -7713,17 +7857,19 @@ img.modal-warning {
   }
 
   &__input {
-    display: block;
+    display: flex;
+    align-items: center;
+    justify-content: center;
     position: relative;
     border: 2px solid $secondary-text-color;
     box-sizing: border-box;
-    width: 18px;
-    height: 18px;
+    width: 20px;
+    height: 20px;
     flex: 0 0 auto;
     border-radius: 50%;
 
     &.checked {
-      border-color: $secondary-text-color;
+      border-color: $ui-highlight-color;
 
       &::before {
         position: absolute;
@@ -7732,9 +7878,31 @@ img.modal-warning {
         content: '';
         display: block;
         border-radius: 50%;
-        width: 10px;
-        height: 10px;
-        background: $secondary-text-color;
+        width: 12px;
+        height: 12px;
+        background: $ui-highlight-color;
+      }
+    }
+
+    .icon {
+      width: 18px;
+      height: 18px;
+    }
+  }
+}
+
+.check-box {
+  &__input {
+    width: 18px;
+    height: 18px;
+    border-radius: 2px;
+
+    &.checked {
+      background: $ui-highlight-color;
+      color: $white;
+
+      &::before {
+        display: none;
       }
     }
   }
@@ -9220,22 +9388,36 @@ noscript {
   }
 }
 
+.safety-action-modal,
 .interaction-modal {
   max-width: 90vw;
   width: 600px;
-  background: var(--modal-background-color);
-  border: 1px solid var(--modal-border-color);
-  border-radius: 8px;
+}
+
+.interaction-modal {
   overflow: visible;
   position: relative;
   display: block;
-  padding: 40px;
+  border-radius: 16px;
+  background: var(--modal-background-color);
+  backdrop-filter: var(--background-filter);
+  border: 1px solid var(--modal-border-color);
+  padding: 24px;
+
+  @media screen and (max-width: $no-gap-breakpoint) {
+    border-radius: 16px 16px 0 0;
+    border-bottom: 0;
+    padding-bottom: 32px;
+  }
 
   h3 {
     font-size: 22px;
     line-height: 33px;
     font-weight: 700;
-    text-align: center;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    gap: 8px;
   }
 
   p {
@@ -9256,7 +9438,9 @@ noscript {
 
   &__icon {
     color: $highlight-text-color;
-    margin: 0 5px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
   }
 
   &__lead {
@@ -9289,6 +9473,7 @@ noscript {
         border: 0;
         padding: 15px - 4px 15px - 6px;
         flex: 1 1 auto;
+        min-width: 0;
 
         &::placeholder {
           color: lighten($darker-text-color, 4%);
diff --git a/app/javascript/flavours/glitch/styles/variables.scss b/app/javascript/flavours/glitch/styles/variables.scss
index 70bd86d33cba81..54dc54ac0283ca 100644
--- a/app/javascript/flavours/glitch/styles/variables.scss
+++ b/app/javascript/flavours/glitch/styles/variables.scss
@@ -46,10 +46,10 @@ $ui-button-focus-background-color: $blurple-600 !default;
 $ui-button-focus-outline-color: $blurple-400 !default;
 $ui-button-focus-outline: solid 2px $ui-button-focus-outline-color !default;
 
-$ui-button-secondary-color: $grey-100 !default;
-$ui-button-secondary-border-color: $grey-100 !default;
-$ui-button-secondary-focus-background-color: $grey-600 !default;
-$ui-button-secondary-focus-color: $white !default;
+$ui-button-secondary-color: $blurple-500 !default;
+$ui-button-secondary-border-color: $blurple-500 !default;
+$ui-button-secondary-focus-border-color: $blurple-300 !default;
+$ui-button-secondary-focus-color: $blurple-300 !default;
 
 $ui-button-tertiary-color: $blurple-300 !default;
 $ui-button-tertiary-border-color: $blurple-300 !default;
@@ -104,7 +104,8 @@ $dismiss-overlay-width: 4rem;
   --dropdown-background-color: #{rgba(darken($ui-base-color, 8%), 0.9)};
   --dropdown-shadow: 0 20px 25px -5px #{rgba($base-shadow-color, 0.25)},
     0 8px 10px -6px #{rgba($base-shadow-color, 0.25)};
-  --modal-background-color: #{darken($ui-base-color, 4%)};
+  --modal-background-color: #{rgba(darken($ui-base-color, 8%), 0.7)};
+  --modal-background-variant-color: #{rgba($ui-base-color, 0.7)};
   --modal-border-color: #{lighten($ui-base-color, 4%)};
   --background-border-color: #{lighten($ui-base-color, 4%)};
   --background-filter: blur(10px) saturate(180%) contrast(75%) brightness(70%);

From c511e52d1e67e3aec8571037572c6e1c7a346cd7 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 15 Mar 2024 20:09:21 +0100
Subject: [PATCH 0481/2191] =?UTF-8?q?[Glitch]=20Add=20=E2=80=9CLearn=20mor?=
 =?UTF-8?q?e=E2=80=9D=20on=20block=20modal=20to=20inform=20of=20federation?=
 =?UTF-8?q?=20caveats?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Port d702a03a0c35fc631a0fa456532946e6751cbbfd to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../features/ui/components/block_modal.jsx    | 33 +++++++++++++++++--
 .../flavours/glitch/styles/components.scss    |  9 +++++
 2 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/app/javascript/flavours/glitch/features/ui/components/block_modal.jsx b/app/javascript/flavours/glitch/features/ui/components/block_modal.jsx
index af5479b5fa4774..fa772b067d503d 100644
--- a/app/javascript/flavours/glitch/features/ui/components/block_modal.jsx
+++ b/app/javascript/flavours/glitch/features/ui/components/block_modal.jsx
@@ -1,8 +1,10 @@
 import PropTypes from 'prop-types';
-import { useCallback } from 'react';
+import { useCallback, useState } from 'react';
 
 import { FormattedMessage } from 'react-intl';
 
+import classNames from 'classnames';
+
 import { useDispatch } from 'react-redux';
 
 import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
@@ -17,6 +19,9 @@ import { Icon } from 'flavours/glitch/components/icon';
 
 export const BlockModal = ({ accountId, acct }) => {
   const dispatch = useDispatch();
+  const [expanded, setExpanded] = useState(false);
+
+  const domain = acct.split('@')[1];
 
   const handleClick = useCallback(() => {
     dispatch(closeModal({ modalType: undefined, ignoreFocus: false }));
@@ -27,6 +32,10 @@ export const BlockModal = ({ accountId, acct }) => {
     dispatch(closeModal({ modalType: undefined, ignoreFocus: false }));
   }, [dispatch]);
 
+  const handleToggleLearnMore = useCallback(() => {
+    setExpanded(!expanded);
+  }, [expanded, setExpanded]);
+
   return (
     <div className='modal-root__modal safety-action-modal'>
       <div className='safety-action-modal__top'>
@@ -64,8 +73,28 @@ export const BlockModal = ({ accountId, acct }) => {
         </div>
       </div>
 
-      <div className='safety-action-modal__bottom'>
+      <div className={classNames('safety-action-modal__bottom', { active: expanded })}>
+        {domain && (
+          <div className='safety-action-modal__bottom__collapsible'>
+            <div className='safety-action-modal__caveats'>
+              <FormattedMessage
+                id='block_modal.remote_users_caveat'
+                defaultMessage='We will ask the server {domain} to respect your decision. However, compliance is not guaranteed since some servers may handle blocks differently. Public posts may still be visible to non-logged-in users.'
+                values={{ domain: <strong>{domain}</strong> }}
+              />
+            </div>
+          </div>
+        )}
+
         <div className='safety-action-modal__actions'>
+          {domain && (
+            <button onClick={handleToggleLearnMore} className='link-button'>
+              {expanded ? <FormattedMessage id='block_modal.show_less' defaultMessage='Show less' /> : <FormattedMessage id='block_modal.show_more' defaultMessage='Show more' />}
+            </button>
+          )}
+
+          <div className='spacer' />
+
           <button onClick={handleCancel} className='link-button'>
             <FormattedMessage id='confirmation_modal.cancel' defaultMessage='Cancel' />
           </button>
diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index 35017778737e6e..8c74f6d2d08ccd 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -6420,6 +6420,15 @@ a.status-card {
     }
   }
 
+  &__caveats {
+    font-size: 14px;
+    padding: 0 12px;
+
+    strong {
+      font-weight: 500;
+    }
+  }
+
   &__bottom {
     padding-top: 0;
 

From 726e7ad0248495951c767197c06dc7127945569f Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Sat, 16 Mar 2024 02:11:59 +0100
Subject: [PATCH 0482/2191] Fix extra separator besides favourite count on
 private posts (#29605)

---
 .../mastodon/features/status/components/detailed_status.jsx     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/features/status/components/detailed_status.jsx b/app/javascript/mastodon/features/status/components/detailed_status.jsx
index 45935716ca4335..8843619bc93737 100644
--- a/app/javascript/mastodon/features/status/components/detailed_status.jsx
+++ b/app/javascript/mastodon/features/status/components/detailed_status.jsx
@@ -304,7 +304,7 @@ class DetailedStatus extends ImmutablePureComponent {
 
             <div className='detailed-status__meta__line'>
               {reblogLink}
-              ·
+              {reblogLink && <>·</>}
               {favouriteLink}
             </div>
           </div>

From 82c2af0356ff888e9665b5b08fda58c7722be637 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Sat, 16 Mar 2024 17:38:20 +0100
Subject: [PATCH 0483/2191] Fix `user_mailer.welcome.hashtags_recent_count` not
 having plural form (#29607)

---
 app/views/application/mailer/_hashtag.html.haml | 2 +-
 app/views/user_mailer/welcome.text.erb          | 2 +-
 config/locales/en.yml                           | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/views/application/mailer/_hashtag.html.haml b/app/views/application/mailer/_hashtag.html.haml
index 524fd7e274b805..fcedfa80a5e247 100644
--- a/app/views/application/mailer/_hashtag.html.haml
+++ b/app/views/application/mailer/_hashtag.html.haml
@@ -17,4 +17,4 @@
                           %span.email-mini-hashtag-img-span
                             = image_tag full_asset_url(account.avatar.url), alt: '', width: 16, height: 16
                       %td
-                        %p= t('user_mailer.welcome.hashtags_recent_count', people: number_with_delimiter(hashtag.history.aggregate(2.days.ago.to_date..Time.zone.today).accounts), days: 2)
+                        %p= t('user_mailer.welcome.hashtags_recent_count', people: number_with_delimiter(hashtag.history.aggregate(2.days.ago.to_date..Time.zone.today).accounts))
diff --git a/app/views/user_mailer/welcome.text.erb b/app/views/user_mailer/welcome.text.erb
index 150944605f09d8..d9da2997daecd7 100644
--- a/app/views/user_mailer/welcome.text.erb
+++ b/app/views/user_mailer/welcome.text.erb
@@ -53,7 +53,7 @@
 <%= t('user_mailer.welcome.hashtags_subtitle') %>
 
 <%- @tags.each do |tag| %>
-* #<%= tag.display_name %> · <%= t('user_mailer.welcome.hashtags_recent_count', people: number_with_delimiter(tag.history.aggregate(2.days.ago.to_date..Time.zone.today).accounts), days: 2) %>
+* #<%= tag.display_name %> · <%= t('user_mailer.welcome.hashtags_recent_count', people: number_with_delimiter(tag.history.aggregate(2.days.ago.to_date..Time.zone.today).accounts)) %>
   <%= tag_url(tag) %>
 <%- end %>
 
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 8199fa52c7b06b..c874a712da59d4 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1868,7 +1868,9 @@ en:
       follows_subtitle: Follow well-known accounts
       follows_title: Who to follow
       follows_view_more: View more people to follow
-      hashtags_recent_count: "%{people} people in the past %{days} days"
+      hashtags_recent_count:
+        one: "%{people} person in the past 2 days"
+        other: "%{people} people in the past 2 days"
       hashtags_subtitle: Explore what’s trending since past 2 days
       hashtags_title: Trending hashtags
       hashtags_view_more: View more trending hashtags

From 04817e965a4a18d345c432cd416e4ec57165a8ed Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 18 Mar 2024 09:47:48 +0100
Subject: [PATCH 0484/2191] New Crowdin Translations (automated) (#29623)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/af.json      |  3 -
 app/javascript/mastodon/locales/an.json      |  8 ---
 app/javascript/mastodon/locales/ar.json      |  8 ---
 app/javascript/mastodon/locales/ast.json     |  5 --
 app/javascript/mastodon/locales/be.json      | 47 ++++++++++---
 app/javascript/mastodon/locales/bg.json      | 65 +++++++++++++++---
 app/javascript/mastodon/locales/bn.json      |  8 ---
 app/javascript/mastodon/locales/br.json      | 12 ++--
 app/javascript/mastodon/locales/bs.json      |  1 -
 app/javascript/mastodon/locales/ca.json      | 50 +++++++++++---
 app/javascript/mastodon/locales/ckb.json     |  8 ---
 app/javascript/mastodon/locales/co.json      |  8 ---
 app/javascript/mastodon/locales/cs.json      |  8 ---
 app/javascript/mastodon/locales/cy.json      |  8 ---
 app/javascript/mastodon/locales/da.json      | 45 ++++++++++---
 app/javascript/mastodon/locales/de.json      | 49 +++++++++++---
 app/javascript/mastodon/locales/el.json      |  8 ---
 app/javascript/mastodon/locales/en-GB.json   |  8 ---
 app/javascript/mastodon/locales/eo.json      |  8 ---
 app/javascript/mastodon/locales/es-AR.json   | 47 ++++++++++---
 app/javascript/mastodon/locales/es-MX.json   | 47 ++++++++++---
 app/javascript/mastodon/locales/es.json      | 49 +++++++++++---
 app/javascript/mastodon/locales/et.json      | 21 +++---
 app/javascript/mastodon/locales/eu.json      | 47 ++++++++++---
 app/javascript/mastodon/locales/fa.json      |  8 ---
 app/javascript/mastodon/locales/fi.json      | 49 +++++++++++---
 app/javascript/mastodon/locales/fil.json     |  3 -
 app/javascript/mastodon/locales/fo.json      | 47 ++++++++++---
 app/javascript/mastodon/locales/fr-CA.json   | 10 +--
 app/javascript/mastodon/locales/fr.json      | 10 +--
 app/javascript/mastodon/locales/fy.json      |  8 ---
 app/javascript/mastodon/locales/ga.json      |  8 ---
 app/javascript/mastodon/locales/gd.json      | 68 ++++++++++++++++---
 app/javascript/mastodon/locales/gl.json      |  8 ---
 app/javascript/mastodon/locales/he.json      | 47 ++++++++++---
 app/javascript/mastodon/locales/hi.json      | 33 ++++++---
 app/javascript/mastodon/locales/hr.json      |  7 --
 app/javascript/mastodon/locales/hu.json      | 55 +++++++++++----
 app/javascript/mastodon/locales/hy.json      |  8 ---
 app/javascript/mastodon/locales/ia.json      |  7 +-
 app/javascript/mastodon/locales/id.json      |  8 ---
 app/javascript/mastodon/locales/ie.json      | 14 ++--
 app/javascript/mastodon/locales/ig.json      |  1 -
 app/javascript/mastodon/locales/io.json      |  8 ---
 app/javascript/mastodon/locales/is.json      | 47 ++++++++++---
 app/javascript/mastodon/locales/it.json      |  8 ---
 app/javascript/mastodon/locales/ja.json      | 10 +--
 app/javascript/mastodon/locales/ka.json      |  4 --
 app/javascript/mastodon/locales/kab.json     | 34 +++++++---
 app/javascript/mastodon/locales/kk.json      |  6 --
 app/javascript/mastodon/locales/kn.json      |  1 -
 app/javascript/mastodon/locales/ko.json      | 47 ++++++++++---
 app/javascript/mastodon/locales/ku.json      |  8 ---
 app/javascript/mastodon/locales/kw.json      |  8 ---
 app/javascript/mastodon/locales/la.json      |  1 -
 app/javascript/mastodon/locales/lad.json     | 17 ++---
 app/javascript/mastodon/locales/lt.json      | 21 +++---
 app/javascript/mastodon/locales/lv.json      | 10 +--
 app/javascript/mastodon/locales/mk.json      |  5 --
 app/javascript/mastodon/locales/ml.json      |  5 --
 app/javascript/mastodon/locales/mr.json      |  1 -
 app/javascript/mastodon/locales/ms.json      |  8 ---
 app/javascript/mastodon/locales/my.json      |  8 ---
 app/javascript/mastodon/locales/ne.json      |  4 ++
 app/javascript/mastodon/locales/nl.json      | 65 +++++++++++++-----
 app/javascript/mastodon/locales/nn.json      | 24 ++++---
 app/javascript/mastodon/locales/no.json      |  8 ---
 app/javascript/mastodon/locales/oc.json      |  8 ---
 app/javascript/mastodon/locales/pa.json      |  3 -
 app/javascript/mastodon/locales/pl.json      | 47 ++++++++++---
 app/javascript/mastodon/locales/pt-BR.json   | 21 +++---
 app/javascript/mastodon/locales/pt-PT.json   |  8 ---
 app/javascript/mastodon/locales/ro.json      |  8 ---
 app/javascript/mastodon/locales/ru.json      |  8 ---
 app/javascript/mastodon/locales/ry.json      | 39 ++++++++++-
 app/javascript/mastodon/locales/sa.json      |  8 ---
 app/javascript/mastodon/locales/sc.json      |  8 ---
 app/javascript/mastodon/locales/sco.json     |  8 ---
 app/javascript/mastodon/locales/si.json      |  6 --
 app/javascript/mastodon/locales/sk.json      |  9 +--
 app/javascript/mastodon/locales/sl.json      | 47 ++++++++++---
 app/javascript/mastodon/locales/sq.json      | 50 +++++++++++---
 app/javascript/mastodon/locales/sr-Latn.json |  8 ---
 app/javascript/mastodon/locales/sr.json      | 38 ++++++++---
 app/javascript/mastodon/locales/sv.json      | 31 ++++++---
 app/javascript/mastodon/locales/szl.json     |  1 -
 app/javascript/mastodon/locales/ta.json      |  6 --
 app/javascript/mastodon/locales/tai.json     |  1 -
 app/javascript/mastodon/locales/te.json      |  4 --
 app/javascript/mastodon/locales/th.json      | 50 +++++++++++---
 app/javascript/mastodon/locales/tok.json     |  7 --
 app/javascript/mastodon/locales/tr.json      | 47 ++++++++++---
 app/javascript/mastodon/locales/tt.json      |  7 --
 app/javascript/mastodon/locales/ug.json      |  1 -
 app/javascript/mastodon/locales/uk.json      |  8 ---
 app/javascript/mastodon/locales/ur.json      |  6 --
 app/javascript/mastodon/locales/uz.json      |  8 ---
 app/javascript/mastodon/locales/vi.json      | 50 +++++++++++---
 app/javascript/mastodon/locales/zgh.json     |  2 -
 app/javascript/mastodon/locales/zh-CN.json   | 49 +++++++++++---
 app/javascript/mastodon/locales/zh-HK.json   | 70 +++++++++++++++++---
 app/javascript/mastodon/locales/zh-TW.json   | 49 +++++++++++---
 config/locales/be.yml                        |  6 +-
 config/locales/bg.yml                        |  4 +-
 config/locales/ca.yml                        |  8 ++-
 config/locales/cy.yml                        |  1 -
 config/locales/da.yml                        |  4 +-
 config/locales/de.yml                        |  6 +-
 config/locales/es-AR.yml                     |  4 +-
 config/locales/es-MX.yml                     |  1 -
 config/locales/es.yml                        |  4 +-
 config/locales/et.yml                        |  1 -
 config/locales/eu.yml                        |  4 +-
 config/locales/fi.yml                        | 10 +--
 config/locales/fo.yml                        |  1 -
 config/locales/fr-CA.yml                     |  1 -
 config/locales/fr.yml                        |  1 -
 config/locales/fy.yml                        |  1 -
 config/locales/gd.yml                        | 12 ++--
 config/locales/gl.yml                        |  1 -
 config/locales/he.yml                        |  6 +-
 config/locales/hu.yml                        | 12 ++--
 config/locales/ie.yml                        |  1 -
 config/locales/is.yml                        |  4 +-
 config/locales/it.yml                        |  1 -
 config/locales/ja.yml                        |  1 -
 config/locales/kab.yml                       |  3 +
 config/locales/ko.yml                        |  4 +-
 config/locales/lad.yml                       |  2 +-
 config/locales/lt.yml                        |  1 -
 config/locales/nl.yml                        | 44 ++++++------
 config/locales/nn.yml                        |  1 -
 config/locales/no.yml                        |  1 -
 config/locales/pl.yml                        |  6 +-
 config/locales/pt-PT.yml                     |  1 -
 config/locales/ro.yml                        | 39 +++++++++++
 config/locales/simple_form.de.yml            |  2 +-
 config/locales/simple_form.hu.yml            |  6 +-
 config/locales/simple_form.kab.yml           |  5 +-
 config/locales/simple_form.pt-BR.yml         |  3 +
 config/locales/simple_form.zh-HK.yml         |  4 ++
 config/locales/sl.yml                        |  1 -
 config/locales/sq.yml                        |  4 +-
 config/locales/sr-Latn.yml                   |  1 -
 config/locales/sr.yml                        |  5 +-
 config/locales/sv.yml                        |  4 +-
 config/locales/th.yml                        |  3 +-
 config/locales/tr.yml                        |  4 +-
 config/locales/vi.yml                        |  1 -
 config/locales/zh-CN.yml                     |  3 +-
 config/locales/zh-HK.yml                     | 41 ++++++++++++
 config/locales/zh-TW.yml                     |  3 +-
 152 files changed, 1533 insertions(+), 800 deletions(-)

diff --git a/app/javascript/mastodon/locales/af.json b/app/javascript/mastodon/locales/af.json
index baa7e7bf709460..e4f7f12b0edcfb 100644
--- a/app/javascript/mastodon/locales/af.json
+++ b/app/javascript/mastodon/locales/af.json
@@ -119,9 +119,7 @@
   "compose_form.spoiler.marked": "Verwyder inhoudswaarskuwing",
   "compose_form.spoiler.unmarked": "Voeg inhoudswaarskuwing by",
   "confirmation_modal.cancel": "Kanselleer",
-  "confirmations.block.block_and_report": "Blokkeer en rapporteer",
   "confirmations.block.confirm": "Blokkeer",
-  "confirmations.block.message": "Is jy seker jy wil {name} blokkeer?",
   "confirmations.cancel_follow_request.confirm": "Herroep versoek",
   "confirmations.cancel_follow_request.message": "Is jy seker jy wil jou versoek om {name} te volg, terugtrek?",
   "confirmations.delete.confirm": "Wis uit",
@@ -129,7 +127,6 @@
   "confirmations.delete_list.confirm": "Wis uit",
   "confirmations.delete_list.message": "Is jy seker jy wil hierdie lys permanent verwyder?",
   "confirmations.discard_edit_media.confirm": "Gooi weg",
-  "confirmations.domain_block.confirm": "Blokkeer die hele domein",
   "confirmations.logout.confirm": "Teken Uit",
   "confirmations.logout.message": "Is jy seker jy wil uitteken?",
   "confirmations.reply.confirm": "Antwoord",
diff --git a/app/javascript/mastodon/locales/an.json b/app/javascript/mastodon/locales/an.json
index 31642e604bcfed..3f1fd376ff46ec 100644
--- a/app/javascript/mastodon/locales/an.json
+++ b/app/javascript/mastodon/locales/an.json
@@ -132,9 +132,7 @@
   "compose_form.spoiler.marked": "Texto amagau dimpués de l'alvertencia",
   "compose_form.spoiler.unmarked": "Texto no amagau",
   "confirmation_modal.cancel": "Cancelar",
-  "confirmations.block.block_and_report": "Blocar y Denunciar",
   "confirmations.block.confirm": "Blocar",
-  "confirmations.block.message": "Yes seguro que quiers blocar a {name}?",
   "confirmations.cancel_follow_request.confirm": "Retirar solicitut",
   "confirmations.cancel_follow_request.message": "Yes seguro que deseyas retirar la tuya solicitut pa seguir a {name}?",
   "confirmations.delete.confirm": "Eliminar",
@@ -143,13 +141,10 @@
   "confirmations.delete_list.message": "Seguro que quiers borrar esta lista permanentment?",
   "confirmations.discard_edit_media.confirm": "Descartar",
   "confirmations.discard_edit_media.message": "Tiens cambios sin alzar en a descripción u vista previa d'o fichero audiovisual, descartar-los de totz modos?",
-  "confirmations.domain_block.confirm": "Amagar dominio entero",
   "confirmations.domain_block.message": "Yes seguro que quiers blocar lo dominio {domain} entero? En cheneral ye prou, y preferible, fer uns quantos bloqueyos y silenciaus concretos. Los tuyos seguidros d'ixe dominio serán eliminaus.",
   "confirmations.logout.confirm": "Zarrar sesión",
   "confirmations.logout.message": "Yes seguro de querer zarrar la sesión?",
   "confirmations.mute.confirm": "Silenciar",
-  "confirmations.mute.explanation": "Esto amagará las publicacions d'ells y en as qualas los has mencionau, pero les permitirá veyer los tuyos mensaches y seguir-te.",
-  "confirmations.mute.message": "Yes seguro que quiers silenciar a {name}?",
   "confirmations.redraft.confirm": "Borrar y tornar ta borrador",
   "confirmations.reply.confirm": "Responder",
   "confirmations.reply.message": "Responder sobrescribirá lo mensache que yes escribindo. Yes seguro que deseyas continar?",
@@ -323,9 +318,6 @@
   "load_pending": "{count, plural, one {# nuevo elemento} other {# nuevos elementos}}",
   "media_gallery.toggle_visible": "{number, plural, one {Amaga la imachen} other {Amaga las imáchens}}",
   "moved_to_account_banner.text": "La tuya cuenta {disabledAccount} ye actualment deshabilitada perque t'has mudau a {movedToAccount}.",
-  "mute_modal.duration": "Duración",
-  "mute_modal.hide_notifications": "Amagar notificacions d'este usuario?",
-  "mute_modal.indefinite": "Indefinida",
   "navigation_bar.about": "Sobre",
   "navigation_bar.blocks": "Usuarios blocaus",
   "navigation_bar.bookmarks": "Marcadors",
diff --git a/app/javascript/mastodon/locales/ar.json b/app/javascript/mastodon/locales/ar.json
index 17071aae48f056..747c47960fca68 100644
--- a/app/javascript/mastodon/locales/ar.json
+++ b/app/javascript/mastodon/locales/ar.json
@@ -160,9 +160,7 @@
   "compose_form.spoiler.unmarked": "إضافة تحذير للمحتوى",
   "compose_form.spoiler_placeholder": "تحذير المحتوى (اختياري)",
   "confirmation_modal.cancel": "إلغاء",
-  "confirmations.block.block_and_report": "حظره والإبلاغ عنه",
   "confirmations.block.confirm": "حظر",
-  "confirmations.block.message": "هل أنتَ مُتأكدٌ أنكَ تُريدُ حَظرَ {name}؟",
   "confirmations.cancel_follow_request.confirm": "إلغاء الطلب",
   "confirmations.cancel_follow_request.message": "متأكد من أنك تريد إلغاء طلب متابعتك لـ {name}؟",
   "confirmations.delete.confirm": "حذف",
@@ -171,15 +169,12 @@
   "confirmations.delete_list.message": "هل أنتَ مُتأكدٌ أنكَ تُريدُ حَذفَ هذِهِ القائمة بشكلٍ دائم؟",
   "confirmations.discard_edit_media.confirm": "تجاهل",
   "confirmations.discard_edit_media.message": "لديك تغييرات غير محفوظة لوصف الوسائط أو معاينتها، أتريد تجاهلها على أي حال؟",
-  "confirmations.domain_block.confirm": "حظر اِسم النِّطاق بشكلٍ كامل",
   "confirmations.domain_block.message": "متأكد من أنك تود حظر اسم النطاق {domain} بالكامل ؟ في غالب الأحيان يُستَحسَن كتم أو حظر بعض الحسابات بدلا من حظر نطاق بالكامل.\nلن تتمكن مِن رؤية محتوى هذا النطاق لا على خيوطك العمومية و لا في إشعاراتك. سوف يتم كذلك إزالة كافة متابعيك المنتمين إلى هذا النطاق.",
   "confirmations.edit.confirm": "تعديل",
   "confirmations.edit.message": "التعديل في الحين سوف يُعيد كتابة الرسالة التي أنت بصدد تحريرها. متأكد من أنك تريد المواصلة؟",
   "confirmations.logout.confirm": "خروج",
   "confirmations.logout.message": "متأكد من أنك تريد الخروج؟",
   "confirmations.mute.confirm": "أكتم",
-  "confirmations.mute.explanation": "هذا سيخفي المنشورات عنهم وتلك المشار فيها إليهم، لكنه سيسمح لهم برؤية منشوراتك ومتابعتك.",
-  "confirmations.mute.message": "هل أنت متأكد أنك تريد كتم {name} ؟",
   "confirmations.redraft.confirm": "إزالة وإعادة الصياغة",
   "confirmations.redraft.message": "هل أنت متأكد من أنك تريد حذف هذا المنشور و إعادة صياغته؟ سوف تفقد جميع الإعجابات و الترقيات أما الردود المتصلة به فستُصبِح يتيمة.",
   "confirmations.reply.confirm": "رد",
@@ -399,9 +394,6 @@
   "loading_indicator.label": "جاري التحميل…",
   "media_gallery.toggle_visible": "{number, plural, zero {} one {اخف الصورة} two {اخف الصورتين} few {اخف الصور} many {اخف الصور} other {اخف الصور}}",
   "moved_to_account_banner.text": "حسابك {disabledAccount} معطل حاليًا لأنك انتقلت إلى {movedToAccount}.",
-  "mute_modal.duration": "المدة",
-  "mute_modal.hide_notifications": "هل تود إخفاء الإخطارات القادمة من هذا المستخدم ؟",
-  "mute_modal.indefinite": "إلى أجل غير مسمى",
   "navigation_bar.about": "عن",
   "navigation_bar.advanced_interface": "افتحه في واجهة الويب المتقدمة",
   "navigation_bar.blocks": "الحسابات المحجوبة",
diff --git a/app/javascript/mastodon/locales/ast.json b/app/javascript/mastodon/locales/ast.json
index de5e310d5af317..b5015c75d893c1 100644
--- a/app/javascript/mastodon/locales/ast.json
+++ b/app/javascript/mastodon/locales/ast.json
@@ -112,16 +112,13 @@
   "compose_form.poll.type": "Estilu",
   "compose_form.publish_form": "Artículu nuevu",
   "confirmation_modal.cancel": "Encaboxar",
-  "confirmations.block.block_and_report": "Bloquiar ya informar",
   "confirmations.block.confirm": "Bloquiar",
-  "confirmations.block.message": "¿De xuru que quies bloquiar a {name}?",
   "confirmations.cancel_follow_request.confirm": "Retirala",
   "confirmations.cancel_follow_request.message": "¿De xuru que quies retirar la solicitú pa siguir a {name}?",
   "confirmations.delete.confirm": "Desaniciar",
   "confirmations.delete.message": "¿De xuru que quies desaniciar esti artículu?",
   "confirmations.delete_list.confirm": "Desaniciar",
   "confirmations.discard_edit_media.confirm": "Escartar",
-  "confirmations.domain_block.confirm": "Bloquiar tol dominiu",
   "confirmations.edit.message": "La edición va sobrescribir el mensaxe que tas escribiendo. ¿De xuru que quies siguir?",
   "confirmations.logout.confirm": "Zarrar la sesión",
   "confirmations.logout.message": "¿De xuru que quies zarrar la sesión?",
@@ -277,8 +274,6 @@
   "lists.subheading": "Les tos llistes",
   "load_pending": "{count, plural, one {# elementu nuevu} other {# elementos nuevos}}",
   "media_gallery.toggle_visible": "{number, plural, one {Anubrir la imaxe} other {Anubrir les imáxenes}}",
-  "mute_modal.duration": "Duración",
-  "mute_modal.hide_notifications": "¿Quies anubrir los avisos d'esti perfil?",
   "navigation_bar.about": "Tocante a",
   "navigation_bar.blocks": "Perfiles bloquiaos",
   "navigation_bar.bookmarks": "Marcadores",
diff --git a/app/javascript/mastodon/locales/be.json b/app/javascript/mastodon/locales/be.json
index 21e2622ba9c920..1ff94eca6c7096 100644
--- a/app/javascript/mastodon/locales/be.json
+++ b/app/javascript/mastodon/locales/be.json
@@ -89,6 +89,14 @@
   "announcement.announcement": "Аб'ява",
   "attachments_list.unprocessed": "(неапрацаваны)",
   "audio.hide": "Схаваць аўдыя",
+  "block_modal.remote_users_caveat": "Мы папросім сервер {domain} паважаць ваш выбар. Аднак гэта не гарантуецца, паколькі некаторыя серверы могуць апрацоўваць блакіроўкі іншым чынам. Публічныя паведамленні могуць заставацца бачнымі для ананімных карыстальнікаў.",
+  "block_modal.show_less": "Паказаць меньш",
+  "block_modal.show_more": "Паказаць больш",
+  "block_modal.they_cant_mention": "Карыстальнік не зможа згадваць або сачыць за вамі.",
+  "block_modal.they_cant_see_posts": "Карыстальнік не будзе бачыць вашых допісаў, а вы — карыстальніка.",
+  "block_modal.they_will_know": "Карыстальнік убачыць, што адбылася блакіроўка.",
+  "block_modal.title": "Заблакіраваць карыстальніка?",
+  "block_modal.you_wont_see_mentions": "Вы не ўбачыце паведамленняў са згадваннем карыстальніка.",
   "boost_modal.combo": "Націсніце {combo}, каб прапусціць наступным разам",
   "bundle_column_error.copy_stacktrace": "Скапіраваць справаздачу пра памылку",
   "bundle_column_error.error.body": "Запытаная старонка не можа быць адлюстраваная. Гэта магло стацца праз хібу ў нашым кодзе, або праз памылку сумяшчальнасці з браўзерам.",
@@ -160,9 +168,7 @@
   "compose_form.spoiler.unmarked": "Дадаць папярэджанне аб змесціве",
   "compose_form.spoiler_placeholder": "Папярэджанне аб змесціве (неабавязкова)",
   "confirmation_modal.cancel": "Скасаваць",
-  "confirmations.block.block_and_report": "Заблакіраваць і паскардзіцца",
   "confirmations.block.confirm": "Заблакіраваць",
-  "confirmations.block.message": "Вы ўпэўненыя што хочаце заблакіраваць {name}?",
   "confirmations.cancel_follow_request.confirm": "Скасаваць запыт",
   "confirmations.cancel_follow_request.message": "Сапраўды хочаце скасаваць свой запыт на падпіску на {name}?",
   "confirmations.delete.confirm": "Выдаліць",
@@ -171,15 +177,13 @@
   "confirmations.delete_list.message": "Вы ўпэўненыя, што хочаце беззваротна выдаліць гэты чарнавік?",
   "confirmations.discard_edit_media.confirm": "Адмяніць",
   "confirmations.discard_edit_media.message": "У вас ёсць незахаваныя змены ў апісанні або прэв'ю, усе роўна скасаваць іх?",
-  "confirmations.domain_block.confirm": "Заблакіраваць дамен цалкам",
+  "confirmations.domain_block.confirm": "Заблакіраваць сервер",
   "confirmations.domain_block.message": "Вы абсалютна дакладна ўпэўнены, што хочаце заблакіраваць {domain} зусім? У большасці выпадкаў, дастаткова некалькіх мэтавых блакіровак ці ігнараванняў. Вы перастанеце бачыць змесціва з гэтага дамену ва ўсіх стужках і апавяшчэннях. Вашы падпіскі з гэтага дамену будуць выдаленыя.",
   "confirmations.edit.confirm": "Рэдагаваць",
   "confirmations.edit.message": "Калі вы зменіце зараз, гэта ператрэ паведамленне, якое вы пішаце. Вы ўпэўнены, што хочаце працягнуць?",
   "confirmations.logout.confirm": "Выйсці",
   "confirmations.logout.message": "Вы ўпэўненыя, што хочаце выйсці?",
   "confirmations.mute.confirm": "Ігнараваць",
-  "confirmations.mute.explanation": "Гэта схавае допісы ад гэтага карыстальніка і пра яго, але ўсё яшчэ дазволіць яму чытаць вашыя допісы і быць падпісаным на вас.",
-  "confirmations.mute.message": "Вы ўпэўненыя, што хочаце ігнараваць {name}?",
   "confirmations.redraft.confirm": "Выдаліць і перапісаць",
   "confirmations.redraft.message": "Вы ўпэўнены, што хочаце выдаліць допіс і перапісаць яго? Упадабанні і пашырэнні згубяцца, а адказы да арыгінальнага допісу асірацеюць.",
   "confirmations.reply.confirm": "Адказаць",
@@ -205,6 +209,27 @@
   "dismissable_banner.explore_statuses": "Допісы з гэтага і іншых сервераў дэцэнтралізаванай сеткі, якія набіраюць папулярнасць прама зараз.",
   "dismissable_banner.explore_tags": "Гэтыя хэштэгі зараз набіраюць папулярнасць сярод людзей на гэтым і іншых серверах дэцэнтралізаванай сеткі",
   "dismissable_banner.public_timeline": "Гэта апошнія публічныя допісы людзей з усей сеткі, за якімі сочаць карыстальнікі {domain}.",
+  "domain_block_modal.block": "Заблакіраваць сервер",
+  "domain_block_modal.block_account_instead": "Заблакіраваць @{name} замест гэтага",
+  "domain_block_modal.they_can_interact_with_old_posts": "Людзі з гэтага сервера змогуць узаемадзейнічаць з вашымі старымі допісамі.",
+  "domain_block_modal.they_cant_follow": "Ніхто з гэтага сервера не зможа падпісацца на вас.",
+  "domain_block_modal.they_wont_know": "Карыстальнік не будзе ведаць пра блакіроўку.",
+  "domain_block_modal.title": "Заблакіраваць дамен?",
+  "domain_block_modal.you_will_lose_followers": "Усе падпісчыкі з гэтага сервера будуць выдаленыя.",
+  "domain_block_modal.you_wont_see_posts": "Вы не ўбачыце допісаў і апавяшчэнняў ад карыстальнікаў з гэтага сервера.",
+  "domain_pill.activitypub_lets_connect": "Ён дазваляе вам узаемадзейнічаць не толькі з карыстальнікамі Mastodon, але і розных іншых сацыяльных платформ.",
+  "domain_pill.activitypub_like_language": "ActivityPub — гэта мова, на якой Mastodon размаўляе з іншымі сацыяльнымі сеткамі.",
+  "domain_pill.server": "Сервер",
+  "domain_pill.their_handle": "Ідэнтыфікатар карыстальніка:",
+  "domain_pill.their_server": "Лічбавы дом, дзе захоўваюцца ўсе допісы.",
+  "domain_pill.their_username": "Унікальны ідэнтыфікатар карыстальніка на серверы. Можна знайсці карыстальнікаў з аднолькавым іменем карыстальніка на розных серверах.",
+  "domain_pill.username": "Імя карыстальніка",
+  "domain_pill.whats_in_a_handle": "Што такое ідэнтыфікатар карыстальніка?",
+  "domain_pill.who_they_are": "Паколькі ідэнтыфікатары кажуць аб тым, хто гэты чалавек і якім серверам ён карыстаецца, вы можаце ўзаемадзейнічаць з карыстальнікамі <button> платформ, якія падтрымліваюць ActivityPub</button>.",
+  "domain_pill.who_you_are": "Паколькі ваш ідэнтыфікатар кажа аб тым, хто вы і дзе знаходзіцеся, людзі могуць узаемадзейнічаць з вамі ў сацыяльнай сетцы <button> на платформах, якія падтрымліваюць ActivityPub</button>.",
+  "domain_pill.your_handle": "Ваш ідэнтыфікатар:",
+  "domain_pill.your_server": "Ваш лічбавы дом, дзе захоўваюцца ўсе вашыя допісы. Не падабаецца гэты сервер? Змяніце сервер у любы час з захаваннем сваіх падпісчыкаў.",
+  "domain_pill.your_username": "Ваш унікальны ідэнтыфікатар на гэтым серверы. Можна знайсці карыстальнікаў з аднолькавым іменем карыстальніка на розных серверах.",
   "embed.instructions": "Убудуйце гэты пост на свой сайт, скапіраваўшы прыведзены ніжэй код",
   "embed.preview": "Вось як гэта будзе выглядаць:",
   "emoji_button.activity": "Актыўнасць",
@@ -402,9 +427,15 @@
   "loading_indicator.label": "Загрузка…",
   "media_gallery.toggle_visible": "{number, plural, one {Схаваць відарыс} other {Схаваць відарысы}}",
   "moved_to_account_banner.text": "Ваш уліковы запіс {disabledAccount} зараз адключаны таму што вы перанесены на {movedToAccount}.",
-  "mute_modal.duration": "Працягласць",
-  "mute_modal.hide_notifications": "Схаваць апавяшчэнні ад гэтага карыстальніка?",
-  "mute_modal.indefinite": "Бестэрмінова",
+  "mute_modal.hide_from_notifications": "Схаваць з апавяшчэнняў",
+  "mute_modal.hide_options": "Схаваць опцыі",
+  "mute_modal.indefinite": "Пакуль я не прыбяру ігнараванне",
+  "mute_modal.show_options": "Паказаць опцыі",
+  "mute_modal.they_can_mention_and_follow": "Карыстальнік зможа згадваць вас і падпісацца на вас, але вы гэтага не ўбачыце.",
+  "mute_modal.they_wont_know": "Карыстальнік не будзе ведаць пра ігнараванне.",
+  "mute_modal.title": "Ігнараваць карыстальніка?",
+  "mute_modal.you_wont_see_mentions": "Вы не ўбачыце паведамленняў са згадваннем карыстальніка.",
+  "mute_modal.you_wont_see_posts": "Карыстальнік па-ранейшаму будзе бачыць вашыя паведамленні, але вы не будзеце паведамленні карыстальніка.",
   "navigation_bar.about": "Пра нас",
   "navigation_bar.advanced_interface": "Адкрыць у пашыраным вэб-інтэрфейсе",
   "navigation_bar.blocks": "Заблакаваныя карыстальнікі",
diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json
index ab6468d8e8fa08..adc974bee8ff68 100644
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@@ -89,6 +89,14 @@
   "announcement.announcement": "Оповестяване",
   "attachments_list.unprocessed": "(необработено)",
   "audio.hide": "Скриване на звука",
+  "block_modal.remote_users_caveat": "Ще поискаме сървърът {domain} да почита решението ви. Съгласието обаче не се гарантира откак някои сървъри могат да боравят с блоковете по различен начин. Обществените публикации още може да се виждат от невлезли в системата потребители.",
+  "block_modal.show_less": "Повече на показ",
+  "block_modal.show_more": "По-малко на показ",
+  "block_modal.they_cant_mention": "Те не могат да ви споменават или последват.",
+  "block_modal.they_cant_see_posts": "Те не могат да виждат публикациите ви, а и вие не можете да виждате техните.",
+  "block_modal.they_will_know": "Те могат да видят, че са блокирани.",
+  "block_modal.title": "Блокирате ли потребителя?",
+  "block_modal.you_wont_see_mentions": "Няма да виждате публикациите, които ги споменават.",
   "boost_modal.combo": "Можете да натиснете {combo}, за да пропуснете това следващия път",
   "bundle_column_error.copy_stacktrace": "Копиране на доклада за грешката",
   "bundle_column_error.error.body": "Заявената страница не може да се изобрази. Това може да е заради грешка в кода ни или проблем със съвместимостта на браузъра.",
@@ -160,9 +168,7 @@
   "compose_form.spoiler.unmarked": "Добавяне на предупреждение за съдържание",
   "compose_form.spoiler_placeholder": "Предупреждение за съдържание (по избор)",
   "confirmation_modal.cancel": "Отказ",
-  "confirmations.block.block_and_report": "Блокиране и докладване",
   "confirmations.block.confirm": "Блокиране",
-  "confirmations.block.message": "Наистина ли искате да блокирате {name}?",
   "confirmations.cancel_follow_request.confirm": "Оттегляне на заявката",
   "confirmations.cancel_follow_request.message": "Наистина ли искате да оттеглите заявката си за последване на {name}?",
   "confirmations.delete.confirm": "Изтриване",
@@ -171,15 +177,13 @@
   "confirmations.delete_list.message": "Наистина ли искате да изтриете завинаги списъка?",
   "confirmations.discard_edit_media.confirm": "Отхвърляне",
   "confirmations.discard_edit_media.message": "Не сте запазили промени на описанието или огледа на мултимедията, отхвърляте ли ги?",
-  "confirmations.domain_block.confirm": "Блокиране на целия домейн",
+  "confirmations.domain_block.confirm": "Блокиране на сървър",
   "confirmations.domain_block.message": "Наистина ли искате да блокирате целия {domain}? В повечето случаи няколко блокирания или заглушавания са достатъчно и за предпочитане. Няма да виждате съдържание от домейна из публични часови оси или известията си. Вашите последователи от този домейн ще се премахнат.",
   "confirmations.edit.confirm": "Редактиране",
   "confirmations.edit.message": "Редактирането сега ще замени съобщението, което в момента съставяте. Сигурни ли сте, че искате да продължите?",
   "confirmations.logout.confirm": "Излизане",
   "confirmations.logout.message": "Наистина ли искате да излезете?",
   "confirmations.mute.confirm": "Заглушаване",
-  "confirmations.mute.explanation": "Това ще скрие публикациите от тях и публикации, които ги споменават, но все още ще им позволява да виждат публикациите ви и да ви следват.",
-  "confirmations.mute.message": "Наистина ли искате да заглушите {name}?",
   "confirmations.redraft.confirm": "Изтриване и преработване",
   "confirmations.redraft.message": "Наистина ли искате да изтриете тази публикация и да я направите чернова? Означаванията като любими и подсилванията ще се изгубят, а и отговорите към първоначалната публикация ще осиротеят.",
   "confirmations.reply.confirm": "Отговор",
@@ -205,6 +209,27 @@
   "dismissable_banner.explore_statuses": "Има публикации през социалната мрежа, които днес набират популярност. По-новите публикации с повече подсилвания и любими са класирани по-високо.",
   "dismissable_banner.explore_tags": "Тези хаштагове сега набират популярност сред хората в този и други сървъри на децентрализирата мрежа.",
   "dismissable_banner.public_timeline": "Ето най-новите обществени публикации от хора в социална мрежа, която хората в {domain} следват.",
+  "domain_block_modal.block": "Блокиране на сървър",
+  "domain_block_modal.block_account_instead": "Вместо това блокиране на @{name}",
+  "domain_block_modal.they_can_interact_with_old_posts": "Хората от този сървър могат да взаимодействат с ваши стари публикации.",
+  "domain_block_modal.they_cant_follow": "Никого от този сървър не може да ви последва.",
+  "domain_block_modal.they_wont_know": "Няма да узнаят, че са били блокирани.",
+  "domain_block_modal.title": "Блокирате ли домейн?",
+  "domain_block_modal.you_will_lose_followers": "Всичките ви последователи от този сървър ще се премахнат.",
+  "domain_block_modal.you_wont_see_posts": "Няма да виждате публикации или известия от потребителите на този сървър.",
+  "domain_pill.activitypub_lets_connect": "Позволява ви да се свързвате и взаимодействате с хора не само в Mastodon, но и през различни социални приложения.",
+  "domain_pill.activitypub_like_language": "ActivityPub е като език на Mastodon, говорещ с други социални мрежи.",
+  "domain_pill.server": "Сървър",
+  "domain_pill.their_handle": "Тяхната ръчка:",
+  "domain_pill.their_server": "Цифровият им дом, където живеят всичките им публикации.",
+  "domain_pill.their_username": "Неповторимият им идентификатор на сървъра им. Възможно е да се намерят потребители със същото потребителско име на други сървъри.",
+  "domain_pill.username": "Потребителско име",
+  "domain_pill.whats_in_a_handle": "Какво е в ръчката?",
+  "domain_pill.who_they_are": "Откак ръчките казват кой кой е и къде е, то може да взаимодействате с хора през социаното уебпространство на <button>захранваните платформи от ActivityPub</button>.",
+  "domain_pill.who_you_are": "Тъй като вашата ръчка казва кои сте и къде сте, то може да взаимодействате с хора през социаното уебпространство на <button>захранваните платформи от ActivityPub</button>.",
+  "domain_pill.your_handle": "Вашата ръчка:",
+  "domain_pill.your_server": "Цифровият ви дом, където живеят всичките ви публикации. Не харесвате ли този? Прехвърляте се на сървъри по всяко време и докарвате последователите си също.",
+  "domain_pill.your_username": "Неповторимият ви идентификатор на този сървър. Възможно е да се намерят потребители със същото потребителско име на други сървъри.",
   "embed.instructions": "Вградете публикацията в уебсайта си, копирайки кода долу.",
   "embed.preview": "Ето как ще изглежда:",
   "emoji_button.activity": "Дейност",
@@ -241,6 +266,7 @@
   "empty_column.list": "Все още списъкът е празен. Членуващите на списъка, публикуващи нови публикации, ще се появят тук.",
   "empty_column.lists": "Все още нямате списъци. Когато създадете такъв, той ще се покаже тук.",
   "empty_column.mutes": "Още не сте заглушавали потребители.",
+  "empty_column.notification_requests": "Всичко е чисто! Тук няма нищо. Получавайки нови известия, те ще се появят тук според настройките ви.",
   "empty_column.notifications": "Все още нямате известия. Взаимодействайте с другите, за да започнете разговора.",
   "empty_column.public": "Тук няма нищо! Публикувайте нещо или последвайте потребители от други сървъри, за да го напълните",
   "error.unexpected_crash.explanation": "Поради грешка в нашия код или проблем със съвместимостта на браузъра, тази страница не може да се покаже правилно.",
@@ -271,6 +297,8 @@
   "filter_modal.select_filter.subtitle": "Изберете съществуваща категория или създайте нова",
   "filter_modal.select_filter.title": "Филтриране на публ.",
   "filter_modal.title.status": "Филтриране на публ.",
+  "filtered_notifications_banner.pending_requests": "Известията от {count, plural, =0 {никого, когото може да познавате} one {едно лице, което може да познавате} other {# души, които може да познавате}}",
+  "filtered_notifications_banner.title": "Филтрирани известия",
   "firehose.all": "Всичко",
   "firehose.local": "Този сървър",
   "firehose.remote": "Други сървъри",
@@ -399,9 +427,15 @@
   "loading_indicator.label": "Зареждане…",
   "media_gallery.toggle_visible": "Скриване на {number, plural, one {изображение} other {изображения}}",
   "moved_to_account_banner.text": "Вашият акаунт {disabledAccount} сега е изключен, защото се преместихте в {movedToAccount}.",
-  "mute_modal.duration": "Времетраене",
-  "mute_modal.hide_notifications": "Скриване на известия от този потребител?",
-  "mute_modal.indefinite": "Неопределено",
+  "mute_modal.hide_from_notifications": "Скриване от известията",
+  "mute_modal.hide_options": "Скриване на възможностите",
+  "mute_modal.indefinite": "Докато премахна заглушаването им",
+  "mute_modal.show_options": "Показване на възможностите",
+  "mute_modal.they_can_mention_and_follow": "Могат да ви споменават и последват, но няма да ги виждате.",
+  "mute_modal.they_wont_know": "Няма да узнаят, че са били заглушени.",
+  "mute_modal.title": "Заглушавате ли потребител?",
+  "mute_modal.you_wont_see_mentions": "Няма да виждате споменаващи ги публикации.",
+  "mute_modal.you_wont_see_posts": "Още могат да виждат публикациите ви, но вие техните не.",
   "navigation_bar.about": "Относно",
   "navigation_bar.advanced_interface": "Отваряне в разширен уебинтерфейс",
   "navigation_bar.blocks": "Блокирани потребители",
@@ -439,7 +473,10 @@
   "notification.reblog": "{name} подсили ваша публикация",
   "notification.status": "{name} току-що публикува",
   "notification.update": "{name} промени публикация",
+  "notification_requests.accept": "Приемам",
+  "notification_requests.dismiss": "Отхвърлям",
   "notification_requests.notifications_from": "Известия от {name}",
+  "notification_requests.title": "Филтрирани известия",
   "notifications.clear": "Изчистване на известията",
   "notifications.clear_confirmation": "Наистина ли искате да изчистите завинаги всичките си известия?",
   "notifications.column_settings.admin.report": "Нови доклади:",
@@ -471,7 +508,14 @@
   "notifications.permission_denied": "Известията на работния плот не са налични поради предварително отказана заявка за разрешение в браузъра",
   "notifications.permission_denied_alert": "Известията на работния плот не могат да се включат, тъй като разрешението на браузъра е отказвано преди",
   "notifications.permission_required": "Известията на работния плот ги няма, щото няма дадено нужното позволение.",
+  "notifications.policy.filter_new_accounts.hint": "Сътворено през {days, plural, one {последния ден} other {последните # дена}}",
   "notifications.policy.filter_new_accounts_title": "Нови акаунти",
+  "notifications.policy.filter_not_followers_hint": "Включително хора, които са ви последвали по-малко от {days, plural, one {ден} other {# дни}}",
+  "notifications.policy.filter_not_followers_title": "Хора, които не ви следват",
+  "notifications.policy.filter_not_following_hint": "Докато не ги одобрите ръчно",
+  "notifications.policy.filter_not_following_title": "Хора, които не следвате",
+  "notifications.policy.filter_private_mentions_title": "Непоискани частни споменавания",
+  "notifications.policy.title": "Да се филтрират известия от…",
   "notifications_permission_banner.enable": "Включване на известията на работния плот",
   "notifications_permission_banner.how_to_control": "За да получавате известия, когато Mastodon не е отворен, включете известията на работния плот. Може да управлявате точно кои видове взаимодействия пораждат известия на работния плот чрез бутона {icon} по-горе, след като бъдат включени.",
   "notifications_permission_banner.title": "Никога не пропускайте нищо",
@@ -609,7 +653,7 @@
   "search.quick_action.go_to_hashtag": "Към хаштаг {x}",
   "search.quick_action.open_url": "Отваряне на URL адреса в Mastodon",
   "search.quick_action.status_search": "Съвпадение на публикации {x}",
-  "search.search_or_paste": "Търсене или поставяне на URL адрес",
+  "search.search_or_paste": "Търсене/поставяне на URL",
   "search_popout.full_text_search_disabled_message": "Не е достъпно на {domain}.",
   "search_popout.full_text_search_logged_out_message": "Достъпно само при влизане в системата.",
   "search_popout.language_code": "Код на езика по ISO",
@@ -648,9 +692,11 @@
   "status.direct": "Частно споменаване на @{name}",
   "status.direct_indicator": "Частно споменаване",
   "status.edit": "Редактиране",
+  "status.edited": "Последно редактирано на {date}",
   "status.edited_x_times": "Редактирано {count, plural,one {{count} път} other {{count} пъти}}",
   "status.embed": "Вграждане",
   "status.favourite": "Любимо",
+  "status.favourites": "{count, plural, one {любимо} other {любими}}",
   "status.filter": "Филтриране на публ.",
   "status.filtered": "Филтрирано",
   "status.hide": "Скриване на публ.",
@@ -671,6 +717,7 @@
   "status.reblog": "Подсилване",
   "status.reblog_private": "Подсилване с оригиналната видимост",
   "status.reblogged_by": "{name} подсили",
+  "status.reblogs": "{count, plural, one {подсилване} other {подсилвания}}",
   "status.reblogs.empty": "Още никого не е подсилвал публикацията. Подсилващият ще се покаже тук.",
   "status.redraft": "Изтриване и преначертаване",
   "status.remove_bookmark": "Премахване на отметката",
diff --git a/app/javascript/mastodon/locales/bn.json b/app/javascript/mastodon/locales/bn.json
index 85f1598889ab0d..797b93e24359f7 100644
--- a/app/javascript/mastodon/locales/bn.json
+++ b/app/javascript/mastodon/locales/bn.json
@@ -148,9 +148,7 @@
   "compose_form.spoiler.marked": "সতর্কতার পিছনে লেখানটি লুকানো আছে",
   "compose_form.spoiler.unmarked": "লেখাটি লুকানো নেই",
   "confirmation_modal.cancel": "বাতিল করুন",
-  "confirmations.block.block_and_report": "ব্লক করুন এবং রিপোর্ট করুন",
   "confirmations.block.confirm": "ব্লক করুন",
-  "confirmations.block.message": "আপনি কি নিশ্চিত {name} কে ব্লক করতে চান?",
   "confirmations.cancel_follow_request.confirm": "অনুরোধ বাতিল করুন",
   "confirmations.cancel_follow_request.message": "আপনি কি নিশ্চিত যে আপনি {name} কে অনুসরণ করার অনুরোধ প্রত্যাহার করতে চান?",
   "confirmations.delete.confirm": "মুছে ফেলুন",
@@ -159,15 +157,12 @@
   "confirmations.delete_list.message": "আপনি কি নিশ্চিত যে আপনি এই তালিকাটি স্থায়িভাবে মুছে ফেলতে চান ?",
   "confirmations.discard_edit_media.confirm": "বাতিল করো",
   "confirmations.discard_edit_media.message": "মিডিয়া Description বা Preview তে আপনার আপনার অসংরক্ষিত পরিবর্তন আছে, সেগুলো বাতিল করবেন?",
-  "confirmations.domain_block.confirm": "এই ডোমেন থেকে সব লুকান",
   "confirmations.domain_block.message": "আপনি কি সত্যিই সত্যই নিশ্চিত যে আপনি পুরো {domain}'টি ব্লক করতে চান? বেশিরভাগ ক্ষেত্রে কয়েকটি লক্ষ্যযুক্ত ব্লক বা নীরবতা যথেষ্ট এবং পছন্দসই। আপনি কোনও পাবলিক টাইমলাইন বা আপনার বিজ্ঞপ্তিগুলিতে সেই ডোমেন থেকে সামগ্রী দেখতে পাবেন না। সেই ডোমেন থেকে আপনার অনুসরণকারীদের সরানো হবে।",
   "confirmations.edit.confirm": "সম্পাদন",
   "confirmations.edit.message": "এখন সম্পাদনা করলে আপনি যে মেসেজ লিখছেন তা overwrite করবে, চালিয়ে যেতে চান?",
   "confirmations.logout.confirm": "প্রস্থান",
   "confirmations.logout.message": "আপনি লগ আউট করতে চান?",
   "confirmations.mute.confirm": "সরিয়ে ফেলুন",
-  "confirmations.mute.explanation": "এটি তাদের কাছ থেকে পোস্ট এবং তাদেরকে মেনশন করা পোস্টগুলি হাইড করবে, তবুও তাদেরকে এটি আপনার পোস্ট গুলো দেখতে দিবে ও তারা আপনাকে অনুসরন করতে পারবে।.",
-  "confirmations.mute.message": "আপনি কি নিশ্চিত {name} সরিয়ে ফেলতে চান ?",
   "confirmations.redraft.confirm": "মুছে ফেলুন এবং আবার সম্পাদন করুন",
   "confirmations.reply.confirm": "মতামত",
   "confirmations.reply.message": "এখন মতামত লিখতে গেলে আপনার এখন যেটা লিখছেন সেটা মুছে যাবে। আপনি নি নিশ্চিত এটা করতে চান ?",
@@ -302,9 +297,6 @@
   "lists.subheading": "আপনার তালিকা",
   "load_pending": "{count, plural, one {# নতুন জিনিস} other {# নতুন জিনিস}}",
   "media_gallery.toggle_visible": "দৃশ্যতার অবস্থা বদলান",
-  "mute_modal.duration": "সময়কাল",
-  "mute_modal.hide_notifications": "এই ব্যবহারকারীর প্রজ্ঞাপন বন্ধ করবেন ?",
-  "mute_modal.indefinite": "অনির্দিষ্ট",
   "navigation_bar.about": "পরিচিতি",
   "navigation_bar.blocks": "বন্ধ করা ব্যবহারকারী",
   "navigation_bar.bookmarks": "বুকমার্ক",
diff --git a/app/javascript/mastodon/locales/br.json b/app/javascript/mastodon/locales/br.json
index 77d42f3536c277..609e7f7158083d 100644
--- a/app/javascript/mastodon/locales/br.json
+++ b/app/javascript/mastodon/locales/br.json
@@ -87,6 +87,8 @@
   "announcement.announcement": "Kemennad",
   "attachments_list.unprocessed": "(ket meret)",
   "audio.hide": "Kuzhat ar c'hleved",
+  "block_modal.show_less": "Diskouez nebeutoc'h",
+  "block_modal.show_more": "Diskouez muioc'h",
   "boost_modal.combo": "Ar wezh kentañ e c'halliot gwaskañ war {combo} evit tremen hebiou",
   "bundle_column_error.copy_stacktrace": "Eilañ an danevell fazi",
   "bundle_column_error.error.body": "N'haller ket skrammañ ar bajenn goulennet. Gallout a ra bezañ abalamour d'ur beug er c'hod pe d'ur gudenn keverlec'hded gant ar merdeer.",
@@ -157,9 +159,7 @@
   "compose_form.spoiler.marked": "Kuzhet eo an destenn a-dreñv ur c'hemenn",
   "compose_form.spoiler.unmarked": "N'eo ket kuzhet an destenn",
   "confirmation_modal.cancel": "Nullañ",
-  "confirmations.block.block_and_report": "Berzañ ha Disklêriañ",
   "confirmations.block.confirm": "Stankañ",
-  "confirmations.block.message": "Ha sur oc'h e fell deoc'h stankañ {name} ?",
   "confirmations.cancel_follow_request.confirm": "Nullañ ar reked",
   "confirmations.cancel_follow_request.message": "Ha sur oc'h e fell deoc'h nullañ ho reked evit heuliañ {name} ?",
   "confirmations.delete.confirm": "Dilemel",
@@ -168,14 +168,11 @@
   "confirmations.delete_list.message": "Ha sur eo hoc'h eus c'hoant da zilemel ar roll-mañ da vat ?",
   "confirmations.discard_edit_media.confirm": "Nac'hañ",
   "confirmations.discard_edit_media.message": "Bez ez eus kemmoù n'int ket enrollet e deskrivadur ar media pe ar rakwel, nullañ anezho evelato?",
-  "confirmations.domain_block.confirm": "Berzañ an domani a-bezh",
   "confirmations.domain_block.message": "Ha sur oc'h e fell deoc'h berzañ an {domain} a-bezh? Peurvuiañ eo trawalc'h berzañ pe mudañ un nebeud implijer·ezed·ien. Ne welot danvez ebet o tont eus an domani-mañ. Dilamet e vo ar c'houmanantoù war an domani-mañ.",
   "confirmations.edit.confirm": "Kemmañ",
   "confirmations.logout.confirm": "Digevreañ",
   "confirmations.logout.message": "Ha sur oc'h e fell deoc'h digevreañ ?",
   "confirmations.mute.confirm": "Kuzhat",
-  "confirmations.mute.explanation": "Kement-se a guzho an toudoù skrivet gantañ·i hag ar re a veneg anezhañ·i, met ne viro ket outañ·i a welet ho toudoù nag a heuliañ ac'hanoc'h.",
-  "confirmations.mute.message": "Ha sur oc'h e fell deoc'h kuzhaat {name} ?",
   "confirmations.redraft.confirm": "Diverkañ ha skrivañ en-dro",
   "confirmations.reply.confirm": "Respont",
   "confirmations.reply.message": "Respont bremañ a zilamo ar gemennadenn emaoc'h o skrivañ. Sur e oc'h e fell deoc'h kenderc'hel ganti?",
@@ -198,6 +195,8 @@
   "dismissable_banner.dismiss": "Diverkañ",
   "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
   "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.",
+  "domain_pill.server": "Dafariad",
+  "domain_pill.username": "Anv-implijer",
   "embed.instructions": "Enframmit an toud-mañ en ho lec'hienn en ur eilañ ar c'hod amañ-dindan.",
   "embed.preview": "Setu penaos e teuio war wel :",
   "emoji_button.activity": "Obererezh",
@@ -366,9 +365,6 @@
   "load_pending": "{count, plural, one {# dra nevez} other {# dra nevez}}",
   "loading_indicator.label": "O kargañ…",
   "media_gallery.toggle_visible": "{number, plural, one {Kuzhat ar skeudenn} other {Kuzhat ar skeudenn}}",
-  "mute_modal.duration": "Padelezh",
-  "mute_modal.hide_notifications": "Kuzhat kemenadennoù eus an implijer-se ?",
-  "mute_modal.indefinite": "Amstrizh",
   "navigation_bar.about": "Diwar-benn",
   "navigation_bar.blocks": "Implijer·ezed·ien berzet",
   "navigation_bar.bookmarks": "Sinedoù",
diff --git a/app/javascript/mastodon/locales/bs.json b/app/javascript/mastodon/locales/bs.json
index c978a8b01fcfb4..d06054ee586b07 100644
--- a/app/javascript/mastodon/locales/bs.json
+++ b/app/javascript/mastodon/locales/bs.json
@@ -11,7 +11,6 @@
   "compose_form.spoiler.marked": "Text is hidden behind warning",
   "compose_form.spoiler.unmarked": "Text is not hidden",
   "confirmations.delete.message": "Are you sure you want to delete this status?",
-  "confirmations.domain_block.confirm": "Hide entire domain",
   "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
   "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.",
   "embed.instructions": "Embed this status on your website by copying the code below.",
diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index fde638411e4a19..e0d62c78bb076e 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -89,6 +89,14 @@
   "announcement.announcement": "Anunci",
   "attachments_list.unprocessed": "(sense processar)",
   "audio.hide": "Amaga l'àudio",
+  "block_modal.remote_users_caveat": "Li demanarem al servidor {domain} que respecti la vostra decisió, tot i que no podem garantir-ho, ja que alguns servidors gestionen de forma diferent els blocatges. És possible que els usuaris no autenticats puguin veure les publicacions públiques.",
+  "block_modal.show_less": "Mostra'n menys",
+  "block_modal.show_more": "Mostra'n més",
+  "block_modal.they_cant_mention": "No us poden esmentar, ni seguir.",
+  "block_modal.they_cant_see_posts": "No poden veure les vostres publicacions, ni vosaltres les seves.",
+  "block_modal.they_will_know": "Poden veure que els heu blocat.",
+  "block_modal.title": "Bloquem l'usuari?",
+  "block_modal.you_wont_see_mentions": "No veureu publicacions que l'esmentin.",
   "boost_modal.combo": "Pots prémer {combo} per a evitar-ho el pròxim cop",
   "bundle_column_error.copy_stacktrace": "Copia l'informe d'error",
   "bundle_column_error.error.body": "No s'ha pogut renderitzar la pàgina sol·licitada. Podria ser per un error en el nostre codi o per un problema de compatibilitat del navegador.",
@@ -160,9 +168,7 @@
   "compose_form.spoiler.unmarked": "Afegeix avís de contingut",
   "compose_form.spoiler_placeholder": "Avís de contingut (opcional)",
   "confirmation_modal.cancel": "Cancel·la",
-  "confirmations.block.block_and_report": "Bloca i denuncia",
   "confirmations.block.confirm": "Bloca",
-  "confirmations.block.message": "Segur que vols blocar a {name}?",
   "confirmations.cancel_follow_request.confirm": "Retirar la sol·licitud",
   "confirmations.cancel_follow_request.message": "Segur que vols retirar la sol·licitud de seguiment de {name}?",
   "confirmations.delete.confirm": "Elimina",
@@ -171,15 +177,13 @@
   "confirmations.delete_list.message": "Segur que vols suprimir permanentment aquesta llista?",
   "confirmations.discard_edit_media.confirm": "Descarta",
   "confirmations.discard_edit_media.message": "Tens canvis no desats en la descripció del contingut o en la previsualització, els vols descartar?",
-  "confirmations.domain_block.confirm": "Bloca el domini sencer",
+  "confirmations.domain_block.confirm": "Bloca el servidor",
   "confirmations.domain_block.message": "Segur que vols blocar {domain} del tot? En la majoria dels casos, només amb blocar o silenciar uns pocs comptes n'hi ha prou i és millor. No veuràs el contingut d’aquest domini en cap de les línies de temps ni en les notificacions. S'eliminaran els teus seguidors d’aquest domini.",
   "confirmations.edit.confirm": "Edita",
   "confirmations.edit.message": "Editant ara sobreescriuràs el missatge que estàs editant. Segur que vols continuar?",
   "confirmations.logout.confirm": "Tanca la sessió",
   "confirmations.logout.message": "Segur que vols tancar la sessió?",
   "confirmations.mute.confirm": "Silencia",
-  "confirmations.mute.explanation": "Això amagarà els tuts d'ells i els d'els que els mencionin, però encara els permetrà veure els teus tuts i seguir-te.",
-  "confirmations.mute.message": "Segur que vols silenciar {name}?",
   "confirmations.redraft.confirm": "Esborra i reescriu",
   "confirmations.redraft.message": "Segur que vols eliminar aquest tut i tornar a escriure'l? Es perdran tots els impulsos i els favorits, i les respostes al tut original quedaran aïllades.",
   "confirmations.reply.confirm": "Respon",
@@ -205,6 +209,27 @@
   "dismissable_banner.explore_statuses": "Aquests son els tuts de la xarxa descentralitzada que guanyen atenció ara mateix. Els tuts més nous amb més impulsos i favorits tenen millor rànquing.",
   "dismissable_banner.explore_tags": "Aquestes etiquetes estan guanyant ara mateix l'atenció dels usuaris d'aquest i altres servidors de la xarxa descentralitzada.",
   "dismissable_banner.public_timeline": "Aquests son els tuts públics més recents de les persones a la web social que les persones de {domain} segueixen.",
+  "domain_block_modal.block": "Bloca el servidor",
+  "domain_block_modal.block_account_instead": "En lloc d'això, bloca @{name}",
+  "domain_block_modal.they_can_interact_with_old_posts": "Els usuaris d'aquest servidor poden interactuar amb les vostres publicacions antigues.",
+  "domain_block_modal.they_cant_follow": "Ningú d'aquest servidor us pot seguir.",
+  "domain_block_modal.they_wont_know": "No sabran que són blocats.",
+  "domain_block_modal.title": "Bloquem el domini?",
+  "domain_block_modal.you_will_lose_followers": "S'eliminaran tots els vostres seguidors d'aquest servidor.",
+  "domain_block_modal.you_wont_see_posts": "No veureu ni les publicacions ni les notificacions dels usuaris d'aquest servidor.",
+  "domain_pill.activitypub_lets_connect": "Us permet connectar i interactuar amb persones a Mastodon i també a d'altres apps socials.",
+  "domain_pill.activitypub_like_language": "ActivityPub és el llenguatge que Mastodon parla amb altres xarxes socials.",
+  "domain_pill.server": "Servidor",
+  "domain_pill.their_handle": "El seu identificador:",
+  "domain_pill.their_server": "La seva llar digital, on són totes les seves publicacions.",
+  "domain_pill.their_username": "El seu identificador únic al servidor. És possible que hi hagi usuaris amb el mateix nom d'usuari a diferents servidors.",
+  "domain_pill.username": "Nom d'usuari",
+  "domain_pill.whats_in_a_handle": "Què constitueix un identificador?",
+  "domain_pill.who_they_are": "Com que un identificador expressa qui i on s'és, podeu interactuar amb persones d'arreu de les <button>plataformes que funcionen amb ActivityPub</button>.",
+  "domain_pill.who_you_are": "Com que un identificador expressa qui i on sou, les persones d'arreu de les <button>plataformes que funcionen amb ActivityPub</button> poden interactuar amb vosaltres.",
+  "domain_pill.your_handle": "El vostre identificador:",
+  "domain_pill.your_server": "La vostra llar digital, on són totes les vostres publicacions. No us agrada aquesta? Canvieu de servidor quan vulgueu i emporteu-vos els vostres seguidors.",
+  "domain_pill.your_username": "El vostre identificador únic en aquest servidor. Hi pot haver usuaris amb el mateix nom a diferents servidors.",
   "embed.instructions": "Incrusta aquest tut a la teva pàgina web copiant el codi següent.",
   "embed.preview": "Aquest aspecte tindrà:",
   "emoji_button.activity": "Activitat",
@@ -402,9 +427,15 @@
   "loading_indicator.label": "Es carrega…",
   "media_gallery.toggle_visible": "{number, plural, one {Amaga la imatge} other {Amaga les imatges}}",
   "moved_to_account_banner.text": "El teu compte {disabledAccount} està desactivat perquè l'has mogut a {movedToAccount}.",
-  "mute_modal.duration": "Durada",
-  "mute_modal.hide_notifications": "Amagar les notificacions d'aquest usuari?",
-  "mute_modal.indefinite": "Indefinit",
+  "mute_modal.hide_from_notifications": "Amaga de les notificacions",
+  "mute_modal.hide_options": "Amaga les opcions",
+  "mute_modal.indefinite": "Fins que els deixi de silenciar",
+  "mute_modal.show_options": "Mostra les opcions",
+  "mute_modal.they_can_mention_and_follow": "Us poden esmentar i seguir, però no els veureu.",
+  "mute_modal.they_wont_know": "No sabran que són silenciats.",
+  "mute_modal.title": "Silenciem l'usuari?",
+  "mute_modal.you_wont_see_mentions": "No veureu publicacions que els esmentin.",
+  "mute_modal.you_wont_see_posts": "Encara poden veure les vostres publicacions, però no veureu les seves.",
   "navigation_bar.about": "Quant a",
   "navigation_bar.advanced_interface": "Obre en la interfície web avançada",
   "navigation_bar.blocks": "Usuaris blocats",
@@ -662,9 +693,11 @@
   "status.direct": "Menciona privadament @{name}",
   "status.direct_indicator": "Menció privada",
   "status.edit": "Edita",
+  "status.edited": "Darrera edició {date}",
   "status.edited_x_times": "Editat {count, plural, one {{count} vegada} other {{count} vegades}}",
   "status.embed": "Incrusta",
   "status.favourite": "Favorit",
+  "status.favourites": "{count, plural, one {# favorit} other {# favorits}}",
   "status.filter": "Filtra aquest tut",
   "status.filtered": "Filtrada",
   "status.hide": "Amaga el tut",
@@ -685,6 +718,7 @@
   "status.reblog": "Impulsa",
   "status.reblog_private": "Impulsa amb la visibilitat original",
   "status.reblogged_by": "impulsat per {name}",
+  "status.reblogs": "{count, plural, one {# impuls} other {# impulsos}}",
   "status.reblogs.empty": "Encara no ha impulsat ningú aquest tut. Quan algú ho faci, apareixerà aquí.",
   "status.redraft": "Esborra i reescriu",
   "status.remove_bookmark": "Elimina el marcador",
diff --git a/app/javascript/mastodon/locales/ckb.json b/app/javascript/mastodon/locales/ckb.json
index 27526e34549243..c3c365b3a11c6f 100644
--- a/app/javascript/mastodon/locales/ckb.json
+++ b/app/javascript/mastodon/locales/ckb.json
@@ -160,9 +160,7 @@
   "compose_form.spoiler.unmarked": "دەق شاراوە نییە",
   "compose_form.spoiler_placeholder": "ئاگادارکردنەوەی ناوەڕۆک (ئیختیاری)",
   "confirmation_modal.cancel": "هەڵوەشاندنەوه",
-  "confirmations.block.block_and_report": "بلۆک & گوزارشت",
   "confirmations.block.confirm": "بلۆک",
-  "confirmations.block.message": "ئایا دڵنیایت لەوەی دەتەوێت {name} بلۆک بکەیت?",
   "confirmations.cancel_follow_request.confirm": "داواکاری کشانەوە",
   "confirmations.cancel_follow_request.message": "ئایا دڵنیای کە دەتەوێت داواکارییەکەت بۆ شوێنکەوتنی {ناو} بکشێنیتەوە؟",
   "confirmations.delete.confirm": "سڕینەوە",
@@ -171,15 +169,12 @@
   "confirmations.delete_list.message": "ئایا دڵنیایت لەوەی دەتەوێت بە هەمیشەیی ئەم لیستە بسڕیتەوە?",
   "confirmations.discard_edit_media.confirm": "ڕەتکردنەوە",
   "confirmations.discard_edit_media.message": "گۆڕانکاریت لە وەسف یان پێشبینی میدیادا هەڵنەگیراوە، بەهەر حاڵ فڕێیان بدە؟",
-  "confirmations.domain_block.confirm": "بلۆککردنی هەموو دۆمەینەکە",
   "confirmations.domain_block.message": "ئایا بەڕاستی، بەڕاستی تۆ دەتەوێت هەموو {domain} بلۆک بکەیت؟ لە زۆربەی حاڵەتەکاندا چەند بلۆکێکی ئامانجدار یان بێدەنگەکان پێویست و پەسەندن. تۆ ناوەڕۆک ێک نابینیت لە دۆمەینەکە لە هیچ هێڵی کاتی گشتی یان ئاگانامەکانت. شوێنکەوتوانی تۆ لەو دۆمەینەوە لادەبرێن.",
   "confirmations.edit.confirm": "دەستکاری",
   "confirmations.edit.message": "دەستکاری کردنی ئێستا: دەبێتە هۆی نووسینەوەی ئەو پەیامەی، کە ئێستا داتدەڕشت. ئایا دڵنیای، کە دەتەوێت بەردەوام بیت؟",
   "confirmations.logout.confirm": "چوونە دەرەوە",
   "confirmations.logout.message": "ئایا دڵنیایت لەوەی دەتەوێت بچیتە دەرەوە?",
   "confirmations.mute.confirm": "بێدەنگ",
-  "confirmations.mute.explanation": "ئەمەش دەبێتە هۆی شاردنەوەی پۆستەکان یان ئەو بابەتانەی کە ئاماژەیان پێ دەکات ، بەڵام هێشتا ڕێگەیان پێ دەدات کە پۆستەکانتان ببینن و شوێنتان بکەون.",
-  "confirmations.mute.message": "ئایا دڵنیایت لەوەی دەتەوێت بیلێیت {name}?",
   "confirmations.redraft.confirm": "سڕینەوە & دووبارە ڕەشکردنەوە",
   "confirmations.redraft.message": "دڵنیای دەتەوێت ئەم پۆستە بسڕیتەوە و دووبارە دایبڕێژیتەوە؟ فەڤۆریت و بووستەکان لەدەست دەچن، وەڵامەکانی پۆستە ئەسڵیەکەش هەتیو دەبن.",
   "confirmations.reply.confirm": "وەڵام",
@@ -370,9 +365,6 @@
   "load_pending": "{count, plural, one {# بەڕگەی نوێ} other {# بەڕگەی نوێ}}",
   "media_gallery.toggle_visible": "شاردنەوەی {number, plural, one {image} other {images}}",
   "moved_to_account_banner.text": "ئەکاونتەکەت {disabledAccount} لە ئێستادا لەکارخراوە چونکە تۆ چوویتە {movedToAccount}.",
-  "mute_modal.duration": "ماوە",
-  "mute_modal.hide_notifications": "شاردنەوەی ئاگانامەکان لەم بەکارهێنەرە؟ ",
-  "mute_modal.indefinite": "نادیار",
   "navigation_bar.about": "دەربارە",
   "navigation_bar.blocks": "بەکارهێنەرە بلۆککراوەکان",
   "navigation_bar.bookmarks": "نیشانکراوەکان",
diff --git a/app/javascript/mastodon/locales/co.json b/app/javascript/mastodon/locales/co.json
index e547382a7cb56d..be4cce2692aaa6 100644
--- a/app/javascript/mastodon/locales/co.json
+++ b/app/javascript/mastodon/locales/co.json
@@ -86,21 +86,16 @@
   "compose_form.spoiler.marked": "Testu piattatu daret'à un'avertimentu",
   "compose_form.spoiler.unmarked": "Testu micca piattatu",
   "confirmation_modal.cancel": "Annullà",
-  "confirmations.block.block_and_report": "Bluccà è signalà",
   "confirmations.block.confirm": "Bluccà",
-  "confirmations.block.message": "Site sicuru·a che vulete bluccà @{name}?",
   "confirmations.delete.confirm": "Toglie",
   "confirmations.delete.message": "Site sicuru·a che vulete sguassà stu statutu?",
   "confirmations.delete_list.confirm": "Toglie",
   "confirmations.delete_list.message": "Site sicuru·a che vulete toglie sta lista?",
   "confirmations.discard_edit_media.confirm": "Scartà",
-  "confirmations.domain_block.confirm": "Piattà tuttu u duminiu",
   "confirmations.domain_block.message": "Site veramente sicuru·a che vulete piattà tuttu à {domain}? Saria forse abbastanza di bluccà ò piattà alcuni conti da quallà. Ùn viderete più nunda da quallà indè e linee pubbliche o e nutificazione. I vostri abbunati da stu duminiu saranu tolti.",
   "confirmations.logout.confirm": "Scunnettassi",
   "confirmations.logout.message": "Site sicuru·a che vulete scunnettà vi?",
   "confirmations.mute.confirm": "Piattà",
-  "confirmations.mute.explanation": "Quessu hà da piattà i statuti da sta persona è i posti chì a mintuvanu, ma ellu·a puderà sempre vede i vostri statuti è siguità vi.",
-  "confirmations.mute.message": "Site sicuru·a che vulete piattà @{name}?",
   "confirmations.redraft.confirm": "Sguassà è riscrive",
   "confirmations.reply.confirm": "Risponde",
   "confirmations.reply.message": "Risponde avà sguasserà u missaghju chì scrivite. Site sicuru·a chì vulete cuntinuà?",
@@ -226,9 +221,6 @@
   "lists.subheading": "E vo liste",
   "load_pending": "{count, plural, one {# entrata nova} other {# entrate nove}}",
   "media_gallery.toggle_visible": "Piattà {number, plural, one {ritrattu} other {ritratti}}",
-  "mute_modal.duration": "Durata",
-  "mute_modal.hide_notifications": "Piattà nutificazione da st'utilizatore?",
-  "mute_modal.indefinite": "Indifinita",
   "navigation_bar.blocks": "Utilizatori bluccati",
   "navigation_bar.bookmarks": "Segnalibri",
   "navigation_bar.community_timeline": "Linea pubblica lucale",
diff --git a/app/javascript/mastodon/locales/cs.json b/app/javascript/mastodon/locales/cs.json
index 5a8493fa07de7f..273e8bf499d14d 100644
--- a/app/javascript/mastodon/locales/cs.json
+++ b/app/javascript/mastodon/locales/cs.json
@@ -160,9 +160,7 @@
   "compose_form.spoiler.unmarked": "Přidat varování o obsahu",
   "compose_form.spoiler_placeholder": "Upozornění na obsah (nepovinné)",
   "confirmation_modal.cancel": "Zrušit",
-  "confirmations.block.block_and_report": "Blokovat a nahlásit",
   "confirmations.block.confirm": "Blokovat",
-  "confirmations.block.message": "Opravdu chcete blokovat {name}?",
   "confirmations.cancel_follow_request.confirm": "Zrušit žádost",
   "confirmations.cancel_follow_request.message": "Opravdu chcete zrušit svou žádost o sledování {name}?",
   "confirmations.delete.confirm": "Smazat",
@@ -171,15 +169,12 @@
   "confirmations.delete_list.message": "Opravdu chcete tento seznam navždy smazat?",
   "confirmations.discard_edit_media.confirm": "Zahodit",
   "confirmations.discard_edit_media.message": "Máte neuložené změny popisku médií nebo náhledu, chcete je přesto zahodit?",
-  "confirmations.domain_block.confirm": "Blokovat celou doménu",
   "confirmations.domain_block.message": "Opravdu chcete blokovat celou doménu {domain}? Ve většině případů stačí blokovat nebo skrýt pár konkrétních uživatelů, což také doporučujeme. Z této domény neuvidíte obsah v žádné veřejné časové ose ani v oznámeních. Vaši sledující z této domény budou odstraněni.",
   "confirmations.edit.confirm": "Upravit",
   "confirmations.edit.message": "Editovat teď znamená přepsání zprávy, kterou právě tvoříte. Opravdu chcete pokračovat?",
   "confirmations.logout.confirm": "Odhlásit se",
   "confirmations.logout.message": "Opravdu se chcete odhlásit?",
   "confirmations.mute.confirm": "Skrýt",
-  "confirmations.mute.explanation": "Tohle skryje uživatelovy příspěvky a příspěvky, které ho zmiňují, ale uživatel stále uvidí vaše příspěvky a může vás sledovat.",
-  "confirmations.mute.message": "Opravdu chcete skrýt uživatele {name}?",
   "confirmations.redraft.confirm": "Smazat a přepsat",
   "confirmations.redraft.message": "Jste si jistí, že chcete odstranit tento příspěvek a vytvořit z něj koncept? Oblíbené a boosty budou ztraceny a odpovědi na původní příspěvek ztratí kontext.",
   "confirmations.reply.confirm": "Odpovědět",
@@ -399,9 +394,6 @@
   "loading_indicator.label": "Načítání…",
   "media_gallery.toggle_visible": "{number, plural, one {Skrýt obrázek} few {Skrýt obrázky} many {Skrýt obrázky} other {Skrýt obrázky}}",
   "moved_to_account_banner.text": "Váš účet {disabledAccount} je momentálně deaktivován, protože jste se přesunul/a na {movedToAccount}.",
-  "mute_modal.duration": "Trvání",
-  "mute_modal.hide_notifications": "Skrýt oznámení od tohoto uživatele?",
-  "mute_modal.indefinite": "Neomezeně",
   "navigation_bar.about": "O aplikaci",
   "navigation_bar.advanced_interface": "Otevřít pokročilé webové rozhraní",
   "navigation_bar.blocks": "Blokovaní uživatelé",
diff --git a/app/javascript/mastodon/locales/cy.json b/app/javascript/mastodon/locales/cy.json
index 0106df18778fdb..d2731b6294e4d5 100644
--- a/app/javascript/mastodon/locales/cy.json
+++ b/app/javascript/mastodon/locales/cy.json
@@ -160,9 +160,7 @@
   "compose_form.spoiler.unmarked": "Ychwanegu rhybudd cynnwys",
   "compose_form.spoiler_placeholder": "Rhybudd cynnwys (dewisol)",
   "confirmation_modal.cancel": "Diddymu",
-  "confirmations.block.block_and_report": "Rhwystro ac Adrodd",
   "confirmations.block.confirm": "Blocio",
-  "confirmations.block.message": "Ydych chi'n siŵr eich bod eisiau blocio {name}?",
   "confirmations.cancel_follow_request.confirm": "Tynnu'r cais yn ôl",
   "confirmations.cancel_follow_request.message": "Ydych chi'n siŵr eich bod am dynnu'ch cais i ddilyn {name} yn ôl?",
   "confirmations.delete.confirm": "Dileu",
@@ -171,15 +169,12 @@
   "confirmations.delete_list.message": "Ydych chi'n siŵr eich bod eisiau dileu'r rhestr hwn am byth?",
   "confirmations.discard_edit_media.confirm": "Dileu",
   "confirmations.discard_edit_media.message": "Mae gennych newidiadau heb eu cadw i'r disgrifiad cyfryngau neu'r rhagolwg - eu dileu beth bynnag?",
-  "confirmations.domain_block.confirm": "Blocio parth cyfan",
   "confirmations.domain_block.message": "Ydych chi wir, wir eisiau blocio'r holl {domain}? Fel arfer, mae blocio neu dewi pobl penodol yn broses mwy effeithiol. Fyddwch chi ddim yn gweld cynnwys o'r parth hwnnw mewn ffrydiau cyhoeddus neu yn eich hysbysiadau. Bydd eich dilynwyr o'r parth hwnnw yn cael eu ddileu.",
   "confirmations.edit.confirm": "Golygu",
   "confirmations.edit.message": "Bydd golygu nawr yn trosysgrifennu'r neges rydych yn ei ysgrifennu ar hyn o bryd. Ydych chi'n siŵr eich bod eisiau gwneud hyn?",
   "confirmations.logout.confirm": "Allgofnodi",
   "confirmations.logout.message": "Ydych chi'n siŵr eich bod am allgofnodi?",
   "confirmations.mute.confirm": "Tewi",
-  "confirmations.mute.explanation": "Bydd hyn yn cuddio postiadau oddi wrthyn nhw a phostiadau sydd yn sôn amdanyn nhw, ond bydd hyn dal yn gadael iddyn nhw gweld eich postiadau a'ch dilyn.",
-  "confirmations.mute.message": "Ydych chi wir eisiau tewi {name}?",
   "confirmations.redraft.confirm": "Dileu ac ailddrafftio",
   "confirmations.redraft.message": "Ydych chi'n siŵr eich bod am ddileu'r postiad hwn a'i ailddrafftio? Bydd ffefrynnau a hybiau'n cael eu colli, a bydd atebion i'r post gwreiddiol yn mynd yn amddifad.",
   "confirmations.reply.confirm": "Ateb",
@@ -401,9 +396,6 @@
   "loading_indicator.label": "Yn llwytho…",
   "media_gallery.toggle_visible": "{number, plural, one {Cuddio delwedd} other {Cuddio delwedd}}",
   "moved_to_account_banner.text": "Ar hyn y bryd, mae eich cyfrif {disabledAccount} wedi ei analluogi am i chi symud i {movedToAccount}.",
-  "mute_modal.duration": "Hyd",
-  "mute_modal.hide_notifications": "Cuddio hysbysiadau gan y defnyddiwr hwn?",
-  "mute_modal.indefinite": "Parhaus",
   "navigation_bar.about": "Ynghylch",
   "navigation_bar.advanced_interface": "Agor mewn rhyngwyneb gwe uwch",
   "navigation_bar.blocks": "Defnyddwyr wedi eu blocio",
diff --git a/app/javascript/mastodon/locales/da.json b/app/javascript/mastodon/locales/da.json
index df17791f1d13c8..bff044e7d6d8f9 100644
--- a/app/javascript/mastodon/locales/da.json
+++ b/app/javascript/mastodon/locales/da.json
@@ -89,6 +89,14 @@
   "announcement.announcement": "Bekendtgørelse",
   "attachments_list.unprocessed": "(ubehandlet)",
   "audio.hide": "Skjul lyd",
+  "block_modal.remote_users_caveat": "Serveren {domain} vil blive bedt om at respektere din beslutning. Overholdelse er dog ikke garanteret, da nogle servere kan håndtere blokke forskelligt. Offentlige indlæg kan stadig være synlige for ikke-indloggede brugere.",
+  "block_modal.show_less": "Vis mindre",
+  "block_modal.show_more": "Vis flere",
+  "block_modal.they_cant_mention": "Vedkommende kan ikke nævne eller følge dig.",
+  "block_modal.they_cant_see_posts": "Vedkommende kan ikke se dine indlæg, og du vil ikke se vedkommendes.",
+  "block_modal.they_will_know": "Vedkommende kan se den aktive blokering.",
+  "block_modal.title": "Blokér bruger?",
+  "block_modal.you_wont_see_mentions": "Du vil ikke se indlæg, som nævner vedkommende.",
   "boost_modal.combo": "Du kan trykke {combo} for at springe dette over næste gang",
   "bundle_column_error.copy_stacktrace": "Kopiér fejlrapport",
   "bundle_column_error.error.body": "Den anmodede side kunne ikke gengives. Dette kan skyldes flere typer fejl.",
@@ -160,9 +168,7 @@
   "compose_form.spoiler.unmarked": "Tilføj indholdsadvarsel",
   "compose_form.spoiler_placeholder": "Indholdsadvarsel (valgfri)",
   "confirmation_modal.cancel": "Afbryd",
-  "confirmations.block.block_and_report": "Blokér og Anmeld",
   "confirmations.block.confirm": "Blokér",
-  "confirmations.block.message": "Er du sikker på, at du vil blokere {name}?",
   "confirmations.cancel_follow_request.confirm": "Annullér anmodning",
   "confirmations.cancel_follow_request.message": "Er du sikker på, at anmodningen om at følge {name} skal annulleres?",
   "confirmations.delete.confirm": "Slet",
@@ -171,15 +177,13 @@
   "confirmations.delete_list.message": "Er du sikker på, at du vil slette denne liste permanent?",
   "confirmations.discard_edit_media.confirm": "Kassér",
   "confirmations.discard_edit_media.message": "Der er ugemte ændringer i mediebeskrivelsen eller forhåndsvisningen, kassér dem alligevel?",
-  "confirmations.domain_block.confirm": "Blokér hele domænet",
+  "confirmations.domain_block.confirm": "Blokér server",
   "confirmations.domain_block.message": "Er du fuldstændig sikker på, at du vil blokere hele {domain}-domænet? Oftest vil nogle få målrettede blokeringer eller skjulninger være tilstrækkelige og at foretrække. Du vil ikke se indhold fra dette domæne i nogle offentlige tidslinjer eller i dine notifikationer, og dine følgere herfra fjernes ligeledes.",
   "confirmations.edit.confirm": "Redigér",
   "confirmations.edit.message": "Redigeres nu, overskrive den besked, der forfattes pt. Fortsæt alligevel?",
   "confirmations.logout.confirm": "Log ud",
   "confirmations.logout.message": "Er du sikker på, at du vil logge ud?",
   "confirmations.mute.confirm": "Skjul (mute)",
-  "confirmations.mute.explanation": "Dette skjuler indlæg fra (og om) dem, men lader dem fortsat se dine indlæg og følge dig.",
-  "confirmations.mute.message": "Er du sikker på, at du vil skjule {name}?",
   "confirmations.redraft.confirm": "Slet og omformulér",
   "confirmations.redraft.message": "Sikker på, at dette indlæg skal slettes og omskrives? Favoritter og boosts går tabt, og svar til det oprindelige indlæg mister tilknytningen.",
   "confirmations.reply.confirm": "Svar",
@@ -205,6 +209,25 @@
   "dismissable_banner.explore_statuses": "Disse indlæg fra diverse sociale netværk vinder fodfæste i dag. Nyere indlæg med flere boosts og favoritter rangeres højere.",
   "dismissable_banner.explore_tags": "Disse hashtages vinder lige nu fodfæste blandt folk på denne og andre servere i det decentraliserede netværk.",
   "dismissable_banner.public_timeline": "Dette er de seneste offentlige indlæg fra folk på det sociale netværk, som folk på {domain} følger.",
+  "domain_block_modal.block": "Blokér server",
+  "domain_block_modal.block_account_instead": "Blokér i stedet @{name}",
+  "domain_block_modal.they_can_interact_with_old_posts": "Folk fra denne server kan interagere med de gamle indlæg.",
+  "domain_block_modal.they_cant_follow": "Ingen fra denne server kan følge dig.",
+  "domain_block_modal.they_wont_know": "Vedkommende ser ikke den aktive blokering.",
+  "domain_block_modal.title": "Blokér domæne?",
+  "domain_block_modal.you_will_lose_followers": "Alle følgerne fra denne server fjernes.",
+  "domain_block_modal.you_wont_see_posts": "Indlæg eller notifikationer fra brugere på denne server vises ikke.",
+  "domain_pill.activitypub_lets_connect": "Det muliggør at komme i forbindelse og interagere med folk ikke kun på Mastodon, men også på tværs af forskellige sociale apps.",
+  "domain_pill.activitypub_like_language": "ActivityPub er \"sproget\", Mastodon taler med andre sociale netværk.",
+  "domain_pill.server": "Server",
+  "domain_pill.their_handle": "Deres handle:",
+  "domain_pill.username": "Brugernavn",
+  "domain_pill.whats_in_a_handle": "Hvad er der i et handle (@brugernavn)?",
+  "domain_pill.who_they_are": "Da et handle fortæller, hvem nogen er, og hvor de er, kan man interagere med folk på tværs af det sociale net af <button>ActivityPub-drevne platforme</button>.",
+  "domain_pill.who_you_are": "Da et handle fortæller, hvem man er, og hvor man er, kan man interagere med folk på tværs af det sociale net af <button>ActivityPub-drevne platforme</button>.",
+  "domain_pill.your_handle": "Dit handle:",
+  "domain_pill.your_server": "Dit digitale hjem, hvor alle dine indlæg lever. Synes ikke om denne? Overfør til enhver tid servere samt tilhængere også.",
+  "domain_pill.your_username": "Din entydige identifikator på denne server. Det er muligt at finde brugere med samme brugernavn på forskellige servere.",
   "embed.instructions": "Indlejr dette indlæg på dit websted ved at kopiere nedenstående kode.",
   "embed.preview": "Sådan kommer det til at se ud:",
   "emoji_button.activity": "Aktivitet",
@@ -402,9 +425,15 @@
   "loading_indicator.label": "Indlæser…",
   "media_gallery.toggle_visible": "{number, plural, one {Skjul billede} other {Skjul billeder}}",
   "moved_to_account_banner.text": "Din konto {disabledAccount} er pt. deaktiveret, da du flyttede til {movedToAccount}.",
-  "mute_modal.duration": "Varighed",
-  "mute_modal.hide_notifications": "Skjul notifikationer fra denne bruger?",
-  "mute_modal.indefinite": "Tidsubegrænset",
+  "mute_modal.hide_from_notifications": "Skjul fra notifikationer",
+  "mute_modal.hide_options": "Skjul valgmuligheder",
+  "mute_modal.indefinite": "Indtil jeg fjerner tavsgørelsen",
+  "mute_modal.show_options": "Vis valgmuligheder",
+  "mute_modal.they_can_mention_and_follow": "Vedkommende kan nævne og følge dig, men vil ikke blive vist.",
+  "mute_modal.they_wont_know": "Vedkommende ser ikke den aktive tavsgørelse.",
+  "mute_modal.title": "Tavsgør bruger?",
+  "mute_modal.you_wont_see_mentions": "Indlæg, som nævner vedkommende, vises ikke.",
+  "mute_modal.you_wont_see_posts": "Vedkommende kan stadig se dine indlæg, med vedkommendes vise ikke.",
   "navigation_bar.about": "Om",
   "navigation_bar.advanced_interface": "Åbn i avanceret webgrænseflade",
   "navigation_bar.blocks": "Blokerede brugere",
diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json
index 17e1ca1dd0204c..412ef31b07cb81 100644
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@@ -89,6 +89,14 @@
   "announcement.announcement": "Ankündigung",
   "attachments_list.unprocessed": "(ausstehend)",
   "audio.hide": "Audio ausblenden",
+  "block_modal.remote_users_caveat": "Wir werden den Server {domain} bitten, deine Entscheidung zu respektieren. Allerdings kann nicht garantiert werden, dass sie eingehalten wird, weil einige Server Blockierungen unterschiedlich handhaben können. Öffentliche Beiträge können für nicht angemeldete Nutzer*innen weiterhin sichtbar sein.",
+  "block_modal.show_less": "Weniger anzeigen",
+  "block_modal.show_more": "Mehr anzeigen",
+  "block_modal.they_cant_mention": "Das Profil wird dich nicht erwähnen oder dir folgen können.",
+  "block_modal.they_cant_see_posts": "Deine Beiträge können nicht mehr angesehen werden und du wirst deren Beiträge nicht mehr sehen.",
+  "block_modal.they_will_know": "Es wird erkennbar sein, dass dieses Profil blockiert wurde.",
+  "block_modal.title": "Profil blockieren?",
+  "block_modal.you_wont_see_mentions": "Du wirst keine Beiträge sehen, die dieses Profil erwähnen.",
   "boost_modal.combo": "Mit {combo} wird dieses Fenster beim nächsten Mal nicht mehr angezeigt",
   "bundle_column_error.copy_stacktrace": "Fehlerbericht kopieren",
   "bundle_column_error.error.body": "Die angeforderte Seite konnte nicht dargestellt werden. Dies könnte auf einen Fehler in unserem Code oder auf ein Browser-Kompatibilitätsproblem zurückzuführen sein.",
@@ -160,9 +168,7 @@
   "compose_form.spoiler.unmarked": "Inhaltswarnung hinzufügen",
   "compose_form.spoiler_placeholder": "Inhaltswarnung (optional)",
   "confirmation_modal.cancel": "Abbrechen",
-  "confirmations.block.block_and_report": "Blockieren und melden",
   "confirmations.block.confirm": "Blockieren",
-  "confirmations.block.message": "Möchtest du {name} wirklich blockieren?",
   "confirmations.cancel_follow_request.confirm": "Anfrage zurückziehen",
   "confirmations.cancel_follow_request.message": "Möchtest du deine Anfrage, {name} zu folgen, wirklich zurückziehen?",
   "confirmations.delete.confirm": "Löschen",
@@ -171,15 +177,13 @@
   "confirmations.delete_list.message": "Möchtest du diese Liste für immer löschen?",
   "confirmations.discard_edit_media.confirm": "Verwerfen",
   "confirmations.discard_edit_media.message": "Du hast Änderungen an der Medienbeschreibung oder -vorschau vorgenommen, die noch nicht gespeichert sind. Trotzdem verwerfen?",
-  "confirmations.domain_block.confirm": "Domain blockieren",
+  "confirmations.domain_block.confirm": "Server blockieren",
   "confirmations.domain_block.message": "Möchtest du die gesamte Domain {domain} wirklich blockieren? In den meisten Fällen reichen ein paar gezielte Blockierungen oder Stummschaltungen aus. Du wirst den Inhalt von dieser Domain nicht in irgendwelchen öffentlichen Timelines oder den Benachrichtigungen finden. Auch deine Follower von dieser Domain werden entfernt.",
   "confirmations.edit.confirm": "Bearbeiten",
   "confirmations.edit.message": "Das Bearbeiten überschreibt die Nachricht, die du gerade verfasst. Möchtest du wirklich fortfahren?",
   "confirmations.logout.confirm": "Abmelden",
   "confirmations.logout.message": "Möchtest du dich wirklich abmelden?",
   "confirmations.mute.confirm": "Stummschalten",
-  "confirmations.mute.explanation": "Dies wird Beiträge von dieser Person und Beiträge, die diese Person erwähnen, ausblenden, aber es wird der Person trotzdem erlauben, deine Beiträge zu sehen und dir zu folgen.",
-  "confirmations.mute.message": "Möchtest du {name} wirklich stummschalten?",
   "confirmations.redraft.confirm": "Löschen und neu erstellen",
   "confirmations.redraft.message": "Möchtest du diesen Beitrag wirklich löschen und neu verfassen? Favoriten und geteilte Beiträge gehen verloren, und Antworten auf den ursprünglichen Beitrag verlieren den Zusammenhang.",
   "confirmations.reply.confirm": "Antworten",
@@ -205,6 +209,27 @@
   "dismissable_banner.explore_statuses": "Diese Beiträge stammen aus dem gesamten sozialen Netzwerk und gewinnen derzeit an Reichweite. Neuere Beiträge, die häufiger geteilt und favorisiert wurden, werden höher eingestuft.",
   "dismissable_banner.explore_tags": "Das sind Hashtags, die derzeit an Reichweite gewinnen. Hashtags, die von vielen verschiedenen Profilen verwendet werden, werden höher eingestuft.",
   "dismissable_banner.public_timeline": "Das sind die neuesten öffentlichen Beiträge von Profilen im sozialen Netzwerk, denen Leute auf {domain} folgen.",
+  "domain_block_modal.block": "Server blockieren",
+  "domain_block_modal.block_account_instead": "Stattdessen @{name} blockieren",
+  "domain_block_modal.they_can_interact_with_old_posts": "Profile von diesem Server werden mit deinen älteren Beiträgen interagieren können.",
+  "domain_block_modal.they_cant_follow": "Niemand von diesem Server wird dir folgen können.",
+  "domain_block_modal.they_wont_know": "Es wird nicht erkennbar sein, dass diese Domain blockiert wurde.",
+  "domain_block_modal.title": "Domain blockieren?",
+  "domain_block_modal.you_will_lose_followers": "Alle Follower von diesem Server werden entfernt.",
+  "domain_block_modal.you_wont_see_posts": "Du wirst keine Beiträge oder Benachrichtigungen von Profilen auf diesem Server sehen.",
+  "domain_pill.activitypub_lets_connect": "Somit kannst du dich nicht nur auf Mastodon mit Leuten verbinden und mit ihnen interagieren, sondern über alle sozialen Apps hinweg.",
+  "domain_pill.activitypub_like_language": "ActivityPub ist sozusagen die Sprache, die Mastodon mit anderen sozialen Netzwerken spricht.",
+  "domain_pill.server": "Server",
+  "domain_pill.their_handle": "Deren Adresse:",
+  "domain_pill.their_server": "Deren digitales Zuhause. Hier „leben“ alle Beiträge von diesem Profil.",
+  "domain_pill.their_username": "Deren eindeutigen Identität auf dem betreffenden Server. Es ist möglich, Profile mit dem gleichen Profilnamen auf verschiedenen Servern zu finden.",
+  "domain_pill.username": "Profilname",
+  "domain_pill.whats_in_a_handle": "Was ist Teil der Adresse?",
+  "domain_pill.who_they_are": "Adressen teilen mit, wer jemand ist und wo sich jemand aufhält. Daher kannst du mit Leuten im gesamten Social Web interagieren, wenn es eine durch <button>ActivityPub angetriebene Plattform</button> ist.",
+  "domain_pill.who_you_are": "Deine Adresse teilt mit, wer du bist und wo du dich aufhältst. Daher können andere Leute im gesamten Social Web mit dir interagieren, wenn es eine durch <button>ActivityPub angetriebene Plattform</button> ist.",
+  "domain_pill.your_handle": "Deine Adresse:",
+  "domain_pill.your_server": "Dein digitales Zuhause. Hier „leben“ alle Beiträge von dir. Dir gefällt es hier nicht? Du kannst jederzeit den Server wechseln und ebenso deine Follower übertragen.",
+  "domain_pill.your_username": "Deine eindeutige Identität auf diesem Server. Es ist möglich, Profile mit dem gleichen Profilnamen auf verschiedenen Servern zu finden.",
   "embed.instructions": "Du kannst diesen Beitrag außerhalb des Fediverse (z. B. auf deiner Website) einbetten, indem du diesen iFrame-Code einfügst.",
   "embed.preview": "Vorschau:",
   "emoji_button.activity": "Aktivitäten",
@@ -284,7 +309,7 @@
   "follow_suggestions.dismiss": "Nicht mehr anzeigen",
   "follow_suggestions.hints.featured": "Dieses Profil wurde vom {domain}-Team ausgewählt.",
   "follow_suggestions.hints.friends_of_friends": "Dieses Profil ist bei deinen Followern beliebt.",
-  "follow_suggestions.hints.most_followed": "Dieses Profil wird von den meisten auf {domain} gefolgt.",
+  "follow_suggestions.hints.most_followed": "Dieses Profil ist eines der am meisten gefolgten auf {domain}.",
   "follow_suggestions.hints.most_interactions": "Dieses Profil erhielt auf {domain} in letzter Zeit viel Aufmerksamkeit.",
   "follow_suggestions.hints.similar_to_recently_followed": "Dieses Profil ähnelt den Profilen, denen du in letzter Zeit gefolgt hast.",
   "follow_suggestions.personalized_suggestion": "Persönliche Empfehlung",
@@ -402,9 +427,15 @@
   "loading_indicator.label": "Wird geladen …",
   "media_gallery.toggle_visible": "{number, plural, one {Medium ausblenden} other {Medien ausblenden}}",
   "moved_to_account_banner.text": "Dein Konto {disabledAccount} ist derzeit deaktiviert, weil du zu {movedToAccount} umgezogen bist.",
-  "mute_modal.duration": "Dauer",
-  "mute_modal.hide_notifications": "Benachrichtigungen dieses Profils ausblenden?",
-  "mute_modal.indefinite": "Unbegrenzt",
+  "mute_modal.hide_from_notifications": "Benachrichtigungen ausblenden",
+  "mute_modal.hide_options": "Einstellungen ausblenden",
+  "mute_modal.indefinite": "Bis ich die Stummschaltung aufhebe",
+  "mute_modal.show_options": "Einstellungen anzeigen",
+  "mute_modal.they_can_mention_and_follow": "Das Profil wird dich weiterhin erwähnen und dir folgen können, aber du wirst davon nichts sehen.",
+  "mute_modal.they_wont_know": "Es wird nicht erkennbar sein, dass dieses Profil stummgeschaltet wurde.",
+  "mute_modal.title": "Profil stummschalten?",
+  "mute_modal.you_wont_see_mentions": "Du wirst keine Beiträge sehen, die dieses Profil erwähnen.",
+  "mute_modal.you_wont_see_posts": "Deine Beiträge können weiterhin angesehen werden, aber du wirst deren Beiträge nicht mehr sehen.",
   "navigation_bar.about": "Über",
   "navigation_bar.advanced_interface": "Im erweiterten Webinterface öffnen",
   "navigation_bar.blocks": "Blockierte Profile",
diff --git a/app/javascript/mastodon/locales/el.json b/app/javascript/mastodon/locales/el.json
index c8d90bf0c5cdbe..937bb5d027c3e5 100644
--- a/app/javascript/mastodon/locales/el.json
+++ b/app/javascript/mastodon/locales/el.json
@@ -154,9 +154,7 @@
   "compose_form.spoiler.unmarked": "Προσθήκη προειδοποίησης περιεχομένου",
   "compose_form.spoiler_placeholder": "Προειδοποίηση περιεχομένου (προαιρετική)",
   "confirmation_modal.cancel": "Άκυρο",
-  "confirmations.block.block_and_report": "Αποκλεισμός & Αναφορά",
   "confirmations.block.confirm": "Αποκλεισμός",
-  "confirmations.block.message": "Σίγουρα θες να αποκλείσεις {name};",
   "confirmations.cancel_follow_request.confirm": "Απόσυρση αιτήματος",
   "confirmations.cancel_follow_request.message": "Είσαι σίγουρος/η ότι θέλεις να αποσύρεις το αίτημά σου να ακολουθείς τον/την {name};",
   "confirmations.delete.confirm": "Διαγραφή",
@@ -165,15 +163,12 @@
   "confirmations.delete_list.message": "Σίγουρα θες να διαγράψεις οριστικά αυτή τη λίστα;",
   "confirmations.discard_edit_media.confirm": "Απόρριψη",
   "confirmations.discard_edit_media.message": "Έχεις μη αποθηκευμένες αλλαγές στην περιγραφή πολυμέσων ή στην προεπισκόπηση, απόρριψη ούτως ή άλλως;",
-  "confirmations.domain_block.confirm": "Αποκλεισμός ολόκληρου του τομέα",
   "confirmations.domain_block.message": "Σίγουρα θες να αποκλείσεις ολόκληρο τον {domain}; Συνήθως μερικοί συγκεκρίμένοι αποκλεισμοί ή σιγάσεις επαρκούν και προτιμούνται. Δεν θα βλέπεις περιεχόμενο από αυτό τον τομέα σε καμία δημόσια ροή ή στις ειδοποιήσεις σου. Όσους ακόλουθους έχεις αυτό αυτό τον τομέα θα αφαιρεθούν.",
   "confirmations.edit.confirm": "Επεξεργασία",
   "confirmations.edit.message": "Αν το επεξεργαστείς τώρα θα αντικατασταθεί το μήνυμα που συνθέτεις. Είσαι σίγουρος ότι θέλεις να συνεχίσεις;",
   "confirmations.logout.confirm": "Αποσύνδεση",
   "confirmations.logout.message": "Σίγουρα θέλεις να αποσυνδεθείς;",
   "confirmations.mute.confirm": "Αποσιώπηση",
-  "confirmations.mute.explanation": "Αυτό θα κρύψει τις δημοσιεύσεις τους και τις δημοσιεύσεις που τους αναφέρουν, αλλά θα συνεχίσουν να μπορούν να βλέπουν τις δημοσιεύσεις σου και να σε ακολουθούν.",
-  "confirmations.mute.message": "Σίγουρα θες να αποσιωπήσεις {name};",
   "confirmations.redraft.confirm": "Διαγραφή & ξαναγράψιμο",
   "confirmations.redraft.message": "Σίγουρα θέλεις να σβήσεις αυτή την ανάρτηση και να την ξαναγράψεις; Οι προτιμήσεις και προωθήσεις θα χαθούν και οι απαντήσεις στην αρχική ανάρτηση θα μείνουν ορφανές.",
   "confirmations.reply.confirm": "Απάντησε",
@@ -366,9 +361,6 @@
   "loading_indicator.label": "Φόρτωση…",
   "media_gallery.toggle_visible": "{number, plural, one {Απόκρυψη εικόνας} other {Απόκρυψη εικόνων}}",
   "moved_to_account_banner.text": "Ο λογαριασμός σου {disabledAccount} είναι προσωρινά απενεργοποιημένος επειδή μεταφέρθηκες στον {movedToAccount}.",
-  "mute_modal.duration": "Διάρκεια",
-  "mute_modal.hide_notifications": "Απόκρυψη ειδοποιήσεων αυτού του χρήστη;",
-  "mute_modal.indefinite": "Επ᾽ αόριστον",
   "navigation_bar.about": "Σχετικά με",
   "navigation_bar.blocks": "Αποκλεισμένοι χρήστες",
   "navigation_bar.bookmarks": "Σελιδοδείκτες",
diff --git a/app/javascript/mastodon/locales/en-GB.json b/app/javascript/mastodon/locales/en-GB.json
index c9b280f84e1886..228a16def241e9 100644
--- a/app/javascript/mastodon/locales/en-GB.json
+++ b/app/javascript/mastodon/locales/en-GB.json
@@ -160,9 +160,7 @@
   "compose_form.spoiler.unmarked": "Add content warning",
   "compose_form.spoiler_placeholder": "Content warning (optional)",
   "confirmation_modal.cancel": "Cancel",
-  "confirmations.block.block_and_report": "Block & Report",
   "confirmations.block.confirm": "Block",
-  "confirmations.block.message": "Are you sure you want to block {name}?",
   "confirmations.cancel_follow_request.confirm": "Withdraw request",
   "confirmations.cancel_follow_request.message": "Are you sure you want to withdraw your request to follow {name}?",
   "confirmations.delete.confirm": "Delete",
@@ -171,15 +169,12 @@
   "confirmations.delete_list.message": "Are you sure you want to permanently delete this list?",
   "confirmations.discard_edit_media.confirm": "Discard",
   "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
-  "confirmations.domain_block.confirm": "Block entire domain",
   "confirmations.domain_block.message": "Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable. You will not see content from that domain in any public timelines or your notifications. Your followers from that domain will be removed.",
   "confirmations.edit.confirm": "Edit",
   "confirmations.edit.message": "Editing now will overwrite the message you are currently composing. Are you sure you want to proceed?",
   "confirmations.logout.confirm": "Log out",
   "confirmations.logout.message": "Are you sure you want to log out?",
   "confirmations.mute.confirm": "Mute",
-  "confirmations.mute.explanation": "This will hide posts from them and posts mentioning them, but it will still allow them to see your posts and follow you.",
-  "confirmations.mute.message": "Are you sure you want to mute {name}?",
   "confirmations.redraft.confirm": "Delete & redraft",
   "confirmations.redraft.message": "Are you sure you want to delete this post and re-draft it? Favourites and boosts will be lost, and replies to the original post will be orphaned.",
   "confirmations.reply.confirm": "Reply",
@@ -393,9 +388,6 @@
   "loading_indicator.label": "Loading…",
   "media_gallery.toggle_visible": "{number, plural, one {Hide image} other {Hide images}}",
   "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.",
-  "mute_modal.duration": "Duration",
-  "mute_modal.hide_notifications": "Hide notifications from this user?",
-  "mute_modal.indefinite": "Indefinite",
   "navigation_bar.about": "About",
   "navigation_bar.advanced_interface": "Open in advanced web interface",
   "navigation_bar.blocks": "Blocked users",
diff --git a/app/javascript/mastodon/locales/eo.json b/app/javascript/mastodon/locales/eo.json
index 1fb4e2bd1115c7..6e7885f485bc90 100644
--- a/app/javascript/mastodon/locales/eo.json
+++ b/app/javascript/mastodon/locales/eo.json
@@ -152,9 +152,7 @@
   "compose_form.spoiler.marked": "Forigi la averton de enhavo",
   "compose_form.spoiler.unmarked": "Aldoni averton de enhavo",
   "confirmation_modal.cancel": "Nuligi",
-  "confirmations.block.block_and_report": "Bloki kaj raporti",
   "confirmations.block.confirm": "Bloki",
-  "confirmations.block.message": "Ĉu vi certas, ke vi volas bloki {name}?",
   "confirmations.cancel_follow_request.confirm": "Eksigi peton",
   "confirmations.cancel_follow_request.message": "Ĉu vi certas ke vi volas eksigi vian peton por sekvi {name}?",
   "confirmations.delete.confirm": "Forigi",
@@ -163,15 +161,12 @@
   "confirmations.delete_list.message": "Ĉu vi certas, ke vi volas porĉiame forigi ĉi tiun liston?",
   "confirmations.discard_edit_media.confirm": "Forĵeti",
   "confirmations.discard_edit_media.message": "Vi havas nekonservitajn ŝanĝojn de la priskribo aŭ la antaŭmontro de la plurmedio, ĉu vi forĵetu ilin malgraŭe?",
-  "confirmations.domain_block.confirm": "Bloki la tutan domajnon",
   "confirmations.domain_block.message": "Ĉu vi vere, vere certas, ke vi volas tute bloki {domain}? Plej ofte, trafa blokado kaj silentigado sufiĉas kaj preferindas. Vi ne vidos enhavon de tiu domajno en publika templinio aŭ en viaj sciigoj. Viaj sekvantoj de tiu domajno estos forigitaj.",
   "confirmations.edit.confirm": "Redakti",
   "confirmations.edit.message": "Redakti nun anstataŭigos la skribatan afiŝon. Ĉu vi certas, ke vi volas daŭrigi?",
   "confirmations.logout.confirm": "Adiaŭi",
   "confirmations.logout.message": "Ĉu vi certas ke vi volas adiaŭi?",
   "confirmations.mute.confirm": "Silentigi",
-  "confirmations.mute.explanation": "Tio kaŝos la mesaĝojn de la uzanto kaj la mesaĝojn kiuj mencias rin, sed ri ankoraŭ rajtos vidi viajn mesaĝojn kaj sekvi vin.",
-  "confirmations.mute.message": "Ĉu vi certas, ke vi volas silentigi {name}?",
   "confirmations.redraft.confirm": "Forigi kaj reskribi",
   "confirmations.redraft.message": "Ĉu vi certas ke vi volas forigi tiun afiŝon kaj reskribi ĝin? Ĉiuj diskonigoj kaj stelumoj estos perditaj, kaj respondoj al la originala mesaĝo estos senparentaj.",
   "confirmations.reply.confirm": "Respondi",
@@ -380,9 +375,6 @@
   "loading_indicator.label": "Ŝargado…",
   "media_gallery.toggle_visible": "{number, plural, one {Kaŝi la bildon} other {Kaŝi la bildojn}}",
   "moved_to_account_banner.text": "Via konto {disabledAccount} estas malvalidigita ĉar vi movis ĝin al {movedToAccount}.",
-  "mute_modal.duration": "Daŭro",
-  "mute_modal.hide_notifications": "Ĉu vi volas kaŝi la sciigojn de ĉi tiu uzanto?",
-  "mute_modal.indefinite": "Nedifinita",
   "navigation_bar.about": "Pri",
   "navigation_bar.advanced_interface": "Malfermi altnivelan retpaĝan interfacon",
   "navigation_bar.blocks": "Blokitaj uzantoj",
diff --git a/app/javascript/mastodon/locales/es-AR.json b/app/javascript/mastodon/locales/es-AR.json
index a573419f4014ba..53144cfcbf9879 100644
--- a/app/javascript/mastodon/locales/es-AR.json
+++ b/app/javascript/mastodon/locales/es-AR.json
@@ -89,6 +89,14 @@
   "announcement.announcement": "Anuncio",
   "attachments_list.unprocessed": "[sin procesar]",
   "audio.hide": "Ocultar audio",
+  "block_modal.remote_users_caveat": "Le pediremos al servidor {domain} que respete tu decisión. Sin embargo, el cumplimiento no está garantizado, ya que algunos servidores pueden manejar los bloqueos de forma diferente. Los mensajes públicos todavía podrían estar visibles para los usuarios no conectados.",
+  "block_modal.show_less": "Mostrar menos",
+  "block_modal.show_more": "Mostrar más",
+  "block_modal.they_cant_mention": "No pueden mencionarte ni seguirte.",
+  "block_modal.they_cant_see_posts": "No pueden ver tus mensajes y vos no verás los suyos.",
+  "block_modal.they_will_know": "Pueden ver que están bloqueados.",
+  "block_modal.title": "¿Bloquear usuario?",
+  "block_modal.you_wont_see_mentions": "No verás mensajes que los mencionen.",
   "boost_modal.combo": "Podés hacer clic en {combo} para saltar esto la próxima vez",
   "bundle_column_error.copy_stacktrace": "Copiar informe de error",
   "bundle_column_error.error.body": "La página solicitada no pudo ser cargada. Podría deberse a un error de programación en nuestro código o a un problema de compatibilidad con el navegador web.",
@@ -160,9 +168,7 @@
   "compose_form.spoiler.unmarked": "Agregar advertencia de contenido",
   "compose_form.spoiler_placeholder": "Advertencia de contenido (opcional)",
   "confirmation_modal.cancel": "Cancelar",
-  "confirmations.block.block_and_report": "Bloquear y denunciar",
   "confirmations.block.confirm": "Bloquear",
-  "confirmations.block.message": "¿Estás seguro que querés bloquear a {name}?",
   "confirmations.cancel_follow_request.confirm": "Retirar solicitud",
   "confirmations.cancel_follow_request.message": "¿Estás seguro que querés retirar tu solicitud para seguir a {name}?",
   "confirmations.delete.confirm": "Eliminar",
@@ -171,15 +177,13 @@
   "confirmations.delete_list.message": "¿Estás seguro que querés eliminar permanentemente esta lista?",
   "confirmations.discard_edit_media.confirm": "Descartar",
   "confirmations.discard_edit_media.message": "Tenés cambios sin guardar en la descripción de medios o en la vista previa, ¿querés descartarlos de todos modos?",
-  "confirmations.domain_block.confirm": "Bloquear dominio entero",
+  "confirmations.domain_block.confirm": "Bloquear servidor",
   "confirmations.domain_block.message": "¿Estás completamente seguro que querés bloquear el {domain} entero? En la mayoría de los casos, unos cuantos bloqueos y silenciados puntuales son suficientes y preferibles. No vas a ver contenido de ese dominio en ninguna de tus líneas temporales o en tus notificaciones. Tus seguidores de ese dominio serán quitados.",
   "confirmations.edit.confirm": "Editar",
   "confirmations.edit.message": "Editar ahora sobreescribirá el mensaje que estás redactando actualmente. ¿Estás seguro que querés seguir?",
   "confirmations.logout.confirm": "Cerrar sesión",
   "confirmations.logout.message": "¿Estás seguro que querés cerrar la sesión?",
   "confirmations.mute.confirm": "Silenciar",
-  "confirmations.mute.explanation": "Se ocultarán los mensajes de esta cuenta y los mensajes de otras cuentas que mencionen a ésta, pero todavía esta cuenta podrá ver tus mensajes o seguirte.",
-  "confirmations.mute.message": "¿Estás seguro que querés silenciar a {name}?",
   "confirmations.redraft.confirm": "Eliminar mensaje original y editarlo",
   "confirmations.redraft.message": "¿Estás seguro que querés eliminar este mensaje y volver a editarlo? Se perderán las veces marcadas como favorito y sus adhesiones, y las respuestas al mensaje original quedarán huérfanas.",
   "confirmations.reply.confirm": "Responder",
@@ -205,6 +209,27 @@
   "dismissable_banner.explore_statuses": "Estos son los mensajes que están ganando popularidad en la web social, hoy mismo. Los mensajes más recientes con más adhesiones y marcados como favoritos obtienen más exposición.",
   "dismissable_banner.explore_tags": "Estas son etiquetas que están ganando popularidad en la web social, hoy mismo. Las etiquetas que son usadas por diferentes cuentas obtienen más exposición.",
   "dismissable_banner.public_timeline": "Estos son los mensajes públicos más recientes de cuentas en la web social que las personas en {domain} siguen.",
+  "domain_block_modal.block": "Bloquear servidor",
+  "domain_block_modal.block_account_instead": "Bloquear @{name} en su lugar",
+  "domain_block_modal.they_can_interact_with_old_posts": "Las cuentas de este servidor pueden interactuar con tus mensajes antiguos.",
+  "domain_block_modal.they_cant_follow": "Nadie de este servidor puede seguirte.",
+  "domain_block_modal.they_wont_know": "No sabrán que fueron bloqueados.",
+  "domain_block_modal.title": "¿Bloquear dominio?",
+  "domain_block_modal.you_will_lose_followers": "Se eliminarán todos tus seguidores de este servidor.",
+  "domain_block_modal.you_wont_see_posts": "No verás mensajes ni notificaciones de usuarios en este servidor.",
+  "domain_pill.activitypub_lets_connect": "Te permite conectar e interactuar con cuentas no solo en Mastodon, sino también a través de diferentes aplicaciones sociales.",
+  "domain_pill.activitypub_like_language": "ActivityPub es como el idioma que Mastodon habla con otras redes sociales.",
+  "domain_pill.server": "Servidor",
+  "domain_pill.their_handle": "Su alias:",
+  "domain_pill.their_server": "Su hogar digital, donde residen todoas sus mensajes.",
+  "domain_pill.their_username": "Su identificador único en su servidor. Es posible encontrar cuentas con el mismo nombre de usuario en diferentes servidores.",
+  "domain_pill.username": "Nombre de usuario",
+  "domain_pill.whats_in_a_handle": "¿En qué consiste el alias?",
+  "domain_pill.who_they_are": "Los alias indican quiénes son y dónde se encuentran, y gracias a ellos podés interactuar con otras cuentas a través de las redes sociales compatibles con <button>ActivityPub</button>.",
+  "domain_pill.who_you_are": "Los alias dicen quién sos y dónde estás, y gracias a ellos podés interactuar con otras cuentas a través de las redes sociales compatibles con <button>ActivityPub</button>.",
+  "domain_pill.your_handle": "Tu alias:",
+  "domain_pill.your_server": "Tu hogar digital, donde residen todos tus mensajes. ¿No te gusta este sitio? Mudate a otro servidor en cualquier momento y llevate a tus seguidores.",
+  "domain_pill.your_username": "Tu identificador único en este servidor. Es posible encontrar cuentas con el mismo nombre de usuario en diferentes servidores.",
   "embed.instructions": "Insertá este mensaje a tu sitio web copiando el código de abajo.",
   "embed.preview": "Así es cómo se verá:",
   "emoji_button.activity": "Actividad",
@@ -402,9 +427,15 @@
   "loading_indicator.label": "Cargando…",
   "media_gallery.toggle_visible": "Ocultar {number, plural, one {imagen} other {imágenes}}",
   "moved_to_account_banner.text": "Tu cuenta {disabledAccount} está actualmente deshabilitada porque te mudaste a {movedToAccount}.",
-  "mute_modal.duration": "Duración",
-  "mute_modal.hide_notifications": "¿Querés ocultar las notificaciones de este usuario?",
-  "mute_modal.indefinite": "Indefinida",
+  "mute_modal.hide_from_notifications": "Ocultar de las notificaciones",
+  "mute_modal.hide_options": "Ocultar opciones",
+  "mute_modal.indefinite": "Hasta que deje de silenciarlos",
+  "mute_modal.show_options": "Mostrar opciones",
+  "mute_modal.they_can_mention_and_follow": "Pueden mencionarte y seguirte, pero no verás nada de ellos.",
+  "mute_modal.they_wont_know": "No sabrán que fueron silenciados.",
+  "mute_modal.title": "¿Silenciar usuario?",
+  "mute_modal.you_wont_see_mentions": "No verás mensajes que los mencionen.",
+  "mute_modal.you_wont_see_posts": "Todavía pueden ver tus mensajes, pero vos no verás los suyos.",
   "navigation_bar.about": "Información",
   "navigation_bar.advanced_interface": "Abrir en interface web avanzada",
   "navigation_bar.blocks": "Usuarios bloqueados",
diff --git a/app/javascript/mastodon/locales/es-MX.json b/app/javascript/mastodon/locales/es-MX.json
index 7df5a384a8f06e..00dcb81461ab13 100644
--- a/app/javascript/mastodon/locales/es-MX.json
+++ b/app/javascript/mastodon/locales/es-MX.json
@@ -89,6 +89,14 @@
   "announcement.announcement": "Anuncio",
   "attachments_list.unprocessed": "(sin procesar)",
   "audio.hide": "Ocultar audio",
+  "block_modal.remote_users_caveat": "Le pediremos al servidor {domain} que respete tu decisión. Sin embargo, el cumplimiento no está garantizado ya que algunos servidores pueden manejar bloques de forma diferente. Las publicaciones públicas pueden ser todavía visibles para los usuarios no conectados.",
+  "block_modal.show_less": "Mostrar menos",
+  "block_modal.show_more": "Mostrar más",
+  "block_modal.they_cant_mention": "No pueden mencionarte ni seguirte.",
+  "block_modal.they_cant_see_posts": "No pueden ver tus publicaciones y tú no verás las de ellos.",
+  "block_modal.they_will_know": "Pueden ver que están bloqueados.",
+  "block_modal.title": "¿Bloquear usuario?",
+  "block_modal.you_wont_see_mentions": "No verás publicaciones que los mencionen.",
   "boost_modal.combo": "Puedes hacer clic en {combo} para saltar este aviso la próxima vez",
   "bundle_column_error.copy_stacktrace": "Copiar informe de error",
   "bundle_column_error.error.body": "La página solicitada no pudo ser renderizada. Podría deberse a un error en nuestro código o a un problema de compatibilidad con el navegador.",
@@ -160,9 +168,7 @@
   "compose_form.spoiler.unmarked": "Texto no oculto",
   "compose_form.spoiler_placeholder": "Advertencia de contenido (opcional)",
   "confirmation_modal.cancel": "Cancelar",
-  "confirmations.block.block_and_report": "Bloquear y Denunciar",
   "confirmations.block.confirm": "Bloquear",
-  "confirmations.block.message": "¿Estás seguro de querer bloquear a {name}?",
   "confirmations.cancel_follow_request.confirm": "Retirar solicitud",
   "confirmations.cancel_follow_request.message": "¿Estás seguro de que deseas retirar tu solicitud para seguir a {name}?",
   "confirmations.delete.confirm": "Eliminar",
@@ -171,15 +177,13 @@
   "confirmations.delete_list.message": "¿Seguro que quieres borrar esta lista permanentemente?",
   "confirmations.discard_edit_media.confirm": "Descartar",
   "confirmations.discard_edit_media.message": "Tienes cambios sin guardar en la descripción o vista previa del archivo, ¿deseas descartarlos de cualquier manera?",
-  "confirmations.domain_block.confirm": "Ocultar dominio entero",
+  "confirmations.domain_block.confirm": "Bloquear servidor",
   "confirmations.domain_block.message": "¿Seguro de que quieres bloquear al dominio {domain} entero? En general unos cuantos bloqueos y silenciados concretos es suficiente y preferible.",
   "confirmations.edit.confirm": "Editar",
   "confirmations.edit.message": "Editar sobrescribirá el mensaje que estás escribiendo. ¿Estás seguro de que deseas continuar?",
   "confirmations.logout.confirm": "Cerrar sesión",
   "confirmations.logout.message": "¿Estás seguro de querer cerrar la sesión?",
   "confirmations.mute.confirm": "Silenciar",
-  "confirmations.mute.explanation": "Esto esconderá las publicaciones de ellos y en las que los has mencionado, pero les permitirá ver tus mensajes y seguirte.",
-  "confirmations.mute.message": "¿Estás seguro de que quieres silenciar a {name}?",
   "confirmations.redraft.confirm": "Borrar y volver a borrador",
   "confirmations.redraft.message": "¿Estás seguro que quieres borrar esta publicación y editarla? Los favoritos e impulsos se perderán, y las respuestas a la publicación original quedarán separadas.",
   "confirmations.reply.confirm": "Responder",
@@ -205,6 +209,27 @@
   "dismissable_banner.explore_statuses": "Estas son las publicaciones que están en tendencia en la red ahora. Las publicaciones recientes con más impulsos y favoritos se muestran más arriba.",
   "dismissable_banner.explore_tags": "Se trata de hashtags que están ganando adeptos en las redes sociales hoy en día. Los hashtags que son utilizados por más personas diferentes se clasifican mejor.",
   "dismissable_banner.public_timeline": "Estos son los toots públicos más recientes de personas en la web social a las que sigue la gente en {domain}.",
+  "domain_block_modal.block": "Bloquear servidor",
+  "domain_block_modal.block_account_instead": "Bloquear @{name} en su lugar",
+  "domain_block_modal.they_can_interact_with_old_posts": "Las personas de este servidor pueden interactuar con tus publicaciones antiguas.",
+  "domain_block_modal.they_cant_follow": "Nadie de este servidor puede seguirte.",
+  "domain_block_modal.they_wont_know": "No sabrán que han sido bloqueados.",
+  "domain_block_modal.title": "¿Bloquear dominio?",
+  "domain_block_modal.you_will_lose_followers": "Todos tus seguidores de este servidor serán eliminados.",
+  "domain_block_modal.you_wont_see_posts": "No verás publicaciones ni notificaciones de usuarios en este servidor.",
+  "domain_pill.activitypub_lets_connect": "Te permite conectar e interactuar con personas no sólo en Mastodon, sino también a través de diferentes aplicaciones sociales.",
+  "domain_pill.activitypub_like_language": "ActivityPub es como el idioma que Mastodon habla con otras redes sociales.",
+  "domain_pill.server": "Servidor",
+  "domain_pill.their_handle": "Su alias:",
+  "domain_pill.their_server": "Su hogar digital, donde residen todas sus publicaciones.",
+  "domain_pill.their_username": "Su identificador único en su servidor. Es posible encontrar usuarios con el mismo nombre de usuario en diferentes servidores.",
+  "domain_pill.username": "Nombre de usuario",
+  "domain_pill.whats_in_a_handle": "¿En qué consiste el alias?",
+  "domain_pill.who_they_are": "Los alias indican quiénes son y dónde se encuentran, puedes interactuar con personas a través de las redes sociales de <button>plataformas que utilizan ActivityPub</button>.",
+  "domain_pill.who_you_are": "Los alias indican quién eres y dónde te encuentras, las personas pueden interactuar contigo a través de las redes sociales de <button>plataformas que utilizan ActivityPub</button>.",
+  "domain_pill.your_handle": "Tu alias:",
+  "domain_pill.your_server": "Tu hogar digital, donde residen todas tus publicaciones. ¿No te gusta este sitio? Muévete a otro servidor en cualquier momento y llévate a tus seguidores.",
+  "domain_pill.your_username": "Tu identificador único en este servidor. Es posible encontrar usuarios con el mismo nombre de usuario en diferentes servidores.",
   "embed.instructions": "Añade este toot a tu sitio web con el siguiente código.",
   "embed.preview": "Así es como se verá:",
   "emoji_button.activity": "Actividad",
@@ -402,9 +427,15 @@
   "loading_indicator.label": "Cargando…",
   "media_gallery.toggle_visible": "Cambiar visibilidad",
   "moved_to_account_banner.text": "Tu cuenta {disabledAccount} está actualmente deshabilitada porque te has mudado a {movedToAccount}.",
-  "mute_modal.duration": "Duración",
-  "mute_modal.hide_notifications": "Ocultar notificaciones de este usuario?",
-  "mute_modal.indefinite": "Indefinida",
+  "mute_modal.hide_from_notifications": "Ocultar de las notificaciones",
+  "mute_modal.hide_options": "Ocultar opciones",
+  "mute_modal.indefinite": "Hasta que deje de silenciarlos",
+  "mute_modal.show_options": "Mostrar opciones",
+  "mute_modal.they_can_mention_and_follow": "Pueden mencionarte y seguirte, pero no verás nada de ellos.",
+  "mute_modal.they_wont_know": "No sabrán que han sido silenciados.",
+  "mute_modal.title": "¿Silenciar usuario?",
+  "mute_modal.you_wont_see_mentions": "No verás publicaciones que los mencionen.",
+  "mute_modal.you_wont_see_posts": "Todavía pueden ver tus publicaciones, pero tú no verás las de ellos.",
   "navigation_bar.about": "Acerca de",
   "navigation_bar.advanced_interface": "Abrir en interfaz web avanzada",
   "navigation_bar.blocks": "Usuarios bloqueados",
diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json
index 5ba7179cba31a1..728f4d05fc11f2 100644
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@@ -89,6 +89,14 @@
   "announcement.announcement": "Anuncio",
   "attachments_list.unprocessed": "(sin procesar)",
   "audio.hide": "Ocultar audio",
+  "block_modal.remote_users_caveat": "Le pediremos al servidor {domain} que respete tu decisión. Sin embargo, el cumplimiento no está garantizado, ya que algunos servidores pueden manejar bloqueos de forma distinta. Los mensajes públicos pueden ser todavía visibles para los usuarios que no hayan iniciado sesión.",
+  "block_modal.show_less": "Mostrar menos",
+  "block_modal.show_more": "Mostrar más",
+  "block_modal.they_cant_mention": "No pueden mencionarte ni seguirte.",
+  "block_modal.they_cant_see_posts": "No pueden ver tus publicaciones y tú no verás las suyas.",
+  "block_modal.they_will_know": "Pueden ver que están bloqueados.",
+  "block_modal.title": "¿Bloquear usuario?",
+  "block_modal.you_wont_see_mentions": "No verás mensajes que los mencionen.",
   "boost_modal.combo": "Puedes hacer clic en {combo} para saltar este aviso la próxima vez",
   "bundle_column_error.copy_stacktrace": "Copiar informe de error",
   "bundle_column_error.error.body": "La página solicitada no pudo ser renderizada. Podría deberse a un error en nuestro código o a un problema de compatibilidad con el navegador.",
@@ -160,9 +168,7 @@
   "compose_form.spoiler.unmarked": "Añadir advertencia de contenido",
   "compose_form.spoiler_placeholder": "Advertencia de contenido (opcional)",
   "confirmation_modal.cancel": "Cancelar",
-  "confirmations.block.block_and_report": "Bloquear y Reportar",
   "confirmations.block.confirm": "Bloquear",
-  "confirmations.block.message": "¿Estás seguro de que quieres bloquear a {name}?",
   "confirmations.cancel_follow_request.confirm": "Retirar solicitud",
   "confirmations.cancel_follow_request.message": "¿Estás seguro de que deseas retirar tu solicitud para seguir a {name}?",
   "confirmations.delete.confirm": "Eliminar",
@@ -171,15 +177,13 @@
   "confirmations.delete_list.message": "¿Seguro que quieres borrar esta lista permanentemente?",
   "confirmations.discard_edit_media.confirm": "Descartar",
   "confirmations.discard_edit_media.message": "Tienes cambios sin guardar en la descripción o vista previa del archivo audiovisual, ¿descartarlos de todos modos?",
-  "confirmations.domain_block.confirm": "Bloquear todo el dominio",
+  "confirmations.domain_block.confirm": "Bloquear servidor",
   "confirmations.domain_block.message": "¿Seguro que quieres bloquear todo el dominio {domain}? En general, unos cuantos bloqueos y silenciados concretos es suficiente y preferible. No verás contenido del dominio en ninguna cronología pública ni en tus notificaciones. Se eliminarán tus seguidores procedentes de ese dominio.",
   "confirmations.edit.confirm": "Editar",
   "confirmations.edit.message": "Editar ahora reemplazará el mensaje que estás escribiendo. ¿Seguro que quieres proceder?",
   "confirmations.logout.confirm": "Cerrar sesión",
   "confirmations.logout.message": "¿Seguro que quieres cerrar la sesión?",
   "confirmations.mute.confirm": "Silenciar",
-  "confirmations.mute.explanation": "Esto esconderá sus publicaciones y las publicaciones que los mencionen, pero podrán seguir viendo tus mensajes y seguirte.",
-  "confirmations.mute.message": "¿Seguro que quieres silenciar a {name}?",
   "confirmations.redraft.confirm": "Borrar y volver a borrador",
   "confirmations.redraft.message": "¿Estás seguro de querer borrar esta publicación y reescribirla? Los favoritos e impulsos se perderán, y las respuestas a la publicación original quedarán sin contexto.",
   "confirmations.reply.confirm": "Responder",
@@ -205,6 +209,27 @@
   "dismissable_banner.explore_statuses": "Estas son las publicaciones que están ganando popularidad en la web social hoy. Las publicaciones recientes con más impulsos y favoritos obtienen más exposición.",
   "dismissable_banner.explore_tags": "Estas son las etiquetas que están ganando popularidad hoy en la red. Etiquetas que se usan por personas diferentes se puntúan más alto.",
   "dismissable_banner.public_timeline": "Estas son las publicaciones más recientes de personas en el Fediverso que siguen las personas de {domain}.",
+  "domain_block_modal.block": "Bloquear servidor",
+  "domain_block_modal.block_account_instead": "Bloquear @{name} en su lugar",
+  "domain_block_modal.they_can_interact_with_old_posts": "Las personas de este servidor pueden interactuar con tus publicaciones antiguas.",
+  "domain_block_modal.they_cant_follow": "Nadie de este servidor puede seguirte.",
+  "domain_block_modal.they_wont_know": "No sabrán que han sido bloqueados.",
+  "domain_block_modal.title": "¿Bloquear dominio?",
+  "domain_block_modal.you_will_lose_followers": "Se eliminarán todos tus seguidores de este servidor.",
+  "domain_block_modal.you_wont_see_posts": "No verás mensajes ni notificaciones de usuarios en este servidor.",
+  "domain_pill.activitypub_lets_connect": "Te permite conectar e interactuar con personas no sólo en Mastodon, sino también a través de diferentes aplicaciones sociales.",
+  "domain_pill.activitypub_like_language": "ActivityPub es como el idioma que Mastodon habla con otras redes sociales.",
+  "domain_pill.server": "Servidor",
+  "domain_pill.their_handle": "Su alias:",
+  "domain_pill.their_server": "Su hogar digital, donde residen todas sus publicaciones.",
+  "domain_pill.their_username": "Su identificador único en su servidor. Es posible encontrar usuarios con el mismo nombre de usuario en diferentes servidores.",
+  "domain_pill.username": "Nombre de usuario",
+  "domain_pill.whats_in_a_handle": "¿En qué consiste el alias?",
+  "domain_pill.who_they_are": "Los alias indican quiénes son y dónde se encuentran, y gracias a ellos puedes interactuar con personas a través de las redes sociales compatibles con <button>ActivityPub</button>.",
+  "domain_pill.who_you_are": "Los alias indican quién eres y dónde te encuentras, y gracias a ellos puedes interactuar con personas a través de las redes sociales compatibles con <button>ActivityPub</button>.",
+  "domain_pill.your_handle": "Tu alias:",
+  "domain_pill.your_server": "Tu hogar digital, donde residen todas tus publicaciones. ¿No te gusta este sitio? Muévete a otro servidor en cualquier momento y llévate a tus seguidores.",
+  "domain_pill.your_username": "Tu identificador único en este servidor. Es posible encontrar usuarios con el mismo nombre de usuario en diferentes servidores.",
   "embed.instructions": "Añade esta publicación a tu sitio web con el siguiente código.",
   "embed.preview": "Así es como se verá:",
   "emoji_button.activity": "Actividad",
@@ -402,9 +427,15 @@
   "loading_indicator.label": "Cargando…",
   "media_gallery.toggle_visible": "Cambiar visibilidad",
   "moved_to_account_banner.text": "Tu cuenta {disabledAccount} está actualmente deshabilitada porque te has mudado a {movedToAccount}.",
-  "mute_modal.duration": "Duración",
-  "mute_modal.hide_notifications": "¿Ocultar notificaciones de este usuario?",
-  "mute_modal.indefinite": "Indefinida",
+  "mute_modal.hide_from_notifications": "Ocultar de las notificaciones",
+  "mute_modal.hide_options": "Ocultar opciones",
+  "mute_modal.indefinite": "Hasta que deje de silenciarlos",
+  "mute_modal.show_options": "Mostrar opciones",
+  "mute_modal.they_can_mention_and_follow": "Pueden mencionarte y seguirte, pero no verás nada de ellos.",
+  "mute_modal.they_wont_know": "No sabrán que han sido silenciados.",
+  "mute_modal.title": "¿Silenciar usuario?",
+  "mute_modal.you_wont_see_mentions": "No verás mensajes que los mencionen.",
+  "mute_modal.you_wont_see_posts": "Todavía pueden ver tus publicaciones, pero tú no verás las suyas.",
   "navigation_bar.about": "Acerca de",
   "navigation_bar.advanced_interface": "Abrir en la interfaz web avanzada",
   "navigation_bar.blocks": "Usuarios bloqueados",
@@ -483,7 +514,7 @@
   "notifications.policy.filter_not_followers_title": "Personas que no te siguen",
   "notifications.policy.filter_not_following_hint": "Hasta que las apruebes manualmente",
   "notifications.policy.filter_not_following_title": "Personas que no sigues",
-  "notifications.policy.filter_private_mentions_hint": "Filtrada, a menos que sea en respuesta a tu propia mención, o si sigues al remitente",
+  "notifications.policy.filter_private_mentions_hint": "Filtradas a menos que sea en respuesta a tu propia mención, o si sigues al remitente",
   "notifications.policy.filter_private_mentions_title": "Menciones privadas no solicitadas",
   "notifications.policy.title": "Filtrar notificaciones de…",
   "notifications_permission_banner.enable": "Habilitar notificaciones de escritorio",
diff --git a/app/javascript/mastodon/locales/et.json b/app/javascript/mastodon/locales/et.json
index 69c59f101a4886..f617ced6ea8386 100644
--- a/app/javascript/mastodon/locales/et.json
+++ b/app/javascript/mastodon/locales/et.json
@@ -89,6 +89,10 @@
   "announcement.announcement": "Teadaanne",
   "attachments_list.unprocessed": "(töötlemata)",
   "audio.hide": "Peida audio",
+  "block_modal.remote_users_caveat": "Serverile {domain} edastatakse palve otsust järgida. Ometi pole see tagatud, kuna mõned serverid võivad blokeeringuid käsitleda omal moel. Avalikud postitused võivad tuvastamata kasutajatele endiselt näha olla.",
+  "block_modal.show_less": "Kuva vähem",
+  "block_modal.show_more": "Kuva rohkem",
+  "block_modal.title": "Blokeeri kasutaja?",
   "boost_modal.combo": "Vajutades {combo}, saab selle edaspidi vahele jätta",
   "bundle_column_error.copy_stacktrace": "Kopeeri veateade",
   "bundle_column_error.error.body": "Soovitud lehte ei õnnestunud esitada. See võib olla meie koodiviga või probleem brauseri ühilduvusega.",
@@ -160,9 +164,7 @@
   "compose_form.spoiler.unmarked": "Märgi sisu tundlikuks",
   "compose_form.spoiler_placeholder": "Sisuhoiatus (valikuline)",
   "confirmation_modal.cancel": "Katkesta",
-  "confirmations.block.block_and_report": "Blokeeri ja teata",
   "confirmations.block.confirm": "Blokeeri",
-  "confirmations.block.message": "Oled kindel, et soovid blokeerida {name}?",
   "confirmations.cancel_follow_request.confirm": "Tühista taotlus",
   "confirmations.cancel_follow_request.message": "Oled kindel, et soovid kasutaja {name} jälgimistaotluse tagasi võtta?",
   "confirmations.delete.confirm": "Kustuta",
@@ -171,15 +173,13 @@
   "confirmations.delete_list.message": "Oled kindel, et soovid selle loetelu pöördumatult kustutada?",
   "confirmations.discard_edit_media.confirm": "Hülga",
   "confirmations.discard_edit_media.message": "Sul on salvestamata muudatusi meediakirjelduses või eelvaates, kas hülgad need?",
-  "confirmations.domain_block.confirm": "Peida terve domeen",
+  "confirmations.domain_block.confirm": "Blokeeri server",
   "confirmations.domain_block.message": "Oled ikka päris-päris kindel, et soovid blokeerida terve {domain}? Enamikel juhtudel piisab mõnest sihitud blokist või vaigistusest, mis on eelistatavam. Sa ei näe selle domeeni sisu ühelgi avalikul ajajoonel või enda teadetes. Su jälgijad sellest domeenist eemaldatakse.",
   "confirmations.edit.confirm": "Muuda",
   "confirmations.edit.message": "Muutes praegu kirjutatakse hetkel loodav sõnum üle. Kas oled kindel, et soovid jätkata?",
   "confirmations.logout.confirm": "Välju",
   "confirmations.logout.message": "Kas oled kindel, et soovid välja logida?",
   "confirmations.mute.confirm": "Vaigista",
-  "confirmations.mute.explanation": "See peidab tema postitused ning postitused, milles teda mainitakse, kuid lubab tal ikkagi sinu postitusi näha ning sind jälgida.",
-  "confirmations.mute.message": "Oled kindel, et soovid {name} vaigistada?",
   "confirmations.redraft.confirm": "Kustuta & taasalusta",
   "confirmations.redraft.message": "Kindel, et soovid postituse kustutada ja võtta uue aluseks? Lemmikuks märkimised ja jagamised lähevad kaotsi ning vastused jäävad ilma algse postituseta.",
   "confirmations.reply.confirm": "Vasta",
@@ -205,6 +205,9 @@
   "dismissable_banner.explore_statuses": "Need postitused üle sotsiaalse võrgu koguvad praegu tähelepanu. Uued postitused, millel on rohkem jagamisi ja lemmikuks märkimisi, on kõrgemal kohal.",
   "dismissable_banner.explore_tags": "Need sildid siit ja teistes serveritest detsentraliseeritud võrgus koguvad tähelepanu just praegu selles serveris.",
   "dismissable_banner.public_timeline": "Need on kõige uuemad avalikud postitused inimestelt sotsiaalvõrgustikus, mida {domain} inimesed jälgivad.",
+  "domain_block_modal.block": "Blokeeri server",
+  "domain_pill.server": "Server",
+  "domain_pill.username": "Kasutajanimi",
   "embed.instructions": "Lisa see postitus oma veebilehele, kopeerides alloleva koodi.",
   "embed.preview": "Nii näeb see välja:",
   "emoji_button.activity": "Tegevus",
@@ -400,9 +403,8 @@
   "loading_indicator.label": "Laadimine…",
   "media_gallery.toggle_visible": "{number, plural, one {Varja pilt} other {Varja pildid}}",
   "moved_to_account_banner.text": "Kontot {disabledAccount} ei ole praegu võimalik kasutada, sest kolisid kontole {movedToAccount}.",
-  "mute_modal.duration": "Kestus",
-  "mute_modal.hide_notifications": "Kas peita teated sellelt kasutajalt?",
-  "mute_modal.indefinite": "Lõpmatu",
+  "mute_modal.hide_options": "Peida valikud",
+  "mute_modal.show_options": "Kuva valikud",
   "navigation_bar.about": "Teave",
   "navigation_bar.advanced_interface": "Ava kohandatud veebiliides",
   "navigation_bar.blocks": "Blokeeritud kasutajad",
@@ -440,6 +442,8 @@
   "notification.reblog": "{name} jagas edasi postitust",
   "notification.status": "{name} just postitas",
   "notification.update": "{name} muutis postitust",
+  "notification_requests.accept": "Nõus",
+  "notification_requests.dismiss": "Hülga",
   "notifications.clear": "Puhasta teated",
   "notifications.clear_confirmation": "Oled kindel, et soovid püsivalt kõik oma teated eemaldada?",
   "notifications.column_settings.admin.report": "Uued teavitused:",
@@ -471,6 +475,7 @@
   "notifications.permission_denied": "Töölauamärguanded pole saadaval, kuna eelnevalt keelduti lehitsejale teavituste luba andmast",
   "notifications.permission_denied_alert": "Töölaua märguandeid ei saa lubada, kuna brauseri luba on varem keeldutud",
   "notifications.permission_required": "Töölaua märguanded ei ole saadaval, kuna vajalik luba pole antud.",
+  "notifications.policy.filter_new_accounts_title": "Uued kontod",
   "notifications_permission_banner.enable": "Luba töölaua märguanded",
   "notifications_permission_banner.how_to_control": "Et saada teateid, ajal mil Mastodon pole avatud, luba töölauamärguanded. Saad täpselt määrata, mis tüüpi tegevused tekitavad märguandeid, kasutates peale teadaannete sisse lülitamist üleval olevat nuppu {icon}.",
   "notifications_permission_banner.title": "Ära jää millestki ilma",
diff --git a/app/javascript/mastodon/locales/eu.json b/app/javascript/mastodon/locales/eu.json
index 90b691ceb647c6..aae678a7d6188e 100644
--- a/app/javascript/mastodon/locales/eu.json
+++ b/app/javascript/mastodon/locales/eu.json
@@ -89,6 +89,14 @@
   "announcement.announcement": "Iragarpena",
   "attachments_list.unprocessed": "(prozesatu gabe)",
   "audio.hide": "Ezkutatu audioa",
+  "block_modal.remote_users_caveat": "{domain} zerbitzariari zure erabakia errespeta dezan eskatuko diogu. Halere, araua beteko den ezin da bermatu, zerbitzari batzuk modu desberdinean kudeatzen baitituzte blokeoak. Baliteke argitalpen publikoak saioa hasi ez duten erabiltzaileentzat ikusgai egotea.",
+  "block_modal.show_less": "Erakutsi gutxiago",
+  "block_modal.show_more": "Erakutsi gehiago",
+  "block_modal.they_cant_mention": "Ezin zaitu aipatu ezta jarraitu ere.",
+  "block_modal.they_cant_see_posts": "Ezin ditu zure bidalketak ikusi eta zuk ez dituzu bereak ikusiko.",
+  "block_modal.they_will_know": "Ezin du ikusi blokeatuta duzunik.",
+  "block_modal.title": "Erabiltzailea blokeatu nahi duzu?",
+  "block_modal.you_wont_see_mentions": "Ez duzu ikusiko bera aipatzen duen argitalpenik.",
   "boost_modal.combo": "{combo} sakatu dezakezu hurrengoan hau saltatzeko",
   "bundle_column_error.copy_stacktrace": "Kopiatu errore-txostena",
   "bundle_column_error.error.body": "Eskatutako orria ezin izan da bistaratu. Kodeko errore bategatik izan daiteke edo nabigatzailearen bateragarritasun arazo bategatik.",
@@ -160,9 +168,7 @@
   "compose_form.spoiler.unmarked": "Testua ez dago ezkutatuta",
   "compose_form.spoiler_placeholder": "Edukiaren abisua (aukerakoa)",
   "confirmation_modal.cancel": "Utzi",
-  "confirmations.block.block_and_report": "Blokeatu eta salatu",
   "confirmations.block.confirm": "Blokeatu",
-  "confirmations.block.message": "Ziur {name} blokeatu nahi duzula?",
   "confirmations.cancel_follow_request.confirm": "Baztertu eskaera",
   "confirmations.cancel_follow_request.message": "Ziur {name} jarraitzeko eskaera bertan behera utzi nahi duzula?",
   "confirmations.delete.confirm": "Ezabatu",
@@ -171,15 +177,13 @@
   "confirmations.delete_list.message": "Ziur behin betiko ezabatu nahi duzula zerrenda hau?",
   "confirmations.discard_edit_media.confirm": "Baztertu",
   "confirmations.discard_edit_media.message": "Multimediaren deskribapen edo aurrebistan gorde gabeko aldaketak daude, baztertu nahi dituzu?",
-  "confirmations.domain_block.confirm": "Ezkutatu domeinu osoa",
+  "confirmations.domain_block.confirm": "Blokeatu zerbitzaria",
   "confirmations.domain_block.message": "Ziur, erabat ziur, {domain} domeinu osoa blokeatu nahi duzula? Gehienetan gutxi batzuk blokeatu edo mututzearekin nahikoa da. Ez duzu domeinu horretako edukirik ikusiko denbora lerroetan edo jakinarazpenetan. Domeinu horretako zure jarraitzaileak kenduko dira ere.",
   "confirmations.edit.confirm": "Editatu",
   "confirmations.edit.message": "Orain editatzen baduzu, une honetan idazten ari zaren mezua gainidatziko da. Ziur jarraitu nahi duzula?",
   "confirmations.logout.confirm": "Amaitu saioa",
   "confirmations.logout.message": "Ziur saioa amaitu nahi duzula?",
   "confirmations.mute.confirm": "Mututu",
-  "confirmations.mute.explanation": "Honek horko bidalketak eta aipamena egiten dietenak ezkutatuko ditu, baina beraiek zure bidalketak ikusi ahal izango dituzte eta zuri jarraitu.",
-  "confirmations.mute.message": "Ziur {name} mututu nahi duzula?",
   "confirmations.redraft.confirm": "Ezabatu eta berridatzi",
   "confirmations.redraft.message": "Ziur argitalpen hau ezabatu eta zirriborroa berriro egitea nahi duzula? Gogokoak eta bultzadak galduko dira, eta jatorrizko argitalpenaren erantzunak zurtz geratuko dira.",
   "confirmations.reply.confirm": "Erantzun",
@@ -205,6 +209,27 @@
   "dismissable_banner.explore_statuses": "Hauek dira gaur egun lekua hartzen ari diren sare sozial osoaren argitalpenak. Bultzada eta gogoko gehien dituzten argitalpen berrienek sailkapen altuagoa dute.",
   "dismissable_banner.explore_tags": "Traola hauek daude bogan orain zerbitzari honetan eta sare deszentralizatuko besteetan.",
   "dismissable_banner.public_timeline": "Hauek dira {domain}-(e)ko jendeak web sozialean jarraitzen dituen jendearen azkeneko argitalpen publikoak.",
+  "domain_block_modal.block": "Blokeatu zerbitzaria",
+  "domain_block_modal.block_account_instead": "Blokeatu @{name} bestela",
+  "domain_block_modal.they_can_interact_with_old_posts": "Zerbitzari honetako jendea zure argitalpen zaharrekin elkarreragin dezake.",
+  "domain_block_modal.they_cant_follow": "Zerbitzari honetako inork ezin zaitu jarraitu.",
+  "domain_block_modal.they_wont_know": "Ez dute jakingo blokeatuak izan direnik.",
+  "domain_block_modal.title": "Domeinua blokeatu nahi duzu?",
+  "domain_block_modal.you_will_lose_followers": "Zerbitzari honetako jarraitzaile guztiak kenduko dira.",
+  "domain_block_modal.you_wont_see_posts": "Ez dituzu zerbitzari honetako erabiltzaileen argitalpenik edota jakinarazpenik ikusiko.",
+  "domain_pill.activitypub_lets_connect": "Mastodon-en ez ezik, beste sare sozialen aplikazioetako jendearekin konektatzea eta harremanetan jartzea uzten dizu.",
+  "domain_pill.activitypub_like_language": "ActivityPub, Mastodon-ek beste sare sozialekin hitz egiteko erabiltzen duen hizkuntza bezalakoxea da.",
+  "domain_pill.server": "Zerbitzaria",
+  "domain_pill.their_handle": "Bere helbidea:",
+  "domain_pill.their_server": "Bere etxe digitala, non bere argitalpenak dauden.",
+  "domain_pill.their_username": "Zerbitzarian duen identifikatzaile bakarra. Baliteke erabiltzaile-izen bera duten erabiltzaileak zerbitzari desberdinetan aurkitzea.",
+  "domain_pill.username": "Erabiltzaile-izena",
+  "domain_pill.whats_in_a_handle": "Zer dago helbide batean?",
+  "domain_pill.who_they_are": "Helbideek norbait nor den eta non dagoen adierazten dute, <button>ActivityPub darabilten plataformen</button> sare sozialeko jendearekin jar zaitezke harremanetan.",
+  "domain_pill.who_you_are": "Zure helbideak nor zaren eta non zauden adierazten duenez, jendea <button>ActivityPub darabilten plataformen</button> sare sozialen bitartez jar daiteke zurekin harremanetan.",
+  "domain_pill.your_handle": "Zure helbidea:",
+  "domain_pill.your_server": "Zure etxe digitala, non zure bidalketak dauden. Ez al zaizu gustatzen? Transferitu zerbitzariak edonoiz eta ekarri zure jarraitzaileak ere.",
+  "domain_pill.your_username": "Zerbitzarian duzun identifikatzaile bakarra. Baliteke erabiltzaile-izen bera duten erabiltzaileak zerbitzari desberdinetan aurkitzea.",
   "embed.instructions": "Txertatu bidalketa hau zure webgunean beheko kodea kopiatuz.",
   "embed.preview": "Hau da izango duen itxura:",
   "emoji_button.activity": "Jarduera",
@@ -402,9 +427,15 @@
   "loading_indicator.label": "Kargatzen…",
   "media_gallery.toggle_visible": "Txandakatu ikusgaitasuna",
   "moved_to_account_banner.text": "Zure {disabledAccount} kontua desgaituta dago une honetan, {movedToAccount} kontura aldatu zinelako.",
-  "mute_modal.duration": "Iraupena",
-  "mute_modal.hide_notifications": "Ezkutatu erabiltzaile honen jakinarazpenak?",
-  "mute_modal.indefinite": "Zehaztu gabe",
+  "mute_modal.hide_from_notifications": "Ezkutatu jakinarazpenetatik",
+  "mute_modal.hide_options": "Ezkutatu aukerak",
+  "mute_modal.indefinite": "Desmututua izan arte",
+  "mute_modal.show_options": "Erakutsi aukerak",
+  "mute_modal.they_can_mention_and_follow": "Aipa eta jarrai zaitzakete, baina ez dituzu ikusiko.",
+  "mute_modal.they_wont_know": "Ez dute jakingo mututuak izan direnik.",
+  "mute_modal.title": "Erabiltzailea mututu nahi duzu?",
+  "mute_modal.you_wont_see_mentions": "Ez duzu ikusiko bera aipatzen duen argitalpenik.",
+  "mute_modal.you_wont_see_posts": "Zure argitalpenak ikus ditzake, baina ez dituzu bereak ikusiko.",
   "navigation_bar.about": "Honi buruz",
   "navigation_bar.advanced_interface": "Ireki web interfaze aurreratuan",
   "navigation_bar.blocks": "Blokeatutako erabiltzaileak",
diff --git a/app/javascript/mastodon/locales/fa.json b/app/javascript/mastodon/locales/fa.json
index aaa01a5dc707d2..b784a1d5c0593a 100644
--- a/app/javascript/mastodon/locales/fa.json
+++ b/app/javascript/mastodon/locales/fa.json
@@ -160,9 +160,7 @@
   "compose_form.spoiler.unmarked": "افزودن هشدار محتوا",
   "compose_form.spoiler_placeholder": "هشدار محتوا (اختیاری)",
   "confirmation_modal.cancel": "لغو",
-  "confirmations.block.block_and_report": "انسداد و گزارش",
   "confirmations.block.confirm": "انسداد",
-  "confirmations.block.message": "مطمئنید که می‌خواهید {name} را مسدود کنید؟",
   "confirmations.cancel_follow_request.confirm": "رد کردن درخواست",
   "confirmations.cancel_follow_request.message": "مطمئنید که می خواهید درخواست پی‌گیری {name} را لغو کنید؟",
   "confirmations.delete.confirm": "حذف",
@@ -171,15 +169,12 @@
   "confirmations.delete_list.message": "مطمئنید می‌خواهید این سیاهه را برای همیشه حذف کنید؟",
   "confirmations.discard_edit_media.confirm": "دور انداختن",
   "confirmations.discard_edit_media.message": "تغییرات ذخیره نشده‌ای در توضیحات یا پیش‌نمایش رسانه دارید. همگی نادیده گرفته شوند؟",
-  "confirmations.domain_block.confirm": "انسداد تمام دامنه",
   "confirmations.domain_block.message": "آیا جدی جدی می‌خواهید تمام دامنهٔ {domain} را مسدود کنید؟ در بیشتر موارد مسدود کردن یا خموشاندن چند حساب خاص کافی است و توصیه می‌شود. پس از این کار شما هیچ محتوایی را از این دامنه در خط زمانی عمومی یا آگاهی‌هایتان نخواهید دید. پی‌گیرانتان از این دامنه هم برداشته خواهند شد.",
   "confirmations.edit.confirm": "ویرایش",
   "confirmations.edit.message": "در صورت ویرایش، پیامی که در حال نوشتنش بودید از بین خواهد رفت. می‌خواهید ادامه دهید؟",
   "confirmations.logout.confirm": "خروج از حساب",
   "confirmations.logout.message": "مطمئنید می‌خواهید خارج شوید؟",
   "confirmations.mute.confirm": "خموش",
-  "confirmations.mute.explanation": "این کار فرسته‌های آن‌ها و فرسته‌هایی را که از آن‌ها نام برده پنهان می‌کند، ولی آن‌ها همچنان اجازه دارند فرسته‌های شما را ببینند و شما را پی‌گیری کنند.",
-  "confirmations.mute.message": "مطمئنید می‌خواهید {name} را بخموشانید؟",
   "confirmations.redraft.confirm": "حذف و بازنویسی",
   "confirmations.redraft.message": "مطمئنید که می‌خواهید این فرسته را حذف کنید و از نو بنویسید؟ با این کار تقویت‌ها و پسندهایش از دست رفته و پاسخ‌ها به آن بی‌مرجع می‌شود.",
   "confirmations.reply.confirm": "پاسخ",
@@ -399,9 +394,6 @@
   "loading_indicator.label": "در حال بارگذاری…",
   "media_gallery.toggle_visible": "{number, plural, one {نهفتن تصویر} other {نهفتن تصاویر}}",
   "moved_to_account_banner.text": "حسابتان {disabledAccount} اکنون از کار افتاده؛ چرا که به {movedToAccount} منتقل شدید.",
-  "mute_modal.duration": "مدت زمان",
-  "mute_modal.hide_notifications": "نهفتن آگاهی‌ها از این کاربر؟",
-  "mute_modal.indefinite": "نامعلوم",
   "navigation_bar.about": "درباره",
   "navigation_bar.advanced_interface": "بازکردن در رابط کاربری وب پیشرفته",
   "navigation_bar.blocks": "کاربران مسدود شده",
diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index 703992a0e7a566..bb5370b6d7de4c 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -89,6 +89,14 @@
   "announcement.announcement": "Tiedote",
   "attachments_list.unprocessed": "(käsittelemätön)",
   "audio.hide": "Piilota ääni",
+  "block_modal.remote_users_caveat": "Pyydämme palvelinta {domain} kunnioittamaan päätöstäsi. Myötämielisyyttä ei kuitenkaan taata, koska jotkin palvelimet voivat käsitellä estoja eri tavalla. Julkiset julkaisut voivat silti näkyä kirjautumattomille käyttäjille.",
+  "block_modal.show_less": "Näytä vähemmän",
+  "block_modal.show_more": "Näytä enemmän",
+  "block_modal.they_cant_mention": "Hän ei voi enää mainita eikä seurata sinua.",
+  "block_modal.they_cant_see_posts": "Hän ei voi enää nähdä julkaisujasi, etkä sinä voi nähdä hänen.",
+  "block_modal.they_will_know": "Hän voi nähdä, että hänet on estetty.",
+  "block_modal.title": "Estetäänkö käyttäjä?",
+  "block_modal.you_wont_see_mentions": "Et enää näe hänen julkaisujaan etkä voi seurata häntä.",
   "boost_modal.combo": "Ensi kerralla voit ohittaa tämän painamalla {combo}",
   "bundle_column_error.copy_stacktrace": "Kopioi virheraportti",
   "bundle_column_error.error.body": "Pyydettyä sivua ei voitu hahmontaa. Se voi johtua virheestä koodissamme tai selaimen yhteensopivuudessa.",
@@ -160,9 +168,7 @@
   "compose_form.spoiler.unmarked": "Lisää sisältövaroitus",
   "compose_form.spoiler_placeholder": "Sisältövaroitus (valinnainen)",
   "confirmation_modal.cancel": "Peruuta",
-  "confirmations.block.block_and_report": "Estä ja raportoi",
   "confirmations.block.confirm": "Estä",
-  "confirmations.block.message": "Haluatko varmasti estää käyttäjän {name}?",
   "confirmations.cancel_follow_request.confirm": "Peruuta pyyntö",
   "confirmations.cancel_follow_request.message": "Haluatko varmasti perua pyyntösi seurata käyttäjätiliä {name}?",
   "confirmations.delete.confirm": "Poista",
@@ -171,15 +177,13 @@
   "confirmations.delete_list.message": "Haluatko varmasti poistaa tämän listan pysyvästi?",
   "confirmations.discard_edit_media.confirm": "Hylkää",
   "confirmations.discard_edit_media.message": "Sinulla on tallentamattomia muutoksia median kuvaukseen tai esikatseluun. Hylätäänkö ne silti?",
-  "confirmations.domain_block.confirm": "Estä koko verkkotunnus",
+  "confirmations.domain_block.confirm": "Estä palvelin",
   "confirmations.domain_block.message": "Haluatko aivan varmasti estää koko verkkotunnuksen {domain}? Useimmiten muutama kohdistettu esto tai mykistys on riittävä ja suositeltava toimi. Et näe sisältöä tästä verkkotunnuksesta millään julkisilla aikajanoilla tai ilmoituksissa. Tähän verkkotunnukseen kuuluvat seuraajasi poistetaan.",
   "confirmations.edit.confirm": "Muokkaa",
   "confirmations.edit.message": "Jos muokkaat viestiä nyt, se korvaa parhaillaan työstämäsi viestin. Haluatko varmasti jatkaa?",
   "confirmations.logout.confirm": "Kirjaudu ulos",
   "confirmations.logout.message": "Haluatko varmasti kirjautua ulos?",
   "confirmations.mute.confirm": "Mykistä",
-  "confirmations.mute.explanation": "Tämä toiminto piilottaa heidän julkaisunsa sinulta – mukaan lukien ne, joissa heidät mainitaan – sallien heidän yhä nähdä julkaisusi ja seurata sinua.",
-  "confirmations.mute.message": "Haluatko varmasti mykistää käyttäjän {name}?",
   "confirmations.redraft.confirm": "Poista ja palauta muokattavaksi",
   "confirmations.redraft.message": "Haluatko varmasti poistaa julkaisun ja tehdä siitä luonnoksen? Suosikit ja tehostukset menetetään, ja alkuperäisen julkaisun vastaukset jäävät orvoiksi.",
   "confirmations.reply.confirm": "Vastaa",
@@ -205,6 +209,27 @@
   "dismissable_banner.explore_statuses": "Nämä sosiaalisen verkon julkaisut keräävät tänään eniten huomiota. Uusimmat, tehostetuimmat ja suosikeiksi lisätyimmät julkaisut nousevat listauksessa korkeammalle.",
   "dismissable_banner.explore_tags": "Nämä sosiaalisen verkon aihetunnisteet keräävät tänään eniten huomiota. Useimman käyttäjän käyttämät aihetunnisteet nousevat listauksessa korkeammalle.",
   "dismissable_banner.public_timeline": "Nämä ovat viimeisimpiä julkaisuja sosiaalisen verkon käyttäjiltä, joita seurataan palvelimella {domain}.",
+  "domain_block_modal.block": "Estä palvelin",
+  "domain_block_modal.block_account_instead": "Estä sen sijaan @{name}",
+  "domain_block_modal.they_can_interact_with_old_posts": "Ihmiset tältä palvelimelta eivät voi olla vuorovaikutuksessa vanhojen julkaisujesi kanssa.",
+  "domain_block_modal.they_cant_follow": "Kukaan tältä palvelimelta ei voi seurata sinua.",
+  "domain_block_modal.they_wont_know": "Hän ei saa tietää, että hänet on estetty.",
+  "domain_block_modal.title": "Estetäänkö verkkotunnus?",
+  "domain_block_modal.you_will_lose_followers": "Kaikki seuraajasi tältä palvelimelta poistetaan.",
+  "domain_block_modal.you_wont_see_posts": "Et enää näe julkaisuja etkä ilmoituksia tämän palvelimen käyttäjiltä.",
+  "domain_pill.activitypub_lets_connect": "Sen avulla voit muodostaa yhteyden ja olla vuorovaikutuksessa ihmisten kanssa, ei vain Mastodonissa vaan myös muissa sosiaalisissa sovelluksissa.",
+  "domain_pill.activitypub_like_language": "ActivityPub on kuin kieli, jota Mastodon puhuu muiden sosiaalisten verkostojen kanssa.",
+  "domain_pill.server": "Palvelin",
+  "domain_pill.their_handle": "Hänen käyttäjänimensä:",
+  "domain_pill.their_server": "Hänen digitaalinen kotinsa, jossa kaikki hänen julkaisunsa sijaitsevat.",
+  "domain_pill.their_username": "Hänen yksilöllinen tunnisteensa omalla palvelimellaan. Eri palvelimilta on mahdollista löytää käyttäjiä, joilla on sama käyttäjänimi.",
+  "domain_pill.username": "Käyttäjänimi",
+  "domain_pill.whats_in_a_handle": "Mitä käyttäjänimessä on?",
+  "domain_pill.who_they_are": "Koska käyttäjätunnukset kertovat, kuka ja missä joku on, voit olla vuorovaikutuksessa ihmisten kanssa läpi sosiaalisen verkon, joka koostuu <button>ActivityPub-pohjaisista alustoista</button>.",
+  "domain_pill.who_you_are": "Koska käyttäjätunnuksesi kertoo, kuka ja missä olet, ihmiset voivat olla vaikutuksessa kanssasi läpi sosiaalisen verkon, joka koostuu <button>ActivityPub-pohjaisista alustoista</button>.",
+  "domain_pill.your_handle": "Käyttäjänimesi:",
+  "domain_pill.your_server": "Digitaalinen kotisi, jossa kaikki julkaisusi sijaitsevat. Etkö pidä tästä? Siirry palvelimelta toiselle milloin tahansa ja tuo myös seuraajasi mukanasi.",
+  "domain_pill.your_username": "Yksilöllinen tunnisteesi tällä palvelimella. Eri palvelimilta on mahdollista löytää käyttäjiä, joilla on sama käyttäjänimi.",
   "embed.instructions": "Upota julkaisu verkkosivullesi kopioimalla alla oleva koodi.",
   "embed.preview": "Tältä se näyttää:",
   "emoji_button.activity": "Aktiviteetit",
@@ -272,7 +297,7 @@
   "filter_modal.select_filter.subtitle": "Käytä olemassa olevaa luokkaa tai luo uusi",
   "filter_modal.select_filter.title": "Suodata tämä julkaisu",
   "filter_modal.title.status": "Suodata julkaisu",
-  "filtered_notifications_banner.pending_requests": "Ilmoitukset, {count, plural, =0 {ei tänään} one {1 henkilö} other {# henkilöä}}",
+  "filtered_notifications_banner.pending_requests": "Ilmoitukset {count, plural, =0 {ei keltään} one {yhdeltä henkilöltä} other {# henkilöltä}}, jonka saatat tuntea",
   "filtered_notifications_banner.title": "Suodatetut ilmoitukset",
   "firehose.all": "Kaikki",
   "firehose.local": "Tämä palvelin",
@@ -402,9 +427,15 @@
   "loading_indicator.label": "Ladataan…",
   "media_gallery.toggle_visible": "{number, plural, one {Piilota kuva} other {Piilota kuvat}}",
   "moved_to_account_banner.text": "Tilisi {disabledAccount} on tällä hetkellä poissa käytöstä, koska teit siirron tiliin {movedToAccount}.",
-  "mute_modal.duration": "Kesto",
-  "mute_modal.hide_notifications": "Piilotetaanko tältä käyttäjältä tulevat ilmoitukset?",
-  "mute_modal.indefinite": "Ikuisesti",
+  "mute_modal.hide_from_notifications": "Piilota ilmoituksista",
+  "mute_modal.hide_options": "Piilota valinnat",
+  "mute_modal.indefinite": "Kunnes poistan mykistyksen häneltä",
+  "mute_modal.show_options": "Näytä valinnat",
+  "mute_modal.they_can_mention_and_follow": "Hän voi mainita sinut ja seurata sinua, mutta sinä et näe häntä.",
+  "mute_modal.they_wont_know": "Hän ei saa tietää, että hänet on mykistetty.",
+  "mute_modal.title": "Mykistetäänkö käyttäjä?",
+  "mute_modal.you_wont_see_mentions": "Et enää näe julkaisuja, joissa hänet mainitaan.",
+  "mute_modal.you_wont_see_posts": "Hän voi yhä nähdä julkaisusi, mutta sinä et näe hänen.",
   "navigation_bar.about": "Tietoja",
   "navigation_bar.advanced_interface": "Avaa edistyneessä selainkäyttöliittymässä",
   "navigation_bar.blocks": "Estetyt käyttäjät",
diff --git a/app/javascript/mastodon/locales/fil.json b/app/javascript/mastodon/locales/fil.json
index 387a65c7857db8..afa0e5fbc2c5fd 100644
--- a/app/javascript/mastodon/locales/fil.json
+++ b/app/javascript/mastodon/locales/fil.json
@@ -106,16 +106,13 @@
   "compose_form.reply": "Tumugon",
   "compose_form.spoiler.unmarked": "Idagdag ang babala sa nilalaman",
   "confirmation_modal.cancel": "Pagpaliban",
-  "confirmations.block.block_and_report": "Harangan at i-ulat",
   "confirmations.block.confirm": "Harangan",
-  "confirmations.block.message": "Sigurado ka bang gusto mong harangan si {name}?",
   "confirmations.cancel_follow_request.confirm": "Bawiin ang kahilingan",
   "confirmations.cancel_follow_request.message": "Sigurdo ka bang gusto mong bawiin ang kahilingang sundan si/ang {name}?",
   "confirmations.delete.message": "Sigurado ka bang gusto mong burahin ang post na ito?",
   "confirmations.delete_list.confirm": "Tanggalin",
   "confirmations.delete_list.message": "Sigurado ka bang gusto mong burahin ang listahang ito?",
   "confirmations.discard_edit_media.confirm": "Ipagpaliban",
-  "confirmations.domain_block.confirm": "Harangan ang buong domain",
   "confirmations.edit.confirm": "Baguhin",
   "confirmations.reply.confirm": "Tumugon",
   "copy_icon_button.copied": "Sinipi sa clipboard",
diff --git a/app/javascript/mastodon/locales/fo.json b/app/javascript/mastodon/locales/fo.json
index 53677e23834968..c3e3f8cc1af64a 100644
--- a/app/javascript/mastodon/locales/fo.json
+++ b/app/javascript/mastodon/locales/fo.json
@@ -89,6 +89,14 @@
   "announcement.announcement": "Kunngerð",
   "attachments_list.unprocessed": "(óviðgjørt)",
   "audio.hide": "Fjal ljóð",
+  "block_modal.remote_users_caveat": "Vit biðja ambætaran {domain} virða tína avgerð. Kortini er eingin vissa um samsvar, av tí at fleiri ambætarar handfara blokkar ymiskt. Almennir postar kunnu framvegis vera sjónligir fyri brúkarar, sum ikki eru innritaðir.",
+  "block_modal.show_less": "Vís minni",
+  "block_modal.show_more": "Vís meiri",
+  "block_modal.they_cant_mention": "Tey kunnu hvørki nevna teg ella fylgja tær.",
+  "block_modal.they_cant_see_posts": "Tey síggja ikki tínar postar og tú sært ikki teirra.",
+  "block_modal.they_will_know": "Tey síggja, at tey eru bannað.",
+  "block_modal.title": "Banna brúkara?",
+  "block_modal.you_wont_see_mentions": "Tú sært ikki postar, sum nevna tey.",
   "boost_modal.combo": "Tú kanst trýsta á {combo} fyri at loypa uppum hetta næstu ferð",
   "bundle_column_error.copy_stacktrace": "Avrita feilfráboðan",
   "bundle_column_error.error.body": "Umbidna síðan kann ikki vísast. Tað kann vera orsakað av einum feili í koduni hjá okkum ella tað kann vera orsakað av kaganum, sum tú brúkar.",
@@ -160,9 +168,7 @@
   "compose_form.spoiler.unmarked": "Skriva ávaring um innihald",
   "compose_form.spoiler_placeholder": "Innihaldsávaring (valfrí)",
   "confirmation_modal.cancel": "Strika",
-  "confirmations.block.block_and_report": "Banna og melda",
   "confirmations.block.confirm": "Banna",
-  "confirmations.block.message": "Ert tú vís/ur í, at tú vilt banna {name}?",
   "confirmations.cancel_follow_request.confirm": "Tak umbønina aftur",
   "confirmations.cancel_follow_request.message": "Er tað tilætlað, at tú tekur umbønina at fylgja {name} aftur?",
   "confirmations.delete.confirm": "Strika",
@@ -171,15 +177,13 @@
   "confirmations.delete_list.message": "Ert tú vís/ur í, at tú vilt strika hetta uppslagið?",
   "confirmations.discard_edit_media.confirm": "Vraka",
   "confirmations.discard_edit_media.message": "Tú hevur broytingar í miðlalýsingini ella undansýningini, sum ikki eru goymdar. Vilt tú kortini vraka?",
-  "confirmations.domain_block.confirm": "Banna heilum økisnavni",
+  "confirmations.domain_block.confirm": "Banna ambætara",
   "confirmations.domain_block.message": "Ert tú púra, púra vís/ur í, at tú vilt banna øllum {domain}? Í flestu førum er nóg mikið og betri, bert at banna ella doyva onkrum ávísum. Tú fert eingi evni at síggja frá økisnavninum á nakrari almennari tíðarrás ella í tínum fráboðanum. Tínir fylgjarar undir økisnavninum verða eisini strikaðir.",
   "confirmations.edit.confirm": "Rætta",
   "confirmations.edit.message": "Rættingar, sum verða gjørdar nú, skriva yvir boðini, sum tú ert í holt við. Ert tú vís/ur í, at tú vilt halda fram?",
   "confirmations.logout.confirm": "Rita út",
   "confirmations.logout.message": "Ert tú vís/ur í, at tú vilt útrita teg?",
   "confirmations.mute.confirm": "Doyv",
-  "confirmations.mute.explanation": "Henda atgerð fjalir teirra postar og postar, ið nevna tey; men tey kunnu framvegis síggja tínar postar og fylgja tær.",
-  "confirmations.mute.message": "Ert tú vís/ur í, at tú vilt doyva {name}?",
   "confirmations.redraft.confirm": "Sletta og skriva umaftur",
   "confirmations.redraft.message": "Vilt tú veruliga strika hendan postin og í staðin gera hann til eina nýggja kladdu? Yndisfrámerki og framhevjanir blíva burtur, og svar til upprunapostin missa tilknýtið.",
   "confirmations.reply.confirm": "Svara",
@@ -205,6 +209,27 @@
   "dismissable_banner.explore_statuses": "Hesi uppsløg, frá hesum og øðrum ambætarum á miðspjadda netverkinum, hava framgongd á hesum ambætara júst nú. Nýggjari postar, sum fleiri hava framhevja og dáma, verða raðfestir hægri.",
   "dismissable_banner.explore_tags": "Hesi frámerki vinna í løtuni fótafesti millum fólk á hesum og øðrum ambætarum í desentrala netverkinum beint nú.",
   "dismissable_banner.public_timeline": "Hetta eru teir nýggjast postarnir frá fólki á sosialu vevinum, sum fólk á {domain} fylgja.",
+  "domain_block_modal.block": "Banna ambætara",
+  "domain_block_modal.block_account_instead": "Banna @{name} ístaðin",
+  "domain_block_modal.they_can_interact_with_old_posts": "Fólk frá hesum ambætara kunnu svara tínum gomlu postum.",
+  "domain_block_modal.they_cant_follow": "Eingin frá hesum ambætara kann fylgja tær.",
+  "domain_block_modal.they_wont_know": "Tey vita ikki, at tey eru bannað.",
+  "domain_block_modal.title": "Banna økisnavni?",
+  "domain_block_modal.you_will_lose_followers": "Allir tínir fylgjarar á hesum ambætara hvørva.",
+  "domain_block_modal.you_wont_see_posts": "Tú sært ongar postar ella boð frá brúkarum á hesum ambætara.",
+  "domain_pill.activitypub_lets_connect": "Tað letur teg fáa samband og samvirka við fólki ikki bara á Mastodon, men á øðrum sosialum appum eisini.",
+  "domain_pill.activitypub_like_language": "ActivityPub er málið, sum Mastodon tosar við onnur sosial netverk.",
+  "domain_pill.server": "Ambætari",
+  "domain_pill.their_handle": "Teirra hald:",
+  "domain_pill.their_server": "Teirra talgilda heim, har allir teirra postar liva.",
+  "domain_pill.their_username": "Teirra eyðmerki á teirra ambætara. Tað er møguligt at finna brúkarar við tí sama brúkaranavninum á ymiskum ambætarum.",
+  "domain_pill.username": "Brúkaranavn",
+  "domain_pill.whats_in_a_handle": "Hvat er í einum haldi?",
+  "domain_pill.who_they_are": "Eftirsum at hald siga, hvør onkur er og hvar tey eru, so kanst tú samvirka við fólk á øllum <button>ActivityPub-riknum pallum</button>.",
+  "domain_pill.who_you_are": "Av tí at tíni hald siga, hvør tú er og hvar tú eru, so kunnu onnur samvirka við teg á øllum <button>ActivityPub-riknum pallum</button>.",
+  "domain_pill.your_handle": "Títt hald:",
+  "domain_pill.your_server": "Títt talgilda heim, har allir tínir postar liva. Dámar tað ikki hendan? Flyt til ein annan ambætara tá tú hevur hug til tess og tak fylgjarar tínar við eisini.",
+  "domain_pill.your_username": "Títt eyðmerki á hesum ambætaranum. Tað er møguligt at finna brúkarar við tí sama brúkaranavninum á ymiskum ambætarum.",
   "embed.instructions": "Fell hendan postin inní á tínum vevstaði við at taka avrit av koduni niðanfyri.",
   "embed.preview": "Soleiðis fer tað at síggja út:",
   "emoji_button.activity": "Virksemi",
@@ -402,9 +427,15 @@
   "loading_indicator.label": "Innlesur…",
   "media_gallery.toggle_visible": "{number, plural, one {Fjal mynd} other {Fjal myndir}}",
   "moved_to_account_banner.text": "Konta tín {disabledAccount} er í løtuni óvirkin, tí tú flutti til {movedToAccount}.",
-  "mute_modal.duration": "Tíðarbil",
-  "mute_modal.hide_notifications": "Fjal fráboðanir frá hesum brúkaranum?",
-  "mute_modal.indefinite": "Óásett tíðarskeið",
+  "mute_modal.hide_from_notifications": "Fjal boð",
+  "mute_modal.hide_options": "Fjal valmøguleikar",
+  "mute_modal.indefinite": "Inntil eg tendri tey aftur",
+  "mute_modal.show_options": "Vís valmøguleikar",
+  "mute_modal.they_can_mention_and_follow": "Tey kunnu bæði nevna og fylgja tær, men tú sært ikki tey.",
+  "mute_modal.they_wont_know": "Tey vita ikki, at tey eru sløkt.",
+  "mute_modal.title": "Sløkk brúkara?",
+  "mute_modal.you_wont_see_mentions": "Tú sært ikki postar, sum nevna tey.",
+  "mute_modal.you_wont_see_posts": "Tey síggja framvegis tínar postar, men tú sært ikki teirra.",
   "navigation_bar.about": "Um",
   "navigation_bar.advanced_interface": "Lat upp í framkomnum vevmarkamóti",
   "navigation_bar.blocks": "Bannaðir brúkarar",
diff --git a/app/javascript/mastodon/locales/fr-CA.json b/app/javascript/mastodon/locales/fr-CA.json
index 6f517fb34e3533..9549686d7cb961 100644
--- a/app/javascript/mastodon/locales/fr-CA.json
+++ b/app/javascript/mastodon/locales/fr-CA.json
@@ -160,9 +160,7 @@
   "compose_form.spoiler.unmarked": "Ajouter un avertissement de contenu",
   "compose_form.spoiler_placeholder": "Avertissement de contenu (optionnel)",
   "confirmation_modal.cancel": "Annuler",
-  "confirmations.block.block_and_report": "Bloquer et signaler",
   "confirmations.block.confirm": "Bloquer",
-  "confirmations.block.message": "Voulez-vous vraiment bloquer {name}?",
   "confirmations.cancel_follow_request.confirm": "Retirer cette demande",
   "confirmations.cancel_follow_request.message": "Êtes-vous sûr de vouloir retirer votre demande pour suivre {name}?",
   "confirmations.delete.confirm": "Supprimer",
@@ -171,15 +169,12 @@
   "confirmations.delete_list.message": "Voulez-vous vraiment supprimer définitivement cette liste?",
   "confirmations.discard_edit_media.confirm": "Rejeter",
   "confirmations.discard_edit_media.message": "Vous avez des modifications non enregistrées de la description ou de l'aperçu du média, voulez-vous quand même les supprimer?",
-  "confirmations.domain_block.confirm": "Bloquer ce domaine entier",
   "confirmations.domain_block.message": "Voulez-vous vraiment, vraiment bloquer {domain} en entier? Dans la plupart des cas, quelques blocages ou masquages ciblés sont suffisants et préférables. Vous ne verrez plus de contenu provenant de ce domaine, ni dans vos fils publics, ni dans vos notifications. Vos abonné·e·s utilisant ce domaine seront retiré·e·s.",
   "confirmations.edit.confirm": "Éditer",
   "confirmations.edit.message": "Modifier maintenant écrasera votre message en cours de rédaction. Voulez-vous vraiment continuer ?",
   "confirmations.logout.confirm": "Se déconnecter",
   "confirmations.logout.message": "Voulez-vous vraiment vous déconnecter?",
   "confirmations.mute.confirm": "Masquer",
-  "confirmations.mute.explanation": "Cela masquera ses publications et celle le/la mentionnant, mais cela lui permettra toujours de voir vos messages et de vous suivre.",
-  "confirmations.mute.message": "Voulez-vous vraiment masquer {name}?",
   "confirmations.redraft.confirm": "Supprimer et réécrire",
   "confirmations.redraft.message": "Êtes-vous sûr·e de vouloir effacer cette publication pour la réécrire? Ses ses mises en favori et boosts seront perdus et ses réponses seront orphelines.",
   "confirmations.reply.confirm": "Répondre",
@@ -271,6 +266,8 @@
   "filter_modal.select_filter.subtitle": "Utilisez une catégorie existante ou en créer une nouvelle",
   "filter_modal.select_filter.title": "Filtrer cette publication",
   "filter_modal.title.status": "Filtrer une publication",
+  "filtered_notifications_banner.pending_requests": "Notifications {count, plural, =0 {de personne} one {d’une personne} other {de # personnes}} que vous pouvez connaitre",
+  "filtered_notifications_banner.title": "Notifications filtrées",
   "firehose.all": "Tout",
   "firehose.local": "Ce serveur",
   "firehose.remote": "Autres serveurs",
@@ -399,9 +396,6 @@
   "loading_indicator.label": "Chargement…",
   "media_gallery.toggle_visible": "{number, plural, one {Cacher l’image} other {Cacher les images}}",
   "moved_to_account_banner.text": "Votre compte {disabledAccount} est actuellement désactivé parce que vous avez déménagé sur {movedToAccount}.",
-  "mute_modal.duration": "Durée",
-  "mute_modal.hide_notifications": "Masquer les notifications de ce compte?",
-  "mute_modal.indefinite": "Indéfinie",
   "navigation_bar.about": "À propos",
   "navigation_bar.advanced_interface": "Ouvrir dans l’interface avancée",
   "navigation_bar.blocks": "Comptes bloqués",
diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json
index 81c6719ea56c2c..29b4d56a4f7f8a 100644
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@@ -160,9 +160,7 @@
   "compose_form.spoiler.unmarked": "Ajouter un avertissement de contenu",
   "compose_form.spoiler_placeholder": "Avertissement de contenu (optionnel)",
   "confirmation_modal.cancel": "Annuler",
-  "confirmations.block.block_and_report": "Bloquer et signaler",
   "confirmations.block.confirm": "Bloquer",
-  "confirmations.block.message": "Voulez-vous vraiment bloquer {name} ?",
   "confirmations.cancel_follow_request.confirm": "Retirer la demande",
   "confirmations.cancel_follow_request.message": "Êtes-vous sûr de vouloir retirer votre demande pour suivre {name} ?",
   "confirmations.delete.confirm": "Supprimer",
@@ -171,15 +169,12 @@
   "confirmations.delete_list.message": "Voulez-vous vraiment supprimer définitivement cette liste ?",
   "confirmations.discard_edit_media.confirm": "Rejeter",
   "confirmations.discard_edit_media.message": "Vous avez des modifications non enregistrées de la description ou de l'aperçu du média, les supprimer quand même ?",
-  "confirmations.domain_block.confirm": "Bloquer tout le domaine",
   "confirmations.domain_block.message": "Voulez-vous vraiment, vraiment bloquer {domain} en entier ? Dans la plupart des cas, quelques blocages ou masquages ciblés sont suffisants et préférables. Vous ne verrez plus de contenu provenant de ce domaine, ni dans vos fils publics, ni dans vos notifications. Vos abonné·e·s utilisant ce domaine seront retiré·e·s.",
   "confirmations.edit.confirm": "Modifier",
   "confirmations.edit.message": "Modifier maintenant écrasera votre message en cours de rédaction. Voulez-vous vraiment continuer ?",
   "confirmations.logout.confirm": "Se déconnecter",
   "confirmations.logout.message": "Voulez-vous vraiment vous déconnecter ?",
   "confirmations.mute.confirm": "Masquer",
-  "confirmations.mute.explanation": "Cela masquera ses messages et les messages le ou la mentionnant, mais cela lui permettra quand même de voir vos messages et de vous suivre.",
-  "confirmations.mute.message": "Voulez-vous vraiment masquer {name} ?",
   "confirmations.redraft.confirm": "Supprimer et ré-écrire",
   "confirmations.redraft.message": "Êtes-vous sûr·e de vouloir effacer cette publication pour la réécrire ? Ses partages ainsi que ses mises en favori seront perdus et ses réponses seront orphelines.",
   "confirmations.reply.confirm": "Répondre",
@@ -271,6 +266,8 @@
   "filter_modal.select_filter.subtitle": "Utilisez une catégorie existante ou en créer une nouvelle",
   "filter_modal.select_filter.title": "Filtrer ce message",
   "filter_modal.title.status": "Filtrer un message",
+  "filtered_notifications_banner.pending_requests": "Notifications {count, plural, =0 {de personne} one {d’une personne} other {de # personnes}} que vous pouvez connaitre",
+  "filtered_notifications_banner.title": "Notifications filtrées",
   "firehose.all": "Tout",
   "firehose.local": "Ce serveur",
   "firehose.remote": "Autres serveurs",
@@ -399,9 +396,6 @@
   "loading_indicator.label": "Chargement…",
   "media_gallery.toggle_visible": "{number, plural, one {Cacher l’image} other {Cacher les images}}",
   "moved_to_account_banner.text": "Votre compte {disabledAccount} est actuellement désactivé parce que vous l'avez déplacé à {movedToAccount}.",
-  "mute_modal.duration": "Durée",
-  "mute_modal.hide_notifications": "Masquer les notifications de cette personne ?",
-  "mute_modal.indefinite": "Indéfinie",
   "navigation_bar.about": "À propos",
   "navigation_bar.advanced_interface": "Ouvrir dans l’interface avancée",
   "navigation_bar.blocks": "Comptes bloqués",
diff --git a/app/javascript/mastodon/locales/fy.json b/app/javascript/mastodon/locales/fy.json
index 02b3833701c246..97119e30c0b8fb 100644
--- a/app/javascript/mastodon/locales/fy.json
+++ b/app/javascript/mastodon/locales/fy.json
@@ -160,9 +160,7 @@
   "compose_form.spoiler.unmarked": "Ynhâldswarskôging tafoegje",
   "compose_form.spoiler_placeholder": "Ynhâldswarskôging (opsjoneel)",
   "confirmation_modal.cancel": "Annulearje",
-  "confirmations.block.block_and_report": "Blokkearje en rapportearje",
   "confirmations.block.confirm": "Blokkearje",
-  "confirmations.block.message": "Binne jo wis dat jo {name} blokkearje wolle?",
   "confirmations.cancel_follow_request.confirm": "Fersyk annulearje",
   "confirmations.cancel_follow_request.message": "Binne jo wis dat jo jo fersyk om {name} te folgjen annulearje wolle?",
   "confirmations.delete.confirm": "Fuortsmite",
@@ -171,15 +169,12 @@
   "confirmations.delete_list.message": "Binne jo wis dat jo dizze list foar permanint fuortsmite wolle?",
   "confirmations.discard_edit_media.confirm": "Fuortsmite",
   "confirmations.discard_edit_media.message": "Jo hawwe net-bewarre wizigingen yn de mediabeskriuwing of foarfertoaning, wolle jo dizze dochs fuortsmite?",
-  "confirmations.domain_block.confirm": "Alles fan dit domein blokkearje",
   "confirmations.domain_block.message": "Binne jo echt wis dat jo alles fan {domain} negearje wolle? Yn de measte gefallen is it blokkearjen of negearjen fan in pear spesifike persoanen genôch en better. Jo sille gjin berjochten fan dizze server op iepenbiere tiidlinen sjen of yn jo meldingen. Jo folgers fan dizze server wurde fuortsmiten.",
   "confirmations.edit.confirm": "Bewurkje",
   "confirmations.edit.message": "Troch no te bewurkjen sil it berjocht dat jo no oan it skriuwen binne oerskreaun wurde. Wolle jo trochgean?",
   "confirmations.logout.confirm": "Ofmelde",
   "confirmations.logout.message": "Binne jo wis dat jo ôfmelde wolle?",
   "confirmations.mute.confirm": "Negearje",
-  "confirmations.mute.explanation": "Dit sil berjochten fan harren en berjochten dêr’t se yn fermeld wurde ûnsichtber meitsje, mar se sille jo berjochten noch hieltyd sjen kinne en jo folgje kinne.",
-  "confirmations.mute.message": "Binne jo wis dat jo {name} negearje wolle?",
   "confirmations.redraft.confirm": "Fuortsmite en opnij opstelle",
   "confirmations.redraft.message": "Binne jo wis dat jo dit berjocht fuortsmite en opnij opstelle wolle? Favoriten en boosts geane dan ferlern en reaksjes op it oarspronklike berjocht reitsje jo kwyt.",
   "confirmations.reply.confirm": "Reagearje",
@@ -399,9 +394,6 @@
   "loading_indicator.label": "Lade…",
   "media_gallery.toggle_visible": "{number, plural, one {ôfbylding ferstopje} other {ôfbyldingen ferstopje}}",
   "moved_to_account_banner.text": "Omdat jo nei {movedToAccount} ferhuze binne is jo account {disabledAccount} op dit stuit útskeakele.",
-  "mute_modal.duration": "Doer",
-  "mute_modal.hide_notifications": "Meldingen fan dizze brûker ferstopje?",
-  "mute_modal.indefinite": "Foar ûnbepaalde tiid",
   "navigation_bar.about": "Oer",
   "navigation_bar.advanced_interface": "Yn avansearre webomjouwing iepenje",
   "navigation_bar.blocks": "Blokkearre brûkers",
diff --git a/app/javascript/mastodon/locales/ga.json b/app/javascript/mastodon/locales/ga.json
index 50ea6bbf6cc6d0..c71effe06df49d 100644
--- a/app/javascript/mastodon/locales/ga.json
+++ b/app/javascript/mastodon/locales/ga.json
@@ -133,9 +133,7 @@
   "compose_form.spoiler.marked": "Bain rabhadh ábhair",
   "compose_form.spoiler.unmarked": "Cuir rabhadh ábhair",
   "confirmation_modal.cancel": "Cealaigh",
-  "confirmations.block.block_and_report": "Bac ⁊ Tuairiscigh",
   "confirmations.block.confirm": "Bac",
-  "confirmations.block.message": "An bhfuil tú cinnte gur mhaith leat {name} a bhac?",
   "confirmations.cancel_follow_request.confirm": "Éirigh as iarratas",
   "confirmations.cancel_follow_request.message": "An bhfuil tú cinnte gur mhaith leat éirigh as an iarratas leanta {name}?",
   "confirmations.delete.confirm": "Scrios",
@@ -144,13 +142,10 @@
   "confirmations.delete_list.message": "An bhfuil tú cinnte gur mhaith leat an liosta seo a scriosadh go buan?",
   "confirmations.discard_edit_media.confirm": "Faigh réidh de",
   "confirmations.discard_edit_media.message": "Tá athruithe neamhshlánaithe don tuarascáil gné nó réamhamharc agat, faigh réidh dóibh ar aon nós?",
-  "confirmations.domain_block.confirm": "Bac fearann go hiomlán",
   "confirmations.domain_block.message": "An bhfuil tú iontach cinnte gur mhaith leat bac an t-ainm fearainn {domain} in iomlán? I bhformhór na gcásanna, is leor agus is fearr cúpla baic a cur i bhfeidhm nó cúpla úsáideoirí a balbhú. Ní fheicfidh tú ábhair ón t-ainm fearainn sin in amlíne ar bith, nó i d'fhógraí. Scaoilfear do leantóirí ón ainm fearainn sin.",
   "confirmations.logout.confirm": "Logáil amach",
   "confirmations.logout.message": "An bhfuil tú cinnte gur mhaith leat logáil amach?",
   "confirmations.mute.confirm": "Balbhaigh",
-  "confirmations.mute.explanation": "Cuiridh seo teachtaireachtaí uathu agus fúthu i bhfolach, ach beidh siad in ann fós do theachtaireachtaí a fheiceáil agus tú a leanúint.",
-  "confirmations.mute.message": "An bhfuil tú cinnte gur mhaith leat {name} a bhalbhú?",
   "confirmations.redraft.confirm": "Scrios ⁊ athdhréachtaigh",
   "confirmations.reply.confirm": "Freagair",
   "confirmations.reply.message": "Scriosfaidh freagra láithreach an teachtaireacht atá a chumadh anois agat. An bhfuil tú cinnte gur mhaith leat leanúint leat?",
@@ -311,9 +306,6 @@
   "lists.replies_policy.title": "Taispeáin freagraí:",
   "lists.search": "Cuardaigh i measc daoine atá á leanúint agat",
   "lists.subheading": "Do liostaí",
-  "mute_modal.duration": "Tréimhse",
-  "mute_modal.hide_notifications": "Cuir póstalacha ón t-úsáideoir seo i bhfolach?",
-  "mute_modal.indefinite": "Gan téarma",
   "navigation_bar.about": "Maidir le",
   "navigation_bar.blocks": "Cuntais bhactha",
   "navigation_bar.bookmarks": "Leabharmharcanna",
diff --git a/app/javascript/mastodon/locales/gd.json b/app/javascript/mastodon/locales/gd.json
index 5d263c0fe638f8..ad9a58d83ddf27 100644
--- a/app/javascript/mastodon/locales/gd.json
+++ b/app/javascript/mastodon/locales/gd.json
@@ -89,6 +89,14 @@
   "announcement.announcement": "Brath-fios",
   "attachments_list.unprocessed": "(gun phròiseasadh)",
   "audio.hide": "Falaich an fhuaim",
+  "block_modal.remote_users_caveat": "Iarraidh sinn air an fhrithealaiche {domain} gun gèill iad ri do cho-dhùnadh. Gidheadh, chan eil barantas gun gèill iad on a làimhsicheas cuid a fhrithealaichean bacaidhean air dòigh eadar-dhealaichte. Dh’fhaoidte gum faic daoine gun chlàradh a-steach na postaichean poblach agad fhathast.",
+  "block_modal.show_less": "Seall nas lugha dheth",
+  "block_modal.show_more": "Seall barrachd dheth",
+  "block_modal.they_cant_mention": "Chan urrainn dhaibh iomradh a thoirt ort no do leantainn.",
+  "block_modal.they_cant_see_posts": "Chan fhaic iad na postaichean agad ’s chan fhaic thu na postaichean aca-san.",
+  "block_modal.they_will_know": "Chì iad gun deach am bacadh.",
+  "block_modal.title": "A bheil thu airson an cleachdaiche a bhacadh?",
+  "block_modal.you_wont_see_mentions": "Chan fhaic thu na postaichean a bheir iomradh orra.",
   "boost_modal.combo": "Brùth air {combo} nam b’ fheàrr leat leum a ghearradh thar seo an ath-thuras",
   "bundle_column_error.copy_stacktrace": "Dèan lethbhreac de aithris na mearachd",
   "bundle_column_error.error.body": "Cha b’ urrainn dhuinn an duilleag a dh’iarr thu a reandaradh. Dh’fhaoidte gu bheil buga sa chòd againn no duilgheadas co-chòrdalachd leis a’ bhrabhsair.",
@@ -160,9 +168,7 @@
   "compose_form.spoiler.unmarked": "Cuir rabhadh susbainte ris",
   "compose_form.spoiler_placeholder": "Rabhadh susbainte (roghainneil)",
   "confirmation_modal.cancel": "Sguir dheth",
-  "confirmations.block.block_and_report": "Bac ⁊ dèan gearan",
   "confirmations.block.confirm": "Bac",
-  "confirmations.block.message": "A bheil thu cinnteach gu bheil thu airson {name} a bhacadh?",
   "confirmations.cancel_follow_request.confirm": "Cuir d’ iarrtas dhan dàrna taobh",
   "confirmations.cancel_follow_request.message": "A bheil thu cinnteach gu bheil thu airson d’ iarrtas airson {name} a leantainn a chur dhan dàrna taobh?",
   "confirmations.delete.confirm": "Sguab às",
@@ -171,15 +177,13 @@
   "confirmations.delete_list.message": "A bheil thu cinnteach gu bheil thu airson an liosta seo a sguabadh às gu buan?",
   "confirmations.discard_edit_media.confirm": "Tilg air falbh",
   "confirmations.discard_edit_media.message": "Tha atharraichean gun sàbhaladh agad ann an tuairisgeul no ro-shealladh a’ mheadhain, a bheil thu airson an tilgeil air falbh co-dhiù?",
-  "confirmations.domain_block.confirm": "Bac an àrainn uile gu lèir",
+  "confirmations.domain_block.confirm": "Bac am frithealaiche",
   "confirmations.domain_block.message": "A bheil thu cinnteach dha-rìribh gu bheil thu airson an àrainn {domain} a bhacadh uile gu lèir? Mar as trice, foghnaidh gun dèan thu bacadh no mùchadh no dhà gu sònraichte agus bhiodh sin na b’ fheàrr. Chan fhaic thu susbaint on àrainn ud air loidhne-ama phoblach sam bith no am measg nam brathan agad. Thèid an luchd-leantainn agad on àrainn ud a thoirt air falbh.",
   "confirmations.edit.confirm": "Deasaich",
   "confirmations.edit.message": "Ma nì thu deasachadh an-dràsta, thèid seo a sgrìobhadh thairis air an teachdaireachd a tha thu a’ sgrìobhadh an-dràsta. A bheil thu cinnteach gu bheil thu airson leantainn air adhart?",
   "confirmations.logout.confirm": "Clàraich a-mach",
   "confirmations.logout.message": "A bheil thu cinnteach gu bheil thu airson clàradh a-mach?",
   "confirmations.mute.confirm": "Mùch",
-  "confirmations.mute.explanation": "Cuiridh seo na postaichean uapa ’s na postaichean a bheir iomradh orra am falach ach chì iad-san na postaichean agad fhathast is faodaidh iad ’gad leantainn.",
-  "confirmations.mute.message": "A bheil thu cinnteach gu bheil thu airson {name} a mhùchadh?",
   "confirmations.redraft.confirm": "Sguab às ⁊ dèan dreachd ùr",
   "confirmations.redraft.message": "A bheil thu cinnteach gu bheil thu airson am post seo a sguabadh às agus dreachd ùr a thòiseachadh? Caillidh tu gach annsachd is brosnachadh air agus thèid freagairtean dhan phost thùsail ’nan dìlleachdanan.",
   "confirmations.reply.confirm": "Freagair",
@@ -205,6 +209,27 @@
   "dismissable_banner.explore_statuses": "Tha fèill air na postaichean seo a’ fàs thar an lìona shòisealta an-diugh. Gheibh postaichean nas ùire le barrachd brosnaichean is annsachdan rangachadh nas àirde.",
   "dismissable_banner.explore_tags": "Tha fèill air na tagaichean hais seo a’ fàs air an fhrithealaiche seo is frithealaichean eile dhen lìonra sgaoilte an-diugh. Gheibh tagaichean hais a tha ’gan cleachdadh le daoine eadar-dhealaichte rangachadh nas àirde.",
   "dismissable_banner.public_timeline": "Seo na postaichean poblach as ùire o dhaoine air an lìonra sòisealta tha ’gan leantainn le daoine air {domain}.",
+  "domain_block_modal.block": "Bac am frithealaiche",
+  "domain_block_modal.block_account_instead": "Bac @{name} ’na àite",
+  "domain_block_modal.they_can_interact_with_old_posts": "’S urrainn do dhaoine a th’ air an fhrithealaiche seo eadar-ghabhail leis na seann-phostaichean agad.",
+  "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_followers": "Thèid a h-uile neach-leantainn agad a th’ air an fhrithealaiche seo a thoirt air falbh.",
+  "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.",
+  "domain_pill.server": "Frithealaiche",
+  "domain_pill.their_handle": "An t-aithnichear aca:",
+  "domain_pill.their_server": "An dachaigh dhigiteach far a bheil na postaichean uile aca a’ fuireach.",
+  "domain_pill.their_username": "Seo an t-aithnichear àraidh aca air an fhrithealaiche aca. Dh’fhaoidte gu bheil luchd-cleachdaidh air a bheil an t-aon ainm air frithealaichean eile.",
+  "domain_pill.username": "Ainm-cleachdaiche",
+  "domain_pill.whats_in_a_handle": "Dè th’ ann an aithnichear?",
+  "domain_pill.who_they_are": "On a dh’innseas aithnichearan cò cuideigin agus càit a bheil iad, ’s urrainn dhut conaltradh le daoine thar an lìonraidh shòisealta de <button>dh’ùrlaran le cumhachd ActivityPub</button>.",
+  "domain_pill.who_you_are": "On a dh’innseas d’ aithnichear cò thusa agus càit a bheil thu, ’s urrainn do dhaoine conaltradh leat thar an lìonraidh shòisealta de <button>dh’ùrlaran le cumhachd ActivityPub</button>.",
+  "domain_pill.your_handle": "An t-aithnichear agad:",
+  "domain_pill.your_server": "Do dhachaigh dhigiteach far a bheil na postaichean uile agad a’ fuireach. Nach toigh leat an tè seo? Dèan imrich gu frithealaiche eile uair sam bith is thoir an luchd-leantainn agad leat cuideachd.",
+  "domain_pill.your_username": "Seo an t-aithnichear àraidh agad air an fhrithealaiche seo. Dh’fhaoidte gu bheil luchd-cleachdaidh air a bheil an t-aon ainm air frithealaichean eile.",
   "embed.instructions": "Leabaich am post seo san làrach-lìn agad is tu a’ dèanamh lethbhreac dhen chòd gu h-ìosal.",
   "embed.preview": "Seo an coltas a bhios air:",
   "emoji_button.activity": "Gnìomhachd",
@@ -241,6 +266,7 @@
   "empty_column.list": "Chan eil dad air an liosta seo fhathast. Nuair a phostaicheas buill a tha air an liosta seo postaichean ùra, nochdaidh iad an-seo.",
   "empty_column.lists": "Chan eil liosta agad fhathast. Nuair chruthaicheas tu tè, nochdaidh i an-seo.",
   "empty_column.mutes": "Cha do mhùch thu cleachdaiche sam bith fhathast.",
+  "empty_column.notification_requests": "Glan! Chan eil dad an-seo. Nuair a gheibh thu brathan ùra, nochdaidh iad an-seo a-rèir nan roghainnean agad.",
   "empty_column.notifications": "Cha d’ fhuair thu brath sam bith fhathast. Nuair a nì càch conaltradh leat, chì thu an-seo e.",
   "empty_column.public": "Chan eil dad an-seo! Sgrìobh rudeigin gu poblach no lean càch o fhrithealaichean eile a làimh airson seo a lìonadh",
   "error.unexpected_crash.explanation": "Air sàilleibh buga sa chòd againn no duilgheadas co-chòrdalachd leis a’ bhrabhsair, chan urrainn dhuinn an duilleag seo a shealltainn mar bu chòir.",
@@ -271,6 +297,8 @@
   "filter_modal.select_filter.subtitle": "Cleachd roinn-seòrsa a tha ann no cruthaich tè ùr",
   "filter_modal.select_filter.title": "Criathraich am post seo",
   "filter_modal.title.status": "Criathraich post",
+  "filtered_notifications_banner.pending_requests": "{count, plural, =0 {Chan eil brath ann o dhaoine} one {Tha brathan ann o # neach} two {Tha brathan ann o # neach} few {Tha brathan ann o # daoine} other {Tha brathan ann o # duine}} air a bheil thu eòlach ’s dòcha",
+  "filtered_notifications_banner.title": "Brathan criathraichte",
   "firehose.all": "Na h-uile",
   "firehose.local": "Am frithealaiche seo",
   "firehose.remote": "Frithealaichean eile",
@@ -287,7 +315,7 @@
   "follow_suggestions.personalized_suggestion": "Moladh pearsanaichte",
   "follow_suggestions.popular_suggestion": "Moladh air a bheil fèill mhòr",
   "follow_suggestions.view_all": "Seall na h-uile",
-  "follow_suggestions.who_to_follow": "Cò a leanas tu",
+  "follow_suggestions.who_to_follow": "Molaidhean leantainn",
   "followed_tags": "Tagaichean hais ’gan leantainn",
   "footer.about": "Mu dhèidhinn",
   "footer.directory": "Eòlaire nam pròifil",
@@ -399,9 +427,15 @@
   "loading_indicator.label": "’Ga luchdadh…",
   "media_gallery.toggle_visible": "{number, plural, 1 {Falaich an dealbh} one {Falaich na dealbhan} two {Falaich na dealbhan} few {Falaich na dealbhan} other {Falaich na dealbhan}}",
   "moved_to_account_banner.text": "Tha an cunntas {disabledAccount} agad à comas on a rinn thu imrich gu {movedToAccount}.",
-  "mute_modal.duration": "Faide",
-  "mute_modal.hide_notifications": "A bheil thu airson na brathan fhalach on chleachdaiche seo?",
-  "mute_modal.indefinite": "Gun chrìoch",
+  "mute_modal.hide_from_notifications": "Falaich o na brathan",
+  "mute_modal.hide_options": "Roghainnean falaich",
+  "mute_modal.indefinite": "Gus an dì-mhùch mi iad",
+  "mute_modal.show_options": "Seall na roghainnean",
+  "mute_modal.they_can_mention_and_follow": "’S urrainn dhaibh iomradh a thoirt ort agus do leantainn ach chan fhaic thu iad-san.",
+  "mute_modal.they_wont_know": "Cha bhi fios aca gun deach am mùchadh.",
+  "mute_modal.title": "A bheil thu airson an cleachdaiche a mhùchadh?",
+  "mute_modal.you_wont_see_mentions": "Chan fhaic thu na postaichean a bheir iomradh orra.",
+  "mute_modal.you_wont_see_posts": "Chì iad na postaichean agad fhathast ach chan fhaic thu na postaichean aca-san.",
   "navigation_bar.about": "Mu dhèidhinn",
   "navigation_bar.advanced_interface": "Fosgail san eadar-aghaidh-lìn adhartach",
   "navigation_bar.blocks": "Cleachdaichean bacte",
@@ -439,6 +473,10 @@
   "notification.reblog": "Bhrosnaich {name} am post agad",
   "notification.status": "Phostaich {name} rud",
   "notification.update": "Dheasaich {name} post",
+  "notification_requests.accept": "Gabh ris",
+  "notification_requests.dismiss": "Leig seachad",
+  "notification_requests.notifications_from": "Brathan o {name}",
+  "notification_requests.title": "Brathan criathraichte",
   "notifications.clear": "Falamhaich na brathan",
   "notifications.clear_confirmation": "A bheil thu cinnteach gu bheil thu airson na brathan uile agad fhalamhachadh gu buan?",
   "notifications.column_settings.admin.report": "Gearanan ùra:",
@@ -470,6 +508,15 @@
   "notifications.permission_denied": "Chan eil brathan deasga ri fhaighinn on a chaidh iarrtas ceadan a’ bhrabhsair a dhiùltadh cheana",
   "notifications.permission_denied_alert": "Cha ghabh brathan deasga a chur an comas on a chaidh iarrtas ceadan a’ bhrabhsair a dhiùltadh cheana",
   "notifications.permission_required": "Chan eil brathan deasga ri fhaighinn on nach deach an cead riatanach a thoirt seachad.",
+  "notifications.policy.filter_new_accounts.hint": "Chaidh a chruthachadh o chionn {count, plural, one {# latha} two {# latha} few {# làithean} other {# latha}}",
+  "notifications.policy.filter_new_accounts_title": "Cunntasan ùra",
+  "notifications.policy.filter_not_followers_hint": "A’ gabhail a-staigh an fheadhainn a lean ort nas lugha na {count, plural, one {# latha} two {# latha} few {# làithean} other {# latha}} seo chaidh",
+  "notifications.policy.filter_not_followers_title": "Daoine nach eil gad leantainn",
+  "notifications.policy.filter_not_following_hint": "Gus an aontaich thu riutha a làimh",
+  "notifications.policy.filter_not_following_title": "Daoine nach eil thu a’ leantainn",
+  "notifications.policy.filter_private_mentions_hint": "Criathraichte ach ma tha e a’ freagairt do dh’iomradh agad fhèin no ma tha thu a’ leantainn an seòladair",
+  "notifications.policy.filter_private_mentions_title": "Iomraidhean prìobhaideach o choigrich",
+  "notifications.policy.title": "Falamhaich na brathan o…",
   "notifications_permission_banner.enable": "Cuir brathan deasga an comas",
   "notifications_permission_banner.how_to_control": "Airson brathan fhaighinn nuair nach eil Mastodon fosgailte, cuir na brathan deasga an comas. Tha an smachd agad fhèin air dè na seòrsaichean de chonaltradh a ghineas brathan deasga leis a’ phutan {icon} gu h-àrd nuair a bhios iad air an cur an comas.",
   "notifications_permission_banner.title": "Na caill dad gu bràth tuilleadh",
@@ -646,9 +693,11 @@
   "status.direct": "Thoir iomradh air @{name} gu prìobhaideach",
   "status.direct_indicator": "Iomradh prìobhaideach",
   "status.edit": "Deasaich",
+  "status.edited": "An deasachadh mu dheireadh {date}",
   "status.edited_x_times": "Chaidh a dheasachadh {count, plural, one {{counter} turas} two {{counter} thuras} few {{counter} tursan} other {{counter} turas}}",
   "status.embed": "Leabaich",
   "status.favourite": "Cuir ris na h-annsachdan",
+  "status.favourites": "{count, plural, one {annsachd} two {annsachd} few {annsachdan} other {annsachd}",
   "status.filter": "Criathraich am post seo",
   "status.filtered": "Criathraichte",
   "status.hide": "Falaich am post",
@@ -669,6 +718,7 @@
   "status.reblog": "Brosnaich",
   "status.reblog_private": "Brosnaich leis an t-so-fhaicsinneachd tùsail",
   "status.reblogged_by": "’Ga bhrosnachadh le {name}",
+  "status.reblogs": "{count, plural, one {bhrosnachadh} two {bhrosnachadh} few {brosnachaidhean} other {brosnachadh}",
   "status.reblogs.empty": "Chan deach am post seo a bhrosnachadh le duine sam bith fhathast. Nuair a bhrosnaicheas cuideigin e, nochdaidh iad an-seo.",
   "status.redraft": "Sguab às ⁊ dèan dreachd ùr",
   "status.remove_bookmark": "Thoir an comharra-lìn air falbh",
diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json
index 02f57570a52acf..d5726062a3ddb1 100644
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@@ -160,9 +160,7 @@
   "compose_form.spoiler.unmarked": "Engadir aviso sobre o contido",
   "compose_form.spoiler_placeholder": "Aviso sobre o contido (optativo)",
   "confirmation_modal.cancel": "Cancelar",
-  "confirmations.block.block_and_report": "Bloquear e denunciar",
   "confirmations.block.confirm": "Bloquear",
-  "confirmations.block.message": "Tes a certeza de querer bloquear a {name}?",
   "confirmations.cancel_follow_request.confirm": "Retirar solicitude",
   "confirmations.cancel_follow_request.message": "Tes a certeza de querer retirar a solicitude para seguir a {name}?",
   "confirmations.delete.confirm": "Eliminar",
@@ -171,15 +169,12 @@
   "confirmations.delete_list.message": "Tes a certeza de querer eliminar de xeito permanente esta listaxe?",
   "confirmations.discard_edit_media.confirm": "Descartar",
   "confirmations.discard_edit_media.message": "Tes cambios sen gardar para a vista previa ou descrición do multimedia, descartamos os cambios?",
-  "confirmations.domain_block.confirm": "Agochar dominio enteiro",
   "confirmations.domain_block.message": "Tes a certeza de querer bloquear todo de {domain}? Na meirande parte dos casos uns bloqueos ou silenciados específicos son suficientes. Non verás máis o contido deste dominio en ningunha cronoloxía pública ou nas túas notificacións. As túas seguidoras deste dominio serán eliminadas.",
   "confirmations.edit.confirm": "Editar",
   "confirmations.edit.message": "Ao editar sobrescribirás a mensaxe que estás a compor. Tes a certeza de que queres continuar?",
   "confirmations.logout.confirm": "Pechar sesión",
   "confirmations.logout.message": "Desexas pechar a sesión?",
   "confirmations.mute.confirm": "Acalar",
-  "confirmations.mute.explanation": "Isto agochará as súas publicacións ou as que a mencionen, mais poderá ler as túas publicacións e ser seguidora túa.",
-  "confirmations.mute.message": "Tes a certeza de querer acalar a {name}?",
   "confirmations.redraft.confirm": "Eliminar e reescribir",
   "confirmations.redraft.message": "Tes a certeza de querer eliminar esta publicación e reescribila? Perderás as promocións e favorecementos, e as respostas á publicación orixinal ficarán orfas.",
   "confirmations.reply.confirm": "Responder",
@@ -402,9 +397,6 @@
   "loading_indicator.label": "Estase a cargar…",
   "media_gallery.toggle_visible": "Agochar {number, plural, one {imaxe} other {imaxes}}",
   "moved_to_account_banner.text": "A túa conta {disabledAccount} está actualmente desactivada porque movéchela a {movedToAccount}.",
-  "mute_modal.duration": "Duración",
-  "mute_modal.hide_notifications": "Agochar notificacións desta persoa?",
-  "mute_modal.indefinite": "Indefinida",
   "navigation_bar.about": "Acerca de",
   "navigation_bar.advanced_interface": "Abrir coa interface web avanzada",
   "navigation_bar.blocks": "Usuarias bloqueadas",
diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json
index 6cf7fc9283b7c5..48f028f3b50e4d 100644
--- a/app/javascript/mastodon/locales/he.json
+++ b/app/javascript/mastodon/locales/he.json
@@ -89,6 +89,14 @@
   "announcement.announcement": "הכרזה",
   "attachments_list.unprocessed": "(לא מעובד)",
   "audio.hide": "השתק",
+  "block_modal.remote_users_caveat": "אנו נבקש מהשרת {domain} לכבד את החלטתך. עם זאת, ציות למוסכמות איננו מובטח כיוון ששרתים מסויימים עשויים לטפל בחסימות בצורה אחרת. הודעות פומביות עדיין יהיו גלויות לעיני משתמשים שאינם מחוברים.",
+  "block_modal.show_less": "הצג פחות",
+  "block_modal.show_more": "הצג עוד",
+  "block_modal.they_cant_mention": "הם אינם יכולים לאזכר אותך או לעקוב אחריך.",
+  "block_modal.they_cant_see_posts": "הם לא יכולים לראות את הודעותיך ואתם לא תוכלו לראות את שלהם.",
+  "block_modal.they_will_know": "הם יכולים לראות שהם חסומים.",
+  "block_modal.title": "לחסום משתמש?",
+  "block_modal.you_wont_see_mentions": "לא תראה הודעות שמאזכרות אותם.",
   "boost_modal.combo": "ניתן להקיש {combo} כדי לדלג בפעם הבאה",
   "bundle_column_error.copy_stacktrace": "העתקת הודעת שגיאה",
   "bundle_column_error.error.body": "הדף המבוקש אינו זמין. זה עשוי להיות באג בקוד או בעייה בתאימות הדפדפן.",
@@ -160,9 +168,7 @@
   "compose_form.spoiler.unmarked": "הוסף אזהרת תוכן",
   "compose_form.spoiler_placeholder": "אזהרת תוכן (לא חובה)",
   "confirmation_modal.cancel": "ביטול",
-  "confirmations.block.block_and_report": "לחסום ולדווח",
   "confirmations.block.confirm": "לחסום",
-  "confirmations.block.message": "האם את/ה בטוח/ה שברצונך למחוק את \"{name}\"?",
   "confirmations.cancel_follow_request.confirm": "ויתור על בקשה",
   "confirmations.cancel_follow_request.message": "לבטל את בקשת המעקב אחרי {name}?",
   "confirmations.delete.confirm": "למחוק",
@@ -171,15 +177,13 @@
   "confirmations.delete_list.message": "האם אתם בטוחים שאתם רוצים למחוק את הרשימה לצמיתות?",
   "confirmations.discard_edit_media.confirm": "השלך",
   "confirmations.discard_edit_media.message": "יש לך שינויים לא שמורים לתיאור המדיה. להשליך אותם בכל זאת?",
-  "confirmations.domain_block.confirm": "חסמו לגמרי את שם המתחם (דומיין)",
+  "confirmations.domain_block.confirm": "חסימת שרת",
   "confirmations.domain_block.message": "בטוחה שברצונך באמת לחסום את קהילת {domain}? ברב המקרים השתקה וחסימה של מספר משתמשים עשוייה להספיק. לא תראי תוכל מכלל שם המתחם בפידים הציבוריים או בהתראות שלך. העוקבים שלך מהקהילה הזאת יוסרו",
   "confirmations.edit.confirm": "עריכה",
   "confirmations.edit.message": "עריכה תדרוס את ההודעה שכבר התחלת לכתוב. האם להמשיך?",
   "confirmations.logout.confirm": "התנתקות",
   "confirmations.logout.message": "האם אתם בטוחים שאתם רוצים להתנתק?",
   "confirmations.mute.confirm": "להשתיק",
-  "confirmations.mute.explanation": "זה יסתיר הודעות שלהם והודעות שמאזכרות אותם, אבל עדיין יתיר להם לראות הודעות שלך ולעקוב אחריך.",
-  "confirmations.mute.message": "בטוח/ה שברצונך להשתיק את {name}?",
   "confirmations.redraft.confirm": "מחיקה ועריכה מחדש",
   "confirmations.redraft.message": "למחוק ולהתחיל טיוטה חדשה? חיבובים והדהודים יאבדו, ותגובות להודעה המקורית ישארו יתומות.",
   "confirmations.reply.confirm": "תגובה",
@@ -205,6 +209,27 @@
   "dismissable_banner.explore_statuses": "אלו הודעות משרת זה ואחרים ברשת המבוזרת שצוברות חשיפה היום. הודעות חדשות יותר עם יותר הדהודים וחיבובים מדורגות גבוה יותר.",
   "dismissable_banner.explore_tags": "התגיות האלו, משרת זה ואחרים ברשת המבוזרת, צוברות חשיפה כעת.",
   "dismissable_banner.public_timeline": "אלו ההודעות האחרונות שהתקבלו מהמשתמשים שנעקבים על ידי משתמשים מ־{domain}.",
+  "domain_block_modal.block": "חסימת שרת",
+  "domain_block_modal.block_account_instead": "לחסום את @{name} במקום שרת שלם",
+  "domain_block_modal.they_can_interact_with_old_posts": "משתמשים משרת זה יכולים להתייחס להודעותיך הישנות.",
+  "domain_block_modal.they_cant_follow": "משתמש משרת זה לא יכול לעקוב אחריך.",
+  "domain_block_modal.they_wont_know": "הם לא ידעו כי נחסמו.",
+  "domain_block_modal.title": "לחסום שרת?",
+  "domain_block_modal.you_will_lose_followers": "כל עוקביך משרת זה יוסרו.",
+  "domain_block_modal.you_wont_see_posts": "לא תוכלו לראות הודעות ממשתמשים על שרת זה.",
+  "domain_pill.activitypub_lets_connect": "מאפשר לך להתחבר ולהתרועע עם אחרים לא רק במסטודון, אלא גם ביישומים חברתיים שונים אחרים.",
+  "domain_pill.activitypub_like_language": "אקטיביטיפאב היא למעשה השפה בה מסטודון מדבר עם רשתות חברתיות אחרות.",
+  "domain_pill.server": "שרת",
+  "domain_pill.their_handle": "הכינוי שלהם:",
+  "domain_pill.their_server": "הבית המקוון שלהם, היכן שהודעותיהם שוכנות.",
+  "domain_pill.their_username": "המזהה הייחודי של השרת שלהם. ניתן למצוא משתמשים עם שם משתמש זהה על שרתים שונים.",
+  "domain_pill.username": "שם משתמש/ת",
+  "domain_pill.whats_in_a_handle": "מה כולל כינוי?",
+  "domain_pill.who_they_are": "מאחר וכינויים מספרים על מישהו ומה מיקומו, ניתן להיות בקשר עם אנשים לרוחבה של הרשת החברתית של <button>שירותי אקטיביטיפאב</button>.",
+  "domain_pill.who_you_are": "מאחר והכינוי שלך מספר על מי את.ה ומה מקומך בעולם, משתמשים מכל העולם יוכלו להיות בקשר עמך לרוחבה של הרשת החברתית של <button>שירותי אקטיביטיפאב</button>.",
+  "domain_pill.your_handle": "הכינוי שלך:",
+  "domain_pill.your_server": "הבית המקוון שלך, היכן ששוכנות כל הודעותיך. לא מוצא חן בעיניך? ניתן לעבור שרתים בכל עת וגם לשמור על העוקבים.",
+  "domain_pill.your_username": "המזהה הייחודי שלך על שרת זה. ניתן למצוא משתמשים עם שם משתמש זהה על שרתים שונים.",
   "embed.instructions": "ניתן להטמיע את ההודעה הזו באתרך ע\"י העתקת הקוד שלהלן.",
   "embed.preview": "דוגמא כיצד זה יראה:",
   "emoji_button.activity": "פעילות",
@@ -402,9 +427,15 @@
   "loading_indicator.label": "בטעינה…",
   "media_gallery.toggle_visible": "{number, plural, one {להסתיר תמונה} two {להסתיר תמונותיים} many {להסתיר תמונות} other {להסתיר תמונות}}",
   "moved_to_account_banner.text": "חשבונך {disabledAccount} אינו פעיל כרגע עקב מעבר ל{movedToAccount}.",
-  "mute_modal.duration": "משך הזמן",
-  "mute_modal.hide_notifications": "להסתיר התראות מחשבון זה?",
-  "mute_modal.indefinite": "ללא תאריך סיום",
+  "mute_modal.hide_from_notifications": "להסתיר מהתראות",
+  "mute_modal.hide_options": "הסתרת אפשרויות",
+  "mute_modal.indefinite": "עד שאסיר השתקה",
+  "mute_modal.show_options": "הצגת אפשרויות",
+  "mute_modal.they_can_mention_and_follow": "הם יכולם לאזכר אתכם ולעקוב אחריכם, אבל לא תראו אותם.",
+  "mute_modal.they_wont_know": "הם לא ידעו כי הושתקו.",
+  "mute_modal.title": "להשתיק משתמש?",
+  "mute_modal.you_wont_see_mentions": "לא תראה הודעות שמאזכרות אותם.",
+  "mute_modal.you_wont_see_posts": "הם יכולים לראות את הודעותכם, אבל אתם לא תוכלו לראות את שלהם.",
   "navigation_bar.about": "אודות",
   "navigation_bar.advanced_interface": "פתח במנשק ווב מתקדם",
   "navigation_bar.blocks": "משתמשים חסומים",
diff --git a/app/javascript/mastodon/locales/hi.json b/app/javascript/mastodon/locales/hi.json
index edab89a84ae34c..372eb09fa78fd4 100644
--- a/app/javascript/mastodon/locales/hi.json
+++ b/app/javascript/mastodon/locales/hi.json
@@ -21,6 +21,7 @@
   "account.blocked": "ब्लॉक",
   "account.browse_more_on_origin_server": "मूल प्रोफ़ाइल पर अधिक ब्राउज़ करें",
   "account.cancel_follow_request": "फॉलो रिक्वेस्ट वापस लें",
+  "account.copy": "प्रोफाइल पर लिंक कॉपी करें",
   "account.direct": "निजि तरीके से उल्लेख करे @{name}",
   "account.disable_notifications": "@{name} पोस्ट के लिए मुझे सूचित मत करो",
   "account.domain_blocked": "छिपा हुआ डोमेन",
@@ -31,6 +32,7 @@
   "account.featured_tags.last_status_never": "कोई पोस्ट नहीं है",
   "account.featured_tags.title": "{name} के चुनिंदा हैशटैग",
   "account.follow": "फॉलो करें",
+  "account.follow_back": "फॉलो करें",
   "account.followers": "फॉलोवर",
   "account.followers.empty": "कोई भी इस यूज़र् को फ़ॉलो नहीं करता है",
   "account.followers_counter": "{count, plural, one {{counter} अनुगामी} other {{counter} समर्थक}}",
@@ -51,6 +53,7 @@
   "account.mute_notifications_short": "सूचनाओ को शांत करे",
   "account.mute_short": "शांत करे",
   "account.muted": "म्यूट है",
+  "account.mutual": "आपसी",
   "account.no_bio": "कोई विवरण नहि दिया गया हे",
   "account.open_original_page": "ओरिजिनल पोस्ट खोलें",
   "account.posts": "टूट्स",
@@ -75,6 +78,8 @@
   "admin.dashboard.retention.average": "औसत",
   "admin.dashboard.retention.cohort": "साईन-अप महिना",
   "admin.dashboard.retention.cohort_size": "नये उपयोगकर्ता",
+  "admin.impact_report.instance_accounts": "ये अकाउंट प्रोफाइल मिटा देगा",
+  "admin.impact_report.instance_followers": "हमारे यूजर्स इन फॉलोअर्स को खो देंगे",
   "admin.impact_report.title": "प्रभावकां सारांश",
   "alert.rate_limited.message": "कृप्या {retry_time, time, medium} के बाद दुबारा कोशिश करें",
   "alert.rate_limited.title": "सीमित दर",
@@ -83,6 +88,13 @@
   "announcement.announcement": "घोषणा",
   "attachments_list.unprocessed": "(असंसाधित)",
   "audio.hide": "हाईड ऑडियो",
+  "block_modal.show_less": "कम दिखाएं",
+  "block_modal.show_more": "और दिखाएँ",
+  "block_modal.they_cant_mention": "वे आपको मेंशन या फॉलो नहीं कर सकते",
+  "block_modal.they_cant_see_posts": "वो आपके पोस्ट नहीं देख सकते और न आप उनके",
+  "block_modal.they_will_know": "वे नहीं देख सकते कि उन्हें ब्लॉक किया गया है",
+  "block_modal.title": "यूजर को ब्लॉक करें?",
+  "block_modal.you_wont_see_mentions": "वो पोस्ट आप नहीं देख सकते जिनमें उन्हें मेंशन किया गया है",
   "boost_modal.combo": "अगली बार स्किप करने के लिए आप {combo} दबा सकते है",
   "bundle_column_error.copy_stacktrace": "कॉपी एरर रिपोर्ट",
   "bundle_column_error.error.body": "अनुरोधित पेज प्रस्तुत नहीं किया जा सका। यह हमारे कोड में बग या ब्राउज़र संगतता समस्या के कारण हो सकता है।",
@@ -130,7 +142,9 @@
   "community.column_settings.remote_only": "केवल सुदूर",
   "compose.language.change": "भाषा बदलें",
   "compose.language.search": "भाषाएँ खोजें...",
+  "compose.published.body": "पोस्ट प्रकाशित हुआ।",
   "compose.published.open": "खोलें",
+  "compose.saved.body": "पोस्ट सुरक्षित किया गया।",
   "compose_form.direct_message_warning_learn_more": "और जानें",
   "compose_form.encryption_warning": "मास्टोडॉन पर पोस्ट एन्ड-टू-एन्ड एन्क्रिप्टेड नहीं है। कोई भी व्यक्तिगत जानकारी मास्टोडॉन पर मत भेजें।",
   "compose_form.hashtag_warning": "ये पोस्ट किसी भी हैशटैग में लिस्ट नहीं किया जाएगा क्योंकि ये पब्लिक नहीं है। सिर्फ पब्लिक पोस्ट ही हैशटैग से खोजे जा सकते हैं।",
@@ -138,15 +152,21 @@
   "compose_form.lock_disclaimer.lock": "लॉक्ड",
   "compose_form.placeholder": "What is on your mind?",
   "compose_form.poll.duration": "चुनाव की अवधि",
+  "compose_form.poll.multiple": "बहुविकल्पी",
+  "compose_form.poll.option_placeholder": "विकल्प {number}",
+  "compose_form.poll.single": "कोई एक चुनें",
   "compose_form.poll.switch_to_multiple": "कई विकल्पों की अनुमति देने के लिए पोल बदलें",
   "compose_form.poll.switch_to_single": "एक ही विकल्प के लिए अनुमति देने के लिए पोल बदलें",
+  "compose_form.poll.type": "स्टाइल",
+  "compose_form.publish": "पोस्ट करें",
   "compose_form.publish_form": "पब्लिश",
+  "compose_form.reply": "जवाब दें",
+  "compose_form.save_changes": "अपडेट करें",
   "compose_form.spoiler.marked": "चेतावनी के पीछे टेक्स्ट छिपा है",
   "compose_form.spoiler.unmarked": "टेक्स्ट छिपा नहीं है",
+  "compose_form.spoiler_placeholder": "सामग्री चेतावनी (वैकल्पिक)",
   "confirmation_modal.cancel": "रद्द करें",
-  "confirmations.block.block_and_report": "ब्लॉक एवं रिपोर्ट",
   "confirmations.block.confirm": "ब्लॉक",
-  "confirmations.block.message": "क्या आप वाकई {name} को ब्लॉक करना चाहते हैं?",
   "confirmations.cancel_follow_request.confirm": "रिक्वेस्ट वापस लें",
   "confirmations.cancel_follow_request.message": "क्या आप सुनिश्चित है की आप {name} का फॉलो रिक्वेस्ट वापिस लेना चाहते हैं?",
   "confirmations.delete.confirm": "मिटाए",
@@ -155,15 +175,13 @@
   "confirmations.delete_list.message": "क्या आप वाकई इस लिस्ट को हमेशा के लिये मिटाना चाहते हैं?",
   "confirmations.discard_edit_media.confirm": "डिस्कार्ड",
   "confirmations.discard_edit_media.message": "लिस्ट में जोड़ें",
-  "confirmations.domain_block.confirm": "संपूर्ण डोमेन छिपाएं",
+  "confirmations.domain_block.confirm": "सर्वर ब्लॉक करें",
   "confirmations.domain_block.message": "क्या आप वास्तव में, वास्तव में आप पूरे {domain} को ब्लॉक करना चाहते हैं? ज्यादातर मामलों में कुछ लक्षित ब्लॉक या म्यूट पर्याप्त और बेहतर हैं। आप किसी भी सार्वजनिक समय-सीमा या अपनी सूचनाओं में उस डोमेन की सामग्री नहीं देखेंगे। उस डोमेन से आपके फॉलोवर्स को हटा दिया जाएगा।",
   "confirmations.edit.confirm": "संशोधित करें",
   "confirmations.edit.message": "अभी संपादन किया तो वो संदेश मिट जायेगा जिसे आप लिख रहे थे। क्या आप जारी रखना चाहते हैं?",
   "confirmations.logout.confirm": "लॉग आउट करें",
   "confirmations.logout.message": "आप सुनिश्चित हैं कि लॉगआउट करना चाहते हैं?",
   "confirmations.mute.confirm": "शांत",
-  "confirmations.mute.explanation": "यह उनसे और पोस्टों का उल्लेख करते हुए उनसे छिपाएगा, लेकिन यह अभी भी उन्हें आपकी पोस्ट देखने और आपको फॉलो करने की अनुमति देगा।",
-  "confirmations.mute.message": "क्या आप वाकई {name} को शांत करना चाहते हैं?",
   "confirmations.redraft.confirm": "मिटायें और पुनःप्रारूपण करें",
   "confirmations.redraft.message": "क्या आप वाकई इस स्टेटस को हटाना चाहते हैं और इसे फिर से ड्राफ्ट करना चाहते हैं? पसंदीदा और बूस्ट खो जाएंगे, और मूल पोस्ट के उत्तर अनाथ हो जाएंगे।",
   "confirmations.reply.confirm": "उत्तर दें",
@@ -174,6 +192,7 @@
   "conversation.mark_as_read": "पढ़ा गया के रूप में चिह्नित करें",
   "conversation.open": "वार्तालाप देखें",
   "conversation.with": "{names} के साथ",
+  "copy_icon_button.copied": "क्लिपबोर्ड पर कॉपी किया गया",
   "copypaste.copied": "कॉपी किआ जा चूका है",
   "copypaste.copy_to_clipboard": "क्लिपबोर्ड पर कॉपी करें",
   "directory.federated": "ज्ञात फेडीवर्स से",
@@ -345,9 +364,6 @@
   "lists.replies_policy.none": "कोई नहीं",
   "lists.replies_policy.title": "इसके जवाब दिखाएं:",
   "lists.subheading": "आपकी सूचियाँ",
-  "mute_modal.duration": "अवधि",
-  "mute_modal.hide_notifications": "इस सभ्य की ओरसे आनेवाली सूचनाए शांत करे",
-  "mute_modal.indefinite": "अनिश्चितकालीन",
   "navigation_bar.about": "विवरण",
   "navigation_bar.blocks": "ब्लॉक्ड यूज़र्स",
   "navigation_bar.bookmarks": "पुस्तकचिह्न:",
@@ -480,6 +496,7 @@
   "status.delete": "हटाएं",
   "status.detailed_status": "विस्तृत वार्ता दृश्य",
   "status.direct": "निजी संदेश @{name} से",
+  "status.edited": "पिछला संशोधन {date}",
   "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
   "status.media.open": "खोलने के लिए क्लिक करें",
   "status.media.show": "दिखाने के लिए क्लिक करें",
diff --git a/app/javascript/mastodon/locales/hr.json b/app/javascript/mastodon/locales/hr.json
index 1e68854c12fd36..ec8d62dbba5c2c 100644
--- a/app/javascript/mastodon/locales/hr.json
+++ b/app/javascript/mastodon/locales/hr.json
@@ -146,9 +146,7 @@
   "compose_form.spoiler.marked": "Tekst je skriven iza upozorenja",
   "compose_form.spoiler.unmarked": "Tekst nije skriven",
   "confirmation_modal.cancel": "Otkaži",
-  "confirmations.block.block_and_report": "Blokiraj i prijavi",
   "confirmations.block.confirm": "Blokiraj",
-  "confirmations.block.message": "Sigurno želite blokirati {name}?",
   "confirmations.cancel_follow_request.confirm": "Povuci zahtjev",
   "confirmations.delete.confirm": "Obriši",
   "confirmations.delete.message": "Stvarno želite obrisati ovaj toot?",
@@ -156,14 +154,11 @@
   "confirmations.delete_list.message": "Jeste li sigurni da želite trajno obrisati ovu listu?",
   "confirmations.discard_edit_media.confirm": "Odbaciti",
   "confirmations.discard_edit_media.message": "Postoje nespremljene promjene u opisu medija ili u pretpregledu, svejedno ih odbaciti?",
-  "confirmations.domain_block.confirm": "Blokiraj cijelu domenu",
   "confirmations.domain_block.message": "Jeste li zaista, zaista sigurni da želite blokirati cijelu domenu {domain}? U većini slučajeva dovoljno je i preferirano nekoliko ciljanih blokiranja ili utišavanja. Nećete vidjeti sadržaj s te domene ni u kojim javnim vremenskim crtama ili Vašim obavijestima. Vaši pratitelji s te domene bit će uklonjeni.",
   "confirmations.edit.confirm": "Uredi",
   "confirmations.logout.confirm": "Odjavi se",
   "confirmations.logout.message": "Jeste li sigurni da se želite odjaviti?",
   "confirmations.mute.confirm": "Utišaj",
-  "confirmations.mute.explanation": "Ovo će sakriti njihove objave i objave koje ih spominju, ali i dalje će im dopuštati da vide Vaše objave i da Vas prate.",
-  "confirmations.mute.message": "Jeste li sigurni da želite utišati {name}?",
   "confirmations.redraft.confirm": "Izbriši i ponovno uredi",
   "confirmations.reply.confirm": "Odgovori",
   "confirmations.reply.message": "Odgovaranje sada će prepisati poruku koju upravo pišete. Jeste li sigurni da želite nastaviti?",
@@ -323,8 +318,6 @@
   "lists.search": "Traži među praćenim ljudima",
   "lists.subheading": "Vaše liste",
   "media_gallery.toggle_visible": "Sakrij {number, plural, one {sliku} other {slike}}",
-  "mute_modal.duration": "Trajanje",
-  "mute_modal.hide_notifications": "Sakrij obavijesti ovog korisnika?",
   "navigation_bar.about": "O aplikaciji",
   "navigation_bar.advanced_interface": "Otvori u naprednom web sučelju",
   "navigation_bar.blocks": "Blokirani korisnici",
diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json
index f658fe4656b3a4..c13c8dc220c3a1 100644
--- a/app/javascript/mastodon/locales/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@@ -16,7 +16,7 @@
   "account.badges.bot": "Automatizált",
   "account.badges.group": "Csoport",
   "account.block": "@{name} letiltása",
-  "account.block_domain": "Domain blokkolása: {domain}",
+  "account.block_domain": "Domain letiltása: {domain}",
   "account.block_short": "Letiltás",
   "account.blocked": "Letiltva",
   "account.browse_more_on_origin_server": "További böngészés az eredeti profilon",
@@ -89,6 +89,14 @@
   "announcement.announcement": "Közlemény",
   "attachments_list.unprocessed": "(feldolgozatlan)",
   "audio.hide": "Hang elrejtése",
+  "block_modal.remote_users_caveat": "Arra kérjük a {domain} kiszolgálót, hogy tartsa tiszteletben a döntésedet. Ugyanakkor az együttműködés nem garantált, mivel néhány kiszolgáló másképp kezelheti a letiltásokat. A nyilvános bejegyzések a be nem jelentkezett felhasználók számára továbbra is látszódhatnak.",
+  "block_modal.show_less": "Kevesebb mutatása",
+  "block_modal.show_more": "Több mutatása",
+  "block_modal.they_cant_mention": "Nem említhetnek meg vagy követhetnek téged.",
+  "block_modal.they_cant_see_posts": "Nem láthatják a bejegyzéseidet, és te sem fogod látni az övékét.",
+  "block_modal.they_will_know": "Láthatják, hogy le vannak tiltva.",
+  "block_modal.title": "Letiltsuk a felhasználót?",
+  "block_modal.you_wont_see_mentions": "Nem látsz majd őket említő bejegyzéseket.",
   "boost_modal.combo": "Hogy átugord ezt következő alkalommal, használd {combo}",
   "bundle_column_error.copy_stacktrace": "Hibajelentés másolása",
   "bundle_column_error.error.body": "A kért lap nem jeleníthető meg. Ez lehet, hogy kódhiba, vagy böngészőkompatibitási hiba.",
@@ -113,7 +121,7 @@
   "column.community": "Helyi idővonal",
   "column.direct": "Személyes említések",
   "column.directory": "Profilok böngészése",
-  "column.domain_blocks": "Letiltott tartománynevek",
+  "column.domain_blocks": "Letiltott domainek",
   "column.favourites": "Kedvencek",
   "column.firehose": "Hírfolyamok",
   "column.follow_requests": "Követési kérelmek",
@@ -160,9 +168,7 @@
   "compose_form.spoiler.unmarked": "Tartalmi figyelmeztetés hozzáadása",
   "compose_form.spoiler_placeholder": "Tartalmi figyelmeztetés (opcionális)",
   "confirmation_modal.cancel": "Mégsem",
-  "confirmations.block.block_and_report": "Letiltás és jelentés",
   "confirmations.block.confirm": "Letiltás",
-  "confirmations.block.message": "Biztos, hogy letiltod: {name}?",
   "confirmations.cancel_follow_request.confirm": "Kérés visszavonása",
   "confirmations.cancel_follow_request.message": "Biztos, hogy visszavonod a(z) {name} felhasználóra vonatkozó követési kérésedet?",
   "confirmations.delete.confirm": "Törlés",
@@ -171,15 +177,13 @@
   "confirmations.delete_list.message": "Biztos, hogy véglegesen törölni szeretnéd ezt a listát?",
   "confirmations.discard_edit_media.confirm": "Elvetés",
   "confirmations.discard_edit_media.message": "Elmentetlen változtatásaid vannak a média leírásában vagy előnézetében. Eldobjuk őket?",
-  "confirmations.domain_block.confirm": "Teljes tartomány tiltása",
+  "confirmations.domain_block.confirm": "Kiszolgáló letiltása",
   "confirmations.domain_block.message": "Biztos, hogy le szeretnéd tiltani a teljes {domain} domaint? A legtöbb esetben néhány célzott tiltás vagy némítás elegendő, és kívánatosabb megoldás. Semmilyen tartalmat nem fogsz látni ebből a domainből se az idővonalakon, se az értesítésekben. Az ebben a domainben lévő követőidet is eltávolítjuk.",
   "confirmations.edit.confirm": "Szerkesztés",
   "confirmations.edit.message": "Ha most szerkeszted, ez felülírja a most szerkesztés alatt álló üzenetet. Mégis ezt szeretnéd?",
   "confirmations.logout.confirm": "Kijelentkezés",
   "confirmations.logout.message": "Biztos, hogy kijelentkezel?",
   "confirmations.mute.confirm": "Némítás",
-  "confirmations.mute.explanation": "Ez elrejti a tőlük érkező bejegyzéseket, valamint az őket megemlítőket, de ők továbbra is láthatják a te bejegyzéseid, és követhetnek is téged.",
-  "confirmations.mute.message": "Biztos, hogy némítod: {name}?",
   "confirmations.redraft.confirm": "Törlés és újraírás",
   "confirmations.redraft.message": "Biztos, hogy ezt a bejegyzést szeretnéd törölni és újraírni? Minden megtolást és kedvencnek jelölést elvesztesz, az eredetire adott válaszok pedig elárvulnak.",
   "confirmations.reply.confirm": "Válasz",
@@ -205,6 +209,27 @@
   "dismissable_banner.explore_statuses": "Ezek jelenleg népszerűvé váló bejegyzések a háló különböző szegleteiből. Az újabb vagy több megtolással rendelkező bejegyzéseket, illetve a kedvencnek jelöléssel rendelkezőeket rangsoroljuk előrébb.",
   "dismissable_banner.explore_tags": "Jelenleg ezek a hashtagek hódítanak teret a közösségi weben. Azokat a hashtageket, amelyeket több különböző ember használ, magasabbra rangsorolják.",
   "dismissable_banner.public_timeline": "Ezek a legfrissebb nyilvános bejegyzések a közösségi weben, amelyeket {domain} domain felhasználói követnek.",
+  "domain_block_modal.block": "Kiszolgáló letiltása",
+  "domain_block_modal.block_account_instead": "Helyette @{name} letiltása",
+  "domain_block_modal.they_can_interact_with_old_posts": "Az ezen a kiszolgálón lévő emberek interaktálhatnak a régi bejegyzéseiddel.",
+  "domain_block_modal.they_cant_follow": "Erről a kiszolgálóról senki sem követhet.",
+  "domain_block_modal.they_wont_know": "Nem fogják tudni, hogy letiltották őket.",
+  "domain_block_modal.title": "Letiltsuk a domaint?",
+  "domain_block_modal.you_will_lose_followers": "Az ezen a kiszolgálón lévő összes követődet törölni fogjuk.",
+  "domain_block_modal.you_wont_see_posts": "Nem látsz majd bejegyzéseket vagy értesítéseket ennek a kiszolgálónak a felhasználóitól.",
+  "domain_pill.activitypub_lets_connect": "Lehetővé teszi, hogy kapcsolatba lépj nem csak a Mastodonon, hanem a más közösségi alkalmazásokon lévő emberekkel is.",
+  "domain_pill.activitypub_like_language": "Az ActivityPub olyan mint egy nyelv, amelyet a Mastodon a más közösségi hálózatokkal való kommunikációra használ.",
+  "domain_pill.server": "Kiszolgáló",
+  "domain_pill.their_handle": "A fiókneve:",
+  "domain_pill.their_server": "A digitális otthona, ahol a bejegyzései találhatók.",
+  "domain_pill.their_username": "Az egyedi azonosítója a kiszolgálóján. Lehet, hogy ugyanazon felhasználónév különböző kiszolgálókon is megtalálható.",
+  "domain_pill.username": "Felhasználónév",
+  "domain_pill.whats_in_a_handle": "Mi is egy fióknév?",
+  "domain_pill.who_they_are": "Mivel a fióknevek mondják meg, hogy valaki kicsoda és hol található, így ezek használatával léphetsz kapcsolatba az <button>ActivityPubot használó platformok</button> közösségi hálózatán lévő emberekkel.",
+  "domain_pill.who_you_are": "Mivel a fiókneved mondja meg, hogy ki vagy és hol, így ezek használatával léphetnek kapcsolatba veled az <button>ActivityPubot használó platformok</button> közösségi hálózatán lévő emberek.",
+  "domain_pill.your_handle": "Saját fióknév:",
+  "domain_pill.your_server": "A digitális otthonod, ahol a bejegyzéseid találhatók. Nem tetszik a mostani? Válts kiszolgálót bármikor, és vidd magaddal a követőidet is.",
+  "domain_pill.your_username": "Az egyedi azonosítód ezen a kiszolgálón. Lehet, hogy ugyanazon felhasználónév különböző kiszolgálókon is megtalálható.",
   "embed.instructions": "Ágyazd be ezt a bejegyzést a weboldaladba az alábbi kód kimásolásával.",
   "embed.preview": "Így fog kinézni:",
   "emoji_button.activity": "Tevékenység",
@@ -230,7 +255,7 @@
   "empty_column.bookmarked_statuses": "Még nincs egyetlen könyvjelzőzött bejegyzésed sem. Ha könyvjelzőzöl egyet, itt fog megjelenni.",
   "empty_column.community": "A helyi idővonal üres. Tégy közzé valamit nyilvánosan, hogy elindítsd az eseményeket!",
   "empty_column.direct": "Még nincs egy személyes említésed sem. Küldéskor vagy fogadáskor itt fognak megjelenni.",
-  "empty_column.domain_blocks": "Még nem lett letiltva egyetlen tartomány sem.",
+  "empty_column.domain_blocks": "Még nem lett letiltva egyetlen domain sem.",
   "empty_column.explore_statuses": "Jelenleg semmi sem felkapott. Nézz vissza később!",
   "empty_column.favourited_statuses": "Még nincs egyetlen kedvenc bejegyzésed sem. Ha kedvencnek jelölsz egyet, itt fog megjelenni.",
   "empty_column.favourites": "Még senki sem jelölte ezt a bejegyzést kedvencnek. Ha valaki mégis megteszi, itt fogjuk mutatni.",
@@ -402,9 +427,15 @@
   "loading_indicator.label": "Betöltés…",
   "media_gallery.toggle_visible": "{number, plural, one {Kép elrejtése} other {Képek elrejtése}}",
   "moved_to_account_banner.text": "A(z) {disabledAccount} fiókod jelenleg le van tiltva, mert átköltöztél ide: {movedToAccount}.",
-  "mute_modal.duration": "Időtartam",
-  "mute_modal.hide_notifications": "Rejtsük el a felhasználótól származó értesítéseket?",
-  "mute_modal.indefinite": "Határozatlan",
+  "mute_modal.hide_from_notifications": "Elrejtés az értesítések közül",
+  "mute_modal.hide_options": "Beállítások elrejtése",
+  "mute_modal.indefinite": "Amíg nem oldom fel a némítást",
+  "mute_modal.show_options": "Beállítások megjelenítése",
+  "mute_modal.they_can_mention_and_follow": "Megemlíthetnek vagy követhetnek téged, de nem fogod őket látni.",
+  "mute_modal.they_wont_know": "Nem fogják tudni, hogy lenémították őket.",
+  "mute_modal.title": "Elnémítsuk a felhasználót?",
+  "mute_modal.you_wont_see_mentions": "Nem látsz majd őket említő bejegyzéseket.",
+  "mute_modal.you_wont_see_posts": "Továbbra is látni fogják a bejegyzéseidet, de te nem fogod látni az övékét.",
   "navigation_bar.about": "Névjegy",
   "navigation_bar.advanced_interface": "Megnyitás a speciális webes felületben",
   "navigation_bar.blocks": "Letiltott felhasználók",
@@ -413,7 +444,7 @@
   "navigation_bar.compose": "Új bejegyzés írása",
   "navigation_bar.direct": "Személyes említések",
   "navigation_bar.discover": "Felfedezés",
-  "navigation_bar.domain_blocks": "Letiltott tartományok",
+  "navigation_bar.domain_blocks": "Letiltott domainek",
   "navigation_bar.explore": "Felfedezés",
   "navigation_bar.favourites": "Kedvencek",
   "navigation_bar.filters": "Némított szavak",
diff --git a/app/javascript/mastodon/locales/hy.json b/app/javascript/mastodon/locales/hy.json
index 2ef6d4c777aaf7..7310104bf932f4 100644
--- a/app/javascript/mastodon/locales/hy.json
+++ b/app/javascript/mastodon/locales/hy.json
@@ -123,23 +123,18 @@
   "compose_form.spoiler.marked": "Տեքստը թաքցուած է զգուշացման ետեւում",
   "compose_form.spoiler.unmarked": "Տեքստը թաքցուած չէ",
   "confirmation_modal.cancel": "Չեղարկել",
-  "confirmations.block.block_and_report": "Արգելափակել եւ բողոքել",
   "confirmations.block.confirm": "Արգելափակել",
-  "confirmations.block.message": "Վստա՞հ ես, որ ուզում ես արգելափակել {name}֊ին։",
   "confirmations.cancel_follow_request.confirm": "Կասեցնել հայցը",
   "confirmations.delete.confirm": "Ջնջել",
   "confirmations.delete.message": "Վստա՞հ ես, որ ուզում ես ջնջել այս գրառումը։",
   "confirmations.delete_list.confirm": "Ջնջել",
   "confirmations.delete_list.message": "Վստա՞հ ես, որ ուզում ես մշտապէս ջնջել այս ցանկը։",
   "confirmations.discard_edit_media.confirm": "Չեղարկել",
-  "confirmations.domain_block.confirm": "Թաքցնել ամբողջ տիրույթը",
   "confirmations.domain_block.message": "Հաստատ֊հաստա՞տ վստահ ես, որ ուզում ես արգելափակել ամբողջ {domain} տիրոյթը։ Սովորաբար մի երկու թիրախաւորուած արգելափակում կամ լռեցում բաւական է ու նախընտրելի։",
   "confirmations.edit.confirm": "Խմբագրել",
   "confirmations.logout.confirm": "Ելք",
   "confirmations.logout.message": "Համոզո՞ւած ես, որ ուզում ես դուրս գալ",
   "confirmations.mute.confirm": "Լռեցնել",
-  "confirmations.mute.explanation": "Սա թաքցնելու ա իրենց գրառումներն, ինչպէս նաեւ իրենց նշող գրառումներն, բայց իրենք միեւնոյն է կը կարողանան հետեւել ձեզ եւ տեսնել ձեր գրառումները։",
-  "confirmations.mute.message": "Վստա՞հ ես, որ ուզում ես {name}֊ին լռեցնել։",
   "confirmations.redraft.confirm": "Ջնջել եւ խմբագրել նորից",
   "confirmations.reply.confirm": "Պատասխանել",
   "confirmations.reply.message": "Այս պահին պատասխանելը կը չեղարկի ձեր՝ այս պահին անաւարտ հաղորդագրութիւնը։ Համոզուա՞ծ էք։",
@@ -302,9 +297,6 @@
   "lists.subheading": "Քո ցանկերը",
   "load_pending": "{count, plural, one {# նոր նիւթ} other {# նոր նիւթ}}",
   "media_gallery.toggle_visible": "Ցուցադրել/թաքցնել",
-  "mute_modal.duration": "Տեւողութիւն",
-  "mute_modal.hide_notifications": "Թաքցնե՞լ ծանուցումներն այս օգտատիրոջից։",
-  "mute_modal.indefinite": "Անժամկէտ",
   "navigation_bar.about": "Մասին",
   "navigation_bar.blocks": "Արգելափակուած օգտատէրեր",
   "navigation_bar.bookmarks": "Էջանիշեր",
diff --git a/app/javascript/mastodon/locales/ia.json b/app/javascript/mastodon/locales/ia.json
index 89285271ffa306..7418b213e7360a 100644
--- a/app/javascript/mastodon/locales/ia.json
+++ b/app/javascript/mastodon/locales/ia.json
@@ -123,21 +123,17 @@
   "compose_form.spoiler.unmarked": "Adder advertimento de contento",
   "compose_form.spoiler_placeholder": "Advertimento de contento (optional)",
   "confirmation_modal.cancel": "Cancellar",
-  "confirmations.block.block_and_report": "Blocar e signalar",
   "confirmations.block.confirm": "Blocar",
-  "confirmations.block.message": "Es tu secur que tu vole blocar {name}?",
   "confirmations.cancel_follow_request.confirm": "Retirar requesta",
   "confirmations.cancel_follow_request.message": "Es tu secur que tu vole retirar tu requesta a sequer a {name}?",
   "confirmations.delete.confirm": "Deler",
   "confirmations.delete.message": "Es tu secur que tu vole deler iste message?",
   "confirmations.delete_list.confirm": "Deler",
   "confirmations.delete_list.message": "Es tu secur que tu vole deler permanentemente iste lista?",
-  "confirmations.domain_block.confirm": "Blocar le dominio complete",
   "confirmations.edit.confirm": "Modificar",
   "confirmations.logout.confirm": "Clauder le session",
   "confirmations.logout.message": "Es tu secur que tu vole clauder le session?",
   "confirmations.mute.confirm": "Silentiar",
-  "confirmations.mute.message": "Es tu secur que tu vole silentiar {name}?",
   "confirmations.reply.confirm": "Responder",
   "confirmations.unfollow.confirm": "Non plus sequer",
   "confirmations.unfollow.message": "Es tu secur que tu vole non plus sequer {name}?",
@@ -155,6 +151,7 @@
   "disabled_account_banner.account_settings": "Parametros de conto",
   "disabled_account_banner.text": "Tu conto {disabledAccount} es actualmente disactivate.",
   "dismissable_banner.dismiss": "Dimitter",
+  "domain_pill.username": "Nomine de usator",
   "embed.preview": "Hic es como il parera:",
   "emoji_button.activity": "Activitate",
   "emoji_button.clear": "Rader",
@@ -269,8 +266,6 @@
   "lists.subheading": "Tu listas",
   "loading_indicator.label": "Cargante…",
   "media_gallery.toggle_visible": "{number, plural, one {Celar imagine} other {Celar imagines}}",
-  "mute_modal.duration": "Duration",
-  "mute_modal.hide_notifications": "Celar notificationes de iste usator?",
   "navigation_bar.about": "A proposito de",
   "navigation_bar.advanced_interface": "Aperir in un interfacie web avantiate",
   "navigation_bar.blocks": "Usatores blocate",
diff --git a/app/javascript/mastodon/locales/id.json b/app/javascript/mastodon/locales/id.json
index ae2051a376c67c..764c081119b54a 100644
--- a/app/javascript/mastodon/locales/id.json
+++ b/app/javascript/mastodon/locales/id.json
@@ -140,9 +140,7 @@
   "compose_form.spoiler.marked": "Hapus peringatan tentang isi konten",
   "compose_form.spoiler.unmarked": "Tambahkan peringatan tentang isi konten",
   "confirmation_modal.cancel": "Batal",
-  "confirmations.block.block_and_report": "Blokir & Laporkan",
   "confirmations.block.confirm": "Blokir",
-  "confirmations.block.message": "Apa Anda yakin ingin memblokir {name}?",
   "confirmations.cancel_follow_request.confirm": "Batalkan permintaan",
   "confirmations.cancel_follow_request.message": "Apakah Anda yakin ingin membatalkan permintaan Anda untuk mengikuti {name}?",
   "confirmations.delete.confirm": "Hapus",
@@ -151,14 +149,11 @@
   "confirmations.delete_list.message": "Apakah Anda yakin untuk menghapus daftar ini secara permanen?",
   "confirmations.discard_edit_media.confirm": "Buang",
   "confirmations.discard_edit_media.message": "Anda belum menyimpan perubahan deskripsi atau pratinjau media, buang saja?",
-  "confirmations.domain_block.confirm": "Sembunyikan keseluruhan domain",
   "confirmations.domain_block.message": "Apakah Anda benar-benar yakin untuk memblokir keseluruhan {domain}? Dalam kasus tertentu beberapa pemblokiran atau penyembunyian lebih baik.",
   "confirmations.edit.confirm": "Ubah",
   "confirmations.logout.confirm": "Keluar",
   "confirmations.logout.message": "Apakah Anda yakin ingin keluar?",
   "confirmations.mute.confirm": "Bisukan",
-  "confirmations.mute.explanation": "Ini akan menyembunyikan pos dari mereka dan pos yang menyebut mereka, tapi ini tetap mengizinkan mereka melihat posmu dan mengikutimu.",
-  "confirmations.mute.message": "Apa Anda yakin ingin membisukan {name}?",
   "confirmations.redraft.confirm": "Hapus dan susun ulang",
   "confirmations.reply.confirm": "Balas",
   "confirmations.reply.message": "Membalas sekarang akan menimpa pesan yang sedang Anda buat. Anda yakin ingin melanjutkan?",
@@ -340,9 +335,6 @@
   "load_pending": "{count, plural, other {# item baru}}",
   "media_gallery.toggle_visible": "Tampil/Sembunyikan",
   "moved_to_account_banner.text": "Akun {disabledAccount} Anda kini dinonaktifkan karena Anda pindah ke {movedToAccount}.",
-  "mute_modal.duration": "Durasi",
-  "mute_modal.hide_notifications": "Sembunyikan notifikasi dari pengguna ini?",
-  "mute_modal.indefinite": "Tak terbatas",
   "navigation_bar.about": "Tentang",
   "navigation_bar.blocks": "Pengguna diblokir",
   "navigation_bar.bookmarks": "Markah",
diff --git a/app/javascript/mastodon/locales/ie.json b/app/javascript/mastodon/locales/ie.json
index d0a42b0b359fd4..17f312418d40c3 100644
--- a/app/javascript/mastodon/locales/ie.json
+++ b/app/javascript/mastodon/locales/ie.json
@@ -89,6 +89,10 @@
   "announcement.announcement": "Proclamation",
   "attachments_list.unprocessed": "(íntractat)",
   "audio.hide": "Celar audio",
+  "block_modal.show_less": "Monstrar minu",
+  "block_modal.show_more": "Monstrar plu",
+  "block_modal.title": "Bloccar usator?",
+  "block_modal.you_wont_see_mentions": "Tu ne va vider postas mentionant li usator.",
   "boost_modal.combo": "Li proxim vez tu posse pressar {combo} por passar to-ci",
   "bundle_column_error.copy_stacktrace": "Copiar erra-raporte",
   "bundle_column_error.error.body": "Li demandat págine ne posset esser rendit. Fórsan it es un problema in nor code, o un problema de compatibilitá con li navigator.",
@@ -160,9 +164,7 @@
   "compose_form.spoiler.unmarked": "Adjunter avise pri li contenete",
   "compose_form.spoiler_placeholder": "Advertiment de contenete (optional)",
   "confirmation_modal.cancel": "Anullar",
-  "confirmations.block.block_and_report": "Bloccar & Raportar",
   "confirmations.block.confirm": "Bloccar",
-  "confirmations.block.message": "Esque tu vermen vole bloccar {name}?",
   "confirmations.cancel_follow_request.confirm": "Retraer petition",
   "confirmations.cancel_follow_request.message": "Esque tu vermen vole retraer tui petition sequer {name}?",
   "confirmations.delete.confirm": "Deleter",
@@ -171,15 +173,13 @@
   "confirmations.delete_list.message": "Esque tu vermen vole permanentmen deleter ti-ci liste?",
   "confirmations.discard_edit_media.confirm": "Forjettar",
   "confirmations.discard_edit_media.message": "Tu have ínconservat changes al descrition de medie o al previse, forjettar les sin egarda?",
-  "confirmations.domain_block.confirm": "Bloccar li tot dominia",
+  "confirmations.domain_block.confirm": "Bloccar servitor",
   "confirmations.domain_block.message": "Esque tu es certissim que tu vole bloccar li tot {domain}? In mult casus, bloccar o silentiar quelc specific contos es suficent e preferibil. Tu ne va vider contenete de ti dominia in quelcunc public témpor-linea o in tui notificationes. Tui sequitores de ti dominia va esser removet.",
   "confirmations.edit.confirm": "Redacter",
   "confirmations.edit.message": "Redacter nu va remplazzar li missage quel tu actualmen composi. Esque tu vermen vole proceder?",
   "confirmations.logout.confirm": "Exear",
   "confirmations.logout.message": "Esque tu vermen vole exear?",
   "confirmations.mute.confirm": "Silentiar",
-  "confirmations.mute.explanation": "To-ci va celar postas de ilu e postas mentionant ilu, ma it ancor va permisser ilu vider tui postas e sequer te.",
-  "confirmations.mute.message": "Esque tu vermen vole silentiar {name}?",
   "confirmations.redraft.confirm": "Deleter & redacter",
   "confirmations.redraft.message": "Esque tu vermen vole deleter ti-ci posta e redacter it? Favorites e boosts va esser perdit, e responses al posta original va esser orfanat.",
   "confirmations.reply.confirm": "Responder",
@@ -205,6 +205,7 @@
   "dismissable_banner.explore_statuses": "Tis-ci es postas del social retage queles es popular hodie. Nov postas con plu mult boosts e favorites es monstrat plu alt.",
   "dismissable_banner.explore_tags": "Tis-ci es hashtags queles es popular che li social retage hodie. Hashtags usat de plu mult persones diferent es monstrat plu alt.",
   "dismissable_banner.public_timeline": "Tis-ci es li max recent public postas de persones che li social retage quem gente che {domain} seque.",
+  "domain_block_modal.block": "Bloccar servitor",
   "embed.instructions": "Inbedar ti-ci posta per copiar li code in infra.",
   "embed.preview": "Vi qualmen it va aspecter:",
   "emoji_button.activity": "Activitá",
@@ -399,9 +400,6 @@
   "loading_indicator.label": "Cargant…",
   "media_gallery.toggle_visible": "{number, plural, one {Celar image} other {Celar images}}",
   "moved_to_account_banner.text": "Tui conto {disabledAccount} es actualmen desactivisat pro que tu movet te a {movedToAccount}.",
-  "mute_modal.duration": "Duration",
-  "mute_modal.hide_notifications": "Celar notificationes de ti-ci usator?",
-  "mute_modal.indefinite": "Índefinit",
   "navigation_bar.about": "Information",
   "navigation_bar.advanced_interface": "Aperter in li web-interfacie avansat",
   "navigation_bar.blocks": "Bloccat usatores",
diff --git a/app/javascript/mastodon/locales/ig.json b/app/javascript/mastodon/locales/ig.json
index a4f72684222375..a9b300fa4f2a96 100644
--- a/app/javascript/mastodon/locales/ig.json
+++ b/app/javascript/mastodon/locales/ig.json
@@ -37,7 +37,6 @@
   "confirmations.delete.confirm": "Hichapụ",
   "confirmations.delete.message": "Are you sure you want to delete this status?",
   "confirmations.delete_list.confirm": "Hichapụ",
-  "confirmations.domain_block.confirm": "Hide entire domain",
   "confirmations.edit.confirm": "Dezie",
   "confirmations.mute.confirm": "Mee ogbi",
   "confirmations.reply.confirm": "Zaa",
diff --git a/app/javascript/mastodon/locales/io.json b/app/javascript/mastodon/locales/io.json
index 5d0b231ed1cf79..3382fa1aecca7b 100644
--- a/app/javascript/mastodon/locales/io.json
+++ b/app/javascript/mastodon/locales/io.json
@@ -149,9 +149,7 @@
   "compose_form.spoiler.marked": "Text is hidden behind warning",
   "compose_form.spoiler.unmarked": "Text is not hidden",
   "confirmation_modal.cancel": "Anulez",
-  "confirmations.block.block_and_report": "Restriktez e Raportizez",
   "confirmations.block.confirm": "Restriktez",
-  "confirmations.block.message": "Ka vu certe volas restrikar {name}?",
   "confirmations.cancel_follow_request.confirm": "Desendez demando",
   "confirmations.cancel_follow_request.message": "Ka vu certe volas desendar vua demando di sequar {name}?",
   "confirmations.delete.confirm": "Efacez",
@@ -160,15 +158,12 @@
   "confirmations.delete_list.message": "Ka vu certe volas netempale efacar ca listo?",
   "confirmations.discard_edit_media.confirm": "Efacez",
   "confirmations.discard_edit_media.message": "Vu havas nesparita chanji di mediodeskript o prevido, vu volas jus efacar?",
-  "confirmations.domain_block.confirm": "Hide entire domain",
   "confirmations.domain_block.message": "Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable.",
   "confirmations.edit.confirm": "Modifikez",
   "confirmations.edit.message": "Modifikar nun remplasos la mesajo quon vu nune skribas. Ka vu certe volas procedar?",
   "confirmations.logout.confirm": "Ekirez",
   "confirmations.logout.message": "Ka tu certe volas ekirar?",
   "confirmations.mute.confirm": "Silencigez",
-  "confirmations.mute.explanation": "Co celigos posti de oli e posti quo mencionas oli, ma ol ankore permisas oli vidar vua posti e sequar vu.",
-  "confirmations.mute.message": "Ka vu certe volas silencigar {name}?",
   "confirmations.redraft.confirm": "Efacez e riskisez",
   "confirmations.redraft.message": "Ka vu certe volas efacar ca posto e riskisigar ol? Favoriziti e repeti esos perdita, e respondi al posto originala esos orfanigita.",
   "confirmations.reply.confirm": "Respondez",
@@ -377,9 +372,6 @@
   "loading_indicator.label": "Kargante…",
   "media_gallery.toggle_visible": "Chanjar videbleso",
   "moved_to_account_banner.text": "Vua konto {disabledAccount} es nune desaktiva pro ke vu movis a {movedToAccount}.",
-  "mute_modal.duration": "Durado",
-  "mute_modal.hide_notifications": "Celez avizi de ca uzanto?",
-  "mute_modal.indefinite": "Nedefinitiva",
   "navigation_bar.about": "Pri co",
   "navigation_bar.advanced_interface": "Apertez per retintervizajo",
   "navigation_bar.blocks": "Blokusita uzeri",
diff --git a/app/javascript/mastodon/locales/is.json b/app/javascript/mastodon/locales/is.json
index cf2d0281f89136..d050aa03116b60 100644
--- a/app/javascript/mastodon/locales/is.json
+++ b/app/javascript/mastodon/locales/is.json
@@ -89,6 +89,14 @@
   "announcement.announcement": "Auglýsing",
   "attachments_list.unprocessed": "(óunnið)",
   "audio.hide": "Fela hljóð",
+  "block_modal.remote_users_caveat": "Við munum biðja {domain} netþjóninn um að virða ákvörðun þína. Hitt er svo annað mál hvort hann fari eftir þessu, ekki er hægt að tryggja eftirfylgni því sumir netþjónar meðhöndla útilokanir á sinn hátt. Opinberar færslur gætu verið sýnilegar notendum sem ekki eru skráðir inn.",
+  "block_modal.show_less": "Sýna minna",
+  "block_modal.show_more": "Sýna meira",
+  "block_modal.they_cant_mention": "Viðkomandi geta ekki minnst á þig eða fylgst með þér.",
+  "block_modal.they_cant_see_posts": "Viðkomandi geta ekki séð færslurnar þínar og þú ekki þeirra.",
+  "block_modal.they_will_know": "Viðkomandi geta séð að þeir eru útilokaðir.",
+  "block_modal.title": "Útiloka notanda?",
+  "block_modal.you_wont_see_mentions": "Þú munt ekki sjá færslur sem minnast á viðkomandi aðila.",
   "boost_modal.combo": "Þú getur ýtt á {combo} til að sleppa þessu næst",
   "bundle_column_error.copy_stacktrace": "Afrita villuskýrslu",
   "bundle_column_error.error.body": "Umbeðna síðau var ekki hægt að myndgera. Það gæti verið vegna villu í kóðanum okkar eða vandamáls með samhæfni vafra.",
@@ -160,9 +168,7 @@
   "compose_form.spoiler.unmarked": "Bæta við aðvörun vegna efnis",
   "compose_form.spoiler_placeholder": "Aðvörun vegna efnis (valkvætt)",
   "confirmation_modal.cancel": "Hætta við",
-  "confirmations.block.block_and_report": "Útiloka og kæra",
   "confirmations.block.confirm": "Útiloka",
-  "confirmations.block.message": "Ertu viss um að þú viljir loka á {name}?",
   "confirmations.cancel_follow_request.confirm": "Taka beiðni til baka",
   "confirmations.cancel_follow_request.message": "Ertu viss um að þú viljir taka til baka beiðnina um að fylgjast með {name}?",
   "confirmations.delete.confirm": "Eyða",
@@ -171,15 +177,13 @@
   "confirmations.delete_list.message": "Ertu viss um að þú viljir eyða þessum lista endanlega?",
   "confirmations.discard_edit_media.confirm": "Henda",
   "confirmations.discard_edit_media.message": "Þú ert með óvistaðar breytingar á lýsingu myndefnis eða forskoðunar, henda þeim samt?",
-  "confirmations.domain_block.confirm": "Útiloka allt lénið",
+  "confirmations.domain_block.confirm": "Útiloka netþjón",
   "confirmations.domain_block.message": "Ertu alveg algjörlega viss um að þú viljir loka á allt {domain}? Í flestum tilfellum er vænlegra að nota færri en markvissari útilokanir eða að þagga niður tiltekna aðila. Þú munt ekki sjá efni frá þessu léni í neinum opinberum tímalínum eða í tilkynningunum þínum. Fylgjendur þínir frá þessu léni verða fjarlægðir.",
   "confirmations.edit.confirm": "Breyta",
   "confirmations.edit.message": "Ef þú breytir núna verður skrifað yfir skilaboðin sem þú ert að semja núna. Ertu viss um að þú viljir halda áfram?",
   "confirmations.logout.confirm": "Skrá út",
   "confirmations.logout.message": "Ertu viss um að þú viljir skrá þig út?",
   "confirmations.mute.confirm": "Þagga",
-  "confirmations.mute.explanation": "Þetta mun fela færslur frá þeim og þær færslur þar sem minnst er á þau, en það mun samt sem áður gera þeim kleift að sjá færslurnar þínar og að fylgjast með þér.",
-  "confirmations.mute.message": "Ertu viss um að þú viljir þagga niður í {name}?",
   "confirmations.redraft.confirm": "Eyða og endurvinna drög",
   "confirmations.redraft.message": "Ertu viss um að þú viljir eyða þessari færslu og enduvinna drögin? Eftirlæti og endurbirtingar munu glatast og svör við upprunalegu færslunni munu verða munaðarlaus.",
   "confirmations.reply.confirm": "Svara",
@@ -205,6 +209,27 @@
   "dismissable_banner.explore_statuses": "Þessar færslur frá þessum og öðrum netþjónum á dreifhýsta netkerfinu eru að fá aukna athygli í þessu töluðum orðum.",
   "dismissable_banner.explore_tags": "Þetta eru myllumerki sem í augnablikinu eru að fá aukna athygli hjá fólki á þessum og öðrum netþjónum á dreifhýsta netkerfinu.",
   "dismissable_banner.public_timeline": "Þetta eru nýjustu opinberu færslurnar frá fólki á samfélagsnetinu sem fólk á {domain} fylgjast með.",
+  "domain_block_modal.block": "Útiloka netþjón",
+  "domain_block_modal.block_account_instead": "Útiloka {name} í staðinn",
+  "domain_block_modal.they_can_interact_with_old_posts": "Fólk frá þessum netþjóni getur sýslað með eldri færslur þínar.",
+  "domain_block_modal.they_cant_follow": "Enginn frá þessum netþjóni getur fylgst með þér.",
+  "domain_block_modal.they_wont_know": "Viðkomandi mun ekki vita að hann hafi verið útilokaður.",
+  "domain_block_modal.title": "Útiloka lén?",
+  "domain_block_modal.you_will_lose_followers": "Allir fylgjendur þínir af þessum netþjóni verða fjarlægðir.",
+  "domain_block_modal.you_wont_see_posts": "Þú munt ekki sjá neinar færslur eða tilkynningar frá notendum á þessum netþjóni.",
+  "domain_pill.activitypub_lets_connect": "Það gerir þér kleift að tengjast og eiga í samskiptum við fólk, ekki bara á Mastodon, heldur einnig á mörgum öðrum mismunandi samfélagsmiðlum.",
+  "domain_pill.activitypub_like_language": "ActivityPub er eins og tungumál sem Mastodon notar til að tala við önnur samfélagsnet.",
+  "domain_pill.server": "Netþjónn",
+  "domain_pill.their_handle": "Kennislóðin þeirra:",
+  "domain_pill.their_server": "Stafrænt heimili viðkomandi, þar sem allar færslur hans eru hýstar.",
+  "domain_pill.their_username": "Sértækt auðkenni viðkomandi á netþjóni hans. Það er mögulegt að finna notendur með sama notandanafn á mismunandi netþjónum.",
+  "domain_pill.username": "Notandanafn",
+  "domain_pill.whats_in_a_handle": "Hvað er í kennislóð (handle)?",
+  "domain_pill.who_they_are": "Vegna þess að kennislóðir segja hver einhver sé og hvar hann sé að finna, getur þú átt í samskiptum við fólk í gegnum samfélagsvef sem knúinn er af <button>ActivityPub-samhæfðum kerfum</button>.",
+  "domain_pill.who_you_are": "Vegna þess að kennislóðin þín segir hver þú sért og hvar þig sé að finna, getur fólk átt í samskiptum við þig í gegnum samfélagsvef sem knúinn er af <button>ActivityPub-samhæfðum kerfum</button>.",
+  "domain_pill.your_handle": "Kennislóðin þín:",
+  "domain_pill.your_server": "Stafrænt heimili þitt, þar sem allar færslur þínar eru hýstar. Kanntu ekki við þennan netþjón? Þú getur flutt þig á milli netþjóna hvenær sem er og tekið með þér alla fylgjendurna þína.",
+  "domain_pill.your_username": "Sértækt auðkenni þitt á þessum netþjóni. Það er mögulegt að finna notendur með sama notandanafn á mismunandi netþjónum.",
   "embed.instructions": "Felldu þessa færslu inn í vefsvæðið þitt með því að afrita kóðann hér fyrir neðan.",
   "embed.preview": "Svona mun þetta líta út:",
   "emoji_button.activity": "Virkni",
@@ -402,9 +427,15 @@
   "loading_indicator.label": "Hleð inn…",
   "media_gallery.toggle_visible": "Víxla sýnileika",
   "moved_to_account_banner.text": "Aðgangurinn þinn {disabledAccount} er óvirkur í augnablikinu vegna þess að þú fluttir þig yfir á {movedToAccount}.",
-  "mute_modal.duration": "Lengd",
-  "mute_modal.hide_notifications": "Fela tilkynningar frá þessum notanda?",
-  "mute_modal.indefinite": "Óendanlegt",
+  "mute_modal.hide_from_notifications": "Fela úr tilkynningum",
+  "mute_modal.hide_options": "Fela valkosti",
+  "mute_modal.indefinite": "Þar til ég hætti að þagga niður í viðkomandi",
+  "mute_modal.show_options": "Birta valkosti",
+  "mute_modal.they_can_mention_and_follow": "Viðkomandi geta minnst á þig og fylgst með þér, en þú munt ekki sjá þá.",
+  "mute_modal.they_wont_know": "Viðkomandi aðilar munu ekki vita að þaggað hefur verið niður í þeim.",
+  "mute_modal.title": "Þagga niður í notanda?",
+  "mute_modal.you_wont_see_mentions": "Þú munt ekki sjá færslur sem minnast á viðkomandi aðila.",
+  "mute_modal.you_wont_see_posts": "Viðkomandi geta áfram séð færslurnar þínar en þú munt ekki sjá færslurnar þeirra.",
   "navigation_bar.about": "Um hugbúnaðinn",
   "navigation_bar.advanced_interface": "Opna í ítarlegu vefviðmóti",
   "navigation_bar.blocks": "Útilokaðir notendur",
diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json
index 06825f40ddb1fc..3b4ea15f9e1b61 100644
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@@ -160,9 +160,7 @@
   "compose_form.spoiler.unmarked": "Aggiungi l'avviso del contenuto",
   "compose_form.spoiler_placeholder": "Contenuto sensibile (facoltativo)",
   "confirmation_modal.cancel": "Annulla",
-  "confirmations.block.block_and_report": "Blocca & Segnala",
   "confirmations.block.confirm": "Blocca",
-  "confirmations.block.message": "Sei sicuro di voler bloccare {name}?",
   "confirmations.cancel_follow_request.confirm": "Annulla la richiesta",
   "confirmations.cancel_follow_request.message": "Sei sicuro di voler annullare la tua richiesta per seguire {name}?",
   "confirmations.delete.confirm": "Elimina",
@@ -171,15 +169,12 @@
   "confirmations.delete_list.message": "Sei sicuro di voler eliminare permanentemente questa lista?",
   "confirmations.discard_edit_media.confirm": "Scarta",
   "confirmations.discard_edit_media.message": "Hai delle modifiche non salvate alla descrizione o anteprima del media, scartarle comunque?",
-  "confirmations.domain_block.confirm": "Blocca l'intero dominio",
   "confirmations.domain_block.message": "Sei davvero sicuro di voler bloccare l'intero {domain}? In gran parte dei casi, è sufficiente e preferibile bloccare o silenziare alcuni profili. Non visualizzerai i contenuti da quel dominio in alcuna cronologia pubblica o tra le tue notifiche. I tuoi seguaci da quel dominio saranno rimossi.",
   "confirmations.edit.confirm": "Modifica",
   "confirmations.edit.message": "Modificare ora sovrascriverà il messaggio che stai correntemente componendo. Sei sicuro di voler procedere?",
   "confirmations.logout.confirm": "Disconnettiti",
   "confirmations.logout.message": "Sei sicuro di volerti disconnettere?",
   "confirmations.mute.confirm": "Silenzia",
-  "confirmations.mute.explanation": "Questo nasconderà i post da loro e i post che li menzionano, ma consentirà comunque loro di visualizzare i tuoi post e di seguirti.",
-  "confirmations.mute.message": "Sei sicuro di voler silenziare {name}?",
   "confirmations.redraft.confirm": "Elimina e riscrivi",
   "confirmations.redraft.message": "Sei sicuro di voler eliminare questo post e riscriverlo? I preferiti e i boost andranno persi e le risposte al post originale non saranno più collegate.",
   "confirmations.reply.confirm": "Rispondi",
@@ -402,9 +397,6 @@
   "loading_indicator.label": "Caricamento…",
   "media_gallery.toggle_visible": "{number, plural, one {Nascondi immagine} other {Nascondi immagini}}",
   "moved_to_account_banner.text": "Il tuo profilo {disabledAccount} è correntemente disabilitato perché ti sei spostato a {movedToAccount}.",
-  "mute_modal.duration": "Durata",
-  "mute_modal.hide_notifications": "Nascondere le notifiche da questo utente?",
-  "mute_modal.indefinite": "Per sempre",
   "navigation_bar.about": "Info",
   "navigation_bar.advanced_interface": "Apri nell'interfaccia web avanzata",
   "navigation_bar.blocks": "Utenti bloccati",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index ba32c7c4928890..66811eafd67b2f 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -160,9 +160,7 @@
   "compose_form.spoiler.unmarked": "本文は隠されていません",
   "compose_form.spoiler_placeholder": "閲覧注意 (オプション)",
   "confirmation_modal.cancel": "キャンセル",
-  "confirmations.block.block_and_report": "ブロックし通報",
   "confirmations.block.confirm": "ブロック",
-  "confirmations.block.message": "本当に{name}さんをブロックしますか？",
   "confirmations.cancel_follow_request.confirm": "フォローリクエストを取り消す",
   "confirmations.cancel_follow_request.message": "{name}に対するフォローリクエストを取り消しますか?",
   "confirmations.delete.confirm": "削除",
@@ -171,15 +169,12 @@
   "confirmations.delete_list.message": "本当にこのリストを完全に削除しますか？",
   "confirmations.discard_edit_media.confirm": "破棄",
   "confirmations.discard_edit_media.message": "メディアの説明またはプレビューに保存されていない変更があります。それでも破棄しますか？",
-  "confirmations.domain_block.confirm": "ドメイン全体をブロック",
   "confirmations.domain_block.message": "本当に{domain}全体を非表示にしますか？ 多くの場合は個別にブロックやミュートするだけで充分であり、また好ましいです。公開タイムラインにそのドメインのコンテンツが表示されなくなり、通知も届かなくなります。そのドメインのフォロワーはアンフォローされます。",
   "confirmations.edit.confirm": "編集",
   "confirmations.edit.message": "今編集すると現在作成中のメッセージが上書きされます。本当に実行しますか？",
   "confirmations.logout.confirm": "ログアウト",
   "confirmations.logout.message": "本当にログアウトしますか？",
   "confirmations.mute.confirm": "ミュート",
-  "confirmations.mute.explanation": "これにより相手の投稿と返信は見えなくなりますが、相手はあなたをフォローし続け投稿を見ることができます。",
-  "confirmations.mute.message": "本当に{name}さんをミュートしますか？",
   "confirmations.redraft.confirm": "削除して下書きに戻す",
   "confirmations.redraft.message": "投稿を削除して下書きに戻します。この投稿へのお気に入り登録やブーストは失われ、返信は孤立することになります。よろしいですか？",
   "confirmations.reply.confirm": "返信",
@@ -402,9 +397,6 @@
   "loading_indicator.label": "読み込み中…",
   "media_gallery.toggle_visible": "{number, plural, one {画像を閉じる} other {画像を閉じる}}",
   "moved_to_account_banner.text": "あなたのアカウント『{disabledAccount}』は『{movedToAccount}』に移動したため現在無効になっています。",
-  "mute_modal.duration": "ミュートする期間",
-  "mute_modal.hide_notifications": "このユーザーからの通知を隠しますか？",
-  "mute_modal.indefinite": "無期限",
   "navigation_bar.about": "概要",
   "navigation_bar.advanced_interface": "上級者向けUIに戻る",
   "navigation_bar.blocks": "ブロックしたユーザー",
@@ -481,7 +473,7 @@
   "notifications.policy.filter_new_accounts_title": "新しいアカウントからの通知をブロックする",
   "notifications.policy.filter_not_followers_hint": "フォローされていても、フォローから{days, plural, other {#日}}経っていない場合はブロックされます",
   "notifications.policy.filter_not_followers_title": "フォローされていないアカウントからの通知をブロックする",
-  "notifications.policy.filter_not_following_hint": "手動で受け入れたアカウントはブロックされません",
+  "notifications.policy.filter_not_following_hint": "手動で通知を受け入れたアカウントはブロックされません",
   "notifications.policy.filter_not_following_title": "フォローしていないアカウントからの通知をブロックする",
   "notifications.policy.filter_private_mentions_hint": "あなたがメンションした相手からの返信、およびフォローしているアカウントからの返信以外がブロックされます",
   "notifications.policy.filter_private_mentions_title": "外部からの非公開の返信をブロックする",
diff --git a/app/javascript/mastodon/locales/ka.json b/app/javascript/mastodon/locales/ka.json
index 964a764a93e4d2..7af4dccd86bb2f 100644
--- a/app/javascript/mastodon/locales/ka.json
+++ b/app/javascript/mastodon/locales/ka.json
@@ -71,15 +71,12 @@
   "compose_form.spoiler.unmarked": "ტექსტი არაა დამალული",
   "confirmation_modal.cancel": "უარყოფა",
   "confirmations.block.confirm": "ბლოკი",
-  "confirmations.block.message": "დარწმუნებული ხართ, გსურთ დაბლოკოთ {name}?",
   "confirmations.delete.confirm": "გაუქმება",
   "confirmations.delete.message": "დარწმუნებული ხართ, გსურთ გააუქმოთ ეს სტატუსი?",
   "confirmations.delete_list.confirm": "გაუქმება",
   "confirmations.delete_list.message": "დარწმუნებული ხართ, გსურთ სამუდამოდ გააუქმოთ ეს სია?",
-  "confirmations.domain_block.confirm": "მთელი დომენის დამალვა",
   "confirmations.domain_block.message": "ნაღდად, ნაღდად, დარწმუნებული ხართ, გსურთ დაბლოკოთ მთელი {domain}? უმეტეს შემთხვევაში რამდენიმე გამიზნული ბლოკი ან გაჩუმება საკმარისი და უკეთესია. კონტენტს ამ დომენიდან ვერ იხილავთ ვერც ერთ ღია თაიმლაინზე ან თქვენს შეტყობინებებში. ამ დომენიდან არსებული მიმდევრები ამოიშლება.",
   "confirmations.mute.confirm": "გაჩუმება",
-  "confirmations.mute.message": "დარწმუნებული ხართ, გსურთ გააჩუმოთ {name}?",
   "confirmations.redraft.confirm": "გაუქმება და გადანაწილება",
   "confirmations.unfollow.confirm": "ნუღარ მიჰყვები",
   "confirmations.unfollow.message": "დარწმუნებული ხართ, აღარ გსურთ მიჰყვებოდეთ {name}-ს?",
@@ -160,7 +157,6 @@
   "lists.search": "ძებნა ადამიანებს შორის რომელთაც მიჰყვებით",
   "lists.subheading": "თქვენი სიები",
   "media_gallery.toggle_visible": "ხილვადობის ჩართვა",
-  "mute_modal.hide_notifications": "დავმალოთ შეტყობინებები ამ მომხმარებლისგან?",
   "navigation_bar.blocks": "დაბლოკილი მომხმარებლები",
   "navigation_bar.community_timeline": "ლოკალური თაიმლაინი",
   "navigation_bar.compose": "Compose new toot",
diff --git a/app/javascript/mastodon/locales/kab.json b/app/javascript/mastodon/locales/kab.json
index 0d719b71b1efe6..fbe60c3bddd95f 100644
--- a/app/javascript/mastodon/locales/kab.json
+++ b/app/javascript/mastodon/locales/kab.json
@@ -67,6 +67,11 @@
   "alert.unexpected.title": "Ayhuh!",
   "announcement.announcement": "Ulɣu",
   "audio.hide": "Ffer amesli",
+  "block_modal.show_less": "Ssken-d drus",
+  "block_modal.show_more": "Ssken-d ugar",
+  "block_modal.they_cant_mention": "Ur zmiren ad k·m-id-bedren, ur zmiren ad k·m-ḍefren.",
+  "block_modal.they_cant_see_posts": "Ur zmiren ad walin tisufaɣ-nwen, ur tettwalim tid-nsen.",
+  "block_modal.title": "Sewḥel aseqdac ?",
   "boost_modal.combo": "Tzemreḍ ad tsiteḍ ɣef {combo} akken ad tzegleḍ aya tikelt i d-iteddun",
   "bundle_column_error.copy_stacktrace": "Nɣel tuccḍa n uneqqis",
   "bundle_column_error.error.title": "Uh, ala !",
@@ -129,22 +134,18 @@
   "compose_form.spoiler.marked": "Kkes aḍris yettwaffren deffir n walɣu",
   "compose_form.spoiler.unmarked": "Rnu aḍris yettwaffren deffir n walɣu",
   "confirmation_modal.cancel": "Sefsex",
-  "confirmations.block.block_and_report": "Sewḥel & sewɛed",
   "confirmations.block.confirm": "Sewḥel",
-  "confirmations.block.message": "Tebɣiḍ s tidet ad tesḥebseḍ {name}?",
   "confirmations.delete.confirm": "Kkes",
   "confirmations.delete.message": "Tebɣiḍ s tidet ad tekkseḍ tasuffeɣt-agi?",
   "confirmations.delete_list.confirm": "Kkes",
   "confirmations.delete_list.message": "Tebɣiḍ s tidet ad tekkseḍ umuɣ-agi i lebda?",
   "confirmations.discard_edit_media.confirm": "Sefsex",
-  "confirmations.domain_block.confirm": "Ffer taɣult meṛṛa",
+  "confirmations.domain_block.confirm": "Sewḥel aqeddac",
   "confirmations.edit.confirm": "Ẓreg",
   "confirmations.edit.message": "Abeddel tura ad d-yaru izen-nni i d-tegreḍ akka tura. Tetḥeqqeḍ tebɣiḍ ad tkemmleḍ?",
   "confirmations.logout.confirm": "Ffeɣ",
   "confirmations.logout.message": "D tidet tebɣiḍ ad teffɣeḍ?",
   "confirmations.mute.confirm": "Sgugem",
-  "confirmations.mute.explanation": "Aya ad yeffer iznan-is d wid i deg d-yettwabder neɣ d-tettwabder, maca xas akka yezmer neɣ tezmer awali n yiznan-inek d uḍfaṛ-ik.",
-  "confirmations.mute.message": "Tetḥeqqeḍ belli tebɣiḍ ad ttegugmeḍ {name}?",
   "confirmations.redraft.confirm": "Sfeḍ & Ɛiwed tira",
   "confirmations.reply.confirm": "Err",
   "confirmations.reply.message": "Tiririt akka tura ad k-degger izen-agi i tettaruḍ. Tebɣiḍ ad tkemmleḍ?",
@@ -166,6 +167,12 @@
   "dismissable_banner.explore_links": "D tiqsiḍin n yisallen i yettwabḍan ass-a deg web inmetti. Tiqsiḍin n yisallen timaynutin i d-yettwassufɣen s wugar n medden yemgaraden, d tid i d-yufraren ugar.",
   "dismissable_banner.explore_statuses": "Ti d tisufaɣ seg uzeṭṭa anmetti i d-yettawin tamyigawt ass-a. Tisufaɣ timaynutin yesεan aṭas n lǧehd d tid iḥemmlen s waṭas, ttwaεlayit d timezwura.",
   "dismissable_banner.explore_tags": "D wiyi i d ihacṭagen i d-yettawin tamyigawt deg web anmetti ass-a. Ihacṭagen i sseqdacen ugar n medden, εlayit d imezwura.",
+  "domain_block_modal.block": "Sewḥel aqeddac",
+  "domain_block_modal.they_cant_follow": "Yiwen ur yezmir ad k·m-id-yeḍfer seg uqeddac-a.",
+  "domain_pill.activitypub_like_language": "ActivityPub am tutlayt yettmeslay Mastodon d izeḍwan inmettiyen nniḍen.",
+  "domain_pill.server": "Aqeddac",
+  "domain_pill.username": "Isem n useqdac",
+  "domain_pill.your_server": "D axxam-inek·inem umḍin, anda i zedɣent akk tsuffaɣ-ik·im. Ur k·m-yeεǧib ara wa? Ssenfel-d iqeddacen melmi i ak·m-yehwa, awi-d daɣen ineḍfaren-ik·im yid-k·m.",
   "embed.instructions": "Ẓẓu addad-agi deg usmel-inek s wenγal n tangalt yellan sdaw-agi.",
   "embed.preview": "Akka ara d-iban:",
   "emoji_button.activity": "Aqeddic",
@@ -209,9 +216,11 @@
   "explore.trending_tags": "Ihacṭagen",
   "filter_modal.added.review_and_configure_title": "Iɣewwaṛen n imzizdig",
   "filter_modal.added.settings_link": "asebter n yiɣewwaṛen",
+  "filter_modal.added.short_explanation": "Tasuffeɣt-a tettwarna ɣer taggayt-a n yimsizdegen: {title}.",
   "filter_modal.select_filter.expired": "yemmut",
   "filter_modal.select_filter.prompt_new": "Taggayt tamaynutt : {name}",
   "filter_modal.select_filter.search": "Nadi neɣ snulfu-d",
+  "filter_modal.select_filter.title": "Sizdeg tassufeɣt-a",
   "firehose.all": "Akk",
   "firehose.local": "Deg uqeddac-ayi",
   "firehose.remote": "Iqeddacen nniḍen",
@@ -248,6 +257,7 @@
   "home.column_settings.show_replies": "Ssken-d tiririyin",
   "home.hide_announcements": "Ffer ulɣuyen",
   "home.pending_critical_update.body": "Ma ulac aɣilif, leqqem aqeddac-ik Mastodon akken kan tzemreḍ !",
+  "home.pending_critical_update.link": "Wali ileqman",
   "home.show_announcements": "Ssken-d ulɣuyen",
   "interaction_modal.description.favourite": "S umiḍan ɣef Mastodon, tzemreḍ ad tesmenyifeḍ tasuffeɣt-a akken ad teǧǧeḍ amaru ad iẓer belli tḥemmleḍ-tt u ad tt-id-tsellkeḍ i ticki.",
   "interaction_modal.description.follow": "S umiḍan deg Mastodon, tzemreḍ ad tḍefreḍ {name} akken ad d-teṭṭfeḍ iznan-is deg lxiḍ-ik·im agejdan.",
@@ -321,9 +331,9 @@
   "load_pending": "{count, plural, one {# n uferdis amaynut} other {# n yiferdisen imaynuten}}",
   "loading_indicator.label": "Yessalay-d …",
   "media_gallery.toggle_visible": "{number, plural, one {Ffer tugna} other {Ffer tugniwin}}",
-  "mute_modal.duration": "Tanzagt",
-  "mute_modal.hide_notifications": "Tebɣiḍ ad teffreḍ talɣutin n umseqdac-a?",
-  "mute_modal.indefinite": "Ur yettwasbadu ara",
+  "mute_modal.hide_options": "Ffer tinefrunin",
+  "mute_modal.show_options": "Sken-d tinefrunin",
+  "mute_modal.title": "Sgugem aseqdac?",
   "navigation_bar.about": "Ɣef",
   "navigation_bar.blocks": "Iseqdacen yettusḥebsen",
   "navigation_bar.bookmarks": "Ticraḍ",
@@ -371,6 +381,7 @@
   "notifications.column_settings.show": "Ssken-d tilɣa deg ujgu",
   "notifications.column_settings.sound": "Rmed imesli",
   "notifications.column_settings.status": "Tisuffaɣ timaynutin :",
+  "notifications.column_settings.unread_notifications.category": "Ilɣa ur nettwaɣra",
   "notifications.filter.all": "Akk",
   "notifications.filter.boosts": "Seǧhed",
   "notifications.filter.favourites": "Imenyafen",
@@ -389,7 +400,7 @@
   "notifications.policy.filter_not_following_hint": "Alamma tqebleḍ-ten s ufus",
   "notifications.policy.filter_not_following_title": "Wid akked tid ur tettḍafareḍ ara",
   "notifications.policy.filter_private_mentions_title": "Abdar uslig ur yettwasferken ara",
-  "notifications.policy.title": "Sizdeg ilɣa seg …",
+  "notifications.policy.title": "Sizdeg ilɣa sɣur …",
   "notifications_permission_banner.enable": "Rmed talɣutin n tnarit",
   "notifications_permission_banner.title": "Ur zeggel acemma",
   "onboarding.action.back": "Tuɣalin ɣer deffir",
@@ -398,7 +409,7 @@
   "onboarding.actions.go_to_home": "Go to your home feed",
   "onboarding.compose.template": "Azul a #Mastodon!",
   "onboarding.follows.lead": "You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!",
-  "onboarding.follows.title": "Popular on Mastodon",
+  "onboarding.follows.title": "Ttwassnen deg Mastodon",
   "onboarding.profile.display_name": "Isem ara d-yettwaskanen",
   "onboarding.profile.note": "Tameddurt",
   "onboarding.profile.note_hint": "Tzemreḍ ad d-@tbedreḍ imdanen niḍen neɣ #ihacṭagen …",
@@ -414,7 +425,7 @@
   "onboarding.start.title": "Tseggmeḍ-tt !",
   "onboarding.steps.follow_people.body": "Aḍfer n medden yelhan, d tikti n Mastodon.",
   "onboarding.steps.follow_people.title": "Follow {count, plural, one {one person} other {# people}}",
-  "onboarding.steps.publish_status.body": "Say hello to the world.",
+  "onboarding.steps.publish_status.body": "Ini-as azul i umaḍal s uḍris, s tiwlafin, s tividyutin neɣ s tefranin {emoji}",
   "onboarding.steps.publish_status.title": "Aru tasuffeɣt-inek·inem tamezwarutt",
   "onboarding.steps.setup_profile.body": "Others are more likely to interact with you with a filled out profile.",
   "onboarding.steps.setup_profile.title": "Customize your profile",
@@ -507,6 +518,7 @@
   "status.edit": "Ẓreg",
   "status.edited_x_times": "Tettwaẓreg {count, plural, one {{count} n tikkelt} other {{count} n tikkal}}",
   "status.embed": "Seddu",
+  "status.filter": "Sizdeg tassufeɣt-a",
   "status.filtered": "Yettwasizdeg",
   "status.hide": "Ffer tasuffeɣt",
   "status.load_more": "Sali ugar",
diff --git a/app/javascript/mastodon/locales/kk.json b/app/javascript/mastodon/locales/kk.json
index f71c10f9169ce7..bd0a806cdb9abe 100644
--- a/app/javascript/mastodon/locales/kk.json
+++ b/app/javascript/mastodon/locales/kk.json
@@ -105,20 +105,15 @@
   "compose_form.spoiler.marked": "Мәтін ескертумен жасырылған",
   "compose_form.spoiler.unmarked": "Мәтін жасырылмаған",
   "confirmation_modal.cancel": "Қайтып алу",
-  "confirmations.block.block_and_report": "Блок және Шағым",
   "confirmations.block.confirm": "Бұғаттау",
-  "confirmations.block.message": "{name} атты қолданушыны бұғаттайтыныңызға сенімдісіз бе?",
   "confirmations.delete.confirm": "Өшіру",
   "confirmations.delete.message": "Бұл жазбаны өшіресіз бе?",
   "confirmations.delete_list.confirm": "Өшіру",
   "confirmations.delete_list.message": "Бұл тізімді жоясыз ба шынымен?",
-  "confirmations.domain_block.confirm": "Бұл доменді бұғатта",
   "confirmations.domain_block.message": "Бұл домендегі {domain} жазбаларды шынымен бұғаттайсыз ба? Кейде үнсіз қылып тастау да жеткілікті.",
   "confirmations.logout.confirm": "Шығу",
   "confirmations.logout.message": "Шығатыныңызға сенімдісіз бе?",
   "confirmations.mute.confirm": "Үнсіз қылу",
-  "confirmations.mute.explanation": "Олардың посттары же олар туралы меншндар сізге көрінбейді, бірақ олар сіздің посттарды көре алады және жазыла алады.",
-  "confirmations.mute.message": "{name} атты қолданушы үнсіз болсын ба?",
   "confirmations.redraft.confirm": "Өшіруді құптау",
   "confirmations.reply.confirm": "Жауап",
   "confirmations.reply.message": "Жауабыңыз жазып жатқан жазбаңыздың үстіне кетеді. Жалғастырамыз ба?",
@@ -234,7 +229,6 @@
   "lists.subheading": "Тізімдеріңіз",
   "load_pending": "{count, plural, one {# жаңа нәрсе} other {# жаңа нәрсе}}",
   "media_gallery.toggle_visible": "Көрінуді қосу",
-  "mute_modal.hide_notifications": "Бұл қолданушы ескертпелерін жасырамыз ба?",
   "navigation_bar.blocks": "Бұғатталғандар",
   "navigation_bar.bookmarks": "Бетбелгілер",
   "navigation_bar.community_timeline": "Жергілікті желі",
diff --git a/app/javascript/mastodon/locales/kn.json b/app/javascript/mastodon/locales/kn.json
index 396aebbdf223ee..ceb0f8b9b6139b 100644
--- a/app/javascript/mastodon/locales/kn.json
+++ b/app/javascript/mastodon/locales/kn.json
@@ -31,7 +31,6 @@
   "compose_form.spoiler.marked": "Text is hidden behind warning",
   "compose_form.spoiler.unmarked": "Text is not hidden",
   "confirmations.delete.message": "Are you sure you want to delete this status?",
-  "confirmations.domain_block.confirm": "Hide entire domain",
   "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
   "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.",
   "embed.instructions": "Embed this status on your website by copying the code below.",
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index a96b146ac2a7b0..5fd28cfd8128a5 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -89,6 +89,14 @@
   "announcement.announcement": "공지사항",
   "attachments_list.unprocessed": "(처리 안 됨)",
   "audio.hide": "소리 숨기기",
+  "block_modal.remote_users_caveat": "우리는 {domain} 서버가 당신의 결정을 존중해 주길 부탁할 것입니다. 하지만 몇몇 서버는 차단을 다르게 취급할 수 있기 때문에 규정이 준수되는 것을 보장할 수는 없습니다. 공개 게시물은 로그인 하지 않은 사용자들에게 여전히 보여질 수 있습니다.",
+  "block_modal.show_less": "간략히 보기",
+  "block_modal.show_more": "더 보기",
+  "block_modal.they_cant_mention": "나를 멘션하거나 팔로우 할 수 없습니다.",
+  "block_modal.they_cant_see_posts": "내가 작성한 게시물을 볼 수 없고 나도 그가 작성한 게시물을 보지 않게 됩니다.",
+  "block_modal.they_will_know": "자신이 차단 당했다는 사실을 확인할 수 있습니다.",
+  "block_modal.title": "사용자를 차단할까요?",
+  "block_modal.you_wont_see_mentions": "그를 멘션하는 게시물을 더는 보지 않습니다.",
   "boost_modal.combo": "다음엔 {combo}를 눌러서 이 과정을 건너뛸 수 있습니다",
   "bundle_column_error.copy_stacktrace": "에러 리포트 복사하기",
   "bundle_column_error.error.body": "요청한 페이지를 렌더링 할 수 없습니다. 저희의 코드에 버그가 있거나, 브라우저 호환성 문제일 수 있습니다.",
@@ -160,9 +168,7 @@
   "compose_form.spoiler.unmarked": "열람 주의 문구 추가",
   "compose_form.spoiler_placeholder": "내용 경고 (선택사항)",
   "confirmation_modal.cancel": "취소",
-  "confirmations.block.block_and_report": "차단하고 신고하기",
   "confirmations.block.confirm": "차단",
-  "confirmations.block.message": "정말로 {name}를 차단하시겠습니까?",
   "confirmations.cancel_follow_request.confirm": "요청 삭제",
   "confirmations.cancel_follow_request.message": "정말 {name}님에 대한 팔로우 요청을 취소하시겠습니까?",
   "confirmations.delete.confirm": "삭제",
@@ -171,15 +177,13 @@
   "confirmations.delete_list.message": "정말로 이 리스트를 영구적으로 삭제하시겠습니까?",
   "confirmations.discard_edit_media.confirm": "저장 안함",
   "confirmations.discard_edit_media.message": "미디어 설명이나 미리보기에 대한 저장하지 않은 변경사항이 있습니다. 버리시겠습니까?",
-  "confirmations.domain_block.confirm": "도메인 전체를 차단",
+  "confirmations.domain_block.confirm": "서버 차단",
   "confirmations.domain_block.message": "정말로 {domain} 전체를 차단하시겠습니까? 대부분의 경우 개별 차단이나 뮤트로 충분합니다. 모든 공개 타임라인과 알림에서 해당 도메인에서 작성된 콘텐츠를 보지 못합니다. 해당 도메인에 속한 팔로워와의 관계가 사라집니다.",
   "confirmations.edit.confirm": "수정",
   "confirmations.edit.message": "지금 편집하면 작성 중인 메시지를 덮어씁니다. 진행이 확실한가요?",
   "confirmations.logout.confirm": "로그아웃",
   "confirmations.logout.message": "정말로 로그아웃 하시겠습니까?",
   "confirmations.mute.confirm": "뮤트",
-  "confirmations.mute.explanation": "이 동작은 해당 계정의 게시물과 해당 계정을 멘션하는 게시물을 숨깁니다, 하지만 여전히 해당 계정이 당신의 게시물을 보고 팔로우 할 수 있습니다.",
-  "confirmations.mute.message": "정말로 {name} 님을 뮤트하시겠습니까?",
   "confirmations.redraft.confirm": "삭제하고 다시 쓰기",
   "confirmations.redraft.message": "정말로 이 게시물을 삭제하고 다시 쓰시겠습니까? 해당 게시물에 대한 부스트와 좋아요를 잃게 되고 원본에 대한 답장은 연결 되지 않습니다.",
   "confirmations.reply.confirm": "답글",
@@ -205,6 +209,22 @@
   "dismissable_banner.explore_statuses": "이 게시물들은 오늘 소셜 웹에서 호응을 얻고 있는 게시물들입니다. 부스트와 관심을 받는 새로운 글들이 높은 순위가 됩니다.",
   "dismissable_banner.explore_tags": "이 해시태그들은 이 서버와 분산화된 네트워크의 다른 서버에서 사람들의 인기를 끌고 있는 것들입니다.",
   "dismissable_banner.public_timeline": "이것들은 {domain}에 있는 사람들이 팔로우한 사람들의 최신 공개 게시물들입니다.",
+  "domain_block_modal.block": "서버 차단",
+  "domain_block_modal.block_account_instead": "대신 @{name}를 차단",
+  "domain_block_modal.they_can_interact_with_old_posts": "이 서버에 있는 사람들이 내 예전 게시물에 상호작용할 수는 있습니다.",
+  "domain_block_modal.they_cant_follow": "이 서버의 누구도 나를 팔로우 할 수 없습니다.",
+  "domain_block_modal.they_wont_know": "내가 차단했다는 사실을 모를 것입니다.",
+  "domain_block_modal.title": "도메인을 차단할까요?",
+  "domain_block_modal.you_will_lose_followers": "이 서버에 있는 팔로워들이 모두 제거될 것입니다.",
+  "domain_block_modal.you_wont_see_posts": "이 서버 사용자의 게시물이나 알림을 보지 않게 됩니다.",
+  "domain_pill.activitypub_lets_connect": "이것은 마스토돈 뿐만이 아니라 다른 소셜 앱들을 넘나들며 사람들을 연결하고 상호작용 할 수 있게 합니다.",
+  "domain_pill.activitypub_like_language": "액티비티펍은 마스토돈이 다른 소셜 네트워크와 대화할 때 쓰는 언어 같은 것입니다.",
+  "domain_pill.server": "서버",
+  "domain_pill.their_handle": "그의 핸들:",
+  "domain_pill.username": "사용자명",
+  "domain_pill.whats_in_a_handle": "핸들엔 무엇이 담겨 있나요?",
+  "domain_pill.who_you_are": "내 핸들은 내가 어디에 있는 누군지 나타내기 때문에 사람들은 <button>액티비티펍</button>을 통해 소셜 웹을 넘나들며 나와 상호작용 할 수 있습니다.",
+  "domain_pill.your_handle": "내 핸들:",
   "embed.instructions": "아래의 코드를 복사하여 대화를 원하는 곳으로 공유하세요.",
   "embed.preview": "이렇게 표시됩니다:",
   "emoji_button.activity": "활동",
@@ -241,6 +261,7 @@
   "empty_column.list": "리스트에 아직 아무것도 없습니다. 리스트의 누군가가 게시물을 올리면 여기에 나타납니다.",
   "empty_column.lists": "아직 리스트가 없습니다. 리스트를 만들면 여기에 나타납니다.",
   "empty_column.mutes": "아직 아무도 뮤트하지 않았습니다.",
+  "empty_column.notification_requests": "깔끔합니다! 여기엔 아무 것도 없습니다. 알림을 받게 되면 설정에 따라 여기에 나타나게 됩니다.",
   "empty_column.notifications": "아직 알림이 없습니다. 다른 사람들이 당신에게 반응했을 때, 여기에서 볼 수 있습니다.",
   "empty_column.public": "여기엔 아직 아무 것도 없습니다! 공개적으로 무언가 포스팅하거나, 다른 서버의 사용자를 팔로우 해서 채워보세요",
   "error.unexpected_crash.explanation": "버그 혹은 브라우저 호환성 문제로 이 페이지를 올바르게 표시할 수 없습니다.",
@@ -401,9 +422,15 @@
   "loading_indicator.label": "불러오는 중...",
   "media_gallery.toggle_visible": "이미지 숨기기",
   "moved_to_account_banner.text": "당신의 계정 {disabledAccount}는 {movedToAccount}로 이동하였기 때문에 현재 비활성화 상태입니다.",
-  "mute_modal.duration": "기간",
-  "mute_modal.hide_notifications": "이 사용자로부터의 알림을 숨기시겠습니까?",
-  "mute_modal.indefinite": "무기한",
+  "mute_modal.hide_from_notifications": "알림에서 숨기기",
+  "mute_modal.hide_options": "옵션 숨기기",
+  "mute_modal.indefinite": "내가 뮤트를 해제하기 전까지",
+  "mute_modal.show_options": "옵션 표시",
+  "mute_modal.they_can_mention_and_follow": "나를 멘션하거나 팔로우 할 수 있습니다, 다만 나에게 안 보일 것입니다.",
+  "mute_modal.they_wont_know": "내가 차단했다는 사실을 모를 것입니다.",
+  "mute_modal.title": "사용자를 뮤트할까요?",
+  "mute_modal.you_wont_see_mentions": "그를 멘션하는 게시물을 더는 보지 않게 됩니다.",
+  "mute_modal.you_wont_see_posts": "내가 작성한 게시물을 볼 수는 있지만, 나는 그가 작성한 것을 보지 않게 됩니다.",
   "navigation_bar.about": "정보",
   "navigation_bar.advanced_interface": "고급 웹 인터페이스에서 열기",
   "navigation_bar.blocks": "차단한 사용자",
@@ -482,6 +509,7 @@
   "notifications.policy.filter_not_followers_title": "나를 팔로우하지 않는 사람들",
   "notifications.policy.filter_not_following_hint": "내가 수동으로 승인하기 전까지",
   "notifications.policy.filter_not_following_title": "내가 팔로우하지 않는 사람들",
+  "notifications.policy.filter_private_mentions_hint": "내가 한 멘션에 단 답글이거나 내가 발신자를 팔로우 한 것이 아닌 이상 걸러집니다",
   "notifications.policy.filter_private_mentions_title": "청하지 않은 개인적인 멘션",
   "notifications.policy.title": "알림을 거를 사람들…",
   "notifications_permission_banner.enable": "데스크탑 알림 활성화",
@@ -660,9 +688,11 @@
   "status.direct": "@{name} 님에게 개인적으로 멘션",
   "status.direct_indicator": "개인적인 멘션",
   "status.edit": "수정",
+  "status.edited": "%{date}에 마지막으로 편집됨",
   "status.edited_x_times": "{count}번 수정됨",
   "status.embed": "임베드",
   "status.favourite": "좋아요",
+  "status.favourites": "{count, plural, other {좋아요}}",
   "status.filter": "이 게시물을 필터",
   "status.filtered": "필터로 걸러짐",
   "status.hide": "게시물 숨기기",
@@ -683,6 +713,7 @@
   "status.reblog": "부스트",
   "status.reblog_private": "원래의 수신자들에게 부스트",
   "status.reblogged_by": "{name} 님이 부스트했습니다",
+  "status.reblogs": "{count, plural, other {부스트}}",
   "status.reblogs.empty": "아직 아무도 이 게시물을 부스트하지 않았습니다. 부스트 한 사람들이 여기에 표시 됩니다.",
   "status.redraft": "지우고 다시 쓰기",
   "status.remove_bookmark": "북마크 삭제",
diff --git a/app/javascript/mastodon/locales/ku.json b/app/javascript/mastodon/locales/ku.json
index 0702fa0003d154..c78861b60c9953 100644
--- a/app/javascript/mastodon/locales/ku.json
+++ b/app/javascript/mastodon/locales/ku.json
@@ -135,9 +135,7 @@
   "compose_form.spoiler.marked": "Hişyariya naverokê rake",
   "compose_form.spoiler.unmarked": "Hişyariya naverokê tevlî bike",
   "confirmation_modal.cancel": "Dev jê berde",
-  "confirmations.block.block_and_report": "Asteng bike & ragihîne",
   "confirmations.block.confirm": "Asteng bike",
-  "confirmations.block.message": "Ma tu dixwazî ku {name} asteng bikî?",
   "confirmations.cancel_follow_request.confirm": "Daxwazê vekişîne",
   "confirmations.cancel_follow_request.message": "Tu dixwazî ​​daxwaza xwe ya şopandina {name} vekşînî?",
   "confirmations.delete.confirm": "Jê bibe",
@@ -146,14 +144,11 @@
   "confirmations.delete_list.message": "Tu ji dil dixwazî vê lîsteyê bi awayekî mayînde jê bibî?",
   "confirmations.discard_edit_media.confirm": "Biavêje",
   "confirmations.discard_edit_media.message": "Guhertinên neqedandî di danasîna an pêşdîtina medyayê de hene, wan bi her awayî bavêje?",
-  "confirmations.domain_block.confirm": "Tevahiya navperê asteng bike",
   "confirmations.domain_block.message": "Tu pê bawerî ku tu dixwazî tevahiya {domain} asteng bikî? Di gelek rewşan de astengkirin an jî bêdengkirin têrê dike û tê hilbijartin. Tu nikarî naveroka vê navperê di demnameyê an jî agahdariyên xwe de bibînî. Şopînerên te yê di vê navperê wê werin jêbirin.",
   "confirmations.edit.confirm": "Serrast bike",
   "confirmations.logout.confirm": "Derkeve",
   "confirmations.logout.message": "Ma tu dixwazî ku derkevî?",
   "confirmations.mute.confirm": "Bêdeng bike",
-  "confirmations.mute.explanation": "Ev ê şandinên ji wan tê û şandinên ku behsa wan dike veşêre, lê hê jî maf dide ku ew şandinên te bibînin û te bişopînin.",
-  "confirmations.mute.message": "Bi rastî tu dixwazî {name} bêdeng bikî?",
   "confirmations.redraft.confirm": "Jê bibe & ji nû ve serrast bike",
   "confirmations.reply.confirm": "Bersivê bide",
   "confirmations.reply.message": "Bersiva niha li ser peyama ku tu niha berhev dikî dê binivsîne. Ma pê bawer î ku tu dixwazî bidomînî?",
@@ -328,9 +323,6 @@
   "load_pending": "{count, plural, one {# hêmaneke nû} other {#hêmaneke nû}}",
   "media_gallery.toggle_visible": "{number, plural, one {Wêneyê veşêre} other {Wêneyan veşêre}}",
   "moved_to_account_banner.text": "Ajimêrê te {disabledAccount} niha neçalak e ji ber ku te bar kir bo {movedToAccount}.",
-  "mute_modal.duration": "Dem",
-  "mute_modal.hide_notifications": "Agahdariyan ji ev bikarhêner veşêre?",
-  "mute_modal.indefinite": "Nediyar",
   "navigation_bar.about": "Derbar",
   "navigation_bar.blocks": "Bikarhênerên astengkirî",
   "navigation_bar.bookmarks": "Şûnpel",
diff --git a/app/javascript/mastodon/locales/kw.json b/app/javascript/mastodon/locales/kw.json
index f9c70db53ef8c9..794cbd9ede362d 100644
--- a/app/javascript/mastodon/locales/kw.json
+++ b/app/javascript/mastodon/locales/kw.json
@@ -86,20 +86,15 @@
   "compose_form.spoiler.marked": "Dilea gwarnyans dalgh",
   "compose_form.spoiler.unmarked": "Keworra gwarnyans dalgh",
   "confirmation_modal.cancel": "Hedhi",
-  "confirmations.block.block_and_report": "Lettya & Reportya",
   "confirmations.block.confirm": "Lettya",
-  "confirmations.block.message": "Owgh hwi sur a vynnes lettya {name}?",
   "confirmations.delete.confirm": "Dilea",
   "confirmations.delete.message": "Owgh hwi sur a vynnes dilea'n post ma?",
   "confirmations.delete_list.confirm": "Dilea",
   "confirmations.delete_list.message": "Owgh hwi sur a vynnes dilea'n rol ma yn fast?",
-  "confirmations.domain_block.confirm": "Lettya gorfarth dhien",
   "confirmations.domain_block.message": "Owgh hwi wir, wir sur a vynnes lettya'n {domain} dhien? Y'n brassa rann a gasow, boghes lettyansow medrys po tawheansow yw lowr ha gwell. Ny wrewgh hwi gweles dalgh a'n worfarth na yn py amserlin boblek pynag po yn agas gwarnyansow. Agas holyoryon an worfarth na a vydh diles.",
   "confirmations.logout.confirm": "Digelmi",
   "confirmations.logout.message": "Owgh hwi sur a vynnes digelmi?",
   "confirmations.mute.confirm": "Tawhe",
-  "confirmations.mute.explanation": "Hemm a wra kudha postow anedha ha postow orth aga meneges, mes hwath aga gasa dhe weles agas postow ha'gas holya.",
-  "confirmations.mute.message": "Owgh hwi sur a vynnes tawhe {name}?",
   "confirmations.redraft.confirm": "Dilea & daskynskrifa",
   "confirmations.reply.confirm": "Gorthebi",
   "confirmations.reply.message": "Gorthebi lemmyn a wra ughskrifa'n messach esowgh hwi orth y skrifa lemmyn. Owgh hwi sur a vynnes pesya?",
@@ -225,9 +220,6 @@
   "lists.subheading": "Agas rolyow",
   "load_pending": "{count, plural, one {# daklennowydh} other {# a daklennow nowydh}}",
   "media_gallery.toggle_visible": "Hide {number, plural, one {aven} other {aven}}",
-  "mute_modal.duration": "Duryans",
-  "mute_modal.hide_notifications": "Kudha gwarnyansow a'n devnydhyer ma?",
-  "mute_modal.indefinite": "Andhevri",
   "navigation_bar.blocks": "Devnydhyoryon lettys",
   "navigation_bar.bookmarks": "Folennosow",
   "navigation_bar.community_timeline": "Amserlin leel",
diff --git a/app/javascript/mastodon/locales/la.json b/app/javascript/mastodon/locales/la.json
index 99aac2ef1374c9..48b23340088bdc 100644
--- a/app/javascript/mastodon/locales/la.json
+++ b/app/javascript/mastodon/locales/la.json
@@ -41,7 +41,6 @@
   "confirmations.delete.confirm": "Oblitterare",
   "confirmations.delete.message": "Are you sure you want to delete this status?",
   "confirmations.delete_list.confirm": "Oblitterare",
-  "confirmations.domain_block.confirm": "Hide entire domain",
   "confirmations.mute.confirm": "Confutare",
   "confirmations.reply.confirm": "Respondere",
   "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
diff --git a/app/javascript/mastodon/locales/lad.json b/app/javascript/mastodon/locales/lad.json
index 9a85344923839a..2f4185f69e1d52 100644
--- a/app/javascript/mastodon/locales/lad.json
+++ b/app/javascript/mastodon/locales/lad.json
@@ -89,6 +89,9 @@
   "announcement.announcement": "Pregon",
   "attachments_list.unprocessed": "(no prosesado)",
   "audio.hide": "Eskonde audio",
+  "block_modal.show_less": "Amostra manko",
+  "block_modal.show_more": "Amostra mas",
+  "block_modal.title": "Bloka utilizador?",
   "boost_modal.combo": "Puedes klikar {combo} para ometer esto la proksima vez",
   "bundle_column_error.copy_stacktrace": "Kopia el raporto de yerro",
   "bundle_column_error.error.body": "La pajina solisitada no pudo ser renderada. Podria ser por un yerro en muestro kodiche o un problem de kompatibilita kon el navigador.",
@@ -160,9 +163,7 @@
   "compose_form.spoiler.unmarked": "Adjusta avertensya de kontenido",
   "compose_form.spoiler_placeholder": "Avertensya de kontenido (opsyonal)",
   "confirmation_modal.cancel": "Anula",
-  "confirmations.block.block_and_report": "Bloka i raporta",
   "confirmations.block.confirm": "Bloka",
-  "confirmations.block.message": "Estas siguro ke keres blokar a {name}?",
   "confirmations.cancel_follow_request.confirm": "Anula solisitud",
   "confirmations.cancel_follow_request.message": "Estas siguro ke keres anular tu solisitud de segir a {name}?",
   "confirmations.delete.confirm": "Efasa",
@@ -171,15 +172,13 @@
   "confirmations.delete_list.message": "Estas siguro ke keres permanentemente efasar esta lista?",
   "confirmations.discard_edit_media.confirm": "Anula",
   "confirmations.discard_edit_media.message": "Tienes trokamientos no guadrados en la deskripsion o vista previa. Keres efasarlos entanto?",
-  "confirmations.domain_block.confirm": "Bloka domeno entero",
+  "confirmations.domain_block.confirm": "Bloka sirvidor",
   "confirmations.domain_block.message": "Estas totalmente siguro ke keres blokar todo el domeno {domain}? En djeneral unos kuantos blokos o silensiamientos son sufisientes i preferavles. No veras kontenido de akel domeno en dinguna linya de tiempo publika ni ent tus avizos. Tus suivantes de akel domeno seran kitados.",
   "confirmations.edit.confirm": "Edita",
   "confirmations.edit.message": "Si edites agora, kitaras el mesaj kualo estas eskriviendo aktualmente. Estas siguro ke keres fazerlo?",
   "confirmations.logout.confirm": "Sal",
   "confirmations.logout.message": "Estas siguro ke keres salir de tu kuento?",
   "confirmations.mute.confirm": "Silensia",
-  "confirmations.mute.explanation": "Esto eskondera las publikasyones de este kuento i publikasyones ke lo enmentan, pero ainda les permetera segirte.",
-  "confirmations.mute.message": "Estas siguro ke keres silensiar a {name}?",
   "confirmations.redraft.confirm": "Efasa i reeskrive",
   "confirmations.redraft.message": "Estas siguro ke keres efasar esta publikasyon i reeskrivirla? Pedreras todos los favoritos i repartajasyones asosiados kon esta publikasyon i repuestas a eya seran guerfanadas.",
   "confirmations.reply.confirm": "Arisponde",
@@ -205,6 +204,10 @@
   "dismissable_banner.explore_statuses": "Estas publikasyones de este sirvidor i otros de la red desentralizada estan agora popularas. Publikasyones mas muevas, kon mas repartajasiones i favoritadas por mas djente aparesen primero.",
   "dismissable_banner.explore_tags": "Estas etiketas estan agora popularas en la red sosyala. Etiketas uzadas por mas djente aparesen primero.",
   "dismissable_banner.public_timeline": "Estas son las publikasyones publikas mas resientes de personas en la red sosyala a las kualas la djente de {domain} sige.",
+  "domain_block_modal.block": "Bloka sirvidor",
+  "domain_block_modal.title": "Bloka el domeno?",
+  "domain_pill.server": "Sirvidor",
+  "domain_pill.username": "Nombre de utilizador",
   "embed.instructions": "Enkrusta esta publikasyon en tu sitio internetiko kopiando este kodiche.",
   "embed.preview": "Paresera ansina:",
   "emoji_button.activity": "Aktivita",
@@ -401,9 +404,6 @@
   "loading_indicator.label": "Eskargando…",
   "media_gallery.toggle_visible": "{number, plural, one {Eskonde imaje} other {Eskonde imajes}}",
   "moved_to_account_banner.text": "Tu kuento {disabledAccount} esta aktualmente inkapasitado porke transferates a {movedToAccount}.",
-  "mute_modal.duration": "Durasyon",
-  "mute_modal.hide_notifications": "Eskonder avizos de este utilizador?",
-  "mute_modal.indefinite": "Indefinida",
   "navigation_bar.about": "Sovre mozotros",
   "navigation_bar.advanced_interface": "Avre en la enterfaz avanzada",
   "navigation_bar.blocks": "Utilizadores blokados",
@@ -659,6 +659,7 @@
   "status.direct": "Enmenta a @{name} en privado",
   "status.direct_indicator": "Enmentadura privada",
   "status.edit": "Edita",
+  "status.edited": "Ultima edisyon: {date}",
   "status.edited_x_times": "Editado {count, plural, one {{count} vez} other {{count} vezes}}",
   "status.embed": "Inkrusta",
   "status.favourite": "Te plaze",
diff --git a/app/javascript/mastodon/locales/lt.json b/app/javascript/mastodon/locales/lt.json
index 15034609780134..f9ef7e242c00e4 100644
--- a/app/javascript/mastodon/locales/lt.json
+++ b/app/javascript/mastodon/locales/lt.json
@@ -160,9 +160,7 @@
   "compose_form.spoiler.unmarked": "Pridėti turinio įspėjimą",
   "compose_form.spoiler_placeholder": "Turinio įspėjimas (pasirinktinis)",
   "confirmation_modal.cancel": "Atšaukti",
-  "confirmations.block.block_and_report": "Blokuoti ir pranešti",
   "confirmations.block.confirm": "Blokuoti",
-  "confirmations.block.message": "Ar tikrai nori užblokuoti {name}?",
   "confirmations.cancel_follow_request.confirm": "Atšaukti prašymą",
   "confirmations.cancel_follow_request.message": "Ar tikrai nori atšaukti savo prašymą sekti {name}?",
   "confirmations.delete.confirm": "Ištrinti",
@@ -171,15 +169,12 @@
   "confirmations.delete_list.message": "Ar tikrai nori visam laikui ištrinti šį sąrašą?",
   "confirmations.discard_edit_media.confirm": "Atmesti",
   "confirmations.discard_edit_media.message": "Turi neišsaugotų medijos aprašymo ar peržiūros pakeitimų, vis tiek juos atmesti?",
-  "confirmations.domain_block.confirm": "Blokuoti visą domeną",
   "confirmations.domain_block.message": "Ar tikrai, tikrai nori užblokuoti visą {domain}? Daugeliu atvejų užtenka kelių tikslinių blokavimų arba nutildymų. Šio domeno turinio nematysi jokiose viešose laiko skalėse ar pranešimuose. Tavo sekėjai iš to domeno bus pašalinti.",
   "confirmations.edit.confirm": "Redaguoti",
   "confirmations.edit.message": "Redaguojant dabar, bus perrašyta šiuo metu kuriama žinutė. Ar tikrai nori tęsti?",
   "confirmations.logout.confirm": "Atsijungti",
   "confirmations.logout.message": "Ar tikrai nori atsijungti?",
   "confirmations.mute.confirm": "Nutildyti",
-  "confirmations.mute.explanation": "Tai paslėps jų įrašus ir įrašus, kuriuose jie menėmi, bet jie vis tiek galės matyti tavo įrašus ir sekti.",
-  "confirmations.mute.message": "Ar tikrai nori nutildyti {name}?",
   "confirmations.redraft.confirm": "Ištrinti ir parengti iš naujo",
   "confirmations.redraft.message": "Ar tikrai nori ištrinti šį įrašą ir parengti jį iš naujo kaip juodraštį? Bus prarastos mėgstamiausios ir pakėlimai, o atsakymai į originalinį įrašą taps liekamojais.",
   "confirmations.reply.confirm": "Atsakyti",
@@ -205,6 +200,19 @@
   "dismissable_banner.explore_statuses": "Tai – įrašai iš viso socialinio žiniatinklio, kurie šiandien sulaukia daug dėmesio. Naujesni įrašai, turintys daugiau pakėlimų ir mėgstamų, vertinami aukščiau.",
   "dismissable_banner.explore_tags": "Tai – saitažodžiai, kurie šiandien sulaukia daug dėmesio socialiniame žiniatinklyje. Saitažodžiai, kuriuos naudoja daugiau skirtingų žmonių, vertinami aukščiau.",
   "dismissable_banner.public_timeline": "Tai – naujausi vieši įrašai, kuriuos socialiniame žiniatinklyje paskelbė žmonės, sekantys {domain}.",
+  "domain_pill.activitypub_lets_connect": "Tai leidžia tau bendrauti su žmonėmis ne tik Mastodon, bet ir įvairiose socialinėse programėlėse.",
+  "domain_pill.activitypub_like_language": "ActivityPub – tarsi kalba, kuria Mastodon kalba su kitais socialiniais tinklais.",
+  "domain_pill.server": "Serveris",
+  "domain_pill.their_handle": "Jų socialinis medijos vardas:",
+  "domain_pill.their_server": "Jų skaitmeniniai namai, kuriuose saugomi visi jų įrašai.",
+  "domain_pill.their_username": "Jų unikalus identifikatorius jų serveryje. Skirtinguose serveriuose galima rasti naudotojų, turinčių tą patį naudotojo vardą.",
+  "domain_pill.username": "Naudotojo vardas",
+  "domain_pill.whats_in_a_handle": "Kas yra socialiniame medijos varde?",
+  "domain_pill.who_they_are": "Kadangi socialines medijos vardai nurodo, kas ir kur jie yra, galima bendrauti su žmonėmis visame socialiniame tinkle, kuriame yra <button> ActivityPub valdomos platformos</button>.",
+  "domain_pill.who_you_are": "Kadangi tavo socialinis medijos vardas nurodo, kas esi ir kur esi, žmonės gali bendrauti su tavimi visame socialiniame tinkle, kurį sudaro <button> ActivityPub valdomos platformos</button>.",
+  "domain_pill.your_handle": "Tavo socialinis medijos vardas:",
+  "domain_pill.your_server": "Tavo skaitmeniniai namai, kuriuose saugomi visi tavo įrašai. Nepatinka šis? Bet kada perkelk serverius ir atsivesk ir savo sekėjus.",
+  "domain_pill.your_username": "Tavo unikalus identifikatorius šiame serveryje. Skirtinguose serveriuose galima rasti naudotojų, turinčių tą patį naudotojo vardą.",
   "embed.instructions": "Įterpk šį įrašą į savo svetainę nukopijavus (-usi) toliau pateiktą kodą.",
   "embed.preview": "Štai, kaip tai atrodys:",
   "emoji_button.activity": "Veikla",
@@ -399,9 +407,6 @@
   "loading_indicator.label": "Kraunama…",
   "media_gallery.toggle_visible": "{number, plural, one {Slėpti vaizdą} few {Slėpti vaizdus} many {Slėpti vaizdo} other {Slėpti vaizdų}}",
   "moved_to_account_banner.text": "Tavo paskyra {disabledAccount} šiuo metu išjungta, nes persikėlei į {movedToAccount}.",
-  "mute_modal.duration": "Trukmė",
-  "mute_modal.hide_notifications": "Slėpti šio naudotojo pranešimus?",
-  "mute_modal.indefinite": "Neribota",
   "navigation_bar.about": "Apie",
   "navigation_bar.advanced_interface": "Atidaryti išplėstinę žiniatinklio sąsają",
   "navigation_bar.blocks": "Užblokuoti naudotojai",
diff --git a/app/javascript/mastodon/locales/lv.json b/app/javascript/mastodon/locales/lv.json
index 726ae655c21264..51d06c82339ec5 100644
--- a/app/javascript/mastodon/locales/lv.json
+++ b/app/javascript/mastodon/locales/lv.json
@@ -159,9 +159,7 @@
   "compose_form.spoiler.unmarked": "Pievienot satura brīdinājumu",
   "compose_form.spoiler_placeholder": "Satura brīdinājums (pēc izvēles)",
   "confirmation_modal.cancel": "Atcelt",
-  "confirmations.block.block_and_report": "Bloķēt un ziņot",
   "confirmations.block.confirm": "Bloķēt",
-  "confirmations.block.message": "Vai tiešām vēlies bloķēt {name}?",
   "confirmations.cancel_follow_request.confirm": "Atsaukt pieprasījumu",
   "confirmations.cancel_follow_request.message": "Vai tiešām vēlies atsaukt pieprasījumu sekot {name}?",
   "confirmations.delete.confirm": "Dzēst",
@@ -170,15 +168,12 @@
   "confirmations.delete_list.message": "Vai tiešām neatgriezeniski izdzēst šo sarakstu?",
   "confirmations.discard_edit_media.confirm": "Atmest",
   "confirmations.discard_edit_media.message": "Ir nesaglabātas izmaiņas informācijas nesēja aprakstā vai priekšskatījumā. Vēlies tās atmest tik un tā?",
-  "confirmations.domain_block.confirm": "Bloķēt visu domēnu",
   "confirmations.domain_block.message": "Vai tu tiešām vēlies bloķēt visu domēnu {domain}? Parasti pietiek, ja nobloķē vai apklusini kādu. Tu neredzēsi saturu vai paziņojumus no šī domēna nevienā laika līnijā. Tavi sekotāji no šī domēna tiks noņemti.",
   "confirmations.edit.confirm": "Labot",
   "confirmations.edit.message": "Rediģējot, tiks pārrakstīts ziņojums, kuru tu šobrīd raksti. Vai tiešām vēlies turpināt?",
   "confirmations.logout.confirm": "Iziet",
   "confirmations.logout.message": "Vai tiešām vēlies izrakstīties?",
   "confirmations.mute.confirm": "Apklusināt",
-  "confirmations.mute.explanation": "Šādi tiks slēpti ieraksti no viņiem un ieraksti, kuros viņi tiek pieminēti, taču viņi joprojām varēs redzēt Tavus ierakstus un sekot Tev.",
-  "confirmations.mute.message": "Vai tiešām vēlies apklusināt {name}?",
   "confirmations.redraft.confirm": "Dzēst un pārrakstīt",
   "confirmations.redraft.message": "Vai tiešām vēlies dzēst šo ziņu un no jauna noformēt to? Izlase un pastiprinājumi tiks zaudēti, un atbildes uz sākotnējo ziņu tiks atstātas bez autoratlīdzības.",
   "confirmations.reply.confirm": "Atbildēt",
@@ -391,9 +386,6 @@
   "loading_indicator.label": "Ielādē…",
   "media_gallery.toggle_visible": "{number, plural, one {Slēpt attēlu} other {Slēpt attēlus}}",
   "moved_to_account_banner.text": "Tavs konts {disabledAccount} pašlaik ir atspējots, jo Tu pārcēlies uz kontu {movedToAccount}.",
-  "mute_modal.duration": "Ilgums",
-  "mute_modal.hide_notifications": "Slēpt paziņojumus no šī lietotāja?",
-  "mute_modal.indefinite": "Beztermiņa",
   "navigation_bar.about": "Par",
   "navigation_bar.advanced_interface": "Atvērt paplašinātā tīmekļa saskarnē",
   "navigation_bar.blocks": "Bloķētie lietotāji",
@@ -633,7 +625,7 @@
   "status.edit": "Labot",
   "status.edited_x_times": "Labots {count, plural, one {{count} reizi} other {{count} reizes}}",
   "status.embed": "Iestrādāt",
-  "status.favourite": "Iecienīts",
+  "status.favourite": "Izlasē",
   "status.filter": "Filtrē šo ziņu",
   "status.filtered": "Filtrēts",
   "status.hide": "Slēpt ierakstu",
diff --git a/app/javascript/mastodon/locales/mk.json b/app/javascript/mastodon/locales/mk.json
index cd30e29493d227..d8a470ed47ead9 100644
--- a/app/javascript/mastodon/locales/mk.json
+++ b/app/javascript/mastodon/locales/mk.json
@@ -80,20 +80,15 @@
   "compose_form.spoiler.marked": "Текстот е сокриен зад предупредување",
   "compose_form.spoiler.unmarked": "Текстот не е сокриен",
   "confirmation_modal.cancel": "Откажи",
-  "confirmations.block.block_and_report": "Блокирај и Пријави",
   "confirmations.block.confirm": "Блокирај",
-  "confirmations.block.message": "Сигурни сте дека дека го блокирате {name}?",
   "confirmations.delete.confirm": "Избриши",
   "confirmations.delete.message": "Сигурни сте дека го бришите статусот?",
   "confirmations.delete_list.confirm": "Избриши",
   "confirmations.delete_list.message": "Дали сте сигурни дека сакате да го избришете списоков?",
-  "confirmations.domain_block.confirm": "Сокриј цел домеин",
   "confirmations.domain_block.message": "Дали скроз сте сигурни дека ќе блокирате сѐ од {domain}? Во повеќето случаеви неколку таргетирани блокирања или заќутувања се доволни и предложени. Нема да ја видите содржината од тој домеин во никој јавен времеплов или вашите нотификации. Вашите следбеници од тој домеин ќе бидат остранети.",
   "confirmations.logout.confirm": "Одјави се",
   "confirmations.logout.message": "Дали сте сигурни дека сакате да се одјавите?",
   "confirmations.mute.confirm": "Заќути",
-  "confirmations.mute.explanation": "Ќе сокрие објави од нив и објави кои ги спомнуваат нив, но сеуште ќе им дозволи да ги видат вашите постови и ве следат.",
-  "confirmations.mute.message": "Дали ќе го заќутите {name}?",
   "confirmations.reply.confirm": "Одговори",
   "confirmations.unfollow.confirm": "Одследи",
   "confirmations.unfollow.message": "Сигурни сте дека ќе го отследите {name}?",
diff --git a/app/javascript/mastodon/locales/ml.json b/app/javascript/mastodon/locales/ml.json
index 6f1ec3c117536c..8fb4e818db2ead 100644
--- a/app/javascript/mastodon/locales/ml.json
+++ b/app/javascript/mastodon/locales/ml.json
@@ -108,14 +108,11 @@
   "compose_form.spoiler.marked": "എഴുത്ത് മുന്നറിയിപ്പിനാൽ മറച്ചിരിക്കുന്നു",
   "compose_form.spoiler.unmarked": "എഴുത്ത് മറയ്ക്കപ്പെട്ടിട്ടില്ല",
   "confirmation_modal.cancel": "റദ്ദാക്കുക",
-  "confirmations.block.block_and_report": "തടയുകയും റിപ്പോർട്ടും ചെയ്യുക",
   "confirmations.block.confirm": "തടയുക",
-  "confirmations.block.message": "{name} തടയാൻ നിങ്ങൾ ആഗ്രഹിക്കുന്നുണ്ടോ?",
   "confirmations.delete.confirm": "മായ്ക്കുക",
   "confirmations.delete.message": "ഈ ടൂട്ട് ഇല്ലാതാക്കണം എന്ന് നിങ്ങൾക്ക് ഉറപ്പാണോ?",
   "confirmations.delete_list.confirm": "മായ്ക്കുക",
   "confirmations.delete_list.message": "ഈ പട്ടിക എന്നെന്നേക്കുമായി നീക്കം ചെയ്യാൻ നിങ്ങൾ ആഗ്രഹിക്കുന്നുണ്ടോ?",
-  "confirmations.domain_block.confirm": "മുഴുവൻ ഡൊമെയ്‌നും തടയുക",
   "confirmations.logout.confirm": "പുറത്തുകടക്കുക",
   "confirmations.logout.message": "നിങ്ങൾക്ക് ലോഗ് ഔട്ട് ചെയ്യണമെന്ന് ഉറപ്പാണോ?",
   "confirmations.mute.confirm": "നിശ്ശബ്ദമാക്കുക",
@@ -229,8 +226,6 @@
   "lists.replies_policy.none": "ആരുമില്ല",
   "lists.replies_policy.title": "ഇതിനുള്ള മറുപടികൾ കാണിക്കുക:",
   "lists.subheading": "എന്റെ പട്ടികകൾ",
-  "mute_modal.duration": "കാലാവധി",
-  "mute_modal.indefinite": "അനിശ്ചിതകാല",
   "navigation_bar.blocks": "തടയപ്പെട്ട ഉപയോക്താക്കൾ",
   "navigation_bar.bookmarks": "ബുക്ക്മാർക്കുകൾ",
   "navigation_bar.community_timeline": "പ്രാദേശിക സമയരേഖ",
diff --git a/app/javascript/mastodon/locales/mr.json b/app/javascript/mastodon/locales/mr.json
index 0cd5e7ef7835fc..a00b39e838a0e0 100644
--- a/app/javascript/mastodon/locales/mr.json
+++ b/app/javascript/mastodon/locales/mr.json
@@ -105,7 +105,6 @@
   "confirmations.delete.message": "हे स्टेटस तुम्हाला नक्की हटवायचंय?",
   "confirmations.delete_list.confirm": "हटवा",
   "confirmations.delete_list.message": "ही यादी तुम्हाला नक्की कायमची हटवायचीय?",
-  "confirmations.domain_block.confirm": "संपूर्ण डोमेन लपवा",
   "confirmations.logout.message": "तुमची खात्री आहे की तुम्ही लॉग आउट करू इच्छिता?",
   "confirmations.mute.confirm": "आवाज बंद करा",
   "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
diff --git a/app/javascript/mastodon/locales/ms.json b/app/javascript/mastodon/locales/ms.json
index 155eeccee67d16..8fe043c5dcec02 100644
--- a/app/javascript/mastodon/locales/ms.json
+++ b/app/javascript/mastodon/locales/ms.json
@@ -160,9 +160,7 @@
   "compose_form.spoiler.unmarked": "Tambah amaran kandungan",
   "compose_form.spoiler_placeholder": "Amaran kandungan (pilihan)",
   "confirmation_modal.cancel": "Batal",
-  "confirmations.block.block_and_report": "Sekat & Lapor",
   "confirmations.block.confirm": "Sekat",
-  "confirmations.block.message": "Adakah anda pasti anda ingin menyekat {name}?",
   "confirmations.cancel_follow_request.confirm": "Tarik balik permintaan",
   "confirmations.cancel_follow_request.message": "Adakah anda pasti ingin menarik balik permintaan anda untuk mengikut {name}?",
   "confirmations.delete.confirm": "Padam",
@@ -171,15 +169,12 @@
   "confirmations.delete_list.message": "Adakah anda pasti anda ingin memadam senarai ini secara kekal?",
   "confirmations.discard_edit_media.confirm": "Singkir",
   "confirmations.discard_edit_media.message": "Anda belum menyimpan perubahan pada penerangan atau pratonton media. Anda ingin membuangnya?",
-  "confirmations.domain_block.confirm": "Sekat keseluruhan domain",
   "confirmations.domain_block.message": "Adakah anda betul-betul, sungguh-sungguh pasti anda ingin menyekat keseluruhan {domain}? Selalunya, beberapa sekatan atau pembisuan tersasar sudah memadai dan lebih diutamakan. Anda tidak akan nampak kandungan daripada domain tersebut di mana-mana garis masa awam mahupun pemberitahuan anda. Pengikut anda daripada domain tersebut juga akan dibuang.",
   "confirmations.edit.confirm": "Sunting",
   "confirmations.edit.message": "Mengedit sekarang akan menimpa mesej yang sedang anda karang. Adakah anda pasti mahu meneruskan?",
   "confirmations.logout.confirm": "Log keluar",
   "confirmations.logout.message": "Adakah anda pasti anda ingin log keluar?",
   "confirmations.mute.confirm": "Bisukan",
-  "confirmations.mute.explanation": "Ini akan menyembunyikan hantaran daripada mereka dan juga hantaran yang menyebut mereka, tetapi ia masih membenarkan mereka melihat hantaran anda dan mengikuti anda.",
-  "confirmations.mute.message": "Adakah anda pasti anda ingin membisukan {name}?",
   "confirmations.redraft.confirm": "Padam & rangka semula",
   "confirmations.redraft.message": "Adakah anda pasti anda ingin memadam pos ini dan merangkanya semula? Kegemaran dan galakan akan hilang, dan balasan ke pos asal akan menjadi yatim.",
   "confirmations.reply.confirm": "Balas",
@@ -396,9 +391,6 @@
   "loading_indicator.label": "Memuatkan…",
   "media_gallery.toggle_visible": "{number, plural, other {Sembunyikan imej}}",
   "moved_to_account_banner.text": "Akaun anda {disabledAccount} kini dinyahdayakan kerana anda berpindah ke {movedToAccount}.",
-  "mute_modal.duration": "Tempoh",
-  "mute_modal.hide_notifications": "Sembunyikan pemberitahuan daripada pengguna ini?",
-  "mute_modal.indefinite": "Tidak tentu",
   "navigation_bar.about": "Perihal",
   "navigation_bar.advanced_interface": "Buka dalam antara muka web lanjutan",
   "navigation_bar.blocks": "Pengguna yang disekat",
diff --git a/app/javascript/mastodon/locales/my.json b/app/javascript/mastodon/locales/my.json
index 001e15e0d119e7..23eaa8564b5470 100644
--- a/app/javascript/mastodon/locales/my.json
+++ b/app/javascript/mastodon/locales/my.json
@@ -150,9 +150,7 @@
   "compose_form.spoiler.marked": "Text is hidden behind warning",
   "compose_form.spoiler.unmarked": "Text is not hidden",
   "confirmation_modal.cancel": "ပယ်ဖျက်မည်",
-  "confirmations.block.block_and_report": "ဘလော့ပြီး တိုင်ကြားမည်",
   "confirmations.block.confirm": "ဘလော့မည်",
-  "confirmations.block.message": "အကောင့်မှ ထွက်ရန် သေချာပါသလား?",
   "confirmations.cancel_follow_request.confirm": "ပန်ကြားချက်ကို ပယ်ဖျက်မည်",
   "confirmations.cancel_follow_request.message": "{name} ကို စောင့်ကြည့်ခြင်းအားပယ်ဖျက်ရန် သေချာပါသလား။",
   "confirmations.delete.confirm": "ဖျက်မည်",
@@ -161,15 +159,12 @@
   "confirmations.delete_list.message": "ဖျက်ရန် သေချာပါသလား?",
   "confirmations.discard_edit_media.confirm": "ဖယ်ထုတ်ပါ",
   "confirmations.discard_edit_media.message": "သင်သည် မီဒီယာဖော်ပြချက် သို့မဟုတ် အစမ်းကြည့်ရှုခြင်းတွင် မသိမ်းဆည်းရသေးသော အပြောင်းအလဲများရှိသည်။ မည်သို့ပင်ဖြစ်စေ ဖျက်ပစ်မည်လား။",
-  "confirmations.domain_block.confirm": "Hide entire domain",
   "confirmations.domain_block.message": "{domain} တစ်ခုလုံးကို ဘလော့လုပ်ရန် တကယ် သေချာပါသလား? များသောအားဖြင့် အနည်းစုကို ပစ်မှတ်ထား ဘလော့လုပ်ခြင်းသည် လုံလောက်ပါသည်။ ထို ဒိုမိန်းမှ အကြောင်းအရာ တစ်ခုမှ မြင်ရမည်မဟုတ်သည့်အပြင် ထို ဒိုမိန်းတွင်ရှိသော သင်၏ စောင့်ကြည့်သူများပါ ဖယ်ရှားပစ်မည်ဖြစ်သည်။",
   "confirmations.edit.confirm": "ပြင်ရန်",
   "confirmations.edit.message": "ယခုပြင်ဆင်ခြင်းတွင် သင်လက်ရှိမက်ဆေ့ချ်ကို ဖျက်ပစ်ပြီး အသစ်ရေးပါမည်။ ရှေ့ဆက်လိုသည်မှာ သေချာပါသလား။",
   "confirmations.logout.confirm": "အကောင့်မှထွက်မည်",
   "confirmations.logout.message": "အကောင့်မှ ထွက်ရန် သေချာပါသလား?",
   "confirmations.mute.confirm": "ပိတ်ထားရန်",
-  "confirmations.mute.explanation": "၎င်းသည် ၎င်းတို့ထံမှ ပို့စ်များနှင့် ၎င်းတို့ကို ဖော်ပြထားသော ပို့စ်များကို ဖျောက်ထားမည်ဖြစ်ပြီး၊ သို့သော် ၎င်းတို့သည် သင့်ပို့စ်များကို မြင်နိုင်ပြီး သင့်အား လိုက်ကြည့်နိုင်စေမည်ဖြစ်သည်။",
-  "confirmations.mute.message": "{name} ကို မမြင်လိုသည်မှာ သေချာပါသလား။ ",
   "confirmations.redraft.confirm": "ဖျက်ပြီး ပြန်လည်ရေးမည်။",
   "confirmations.redraft.message": "သင် ဒီပိုစ့်ကိုဖျက်ပြီး ပြန်တည်းဖြတ်မှာ သေချာပြီလား။ ကြယ်ပွင့်​တွေ နဲ့ ပြန်မျှ​ဝေမှု​တွေကိုဆုံးရှုံးမည်။မူရင်းပို့စ်ဆီကို ပြန်စာ​တွေမှာလည်း​ \nပိုစ့်ကို​တွေ့ရမည်မဟုတ်​တော့ပါ။.",
   "confirmations.reply.confirm": "စာပြန်မည်",
@@ -377,9 +372,6 @@
   "loading_indicator.label": "လုပ်ဆောင်နေသည်…",
   "media_gallery.toggle_visible": "{number, plural, one {Hide image} other {Hide images}}",
   "moved_to_account_banner.text": "{movedToAccount} အကောင့်သို့ပြောင်းလဲထားသဖြင့် {disabledAccount} အကောင့်မှာပိတ်ထားသည်",
-  "mute_modal.duration": "ကြာချိန်",
-  "mute_modal.hide_notifications": "ဤအကောင့်မှသတိပေးချက်များကိုပိတ်မလား?",
-  "mute_modal.indefinite": "ရေတွက်လို့မရပါ",
   "navigation_bar.about": "အကြောင်း",
   "navigation_bar.advanced_interface": "အဆင့်မြင့်ဝဘ်ပုံစံ ဖွင့်ပါ",
   "navigation_bar.blocks": "ဘလော့ထားသောအကောင့်များ",
diff --git a/app/javascript/mastodon/locales/ne.json b/app/javascript/mastodon/locales/ne.json
index 86e24a15fb1188..aef23c8566c985 100644
--- a/app/javascript/mastodon/locales/ne.json
+++ b/app/javascript/mastodon/locales/ne.json
@@ -50,6 +50,10 @@
   "admin.dashboard.retention.cohort_size": "नयाँ प्रयोगकर्ताहरू",
   "alert.rate_limited.message": "कृपया {retry_time, time, medium} पछि पुन: प्रयास गर्नुहोस्।",
   "alert.unexpected.message": "एउटा अनपेक्षित त्रुटि भयो।",
+  "announcement.announcement": "घोषणा",
+  "block_modal.remote_users_caveat": "हामी सर्भर {domain} लाई तपाईंको निर्णयको सम्मान गर्न सोध्नेछौं। तर, हामी अनुपालनको ग्यारेन्टी दिन सक्दैनौं किनभने केही सर्भरहरूले ब्लकहरू फरक रूपमा ह्यान्डल गर्न सक्छन्। सार्वजनिक पोस्टहरू लग इन नभएका प्रयोगकर्ताहरूले देख्न सक्छन्।",
+  "block_modal.show_less": "कम देखाउनुहोस्",
+  "block_modal.show_more": "थप देखाउनुहोस्",
   "bundle_column_error.retry": "पुन: प्रयास गर्नुहोस्",
   "bundle_modal_error.close": "बन्द गर्नुहोस्",
   "bundle_modal_error.message": "यो कम्पोनेन्ट लोड गर्दा केही गडबड भयो।",
diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json
index cdb5562e90cc3a..9bf40a7148bb32 100644
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@@ -89,6 +89,14 @@
   "announcement.announcement": "Mededeling",
   "attachments_list.unprocessed": "(niet verwerkt)",
   "audio.hide": "Audio verbergen",
+  "block_modal.remote_users_caveat": "We vragen de server {domain} om je besluit te respecteren. Het naleven hiervan is echter niet gegarandeerd, omdat sommige servers blokkades anders kunnen interpreteren. Openbare berichten zijn mogelijk nog steeds zichtbaar voor niet-ingelogde gebruikers.",
+  "block_modal.show_less": "Minder tonen",
+  "block_modal.show_more": "Meer tonen",
+  "block_modal.they_cant_mention": "De persoon kan jou niet vermelden of volgen.",
+  "block_modal.they_cant_see_posts": "De persoon kan jouw berichten niet zien en jij ook niet diens berichten.",
+  "block_modal.they_will_know": "De persoon kan zien dat die wordt geblokkeerd.",
+  "block_modal.title": "Gebruiker blokkeren?",
+  "block_modal.you_wont_see_mentions": "Je ziet geen berichten meer die dit account vermelden.",
   "boost_modal.combo": "Je kunt {combo} klikken om dit de volgende keer over te slaan",
   "bundle_column_error.copy_stacktrace": "Foutrapportage kopiëren",
   "bundle_column_error.error.body": "De opgevraagde pagina kon niet worden weergegeven. Dit kan het gevolg zijn van een fout in onze broncode, of van een compatibiliteitsprobleem met je webbrowser.",
@@ -160,9 +168,7 @@
   "compose_form.spoiler.unmarked": "Inhoudswaarschuwing toevoegen",
   "compose_form.spoiler_placeholder": "Inhoudswaarschuwing (optioneel)",
   "confirmation_modal.cancel": "Annuleren",
-  "confirmations.block.block_and_report": "Blokkeren en rapporteren",
   "confirmations.block.confirm": "Blokkeren",
-  "confirmations.block.message": "Weet je het zeker dat je {name} wilt blokkeren?",
   "confirmations.cancel_follow_request.confirm": "Verzoek annuleren",
   "confirmations.cancel_follow_request.message": "Weet je zeker dat je jouw verzoek om {name} te volgen wilt annuleren?",
   "confirmations.delete.confirm": "Verwijderen",
@@ -171,15 +177,13 @@
   "confirmations.delete_list.message": "Weet je zeker dat je deze lijst definitief wilt verwijderen?",
   "confirmations.discard_edit_media.confirm": "Weggooien",
   "confirmations.discard_edit_media.message": "Je hebt niet-opgeslagen wijzigingen in de mediabeschrijving of voorvertonning, wil je deze toch weggooien?",
-  "confirmations.domain_block.confirm": "Blokkeer alles van deze server",
-  "confirmations.domain_block.message": "Weet je het echt heel erg zeker dat je alles van {domain} wilt blokkeren? In de meeste gevallen is het blokkeren of negeren van een paar specifieke personen voldoende en beter. Je zult geen berichten van deze server op openbare tijdlijnen zien of in jouw meldingen. Jouw volgers van deze server worden verwijderd.",
+  "confirmations.domain_block.confirm": "Server blokkeren",
+  "confirmations.domain_block.message": "Weet je het echt heel erg zeker dat je alles van {domain} wilt blokkeren? In de meeste gevallen is het blokkeren of negeren van een paar specifieke personen voldoende en beter. Je ziet geen berichten van deze server meer op openbare tijdlijnen of in jouw meldingen. Jouw volgers van deze server worden verwijderd.",
   "confirmations.edit.confirm": "Bewerken",
   "confirmations.edit.message": "Door nu te reageren overschrijf je het bericht dat je op dit moment aan het schrijven bent. Weet je zeker dat je verder wil gaan?",
   "confirmations.logout.confirm": "Uitloggen",
   "confirmations.logout.message": "Weet je zeker dat je wilt uitloggen?",
   "confirmations.mute.confirm": "Negeren",
-  "confirmations.mute.explanation": "Dit verbergt diens berichten en berichten waar diegene in wordt vermeld, maar diegene kan nog steeds jouw berichten bekijken en jou volgen.",
-  "confirmations.mute.message": "Weet je het zeker dat je {name} wilt negeren?",
   "confirmations.redraft.confirm": "Verwijderen en herschrijven",
   "confirmations.redraft.message": "Weet je zeker dat je dit bericht wilt verwijderen en herschrijven? Je verliest wel de boosts en favorieten, en de reacties op het originele bericht raak je kwijt.",
   "confirmations.reply.confirm": "Reageren",
@@ -205,6 +209,27 @@
   "dismissable_banner.explore_statuses": "Dit zijn berichten op het sociale web die vandaag aan populariteit winnen. Nieuwere berichten met meer boosts en favorieten staan hoger.",
   "dismissable_banner.explore_tags": "Deze hashtags winnen aan populariteit op het sociale web. Hashtags die door meer verschillende mensen worden gebruikt staan hoger.",
   "dismissable_banner.public_timeline": "Dit zijn de meest recente openbare berichten van accounts op het sociale web die door mensen op {domain} worden gevolgd.",
+  "domain_block_modal.block": "Server blokkeren",
+  "domain_block_modal.block_account_instead": "In plaats hiervan {name} blokkeren",
+  "domain_block_modal.they_can_interact_with_old_posts": "Mensen op deze server kunnen interactie hebben met jouw oude berichten.",
+  "domain_block_modal.they_cant_follow": "Niemand op deze server kan jou volgen.",
+  "domain_block_modal.they_wont_know": "Ze krijgen niet te weten dat ze worden geblokkeerd.",
+  "domain_block_modal.title": "Server blokkeren?",
+  "domain_block_modal.you_will_lose_followers": "Al jouw volgers van deze server worden ontvolgd.",
+  "domain_block_modal.you_wont_see_posts": "Je ziet geen berichten of meldingen meer van gebruikers op deze server.",
+  "domain_pill.activitypub_lets_connect": "Het zorgt ervoor dat je niet alleen maar kunt verbinden en communiceren met mensen op Mastodon, maar ook met andere sociale apps.",
+  "domain_pill.activitypub_like_language": "ActivityPub is de taal die Mastodon met andere sociale netwerken spreekt.",
+  "domain_pill.server": "Server",
+  "domain_pill.their_handle": "Hun Mastodon-adres:",
+  "domain_pill.their_server": "Hun digitale thuis, waar al hun berichten zich bevinden.",
+  "domain_pill.their_username": "Hun unieke identificatie-adres op hun server. Het is mogelijk dat er gebruikers met dezelfde gebruikersnaam op verschillende servers te vinden zijn.",
+  "domain_pill.username": "Gebruikersnaam",
+  "domain_pill.whats_in_a_handle": "Wat is een Mastodon-adres?",
+  "domain_pill.who_they_are": "Omdat je aan een Mastodon-adres kunt zien wie iemand is en waar die zich bevindt, kun je met mensen op het door <button>ActivityPub aangedreven</button> sociale web communiceren.",
+  "domain_pill.who_you_are": "Omdat je aan jouw Mastodon-adres kunt zien wie jij bent is en waar je je bevindt, kunnen mensen op het door <button>ActivityPub aangedreven</button> sociale web met jou communiceren.",
+  "domain_pill.your_handle": "Jouw Mastodon-adres:",
+  "domain_pill.your_server": "Jouw digitale thuis, waar al jouw berichten zich bevinden. Is deze server toch niet naar jouw wens? Dan kun je op elk moment naar een andere server verhuizen en ook jouw volgers overbrengen.",
+  "domain_pill.your_username": "Jouw unieke identificatie-adres op deze server. Het is mogelijk dat er gebruikers met dezelfde gebruikersnaam op verschillende servers te vinden zijn.",
   "embed.instructions": "Embed dit bericht op jouw website door de onderstaande code te kopiëren.",
   "embed.preview": "Zo komt het eruit te zien:",
   "emoji_button.activity": "Activiteiten",
@@ -229,17 +254,17 @@
   "empty_column.blocks": "Je hebt nog geen gebruikers geblokkeerd.",
   "empty_column.bookmarked_statuses": "Jij hebt nog geen berichten aan je bladwijzers toegevoegd. Wanneer je er een aan jouw bladwijzers toevoegt, valt deze hier te zien.",
   "empty_column.community": "De lokale tijdlijn is nog leeg. Plaats een openbaar bericht om de spits af te bijten!",
-  "empty_column.direct": "Je hebt nog geen privéberichten. Wanneer je er een verstuurt of ontvangt, zullen deze hier verschijnen.",
+  "empty_column.direct": "Je hebt nog geen privéberichten. Wanneer je er een verstuurt of ontvangt, komen deze hier te staan.",
   "empty_column.domain_blocks": "Er zijn nog geen geblokkeerde servers.",
   "empty_column.explore_statuses": "Momenteel zijn er geen trends. Kom later terug!",
   "empty_column.favourited_statuses": "Jij hebt nog geen favoriete berichten. Wanneer je een bericht als favoriet markeert, valt deze hier te zien.",
   "empty_column.favourites": "Niemand heeft dit bericht nog als favoriet gemarkeerd. Wanneer iemand dit doet, valt dat hier te zien.",
-  "empty_column.follow_requests": "Je hebt nog geen volgverzoeken. Wanneer je er een ontvangt, zal dat hier te zien zijn.",
-  "empty_column.followed_tags": "Je hebt nog geen hashtags gevolgd. Wanneer je dit doet, zullen ze hier verschijnen.",
+  "empty_column.follow_requests": "Jij hebt nog enkel volgverzoek ontvangen. Wanneer je er eentje ontvangt, valt dat hier te zien.",
+  "empty_column.followed_tags": "Je hebt nog geen hashtags gevolgd. Nadat je dit doet, komen deze hier te staan.",
   "empty_column.hashtag": "Er is nog niks te vinden onder deze hashtag.",
   "empty_column.home": "Deze tijdlijn is leeg! Volg meer mensen om het te vullen.",
   "empty_column.list": "Er is nog niks te zien in deze lijst. Wanneer lijstleden nieuwe berichten plaatsen, zijn deze hier te zien.",
-  "empty_column.lists": "Je hebt nog geen lijsten. Wanneer je er een aanmaakt, zal dat hier verschijnen.",
+  "empty_column.lists": "Je hebt nog geen lijsten. Wanneer je er een aanmaakt, valt dat hier te zien.",
   "empty_column.mutes": "Jij hebt nog geen gebruikers genegeerd.",
   "empty_column.notification_requests": "Helemaal leeg! Er is hier niets. Wanneer je nieuwe meldingen ontvangt, verschijnen deze hier volgens jouw instellingen.",
   "empty_column.notifications": "Je hebt nog geen meldingen. Begin met iemand een gesprek.",
@@ -402,9 +427,15 @@
   "loading_indicator.label": "Laden…",
   "media_gallery.toggle_visible": "{number, plural, one {afbeelding verbergen} other {afbeeldingen verbergen}}",
   "moved_to_account_banner.text": "Omdat je naar {movedToAccount} bent verhuisd is jouw account {disabledAccount} momenteel uitgeschakeld.",
-  "mute_modal.duration": "Tijdsduur",
-  "mute_modal.hide_notifications": "Verberg meldingen van deze persoon?",
-  "mute_modal.indefinite": "Voor onbepaalde tijd",
+  "mute_modal.hide_from_notifications": "Onder meldingen verbergen",
+  "mute_modal.hide_options": "Opties verbergen",
+  "mute_modal.indefinite": "Totdat ik ze niet meer negeer",
+  "mute_modal.show_options": "Opties tonen",
+  "mute_modal.they_can_mention_and_follow": "De persoon kan jou vermelden en volgen, maar jij ziet niks meer van deze persoon.",
+  "mute_modal.they_wont_know": "De persoon krijgt niet te weten dat die wordt genegeerd.",
+  "mute_modal.title": "Gebruiker negeren?",
+  "mute_modal.you_wont_see_mentions": "Je ziet geen berichten meer die dit account vermelden.",
+  "mute_modal.you_wont_see_posts": "De persoon kan nog steeds jouw berichten zien, maar diens berichten zie je niet meer.",
   "navigation_bar.about": "Over",
   "navigation_bar.advanced_interface": "In geavanceerde webinterface openen",
   "navigation_bar.blocks": "Geblokkeerde gebruikers",
@@ -495,7 +526,7 @@
   "onboarding.actions.go_to_home": "Ga naar je starttijdlijn",
   "onboarding.compose.template": "Hallo #Mastodon!",
   "onboarding.follows.empty": "Helaas kunnen op dit moment geen resultaten worden getoond. Je kunt proberen te zoeken of op de verkenningspagina te bladeren om mensen te vinden die je kunt volgen, of probeer het later opnieuw.",
-  "onboarding.follows.lead": "Jouw starttijdlijn is de belangrijkste manier om Mastodon te ervaren. Hoe meer mensen je volgt, hoe actiever en interessanter het zal zijn. Om te beginnen, zijn hier enkele suggesties:",
+  "onboarding.follows.lead": "Jouw starttijdlijn is de belangrijkste manier om Mastodon te ervaren. Hoe meer mensen je volgt, hoe actiever en interessanter het wordt. Om te beginnen zijn hier enkele suggesties:",
   "onboarding.follows.title": "Je starttijdlijn aan jouw wensen aanpassen",
   "onboarding.profile.discoverable": "Maak mijn profiel vindbaar",
   "onboarding.profile.discoverable_hint": "Wanneer je akkoord gaat met het vindbaar zijn op Mastodon, verschijnen je berichten in zoekresultaten en kunnen ze trending worden, en je profiel kan aan andere mensen worden aanbevolen wanneer ze vergelijkbare interesses hebben.",
@@ -519,7 +550,7 @@
   "onboarding.steps.follow_people.title": "Je starttijdlijn aan jouw wensen aanpassen",
   "onboarding.steps.publish_status.body": "Zeg hallo tegen de wereld met tekst, foto's, video's of peilingen {emoji}",
   "onboarding.steps.publish_status.title": "Maak je eerste bericht",
-  "onboarding.steps.setup_profile.body": "Anderen zullen eerder met je in contact treden als je wat over jezelf vertelt.",
+  "onboarding.steps.setup_profile.body": "Wanneer je meer over jezelf vertelt, krijg je meer interactie met andere mensen.",
   "onboarding.steps.setup_profile.title": "Je profiel aanpassen",
   "onboarding.steps.share_profile.body": "Laat je vrienden weten waar je te vinden bent op Mastodon",
   "onboarding.steps.share_profile.title": "Deel je Mastodonprofiel",
@@ -547,7 +578,7 @@
   "privacy.private.short": "Volgers",
   "privacy.public.long": "Iedereen op Mastodon en daarbuiten",
   "privacy.public.short": "Openbaar",
-  "privacy.unlisted.additional": "Dit is vergelijkbaar met openbaar, behalve dat het beticht niet verschijnt op openbare tijdlijnen of hashtags, onder verkennen of Mastodon zoeken, zelfs als je je account daarvoor hebt ingesteld.",
+  "privacy.unlisted.additional": "Dit is vergelijkbaar met openbaar, behalve dat het bericht niet op openbare tijdlijnen, onder hashtags, verkennen of zoeken verschijnt, zelfs als je je account daarvoor hebt ingesteld.",
   "privacy.unlisted.long": "Voor iedereen zichtbaar, maar niet onder trends, hashtags en op openbare tijdlijnen",
   "privacy.unlisted.short": "Minder openbaar",
   "privacy_policy.last_updated": "Laatst bijgewerkt op {date}",
@@ -693,7 +724,7 @@
   "status.remove_bookmark": "Bladwijzer verwijderen",
   "status.replied_to": "Reageerde op {name}",
   "status.reply": "Reageren",
-  "status.replyAll": "Reageer op iedereen",
+  "status.replyAll": "Op iedereen reageren",
   "status.report": "@{name} rapporteren",
   "status.sensitive_warning": "Gevoelige inhoud",
   "status.share": "Delen",
diff --git a/app/javascript/mastodon/locales/nn.json b/app/javascript/mastodon/locales/nn.json
index 4235f579162d32..a218cadf8dfb82 100644
--- a/app/javascript/mastodon/locales/nn.json
+++ b/app/javascript/mastodon/locales/nn.json
@@ -89,6 +89,9 @@
   "announcement.announcement": "Kunngjering",
   "attachments_list.unprocessed": "(ubehandla)",
   "audio.hide": "Gøym lyd",
+  "block_modal.remote_users_caveat": "Vi vil be tenaren {domain} om å respektere di avgjerd. Det kan ikkje garanterast at det vert etterfølgd, sidan nokre tenarar kan handtere blokkering ulikt. Offentlege innlegg kan framleis vere synlege for ikkje-innlogga brukarar.",
+  "block_modal.show_less": "Vis mindre",
+  "block_modal.show_more": "Vis meir",
   "boost_modal.combo": "Du kan trykkja {combo} for å hoppa over dette neste gong",
   "bundle_column_error.copy_stacktrace": "Kopier feilrapport",
   "bundle_column_error.error.body": "Den etterspurde sida kan ikke hentast fram. Det kan skuldast ein feil i koden vår eller eit kompatibilitetsproblem.",
@@ -160,9 +163,7 @@
   "compose_form.spoiler.unmarked": "Legg til innhaldsåtvaring",
   "compose_form.spoiler_placeholder": "Innhaldsåtvaring (valfritt)",
   "confirmation_modal.cancel": "Avbryt",
-  "confirmations.block.block_and_report": "Blokker & rapporter",
   "confirmations.block.confirm": "Blokker",
-  "confirmations.block.message": "Er du sikker på at du vil blokkera {name}?",
   "confirmations.cancel_follow_request.confirm": "Trekk attende førespurnad",
   "confirmations.cancel_follow_request.message": "Er du sikker på at du vil trekkje attende førespurnaden din om å fylgje {name}?",
   "confirmations.delete.confirm": "Slett",
@@ -171,15 +172,12 @@
   "confirmations.delete_list.message": "Er du sikker på at du vil sletta denne lista for alltid?",
   "confirmations.discard_edit_media.confirm": "Forkast",
   "confirmations.discard_edit_media.message": "Du har ulagra endringar i mediaskildringa eller førehandsvisinga. Vil du forkasta dei likevel?",
-  "confirmations.domain_block.confirm": "Blokker heile domenet",
   "confirmations.domain_block.message": "Er du heilt, heilt sikker på at du vil skjula heile {domain}? I dei fleste tilfelle er det godt nok og føretrekt med nokre få målretta blokkeringar eller målbindingar. Du kjem ikkje til å sjå innhald frå domenet i fødererte tidsliner eller i varsla dine. Fylgjarane dine frå domenet vert fjerna.",
   "confirmations.edit.confirm": "Rediger",
   "confirmations.edit.message": "Å redigera no vil overskriva den meldinga du er i ferd med å skriva. Er du sikker på at du vil halda fram?",
   "confirmations.logout.confirm": "Logg ut",
   "confirmations.logout.message": "Er du sikker på at du vil logga ut?",
   "confirmations.mute.confirm": "Målbind",
-  "confirmations.mute.explanation": "Dette vil gøyma innlegga deira og innlegg som nemner dei, men dei vil framleis kunna sjå innlegga dine og fylgja deg.",
-  "confirmations.mute.message": "Er du sikker på at du vil målbinda {name}?",
   "confirmations.redraft.confirm": "Slett & skriv på nytt",
   "confirmations.redraft.message": "Er du sikker på at du vil sletta denne statusen og skriva han på nytt? Då misser du favorittar og framhevingar, og svar til det opprinnelege innlegget vert foreldrelause.",
   "confirmations.reply.confirm": "Svar",
@@ -205,6 +203,19 @@
   "dismissable_banner.explore_statuses": "Dette er innlegg frå det desentraliserte nettverket som er i støytet i dag. Nye statusar som er mykje framheva og merkte som favorittar er rangert høgare.",
   "dismissable_banner.explore_tags": "Desse emneknaggane er populære blant folk på denne tenaren og andre tenarar i det desentraliserte nettverket nett no.",
   "dismissable_banner.public_timeline": "Dette er dei nyaste offentlege innlegga frå menneske på det sosiale nettet som folk på {domain} følgjer.",
+  "domain_pill.activitypub_lets_connect": "Den lar deg kople til og samhandle med folk ikkje berre på Mastodon, men òg på tvers av forskjellige sosiale appar.",
+  "domain_pill.activitypub_like_language": "ActivityPub er som språket Mastodon snakkar med andre sosiale nettverk.",
+  "domain_pill.server": "Tenar",
+  "domain_pill.their_handle": "Deira handtak:",
+  "domain_pill.their_server": "Deira digitale heim, som alle innlegga deira bur.",
+  "domain_pill.their_username": "Deira unike identifikator på serveren deira. Det er mogleg å finne brukarar med same brukarnamn på forskjellige tenarar.",
+  "domain_pill.username": "Brukarnamn",
+  "domain_pill.whats_in_a_handle": "Kva er i eit handtak?",
+  "domain_pill.who_they_are": "Sidan handtak seier kven nokon er og kvar dei er, kan du interagere med folk på tvers av det sosiale nettverket av <button>plattformar som støttar ActivityPub</button>.",
+  "domain_pill.who_you_are": "Sidan handtaket ditt seier kven du er og kvar du er, kan folk interagere med deg på tvers av det sosiale nettverket av <button>plattformar som støttar ActivityPub</button>.",
+  "domain_pill.your_handle": "Handtaket ditt:",
+  "domain_pill.your_server": "Din digitale heim, som alle postane dine bur i. Liker du ikkje dette? Overfør tenarar når som helst og ta med følgjarane dine òg.",
+  "domain_pill.your_username": "Din unike identifikator på denne tenaren. Det er mogleg å finne brukarar med same brukarnamn på forskjellige tenarar.",
   "embed.instructions": "Bygg inn denne statusen på nettsida di ved å kopiera koden nedanfor.",
   "embed.preview": "Slik kjem det til å sjå ut:",
   "emoji_button.activity": "Aktivitet",
@@ -402,9 +413,6 @@
   "loading_indicator.label": "Lastar…",
   "media_gallery.toggle_visible": "{number, plural, one {Skjul bilete} other {Skjul bilete}}",
   "moved_to_account_banner.text": "Kontoen din, {disabledAccount} er for tida deaktivert fordi du har flytta til {movedToAccount}.",
-  "mute_modal.duration": "Varigheit",
-  "mute_modal.hide_notifications": "Gøym varsel frå denne brukaren?",
-  "mute_modal.indefinite": "På ubestemt tid",
   "navigation_bar.about": "Om",
   "navigation_bar.advanced_interface": "Opne i avansert nettgrensesnitt",
   "navigation_bar.blocks": "Blokkerte brukarar",
diff --git a/app/javascript/mastodon/locales/no.json b/app/javascript/mastodon/locales/no.json
index 4834100a915aef..7f93ff04650262 100644
--- a/app/javascript/mastodon/locales/no.json
+++ b/app/javascript/mastodon/locales/no.json
@@ -160,9 +160,7 @@
   "compose_form.spoiler.unmarked": "Legg til innholdsvarsel",
   "compose_form.spoiler_placeholder": "Innholdsadvarsel (valgfritt)",
   "confirmation_modal.cancel": "Avbryt",
-  "confirmations.block.block_and_report": "Blokker og rapporter",
   "confirmations.block.confirm": "Blokkèr",
-  "confirmations.block.message": "Er du sikker på at du vil blokkere {name}?",
   "confirmations.cancel_follow_request.confirm": "Trekk tilbake forespørsel",
   "confirmations.cancel_follow_request.message": "Er du sikker på at du vil trekke tilbake forespørselen din for å følge {name}?",
   "confirmations.delete.confirm": "Slett",
@@ -171,15 +169,12 @@
   "confirmations.delete_list.message": "Er du sikker på at du vil slette denne listen permanent?",
   "confirmations.discard_edit_media.confirm": "Forkast",
   "confirmations.discard_edit_media.message": "Du har ulagrede endringer i mediebeskrivelsen eller i forhåndsvisning, forkast dem likevel?",
-  "confirmations.domain_block.confirm": "Skjul alt fra domenet",
   "confirmations.domain_block.message": "Er du sikker på at du vil skjule hele domenet {domain}? I de fleste tilfeller er det bedre med målrettet blokkering eller demping.",
   "confirmations.edit.confirm": "Redigér",
   "confirmations.edit.message": "Å redigere nå vil overskrive meldingen du skriver for øyeblikket. Er du sikker på at du vil fortsette?",
   "confirmations.logout.confirm": "Logg ut",
   "confirmations.logout.message": "Er du sikker på at du vil logge ut?",
   "confirmations.mute.confirm": "Demp",
-  "confirmations.mute.explanation": "Dette vil skjule innlegg fra dem og innlegg som nevner dem, men det vil fortsatt la dem se dine innlegg og å følge deg.",
-  "confirmations.mute.message": "Er du sikker på at du vil dempe {name}?",
   "confirmations.redraft.confirm": "Slett og skriv på nytt",
   "confirmations.redraft.message": "Er du sikker på at du vil slette dette innlegget og lagre det på nytt? Favoritter og fremhevinger vil gå tapt, og svar til det originale innlegget vil bli foreldreløse.",
   "confirmations.reply.confirm": "Svar",
@@ -389,9 +384,6 @@
   "loading_indicator.label": "Laster…",
   "media_gallery.toggle_visible": "Veksle synlighet",
   "moved_to_account_banner.text": "Din konto {disabledAccount} er for øyeblikket deaktivert fordi du flyttet til {movedToAccount}.",
-  "mute_modal.duration": "Varighet",
-  "mute_modal.hide_notifications": "Skjul varslinger fra denne brukeren?",
-  "mute_modal.indefinite": "På ubestemt tid",
   "navigation_bar.about": "Om",
   "navigation_bar.advanced_interface": "Åpne i det avanserte nettgrensesnittet",
   "navigation_bar.blocks": "Blokkerte brukere",
diff --git a/app/javascript/mastodon/locales/oc.json b/app/javascript/mastodon/locales/oc.json
index 2a5d05aac72b0c..3c32fed0efc2fa 100644
--- a/app/javascript/mastodon/locales/oc.json
+++ b/app/javascript/mastodon/locales/oc.json
@@ -137,9 +137,7 @@
   "compose_form.spoiler.marked": "Lo tèxte es rescondut jos l’avertiment",
   "compose_form.spoiler.unmarked": "Lo tèxte es pas rescondut",
   "confirmation_modal.cancel": "Anullar",
-  "confirmations.block.block_and_report": "Blocar e senhalar",
   "confirmations.block.confirm": "Blocar",
-  "confirmations.block.message": "Volètz vertadièrament blocar {name} ?",
   "confirmations.cancel_follow_request.confirm": "Retirar la demandar",
   "confirmations.cancel_follow_request.message": "Volètz vertadièrament retirar la demanda de seguiment de {name} ?",
   "confirmations.delete.confirm": "Escafar",
@@ -147,14 +145,11 @@
   "confirmations.delete_list.confirm": "Suprimir",
   "confirmations.delete_list.message": "Volètz vertadièrament suprimir aquesta lista per totjorn ?",
   "confirmations.discard_edit_media.confirm": "Ignorar",
-  "confirmations.domain_block.confirm": "Amagar tot lo domeni",
   "confirmations.domain_block.message": "Volètz vertadièrament blocar complètament {domain} ? De còps cal pas que blocar o rescondre unas personas solament.\nVeiretz pas cap de contengut d’aquel domeni dins cap de flux public o dins vòstras notificacions. Vòstres seguidors d’aquel domeni seràn levats.",
   "confirmations.edit.confirm": "Modificar",
   "confirmations.logout.confirm": "Desconnexion",
   "confirmations.logout.message": "Volètz vertadièrament vos desconnectar ?",
   "confirmations.mute.confirm": "Rescondre",
-  "confirmations.mute.explanation": "Aquò lor escondrà las publicacions e mencions, mas aquò lor permetrà encara de veire vòstra publicacions e de vos sègre.",
-  "confirmations.mute.message": "Volètz vertadièrament rescondre {name} ?",
   "confirmations.redraft.confirm": "Escafar & tornar formular",
   "confirmations.reply.confirm": "Respondre",
   "confirmations.reply.message": "Respondre remplaçarà lo messatge que sètz a escriure. Volètz vertadièrament contunhar ?",
@@ -333,9 +328,6 @@
   "load_pending": "{count, plural, one {# nòu element} other {# nòu elements}}",
   "loading_indicator.label": "Cargament…",
   "media_gallery.toggle_visible": "Modificar la visibilitat",
-  "mute_modal.duration": "Durada",
-  "mute_modal.hide_notifications": "Rescondre las notificacions d’aquesta persona ?",
-  "mute_modal.indefinite": "Cap de data de fin",
   "navigation_bar.about": "A prepaus",
   "navigation_bar.advanced_interface": "Dobrir l’interfàcia web avançada",
   "navigation_bar.blocks": "Personas blocadas",
diff --git a/app/javascript/mastodon/locales/pa.json b/app/javascript/mastodon/locales/pa.json
index f86a6933fcf4cc..e09dd9067ab079 100644
--- a/app/javascript/mastodon/locales/pa.json
+++ b/app/javascript/mastodon/locales/pa.json
@@ -86,13 +86,11 @@
   "compose_form.spoiler.unmarked": "ਸਮੱਗਰੀ ਬਾਰੇ ਚੇਤਾਵਨੀ ਜੋੜੋ",
   "compose_form.spoiler_placeholder": "ਸਮੱਗਰੀ ਬਾਰੇ ਚੇਤਾਵਨੀ (ਚੋਣਵਾਂ)",
   "confirmation_modal.cancel": "ਰੱਦ ਕਰੋ",
-  "confirmations.block.block_and_report": "ਰੋਕ ਲਾਓ ਤੇ ਰਿਪੋਰਟ ਕਰੋ",
   "confirmations.block.confirm": "ਪਾਬੰਦੀ",
   "confirmations.delete.confirm": "ਹਟਾਓ",
   "confirmations.delete.message": "ਕੀ ਤੁਸੀਂ ਇਹ ਪੋਸਟ ਨੂੰ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?",
   "confirmations.delete_list.confirm": "ਹਟਾਓ",
   "confirmations.discard_edit_media.confirm": "ਰੱਦ ਕਰੋ",
-  "confirmations.domain_block.confirm": "ਪੂਰੀ ਡੋਮੇਨ ਉੱਤੇ ਪਾਬੰਦੀ ਲਾਓ",
   "confirmations.edit.confirm": "ਸੋਧ",
   "confirmations.logout.confirm": "ਬਾਹਰ ਹੋਵੋ",
   "confirmations.mute.confirm": "ਮੌਨ ਕਰੋ",
@@ -196,7 +194,6 @@
   "lists.replies_policy.followed": "ਕੋਈ ਵੀ ਫ਼ਾਲੋ ਕੀਤਾ ਵਰਤੋਂਕਾਰ",
   "lists.replies_policy.none": "ਕੋਈ ਨਹੀਂ",
   "loading_indicator.label": "ਲੋਡ ਹੋ ਰਿਹਾ ਹੈ…",
-  "mute_modal.duration": "ਮਿਆਦ",
   "navigation_bar.about": "ਇਸ ਬਾਰੇ",
   "navigation_bar.advanced_interface": "ਤਕਨੀਕੀ ਵੈੱਬ ਇੰਟਰਫੇਸ ਵਿੱਚ ਖੋਲ੍ਹੋ",
   "navigation_bar.blocks": "ਪਾਬੰਦੀ ਲਾਏ ਵਰਤੋਂਕਾਰ",
diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json
index acd389da1c2166..782ea9d76298f8 100644
--- a/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@@ -89,6 +89,14 @@
   "announcement.announcement": "Ogłoszenie",
   "attachments_list.unprocessed": "(nieprzetworzone)",
   "audio.hide": "Ukryj dźwięk",
+  "block_modal.remote_users_caveat": "Poprosimy serwer {domain} o uszanowanie twojej decyzji. Zgodność nie jest jednak gwarantowana, bo niektóre serwery mogą inaczej obsługiwać blokowanie. Wpisy publiczne mogą być widoczne dla niezalogowanych użytkowników.",
+  "block_modal.show_less": "Pokaż mniej",
+  "block_modal.show_more": "Pokaż więcej",
+  "block_modal.they_cant_mention": "Użytkownik nie może Cię obserwować ani dodawać wzmianek o Tobie.",
+  "block_modal.they_cant_see_posts": "Użytkownik nie będzie widzieć Twoich wpisów, a Ty jego.",
+  "block_modal.they_will_know": "Użytkownik będzie wiedział, że jest zablokowany.",
+  "block_modal.title": "Zablokować użytkownika?",
+  "block_modal.you_wont_see_mentions": "Nie zobaczysz wpisów, które wspominają tego użytkownika.",
   "boost_modal.combo": "Naciśnij {combo}, aby pominąć to następnym razem",
   "bundle_column_error.copy_stacktrace": "Skopiuj raport o błędzie",
   "bundle_column_error.error.body": "Nie można zrenderować żądanej strony. Może to być spowodowane błędem w naszym kodzie lub problemami z kompatybilnością przeglądarki.",
@@ -160,9 +168,7 @@
   "compose_form.spoiler.unmarked": "Dodaj ostrzeżenie o treści",
   "compose_form.spoiler_placeholder": "Ostrzeżenie o treści (opcjonalne)",
   "confirmation_modal.cancel": "Anuluj",
-  "confirmations.block.block_and_report": "Zablokuj i zgłoś",
   "confirmations.block.confirm": "Zablokuj",
-  "confirmations.block.message": "Czy na pewno chcesz zablokować {name}?",
   "confirmations.cancel_follow_request.confirm": "Wycofaj prośbę",
   "confirmations.cancel_follow_request.message": "Czy na pewno chcesz wycofać prośbę o możliwość obserwowania {name}?",
   "confirmations.delete.confirm": "Usuń",
@@ -171,15 +177,13 @@
   "confirmations.delete_list.message": "Czy na pewno chcesz bezpowrotnie usunąć tą listę?",
   "confirmations.discard_edit_media.confirm": "Odrzuć",
   "confirmations.discard_edit_media.message": "Masz niezapisane zmiany w opisie lub podglądzie, odrzucić je mimo to?",
-  "confirmations.domain_block.confirm": "Ukryj wszystko z domeny",
+  "confirmations.domain_block.confirm": "Blokuj serwer",
   "confirmations.domain_block.message": "Czy na pewno chcesz zablokować całą domenę {domain}? Zwykle lepszym rozwiązaniem jest blokada lub wyciszenie kilku użytkowników.",
   "confirmations.edit.confirm": "Edytuj",
   "confirmations.edit.message": "Edytowanie wpisu nadpisze wiadomość, którą obecnie piszesz. Czy na pewno chcesz to zrobić?",
   "confirmations.logout.confirm": "Wyloguj",
   "confirmations.logout.message": "Czy na pewno chcesz się wylogować?",
   "confirmations.mute.confirm": "Wycisz",
-  "confirmations.mute.explanation": "To schowa ich i wspominające ich posty, ale wciąż pozwoli im widzieć twoje posty i obserwować cię.",
-  "confirmations.mute.message": "Czy na pewno chcesz wyciszyć {name}?",
   "confirmations.redraft.confirm": "Usuń i przeredaguj",
   "confirmations.redraft.message": "Czy na pewno chcesz usunąć i przeredagować ten wpis? Polubienia i podbicia zostaną utracone, a odpowiedzi do oryginalnego wpisu zostaną osierocone.",
   "confirmations.reply.confirm": "Odpowiedz",
@@ -205,6 +209,27 @@
   "dismissable_banner.explore_statuses": "Obecnie te wpisy z tego serwera i pozostałych serwerów w zdecentralizowanej sieci zyskują popularność na tym serwerze.",
   "dismissable_banner.explore_tags": "Te hasztagi obecnie zyskują popularność wśród osób z tego serwera i pozostałych w zdecentralizowanej sieci.",
   "dismissable_banner.public_timeline": "Są to najnowsze publiczne wpisy osób w serwisie społecznościowym, które obserwują ludzie w serwisie {domain}.",
+  "domain_block_modal.block": "Blokuj serwer",
+  "domain_block_modal.block_account_instead": "Zamiast tego zablokuj @{name}",
+  "domain_block_modal.they_can_interact_with_old_posts": "Ludzie z tego serwera mogą wchodzić w interakcje z Twoimi starymi wpisami.",
+  "domain_block_modal.they_cant_follow": "Nikt z tego serwera nie może Cię obserwować.",
+  "domain_block_modal.they_wont_know": "Użytkownik nie dowie się, że został zablokowany.",
+  "domain_block_modal.title": "Zablokować domenę?",
+  "domain_block_modal.you_will_lose_followers": "Wszyscy twoi obserwujący z tego serwera zostaną usunięci.",
+  "domain_block_modal.you_wont_see_posts": "Nie zobaczysz postów ani powiadomień od użytkowników na tym serwerze.",
+  "domain_pill.activitypub_lets_connect": "Pozwala połączyć się z ludźmi na Mastodonie, jak i na innych serwisach społecznościowych.",
+  "domain_pill.activitypub_like_language": "ActivityPub jest językiem używanym przez Mastodon do wymiany danych z innymi serwisami społecznościowymi.",
+  "domain_pill.server": "Serwer",
+  "domain_pill.their_handle": "Uchwyt:",
+  "domain_pill.their_server": "Cyfrowy dom, w którym znajdują się wszystkie wpisy.",
+  "domain_pill.their_username": "Unikalny identyfikator na serwerze. Możliwe jest znalezienie użytkowników o tej samej nazwie użytkownika na różnych serwerach.",
+  "domain_pill.username": "Nazwa użytkownika",
+  "domain_pill.whats_in_a_handle": "Co zawiera uchwyt użytkownika?",
+  "domain_pill.who_they_are": "Ponieważ uchwyty mówią kto jest kim i gdzie się znajduje, możesz wchodzić w interakcje z ludźmi korzystającymi z <button>serwisów opartych o ActivityPub</button>.",
+  "domain_pill.who_you_are": "Ponieważ Twój uchwyt mówi kim jesteś i gdzie się znajdujesz, inni mogą wchodzić z Tobą w interakcje korzystając z <button>serwisów opartych o ActivityPub</button>.",
+  "domain_pill.your_handle": "Twój uchwyt:",
+  "domain_pill.your_server": "Twój cyfrowy dom, w którym żyją wszystkie Twoje wpisy. Nie lubisz tego? Zmień serwer w dowolnym momencie i przenieś swoich obserwujących.",
+  "domain_pill.your_username": "Twój unikalny identyfikator na tym serwerze. Użytkownicy o tej samej nazwie mogą współistnieć na różnych serwerach.",
   "embed.instructions": "Osadź ten wpis na swojej stronie wklejając poniższy kod.",
   "embed.preview": "Będzie to wyglądać tak:",
   "emoji_button.activity": "Aktywność",
@@ -402,9 +427,15 @@
   "loading_indicator.label": "Ładowanie…",
   "media_gallery.toggle_visible": "Przełącz widoczność",
   "moved_to_account_banner.text": "Twoje konto {disabledAccount} jest obecnie wyłączone, ponieważ zostało przeniesione na {movedToAccount}.",
-  "mute_modal.duration": "Czas",
-  "mute_modal.hide_notifications": "Chcesz ukryć powiadomienia od tego użytkownika?",
-  "mute_modal.indefinite": "Nieokreślony",
+  "mute_modal.hide_from_notifications": "Ukryj z powiadomień",
+  "mute_modal.hide_options": "Ukryj opcje",
+  "mute_modal.indefinite": "Do ręcznego usunięcia wyciszenia",
+  "mute_modal.show_options": "Pokaż opcje",
+  "mute_modal.they_can_mention_and_follow": "Użytkownik może Cię obserwować oraz dodawać wzmianki, ale Ty ich nie zobaczysz.",
+  "mute_modal.they_wont_know": "Użytkownik nie dowie się, że został wyciszony.",
+  "mute_modal.title": "Wyciszyć użytkownika?",
+  "mute_modal.you_wont_see_mentions": "Nie zobaczysz wpisów, które wspominają tego użytkownika.",
+  "mute_modal.you_wont_see_posts": "Użytkownik dalej będzie widzieć Twoje posty, ale Ty nie będziesz widzieć jego.",
   "navigation_bar.about": "O serwerze",
   "navigation_bar.advanced_interface": "Otwórz w zaawansowanym interfejsie użytkownika",
   "navigation_bar.blocks": "Zablokowani użytkownicy",
diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json
index 585052de918413..28a18667ae6450 100644
--- a/app/javascript/mastodon/locales/pt-BR.json
+++ b/app/javascript/mastodon/locales/pt-BR.json
@@ -89,6 +89,10 @@
   "announcement.announcement": "Comunicados",
   "attachments_list.unprocessed": "(não processado)",
   "audio.hide": "Ocultar áudio",
+  "block_modal.show_less": "Mostrar menos",
+  "block_modal.show_more": "Mostrar mais",
+  "block_modal.title": "Bloquear usuário?",
+  "block_modal.you_wont_see_mentions": "Você não verá publicações que os mencionem.",
   "boost_modal.combo": "Pressione {combo} para pular isso na próxima vez",
   "bundle_column_error.copy_stacktrace": "Copiar relatório do erro",
   "bundle_column_error.error.body": "A página solicitada não pôde ser renderizada. Pode ser devido a um erro no nosso código, ou um problema de compatibilidade do seu navegador.",
@@ -160,9 +164,7 @@
   "compose_form.spoiler.unmarked": "Sem Aviso de Conteúdo",
   "compose_form.spoiler_placeholder": "Aviso de conteúdo (opcional)",
   "confirmation_modal.cancel": "Cancelar",
-  "confirmations.block.block_and_report": "Bloquear e denunciar",
   "confirmations.block.confirm": "Bloquear",
-  "confirmations.block.message": "Você tem certeza de que deseja bloquear {name}?",
   "confirmations.cancel_follow_request.confirm": "Cancelar a solicitação",
   "confirmations.cancel_follow_request.message": "Tem certeza de que deseja cancelar seu pedido para seguir {name}?",
   "confirmations.delete.confirm": "Excluir",
@@ -171,15 +173,12 @@
   "confirmations.delete_list.message": "Você tem certeza de que deseja excluir esta lista?",
   "confirmations.discard_edit_media.confirm": "Descartar",
   "confirmations.discard_edit_media.message": "Há mudanças não salvas na descrição ou pré-visualização da mídia. Descartar assim mesmo?",
-  "confirmations.domain_block.confirm": "Bloquear instância",
   "confirmations.domain_block.message": "Você tem certeza de que deseja bloquear tudo de {domain}? Você não verá mais o conteúdo desta instância em nenhuma linha do tempo pública ou nas suas notificações. Seus seguidores desta instância serão removidos.",
   "confirmations.edit.confirm": "Editar",
   "confirmations.edit.message": "Editar agora irá substituir a mensagem que está sendo criando. Tem certeza de que deseja continuar?",
   "confirmations.logout.confirm": "Sair",
   "confirmations.logout.message": "Você tem certeza de que deseja sair?",
   "confirmations.mute.confirm": "Silenciar",
-  "confirmations.mute.explanation": "Isso ocultará toots do usuário e toots que o mencionam, mas ainda permitirá que ele veja teus toots e te siga.",
-  "confirmations.mute.message": "Você tem certeza de que deseja silenciar {name}?",
   "confirmations.redraft.confirm": "Excluir e rascunhar",
   "confirmations.redraft.message": "Você tem certeza de que quer apagar essa postagem e rascunhá-la? Favoritos e impulsos serão perdidos, e respostas à postagem original ficarão órfãs.",
   "confirmations.reply.confirm": "Responder",
@@ -205,6 +204,8 @@
   "dismissable_banner.explore_statuses": "Estas são postagens de toda a rede social que estão ganhando tração hoje. Postagens mais recentes com mais impulsos e favoritos têm classificações mais altas.",
   "dismissable_banner.explore_tags": "Estas hashtags estão ganhando popularidade no momento entre as pessoas deste e de outros servidores da rede descentralizada.",
   "dismissable_banner.public_timeline": "Estas são as publicações públicas mais recentes de pessoas na rede social que pessoas em {domain} seguem.",
+  "domain_block_modal.they_can_interact_with_old_posts": "Pessoas deste servidor podem interagir com suas publicações antigas.",
+  "domain_block_modal.they_cant_follow": "Ninguém deste servidor pode lhe seguir.",
   "embed.instructions": "Incorpore este toot no seu site ao copiar o código abaixo.",
   "embed.preview": "Aqui está como vai ficar:",
   "emoji_button.activity": "Atividade",
@@ -401,9 +402,13 @@
   "loading_indicator.label": "Carregando…",
   "media_gallery.toggle_visible": "{number, plural, one {Ocultar mídia} other {Ocultar mídias}}",
   "moved_to_account_banner.text": "Sua conta {disabledAccount} está desativada porque você a moveu para {movedToAccount}.",
-  "mute_modal.duration": "Duração",
-  "mute_modal.hide_notifications": "Ocultar notificações deste usuário?",
-  "mute_modal.indefinite": "Indefinido",
+  "mute_modal.hide_options": "Ocultar opções",
+  "mute_modal.show_options": "Mostrar opções",
+  "mute_modal.they_can_mention_and_follow": "Eles podem mencionar e seguir você, mas você não os verá.",
+  "mute_modal.they_wont_know": "Eles não saberão que foram silenciados.",
+  "mute_modal.title": "Silenciar usuário?",
+  "mute_modal.you_wont_see_mentions": "Você não verá publicações que os mencionem.",
+  "mute_modal.you_wont_see_posts": "Eles ainda poderão ver suas publicações, mas você não verá as deles.",
   "navigation_bar.about": "Sobre",
   "navigation_bar.advanced_interface": "Ativar na interface web avançada",
   "navigation_bar.blocks": "Usuários bloqueados",
diff --git a/app/javascript/mastodon/locales/pt-PT.json b/app/javascript/mastodon/locales/pt-PT.json
index c5a837a34c2ed0..b1145f64d506dc 100644
--- a/app/javascript/mastodon/locales/pt-PT.json
+++ b/app/javascript/mastodon/locales/pt-PT.json
@@ -160,9 +160,7 @@
   "compose_form.spoiler.unmarked": "Juntar um aviso de conteúdo",
   "compose_form.spoiler_placeholder": "Aviso de conteúdo (opcional)",
   "confirmation_modal.cancel": "Cancelar",
-  "confirmations.block.block_and_report": "Bloquear e Denunciar",
   "confirmations.block.confirm": "Bloquear",
-  "confirmations.block.message": "De certeza que queres bloquear {name}?",
   "confirmations.cancel_follow_request.confirm": "Retirar pedido",
   "confirmations.cancel_follow_request.message": "Tem a certeza que pretende retirar o pedido para seguir {name}?",
   "confirmations.delete.confirm": "Eliminar",
@@ -171,15 +169,12 @@
   "confirmations.delete_list.message": "Tens a certeza de que deseja eliminar permanentemente esta lista?",
   "confirmations.discard_edit_media.confirm": "Descartar",
   "confirmations.discard_edit_media.message": "Tem alterações por guardar na descrição ou pré-visualização do conteúdo. Descartar mesmo assim?",
-  "confirmations.domain_block.confirm": "Esconder tudo deste domínio",
   "confirmations.domain_block.message": "De certeza que queres bloquear completamente o domínio {domain}? Na maioria dos casos, silenciar ou bloquear alguns utilizadores é suficiente e é o recomendado. Não irás ver conteúdo daquele domínio em cronologia alguma nem nas tuas notificações. Os teus seguidores daquele domínio serão removidos.",
   "confirmations.edit.confirm": "Editar",
   "confirmations.edit.message": "Editar agora irá sobrescrever a mensagem que está a compor. Tem a certeza de que deseja continuar?",
   "confirmations.logout.confirm": "Terminar sessão",
   "confirmations.logout.message": "Tem a certeza de que quer terminar a sessão?",
   "confirmations.mute.confirm": "Silenciar",
-  "confirmations.mute.explanation": "Isto irá esconder publicações deles ou publicações que os mencionem, mas irá permitir que vejam as suas publicações e sejam seus seguidores.",
-  "confirmations.mute.message": "De certeza que queres silenciar {name}?",
   "confirmations.redraft.confirm": "Eliminar & reescrever",
   "confirmations.redraft.message": "Tem a certeza de que quer eliminar e reescrever esta publicação? Os favoritos e partilhas perder-se-ão e as respostas à publicação original ficarão órfãs.",
   "confirmations.reply.confirm": "Responder",
@@ -402,9 +397,6 @@
   "loading_indicator.label": "A carregar…",
   "media_gallery.toggle_visible": "Alternar visibilidade",
   "moved_to_account_banner.text": "A sua conta {disabledAccount} está, no momento, desativada, porque você migrou para {movedToAccount}.",
-  "mute_modal.duration": "Duração",
-  "mute_modal.hide_notifications": "Esconder notificações deste utilizador?",
-  "mute_modal.indefinite": "Indefinidamente",
   "navigation_bar.about": "Sobre",
   "navigation_bar.advanced_interface": "Abrir na interface web avançada",
   "navigation_bar.blocks": "Utilizadores bloqueados",
diff --git a/app/javascript/mastodon/locales/ro.json b/app/javascript/mastodon/locales/ro.json
index 37e999053cead9..0aef0ebd9617ee 100644
--- a/app/javascript/mastodon/locales/ro.json
+++ b/app/javascript/mastodon/locales/ro.json
@@ -155,9 +155,7 @@
   "compose_form.spoiler.unmarked": "Adaugă un avertisment privind conținutul",
   "compose_form.spoiler_placeholder": "Atenționare de conținut (opțional)",
   "confirmation_modal.cancel": "Anulează",
-  "confirmations.block.block_and_report": "Blochează și raportează",
   "confirmations.block.confirm": "Blochează",
-  "confirmations.block.message": "Ești sigur că vrei să blochezi pe {name}?",
   "confirmations.cancel_follow_request.confirm": "Retrage cererea",
   "confirmations.cancel_follow_request.message": "Sunteți sigur că doriți să retrageți cererea dvs. de urmărire pentru {name}?",
   "confirmations.delete.confirm": "Elimină",
@@ -166,15 +164,12 @@
   "confirmations.delete_list.message": "Ești sigur că vrei să elimini definitiv această listă?",
   "confirmations.discard_edit_media.confirm": "Renunță",
   "confirmations.discard_edit_media.message": "Ai modificări nesalvate în descrierea sau previzualizarea media, renunți oricum?",
-  "confirmations.domain_block.confirm": "Blochează întregul domeniu",
   "confirmations.domain_block.message": "Ești absolut sigur că vrei să blochezi tot domeniul {domain}? În cele mai multe cazuri, raportarea sau blocarea anumitor lucruri este suficientă și de preferat. Nu vei mai vedea niciun conținut din acest domeniu în vreun flux public sau în vreo notificare. Abonații tăi din acest domeniu vor fi eliminați.",
   "confirmations.edit.confirm": "Modifică",
   "confirmations.edit.message": "Editarea acum va suprascrie mesajul pe care îl compuneți în prezent. Sunteți sigur că vreți să continuați?",
   "confirmations.logout.confirm": "Deconectare",
   "confirmations.logout.message": "Ești sigur că vrei să te deconectezi?",
   "confirmations.mute.confirm": "Ignoră",
-  "confirmations.mute.explanation": "Postările acestei persoane și postările în care este menționată vor fi ascunse, însă tot va putea să îți vadă postările și să se aboneze la tine.",
-  "confirmations.mute.message": "Ești sigur că vrei să ignori pe {name}?",
   "confirmations.redraft.confirm": "Șterge și scrie din nou",
   "confirmations.reply.confirm": "Răspunde",
   "confirmations.reply.message": "Dacă răspunzi acum, mesajul pe care îl scrii în acest moment va fi șters. Ești sigur că vrei să continui?",
@@ -370,9 +365,6 @@
   "load_pending": "{count, plural, one {# element nou} other {# elemente noi}}",
   "media_gallery.toggle_visible": "{number, plural, one {Ascunde imaginea} other {Ascunde imaginile}}",
   "moved_to_account_banner.text": "Contul tău {disabledAccount} este în acest moment dezactivat deoarece te-ai mutat la {movedToAccount}.",
-  "mute_modal.duration": "Durata",
-  "mute_modal.hide_notifications": "Ascunde notificările de la acest utilizator?",
-  "mute_modal.indefinite": "Nedeterminat",
   "navigation_bar.about": "Despre",
   "navigation_bar.advanced_interface": "Deschide în interfața web avansată",
   "navigation_bar.blocks": "Utilizatori blocați",
diff --git a/app/javascript/mastodon/locales/ru.json b/app/javascript/mastodon/locales/ru.json
index 917b8f49654319..7a60f3bb7c770f 100644
--- a/app/javascript/mastodon/locales/ru.json
+++ b/app/javascript/mastodon/locales/ru.json
@@ -160,9 +160,7 @@
   "compose_form.spoiler.unmarked": "Текст не скрыт",
   "compose_form.spoiler_placeholder": "Предупреждение о контенте (опционально)",
   "confirmation_modal.cancel": "Отмена",
-  "confirmations.block.block_and_report": "Заблокировать и пожаловаться",
   "confirmations.block.confirm": "Заблокировать",
-  "confirmations.block.message": "Вы уверены, что хотите заблокировать {name}?",
   "confirmations.cancel_follow_request.confirm": "Отменить запрос",
   "confirmations.cancel_follow_request.message": "Вы уверены, что хотите отозвать свой запрос на подписку {name}?",
   "confirmations.delete.confirm": "Удалить",
@@ -171,15 +169,12 @@
   "confirmations.delete_list.message": "Вы действительно хотите навсегда удалить этот список?",
   "confirmations.discard_edit_media.confirm": "Отменить",
   "confirmations.discard_edit_media.message": "У вас есть несохранённые изменения описания мультимедиа или предпросмотра, отменить их?",
-  "confirmations.domain_block.confirm": "Да, заблокировать узел",
   "confirmations.domain_block.message": "Вы точно уверены, что хотите заблокировать {domain} полностью? В большинстве случаев нескольких блокировок и игнорирований вполне достаточно. Вы перестанете видеть публичную ленту и уведомления оттуда. Ваши подписчики из этого домена будут удалены.",
   "confirmations.edit.confirm": "Редактировать",
   "confirmations.edit.message": "В данный момент, редактирование перезапишет составляемое вами сообщение. Вы уверены, что хотите продолжить?",
   "confirmations.logout.confirm": "Выйти",
   "confirmations.logout.message": "Вы уверены, что хотите выйти?",
   "confirmations.mute.confirm": "Игнорировать",
-  "confirmations.mute.explanation": "Это действие скроет посты данного пользователя и те, в которых он упоминается, но при этом он по-прежнему сможет подписаться и смотреть ваши посты.",
-  "confirmations.mute.message": "Вы уверены, что хотите добавить {name} в список игнорируемых?",
   "confirmations.redraft.confirm": "Удалить и исправить",
   "confirmations.redraft.message": "Вы уверены, что хотите удалить и переписать этот пост? Отметки «избранного», продвижения и ответы к оригинальному посту будут удалены.",
   "confirmations.reply.confirm": "Ответить",
@@ -393,9 +388,6 @@
   "loading_indicator.label": "Загрузка…",
   "media_gallery.toggle_visible": "Показать/скрыть {number, plural, =1 {изображение} other {изображения}}",
   "moved_to_account_banner.text": "Ваша учетная запись {disabledAccount} в настоящее время заморожена, потому что вы переехали на {movedToAccount}.",
-  "mute_modal.duration": "Продолжительность",
-  "mute_modal.hide_notifications": "Скрыть уведомления от этого пользователя?",
-  "mute_modal.indefinite": "Не определена",
   "navigation_bar.about": "О проекте",
   "navigation_bar.advanced_interface": "Включить многоколоночный интерфейс",
   "navigation_bar.blocks": "Заблокированные пользователи",
diff --git a/app/javascript/mastodon/locales/ry.json b/app/javascript/mastodon/locales/ry.json
index 59de0397777655..de3d6191716b72 100644
--- a/app/javascript/mastodon/locales/ry.json
+++ b/app/javascript/mastodon/locales/ry.json
@@ -15,5 +15,42 @@
   "account.block_domain": "Заблоковати домен {domain}",
   "account.block_short": "Заблоковати",
   "account.blocked": "Заблоковано",
-  "account.browse_more_on_origin_server": "Позирайте бульше на ориґіналнум профілю"
+  "account.browse_more_on_origin_server": "Позирайте бульше на ориґіналнум профілю",
+  "account.copy": "Зкопіровати удкликованя на профіл",
+  "account.domain_blocked": "Домен заблокованый",
+  "account.edit_profile": "Управити профіл",
+  "account.endorse": "Указовати на профілови",
+  "account.featured_tags.last_status_at": "Датум послідньої публикації {date}",
+  "account.featured_tags.last_status_never": "Ниє публикацій",
+  "account.follow": "Пудписати ся",
+  "account.followers": "Пудписникы",
+  "account.followers.empty": "У сього хосновача раз ниє пудписникув.",
+  "account.following": "Слідуєте",
+  "account.follows.empty": "Сись хосновач щи никого не слідує.",
+  "account.go_to_profile": "Перейти на профіл",
+  "account.languages": "Поміняти убрані языкы",
+  "account.link_verified_on": "Властность сього удкликованя было звірено {date}",
+  "account.media": "Медіа",
+  "account.moved_to": "Хосновач {name} указав, ож новый профіл йим є:",
+  "account.mute_notifications_short": "Стишити голошіня",
+  "account.mute_short": "Стишити",
+  "account.muted": "Стишено",
+  "account.mutual": "Взайомно",
+  "account.no_bio": "Описа ниє.",
+  "account.open_original_page": "Удоперти ориґіналну сторунку",
+  "account.posts": "Публикації",
+  "account.posts_with_replies": "Публикації тай удповіді",
+  "account.report": "Скарговати ся на {name}",
+  "account.requested": "Чекат ся на пудтвердженя. Нажміт убы удмінити запрос на слідованя",
+  "account.requested_follow": "Хосновач {name} просит ся пудписати ся на вас",
+  "account.share": "Пошырити профіл хосновача {name}",
+  "account.unblock": "Розблоковати {name}",
+  "account.unblock_domain": "Розблоковати домен {domain}",
+  "bundle_column_error.return": "Вернути ся на головну",
+  "bundle_column_error.routing.body": "Не можеме найти сяку сторунку. Бизувні сьте, ож URL у адресному шорикови є добрый?",
+  "bundle_column_error.routing.title": "404",
+  "bundle_modal_error.close": "Заперти",
+  "bundle_modal_error.message": "Штось ся показило, закидь сьме ладовали сись компонент.",
+  "bundle_modal_error.retry": "Попробовати зась",
+  "closed_registrations.other_server_instructions": "Mastodon є децентралізованов платформов, можете си учинити профіл и на другому серверови тай комуніковати из сим."
 }
diff --git a/app/javascript/mastodon/locales/sa.json b/app/javascript/mastodon/locales/sa.json
index 8620b348e340a6..99aa46bc89f7ab 100644
--- a/app/javascript/mastodon/locales/sa.json
+++ b/app/javascript/mastodon/locales/sa.json
@@ -135,9 +135,7 @@
   "compose_form.spoiler.marked": "प्रच्छान्नाक्षरं विद्यते",
   "compose_form.spoiler.unmarked": "अप्रच्छन्नाक्षरं विद्यते",
   "confirmation_modal.cancel": "नश्यताम्",
-  "confirmations.block.block_and_report": "अवरुध्य आविद्यताम्",
   "confirmations.block.confirm": "निषेधः",
-  "confirmations.block.message": "निश्चयेनाऽवरोधो विधेयः {name}?",
   "confirmations.cancel_follow_request.confirm": "अनुरोधनमपनय",
   "confirmations.cancel_follow_request.message": "{name} अनुसरणस्यानुरोधमपनेतुं दृढीकृतं वा?",
   "confirmations.delete.confirm": "मार्जय",
@@ -146,15 +144,12 @@
   "confirmations.delete_list.message": "सूचिरियं निश्चयेन स्थायित्वेन च मार्जितुमिच्छसि वा?",
   "confirmations.discard_edit_media.confirm": "अपास्य",
   "confirmations.discard_edit_media.message": "माध्यमवर्णनां प्रदर्शनञ्च अरक्षितानि परिवर्तनानि सन्ति, तानि अपासितुमिच्छसि वा?",
-  "confirmations.domain_block.confirm": "निषिद्धः प्रदेशः क्रियताम्",
   "confirmations.domain_block.message": "नूनं निश्चयेनैव विनष्टुमिच्छति पूर्णप्रदेशमेव {domain} ? अधिकांशसन्दर्भेऽस्थायित्वेन निषेधता निःशब्दत्वञ्च पर्याप्तं चयनीयञ्च । न तस्मात् प्रदेशात्सर्वे विषया द्रष्टुमशक्याः किस्यांश्चिदपि सर्वजनिकसमयतालिकायां वा स्वीयसूचनापटले । सर्वेऽनुसर्तारस्ते प्रदेशात् ये सन्ति ते नश्यन्ते ।",
   "confirmations.edit.confirm": "सम्पादय",
   "confirmations.edit.message": "सम्पादनमिदानीं लिख्यते तर्हि पूर्वलिखितसन्देशं विनश्य पुनः लिख्यते। निश्चयेनैवं कर्तव्यम्?",
   "confirmations.logout.confirm": "बहिर्गम्यताम्",
   "confirmations.logout.message": "निश्चयेनैव बहिर्गमनं वाञ्छितम्?",
   "confirmations.mute.confirm": "निःशब्दम्",
-  "confirmations.mute.explanation": "एतेन तेषां पत्राणि तथा च यत्र ते उल्लिखिताः तानि छाद्यन्ते, किन्त्वेवं सत्यपि ते त्वामनुसर्तुं ततश्च पत्राणि द्रष्टुं शक्नुवन्ति ।",
-  "confirmations.mute.message": "किं निश्चयेन निःशब्दं भवेत् {name} मित्रमेतत् ?",
   "confirmations.redraft.confirm": "मार्जय पुनश्च लिख्यताम्",
   "confirmations.reply.confirm": "उत्तरम्",
   "confirmations.reply.message": "प्रत्युत्तरमिदानीं लिख्यते तर्हि पूर्वलिखितसन्देशं विनश्य पुनः लिख्यते । निश्चयेनैवं कर्तव्यम् ?",
@@ -334,9 +329,6 @@
   "load_pending": "{count, plural, one {# नूतनवस्तु} other {# नूतनवस्तूनि}}",
   "media_gallery.toggle_visible": "{number, plural, one {चित्रं प्रच्छादय} other {चित्राणि प्रच्छादय}}",
   "moved_to_account_banner.text": "तव एकौण्ट् {disabledAccount} अधुना निष्कृतो यतोहि {movedToAccount} अस्मिन्त्वमसार्षीः।",
-  "mute_modal.duration": "परिमाणम्",
-  "mute_modal.hide_notifications": "अस्मादुपभोक्तुर्विज्ञापनानि प्रच्छादयितुमिच्छसि वा?",
-  "mute_modal.indefinite": "अ॑परिमितम्",
   "navigation_bar.about": "विषये",
   "navigation_bar.blocks": "निषिद्धभोक्तारः",
   "navigation_bar.bookmarks": "पुटचिह्नानि",
diff --git a/app/javascript/mastodon/locales/sc.json b/app/javascript/mastodon/locales/sc.json
index a3d11d7dbddee3..1a5f2ef0f396be 100644
--- a/app/javascript/mastodon/locales/sc.json
+++ b/app/javascript/mastodon/locales/sc.json
@@ -106,21 +106,16 @@
   "compose_form.spoiler.marked": "Boga avisu de cuntenutu",
   "compose_form.spoiler.unmarked": "Agiunghe avisu de cuntenutu",
   "confirmation_modal.cancel": "Annulla",
-  "confirmations.block.block_and_report": "Bloca e signala",
   "confirmations.block.confirm": "Bloca",
-  "confirmations.block.message": "Seguru chi boles blocare {name}?",
   "confirmations.delete.confirm": "Cantzella",
   "confirmations.delete.message": "Seguru chi boles cantzellare custa publicatzione?",
   "confirmations.delete_list.confirm": "Cantzella",
   "confirmations.delete_list.message": "Seguru chi boles cantzellare custa lista in manera permanente?",
-  "confirmations.domain_block.confirm": "Bloca totu su domìniu",
   "confirmations.domain_block.message": "Boles de seguru, ma a beru a beru, blocare {domain}? In sa parte manna de is casos, pagos blocos o silentziamentos de persones sunt sufitzientes e preferìbiles. No as a bìdere cuntenutos dae custu domìniu in peruna lìnia de tempus pùblica o in is notìficas tuas. Sa gente chi ti sighit dae cussu domìniu at a èssere bogada.",
   "confirmations.edit.confirm": "Modìfica",
   "confirmations.logout.confirm": "Essi·nche",
   "confirmations.logout.message": "Seguru chi boles essire?",
   "confirmations.mute.confirm": "A sa muda",
-  "confirmations.mute.explanation": "Custu at a cuare is publicatziones issoro e is messàgios chi ddos mèntovant, ma ant a pòdere bìdere is messàgios tuos e t'ant a pòdere sighire.",
-  "confirmations.mute.message": "Seguru chi boles pònnere a {name} a sa muda?",
   "confirmations.redraft.confirm": "Cantzella e torra a fàghere",
   "confirmations.reply.confirm": "Risponde",
   "confirmations.reply.message": "Rispondende immoe as a subrascrìere su messàgiu chi ses iscriende. Seguru chi boles sighire?",
@@ -265,9 +260,6 @@
   "load_pending": "{count, plural, one {# elementu nou} other {# elementos noos}}",
   "loading_indicator.label": "Carrighende…",
   "media_gallery.toggle_visible": "Cua {number, plural, one {immàgine} other {immàgines}}",
-  "mute_modal.duration": "Durada",
-  "mute_modal.hide_notifications": "Boles cuare is notìficas de custa persone?",
-  "mute_modal.indefinite": "Indefinida",
   "navigation_bar.about": "Informatziones",
   "navigation_bar.blocks": "Persones blocadas",
   "navigation_bar.bookmarks": "Sinnalibros",
diff --git a/app/javascript/mastodon/locales/sco.json b/app/javascript/mastodon/locales/sco.json
index 7d6997131ef906..ba62c11f71a715 100644
--- a/app/javascript/mastodon/locales/sco.json
+++ b/app/javascript/mastodon/locales/sco.json
@@ -131,9 +131,7 @@
   "compose_form.spoiler.marked": "Tak aff the content warnin",
   "compose_form.spoiler.unmarked": "Pit on a content warnin",
   "confirmation_modal.cancel": "Stap",
-  "confirmations.block.block_and_report": "Dingie & Clype",
   "confirmations.block.confirm": "Dingie",
-  "confirmations.block.message": "Ye shair thit ye'r wantin tae dingie {name}?",
   "confirmations.cancel_follow_request.confirm": "Tak back yer request",
   "confirmations.cancel_follow_request.message": "Ye shair thit ye'r wantin tae tak back yer request fir tae follae {name}?",
   "confirmations.delete.confirm": "Delete",
@@ -142,13 +140,10 @@
   "confirmations.delete_list.message": "Ye shair thit ye'r wantin fir tae delete this post fir ever?",
   "confirmations.discard_edit_media.confirm": "Fling awa",
   "confirmations.discard_edit_media.message": "Ye'v chynges tae the media description or preview thit ye'v no saved, fling them awa onie weys?",
-  "confirmations.domain_block.confirm": "Dingie the hail domain",
   "confirmations.domain_block.message": "Ye a hunner percent shair thit ye'r wantin tae dingie the hail {domain}? In maist cases a haunfae tairgtit dingies an wheeshts are eneuch an preferit. Ye wullnae see content fae that domain in onie public timelines or in yer notes. Yer follaers fae that domain wull be taen awa.",
   "confirmations.logout.confirm": "Log oot",
   "confirmations.logout.message": "Ye shair thit ye'r wantin tae log oot?",
   "confirmations.mute.confirm": "Wheesht",
-  "confirmations.mute.explanation": "This'll hide posts fae them an posts mentionin them, but it'll stull alloo them tae see yer posts an follae ye.",
-  "confirmations.mute.message": "Ye sure thit ye'r wantin tae wheesht {name}?",
   "confirmations.redraft.confirm": "Delete an stert anew",
   "confirmations.reply.confirm": "Reply",
   "confirmations.reply.message": "Replyin noo'll owerwrite the message ye'r screivin the noo. Ur ye sure thit ye'r wantin tae dae that?",
@@ -319,9 +314,6 @@
   "load_pending": "{count, plural, one {# new item} other {# new items}}",
   "media_gallery.toggle_visible": "{number, plural, one {Hide image} other {Hide images}}",
   "moved_to_account_banner.text": "Yer accoont {disabledAccount} is disabilt the noo acause ye flittit tae {movedToAccount}.",
-  "mute_modal.duration": "Lenth",
-  "mute_modal.hide_notifications": "Hide notifications fae this uiser?",
-  "mute_modal.indefinite": "Indefinite",
   "navigation_bar.about": "Aboot",
   "navigation_bar.blocks": "Dingied uisers",
   "navigation_bar.bookmarks": "Buikmairks",
diff --git a/app/javascript/mastodon/locales/si.json b/app/javascript/mastodon/locales/si.json
index e310a63edceac2..4cb81a760c74ae 100644
--- a/app/javascript/mastodon/locales/si.json
+++ b/app/javascript/mastodon/locales/si.json
@@ -108,21 +108,17 @@
   "compose_form.spoiler.marked": "අන්තර්ගත අවවාදය ඉවත් කරන්න",
   "compose_form.spoiler.unmarked": "අන්තර්ගත අවවාදයක් එක් කරන්න",
   "confirmation_modal.cancel": "අවලංගු",
-  "confirmations.block.block_and_report": "අවහිර කර වාර්තා කරන්න",
   "confirmations.block.confirm": "අවහිර",
-  "confirmations.block.message": "ඔබට {name} අවහිර කිරීමට වුවමනා ද?",
   "confirmations.delete.confirm": "මකන්න",
   "confirmations.delete.message": "ඔබට මෙම ලිපිය මැකීමට වුවමනා ද?",
   "confirmations.delete_list.confirm": "මකන්න",
   "confirmations.delete_list.message": "ඔබට මෙම ලැයිස්තුව සදහටම මැකීමට වුවමනා ද?",
   "confirmations.discard_edit_media.confirm": "ඉවත ලන්න",
   "confirmations.discard_edit_media.message": "ඔබට මාධ්‍ය විස්තරයට හෝ පෙරදසුනට නොසුරකින ලද වෙනස්කම් තිබේ, කෙසේ වෙතත් ඒවා ඉවත දමන්නද?",
-  "confirmations.domain_block.confirm": "සම්පූර්ණ වසම අවහිර කරන්න",
   "confirmations.edit.confirm": "සංස්කරණය",
   "confirmations.logout.confirm": "නික්මෙන්න",
   "confirmations.logout.message": "ඔබට නික්මෙන්න අවශ්‍ය බව විශ්වාසද?",
   "confirmations.mute.confirm": "නිශ්ශබ්ද",
-  "confirmations.mute.message": "{name} නිහඬ කිරීමට වුවමනා ද?",
   "confirmations.reply.confirm": "පිළිතුර",
   "conversation.delete": "සංවාදය මකන්න",
   "conversation.mark_as_read": "කියවූ බව යොදන්න",
@@ -248,8 +244,6 @@
   "lists.replies_policy.none": "කිසිවෙක් නැත",
   "lists.replies_policy.title": "පිළිතුරු පෙන්වන්න:",
   "lists.subheading": "ඔබගේ ලැයිස්තු",
-  "mute_modal.duration": "පරාසය",
-  "mute_modal.hide_notifications": "මෙම පුද්ගලයාගේ දැනුම්දීම් සඟවන්නද?",
   "navigation_bar.about": "පිළිබඳව",
   "navigation_bar.blocks": "අවහිර කළ අය",
   "navigation_bar.bookmarks": "පොත්යොමු",
diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json
index 499ce9794ceff7..8c9238bb9e61fd 100644
--- a/app/javascript/mastodon/locales/sk.json
+++ b/app/javascript/mastodon/locales/sk.json
@@ -160,9 +160,7 @@
   "compose_form.spoiler.unmarked": "Pridať varovanie o obsahu",
   "compose_form.spoiler_placeholder": "Varovanie o obsahu (voliteľné)",
   "confirmation_modal.cancel": "Zruš",
-  "confirmations.block.block_and_report": "Zablokovať a nahlásiť",
   "confirmations.block.confirm": "Zablokovať",
-  "confirmations.block.message": "Určite chcete zablokovať {name}?",
   "confirmations.cancel_follow_request.confirm": "Stiahnuť žiadosť",
   "confirmations.cancel_follow_request.message": "Určite chcete stiahnuť svoju žiadosť o sledovanie {name}?",
   "confirmations.delete.confirm": "Vymazať",
@@ -171,15 +169,12 @@
   "confirmations.delete_list.message": "Určite chcete tento zoznam trvalo vymazať?",
   "confirmations.discard_edit_media.confirm": "Zahodiť",
   "confirmations.discard_edit_media.message": "Máte neuložené zmeny v popise alebo náhľade média, zahodiť ich aj tak?",
-  "confirmations.domain_block.confirm": "Blokovať celú doménu",
   "confirmations.domain_block.message": "Určite chcete blokovať celú doménu {domain}? Vo väčšine prípadov stačí blokovať alebo ignorovať pár konkrétnych účtov, čo aj odporúčame. Obsah z tejto domény neuvidíte v žiadnej verejnej časovej osi ani v upozorneniach. Vaši sledujúci pochádzajúci z tejto domény budú odstránení.",
   "confirmations.edit.confirm": "Upraviť",
   "confirmations.edit.message": "Úpravou prepíšete príspevok, ktorý máte rozpísaný. Určite chcete pokračovať?",
   "confirmations.logout.confirm": "Odhlásiť sa",
   "confirmations.logout.message": "Určite sa chcete odhlásiť?",
   "confirmations.mute.confirm": "Stíšiť",
-  "confirmations.mute.explanation": "Toto nastavenie skryje príspevky od daného účtu alebo príspevky od iných, v ktorých je tento účet spomenutý. Účet bude stále vidieť vaše príspevky a môcť vás sledovať.",
-  "confirmations.mute.message": "Určite chcete stíšiť {name}?",
   "confirmations.redraft.confirm": "Vymazať a prepísať",
   "confirmations.redraft.message": "Určite chcete tento príspevok vymazať a prepísať? Prídete o jeho zdieľania a ohviezdičkovania a odpovede na pôvodný príspevok budú odlúčené.",
   "confirmations.reply.confirm": "Odpovedať",
@@ -400,9 +395,6 @@
   "loading_indicator.label": "Načítavanie…",
   "media_gallery.toggle_visible": "{number, plural, one {Skryť obrázok} other {Skryť obrázky}}",
   "moved_to_account_banner.text": "Váš účet {disabledAccount} je momentálne deaktivovaný, pretože ste sa presunuli na {movedToAccount}.",
-  "mute_modal.duration": "Trvanie",
-  "mute_modal.hide_notifications": "Skryť upozornenia od tohto účtu?",
-  "mute_modal.indefinite": "Bez obmedzenia",
   "navigation_bar.about": "O tomto serveri",
   "navigation_bar.advanced_interface": "Otvoriť v pokročilom webovom rozhraní",
   "navigation_bar.blocks": "Blokované účty",
@@ -653,6 +645,7 @@
   "status.direct": "Súkromne označiť @{name}",
   "status.direct_indicator": "Súkromné označenie",
   "status.edit": "Upraviť",
+  "status.edited": "Naposledy upravený {date}",
   "status.edited_x_times": "Upravený {count, plural, other {{count}×}}",
   "status.embed": "Vložiť",
   "status.favourite": "Ohviezdičkované",
diff --git a/app/javascript/mastodon/locales/sl.json b/app/javascript/mastodon/locales/sl.json
index c96e9291636325..de22e98f07a236 100644
--- a/app/javascript/mastodon/locales/sl.json
+++ b/app/javascript/mastodon/locales/sl.json
@@ -89,6 +89,14 @@
   "announcement.announcement": "Obvestilo",
   "attachments_list.unprocessed": "(neobdelano)",
   "audio.hide": "Skrij zvok",
+  "block_modal.remote_users_caveat": "Od strežnika {domain} bomo zahtevali, da spoštuje vašo odločitev. Izpolnjevanje zahteve ni zagotovljeno, ker nekateri strežniki blokiranja obravnavajo drugače. Javne objave bodo morda še vedno vidne neprijavljenim uporabnikom.",
+  "block_modal.show_less": "Pokaži manj",
+  "block_modal.show_more": "Pokaži več",
+  "block_modal.they_cant_mention": "Ne morejo vas omenjati ali vam slediti.",
+  "block_modal.they_cant_see_posts": "Ne vidijo vaših objav, vi pa ne njihovih.",
+  "block_modal.they_will_know": "Ne morejo videti, da so blokirani.",
+  "block_modal.title": "Blokiraj uporabnika?",
+  "block_modal.you_wont_see_mentions": "Objav, ki jih omenjajo, ne boste videli.",
   "boost_modal.combo": "Če želite preskočiti to, lahko pritisnete {combo}",
   "bundle_column_error.copy_stacktrace": "Kopiraj poročilo o napaki",
   "bundle_column_error.error.body": "Zahtevane strani ni mogoče upodobiti. Vzrok težave je morda hrošč v naši kodi ali pa nezdružljivost z brskalnikom.",
@@ -160,9 +168,7 @@
   "compose_form.spoiler.unmarked": "Dodaj opozorilo o vsebini",
   "compose_form.spoiler_placeholder": "Opozorilo o vsebini (ni obvezno)",
   "confirmation_modal.cancel": "Prekliči",
-  "confirmations.block.block_and_report": "Blokiraj in prijavi",
   "confirmations.block.confirm": "Blokiraj",
-  "confirmations.block.message": "Ali ste prepričani, da želite blokirati {name}?",
   "confirmations.cancel_follow_request.confirm": "Umakni zahtevo",
   "confirmations.cancel_follow_request.message": "Ali ste prepričani, da želite umakniti svojo zahtevo, da bi sledili {name}?",
   "confirmations.delete.confirm": "Izbriši",
@@ -171,15 +177,13 @@
   "confirmations.delete_list.message": "Ali ste prepričani, da želite trajno izbrisati ta seznam?",
   "confirmations.discard_edit_media.confirm": "Opusti",
   "confirmations.discard_edit_media.message": "Imate ne shranjene spremembe za medijski opis ali predogled; jih želite kljub temu opustiti?",
-  "confirmations.domain_block.confirm": "Blokiraj celotno domeno",
+  "confirmations.domain_block.confirm": "Blokiraj strežnik",
   "confirmations.domain_block.message": "Ali ste res, res prepričani, da želite blokirati celotno {domain}? V večini primerov je nekaj ciljnih blokiranj ali utišanj dovolj in boljše. Vsebino iz te domene ne boste videli v javnih časovnicah ali obvestilih. Vaši sledilci iz te domene bodo odstranjeni.",
   "confirmations.edit.confirm": "Uredi",
   "confirmations.edit.message": "Urejanje bo prepisalo sporočilo, ki ga trenutno sestavljate. Ali ste prepričani, da želite nadaljevati?",
   "confirmations.logout.confirm": "Odjava",
   "confirmations.logout.message": "Ali ste prepričani, da se želite odjaviti?",
   "confirmations.mute.confirm": "Utišanje",
-  "confirmations.mute.explanation": "S tem boste skrili objave pred njimi in objave, ki jih omenjajo, še vedno pa bodo lahko videli vaše objave in vam sledili.",
-  "confirmations.mute.message": "Ali ste prepričani, da želite utišati {name}?",
   "confirmations.redraft.confirm": "Izbriši in preoblikuj",
   "confirmations.redraft.message": "Ali ste prepričani, da želite izbrisati ta status in ga preoblikovati? Vzljubi in izpostavitve bodo izgubljeni, odgovori na izvirno objavo pa bodo osiroteli.",
   "confirmations.reply.confirm": "Odgovori",
@@ -205,6 +209,27 @@
   "dismissable_banner.explore_statuses": "Te objave s tega in drugih strežnikov v decentraliziranem omrežju pridobivajo ravno zdaj veliko pozornosti na tem strežniku.",
   "dismissable_banner.explore_tags": "Ravno zdaj dobivajo ti ključniki veliko pozoronosti med osebami na tem in drugih strežnikih decentraliziranega omrežja.",
   "dismissable_banner.public_timeline": "To so najnovejše javne objave oseb z družabnega omrežja, ki jim sledijo osebe na {domain}.",
+  "domain_block_modal.block": "Blokiraj strežnik",
+  "domain_block_modal.block_account_instead": "Namesto tega blokiraj @{name}",
+  "domain_block_modal.they_can_interact_with_old_posts": "Osebe s tega strežnika se lahko odzivajo na vaše stare objave.",
+  "domain_block_modal.they_cant_follow": "Nihče s tega strežnika vam ne more slediti.",
+  "domain_block_modal.they_wont_know": "Ne bodo vedeli, da so blokirani.",
+  "domain_block_modal.title": "Blokiraj domeno?",
+  "domain_block_modal.you_will_lose_followers": "Vsi vaši sledilci s tega strežnika bodo odstranjeni.",
+  "domain_block_modal.you_wont_see_posts": "Objav ali obvestil uporabnikov s tega strežnika ne boste videli.",
+  "domain_pill.activitypub_lets_connect": "Omogoča vam povezovanje in interakcijo z ljudmi, ki niso samo na Mastodonu, ampak tudi na drugih družabnih platformah.",
+  "domain_pill.activitypub_like_language": "Protokol ActivityPub je kot jezik, s katerim se Mastodon pogovarja z drugimi družabnimi omrežji.",
+  "domain_pill.server": "Strežnik",
+  "domain_pill.their_handle": "Njihova ročica:",
+  "domain_pill.their_server": "Njihovo digitalno domovanje, kjer bivajo vse njihove objave.",
+  "domain_pill.their_username": "Njihov edinstveni identifikator na njihovem strežniku. Uporabnike z istim uporabniškim imenom lahko najdete na različnih strežnikih.",
+  "domain_pill.username": "Uporabniško ime",
+  "domain_pill.whats_in_a_handle": "Kaj je v ročici?",
+  "domain_pill.who_they_are": "Ker ročice povedo, kdo je kdo in kje so, ste lahko z osebami v interakciji prek družabnega spleta <button>platform, ki jih poganja ActivityPub</button>.",
+  "domain_pill.who_you_are": "Ker ročice povedo, kdo ste in kje ste, ste lahko z osebami v interakciji prek družabnega spleta <button>platform, ki jih poganja ActivityPub</button>.",
+  "domain_pill.your_handle": "Vaša ročica:",
+  "domain_pill.your_server": "Vaše digitalno domovanje, kjer bivajo vse vaše objave. Vam ta ni všeč? Prenesite ga med strežniki kadar koli in z njim tudi svoje sledilce.",
+  "domain_pill.your_username": "Vaš edinstveni identifikator na tem strežniku. Uporabnike z istim uporabniškim imenom je možno najti na različnih strežnikih.",
   "embed.instructions": "Vstavite to objavo na svojo spletno stran tako, da kopirate spodnjo kodo.",
   "embed.preview": "Tako bo izgledalo:",
   "emoji_button.activity": "Dejavnost",
@@ -402,9 +427,15 @@
   "loading_indicator.label": "Nalaganje …",
   "media_gallery.toggle_visible": "{number, plural,one {Skrij sliko} two {Skrij sliki} other {Skrij slike}}",
   "moved_to_account_banner.text": "Vaš račun {disabledAccount} je trenutno onemogočen, ker ste se prestavili na {movedToAccount}.",
-  "mute_modal.duration": "Trajanje",
-  "mute_modal.hide_notifications": "Ali želite skriti obvestila tega uporabnika?",
-  "mute_modal.indefinite": "Nedoločeno",
+  "mute_modal.hide_from_notifications": "Skrijte se pred obvestili",
+  "mute_modal.hide_options": "Skrij možnosti",
+  "mute_modal.indefinite": "Dokler jim ne povrnem glasu",
+  "mute_modal.show_options": "Pokaži možnosti",
+  "mute_modal.they_can_mention_and_follow": "Lahko vas omenijo ali vam sledijo, vi pa jih ne morete videti.",
+  "mute_modal.they_wont_know": "Ne bodo vedeli, da so utišani.",
+  "mute_modal.title": "Utišaj uporabnika?",
+  "mute_modal.you_wont_see_mentions": "Objav, ki jih omenjajo, ne boste videli.",
+  "mute_modal.you_wont_see_posts": "Še vedno vidijo vaše objave, vi pa ne njihovih.",
   "navigation_bar.about": "O Mastodonu",
   "navigation_bar.advanced_interface": "Odpri v naprednem spletnem vmesniku",
   "navigation_bar.blocks": "Blokirani uporabniki",
diff --git a/app/javascript/mastodon/locales/sq.json b/app/javascript/mastodon/locales/sq.json
index 8c710555944686..dd8f4ad9802490 100644
--- a/app/javascript/mastodon/locales/sq.json
+++ b/app/javascript/mastodon/locales/sq.json
@@ -89,6 +89,14 @@
   "announcement.announcement": "Lajmërim",
   "attachments_list.unprocessed": "(e papërpunuar)",
   "audio.hide": "Fshihe audion",
+  "block_modal.remote_users_caveat": "Do t’i kërkojmë shërbyesit {domain} të respektojë vendimin tuaj. Por, pajtimi s’është i garantuar, ngaqë disa shërbyes mund t’i trajtojnë ndryshe bllokimet. Psotimet publike mundet të jenë ende të dukshme për përdorues pa bërë hyrje në llogari.",
+  "block_modal.show_less": "Shfaq më pak",
+  "block_modal.show_more": "Shfaq më tepër",
+  "block_modal.they_cant_mention": "S’mund t’u përmendin, ose t’ju ndjekin.",
+  "block_modal.they_cant_see_posts": "S’mund të shohin postimet tuaja dhe as ju të tyret.",
+  "block_modal.they_will_know": "Mund të shohin se janë bllokuar.",
+  "block_modal.title": "Të bllokohet përdoruesi?",
+  "block_modal.you_wont_see_mentions": "S’do të shihni postimet ku përmenden.",
   "boost_modal.combo": "Që kjo të anashkalohet herës tjetër, mund të shtypni {combo}",
   "bundle_column_error.copy_stacktrace": "Kopjo raportim gabimi",
   "bundle_column_error.error.body": "Faqja e kërkuar s’u vizatua dot. Kjo mund të vijë nga një e metë në kodin tonë, ose nga një problem përputhshmërie i shfletuesit.",
@@ -160,9 +168,7 @@
   "compose_form.spoiler.unmarked": "Shtoni sinjalizim lënde",
   "compose_form.spoiler_placeholder": "Sinjalizim lënde (opsional)",
   "confirmation_modal.cancel": "Anuloje",
-  "confirmations.block.block_and_report": "Bllokojeni & Raportojeni",
   "confirmations.block.confirm": "Bllokoje",
-  "confirmations.block.message": "Jeni i sigurt se doni të bllokohet {name}?",
   "confirmations.cancel_follow_request.confirm": "Tërhiqeni mbrapsht kërkesën",
   "confirmations.cancel_follow_request.message": "Jeni i sigurt se doni të tërhiqni mbrapsht kërkesën tuaj për ndjekje të {name}?",
   "confirmations.delete.confirm": "Fshije",
@@ -171,15 +177,13 @@
   "confirmations.delete_list.message": "Jeni i sigurt se doni të fshihet përgjithmonë kjo listë?",
   "confirmations.discard_edit_media.confirm": "Hidhe tej",
   "confirmations.discard_edit_media.message": "Keni ndryshime të paruajtura te përshkrimi ose paraparja e medias, të hidhen tej, sido qoftë?",
-  "confirmations.domain_block.confirm": "Bllokoje krejt përkatësinë",
+  "confirmations.domain_block.confirm": "Bllokoje shërbyesin",
   "confirmations.domain_block.message": "Jeni i sigurt, shumë i sigurt se doni të bllokohet krejt {domain}? Në shumicën e rasteve, ndoca bllokime ose heshtime me synim të caktuar janë të mjaftueshme dhe të parapëlqyera. S’keni për të parë lëndë nga kjo përkatësi në ndonjë rrjedhë kohore publike, apo te njoftimet tuaja. Ndjekësit tuaj prej asaj përkatësie do të hiqen.",
   "confirmations.edit.confirm": "Përpunojeni",
   "confirmations.edit.message": "Përpunimi tani do të sjellë mbishkrim të mesazhit që po hartoni aktualisht. Jeni i sigurt se doni të vazhdohet?",
   "confirmations.logout.confirm": "Dilni",
   "confirmations.logout.message": "Jeni i sigurt se doni të dilet?",
   "confirmations.mute.confirm": "Heshtoje",
-  "confirmations.mute.explanation": "Kjo do t’u fshehë postimet dhe përmendje postimesh, por ende do t’u lejojë të shohin postimet tuaja dhe t’ju ndjekin.",
-  "confirmations.mute.message": "Jeni i sigurt se doni të heshtohet {name}?",
   "confirmations.redraft.confirm": "Fshijeni & rihartojeni",
   "confirmations.redraft.message": "Jeni i sigurt se doni të fshihet kjo gjendje dhe të rihartohet? Të parapëlqyerit dhe përforcimet do të humbin, ndërsa përgjigjet te postimi origjinal do të bëhen jetime.",
   "confirmations.reply.confirm": "Përgjigjuni",
@@ -205,6 +209,27 @@
   "dismissable_banner.explore_statuses": "Këto janë postime nga rrjeti shoqëror që po tërheqin vëmendjen tani. Postimet më të reja me më përforcime dhe më të parapëlqyera nga njerëzit renditen më sipër.",
   "dismissable_banner.explore_tags": "Këta hashtag-ë po tërheqin vëmendjen mes personave në këtë shërbyes dhe të tjerë të tillë të rrjetit të decentralizuar mu tani.",
   "dismissable_banner.public_timeline": "Këto janë postimet më të reja publike prej personash në rrjetin shoqëror që ndjekin njerëzit në {domain}.",
+  "domain_block_modal.block": "Bllokoje shërbyesin",
+  "domain_block_modal.block_account_instead": "Blloko @{name} në vend të kësaj",
+  "domain_block_modal.they_can_interact_with_old_posts": "Persona nga ky shërbyes mund të ndërveprojnë me postimet tuaja të vjetra.",
+  "domain_block_modal.they_cant_follow": "S’mund t’ju ndjekë askush nga ky shërbyes.",
+  "domain_block_modal.they_wont_know": "S’do ta dinë se janë bllokuar.",
+  "domain_block_modal.title": "Të bllokohet përkatësia?",
+  "domain_block_modal.you_will_lose_followers": "Krejt ndjekësit tuaj nga ky shërbyes do të hiqen.",
+  "domain_block_modal.you_wont_see_posts": "S’do të shihni postime, apo njoftime nga përdorues në këtë shërbyes.",
+  "domain_pill.activitypub_lets_connect": "Ju lejon të lidheni dhe ndërveproni me persona jo thjesht në Mastodon, por edhe nëpër aplikacione të ndryshme shoqërore.",
+  "domain_pill.activitypub_like_language": "ActivityPub është si gjuha me të cilën Mastodon-i komunikon me rrjete të tjerë shoqërorë.",
+  "domain_pill.server": "Shërbyes",
+  "domain_pill.their_handle": "Targa e tij:",
+  "domain_pill.their_server": "Shtëpia e tij dixhitale, ku rrinë krejt postimet prej tij.",
+  "domain_pill.their_username": "Identifikuesi i tij unik në shërbyesin e vet. Është e mundur të gjenden përdorues me të njëjtin emër përdoruesi në shërbyes të ndryshëm.",
+  "domain_pill.username": "Emër përdoruesi",
+  "domain_pill.whats_in_a_handle": "Ç’është një targë?",
+  "domain_pill.who_they_are": "Nga targat thonë se cili është dikush dhe se ku gjendet, ju mund të ndërveproni me persona nëpër web-in shoqëror të <button>platformave të ngritura mbi ActivityPub</button>.",
+  "domain_pill.who_you_are": "Ngaqë targa juaj thotë se cili jeni dhe se ku gjendeni, njerëzit mund të ndërveprojnë me ju nëpër web-in shoqëror të <button>platformave të bazuara në ActivityPub</button>.",
+  "domain_pill.your_handle": "Targa juaj:",
+  "domain_pill.your_server": "Shtëpia juaj dixhitale, kur gjenden krejt postimet tuaja. S’ju pëlqen kjo këtu? Shpërngulni shërbyes kur të doni dhe sillni edhe ndjekësit tuaj.",
+  "domain_pill.your_username": "Identifikuesi juja unik në këtë shërbyes. Është e mundur të gjenden përdorues me të njëjtin emër përdoruesi në shërbyes të ndryshëm.",
   "embed.instructions": "Trupëzojeni këtë gjendje në sajtin tuaj duke kopjuar kodin më poshtë.",
   "embed.preview": "Ja si do të duket:",
   "emoji_button.activity": "Veprimtari",
@@ -401,9 +426,15 @@
   "loading_indicator.label": "Po ngarkohet…",
   "media_gallery.toggle_visible": "Fshihni {number, plural, one {figurë} other {figura}}",
   "moved_to_account_banner.text": "Llogaria juaj {disabledAccount} aktualisht është e çaktivizuar, ngaqë kaluat te {movedToAccount}.",
-  "mute_modal.duration": "Kohëzgjatje",
-  "mute_modal.hide_notifications": "Të kalohen të fshehura njoftimet prej këtij përdoruesi?",
-  "mute_modal.indefinite": "E pacaktuar",
+  "mute_modal.hide_from_notifications": "Fshihe prej njoftimeve",
+  "mute_modal.hide_options": "Fshihi mundësitë",
+  "mute_modal.indefinite": "Deri sa t’u heq heshtimin",
+  "mute_modal.show_options": "Shfaq mundësi",
+  "mute_modal.they_can_mention_and_follow": "Mund t’ju përmendin dhe ndjekin, por s’do t’i shihni.",
+  "mute_modal.they_wont_know": "S’do ta dinë se janë heshtuar.",
+  "mute_modal.title": "Të heshtohet përdoruesi?",
+  "mute_modal.you_wont_see_mentions": "S’do të shihni postime ku përmenden.",
+  "mute_modal.you_wont_see_posts": "Ata munden ende të shohin postimet tuaja, por ju s’do të shihni të tyret.",
   "navigation_bar.about": "Mbi",
   "navigation_bar.advanced_interface": "Hape në ndërfaqe web të thelluar",
   "navigation_bar.blocks": "Përdorues të bllokuar",
@@ -659,9 +690,11 @@
   "status.direct": "Përmendje private për @{name}",
   "status.direct_indicator": "Përmendje private",
   "status.edit": "Përpunojeni",
+  "status.edited": "Përpunuar së fundi më {date}",
   "status.edited_x_times": "Përpunuar {count, plural, one {{count} herë} other {{count} herë}}",
   "status.embed": "Trupëzim",
   "status.favourite": "I vini shenjë si të parapëlqyer",
+  "status.favourites": "{count, plural, one {i parapëlqyer} other {të parapëlqyer}}",
   "status.filter": "Filtroje këtë postim",
   "status.filtered": "I filtruar",
   "status.hide": "Fshihe postimin",
@@ -682,6 +715,7 @@
   "status.reblog": "Përforcojeni",
   "status.reblog_private": "Përforcim për publikun origjinal",
   "status.reblogged_by": "{name} përforcoi",
+  "status.reblogs": "{count, plural, one {përforcim} other {përforcime}}",
   "status.reblogs.empty": "Këtë mesazh s’e ka përforcuar njeri deri tani. Kur ta bëjë dikush, kjo do të duket këtu.",
   "status.redraft": "Fshijeni & rihartojeni",
   "status.remove_bookmark": "Hiqe faqerojtësin",
diff --git a/app/javascript/mastodon/locales/sr-Latn.json b/app/javascript/mastodon/locales/sr-Latn.json
index 6281f729f77aca..2d795c76cc5ae3 100644
--- a/app/javascript/mastodon/locales/sr-Latn.json
+++ b/app/javascript/mastodon/locales/sr-Latn.json
@@ -160,9 +160,7 @@
   "compose_form.spoiler.unmarked": "Dodaj upozorenje o sadržaju",
   "compose_form.spoiler_placeholder": "Upozorenje o sadržaju (opciono)",
   "confirmation_modal.cancel": "Otkaži",
-  "confirmations.block.block_and_report": "Blokiraj i prijavi",
   "confirmations.block.confirm": "Blokiraj",
-  "confirmations.block.message": "Da li ste sigurni da želite da blokirate korisnika {name}?",
   "confirmations.cancel_follow_request.confirm": "Povuci zahtev",
   "confirmations.cancel_follow_request.message": "Da li ste sigurni da želite da povučete zahtev da pratite {name}?",
   "confirmations.delete.confirm": "Izbriši",
@@ -171,15 +169,12 @@
   "confirmations.delete_list.message": "Da li ste sigurni da želite da trajno izbrišete ovu listu?",
   "confirmations.discard_edit_media.confirm": "Odbaci",
   "confirmations.discard_edit_media.message": "Imate nesačuvane promene u opisu ili pregledu medija, da li ipak hoćete da ih odbacite?",
-  "confirmations.domain_block.confirm": "Blokiraj ceo domen",
   "confirmations.domain_block.message": "Da li ste zaista sigurni da želite da blokirate ceo domen {domain}? U većini slučajeva, dovoljno je i poželjno nekoliko ciljanih blokiranja ili ignorisanja. Nećete videti sadržaj sa tog domena ni u jednoj javnoj vremenskoj liniji ili u vašim obaveštenjima. Vaši pratioci sa tog domena će biti uklonjeni.",
   "confirmations.edit.confirm": "Uredi",
   "confirmations.edit.message": "Uređivanjem će se obrisati poruka koju trenutno sastavljate. Da li ste sigurni da želite da nastavite?",
   "confirmations.logout.confirm": "Odjava",
   "confirmations.logout.message": "Da li ste sigurni da želite da se odjavite?",
   "confirmations.mute.confirm": "Ignoriši",
-  "confirmations.mute.explanation": "Ovo će sakriti objave korisnika i objave koje ga pominju, ali će mu i dalje biti dozvoljeno da vidi Vaše objave i da Vas prati.",
-  "confirmations.mute.message": "Da li stvarno želite da ignorišete korisnika {name}?",
   "confirmations.redraft.confirm": "Izbriši i prepravi",
   "confirmations.redraft.message": "Da li ste sigurni da želite da izbrišete ovu objavu i da je prepravite? Podržavanja i oznake kao omiljenih će biti izgubljeni, a odgovori će ostati bez originalne objave.",
   "confirmations.reply.confirm": "Odgovori",
@@ -402,9 +397,6 @@
   "loading_indicator.label": "Učitavanje…",
   "media_gallery.toggle_visible": "{number, plural, one {Sakrij sliku} few {Sakrij slike} other {Sakrij slike}}",
   "moved_to_account_banner.text": "Vaš nalog {disabledAccount} je trenutno onemogućen jer ste prešli na {movedToAccount}.",
-  "mute_modal.duration": "Trajanje",
-  "mute_modal.hide_notifications": "Sakriti obaveštenja od ovog korisnika?",
-  "mute_modal.indefinite": "Neodređeno",
   "navigation_bar.about": "Osnovni podaci",
   "navigation_bar.advanced_interface": "Otvori u naprednom veb okruženju",
   "navigation_bar.blocks": "Blokirani korisnici",
diff --git a/app/javascript/mastodon/locales/sr.json b/app/javascript/mastodon/locales/sr.json
index ae550315e44319..347a3f65a3c071 100644
--- a/app/javascript/mastodon/locales/sr.json
+++ b/app/javascript/mastodon/locales/sr.json
@@ -89,6 +89,14 @@
   "announcement.announcement": "Најава",
   "attachments_list.unprocessed": "(необрађено)",
   "audio.hide": "Сакриј аудио",
+  "block_modal.remote_users_caveat": "Замолићемо сервер {domain} да поштује вашу одлуку. Међутим, усклађеност није загарантована јер неки сервери могу другачије да обрађују блокове. Јавне објаве могу и даље бити видљиве корисницима који нису пријављени.",
+  "block_modal.show_less": "Прикажи мање",
+  "block_modal.show_more": "Прикажи више",
+  "block_modal.they_cant_mention": "Не могу да вас помињу или прате.",
+  "block_modal.they_cant_see_posts": "Не могу да виде ваше објаве, а ви нећете видети њихове.",
+  "block_modal.they_will_know": "Могу да виде да су блокирани.",
+  "block_modal.title": "Блокирати корисника?",
+  "block_modal.you_wont_see_mentions": "Нећете видети објаве које их помињу.",
   "boost_modal.combo": "Можете притиснути {combo} да прескочите ово следећи пут",
   "bundle_column_error.copy_stacktrace": "Копирај извештај о грешци",
   "bundle_column_error.error.body": "Није могуће приказати тражену страницу. Разлог може бити грешка у нашем коду или проблем са компатибилношћу претраживача.",
@@ -160,9 +168,7 @@
   "compose_form.spoiler.unmarked": "Додај упозорење о садржају",
   "compose_form.spoiler_placeholder": "Упозорење о садржају (опционо)",
   "confirmation_modal.cancel": "Откажи",
-  "confirmations.block.block_and_report": "Блокирај и пријави",
   "confirmations.block.confirm": "Блокирај",
-  "confirmations.block.message": "Да ли сте сигурни да желите да блокирате корисника {name}?",
   "confirmations.cancel_follow_request.confirm": "Повуци захтев",
   "confirmations.cancel_follow_request.message": "Да ли сте сигурни да желите да повучете захтев да пратите {name}?",
   "confirmations.delete.confirm": "Избриши",
@@ -171,15 +177,13 @@
   "confirmations.delete_list.message": "Да ли сте сигурни да желите да трајно избришете ову листу?",
   "confirmations.discard_edit_media.confirm": "Одбаци",
   "confirmations.discard_edit_media.message": "Имате несачуване промене у опису или прегледу медија, да ли ипак хоћете да их одбаците?",
-  "confirmations.domain_block.confirm": "Блокирај цео домен",
+  "confirmations.domain_block.confirm": "Блокирај сервер",
   "confirmations.domain_block.message": "Да ли сте заиста сигурни да желите да блокирате цео домен {domain}? У већини случајева, довољно је и пожељно неколико циљаних блокирања или игнорисања. Нећете видети садржај са тог домена ни у једној јавној временској линији или у вашим обавештењима. Ваши пратиоци са тог домена ће бити уклоњени.",
   "confirmations.edit.confirm": "Уреди",
   "confirmations.edit.message": "Уређивањем ће се обрисати порука коју тренутно састављате. Да ли сте сигурни да желите да наставите?",
   "confirmations.logout.confirm": "Одјава",
   "confirmations.logout.message": "Да ли сте сигурни да желите да се одјавите?",
   "confirmations.mute.confirm": "Игнориши",
-  "confirmations.mute.explanation": "Ово ће сакрити објаве корисника и објаве које га помињу, али ће му и даље бити дозвољено да види Ваше објаве и да Вас прати.",
-  "confirmations.mute.message": "Да ли стварно желите да игноришете корисника {name}?",
   "confirmations.redraft.confirm": "Избриши и преправи",
   "confirmations.redraft.message": "Да ли сте сигурни да желите да избришете ову објаву и да је преправите? Подржавања и ознаке као омиљених ће бити изгубљени, а одговори ће остати без оригиналне објаве.",
   "confirmations.reply.confirm": "Одговори",
@@ -205,6 +209,18 @@
   "dismissable_banner.explore_statuses": "Ово су објаве широм друштвеног веба које данас постају све популарније. Новије објаве са више подржавања и омиљене су рангиране више.",
   "dismissable_banner.explore_tags": "Ово су хеш ознаке које данас постају све популарније на друштвеној мрежи. Хеш ознаке које користи више различитих људи су рангиране више.",
   "dismissable_banner.public_timeline": "Ово су најновије јавне објаве људи са друштвеног веба које људи на {domain}-у прате.",
+  "domain_block_modal.block": "Блокирај сервер",
+  "domain_block_modal.block_account_instead": "Уместо тога, блокирај @{name}",
+  "domain_block_modal.they_can_interact_with_old_posts": "Људи са овог сервера могу да имају интеракцију са вашим старим објавама.",
+  "domain_block_modal.they_cant_follow": "Нико са овог сервера не може да вас прати.",
+  "domain_block_modal.they_wont_know": "Неће знати да су блокирани.",
+  "domain_block_modal.title": "Блокирати домен?",
+  "domain_block_modal.you_will_lose_followers": "Сви ваши пратиоци са овог сервера ће бити уклоњени.",
+  "domain_block_modal.you_wont_see_posts": "Нећете видети објаве или обавештења корисника на овом серверу.",
+  "domain_pill.activitypub_lets_connect": "Омогућује вам да се повежете и комуницирате са људима не само на Mastodon-у, већ и у различитим друштвеним апликацијама.",
+  "domain_pill.activitypub_like_language": "ActivityPub је као језик којим Mastodon говори са другим друштвеним мрежама.",
+  "domain_pill.server": "Сервер",
+  "domain_pill.username": "Корисничко име",
   "embed.instructions": "Уградите ову објаву на свој веб сајт копирањем кода испод.",
   "embed.preview": "Ево како ће то изгледати:",
   "emoji_button.activity": "Активности",
@@ -402,9 +418,15 @@
   "loading_indicator.label": "Учитавање…",
   "media_gallery.toggle_visible": "{number, plural, one {Сакриј слику} few {Сакриј слике} other {Сакриј слике}}",
   "moved_to_account_banner.text": "Ваш налог {disabledAccount} је тренутно онемогућен јер сте прешли на {movedToAccount}.",
-  "mute_modal.duration": "Трајање",
-  "mute_modal.hide_notifications": "Сакрити обавештења од овог корисника?",
-  "mute_modal.indefinite": "Неодређено",
+  "mute_modal.hide_from_notifications": "Сакриј из обавештења",
+  "mute_modal.hide_options": "Сакриј опције",
+  "mute_modal.indefinite": "Док их не уклоним из игнорисаних",
+  "mute_modal.show_options": "Прикажи опције",
+  "mute_modal.they_can_mention_and_follow": "Могу да вас помињу и прате, али их нећете видети.",
+  "mute_modal.they_wont_know": "Неће знати да су игнорисани.",
+  "mute_modal.title": "Игнорисати корисника?",
+  "mute_modal.you_wont_see_mentions": "Нећете видети објаве које га помињу.",
+  "mute_modal.you_wont_see_posts": "И даље може да види ваше објаве, али ви нећете видети његове.",
   "navigation_bar.about": "Основни подаци",
   "navigation_bar.advanced_interface": "Отвори у напредном веб окружењу",
   "navigation_bar.blocks": "Блокирани корисници",
diff --git a/app/javascript/mastodon/locales/sv.json b/app/javascript/mastodon/locales/sv.json
index 6bf7471359e967..1bfd3e480fb19d 100644
--- a/app/javascript/mastodon/locales/sv.json
+++ b/app/javascript/mastodon/locales/sv.json
@@ -89,6 +89,13 @@
   "announcement.announcement": "Meddelande",
   "attachments_list.unprocessed": "(obehandlad)",
   "audio.hide": "Dölj audio",
+  "block_modal.show_less": "Visa mindre",
+  "block_modal.show_more": "Visa mer",
+  "block_modal.they_cant_mention": "De kan inte nämna eller följa dig.",
+  "block_modal.they_cant_see_posts": "De kan inte se dina inlägg och du kan inte se deras.",
+  "block_modal.they_will_know": "De kan se att de är blockerade.",
+  "block_modal.title": "Blockera användare?",
+  "block_modal.you_wont_see_mentions": "Du kommer inte att se inlägg som nämner dem.",
   "boost_modal.combo": "Du kan trycka på {combo} för att hoppa över detta nästa gång",
   "bundle_column_error.copy_stacktrace": "Kopiera felrapport",
   "bundle_column_error.error.body": "Den begärda sidan kunde inte visas. Det kan bero på ett fel i vår kod eller ett problem med webbläsarens kompatibilitet.",
@@ -160,9 +167,7 @@
   "compose_form.spoiler.unmarked": "Texten är inte dold",
   "compose_form.spoiler_placeholder": "Innehållsvarning (valfritt)",
   "confirmation_modal.cancel": "Avbryt",
-  "confirmations.block.block_and_report": "Blockera & rapportera",
   "confirmations.block.confirm": "Blockera",
-  "confirmations.block.message": "Är du säker på att du vill blockera {name}?",
   "confirmations.cancel_follow_request.confirm": "Återkalla förfrågan",
   "confirmations.cancel_follow_request.message": "Är du säker på att du vill återkalla din begäran om att följa {name}?",
   "confirmations.delete.confirm": "Radera",
@@ -171,15 +176,13 @@
   "confirmations.delete_list.message": "Är du säker på att du vill radera denna lista permanent?",
   "confirmations.discard_edit_media.confirm": "Kasta",
   "confirmations.discard_edit_media.message": "Du har osparade ändringar till mediabeskrivningen eller förhandsgranskningen, kasta bort dem ändå?",
-  "confirmations.domain_block.confirm": "Dölj hela domänen",
+  "confirmations.domain_block.confirm": "Blockera server",
   "confirmations.domain_block.message": "Är du verkligen, verkligen säker på att du vill blockera hela {domain}? I de flesta fall är några riktade blockeringar eller nedtystade konton tillräckligt och att föredra. Du kommer inte se innehåll från den domänen i den allmänna tidslinjen eller i dina aviseringar. Dina följare från den domänen komer att tas bort.",
   "confirmations.edit.confirm": "Redigera",
   "confirmations.edit.message": "Om du svarar nu kommer det att ersätta meddelandet du håller på att skapa. Är du säker på att du vill fortsätta?",
   "confirmations.logout.confirm": "Logga ut",
   "confirmations.logout.message": "Är du säker på att du vill logga ut?",
   "confirmations.mute.confirm": "Tysta",
-  "confirmations.mute.explanation": "Detta kommer dölja inlägg från hen och inlägg som nämner hen, men hen tillåts fortfarande se dina inlägg och följa dig.",
-  "confirmations.mute.message": "Är du säker på att du vill tysta {name}?",
   "confirmations.redraft.confirm": "Radera & gör om",
   "confirmations.redraft.message": "Är du säker på att du vill radera detta inlägg och göra om det? Favoritmarkeringar, boostar och svar till det ursprungliga inlägget kommer förlora sitt sammanhang.",
   "confirmations.reply.confirm": "Svara",
@@ -205,6 +208,16 @@
   "dismissable_banner.explore_statuses": "Dessa inlägg, från denna och andra servrar i det decentraliserade nätverket, pratas det om just nu på denna server.",
   "dismissable_banner.explore_tags": "Dessa hashtaggar pratas det om just nu bland folk på denna och andra servrar i det decentraliserade nätverket.",
   "dismissable_banner.public_timeline": "De här är de aktuella publika inlägg från personer på det sociala nätet som personer i {domain} följer.",
+  "domain_block_modal.block": "Blockera server",
+  "domain_block_modal.block_account_instead": "Blockera @{name} istället",
+  "domain_block_modal.they_can_interact_with_old_posts": "Personer från denna server kan interagera med dina gamla inlägg.",
+  "domain_block_modal.they_cant_follow": "Ingen från denna server kan följa dig.",
+  "domain_block_modal.title": "Blockera domän?",
+  "domain_block_modal.you_will_lose_followers": "Alla dina följare från denna server kommer att tas bort.",
+  "domain_pill.server": "Server",
+  "domain_pill.their_username": "Deras unika identifierare på deras server. Det är möjligt att hitta användare med samma användarnamn på olika servrar.",
+  "domain_pill.username": "Användarnamn",
+  "domain_pill.your_username": "Din unika identifierare på denna server. Det är möjligt att hitta användare med samma användarnamn på olika servrar.",
   "embed.instructions": "Bädda in detta inlägg på din webbplats genom att kopiera koden nedan.",
   "embed.preview": "Så här kommer det att se ut:",
   "emoji_button.activity": "Aktivitet",
@@ -399,9 +412,11 @@
   "loading_indicator.label": "Laddar…",
   "media_gallery.toggle_visible": "Växla synlighet",
   "moved_to_account_banner.text": "Ditt konto {disabledAccount} är för närvarande inaktiverat eftersom du flyttat till {movedToAccount}.",
-  "mute_modal.duration": "Varaktighet",
-  "mute_modal.hide_notifications": "Dölj aviseringar från denna användare?",
-  "mute_modal.indefinite": "Obestämt",
+  "mute_modal.hide_options": "Dölj alternativ",
+  "mute_modal.show_options": "Visa alternativ",
+  "mute_modal.they_can_mention_and_follow": "De kan nämna och följa dig, men du ser dem inte.",
+  "mute_modal.you_wont_see_mentions": "Du kommer inte att se inlägg som nämner dem.",
+  "mute_modal.you_wont_see_posts": "De kan fortfarande se dina inlägg, men du kan inte se deras.",
   "navigation_bar.about": "Om",
   "navigation_bar.advanced_interface": "Öppna i avancerat webbgränssnitt",
   "navigation_bar.blocks": "Blockerade användare",
diff --git a/app/javascript/mastodon/locales/szl.json b/app/javascript/mastodon/locales/szl.json
index 42164f656b10b7..43cfc78d5bb373 100644
--- a/app/javascript/mastodon/locales/szl.json
+++ b/app/javascript/mastodon/locales/szl.json
@@ -34,7 +34,6 @@
   "compose_form.spoiler.marked": "Text is hidden behind warning",
   "compose_form.spoiler.unmarked": "Text is not hidden",
   "confirmations.delete.message": "Are you sure you want to delete this status?",
-  "confirmations.domain_block.confirm": "Hide entire domain",
   "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
   "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.",
   "embed.instructions": "Embed this status on your website by copying the code below.",
diff --git a/app/javascript/mastodon/locales/ta.json b/app/javascript/mastodon/locales/ta.json
index 7de7146bf66cec..ac0984293af780 100644
--- a/app/javascript/mastodon/locales/ta.json
+++ b/app/javascript/mastodon/locales/ta.json
@@ -126,22 +126,17 @@
   "compose_form.spoiler.marked": "எச்சரிக்கையின் பின்னால் பதிவு மறைக்கப்பட்டுள்ளது",
   "compose_form.spoiler.unmarked": "பதிவு மறைக்கப்படவில்லை",
   "confirmation_modal.cancel": "ரத்து",
-  "confirmations.block.block_and_report": "தடுத்துப் புகாரளி",
   "confirmations.block.confirm": "தடு",
-  "confirmations.block.message": "{name}-ஐ நிச்சயமாகத் தடுக்க விரும்புகிறீர்களா?",
   "confirmations.delete.confirm": "நீக்கு",
   "confirmations.delete.message": "இப்பதிவை நிச்சயமாக நீக்க விரும்புகிறீர்களா?",
   "confirmations.delete_list.confirm": "நீக்கு",
   "confirmations.delete_list.message": "இப்பட்டியலை நிரந்தரமாக நீக்க நிச்சயம் விரும்புகிறீர்களா?",
   "confirmations.discard_edit_media.confirm": "நிராகரி",
   "confirmations.discard_edit_media.message": "சேமிக்கப்படாத மாற்றங்கள் ஊடக விளக்கம் அல்லது முன்னோட்டத்தில் உள்ளது. அவற்றை நிராகரிக்கவா?",
-  "confirmations.domain_block.confirm": "முழு களத்தையும் மறை",
   "confirmations.domain_block.message": "நீங்கள் முழு {domain} களத்தையும் நிச்சயமாக, நிச்சயமாகத் தடுக்க விரும்புகிறீர்களா? பெரும்பாலும் சில குறிப்பிட்ட பயனர்களைத் தடுப்பதே போதுமானது. முழு களத்தையும் தடுத்தால், அதிலிருந்து வரும் எந்தப் பதிவையும் உங்களால் காண முடியாது, மேலும் அப்பதிவுகள் குறித்த அறிவிப்புகளும் உங்களுக்கு வராது. அந்தக் களத்தில் இருக்கும் பின்தொடர்பவர்கள் உங்கள் பக்கத்திலிருந்து நீக்கப்படுவார்கள்.",
   "confirmations.logout.confirm": "வெளியேறு",
   "confirmations.logout.message": "நிச்சயமாக நீங்கள் வெளியேற விரும்புகிறீர்களா?",
   "confirmations.mute.confirm": "அமைதியாக்கு",
-  "confirmations.mute.explanation": "இந்தத் தேர்வு அவர்களின் பதிவுகளையும், அவர்களைக் குறிப்பிடும் பதிவுகளையும் மறைத்துவிடும். ஆனால், அவர்களால் உங்களைப் பின்தொடர்ந்து உங்கள் பதிவுகளைக் காண முடியும்.",
-  "confirmations.mute.message": "{name}-ஐ நிச்சயமாக நீங்கள் அமைதியாக்க விரும்புகிறீர்களா?",
   "confirmations.redraft.confirm": "பதிவை நீக்கி மறுவரைவு செய்",
   "confirmations.reply.confirm": "மறுமொழி",
   "confirmations.reply.message": "ஏற்கனவே ஒரு பதிவு எழுதப்பட்டுக்கொண்டிருக்கிறது. இப்பொழுது பதில் எழுத முனைந்தால் அது அழிக்கப்படும். பரவாயில்லையா?",
@@ -264,7 +259,6 @@
   "lists.subheading": "உங்கள் பட்டியல்கள்",
   "load_pending": "{count, plural,one {# புதியது}other {# புதியவை}}",
   "media_gallery.toggle_visible": "நிலைமாற்று தெரியும்",
-  "mute_modal.hide_notifications": "இந்த பயனரின் அறிவிப்புகளை மறைக்கவா?",
   "navigation_bar.blocks": "தடுக்கப்பட்ட பயனர்கள்",
   "navigation_bar.bookmarks": "அடையாளக்குறிகள்",
   "navigation_bar.community_timeline": "உள்ளூர் காலக்கெடு",
diff --git a/app/javascript/mastodon/locales/tai.json b/app/javascript/mastodon/locales/tai.json
index fe6b8fe6503782..825cfb93bdff25 100644
--- a/app/javascript/mastodon/locales/tai.json
+++ b/app/javascript/mastodon/locales/tai.json
@@ -20,7 +20,6 @@
   "compose_form.spoiler.marked": "Î-tû luē-iông kíng-kò",
   "compose_form.spoiler.unmarked": "Tsing-ka luē-iông kíng-kò",
   "confirmations.delete.message": "Lí kám bueh thâi-tiāu tsi̍t-ē huah-siann?",
-  "confirmations.domain_block.confirm": "Hong-só tsíng-kò bāng-hi̍k",
   "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
   "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.",
   "embed.instructions": "Embed this status on your website by copying the code below.",
diff --git a/app/javascript/mastodon/locales/te.json b/app/javascript/mastodon/locales/te.json
index 1202de15567a03..284102c381bc6d 100644
--- a/app/javascript/mastodon/locales/te.json
+++ b/app/javascript/mastodon/locales/te.json
@@ -70,15 +70,12 @@
   "compose_form.spoiler.unmarked": "పాఠ్యం దాచబడలేదు",
   "confirmation_modal.cancel": "రద్దు చెయ్యి",
   "confirmations.block.confirm": "బ్లాక్ చేయి",
-  "confirmations.block.message": "మీరు ఖచ్చితంగా {name}ని బ్లాక్ చేయాలనుకుంటున్నారా?",
   "confirmations.delete.confirm": "తొలగించు",
   "confirmations.delete.message": "మీరు ఖచ్చితంగా ఈ స్టేటస్ ని తొలగించాలనుకుంటున్నారా?",
   "confirmations.delete_list.confirm": "తొలగించు",
   "confirmations.delete_list.message": "మీరు ఖచ్చితంగా ఈ జాబితాను శాశ్వతంగా తొలగించాలనుకుంటున్నారా?",
-  "confirmations.domain_block.confirm": "మొత్తం డొమైన్ను దాచు",
   "confirmations.domain_block.message": "మీరు నిజంగా నిజంగా మొత్తం {domain} ని బ్లాక్ చేయాలనుకుంటున్నారా? చాలా సందర్భాలలో కొన్ని లక్ష్యంగా ఉన్న బ్లాక్స్ లేదా మ్యూట్స్ సరిపోతాయి మరియు ఉత్తమమైనవి. మీరు ఆ డొమైన్ నుండి కంటెంట్ను ఏ ప్రజా కాలక్రమాలలో లేదా మీ నోటిఫికేషన్లలో చూడలేరు. ఆ డొమైన్ నుండి మీ అనుచరులు తీసివేయబడతారు.",
   "confirmations.mute.confirm": "మ్యూట్ చేయి",
-  "confirmations.mute.message": "{name}ను మీరు ఖచ్చితంగా మ్యూట్ చేయాలనుకుంటున్నారా?",
   "confirmations.redraft.confirm": "తొలగించు & తిరగరాయు",
   "confirmations.reply.confirm": "ప్రత్యుత్తరమివ్వు",
   "confirmations.reply.message": "ఇప్పుడే ప్రత్యుత్తరం ఇస్తే మీరు ప్రస్తుతం వ్రాస్తున్న సందేశం తిరగరాయబడుతుంది. మీరు ఖచ్చితంగా కొనసాగించాలనుకుంటున్నారా?",
@@ -173,7 +170,6 @@
   "lists.search": "మీరు అనుసరించే వ్యక్తులలో శోధించండి",
   "lists.subheading": "మీ జాబితాలు",
   "media_gallery.toggle_visible": "దృశ్యమానతను టోగుల్ చేయండి",
-  "mute_modal.hide_notifications": "ఈ వినియోగదారు నుండి నోటిఫికేషన్లను దాచాలా?",
   "navigation_bar.blocks": "బ్లాక్ చేయబడిన వినియోగదారులు",
   "navigation_bar.community_timeline": "స్థానిక కాలక్రమం",
   "navigation_bar.compose": "కొత్త టూట్ను రాయండి",
diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json
index d3a04209fd8c74..ce3b4eaa256bc1 100644
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@@ -89,6 +89,14 @@
   "announcement.announcement": "ประกาศ",
   "attachments_list.unprocessed": "(ยังไม่ได้ประมวลผล)",
   "audio.hide": "ซ่อนเสียง",
+  "block_modal.remote_users_caveat": "เราจะขอให้เซิร์ฟเวอร์ {domain} เคารพการตัดสินใจของคุณ อย่างไรก็ตาม ไม่รับประกันการปฏิบัติตามข้อกำหนดเนื่องจากเซิร์ฟเวอร์บางแห่งอาจจัดการการปิดกั้นแตกต่างกัน โพสต์สาธารณะอาจยังคงปรากฏแก่ผู้ใช้ที่ไม่ได้เข้าสู่ระบบ",
+  "block_modal.show_less": "แสดงน้อยลง",
+  "block_modal.show_more": "แสดงเพิ่มเติม",
+  "block_modal.they_cant_mention": "เขาไม่สามารถกล่าวถึงหรือติดตามคุณ",
+  "block_modal.they_cant_see_posts": "เขาไม่สามารถเห็นโพสต์ของคุณและคุณจะไม่เห็นโพสต์ของเขา",
+  "block_modal.they_will_know": "เขาสามารถเห็นว่ามีการปิดกั้นเขา",
+  "block_modal.title": "ปิดกั้นผู้ใช้?",
+  "block_modal.you_wont_see_mentions": "คุณจะไม่เห็นโพสต์ที่กล่าวถึงเขา",
   "boost_modal.combo": "คุณสามารถกด {combo} เพื่อข้ามสิ่งนี้ในครั้งถัดไป",
   "bundle_column_error.copy_stacktrace": "คัดลอกรายงานข้อผิดพลาด",
   "bundle_column_error.error.body": "ไม่สามารถแสดงผลหน้าที่ขอ ข้อผิดพลาดอาจเป็นเพราะข้อบกพร่องในโค้ดของเรา หรือปัญหาความเข้ากันได้ของเบราว์เซอร์",
@@ -160,9 +168,7 @@
   "compose_form.spoiler.unmarked": "เพิ่มคำเตือนเนื้อหา",
   "compose_form.spoiler_placeholder": "คำเตือนเนื้อหา (ไม่จำเป็น)",
   "confirmation_modal.cancel": "ยกเลิก",
-  "confirmations.block.block_and_report": "ปิดกั้นแล้วรายงาน",
   "confirmations.block.confirm": "ปิดกั้น",
-  "confirmations.block.message": "คุณแน่ใจหรือไม่ว่าต้องการปิดกั้น {name}?",
   "confirmations.cancel_follow_request.confirm": "ถอนคำขอ",
   "confirmations.cancel_follow_request.message": "คุณแน่ใจหรือไม่ว่าต้องการถอนคำขอเพื่อติดตาม {name} ของคุณ?",
   "confirmations.delete.confirm": "ลบ",
@@ -171,15 +177,13 @@
   "confirmations.delete_list.message": "คุณแน่ใจหรือไม่ว่าต้องการลบรายการนี้อย่างถาวร?",
   "confirmations.discard_edit_media.confirm": "ละทิ้ง",
   "confirmations.discard_edit_media.message": "คุณมีการเปลี่ยนแปลงคำอธิบายหรือตัวอย่างสื่อที่ยังไม่ได้บันทึก ละทิ้งการเปลี่ยนแปลงเหล่านั้นต่อไป?",
-  "confirmations.domain_block.confirm": "ปิดกั้นทั้งโดเมน",
+  "confirmations.domain_block.confirm": "ปิดกั้นเซิร์ฟเวอร์",
   "confirmations.domain_block.message": "คุณแน่ใจจริง ๆ หรือไม่ว่าต้องการปิดกั้นทั้ง {domain}? ในกรณีส่วนใหญ่ การปิดกั้นหรือการซ่อนแบบกำหนดเป้าหมายไม่กี่รายการนั้นเพียงพอและเป็นที่นิยม คุณจะไม่เห็นเนื้อหาจากโดเมนนั้นในเส้นเวลาสาธารณะใด ๆ หรือการแจ้งเตือนของคุณ จะเอาผู้ติดตามของคุณจากโดเมนนั้นออก",
   "confirmations.edit.confirm": "แก้ไข",
   "confirmations.edit.message": "การแก้ไขในตอนนี้จะเขียนทับข้อความที่คุณกำลังเขียนในปัจจุบัน คุณแน่ใจหรือไม่ว่าต้องการดำเนินการต่อ?",
   "confirmations.logout.confirm": "ออกจากระบบ",
   "confirmations.logout.message": "คุณแน่ใจหรือไม่ว่าต้องการออกจากระบบ?",
   "confirmations.mute.confirm": "ซ่อน",
-  "confirmations.mute.explanation": "นี่จะซ่อนโพสต์จากเขาและโพสต์ที่กล่าวถึงเขา แต่จะยังคงอนุญาตให้เขาเห็นโพสต์ของคุณและติดตามคุณ",
-  "confirmations.mute.message": "คุณแน่ใจหรือไม่ว่าต้องการซ่อน {name}?",
   "confirmations.redraft.confirm": "ลบแล้วร่างใหม่",
   "confirmations.redraft.message": "คุณแน่ใจหรือไม่ว่าต้องการลบโพสต์นี้แล้วร่างโพสต์ใหม่? รายการโปรดและการดันจะสูญหาย และการตอบกลับโพสต์ดั้งเดิมจะไม่มีความเกี่ยวพัน",
   "confirmations.reply.confirm": "ตอบกลับ",
@@ -205,6 +209,27 @@
   "dismissable_banner.explore_statuses": "นี่คือโพสต์จากทั่วทั้งเว็บสังคมที่กำลังได้รับความสนใจวันนี้ โพสต์ที่ใหม่กว่าที่มีการดันและรายการโปรดมากกว่าจะได้รับการจัดอันดับที่สูงกว่า",
   "dismissable_banner.explore_tags": "นี่คือแฮชแท็กที่กำลังได้รับความสนใจในเว็บสังคมวันนี้ แฮชแท็กที่มีการใช้โดยผู้คนต่าง ๆ มากกว่าจะได้รับการจัดอันดับที่สูงกว่า",
   "dismissable_banner.public_timeline": "นี่คือโพสต์สาธารณะล่าสุดจากผู้คนในเว็บสังคมที่ผู้คนใน {domain} ติดตาม",
+  "domain_block_modal.block": "ปิดกั้นเซิร์ฟเวอร์",
+  "domain_block_modal.block_account_instead": "ปิดกั้น @{name} แทน",
+  "domain_block_modal.they_can_interact_with_old_posts": "ผู้คนจากเซิร์ฟเวอร์นี้สามารถโต้ตอบกับโพสต์เก่า ๆ ของคุณ",
+  "domain_block_modal.they_cant_follow": "ไม่มีใครจากเซิร์ฟเวอร์นี้สามารถติดตามคุณ",
+  "domain_block_modal.they_wont_know": "เขาจะไม่ทราบว่ามีการปิดกั้นเขา",
+  "domain_block_modal.title": "ปิดกั้นโดเมน?",
+  "domain_block_modal.you_will_lose_followers": "จะเอาผู้ติดตามทั้งหมดของคุณจากเซิร์ฟเวอร์นี้ออก",
+  "domain_block_modal.you_wont_see_posts": "คุณจะไม่เห็นโพสต์หรือการแจ้งเตือนจากผู้ใช้ในเซิร์ฟเวอร์นี้",
+  "domain_pill.activitypub_lets_connect": "โปรโตคอลช่วยให้คุณเชื่อมต่อและโต้ตอบกับผู้คนไม่ใช่แค่ใน Mastodon แต่ทั่วทั้งแอปสังคมต่าง ๆ เช่นกัน",
+  "domain_pill.activitypub_like_language": "ActivityPub เป็นเหมือนภาษาที่ Mastodon พูดกับเครือข่ายสังคมอื่น ๆ",
+  "domain_pill.server": "เซิร์ฟเวอร์",
+  "domain_pill.their_handle": "นามของเขา:",
+  "domain_pill.their_server": "บ้านดิจิทัลของเขา ที่ซึ่งโพสต์ทั้งหมดของเขาอาศัยอยู่",
+  "domain_pill.their_username": "ตัวระบุที่ไม่ซ้ำกันของเขาในเซิร์ฟเวอร์ของเขา เป็นไปได้ที่จะค้นหาผู้ใช้ที่มีชื่อผู้ใช้เดียวกันในเซิร์ฟเวอร์ที่แตกต่างกัน",
+  "domain_pill.username": "ชื่อผู้ใช้",
+  "domain_pill.whats_in_a_handle": "ในนามมีอะไรอยู่?",
+  "domain_pill.who_they_are": "เนื่องจากนามบอกว่าใครสักคนคือใครและเขาอยู่ที่ไหน คุณสามารถโต้ตอบกับผู้คนทั่วทั้งเว็บสังคมของ <button>แพลตฟอร์มที่ขับเคลื่อนโดย ActivityPub</button>",
+  "domain_pill.who_you_are": "เนื่องจากนามของคุณบอกว่าคุณคือใครและคุณอยู่ที่ไหน ผู้คนสามารถโต้ตอบกับคุณทั่วทั้งเว็บสังคมของ <button>แพลตฟอร์มที่ขับเคลื่อนโดย ActivityPub</button>",
+  "domain_pill.your_handle": "นามของคุณ:",
+  "domain_pill.your_server": "บ้านดิจิทัลของคุณ ที่ซึ่งโพสต์ทั้งหมดของคุณอาศัยอยู่ ไม่ชอบเซิร์ฟเวอร์นี้? ถ่ายโอนเซิร์ฟเวอร์เมื่อใดก็ได้และนำผู้ติดตามของคุณไปด้วยเช่นกัน",
+  "domain_pill.your_username": "ตัวระบุที่ไม่ซ้ำกันของคุณในเซิร์ฟเวอร์นี้ เป็นไปได้ที่จะค้นหาผู้ใช้ที่มีชื่อผู้ใช้เดียวกันในเซิร์ฟเวอร์ที่แตกต่างกัน",
   "embed.instructions": "ฝังโพสต์นี้ในเว็บไซต์ของคุณโดยคัดลอกโค้ดด้านล่าง",
   "embed.preview": "นี่คือลักษณะของการฝังที่จะปรากฏ:",
   "emoji_button.activity": "กิจกรรม",
@@ -402,9 +427,15 @@
   "loading_indicator.label": "กำลังโหลด…",
   "media_gallery.toggle_visible": "{number, plural, other {ซ่อนภาพ}}",
   "moved_to_account_banner.text": "มีการปิดใช้งานบัญชีของคุณ {disabledAccount} ในปัจจุบันเนื่องจากคุณได้ย้ายไปยัง {movedToAccount}",
-  "mute_modal.duration": "ระยะเวลา",
-  "mute_modal.hide_notifications": "ซ่อนการแจ้งเตือนจากผู้ใช้นี้?",
-  "mute_modal.indefinite": "ไม่มีกำหนด",
+  "mute_modal.hide_from_notifications": "ซ่อนจากการแจ้งเตือน",
+  "mute_modal.hide_options": "ซ่อนตัวเลือก",
+  "mute_modal.indefinite": "จนกว่าฉันจะเลิกซ่อนเขา",
+  "mute_modal.show_options": "แสดงตัวเลือก",
+  "mute_modal.they_can_mention_and_follow": "เขาสามารถกล่าวถึงและติดตามคุณ แต่คุณจะไม่เห็นเขา",
+  "mute_modal.they_wont_know": "เขาจะไม่ทราบว่ามีการซ่อนเขา",
+  "mute_modal.title": "ซ่อนผู้ใช้?",
+  "mute_modal.you_wont_see_mentions": "คุณจะไม่เห็นโพสต์ที่กล่าวถึงเขา",
+  "mute_modal.you_wont_see_posts": "เขายังคงสามารถเห็นโพสต์ของคุณ แต่คุณจะไม่เห็นโพสต์ของเขา",
   "navigation_bar.about": "เกี่ยวกับ",
   "navigation_bar.advanced_interface": "เปิดในส่วนติดต่อเว็บขั้นสูง",
   "navigation_bar.blocks": "ผู้ใช้ที่ปิดกั้นอยู่",
@@ -662,9 +693,11 @@
   "status.direct": "กล่าวถึง @{name} แบบส่วนตัว",
   "status.direct_indicator": "การกล่าวถึงแบบส่วนตัว",
   "status.edit": "แก้ไข",
+  "status.edited": "แก้ไขล่าสุดเมื่อ {date}",
   "status.edited_x_times": "แก้ไข {count, plural, other {{count} ครั้ง}}",
   "status.embed": "ฝัง",
   "status.favourite": "ชื่นชอบ",
+  "status.favourites": "{count, plural, other {รายการโปรด}}",
   "status.filter": "กรองโพสต์นี้",
   "status.filtered": "กรองอยู่",
   "status.hide": "ซ่อนโพสต์",
@@ -685,6 +718,7 @@
   "status.reblog": "ดัน",
   "status.reblog_private": "ดันด้วยการมองเห็นดั้งเดิม",
   "status.reblogged_by": "{name} ได้ดัน",
+  "status.reblogs": "{count, plural, other {การดัน}}",
   "status.reblogs.empty": "ยังไม่มีใครดันโพสต์นี้ เมื่อใครสักคนดัน เขาจะปรากฏที่นี่",
   "status.redraft": "ลบแล้วร่างใหม่",
   "status.remove_bookmark": "เอาที่คั่นหน้าออก",
diff --git a/app/javascript/mastodon/locales/tok.json b/app/javascript/mastodon/locales/tok.json
index f6bf927b948e21..c3f184e15d4917 100644
--- a/app/javascript/mastodon/locales/tok.json
+++ b/app/javascript/mastodon/locales/tok.json
@@ -119,9 +119,7 @@
   "compose_form.save_changes": "o sin e ni",
   "compose_form.spoiler.marked": "o weka e toki pi ijo ike ken",
   "confirmation_modal.cancel": "o pini",
-  "confirmations.block.block_and_report": "o weka e jan o toki e jan tawa lawa",
   "confirmations.block.confirm": "o weka",
-  "confirmations.block.message": "sina o wile ala wile weka e jan {name}?",
   "confirmations.cancel_follow_request.confirm": "o weka e wile sina",
   "confirmations.cancel_follow_request.message": "sina awen ala awen wile weka e wile kute sina lon {name}?",
   "confirmations.delete.confirm": "o weka",
@@ -130,15 +128,12 @@
   "confirmations.delete_list.message": "sina wile ala wile weka e lipu ni?",
   "confirmations.discard_edit_media.confirm": "o weka",
   "confirmations.discard_edit_media.message": "toki sitelen anu lukin lili sitelen la ante pi awen ala li lon. sina wile weka e ante ni?",
-  "confirmations.domain_block.confirm": "o weka.",
   "confirmations.domain_block.message": "sina wile ala a wile a len e ma {domain} ꞏ ken suli la len jan taso li pona ꞏ len pi ma ni la sina ken ala lukin e ijo pi ma ni lon lipu toki ale anu lukin toki ꞏ len ni la jan kute sina pi ma ni li weka",
   "confirmations.edit.confirm": "o ante",
   "confirmations.edit.message": "sina ante e toki sina la toki pali sina li weka. sina wile ala wile e ni?",
   "confirmations.logout.confirm": "o weka",
   "confirmations.logout.message": "sina wile ala wile weka",
   "confirmations.mute.confirm": "o len",
-  "confirmations.mute.explanation": "ni la sina lukin ala e toki ona e toki kepeken nimi ona. taso la ona li ken lukin e toki sina li ken kute e ona.",
-  "confirmations.mute.message": "sina awen ala awen wile kute ala e {name}?",
   "confirmations.redraft.confirm": "o weka o pali sin e toki",
   "confirmations.redraft.message": "pali sin e toki ni la sina wile ala wile weka e ona? sina ni la suli pi toki ni en wawa pi toki ni li weka. kin la toki lon toki ni li jo e mama ala.",
   "confirmations.reply.confirm": "toki lon toki ni",
@@ -266,8 +261,6 @@
   "load_pending": "{count, plural, other {ijo sin #}}",
   "loading_indicator.label": "ni li kama…",
   "media_gallery.toggle_visible": "{number, plural, other {o len e sitelen}}",
-  "mute_modal.duration": "tenpo",
-  "mute_modal.indefinite": "tenpo ale",
   "navigation_bar.about": "sona",
   "navigation_bar.blocks": "jan weka",
   "navigation_bar.compose": "o pali e toki sin",
diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json
index b5209c2dad9492..bf88e53c948110 100644
--- a/app/javascript/mastodon/locales/tr.json
+++ b/app/javascript/mastodon/locales/tr.json
@@ -89,6 +89,14 @@
   "announcement.announcement": "Duyuru",
   "attachments_list.unprocessed": "(işlenmemiş)",
   "audio.hide": "Sesi gizle",
+  "block_modal.remote_users_caveat": "{domain} sunucusundan kararınıza saygı duymasını isteyeceğiz. Ancak, Uymaları garanti değildir çünkü bazı sunucular engellemeyi farklı şekilde yapıyorlar. Herkese açık gönderiler giriş yapmamış kullanıcılara görüntülenmeye devam edebilir.",
+  "block_modal.show_less": "Daha az göster",
+  "block_modal.show_more": "Daha fazla göster",
+  "block_modal.they_cant_mention": "Sizden bahsedemez veya sizi takip edemezler.",
+  "block_modal.they_cant_see_posts": "Onlar sizin gönderilerinizi görmeye devam edebilir, ancak siz onlarınkini göremezsiniz.",
+  "block_modal.they_will_know": "Engellendiklerini görebiliyorlar.",
+  "block_modal.title": "Kullanıcıyı engelle?",
+  "block_modal.you_wont_see_mentions": "Onlardan bahseden gönderiler göremezsiniz.",
   "boost_modal.combo": "Bir daha ki sefere {combo} tuşuna basabilirsin",
   "bundle_column_error.copy_stacktrace": "Hata raporunu kopyala",
   "bundle_column_error.error.body": "İstenen sayfa gösterilemiyor. Bu durum kodumuzdaki bir hatadan veya tarayıcı uyum sorunundan kaynaklanıyor olabilir.",
@@ -160,9 +168,7 @@
   "compose_form.spoiler.unmarked": "Metin gizli değil",
   "compose_form.spoiler_placeholder": "İçerik uyarısı (isteğe bağlı)",
   "confirmation_modal.cancel": "İptal",
-  "confirmations.block.block_and_report": "Engelle ve Bildir",
   "confirmations.block.confirm": "Engelle",
-  "confirmations.block.message": "{name} adlı kullanıcıyı engellemek istediğinden emin misin?",
   "confirmations.cancel_follow_request.confirm": "İsteği geri çek",
   "confirmations.cancel_follow_request.message": "{name} kişisini takip etme isteğini geri çekmek istediğinden emin misin?",
   "confirmations.delete.confirm": "Sil",
@@ -171,15 +177,13 @@
   "confirmations.delete_list.message": "Bu listeyi kalıcı olarak silmek istediğinden emin misin?",
   "confirmations.discard_edit_media.confirm": "Vazgeç",
   "confirmations.discard_edit_media.message": "Medya açıklaması veya ön izlemede kaydedilmemiş değişiklikleriniz var, yine de vazgeçmek istiyor musunuz?",
-  "confirmations.domain_block.confirm": "Alanın tamamını engelle",
+  "confirmations.domain_block.confirm": "Sunucuyu engelle",
   "confirmations.domain_block.message": "{domain} alanının tamamını engellemek istediğinden gerçekten emin misin? Genellikle hedeflenen birkaç engelleme veya sessize alma yeterlidir ve tercih edilir. Bu alan adından gelen içeriği herhangi bir genel zaman çizelgesinde veya bildirimlerinde görmezsin. Bu alan adındaki takipçilerin kaldırılır.",
   "confirmations.edit.confirm": "Düzenle",
   "confirmations.edit.message": "Şimdi düzenlersen şu an oluşturduğun iletinin üzerine yazılır. Devam etmek istediğine emin misin?",
   "confirmations.logout.confirm": "Oturumu kapat",
   "confirmations.logout.message": "Oturumu kapatmak istediğinden emin misin?",
   "confirmations.mute.confirm": "Sessize al",
-  "confirmations.mute.explanation": "Bu, onlardan gelen ve bahseden gönderileri gizler. Ancak yine de gönderilerini görmelerine ve seni takip etmelerine izin verilir.",
-  "confirmations.mute.message": "{name} kullanıcısını sessize almak istediğinden emin misin?",
   "confirmations.redraft.confirm": "Sil Düzenle ve yeniden paylaş",
   "confirmations.redraft.message": "Bu gönderiyi silip taslak haline getirmek istediğinize emin misiniz? Mevcut favoriler ve boostlar silinecek ve gönderiye verilen yanıtlar başıboş kalacak.",
   "confirmations.reply.confirm": "Yanıtla",
@@ -205,6 +209,27 @@
   "dismissable_banner.explore_statuses": "Bunlar, sosyal ağ genelinde bugün ilgi gören gönderiler. Daha çok yinelenen ve favorilenen yeni gönderiler daha üst sıralarda yer alır.",
   "dismissable_banner.explore_tags": "Bu etiketler, merkeziyetsiz ağda bulunan bu ve diğer sunuculardaki insanların şimdilerde ilgisini çekiyor.",
   "dismissable_banner.public_timeline": "Bunlar, {domain} üzerindeki insanların, sosyal ağ da takip ettiği insanlarca gönderilen en son ve herkese açık gönderilerdir.",
+  "domain_block_modal.block": "Sunucuyu engelle",
+  "domain_block_modal.block_account_instead": "Bunun yerine {name} hesabını engelle",
+  "domain_block_modal.they_can_interact_with_old_posts": "Bu sunucudan kişiler eski gönderilerinizle etkileşebilirler.",
+  "domain_block_modal.they_cant_follow": "Bu sunucudan hiç kimse sizi takip edemez.",
+  "domain_block_modal.they_wont_know": "Engellendiklerini bilmeyecekler.",
+  "domain_block_modal.title": "Alan adını engelle?",
+  "domain_block_modal.you_will_lose_followers": "Bu sunucudaki tüm takipçileriniz kaldırılacaktır.",
+  "domain_block_modal.you_wont_see_posts": "Bu sunucudaki kullanıcılardan gelen gönderileri veya bildirimleri göremezsiniz.",
+  "domain_pill.activitypub_lets_connect": "Sadece Mastodon üzerindeki değil, diğer sosyal uygulamalardaki kişilerle de bağlantı kurmanıza ve etkileşmenize olanak sağlar.",
+  "domain_pill.activitypub_like_language": "ActivityPub, Mastodon'un diğer sosyal ağlarla konuşmak için kullandığı dil gibidir.",
+  "domain_pill.server": "Sunucu",
+  "domain_pill.their_handle": "Tanıtıcıları:",
+  "domain_pill.their_server": "Dijital evleri, tüm gönderilerinin yaşadığı yerdir.",
+  "domain_pill.their_username": "Sunucularındaki tekil tanımlayıcıları. Farklı sunucularda aynı kullanıcı adına sahip kullanıcıları bulmak mümkündür.",
+  "domain_pill.username": "Kullanıcı adı",
+  "domain_pill.whats_in_a_handle": "Tanıtıcı nedir?",
+  "domain_pill.who_they_are": "Tanıtıcılar bir kişinin kim olduğunu ve nerede olduğunu söylediği için, <button>ActivityPub destekli platformların</button> sosyal ağındaki insanlarla etkileşime geçebilirsiniz.",
+  "domain_pill.who_you_are": "Tanıtıcınız kim olduğunuzu ve nerede olduğunuzu söylediği için, <button>ActivityPub destekli platformların</button> sosyal ağındaki insanlar sizinle etkileşime geçebilir.",
+  "domain_pill.your_handle": "Tanıtıcınız:",
+  "domain_pill.your_server": "Dijital anasayfanız, tüm gönderilerinizin yaşadığı yerdir. Bunu beğenmediniz mi? İstediğiniz zaman sunucularınızı değiştirin ve takipçilerinizi de getirin.",
+  "domain_pill.your_username": "Bu sunucudaki tekil tanımlayıcınız. Farklı sunucularda aynı kullanıcı adına sahip kullanıcıları bulmak mümkündür.",
   "embed.instructions": "Aşağıdaki kodu kopyalayarak bu durumu sitenize gömün.",
   "embed.preview": "İşte nasıl görüneceği:",
   "emoji_button.activity": "Aktivite",
@@ -402,9 +427,15 @@
   "loading_indicator.label": "Yükleniyor…",
   "media_gallery.toggle_visible": "{number, plural, one {Resmi} other {Resimleri}} gizle",
   "moved_to_account_banner.text": "{disabledAccount} hesabınız, {movedToAccount} hesabına taşıdığınız için şu an devre dışı.",
-  "mute_modal.duration": "Süre",
-  "mute_modal.hide_notifications": "Bu kullanıcıdan bildirimler gizlensin mı?",
-  "mute_modal.indefinite": "Belirsiz",
+  "mute_modal.hide_from_notifications": "Bildirimlerde gizle",
+  "mute_modal.hide_options": "Seçenekleri gizle",
+  "mute_modal.indefinite": "Ben sessizliklerini kaldırana kadar",
+  "mute_modal.show_options": "Seçenekleri göster",
+  "mute_modal.they_can_mention_and_follow": "Sizden bahsedebilir ve sizi takip edebilirler, ancak siz onları göremezsiniz.",
+  "mute_modal.they_wont_know": "Susturulduklarını bilmeyecekler.",
+  "mute_modal.title": "Kullanıcıyı sustur?",
+  "mute_modal.you_wont_see_mentions": "Onlardan bahseden gönderiler göremezsiniz.",
+  "mute_modal.you_wont_see_posts": "Onlar sizin gönderilerinizi görmeye devam edebilir, ancak siz onlarınkini göremezsiniz.",
   "navigation_bar.about": "Hakkında",
   "navigation_bar.advanced_interface": "Gelişmiş web arayüzünde aç",
   "navigation_bar.blocks": "Engellenen kullanıcılar",
diff --git a/app/javascript/mastodon/locales/tt.json b/app/javascript/mastodon/locales/tt.json
index ccddd82490c086..82d45205c2143f 100644
--- a/app/javascript/mastodon/locales/tt.json
+++ b/app/javascript/mastodon/locales/tt.json
@@ -134,9 +134,7 @@
   "compose_form.spoiler.marked": "Text is hidden behind warning",
   "compose_form.spoiler.unmarked": "Text is not hidden",
   "confirmation_modal.cancel": "Баш тарту",
-  "confirmations.block.block_and_report": "Блоклау һәм шикаять итү",
   "confirmations.block.confirm": "Блоклау",
-  "confirmations.block.message": "Сез {name} кулланучыны блокларга телисезме?",
   "confirmations.cancel_follow_request.confirm": "Сорауны баш тарту",
   "confirmations.cancel_follow_request.message": "Сез абонемент соравыгызны кире кайтарырга телисез {name}?",
   "confirmations.delete.confirm": "Бетерү",
@@ -145,14 +143,11 @@
   "confirmations.delete_list.message": "Сез бу исемлекне мәңгегә бетерергә телисезме?",
   "confirmations.discard_edit_media.confirm": "Баш тарту",
   "confirmations.discard_edit_media.message": "Сезнең медиа тасвирламасында яки алдан карау өчен сакланмаган үзгәрешләр бармы? ",
-  "confirmations.domain_block.confirm": "Hide entire domain",
   "confirmations.domain_block.message": "Сез чыннан да барысын да блокларга телисез {domain}? Күпчелек очракта берничә максатлы блоклар яки тавышсызлар җитәрлек һәм өстенлекле. Сез бу доменнан эчтәлекне җәмәгать срокларында яки хәбәрләрегездә күрмәячәксез. Бу доменнан сезнең шәкертләр бетереләчәк.",
   "confirmations.edit.confirm": "Үзгәртү",
   "confirmations.logout.confirm": "Чыгу",
   "confirmations.logout.message": "Сез чыгарга телисезме?",
   "confirmations.mute.confirm": "Тавышсыз",
-  "confirmations.mute.explanation": "Бу алардан ураза тотуны һәм алар турында искә алуны яшерәчәк, ләкин бу аларга уразаларыгызны күрергә һәм язылырга мөмкинлек бирәчәк.",
-  "confirmations.mute.message": "Сез тавышны сүндерергә телисез {name}?",
   "confirmations.redraft.confirm": "Бетерү & эшкәртү",
   "confirmations.reply.confirm": "Җавап бирү",
   "confirmations.reply.message": "Тһеавап хәзер сез ясаган хәбәрне яңадан язуга китерәчәк. Сез дәвам итәсегез киләме?",
@@ -301,8 +296,6 @@
   "lists.replies_policy.none": "Һичкем",
   "lists.subheading": "Исемлегегегезләр",
   "load_pending": "{count, plural, one {# яңа элемент} other {# яңа элемент}}",
-  "mute_modal.duration": "Дәвамлык",
-  "mute_modal.indefinite": "Билгесез",
   "navigation_bar.about": "Проект турында",
   "navigation_bar.blocks": "Блокланган кулланучылар",
   "navigation_bar.bookmarks": "Кыстыргычлар",
diff --git a/app/javascript/mastodon/locales/ug.json b/app/javascript/mastodon/locales/ug.json
index 9dc3b5c1f985cf..4120d4483b264c 100644
--- a/app/javascript/mastodon/locales/ug.json
+++ b/app/javascript/mastodon/locales/ug.json
@@ -17,7 +17,6 @@
   "compose_form.spoiler.marked": "Text is hidden behind warning",
   "compose_form.spoiler.unmarked": "Text is not hidden",
   "confirmations.delete.message": "Are you sure you want to delete this status?",
-  "confirmations.domain_block.confirm": "Hide entire domain",
   "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
   "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.",
   "embed.instructions": "Embed this status on your website by copying the code below.",
diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json
index 14cff9d82fad2b..bb0d0b39e2aed8 100644
--- a/app/javascript/mastodon/locales/uk.json
+++ b/app/javascript/mastodon/locales/uk.json
@@ -160,9 +160,7 @@
   "compose_form.spoiler.unmarked": "Додати попередження про вміст",
   "compose_form.spoiler_placeholder": "Попередження про вміст (необов'язково)",
   "confirmation_modal.cancel": "Скасувати",
-  "confirmations.block.block_and_report": "Заблокувати та поскаржитися",
   "confirmations.block.confirm": "Заблокувати",
-  "confirmations.block.message": "Ви впевнені, що хочете заблокувати {name}?",
   "confirmations.cancel_follow_request.confirm": "Відкликати запит",
   "confirmations.cancel_follow_request.message": "Ви дійсно бажаєте відкликати запит на стеження за {name}?",
   "confirmations.delete.confirm": "Видалити",
@@ -171,15 +169,12 @@
   "confirmations.delete_list.message": "Ви впевнені, що хочете видалити цей список назавжди?",
   "confirmations.discard_edit_media.confirm": "Відкинути",
   "confirmations.discard_edit_media.message": "У вас є незбережені зміни в описі медіа або попереднього перегляду, все одно відкинути їх?",
-  "confirmations.domain_block.confirm": "Заблокувати весь домен",
   "confirmations.domain_block.message": "Ви точно, точно впевнені, що хочете заблокувати весь домен {domain}? У більшості випадків для нормальної роботи краще заблокувати або приховати лише деяких користувачів. Ви не зможете бачити контент з цього домену у будь-яких стрічках або ваших сповіщеннях. Ваші підписники з цього домену будуть відписані від вас.",
   "confirmations.edit.confirm": "Змінити",
   "confirmations.edit.message": "Редагування перезапише повідомлення, яке ви зараз пишете. Ви впевнені, що хочете продовжити?",
   "confirmations.logout.confirm": "Вийти",
   "confirmations.logout.message": "Ви впевнені, що хочете вийти?",
   "confirmations.mute.confirm": "Приховати",
-  "confirmations.mute.explanation": "Це сховає дописи від них і дописи зі згадками про них, проте вони все одно матимуть змогу бачити ваші дописи й підписуватися на вас.",
-  "confirmations.mute.message": "Ви впевнені, що хочете приховати {name}?",
   "confirmations.redraft.confirm": "Видалити та виправити",
   "confirmations.redraft.message": "Ви впевнені, що хочете видалити цей допис та переписати його? Додавання у вибране та поширення буде втрачено, а відповіді на оригінальний допис залишаться без першоджерела.",
   "confirmations.reply.confirm": "Відповісти",
@@ -402,9 +397,6 @@
   "loading_indicator.label": "Завантаження…",
   "media_gallery.toggle_visible": "{number, plural, one {Приховати зображення} other {Приховати зображення}}",
   "moved_to_account_banner.text": "Ваш обліковий запис {disabledAccount} наразі вимкнений, оскільки вас перенесено до {movedToAccount}.",
-  "mute_modal.duration": "Тривалість",
-  "mute_modal.hide_notifications": "Сховати сповіщення цього користувача?",
-  "mute_modal.indefinite": "Невизначений строк",
   "navigation_bar.about": "Про застосунок",
   "navigation_bar.advanced_interface": "Відкрити в розширеному вебінтерфейсі",
   "navigation_bar.blocks": "Заблоковані користувачі",
diff --git a/app/javascript/mastodon/locales/ur.json b/app/javascript/mastodon/locales/ur.json
index d344f00c87ff3c..37f156c28fc9f6 100644
--- a/app/javascript/mastodon/locales/ur.json
+++ b/app/javascript/mastodon/locales/ur.json
@@ -121,20 +121,15 @@
   "compose_form.spoiler.marked": "Text is hidden behind warning",
   "compose_form.spoiler.unmarked": "Text is not hidden",
   "confirmation_modal.cancel": "منسوخ",
-  "confirmations.block.block_and_report": "شکایت کریں اور بلاک کریں",
   "confirmations.block.confirm": "بلاک",
-  "confirmations.block.message": "کیا واقعی آپ {name} کو بلاک کرنا چاہتے ہیں؟",
   "confirmations.delete.confirm": "ڈیلیٹ",
   "confirmations.delete.message": "Are you sure you want to delete this status?",
   "confirmations.delete_list.confirm": "ڈیلیٹ",
   "confirmations.delete_list.message": "کیا آپ واقعی اس فہرست کو مستقل طور پر ڈیلیٹ کرنا چاہتے ہیں؟",
-  "confirmations.domain_block.confirm": "Hide entire domain",
   "confirmations.domain_block.message": "کیا آپ واقعی، واقعی یقین رکھتے ہیں کہ آپ پورے {domain} کو بلاک کرنا چاہتے ہیں؟ زیادہ تر معاملات میں چند ٹارگٹیڈ بلاکس یا خاموش کرنا کافی اور افضل ہیں۔ آپ اس ڈومین کا مواد کسی بھی عوامی ٹائم لائنز یا اپنی اطلاعات میں نہیں دیکھیں گے۔ اس ڈومین سے آپ کے پیروکاروں کو ہٹا دیا جائے گا۔",
   "confirmations.logout.confirm": "لاگ آؤٹ",
   "confirmations.logout.message": "کیا واقعی آپ لاگ آؤٹ ہونا چاہتے ہیں؟",
   "confirmations.mute.confirm": "خاموش",
-  "confirmations.mute.explanation": "یہ ان سے پوسٹس اور ان کا تذکرہ کرنے والی پوسٹس کو چھپائے گا، لیکن یہ پھر بھی انہیں آپ کی پوسٹس دیکھنے اور آپ کی پیروی کرنے کی اجازت دے گا۔",
-  "confirmations.mute.message": "کیا واقعی آپ {name} کو خاموش کرنا چاہتے ہیں؟",
   "confirmations.redraft.confirm": "ڈیلیٹ کریں اور دوبارہ ڈرافٹ کریں",
   "confirmations.reply.confirm": "جواب دیں",
   "confirmations.reply.message": "ابھی جواب دینے سے وہ پیغام اوور رائٹ ہو جائے گا جو آپ فی الحال لکھ رہے ہیں۔ کیا آپ واقعی آگے بڑھنا چاہتے ہیں؟",
@@ -223,7 +218,6 @@
   "keyboard_shortcuts.toot": "to start a brand new toot",
   "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
   "keyboard_shortcuts.up": "to move up in the list",
-  "mute_modal.indefinite": "غیر معینہ",
   "navigation_bar.blocks": "مسدود صارفین",
   "navigation_bar.bookmarks": "بُک مارکس",
   "navigation_bar.community_timeline": "مقامی ٹائم لائن",
diff --git a/app/javascript/mastodon/locales/uz.json b/app/javascript/mastodon/locales/uz.json
index b307d917fad0b7..77892914a42263 100644
--- a/app/javascript/mastodon/locales/uz.json
+++ b/app/javascript/mastodon/locales/uz.json
@@ -132,9 +132,7 @@
   "compose_form.spoiler.marked": "Kontent ogohlantirishini olib tashlang",
   "compose_form.spoiler.unmarked": "Kontent haqida ogohlantirish qo'shing",
   "confirmation_modal.cancel": "Bekor qilish",
-  "confirmations.block.block_and_report": "Bloklash va hisobot berish",
   "confirmations.block.confirm": "Bloklash",
-  "confirmations.block.message": "Haqiqatan ham {name}ni bloklamoqchimisiz?",
   "confirmations.cancel_follow_request.confirm": "Bekor qilish",
   "confirmations.cancel_follow_request.message": "Haqiqatan ham {name}ga obuna boʻlish soʻrovingizni qaytarib olmoqchimisiz?",
   "confirmations.delete.confirm": "Oʻchirish",
@@ -143,13 +141,10 @@
   "confirmations.delete_list.message": "Haqiqatan ham bu roʻyxatni butunlay oʻchirib tashlamoqchimisiz?",
   "confirmations.discard_edit_media.confirm": "Bekor qilish",
   "confirmations.discard_edit_media.message": "Sizda media tavsifi yoki oldindan ko‘rishda saqlanmagan o‘zgarishlar bor, ular baribir bekor qilinsinmi?",
-  "confirmations.domain_block.confirm": "Butun domenni bloklash",
   "confirmations.domain_block.message": "Haqiqatan ham, {domain} ni butunlay bloklamoqchimisiz? Ko'pgina hollarda bir nechta maqsadli bloklar yoki ovozni o'chirish etarli va afzaldir. Siz oʻsha domendagi kontentni hech qanday umumiy vaqt jadvallarida yoki bildirishnomalaringizda koʻrmaysiz. Bu domendagi obunachilaringiz olib tashlanadi.",
   "confirmations.logout.confirm": "Chiqish",
   "confirmations.logout.message": "Chiqishingizga aminmisiz?",
   "confirmations.mute.confirm": "Ovozsiz",
-  "confirmations.mute.explanation": "Bu ulardagi postlar va ular haqida eslatib o'tilgan postlarni yashiradi, ammo bu ularga sizning postlaringizni ko'rish va sizni kuzatish imkonini beradi.",
-  "confirmations.mute.message": "Haqiqatan ham {name} ovozini o‘chirib qo‘ymoqchimisiz?",
   "confirmations.redraft.confirm": "O'chirish va qayta loyihalash",
   "confirmations.reply.confirm": "Javob berish",
   "confirmations.reply.message": "Hozir javob bersangiz, hozir yozayotgan xabaringiz ustidan yoziladi. Davom etishni xohlaysizmi?",
@@ -314,9 +309,6 @@
   "load_pending": "{count, plural, one {# yangi element} other {# yangi elementlar}}",
   "media_gallery.toggle_visible": "{number, plural, one {Rasmni yashirish} other {Rasmlarni yashirish}}",
   "moved_to_account_banner.text": "{movedToAccount} hisobiga koʻchganingiz uchun {disabledAccount} hisobingiz hozirda oʻchirib qoʻyilgan.",
-  "mute_modal.duration": "Davomiyligi",
-  "mute_modal.hide_notifications": "Bu foydalanuvchidan bildirishnomalar berkitilsinmi?",
-  "mute_modal.indefinite": "Cheksiz",
   "navigation_bar.about": "Haqida",
   "navigation_bar.blocks": "Bloklangan foydalanuvchilar",
   "navigation_bar.bookmarks": "Xatcho‘plar",
diff --git a/app/javascript/mastodon/locales/vi.json b/app/javascript/mastodon/locales/vi.json
index afd912556ea503..b51b832b2b65ba 100644
--- a/app/javascript/mastodon/locales/vi.json
+++ b/app/javascript/mastodon/locales/vi.json
@@ -89,6 +89,14 @@
   "announcement.announcement": "Có gì mới?",
   "attachments_list.unprocessed": "(chưa xử lí)",
   "audio.hide": "Ẩn âm thanh",
+  "block_modal.remote_users_caveat": "Chúng tôi sẽ yêu cầu {domain} tôn trọng quyết định của bạn. Tuy nhiên, việc tuân thủ không được đảm bảo vì một số máy chủ có thể xử lý việc chặn theo cách khác nhau. Các tút công khai vẫn có thể hiển thị đối với người dùng chưa đăng nhập.",
+  "block_modal.show_less": "Thu gọn",
+  "block_modal.show_more": "Hiện thêm",
+  "block_modal.they_cant_mention": "Họ không thể nhắc đến hay theo dõi bạn.",
+  "block_modal.they_cant_see_posts": "Bạn và họ sẽ không nhìn thấy tút của nhau.",
+  "block_modal.they_will_know": "Họ sẽ biết đã bị bạn chặn.",
+  "block_modal.title": "Chặn người này?",
+  "block_modal.you_wont_see_mentions": "Bạn sẽ không nhìn thấy tút có nhắc đến họ.",
   "boost_modal.combo": "Nhấn {combo} để bỏ qua bước này",
   "bundle_column_error.copy_stacktrace": "Sao chép báo lỗi",
   "bundle_column_error.error.body": "Không thể hiện trang này. Đây có thể là một lỗi trong mã lập trình của chúng tôi, hoặc là vấn đề tương thích của trình duyệt.",
@@ -160,9 +168,7 @@
   "compose_form.spoiler.unmarked": "Tạo nội dung ẩn",
   "compose_form.spoiler_placeholder": "Nội dung ẩn (tùy chọn)",
   "confirmation_modal.cancel": "Hủy bỏ",
-  "confirmations.block.block_and_report": "Chặn & Báo cáo",
   "confirmations.block.confirm": "Chặn",
-  "confirmations.block.message": "Bạn có thật sự muốn chặn {name}?",
   "confirmations.cancel_follow_request.confirm": "Thu hồi yêu cầu",
   "confirmations.cancel_follow_request.message": "Bạn có chắc muốn thu hồi yêu cầu theo dõi của bạn với {name}?",
   "confirmations.delete.confirm": "Xóa bỏ",
@@ -171,15 +177,13 @@
   "confirmations.delete_list.message": "Bạn thật sự muốn xóa vĩnh viễn danh sách này?",
   "confirmations.discard_edit_media.confirm": "Bỏ qua",
   "confirmations.discard_edit_media.message": "Bạn chưa lưu thay đổi đối với phần mô tả hoặc bản xem trước của media, vẫn bỏ luôn?",
-  "confirmations.domain_block.confirm": "Ẩn toàn bộ máy chủ",
+  "confirmations.domain_block.confirm": "Chặn máy chủ",
   "confirmations.domain_block.message": "Bạn thật sự muốn ẩn toàn bộ nội dung từ {domain}? Sẽ hợp lý hơn nếu bạn chỉ chặn hoặc ẩn một vài tài khoản cụ thể. Ẩn toàn bộ nội dung từ máy chủ sẽ khiến bạn không còn thấy nội dung từ máy chủ đó ở bất kỳ nơi nào, kể cả thông báo. Người quan tâm bạn từ máy chủ đó cũng sẽ bị xóa luôn.",
   "confirmations.edit.confirm": "Sửa",
   "confirmations.edit.message": "Nội dung tút cũ sẽ bị ghi đè, bạn có tiếp tục?",
   "confirmations.logout.confirm": "Đăng xuất",
   "confirmations.logout.message": "Bạn có thật sự muốn thoát?",
   "confirmations.mute.confirm": "Ẩn",
-  "confirmations.mute.explanation": "Điều này sẽ khiến tút của họ và những tút có nhắc đến họ bị ẩn, tuy nhiên họ vẫn có thể xem tút của bạn và theo dõi bạn.",
-  "confirmations.mute.message": "Bạn thật sự muốn ẩn {name}?",
   "confirmations.redraft.confirm": "Xóa & viết lại",
   "confirmations.redraft.message": "Bạn thật sự muốn xóa tút và viết lại? Điều này sẽ xóa mất những lượt thích và đăng lại của tút, cũng như những trả lời sẽ không còn nội dung gốc.",
   "confirmations.reply.confirm": "Trả lời",
@@ -205,6 +209,27 @@
   "dismissable_banner.explore_statuses": "Đây là những tút đang phổ biến trong mạng liên hợp của máy chủ này.",
   "dismissable_banner.explore_tags": "Đây là những hashtag đang được sử dụng nhiều trong mạng liên hợp của máy chủ này.",
   "dismissable_banner.public_timeline": "Đây là những tút công khai gần đây trong mạng liên hợp của máy chủ {domain}.",
+  "domain_block_modal.block": "Chặn máy chủ",
+  "domain_block_modal.block_account_instead": "Chỉ chặn {name}",
+  "domain_block_modal.they_can_interact_with_old_posts": "Thành viên máy chủ này có thể tương tác với các tút cũ của bạn.",
+  "domain_block_modal.they_cant_follow": "Không ai trên máy chủ này có thể theo dõi bạn.",
+  "domain_block_modal.they_wont_know": "Họ sẽ không biết đã bị bạn chặn.",
+  "domain_block_modal.title": "Chặn máy chủ?",
+  "domain_block_modal.you_will_lose_followers": "Những người theo dõi bạn ở máy chủ này sẽ bị xóa.",
+  "domain_block_modal.you_wont_see_posts": "Bạn sẽ không thấy tút hoặc thông báo từ thành viên máy chủ này.",
+  "domain_pill.activitypub_lets_connect": "Nó cho phép bạn kết nối và tương tác với mọi người không chỉ trên Mastodon mà còn trên các ứng dụng xã hội khác.",
+  "domain_pill.activitypub_like_language": "ActivityPub giống như ngôn ngữ Mastodon giao tiếp với các mạng xã hội khác.",
+  "domain_pill.server": "Máy chủ",
+  "domain_pill.their_handle": "Địa chỉ Mastodon:",
+  "domain_pill.their_server": "Ngôi nhà kỹ thuật số, nơi lưu giữ tút của ai đó.",
+  "domain_pill.their_username": "Danh tính duy nhất của họ trên máy chủ này. Có thể có tên người dùng giống nhau trên các máy chủ khác.",
+  "domain_pill.username": "Tên người dùng",
+  "domain_pill.whats_in_a_handle": "Địa chỉ Mastodon là gì?",
+  "domain_pill.who_they_are": "Vì địa chỉ Mastodon cho biết một người là ai và họ ở đâu, nên bạn có thể tương tác với mọi người trên các nền tảng có <button>hỗ trợ ActivityPub</button>.",
+  "domain_pill.who_you_are": "Vì địa chỉ Mastodon cho biết bạn là ai và bạn ở đâu, nên bạn có thể tương tác với mọi người trên các nền tảng có <button>hỗ trợ ActivityPub</button>.",
+  "domain_pill.your_handle": "Địa chỉ Mastodon của bạn:",
+  "domain_pill.your_server": "Ngôi nhà kỹ thuật số, nơi lưu giữ tút của bạn. Không thích ở đây? Chuyển sang máy chủ khác và mang theo người theo dõi của bạn.",
+  "domain_pill.your_username": "Danh tính duy nhất của bạn trên máy chủ này. Có thể có tên người dùng giống bạn trên các máy chủ khác.",
   "embed.instructions": "Sao chép đoạn mã dưới đây và chèn vào trang web của bạn.",
   "embed.preview": "Nó sẽ hiển thị như vầy:",
   "emoji_button.activity": "Hoạt động",
@@ -402,9 +427,15 @@
   "loading_indicator.label": "Đang tải…",
   "media_gallery.toggle_visible": "{number, plural, other {Ẩn hình ảnh}}",
   "moved_to_account_banner.text": "Tài khoản {disabledAccount} của bạn hiện không khả dụng vì bạn đã chuyển sang {movedToAccount}.",
-  "mute_modal.duration": "Thời hạn",
-  "mute_modal.hide_notifications": "Ẩn thông báo từ người này?",
-  "mute_modal.indefinite": "Vĩnh viễn",
+  "mute_modal.hide_from_notifications": "Ẩn thông báo",
+  "mute_modal.hide_options": "Tùy chọn ẩn",
+  "mute_modal.indefinite": "Cho tới khi bỏ ẩn",
+  "mute_modal.show_options": "Hiển thị tùy chọn",
+  "mute_modal.they_can_mention_and_follow": "Họ có thể nhắc đến và theo dõi bạn, nhưng bạn không thấy họ.",
+  "mute_modal.they_wont_know": "Họ sẽ không biết đã bị bạn ẩn.",
+  "mute_modal.title": "Ẩn người này?",
+  "mute_modal.you_wont_see_mentions": "Bạn sẽ không nhìn thấy tút có nhắc đến họ.",
+  "mute_modal.you_wont_see_posts": "Bạn sẽ không nhìn thấy tút của họ.",
   "navigation_bar.about": "Giới thiệu",
   "navigation_bar.advanced_interface": "Dùng bố cục nhiều cột",
   "navigation_bar.blocks": "Người đã chặn",
@@ -662,9 +693,11 @@
   "status.direct": "Nhắn riêng @{name}",
   "status.direct_indicator": "Nhắn riêng",
   "status.edit": "Sửa",
+  "status.edited": "Sửa lần cuối {date}",
   "status.edited_x_times": "Đã sửa {count, plural, other {{count} lần}}",
   "status.embed": "Nhúng",
   "status.favourite": "Thích",
+  "status.favourites": "{count, plural, other {lượt thích}}",
   "status.filter": "Lọc tút này",
   "status.filtered": "Bộ lọc",
   "status.hide": "Ẩn tút",
@@ -685,6 +718,7 @@
   "status.reblog": "Đăng lại",
   "status.reblog_private": "Đăng lại (Riêng tư)",
   "status.reblogged_by": "{name} đăng lại",
+  "status.reblogs": "{count, plural, other {đăng lại}}",
   "status.reblogs.empty": "Tút này chưa có ai đăng lại. Nếu có, nó sẽ hiển thị ở đây.",
   "status.redraft": "Xóa và viết lại",
   "status.remove_bookmark": "Bỏ lưu",
diff --git a/app/javascript/mastodon/locales/zgh.json b/app/javascript/mastodon/locales/zgh.json
index a585838cd22af9..1d3a22108cd7ba 100644
--- a/app/javascript/mastodon/locales/zgh.json
+++ b/app/javascript/mastodon/locales/zgh.json
@@ -48,11 +48,9 @@
   "compose_form.spoiler.unmarked": "Text is not hidden",
   "confirmation_modal.cancel": "ⵙⵔ",
   "confirmations.block.confirm": "ⴳⴷⵍ",
-  "confirmations.block.message": "ⵉⵙ ⵏⵉⵜ ⵜⵅⵙⴷ ⴰⴷ ⵜⴳⴷⵍⴷ {name}?",
   "confirmations.delete.confirm": "ⴽⴽⵙ",
   "confirmations.delete.message": "ⵉⵙ ⵏⵉⵜ ⵜⵅⵙⴷ ⴰⴷ ⵜⴽⴽⵙⴷ ⵜⴰⵥⵕⵉⴳⵜ ⴰ?",
   "confirmations.delete_list.confirm": "ⴽⴽⵙ",
-  "confirmations.domain_block.confirm": "Hide entire domain",
   "confirmations.logout.confirm": "ⴼⴼⵖ",
   "confirmations.logout.message": "ⵉⵙ ⵏⵉⵜ ⵜⵅⵙⴷ ⴰⴷ ⵜⴼⴼⵖⴷ?",
   "confirmations.mute.confirm": "ⵥⵥⵉⵥⵏ",
diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json
index 7694270d1026b2..1a39dc235c6007 100644
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@@ -89,6 +89,14 @@
   "announcement.announcement": "公告",
   "attachments_list.unprocessed": "(未处理)",
   "audio.hide": "隐藏音频",
+  "block_modal.remote_users_caveat": "我们将要求服务器 {domain} 尊重您的决定。然而，无法保证对方一定遵从，因为某些服务器可能会以不同的方式处理屏蔽操作。公开嘟文仍然可能对未登录用户可见。",
+  "block_modal.show_less": "显示更少",
+  "block_modal.show_more": "显示更多",
+  "block_modal.they_cant_mention": "他们不能提及或关注你。",
+  "block_modal.they_cant_see_posts": "他们看不到你的嘟文，你也看不到他们的嘟文。",
+  "block_modal.they_will_know": "他们可以看到他们被屏蔽。",
+  "block_modal.title": "屏蔽用户？",
+  "block_modal.you_wont_see_mentions": "你不会看到提及他们的嘟文。",
   "boost_modal.combo": "下次按住 {combo} 即可跳过此提示",
   "bundle_column_error.copy_stacktrace": "复制错误报告",
   "bundle_column_error.error.body": "请求的页面无法渲染，可能是代码出现错误或浏览器存在兼容性问题。",
@@ -160,9 +168,7 @@
   "compose_form.spoiler.unmarked": "添加内容警告",
   "compose_form.spoiler_placeholder": "内容警告 (可选)",
   "confirmation_modal.cancel": "取消",
-  "confirmations.block.block_and_report": "屏蔽与举报",
   "confirmations.block.confirm": "屏蔽",
-  "confirmations.block.message": "确定要屏蔽 {name} 吗？",
   "confirmations.cancel_follow_request.confirm": "撤回请求",
   "confirmations.cancel_follow_request.message": "确定撤回关注 {name} 的请求吗？",
   "confirmations.delete.confirm": "删除",
@@ -171,15 +177,13 @@
   "confirmations.delete_list.message": "确定永久删除这个列表吗？",
   "confirmations.discard_edit_media.confirm": "丢弃",
   "confirmations.discard_edit_media.message": "您还有未保存的媒体描述或预览修改，仍要丢弃吗？",
-  "confirmations.domain_block.confirm": "屏蔽整个域名",
+  "confirmations.domain_block.confirm": "屏蔽服务器",
   "confirmations.domain_block.message": "你真的确定要屏蔽所有来自 {domain} 的内容吗？多数情况下，对几个特定的用户进行屏蔽或禁用对他们的消息提醒就足够了。屏蔽后，来自该域名的内容将不再出现在你任何的公共时间轴或通知列表里，你来自该域名下的关注者也将被移除。",
   "confirmations.edit.confirm": "编辑",
   "confirmations.edit.message": "编辑此消息将会覆盖当前正在撰写的信息。仍要继续吗？",
   "confirmations.logout.confirm": "退出登录",
   "confirmations.logout.message": "确定要退出登录吗？",
   "confirmations.mute.confirm": "隐藏",
-  "confirmations.mute.explanation": "他们的嘟文以及提到他们的嘟文都会隐藏，但他们仍然可以看到你的嘟文，也可以关注你。",
-  "confirmations.mute.message": "你确定要隐藏 {name} 吗？",
   "confirmations.redraft.confirm": "删除并重新编辑",
   "confirmations.redraft.message": "确定删除这条嘟文并重写吗？所有相关的喜欢和转嘟都将丢失，嘟文的回复也会失去关联。",
   "confirmations.reply.confirm": "回复",
@@ -205,6 +209,27 @@
   "dismissable_banner.explore_statuses": "这些是目前在社交网络上引起关注的嘟文。嘟文的喜欢和转嘟次数越多，排名越高。",
   "dismissable_banner.explore_tags": "这些标签正在本站和分布式网络上其他站点的用户中引起关注。",
   "dismissable_banner.public_timeline": "这些是在 {domain} 上关注的人们最新发布的公开嘟文。",
+  "domain_block_modal.block": "屏蔽服务器",
+  "domain_block_modal.block_account_instead": "改为屏蔽 @{name}",
+  "domain_block_modal.they_can_interact_with_old_posts": "来自该服务器的人可以与你之前的嘟文交互。",
+  "domain_block_modal.they_cant_follow": "此服务器上没有人可以关注你。",
+  "domain_block_modal.they_wont_know": "他们不会知道自己被屏蔽。",
+  "domain_block_modal.title": "屏蔽该域名？",
+  "domain_block_modal.you_will_lose_followers": "该服务器上你的所有关注者都会被删除。",
+  "domain_block_modal.you_wont_see_posts": "你将不会看到此服务器上用户的嘟文或通知。",
+  "domain_pill.activitypub_lets_connect": "它让你不仅能与Mastodon上的人交流互动，还能与其它不同社交应用上的人联系。",
+  "domain_pill.activitypub_like_language": "ActivityPub就像Mastodon与其它社交网络交流时使用的语言。",
+  "domain_pill.server": "服务器",
+  "domain_pill.their_handle": "它们的代号：",
+  "domain_pill.their_server": "它们的数字家园，它们的所有嘟文都存放在那里。",
+  "domain_pill.their_username": "它们在它们的服务器上的唯一标识符。在不同的服务器上可能会找到相同用户名的用户。",
+  "domain_pill.username": "用户名",
+  "domain_pill.whats_in_a_handle": "代号里都有什么？",
+  "domain_pill.who_they_are": "代号可以告诉你一个人是谁和在哪里，所以你可以在社交网络上与<button>由ActivityPub驱动的不同平台</button>的人们互动。",
+  "domain_pill.who_you_are": "你的代号可以告诉别人你是谁和你在哪里，这样社交网络上来自<button>由ActivityPub驱动的不同平台</button>的人们就可以与你互动。",
+  "domain_pill.your_handle": "你的代号：",
+  "domain_pill.your_server": "你的数字家园，你的所有嘟文都存放在这里。不喜欢这个服务器吗？随时带上你的关注者一起迁移到其它服务器。",
+  "domain_pill.your_username": "你在这个服务器上的唯一标识符。在不同的服务器上可能会找到相同用户名的用户。",
   "embed.instructions": "复制下列代码以在你的网站中嵌入此嘟文。",
   "embed.preview": "它会像这样显示出来：",
   "emoji_button.activity": "活动",
@@ -402,9 +427,15 @@
   "loading_indicator.label": "加载中…",
   "media_gallery.toggle_visible": "{number, plural, other {隐藏图像}}",
   "moved_to_account_banner.text": "您的账号 {disabledAccount} 已禁用，因为您已迁移到 {movedToAccount}。",
-  "mute_modal.duration": "持续时长",
-  "mute_modal.hide_notifications": "同时隐藏来自这个用户的通知？",
-  "mute_modal.indefinite": "无期限",
+  "mute_modal.hide_from_notifications": "从通知中隐藏",
+  "mute_modal.hide_options": "隐藏选项",
+  "mute_modal.indefinite": "直到我取消隐藏他们",
+  "mute_modal.show_options": "显示选项",
+  "mute_modal.they_can_mention_and_follow": "他们可以提及和关注你，但是你看不到他们。",
+  "mute_modal.they_wont_know": "它们不会知道自己已被隐藏。",
+  "mute_modal.title": "隐藏用户？",
+  "mute_modal.you_wont_see_mentions": "你看不到提及他们的嘟文。",
+  "mute_modal.you_wont_see_posts": "他们可以看到你的嘟文，但是你看不到他们的。",
   "navigation_bar.about": "关于",
   "navigation_bar.advanced_interface": "在高级网页界面中打开",
   "navigation_bar.blocks": "已屏蔽的用户",
@@ -545,7 +576,7 @@
   "privacy.direct.short": "具体的人",
   "privacy.private.long": "仅限您的关注者",
   "privacy.private.short": "关注者",
-  "privacy.public.long": "所有Mastodon内外的人",
+  "privacy.public.long": "所有 Mastodon 内外的人",
   "privacy.public.short": "公开",
   "privacy.unlisted.additional": "该模式的行为与“公开”完全相同，只是帖子不会出现在实时动态、话题标签、探索或 Mastodon 搜索中，即使你已在账户级设置中选择加入。",
   "privacy.unlisted.long": "减少算法影响",
diff --git a/app/javascript/mastodon/locales/zh-HK.json b/app/javascript/mastodon/locales/zh-HK.json
index 3ec1085ec23599..44a1435b2f3747 100644
--- a/app/javascript/mastodon/locales/zh-HK.json
+++ b/app/javascript/mastodon/locales/zh-HK.json
@@ -89,6 +89,14 @@
   "announcement.announcement": "公告",
   "attachments_list.unprocessed": "（未處理）",
   "audio.hide": "隱藏音訊",
+  "block_modal.remote_users_caveat": "我們會要求 {domain} 伺服器尊重你的決定。然而，由於部份伺服器可能以不同方式處理封鎖，因此無法保證一定會成功。公開帖文仍然有機會被未登入的使用者看見。",
+  "block_modal.show_less": "顯示更少",
+  "block_modal.show_more": "顯示更多",
+  "block_modal.they_cant_mention": "對方無法提及和追蹤你。",
+  "block_modal.they_cant_see_posts": "你們無法看到對方的帖文。",
+  "block_modal.they_will_know": "對方會看到自己被封鎖。",
+  "block_modal.title": "封鎖使用者？",
+  "block_modal.you_wont_see_mentions": "你將不會看到提及對方的帖文。",
   "boost_modal.combo": "你下次可以按 {combo} 來跳過",
   "bundle_column_error.copy_stacktrace": "複製錯誤報告",
   "bundle_column_error.error.body": "無法提供請求的頁面。這可能是因為代碼出現錯誤或瀏覽器出現兼容問題。",
@@ -160,9 +168,7 @@
   "compose_form.spoiler.unmarked": "文字沒有被隱藏",
   "compose_form.spoiler_placeholder": "內容警告 (選用)",
   "confirmation_modal.cancel": "取消",
-  "confirmations.block.block_and_report": "封鎖並檢舉",
   "confirmations.block.confirm": "封鎖",
-  "confirmations.block.message": "你確定要封鎖{name}嗎？",
   "confirmations.cancel_follow_request.confirm": "撤回請求",
   "confirmations.cancel_follow_request.message": "您確定要撤回追蹤 {name} 的請求嗎？",
   "confirmations.delete.confirm": "刪除",
@@ -171,15 +177,13 @@
   "confirmations.delete_list.message": "你確定要永久刪除這列表嗎？",
   "confirmations.discard_edit_media.confirm": "捨棄",
   "confirmations.discard_edit_media.message": "您在媒體描述或預覽有尚未儲存的變更。確定要捨棄它們嗎？",
-  "confirmations.domain_block.confirm": "封鎖整個網站",
+  "confirmations.domain_block.confirm": "封鎖伺服器",
   "confirmations.domain_block.message": "你真的真的確定要封鎖整個 {domain} ？多數情況下，封鎖或靜音幾個特定目標就已經有效，也是比較建議的做法。若然封鎖全站，你將不會再在這裏看到該站的內容和通知。來自該站的關注者亦會被移除。",
   "confirmations.edit.confirm": "編輯",
   "confirmations.edit.message": "現在編輯將會覆蓋你目前正在撰寫的訊息。你確定要繼續嗎？",
   "confirmations.logout.confirm": "登出",
   "confirmations.logout.message": "確定要登出嗎？",
   "confirmations.mute.confirm": "靜音",
-  "confirmations.mute.explanation": "這將會隱藏來自他們的貼文與通知，但是他們還是可以查閱你的貼文與關注你。",
-  "confirmations.mute.message": "你確定要將{name}靜音嗎？",
   "confirmations.redraft.confirm": "刪除並編輯",
   "confirmations.redraft.message": "你確定要移除並重新起草這篇帖文嗎？你將會失去最愛和轉推，而回覆也會與原始帖文斷開連接。",
   "confirmations.reply.confirm": "回覆",
@@ -205,6 +209,27 @@
   "dismissable_banner.explore_statuses": "這些是今天在社交網絡上受到關注的帖文。新的帖文如果有較多轉推和最愛會排得更高。",
   "dismissable_banner.explore_tags": "這些主題標籤正在被本站以及去中心化網路上的人們熱烈討論。",
   "dismissable_banner.public_timeline": "這些是 {domain} 使用者追蹤的社交網絡上最新的公開帖文。",
+  "domain_block_modal.block": "封鎖伺服器",
+  "domain_block_modal.block_account_instead": "封鎖 @{name} 即可",
+  "domain_block_modal.they_can_interact_with_old_posts": "此伺服器的人們可與你的舊帖文互動。",
+  "domain_block_modal.they_cant_follow": "此伺服器的人無法追蹤你。",
+  "domain_block_modal.they_wont_know": "對方不會知道自己被封鎖。",
+  "domain_block_modal.title": "封鎖網域？",
+  "domain_block_modal.you_will_lose_followers": "你在此伺服器的所有追蹤者都將會被移除。",
+  "domain_block_modal.you_wont_see_posts": "你將看不到此伺服器使用者的帖文和通知。",
+  "domain_pill.activitypub_lets_connect": "這讓你不僅能在 Mastodon 上，也能在其他社交應用程式中與人交流互動。",
+  "domain_pill.activitypub_like_language": "ActivityPub 就像 Mastodon 與其他社交網絡溝通所用的語言。",
+  "domain_pill.server": "伺服器",
+  "domain_pill.their_handle": "他們的帳號：",
+  "domain_pill.their_server": "他們的數碼家園，所有帖文的棲息地。",
+  "domain_pill.their_username": "在他們的伺服器上的獨特識別碼。不同伺服器上的使用者有可能擁有相同的使用者名稱。",
+  "domain_pill.username": "使用者名稱",
+  "domain_pill.whats_in_a_handle": "帳號是甚麼？",
+  "domain_pill.who_they_are": "帳號代表了使用者的身份和所在之處，因此你能夠在以 <button>ActivityPub 支援的平台</button>構建的社交網絡中與他人互動交流。",
+  "domain_pill.who_you_are": "你的帳號代表了你的身份和所在之處，因此人們能夠在以 <button>ActivityPub 支援的平台</button>構建的社交網絡中與你互動交流。",
+  "domain_pill.your_handle": "你的帳號：",
+  "domain_pill.your_server": "你的數碼家園，你所有帖文的棲息地。不喜歡這裏嗎？隨時搬家到其他伺服器，把你的追蹤者也帶來。",
+  "domain_pill.your_username": "你在這台伺服器的獨特識別碼。可以在不同伺服器上找到相同使用者名稱的人。",
   "embed.instructions": "要內嵌此文章，請將以下代碼貼進你的網站。",
   "embed.preview": "看上去會是這樣：",
   "emoji_button.activity": "活動",
@@ -241,6 +266,7 @@
   "empty_column.list": "這個列表暫時未有內容。",
   "empty_column.lists": "你還沒有建立任何名單。這裡將會顯示你所建立的名單。",
   "empty_column.mutes": "你尚未靜音任何使用者。",
+  "empty_column.notification_requests": "沒有新通知了！當有新通知時，會根據設定顯示在這裏。",
   "empty_column.notifications": "你沒有任何通知紀錄，快向其他用戶搭訕吧。",
   "empty_column.public": "跨站時間軸暫時沒有內容！快寫一些公共的文章，或者關注另一些服務站的用戶吧！你和本站、友站的交流，將決定這裏出現的內容。",
   "error.unexpected_crash.explanation": "由於發生系統故障或瀏覽器相容性問題，故無法正常顯示頁面。",
@@ -271,13 +297,21 @@
   "filter_modal.select_filter.subtitle": "使用既有類別，或創建一個新類別",
   "filter_modal.select_filter.title": "過濾此帖文",
   "filter_modal.title.status": "過濾一則帖文",
+  "filtered_notifications_banner.pending_requests": "來自 {count, plural, =0 {0 位} other {# 位}}你可能認識的人的通知",
+  "filtered_notifications_banner.title": "已過濾之通知",
   "firehose.all": "全部",
   "firehose.local": "本伺服器",
   "firehose.remote": "其他伺服器",
   "follow_request.authorize": "批准",
   "follow_request.reject": "拒絕",
   "follow_requests.unlocked_explanation": "即使您的帳號未上鎖，{domain} 的工作人員認為您可能會想手動審核來自這些帳號的追蹤請求。",
+  "follow_suggestions.curated_suggestion": "編輯精選",
   "follow_suggestions.dismiss": "不再顯示",
+  "follow_suggestions.hints.featured": "這個人檔案是由 {domain} 團隊精挑細選。",
+  "follow_suggestions.hints.friends_of_friends": "這個人檔案在你追蹤的人當中很受歡迎。",
+  "follow_suggestions.hints.most_followed": "這個人檔案是在 {domain} 上最多追蹤之一。",
+  "follow_suggestions.hints.most_interactions": "這個人檔案最近在 {domain} 上備受關注。",
+  "follow_suggestions.hints.similar_to_recently_followed": "這個人檔案與你最近追蹤的類似。",
   "follow_suggestions.personalized_suggestion": "個人化推薦",
   "follow_suggestions.popular_suggestion": "熱門推薦",
   "follow_suggestions.view_all": "查看所有",
@@ -393,9 +427,15 @@
   "loading_indicator.label": "載入中…",
   "media_gallery.toggle_visible": "隱藏圖片",
   "moved_to_account_banner.text": "您的帳號 {disabledAccount} 目前已停用，因為您已搬家至 {movedToAccount}。",
-  "mute_modal.duration": "時間",
-  "mute_modal.hide_notifications": "需要隱藏這使用者的通知嗎？",
-  "mute_modal.indefinite": "沒期限",
+  "mute_modal.hide_from_notifications": "隱藏通知",
+  "mute_modal.hide_options": "隱藏選項",
+  "mute_modal.indefinite": "直至我將對方解除靜音",
+  "mute_modal.show_options": "顯示選項",
+  "mute_modal.they_can_mention_and_follow": "對方能提及和追蹤你，但你將看不到對方。",
+  "mute_modal.they_wont_know": "對方不會知道自己被靜音。",
+  "mute_modal.title": "將使用者靜音？",
+  "mute_modal.you_wont_see_mentions": "你將看不到提及他們的帖文。",
+  "mute_modal.you_wont_see_posts": "他們仍能看到你的帖文，但你將看不到他們的。",
   "navigation_bar.about": "關於",
   "navigation_bar.advanced_interface": "在進階網頁介面打開",
   "navigation_bar.blocks": "封鎖名單",
@@ -433,6 +473,10 @@
   "notification.reblog": "{name} 轉推你的文章",
   "notification.status": "{name} 剛發表了文章",
   "notification.update": "{name} 編輯了帖文",
+  "notification_requests.accept": "接受",
+  "notification_requests.dismiss": "忽略",
+  "notification_requests.notifications_from": "來自 {name} 的通知",
+  "notification_requests.title": "已過濾之通知",
   "notifications.clear": "清空通知紀錄",
   "notifications.clear_confirmation": "你確定要清空通知紀錄嗎？",
   "notifications.column_settings.admin.report": "新舉報：",
@@ -464,6 +508,15 @@
   "notifications.permission_denied": "本站不能發送桌面通知，因為瀏覽器先前拒絕了本站的桌面通知權限請求",
   "notifications.permission_denied_alert": "無法啟用桌面通知，因為瀏覽器先前拒絕了本站的桌面通知權限請求",
   "notifications.permission_required": "由於瀏覽器未有授予桌面通知權限，本站暫未能發送桌面通知。",
+  "notifications.policy.filter_new_accounts.hint": "在過去 {days, plural, other {# 天}}內建立",
+  "notifications.policy.filter_new_accounts_title": "新帳號",
+  "notifications.policy.filter_not_followers_hint": "包括追蹤你不到 {days, plural, other {# 天}}的人",
+  "notifications.policy.filter_not_followers_title": "未追蹤你的人",
+  "notifications.policy.filter_not_following_hint": "直至你手動核准他們",
+  "notifications.policy.filter_not_following_title": "你未追蹤的人",
+  "notifications.policy.filter_private_mentions_hint": "除非回覆你的提及或來自你追蹤的人，否則將被過濾",
+  "notifications.policy.filter_private_mentions_title": "未經請求的私人提及",
+  "notifications.policy.title": "過濾來自以下的通知…",
   "notifications_permission_banner.enable": "啟用桌面通知",
   "notifications_permission_banner.how_to_control": "只要啟用桌面通知，便可在 Mastodon 網站沒有打開時收到通知。在已經啟用桌面通知的時候，你可以透過上面的 {icon} 按鈕準確控制哪些類型的互動會產生桌面通知。",
   "notifications_permission_banner.title": "不放過任何事情",
@@ -640,6 +693,7 @@
   "status.direct": "私下提及 @{name}",
   "status.direct_indicator": "私人提及",
   "status.edit": "編輯",
+  "status.edited": "最後編輯於 {date}",
   "status.edited_x_times": "Edited {count, plural, one {{count} 次} other {{count} 次}}",
   "status.embed": "嵌入",
   "status.favourite": "最愛",
diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json
index c2450ac0156684..71272213a80a1c 100644
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@@ -70,7 +70,7 @@
   "account.unendorse": "取消於個人檔案推薦對方",
   "account.unfollow": "取消跟隨",
   "account.unmute": "解除靜音 @{name}",
-  "account.unmute_notifications_short": "取消靜音推播通知",
+  "account.unmute_notifications_short": "解除靜音推播通知",
   "account.unmute_short": "解除靜音",
   "account_note.placeholder": "按此新增備註",
   "admin.dashboard.daily_retention": "註冊後使用者存留率（日）",
@@ -89,6 +89,14 @@
   "announcement.announcement": "公告",
   "attachments_list.unprocessed": "（未經處理）",
   "audio.hide": "隱藏音訊",
+  "block_modal.remote_users_caveat": "我們會要求 {domain} 伺服器尊重您的決定。然而，我們無法保證所有伺服器都會遵守，某些伺服器可能以不同方式處理封鎖。未登入之使用者仍可能看到您的公開嘟文。",
+  "block_modal.show_less": "減少顯示",
+  "block_modal.show_more": "顯示更多",
+  "block_modal.they_cant_mention": "他們無法提及或跟隨您。",
+  "block_modal.they_cant_see_posts": "他們無法讀取您的嘟文，且您不會見到他們的。",
+  "block_modal.they_will_know": "他們能見到他們已被封鎖。",
+  "block_modal.title": "是否封鎖該使用者？",
+  "block_modal.you_wont_see_mentions": "您不會見到提及他們的嘟文。",
   "boost_modal.combo": "下次您可以按 {combo} 跳過",
   "bundle_column_error.copy_stacktrace": "複製錯誤報告",
   "bundle_column_error.error.body": "無法繪製請求的頁面。這可能是因為我們程式碼中的臭蟲或是瀏覽器的相容問題。",
@@ -160,9 +168,7 @@
   "compose_form.spoiler.unmarked": "新增內容警告",
   "compose_form.spoiler_placeholder": "內容警告 (可選的)",
   "confirmation_modal.cancel": "取消",
-  "confirmations.block.block_and_report": "封鎖並檢舉",
   "confirmations.block.confirm": "封鎖",
-  "confirmations.block.message": "您確定要封鎖 {name} 嗎？",
   "confirmations.cancel_follow_request.confirm": "收回跟隨請求",
   "confirmations.cancel_follow_request.message": "您確定要收回跟隨 {name} 的請求嗎？",
   "confirmations.delete.confirm": "刪除",
@@ -171,15 +177,13 @@
   "confirmations.delete_list.message": "您確定要永久刪除此列表嗎？",
   "confirmations.discard_edit_media.confirm": "捨棄",
   "confirmations.discard_edit_media.message": "您於媒體描述或預覽區塊有未儲存的變更。是否要捨棄這些變更？",
-  "confirmations.domain_block.confirm": "封鎖整個網域",
+  "confirmations.domain_block.confirm": "封鎖伺服器",
   "confirmations.domain_block.message": "您真的非常確定要封鎖整個 {domain} 網域嗎？大部分情況下，封鎖或靜音少數特定的帳號就能滿足需求了。您將不能在任何公開的時間軸及通知中看到來自此網域的內容。您來自該網域的跟隨者也將被移除。",
   "confirmations.edit.confirm": "編輯",
   "confirmations.edit.message": "編輯嘟文將覆蓋掉您目前正在撰寫之嘟文內容。您是否仍要繼續？",
   "confirmations.logout.confirm": "登出",
   "confirmations.logout.message": "您確定要登出嗎？",
   "confirmations.mute.confirm": "靜音",
-  "confirmations.mute.explanation": "此操作將隱藏來自他們的嘟文與通知，但是他們還是可以查閱您的嘟文與跟隨您。",
-  "confirmations.mute.message": "您確定要靜音 {name} 嗎？",
   "confirmations.redraft.confirm": "刪除並重新編輯",
   "confirmations.redraft.message": "您確定要刪除這則嘟文並重新編輯嗎？您將失去這則嘟文之轉嘟及最愛，且對此嘟文之回覆會變成獨立的嘟文。",
   "confirmations.reply.confirm": "回覆",
@@ -205,6 +209,27 @@
   "dismissable_banner.explore_statuses": "這些於此伺服器以及去中心化網路中其他伺服器發出的嘟文正在被此伺服器上的人們熱烈討論著。越多不同人轉嘟及最愛排名更高。",
   "dismissable_banner.explore_tags": "這些主題標籤正在被此伺服器以及去中心化網路上的人們熱烈討論著。越多不同人所嘟出的主題標籤排名更高。",
   "dismissable_banner.public_timeline": "這些是來自 {domain} 使用者們跟隨中帳號所發表之最新公開嘟文。",
+  "domain_block_modal.block": "封鎖伺服器",
+  "domain_block_modal.block_account_instead": "改為封鎖 @{name}",
+  "domain_block_modal.they_can_interact_with_old_posts": "來自此伺服器之使用者能與您以往的嘟文互動。",
+  "domain_block_modal.they_cant_follow": "來自此伺服器之使用者將無法跟隨您。",
+  "domain_block_modal.they_wont_know": "他們不會知道他們已被封鎖。",
+  "domain_block_modal.title": "是否封鎖該網域？",
+  "domain_block_modal.you_will_lose_followers": "所有您來自此伺服器之跟隨者將被移除。",
+  "domain_block_modal.you_wont_see_posts": "您不會見到來自此伺服器使用者之任何嘟文或通知。",
+  "domain_pill.activitypub_lets_connect": "它使您能於 Mastodon 及其他不同的社群應用程式與人連結及互動。",
+  "domain_pill.activitypub_like_language": "ActivityPub 像是 Mastodon 與其他社群網路溝通時所用的語言。",
+  "domain_pill.server": "伺服器",
+  "domain_pill.their_handle": "他們的帳號：",
+  "domain_pill.their_server": "他們數位世界的家，他們所有的嘟文都在這裡。",
+  "domain_pill.their_username": "他們於他們的伺服器中獨一無二的識別。於不同的伺服器上可能找到具有相同帳號的使用者。",
+  "domain_pill.username": "使用者名稱",
+  "domain_pill.whats_in_a_handle": "什麼是帳號 (@handle) ？",
+  "domain_pill.who_they_are": "由於帳號 (@handle) 能說明某人是誰以及他們來自何方，您能於 <button>支援 ActivityPub 的平臺</button> 之社群網路上與人們互動。",
+  "domain_pill.who_you_are": "由於帳號 (@handle) 能說明您是誰以及您來自何方，人們能於 <button>支援 ActivityPub 的平臺</button> 之社群網路上與您互動。",
+  "domain_pill.your_handle": "您的帳號：",
+  "domain_pill.your_server": "您數位世界的家，您所有的嘟文都在這裡。不喜歡這台伺服器嗎？您能隨時搬家至其他伺服器並且仍保有您的跟隨者。",
+  "domain_pill.your_username": "您於您的伺服器中獨一無二的識別。於不同的伺服器上可能找到具有相同帳號的使用者。",
   "embed.instructions": "若您欲於您的網站嵌入此嘟文，請複製以下程式碼。",
   "embed.preview": "它將顯示成這樣：",
   "emoji_button.activity": "活動",
@@ -402,9 +427,15 @@
   "loading_indicator.label": "正在載入...",
   "media_gallery.toggle_visible": "切換可見性",
   "moved_to_account_banner.text": "您的帳號 {disabledAccount} 目前已停用，因為您已搬家至 {movedToAccount}。",
-  "mute_modal.duration": "持續時間",
-  "mute_modal.hide_notifications": "是否隱藏來自這位使用者的通知？",
-  "mute_modal.indefinite": "無期限",
+  "mute_modal.hide_from_notifications": "於通知中隱藏",
+  "mute_modal.hide_options": "隱藏選項",
+  "mute_modal.indefinite": "直到我解除靜音他們",
+  "mute_modal.show_options": "顯示選項",
+  "mute_modal.they_can_mention_and_follow": "他們仍可提及或跟隨您，但您不會見到他們。",
+  "mute_modal.they_wont_know": "他們不會知道他們已被靜音。",
+  "mute_modal.title": "是否靜音該使用者？",
+  "mute_modal.you_wont_see_mentions": "您不會見到提及他們的嘟文。",
+  "mute_modal.you_wont_see_posts": "他們仍可讀取您的嘟文，但您不會見到他們的。",
   "navigation_bar.about": "關於",
   "navigation_bar.advanced_interface": "以進階網頁介面開啟",
   "navigation_bar.blocks": "已封鎖的使用者",
diff --git a/config/locales/be.yml b/config/locales/be.yml
index d0cc96d6d89206..7d32ff1366e8a2 100644
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -1931,7 +1931,11 @@ be:
       follows_subtitle: Падпішыцеся на папулярных карыстальнікаў
       follows_title: На каго падпісацца
       follows_view_more: Прагледзець больш людзей, на якіх варта падпісацца
-      hashtags_recent_count: "%{people} людзей за апошнія %{days} дні"
+      hashtags_recent_count:
+        few: "%{people} чалавекі за апошнія 2 дні"
+        many: "%{people} чалавек за апошнія 2 дні"
+        one: "%{people} чалавек за апошнія 2 дні"
+        other: "%{people} чалавека за апошнія 2 дні"
       hashtags_subtitle: Даведайцеся што было папулярна ў апошнія 2 дні
       hashtags_title: Папулярныя хэштэгі
       hashtags_view_more: Прагледзець іншыя папулярныя хэштэгі
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 8689b0359ec47c..5b4a828dd71568 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -1867,7 +1867,9 @@ bg:
       follows_subtitle: Следвайте добре известни акаунти
       follows_title: Кого да се последва
       follows_view_more: Преглед на още хора за последване
-      hashtags_recent_count: "%{people} души за последните %{days} дни"
+      hashtags_recent_count:
+        one: "%{people} лице през последните 2 дни"
+        other: "%{people} души през последните 2 дни"
       hashtags_subtitle: Проучете какво изгрява от последните 2 дни
       hashtags_title: Изгряващи хаштагове
       hashtags_view_more: Преглед на още изгряващи хаштагове
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 15a06559be9c14..f5a0143ef659a2 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -1582,7 +1582,7 @@ ca:
   rss:
     content_warning: 'Avís de contingut:'
     descriptions:
-      account: Publicacions des de @%{acct}
+      account: Publicacions públiques de @%{acct}
       tag: 'Tuts etiquetats #%{hashtag}'
   scheduled_statuses:
     over_daily_limit: Has superat el límit de %{limit} tuts programats per a avui
@@ -1729,7 +1729,7 @@ ca:
     keep_self_bookmark: Mantenir els tuts que has desat a les adreces d'interès
     keep_self_bookmark_hint: No esborra els teus propis tuts si els has desat en les adreces d'interès
     keep_self_fav: Mantenir els tuts que has afavorit
-    keep_self_fav_hint: No esborra els teus propis tuts si les has afavorit
+    keep_self_fav_hint: No esborra les teves publicacions si les has afavorit
     min_age:
       '1209600': 2 setmanes
       '15778476': 6 mesos
@@ -1867,7 +1867,9 @@ ca:
       follows_subtitle: Seguiu comptes populars
       follows_title: A qui seguir
       follows_view_more: Més persones a qui seguir
-      hashtags_recent_count: "%{people} persones en els últims %{days} dies"
+      hashtags_recent_count:
+        one: "%{people} persona en els 2 últims dies"
+        other: "%{people} persones en els 2 últims dies"
       hashtags_subtitle: Exploreu què és tendència des de fa 2 dies
       hashtags_title: Etiquetes en tendència
       hashtags_view_more: Més etiquetes en tendència
diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index 17c4280508ea69..8fcd10fe4d5568 100644
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@@ -1995,7 +1995,6 @@ cy:
       follows_subtitle: Dilynwch gyfrifon adnabyddus
       follows_title: Pwy i ddilyn
       follows_view_more: Gweld mwy o bobl i ddilyn
-      hashtags_recent_count: "%{people} person yn y %{days} diwrnod diwethaf"
       hashtags_subtitle: Gweld beth sy'n tueddu dros y 2 ddiwrnod diwethaf
       hashtags_title: Hashnodau tuedd
       hashtags_view_more: Gweld mwy o hashnodau tuedd
diff --git a/config/locales/da.yml b/config/locales/da.yml
index 527f2240c7c1ba..59de5327d0bce0 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -1867,7 +1867,9 @@ da:
       follows_subtitle: Følg velkendte konti
       follows_title: Hvem, som skal følges
       follows_view_more: Vis nogle personer at følge
-      hashtags_recent_count: "%{people} personer de seneste %{days} dage"
+      hashtags_recent_count:
+        one: "%{people} person de seneste 2 dage"
+        other: "%{people} personer de seneste 2 dage"
       hashtags_subtitle: Udforsk de seneste 2 dages tendenser
       hashtags_title: Populære hashtags
       hashtags_view_more: Se flere populære hashtags
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 262c0166c92086..fa66754346cb1d 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -1867,8 +1867,10 @@ de:
       follows_subtitle: Folge bekannten Profilen
       follows_title: Empfohlene Profile
       follows_view_more: Weitere Profile zum Folgen entdecken
-      hashtags_recent_count: "%{people} Personen in den letzten %{days} Tagen"
-      hashtags_subtitle: Entdecke, was in den letzten 2 Tagen angesagt war
+      hashtags_recent_count:
+        one: "%{people} Profil in den vergangenen 2 Tagen"
+        other: "%{people} Profile in den vergangenen 2 Tagen"
+      hashtags_subtitle: Entdecke, was in den vergangenen 2 Tagen angesagt war
       hashtags_title: Angesagte Hashtags
       hashtags_view_more: Weitere angesagte Hashtags entdecken
       post_action: Verfassen
diff --git a/config/locales/es-AR.yml b/config/locales/es-AR.yml
index 398345d8c8239a..933729139918dc 100644
--- a/config/locales/es-AR.yml
+++ b/config/locales/es-AR.yml
@@ -1867,7 +1867,9 @@ es-AR:
       follows_subtitle: Seguí cuentas populares
       follows_title: A quién seguir
       follows_view_more: Encontrá más cuentas para seguir
-      hashtags_recent_count: "%{people} cuentas en los últimos %{days} días"
+      hashtags_recent_count:
+        one: "%{people} cuenta en los últimos 2 días"
+        other: "%{people} cuenta en los últimos 2 días"
       hashtags_subtitle: Explora las tendencias de los últimos 2 días
       hashtags_title: Etiquetas en tendencia
       hashtags_view_more: Ver más etiquetas en tendencias
diff --git a/config/locales/es-MX.yml b/config/locales/es-MX.yml
index 3d7c8b9ea4180a..511b3920069926 100644
--- a/config/locales/es-MX.yml
+++ b/config/locales/es-MX.yml
@@ -1867,7 +1867,6 @@ es-MX:
       follows_subtitle: Seguir cuentas conocidas
       follows_title: A quién seguir
       follows_view_more: Ver más personas para seguir
-      hashtags_recent_count: "%{people} personas en los últimos %{days} días"
       hashtags_subtitle: Explora las tendencias de los últimos 2 días
       hashtags_title: Etiquetas en tendencia
       hashtags_view_more: Ver más etiquetas en tendencia
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 946ba1cbebeb6f..67e7e687604b6f 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -1867,7 +1867,9 @@ es:
       follows_subtitle: Seguir cuentas conocidas
       follows_title: A quién seguir
       follows_view_more: Ver más personas para seguir
-      hashtags_recent_count: "%{people} personas en los últimos %{days} días"
+      hashtags_recent_count:
+        one: "%{people} persona en los últimos 2 días"
+        other: "%{people} personas en los últimos 2 días"
       hashtags_subtitle: Explora las tendencias de los últimos 2 días
       hashtags_title: Etiquetas en tendencia
       hashtags_view_more: Ver más etiquetas en tendencia
diff --git a/config/locales/et.yml b/config/locales/et.yml
index cd944d9c199f26..d9220a72d6387e 100644
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -1869,7 +1869,6 @@ et:
       follows_subtitle: Jälgi teada-tuntud kasutajaid
       follows_title: Keda jälgida
       follows_view_more: Vaata lähemalt, keda jälgida
-      hashtags_recent_count: "%{people} inimest viimase %{days} päeva jooksul"
       hashtags_subtitle: Avasta, mis viimase 2 päeva jooksul on toimunud
       hashtags_title: Populaarsed märksõnad
       hashtags_view_more: Vaata teisi trendikaid märksõnu
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index 4c88ac0e59590a..b2292b80f4bcf0 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -1871,7 +1871,9 @@ eu:
       follows_subtitle: Jarraitu kontu ospetsuak
       follows_title: Nor jarraitu
       follows_view_more: Ikusi jarrai dezakezun jende gehiago
-      hashtags_recent_count: "%{people} pertsona azken %{days} egunetan"
+      hashtags_recent_count:
+        one: Pertson %{people} azken 2 egunetan
+        other: "%{people} pertson azken 2 egunetan"
       hashtags_subtitle: Arakatu azken 2 egunetan pil-pilean dagoena
       hashtags_title: Pil-pilean dauden traolak
       hashtags_view_more: Ikusi pil-pilean dauden traol gehiago
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 93dbd0162790da..01203cf484f69c 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -1846,10 +1846,10 @@ fi:
       apps_ios_action: Lataa App Storesta
       apps_step: Lataa viralliset sovelluksemme.
       apps_title: Mastodon-sovellukset
-      checklist_subtitle: 'Aloitetaan, sinä aloitat uudella sosiaalisella seudulla:'
-      checklist_title: Tervetuloa tarkistuslista
+      checklist_subtitle: 'Aloitetaan tällä uudella sosiaalisella seudulla:'
+      checklist_title: Tervetulon tarkistuslista
       edit_profile_action: Mukauta
-      edit_profile_step: Täydentämällä profiilisi tietoja tehostat vaikutemaa.
+      edit_profile_step: Tehosta vuorovaikutuksiasi täydennetyllä profiililla.
       edit_profile_title: Mukauta profiiliasi
       explanation: Näillä vinkeillä pääset alkuun
       feature_action: Lue lisää
@@ -1867,7 +1867,9 @@ fi:
       follows_subtitle: Seuraa tunnettuja tilejä
       follows_title: Ehdotuksia seurattavaksi
       follows_view_more: Näytä lisää seurattavia henkilöitä
-      hashtags_recent_count: "%{people} henkilöä viimeisenä %{days} päivänä"
+      hashtags_recent_count:
+        one: "%{people} henkilö viimeisenä 2 päivänä"
+        other: "%{people} henkilöä viimeisenä 2 päivänä"
       hashtags_subtitle: Tutki, mikä on ollut suosittua viimeisenä 2 päivänä
       hashtags_title: Suositut aihetunnisteet
       hashtags_view_more: Näytä lisää suosittuja aihetunnisteita
diff --git a/config/locales/fo.yml b/config/locales/fo.yml
index 64c26a62f20b1e..b78b9926db5a81 100644
--- a/config/locales/fo.yml
+++ b/config/locales/fo.yml
@@ -1867,7 +1867,6 @@ fo:
       follows_subtitle: Fylg vælkendar kontur
       follows_title: Hvørji tú átti at fylgt
       follows_view_more: Sí fleiri fólk at fylgja
-      hashtags_recent_count: "%{people} fólk seinastu %{days} dagarnar"
       hashtags_subtitle: Kanna rákið seinastu 2 dagarnar
       hashtags_title: Vælumtókt frámerki
       hashtags_view_more: Sí fleiri vælumtókt frámerki
diff --git a/config/locales/fr-CA.yml b/config/locales/fr-CA.yml
index 860c591a0a9857..492fe25181a5e4 100644
--- a/config/locales/fr-CA.yml
+++ b/config/locales/fr-CA.yml
@@ -1867,7 +1867,6 @@ fr-CA:
       follows_subtitle: Suivez des comptes populaires
       follows_title: Qui suivre
       follows_view_more: Voir plus de personnes à suivre
-      hashtags_recent_count: "%{people} personnes dans les %{days} derniers jours"
       hashtags_subtitle: Explorez les tendances depuis les 2 derniers jours
       hashtags_title: Hashtags populaires
       hashtags_view_more: Voir plus de hashtags populaires
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 46b22cf8b368aa..6f8df69ee7a317 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -1867,7 +1867,6 @@ fr:
       follows_subtitle: Suivez des comptes populaires
       follows_title: Qui suivre
       follows_view_more: Voir plus de personnes à suivre
-      hashtags_recent_count: "%{people} personnes dans les %{days} derniers jours"
       hashtags_subtitle: Explorez les tendances depuis les 2 derniers jours
       hashtags_title: Hashtags populaires
       hashtags_view_more: Voir plus de hashtags populaires
diff --git a/config/locales/fy.yml b/config/locales/fy.yml
index ad2c37e23f17c4..0dad09baf4abdf 100644
--- a/config/locales/fy.yml
+++ b/config/locales/fy.yml
@@ -1848,7 +1848,6 @@ fy:
       follow_action: Folgje
       follows_title: Wa te folgjen
       follows_view_more: Mear minsken om te folgjen besjen
-      hashtags_recent_count: "%{people} minsken yn de ôfrûne %{days} dagen"
       hashtags_subtitle: Wat der yn de ôfrûne 2 dagen bard is ferkenne
       hashtags_title: Populêre hashtags
       hashtags_view_more: Mear populêre hashtags besjen
diff --git a/config/locales/gd.yml b/config/locales/gd.yml
index 16f046baab8fff..c9a4467b123e84 100644
--- a/config/locales/gd.yml
+++ b/config/locales/gd.yml
@@ -903,7 +903,7 @@ gd:
         message_html: "<strong>Chaidh stòras nan oibseactan agad a dhroch-rèiteachadh. Tha prìobhaideachd an luchd-cleachdaidh agad fo chunnart.</strong>"
     tags:
       review: Dèan lèirmheas air an staid
-      updated_msg: Chaidh roghainnean nan tagaichean hais ùrachadh
+      updated_msg: Chaidh roghainnean an taga hais ùrachadh
     title: Rianachd
     trends:
       allow: Ceadaich
@@ -1209,7 +1209,7 @@ gd:
       appealed_msg: Chaidh an t-ath-thagradh agad a chur a-null. Ma thèid aontachadh ris, gheibh thu brath mu dhèidhinn.
       appeals:
         submit: Cuir a-null an t-ath-thagradh
-      approve_appeal: Zatwierdź odwołanie
+      approve_appeal: Thoir aonta ris an ath-thagradh
       associated_report: An gearan co-cheangailte
       created_at: Ceann-là
       description_html: Seo na gnìomhan a chaidh a ghabhail an aghaidh a’ chunntais agad agus na rabhaidhean a chaidh a chur thugad le luchd-obrach %{instance}.
@@ -1929,9 +1929,13 @@ gd:
       follow_step: Tha leantainn dhaoine inntinneach air cridhe Mhastodon.
       follow_title: Cuir dreach pearsanta air do dhachaigh
       follows_subtitle: Lean cunntasan cliùiteach
-      follows_title: Cò a leanas tu
+      follows_title: Molaidhean leantainn
       follows_view_more: Seall barrachd dhaoine ri leantainn
-      hashtags_recent_count: 'Daoine sna %{days} là(ithean) seo chaidh: %{people}'
+      hashtags_recent_count:
+        few: "%{people} daoine san 2 latha seo chaidh"
+        one: "%{people} neach san 2 latha seo chaidh"
+        other: "%{people} daoine san 2 latha seo chaidh"
+        two: "%{people} daoine san 2 latha seo chaidh"
       hashtags_subtitle: Rùraich na tha a’ treandadh san 2 latha seo chaidh
       hashtags_title: Tagaichean hais a’ treandadh
       hashtags_view_more: Seall barrachd thagaichean hais a’ treandadh
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 61a6086c5ebec1..0c2b9af1b0b306 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -1867,7 +1867,6 @@ gl:
       follows_subtitle: Sigue estas contas populares
       follows_title: A quen seguir
       follows_view_more: Ver máis persoas para seguir
-      hashtags_recent_count: "%{people} persoas nos últimos %{days} días"
       hashtags_subtitle: Descubre os temas en voga nos últimos 2 días
       hashtags_title: Cancelos en voga
       hashtags_view_more: Ver máis cancelos en voga
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 59f562c2c94715..cc1f9dc7fb00d8 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -1931,7 +1931,11 @@ he:
       follows_subtitle: לעקיבה אחרי חלשבונות ידועים
       follows_title: אחרי מי לעקוב
       follows_view_more: ראו עוד א.נשים לעקוב אחריהן.ם
-      hashtags_recent_count: "%{people} אנשים ב־%{days} ימים"
+      hashtags_recent_count:
+        many: "%{people} אנשים ביומיים האחרונים"
+        one: איש אחד ביומיים האחרונים
+        other: "%{people} אנשים ביומיים האחרונים"
+        two: שני אנשים ביומיים האחרונים
       hashtags_subtitle: לחקור מהם הנושאים החמים ביומיים האחרונים
       hashtags_title: תגיות חמות
       hashtags_view_more: צפיה בעוד תגיות שכרגע חוזרות הרבה
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 76fef4633aada4..418c6ffe75e15d 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -778,7 +778,7 @@ hu:
         warning_hint: Javasoljuk a "Jóváhagyás szükséges a regisztrációhoz” lehetőség használatát, hacsak nem vagy biztos abban, hogy a moderátor csapatod időben tudja kezelni a szemetet és a rosszindulatú regisztrációkat.
       security:
         authorized_fetch: Hitelesítés szükséges a föderációs kiszolgálóktól
-        authorized_fetch_hint: A föderációs szerverek hitelesítésének szükségessége lehetővé teszi mind a felhasználói mind a szerver szintű blokkok szigorúbb végrehajtását. Ez azonban a teljesítménybüntetés árán jár, csökkenti a válaszok elérhetőségét és kompatibilitási problémákat vethet fel egyes föderációs szolgáltatásokkal. Emellett ez nem akadályozza meg a dedikált szereplőket abban, hogy nyilvános bejegyzéseiket és fiókjaikat letöltsék.
+        authorized_fetch_hint: A hitelesítés megkövetelése föderált kiszolgálók felé lehetővé teszi a felhasználó- és kiszolgáló szintű letiltások szigorúbb kikényszerítését. Azonban ennek az ára teljesítménycsökkenés, a válaszaid elérésének csökkenése, és vezethet kombatibilitási problémákhoz is bizonyos föderációs szolgáltatásokkal. Ráadásul ez nem akadályozza meg, hogy eltökélt aktorok letöltsék a nyilvános bejegyzéseidet és fiókjaidat.
         authorized_fetch_overridden_hint: Jelenleg nem lehet ezt a beállítást megváltoztatni, mert azt egy környezeti változó felülbírálja.
         federation_authentication: Föderációs hitelesítés kikényszerítése
       title: Kiszolgáló-beállítások
@@ -1452,9 +1452,9 @@ hu:
   moderation:
     title: Moderáció
   move_handler:
-    carry_blocks_over_text: Ez a fiók elköltözött innen %{acct}, melyet letiltottatok.
-    carry_mutes_over_text: Ez a fiók elköltözött innen %{acct}, melyet lenémítottatok.
-    copy_account_note_text: 'Ez a fiók elköltözött innen %{acct}, itt vannak a bejegyzéseitek róla:'
+    carry_blocks_over_text: 'Ez a felhasználó elköltözött innen: %{acct}, korábban letiltottad.'
+    carry_mutes_over_text: 'Ez a felhasználó elköltözött innen: %{acct}, korábban lenémítottad.'
+    copy_account_note_text: 'Ez a fiók elköltözött innen: %{acct}, itt vannak a bejegyzéseid róla:'
   navigation:
     toggle_menu: Menü be/ki
   notification_mailer:
@@ -1867,7 +1867,9 @@ hu:
       follows_subtitle: Jól ismert fiókok követése
       follows_title: Kit érdemes követni
       follows_view_more: További követendő személyek megtekintése
-      hashtags_recent_count: "%{people} személy az elmúlt %{days} napban"
+      hashtags_recent_count:
+        one: "%{people} személy az elmúlt 2 napban"
+        other: "%{people} személy az elmúlt 2 napban"
       hashtags_subtitle: Fedezd fel, mi felkapott az elmúlt 2 napban
       hashtags_title: Felkapott hashtagek
       hashtags_view_more: További felkapott hashtagek megtekintése
diff --git a/config/locales/ie.yml b/config/locales/ie.yml
index 222b82ba8080ce..0513d5925d347e 100644
--- a/config/locales/ie.yml
+++ b/config/locales/ie.yml
@@ -1867,7 +1867,6 @@ ie:
       follows_subtitle: Sequer famosi contos
       follows_title: Persones a sequer
       follows_view_more: Vider plu persones a sequer
-      hashtags_recent_count: "%{people} persones in li passat %{days} dies"
       hashtags_subtitle: Explorar li postas de tendentie durant li passat 2 dies
       hashtags_title: Populari hashtags
       hashtags_view_more: Vider plu hashtags in tendentie
diff --git a/config/locales/is.yml b/config/locales/is.yml
index df0391bfa3ea7b..110cf1e69703e1 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -1871,7 +1871,9 @@ is:
       follows_subtitle: Fylgstu með vel þekktum notendum
       follows_title: Hverjum ætti að fylgjast með
       follows_view_more: Skoða fleira fólk til að fylgjast með
-      hashtags_recent_count: "%{people} manns á síðustu %{days} dögum"
+      hashtags_recent_count:
+        one: "%{people} aðili síðustu 2 daga"
+        other: "%{people} manns á síðustu 2 dögum"
       hashtags_subtitle: Skoðaðu hvað sé búið að vera í umræðunni síðustu 2 dagana
       hashtags_title: Vinsæl myllumerki
       hashtags_view_more: Sjá fleiri vinsæl myllumerki
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 64015bd98d54dc..b84803c0092ba6 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -1869,7 +1869,6 @@ it:
       follows_subtitle: Segui account ben noti
       follows_title: Chi seguire
       follows_view_more: Visualizza più persone da seguire
-      hashtags_recent_count: "%{people} persone negli ultimi %{days} giorni"
       hashtags_subtitle: Esplora le tendenze degli ultimi 2 giorni
       hashtags_title: Hashtag di tendenza
       hashtags_view_more: Visualizza altri hashtag di tendenza
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index ae5203baee9778..c51d0a8ea9aab4 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -1835,7 +1835,6 @@ ja:
       follows_subtitle: 人気アカウントをフォロー
       follows_title: フォローを増やしてみませんか？
       follows_view_more: フォローするユーザーを探す
-      hashtags_recent_count: "%{days} 日間で %{people} 人が共有"
       hashtags_subtitle: 過去2日間のトレンドを見る
       hashtags_title: トレンドのハッシュタグ
       hashtags_view_more: トレンドのハッシュタグをもっと見る
diff --git a/config/locales/kab.yml b/config/locales/kab.yml
index b19424c0fac28a..0c36059406b991 100644
--- a/config/locales/kab.yml
+++ b/config/locales/kab.yml
@@ -876,8 +876,11 @@ kab:
       follows_title: Anwa ara ḍefṛeḍ
       follows_view_more: Ssken-d ugar n medden ay tzemred ad tḍefred
       post_step: Ini-as azul i umaḍal s uḍris, s tiwlafin, s tividyutin neɣ s tefranin.
+      post_title: Aru tasuffeɣt-inek·inem tamezwarut
       share_action: Bḍu
       share_step: Init-asen i yimeddukal-nwen amek ara ken-id-afen deg Mastodon.
+      share_title: Bḍu amaɣnu-inek·inem n Mastodon
+      sign_in_action: Qqen
       subject: Ansuf ɣer Maṣṭudun
       title: Ansuf yessek·em, %{name}!
   users:
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 40af97c6287a96..6f8c7c6146d931 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -1824,6 +1824,7 @@ ko:
       explanation: 시작하기 전에 몇가지 팁들을 준비했습니다
       feature_action: 더 알아보기
       feature_audience: 마스토돈은 중개자 없이 청중을 관리할 수 있는 특별한 가능성을 제공합니다. 자체 인프라에 배포된 마스토돈을 사용하면 온라인에 있는 다른 마스토돈 서버에도 팔로우하거나 팔로우할 수 있으며, 본인 외에는 누구의 통제도 받지 않습니다.
+      feature_audience_title: 신뢰 있는 청중 구축
       feature_control_title: 내 타임라인에 대해 통제권을 유지하세요
       feature_creativity: 마스토돈은 오디오, 비디오, 사진, 접근성 설명(alt),  투표, 콘텐츠 주의 (블라인드), 움직이는 아바타, 커스텀 이모티콘, 썸네일 자르기, 그리고 더 많은 것들을 당신이 온라인에서 당신을 더 잘 드러낼 수 있도록 돕기위해 지원합니다. 당신이 그림이나 음악을 올리던, 팟캐스트 같은것을 진행하던 마스토돈이 함께합니다.
       feature_moderation: 마스토돈은 의사 결정권을 사용자에게 돌려줍니다. 각 서버는 기업 소셜 미디어처럼 하향식이 아닌 로컬에서 시행되는 자체 규칙과 규정을 만들 수 있어 다양한 그룹의 요구에 가장 유연하게 대응할 수 있습니다. 동의하는 규칙이 있는 서버에 가입하거나 직접 서버를 호스팅하세요.
@@ -1834,7 +1835,8 @@ ko:
       follows_subtitle: 잘 알려진 계정들을 팔로우
       follows_title: 누구를 팔로우 할 지
       follows_view_more: 팔로우 할 사람들 더 보기
-      hashtags_recent_count: 최근 %{days}일동안 %{people} 명
+      hashtags_recent_count:
+        other: 최근 2일동안 %{people} 명
       hashtags_subtitle: 최근 2일간 무엇이 유행했는지 둘러보기
       hashtags_title: 유행하는 해시태그
       hashtags_view_more: 유행하는 해시태그 더 보기
diff --git a/config/locales/lad.yml b/config/locales/lad.yml
index 8affb2a88b94a1..cd62cbc0f828a2 100644
--- a/config/locales/lad.yml
+++ b/config/locales/lad.yml
@@ -1857,11 +1857,11 @@ lad:
       feature_creativity_title: Kreativita sin paralelas
       feature_moderation_title: La moderasyon komo deveria ser
       follow_action: Sige
+      follow_step: El buto de Mastodon es segir a djente interesante.
       follow_title: Personaliza tu linya prinsipala
       follows_subtitle: Sige kuentos konesidos
       follows_title: A ken segir
       follows_view_more: Ve mas personas para segir
-      hashtags_recent_count: "%{people} personas en los ultimos %{days} diyas"
       hashtags_subtitle: Eksplora los trendes de los ultimos 2 diyas
       hashtags_title: Etiketas en trend
       hashtags_view_more: Ve mas etiketas en trend
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 52321b87bcebd3..610b4437c8afe3 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -851,7 +851,6 @@ lt:
       follows_subtitle: Sek gerai žinomas paskyras.
       follows_title: Ką sekti
       follows_view_more: Peržiūrėti daugiau sekamų žmonių
-      hashtags_recent_count: "%{people} žmonių per pastarąsias %{days} dienas"
       hashtags_subtitle: Naršyk, kas tendencinga per pastarąsias 2 dienas.
       hashtags_title: Tendencijos saitažodžiai
       hashtags_view_more: Peržiūrėti daugiau tendencingų saitažodžių
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 8f7cb06b66a440..6870578a87d42e 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -386,12 +386,12 @@ nl:
       confirm_suspension:
         cancel: Annuleren
         confirm: Opschorten
-        permanent_action: De schorsing ongedaan maken zal geen gegevens of volgrelaties herstellen.
+        permanent_action: Het ongedaan maken van de schorsing herstelt geen gegevens of volgrelaties.
         preamble_html: Je staat op het punt om <strong>%{domain}</strong> en subdomeinen op te schorten.
         remove_all_data: Dit verwijdert alle inhoud, media en profielgegevens van de accounts van dit domein van jouw server.
-        stop_communication: Jouw server zal niet langer met deze servers communiceren.
+        stop_communication: Jouw server communiceert niet langer meer met deze servers.
         title: Domeinblokkade voor %{domain} bevestigen
-        undo_relationships: Dit zal elke volgrelatie tussen de accounts van deze servers en die van jou ongedaan maken.
+        undo_relationships: Dit maakt elke volgrelatie tussen de accounts van deze servers en die van jou ongedaan.
       created_msg: Domeinblokkade wordt nu verwerkt
       destroyed_msg: Domeinblokkade is ongedaan gemaakt
       domain: Domein
@@ -470,8 +470,8 @@ nl:
     instances:
       availability:
         description_html:
-          one: Als de bezorging aan het domein gedurende <strong>%{count} dag</strong> blijft mislukken, dan zullen er geen verdere pogingen tot bezorging worden gedaan tot een bezorging <em>van</em> het domein is ontvangen.
-          other: Als de bezorging aan het domein gedurende <strong>%{count} verschillende dagen</strong> blijft mislukken, dan zullen er geen verdere pogingen tot bezorging worden gedaan tot een bezorging <em>van</em> het domein is ontvangen.
+          one: Wanneer de bezorging aan het domein gedurende <strong>%{count} dag</strong> blijft mislukken dan worden er geen bezorgpogingen meer gedaan, totdat een bezorging <em>van</em> het domein wordt ontvangen.
+          other: Als de bezorging aan het domein gedurende <strong>%{count} verschillende dagen</strong> blijft mislukken dan worden er geen bezorgpogingen meer gedaan, totdat een bezorging <em>van</em> het domein wordt ontvangen.
         failure_threshold_reached: Foutieve drempelwaarde bereikt op %{date}.
         failures_recorded:
           one: Mislukte poging op %{count} dag.
@@ -593,7 +593,7 @@ nl:
         other_description_html: Bekijk meer opties voor het controleren van het gedrag van en de communicatie met het gerapporteerde account.
         resolve_description_html: Er wordt tegen het gerapporteerde account geen maatregel genomen, geen overtreding geregistreerd en de rapportage wordt gemarkeerd als opgelost.
         silence_description_html: Het account is alleen zichtbaar voor degenen die het al volgen of handmatig opzoeken, waardoor het bereik ernstig wordt beperkt. Dit kan altijd ongedaan worden gemaakt. Dit sluit alle rapporten tegen dit account af.
-        suspend_description_html: Het account en al zijn inhoud zullen niet toegankelijk zijn en uiteindelijk verwijderd worden en er zal geen interactie met het account mogelijk zijn. Dit is omkeerbaar binnen 30 dagen. Dit sluit alle rapporten tegen dit account af.
+        suspend_description_html: Het account en de inhoud hiervan is niet meer toegankelijk, en het is ook niet meer mogelijk om ermee interactie te hebben. Uiteindelijk wordt het account volledig verwijderd. Dit is omkeerbaar binnen 30 dagen. Dit sluit alle rapporten tegen dit account af.
       actions_description_html: Beslis welke maatregel moet worden genomen om deze rapportage op te lossen. Wanneer je een (straf)maatregel tegen het gerapporteerde account neemt, krijgt het account een e-mailmelding, behalve wanneer de <strong>spam</strong>-categorie is gekozen.
       actions_description_remote_html: Beslis welke actie moet worden ondernomen om deze rapportage op te lossen. Dit is alleen van invloed op hoe <strong>jouw</strong> server met dit externe account communiceert en de inhoud ervan beheert.
       add_to_report: Meer aan de rapportage toevoegen
@@ -653,7 +653,7 @@ nl:
         close_report: 'Rapportage #%{id} als opgelost markeren'
         close_reports_html: "<strong>Alle</strong> rapportages tegen <strong>@%{acct}</strong> als opgelost markeren"
         delete_data_html: Het account en inhoud van <strong>@%{acct}</strong> over 30 dagen verwijderen, tenzij die in de tussentijd wordt gedeblokkeerd
-        preview_preamble_html: "<strong>@%{acct}</strong> zal een waarschuwing ontvangen met de volgende inhoud:"
+        preview_preamble_html: "<strong>@%{acct}</strong> ontvangt een waarschuwing met de volgende inhoud:"
         record_strike_html: Registreer een overtreding van <strong>@%{acct}</strong> om je te helpen met het sneller afhandelen van toekomstige overtredingen van dit account
         send_email_html: Een waarschuwingsmail naar <strong>@%{acct}</strong> sturen
         warning_placeholder: Optionele aanvullende redenen voor de moderatie-actie.
@@ -778,7 +778,7 @@ nl:
         warning_hint: We raden je aan om “Goedkeuring vereist om te kunnen registreren” te gebruiken, tenzij je er zeker van bent dat jouw moderatieteam spam en kwaadwillende registraties tijdig kan afhandelen.
       security:
         authorized_fetch: Verificatie van gefedeerde servers vereisen
-        authorized_fetch_hint: Verificatie vereisen van gefedereerde servers maakt een striktere handhaving van blokkades op gebruikersniveau en serverniveau mogelijk. Dit gaat echter ten koste van de prestaties, vermindert het bereik van je reacties en kan compatibiliteitsproblemen met sommige gefedereerde services opleveren. Bovendien zal dit niet voorkomen dat personen met slechte bedoelingen je openbare berichten en accounts kunnen ophalen.
+        authorized_fetch_hint: Verificatie vereisen van gefedereerde servers maakt een striktere handhaving van blokkades op gebruikersniveau en serverniveau mogelijk. Dit gaat echter ten koste van de prestaties, vermindert het bereik van je reacties en kan compatibiliteitsproblemen met sommige gefedereerde services opleveren. Bovendien voorkomt dit niet dat personen met slechte bedoelingen je openbare berichten en accounts kunnen ophalen.
         authorized_fetch_overridden_hint: Je kunt momenteel deze instelling niet wijzigen, omdat deze is overschreven door een omgevingsvariabele.
         federation_authentication: Afgedwongen federatie-verificatie
       title: Serverinstellingen
@@ -900,7 +900,7 @@ nl:
       pending_review: In afwachting van beoordeling
       preview_card_providers:
         allowed: Links van deze website kunnen trending worden
-        description_html: Dit zijn domeinen waarvan er links vaak op jouw server worden gedeeld. Links zullen niet in het openbaar trending worden, voordat het domein van de link wordt goedgekeurd. Jouw goedkeuring (of afwijzing) geldt ook voor subdomeinen.
+        description_html: Dit zijn domeinen waarvan er vaak links op jouw server worden gedeeld. Links worden niet in het openbaar trending, voordat het domein van de link wordt goedgekeurd. Jouw goedkeuring (of afwijzing) geldt ook voor subdomeinen.
         rejected: Links naar deze nieuwssite kunnen niet trending worden
         title: Websites
       rejected: Afgekeurd
@@ -928,7 +928,7 @@ nl:
         listable: Kan worden aanbevolen
         no_tag_selected: Er werden geen hashtags gewijzigd, omdat er geen enkele werd geselecteerd
         not_listable: Wordt niet aanbevolen
-        not_trendable: Zal niet onder trends verschijnen
+        not_trendable: Verschijnt niet onder trends
         not_usable: Kan niet worden gebruikt
         peaked_on_and_decaying: Piekte op %{date} en is nu weer op diens retour
         title: Trending hashtags
@@ -1159,10 +1159,10 @@ nl:
       email_change_html: Je kunt <a href="%{path}">je e-mailadres wijzigen</a> zonder dat je jouw account hoeft te verwijderen
       email_contact_html: Wanneer het nog steeds niet aankomt, kun je voor hulp e-mailen naar <a href="mailto:%{email}">%{email}</a>
       email_reconfirmation_html: Wanneer je de bevestigingsmail niet hebt ontvangen, kun je deze <a href="%{path}">opnieuw aanvragen</a>
-      irreversible: Je zult niet in staat zijn om jouw account te herstellen of te deactiveren
+      irreversible: Je bent niet meer in staat om jouw account te herstellen of te deactiveren
       more_details_html: Zie het <a href="%{terms_path}">privacybeleid</a> voor meer informatie.
-      username_available: Jouw gebruikersnaam zal weer beschikbaar komen
-      username_unavailable: Jouw gebruikersnaam zal onbeschikbaar blijven
+      username_available: Jouw gebruikersnaam komt weer beschikbaar
+      username_unavailable: Jouw gebruikersnaam blijft onbeschikbaar
   disputes:
     strikes:
       action_taken: Genomen maatregel
@@ -1197,7 +1197,7 @@ nl:
     invalid_domain: is een ongeldige domeinnaam
   edit_profile:
     basic_information: Algemene informatie
-    hint_html: "<strong>Pas aan wat mensen op jouw openbare profiel en naast je berichten zien.</strong> Andere mensen zullen je eerder volgen en met je communiceren wanneer je profiel is ingevuld en je een profielfoto hebt."
+    hint_html: "<strong>Wat mensen op jouw openbare profiel en naast je berichten zien aanpassen.</strong> Andere mensen gaan je waarschijnlijk eerder volgen en hebben vaker interactie met je, wanneer je profiel is ingevuld en je een profielfoto hebt."
     other: Overige
   errors:
     '400': De aanvraag die je hebt ingediend was ongeldig of foutief.
@@ -1323,7 +1323,7 @@ nl:
       bookmarks_html: Je staat op het punt <strong>jouw bladwijzers</strong> te vervangen door <strong>%{total_items} berichten</strong> vanuit <strong>%{filename}</strong>.
       domain_blocking_html: Je staat op het punt <strong>jouw lijst met geblokkeerde domeinen</strong> te vervangen door <strong>%{total_items} domeinen</strong> vanuit <strong>%{filename}</strong>.
       following_html: Je staat op het punt om <strong>%{total_items} accounts</strong> <strong>te volgen</strong> vanuit <strong>%{filename}</strong> en <strong>te stoppen met het volgen van alle andere accounts</strong>.
-      lists_html: Je staat op het punt <strong>je lijsten</strong> te vervangen door inhoud van <strong>%{filename}</strong>. Tot <strong>%{total_items} accounts</strong> zullen aan nieuwe lijsten worden toegevoegd.
+      lists_html: Je staat op het punt <strong>je lijsten</strong> te vervangen door inhoud van <strong>%{filename}</strong>. Er worden totaal <strong>%{total_items} accounts</strong> aan nieuwe lijsten toegevoegd.
       muting_html: Je staat op het punt <strong>jouw lijst met genegeerde accounts</strong> te vervangen door <strong>%{total_items} accounts</strong> vanuit <strong>%{filename}</strong>.
     preambles:
       blocking_html: Je staat op het punt om <strong>%{total_items} accounts</strong> te <strong>blokkeren</strong> vanuit <strong>%{filename}</strong>.
@@ -1421,7 +1421,7 @@ nl:
   migrations:
     acct: Verhuisd naar
     cancel: Doorverwijzing annuleren
-    cancel_explanation: Het annuleren van de doorverwijzing zal jouw huidige account opnieuw activeren, maar brengt geen volgers terug die naar het andere account zijn verhuisd.
+    cancel_explanation: Het annuleren van de doorverwijzing activeert opnieuw jouw huidige account, maar brengt geen volgers terug die naar het andere account zijn verhuisd.
     cancelled_msg: De doorverwijzing is succesvol geannuleerd.
     errors:
       already_moved: is hetzelfde account waarnaar je al naar toe bent verhuisd
@@ -1822,7 +1822,7 @@ nl:
         mark_statuses_as_sensitive: Sommige van jouw berichten zijn als gevoelig gemarkeerd door de moderatoren van %{instance}. Dit betekent dat mensen op de media in de berichten moeten klikken/tikken om deze weer te geven. Je kunt media in de toekomst ook zelf als gevoelig markeren.
         sensitive: Vanaf nu worden al jouw geüploade media als gevoelig gemarkeerd en verborgen achter een waarschuwing.
         silence: Je kunt nog steeds jouw account gebruiken, maar alleen mensen die jou al volgen kunnen jouw berichten zien, en je kunt minder goed worden gevonden. Andere kunnen je echter nog wel steeds handmatig volgen.
-        suspend: Je kunt niet langer jouw account gebruiken, en jouw profiel en andere gegevens zijn niet langer toegankelijk. Je kunt nog steeds inloggen om een backup van jouw gegevens op te vragen, totdat deze na 30 dagen volledig worden verwijderd. We zullen wel enkele basisgegevens behouden om te voorkomen dat je onder je schorsing uit probeert te komen.
+        suspend: Je kunt niet langer jouw account gebruiken, en jouw profiel en andere gegevens zijn niet langer toegankelijk. Je kunt nog steeds inloggen om een backup van jouw gegevens op te vragen, totdat deze na 30 dagen volledig worden verwijderd. We behouden wel enkele basisgegevens, om te voorkomen dat je onder je schorsing uit probeert te komen.
       reason: 'Reden:'
       statuses: 'Gerapporteerde berichten:'
       subject:
@@ -1830,7 +1830,7 @@ nl:
         disable: Jouw account %{acct} is bevroren
         mark_statuses_as_sensitive: Deze berichten van %{acct} zijn als gevoelig gemarkeerd
         none: Waarschuwing voor %{acct}
-        sensitive: Berichten van %{acct} zullen vanaf nu altijd als gevoelig worden gemarkeerd
+        sensitive: Berichten van %{acct} worden vanaf nu altijd als gevoelig gemarkeerd
         silence: Jouw account %{acct} is nu beperkt
         suspend: Jouw account %{acct} is opgeschort
       title:
@@ -1849,7 +1849,7 @@ nl:
       checklist_subtitle: 'Laten we aan dit nieuwe sociale avontuur beginnen:'
       checklist_title: Welkomstchecklist
       edit_profile_action: Personaliseren
-      edit_profile_step: Anderen zullen eerder met je in contact treden als je wat over jezelf vertelt.
+      edit_profile_step: Wanneer je meer over jezelf vertelt, krijg je meer interactie met andere mensen.
       edit_profile_title: Je profiel aanpassen
       explanation: Hier zijn enkele tips om je op weg te helpen
       feature_action: Meer informatie
@@ -1867,7 +1867,9 @@ nl:
       follows_subtitle: Volg bekende accounts
       follows_title: Wie te volgen
       follows_view_more: Meer mensen om te volgen bekijken
-      hashtags_recent_count: "%{people} mensen in de afgelopen %{days} dagen"
+      hashtags_recent_count:
+        one: "%{people} persoon in de afgelopen 2 dagen"
+        other: "%{people} mensen in de afgelopen 2 dagen"
       hashtags_subtitle: Wat er in de afgelopen 2 dagen is gebeurd verkennen
       hashtags_title: Populaire hashtags
       hashtags_view_more: Meer populaire hashtags bekijken
@@ -1891,7 +1893,7 @@ nl:
   verification:
     extra_instructions_html: <strong>Tip:</strong> De link op je website kan onzichtbaar zijn. Het belangrijke onderdeel is <code>rel="me"</code> dat impersonatie op websites met user-generated content voorkomt. Je kunt zelfs een <code>link</code>-tag gebruiken in de header van de pagina in plaats van <code>a</code>, maar de HTML moet ook zonder JavaScript toegankelijk zijn.
     here_is_how: Zo werkt het
-    hint_html: "<strong>Verificatie van je identiteit op Mastodon is voor iedereen.</strong> Het is gebaseerd op open webstandaarden, en is en blijft altijd gratis. Alles wat nodig is is een persoonlijke website waar mensen je aan kunnen herkennen. Wanneer je vanuit jouw profiel naar deze website linkt, zullen wij controleren of de website naar jouw profiel teruglinkt en daar een visuele indicator van tonen."
+    hint_html: "<strong>Verificatie van je identiteit op Mastodon is voor iedereen.</strong> Het is gebaseerd op open webstandaarden, en is en blijft altijd gratis. Alles wat nodig is is een persoonlijke website waar mensen je aan kunnen herkennen. Wanneer je vanuit jouw profiel naar deze website linkt, controleren wij of de website naar jouw profiel teruglinkt en geven wij dit duidelijk hierop aan."
     instructions_html: Kopieer en plak de onderstaande code in de HTML van je website. Voeg vervolgens het adres van je website toe aan een van de extra velden op je profiel op het tabblad "Profiel bewerken" en sla de wijzigingen op.
     verification: Verificatie
     verified_links: Jouw geverifieerde links
diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index 73821e5e28b04f..43b7768a9c07fe 100644
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -1867,7 +1867,6 @@ nn:
       follows_subtitle: Fylg kjende folk
       follows_title: Kven du kan fylgja
       follows_view_more: Sjå fleire du kan fylgja
-      hashtags_recent_count: "%{people} folk dei siste %{days} dagane"
       hashtags_subtitle: Sjå kva som har vore populært dei siste to dagane
       hashtags_title: Populære emneknaggar
       hashtags_view_more: Sjå fleire populære emneknaggar
diff --git a/config/locales/no.yml b/config/locales/no.yml
index ba3d40a522efb2..22292a32122dda 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -1854,7 +1854,6 @@
       follows_subtitle: Følg godt kjente kontoer
       follows_title: Hvem å følge
       follows_view_more: Vis flere personer å følge
-      hashtags_recent_count: "%{people} personer i de siste %{days} dagene"
       hashtags_title: Populære emneknagger
       hashtags_view_more: Vis flere populære emneknagger
       post_step: Si hallo til verdenen med tekst, bilder, videoer, eller meningsmålinger.
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 70e772c4c71569..e77a8d315bca15 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -1931,7 +1931,11 @@ pl:
       follows_subtitle: Obserwuj dobrze znane konta
       follows_title: Kogo obserwować
       follows_view_more: Zobacz więcej osób do obserwowania
-      hashtags_recent_count: "%{people} osób w ostatnie %{days} dni"
+      hashtags_recent_count:
+        few: "%{people} osoby w ostatnie 2 dni"
+        many: "%{people} osób w ostatnie 2 dni"
+        one: "%{people} osoba w ostatnie 2 dni"
+        other: "%{people} osób w ostatnie 2 dni"
       hashtags_subtitle: Zobacz, co było popularne przez ostatnie 2 dni
       hashtags_title: Popularne hashtagi
       hashtags_view_more: Zobacz więcej popularnych hashtagów
diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index bd635d12b670c9..da1bf9f2f4b659 100644
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -1867,7 +1867,6 @@ pt-PT:
       follows_subtitle: Siga contas bem conhecidas
       follows_title: Quem seguir
       follows_view_more: Veja mais pessoas para seguir
-      hashtags_recent_count: "%{people} pessoas nos últimos %{days} dias"
       hashtags_subtitle: Explore o que está em tendência desde os últimos 2 dias
       hashtags_title: Trending hashtags
       hashtags_view_more: Ver mais hashtags em alta
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index 747402bb1e6299..1099e3d0d7e3c6 100644
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -122,6 +122,8 @@ ro:
       removed_header_msg: S-a îndepărtat cu succes coperta utilizatorului %{username}
       resend_confirmation:
         already_confirmed: Acest utilizator este deja confirmat
+        send: Retrimite link-ul de confirmare
+        success: Link-ul de confirmare a fost trimis cu succes!
       reset: Resetează
       reset_password: Resetează parola
       resubscribe: Resubscrie-te
@@ -129,6 +131,7 @@ ro:
       search: Caută
       search_same_email_domain: Alţi utilizatori cu acelaşi domeniu de e-mail
       search_same_ip: Alţi utilizatori cu acelaşi IP
+      security: Securitate
       security_measures:
         only_password: Doar parola
         password_and_2fa: Parolă și Conectarea în 2 pași
@@ -189,6 +192,7 @@ ro:
         destroy_ip_block: Șterge regula IP
         destroy_status: Șterge starea
         destroy_unavailable_domain: Șterge Domeniul Indisponibil
+        destroy_user_role: Distruge Rolul
         disable_2fa_user: Dezactivează 2FA
         disable_custom_emoji: Dezactivează Emoji-urile Personalizate
         disable_sign_in_token_auth_user: Dezactivează Autentificarea prin Token E-mail pentru Utilizator
@@ -202,6 +206,7 @@ ro:
         reject_user: Respinge Utilizatorul
         remove_avatar_user: Elimină avatar
         reopen_report: Redeschide Raport
+        resend_user: Retrimite E-Mail-ul de Confirmare
         reset_password_user: Resetează Parola
         resolve_report: Rezolvă Raport
         sensitive_account: Cont Sensibil
@@ -213,7 +218,9 @@ ro:
         unsuspend_account: Anulează Suspendarea Contului
         update_announcement: Actualizare Anunț
         update_custom_emoji: Actualizare Emoji Personalizat
+        update_ip_block: Actualizați regula IP
         update_status: Actualizează Starea
+        update_user_role: Actualizare Rol
       actions:
         create_custom_emoji_html: "%{name} a încărcat noi emoji %{target}"
       deleted_account: cont șters
@@ -238,6 +245,7 @@ ro:
       unpublish: Revocă publicarea
       unpublished_msg: Publicarea anunțului a fost revocată cu succes!
       updated_msg: Anunț actualizat cu succes!
+    critical_update_pending: Actualizare critică în așteptare
     custom_emojis:
       assign_category: Atribuie o categorie
       by_domain: Domeniu
@@ -272,6 +280,37 @@ ro:
       update_failed_msg: Nu s-a putut actualiza emoticonul respectiv
       updated_msg: Emoticon actualizat cu succes!
       upload: Încarcă
+    dashboard:
+      active_users: utilizatori activi
+      interactions: interacțiuni
+      media_storage: Stocare media
+      new_users: utilizatori noi
+      opened_reports: rapoarte deschise
+      resolved_reports: rapoarte rezolvate
+      software: Software
+      sources: Surse de înscriere
+      space: Utilizare spațiu
+      title: Tablou de bord
+      top_languages: Limbi active de top
+      top_servers: Top servere active
+      website: Site web
+    disputes:
+      appeals:
+        empty: Niciun recurs găsit.
+        title: Recursuri
+    domain_allows:
+      export: Exportare
+      import: Importare
+    domain_blocks:
+      confirm_suspension:
+        cancel: Anulare
+        confirm: Suspendă
+        permanent_action: Anularea suspendării nu va restabili nicio dată sau relație.
+        preamble_html: Sunteți pe cale să suspendați <strong>%{domain}</strong> și subdomeniile sale.
+        remove_all_data: Acest lucru va elimina tot conținutul, media și datele profilului contului acestui domeniu de pe server.
+        stop_communication: Serverul tău nu va mai comunica cu aceste servere.
+        title: Confirmați blocarea domeniului pentru %{domain}
+        undo_relationships: Această acțiune va anula orice relație de urmărire între conturile acestor servere și ale tale.
     email_domain_blocks:
       delete: Șterge
       dns:
diff --git a/config/locales/simple_form.de.yml b/config/locales/simple_form.de.yml
index 1d608af08b5159..1d3fba7876aaf3 100644
--- a/config/locales/simple_form.de.yml
+++ b/config/locales/simple_form.de.yml
@@ -149,7 +149,7 @@ de:
         show_collections: Follower und „Folge ich“ im Profil anzeigen
         unlocked: Neue Follower automatisch akzeptieren
       account_alias:
-        acct: Profilname des alten Kontos
+        acct: Adresse des alten Kontos
       account_migration:
         acct: Adresse des neuen Kontos
       account_warning_preset:
diff --git a/config/locales/simple_form.hu.yml b/config/locales/simple_form.hu.yml
index 8855494fdf7e53..1d5e149339a9d6 100644
--- a/config/locales/simple_form.hu.yml
+++ b/config/locales/simple_form.hu.yml
@@ -149,9 +149,9 @@ hu:
         show_collections: Követők és követettek megjelnítése a profilban
         unlocked: Új követők automatikus elfogadása
       account_alias:
-        acct: Régi fiók kezelése
+        acct: A régi fiók fiókneve
       account_migration:
-        acct: Új fiók kezelése
+        acct: Az új fiók fiókneve
       account_warning_preset:
         text: Figyelmeztető szöveg
         title: Cím
@@ -252,7 +252,7 @@ hu:
         registrations_mode: Ki regisztrálhat
         require_invite_text: Indok megkövetelése a csatlakozáshoz
         show_domain_blocks: Domain tiltások megjelenitése
-        show_domain_blocks_rationale: A domainok blokkolásának okának megjelenítése
+        show_domain_blocks_rationale: A domainek letiltási okainak megjelenítése
         site_contact_email: Kapcsolattartó e-mail
         site_contact_username: Kapcsolattartó felhasználóneve
         site_extended_description: Bővített leírás
diff --git a/config/locales/simple_form.kab.yml b/config/locales/simple_form.kab.yml
index 4f7357c5728fa3..8723e83efac3cc 100644
--- a/config/locales/simple_form.kab.yml
+++ b/config/locales/simple_form.kab.yml
@@ -91,8 +91,8 @@ kab:
         site_terms: Tasertit tabaḍnit
         site_title: Isem n uqeddac
       interactions:
-        must_be_follower: Ssewḥel ilɣa seg wid akked tid ur yellin ara d imeḍfaren-ik·im
-        must_be_following: Ssewḥel ilɣa seg wid akked tid ur tettḍafareḍ ara
+        must_be_follower: Ssewḥel ilɣa sɣur wid akked tid ur yellin ara d imeḍfaren-ik·im
+        must_be_following: Ssewḥel ilɣa sɣur wid akked tid ur tettḍafareḍ ara
         must_be_following_dm: Sewḥel iznan usriden sɣur wid akked tid ur tettḍafareḍ ara
       invite:
         comment: Awennit
@@ -111,6 +111,7 @@ kab:
         mention: Yuder-ik·em-id walbɛaḍ
         reblog: Yella win yesselhan adda-dik·im
       rule:
+        hint: Isallen-nniḍen
         text: Alugen
       tag:
         name: Ahacṭag
diff --git a/config/locales/simple_form.pt-BR.yml b/config/locales/simple_form.pt-BR.yml
index 3a4e99a0d12793..676f5e37a3f354 100644
--- a/config/locales/simple_form.pt-BR.yml
+++ b/config/locales/simple_form.pt-BR.yml
@@ -39,12 +39,14 @@ pt-BR:
         text: Você só pode solicitar uma revisão uma vez
       defaults:
         autofollow: Pessoas que criarem conta através de seu convite te seguirão automaticamente
+        avatar: WEBP, PNG, GIF ou JPG. No máximo %{size}. Será reduzido para %{dimensions}px
         bot: Essa conta executa principalmente ações automatizadas e pode não ser monitorada
         context: Um ou mais contextos onde o filtro deve atuar
         current_password: Para fins de segurança, digite a senha da conta atual
         current_username: Para confirmar, digite o nome de usuário da conta atual
         digest: Enviado apenas após um longo período de inatividade com um resumo das menções recebidas durante ausência
         email: Você receberá um e-mail de confirmação
+        header: WEBP, PNG, GIF ou JPG. No máximo %{size}. Será reduzido para %{dimensions}px
         inbox_url: Copie o link da página inicial do repetidor que você deseja usar
         irreversible: As publicações filtradas desaparecerão irreversivelmente, mesmo se o filtro for removido depois
         locale: O idioma da interface do usuário, e-mails e notificações
@@ -297,6 +299,7 @@ pt-BR:
           patch: Notificar sobre atualizações de correções
         trending_tag: Uma nova tendência requer revisão
       rule:
+        hint: Informações adicionais
         text: Regra
       settings:
         indexable: Incluir página de perfil nos motores de busca
diff --git a/config/locales/simple_form.zh-HK.yml b/config/locales/simple_form.zh-HK.yml
index 6fa052082eaa4f..f6e40720feb1b3 100644
--- a/config/locales/simple_form.zh-HK.yml
+++ b/config/locales/simple_form.zh-HK.yml
@@ -39,12 +39,14 @@ zh-HK:
         text: 你每次只能提出一次申訴
       defaults:
         autofollow: 通過邀請網址註冊的用戶將會自動關注你
+        avatar: WEBP、PNG、GIF 或 JPG 格式圖片，最大為 %{size}，並將縮小至 %{dimensions} px
         bot: 這個帳號是機械人，所做的事情可能沒有經人為監察
         context: 過濾器應該套用的一項或多項條件
         current_password: 基於保安緣故，請輸入目前帳號的密碼
         current_username: 請輸入目前帳戶的使用者名稱以確認
         digest: 僅在你長時間未登錄，且收到了私信時發送
         email: 你將收到一封確認電郵
+        header: WEBP、PNG、GIF 或 JPG 格式圖片，最大為 %{size}，並將縮小至 %{dimensions} px
         inbox_url: 在你想要使用的中繼站首頁，複製它的網址
         irreversible: 文章過濾是不可還原的，即使日後過濾器被移除，也無法重新看到被它濾走的文章
         locale: 使用者介面、電郵和通知的語言
@@ -114,6 +116,7 @@ zh-HK:
           sign_up_requires_approval: 新登記申請正等候你審批
         severity: 請設定伺服器將如何處理來自這個 IP 位址的請求
       rule:
+        hint: 選填。提供有關規則的更多細節
         text: 請描述在此伺服器上用戶需要遵守的規則或要求。請盡量保持簡短易明。
       sessions:
         otp: 輸入你手機上生成的雙重認證碼，或者任意一個恢復代碼：
@@ -297,6 +300,7 @@ zh-HK:
           patch: 通知除錯更新
         trending_tag: 新趨勢須經過審核
       rule:
+        hint: 其他資訊
         text: 規則
       settings:
         indexable: 在搜尋引擎中顯示個人檔案
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 103e16a1f5fb73..4583219b779bcb 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -1931,7 +1931,6 @@ sl:
       follows_subtitle: Sledite dobro znanim računom
       follows_title: Komu slediti
       follows_view_more: Pokaži več oseb za sledenje
-      hashtags_recent_count: "%{people} oseb v zadnjih %{days} dneh"
       hashtags_subtitle: Raziščite, kaj je v trendu zadnja dva dni
       hashtags_title: Ključniki v trendu
       hashtags_view_more: Pokaži več ključnikov v trendu
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index 0aa7ad34bcb261..9b3b4a6bdbeb75 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -1863,7 +1863,9 @@ sq:
       follows_subtitle: Ndiqni llogari të mirënjohura
       follows_title: Cilët të ndiqen
       follows_view_more: Shihni më tepër vetë për ndjekje
-      hashtags_recent_count: "%{people} vetë në %{days} ditët e shkuara"
+      hashtags_recent_count:
+        one: "%{people} person në 2 ditët e shkuara"
+        other: "%{people} vetë në 2 ditët e shkuara"
       hashtags_subtitle: Eksploroni ç’është në modëë që prej 2 ditëve të fundit
       hashtags_title: Hashtag-ë në modë
       hashtags_view_more: Shihni më tepër hashtagë në modë
diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml
index c2f9295f1cf867..51067390ab3b93 100644
--- a/config/locales/sr-Latn.yml
+++ b/config/locales/sr-Latn.yml
@@ -1899,7 +1899,6 @@ sr-Latn:
       follows_subtitle: Pratite dobro poznate naloge
       follows_title: Koga pratiti
       follows_view_more: Pogledajte još ljudi za praćenje
-      hashtags_recent_count: "%{people} ljudi u prošlih %{days} dana"
       hashtags_subtitle: Istražite šta je u trendu u poslednja 2 dana
       hashtags_title: Heš oznake u trendu
       hashtags_view_more: Pogledajte još heš oznaka u trendu
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 19b6b66dd8800d..f97dc49c0264fc 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -1899,7 +1899,10 @@ sr:
       follows_subtitle: Пратите добро познате налоге
       follows_title: Кога пратити
       follows_view_more: Погледајте још људи за праћење
-      hashtags_recent_count: "%{people} људи у прошлих %{days} дана"
+      hashtags_recent_count:
+        few: "%{people} особе у последња 2 дана"
+        one: "%{people} особа у последња 2 дана"
+        other: "%{people} особа у последња 2 дана"
       hashtags_subtitle: Истражите шта је у тренду у последња 2 дана
       hashtags_title: Хеш ознаке у тренду
       hashtags_view_more: Погледајте још хеш ознака у тренду
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index a40808eed60f89..1ab7a630425bb9 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -1867,7 +1867,9 @@ sv:
       follows_subtitle: Följ välkända konton
       follows_title: Rekommenderade profiler
       follows_view_more: Visa fler personer att följa
-      hashtags_recent_count: "%{people} personer under de senaste %{days} dagarna"
+      hashtags_recent_count:
+        one: "%{people} personer de senaste 2 dagarna"
+        other: "%{people} personer under de senaste 2 dagarna"
       hashtags_subtitle: Utforska vad som har trendat de senaste 2 dagarna
       hashtags_title: Trendande hashtaggar
       hashtags_view_more: Visa fler trendande hashtaggar
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 1b4ce0d6abef74..10571af9d29114 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -1827,7 +1827,8 @@ th:
       follows_subtitle: ติดตามบัญชีที่มีชื่อเสียง
       follows_title: ติดตามใครดี
       follows_view_more: ดูผู้คนที่จะติดตามเพิ่มเติม
-      hashtags_recent_count: "%{people} คนใน %{days} วันที่ผ่านมา"
+      hashtags_recent_count:
+        other: "%{people} คนใน 2 วันที่ผ่านมา"
       hashtags_subtitle: สำรวจสิ่งที่กำลังนิยมตั้งแต่ 2 วันที่ผ่านมา
       hashtags_title: แฮชแท็กที่กำลังนิยม
       hashtags_view_more: ดูแฮชแท็กที่กำลังนิยมเพิ่มเติม
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 58436690ca362a..f80a21ed7201a2 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -1867,7 +1867,9 @@ tr:
       follows_subtitle: Tanınmış hesapları takip edin
       follows_title: Takip edebileceklerin
       follows_view_more: Takip edecek daha fazla kişi görüntüleyin
-      hashtags_recent_count: "%{days} günde %{people} kişi"
+      hashtags_recent_count:
+        one: Son 2 günde %{people} kişi
+        other: Son 2 günde %{people} kişi
       hashtags_subtitle: Son 2 günde öne çıkanları keşfedin
       hashtags_title: Öne çıkan etiketler
       hashtags_view_more: Daha fazla öne çıkan etiket görüntüleyin
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 3ceaad92efa939..14e60dc124ecc8 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -1835,7 +1835,6 @@ vi:
       follows_subtitle: Theo dõi những người thú vị
       follows_title: Gợi ý theo dõi
       follows_view_more: Xem thêm những người khác
-      hashtags_recent_count: "%{people} người dùng trong %{days} ngày qua"
       hashtags_subtitle: Khám phá xu hướng 2 ngày qua
       hashtags_title: Hashtag xu hướng
       hashtags_view_more: Xem thêm hashtag xu hướng
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 6296a4bb7cbc1b..17a66f72b3cafb 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -1835,7 +1835,8 @@ zh-CN:
       follows_subtitle: 关注知名账户
       follows_title: 推荐关注
       follows_view_more: 查看更多可关注的人
-      hashtags_recent_count: 在过去的 %{days} 天中有 %{people} 人
+      hashtags_recent_count:
+        other: 过去2天内有 %{people} 人
       hashtags_subtitle: 探索过去2天以来的热门内容
       hashtags_title: 热门话题标签
       hashtags_view_more: 查看更多热门话题标签
diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml
index 0d3e109b19733e..43e3ef51d0d5c9 100644
--- a/config/locales/zh-HK.yml
+++ b/config/locales/zh-HK.yml
@@ -753,6 +753,7 @@ zh-HK:
         disabled: 給沒有人
         users: 所有已登入的帳號
       registrations:
+        moderation_recommandation: 在向所有人開放註冊之前，請確保擁有一個準備充足且反應迅速的審核團隊！
         preamble: 控制誰可在你的伺服器上建立帳號。
         title: 註冊
       registrations_mode:
@@ -760,6 +761,7 @@ zh-HK:
           approved: 註冊需要核准
           none: 沒有人可註冊
           open: 任何人皆能註冊
+        warning_hint: 我們建議你使用「需要審核註冊」的設定，除非你確信審核團隊能夠及時處理垃圾訊息和惡意註冊。
       security:
         authorized_fetch: 要求跨站驗證
         authorized_fetch_hint: 要求跨站驗證可更嚴謹地執行使用者級及伺服器級的封鎖。然而，這會犧牲性能，降低你回覆的觸及範圍，跨站服務亦可能出現兼容問題。此外，這並無法阻止他人蓄意擷取你的公開帖文和帳號。
@@ -948,6 +950,9 @@ zh-HK:
       title: Webhooks
       webhook: Webhook
   admin_mailer:
+    auto_close_registrations:
+      body: 由於管理員最近較少活動，為防止 %{instance} 被惡意利用，註冊流程已自動改為手動審核。你可以隨時將它切換回開放註冊。
+      subject: "%{instance} 上的註冊已自動切換為需要審核批准"
     new_appeal:
       actions:
         delete_statuses: 刪除他們的帖文
@@ -1805,7 +1810,43 @@ zh-HK:
         silence: 賬戶已被限制
         suspend: 帳號已停用
     welcome:
+      apps_android_action: 從 Google Play 下載
+      apps_ios_action: 從 App Store 下載
+      apps_step: 下載官方應用程式。
+      apps_title: Mastodon 應用程式
+      checklist_subtitle: 讓我們帶你進入全新的社交領域：
+      checklist_title: 歡迎清單
+      edit_profile_action: 自訂
+      edit_profile_step: 完善個人檔案來促進互動。
+      edit_profile_title: 自訂你的個人檔案。
       explanation: 下面是幾個小貼士，希望它們能幫到你
+      feature_action: 了解更多
+      feature_audience: 在 Mastodon 上，無需仲介，你也可以管理受眾。將 Mastodon 部署在自己的基礎架構上，既可以追蹤來自其他 Mastodon 伺服器上的人，也可以被他們追蹤。完全不受他人控制，一切由你掌控。
+      feature_audience_title: 自信地建立受眾
+      feature_control: 由你決定首頁時間軸的內容，不讓演算法和廣告干擾你！你可以使用同一帳號追蹤 Mastodon 伺服器上的使用者，並按時序瀏覽帖文，打造你專屬的網絡世界，讓這角落更貼近你的喜好。
+      feature_control_title: 掌控自己的時間軸
+      feature_creativity: Mastodon 囊括多元格式，助你盡情表達自我：干台支援音訊、影片、圖片帖文、無障礙描述、投票、內容警告，還有動態頭像、自訂表情符號、縮圖裁剪控制等功能。無論你想發佈藝術作品、音樂還是 podcast，Mastodon 都是你的理想平台。
+      feature_creativity_title: 無與倫比的創意
+      feature_moderation: 在 Mastodon，一切由你掌控。每台伺服器都能各自制訂並實施自身守則，而非像企業社交媒體那樣由上而下。這讓 Mastodon 能夠靈活地滿足不同群體的需要。你可以加入你認同其規則的伺服器，也可以自行架設。
+      feature_moderation_title: 以應有的方式管理社群
+      follow_action: 追蹤
+      follow_step: 追蹤有趣的人正是 Mastodon 的核心所在。
+      follow_title: 自訂你的首頁時間軸
+      follows_subtitle: 追蹤知名帳號
+      follows_title: 追蹤對象
+      follows_view_more: 查看更多追蹤對象
+      hashtags_recent_count:
+        other: 過去兩天內有 %{people} 人
+      hashtags_subtitle: 查看過去兩天的流行話題
+      hashtags_title: 熱門標籤
+      hashtags_view_more: 查看更多熱門標籤
+      post_action: 撰寫
+      post_step: 用文字、相片、影片或投票跟大家打個招呼吧。
+      post_title: 發表你的第一則帖文
+      share_action: 分享
+      share_step: 讓你的朋友知道如何在 Mastodon 上找到你。
+      share_title: 分享你的 Mastodon 個人檔案
+      sign_in_action: 登入
       subject: 歡迎來到 Mastodon (萬象)
       title: 歡迎 %{name} 加入！
   users:
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 2eecfa7b465045..592f41c1c51b46 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -1837,7 +1837,8 @@ zh-TW:
       follows_subtitle: 跟隨家喻戶曉的熱門帳號
       follows_title: 推薦跟隨帳號
       follows_view_more: 檢視更多人以跟隨
-      hashtags_recent_count: 於過去 %{days} 天 %{people} 人
+      hashtags_recent_count:
+        other: 於過去二天 %{people} 人
       hashtags_subtitle: 探索過去兩天內的熱門主題標籤
       hashtags_title: 熱門主題標籤
       hashtags_view_more: 檢視更多熱門主題標籤

From 5d3d525d0e3a898f63c1f06c22756e5efc7f809c Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 18 Mar 2024 09:48:13 +0100
Subject: [PATCH 0485/2191] Update DefinitelyTyped types (non-major) (#29631)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index f185ad8d68805e..0be10a40851ca2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3208,9 +3208,9 @@ __metadata:
   linkType: hard
 
 "@types/lodash@npm:^4.14.195":
-  version: 4.14.202
-  resolution: "@types/lodash@npm:4.14.202"
-  checksum: 10c0/6064d43c8f454170841bd67c8266cc9069d9e570a72ca63f06bceb484cb4a3ee60c9c1f305c1b9e3a87826049fd41124b8ef265c4dd08b00f6766609c7fe9973
+  version: 4.17.0
+  resolution: "@types/lodash@npm:4.17.0"
+  checksum: 10c0/4c5b41c9a6c41e2c05d08499e96f7940bcf194dcfa84356235b630da920c2a5e05f193618cea76006719bec61c76617dff02defa9d29934f9f6a76a49291bd8f
   languageName: node
   linkType: hard
 
@@ -3326,11 +3326,11 @@ __metadata:
   linkType: hard
 
 "@types/react-dom@npm:^18.0.0, @types/react-dom@npm:^18.2.4":
-  version: 18.2.21
-  resolution: "@types/react-dom@npm:18.2.21"
+  version: 18.2.22
+  resolution: "@types/react-dom@npm:18.2.22"
   dependencies:
     "@types/react": "npm:*"
-  checksum: 10c0/a887b4b647071df48173f054854713b68fdacfceeba7fa14f64ba26688d7d43574d7dc88a2a346e28f2e667eeab1b9bdbcad8a54353869835e52638607f61ff5
+  checksum: 10c0/cd85b5f402126e44b8c7b573e74737389816abcc931b2b14d8f946ba81cce8637ea490419488fcae842efb1e2f69853bc30522e43fd8359e1007d4d14b8d8146
   languageName: node
   linkType: hard
 
@@ -3456,13 +3456,13 @@ __metadata:
   linkType: hard
 
 "@types/react@npm:*, @types/react@npm:16 || 17 || 18, @types/react@npm:>=16.9.11, @types/react@npm:^18.2.7":
-  version: 18.2.64
-  resolution: "@types/react@npm:18.2.64"
+  version: 18.2.66
+  resolution: "@types/react@npm:18.2.66"
   dependencies:
     "@types/prop-types": "npm:*"
     "@types/scheduler": "npm:*"
     csstype: "npm:^3.0.2"
-  checksum: 10c0/ab3ba9597990d08ffd419a5ad28fd22393c7a9a241ae455fb1d5d193d209471aa1909fa7ad016fd8d161eab6d0babba77b013b56a5170bedf78833085b9ee424
+  checksum: 10c0/56e4b841f2daf03a0b3268d4f2bcf5841167fe56742b9f1c076fad66587fb59191bdaba4d5727dbfbcff750d5e8797fdd4e57d8d9704b0bfc6ad31ee1e268a70
   languageName: node
   linkType: hard
 

From cf7d412367c6748111d3c0b50a6827e4ea25afd2 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 18 Mar 2024 09:48:37 +0100
Subject: [PATCH 0486/2191] Update peter-evans/create-pull-request action to
 v6.0.2 (#29630)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .github/workflows/crowdin-download.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/crowdin-download.yml b/.github/workflows/crowdin-download.yml
index 45580bd06f2ead..e3ad7371a86c4b 100644
--- a/.github/workflows/crowdin-download.yml
+++ b/.github/workflows/crowdin-download.yml
@@ -52,7 +52,7 @@ jobs:
 
       # Create or update the pull request
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v6.0.1
+        uses: peter-evans/create-pull-request@v6.0.2
         with:
           commit-message: 'New Crowdin translations'
           title: 'New Crowdin Translations (automated)'

From 2f653174b106ef7973b15699731728815b23eec9 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 18 Mar 2024 08:49:18 +0000
Subject: [PATCH 0487/2191] Update libretranslate/libretranslate Docker tag to
 v1.5.6 (#29629)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .devcontainer/docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
index ecdf9f5f53060c..d14af5d7d98ae4 100644
--- a/.devcontainer/docker-compose.yml
+++ b/.devcontainer/docker-compose.yml
@@ -70,7 +70,7 @@ services:
         hard: -1
 
   libretranslate:
-    image: libretranslate/libretranslate:v1.5.5
+    image: libretranslate/libretranslate:v1.5.6
     restart: unless-stopped
     volumes:
       - lt-data:/home/libretranslate/.local

From a0fcac9652536df9c880fcfd4aa07bc1e61d74ed Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 18 Mar 2024 08:49:34 +0000
Subject: [PATCH 0488/2191] Update dependency postcss to v8.4.36 (#29628)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 0be10a40851ca2..971e6418f1099a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -13071,13 +13071,13 @@ __metadata:
   linkType: hard
 
 "postcss@npm:^8.2.15, postcss@npm:^8.4.24, postcss@npm:^8.4.33":
-  version: 8.4.35
-  resolution: "postcss@npm:8.4.35"
+  version: 8.4.36
+  resolution: "postcss@npm:8.4.36"
   dependencies:
     nanoid: "npm:^3.3.7"
     picocolors: "npm:^1.0.0"
-    source-map-js: "npm:^1.0.2"
-  checksum: 10c0/e8dd04e48001eb5857abc9475365bf08f4e508ddf9bc0b8525449a95d190f10d025acebc5b56ac2e94b3c7146790e4ae78989bb9633cb7ee20d1cc9b7dc909b2
+    source-map-js: "npm:^1.1.0"
+  checksum: 10c0/e7c834e31d8f4e8dfd0a427df36fdc7bdc58a16e373551618e2c3ac172019eb816b24f1b4709311ebcade8d3ba31b2d75522d28ef45ecbbeb11eb01f265579fb
   languageName: node
   linkType: hard
 
@@ -15018,10 +15018,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"source-map-js@npm:>=0.6.2 <2.0.0, source-map-js@npm:^1.0.1, source-map-js@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "source-map-js@npm:1.0.2"
-  checksum: 10c0/32f2dfd1e9b7168f9a9715eb1b4e21905850f3b50cf02cf476e47e4eebe8e6b762b63a64357896aa29b37e24922b4282df0f492e0d2ace572b43d15525976ff8
+"source-map-js@npm:>=0.6.2 <2.0.0, source-map-js@npm:^1.0.1, source-map-js@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "source-map-js@npm:1.1.0"
+  checksum: 10c0/d1f016efe4fcf67fd92e36da0670f2889b13a36cc453329758336450e811c61164376eb451b453b4dd4e89a760f841b0a014942d54f240af31a791829bc0e336
   languageName: node
   linkType: hard
 

From 97a229d5f42afecfa328c676271279b484e65f4b Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 18 Mar 2024 08:53:29 +0000
Subject: [PATCH 0489/2191] Update dependency nokogiri to v1.16.3 (#29622)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index cb76abafccecb9..9766c38471dc79 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -455,7 +455,7 @@ GEM
     net-smtp (0.4.0.1)
       net-protocol
     nio4r (2.5.9)
-    nokogiri (1.16.2)
+    nokogiri (1.16.3)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     nsa (0.3.0)

From ecdbf15ebef3bae688528b347fec50583c6cc04d Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 18 Mar 2024 04:54:46 -0400
Subject: [PATCH 0490/2191] Remove unused `link_to_older` and `link_to_newer`
 helper methods (#29620)

---
 app/helpers/statuses_helper.rb       |  8 --------
 config/locales/an.yml                |  2 --
 config/locales/ar.yml                |  2 --
 config/locales/be.yml                |  2 --
 config/locales/bg.yml                |  2 --
 config/locales/ca.yml                |  2 --
 config/locales/ckb.yml               |  2 --
 config/locales/co.yml                |  2 --
 config/locales/cs.yml                |  2 --
 config/locales/cy.yml                |  2 --
 config/locales/da.yml                |  2 --
 config/locales/de.yml                |  2 --
 config/locales/el.yml                |  2 --
 config/locales/en-GB.yml             |  2 --
 config/locales/en.yml                |  2 --
 config/locales/eo.yml                |  2 --
 config/locales/es-AR.yml             |  2 --
 config/locales/es-MX.yml             |  2 --
 config/locales/es.yml                |  2 --
 config/locales/et.yml                |  2 --
 config/locales/eu.yml                |  2 --
 config/locales/fa.yml                |  2 --
 config/locales/fi.yml                |  2 --
 config/locales/fo.yml                |  2 --
 config/locales/fr-CA.yml             |  2 --
 config/locales/fr.yml                |  2 --
 config/locales/fy.yml                |  2 --
 config/locales/ga.yml                |  1 -
 config/locales/gd.yml                |  2 --
 config/locales/gl.yml                |  2 --
 config/locales/he.yml                |  2 --
 config/locales/hu.yml                |  2 --
 config/locales/hy.yml                |  2 --
 config/locales/id.yml                |  2 --
 config/locales/ie.yml                |  2 --
 config/locales/io.yml                |  2 --
 config/locales/is.yml                |  2 --
 config/locales/it.yml                |  2 --
 config/locales/ja.yml                |  2 --
 config/locales/kab.yml               |  2 --
 config/locales/ko.yml                |  2 --
 config/locales/ku.yml                |  2 --
 config/locales/lad.yml               |  2 --
 config/locales/lv.yml                |  2 --
 config/locales/ms.yml                |  2 --
 config/locales/my.yml                |  2 --
 config/locales/nl.yml                |  2 --
 config/locales/nn.yml                |  2 --
 config/locales/no.yml                |  2 --
 config/locales/oc.yml                |  2 --
 config/locales/pl.yml                |  2 --
 config/locales/pt-BR.yml             |  2 --
 config/locales/pt-PT.yml             |  2 --
 config/locales/ru.yml                |  2 --
 config/locales/sc.yml                |  2 --
 config/locales/sco.yml               |  2 --
 config/locales/si.yml                |  2 --
 config/locales/sl.yml                |  2 --
 config/locales/sq.yml                |  2 --
 config/locales/sr-Latn.yml           |  2 --
 config/locales/sr.yml                |  2 --
 config/locales/sv.yml                |  2 --
 config/locales/th.yml                |  2 --
 config/locales/tr.yml                |  2 --
 config/locales/uk.yml                |  2 --
 config/locales/vi.yml                |  2 --
 config/locales/zh-CN.yml             |  2 --
 config/locales/zh-HK.yml             |  2 --
 config/locales/zh-TW.yml             |  2 --
 spec/helpers/statuses_helper_spec.rb | 20 --------------------
 70 files changed, 163 deletions(-)

diff --git a/app/helpers/statuses_helper.rb b/app/helpers/statuses_helper.rb
index 286c53d834e03d..ca693a8a78a9af 100644
--- a/app/helpers/statuses_helper.rb
+++ b/app/helpers/statuses_helper.rb
@@ -4,14 +4,6 @@ module StatusesHelper
   EMBEDDED_CONTROLLER = 'statuses'
   EMBEDDED_ACTION = 'embed'
 
-  def link_to_newer(url)
-    link_to t('statuses.show_newer'), url, class: 'load-more load-gap'
-  end
-
-  def link_to_older(url)
-    link_to t('statuses.show_older'), url, class: 'load-more load-gap'
-  end
-
   def nothing_here(extra_classes = '')
     content_tag(:div, class: "nothing-here #{extra_classes}") do
       t('accounts.nothing_here')
diff --git a/config/locales/an.yml b/config/locales/an.yml
index 27abf2203a8c91..5ac57f423818b7 100644
--- a/config/locales/an.yml
+++ b/config/locales/an.yml
@@ -1468,8 +1468,6 @@ an:
         other: "%{count} votos"
       vote: Vota
     show_more: Amostrar mas
-    show_newer: Amostrar mas recients
-    show_older: Amostrar mas antigos
     show_thread: Amostrar discusión
     title: "%{name}: «%{quote}»"
     visibilities:
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 2e227f53a7a35f..5b932f525c8fdd 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -1820,8 +1820,6 @@ ar:
         zero: بدون صوت %{count}
       vote: صوّت
     show_more: أظهر المزيد
-    show_newer: إظهار أحدث
-    show_older: إظهار أقدم
     show_thread: اعرض خيط المحادثة
     title: '%{name}: "%{quote}"'
     visibilities:
diff --git a/config/locales/be.yml b/config/locales/be.yml
index 7d32ff1366e8a2..d04409ca9a7f60 100644
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -1761,8 +1761,6 @@ be:
         other: "%{count} голасу"
       vote: Прагаласаваць
     show_more: Паказаць больш
-    show_newer: Паказаць навейшыя
-    show_older: Паказаць старэйшыя
     show_thread: Паказаць ланцуг
     title: '%{name}: "%{quote}"'
     visibilities:
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 5b4a828dd71568..3f05bfa0c08e61 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -1697,8 +1697,6 @@ bg:
         other: "%{count} гласа"
       vote: Гласуване
     show_more: Покажи повече
-    show_newer: Показване на по-нови
-    show_older: Показване на по-стари
     show_thread: Показване на нишката
     title: "%{name}: „%{quote}“"
     visibilities:
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index f5a0143ef659a2..dedf69d7b21eec 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -1697,8 +1697,6 @@ ca:
         other: "%{count} vots"
       vote: Vota
     show_more: Mostra'n més
-    show_newer: Mostra els més nous
-    show_older: Mostra els més vells
     show_thread: Mostra el fil
     title: '%{name}: "%{quote}"'
     visibilities:
diff --git a/config/locales/ckb.yml b/config/locales/ckb.yml
index f4733c27e5fbb0..c1f280a24c55a6 100644
--- a/config/locales/ckb.yml
+++ b/config/locales/ckb.yml
@@ -982,8 +982,6 @@ ckb:
         other: "%{count} دەنگەکان"
       vote: دەنگ
     show_more: زیاتر پیشان بدە
-    show_newer: نوێتر پیشان بدە
-    show_older: پیشاندانی کۆنتر
     show_thread: نیشاندانی ڕشتە
     visibilities:
       private: شوێنکەوتوانی تەنها
diff --git a/config/locales/co.yml b/config/locales/co.yml
index 8668cc69539283..13c8b743134b6f 100644
--- a/config/locales/co.yml
+++ b/config/locales/co.yml
@@ -966,8 +966,6 @@ co:
         other: "%{count} voti"
       vote: Vutà
     show_more: Vede di più
-    show_newer: Vede i più ricenti
-    show_older: Vede i più anziani
     show_thread: Vede u filu
     title: '%{name}: "%{quote}"'
     visibilities:
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 2ecc3606662f68..7e4e3805418026 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -1761,8 +1761,6 @@ cs:
         other: "%{count} hlasů"
       vote: Hlasovat
     show_more: Zobrazit více
-    show_newer: Zobrazit novější
-    show_older: Zobrazit starší
     show_thread: Zobrazit vlákno
     title: "%{name}: „%{quote}“"
     visibilities:
diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index 8fcd10fe4d5568..067d939deb5a18 100644
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@@ -1825,8 +1825,6 @@ cy:
         zero: "%{count} o bleidleisiau"
       vote: Pleidlais
     show_more: Dangos mwy
-    show_newer: Dangos y diweddaraf
-    show_older: Dangos pethau hŷn
     show_thread: Dangos edefyn
     title: '%{name}: "%{quote}"'
     visibilities:
diff --git a/config/locales/da.yml b/config/locales/da.yml
index 59de5327d0bce0..fcb600d7b95bd8 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -1697,8 +1697,6 @@ da:
         other: "%{count} stemmer"
       vote: Stem
     show_more: Vis flere
-    show_newer: Vis nyere
-    show_older: Vis ældre
     show_thread: Vis tråd
     title: '%{name}: "%{quote}"'
     visibilities:
diff --git a/config/locales/de.yml b/config/locales/de.yml
index fa66754346cb1d..84f10d8e088efe 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -1697,8 +1697,6 @@ de:
         other: "%{count} Stimmen"
       vote: Abstimmen
     show_more: Mehr anzeigen
-    show_newer: Neuere anzeigen
-    show_older: Ältere anzeigen
     show_thread: Thread anzeigen
     title: "%{name}: „%{quote}“"
     visibilities:
diff --git a/config/locales/el.yml b/config/locales/el.yml
index 1b7dcddc6fc39c..d3d91abc2b6b87 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -1569,8 +1569,6 @@ el:
         other: "%{count} ψήφοι"
       vote: Ψήφισε
     show_more: Δείξε περισσότερα
-    show_newer: Εμφάνιση νεότερων
-    show_older: Εμφάνιση παλαιότερων
     show_thread: Εμφάνιση νήματος
     title: '%{name}: "%{quote}"'
     visibilities:
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 292365ed560c10..b5d92541df5847 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -1692,8 +1692,6 @@ en-GB:
         other: "%{count} votes"
       vote: Vote
     show_more: Show more
-    show_newer: Show newer
-    show_older: Show older
     show_thread: Show thread
     title: '%{name}: "%{quote}"'
     visibilities:
diff --git a/config/locales/en.yml b/config/locales/en.yml
index c874a712da59d4..b6f9689ac4d5fb 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1698,8 +1698,6 @@ en:
         other: "%{count} votes"
       vote: Vote
     show_more: Show more
-    show_newer: Show newer
-    show_older: Show older
     show_thread: Show thread
     title: '%{name}: "%{quote}"'
     visibilities:
diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index 9d27dace972cf7..cb5654b4c7288d 100644
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -1624,8 +1624,6 @@ eo:
         other: "%{count} voĉdonoj"
       vote: Voĉdoni
     show_more: Montri pli
-    show_newer: Montri pli novajn
-    show_older: Montri pli malnovajn
     show_thread: Montri la mesaĝaron
     title: "%{name}: “%{quote}”"
     visibilities:
diff --git a/config/locales/es-AR.yml b/config/locales/es-AR.yml
index 933729139918dc..aae437b9546742 100644
--- a/config/locales/es-AR.yml
+++ b/config/locales/es-AR.yml
@@ -1697,8 +1697,6 @@ es-AR:
         other: "%{count} votos"
       vote: Votar
     show_more: Mostrar más
-    show_newer: Mostrar más recientes
-    show_older: Mostrar más antiguos
     show_thread: Mostrar hilo
     title: '%{name}: "%{quote}"'
     visibilities:
diff --git a/config/locales/es-MX.yml b/config/locales/es-MX.yml
index 511b3920069926..e7e1a4ff88ea1b 100644
--- a/config/locales/es-MX.yml
+++ b/config/locales/es-MX.yml
@@ -1697,8 +1697,6 @@ es-MX:
         other: "%{count} votos"
       vote: Vota
     show_more: Mostrar más
-    show_newer: Mostrar más recientes
-    show_older: Mostrar más antiguos
     show_thread: Mostrar discusión
     title: "%{name}: «%{quote}»"
     visibilities:
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 67e7e687604b6f..24822116ca0c45 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -1697,8 +1697,6 @@ es:
         other: "%{count} votos"
       vote: Vota
     show_more: Mostrar más
-    show_newer: Mostrar más recientes
-    show_older: Mostrar más antiguos
     show_thread: Mostrar discusión
     title: "%{name}: «%{quote}»"
     visibilities:
diff --git a/config/locales/et.yml b/config/locales/et.yml
index d9220a72d6387e..80e3d3ef682810 100644
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -1697,8 +1697,6 @@ et:
         other: "%{count} häält"
       vote: Hääleta
     show_more: Näita rohkem
-    show_newer: Uuemate kuvamine
-    show_older: Vanemate kuvamine
     show_thread: Kuva lõim
     title: '%{name}: "%{quote}"'
     visibilities:
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index b2292b80f4bcf0..ac641ab45423b7 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -1701,8 +1701,6 @@ eu:
         other: "%{count} boto"
       vote: Bozkatu
     show_more: Erakutsi gehiago
-    show_newer: Erakutsi berriagoak
-    show_older: Erakutsi zaharragoak
     show_thread: Erakutsi haria
     title: '%{name}: "%{quote}"'
     visibilities:
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index af5e1cfea8b31e..df9b926276f753 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -1461,8 +1461,6 @@ fa:
         other: "%{count} رأی"
       vote: رأی
     show_more: نمایش
-    show_newer: نمایش جدیدتر
-    show_older: نمایش قدیمی‌تر
     show_thread: نمایش رشته
     title: "%{name}: «%{quote}»"
     visibilities:
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 01203cf484f69c..a92ad4ecb65eee 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -1697,8 +1697,6 @@ fi:
         other: "%{count} ääntä"
       vote: Äänestä
     show_more: Näytä lisää
-    show_newer: Näytä uudemmat
-    show_older: Näytä vanhempi
     show_thread: Näytä ketju
     title: "%{name}: ”%{quote}”"
     visibilities:
diff --git a/config/locales/fo.yml b/config/locales/fo.yml
index b78b9926db5a81..45633d85b308dc 100644
--- a/config/locales/fo.yml
+++ b/config/locales/fo.yml
@@ -1697,8 +1697,6 @@ fo:
         other: "%{count} atkvøður"
       vote: Atkvøð
     show_more: Vís meira
-    show_newer: Vís nýggjari
-    show_older: Vís eldri
     show_thread: Vís tráð
     title: '%{name}: "%{quote}"'
     visibilities:
diff --git a/config/locales/fr-CA.yml b/config/locales/fr-CA.yml
index 492fe25181a5e4..2ed482770caab1 100644
--- a/config/locales/fr-CA.yml
+++ b/config/locales/fr-CA.yml
@@ -1697,8 +1697,6 @@ fr-CA:
         other: "%{count} votes"
       vote: Voter
     show_more: Déplier
-    show_newer: Plus récents
-    show_older: Plus anciens
     show_thread: Afficher le fil de discussion
     title: "%{name} : « %{quote} »"
     visibilities:
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 6f8df69ee7a317..ae012c1531c7b4 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -1697,8 +1697,6 @@ fr:
         other: "%{count} votes"
       vote: Voter
     show_more: Déplier
-    show_newer: Plus récents
-    show_older: Plus anciens
     show_thread: Afficher le fil de discussion
     title: "%{name} : « %{quote} »"
     visibilities:
diff --git a/config/locales/fy.yml b/config/locales/fy.yml
index 0dad09baf4abdf..742b2903a0ca3a 100644
--- a/config/locales/fy.yml
+++ b/config/locales/fy.yml
@@ -1692,8 +1692,6 @@ fy:
         other: "%{count} stimmen"
       vote: Stimme
     show_more: Mear toane
-    show_newer: Nijere toane
-    show_older: Aldere toane
     show_thread: Petear toane
     title: '%{name}: "%{quote}"'
     visibilities:
diff --git a/config/locales/ga.yml b/config/locales/ga.yml
index 527512053be1ae..5c61898ef51284 100644
--- a/config/locales/ga.yml
+++ b/config/locales/ga.yml
@@ -471,7 +471,6 @@ ga:
     poll:
       vote: Vótáil
     show_more: Taispeáin níos mó
-    show_newer: Taispeáin níos nuaí
     show_thread: Taispeáin snáithe
     visibilities:
       private: Leantóirí amháin
diff --git a/config/locales/gd.yml b/config/locales/gd.yml
index c9a4467b123e84..79bbbea0f581e7 100644
--- a/config/locales/gd.yml
+++ b/config/locales/gd.yml
@@ -1761,8 +1761,6 @@ gd:
         two: "%{count} bhòt"
       vote: Bhòt
     show_more: Seall barrachd dheth
-    show_newer: Seall feadhainn as ùire
-    show_older: Seall feadhainn as sine
     show_thread: Seall an snàithlean
     title: "%{name}: “%{quote}”"
     visibilities:
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 0c2b9af1b0b306..dc4a62f701c4f8 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -1697,8 +1697,6 @@ gl:
         other: "%{count} votos"
       vote: Votar
     show_more: Mostrar máis
-    show_newer: Mostrar o máis novo
-    show_older: Mostrar o máis vello
     show_thread: Amosar fío
     title: '%{name}: "%{quote}"'
     visibilities:
diff --git a/config/locales/he.yml b/config/locales/he.yml
index cc1f9dc7fb00d8..1388a716325433 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -1761,8 +1761,6 @@ he:
         two: "%{count} קולות"
       vote: הצבעה
     show_more: עוד
-    show_newer: הצג חדשים יותר
-    show_older: הצג ישנים יותר
     show_thread: הצג שרשור
     title: '%{name}: "%{quote}"'
     visibilities:
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 418c6ffe75e15d..f09f7e42852c10 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -1697,8 +1697,6 @@ hu:
         other: "%{count} szavazat"
       vote: Szavazás
     show_more: Több megjelenítése
-    show_newer: Újabbak mutatása
-    show_older: Régebbiek mutatása
     show_thread: Szál mutatása
     title: "%{name}: „%{quote}”"
     visibilities:
diff --git a/config/locales/hy.yml b/config/locales/hy.yml
index 4125c1110e1af3..9d596dd834558c 100644
--- a/config/locales/hy.yml
+++ b/config/locales/hy.yml
@@ -808,8 +808,6 @@ hy:
         other: "%{count} ձայներ"
       vote: Քուէարկել
     show_more: Աւելին
-    show_newer: Ցուցադրել նորերը
-    show_older: Ցուցադրել հները
     show_thread: Բացել շղթան
     title: '%{name}: "%{quote}"'
     visibilities:
diff --git a/config/locales/id.yml b/config/locales/id.yml
index 1655b744ff5715..d1c04ad1d483aa 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -1428,8 +1428,6 @@ id:
         other: "%{count} memilih"
       vote: Pilih
     show_more: Tampilkan selengkapnya
-    show_newer: Tampilkan lebih baru
-    show_older: Tampilkan lebih lama
     show_thread: Tampilkan utas
     title: '%{name}: "%{quote}"'
     visibilities:
diff --git a/config/locales/ie.yml b/config/locales/ie.yml
index 0513d5925d347e..7a0ae6292e8eda 100644
--- a/config/locales/ie.yml
+++ b/config/locales/ie.yml
@@ -1697,8 +1697,6 @@ ie:
         other: "%{count} votes"
       vote: Votar
     show_more: Monstrar plu
-    show_newer: Monstrar plu nov
-    show_older: Monstrar plu old
     show_thread: Monstrar fil
     title: "%{name}: «%{quote}»"
     visibilities:
diff --git a/config/locales/io.yml b/config/locales/io.yml
index 32769effa4dbf5..4561a43e8e3f31 100644
--- a/config/locales/io.yml
+++ b/config/locales/io.yml
@@ -1666,8 +1666,6 @@ io:
         other: "%{count} voti"
       vote: Votez
     show_more: Montrar plue
-    show_newer: Montrez plu nova kozo
-    show_older: Montrez plu olda kozo
     show_thread: Montrez postaro
     title: '%{name}: "%{quote}"'
     visibilities:
diff --git a/config/locales/is.yml b/config/locales/is.yml
index 110cf1e69703e1..d7a3f8e2ccc7b1 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -1701,8 +1701,6 @@ is:
         other: "%{count} atkvæði"
       vote: Greiða atkvæði
     show_more: Sýna meira
-    show_newer: Sýna nýrri
-    show_older: Sýna eldri
     show_thread: Birta þráð
     title: "%{name}: „%{quote}‟"
     visibilities:
diff --git a/config/locales/it.yml b/config/locales/it.yml
index b84803c0092ba6..6e7f9a7ce1597d 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -1699,8 +1699,6 @@ it:
         other: "%{count} voti"
       vote: Vota
     show_more: Mostra di più
-    show_newer: Mostra più nuovi
-    show_older: Mostra più vecchi
     show_thread: Mostra thread
     title: '%{name}: "%{quote}"'
     visibilities:
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index c51d0a8ea9aab4..f5e874f98db0a5 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -1665,8 +1665,6 @@ ja:
         other: "%{count}票"
       vote: 投票
     show_more: もっと見る
-    show_newer: 新しいものを表示
-    show_older: 古いものを表示
     show_thread: スレッドを表示
     title: '%{name}: "%{quote}"'
     visibilities:
diff --git a/config/locales/kab.yml b/config/locales/kab.yml
index 0c36059406b991..566ba0dee1d0d1 100644
--- a/config/locales/kab.yml
+++ b/config/locales/kab.yml
@@ -813,8 +813,6 @@ kab:
         other: "%{count} n yedɣaren"
       vote: Dɣeṛ
     show_more: Ssken-d ugar
-    show_newer: Ssken-d timaynutin
-    show_older: Ssken-d tiqburin
     show_thread: Ssken-d lxiḍ
     title: '%{name} : "%{quote}"'
     visibilities:
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 6f8c7c6146d931..c4dcb5687b884a 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -1667,8 +1667,6 @@ ko:
         other: "%{count}명 투표함"
       vote: 투표
     show_more: 더 보기
-    show_newer: 새로운 것 표시
-    show_older: 오래된 것 표시
     show_thread: 글타래 보기
     title: '%{name}: "%{quote}"'
     visibilities:
diff --git a/config/locales/ku.yml b/config/locales/ku.yml
index 0c44b7555bb21c..f8d9cd80d42dbb 100644
--- a/config/locales/ku.yml
+++ b/config/locales/ku.yml
@@ -1462,8 +1462,6 @@ ku:
         other: "%{count} deng"
       vote: Deng bide
     show_more: Bêtir nîşan bide
-    show_newer: Nûtirîn nîşan bide
-    show_older: Kevntirîn nîşan bide
     show_thread: Mijarê nîşan bide
     title: "%{name}%{quote}"
     visibilities:
diff --git a/config/locales/lad.yml b/config/locales/lad.yml
index cd62cbc0f828a2..c0ab028b9cfbff 100644
--- a/config/locales/lad.yml
+++ b/config/locales/lad.yml
@@ -1697,8 +1697,6 @@ lad:
         other: "%{count} votos"
       vote: Vota
     show_more: Amostra mas
-    show_newer: Amostra mas muevos
-    show_older: Amostra mas viejos
     show_thread: Amostra diskusyon
     title: '%{name}: "%{quote}"'
     visibilities:
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index 83489f7e7b582f..bd2500a912ca9e 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -1718,8 +1718,6 @@ lv:
         zero: "%{count} balsu"
       vote: Balsu skaits
     show_more: Rādīt vairāk
-    show_newer: Nekad nerādīt
-    show_older: Rādīt senākus
     show_thread: Rādīt tematu
     title: "%{name}: “%{quote}”"
     visibilities:
diff --git a/config/locales/ms.yml b/config/locales/ms.yml
index 1704aed3e07f88..bfd6591ddbe8fd 100644
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@@ -1634,8 +1634,6 @@ ms:
         other: "%{count} undi"
       vote: Undi
     show_more: Tunjuk lebih banyak
-    show_newer: Tunjuk lebih baharu
-    show_older: Tunjuk lebih tua
     show_thread: Tunjuk bebenang
     title: '%{name}: "%{quote}"'
     visibilities:
diff --git a/config/locales/my.yml b/config/locales/my.yml
index a01755b6c48a43..6898db877c9d11 100644
--- a/config/locales/my.yml
+++ b/config/locales/my.yml
@@ -1633,8 +1633,6 @@ my:
         other: မဲအရေအတွက် %{count} မဲ
       vote: မဲပေးမည်
     show_more: ပိုမိုပြရန်
-    show_newer: ပို့စ်အသစ်များပြရန်
-    show_older: ပို့စ်အဟောင်းများပြရန်
     show_thread: Thread ကို ပြပါ
     title: '%{name}: "%{quote}"'
     visibilities:
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 6870578a87d42e..3b4c586dc5493c 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -1697,8 +1697,6 @@ nl:
         other: "%{count} stemmen"
       vote: Stemmen
     show_more: Meer tonen
-    show_newer: Nieuwere tonen
-    show_older: Oudere tonen
     show_thread: Gesprek tonen
     title: '%{name}: "%{quote}"'
     visibilities:
diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index 43b7768a9c07fe..f53b67d0982175 100644
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -1697,8 +1697,6 @@ nn:
         other: "%{count} røyster"
       vote: Røyst
     show_more: Vis meir
-    show_newer: Vis nyere
-    show_older: Vis eldre
     show_thread: Vis tråden
     title: "%{name}: «%{quote}»"
     visibilities:
diff --git a/config/locales/no.yml b/config/locales/no.yml
index 22292a32122dda..4cdf2ca82a0e01 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -1694,8 +1694,6 @@
         other: "%{count} stemmer"
       vote: Stem
     show_more: Vis mer
-    show_newer: Vis nyere
-    show_older: Vis eldre
     show_thread: Vis tråden
     title: "%{name}: «%{quote}»"
     visibilities:
diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index 9f9f04ba9be0ac..569f76715b21c5 100644
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -875,8 +875,6 @@ oc:
         other: "%{count} vòtes"
       vote: Votar
     show_more: Ne veire mai
-    show_newer: Veire mai recents
-    show_older: Veire mai ancians
     show_thread: Mostrar lo fil
     title: '%{name} : "%{quote}"'
     visibilities:
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index e77a8d315bca15..e43f9a605079dd 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -1761,8 +1761,6 @@ pl:
         other: "%{count} głosy"
       vote: Głosuj
     show_more: Pokaż więcej
-    show_newer: Pokaż nowsze
-    show_older: Pokaż starsze
     show_thread: Pokaż wątek
     title: '%{name}: "%{quote}"'
     visibilities:
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 82b970ce58cd3e..194de9a3eb1456 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -1697,8 +1697,6 @@ pt-BR:
         other: "%{count} votos"
       vote: Votar
     show_more: Mostrar mais
-    show_newer: Mostrar mais recentes
-    show_older: Mostrar mais antigos
     show_thread: Mostrar conversa
     title: '%{name}: "%{quote}"'
     visibilities:
diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index da1bf9f2f4b659..57a698e1d10dc1 100644
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -1697,8 +1697,6 @@ pt-PT:
         other: "%{count} votos"
       vote: Votar
     show_more: Mostrar mais
-    show_newer: Mostrar mais recentes
-    show_older: Mostrar mais antigos
     show_thread: Mostrar conversa
     title: '%{name}: "%{quote}"'
     visibilities:
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 83fbe373a01dc1..d2c46097008559 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -1756,8 +1756,6 @@ ru:
         other: "%{count} голосов"
       vote: Голосовать
     show_more: Развернуть
-    show_newer: Показать более новое
-    show_older: Показать старые
     show_thread: Открыть обсуждение
     title: '%{name}: "%{quote}"'
     visibilities:
diff --git a/config/locales/sc.yml b/config/locales/sc.yml
index ec16c6027d82fb..e51ac84eac6f55 100644
--- a/config/locales/sc.yml
+++ b/config/locales/sc.yml
@@ -1025,8 +1025,6 @@ sc:
         other: "%{count} votos"
       vote: Vota
     show_more: Ammustra·nde prus
-    show_newer: Ammustra is prus noos
-    show_older: Ammustra is prus betzos
     show_thread: Ammustra su tema
     title: '%{name}: "%{quote}"'
     visibilities:
diff --git a/config/locales/sco.yml b/config/locales/sco.yml
index 5b452fc6bb7d38..8382dec76e1cad 100644
--- a/config/locales/sco.yml
+++ b/config/locales/sco.yml
@@ -1452,8 +1452,6 @@ sco:
         other: "%{count} votes"
       vote: Vote
     show_more: Shaw mair
-    show_newer: Shaw newer
-    show_older: Shaw aulder
     show_thread: Shaw threid
     title: '%{name}: "%{quote}"'
     visibilities:
diff --git a/config/locales/si.yml b/config/locales/si.yml
index 6afa8f8ef3b839..e0be7ff8e95721 100644
--- a/config/locales/si.yml
+++ b/config/locales/si.yml
@@ -1316,8 +1316,6 @@ si:
         other: ඡන්ද %{count} යි
       vote: ඡන්දය
     show_more: තව පෙන්වන්න
-    show_newer: අලුත්ම පෙන්වන්න
-    show_older: පැරණි පෙන්වන්න
     show_thread: නූල් පෙන්වන්න
     title: '%{name}: "%{quote}"'
     visibilities:
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 4583219b779bcb..3f2b65b76abfe6 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -1761,8 +1761,6 @@ sl:
         two: "%{count} glasova"
       vote: Glasuj
     show_more: Pokaži več
-    show_newer: Pokaži novejše
-    show_older: Pokaži starejše
     show_thread: Pokaži nit
     title: "%{name}: »%{quote}«"
     visibilities:
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index 9b3b4a6bdbeb75..759f995470991d 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -1693,8 +1693,6 @@ sq:
         other: "%{count} vota"
       vote: Votë
     show_more: Shfaq më tepër
-    show_newer: Shfaq më të reja
-    show_older: Shfaq më të vjetra
     show_thread: Shfaq rrjedhën
     title: '%{name}: "%{quote}"'
     visibilities:
diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml
index 51067390ab3b93..74a5e0b1c07ea0 100644
--- a/config/locales/sr-Latn.yml
+++ b/config/locales/sr-Latn.yml
@@ -1729,8 +1729,6 @@ sr-Latn:
         other: "%{count} glasova"
       vote: Glasajte
     show_more: Prikaži još
-    show_newer: Nikad ne prikazuj
-    show_older: Prikaži starije
     show_thread: Prikaži niz
     title: "%{name}: „%{quote}”"
     visibilities:
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index f97dc49c0264fc..9e7dd9c35c62c0 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -1729,8 +1729,6 @@ sr:
         other: "%{count} гласова"
       vote: Гласајте
     show_more: Прикажи још
-    show_newer: Никад не приказуј
-    show_older: Прикажи старије
     show_thread: Прикажи низ
     title: "%{name}: „%{quote}”"
     visibilities:
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 1ab7a630425bb9..d282d9222204cb 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -1697,8 +1697,6 @@ sv:
         other: "%{count} röster"
       vote: Rösta
     show_more: Visa mer
-    show_newer: Visa nyare
-    show_older: Visa äldre
     show_thread: Visa tråd
     title: '%{name}: "%{quote}"'
     visibilities:
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 10571af9d29114..67d2b94793d936 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -1665,8 +1665,6 @@ th:
         other: "%{count} การลงคะแนน"
       vote: ลงคะแนน
     show_more: แสดงเพิ่มเติม
-    show_newer: แสดงที่ใหม่กว่า
-    show_older: แสดงที่เก่ากว่า
     show_thread: แสดงกระทู้
     title: '%{name}: "%{quote}"'
     visibilities:
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index f80a21ed7201a2..a942e5b3947f4f 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -1697,8 +1697,6 @@ tr:
         other: "%{count} oylar"
       vote: Oy Ver
     show_more: Daha fazlasını göster
-    show_newer: Yenileri göster
-    show_older: Eskileri göster
     show_thread: Konuyu göster
     title: '%{name}: "%{quote}"'
     visibilities:
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index eb3ca2a4ae153b..9c343489eb445f 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -1761,8 +1761,6 @@ uk:
         other: "%{count} голоси"
       vote: Проголосувати
     show_more: Розгорнути
-    show_newer: Показати новіші
-    show_older: Показати давніші
     show_thread: Відкрити обговорення
     title: '%{name}: "%{quote}"'
     visibilities:
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 14e60dc124ecc8..bb3bd27b507b46 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -1665,8 +1665,6 @@ vi:
         other: "%{count} người bình chọn"
       vote: Bình chọn
     show_more: Đọc thêm
-    show_newer: Mới hơn
-    show_older: Cũ hơn
     show_thread: Nội dung gốc
     title: '%{name}: "%{quote}"'
     visibilities:
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 17a66f72b3cafb..2d1d82b3064c3b 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -1665,8 +1665,6 @@ zh-CN:
         other: "%{count} 票"
       vote: 投票
     show_more: 显示更多
-    show_newer: 显示更新内容
-    show_older: 显示更早内容
     show_thread: 显示全部对话
     title: "%{name}：“%{quote}”"
     visibilities:
diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml
index 43e3ef51d0d5c9..0bb362eadf65d3 100644
--- a/config/locales/zh-HK.yml
+++ b/config/locales/zh-HK.yml
@@ -1665,8 +1665,6 @@ zh-HK:
         other: "%{count} 票"
       vote: 投票
     show_more: 顯示更多
-    show_newer: 顯示較新嘟文
-    show_older: 顯示較舊嘟文
     show_thread: 顯示討論串
     title: "%{name}：「%{quote}」"
     visibilities:
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 592f41c1c51b46..4c450f3c1bf283 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -1667,8 +1667,6 @@ zh-TW:
         other: "%{count} 票"
       vote: 投票
     show_more: 顯示更多
-    show_newer: 顯示較新嘟文
-    show_older: 顯示較舊嘟文
     show_thread: 顯示討論串
     title: "%{name}：「%{quote}」"
     visibilities:
diff --git a/spec/helpers/statuses_helper_spec.rb b/spec/helpers/statuses_helper_spec.rb
index c67e1f3f2b301a..73d7d80e46043f 100644
--- a/spec/helpers/statuses_helper_spec.rb
+++ b/spec/helpers/statuses_helper_spec.rb
@@ -29,26 +29,6 @@ def status_text_summary(status)
     I18n.t('statuses.content_warning', warning: status.spoiler_text)
   end
 
-  describe 'link_to_newer' do
-    it 'returns a link to newer content' do
-      url = 'https://example.com'
-      result = helper.link_to_newer(url)
-
-      expect(result).to match('load-more')
-      expect(result).to match(I18n.t('statuses.show_newer'))
-    end
-  end
-
-  describe 'link_to_older' do
-    it 'returns a link to older content' do
-      url = 'https://example.com'
-      result = helper.link_to_older(url)
-
-      expect(result).to match('load-more')
-      expect(result).to match(I18n.t('statuses.show_older'))
-    end
-  end
-
   describe 'fa_visibility_icon' do
     context 'with a status that is public' do
       let(:status) { Status.new(visibility: 'public') }

From 92855948a000563f1a6d715721892dfc18606baf Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 18 Mar 2024 04:55:54 -0400
Subject: [PATCH 0491/2191] Remove unused `show_landing_strip?` helper method
 (#29618)

---
 app/helpers/application_helper.rb          |  4 ---
 spec/helpers/application_helper_spec.rb    | 30 ----------------------
 spec/views/statuses/show.html.haml_spec.rb |  2 +-
 3 files changed, 1 insertion(+), 35 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index a4f92743c5829d..18c9663275ebdf 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -32,10 +32,6 @@ def active_nav_class(*paths)
     paths.any? { |path| current_page?(path) } ? 'active' : ''
   end
 
-  def show_landing_strip?
-    !user_signed_in? && !single_user_mode?
-  end
-
   def open_registrations?
     Setting.registrations_mode == 'open'
   end
diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
index ef1463e64c8660..6fc6b3c0877a72 100644
--- a/spec/helpers/application_helper_spec.rb
+++ b/spec/helpers/application_helper_spec.rb
@@ -99,36 +99,6 @@ def current_theme = 'default'
     end
   end
 
-  describe 'show_landing_strip?', :without_verify_partial_doubles do
-    describe 'when signed in' do
-      before do
-        allow(helper).to receive(:user_signed_in?).and_return(true)
-      end
-
-      it 'does not show landing strip' do
-        expect(helper.show_landing_strip?).to be false
-      end
-    end
-
-    describe 'when signed out' do
-      before do
-        allow(helper).to receive(:user_signed_in?).and_return(false)
-      end
-
-      it 'does not show landing strip on single user instance' do
-        allow(helper).to receive(:single_user_mode?).and_return(true)
-
-        expect(helper.show_landing_strip?).to be false
-      end
-
-      it 'shows landing strip on multi user instance' do
-        allow(helper).to receive(:single_user_mode?).and_return(false)
-
-        expect(helper.show_landing_strip?).to be true
-      end
-    end
-  end
-
   describe 'available_sign_up_path' do
     context 'when registrations are closed' do
       before do
diff --git a/spec/views/statuses/show.html.haml_spec.rb b/spec/views/statuses/show.html.haml_spec.rb
index 233965883a1675..92ba678b6d5cd6 100644
--- a/spec/views/statuses/show.html.haml_spec.rb
+++ b/spec/views/statuses/show.html.haml_spec.rb
@@ -4,7 +4,7 @@
 
 describe 'statuses/show.html.haml', :without_verify_partial_doubles do
   before do
-    allow(view).to receive_messages(api_oembed_url: '', show_landing_strip?: true, site_title: 'example site', site_hostname: 'example.com', full_asset_url: '//asset.host/image.svg', current_account: nil, single_user_mode?: false)
+    allow(view).to receive_messages(api_oembed_url: '', site_title: 'example site', site_hostname: 'example.com', full_asset_url: '//asset.host/image.svg', current_account: nil, single_user_mode?: false)
     allow(view).to receive(:local_time)
     allow(view).to receive(:local_time_ago)
     assign(:instance_presenter, InstancePresenter.new)

From 307efe41c6c906fb2e6a49a6f08c9a09ec58ba7e Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 18 Mar 2024 10:15:03 +0100
Subject: [PATCH 0492/2191] Update dependency axios to v1.6.8 (#29613)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 971e6418f1099a..fbb747899f257d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4687,13 +4687,13 @@ __metadata:
   linkType: hard
 
 "axios@npm:^1.4.0":
-  version: 1.6.7
-  resolution: "axios@npm:1.6.7"
+  version: 1.6.8
+  resolution: "axios@npm:1.6.8"
   dependencies:
-    follow-redirects: "npm:^1.15.4"
+    follow-redirects: "npm:^1.15.6"
     form-data: "npm:^4.0.0"
     proxy-from-env: "npm:^1.1.0"
-  checksum: 10c0/131bf8e62eee48ca4bd84e6101f211961bf6a21a33b95e5dfb3983d5a2fe50d9fffde0b57668d7ce6f65063d3dc10f2212cbcb554f75cfca99da1c73b210358d
+  checksum: 10c0/0f22da6f490335479a89878bc7d5a1419484fbb437b564a80c34888fc36759ae4f56ea28d55a191695e5ed327f0bad56e7ff60fb6770c14d1be6501505d47ab9
   languageName: node
   linkType: hard
 
@@ -8108,13 +8108,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"follow-redirects@npm:^1.0.0, follow-redirects@npm:^1.15.4":
-  version: 1.15.4
-  resolution: "follow-redirects@npm:1.15.4"
+"follow-redirects@npm:^1.0.0, follow-redirects@npm:^1.15.6":
+  version: 1.15.6
+  resolution: "follow-redirects@npm:1.15.6"
   peerDependenciesMeta:
     debug:
       optional: true
-  checksum: 10c0/5f37ed9170c9eb19448c5418fdb0f2b73f644b5364834e70791a76ecc7db215246f9773bbef4852cfae4067764ffc852e047f744b661b0211532155b73556a6a
+  checksum: 10c0/9ff767f0d7be6aa6870c82ac79cf0368cd73e01bbc00e9eb1c2a16fbb198ec105e3c9b6628bb98e9f3ac66fe29a957b9645bcb9a490bb7aa0d35f908b6b85071
   languageName: node
   linkType: hard
 

From f279ff3bd69bd4115e247e81d1930dc85eb64ae2 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 18 Mar 2024 05:19:38 -0400
Subject: [PATCH 0493/2191] Update `rspec-*` gems (#29616)

---
 Gemfile.lock | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 9766c38471dc79..9fb549c194d570 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -622,16 +622,16 @@ GEM
       chunky_png (~> 1.0)
       rqrcode_core (~> 1.0)
     rqrcode_core (1.2.0)
-    rspec-core (3.12.2)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.3)
+    rspec-core (3.13.0)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
+      rspec-support (~> 3.13.0)
     rspec-github (2.4.0)
       rspec-core (~> 3.0)
-    rspec-mocks (3.12.6)
+    rspec-mocks (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
+      rspec-support (~> 3.13.0)
     rspec-rails (6.1.1)
       actionpack (>= 6.1)
       activesupport (>= 6.1)
@@ -645,7 +645,7 @@ GEM
       rspec-expectations (~> 3.0)
       rspec-mocks (~> 3.0)
       sidekiq (>= 5, < 8)
-    rspec-support (3.12.1)
+    rspec-support (3.13.1)
     rubocop (1.60.2)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)

From 1164c7005ec342398a37ae16c4cc256b9922a524 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 18 Mar 2024 10:33:54 +0100
Subject: [PATCH 0494/2191] Update dependency http-link-header to v1.1.3
 (#29625)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index fbb747899f257d..e36acff5be3dff 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8862,9 +8862,9 @@ __metadata:
   linkType: hard
 
 "http-link-header@npm:^1.1.1":
-  version: 1.1.2
-  resolution: "http-link-header@npm:1.1.2"
-  checksum: 10c0/d4ae44b912dd1f5a37c11438878b51635a7a8f9228bf004b2ecf9e1d23a9d912942b02e5f41695bbe9fa93ab380bdd10c58db717c3531c705116e61014aba3f0
+  version: 1.1.3
+  resolution: "http-link-header@npm:1.1.3"
+  checksum: 10c0/56698a9d3aee4d5319d1cdfe62ef5d7179f179ec1e6432d23c9e6a0c896be642ba47a4985a45419cff91008032aef920aca9df94ff9e763e646c83bf54b7243d
   languageName: node
   linkType: hard
 

From a732ef21b0bd010e5c78dfcaab7e0ba42457d74d Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 18 Mar 2024 10:37:33 +0100
Subject: [PATCH 0495/2191] Update dependency json-schema to v4.2.0 (#29604)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 9fb549c194d570..e3239f3411dac9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -372,7 +372,7 @@ GEM
     json-ld-preloaded (3.3.0)
       json-ld (~> 3.3)
       rdf (~> 3.3)
-    json-schema (4.1.1)
+    json-schema (4.2.0)
       addressable (>= 2.8)
     jsonapi-renderer (0.2.2)
     jwt (2.7.1)

From 9142805ca898da48c256145d1d1f0122da10ed01 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 18 Mar 2024 10:58:28 +0100
Subject: [PATCH 0496/2191] =?UTF-8?q?Remove=20deprecated=20`@types/?=
 =?UTF-8?q?=E2=80=A6`=20packages=20(#29633)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json |  3 ---
 yarn.lock    | 36 +++---------------------------------
 2 files changed, 3 insertions(+), 36 deletions(-)

diff --git a/package.json b/package.json
index 9f20a981aeda85..338c440f878c11 100644
--- a/package.json
+++ b/package.json
@@ -157,14 +157,11 @@
     "@types/react-helmet": "^6.1.6",
     "@types/react-immutable-proptypes": "^2.1.0",
     "@types/react-motion": "^0.0.40",
-    "@types/react-overlays": "^3.1.0",
     "@types/react-router": "^5.1.20",
     "@types/react-router-dom": "^5.3.3",
-    "@types/react-select": "^5.0.1",
     "@types/react-sparklines": "^1.7.2",
     "@types/react-swipeable-views": "^0.13.1",
     "@types/react-test-renderer": "^18.0.0",
-    "@types/react-textarea-autosize": "^8.0.0",
     "@types/react-toggle": "^4.0.3",
     "@types/redux-immutable": "^4.0.3",
     "@types/requestidlecallback": "^0.3.5",
diff --git a/yarn.lock b/yarn.lock
index e36acff5be3dff..6a2b98c3c0185e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2322,14 +2322,11 @@ __metadata:
     "@types/react-helmet": "npm:^6.1.6"
     "@types/react-immutable-proptypes": "npm:^2.1.0"
     "@types/react-motion": "npm:^0.0.40"
-    "@types/react-overlays": "npm:^3.1.0"
     "@types/react-router": "npm:^5.1.20"
     "@types/react-router-dom": "npm:^5.3.3"
-    "@types/react-select": "npm:^5.0.1"
     "@types/react-sparklines": "npm:^1.7.2"
     "@types/react-swipeable-views": "npm:^0.13.1"
     "@types/react-test-renderer": "npm:^18.0.0"
-    "@types/react-textarea-autosize": "npm:^8.0.0"
     "@types/react-toggle": "npm:^4.0.3"
     "@types/redux-immutable": "npm:^4.0.3"
     "@types/requestidlecallback": "npm:^0.3.5"
@@ -3362,15 +3359,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/react-overlays@npm:^3.1.0":
-  version: 3.1.0
-  resolution: "@types/react-overlays@npm:3.1.0"
-  dependencies:
-    react-overlays: "npm:*"
-  checksum: 10c0/99a4de7c56a286cf72dbf135ad6f9da7c095483987ab548ba7e63d1d885fd54939e78e8bd3dd3cf275a6f4c3d6bdcd00c6923c92cc6c3a4c9bacf5a55550f18b
-  languageName: node
-  linkType: hard
-
 "@types/react-router-dom@npm:^5.3.3":
   version: 5.3.3
   resolution: "@types/react-router-dom@npm:5.3.3"
@@ -3392,15 +3380,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/react-select@npm:^5.0.1":
-  version: 5.0.1
-  resolution: "@types/react-select@npm:5.0.1"
-  dependencies:
-    react-select: "npm:*"
-  checksum: 10c0/6ea7f3beaebb38e537e5b742a0d8b49f212bdf1dade9f9ce5e3c91e24aad95284aeda0efc8a235e05a7102748f475c4476fb6830030b5574fdf19c3f1d908027
-  languageName: node
-  linkType: hard
-
 "@types/react-sparklines@npm:^1.7.2":
   version: 1.7.5
   resolution: "@types/react-sparklines@npm:1.7.5"
@@ -3428,15 +3407,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/react-textarea-autosize@npm:^8.0.0":
-  version: 8.0.0
-  resolution: "@types/react-textarea-autosize@npm:8.0.0"
-  dependencies:
-    react-textarea-autosize: "npm:*"
-  checksum: 10c0/8d6a40e53aa3452ddda53a2b9eb8668ffdfdabc8133d731a3ea2205309376f66fb7537832170def243520fefec70e02b7f05043cf4fdeac520b5883fbb66dc12
-  languageName: node
-  linkType: hard
-
 "@types/react-toggle@npm:^4.0.3":
   version: 4.0.5
   resolution: "@types/react-toggle@npm:4.0.5"
@@ -13605,7 +13575,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-overlays@npm:*, react-overlays@npm:^5.2.1":
+"react-overlays@npm:^5.2.1":
   version: 5.2.1
   resolution: "react-overlays@npm:5.2.1"
   dependencies:
@@ -13712,7 +13682,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-select@npm:*, react-select@npm:^5.7.3":
+"react-select@npm:^5.7.3":
   version: 5.8.0
   resolution: "react-select@npm:5.8.0"
   dependencies:
@@ -13817,7 +13787,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-textarea-autosize@npm:*, react-textarea-autosize@npm:^8.4.1":
+"react-textarea-autosize@npm:^8.4.1":
   version: 8.5.3
   resolution: "react-textarea-autosize@npm:8.5.3"
   dependencies:

From 6ebb971aadee77b9b5ebc9565fca10b93d107272 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 18 Mar 2024 10:59:31 +0100
Subject: [PATCH 0497/2191] Update dependency async-mutex to ^0.5.0 (#29552)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 package.json |  2 +-
 yarn.lock    | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 338c440f878c11..a42767580e1542 100644
--- a/package.json
+++ b/package.json
@@ -49,7 +49,7 @@
     "@reduxjs/toolkit": "^2.0.1",
     "@svgr/webpack": "^5.5.0",
     "arrow-key-navigation": "^1.2.0",
-    "async-mutex": "^0.4.0",
+    "async-mutex": "^0.5.0",
     "autoprefixer": "^10.4.14",
     "axios": "^1.4.0",
     "babel-loader": "^8.3.0",
diff --git a/yarn.lock b/yarn.lock
index 6a2b98c3c0185e..06cf1fddfbeb39 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2334,7 +2334,7 @@ __metadata:
     "@typescript-eslint/eslint-plugin": "npm:^7.0.0"
     "@typescript-eslint/parser": "npm:^7.0.0"
     arrow-key-navigation: "npm:^1.2.0"
-    async-mutex: "npm:^0.4.0"
+    async-mutex: "npm:^0.5.0"
     autoprefixer: "npm:^10.4.14"
     axios: "npm:^1.4.0"
     babel-jest: "npm:^29.5.0"
@@ -4558,12 +4558,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"async-mutex@npm:^0.4.0":
-  version: 0.4.1
-  resolution: "async-mutex@npm:0.4.1"
+"async-mutex@npm:^0.5.0":
+  version: 0.5.0
+  resolution: "async-mutex@npm:0.5.0"
   dependencies:
     tslib: "npm:^2.4.0"
-  checksum: 10c0/3c412736c0bc4a9a2cfd948276a8caab8686aa615866a5bd20986e616f8945320acb310058a17afa1b31b8de6f634a78b7ec2217a33d7559b38f68bb85a95854
+  checksum: 10c0/9096e6ad6b674c894d8ddd5aa4c512b09bb05931b8746ebd634952b05685608b2b0820ed5c406e6569919ff5fe237ab3c491e6f2887d6da6b6ba906db3ee9c32
   languageName: node
   linkType: hard
 

From 0dd1c772a867d21afc542aa807909cd4017e4816 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 18 Mar 2024 10:59:45 +0100
Subject: [PATCH 0498/2191] Update dependency cocoon-js-vanilla to v1.5.1
 (#29461)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 06cf1fddfbeb39..f857c5738c9230 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5624,9 +5624,9 @@ __metadata:
   linkType: hard
 
 "cocoon-js-vanilla@npm:^1.3.0":
-  version: 1.4.0
-  resolution: "cocoon-js-vanilla@npm:1.4.0"
-  checksum: 10c0/3a3976d325d24518317ca38536ad5f4e570c139b86082dd33c64d38c2a4b2c58fa9cc9aac4624d8fd2f4c9f0eafe681bb8872360010e6b36d9974d8abc57f520
+  version: 1.5.1
+  resolution: "cocoon-js-vanilla@npm:1.5.1"
+  checksum: 10c0/0449084ef5864fc4159aa127592995657224bfcec6b7fd6270f2f9af545fc711e7ddbeb673a7cafc9dc0985be4c20b76ba413905fcaeddc3c6f6a5397d80cdd6
   languageName: node
   linkType: hard
 

From 7f171622426d769128f6d35d87c2b6b3fa1d5236 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 18 Mar 2024 10:00:13 +0000
Subject: [PATCH 0499/2191] Update dependency cssnano to v6.1.0 (#29514)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 305 +++++++++++++++++++++++++++---------------------------
 1 file changed, 153 insertions(+), 152 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index f857c5738c9230..5cc5a265e0e21b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6207,63 +6207,64 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cssnano-preset-default@npm:^6.0.5":
-  version: 6.0.5
-  resolution: "cssnano-preset-default@npm:6.0.5"
+"cssnano-preset-default@npm:^6.1.0":
+  version: 6.1.0
+  resolution: "cssnano-preset-default@npm:6.1.0"
   dependencies:
+    browserslist: "npm:^4.23.0"
     css-declaration-sorter: "npm:^7.1.1"
-    cssnano-utils: "npm:^4.0.1"
+    cssnano-utils: "npm:^4.0.2"
     postcss-calc: "npm:^9.0.1"
-    postcss-colormin: "npm:^6.0.3"
-    postcss-convert-values: "npm:^6.0.4"
-    postcss-discard-comments: "npm:^6.0.1"
-    postcss-discard-duplicates: "npm:^6.0.2"
-    postcss-discard-empty: "npm:^6.0.2"
-    postcss-discard-overridden: "npm:^6.0.1"
-    postcss-merge-longhand: "npm:^6.0.3"
-    postcss-merge-rules: "npm:^6.0.4"
-    postcss-minify-font-values: "npm:^6.0.2"
-    postcss-minify-gradients: "npm:^6.0.2"
-    postcss-minify-params: "npm:^6.0.3"
-    postcss-minify-selectors: "npm:^6.0.2"
-    postcss-normalize-charset: "npm:^6.0.1"
-    postcss-normalize-display-values: "npm:^6.0.1"
-    postcss-normalize-positions: "npm:^6.0.1"
-    postcss-normalize-repeat-style: "npm:^6.0.1"
-    postcss-normalize-string: "npm:^6.0.1"
-    postcss-normalize-timing-functions: "npm:^6.0.1"
-    postcss-normalize-unicode: "npm:^6.0.3"
-    postcss-normalize-url: "npm:^6.0.1"
-    postcss-normalize-whitespace: "npm:^6.0.1"
-    postcss-ordered-values: "npm:^6.0.1"
-    postcss-reduce-initial: "npm:^6.0.3"
-    postcss-reduce-transforms: "npm:^6.0.1"
-    postcss-svgo: "npm:^6.0.2"
-    postcss-unique-selectors: "npm:^6.0.2"
+    postcss-colormin: "npm:^6.1.0"
+    postcss-convert-values: "npm:^6.1.0"
+    postcss-discard-comments: "npm:^6.0.2"
+    postcss-discard-duplicates: "npm:^6.0.3"
+    postcss-discard-empty: "npm:^6.0.3"
+    postcss-discard-overridden: "npm:^6.0.2"
+    postcss-merge-longhand: "npm:^6.0.4"
+    postcss-merge-rules: "npm:^6.1.0"
+    postcss-minify-font-values: "npm:^6.0.3"
+    postcss-minify-gradients: "npm:^6.0.3"
+    postcss-minify-params: "npm:^6.1.0"
+    postcss-minify-selectors: "npm:^6.0.3"
+    postcss-normalize-charset: "npm:^6.0.2"
+    postcss-normalize-display-values: "npm:^6.0.2"
+    postcss-normalize-positions: "npm:^6.0.2"
+    postcss-normalize-repeat-style: "npm:^6.0.2"
+    postcss-normalize-string: "npm:^6.0.2"
+    postcss-normalize-timing-functions: "npm:^6.0.2"
+    postcss-normalize-unicode: "npm:^6.1.0"
+    postcss-normalize-url: "npm:^6.0.2"
+    postcss-normalize-whitespace: "npm:^6.0.2"
+    postcss-ordered-values: "npm:^6.0.2"
+    postcss-reduce-initial: "npm:^6.1.0"
+    postcss-reduce-transforms: "npm:^6.0.2"
+    postcss-svgo: "npm:^6.0.3"
+    postcss-unique-selectors: "npm:^6.0.3"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/b51072bf808ad7af0e7d38eb2490fc9dd27bfa95c0de804f7b5f242a283cedd6446ef55936843e4c7c9856540e225e322a794e70b47ae515b894e84b629a58ea
+  checksum: 10c0/47b7026b66b80a03f043929f825f48a13ed3a4086a6f335f25312c77fe73977a74cf718a486f91d9513b652e7d34312394380141c3bf6b8c8027ebc96710b6f6
   languageName: node
   linkType: hard
 
-"cssnano-utils@npm:^4.0.1":
-  version: 4.0.1
-  resolution: "cssnano-utils@npm:4.0.1"
+"cssnano-utils@npm:^4.0.2":
+  version: 4.0.2
+  resolution: "cssnano-utils@npm:4.0.2"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/20513a393402f283c85c450ece43d1a6a06a9906b524481043ac203a86888a4ca5cbef878c615a58fdd82a9e870ce62c6f3fea9f51814034a084d8980e17cf96
+  checksum: 10c0/260b8c8ffa48b908aa77ef129f9b8648ecd92aed405b20e7fe6b8370779dd603530344fc9d96683d53533246e48b36ac9d2aa5a476b4f81c547bbad86d187f35
   languageName: node
   linkType: hard
 
 "cssnano@npm:^6.0.1":
-  version: 6.0.5
-  resolution: "cssnano@npm:6.0.5"
+  version: 6.1.0
+  resolution: "cssnano@npm:6.1.0"
   dependencies:
-    cssnano-preset-default: "npm:^6.0.5"
+    cssnano-preset-default: "npm:^6.1.0"
     lilconfig: "npm:^3.1.1"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/f802b563bf4a3a973d91e0327803536d56c4667138587d84f6341f68862d7514bceb2f1258d7bbf66b2fdedf1e9c1b7fd0b4848bb0069296ecbebbdc70f2ccca
+  checksum: 10c0/ffe0d8c9110cce01692f51d21ae2fe6d319f2329989d28ef0dddb67a6fba2780c525f00682f0788bdbba380f37893d27ee870b3e99fb97c1fb8edccbd68a1d92
   languageName: node
   linkType: hard
 
@@ -12639,9 +12640,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-colormin@npm:^6.0.3":
-  version: 6.0.3
-  resolution: "postcss-colormin@npm:6.0.3"
+"postcss-colormin@npm:^6.1.0":
+  version: 6.1.0
+  resolution: "postcss-colormin@npm:6.1.0"
   dependencies:
     browserslist: "npm:^4.23.0"
     caniuse-api: "npm:^3.0.0"
@@ -12649,55 +12650,55 @@ __metadata:
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/beddf9fd1bda3f456e1235829297341de34ca40f9a2e16f23930e13d9df6b6186ca3717817da0adab266bf5e8fcde7bd056ab54187f959eb53d2bfbde7f441e6
+  checksum: 10c0/0802963fa0d8f2fe408b2e088117670f5303c69a58c135f0ecf0e5ceff69e95e87111b22c4e29c9adb2f69aa8d3bc175f4e8e8708eeb99c9ffc36c17064de427
   languageName: node
   linkType: hard
 
-"postcss-convert-values@npm:^6.0.4":
-  version: 6.0.4
-  resolution: "postcss-convert-values@npm:6.0.4"
+"postcss-convert-values@npm:^6.1.0":
+  version: 6.1.0
+  resolution: "postcss-convert-values@npm:6.1.0"
   dependencies:
     browserslist: "npm:^4.23.0"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/c267ae8f2dbfc7fff5e46cd984bb6191405fe76f1eee04fd10a69fe10065ad7c3b62fa36e4bef3fa3a730284cd7295cb66968afb6cdaad0571a57cfcb25248fc
+  checksum: 10c0/a80066965cb58fe8fcaf79f306b32c83fc678e1f0678e43f4db3e9fee06eed6db92cf30631ad348a17492769d44757400493c91a33ee865ee8dedea9234a11f5
   languageName: node
   linkType: hard
 
-"postcss-discard-comments@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "postcss-discard-comments@npm:6.0.1"
+"postcss-discard-comments@npm:^6.0.2":
+  version: 6.0.2
+  resolution: "postcss-discard-comments@npm:6.0.2"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/5e9128ffb8c005081bb0521f5a23cf090e8513d928ed39935504ffde2e335a62a7e1a749c5c7bc2d03f06a8667900d19dd7eed19dfa4273043b5fd760476260d
+  checksum: 10c0/338a1fcba7e2314d956e5e5b9bd1e12e6541991bf85ac72aed6e229a029bf60edb31f11576b677623576169aa7d9c75e1be259ac7b50d0b735b841b5518f9da9
   languageName: node
   linkType: hard
 
-"postcss-discard-duplicates@npm:^6.0.2":
-  version: 6.0.2
-  resolution: "postcss-discard-duplicates@npm:6.0.2"
+"postcss-discard-duplicates@npm:^6.0.3":
+  version: 6.0.3
+  resolution: "postcss-discard-duplicates@npm:6.0.3"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/316b8263c3a06d3303288d99e093ed2922757222fe5ea457b70d8d3fccadf0a1a452a6cc3b8296e749e70b0a231b68a742f9e01c606baa7fe3e14327bae3094b
+  checksum: 10c0/24d2f00e54668f2837eb38a64b1751d7a4a73b2752f9749e61eb728f1fae837984bc2b339f7f5207aff5f66f72551253489114b59b9ba21782072677a81d7d1b
   languageName: node
   linkType: hard
 
-"postcss-discard-empty@npm:^6.0.2":
-  version: 6.0.2
-  resolution: "postcss-discard-empty@npm:6.0.2"
+"postcss-discard-empty@npm:^6.0.3":
+  version: 6.0.3
+  resolution: "postcss-discard-empty@npm:6.0.3"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/abae41eecf93ed7b2b34bb77d319d70093e663ee4b23dc0b1e0007044bbf4315d980539bb67466a8ed24a475afdd52bd465f92433466cf3bf2057591c7124ab1
+  checksum: 10c0/1af08bb29f18eda41edf3602b257d89a4cf0a16f79fc773cfebd4a37251f8dbd9b77ac18efe55d0677d000b43a8adf2ef9328d31961c810e9433a38494a1fa65
   languageName: node
   linkType: hard
 
-"postcss-discard-overridden@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "postcss-discard-overridden@npm:6.0.1"
+"postcss-discard-overridden@npm:^6.0.2":
+  version: 6.0.2
+  resolution: "postcss-discard-overridden@npm:6.0.2"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/22f9d56e53b90bc0f8e6d1c24d6da6c7c1a9d757644a128a7a4263a5479aaa8eca4ce3bfe9db10358051635ed40e8778a68c3f1831b7163eae10ced001db4a87
+  checksum: 10c0/fda70ef3cd4cb508369c5bbbae44d7760c40ec9f2e65df1cd1b6e0314317fb1d25ae7f64987ca84e66889c1e9d1862487a6ce391c159dfe04d536597bfc5030d
   languageName: node
   linkType: hard
 
@@ -12724,77 +12725,77 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-merge-longhand@npm:^6.0.3":
-  version: 6.0.3
-  resolution: "postcss-merge-longhand@npm:6.0.3"
+"postcss-merge-longhand@npm:^6.0.4":
+  version: 6.0.4
+  resolution: "postcss-merge-longhand@npm:6.0.4"
   dependencies:
     postcss-value-parser: "npm:^4.2.0"
-    stylehacks: "npm:^6.0.3"
+    stylehacks: "npm:^6.1.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/a71758832e198af58a3d1c5013731c8dcd646611bd6ce099a5cbcef4dc2fd7c574e2f28f80bfe67887b046abfacca94bbeb2982bef3b087e9b52bd4acd3d8a38
+  checksum: 10c0/6c05cfe60d86cb0b6f40abe4649e1c0c21cf416fbf17aa15f04c315fcef4887827db5ef2593eca27b2b14127f5338ab179b147940c22315b5a9bcb0bdbbfa768
   languageName: node
   linkType: hard
 
-"postcss-merge-rules@npm:^6.0.4":
-  version: 6.0.4
-  resolution: "postcss-merge-rules@npm:6.0.4"
+"postcss-merge-rules@npm:^6.1.0":
+  version: 6.1.0
+  resolution: "postcss-merge-rules@npm:6.1.0"
   dependencies:
     browserslist: "npm:^4.23.0"
     caniuse-api: "npm:^3.0.0"
-    cssnano-utils: "npm:^4.0.1"
+    cssnano-utils: "npm:^4.0.2"
     postcss-selector-parser: "npm:^6.0.15"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/57a16817c099dfc644bf2619831208bafcfd91225cccc8f6d2913241fe4a7225b3dc565bc92402902b4271771ad5d56358afd8eb7f709827a6576177e0bf9433
+  checksum: 10c0/3ce76c87e29003fe46fbeba64348ed61d50d8966cfd56ec59b70b6fbf2e2ea8866b8399eec09e036fc636c84207ba12037a1dbc1374fd313a885511947699cad
   languageName: node
   linkType: hard
 
-"postcss-minify-font-values@npm:^6.0.2":
-  version: 6.0.2
-  resolution: "postcss-minify-font-values@npm:6.0.2"
+"postcss-minify-font-values@npm:^6.0.3":
+  version: 6.0.3
+  resolution: "postcss-minify-font-values@npm:6.0.3"
   dependencies:
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/6a9407441531efd83683d529c9632c5c4ac7d971716dffa708b3775f36382ca9a960372793c4f9df68aaae513213a53400860d9a6bd233da6f68f8fc985efe72
+  checksum: 10c0/c1ae31099e3ae79169405d3d46cd49cff35c70c63d1f36f24b16fcce43999c130db396e1fde071a375bd5b4853b14058111034a8da278a3a31f9ca12e091116e
   languageName: node
   linkType: hard
 
-"postcss-minify-gradients@npm:^6.0.2":
-  version: 6.0.2
-  resolution: "postcss-minify-gradients@npm:6.0.2"
+"postcss-minify-gradients@npm:^6.0.3":
+  version: 6.0.3
+  resolution: "postcss-minify-gradients@npm:6.0.3"
   dependencies:
     colord: "npm:^2.9.3"
-    cssnano-utils: "npm:^4.0.1"
+    cssnano-utils: "npm:^4.0.2"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/7a72edf3fe0028010d85af77d8c6bfa6147785bc9b3758efb0d09b51a8254ce3f8bc3f67220af6f204bb175e95b9e8355baf29b9c32b1df590506bca835b02f4
+  checksum: 10c0/7fcbcec94fe5455b89fe1b424a451198e60e0407c894bbacdc062d9fdef2f8571b483b5c3bb17f22d2f1249431251b2de22e1e4e8b0614d10624f8ee6e71afd2
   languageName: node
   linkType: hard
 
-"postcss-minify-params@npm:^6.0.3":
-  version: 6.0.3
-  resolution: "postcss-minify-params@npm:6.0.3"
+"postcss-minify-params@npm:^6.1.0":
+  version: 6.1.0
+  resolution: "postcss-minify-params@npm:6.1.0"
   dependencies:
     browserslist: "npm:^4.23.0"
-    cssnano-utils: "npm:^4.0.1"
+    cssnano-utils: "npm:^4.0.2"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/65a8bc0f75e7dc8a292797209ec0b1adef52923daf181ad34a7e83cbc974e2192e0e35ce0f35dbcb0177828991f92da8e239564f56588482d99c04a3e0755266
+  checksum: 10c0/e5c38c3e5fb42e2ca165764f983716e57d854a63a477f7389ccc94cd2ab8123707006613bd7f29acc6eafd296fff513aa6d869c98ac52590f886d641cb21a59e
   languageName: node
   linkType: hard
 
-"postcss-minify-selectors@npm:^6.0.2":
-  version: 6.0.2
-  resolution: "postcss-minify-selectors@npm:6.0.2"
+"postcss-minify-selectors@npm:^6.0.3":
+  version: 6.0.3
+  resolution: "postcss-minify-selectors@npm:6.0.3"
   dependencies:
     postcss-selector-parser: "npm:^6.0.15"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/5437b586c1237fc442e7e6078d4f23c987efc456366368b07a0da67332b04bd55821cedf0441e73e1209689f63139e272d930508e2963ba6e27c46561a661128
+  checksum: 10c0/6abc83edf3fd746979ef709182fd613a764c5c2f68ae20aaa1b38940153a1078c0b270d657fe3bcfe6cda44b61f5af762fe9b31b8b62f63b897bfc2d2bc02b88
   languageName: node
   linkType: hard
 
@@ -12842,136 +12843,136 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-normalize-charset@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "postcss-normalize-charset@npm:6.0.1"
+"postcss-normalize-charset@npm:^6.0.2":
+  version: 6.0.2
+  resolution: "postcss-normalize-charset@npm:6.0.2"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/8c09eedaf8813123875c65ab35120f14a87d6b9e8d6805fa808e3a714a8f868d15123f34f61e2240d89225f2f5c2bdabbcdf6385ce86b2487370d8994a65a857
+  checksum: 10c0/af32a3b4cf94163d728b8aa935b2494c9f69fbc96a33b35f67ae15dbdef7fcc8732569df97cbaaf20ca6c0103c39adad0cfce2ba07ffed283796787f6c36f410
   languageName: node
   linkType: hard
 
-"postcss-normalize-display-values@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "postcss-normalize-display-values@npm:6.0.1"
+"postcss-normalize-display-values@npm:^6.0.2":
+  version: 6.0.2
+  resolution: "postcss-normalize-display-values@npm:6.0.2"
   dependencies:
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/d08a92c653fb4f2506e029ceb8e3fdae9bc937fb1a7e80ecde759d02f6d15f69211af384d89d8582b160fd129abd9c77c8c64d75379417098ee5a2ba779e33d3
+  checksum: 10c0/782761850c7e697fdb6c3ff53076de716a71b60f9e835efb2f7ef238de347c88b5d55f0d43cf5c608e1ee58de65360e3d9fccd5f20774bba08ded7c87d8a5651
   languageName: node
   linkType: hard
 
-"postcss-normalize-positions@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "postcss-normalize-positions@npm:6.0.1"
+"postcss-normalize-positions@npm:^6.0.2":
+  version: 6.0.2
+  resolution: "postcss-normalize-positions@npm:6.0.2"
   dependencies:
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/bb0267b13c92791543f5e9f94b119a0540e08aa46f600acd73a692cd38d07d2d2fddb11148a81adb58e3f65671eebb05ea38d2ded48f3202b2582f1199aa848e
+  checksum: 10c0/9fdd42a47226bbda5f68774f3c4c3a90eb4fa708aef5a997c6a52fe6cac06585c9774038fe3bc1aa86a203c29223b8d8db6ebe7580c1aa293154f2b48db0b038
   languageName: node
   linkType: hard
 
-"postcss-normalize-repeat-style@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "postcss-normalize-repeat-style@npm:6.0.1"
+"postcss-normalize-repeat-style@npm:^6.0.2":
+  version: 6.0.2
+  resolution: "postcss-normalize-repeat-style@npm:6.0.2"
   dependencies:
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/f6e943dbbf9341dd6ce2c9fc6820e8ae2a838d1db84f58f75b1e5c1b8b9d6895d17fb30b320e2189b8747f844713ec687540b5b1d52ccd6c9108d6d35328c659
+  checksum: 10c0/9133ccbdf1286920c1cd0d01c1c5fa0bd3251b717f2f3e47d691dcc44978ac1dc419d20d9ae5428bd48ee542059e66b823ba699356f5968ccced5606c7c7ca34
   languageName: node
   linkType: hard
 
-"postcss-normalize-string@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "postcss-normalize-string@npm:6.0.1"
+"postcss-normalize-string@npm:^6.0.2":
+  version: 6.0.2
+  resolution: "postcss-normalize-string@npm:6.0.2"
   dependencies:
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/afcdd69522fc3ebafc349c2ef4b62f1e734ade9b6148fd20f2b841477808ac6cf6e5bfbb533c492fdc6bb2184b84be8ebb800a6ae174c4313f87fb0695088cc0
+  checksum: 10c0/fecc2d52c4029b24fecf2ca2fb45df5dbdf9f35012194ad4ea80bc7be3252cdcb21a0976400902320595aa6178f2cc625cc804c6b6740aef6efa42105973a205
   languageName: node
   linkType: hard
 
-"postcss-normalize-timing-functions@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "postcss-normalize-timing-functions@npm:6.0.1"
+"postcss-normalize-timing-functions@npm:^6.0.2":
+  version: 6.0.2
+  resolution: "postcss-normalize-timing-functions@npm:6.0.2"
   dependencies:
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/c1c81d0dcb2f74fbd69cc45b0b6bd6cde390a0c9df602aabbf3eb2149a49da48e808837e811d22a525ffb036e158e63b4b2cf12c94cf28f2c2f6af858876134e
+  checksum: 10c0/a22af0b3374704e59ae70bbbcc66b7029137e284f04e30a2ad548818d1540d6c1ed748dd8f689b9b6df5c1064085a00ad07b6f7e25ffaad49d4e661b616cdeae
   languageName: node
   linkType: hard
 
-"postcss-normalize-unicode@npm:^6.0.3":
-  version: 6.0.3
-  resolution: "postcss-normalize-unicode@npm:6.0.3"
+"postcss-normalize-unicode@npm:^6.1.0":
+  version: 6.1.0
+  resolution: "postcss-normalize-unicode@npm:6.1.0"
   dependencies:
     browserslist: "npm:^4.23.0"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/9a79ff4fcdfc876e12fa595271f2fca655a5022fd63a202387fa9be1f6705a6e34395d555de8878ffed8b0305281ff452e26045bdc710e161f4103380b1d05d8
+  checksum: 10c0/ff5746670d94dd97b49a0955c3c71ff516fb4f54bbae257f877d179bacc44a62e50a0fd6e7ddf959f2ca35c335de4266b0c275d880bb57ad7827189339ab1582
   languageName: node
   linkType: hard
 
-"postcss-normalize-url@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "postcss-normalize-url@npm:6.0.1"
+"postcss-normalize-url@npm:^6.0.2":
+  version: 6.0.2
+  resolution: "postcss-normalize-url@npm:6.0.2"
   dependencies:
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/4e3e713a95e01f263feccd041b2b10016a0a09e494c81567f012d1326d9b2d57dc4a68956a820313630370c0ef591bdbb37cc96ed259022559623be179aad436
+  checksum: 10c0/4718f1c0657788d2c560b340ee8e0a4eb3eb053eba6fbbf489e9a6e739b4c5f9ce1957f54bd03497c50a1f39962bf6ab9ff6ba4976b69dd160f6afd1670d69b7
   languageName: node
   linkType: hard
 
-"postcss-normalize-whitespace@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "postcss-normalize-whitespace@npm:6.0.1"
+"postcss-normalize-whitespace@npm:^6.0.2":
+  version: 6.0.2
+  resolution: "postcss-normalize-whitespace@npm:6.0.2"
   dependencies:
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/259c0b7653f033ed14303602a30e458c37dc63ee55f47226b6379a6ea553ca7c9b971d49715b8f3f36a3a06927f6f87d7997c027ad4664af3bca37a5fe30352e
+  checksum: 10c0/d5275a88e29a894aeb83a2a833e816d2456dbf3f39961628df596ce205dcc4895186a023812ff691945e0804241ccc53e520d16591b5812288474b474bbaf652
   languageName: node
   linkType: hard
 
-"postcss-ordered-values@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "postcss-ordered-values@npm:6.0.1"
+"postcss-ordered-values@npm:^6.0.2":
+  version: 6.0.2
+  resolution: "postcss-ordered-values@npm:6.0.2"
   dependencies:
-    cssnano-utils: "npm:^4.0.1"
+    cssnano-utils: "npm:^4.0.2"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/2e71f035c90b26d7a8d31e1b716f977532367f75bc76de3318b6ba7b2e1ec43c011cc09e741f59f7d93dff427b7d90a35db0b460d2f171a6f0c6e8c938ef30ad
+  checksum: 10c0/aece23a289228aa804217a85f8da198d22b9123f02ca1310b81834af380d6fbe115e4300683599b4a2ab7f1c6a1dbd6789724c47c38e2b0a3774f2ea4b4f0963
   languageName: node
   linkType: hard
 
-"postcss-reduce-initial@npm:^6.0.3":
-  version: 6.0.3
-  resolution: "postcss-reduce-initial@npm:6.0.3"
+"postcss-reduce-initial@npm:^6.1.0":
+  version: 6.1.0
+  resolution: "postcss-reduce-initial@npm:6.1.0"
   dependencies:
     browserslist: "npm:^4.23.0"
     caniuse-api: "npm:^3.0.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/824813d56f1f0d502b35781de5dd3caa5af71c9652710c95266ef8602a36cd9ea757033fb7206562d0a03e21f7a4198c09538dbf8c7548d014631a64bdcbb406
+  checksum: 10c0/a8f28cf51ce9a1b9423cce1a01c1d7cbee90125930ec36435a0073e73aef402d90affe2fd3600c964b679cf738869fda447b95a9acce74414e9d67d5c6ba8646
   languageName: node
   linkType: hard
 
-"postcss-reduce-transforms@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "postcss-reduce-transforms@npm:6.0.1"
+"postcss-reduce-transforms@npm:^6.0.2":
+  version: 6.0.2
+  resolution: "postcss-reduce-transforms@npm:6.0.2"
   dependencies:
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/de7631302311071d86622166539162e69df506785e3674afab0602c86ed9aa67799e44405b40327f0011d58089d2dc4e2ae481b21812177818e28f9272d350a5
+  checksum: 10c0/755ef27b3d083f586ac831f0c611a66e76f504d27e2100dc7674f6b86afad597901b4520cb889fe58ca70e852aa7fd0c0acb69a63d39dfe6a95860b472394e7c
   languageName: node
   linkType: hard
 
@@ -13010,26 +13011,26 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-svgo@npm:^6.0.2":
-  version: 6.0.2
-  resolution: "postcss-svgo@npm:6.0.2"
+"postcss-svgo@npm:^6.0.3":
+  version: 6.0.3
+  resolution: "postcss-svgo@npm:6.0.3"
   dependencies:
     postcss-value-parser: "npm:^4.2.0"
     svgo: "npm:^3.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/db607404d09af256c7957a0ace822d651a00a52a1796da603f93ba3f0a095ac7595e1f624b9dc53f362ab10e382845d7873f485980f9c92fcb86256833f5e835
+  checksum: 10c0/994b15a88cbb411f32cfa98957faa5623c76f2d75fede51f5f47238f06b367ebe59c204fecbdaf21ccb9e727239a4b290087e04c502392658a0c881ddfbd61f2
   languageName: node
   linkType: hard
 
-"postcss-unique-selectors@npm:^6.0.2":
-  version: 6.0.2
-  resolution: "postcss-unique-selectors@npm:6.0.2"
+"postcss-unique-selectors@npm:^6.0.3":
+  version: 6.0.3
+  resolution: "postcss-unique-selectors@npm:6.0.3"
   dependencies:
     postcss-selector-parser: "npm:^6.0.15"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/a0fe112d1094f90e1bfcfd2174a74b2fd0630a24449e9942923d02956c7d64ea4add5adede53d9efb3f6d40cd388ac150d032a115f6a46b73d5f3d3d26fa1bb7
+  checksum: 10c0/884c5da4c3bfdacf6a61bb3bd23d212e61d2b3e99ba5099d4d646d18970d2c72d8f6bd8f2ab244ee68d7214e576dc3fd9004fc946ff872e745a965da29f7b18b
   languageName: node
   linkType: hard
 
@@ -15530,15 +15531,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"stylehacks@npm:^6.0.3":
-  version: 6.0.3
-  resolution: "stylehacks@npm:6.0.3"
+"stylehacks@npm:^6.1.0":
+  version: 6.1.0
+  resolution: "stylehacks@npm:6.1.0"
   dependencies:
     browserslist: "npm:^4.23.0"
     postcss-selector-parser: "npm:^6.0.15"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/780c147a695d77794f60e993824f3c67f1cde04905163e5a1b50ba8a1715ddda789cfdf86d46711713afe4a38252d5e3f6d79b103dc29d3b6f3749c24749de1d
+  checksum: 10c0/0e9624d2b12d00d5593e3ef9ef8ed1f4c2029087b4862567cfab9ea3d3fc21efeb9aa00251c13defdfff4481abff8d6e0c48e3e27fac967c959acc7dcb0d5b67
   languageName: node
   linkType: hard
 

From 58ce0002cdb340529dae81e0e0c61c629a05d9b3 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 18 Mar 2024 10:00:29 +0000
Subject: [PATCH 0500/2191] Update dependency typescript to v5.4.2 (#29632)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 5cc5a265e0e21b..dd80cc8430fb2d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -16263,22 +16263,22 @@ __metadata:
   linkType: hard
 
 "typescript@npm:5, typescript@npm:^5.0.4":
-  version: 5.3.3
-  resolution: "typescript@npm:5.3.3"
+  version: 5.4.2
+  resolution: "typescript@npm:5.4.2"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
-  checksum: 10c0/e33cef99d82573624fc0f854a2980322714986bc35b9cb4d1ce736ed182aeab78e2cb32b385efa493b2a976ef52c53e20d6c6918312353a91850e2b76f1ea44f
+  checksum: 10c0/583ff68cafb0c076695f72d61df6feee71689568179fb0d3a4834dac343df6b6ed7cf7b6f6c801fa52d43cd1d324e2f2d8ae4497b09f9e6cfe3d80a6d6c9ca52
   languageName: node
   linkType: hard
 
 "typescript@patch:typescript@npm%3A5#optional!builtin<compat/typescript>, typescript@patch:typescript@npm%3A^5.0.4#optional!builtin<compat/typescript>":
-  version: 5.3.3
-  resolution: "typescript@patch:typescript@npm%3A5.3.3#optional!builtin<compat/typescript>::version=5.3.3&hash=e012d7"
+  version: 5.4.2
+  resolution: "typescript@patch:typescript@npm%3A5.4.2#optional!builtin<compat/typescript>::version=5.4.2&hash=5adc0c"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
-  checksum: 10c0/1d0a5f4ce496c42caa9a30e659c467c5686eae15d54b027ee7866744952547f1be1262f2d40de911618c242b510029d51d43ff605dba8fb740ec85ca2d3f9500
+  checksum: 10c0/fcf6658073d07283910d9a0e04b1d5d0ebc822c04dbb7abdd74c3151c7aa92fcddbac7d799404e358197222006ccdc4c0db219d223d2ee4ccd9e2b01333b49be
   languageName: node
   linkType: hard
 

From b5115850bb22a3676456732b61408fba07bb4b64 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 18 Mar 2024 06:11:53 -0400
Subject: [PATCH 0501/2191] Move repeated `insert_pagination_headers` method to
 api base class (#29606)

---
 app/controllers/api/base_controller.rb                        | 4 ++++
 .../api/v1/accounts/follower_accounts_controller.rb           | 4 ----
 .../api/v1/accounts/following_accounts_controller.rb          | 4 ----
 app/controllers/api/v1/accounts/statuses_controller.rb        | 4 ----
 app/controllers/api/v1/admin/accounts_controller.rb           | 4 ----
 .../api/v1/admin/canonical_email_blocks_controller.rb         | 4 ----
 app/controllers/api/v1/admin/domain_allows_controller.rb      | 4 ----
 app/controllers/api/v1/admin/domain_blocks_controller.rb      | 4 ----
 .../api/v1/admin/email_domain_blocks_controller.rb            | 4 ----
 app/controllers/api/v1/admin/ip_blocks_controller.rb          | 4 ----
 app/controllers/api/v1/admin/reports_controller.rb            | 4 ----
 app/controllers/api/v1/admin/tags_controller.rb               | 4 ----
 .../admin/trends/links/preview_card_providers_controller.rb   | 4 ----
 app/controllers/api/v1/blocks_controller.rb                   | 4 ----
 app/controllers/api/v1/bookmarks_controller.rb                | 4 ----
 app/controllers/api/v1/conversations_controller.rb            | 4 ----
 .../api/v1/crypto/encrypted_messages_controller.rb            | 4 ----
 app/controllers/api/v1/domain_blocks_controller.rb            | 4 ----
 app/controllers/api/v1/endorsements_controller.rb             | 4 ----
 app/controllers/api/v1/favourites_controller.rb               | 4 ----
 app/controllers/api/v1/follow_requests_controller.rb          | 4 ----
 app/controllers/api/v1/followed_tags_controller.rb            | 4 ----
 app/controllers/api/v1/lists/accounts_controller.rb           | 4 ----
 app/controllers/api/v1/mutes_controller.rb                    | 4 ----
 app/controllers/api/v1/notifications/requests_controller.rb   | 4 ----
 app/controllers/api/v1/notifications_controller.rb            | 4 ----
 app/controllers/api/v1/scheduled_statuses_controller.rb       | 4 ----
 .../api/v1/statuses/favourited_by_accounts_controller.rb      | 4 ----
 .../api/v1/statuses/reblogged_by_accounts_controller.rb       | 4 ----
 app/controllers/api/v1/timelines/base_controller.rb           | 4 ----
 app/controllers/api/v1/trends/links_controller.rb             | 4 ----
 app/controllers/api/v1/trends/statuses_controller.rb          | 4 ----
 app/controllers/api/v1/trends/tags_controller.rb              | 4 ----
 33 files changed, 4 insertions(+), 128 deletions(-)

diff --git a/app/controllers/api/base_controller.rb b/app/controllers/api/base_controller.rb
index bf7deac5cfc857..f87d596ce3a441 100644
--- a/app/controllers/api/base_controller.rb
+++ b/app/controllers/api/base_controller.rb
@@ -104,6 +104,10 @@ def disallow_unauthenticated_api_access?
 
   private
 
+  def insert_pagination_headers
+    set_pagination_headers(next_path, prev_path)
+  end
+
   def pagination_options_invalid?
     params.slice(:limit, :offset).values.map(&:to_i).any?(&:negative?)
   end
diff --git a/app/controllers/api/v1/accounts/follower_accounts_controller.rb b/app/controllers/api/v1/accounts/follower_accounts_controller.rb
index f60181f1eb6481..449866fa556972 100644
--- a/app/controllers/api/v1/accounts/follower_accounts_controller.rb
+++ b/app/controllers/api/v1/accounts/follower_accounts_controller.rb
@@ -41,10 +41,6 @@ def paginated_follows
     )
   end
 
-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
   def next_path
     api_v1_account_followers_url pagination_params(max_id: pagination_max_id) if records_continue?
   end
diff --git a/app/controllers/api/v1/accounts/following_accounts_controller.rb b/app/controllers/api/v1/accounts/following_accounts_controller.rb
index 3ab8c1efd6971a..c4f4313f8fce9d 100644
--- a/app/controllers/api/v1/accounts/following_accounts_controller.rb
+++ b/app/controllers/api/v1/accounts/following_accounts_controller.rb
@@ -41,10 +41,6 @@ def paginated_follows
     )
   end
 
-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
   def next_path
     api_v1_account_following_index_url pagination_params(max_id: pagination_max_id) if records_continue?
   end
diff --git a/app/controllers/api/v1/accounts/statuses_controller.rb b/app/controllers/api/v1/accounts/statuses_controller.rb
index 56d4e6909113fd..35ea9c8ec12d5d 100644
--- a/app/controllers/api/v1/accounts/statuses_controller.rb
+++ b/app/controllers/api/v1/accounts/statuses_controller.rb
@@ -35,10 +35,6 @@ def pagination_params(core_params)
     params.slice(:limit, *AccountStatusesFilter::KEYS).permit(:limit, *AccountStatusesFilter::KEYS).merge(core_params)
   end
 
-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
   def next_path
     api_v1_account_statuses_url pagination_params(max_id: pagination_max_id) if records_continue?
   end
diff --git a/app/controllers/api/v1/admin/accounts_controller.rb b/app/controllers/api/v1/admin/accounts_controller.rb
index 06cebffcb6a6e7..ff6f41e01daa4f 100644
--- a/app/controllers/api/v1/admin/accounts_controller.rb
+++ b/app/controllers/api/v1/admin/accounts_controller.rb
@@ -125,10 +125,6 @@ def translated_filter_params
     translated_params
   end
 
-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
   def next_path
     api_v1_admin_accounts_url(pagination_params(max_id: pagination_max_id)) if records_continue?
   end
diff --git a/app/controllers/api/v1/admin/canonical_email_blocks_controller.rb b/app/controllers/api/v1/admin/canonical_email_blocks_controller.rb
index f81e480bd76d17..701f668de620f2 100644
--- a/app/controllers/api/v1/admin/canonical_email_blocks_controller.rb
+++ b/app/controllers/api/v1/admin/canonical_email_blocks_controller.rb
@@ -65,10 +65,6 @@ def set_canonical_email_block
     @canonical_email_block = CanonicalEmailBlock.find(params[:id])
   end
 
-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
   def next_path
     api_v1_admin_canonical_email_blocks_url(pagination_params(max_id: pagination_max_id)) if records_continue?
   end
diff --git a/app/controllers/api/v1/admin/domain_allows_controller.rb b/app/controllers/api/v1/admin/domain_allows_controller.rb
index 18412928437232..a7ae84e30691b8 100644
--- a/app/controllers/api/v1/admin/domain_allows_controller.rb
+++ b/app/controllers/api/v1/admin/domain_allows_controller.rb
@@ -61,10 +61,6 @@ def filtered_domain_allows
     DomainAllow.all
   end
 
-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
   def next_path
     api_v1_admin_domain_allows_url(pagination_params(max_id: pagination_max_id)) if records_continue?
   end
diff --git a/app/controllers/api/v1/admin/domain_blocks_controller.rb b/app/controllers/api/v1/admin/domain_blocks_controller.rb
index 8cd90b7c527bbf..b589d277d5f0b4 100644
--- a/app/controllers/api/v1/admin/domain_blocks_controller.rb
+++ b/app/controllers/api/v1/admin/domain_blocks_controller.rb
@@ -72,10 +72,6 @@ def domain_block_params
     params.permit(:severity, :reject_media, :reject_reports, :private_comment, :public_comment, :obfuscate)
   end
 
-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
   def next_path
     api_v1_admin_domain_blocks_url(pagination_params(max_id: pagination_max_id)) if records_continue?
   end
diff --git a/app/controllers/api/v1/admin/email_domain_blocks_controller.rb b/app/controllers/api/v1/admin/email_domain_blocks_controller.rb
index 34489e19b49646..bdedb9d0405f7f 100644
--- a/app/controllers/api/v1/admin/email_domain_blocks_controller.rb
+++ b/app/controllers/api/v1/admin/email_domain_blocks_controller.rb
@@ -58,10 +58,6 @@ def resource_params
     params.permit(:domain, :allow_with_approval)
   end
 
-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
   def next_path
     api_v1_admin_email_domain_blocks_url(pagination_params(max_id: pagination_max_id)) if records_continue?
   end
diff --git a/app/controllers/api/v1/admin/ip_blocks_controller.rb b/app/controllers/api/v1/admin/ip_blocks_controller.rb
index 0f666476c59da3..36257811490f5c 100644
--- a/app/controllers/api/v1/admin/ip_blocks_controller.rb
+++ b/app/controllers/api/v1/admin/ip_blocks_controller.rb
@@ -63,10 +63,6 @@ def resource_params
     params.permit(:ip, :severity, :comment, :expires_in)
   end
 
-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
   def next_path
     api_v1_admin_ip_blocks_url(pagination_params(max_id: pagination_max_id)) if records_continue?
   end
diff --git a/app/controllers/api/v1/admin/reports_controller.rb b/app/controllers/api/v1/admin/reports_controller.rb
index f0598aa81ef750..9b5beeab67ee79 100644
--- a/app/controllers/api/v1/admin/reports_controller.rb
+++ b/app/controllers/api/v1/admin/reports_controller.rb
@@ -89,10 +89,6 @@ def filter_params
     params.permit(*FILTER_PARAMS)
   end
 
-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
   def next_path
     api_v1_admin_reports_url(pagination_params(max_id: pagination_max_id)) if records_continue?
   end
diff --git a/app/controllers/api/v1/admin/tags_controller.rb b/app/controllers/api/v1/admin/tags_controller.rb
index 989e7e610ae076..c75498072051e7 100644
--- a/app/controllers/api/v1/admin/tags_controller.rb
+++ b/app/controllers/api/v1/admin/tags_controller.rb
@@ -44,10 +44,6 @@ def tag_params
     params.permit(:display_name, :trendable, :usable, :listable)
   end
 
-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
   def next_path
     api_v1_admin_tags_url(pagination_params(max_id: pagination_max_id)) if records_continue?
   end
diff --git a/app/controllers/api/v1/admin/trends/links/preview_card_providers_controller.rb b/app/controllers/api/v1/admin/trends/links/preview_card_providers_controller.rb
index 7ab7e6bd048779..8bb5e22716be7c 100644
--- a/app/controllers/api/v1/admin/trends/links/preview_card_providers_controller.rb
+++ b/app/controllers/api/v1/admin/trends/links/preview_card_providers_controller.rb
@@ -42,10 +42,6 @@ def set_providers
     @providers = PreviewCardProvider.all.to_a_paginated_by_id(limit_param(LIMIT), params_slice(:max_id, :since_id, :min_id))
   end
 
-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
   def next_path
     api_v1_admin_trends_links_preview_card_providers_url(pagination_params(max_id: pagination_max_id)) if records_continue?
   end
diff --git a/app/controllers/api/v1/blocks_controller.rb b/app/controllers/api/v1/blocks_controller.rb
index 7826a3c6813bc1..234ab2e82cfff0 100644
--- a/app/controllers/api/v1/blocks_controller.rb
+++ b/app/controllers/api/v1/blocks_controller.rb
@@ -28,10 +28,6 @@ def paginated_blocks
                                )
   end
 
-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
   def next_path
     api_v1_blocks_url pagination_params(max_id: pagination_max_id) if records_continue?
   end
diff --git a/app/controllers/api/v1/bookmarks_controller.rb b/app/controllers/api/v1/bookmarks_controller.rb
index 08d3cf8344fb46..b6bb987b6bccc6 100644
--- a/app/controllers/api/v1/bookmarks_controller.rb
+++ b/app/controllers/api/v1/bookmarks_controller.rb
@@ -31,10 +31,6 @@ def account_bookmarks
     current_account.bookmarks
   end
 
-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
   def next_path
     api_v1_bookmarks_url pagination_params(max_id: pagination_max_id) if records_continue?
   end
diff --git a/app/controllers/api/v1/conversations_controller.rb b/app/controllers/api/v1/conversations_controller.rb
index 6a3567e624b8ad..a95c816e1c72af 100644
--- a/app/controllers/api/v1/conversations_controller.rb
+++ b/app/controllers/api/v1/conversations_controller.rb
@@ -53,10 +53,6 @@ def paginated_conversations
                        .to_a_paginated_by_id(limit_param(LIMIT), params_slice(:max_id, :since_id, :min_id))
   end
 
-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
   def next_path
     api_v1_conversations_url pagination_params(max_id: pagination_max_id) if records_continue?
   end
diff --git a/app/controllers/api/v1/crypto/encrypted_messages_controller.rb b/app/controllers/api/v1/crypto/encrypted_messages_controller.rb
index c70ae46d1818f7..d3de220393f023 100644
--- a/app/controllers/api/v1/crypto/encrypted_messages_controller.rb
+++ b/app/controllers/api/v1/crypto/encrypted_messages_controller.rb
@@ -29,10 +29,6 @@ def set_encrypted_messages
     @encrypted_messages = @current_device.encrypted_messages.to_a_paginated_by_id(limit_param(LIMIT), params_slice(:max_id, :since_id, :min_id))
   end
 
-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
   def next_path
     api_v1_crypto_encrypted_messages_url pagination_params(max_id: pagination_max_id) if records_continue?
   end
diff --git a/app/controllers/api/v1/domain_blocks_controller.rb b/app/controllers/api/v1/domain_blocks_controller.rb
index 5774c4d1c70e45..3dee2d176cccda 100644
--- a/app/controllers/api/v1/domain_blocks_controller.rb
+++ b/app/controllers/api/v1/domain_blocks_controller.rb
@@ -38,10 +38,6 @@ def account_domain_blocks
     current_account.domain_blocks
   end
 
-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
   def next_path
     api_v1_domain_blocks_url pagination_params(max_id: pagination_max_id) if records_continue?
   end
diff --git a/app/controllers/api/v1/endorsements_controller.rb b/app/controllers/api/v1/endorsements_controller.rb
index 449a9ac245cac5..9a723d89e4f233 100644
--- a/app/controllers/api/v1/endorsements_controller.rb
+++ b/app/controllers/api/v1/endorsements_controller.rb
@@ -28,10 +28,6 @@ def endorsed_accounts
     current_account.endorsed_accounts.includes(:account_stat, :user).without_suspended
   end
 
-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
   def next_path
     return if unlimited?
 
diff --git a/app/controllers/api/v1/favourites_controller.rb b/app/controllers/api/v1/favourites_controller.rb
index 85e46b1166a77c..73da538f5c80ad 100644
--- a/app/controllers/api/v1/favourites_controller.rb
+++ b/app/controllers/api/v1/favourites_controller.rb
@@ -31,10 +31,6 @@ def account_favourites
     current_account.favourites
   end
 
-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
   def next_path
     api_v1_favourites_url pagination_params(max_id: pagination_max_id) if records_continue?
   end
diff --git a/app/controllers/api/v1/follow_requests_controller.rb b/app/controllers/api/v1/follow_requests_controller.rb
index 87f6df5f9466b2..7ffd7614bbda06 100644
--- a/app/controllers/api/v1/follow_requests_controller.rb
+++ b/app/controllers/api/v1/follow_requests_controller.rb
@@ -48,10 +48,6 @@ def paginated_follow_requests
     )
   end
 
-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
   def next_path
     api_v1_follow_requests_url pagination_params(max_id: pagination_max_id) if records_continue?
   end
diff --git a/app/controllers/api/v1/followed_tags_controller.rb b/app/controllers/api/v1/followed_tags_controller.rb
index 0ea4a95ef56957..8888612b16284d 100644
--- a/app/controllers/api/v1/followed_tags_controller.rb
+++ b/app/controllers/api/v1/followed_tags_controller.rb
@@ -22,10 +22,6 @@ def set_results
     )
   end
 
-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
   def next_path
     api_v1_followed_tags_url pagination_params(max_id: pagination_max_id) if records_continue?
   end
diff --git a/app/controllers/api/v1/lists/accounts_controller.rb b/app/controllers/api/v1/lists/accounts_controller.rb
index 5ae74bf04d8142..aecf3910493d7d 100644
--- a/app/controllers/api/v1/lists/accounts_controller.rb
+++ b/app/controllers/api/v1/lists/accounts_controller.rb
@@ -55,10 +55,6 @@ def resource_params
     params.permit(account_ids: [])
   end
 
-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
   def next_path
     return if unlimited?
 
diff --git a/app/controllers/api/v1/mutes_controller.rb b/app/controllers/api/v1/mutes_controller.rb
index 9542d96110052d..dbfd7e103a2f58 100644
--- a/app/controllers/api/v1/mutes_controller.rb
+++ b/app/controllers/api/v1/mutes_controller.rb
@@ -28,10 +28,6 @@ def paginated_mutes
                              )
   end
 
-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
   def next_path
     api_v1_mutes_url pagination_params(max_id: pagination_max_id) if records_continue?
   end
diff --git a/app/controllers/api/v1/notifications/requests_controller.rb b/app/controllers/api/v1/notifications/requests_controller.rb
index 35f5d58a814752..6a26cc0e8abf07 100644
--- a/app/controllers/api/v1/notifications/requests_controller.rb
+++ b/app/controllers/api/v1/notifications/requests_controller.rb
@@ -53,10 +53,6 @@ def set_request
     @request = NotificationRequest.where(account: current_account).find(params[:id])
   end
 
-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
   def next_path
     api_v1_notifications_requests_url pagination_params(max_id: pagination_max_id) unless @requests.empty?
   end
diff --git a/app/controllers/api/v1/notifications_controller.rb b/app/controllers/api/v1/notifications_controller.rb
index 777740751f4308..c41a0bb05d11f8 100644
--- a/app/controllers/api/v1/notifications_controller.rb
+++ b/app/controllers/api/v1/notifications_controller.rb
@@ -58,10 +58,6 @@ def target_statuses_from_notifications
     @notifications.reject { |notification| notification.target_status.nil? }.map(&:target_status)
   end
 
-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
   def next_path
     api_v1_notifications_url pagination_params(max_id: pagination_max_id) unless @notifications.empty?
   end
diff --git a/app/controllers/api/v1/scheduled_statuses_controller.rb b/app/controllers/api/v1/scheduled_statuses_controller.rb
index f6c0703833a7f6..1217ed014e981f 100644
--- a/app/controllers/api/v1/scheduled_statuses_controller.rb
+++ b/app/controllers/api/v1/scheduled_statuses_controller.rb
@@ -47,10 +47,6 @@ def pagination_params(core_params)
     params.slice(:limit).permit(:limit).merge(core_params)
   end
 
-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
   def next_path
     api_v1_scheduled_statuses_url pagination_params(max_id: pagination_max_id) if records_continue?
   end
diff --git a/app/controllers/api/v1/statuses/favourited_by_accounts_controller.rb b/app/controllers/api/v1/statuses/favourited_by_accounts_controller.rb
index 069ad37cb2092c..bbc8082e0cf374 100644
--- a/app/controllers/api/v1/statuses/favourited_by_accounts_controller.rb
+++ b/app/controllers/api/v1/statuses/favourited_by_accounts_controller.rb
@@ -34,10 +34,6 @@ def paginated_favourites
     )
   end
 
-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
   def next_path
     api_v1_status_favourited_by_index_url pagination_params(max_id: pagination_max_id) if records_continue?
   end
diff --git a/app/controllers/api/v1/statuses/reblogged_by_accounts_controller.rb b/app/controllers/api/v1/statuses/reblogged_by_accounts_controller.rb
index b8a997518d5384..eaa5ef725501f2 100644
--- a/app/controllers/api/v1/statuses/reblogged_by_accounts_controller.rb
+++ b/app/controllers/api/v1/statuses/reblogged_by_accounts_controller.rb
@@ -30,10 +30,6 @@ def paginated_statuses
     )
   end
 
-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
   def next_path
     api_v1_status_reblogged_by_index_url pagination_params(max_id: pagination_max_id) if records_continue?
   end
diff --git a/app/controllers/api/v1/timelines/base_controller.rb b/app/controllers/api/v1/timelines/base_controller.rb
index 7735cf1dc08706..e79eba79ee575d 100644
--- a/app/controllers/api/v1/timelines/base_controller.rb
+++ b/app/controllers/api/v1/timelines/base_controller.rb
@@ -5,10 +5,6 @@ class Api::V1::Timelines::BaseController < Api::BaseController
 
   private
 
-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
   def pagination_collection
     @statuses
   end
diff --git a/app/controllers/api/v1/trends/links_controller.rb b/app/controllers/api/v1/trends/links_controller.rb
index 57cfa0b7e43b30..8edf5bbcef77eb 100644
--- a/app/controllers/api/v1/trends/links_controller.rb
+++ b/app/controllers/api/v1/trends/links_controller.rb
@@ -34,10 +34,6 @@ def links_from_trends
     scope
   end
 
-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
   def pagination_params(core_params)
     params.slice(:limit).permit(:limit).merge(core_params)
   end
diff --git a/app/controllers/api/v1/trends/statuses_controller.rb b/app/controllers/api/v1/trends/statuses_controller.rb
index c186864c3b1e21..48bfe119918b20 100644
--- a/app/controllers/api/v1/trends/statuses_controller.rb
+++ b/app/controllers/api/v1/trends/statuses_controller.rb
@@ -32,10 +32,6 @@ def statuses_from_trends
     scope
   end
 
-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
   def pagination_params(core_params)
     params.slice(:limit).permit(:limit).merge(core_params)
   end
diff --git a/app/controllers/api/v1/trends/tags_controller.rb b/app/controllers/api/v1/trends/tags_controller.rb
index aca3dd7089c1bc..6d3855a90a8a6d 100644
--- a/app/controllers/api/v1/trends/tags_controller.rb
+++ b/app/controllers/api/v1/trends/tags_controller.rb
@@ -30,10 +30,6 @@ def tags_from_trends
     Trends.tags.query.allowed
   end
 
-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
   def pagination_params(core_params)
     params.slice(:limit).permit(:limit).merge(core_params)
   end

From d5063072c3d7a882456f09cb70e664a2aeec7d81 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 18 Mar 2024 13:57:21 +0100
Subject: [PATCH 0502/2191] Revert friends-of-friends follow recommendation
 query to using a CTE (#29619)

---
 .../friends_of_friends_source.rb              | 37 +++++++++++++++----
 .../friends_of_friends_source_spec.rb         | 12 +++---
 2 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/app/models/account_suggestions/friends_of_friends_source.rb b/app/models/account_suggestions/friends_of_friends_source.rb
index b4f549bf314ed7..825b24f41981ed 100644
--- a/app/models/account_suggestions/friends_of_friends_source.rb
+++ b/app/models/account_suggestions/friends_of_friends_source.rb
@@ -7,14 +7,35 @@ def get(account, limit: DEFAULT_LIMIT)
   end
 
   def source_query(account, limit: DEFAULT_LIMIT)
-    first_degree = account.following.where.not(hide_collections: true).select(:id).reorder(nil)
-    base_account_scope(account)
-      .joins(:account_stat)
-      .joins(:passive_relationships).where(passive_relationships: { account_id: first_degree })
-      .group('accounts.id, account_stats.id')
-      .reorder(frequency: :desc, followers_count: :desc)
-      .limit(limit)
-      .pluck(Arel.sql('accounts.id, COUNT(*) AS frequency, followers_count'))
+    Account.find_by_sql([<<~SQL.squish, { id: account.id, limit: limit }]).map { |row| [row.id, row.frequency, row.followers_count] }
+      WITH first_degree AS (
+          SELECT target_account_id
+          FROM follows
+          JOIN accounts AS target_accounts ON follows.target_account_id = target_accounts.id
+          WHERE account_id = :id
+            AND NOT target_accounts.hide_collections
+      )
+      SELECT accounts.id, COUNT(*) AS frequency, account_stats.followers_count as followers_count
+      FROM accounts
+      JOIN follows ON follows.target_account_id = accounts.id
+      JOIN account_stats ON account_stats.account_id = accounts.id
+      LEFT OUTER JOIN follow_recommendation_mutes ON follow_recommendation_mutes.target_account_id = accounts.id AND follow_recommendation_mutes.account_id = :id
+      WHERE follows.account_id IN (SELECT * FROM first_degree)
+        AND NOT EXISTS (SELECT 1 FROM blocks b WHERE b.target_account_id = follows.target_account_id AND b.account_id = :id)
+        AND NOT EXISTS (SELECT 1 FROM blocks b WHERE b.target_account_id = :id AND b.account_id = follows.target_account_id)
+        AND NOT EXISTS (SELECT 1 FROM mutes m WHERE m.target_account_id = follows.target_account_id AND m.account_id = :id)
+        AND (accounts.domain IS NULL OR NOT EXISTS (SELECT 1 FROM account_domain_blocks b WHERE b.account_id = :id AND b.domain = accounts.domain))
+        AND NOT EXISTS (SELECT 1 FROM follows f WHERE f.target_account_id = follows.target_account_id AND f.account_id = :id)
+        AND follows.target_account_id <> :id
+        AND accounts.discoverable
+        AND accounts.suspended_at IS NULL
+        AND accounts.silenced_at IS NULL
+        AND accounts.moved_to_account_id IS NULL
+        AND follow_recommendation_mutes.target_account_id IS NULL
+      GROUP BY accounts.id, account_stats.id
+      ORDER BY frequency DESC, account_stats.followers_count ASC
+      LIMIT :limit
+    SQL
   end
 
   private
diff --git a/spec/models/account_suggestions/friends_of_friends_source_spec.rb b/spec/models/account_suggestions/friends_of_friends_source_spec.rb
index d7915985f8c1f5..c2f8d0f86c3326 100644
--- a/spec/models/account_suggestions/friends_of_friends_source_spec.rb
+++ b/spec/models/account_suggestions/friends_of_friends_source_spec.rb
@@ -76,19 +76,19 @@
       it 'contains correct underlying source data' do
         expect(source_query_values)
           .to contain_exactly(
-            [eugen.id, 2, 3], # Followed by 2 friends of bob (eve, mallory), 3 followers total (breaks tie)
-            [john.id, 2, 2],  # Followed by 2 friends of bob (eve, mallory), 2 followers total
-            [neil.id, 1, 2],  # Followed by 1 friends of bob (mallory), 2 followers total (breaks tie)
-            [jerk.id, 1, 1]   # Followed by 1 friends of bob (eve), 1 followers total
+            [john.id, 2, 2],  # Followed by 2 friends of bob (eve, mallory), 2 followers total (breaks tie)
+            [eugen.id, 2, 3], # Followed by 2 friends of bob (eve, mallory), 3 followers total
+            [jerk.id, 1, 1],  # Followed by 1 friends of bob (eve), 1 followers total (breaks tie)
+            [neil.id, 1, 2]   # Followed by 1 friends of bob (mallory), 2 followers total
           )
       end
 
       def expected_results
         [
-          [eugen.id, :friends_of_friends],
           [john.id, :friends_of_friends],
-          [neil.id, :friends_of_friends],
+          [eugen.id, :friends_of_friends],
           [jerk.id, :friends_of_friends],
+          [neil.id, :friends_of_friends],
         ]
       end
 

From 6d2986017e908b0f4fb88baca0902203e5beb177 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 18 Mar 2024 09:24:59 -0400
Subject: [PATCH 0503/2191] Remove unused `active_nav_class` helper method
 (#29617)

---
 app/helpers/application_helper.rb       |  4 ----
 spec/helpers/application_helper_spec.rb | 24 ------------------------
 2 files changed, 28 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 18c9663275ebdf..7dc7d60808fe40 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -28,10 +28,6 @@ def friendly_number_to_human(number, **options)
     number_to_human(number, **options)
   end
 
-  def active_nav_class(*paths)
-    paths.any? { |path| current_page?(path) } ? 'active' : ''
-  end
-
   def open_registrations?
     Setting.registrations_mode == 'open'
   end
diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
index 6fc6b3c0877a72..9330eb0dae1105 100644
--- a/spec/helpers/application_helper_spec.rb
+++ b/spec/helpers/application_helper_spec.rb
@@ -3,30 +3,6 @@
 require 'rails_helper'
 
 describe ApplicationHelper do
-  describe 'active_nav_class' do
-    it 'returns active when on the current page' do
-      allow(helper).to receive(:current_page?).and_return(true)
-
-      result = helper.active_nav_class('/test')
-      expect(result).to eq 'active'
-    end
-
-    it 'returns active when on a current page' do
-      allow(helper).to receive(:current_page?).with('/foo').and_return(false)
-      allow(helper).to receive(:current_page?).with('/test').and_return(true)
-
-      result = helper.active_nav_class('/foo', '/test')
-      expect(result).to eq 'active'
-    end
-
-    it 'returns empty string when not on current page' do
-      allow(helper).to receive(:current_page?).and_return(false)
-
-      result = helper.active_nav_class('/test')
-      expect(result).to eq ''
-    end
-  end
-
   describe 'body_classes' do
     context 'with a body class string from a controller' do
       before { helper.extend controller_helpers }

From 4ce714adea8636f477f3f77aabf525a75c262358 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 18 Mar 2024 15:09:18 +0100
Subject: [PATCH 0504/2191] Update dependency irb to v1.12.0 (#29519)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index e3239f3411dac9..9de472091ccf4c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -351,7 +351,7 @@ GEM
       terminal-table (>= 1.5.1)
     idn-ruby (0.1.5)
     io-console (0.7.2)
-    irb (1.11.2)
+    irb (1.12.0)
       rdoc
       reline (>= 0.4.2)
     jmespath (1.6.2)
@@ -607,7 +607,7 @@ GEM
     redlock (1.3.2)
       redis (>= 3.0.0, < 6.0)
     regexp_parser (2.9.0)
-    reline (0.4.2)
+    reline (0.4.3)
       io-console (~> 0.5)
     request_store (1.5.1)
       rack (>= 1.4)

From 39839baec378eb2b9bcd709fd8d7784e81e1674a Mon Sep 17 00:00:00 2001
From: Jeong Arm <kjwonmail@gmail.com>
Date: Tue, 19 Mar 2024 17:18:14 +0900
Subject: [PATCH 0505/2191] Fix mute for 30 days (#29640)

---
 app/javascript/mastodon/features/ui/components/mute_modal.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/features/ui/components/mute_modal.jsx b/app/javascript/mastodon/features/ui/components/mute_modal.jsx
index e9dc1a7c2ec38c..df466cfac6aa75 100644
--- a/app/javascript/mastodon/features/ui/components/mute_modal.jsx
+++ b/app/javascript/mastodon/features/ui/components/mute_modal.jsx
@@ -118,7 +118,7 @@ export const MuteModal = ({ accountId, acct }) => {
             <RadioButtonLabel name='duration' value='0' label={intl.formatMessage(messages.indefinite)} currentValue={muteDuration} onChange={handleChangeMuteDuration} />
             <RadioButtonLabel name='duration' value='86400' label={intl.formatMessage(messages.hours, { number: 24 })} currentValue={muteDuration} onChange={handleChangeMuteDuration} />
             <RadioButtonLabel name='duration' value='604800' label={intl.formatMessage(messages.days, { number: 7 })} currentValue={muteDuration} onChange={handleChangeMuteDuration} />
-            <RadioButtonLabel name='duration' value='x' label={intl.formatMessage(messages.days, { number: 30 })} currentValue={muteDuration} onChange={handleChangeMuteDuration} />
+            <RadioButtonLabel name='duration' value='2592000' label={intl.formatMessage(messages.days, { number: 30 })} currentValue={muteDuration} onChange={handleChangeMuteDuration} />
           </div>
 
           <div className='safety-action-modal__field-group'>

From cf08a438e7ce7981c209b0faa54a32c5bbe40930 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 19 Mar 2024 09:20:53 +0100
Subject: [PATCH 0506/2191] Add badge on account card in report moderation
 interface when account is already suspended (#29592)

---
 app/javascript/styles/mastodon/admin.scss      | 13 +++++++++++++
 app/views/admin/reports/_header_card.html.haml |  6 ++++++
 config/locales/en.yml                          |  3 +++
 3 files changed, 22 insertions(+)

diff --git a/app/javascript/styles/mastodon/admin.scss b/app/javascript/styles/mastodon/admin.scss
index 60e3cc19dde09a..fadd77d13d92d5 100644
--- a/app/javascript/styles/mastodon/admin.scss
+++ b/app/javascript/styles/mastodon/admin.scss
@@ -1380,6 +1380,19 @@ a.sparkline {
 .account-card {
   border-radius: 4px;
   border: 1px solid lighten($ui-base-color, 8%);
+  position: relative;
+
+  &__warning-badge {
+    position: absolute;
+    padding: 4px 10px;
+    top: 10px;
+    inset-inline-start: 10px;
+    border-radius: 4px;
+    background:
+      url('../images/warning-stripes.svg') repeat-y left,
+      url('../images/warning-stripes.svg') repeat-y right,
+      var(--background-color);
+  }
 
   &__permalink {
     color: inherit;
diff --git a/app/views/admin/reports/_header_card.html.haml b/app/views/admin/reports/_header_card.html.haml
index 6fd8b4ecc8be98..e90e3f9c906851 100644
--- a/app/views/admin/reports/_header_card.html.haml
+++ b/app/views/admin/reports/_header_card.html.haml
@@ -1,5 +1,11 @@
 .report-header__card
   .account-card
+    - if report.target_account.suspended?
+      .account-card__warning-badge
+        - if report.target_account.suspension_origin_local?
+          = t('admin.reports.already_suspended_badges.local')
+        - else
+          = t('admin.reports.already_suspended_badges.remote')
     .account-card__header
       = image_tag report.target_account.header.url, alt: ''
     .account-card__title
diff --git a/config/locales/en.yml b/config/locales/en.yml
index b6f9689ac4d5fb..6fc81ca5fb4b0c 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -597,6 +597,9 @@ en:
       actions_description_html: Decide which action to take to resolve this report. If you take a punitive action against the reported account, an e-mail notification will be sent to them, except when the <strong>Spam</strong> category is selected.
       actions_description_remote_html: Decide which action to take to resolve this report. This will only affect how <strong>your</strong> server communicates with this remote account and handle its content.
       add_to_report: Add more to report
+      already_suspended_badges:
+        local: Already suspended on this server
+        remote: Already suspended on their server
       are_you_sure: Are you sure?
       assign_to_self: Assign to me
       assigned: Assigned moderator

From 72e1162eb37de1659c4253a5bb99ed28c9fb707c Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 19 Mar 2024 04:22:46 -0400
Subject: [PATCH 0507/2191] Flatten `olm` section of context helper extension
 map (#29638)

---
 app/helpers/context_helper.rb | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/helpers/context_helper.rb b/app/helpers/context_helper.rb
index 945ef9b91a45a7..2d7a4f98fdcc25 100644
--- a/app/helpers/context_helper.rb
+++ b/app/helpers/context_helper.rb
@@ -24,12 +24,21 @@ module ContextHelper
     memorial: { 'toot' => 'http://joinmastodon.org/ns#', 'memorial' => 'toot:memorial' },
     voters_count: { 'toot' => 'http://joinmastodon.org/ns#', 'votersCount' => 'toot:votersCount' },
     olm: {
-      'toot' => 'http://joinmastodon.org/ns#', 'Device' => 'toot:Device', 'Ed25519Signature' => 'toot:Ed25519Signature', 'Ed25519Key' => 'toot:Ed25519Key', 'Curve25519Key' => 'toot:Curve25519Key', 'EncryptedMessage' => 'toot:EncryptedMessage', 'publicKeyBase64' => 'toot:publicKeyBase64', 'deviceId' => 'toot:deviceId',
+      'toot' => 'http://joinmastodon.org/ns#',
+      'Device' => 'toot:Device',
+      'Ed25519Signature' => 'toot:Ed25519Signature',
+      'Ed25519Key' => 'toot:Ed25519Key',
+      'Curve25519Key' => 'toot:Curve25519Key',
+      'EncryptedMessage' => 'toot:EncryptedMessage',
+      'publicKeyBase64' => 'toot:publicKeyBase64',
+      'deviceId' => 'toot:deviceId',
       'claim' => { '@type' => '@id', '@id' => 'toot:claim' },
       'fingerprintKey' => { '@type' => '@id', '@id' => 'toot:fingerprintKey' },
       'identityKey' => { '@type' => '@id', '@id' => 'toot:identityKey' },
       'devices' => { '@type' => '@id', '@id' => 'toot:devices' },
-      'messageFranking' => 'toot:messageFranking', 'messageType' => 'toot:messageType', 'cipherText' => 'toot:cipherText'
+      'messageFranking' => 'toot:messageFranking',
+      'messageType' => 'toot:messageType',
+      'cipherText' => 'toot:cipherText',
     },
     suspended: { 'toot' => 'http://joinmastodon.org/ns#', 'suspended' => 'toot:suspended' },
   }.freeze

From 4e61bce4e988c8e47f4627c5cfcdb2767b1cec17 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 19 Mar 2024 09:36:52 +0100
Subject: [PATCH 0508/2191] New Crowdin Translations (automated) (#29641)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/bg.json    |  1 +
 app/javascript/mastodon/locales/de.json    |  4 +--
 app/javascript/mastodon/locales/gl.json    | 39 ++++++++++++++++++++++
 app/javascript/mastodon/locales/ia.json    |  4 +++
 app/javascript/mastodon/locales/ne.json    |  2 ++
 app/javascript/mastodon/locales/zh-TW.json |  2 +-
 config/locales/gl.yml                      |  3 ++
 config/locales/vi.yml                      |  2 ++
 8 files changed, 54 insertions(+), 3 deletions(-)

diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json
index adc974bee8ff68..d692925d152e79 100644
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@@ -514,6 +514,7 @@
   "notifications.policy.filter_not_followers_title": "Хора, които не ви следват",
   "notifications.policy.filter_not_following_hint": "Докато не ги одобрите ръчно",
   "notifications.policy.filter_not_following_title": "Хора, които не следвате",
+  "notifications.policy.filter_private_mentions_hint": "Филтрирано, освен ако е отговор към ваше собствено споменаване или ако следвате подателя",
   "notifications.policy.filter_private_mentions_title": "Непоискани частни споменавания",
   "notifications.policy.title": "Да се филтрират известия от…",
   "notifications_permission_banner.enable": "Включване на известията на работния плот",
diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json
index 412ef31b07cb81..cb03e7ba3d88e6 100644
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@@ -697,7 +697,7 @@
   "status.edited_x_times": "{count, plural, one {{count}-mal} other {{count}-mal}} bearbeitet",
   "status.embed": "Beitrag per iFrame einbetten",
   "status.favourite": "Favorisieren",
-  "status.favourites": "{count, plural, one {Favorit} other {Favoriten}}",
+  "status.favourites": "{count, plural, one {Mal favorisiert} other {Mal favorisiert}}",
   "status.filter": "Beitrag filtern",
   "status.filtered": "Gefiltert",
   "status.hide": "Beitrag ausblenden",
@@ -718,7 +718,7 @@
   "status.reblog": "Teilen",
   "status.reblog_private": "Mit der ursprünglichen Zielgruppe teilen",
   "status.reblogged_by": "{name} teilte",
-  "status.reblogs": "{count, plural, one {geteilt} other {geteilt}}",
+  "status.reblogs": "{count, plural, one {Mal geteilt} other {Mal geteilt}}",
   "status.reblogs.empty": "Diesen Beitrag hat bisher noch niemand geteilt. Sobald es jemand tut, wird das Profil hier erscheinen.",
   "status.redraft": "Löschen und neu erstellen",
   "status.remove_bookmark": "Lesezeichen entfernen",
diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json
index d5726062a3ddb1..57882196f3a68b 100644
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@@ -89,6 +89,14 @@
   "announcement.announcement": "Anuncio",
   "attachments_list.unprocessed": "(sen procesar)",
   "audio.hide": "Agochar audio",
+  "block_modal.remote_users_caveat": "Ímoslle pedir ao servidor {domain} que respecte a túa decisión. Emporiso, non hai garantía de que atenda a petición xa que os servidores xestionan os bloqueos de formas diferentes. As publicacións públicas poderían aínda ser visibles para usuarias que non iniciaron sesión.",
+  "block_modal.show_less": "Mostrar menos",
+  "block_modal.show_more": "Mostrar máis",
+  "block_modal.they_cant_mention": "Non te pode seguir nin mencionar.",
+  "block_modal.they_cant_see_posts": "Non pode ver as túas publicacións nin ti as de ela.",
+  "block_modal.they_will_know": "Pode ver que a bloqueaches.",
+  "block_modal.title": "Bloquear usuaria?",
+  "block_modal.you_wont_see_mentions": "Non verás publicacións que a mencionen.",
   "boost_modal.combo": "Preme {combo} para ignorar isto na seguinte vez",
   "bundle_column_error.copy_stacktrace": "Copiar informe do erro",
   "bundle_column_error.error.body": "Non se puido mostrar a páxina solicitada. Podería deberse a un problema no código, ou incompatiblidade co navegador.",
@@ -169,6 +177,7 @@
   "confirmations.delete_list.message": "Tes a certeza de querer eliminar de xeito permanente esta listaxe?",
   "confirmations.discard_edit_media.confirm": "Descartar",
   "confirmations.discard_edit_media.message": "Tes cambios sen gardar para a vista previa ou descrición do multimedia, descartamos os cambios?",
+  "confirmations.domain_block.confirm": "Bloquear servidor",
   "confirmations.domain_block.message": "Tes a certeza de querer bloquear todo de {domain}? Na meirande parte dos casos uns bloqueos ou silenciados específicos son suficientes. Non verás máis o contido deste dominio en ningunha cronoloxía pública ou nas túas notificacións. As túas seguidoras deste dominio serán eliminadas.",
   "confirmations.edit.confirm": "Editar",
   "confirmations.edit.message": "Ao editar sobrescribirás a mensaxe que estás a compor. Tes a certeza de que queres continuar?",
@@ -200,6 +209,27 @@
   "dismissable_banner.explore_statuses": "Estas son as publicacións da web social que hoxe están gañando popularidade. As publicacións con máis promocións e favorecemento teñen puntuación máis alta.",
   "dismissable_banner.explore_tags": "Estes cancelos están gañando popularidade entre as persoas deste servidor e noutros servidores da rede descentralizada.",
   "dismissable_banner.public_timeline": "Estas son as publicacións públicas máis recentes das persoas que as usuarias de {domain} están a seguir.",
+  "domain_block_modal.block": "Bloquear servidor",
+  "domain_block_modal.block_account_instead": "Prefiro bloquear a @{name}",
+  "domain_block_modal.they_can_interact_with_old_posts": "As persoas deste servidor poden interactuar coas túas publicacións antigas.",
+  "domain_block_modal.they_cant_follow": "Ninguén deste servidor pode seguirte.",
+  "domain_block_modal.they_wont_know": "Non saberá que a bloqueaches.",
+  "domain_block_modal.title": "Bloquear dominio?",
+  "domain_block_modal.you_will_lose_followers": "Vanse eliminar todas as túas seguidoras deste servidor.",
+  "domain_block_modal.you_wont_see_posts": "Non verás publicacións ou notificación das usuarias neste servidor.",
+  "domain_pill.activitypub_lets_connect": "Permíteche conectar e interactuar con persoas non só de Mastodon, se non tamén con outras apps sociais.",
+  "domain_pill.activitypub_like_language": "ActivityPub é algo así como o idioma que Mastodon fala con outras redes sociais.",
+  "domain_pill.server": "Servidor",
+  "domain_pill.their_handle": "O seu alcume:",
+  "domain_pill.their_server": "O seu fogar dixital, onde están as súas publicacións.",
+  "domain_pill.their_username": "O seu identificador único no seu servidor. É posible atopar usuarias co mesmo nome de usuaria en diferentes servidores.",
+  "domain_pill.username": "Nome de usuaria",
+  "domain_pill.whats_in_a_handle": "Que é o alcume?",
+  "domain_pill.who_they_are": "O alcume dinos quen é esa persoa e onde está, para que poidas interactuar con ela en toda a web social de <button>plataformas ActivityPub</button>.",
+  "domain_pill.who_you_are": "Como o teu alcume informa de quen es e onde estás, as persoas poden interactuar contigo desde toda a web social de <button>plataformas ActivityPub</button>.",
+  "domain_pill.your_handle": "O teu alcume:",
+  "domain_pill.your_server": "O teu fogar dixital, onde están as túas publicacións. Non é do teu agrado? Podes cambiar de servidor cando queiras levando as túas seguidoras contigo.",
+  "domain_pill.your_username": "O teu identificador único neste servidor. É posible que atopes usuarias co mesmo nome de usuaria en outros servidores.",
   "embed.instructions": "Engade esta publicación ó teu sitio web copiando o seguinte código.",
   "embed.preview": "Así será mostrado:",
   "emoji_button.activity": "Actividade",
@@ -397,6 +427,15 @@
   "loading_indicator.label": "Estase a cargar…",
   "media_gallery.toggle_visible": "Agochar {number, plural, one {imaxe} other {imaxes}}",
   "moved_to_account_banner.text": "A túa conta {disabledAccount} está actualmente desactivada porque movéchela a {movedToAccount}.",
+  "mute_modal.hide_from_notifications": "Ocultar nas notificacións",
+  "mute_modal.hide_options": "Opcións ao ocultar",
+  "mute_modal.indefinite": "Ata que as reactive",
+  "mute_modal.show_options": "Mostrar opcións",
+  "mute_modal.they_can_mention_and_follow": "Pódete mencionar e seguirte, pero non o verás.",
+  "mute_modal.they_wont_know": "Non saberá que a acalaches.",
+  "mute_modal.title": "Acalar usuaria?",
+  "mute_modal.you_wont_see_mentions": "Non verás as publicacións que a mencionen.",
+  "mute_modal.you_wont_see_posts": "Seguirá podendo ler as túas publicacións, pero non verás as súas.",
   "navigation_bar.about": "Acerca de",
   "navigation_bar.advanced_interface": "Abrir coa interface web avanzada",
   "navigation_bar.blocks": "Usuarias bloqueadas",
diff --git a/app/javascript/mastodon/locales/ia.json b/app/javascript/mastodon/locales/ia.json
index 7418b213e7360a..e587dbc52c12b1 100644
--- a/app/javascript/mastodon/locales/ia.json
+++ b/app/javascript/mastodon/locales/ia.json
@@ -3,7 +3,10 @@
   "about.contact": "Contacto:",
   "about.disclaimer": "Mastodon es software libere, de codice aperte, e un marca de Mastodon gGmbH.",
   "about.domain_blocks.no_reason_available": "Ration non disponibile",
+  "about.domain_blocks.preamble": "Mastodon generalmente permitte vider contento ab e interacter con usatores ab ulle altere servitor in le fediverso. Iste es le exceptiones que ha essite facite in iste servitor particular.",
+  "about.domain_blocks.silenced.explanation": "Generalmente non videras perfiles e contento de iste servitor, a minus que tu expressemente lo cerca o opta pro lo per sequer.",
   "about.domain_blocks.silenced.title": "Limitate",
+  "about.domain_blocks.suspended.explanation": "Nulle data de iste servitor essera processate, immagazinate o scambiate, faciente qualcunque interaction o communication con usatores de iste servitor impossibile.",
   "about.domain_blocks.suspended.title": "Suspendite",
   "about.not_available": "Iste information non faceva disponibile in iste servitor.",
   "about.rules": "Regulas del servitor",
@@ -71,6 +74,7 @@
   "alert.unexpected.message": "Ocurreva un error inexpectate.",
   "announcement.announcement": "Annuncio",
   "audio.hide": "Celar audio",
+  "bundle_column_error.error.title": "Oh, non!",
   "bundle_column_error.network.title": "Error de rete",
   "bundle_column_error.retry": "Tentar novemente",
   "bundle_column_error.return": "Retornar al initio",
diff --git a/app/javascript/mastodon/locales/ne.json b/app/javascript/mastodon/locales/ne.json
index aef23c8566c985..500261a34be6e1 100644
--- a/app/javascript/mastodon/locales/ne.json
+++ b/app/javascript/mastodon/locales/ne.json
@@ -54,6 +54,8 @@
   "block_modal.remote_users_caveat": "हामी सर्भर {domain} लाई तपाईंको निर्णयको सम्मान गर्न सोध्नेछौं। तर, हामी अनुपालनको ग्यारेन्टी दिन सक्दैनौं किनभने केही सर्भरहरूले ब्लकहरू फरक रूपमा ह्यान्डल गर्न सक्छन्। सार्वजनिक पोस्टहरू लग इन नभएका प्रयोगकर्ताहरूले देख्न सक्छन्।",
   "block_modal.show_less": "कम देखाउनुहोस्",
   "block_modal.show_more": "थप देखाउनुहोस्",
+  "bundle_column_error.copy_stacktrace": "त्रुटि रिपोर्ट प्रतिलिपि गर्नुहोस्",
+  "bundle_column_error.network.title": "नेटवर्क त्रुटि",
   "bundle_column_error.retry": "पुन: प्रयास गर्नुहोस्",
   "bundle_modal_error.close": "बन्द गर्नुहोस्",
   "bundle_modal_error.message": "यो कम्पोनेन्ट लोड गर्दा केही गडबड भयो।",
diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json
index 71272213a80a1c..30313d92f44821 100644
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@@ -89,7 +89,7 @@
   "announcement.announcement": "公告",
   "attachments_list.unprocessed": "（未經處理）",
   "audio.hide": "隱藏音訊",
-  "block_modal.remote_users_caveat": "我們會要求 {domain} 伺服器尊重您的決定。然而，我們無法保證所有伺服器都會遵守，某些伺服器可能以不同方式處理封鎖。未登入之使用者仍可能看到您的公開嘟文。",
+  "block_modal.remote_users_caveat": "我們會要求 {domain} 伺服器尊重您的決定。然而，我們無法保證所有伺服器皆會遵守，某些伺服器可能以不同方式處理封鎖。未登入之使用者仍可能看見您的公開嘟文。",
   "block_modal.show_less": "減少顯示",
   "block_modal.show_more": "顯示更多",
   "block_modal.they_cant_mention": "他們無法提及或跟隨您。",
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index dc4a62f701c4f8..57249d2ca961be 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -1865,6 +1865,9 @@ gl:
       follows_subtitle: Sigue estas contas populares
       follows_title: A quen seguir
       follows_view_more: Ver máis persoas para seguir
+      hashtags_recent_count:
+        one: "%{people} persoa nos últimos 2 días"
+        other: "%{people} persoas nos últimos 2 días"
       hashtags_subtitle: Descubre os temas en voga nos últimos 2 días
       hashtags_title: Cancelos en voga
       hashtags_view_more: Ver máis cancelos en voga
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index bb3bd27b507b46..b9efeee46e8e88 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -1833,6 +1833,8 @@ vi:
       follows_subtitle: Theo dõi những người thú vị
       follows_title: Gợi ý theo dõi
       follows_view_more: Xem thêm những người khác
+      hashtags_recent_count:
+        other: "%{people} người dùng trong 2 ngày qua"
       hashtags_subtitle: Khám phá xu hướng 2 ngày qua
       hashtags_title: Hashtag xu hướng
       hashtags_view_more: Xem thêm hashtag xu hướng

From 6c68c3c0ce610a7d816249e2f8139863c3129047 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 19 Mar 2024 05:03:15 -0400
Subject: [PATCH 0509/2191] Introduce `inline_svg` gem, minimal usage, prep for
 material design icons (#29612)

---
 Gemfile                           | 1 +
 Gemfile.lock                      | 4 ++++
 app/helpers/application_helper.rb | 2 +-
 app/javascript/images/check.svg   | 4 ++++
 config/initializers/propshaft.rb  | 3 +++
 5 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 app/javascript/images/check.svg
 create mode 100644 config/initializers/propshaft.rb

diff --git a/Gemfile b/Gemfile
index d3bfeb44870733..3a1ff81d43d8f8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -59,6 +59,7 @@ gem 'http', '~> 5.1'
 gem 'http_accept_language', '~> 2.1'
 gem 'httplog', '~> 1.6.2'
 gem 'idn-ruby', require: 'idn'
+gem 'inline_svg'
 gem 'kaminari', '~> 1.2'
 gem 'link_header', '~> 0.0'
 gem 'mime-types', '~> 3.5.0', require: 'mime/types/columnar'
diff --git a/Gemfile.lock b/Gemfile.lock
index 9de472091ccf4c..9c5bb940bc4de8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -350,6 +350,9 @@ GEM
       rainbow (>= 2.2.2, < 4.0)
       terminal-table (>= 1.5.1)
     idn-ruby (0.1.5)
+    inline_svg (1.9.0)
+      activesupport (>= 3.0)
+      nokogiri (>= 1.6)
     io-console (0.7.2)
     irb (1.12.0)
       rdoc
@@ -865,6 +868,7 @@ DEPENDENCIES
   httplog (~> 1.6.2)
   i18n-tasks (~> 1.0)
   idn-ruby
+  inline_svg
   irb (~> 1.8)
   json-ld
   json-ld-preloaded (~> 3.2)
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 7dc7d60808fe40..668afe7fde13d9 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -114,7 +114,7 @@ def fa_icon(icon, attributes = {})
   end
 
   def check_icon
-    content_tag(:svg, tag.path('fill-rule': 'evenodd', 'clip-rule': 'evenodd', d: 'M16.704 4.153a.75.75 0 01.143 1.052l-8 10.5a.75.75 0 01-1.127.075l-4.5-4.5a.75.75 0 011.06-1.06l3.894 3.893 7.48-9.817a.75.75 0 011.05-.143z'), xmlns: 'http://www.w3.org/2000/svg', viewBox: '0 0 20 20', fill: 'currentColor')
+    inline_svg_tag 'check.svg'
   end
 
   def visibility_icon(status)
diff --git a/app/javascript/images/check.svg b/app/javascript/images/check.svg
new file mode 100644
index 00000000000000..8a0ebe878d18c1
--- /dev/null
+++ b/app/javascript/images/check.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor">
+    <path fill-rule="evenodd" clip-rule="evenodd"
+        d="M16.704 4.153a.75.75 0 01.143 1.052l-8 10.5a.75.75 0 01-1.127.075l-4.5-4.5a.75.75 0 011.06-1.06l3.894 3.893 7.48-9.817a.75.75 0 011.05-.143z" />
+</svg>
\ No newline at end of file
diff --git a/config/initializers/propshaft.rb b/config/initializers/propshaft.rb
new file mode 100644
index 00000000000000..6cf368d5b7dd41
--- /dev/null
+++ b/config/initializers/propshaft.rb
@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+Rails.application.config.assets.paths << Rails.root.join('app', 'javascript', 'images')

From caee5e4d6a35c925e6a73933d85e4f14b5b36d8d Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 19 Mar 2024 10:11:38 +0100
Subject: [PATCH 0510/2191] Update dependency core-js to v3.36.1 (#29642)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index dd80cc8430fb2d..d5e53d23f2c93d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5900,9 +5900,9 @@ __metadata:
   linkType: hard
 
 "core-js@npm:^3.30.2":
-  version: 3.36.0
-  resolution: "core-js@npm:3.36.0"
-  checksum: 10c0/62dcb41ba79ead581e4c5b2740ae18bfe6ee230e853893736d16edb01b580574d8645ff6c5513d1c75d59620f8451aee45c119d3c4f5ebc66cff5f003a816864
+  version: 3.36.1
+  resolution: "core-js@npm:3.36.1"
+  checksum: 10c0/4f0ad2464535d809ba659226feca15bff14b9b5452518bddff8d81b9c94b0227b3027d9838f22f1dce664958acb4107b935cc0037695ae545edc2a303bca98bf
   languageName: node
   linkType: hard
 

From 42cdd0c095de63c8e2e1655e6338217b7a24b7a3 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 19 Mar 2024 14:00:39 +0100
Subject: [PATCH 0511/2191] Update babel monorepo to v7.24.1 (#29645)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 1000 ++++++++++++++++++++++++++---------------------------
 1 file changed, 500 insertions(+), 500 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index d5e53d23f2c93d..8d504c719a74b8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -42,55 +42,55 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.10.4, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.23.5":
-  version: 7.23.5
-  resolution: "@babel/code-frame@npm:7.23.5"
+"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.10.4, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.23.5, @babel/code-frame@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/code-frame@npm:7.24.1"
   dependencies:
-    "@babel/highlight": "npm:^7.23.4"
-    chalk: "npm:^2.4.2"
-  checksum: 10c0/a10e843595ddd9f97faa99917414813c06214f4d9205294013e20c70fbdf4f943760da37dec1d998bf3e6fc20fa2918a47c0e987a7e458663feb7698063ad7c6
+    "@babel/highlight": "npm:^7.24.1"
+    picocolors: "npm:^1.0.0"
+  checksum: 10c0/c92f4244538089c95f0322c5e8f6c2287529a576ae9ab254366a073c8720ecb537e7009d5d79a6a5698d3b658b298fc77691c05608cafbe4957cab03033ada15
   languageName: node
   linkType: hard
 
-"@babel/compat-data@npm:^7.22.6, @babel/compat-data@npm:^7.23.5":
-  version: 7.23.5
-  resolution: "@babel/compat-data@npm:7.23.5"
-  checksum: 10c0/081278ed46131a890ad566a59c61600a5f9557bd8ee5e535890c8548192532ea92590742fd74bd9db83d74c669ef8a04a7e1c85cdea27f960233e3b83c3a957c
+"@babel/compat-data@npm:^7.22.6, @babel/compat-data@npm:^7.23.5, @babel/compat-data@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/compat-data@npm:7.24.1"
+  checksum: 10c0/8a1935450345c326b14ea632174696566ef9b353bd0d6fb682456c0774342eeee7654877ced410f24a731d386fdcbf980b75083fc764964d6f816b65792af2f5
   languageName: node
   linkType: hard
 
 "@babel/core@npm:^7.10.4, @babel/core@npm:^7.11.1, @babel/core@npm:^7.11.6, @babel/core@npm:^7.12.3, @babel/core@npm:^7.22.1":
-  version: 7.24.0
-  resolution: "@babel/core@npm:7.24.0"
+  version: 7.24.1
+  resolution: "@babel/core@npm:7.24.1"
   dependencies:
     "@ampproject/remapping": "npm:^2.2.0"
-    "@babel/code-frame": "npm:^7.23.5"
-    "@babel/generator": "npm:^7.23.6"
+    "@babel/code-frame": "npm:^7.24.1"
+    "@babel/generator": "npm:^7.24.1"
     "@babel/helper-compilation-targets": "npm:^7.23.6"
     "@babel/helper-module-transforms": "npm:^7.23.3"
-    "@babel/helpers": "npm:^7.24.0"
-    "@babel/parser": "npm:^7.24.0"
+    "@babel/helpers": "npm:^7.24.1"
+    "@babel/parser": "npm:^7.24.1"
     "@babel/template": "npm:^7.24.0"
-    "@babel/traverse": "npm:^7.24.0"
+    "@babel/traverse": "npm:^7.24.1"
     "@babel/types": "npm:^7.24.0"
     convert-source-map: "npm:^2.0.0"
     debug: "npm:^4.1.0"
     gensync: "npm:^1.0.0-beta.2"
     json5: "npm:^2.2.3"
     semver: "npm:^6.3.1"
-  checksum: 10c0/bb37cbf0bdfd676b246af0a3d9a7932d10573f2d45114fdda02a71889e35530ce13d8930177e78b065d6734b8d45a4fbf7c77f223b1d44b4a28cfe5fefee93ed
+  checksum: 10c0/b085b0bc65c225f20b9d5f7b05c8b127c005a73c355d4a7480f099de5d6757abafa7f60786eb95e6d098a6b5c34618e7b0950d60ef55139db04d8767d410e0a9
   languageName: node
   linkType: hard
 
-"@babel/generator@npm:^7.23.6, @babel/generator@npm:^7.7.2":
-  version: 7.23.6
-  resolution: "@babel/generator@npm:7.23.6"
+"@babel/generator@npm:^7.24.1, @babel/generator@npm:^7.7.2":
+  version: 7.24.1
+  resolution: "@babel/generator@npm:7.24.1"
   dependencies:
-    "@babel/types": "npm:^7.23.6"
-    "@jridgewell/gen-mapping": "npm:^0.3.2"
-    "@jridgewell/trace-mapping": "npm:^0.3.17"
+    "@babel/types": "npm:^7.24.0"
+    "@jridgewell/gen-mapping": "npm:^0.3.5"
+    "@jridgewell/trace-mapping": "npm:^0.3.25"
     jsesc: "npm:^2.5.1"
-  checksum: 10c0/53540e905cd10db05d9aee0a5304e36927f455ce66f95d1253bb8a179f286b88fa7062ea0db354c566fe27f8bb96567566084ffd259f8feaae1de5eccc8afbda
+  checksum: 10c0/f0eea7497657cdf68cfb4b7d181588e1498eefd1f303d73b0d8ca9b21a6db27136a6f5beb8f988b6bdcd4249870826080950450fd310951de42ecf36df274881
   languageName: node
   linkType: hard
 
@@ -122,7 +122,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-compilation-targets@npm:^7.22.15, @babel/helper-compilation-targets@npm:^7.22.6, @babel/helper-compilation-targets@npm:^7.23.6":
+"@babel/helper-compilation-targets@npm:^7.22.6, @babel/helper-compilation-targets@npm:^7.23.6":
   version: 7.23.6
   resolution: "@babel/helper-compilation-targets@npm:7.23.6"
   dependencies:
@@ -135,22 +135,22 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-create-class-features-plugin@npm:^7.22.15":
-  version: 7.22.15
-  resolution: "@babel/helper-create-class-features-plugin@npm:7.22.15"
+"@babel/helper-create-class-features-plugin@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/helper-create-class-features-plugin@npm:7.24.1"
   dependencies:
     "@babel/helper-annotate-as-pure": "npm:^7.22.5"
-    "@babel/helper-environment-visitor": "npm:^7.22.5"
-    "@babel/helper-function-name": "npm:^7.22.5"
-    "@babel/helper-member-expression-to-functions": "npm:^7.22.15"
+    "@babel/helper-environment-visitor": "npm:^7.22.20"
+    "@babel/helper-function-name": "npm:^7.23.0"
+    "@babel/helper-member-expression-to-functions": "npm:^7.23.0"
     "@babel/helper-optimise-call-expression": "npm:^7.22.5"
-    "@babel/helper-replace-supers": "npm:^7.22.9"
+    "@babel/helper-replace-supers": "npm:^7.24.1"
     "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.22.5"
     "@babel/helper-split-export-declaration": "npm:^7.22.6"
     semver: "npm:^6.3.1"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10c0/2ae5759fe8845fda99b34f2ba6cd0794fc860213d14c93a87aa9180960252bce621157a79c373b7fbb423b25a55fb0e20eae0d5f8e4ad5ef22dc70e7c2af3805
+  checksum: 10c0/45372890634c37deefc81f44b7d958fe210f7da7d8a2239c9849c6041a56536f74bf3aa2d115bc06d5680d0dc49c1303f74a045d76ae0dd1592c7d5c0c268ebc
   languageName: node
   linkType: hard
 
@@ -167,9 +167,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-define-polyfill-provider@npm:^0.5.0":
-  version: 0.5.0
-  resolution: "@babel/helper-define-polyfill-provider@npm:0.5.0"
+"@babel/helper-define-polyfill-provider@npm:^0.6.1":
+  version: 0.6.1
+  resolution: "@babel/helper-define-polyfill-provider@npm:0.6.1"
   dependencies:
     "@babel/helper-compilation-targets": "npm:^7.22.6"
     "@babel/helper-plugin-utils": "npm:^7.22.5"
@@ -178,11 +178,11 @@ __metadata:
     resolve: "npm:^1.14.2"
   peerDependencies:
     "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0
-  checksum: 10c0/2b053b96a0c604a7e0f5c7d13a8a55f4451d938f7af42bd40f62a87df15e6c87a0b1dbd893a0f0bb51077b54dc3ba00a58b166531a5940ad286ab685dd8979ec
+  checksum: 10c0/210e1c8ac118f7c5a0ef5b42c4267c3db2f59b1ebc666a275d442b86896de4a66ef93539d702870f172f9749cd44c89f53056a5b17e619c3142b12ed4e4e6aae
   languageName: node
   linkType: hard
 
-"@babel/helper-environment-visitor@npm:^7.22.20, @babel/helper-environment-visitor@npm:^7.22.5":
+"@babel/helper-environment-visitor@npm:^7.22.20":
   version: 7.22.20
   resolution: "@babel/helper-environment-visitor@npm:7.22.20"
   checksum: 10c0/e762c2d8f5d423af89bd7ae9abe35bd4836d2eb401af868a63bbb63220c513c783e25ef001019418560b3fdc6d9a6fb67e6c0b650bcdeb3a2ac44b5c3d2bdd94
@@ -208,7 +208,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-member-expression-to-functions@npm:^7.22.15":
+"@babel/helper-member-expression-to-functions@npm:^7.23.0":
   version: 7.23.0
   resolution: "@babel/helper-member-expression-to-functions@npm:7.23.0"
   dependencies:
@@ -217,12 +217,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-module-imports@npm:^7.0.0-beta.49, @babel/helper-module-imports@npm:^7.10.4, @babel/helper-module-imports@npm:^7.16.7, @babel/helper-module-imports@npm:^7.22.15":
-  version: 7.22.15
-  resolution: "@babel/helper-module-imports@npm:7.22.15"
+"@babel/helper-module-imports@npm:^7.0.0-beta.49, @babel/helper-module-imports@npm:^7.10.4, @babel/helper-module-imports@npm:^7.16.7, @babel/helper-module-imports@npm:^7.22.15, @babel/helper-module-imports@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/helper-module-imports@npm:7.24.1"
   dependencies:
-    "@babel/types": "npm:^7.22.15"
-  checksum: 10c0/4e0d7fc36d02c1b8c8b3006dfbfeedf7a367d3334a04934255de5128115ea0bafdeb3e5736a2559917f0653e4e437400d54542da0468e08d3cbc86d3bbfa8f30
+    "@babel/types": "npm:^7.24.0"
+  checksum: 10c0/9242a9af73e7eb3fe106d7e55c157149f7f38df6494980744e99fc608103c2ee20726df9596fae722c57ae89c9c304200673b733c3c1c5312385ff26ebd2a4fa
   languageName: node
   linkType: hard
 
@@ -270,16 +270,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-replace-supers@npm:^7.22.20, @babel/helper-replace-supers@npm:^7.22.9":
-  version: 7.22.20
-  resolution: "@babel/helper-replace-supers@npm:7.22.20"
+"@babel/helper-replace-supers@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/helper-replace-supers@npm:7.24.1"
   dependencies:
     "@babel/helper-environment-visitor": "npm:^7.22.20"
-    "@babel/helper-member-expression-to-functions": "npm:^7.22.15"
+    "@babel/helper-member-expression-to-functions": "npm:^7.23.0"
     "@babel/helper-optimise-call-expression": "npm:^7.22.5"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10c0/6b0858811ad46873817c90c805015d63300e003c5a85c147a17d9845fa2558a02047c3cc1f07767af59014b2dd0fa75b503e5bc36e917f360e9b67bb6f1e79f4
+  checksum: 10c0/d39a3df7892b7c3c0e307fb229646168a9bd35e26a72080c2530729322600e8cff5f738f44a14860a2358faffa741b6a6a0d6749f113387b03ddbfa0ec10e1a0
   languageName: node
   linkType: hard
 
@@ -324,7 +324,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-validator-option@npm:^7.22.15, @babel/helper-validator-option@npm:^7.23.5":
+"@babel/helper-validator-option@npm:^7.23.5":
   version: 7.23.5
   resolution: "@babel/helper-validator-option@npm:7.23.5"
   checksum: 10c0/af45d5c0defb292ba6fd38979e8f13d7da63f9623d8ab9ededc394f67eb45857d2601278d151ae9affb6e03d5d608485806cd45af08b4468a0515cf506510e94
@@ -342,70 +342,71 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helpers@npm:^7.24.0":
-  version: 7.24.0
-  resolution: "@babel/helpers@npm:7.24.0"
+"@babel/helpers@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/helpers@npm:7.24.1"
   dependencies:
     "@babel/template": "npm:^7.24.0"
-    "@babel/traverse": "npm:^7.24.0"
+    "@babel/traverse": "npm:^7.24.1"
     "@babel/types": "npm:^7.24.0"
-  checksum: 10c0/dd27c9f11c1c5244ef312fae37636f2fcc69c541c46508017b846c4cf680af059f1922ce84e3f778f123a70d027ded75c96070ee8e906f3bc52dc26dc43df608
+  checksum: 10c0/b3445860ae749fc664682b291f092285e949114e8336784ae29f88eb4c176279b01cc6740005a017a0389ae4b4e928d5bbbc01de7da7e400c972e3d6f792063a
   languageName: node
   linkType: hard
 
-"@babel/highlight@npm:^7.23.4":
-  version: 7.23.4
-  resolution: "@babel/highlight@npm:7.23.4"
+"@babel/highlight@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/highlight@npm:7.24.1"
   dependencies:
     "@babel/helper-validator-identifier": "npm:^7.22.20"
     chalk: "npm:^2.4.2"
     js-tokens: "npm:^4.0.0"
-  checksum: 10c0/fbff9fcb2f5539289c3c097d130e852afd10d89a3a08ac0b5ebebbc055cc84a4bcc3dcfed463d488cde12dd0902ef1858279e31d7349b2e8cee43913744bda33
+    picocolors: "npm:^1.0.0"
+  checksum: 10c0/39520f655101245efd44a6e5997e73e2b977f8e2011897022ec81fa5b0366dbfef5313bdebadbd08186f52b7e9c21b38ba265cc78caa0c6a8c894461e7a70430
   languageName: node
   linkType: hard
 
-"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.24.0":
-  version: 7.24.0
-  resolution: "@babel/parser@npm:7.24.0"
+"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.24.0, @babel/parser@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/parser@npm:7.24.1"
   bin:
     parser: ./bin/babel-parser.js
-  checksum: 10c0/77593d0b9de9906823c4d653bb6cda1c7593837598516330f655f70cba6224a37def7dbe5b4dad0038482d407d8d209eb8be5f48ca9a13357d769f829c5adb8e
+  checksum: 10c0/d2a8b99aa5f33182b69d5569367403a40e7c027ae3b03a1f81fd8ac9b06ceb85b31f6ee4267fb90726dc2ac99909c6bdaa9cf16c379efab73d8dfe85cee32c50
   languageName: node
   linkType: hard
 
-"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:7.23.3"
+"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10c0/356a4e9fc52d7ca761ce6857fc58e2295c2785d22565760e6a5680be86c6e5883ab86e0ba25ef572882c01713d3a31ae6cfa3e3222cdb95e6026671dab1fa415
+  checksum: 10c0/d4e592e6fc4878654243d2e7b51ea86471b868a8cb09de29e73b65d2b64159990c6c198fd7c9c2af2e38b1cddf70206243792853c47384a84f829dada152f605
   languageName: node
   linkType: hard
 
-"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:7.23.3"
+"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
     "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.22.5"
-    "@babel/plugin-transform-optional-chaining": "npm:^7.23.3"
+    "@babel/plugin-transform-optional-chaining": "npm:^7.24.1"
   peerDependencies:
     "@babel/core": ^7.13.0
-  checksum: 10c0/a8785f099d55ca71ed89815e0f3a636a80c16031f80934cfec17c928d096ee0798964733320c8b145ef36ba429c5e19d5107b06231e0ab6777cfb0f01adfdc23
+  checksum: 10c0/351c36e45795a7890d610ab9041a52f4078a59429f6e74c281984aa44149a10d43e82b3a8172c703c0d5679471e165d1c02b6d2e45a677958ee301b89403f202
   languageName: node
   linkType: hard
 
-"@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@npm:^7.23.7":
-  version: 7.23.7
-  resolution: "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@npm:7.23.7"
+"@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@npm:7.24.1"
   dependencies:
     "@babel/helper-environment-visitor": "npm:^7.22.20"
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10c0/355746e21ad7f43e4f4daef54cfe2ef461ecd19446b2afedd53c39df1bf9aa2eeeeaabee2279b1321de89a97c9360e4f76e9ba950fee50ff1676c25f6929d625
+  checksum: 10c0/d7dd5a59a54635a3152895dcaa68f3370bb09d1f9906c1e72232ff759159e6be48de4a598a993c986997280a2dc29922a48aaa98020f16439f3f57ad72788354
   languageName: node
   linkType: hard
 
@@ -484,25 +485,25 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-syntax-import-assertions@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-syntax-import-assertions@npm:7.23.3"
+"@babel/plugin-syntax-import-assertions@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-syntax-import-assertions@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/7db8b59f75667bada2293353bb66b9d5651a673b22c72f47da9f5c46e719142481601b745f9822212fd7522f92e26e8576af37116f85dae1b5e5967f80d0faab
+  checksum: 10c0/72f0340d73e037f0702c61670054e0af66ece7282c5c2f4ba8de059390fee502de282defdf15959cd9f71aa18dc5c5e4e7a0fde317799a0600c6c4e0a656d82b
   languageName: node
   linkType: hard
 
-"@babel/plugin-syntax-import-attributes@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-syntax-import-attributes@npm:7.23.3"
+"@babel/plugin-syntax-import-attributes@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-syntax-import-attributes@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/99b40d33d79205a8e04bb5dea56fd72906ffc317513b20ca7319e7683e18fce8ea2eea5e9171056f92b979dc0ab1e31b2cb5171177a5ba61e05b54fe7850a606
+  checksum: 10c0/309634e3335777aee902552b2cf244c4a8050213cc878b3fb9d70ad8cbbff325dc46ac5e5791836ff477ea373b27832238205f6ceaff81f7ea7c4c7e8fbb13bb
   languageName: node
   linkType: hard
 
@@ -528,14 +529,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-syntax-jsx@npm:7, @babel/plugin-syntax-jsx@npm:^7.22.5, @babel/plugin-syntax-jsx@npm:^7.23.3, @babel/plugin-syntax-jsx@npm:^7.7.2":
-  version: 7.23.3
-  resolution: "@babel/plugin-syntax-jsx@npm:7.23.3"
+"@babel/plugin-syntax-jsx@npm:7, @babel/plugin-syntax-jsx@npm:^7.23.3, @babel/plugin-syntax-jsx@npm:^7.24.1, @babel/plugin-syntax-jsx@npm:^7.7.2":
+  version: 7.24.1
+  resolution: "@babel/plugin-syntax-jsx@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/563bb7599b868773f1c7c1d441ecc9bc53aeb7832775da36752c926fc402a1fa5421505b39e724f71eb217c13e4b93117e081cac39723b0e11dac4c897f33c3e
+  checksum: 10c0/6cec76fbfe6ca81c9345c2904d8d9a8a0df222f9269f0962ed6eb2eb8f3f10c2f15e993d1ef09dbaf97726bf1792b5851cf5bd9a769f966a19448df6be95d19a
   languageName: node
   linkType: hard
 
@@ -627,14 +628,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-syntax-typescript@npm:^7.23.3, @babel/plugin-syntax-typescript@npm:^7.7.2":
-  version: 7.23.3
-  resolution: "@babel/plugin-syntax-typescript@npm:7.23.3"
+"@babel/plugin-syntax-typescript@npm:^7.24.1, @babel/plugin-syntax-typescript@npm:^7.7.2":
+  version: 7.24.1
+  resolution: "@babel/plugin-syntax-typescript@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/4d6e9cdb9d0bfb9bd9b220fc951d937fce2ca69135ec121153572cebe81d86abc9a489208d6b69ee5f10cadcaeffa10d0425340a5029e40e14a6025021b90948
+  checksum: 10c0/7a81e277dcfe3138847e8e5944e02a42ff3c2e864aea6f33fd9b70d1556d12b0e70f0d56cc1985d353c91bcbf8fe163e6cc17418da21129b7f7f1d8b9ac00c93
   languageName: node
   linkType: hard
 
@@ -650,310 +651,310 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-arrow-functions@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-arrow-functions@npm:7.23.3"
+"@babel/plugin-transform-arrow-functions@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-arrow-functions@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/b128315c058f5728d29b0b78723659b11de88247ea4d0388f0b935cddf60a80c40b9067acf45cbbe055bd796928faef152a09d9e4a0695465aca4394d9f109ca
+  checksum: 10c0/f44bfacf087dc21b422bab99f4e9344ee7b695b05c947dacae66de05c723ab9d91800be7edc1fa016185e8c819f3aca2b4a5f66d8a4d1e47d9bad80b8fa55b8e
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-async-generator-functions@npm:^7.23.9":
-  version: 7.23.9
-  resolution: "@babel/plugin-transform-async-generator-functions@npm:7.23.9"
+"@babel/plugin-transform-async-generator-functions@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-async-generator-functions@npm:7.24.1"
   dependencies:
     "@babel/helper-environment-visitor": "npm:^7.22.20"
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
     "@babel/helper-remap-async-to-generator": "npm:^7.22.20"
     "@babel/plugin-syntax-async-generators": "npm:^7.8.4"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/4ff75f9ce500e1de8c0236fa5122e6475a477d19cb9a4c2ae8651e78e717ebb2e2cecfeca69d420def779deaec78b945843b9ffd15f02ecd7de5072030b4469b
+  checksum: 10c0/c207cb6b3b7dcb5cd9b22ce5a063493ec7534a21375cb987ad079eee6cc5cae573bd3c97af91fbf0ee47cae1d3f8632c4387885aeab0eedece5652dc4e6b9f1c
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-async-to-generator@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-async-to-generator@npm:7.23.3"
+"@babel/plugin-transform-async-to-generator@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-async-to-generator@npm:7.24.1"
   dependencies:
-    "@babel/helper-module-imports": "npm:^7.22.15"
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-module-imports": "npm:^7.24.1"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
     "@babel/helper-remap-async-to-generator": "npm:^7.22.20"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/da3ffd413eef02a8e2cfee3e0bb0d5fc0fcb795c187bc14a5a8e8874cdbdc43bbf00089c587412d7752d97efc5967c3c18ff5398e3017b9a14a06126f017e7e9
+  checksum: 10c0/3731ba8e83cbea1ab22905031f25b3aeb0b97c6467360a2cc685352f16e7c786417d8883bc747f5a0beff32266bdb12a05b6292e7b8b75967087200a7bc012c4
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-block-scoped-functions@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-block-scoped-functions@npm:7.23.3"
+"@babel/plugin-transform-block-scoped-functions@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-block-scoped-functions@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/82c12a11277528184a979163de7189ceb00129f60dd930b0d5313454310bf71205f302fb2bf0430247161c8a22aaa9fb9eec1459f9f7468206422c191978fd59
+  checksum: 10c0/6fbaa85f5204f34845dfc0bebf62fdd3ac5a286241c85651e59d426001e7a1785ac501f154e093e0b8ee49e1f51e3f8b06575a5ae8d4a9406d43e4816bf18c37
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-block-scoping@npm:^7.23.4":
-  version: 7.23.4
-  resolution: "@babel/plugin-transform-block-scoping@npm:7.23.4"
+"@babel/plugin-transform-block-scoping@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-block-scoping@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/83006804dddf980ab1bcd6d67bc381e24b58c776507c34f990468f820d0da71dba3697355ca4856532fa2eeb2a1e3e73c780f03760b5507a511cbedb0308e276
+  checksum: 10c0/1a230ad95d9672626831e22df9b4838901681fa11d44c3811d71ca64ea53f5e87de2abef865f70fe62657053278d9034cc4ea3bab0fd3300bdf9e73b3f85f97a
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-class-properties@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-class-properties@npm:7.23.3"
+"@babel/plugin-transform-class-properties@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-class-properties@npm:7.24.1"
   dependencies:
-    "@babel/helper-create-class-features-plugin": "npm:^7.22.15"
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-create-class-features-plugin": "npm:^7.24.1"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/bca30d576f539eef216494b56d610f1a64aa9375de4134bc021d9660f1fa735b1d7cc413029f22abc0b7cb737e3a57935c8ae9d8bd1730921ccb1deebce51bfd
+  checksum: 10c0/00dff042ac9df4ae67b5ef98b1137cc72e0a24e6d911dc200540a8cb1f00b4cff367a922aeb22da17da662079f0abcd46ee1c5f4cdf37ceebf6ff1639bb9af27
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-class-static-block@npm:^7.23.4":
-  version: 7.23.4
-  resolution: "@babel/plugin-transform-class-static-block@npm:7.23.4"
+"@babel/plugin-transform-class-static-block@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-class-static-block@npm:7.24.1"
   dependencies:
-    "@babel/helper-create-class-features-plugin": "npm:^7.22.15"
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-create-class-features-plugin": "npm:^7.24.1"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
     "@babel/plugin-syntax-class-static-block": "npm:^7.14.5"
   peerDependencies:
     "@babel/core": ^7.12.0
-  checksum: 10c0/fdca96640ef29d8641a7f8de106f65f18871b38cc01c0f7b696d2b49c76b77816b30a812c08e759d06dd10b4d9b3af6b5e4ac22a2017a88c4077972224b77ab0
+  checksum: 10c0/3095d02b7932890b82346d42200a89a56b6ca7d25a69a94242ab5b1772f18138b8e639358dd70d23add2df8b0d1640e1e13729c2c275ecce550cbe89048ba85f
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-classes@npm:^7.23.8":
-  version: 7.23.8
-  resolution: "@babel/plugin-transform-classes@npm:7.23.8"
+"@babel/plugin-transform-classes@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-classes@npm:7.24.1"
   dependencies:
     "@babel/helper-annotate-as-pure": "npm:^7.22.5"
     "@babel/helper-compilation-targets": "npm:^7.23.6"
     "@babel/helper-environment-visitor": "npm:^7.22.20"
     "@babel/helper-function-name": "npm:^7.23.0"
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
-    "@babel/helper-replace-supers": "npm:^7.22.20"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-replace-supers": "npm:^7.24.1"
     "@babel/helper-split-export-declaration": "npm:^7.22.6"
     globals: "npm:^11.1.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/227ac5166501e04d9e7fbd5eda6869b084ffa4af6830ac12544ac6ea14953ca00eb1762b0df9349c0f6c8d2a799385910f558066cd0fb85b9ca437b1131a6043
+  checksum: 10c0/586a95826be4d68056fa23d8e6c34353ce2ea59bf3ca8cf62bc784e60964d492d76e1b48760c43fd486ffb65a79d3fed9a4f91289e4f526f88c3b6acc0dfb00e
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-computed-properties@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-computed-properties@npm:7.23.3"
+"@babel/plugin-transform-computed-properties@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-computed-properties@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
-    "@babel/template": "npm:^7.22.15"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/template": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/3ca8a006f8e652b58c21ecb84df1d01a73f0a96b1d216fd09a890b235dd90cb966b152b603b88f7e850ae238644b1636ce5c30b7c029c0934b43383932372e4a
+  checksum: 10c0/8292c508b656b7722e2c2ca0f6f31339852e3ed2b9b80f6e068a4010e961b431ca109ecd467fc906283f4b1574c1e7b1cb68d35a4dea12079d386c15ff7e0eac
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-destructuring@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-destructuring@npm:7.23.3"
+"@babel/plugin-transform-destructuring@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-destructuring@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/717e9a62c1b0c93c507f87b4eaf839ec08d3c3147f14d74ae240d8749488d9762a8b3950132be620a069bde70f4b3e4ee9867b226c973fcc40f3cdec975cde71
+  checksum: 10c0/a08e706a9274a699abc3093f38c72d4a5354eac11c44572cc9ea049915b6e03255744297069fd94fcce82380725c5d6b1b11b9a84c0081aa3aa6fc2fdab98ef6
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-dotall-regex@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-dotall-regex@npm:7.23.3"
+"@babel/plugin-transform-dotall-regex@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-dotall-regex@npm:7.24.1"
   dependencies:
     "@babel/helper-create-regexp-features-plugin": "npm:^7.22.15"
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/6c89286d1277c2a63802a453c797c87c1203f89e4c25115f7b6620f5fce15d8c8d37af613222f6aa497aa98773577a6ec8752e79e13d59bc5429270677ea010b
+  checksum: 10c0/758def705ec5a87ef910280dc2df5d2fda59dc5d4771c1725c7aed0988ae5b79e29aeb48109120301a3e1c6c03dfac84700469de06f38ca92c96834e09eadf5d
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-duplicate-keys@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-duplicate-keys@npm:7.23.3"
+"@babel/plugin-transform-duplicate-keys@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-duplicate-keys@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/7e2640e4e6adccd5e7b0615b6e9239d7c98363e21c52086ea13759dfa11cf7159b255fc5331c2de435639ea8eb6acefae115ae0d797a3d19d12587652f8052a5
+  checksum: 10c0/41072f57f83a6c2b15f3ee0b6779cdca105ff3d98061efe92ac02d6c7b90fdb6e7e293b8a4d5b9c690d9ae5d3ae73e6bde4596dc4d8c66526a0e5e1abc73c88c
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-dynamic-import@npm:^7.23.4":
-  version: 7.23.4
-  resolution: "@babel/plugin-transform-dynamic-import@npm:7.23.4"
+"@babel/plugin-transform-dynamic-import@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-dynamic-import@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
     "@babel/plugin-syntax-dynamic-import": "npm:^7.8.3"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/19ae4a4a2ca86d35224734c41c48b2aa6a13139f3cfa1cbd18c0e65e461de8b65687dec7e52b7a72bb49db04465394c776aa1b13a2af5dc975b2a0cde3dcab67
+  checksum: 10c0/7e2834780e9b5251ef341854043a89c91473b83c335358620ca721554877e64e416aeb3288a35f03e825c4958e07d5d00ead08c4490fadc276a21fe151d812f1
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-exponentiation-operator@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-exponentiation-operator@npm:7.23.3"
+"@babel/plugin-transform-exponentiation-operator@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-exponentiation-operator@npm:7.24.1"
   dependencies:
     "@babel/helper-builder-binary-assignment-operator-visitor": "npm:^7.22.15"
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/5c33ee6a1bdc52fcdf0807f445b27e3fbdce33008531885e65a699762327565fffbcfde8395be7f21bcb22d582e425eddae45650c986462bb84ba68f43687516
+  checksum: 10c0/f0fc4c5a9add25fd6bf23dabe6752e9b7c0a2b2554933dddfd16601245a2ba332b647951079c782bf3b94c6330e3638b9b4e0227f469a7c1c707446ba0eba6c7
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-export-namespace-from@npm:^7.23.4":
-  version: 7.23.4
-  resolution: "@babel/plugin-transform-export-namespace-from@npm:7.23.4"
+"@babel/plugin-transform-export-namespace-from@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-export-namespace-from@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
     "@babel/plugin-syntax-export-namespace-from": "npm:^7.8.3"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/38bf04f851e36240bbe83ace4169da626524f4107bfb91f05b4ad93a5fb6a36d5b3d30b8883c1ba575ccfc1bac7938e90ca2e3cb227f7b3f4a9424beec6fd4a7
+  checksum: 10c0/510bb23b2423d5fbffef69b356e4050929c21a7627e8194b1506dd935c7d9cbbd696c9ae9d7c3bcd7e6e7b69561b0b290c2d72d446327b40fc20ce40bbca6712
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-for-of@npm:^7.23.6":
-  version: 7.23.6
-  resolution: "@babel/plugin-transform-for-of@npm:7.23.6"
+"@babel/plugin-transform-for-of@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-for-of@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
     "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.22.5"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/46681b6ab10f3ca2d961f50d4096b62ab5d551e1adad84e64be1ee23e72eb2f26a1e30e617e853c74f1349fffe4af68d33921a128543b6f24b6d46c09a3e2aec
+  checksum: 10c0/e4bc92b1f334246e62d4bde079938df940794db564742034f6597f2e38bd426e11ae8c5670448e15dd6e45c462f2a9ab3fa87259bddf7c08553ffd9457fc2b2c
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-function-name@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-function-name@npm:7.23.3"
+"@babel/plugin-transform-function-name@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-function-name@npm:7.24.1"
   dependencies:
-    "@babel/helper-compilation-targets": "npm:^7.22.15"
+    "@babel/helper-compilation-targets": "npm:^7.23.6"
     "@babel/helper-function-name": "npm:^7.23.0"
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/89cb9747802118048115cf92a8f310752f02030549b26f008904990cbdc86c3d4a68e07ca3b5c46de8a46ed4df2cb576ac222c74c56de67253d2a3ddc2956083
+  checksum: 10c0/65c1735ec3b5e43db9b5aebf3c16171c04b3050c92396b9e22dda0d2aaf51f43fdcf147f70a40678fd9a4ee2272a5acec4826e9c21bcf968762f4c184897ad75
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-json-strings@npm:^7.23.4":
-  version: 7.23.4
-  resolution: "@babel/plugin-transform-json-strings@npm:7.23.4"
+"@babel/plugin-transform-json-strings@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-json-strings@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
     "@babel/plugin-syntax-json-strings": "npm:^7.8.3"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/39e82223992a9ad857722ae051291935403852ad24b0dd64c645ca1c10517b6bf9822377d88643fed8b3e61a4e3f7e5ae41cf90eb07c40a786505d47d5970e54
+  checksum: 10c0/13d9b6a3c31ab4be853b3d49d8d1171f9bd8198562fd75da8f31e7de31398e1cfa6eb1d073bed93c9746e4f9c47a53b20f8f4c255ece3f88c90852ad3181dc2d
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-literals@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-literals@npm:7.23.3"
+"@babel/plugin-transform-literals@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-literals@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/8292106b106201464c2bfdd5c014fe6a9ca1c0256eb0a8031deb20081e21906fe68b156186f77d993c23eeab6d8d6f5f66e8895eec7ed97ce6de5dbcafbcd7f4
+  checksum: 10c0/a27cc7d565ee57b5a2bf136fa889c5c2f5988545ae7b3b2c83a7afe5dd37dfac80dca88b1c633c65851ce6af7d2095c04c01228657ce0198f918e64b5ccd01fa
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-logical-assignment-operators@npm:^7.23.4":
-  version: 7.23.4
-  resolution: "@babel/plugin-transform-logical-assignment-operators@npm:7.23.4"
+"@babel/plugin-transform-logical-assignment-operators@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-logical-assignment-operators@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
     "@babel/plugin-syntax-logical-assignment-operators": "npm:^7.10.4"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/87b034dd13143904e405887e6125d76c27902563486efc66b7d9a9d8f9406b76c6ac42d7b37224014af5783d7edb465db0cdecd659fa3227baad0b3a6a35deff
+  checksum: 10c0/98a2e0843ddfe51443c1bfcf08ba40ad8856fd4f8e397b392a5390a54f257c8c1b9a99d8ffc0fc7e8c55cce45e2cd9c2795a4450303f48f501bcbd662de44554
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-member-expression-literals@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-member-expression-literals@npm:7.23.3"
+"@babel/plugin-transform-member-expression-literals@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-member-expression-literals@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/687f24f3ec60b627fef6e87b9e2770df77f76727b9d5f54fa4c84a495bb24eb4a20f1a6240fa22d339d45aac5eaeb1b39882e941bfd00cf498f9c53478d1ec88
+  checksum: 10c0/2af731d02aa4c757ef80c46df42264128cbe45bfd15e1812d1a595265b690a44ad036041c406a73411733540e1c4256d8174705ae6b8cfaf757fc175613993fd
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-modules-amd@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-modules-amd@npm:7.23.3"
+"@babel/plugin-transform-modules-amd@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-modules-amd@npm:7.24.1"
   dependencies:
     "@babel/helper-module-transforms": "npm:^7.23.3"
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/9f7ec036f7cfc588833a4dd117a44813b64aa4c1fd5bfb6c78f60198c1d290938213090c93a46f97a68a2490fad909e21a82b2472e95da74d108c125df21c8d5
+  checksum: 10c0/71fd04e5e7026e6e52701214b1e9f7508ba371b757e5075fbb938a79235ed66a54ce65f89bb92b59159e9f03f01b392e6c4de6d255b948bec975a90cfd6809ef
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-modules-commonjs@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-modules-commonjs@npm:7.23.3"
+"@babel/plugin-transform-modules-commonjs@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-modules-commonjs@npm:7.24.1"
   dependencies:
     "@babel/helper-module-transforms": "npm:^7.23.3"
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
     "@babel/helper-simple-access": "npm:^7.22.5"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/5c8840c5c9ecba39367ae17c973ed13dbc43234147b77ae780eec65010e2a9993c5d717721b23e8179f7cf49decdd325c509b241d69cfbf92aa647a1d8d5a37d
+  checksum: 10c0/efb3ea2047604a7eb44a9289311ebb29842fe6510ff8b66a77a60440448c65e1312a60dc48191ed98246bdbd163b5b6f3348a0669bcc0e3809e69c7c776b20fa
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-modules-systemjs@npm:^7.23.9":
-  version: 7.23.9
-  resolution: "@babel/plugin-transform-modules-systemjs@npm:7.23.9"
+"@babel/plugin-transform-modules-systemjs@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-modules-systemjs@npm:7.24.1"
   dependencies:
     "@babel/helper-hoist-variables": "npm:^7.22.5"
     "@babel/helper-module-transforms": "npm:^7.23.3"
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
     "@babel/helper-validator-identifier": "npm:^7.22.20"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/1926631fe9d87c0c53427a3420ad49da62d53320d0016b6afab64e5417a672aa5bdff3ea1d24746ffa1e43319c28a80f5d8cef0ad214760d399c293b5850500f
+  checksum: 10c0/38145f8abe8a4ce2b41adabe5d65eb7bd54a139dc58e2885fec975eb5cf247bd938c1dd9f09145c46dbe57d25dd0ef7f00a020e5eb0cbe8195b2065d51e2d93d
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-modules-umd@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-modules-umd@npm:7.23.3"
+"@babel/plugin-transform-modules-umd@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-modules-umd@npm:7.24.1"
   dependencies:
     "@babel/helper-module-transforms": "npm:^7.23.3"
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/f0d2f890a15b4367d0d8f160bed7062bdb145c728c24e9bfbc1211c7925aae5df72a88df3832c92dd2011927edfed4da1b1249e4c78402e893509316c0c2caa6
+  checksum: 10c0/14c90c58562b54e17fe4a8ded3f627f9a993648f8378ef00cb2f6c34532032b83290d2ad54c7fff4f0c2cd49091bda780f8cc28926ec4b77a6c2141105a2e699
   languageName: node
   linkType: hard
 
@@ -969,138 +970,137 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-new-target@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-new-target@npm:7.23.3"
+"@babel/plugin-transform-new-target@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-new-target@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/f489b9e1f17b42b2ba6312d58351e757cb23a8409f64f2bb6af4c09d015359588a5d68943b20756f141d0931a94431c782f3ed1225228a930a04b07be0c31b04
+  checksum: 10c0/c4cabe628163855f175a8799eb73d692b6f1dc347aae5022af0c253f80c92edb962e48ddccc98b691eff3d5d8e53c9a8f10894c33ba4cebc2e2f8f8fe554fb7a
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-nullish-coalescing-operator@npm:^7.22.3, @babel/plugin-transform-nullish-coalescing-operator@npm:^7.23.4":
-  version: 7.23.4
-  resolution: "@babel/plugin-transform-nullish-coalescing-operator@npm:7.23.4"
+"@babel/plugin-transform-nullish-coalescing-operator@npm:^7.22.3, @babel/plugin-transform-nullish-coalescing-operator@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-nullish-coalescing-operator@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
     "@babel/plugin-syntax-nullish-coalescing-operator": "npm:^7.8.3"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/bce490d22da5c87ff27fffaff6ad5a4d4979b8d7b72e30857f191e9c1e1824ba73bb8d7081166289369e388f94f0ce5383a593b1fc84d09464a062c75f824b0b
+  checksum: 10c0/c8532951506fb031287280cebeef10aa714f8a7cea2b62a13c805f0e0af945ba77a7c87e4bbbe4c37fe973e0e5d5e649cfac7f0374f57efc54cdf9656362a392
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-numeric-separator@npm:^7.23.4":
-  version: 7.23.4
-  resolution: "@babel/plugin-transform-numeric-separator@npm:7.23.4"
+"@babel/plugin-transform-numeric-separator@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-numeric-separator@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
     "@babel/plugin-syntax-numeric-separator": "npm:^7.10.4"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/e34902da4f5588dc4812c92cb1f6a5e3e3647baf7b4623e30942f551bf1297621abec4e322ebfa50b320c987c0f34d9eb4355b3d289961d9035e2126e3119c12
+  checksum: 10c0/15e2b83292e586fb4f5b4b4021d4821a806ca6de2b77d5ad6c4e07aa7afa23704e31b4d683dac041afc69ac51b2461b96e8c98e46311cc1faba54c73f235044f
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-object-rest-spread@npm:^7.24.0":
-  version: 7.24.0
-  resolution: "@babel/plugin-transform-object-rest-spread@npm:7.24.0"
+"@babel/plugin-transform-object-rest-spread@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-object-rest-spread@npm:7.24.1"
   dependencies:
-    "@babel/compat-data": "npm:^7.23.5"
     "@babel/helper-compilation-targets": "npm:^7.23.6"
     "@babel/helper-plugin-utils": "npm:^7.24.0"
     "@babel/plugin-syntax-object-rest-spread": "npm:^7.8.3"
-    "@babel/plugin-transform-parameters": "npm:^7.23.3"
+    "@babel/plugin-transform-parameters": "npm:^7.24.1"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/02fe8b99ee6329e68b97b1b1b5410e50c6c20470e73dcd1d287c6ddb5623c654dce82327b2a3f6710ee3b512fe4950e43ab81d0bbc33d771f0cad3bc3cef87c6
+  checksum: 10c0/e301f1a66b63bafc2bce885305cc88ab30ec875b5e2c7933fb7f9cbf0d954685aa10334ffcecf147ba19d6a1d7ffab37baf4ce871849d395941c56fdb3060f73
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-object-super@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-object-super@npm:7.23.3"
+"@babel/plugin-transform-object-super@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-object-super@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
-    "@babel/helper-replace-supers": "npm:^7.22.20"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-replace-supers": "npm:^7.24.1"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/a6856fd8c0afbe5b3318c344d4d201d009f4051e2f6ff6237ff2660593e93c5997a58772b13d639077c3e29ced3440247b29c496cd77b13af1e7559a70009775
+  checksum: 10c0/d30e6b9e59a707efd7ed524fc0a8deeea046011a6990250f2e9280516683138e2d13d9c52daf41d78407bdab0378aef7478326f2a15305b773d851cb6e106157
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-optional-catch-binding@npm:^7.23.4":
-  version: 7.23.4
-  resolution: "@babel/plugin-transform-optional-catch-binding@npm:7.23.4"
+"@babel/plugin-transform-optional-catch-binding@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-optional-catch-binding@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
     "@babel/plugin-syntax-optional-catch-binding": "npm:^7.8.3"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/4ef61812af0e4928485e28301226ce61139a8b8cea9e9a919215ebec4891b9fea2eb7a83dc3090e2679b7d7b2c8653da601fbc297d2addc54a908b315173991e
+  checksum: 10c0/68408b9ef772d9aa5dccf166c86dc4d2505990ce93e03dcfc65c73fb95c2511248e009ba9ccf5b96405fb85de1c16ad8291016b1cc5689ee4becb1e3050e0ae7
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-optional-chaining@npm:^7.23.3, @babel/plugin-transform-optional-chaining@npm:^7.23.4":
-  version: 7.23.4
-  resolution: "@babel/plugin-transform-optional-chaining@npm:7.23.4"
+"@babel/plugin-transform-optional-chaining@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-optional-chaining@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
     "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.22.5"
     "@babel/plugin-syntax-optional-chaining": "npm:^7.8.3"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/305b773c29ad61255b0e83ec1e92b2f7af6aa58be4cba1e3852bddaa14f7d2afd7b4438f41c28b179d6faac7eb8d4fb5530a17920294f25d459b8f84406bfbfb
+  checksum: 10c0/b4688795229c9e9ce978eccf979fe515eb4e8d864d2dcd696baa937c8db13e3d46cff664a3cd6119dfe60e261f5d359b10c6783effab7cc91d75d03ad7f43d05
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-parameters@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-parameters@npm:7.23.3"
+"@babel/plugin-transform-parameters@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-parameters@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/a8d4cbe0f6ba68d158f5b4215c63004fc37a1fdc539036eb388a9792017c8496ea970a1932ccb929308f61e53dc56676ed01d8df6f42bc0a85c7fd5ba82482b7
+  checksum: 10c0/eee8d2f72d3ee0876dc8d85f949f4adf34685cfe36c814ebc20c96315f3891a53d43c764d636b939e34d55e6a6a4af9aa57ed0d7f9439eb5771a07277c669e55
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-private-methods@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-private-methods@npm:7.23.3"
+"@babel/plugin-transform-private-methods@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-private-methods@npm:7.24.1"
   dependencies:
-    "@babel/helper-create-class-features-plugin": "npm:^7.22.15"
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-create-class-features-plugin": "npm:^7.24.1"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/745a655edcd111b7f91882b921671ca0613079760d8c9befe336b8a9bc4ce6bb49c0c08941831c950afb1b225b4b2d3eaac8842e732db095b04db38efd8c34f4
+  checksum: 10c0/d8e18587d2a8b71a795da5e8841b0e64f1525a99ad73ea8b9caa331bc271d69646e2e1e749fd634321f3df9d126070208ddac22a27ccf070566b2efb74fecd99
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-private-property-in-object@npm:^7.23.4":
-  version: 7.23.4
-  resolution: "@babel/plugin-transform-private-property-in-object@npm:7.23.4"
+"@babel/plugin-transform-private-property-in-object@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-private-property-in-object@npm:7.24.1"
   dependencies:
     "@babel/helper-annotate-as-pure": "npm:^7.22.5"
-    "@babel/helper-create-class-features-plugin": "npm:^7.22.15"
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-create-class-features-plugin": "npm:^7.24.1"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
     "@babel/plugin-syntax-private-property-in-object": "npm:^7.14.5"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/8d31b28f24204b4d13514cd3a8f3033abf575b1a6039759ddd6e1d82dd33ba7281f9bc85c9f38072a665d69bfa26dc40737eefaf9d397b024654a483d2357bf5
+  checksum: 10c0/33d2b9737de7667d7a1b704eef99bfecc6736157d9ea28c2e09010d5f25e33ff841c41d89a4430c5d47f4eb3384e24770fa0ec79600e1e38d6d16e2f9333b4b5
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-property-literals@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-property-literals@npm:7.23.3"
+"@babel/plugin-transform-property-literals@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-property-literals@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/b2549f23f90cf276c2e3058c2225c3711c2ad1c417e336d3391199445a9776dd791b83be47b2b9a7ae374b40652d74b822387e31fa5267a37bf49c122e1a9747
+  checksum: 10c0/3bf3e01f7bb8215a8b6d0081b6f86fea23e3a4543b619e059a264ede028bc58cdfb0acb2c43271271915a74917effa547bc280ac636a9901fa9f2fb45623f87e
   languageName: node
   linkType: hard
 
@@ -1115,26 +1115,26 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-react-display-name@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-react-display-name@npm:7.23.3"
+"@babel/plugin-transform-react-display-name@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-react-display-name@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/3aed142af7bd1aed1df2bdad91ed33ba1cdd5c3c67ce6eafba821ff72f129162a197ffb55f1eb1775af276abd5545934489a8257fef6c6665ddf253a4f39a939
+  checksum: 10c0/adf1a3cb0df8134533a558a9072a67e34127fd489dfe431c3348a86dd41f3e74861d5d5134bbb68f61a9cdb3f7e79b2acea1346be94ce4d3328a64e5a9e09be1
   languageName: node
   linkType: hard
 
 "@babel/plugin-transform-react-inline-elements@npm:^7.21.0":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-react-inline-elements@npm:7.23.3"
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-react-inline-elements@npm:7.24.1"
   dependencies:
     "@babel/helper-builder-react-jsx": "npm:^7.22.10"
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/138f7769b30f65d339588155affe677c68fde3cdaa060a2dc73152cc8c941c246d4b2ae73c8f1d9ddf1055e587fcb7379c155d49daec086ed50557f2117c1d50
+  checksum: 10c0/83fc6afaebbe82a5b14936f00b6d1ffce1a3d908ac749d5daa43f724d32c98b50807ffc3ce2492c1aa49870189507b751993a4a079b9c3226c9b8aab783d08b6
   languageName: node
   linkType: hard
 
@@ -1149,208 +1149,208 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-react-jsx@npm:^7.22.15, @babel/plugin-transform-react-jsx@npm:^7.22.5":
-  version: 7.22.15
-  resolution: "@babel/plugin-transform-react-jsx@npm:7.22.15"
+"@babel/plugin-transform-react-jsx@npm:^7.22.5, @babel/plugin-transform-react-jsx@npm:^7.23.4":
+  version: 7.23.4
+  resolution: "@babel/plugin-transform-react-jsx@npm:7.23.4"
   dependencies:
     "@babel/helper-annotate-as-pure": "npm:^7.22.5"
     "@babel/helper-module-imports": "npm:^7.22.15"
     "@babel/helper-plugin-utils": "npm:^7.22.5"
-    "@babel/plugin-syntax-jsx": "npm:^7.22.5"
-    "@babel/types": "npm:^7.22.15"
+    "@babel/plugin-syntax-jsx": "npm:^7.23.3"
+    "@babel/types": "npm:^7.23.4"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/db37491e3eea5530521e177380312f308f01f806866fa0ce08d48fc5a8c9eaf9a954f778fa1ff477248afb72e916eb66ab3d35254bb6a8979f8b8e74a0fd8873
+  checksum: 10c0/8851b3adc515cd91bdb06ff3a23a0f81f0069cfef79dfb3fa744da4b7a82e3555ccb6324c4fa71ecf22508db13b9ff6a0ed96675f95fc87903b9fc6afb699580
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-react-pure-annotations@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-react-pure-annotations@npm:7.23.3"
+"@babel/plugin-transform-react-pure-annotations@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-react-pure-annotations@npm:7.24.1"
   dependencies:
     "@babel/helper-annotate-as-pure": "npm:^7.22.5"
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/76287adeab656fb7f39243e5ab6a8c60069cf69fffeebd1566457d56cb2f966366a23bd755d3e369f4d0437459e3b76243df370caa7d7d2287a8560b66c53ca2
+  checksum: 10c0/9eb3056fcaadd63d404fd5652b2a3f693bc4758ba753fee5b5c580c7a64346eeeb94e5a4f77a99c76f3cf06d1f1ad6c227647cd0b1219efe3d00cafa5a6e7b2a
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-regenerator@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-regenerator@npm:7.23.3"
+"@babel/plugin-transform-regenerator@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-regenerator@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
     regenerator-transform: "npm:^0.15.2"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/3b0e989ae5db78894ee300b24e07fbcec490c39ab48629c519377581cf94e90308f4ddc10a8914edc9f403e2d3ac7a7ae0ae09003629d852da03e2ba846299c6
+  checksum: 10c0/0a333585d7c0b38d31cc549d0f3cf7c396d1d50b6588a307dc58325505ddd4f5446188bc536c4779431b396251801b3f32d6d8e87db8274bc84e8c41950737f7
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-reserved-words@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-reserved-words@npm:7.23.3"
+"@babel/plugin-transform-reserved-words@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-reserved-words@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/4e6d61f6c9757592661cfbd2c39c4f61551557b98cb5f0995ef10f5540f67e18dde8a42b09716d58943b6e4b7ef5c9bcf19902839e7328a4d49149e0fecdbfcd
+  checksum: 10c0/936d6e73cafb2cbb495f6817c6f8463288dbc9ab3c44684b931ebc1ece24f0d55dfabc1a75ba1de5b48843d0fef448dcfdbecb8485e4014f8f41d0d1440c536f
   languageName: node
   linkType: hard
 
 "@babel/plugin-transform-runtime@npm:^7.22.4":
-  version: 7.24.0
-  resolution: "@babel/plugin-transform-runtime@npm:7.24.0"
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-runtime@npm:7.24.1"
   dependencies:
-    "@babel/helper-module-imports": "npm:^7.22.15"
+    "@babel/helper-module-imports": "npm:^7.24.1"
     "@babel/helper-plugin-utils": "npm:^7.24.0"
-    babel-plugin-polyfill-corejs2: "npm:^0.4.8"
-    babel-plugin-polyfill-corejs3: "npm:^0.9.0"
-    babel-plugin-polyfill-regenerator: "npm:^0.5.5"
+    babel-plugin-polyfill-corejs2: "npm:^0.4.10"
+    babel-plugin-polyfill-corejs3: "npm:^0.10.1"
+    babel-plugin-polyfill-regenerator: "npm:^0.6.1"
     semver: "npm:^6.3.1"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/a632e0c6f4b1be21955646ba4f6e4af323daaa6ab68ce39f92f5186d444402e920b33cabd40759c36f72d8c36f256a35ea03060e407ca69bcf373fdcb450aa42
+  checksum: 10c0/54e4dbc7aa6fd6c338c657108418f10301e88bbc4c00675f901d529d3bbf578e6a438076bc57c1efdb433853dea1d7c1a6ebaa18f936debc1fd9e25f7553c33a
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-shorthand-properties@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-shorthand-properties@npm:7.23.3"
+"@babel/plugin-transform-shorthand-properties@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-shorthand-properties@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/c423c66fec0b6503f50561741754c84366ef9e9818442c8881fbaa90cc363fd137084b9431cdc00ed2f1fd8c8a1a5982c4a7e1f2af3769db4caf2ac7ea55d4f0
+  checksum: 10c0/8273347621183aada3cf1f3019d8d5f29467ba13a75b72cb405bc7f23b7e05fd85f4edb1e4d9f0103153dddb61826a42dc24d466480d707f8932c1923a4c25fa
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-spread@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-spread@npm:7.23.3"
+"@babel/plugin-transform-spread@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-spread@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
     "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.22.5"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/a348e4ae47e4ceeceb760506ec7bf835ccc18a2cf70ec74ebfbe41bc172fa2412b05b7d1b86836f8aee375e41a04ff20486074778d0e2d19d668b33dc52e9dbb
+  checksum: 10c0/50a0302e344546d57e5c9f4dea575f88e084352eeac4e9a3e238c41739eef2df1daf4a7ebbb3ccb7acd3447f6a5ce9938405f98bf5f5583deceb8257f5a673c9
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-sticky-regex@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-sticky-regex@npm:7.23.3"
+"@babel/plugin-transform-sticky-regex@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-sticky-regex@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/cd15c407906b41e4b924ea151e455c11274dba050771ee7154ad88a1a274140ac5e84efc8d08c4379f2f0cec8a09e4a0a3b2a3a954ba6a67d9fb35df1c714c56
+  checksum: 10c0/786fe2ae11ef9046b9fa95677935abe495031eebf1274ad03f2054a20adea7b9dbd00336ac0b143f7924bc562e5e09793f6e8613607674b97e067d4838ccc4a0
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-template-literals@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-template-literals@npm:7.23.3"
+"@babel/plugin-transform-template-literals@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-template-literals@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/9b5f43788b9ffcb8f2b445a16b1aa40fcf23cb0446a4649445f098ec6b4cb751f243a535da623d59fefe48f4c40552f5621187a61811779076bab26863e3373d
+  checksum: 10c0/f73bcda5488eb81c6e7a876498d9e6b72be32fca5a4d9db9053491a2d1300cd27b889b463fd2558f3cd5826a85ed00f61d81b234aa55cb5a0abf1b6fa1bd5026
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-typeof-symbol@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-typeof-symbol@npm:7.23.3"
+"@babel/plugin-transform-typeof-symbol@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-typeof-symbol@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/50e81d84c6059878be2a0e41e0d790cab10882cfb8fa85e8c2665ccb0b3cd7233f49197f17427bc7c1b36c80e07076640ecf1b641888d78b9cb91bc16478d84a
+  checksum: 10c0/d392f549bfd13414f59feecdf3fb286f266a3eb9107a9de818e57907bda56eed08d1f6f8e314d09bf99252df026a7fd4d5df839acd45078a777abcebaa9a8593
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-typescript@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-typescript@npm:7.23.3"
+"@babel/plugin-transform-typescript@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-typescript@npm:7.24.1"
   dependencies:
     "@babel/helper-annotate-as-pure": "npm:^7.22.5"
-    "@babel/helper-create-class-features-plugin": "npm:^7.22.15"
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
-    "@babel/plugin-syntax-typescript": "npm:^7.23.3"
+    "@babel/helper-create-class-features-plugin": "npm:^7.24.1"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/plugin-syntax-typescript": "npm:^7.24.1"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/a3c738efcf491ceb1eee646f57c44990ee0c80465527b88fcfa0b7602688c4ff8c165a4c5b62caf05d968b095212018fd30a02879c12d37c657081f57b31fb26
+  checksum: 10c0/9abce423ed2d3cb9398b09e3ed9efea661e92bd32e919f5c7942ac4bad4c5fd23a1d575bb7444d8c92261b68fb626552e0d9eea960372b6b6f54c2c9699a2649
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-unicode-escapes@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-unicode-escapes@npm:7.23.3"
+"@babel/plugin-transform-unicode-escapes@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-unicode-escapes@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/f1ed54742dc982666f471df5d087cfda9c6dbf7842bec2d0f7893ed359b142a38c0210358f297ab5c7a3e11ec0dfb0e523de2e2edf48b62f257aaadd5f068866
+  checksum: 10c0/67a72a1ed99639de6a93aead35b1993cb3f0eb178a8991fcef48732c38c9f0279c85bbe1e2e2477b85afea873e738ff0955a35057635ce67bc149038e2d8a28e
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-unicode-property-regex@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-unicode-property-regex@npm:7.23.3"
+"@babel/plugin-transform-unicode-property-regex@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-unicode-property-regex@npm:7.24.1"
   dependencies:
     "@babel/helper-create-regexp-features-plugin": "npm:^7.22.15"
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/dca5702d43fac70351623a12e4dfa454fd028a67498888522b644fd1a02534fabd440106897e886ebcc6ce6a39c58094ca29953b6f51bc67372aa8845a5ae49f
+  checksum: 10c0/d9d9752df7d51bf9357c0bf3762fe16b8c841fca9ecf4409a16f15ccc34be06e8e71abfaee1251b7d451227e70e6b873b36f86b090efdb20f6f7de5fdb6c7a05
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-unicode-regex@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-unicode-regex@npm:7.23.3"
+"@babel/plugin-transform-unicode-regex@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-unicode-regex@npm:7.24.1"
   dependencies:
     "@babel/helper-create-regexp-features-plugin": "npm:^7.22.15"
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/df824dcca2f6e731f61d69103e87d5dd974d8a04e46e28684a4ba935ae633d876bded09b8db890fd72d0caf7b9638e2672b753671783613cc78d472951e2df8c
+  checksum: 10c0/6046ab38e5d14ed97dbb921bd79ac1d7ad9d3286da44a48930e980b16896db2df21e093563ec3c916a630dc346639bf47c5924a33902a06fe3bbb5cdc7ef5f2f
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-unicode-sets-regex@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-unicode-sets-regex@npm:7.23.3"
+"@babel/plugin-transform-unicode-sets-regex@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-unicode-sets-regex@npm:7.24.1"
   dependencies:
     "@babel/helper-create-regexp-features-plugin": "npm:^7.22.15"
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10c0/30fe1d29af8395a867d40a63a250ca89072033d9bc7d4587eeebeaf4ad7f776aab83064321bfdb1d09d7e29a1d392852361f4f60a353f0f4d1a3b435dcbf256b
+  checksum: 10c0/b6c1f6b90afeeddf97e5713f72575787fcb7179be7b4c961869bfbc66915f66540dc49da93e4369da15596bd44b896d1eb8a50f5e1fd907abd7a1a625901006b
   languageName: node
   linkType: hard
 
 "@babel/preset-env@npm:^7.11.0, @babel/preset-env@npm:^7.12.1, @babel/preset-env@npm:^7.22.4":
-  version: 7.24.0
-  resolution: "@babel/preset-env@npm:7.24.0"
+  version: 7.24.1
+  resolution: "@babel/preset-env@npm:7.24.1"
   dependencies:
-    "@babel/compat-data": "npm:^7.23.5"
+    "@babel/compat-data": "npm:^7.24.1"
     "@babel/helper-compilation-targets": "npm:^7.23.6"
     "@babel/helper-plugin-utils": "npm:^7.24.0"
     "@babel/helper-validator-option": "npm:^7.23.5"
-    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "npm:^7.23.3"
-    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "npm:^7.23.3"
-    "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "npm:^7.23.7"
+    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "npm:^7.24.1"
+    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "npm:^7.24.1"
+    "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "npm:^7.24.1"
     "@babel/plugin-proposal-private-property-in-object": "npm:7.21.0-placeholder-for-preset-env.2"
     "@babel/plugin-syntax-async-generators": "npm:^7.8.4"
     "@babel/plugin-syntax-class-properties": "npm:^7.12.13"
     "@babel/plugin-syntax-class-static-block": "npm:^7.14.5"
     "@babel/plugin-syntax-dynamic-import": "npm:^7.8.3"
     "@babel/plugin-syntax-export-namespace-from": "npm:^7.8.3"
-    "@babel/plugin-syntax-import-assertions": "npm:^7.23.3"
-    "@babel/plugin-syntax-import-attributes": "npm:^7.23.3"
+    "@babel/plugin-syntax-import-assertions": "npm:^7.24.1"
+    "@babel/plugin-syntax-import-attributes": "npm:^7.24.1"
     "@babel/plugin-syntax-import-meta": "npm:^7.10.4"
     "@babel/plugin-syntax-json-strings": "npm:^7.8.3"
     "@babel/plugin-syntax-logical-assignment-operators": "npm:^7.10.4"
@@ -1362,63 +1362,63 @@ __metadata:
     "@babel/plugin-syntax-private-property-in-object": "npm:^7.14.5"
     "@babel/plugin-syntax-top-level-await": "npm:^7.14.5"
     "@babel/plugin-syntax-unicode-sets-regex": "npm:^7.18.6"
-    "@babel/plugin-transform-arrow-functions": "npm:^7.23.3"
-    "@babel/plugin-transform-async-generator-functions": "npm:^7.23.9"
-    "@babel/plugin-transform-async-to-generator": "npm:^7.23.3"
-    "@babel/plugin-transform-block-scoped-functions": "npm:^7.23.3"
-    "@babel/plugin-transform-block-scoping": "npm:^7.23.4"
-    "@babel/plugin-transform-class-properties": "npm:^7.23.3"
-    "@babel/plugin-transform-class-static-block": "npm:^7.23.4"
-    "@babel/plugin-transform-classes": "npm:^7.23.8"
-    "@babel/plugin-transform-computed-properties": "npm:^7.23.3"
-    "@babel/plugin-transform-destructuring": "npm:^7.23.3"
-    "@babel/plugin-transform-dotall-regex": "npm:^7.23.3"
-    "@babel/plugin-transform-duplicate-keys": "npm:^7.23.3"
-    "@babel/plugin-transform-dynamic-import": "npm:^7.23.4"
-    "@babel/plugin-transform-exponentiation-operator": "npm:^7.23.3"
-    "@babel/plugin-transform-export-namespace-from": "npm:^7.23.4"
-    "@babel/plugin-transform-for-of": "npm:^7.23.6"
-    "@babel/plugin-transform-function-name": "npm:^7.23.3"
-    "@babel/plugin-transform-json-strings": "npm:^7.23.4"
-    "@babel/plugin-transform-literals": "npm:^7.23.3"
-    "@babel/plugin-transform-logical-assignment-operators": "npm:^7.23.4"
-    "@babel/plugin-transform-member-expression-literals": "npm:^7.23.3"
-    "@babel/plugin-transform-modules-amd": "npm:^7.23.3"
-    "@babel/plugin-transform-modules-commonjs": "npm:^7.23.3"
-    "@babel/plugin-transform-modules-systemjs": "npm:^7.23.9"
-    "@babel/plugin-transform-modules-umd": "npm:^7.23.3"
+    "@babel/plugin-transform-arrow-functions": "npm:^7.24.1"
+    "@babel/plugin-transform-async-generator-functions": "npm:^7.24.1"
+    "@babel/plugin-transform-async-to-generator": "npm:^7.24.1"
+    "@babel/plugin-transform-block-scoped-functions": "npm:^7.24.1"
+    "@babel/plugin-transform-block-scoping": "npm:^7.24.1"
+    "@babel/plugin-transform-class-properties": "npm:^7.24.1"
+    "@babel/plugin-transform-class-static-block": "npm:^7.24.1"
+    "@babel/plugin-transform-classes": "npm:^7.24.1"
+    "@babel/plugin-transform-computed-properties": "npm:^7.24.1"
+    "@babel/plugin-transform-destructuring": "npm:^7.24.1"
+    "@babel/plugin-transform-dotall-regex": "npm:^7.24.1"
+    "@babel/plugin-transform-duplicate-keys": "npm:^7.24.1"
+    "@babel/plugin-transform-dynamic-import": "npm:^7.24.1"
+    "@babel/plugin-transform-exponentiation-operator": "npm:^7.24.1"
+    "@babel/plugin-transform-export-namespace-from": "npm:^7.24.1"
+    "@babel/plugin-transform-for-of": "npm:^7.24.1"
+    "@babel/plugin-transform-function-name": "npm:^7.24.1"
+    "@babel/plugin-transform-json-strings": "npm:^7.24.1"
+    "@babel/plugin-transform-literals": "npm:^7.24.1"
+    "@babel/plugin-transform-logical-assignment-operators": "npm:^7.24.1"
+    "@babel/plugin-transform-member-expression-literals": "npm:^7.24.1"
+    "@babel/plugin-transform-modules-amd": "npm:^7.24.1"
+    "@babel/plugin-transform-modules-commonjs": "npm:^7.24.1"
+    "@babel/plugin-transform-modules-systemjs": "npm:^7.24.1"
+    "@babel/plugin-transform-modules-umd": "npm:^7.24.1"
     "@babel/plugin-transform-named-capturing-groups-regex": "npm:^7.22.5"
-    "@babel/plugin-transform-new-target": "npm:^7.23.3"
-    "@babel/plugin-transform-nullish-coalescing-operator": "npm:^7.23.4"
-    "@babel/plugin-transform-numeric-separator": "npm:^7.23.4"
-    "@babel/plugin-transform-object-rest-spread": "npm:^7.24.0"
-    "@babel/plugin-transform-object-super": "npm:^7.23.3"
-    "@babel/plugin-transform-optional-catch-binding": "npm:^7.23.4"
-    "@babel/plugin-transform-optional-chaining": "npm:^7.23.4"
-    "@babel/plugin-transform-parameters": "npm:^7.23.3"
-    "@babel/plugin-transform-private-methods": "npm:^7.23.3"
-    "@babel/plugin-transform-private-property-in-object": "npm:^7.23.4"
-    "@babel/plugin-transform-property-literals": "npm:^7.23.3"
-    "@babel/plugin-transform-regenerator": "npm:^7.23.3"
-    "@babel/plugin-transform-reserved-words": "npm:^7.23.3"
-    "@babel/plugin-transform-shorthand-properties": "npm:^7.23.3"
-    "@babel/plugin-transform-spread": "npm:^7.23.3"
-    "@babel/plugin-transform-sticky-regex": "npm:^7.23.3"
-    "@babel/plugin-transform-template-literals": "npm:^7.23.3"
-    "@babel/plugin-transform-typeof-symbol": "npm:^7.23.3"
-    "@babel/plugin-transform-unicode-escapes": "npm:^7.23.3"
-    "@babel/plugin-transform-unicode-property-regex": "npm:^7.23.3"
-    "@babel/plugin-transform-unicode-regex": "npm:^7.23.3"
-    "@babel/plugin-transform-unicode-sets-regex": "npm:^7.23.3"
+    "@babel/plugin-transform-new-target": "npm:^7.24.1"
+    "@babel/plugin-transform-nullish-coalescing-operator": "npm:^7.24.1"
+    "@babel/plugin-transform-numeric-separator": "npm:^7.24.1"
+    "@babel/plugin-transform-object-rest-spread": "npm:^7.24.1"
+    "@babel/plugin-transform-object-super": "npm:^7.24.1"
+    "@babel/plugin-transform-optional-catch-binding": "npm:^7.24.1"
+    "@babel/plugin-transform-optional-chaining": "npm:^7.24.1"
+    "@babel/plugin-transform-parameters": "npm:^7.24.1"
+    "@babel/plugin-transform-private-methods": "npm:^7.24.1"
+    "@babel/plugin-transform-private-property-in-object": "npm:^7.24.1"
+    "@babel/plugin-transform-property-literals": "npm:^7.24.1"
+    "@babel/plugin-transform-regenerator": "npm:^7.24.1"
+    "@babel/plugin-transform-reserved-words": "npm:^7.24.1"
+    "@babel/plugin-transform-shorthand-properties": "npm:^7.24.1"
+    "@babel/plugin-transform-spread": "npm:^7.24.1"
+    "@babel/plugin-transform-sticky-regex": "npm:^7.24.1"
+    "@babel/plugin-transform-template-literals": "npm:^7.24.1"
+    "@babel/plugin-transform-typeof-symbol": "npm:^7.24.1"
+    "@babel/plugin-transform-unicode-escapes": "npm:^7.24.1"
+    "@babel/plugin-transform-unicode-property-regex": "npm:^7.24.1"
+    "@babel/plugin-transform-unicode-regex": "npm:^7.24.1"
+    "@babel/plugin-transform-unicode-sets-regex": "npm:^7.24.1"
     "@babel/preset-modules": "npm:0.1.6-no-external-plugins"
-    babel-plugin-polyfill-corejs2: "npm:^0.4.8"
-    babel-plugin-polyfill-corejs3: "npm:^0.9.0"
-    babel-plugin-polyfill-regenerator: "npm:^0.5.5"
+    babel-plugin-polyfill-corejs2: "npm:^0.4.10"
+    babel-plugin-polyfill-corejs3: "npm:^0.10.1"
+    babel-plugin-polyfill-regenerator: "npm:^0.6.1"
     core-js-compat: "npm:^3.31.0"
     semver: "npm:^6.3.1"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/cb5098bb860aede8418f204d7a693108d7c318edbb227f9842ac6aa71f2154ea1737846994af9bcd0c0b716cd73904f69f09bef635a9679465ec3558144beb4f
+  checksum: 10c0/c9fd96ed8561ac3f8d2e490face5b763ea05a7908770a52fe2ffa0e72581c5cd8ea5c016a85f47775fc3584c6d748eea62044c19ae3f4edf11ffc1e1e9c8bffd
   languageName: node
   linkType: hard
 
@@ -1436,33 +1436,33 @@ __metadata:
   linkType: hard
 
 "@babel/preset-react@npm:^7.12.5, @babel/preset-react@npm:^7.22.3":
-  version: 7.23.3
-  resolution: "@babel/preset-react@npm:7.23.3"
+  version: 7.24.1
+  resolution: "@babel/preset-react@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
-    "@babel/helper-validator-option": "npm:^7.22.15"
-    "@babel/plugin-transform-react-display-name": "npm:^7.23.3"
-    "@babel/plugin-transform-react-jsx": "npm:^7.22.15"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-validator-option": "npm:^7.23.5"
+    "@babel/plugin-transform-react-display-name": "npm:^7.24.1"
+    "@babel/plugin-transform-react-jsx": "npm:^7.23.4"
     "@babel/plugin-transform-react-jsx-development": "npm:^7.22.5"
-    "@babel/plugin-transform-react-pure-annotations": "npm:^7.23.3"
+    "@babel/plugin-transform-react-pure-annotations": "npm:^7.24.1"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/cecb2493e09fd4ffa5effcef1d06e968386b1bfe077a99834f7e8ef249208274fca62fe5a6b3986ef1c1c3900b2eb409adb528ae1b73dba31397b16f9262e83c
+  checksum: 10c0/a842abc5a024ed68a0ce4c1244607d40165cb6f8cf1817ebda282e470f20302d81c6a61cb41c1a31aa6c4e99ce93df4dd9e998a8ded1417c25d7480f0e14103a
   languageName: node
   linkType: hard
 
 "@babel/preset-typescript@npm:^7.21.5":
-  version: 7.23.3
-  resolution: "@babel/preset-typescript@npm:7.23.3"
+  version: 7.24.1
+  resolution: "@babel/preset-typescript@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
-    "@babel/helper-validator-option": "npm:^7.22.15"
-    "@babel/plugin-syntax-jsx": "npm:^7.23.3"
-    "@babel/plugin-transform-modules-commonjs": "npm:^7.23.3"
-    "@babel/plugin-transform-typescript": "npm:^7.23.3"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-validator-option": "npm:^7.23.5"
+    "@babel/plugin-syntax-jsx": "npm:^7.24.1"
+    "@babel/plugin-transform-modules-commonjs": "npm:^7.24.1"
+    "@babel/plugin-transform-typescript": "npm:^7.24.1"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/e72b654c7f0f08b35d7e1c0e3a59c0c13037f295c425760b8b148aa7dde01e6ddd982efc525710f997a1494fafdd55cb525738c016609e7e4d703d02014152b7
+  checksum: 10c0/0033dc6fbc898ed0d8017c83a2dd5e095c82909e2f83e48cf9f305e3e9287148758c179ad90f27912cf98ca68bfec3643c57c70c0ca34d3a6c50dc8243aef406
   languageName: node
   linkType: hard
 
@@ -1483,11 +1483,11 @@ __metadata:
   linkType: hard
 
 "@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.0, @babel/runtime@npm:^7.12.13, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.13.8, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.2.0, @babel/runtime@npm:^7.20.13, @babel/runtime@npm:^7.22.3, @babel/runtime@npm:^7.23.2, @babel/runtime@npm:^7.3.1, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.6.3, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.8.7, @babel/runtime@npm:^7.9.2":
-  version: 7.24.0
-  resolution: "@babel/runtime@npm:7.24.0"
+  version: 7.24.1
+  resolution: "@babel/runtime@npm:7.24.1"
   dependencies:
     regenerator-runtime: "npm:^0.14.0"
-  checksum: 10c0/3495eed727bf4a4f84c35bb51ab53317ae38f4bbc3b1d0a8303751f9dfa0ce6f5fb2afced72b76c3dd0d8bb2ccb84787559a4dee9886291a36b26f02f0f759b4
+  checksum: 10c0/500c6a99ddd84f37c7bc5dbc84777af47b1372b20e879941670451d55484faf18a673c5ebee9ca2b0f36208a729417873b35b1b92e76f811620f6adf7b8cb0f1
   languageName: node
   linkType: hard
 
@@ -1502,25 +1502,25 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/traverse@npm:7, @babel/traverse@npm:^7.24.0":
-  version: 7.24.0
-  resolution: "@babel/traverse@npm:7.24.0"
+"@babel/traverse@npm:7, @babel/traverse@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/traverse@npm:7.24.1"
   dependencies:
-    "@babel/code-frame": "npm:^7.23.5"
-    "@babel/generator": "npm:^7.23.6"
+    "@babel/code-frame": "npm:^7.24.1"
+    "@babel/generator": "npm:^7.24.1"
     "@babel/helper-environment-visitor": "npm:^7.22.20"
     "@babel/helper-function-name": "npm:^7.23.0"
     "@babel/helper-hoist-variables": "npm:^7.22.5"
     "@babel/helper-split-export-declaration": "npm:^7.22.6"
-    "@babel/parser": "npm:^7.24.0"
+    "@babel/parser": "npm:^7.24.1"
     "@babel/types": "npm:^7.24.0"
     debug: "npm:^4.3.1"
     globals: "npm:^11.1.0"
-  checksum: 10c0/55ffd2b0ce0fbd0a09051edc4def4fb1e96f35e0b100c0dc2a7429df569971ae312c290e980e423471f350961705698a257c7eea8c8304918024cc26f02468ba
+  checksum: 10c0/c087b918f6823776537ba246136c70e7ce0719fc05361ebcbfd16f4e6f2f6f1f8f4f9167f1d9b675f27d12074839605189cc9d689de20b89a85e7c140f23daab
   languageName: node
   linkType: hard
 
-"@babel/types@npm:^7.0.0, @babel/types@npm:^7.0.0-beta.49, @babel/types@npm:^7.12.11, @babel/types@npm:^7.12.6, @babel/types@npm:^7.20.7, @babel/types@npm:^7.22.10, @babel/types@npm:^7.22.15, @babel/types@npm:^7.22.19, @babel/types@npm:^7.22.5, @babel/types@npm:^7.23.0, @babel/types@npm:^7.23.6, @babel/types@npm:^7.24.0, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3":
+"@babel/types@npm:^7.0.0, @babel/types@npm:^7.0.0-beta.49, @babel/types@npm:^7.12.11, @babel/types@npm:^7.12.6, @babel/types@npm:^7.20.7, @babel/types@npm:^7.22.10, @babel/types@npm:^7.22.15, @babel/types@npm:^7.22.19, @babel/types@npm:^7.22.5, @babel/types@npm:^7.23.0, @babel/types@npm:^7.23.4, @babel/types@npm:^7.24.0, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3":
   version: 7.24.0
   resolution: "@babel/types@npm:7.24.0"
   dependencies:
@@ -2231,14 +2231,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@jridgewell/gen-mapping@npm:^0.3.0, @jridgewell/gen-mapping@npm:^0.3.2":
-  version: 0.3.3
-  resolution: "@jridgewell/gen-mapping@npm:0.3.3"
+"@jridgewell/gen-mapping@npm:^0.3.0, @jridgewell/gen-mapping@npm:^0.3.5":
+  version: 0.3.5
+  resolution: "@jridgewell/gen-mapping@npm:0.3.5"
   dependencies:
-    "@jridgewell/set-array": "npm:^1.0.1"
+    "@jridgewell/set-array": "npm:^1.2.1"
     "@jridgewell/sourcemap-codec": "npm:^1.4.10"
-    "@jridgewell/trace-mapping": "npm:^0.3.9"
-  checksum: 10c0/376fc11cf5a967318ba3ddd9d8e91be528eab6af66810a713c49b0c3f8dc67e9949452c51c38ab1b19aa618fb5e8594da5a249977e26b1e7fea1ee5a1fcacc74
+    "@jridgewell/trace-mapping": "npm:^0.3.24"
+  checksum: 10c0/1be4fd4a6b0f41337c4f5fdf4afc3bd19e39c3691924817108b82ffcb9c9e609c273f936932b9fba4b3a298ce2eb06d9bff4eb1cc3bd81c4f4ee1b4917e25feb
   languageName: node
   linkType: hard
 
@@ -2249,10 +2249,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@jridgewell/set-array@npm:^1.0.1":
-  version: 1.1.2
-  resolution: "@jridgewell/set-array@npm:1.1.2"
-  checksum: 10c0/bc7ab4c4c00470de4e7562ecac3c0c84f53e7ee8a711e546d67c47da7febe7c45cd67d4d84ee3c9b2c05ae8e872656cdded8a707a283d30bd54fbc65aef821ab
+"@jridgewell/set-array@npm:^1.2.1":
+  version: 1.2.1
+  resolution: "@jridgewell/set-array@npm:1.2.1"
+  checksum: 10c0/2a5aa7b4b5c3464c895c802d8ae3f3d2b92fcbe84ad12f8d0bfbb1f5ad006717e7577ee1fd2eac00c088abe486c7adb27976f45d2941ff6b0b92b2c3302c60f4
   languageName: node
   linkType: hard
 
@@ -2273,13 +2273,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@jridgewell/trace-mapping@npm:^0.3.12, @jridgewell/trace-mapping@npm:^0.3.17, @jridgewell/trace-mapping@npm:^0.3.18, @jridgewell/trace-mapping@npm:^0.3.9":
-  version: 0.3.20
-  resolution: "@jridgewell/trace-mapping@npm:0.3.20"
+"@jridgewell/trace-mapping@npm:^0.3.12, @jridgewell/trace-mapping@npm:^0.3.18, @jridgewell/trace-mapping@npm:^0.3.24, @jridgewell/trace-mapping@npm:^0.3.25, @jridgewell/trace-mapping@npm:^0.3.9":
+  version: 0.3.25
+  resolution: "@jridgewell/trace-mapping@npm:0.3.25"
   dependencies:
     "@jridgewell/resolve-uri": "npm:^3.1.0"
     "@jridgewell/sourcemap-codec": "npm:^1.4.14"
-  checksum: 10c0/0ea0b2675cf513ec44dc25605616a3c9b808b9832e74b5b63c44260d66b58558bba65764f81928fc1033ead911f8718dca1134049c3e7a93937faf436671df31
+  checksum: 10c0/3d1ce6ebc69df9682a5a8896b414c6537e428a1d68b02fcc8363b04284a8ca0df04d0ee3013132252ab14f2527bc13bea6526a912ecb5658f0e39fd2860b4df4
   languageName: node
   linkType: hard
 
@@ -4789,39 +4789,39 @@ __metadata:
   languageName: node
   linkType: hard
 
-"babel-plugin-polyfill-corejs2@npm:^0.4.8":
-  version: 0.4.8
-  resolution: "babel-plugin-polyfill-corejs2@npm:0.4.8"
+"babel-plugin-polyfill-corejs2@npm:^0.4.10":
+  version: 0.4.10
+  resolution: "babel-plugin-polyfill-corejs2@npm:0.4.10"
   dependencies:
     "@babel/compat-data": "npm:^7.22.6"
-    "@babel/helper-define-polyfill-provider": "npm:^0.5.0"
+    "@babel/helper-define-polyfill-provider": "npm:^0.6.1"
     semver: "npm:^6.3.1"
   peerDependencies:
     "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0
-  checksum: 10c0/843e7528de0e03a31a6f3837896a95f75b0b24b0294a077246282372279e974400b0bdd82399e8f9cbfe42c87ed56540fd71c33eafb7c8e8b9adac546ecc5fe5
+  checksum: 10c0/910bfb1d809cae49cf43348f9b1e4a5e4c895aa25686fdd2ff8af7b7a996b88ad39597707905d097e08d4e70e14340ac935082ef4e035e77f68741f813f2a80d
   languageName: node
   linkType: hard
 
-"babel-plugin-polyfill-corejs3@npm:^0.9.0":
-  version: 0.9.0
-  resolution: "babel-plugin-polyfill-corejs3@npm:0.9.0"
+"babel-plugin-polyfill-corejs3@npm:^0.10.1":
+  version: 0.10.1
+  resolution: "babel-plugin-polyfill-corejs3@npm:0.10.1"
   dependencies:
-    "@babel/helper-define-polyfill-provider": "npm:^0.5.0"
-    core-js-compat: "npm:^3.34.0"
+    "@babel/helper-define-polyfill-provider": "npm:^0.6.1"
+    core-js-compat: "npm:^3.36.0"
   peerDependencies:
     "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0
-  checksum: 10c0/b857010736c5e42e20b683973dae862448a42082fcc95b3ef188305a6864a4f94b5cbd568e49e4cd7172c6b2eace7bc403c3ba0984fbe5479474ade01126d559
+  checksum: 10c0/54ad0b2d2eb44ae8cc20485ef3be6097e262e02ee76003f39734af5e421743dcff478bfc3cc8fef7cda298e1b507c618ff161c47672fd1ae598df0a2ca48b4e1
   languageName: node
   linkType: hard
 
-"babel-plugin-polyfill-regenerator@npm:^0.5.5":
-  version: 0.5.5
-  resolution: "babel-plugin-polyfill-regenerator@npm:0.5.5"
+"babel-plugin-polyfill-regenerator@npm:^0.6.1":
+  version: 0.6.1
+  resolution: "babel-plugin-polyfill-regenerator@npm:0.6.1"
   dependencies:
-    "@babel/helper-define-polyfill-provider": "npm:^0.5.0"
+    "@babel/helper-define-polyfill-provider": "npm:^0.6.1"
   peerDependencies:
     "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0
-  checksum: 10c0/2aab692582082d54e0df9f9373dca1b223e65b4e7e96440160f27ed8803d417a1fa08da550f08aa3820d2010329ca91b68e2b6e9bd7aed51c93d46dfe79629bb
+  checksum: 10c0/0b55a35a75a261f62477d8d0f0c4a8e3b66f109323ce301d7de6898e168c41224de3bc26a92f48f2c7fcc19dfd1fc60fe71098bfd4f804a0463ff78586892403
   languageName: node
   linkType: hard
 
@@ -5883,12 +5883,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"core-js-compat@npm:^3.31.0, core-js-compat@npm:^3.34.0":
-  version: 3.35.1
-  resolution: "core-js-compat@npm:3.35.1"
+"core-js-compat@npm:^3.31.0, core-js-compat@npm:^3.36.0":
+  version: 3.36.1
+  resolution: "core-js-compat@npm:3.36.1"
   dependencies:
-    browserslist: "npm:^4.22.2"
-  checksum: 10c0/c3b872e1f9703aa9554cce816207d85730da4703f1776c540b4da11bbbef6d9a1e6041625b5c1f58d2ada3d05f4a2b92897b7de5315c5ecd5d33d50dec86cca7
+    browserslist: "npm:^4.23.0"
+  checksum: 10c0/70fba18a4095cd8ac04e5ba8cee251e328935859cf2851c1f67770068ea9f9fe71accb1b7de17cd3c9a28d304a4c41712bd9aa895110ebb6e3be71b666b029d1
   languageName: node
   linkType: hard
 

From bd06963c165b376a11d90f632e1988d5890c970f Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 19 Mar 2024 14:39:30 +0100
Subject: [PATCH 0512/2191] Slightly increase font weight of favorite/boost
 numbers in detailed statuses (#29648)

---
 app/javascript/styles/mastodon/components.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 8b7e5f5e84ac07..71f9e0d9d0b2d5 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -1688,6 +1688,7 @@ body > [data-popper-placement] {
 
   .animated-number {
     color: $secondary-text-color;
+    font-weight: 500;
   }
 }
 

From bc6f9befde4e08426127730acebdc13064e1eeb6 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 19 Mar 2024 14:40:16 +0100
Subject: [PATCH 0513/2191] =?UTF-8?q?Change=20=E2=80=9CNotifications?=
 =?UTF-8?q?=E2=80=9D=20settings=20page=20to=20=E2=80=9CE-mail=20notificati?=
 =?UTF-8?q?ons=E2=80=9D=20(#29646)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/locales/en.yml | 2 +-
 config/navigation.rb  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 6fc81ca5fb4b0c..f45175e3fd57db 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1656,7 +1656,7 @@ en:
     import: Import
     import_and_export: Import and export
     migrate: Account migration
-    notifications: Notifications
+    notifications: E-mail notifications
     preferences: Preferences
     profile: Public profile
     relationships: Follows and followers
diff --git a/config/navigation.rb b/config/navigation.rb
index 1e7acf3b9c61d8..734e5294b58423 100644
--- a/config/navigation.rb
+++ b/config/navigation.rb
@@ -12,7 +12,7 @@
 
     n.item :preferences, safe_join([fa_icon('cog fw'), t('settings.preferences')]), settings_preferences_path, if: -> { current_user.functional? && !self_destruct } do |s|
       s.item :appearance, safe_join([fa_icon('desktop fw'), t('settings.appearance')]), settings_preferences_appearance_path
-      s.item :notifications, safe_join([fa_icon('bell fw'), t('settings.notifications')]), settings_preferences_notifications_path
+      s.item :notifications, safe_join([fa_icon('envelope fw'), t('settings.notifications')]), settings_preferences_notifications_path
       s.item :other, safe_join([fa_icon('cog fw'), t('preferences.other')]), settings_preferences_other_path
     end
 

From d7ab5655efde24fd73f9ad4cd6c763852a7004f8 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 19 Mar 2024 10:17:18 -0400
Subject: [PATCH 0514/2191] Replace `render_symbol` method with
 `inline_svg_tag` usage (#29647)

---
 app/helpers/branding_helper.rb          | 11 -----------
 app/views/layouts/application.html.haml |  4 ++--
 app/views/layouts/embedded.html.haml    |  2 +-
 3 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/app/helpers/branding_helper.rb b/app/helpers/branding_helper.rb
index 2b9c233c23bcfa..f72d6df5d9fddc 100644
--- a/app/helpers/branding_helper.rb
+++ b/app/helpers/branding_helper.rb
@@ -21,15 +21,4 @@ def _logo_as_symbol_icon
   def render_logo
     image_pack_tag('logo.svg', alt: 'Mastodon', class: 'logo logo--icon')
   end
-
-  def render_symbol(version = :icon)
-    path = case version
-           when :icon
-             'logo-symbol-icon.svg'
-           when :wordmark
-             'logo-symbol-wordmark.svg'
-           end
-
-    render(file: Rails.root.join('app', 'javascript', 'images', path)).html_safe # rubocop:disable Rails/OutputSafety
-  end
 end
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index c7210736703a41..449657f8cab316 100755
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -44,5 +44,5 @@
     = content_for?(:content) ? yield(:content) : yield
 
     .logo-resources{ 'tabindex' => '-1', 'inert' => true, 'aria-hidden' => true }
-      = render_symbol :icon
-      = render_symbol :wordmark
+      = inline_svg_tag 'logo-symbol-icon.svg'
+      = inline_svg_tag 'logo-symbol-wordmark.svg'
diff --git a/app/views/layouts/embedded.html.haml b/app/views/layouts/embedded.html.haml
index d8aa522d8007e1..54d4ba715764ae 100644
--- a/app/views/layouts/embedded.html.haml
+++ b/app/views/layouts/embedded.html.haml
@@ -21,4 +21,4 @@
     = yield
 
     .logo-resources{ 'tabindex' => '-1', 'inert' => true, 'aria-hidden' => true }
-      = render_symbol :icon
+      = inline_svg_tag 'logo-symbol-icon.svg'

From 62e266fbd6231bd8083df774a93e88155d3f0bd9 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 19 Mar 2024 11:39:14 -0400
Subject: [PATCH 0515/2191] Add `BrowserDetection` model concern (#29513)

---
 app/models/concerns/browser_detection.rb | 27 ++++++++++++++++++++++++
 app/models/login_activity.rb             | 14 ++----------
 app/models/session_activation.rb         | 19 ++---------------
 3 files changed, 31 insertions(+), 29 deletions(-)
 create mode 100644 app/models/concerns/browser_detection.rb

diff --git a/app/models/concerns/browser_detection.rb b/app/models/concerns/browser_detection.rb
new file mode 100644
index 00000000000000..d42d0a5c998283
--- /dev/null
+++ b/app/models/concerns/browser_detection.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module BrowserDetection
+  extend ActiveSupport::Concern
+
+  included do
+    before_save :assign_user_agent
+  end
+
+  def detection
+    @detection ||= Browser.new(user_agent)
+  end
+
+  def browser
+    detection.id
+  end
+
+  def platform
+    detection.platform.id
+  end
+
+  private
+
+  def assign_user_agent
+    self.user_agent ||= ''
+  end
+end
diff --git a/app/models/login_activity.rb b/app/models/login_activity.rb
index 654dd623ad13ca..240d571c0edd38 100644
--- a/app/models/login_activity.rb
+++ b/app/models/login_activity.rb
@@ -16,21 +16,11 @@
 #
 
 class LoginActivity < ApplicationRecord
+  include BrowserDetection
+
   enum :authentication_method, { password: 'password', otp: 'otp', webauthn: 'webauthn', sign_in_token: 'sign_in_token', omniauth: 'omniauth' }
 
   belongs_to :user
 
   validates :authentication_method, inclusion: { in: authentication_methods.keys }
-
-  def detection
-    @detection ||= Browser.new(user_agent)
-  end
-
-  def browser
-    detection.id
-  end
-
-  def platform
-    detection.platform.id
-  end
 end
diff --git a/app/models/session_activation.rb b/app/models/session_activation.rb
index c67180d3baf54e..d0a77daf0a666c 100644
--- a/app/models/session_activation.rb
+++ b/app/models/session_activation.rb
@@ -16,6 +16,8 @@
 #
 
 class SessionActivation < ApplicationRecord
+  include BrowserDetection
+
   belongs_to :user, inverse_of: :session_activations
   belongs_to :access_token, class_name: 'Doorkeeper::AccessToken', dependent: :destroy, optional: true
   belongs_to :web_push_subscription, class_name: 'Web::PushSubscription', dependent: :destroy, optional: true
@@ -24,19 +26,6 @@ class SessionActivation < ApplicationRecord
            to: :access_token,
            allow_nil: true
 
-  def detection
-    @detection ||= Browser.new(user_agent)
-  end
-
-  def browser
-    detection.id
-  end
-
-  def platform
-    detection.platform.id
-  end
-
-  before_save   :assign_user_agent
   before_create :assign_access_token
 
   class << self
@@ -67,10 +56,6 @@ def exclusive(id)
 
   private
 
-  def assign_user_agent
-    self.user_agent = '' if user_agent.nil?
-  end
-
   def assign_access_token
     self.access_token = Doorkeeper::AccessToken.create!(access_token_attributes)
   end

From ffc5be4820ed7bad4656489f096230dd7965140b Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 19 Mar 2024 16:39:26 +0100
Subject: [PATCH 0516/2191] =?UTF-8?q?Change=20filtered=20icon=20from=20?=
 =?UTF-8?q?=E2=80=9Carchive=E2=80=9D=20to=20=E2=80=9Cinventory=202?=
 =?UTF-8?q?=E2=80=9D=20(#29652)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/filtered_notifications_banner.jsx             | 5 ++---
 app/javascript/mastodon/features/notifications/request.jsx   | 4 ++--
 app/javascript/mastodon/features/notifications/requests.jsx  | 4 ++--
 app/javascript/material-icons/400-24px/archive-fill.svg      | 1 -
 app/javascript/material-icons/400-24px/archive.svg           | 1 -
 app/javascript/material-icons/400-24px/inventory_2-fill.svg  | 1 +
 app/javascript/material-icons/400-24px/inventory_2.svg       | 1 +
 7 files changed, 8 insertions(+), 9 deletions(-)
 delete mode 100644 app/javascript/material-icons/400-24px/archive-fill.svg
 delete mode 100644 app/javascript/material-icons/400-24px/archive.svg
 create mode 100644 app/javascript/material-icons/400-24px/inventory_2-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/inventory_2.svg

diff --git a/app/javascript/mastodon/features/notifications/components/filtered_notifications_banner.jsx b/app/javascript/mastodon/features/notifications/components/filtered_notifications_banner.jsx
index bf9467bd634c8a..adf58afbf0951b 100644
--- a/app/javascript/mastodon/features/notifications/components/filtered_notifications_banner.jsx
+++ b/app/javascript/mastodon/features/notifications/components/filtered_notifications_banner.jsx
@@ -6,8 +6,7 @@ import { Link } from 'react-router-dom';
 
 import { useDispatch, useSelector } from 'react-redux';
 
-
-import ArchiveIcon from '@/material-icons/400-24px/archive.svg?react';
+import InventoryIcon from '@/material-icons/400-24px/inventory_2.svg?react';
 import { fetchNotificationPolicy } from 'mastodon/actions/notifications';
 import { Icon } from 'mastodon/components/icon';
 import { toCappedNumber } from 'mastodon/utils/numbers';
@@ -34,7 +33,7 @@ export const FilteredNotificationsBanner = () => {
 
   return (
     <Link className='filtered-notifications-banner' to='/notifications/requests'>
-      <Icon icon={ArchiveIcon} />
+      <Icon icon={InventoryIcon} />
 
       <div className='filtered-notifications-banner__text'>
         <strong><FormattedMessage id='filtered_notifications_banner.title' defaultMessage='Filtered notifications' /></strong>
diff --git a/app/javascript/mastodon/features/notifications/request.jsx b/app/javascript/mastodon/features/notifications/request.jsx
index d1f449844067cd..09bef3beab8cf0 100644
--- a/app/javascript/mastodon/features/notifications/request.jsx
+++ b/app/javascript/mastodon/features/notifications/request.jsx
@@ -7,8 +7,8 @@ import { Helmet } from 'react-helmet';
 
 import { useSelector, useDispatch } from 'react-redux';
 
-import ArchiveIcon from '@/material-icons/400-24px/archive.svg?react';
 import DoneIcon from '@/material-icons/400-24px/done.svg?react';
+import InventoryIcon from '@/material-icons/400-24px/inventory_2.svg?react';
 import VolumeOffIcon from '@/material-icons/400-24px/volume_off.svg?react';
 import { fetchNotificationRequest, fetchNotificationsForRequest, expandNotificationsForRequest, acceptNotificationRequest, dismissNotificationRequest } from 'mastodon/actions/notifications';
 import Column from 'mastodon/components/column';
@@ -94,7 +94,7 @@ export const NotificationRequest = ({ multiColumn, params: { id } }) => {
     <Column bindToDocument={!multiColumn} ref={columnRef} label={columnTitle}>
       <ColumnHeader
         icon='archive'
-        iconComponent={ArchiveIcon}
+        iconComponent={InventoryIcon}
         title={columnTitle}
         onClick={handleHeaderClick}
         multiColumn={multiColumn}
diff --git a/app/javascript/mastodon/features/notifications/requests.jsx b/app/javascript/mastodon/features/notifications/requests.jsx
index 46e3c428a6ea83..2d10c6a06c0771 100644
--- a/app/javascript/mastodon/features/notifications/requests.jsx
+++ b/app/javascript/mastodon/features/notifications/requests.jsx
@@ -7,7 +7,7 @@ import { Helmet } from 'react-helmet';
 
 import { useSelector, useDispatch } from 'react-redux';
 
-import ArchiveIcon from '@/material-icons/400-24px/archive.svg?react';
+import InventoryIcon from '@/material-icons/400-24px/inventory_2.svg?react';
 import { fetchNotificationRequests, expandNotificationRequests } from 'mastodon/actions/notifications';
 import Column from 'mastodon/components/column';
 import ColumnHeader from 'mastodon/components/column_header';
@@ -43,7 +43,7 @@ export const NotificationRequests = ({ multiColumn }) => {
     <Column bindToDocument={!multiColumn} ref={columnRef} label={intl.formatMessage(messages.title)}>
       <ColumnHeader
         icon='archive'
-        iconComponent={ArchiveIcon}
+        iconComponent={InventoryIcon}
         title={intl.formatMessage(messages.title)}
         onClick={handleHeaderClick}
         multiColumn={multiColumn}
diff --git a/app/javascript/material-icons/400-24px/archive-fill.svg b/app/javascript/material-icons/400-24px/archive-fill.svg
deleted file mode 100644
index bb604288f5bd9b..00000000000000
--- a/app/javascript/material-icons/400-24px/archive-fill.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="m480-240 160-160-56-56-64 64v-168h-80v168l-64-64-56 56 160 160ZM200-120q-33 0-56.5-23.5T120-200v-499q0-14 4.5-27t13.5-24l50-61q11-14 27.5-21.5T250-840h460q18 0 34.5 7.5T772-811l50 61q9 11 13.5 24t4.5 27v499q0 33-23.5 56.5T760-120H200Zm16-600h528l-34-40H250l-34 40Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/archive.svg b/app/javascript/material-icons/400-24px/archive.svg
deleted file mode 100644
index 6b72fca4ee700d..00000000000000
--- a/app/javascript/material-icons/400-24px/archive.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="m480-240 160-160-56-56-64 64v-168h-80v168l-64-64-56 56 160 160ZM200-640v440h560v-440H200Zm0 520q-33 0-56.5-23.5T120-200v-499q0-14 4.5-27t13.5-24l50-61q11-14 27.5-21.5T250-840h460q18 0 34.5 7.5T772-811l50 61q9 11 13.5 24t4.5 27v499q0 33-23.5 56.5T760-120H200Zm16-600h528l-34-40H250l-34 40Zm264 300Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/inventory_2-fill.svg b/app/javascript/material-icons/400-24px/inventory_2-fill.svg
new file mode 100644
index 00000000000000..10ec85da046f87
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/inventory_2-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M200-80q-33 0-56.5-23.5T120-160v-451q-18-11-29-28.5T80-680v-120q0-33 23.5-56.5T160-880h640q33 0 56.5 23.5T880-800v120q0 23-11 40.5T840-611v451q0 33-23.5 56.5T760-80H200Zm-40-600h640v-120H160v120Zm200 280h240v-80H360v80Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/inventory_2.svg b/app/javascript/material-icons/400-24px/inventory_2.svg
new file mode 100644
index 00000000000000..d00fb1a632cf2d
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/inventory_2.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M200-80q-33 0-56.5-23.5T120-160v-451q-18-11-29-28.5T80-680v-120q0-33 23.5-56.5T160-880h640q33 0 56.5 23.5T880-800v120q0 23-11 40.5T840-611v451q0 33-23.5 56.5T760-80H200Zm0-520v440h560v-440H200Zm-40-80h640v-120H160v120Zm200 280h240v-80H360v80Zm120 20Z"/></svg>
\ No newline at end of file

From 4c84891453378ca9db03657ec42f96684223e85c Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 19 Mar 2024 12:11:10 -0400
Subject: [PATCH 0517/2191] Pull out full `li` element into
 admin/status_edits/status_edit partial (#29499)

---
 .../admin/status_edits/_status_edit.html.haml | 44 ++++++++++++-------
 app/views/admin/statuses/show.html.haml       | 13 +-----
 2 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/app/views/admin/status_edits/_status_edit.html.haml b/app/views/admin/status_edits/_status_edit.html.haml
index 19a0e063dabf5e..72547772132ec4 100644
--- a/app/views/admin/status_edits/_status_edit.html.haml
+++ b/app/views/admin/status_edits/_status_edit.html.haml
@@ -1,20 +1,30 @@
-.status
-  .status__content><
-    - if status_edit.spoiler_text.blank?
-      = prerender_custom_emojis(status_content_format(status_edit), status_edit.emojis)
-    - else
-      %details<
-        %summary><
-          %strong> Content warning: #{prerender_custom_emojis(h(status_edit.spoiler_text), status_edit.emojis)}
-        = prerender_custom_emojis(status_content_format(status_edit), status_edit.emojis)
+%li
+  .history__entry
+    %h5
+      - if status_edit_iteration.first?
+        = t('admin.statuses.original_status')
+      - else
+        = t('admin.statuses.status_changed')
+      ·
+      %time.formatted{ datetime: status_edit.created_at.iso8601, title: l(status_edit.created_at) }= l(status_edit.created_at)
 
-  - unless status_edit.ordered_media_attachments.empty?
-    = render partial: 'admin/reports/media_attachments', locals: { status: status_edit }
+    .status
+      .status__content><
+        - if status_edit.spoiler_text.blank?
+          = prerender_custom_emojis(status_content_format(status_edit), status_edit.emojis)
+        - else
+          %details<
+            %summary><
+              %strong> Content warning: #{prerender_custom_emojis(h(status_edit.spoiler_text), status_edit.emojis)}
+            = prerender_custom_emojis(status_content_format(status_edit), status_edit.emojis)
 
-  .detailed-status__meta
-    %time.formatted{ datetime: status_edit.created_at.iso8601, title: l(status_edit.created_at) }= l(status_edit.created_at)
+      - unless status_edit.ordered_media_attachments.empty?
+        = render partial: 'admin/reports/media_attachments', locals: { status: status_edit }
 
-    - if status_edit.sensitive?
-      ·
-      = fa_icon('eye-slash fw')
-      = t('stream_entries.sensitive_content')
+      .detailed-status__meta
+        %time.formatted{ datetime: status_edit.created_at.iso8601, title: l(status_edit.created_at) }= l(status_edit.created_at)
+
+        - if status_edit.sensitive?
+          ·
+          = fa_icon('eye-slash fw')
+          = t('stream_entries.sensitive_content')
diff --git a/app/views/admin/statuses/show.html.haml b/app/views/admin/statuses/show.html.haml
index 0e88624def4359..9cadde2870c3e1 100644
--- a/app/views/admin/statuses/show.html.haml
+++ b/app/views/admin/statuses/show.html.haml
@@ -47,15 +47,4 @@
 %h3= t('admin.statuses.history')
 
 %ol.history
-  - batched_ordered_status_edits.with_index do |status_edit, i|
-    %li
-      .history__entry
-        %h5
-          - if i.zero?
-            = t('admin.statuses.original_status')
-          - else
-            = t('admin.statuses.status_changed')
-          ·
-          %time.formatted{ datetime: status_edit.created_at.iso8601, title: l(status_edit.created_at) }= l(status_edit.created_at)
-
-        = render status_edit
+  = render partial: 'admin/status_edits/status_edit', collection: batched_ordered_status_edits

From 327da54e23aef11e8b2a19b2101a0944c1a45be5 Mon Sep 17 00:00:00 2001
From: Essem <smswessem@gmail.com>
Date: Thu, 14 Mar 2024 20:51:15 -0500
Subject: [PATCH 0518/2191] Use a consumer for identity

---
 .../flavours/glitch/components/status.jsx     | 21 ++++++++++++-------
 .../features/ui/util/identity_consumer.jsx    | 16 ++++++++++++++
 2 files changed, 29 insertions(+), 8 deletions(-)
 create mode 100644 app/javascript/flavours/glitch/features/ui/util/identity_consumer.jsx

diff --git a/app/javascript/flavours/glitch/components/status.jsx b/app/javascript/flavours/glitch/components/status.jsx
index ad3f86c7c1b098..0faa6d1dbd1005 100644
--- a/app/javascript/flavours/glitch/components/status.jsx
+++ b/app/javascript/flavours/glitch/components/status.jsx
@@ -20,6 +20,7 @@ import Card from '../features/status/components/card';
 // to use the progress bar to show download progress
 import Bundle from '../features/ui/components/bundle';
 import { MediaGallery, Video, Audio } from '../features/ui/util/async-components';
+import { IdentityConsumer } from '../features/ui/util/identity_consumer';
 import { SensitiveMediaContext } from '../features/ui/util/sensitive_media_context';
 import { displayMedia, visibleReactions } from '../initial_state';
 
@@ -845,14 +846,18 @@ class Status extends ImmutablePureComponent {
               {...statusContentProps}
             />
 
-            <StatusReactions
-              statusId={status.get('id')}
-              reactions={status.get('reactions')}
-              numVisible={visibleReactions}
-              addReaction={this.props.onReactionAdd}
-              removeReaction={this.props.onReactionRemove}
-              canReact={this.context.identity.signedIn}
-            />
+            <IdentityConsumer>
+              {identity => (
+                <StatusReactions
+                  statusId={status.get('id')}
+                  reactions={status.get('reactions')}
+                  numVisible={visibleReactions}
+                  addReaction={this.props.onReactionAdd}
+                  removeReaction={this.props.onReactionRemove}
+                  canReact={identity.signedIn}
+                />
+              )}
+            </IdentityConsumer>
 
             {(!isCollapsed || !(muted || !settings.getIn(['collapsed', 'show_action_bar']))) && (
               <StatusActionBar
diff --git a/app/javascript/flavours/glitch/features/ui/util/identity_consumer.jsx b/app/javascript/flavours/glitch/features/ui/util/identity_consumer.jsx
new file mode 100644
index 00000000000000..bf7c7e70f93105
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/ui/util/identity_consumer.jsx
@@ -0,0 +1,16 @@
+import PropTypes from 'prop-types';
+import { PureComponent } from 'react';
+
+export class IdentityConsumer extends PureComponent {
+  static contextTypes = {
+    identity: PropTypes.object
+  };
+
+  static propTypes = {
+    children: PropTypes.func.isRequired
+  };
+
+  render() {
+    return this.props.children(this.context.identity);
+  }
+}

From d959501ef1faad8ae312ef027d3c68fec6ccf7fd Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Sat, 16 Mar 2024 02:11:59 +0100
Subject: [PATCH 0519/2191] [Glitch] Fix extra separator besides favourite
 count on private posts

Port 726e7ad0248495951c767197c06dc7127945569f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../glitch/features/status/components/detailed_status.jsx       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/flavours/glitch/features/status/components/detailed_status.jsx b/app/javascript/flavours/glitch/features/status/components/detailed_status.jsx
index 31d90dd8159687..a5704665fd8c44 100644
--- a/app/javascript/flavours/glitch/features/status/components/detailed_status.jsx
+++ b/app/javascript/flavours/glitch/features/status/components/detailed_status.jsx
@@ -322,7 +322,7 @@ class DetailedStatus extends ImmutablePureComponent {
 
             <div className='detailed-status__meta__line'>
               {reblogLink}
-              ·
+              {reblogLink && <>·</>}
               {favouriteLink}
             </div>
           </div>

From ccf2f2cb75d6f5a307b5b82b3ee445b1cabbaad5 Mon Sep 17 00:00:00 2001
From: Jeong Arm <kjwonmail@gmail.com>
Date: Tue, 19 Mar 2024 17:18:14 +0900
Subject: [PATCH 0520/2191] [Glitch] Fix mute for 30 days

Port 39839baec378eb2b9bcd709fd8d7784e81e1674a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/features/ui/components/mute_modal.jsx       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/flavours/glitch/features/ui/components/mute_modal.jsx b/app/javascript/flavours/glitch/features/ui/components/mute_modal.jsx
index a161e2486156c3..f94adbd858588b 100644
--- a/app/javascript/flavours/glitch/features/ui/components/mute_modal.jsx
+++ b/app/javascript/flavours/glitch/features/ui/components/mute_modal.jsx
@@ -118,7 +118,7 @@ export const MuteModal = ({ accountId, acct }) => {
             <RadioButtonLabel name='duration' value='0' label={intl.formatMessage(messages.indefinite)} currentValue={muteDuration} onChange={handleChangeMuteDuration} />
             <RadioButtonLabel name='duration' value='86400' label={intl.formatMessage(messages.hours, { number: 24 })} currentValue={muteDuration} onChange={handleChangeMuteDuration} />
             <RadioButtonLabel name='duration' value='604800' label={intl.formatMessage(messages.days, { number: 7 })} currentValue={muteDuration} onChange={handleChangeMuteDuration} />
-            <RadioButtonLabel name='duration' value='x' label={intl.formatMessage(messages.days, { number: 30 })} currentValue={muteDuration} onChange={handleChangeMuteDuration} />
+            <RadioButtonLabel name='duration' value='2592000' label={intl.formatMessage(messages.days, { number: 30 })} currentValue={muteDuration} onChange={handleChangeMuteDuration} />
           </div>
 
           <div className='safety-action-modal__field-group'>

From 885a4c73cbcfa97b33ac64b41c4bb8e95d229b37 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 19 Mar 2024 09:20:53 +0100
Subject: [PATCH 0521/2191] [Glitch] Add badge on account card in report
 moderation interface when account is already suspended

Port cf08a438e7ce7981c209b0faa54a32c5bbe40930 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/styles/admin.scss | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/app/javascript/flavours/glitch/styles/admin.scss b/app/javascript/flavours/glitch/styles/admin.scss
index ca4346558c7eb0..de8cc64e4f6163 100644
--- a/app/javascript/flavours/glitch/styles/admin.scss
+++ b/app/javascript/flavours/glitch/styles/admin.scss
@@ -1401,6 +1401,19 @@ a.sparkline {
 .account-card {
   border-radius: 4px;
   border: 1px solid lighten($ui-base-color, 8%);
+  position: relative;
+
+  &__warning-badge {
+    position: absolute;
+    padding: 4px 10px;
+    top: 10px;
+    inset-inline-start: 10px;
+    border-radius: 4px;
+    background:
+      url('~images/warning-stripes.svg') repeat-y left,
+      url('~images/warning-stripes.svg') repeat-y right,
+      var(--background-color);
+  }
 
   &__permalink {
     color: inherit;

From 8b3bd12def2f43b03dd079139d8ff7238afdc822 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 19 Mar 2024 14:39:30 +0100
Subject: [PATCH 0522/2191] [Glitch] Slightly increase font weight of
 favorite/boost numbers in detailed statuses

Port bd06963c165b376a11d90f632e1988d5890c970f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/styles/components.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index 8c74f6d2d08ccd..fba040a1c61f4b 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -1900,6 +1900,7 @@ body > [data-popper-placement] {
 
   .animated-number {
     color: $secondary-text-color;
+    font-weight: 500;
   }
 }
 

From da2bb672ce5fcd23033e73c60cc7f7ed7d1e0ccb Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 19 Mar 2024 16:39:26 +0100
Subject: [PATCH 0523/2191] =?UTF-8?q?[Glitch]=20Change=20filtered=20icon?=
 =?UTF-8?q?=20from=20=E2=80=9Carchive=E2=80=9D=20to=20=E2=80=9Cinventory?=
 =?UTF-8?q?=202=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Port ffc5be4820ed7bad4656489f096230dd7965140b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../components/filtered_notifications_banner.jsx             | 5 ++---
 .../flavours/glitch/features/notifications/request.jsx       | 4 ++--
 .../flavours/glitch/features/notifications/requests.jsx      | 4 ++--
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/app/javascript/flavours/glitch/features/notifications/components/filtered_notifications_banner.jsx b/app/javascript/flavours/glitch/features/notifications/components/filtered_notifications_banner.jsx
index 2cd843ebc99239..59496628288476 100644
--- a/app/javascript/flavours/glitch/features/notifications/components/filtered_notifications_banner.jsx
+++ b/app/javascript/flavours/glitch/features/notifications/components/filtered_notifications_banner.jsx
@@ -6,8 +6,7 @@ import { Link } from 'react-router-dom';
 
 import { useDispatch, useSelector } from 'react-redux';
 
-
-import ArchiveIcon from '@/material-icons/400-24px/archive.svg?react';
+import InventoryIcon from '@/material-icons/400-24px/inventory_2.svg?react';
 import { fetchNotificationPolicy } from 'flavours/glitch/actions/notifications';
 import { Icon } from 'flavours/glitch/components/icon';
 import { toCappedNumber } from 'flavours/glitch/utils/numbers';
@@ -34,7 +33,7 @@ export const FilteredNotificationsBanner = () => {
 
   return (
     <Link className='filtered-notifications-banner' to='/notifications/requests'>
-      <Icon icon={ArchiveIcon} />
+      <Icon icon={InventoryIcon} />
 
       <div className='filtered-notifications-banner__text'>
         <strong><FormattedMessage id='filtered_notifications_banner.title' defaultMessage='Filtered notifications' /></strong>
diff --git a/app/javascript/flavours/glitch/features/notifications/request.jsx b/app/javascript/flavours/glitch/features/notifications/request.jsx
index ea13a2ed6fe31e..4a6a189b8f8de6 100644
--- a/app/javascript/flavours/glitch/features/notifications/request.jsx
+++ b/app/javascript/flavours/glitch/features/notifications/request.jsx
@@ -7,8 +7,8 @@ import { Helmet } from 'react-helmet';
 
 import { useSelector, useDispatch } from 'react-redux';
 
-import ArchiveIcon from '@/material-icons/400-24px/archive.svg?react';
 import DoneIcon from '@/material-icons/400-24px/done.svg?react';
+import InventoryIcon from '@/material-icons/400-24px/inventory_2.svg?react';
 import VolumeOffIcon from '@/material-icons/400-24px/volume_off.svg?react';
 import { fetchNotificationRequest, fetchNotificationsForRequest, expandNotificationsForRequest, acceptNotificationRequest, dismissNotificationRequest } from 'flavours/glitch/actions/notifications';
 import Column from 'flavours/glitch/components/column';
@@ -94,7 +94,7 @@ export const NotificationRequest = ({ multiColumn, params: { id } }) => {
     <Column bindToDocument={!multiColumn} ref={columnRef} label={columnTitle}>
       <ColumnHeader
         icon='archive'
-        iconComponent={ArchiveIcon}
+        iconComponent={InventoryIcon}
         title={columnTitle}
         onClick={handleHeaderClick}
         multiColumn={multiColumn}
diff --git a/app/javascript/flavours/glitch/features/notifications/requests.jsx b/app/javascript/flavours/glitch/features/notifications/requests.jsx
index 6cb77b997b3836..d7a07da152c750 100644
--- a/app/javascript/flavours/glitch/features/notifications/requests.jsx
+++ b/app/javascript/flavours/glitch/features/notifications/requests.jsx
@@ -7,7 +7,7 @@ import { Helmet } from 'react-helmet';
 
 import { useSelector, useDispatch } from 'react-redux';
 
-import ArchiveIcon from '@/material-icons/400-24px/archive.svg?react';
+import InventoryIcon from '@/material-icons/400-24px/inventory_2.svg?react';
 import { fetchNotificationRequests, expandNotificationRequests } from 'flavours/glitch/actions/notifications';
 import Column from 'flavours/glitch/components/column';
 import ColumnHeader from 'flavours/glitch/components/column_header';
@@ -43,7 +43,7 @@ export const NotificationRequests = ({ multiColumn }) => {
     <Column bindToDocument={!multiColumn} ref={columnRef} label={intl.formatMessage(messages.title)}>
       <ColumnHeader
         icon='archive'
-        iconComponent={ArchiveIcon}
+        iconComponent={InventoryIcon}
         title={intl.formatMessage(messages.title)}
         onClick={handleHeaderClick}
         multiColumn={multiColumn}

From d0dfcc9f3a3a750b7755f1f519311826afe11ef2 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 19 Mar 2024 19:58:04 +0100
Subject: [PATCH 0524/2191] Fix build issue with glitch-soc's theming system

---
 app/javascript/styles/mastodon/admin.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/javascript/styles/mastodon/admin.scss b/app/javascript/styles/mastodon/admin.scss
index 64f7b89b6cf121..7ae1bbdd6c01c6 100644
--- a/app/javascript/styles/mastodon/admin.scss
+++ b/app/javascript/styles/mastodon/admin.scss
@@ -1405,8 +1405,8 @@ a.sparkline {
     inset-inline-start: 10px;
     border-radius: 4px;
     background:
-      url('../images/warning-stripes.svg') repeat-y left,
-      url('../images/warning-stripes.svg') repeat-y right,
+      url('~images/warning-stripes.svg') repeat-y left,
+      url('~images/warning-stripes.svg') repeat-y right,
       var(--background-color);
   }
 

From 5f1380415fc3bc8abe38c5077cb30b6f2ff60f58 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 20 Mar 2024 09:19:08 +0100
Subject: [PATCH 0525/2191] Update dependency postcss to v8.4.37 (#29656)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 8d504c719a74b8..bb2722fba02da8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -13042,13 +13042,13 @@ __metadata:
   linkType: hard
 
 "postcss@npm:^8.2.15, postcss@npm:^8.4.24, postcss@npm:^8.4.33":
-  version: 8.4.36
-  resolution: "postcss@npm:8.4.36"
+  version: 8.4.37
+  resolution: "postcss@npm:8.4.37"
   dependencies:
     nanoid: "npm:^3.3.7"
     picocolors: "npm:^1.0.0"
-    source-map-js: "npm:^1.1.0"
-  checksum: 10c0/e7c834e31d8f4e8dfd0a427df36fdc7bdc58a16e373551618e2c3ac172019eb816b24f1b4709311ebcade8d3ba31b2d75522d28ef45ecbbeb11eb01f265579fb
+    source-map-js: "npm:^1.2.0"
+  checksum: 10c0/0b5730ad0ccbceaf0faaa4a283a144adefd23254f17dbdd63be5e0b37193c7df58003f88742c04c3ae6fd60d1a5158b331a4ce926797fb21e94833ae83c6bf69
   languageName: node
   linkType: hard
 
@@ -14989,10 +14989,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"source-map-js@npm:>=0.6.2 <2.0.0, source-map-js@npm:^1.0.1, source-map-js@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "source-map-js@npm:1.1.0"
-  checksum: 10c0/d1f016efe4fcf67fd92e36da0670f2889b13a36cc453329758336450e811c61164376eb451b453b4dd4e89a760f841b0a014942d54f240af31a791829bc0e336
+"source-map-js@npm:>=0.6.2 <2.0.0, source-map-js@npm:^1.0.1, source-map-js@npm:^1.2.0":
+  version: 1.2.0
+  resolution: "source-map-js@npm:1.2.0"
+  checksum: 10c0/7e5f896ac10a3a50fe2898e5009c58ff0dc102dcb056ed27a354623a0ece8954d4b2649e1a1b2b52ef2e161d26f8859c7710350930751640e71e374fe2d321a4
   languageName: node
   linkType: hard
 

From 6c0b1a41a1b3ef15288a29ac2d486a822c4cbd14 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 20 Mar 2024 09:39:42 +0100
Subject: [PATCH 0526/2191] New Crowdin Translations (automated) (#29657)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/fo.json    |  2 +-
 app/javascript/mastodon/locales/hu.json    | 22 ++++++------
 app/javascript/mastodon/locales/ko.json    |  9 +++--
 app/javascript/mastodon/locales/nn.json    | 28 +++++++++++++++-
 app/javascript/mastodon/locales/pt-PT.json | 39 ++++++++++++++++++++++
 app/javascript/mastodon/locales/ry.json    |  8 +++++
 app/javascript/mastodon/locales/sk.json    | 14 ++++++++
 config/locales/an.yml                      |  1 -
 config/locales/ar.yml                      |  1 -
 config/locales/ast.yml                     |  1 -
 config/locales/be.yml                      |  1 -
 config/locales/bg.yml                      |  5 ++-
 config/locales/ca.yml                      |  5 ++-
 config/locales/ckb.yml                     |  1 -
 config/locales/co.yml                      |  1 -
 config/locales/cs.yml                      |  1 -
 config/locales/cy.yml                      |  1 -
 config/locales/da.yml                      |  5 ++-
 config/locales/de.yml                      |  5 ++-
 config/locales/el.yml                      |  1 -
 config/locales/en-GB.yml                   |  1 -
 config/locales/eo.yml                      |  1 -
 config/locales/es-AR.yml                   |  2 +-
 config/locales/es-MX.yml                   |  8 ++++-
 config/locales/es.yml                      |  2 +-
 config/locales/et.yml                      |  1 -
 config/locales/eu.yml                      |  5 ++-
 config/locales/fa.yml                      |  1 -
 config/locales/fi.yml                      |  5 ++-
 config/locales/fo.yml                      |  9 +++--
 config/locales/fr-CA.yml                   |  1 -
 config/locales/fr.yml                      |  1 -
 config/locales/fy.yml                      |  1 -
 config/locales/ga.yml                      |  1 -
 config/locales/gd.yml                      |  1 -
 config/locales/gl.yml                      |  5 ++-
 config/locales/he.yml                      |  4 ++-
 config/locales/hr.yml                      |  1 -
 config/locales/hu.yml                      |  5 ++-
 config/locales/hy.yml                      |  1 -
 config/locales/id.yml                      |  1 -
 config/locales/ie.yml                      |  1 -
 config/locales/io.yml                      |  1 -
 config/locales/is.yml                      |  4 ++-
 config/locales/it.yml                      |  5 ++-
 config/locales/ja.yml                      |  1 -
 config/locales/ka.yml                      |  1 -
 config/locales/kab.yml                     |  1 -
 config/locales/kk.yml                      |  1 -
 config/locales/ko.yml                      |  7 +++-
 config/locales/ku.yml                      |  1 -
 config/locales/lad.yml                     |  4 ++-
 config/locales/lt.yml                      |  4 ++-
 config/locales/lv.yml                      |  1 -
 config/locales/ml.yml                      |  2 --
 config/locales/ms.yml                      |  1 -
 config/locales/my.yml                      |  1 -
 config/locales/nl.yml                      |  5 ++-
 config/locales/nn.yml                      | 24 ++++++++-----
 config/locales/no.yml                      |  1 -
 config/locales/oc.yml                      |  1 -
 config/locales/pl.yml                      |  5 ++-
 config/locales/pt-BR.yml                   |  1 -
 config/locales/pt-PT.yml                   |  8 ++++-
 config/locales/ru.yml                      |  1 -
 config/locales/sc.yml                      |  1 -
 config/locales/sco.yml                     |  1 -
 config/locales/si.yml                      |  1 -
 config/locales/simple_form.nn.yml          |  2 +-
 config/locales/sk.yml                      |  8 ++++-
 config/locales/sl.yml                      |  5 ++-
 config/locales/sq.yml                      |  5 ++-
 config/locales/sr-Latn.yml                 |  1 -
 config/locales/sr.yml                      |  1 -
 config/locales/sv.yml                      |  2 +-
 config/locales/th.yml                      |  5 ++-
 config/locales/tr.yml                      |  5 ++-
 config/locales/tt.yml                      |  1 -
 config/locales/uk.yml                      |  5 ++-
 config/locales/vi.yml                      |  1 -
 config/locales/zgh.yml                     |  1 -
 config/locales/zh-CN.yml                   |  5 ++-
 config/locales/zh-HK.yml                   |  1 -
 config/locales/zh-TW.yml                   |  5 ++-
 84 files changed, 243 insertions(+), 103 deletions(-)

diff --git a/app/javascript/mastodon/locales/fo.json b/app/javascript/mastodon/locales/fo.json
index c3e3f8cc1af64a..27c0c8548fbbd0 100644
--- a/app/javascript/mastodon/locales/fo.json
+++ b/app/javascript/mastodon/locales/fo.json
@@ -7,7 +7,7 @@
   "about.domain_blocks.silenced.explanation": "Yvirhøvur, so sært tú ikki vangar og innihald frá hesum ambætaranum, uttan so at tú skilliga leitar hesi upp ella velur tey við at fylgja teimum.",
   "about.domain_blocks.silenced.title": "Avmarkað",
   "about.domain_blocks.suspended.explanation": "Ongar dátur frá hesum ambætara verða viðgjørd, goymd ella deild, tað ger, at samskifti við aðrar ambætarar er iki møguligt.",
-  "about.domain_blocks.suspended.title": "Koyrdur frá",
+  "about.domain_blocks.suspended.title": "Gjørt óvirkið",
   "about.not_available": "Hetta er ikki tøkt á føroyska servaranum enn.",
   "about.powered_by": "Miðfirra almennur miðil koyrandi á {mastodon}",
   "about.rules": "Ambætarareglur",
diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json
index c13c8dc220c3a1..38e46399d3f63c 100644
--- a/app/javascript/mastodon/locales/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@@ -92,11 +92,11 @@
   "block_modal.remote_users_caveat": "Arra kérjük a {domain} kiszolgálót, hogy tartsa tiszteletben a döntésedet. Ugyanakkor az együttműködés nem garantált, mivel néhány kiszolgáló másképp kezelheti a letiltásokat. A nyilvános bejegyzések a be nem jelentkezett felhasználók számára továbbra is látszódhatnak.",
   "block_modal.show_less": "Kevesebb mutatása",
   "block_modal.show_more": "Több mutatása",
-  "block_modal.they_cant_mention": "Nem említhetnek meg vagy követhetnek téged.",
-  "block_modal.they_cant_see_posts": "Nem láthatják a bejegyzéseidet, és te sem fogod látni az övékét.",
-  "block_modal.they_will_know": "Láthatják, hogy le vannak tiltva.",
+  "block_modal.they_cant_mention": "Nem említhet meg és nem követhet téged.",
+  "block_modal.they_cant_see_posts": "Nem láthatja a bejegyzéseidet, és te sem fogod látni az övéit.",
+  "block_modal.they_will_know": "Láthatja, hogy le van tiltva.",
   "block_modal.title": "Letiltsuk a felhasználót?",
-  "block_modal.you_wont_see_mentions": "Nem látsz majd őket említő bejegyzéseket.",
+  "block_modal.you_wont_see_mentions": "Nem látsz majd őt említő bejegyzéseket.",
   "boost_modal.combo": "Hogy átugord ezt következő alkalommal, használd {combo}",
   "bundle_column_error.copy_stacktrace": "Hibajelentés másolása",
   "bundle_column_error.error.body": "A kért lap nem jeleníthető meg. Ez lehet, hogy kódhiba, vagy böngészőkompatibitási hiba.",
@@ -176,7 +176,7 @@
   "confirmations.delete_list.confirm": "Törlés",
   "confirmations.delete_list.message": "Biztos, hogy véglegesen törölni szeretnéd ezt a listát?",
   "confirmations.discard_edit_media.confirm": "Elvetés",
-  "confirmations.discard_edit_media.message": "Elmentetlen változtatásaid vannak a média leírásában vagy előnézetében. Eldobjuk őket?",
+  "confirmations.discard_edit_media.message": "Mentetlen változtatásaid vannak a média leírásában vagy előnézetében, mindenképp elveted?",
   "confirmations.domain_block.confirm": "Kiszolgáló letiltása",
   "confirmations.domain_block.message": "Biztos, hogy le szeretnéd tiltani a teljes {domain} domaint? A legtöbb esetben néhány célzott tiltás vagy némítás elegendő, és kívánatosabb megoldás. Semmilyen tartalmat nem fogsz látni ebből a domainből se az idővonalakon, se az értesítésekben. Az ebben a domainben lévő követőidet is eltávolítjuk.",
   "confirmations.edit.confirm": "Szerkesztés",
@@ -213,7 +213,7 @@
   "domain_block_modal.block_account_instead": "Helyette @{name} letiltása",
   "domain_block_modal.they_can_interact_with_old_posts": "Az ezen a kiszolgálón lévő emberek interaktálhatnak a régi bejegyzéseiddel.",
   "domain_block_modal.they_cant_follow": "Erről a kiszolgálóról senki sem követhet.",
-  "domain_block_modal.they_wont_know": "Nem fogják tudni, hogy letiltották őket.",
+  "domain_block_modal.they_wont_know": "Nem fogja tudni, hogy letiltották.",
   "domain_block_modal.title": "Letiltsuk a domaint?",
   "domain_block_modal.you_will_lose_followers": "Az ezen a kiszolgálón lévő összes követődet törölni fogjuk.",
   "domain_block_modal.you_wont_see_posts": "Nem látsz majd bejegyzéseket vagy értesítéseket ennek a kiszolgálónak a felhasználóitól.",
@@ -350,7 +350,7 @@
   "home.pending_critical_update.title": "Kritikus biztonsági frissítés érhető el!",
   "home.show_announcements": "Közlemények megjelenítése",
   "interaction_modal.description.favourite": "Egy Mastodon fiókkal kedvencnek jelölheted ezt a bejegyzést, tudatva a szerzővel, hogy értékeled és elteszed későbbre.",
-  "interaction_modal.description.follow": "Egy Mastodon fiókkal bekövetheted {name} fiókot, hogy lásd a bejegyzéseit a saját hírfolyamodban.",
+  "interaction_modal.description.follow": "Egy Mastodon-fiókkal követheted {name} fiókját, hogy lásd a bejegyzéseit a kezdőlapodon.",
   "interaction_modal.description.reblog": "Egy Mastodon fiókkal megtolhatod ezt a bejegyzést, hogy megoszd a saját követőiddel.",
   "interaction_modal.description.reply": "Egy Mastodon fiókkal válaszolhatsz erre a bejegyzésre.",
   "interaction_modal.login.action": "Vigyen haza",
@@ -431,11 +431,11 @@
   "mute_modal.hide_options": "Beállítások elrejtése",
   "mute_modal.indefinite": "Amíg nem oldom fel a némítást",
   "mute_modal.show_options": "Beállítások megjelenítése",
-  "mute_modal.they_can_mention_and_follow": "Megemlíthetnek vagy követhetnek téged, de nem fogod őket látni.",
-  "mute_modal.they_wont_know": "Nem fogják tudni, hogy lenémították őket.",
+  "mute_modal.they_can_mention_and_follow": "Megemlíthet vagy követhet téged, de te nem fogod ezeket látni.",
+  "mute_modal.they_wont_know": "Nem fogja tudni, hogy lenémítottad.",
   "mute_modal.title": "Elnémítsuk a felhasználót?",
-  "mute_modal.you_wont_see_mentions": "Nem látsz majd őket említő bejegyzéseket.",
-  "mute_modal.you_wont_see_posts": "Továbbra is látni fogják a bejegyzéseidet, de te nem fogod látni az övékét.",
+  "mute_modal.you_wont_see_mentions": "Nem látsz majd őt említő bejegyzéseket.",
+  "mute_modal.you_wont_see_posts": "Továbbra is látni fogja a bejegyzéseidet, de te nem fogod látni az övéit.",
   "navigation_bar.about": "Névjegy",
   "navigation_bar.advanced_interface": "Megnyitás a speciális webes felületben",
   "navigation_bar.blocks": "Letiltott felhasználók",
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index 5fd28cfd8128a5..96407b00203cd7 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -221,10 +221,15 @@
   "domain_pill.activitypub_like_language": "액티비티펍은 마스토돈이 다른 소셜 네트워크와 대화할 때 쓰는 언어 같은 것입니다.",
   "domain_pill.server": "서버",
   "domain_pill.their_handle": "그의 핸들:",
+  "domain_pill.their_server": "그의 게시물이 살고 있는 디지털 거처입니다.",
+  "domain_pill.their_username": "그의 서버에서 유일한 식별자입니다. 다른 서버에서 같은 사용자명을 가진 사용자를 찾을 수도 있습니다.",
   "domain_pill.username": "사용자명",
   "domain_pill.whats_in_a_handle": "핸들엔 무엇이 담겨 있나요?",
+  "domain_pill.who_they_are": "핸들은 어디에 있는 누구인지를 나타내기 때문에 <button>액티비티펍을 사용하는 플랫폼</button>들의 소셜 웹을 넘나들며 사람들과 상호작용 할 수 있습니다.",
   "domain_pill.who_you_are": "내 핸들은 내가 어디에 있는 누군지 나타내기 때문에 사람들은 <button>액티비티펍</button>을 통해 소셜 웹을 넘나들며 나와 상호작용 할 수 있습니다.",
   "domain_pill.your_handle": "내 핸들:",
+  "domain_pill.your_server": "내 게시물들이 살고 있는 나의 디지털 거처입니다. 마음에 들지 않나요? 팔로워를 데리고 언제든지 다른 서버로 거처를 옮길 수도 있습니다.",
+  "domain_pill.your_username": "이 서버에서 유일한 내 식별자입니다. 다른 서버에서 같은 사용자명을 가진 사용자를 찾을 수도 있습니다.",
   "embed.instructions": "아래의 코드를 복사하여 대화를 원하는 곳으로 공유하세요.",
   "embed.preview": "이렇게 표시됩니다:",
   "emoji_button.activity": "활동",
@@ -507,11 +512,11 @@
   "notifications.policy.filter_new_accounts_title": "새 계정",
   "notifications.policy.filter_not_followers_hint": "나를 팔로우 한 지 {days, plural, other {# 일}}이 되지 않은 사람들을 포함",
   "notifications.policy.filter_not_followers_title": "나를 팔로우하지 않는 사람들",
-  "notifications.policy.filter_not_following_hint": "내가 수동으로 승인하기 전까지",
+  "notifications.policy.filter_not_following_hint": "내가 수동으로 승인하지 않는 한",
   "notifications.policy.filter_not_following_title": "내가 팔로우하지 않는 사람들",
   "notifications.policy.filter_private_mentions_hint": "내가 한 멘션에 단 답글이거나 내가 발신자를 팔로우 한 것이 아닌 이상 걸러집니다",
   "notifications.policy.filter_private_mentions_title": "청하지 않은 개인적인 멘션",
-  "notifications.policy.title": "알림을 거를 사람들…",
+  "notifications.policy.title": "알림을 제외할 조건들…",
   "notifications_permission_banner.enable": "데스크탑 알림 활성화",
   "notifications_permission_banner.how_to_control": "마스토돈이 열려 있지 않을 때에도 알림을 받으려면, 데스크탑 알림을 활성화 하세요. 당신은 어떤 종류의 반응이 데스크탑 알림을 발생할 지를 {icon} 버튼을 통해 세세하게 설정할 수 있습니다.",
   "notifications_permission_banner.title": "아무것도 놓치지 마세요",
diff --git a/app/javascript/mastodon/locales/nn.json b/app/javascript/mastodon/locales/nn.json
index a218cadf8dfb82..aa20207a769766 100644
--- a/app/javascript/mastodon/locales/nn.json
+++ b/app/javascript/mastodon/locales/nn.json
@@ -92,6 +92,11 @@
   "block_modal.remote_users_caveat": "Vi vil be tenaren {domain} om å respektere di avgjerd. Det kan ikkje garanterast at det vert etterfølgd, sidan nokre tenarar kan handtere blokkering ulikt. Offentlege innlegg kan framleis vere synlege for ikkje-innlogga brukarar.",
   "block_modal.show_less": "Vis mindre",
   "block_modal.show_more": "Vis meir",
+  "block_modal.they_cant_mention": "Dei kan ikkje nemna eller fylgja deg.",
+  "block_modal.they_cant_see_posts": "Dei kan ikkje sjå innlegga dine, og du vil ikkje sjå deira.",
+  "block_modal.they_will_know": "Dei kan sjå at dei er blokkerte.",
+  "block_modal.title": "Blokker brukaren?",
+  "block_modal.you_wont_see_mentions": "Du ser ikkje innlegg som nemner dei.",
   "boost_modal.combo": "Du kan trykkja {combo} for å hoppa over dette neste gong",
   "bundle_column_error.copy_stacktrace": "Kopier feilrapport",
   "bundle_column_error.error.body": "Den etterspurde sida kan ikke hentast fram. Det kan skuldast ein feil i koden vår eller eit kompatibilitetsproblem.",
@@ -172,6 +177,7 @@
   "confirmations.delete_list.message": "Er du sikker på at du vil sletta denne lista for alltid?",
   "confirmations.discard_edit_media.confirm": "Forkast",
   "confirmations.discard_edit_media.message": "Du har ulagra endringar i mediaskildringa eller førehandsvisinga. Vil du forkasta dei likevel?",
+  "confirmations.domain_block.confirm": "Blokker tenaren",
   "confirmations.domain_block.message": "Er du heilt, heilt sikker på at du vil skjula heile {domain}? I dei fleste tilfelle er det godt nok og føretrekt med nokre få målretta blokkeringar eller målbindingar. Du kjem ikkje til å sjå innhald frå domenet i fødererte tidsliner eller i varsla dine. Fylgjarane dine frå domenet vert fjerna.",
   "confirmations.edit.confirm": "Rediger",
   "confirmations.edit.message": "Å redigera no vil overskriva den meldinga du er i ferd med å skriva. Er du sikker på at du vil halda fram?",
@@ -203,6 +209,14 @@
   "dismissable_banner.explore_statuses": "Dette er innlegg frå det desentraliserte nettverket som er i støytet i dag. Nye statusar som er mykje framheva og merkte som favorittar er rangert høgare.",
   "dismissable_banner.explore_tags": "Desse emneknaggane er populære blant folk på denne tenaren og andre tenarar i det desentraliserte nettverket nett no.",
   "dismissable_banner.public_timeline": "Dette er dei nyaste offentlege innlegga frå menneske på det sosiale nettet som folk på {domain} følgjer.",
+  "domain_block_modal.block": "Blokker tenaren",
+  "domain_block_modal.block_account_instead": "Blokker @{name} i staden",
+  "domain_block_modal.they_can_interact_with_old_posts": "Folk på denne tenaren kan samhandla med dei gamle innlegga dine.",
+  "domain_block_modal.they_cant_follow": "Ingen på denne tenaren kan fylgja deg.",
+  "domain_block_modal.they_wont_know": "Dei veit ikkje at dei er blokkerte.",
+  "domain_block_modal.title": "Blokker domenet?",
+  "domain_block_modal.you_will_lose_followers": "Alle fylgjarane dine frå denne tenaren blir fjerna.",
+  "domain_block_modal.you_wont_see_posts": "Du vil ikkje sjå innlegg eller varslingar frå brukarar på denne tenaren.",
   "domain_pill.activitypub_lets_connect": "Den lar deg kople til og samhandle med folk ikkje berre på Mastodon, men òg på tvers av forskjellige sosiale appar.",
   "domain_pill.activitypub_like_language": "ActivityPub er som språket Mastodon snakkar med andre sosiale nettverk.",
   "domain_pill.server": "Tenar",
@@ -234,7 +248,7 @@
   "emoji_button.symbols": "Symbol",
   "emoji_button.travel": "Reise & stader",
   "empty_column.account_hides_collections": "Denne brukaren har valt å ikkje gjere denne informasjonen tilgjengeleg",
-  "empty_column.account_suspended": "Kontoen er suspendert",
+  "empty_column.account_suspended": "Kontoen er utestengd",
   "empty_column.account_timeline": "Ingen tut her!",
   "empty_column.account_unavailable": "Profil ikkje tilgjengeleg",
   "empty_column.blocks": "Du har ikkje blokkert nokon enno.",
@@ -413,6 +427,15 @@
   "loading_indicator.label": "Lastar…",
   "media_gallery.toggle_visible": "{number, plural, one {Skjul bilete} other {Skjul bilete}}",
   "moved_to_account_banner.text": "Kontoen din, {disabledAccount} er for tida deaktivert fordi du har flytta til {movedToAccount}.",
+  "mute_modal.hide_from_notifications": "Ikkje vis varslingar",
+  "mute_modal.hide_options": "Gøym val",
+  "mute_modal.indefinite": "Til eg avdempar dei",
+  "mute_modal.show_options": "Vis val",
+  "mute_modal.they_can_mention_and_follow": "Dei kan nemna og fylgja deg, men du vil ikkje sjå dei.",
+  "mute_modal.they_wont_know": "Dei veit ikkje at dei er dempa.",
+  "mute_modal.title": "Demp brukaren?",
+  "mute_modal.you_wont_see_mentions": "Du vil ikkje sjå innlegg som nemner dei.",
+  "mute_modal.you_wont_see_posts": "Dei kan framleis sjå innlegga dine, men du vil ikkje sjå deira.",
   "navigation_bar.about": "Om",
   "navigation_bar.advanced_interface": "Opne i avansert nettgrensesnitt",
   "navigation_bar.blocks": "Blokkerte brukarar",
@@ -670,9 +693,11 @@
   "status.direct": "Nevn @{name} privat",
   "status.direct_indicator": "Privat omtale",
   "status.edit": "Rediger",
+  "status.edited": "Sist endra {date}",
   "status.edited_x_times": "Redigert {count, plural, one {{count} gong} other {{count} gonger}}",
   "status.embed": "Bygg inn",
   "status.favourite": "Favoritt",
+  "status.favourites": "{count, plural, one {favoritt} other {favorittar}}",
   "status.filter": "Filtrer dette innlegget",
   "status.filtered": "Filtrert",
   "status.hide": "Skjul innlegget",
@@ -693,6 +718,7 @@
   "status.reblog": "Framhev",
   "status.reblog_private": "Framhev til dei originale mottakarane",
   "status.reblogged_by": "{name} framheva",
+  "status.reblogs": "{count, plural, one {framheving} other {framhevingar}}",
   "status.reblogs.empty": "Ingen har framheva dette tutet enno. Om nokon gjer, så dukkar det opp her.",
   "status.redraft": "Slett & skriv på nytt",
   "status.remove_bookmark": "Fjern bokmerke",
diff --git a/app/javascript/mastodon/locales/pt-PT.json b/app/javascript/mastodon/locales/pt-PT.json
index b1145f64d506dc..d4b37ffe6d79df 100644
--- a/app/javascript/mastodon/locales/pt-PT.json
+++ b/app/javascript/mastodon/locales/pt-PT.json
@@ -89,6 +89,14 @@
   "announcement.announcement": "Anúncio",
   "attachments_list.unprocessed": "(não processado)",
   "audio.hide": "Ocultar áudio",
+  "block_modal.remote_users_caveat": "Vamos pedir ao servidor {domain} para respeitar a sua decisão. No entanto, não é garantido o seu cumprimento, uma vez que alguns servidores podem tratar os bloqueios de forma diferente. As mensagens públicas podem continuar a ser visíveis para utilizadores não autenticados.",
+  "block_modal.show_less": "Mostrar menos",
+  "block_modal.show_more": "Mostrar mais",
+  "block_modal.they_cant_mention": "Eles não o podem mencionar ou seguir.",
+  "block_modal.they_cant_see_posts": "Eles não podem ver as suas publicações e você não verá as deles.",
+  "block_modal.they_will_know": "Eles podem ver que estão bloqueados.",
+  "block_modal.title": "Bloquear utilizador?",
+  "block_modal.you_wont_see_mentions": "Não verá publicações que os mencionem.",
   "boost_modal.combo": "Pode clicar {combo} para não voltar a ver",
   "bundle_column_error.copy_stacktrace": "Copiar relatório de erros",
   "bundle_column_error.error.body": "A página solicitada não pôde ser sintetizada. Isto pode ser devido a uma falha no nosso código ou a um problema de compatibilidade com o navegador.",
@@ -169,6 +177,7 @@
   "confirmations.delete_list.message": "Tens a certeza de que deseja eliminar permanentemente esta lista?",
   "confirmations.discard_edit_media.confirm": "Descartar",
   "confirmations.discard_edit_media.message": "Tem alterações por guardar na descrição ou pré-visualização do conteúdo. Descartar mesmo assim?",
+  "confirmations.domain_block.confirm": "Bloquear servidor",
   "confirmations.domain_block.message": "De certeza que queres bloquear completamente o domínio {domain}? Na maioria dos casos, silenciar ou bloquear alguns utilizadores é suficiente e é o recomendado. Não irás ver conteúdo daquele domínio em cronologia alguma nem nas tuas notificações. Os teus seguidores daquele domínio serão removidos.",
   "confirmations.edit.confirm": "Editar",
   "confirmations.edit.message": "Editar agora irá sobrescrever a mensagem que está a compor. Tem a certeza de que deseja continuar?",
@@ -200,6 +209,27 @@
   "dismissable_banner.explore_statuses": "Estas são publicações de toda a rede social que estão a ganhar popularidade atualmente. As mensagens mais recentes com mais partilhas e favoritos obtêm uma classificação mais elevada.",
   "dismissable_banner.explore_tags": "Estas #etiquetas estão presentemente a ganhar atenção entre as pessoas neste e noutros servidores da rede descentralizada.",
   "dismissable_banner.public_timeline": "Estas são as publicações públicas mais recentes de pessoas na rede social que as pessoas em {domain} seguem.",
+  "domain_block_modal.block": "Bloquear servidor",
+  "domain_block_modal.block_account_instead": "Bloquear @{name} em alternativa",
+  "domain_block_modal.they_can_interact_with_old_posts": "As pessoas deste servidor podem interagir com as suas publicações antigas.",
+  "domain_block_modal.they_cant_follow": "Ninguém deste servidor pode segui-lo.",
+  "domain_block_modal.they_wont_know": "Eles não saberão que foram bloqueados.",
+  "domain_block_modal.title": "Bloquear domínio?",
+  "domain_block_modal.you_will_lose_followers": "Todos os seus seguidores deste servidor serão removidos.",
+  "domain_block_modal.you_wont_see_posts": "Não verá publicações ou notificações de utilizadores neste servidor.",
+  "domain_pill.activitypub_lets_connect": "Permite-lhe conectar e interagir com pessoas não só no Mastodon, mas também em diferentes aplicações sociais.",
+  "domain_pill.activitypub_like_language": "O ActivityPub é como a linguagem que o Mastodon fala com outras redes sociais.",
+  "domain_pill.server": "Servidor",
+  "domain_pill.their_handle": "O seu identificador:",
+  "domain_pill.their_server": "A sua casa digital, onde se encontram todas as suas publicações.",
+  "domain_pill.their_username": "O seu identificador único no seu servidor. É possível encontrar utilizadores com o mesmo nome de utilizador em diferentes servidores.",
+  "domain_pill.username": "Nome de utilizador",
+  "domain_pill.whats_in_a_handle": "Em que consiste um identificador?",
+  "domain_pill.who_they_are": "Uma vez que os identificadores dizem quem é alguém e onde está, pode interagir com as pessoas através da rede social de <button>plataformas que suportam ActivityPub</button>.",
+  "domain_pill.who_you_are": "Uma vez que o seu identificador indica quem é e onde está, as pessoas podem interagir consigo através da rede social de <button>plataformas que suportam ActivityPub</button>.",
+  "domain_pill.your_handle": "O seu identificador:",
+  "domain_pill.your_server": "A sua casa digital, onde se encontram todas as suas publicações. Não gosta deste? Mude de servidor a qualquer momento e leve também os seus seguidores.",
+  "domain_pill.your_username": "O seu identificador único neste servidor. É possível encontrar utilizadores com o mesmo nome de utilizador em diferentes servidores.",
   "embed.instructions": "Incorpore esta publicação no seu site copiando o código abaixo.",
   "embed.preview": "Podes ver aqui como irá ficar:",
   "emoji_button.activity": "Actividade",
@@ -397,6 +427,15 @@
   "loading_indicator.label": "A carregar…",
   "media_gallery.toggle_visible": "Alternar visibilidade",
   "moved_to_account_banner.text": "A sua conta {disabledAccount} está, no momento, desativada, porque você migrou para {movedToAccount}.",
+  "mute_modal.hide_from_notifications": "Ocultar das notificações",
+  "mute_modal.hide_options": "Ocultar opções",
+  "mute_modal.indefinite": "Até que eu os tire do silêncio",
+  "mute_modal.show_options": "Mostrar opções",
+  "mute_modal.they_can_mention_and_follow": "Eles podem mencioná-lo e segui-lo, mas você não os verá.",
+  "mute_modal.they_wont_know": "Eles não saberão que foram silenciados.",
+  "mute_modal.title": "Silenciar utilizador?",
+  "mute_modal.you_wont_see_mentions": "Não verá publicações que os mencionem.",
+  "mute_modal.you_wont_see_posts": "Eles podem continuar a ver as suas publicações, mas você não verá as deles.",
   "navigation_bar.about": "Sobre",
   "navigation_bar.advanced_interface": "Abrir na interface web avançada",
   "navigation_bar.blocks": "Utilizadores bloqueados",
diff --git a/app/javascript/mastodon/locales/ry.json b/app/javascript/mastodon/locales/ry.json
index de3d6191716b72..62772f4f2231ca 100644
--- a/app/javascript/mastodon/locales/ry.json
+++ b/app/javascript/mastodon/locales/ry.json
@@ -6,6 +6,8 @@
   "about.domain_blocks.silenced.title": "Обмежено",
   "about.domain_blocks.suspended.explanation": "Ниякі податкы из сього сервера не будут уброблені, усокочені ци поміняні, што чинит невозможнов хоть-яку інтеракцію ци зязок из хосновачами из сього сервера.",
   "about.domain_blocks.suspended.title": "Заблоковано",
+  "about.not_available": "Ися інформація не была доступна на сюм сервері.",
+  "about.powered_by": "Децентралізована медіа основана на {mastodon}",
   "about.rules": "Правила сервера",
   "account.account_note_header": "Примітка",
   "account.add_or_remove_from_list": "Дати авадь забрати из исписа",
@@ -16,18 +18,24 @@
   "account.block_short": "Заблоковати",
   "account.blocked": "Заблоковано",
   "account.browse_more_on_origin_server": "Позирайте бульше на ориґіналнум профілю",
+  "account.cancel_follow_request": "Удмінити пудписку",
   "account.copy": "Зкопіровати удкликованя на профіл",
+  "account.disable_notifications": "Бульше не сповіщати ми коли {name} пише",
   "account.domain_blocked": "Домен заблокованый",
   "account.edit_profile": "Управити профіл",
+  "account.enable_notifications": "Уповістити ня, кой {name} пише",
   "account.endorse": "Указовати на профілови",
   "account.featured_tags.last_status_at": "Датум послідньої публикації {date}",
   "account.featured_tags.last_status_never": "Ниє публикацій",
+  "account.featured_tags.title": "Ублюблені гештеґы {name}",
   "account.follow": "Пудписати ся",
+  "account.follow_back": "Пудписати ся тоже",
   "account.followers": "Пудписникы",
   "account.followers.empty": "У сього хосновача раз ниє пудписникув.",
   "account.following": "Слідуєте",
   "account.follows.empty": "Сись хосновач щи никого не слідує.",
   "account.go_to_profile": "Перейти на профіл",
+  "account.joined_short": "Датум прикапчованя",
   "account.languages": "Поміняти убрані языкы",
   "account.link_verified_on": "Властность сього удкликованя было звірено {date}",
   "account.media": "Медіа",
diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json
index 8c9238bb9e61fd..c2b1cede94264a 100644
--- a/app/javascript/mastodon/locales/sk.json
+++ b/app/javascript/mastodon/locales/sk.json
@@ -89,6 +89,9 @@
   "announcement.announcement": "Oznámenie",
   "attachments_list.unprocessed": "(nespracované)",
   "audio.hide": "Skryť zvuk",
+  "block_modal.show_less": "Zobraziť menej",
+  "block_modal.show_more": "Zobraziť viac",
+  "block_modal.title": "Blokovať užívateľa?",
   "boost_modal.combo": "Nabudúce môžete preskočiť stlačením {combo}",
   "bundle_column_error.copy_stacktrace": "Kopírovať chybovú hlášku",
   "bundle_column_error.error.body": "Požadovanú stránku nebolo možné vykresliť. Môže to byť spôsobené chybou v našom kóde alebo problémom s kompatibilitou prehliadača.",
@@ -169,6 +172,7 @@
   "confirmations.delete_list.message": "Určite chcete tento zoznam trvalo vymazať?",
   "confirmations.discard_edit_media.confirm": "Zahodiť",
   "confirmations.discard_edit_media.message": "Máte neuložené zmeny v popise alebo náhľade média, zahodiť ich aj tak?",
+  "confirmations.domain_block.confirm": "Blokovať server",
   "confirmations.domain_block.message": "Určite chcete blokovať celú doménu {domain}? Vo väčšine prípadov stačí blokovať alebo ignorovať pár konkrétnych účtov, čo aj odporúčame. Obsah z tejto domény neuvidíte v žiadnej verejnej časovej osi ani v upozorneniach. Vaši sledujúci pochádzajúci z tejto domény budú odstránení.",
   "confirmations.edit.confirm": "Upraviť",
   "confirmations.edit.message": "Úpravou prepíšete príspevok, ktorý máte rozpísaný. Určite chcete pokračovať?",
@@ -200,6 +204,10 @@
   "dismissable_banner.explore_statuses": "Toto sú príspevky z celej sociálnej siete, ktoré sú dnes populárne. Novšie príspevky s viacerými ohviezdičkovaniami a zdieľaniami sú radené vyššie.",
   "dismissable_banner.explore_tags": "Toto sú hashtagy zo sociálnej siete, ktoré sú dnes populárne. Novšie hashtagy používané viacerými ľuďmi sú radené vyššie.",
   "dismissable_banner.public_timeline": "Toto sú najnovšie verejné príspevky od účtov na sociálnej sieti, ktoré sú sledované účtami z {domain}.",
+  "domain_block_modal.block": "Blokovať server",
+  "domain_block_modal.title": "Blokovať doménu?",
+  "domain_pill.server": "Server",
+  "domain_pill.username": "Používateľské meno",
   "embed.instructions": "Tento príspevok môžete pridať na svoju webovú stránku použitím tohto kódu.",
   "embed.preview": "Takto bude vyzerať:",
   "emoji_button.activity": "Aktivita",
@@ -267,6 +275,7 @@
   "filter_modal.select_filter.title": "Filtrovanie tohto príspevku",
   "filter_modal.title.status": "Filtrovanie príspevku",
   "filtered_notifications_banner.pending_requests": "Oboznámenia od {count, plural, =0 {nikoho} one {jedného človeka} other {# ľudí}} čo môžeš poznať",
+  "filtered_notifications_banner.title": "Filtrované oznámenia",
   "firehose.all": "Všetko",
   "firehose.local": "Tento server",
   "firehose.remote": "Ostatné servery",
@@ -395,6 +404,9 @@
   "loading_indicator.label": "Načítavanie…",
   "media_gallery.toggle_visible": "{number, plural, one {Skryť obrázok} other {Skryť obrázky}}",
   "moved_to_account_banner.text": "Váš účet {disabledAccount} je momentálne deaktivovaný, pretože ste sa presunuli na {movedToAccount}.",
+  "mute_modal.hide_options": "Skryť možnosti",
+  "mute_modal.show_options": "Zobraziť možnosti",
+  "mute_modal.title": "Stíšiť užívateľa?",
   "navigation_bar.about": "O tomto serveri",
   "navigation_bar.advanced_interface": "Otvoriť v pokročilom webovom rozhraní",
   "navigation_bar.blocks": "Blokované účty",
@@ -433,6 +445,7 @@
   "notification.status": "{name} uverejňuje niečo nové",
   "notification.update": "{name} upravuje príspevok",
   "notification_requests.accept": "Prijať",
+  "notification_requests.dismiss": "Zamietnuť",
   "notification_requests.notifications_from": "Oboznámenia od {name}",
   "notification_requests.title": "Filtrované oboznámenia",
   "notifications.clear": "Vyčistiť upozornenia",
@@ -469,6 +482,7 @@
   "notifications.policy.filter_new_accounts_title": "Nové účty",
   "notifications.policy.filter_not_followers_title": "Ľudia, ktorí ťa nenasledujú",
   "notifications.policy.filter_not_following_title": "Ľudia, ktorých nenasleduješ",
+  "notifications.policy.title": "Filtrovať oznámenia od…",
   "notifications_permission_banner.enable": "Povoliť upozornenia na ploche",
   "notifications_permission_banner.how_to_control": "Ak chcete dostávať upozornenia, keď Mastodon nie je otvorený, povoľte upozornenia na ploche. Po ich zapnutí môžete presne kontrolovať, ktoré typy interakcií generujú upozornenia na ploche, a to prostredníctvom tlačidla {icon} vyššie.",
   "notifications_permission_banner.title": "Nenechajte si nič ujsť",
diff --git a/config/locales/an.yml b/config/locales/an.yml
index 5ac57f423818b7..068a20187d6963 100644
--- a/config/locales/an.yml
+++ b/config/locales/an.yml
@@ -1423,7 +1423,6 @@ an:
     import: Importar
     import_and_export: Importar y exportar
     migrate: Migración de cuenta
-    notifications: Notificacions
     preferences: Preferencias
     profile: Perfil
     relationships: Seguindo y seguidores
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 5b932f525c8fdd..b0579c6f3f3363 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -1751,7 +1751,6 @@ ar:
     import: استيراد
     import_and_export: استيراد وتصدير
     migrate: تهجير الحساب
-    notifications: الإخطارات
     preferences: التفضيلات
     profile: الملف التعريفي
     relationships: المتابِعون والمتابَعون
diff --git a/config/locales/ast.yml b/config/locales/ast.yml
index 9b9d5510c08062..816858d4a09277 100644
--- a/config/locales/ast.yml
+++ b/config/locales/ast.yml
@@ -801,7 +801,6 @@ ast:
     import: Importación
     import_and_export: Importación ya esportación
     migrate: Migración de la cuenta
-    notifications: Avisos
     preferences: Preferencies
     profile: Perfil públicu
     relationships: Perfiles que sigues ya te siguen
diff --git a/config/locales/be.yml b/config/locales/be.yml
index d04409ca9a7f60..0bdc3bb5548946 100644
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -1704,7 +1704,6 @@ be:
     import: Імпарт
     import_and_export: Імпарт і экспарт
     migrate: Перамяшчэнне ўліковага запісу
-    notifications: Апавяшчэнні
     preferences: Налады
     profile: Профіль
     relationships: Падпіскі і падпісчыкі
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 3f05bfa0c08e61..feb4e74533074e 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -597,6 +597,9 @@ bg:
       actions_description_html: Решете какво действие може да се предприеме, за да бъде отхвърлен докладът. Ако предприемете наказателно действие срещу докладвания акаунт, към него ще бъде изпратено известие по имейл, освен ако <strong>Спам</strong> категорията не е била избрана.
       actions_description_remote_html: Преценете с какво действие да решите този доклад. Това ще има ефекет върху това как <strong>вашият</strong> сървър комуникира с този отдалечен акаунт и се справя с неговото съдържание.
       add_to_report: Добавяне на още към доклада
+      already_suspended_badges:
+        local: Вече е спряно на този сървър
+        remote: Вече е спряно на сървъра им
       are_you_sure: Сигурни ли сте?
       assign_to_self: Назначаване на мен
       assigned: Назначен модератор
@@ -1652,7 +1655,7 @@ bg:
     import: Импортиране
     import_and_export: Импортиране и експортиране
     migrate: Миграция на акаунта
-    notifications: Известия
+    notifications: Известия по имейла
     preferences: Предпочитания
     profile: Профил
     relationships: Последвания и последователи
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index dedf69d7b21eec..2523db0eb0d5c3 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -597,6 +597,9 @@ ca:
       actions_description_html: Decideix quina acció a prendre per a resoldre aquest informe. Si prens un acció punitiva contra el compte denunciat, se li enviarà una notificació per correu electrònic, excepte quan se selecciona la categoria <strong>Spam</strong>.
       actions_description_remote_html: Decideix quina acció prendre per a resoldre aquest informe. Això només afectarà com <strong>el teu</strong> servidor es comunica amb aquest compte remot i en gestiona el contingut.
       add_to_report: Afegir més al informe
+      already_suspended_badges:
+        local: Ja és suspès en aquest servidor
+        remote: Ja és suspès al seu servidor
       are_you_sure: Segur?
       assign_to_self: Assigna'm
       assigned: Moderador assignat
@@ -1652,7 +1655,7 @@ ca:
     import: Importació
     import_and_export: Importació i exportació
     migrate: Migració del compte
-    notifications: Notificacions
+    notifications: Notificacions per correu electrònic
     preferences: Preferències
     profile: Perfil
     relationships: Seguits i seguidors
diff --git a/config/locales/ckb.yml b/config/locales/ckb.yml
index c1f280a24c55a6..dfa035eca81cb7 100644
--- a/config/locales/ckb.yml
+++ b/config/locales/ckb.yml
@@ -942,7 +942,6 @@ ckb:
     import: هاوردن
     import_and_export: هاوردەکردن و ناردن
     migrate: گواستنەوەی هەژمارە
-    notifications: ئاگادارییەکان
     preferences: پەسەندەکان
     profile: پرۆفایل
     relationships: شوێنکەوتوو و شوێنکەوتوان
diff --git a/config/locales/co.yml b/config/locales/co.yml
index 13c8b743134b6f..7d8abcd112e6b8 100644
--- a/config/locales/co.yml
+++ b/config/locales/co.yml
@@ -926,7 +926,6 @@ co:
     import: Impurtazione
     import_and_export: Impurtazione è spurtazione
     migrate: Migrazione di u contu
-    notifications: Nutificazione
     preferences: Priferenze
     profile: Prufile
     relationships: Abbunamenti è abbunati
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 7e4e3805418026..b44b01beeed656 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -1704,7 +1704,6 @@ cs:
     import: Import
     import_and_export: Import a export
     migrate: Přesun účtu
-    notifications: Oznámení
     preferences: Předvolby
     profile: Profil
     relationships: Sledovaní a sledující
diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index 067d939deb5a18..93d249cb507c26 100644
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@@ -1756,7 +1756,6 @@ cy:
     import: Mewnforio
     import_and_export: Mewnforio ac allforio
     migrate: Mudo cyfrif
-    notifications: Hysbysiadau
     preferences: Dewisiadau
     profile: Proffil cyhoeddus
     relationships: Yn dilyn a dilynwyr
diff --git a/config/locales/da.yml b/config/locales/da.yml
index fcb600d7b95bd8..eda22d5b9c5e00 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -597,6 +597,9 @@ da:
       actions_description_html: Afgør, hvilke foranstaltning, der skal træffes for at løse denne anmeldelse. Træffes en straffende foranstaltning mod den anmeldte konto, fremsendes en e-mailnotifikation, undtagen når kategorien <strong>Spam</strong> er valgt.
       actions_description_remote_html: Fastslå en nødvendig handling mhp. at løse denne anmeldelse. Dette vil kun påvirke <strong>din</strong> servers kommunikation med, og indholdshåndtering for, fjernkontoen.
       add_to_report: Føj mere til anmeldelse
+      already_suspended_badges:
+        local: Allerede suspenderet på denne server
+        remote: Allerede suspenderet på vedkommendes server
       are_you_sure: Sikker?
       assign_to_self: Tildel til mig
       assigned: Tildelt moderator
@@ -1652,7 +1655,7 @@ da:
     import: Import
     import_and_export: Import og eksport
     migrate: Kontomigrering
-    notifications: Notifikationer
+    notifications: E-mailnotifikationer
     preferences: Præferencer
     profile: Offentlig profil
     relationships: Følger og følgere
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 84f10d8e088efe..62e62c2c0b2396 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -597,6 +597,9 @@ de:
       actions_description_html: Entscheide, welche Maßnahmen du zum Klären dieser Meldung ergreifen möchtest. Wenn du eine Strafmaßnahme gegen das gemeldete Konto ergreifst, wird eine E-Mail-Benachrichtigung an dieses gesendet, außer wenn die <strong>Spam</strong>-Kategorie ausgewählt ist.
       actions_description_remote_html: Entscheide, welche Maßnahmen du zum Klären dieser Meldung ergreifen möchtest. Dies wirkt sich lediglich darauf aus, wie <strong>dein</strong> Server mit diesem externen Konto kommuniziert und dessen Inhalt handhabt.
       add_to_report: Meldung ergänzen
+      already_suspended_badges:
+        local: Auf diesem Server bereits gesperrt
+        remote: Auf dem anderen Server bereits gesperrt
       are_you_sure: Bist du dir sicher?
       assign_to_self: Mir zuweisen
       assigned: Zugewiesene*r Moderator*in
@@ -1652,7 +1655,7 @@ de:
     import: Importieren
     import_and_export: Importieren und exportieren
     migrate: Kontoumzug
-    notifications: Benachrichtigungen
+    notifications: E-Mail-Benachrichtigungen
     preferences: Einstellungen
     profile: Öffentliches Profil
     relationships: Follower und Folge ich
diff --git a/config/locales/el.yml b/config/locales/el.yml
index d3d91abc2b6b87..2e7ac87463679d 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -1524,7 +1524,6 @@ el:
     import: Εισαγωγή
     import_and_export: Εισαγωγή και εξαγωγή
     migrate: Μετακόμιση λογαριασμού
-    notifications: Ειδοποιήσεις
     preferences: Προτιμήσεις
     profile: Προφίλ
     relationships: Ακολουθείς και σε ακολουθούν
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index b5d92541df5847..a2f84b0932aca0 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -1647,7 +1647,6 @@ en-GB:
     import: Import
     import_and_export: Import and export
     migrate: Account migration
-    notifications: Notifications
     preferences: Preferences
     profile: Profile
     relationships: Follows and followers
diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index cb5654b4c7288d..d59eadd5286fd1 100644
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -1579,7 +1579,6 @@ eo:
     import: Enporti
     import_and_export: Importi kaj eksporti
     migrate: Konta migrado
-    notifications: Sciigoj
     preferences: Preferoj
     profile: Profilo
     relationships: Sekvatoj kaj sekvantoj
diff --git a/config/locales/es-AR.yml b/config/locales/es-AR.yml
index aae437b9546742..633291110766c2 100644
--- a/config/locales/es-AR.yml
+++ b/config/locales/es-AR.yml
@@ -1652,7 +1652,7 @@ es-AR:
     import: Importar
     import_and_export: Importación y exportación
     migrate: Migración de la cuenta
-    notifications: Notificaciones
+    notifications: Notificaciones por correo electrónico
     preferences: Configuración
     profile: Perfil público
     relationships: Seguimientos
diff --git a/config/locales/es-MX.yml b/config/locales/es-MX.yml
index e7e1a4ff88ea1b..24b4af7ecdb97c 100644
--- a/config/locales/es-MX.yml
+++ b/config/locales/es-MX.yml
@@ -597,6 +597,9 @@ es-MX:
       actions_description_html: Decide qué medidas tomar para resolver esta denuncia. Si tomas una acción punitiva contra la cuenta denunciada, se le enviará a dicha cuenta una notificación por correo electrónico, excepto cuando se seleccione la categoría <strong>Spam</strong>.
       actions_description_remote_html: Decide qué medidas tomar para resolver este reporte. Esto solo afectará a la forma en que <strong>tu servidor</strong> se comunica con esta cuenta remota y gestiona su contenido.
       add_to_report: Añadir más al reporte
+      already_suspended_badges:
+        local: Ya suspendido en este servidor
+        remote: Ya suspendido en su servidor
       are_you_sure: "¿Estás seguro?"
       assign_to_self: Asignármela a mí
       assigned: Moderador asignado
@@ -1652,7 +1655,7 @@ es-MX:
     import: Importar
     import_and_export: Importar y exportar
     migrate: Migración de cuenta
-    notifications: Notificaciones
+    notifications: Notificaciones por correo electrónico
     preferences: Preferencias
     profile: Perfil
     relationships: Siguiendo y seguidores
@@ -1865,6 +1868,9 @@ es-MX:
       follows_subtitle: Seguir cuentas conocidas
       follows_title: A quién seguir
       follows_view_more: Ver más personas para seguir
+      hashtags_recent_count:
+        one: "%{people} personas en los últimos 2 días"
+        other: "%{people} personas en los últimos 2 días"
       hashtags_subtitle: Explora las tendencias de los últimos 2 días
       hashtags_title: Etiquetas en tendencia
       hashtags_view_more: Ver más etiquetas en tendencia
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 24822116ca0c45..2f7877afed5809 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -1652,7 +1652,7 @@ es:
     import: Importar
     import_and_export: Importar y exportar
     migrate: Migración de cuenta
-    notifications: Notificaciones
+    notifications: Notificaciones por correo electrónico
     preferences: Preferencias
     profile: Perfil
     relationships: Siguiendo y seguidores
diff --git a/config/locales/et.yml b/config/locales/et.yml
index 80e3d3ef682810..889ddfcff1a60a 100644
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -1652,7 +1652,6 @@ et:
     import: Impordi
     import_and_export: Import / eksport
     migrate: Konto kolimine
-    notifications: Teated
     preferences: Eelistused
     profile: Profiil
     relationships: Jälgitud ja jälgijad
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index ac641ab45423b7..4238e71c841cb7 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -599,6 +599,9 @@ eu:
       actions_description_html: Erabaki txosten hau konpontzeko ze ekintza hartu. Salatutako kontuaren aurka zigor ekintza bat hartzen baduzu, eposta jakinarazpen bat bidaliko zaie, <strong>Spam</strong> kategoria hautatzean ezik.
       actions_description_remote_html: Hautatu txosten honi konponbidea aurkitzeko zein neurri hartu. Hau soilik <strong>zure</strong> zerbitzaria urruneko kontu honekin nola komunikatu eta bere edukia nola maneiatzeko da.
       add_to_report: Gehitu gehiago txostenera
+      already_suspended_badges:
+        local: Dagoeneko kanporatu da zerbitzari honetatik
+        remote: Dagoeneko kanporatu da bere zerbitzaritik
       are_you_sure: Ziur zaude?
       assign_to_self: Esleitu niri
       assigned: Esleitutako moderatzailea
@@ -1656,7 +1659,7 @@ eu:
     import: Inportazioa
     import_and_export: Inportatu eta esportatu
     migrate: Kontuaren migrazioa
-    notifications: Jakinarazpenak
+    notifications: Posta bidezko jakinarazpenak
     preferences: Hobespenak
     profile: Profila
     relationships: Jarraitutakoak eta jarraitzaileak
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index df9b926276f753..d93d2e7d5f1096 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -1416,7 +1416,6 @@ fa:
     import: درون‌ریزی
     import_and_export: درون‌ریزی و برون‌بری
     migrate: انتقال حساب
-    notifications: آگاهی‌ها
     preferences: ترجیحات
     profile: نمایه
     relationships: پیگیری‌ها و پیگیران
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index a92ad4ecb65eee..0ba5931e5a0ed9 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -597,6 +597,9 @@ fi:
       actions_description_html: Päätä, mihin toimiin ryhdyt tämän raportin ratkaisemiseksi. Jos ryhdyt rangaistustoimeen ilmoitettua tiliä kohtaan, hänelle lähetetään sähköposti-ilmoitus, paitsi jos <strong>Roskaposti</strong>-luokka on valittuna.
       actions_description_remote_html: Päätä, mihin toimiin ryhdyt tämän raportin ratkaisemiseksi. Tämä vaikuttaa vain siihen, miten <strong>palvelimesi</strong> kommunikoi tämän etätilin kanssa ja käsittelee sen sisältöä.
       add_to_report: Lisää raporttiin
+      already_suspended_badges:
+        local: Jäädytetty jo tällä palvelimella
+        remote: Jäädytetty jo tällä palvelimella
       are_you_sure: Oletko varma?
       assign_to_self: Ota tehtäväksi
       assigned: Määritetty valvoja
@@ -1652,7 +1655,7 @@ fi:
     import: Tuo
     import_and_export: Tuonti ja vienti
     migrate: Tilin muutto muualle
-    notifications: Ilmoitukset
+    notifications: Sähköposti-ilmoitukset
     preferences: Ominaisuudet
     profile: Julkinen profiili
     relationships: Seuratut ja seuraajat
diff --git a/config/locales/fo.yml b/config/locales/fo.yml
index 45633d85b308dc..49d206bbb98af3 100644
--- a/config/locales/fo.yml
+++ b/config/locales/fo.yml
@@ -94,7 +94,7 @@ fo:
         disabled: Óvirkið
         pending: Í bíðistøðu
         silenced: Avmarkað
-        suspended: Avbrotin
+        suspended: Gjørt óvirkin
         title: Umsjón
       moderation_notes: Umsjónarviðmerkingar
       most_recent_activity: Feskasta virksemi
@@ -150,7 +150,7 @@ fo:
       strikes: Eldri fráboðanir
       subscribe: Tekna hald
       suspend: Fyribils ikki í gildi
-      suspended: Ikki í gildi
+      suspended: Gjørt óvirkin
       suspension_irreversible: Dáturnar á hesu kontu er endaliga sletttaðar. Tú kann seta hana í gildi, men dáturnar fáast ikki aftur.
       suspension_reversible_hint_html: Kontan er sett úr gildi og dáturnar verða endaliga strikaðar tann %{date}. Inntil tá kann kontan endurskapast uttan fylgjur. Ynskir tú at strika allar dátur hjá kontuni beinan vegin, so kanst tú gera tað niðanfyri.
       title: Kontur
@@ -597,6 +597,9 @@ fo:
       actions_description_html: Ger av hvør atgerð skal takast fyri at avgreiða hesa meldingina. Revsitiltøk móti meldaðu kontuni føra við sær, at ein teldupostfráboðan verður send teimum, undantikið tá <strong>Ruskpostur</strong> verður valdur.
       actions_description_remote_html: Tak avgerð um hvat skal gerast fyri at avgreiða hesa rapporteringina. Hetta fer einans at ávirka, hvussu <strong>tín</strong> ambætari samskiftir við hesa fjarkontuna og hvussu hann handfer tilfar frá henni.
       add_to_report: Legg meira afturat meldingini
+      already_suspended_badges:
+        local: Longu gjørt óvirkin á hesum ambætaranum
+        remote: Longu gjørt óvirkin á teirra ambætara
       are_you_sure: Er tú vís/ur?
       assign_to_self: Tilluta mær
       assigned: Tilnevnt umsjónarfólk
@@ -1652,7 +1655,7 @@ fo:
     import: Innflyt
     import_and_export: Innflyt og útflyt
     migrate: Flyting av kontu
-    notifications: Fráboðanir
+    notifications: Teldupostfráboðanir
     preferences: Stillingar
     profile: Vangi
     relationships: Fylging og fylgjarar
diff --git a/config/locales/fr-CA.yml b/config/locales/fr-CA.yml
index 2ed482770caab1..fa69e36cc0817a 100644
--- a/config/locales/fr-CA.yml
+++ b/config/locales/fr-CA.yml
@@ -1652,7 +1652,6 @@ fr-CA:
     import: Import de données
     import_and_export: Import et export
     migrate: Migration de compte
-    notifications: Notifications
     preferences: Préférences
     profile: Profil
     relationships: Abonnements et abonné·e·s
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index ae012c1531c7b4..2045760655c4c3 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -1652,7 +1652,6 @@ fr:
     import: Import de données
     import_and_export: Import et export
     migrate: Migration de compte
-    notifications: Notifications
     preferences: Préférences
     profile: Profil
     relationships: Abonnements et abonné·e·s
diff --git a/config/locales/fy.yml b/config/locales/fy.yml
index 742b2903a0ca3a..1d62f7c6af012c 100644
--- a/config/locales/fy.yml
+++ b/config/locales/fy.yml
@@ -1647,7 +1647,6 @@ fy:
     import: Ymportearje
     import_and_export: Ymportearje en eksportearje
     migrate: Accountmigraasje
-    notifications: Meldingen
     preferences: Ynstellingen
     profile: Profyl
     relationships: Folgers en folgjenden
diff --git a/config/locales/ga.yml b/config/locales/ga.yml
index 5c61898ef51284..a3ad293e5bd79d 100644
--- a/config/locales/ga.yml
+++ b/config/locales/ga.yml
@@ -461,7 +461,6 @@ ga:
     development: Forbairt
     edit_profile: Cuir an phróifíl in eagar
     import: Iompórtáil
-    notifications: Fógraí
     preferences: Sainroghanna pearsanta
     profile: Próifíl
     webauthn_authentication: Eochracha slándála
diff --git a/config/locales/gd.yml b/config/locales/gd.yml
index 79bbbea0f581e7..381a0a8b40ab8f 100644
--- a/config/locales/gd.yml
+++ b/config/locales/gd.yml
@@ -1704,7 +1704,6 @@ gd:
     import: Ion-phortadh
     import_and_export: Ion-phortadh ⁊ às-phortadh
     migrate: Imrich cunntais
-    notifications: Brathan
     preferences: Roghainnean
     profile: Pròifil phoblach
     relationships: Dàimhean leantainn
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 57249d2ca961be..7fbba21b279334 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -597,6 +597,9 @@ gl:
       actions_description_html: Decide que acción tomar respecto desta denuncia. Se tomas accións punitivas contra a conta denunciada, enviaráselles un email coa notificación, excepto se está seleccionada a categoría <strong>Spam</strong>.
       actions_description_remote_html: Decide a acción a tomar para resolver a denuncia. Isto só lle afecta ao xeito en que o <strong>teu</strong> servidor se comunica con esta conta remota e xestiona o seu contido.
       add_to_report: Engadir máis á denuncia
+      already_suspended_badges:
+        local: Xa está suspendida neste servidor
+        remote: Xa está suspendida no seu servidor
       are_you_sure: Tes certeza?
       assign_to_self: Asignarme
       assigned: Moderador asignado
@@ -1652,7 +1655,7 @@ gl:
     import: Importar
     import_and_export: Importar e exportar
     migrate: Migrar conta
-    notifications: Notificacións
+    notifications: Notificacións por correo
     preferences: Preferencias
     profile: Perfil
     relationships: Seguindo e seguidoras
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 1388a716325433..2dfb98a2d842c1 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -621,6 +621,9 @@ he:
       actions_description_html: בחר/י איזו פעולה לבצע על מנת לפתור את הדו"ח. אם תופעל פעולת ענישה כנגד החשבון המדווח, הודעת דוא"ל תשלח אליהם, אלא אם נבחרה קטגוריית ה<strong>ספאם</strong>.
       actions_description_remote_html: בחרו איזו פעולה לבצע כדי לפתור את הדיווח שהוגש. פעולה זו תשפיע רק על התקשורת מול השרת <strong>שלך</strong> עם החשבון המרוחק ותוכנו.
       add_to_report: הוספת פרטים לדיווח
+      already_suspended_badges:
+        local: כבר הודח בשרת זה
+        remote: כבר הודח בשרת שלו
       are_you_sure: 100% על בטוח?
       assign_to_self: הקצה אלי
       assigned: מנחה מוקצה
@@ -1704,7 +1707,6 @@ he:
     import: יבוא
     import_and_export: יבוא ויצוא
     migrate: הגירת חשבון
-    notifications: התראות
     preferences: העדפות
     profile: פרופיל
     relationships: נעקבים ועוקבים
diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index c5020f6f9f665b..4ea818b301024e 100644
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -211,7 +211,6 @@ hr:
     featured_tags: Istaknuti hashtagovi
     import: Uvezi
     import_and_export: Uvezi i izvezi
-    notifications: Obavijesti
     preferences: Postavke
     profile: Profil
     statuses_cleanup: Automatsko brisanje postova
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index f09f7e42852c10..7b0e72cfcd55f7 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -597,6 +597,9 @@ hu:
       actions_description_html: Döntsd el, mit csináljunk, hogy megoldjuk ezt a bejelentést. Ha valamilyen büntető intézkedést hozol a bejelentett fiók ellen, küldünk neki egy figyelmeztetést e-mail-ben, kivéve ha a <strong>Spam</strong> kategóriát választod.
       actions_description_remote_html: Döntsd el, mit tegyünk a bejelentés lezárásának érdekében. Ez csak azt befolyásolja, hogy a <strong>saját</strong> kiszolgálód hogyan kommunikál ezzel a távoli fiókkal és hogyan kezeli annak tartalmait.
       add_to_report: Továbbiak hozzáadása a bejelentéshez
+      already_suspended_badges:
+        local: Már felfüggesztették ezen a szerveren
+        remote: Már felfüggesztették a kiszolgálóján
       are_you_sure: Biztos vagy benne?
       assign_to_self: Magamhoz rendelés
       assigned: Hozzárendelt moderátor
@@ -1652,7 +1655,7 @@ hu:
     import: Importálás
     import_and_export: Import és export
     migrate: Fiók átirányítása
-    notifications: Értesítések
+    notifications: E-mail értesítések
     preferences: Beállítások
     profile: Profil
     relationships: Követések és követők
diff --git a/config/locales/hy.yml b/config/locales/hy.yml
index 9d596dd834558c..5042e3f7f06c9c 100644
--- a/config/locales/hy.yml
+++ b/config/locales/hy.yml
@@ -778,7 +778,6 @@ hy:
     import: Ներմուծել
     import_and_export: Ներմուծել և արտահանել
     migrate: Հաշուի տեղափոխում
-    notifications: Ծանուցումներ
     preferences: Կարգավորումներ
     profile: Հաշիւ
     relationships: Հետեւումներ և հետեւորդներ
diff --git a/config/locales/id.yml b/config/locales/id.yml
index d1c04ad1d483aa..bee282fa833259 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -1389,7 +1389,6 @@ id:
     import: Impor
     import_and_export: Impor dan ekspor
     migrate: Pemindahan akun
-    notifications: Notifikasi
     preferences: Pilihan
     profile: Profil
     relationships: Ikuti dan pengikut
diff --git a/config/locales/ie.yml b/config/locales/ie.yml
index 7a0ae6292e8eda..6763a8038a5f8f 100644
--- a/config/locales/ie.yml
+++ b/config/locales/ie.yml
@@ -1652,7 +1652,6 @@ ie:
     import: Importar
     import_and_export: Importation e exportation
     migrate: Migration de conto
-    notifications: Notificationes
     preferences: Preferenties
     profile: Public profil
     relationships: Sequetes e sequitores
diff --git a/config/locales/io.yml b/config/locales/io.yml
index 4561a43e8e3f31..ed0d0d6345e040 100644
--- a/config/locales/io.yml
+++ b/config/locales/io.yml
@@ -1621,7 +1621,6 @@ io:
     import: Importacar
     import_and_export: Importaco e exportaco
     migrate: Kontomigro
-    notifications: Avizi
     preferences: Preferi
     profile: Profilo
     relationships: Sequati e sequanti
diff --git a/config/locales/is.yml b/config/locales/is.yml
index d7a3f8e2ccc7b1..710b35fce95303 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -597,6 +597,9 @@ is:
       actions_description_html: Ákveddu til hvaða aðgerða eigi að taka til að leysa þessa kæru. Ef þú ákveður að refsa kærða notandaaðgangnum, verður viðkomandi send tilkynning í tölvupósti, nema ef flokkurinn <strong>Ruslpóstur</strong> sé valinn.
       actions_description_remote_html: Ákveddu til hvaða aðgerða eigi að taka til að leysa þessa kæru. Þetta mun aðeins hafa áhrif á hvernig <strong>netþjónninn þinn</strong> meðhöndlar þennan fjartengda aðgang og efnið á honum.
       add_to_report: Bæta fleiru í kæru
+      already_suspended_badges:
+        local: Þegar frystur á þessum netþjóni
+        remote: Þegar frystur á hinum netþjóninum
       are_you_sure: Ertu viss?
       assign_to_self: Úthluta mér
       assigned: Úthlutaður umsjónarmaður
@@ -1656,7 +1659,6 @@ is:
     import: Flytja inn
     import_and_export: Inn- og útflutningur
     migrate: Yfirfærsla notandaaðgangs
-    notifications: Tilkynningar
     preferences: Kjörstillingar
     profile: Notandasnið
     relationships: Fylgist með og fylgjendur
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 6e7f9a7ce1597d..16a42b07607f19 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -597,6 +597,9 @@ it:
       actions_description_html: Decidete quali azioni intraprendere per risolvere la segnalazione. Se si intraprende un'azione punitiva contro l'account segnalato, gli sarà inviata una notifica via e-mail, tranne quando è selezionata la categoria <strong>Spam</strong>.
       actions_description_remote_html: Decide quali azioni intraprendere per risolvere la relazione. Questo influenzerà solo come <strong>il tuo</strong> server comunica con questo account remoto e ne gestisce il contenuto.
       add_to_report: Aggiungi altro al report
+      already_suspended_badges:
+        local: Già sospeso su questo server
+        remote: Già sospeso sul loro server
       are_you_sure: Sei sicuro?
       assign_to_self: Assegna a me
       assigned: Moderatore assegnato
@@ -1654,7 +1657,7 @@ it:
     import: Importa
     import_and_export: Importa ed esporta
     migrate: Migrazione dell'account
-    notifications: Notifiche
+    notifications: Notifiche e-mail
     preferences: Preferenze
     profile: Profilo
     relationships: Follows e followers
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index f5e874f98db0a5..19b2e94db0596b 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -1626,7 +1626,6 @@ ja:
     import: データのインポート
     import_and_export: インポート・エクスポート
     migrate: アカウントの引っ越し
-    notifications: 通知
     preferences: ユーザー設定
     profile: プロフィール
     relationships: フォロー・フォロワー
diff --git a/config/locales/ka.yml b/config/locales/ka.yml
index 74b86346002279..c92fd98a7cb4a4 100644
--- a/config/locales/ka.yml
+++ b/config/locales/ka.yml
@@ -419,7 +419,6 @@ ka:
     export: მონაცემის ექსპორტი
     import: იმპორტი
     migrate: ანგარიშის მიგრაცია
-    notifications: შეტყობინებები
     preferences: პრეფერენციები
     two_factor_authentication: მეორე-ფაქტორის აუტენტიფიკაცია
   statuses:
diff --git a/config/locales/kab.yml b/config/locales/kab.yml
index 566ba0dee1d0d1..4ba608c9f9d29f 100644
--- a/config/locales/kab.yml
+++ b/config/locales/kab.yml
@@ -784,7 +784,6 @@ kab:
     import: Kter
     import_and_export: Taktert d usifeḍ
     migrate: Tunigin n umiḍan
-    notifications: Ilɣa
     preferences: Imenyafen
     profile: Ameɣnu
     relationships: Imeḍfaṛen akked wid i teṭṭafaṛeḍ
diff --git a/config/locales/kk.yml b/config/locales/kk.yml
index 1dcbce97eb4b7c..f08d8ead1aa8b0 100644
--- a/config/locales/kk.yml
+++ b/config/locales/kk.yml
@@ -643,7 +643,6 @@ kk:
     import: Импорт
     import_and_export: Импорт/экспорт
     migrate: Аккаунт көшіру
-    notifications: Ескертпелер
     preferences: Баптаулар
     profile: Профиль
     relationships: Жазылымдар және оқырмандар
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index c4dcb5687b884a..82472788dc21a6 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -587,6 +587,9 @@ ko:
       actions_description_html: 이 신고를 해결하기 위해 취해야 할 조치를 지정해주세요. 신고된 계정에 대해 처벌 조치를 취하면, <strong>스팸</strong> 카테고리가 선택된 경우를 제외하고 해당 계정으로 이메일 알림이 전송됩니다.
       actions_description_remote_html: 이 신고를 해결하기 위해 실행할 행동을 결정하세요. 이 결정은 이 원격 계정과 그 콘텐츠를 다루는 방식에 대해 <strong>이 서버</strong>에서만 영향을 끼칩니다
       add_to_report: 신고에 더 추가하기
+      already_suspended_badges:
+        local: 이 서버에서 이미 정지되었습니다
+        remote: 저 서버에서 이미 정지되었습니다
       are_you_sure: 확실합니까?
       assign_to_self: 나에게 할당하기
       assigned: 할당된 중재자
@@ -1628,7 +1631,7 @@ ko:
     import: 데이터 가져오기
     import_and_export: 가져오기 & 내보내기
     migrate: 계정 이동
-    notifications: 알림
+    notifications: 이메일 알림
     preferences: 환경설정
     profile: 공개 프로필
     relationships: 팔로잉과 팔로워
@@ -1823,8 +1826,10 @@ ko:
       feature_action: 더 알아보기
       feature_audience: 마스토돈은 중개자 없이 청중을 관리할 수 있는 특별한 가능성을 제공합니다. 자체 인프라에 배포된 마스토돈을 사용하면 온라인에 있는 다른 마스토돈 서버에도 팔로우하거나 팔로우할 수 있으며, 본인 외에는 누구의 통제도 받지 않습니다.
       feature_audience_title: 신뢰 있는 청중 구축
+      feature_control: 내가 홈 피드에서 무엇을 보고 싶은지는 내가 제일 잘 압니다. 알고리즘이나 시간을 낭비하게 만드는 광고는 없습니다. 계정 하나로 다른 마스토돈 서버에 있는 누구나 팔로우 하여 그들의 게시물을 시간순으로 받아보고 인터넷의 한 구석을 좀 더 나답게 만들어 보세요.
       feature_control_title: 내 타임라인에 대해 통제권을 유지하세요
       feature_creativity: 마스토돈은 오디오, 비디오, 사진, 접근성 설명(alt),  투표, 콘텐츠 주의 (블라인드), 움직이는 아바타, 커스텀 이모티콘, 썸네일 자르기, 그리고 더 많은 것들을 당신이 온라인에서 당신을 더 잘 드러낼 수 있도록 돕기위해 지원합니다. 당신이 그림이나 음악을 올리던, 팟캐스트 같은것을 진행하던 마스토돈이 함께합니다.
+      feature_creativity_title: 독보적인 창의성
       feature_moderation: 마스토돈은 의사 결정권을 사용자에게 돌려줍니다. 각 서버는 기업 소셜 미디어처럼 하향식이 아닌 로컬에서 시행되는 자체 규칙과 규정을 만들 수 있어 다양한 그룹의 요구에 가장 유연하게 대응할 수 있습니다. 동의하는 규칙이 있는 서버에 가입하거나 직접 서버를 호스팅하세요.
       feature_moderation_title: 올바른 중재
       follow_action: 팔로우
diff --git a/config/locales/ku.yml b/config/locales/ku.yml
index f8d9cd80d42dbb..74dcd6f8f38a01 100644
--- a/config/locales/ku.yml
+++ b/config/locales/ku.yml
@@ -1417,7 +1417,6 @@ ku:
     import: Têxistin
     import_and_export: Têxistin û derxistin
     migrate: Barkirina ajimêrê
-    notifications: Agahdarî
     preferences: Hilbijarte
     profile: Profîl
     relationships: Şopandin û şopîner
diff --git a/config/locales/lad.yml b/config/locales/lad.yml
index c0ab028b9cfbff..0f04ce8928713f 100644
--- a/config/locales/lad.yml
+++ b/config/locales/lad.yml
@@ -597,6 +597,9 @@ lad:
       actions_description_html: Dechide kualas mizuras tomar para rezolver esta denunsia. Si tomas una aksion punitiva kontra el kuento denunsiada, se le embiara a dicho kuento un avizo por posta elektronika, ekseptado kuando se eskoja la kategoria <strong>Spam</strong>.
       actions_description_remote_html: Dechide ke fazer para rezolver este raporto. Esto solo va afektar komo <strong>tu</strong> sirvidor komunike kon este kuento remoto i ke faze kon su kontenido.
       add_to_report: Adjusta mas al raporto
+      already_suspended_badges:
+        local: Ya suspendido en este sirvidor
+        remote: Ya suspendido en sus sirvidor
       are_you_sure: Estas siguro?
       assign_to_self: Asinyamela a mi
       assigned: Moderador asinyado
@@ -1652,7 +1655,6 @@ lad:
     import: Importo
     import_and_export: Importo i eksporto
     migrate: Migrasyon de kuento
-    notifications: Avizos
     preferences: Preferensyas
     profile: Profil publiko
     relationships: Segidos i suivantes
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 610b4437c8afe3..44b5443fc8220b 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -466,6 +466,9 @@ lt:
       destroyed_msg: Skundo žinutė sekmingai ištrinta!
     reports:
       action_taken_by: Veiksmo ėmėsi
+      already_suspended_badges:
+        local: Jau sustabdytas šiame serveryje
+        remote: Jau sustabdytas jų serveryje
       are_you_sure: Ar esi įsitikinęs (-usi)?
       assign_to_self: Paskirti man
       assigned: Paskirtas moderatorius
@@ -755,7 +758,6 @@ lt:
     featured_tags: Rodomi saitažodžiai(#)
     import: Importuoti
     migrate: Paskyros migracija
-    notifications: Pranešimai
     preferences: Preferencijos
     two_factor_authentication: Dviejų veiksnių autentikacija
   statuses:
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index bd2500a912ca9e..481cd94f788a60 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -1667,7 +1667,6 @@ lv:
     import: Imports
     import_and_export: Imports un eksports
     migrate: Konta migrācija
-    notifications: Paziņojumi
     preferences: Iestatījumi
     profile: Profils
     relationships: Sekojamie un sekotāji
diff --git a/config/locales/ml.yml b/config/locales/ml.yml
index 5f8de529872ced..883a400318a1da 100644
--- a/config/locales/ml.yml
+++ b/config/locales/ml.yml
@@ -87,5 +87,3 @@ ml:
       subject: "%{name} ഇപ്പോൾ നിങ്ങളെ പിന്തുടരുന്നു"
   relationships:
     following: പിന്തുടരുന്നു
-  settings:
-    notifications: അറിയിപ്പുകൾ
diff --git a/config/locales/ms.yml b/config/locales/ms.yml
index bfd6591ddbe8fd..f39c26a5c10baa 100644
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@@ -1595,7 +1595,6 @@ ms:
     import: Import
     import_and_export: Import dan eksport
     migrate: Penghijrahan akaun
-    notifications: Pemberitahuan
     preferences: Keutamaan
     profile: Profil
     relationships: Ikutan dan pengikut
diff --git a/config/locales/my.yml b/config/locales/my.yml
index 6898db877c9d11..4ac9ecdd45ba9d 100644
--- a/config/locales/my.yml
+++ b/config/locales/my.yml
@@ -1594,7 +1594,6 @@ my:
     import: ထည့်သွင်းခြင်း
     import_and_export: ထည့်သွင်းခြင်းနှင့် ထုတ်ယူခြင်း
     migrate: အကောင့်ပြောင်းရွှေ့ခြင်း
-    notifications: အသိပေးချက်များ
     preferences: သတ်မှတ်ချက်များ
     profile: ပရိုဖိုင်
     relationships: စောင့်ကြည့်သူများနှင့် စောင့်ကြည့်စာရင်း
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 3b4c586dc5493c..561a0f0af81789 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -597,6 +597,9 @@ nl:
       actions_description_html: Beslis welke maatregel moet worden genomen om deze rapportage op te lossen. Wanneer je een (straf)maatregel tegen het gerapporteerde account neemt, krijgt het account een e-mailmelding, behalve wanneer de <strong>spam</strong>-categorie is gekozen.
       actions_description_remote_html: Beslis welke actie moet worden ondernomen om deze rapportage op te lossen. Dit is alleen van invloed op hoe <strong>jouw</strong> server met dit externe account communiceert en de inhoud ervan beheert.
       add_to_report: Meer aan de rapportage toevoegen
+      already_suspended_badges:
+        local: Al geschorst op deze server
+        remote: Al geschorst op hun server
       are_you_sure: Weet je het zeker?
       assign_to_self: Aan mij toewijzen
       assigned: Toegewezen moderator
@@ -1652,7 +1655,7 @@ nl:
     import: Importeren
     import_and_export: Importeren en exporteren
     migrate: Accountmigratie
-    notifications: Meldingen
+    notifications: E-mailmeldingen
     preferences: Voorkeuren
     profile: Openbaar profiel
     relationships: Volgers en gevolgde accounts
diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index f53b67d0982175..983dd0142100e8 100644
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -152,7 +152,7 @@ nn:
       suspend: Utvis og slett kontodata for godt
       suspended: Utvist
       suspension_irreversible: Data frå denne kontoen har blitt ikkje-reverserbart sletta. Du kan oppheve suspenderinga av kontoen for å bruke den, men det vil ikkje gjenopprette alle data den tidligare har hatt.
-      suspension_reversible_hint_html: Kontoen har blitt suspendert, og data vil bli fullstendig fjerna den %{date}. Fram til då kan kontoen gjenopprettes uten negative effekter. Om du ynskjer å fjerne kontodata no, kan du gjere det nedanfor.
+      suspension_reversible_hint_html: Kontoen har vorte stengd, og data vil bli fullstendig fjerna den %{date}. Fram til då kandu gjenoppretta kontoen utan negative konsekvensar. Om du ynskjer å fjerna kontodata no, kan du gjera det nedanfor.
       title: Kontoar
       unblock_email: Avblokker e-postadresse
       unblocked_email_msg: Avblokkerte %{username} si e-postadresse
@@ -221,7 +221,7 @@ nn:
         unblock_email_account: Avblokker e-postadresse
         unsensitive_account: Angr tving ømtolig konto
         unsilence_account: Angre avgrensing av konto
-        unsuspend_account: Opphev suspensjonen av kontoen
+        unsuspend_account: Opphev utestenginga av kontoen
         update_announcement: Oppdater kunngjøringen
         update_custom_emoji: Oppdater tilpassa emoji
         update_domain_block: Oppdater domene-sperring
@@ -385,9 +385,9 @@ nn:
       add_new: Lag ny
       confirm_suspension:
         cancel: Avbryt
-        confirm: Suspender
+        confirm: Utvis
         permanent_action: Å oppheve suspensjonen vil ikkje gjenopprette data eller koplingar.
-        preamble_html: Du er i ferd med å suspendera <strong>%{domain}</strong> inkludert underdomener.
+        preamble_html: Du er i ferd med å utestenga <strong>%{domain}</strong> inkludert underdomene.
         remove_all_data: Dette vil fjerna alt innhald, media og profildata for kontoar som tilhøyrer dette domenet frå din tenar.
         stop_communication: Tenaren din vil slutta å kommunisera med desse tenarane.
         title: Stadfest domeneblokkering for %{domain}
@@ -492,7 +492,7 @@ nn:
           reject_media: Avvis media
           reject_reports: Avvis rapporter
           silence: Begrens
-          suspend: Suspender
+          suspend: Utvis
         policy: Vilkår
         reason: Offentlig årsak
         title: Retningslinjer for innhold
@@ -597,6 +597,9 @@ nn:
       actions_description_html: Avgjer kva som skal gjerast med denne rapporteringa. Dersom du utfører straffetiltak mot den rapporterte kontoen, vil dei motta ein e-post – så sant du ikkje har valt kategorien <strong>Spam</strong>.
       actions_description_remote_html: Avgjer kva du vil gjera for å løysa denne rapporten. Dette påverkar berre korleis tenaren <strong>din</strong> kommuniserer med kontoen på ein annan tenar, og korleis tenaren din handterer innhald derifrå.
       add_to_report: Legg til i rapporten
+      already_suspended_badges:
+        local: Allereie utestengd på denne tenaren
+        remote: Allereie utestengd på tenaren deira
       are_you_sure: Er du sikker?
       assign_to_self: Tilegn til meg
       assigned: Tilsett moderator
@@ -979,7 +982,7 @@ nn:
         none: en advarsel
         sensitive: å merke kontoen sin som følsom
         silence: for å begrense deres konto
-        suspend: for å suspendere kontoen deres
+        suspend: for å stenga kontoen deira
       body: "%{target} ankar på ei modereringsavgjerd av %{action_taken_by} den %{date}, som var %{type}. Dei skreiv:"
       next_steps: Du kan godkjenna anken for å endra modereringsavgjerda, eller du kan oversjå anken.
       subject: "%{username} ankar ei modereringsavgjer på %{instance}"
@@ -1189,7 +1192,7 @@ nn:
         none: Advarsel
         sensitive: Markering av konto som ømtolig
         silence: Begrensning av konto
-        suspend: Suspensjon av konto
+        suspend: Utestenging av konto
       your_appeal_approved: Din klage har blitt godkjent
       your_appeal_pending: Du har levert en klage
       your_appeal_rejected: Din klage har blitt avvist
@@ -1652,7 +1655,7 @@ nn:
     import: Hent inn
     import_and_export: Importer og eksporter
     migrate: Kontoflytting
-    notifications: Varsel
+    notifications: E-postvarslingar
     preferences: Innstillingar
     profile: Profil
     relationships: Fylgjar og fylgjarar
@@ -1820,7 +1823,7 @@ nn:
         mark_statuses_as_sensitive: Nokre av innlegga dine har vorte markerte som ømtolige av moderatorane ved %{instance}. Dette tyder at folk må trykkje på mediane i innlegga for å førehandsvise dei. Du kan markera media som ømtolig sjølv når du legg ut nye innlegg.
         sensitive: Frå no av vil alle dine opplasta mediefiler bli markert som ømtolig og skjult bak ei klikk-åtvaring.
         silence: Medan kontoen din er avgrensa, vil berre folk som allereie fylgjer deg sjå dine tutar på denne tenaren, og du kan bli ekskludert fra diverse offentlige oppføringer. Andre kan framleis fylgje deg manuelt.
-        suspend: Du kan ikkje lenger bruke kontoen din, og profilen og andre data er ikkje lenger tilgjengelege. Du kan framleis logge inn for å be om ein sikkerheitskopi av data før dei blir fullstendig sletta om omtrent 30 dagar, men vi beheld nokre grunnleggjande data for å forhindre deg å omgå suspenderinga.
+        suspend: Du kan ikkje lenger bruka kontoen din, og profilen og andre data er ikkje lenger tilgjengelege. Du kan framleis logga inn for å be om ein sikkerheitskopi av data før dei blir fullstendig sletta om omtrent 30 dagar, men me vil lagra nokre grunnleggjande data for å syta for at du ikkje omgår utestenginga.
       reason: 'Årsak:'
       statuses: 'Innlegg sitert:'
       subject:
@@ -1865,6 +1868,9 @@ nn:
       follows_subtitle: Fylg kjende folk
       follows_title: Kven du kan fylgja
       follows_view_more: Sjå fleire du kan fylgja
+      hashtags_recent_count:
+        one: "%{people} person dei siste to dagane"
+        other: "%{people} personar dei siste to dagane"
       hashtags_subtitle: Sjå kva som har vore populært dei siste to dagane
       hashtags_title: Populære emneknaggar
       hashtags_view_more: Sjå fleire populære emneknaggar
diff --git a/config/locales/no.yml b/config/locales/no.yml
index 4cdf2ca82a0e01..c71dffc6361e99 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -1649,7 +1649,6 @@
     import: Importér
     import_and_export: Importer og eksporter
     migrate: Kontomigrering
-    notifications: Varslinger
     preferences: Innstillinger
     profile: Profil
     relationships: Følginger og følgere
diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index 569f76715b21c5..0a653ea46c2732 100644
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -832,7 +832,6 @@ oc:
     import: Importar de donadas
     import_and_export: Import e export
     migrate: Migracion de compte
-    notifications: Notificacions
     preferences: Preferéncias
     profile: Perfil
     relationships: Abonaments e seguidors
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index e43f9a605079dd..1dc1482e20aede 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -621,6 +621,9 @@ pl:
       actions_description_html: Zdecyduj, jakie działania należy podjąć, aby rozstrzygnąć niniejsze zgłoszenie. Jeśli podejmiesz działania karne przeciwko zgłoszonemu kontowi, zostanie do nich wysłane powiadomienie e-mail, chyba że wybrano kategorię <strong>Spam</strong>.
       actions_description_remote_html: Zdecyduj, jakie działanie należy podjąć, aby rozwiązać to zgłoszenie. Będzie to miało wpływ jedynie na sposób, w jaki <strong>Twój</strong> serwer komunikuje się z tym kontem zdalnym i obsługuje jego zawartość.
       add_to_report: Dodaj więcej do zgłoszenia
+      already_suspended_badges:
+        local: Już zawieszono na tym serwerze
+        remote: Już zawieszono na ich serwerze
       are_you_sure: Czy na pewno?
       assign_to_self: Przypisz do siebie
       assigned: Przypisany moderator
@@ -1704,7 +1707,7 @@ pl:
     import: Importowanie danych
     import_and_export: Import i eksport
     migrate: Migracja konta
-    notifications: Powiadomienia
+    notifications: Powiadomienia e-mail
     preferences: Preferencje
     profile: Profil
     relationships: Obserwowani i obserwujący
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 194de9a3eb1456..78a20aed0252c1 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -1652,7 +1652,6 @@ pt-BR:
     import: Importar
     import_and_export: Importar e exportar
     migrate: Migração de conta
-    notifications: Notificações
     preferences: Preferências
     profile: Perfil
     relationships: Seguindo e seguidores
diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index 57a698e1d10dc1..9dde61ff06a542 100644
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -597,6 +597,9 @@ pt-PT:
       actions_description_html: Decida a ação a tomar para resolver esta denúncia. Se decidir por uma ação punitiva contra a conta denunciada, um e-mail de notificação será enviado, excetuando quando selecionada a categoria <strong>Spam</strong>.
       actions_description_remote_html: Decida quais as medidas a tomar para resolver esta denúncia. Isso apenas afetará como <strong>o seu</strong> servido comunica com esta conta remota e gere o seu conteúdo.
       add_to_report: Adicionar mais à denúncia
+      already_suspended_badges:
+        local: Já suspenso neste servidor
+        remote: Já suspenso no servidor deles
       are_you_sure: Tem a certeza?
       assign_to_self: Atribuída a mim
       assigned: Atribuída ao moderador
@@ -1652,7 +1655,7 @@ pt-PT:
     import: Importar
     import_and_export: Importar e exportar
     migrate: Migração de conta
-    notifications: Notificações
+    notifications: Notificações por e-mail
     preferences: Preferências
     profile: Perfil
     relationships: Seguindo e seguidores
@@ -1865,6 +1868,9 @@ pt-PT:
       follows_subtitle: Siga contas bem conhecidas
       follows_title: Quem seguir
       follows_view_more: Veja mais pessoas para seguir
+      hashtags_recent_count:
+        one: "%{people} pessoa nos últimos 2 dias"
+        other: "%{people} pessoas nos últimos 2 dias"
       hashtags_subtitle: Explore o que está em tendência desde os últimos 2 dias
       hashtags_title: Trending hashtags
       hashtags_view_more: Ver mais hashtags em alta
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index d2c46097008559..05ea31ff814178 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -1699,7 +1699,6 @@ ru:
     import: Импорт
     import_and_export: Импорт и экспорт
     migrate: Миграция учётной записи
-    notifications: Уведомления
     preferences: Настройки
     profile: Профиль
     relationships: Подписки и подписчики
diff --git a/config/locales/sc.yml b/config/locales/sc.yml
index e51ac84eac6f55..01c355794d3a75 100644
--- a/config/locales/sc.yml
+++ b/config/locales/sc.yml
@@ -985,7 +985,6 @@ sc:
     import: Importatzione
     import_and_export: Importatzione e esportatzione
     migrate: Tràmuda de contu
-    notifications: Notìficas
     preferences: Preferèntzias
     profile: Profilu
     relationships: Gente chi sighis e sighiduras
diff --git a/config/locales/sco.yml b/config/locales/sco.yml
index 8382dec76e1cad..2a7b1e3e701aed 100644
--- a/config/locales/sco.yml
+++ b/config/locales/sco.yml
@@ -1407,7 +1407,6 @@ sco:
     import: Import
     import_and_export: Import an export
     migrate: Accoont flittin
-    notifications: Notes
     preferences: Preferences
     profile: Profile
     relationships: Follaes and follaers
diff --git a/config/locales/si.yml b/config/locales/si.yml
index e0be7ff8e95721..f5e65fda8d8107 100644
--- a/config/locales/si.yml
+++ b/config/locales/si.yml
@@ -1274,7 +1274,6 @@ si:
     import: ආයාතය
     import_and_export: ආයාත හා නිර්යාත
     migrate: ගිණුම් සංක්‍රමණය
-    notifications: දැනුම්දීම්
     preferences: අභිප්‍රේත
     profile: ප්‍රසිද්ධ පැතිකඩ
     relationships: අනුගමන හා අනුගාමික
diff --git a/config/locales/simple_form.nn.yml b/config/locales/simple_form.nn.yml
index 72525619c7d9cd..1edf185c0a0521 100644
--- a/config/locales/simple_form.nn.yml
+++ b/config/locales/simple_form.nn.yml
@@ -165,7 +165,7 @@ nn:
           none: Gjer inkje
           sensitive: Ømtolig
           silence: Togn
-          suspend: Utvis og slett kontodata for godt
+          suspend: Utvis
         warning_preset_id: Bruk åtvaringsoppsett
       announcement:
         all_day: Heildagshending
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 1d8866645c2bd8..6b59677910abbc 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -198,11 +198,14 @@ sk:
         destroy_ip_block: Vymaž IP pravidlo
         destroy_status: Vymaž príspevok
         destroy_unavailable_domain: Vymaž nedostupnú doménu
+        destroy_user_role: Zničiť rolu
         disable_2fa_user: Vypni dvoj-faktorové overovanie
         disable_custom_emoji: Vypni vlastné emotikony
+        disable_sign_in_token_auth_user: Zakázať používateľom overovanie e-mailovým tokenom
         disable_user: Deaktivuj užívateľa
         enable_custom_emoji: Povoľ vlastné emotikony
         enable_user: Povoľ užívateľa
+        memorialize_account: Zmena na „in memoriam“
         promote_user: Povýš užívateľskú rolu
         reject_appeal: Zamietni námietku
         reject_user: Zamietni užívateľa
@@ -447,10 +450,13 @@ sk:
         instance_statuses_measure: uložené príspevky
       delivery:
         all: Všetko
+        clear: Vymazať chyby doručovania
         failing: Zlyhávajúce
+        restart: Reštartovať doručovanie
         stop: Zastav doručenie
         unavailable: Nedostupné
       delivery_available: Je v dosahu doručovania
+      delivery_error_days: Dni chybného doručovania
       empty: Nenájdené žiadne domény.
       moderation:
         all: Všetky
@@ -1188,7 +1194,7 @@ sk:
     import: Importuj
     import_and_export: Import a export
     migrate: Presuň účet
-    notifications: Oboznámenia
+    notifications: Emailové upozornenia
     preferences: Voľby
     profile: Profil
     relationships: Sledovania a následovatelia
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 3f2b65b76abfe6..9498ca78983e6b 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -621,6 +621,9 @@ sl:
       actions_description_html: Odločite se, katere ukrepe boste sprejeli za rešitev te prijave. Če sprejmete kazenski ukrep proti prijavljenemu računu, mu bo poslano e-poštno obvestilo, razen če je izbrana kategorija <strong>Neželena pošta</strong>.
       actions_description_remote_html: Odločite se za dejanje, ki bo odločilo o tej prijavi. To bo vplivalo le na to, kako <strong>vaš</strong> strežnik komunicira s tem oddaljenim računom in obravnava njegovo vsebino.
       add_to_report: Dodaj več v prijavo
+      already_suspended_badges:
+        local: Že suspendiran na tem strežniku
+        remote: Že suspendiran na njihovem strežniku
       are_you_sure: Ali ste prepričani?
       assign_to_self: Dodeli meni
       assigned: Dodeljen moderator
@@ -1704,7 +1707,7 @@ sl:
     import: Uvozi
     import_and_export: Uvoz in izvoz
     migrate: Selitev računa
-    notifications: Obvestila
+    notifications: Obvestila po e-pošti
     preferences: Nastavitve
     profile: Profil
     relationships: Sledenja in sledilci
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index 759f995470991d..ce2c8b0f992fc1 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -596,6 +596,9 @@ sq:
       actions_description_html: Vendosni cili veprim të kryhet për të zgjidhur këtë raportim. Nëse ndërmerrni një veprim ndëshkues kundër llogarisë së raportuar, atyre do t’u dërgohet një njoftim me email, hiq rastin kur përzgjidhet kategoria <strong>I padëshiruar</strong>.
       actions_description_remote_html: Vendosni cili veprim të ndërmerret për zgjidhjen e këtij raportimi. Kjo do të prekë vetëm mënyrën se si shërbyesi <strong>juaj</strong> komunikon me këtë llogari të largët dhe se si e trajtojnë lëndën e saj.
       add_to_report: Shtoni më tepër te raportimi
+      already_suspended_badges:
+        local: Tashmë i pezulluar në këtë shërbyes
+        remote: Tashmë i pezulluar në shërbyesin e vet
       are_you_sure: A jeni i sigurt?
       assign_to_self: Caktojani vetes
       assigned: Iu caktua moderator
@@ -1648,7 +1651,7 @@ sq:
     import: Importo
     import_and_export: Importim dhe eksportim
     migrate: Migrim llogarie
-    notifications: Njoftime
+    notifications: Njoftime me email
     preferences: Parapëlqime
     profile: Profil
     relationships: Ndjekje dhe ndjekës
diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml
index 74a5e0b1c07ea0..4f10fe8649a197 100644
--- a/config/locales/sr-Latn.yml
+++ b/config/locales/sr-Latn.yml
@@ -1678,7 +1678,6 @@ sr-Latn:
     import: Uvoz
     import_and_export: Uvoz i izvoz
     migrate: Prebacivanje naloga
-    notifications: Obaveštenja
     preferences: Podešavanja
     profile: Javni profil
     relationships: Praćenja i pratioci
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 9e7dd9c35c62c0..382f196bd0beeb 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -1678,7 +1678,6 @@ sr:
     import: Увоз
     import_and_export: Увоз и извоз
     migrate: Пребацивање налога
-    notifications: Обавештења
     preferences: Подешавања
     profile: Јавни профил
     relationships: Праћења и пратиоци
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index d282d9222204cb..855fa765f5225a 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -1652,7 +1652,7 @@ sv:
     import: Importera
     import_and_export: Import och export
     migrate: Kontoflytt
-    notifications: Aviseringar
+    notifications: E-postaviseringar
     preferences: Inställningar
     profile: Profil
     relationships: Följer och följare
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 67d2b94793d936..558552362fa15c 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -585,6 +585,9 @@ th:
       actions_description_html: ตัดสินใจว่าการกระทำใดที่จะใช้เพื่อแก้ปัญหารายงานนี้ หากคุณใช้การกระทำที่เป็นการลงโทษต่อบัญชีที่รายงาน จะส่งการแจ้งเตือนอีเมลถึงเขา ยกเว้นเมื่อมีการเลือกหมวดหมู่ <strong>สแปม</strong>
       actions_description_remote_html: ตัดสินใจว่าการกระทำใดที่จะใช้เพื่อแก้ปัญหารายงานนี้ นี่จะมีผลต่อวิธีที่เซิร์ฟเวอร์ <strong>ของคุณ</strong> สื่อสารกับบัญชีระยะไกลนี้และจัดการเนื้อหาของบัญชีเท่านั้น
       add_to_report: เพิ่มข้อมูลเพิ่มเติมไปยังรายงาน
+      already_suspended_badges:
+        local: ระงับในเซิร์ฟเวอร์นี้อยู่แล้ว
+        remote: ระงับในเซิร์ฟเวอร์ของเขาอยู่แล้ว
       are_you_sure: คุณแน่ใจหรือไม่?
       assign_to_self: มอบหมายให้ฉัน
       assigned: ผู้กลั่นกรองที่ได้รับมอบหมาย
@@ -1626,7 +1629,7 @@ th:
     import: การนำเข้า
     import_and_export: การนำเข้าและการส่งออก
     migrate: การโยกย้ายบัญชี
-    notifications: การแจ้งเตือน
+    notifications: การแจ้งเตือนทางอีเมล
     preferences: การกำหนดลักษณะ
     profile: โปรไฟล์สาธารณะ
     relationships: การติดตามและผู้ติดตาม
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index a942e5b3947f4f..bdf002333d171f 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -597,6 +597,9 @@ tr:
       actions_description_html: Bu bildirimi çözmek için ne yapılması gerektiğine karar verin. Bildirilen hesap için ceza işlemi yaparsanız, <strong>İstenmeyen</strong> kategorisi seçilmemişse, onlara bir e-posta duyurusu gönderilecektir.
       actions_description_remote_html: Bu bildirimi çözmek için hangi eylemi yapmak istediğinize karar verin. Bu yalnızca <strong>sizin</strong> sunucunuzun bu uzak hesapla nasıl etkileşeğini ve içeriğiyle ne yapacağını etkiler.
       add_to_report: Bildirime daha fazlasını ekle
+      already_suspended_badges:
+        local: Bu sunucuda zaten askıya alınmış
+        remote: Sunucularında zaten askıya alınmış
       are_you_sure: Emin misiniz?
       assign_to_self: Bana ata
       assigned: Denetleyici atandı
@@ -1652,7 +1655,7 @@ tr:
     import: İçe aktar
     import_and_export: İçe ve dışa aktar
     migrate: Hesap taşıma
-    notifications: Bildirimler
+    notifications: E-posta bildirimleri
     preferences: Tercihler
     profile: Profil
     relationships: Takip edilenler ve takipçiler
diff --git a/config/locales/tt.yml b/config/locales/tt.yml
index 845b33a02102b0..c1a22a4ca8c354 100644
--- a/config/locales/tt.yml
+++ b/config/locales/tt.yml
@@ -511,7 +511,6 @@ tt:
     development: Ясаучылар өчен
     edit_profile: Профильне үзгәртү
     import: Импортлау
-    notifications: Искәртүләр
     preferences: Caylaw
     profile: Профиль
     two_factor_authentication: Ике-факторлы авторизация
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 9c343489eb445f..21ddeb5117e1fe 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -621,6 +621,9 @@ uk:
       actions_description_html: Визначте, які дії слід вжити для розв'язання цієї скарги. Якщо ви оберете каральні дії проти зареєстрованого облікового запису, про них буде надіслано сповіщення електронним листом, крім випадків, коли вибрано категорію <strong>Спам</strong>.
       actions_description_remote_html: Визначте, які дії слід вжити для розв'язання цього звіту. Це вплине тільки на те, як <strong>ваш</strong> сервер з'єднується з цим віддаленим обліковим записом і обробляє його вміст.
       add_to_report: Додати ще подробиць до скарги
+      already_suspended_badges:
+        local: Вже призупинено на цьому сервері
+        remote: Уже призупинено на їх сервері
       are_you_sure: Ви впевнені?
       assign_to_self: Призначити мені
       assigned: Призначений модератор
@@ -1704,7 +1707,7 @@ uk:
     import: Імпорт
     import_and_export: Імпорт та експорт
     migrate: Міграція облікового запису
-    notifications: Сповіщення
+    notifications: E-mail сповіщення
     preferences: Налаштування
     profile: Загальнодоступний профіль
     relationships: Підписки та підписники
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index b9efeee46e8e88..fc4ec804820e53 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -1626,7 +1626,6 @@ vi:
     import: Nhập dữ liệu
     import_and_export: Dữ liệu
     migrate: Chuyển tài khoản sang máy chủ khác
-    notifications: Thông báo
     preferences: Chung
     profile: Hồ sơ
     relationships: Quan hệ
diff --git a/config/locales/zgh.yml b/config/locales/zgh.yml
index 1db573369a1099..180fcf2f1673f4 100644
--- a/config/locales/zgh.yml
+++ b/config/locales/zgh.yml
@@ -110,5 +110,4 @@ zgh:
     account_settings: ⵜⵉⵙⵖⴰⵍ ⵏ ⵓⵎⵉⴹⴰⵏ
     back: ⴰⵖⵓⵍ ⵖⵔ ⵎⴰⵙⵜⵓⴷⵓⵏ
     edit_profile: ⵙⵏⴼⵍ ⵉⴼⵔⵙ
-    notifications: ⵜⵉⵏⵖⵎⵉⵙⵉⵏ
     profile: ⵉⴼⵔⵙ
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 2d1d82b3064c3b..29f9badb8031be 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -585,6 +585,9 @@ zh-CN:
       actions_description_html: 决定采取何种措施处理此举报。如果对被举报账号采取惩罚性措施，将向其发送一封电子邮件通知。但若选中<strong>垃圾信息</strong>类别则不会发送通知。
       actions_description_remote_html: 决定采取何种行动来解决此举报。 这只会影响<strong>您的</strong>服务器如何与该远程帐户的通信并处理其内容。
       add_to_report: 增加更多举报内容
+      already_suspended_badges:
+        local: 已经在此服务器上暂停
+        remote: 已在其所属服务器被封禁
       are_you_sure: 你确定吗？
       assign_to_self: 接管
       assigned: 已接管的监察员
@@ -1626,7 +1629,7 @@ zh-CN:
     import: 导入
     import_and_export: 导入和导出
     migrate: 账户迁移
-    notifications: 通知
+    notifications: 电子邮件通知
     preferences: 首选项
     profile: 个人资料
     relationships: 关注管理
diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml
index 0bb362eadf65d3..2a0f802a1fd868 100644
--- a/config/locales/zh-HK.yml
+++ b/config/locales/zh-HK.yml
@@ -1626,7 +1626,6 @@ zh-HK:
     import: 匯入
     import_and_export: 匯入及匯出
     migrate: 帳戶遷移
-    notifications: 通知
     preferences: 偏好設定
     profile: 個人資料
     relationships: 關注及追隨者
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 4c450f3c1bf283..b78c7d3319a4dc 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -585,6 +585,9 @@ zh-TW:
       actions_description_html: 決定應對此報告採取何種行動。若您對檢舉之帳號採取懲罰措施，則將對他們發送 e-mail 通知，如非選擇了 <strong>垃圾郵件</strong> 類別。
       actions_description_remote_html: 決定將對此檢舉報告採取何種動作。這將僅作用於<strong>您的伺服器</strong>與此遠端帳號及其內容之通訊行為。
       add_to_report: 加入更多至報告
+      already_suspended_badges:
+        local: 已自此伺服器停權
+        remote: 已自該伺服器停權
       are_you_sure: 您確定嗎？
       assign_to_self: 指派給自己
       assigned: 指派站務
@@ -1628,7 +1631,7 @@ zh-TW:
     import: 匯入
     import_and_export: 匯入及匯出
     migrate: 帳號搬遷
-    notifications: 通知
+    notifications: 電子郵件通知
     preferences: 偏好設定
     profile: 個人檔案
     relationships: 跟隨中與跟隨者

From a583317df62acced3cea1f102e5c7981ff1bdbea Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 20 Mar 2024 12:06:44 +0100
Subject: [PATCH 0527/2191] Fix icon and styling in browser notifications
 banner (#29658)

---
 .../notifications/components/column_settings.jsx   | 14 ++++++++------
 .../components/notifications_permission_banner.jsx |  4 ++--
 .../material-icons/400-20px/settings-fill.svg      |  1 +
 .../material-icons/400-20px/settings.svg           |  1 +
 app/javascript/styles/mastodon/components.scss     |  6 ++++++
 5 files changed, 18 insertions(+), 8 deletions(-)
 create mode 100644 app/javascript/material-icons/400-20px/settings-fill.svg
 create mode 100644 app/javascript/material-icons/400-20px/settings.svg

diff --git a/app/javascript/mastodon/features/notifications/components/column_settings.jsx b/app/javascript/mastodon/features/notifications/components/column_settings.jsx
index 2a9425b82b3398..caa1b757a4b758 100644
--- a/app/javascript/mastodon/features/notifications/components/column_settings.jsx
+++ b/app/javascript/mastodon/features/notifications/components/column_settings.jsx
@@ -68,16 +68,18 @@ export default class ColumnSettings extends PureComponent {
           <span className='warning-hint'><FormattedMessage id='notifications.permission_denied' defaultMessage='Desktop notifications are unavailable due to previously denied browser permissions request' /></span>
         )}
 
-        {alertsEnabled && browserSupport && browserPermission === 'default' && (
-          <span className='warning-hint'>
-            <FormattedMessage id='notifications.permission_required' defaultMessage='Desktop notifications are unavailable because the required permission has not been granted.' /> <GrantPermissionButton onClick={onRequestNotificationPermission} />
-          </span>
-        )}
-
         <section>
           <ClearColumnButton onClick={onClear} />
         </section>
 
+        {alertsEnabled && browserSupport && browserPermission === 'default' && (
+          <section>
+            <span className='warning-hint'>
+              <FormattedMessage id='notifications.permission_required' defaultMessage='Desktop notifications are unavailable because the required permission has not been granted.' /> <GrantPermissionButton onClick={onRequestNotificationPermission} />
+            </span>
+          </section>
+        )}
+
         <section>
           <h3><FormattedMessage id='notifications.policy.title' defaultMessage='Filter out notifications from…' /></h3>
 
diff --git a/app/javascript/mastodon/features/notifications/components/notifications_permission_banner.jsx b/app/javascript/mastodon/features/notifications/components/notifications_permission_banner.jsx
index 1cdf5b5dfef100..276bcbebad0210 100644
--- a/app/javascript/mastodon/features/notifications/components/notifications_permission_banner.jsx
+++ b/app/javascript/mastodon/features/notifications/components/notifications_permission_banner.jsx
@@ -5,8 +5,8 @@ import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
 
 import { connect } from 'react-redux';
 
+import SettingsIcon from '@/material-icons/400-20px/settings.svg?react';
 import CloseIcon from '@/material-icons/400-24px/close.svg?react';
-import TuneIcon from '@/material-icons/400-24px/tune.svg?react';
 import { requestBrowserPermission } from 'mastodon/actions/notifications';
 import { changeSetting } from 'mastodon/actions/settings';
 import { Button } from 'mastodon/components/button';
@@ -42,7 +42,7 @@ class NotificationsPermissionBanner extends PureComponent {
         </div>
 
         <h2><FormattedMessage id='notifications_permission_banner.title' defaultMessage='Never miss a thing' /></h2>
-        <p><FormattedMessage id='notifications_permission_banner.how_to_control' defaultMessage="To receive notifications when Mastodon isn't open, enable desktop notifications. You can control precisely which types of interactions generate desktop notifications through the {icon} button above once they're enabled." values={{ icon: <Icon id='sliders' icon={TuneIcon} /> }} /></p>
+        <p><FormattedMessage id='notifications_permission_banner.how_to_control' defaultMessage="To receive notifications when Mastodon isn't open, enable desktop notifications. You can control precisely which types of interactions generate desktop notifications through the {icon} button above once they're enabled." values={{ icon: <Icon id='sliders' icon={SettingsIcon} /> }} /></p>
         <Button onClick={this.handleClick}><FormattedMessage id='notifications_permission_banner.enable' defaultMessage='Enable desktop notifications' /></Button>
       </div>
     );
diff --git a/app/javascript/material-icons/400-20px/settings-fill.svg b/app/javascript/material-icons/400-20px/settings-fill.svg
new file mode 100644
index 00000000000000..f5de77821d1bb5
--- /dev/null
+++ b/app/javascript/material-icons/400-20px/settings-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="20" viewBox="0 -960 960 960" width="20"><path d="m403-96-22-114q-23-9-44.5-21T296-259l-110 37-77-133 87-76q-2-12-3-24t-1-25q0-13 1-25t3-24l-87-76 77-133 110 37q19-16 40.5-28t44.5-21l22-114h154l22 114q23 9 44.5 21t40.5 28l110-37 77 133-87 76q2 12 3 24t1 25q0 13-1 25t-3 24l87 76-77 133-110-37q-19 16-40.5 28T579-210L557-96H403Zm77-240q60 0 102-42t42-102q0-60-42-102t-102-42q-60 0-102 42t-42 102q0 60 42 102t102 42Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-20px/settings.svg b/app/javascript/material-icons/400-20px/settings.svg
new file mode 100644
index 00000000000000..472569ab6acea9
--- /dev/null
+++ b/app/javascript/material-icons/400-20px/settings.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="20" viewBox="0 -960 960 960" width="20"><path d="m403-96-22-114q-23-9-44.5-21T296-259l-110 37-77-133 87-76q-2-12-3-24t-1-25q0-13 1-25t3-24l-87-76 77-133 110 37q19-16 40.5-28t44.5-21l22-114h154l22 114q23 9 44.5 21t40.5 28l110-37 77 133-87 76q2 12 3 24t1 25q0 13-1 25t-3 24l87 76-77 133-110-37q-19 16-40.5 28T579-210L557-96H403Zm59-72h36l19-99q38-7 71-26t57-48l96 32 18-30-76-67q6-17 9.5-35.5T696-480q0-20-3.5-38.5T683-554l76-67-18-30-96 32q-24-29-57-48t-71-26l-19-99h-36l-19 99q-38 7-71 26t-57 48l-96-32-18 30 76 67q-6 17-9.5 35.5T264-480q0 20 3.5 38.5T277-406l-76 67 18 30 96-32q24 29 57 48t71 26l19 99Zm18-168q60 0 102-42t42-102q0-60-42-102t-102-42q-60 0-102 42t-42 102q0 60 42 102t102 42Zm0-144Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 71f9e0d9d0b2d5..ff3b72158c4c61 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -8581,6 +8581,12 @@ noscript {
     color: $darker-text-color;
     margin-bottom: 15px;
     text-align: center;
+
+    .icon {
+      width: 20px;
+      height: 20px;
+      vertical-align: middle;
+    }
   }
 }
 

From e36e7ea2432104d2e72ab71f1aa5d2d4ca5ad3c8 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 20 Mar 2024 12:06:50 +0100
Subject: [PATCH 0528/2191] Fix emoji picker dropdown background and borders
 (#29653)

---
 app/javascript/styles/mastodon/components.scss   |  5 +++++
 app/javascript/styles/mastodon/emoji_picker.scss | 15 ---------------
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index ff3b72158c4c61..c2a968aec3209e 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -4848,6 +4848,11 @@ a.status-card {
   position: relative;
   margin-top: 5px;
   z-index: 2;
+  background: var(--dropdown-background-color);
+  backdrop-filter: var(--background-filter);
+  border: 1px solid var(--dropdown-border-color);
+  box-shadow: var(--dropdown-shadow);
+  border-radius: 5px;
 
   .emoji-mart-scroll {
     transition: opacity 200ms ease;
diff --git a/app/javascript/styles/mastodon/emoji_picker.scss b/app/javascript/styles/mastodon/emoji_picker.scss
index fec0c10ddb9db9..14ce6a14b533a9 100644
--- a/app/javascript/styles/mastodon/emoji_picker.scss
+++ b/app/javascript/styles/mastodon/emoji_picker.scss
@@ -14,21 +14,9 @@
 }
 
 .emoji-mart-bar {
-  border: 0 solid var(--dropdown-border-color);
-
   &:first-child {
-    border-bottom-width: 1px;
-    border-top-left-radius: 5px;
-    border-top-right-radius: 5px;
     background: var(--dropdown-border-color);
   }
-
-  &:last-child {
-    border-top-width: 1px;
-    border-bottom-left-radius: 5px;
-    border-bottom-right-radius: 5px;
-    display: none;
-  }
 }
 
 .emoji-mart-anchors {
@@ -94,7 +82,6 @@
   height: 270px;
   max-height: 35vh;
   padding: 0 6px 6px;
-  background: var(--dropdown-background-color);
   will-change: transform;
 
   &::-webkit-scrollbar-track:hover,
@@ -106,7 +93,6 @@
 .emoji-mart-search {
   padding: 10px;
   padding-inline-end: 45px;
-  background: var(--dropdown-background-color);
   position: relative;
 
   input {
@@ -195,7 +181,6 @@
     width: 100%;
     font-weight: 500;
     padding: 5px 6px;
-    background: var(--dropdown-background-color);
   }
 }
 

From 94f7ae192b8df4f0a8846249016268f914b730bb Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 20 Mar 2024 12:07:02 +0100
Subject: [PATCH 0529/2191] Fix emoji picker placement on limited-height
 viewports (#29651)

---
 .../compose/components/emoji_picker_dropdown.jsx         | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.jsx b/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.jsx
index acc3fd0ce51b3d..43795d030fac65 100644
--- a/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.jsx
+++ b/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.jsx
@@ -330,6 +330,7 @@ class EmojiPickerDropdown extends PureComponent {
   state = {
     active: false,
     loading: false,
+    placement: 'bottom',
   };
 
   setRef = (c) => {
@@ -381,10 +382,14 @@ class EmojiPickerDropdown extends PureComponent {
     return this.target;
   };
 
+  handleOverlayEnter = (state) => {
+    this.setState({ placement: state.placement });
+  };
+
   render () {
     const { intl, onPickEmoji, onSkinTone, skinTone, frequentlyUsedEmojis } = this.props;
     const title = intl.formatMessage(messages.emoji);
-    const { active, loading } = this.state;
+    const { active, loading, placement } = this.state;
 
     return (
       <div className='emoji-picker-dropdown' onKeyDown={this.handleKeyDown} ref={this.setTargetRef}>
@@ -397,7 +402,7 @@ class EmojiPickerDropdown extends PureComponent {
           inverted
         />
 
-        <Overlay show={active} placement={'bottom'} target={this.findTarget} popperConfig={{ strategy: 'fixed' }}>
+        <Overlay show={active} placement={placement} flip target={this.findTarget} popperConfig={{ strategy: 'fixed', onFirstUpdate: this.handleOverlayEnter }}>
           {({ props, placement })=> (
             <div {...props} style={{ ...props.style }}>
               <div className={`dropdown-animation ${placement}`}>

From a68dd889feac16cda51a82c3c5ba8a8c82c0a2c8 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 20 Mar 2024 12:07:10 +0100
Subject: [PATCH 0530/2191] Add back support for old browsers (#29654)

---
 .browserslistrc   |   4 +-
 package.json      |   1 +
 postcss.config.js |   1 +
 yarn.lock         | 855 +++++++++++++++++++++++++++++++++++++++++++++-
 4 files changed, 858 insertions(+), 3 deletions(-)

diff --git a/.browserslistrc b/.browserslistrc
index 54dd3aaf3482ec..0376af4bccd794 100644
--- a/.browserslistrc
+++ b/.browserslistrc
@@ -1,7 +1,9 @@
 [production]
 defaults
-not IE 11
+> 0.2%
+ios >= 15.6
 not dead
+not OperaMini all
 
 [development]
 supports es6-module
diff --git a/package.json b/package.json
index a42767580e1542..ed59a68a417b7c 100644
--- a/package.json
+++ b/package.json
@@ -88,6 +88,7 @@
     "path-complete-extname": "^1.0.0",
     "postcss": "^8.4.24",
     "postcss-loader": "^4.3.0",
+    "postcss-preset-env": "^9.5.2",
     "prop-types": "^15.8.1",
     "punycode": "^2.3.0",
     "react": "^18.2.0",
diff --git a/postcss.config.js b/postcss.config.js
index 5d58d74e34be87..b6ea8130b5d234 100644
--- a/postcss.config.js
+++ b/postcss.config.js
@@ -1,5 +1,6 @@
 module.exports = ({ env }) => ({
   plugins: [
+    'postcss-preset-env',
     'autoprefixer',
     env === 'production' ? 'cssnano' : '',
   ],
diff --git a/yarn.lock b/yarn.lock
index bb2722fba02da8..1e37fcc0295cd5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1538,6 +1538,46 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@csstools/cascade-layer-name-parser@npm:^1.0.9":
+  version: 1.0.9
+  resolution: "@csstools/cascade-layer-name-parser@npm:1.0.9"
+  peerDependencies:
+    "@csstools/css-parser-algorithms": ^2.6.1
+    "@csstools/css-tokenizer": ^2.2.4
+  checksum: 10c0/f6e28c7cdeca44711288400cf20de9ebc4db71eafa39ca9a6b3e9f5d3295ba636dd986aac9fcb9e6171c84d436712d68ced923504d78d5fda0601c880eb352fe
+  languageName: node
+  linkType: hard
+
+"@csstools/color-helpers@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "@csstools/color-helpers@npm:4.0.0"
+  checksum: 10c0/fc78871253f8c92789ed64a0e5555bd2873c2b62a49c30baced88487561fe09fe897b0d16fcf7bf2a94f78ff37530773a4395ce5efc016810c094041b5bbcd42
+  languageName: node
+  linkType: hard
+
+"@csstools/css-calc@npm:^1.2.0":
+  version: 1.2.0
+  resolution: "@csstools/css-calc@npm:1.2.0"
+  peerDependencies:
+    "@csstools/css-parser-algorithms": ^2.6.1
+    "@csstools/css-tokenizer": ^2.2.4
+  checksum: 10c0/ef12dc08ccdb9903e5cb24d81b469080b94c79123415f62f707196a85c53420b7729be608930314c7a9404f50c832fe5256f647c0567d1c825079cb77f6a8719
+  languageName: node
+  linkType: hard
+
+"@csstools/css-color-parser@npm:^1.6.2":
+  version: 1.6.2
+  resolution: "@csstools/css-color-parser@npm:1.6.2"
+  dependencies:
+    "@csstools/color-helpers": "npm:^4.0.0"
+    "@csstools/css-calc": "npm:^1.2.0"
+  peerDependencies:
+    "@csstools/css-parser-algorithms": ^2.6.1
+    "@csstools/css-tokenizer": ^2.2.4
+  checksum: 10c0/f587482fd7a40b6bd4cc790771245477d82203ba08f8f85981908680423476b9733c71fb4f1ba655f4dfb77907b4dfbb654dd7ba89e9edf0ba5229c26830ee8f
+  languageName: node
+  linkType: hard
+
 "@csstools/css-parser-algorithms@npm:^2.5.0":
   version: 2.5.0
   resolution: "@csstools/css-parser-algorithms@npm:2.5.0"
@@ -1547,6 +1587,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@csstools/css-parser-algorithms@npm:^2.6.1":
+  version: 2.6.1
+  resolution: "@csstools/css-parser-algorithms@npm:2.6.1"
+  peerDependencies:
+    "@csstools/css-tokenizer": ^2.2.4
+  checksum: 10c0/2c60377c4ffc96bbeb962cab19c09fccbcc834785928747219ed3bd916a34e52977393935d1d36501403f3f95ff59d358dd741d1dddcdaf9564ab36d73926aa6
+  languageName: node
+  linkType: hard
+
 "@csstools/css-tokenizer@npm:^2.2.3":
   version: 2.2.3
   resolution: "@csstools/css-tokenizer@npm:2.2.3"
@@ -1554,6 +1603,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@csstools/css-tokenizer@npm:^2.2.4":
+  version: 2.2.4
+  resolution: "@csstools/css-tokenizer@npm:2.2.4"
+  checksum: 10c0/23997db5874514f4b951ebd215e1e6cc8baf03adf9a35fc6fd028b84cb52aa2dc053860722108c09859a9b37b455f62b84181fe15539cd37797ea699b9ff85f0
+  languageName: node
+  linkType: hard
+
 "@csstools/media-query-list-parser@npm:^2.1.7":
   version: 2.1.7
   resolution: "@csstools/media-query-list-parser@npm:2.1.7"
@@ -1564,6 +1620,382 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@csstools/media-query-list-parser@npm:^2.1.9":
+  version: 2.1.9
+  resolution: "@csstools/media-query-list-parser@npm:2.1.9"
+  peerDependencies:
+    "@csstools/css-parser-algorithms": ^2.6.1
+    "@csstools/css-tokenizer": ^2.2.4
+  checksum: 10c0/602e9b5631928c078e670018df20b959bfb8e42ea11024d5218f1604e5ef94e070a74934a919ccbff3713e506d99096057947fa0c2e4768939f7b22479553534
+  languageName: node
+  linkType: hard
+
+"@csstools/postcss-cascade-layers@npm:^4.0.3":
+  version: 4.0.3
+  resolution: "@csstools/postcss-cascade-layers@npm:4.0.3"
+  dependencies:
+    "@csstools/selector-specificity": "npm:^3.0.2"
+    postcss-selector-parser: "npm:^6.0.13"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/63f29af21eed000130f6f1268c00188a52eafbdeccc6acf5aa46507e499259631aa89f928b01b4698c41f3f68703db4c6e363c0e6f64b04b20c7e6452a5b259a
+  languageName: node
+  linkType: hard
+
+"@csstools/postcss-color-function@npm:^3.0.12":
+  version: 3.0.12
+  resolution: "@csstools/postcss-color-function@npm:3.0.12"
+  dependencies:
+    "@csstools/css-color-parser": "npm:^1.6.2"
+    "@csstools/css-parser-algorithms": "npm:^2.6.1"
+    "@csstools/css-tokenizer": "npm:^2.2.4"
+    "@csstools/postcss-progressive-custom-properties": "npm:^3.1.1"
+    "@csstools/utilities": "npm:^1.0.0"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/a270aef93e98efb2b184b84a5de8acc28b10aed229807d1e5b5cf43309b281782895322ec98c0c9486b306ec68915e06689d6959c13ea2ab37fbb773ecd02335
+  languageName: node
+  linkType: hard
+
+"@csstools/postcss-color-mix-function@npm:^2.0.12":
+  version: 2.0.12
+  resolution: "@csstools/postcss-color-mix-function@npm:2.0.12"
+  dependencies:
+    "@csstools/css-color-parser": "npm:^1.6.2"
+    "@csstools/css-parser-algorithms": "npm:^2.6.1"
+    "@csstools/css-tokenizer": "npm:^2.2.4"
+    "@csstools/postcss-progressive-custom-properties": "npm:^3.1.1"
+    "@csstools/utilities": "npm:^1.0.0"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/42c7d48eeb1c1e49265505b560b9e034861254c62c5f78d89538255decab67d70f89bf81b269b208aa2103e9f48a51a33bb009eb17774f07c0459929d97f7056
+  languageName: node
+  linkType: hard
+
+"@csstools/postcss-exponential-functions@npm:^1.0.5":
+  version: 1.0.5
+  resolution: "@csstools/postcss-exponential-functions@npm:1.0.5"
+  dependencies:
+    "@csstools/css-calc": "npm:^1.2.0"
+    "@csstools/css-parser-algorithms": "npm:^2.6.1"
+    "@csstools/css-tokenizer": "npm:^2.2.4"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/45e18ca9025597da29cbef214cef39fcabef1e169bbb1f5c015de5f677e2927a1c3b8ae18558d815701e8d3e64db1043412a222af35036c92c25011a0e1e027d
+  languageName: node
+  linkType: hard
+
+"@csstools/postcss-font-format-keywords@npm:^3.0.2":
+  version: 3.0.2
+  resolution: "@csstools/postcss-font-format-keywords@npm:3.0.2"
+  dependencies:
+    "@csstools/utilities": "npm:^1.0.0"
+    postcss-value-parser: "npm:^4.2.0"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/1b9bf031ce1a00fef1fae0b1ad614eddc6bb4c036ecad47e065c99063ba3d2f6ab8e47f9db02a6fbe8b75b0e02a075a7a80480d4296918970ba9e8d36f07a523
+  languageName: node
+  linkType: hard
+
+"@csstools/postcss-gamut-mapping@npm:^1.0.5":
+  version: 1.0.5
+  resolution: "@csstools/postcss-gamut-mapping@npm:1.0.5"
+  dependencies:
+    "@csstools/css-color-parser": "npm:^1.6.2"
+    "@csstools/css-parser-algorithms": "npm:^2.6.1"
+    "@csstools/css-tokenizer": "npm:^2.2.4"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/33e2185ae8f8a229476bd5a60c0523aef8cb4de552a6c532514b9d87bff579f36fb7640dd14c9ea56906996d43f4d5ab969a4f704e1b8a94f7802beb3df31d08
+  languageName: node
+  linkType: hard
+
+"@csstools/postcss-gradients-interpolation-method@npm:^4.0.13":
+  version: 4.0.13
+  resolution: "@csstools/postcss-gradients-interpolation-method@npm:4.0.13"
+  dependencies:
+    "@csstools/css-color-parser": "npm:^1.6.2"
+    "@csstools/css-parser-algorithms": "npm:^2.6.1"
+    "@csstools/css-tokenizer": "npm:^2.2.4"
+    "@csstools/postcss-progressive-custom-properties": "npm:^3.1.1"
+    "@csstools/utilities": "npm:^1.0.0"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/af7c2d9c8e2249ea4cc50c9ef1b5ad75b1ed062020f1a8906ba9baf3143c4e2638b8b2189d7552838558e7b9a8a1ee9aa0baa076f5deabb23c1dc90fd78d7eab
+  languageName: node
+  linkType: hard
+
+"@csstools/postcss-hwb-function@npm:^3.0.11":
+  version: 3.0.11
+  resolution: "@csstools/postcss-hwb-function@npm:3.0.11"
+  dependencies:
+    "@csstools/css-color-parser": "npm:^1.6.2"
+    "@csstools/css-parser-algorithms": "npm:^2.6.1"
+    "@csstools/css-tokenizer": "npm:^2.2.4"
+    "@csstools/postcss-progressive-custom-properties": "npm:^3.1.1"
+    "@csstools/utilities": "npm:^1.0.0"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/d779617ef97ff22a125fbdd65f01dd3dd5bc607dbe7f3b02ae808d2fcccb1d5022b7f8e66e64283f7f9c52b6997bf0dc649566c734f0e3e4f3ba3c66a3b564a8
+  languageName: node
+  linkType: hard
+
+"@csstools/postcss-ic-unit@npm:^3.0.5":
+  version: 3.0.5
+  resolution: "@csstools/postcss-ic-unit@npm:3.0.5"
+  dependencies:
+    "@csstools/postcss-progressive-custom-properties": "npm:^3.1.1"
+    "@csstools/utilities": "npm:^1.0.0"
+    postcss-value-parser: "npm:^4.2.0"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/bf21b74e1bdff425481724a36385f1ebe7c8aea6cccfcf6715cad58449d2d19419342e94d33d6626ec09bed8d4ab6e391b8eebaa3bda721e7f41e5c64c485f2a
+  languageName: node
+  linkType: hard
+
+"@csstools/postcss-initial@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "@csstools/postcss-initial@npm:1.0.1"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/5d21c7c611d90a4b6758ba5be5e38d8d9eea9499c62797c4f5e01fbc9ccc2c68daf1c201850efe70ffa4ff9e979e7dea80b854b8793768550879562881aa6f9f
+  languageName: node
+  linkType: hard
+
+"@csstools/postcss-is-pseudo-class@npm:^4.0.5":
+  version: 4.0.5
+  resolution: "@csstools/postcss-is-pseudo-class@npm:4.0.5"
+  dependencies:
+    "@csstools/selector-specificity": "npm:^3.0.2"
+    postcss-selector-parser: "npm:^6.0.13"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/5f35d5474957be30f54b89cf46b818390754af8094c4d9a083a79d579ccd817452bb7e2cfef8951c664d4c6ba381d8d45cd89f49339a42941f947ccb032f9d45
+  languageName: node
+  linkType: hard
+
+"@csstools/postcss-light-dark-function@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "@csstools/postcss-light-dark-function@npm:1.0.1"
+  dependencies:
+    "@csstools/css-parser-algorithms": "npm:^2.6.1"
+    "@csstools/css-tokenizer": "npm:^2.2.4"
+    "@csstools/postcss-progressive-custom-properties": "npm:^3.1.1"
+    "@csstools/utilities": "npm:^1.0.0"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/538e809b473b91245cb79418949c4a27c0e82b0ea357f9c93b054e07d3194857e53979693226be9448904a7d9d4ad4732ad34183db82927bb172fe6cab1e53a8
+  languageName: node
+  linkType: hard
+
+"@csstools/postcss-logical-float-and-clear@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "@csstools/postcss-logical-float-and-clear@npm:2.0.1"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/92d9184bf8a159753a5872463dcfde580abd9b935e2a59f7ebe601cd14d9871f2f9f4dc18d8bbe251e7d8a3e446e302d9d99bf408d9cabbd9a6323825f5e833d
+  languageName: node
+  linkType: hard
+
+"@csstools/postcss-logical-overflow@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "@csstools/postcss-logical-overflow@npm:1.0.1"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/a8f5b1fdaf4ce7b1665407dac2f2e0c0ea11195e6873cfc714d9cd206489170fd91fc172b337330baf60191206f60579e235264f0dc7fee750ccd27ffe02c163
+  languageName: node
+  linkType: hard
+
+"@csstools/postcss-logical-overscroll-behavior@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "@csstools/postcss-logical-overscroll-behavior@npm:1.0.1"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/9485502bd9235276525351818d6cc11544ac1b270bb4f527f3fac32fe98ac66269366c34cdb8f61920b10ff9aac5824935004a5927490a5febca77eb41226604
+  languageName: node
+  linkType: hard
+
+"@csstools/postcss-logical-resize@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "@csstools/postcss-logical-resize@npm:2.0.1"
+  dependencies:
+    postcss-value-parser: "npm:^4.2.0"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/18f7e19ea465a15b334d8231b9ed98b630c74a6c2a6c52884437b852065f7b55bb1282cdbbdc1136aade479e996605b01799ab0ab771e2c47fd78d966ed33162
+  languageName: node
+  linkType: hard
+
+"@csstools/postcss-logical-viewport-units@npm:^2.0.7":
+  version: 2.0.7
+  resolution: "@csstools/postcss-logical-viewport-units@npm:2.0.7"
+  dependencies:
+    "@csstools/css-tokenizer": "npm:^2.2.4"
+    "@csstools/utilities": "npm:^1.0.0"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/9493f5395ccfe88d0d0740e54f77f0c844afc79b164068fdd907aed75004b4252ba9423dea22194ad98114dd1a2e77c14e307604305d926425251d4ab3013949
+  languageName: node
+  linkType: hard
+
+"@csstools/postcss-media-minmax@npm:^1.1.4":
+  version: 1.1.4
+  resolution: "@csstools/postcss-media-minmax@npm:1.1.4"
+  dependencies:
+    "@csstools/css-calc": "npm:^1.2.0"
+    "@csstools/css-parser-algorithms": "npm:^2.6.1"
+    "@csstools/css-tokenizer": "npm:^2.2.4"
+    "@csstools/media-query-list-parser": "npm:^2.1.9"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/620bb85065195c72cf9c0abe9af822f9feeaf919b53bfd47ec09f75b644cb544bd967b09278c48f829348808b34c552718c1aa3eb5342e2dec983e22eb63b0a0
+  languageName: node
+  linkType: hard
+
+"@csstools/postcss-media-queries-aspect-ratio-number-values@npm:^2.0.7":
+  version: 2.0.7
+  resolution: "@csstools/postcss-media-queries-aspect-ratio-number-values@npm:2.0.7"
+  dependencies:
+    "@csstools/css-parser-algorithms": "npm:^2.6.1"
+    "@csstools/css-tokenizer": "npm:^2.2.4"
+    "@csstools/media-query-list-parser": "npm:^2.1.9"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/d5d52a744f9a9466d86a506aab430811778dfa681d3f52f5486ee9b686390919eaae9ad356b84bc782d263227f35913ef68d9a6c3eefcfc38d8ffaccc9b94de0
+  languageName: node
+  linkType: hard
+
+"@csstools/postcss-nested-calc@npm:^3.0.2":
+  version: 3.0.2
+  resolution: "@csstools/postcss-nested-calc@npm:3.0.2"
+  dependencies:
+    "@csstools/utilities": "npm:^1.0.0"
+    postcss-value-parser: "npm:^4.2.0"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/3e24cf641170f9090f0dce088f6dae09ed9a0f38af1bdaa369ecc791a94cce54d7a02a0634f661a97fae24e04f1601c21d753593de018c80ad4236d36144b975
+  languageName: node
+  linkType: hard
+
+"@csstools/postcss-normalize-display-values@npm:^3.0.2":
+  version: 3.0.2
+  resolution: "@csstools/postcss-normalize-display-values@npm:3.0.2"
+  dependencies:
+    postcss-value-parser: "npm:^4.2.0"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/a20e2f4c213a5ec6e004c2ba76b543d3288a39aae21b3198b06a57df0d2c7916111d2cd70dcb0e8c6ca1cf1b01751e88fd2fe9abbc070e1efab1a4e54dcdbbbe
+  languageName: node
+  linkType: hard
+
+"@csstools/postcss-oklab-function@npm:^3.0.12":
+  version: 3.0.12
+  resolution: "@csstools/postcss-oklab-function@npm:3.0.12"
+  dependencies:
+    "@csstools/css-color-parser": "npm:^1.6.2"
+    "@csstools/css-parser-algorithms": "npm:^2.6.1"
+    "@csstools/css-tokenizer": "npm:^2.2.4"
+    "@csstools/postcss-progressive-custom-properties": "npm:^3.1.1"
+    "@csstools/utilities": "npm:^1.0.0"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/1454f57c756bdc882a523b50634823a0c31d7adc35330e13c80f9573c287f2a4ab30bbce48e0e8788dfe5a293d55113db2205373523b202a8828b9088e55e51c
+  languageName: node
+  linkType: hard
+
+"@csstools/postcss-progressive-custom-properties@npm:^3.1.1":
+  version: 3.1.1
+  resolution: "@csstools/postcss-progressive-custom-properties@npm:3.1.1"
+  dependencies:
+    postcss-value-parser: "npm:^4.2.0"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/9303296c8285a8154d2ee22d5a1330c94c5f361d277a1fd27172e868e3511619a6876538beacae0c9e925a9d1e81a32438d405526170faa84cad0c2d2159fdd2
+  languageName: node
+  linkType: hard
+
+"@csstools/postcss-relative-color-syntax@npm:^2.0.12":
+  version: 2.0.12
+  resolution: "@csstools/postcss-relative-color-syntax@npm:2.0.12"
+  dependencies:
+    "@csstools/css-color-parser": "npm:^1.6.2"
+    "@csstools/css-parser-algorithms": "npm:^2.6.1"
+    "@csstools/css-tokenizer": "npm:^2.2.4"
+    "@csstools/postcss-progressive-custom-properties": "npm:^3.1.1"
+    "@csstools/utilities": "npm:^1.0.0"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/e12a59b89372fbc5cc460cfeceeea2ddc8b7a8f5639a767dbd6c7ff799bf740ac5dd7ae6797703f74efeadd696801042bff8770117cf5ed70646dcc598637334
+  languageName: node
+  linkType: hard
+
+"@csstools/postcss-scope-pseudo-class@npm:^3.0.1":
+  version: 3.0.1
+  resolution: "@csstools/postcss-scope-pseudo-class@npm:3.0.1"
+  dependencies:
+    postcss-selector-parser: "npm:^6.0.13"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/489c5469951277b810754ba02e9f6c42196e03f2203b908181a81747bf1dcaa7b194c8c0f5c7dcb6b7276d08f2573a71bd7df4f2251c034ef1b92968c7070285
+  languageName: node
+  linkType: hard
+
+"@csstools/postcss-stepped-value-functions@npm:^3.0.6":
+  version: 3.0.6
+  resolution: "@csstools/postcss-stepped-value-functions@npm:3.0.6"
+  dependencies:
+    "@csstools/css-calc": "npm:^1.2.0"
+    "@csstools/css-parser-algorithms": "npm:^2.6.1"
+    "@csstools/css-tokenizer": "npm:^2.2.4"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/a198aedc4fffe88909c92bfaa36031e6803e739a2578ba4a81c01b9f1525e6a6876d6ffacbbe21701298598dcade8b2ac8423d8ab0fc5d9f4ba86ed60f53cbca
+  languageName: node
+  linkType: hard
+
+"@csstools/postcss-text-decoration-shorthand@npm:^3.0.4":
+  version: 3.0.4
+  resolution: "@csstools/postcss-text-decoration-shorthand@npm:3.0.4"
+  dependencies:
+    "@csstools/color-helpers": "npm:^4.0.0"
+    postcss-value-parser: "npm:^4.2.0"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/2e17535bbeed8ca5f095e6aecfb552004c1920597f16146fe6ec773b46af95f9e0e3cf77181d4216a23528de8e042bd85f82df1562447f52e7687ed8628f0adc
+  languageName: node
+  linkType: hard
+
+"@csstools/postcss-trigonometric-functions@npm:^3.0.6":
+  version: 3.0.6
+  resolution: "@csstools/postcss-trigonometric-functions@npm:3.0.6"
+  dependencies:
+    "@csstools/css-calc": "npm:^1.2.0"
+    "@csstools/css-parser-algorithms": "npm:^2.6.1"
+    "@csstools/css-tokenizer": "npm:^2.2.4"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/4b484af853d9eb59a4a4b1c063fcf48e2658bb2d6930dfab1d79e676986534687e6440b8cdcd2731ddcb7726537f4ed484208a2b80ef2c9359053762ba35e5e7
+  languageName: node
+  linkType: hard
+
+"@csstools/postcss-unset-value@npm:^3.0.1":
+  version: 3.0.1
+  resolution: "@csstools/postcss-unset-value@npm:3.0.1"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/5032c3125eada0a3a77d0867644cf994e28b789aaa40e990e7eebcdf5a9ed9f36b30e0904827044cea39849c9a9a19c90e82d3ca655550d82a7530872b3b6ff8
+  languageName: node
+  linkType: hard
+
+"@csstools/selector-resolve-nested@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "@csstools/selector-resolve-nested@npm:1.1.0"
+  peerDependencies:
+    postcss-selector-parser: ^6.0.13
+  checksum: 10c0/3a53b14e048d48b8900c1cf30442ab5eec1a1087c74ce41459c4dcd42ad7d363c9327890ba7aed25288d09c206d9565178bae126b25cdc3e1170a1d55e763c77
+  languageName: node
+  linkType: hard
+
 "@csstools/selector-specificity@npm:^3.0.1":
   version: 3.0.1
   resolution: "@csstools/selector-specificity@npm:3.0.1"
@@ -1573,6 +2005,24 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@csstools/selector-specificity@npm:^3.0.2":
+  version: 3.0.2
+  resolution: "@csstools/selector-specificity@npm:3.0.2"
+  peerDependencies:
+    postcss-selector-parser: ^6.0.13
+  checksum: 10c0/d0c7dae2f1e9536e3e17f00467320a704f3208c76283c29c57fd69d4b83dcf6d062f492ed687c5ffd5f47fada9f0657c2efc89ea18fd4b038f757669553e0095
+  languageName: node
+  linkType: hard
+
+"@csstools/utilities@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "@csstools/utilities@npm:1.0.0"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/2ac10895e0a1f9e1fc9c092197c8595a09f632552791af91219f38c55bb39083fb44b74a6a7de9112492cf24a2fe66d20c955a2b4aff041d5c017d87bbebc0f2
+  languageName: node
+  linkType: hard
+
 "@discoveryjs/json-ext@npm:0.5.7":
   version: 0.5.7
   resolution: "@discoveryjs/json-ext@npm:0.5.7"
@@ -2388,6 +2838,7 @@ __metadata:
     path-complete-extname: "npm:^1.0.0"
     postcss: "npm:^8.4.24"
     postcss-loader: "npm:^4.3.0"
+    postcss-preset-env: "npm:^9.5.2"
     prettier: "npm:^3.0.0"
     prop-types: "npm:^15.8.1"
     punycode: "npm:^2.3.0"
@@ -4622,7 +5073,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"autoprefixer@npm:^10.4.14":
+"autoprefixer@npm:^10.4.14, autoprefixer@npm:^10.4.18":
   version: 10.4.18
   resolution: "autoprefixer@npm:10.4.18"
   dependencies:
@@ -5160,7 +5611,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"browserslist@npm:^4.0.0, browserslist@npm:^4.22.2, browserslist@npm:^4.23.0":
+"browserslist@npm:^4.0.0, browserslist@npm:^4.22.2, browserslist@npm:^4.22.3, browserslist@npm:^4.23.0":
   version: 4.23.0
   resolution: "browserslist@npm:4.23.0"
   dependencies:
@@ -6069,6 +6520,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"css-blank-pseudo@npm:^6.0.1":
+  version: 6.0.1
+  resolution: "css-blank-pseudo@npm:6.0.1"
+  dependencies:
+    postcss-selector-parser: "npm:^6.0.13"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/04f2dc1c39a429cb4958b60a9d00b03e29a78e3e55fe111b3a0660b7c6c478455d5907eda7c7a495cf72dbe83ae3c80b409e0468ca1ba5ccef992e69a8f49df8
+  languageName: node
+  linkType: hard
+
 "css-declaration-sorter@npm:^7.1.1":
   version: 7.1.1
   resolution: "css-declaration-sorter@npm:7.1.1"
@@ -6085,6 +6547,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"css-has-pseudo@npm:^6.0.2":
+  version: 6.0.2
+  resolution: "css-has-pseudo@npm:6.0.2"
+  dependencies:
+    "@csstools/selector-specificity": "npm:^3.0.2"
+    postcss-selector-parser: "npm:^6.0.13"
+    postcss-value-parser: "npm:^4.2.0"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/96f9a6a4f31e11797e583d458535e11fa513b3f1f430ab566964a2f0792eaaa543213598b0a509516f07464234348ab11d56448b6d0c0c8a36988e0c86cf4ca1
+  languageName: node
+  linkType: hard
+
 "css-loader@npm:^5.2.7":
   version: 5.2.7
   resolution: "css-loader@npm:5.2.7"
@@ -6105,6 +6580,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"css-prefers-color-scheme@npm:^9.0.1":
+  version: 9.0.1
+  resolution: "css-prefers-color-scheme@npm:9.0.1"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/b94da00d84c4ebb56eb8fce96d4fdb20d2e622a7cd8cd6d7b87d1d2b718a55ce88bccc9d871771bfe77c5107de06132ba87190e3656f049e45f19f652d50136c
+  languageName: node
+  linkType: hard
+
 "css-select-base-adapter@npm:^0.1.1":
   version: 0.1.1
   resolution: "css-select-base-adapter@npm:0.1.1"
@@ -6198,6 +6682,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"cssdb@npm:^7.11.1":
+  version: 7.11.2
+  resolution: "cssdb@npm:7.11.2"
+  checksum: 10c0/5cd8dfee703dfbd7b7a8c3a93d65d26007ec1cd9692379b5868a0ceedf23b88e28d4b98f1cb9a4161f8b01e4a229e08ba9603fb94b756a3df6e07c423fff5b5d
+  languageName: node
+  linkType: hard
+
 "cssesc@npm:^3.0.0":
   version: 3.0.0
   resolution: "cssesc@npm:3.0.0"
@@ -12628,6 +13119,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"postcss-attribute-case-insensitive@npm:^6.0.3":
+  version: 6.0.3
+  resolution: "postcss-attribute-case-insensitive@npm:6.0.3"
+  dependencies:
+    postcss-selector-parser: "npm:^6.0.13"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/6161a625356db17ea23daa50797e23fa830a15629fa45e7438b5ac72a389f81ba51088503c5893a941d34d287857882867199584c5f03bf7762258c74570f456
+  languageName: node
+  linkType: hard
+
 "postcss-calc@npm:^9.0.1":
   version: 9.0.1
   resolution: "postcss-calc@npm:9.0.1"
@@ -12640,6 +13142,56 @@ __metadata:
   languageName: node
   linkType: hard
 
+"postcss-clamp@npm:^4.1.0":
+  version: 4.1.0
+  resolution: "postcss-clamp@npm:4.1.0"
+  dependencies:
+    postcss-value-parser: "npm:^4.2.0"
+  peerDependencies:
+    postcss: ^8.4.6
+  checksum: 10c0/701261026b38a4c27b3c3711635fac96005f36d3270adb76dbdb1eebc950fc841db45283ee66068a7121565592e9d7967d5534e15b6e4dd266afcabf9eafa905
+  languageName: node
+  linkType: hard
+
+"postcss-color-functional-notation@npm:^6.0.7":
+  version: 6.0.7
+  resolution: "postcss-color-functional-notation@npm:6.0.7"
+  dependencies:
+    "@csstools/css-color-parser": "npm:^1.6.2"
+    "@csstools/css-parser-algorithms": "npm:^2.6.1"
+    "@csstools/css-tokenizer": "npm:^2.2.4"
+    "@csstools/postcss-progressive-custom-properties": "npm:^3.1.1"
+    "@csstools/utilities": "npm:^1.0.0"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/bd3c1831e885f395205d503bf4b24f462dc9f4af74be11c5b0ad7b09eb150b2d3f8b2c727ab9e67c474ff05baa8e8e3c950880ffe2085ed39794d308c0297667
+  languageName: node
+  linkType: hard
+
+"postcss-color-hex-alpha@npm:^9.0.4":
+  version: 9.0.4
+  resolution: "postcss-color-hex-alpha@npm:9.0.4"
+  dependencies:
+    "@csstools/utilities": "npm:^1.0.0"
+    postcss-value-parser: "npm:^4.2.0"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/57b5cfe17e0b659d5444f267c485462b8b25f6ab087b810c7dd44662af4828e1e8f9c4a9169b8635a4755509ca7c0f3463c2e96444764c4e6ff9f4036aad05e5
+  languageName: node
+  linkType: hard
+
+"postcss-color-rebeccapurple@npm:^9.0.3":
+  version: 9.0.3
+  resolution: "postcss-color-rebeccapurple@npm:9.0.3"
+  dependencies:
+    "@csstools/utilities": "npm:^1.0.0"
+    postcss-value-parser: "npm:^4.2.0"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/ab36d29df23dd475a2a540101427640ef9c7936bbf941816e8582caea05feced26c65f795a849e2ad17469cee6682d1bbccd2f8ab0da07fe91efcc0649568038
+  languageName: node
+  linkType: hard
+
 "postcss-colormin@npm:^6.1.0":
   version: 6.1.0
   resolution: "postcss-colormin@npm:6.1.0"
@@ -12666,6 +13218,60 @@ __metadata:
   languageName: node
   linkType: hard
 
+"postcss-custom-media@npm:^10.0.4":
+  version: 10.0.4
+  resolution: "postcss-custom-media@npm:10.0.4"
+  dependencies:
+    "@csstools/cascade-layer-name-parser": "npm:^1.0.9"
+    "@csstools/css-parser-algorithms": "npm:^2.6.1"
+    "@csstools/css-tokenizer": "npm:^2.2.4"
+    "@csstools/media-query-list-parser": "npm:^2.1.9"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/2384a40f0e38abe92fbfc707000b264e4bdfe65bd0086ab18c6aab71049198f9dd1431bc4f9bbf68f7cca86b4ff0da352bac4a6ecd04e3671b7ddf6ed6ec3d04
+  languageName: node
+  linkType: hard
+
+"postcss-custom-properties@npm:^13.3.6":
+  version: 13.3.6
+  resolution: "postcss-custom-properties@npm:13.3.6"
+  dependencies:
+    "@csstools/cascade-layer-name-parser": "npm:^1.0.9"
+    "@csstools/css-parser-algorithms": "npm:^2.6.1"
+    "@csstools/css-tokenizer": "npm:^2.2.4"
+    "@csstools/utilities": "npm:^1.0.0"
+    postcss-value-parser: "npm:^4.2.0"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/faa3b692966314a6dfcba93e74d91f20f2484ea328f88c809b1d0daa8ecc0d8d5125e06d1d7c18b5455ac30cb3501c7069b6e56e5efac61523a6ed75c3d73a30
+  languageName: node
+  linkType: hard
+
+"postcss-custom-selectors@npm:^7.1.8":
+  version: 7.1.8
+  resolution: "postcss-custom-selectors@npm:7.1.8"
+  dependencies:
+    "@csstools/cascade-layer-name-parser": "npm:^1.0.9"
+    "@csstools/css-parser-algorithms": "npm:^2.6.1"
+    "@csstools/css-tokenizer": "npm:^2.2.4"
+    postcss-selector-parser: "npm:^6.0.13"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/6a7d8248342177a222821531ea3b4008764362e4f7e8f7f2d5767e5880c37ffa39ac5adced2c686baeb9c1f4ed4c283fcc8a8d30ef3b4fc5f63d4ef9a691285e
+  languageName: node
+  linkType: hard
+
+"postcss-dir-pseudo-class@npm:^8.0.1":
+  version: 8.0.1
+  resolution: "postcss-dir-pseudo-class@npm:8.0.1"
+  dependencies:
+    postcss-selector-parser: "npm:^6.0.13"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/8c096e096b09e4041818bd2edf5581b5172375621f5eeca013633166ea100ab98e71bf60fccd92fa20cfa7b55c57598605a1655c6bcbe54a80728a7d4e36859e
+  languageName: node
+  linkType: hard
+
 "postcss-discard-comments@npm:^6.0.2":
   version: 6.0.2
   resolution: "postcss-discard-comments@npm:6.0.2"
@@ -12702,6 +13308,86 @@ __metadata:
   languageName: node
   linkType: hard
 
+"postcss-double-position-gradients@npm:^5.0.5":
+  version: 5.0.5
+  resolution: "postcss-double-position-gradients@npm:5.0.5"
+  dependencies:
+    "@csstools/postcss-progressive-custom-properties": "npm:^3.1.1"
+    "@csstools/utilities": "npm:^1.0.0"
+    postcss-value-parser: "npm:^4.2.0"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/02c22ca055ceca1ecc3c6888eab5c84769c9df37f59855f0ff9e9faaedcb4acf6818e927bff18bd57df161045f775ecca4142b13f968332419976c556a769995
+  languageName: node
+  linkType: hard
+
+"postcss-focus-visible@npm:^9.0.1":
+  version: 9.0.1
+  resolution: "postcss-focus-visible@npm:9.0.1"
+  dependencies:
+    postcss-selector-parser: "npm:^6.0.13"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/b8eb14ef51df62969559a7b2b4a4b6313a802fc2de225de293ad484ed6528833fc6bb7574aad5fabe7eeb27e8cd62663c2d547b25ff058d31c06d3d066abd904
+  languageName: node
+  linkType: hard
+
+"postcss-focus-within@npm:^8.0.1":
+  version: 8.0.1
+  resolution: "postcss-focus-within@npm:8.0.1"
+  dependencies:
+    postcss-selector-parser: "npm:^6.0.13"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/cb0380d89f3b9313345dbea65c78c7ad16a6e6ab2ba9e90451d5b14f05ee691a0cdf458376368061327182e031644da21eee7e6e9ae508d195f083e0a20c0502
+  languageName: node
+  linkType: hard
+
+"postcss-font-variant@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "postcss-font-variant@npm:5.0.0"
+  peerDependencies:
+    postcss: ^8.1.0
+  checksum: 10c0/ccc96460cf6a52b5439c26c9a5ea0589882e46161e3c2331d4353de7574448f5feef667d1a68f7f39b9fe3ee75d85957383ae82bbfcf87c3162c7345df4a444e
+  languageName: node
+  linkType: hard
+
+"postcss-gap-properties@npm:^5.0.1":
+  version: 5.0.1
+  resolution: "postcss-gap-properties@npm:5.0.1"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/3b28c38819add37a2fc7decd7e3bdda1cab1de861af228abfb3e4310d87786eff4572a693bec6cea1c435bcd3dd0bb58bc9a58f1dde3a1c7def9feaf800762b8
+  languageName: node
+  linkType: hard
+
+"postcss-image-set-function@npm:^6.0.3":
+  version: 6.0.3
+  resolution: "postcss-image-set-function@npm:6.0.3"
+  dependencies:
+    "@csstools/utilities": "npm:^1.0.0"
+    postcss-value-parser: "npm:^4.2.0"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/b35ce25aeca95f7abc5e5820f2398588150f5be02209054d714e870ae2fa01a8482fd10600fe1f847add898c39690275a60a5999f83f6bed6c66be9b0444b704
+  languageName: node
+  linkType: hard
+
+"postcss-lab-function@npm:^6.0.12":
+  version: 6.0.12
+  resolution: "postcss-lab-function@npm:6.0.12"
+  dependencies:
+    "@csstools/css-color-parser": "npm:^1.6.2"
+    "@csstools/css-parser-algorithms": "npm:^2.6.1"
+    "@csstools/css-tokenizer": "npm:^2.2.4"
+    "@csstools/postcss-progressive-custom-properties": "npm:^3.1.1"
+    "@csstools/utilities": "npm:^1.0.0"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/1c96c19d0487346445749777df2af7cc828f3e3c4e8a435cac250d03c14efb0d14ee994ac58d966ed07f8f07aa297f0e3311248b78ba1e816bb18386e435a83c
+  languageName: node
+  linkType: hard
+
 "postcss-loader@npm:^4.3.0":
   version: 4.3.0
   resolution: "postcss-loader@npm:4.3.0"
@@ -12718,6 +13404,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"postcss-logical@npm:^7.0.1":
+  version: 7.0.1
+  resolution: "postcss-logical@npm:7.0.1"
+  dependencies:
+    postcss-value-parser: "npm:^4.2.0"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/66a06b5d3cb31181dd76c80286addd219205066a4a8c216076869fc54769ee0011cdaa8063e1b2c19c114cdc5ad12a2e2e8b730f6971960dc77d55f25f290223
+  languageName: node
+  linkType: hard
+
 "postcss-media-query-parser@npm:^0.2.3":
   version: 0.2.3
   resolution: "postcss-media-query-parser@npm:0.2.3"
@@ -12843,6 +13540,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"postcss-nesting@npm:^12.1.0":
+  version: 12.1.0
+  resolution: "postcss-nesting@npm:12.1.0"
+  dependencies:
+    "@csstools/selector-resolve-nested": "npm:^1.1.0"
+    "@csstools/selector-specificity": "npm:^3.0.2"
+    postcss-selector-parser: "npm:^6.0.13"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/87902723214ec33a81520f51cce1e52f52c02272f2b7838d3aaa795e226104bf4809ef9dad8840f43852c1f229afb5f480ab1f20c7677bd021cf57739b625871
+  languageName: node
+  linkType: hard
+
 "postcss-normalize-charset@npm:^6.0.2":
   version: 6.0.2
   resolution: "postcss-normalize-charset@npm:6.0.2"
@@ -12941,6 +13651,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"postcss-opacity-percentage@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "postcss-opacity-percentage@npm:2.0.0"
+  peerDependencies:
+    postcss: ^8.2
+  checksum: 10c0/f031f3281060c4c0ede8f9a5832f65a3d8c2a1896ff324c41de42016e092635f0e0abee07545b01db93dc430a9741674a1d09c377c6c01cd8c2f4be65f889161
+  languageName: node
+  linkType: hard
+
 "postcss-ordered-values@npm:^6.0.2":
   version: 6.0.2
   resolution: "postcss-ordered-values@npm:6.0.2"
@@ -12953,6 +13672,118 @@ __metadata:
   languageName: node
   linkType: hard
 
+"postcss-overflow-shorthand@npm:^5.0.1":
+  version: 5.0.1
+  resolution: "postcss-overflow-shorthand@npm:5.0.1"
+  dependencies:
+    postcss-value-parser: "npm:^4.2.0"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/328407adffae084c096b3ea2c03037f0083a0000cae744872bb1168fdd317eef12bb049cdfef749343c3ed65b4275dc6eefe577d99cbc78e3617cb36d07e8717
+  languageName: node
+  linkType: hard
+
+"postcss-page-break@npm:^3.0.4":
+  version: 3.0.4
+  resolution: "postcss-page-break@npm:3.0.4"
+  peerDependencies:
+    postcss: ^8
+  checksum: 10c0/eaaf4d8922b35f2acd637eb059f7e2510b24d65eb8f31424799dd5a98447b6ef010b41880c26e78f818e00f842295638ec75f89d5d489067f53e3dd3db74a00f
+  languageName: node
+  linkType: hard
+
+"postcss-place@npm:^9.0.1":
+  version: 9.0.1
+  resolution: "postcss-place@npm:9.0.1"
+  dependencies:
+    postcss-value-parser: "npm:^4.2.0"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/d0fb5b0416fd15d5ac7da5fcc1829b9b78c5a90caba5bd045052c6ac0467910cbbeb2fff6c5257190affa656be27168c94ff339f86c0b7df54f9bea04bcadba7
+  languageName: node
+  linkType: hard
+
+"postcss-preset-env@npm:^9.5.2":
+  version: 9.5.2
+  resolution: "postcss-preset-env@npm:9.5.2"
+  dependencies:
+    "@csstools/postcss-cascade-layers": "npm:^4.0.3"
+    "@csstools/postcss-color-function": "npm:^3.0.12"
+    "@csstools/postcss-color-mix-function": "npm:^2.0.12"
+    "@csstools/postcss-exponential-functions": "npm:^1.0.5"
+    "@csstools/postcss-font-format-keywords": "npm:^3.0.2"
+    "@csstools/postcss-gamut-mapping": "npm:^1.0.5"
+    "@csstools/postcss-gradients-interpolation-method": "npm:^4.0.13"
+    "@csstools/postcss-hwb-function": "npm:^3.0.11"
+    "@csstools/postcss-ic-unit": "npm:^3.0.5"
+    "@csstools/postcss-initial": "npm:^1.0.1"
+    "@csstools/postcss-is-pseudo-class": "npm:^4.0.5"
+    "@csstools/postcss-light-dark-function": "npm:^1.0.1"
+    "@csstools/postcss-logical-float-and-clear": "npm:^2.0.1"
+    "@csstools/postcss-logical-overflow": "npm:^1.0.1"
+    "@csstools/postcss-logical-overscroll-behavior": "npm:^1.0.1"
+    "@csstools/postcss-logical-resize": "npm:^2.0.1"
+    "@csstools/postcss-logical-viewport-units": "npm:^2.0.7"
+    "@csstools/postcss-media-minmax": "npm:^1.1.4"
+    "@csstools/postcss-media-queries-aspect-ratio-number-values": "npm:^2.0.7"
+    "@csstools/postcss-nested-calc": "npm:^3.0.2"
+    "@csstools/postcss-normalize-display-values": "npm:^3.0.2"
+    "@csstools/postcss-oklab-function": "npm:^3.0.12"
+    "@csstools/postcss-progressive-custom-properties": "npm:^3.1.1"
+    "@csstools/postcss-relative-color-syntax": "npm:^2.0.12"
+    "@csstools/postcss-scope-pseudo-class": "npm:^3.0.1"
+    "@csstools/postcss-stepped-value-functions": "npm:^3.0.6"
+    "@csstools/postcss-text-decoration-shorthand": "npm:^3.0.4"
+    "@csstools/postcss-trigonometric-functions": "npm:^3.0.6"
+    "@csstools/postcss-unset-value": "npm:^3.0.1"
+    autoprefixer: "npm:^10.4.18"
+    browserslist: "npm:^4.22.3"
+    css-blank-pseudo: "npm:^6.0.1"
+    css-has-pseudo: "npm:^6.0.2"
+    css-prefers-color-scheme: "npm:^9.0.1"
+    cssdb: "npm:^7.11.1"
+    postcss-attribute-case-insensitive: "npm:^6.0.3"
+    postcss-clamp: "npm:^4.1.0"
+    postcss-color-functional-notation: "npm:^6.0.7"
+    postcss-color-hex-alpha: "npm:^9.0.4"
+    postcss-color-rebeccapurple: "npm:^9.0.3"
+    postcss-custom-media: "npm:^10.0.4"
+    postcss-custom-properties: "npm:^13.3.6"
+    postcss-custom-selectors: "npm:^7.1.8"
+    postcss-dir-pseudo-class: "npm:^8.0.1"
+    postcss-double-position-gradients: "npm:^5.0.5"
+    postcss-focus-visible: "npm:^9.0.1"
+    postcss-focus-within: "npm:^8.0.1"
+    postcss-font-variant: "npm:^5.0.0"
+    postcss-gap-properties: "npm:^5.0.1"
+    postcss-image-set-function: "npm:^6.0.3"
+    postcss-lab-function: "npm:^6.0.12"
+    postcss-logical: "npm:^7.0.1"
+    postcss-nesting: "npm:^12.1.0"
+    postcss-opacity-percentage: "npm:^2.0.0"
+    postcss-overflow-shorthand: "npm:^5.0.1"
+    postcss-page-break: "npm:^3.0.4"
+    postcss-place: "npm:^9.0.1"
+    postcss-pseudo-class-any-link: "npm:^9.0.1"
+    postcss-replace-overflow-wrap: "npm:^4.0.0"
+    postcss-selector-not: "npm:^7.0.2"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/40f94472f2d940cbf1df9974bea29a76ada4c1285b97e7104c0cdf001fcafd0a1f5966822250df0d659ec0ea51e577a1ab78c9f5f8a5683ea9897efe043515c1
+  languageName: node
+  linkType: hard
+
+"postcss-pseudo-class-any-link@npm:^9.0.1":
+  version: 9.0.1
+  resolution: "postcss-pseudo-class-any-link@npm:9.0.1"
+  dependencies:
+    postcss-selector-parser: "npm:^6.0.13"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/2d33f486af442a0ee095b7b8875701ed3f54ea3f80d2c4d1c1b35d105088b569c847e1c71fde2adf6cefb4920e8fb7d057ff1ad56e62c65892c7b68e26213b98
+  languageName: node
+  linkType: hard
+
 "postcss-reduce-initial@npm:^6.1.0":
   version: 6.1.0
   resolution: "postcss-reduce-initial@npm:6.1.0"
@@ -12976,6 +13807,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"postcss-replace-overflow-wrap@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "postcss-replace-overflow-wrap@npm:4.0.0"
+  peerDependencies:
+    postcss: ^8.0.3
+  checksum: 10c0/451361b714528cd3632951256ef073769cde725a46cda642a6864f666fb144921fa55e614aec1bcf5946f37d6ffdcca3b932b76f3d997c07b076e8db152b128d
+  languageName: node
+  linkType: hard
+
 "postcss-resolve-nested-selector@npm:^0.1.1":
   version: 0.1.1
   resolution: "postcss-resolve-nested-selector@npm:0.1.1"
@@ -13001,6 +13841,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"postcss-selector-not@npm:^7.0.2":
+  version: 7.0.2
+  resolution: "postcss-selector-not@npm:7.0.2"
+  dependencies:
+    postcss-selector-parser: "npm:^6.0.13"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/624b6e516d37d43406ff1414b3413fe7a5dc34eccadd6a6082fe7df13c5c2fab3e244af33ff0916f9be0a4f7db91d1c22102f5166d7a6e6595e7c00e11e20281
+  languageName: node
+  linkType: hard
+
 "postcss-selector-parser@npm:^6.0.11, postcss-selector-parser@npm:^6.0.13, postcss-selector-parser@npm:^6.0.15, postcss-selector-parser@npm:^6.0.2, postcss-selector-parser@npm:^6.0.4":
   version: 6.0.15
   resolution: "postcss-selector-parser@npm:6.0.15"

From 50fd94f481cf23a81662140afe99df2fbf1149be Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 20 Mar 2024 12:20:23 +0100
Subject: [PATCH 0531/2191] Fix blockquote color in reply indicator (#29659)

---
 app/javascript/styles/mastodon/rich_text.scss | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/app/javascript/styles/mastodon/rich_text.scss b/app/javascript/styles/mastodon/rich_text.scss
index c77c23bc4038f4..c57db26e036c32 100644
--- a/app/javascript/styles/mastodon/rich_text.scss
+++ b/app/javascript/styles/mastodon/rich_text.scss
@@ -1,5 +1,6 @@
 .status__content__text,
 .e-content,
+.edit-indicator__content,
 .reply-indicator__content {
   pre,
   blockquote {
@@ -55,10 +56,3 @@
     list-style-type: decimal;
   }
 }
-
-.reply-indicator__content {
-  blockquote {
-    border-left-color: $inverted-text-color;
-    color: $inverted-text-color;
-  }
-}

From 100cb466089688216975ae06dbdca63b83d04bac Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 20 Mar 2024 12:06:44 +0100
Subject: [PATCH 0532/2191] [Glitch] Fix icon and styling in browser
 notifications banner

Port a583317df62acced3cea1f102e5c7981ff1bdbea to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../notifications/components/column_settings.jsx   | 14 ++++++++------
 .../components/notifications_permission_banner.jsx |  4 ++--
 .../flavours/glitch/styles/components.scss         |  6 ++++++
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/app/javascript/flavours/glitch/features/notifications/components/column_settings.jsx b/app/javascript/flavours/glitch/features/notifications/components/column_settings.jsx
index 6b3df02e73f449..3f02df18818086 100644
--- a/app/javascript/flavours/glitch/features/notifications/components/column_settings.jsx
+++ b/app/javascript/flavours/glitch/features/notifications/components/column_settings.jsx
@@ -71,16 +71,18 @@ export default class ColumnSettings extends PureComponent {
           <span className='warning-hint'><FormattedMessage id='notifications.permission_denied' defaultMessage='Desktop notifications are unavailable due to previously denied browser permissions request' /></span>
         )}
 
-        {alertsEnabled && browserSupport && browserPermission === 'default' && (
-          <span className='warning-hint'>
-            <FormattedMessage id='notifications.permission_required' defaultMessage='Desktop notifications are unavailable because the required permission has not been granted.' /> <GrantPermissionButton onClick={onRequestNotificationPermission} />
-          </span>
-        )}
-
         <section>
           <ClearColumnButton onClick={onClear} />
         </section>
 
+        {alertsEnabled && browserSupport && browserPermission === 'default' && (
+          <section>
+            <span className='warning-hint'>
+              <FormattedMessage id='notifications.permission_required' defaultMessage='Desktop notifications are unavailable because the required permission has not been granted.' /> <GrantPermissionButton onClick={onRequestNotificationPermission} />
+            </span>
+          </section>
+        )}
+
         <section>
           <h3><FormattedMessage id='notifications.policy.title' defaultMessage='Filter out notifications from…' /></h3>
 
diff --git a/app/javascript/flavours/glitch/features/notifications/components/notifications_permission_banner.jsx b/app/javascript/flavours/glitch/features/notifications/components/notifications_permission_banner.jsx
index ba031332f96d8e..7d1367a62384b4 100644
--- a/app/javascript/flavours/glitch/features/notifications/components/notifications_permission_banner.jsx
+++ b/app/javascript/flavours/glitch/features/notifications/components/notifications_permission_banner.jsx
@@ -5,8 +5,8 @@ import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
 
 import { connect } from 'react-redux';
 
+import SettingsIcon from '@/material-icons/400-20px/settings.svg?react';
 import CloseIcon from '@/material-icons/400-24px/close.svg?react';
-import TuneIcon from '@/material-icons/400-24px/tune.svg?react';
 import { requestBrowserPermission } from 'flavours/glitch/actions/notifications';
 import { changeSetting } from 'flavours/glitch/actions/settings';
 import { Button } from 'flavours/glitch/components/button';
@@ -42,7 +42,7 @@ class NotificationsPermissionBanner extends PureComponent {
         </div>
 
         <h2><FormattedMessage id='notifications_permission_banner.title' defaultMessage='Never miss a thing' /></h2>
-        <p><FormattedMessage id='notifications_permission_banner.how_to_control' defaultMessage="To receive notifications when Mastodon isn't open, enable desktop notifications. You can control precisely which types of interactions generate desktop notifications through the {icon} button above once they're enabled." values={{ icon: <Icon id='sliders' icon={TuneIcon} /> }} /></p>
+        <p><FormattedMessage id='notifications_permission_banner.how_to_control' defaultMessage="To receive notifications when Mastodon isn't open, enable desktop notifications. You can control precisely which types of interactions generate desktop notifications through the {icon} button above once they're enabled." values={{ icon: <Icon id='sliders' icon={SettingsIcon} /> }} /></p>
         <Button onClick={this.handleClick}><FormattedMessage id='notifications_permission_banner.enable' defaultMessage='Enable desktop notifications' /></Button>
       </div>
     );
diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index fba040a1c61f4b..47756b50ee3f0e 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -9169,6 +9169,12 @@ noscript {
     color: $darker-text-color;
     margin-bottom: 15px;
     text-align: center;
+
+    .icon {
+      width: 20px;
+      height: 20px;
+      vertical-align: middle;
+    }
   }
 }
 

From 72baa1e5c36fae6f7317601ea33065362238402b Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 20 Mar 2024 12:06:50 +0100
Subject: [PATCH 0533/2191] [Glitch] Fix emoji picker dropdown background and
 borders

Port e36e7ea2432104d2e72ab71f1aa5d2d4ca5ad3c8 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/styles/components.scss        |  5 +++++
 .../flavours/glitch/styles/emoji_picker.scss      | 15 ---------------
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index 47756b50ee3f0e..42a262c9fcc3b4 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -5234,6 +5234,11 @@ a.status-card {
   position: relative;
   margin-top: 5px;
   z-index: 2;
+  background: var(--dropdown-background-color);
+  backdrop-filter: var(--background-filter);
+  border: 1px solid var(--dropdown-border-color);
+  box-shadow: var(--dropdown-shadow);
+  border-radius: 5px;
 
   .emoji-mart-scroll {
     transition: opacity 200ms ease;
diff --git a/app/javascript/flavours/glitch/styles/emoji_picker.scss b/app/javascript/flavours/glitch/styles/emoji_picker.scss
index fec0c10ddb9db9..14ce6a14b533a9 100644
--- a/app/javascript/flavours/glitch/styles/emoji_picker.scss
+++ b/app/javascript/flavours/glitch/styles/emoji_picker.scss
@@ -14,21 +14,9 @@
 }
 
 .emoji-mart-bar {
-  border: 0 solid var(--dropdown-border-color);
-
   &:first-child {
-    border-bottom-width: 1px;
-    border-top-left-radius: 5px;
-    border-top-right-radius: 5px;
     background: var(--dropdown-border-color);
   }
-
-  &:last-child {
-    border-top-width: 1px;
-    border-bottom-left-radius: 5px;
-    border-bottom-right-radius: 5px;
-    display: none;
-  }
 }
 
 .emoji-mart-anchors {
@@ -94,7 +82,6 @@
   height: 270px;
   max-height: 35vh;
   padding: 0 6px 6px;
-  background: var(--dropdown-background-color);
   will-change: transform;
 
   &::-webkit-scrollbar-track:hover,
@@ -106,7 +93,6 @@
 .emoji-mart-search {
   padding: 10px;
   padding-inline-end: 45px;
-  background: var(--dropdown-background-color);
   position: relative;
 
   input {
@@ -195,7 +181,6 @@
     width: 100%;
     font-weight: 500;
     padding: 5px 6px;
-    background: var(--dropdown-background-color);
   }
 }
 

From 5e039b96c30efab07f9435b937857e7944ab8e81 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 20 Mar 2024 12:07:02 +0100
Subject: [PATCH 0534/2191] [Glitch] Fix emoji picker placement on
 limited-height viewports

Port 94f7ae192b8df4f0a8846249016268f914b730bb to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../compose/components/emoji_picker_dropdown.jsx         | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/javascript/flavours/glitch/features/compose/components/emoji_picker_dropdown.jsx b/app/javascript/flavours/glitch/features/compose/components/emoji_picker_dropdown.jsx
index afe2981d054e66..c556f1536689f3 100644
--- a/app/javascript/flavours/glitch/features/compose/components/emoji_picker_dropdown.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/emoji_picker_dropdown.jsx
@@ -332,6 +332,7 @@ class EmojiPickerDropdown extends PureComponent {
   state = {
     active: false,
     loading: false,
+    placement: 'bottom',
   };
 
   setRef = (c) => {
@@ -383,10 +384,14 @@ class EmojiPickerDropdown extends PureComponent {
     return this.target;
   };
 
+  handleOverlayEnter = (state) => {
+    this.setState({ placement: state.placement });
+  };
+
   render () {
     const { intl, onPickEmoji, onSkinTone, skinTone, frequentlyUsedEmojis } = this.props;
     const title = intl.formatMessage(messages.emoji);
-    const { active, loading } = this.state;
+    const { active, loading, placement } = this.state;
 
     return (
       <div className='emoji-picker-dropdown' onKeyDown={this.handleKeyDown} ref={this.setTargetRef}>
@@ -399,7 +404,7 @@ class EmojiPickerDropdown extends PureComponent {
           inverted
         />
 
-        <Overlay show={active} placement={'bottom'} target={this.findTarget} popperConfig={{ strategy: 'fixed' }}>
+        <Overlay show={active} placement={placement} flip target={this.findTarget} popperConfig={{ strategy: 'fixed', onFirstUpdate: this.handleOverlayEnter }}>
           {({ props, placement })=> (
             <div {...props} style={{ ...props.style }}>
               <div className={`dropdown-animation ${placement}`}>

From df777776f1f296a347305d848634e882fd20b758 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 20 Mar 2024 12:20:23 +0100
Subject: [PATCH 0535/2191] [Glitch] Fix blockquote color in reply indicator

Port 50fd94f481cf23a81662140afe99df2fbf1149be to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/styles/rich_text.scss | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/app/javascript/flavours/glitch/styles/rich_text.scss b/app/javascript/flavours/glitch/styles/rich_text.scss
index 6224302ee3f5f9..266a09eb8e82d8 100644
--- a/app/javascript/flavours/glitch/styles/rich_text.scss
+++ b/app/javascript/flavours/glitch/styles/rich_text.scss
@@ -1,5 +1,6 @@
 .status__content__text,
 .e-content,
+.edit-indicator__content,
 .reply-indicator__content {
   pre,
   blockquote {
@@ -90,10 +91,3 @@
     list-style-type: decimal;
   }
 }
-
-.reply-indicator__content {
-  blockquote {
-    border-inline-start-color: $inverted-text-color;
-    color: $inverted-text-color;
-  }
-}

From 3211e960ac793b1b9431a7eea40b385272f1a2a6 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 20 Mar 2024 14:31:31 +0100
Subject: [PATCH 0536/2191] =?UTF-8?q?Fix=20=E2=80=9CExplore=E2=80=9D=20ico?=
 =?UTF-8?q?n=20in=20navigation=20bar=20not=20being=20filled=20when=20selec?=
 =?UTF-8?q?ted=20(#29649)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mastodon/features/ui/components/navigation_panel.jsx       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/features/ui/components/navigation_panel.jsx b/app/javascript/mastodon/features/ui/components/navigation_panel.jsx
index f2b40af72b1872..14a1933436a181 100644
--- a/app/javascript/mastodon/features/ui/components/navigation_panel.jsx
+++ b/app/javascript/mastodon/features/ui/components/navigation_panel.jsx
@@ -11,6 +11,7 @@ import { useSelector, useDispatch } from 'react-redux';
 import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
 import BookmarksActiveIcon from '@/material-icons/400-24px/bookmarks-fill.svg?react';
 import BookmarksIcon from '@/material-icons/400-24px/bookmarks.svg?react';
+import ExploreActiveIcon from '@/material-icons/400-24px/explore-fill.svg?react';
 import ExploreIcon from '@/material-icons/400-24px/explore.svg?react';
 import HomeActiveIcon from '@/material-icons/400-24px/home-fill.svg?react';
 import HomeIcon from '@/material-icons/400-24px/home.svg?react';
@@ -145,7 +146,7 @@ class NavigationPanel extends Component {
         )}
 
         {trendsEnabled ? (
-          <ColumnLink transparent to='/explore' icon='explore' iconComponent={ExploreIcon} text={intl.formatMessage(messages.explore)} />
+          <ColumnLink transparent to='/explore' icon='explore' iconComponent={ExploreIcon} activeIconComponent={ExploreActiveIcon} text={intl.formatMessage(messages.explore)} />
         ) : (
           <ColumnLink transparent to='/search' icon='search' iconComponent={SearchIcon} text={intl.formatMessage(messages.search)} />
         )}

From 0a33be39c14f896ad36ff27fb0f19c41fa17fdfe Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 20 Mar 2024 09:45:34 -0400
Subject: [PATCH 0537/2191] Reduce `LineLength` for `react_admin_component`
 helpers (#29650)

---
 .haml-lint.yml                                |  2 +
 app/views/admin/dashboard/index.html.haml     | 77 ++++++++++++++++---
 .../confirm_suspension.html.haml              |  3 +-
 app/views/admin/instances/show.html.haml      | 61 +++++++++++++--
 app/views/admin/reports/show.html.haml        |  6 +-
 app/views/admin/tags/show.html.haml           | 40 ++++++++--
 6 files changed, 162 insertions(+), 27 deletions(-)

diff --git a/.haml-lint.yml b/.haml-lint.yml
index 8cfcaec8d93fec..b94eb8b0dfa55d 100644
--- a/.haml-lint.yml
+++ b/.haml-lint.yml
@@ -14,3 +14,5 @@ linters:
     enabled: true
   LineLength:
     max: 320
+  ViewLength:
+    max: 200 # Override default value of 100 inherited from rubocop
diff --git a/app/views/admin/dashboard/index.html.haml b/app/views/admin/dashboard/index.html.haml
index 3597152e09ed49..8a80992785c21b 100644
--- a/app/views/admin/dashboard/index.html.haml
+++ b/app/views/admin/dashboard/index.html.haml
@@ -16,19 +16,43 @@
 
 .dashboard
   .dashboard__item
-    = react_admin_component :counter, measure: 'new_users', start_at: @time_period.first, end_at: @time_period.last, label: t('admin.dashboard.new_users'), href: admin_accounts_path(origin: 'local')
+    = react_admin_component :counter,
+                            end_at: @time_period.last,
+                            href: admin_accounts_path(origin: 'local'),
+                            label: t('admin.dashboard.new_users'),
+                            measure: 'new_users',
+                            start_at: @time_period.first
 
   .dashboard__item
-    = react_admin_component :counter, measure: 'active_users', start_at: @time_period.first, end_at: @time_period.last, label: t('admin.dashboard.active_users'), href: admin_accounts_path(origin: 'local')
+    = react_admin_component :counter,
+                            end_at: @time_period.last,
+                            href: admin_accounts_path(origin: 'local'),
+                            label: t('admin.dashboard.active_users'),
+                            measure: 'active_users',
+                            start_at: @time_period.first
 
   .dashboard__item
-    = react_admin_component :counter, measure: 'interactions', start_at: @time_period.first, end_at: @time_period.last, label: t('admin.dashboard.interactions')
+    = react_admin_component :counter,
+                            end_at: @time_period.last,
+                            label: t('admin.dashboard.interactions'),
+                            measure: 'interactions',
+                            start_at: @time_period.first
 
   .dashboard__item
-    = react_admin_component :counter, measure: 'opened_reports', start_at: @time_period.first, end_at: @time_period.last, label: t('admin.dashboard.opened_reports'), href: admin_reports_path
+    = react_admin_component :counter,
+                            end_at: @time_period.last,
+                            href: admin_reports_path,
+                            label: t('admin.dashboard.opened_reports'),
+                            measure: 'opened_reports',
+                            start_at: @time_period.first
 
   .dashboard__item
-    = react_admin_component :counter, measure: 'resolved_reports', start_at: @time_period.first, end_at: @time_period.last, label: t('admin.dashboard.resolved_reports'), href: admin_reports_path(resolved: '1')
+    = react_admin_component :counter,
+                            end_at: @time_period.last,
+                            href: admin_reports_path(resolved: '1'),
+                            label: t('admin.dashboard.resolved_reports'),
+                            measure: 'resolved_reports',
+                            start_at: @time_period.first
 
   .dashboard__item
     = link_to admin_reports_path, class: 'dashboard__quick-access' do
@@ -47,22 +71,51 @@
       %span= t('admin.dashboard.pending_appeals_html', count: @pending_appeals_count)
       = fa_icon 'chevron-right fw'
   .dashboard__item
-    = react_admin_component :dimension, dimension: 'sources', start_at: @time_period.first, end_at: @time_period.last, limit: 8, label: t('admin.dashboard.sources')
+    = react_admin_component :dimension,
+                            dimension: 'sources',
+                            end_at: @time_period.last,
+                            label: t('admin.dashboard.sources'),
+                            limit: 8,
+                            start_at: @time_period.first
 
   .dashboard__item
-    = react_admin_component :dimension, dimension: 'languages', start_at: @time_period.first, end_at: @time_period.last, limit: 8, label: t('admin.dashboard.top_languages')
+    = react_admin_component :dimension,
+                            dimension: 'languages',
+                            end_at: @time_period.last,
+                            label: t('admin.dashboard.top_languages'),
+                            limit: 8,
+                            start_at: @time_period.first
 
   .dashboard__item
-    = react_admin_component :dimension, dimension: 'servers', start_at: @time_period.first, end_at: @time_period.last, limit: 8, label: t('admin.dashboard.top_servers')
+    = react_admin_component :dimension,
+                            dimension: 'servers',
+                            end_at: @time_period.last,
+                            label: t('admin.dashboard.top_servers'),
+                            limit: 8,
+                            start_at: @time_period.first
 
   .dashboard__item.dashboard__item--span-double-column
-    = react_admin_component :retention, start_at: @time_period.last - 6.months, end_at: @time_period.last, frequency: 'month'
+    = react_admin_component :retention,
+                            end_at: @time_period.last,
+                            frequency: 'month',
+                            start_at: @time_period.last - 6.months
 
   .dashboard__item.dashboard__item--span-double-row
-    = react_admin_component :trends, limit: 7
+    = react_admin_component :trends,
+                            limit: 7
 
   .dashboard__item
-    = react_admin_component :dimension, dimension: 'software_versions', start_at: @time_period.first, end_at: @time_period.last, limit: 4, label: t('admin.dashboard.software')
+    = react_admin_component :dimension,
+                            dimension: 'software_versions',
+                            end_at: @time_period.last,
+                            label: t('admin.dashboard.software'),
+                            limit: 4,
+                            start_at: @time_period.first
 
   .dashboard__item
-    = react_admin_component :dimension, dimension: 'space_usage', start_at: @time_period.first, end_at: @time_period.last, limit: 3, label: t('admin.dashboard.space')
+    = react_admin_component :dimension,
+                            dimension: 'space_usage',
+                            end_at: @time_period.last,
+                            label: t('admin.dashboard.space'),
+                            limit: 3,
+                            start_at: @time_period.first
diff --git a/app/views/admin/domain_blocks/confirm_suspension.html.haml b/app/views/admin/domain_blocks/confirm_suspension.html.haml
index a5df8ba3f3adb5..4c4f92d710d666 100644
--- a/app/views/admin/domain_blocks/confirm_suspension.html.haml
+++ b/app/views/admin/domain_blocks/confirm_suspension.html.haml
@@ -14,7 +14,8 @@
 
   %hr.spacer
 
-  = react_admin_component :impact_report, domain: @domain_block.domain
+  = react_admin_component :impact_report,
+                          domain: @domain_block.domain
 
   .actions
     = link_to t('.cancel'), admin_instances_path, class: 'button button-tertiary'
diff --git a/app/views/admin/instances/show.html.haml b/app/views/admin/instances/show.html.haml
index 5f2664df76dc11..5bf4e899f3cf44 100644
--- a/app/views/admin/instances/show.html.haml
+++ b/app/views/admin/instances/show.html.haml
@@ -14,21 +14,66 @@
 
     .dashboard
       .dashboard__item
-        = react_admin_component :counter, measure: 'instance_accounts', start_at: @time_period.first, end_at: @time_period.last, params: { domain: @instance.domain }, label: t('admin.instances.dashboard.instance_accounts_measure'), href: admin_accounts_path(origin: 'remote', by_domain: @instance.domain)
+        = react_admin_component :counter,
+                                end_at: @time_period.last,
+                                href: admin_accounts_path(origin: 'remote', by_domain: @instance.domain),
+                                label: t('admin.instances.dashboard.instance_accounts_measure'),
+                                measure: 'instance_accounts',
+                                params: { domain: @instance.domain },
+                                start_at: @time_period.first
       .dashboard__item
-        = react_admin_component :counter, measure: 'instance_statuses', start_at: @time_period.first, end_at: @time_period.last, params: { domain: @instance.domain }, label: t('admin.instances.dashboard.instance_statuses_measure')
+        = react_admin_component :counter,
+                                end_at: @time_period.last,
+                                label: t('admin.instances.dashboard.instance_statuses_measure'),
+                                measure: 'instance_statuses',
+                                params: { domain: @instance.domain },
+                                start_at: @time_period.first
       .dashboard__item
-        = react_admin_component :counter, measure: 'instance_media_attachments', start_at: @time_period.first, end_at: @time_period.last, params: { domain: @instance.domain }, label: t('admin.instances.dashboard.instance_media_attachments_measure')
+        = react_admin_component :counter,
+                                end_at: @time_period.last,
+                                label: t('admin.instances.dashboard.instance_media_attachments_measure'),
+                                measure: 'instance_media_attachments',
+                                params: { domain: @instance.domain },
+                                start_at: @time_period.first
       .dashboard__item
-        = react_admin_component :counter, measure: 'instance_follows', start_at: @time_period.first, end_at: @time_period.last, params: { domain: @instance.domain }, label: t('admin.instances.dashboard.instance_follows_measure')
+        = react_admin_component :counter,
+                                end_at: @time_period.last,
+                                label: t('admin.instances.dashboard.instance_follows_measure'),
+                                measure: 'instance_follows',
+                                params: { domain: @instance.domain },
+                                start_at: @time_period.first
       .dashboard__item
-        = react_admin_component :counter, measure: 'instance_followers', start_at: @time_period.first, end_at: @time_period.last, params: { domain: @instance.domain }, label: t('admin.instances.dashboard.instance_followers_measure')
+        = react_admin_component :counter,
+                                end_at: @time_period.last,
+                                label: t('admin.instances.dashboard.instance_followers_measure'),
+                                measure: 'instance_followers',
+                                params: { domain: @instance.domain },
+                                start_at: @time_period.first
       .dashboard__item
-        = react_admin_component :counter, measure: 'instance_reports', start_at: @time_period.first, end_at: @time_period.last, params: { domain: @instance.domain }, label: t('admin.instances.dashboard.instance_reports_measure'), href: admin_reports_path(by_target_domain: @instance.domain)
+        = react_admin_component :counter,
+                                end_at: @time_period.last,
+                                href: admin_reports_path(by_target_domain: @instance.domain),
+                                label: t('admin.instances.dashboard.instance_reports_measure'),
+                                measure: 'instance_reports',
+                                params: { domain: @instance.domain },
+                                start_at: @time_period.first
       .dashboard__item
-        = react_admin_component :dimension, dimension: 'instance_accounts', start_at: @time_period.first, end_at: @time_period.last, params: { domain: @instance.domain }, limit: 8, label: t('admin.instances.dashboard.instance_accounts_dimension')
+        = react_admin_component :dimension,
+                                dimension: 'instance_accounts',
+                                end_at: @time_period.last,
+                                label: t('admin.instances.dashboard.instance_accounts_dimension'),
+                                limit: 8,
+                                params: { domain: @instance.domain },
+                                start_at: @time_period.first
       .dashboard__item
-        = react_admin_component :dimension, dimension: 'instance_languages', start_at: @time_period.first, end_at: @time_period.last, params: { domain: @instance.domain }, limit: 8, label: t('admin.instances.dashboard.instance_languages_dimension')
+        = react_admin_component :dimension,
+                                dimension: 'instance_languages',
+                                end_at: @time_period.last,
+                                label: t('admin.instances.dashboard.instance_languages_dimension'),
+                                limit: 8,
+                                params: { domain: @instance.domain },
+                                start_at: @time_period.first
+
   - else
     %p
       = t('admin.instances.unknown_instance')
diff --git a/app/views/admin/reports/show.html.haml b/app/views/admin/reports/show.html.haml
index e20dd38c4f8c07..e37fa2590a408a 100644
--- a/app/views/admin/reports/show.html.haml
+++ b/app/views/admin/reports/show.html.haml
@@ -20,7 +20,11 @@
 
 %p= t 'admin.reports.category_description_html'
 
-= react_admin_component :report_reason_selector, id: @report.id, category: @report.category, rule_ids: @report.rule_ids&.map(&:to_s), disabled: @report.action_taken?
+= react_admin_component :report_reason_selector,
+                        category: @report.category,
+                        disabled: @report.action_taken?,
+                        id: @report.id,
+                        rule_ids: @report.rule_ids&.map(&:to_s)
 
 - if @report.comment.present?
   = render 'admin/reports/comment', report: @report
diff --git a/app/views/admin/tags/show.html.haml b/app/views/admin/tags/show.html.haml
index e4c985c19e2afb..2e4424bec6cde0 100644
--- a/app/views/admin/tags/show.html.haml
+++ b/app/views/admin/tags/show.html.haml
@@ -9,15 +9,45 @@
 
   .dashboard
     .dashboard__item
-      = react_admin_component :counter, measure: 'tag_accounts', start_at: @time_period.first, end_at: @time_period.last, params: { id: @tag.id }, label: t('admin.trends.tags.dashboard.tag_accounts_measure'), href: tag_url(@tag), target: '_blank', rel: 'noopener noreferrer'
+      = react_admin_component :counter,
+                              end_at: @time_period.last,
+                              href: tag_url(@tag),
+                              label: t('admin.trends.tags.dashboard.tag_accounts_measure'),
+                              measure: 'tag_accounts',
+                              params: { id: @tag.id },
+                              rel: 'noopener noreferrer',
+                              start_at: @time_period.first,
+                              target: '_blank'
     .dashboard__item
-      = react_admin_component :counter, measure: 'tag_uses', start_at: @time_period.first, end_at: @time_period.last, params: { id: @tag.id }, label: t('admin.trends.tags.dashboard.tag_uses_measure')
+      = react_admin_component :counter,
+                              end_at: @time_period.last,
+                              label: t('admin.trends.tags.dashboard.tag_uses_measure'),
+                              measure: 'tag_uses',
+                              params: { id: @tag.id },
+                              start_at: @time_period.first
     .dashboard__item
-      = react_admin_component :counter, measure: 'tag_servers', start_at: @time_period.first, end_at: @time_period.last, params: { id: @tag.id }, label: t('admin.trends.tags.dashboard.tag_servers_measure')
+      = react_admin_component :counter,
+                              end_at: @time_period.last,
+                              label: t('admin.trends.tags.dashboard.tag_servers_measure'),
+                              measure: 'tag_servers',
+                              params: { id: @tag.id },
+                              start_at: @time_period.first
     .dashboard__item
-      = react_admin_component :dimension, dimension: 'tag_servers', start_at: @time_period.first, end_at: @time_period.last, params: { id: @tag.id }, limit: 8, label: t('admin.trends.tags.dashboard.tag_servers_dimension')
+      = react_admin_component :dimension,
+                              dimension: 'tag_servers',
+                              end_at: @time_period.last,
+                              label: t('admin.trends.tags.dashboard.tag_servers_dimension'),
+                              limit: 8,
+                              params: { id: @tag.id },
+                              start_at: @time_period.first
     .dashboard__item
-      = react_admin_component :dimension, dimension: 'tag_languages', start_at: @time_period.first, end_at: @time_period.last, params: { id: @tag.id }, limit: 8, label: t('admin.trends.tags.dashboard.tag_languages_dimension')
+      = react_admin_component :dimension,
+                              dimension: 'tag_languages',
+                              end_at: @time_period.last,
+                              label: t('admin.trends.tags.dashboard.tag_languages_dimension'),
+                              limit: 8,
+                              params: { id: @tag.id },
+                              start_at: @time_period.first
     .dashboard__item
       = link_to admin_tag_path(@tag.id), class: ['dashboard__quick-access', @tag.usable? ? 'positive' : 'negative'] do
         - if @tag.usable?

From 8a1423a47425dd67615e94bdfd13d64b53676da4 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 20 Mar 2024 15:38:00 +0100
Subject: [PATCH 0538/2191] Allow unblocking email addresses from any matching
 account (#29305)

---
 app/controllers/admin/accounts_controller.rb         | 2 +-
 app/models/canonical_email_block.rb                  | 1 +
 app/views/admin/accounts/show.html.haml              | 2 +-
 spec/fabricators/canonical_email_block_fabricator.rb | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/controllers/admin/accounts_controller.rb b/app/controllers/admin/accounts_controller.rb
index 9beb8fde6b2fda..d3be7817ff4b81 100644
--- a/app/controllers/admin/accounts_controller.rb
+++ b/app/controllers/admin/accounts_controller.rb
@@ -128,7 +128,7 @@ def remove_header
     def unblock_email
       authorize @account, :unblock_email?
 
-      CanonicalEmailBlock.where(reference_account: @account).delete_all
+      CanonicalEmailBlock.matching_account(@account).delete_all
 
       log_action :unblock_email, @account
 
diff --git a/app/models/canonical_email_block.rb b/app/models/canonical_email_block.rb
index d09df6f5e2a531..c05eb9801dc48c 100644
--- a/app/models/canonical_email_block.rb
+++ b/app/models/canonical_email_block.rb
@@ -20,6 +20,7 @@ class CanonicalEmailBlock < ApplicationRecord
   validates :canonical_email_hash, presence: true, uniqueness: true
 
   scope :matching_email, ->(email) { where(canonical_email_hash: email_to_canonical_email_hash(email)) }
+  scope :matching_account, ->(account) { matching_email(account&.user_email).or(where(reference_account: account)) }
 
   def to_log_human_identifier
     canonical_email_hash
diff --git a/app/views/admin/accounts/show.html.haml b/app/views/admin/accounts/show.html.haml
index da2f2055d073c8..d380d807a3ccca 100644
--- a/app/views/admin/accounts/show.html.haml
+++ b/app/views/admin/accounts/show.html.haml
@@ -30,7 +30,7 @@
 = render 'admin/accounts/counters', account: @account
 
 - if @account.local? && @account.user.nil?
-  = link_to t('admin.accounts.unblock_email'), unblock_email_admin_account_path(@account.id), method: :post, class: 'button' if can?(:unblock_email, @account) && CanonicalEmailBlock.exists?(reference_account_id: @account.id)
+  = link_to t('admin.accounts.unblock_email'), unblock_email_admin_account_path(@account.id), method: :post, class: 'button' if can?(:unblock_email, @account) && CanonicalEmailBlock.matching_account(@account).exists?
 - else
   .table-wrapper
     %table.table.inline-table
diff --git a/spec/fabricators/canonical_email_block_fabricator.rb b/spec/fabricators/canonical_email_block_fabricator.rb
index 1ef53ff4a47d8f..2f979df794ef21 100644
--- a/spec/fabricators/canonical_email_block_fabricator.rb
+++ b/spec/fabricators/canonical_email_block_fabricator.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 Fabricator(:canonical_email_block) do
-  email { sequence(:email) { |i| "#{i}#{Faker::Internet.email}" } }
+  email { |attrs| attrs[:reference_account] ? attrs[:reference_account].user_email : sequence(:email) { |i| "#{i}#{Faker::Internet.email}" } }
   reference_account { Fabricate.build(:account) }
 end

From 44bf7b812894f9c8d67cbfbb1a23b0091aa601c5 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 20 Mar 2024 16:37:21 +0100
Subject: [PATCH 0539/2191] Add notifications of severed relationships (#27511)

---
 .../severed_relationships_controller.rb       | 61 +++++++++++++++++++
 .../notifications/components/notification.jsx | 29 +++++++++
 .../relationships_severance_event.jsx         | 61 +++++++++++++++++++
 app/javascript/mastodon/locales/en.json       |  8 +++
 .../mastodon/reducers/notifications.js        |  1 +
 .../material-icons/400-24px/link_off-fill.svg |  1 +
 .../material-icons/400-24px/link_off.svg      |  1 +
 .../account_relationship_severance_event.rb   | 27 ++++++++
 app/models/concerns/account/interactions.rb   |  5 ++
 app/models/concerns/account/merging.rb        | 12 ++++
 app/models/notification.rb                    |  9 +++
 app/models/relationship_severance_event.rb    | 56 +++++++++++++++++
 app/models/severed_relationship.rb            | 40 ++++++++++++
 ...relationship_severance_event_serializer.rb |  9 +++
 .../rest/notification_serializer.rb           |  5 ++
 ...after_block_domain_from_account_service.rb | 23 +++++--
 app/services/block_domain_service.rb          | 19 +++++-
 app/services/delete_account_service.rb        | 22 +++++++
 app/services/notify_service.rb                |  4 +-
 app/services/purge_domain_service.rb          | 22 ++++++-
 app/services/suspend_account_service.rb       | 18 ++++++
 .../severed_relationships/index.html.haml     | 34 +++++++++++
 config/locales/en.yml                         | 12 ++++
 config/navigation.rb                          |  6 +-
 config/routes.rb                              |  8 +++
 ...44_create_relationship_severance_events.rb | 15 +++++
 ...0312105620_create_severed_relationships.rb | 27 ++++++++
 ...e_account_relationship_severance_events.rb | 14 +++++
 db/schema.rb                                  | 41 ++++++++++++-
 lib/mastodon/cli/maintenance.rb               | 17 +++++-
 ...relationship_severance_event_fabricator.rb |  6 ++
 ...relationship_severance_event_fabricator.rb |  6 ++
 .../severed_relationship_fabricator.rb        |  8 +++
 .../relationship_severance_event_spec.rb      | 49 +++++++++++++++
 spec/models/severed_relationship_spec.rb      | 45 ++++++++++++++
 spec/requests/severed_relationships_spec.rb   | 23 +++++++
 ..._block_domain_from_account_service_spec.rb | 31 +++++++---
 spec/services/block_domain_service_spec.rb    | 49 ++++++---------
 spec/services/suspend_account_service_spec.rb |  9 ++-
 39 files changed, 780 insertions(+), 53 deletions(-)
 create mode 100644 app/controllers/severed_relationships_controller.rb
 create mode 100644 app/javascript/mastodon/features/notifications/components/relationships_severance_event.jsx
 create mode 100644 app/javascript/material-icons/400-24px/link_off-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/link_off.svg
 create mode 100644 app/models/account_relationship_severance_event.rb
 create mode 100644 app/models/relationship_severance_event.rb
 create mode 100644 app/models/severed_relationship.rb
 create mode 100644 app/serializers/rest/account_relationship_severance_event_serializer.rb
 create mode 100644 app/views/severed_relationships/index.html.haml
 create mode 100644 db/migrate/20240312100644_create_relationship_severance_events.rb
 create mode 100644 db/migrate/20240312105620_create_severed_relationships.rb
 create mode 100644 db/migrate/20240320140159_create_account_relationship_severance_events.rb
 create mode 100644 spec/fabricators/account_relationship_severance_event_fabricator.rb
 create mode 100644 spec/fabricators/relationship_severance_event_fabricator.rb
 create mode 100644 spec/fabricators/severed_relationship_fabricator.rb
 create mode 100644 spec/models/relationship_severance_event_spec.rb
 create mode 100644 spec/models/severed_relationship_spec.rb
 create mode 100644 spec/requests/severed_relationships_spec.rb

diff --git a/app/controllers/severed_relationships_controller.rb b/app/controllers/severed_relationships_controller.rb
new file mode 100644
index 00000000000000..8994fff0acc1e1
--- /dev/null
+++ b/app/controllers/severed_relationships_controller.rb
@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+class SeveredRelationshipsController < ApplicationController
+  layout 'admin'
+
+  before_action :authenticate_user!
+  before_action :set_body_classes
+  before_action :set_cache_headers
+
+  before_action :set_event, only: [:following, :followers]
+
+  def index
+    @events = AccountRelationshipSeveranceEvent.where(account: current_account)
+  end
+
+  def following
+    respond_to do |format|
+      format.csv { send_data following_data, filename: "following-#{@event.target_name}-#{@event.created_at.to_date.iso8601}.csv" }
+    end
+  end
+
+  def followers
+    respond_to do |format|
+      format.csv { send_data followers_data, filename: "followers-#{@event.target_name}-#{@event.created_at.to_date.iso8601}.csv" }
+    end
+  end
+
+  private
+
+  def set_event
+    @event = AccountRelationshipSeveranceEvent.find(params[:id])
+  end
+
+  def following_data
+    CSV.generate(headers: ['Account address', 'Show boosts', 'Notify on new posts', 'Languages'], write_headers: true) do |csv|
+      @event.severed_relationships.active.where(local_account: current_account).includes(:remote_account).reorder(id: :desc).each do |follow|
+        csv << [acct(follow.target_account), follow.show_reblogs, follow.notify, follow.languages&.join(', ')]
+      end
+    end
+  end
+
+  def followers_data
+    CSV.generate(headers: ['Account address'], write_headers: true) do |csv|
+      @event.severed_relationships.passive.where(local_account: current_account).includes(:remote_account).reorder(id: :desc).each do |follow|
+        csv << [acct(follow.account)]
+      end
+    end
+  end
+
+  def acct(account)
+    account.local? ? account.local_username_and_domain : account.acct
+  end
+
+  def set_body_classes
+    @body_classes = 'admin'
+  end
+
+  def set_cache_headers
+    response.cache_control.replace(private: true, no_store: true)
+  end
+end
diff --git a/app/javascript/mastodon/features/notifications/components/notification.jsx b/app/javascript/mastodon/features/notifications/components/notification.jsx
index d7101f8384f61e..1af1eb78d94fe7 100644
--- a/app/javascript/mastodon/features/notifications/components/notification.jsx
+++ b/app/javascript/mastodon/features/notifications/components/notification.jsx
@@ -14,6 +14,7 @@ import EditIcon from '@/material-icons/400-24px/edit.svg?react';
 import FlagIcon from '@/material-icons/400-24px/flag-fill.svg?react';
 import HomeIcon from '@/material-icons/400-24px/home-fill.svg?react';
 import InsertChartIcon from '@/material-icons/400-24px/insert_chart.svg?react';
+import LinkOffIcon from '@/material-icons/400-24px/link_off.svg?react';
 import PersonIcon from '@/material-icons/400-24px/person-fill.svg?react';
 import PersonAddIcon from '@/material-icons/400-24px/person_add-fill.svg?react';
 import RepeatIcon from '@/material-icons/400-24px/repeat.svg?react';
@@ -26,6 +27,7 @@ import { WithRouterPropTypes } from 'mastodon/utils/react_router';
 
 import FollowRequestContainer from '../containers/follow_request_container';
 
+import RelationshipsSeveranceEvent from './relationships_severance_event';
 import Report from './report';
 
 const messages = defineMessages({
@@ -36,6 +38,7 @@ const messages = defineMessages({
   reblog: { id: 'notification.reblog', defaultMessage: '{name} boosted your status' },
   status: { id: 'notification.status', defaultMessage: '{name} just posted' },
   update: { id: 'notification.update', defaultMessage: '{name} edited a post' },
+  severedRelationships: { id: 'notification.severed_relationships', defaultMessage: 'Relationships with {name} severed' },
   adminSignUp: { id: 'notification.admin.sign_up', defaultMessage: '{name} signed up' },
   adminReport: { id: 'notification.admin.report', defaultMessage: '{name} reported {target}' },
 });
@@ -358,6 +361,30 @@ class Notification extends ImmutablePureComponent {
     );
   }
 
+  renderRelationshipsSevered (notification) {
+    const { intl, unread } = this.props;
+
+    if (!notification.get('event')) {
+      return null;
+    }
+
+    return (
+      <HotKeys handlers={this.getHandlers()}>
+        <div className={classNames('notification notification-severed-relationships focusable', { unread })} tabIndex={0} aria-label={notificationForScreenReader(intl, intl.formatMessage(messages.adminReport, { name: notification.getIn(['event', 'target_name']) }), notification.get('created_at'))}>
+          <div className='notification__message'>
+            <Icon id='unlink' icon={LinkOffIcon} />
+
+            <span title={notification.get('created_at')}>
+              <FormattedMessage id='notification.severedRelationships' defaultMessage='Relationships with {name} severed' values={{ name: notification.getIn(['event', 'target_name']) }} />
+            </span>
+          </div>
+
+          <RelationshipsSeveranceEvent event={notification.get('event')} />
+        </div>
+      </HotKeys>
+    );
+  }
+
   renderAdminSignUp (notification, account, link) {
     const { intl, unread } = this.props;
 
@@ -429,6 +456,8 @@ class Notification extends ImmutablePureComponent {
       return this.renderUpdate(notification, link);
     case 'poll':
       return this.renderPoll(notification, account);
+    case 'severed_relationships':
+      return this.renderRelationshipsSevered(notification);
     case 'admin.sign_up':
       return this.renderAdminSignUp(notification, account, link);
     case 'admin.report':
diff --git a/app/javascript/mastodon/features/notifications/components/relationships_severance_event.jsx b/app/javascript/mastodon/features/notifications/components/relationships_severance_event.jsx
new file mode 100644
index 00000000000000..12bc5f130d0482
--- /dev/null
+++ b/app/javascript/mastodon/features/notifications/components/relationships_severance_event.jsx
@@ -0,0 +1,61 @@
+import PropTypes from 'prop-types';
+
+import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
+
+import ImmutablePropTypes from 'react-immutable-proptypes';
+
+import { RelativeTimestamp } from 'mastodon/components/relative_timestamp';
+
+// This needs to be kept in sync with app/models/relationship_severance_event.rb
+const messages = defineMessages({
+  account_suspension: { id: 'relationship_severance_notification.types.account_suspension', defaultMessage: 'Account has been suspended' },
+  domain_block: { id: 'relationship_severance_notification.types.domain_block', defaultMessage: 'Domain has been suspended' },
+  user_domain_block: { id: 'relationship_severance_notification.types.user_domain_block', defaultMessage: 'You blocked this domain' },
+});
+
+const RelationshipsSeveranceEvent = ({ event, hidden }) => {
+  const intl = useIntl();
+
+  if (hidden || !event) {
+    return null;
+  }
+
+  return (
+    <div className='notification__report'>
+      <div className='notification__report__details'>
+        <div>
+          <RelativeTimestamp timestamp={event.get('created_at')} short={false} />
+          {' · '}
+          { event.get('purged') ? (
+            <FormattedMessage
+              id='relationship_severance_notification.purged_data'
+              defaultMessage='purged by administrators'
+            />
+          ) : (
+            <FormattedMessage
+              id='relationship_severance_notification.relationships'
+              defaultMessage='{count, plural, one {# relationship} other {# relationships}}'
+              values={{ count: event.get('relationships_count', 0) }}
+            />
+          )}
+          <br />
+          <strong>{intl.formatMessage(messages[event.get('type')])}</strong>
+        </div>
+
+        <div className='notification__report__actions'>
+          <a href='/severed_relationships' className='button' target='_blank' rel='noopener noreferrer'>
+            <FormattedMessage id='relationship_severance_notification.view' defaultMessage='View' />
+          </a>
+        </div>
+      </div>
+    </div>
+  );
+
+};
+
+RelationshipsSeveranceEvent.propTypes = {
+  event: ImmutablePropTypes.map.isRequired,
+  hidden: PropTypes.bool,
+};
+
+export default RelationshipsSeveranceEvent;
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index 376dfb7e4b6b0f..ca698533668050 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -471,6 +471,8 @@
   "notification.own_poll": "Your poll has ended",
   "notification.poll": "A poll you have voted in has ended",
   "notification.reblog": "{name} boosted your post",
+  "notification.severedRelationships": "Relationships with {name} severed",
+  "notification.severed_relationships": "Relationships with {name} severed",
   "notification.status": "{name} just posted",
   "notification.update": "{name} edited a post",
   "notification_requests.accept": "Accept",
@@ -587,6 +589,12 @@
   "refresh": "Refresh",
   "regeneration_indicator.label": "Loading…",
   "regeneration_indicator.sublabel": "Your home feed is being prepared!",
+  "relationship_severance_notification.purged_data": "purged by administrators",
+  "relationship_severance_notification.relationships": "{count, plural, one {# relationship} other {# relationships}}",
+  "relationship_severance_notification.types.account_suspension": "Account has been suspended",
+  "relationship_severance_notification.types.domain_block": "Domain has been suspended",
+  "relationship_severance_notification.types.user_domain_block": "You blocked this domain",
+  "relationship_severance_notification.view": "View",
   "relative_time.days": "{number}d",
   "relative_time.full.days": "{number, plural, one {# day} other {# days}} ago",
   "relative_time.full.hours": "{number, plural, one {# hour} other {# hours}} ago",
diff --git a/app/javascript/mastodon/reducers/notifications.js b/app/javascript/mastodon/reducers/notifications.js
index b1c80b3d4fdd47..bc859364393365 100644
--- a/app/javascript/mastodon/reducers/notifications.js
+++ b/app/javascript/mastodon/reducers/notifications.js
@@ -55,6 +55,7 @@ export const notificationToMap = notification => ImmutableMap({
   created_at: notification.created_at,
   status: notification.status ? notification.status.id : null,
   report: notification.report ? fromJS(notification.report) : null,
+  event: notification.event ? fromJS(notification.event) : null,
 });
 
 const normalizeNotification = (state, notification, usePendingItems) => {
diff --git a/app/javascript/material-icons/400-24px/link_off-fill.svg b/app/javascript/material-icons/400-24px/link_off-fill.svg
new file mode 100644
index 00000000000000..618e7753476fc2
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/link_off-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="m770-302-60-62q40-11 65-42.5t25-73.5q0-50-35-85t-85-35H520v-80h160q83 0 141.5 58.5T880-480q0 57-29.5 105T770-302ZM634-440l-80-80h86v80h-6ZM792-56 56-792l56-56 736 736-56 56ZM440-280H280q-83 0-141.5-58.5T80-480q0-69 42-123t108-71l74 74h-24q-50 0-85 35t-35 85q0 50 35 85t85 35h160v80ZM320-440v-80h65l79 80H320Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/link_off.svg b/app/javascript/material-icons/400-24px/link_off.svg
new file mode 100644
index 00000000000000..618e7753476fc2
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/link_off.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="m770-302-60-62q40-11 65-42.5t25-73.5q0-50-35-85t-85-35H520v-80h160q83 0 141.5 58.5T880-480q0 57-29.5 105T770-302ZM634-440l-80-80h86v80h-6ZM792-56 56-792l56-56 736 736-56 56ZM440-280H280q-83 0-141.5-58.5T80-480q0-69 42-123t108-71l74 74h-24q-50 0-85 35t-35 85q0 50 35 85t85 35h160v80ZM320-440v-80h65l79 80H320Z"/></svg>
\ No newline at end of file
diff --git a/app/models/account_relationship_severance_event.rb b/app/models/account_relationship_severance_event.rb
new file mode 100644
index 00000000000000..0cf3fb117d4230
--- /dev/null
+++ b/app/models/account_relationship_severance_event.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+#
+# == Schema Information
+#
+# Table name: account_relationship_severance_events
+#
+#  id                              :bigint(8)        not null, primary key
+#  account_id                      :bigint(8)        not null
+#  relationship_severance_event_id :bigint(8)        not null
+#  created_at                      :datetime         not null
+#  updated_at                      :datetime         not null
+#
+class AccountRelationshipSeveranceEvent < ApplicationRecord
+  belongs_to :account
+  belongs_to :relationship_severance_event
+
+  delegate :severed_relationships, :type, :target_name, :purged, to: :relationship_severance_event, prefix: false
+
+  before_create :set_relationships_count!
+
+  private
+
+  def set_relationships_count!
+    self.relationships_count = severed_relationships.where(local_account: account).count
+  end
+end
diff --git a/app/models/concerns/account/interactions.rb b/app/models/concerns/account/interactions.rb
index 85363febfb2a43..a32697b66eb830 100644
--- a/app/models/concerns/account/interactions.rb
+++ b/app/models/concerns/account/interactions.rb
@@ -83,6 +83,11 @@ def follow_mapping(query, field)
     has_many :following, -> { order('follows.id desc') }, through: :active_relationships,  source: :target_account
     has_many :followers, -> { order('follows.id desc') }, through: :passive_relationships, source: :account
 
+    with_options class_name: 'SeveredRelationship', dependent: :destroy do
+      has_many :severed_relationships, foreign_key: 'local_account_id', inverse_of: :local_account
+      has_many :remote_severed_relationships, foreign_key: 'remote_account_id', inverse_of: :remote_account
+    end
+
     # Account notes
     has_many :account_notes, dependent: :destroy
 
diff --git a/app/models/concerns/account/merging.rb b/app/models/concerns/account/merging.rb
index 960ee1819f840b..ebc57a12219145 100644
--- a/app/models/concerns/account/merging.rb
+++ b/app/models/concerns/account/merging.rb
@@ -48,6 +48,18 @@ def merge_with!(other_account)
       record.update_attribute(:account_warning_id, id)
     end
 
+    SeveredRelationship.where(local_account_id: other_account.id).reorder(nil).find_each do |record|
+      record.update_attribute(:local_account_id, id)
+    rescue ActiveRecord::RecordNotUnique
+      next
+    end
+
+    SeveredRelationship.where(remote_account_id: other_account.id).reorder(nil).find_each do |record|
+      record.update_attribute(:remote_account_id, id)
+    rescue ActiveRecord::RecordNotUnique
+      next
+    end
+
     # Some follow relationships have moved, so the cache is stale
     Rails.cache.delete_matched("followers_hash:#{id}:*")
     Rails.cache.delete_matched("relationships:#{id}:*")
diff --git a/app/models/notification.rb b/app/models/notification.rb
index 861a1543696655..8ee7e77258899d 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -54,6 +54,9 @@ class Notification < ApplicationRecord
     update: {
       filterable: false,
     }.freeze,
+    severed_relationships: {
+      filterable: false,
+    }.freeze,
     'admin.sign_up': {
       filterable: false,
     }.freeze,
@@ -86,6 +89,7 @@ class Notification < ApplicationRecord
     belongs_to :favourite, inverse_of: :notification
     belongs_to :poll, inverse_of: false
     belongs_to :report, inverse_of: false
+    belongs_to :relationship_severance_event, inverse_of: false
   end
 
   validates :type, inclusion: { in: TYPES }
@@ -182,6 +186,11 @@ def set_from_account
       self.from_account_id = activity&.status&.account_id
     when 'Account'
       self.from_account_id = activity&.id
+    when 'AccountRelationshipSeveranceEvent'
+      # These do not really have an originating account, but this is mandatory
+      # in the data model, and the recipient's account will by definition
+      # always exist
+      self.from_account_id = account_id
     end
   end
 
diff --git a/app/models/relationship_severance_event.rb b/app/models/relationship_severance_event.rb
new file mode 100644
index 00000000000000..d9775150e83f7d
--- /dev/null
+++ b/app/models/relationship_severance_event.rb
@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+# == Schema Information
+#
+# Table name: relationship_severance_events
+#
+#  id          :bigint(8)        not null, primary key
+#  type        :integer          not null
+#  target_name :string           not null
+#  purged      :boolean          default(FALSE), not null
+#  created_at  :datetime         not null
+#  updated_at  :datetime         not null
+#
+class RelationshipSeveranceEvent < ApplicationRecord
+  self.inheritance_column = nil
+
+  has_many :severed_relationships, inverse_of: :relationship_severance_event, dependent: :delete_all
+
+  enum type: {
+    domain_block: 0,
+    user_domain_block: 1,
+    account_suspension: 2,
+  }
+
+  scope :about_local_account, ->(account) { where(id: SeveredRelationship.about_local_account(account).select(:relationship_severance_event_id)) }
+
+  def import_from_active_follows!(follows)
+    import_from_follows!(follows, true)
+  end
+
+  def import_from_passive_follows!(follows)
+    import_from_follows!(follows, false)
+  end
+
+  def affected_local_accounts
+    Account.where(id: severed_relationships.select(:local_account_id))
+  end
+
+  private
+
+  def import_from_follows!(follows, active)
+    SeveredRelationship.insert_all(
+      follows.pluck(:account_id, :target_account_id, :show_reblogs, :notify, :languages).map do |account_id, target_account_id, show_reblogs, notify, languages|
+        {
+          local_account_id: active ? account_id : target_account_id,
+          remote_account_id: active ? target_account_id : account_id,
+          show_reblogs: show_reblogs,
+          notify: notify,
+          languages: languages,
+          relationship_severance_event_id: id,
+          direction: active ? :active : :passive,
+        }
+      end
+    )
+  end
+end
diff --git a/app/models/severed_relationship.rb b/app/models/severed_relationship.rb
new file mode 100644
index 00000000000000..00a913f7fc82b1
--- /dev/null
+++ b/app/models/severed_relationship.rb
@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+# == Schema Information
+#
+# Table name: severed_relationships
+#
+#  id                              :bigint(8)        not null, primary key
+#  relationship_severance_event_id :bigint(8)        not null
+#  local_account_id                :bigint(8)        not null
+#  remote_account_id               :bigint(8)        not null
+#  direction                       :integer          not null
+#  show_reblogs                    :boolean
+#  notify                          :boolean
+#  languages                       :string           is an Array
+#  created_at                      :datetime         not null
+#  updated_at                      :datetime         not null
+#
+class SeveredRelationship < ApplicationRecord
+  belongs_to :relationship_severance_event
+  belongs_to :local_account, class_name: 'Account'
+  belongs_to :remote_account, class_name: 'Account'
+
+  enum direction: {
+    passive: 0, # analogous to `local_account.passive_relationships`
+    active: 1, # analogous to `local_account.active_relationships`
+  }
+
+  scope :about_local_account, ->(account) { where(local_account: account) }
+
+  scope :active, -> { where(direction: :active) }
+  scope :passive, -> { where(direction: :passive) }
+
+  def account
+    active? ? local_account : remote_account
+  end
+
+  def target_account
+    active? ? remote_account : local_account
+  end
+end
diff --git a/app/serializers/rest/account_relationship_severance_event_serializer.rb b/app/serializers/rest/account_relationship_severance_event_serializer.rb
new file mode 100644
index 00000000000000..2578e3a20fc286
--- /dev/null
+++ b/app/serializers/rest/account_relationship_severance_event_serializer.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class REST::AccountRelationshipSeveranceEventSerializer < ActiveModel::Serializer
+  attributes :id, :type, :purged, :target_name, :created_at
+
+  def id
+    object.id.to_s
+  end
+end
diff --git a/app/serializers/rest/notification_serializer.rb b/app/serializers/rest/notification_serializer.rb
index 137fc53ddab230..d7b88b7c37b0db 100644
--- a/app/serializers/rest/notification_serializer.rb
+++ b/app/serializers/rest/notification_serializer.rb
@@ -6,6 +6,7 @@ class REST::NotificationSerializer < ActiveModel::Serializer
   belongs_to :from_account, key: :account, serializer: REST::AccountSerializer
   belongs_to :target_status, key: :status, if: :status_type?, serializer: REST::StatusSerializer
   belongs_to :report, if: :report_type?, serializer: REST::ReportSerializer
+  belongs_to :relationship_severance_event, key: :event, if: :relationship_severance_event?, serializer: REST::AccountRelationshipSeveranceEventSerializer
 
   def id
     object.id.to_s
@@ -18,4 +19,8 @@ def status_type?
   def report_type?
     object.type == :'admin.report'
   end
+
+  def relationship_severance_event?
+    object.type == :severed_relationships
+  end
 end
diff --git a/app/services/after_block_domain_from_account_service.rb b/app/services/after_block_domain_from_account_service.rb
index 89d007c1cd9df6..adb17845ccaf29 100644
--- a/app/services/after_block_domain_from_account_service.rb
+++ b/app/services/after_block_domain_from_account_service.rb
@@ -9,18 +9,21 @@ class AfterBlockDomainFromAccountService < BaseService
   def call(account, domain)
     @account = account
     @domain  = domain
+    @domain_block_event = nil
 
     clear_notifications!
     remove_follows!
     reject_existing_followers!
     reject_pending_follow_requests!
+    notify_of_severed_relationships!
   end
 
   private
 
   def remove_follows!
-    @account.active_relationships.where(target_account: Account.where(domain: @domain)).includes(:target_account).reorder(nil).find_each do |follow|
-      UnfollowService.new.call(@account, follow.target_account)
+    @account.active_relationships.where(target_account: Account.where(domain: @domain)).includes(:target_account).reorder(nil).in_batches do |follows|
+      domain_block_event.import_from_active_follows!(follows)
+      follows.each { |follow| UnfollowService.new.call(@account, follow.target_account) }
     end
   end
 
@@ -29,8 +32,9 @@ def clear_notifications!
   end
 
   def reject_existing_followers!
-    @account.passive_relationships.where(account: Account.where(domain: @domain)).includes(:account).reorder(nil).find_each do |follow|
-      reject_follow!(follow)
+    @account.passive_relationships.where(account: Account.where(domain: @domain)).includes(:account).reorder(nil).in_batches do |follows|
+      domain_block_event.import_from_passive_follows!(follows)
+      follows.each { |follow| reject_follow!(follow) }
     end
   end
 
@@ -47,4 +51,15 @@ def reject_follow!(follow)
 
     ActivityPub::DeliveryWorker.perform_async(Oj.dump(serialize_payload(follow, ActivityPub::RejectFollowSerializer)), @account.id, follow.account.inbox_url)
   end
+
+  def notify_of_severed_relationships!
+    return if @domain_block_event.nil?
+
+    event = AccountRelationshipSeveranceEvent.create!(account: @account, relationship_severance_event: @domain_block_event)
+    LocalNotificationWorker.perform_async(@account.id, event.id, 'AccountRelationshipSeveranceEvent', 'severed_relationships')
+  end
+
+  def domain_block_event
+    @domain_block_event ||= RelationshipSeveranceEvent.create!(type: :user_domain_block, target_name: @domain)
+  end
 end
diff --git a/app/services/block_domain_service.rb b/app/services/block_domain_service.rb
index 76cc36ff6b0d00..00d020d2b396fa 100644
--- a/app/services/block_domain_service.rb
+++ b/app/services/block_domain_service.rb
@@ -5,8 +5,11 @@ class BlockDomainService < BaseService
 
   def call(domain_block, update = false)
     @domain_block = domain_block
+    @domain_block_event = nil
+
     process_domain_block!
     process_retroactive_updates! if update
+    notify_of_severed_relationships!
   end
 
   private
@@ -37,7 +40,17 @@ def suspend_accounts!
     blocked_domain_accounts.without_suspended.in_batches.update_all(suspended_at: @domain_block.created_at, suspension_origin: :local)
 
     blocked_domain_accounts.where(suspended_at: @domain_block.created_at).reorder(nil).find_each do |account|
-      DeleteAccountService.new.call(account, reserve_username: true, suspended_at: @domain_block.created_at)
+      DeleteAccountService.new.call(account, reserve_username: true, suspended_at: @domain_block.created_at, relationship_severance_event: domain_block_event)
+    end
+  end
+
+  def notify_of_severed_relationships!
+    return if @domain_block_event.nil?
+
+    # TODO: check how efficient that query is, also check `push_bulk`/`perform_bulk`
+    @domain_block_event.affected_local_accounts.reorder(nil).find_each do |account|
+      event = AccountRelationshipSeveranceEvent.create!(account: account, relationship_severance_event: @domain_block_event)
+      LocalNotificationWorker.perform_async(account.id, event.id, 'AccountRelationshipSeveranceEvent', 'severed_relationships')
     end
   end
 
@@ -45,6 +58,10 @@ def blocked_domain
     domain_block.domain
   end
 
+  def domain_block_event
+    @domain_block_event ||= RelationshipSeveranceEvent.create!(type: :domain_block, target_name: blocked_domain)
+  end
+
   def blocked_domain_accounts
     Account.by_domain_and_subdomains(blocked_domain)
   end
diff --git a/app/services/delete_account_service.rb b/app/services/delete_account_service.rb
index 7c7cb97df2643c..bdfe0e71672845 100644
--- a/app/services/delete_account_service.rb
+++ b/app/services/delete_account_service.rb
@@ -58,6 +58,8 @@ class DeleteAccountService < BaseService
     reports
     targeted_moderation_notes
     targeted_reports
+    severed_relationships
+    remote_severed_relationships
   ).freeze
 
   # Suspend or remove an account and remove as much of its data
@@ -72,6 +74,7 @@ class DeleteAccountService < BaseService
   # @option [Boolean] :skip_side_effects Side effects are ActivityPub and streaming API payloads
   # @option [Boolean] :skip_activitypub Skip sending ActivityPub payloads. Implied by :skip_side_effects
   # @option [Time]    :suspended_at Only applicable when :reserve_username is true
+  # @option [RelationshipSeveranceEvent] :relationship_severance_event Event used to record severed relationships not initiated by the user
   def call(account, **options)
     @account = account
     @options = { reserve_username: true, reserve_email: true }.merge(options)
@@ -84,6 +87,7 @@ def call(account, **options)
 
     @options[:skip_activitypub] = true if @options[:skip_side_effects]
 
+    record_severed_relationships!
     distribute_activities!
     purge_content!
     fulfill_deletion_request!
@@ -266,6 +270,20 @@ def delete_actor!
     end
   end
 
+  def record_severed_relationships!
+    return if relationship_severance_event.nil?
+
+    @account.active_relationships.in_batches do |follows|
+      # NOTE: these follows are passive with regards to the local accounts
+      relationship_severance_event.import_from_passive_follows!(follows)
+    end
+
+    @account.passive_relationships.in_batches do |follows|
+      # NOTE: these follows are active with regards to the local accounts
+      relationship_severance_event.import_from_active_follows!(follows)
+    end
+  end
+
   def delete_actor_json
     @delete_actor_json ||= Oj.dump(serialize_payload(@account, ActivityPub::DeleteActorSerializer, signer: @account, always_sign: true))
   end
@@ -305,4 +323,8 @@ def skip_side_effects?
   def skip_activitypub?
     @options[:skip_activitypub]
   end
+
+  def relationship_severance_event
+    @options[:relationship_severance_event]
+  end
 end
diff --git a/app/services/notify_service.rb b/app/services/notify_service.rb
index f3d16f1be7fa13..c83e4c017fe599 100644
--- a/app/services/notify_service.rb
+++ b/app/services/notify_service.rb
@@ -9,6 +9,8 @@ class NotifyService < BaseService
     update
     poll
     status
+    # TODO: this probably warrants an email notification
+    severed_relationships
   ).freeze
 
   class DismissCondition
@@ -20,7 +22,7 @@ def initialize(notification)
 
     def dismiss?
       blocked   = @recipient.unavailable?
-      blocked ||= from_self? && @notification.type != :poll
+      blocked ||= from_self? && @notification.type != :poll && @notification.type != :severed_relationships
 
       return blocked if message? && from_staff?
 
diff --git a/app/services/purge_domain_service.rb b/app/services/purge_domain_service.rb
index 9df81f13e66be0..ca0f0d441fe5bb 100644
--- a/app/services/purge_domain_service.rb
+++ b/app/services/purge_domain_service.rb
@@ -2,10 +2,26 @@
 
 class PurgeDomainService < BaseService
   def call(domain)
-    Account.remote.where(domain: domain).reorder(nil).find_each do |account|
+    @domain = domain
+
+    purge_relationship_severance_events!
+    purge_accounts!
+    purge_emojis!
+
+    Instance.refresh
+  end
+
+  def purge_relationship_severance_events!
+    RelationshipSeveranceEvent.where(type: [:domain_block, :user_domain_block], target_name: @domain).in_batches.update_all(purged: true)
+  end
+
+  def purge_accounts!
+    Account.remote.where(domain: @domain).reorder(nil).find_each do |account|
       DeleteAccountService.new.call(account, reserve_username: false, skip_side_effects: true)
     end
-    CustomEmoji.remote.where(domain: domain).reorder(nil).find_each(&:destroy)
-    Instance.refresh
+  end
+
+  def purge_emojis!
+    CustomEmoji.remote.where(domain: @domain).reorder(nil).find_each(&:destroy)
   end
 end
diff --git a/app/services/suspend_account_service.rb b/app/services/suspend_account_service.rb
index 8d5446f1a88099..86c4ff64164078 100644
--- a/app/services/suspend_account_service.rb
+++ b/app/services/suspend_account_service.rb
@@ -8,6 +8,7 @@ class SuspendAccountService < BaseService
   def call(account)
     return unless account.suspended?
 
+    @relationship_severance_event = nil
     @account = account
 
     reject_remote_follows!
@@ -15,6 +16,7 @@ def call(account)
     unmerge_from_home_timelines!
     unmerge_from_list_timelines!
     privatize_media_attachments!
+    notify_of_severed_relationships!
   end
 
   private
@@ -36,6 +38,8 @@ def reject_remote_follows!
         [Oj.dump(serialize_payload(follow, ActivityPub::RejectFollowSerializer)), follow.target_account_id, @account.inbox_url]
       end
 
+      relationship_severance_event.import_from_passive_follows!(follows)
+
       follows.each(&:destroy)
     end
   end
@@ -101,7 +105,21 @@ def privatize_media_attachments!
     end
   end
 
+  def notify_of_severed_relationships!
+    return if @relationship_severance_event.nil?
+
+    # TODO: check how efficient that query is, also check `push_bulk`/`perform_bulk`
+    @relationship_severance_event.affected_local_accounts.reorder(nil).find_each do |account|
+      event = AccountRelationshipSeveranceEvent.create!(account: account, relationship_severance_event: @relationship_severance_event)
+      LocalNotificationWorker.perform_async(account.id, event.id, 'AccountRelationshipSeveranceEvent', 'severed_relationships')
+    end
+  end
+
   def signed_activity_json
     @signed_activity_json ||= Oj.dump(serialize_payload(@account, ActivityPub::UpdateSerializer, signer: @account))
   end
+
+  def relationship_severance_event
+    @relationship_severance_event ||= RelationshipSeveranceEvent.create!(type: :account_suspension, target_name: @account.acct)
+  end
 end
diff --git a/app/views/severed_relationships/index.html.haml b/app/views/severed_relationships/index.html.haml
new file mode 100644
index 00000000000000..97bef8792956d4
--- /dev/null
+++ b/app/views/severed_relationships/index.html.haml
@@ -0,0 +1,34 @@
+- content_for :page_title do
+  = t('settings.severed_relationships')
+
+%p.muted-hint= t('severed_relationships.preamble')
+
+- unless @events.empty?
+  .table-wrapper
+    %table.table
+      %thead
+        %tr
+          %th= t('exports.archive_takeout.date')
+          %th= t('severed_relationships.type')
+          %th= t('severed_relationships.lost_follows')
+          %th= t('severed_relationships.lost_followers')
+      %tbody
+        - @events.each do |event|
+          %tr
+            %td= l event.created_at
+            %td= t("severed_relationships.event_type.#{event.type}", target_name: event.target_name)
+            - if event.purged?
+              %td{ rowspan: 2 }= t('severed_relationships.purged')
+            - else
+              %td
+                - count = event.severed_relationships.active.where(local_account: current_account).count
+                - if count.zero?
+                  = t('generic.none')
+                - else
+                  = table_link_to 'download', t('severed_relationships.download', count: count), following_severed_relationship_path(event, format: :csv)
+              %td
+                - count = event.severed_relationships.passive.where(local_account: current_account).count
+                - if count.zero?
+                  = t('generic.none')
+                - else
+                  = table_link_to 'download', t('severed_relationships.download', count: count), followers_severed_relationship_path(event, format: :csv)
diff --git a/config/locales/en.yml b/config/locales/en.yml
index f45175e3fd57db..823e720ea75070 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1660,10 +1660,22 @@ en:
     preferences: Preferences
     profile: Public profile
     relationships: Follows and followers
+    severed_relationships: Severed relationships
     statuses_cleanup: Automated post deletion
     strikes: Moderation strikes
     two_factor_authentication: Two-factor Auth
     webauthn_authentication: Security keys
+  severed_relationships:
+    download: Download (%{count})
+    event_type:
+      account_suspension: Account suspension (%{target_name})
+      domain_block: Server suspension (%{target_name})
+      user_domain_block: You blocked %{target_name}
+    lost_followers: Lost followers
+    lost_follows: Lost follows
+    preamble: You may lose follows and followers when you block a domain or when your moderators decide to suspend a remote server. When that happens, you will be able to download lists of severed relationships, to be inspected and possibly imported on another server.
+    purged: Information about this server has been purged by your server's administrators.
+    type: Event
   statuses:
     attached:
       audio:
diff --git a/config/navigation.rb b/config/navigation.rb
index 734e5294b58423..791025d526a68f 100644
--- a/config/navigation.rb
+++ b/config/navigation.rb
@@ -16,7 +16,11 @@
       s.item :other, safe_join([fa_icon('cog fw'), t('preferences.other')]), settings_preferences_other_path
     end
 
-    n.item :relationships, safe_join([fa_icon('users fw'), t('settings.relationships')]), relationships_path, if: -> { current_user.functional? && !self_destruct }
+    n.item :relationships, safe_join([fa_icon('users fw'), t('settings.relationships')]), relationships_path, if: -> { current_user.functional? && !self_destruct } do |s|
+      s.item :current, safe_join([fa_icon('users fw'), t('settings.relationships')]), relationships_path
+      s.item :severed_relationships, safe_join([fa_icon('unlink fw'), t('settings.severed_relationships')]), severed_relationships_path
+    end
+
     n.item :filters, safe_join([fa_icon('filter fw'), t('filters.index.title')]), filters_path, highlights_on: %r{/filters}, if: -> { current_user.functional? && !self_destruct }
     n.item :statuses_cleanup, safe_join([fa_icon('history fw'), t('settings.statuses_cleanup')]), statuses_cleanup_path, if: -> { current_user.functional_or_moved? && !self_destruct }
 
diff --git a/config/routes.rb b/config/routes.rb
index 55f2de6a14cb28..d032b5110f6b95 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -189,6 +189,14 @@ def redirect_with_vary(path)
   end
 
   resource :relationships, only: [:show, :update]
+  resources :severed_relationships, only: [:index] do
+    member do
+      constraints(format: :csv) do
+        get :followers
+        get :following
+      end
+    end
+  end
   resource :statuses_cleanup, controller: :statuses_cleanup, only: [:show, :update]
 
   get '/media_proxy/:id/(*any)', to: 'media_proxy#show', as: :media_proxy, format: false
diff --git a/db/migrate/20240312100644_create_relationship_severance_events.rb b/db/migrate/20240312100644_create_relationship_severance_events.rb
new file mode 100644
index 00000000000000..8c55fe330f252a
--- /dev/null
+++ b/db/migrate/20240312100644_create_relationship_severance_events.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class CreateRelationshipSeveranceEvents < ActiveRecord::Migration[7.0]
+  def change
+    create_table :relationship_severance_events do |t|
+      t.integer :type, null: false
+      t.string :target_name, null: false
+      t.boolean :purged, null: false, default: false
+
+      t.timestamps
+
+      t.index [:type, :target_name]
+    end
+  end
+end
diff --git a/db/migrate/20240312105620_create_severed_relationships.rb b/db/migrate/20240312105620_create_severed_relationships.rb
new file mode 100644
index 00000000000000..1ed911cd55a379
--- /dev/null
+++ b/db/migrate/20240312105620_create_severed_relationships.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+class CreateSeveredRelationships < ActiveRecord::Migration[7.0]
+  def change
+    create_table :severed_relationships do |t|
+      # No need to have an index on this foreign key as it is covered by `index_severed_relationships_on_unique_tuples`
+      t.references :relationship_severance_event, null: false, foreign_key: { on_delete: :cascade }, index: false
+
+      # No need to have an index on this foregin key as it is covered by `index_severed_relationships_on_local_account_and_event`
+      t.references :local_account, null: false, foreign_key: { to_table: :accounts, on_delete: :cascade }, index: false
+      t.references :remote_account, null: false, foreign_key: { to_table: :accounts, on_delete: :cascade }
+
+      # Used to describe whether `local_account` is the active (follower) or passive (followed) part of the relationship
+      t.integer :direction, null: false
+
+      # Those attributes are carried over from the `follows` table
+      t.boolean :show_reblogs
+      t.boolean :notify
+      t.string :languages, array: true
+
+      t.timestamps
+
+      t.index [:relationship_severance_event_id, :local_account_id, :direction, :remote_account_id], name: 'index_severed_relationships_on_unique_tuples', unique: true
+      t.index [:local_account_id, :relationship_severance_event_id], name: 'index_severed_relationships_on_local_account_and_event'
+    end
+  end
+end
diff --git a/db/migrate/20240320140159_create_account_relationship_severance_events.rb b/db/migrate/20240320140159_create_account_relationship_severance_events.rb
new file mode 100644
index 00000000000000..160ef762136525
--- /dev/null
+++ b/db/migrate/20240320140159_create_account_relationship_severance_events.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class CreateAccountRelationshipSeveranceEvents < ActiveRecord::Migration[7.1]
+  def change
+    create_table :account_relationship_severance_events do |t|
+      t.belongs_to :account, foreign_key: { on_delete: :cascade }, null: false, index: { unique: true }
+      t.belongs_to :relationship_severance_event, foreign_key: { on_delete: :cascade }, null: false, index: { unique: true }
+
+      t.integer :relationships_count, default: 0, null: false
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index b98253a6c15f15..1e1d99f26b28c3 100644
--- 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_03_10_123453) do
+ActiveRecord::Schema[7.1].define(version: 2024_03_20_140159) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -90,6 +90,16 @@
     t.index ["target_account_id"], name: "index_account_pins_on_target_account_id"
   end
 
+  create_table "account_relationship_severance_events", force: :cascade do |t|
+    t.bigint "account_id", null: false
+    t.bigint "relationship_severance_event_id", null: false
+    t.integer "relationships_count", default: 0, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["account_id"], name: "index_account_relationship_severance_events_on_account_id", unique: true
+    t.index ["relationship_severance_event_id"], name: "idx_on_relationship_severance_event_id_403f53e707", unique: true
+  end
+
   create_table "account_stats", force: :cascade do |t|
     t.bigint "account_id", null: false
     t.bigint "statuses_count", default: 0, null: false
@@ -871,6 +881,15 @@
     t.string "url"
   end
 
+  create_table "relationship_severance_events", force: :cascade do |t|
+    t.integer "type", null: false
+    t.string "target_name", null: false
+    t.boolean "purged", default: false, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["type", "target_name"], name: "index_relationship_severance_events_on_type_and_target_name"
+  end
+
   create_table "relays", force: :cascade do |t|
     t.string "inbox_url", default: "", null: false
     t.string "follow_activity_id"
@@ -950,6 +969,21 @@
     t.index ["thing_type", "thing_id", "var"], name: "index_settings_on_thing_type_and_thing_id_and_var", unique: true
   end
 
+  create_table "severed_relationships", force: :cascade do |t|
+    t.bigint "relationship_severance_event_id", null: false
+    t.bigint "local_account_id", null: false
+    t.bigint "remote_account_id", null: false
+    t.integer "direction", null: false
+    t.boolean "show_reblogs"
+    t.boolean "notify"
+    t.string "languages", array: true
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["local_account_id", "relationship_severance_event_id"], name: "index_severed_relationships_on_local_account_and_event"
+    t.index ["relationship_severance_event_id", "local_account_id", "direction", "remote_account_id"], name: "index_severed_relationships_on_unique_tuples", unique: true
+    t.index ["remote_account_id"], name: "index_severed_relationships_on_remote_account_id"
+  end
+
   create_table "site_uploads", force: :cascade do |t|
     t.string "var", default: "", null: false
     t.string "file_file_name"
@@ -1228,6 +1262,8 @@
   add_foreign_key "account_notes", "accounts", on_delete: :cascade
   add_foreign_key "account_pins", "accounts", column: "target_account_id", on_delete: :cascade
   add_foreign_key "account_pins", "accounts", on_delete: :cascade
+  add_foreign_key "account_relationship_severance_events", "accounts", on_delete: :cascade
+  add_foreign_key "account_relationship_severance_events", "relationship_severance_events", on_delete: :cascade
   add_foreign_key "account_stats", "accounts", on_delete: :cascade
   add_foreign_key "account_statuses_cleanup_policies", "accounts", on_delete: :cascade
   add_foreign_key "account_warnings", "accounts", column: "target_account_id", on_delete: :cascade
@@ -1320,6 +1356,9 @@
   add_foreign_key "scheduled_statuses", "accounts", on_delete: :cascade
   add_foreign_key "session_activations", "oauth_access_tokens", column: "access_token_id", name: "fk_957e5bda89", on_delete: :cascade
   add_foreign_key "session_activations", "users", name: "fk_e5fda67334", on_delete: :cascade
+  add_foreign_key "severed_relationships", "accounts", column: "local_account_id", on_delete: :cascade
+  add_foreign_key "severed_relationships", "accounts", column: "remote_account_id", on_delete: :cascade
+  add_foreign_key "severed_relationships", "relationship_severance_events", on_delete: :cascade
   add_foreign_key "status_edits", "accounts", on_delete: :nullify
   add_foreign_key "status_edits", "statuses", on_delete: :cascade
   add_foreign_key "status_pins", "accounts", name: "fk_d4cb435b62", on_delete: :cascade
diff --git a/lib/mastodon/cli/maintenance.rb b/lib/mastodon/cli/maintenance.rb
index 9f234e386030d4..e6a346ae2636b7 100644
--- a/lib/mastodon/cli/maintenance.rb
+++ b/lib/mastodon/cli/maintenance.rb
@@ -5,7 +5,7 @@
 module Mastodon::CLI
   class Maintenance < Base
     MIN_SUPPORTED_VERSION = 2019_10_01_213028
-    MAX_SUPPORTED_VERSION = 2023_09_07_150100
+    MAX_SUPPORTED_VERSION = 2023_10_23_105620
 
     # Stubs to enjoy ActiveRecord queries while not depending on a particular
     # version of the code/database
@@ -39,6 +39,7 @@ class Appeal < ApplicationRecord; end
     class Webhook < ApplicationRecord; end
     class BulkImport < ApplicationRecord; end
     class SoftwareUpdate < ApplicationRecord; end
+    class SeveredRelationship < ApplicationRecord; end
 
     class DomainBlock < ApplicationRecord
       enum severity: { silence: 0, suspend: 1, noop: 2 }
@@ -129,6 +130,20 @@ def merge_with!(other_account)
             record.update_attribute(:account_warning_id, id)
           end
         end
+
+        if ActiveRecord::Base.connection.table_exists?(:severed_relationships)
+          SeveredRelationship.where(local_account_id: other_account.id).reorder(nil).find_each do |record|
+            record.update_attribute(:local_account_id, id)
+          rescue ActiveRecord::RecordNotUnique
+            next
+          end
+
+          SeveredRelationship.where(remote_account_id: other_account.id).reorder(nil).find_each do |record|
+            record.update_attribute(:remote_account_id, id)
+          rescue ActiveRecord::RecordNotUnique
+            next
+          end
+        end
       end
     end
 
diff --git a/spec/fabricators/account_relationship_severance_event_fabricator.rb b/spec/fabricators/account_relationship_severance_event_fabricator.rb
new file mode 100644
index 00000000000000..5580d520923e68
--- /dev/null
+++ b/spec/fabricators/account_relationship_severance_event_fabricator.rb
@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+Fabricator(:account_relationship_severance_event) do
+  account
+  relationship_severance_event
+end
diff --git a/spec/fabricators/relationship_severance_event_fabricator.rb b/spec/fabricators/relationship_severance_event_fabricator.rb
new file mode 100644
index 00000000000000..7fec14e9f21e45
--- /dev/null
+++ b/spec/fabricators/relationship_severance_event_fabricator.rb
@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+Fabricator(:relationship_severance_event) do
+  type { :domain_block }
+  target_name { 'example.com' }
+end
diff --git a/spec/fabricators/severed_relationship_fabricator.rb b/spec/fabricators/severed_relationship_fabricator.rb
new file mode 100644
index 00000000000000..6600b72cdfc964
--- /dev/null
+++ b/spec/fabricators/severed_relationship_fabricator.rb
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+Fabricator(:severed_relationship) do
+  local_account { Fabricate.build(:account) }
+  remote_account { Fabricate.build(:account) }
+  relationship_severance_event { Fabricate.build(:relationship_severance_event) }
+  direction { :active }
+end
diff --git a/spec/models/relationship_severance_event_spec.rb b/spec/models/relationship_severance_event_spec.rb
new file mode 100644
index 00000000000000..93c0f1a26dad75
--- /dev/null
+++ b/spec/models/relationship_severance_event_spec.rb
@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe RelationshipSeveranceEvent do
+  let(:local_account)  { Fabricate(:account) }
+  let(:remote_account) { Fabricate(:account, domain: 'example.com') }
+  let(:event)          { Fabricate(:relationship_severance_event) }
+
+  describe '#import_from_active_follows!' do
+    before do
+      local_account.follow!(remote_account)
+    end
+
+    it 'imports the follow relationships with the expected direction' do
+      event.import_from_active_follows!(local_account.active_relationships)
+
+      relationships = event.severed_relationships.to_a
+      expect(relationships.size).to eq 1
+      expect(relationships[0].account).to eq local_account
+      expect(relationships[0].target_account).to eq remote_account
+    end
+  end
+
+  describe '#import_from_passive_follows!' do
+    before do
+      remote_account.follow!(local_account)
+    end
+
+    it 'imports the follow relationships with the expected direction' do
+      event.import_from_passive_follows!(local_account.passive_relationships)
+
+      relationships = event.severed_relationships.to_a
+      expect(relationships.size).to eq 1
+      expect(relationships[0].account).to eq remote_account
+      expect(relationships[0].target_account).to eq local_account
+    end
+  end
+
+  describe '#affected_local_accounts' do
+    before do
+      event.severed_relationships.create!(local_account: local_account, remote_account: remote_account, direction: :active)
+    end
+
+    it 'correctly lists local accounts' do
+      expect(event.affected_local_accounts.to_a).to contain_exactly(local_account)
+    end
+  end
+end
diff --git a/spec/models/severed_relationship_spec.rb b/spec/models/severed_relationship_spec.rb
new file mode 100644
index 00000000000000..0f922d79838343
--- /dev/null
+++ b/spec/models/severed_relationship_spec.rb
@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe SeveredRelationship do
+  let(:local_account)  { Fabricate(:account) }
+  let(:remote_account) { Fabricate(:account, domain: 'example.com') }
+  let(:event)          { Fabricate(:relationship_severance_event) }
+
+  describe '#account' do
+    context 'when the local account is the follower' do
+      let(:severed_relationship) { Fabricate(:severed_relationship, relationship_severance_event: event, local_account: local_account, remote_account: remote_account, direction: :active) }
+
+      it 'returns the local account' do
+        expect(severed_relationship.account).to eq local_account
+      end
+    end
+
+    context 'when the local account is being followed' do
+      let(:severed_relationship) { Fabricate(:severed_relationship, relationship_severance_event: event, local_account: local_account, remote_account: remote_account, direction: :passive) }
+
+      it 'returns the remote account' do
+        expect(severed_relationship.account).to eq remote_account
+      end
+    end
+  end
+
+  describe '#target_account' do
+    context 'when the local account is the follower' do
+      let(:severed_relationship) { Fabricate(:severed_relationship, relationship_severance_event: event, local_account: local_account, remote_account: remote_account, direction: :active) }
+
+      it 'returns the remote account' do
+        expect(severed_relationship.target_account).to eq remote_account
+      end
+    end
+
+    context 'when the local account is being followed' do
+      let(:severed_relationship) { Fabricate(:severed_relationship, relationship_severance_event: event, local_account: local_account, remote_account: remote_account, direction: :passive) }
+
+      it 'returns the local account' do
+        expect(severed_relationship.target_account).to eq local_account
+      end
+    end
+  end
+end
diff --git a/spec/requests/severed_relationships_spec.rb b/spec/requests/severed_relationships_spec.rb
new file mode 100644
index 00000000000000..4063026d79c444
--- /dev/null
+++ b/spec/requests/severed_relationships_spec.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'Severed relationships page' do
+  include RoutingHelper
+
+  describe 'GET severed_relationships#index' do
+    let(:user) { Fabricate(:user) }
+
+    before do
+      sign_in user
+
+      Fabricate(:severed_relationship, local_account: user.account)
+    end
+
+    it 'returns http success' do
+      get severed_relationships_path
+
+      expect(response).to have_http_status(200)
+    end
+  end
+end
diff --git a/spec/services/after_block_domain_from_account_service_spec.rb b/spec/services/after_block_domain_from_account_service_spec.rb
index 2fce424b1acab7..12e780357de3c3 100644
--- a/spec/services/after_block_domain_from_account_service_spec.rb
+++ b/spec/services/after_block_domain_from_account_service_spec.rb
@@ -5,22 +5,33 @@
 RSpec.describe AfterBlockDomainFromAccountService do
   subject { described_class.new }
 
-  let!(:wolf) { Fabricate(:account, username: 'wolf', domain: 'evil.org', inbox_url: 'https://evil.org/inbox', protocol: :activitypub) }
-  let!(:alice) { Fabricate(:account, username: 'alice') }
+  let(:wolf) { Fabricate(:account, username: 'wolf', domain: 'evil.org', inbox_url: 'https://evil.org/wolf/inbox', protocol: :activitypub) }
+  let(:dog)  { Fabricate(:account, username: 'dog', domain: 'evil.org', inbox_url: 'https://evil.org/dog/inbox', protocol: :activitypub) }
+  let(:alice) { Fabricate(:account, username: 'alice') }
 
   before do
-    allow(ActivityPub::DeliveryWorker).to receive(:perform_async)
+    wolf.follow!(alice)
+    alice.follow!(dog)
   end
 
-  it 'purge followers from blocked domain' do
-    wolf.follow!(alice)
-    subject.call(alice, 'evil.org')
-    expect(wolf.following?(alice)).to be false
+  around do |example|
+    Sidekiq::Testing.fake! do
+      example.run
+    end
   end
 
-  it 'sends Reject->Follow to followers from blocked domain' do
-    wolf.follow!(alice)
+  it 'purges followers from blocked domain, sends them Reject->Follow, and records severed relationships', :aggregate_failures do
     subject.call(alice, 'evil.org')
-    expect(ActivityPub::DeliveryWorker).to have_received(:perform_async).once
+
+    expect(wolf.following?(alice)).to be false
+    expect(ActivityPub::DeliveryWorker.jobs.pluck('args')).to contain_exactly(
+      [a_string_including('"type":"Reject"'), alice.id, wolf.inbox_url],
+      [a_string_including('"type":"Undo"'), alice.id, dog.inbox_url]
+    )
+
+    severed_relationships = alice.severed_relationships.to_a
+    expect(severed_relationships.count).to eq 2
+    expect(severed_relationships[0].relationship_severance_event).to eq severed_relationships[1].relationship_severance_event
+    expect(severed_relationships.map { |rel| [rel.account, rel.target_account] }).to contain_exactly([wolf, alice], [alice, dog])
   end
 end
diff --git a/spec/services/block_domain_service_spec.rb b/spec/services/block_domain_service_spec.rb
index 0f278293a86676..26f80eaf620edc 100644
--- a/spec/services/block_domain_service_spec.rb
+++ b/spec/services/block_domain_service_spec.rb
@@ -5,6 +5,8 @@
 RSpec.describe BlockDomainService do
   subject { described_class.new }
 
+  let(:local_account) { Fabricate(:account) }
+  let(:bystander) { Fabricate(:account, domain: 'evil.org') }
   let!(:bad_account) { Fabricate(:account, username: 'badguy666', domain: 'evil.org') }
   let!(:bad_status_plain) { Fabricate(:status, account: bad_account, text: 'You suck') }
   let!(:bad_status_with_attachment) { Fabricate(:status, account: bad_account, text: 'Hahaha') }
@@ -13,62 +15,51 @@
 
   describe 'for a suspension' do
     before do
-      subject.call(DomainBlock.create!(domain: 'evil.org', severity: :suspend))
+      local_account.follow!(bad_account)
+      bystander.follow!(local_account)
     end
 
-    it 'creates a domain block' do
+    it 'creates a domain block, suspends remote accounts with appropriate suspension date, records severed relationships', :aggregate_failures do
+      subject.call(DomainBlock.create!(domain: 'evil.org', severity: :suspend))
+
       expect(DomainBlock.blocked?('evil.org')).to be true
-    end
 
-    it 'removes remote accounts from that domain' do
+      # Suspends account with appropriate suspension date
       expect(bad_account.reload.suspended?).to be true
-    end
-
-    it 'records suspension date appropriately' do
       expect(bad_account.reload.suspended_at).to eq DomainBlock.find_by(domain: 'evil.org').created_at
-    end
 
-    it 'keeps already-banned accounts banned' do
+      # Keep already-suspended account without updating the suspension date
       expect(already_banned_account.reload.suspended?).to be true
-    end
-
-    it 'does not overwrite suspension date of already-banned accounts' do
       expect(already_banned_account.reload.suspended_at).to_not eq DomainBlock.find_by(domain: 'evil.org').created_at
-    end
 
-    it 'removes the remote accounts\'s statuses and media attachments' do
+      # Removes content
       expect { bad_status_plain.reload }.to raise_exception ActiveRecord::RecordNotFound
       expect { bad_status_with_attachment.reload }.to raise_exception ActiveRecord::RecordNotFound
       expect { bad_attachment.reload }.to raise_exception ActiveRecord::RecordNotFound
+
+      # Records severed relationships
+      severed_relationships = local_account.severed_relationships.to_a
+      expect(severed_relationships.count).to eq 2
+      expect(severed_relationships[0].relationship_severance_event).to eq severed_relationships[1].relationship_severance_event
+      expect(severed_relationships.map { |rel| [rel.account, rel.target_account] }).to contain_exactly([bystander, local_account], [local_account, bad_account])
     end
   end
 
   describe 'for a silence with reject media' do
-    before do
+    it 'does not mark the domain as blocked, but silences accounts with an appropriate silencing date, clears media', :aggregate_failures, :sidekiq_inline do
       subject.call(DomainBlock.create!(domain: 'evil.org', severity: :silence, reject_media: true))
-    end
 
-    it 'does not create a domain block' do
       expect(DomainBlock.blocked?('evil.org')).to be false
-    end
 
-    it 'silences remote accounts from that domain' do
+      # Silences account with appropriate silecing date
       expect(bad_account.reload.silenced?).to be true
-    end
-
-    it 'records suspension date appropriately' do
       expect(bad_account.reload.silenced_at).to eq DomainBlock.find_by(domain: 'evil.org').created_at
-    end
 
-    it 'keeps already-banned accounts banned' do
+      # Keeps already-silenced accounts without updating the silecing date
       expect(already_banned_account.reload.silenced?).to be true
-    end
-
-    it 'does not overwrite suspension date of already-banned accounts' do
       expect(already_banned_account.reload.silenced_at).to_not eq DomainBlock.find_by(domain: 'evil.org').created_at
-    end
 
-    it 'leaves the domains status and attachments, but clears media', :sidekiq_inline do
+      # Leaves posts but clears media
       expect { bad_status_plain.reload }.to_not raise_error
       expect { bad_status_with_attachment.reload }.to_not raise_error
       expect { bad_attachment.reload }.to_not raise_error
diff --git a/spec/services/suspend_account_service_spec.rb b/spec/services/suspend_account_service_spec.rb
index d62f7ef0d60943..74ef8f60e26c06 100644
--- a/spec/services/suspend_account_service_spec.rb
+++ b/spec/services/suspend_account_service_spec.rb
@@ -59,7 +59,7 @@ def match_update_actor_request(req, account)
         remote_follower.follow!(account)
       end
 
-      it 'sends an update actor to followers and reporters' do
+      it 'sends an Update actor activity to followers and reporters' do
         subject
         expect(a_request(:post, remote_follower.inbox_url).with { |req| match_update_actor_request(req, account) }).to have_been_made.once
         expect(a_request(:post, remote_reporter.inbox_url).with { |req| match_update_actor_request(req, account) }).to have_been_made.once
@@ -85,9 +85,14 @@ def match_reject_follow_request(req, account, followee)
         account.follow!(local_followee)
       end
 
-      it 'sends a reject follow' do
+      it 'sends a Reject Follow activity, and records severed relationships', :aggregate_failures do
         subject
+
         expect(a_request(:post, account.inbox_url).with { |req| match_reject_follow_request(req, account, local_followee) }).to have_been_made.once
+
+        severed_relationships = local_followee.severed_relationships.to_a
+        expect(severed_relationships.count).to eq 1
+        expect(severed_relationships.map { |rel| [rel.account, rel.target_account] }).to contain_exactly([account, local_followee])
       end
     end
   end

From 27a6fa7b0e7605d0f88540d23fe19d34e3b23b79 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 20 Mar 2024 16:44:36 +0100
Subject: [PATCH 0540/2191] Update dependency cssnano to v6.1.1 (#29661)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 135 ++++++++++++++++++++----------------------------------
 1 file changed, 50 insertions(+), 85 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 1e37fcc0295cd5..20e40c4b52de66 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1578,16 +1578,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/css-parser-algorithms@npm:^2.5.0":
-  version: 2.5.0
-  resolution: "@csstools/css-parser-algorithms@npm:2.5.0"
-  peerDependencies:
-    "@csstools/css-tokenizer": ^2.2.3
-  checksum: 10c0/31b4a523d956e204af9842183678cca5a88ad76551d54dcb6083f8a6f2dfd8fdec6c09bca5410842af54b90997308bebee7593c17dbc1a4e951453b54bd3f024
-  languageName: node
-  linkType: hard
-
-"@csstools/css-parser-algorithms@npm:^2.6.1":
+"@csstools/css-parser-algorithms@npm:^2.5.0, @csstools/css-parser-algorithms@npm:^2.6.1":
   version: 2.6.1
   resolution: "@csstools/css-parser-algorithms@npm:2.6.1"
   peerDependencies:
@@ -1596,31 +1587,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/css-tokenizer@npm:^2.2.3":
-  version: 2.2.3
-  resolution: "@csstools/css-tokenizer@npm:2.2.3"
-  checksum: 10c0/557266ec52e8b36c19008a5bbd7151effba085cdd6d68270c01afebf914981caac698eda754b2a530a8a9947a3dd70e3f3a39a5e037c4170bb2a055a92754acb
-  languageName: node
-  linkType: hard
-
-"@csstools/css-tokenizer@npm:^2.2.4":
+"@csstools/css-tokenizer@npm:^2.2.3, @csstools/css-tokenizer@npm:^2.2.4":
   version: 2.2.4
   resolution: "@csstools/css-tokenizer@npm:2.2.4"
   checksum: 10c0/23997db5874514f4b951ebd215e1e6cc8baf03adf9a35fc6fd028b84cb52aa2dc053860722108c09859a9b37b455f62b84181fe15539cd37797ea699b9ff85f0
   languageName: node
   linkType: hard
 
-"@csstools/media-query-list-parser@npm:^2.1.7":
-  version: 2.1.7
-  resolution: "@csstools/media-query-list-parser@npm:2.1.7"
-  peerDependencies:
-    "@csstools/css-parser-algorithms": ^2.5.0
-    "@csstools/css-tokenizer": ^2.2.3
-  checksum: 10c0/433aef06b00f1d402fd24074a1919b8e2de94245a3b780da6466c8cc9e0f3cc93d2db930f0fce36c7d6908cd50b626cd61e803d3f62dddad79eeb742858028ef
-  languageName: node
-  linkType: hard
-
-"@csstools/media-query-list-parser@npm:^2.1.9":
+"@csstools/media-query-list-parser@npm:^2.1.7, @csstools/media-query-list-parser@npm:^2.1.9":
   version: 2.1.9
   resolution: "@csstools/media-query-list-parser@npm:2.1.9"
   peerDependencies:
@@ -1996,16 +1970,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/selector-specificity@npm:^3.0.1":
-  version: 3.0.1
-  resolution: "@csstools/selector-specificity@npm:3.0.1"
-  peerDependencies:
-    postcss-selector-parser: ^6.0.13
-  checksum: 10c0/4280f494726d5e38de74e28dee2ff74ec86244560dff4edeec3ddff3ac73c774c19535bd1bb70cad77949bfb359cf87e977d0ec3264591e3b7260342a20dd84f
-  languageName: node
-  linkType: hard
-
-"@csstools/selector-specificity@npm:^3.0.2":
+"@csstools/selector-specificity@npm:^3.0.1, @csstools/selector-specificity@npm:^3.0.2":
   version: 3.0.2
   resolution: "@csstools/selector-specificity@npm:3.0.2"
   peerDependencies:
@@ -6698,9 +6663,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cssnano-preset-default@npm:^6.1.0":
-  version: 6.1.0
-  resolution: "cssnano-preset-default@npm:6.1.0"
+"cssnano-preset-default@npm:^6.1.1":
+  version: 6.1.1
+  resolution: "cssnano-preset-default@npm:6.1.1"
   dependencies:
     browserslist: "npm:^4.23.0"
     css-declaration-sorter: "npm:^7.1.1"
@@ -6712,12 +6677,12 @@ __metadata:
     postcss-discard-duplicates: "npm:^6.0.3"
     postcss-discard-empty: "npm:^6.0.3"
     postcss-discard-overridden: "npm:^6.0.2"
-    postcss-merge-longhand: "npm:^6.0.4"
-    postcss-merge-rules: "npm:^6.1.0"
-    postcss-minify-font-values: "npm:^6.0.3"
+    postcss-merge-longhand: "npm:^6.0.5"
+    postcss-merge-rules: "npm:^6.1.1"
+    postcss-minify-font-values: "npm:^6.1.0"
     postcss-minify-gradients: "npm:^6.0.3"
     postcss-minify-params: "npm:^6.1.0"
-    postcss-minify-selectors: "npm:^6.0.3"
+    postcss-minify-selectors: "npm:^6.0.4"
     postcss-normalize-charset: "npm:^6.0.2"
     postcss-normalize-display-values: "npm:^6.0.2"
     postcss-normalize-positions: "npm:^6.0.2"
@@ -6731,10 +6696,10 @@ __metadata:
     postcss-reduce-initial: "npm:^6.1.0"
     postcss-reduce-transforms: "npm:^6.0.2"
     postcss-svgo: "npm:^6.0.3"
-    postcss-unique-selectors: "npm:^6.0.3"
+    postcss-unique-selectors: "npm:^6.0.4"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/47b7026b66b80a03f043929f825f48a13ed3a4086a6f335f25312c77fe73977a74cf718a486f91d9513b652e7d34312394380141c3bf6b8c8027ebc96710b6f6
+  checksum: 10c0/dc5927c8538778f859b781dc1fb10f0082cd7b3afdba30e835e472dbf51724d4f18e5170587761150142284a371d6c9d2c3b51d29826c08d2b9dd86a929597ee
   languageName: node
   linkType: hard
 
@@ -6748,14 +6713,14 @@ __metadata:
   linkType: hard
 
 "cssnano@npm:^6.0.1":
-  version: 6.1.0
-  resolution: "cssnano@npm:6.1.0"
+  version: 6.1.1
+  resolution: "cssnano@npm:6.1.1"
   dependencies:
-    cssnano-preset-default: "npm:^6.1.0"
+    cssnano-preset-default: "npm:^6.1.1"
     lilconfig: "npm:^3.1.1"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/ffe0d8c9110cce01692f51d21ae2fe6d319f2329989d28ef0dddb67a6fba2780c525f00682f0788bdbba380f37893d27ee870b3e99fb97c1fb8edccbd68a1d92
+  checksum: 10c0/2db52c2f5e314f05efec8977de392886ef0e7e08568ac45446f2303218180e317cee64c6c0c6d2c1d70a7f339fcead75384e09e187b88ccacd7f9fd51919fdf1
   languageName: node
   linkType: hard
 
@@ -13422,40 +13387,40 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-merge-longhand@npm:^6.0.4":
-  version: 6.0.4
-  resolution: "postcss-merge-longhand@npm:6.0.4"
+"postcss-merge-longhand@npm:^6.0.5":
+  version: 6.0.5
+  resolution: "postcss-merge-longhand@npm:6.0.5"
   dependencies:
     postcss-value-parser: "npm:^4.2.0"
-    stylehacks: "npm:^6.1.0"
+    stylehacks: "npm:^6.1.1"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/6c05cfe60d86cb0b6f40abe4649e1c0c21cf416fbf17aa15f04c315fcef4887827db5ef2593eca27b2b14127f5338ab179b147940c22315b5a9bcb0bdbbfa768
+  checksum: 10c0/5a223a7f698c05ab42e9997108a7ff27ea1e0c33a11a353d65a04fc89c3b5b750b9e749550d76b6406329117a055adfc79dde7fee48dca5c8e167a2854ae3fea
   languageName: node
   linkType: hard
 
-"postcss-merge-rules@npm:^6.1.0":
-  version: 6.1.0
-  resolution: "postcss-merge-rules@npm:6.1.0"
+"postcss-merge-rules@npm:^6.1.1":
+  version: 6.1.1
+  resolution: "postcss-merge-rules@npm:6.1.1"
   dependencies:
     browserslist: "npm:^4.23.0"
     caniuse-api: "npm:^3.0.0"
     cssnano-utils: "npm:^4.0.2"
-    postcss-selector-parser: "npm:^6.0.15"
+    postcss-selector-parser: "npm:^6.0.16"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/3ce76c87e29003fe46fbeba64348ed61d50d8966cfd56ec59b70b6fbf2e2ea8866b8399eec09e036fc636c84207ba12037a1dbc1374fd313a885511947699cad
+  checksum: 10c0/6d8952dbb19b1e59bf5affe0871fa1be6515103466857cff5af879d6cf619659f8642ec7a931cabb7cdbd393d8c1e91748bf70bee70fa3edea010d4e25786d04
   languageName: node
   linkType: hard
 
-"postcss-minify-font-values@npm:^6.0.3":
-  version: 6.0.3
-  resolution: "postcss-minify-font-values@npm:6.0.3"
+"postcss-minify-font-values@npm:^6.1.0":
+  version: 6.1.0
+  resolution: "postcss-minify-font-values@npm:6.1.0"
   dependencies:
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/c1ae31099e3ae79169405d3d46cd49cff35c70c63d1f36f24b16fcce43999c130db396e1fde071a375bd5b4853b14058111034a8da278a3a31f9ca12e091116e
+  checksum: 10c0/0d6567170c22a7db42096b5eac298f041614890fbe01759a9fa5ccda432f2bb09efd399d92c11bf6675ae13ccd259db4602fad3c358317dee421df5f7ab0a003
   languageName: node
   linkType: hard
 
@@ -13485,14 +13450,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-minify-selectors@npm:^6.0.3":
-  version: 6.0.3
-  resolution: "postcss-minify-selectors@npm:6.0.3"
+"postcss-minify-selectors@npm:^6.0.4":
+  version: 6.0.4
+  resolution: "postcss-minify-selectors@npm:6.0.4"
   dependencies:
-    postcss-selector-parser: "npm:^6.0.15"
+    postcss-selector-parser: "npm:^6.0.16"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/6abc83edf3fd746979ef709182fd613a764c5c2f68ae20aaa1b38940153a1078c0b270d657fe3bcfe6cda44b61f5af762fe9b31b8b62f63b897bfc2d2bc02b88
+  checksum: 10c0/695ec2e1e3a7812b0cabe1105d0ed491760be3d8e9433914fb5af1fc30a84e6dc24089cd31b7e300de620b8e7adf806526c1acf8dd14077a7d1d2820c60a327c
   languageName: node
   linkType: hard
 
@@ -13852,13 +13817,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-selector-parser@npm:^6.0.11, postcss-selector-parser@npm:^6.0.13, postcss-selector-parser@npm:^6.0.15, postcss-selector-parser@npm:^6.0.2, postcss-selector-parser@npm:^6.0.4":
-  version: 6.0.15
-  resolution: "postcss-selector-parser@npm:6.0.15"
+"postcss-selector-parser@npm:^6.0.11, postcss-selector-parser@npm:^6.0.13, postcss-selector-parser@npm:^6.0.15, postcss-selector-parser@npm:^6.0.16, postcss-selector-parser@npm:^6.0.2, postcss-selector-parser@npm:^6.0.4":
+  version: 6.0.16
+  resolution: "postcss-selector-parser@npm:6.0.16"
   dependencies:
     cssesc: "npm:^3.0.0"
     util-deprecate: "npm:^1.0.2"
-  checksum: 10c0/48b425d6cef497bcf6b7d136f6fd95cfca43026955e07ec9290d3c15457de3a862dbf251dd36f42c07a0d5b5ab6f31e41acefeff02528995a989b955505e440b
+  checksum: 10c0/0e11657cb3181aaf9ff67c2e59427c4df496b4a1b6a17063fae579813f80af79d444bf38f82eeb8b15b4679653fd3089e66ef0283f9aab01874d885e6cf1d2cf
   languageName: node
   linkType: hard
 
@@ -13874,14 +13839,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-unique-selectors@npm:^6.0.3":
-  version: 6.0.3
-  resolution: "postcss-unique-selectors@npm:6.0.3"
+"postcss-unique-selectors@npm:^6.0.4":
+  version: 6.0.4
+  resolution: "postcss-unique-selectors@npm:6.0.4"
   dependencies:
-    postcss-selector-parser: "npm:^6.0.15"
+    postcss-selector-parser: "npm:^6.0.16"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/884c5da4c3bfdacf6a61bb3bd23d212e61d2b3e99ba5099d4d646d18970d2c72d8f6bd8f2ab244ee68d7214e576dc3fd9004fc946ff872e745a965da29f7b18b
+  checksum: 10c0/bfb99d8a7c675c93f2e65c9d9d563477bfd46fdce9e2727d42d57982b31ccbaaf944e8034bfbefe48b3119e77fba7eb1b181c19b91cb3a5448058fa66a7c9ae9
   languageName: node
   linkType: hard
 
@@ -16382,15 +16347,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"stylehacks@npm:^6.1.0":
-  version: 6.1.0
-  resolution: "stylehacks@npm:6.1.0"
+"stylehacks@npm:^6.1.1":
+  version: 6.1.1
+  resolution: "stylehacks@npm:6.1.1"
   dependencies:
     browserslist: "npm:^4.23.0"
-    postcss-selector-parser: "npm:^6.0.15"
+    postcss-selector-parser: "npm:^6.0.16"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/0e9624d2b12d00d5593e3ef9ef8ed1f4c2029087b4862567cfab9ea3d3fc21efeb9aa00251c13defdfff4481abff8d6e0c48e3e27fac967c959acc7dcb0d5b67
+  checksum: 10c0/2dd2bccfd8311ff71492e63a7b8b86c3d7b1fff55d4ba5a2357aff97743e633d351cdc2f5ae3c0057637d00dab4ef5fc5b218a1b370e4585a41df22b5a5128be
   languageName: node
   linkType: hard
 

From 99c9db5f670344dac6e1c2271b466c071f195c46 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 20 Mar 2024 15:48:24 +0000
Subject: [PATCH 0541/2191] Update babel monorepo to v7.24.3 (#29660)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 72 +++++++++++++++++++++++++++----------------------------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 20e40c4b52de66..4336dcb977e395 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -42,13 +42,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.10.4, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.23.5, @babel/code-frame@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/code-frame@npm:7.24.1"
+"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.10.4, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.23.5, @babel/code-frame@npm:^7.24.1, @babel/code-frame@npm:^7.24.2":
+  version: 7.24.2
+  resolution: "@babel/code-frame@npm:7.24.2"
   dependencies:
-    "@babel/highlight": "npm:^7.24.1"
+    "@babel/highlight": "npm:^7.24.2"
     picocolors: "npm:^1.0.0"
-  checksum: 10c0/c92f4244538089c95f0322c5e8f6c2287529a576ae9ab254366a073c8720ecb537e7009d5d79a6a5698d3b658b298fc77691c05608cafbe4957cab03033ada15
+  checksum: 10c0/d1d4cba89475ab6aab7a88242e1fd73b15ecb9f30c109b69752956434d10a26a52cbd37727c4eca104b6d45227bd1dfce39a6a6f4a14c9b2f07f871e968cf406
   languageName: node
   linkType: hard
 
@@ -60,11 +60,11 @@ __metadata:
   linkType: hard
 
 "@babel/core@npm:^7.10.4, @babel/core@npm:^7.11.1, @babel/core@npm:^7.11.6, @babel/core@npm:^7.12.3, @babel/core@npm:^7.22.1":
-  version: 7.24.1
-  resolution: "@babel/core@npm:7.24.1"
+  version: 7.24.3
+  resolution: "@babel/core@npm:7.24.3"
   dependencies:
     "@ampproject/remapping": "npm:^2.2.0"
-    "@babel/code-frame": "npm:^7.24.1"
+    "@babel/code-frame": "npm:^7.24.2"
     "@babel/generator": "npm:^7.24.1"
     "@babel/helper-compilation-targets": "npm:^7.23.6"
     "@babel/helper-module-transforms": "npm:^7.23.3"
@@ -78,7 +78,7 @@ __metadata:
     gensync: "npm:^1.0.0-beta.2"
     json5: "npm:^2.2.3"
     semver: "npm:^6.3.1"
-  checksum: 10c0/b085b0bc65c225f20b9d5f7b05c8b127c005a73c355d4a7480f099de5d6757abafa7f60786eb95e6d098a6b5c34618e7b0950d60ef55139db04d8767d410e0a9
+  checksum: 10c0/e6e756b6de27d0312514a005688fa1915c521ad4269a388913eff2120a546538078f8488d6d16e86f851872f263cb45a6bbae08738297afb9382600d2ac342a9
   languageName: node
   linkType: hard
 
@@ -217,12 +217,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-module-imports@npm:^7.0.0-beta.49, @babel/helper-module-imports@npm:^7.10.4, @babel/helper-module-imports@npm:^7.16.7, @babel/helper-module-imports@npm:^7.22.15, @babel/helper-module-imports@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/helper-module-imports@npm:7.24.1"
+"@babel/helper-module-imports@npm:^7.0.0-beta.49, @babel/helper-module-imports@npm:^7.10.4, @babel/helper-module-imports@npm:^7.16.7, @babel/helper-module-imports@npm:^7.22.15, @babel/helper-module-imports@npm:^7.24.1, @babel/helper-module-imports@npm:^7.24.3":
+  version: 7.24.3
+  resolution: "@babel/helper-module-imports@npm:7.24.3"
   dependencies:
     "@babel/types": "npm:^7.24.0"
-  checksum: 10c0/9242a9af73e7eb3fe106d7e55c157149f7f38df6494980744e99fc608103c2ee20726df9596fae722c57ae89c9c304200673b733c3c1c5312385ff26ebd2a4fa
+  checksum: 10c0/052c188adcd100f5e8b6ff0c9643ddaabc58b6700d3bbbc26804141ad68375a9f97d9d173658d373d31853019e65f62610239e3295cdd58e573bdcb2fded188d
   languageName: node
   linkType: hard
 
@@ -353,15 +353,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/highlight@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/highlight@npm:7.24.1"
+"@babel/highlight@npm:^7.24.2":
+  version: 7.24.2
+  resolution: "@babel/highlight@npm:7.24.2"
   dependencies:
     "@babel/helper-validator-identifier": "npm:^7.22.20"
     chalk: "npm:^2.4.2"
     js-tokens: "npm:^4.0.0"
     picocolors: "npm:^1.0.0"
-  checksum: 10c0/39520f655101245efd44a6e5997e73e2b977f8e2011897022ec81fa5b0366dbfef5313bdebadbd08186f52b7e9c21b38ba265cc78caa0c6a8c894461e7a70430
+  checksum: 10c0/98ce00321daedeed33a4ed9362dc089a70375ff1b3b91228b9f05e6591d387a81a8cba68886e207861b8871efa0bc997ceabdd9c90f6cce3ee1b2f7f941b42db
   languageName: node
   linkType: hard
 
@@ -662,9 +662,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-async-generator-functions@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-async-generator-functions@npm:7.24.1"
+"@babel/plugin-transform-async-generator-functions@npm:^7.24.3":
+  version: 7.24.3
+  resolution: "@babel/plugin-transform-async-generator-functions@npm:7.24.3"
   dependencies:
     "@babel/helper-environment-visitor": "npm:^7.22.20"
     "@babel/helper-plugin-utils": "npm:^7.24.0"
@@ -672,7 +672,7 @@ __metadata:
     "@babel/plugin-syntax-async-generators": "npm:^7.8.4"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/c207cb6b3b7dcb5cd9b22ce5a063493ec7534a21375cb987ad079eee6cc5cae573bd3c97af91fbf0ee47cae1d3f8632c4387885aeab0eedece5652dc4e6b9f1c
+  checksum: 10c0/55ceed059f819dcccbfe69600bfa1c055ada466bd54eda117cfdd2cf773dd85799e2f6556e4a559b076e93b9704abcca2aef9d72aad7dc8a5d3d17886052f1d3
   languageName: node
   linkType: hard
 
@@ -1200,10 +1200,10 @@ __metadata:
   linkType: hard
 
 "@babel/plugin-transform-runtime@npm:^7.22.4":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-runtime@npm:7.24.1"
+  version: 7.24.3
+  resolution: "@babel/plugin-transform-runtime@npm:7.24.3"
   dependencies:
-    "@babel/helper-module-imports": "npm:^7.24.1"
+    "@babel/helper-module-imports": "npm:^7.24.3"
     "@babel/helper-plugin-utils": "npm:^7.24.0"
     babel-plugin-polyfill-corejs2: "npm:^0.4.10"
     babel-plugin-polyfill-corejs3: "npm:^0.10.1"
@@ -1211,7 +1211,7 @@ __metadata:
     semver: "npm:^6.3.1"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/54e4dbc7aa6fd6c338c657108418f10301e88bbc4c00675f901d529d3bbf578e6a438076bc57c1efdb433853dea1d7c1a6ebaa18f936debc1fd9e25f7553c33a
+  checksum: 10c0/ee01967bf405d84bd95ca4089166a18fb23fe9851a6da53dcf712a7f8ba003319996f21f320d568ec76126e18adfaee978206ccda86eef7652d47cc9a052e75e
   languageName: node
   linkType: hard
 
@@ -1333,8 +1333,8 @@ __metadata:
   linkType: hard
 
 "@babel/preset-env@npm:^7.11.0, @babel/preset-env@npm:^7.12.1, @babel/preset-env@npm:^7.22.4":
-  version: 7.24.1
-  resolution: "@babel/preset-env@npm:7.24.1"
+  version: 7.24.3
+  resolution: "@babel/preset-env@npm:7.24.3"
   dependencies:
     "@babel/compat-data": "npm:^7.24.1"
     "@babel/helper-compilation-targets": "npm:^7.23.6"
@@ -1363,7 +1363,7 @@ __metadata:
     "@babel/plugin-syntax-top-level-await": "npm:^7.14.5"
     "@babel/plugin-syntax-unicode-sets-regex": "npm:^7.18.6"
     "@babel/plugin-transform-arrow-functions": "npm:^7.24.1"
-    "@babel/plugin-transform-async-generator-functions": "npm:^7.24.1"
+    "@babel/plugin-transform-async-generator-functions": "npm:^7.24.3"
     "@babel/plugin-transform-async-to-generator": "npm:^7.24.1"
     "@babel/plugin-transform-block-scoped-functions": "npm:^7.24.1"
     "@babel/plugin-transform-block-scoping": "npm:^7.24.1"
@@ -1412,13 +1412,13 @@ __metadata:
     "@babel/plugin-transform-unicode-sets-regex": "npm:^7.24.1"
     "@babel/preset-modules": "npm:0.1.6-no-external-plugins"
     babel-plugin-polyfill-corejs2: "npm:^0.4.10"
-    babel-plugin-polyfill-corejs3: "npm:^0.10.1"
+    babel-plugin-polyfill-corejs3: "npm:^0.10.4"
     babel-plugin-polyfill-regenerator: "npm:^0.6.1"
     core-js-compat: "npm:^3.31.0"
     semver: "npm:^6.3.1"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/c9fd96ed8561ac3f8d2e490face5b763ea05a7908770a52fe2ffa0e72581c5cd8ea5c016a85f47775fc3584c6d748eea62044c19ae3f4edf11ffc1e1e9c8bffd
+  checksum: 10c0/abd6f3b6c6a71d4ff766cda5b51467677a811240d022492e651065e26ce1a8eb2067eabe5653fce80dda9c5c204fb7b89b419578d7e86eaaf7970929ee7b4885
   languageName: node
   linkType: hard
 
@@ -5218,15 +5218,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"babel-plugin-polyfill-corejs3@npm:^0.10.1":
-  version: 0.10.1
-  resolution: "babel-plugin-polyfill-corejs3@npm:0.10.1"
+"babel-plugin-polyfill-corejs3@npm:^0.10.1, babel-plugin-polyfill-corejs3@npm:^0.10.4":
+  version: 0.10.4
+  resolution: "babel-plugin-polyfill-corejs3@npm:0.10.4"
   dependencies:
     "@babel/helper-define-polyfill-provider": "npm:^0.6.1"
-    core-js-compat: "npm:^3.36.0"
+    core-js-compat: "npm:^3.36.1"
   peerDependencies:
     "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0
-  checksum: 10c0/54ad0b2d2eb44ae8cc20485ef3be6097e262e02ee76003f39734af5e421743dcff478bfc3cc8fef7cda298e1b507c618ff161c47672fd1ae598df0a2ca48b4e1
+  checksum: 10c0/31b92cd3dfb5b417da8dfcf0deaa4b8b032b476d7bb31ca51c66127cf25d41e89260e89d17bc004b2520faa38aa9515fafabf81d89f9d4976e9dc1163e4a7c41
   languageName: node
   linkType: hard
 
@@ -6299,7 +6299,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"core-js-compat@npm:^3.31.0, core-js-compat@npm:^3.36.0":
+"core-js-compat@npm:^3.31.0, core-js-compat@npm:^3.36.1":
   version: 3.36.1
   resolution: "core-js-compat@npm:3.36.1"
   dependencies:

From d4449cc682d057a4c6873b6e13512c38e571372d Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 20 Mar 2024 17:08:34 +0100
Subject: [PATCH 0542/2191] Fix account_relationship_severance_events unique
 indexes (#29665)

---
 app/models/account_relationship_severance_event.rb          | 1 +
 ...20140159_create_account_relationship_severance_events.rb | 6 ++++--
 db/schema.rb                                                | 5 +++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/models/account_relationship_severance_event.rb b/app/models/account_relationship_severance_event.rb
index 0cf3fb117d4230..32b185e3af6c70 100644
--- a/app/models/account_relationship_severance_event.rb
+++ b/app/models/account_relationship_severance_event.rb
@@ -8,6 +8,7 @@
 #  id                              :bigint(8)        not null, primary key
 #  account_id                      :bigint(8)        not null
 #  relationship_severance_event_id :bigint(8)        not null
+#  relationships_count             :integer          default(0), not null
 #  created_at                      :datetime         not null
 #  updated_at                      :datetime         not null
 #
diff --git a/db/migrate/20240320140159_create_account_relationship_severance_events.rb b/db/migrate/20240320140159_create_account_relationship_severance_events.rb
index 160ef762136525..5262c508fe3f3f 100644
--- a/db/migrate/20240320140159_create_account_relationship_severance_events.rb
+++ b/db/migrate/20240320140159_create_account_relationship_severance_events.rb
@@ -3,11 +3,13 @@
 class CreateAccountRelationshipSeveranceEvents < ActiveRecord::Migration[7.1]
   def change
     create_table :account_relationship_severance_events do |t|
-      t.belongs_to :account, foreign_key: { on_delete: :cascade }, null: false, index: { unique: true }
-      t.belongs_to :relationship_severance_event, foreign_key: { on_delete: :cascade }, null: false, index: { unique: true }
+      t.belongs_to :account, foreign_key: { on_delete: :cascade }, null: false
+      t.belongs_to :relationship_severance_event, foreign_key: { on_delete: :cascade }, null: false
 
       t.integer :relationships_count, default: 0, null: false
 
+      t.index [:account_id, :relationship_severance_event_id], unique: true
+
       t.timestamps
     end
   end
diff --git a/db/schema.rb b/db/schema.rb
index 1e1d99f26b28c3..9756da1af88067 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -96,8 +96,9 @@
     t.integer "relationships_count", default: 0, null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
-    t.index ["account_id"], name: "index_account_relationship_severance_events_on_account_id", unique: true
-    t.index ["relationship_severance_event_id"], name: "idx_on_relationship_severance_event_id_403f53e707", unique: true
+    t.index ["account_id", "relationship_severance_event_id"], name: "idx_on_account_id_relationship_severance_event_id_7bd82bf20e", unique: true
+    t.index ["account_id"], name: "index_account_relationship_severance_events_on_account_id"
+    t.index ["relationship_severance_event_id"], name: "idx_on_relationship_severance_event_id_403f53e707"
   end
 
   create_table "account_stats", force: :cascade do |t|

From 954b470fbce3fbe4b9b42992b03425fa24d6a2ad Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 20 Mar 2024 17:48:24 +0100
Subject: [PATCH 0543/2191] Fix error when attempting to delete posts that
 triggered a notification request (#29666)

---
 app/models/notification_request.rb                         | 2 +-
 ..._change_notification_request_last_status_id_nullable.rb | 7 +++++++
 db/schema.rb                                               | 4 ++--
 3 files changed, 10 insertions(+), 3 deletions(-)
 create mode 100644 db/migrate/20240320163441_change_notification_request_last_status_id_nullable.rb

diff --git a/app/models/notification_request.rb b/app/models/notification_request.rb
index 6901b3985b9118..6e9cae66255032 100644
--- a/app/models/notification_request.rb
+++ b/app/models/notification_request.rb
@@ -7,7 +7,7 @@
 #  id                  :bigint(8)        not null, primary key
 #  account_id          :bigint(8)        not null
 #  from_account_id     :bigint(8)        not null
-#  last_status_id      :bigint(8)        not null
+#  last_status_id      :bigint(8)
 #  notifications_count :bigint(8)        default(0), not null
 #  dismissed           :boolean          default(FALSE), not null
 #  created_at          :datetime         not null
diff --git a/db/migrate/20240320163441_change_notification_request_last_status_id_nullable.rb b/db/migrate/20240320163441_change_notification_request_last_status_id_nullable.rb
new file mode 100644
index 00000000000000..afc3df5aa441ad
--- /dev/null
+++ b/db/migrate/20240320163441_change_notification_request_last_status_id_nullable.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class ChangeNotificationRequestLastStatusIdNullable < ActiveRecord::Migration[7.1]
+  def change
+    change_column_null :notification_requests, :last_status_id, true
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 9756da1af88067..cd66ff750b9f51 100644
--- 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_03_20_140159) do
+ActiveRecord::Schema[7.1].define(version: 2024_03_20_163441) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -700,7 +700,7 @@
   create_table "notification_requests", id: :bigint, default: -> { "timestamp_id('notification_requests'::text)" }, force: :cascade do |t|
     t.bigint "account_id", null: false
     t.bigint "from_account_id", null: false
-    t.bigint "last_status_id", null: false
+    t.bigint "last_status_id"
     t.bigint "notifications_count", default: 0, null: false
     t.boolean "dismissed", default: false, null: false
     t.datetime "created_at", null: false

From 98a2bb8be2e47d26b6306dcbe82c82a1f17f0813 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 20 Mar 2024 18:02:09 +0100
Subject: [PATCH 0544/2191] Fix issue with severed relationships notifications
 (#29668)

---
 app/models/account_relationship_severance_event.rb | 2 +-
 app/models/notification.rb                         | 2 +-
 app/serializers/rest/notification_serializer.rb    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/models/account_relationship_severance_event.rb b/app/models/account_relationship_severance_event.rb
index 32b185e3af6c70..e621b547589db1 100644
--- a/app/models/account_relationship_severance_event.rb
+++ b/app/models/account_relationship_severance_event.rb
@@ -16,7 +16,7 @@ class AccountRelationshipSeveranceEvent < ApplicationRecord
   belongs_to :account
   belongs_to :relationship_severance_event
 
-  delegate :severed_relationships, :type, :target_name, :purged, to: :relationship_severance_event, prefix: false
+  delegate :severed_relationships, :type, :target_name, :purged?, to: :relationship_severance_event, prefix: false
 
   before_create :set_relationships_count!
 
diff --git a/app/models/notification.rb b/app/models/notification.rb
index 8ee7e77258899d..b2376c78a3df2b 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -89,7 +89,7 @@ class Notification < ApplicationRecord
     belongs_to :favourite, inverse_of: :notification
     belongs_to :poll, inverse_of: false
     belongs_to :report, inverse_of: false
-    belongs_to :relationship_severance_event, inverse_of: false
+    belongs_to :account_relationship_severance_event, inverse_of: false
   end
 
   validates :type, inclusion: { in: TYPES }
diff --git a/app/serializers/rest/notification_serializer.rb b/app/serializers/rest/notification_serializer.rb
index d7b88b7c37b0db..36a0adfec46d5e 100644
--- a/app/serializers/rest/notification_serializer.rb
+++ b/app/serializers/rest/notification_serializer.rb
@@ -6,7 +6,7 @@ class REST::NotificationSerializer < ActiveModel::Serializer
   belongs_to :from_account, key: :account, serializer: REST::AccountSerializer
   belongs_to :target_status, key: :status, if: :status_type?, serializer: REST::StatusSerializer
   belongs_to :report, if: :report_type?, serializer: REST::ReportSerializer
-  belongs_to :relationship_severance_event, key: :event, if: :relationship_severance_event?, serializer: REST::AccountRelationshipSeveranceEventSerializer
+  belongs_to :account_relationship_severance_event, key: :event, if: :relationship_severance_event?, serializer: REST::AccountRelationshipSeveranceEventSerializer
 
   def id
     object.id.to_s

From f4d753aedfd0916cba554e5cce42b854072de642 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 20 Mar 2024 18:14:53 +0100
Subject: [PATCH 0545/2191] Fix error in severed relationship event serializer
 (#29670)

---
 app/models/account_relationship_severance_event.rb | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/models/account_relationship_severance_event.rb b/app/models/account_relationship_severance_event.rb
index e621b547589db1..84b8b1c65ada66 100644
--- a/app/models/account_relationship_severance_event.rb
+++ b/app/models/account_relationship_severance_event.rb
@@ -16,7 +16,13 @@ class AccountRelationshipSeveranceEvent < ApplicationRecord
   belongs_to :account
   belongs_to :relationship_severance_event
 
-  delegate :severed_relationships, :type, :target_name, :purged?, to: :relationship_severance_event, prefix: false
+  delegate :severed_relationships,
+           :type,
+           :target_name,
+           :purged,
+           :purged?,
+           to: :relationship_severance_event,
+           prefix: false
 
   before_create :set_relationships_count!
 

From be52633ee4ce4a14b48f82156cf64c0a3eb9835b Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 20 Mar 2024 18:21:03 +0100
Subject: [PATCH 0546/2191] Change back button to always appear in advanced web
 UI (#29669)

---
 .../mastodon/components/column_header.jsx     | 23 ++++++++-----------
 .../features/follow_requests/index.jsx        |  2 +-
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/app/javascript/mastodon/components/column_header.jsx b/app/javascript/mastodon/components/column_header.jsx
index 7fd646690d2aaa..a7d07ffdb07108 100644
--- a/app/javascript/mastodon/components/column_header.jsx
+++ b/app/javascript/mastodon/components/column_header.jsx
@@ -13,7 +13,7 @@ import ChevronRightIcon from '@/material-icons/400-24px/chevron_right.svg?react'
 import CloseIcon from '@/material-icons/400-24px/close.svg?react';
 import SettingsIcon from '@/material-icons/400-24px/settings.svg?react';
 import { Icon }  from 'mastodon/components/icon';
-import { ButtonInTabsBar, useColumnsContext } from 'mastodon/features/ui/util/columns_context';
+import { ButtonInTabsBar } from 'mastodon/features/ui/util/columns_context';
 import { WithRouterPropTypes } from 'mastodon/utils/react_router';
 
 import { useAppHistory } from './router';
@@ -26,10 +26,9 @@ const messages = defineMessages({
   back: { id: 'column_back_button.label', defaultMessage: 'Back' },
 });
 
-const BackButton = ({ pinned, show, onlyIcon }) => {
+const BackButton = ({ onlyIcon }) => {
   const history = useAppHistory();
   const intl = useIntl();
-  const { multiColumn } = useColumnsContext();
 
   const handleBackClick = useCallback(() => {
     if (history.location?.state?.fromMastodon) {
@@ -39,10 +38,6 @@ const BackButton = ({ pinned, show, onlyIcon }) => {
     }
   }, [history]);
 
-  const showButton = history && !pinned && ((multiColumn && history.location?.state?.fromMastodon) || show);
-
-  if (!showButton) return null;
-
   return (
     <button onClick={handleBackClick} className={classNames('column-header__back-button', { 'compact': onlyIcon })} aria-label={intl.formatMessage(messages.back)}>
       <Icon id='chevron-left' icon={ArrowBackIcon} className='column-back-button__icon' />
@@ -52,8 +47,6 @@ const BackButton = ({ pinned, show, onlyIcon }) => {
 };
 
 BackButton.propTypes = {
-  pinned: PropTypes.bool,
-  show: PropTypes.bool,
   onlyIcon: PropTypes.bool,
 };
 
@@ -118,7 +111,7 @@ class ColumnHeader extends PureComponent {
   };
 
   render () {
-    const { title, icon, iconComponent, active, children, pinned, multiColumn, extraButton, showBackButton, intl: { formatMessage }, placeholder, appendContent, collapseIssues } = this.props;
+    const { title, icon, iconComponent, active, children, pinned, multiColumn, extraButton, showBackButton, intl: { formatMessage }, placeholder, appendContent, collapseIssues, history } = this.props;
     const { collapsed, animating } = this.state;
 
     const wrapperClassName = classNames('column-header__wrapper', {
@@ -161,7 +154,9 @@ class ColumnHeader extends PureComponent {
       pinButton = <button className='text-btn column-header__setting-btn' onClick={this.handlePin}><Icon id='plus' icon={AddIcon} /> <FormattedMessage id='column_header.pin' defaultMessage='Pin' /></button>;
     }
 
-    backButton = <BackButton pinned={pinned} show={showBackButton} onlyIcon={!!title} />;
+    if (history && !pinned && ((multiColumn && history.location?.state?.fromMastodon) || showBackButton)) {
+      backButton = <BackButton onlyIcon={!!title} />;
+    }
 
     const collapsedContent = [
       extraContent,
@@ -199,16 +194,16 @@ class ColumnHeader extends PureComponent {
         <h1 className={buttonClassName}>
           {hasTitle && (
             <>
-              {showBackButton && backButton}
+              {backButton}
 
               <button onClick={this.handleTitleClick} className='column-header__title'>
-                {!showBackButton && <Icon id={icon} icon={iconComponent} className='column-header__icon' />}
+                {!backButton && <Icon id={icon} icon={iconComponent} className='column-header__icon' />}
                 {title}
               </button>
             </>
           )}
 
-          {!hasTitle && showBackButton && backButton}
+          {!hasTitle && backButton}
 
           <div className='column-header__buttons'>
             {extraButton}
diff --git a/app/javascript/mastodon/features/follow_requests/index.jsx b/app/javascript/mastodon/features/follow_requests/index.jsx
index 7d651f2ca69c24..a8f40a31d0d007 100644
--- a/app/javascript/mastodon/features/follow_requests/index.jsx
+++ b/app/javascript/mastodon/features/follow_requests/index.jsx
@@ -68,7 +68,7 @@ class FollowRequests extends ImmutablePureComponent {
     );
 
     return (
-      <Column bindToDocument={!multiColumn} icon='user-plus' iconComponent={PersonAddIcon} heading={intl.formatMessage(messages.heading)} alwaysShowBackButton>
+      <Column bindToDocument={!multiColumn} icon='user-plus' iconComponent={PersonAddIcon} heading={intl.formatMessage(messages.heading)}>
         <ScrollableList
           scrollKey='follow_requests'
           onLoadMore={this.handleLoadMore}

From 49089817b087f75e9bab1ab933e8727230fc34b4 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 20 Mar 2024 14:31:31 +0100
Subject: [PATCH 0547/2191] =?UTF-8?q?[Glitch]=20Fix=20=E2=80=9CExplore?=
 =?UTF-8?q?=E2=80=9D=20icon=20in=20navigation=20bar=20not=20being=20filled?=
 =?UTF-8?q?=20when=20selected?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Port 3211e960ac793b1b9431a7eea40b385272f1a2a6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../glitch/features/ui/components/navigation_panel.jsx         | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/javascript/flavours/glitch/features/ui/components/navigation_panel.jsx b/app/javascript/flavours/glitch/features/ui/components/navigation_panel.jsx
index 7ac748e4389ab6..fa1df612fa3830 100644
--- a/app/javascript/flavours/glitch/features/ui/components/navigation_panel.jsx
+++ b/app/javascript/flavours/glitch/features/ui/components/navigation_panel.jsx
@@ -8,6 +8,7 @@ import { useSelector, useDispatch } from 'react-redux';
 
 import BookmarksActiveIcon from '@/material-icons/400-24px/bookmarks-fill.svg?react';
 import BookmarksIcon from '@/material-icons/400-24px/bookmarks.svg?react';
+import ExploreActiveIcon from '@/material-icons/400-24px/explore-fill.svg?react';
 import ExploreIcon from '@/material-icons/400-24px/explore.svg?react';
 import HomeActiveIcon from '@/material-icons/400-24px/home-fill.svg?react';
 import HomeIcon from '@/material-icons/400-24px/home.svg?react';
@@ -143,7 +144,7 @@ class NavigationPanel extends Component {
         )}
 
         {trendsEnabled ? (
-          <ColumnLink transparent to='/explore' icon='explore' iconComponent={ExploreIcon} text={intl.formatMessage(messages.explore)} />
+          <ColumnLink transparent to='/explore' icon='explore' iconComponent={ExploreIcon} activeIconComponent={ExploreActiveIcon} text={intl.formatMessage(messages.explore)} />
         ) : (
           <ColumnLink transparent to='/search' icon='search' iconComponent={SearchIcon} text={intl.formatMessage(messages.search)} />
         )}

From 821fc5358340c242d49b6227319e6509167f43d9 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 20 Mar 2024 17:48:24 +0100
Subject: [PATCH 0548/2191] Fix error when attempting to delete posts that
 triggered a notification request (#29666)

---
 app/models/notification_request.rb                         | 2 +-
 ..._change_notification_request_last_status_id_nullable.rb | 7 +++++++
 db/schema.rb                                               | 4 ++--
 3 files changed, 10 insertions(+), 3 deletions(-)
 create mode 100644 db/migrate/20240320163441_change_notification_request_last_status_id_nullable.rb

diff --git a/app/models/notification_request.rb b/app/models/notification_request.rb
index 6901b3985b9118..6e9cae66255032 100644
--- a/app/models/notification_request.rb
+++ b/app/models/notification_request.rb
@@ -7,7 +7,7 @@
 #  id                  :bigint(8)        not null, primary key
 #  account_id          :bigint(8)        not null
 #  from_account_id     :bigint(8)        not null
-#  last_status_id      :bigint(8)        not null
+#  last_status_id      :bigint(8)
 #  notifications_count :bigint(8)        default(0), not null
 #  dismissed           :boolean          default(FALSE), not null
 #  created_at          :datetime         not null
diff --git a/db/migrate/20240320163441_change_notification_request_last_status_id_nullable.rb b/db/migrate/20240320163441_change_notification_request_last_status_id_nullable.rb
new file mode 100644
index 00000000000000..afc3df5aa441ad
--- /dev/null
+++ b/db/migrate/20240320163441_change_notification_request_last_status_id_nullable.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class ChangeNotificationRequestLastStatusIdNullable < ActiveRecord::Migration[7.1]
+  def change
+    change_column_null :notification_requests, :last_status_id, true
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index df7f84c65043bd..795a81c5ce7955 100644
--- 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_03_10_123453) do
+ActiveRecord::Schema[7.1].define(version: 2024_03_20_163441) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -689,7 +689,7 @@
   create_table "notification_requests", id: :bigint, default: -> { "timestamp_id('notification_requests'::text)" }, force: :cascade do |t|
     t.bigint "account_id", null: false
     t.bigint "from_account_id", null: false
-    t.bigint "last_status_id", null: false
+    t.bigint "last_status_id"
     t.bigint "notifications_count", default: 0, null: false
     t.boolean "dismissed", default: false, null: false
     t.datetime "created_at", null: false

From 62722238c9a03d26ddc6a7df04e734061a3ab487 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 20 Mar 2024 18:10:50 -0400
Subject: [PATCH 0549/2191] Lock `i18n` gem to version `1.14.1` (#29674)

---
 Gemfile      | 1 +
 Gemfile.lock | 1 +
 2 files changed, 2 insertions(+)

diff --git a/Gemfile b/Gemfile
index 3a1ff81d43d8f8..c19a0115388605 100644
--- a/Gemfile
+++ b/Gemfile
@@ -58,6 +58,7 @@ gem 'htmlentities', '~> 4.3'
 gem 'http', '~> 5.1'
 gem 'http_accept_language', '~> 2.1'
 gem 'httplog', '~> 1.6.2'
+gem 'i18n', '1.14.1' # TODO: Remove version when resolved: https://github.com/glebm/i18n-tasks/issues/552 / https://github.com/ruby-i18n/i18n/pull/688
 gem 'idn-ruby', require: 'idn'
 gem 'inline_svg'
 gem 'kaminari', '~> 1.2'
diff --git a/Gemfile.lock b/Gemfile.lock
index 9c5bb940bc4de8..46e8eb1e6612e5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -866,6 +866,7 @@ DEPENDENCIES
   http (~> 5.1)
   http_accept_language (~> 2.1)
   httplog (~> 1.6.2)
+  i18n (= 1.14.1)
   i18n-tasks (~> 1.0)
   idn-ruby
   inline_svg

From 39bac24cb73b249e1260c5ee29cd9ffcf482dee0 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 20 Mar 2024 18:12:11 -0400
Subject: [PATCH 0550/2191] Remove reference to deleted haml lint todo file
 (#29675)

---
 .haml-lint.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.haml-lint.yml b/.haml-lint.yml
index b94eb8b0dfa55d..2b553ca56c586f 100644
--- a/.haml-lint.yml
+++ b/.haml-lint.yml
@@ -1,5 +1,3 @@
-inherits_from: .haml-lint_todo.yml
-
 exclude:
   - 'vendor/**/*'
   - lib/templates/haml/scaffold/_form.html.haml

From 7434c9c2768a2c9776d69794f6200aa4c1e81607 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 21 Mar 2024 09:28:37 +0100
Subject: [PATCH 0551/2191] Fix the relationships controller spec, since it
 requires an extra model now (#29671)

---
 spec/requests/severed_relationships_spec.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/spec/requests/severed_relationships_spec.rb b/spec/requests/severed_relationships_spec.rb
index 4063026d79c444..05a48ca3498452 100644
--- a/spec/requests/severed_relationships_spec.rb
+++ b/spec/requests/severed_relationships_spec.rb
@@ -7,11 +7,12 @@
 
   describe 'GET severed_relationships#index' do
     let(:user) { Fabricate(:user) }
+    let(:event) { Fabricate(:account_relationship_severance_event, account: user.account) }
 
     before do
       sign_in user
 
-      Fabricate(:severed_relationship, local_account: user.account)
+      Fabricate.times(3, :severed_relationship, local_account: user.account, relationship_severance_event: event.relationship_severance_event)
     end
 
     it 'returns http success' do

From 3f363c61bc5ccd55636c0d0bda67b47f956499fb Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 21 Mar 2024 09:32:25 +0100
Subject: [PATCH 0552/2191] Update dependency postcss to v8.4.38 (#29684)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 4336dcb977e395..cef691dd0154c4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -13858,13 +13858,13 @@ __metadata:
   linkType: hard
 
 "postcss@npm:^8.2.15, postcss@npm:^8.4.24, postcss@npm:^8.4.33":
-  version: 8.4.37
-  resolution: "postcss@npm:8.4.37"
+  version: 8.4.38
+  resolution: "postcss@npm:8.4.38"
   dependencies:
     nanoid: "npm:^3.3.7"
     picocolors: "npm:^1.0.0"
     source-map-js: "npm:^1.2.0"
-  checksum: 10c0/0b5730ad0ccbceaf0faaa4a283a144adefd23254f17dbdd63be5e0b37193c7df58003f88742c04c3ae6fd60d1a5158b331a4ce926797fb21e94833ae83c6bf69
+  checksum: 10c0/955407b8f70cf0c14acf35dab3615899a2a60a26718a63c848cf3c29f2467b0533991b985a2b994430d890bd7ec2b1963e36352b0774a19143b5f591540f7c06
   languageName: node
   linkType: hard
 

From 01464074c91f9b7a720928fc4ee912be3d8002d2 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 21 Mar 2024 09:32:31 +0100
Subject: [PATCH 0553/2191] Update dependency autoprefixer to v10.4.19 (#29682)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index cef691dd0154c4..e8bb3c2eb95440 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5039,11 +5039,11 @@ __metadata:
   linkType: hard
 
 "autoprefixer@npm:^10.4.14, autoprefixer@npm:^10.4.18":
-  version: 10.4.18
-  resolution: "autoprefixer@npm:10.4.18"
+  version: 10.4.19
+  resolution: "autoprefixer@npm:10.4.19"
   dependencies:
     browserslist: "npm:^4.23.0"
-    caniuse-lite: "npm:^1.0.30001591"
+    caniuse-lite: "npm:^1.0.30001599"
     fraction.js: "npm:^4.3.7"
     normalize-range: "npm:^0.1.2"
     picocolors: "npm:^1.0.0"
@@ -5052,7 +5052,7 @@ __metadata:
     postcss: ^8.1.0
   bin:
     autoprefixer: bin/autoprefixer
-  checksum: 10c0/b6e1c1ba2fc6c09360cdcd75b00ce809c5dbe1ad4c30f0186764609a982aa5563d45965cb9e6a9d195c639a9fb1dcac2594484fc41624050195f626e9add666e
+  checksum: 10c0/fe0178eb8b1da4f15c6535cd329926609b22d1811e047371dccce50563623f8075dd06fb167daff059e4228da651b0bdff6d9b44281541eaf0ce0b79125bfd19
   languageName: node
   linkType: hard
 
@@ -5795,10 +5795,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001587, caniuse-lite@npm:^1.0.30001591":
-  version: 1.0.30001591
-  resolution: "caniuse-lite@npm:1.0.30001591"
-  checksum: 10c0/21937d341c3d75994504db21340f65573a1e847a8ab33ee4964ed493994d6552864c494ba144485459abd9c711c75c0708bc9fa19f2bff525bff75ffb0a42c3b
+"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001587, caniuse-lite@npm:^1.0.30001599":
+  version: 1.0.30001599
+  resolution: "caniuse-lite@npm:1.0.30001599"
+  checksum: 10c0/8b3b9610b5be88533a3c8d0770d6896f7b1a9fee3dbeb7339e4ee119a514c81e5e07a628a5a289a6541ca291ac78a9402f5a99cf6012139e91f379083488a8eb
   languageName: node
   linkType: hard
 

From cdd168f5d3222fc63bdbc8da36236c1b027507a8 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 21 Mar 2024 04:32:35 -0400
Subject: [PATCH 0554/2191] Update `enum` away from deprecated (#29678)

---
 app/models/relationship_severance_event.rb | 2 +-
 app/models/severed_relationship.rb         | 2 +-
 lib/mastodon/cli/maintenance.rb            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/models/relationship_severance_event.rb b/app/models/relationship_severance_event.rb
index d9775150e83f7d..30ada2576714d3 100644
--- a/app/models/relationship_severance_event.rb
+++ b/app/models/relationship_severance_event.rb
@@ -16,7 +16,7 @@ class RelationshipSeveranceEvent < ApplicationRecord
 
   has_many :severed_relationships, inverse_of: :relationship_severance_event, dependent: :delete_all
 
-  enum type: {
+  enum :type, {
     domain_block: 0,
     user_domain_block: 1,
     account_suspension: 2,
diff --git a/app/models/severed_relationship.rb b/app/models/severed_relationship.rb
index 00a913f7fc82b1..d71b2610fe3639 100644
--- a/app/models/severed_relationship.rb
+++ b/app/models/severed_relationship.rb
@@ -20,7 +20,7 @@ class SeveredRelationship < ApplicationRecord
   belongs_to :local_account, class_name: 'Account'
   belongs_to :remote_account, class_name: 'Account'
 
-  enum direction: {
+  enum :direction, {
     passive: 0, # analogous to `local_account.passive_relationships`
     active: 1, # analogous to `local_account.active_relationships`
   }
diff --git a/lib/mastodon/cli/maintenance.rb b/lib/mastodon/cli/maintenance.rb
index e6a346ae2636b7..f376bcee079ebf 100644
--- a/lib/mastodon/cli/maintenance.rb
+++ b/lib/mastodon/cli/maintenance.rb
@@ -42,7 +42,7 @@ class SoftwareUpdate < ApplicationRecord; end
     class SeveredRelationship < ApplicationRecord; end
 
     class DomainBlock < ApplicationRecord
-      enum severity: { silence: 0, suspend: 1, noop: 2 }
+      enum :severity, { silence: 0, suspend: 1, noop: 2 }
       scope :by_severity, -> { in_order_of(:severity, %w(noop silence suspend)).order(:domain) }
     end
 

From 718ee72c8073fe8851a29dc930fd78a41335906c Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 21 Mar 2024 04:32:40 -0400
Subject: [PATCH 0555/2191] Use `db_table_exists?` method in new
 cli/maintenance area (#29677)

---
 lib/mastodon/cli/maintenance.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/mastodon/cli/maintenance.rb b/lib/mastodon/cli/maintenance.rb
index f376bcee079ebf..2e7c8570789392 100644
--- a/lib/mastodon/cli/maintenance.rb
+++ b/lib/mastodon/cli/maintenance.rb
@@ -131,7 +131,7 @@ def merge_with!(other_account)
           end
         end
 
-        if ActiveRecord::Base.connection.table_exists?(:severed_relationships)
+        if db_table_exists?(:severed_relationships)
           SeveredRelationship.where(local_account_id: other_account.id).reorder(nil).find_each do |record|
             record.update_attribute(:local_account_id, id)
           rescue ActiveRecord::RecordNotUnique

From 77897cd24cbf9802bd000c88ab3c7bfb6714f968 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 21 Mar 2024 04:36:49 -0400
Subject: [PATCH 0556/2191] Use existing
 `SeveredRelationship.about_local_account` scope in more places (#29673)

---
 app/controllers/severed_relationships_controller.rb | 4 ++--
 app/models/account_relationship_severance_event.rb  | 2 +-
 app/models/concerns/account/merging.rb              | 4 ++--
 app/models/severed_relationship.rb                  | 1 +
 app/views/severed_relationships/index.html.haml     | 4 ++--
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/controllers/severed_relationships_controller.rb b/app/controllers/severed_relationships_controller.rb
index 8994fff0acc1e1..168e85e3fe4717 100644
--- a/app/controllers/severed_relationships_controller.rb
+++ b/app/controllers/severed_relationships_controller.rb
@@ -33,7 +33,7 @@ def set_event
 
   def following_data
     CSV.generate(headers: ['Account address', 'Show boosts', 'Notify on new posts', 'Languages'], write_headers: true) do |csv|
-      @event.severed_relationships.active.where(local_account: current_account).includes(:remote_account).reorder(id: :desc).each do |follow|
+      @event.severed_relationships.active.about_local_account(current_account).includes(:remote_account).reorder(id: :desc).each do |follow|
         csv << [acct(follow.target_account), follow.show_reblogs, follow.notify, follow.languages&.join(', ')]
       end
     end
@@ -41,7 +41,7 @@ def following_data
 
   def followers_data
     CSV.generate(headers: ['Account address'], write_headers: true) do |csv|
-      @event.severed_relationships.passive.where(local_account: current_account).includes(:remote_account).reorder(id: :desc).each do |follow|
+      @event.severed_relationships.passive.about_local_account(current_account).includes(:remote_account).reorder(id: :desc).each do |follow|
         csv << [acct(follow.account)]
       end
     end
diff --git a/app/models/account_relationship_severance_event.rb b/app/models/account_relationship_severance_event.rb
index 84b8b1c65ada66..20b15e28399c94 100644
--- a/app/models/account_relationship_severance_event.rb
+++ b/app/models/account_relationship_severance_event.rb
@@ -29,6 +29,6 @@ class AccountRelationshipSeveranceEvent < ApplicationRecord
   private
 
   def set_relationships_count!
-    self.relationships_count = severed_relationships.where(local_account: account).count
+    self.relationships_count = severed_relationships.about_local_account(account).count
   end
 end
diff --git a/app/models/concerns/account/merging.rb b/app/models/concerns/account/merging.rb
index ebc57a12219145..e6b147482cc6d3 100644
--- a/app/models/concerns/account/merging.rb
+++ b/app/models/concerns/account/merging.rb
@@ -48,13 +48,13 @@ def merge_with!(other_account)
       record.update_attribute(:account_warning_id, id)
     end
 
-    SeveredRelationship.where(local_account_id: other_account.id).reorder(nil).find_each do |record|
+    SeveredRelationship.about_local_account(other_account).reorder(nil).find_each do |record|
       record.update_attribute(:local_account_id, id)
     rescue ActiveRecord::RecordNotUnique
       next
     end
 
-    SeveredRelationship.where(remote_account_id: other_account.id).reorder(nil).find_each do |record|
+    SeveredRelationship.about_remote_account(other_account).reorder(nil).find_each do |record|
       record.update_attribute(:remote_account_id, id)
     rescue ActiveRecord::RecordNotUnique
       next
diff --git a/app/models/severed_relationship.rb b/app/models/severed_relationship.rb
index d71b2610fe3639..64b5b0001b751a 100644
--- a/app/models/severed_relationship.rb
+++ b/app/models/severed_relationship.rb
@@ -26,6 +26,7 @@ class SeveredRelationship < ApplicationRecord
   }
 
   scope :about_local_account, ->(account) { where(local_account: account) }
+  scope :about_remote_account, ->(account) { where(remote_account: account) }
 
   scope :active, -> { where(direction: :active) }
   scope :passive, -> { where(direction: :passive) }
diff --git a/app/views/severed_relationships/index.html.haml b/app/views/severed_relationships/index.html.haml
index 97bef8792956d4..75296d90aafc59 100644
--- a/app/views/severed_relationships/index.html.haml
+++ b/app/views/severed_relationships/index.html.haml
@@ -21,13 +21,13 @@
               %td{ rowspan: 2 }= t('severed_relationships.purged')
             - else
               %td
-                - count = event.severed_relationships.active.where(local_account: current_account).count
+                - count = event.severed_relationships.active.about_local_account(current_account).count
                 - if count.zero?
                   = t('generic.none')
                 - else
                   = table_link_to 'download', t('severed_relationships.download', count: count), following_severed_relationship_path(event, format: :csv)
               %td
-                - count = event.severed_relationships.passive.where(local_account: current_account).count
+                - count = event.severed_relationships.passive.about_local_account(current_account).count
                 - if count.zero?
                   = t('generic.none')
                 - else

From c007dd5dd21ded9b82d2f2e5dd063dc0fe88a797 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 21 Mar 2024 10:57:45 +0100
Subject: [PATCH 0557/2191] New Crowdin Translations (automated) (#29687)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/bg.json    | 10 ++++-
 app/javascript/mastodon/locales/ca.json    |  8 ++++
 app/javascript/mastodon/locales/da.json    |  7 ++++
 app/javascript/mastodon/locales/eu.json    |  8 ++++
 app/javascript/mastodon/locales/fi.json    |  8 ++++
 app/javascript/mastodon/locales/fo.json    |  8 ++++
 app/javascript/mastodon/locales/gd.json    |  9 ++++-
 app/javascript/mastodon/locales/hu.json    |  8 ++++
 app/javascript/mastodon/locales/ko.json    | 10 ++++-
 app/javascript/mastodon/locales/lad.json   | 19 +++++++++
 app/javascript/mastodon/locales/lv.json    | 14 ++++---
 app/javascript/mastodon/locales/nl.json    |  8 ++++
 app/javascript/mastodon/locales/nn.json    | 32 +++++++++------
 app/javascript/mastodon/locales/ry.json    | 16 ++++++++
 app/javascript/mastodon/locales/sk.json    |  1 +
 app/javascript/mastodon/locales/sl.json    | 10 ++++-
 app/javascript/mastodon/locales/sq.json    |  6 +++
 app/javascript/mastodon/locales/uk.json    | 36 +++++++++++++++++
 app/javascript/mastodon/locales/zh-CN.json |  8 ++++
 app/javascript/mastodon/locales/zh-TW.json |  8 ++++
 config/locales/be.yml                      |  1 +
 config/locales/bg.yml                      | 12 ++++++
 config/locales/ca.yml                      | 12 ++++++
 config/locales/da.yml                      | 11 ++++++
 config/locales/devise.lv.yml               |  8 ++--
 config/locales/devise.nn.yml               |  4 +-
 config/locales/doorkeeper.nl.yml           |  2 +-
 config/locales/doorkeeper.zh-TW.yml        |  2 +-
 config/locales/es-AR.yml                   |  3 ++
 config/locales/es.yml                      |  3 ++
 config/locales/eu.yml                      | 12 ++++++
 config/locales/fi.yml                      | 12 ++++++
 config/locales/fo.yml                      | 12 ++++++
 config/locales/gd.yml                      | 15 ++++++++
 config/locales/hu.yml                      | 14 ++++++-
 config/locales/ko.yml                      | 12 ++++++
 config/locales/lad.yml                     |  7 ++++
 config/locales/lv.yml                      | 45 +++++++++++++---------
 config/locales/nl.yml                      | 16 +++++++-
 config/locales/nn.yml                      | 36 +++++++++++------
 config/locales/pl.yml                      | 12 ++++++
 config/locales/simple_form.lv.yml          |  4 +-
 config/locales/sk.yml                      |  3 ++
 config/locales/sl.yml                      | 12 ++++++
 config/locales/sq.yml                      |  7 ++++
 config/locales/uk.yml                      | 45 ++++++++++++++++++++++
 config/locales/vi.yml                      |  4 ++
 config/locales/zh-CN.yml                   | 12 ++++++
 config/locales/zh-TW.yml                   | 14 ++++++-
 49 files changed, 519 insertions(+), 67 deletions(-)

diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json
index d692925d152e79..9d972726b75c08 100644
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@@ -434,7 +434,7 @@
   "mute_modal.they_can_mention_and_follow": "Могат да ви споменават и последват, но няма да ги виждате.",
   "mute_modal.they_wont_know": "Няма да узнаят, че са били заглушени.",
   "mute_modal.title": "Заглушавате ли потребител?",
-  "mute_modal.you_wont_see_mentions": "Няма да виждате споменаващи ги публикации.",
+  "mute_modal.you_wont_see_mentions": "Няма да виждате споменаващите ги публикации.",
   "mute_modal.you_wont_see_posts": "Още могат да виждат публикациите ви, но вие техните не.",
   "navigation_bar.about": "Относно",
   "navigation_bar.advanced_interface": "Отваряне в разширен уебинтерфейс",
@@ -471,6 +471,8 @@
   "notification.own_poll": "Анкетата ви приключи",
   "notification.poll": "Анкета, в която гласувахте, приключи",
   "notification.reblog": "{name} подсили ваша публикация",
+  "notification.severedRelationships": "Връзката с {name} е прекъсната",
+  "notification.severed_relationships": "Връзката с {name} е прекъсната",
   "notification.status": "{name} току-що публикува",
   "notification.update": "{name} промени публикация",
   "notification_requests.accept": "Приемам",
@@ -587,6 +589,12 @@
   "refresh": "Опресняване",
   "regeneration_indicator.label": "Зареждане…",
   "regeneration_indicator.sublabel": "Подготовка на началния ви инфоканал!",
+  "relationship_severance_notification.purged_data": "прочистено от администраторите",
+  "relationship_severance_notification.relationships": "{count, plural, one {# връзка} other {# връзки}}",
+  "relationship_severance_notification.types.account_suspension": "Акаунтът е спрян",
+  "relationship_severance_notification.types.domain_block": "Домейнът е спрян",
+  "relationship_severance_notification.types.user_domain_block": "Блокирахте този домейн",
+  "relationship_severance_notification.view": "Преглед",
   "relative_time.days": "{number} д.",
   "relative_time.full.days": "преди {number, plural, one {# ден} other {# дни}}",
   "relative_time.full.hours": "преди {number, plural, one {# час} other {# часа}}",
diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index e0d62c78bb076e..3f1d7f858c8be7 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -471,6 +471,8 @@
   "notification.own_poll": "La teva enquesta ha finalitzat",
   "notification.poll": "Ha finalitzat una enquesta en què has votat",
   "notification.reblog": "{name} t'ha impulsat",
+  "notification.severedRelationships": "S'han eliminat les relacions amb {name}",
+  "notification.severed_relationships": "S'han eliminat les relacions amb {name}",
   "notification.status": "{name} acaba de publicar",
   "notification.update": "{name} ha editat un tut",
   "notification_requests.accept": "Accepta",
@@ -587,6 +589,12 @@
   "refresh": "Actualitza",
   "regeneration_indicator.label": "Es carrega…",
   "regeneration_indicator.sublabel": "Es prepara la teva línia de temps d'Inici!",
+  "relationship_severance_notification.purged_data": "ho han purgat els administradors",
+  "relationship_severance_notification.relationships": "{count, plural, one {# relació} other {# relacions}}",
+  "relationship_severance_notification.types.account_suspension": "S'ha suspès el compte",
+  "relationship_severance_notification.types.domain_block": "S'ha suspès el domini",
+  "relationship_severance_notification.types.user_domain_block": "Heu blocat aquest domini",
+  "relationship_severance_notification.view": "Veure",
   "relative_time.days": "{number}d",
   "relative_time.full.days": "fa {number, plural, one {# dia} other {# dies}}",
   "relative_time.full.hours": "fa {number, plural, one {# hora} other {# hores}}",
diff --git a/app/javascript/mastodon/locales/da.json b/app/javascript/mastodon/locales/da.json
index bff044e7d6d8f9..e00e23f9b87566 100644
--- a/app/javascript/mastodon/locales/da.json
+++ b/app/javascript/mastodon/locales/da.json
@@ -469,6 +469,7 @@
   "notification.own_poll": "Din afstemning er afsluttet",
   "notification.poll": "En afstemning, hvori du stemte, er slut",
   "notification.reblog": "{name} boostede dit indlæg",
+  "notification.severedRelationships": "Forhold med {name} afbrudt",
   "notification.status": "{name} har netop postet",
   "notification.update": "{name} redigerede et indlæg",
   "notification_requests.accept": "Acceptér",
@@ -585,6 +586,12 @@
   "refresh": "Genindlæs",
   "regeneration_indicator.label": "Indlæser…",
   "regeneration_indicator.sublabel": "Din hjemmetidslinje klargøres!",
+  "relationship_severance_notification.purged_data": "renset af administratorer",
+  "relationship_severance_notification.relationships": "{count, plural, one {# forhold} other {# forhold}}",
+  "relationship_severance_notification.types.account_suspension": "Konto er blevet suspenderet",
+  "relationship_severance_notification.types.domain_block": "Domæne er blevet suspenderet",
+  "relationship_severance_notification.types.user_domain_block": "Dette domæne blev blokeret",
+  "relationship_severance_notification.view": "Vis",
   "relative_time.days": "{number}d",
   "relative_time.full.days": "{number, plural, one {# dag} other {# dage}} siden",
   "relative_time.full.hours": "{number, plural, one {# time} other {# timer}} siden",
diff --git a/app/javascript/mastodon/locales/eu.json b/app/javascript/mastodon/locales/eu.json
index aae678a7d6188e..1a6338c2eb6974 100644
--- a/app/javascript/mastodon/locales/eu.json
+++ b/app/javascript/mastodon/locales/eu.json
@@ -471,6 +471,8 @@
   "notification.own_poll": "Zure inkesta amaitu da",
   "notification.poll": "Zuk erantzun duzun inkesta bat bukatu da",
   "notification.reblog": "{name}(e)k bultzada eman dio zure bidalketari",
+  "notification.severedRelationships": "{name} erabiltzailearekin zenuen erlazioa galdu da",
+  "notification.severed_relationships": "{name} erabiltzailearekin zenuen erlazioa galdu da",
   "notification.status": "{name} erabiltzaileak bidalketa egin berri du",
   "notification.update": "{name} erabiltzaileak bidalketa bat editatu du",
   "notification_requests.accept": "Onartu",
@@ -587,6 +589,12 @@
   "refresh": "Berritu",
   "regeneration_indicator.label": "Kargatzen…",
   "regeneration_indicator.sublabel": "Zure hasiera-jarioa prestatzen ari da!",
+  "relationship_severance_notification.purged_data": "administratzaileek kendua",
+  "relationship_severance_notification.relationships": "{count, plural, one {Erlazio #} other {# erlazio}}",
+  "relationship_severance_notification.types.account_suspension": "Kontua bertan behera utzi da",
+  "relationship_severance_notification.types.domain_block": "Domeinua bertan behera utzi da",
+  "relationship_severance_notification.types.user_domain_block": "Domeinu hau blokeatu duzu",
+  "relationship_severance_notification.view": "Ikusi",
   "relative_time.days": "{number}e",
   "relative_time.full.days": "Duela {number, plural, one {egun #} other {# egun}}",
   "relative_time.full.hours": "Duela {number, plural, one {ordu #} other {# ordu}}",
diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index bb5370b6d7de4c..b976b505d6bce3 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -471,6 +471,8 @@
   "notification.own_poll": "Äänestyksesi on päättynyt",
   "notification.poll": "Kysely, johon osallistuit, on päättynyt",
   "notification.reblog": "{name} tehosti julkaisuasi",
+  "notification.severedRelationships": "Suhteet palvelimeen {name} katkenneet",
+  "notification.severed_relationships": "Suhteet palvelimeen {name} katkenneet",
   "notification.status": "{name} julkaisi juuri",
   "notification.update": "{name} muokkasi julkaisua",
   "notification_requests.accept": "Hyväksy",
@@ -587,6 +589,12 @@
   "refresh": "Päivitä",
   "regeneration_indicator.label": "Ladataan…",
   "regeneration_indicator.sublabel": "Kotisyötettäsi valmistellaan!",
+  "relationship_severance_notification.purged_data": "ylläpitäjien tyhjentämä",
+  "relationship_severance_notification.relationships": "{count, plural, one {# suhde} other {# suhdetta}}",
+  "relationship_severance_notification.types.account_suspension": "Tili on jäädytetty",
+  "relationship_severance_notification.types.domain_block": "Verkkotunnus on jäädytetty",
+  "relationship_severance_notification.types.user_domain_block": "Estit tämän verkkotunnuksen",
+  "relationship_severance_notification.view": "Näytä",
   "relative_time.days": "{number} pv",
   "relative_time.full.days": "{number, plural, one {# päivä} other {# päivää}} sitten",
   "relative_time.full.hours": "{number, plural, one {# tunti} other {# tuntia}} sitten",
diff --git a/app/javascript/mastodon/locales/fo.json b/app/javascript/mastodon/locales/fo.json
index 27c0c8548fbbd0..5d8cafcd16be56 100644
--- a/app/javascript/mastodon/locales/fo.json
+++ b/app/javascript/mastodon/locales/fo.json
@@ -471,6 +471,8 @@
   "notification.own_poll": "Tín atkvøðugreiðsla er endað",
   "notification.poll": "Ein atkvøðugreiðsla, har tú hevur atkvøtt, er endað",
   "notification.reblog": "{name} lyfti tín post",
+  "notification.severedRelationships": "Tilknýti við {name} avbrotið",
+  "notification.severed_relationships": "Tilknýti við {name} avbrotið",
   "notification.status": "{name} hevur júst postað",
   "notification.update": "{name} rættaði ein post",
   "notification_requests.accept": "Góðtak",
@@ -587,6 +589,12 @@
   "refresh": "Endurles",
   "regeneration_indicator.label": "Innlesur…",
   "regeneration_indicator.sublabel": "Tín heimarás verður gjørd klár!",
+  "relationship_severance_notification.purged_data": "reinsað av umsitarum",
+  "relationship_severance_notification.relationships": "{count, plural, one {# tilknýti} other {# tilknýti}}",
+  "relationship_severance_notification.types.account_suspension": "Kontan er ógildað",
+  "relationship_severance_notification.types.domain_block": "Økisnavn er ógildað",
+  "relationship_severance_notification.types.user_domain_block": "Tú hevur forðað hesum økisnavni",
+  "relationship_severance_notification.view": "Vís",
   "relative_time.days": "{number}d",
   "relative_time.full.days": "{number, plural, one {# dagur} other {# dagar}} síðani",
   "relative_time.full.hours": "{number, plural, one {# tími} other {# tímar}} síðani",
diff --git a/app/javascript/mastodon/locales/gd.json b/app/javascript/mastodon/locales/gd.json
index ad9a58d83ddf27..4696d50eac6980 100644
--- a/app/javascript/mastodon/locales/gd.json
+++ b/app/javascript/mastodon/locales/gd.json
@@ -471,6 +471,8 @@
   "notification.own_poll": "Thàinig an cunntas-bheachd agad gu crìoch",
   "notification.poll": "Thàinig cunntas-bheachd sa bhòt thu gu crìoch",
   "notification.reblog": "Bhrosnaich {name} am post agad",
+  "notification.severedRelationships": "Chaidh na dàimhean le {name} a dhealachadh",
+  "notification.severed_relationships": "Chaidh na dàimhean le {name} a dhealachadh",
   "notification.status": "Phostaich {name} rud",
   "notification.update": "Dheasaich {name} post",
   "notification_requests.accept": "Gabh ris",
@@ -514,7 +516,7 @@
   "notifications.policy.filter_not_followers_title": "Daoine nach eil gad leantainn",
   "notifications.policy.filter_not_following_hint": "Gus an aontaich thu riutha a làimh",
   "notifications.policy.filter_not_following_title": "Daoine nach eil thu a’ leantainn",
-  "notifications.policy.filter_private_mentions_hint": "Criathraichte ach ma tha e a’ freagairt do dh’iomradh agad fhèin no ma tha thu a’ leantainn an seòladair",
+  "notifications.policy.filter_private_mentions_hint": "Criathraichte ach ma tha e a’ freagairt do dh’iomradh agad fhèin no ma tha thu a’ leantainn an t-seòladair",
   "notifications.policy.filter_private_mentions_title": "Iomraidhean prìobhaideach o choigrich",
   "notifications.policy.title": "Falamhaich na brathan o…",
   "notifications_permission_banner.enable": "Cuir brathan deasga an comas",
@@ -587,6 +589,11 @@
   "refresh": "Ath-nuadhaich",
   "regeneration_indicator.label": "’Ga luchdadh…",
   "regeneration_indicator.sublabel": "Tha do dhachaigh ’ga ullachadh!",
+  "relationship_severance_notification.purged_data": "chaidh a phurgaideachadh leis na rianairean",
+  "relationship_severance_notification.types.account_suspension": "Chaidh cunntas a chur à rèim",
+  "relationship_severance_notification.types.domain_block": "Chaidh àrainn a chur à rèim",
+  "relationship_severance_notification.types.user_domain_block": "Bhac thu an àrainn seo",
+  "relationship_severance_notification.view": "Seall",
   "relative_time.days": "{number}l",
   "relative_time.full.days": "{number, plural, one {# latha} two {# latha} few {# làithean} other {# latha}} air ais",
   "relative_time.full.hours": "{number, plural, one {# uair a thìde} two {# uair a thìde} few {# uairean a thìde} other {# uair a thìde}} air ais",
diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json
index 38e46399d3f63c..760063ab758a48 100644
--- a/app/javascript/mastodon/locales/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@@ -471,6 +471,8 @@
   "notification.own_poll": "A szavazásod véget ért",
   "notification.poll": "Egy szavazás, melyben részt vettél, véget ért",
   "notification.reblog": "{name} megtolta a bejegyzésedet",
+  "notification.severedRelationships": "A kapcsolatok megszakítva ezzel: {name}",
+  "notification.severed_relationships": "A kapcsolatok megszakítva ezzel: {name}",
   "notification.status": "{name} bejegyzést tett közzé",
   "notification.update": "{name} szerkesztett egy bejegyzést",
   "notification_requests.accept": "Elfogadás",
@@ -587,6 +589,12 @@
   "refresh": "Frissítés",
   "regeneration_indicator.label": "Betöltés…",
   "regeneration_indicator.sublabel": "A saját idővonalad épp készül!",
+  "relationship_severance_notification.purged_data": "rendszergazdák által véglegesen törölve",
+  "relationship_severance_notification.relationships": "{count, plural, one {# kapcsolat} other {# kapcsolat}}",
+  "relationship_severance_notification.types.account_suspension": "A fiók fel van függesztve",
+  "relationship_severance_notification.types.domain_block": "A domain fel van függesztve",
+  "relationship_severance_notification.types.user_domain_block": "Blokkoltad ezt a domaint",
+  "relationship_severance_notification.view": "Megtekintés",
   "relative_time.days": "{number}n",
   "relative_time.full.days": "{number, plural, one {# napja} other {# napja}}",
   "relative_time.full.hours": "{number, plural, one {# órája} other {# órája}}",
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index 96407b00203cd7..5ccd652a14f6b0 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -220,7 +220,7 @@
   "domain_pill.activitypub_lets_connect": "이것은 마스토돈 뿐만이 아니라 다른 소셜 앱들을 넘나들며 사람들을 연결하고 상호작용 할 수 있게 합니다.",
   "domain_pill.activitypub_like_language": "액티비티펍은 마스토돈이 다른 소셜 네트워크와 대화할 때 쓰는 언어 같은 것입니다.",
   "domain_pill.server": "서버",
-  "domain_pill.their_handle": "그의 핸들:",
+  "domain_pill.their_handle": "이 사람의 핸들:",
   "domain_pill.their_server": "그의 게시물이 살고 있는 디지털 거처입니다.",
   "domain_pill.their_username": "그의 서버에서 유일한 식별자입니다. 다른 서버에서 같은 사용자명을 가진 사용자를 찾을 수도 있습니다.",
   "domain_pill.username": "사용자명",
@@ -471,6 +471,8 @@
   "notification.own_poll": "설문을 마침",
   "notification.poll": "참여한 설문이 종료됨",
   "notification.reblog": "{name} 님이 부스트했습니다",
+  "notification.severedRelationships": "{name} 님과의 관계가 단절되었습니다",
+  "notification.severed_relationships": "{name} 님과의 관계가 단절되었습니다",
   "notification.status": "{name} 님이 방금 게시물을 올렸습니다",
   "notification.update": "{name} 님이 게시물을 수정했습니다",
   "notification_requests.accept": "수락",
@@ -587,6 +589,12 @@
   "refresh": "새로고침",
   "regeneration_indicator.label": "불러오는 중…",
   "regeneration_indicator.sublabel": "홈 피드를 준비하고 있습니다!",
+  "relationship_severance_notification.purged_data": "관리자에 의해 제거되었습니다",
+  "relationship_severance_notification.relationships": "{count, plural, other {# 건의 관계}}",
+  "relationship_severance_notification.types.account_suspension": "계정이 정지되었습니다",
+  "relationship_severance_notification.types.domain_block": "도메인이 정지되었습니다",
+  "relationship_severance_notification.types.user_domain_block": "내가 이 도메인을 차단했습니다",
+  "relationship_severance_notification.view": "보기",
   "relative_time.days": "{number}일 전",
   "relative_time.full.days": "{number} 일 전",
   "relative_time.full.hours": "{number} 시간 전",
diff --git a/app/javascript/mastodon/locales/lad.json b/app/javascript/mastodon/locales/lad.json
index 2f4185f69e1d52..547351af8cbf67 100644
--- a/app/javascript/mastodon/locales/lad.json
+++ b/app/javascript/mastodon/locales/lad.json
@@ -91,7 +91,10 @@
   "audio.hide": "Eskonde audio",
   "block_modal.show_less": "Amostra manko",
   "block_modal.show_more": "Amostra mas",
+  "block_modal.they_cant_mention": "No te puede enmentar ni segir.",
+  "block_modal.they_will_know": "Puede ver ke esta blokado.",
   "block_modal.title": "Bloka utilizador?",
+  "block_modal.you_wont_see_mentions": "No veras publikasyones ke lo enmentan.",
   "boost_modal.combo": "Puedes klikar {combo} para ometer esto la proksima vez",
   "bundle_column_error.copy_stacktrace": "Kopia el raporto de yerro",
   "bundle_column_error.error.body": "La pajina solisitada no pudo ser renderada. Podria ser por un yerro en muestro kodiche o un problem de kompatibilita kon el navigador.",
@@ -205,9 +208,16 @@
   "dismissable_banner.explore_tags": "Estas etiketas estan agora popularas en la red sosyala. Etiketas uzadas por mas djente aparesen primero.",
   "dismissable_banner.public_timeline": "Estas son las publikasyones publikas mas resientes de personas en la red sosyala a las kualas la djente de {domain} sige.",
   "domain_block_modal.block": "Bloka sirvidor",
+  "domain_block_modal.block_account_instead": "Bloka @{name} en su lugar",
+  "domain_block_modal.they_cant_follow": "Dingun de este sirvidor puede segirte.",
+  "domain_block_modal.they_wont_know": "No savra ke tiene sido blokado.",
   "domain_block_modal.title": "Bloka el domeno?",
+  "domain_block_modal.you_will_lose_followers": "Se efasaran todos tus suivantes de este sirvidor.",
   "domain_pill.server": "Sirvidor",
+  "domain_pill.their_handle": "Su alias:",
   "domain_pill.username": "Nombre de utilizador",
+  "domain_pill.whats_in_a_handle": "En ke konsiste el alias?",
+  "domain_pill.your_handle": "Tu alias:",
   "embed.instructions": "Enkrusta esta publikasyon en tu sitio internetiko kopiando este kodiche.",
   "embed.preview": "Paresera ansina:",
   "emoji_button.activity": "Aktivita",
@@ -404,6 +414,13 @@
   "loading_indicator.label": "Eskargando…",
   "media_gallery.toggle_visible": "{number, plural, one {Eskonde imaje} other {Eskonde imajes}}",
   "moved_to_account_banner.text": "Tu kuento {disabledAccount} esta aktualmente inkapasitado porke transferates a {movedToAccount}.",
+  "mute_modal.hide_from_notifications": "Eskonde de avizos",
+  "mute_modal.hide_options": "Eskonde opsyones",
+  "mute_modal.indefinite": "Asta ke desho de silensyarlo",
+  "mute_modal.show_options": "Amostra opsyones",
+  "mute_modal.they_wont_know": "No savra ke tiene sido silensyado.",
+  "mute_modal.title": "Silensiar utilizador?",
+  "mute_modal.you_wont_see_mentions": "No veras publikasyones ke lo enmentan.",
   "navigation_bar.about": "Sovre mozotros",
   "navigation_bar.advanced_interface": "Avre en la enterfaz avanzada",
   "navigation_bar.blocks": "Utilizadores blokados",
@@ -553,6 +570,8 @@
   "refresh": "Arefreska",
   "regeneration_indicator.label": "Eskargando…",
   "regeneration_indicator.sublabel": "Tu linya de tiempo prinsipala esta preparando!",
+  "relationship_severance_notification.types.user_domain_block": "Blokates este domeno",
+  "relationship_severance_notification.view": "Mira",
   "relative_time.days": "{number} d",
   "relative_time.full.days": "antes {number, plural, one {# diya} other {# diyas}}",
   "relative_time.full.hours": "antes {number, plural, one {# ora} other {# oras}}",
diff --git a/app/javascript/mastodon/locales/lv.json b/app/javascript/mastodon/locales/lv.json
index 51d06c82339ec5..21fa46faa60bdc 100644
--- a/app/javascript/mastodon/locales/lv.json
+++ b/app/javascript/mastodon/locales/lv.json
@@ -236,7 +236,7 @@
   "empty_column.lists": "Pašlaik Tev nav neviena saraksta. Kad tādu izveidosi, tas parādīsies šeit.",
   "empty_column.mutes": "Neviens lietotājs vēl nav apklusināts.",
   "empty_column.notifications": "Tev vēl nav paziņojumu. Kad citi cilvēki ar Tevi mijiedarbosies, Tu to redzēsi šeit.",
-  "empty_column.public": "Šeit nekā nav! Ieraksti kaut ko publiski vai seko lietotājiem no citiem serveriem, lai iegūtu saturu",
+  "empty_column.public": "Šeit nekā nav. Ieraksti kaut ko publiski vai seko lietotājiem no citiem serveriem, lai iegūtu saturu",
   "error.unexpected_crash.explanation": "Koda kļūdas vai pārlūkprogrammas saderības problēmas dēļ šo lapu nevarēja parādīt pareizi.",
   "error.unexpected_crash.explanation_addons": "Šo lapu nevarēja parādīt pareizi. Šo kļūdu, iespējams, izraisīja pārlūkprogrammas papildinājums vai automātiskās tulkošanas rīki.",
   "error.unexpected_crash.next_steps": "Mēģini atsvaidzināt lapu. Ja tas nepalīdz, iespējams, varēsi lietot Mastodon, izmantojot citu pārlūkprogrammu vai lietotni.",
@@ -265,6 +265,7 @@
   "filter_modal.select_filter.subtitle": "Izmanto esošu kategoriju vai izveido jaunu",
   "filter_modal.select_filter.title": "Filtrēt šo ziņu",
   "filter_modal.title.status": "Filtrēt ziņu",
+  "filtered_notifications_banner.pending_requests": "Paziņojumi no {count, plural, =0 {neviena} one {viena cilvēka} other {# cilvēkiem}}, ko Tu varētu zināt",
   "firehose.all": "Visi",
   "firehose.local": "Šis serveris",
   "firehose.remote": "Citi serveri",
@@ -273,6 +274,7 @@
   "follow_requests.unlocked_explanation": "Lai gan Tavs konts nav slēgts, {domain} darbinieki iedomājās, ka Tu varētu vēlēties pašrocīgi pārskatīt sekošanas pieprasījumus no šiem kontiem.",
   "follow_suggestions.curated_suggestion": "Darbinieku izvēle",
   "follow_suggestions.dismiss": "Vairs nerādīt",
+  "follow_suggestions.personalized_suggestion": "Pielāgots ieteikums",
   "follow_suggestions.view_all": "Skatīt visu",
   "follow_suggestions.who_to_follow": "Kam sekot",
   "followed_tags": "Sekojamie tēmturi",
@@ -413,7 +415,7 @@
   "navigation_bar.security": "Drošība",
   "not_signed_in_indicator.not_signed_in": "Ir jāpiesakās, lai piekļūtu šim resursam.",
   "notification.admin.report": "{name} ziņoja par {target}",
-  "notification.admin.sign_up": "{name} ir pierakstījies",
+  "notification.admin.sign_up": "{name} pierakstījās",
   "notification.favourite": "{name} pievienoja tavu ziņu izlasei",
   "notification.follow": "{name} uzsāka Tev sekot",
   "notification.follow_request": "{name} nosūtīja Tev sekošanas pieprasījumu",
@@ -464,7 +466,7 @@
   "onboarding.compose.template": "Sveiki, #Mastodon!",
   "onboarding.follows.empty": "Diemžēl pašlaik nevar parādīt rezultātus. Vari mēģināt izmantot meklēšanu vai pārlūkot izpētes lapu, lai atrastu cilvēkus, kuriem sekot, vai vēlāk mēģināt vēlreiz.",
   "onboarding.follows.lead": "Tava mājas plūsma ir galvenais veids, kā izbaudīt Mastodon. Jo vairāk cilvēku sekosi, jo aktīvāk un interesantāk tas būs. Lai sāktu, šeit ir daži ieteikumi:",
-  "onboarding.follows.title": "Populārs Mastodon",
+  "onboarding.follows.title": "Pielāgo savu mājas barotni",
   "onboarding.profile.discoverable": "Padarīt manu profilu atklājamu",
   "onboarding.profile.display_name": "Attēlojamais vārds",
   "onboarding.profile.display_name_hint": "Tavs pilnais vārds vai Tavs joku vārds…",
@@ -482,7 +484,7 @@
   "onboarding.start.skip": "Nav nepieciešama palīdzība darba sākšanai?",
   "onboarding.start.title": "Tev tas izdevās!",
   "onboarding.steps.follow_people.body": "Tu pats veido savu plūsmu. Piepildīsim to ar interesantiem cilvēkiem.",
-  "onboarding.steps.follow_people.title": "Sekot {count, plural, one {one person} other {# cilvēkiem}}",
+  "onboarding.steps.follow_people.title": "Pielāgo savu mājas barotni",
   "onboarding.steps.publish_status.body": "Sveicini pasauli ar tekstu, fotoattēliem, video, vai aptaujām {emoji}",
   "onboarding.steps.publish_status.title": "Izveido savu pirmo ziņu",
   "onboarding.steps.setup_profile.body": "Palielini mijiedarbību ar aptverošu profilu!",
@@ -492,14 +494,14 @@
   "onboarding.tips.2fa": "<strong>Vai zināji?</strong> Tu vari aizsargāt savu kontu, konta iestatījumos iestatot divpakāpju autentifikāciju. Tas darbojas ar jebkuru Tevis izvēlētu TOTP lietotni, nav nepieciešams tālruņa numurs!",
   "onboarding.tips.accounts_from_other_servers": "<strong>Vai zināji?</strong> Tā kā Mastodon ir decentralizēts, daži profili, ar kuriem saskaraties, tiks mitināti citos, nevis tavos serveros. Un tomēr tu varat sazināties ar viņiem nevainojami! Viņu serveris atrodas viņu lietotājvārda otrajā pusē!",
   "onboarding.tips.migration": "<strong>Vai zināji?</strong> Ja uzskati, ka {domain} nākotnē nav lieliska servera izvēle, vari pāriet uz citu Mastodon serveri, nezaudējot savus sekotājus. Tu pat vari mitināt savu serveri!",
-  "onboarding.tips.verification": "<strong>Vai zināji?</strong> Tu vari verificēt savu kontu, ievietojot saiti uz savu Mastodon profilu savā vietnē un pievienojot vietni savam profilam. Nav nepieciešami nekādi maksājumi vai dokumenti!",
+  "onboarding.tips.verification": "<strong>Vai zināji?</strong> Tu vari apliecināt savu kontu, ievietojot savā tīmekļvietnē saiti uz savu Mastodon profilu un pievienojot tīmekļvietni savam profilam. Nav nepieciešami nekādi maksājumi vai dokumenti.",
   "password_confirmation.exceeds_maxlength": "Paroles apstiprināšana pārsniedz maksimālo paroles garumu",
   "password_confirmation.mismatching": "Paroles apstiprinājums neatbilst",
   "picture_in_picture.restore": "Novietot atpakaļ",
   "poll.closed": "Pabeigta",
   "poll.refresh": "Atsvaidzināt",
   "poll.reveal": "Skatīt rezultātus",
-  "poll.total_people": "{count, plural, zero {# cilvēku} one {# persona} other {# cilvēki}}",
+  "poll.total_people": "{count, plural, zero {# cilvēku} one {# cilvēks} other {# cilvēki}}",
   "poll.total_votes": "{count, plural, zero {# balsojumu} one {# balsojums} other {# balsojumi}}",
   "poll.vote": "Balsot",
   "poll.voted": "Tu balsoji par šo atbildi",
diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json
index 9bf40a7148bb32..f60c426bc2629e 100644
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@@ -471,6 +471,8 @@
   "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.severedRelationships": "Volgrelaties met {name} verbroken",
+  "notification.severed_relationships": "Volgrelaties met {name} verbroken",
   "notification.status": "{name} heeft zojuist een bericht geplaatst",
   "notification.update": "{name} heeft een bericht bewerkt",
   "notification_requests.accept": "Accepteren",
@@ -587,6 +589,12 @@
   "refresh": "Vernieuwen",
   "regeneration_indicator.label": "Aan het laden…",
   "regeneration_indicator.sublabel": "Jouw starttijdlijn wordt aangemaakt!",
+  "relationship_severance_notification.purged_data": "verwijderd door beheerders",
+  "relationship_severance_notification.relationships": "{count, plural, one {# volgrelatie} other {# volgrelaties}}",
+  "relationship_severance_notification.types.account_suspension": "Account is opgeschort",
+  "relationship_severance_notification.types.domain_block": "Domein is opgeschort",
+  "relationship_severance_notification.types.user_domain_block": "Je hebt dit domein geblokkeerd",
+  "relationship_severance_notification.view": "Weergeven",
   "relative_time.days": "{number}d",
   "relative_time.full.days": "{number, plural, one {# dag} other {# dagen}} geleden",
   "relative_time.full.hours": "{number, plural, one {# uur} other {# uur}} geleden",
diff --git a/app/javascript/mastodon/locales/nn.json b/app/javascript/mastodon/locales/nn.json
index aa20207a769766..a70d607d4d41f2 100644
--- a/app/javascript/mastodon/locales/nn.json
+++ b/app/javascript/mastodon/locales/nn.json
@@ -32,7 +32,7 @@
   "account.featured_tags.last_status_never": "Ingen innlegg",
   "account.featured_tags.title": "{name} sine framheva emneknaggar",
   "account.follow": "Fylg",
-  "account.follow_back": "Følg tilbake",
+  "account.follow_back": "Fylg tilbake",
   "account.followers": "Fylgjarar",
   "account.followers.empty": "Ingen fylgjer denne brukaren enno.",
   "account.followers_counter": "{count, plural, one {{counter} fylgjar} other {{counter} fylgjarar}}",
@@ -79,8 +79,8 @@
   "admin.dashboard.retention.cohort": "Registrert månad",
   "admin.dashboard.retention.cohort_size": "Nye brukarar",
   "admin.impact_report.instance_accounts": "Kontoprofilar dette vil sletta",
-  "admin.impact_report.instance_followers": "Følgjarar våre brukarar vil mista",
-  "admin.impact_report.instance_follows": "Følgjarar deira brukarar vil mista",
+  "admin.impact_report.instance_followers": "Fylgjarar som brukarane våre ville mista",
+  "admin.impact_report.instance_follows": "Fylgjarar som brukarane deira ville mista",
   "admin.impact_report.title": "Samandrag av konsekvensane",
   "alert.rate_limited.message": "Ver venleg å prøv på nytt etter {retry_time, time, medium}.",
   "alert.rate_limited.title": "Redusert kapasitet",
@@ -89,7 +89,7 @@
   "announcement.announcement": "Kunngjering",
   "attachments_list.unprocessed": "(ubehandla)",
   "audio.hide": "Gøym lyd",
-  "block_modal.remote_users_caveat": "Vi vil be tenaren {domain} om å respektere di avgjerd. Det kan ikkje garanterast at det vert etterfølgd, sidan nokre tenarar kan handtere blokkering ulikt. Offentlege innlegg kan framleis vere synlege for ikkje-innlogga brukarar.",
+  "block_modal.remote_users_caveat": "Me vil be tenaren {domain} om å respektere di avgjerd. Me kan ikkje garantera at det vert gjort, sidan nokre tenarar kan handtera blokkering ulikt. Offentlege innlegg kan framleis vera synlege for ikkje-innlogga brukarar.",
   "block_modal.show_less": "Vis mindre",
   "block_modal.show_more": "Vis meir",
   "block_modal.they_cant_mention": "Dei kan ikkje nemna eller fylgja deg.",
@@ -208,7 +208,7 @@
   "dismissable_banner.explore_links": "Desse nyhendesakene snakkast om av folk på denne og andre tenarar på det desentraliserte nettverket no.",
   "dismissable_banner.explore_statuses": "Dette er innlegg frå det desentraliserte nettverket som er i støytet i dag. Nye statusar som er mykje framheva og merkte som favorittar er rangert høgare.",
   "dismissable_banner.explore_tags": "Desse emneknaggane er populære blant folk på denne tenaren og andre tenarar i det desentraliserte nettverket nett no.",
-  "dismissable_banner.public_timeline": "Dette er dei nyaste offentlege innlegga frå menneske på det sosiale nettet som folk på {domain} følgjer.",
+  "dismissable_banner.public_timeline": "Dette er dei nyaste offentlege innlegga frå menneske på det sosiale nettet som folk på {domain} fylgjer.",
   "domain_block_modal.block": "Blokker tenaren",
   "domain_block_modal.block_account_instead": "Blokker @{name} i staden",
   "domain_block_modal.they_can_interact_with_old_posts": "Folk på denne tenaren kan samhandla med dei gamle innlegga dine.",
@@ -228,7 +228,7 @@
   "domain_pill.who_they_are": "Sidan handtak seier kven nokon er og kvar dei er, kan du interagere med folk på tvers av det sosiale nettverket av <button>plattformar som støttar ActivityPub</button>.",
   "domain_pill.who_you_are": "Sidan handtaket ditt seier kven du er og kvar du er, kan folk interagere med deg på tvers av det sosiale nettverket av <button>plattformar som støttar ActivityPub</button>.",
   "domain_pill.your_handle": "Handtaket ditt:",
-  "domain_pill.your_server": "Din digitale heim, som alle postane dine bur i. Liker du ikkje dette? Overfør tenarar når som helst og ta med følgjarane dine òg.",
+  "domain_pill.your_server": "Din digitale heim, der alle innlegga dine bur i. Liker du ikkje dette? Byt til ein ny tenar når som helst og ta med fylgjarane dine òg.",
   "domain_pill.your_username": "Din unike identifikator på denne tenaren. Det er mogleg å finne brukarar med same brukarnamn på forskjellige tenarar.",
   "embed.instructions": "Bygg inn denne statusen på nettsida di ved å kopiera koden nedanfor.",
   "embed.preview": "Slik kjem det til å sjå ut:",
@@ -259,16 +259,16 @@
   "empty_column.explore_statuses": "Ingenting er i støytet nett no. Prøv igjen seinare!",
   "empty_column.favourited_statuses": "Du har ingen favoritt-statusar ennå. Når du merkjer ein som favoritt, dukkar han opp her.",
   "empty_column.favourites": "Ingen har merkt denne statusen som favoritt enno. Når nokon gjer det, dukkar dei opp her.",
-  "empty_column.follow_requests": "Du har ingen følgjeførespurnadar ennå. Når du får ein, så vil den dukke opp her.",
+  "empty_column.follow_requests": "Ingen har spurt om å fylgja deg enno. Når nokon gjer det, vil det dukka opp her.",
   "empty_column.followed_tags": "Du fylgjer ingen emneknaggar enno. Når du gjer det, vil dei syna her.",
   "empty_column.hashtag": "Det er ingenting i denne emneknaggen enno.",
-  "empty_column.home": "Heime-tidslina di er tom! Følg fleire folk for å fylle ho med innhald. {suggestions}",
+  "empty_column.home": "Heime-tidslina di er tom! Fylg fleire folk for å fylla ho med innhald. {suggestions}.",
   "empty_column.list": "Det er ingenting i denne lista enno. Når medlemer av denne lista legg ut nye statusar, så dukkar dei opp her.",
   "empty_column.lists": "Du har ingen lister enno. Når du lagar ei, så dukkar ho opp her.",
   "empty_column.mutes": "Du har ikkje målbunde nokon enno.",
   "empty_column.notification_requests": "Ferdig! Her er det ingenting. Når du får nye varsel, kjem dei opp her slik du har valt.",
   "empty_column.notifications": "Du har ingen varsel enno. Kommuniser med andre for å starte samtalen.",
-  "empty_column.public": "Det er ingenting her! Skriv noko offentleg, eller følg brukarar frå andre tenarar manuelt for å fylle det opp",
+  "empty_column.public": "Det er ingenting her! Skriv noko offentleg, eller fylg brukarar frå andre tenarar manuelt for å få meir her",
   "error.unexpected_crash.explanation": "På grunn av eit nettlesarkompatibilitetsproblem eller ein feil i koden vår, kunne ikkje denne sida bli vist slik den skal.",
   "error.unexpected_crash.explanation_addons": "Denne sida kunne ikkje visast som den skulle. Feilen kjem truleg frå ei nettleserutviding eller frå automatiske omsetjingsverktøy.",
   "error.unexpected_crash.next_steps": "Prøv å lasta inn sida på nytt. Hjelper ikkje dette kan du framleis nytta Mastodon i ein annan nettlesar eller app.",
@@ -315,7 +315,7 @@
   "follow_suggestions.personalized_suggestion": "Personleg forslag",
   "follow_suggestions.popular_suggestion": "Populært forslag",
   "follow_suggestions.view_all": "Vis alle",
-  "follow_suggestions.who_to_follow": "Kven som skal følgjast",
+  "follow_suggestions.who_to_follow": "Kven du kan fylgja",
   "followed_tags": "Fylgde emneknaggar",
   "footer.about": "Om",
   "footer.directory": "Profilmappe",
@@ -471,6 +471,8 @@
   "notification.own_poll": "Rundspørjinga di er ferdig",
   "notification.poll": "Ei rundspørjing du har røysta i er ferdig",
   "notification.reblog": "{name} framheva innlegget ditt",
+  "notification.severedRelationships": "Forholda med {name} er brotne",
+  "notification.severed_relationships": "Forholda med {name} er brotne",
   "notification.status": "{name} la nettopp ut",
   "notification.update": "{name} redigerte eit innlegg",
   "notification_requests.accept": "Godkjenn",
@@ -574,8 +576,8 @@
   "privacy.change": "Endre personvernet på innlegg",
   "privacy.direct.long": "Alle nemnde i innlegget",
   "privacy.direct.short": "Spesifikke folk",
-  "privacy.private.long": "Berre dine følgjarar",
-  "privacy.private.short": "Følgjarar",
+  "privacy.private.long": "Berre dei som fylgjer deg",
+  "privacy.private.short": "Fylgjarar",
   "privacy.public.long": "Kven som helst på og av Mastodon",
   "privacy.public.short": "Offentleg",
   "privacy.unlisted.additional": "Dette er akkurat som offentleg, bortsett frå at innlegga ikkje dukkar opp i direktestraumar eller merkelappar, i oppdagingar eller Mastodon-søk, sjølv om du har sagt ja til at kontoen skal vera synleg.",
@@ -587,6 +589,12 @@
   "refresh": "Oppdater",
   "regeneration_indicator.label": "Lastar…",
   "regeneration_indicator.sublabel": "Heimetidslina di vert førebudd!",
+  "relationship_severance_notification.purged_data": "sletta av administratorar",
+  "relationship_severance_notification.relationships": "{count, plural, one {# forhold} other {# forhold}}",
+  "relationship_severance_notification.types.account_suspension": "Kontoen er utvist",
+  "relationship_severance_notification.types.domain_block": "Domenet er utestengt",
+  "relationship_severance_notification.types.user_domain_block": "Du blokkerte dette domenet",
+  "relationship_severance_notification.view": "Sjå",
   "relative_time.days": "{number}dg",
   "relative_time.full.days": "{number, plural, one {# dag} other {# dagar}} sidan",
   "relative_time.full.hours": "{number, plural, one {# time} other {# timar}} sidan",
diff --git a/app/javascript/mastodon/locales/ry.json b/app/javascript/mastodon/locales/ry.json
index 62772f4f2231ca..67aad910054010 100644
--- a/app/javascript/mastodon/locales/ry.json
+++ b/app/javascript/mastodon/locales/ry.json
@@ -35,11 +35,13 @@
   "account.following": "Слідуєте",
   "account.follows.empty": "Сись хосновач щи никого не слідує.",
   "account.go_to_profile": "Перейти на профіл",
+  "account.hide_reblogs": "Спрятати друленя уд @{name}",
   "account.joined_short": "Датум прикапчованя",
   "account.languages": "Поміняти убрані языкы",
   "account.link_verified_on": "Властность сього удкликованя было звірено {date}",
   "account.media": "Медіа",
   "account.moved_to": "Хосновач {name} указав, ож новый профіл йим є:",
+  "account.mute": "Стишити {name}",
   "account.mute_notifications_short": "Стишити голошіня",
   "account.mute_short": "Стишити",
   "account.muted": "Стишено",
@@ -52,8 +54,22 @@
   "account.requested": "Чекат ся на пудтвердженя. Нажміт убы удмінити запрос на слідованя",
   "account.requested_follow": "Хосновач {name} просит ся пудписати ся на вас",
   "account.share": "Пошырити профіл хосновача {name}",
+  "account.show_reblogs": "Указати друленя уд {name}",
   "account.unblock": "Розблоковати {name}",
   "account.unblock_domain": "Розблоковати домен {domain}",
+  "account.unblock_short": "Розблоковати",
+  "account.unendorse": "Не указовати на профілови",
+  "account.unfollow": "Удписати ся",
+  "account.unmute_notifications_short": "Указовати голошіня",
+  "account.unmute_short": "Указовати",
+  "account_note.placeholder": "Клопкніт обы додати примітку",
+  "admin.dashboard.retention.cohort_size": "Нові хосновачі",
+  "admin.impact_report.instance_accounts": "Профілі из акаунтув, котрі ся удалят",
+  "admin.impact_report.instance_followers": "Пудписникы, котрых стратят наші хосновачі",
+  "admin.impact_report.instance_follows": "Пудписникы, котрых стратят їхні хосновачі",
+  "admin.impact_report.title": "Вплыв цілком",
+  "alert.rate_limited.message": "Попробуйте зась по {retry_time, time, medium}.",
+  "alert.rate_limited.title": "Частота обмежена",
   "bundle_column_error.return": "Вернути ся на головну",
   "bundle_column_error.routing.body": "Не можеме найти сяку сторунку. Бизувні сьте, ож URL у адресному шорикови є добрый?",
   "bundle_column_error.routing.title": "404",
diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json
index c2b1cede94264a..3387718aae5878 100644
--- a/app/javascript/mastodon/locales/sk.json
+++ b/app/javascript/mastodon/locales/sk.json
@@ -553,6 +553,7 @@
   "refresh": "Obnoviť",
   "regeneration_indicator.label": "Načítavanie…",
   "regeneration_indicator.sublabel": "Váš domovský kanál sa pripravuje.",
+  "relationship_severance_notification.view": "Zobraziť",
   "relative_time.days": "{number} dní",
   "relative_time.full.days": "Pred {number, plural, one {# dňom} other {# dňami}}",
   "relative_time.full.hours": "Pred {number, plural, one {# hodinou} other {# hodinami}}",
diff --git a/app/javascript/mastodon/locales/sl.json b/app/javascript/mastodon/locales/sl.json
index de22e98f07a236..b1923c7dd60379 100644
--- a/app/javascript/mastodon/locales/sl.json
+++ b/app/javascript/mastodon/locales/sl.json
@@ -471,6 +471,8 @@
   "notification.own_poll": "Vaša anketa je zaključena",
   "notification.poll": "Anketa, v kateri ste sodelovali, je zaključena",
   "notification.reblog": "{name} je izpostavila/a vašo objavo",
+  "notification.severedRelationships": "Veze z {name} prekinjene",
+  "notification.severed_relationships": "Veze z {name} prekinjene",
   "notification.status": "{name} je pravkar objavil/a",
   "notification.update": "{name} je uredil(a) objavo",
   "notification_requests.accept": "Sprejmi",
@@ -516,7 +518,7 @@
   "notifications.policy.filter_not_following_title": "Ljudje, ki jim ne sledite",
   "notifications.policy.filter_private_mentions_hint": "Filtrirano, razen če je odgovor na vašo lastno omembo ali če sledite pošiljatelju",
   "notifications.policy.filter_private_mentions_title": "Neželene zasebne omembe",
-  "notifications.policy.title": "Skrij obvestila od …",
+  "notifications.policy.title": "Filtriraj obvestila od …",
   "notifications_permission_banner.enable": "Omogoči obvestila na namizju",
   "notifications_permission_banner.how_to_control": "Če želite prejemati obvestila, ko Mastodon ni odprt, omogočite namizna obvestila. Natančno lahko nadzirate, katere vrste interakcij naj tvorijo namizna obvestila; ko so omogočena, za to uporabite gumb {icon} zgoraj.",
   "notifications_permission_banner.title": "Nikoli ne zamudite ničesar",
@@ -587,6 +589,12 @@
   "refresh": "Osveži",
   "regeneration_indicator.label": "Nalaganje …",
   "regeneration_indicator.sublabel": "Vaš domači vir se pripravlja!",
+  "relationship_severance_notification.purged_data": "očistili skrbniki",
+  "relationship_severance_notification.relationships": "{count, plural, one {# veza} two {# vezi} few {# veze} other {# vez}}",
+  "relationship_severance_notification.types.account_suspension": "Račun je bil suspendiran",
+  "relationship_severance_notification.types.domain_block": "Domena je bila suspendirana",
+  "relationship_severance_notification.types.user_domain_block": "Domeno ste blokirali",
+  "relationship_severance_notification.view": "Pogled",
   "relative_time.days": "{number} d",
   "relative_time.full.days": "{number, plural, one {pred # dnem} two {pred # dnevoma} few {pred # dnevi} other {pred # dnevi}}",
   "relative_time.full.hours": "{number, plural, one {pred # uro} two {pred # urama} few {pred # urami} other {pred # urami}}",
diff --git a/app/javascript/mastodon/locales/sq.json b/app/javascript/mastodon/locales/sq.json
index dd8f4ad9802490..7f842c6bd86898 100644
--- a/app/javascript/mastodon/locales/sq.json
+++ b/app/javascript/mastodon/locales/sq.json
@@ -584,6 +584,12 @@
   "refresh": "Rifreskoje",
   "regeneration_indicator.label": "Po ngarkohet…",
   "regeneration_indicator.sublabel": "Prurja juaj vetjake po përgatitet!",
+  "relationship_severance_notification.purged_data": "spastruar nga përgjegjës",
+  "relationship_severance_notification.relationships": "{count, plural, one {# marrëdhënie} other {# marrëdhënie}}",
+  "relationship_severance_notification.types.account_suspension": "Llogaria është pezulluar",
+  "relationship_severance_notification.types.domain_block": "Përkatësia është pezulluar",
+  "relationship_severance_notification.types.user_domain_block": "E bllokuat këtë përkatësi",
+  "relationship_severance_notification.view": "Shiheni",
   "relative_time.days": "{number}d",
   "relative_time.full.days": "{number, plural, one {# ditë} other {# ditë}} më parë",
   "relative_time.full.hours": "{number, plural, one {# orë} other {# orë}} më parë",
diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json
index bb0d0b39e2aed8..abc9c37758f304 100644
--- a/app/javascript/mastodon/locales/uk.json
+++ b/app/javascript/mastodon/locales/uk.json
@@ -89,6 +89,14 @@
   "announcement.announcement": "Оголошення",
   "attachments_list.unprocessed": "(не оброблено)",
   "audio.hide": "Сховати аудіо",
+  "block_modal.remote_users_caveat": "Ми попросимо сервер {domain} поважати ваше рішення. Однак дотримання вимог не гарантується, оскільки деякі сервери можуть обробляти блоки по-різному. Загальнодоступні дописи все ще можуть бути видимими для користувачів, які не увійшли в систему.",
+  "block_modal.show_less": "Згорнути",
+  "block_modal.show_more": "Розгорнути",
+  "block_modal.they_cant_mention": "Вони не можуть згадувати та стежити за вами.",
+  "block_modal.they_cant_see_posts": "Вони не можуть бачити ваших дописів, а ви бачитимете їхні.",
+  "block_modal.they_will_know": "Вони можуть бачити, що вони заблоковані.",
+  "block_modal.title": "Заблокувати користувача?",
+  "block_modal.you_wont_see_mentions": "Ви не бачитимете дописів, де їх згадано.",
   "boost_modal.combo": "Ви можете натиснути {combo}, щоби пропустити це наступного разу",
   "bundle_column_error.copy_stacktrace": "Копіювати звіт про помилку",
   "bundle_column_error.error.body": "Неможливо показати запитану сторінку. Це може бути спричинено помилкою у нашому коді, або через проблему сумісності з браузером.",
@@ -169,6 +177,7 @@
   "confirmations.delete_list.message": "Ви впевнені, що хочете видалити цей список назавжди?",
   "confirmations.discard_edit_media.confirm": "Відкинути",
   "confirmations.discard_edit_media.message": "У вас є незбережені зміни в описі медіа або попереднього перегляду, все одно відкинути їх?",
+  "confirmations.domain_block.confirm": "Блокувати сервер",
   "confirmations.domain_block.message": "Ви точно, точно впевнені, що хочете заблокувати весь домен {domain}? У більшості випадків для нормальної роботи краще заблокувати або приховати лише деяких користувачів. Ви не зможете бачити контент з цього домену у будь-яких стрічках або ваших сповіщеннях. Ваші підписники з цього домену будуть відписані від вас.",
   "confirmations.edit.confirm": "Змінити",
   "confirmations.edit.message": "Редагування перезапише повідомлення, яке ви зараз пишете. Ви впевнені, що хочете продовжити?",
@@ -200,6 +209,16 @@
   "dismissable_banner.explore_statuses": "Ці дописи з цього та інших серверів децентралізованої мережі зараз набирають популярності на цьому сервері. Новіші дописи з частішим поширенням та додаванням до вподобаного мають вищий рейтинг.",
   "dismissable_banner.explore_tags": "Ці хештеги зараз набирають популярності серед людей на цьому та інших серверах децентралізованої мережі. Хештеги, які використовуються більшою кількістю людей, мають вищий рейтинг.",
   "dismissable_banner.public_timeline": "Це найновіші загальнодоступні дописи від людей в соціальній мережі, на які підписані люди в {domain}.",
+  "domain_block_modal.block": "Блокувати сервер",
+  "domain_block_modal.block_account_instead": "Блокувати @{name} натомість",
+  "domain_block_modal.they_can_interact_with_old_posts": "Люди з цього сервера можуть взаємодіяти зі своїми старими дописами.",
+  "domain_block_modal.they_cant_follow": "Ніхто з цього сервера не може слідкувати за вами.",
+  "domain_block_modal.they_wont_know": "Вони не знають, що їх заблоковано.",
+  "domain_block_modal.title": "Заблокувати домен?",
+  "domain_block_modal.you_will_lose_followers": "Усіх ваших підписників з цього сервера буде вилучено.",
+  "domain_block_modal.you_wont_see_posts": "Ви не бачитимете дописів і сповіщень від користувачів на цьому сервері.",
+  "domain_pill.server": "Сервер",
+  "domain_pill.username": "Ім'я користувача",
   "embed.instructions": "Вбудуйте цей допис до вашого вебсайту, скопіювавши код нижче.",
   "embed.preview": "Ось який вигляд це матиме:",
   "emoji_button.activity": "Діяльність",
@@ -397,6 +416,15 @@
   "loading_indicator.label": "Завантаження…",
   "media_gallery.toggle_visible": "{number, plural, one {Приховати зображення} other {Приховати зображення}}",
   "moved_to_account_banner.text": "Ваш обліковий запис {disabledAccount} наразі вимкнений, оскільки вас перенесено до {movedToAccount}.",
+  "mute_modal.hide_from_notifications": "Сховати зі сповіщень",
+  "mute_modal.hide_options": "Сховати опції",
+  "mute_modal.indefinite": "Доки я не перестану ігнорувати їх",
+  "mute_modal.show_options": "Показати опції",
+  "mute_modal.they_can_mention_and_follow": "Вони зможуть згадувати та стежити за вами, але ви їх не бачитимете.",
+  "mute_modal.they_wont_know": "Вони не знатимуть, що їх ігнорують.",
+  "mute_modal.title": "Ігнорувати користувача?",
+  "mute_modal.you_wont_see_mentions": "Ви не бачитимете дописів, де їх згадано.",
+  "mute_modal.you_wont_see_posts": "Вони все ще можуть бачити ваші дописи, але ви не бачитимете їхніх.",
   "navigation_bar.about": "Про застосунок",
   "navigation_bar.advanced_interface": "Відкрити в розширеному вебінтерфейсі",
   "navigation_bar.blocks": "Заблоковані користувачі",
@@ -432,6 +460,8 @@
   "notification.own_poll": "Ваше опитування завершилося",
   "notification.poll": "Опитування, у якому ви голосували, скінчилося",
   "notification.reblog": "{name} поширює ваш допис",
+  "notification.severedRelationships": "Зв'язки з {name} розірвані",
+  "notification.severed_relationships": "Зв'язки з {name} розірвані",
   "notification.status": "{name} щойно дописує",
   "notification.update": "{name} змінює допис",
   "notification_requests.accept": "Прийняти",
@@ -544,6 +574,12 @@
   "refresh": "Оновити",
   "regeneration_indicator.label": "Завантаження…",
   "regeneration_indicator.sublabel": "Хвилинку, ми готуємо вашу стрічку!",
+  "relationship_severance_notification.purged_data": "очищено адміністраторами",
+  "relationship_severance_notification.relationships": "{count, plural, one {# зв'язок} few {# зв'язки} many {# зв'язків} other {# зв'язок}}",
+  "relationship_severance_notification.types.account_suspension": "Обліковий запис призупинено",
+  "relationship_severance_notification.types.domain_block": "Домен призупинено",
+  "relationship_severance_notification.types.user_domain_block": "Ви заблокували цей домен",
+  "relationship_severance_notification.view": "Вигляд",
   "relative_time.days": "{number}д",
   "relative_time.full.days": "{number, plural, one {# день} few {# дні} other {# днів}} тому",
   "relative_time.full.hours": "{number, plural, one {# година} few {# години} other {# годин}} тому",
diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json
index 1a39dc235c6007..6ad7599060b678 100644
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@@ -471,6 +471,8 @@
   "notification.own_poll": "你的投票已经结束",
   "notification.poll": "你参与的一个投票已经结束",
   "notification.reblog": "{name} 转发了你的嘟文",
+  "notification.severedRelationships": "与 {name} 的关系已被切断",
+  "notification.severed_relationships": "与 {name} 的关系已被切断",
   "notification.status": "{name} 刚刚发布嘟文",
   "notification.update": "{name} 编辑了嘟文",
   "notification_requests.accept": "接受",
@@ -587,6 +589,12 @@
   "refresh": "刷新",
   "regeneration_indicator.label": "加载中…",
   "regeneration_indicator.sublabel": "你的主页动态正在准备中！",
+  "relationship_severance_notification.purged_data": "被管理员清除",
+  "relationship_severance_notification.relationships": "{count, plural, other {# 条关系}}",
+  "relationship_severance_notification.types.account_suspension": "账户已被封禁",
+  "relationship_severance_notification.types.domain_block": "域名已被封禁",
+  "relationship_severance_notification.types.user_domain_block": "你屏蔽了这个域名",
+  "relationship_severance_notification.view": "查看",
   "relative_time.days": "{number} 天前",
   "relative_time.full.days": "{number, plural, one {# 天} other {# 天}}前",
   "relative_time.full.hours": "{number, plural, one {# 小时} other {# 小时}}前",
diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json
index 30313d92f44821..e352985811d4f3 100644
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@@ -471,6 +471,8 @@
   "notification.own_poll": "您的投票已結束",
   "notification.poll": "您曾投過的投票已經結束",
   "notification.reblog": "{name} 已轉嘟您的嘟文",
+  "notification.severedRelationships": "已斷絕與 {name} 之服務關係",
+  "notification.severed_relationships": "已斷絕與 {name} 之服務關係",
   "notification.status": "{name} 剛剛嘟文",
   "notification.update": "{name} 已編輯嘟文",
   "notification_requests.accept": "接受",
@@ -587,6 +589,12 @@
   "refresh": "重新整理",
   "regeneration_indicator.label": "載入中…",
   "regeneration_indicator.sublabel": "您的首頁時間軸正在準備中！",
+  "relationship_severance_notification.purged_data": "已被管理員清除",
+  "relationship_severance_notification.relationships": "{count, plural, other {# 個服務關係}}",
+  "relationship_severance_notification.types.account_suspension": "該帳號已被停權",
+  "relationship_severance_notification.types.domain_block": "該網域已被停權",
+  "relationship_severance_notification.types.user_domain_block": "您已封鎖此網域",
+  "relationship_severance_notification.view": "檢視",
   "relative_time.days": "{number} 天",
   "relative_time.full.days": "{number, plural, other {# 天}}前",
   "relative_time.full.hours": "{number, plural, one {# 小時} other {# 小時}}前",
diff --git a/config/locales/be.yml b/config/locales/be.yml
index 0bdc3bb5548946..63f605e9fbbfc0 100644
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -1704,6 +1704,7 @@ be:
     import: Імпарт
     import_and_export: Імпарт і экспарт
     migrate: Перамяшчэнне ўліковага запісу
+    notifications: Email апавяшчэнні
     preferences: Налады
     profile: Профіль
     relationships: Падпіскі і падпісчыкі
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index feb4e74533074e..e888c2ea93f385 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -1659,10 +1659,22 @@ bg:
     preferences: Предпочитания
     profile: Профил
     relationships: Последвания и последователи
+    severed_relationships: Прекъснати връзки
     statuses_cleanup: Автоматично изтриване на публикации
     strikes: Модериране на предупреждения
     two_factor_authentication: Двустепенно удостоверяване
     webauthn_authentication: Ключове за сигурност
+  severed_relationships:
+    download: Изтегляне (%{count})
+    event_type:
+      account_suspension: Спиране на акаунта (%{target_name})
+      domain_block: Спиране на сървъра (%{target_name})
+      user_domain_block: Блокирахте %{target_name}
+    lost_followers: Загубени последователи
+    lost_follows: Загубени последвания
+    preamble: Може да загубите последванията и последователите, блокирайки домейн или когато модераторите ви решават да спрат отдалечен сървър. Случавайки се това, вие ще може да изтеглите списъците с прекъснати връзки, които да се проверят и възможно да се внесат на друг сървър.
+    purged: Сведенията за този сървър са били прочистени от администраторите на сървъра ви.
+    type: Събитие
   statuses:
     attached:
       audio:
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 2523db0eb0d5c3..3601d5bd8b6773 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -1659,10 +1659,22 @@ ca:
     preferences: Preferències
     profile: Perfil
     relationships: Seguits i seguidors
+    severed_relationships: Relacions eliminades
     statuses_cleanup: Esborrat automàtic de tuts
     strikes: Accions de mediació
     two_factor_authentication: Autenticació de dos factors
     webauthn_authentication: Claus de seguretat
+  severed_relationships:
+    download: Baixa (%{count})
+    event_type:
+      account_suspension: Suspensió del compte (%{target_name})
+      domain_block: Suspensió del servidor (%{target_name})
+      user_domain_block: Heu blocat %{target_name}
+    lost_followers: Seguidors perduts
+    lost_follows: Seguiments perduts
+    preamble: Quan bloqueu un domini o els vostres moderadors decideixen suspendre un servidor remot, es poden perdre seguidors i seguiments. Si això passa, podeu baixar-vos la llista de relacions trencades per a revisar-la i, si voleu, importar-les a un altre servidor.
+    purged: Els administradors del vostre servidor han purgat la informació relativa a aquest servidor.
+    type: Esdeveniment
   statuses:
     attached:
       audio:
diff --git a/config/locales/da.yml b/config/locales/da.yml
index eda22d5b9c5e00..63762f740cdafd 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -1659,10 +1659,21 @@ da:
     preferences: Præferencer
     profile: Offentlig profil
     relationships: Følger og følgere
+    severed_relationships: Afbrudte forhold
     statuses_cleanup: Auto-indlægssletning
     strikes: Moderationsadvarsler
     two_factor_authentication: Tofaktorgodkendelse
     webauthn_authentication: Sikkerhedsnøgler
+  severed_relationships:
+    download: Download (%{count})
+    event_type:
+      account_suspension: Kontosuspendering (%{target_name})
+      domain_block: Serversuspendering (%{target_name})
+      user_domain_block: "%{target_name} blev blokeret"
+    lost_followers: Tabte følgere
+    preamble: Der kan mistes fulgte objekter og følgere, når et domæne blokeres eller moderatorerne beslutter at suspendere en ekstern server. Når det sker, kan der downloades lister over afbrudte relationer til inspektion og mulig import på anden server.
+    purged: Oplysninger om denne server er blevet renset af serveradministratoreren.
+    type: Begivenhed
   statuses:
     attached:
       audio:
diff --git a/config/locales/devise.lv.yml b/config/locales/devise.lv.yml
index 6746e813d84573..94b4774b60f001 100644
--- a/config/locales/devise.lv.yml
+++ b/config/locales/devise.lv.yml
@@ -6,7 +6,7 @@ lv:
       send_instructions: Pēc dažām minūtēm saņemsi e-pastu ar norādījumiem, kā apstiprināt savu e-pasta adresi. Lūdzu, pārbaudi spama mapi, ja neesi saņēmis šo e-pastu.
       send_paranoid_instructions: Ja tava e-pasta adrese ir mūsu datu bāzē, pēc dažām minūtēm saņemsi e-pastu ar norādījumiem, kā apstiprināt savu e-pasta adresi. Lūdzu, pārbaudi spama mapi, ja neesi saņēmis šo e-pastu.
     failure:
-      already_authenticated: Jau esi pierakstījies.
+      already_authenticated: Tu jau esi pieteicies.
       inactive: Tavs konts vēl nav aktivizēts.
       invalid: Nederīga %{authentication_keys} vai parole.
       last_attempt: Tev ir vēl viens mēģinājums, pirms tavs konts tiks bloķēts.
@@ -22,7 +22,7 @@ lv:
         action: Apstiprini savu e-pasta adresi
         action_with_app: Apstiprināt un atgriezties %{app}
         explanation: Ar šo e-pasta adresi esi izveidojis kontu vietnē %{host}. Tu esi viena klikšķa attālumā no tā aktivizēšanas. Ja tas nebiji tu, lūdzu, ignorē šo e-pasta ziņojumu.
-        explanation_when_pending: Tu pieteicies uzaicinājumam uz %{host} ar šo e-pasta adresi. Kad būsi apstiprinājis savu e-pasta adresi, mēs izskatīsim pieteikumu. Tu vari pierakstīties, lai mainītu savu informāciju vai dzēstu savu kontu, taču nevari piekļūt lielākajai daļai funkciju, kamēr tavs konts nav apstiprināts. Ja tavs pieteikums tiks noraidīts, tavi dati tiks noņemti, tāpēc tev nebūs jāveic nekādas darbības. Ja tas nebiji tu, lūdzu, ignorē šo e-pasta ziņojumu.
+        explanation_when_pending: Tu pieteicies uzaicinājumam uz %{host} ar šo e-pasta adresi. Kad būsi apstiprinājis savu e-pasta adresi, mēs izskatīsim pieteikumu. Tu vari pieteikties, lai mainītu savu informāciju vai izdzēstu savu kontu, taču Tu nevari piekļūt lielākajai daļai iespēju, kamēr Tavs konts nav apstiprināts. Ja Tavs pieteikums tiks noraidīts, Tavi dati tiks noņemti, tāpēc Tev nebūs jāveic nekādas darbības. Ja tas nebiji Tu, lūgums neņemt vērā šo e-pasta ziņojumu.
         extra_html: Lūdzu, pārskati arī <a href="%{terms_path}">servera noteikumus</a> un <a href="%{policy_path}"> mūsu pakalpojumu sniegšanas noteikumus</a>.
         subject: 'Mastodon: Apstiprināšanas norādījumi %{instance}'
         title: Apstiprini savu e-pasta adresi
@@ -90,7 +90,7 @@ lv:
       no_token: Tu nevari piekļūt šai lapai, ja neesi saņēmis paroles atiestatīšanas e-pasta ziņojumu. Ja ienāci no paroles atiestatīšanas e-pasta, lūdzu, pārliecinies, vai izmanto visu norādīto URL.
       send_instructions: Ja tava e-pasta adrese ir mūsu datu bāzē, pēc dažām minūtēm uz savu e-pasta adresi saņemsi paroles atkopšanas saiti. Lūdzu, pārbaudi spama mapi, ja neesi saņēmis šo e-pastu.
       send_paranoid_instructions: Ja tava e-pasta adrese ir mūsu datu bāzē, pēc dažām minūtēm uz savu e-pasta adresi saņemsi paroles atkopšanas saiti. Lūdzu, pārbaudi spama mapi, ja neesi saņēmis šo e-pastu.
-      updated: Tava parole ir veiksmīgi nomainīta. Tagad tu esi pierakstījies.
+      updated: Tava parole tika veiksmīgi nomainīta. Tu tagad esi pieteicies.
       updated_not_active: Tava parole ir veiksmīgi nomainīta.
     registrations:
       destroyed: Visu labu! Tavs konts ir veiksmīgi atcelts. Mēs ceram tevi drīz atkal redzēt.
@@ -103,7 +103,7 @@ lv:
       updated: Tavs konts ir veiksmīgi atjaunināts.
     sessions:
       already_signed_out: Veiksmīgi izrakstījies.
-      signed_in: Veiksmīgi pierakstījies.
+      signed_in: Veiksmīgi pieteicies.
       signed_out: Veiksmīgi izrakstījies.
     unlocks:
       send_instructions: Pēc dažām minūtēm tu saņemsi e-pastu ar norādījumiem, kā atbloķēt savu kontu. Lūdzu, pārbaudi spama mapi, ja neesi saņēmis šo e-pastu.
diff --git a/config/locales/devise.nn.yml b/config/locales/devise.nn.yml
index 01d6e5a468d390..e9e8e1f6e0a3c9 100644
--- a/config/locales/devise.nn.yml
+++ b/config/locales/devise.nn.yml
@@ -66,11 +66,11 @@ nn:
         subject: 'Mastodon: Instruksjonar for å opne kontoen igjen'
       webauthn_credential:
         added:
-          explanation: Følgende sikkerhetsnøkkel har blitt lagt til i kontoen din
+          explanation: Denne tryggingsnykjelen er lagt til kontoen din
           subject: 'Mastodon: Ny sikkerheitsnøkkel'
           title: Ein ny sikkerheitsnøkkel har blitt lagt til
         deleted:
-          explanation: Den følgande sikkerheitsnøkkelen har blitt sletta frå kontoen din
+          explanation: Denne tryggingsnykjelen er sletta frå kontoen din
           subject: 'Mastodon: Sikkerheitsnøkkel sletta'
           title: Ein av sikkerheitsnøklane dine har blitt sletta
       webauthn_disabled:
diff --git a/config/locales/doorkeeper.nl.yml b/config/locales/doorkeeper.nl.yml
index 65e2bfcb7aec47..b3e6e79a1a3d62 100644
--- a/config/locales/doorkeeper.nl.yml
+++ b/config/locales/doorkeeper.nl.yml
@@ -164,7 +164,7 @@ nl:
       admin:write:ip_blocks: moderatieacties op geblokkeerde IP-adressen uitvoeren
       admin:write:reports: moderatieacties op rapportages uitvoeren
       crypto: end-to-end-encryptie gebruiken
-      follow: relaties tussen accounts bewerken
+      follow: volgrelaties tussen accounts bewerken
       push: jouw pushmeldingen ontvangen
       read: alle gegevens van jouw account lezen
       read:accounts: informatie accounts bekijken
diff --git a/config/locales/doorkeeper.zh-TW.yml b/config/locales/doorkeeper.zh-TW.yml
index f9813b13196044..f2250b79cbce02 100644
--- a/config/locales/doorkeeper.zh-TW.yml
+++ b/config/locales/doorkeeper.zh-TW.yml
@@ -130,7 +130,7 @@ zh-TW:
         favourites: 最愛
         filters: 過濾器
         follow: 跟隨、靜音與封鎖
-        follows: 跟隨的使用者
+        follows: 正在跟隨
         lists: 列表
         media: 多媒體附加檔案
         mutes: 靜音
diff --git a/config/locales/es-AR.yml b/config/locales/es-AR.yml
index 633291110766c2..2e21c73279eadc 100644
--- a/config/locales/es-AR.yml
+++ b/config/locales/es-AR.yml
@@ -597,6 +597,9 @@ es-AR:
       actions_description_html: Decidí qué medidas tomar para resolver esta denuncia. Si tomás una acción punitiva contra la cuenta denunciada, se le enviará a dicha cuenta una notificación por correo electrónico, excepto cuando se seleccione la categoría <strong>Spam</strong>.
       actions_description_remote_html: Decidí qué medidas tomar para resolver esta denuncia. Esto sólo afectará la forma en que <strong>tu servidor</strong> se comunica con esta cuenta remota y maneja su contenido.
       add_to_report: Agregar más a la denuncia
+      already_suspended_badges:
+        local: Ya suspendido en este servidor
+        remote: Ya suspendido en su servidor
       are_you_sure: "¿Estás seguro?"
       assign_to_self: Asignármela a mí
       assigned: Moderador asignado
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 2f7877afed5809..22ee45d3bf93ac 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -597,6 +597,9 @@ es:
       actions_description_html: Decide qué medidas tomar para resolver esta denuncia. Si tomas una acción punitiva contra la cuenta denunciada, se le enviará a dicha cuenta una notificación por correo electrónico, excepto cuando se seleccione la categoría <strong>Spam</strong>.
       actions_description_remote_html: Decide qué medidas tomar para resolver este informe. Esto solo afectará a la forma en que <strong>tu servidor</strong> se comunica con esta cuenta remota y gestiona su contenido.
       add_to_report: Añadir más al reporte
+      already_suspended_badges:
+        local: Ya suspendido en este servidor
+        remote: Ya suspendido en su servidor
       are_you_sure: "¿Estás seguro?"
       assign_to_self: Asignármela a mí
       assigned: Moderador asignado
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index 4238e71c841cb7..3e770b85c96ddc 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -1663,10 +1663,22 @@ eu:
     preferences: Hobespenak
     profile: Profila
     relationships: Jarraitutakoak eta jarraitzaileak
+    severed_relationships: Indartutako erlazioak
     statuses_cleanup: Bidalketak automatikoki ezabatzea
     strikes: Moderazio neurriak
     two_factor_authentication: Bi faktoreetako autentifikazioa
     webauthn_authentication: Segurtasun gakoak
+  severed_relationships:
+    download: Deskargatu (%{count})
+    event_type:
+      account_suspension: Kontua bertan behera uztea (%{target_name})
+      domain_block: Domeinua bertan behera uztea (%{target_name})
+      user_domain_block: "%{target_name} blokeatu duzu"
+    lost_followers: Galdutako jarraitzaileak
+    lost_follows: Jarraitzeari utzi diozun jendea
+    preamble: Jarraitzaileak gal ditzakezu, baita jendea jarraitzeari utzi domeinu bat blokeatzen duzunean edo moderatzaileek urruneko zerbitzari bat bertan behera uztea erabakitzen badute. Hau gertatzean, galdutako erlazioen zerrendak deskargatu ahalko dituzu, aztertzeko eta agian, beste zerbitzari batean inportatzeko.
+    purged: Zerbitzari honen informazioa kendu du zerbitzariko administratzaileak.
+    type: Gertaera
   statuses:
     attached:
       audio:
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 0ba5931e5a0ed9..fe5956fd5846a6 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -1659,10 +1659,22 @@ fi:
     preferences: Ominaisuudet
     profile: Julkinen profiili
     relationships: Seuratut ja seuraajat
+    severed_relationships: Katkenneet suhteet
     statuses_cleanup: Autom. julkaisujen poisto
     strikes: Valvontavaroitukset
     two_factor_authentication: Kaksivaiheinen todennus
     webauthn_authentication: Suojausavaimet
+  severed_relationships:
+    download: Lataa (%{count})
+    event_type:
+      account_suspension: Tilin jäädytys (%{target_name})
+      domain_block: Palvelimen jäädytys (%{target_name})
+      user_domain_block: Estit käyttäjän %{target_name}
+    lost_followers: Menetetyt seuraajat
+    lost_follows: Menetetyt seuratut
+    preamble: Voit menettää seurattusi ja seuraajasi, kun estät verkkotunnuksen tai kun valvojasi päättävät jäädyttää etäpalvelimen. Kun näin tapahtuu, voit ladata luetteloita katkenneista suhteista, jotta voit tarkastella niitä ja mahdollisesti viedä ne toiselle palvelimelle.
+    purged: Palvelimesi ylläpitäjät ovat tyhjentäneet tämän palvelimen tiedot.
+    type: Tapahtuma
   statuses:
     attached:
       audio:
diff --git a/config/locales/fo.yml b/config/locales/fo.yml
index 49d206bbb98af3..1850c2a3b82f64 100644
--- a/config/locales/fo.yml
+++ b/config/locales/fo.yml
@@ -1659,10 +1659,22 @@ fo:
     preferences: Stillingar
     profile: Vangi
     relationships: Fylging og fylgjarar
+    severed_relationships: Avbrotin tilknýti
     statuses_cleanup: Sjálvvirkandi striking av postum
     strikes: Umsjónaratsóknir
     two_factor_authentication: Váttan í tveimum stigum
     webauthn_authentication: Trygdarlyklar
+  severed_relationships:
+    download: Niðurtøkur (%{count})
+    event_type:
+      account_suspension: Kontuógilding (%{target_name})
+      domain_block: Ambætara-ógilding (%{target_name})
+      user_domain_block: Tú hevur forðað %{target_name}
+    lost_followers: Mistir fylgjarar
+    lost_follows: Mist fylgi
+    preamble: Tá ið tú forðar einum økisnavni, ella tínir umsitarar velja at avgilda ein fjarambætara, kanst tú missa fylgi og fylgjarar. Um tað hendir, kanst tú taka ein lista av avbrotnum tilknýtum niður, sum tú kanst eftirhyggja og møguliga innflyta á ein nýggjan ambætara.
+    purged: Umsitararnir fyri tín ambætara hava tømt upplýsingar um henda ambætara úr skipanini.
+    type: Tiltak
   statuses:
     attached:
       audio:
diff --git a/config/locales/gd.yml b/config/locales/gd.yml
index 381a0a8b40ab8f..d61c79aa56eecb 100644
--- a/config/locales/gd.yml
+++ b/config/locales/gd.yml
@@ -621,6 +621,9 @@ gd:
       actions_description_html: Socraich dè a nì thu airson an gearan seo fhuasgladh. Ma chuireas tu peanas air a’ chunntas le gearan air, gheibh iad brath air a’ phost-d mura tagh thu an roinn-seòrsa <strong>Spama</strong>.
       actions_description_remote_html: Cuir romhad dè an gnìomh a ghabhas tu airson an gearan seo fhuasgladh. Cha bheir seo buaidh ach air mar a làimhsicheas am frithealaiche <strong>agadsa</strong> an cunntas cèin seo is mar a nì e conaltradh leis.
       add_to_report: Cuir barrachd ris a’ ghearan
+      already_suspended_badges:
+        local: Chaidh an cur à rèim air an fhrithealaiche seo mu thràth
+        remote: Chaidh an cur à rèim air an fhrithealaiche aca-san mu thràth
       are_you_sure: A bheil thu cinnteach?
       assign_to_self: Iomruin dhomh-sa
       assigned: Maor iomruinte
@@ -1704,13 +1707,25 @@ gd:
     import: Ion-phortadh
     import_and_export: Ion-phortadh ⁊ às-phortadh
     migrate: Imrich cunntais
+    notifications: Brathan puist-d
     preferences: Roghainnean
     profile: Pròifil phoblach
     relationships: Dàimhean leantainn
+    severed_relationships: Dàimhean dealaichte
     statuses_cleanup: Sguabadh às phostaichean
     strikes: Rabhaidhean na maorsainneachd
     two_factor_authentication: Dearbhadh dà-cheumnach
     webauthn_authentication: Iuchraichean tèarainteachd
+  severed_relationships:
+    download: Luchdaich a-nuas (%{count})
+    event_type:
+      account_suspension: Cunntas à rèim (%{target_name})
+      domain_block: Frithealaiche à rèim (%{target_name})
+      user_domain_block: Bhac thu %{target_name}
+    lost_followers: An luchd-leantainn a chaill thu
+    lost_follows: Daoine nach lean thu tuilleadh
+    purged: Chaidh am fiosrachadh mun fhrithealaiche seo a phurgaideachadh le rianairean an fhrithealaiche agad.
+    type: Tachartas
   statuses:
     attached:
       audio:
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 7b0e72cfcd55f7..4ea0a9652ffa03 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -1655,14 +1655,26 @@ hu:
     import: Importálás
     import_and_export: Import és export
     migrate: Fiók átirányítása
-    notifications: E-mail értesítések
+    notifications: E-mail-értesítések
     preferences: Beállítások
     profile: Profil
     relationships: Követések és követők
+    severed_relationships: Megszakított kapcsolatok
     statuses_cleanup: Bejegyzések automatikus törlése
     strikes: Moderációs felrótt vétségek
     two_factor_authentication: Kétlépcsős hitelesítés
     webauthn_authentication: Biztonsági kulcsok
+  severed_relationships:
+    download: Letöltés (%{count})
+    event_type:
+      account_suspension: Fiók felfüggesztése (%{target_name})
+      domain_block: Kiszolgáló felfüggesztése (%{target_name})
+      user_domain_block: 'Blokkoltad ezt: %{target_name}'
+    lost_followers: Elvesztett követők
+    lost_follows: Elvesztett követések
+    preamble: Ha blokkolsz egy domaint, vagy ha a moderátorok úgy döntenek, hogy blokkolnak egy távoli kiszolgálót, akkor követőket és követéseket veszíthetsz. Amikor ez megtörténik, akkor letöltheted a megszakadt kapcsolatokat, hogy átvizsgáld őket, és esetleg egy másik kiszolgálón importáld őket.
+    purged: A kiszolgáló információit a kiszolgálód rendszergazdái véglegesen eltávolították.
+    type: Esemény
   statuses:
     attached:
       audio:
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 82472788dc21a6..c556c9e816b02e 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -1635,10 +1635,22 @@ ko:
     preferences: 환경설정
     profile: 공개 프로필
     relationships: 팔로잉과 팔로워
+    severed_relationships: 단절된 관계들
     statuses_cleanup: 게시물 자동 삭제
     strikes: 중재 기록
     two_factor_authentication: 2단계 인증
     webauthn_authentication: 보안 키
+  severed_relationships:
+    download: 다운로드 (%{count})
+    event_type:
+      account_suspension: 계정 정지 (%{target_name})
+      domain_block: 서버 정지 (%{target_name})
+      user_domain_block: 내가 %{target_name}을 차단했습니다
+    lost_followers: 잃은 팔로워
+    lost_follows: 잃은 팔로우
+    preamble: 내가 도메인을 차단하거나 중재진이 다른 서버를 정지하기로 결정했다면 내 팔로우와 팔로워를 잃게 됩니다. 그런 일이 일어났다면 그로 인해 단절된 관계들의 목록을 다운로드 받아 확인하고 다른 서버에서 불러올 수 있습니다.
+    purged: 이 서버에 대한 정보는 관리자에 의해 삭제되었습니다.
+    type: 이벤트
   statuses:
     attached:
       audio:
diff --git a/config/locales/lad.yml b/config/locales/lad.yml
index 0f04ce8928713f..3aaac3ab5ab504 100644
--- a/config/locales/lad.yml
+++ b/config/locales/lad.yml
@@ -1655,6 +1655,7 @@ lad:
     import: Importo
     import_and_export: Importo i eksporto
     migrate: Migrasyon de kuento
+    notifications: Avizos por posta elektronika
     preferences: Preferensyas
     profile: Profil publiko
     relationships: Segidos i suivantes
@@ -1662,6 +1663,9 @@ lad:
     strikes: Amonestamientos de moderasyon
     two_factor_authentication: Autentifikasyon en dos pasos
     webauthn_authentication: Yaves de sigurita
+  severed_relationships:
+    download: Abasha (%{count})
+    type: Evenimiento
   statuses:
     attached:
       audio:
@@ -1862,6 +1866,9 @@ lad:
       follows_subtitle: Sige kuentos konesidos
       follows_title: A ken segir
       follows_view_more: Ve mas personas para segir
+      hashtags_recent_count:
+        one: "%{people} persona en los ultimos 2 diyas"
+        other: "%{people} personas en los ultimos 2 diyas"
       hashtags_subtitle: Eksplora los trendes de los ultimos 2 diyas
       hashtags_title: Etiketas en trend
       hashtags_view_more: Ve mas etiketas en trend
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index 481cd94f788a60..ee839540075d6a 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -16,9 +16,9 @@ lv:
     instance_actor_flash: Šis konts ir virtuāls aktieris, ko izmanto, lai pārstāvētu pašu serveri, nevis atsevišķu lietotāju. To izmanto federācijas nolūkos, un to nevajadzētu apturēt.
     last_active: pēdējā aktivitāte
     link_verified_on: Šīs saites piederība tika pārbaudīta %{date}
-    nothing_here: Te nekā nav!
+    nothing_here: Šeit nekā nav.
     pin_errors:
-      following: Tev jau ir jāseko personai, kuru vēlies apstiprināt
+      following: Tev ir jāseko personai, kuru vēlies atbalstīt
     posts:
       one: Ziņa
       other: Ziņas
@@ -575,7 +575,7 @@ lv:
     relays:
       add_new: Pievienot jaunu releju
       delete: Dzēst
-      description_html: "<strong>Federācijas relejs</strong> ir starpniekserveris, kas apmainās ar lielu publisko ziņu apjomu starp serveriem, kas to abonē un publicē. <strong>Tas var palīdzēt maziem un vidējiem serveriem atklāt saturu no federācijas</strong>, pretējā gadījumā vietējiem lietotājiem manuāli jāseko citām personām attālos serveros."
+      description_html: "<strong>Federācijas pārraidītājs</strong> ir starpniekserveris, kas apmainās ar lielu publisko ierakstu apjomu starp serveriem, kas to abonē un publicē tajā. <strong>Tas var palīdzēt maziem un vidējiem serveriem atklāt saturu fediversā</strong>, pretējā gadījumā vietējiem lietotājiem būtu pasrocīgi jāseko citiem cilvēkiem attālos serveros."
       disable: Atspējot
       disabled: Atspējots
       enable: Iespējot
@@ -659,7 +659,7 @@ lv:
         actions:
           delete_html: Noņemt aizskarošās ziņas
           mark_as_sensitive_html: Atzīmēt aizskarošo ziņu multivides saturu kā sensitīvu
-          silence_html: Ievērojami ierobežojiet <strong>@%{acct}</strong> sasniedzamību, padarot viņa profilu un saturu redzamu tikai personām, kas jau seko viņiem vai manuāli meklē profilu
+          silence_html: Ievērojami ierobežo <strong>@%{acct}</strong> sasniedzamību, padarot viņa profilu un saturu redzamu tikai cilvēkiem, kas jau seko tam vai pašrocīgi uzmeklē profilu
           suspend_html: Apturēt <strong>@%{acct}</strong>, padarot viņu profilu un saturu nepieejamu un neiespējamu mijiedarbību ar
         close_report: 'Atzīmēt ziņojumu #%{id} kā atrisinātu'
         close_reports_html: Atzīmējiet <strong>visus</strong> pārskatus par <strong>@%{acct}</strong> kā atrisinātus
@@ -902,9 +902,9 @@ lv:
         publishers:
           no_publisher_selected: Neviens publicētājs netika mainīts, jo neviens netika atlasīts
         shared_by_over_week:
-          one: Pēdējās nedēļas laikā kopīgoja viena persona
+          one: Pēdējās nedēļas laikā kopīgoja viens cilvēks
           other: Pēdējās nedēļas laikā kopīgoja %{count} cilvēki
-          zero: Pēdējās nedēļas laikā kopīgoja %{count} personas
+          zero: Pēdējās nedēļas laikā kopīgoja %{count} cilvēku
         title: Populārākās saites
         usage_comparison: Šodien kopīgots %{today} reizes, salīdzinot ar %{yesterday} vakar
       not_allowed_to_trend: Popularizešana nav atļauta
@@ -944,7 +944,7 @@ lv:
         not_trendable: Neparādīsies pie tendencēm
         not_usable: Nevar tikt lietots
         peaked_on_and_decaying: Sasniedza maksimumu %{date}, tagad samazinās
-        title: Populārākie tēmturi
+        title: Izplatīti tēmturi
         trendable: Var parādīsies pie tendencēm
         trending_rank: 'Populārākie #%{rank}'
         usable: Var tikt lietots
@@ -952,7 +952,7 @@ lv:
         used_by_over_week:
           one: Pēdējās nedēļas laikā izmantoja viens cilvēks
           other: Pēdējās nedēļas laikā izmantoja %{count} cilvēki
-          zero: Pēdējās nedēļas laikā izmantoja %{count} personas
+          zero: Pēdējās nedēļas laikā izmantoja %{count} cilvēku
       title: Tendences
       trending: Populārākie
     warning_presets:
@@ -1015,7 +1015,7 @@ lv:
       new_trending_statuses:
         title: Populārākās ziņas
       new_trending_tags:
-        title: Populārākie tēmturi
+        title: Izplatīti tēmturi
       subject: Tiek pārskatītas jaunas tendences %{instance}
   aliases:
     add_new: Izveidot aizstājvārdu
@@ -1040,7 +1040,7 @@ lv:
     salutation: "%{name},"
     settings: 'Mainīt e-pasta uztādījumus: %{link}'
     unsubscribe: Atcelt abonēšanu
-    view: 'Skatījums:'
+    view: 'Skatīt:'
     view_profile: Skatīt profilu
     view_status: Skatīt ziņu
   applications:
@@ -1119,7 +1119,7 @@ lv:
       title: Pierakstīties %{domain}
     sign_up:
       manual_review: Reģistrācijas domēnā %{domain} manuāli pārbauda mūsu moderatori. Lai palīdzētu mums apstrādāt tavu reģistrāciju, uzraksti mazliet par sevi un to, kāpēc vēlies kontu %{domain}.
-      preamble: Izmantojot kontu šajā Mastodon serverī, tu varēsi sekot jebkurai citai personai tīklā neatkarīgi no tā, kur tiek mitināts viņas konts.
+      preamble: Ar kontu šajā Mastodon serverī varēsi sekot jebkuram citam tīklā esošam cilvēkam neatkarīgi no tā, kur tiek mitināts viņa konts.
       title: Atļauj tevi iestatīt %{domain}.
     status:
       account_status: Konta statuss
@@ -1351,7 +1351,7 @@ lv:
       following_html: Tu gatavojies <strong>sekot</strong> līdz pat <strong>%{total_items} kontiem</strong> no <strong>%{filename}</strong>.
       lists_html: Tu gatavojies pievienot līdz pat <strong>%{total_items} kontiem</strong> no <strong>%{filename}</strong> saviem <strong>sarakstiem</strong>. Jauni saraksti tiks izveidoti, ja nav saraksta, ko pievienot.
       muting_html: Tu gatavojies <strong>noklusināt</strong> līdz pat <strong>%{total_items} kontiem</strong> no <strong>%{filename}</strong>.
-    preface: Tu vari importēt datus, kurus esi eksportējis no cita servera, piemēram, to personu sarakstu, kurām tu seko vai kuras bloķē.
+    preface: Tu vari ievietot datus, kurus esi izguvis no cita servera, kā, piemēram, cilvēku sarakstu, kuriem Tu seko vai kurus bloķē.
     recent_imports: Nesen importēts
     states:
       finished: Pabeigts
@@ -1481,7 +1481,7 @@ lv:
       report:
         subject: "%{name} iesniedza ziņojumu"
       sign_up:
-        subject: "%{name} ir pierakstījies"
+        subject: "%{name} pierakstījās"
     favourite:
       body: 'Tavu ziņu izlasei pievienoja %{name}:'
       subject: "%{name} pievienoja tavu ziņu izlasei"
@@ -1708,9 +1708,9 @@ lv:
       reblog: Izceltu ierakstu nevar piespraust
     poll:
       total_people:
-        one: "%{count} persona"
+        one: "%{count} cilvēks"
         other: "%{count} cilvēki"
-        zero: "%{count} personu"
+        zero: "%{count} cilvēku"
       total_votes:
         one: "%{count} balss"
         other: "%{count} balsis"
@@ -1826,7 +1826,7 @@ lv:
       explanation:
         delete_statuses: Tika konstatēts, ka dažas no tavām ziņām pārkāpj vienu vai vairākas kopienas vadlīnijas, un rezultātā %{instance} moderatori tās noņēma.
         disable: Tu vairs nevari izmantot savu kontu, taču tavs profils un citi dati paliek neskarti. Tu vari pieprasīt savu datu dublējumu, mainīt konta iestatījumus vai dzēst kontu.
-        mark_statuses_as_sensitive: "%{instance} moderatori dažas no tavām ziņām ir atzīmējušas kā sensitīvas. Tas nozīmē, ka cilvēkiem būs jāpieskaras ziņās esošajai multividei, pirms tiek parādīts priekšskatījums. Tu arī pats vari atzīmēt mediju kā sensitīvu, kad tādu publicēsi turpmāk."
+        mark_statuses_as_sensitive: "%{instance} moderatori dažus no Taviem ierakstiem ir atzīmējuši kā jutīgus. Tas nozīmē, ka cilvēkiem būs jāpiesit ierakstos esošajiem informāijas nesējiem, pirms tiek attēlots priekšskatījums. Tu arī pats vari atzīmēt informācijas nesēju kā jutīgu, kad nākotnē tādu ievietosi."
         sensitive: No šī brīža visi augšupielādētie multivides faili tiks atzīmēti kā sensitīvi un paslēpti aiz klikšķa brīdinājuma.
         silence: Tu joprojām vari izmantot savu kontu, taču tikai tie cilvēki, kuri jau tev seko, redzēs tavas ziņas šajā serverī, un tev var tikt liegtas dažādas atklāšanas funkcijas. Tomēr citi joprojām var tev manuāli sekot.
         suspend: Tu vairs nevari izmantot savu kontu, un tavs profils un citi dati vairs nav pieejami. Tu joprojām vari pieteikties, lai pieprasītu savu datu dublēšanu, līdz dati tiks pilnībā noņemti aptuveni 30 dienu laikā, taču mēs saglabāsim dažus pamata datus, lai neļautu tev izvairīties no apturēšanas.
@@ -1849,8 +1849,15 @@ lv:
         silence: Konts ierobežots
         suspend: Konts apturēts
     welcome:
+      edit_profile_action: Pielāgot
+      edit_profile_title: Pielāgo savu profilu
       explanation: Šeit ir daži padomi, kā sākt darbu
       feature_creativity: Mastodon nodrošina skaņas, video un attēlu ierakstus, pieejamības aprakstus, aptaujas, satura brīdinājumus, animētus profila attēlus, pielāgotas emocijzīmes, sīktēlu apgriešanas vadīklas un vēl, lai palīdzētu Tev sevi izpaust tiešsaistē. Vai Tu izplati savu mākslu, mūziku vai aplādes, Mastodon ir šeit ar Tevi.
+      follow_title: Pielāgo savu mājas barotni
+      hashtags_recent_count:
+        one: "%{people} cilvēks pēdējās 2 dienās"
+        other: "%{people} cilvēki pēdējās 2 dienās"
+        zero: "%{people} cilvēku pēdējās divās dienās"
       subject: Laipni lūgts Mastodon
       title: Laipni lūgts uz borta, %{name}!
   users:
@@ -1859,11 +1866,11 @@ lv:
     invalid_otp_token: Nederīgs divfaktora kods
     otp_lost_help_html: Ja esi zaudējis piekļuvi abiem, tu vari sazināties ar %{email}
     seamless_external_login: Tu esi pieteicies, izmantojot ārēju pakalpojumu, tāpēc paroles un e-pasta iestatījumi nav pieejami.
-    signed_in_as: 'Pierakstījies kā:'
+    signed_in_as: 'Pieteicies kā:'
   verification:
-    extra_instructions_html: <strong>Padoms.</strong> saite tavā vietnē var būt neredzama. Svarīga daļa ir <code>rel="me"</code>, kas novērš uzdošanos vietnēs ar lietotāju ģenerētu saturu. Tu vari pat lapas galvenē izmantot tagu <code>link</code>, nevis <code>a</code>, taču HTML ir jābūt pieejamam, neizpildot JavaScript.
+    extra_instructions_html: <strong>Padoms:</strong> saite Tavā vietnē var būt neredzama. Svarīga daļa ir <code>rel="me"</code>, kas novērš uzdošanos vietnēs ar lietotāju izveidotu saturu. Tu pat vari lapas galvenē izmantot tagu <code>link</code>, nevis <code>a</code>, taču HTML ir jābūt pieejamam bez JavaScript izpildīšanas.
     here_is_how: Lūk, kā
-    hint_html: "<strong>Ikviens var apliecināt savu identitāti Mastodon.</strong> Pamatojoties uz atvērtiem tīmekļa standartiem, tagad un uz visiem laikiem bez maksas. Viss, kas tev nepieciešams, ir personīga vietne, pēc kuras cilvēki tevi atpazīst. Kad no sava profila izveidosi saiti uz šo vietni, mēs pārbaudīsim, vai vietne novirza atpakaļ uz tavu profilu, un tajā tiks parādīts vizuāls indikators."
+    hint_html: "<strong>Ikviens var apliecināt savu identitāti Mastodon.</strong> Balstīts uz atvērtiem tīmekļa standartiem, tagad un uz visiem laikiem bez maksas. Viss, kas Tev nepieciešams, ir personīga vietne, pēc kuras cilvēki Tevi atpazīst. Kad savā profilu sasaistīsi ar šo tīmekļvietni, mēs pārbaudīsim, vai tīmekļvietnei ir saite uz Tavu profilu, un tajā tiks parādīts redzama norāde."
     instructions_html: Ievieto starpliktuvē un ielīmē tālāk norādīto kodu savas tīmekļvietnes HTML! Tad pievieno savas tīmekļvietnes adresi vienā no papildu laukiem savā profila cilnē "Labot profilu" un saglabā izmaiņas!
     verification: Pārbaude
     verified_links: Tavas verifikācijas saites
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 561a0f0af81789..91aabb1fa5e1c5 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -560,7 +560,7 @@ nl:
       no_ip_block_selected: Er zijn geen IP-regels veranderd, omdat er geen een was geselecteerd
       title: IP-regels
     relationships:
-      title: Relaties van %{acct}
+      title: Volgrelaties van %{acct}
     relays:
       add_new: Nieuwe relayserver toevoegen
       delete: Verwijderen
@@ -1572,7 +1572,7 @@ nl:
     moved: Verhuisd
     mutual: Wederzijds
     primary: Primair
-    relationship: Relatie
+    relationship: Volgrelatie
     remove_selected_domains: Alle volgers van de geselecteerde domeinen verwijderen
     remove_selected_followers: Geselecteerde volgers verwijderen
     remove_selected_follows: Geselecteerde gebruikers ontvolgen
@@ -1659,10 +1659,22 @@ nl:
     preferences: Voorkeuren
     profile: Openbaar profiel
     relationships: Volgers en gevolgde accounts
+    severed_relationships: Verbroken volgrelaties
     statuses_cleanup: Automatisch berichten verwijderen
     strikes: Vastgestelde overtredingen
     two_factor_authentication: Tweestapsverificatie
     webauthn_authentication: Beveiligingssleutels
+  severed_relationships:
+    download: Downloaden (%{count})
+    event_type:
+      account_suspension: Accountschorsing (%{target_name})
+      domain_block: Serverschorsing (%{target_name})
+      user_domain_block: Je hebt %{target_name} geblokkeerd
+    lost_followers: Verloren volgers
+    lost_follows: Verloren gevolgde accounts
+    preamble: Je kan gevolgde accounts en volgers verliezen wanneer je een domein blokkeert of wanneer de moderators van jouw server beslissen om een externe server op te schorten. Wanneer dat gebeurt, kun je lijsten van verbroken volgrelaties downloaden, deze inspecteren en mogelijk importeren op een andere server.
+    purged: Informatie over deze server is verwijderd door de beheerders van jouw server.
+    type: Gebeurtenis
   statuses:
     attached:
       audio:
diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index 983dd0142100e8..1470dc9fc0633e 100644
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -391,7 +391,7 @@ nn:
         remove_all_data: Dette vil fjerna alt innhald, media og profildata for kontoar som tilhøyrer dette domenet frå din tenar.
         stop_communication: Tenaren din vil slutta å kommunisera med desse tenarane.
         title: Stadfest domeneblokkering for %{domain}
-        undo_relationships: Dette vil oppheve alle følgar-relasjonar mellom kontoane dine og kontoar på desse tenerane.
+        undo_relationships: Dette vil oppheve alle fylgjar-relasjonar mellom kontoane dine og kontoar på desse tenerane.
       created_msg: Domeneblokkering blir nå behandlet
       destroyed_msg: Domeneblokkering har nå blitt angret
       domain: Domene
@@ -404,7 +404,7 @@ nn:
         create: Lag blokkering
         hint: Domeneblokkeringen vil ikke hindre opprettelse av kontooppføringer i databasen, men vil retroaktivt og automatisk benytte spesifikke moderasjonsmetoder på de kontoene.
         severity:
-          desc_html: "<strong>Målbind</strong> gjer kontoen sine postear usynlege for alle som ikkje følger den. <strong>Utvis</strong> fjernar alt innhald, media og profildata frå kontoen. Bruk <strong>Ingen</strong> viss du berre vil fjerne mediafiler."
+          desc_html: "<strong>Avgrens</strong> gjer innlegg frå kontoar på dette domenet usynlege for alle som ikkje fylgjer dei. <strong>Utvis</strong> fjernar alt innhald, media og profildata frå kontoar på dette domenet frå tenaren din. Bruk <strong>Ingen</strong> viss du berre vil avvisa mediafiler."
           noop: Ingen
           silence: Målbind
           suspend: Utvis
@@ -499,8 +499,8 @@ nn:
       dashboard:
         instance_accounts_dimension: Mest fylgde kontoar
         instance_accounts_measure: lagrede kontoer
-        instance_followers_measure: våre følgere der
-        instance_follows_measure: deres følgere her
+        instance_followers_measure: fylgjarane våre der
+        instance_follows_measure: fylgjarane deira her
         instance_languages_dimension: Mest brukte språk
         instance_media_attachments_measure: lagrede mediavedlegg
         instance_reports_measure: rapporter om dem
@@ -834,7 +834,7 @@ nn:
         sensitive: "%{name} markerte %{target} sin konto som ømtolig"
         silence: "%{name} begrenset %{target}s konto"
         suspend: "%{name} utviste %{target} sin konto"
-      appeal_approved: Klage tatt til følge
+      appeal_approved: Anka
       appeal_pending: Klage behandles
       appeal_rejected: Anken er avvist
     system_checks:
@@ -1013,7 +1013,7 @@ nn:
     created_msg: Laga eit nytt kallenamn. No kan du setja i gang med flyttinga frå den gamle kontoen.
     deleted_msg: Fjerna kallenamnet. No vert det ikkje lenger mogeleg å flytta frå den andre kontoen til denne.
     empty: Du har inkje alias.
-    hint_html: Dersom du vil flytte fra en annen konto til den, kan du lage et alias her, som er påkrevd før du kan gå videre med å flytte følgere fra den gamle kontoen til den nye. Handlingen i seg selv er <strong>harmløs og reversibel</strong>. <strong>Kontoflyttingen har blitt satt i gang fra den gamle kontoen</strong>.
+    hint_html: Viss du vil flytta frå ein annan konto til denne, kan du laga eit alias her. Det treng du før du kan halda fram med å flytta fylgjarar frå den gamle kontoen til dnene. Denne handlinga er i seg sjølv <strong>harmlaus og kan angrast</strong>. <strong>Du har starta overføringa frå den gamle kontoen</strong>.
     remove: Fjern aliaslenking
   appearance:
     advanced_web_interface: Avansert nettgrensesnitt
@@ -1110,7 +1110,7 @@ nn:
       title: Logg inn på %{domain}
     sign_up:
       manual_review: Når du lagar ein konto på %{domain}, vil moderatorane våre gå gjennom påmeldinga di manuelt. For å hjelpa oss med påmeldinga di, er det fint om du skriv litt om deg sjølv og kvifor du vil ha ein konto på %{domain}.
-      preamble: Med en konto på denne Mastodon-tjeneren vil du kunne følge andre personer på nettverket, uansett hvor kontoen deres holder til.
+      preamble: Med ein konto på denne Mastodon-tenaren kan du fylgja andre folk på nettverket, uansett kvar dei har brukarkontoen sin.
       title: La oss få deg satt i gang på %{domain}.
     status:
       account_status: Kontostatus
@@ -1170,7 +1170,7 @@ nn:
     strikes:
       action_taken: Handling utført
       appeal: Klage
-      appeal_approved: Denne advarselens klage ble tatt til følge og er ikke lenger gyldig
+      appeal_approved: Denne handlinga er anka og er ikkje lenger gyldig
       appeal_rejected: Klagen ble avvist
       appeal_submitted_at: Klage levert
       appealed_msg: Din klage har blitt levert. Du får beskjed om den blir godkjent.
@@ -1424,7 +1424,7 @@ nn:
   migrations:
     acct: Flytta til
     cancel: Avbryt omdirigeringen
-    cancel_explanation: Å avbryte omdirigeringen vil reaktivere din nåværende konto, men vil ikke bringe tilbake følgere som har blitt flyttet til den kontoen.
+    cancel_explanation: Viss du avbryt omdirigeringa, vil det ta i bruk at den noverande kontoen din, men det vil ikkje få tilbake fylgjarar som er flytte til den andre kontoen.
     cancelled_msg: Avbrøt omdirigeringen med suksess.
     errors:
       already_moved: er den same kontoen som du allereie har flytta til
@@ -1435,7 +1435,7 @@ nn:
     followers_count: Fylgjarar då kontoen vart flytta
     incoming_migrations: Flyttar frå ein annan konto
     incoming_migrations_html: For å flytta frå ein annnan konto til denne må du fyrst <a href="%{path}">laga eit kallenamn til kontoen</a>.
-    moved_msg: Kontoen din omdirigeres nå til %{acct}, og følgerne dine blir flyttet over.
+    moved_msg: Kontoen din vidaresender no til %{acct}, og fylgjarane dine blir flytte over dit.
     not_redirecting: Kontoen din omdirigeres ikke til noen andre kontoer for øyeblikket.
     on_cooldown: Du har nylig overført kontoen din. Denne funksjonen blir tilgjengelig igjen om %{count} dager.
     past_migrations: Tidlegare vandringar
@@ -1448,7 +1448,7 @@ nn:
       before: 'Før du fortsetter, vennligst les disse notisene nøye:'
       cooldown: Etter flytting er det en nedkjølingsperiode der du ikke vil kunne flytte igjen
       disabled_account: Din nåværende konto vil ikke være fullt brukbar etterpå. Men du vil ha tilgang til dataeksportering såvel som reaktivering.
-      followers: Denne handlingen vil flytte alle følgere fra den nåværende kontoen til den nye kontoen
+      followers: Denne handlinga flyttar alle fylgjarar frå denne kontoen til den nye
       only_redirect_html: Alternativt kan du velge å <a href="%{path}">bare legge ut en omdirigering på profilen din</a>.
       other_data: Inkje anna data flyttast av seg sjølve
       redirect: Profilen til din nåværende konto vil bli oppdatert med en omdirigeringsnotis og bli fjernet fra søk
@@ -1564,7 +1564,7 @@ nn:
     dormant: I dvale
     follow_failure: Greidde ikkje fylgja alle kontoane du valde.
     follow_selected_followers: Følg valgte tilhengere
-    followers: Følgere
+    followers: Fylgjarar
     following: Følginger
     invited: Innboden
     last_active: Sist aktiv
@@ -1659,10 +1659,22 @@ nn:
     preferences: Innstillingar
     profile: Profil
     relationships: Fylgjar og fylgjarar
+    severed_relationships: Brotne forhold
     statuses_cleanup: Automatisert sletting av innlegg
     strikes: Modereringsadvarsler
     two_factor_authentication: Tostegsautorisering
     webauthn_authentication: Sikkerhetsnøkler
+  severed_relationships:
+    download: Last ned (%{count})
+    event_type:
+      account_suspension: Utestenging av konto (%{target_name})
+      domain_block: Tenarutestenging (%{target_name})
+      user_domain_block: Du blokkerte %{target_name}
+    lost_followers: Mista fylgjarar
+    lost_follows: Mista fylgjer
+    preamble: Du kan mista fylgjarar og folk du fylgjer når du blokkerer eit domene eller når moderatorar avgjer å utestenga ein annan tenar. Når det skjer, vil du kunne lasta ned ei liste over brotne forhold, slik at du kan sjå gjennom ho og kanskje importera ho på ein annan tenar.
+    purged: Informasjonen om denne tenaren er sletta av administratorane på tenaren din.
+    type: Hending
   statuses:
     attached:
       audio:
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 1dc1482e20aede..89eec685d8903b 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -1711,10 +1711,22 @@ pl:
     preferences: Preferencje
     profile: Profil
     relationships: Obserwowani i obserwujący
+    severed_relationships: Zerwane związki
     statuses_cleanup: Automatyczne usuwanie wpisów
     strikes: Ostrzeżenia moderacyjne
     two_factor_authentication: Uwierzytelnianie dwuetapowe
     webauthn_authentication: Klucze bezpieczeństwa
+  severed_relationships:
+    download: Pobierz (%{count})
+    event_type:
+      account_suspension: Zawieszenie konta (%{target_name})
+      domain_block: Zawieszenie serwera (%{target_name})
+      user_domain_block: Zablokowano %{target_name}
+    lost_followers: Utraceni obserwujący
+    lost_follows: Utracone obserwowania
+    preamble: Możesz stracić obserwowania i obserwujących kiedy zablokujesz domenę albo kiedy twoi moderatorzy postanowią zawiesić obcy serwer. W tym wypadku będziesz móc pobrać listę zerwanych związków do przejrzenia i potencjalnego importu na innym serwerze.
+    purged: Informacje o tym serwerze zostały wyczyszczone przez administratora twojego serwera.
+    type: Zdarzenie
   statuses:
     attached:
       audio:
diff --git a/config/locales/simple_form.lv.yml b/config/locales/simple_form.lv.yml
index 596fbe3e3417b6..002761065d5de2 100644
--- a/config/locales/simple_form.lv.yml
+++ b/config/locales/simple_form.lv.yml
@@ -6,7 +6,7 @@ lv:
         discoverable: Tavas publiskās ziņas un profils var tikt piedāvāti vai ieteikti dažādās Mastodon vietās, un tavs profils var tikt ieteikts citiem lietotājiem.
         display_name: Tavs pilnais vārds vai tavs joku vārds.
         fields: Tava mājas lapa, vietniekvārdi, vecums, viss, ko vēlies.
-        indexable: Tavas publiskās ziņas var tikt parādītas Mastodon meklēšanas rezultātos. Personas, kuras ir mijiedarbojušās ar tavām ziņām, var tās meklēt neatkarīgi no tā.
+        indexable: Tavi publiskie ieraksti var tikt parādīti Mastodon meklēšanas iznākumā. Cilvēki, kuri ir mijiedarbojušies ar Taviem ierakstiem, var tos meklēt neatkarīgi no tā.
         note: 'Tu vari @minēt citus cilvēkus vai #mirkļbirkas.'
         show_collections: Cilvēki varēs pārlūkot Tavus sekotājus un sekojamos. Cilvēki, kuriem Tu seko, redzēs, ka Tu seko viņiem neatkarīgi no tā.
         unlocked: Cilvēki varēs tev sekot, neprasot apstiprinājumu. Noņem atzīmi, ja vēlies pārskatīt sekošanas pieprasījumus un izvēlēties, pieņemt vai noraidīt jaunus sekotājus.
@@ -44,7 +44,7 @@ lv:
         context: Viens vai vairāki konteksti, kur jāpiemēro filtrs
         current_password: Drošības nolūkos, lūdzu, ievadi pašreizējā konta paroli
         current_username: Lai apstiprinātu, lūdzu, ievadi pašreizējā konta paroli
-        digest: Sūta tikai pēc ilgstošas neaktivitātes un tikai tad, ja savas prombūtnes laikā neesi saņēmis personiskas ziņas
+        digest: Tiek nosūtīts tikai pēc ilgstošas bezdarbības un tikai tad, ja savas prombūtnes laikā esi saņēmis jebkādas personīgas ziņas
         email: Tev tiks nosūtīts apstiprinājuma e-pasts
         header: WEBP, PNG, GIF vai JPG. Ne vairāk kā %{size}. Tiks samazināts līdz %{dimensions}px
         inbox_url: Nokopē URL no tā releja sākumlapas, kuru vēlies izmantot
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 6b59677910abbc..8c613e9589f26c 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -1199,6 +1199,9 @@ sk:
     profile: Profil
     relationships: Sledovania a následovatelia
     two_factor_authentication: Dvojfázové overenie
+  severed_relationships:
+    lost_followers: Stratení nasledovatelia
+    lost_follows: Stratené sledovania
   statuses:
     attached:
       description: 'Priložené: %{attached}'
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 9498ca78983e6b..6355d019243423 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -1711,10 +1711,22 @@ sl:
     preferences: Nastavitve
     profile: Profil
     relationships: Sledenja in sledilci
+    severed_relationships: Prekinjene veze
     statuses_cleanup: Samodejno brisanje objav
     strikes: Ukrepi morediranja
     two_factor_authentication: Dvofaktorsko overjanje
     webauthn_authentication: Varnostni ključi
+  severed_relationships:
+    download: Prejmi (%{count})
+    event_type:
+      account_suspension: Suspendiranje računa (%{target_name})
+      domain_block: Suspendiranje strežnika (%{target_name})
+      user_domain_block: Blokirali ste %{target_name}
+    lost_followers: Izgubljeni sledilci
+    lost_follows: Izgubljena sledeni
+    preamble: Če blokirate domeno ali če se vaši moderatorji odločijo suspendirati oddaljen strežnik, lahko izgubite sledene in sledilce. Ko se to zgodi, boste lahko prejeli sezname prekinjenih vez za pregled in morebitno uvažanje na drugem strežniku.
+    purged: Podatke o tem strežniku so očistili skrbniki vašega strežnika.
+    type: Dogodek
   statuses:
     attached:
       audio:
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index ce2c8b0f992fc1..25286c00f55a51 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -1659,6 +1659,13 @@ sq:
     strikes: Paralajmërime nga moderimi
     two_factor_authentication: Mirëfilltësim Dyfaktorësh
     webauthn_authentication: Kyçe sigurie
+  severed_relationships:
+    event_type:
+      account_suspension: Pezullim llogarie (%{target_name})
+      domain_block: Pezullim shërbyesi (%{target_name})
+      user_domain_block: Bllokuat %{target_name}
+    purged: Hollësitë rreth këtij shërbyesi janë spastuar nga përgjegjësit e shërbyesit tuaj.
+    type: Akt
   statuses:
     attached:
       audio:
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 21ddeb5117e1fe..b02e9c55627f2b 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -1711,10 +1711,22 @@ uk:
     preferences: Налаштування
     profile: Загальнодоступний профіль
     relationships: Підписки та підписники
+    severed_relationships: Розірвані зв'язки
     statuses_cleanup: Автовидалення допису
     strikes: Попередження модераторів
     two_factor_authentication: Двофакторна автентифікація
     webauthn_authentication: Ключі безпеки
+  severed_relationships:
+    download: Завантажити (%{count})
+    event_type:
+      account_suspension: Призупинення облікового запису (%{target_name})
+      domain_block: Призупинення сервера (%{target_name})
+      user_domain_block: Ви заблокували %{target_name}
+    lost_followers: Втрачені підписники
+    lost_follows: Втрачені підписки
+    preamble: Ви можете втратити підписки та підписників, коли ви блокуєте домен або коли модератори вирішують призупинити віддалений сервер. Коли це станеться, ви зможете завантажити списки розірваних зв'язків, які мають бути перевірені та, можливо, імпортовані на іншому сервері.
+    purged: Інформацію про цей сервер очищені адміністраторами вашого сервера.
+    type: Подія
   statuses:
     attached:
       audio:
@@ -1911,8 +1923,41 @@ uk:
       apps_ios_action: Завантажити з App Store
       apps_step: Завантажити наші офіційні застосунки.
       apps_title: Застосунки Mastodon
+      checklist_subtitle: 'Розпочнімо у цій новій соціальній межі:'
+      checklist_title: Контрольний список привітання
+      edit_profile_action: Персоналізувати
+      edit_profile_step: Інші, ймовірно, швидше взаємодіятимуть з вами, якщо ви заповните профіль.
+      edit_profile_title: Персоналізуйте свій профіль
       explanation: Ось кілька порад для початку
       feature_action: Докладніше
+      feature_audience: Mastodon надає унікальну можливість керувати своєю аудиторією без посередників. Маючи сервер Mastodon, розгорнутий на власній інфраструктурі, його користувачі можуть взаємодіяти з будь-яким іншим сервером Mastodon, не віддаючи контроль у чужі руки.
+      feature_audience_title: Формуйте свою аудиторію з впевненістю
+      feature_control: Тільки ви знаєте, що саме хочете бачити на своєму сервері. Немає алгоритмів або реклами, що марнують ваш час. Слідкуйте за будь-яким сервером Mastodon з одного облікового запису та отримуйте повідомлення в хронологічному порядку, і зробіть ваш куточок інтернету трохи схожим на вас.
+      feature_control_title: Керуйте своєю стрічкою
+      feature_creativity: Mastodon підтримує дописи з аудіо, відео та зображеннями, опис для доступності, опитування, попередження про вміст, анімовані аватари, користувацькі емодзі, мініатюри, керування кадруванням мініатюр та багато іншого. Чи викладаєте ви своє мистецтво, чи музику або подкаст, Mastodon тут для вас.
+      feature_creativity_title: Необмежена творчість
+      feature_moderation: Mastodon повертає прийняття рішень у ваші руки. На відміну від соціальних мереж, що належать корпораціям, які спускають свої правила згори, кожен сервер Mastodon встановлює свої правила і норми, яких дотримуються на місцевому рівні, що робить їх найгнучкішими для задовільнення потреб різних груп людей. Приєднуйтесь до сервера з правилами, з якими ви згодні, або створіть свій власний.
+      feature_moderation_title: Модерація, якою вона має бути
+      follow_action: Підписатися
+      follow_step: Ви керуєте головною стрічкою. Заповнюйте її цікавими людьми.
+      follow_title: Персоналізуйте домашню стрічку
+      follows_subtitle: Стежте за відомими обліковими записами
+      follows_title: На кого підписатися
+      follows_view_more: Переглянути більше людей, щоб підписатися
+      hashtags_recent_count:
+        few: "%{people} особи за останні 2 дні"
+        many: "%{people} осіб за останні 2 дні"
+        one: "%{people} особа за останні 2 дні"
+        other: "%{people} особа за останні 2 дні"
+      hashtags_subtitle: Дізнавайтеся, що було популярним минулі 2 дні
+      hashtags_title: Популярні хештеги
+      hashtags_view_more: Переглянути більше популярних хештеґів
+      post_action: Створити
+      post_step: Привітайтеся зі світом, з текстом, світлинами, відео та опитуваннями.
+      post_title: Напишіть свій перший допис
+      share_action: Поділитися
+      share_step: Розкажіть друзям, як знайти вас на Mastodon.
+      share_title: Поділіться своїм профілем Mastodon
       sign_in_action: Увійти
       subject: Ласкаво просимо до Mastodon
       title: Ласкаво просимо, %{name}!
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index fc4ec804820e53..eaa913c8cdc1b8 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -585,6 +585,9 @@ vi:
       actions_description_html: Nếu áp đặt trừng phạt, một email thông báo sẽ được gửi cho người này, ngoại trừ <strong>Spam</strong>.
       actions_description_remote_html: Chọn hành động cần thực hiện để xử lý báo cáo này. Điều này sẽ chỉ ảnh hưởng đến cách máy chủ <strong>của bạn</strong> giao tiếp với tài khoản này và xử lý nội dung của nó.
       add_to_report: Bổ sung báo cáo
+      already_suspended_badges:
+        local: Đã vô hiệu hóa trên máy chủ này
+        remote: Đã vô hiệu hóa trên máy chủ khác
       are_you_sure: Bạn có chắc không?
       assign_to_self: Giao cho tôi
       assigned: Người xử lý
@@ -1626,6 +1629,7 @@ vi:
     import: Nhập dữ liệu
     import_and_export: Dữ liệu
     migrate: Chuyển tài khoản sang máy chủ khác
+    notifications: Thông báo email
     preferences: Chung
     profile: Hồ sơ
     relationships: Quan hệ
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 29f9badb8031be..dcc99d7a9167c3 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -1633,10 +1633,22 @@ zh-CN:
     preferences: 首选项
     profile: 个人资料
     relationships: 关注管理
+    severed_relationships: 已断开的关系
     statuses_cleanup: 自动删除嘟文
     strikes: 操作记录
     two_factor_authentication: 双因素认证
     webauthn_authentication: 安全密钥
+  severed_relationships:
+    download: 下载 (%{count})
+    event_type:
+      account_suspension: 账户被封禁 (%{target_name})
+      domain_block: 服务器被封禁 (%{target_name})
+      user_domain_block: 你屏蔽了 %{target_name}
+    lost_followers: 失去的关注者
+    lost_follows: 失去的关注
+    preamble: 当你屏蔽一个域名或你的管理员决定封禁一个外站服务器时，你可能会失去关注和粉丝。在这种情况下，你可以下载被切断的关系的列表，进行检查以便导入另一个服务器。
+    purged: 关于此服务器的信息已被你所在服务器的管理员清除。
+    type: 事件
   statuses:
     attached:
       audio:
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index b78c7d3319a4dc..e83001e7db4aaf 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -1331,7 +1331,7 @@ zh-TW:
       muting: 正在匯入已靜音帳號
     type: 匯入類型
     type_groups:
-      constructive: 跟隨者與書籤
+      constructive: 跟隨中與書籤
       destructive: 封鎖與靜音
     types:
       blocking: 您封鎖的使用者列表
@@ -1635,10 +1635,22 @@ zh-TW:
     preferences: 偏好設定
     profile: 個人檔案
     relationships: 跟隨中與跟隨者
+    severed_relationships: 已斷絕服務關係
     statuses_cleanup: 自動嘟文刪除
     strikes: 管理警告
     two_factor_authentication: 兩階段驗證
     webauthn_authentication: 安全金鑰
+  severed_relationships:
+    download: 下載 (%{count} 份)
+    event_type:
+      account_suspension: 停權帳號 (%{target_name})
+      domain_block: 停權伺服器 (%{target_name})
+      user_domain_block: 您已封鎖 %{target_name}
+    lost_followers: 失去之跟隨者
+    lost_follows: 失去之跟隨中
+    preamble: 當您封鎖網域或您的管理員決定停權遠端伺服器時，您可能失去跟隨中或跟隨者。當此發生時，您能下載斷絕服務關係之列表並於其他伺服器中檢視或匯入資料。
+    purged: 關於此伺服器已被您的伺服器管理員清除之資訊
+    type: 事件
   statuses:
     attached:
       audio:

From 885d0faf83d55f2f67ad76f7f34c51afcd72efe5 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 21 Mar 2024 11:06:21 +0100
Subject: [PATCH 0558/2191] Fix duplicate translation string for severed
 relationships (#29689)

---
 .../features/notifications/components/notification.jsx         | 3 +--
 app/javascript/mastodon/locales/en.json                        | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/javascript/mastodon/features/notifications/components/notification.jsx b/app/javascript/mastodon/features/notifications/components/notification.jsx
index 1af1eb78d94fe7..1e89f77d453c7c 100644
--- a/app/javascript/mastodon/features/notifications/components/notification.jsx
+++ b/app/javascript/mastodon/features/notifications/components/notification.jsx
@@ -38,7 +38,6 @@ const messages = defineMessages({
   reblog: { id: 'notification.reblog', defaultMessage: '{name} boosted your status' },
   status: { id: 'notification.status', defaultMessage: '{name} just posted' },
   update: { id: 'notification.update', defaultMessage: '{name} edited a post' },
-  severedRelationships: { id: 'notification.severed_relationships', defaultMessage: 'Relationships with {name} severed' },
   adminSignUp: { id: 'notification.admin.sign_up', defaultMessage: '{name} signed up' },
   adminReport: { id: 'notification.admin.report', defaultMessage: '{name} reported {target}' },
 });
@@ -375,7 +374,7 @@ class Notification extends ImmutablePureComponent {
             <Icon id='unlink' icon={LinkOffIcon} />
 
             <span title={notification.get('created_at')}>
-              <FormattedMessage id='notification.severedRelationships' defaultMessage='Relationships with {name} severed' values={{ name: notification.getIn(['event', 'target_name']) }} />
+              <FormattedMessage id='notification.severed_relationships' defaultMessage='Relationships with {name} severed' values={{ name: notification.getIn(['event', 'target_name']) }} />
             </span>
           </div>
 
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index ca698533668050..efda92d21324a1 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -471,7 +471,6 @@
   "notification.own_poll": "Your poll has ended",
   "notification.poll": "A poll you have voted in has ended",
   "notification.reblog": "{name} boosted your post",
-  "notification.severedRelationships": "Relationships with {name} severed",
   "notification.severed_relationships": "Relationships with {name} severed",
   "notification.status": "{name} just posted",
   "notification.update": "{name} edited a post",

From d13cdced1ed6e698d67d046ed26cbae33718dcf9 Mon Sep 17 00:00:00 2001
From: Nick Schonning <nschonni@gmail.com>
Date: Thu, 21 Mar 2024 06:35:12 -0400
Subject: [PATCH 0559/2191] Add Renovate grouped updates for RSpec and RuboCop
 (#29621)

---
 .github/renovate.json5 | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/.github/renovate.json5 b/.github/renovate.json5
index dab99829a1be87..e92608a43711ed 100644
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -125,6 +125,22 @@
       ],
       groupName: null, // We dont want them to belong to any group
     },
+    {
+      // Group all RuboCop packages with `rubocop` in the same PR
+      matchManagers: ['bundler'],
+      matchPackageNames: ['rubocop'],
+      matchPackagePrefixes: ['rubocop-'],
+      matchUpdateTypes: ['patch', 'minor'],
+      groupName: 'RuboCop (non-major)',
+    },
+    {
+      // Group all RSpec packages with `rspec` in the same PR
+      matchManagers: ['bundler'],
+      matchPackageNames: ['rspec'],
+      matchPackagePrefixes: ['rspec-'],
+      matchUpdateTypes: ['patch', 'minor'],
+      groupName: 'RSpec (non-major)',
+    },
     // Add labels depending on package manager
     { matchManagers: ['npm', 'nvm'], addLabels: ['javascript'] },
     { matchManagers: ['bundler', 'ruby-version'], addLabels: ['ruby'] },

From 1feb228275e9e0fee69b58593ad97881deed40aa Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 21 Mar 2024 11:40:38 +0100
Subject: [PATCH 0560/2191] Update dependency express to v4.19.1 (#29663)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index e8bb3c2eb95440..90cc201dc6b6b7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6285,10 +6285,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cookie@npm:0.5.0":
-  version: 0.5.0
-  resolution: "cookie@npm:0.5.0"
-  checksum: 10c0/c01ca3ef8d7b8187bae434434582288681273b5a9ed27521d4d7f9f7928fe0c920df0decd9f9d3bbd2d14ac432b8c8cf42b98b3bdd5bfe0e6edddeebebe8b61d
+"cookie@npm:0.6.0":
+  version: 0.6.0
+  resolution: "cookie@npm:0.6.0"
+  checksum: 10c0/f2318b31af7a31b4ddb4a678d024514df5e705f9be5909a192d7f116cfb6d45cbacf96a473fa733faa95050e7cff26e7832bb3ef94751592f1387b71c8956686
   languageName: node
   linkType: hard
 
@@ -8187,15 +8187,15 @@ __metadata:
   linkType: hard
 
 "express@npm:^4.17.1, express@npm:^4.18.2":
-  version: 4.18.3
-  resolution: "express@npm:4.18.3"
+  version: 4.19.1
+  resolution: "express@npm:4.19.1"
   dependencies:
     accepts: "npm:~1.3.8"
     array-flatten: "npm:1.1.1"
     body-parser: "npm:1.20.2"
     content-disposition: "npm:0.5.4"
     content-type: "npm:~1.0.4"
-    cookie: "npm:0.5.0"
+    cookie: "npm:0.6.0"
     cookie-signature: "npm:1.0.6"
     debug: "npm:2.6.9"
     depd: "npm:2.0.0"
@@ -8221,7 +8221,7 @@ __metadata:
     type-is: "npm:~1.6.18"
     utils-merge: "npm:1.0.1"
     vary: "npm:~1.1.2"
-  checksum: 10c0/0b9eeafbac549e3c67d92d083bf1773e358359f41ad142b92121935c6348d29079b75054555b3f62de39263fffc8ba06898b09fdd3e213e28e714c03c5d9f44c
+  checksum: 10c0/1cf6d3c095131f0d730105fac23a713083604d4f3ad9364df53cade50662abcfee2f6f8a955fdf164a5ee63f09f457da0b70cbed435ad302fa6f14162a9757f9
   languageName: node
   linkType: hard
 

From a506b09de0725f5756c01e3a3747cbaf10608fb7 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 21 Mar 2024 11:41:47 +0100
Subject: [PATCH 0561/2191] Update dependency @reduxjs/toolkit to v2.2.2
 (#29681)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 90cc201dc6b6b7..7273817bb739c1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3005,8 +3005,8 @@ __metadata:
   linkType: hard
 
 "@reduxjs/toolkit@npm:^2.0.1":
-  version: 2.2.1
-  resolution: "@reduxjs/toolkit@npm:2.2.1"
+  version: 2.2.2
+  resolution: "@reduxjs/toolkit@npm:2.2.2"
   dependencies:
     immer: "npm:^10.0.3"
     redux: "npm:^5.0.1"
@@ -3020,7 +3020,7 @@ __metadata:
       optional: true
     react-redux:
       optional: true
-  checksum: 10c0/675f816b311d6d703259e00c73977c9c5968e41b039d6d149e34e9084d5e6718aff3b692d2b7697974fb57a056687932117da1dd5202d392811d8d4e91d09322
+  checksum: 10c0/d749181b1bc071698517cba7ce05c42ddfe99363019249722b4dfa3afc71b3a6e4cb9885af574cf81c5d6515f68201ebfedddb5c14b262c941a45112fdc66ce3
   languageName: node
   linkType: hard
 

From 2ec3fcaffef12f52cd8f9177bc95e889ea1f852b Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 21 Mar 2024 10:43:37 +0000
Subject: [PATCH 0562/2191] Update dependency rack to v2.2.9 (#29685)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 46e8eb1e6612e5..3e3cd8dc09f461 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -535,7 +535,7 @@ GEM
       activesupport (>= 3.0.0)
     raabro (1.4.0)
     racc (1.7.3)
-    rack (2.2.8.1)
+    rack (2.2.9)
     rack-attack (6.7.0)
       rack (>= 1.0, < 4)
     rack-cors (2.0.2)

From 1df00d4e76686a50da533a9217534cbb95e49097 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 21 Mar 2024 10:46:14 +0000
Subject: [PATCH 0563/2191] Update dependency pino-pretty to v11 (#29662)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 streaming/package.json |  2 +-
 yarn.lock              | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/streaming/package.json b/streaming/package.json
index 6e183a181cb3fd..f90a1e4404642e 100644
--- a/streaming/package.json
+++ b/streaming/package.json
@@ -37,7 +37,7 @@
     "@types/uuid": "^9.0.0",
     "@types/ws": "^8.5.9",
     "eslint-define-config": "^2.0.0",
-    "pino-pretty": "^10.3.1",
+    "pino-pretty": "^11.0.0",
     "typescript": "^5.0.4"
   },
   "optionalDependencies": {
diff --git a/yarn.lock b/yarn.lock
index 7273817bb739c1..13ea8583d7e868 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2886,7 +2886,7 @@ __metadata:
     pg-connection-string: "npm:^2.6.0"
     pino: "npm:^8.17.2"
     pino-http: "npm:^9.0.0"
-    pino-pretty: "npm:^10.3.1"
+    pino-pretty: "npm:^11.0.0"
     prom-client: "npm:^15.0.0"
     typescript: "npm:^5.0.4"
     utf-8-validate: "npm:^6.0.3"
@@ -12982,9 +12982,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pino-pretty@npm:^10.3.1":
-  version: 10.3.1
-  resolution: "pino-pretty@npm:10.3.1"
+"pino-pretty@npm:^11.0.0":
+  version: 11.0.0
+  resolution: "pino-pretty@npm:11.0.0"
   dependencies:
     colorette: "npm:^2.0.7"
     dateformat: "npm:^4.6.3"
@@ -13002,7 +13002,7 @@ __metadata:
     strip-json-comments: "npm:^3.1.1"
   bin:
     pino-pretty: bin.js
-  checksum: 10c0/6964fba5acc7a9f112e4c6738d602e123daf16cb5f6ddc56ab4b6bb05059f28876d51da8f72358cf1172e95fa12496b70465431a0836df693c462986d050686b
+  checksum: 10c0/d42213f3fdf19d92152b0a14683b2bb8443423739c81ab7c1181a5dac0e0ca7621d232c8264ece81edc01106ca2a8e165783daca0a902f0fde480027075d5540
   languageName: node
   linkType: hard
 

From 75f34b80a8b3913d81a71ac7dc237d23c990bb4a Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 21 Mar 2024 15:12:26 +0100
Subject: [PATCH 0564/2191] Clean up notification requests when deleting
 accounts (#29693)

---
 app/services/delete_account_service.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/services/delete_account_service.rb b/app/services/delete_account_service.rb
index bdfe0e71672845..328d8ae8f83965 100644
--- a/app/services/delete_account_service.rb
+++ b/app/services/delete_account_service.rb
@@ -185,6 +185,7 @@ def purge_generated_notifications!
     # polymorphically associated notifications generated by this account
 
     Notification.where(from_account: @account).in_batches.delete_all
+    NotificationRequest.where(from_account: @account).in_batches.delete_all
   end
 
   def purge_favourites!

From a59f5694fec6131d9b3eefe9b24dd3813d2cf4d3 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 21 Mar 2024 10:12:50 -0400
Subject: [PATCH 0565/2191] =?UTF-8?q?Add=20empty=20line=20after=20?=
 =?UTF-8?q?=E2=9C=A8magic=E2=9C=A8=20frozen=20string=20comment=20(#29696)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/initializers/application_controller_renderer.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb
index f4556db3998819..6d56e439007a07 100644
--- a/config/initializers/application_controller_renderer.rb
+++ b/config/initializers/application_controller_renderer.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 # ActiveSupport::Reloader.to_prepare do

From 814a48517fe820db9a606ba8274c104f002678d9 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 21 Mar 2024 17:46:38 +0100
Subject: [PATCH 0566/2191] Add some more tests for notification policies
 (#29698)

---
 .../api/v1/notifications/policies_spec.rb     | 29 ++++++++++++++++---
 .../api/v1/notifications/requests_spec.rb     |  7 +----
 2 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/spec/requests/api/v1/notifications/policies_spec.rb b/spec/requests/api/v1/notifications/policies_spec.rb
index fe6bdbd97355f8..9acd47a7b42f68 100644
--- a/spec/requests/api/v1/notifications/policies_spec.rb
+++ b/spec/requests/api/v1/notifications/policies_spec.rb
@@ -22,10 +22,20 @@
     it_behaves_like 'forbidden for wrong scope', 'write write:notifications'
 
     context 'with no options' do
-      it 'returns http success', :aggregate_failures do
+      it 'returns json with expected attributes', :aggregate_failures do
         subject
 
         expect(response).to have_http_status(200)
+        expect(body_as_json).to include(
+          filter_not_following: false,
+          filter_not_followers: false,
+          filter_new_accounts: false,
+          filter_private_mentions: true,
+          summary: a_hash_including(
+            pending_requests_count: '1',
+            pending_notifications_count: '0'
+          )
+        )
       end
     end
   end
@@ -35,14 +45,25 @@
       put '/api/v1/notifications/policy', headers: headers, params: params
     end
 
-    let(:params) { {} }
+    let(:params) { { filter_not_following: true } }
 
     it_behaves_like 'forbidden for wrong scope', 'read read:notifications'
 
-    it 'returns http success' do
-      subject
+    it 'changes notification policy and returns an updated json object', :aggregate_failures do
+      expect { subject }
+        .to change { NotificationPolicy.find_or_initialize_by(account: user.account).filter_not_following }.from(false).to(true)
 
       expect(response).to have_http_status(200)
+      expect(body_as_json).to include(
+        filter_not_following: true,
+        filter_not_followers: false,
+        filter_new_accounts: false,
+        filter_private_mentions: true,
+        summary: a_hash_including(
+          pending_requests_count: '0',
+          pending_notifications_count: '0'
+        )
+      )
     end
   end
 end
diff --git a/spec/requests/api/v1/notifications/requests_spec.rb b/spec/requests/api/v1/notifications/requests_spec.rb
index 64675d562c6474..772402a6b5a089 100644
--- a/spec/requests/api/v1/notifications/requests_spec.rb
+++ b/spec/requests/api/v1/notifications/requests_spec.rb
@@ -82,15 +82,10 @@
 
     it_behaves_like 'forbidden for wrong scope', 'read read:notifications'
 
-    it 'returns http success' do
+    it 'returns http success and dismisses the notification request', :aggregate_failures do
       subject
 
       expect(response).to have_http_status(200)
-    end
-
-    it 'dismisses the notification request' do
-      subject
-
       expect(notification_request.reload.dismissed?).to be true
     end
 

From 05abefe989a12dd805193a59873e60d6b60d1297 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 21 Mar 2024 18:39:27 +0100
Subject: [PATCH 0567/2191] Update RuboCop (non-major) to v1.62.1 (#29692)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 3e3cd8dc09f461..54b6504e28e78f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -139,7 +139,7 @@ GEM
       erubi (~> 1.4)
       parser (>= 2.4)
       smart_properties
-    bigdecimal (3.1.6)
+    bigdecimal (3.1.7)
     bindata (2.4.15)
     binding_of_caller (1.0.0)
       debug_inspector (>= 0.0.1)
@@ -225,8 +225,7 @@ GEM
     dotenv-rails (2.8.1)
       dotenv (= 2.8.1)
       railties (>= 3.2)
-    drb (2.2.0)
-      ruby2_keywords
+    drb (2.2.1)
     ed25519 (1.3.0)
     elasticsearch (7.13.3)
       elasticsearch-api (= 7.13.3)
@@ -438,7 +437,7 @@ GEM
     mime-types-data (3.2023.1205)
     mini_mime (1.1.5)
     mini_portile2 (2.8.5)
-    minitest (5.21.2)
+    minitest (5.22.3)
     msgpack (1.7.2)
     multi_json (1.15.0)
     multipart-post (2.3.0)
@@ -649,7 +648,7 @@ GEM
       rspec-mocks (~> 3.0)
       sidekiq (>= 5, < 8)
     rspec-support (3.13.1)
-    rubocop (1.60.2)
+    rubocop (1.62.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
@@ -657,24 +656,24 @@ GEM
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.30.0, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.30.0)
-      parser (>= 3.2.1.0)
+    rubocop-ast (1.31.2)
+      parser (>= 3.3.0.4)
     rubocop-capybara (2.20.0)
       rubocop (~> 1.41)
-    rubocop-factory_bot (2.25.0)
-      rubocop (~> 1.33)
+    rubocop-factory_bot (2.25.1)
+      rubocop (~> 1.41)
     rubocop-performance (1.20.2)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.30.0, < 2.0)
-    rubocop-rails (2.23.1)
+    rubocop-rails (2.24.0)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
-      rubocop-ast (>= 1.30.0, < 2.0)
-    rubocop-rspec (2.26.1)
+      rubocop-ast (>= 1.31.1, < 2.0)
+    rubocop-rspec (2.27.1)
       rubocop (~> 1.40)
       rubocop-capybara (~> 2.17)
       rubocop-factory_bot (~> 2.22)

From f5444c8fe4a913d67f8540cd0f5dff1ad5aae232 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 21 Mar 2024 19:06:32 +0100
Subject: [PATCH 0568/2191] Update dependency rspec-rails to v6.1.2 (#29691)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 54b6504e28e78f..715a02377e6345 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -213,7 +213,7 @@ GEM
     devise_pam_authenticatable2 (9.2.0)
       devise (>= 4.0.0)
       rpam2 (~> 4.0)
-    diff-lcs (1.5.0)
+    diff-lcs (1.5.1)
     discard (1.3.0)
       activerecord (>= 4.2, < 8)
     docile (1.4.0)
@@ -600,7 +600,7 @@ GEM
       link_header (~> 0.0, >= 0.0.8)
     rdf-normalize (0.7.0)
       rdf (~> 3.3)
-    rdoc (6.6.2)
+    rdoc (6.6.3.1)
       psych (>= 4.0.0)
     redcarpet (3.6.0)
     redis (4.8.1)
@@ -634,14 +634,14 @@ GEM
     rspec-mocks (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-rails (6.1.1)
+    rspec-rails (6.1.2)
       actionpack (>= 6.1)
       activesupport (>= 6.1)
       railties (>= 6.1)
-      rspec-core (~> 3.12)
-      rspec-expectations (~> 3.12)
-      rspec-mocks (~> 3.12)
-      rspec-support (~> 3.12)
+      rspec-core (~> 3.13)
+      rspec-expectations (~> 3.13)
+      rspec-mocks (~> 3.13)
+      rspec-support (~> 3.13)
     rspec-sidekiq (4.1.0)
       rspec-core (~> 3.0)
       rspec-expectations (~> 3.0)

From 7f5e930bd2f92fcdd570f288647908f83c878632 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 21 Mar 2024 18:09:26 +0000
Subject: [PATCH 0569/2191] Update dependency strong_migrations to v1.8.0
 (#29556)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index c19a0115388605..35b9ee91db3d8b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -90,7 +90,7 @@ gem 'sidekiq-bulk', '~> 0.2.0'
 gem 'simple-navigation', '~> 4.4'
 gem 'simple_form', '~> 5.2'
 gem 'stoplight', '~> 3.0.1'
-gem 'strong_migrations', '1.7.0'
+gem 'strong_migrations', '1.8.0'
 gem 'tty-prompt', '~> 0.23', require: false
 gem 'twitter-text', '~> 3.1.0'
 gem 'tzinfo-data', '~> 1.2023'
diff --git a/Gemfile.lock b/Gemfile.lock
index 715a02377e6345..2a64928c5022d6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -734,7 +734,7 @@ GEM
     stoplight (3.0.2)
       redlock (~> 1.0)
     stringio (3.1.0)
-    strong_migrations (1.7.0)
+    strong_migrations (1.8.0)
       activerecord (>= 5.2)
     swd (1.3.0)
       activesupport (>= 3)
@@ -940,7 +940,7 @@ DEPENDENCIES
   simplecov-lcov (~> 0.8)
   stackprof
   stoplight (~> 3.0.1)
-  strong_migrations (= 1.7.0)
+  strong_migrations (= 1.8.0)
   test-prof
   thor (~> 1.2)
   tty-prompt (~> 0.23)

From ec6d016da1fcf5830d5e10b30106969a9e6467d2 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 21 Mar 2024 19:09:45 +0100
Subject: [PATCH 0570/2191] Update dependency ox to v2.14.18 (#29701)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 2a64928c5022d6..17b7bfb4a00988 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -499,7 +499,7 @@ GEM
     openssl-signature_algorithm (1.3.0)
       openssl (> 2.0)
     orm_adapter (0.5.0)
-    ox (2.14.17)
+    ox (2.14.18)
     parallel (1.24.0)
     parser (3.3.0.5)
       ast (~> 2.4.1)

From 142c018cfa5c6273b2f52b1fdb7dad76eb24fd81 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 21 Mar 2024 17:48:41 -0400
Subject: [PATCH 0571/2191] Add ruby 3.3 to CI test matrix (#29705)

---
 .github/workflows/test-ruby.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/test-ruby.yml b/.github/workflows/test-ruby.yml
index 7fd259ae0111e7..624c3b7a2f7e02 100644
--- a/.github/workflows/test-ruby.yml
+++ b/.github/workflows/test-ruby.yml
@@ -114,6 +114,7 @@ jobs:
           - '3.0'
           - '3.1'
           - '.ruby-version'
+          - '3.3'
     steps:
       - uses: actions/checkout@v4
 
@@ -189,6 +190,7 @@ jobs:
           - '3.0'
           - '3.1'
           - '.ruby-version'
+          - '3.3'
 
     steps:
       - uses: actions/checkout@v4
@@ -288,6 +290,7 @@ jobs:
           - '3.0'
           - '3.1'
           - '.ruby-version'
+          - '3.3'
         search-image:
           - docker.elastic.co/elasticsearch/elasticsearch:7.17.13
         include:

From 70a8fcf07d1ddf6621aadcda9d9a36e7dc646083 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 21 Mar 2024 22:52:29 +0100
Subject: [PATCH 0572/2191] Fix notification policy migration not preserving
 `filter_private_mentions` correctly (#29699)

---
 ..._migrate_interaction_settings_to_policy.rb |  4 +-
 ...te_interaction_settings_to_policy_again.rb | 54 +++++++++++++++++++
 db/schema.rb                                  |  2 +-
 lib/tasks/tests.rake                          |  9 +++-
 4 files changed, 65 insertions(+), 4 deletions(-)
 create mode 100644 db/post_migrate/20240321160706_migrate_interaction_settings_to_policy_again.rb

diff --git a/db/migrate/20240304090449_migrate_interaction_settings_to_policy.rb b/db/migrate/20240304090449_migrate_interaction_settings_to_policy.rb
index 0e9a42f8df6c3d..a0ce0a66381de4 100644
--- a/db/migrate/20240304090449_migrate_interaction_settings_to_policy.rb
+++ b/db/migrate/20240304090449_migrate_interaction_settings_to_policy.rb
@@ -36,8 +36,8 @@ def up
         requires_new_policy = true
       end
 
-      if deserialized_settings['interactions.must_be_following_dm']
-        policy.filter_private_mentions = true
+      unless deserialized_settings['interactions.must_be_following_dm']
+        policy.filter_private_mentions = false
         requires_new_policy = true
       end
 
diff --git a/db/post_migrate/20240321160706_migrate_interaction_settings_to_policy_again.rb b/db/post_migrate/20240321160706_migrate_interaction_settings_to_policy_again.rb
new file mode 100644
index 00000000000000..9baefa677549d6
--- /dev/null
+++ b/db/post_migrate/20240321160706_migrate_interaction_settings_to_policy_again.rb
@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+class MigrateInteractionSettingsToPolicyAgain < ActiveRecord::Migration[7.1]
+  disable_ddl_transaction!
+
+  # Dummy classes, to make migration possible across version changes
+  class Account < ApplicationRecord
+    has_one :user, inverse_of: :account
+    has_one :notification_policy, inverse_of: :account
+  end
+
+  class User < ApplicationRecord
+    belongs_to :account
+  end
+
+  class NotificationPolicy < ApplicationRecord
+    belongs_to :account
+  end
+
+  def up
+    User.includes(account: :notification_policy).find_each do |user|
+      deserialized_settings = Oj.load(user.attributes_before_type_cast['settings'])
+
+      next if deserialized_settings.nil?
+
+      # If the user has configured a notification policy, don't override it
+      next if user.account.notification_policy.present?
+
+      policy = user.account.build_notification_policy
+      requires_new_policy = false
+
+      if deserialized_settings['interactions.must_be_follower']
+        policy.filter_not_followers = true
+        requires_new_policy = true
+      end
+
+      if deserialized_settings['interactions.must_be_following']
+        policy.filter_not_following = true
+        requires_new_policy = true
+      end
+
+      unless deserialized_settings['interactions.must_be_following_dm']
+        policy.filter_private_mentions = false
+        requires_new_policy = true
+      end
+
+      policy.save if requires_new_policy && policy.changed?
+    rescue ActiveRecord::RecordNotUnique
+      next
+    end
+  end
+
+  def down; end
+end
diff --git a/db/schema.rb b/db/schema.rb
index cd66ff750b9f51..34563191585bbd 100644
--- 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_03_20_163441) do
+ActiveRecord::Schema[7.1].define(version: 2024_03_21_160706) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
diff --git a/lib/tasks/tests.rake b/lib/tasks/tests.rake
index 935f6d24a38eaa..6afc013eded42d 100644
--- a/lib/tasks/tests.rake
+++ b/lib/tasks/tests.rake
@@ -105,6 +105,12 @@ namespace :tests do
         exit(1)
       end
 
+      policy = NotificationPolicy.find_by(account: User.find(1).account)
+      unless policy.filter_private_mentions == false && policy.filter_not_following == true
+        puts 'Notification policy not migrated as expected'
+        exit(1)
+      end
+
       puts 'No errors found. Database state is consistent with a successful migration process.'
     end
 
@@ -181,7 +187,8 @@ namespace :tests do
         INSERT INTO "settings"
           (id, thing_type, thing_id, var, value, created_at, updated_at)
         VALUES
-          (5, 'User', 4, 'default_language', E'--- kmr\n', now(), now());
+          (5, 'User', 4, 'default_language', E'--- kmr\n', now(), now()),
+          (6, 'User', 1, 'interactions', E'--- !ruby/hash:ActiveSupport::HashWithIndifferentAccess\nmust_be_follower: false\nmust_be_following: true\nmust_be_following_dm: false\n', now(), now());
       SQL
     end
 

From 05eda8d19330a9c27c0cf07de19a87edff269057 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 21 Mar 2024 22:53:24 +0100
Subject: [PATCH 0573/2191] Remove severed relationship notifications for
 single account suspensions (#29700)

---
 app/services/suspend_account_service.rb       | 18 ------------------
 spec/services/suspend_account_service_spec.rb |  6 +-----
 2 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/app/services/suspend_account_service.rb b/app/services/suspend_account_service.rb
index 86c4ff64164078..8d5446f1a88099 100644
--- a/app/services/suspend_account_service.rb
+++ b/app/services/suspend_account_service.rb
@@ -8,7 +8,6 @@ class SuspendAccountService < BaseService
   def call(account)
     return unless account.suspended?
 
-    @relationship_severance_event = nil
     @account = account
 
     reject_remote_follows!
@@ -16,7 +15,6 @@ def call(account)
     unmerge_from_home_timelines!
     unmerge_from_list_timelines!
     privatize_media_attachments!
-    notify_of_severed_relationships!
   end
 
   private
@@ -38,8 +36,6 @@ def reject_remote_follows!
         [Oj.dump(serialize_payload(follow, ActivityPub::RejectFollowSerializer)), follow.target_account_id, @account.inbox_url]
       end
 
-      relationship_severance_event.import_from_passive_follows!(follows)
-
       follows.each(&:destroy)
     end
   end
@@ -105,21 +101,7 @@ def privatize_media_attachments!
     end
   end
 
-  def notify_of_severed_relationships!
-    return if @relationship_severance_event.nil?
-
-    # TODO: check how efficient that query is, also check `push_bulk`/`perform_bulk`
-    @relationship_severance_event.affected_local_accounts.reorder(nil).find_each do |account|
-      event = AccountRelationshipSeveranceEvent.create!(account: account, relationship_severance_event: @relationship_severance_event)
-      LocalNotificationWorker.perform_async(account.id, event.id, 'AccountRelationshipSeveranceEvent', 'severed_relationships')
-    end
-  end
-
   def signed_activity_json
     @signed_activity_json ||= Oj.dump(serialize_payload(@account, ActivityPub::UpdateSerializer, signer: @account))
   end
-
-  def relationship_severance_event
-    @relationship_severance_event ||= RelationshipSeveranceEvent.create!(type: :account_suspension, target_name: @account.acct)
-  end
 end
diff --git a/spec/services/suspend_account_service_spec.rb b/spec/services/suspend_account_service_spec.rb
index 74ef8f60e26c06..7c72a4776b4b1d 100644
--- a/spec/services/suspend_account_service_spec.rb
+++ b/spec/services/suspend_account_service_spec.rb
@@ -85,14 +85,10 @@ def match_reject_follow_request(req, account, followee)
         account.follow!(local_followee)
       end
 
-      it 'sends a Reject Follow activity, and records severed relationships', :aggregate_failures do
+      it 'sends a Reject Follow activity', :aggregate_failures do
         subject
 
         expect(a_request(:post, account.inbox_url).with { |req| match_reject_follow_request(req, account, local_followee) }).to have_been_made.once
-
-        severed_relationships = local_followee.severed_relationships.to_a
-        expect(severed_relationships.count).to eq 1
-        expect(severed_relationships.map { |rel| [rel.account, rel.target_account] }).to contain_exactly([account, local_followee])
       end
     end
   end

From ec1e770feaef81574482b841bc04a286f9dc7249 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Fri, 22 Mar 2024 12:59:35 +0100
Subject: [PATCH 0574/2191] Add the role ID to the badge component (#29707)

---
 app/javascript/mastodon/components/badge.jsx                 | 5 +++--
 .../mastodon/features/account/components/header.jsx          | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/javascript/mastodon/components/badge.jsx b/app/javascript/mastodon/components/badge.jsx
index 646655c249b872..5e0b2587bd6560 100644
--- a/app/javascript/mastodon/components/badge.jsx
+++ b/app/javascript/mastodon/components/badge.jsx
@@ -7,8 +7,8 @@ import PersonIcon from '@/material-icons/400-24px/person.svg?react';
 import SmartToyIcon from '@/material-icons/400-24px/smart_toy.svg?react';
 
 
-export const Badge = ({ icon, label, domain }) => (
-  <div className='account-role'>
+export const Badge = ({ icon, label, domain, roleId }) => (
+  <div className='account-role' data-account-role-id={roleId}>
     {icon}
     {label}
     {domain && <span className='account-role__domain'>{domain}</span>}
@@ -19,6 +19,7 @@ Badge.propTypes = {
   icon: PropTypes.node,
   label: PropTypes.node,
   domain: PropTypes.node,
+  roleId: PropTypes.string
 };
 
 Badge.defaultProps = {
diff --git a/app/javascript/mastodon/features/account/components/header.jsx b/app/javascript/mastodon/features/account/components/header.jsx
index ecb1108dedc223..e9d6071a21f80b 100644
--- a/app/javascript/mastodon/features/account/components/header.jsx
+++ b/app/javascript/mastodon/features/account/components/header.jsx
@@ -408,7 +408,7 @@ class Header extends ImmutablePureComponent {
     }
 
     account.get('roles', []).forEach((role) => {
-      badges.push(<Badge key={`role-badge-${role.get('id')}`} label={<span>{role.get('name')}</span>} domain={domain} />);
+      badges.push(<Badge key={`role-badge-${role.get('id')}`} label={<span>{role.get('name')}</span>} domain={domain} roleId={role.get('id')} />);
     });
 
     return (

From 8c1d29df7ee11c0d8c803c366b125badda8f4e1b Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 22 Mar 2024 10:43:35 -0400
Subject: [PATCH 0575/2191] Use `has_many through` instead of `delegate` for
 ARSE<>SR (#29672)

---
 app/models/account_relationship_severance_event.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/models/account_relationship_severance_event.rb b/app/models/account_relationship_severance_event.rb
index 20b15e28399c94..697b06b74b46a4 100644
--- a/app/models/account_relationship_severance_event.rb
+++ b/app/models/account_relationship_severance_event.rb
@@ -16,8 +16,9 @@ class AccountRelationshipSeveranceEvent < ApplicationRecord
   belongs_to :account
   belongs_to :relationship_severance_event
 
-  delegate :severed_relationships,
-           :type,
+  has_many :severed_relationships, through: :relationship_severance_event
+
+  delegate :type,
            :target_name,
            :purged,
            :purged?,

From 5db5fa879bd2f48f207567581458bad5a74ec004 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 22 Mar 2024 15:50:03 +0100
Subject: [PATCH 0576/2191] New Crowdin Translations (automated) (#29708)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/bg.json    |  1 -
 app/javascript/mastodon/locales/ca.json    |  5 +-
 app/javascript/mastodon/locales/da.json    |  1 -
 app/javascript/mastodon/locales/de.json    |  7 +++
 app/javascript/mastodon/locales/es-AR.json |  7 +++
 app/javascript/mastodon/locales/eu.json    |  1 -
 app/javascript/mastodon/locales/fi.json    |  1 -
 app/javascript/mastodon/locales/fo.json    |  1 -
 app/javascript/mastodon/locales/fr-CA.json | 63 ++++++++++++++++++++++
 app/javascript/mastodon/locales/fr.json    | 63 ++++++++++++++++++++++
 app/javascript/mastodon/locales/gd.json    |  6 +--
 app/javascript/mastodon/locales/gl.json    |  7 +++
 app/javascript/mastodon/locales/he.json    |  9 +++-
 app/javascript/mastodon/locales/hu.json    |  1 -
 app/javascript/mastodon/locales/it.json    | 46 ++++++++++++++++
 app/javascript/mastodon/locales/ko.json    |  1 -
 app/javascript/mastodon/locales/lad.json   |  1 +
 app/javascript/mastodon/locales/nl.json    |  1 -
 app/javascript/mastodon/locales/nn.json    | 23 ++++----
 app/javascript/mastodon/locales/sk.json    |  2 +
 app/javascript/mastodon/locales/sl.json    |  1 -
 app/javascript/mastodon/locales/sq.json    |  1 +
 app/javascript/mastodon/locales/sv.json    | 19 +++++++
 app/javascript/mastodon/locales/tr.json    |  7 +++
 app/javascript/mastodon/locales/uk.json    |  1 -
 app/javascript/mastodon/locales/vi.json    |  7 +++
 app/javascript/mastodon/locales/zh-CN.json |  1 -
 app/javascript/mastodon/locales/zh-TW.json |  1 -
 config/locales/ca.yml                      |  2 +-
 config/locales/de.yml                      | 12 +++++
 config/locales/doorkeeper.nn.yml           | 14 ++---
 config/locales/es-AR.yml                   | 12 +++++
 config/locales/fr-CA.yml                   | 19 +++++++
 config/locales/fr.yml                      | 19 +++++++
 config/locales/gd.yml                      |  1 +
 config/locales/gl.yml                      | 12 +++++
 config/locales/he.yml                      | 13 +++++
 config/locales/it.yml                      | 15 ++++++
 config/locales/nn.yml                      | 48 ++++++++---------
 config/locales/simple_form.fr-CA.yml       |  2 +
 config/locales/simple_form.fr.yml          |  2 +
 config/locales/simple_form.ko.yml          |  2 +-
 config/locales/simple_form.nn.yml          |  4 +-
 config/locales/simple_form.sv.yml          |  1 +
 config/locales/sl.yml                      | 22 ++++----
 config/locales/sq.yml                      |  3 ++
 config/locales/sv.yml                      |  3 ++
 config/locales/tr.yml                      | 12 +++++
 config/locales/vi.yml                      | 12 +++++
 49 files changed, 438 insertions(+), 77 deletions(-)

diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json
index 9d972726b75c08..4670a6e2d6d0ef 100644
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@@ -471,7 +471,6 @@
   "notification.own_poll": "Анкетата ви приключи",
   "notification.poll": "Анкета, в която гласувахте, приключи",
   "notification.reblog": "{name} подсили ваша публикация",
-  "notification.severedRelationships": "Връзката с {name} е прекъсната",
   "notification.severed_relationships": "Връзката с {name} е прекъсната",
   "notification.status": "{name} току-що публикува",
   "notification.update": "{name} промени публикация",
diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index 3f1d7f858c8be7..c95e8a9502fc9e 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -471,7 +471,6 @@
   "notification.own_poll": "La teva enquesta ha finalitzat",
   "notification.poll": "Ha finalitzat una enquesta en què has votat",
   "notification.reblog": "{name} t'ha impulsat",
-  "notification.severedRelationships": "S'han eliminat les relacions amb {name}",
   "notification.severed_relationships": "S'han eliminat les relacions amb {name}",
   "notification.status": "{name} acaba de publicar",
   "notification.update": "{name} ha editat un tut",
@@ -589,12 +588,12 @@
   "refresh": "Actualitza",
   "regeneration_indicator.label": "Es carrega…",
   "regeneration_indicator.sublabel": "Es prepara la teva línia de temps d'Inici!",
-  "relationship_severance_notification.purged_data": "ho han purgat els administradors",
+  "relationship_severance_notification.purged_data": "purgat pels administradors",
   "relationship_severance_notification.relationships": "{count, plural, one {# relació} other {# relacions}}",
   "relationship_severance_notification.types.account_suspension": "S'ha suspès el compte",
   "relationship_severance_notification.types.domain_block": "S'ha suspès el domini",
   "relationship_severance_notification.types.user_domain_block": "Heu blocat aquest domini",
-  "relationship_severance_notification.view": "Veure",
+  "relationship_severance_notification.view": "Visualitza",
   "relative_time.days": "{number}d",
   "relative_time.full.days": "fa {number, plural, one {# dia} other {# dies}}",
   "relative_time.full.hours": "fa {number, plural, one {# hora} other {# hores}}",
diff --git a/app/javascript/mastodon/locales/da.json b/app/javascript/mastodon/locales/da.json
index e00e23f9b87566..ca32ba298a7ad0 100644
--- a/app/javascript/mastodon/locales/da.json
+++ b/app/javascript/mastodon/locales/da.json
@@ -469,7 +469,6 @@
   "notification.own_poll": "Din afstemning er afsluttet",
   "notification.poll": "En afstemning, hvori du stemte, er slut",
   "notification.reblog": "{name} boostede dit indlæg",
-  "notification.severedRelationships": "Forhold med {name} afbrudt",
   "notification.status": "{name} har netop postet",
   "notification.update": "{name} redigerede et indlæg",
   "notification_requests.accept": "Acceptér",
diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json
index cb03e7ba3d88e6..bed336f76b35a0 100644
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@@ -471,6 +471,7 @@
   "notification.own_poll": "Deine Umfrage ist beendet",
   "notification.poll": "Eine Umfrage, an der du teilgenommen hast, ist beendet",
   "notification.reblog": "{name} teilte deinen Beitrag",
+  "notification.severed_relationships": "Beziehungen zu {name} getrennt",
   "notification.status": "{name} hat gerade etwas gepostet",
   "notification.update": "{name} bearbeitete einen Beitrag",
   "notification_requests.accept": "Akzeptieren",
@@ -587,6 +588,12 @@
   "refresh": "Aktualisieren",
   "regeneration_indicator.label": "Wird geladen …",
   "regeneration_indicator.sublabel": "Deine Startseite wird gerade vorbereitet!",
+  "relationship_severance_notification.purged_data": "von Administrator*innen entfernt",
+  "relationship_severance_notification.relationships": "{count, plural, one {# Beziehung} other {# Beziehungen}}",
+  "relationship_severance_notification.types.account_suspension": "Konto wurde gesperrt",
+  "relationship_severance_notification.types.domain_block": "Domain wurde gesperrt",
+  "relationship_severance_notification.types.user_domain_block": "Du hast diese Domain blockiert",
+  "relationship_severance_notification.view": "Anzeigen",
   "relative_time.days": "{number} T.",
   "relative_time.full.days": "vor {number, plural, one {# Tag} other {# Tagen}}",
   "relative_time.full.hours": "vor {number, plural, one {# Stunde} other {# Stunden}}",
diff --git a/app/javascript/mastodon/locales/es-AR.json b/app/javascript/mastodon/locales/es-AR.json
index 53144cfcbf9879..fec707be6236a7 100644
--- a/app/javascript/mastodon/locales/es-AR.json
+++ b/app/javascript/mastodon/locales/es-AR.json
@@ -471,6 +471,7 @@
   "notification.own_poll": "Tu encuesta finalizó",
   "notification.poll": "Finalizó una encuesta en la que votaste",
   "notification.reblog": "{name} adhirió a tu mensaje",
+  "notification.severed_relationships": "Relaciones con {name} cortadas",
   "notification.status": "{name} acaba de enviar un mensaje",
   "notification.update": "{name} editó un mensaje",
   "notification_requests.accept": "Aceptar",
@@ -587,6 +588,12 @@
   "refresh": "Refrescar",
   "regeneration_indicator.label": "Cargando…",
   "regeneration_indicator.sublabel": "¡Se está preparando tu línea temporal principal!",
+  "relationship_severance_notification.purged_data": "purgada por administradores",
+  "relationship_severance_notification.relationships": "{count, plural, one {# relación} other {# relaciones}}",
+  "relationship_severance_notification.types.account_suspension": "La cuenta fue suspendida",
+  "relationship_severance_notification.types.domain_block": "El dominio fue suspendido",
+  "relationship_severance_notification.types.user_domain_block": "Bloqueaste este dominio",
+  "relationship_severance_notification.view": "Ver",
   "relative_time.days": "{number}d",
   "relative_time.full.days": "{number, plural,one {hace # día} other {hace # días}}",
   "relative_time.full.hours": "{number, plural,one {hace # hora} other {hace # horas}}",
diff --git a/app/javascript/mastodon/locales/eu.json b/app/javascript/mastodon/locales/eu.json
index 1a6338c2eb6974..bd0081d71a5c08 100644
--- a/app/javascript/mastodon/locales/eu.json
+++ b/app/javascript/mastodon/locales/eu.json
@@ -471,7 +471,6 @@
   "notification.own_poll": "Zure inkesta amaitu da",
   "notification.poll": "Zuk erantzun duzun inkesta bat bukatu da",
   "notification.reblog": "{name}(e)k bultzada eman dio zure bidalketari",
-  "notification.severedRelationships": "{name} erabiltzailearekin zenuen erlazioa galdu da",
   "notification.severed_relationships": "{name} erabiltzailearekin zenuen erlazioa galdu da",
   "notification.status": "{name} erabiltzaileak bidalketa egin berri du",
   "notification.update": "{name} erabiltzaileak bidalketa bat editatu du",
diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index b976b505d6bce3..2cf85926fc8de0 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -471,7 +471,6 @@
   "notification.own_poll": "Äänestyksesi on päättynyt",
   "notification.poll": "Kysely, johon osallistuit, on päättynyt",
   "notification.reblog": "{name} tehosti julkaisuasi",
-  "notification.severedRelationships": "Suhteet palvelimeen {name} katkenneet",
   "notification.severed_relationships": "Suhteet palvelimeen {name} katkenneet",
   "notification.status": "{name} julkaisi juuri",
   "notification.update": "{name} muokkasi julkaisua",
diff --git a/app/javascript/mastodon/locales/fo.json b/app/javascript/mastodon/locales/fo.json
index 5d8cafcd16be56..3ea13cc7f0947c 100644
--- a/app/javascript/mastodon/locales/fo.json
+++ b/app/javascript/mastodon/locales/fo.json
@@ -471,7 +471,6 @@
   "notification.own_poll": "Tín atkvøðugreiðsla er endað",
   "notification.poll": "Ein atkvøðugreiðsla, har tú hevur atkvøtt, er endað",
   "notification.reblog": "{name} lyfti tín post",
-  "notification.severedRelationships": "Tilknýti við {name} avbrotið",
   "notification.severed_relationships": "Tilknýti við {name} avbrotið",
   "notification.status": "{name} hevur júst postað",
   "notification.update": "{name} rættaði ein post",
diff --git a/app/javascript/mastodon/locales/fr-CA.json b/app/javascript/mastodon/locales/fr-CA.json
index 9549686d7cb961..1e1c78f29d6aea 100644
--- a/app/javascript/mastodon/locales/fr-CA.json
+++ b/app/javascript/mastodon/locales/fr-CA.json
@@ -89,6 +89,14 @@
   "announcement.announcement": "Annonce",
   "attachments_list.unprocessed": "(non traité)",
   "audio.hide": "Masquer l'audio",
+  "block_modal.remote_users_caveat": "Nous allons demander au serveur {domain} de respecter votre décision. Cependant, ce respect n'est pas garanti, car certains serveurs peuvent gérer différemment les blocages. Les messages publics peuvent rester visibles par les utilisateurs non connectés.",
+  "block_modal.show_less": "Afficher moins",
+  "block_modal.show_more": "Afficher plus",
+  "block_modal.they_cant_mention": "Il ne peut pas vous mentionner ou vous suivre.",
+  "block_modal.they_cant_see_posts": "Il peut toujours voir vos publications, mais vous ne verrez pas les siennes.",
+  "block_modal.they_will_know": "Il peut voir qu'il est bloqué.",
+  "block_modal.title": "Bloquer l'utilisateur ?",
+  "block_modal.you_wont_see_mentions": "Vous ne verrez pas les publications qui le mentionne.",
   "boost_modal.combo": "Vous pouvez appuyer sur {combo} pour sauter ceci la prochaine fois",
   "bundle_column_error.copy_stacktrace": "Copier le rapport d'erreur",
   "bundle_column_error.error.body": "La page demandée n'a pas pu être affichée. Cela pourrait être dû à un bogue dans notre code, ou à un problème de compatibilité avec le navigateur.",
@@ -169,6 +177,7 @@
   "confirmations.delete_list.message": "Voulez-vous vraiment supprimer définitivement cette liste?",
   "confirmations.discard_edit_media.confirm": "Rejeter",
   "confirmations.discard_edit_media.message": "Vous avez des modifications non enregistrées de la description ou de l'aperçu du média, voulez-vous quand même les supprimer?",
+  "confirmations.domain_block.confirm": "Bloquer le serveur",
   "confirmations.domain_block.message": "Voulez-vous vraiment, vraiment bloquer {domain} en entier? Dans la plupart des cas, quelques blocages ou masquages ciblés sont suffisants et préférables. Vous ne verrez plus de contenu provenant de ce domaine, ni dans vos fils publics, ni dans vos notifications. Vos abonné·e·s utilisant ce domaine seront retiré·e·s.",
   "confirmations.edit.confirm": "Éditer",
   "confirmations.edit.message": "Modifier maintenant écrasera votre message en cours de rédaction. Voulez-vous vraiment continuer ?",
@@ -200,6 +209,27 @@
   "dismissable_banner.explore_statuses": "Voici des publications venant de tout le web social gagnant en popularité aujourd’hui. Les nouvelles publications avec plus de boosts et de favoris sont classés plus haut.",
   "dismissable_banner.explore_tags": "Ces hashtags sont présentement en train de gagner de l'ampleur parmi des personnes sur les serveurs du réseau décentralisé dont celui-ci.",
   "dismissable_banner.public_timeline": "Ce sont les messages publics les plus récents de personnes sur le web social que les gens de {domain} suivent.",
+  "domain_block_modal.block": "Bloquer le serveur",
+  "domain_block_modal.block_account_instead": "Bloquer @{name} à la place",
+  "domain_block_modal.they_can_interact_with_old_posts": "Les personnes de ce serveur peuvent interagir avec vos anciennes publications.",
+  "domain_block_modal.they_cant_follow": "Personne de ce serveur ne peut vous suivre.",
+  "domain_block_modal.they_wont_know": "Il ne saura pas qu'il a été bloqué.",
+  "domain_block_modal.title": "Bloquer le domaine ?",
+  "domain_block_modal.you_will_lose_followers": "Tous vos abonnés de ce serveur seront supprimés.",
+  "domain_block_modal.you_wont_see_posts": "Vous ne verrez plus les publications ou les notifications des utilisateurs de ce serveur.",
+  "domain_pill.activitypub_lets_connect": "Cela vous permet de vous connecter et d'interagir avec les autres non seulement sur Mastodon, mais également sur d'autres applications de réseaux sociaux.",
+  "domain_pill.activitypub_like_language": "ActivityPub est comme une langue que Mastodon utilise pour communiquer avec les autres réseaux sociaux.",
+  "domain_pill.server": "Serveur",
+  "domain_pill.their_handle": "Son identifiant :",
+  "domain_pill.their_server": "Son foyer numérique, là où tous ses posts résident.",
+  "domain_pill.their_username": "Son identifiant unique sur leur serveur. Il est possible de rencontrer des utilisateurs avec le même nom sur différents serveurs.",
+  "domain_pill.username": "Nom d’utilisateur",
+  "domain_pill.whats_in_a_handle": "Qu'est-ce qu'un identifiant ?",
+  "domain_pill.who_they_are": "Comme un identifiant contient le nom et le service hébergeant une personne, vous pouvez interagir sur <button>les plateformes sociales implémentant ActivityPub</button>.",
+  "domain_pill.who_you_are": "Comme un identifiant indique votre nom et le service vous hébergeant, vous pouvez interagir avec <button>les autres plateformes sociales implémentant ActivityPub</button>.",
+  "domain_pill.your_handle": "Votre identifiant :",
+  "domain_pill.your_server": "Votre foyer numérique, là où vos messages résident. Vous souhaitez changer ? Lancez un transfert vers un autre serveur quand vous le voulez et vos abonné·e·s suivront automatiquement.",
+  "domain_pill.your_username": "Votre identifiant unique sur ce serveur. Il est possible de trouver des utilisateurs ayant le même nom d'utilisateur sur différents serveurs.",
   "embed.instructions": "Intégrez cette publication à votre site en copiant le code ci-dessous.",
   "embed.preview": "Voici comment il apparaîtra:",
   "emoji_button.activity": "Activité",
@@ -236,6 +266,7 @@
   "empty_column.list": "Il n’y a rien dans cette liste pour l’instant. Quand des membres de cette liste publieront de nouvelles publications, elles apparaîtront ici.",
   "empty_column.lists": "Vous n’avez pas encore de liste. Lorsque vous en créerez une, elle apparaîtra ici.",
   "empty_column.mutes": "Vous n’avez masqué aucun compte pour le moment.",
+  "empty_column.notification_requests": "C'est fini ! Il n'y a plus rien ici. Lorsque vous recevez de nouvelles notifications, elles apparaitront ici conformément à vos préférences.",
   "empty_column.notifications": "Vous n'avez pas encore de notifications. Quand d'autres personnes interagissent avec vous, vous en verrez ici.",
   "empty_column.public": "Il n’y a rien ici! Écrivez quelque chose publiquement, ou bien suivez manuellement des personnes d’autres serveurs pour remplir le fil public",
   "error.unexpected_crash.explanation": "En raison d’un bogue dans notre code ou d’un problème de compatibilité avec votre navigateur, cette page n’a pas pu être affichée correctement.",
@@ -396,6 +427,15 @@
   "loading_indicator.label": "Chargement…",
   "media_gallery.toggle_visible": "{number, plural, one {Cacher l’image} other {Cacher les images}}",
   "moved_to_account_banner.text": "Votre compte {disabledAccount} est actuellement désactivé parce que vous avez déménagé sur {movedToAccount}.",
+  "mute_modal.hide_from_notifications": "Cacher des notifications",
+  "mute_modal.hide_options": "Masquer les options",
+  "mute_modal.indefinite": "Jusqu'à ce que je les réactive",
+  "mute_modal.show_options": "Afficher les options",
+  "mute_modal.they_can_mention_and_follow": "Ils peuvent vous mentionner et vous suivre, mais vous ne les verrez pas.",
+  "mute_modal.they_wont_know": "Ils ne sauront pas qu'ils ont été rendus silencieux.",
+  "mute_modal.title": "Rendre cet utilisateur silencieux ?",
+  "mute_modal.you_wont_see_mentions": "Vous ne verrez pas les publications qui le mentionne.",
+  "mute_modal.you_wont_see_posts": "Il peut toujours voir vos publications, mais vous ne verrez pas les siennes.",
   "navigation_bar.about": "À propos",
   "navigation_bar.advanced_interface": "Ouvrir dans l’interface avancée",
   "navigation_bar.blocks": "Comptes bloqués",
@@ -431,8 +471,13 @@
   "notification.own_poll": "Votre sondage est terminé",
   "notification.poll": "Un sondage auquel vous avez participé est terminé",
   "notification.reblog": "{name} a boosté votre message",
+  "notification.severed_relationships": "Relation avec {name} rompues",
   "notification.status": "{name} vient de publier",
   "notification.update": "{name} a modifié une publication",
+  "notification_requests.accept": "Accepter",
+  "notification_requests.dismiss": "Rejeter",
+  "notification_requests.notifications_from": "Notifications de {name}",
+  "notification_requests.title": "Notifications filtrées",
   "notifications.clear": "Effacer notifications",
   "notifications.clear_confirmation": "Voulez-vous vraiment effacer toutes vos notifications?",
   "notifications.column_settings.admin.report": "Nouveaux signalements:",
@@ -464,6 +509,15 @@
   "notifications.permission_denied": "Les notifications de bureau ne sont pas disponibles en raison d'une demande de permission de navigateur précédemment refusée",
   "notifications.permission_denied_alert": "Les notifications de bureau ne peuvent pas être activées, car l’autorisation du navigateur a précedemment été refusée",
   "notifications.permission_required": "Les notifications de bureau ne sont pas disponibles car l’autorisation requise n’a pas été accordée.",
+  "notifications.policy.filter_new_accounts.hint": "Créés au cours des derniers {days, plural, one {un jour} other {# jours}}",
+  "notifications.policy.filter_new_accounts_title": "Nouveaux comptes",
+  "notifications.policy.filter_not_followers_hint": "Incluant les personnes qui vous suivent depuis moins de {days, plural, one {un jour} other {# jours}}",
+  "notifications.policy.filter_not_followers_title": "Personnes qui ne vous suivent pas",
+  "notifications.policy.filter_not_following_hint": "Jusqu'à ce que vous les validiez manuellement",
+  "notifications.policy.filter_not_following_title": "Personnes que vous ne suivez pas",
+  "notifications.policy.filter_private_mentions_hint": "Filtré sauf si c'est en réponse à une mention de vous ou si vous suivez l'expéditeur",
+  "notifications.policy.filter_private_mentions_title": "Mentions privées non sollicitées",
+  "notifications.policy.title": "Filtrer les notifications de…",
   "notifications_permission_banner.enable": "Activer les notifications de bureau",
   "notifications_permission_banner.how_to_control": "Pour recevoir des notifications lorsque Mastodon n’est pas ouvert, activez les notifications de bureau. Vous pouvez contrôler précisément quels types d’interactions génèrent des notifications de bureau via le bouton {icon} ci-dessus une fois qu’elles sont activées.",
   "notifications_permission_banner.title": "Ne rien rater",
@@ -534,6 +588,12 @@
   "refresh": "Actualiser",
   "regeneration_indicator.label": "Chargement…",
   "regeneration_indicator.sublabel": "Votre fil d'accueil est en cours de préparation!",
+  "relationship_severance_notification.purged_data": "supprimées par les administrateurs",
+  "relationship_severance_notification.relationships": "{count, plural, one {# relation} other {# relations}}",
+  "relationship_severance_notification.types.account_suspension": "Le compte a été suspendu",
+  "relationship_severance_notification.types.domain_block": "Le domaine a été suspendu",
+  "relationship_severance_notification.types.user_domain_block": "Vous avez bloqué ce domaine",
+  "relationship_severance_notification.view": "Afficher",
   "relative_time.days": "{number} j",
   "relative_time.full.days": "il y a {number, plural, one {# jour} other {# jours}}",
   "relative_time.full.hours": "il y a {number, plural, one {# heure} other {# heures}}",
@@ -640,9 +700,11 @@
   "status.direct": "Mention privée @{name}",
   "status.direct_indicator": "Mention privée",
   "status.edit": "Modifier",
+  "status.edited": "Dernière modification le {date}",
   "status.edited_x_times": "Modifiée {count, plural, one {{count} fois} other {{count} fois}}",
   "status.embed": "Intégrer",
   "status.favourite": "Ajouter aux favoris",
+  "status.favourites": "{count, plural, one {favori} other {favoris}}",
   "status.filter": "Filtrer cette publication",
   "status.filtered": "Filtrée",
   "status.hide": "Masquer le message",
@@ -663,6 +725,7 @@
   "status.reblog": "Booster",
   "status.reblog_private": "Booster avec visibilité originale",
   "status.reblogged_by": "{name} a boosté",
+  "status.reblogs": "{count, plural, one {boost} other {boosts}}",
   "status.reblogs.empty": "Personne n’a encore boosté cette publication. Lorsque quelqu’un le fera, elle apparaîtra ici.",
   "status.redraft": "Supprimer et réécrire",
   "status.remove_bookmark": "Retirer des signets",
diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json
index 29b4d56a4f7f8a..af5ed66bd8bd1e 100644
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@@ -89,6 +89,14 @@
   "announcement.announcement": "Annonce",
   "attachments_list.unprocessed": "(non traité)",
   "audio.hide": "Masquer l'audio",
+  "block_modal.remote_users_caveat": "Nous allons demander au serveur {domain} de respecter votre décision. Cependant, ce respect n'est pas garanti, car certains serveurs peuvent gérer différemment les blocages. Les messages publics peuvent rester visibles par les utilisateurs non connectés.",
+  "block_modal.show_less": "Afficher moins",
+  "block_modal.show_more": "Afficher plus",
+  "block_modal.they_cant_mention": "Il ne peut pas vous mentionner ou vous suivre.",
+  "block_modal.they_cant_see_posts": "Il peut toujours voir vos publications, mais vous ne verrez pas les siennes.",
+  "block_modal.they_will_know": "Il peut voir qu'il est bloqué.",
+  "block_modal.title": "Bloquer l'utilisateur ?",
+  "block_modal.you_wont_see_mentions": "Vous ne verrez pas les publications qui le mentionne.",
   "boost_modal.combo": "Vous pouvez appuyer sur {combo} pour passer ceci la prochaine fois",
   "bundle_column_error.copy_stacktrace": "Copier le rapport d'erreur",
   "bundle_column_error.error.body": "La page demandée n'a pas pu être affichée. Cela peut être dû à un bogue dans notre code, ou à un problème de compatibilité avec le navigateur.",
@@ -169,6 +177,7 @@
   "confirmations.delete_list.message": "Voulez-vous vraiment supprimer définitivement cette liste ?",
   "confirmations.discard_edit_media.confirm": "Rejeter",
   "confirmations.discard_edit_media.message": "Vous avez des modifications non enregistrées de la description ou de l'aperçu du média, les supprimer quand même ?",
+  "confirmations.domain_block.confirm": "Bloquer le serveur",
   "confirmations.domain_block.message": "Voulez-vous vraiment, vraiment bloquer {domain} en entier ? Dans la plupart des cas, quelques blocages ou masquages ciblés sont suffisants et préférables. Vous ne verrez plus de contenu provenant de ce domaine, ni dans vos fils publics, ni dans vos notifications. Vos abonné·e·s utilisant ce domaine seront retiré·e·s.",
   "confirmations.edit.confirm": "Modifier",
   "confirmations.edit.message": "Modifier maintenant écrasera votre message en cours de rédaction. Voulez-vous vraiment continuer ?",
@@ -200,6 +209,27 @@
   "dismissable_banner.explore_statuses": "Ces messages venant de tout le web social gagnent en popularité aujourd’hui. Les nouveaux messages avec plus de boosts et de favoris sont classés plus haut.",
   "dismissable_banner.explore_tags": "Ces hashtags sont actuellement en train de gagner de l'ampleur parmi les personnes sur les serveurs du réseau décentralisé dont celui-ci.",
   "dismissable_banner.public_timeline": "Ce sont les posts publics les plus récents de personnes sur le web social que les gens sur {domain} suivent.",
+  "domain_block_modal.block": "Bloquer le serveur",
+  "domain_block_modal.block_account_instead": "Bloquer @{name} à la place",
+  "domain_block_modal.they_can_interact_with_old_posts": "Les personnes de ce serveur peuvent interagir avec vos anciennes publications.",
+  "domain_block_modal.they_cant_follow": "Personne de ce serveur ne peut vous suivre.",
+  "domain_block_modal.they_wont_know": "Il ne saura pas qu'il a été bloqué.",
+  "domain_block_modal.title": "Bloquer le domaine ?",
+  "domain_block_modal.you_will_lose_followers": "Tous vos abonnés de ce serveur seront supprimés.",
+  "domain_block_modal.you_wont_see_posts": "Vous ne verrez plus les publications ou les notifications des utilisateurs de ce serveur.",
+  "domain_pill.activitypub_lets_connect": "Cela vous permet de vous connecter et d'interagir avec les autres non seulement sur Mastodon, mais également sur d'autres applications de réseaux sociaux.",
+  "domain_pill.activitypub_like_language": "ActivityPub est comme une langue que Mastodon utilise pour communiquer avec les autres réseaux sociaux.",
+  "domain_pill.server": "Serveur",
+  "domain_pill.their_handle": "Son identifiant :",
+  "domain_pill.their_server": "Son foyer numérique, là où tous ses posts résident.",
+  "domain_pill.their_username": "Son identifiant unique sur leur serveur. Il est possible de rencontrer des utilisateurs avec le même nom sur différents serveurs.",
+  "domain_pill.username": "Nom d’utilisateur",
+  "domain_pill.whats_in_a_handle": "Qu'est-ce qu'un identifiant ?",
+  "domain_pill.who_they_are": "Comme un identifiant contient le nom et le service hébergeant une personne, vous pouvez interagir sur <button>les plateformes sociales implémentant ActivityPub</button>.",
+  "domain_pill.who_you_are": "Comme un identifiant indique votre nom et le service vous hébergeant, vous pouvez interagir avec <button>les autres plateformes sociales implémentant ActivityPub</button>.",
+  "domain_pill.your_handle": "Votre identifiant :",
+  "domain_pill.your_server": "Votre foyer numérique, là où vos messages résident. Vous souhaitez changer ? Lancez un transfert vers un autre serveur quand vous le voulez et vos abonné·e·s suivront automatiquement.",
+  "domain_pill.your_username": "Votre identifiant unique sur ce serveur. Il est possible de trouver des utilisateurs ayant le même nom d'utilisateur sur différents serveurs.",
   "embed.instructions": "Intégrez ce message à votre site en copiant le code ci-dessous.",
   "embed.preview": "Il apparaîtra comme cela :",
   "emoji_button.activity": "Activités",
@@ -236,6 +266,7 @@
   "empty_column.list": "Il n’y a rien dans cette liste pour l’instant. Quand des membres de cette liste publieront de nouveaux messages, ils apparaîtront ici.",
   "empty_column.lists": "Vous n’avez pas encore de liste. Lorsque vous en créerez une, elle apparaîtra ici.",
   "empty_column.mutes": "Vous n’avez masqué aucun compte pour le moment.",
+  "empty_column.notification_requests": "C'est fini ! Il n'y a plus rien ici. Lorsque vous recevez de nouvelles notifications, elles apparaitront ici conformément à vos préférences.",
   "empty_column.notifications": "Vous n’avez pas encore de notification. Interagissez avec d’autres personnes pour débuter la conversation.",
   "empty_column.public": "Il n’y a rien ici ! Écrivez quelque chose publiquement, ou bien suivez manuellement des personnes d’autres serveurs pour remplir le fil public",
   "error.unexpected_crash.explanation": "En raison d’un bug dans notre code ou d’un problème de compatibilité avec votre navigateur, cette page n’a pas pu être affichée correctement.",
@@ -396,6 +427,15 @@
   "loading_indicator.label": "Chargement…",
   "media_gallery.toggle_visible": "{number, plural, one {Cacher l’image} other {Cacher les images}}",
   "moved_to_account_banner.text": "Votre compte {disabledAccount} est actuellement désactivé parce que vous l'avez déplacé à {movedToAccount}.",
+  "mute_modal.hide_from_notifications": "Cacher des notifications",
+  "mute_modal.hide_options": "Masquer les options",
+  "mute_modal.indefinite": "Jusqu'à ce que je les réactive",
+  "mute_modal.show_options": "Afficher les options",
+  "mute_modal.they_can_mention_and_follow": "Ils peuvent vous mentionner et vous suivre, mais vous ne les verrez pas.",
+  "mute_modal.they_wont_know": "Ils ne sauront pas qu'ils ont été rendus silencieux.",
+  "mute_modal.title": "Rendre cet utilisateur silencieux ?",
+  "mute_modal.you_wont_see_mentions": "Vous ne verrez pas les publications qui le mentionne.",
+  "mute_modal.you_wont_see_posts": "Il peut toujours voir vos publications, mais vous ne verrez pas les siennes.",
   "navigation_bar.about": "À propos",
   "navigation_bar.advanced_interface": "Ouvrir dans l’interface avancée",
   "navigation_bar.blocks": "Comptes bloqués",
@@ -431,8 +471,13 @@
   "notification.own_poll": "Votre sondage est terminé",
   "notification.poll": "Un sondage auquel vous avez participé vient de se terminer",
   "notification.reblog": "{name} a partagé votre message",
+  "notification.severed_relationships": "Relation avec {name} rompues",
   "notification.status": "{name} vient de publier",
   "notification.update": "{name} a modifié un message",
+  "notification_requests.accept": "Accepter",
+  "notification_requests.dismiss": "Rejeter",
+  "notification_requests.notifications_from": "Notifications de {name}",
+  "notification_requests.title": "Notifications filtrées",
   "notifications.clear": "Effacer les notifications",
   "notifications.clear_confirmation": "Voulez-vous vraiment effacer toutes vos notifications ?",
   "notifications.column_settings.admin.report": "Nouveaux signalements :",
@@ -464,6 +509,15 @@
   "notifications.permission_denied": "Impossible d’activer les notifications de bureau car l’autorisation a été refusée.",
   "notifications.permission_denied_alert": "Les notifications de bureau ne peuvent pas être activées, car l’autorisation du navigateur a été refusée avant",
   "notifications.permission_required": "Les notifications de bureau ne sont pas disponibles car l’autorisation requise n’a pas été accordée.",
+  "notifications.policy.filter_new_accounts.hint": "Créés au cours des derniers {days, plural, one {un jour} other {# jours}}",
+  "notifications.policy.filter_new_accounts_title": "Nouveaux comptes",
+  "notifications.policy.filter_not_followers_hint": "Incluant les personnes qui vous suivent depuis moins de {days, plural, one {un jour} other {# jours}}",
+  "notifications.policy.filter_not_followers_title": "Personnes qui ne vous suivent pas",
+  "notifications.policy.filter_not_following_hint": "Jusqu'à ce que vous les validiez manuellement",
+  "notifications.policy.filter_not_following_title": "Personnes que vous ne suivez pas",
+  "notifications.policy.filter_private_mentions_hint": "Filtré sauf si c'est en réponse à une mention de vous ou si vous suivez l'expéditeur",
+  "notifications.policy.filter_private_mentions_title": "Mentions privées non sollicitées",
+  "notifications.policy.title": "Filtrer les notifications de…",
   "notifications_permission_banner.enable": "Activer les notifications de bureau",
   "notifications_permission_banner.how_to_control": "Pour recevoir des notifications lorsque Mastodon n’est pas ouvert, activez les notifications du bureau. Vous pouvez contrôler précisément quels types d’interactions génèrent des notifications de bureau via le bouton {icon} ci-dessus une fois qu’elles sont activées.",
   "notifications_permission_banner.title": "Toujours au courant",
@@ -534,6 +588,12 @@
   "refresh": "Actualiser",
   "regeneration_indicator.label": "Chargement…",
   "regeneration_indicator.sublabel": "Votre fil principal est en cours de préparation !",
+  "relationship_severance_notification.purged_data": "supprimées par les administrateurs",
+  "relationship_severance_notification.relationships": "{count, plural, one {# relation} other {# relations}}",
+  "relationship_severance_notification.types.account_suspension": "Le compte a été suspendu",
+  "relationship_severance_notification.types.domain_block": "Le domaine a été suspendu",
+  "relationship_severance_notification.types.user_domain_block": "Vous avez bloqué ce domaine",
+  "relationship_severance_notification.view": "Afficher",
   "relative_time.days": "{number} j",
   "relative_time.full.days": "il y a {number, plural, one {# jour} other {# jours}}",
   "relative_time.full.hours": "il y a {number, plural, one {# heure} other {# heures}}",
@@ -640,9 +700,11 @@
   "status.direct": "Mention privée @{name}",
   "status.direct_indicator": "Mention privée",
   "status.edit": "Modifier",
+  "status.edited": "Dernière modification le {date}",
   "status.edited_x_times": "Modifié {count, plural, one {{count} fois} other {{count} fois}}",
   "status.embed": "Intégrer",
   "status.favourite": "Ajouter aux favoris",
+  "status.favourites": "{count, plural, one {favori} other {favoris}}",
   "status.filter": "Filtrer ce message",
   "status.filtered": "Filtré",
   "status.hide": "Masquer le message",
@@ -663,6 +725,7 @@
   "status.reblog": "Partager",
   "status.reblog_private": "Partager à l’audience originale",
   "status.reblogged_by": "{name} a partagé",
+  "status.reblogs": "{count, plural, one {boost} other {boosts}}",
   "status.reblogs.empty": "Personne n’a encore partagé ce message. Lorsque quelqu’un le fera, il apparaîtra ici.",
   "status.redraft": "Supprimer et réécrire",
   "status.remove_bookmark": "Retirer des marque-pages",
diff --git a/app/javascript/mastodon/locales/gd.json b/app/javascript/mastodon/locales/gd.json
index 4696d50eac6980..9c566909a7910f 100644
--- a/app/javascript/mastodon/locales/gd.json
+++ b/app/javascript/mastodon/locales/gd.json
@@ -471,7 +471,6 @@
   "notification.own_poll": "Thàinig an cunntas-bheachd agad gu crìoch",
   "notification.poll": "Thàinig cunntas-bheachd sa bhòt thu gu crìoch",
   "notification.reblog": "Bhrosnaich {name} am post agad",
-  "notification.severedRelationships": "Chaidh na dàimhean le {name} a dhealachadh",
   "notification.severed_relationships": "Chaidh na dàimhean le {name} a dhealachadh",
   "notification.status": "Phostaich {name} rud",
   "notification.update": "Dheasaich {name} post",
@@ -510,9 +509,9 @@
   "notifications.permission_denied": "Chan eil brathan deasga ri fhaighinn on a chaidh iarrtas ceadan a’ bhrabhsair a dhiùltadh cheana",
   "notifications.permission_denied_alert": "Cha ghabh brathan deasga a chur an comas on a chaidh iarrtas ceadan a’ bhrabhsair a dhiùltadh cheana",
   "notifications.permission_required": "Chan eil brathan deasga ri fhaighinn on nach deach an cead riatanach a thoirt seachad.",
-  "notifications.policy.filter_new_accounts.hint": "Chaidh a chruthachadh o chionn {count, plural, one {# latha} two {# latha} few {# làithean} other {# latha}}",
+  "notifications.policy.filter_new_accounts.hint": "Chaidh a chruthachadh o chionn {days, plural, one {# latha} two {# latha} few {# làithean} other {# latha}}",
   "notifications.policy.filter_new_accounts_title": "Cunntasan ùra",
-  "notifications.policy.filter_not_followers_hint": "A’ gabhail a-staigh an fheadhainn a lean ort nas lugha na {count, plural, one {# latha} two {# latha} few {# làithean} other {# latha}} seo chaidh",
+  "notifications.policy.filter_not_followers_hint": "A’ gabhail a-staigh an fheadhainn a lean ort nas lugha na {days, plural, one {# latha} two {# latha} few {# làithean} other {# latha}} seo chaidh",
   "notifications.policy.filter_not_followers_title": "Daoine nach eil gad leantainn",
   "notifications.policy.filter_not_following_hint": "Gus an aontaich thu riutha a làimh",
   "notifications.policy.filter_not_following_title": "Daoine nach eil thu a’ leantainn",
@@ -590,6 +589,7 @@
   "regeneration_indicator.label": "’Ga luchdadh…",
   "regeneration_indicator.sublabel": "Tha do dhachaigh ’ga ullachadh!",
   "relationship_severance_notification.purged_data": "chaidh a phurgaideachadh leis na rianairean",
+  "relationship_severance_notification.relationships": "{count, plural, one {# dàimh} two {# dhàimh} few {# dàimhean} other {# dàimh}}",
   "relationship_severance_notification.types.account_suspension": "Chaidh cunntas a chur à rèim",
   "relationship_severance_notification.types.domain_block": "Chaidh àrainn a chur à rèim",
   "relationship_severance_notification.types.user_domain_block": "Bhac thu an àrainn seo",
diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json
index 57882196f3a68b..57d13205fbfc02 100644
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@@ -471,6 +471,7 @@
   "notification.own_poll": "A túa enquisa rematou",
   "notification.poll": "Rematou a enquisa na que votaches",
   "notification.reblog": "{name} compartiu a túa publicación",
+  "notification.severed_relationships": "Cortouse a relación con {name}",
   "notification.status": "{name} publicou",
   "notification.update": "{name} editou unha publicación",
   "notification_requests.accept": "Aceptar",
@@ -587,6 +588,12 @@
   "refresh": "Actualizar",
   "regeneration_indicator.label": "Estase a cargar…",
   "regeneration_indicator.sublabel": "Estase a preparar a túa cronoloxía de inicio!",
+  "relationship_severance_notification.purged_data": "purgada pola administración",
+  "relationship_severance_notification.relationships": "{count, plural, one {# relación} other {# relacións}}",
+  "relationship_severance_notification.types.account_suspension": "A conta foi suspendida",
+  "relationship_severance_notification.types.domain_block": "O dominio foi suspendido",
+  "relationship_severance_notification.types.user_domain_block": "Bloqueaches este dominio",
+  "relationship_severance_notification.view": "Ver",
   "relative_time.days": "{number}d",
   "relative_time.full.days": "hai {number, plural, one {# día} other {# días}}",
   "relative_time.full.hours": "hai {number, plural, one {# hora} other {# horas}}",
diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json
index 48f028f3b50e4d..1f65c3549dba65 100644
--- a/app/javascript/mastodon/locales/he.json
+++ b/app/javascript/mastodon/locales/he.json
@@ -248,7 +248,7 @@
   "emoji_button.symbols": "סמלים",
   "emoji_button.travel": "טיולים ואתרים",
   "empty_column.account_hides_collections": "המשתמש.ת בחר.ה להסתיר מידע זה",
-  "empty_column.account_suspended": "חשבון מושהה",
+  "empty_column.account_suspended": "חשבון מושעה",
   "empty_column.account_timeline": "אין עדיין אף הודעה!",
   "empty_column.account_unavailable": "פרופיל לא זמין",
   "empty_column.blocks": "עדיין לא חסמתם משתמשים אחרים.",
@@ -471,6 +471,7 @@
   "notification.own_poll": "הסקר שלך הסתיים",
   "notification.poll": "סקר שהצבעת בו הסתיים",
   "notification.reblog": "הודעתך הודהדה על ידי {name}",
+  "notification.severed_relationships": "חתכתם כל קשר עם {name}",
   "notification.status": "{name} הרגע פרסמו",
   "notification.update": "{name} ערכו הודעה",
   "notification_requests.accept": "לקבל",
@@ -587,6 +588,12 @@
   "refresh": "רענון",
   "regeneration_indicator.label": "טוען…",
   "regeneration_indicator.sublabel": "פיד הבית שלך בהכנה!",
+  "relationship_severance_notification.purged_data": "המידע נמחק על ידי ההנהלה",
+  "relationship_severance_notification.relationships": "{count, plural, one {קשר אחד}  other {# קשרים}}",
+  "relationship_severance_notification.types.account_suspension": "החשבון הושעה",
+  "relationship_severance_notification.types.domain_block": "השרת הושעה",
+  "relationship_severance_notification.types.user_domain_block": "חסמת שרת זה",
+  "relationship_severance_notification.view": "הצג",
   "relative_time.days": "{number} ימים",
   "relative_time.full.days": "לפני {number, plural, one {# יום} other {# ימים}}",
   "relative_time.full.hours": "לפני {number, plural, one {# שעה} other {# שעות}}",
diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json
index 760063ab758a48..d9dfd01a26ab7c 100644
--- a/app/javascript/mastodon/locales/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@@ -471,7 +471,6 @@
   "notification.own_poll": "A szavazásod véget ért",
   "notification.poll": "Egy szavazás, melyben részt vettél, véget ért",
   "notification.reblog": "{name} megtolta a bejegyzésedet",
-  "notification.severedRelationships": "A kapcsolatok megszakítva ezzel: {name}",
   "notification.severed_relationships": "A kapcsolatok megszakítva ezzel: {name}",
   "notification.status": "{name} bejegyzést tett közzé",
   "notification.update": "{name} szerkesztett egy bejegyzést",
diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json
index 3b4ea15f9e1b61..7d5df9198d96c6 100644
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@@ -89,6 +89,14 @@
   "announcement.announcement": "Annuncio",
   "attachments_list.unprocessed": "(non elaborato)",
   "audio.hide": "Nascondi audio",
+  "block_modal.remote_users_caveat": "Chiederemo al server {domain} di rispettare la tua decisione. Tuttavia, la conformità non è garantita poiché alcuni server potrebbero gestire i blocchi in modo diverso. I post pubblici potrebbero essere ancora visibili agli utenti che non hanno effettuato l'accesso.",
+  "block_modal.show_less": "Mostra meno",
+  "block_modal.show_more": "Mostra di più",
+  "block_modal.they_cant_mention": "Non possono menzionarti o seguirti.",
+  "block_modal.they_cant_see_posts": "Non possono vedere i tuoi post e tu non vedrai i loro.",
+  "block_modal.they_will_know": "Possono vedere che sono bloccati.",
+  "block_modal.title": "Bloccare l'utente?",
+  "block_modal.you_wont_see_mentions": "Non vedrai i post che li menzionano.",
   "boost_modal.combo": "Puoi premere {combo} per saltare questo passaggio, la prossima volta",
   "bundle_column_error.copy_stacktrace": "Copia rapporto sull'errore",
   "bundle_column_error.error.body": "Impossibile rendedrizzare la pagina richiesta. Potrebbe dipendere da un bug nel nostro codice o da un problema di compatibilità di un browser.",
@@ -169,6 +177,7 @@
   "confirmations.delete_list.message": "Sei sicuro di voler eliminare permanentemente questa lista?",
   "confirmations.discard_edit_media.confirm": "Scarta",
   "confirmations.discard_edit_media.message": "Hai delle modifiche non salvate alla descrizione o anteprima del media, scartarle comunque?",
+  "confirmations.domain_block.confirm": "Blocca il server",
   "confirmations.domain_block.message": "Sei davvero sicuro di voler bloccare l'intero {domain}? In gran parte dei casi, è sufficiente e preferibile bloccare o silenziare alcuni profili. Non visualizzerai i contenuti da quel dominio in alcuna cronologia pubblica o tra le tue notifiche. I tuoi seguaci da quel dominio saranno rimossi.",
   "confirmations.edit.confirm": "Modifica",
   "confirmations.edit.message": "Modificare ora sovrascriverà il messaggio che stai correntemente componendo. Sei sicuro di voler procedere?",
@@ -200,6 +209,27 @@
   "dismissable_banner.explore_statuses": "Questi sono post da tutto il social web che stanno guadagnando popolarità oggi. I post più recenti con più condivisioni e preferiti sono classificati più in alto.",
   "dismissable_banner.explore_tags": "Questi hashtag stanno ottenendo popolarità tra le persone su questo e altri server della rete decentralizzata, al momento.",
   "dismissable_banner.public_timeline": "Questi sono i post pubblici più recenti di persone sul social che le persone su {domain} seguono.",
+  "domain_block_modal.block": "Blocca il server",
+  "domain_block_modal.block_account_instead": "Blocca invece @{name}",
+  "domain_block_modal.they_can_interact_with_old_posts": "Le persone da questo server possono interagire con i tuoi vecchi post.",
+  "domain_block_modal.they_cant_follow": "Nessuno da questo server può seguirti.",
+  "domain_block_modal.they_wont_know": "Non sapranno di essere stati bloccati.",
+  "domain_block_modal.title": "Bloccare il dominio?",
+  "domain_block_modal.you_will_lose_followers": "Tutti i tuoi seguaci da questo server verranno rimossi.",
+  "domain_block_modal.you_wont_see_posts": "Non vedrai post o notifiche dagli utenti su questo server.",
+  "domain_pill.activitypub_lets_connect": "Ti consente di connetterti e interagire con le persone non solo su Mastodon, ma anche su diverse app social.",
+  "domain_pill.activitypub_like_language": "ActivityPub è come la lingua che Mastodon parla con altri social network.",
+  "domain_pill.server": "Server",
+  "domain_pill.their_handle": "Il loro nome univoco:",
+  "domain_pill.their_server": "La loro casa digitale, dove risiedono tutti i loro post.",
+  "domain_pill.their_username": "Il loro identificatore univoco sul loro server. È possibile trovare utenti con lo stesso nome utente su server diversi.",
+  "domain_pill.username": "Nome utente",
+  "domain_pill.whats_in_a_handle": "Cosa c'è in un nome univoco?",
+  "domain_pill.who_they_are": "Poiché i nomi univoci indicano chi sia qualcuno e dove si trovi, puoi interagire con le persone attraverso la rete sociale delle <button>piattaforme basate su ActivityPub</button>.",
+  "domain_pill.who_you_are": "Poiché il tuo nome univoco indica chi tu sia e dove ti trovi, le persone possono interagire con te sulla rete sociale delle <button>piattaforme basate su ActivityPub</button>.",
+  "domain_pill.your_handle": "Il tuo nome univoco:",
+  "domain_pill.your_server": "La tua casa digitale, dove vivono tutti i tuoi post. Non ti piace questa? Cambia server in qualsiasi momento e porta con te anche i tuoi seguaci.",
+  "domain_pill.your_username": "Il tuo identificatore univoco su questo server. È possibile trovare utenti con lo stesso nome utente su server diversi.",
   "embed.instructions": "Incorpora questo post sul tuo sito web, copiando il seguente codice.",
   "embed.preview": "Ecco come apparirà:",
   "emoji_button.activity": "Attività",
@@ -397,6 +427,15 @@
   "loading_indicator.label": "Caricamento…",
   "media_gallery.toggle_visible": "{number, plural, one {Nascondi immagine} other {Nascondi immagini}}",
   "moved_to_account_banner.text": "Il tuo profilo {disabledAccount} è correntemente disabilitato perché ti sei spostato a {movedToAccount}.",
+  "mute_modal.hide_from_notifications": "Nascondi dalle notifiche",
+  "mute_modal.hide_options": "Nascondi le opzioni",
+  "mute_modal.indefinite": "Finché io non le riattivo",
+  "mute_modal.show_options": "Mostre le opzioni",
+  "mute_modal.they_can_mention_and_follow": "Possono menzionarti e seguirti, ma non li vedrai.",
+  "mute_modal.they_wont_know": "Non sapranno di essere stati silenziati.",
+  "mute_modal.title": "Silenziare l'utente?",
+  "mute_modal.you_wont_see_mentions": "Non vedrai i post che li menzionano.",
+  "mute_modal.you_wont_see_posts": "Possono ancora vedere i tuoi post, ma tu non vedrai i loro.",
   "navigation_bar.about": "Info",
   "navigation_bar.advanced_interface": "Apri nell'interfaccia web avanzata",
   "navigation_bar.blocks": "Utenti bloccati",
@@ -432,6 +471,7 @@
   "notification.own_poll": "Il tuo sondaggio è terminato",
   "notification.poll": "Un sondaggio in cui hai votato è terminato",
   "notification.reblog": "{name} ha rebloggato il tuo post",
+  "notification.severed_relationships": "Relazioni interrotte con {name}",
   "notification.status": "{name} ha appena pubblicato un post",
   "notification.update": "{name} ha modificato un post",
   "notification_requests.accept": "Accetta",
@@ -548,6 +588,12 @@
   "refresh": "Ricarica",
   "regeneration_indicator.label": "Caricamento…",
   "regeneration_indicator.sublabel": "Il feed della tua home è in preparazione!",
+  "relationship_severance_notification.purged_data": "rimossi dagli amministratori",
+  "relationship_severance_notification.relationships": "{count, plural,one {# relazione} other {# relazioni}}",
+  "relationship_severance_notification.types.account_suspension": "L'account è stato sospeso",
+  "relationship_severance_notification.types.domain_block": "Il dominio è stato sospeso",
+  "relationship_severance_notification.types.user_domain_block": "Hai bloccato questo dominio",
+  "relationship_severance_notification.view": "Visualizza",
   "relative_time.days": "{number}g",
   "relative_time.full.days": "{number, plural, one {# giorno} other {# giorni}} fa",
   "relative_time.full.hours": "{number, plural, one {# ora} other {# ore}} fa",
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index 5ccd652a14f6b0..da354f39101596 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -471,7 +471,6 @@
   "notification.own_poll": "설문을 마침",
   "notification.poll": "참여한 설문이 종료됨",
   "notification.reblog": "{name} 님이 부스트했습니다",
-  "notification.severedRelationships": "{name} 님과의 관계가 단절되었습니다",
   "notification.severed_relationships": "{name} 님과의 관계가 단절되었습니다",
   "notification.status": "{name} 님이 방금 게시물을 올렸습니다",
   "notification.update": "{name} 님이 게시물을 수정했습니다",
diff --git a/app/javascript/mastodon/locales/lad.json b/app/javascript/mastodon/locales/lad.json
index 547351af8cbf67..1eb8aa4abc6f4c 100644
--- a/app/javascript/mastodon/locales/lad.json
+++ b/app/javascript/mastodon/locales/lad.json
@@ -213,6 +213,7 @@
   "domain_block_modal.they_wont_know": "No savra ke tiene sido blokado.",
   "domain_block_modal.title": "Bloka el domeno?",
   "domain_block_modal.you_will_lose_followers": "Se efasaran todos tus suivantes de este sirvidor.",
+  "domain_block_modal.you_wont_see_posts": "No veras publikasyones ni avizos de utilizadores en este sirvidor.",
   "domain_pill.server": "Sirvidor",
   "domain_pill.their_handle": "Su alias:",
   "domain_pill.username": "Nombre de utilizador",
diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json
index f60c426bc2629e..4be0808f2352c0 100644
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@@ -471,7 +471,6 @@
   "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.severedRelationships": "Volgrelaties met {name} verbroken",
   "notification.severed_relationships": "Volgrelaties met {name} verbroken",
   "notification.status": "{name} heeft zojuist een bericht geplaatst",
   "notification.update": "{name} heeft een bericht bewerkt",
diff --git a/app/javascript/mastodon/locales/nn.json b/app/javascript/mastodon/locales/nn.json
index a70d607d4d41f2..7742d83e176630 100644
--- a/app/javascript/mastodon/locales/nn.json
+++ b/app/javascript/mastodon/locales/nn.json
@@ -49,7 +49,7 @@
   "account.media": "Media",
   "account.mention": "Nemn @{name}",
   "account.moved_to": "{name} seier at deira nye konto no er:",
-  "account.mute": "Målbind @{name}",
+  "account.mute": "Demp @{name}",
   "account.mute_notifications_short": "Demp varslingar",
   "account.mute_short": "Demp",
   "account.muted": "Målbunden",
@@ -69,9 +69,9 @@
   "account.unblock_short": "Stopp blokkering",
   "account.unendorse": "Ikkje vis på profil",
   "account.unfollow": "Slutt å fylgja",
-  "account.unmute": "Opphev målbinding av @{name}",
+  "account.unmute": "Opphev demping av @{name}",
   "account.unmute_notifications_short": "Opphev demping av varslingar",
-  "account.unmute_short": "Opphev målbinding",
+  "account.unmute_short": "Opphev demping",
   "account_note.placeholder": "Klikk for å leggja til merknad",
   "admin.dashboard.daily_retention": "Mengda brukarar aktive ved dagar etter registrering",
   "admin.dashboard.monthly_retention": "Mengda brukarar aktive ved månader etter registrering",
@@ -178,12 +178,12 @@
   "confirmations.discard_edit_media.confirm": "Forkast",
   "confirmations.discard_edit_media.message": "Du har ulagra endringar i mediaskildringa eller førehandsvisinga. Vil du forkasta dei likevel?",
   "confirmations.domain_block.confirm": "Blokker tenaren",
-  "confirmations.domain_block.message": "Er du heilt, heilt sikker på at du vil skjula heile {domain}? I dei fleste tilfelle er det godt nok og føretrekt med nokre få målretta blokkeringar eller målbindingar. Du kjem ikkje til å sjå innhald frå domenet i fødererte tidsliner eller i varsla dine. Fylgjarane dine frå domenet vert fjerna.",
+  "confirmations.domain_block.message": "Er du heilt, heilt sikker på at du vil skjula heile {domain}? I dei fleste tilfelle er det godt nok og føretrekt med nokre få målretta blokkeringar eller dempingar. Du kjem ikkje til å sjå innhald frå domenet i fødererte tidsliner eller i varsla dine. Fylgjarane dine frå domenet vert fjerna.",
   "confirmations.edit.confirm": "Rediger",
   "confirmations.edit.message": "Å redigera no vil overskriva den meldinga du er i ferd med å skriva. Er du sikker på at du vil halda fram?",
   "confirmations.logout.confirm": "Logg ut",
   "confirmations.logout.message": "Er du sikker på at du vil logga ut?",
-  "confirmations.mute.confirm": "Målbind",
+  "confirmations.mute.confirm": "Demp",
   "confirmations.redraft.confirm": "Slett & skriv på nytt",
   "confirmations.redraft.message": "Er du sikker på at du vil sletta denne statusen og skriva han på nytt? Då misser du favorittar og framhevingar, og svar til det opprinnelege innlegget vert foreldrelause.",
   "confirmations.reply.confirm": "Svar",
@@ -471,7 +471,6 @@
   "notification.own_poll": "Rundspørjinga di er ferdig",
   "notification.poll": "Ei rundspørjing du har røysta i er ferdig",
   "notification.reblog": "{name} framheva innlegget ditt",
-  "notification.severedRelationships": "Forholda med {name} er brotne",
   "notification.severed_relationships": "Forholda med {name} er brotne",
   "notification.status": "{name} la nettopp ut",
   "notification.update": "{name} redigerte eit innlegg",
@@ -623,7 +622,7 @@
   "report.comment.title": "Er det noko anna du meiner me bør vite?",
   "report.forward": "Vidaresend til {target}",
   "report.forward_hint": "Kontoen er frå ein annan tenar. Vil du senda ein anonymisert kopi av rapporten dit òg?",
-  "report.mute": "Målbind",
+  "report.mute": "Demp",
   "report.mute_explanation": "Du vil ikkje lenger sjå innlegga deira. Dei kan framleis fylgje deg og sjå innlegga dine, men vil ikkje vite at du har valt å ikkje sjå innlegga deira.",
   "report.next": "Neste",
   "report.placeholder": "Tilleggskommentarar",
@@ -694,7 +693,7 @@
   "status.block": "Blokker @{name}",
   "status.bookmark": "Set bokmerke",
   "status.cancel_reblog_private": "Opphev framheving",
-  "status.cannot_reblog": "Denne posten kan ikkje framhevast",
+  "status.cannot_reblog": "Du kan ikkje framheva dette innlegget",
   "status.copy": "Kopier lenke til status",
   "status.delete": "Slett",
   "status.detailed_status": "Detaljert samtalevisning",
@@ -717,8 +716,8 @@
   "status.media_hidden": "Mediet er gøymt",
   "status.mention": "Nemn @{name}",
   "status.more": "Meir",
-  "status.mute": "Målbind @{name}",
-  "status.mute_conversation": "Målbind samtale",
+  "status.mute": "Demp @{name}",
+  "status.mute_conversation": "Demp samtale",
   "status.open": "Utvid denne statusen",
   "status.pin": "Fest på profil",
   "status.pinned": "Festa tut",
@@ -742,11 +741,11 @@
   "status.show_more": "Vis meir",
   "status.show_more_all": "Vis meir for alle",
   "status.show_original": "Vis original",
-  "status.title.with_attachments": "{user} postet {attachmentCount, plural, one {et vedlegg} other {{attachmentCount} vedlegg}}",
+  "status.title.with_attachments": "{user} la ut {attachmentCount, plural, one {eitt vedlegg} other {{attachmentCount} vedlegg}}",
   "status.translate": "Omset",
   "status.translated_from_with": "Omsett frå {lang} ved bruk av {provider}",
   "status.uncached_media_warning": "Førehandsvisning er ikkje tilgjengeleg",
-  "status.unmute_conversation": "Opphev målbinding av samtalen",
+  "status.unmute_conversation": "Opphev demping av samtalen",
   "status.unpin": "Løys frå profil",
   "subscribed_languages.lead": "Kun innlegg på valde språk vil bli dukke opp i heimestraumen din og i listene dine etter denne endringa. For å motta innlegg på alle språk, la vere å velje nokon.",
   "subscribed_languages.save": "Lagre endringar",
diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json
index 3387718aae5878..dd21d3030a0b94 100644
--- a/app/javascript/mastodon/locales/sk.json
+++ b/app/javascript/mastodon/locales/sk.json
@@ -205,8 +205,10 @@
   "dismissable_banner.explore_tags": "Toto sú hashtagy zo sociálnej siete, ktoré sú dnes populárne. Novšie hashtagy používané viacerými ľuďmi sú radené vyššie.",
   "dismissable_banner.public_timeline": "Toto sú najnovšie verejné príspevky od účtov na sociálnej sieti, ktoré sú sledované účtami z {domain}.",
   "domain_block_modal.block": "Blokovať server",
+  "domain_block_modal.block_account_instead": "Namiesto toho zablokuj @{name}",
   "domain_block_modal.title": "Blokovať doménu?",
   "domain_pill.server": "Server",
+  "domain_pill.their_server": "Ich digitálny domov, kde žijú všetky ich príspevky.",
   "domain_pill.username": "Používateľské meno",
   "embed.instructions": "Tento príspevok môžete pridať na svoju webovú stránku použitím tohto kódu.",
   "embed.preview": "Takto bude vyzerať:",
diff --git a/app/javascript/mastodon/locales/sl.json b/app/javascript/mastodon/locales/sl.json
index b1923c7dd60379..d31b4108047cd1 100644
--- a/app/javascript/mastodon/locales/sl.json
+++ b/app/javascript/mastodon/locales/sl.json
@@ -471,7 +471,6 @@
   "notification.own_poll": "Vaša anketa je zaključena",
   "notification.poll": "Anketa, v kateri ste sodelovali, je zaključena",
   "notification.reblog": "{name} je izpostavila/a vašo objavo",
-  "notification.severedRelationships": "Veze z {name} prekinjene",
   "notification.severed_relationships": "Veze z {name} prekinjene",
   "notification.status": "{name} je pravkar objavil/a",
   "notification.update": "{name} je uredil(a) objavo",
diff --git a/app/javascript/mastodon/locales/sq.json b/app/javascript/mastodon/locales/sq.json
index 7f842c6bd86898..a5122d098b0393 100644
--- a/app/javascript/mastodon/locales/sq.json
+++ b/app/javascript/mastodon/locales/sq.json
@@ -470,6 +470,7 @@
   "notification.own_poll": "Pyetësori juaj ka përfunduar",
   "notification.poll": "Ka përfunduar një pyetësor ku keni votuar",
   "notification.reblog": "{name} përforcoi mesazhin tuaj",
+  "notification.severed_relationships": "Marrëdhëniet me {name} u ndërprenë",
   "notification.status": "{name} sapo postoi",
   "notification.update": "{name} përpunoi një postim",
   "notification_requests.accept": "Pranoje",
diff --git a/app/javascript/mastodon/locales/sv.json b/app/javascript/mastodon/locales/sv.json
index 1bfd3e480fb19d..016007f4997417 100644
--- a/app/javascript/mastodon/locales/sv.json
+++ b/app/javascript/mastodon/locales/sv.json
@@ -89,6 +89,7 @@
   "announcement.announcement": "Meddelande",
   "attachments_list.unprocessed": "(obehandlad)",
   "audio.hide": "Dölj audio",
+  "block_modal.remote_users_caveat": "Vi kommer att be servern {domain} att respektera ditt beslut. Dock garanteras inte efterlevnad eftersom vissa servrar kan hantera blockeringar på olika sätt. Offentliga inlägg kan fortfarande vara synliga för icke-inloggade användare.",
   "block_modal.show_less": "Visa mindre",
   "block_modal.show_more": "Visa mer",
   "block_modal.they_cant_mention": "De kan inte nämna eller följa dig.",
@@ -212,8 +213,12 @@
   "domain_block_modal.block_account_instead": "Blockera @{name} istället",
   "domain_block_modal.they_can_interact_with_old_posts": "Personer från denna server kan interagera med dina gamla inlägg.",
   "domain_block_modal.they_cant_follow": "Ingen från denna server kan följa dig.",
+  "domain_block_modal.they_wont_know": "De kommer inte veta att de har blockerats.",
   "domain_block_modal.title": "Blockera domän?",
   "domain_block_modal.you_will_lose_followers": "Alla dina följare från denna server kommer att tas bort.",
+  "domain_block_modal.you_wont_see_posts": "Du kommer inte att se inlägg eller meddelanden från användare på den här servern.",
+  "domain_pill.activitypub_lets_connect": "Det låter dig ansluta och interagera med människor inte bara på Mastodon, men även på andra sociala appar.",
+  "domain_pill.activitypub_like_language": "ActivityPub är som språket Mastodon talar med andra sociala nätverk.",
   "domain_pill.server": "Server",
   "domain_pill.their_username": "Deras unika identifierare på deras server. Det är möjligt att hitta användare med samma användarnamn på olika servrar.",
   "domain_pill.username": "Användarnamn",
@@ -415,6 +420,8 @@
   "mute_modal.hide_options": "Dölj alternativ",
   "mute_modal.show_options": "Visa alternativ",
   "mute_modal.they_can_mention_and_follow": "De kan nämna och följa dig, men du ser dem inte.",
+  "mute_modal.they_wont_know": "De vet inte att de har blivit tysta.",
+  "mute_modal.title": "Tysta användare?",
   "mute_modal.you_wont_see_mentions": "Du kommer inte att se inlägg som nämner dem.",
   "mute_modal.you_wont_see_posts": "De kan fortfarande se dina inlägg, men du kan inte se deras.",
   "navigation_bar.about": "Om",
@@ -454,6 +461,10 @@
   "notification.reblog": "{name} boostade ditt inlägg",
   "notification.status": "{name} publicerade just ett inlägg",
   "notification.update": "{name} redigerade ett inlägg",
+  "notification_requests.accept": "Godkänn",
+  "notification_requests.dismiss": "Avfärda",
+  "notification_requests.notifications_from": "Aviseringar från {name}",
+  "notification_requests.title": "Filtrerade meddelanden",
   "notifications.clear": "Rensa aviseringar",
   "notifications.clear_confirmation": "Är du säker på att du vill rensa alla dina aviseringar permanent?",
   "notifications.column_settings.admin.report": "Nya rapporter:",
@@ -485,9 +496,12 @@
   "notifications.permission_denied": "Skrivbordsaviseringar är otillgängliga på grund av tidigare nekade förfrågningar om behörighet i webbläsaren",
   "notifications.permission_denied_alert": "Skrivbordsaviseringar kan inte aktiveras, eftersom att webbläsarens behörighet har nekats innan",
   "notifications.permission_required": "Skrivbordsaviseringar är otillgängliga eftersom att rättigheten som krävs inte har godkänts.",
+  "notifications.policy.filter_new_accounts.hint": "Skapad inom de senaste {days, plural, one {dagen} other {# dagarna}}",
   "notifications.policy.filter_new_accounts_title": "Nya konton",
   "notifications.policy.filter_not_followers_title": "Personer som inte följer dig",
   "notifications.policy.filter_not_following_title": "Personer du inte följer",
+  "notifications.policy.filter_private_mentions_title": "Oombedda privata omnämnanden",
+  "notifications.policy.title": "Filtrera ut aviseringar från…",
   "notifications_permission_banner.enable": "Aktivera skrivbordsaviseringar",
   "notifications_permission_banner.how_to_control": "För att ta emot aviseringar när Mastodon inte är öppet, aktivera skrivbordsaviseringar. När de är aktiverade kan du styra exakt vilka typer av interaktioner som aviseras via {icon} -knappen ovan.",
   "notifications_permission_banner.title": "Missa aldrig något",
@@ -558,6 +572,11 @@
   "refresh": "Läs om",
   "regeneration_indicator.label": "Laddar…",
   "regeneration_indicator.sublabel": "Ditt hemmaflöde förbereds!",
+  "relationship_severance_notification.purged_data": "rensad av administratörer",
+  "relationship_severance_notification.types.account_suspension": "Ditt konto har blivit avstängt",
+  "relationship_severance_notification.types.domain_block": "Domänen har stängts av",
+  "relationship_severance_notification.types.user_domain_block": "Du blockerade denna domän",
+  "relationship_severance_notification.view": "Visa",
   "relative_time.days": "{number}d",
   "relative_time.full.days": "{number, plural, one {# dag} other {# dagar}} sedan",
   "relative_time.full.hours": "{number, plural, one {# timme} other {# timmar}} sedan",
diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json
index bf88e53c948110..799400ea35db0c 100644
--- a/app/javascript/mastodon/locales/tr.json
+++ b/app/javascript/mastodon/locales/tr.json
@@ -471,6 +471,7 @@
   "notification.own_poll": "Anketiniz sona erdi",
   "notification.poll": "Oy verdiğiniz bir anket sona erdi",
   "notification.reblog": "{name} gönderini yeniden paylaştı",
+  "notification.severed_relationships": "{name} ile ilişkiler koptu",
   "notification.status": "{name} az önce gönderdi",
   "notification.update": "{name} bir gönderiyi düzenledi",
   "notification_requests.accept": "Onayla",
@@ -587,6 +588,12 @@
   "refresh": "Yenile",
   "regeneration_indicator.label": "Yükleniyor…",
   "regeneration_indicator.sublabel": "Ana akışın hazırlanıyor!",
+  "relationship_severance_notification.purged_data": "yöneticiler tarafından temizlendi",
+  "relationship_severance_notification.relationships": "{count, plural, one {# ilişki} other {# ilişki}}",
+  "relationship_severance_notification.types.account_suspension": "Hesap askıya alındı",
+  "relationship_severance_notification.types.domain_block": "Alan adı askıya alındı",
+  "relationship_severance_notification.types.user_domain_block": "Bu alan adını engellediniz",
+  "relationship_severance_notification.view": "Görüntüle",
   "relative_time.days": "{number}d",
   "relative_time.full.days": "{number, plural, one {# gün} other {# gün}} önce",
   "relative_time.full.hours": "{number, plural, one {# saat} other {# saat}} önce",
diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json
index abc9c37758f304..3456327a676ba6 100644
--- a/app/javascript/mastodon/locales/uk.json
+++ b/app/javascript/mastodon/locales/uk.json
@@ -460,7 +460,6 @@
   "notification.own_poll": "Ваше опитування завершилося",
   "notification.poll": "Опитування, у якому ви голосували, скінчилося",
   "notification.reblog": "{name} поширює ваш допис",
-  "notification.severedRelationships": "Зв'язки з {name} розірвані",
   "notification.severed_relationships": "Зв'язки з {name} розірвані",
   "notification.status": "{name} щойно дописує",
   "notification.update": "{name} змінює допис",
diff --git a/app/javascript/mastodon/locales/vi.json b/app/javascript/mastodon/locales/vi.json
index b51b832b2b65ba..9b09d21450cd11 100644
--- a/app/javascript/mastodon/locales/vi.json
+++ b/app/javascript/mastodon/locales/vi.json
@@ -471,6 +471,7 @@
   "notification.own_poll": "Cuộc bình chọn của bạn đã kết thúc",
   "notification.poll": "Cuộc bình chọn đã kết thúc",
   "notification.reblog": "{name} đăng lại tút của bạn",
+  "notification.severed_relationships": "Mối quan hệ với {name} bị cắt đứt",
   "notification.status": "{name} đăng tút mới",
   "notification.update": "{name} đã sửa tút",
   "notification_requests.accept": "Chấp nhận",
@@ -587,6 +588,12 @@
   "refresh": "Làm mới",
   "regeneration_indicator.label": "Đang tải…",
   "regeneration_indicator.sublabel": "Trang chủ của bạn đang được cập nhật!",
+  "relationship_severance_notification.purged_data": "bị quản trị viên xóa",
+  "relationship_severance_notification.relationships": "{count, plural, other {# mối quan hệ}}",
+  "relationship_severance_notification.types.account_suspension": "Người này đã bị vô hiệu hóa",
+  "relationship_severance_notification.types.domain_block": "Máy chủ này đã bị vô hiệu hóa",
+  "relationship_severance_notification.types.user_domain_block": "Bạn đã chặn máy chủ này",
+  "relationship_severance_notification.view": "Chi tiết",
   "relative_time.days": "{number} ngày",
   "relative_time.full.days": "{number, plural, other {# ngày}}",
   "relative_time.full.hours": "{number, plural, other {# giờ}}",
diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json
index 6ad7599060b678..cc68ab762f749e 100644
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@@ -471,7 +471,6 @@
   "notification.own_poll": "你的投票已经结束",
   "notification.poll": "你参与的一个投票已经结束",
   "notification.reblog": "{name} 转发了你的嘟文",
-  "notification.severedRelationships": "与 {name} 的关系已被切断",
   "notification.severed_relationships": "与 {name} 的关系已被切断",
   "notification.status": "{name} 刚刚发布嘟文",
   "notification.update": "{name} 编辑了嘟文",
diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json
index e352985811d4f3..228430dd8045b7 100644
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@@ -471,7 +471,6 @@
   "notification.own_poll": "您的投票已結束",
   "notification.poll": "您曾投過的投票已經結束",
   "notification.reblog": "{name} 已轉嘟您的嘟文",
-  "notification.severedRelationships": "已斷絕與 {name} 之服務關係",
   "notification.severed_relationships": "已斷絕與 {name} 之服務關係",
   "notification.status": "{name} 剛剛嘟文",
   "notification.update": "{name} 已編輯嘟文",
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 3601d5bd8b6773..f94abe265e851c 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -1672,7 +1672,7 @@ ca:
       user_domain_block: Heu blocat %{target_name}
     lost_followers: Seguidors perduts
     lost_follows: Seguiments perduts
-    preamble: Quan bloqueu un domini o els vostres moderadors decideixen suspendre un servidor remot, es poden perdre seguidors i seguiments. Si això passa, podeu baixar-vos la llista de relacions trencades per a revisar-la i, si voleu, importar-les a un altre servidor.
+    preamble: Quan bloqueu un domini o els vostres moderadors decideixen suspendre un servidor remot, podeu perdre seguidors i seguiments. Si passa, podeu baixar la llista de relacions trencades per a revisar-la i, de cas, importar-la a un altre servidor.
     purged: Els administradors del vostre servidor han purgat la informació relativa a aquest servidor.
     type: Esdeveniment
   statuses:
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 62e62c2c0b2396..620b571f9f50ac 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -1659,10 +1659,22 @@ de:
     preferences: Einstellungen
     profile: Öffentliches Profil
     relationships: Follower und Folge ich
+    severed_relationships: Getrennte Beziehungen
     statuses_cleanup: Automatische Löschung
     strikes: Maßnahmen
     two_factor_authentication: Zwei-Faktor-Authentisierung (2FA)
     webauthn_authentication: Sicherheitsschlüssel
+  severed_relationships:
+    download: Herunterladen (%{count})
+    event_type:
+      account_suspension: Kontosperre (%{target_name})
+      domain_block: Serversperre (%{target_name})
+      user_domain_block: Du hast %{target_name} blockiert
+    lost_followers: Verlorene Follower
+    lost_follows: Konten entfolgt
+    preamble: Möglicherweise verlierst du Follower und entfolgst Konten, wenn du eine Domain blockierst oder Moderator*innen externe Server sperren. Sollte das der Fall sein, wirst du eine Liste mit den getrennten Beziehungen herunterladen können. Dadurch kannst du die Änderungen einsehen oder die Liste auf einen anderen Server importieren.
+    purged: Informationen über diesen Server wurden von deinen Server-Administrator*innen entfernt.
+    type: Ereignis
   statuses:
     attached:
       audio:
diff --git a/config/locales/doorkeeper.nn.yml b/config/locales/doorkeeper.nn.yml
index 66dd0f9093cd49..0e5d1ca455ae4d 100644
--- a/config/locales/doorkeeper.nn.yml
+++ b/config/locales/doorkeeper.nn.yml
@@ -92,9 +92,9 @@ nn:
         invalid_resource_owner: Ressurseigardetaljane er ikkje gyldige, eller så er det ikkje mogleg å finna eigaren
         invalid_scope: Det etterspurte omfanget er ugyldig, ukjent eller har feil struktur.
         invalid_token:
-          expired: Tilgangsbeviset har gått ut på dato
-          revoked: Tilgangsbeviset har blitt oppheva
-          unknown: Tilgangsbeviset er ugyldig
+          expired: Innloggingsnykelen har gått ut på dato
+          revoked: Innloggingsnykelen er oppheva
+          unknown: Innloggngsnykelen er ugyldig
         resource_owner_authenticator_not_configured: Ressurseigar kunne ikkje finnast fordi Doorkeeper.configure.resource_owner_authenticator ikkje er konfigurert.
         server_error: Autoriseringstenaren støtte på ei uventa hending som hindra han i å svara på førespurnaden.
         temporarily_unavailable: Autoriseringstenaren kan ikkje hansama førespurnaden grunna kortvarig overbelastning eller tenarvedlikehald.
@@ -129,11 +129,11 @@ nn:
         crypto: Ende-til-ende-kryptering
         favourites: Favorittar
         filters: Filter
-        follow: Dei du fylgjer, målbind og blokkerer
+        follow: Dei du fylgjer, dempar og blokkerer
         follows: Fylgjer
         lists: Lister
         media: Mediavedlegg
-        mutes: Målbindingar
+        mutes: Dempingar
         notifications: Varsel
         push: Pushvarsel
         reports: Rapportar
@@ -183,13 +183,13 @@ nn:
       write:accounts: redigera profilen din
       write:blocks: blokker kontoar og domene
       write:bookmarks: bokmerk innlegg
-      write:conversations: målbind og slett samtalar
+      write:conversations: demp og slett samtalar
       write:favourites: favorittmarker innlegg
       write:filters: lag filter
       write:follows: fylg folk
       write:lists: lag lister
       write:media: last opp mediefiler
-      write:mutes: målbind folk og samtalar
+      write:mutes: demp folk og samtalar
       write:notifications: tøm varsla dine
       write:reports: rapporter andre folk
       write:statuses: publiser innlegg
diff --git a/config/locales/es-AR.yml b/config/locales/es-AR.yml
index 2e21c73279eadc..fd53f9d4fd86b8 100644
--- a/config/locales/es-AR.yml
+++ b/config/locales/es-AR.yml
@@ -1659,10 +1659,22 @@ es-AR:
     preferences: Configuración
     profile: Perfil público
     relationships: Seguimientos
+    severed_relationships: Relaciones cortadas
     statuses_cleanup: Eliminación auto. de mensajes
     strikes: Moderación de incumplimientos
     two_factor_authentication: Aut. de dos factores
     webauthn_authentication: Llaves de seguridad
+  severed_relationships:
+    download: Descargar (%{count})
+    event_type:
+      account_suspension: Suspensión de cuenta (%{target_name})
+      domain_block: Suspensión de cuenta (%{target_name})
+      user_domain_block: Bloqueaste a %{target_name}
+    lost_followers: Seguidores perdidos
+    lost_follows: Cuentas seguidas perdidas
+    preamble: Podés perder seguidores y cuentas seguidas cuando bloqueás un dominio o cuando tus moderadores deciden suspender un servidor remoto. Cuando esto suceda, vas a poder descargar listas de relaciones cortadas, que serán inspectadas y posiblemente importadas en otro servidor.
+    purged: La información sobre este servidor fue purgada por los administradores de tu servidor.
+    type: Evento
   statuses:
     attached:
       audio:
diff --git a/config/locales/fr-CA.yml b/config/locales/fr-CA.yml
index fa69e36cc0817a..6e422455c35963 100644
--- a/config/locales/fr-CA.yml
+++ b/config/locales/fr-CA.yml
@@ -597,6 +597,9 @@ fr-CA:
       actions_description_html: Décidez des mesures à prendre pour résoudre ce signalement. Si vous prenez des mesures punitives contre le compte signalé, une notification sera envoyée par e-mail, sauf si la catégorie <strong>Spam</strong> est sélectionnée.
       actions_description_remote_html: Décidez des mesures à prendre pour résoudre ce signalement. Cela n'affectera que la manière dont <strong>votre</strong> serveur communique avec ce compte distant et traite son contenu.
       add_to_report: Ajouter davantage au rapport
+      already_suspended_badges:
+        local: Déjà suspendu sur ce serveur
+        remote: Déjà suspendu sur le serveur distant
       are_you_sure: Voulez-vous vraiment faire ça ?
       assign_to_self: Me l’assigner
       assigned: Modérateur assigné
@@ -1652,13 +1655,26 @@ fr-CA:
     import: Import de données
     import_and_export: Import et export
     migrate: Migration de compte
+    notifications: Notifications par mail
     preferences: Préférences
     profile: Profil
     relationships: Abonnements et abonné·e·s
+    severed_relationships: Relations rompues
     statuses_cleanup: Suppression automatique de messages
     strikes: Sanctions de modération
     two_factor_authentication: Identification à deux facteurs
     webauthn_authentication: Clés de sécurité
+  severed_relationships:
+    download: Téléchargement (%{count})
+    event_type:
+      account_suspension: Suspension du compte (%{target_name})
+      domain_block: Suspension du serveur (%{target_name})
+      user_domain_block: Vous avez bloqué %{target_name}
+    lost_followers: Abonné·e·s perdu·e·s
+    lost_follows: Abonnements perdus
+    preamble: Vous pouvez perdre des abonnés et des abonnements lorsque vous bloquez un domaine ou lorsque vos modérateurs décident de suspendre un serveur distant. Lorsque cela arrive, vous êtes en mesure de télécharger une liste de vos relations rompues, afin de l'inspecter et d'éventuellement l'importer sur un autre serveur.
+    purged: Les informations sur ce serveur ont été purgées par les administrateurs du serveur.
+    type: Evènement
   statuses:
     attached:
       audio:
@@ -1864,6 +1880,9 @@ fr-CA:
       follows_subtitle: Suivez des comptes populaires
       follows_title: Qui suivre
       follows_view_more: Voir plus de personnes à suivre
+      hashtags_recent_count:
+        one: "%{people} personne dans les deux derniers jours"
+        other: "%{people} personnes dans les deux derniers jours"
       hashtags_subtitle: Explorez les tendances depuis les 2 derniers jours
       hashtags_title: Hashtags populaires
       hashtags_view_more: Voir plus de hashtags populaires
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 2045760655c4c3..31f5bfa5159f72 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -597,6 +597,9 @@ fr:
       actions_description_html: Décidez des mesures à prendre pour résoudre ce signalement. Si vous prenez des mesures punitives contre le compte signalé, une notification sera envoyée par e-mail, sauf si la catégorie <strong>Spam</strong> est sélectionnée.
       actions_description_remote_html: Décidez des mesures à prendre pour résoudre ce signalement. Cela n'affectera que la manière dont <strong>votre</strong> serveur communique avec ce compte distant et traite son contenu.
       add_to_report: Ajouter davantage au rapport
+      already_suspended_badges:
+        local: Déjà suspendu sur ce serveur
+        remote: Déjà suspendu sur le serveur distant
       are_you_sure: Voulez-vous vraiment faire ça ?
       assign_to_self: Me l’assigner
       assigned: Modérateur assigné
@@ -1652,13 +1655,26 @@ fr:
     import: Import de données
     import_and_export: Import et export
     migrate: Migration de compte
+    notifications: Notifications par mail
     preferences: Préférences
     profile: Profil
     relationships: Abonnements et abonné·e·s
+    severed_relationships: Relations rompues
     statuses_cleanup: Suppression automatique de messages
     strikes: Sanctions de modération
     two_factor_authentication: Authentification à deux facteurs
     webauthn_authentication: Clés de sécurité
+  severed_relationships:
+    download: Téléchargement (%{count})
+    event_type:
+      account_suspension: Suspension du compte (%{target_name})
+      domain_block: Suspension du serveur (%{target_name})
+      user_domain_block: Vous avez bloqué %{target_name}
+    lost_followers: Abonné·e·s perdu·e·s
+    lost_follows: Abonnements perdus
+    preamble: Vous pouvez perdre des abonnés et des abonnements lorsque vous bloquez un domaine ou lorsque vos modérateurs décident de suspendre un serveur distant. Lorsque cela arrive, vous êtes en mesure de télécharger une liste de vos relations rompues, afin de l'inspecter et d'éventuellement l'importer sur un autre serveur.
+    purged: Les informations sur ce serveur ont été purgées par les administrateurs du serveur.
+    type: Evènement
   statuses:
     attached:
       audio:
@@ -1864,6 +1880,9 @@ fr:
       follows_subtitle: Suivez des comptes populaires
       follows_title: Qui suivre
       follows_view_more: Voir plus de personnes à suivre
+      hashtags_recent_count:
+        one: "%{people} personne dans les deux derniers jours"
+        other: "%{people} personnes dans les deux derniers jours"
       hashtags_subtitle: Explorez les tendances depuis les 2 derniers jours
       hashtags_title: Hashtags populaires
       hashtags_view_more: Voir plus de hashtags populaires
diff --git a/config/locales/gd.yml b/config/locales/gd.yml
index d61c79aa56eecb..11402d3f56e484 100644
--- a/config/locales/gd.yml
+++ b/config/locales/gd.yml
@@ -1724,6 +1724,7 @@ gd:
       user_domain_block: Bhac thu %{target_name}
     lost_followers: An luchd-leantainn a chaill thu
     lost_follows: Daoine nach lean thu tuilleadh
+    preamble: Dh’fhaoidte gun chaill thu dàimhean leantainn nuair a bhacas tu àrainn no nuair a chuireas na maoir romhpa gun cuir iad frithealaiche cèin à rèim. Nuair a thachras sin, ’s urrainn dhut liosta de na dàimhean dealaichte a luchdadh a-nuas airson sùil a thoirt orra agus an ion-phortadh gu frithealaiche eile ’s dòcha.
     purged: Chaidh am fiosrachadh mun fhrithealaiche seo a phurgaideachadh le rianairean an fhrithealaiche agad.
     type: Tachartas
   statuses:
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 7fbba21b279334..4b1c9f096b107d 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -1659,10 +1659,22 @@ gl:
     preferences: Preferencias
     profile: Perfil
     relationships: Seguindo e seguidoras
+    severed_relationships: Relacións cortadas
     statuses_cleanup: Borrado automático da publicación
     strikes: Avisos da moderación
     two_factor_authentication: Validar Dobre Factor
     webauthn_authentication: Chaves de seguridade
+  severed_relationships:
+    download: Descargar (%{count})
+    event_type:
+      account_suspension: Suspensión da conta (%{target_name})
+      domain_block: Suspensión do servidor (%{target_name})
+      user_domain_block: Bloqueaches a %{target_name}
+    lost_followers: Seguidoras perdidas
+    lost_follows: Seguimentos perdidos
+    preamble: Pode acontecer que perdas seguidoras e seguimentos ao bloquear un dominio ou cando a Moderación do teu servidor decide suspender un servidor remoto. Se acontecese isto, podes descargar unha lista coas relacións cortadas para revisala e, se queres, importala noutro servidor.
+    purged: A administración do teu servidor purgou a información acerca deste servidor.
+    type: Evento
   statuses:
     attached:
       audio:
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 2dfb98a2d842c1..da93925548898e 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -1707,13 +1707,26 @@ he:
     import: יבוא
     import_and_export: יבוא ויצוא
     migrate: הגירת חשבון
+    notifications: התראות בדואל
     preferences: העדפות
     profile: פרופיל
     relationships: נעקבים ועוקבים
+    severed_relationships: קשרים שנותקו
     statuses_cleanup: מחיקת הודעות אוטומטית
     strikes: עבירות מנהלתיות
     two_factor_authentication: אימות דו-שלבי
     webauthn_authentication: מפתחות אבטחה
+  severed_relationships:
+    download: הורדה (%{count})
+    event_type:
+      account_suspension: השעיית חשבון (%{target_name})
+      domain_block: השעיית שרת (%{target_name})
+      user_domain_block: חסמת את %{target_name}
+    lost_followers: אובדן עוקבים
+    lost_follows: אובדן נעקבים
+    preamble: הנכם עשויים לאבד עוקבים ונעקבים כשתחסמו שרת או כשמנהליכם יחליטו להשעות שרת אחר. במקרה כזה, תוכלו להוריד רשימה של קשרי המעקב שנותקו, כדי לעבור עליהם ואם תרצו לייבא אותם לשרת אחר.
+    purged: מידע על שרת מרוחק זה נמחק על ידי מנהלי השרת שלך.
+    type: אירוע
   statuses:
     attached:
       audio:
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 16a42b07607f19..c63d8ef285acbf 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -1661,10 +1661,22 @@ it:
     preferences: Preferenze
     profile: Profilo
     relationships: Follows e followers
+    severed_relationships: Relazioni interrotte
     statuses_cleanup: Cancellazione automatica dei post
     strikes: Sanzioni di moderazione
     two_factor_authentication: Autenticazione a due fattori
     webauthn_authentication: Chiavi di sicurezza
+  severed_relationships:
+    download: Scarica (%{count})
+    event_type:
+      account_suspension: Sospensione dell'account (%{target_name})
+      domain_block: Sospensione del server (%{target_name})
+      user_domain_block: Hai bloccato %{target_name}
+    lost_followers: Seguaci persi
+    lost_follows: Account seguiti persi
+    preamble: Potresti perdere account seguiti e seguaci quando blocchi un dominio o quando i tuoi moderatori decidono di sospendere un server remoto. Quando ciò accadrà, potrai scaricare liste di relazioni interrotte, da consultare ed eventualmente importare su un altro server.
+    purged: Le informazioni su questo server sono state eliminate dagli amministratori del tuo server.
+    type: Evento
   statuses:
     attached:
       audio:
@@ -1870,6 +1882,9 @@ it:
       follows_subtitle: Segui account ben noti
       follows_title: Chi seguire
       follows_view_more: Visualizza più persone da seguire
+      hashtags_recent_count:
+        one: "%{people} persona negli ultimi 2 giorni"
+        other: "%{people} persone negli ultimi 2 giorni"
       hashtags_subtitle: Esplora le tendenze degli ultimi 2 giorni
       hashtags_title: Hashtag di tendenza
       hashtags_view_more: Visualizza altri hashtag di tendenza
diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index 1470dc9fc0633e..7145f30377309c 100644
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -58,7 +58,7 @@ nn:
       demote: Degrader
       destroyed_msg: "%{username} sine data er no i slettekøa"
       disable: Slå av
-      disable_sign_in_token_auth: Slå av e-post token autentisering
+      disable_sign_in_token_auth: Slå av innlogging med epost-nykel
       disable_two_factor_authentication: Slå av 2FA
       disabled: Slege av
       display_name: Synleg namn
@@ -67,7 +67,7 @@ nn:
       email: E-post
       email_status: E-poststatus
       enable: Slå på
-      enable_sign_in_token_auth: Slå på e-post token autentisering
+      enable_sign_in_token_auth: Slå på innlogging med epost-nykel
       enabled: Aktivert
       enabled_msg: Gjenaktiverte %{username} sin konto
       followers: Fylgjarar
@@ -158,9 +158,9 @@ nn:
       unblocked_email_msg: Avblokkerte %{username} si e-postadresse
       unconfirmed_email: E-post utan stadfesting
       undo_sensitized: Angr tving ømtolig
-      undo_silenced: Angr målbinding
+      undo_silenced: Angre avgrensinga
       undo_suspension: Angr utvising
-      unsilenced_msg: Opphevde vellykket begrensningen av %{username} sin konto
+      unsilenced_msg: Oppheva avgrensinga av %{username} sin konto
       unsubscribe: Avmeld
       unsuspended_msg: Oppheving av utvisinga av %{username} sin konto var vellykka
       username: Brukarnamn
@@ -200,10 +200,10 @@ nn:
         destroy_user_role: Øydelegg rolle
         disable_2fa_user: Skruv av 2FA
         disable_custom_emoji: Skruv av tilpassa emoji
-        disable_sign_in_token_auth_user: Slå av e-post tokenautentisering for brukar
+        disable_sign_in_token_auth_user: Slå av innlogging med epost-nykel for brukaren
         disable_user: Skruv av brukar
         enable_custom_emoji: Skruv på tilpassa emoji
-        enable_sign_in_token_auth_user: Slå på e-post tokenautentisering for brukar
+        enable_sign_in_token_auth_user: Slå på innlogging med epost-nykel for brukaren
         enable_user: Skruv på brukar
         memorialize_account: Opprett minnekonto
         promote_user: Forfrem brukar
@@ -259,10 +259,10 @@ nn:
         destroy_user_role_html: "%{name} sletta rolla %{target}"
         disable_2fa_user_html: "%{name} tok vekk krav om tofaktorautentisering for brukaren %{target}"
         disable_custom_emoji_html: "%{name} deaktiverte emojien %{target}"
-        disable_sign_in_token_auth_user_html: "%{name} deaktivert e-post token for godkjenning for %{target}"
+        disable_sign_in_token_auth_user_html: "%{name} skrudde av innlogging med epost-nykel for %{target}"
         disable_user_html: "%{name} slo av innlogging for brukaren %{target}"
         enable_custom_emoji_html: "%{name} aktiverte emojien %{target}"
-        enable_sign_in_token_auth_user_html: "%{name} aktiverte e-post token autentisering for %{target}"
+        enable_sign_in_token_auth_user_html: "%{name} skrudde på innlogging med epost-nykel for %{target}"
         enable_user_html: "%{name} aktiverte innlogging for brukaren %{target}"
         memorialize_account_html: "%{name} endret %{target}s konto til en minneside"
         promote_user_html: "%{name} fremja brukaren %{target}"
@@ -274,7 +274,7 @@ nn:
         reset_password_user_html: "%{name} tilbakestilte passordet for brukaren %{target}"
         resolve_report_html: "%{name} løyste ein rapport %{target}"
         sensitive_account_html: "%{name} markerte %{target} sitt media som ømtolig"
-        silence_account_html: "%{name} begrensa %{target} sin konto"
+        silence_account_html: "%{name} avgrensa %{target} sin konto"
         suspend_account_html: "%{name} utviste %{target} sin konto"
         unassigned_report_html: "%{name} løyste ein rapport %{target}"
         unblock_email_account_html: "%{name} avblokkerte %{target} si e-postadresse"
@@ -396,8 +396,8 @@ nn:
       destroyed_msg: Domeneblokkering har nå blitt angret
       domain: Domene
       edit: Rediger domeneblokkering
-      existing_domain_block: Du har allerede pålagt strengere begrensninger på %{name}.
-      existing_domain_block_html: Du har allerede pålagt strengere begrensninger på %{name}, du kan være nødt til <a href="%{unblock_url}">oppheve blokkeringen av den</a> først.
+      existing_domain_block: Du har allereie gjort strengare avgrensingar av %{name}.
+      existing_domain_block_html: Du har allereie avgrensa kontoen til %{name} kraftig, det kan henda du må <a href="%{unblock_url}">oppheva blokkeringa</a> fyrst.
       export: Eksporter
       import: Importer
       new:
@@ -406,17 +406,17 @@ nn:
         severity:
           desc_html: "<strong>Avgrens</strong> gjer innlegg frå kontoar på dette domenet usynlege for alle som ikkje fylgjer dei. <strong>Utvis</strong> fjernar alt innhald, media og profildata frå kontoar på dette domenet frå tenaren din. Bruk <strong>Ingen</strong> viss du berre vil avvisa mediafiler."
           noop: Ingen
-          silence: Målbind
+          silence: Avgrens
           suspend: Utvis
         title: Ny domeneblokkering
       no_domain_block_selected: Ingen domeneblokkeringar vart endra sidan ingen var valde
       not_permitted: Du har ikkje løyve til å utføra denne handlinga
       obfuscate: Obfuskere domenenavn
-      obfuscate_hint: Skjul deler av domenenavnet i listen hvis annonsering av listen over domenebegrensninger er slått på
+      obfuscate_hint: Gøym delar av domenenamnet i lista viss kunngjering av lista over domeneavgrensingar er påskrudd
       private_comment: Privat kommentar
-      private_comment_hint: Kommenter angående denne domenebegrensningen for internt bruk av moderatorene.
+      private_comment_hint: Kommentar om denne domeneavgrensinga til intern bruk for administratorane.
       public_comment: Offentleg kommentar
-      public_comment_hint: Kommenter angående denne domenebegrensningen for offentligheten, hvis publisering av domenebegrensningslisten er slått på.
+      public_comment_hint: Kommentar om denne domeneavgrensinga for publikum, viss kunngjering av lista over avgrensa domene er påskrudd.
       reject_media: Avvis mediefiler
       reject_media_hint: Fjernar mediefiler som er lagra lokalt og nektar å lasta ned andre i framtida. Har ikkje noko å seia for utvisingar
       reject_reports: Avvis rapportar
@@ -480,7 +480,7 @@ nn:
         title: Tilgjenge
         warning: Det siste forsøket på å koble til denne serveren lyktes ikke
       back_to_all: Alle
-      back_to_limited: Begrenset
+      back_to_limited: Avgrensa
       back_to_warning: Advarsel
       by_domain: Domene
       confirm_purge: Er du sikker på at du vil slette data permanent fra dette domenet?
@@ -491,7 +491,7 @@ nn:
         policies:
           reject_media: Avvis media
           reject_reports: Avvis rapporter
-          silence: Begrens
+          silence: Avgrens
           suspend: Utvis
         policy: Vilkår
         reason: Offentlig årsak
@@ -651,7 +651,7 @@ nn:
         actions:
           delete_html: Fjerna dei påtala innlegga
           mark_as_sensitive_html: Markera dei påtala mediefilene som sensitive
-          silence_html: Sterkt avgrensa korleis <strong>@%{acct}</strong> kan samhandla ved å gjera brukarprofilen og innhaldet synleg berre for folk som allereie fylgjer brukarkontoen eller søkjer han opp manuelt
+          silence_html: Avgrens kraftig korleis <strong>@%{acct}</strong> kan samhandla med andre ved å gjera brukarprofilen og innhaldet synleg berre for folk som allereie fylgjer brukarkontoen eller søkjer opp profilen manuelt
           suspend_html: Stengja brukarkontoen til <strong>@%{acct}</strong>, slik at brukarprofilen og innhaldet blir utilgjengeleg og umogleg å samhandla med
         close_report: Marker rapport nr. %{id} som løyst
         close_reports_html: Marker <strong>alle</strong> rapportane om <strong>@%{acct}</strong> som løyste
@@ -832,7 +832,7 @@ nn:
         mark_statuses_as_sensitive: "%{name} markerte %{target} sine innlegg som ømtålige"
         none: "%{name} sendte en advarsel til %{target}"
         sensitive: "%{name} markerte %{target} sin konto som ømtolig"
-        silence: "%{name} begrenset %{target}s konto"
+        silence: "%{name} avgrensa kontoen til %{target}"
         suspend: "%{name} utviste %{target} sin konto"
       appeal_approved: Anka
       appeal_pending: Klage behandles
@@ -981,7 +981,7 @@ nn:
         mark_statuses_as_sensitive: å merke innleggene sine som følsomme
         none: en advarsel
         sensitive: å merke kontoen sin som følsom
-        silence: for å begrense deres konto
+        silence: for å avgrensa kontoen deira
         suspend: for å stenga kontoen deira
       body: "%{target} ankar på ei modereringsavgjerd av %{action_taken_by} den %{date}, som var %{type}. Dei skreiv:"
       next_steps: Du kan godkjenna anken for å endra modereringsavgjerda, eller du kan oversjå anken.
@@ -1067,7 +1067,7 @@ nn:
     didnt_get_confirmation: Fekk du ikkje stadfestingslenka?
     dont_have_your_security_key: Har du ikke sikkerhetsnøkkelen din?
     forgot_password: Har du gløymt passordet ditt?
-    invalid_reset_password_token: Tilgangsnykelen er ugyldig eller utgått. Ver venleg å beda om ein ny ein.
+    invalid_reset_password_token: Tilgangsnykelen er ugyldig eller utgått. Ver venleg å be om ein ny ein.
     link_to_otp: Skriv inn en 2-trinnskode fra din 2-trinnspåloggingsenhet eller en gjenopprettingskode
     link_to_webauth: Bruk sikkerhetsnøkkel-enheten din
     log_in_with: Logg inn med
@@ -1191,7 +1191,7 @@ nn:
         mark_statuses_as_sensitive: Markering av innlegg som ømtolige
         none: Advarsel
         sensitive: Markering av konto som ømtolig
-        silence: Begrensning av konto
+        silence: Avgrensing av konto
         suspend: Utestenging av konto
       your_appeal_approved: Din klage har blitt godkjent
       your_appeal_pending: Du har levert en klage
@@ -1510,9 +1510,9 @@ nn:
           trillion: Bil
   otp_authentication:
     code_hint: Skriv inn koden generert av autentiseringsappen din for å bekrefte
-    description_html: Hvis du skrur på <strong>2-trinnsautentisering</strong> ved hjelp av en autentiseringsapp, vil pålogging kreve at du er i besittelse av autentiseringsenheten din, som genererer sjetonger som du skal skrive inn.
+    description_html: Viss du skrur på <strong>tofaktorinnlogging</strong> med ein innloggingsapp, må du ha telefonen din klar når du loggar inn. Telefonen lagar innloggingsnyklar du må skriva inn.
     enable: Aktiver
-    instructions_html: "<strong>Skann denne QR-koden i Authy, Google Autentisering, eller en lignende TOTP-app på en av dine enheter</strong>. Fra nå av, vil den appen generere sjetonger som du vil måtte skrive inn når du logger på."
+    instructions_html: "<strong>Skann denne QR-koden i Google authenticator eller annan tofaktor-app på telefonen din</strong>. Frå no vil den appen laga tilgangsnyklar som du skriv inn når du vil logga inn."
     manual_instructions: 'Hvis du ikke kan skanne QR-koden og må skrive den inn manuelt, her er tekstkoden i ren tekst:'
     setup: Sett opp
     wrong_code: Den innskrevne koden var ugyldig! Er tjenertiden og enhetstiden riktige?
diff --git a/config/locales/simple_form.fr-CA.yml b/config/locales/simple_form.fr-CA.yml
index a4e57841e6b10c..823929c550e104 100644
--- a/config/locales/simple_form.fr-CA.yml
+++ b/config/locales/simple_form.fr-CA.yml
@@ -116,6 +116,7 @@ fr-CA:
           sign_up_requires_approval: Les nouvelles inscriptions nécessiteront votre approbation
         severity: Choisir ce qui se passera avec les requêtes de cette adresse IP
       rule:
+        hint: Optionnel. Fournissez plus de détails sur la règle
         text: Décrivez une règle ou une exigence pour les utilisateurs sur ce serveur. Essayez de la garder courte et simple
       sessions:
         otp: 'Entrez le code d’authentification à deux facteurs généré par l’application de votre téléphone ou utilisez un de vos codes de récupération :'
@@ -299,6 +300,7 @@ fr-CA:
           patch: Notifier pour des mises à jour de corrections de bug
         trending_tag: Nouvelle tendance nécessitant supervision
       rule:
+        hint: Information supplémentaire
         text: Règle
       settings:
         indexable: Inclure la page de profil dans les moteurs de recherches
diff --git a/config/locales/simple_form.fr.yml b/config/locales/simple_form.fr.yml
index bd1dc6885f0076..4c8de1b20d4dc1 100644
--- a/config/locales/simple_form.fr.yml
+++ b/config/locales/simple_form.fr.yml
@@ -116,6 +116,7 @@ fr:
           sign_up_requires_approval: Les nouvelles inscriptions nécessiteront votre approbation
         severity: Choisir ce qui se passera avec les requêtes de cette adresse IP
       rule:
+        hint: Optionnel. Fournissez plus de détails sur la règle
         text: Décrivez une règle ou une exigence pour les utilisateurs sur ce serveur. Essayez de la garder courte et simple
       sessions:
         otp: 'Entrez le code d’authentification à deux facteurs généré par l’application de votre téléphone ou utilisez un de vos codes de récupération :'
@@ -299,6 +300,7 @@ fr:
           patch: Notifier pour des mises à jour de corrections de bug
         trending_tag: Nouvelle tendance nécessitant supervision
       rule:
+        hint: Information supplémentaire
         text: Règle
       settings:
         indexable: Inclure la page de profil dans les moteurs de recherches
diff --git a/config/locales/simple_form.ko.yml b/config/locales/simple_form.ko.yml
index d948a88ed16282..627d96df022f16 100644
--- a/config/locales/simple_form.ko.yml
+++ b/config/locales/simple_form.ko.yml
@@ -303,7 +303,7 @@ ko:
         hint: 추가 정보
         text: 규칙
       settings:
-        indexable: 검색 엔진에 프로필 페이지 기재하기
+        indexable: 검색엔진에 프로필 페이지 포함하기
         show_application: 어떤 앱으로 게시물을 보냈는지 표시
       tag:
         listable: 이 해시태그가 검색과 추천에 보여지도록 허용
diff --git a/config/locales/simple_form.nn.yml b/config/locales/simple_form.nn.yml
index 1edf185c0a0521..a9f5f609fafb14 100644
--- a/config/locales/simple_form.nn.yml
+++ b/config/locales/simple_form.nn.yml
@@ -224,7 +224,7 @@ nn:
         setting_use_blurhash: Vis fargerike overgangar for gøymde medium
         setting_use_pending_items: Saktemodus
         severity: Alvorsgrad
-        sign_in_token_attempt: Trygdenykel
+        sign_in_token_attempt: Innloggingsnykel
         title: Tittel
         type: Importtype
         username: Brukarnamn
@@ -280,7 +280,7 @@ nn:
         severities:
           no_access: Blokker tilgang
           sign_up_block: Blokker registrering
-          sign_up_requires_approval: Begrens påmeldinger
+          sign_up_requires_approval: Avgrens påmeldingar
         severity: Oppføring
       notification_emails:
         appeal: Nokon klagar på ei moderatoravgjerd
diff --git a/config/locales/simple_form.sv.yml b/config/locales/simple_form.sv.yml
index c3b8625c8eed2c..37372cac2791ff 100644
--- a/config/locales/simple_form.sv.yml
+++ b/config/locales/simple_form.sv.yml
@@ -116,6 +116,7 @@ sv:
           sign_up_requires_approval: Nya registreringar kräver ditt godkännande
         severity: Välj vad som ska hända med förfrågningar från denna IP
       rule:
+        hint: Valfritt. Ange mer information om regeln
         text: Beskriv en regel eller ett krav för användare av denna server. Försök hålla det kort och koncist
       sessions:
         otp: 'Ange tvåfaktorskoden som genererades av din telefonapp, eller använd någon av dina återställningskoder:'
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 6355d019243423..adb3a041caa6ad 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -1259,17 +1259,17 @@ sl:
   exports:
     archive_takeout:
       date: Datum
-      download: Prenesi svoj arhiv
-      hint_html: Zahtevate lahko arhiv vaših <strong>objav in naloženih medijev</strong>. Izvoženi podatki bodo v zapisu ActivityPub, ki ga bo mogoče brati s poljubno skladno programsko opremo. Arhiv lahko zahtevate vsakih 7 dni.
-      in_progress: Prevajanje arhiva...
+      download: Prenesite svoj arhiv
+      hint_html: Zahtevate lahko arhiv svojih <strong>objav in naloženih medijev</strong>. Izvoženi podatki bodo v zapisu ActivityPub, ki ga bo mogoče brati s poljubno skladno programsko opremo. Arhiv lahko zahtevate vsakih 7 dni.
+      in_progress: Pripravljanje vašega arhiva …
       request: Zahtevajte svoj arhiv
       size: Velikost
-    blocks: Blokirate
+    blocks: Blokirani
     bookmarks: Zaznamki
     csv: CSV
-    domain_blocks: Bloki domene
+    domain_blocks: Blokirane domene
     lists: Seznami
-    mutes: Utišate
+    mutes: Utišani
     storage: Shranjeni mediji
   featured_tags:
     add_new: Dodaj novo
@@ -1613,17 +1613,17 @@ sl:
     confirm_follow_selected_followers: Ali ste prepričani, da želite slediti izbranim sledilcem?
     confirm_remove_selected_followers: Ali ste prepričani, da želite odstraniti izbrane sledilce?
     confirm_remove_selected_follows: Ali ste prepričani, da želite odstraniti izbrana sledenja?
-    dormant: Skrit
+    dormant: Nedejavno
     follow_failure: Nekaterim od izbranih računov ni bilo mogoče slediti.
     follow_selected_followers: Sledi izbranim sledilcem
     followers: Sledilci
-    following: Sledi
+    following: Sledeni
     invited: Vabljeni
     last_active: Zadnja dejavnost
-    most_recent: Najnovejša
+    most_recent: Najnovejše
     moved: Prestavljeno
-    mutual: Vzajemna
-    primary: Primarna
+    mutual: Vzajemno
+    primary: Primarno
     relationship: Razmerje
     remove_selected_domains: Odstrani vse sledilce iz izbranih domen
     remove_selected_followers: Odstrani izbrane sledilce
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index 25286c00f55a51..3742b61427b928 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -1655,15 +1655,18 @@ sq:
     preferences: Parapëlqime
     profile: Profil
     relationships: Ndjekje dhe ndjekës
+    severed_relationships: Marrëdhënie të ndërprera
     statuses_cleanup: Fshirje e automatizuar postimesh
     strikes: Paralajmërime nga moderimi
     two_factor_authentication: Mirëfilltësim Dyfaktorësh
     webauthn_authentication: Kyçe sigurie
   severed_relationships:
+    download: Shkarkim (%{count})
     event_type:
       account_suspension: Pezullim llogarie (%{target_name})
       domain_block: Pezullim shërbyesi (%{target_name})
       user_domain_block: Bllokuat %{target_name}
+    preamble: Mund të humbni ndjekje dhe ndjekës, kur bllokoni një përkatësi, ose kur moderatorët tuaj vendosin të pezullojnë një shërbyes të largët. Kur kjo ndodh, do të jeni në gjendje të shkarkoni lista marrëdhëniesh të dëmtuara, për t’i shqyrtuar dhe mundet për t’i importuar në një shërbyes tjetër.
     purged: Hollësitë rreth këtij shërbyesi janë spastuar nga përgjegjësit e shërbyesit tuaj.
     type: Akt
   statuses:
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 855fa765f5225a..8ffb3c1e297334 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -1660,6 +1660,9 @@ sv:
     strikes: Modereringsprickar
     two_factor_authentication: Tvåfaktorsautentisering
     webauthn_authentication: Säkerhetsnycklar
+  severed_relationships:
+    lost_follows: Förlorade följare
+    type: Händelse
   statuses:
     attached:
       audio:
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index bdf002333d171f..692b3d281fd3e8 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -1659,10 +1659,22 @@ tr:
     preferences: Tercihler
     profile: Profil
     relationships: Takip edilenler ve takipçiler
+    severed_relationships: Kopmuş ilişkiler
     statuses_cleanup: Otomatik gönderi silme
     strikes: Moderasyon eylemleri
     two_factor_authentication: İki adımlı doğrulama
     webauthn_authentication: Güvenlik anahtarları
+  severed_relationships:
+    download: İndir (%{count})
+    event_type:
+      account_suspension: Hesap askıya alma (%{target_name})
+      domain_block: Sunucu askıya alma (%{target_name})
+      user_domain_block: 'Engellediniz: %{target_name}'
+    lost_followers: Kaybedilen takipçiler
+    lost_follows: Kaybedilen takipler
+    preamble: Bir alan adını engellediğinizde veya denetleyicileriniz uzak bir sunucuyu askıya almaya karar verdiğinde takipçilerinizi ve takiplerinizi kaybedebilirsiniz. Bu olduğunda, kopan ilişkilerin bir listesini, incelemek ve başka bir sunucuya aktarmak için indirebileceksiniz.
+    purged: Bu sunucu hakkındaki bilgiler, sunucunun yöneticileri tarafından temizlenmiş.
+    type: Olay
   statuses:
     attached:
       audio:
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index eaa913c8cdc1b8..f71ff741dc4b4e 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -1633,10 +1633,22 @@ vi:
     preferences: Chung
     profile: Hồ sơ
     relationships: Quan hệ
+    severed_relationships: Mối quan hệ bị cắt đứt
     statuses_cleanup: Tự động xóa tút cũ
     strikes: Lần cảnh cáo
     two_factor_authentication: Xác minh 2 bước
     webauthn_authentication: Khóa bảo mật
+  severed_relationships:
+    download: Tải xuống (%{count})
+    event_type:
+      account_suspension: Người bị vô hiệu hóa (%{target_name})
+      domain_block: Máy chủ bị vô hiệu hóa (%{target_name})
+      user_domain_block: Bạn đã chặn %{target_name}
+    lost_followers: Mất người theo dõi
+    lost_follows: Mất người đang theo dõi
+    preamble: Bạn có thể mất số lượt theo dõi và người theo dõi khi chặn một máy chủ hoặc khi kiểm duyệt viên của bạn quyết định tạm dừng máy chủ từ xa. Khi điều đó xảy ra, bạn sẽ có thể tải xuống danh sách các mối quan hệ đã bị cắt đứt, để kiểm tra và nhập vào máy chủ khác.
+    purged: Thông tin về máy chủ này đã bị quản trị viên máy chủ của bạn xóa sạch.
+    type: Sự kiện
   statuses:
     attached:
       audio:

From 34f293475eb6c303a110219d717f430e2edeb269 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 22 Mar 2024 11:08:27 -0400
Subject: [PATCH 0577/2191] Fix results/query in
 `api/v1/featured_tags/suggestions` (#29597)

---
 .../featured_tags/suggestions_controller.rb   |  6 +++-
 spec/fabricators/featured_tag_fabricator.rb   |  2 +-
 .../api/v1/featured_tags/suggestions_spec.rb  | 30 ++++++++++++++++---
 3 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/app/controllers/api/v1/featured_tags/suggestions_controller.rb b/app/controllers/api/v1/featured_tags/suggestions_controller.rb
index 76633210a1dd9c..4f732ed2d5a474 100644
--- a/app/controllers/api/v1/featured_tags/suggestions_controller.rb
+++ b/app/controllers/api/v1/featured_tags/suggestions_controller.rb
@@ -12,6 +12,10 @@ def index
   private
 
   def set_recently_used_tags
-    @recently_used_tags = Tag.recently_used(current_account).where.not(id: current_account.featured_tags).limit(10)
+    @recently_used_tags = Tag.recently_used(current_account).where.not(id: featured_tag_ids).limit(10)
+  end
+
+  def featured_tag_ids
+    current_account.featured_tags.pluck(:tag_id)
   end
 end
diff --git a/spec/fabricators/featured_tag_fabricator.rb b/spec/fabricators/featured_tag_fabricator.rb
index 0803dc43a72e34..6003099dbdb3dc 100644
--- a/spec/fabricators/featured_tag_fabricator.rb
+++ b/spec/fabricators/featured_tag_fabricator.rb
@@ -2,6 +2,6 @@
 
 Fabricator(:featured_tag) do
   account { Fabricate.build(:account) }
-  tag { Fabricate.build(:tag) }
+  tag { nil }
   name { sequence(:name) { |i| "Tag#{i}" } }
 end
diff --git a/spec/requests/api/v1/featured_tags/suggestions_spec.rb b/spec/requests/api/v1/featured_tags/suggestions_spec.rb
index f7b453b740afc4..00451540cac0ea 100644
--- a/spec/requests/api/v1/featured_tags/suggestions_spec.rb
+++ b/spec/requests/api/v1/featured_tags/suggestions_spec.rb
@@ -7,13 +7,35 @@
   let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
   let(:scopes)  { 'read:accounts' }
   let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
-  let(:account) { Fabricate(:account) }
+  let(:account) { Fabricate(:account, user: user) }
 
   describe 'GET /api/v1/featured_tags/suggestions' do
-    it 'returns http success' do
-      get '/api/v1/featured_tags/suggestions', params: { account_id: account.id, limit: 2 }, headers: headers
+    let!(:unused_featured_tag) { Fabricate(:tag, name: 'unused_featured_tag') }
+    let!(:used_tag) { Fabricate(:tag, name: 'used_tag') }
+    let!(:used_featured_tag) { Fabricate(:tag, name: 'used_featured_tag') }
 
-      expect(response).to have_http_status(200)
+    before do
+      _unused_tag = Fabricate(:tag, name: 'unused_tag')
+
+      # Make relevant tags used by account
+      status = Fabricate(:status, account: account)
+      status.tags << used_tag
+      status.tags << used_featured_tag
+
+      # Feature the relevant tags
+      Fabricate :featured_tag, account: account, name: unused_featured_tag.name
+      Fabricate :featured_tag, account: account, name: used_featured_tag.name
+    end
+
+    it 'returns http success and recently used but not featured tags' do
+      get '/api/v1/featured_tags/suggestions', params: { limit: 2 }, headers: headers
+
+      expect(response)
+        .to have_http_status(200)
+      expect(body_as_json)
+        .to contain_exactly(
+          include(name: used_tag.name)
+        )
     end
   end
 end

From dfa43707eb88276b8268e49c7853d226006bf140 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 22 Mar 2024 16:44:31 +0100
Subject: [PATCH 0578/2191] Change `AccountRelationshipSeveranceEvent` model to
 store lost followers and following counts separately (#29714)

---
 .../components/relationships_severance_event.jsx       |  2 +-
 app/models/account_relationship_severance_event.rb     | 10 ++++++++--
 .../account_relationship_severance_event_serializer.rb |  2 +-
 app/views/severed_relationships/index.html.haml        |  4 ++--
 ..._counts_to_account_relationship_severance_events.rb |  8 ++++++++
 ...count_from_account_relationship_severance_events.rb |  7 +++++++
 db/schema.rb                                           |  5 +++--
 7 files changed, 30 insertions(+), 8 deletions(-)
 create mode 100644 db/migrate/20240322125607_add_followers_and_following_counts_to_account_relationship_severance_events.rb
 create mode 100644 db/post_migrate/20240322130318_remove_relationships_count_from_account_relationship_severance_events.rb

diff --git a/app/javascript/mastodon/features/notifications/components/relationships_severance_event.jsx b/app/javascript/mastodon/features/notifications/components/relationships_severance_event.jsx
index 12bc5f130d0482..23d0d2eecf3b20 100644
--- a/app/javascript/mastodon/features/notifications/components/relationships_severance_event.jsx
+++ b/app/javascript/mastodon/features/notifications/components/relationships_severance_event.jsx
@@ -35,7 +35,7 @@ const RelationshipsSeveranceEvent = ({ event, hidden }) => {
             <FormattedMessage
               id='relationship_severance_notification.relationships'
               defaultMessage='{count, plural, one {# relationship} other {# relationships}}'
-              values={{ count: event.get('relationships_count', 0) }}
+              values={{ count: event.get('followers_count', 0) + event.get('following_count', 0) }}
             />
           )}
           <br />
diff --git a/app/models/account_relationship_severance_event.rb b/app/models/account_relationship_severance_event.rb
index 697b06b74b46a4..c1269fad6d9152 100644
--- a/app/models/account_relationship_severance_event.rb
+++ b/app/models/account_relationship_severance_event.rb
@@ -8,11 +8,16 @@
 #  id                              :bigint(8)        not null, primary key
 #  account_id                      :bigint(8)        not null
 #  relationship_severance_event_id :bigint(8)        not null
-#  relationships_count             :integer          default(0), not null
 #  created_at                      :datetime         not null
 #  updated_at                      :datetime         not null
+#  followers_count                 :integer          default(0), not null
+#  following_count                 :integer          default(0), not null
 #
 class AccountRelationshipSeveranceEvent < ApplicationRecord
+  self.ignored_columns += %w(
+    relationships_count
+  )
+
   belongs_to :account
   belongs_to :relationship_severance_event
 
@@ -30,6 +35,7 @@ class AccountRelationshipSeveranceEvent < ApplicationRecord
   private
 
   def set_relationships_count!
-    self.relationships_count = severed_relationships.about_local_account(account).count
+    self.followers_count = severed_relationships.about_local_account(account).passive.count
+    self.following_count = severed_relationships.about_local_account(account).active.count
   end
 end
diff --git a/app/serializers/rest/account_relationship_severance_event_serializer.rb b/app/serializers/rest/account_relationship_severance_event_serializer.rb
index 2578e3a20fc286..751bc103c2c348 100644
--- a/app/serializers/rest/account_relationship_severance_event_serializer.rb
+++ b/app/serializers/rest/account_relationship_severance_event_serializer.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class REST::AccountRelationshipSeveranceEventSerializer < ActiveModel::Serializer
-  attributes :id, :type, :purged, :target_name, :created_at
+  attributes :id, :type, :purged, :target_name, :followers_count, :following_count, :created_at
 
   def id
     object.id.to_s
diff --git a/app/views/severed_relationships/index.html.haml b/app/views/severed_relationships/index.html.haml
index 75296d90aafc59..7c599e9c0e7e55 100644
--- a/app/views/severed_relationships/index.html.haml
+++ b/app/views/severed_relationships/index.html.haml
@@ -21,13 +21,13 @@
               %td{ rowspan: 2 }= t('severed_relationships.purged')
             - else
               %td
-                - count = event.severed_relationships.active.about_local_account(current_account).count
+                - count = event.following_count
                 - if count.zero?
                   = t('generic.none')
                 - else
                   = table_link_to 'download', t('severed_relationships.download', count: count), following_severed_relationship_path(event, format: :csv)
               %td
-                - count = event.severed_relationships.passive.about_local_account(current_account).count
+                - count = event.followers_count
                 - if count.zero?
                   = t('generic.none')
                 - else
diff --git a/db/migrate/20240322125607_add_followers_and_following_counts_to_account_relationship_severance_events.rb b/db/migrate/20240322125607_add_followers_and_following_counts_to_account_relationship_severance_events.rb
new file mode 100644
index 00000000000000..ab5752b7a5afe2
--- /dev/null
+++ b/db/migrate/20240322125607_add_followers_and_following_counts_to_account_relationship_severance_events.rb
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class AddFollowersAndFollowingCountsToAccountRelationshipSeveranceEvents < ActiveRecord::Migration[7.1]
+  def change
+    add_column :account_relationship_severance_events, :followers_count, :integer, default: 0, null: false
+    add_column :account_relationship_severance_events, :following_count, :integer, default: 0, null: false
+  end
+end
diff --git a/db/post_migrate/20240322130318_remove_relationships_count_from_account_relationship_severance_events.rb b/db/post_migrate/20240322130318_remove_relationships_count_from_account_relationship_severance_events.rb
new file mode 100644
index 00000000000000..76f2d325fe530c
--- /dev/null
+++ b/db/post_migrate/20240322130318_remove_relationships_count_from_account_relationship_severance_events.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class RemoveRelationshipsCountFromAccountRelationshipSeveranceEvents < ActiveRecord::Migration[7.1]
+  def change
+    safety_assured { remove_column :account_relationship_severance_events, :relationships_count, :integer, default: 0, null: false }
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 34563191585bbd..dcf16a7ed93194 100644
--- 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_03_21_160706) do
+ActiveRecord::Schema[7.1].define(version: 2024_03_22_130318) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -93,9 +93,10 @@
   create_table "account_relationship_severance_events", force: :cascade do |t|
     t.bigint "account_id", null: false
     t.bigint "relationship_severance_event_id", null: false
-    t.integer "relationships_count", default: 0, null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.integer "followers_count", default: 0, null: false
+    t.integer "following_count", default: 0, null: false
     t.index ["account_id", "relationship_severance_event_id"], name: "idx_on_account_id_relationship_severance_event_id_7bd82bf20e", unique: true
     t.index ["account_id"], name: "index_account_relationship_severance_events_on_account_id"
     t.index ["relationship_severance_event_id"], name: "idx_on_relationship_severance_event_id_403f53e707"

From 387c78ddf9c7654090b7b529ccebfb96f5cab534 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 22 Mar 2024 16:45:04 +0100
Subject: [PATCH 0579/2191] Change icon of severed relationships notifications
 (#29712)

---
 .../features/notifications/components/notification.jsx        | 4 ++--
 app/javascript/material-icons/400-24px/heart_broken-fill.svg  | 1 +
 app/javascript/material-icons/400-24px/heart_broken.svg       | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 app/javascript/material-icons/400-24px/heart_broken-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/heart_broken.svg

diff --git a/app/javascript/mastodon/features/notifications/components/notification.jsx b/app/javascript/mastodon/features/notifications/components/notification.jsx
index 1e89f77d453c7c..5527f3d482620f 100644
--- a/app/javascript/mastodon/features/notifications/components/notification.jsx
+++ b/app/javascript/mastodon/features/notifications/components/notification.jsx
@@ -12,9 +12,9 @@ import { HotKeys } from 'react-hotkeys';
 
 import EditIcon from '@/material-icons/400-24px/edit.svg?react';
 import FlagIcon from '@/material-icons/400-24px/flag-fill.svg?react';
+import HeartBrokenIcon from '@/material-icons/400-24px/heart_broken-fill.svg?react';
 import HomeIcon from '@/material-icons/400-24px/home-fill.svg?react';
 import InsertChartIcon from '@/material-icons/400-24px/insert_chart.svg?react';
-import LinkOffIcon from '@/material-icons/400-24px/link_off.svg?react';
 import PersonIcon from '@/material-icons/400-24px/person-fill.svg?react';
 import PersonAddIcon from '@/material-icons/400-24px/person_add-fill.svg?react';
 import RepeatIcon from '@/material-icons/400-24px/repeat.svg?react';
@@ -371,7 +371,7 @@ class Notification extends ImmutablePureComponent {
       <HotKeys handlers={this.getHandlers()}>
         <div className={classNames('notification notification-severed-relationships focusable', { unread })} tabIndex={0} aria-label={notificationForScreenReader(intl, intl.formatMessage(messages.adminReport, { name: notification.getIn(['event', 'target_name']) }), notification.get('created_at'))}>
           <div className='notification__message'>
-            <Icon id='unlink' icon={LinkOffIcon} />
+            <Icon id='heart_broken' icon={HeartBrokenIcon} />
 
             <span title={notification.get('created_at')}>
               <FormattedMessage id='notification.severed_relationships' defaultMessage='Relationships with {name} severed' values={{ name: notification.getIn(['event', 'target_name']) }} />
diff --git a/app/javascript/material-icons/400-24px/heart_broken-fill.svg b/app/javascript/material-icons/400-24px/heart_broken-fill.svg
new file mode 100644
index 00000000000000..75ff3932cde969
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/heart_broken-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M481-83Q347-218 267.5-301t-121-138q-41.5-55-54-94T80-620q0-92 64-156t156-64q45 0 87 16.5t75 47.5l-62 216h120l-34 335 114-375H480l71-212q25-14 52.5-21t56.5-7q92 0 156 64t64 156q0 48-13 88t-55 95.5q-42 55.5-121 138T481-83Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/heart_broken.svg b/app/javascript/material-icons/400-24px/heart_broken.svg
new file mode 100644
index 00000000000000..2ce7de57f106e8
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/heart_broken.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M481-83Q347-218 267.5-301t-121-138q-41.5-55-54-94T80-620q0-92 64-156t156-64q45 0 87 16.5t75 47.5l-62 216h120l-34 335 114-375H480l71-212q25-14 52.5-21t56.5-7q92 0 156 64t64 156q0 48-13 88t-55 95.5q-42 55.5-121 138T481-83Zm-71-186 21-211H294l75-263q-16-8-33.5-12.5T300-760q-58 0-99 41t-41 99q0 31 11.5 62t40 70.5q28.5 39.5 77 92T410-269Zm188-48q111-113 156.5-180T800-620q0-58-41-99t-99-41q-11 0-22 1.5t-22 5.5l-24 73h116L598-317Zm110-363ZM294-480Z"/></svg>
\ No newline at end of file

From de6c9e0fcd9d9768b3696b27122334aaf955c231 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 22 Mar 2024 17:21:50 +0100
Subject: [PATCH 0580/2191] Change new modals to allow vertical scrolling
 (#29644)

---
 app/javascript/styles/mastodon/components.scss | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index c2a968aec3209e..4bb3216e459087 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -8823,8 +8823,9 @@ noscript {
 
 .safety-action-modal,
 .interaction-modal {
-  max-width: 90vw;
+  max-width: 100vw;
   width: 600px;
+  overflow-y: auto;
 }
 
 .interaction-modal {

From d71d26a3c90ba196dfc41043b73c53d4ca8f2398 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 22 Mar 2024 17:21:53 +0100
Subject: [PATCH 0581/2191] Reattribute notification-related records if
 possible when merging accounts (#29694)

---
 app/models/concerns/account/merging.rb | 10 ++++++++++
 lib/mastodon/cli/maintenance.rb        | 15 +++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/app/models/concerns/account/merging.rb b/app/models/concerns/account/merging.rb
index e6b147482cc6d3..bd8b162238b030 100644
--- a/app/models/concerns/account/merging.rb
+++ b/app/models/concerns/account/merging.rb
@@ -27,6 +27,16 @@ def merge_with!(other_account)
       end
     end
 
+    [
+      Notification, NotificationPermission, NotificationRequest
+    ].each do |klass|
+      klass.where(from_account_id: other_account.id).reorder(nil).find_each do |record|
+        record.update_attribute(:from_account_id, id)
+      rescue ActiveRecord::RecordNotUnique
+        next
+      end
+    end
+
     target_classes = [
       Follow, FollowRequest, Block, Mute, AccountModerationNote, AccountPin,
       AccountNote
diff --git a/lib/mastodon/cli/maintenance.rb b/lib/mastodon/cli/maintenance.rb
index 2e7c8570789392..d16d55eae1ec08 100644
--- a/lib/mastodon/cli/maintenance.rb
+++ b/lib/mastodon/cli/maintenance.rb
@@ -26,6 +26,9 @@ class AccountPin < ApplicationRecord; end
     class ListAccount < ApplicationRecord; end
     class PollVote < ApplicationRecord; end
     class Mention < ApplicationRecord; end
+    class Notification < ApplicationRecord; end
+    class NotificationPermission < ApplicationRecord; end
+    class NotificationRequest < ApplicationRecord; end
     class AccountDomainBlock < ApplicationRecord; end
     class AnnouncementReaction < ApplicationRecord; end
     class FeaturedTag < ApplicationRecord; end
@@ -108,6 +111,18 @@ def merge_with!(other_account)
           end
         end
 
+        from_classes = [Notification]
+        from_classes << NotificationPermission if db_table_exists?(:notification_permissions)
+        from_classes << NotificationRequest if db_table_exists?(:notification_requests)
+
+        from_classes.each do |klass|
+          klass.where(from_account_id: other_account.id).find_each do |record|
+            record.update_attribute(:from_account_id, id)
+          rescue ActiveRecord::RecordNotUnique
+            next
+          end
+        end
+
         target_classes = [Follow, FollowRequest, Block, Mute, AccountModerationNote, AccountPin]
         target_classes << AccountNote if db_table_exists?(:account_notes)
 

From 58376eeddac328d275339cd920a49bb29067f1c6 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 22 Mar 2024 17:22:36 +0100
Subject: [PATCH 0582/2191] Remove obsolete `admin` and `moderator` columns
 from `users` table (#29718)

---
 app/models/user.rb                                        | 2 --
 .../20240322161611_remove_obsolete_roles_from_users.rb    | 8 ++++++++
 db/schema.rb                                              | 4 +---
 3 files changed, 9 insertions(+), 5 deletions(-)
 create mode 100644 db/post_migrate/20240322161611_remove_obsolete_roles_from_users.rb

diff --git a/app/models/user.rb b/app/models/user.rb
index ee9116b9f4555d..17ec90c9ee9ea1 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -14,7 +14,6 @@
 #  sign_in_count             :integer          default(0), not null
 #  current_sign_in_at        :datetime
 #  last_sign_in_at           :datetime
-#  admin                     :boolean          default(FALSE), not null
 #  confirmation_token        :string
 #  confirmed_at              :datetime
 #  confirmation_sent_at      :datetime
@@ -29,7 +28,6 @@
 #  otp_backup_codes          :string           is an Array
 #  account_id                :bigint(8)        not null
 #  disabled                  :boolean          default(FALSE), not null
-#  moderator                 :boolean          default(FALSE), not null
 #  invite_id                 :bigint(8)
 #  chosen_languages          :string           is an Array
 #  created_by_application_id :bigint(8)
diff --git a/db/post_migrate/20240322161611_remove_obsolete_roles_from_users.rb b/db/post_migrate/20240322161611_remove_obsolete_roles_from_users.rb
new file mode 100644
index 00000000000000..8a46a1d7d38173
--- /dev/null
+++ b/db/post_migrate/20240322161611_remove_obsolete_roles_from_users.rb
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class RemoveObsoleteRolesFromUsers < ActiveRecord::Migration[7.1]
+  def change
+    safety_assured { remove_column :users, :admin, :boolean, default: false, null: false }
+    safety_assured { remove_column :users, :moderator, :boolean, default: false, null: false }
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index dcf16a7ed93194..27c486487d8a22 100644
--- 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_03_22_130318) do
+ActiveRecord::Schema[7.1].define(version: 2024_03_22_161611) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -1170,7 +1170,6 @@
     t.integer "sign_in_count", default: 0, null: false
     t.datetime "current_sign_in_at", precision: nil
     t.datetime "last_sign_in_at", precision: nil
-    t.boolean "admin", default: false, null: false
     t.string "confirmation_token"
     t.datetime "confirmed_at", precision: nil
     t.datetime "confirmation_sent_at", precision: nil
@@ -1185,7 +1184,6 @@
     t.string "otp_backup_codes", array: true
     t.bigint "account_id", null: false
     t.boolean "disabled", default: false, null: false
-    t.boolean "moderator", default: false, null: false
     t.bigint "invite_id"
     t.string "chosen_languages", array: true
     t.bigint "created_by_application_id"

From 119c7aa0df1e1d26bdee1701250d23a7af9e9136 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 22 Mar 2024 16:22:52 +0000
Subject: [PATCH 0583/2191] Update dependency rails-i18n to v7.0.9 (#29564)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 17b7bfb4a00988..b341ca84b3d070 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -582,7 +582,7 @@ GEM
     rails-html-sanitizer (1.6.0)
       loofah (~> 2.21)
       nokogiri (~> 1.14)
-    rails-i18n (7.0.8)
+    rails-i18n (7.0.9)
       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 8)
     railties (7.1.3.2)

From 37ca59815cd3a3b2662e20f0c28185eb0d604dd4 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 22 Mar 2024 17:24:04 +0100
Subject: [PATCH 0584/2191] Remove setting for unfollow confirmation modal, and
 make it unconditional (#29373)

---
 .../mastodon/containers/account_container.jsx | 21 +++-----
 .../containers/header_container.jsx           | 41 ++++++---------
 .../directory/components/account_card.jsx     | 52 ++++++++-----------
 app/javascript/mastodon/initial_state.js      |  2 -
 app/models/concerns/user/has_settings.rb      |  4 --
 app/models/user_settings.rb                   |  1 -
 app/serializers/initial_state_serializer.rb   |  1 -
 .../preferences/appearance/show.html.haml     |  1 -
 8 files changed, 46 insertions(+), 77 deletions(-)

diff --git a/app/javascript/mastodon/containers/account_container.jsx b/app/javascript/mastodon/containers/account_container.jsx
index a134452e77210f..f171fcc2fe5d19 100644
--- a/app/javascript/mastodon/containers/account_container.jsx
+++ b/app/javascript/mastodon/containers/account_container.jsx
@@ -13,7 +13,6 @@ import {
 import { openModal } from '../actions/modal';
 import { initMuteModal } from '../actions/mutes';
 import Account from '../components/account';
-import { unfollowModal } from '../initial_state';
 import { makeGetAccount } from '../selectors';
 
 const messages = defineMessages({
@@ -34,18 +33,14 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
 
   onFollow (account) {
     if (account.getIn(['relationship', 'following']) || account.getIn(['relationship', 'requested'])) {
-      if (unfollowModal) {
-        dispatch(openModal({
-          modalType: 'CONFIRM',
-          modalProps: {
-            message: <FormattedMessage id='confirmations.unfollow.message' defaultMessage='Are you sure you want to unfollow {name}?' values={{ name: <strong>@{account.get('acct')}</strong> }} />,
-            confirm: intl.formatMessage(messages.unfollowConfirm),
-            onConfirm: () => dispatch(unfollowAccount(account.get('id'))),
-          },
-        }));
-      } else {
-        dispatch(unfollowAccount(account.get('id')));
-      }
+      dispatch(openModal({
+        modalType: 'CONFIRM',
+        modalProps: {
+          message: <FormattedMessage id='confirmations.unfollow.message' defaultMessage='Are you sure you want to unfollow {name}?' values={{ name: <strong>@{account.get('acct')}</strong> }} />,
+          confirm: intl.formatMessage(messages.unfollowConfirm),
+          onConfirm: () => dispatch(unfollowAccount(account.get('id'))),
+        },
+      }));
     } else {
       dispatch(followAccount(account.get('id')));
     }
diff --git a/app/javascript/mastodon/features/account_timeline/containers/header_container.jsx b/app/javascript/mastodon/features/account_timeline/containers/header_container.jsx
index 071dbdbfb72aa4..73fd62841b33a5 100644
--- a/app/javascript/mastodon/features/account_timeline/containers/header_container.jsx
+++ b/app/javascript/mastodon/features/account_timeline/containers/header_container.jsx
@@ -21,7 +21,6 @@ import { initDomainBlockModal, unblockDomain } from '../../../actions/domain_blo
 import { openModal } from '../../../actions/modal';
 import { initMuteModal } from '../../../actions/mutes';
 import { initReport } from '../../../actions/reports';
-import { unfollowModal } from '../../../initial_state';
 import { makeGetAccount, getAccountHidden } from '../../../selectors';
 import Header from '../components/header';
 
@@ -47,31 +46,23 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
 
   onFollow (account) {
     if (account.getIn(['relationship', 'following'])) {
-      if (unfollowModal) {
-        dispatch(openModal({
-          modalType: 'CONFIRM',
-          modalProps: {
-            message: <FormattedMessage id='confirmations.unfollow.message' defaultMessage='Are you sure you want to unfollow {name}?' values={{ name: <strong>@{account.get('acct')}</strong> }} />,
-            confirm: intl.formatMessage(messages.unfollowConfirm),
-            onConfirm: () => dispatch(unfollowAccount(account.get('id'))),
-          },
-        }));
-      } else {
-        dispatch(unfollowAccount(account.get('id')));
-      }
+      dispatch(openModal({
+        modalType: 'CONFIRM',
+        modalProps: {
+          message: <FormattedMessage id='confirmations.unfollow.message' defaultMessage='Are you sure you want to unfollow {name}?' values={{ name: <strong>@{account.get('acct')}</strong> }} />,
+          confirm: intl.formatMessage(messages.unfollowConfirm),
+          onConfirm: () => dispatch(unfollowAccount(account.get('id'))),
+        },
+      }));
     } else if (account.getIn(['relationship', 'requested'])) {
-      if (unfollowModal) {
-        dispatch(openModal({
-          modalType: 'CONFIRM',
-          modalProps: {
-            message: <FormattedMessage id='confirmations.cancel_follow_request.message' defaultMessage='Are you sure you want to withdraw your request to follow {name}?' values={{ name: <strong>@{account.get('acct')}</strong> }} />,
-            confirm: intl.formatMessage(messages.cancelFollowRequestConfirm),
-            onConfirm: () => dispatch(unfollowAccount(account.get('id'))),
-          },
-        }));
-      } else {
-        dispatch(unfollowAccount(account.get('id')));
-      }
+      dispatch(openModal({
+        modalType: 'CONFIRM',
+        modalProps: {
+          message: <FormattedMessage id='confirmations.cancel_follow_request.message' defaultMessage='Are you sure you want to withdraw your request to follow {name}?' values={{ name: <strong>@{account.get('acct')}</strong> }} />,
+          confirm: intl.formatMessage(messages.cancelFollowRequestConfirm),
+          onConfirm: () => dispatch(unfollowAccount(account.get('id'))),
+        },
+      }));
     } else {
       dispatch(followAccount(account.get('id')));
     }
diff --git a/app/javascript/mastodon/features/directory/components/account_card.jsx b/app/javascript/mastodon/features/directory/components/account_card.jsx
index ff1f8a653b5561..9c5e688120f3e1 100644
--- a/app/javascript/mastodon/features/directory/components/account_card.jsx
+++ b/app/javascript/mastodon/features/directory/components/account_card.jsx
@@ -20,7 +20,7 @@ import { Avatar } from 'mastodon/components/avatar';
 import { Button } from 'mastodon/components/button';
 import { DisplayName } from 'mastodon/components/display_name';
 import { ShortNumber } from 'mastodon/components/short_number';
-import { autoPlayGif, me, unfollowModal } from 'mastodon/initial_state';
+import { autoPlayGif, me } from 'mastodon/initial_state';
 import { makeGetAccount } from 'mastodon/selectors';
 
 const messages = defineMessages({
@@ -48,38 +48,30 @@ const makeMapStateToProps = () => {
 const mapDispatchToProps = (dispatch, { intl }) => ({
   onFollow(account) {
     if (account.getIn(['relationship', 'following'])) {
-      if (unfollowModal) {
-        dispatch(
-          openModal({
-            modalType: 'CONFIRM',
-            modalProps: {
-              message: (
-                <FormattedMessage
-                  id='confirmations.unfollow.message'
-                  defaultMessage='Are you sure you want to unfollow {name}?'
-                  values={{ name: <strong>@{account.get('acct')}</strong> }}
-                />
-              ),
-              confirm: intl.formatMessage(messages.unfollowConfirm),
-              onConfirm: () => dispatch(unfollowAccount(account.get('id'))),
-            } }),
-        );
-      } else {
-        dispatch(unfollowAccount(account.get('id')));
-      }
-    } else if (account.getIn(['relationship', 'requested'])) {
-      if (unfollowModal) {
-        dispatch(openModal({
+      dispatch(
+        openModal({
           modalType: 'CONFIRM',
           modalProps: {
-            message: <FormattedMessage id='confirmations.cancel_follow_request.message' defaultMessage='Are you sure you want to withdraw your request to follow {name}?' values={{ name: <strong>@{account.get('acct')}</strong> }} />,
-            confirm: intl.formatMessage(messages.cancelFollowRequestConfirm),
+            message: (
+              <FormattedMessage
+                id='confirmations.unfollow.message'
+                defaultMessage='Are you sure you want to unfollow {name}?'
+                values={{ name: <strong>@{account.get('acct')}</strong> }}
+              />
+            ),
+            confirm: intl.formatMessage(messages.unfollowConfirm),
             onConfirm: () => dispatch(unfollowAccount(account.get('id'))),
-          },
-        }));
-      } else {
-        dispatch(unfollowAccount(account.get('id')));
-      }
+          } }),
+      );
+    } else if (account.getIn(['relationship', 'requested'])) {
+      dispatch(openModal({
+        modalType: 'CONFIRM',
+        modalProps: {
+          message: <FormattedMessage id='confirmations.cancel_follow_request.message' defaultMessage='Are you sure you want to withdraw your request to follow {name}?' values={{ name: <strong>@{account.get('acct')}</strong> }} />,
+          confirm: intl.formatMessage(messages.cancelFollowRequestConfirm),
+          onConfirm: () => dispatch(unfollowAccount(account.get('id'))),
+        },
+      }));
     } else {
       dispatch(followAccount(account.get('id')));
     }
diff --git a/app/javascript/mastodon/initial_state.js b/app/javascript/mastodon/initial_state.js
index 596c9ca49f3ab1..d8c57a2a0c146f 100644
--- a/app/javascript/mastodon/initial_state.js
+++ b/app/javascript/mastodon/initial_state.js
@@ -38,7 +38,6 @@
  * @property {string} title
  * @property {boolean} show_trends
  * @property {boolean} trends_as_landing_page
- * @property {boolean} unfollow_modal
  * @property {boolean} use_blurhash
  * @property {boolean=} use_pending_items
  * @property {string} version
@@ -99,7 +98,6 @@ export const source_url = getMeta('source_url');
 export const timelinePreview = getMeta('timeline_preview');
 export const title = getMeta('title');
 export const trendsAsLanding = getMeta('trends_as_landing_page');
-export const unfollowModal = getMeta('unfollow_modal');
 export const useBlurhash = getMeta('use_blurhash');
 export const usePendingItems = getMeta('use_pending_items');
 export const version = getMeta('version');
diff --git a/app/models/concerns/user/has_settings.rb b/app/models/concerns/user/has_settings.rb
index bfa8aa2ca3549f..65373325f0ba79 100644
--- a/app/models/concerns/user/has_settings.rb
+++ b/app/models/concerns/user/has_settings.rb
@@ -27,10 +27,6 @@ def setting_default_sensitive
     settings['default_sensitive']
   end
 
-  def setting_unfollow_modal
-    settings['web.unfollow_modal']
-  end
-
   def setting_boost_modal
     settings['web.reblog_modal']
   end
diff --git a/app/models/user_settings.rb b/app/models/user_settings.rb
index 030cbec4d8240c..6571632fcd7a72 100644
--- a/app/models/user_settings.rb
+++ b/app/models/user_settings.rb
@@ -27,7 +27,6 @@ class KeyError < Error; end
     setting :disable_swiping, default: false
     setting :delete_modal, default: true
     setting :reblog_modal, default: false
-    setting :unfollow_modal, default: true
     setting :reduce_motion, default: false
     setting :expand_content_warnings, default: false
     setting :display_media, default: 'default', in: %w(default show_all hide_all)
diff --git a/app/serializers/initial_state_serializer.rb b/app/serializers/initial_state_serializer.rb
index 9f7921461d7afd..72aaabcfcb1f81 100644
--- a/app/serializers/initial_state_serializer.rb
+++ b/app/serializers/initial_state_serializer.rb
@@ -17,7 +17,6 @@ def meta
 
     if object.current_account
       store[:me]                = object.current_account.id.to_s
-      store[:unfollow_modal]    = object_account_user.setting_unfollow_modal
       store[:boost_modal]       = object_account_user.setting_boost_modal
       store[:delete_modal]      = object_account_user.setting_delete_modal
       store[:auto_play_gif]     = object_account_user.setting_auto_play_gif
diff --git a/app/views/settings/preferences/appearance/show.html.haml b/app/views/settings/preferences/appearance/show.html.haml
index 76cd4381d8bb82..e89e015b298bee 100644
--- a/app/views/settings/preferences/appearance/show.html.haml
+++ b/app/views/settings/preferences/appearance/show.html.haml
@@ -66,7 +66,6 @@
     %h4= t 'appearance.confirmation_dialogs'
 
     .fields-group
-      = ff.input :'web.unfollow_modal', wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_unfollow_modal')
       = ff.input :'web.reblog_modal', wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_boost_modal')
       = ff.input :'web.delete_modal', wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_delete_modal')
 

From 81a04ac25cb5a25d8501e59a16b272a6b4e177f0 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 22 Mar 2024 17:25:36 +0100
Subject: [PATCH 0585/2191] Improve specs for severed relationships (#29688)

---
 spec/features/severed_relationships_spec.rb | 24 +++++++++++++++++++++
 spec/requests/severed_relationships_spec.rb | 24 ---------------------
 spec/services/block_domain_service_spec.rb  |  5 ++++-
 3 files changed, 28 insertions(+), 25 deletions(-)
 create mode 100644 spec/features/severed_relationships_spec.rb
 delete mode 100644 spec/requests/severed_relationships_spec.rb

diff --git a/spec/features/severed_relationships_spec.rb b/spec/features/severed_relationships_spec.rb
new file mode 100644
index 00000000000000..b933398a083888
--- /dev/null
+++ b/spec/features/severed_relationships_spec.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'Severed relationships page' do
+  include ProfileStories
+
+  describe 'GET severed_relationships#index' do
+    before do
+      as_a_logged_in_user
+
+      event = Fabricate(:relationship_severance_event)
+      Fabricate.times(3, :severed_relationship, local_account: bob.account, relationship_severance_event: event)
+      Fabricate(:account_relationship_severance_event, account: bob.account, relationship_severance_event: event)
+    end
+
+    it 'returns http success' do
+      visit severed_relationships_path
+
+      expect(page).to have_title(I18n.t('settings.severed_relationships'))
+      expect(page).to have_link(href: following_severed_relationship_path(AccountRelationshipSeveranceEvent.first, format: :csv))
+    end
+  end
+end
diff --git a/spec/requests/severed_relationships_spec.rb b/spec/requests/severed_relationships_spec.rb
deleted file mode 100644
index 05a48ca3498452..00000000000000
--- a/spec/requests/severed_relationships_spec.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe 'Severed relationships page' do
-  include RoutingHelper
-
-  describe 'GET severed_relationships#index' do
-    let(:user) { Fabricate(:user) }
-    let(:event) { Fabricate(:account_relationship_severance_event, account: user.account) }
-
-    before do
-      sign_in user
-
-      Fabricate.times(3, :severed_relationship, local_account: user.account, relationship_severance_event: event.relationship_severance_event)
-    end
-
-    it 'returns http success' do
-      get severed_relationships_path
-
-      expect(response).to have_http_status(200)
-    end
-  end
-end
diff --git a/spec/services/block_domain_service_spec.rb b/spec/services/block_domain_service_spec.rb
index 26f80eaf620edc..d4f0c042d453c9 100644
--- a/spec/services/block_domain_service_spec.rb
+++ b/spec/services/block_domain_service_spec.rb
@@ -19,7 +19,7 @@
       bystander.follow!(local_account)
     end
 
-    it 'creates a domain block, suspends remote accounts with appropriate suspension date, records severed relationships', :aggregate_failures do
+    it 'creates a domain block, suspends remote accounts with appropriate suspension date, records severed relationships and sends notification', :aggregate_failures do
       subject.call(DomainBlock.create!(domain: 'evil.org', severity: :suspend))
 
       expect(DomainBlock.blocked?('evil.org')).to be true
@@ -42,6 +42,9 @@
       expect(severed_relationships.count).to eq 2
       expect(severed_relationships[0].relationship_severance_event).to eq severed_relationships[1].relationship_severance_event
       expect(severed_relationships.map { |rel| [rel.account, rel.target_account] }).to contain_exactly([bystander, local_account], [local_account, bad_account])
+
+      # Sends severed relationships notification
+      expect(LocalNotificationWorker).to have_enqueued_sidekiq_job(local_account.id, anything, 'AccountRelationshipSeveranceEvent', 'severed_relationships')
     end
   end
 

From 6c381f20b1d52c96525cbd5c41b0c972c3394a48 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Sun, 24 Mar 2024 15:17:06 +0100
Subject: [PATCH 0586/2191] Restore advanced filter bar setting (#29737)

---
 .../notifications/components/column_settings.jsx      | 11 +++++++++++
 .../notifications/containers/filter_bar_container.js  |  2 +-
 app/javascript/mastodon/locales/en.json               |  2 ++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/features/notifications/components/column_settings.jsx b/app/javascript/mastodon/features/notifications/components/column_settings.jsx
index caa1b757a4b758..fc737c0fe20556 100644
--- a/app/javascript/mastodon/features/notifications/components/column_settings.jsx
+++ b/app/javascript/mastodon/features/notifications/components/column_settings.jsx
@@ -54,6 +54,7 @@ export default class ColumnSettings extends PureComponent {
   render () {
     const { settings, pushSettings, onChange, onClear, alertsEnabled, browserSupport, browserPermission, onRequestNotificationPermission, notificationPolicy } = this.props;
 
+    const filterAdvancedStr = <FormattedMessage id='notifications.column_settings.filter_bar.advanced' defaultMessage='Display all categories' />;
     const unreadMarkersShowStr = <FormattedMessage id='notifications.column_settings.unread_notifications.highlight' defaultMessage='Highlight unread notifications' />;
     const alertStr = <FormattedMessage id='notifications.column_settings.alert' defaultMessage='Desktop notifications' />;
     const showStr = <FormattedMessage id='notifications.column_settings.show' defaultMessage='Show in column' />;
@@ -116,6 +117,16 @@ export default class ColumnSettings extends PureComponent {
           </div>
         </section>
 
+        <section role='group' aria-labelledby='notifications-filter-bar'>
+          <h3 id='notifications-filter-bar'>
+            <FormattedMessage id='notifications.column_settings.filter_bar.category' defaultMessage='Quick filter bar' />
+          </h3>
+
+          <div className='column-settings__row'>
+            <SettingToggle id='advanced-filter-bar' prefix='notifications' settings={settings} settingPath={['quickFilter', 'advanced']} onChange={onChange} label={filterAdvancedStr} />
+          </div>
+        </section>
+
         <section role='group' aria-labelledby='notifications-follow'>
           <h3 id='notifications-follow'><FormattedMessage id='notifications.column_settings.follow' defaultMessage='New followers:' /></h3>
 
diff --git a/app/javascript/mastodon/features/notifications/containers/filter_bar_container.js b/app/javascript/mastodon/features/notifications/containers/filter_bar_container.js
index e448cd26ad9ea5..4e0184cef30534 100644
--- a/app/javascript/mastodon/features/notifications/containers/filter_bar_container.js
+++ b/app/javascript/mastodon/features/notifications/containers/filter_bar_container.js
@@ -5,7 +5,7 @@ import FilterBar from '../components/filter_bar';
 
 const makeMapStateToProps = state => ({
   selectedFilter: state.getIn(['settings', 'notifications', 'quickFilter', 'active']),
-  advancedMode: false,
+  advancedMode: state.getIn(['settings', 'notifications', 'quickFilter', 'advanced']),
 });
 
 const mapDispatchToProps = (dispatch) => ({
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index efda92d21324a1..1134b393a761e5 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -484,6 +484,8 @@
   "notifications.column_settings.admin.sign_up": "New sign-ups:",
   "notifications.column_settings.alert": "Desktop notifications",
   "notifications.column_settings.favourite": "Favorites:",
+  "notifications.column_settings.filter_bar.advanced": "Display all categories",
+  "notifications.column_settings.filter_bar.category": "Quick filter bar",
   "notifications.column_settings.follow": "New followers:",
   "notifications.column_settings.follow_request": "New follow requests:",
   "notifications.column_settings.mention": "Mentions:",

From 8e7e86ee354fca36b989b6de40904f38e6db103b Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 25 Mar 2024 11:29:55 +0100
Subject: [PATCH 0587/2191] Add ability to reorder uploaded media before
 posting in web UI (#28456)

---
 app/javascript/mastodon/actions/compose.js    |   7 +
 .../compose/components/compose_form.jsx       |   4 +-
 .../features/compose/components/upload.jsx    | 124 +++++++++---------
 .../compose/components/upload_form.jsx        |  70 ++++++----
 .../compose/components/upload_progress.jsx    |  67 +++++-----
 .../compose/containers/upload_container.js    |  27 ----
 .../containers/upload_form_container.js       |   9 --
 .../containers/upload_progress_container.js   |  11 --
 .../ui/components/focal_point_modal.jsx       |   2 +-
 app/javascript/mastodon/reducers/compose.js   |   9 ++
 10 files changed, 159 insertions(+), 171 deletions(-)
 delete mode 100644 app/javascript/mastodon/features/compose/containers/upload_container.js
 delete mode 100644 app/javascript/mastodon/features/compose/containers/upload_form_container.js
 delete mode 100644 app/javascript/mastodon/features/compose/containers/upload_progress_container.js

diff --git a/app/javascript/mastodon/actions/compose.js b/app/javascript/mastodon/actions/compose.js
index 12bd43f807553f..7477e45e5eb4bf 100644
--- a/app/javascript/mastodon/actions/compose.js
+++ b/app/javascript/mastodon/actions/compose.js
@@ -75,6 +75,7 @@ export const INIT_MEDIA_EDIT_MODAL = 'INIT_MEDIA_EDIT_MODAL';
 
 export const COMPOSE_CHANGE_MEDIA_DESCRIPTION = 'COMPOSE_CHANGE_MEDIA_DESCRIPTION';
 export const COMPOSE_CHANGE_MEDIA_FOCUS       = 'COMPOSE_CHANGE_MEDIA_FOCUS';
+export const COMPOSE_CHANGE_MEDIA_ORDER       = 'COMPOSE_CHANGE_MEDIA_ORDER';
 
 export const COMPOSE_SET_STATUS = 'COMPOSE_SET_STATUS';
 export const COMPOSE_FOCUS = 'COMPOSE_FOCUS';
@@ -809,3 +810,9 @@ export function changePollSettings(expiresIn, isMultiple) {
     isMultiple,
   };
 }
+
+export const changeMediaOrder = (a, b) => ({
+  type: COMPOSE_CHANGE_MEDIA_ORDER,
+  a,
+  b,
+});
diff --git a/app/javascript/mastodon/features/compose/components/compose_form.jsx b/app/javascript/mastodon/features/compose/components/compose_form.jsx
index b93bac9d19bce9..9b4d3dfeb5e2c8 100644
--- a/app/javascript/mastodon/features/compose/components/compose_form.jsx
+++ b/app/javascript/mastodon/features/compose/components/compose_form.jsx
@@ -21,7 +21,6 @@ import PollButtonContainer from '../containers/poll_button_container';
 import PrivacyDropdownContainer from '../containers/privacy_dropdown_container';
 import SpoilerButtonContainer from '../containers/spoiler_button_container';
 import UploadButtonContainer from '../containers/upload_button_container';
-import UploadFormContainer from '../containers/upload_form_container';
 import WarningContainer from '../containers/warning_container';
 import { countableText } from '../util/counter';
 
@@ -30,6 +29,7 @@ import { EditIndicator } from './edit_indicator';
 import { NavigationBar } from './navigation_bar';
 import { PollForm } from "./poll_form";
 import { ReplyIndicator } from './reply_indicator';
+import { UploadForm } from './upload_form';
 
 const allowedAroundShortCode = '><\u0085\u0020\u00a0\u1680\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029\u0009\u000a\u000b\u000c\u000d';
 
@@ -283,7 +283,7 @@ class ComposeForm extends ImmutablePureComponent {
             />
           </div>
 
-          <UploadFormContainer />
+          <UploadForm />
           <PollForm />
 
           <div className='compose-form__footer'>
diff --git a/app/javascript/mastodon/features/compose/components/upload.jsx b/app/javascript/mastodon/features/compose/components/upload.jsx
index e8045ae81fb618..7f6ef6cfd8e418 100644
--- a/app/javascript/mastodon/features/compose/components/upload.jsx
+++ b/app/javascript/mastodon/features/compose/components/upload.jsx
@@ -1,77 +1,81 @@
 import PropTypes from 'prop-types';
+import { useCallback } from 'react';
 
 import { FormattedMessage } from 'react-intl';
 
 import classNames from 'classnames';
 
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import ImmutablePureComponent from 'react-immutable-pure-component';
+import { useDispatch, useSelector } from 'react-redux';
 
 import spring from 'react-motion/lib/spring';
 
 import CloseIcon from '@/material-icons/400-20px/close.svg?react';
 import EditIcon from '@/material-icons/400-24px/edit.svg?react';
 import WarningIcon from '@/material-icons/400-24px/warning.svg?react';
+import { undoUploadCompose, initMediaEditModal } from 'mastodon/actions/compose';
 import { Blurhash } from 'mastodon/components/blurhash';
 import { Icon }  from 'mastodon/components/icon';
+import Motion from 'mastodon/features/ui/util/optional_motion';
 
-import Motion from '../../ui/util/optional_motion';
-
-export default class Upload extends ImmutablePureComponent {
-
-  static propTypes = {
-    media: ImmutablePropTypes.map.isRequired,
-    sensitive: PropTypes.bool,
-    onUndo: PropTypes.func.isRequired,
-    onOpenFocalPoint: PropTypes.func.isRequired,
-  };
-
-  handleUndoClick = e => {
-    e.stopPropagation();
-    this.props.onUndo(this.props.media.get('id'));
-  };
-
-  handleFocalPointClick = e => {
-    e.stopPropagation();
-    this.props.onOpenFocalPoint(this.props.media.get('id'));
-  };
-
-  render () {
-    const { media, sensitive } = this.props;
-
-    if (!media) {
-      return null;
-    }
-
-    const focusX = media.getIn(['meta', 'focus', 'x']);
-    const focusY = media.getIn(['meta', 'focus', 'y']);
-    const x = ((focusX /  2) + .5) * 100;
-    const y = ((focusY / -2) + .5) * 100;
-    const missingDescription = (media.get('description') || '').length === 0;
-
-    return (
-      <div className='compose-form__upload'>
-        <Motion defaultStyle={{ scale: 0.8 }} style={{ scale: spring(1, { stiffness: 180, damping: 12 }) }}>
-          {({ scale }) => (
-            <div className='compose-form__upload__thumbnail' style={{ transform: `scale(${scale})`, backgroundImage: !sensitive ? `url(${media.get('preview_url')})` : null, backgroundPosition: `${x}% ${y}%` }}>
-              {sensitive && <Blurhash
-                hash={media.get('blurhash')}
-                className='compose-form__upload__preview'
-              />}
-
-              <div className='compose-form__upload__actions'>
-                <button type='button' className='icon-button compose-form__upload__delete' onClick={this.handleUndoClick}><Icon icon={CloseIcon} /></button>
-                <button type='button' className='icon-button' onClick={this.handleFocalPointClick}><Icon icon={EditIcon} /> <FormattedMessage id='upload_form.edit' defaultMessage='Edit' /></button>
-              </div>
-
-              <div className='compose-form__upload__warning'>
-                <button type='button' className={classNames('icon-button', { active: missingDescription })} onClick={this.handleFocalPointClick}>{missingDescription && <Icon icon={WarningIcon} />} ALT</button>
-              </div>
-            </div>
-          )}
-        </Motion>
-      </div>
-    );
+export const Upload = ({ id, onDragStart, onDragEnter, onDragEnd }) => {
+  const dispatch = useDispatch();
+  const media = useSelector(state => state.getIn(['compose', 'media_attachments']).find(item => item.get('id') === id));
+  const sensitive = useSelector(state => state.getIn(['compose', 'spoiler']));
+
+  const handleUndoClick = useCallback(() => {
+    dispatch(undoUploadCompose(id));
+  }, [dispatch, id]);
+
+  const handleFocalPointClick = useCallback(() => {
+    dispatch(initMediaEditModal(id));
+  }, [dispatch, id]);
+
+  const handleDragStart = useCallback(() => {
+    onDragStart(id);
+  }, [onDragStart, id]);
+
+  const handleDragEnter = useCallback(() => {
+    onDragEnter(id);
+  }, [onDragEnter, id]);
+
+  if (!media) {
+    return null;
   }
 
-}
+  const focusX = media.getIn(['meta', 'focus', 'x']);
+  const focusY = media.getIn(['meta', 'focus', 'y']);
+  const x = ((focusX /  2) + .5) * 100;
+  const y = ((focusY / -2) + .5) * 100;
+  const missingDescription = (media.get('description') || '').length === 0;
+
+  return (
+    <div className='compose-form__upload' draggable onDragStart={handleDragStart} onDragEnter={handleDragEnter} onDragEnd={onDragEnd}>
+      <Motion defaultStyle={{ scale: 0.8 }} style={{ scale: spring(1, { stiffness: 180, damping: 12 }) }}>
+        {({ scale }) => (
+          <div className='compose-form__upload__thumbnail' style={{ transform: `scale(${scale})`, backgroundImage: !sensitive ? `url(${media.get('preview_url')})` : null, backgroundPosition: `${x}% ${y}%` }}>
+            {sensitive && <Blurhash
+              hash={media.get('blurhash')}
+              className='compose-form__upload__preview'
+            />}
+
+            <div className='compose-form__upload__actions'>
+              <button type='button' className='icon-button compose-form__upload__delete' onClick={handleUndoClick}><Icon icon={CloseIcon} /></button>
+              <button type='button' className='icon-button' onClick={handleFocalPointClick}><Icon icon={EditIcon} /> <FormattedMessage id='upload_form.edit' defaultMessage='Edit' /></button>
+            </div>
+
+            <div className='compose-form__upload__warning'>
+              <button type='button' className={classNames('icon-button', { active: missingDescription })} onClick={handleFocalPointClick}>{missingDescription && <Icon icon={WarningIcon} />} ALT</button>
+            </div>
+          </div>
+        )}
+      </Motion>
+    </div>
+  );
+};
+
+Upload.propTypes = {
+  id: PropTypes.string,
+  onDragEnter: PropTypes.func,
+  onDragStart: PropTypes.func,
+  onDragEnd: PropTypes.func,
+};
diff --git a/app/javascript/mastodon/features/compose/components/upload_form.jsx b/app/javascript/mastodon/features/compose/components/upload_form.jsx
index 46bac7823b8d16..adf5591382a49f 100644
--- a/app/javascript/mastodon/features/compose/components/upload_form.jsx
+++ b/app/javascript/mastodon/features/compose/components/upload_form.jsx
@@ -1,31 +1,53 @@
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import ImmutablePureComponent from 'react-immutable-pure-component';
+import { useRef, useCallback } from 'react';
 
-import UploadContainer from '../containers/upload_container';
-import UploadProgressContainer from '../containers/upload_progress_container';
+import { useSelector, useDispatch } from 'react-redux';
 
-export default class UploadForm extends ImmutablePureComponent {
+import { changeMediaOrder } from 'mastodon/actions/compose';
 
-  static propTypes = {
-    mediaIds: ImmutablePropTypes.list.isRequired,
-  };
+import { Upload } from './upload';
+import { UploadProgress } from './upload_progress';
 
-  render () {
-    const { mediaIds } = this.props;
+export const UploadForm = () => {
+  const dispatch = useDispatch();
+  const mediaIds = useSelector(state => state.getIn(['compose', 'media_attachments']).map(item => item.get('id')));
+  const active = useSelector(state => state.getIn(['compose', 'is_uploading']));
+  const progress = useSelector(state => state.getIn(['compose', 'progress']));
+  const isProcessing = useSelector(state => state.getIn(['compose', 'is_processing']));
 
-    return (
-      <>
-        <UploadProgressContainer />
+  const dragItem = useRef();
+  const dragOverItem = useRef();
 
-        {mediaIds.size > 0 && (
-          <div className='compose-form__uploads'>
-            {mediaIds.map(id => (
-              <UploadContainer id={id} key={id} />
-            ))}
-          </div>
-        )}
-      </>
-    );
-  }
+  const handleDragStart = useCallback(id => {
+    dragItem.current = id;
+  }, [dragItem]);
 
-}
+  const handleDragEnter = useCallback(id => {
+    dragOverItem.current = id;
+  }, [dragOverItem]);
+
+  const handleDragEnd = useCallback(() => {
+    dispatch(changeMediaOrder(dragItem.current, dragOverItem.current));
+    dragItem.current = null;
+    dragOverItem.current = null;
+  }, [dispatch, dragItem, dragOverItem]);
+
+  return (
+    <>
+      <UploadProgress active={active} progress={progress} isProcessing={isProcessing} />
+
+      {mediaIds.size > 0 && (
+        <div className='compose-form__uploads'>
+          {mediaIds.map(id => (
+            <Upload
+              key={id}
+              id={id}
+              onDragStart={handleDragStart}
+              onDragEnter={handleDragEnter}
+              onDragEnd={handleDragEnd}
+            />
+          ))}
+        </div>
+      )}
+    </>
+  );
+};
diff --git a/app/javascript/mastodon/features/compose/components/upload_progress.jsx b/app/javascript/mastodon/features/compose/components/upload_progress.jsx
index 1276cded1ff2fd..fd0c8f45302831 100644
--- a/app/javascript/mastodon/features/compose/components/upload_progress.jsx
+++ b/app/javascript/mastodon/features/compose/components/upload_progress.jsx
@@ -1,5 +1,4 @@
 import PropTypes from 'prop-types';
-import { PureComponent } from 'react';
 
 import { FormattedMessage } from 'react-intl';
 
@@ -10,46 +9,40 @@ import { Icon }  from 'mastodon/components/icon';
 
 import Motion from '../../ui/util/optional_motion';
 
-export default class UploadProgress extends PureComponent {
-
-  static propTypes = {
-    active: PropTypes.bool,
-    progress: PropTypes.number,
-    isProcessing: PropTypes.bool,
-  };
-
-  render () {
-    const { active, progress, isProcessing } = this.props;
-
-    if (!active) {
-      return null;
-    }
+export const UploadProgress = ({ active, progress, isProcessing }) => {
+  if (!active) {
+    return null;
+  }
 
-    let message;
+  let message;
 
-    if (isProcessing) {
-      message = <FormattedMessage id='upload_progress.processing' defaultMessage='Processing…' />;
-    } else {
-      message = <FormattedMessage id='upload_progress.label' defaultMessage='Uploading…' />;
-    }
+  if (isProcessing) {
+    message = <FormattedMessage id='upload_progress.processing' defaultMessage='Processing…' />;
+  } else {
+    message = <FormattedMessage id='upload_progress.label' defaultMessage='Uploading…' />;
+  }
 
-    return (
-      <div className='upload-progress'>
-        <Icon id='upload' icon={UploadFileIcon} />
+  return (
+    <div className='upload-progress'>
+      <Icon id='upload' icon={UploadFileIcon} />
 
-        <div className='upload-progress__message'>
-          {message}
+      <div className='upload-progress__message'>
+        {message}
 
-          <div className='upload-progress__backdrop'>
-            <Motion defaultStyle={{ width: 0 }} style={{ width: spring(progress) }}>
-              {({ width }) =>
-                <div className='upload-progress__tracker' style={{ width: `${width}%` }} />
-              }
-            </Motion>
-          </div>
+        <div className='upload-progress__backdrop'>
+          <Motion defaultStyle={{ width: 0 }} style={{ width: spring(progress) }}>
+            {({ width }) =>
+              <div className='upload-progress__tracker' style={{ width: `${width}%` }} />
+            }
+          </Motion>
         </div>
       </div>
-    );
-  }
-
-}
+    </div>
+  );
+};
+
+UploadProgress.propTypes = {
+  active: PropTypes.bool,
+  progress: PropTypes.number,
+  isProcessing: PropTypes.bool,
+};
diff --git a/app/javascript/mastodon/features/compose/containers/upload_container.js b/app/javascript/mastodon/features/compose/containers/upload_container.js
deleted file mode 100644
index a17a6914448b8a..00000000000000
--- a/app/javascript/mastodon/features/compose/containers/upload_container.js
+++ /dev/null
@@ -1,27 +0,0 @@
-import { connect } from 'react-redux';
-
-import { undoUploadCompose, initMediaEditModal, submitCompose } from '../../../actions/compose';
-import Upload from '../components/upload';
-
-const mapStateToProps = (state, { id }) => ({
-  media: state.getIn(['compose', 'media_attachments']).find(item => item.get('id') === id),
-  sensitive: state.getIn(['compose', 'spoiler']),
-});
-
-const mapDispatchToProps = dispatch => ({
-
-  onUndo: id => {
-    dispatch(undoUploadCompose(id));
-  },
-
-  onOpenFocalPoint: id => {
-    dispatch(initMediaEditModal(id));
-  },
-
-  onSubmit (router) {
-    dispatch(submitCompose(router));
-  },
-
-});
-
-export default connect(mapStateToProps, mapDispatchToProps)(Upload);
diff --git a/app/javascript/mastodon/features/compose/containers/upload_form_container.js b/app/javascript/mastodon/features/compose/containers/upload_form_container.js
deleted file mode 100644
index 336525cf5399d6..00000000000000
--- a/app/javascript/mastodon/features/compose/containers/upload_form_container.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import { connect } from 'react-redux';
-
-import UploadForm from '../components/upload_form';
-
-const mapStateToProps = state => ({
-  mediaIds: state.getIn(['compose', 'media_attachments']).map(item => item.get('id')),
-});
-
-export default connect(mapStateToProps)(UploadForm);
diff --git a/app/javascript/mastodon/features/compose/containers/upload_progress_container.js b/app/javascript/mastodon/features/compose/containers/upload_progress_container.js
deleted file mode 100644
index ffff321c3fcdf1..00000000000000
--- a/app/javascript/mastodon/features/compose/containers/upload_progress_container.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import { connect } from 'react-redux';
-
-import UploadProgress from '../components/upload_progress';
-
-const mapStateToProps = state => ({
-  active: state.getIn(['compose', 'is_uploading']),
-  progress: state.getIn(['compose', 'progress']),
-  isProcessing: state.getIn(['compose', 'is_processing']),
-});
-
-export default connect(mapStateToProps)(UploadProgress);
diff --git a/app/javascript/mastodon/features/ui/components/focal_point_modal.jsx b/app/javascript/mastodon/features/ui/components/focal_point_modal.jsx
index 5f430d53923b1b..7adfc208e7251a 100644
--- a/app/javascript/mastodon/features/ui/components/focal_point_modal.jsx
+++ b/app/javascript/mastodon/features/ui/components/focal_point_modal.jsx
@@ -22,7 +22,7 @@ import { GIFV } from 'mastodon/components/gifv';
 import { IconButton } from 'mastodon/components/icon_button';
 import Audio from 'mastodon/features/audio';
 import { CharacterCounter } from 'mastodon/features/compose/components/character_counter';
-import UploadProgress from 'mastodon/features/compose/components/upload_progress';
+import { UploadProgress } from 'mastodon/features/compose/components/upload_progress';
 import { Tesseract as fetchTesseract } from 'mastodon/features/ui/util/async-components';
 import { me } from 'mastodon/initial_state';
 import { assetHost } from 'mastodon/utils/config';
diff --git a/app/javascript/mastodon/reducers/compose.js b/app/javascript/mastodon/reducers/compose.js
index 8dc28018571224..97218e9f7505d1 100644
--- a/app/javascript/mastodon/reducers/compose.js
+++ b/app/javascript/mastodon/reducers/compose.js
@@ -45,6 +45,7 @@ import {
   INIT_MEDIA_EDIT_MODAL,
   COMPOSE_CHANGE_MEDIA_DESCRIPTION,
   COMPOSE_CHANGE_MEDIA_FOCUS,
+  COMPOSE_CHANGE_MEDIA_ORDER,
   COMPOSE_SET_STATUS,
   COMPOSE_FOCUS,
 } from '../actions/compose';
@@ -536,6 +537,14 @@ export default function compose(state = initialState, action) {
     return state.set('language', action.language);
   case COMPOSE_FOCUS:
     return state.set('focusDate', new Date()).update('text', text => text.length > 0 ? text : action.defaultText);
+  case COMPOSE_CHANGE_MEDIA_ORDER:
+    return state.update('media_attachments', list => {
+      const indexA = list.findIndex(x => x.get('id') === action.a);
+      const moveItem = list.get(indexA);
+      const indexB = list.findIndex(x => x.get('id') === action.b);
+
+      return list.splice(indexA, 1).splice(indexB, 0, moveItem);
+    });
   default:
     return state;
   }

From 799e3be9bdbb5b895b004a0c553954b3f104ace6 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 25 Mar 2024 12:07:38 +0100
Subject: [PATCH 0588/2191] New Crowdin Translations (automated) (#29726)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/ar.json    |  1 +
 app/javascript/mastodon/locales/be.json    |  4 ++
 app/javascript/mastodon/locales/da.json    |  4 +-
 app/javascript/mastodon/locales/de.json    |  2 +
 app/javascript/mastodon/locales/es-AR.json |  4 +-
 app/javascript/mastodon/locales/es-MX.json |  9 ++++
 app/javascript/mastodon/locales/es.json    |  9 ++++
 app/javascript/mastodon/locales/eu.json    |  2 +
 app/javascript/mastodon/locales/fa.json    |  2 +
 app/javascript/mastodon/locales/fi.json    |  2 +
 app/javascript/mastodon/locales/fo.json    |  2 +
 app/javascript/mastodon/locales/gd.json    |  6 +--
 app/javascript/mastodon/locales/he.json    |  2 +
 app/javascript/mastodon/locales/is.json    |  4 ++
 app/javascript/mastodon/locales/it.json    |  2 +
 app/javascript/mastodon/locales/ja.json    | 25 +++++++++++
 app/javascript/mastodon/locales/ko.json    |  1 +
 app/javascript/mastodon/locales/lt.json    |  3 ++
 app/javascript/mastodon/locales/nl.json    | 20 +++++----
 app/javascript/mastodon/locales/pl.json    |  9 ++++
 app/javascript/mastodon/locales/pt-PT.json |  9 ++++
 app/javascript/mastodon/locales/sk.json    |  3 ++
 app/javascript/mastodon/locales/sq.json    |  2 +
 app/javascript/mastodon/locales/sv.json    |  1 +
 app/javascript/mastodon/locales/th.json    |  9 ++++
 app/javascript/mastodon/locales/tr.json    |  2 +
 app/javascript/mastodon/locales/uk.json    |  2 +
 app/javascript/mastodon/locales/zh-CN.json |  2 +
 app/javascript/mastodon/locales/zh-HK.json |  9 ++++
 app/javascript/mastodon/locales/zh-TW.json |  2 +
 config/locales/be.yml                      |  8 ++++
 config/locales/devise.hu.yml               |  2 +-
 config/locales/doorkeeper.hu.yml           |  4 +-
 config/locales/es-AR.yml                   |  2 +-
 config/locales/es-MX.yml                   | 12 ++++++
 config/locales/es.yml                      | 12 ++++++
 config/locales/hu.yml                      | 48 +++++++++++-----------
 config/locales/is.yml                      |  3 ++
 config/locales/ja.yml                      |  3 ++
 config/locales/ko.yml                      |  2 +-
 config/locales/lt.yml                      | 19 ++++++---
 config/locales/pt-PT.yml                   | 12 ++++++
 config/locales/simple_form.hu.yml          | 12 +++---
 config/locales/simple_form.nl.yml          |  4 +-
 config/locales/th.yml                      | 11 +++++
 config/locales/zh-HK.yml                   | 13 ++++++
 46 files changed, 265 insertions(+), 56 deletions(-)

diff --git a/app/javascript/mastodon/locales/ar.json b/app/javascript/mastodon/locales/ar.json
index 747c47960fca68..62ac7739d382f0 100644
--- a/app/javascript/mastodon/locales/ar.json
+++ b/app/javascript/mastodon/locales/ar.json
@@ -89,6 +89,7 @@
   "announcement.announcement": "إعلان",
   "attachments_list.unprocessed": "(غير معالَج)",
   "audio.hide": "إخفاء المقطع الصوتي",
+  "block_modal.remote_users_caveat": "Do t’i kërkojmë shërbyesit {domain} të respektojë vendimin tuaj. Por, pajtimi s’është i garantuar, ngaqë disa shërbyes mund t’i trajtojnë ndryshe bllokimet. Psotimet publike mundet të jenë ende të dukshme për përdorues pa bërë hyrje në llogari.",
   "boost_modal.combo": "يُمكنك الضّغط على {combo} لتخطي هذا في المرة المُقبلة",
   "bundle_column_error.copy_stacktrace": "انسخ تقرير الخطأ",
   "bundle_column_error.error.body": "لا يمكن تقديم الصفحة المطلوبة. قد يكون بسبب خطأ في التعليمات البرمجية، أو مشكلة توافق المتصفح.",
diff --git a/app/javascript/mastodon/locales/be.json b/app/javascript/mastodon/locales/be.json
index 1ff94eca6c7096..754b7156b87e42 100644
--- a/app/javascript/mastodon/locales/be.json
+++ b/app/javascript/mastodon/locales/be.json
@@ -471,6 +471,7 @@
   "notification.own_poll": "Ваша апытанне скончылася",
   "notification.poll": "Апытанне, дзе вы прынялі ўдзел, скончылася",
   "notification.reblog": "{name} пашырыў ваш допіс",
+  "notification.severed_relationships": "Зносіны з {name} былі разарваныя",
   "notification.status": "Новы допіс ад {name}",
   "notification.update": "Допіс {name} адрэдагаваны",
   "notification_requests.accept": "Прыняць",
@@ -483,6 +484,7 @@
   "notifications.column_settings.admin.sign_up": "Новыя ўваходы:",
   "notifications.column_settings.alert": "Апавяшчэнні на працоўным стале",
   "notifications.column_settings.favourite": "Упадабанае:",
+  "notifications.column_settings.filter_bar.advanced": "Паказаць усе катэгорыі",
   "notifications.column_settings.follow": "Новыя падпісчыкі:",
   "notifications.column_settings.follow_request": "Новыя запыты на падпіску:",
   "notifications.column_settings.mention": "Згадванні:",
@@ -587,6 +589,8 @@
   "refresh": "Абнавiць",
   "regeneration_indicator.label": "Загрузка…",
   "regeneration_indicator.sublabel": "Пачакайце, рыхтуем вашу стужку!",
+  "relationship_severance_notification.types.user_domain_block": "Вы заблакіравалі гэты дамен",
+  "relationship_severance_notification.view": "Праглядзець",
   "relative_time.days": "{number} д",
   "relative_time.full.days": "{number, plural, one {# дзень} few {# дні} many {# дзён} other {# дня}} таму",
   "relative_time.full.hours": "{number, plural, one {# гадзіна} few {# гадзіны} many {# гадзін} other {# гадзіны}} таму",
diff --git a/app/javascript/mastodon/locales/da.json b/app/javascript/mastodon/locales/da.json
index ca32ba298a7ad0..97468c6272d1c8 100644
--- a/app/javascript/mastodon/locales/da.json
+++ b/app/javascript/mastodon/locales/da.json
@@ -220,7 +220,7 @@
   "domain_pill.activitypub_lets_connect": "Det muliggør at komme i forbindelse og interagere med folk ikke kun på Mastodon, men også på tværs af forskellige sociale apps.",
   "domain_pill.activitypub_like_language": "ActivityPub er \"sproget\", Mastodon taler med andre sociale netværk.",
   "domain_pill.server": "Server",
-  "domain_pill.their_handle": "Deres handle:",
+  "domain_pill.their_handle": "Vedkommendes handle:",
   "domain_pill.username": "Brugernavn",
   "domain_pill.whats_in_a_handle": "Hvad er der i et handle (@brugernavn)?",
   "domain_pill.who_they_are": "Da et handle fortæller, hvem nogen er, og hvor de er, kan man interagere med folk på tværs af det sociale net af <button>ActivityPub-drevne platforme</button>.",
@@ -481,6 +481,8 @@
   "notifications.column_settings.admin.sign_up": "Nye tilmeldinger:",
   "notifications.column_settings.alert": "Computernotifikationer",
   "notifications.column_settings.favourite": "Favoritter:",
+  "notifications.column_settings.filter_bar.advanced": "Vis alle kategorier",
+  "notifications.column_settings.filter_bar.category": "Hurtigfiltreringsbjælke",
   "notifications.column_settings.follow": "Nye følgere:",
   "notifications.column_settings.follow_request": "Nye følgeanmodninger:",
   "notifications.column_settings.mention": "Omtaler:",
diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json
index bed336f76b35a0..8cc77c0725a1f1 100644
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@@ -484,6 +484,8 @@
   "notifications.column_settings.admin.sign_up": "Neue Registrierungen:",
   "notifications.column_settings.alert": "Desktop-Benachrichtigungen",
   "notifications.column_settings.favourite": "Favoriten:",
+  "notifications.column_settings.filter_bar.advanced": "Alle Filterkategorien anzeigen",
+  "notifications.column_settings.filter_bar.category": "Filterleiste",
   "notifications.column_settings.follow": "Neue Follower:",
   "notifications.column_settings.follow_request": "Neue Follower-Anfragen:",
   "notifications.column_settings.mention": "Erwähnungen:",
diff --git a/app/javascript/mastodon/locales/es-AR.json b/app/javascript/mastodon/locales/es-AR.json
index fec707be6236a7..a9db8831e2914d 100644
--- a/app/javascript/mastodon/locales/es-AR.json
+++ b/app/javascript/mastodon/locales/es-AR.json
@@ -427,7 +427,7 @@
   "loading_indicator.label": "Cargando…",
   "media_gallery.toggle_visible": "Ocultar {number, plural, one {imagen} other {imágenes}}",
   "moved_to_account_banner.text": "Tu cuenta {disabledAccount} está actualmente deshabilitada porque te mudaste a {movedToAccount}.",
-  "mute_modal.hide_from_notifications": "Ocultar de las notificaciones",
+  "mute_modal.hide_from_notifications": "Ocultar en las notificaciones",
   "mute_modal.hide_options": "Ocultar opciones",
   "mute_modal.indefinite": "Hasta que deje de silenciarlos",
   "mute_modal.show_options": "Mostrar opciones",
@@ -484,6 +484,8 @@
   "notifications.column_settings.admin.sign_up": "Nuevos registros:",
   "notifications.column_settings.alert": "Notificaciones de escritorio",
   "notifications.column_settings.favourite": "Favoritos:",
+  "notifications.column_settings.filter_bar.advanced": "Mostrar todas las categorías",
+  "notifications.column_settings.filter_bar.category": "Barra de filtrado rápido",
   "notifications.column_settings.follow": "Nuevos seguidores:",
   "notifications.column_settings.follow_request": "Nuevas solicitudes de seguimiento:",
   "notifications.column_settings.mention": "Menciones:",
diff --git a/app/javascript/mastodon/locales/es-MX.json b/app/javascript/mastodon/locales/es-MX.json
index 00dcb81461ab13..dea71a93513b6e 100644
--- a/app/javascript/mastodon/locales/es-MX.json
+++ b/app/javascript/mastodon/locales/es-MX.json
@@ -471,6 +471,7 @@
   "notification.own_poll": "Tu encuesta ha terminado",
   "notification.poll": "Una encuesta en la que has votado ha terminado",
   "notification.reblog": "{name} ha retooteado tu estado",
+  "notification.severed_relationships": "Se han cortado las relaciones con {name}",
   "notification.status": "{name} acaba de publicar",
   "notification.update": "{name} editó una publicación",
   "notification_requests.accept": "Aceptar",
@@ -483,6 +484,8 @@
   "notifications.column_settings.admin.sign_up": "Registros nuevos:",
   "notifications.column_settings.alert": "Notificaciones de escritorio",
   "notifications.column_settings.favourite": "Favoritos:",
+  "notifications.column_settings.filter_bar.advanced": "Mostrar todas las categorías",
+  "notifications.column_settings.filter_bar.category": "Barra de filtrado rápido",
   "notifications.column_settings.follow": "Nuevos seguidores:",
   "notifications.column_settings.follow_request": "Nuevas solicitudes de seguimiento:",
   "notifications.column_settings.mention": "Menciones:",
@@ -587,6 +590,12 @@
   "refresh": "Actualizar",
   "regeneration_indicator.label": "Cargando…",
   "regeneration_indicator.sublabel": "¡Tu historia de inicio se está preparando!",
+  "relationship_severance_notification.purged_data": "purgado por administradores",
+  "relationship_severance_notification.relationships": "{count, plural, one {# relación} other {# relaciones}}",
+  "relationship_severance_notification.types.account_suspension": "La cuenta ha sido suspendida",
+  "relationship_severance_notification.types.domain_block": "El dominio ha sido suspendido",
+  "relationship_severance_notification.types.user_domain_block": "Bloqueaste este dominio",
+  "relationship_severance_notification.view": "Ver",
   "relative_time.days": "{number} d",
   "relative_time.full.days": "{number, plural, one {# día} other {# días hace}}",
   "relative_time.full.hours": "{number, plural, one {# hora} other {# horas}} hace",
diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json
index 728f4d05fc11f2..64bcf7d9c0f70b 100644
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@@ -471,6 +471,7 @@
   "notification.own_poll": "Tu encuesta ha terminado",
   "notification.poll": "Una encuesta en la que has votado ha terminado",
   "notification.reblog": "{name} ha impulsado tu publicación",
+  "notification.severed_relationships": "Se han cortado las relaciones con {name}",
   "notification.status": "{name} acaba de publicar",
   "notification.update": "{name} editó una publicación",
   "notification_requests.accept": "Aceptar",
@@ -483,6 +484,8 @@
   "notifications.column_settings.admin.sign_up": "Nuevos registros:",
   "notifications.column_settings.alert": "Notificaciones de escritorio",
   "notifications.column_settings.favourite": "Favoritos:",
+  "notifications.column_settings.filter_bar.advanced": "Mostrar todas las categorías",
+  "notifications.column_settings.filter_bar.category": "Barra de filtrado rápido",
   "notifications.column_settings.follow": "Nuevos seguidores:",
   "notifications.column_settings.follow_request": "Nuevas solicitudes de seguimiento:",
   "notifications.column_settings.mention": "Menciones:",
@@ -587,6 +590,12 @@
   "refresh": "Actualizar",
   "regeneration_indicator.label": "Cargando…",
   "regeneration_indicator.sublabel": "¡Tu historia de inicio se está preparando!",
+  "relationship_severance_notification.purged_data": "purgado por administradores",
+  "relationship_severance_notification.relationships": "{count, plural, one {# relación} other {# relaciones}}",
+  "relationship_severance_notification.types.account_suspension": "La cuenta ha sido suspendida",
+  "relationship_severance_notification.types.domain_block": "El dominio ha sido suspendido",
+  "relationship_severance_notification.types.user_domain_block": "Bloqueaste este dominio",
+  "relationship_severance_notification.view": "Ver",
   "relative_time.days": "{number} d",
   "relative_time.full.days": "hace {number, plural, one {# día} other {# días}}",
   "relative_time.full.hours": "hace {number, plural, one {# hora} other {# horas}}",
diff --git a/app/javascript/mastodon/locales/eu.json b/app/javascript/mastodon/locales/eu.json
index bd0081d71a5c08..8c3c5f98456a31 100644
--- a/app/javascript/mastodon/locales/eu.json
+++ b/app/javascript/mastodon/locales/eu.json
@@ -484,6 +484,8 @@
   "notifications.column_settings.admin.sign_up": "Izen-emate berriak:",
   "notifications.column_settings.alert": "Mahaigaineko jakinarazpenak",
   "notifications.column_settings.favourite": "Gogokoak:",
+  "notifications.column_settings.filter_bar.advanced": "Bistaratu kategoria guztiak",
+  "notifications.column_settings.filter_bar.category": "Iragazki-barra bizkorra",
   "notifications.column_settings.follow": "Jarraitzaile berriak:",
   "notifications.column_settings.follow_request": "Jarraitzeko eskaera berriak:",
   "notifications.column_settings.mention": "Aipamenak:",
diff --git a/app/javascript/mastodon/locales/fa.json b/app/javascript/mastodon/locales/fa.json
index b784a1d5c0593a..6d6b7d612caea0 100644
--- a/app/javascript/mastodon/locales/fa.json
+++ b/app/javascript/mastodon/locales/fa.json
@@ -462,6 +462,8 @@
   "notifications.permission_denied": "آگاهی‌های میزکار به دلیل رد کردن درخواست اجازهٔ پیشین مرورگر، در دسترس نیستند",
   "notifications.permission_denied_alert": "از آن‌جا که پیش از این اجازهٔ مرورگر رد شده است، آگاهی‌های میزکار نمی‌توانند به کار بیفتند",
   "notifications.permission_required": "آگاهی‌های میزکار در دسترس نیستند زیرا اجازه‌های لازم، اعطا نشده.",
+  "notifications.policy.filter_not_followers_title": "کسانی که شما را دنبال میکنند",
+  "notifications.policy.filter_not_following_hint": "",
   "notifications_permission_banner.enable": "به کار انداختن آگاهی‌های میزکار",
   "notifications_permission_banner.how_to_control": "برای دریافت آگاهی‌ها هنگام باز نبودن ماستودون، آگاهی‌های میزکار را به کار بیندازید. پس از به کار افتادنشان می‌توانید گونه‌های دقیق برهم‌کنش‌هایی که آگاهی‌های میزکار تولید می‌کنند را از {icon} بالا واپایید.",
   "notifications_permission_banner.title": "هرگز چیزی را از دست ندهید",
diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index 2cf85926fc8de0..16670d9ffed4d3 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -484,6 +484,8 @@
   "notifications.column_settings.admin.sign_up": "Uudet rekisteröitymiset:",
   "notifications.column_settings.alert": "Työpöytäilmoitukset",
   "notifications.column_settings.favourite": "Suosikit:",
+  "notifications.column_settings.filter_bar.advanced": "Näytä kaikki luokat",
+  "notifications.column_settings.filter_bar.category": "Pikasuodatuspalkki",
   "notifications.column_settings.follow": "Uudet seuraajat:",
   "notifications.column_settings.follow_request": "Uudet seuraamispyynnöt:",
   "notifications.column_settings.mention": "Maininnat:",
diff --git a/app/javascript/mastodon/locales/fo.json b/app/javascript/mastodon/locales/fo.json
index 3ea13cc7f0947c..c86829ee30ca84 100644
--- a/app/javascript/mastodon/locales/fo.json
+++ b/app/javascript/mastodon/locales/fo.json
@@ -484,6 +484,8 @@
   "notifications.column_settings.admin.sign_up": "Nýggjar tilmeldingar:",
   "notifications.column_settings.alert": "Skriviborðsfráboðanir",
   "notifications.column_settings.favourite": "Dámdir postar:",
+  "notifications.column_settings.filter_bar.advanced": "Vís allar bólkar",
+  "notifications.column_settings.filter_bar.category": "Skjótfilturbjálki",
   "notifications.column_settings.follow": "Nýggir fylgjarar:",
   "notifications.column_settings.follow_request": "Nýggjar umbønir um at fylgja:",
   "notifications.column_settings.mention": "Umrøður:",
diff --git a/app/javascript/mastodon/locales/gd.json b/app/javascript/mastodon/locales/gd.json
index 9c566909a7910f..612e3637749e9f 100644
--- a/app/javascript/mastodon/locales/gd.json
+++ b/app/javascript/mastodon/locales/gd.json
@@ -701,10 +701,10 @@
   "status.direct_indicator": "Iomradh prìobhaideach",
   "status.edit": "Deasaich",
   "status.edited": "An deasachadh mu dheireadh {date}",
-  "status.edited_x_times": "Chaidh a dheasachadh {count, plural, one {{counter} turas} two {{counter} thuras} few {{counter} tursan} other {{counter} turas}}",
+  "status.edited_x_times": "Chaidh a dheasachadh {count, plural, one {{count} turas} two {{count} thuras} few {{count} tursan} other {{count} turas}}",
   "status.embed": "Leabaich",
   "status.favourite": "Cuir ris na h-annsachdan",
-  "status.favourites": "{count, plural, one {annsachd} two {annsachd} few {annsachdan} other {annsachd}",
+  "status.favourites": "{count, plural, one {annsachd} two {annsachd} few {annsachdan} other {annsachd}}",
   "status.filter": "Criathraich am post seo",
   "status.filtered": "Criathraichte",
   "status.hide": "Falaich am post",
@@ -725,7 +725,7 @@
   "status.reblog": "Brosnaich",
   "status.reblog_private": "Brosnaich leis an t-so-fhaicsinneachd tùsail",
   "status.reblogged_by": "’Ga bhrosnachadh le {name}",
-  "status.reblogs": "{count, plural, one {bhrosnachadh} two {bhrosnachadh} few {brosnachaidhean} other {brosnachadh}",
+  "status.reblogs": "{count, plural, one {bhrosnachadh} two {bhrosnachadh} few {brosnachaidhean} other {brosnachadh}}",
   "status.reblogs.empty": "Chan deach am post seo a bhrosnachadh le duine sam bith fhathast. Nuair a bhrosnaicheas cuideigin e, nochdaidh iad an-seo.",
   "status.redraft": "Sguab às ⁊ dèan dreachd ùr",
   "status.remove_bookmark": "Thoir an comharra-lìn air falbh",
diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json
index 1f65c3549dba65..82dec2d863ebde 100644
--- a/app/javascript/mastodon/locales/he.json
+++ b/app/javascript/mastodon/locales/he.json
@@ -484,6 +484,8 @@
   "notifications.column_settings.admin.sign_up": "הרשמות חדשות:",
   "notifications.column_settings.alert": "התראות לשולחן העבודה",
   "notifications.column_settings.favourite": "חיבובים:",
+  "notifications.column_settings.filter_bar.advanced": "להציג את כל הקטגוריות",
+  "notifications.column_settings.filter_bar.category": "שורת סינון מהיר",
   "notifications.column_settings.follow": "עוקבים חדשים:",
   "notifications.column_settings.follow_request": "בקשות מעקב חדשות:",
   "notifications.column_settings.mention": "פניות:",
diff --git a/app/javascript/mastodon/locales/is.json b/app/javascript/mastodon/locales/is.json
index d050aa03116b60..b65df2fc51cf52 100644
--- a/app/javascript/mastodon/locales/is.json
+++ b/app/javascript/mastodon/locales/is.json
@@ -483,6 +483,8 @@
   "notifications.column_settings.admin.sign_up": "Nýjar skráningar:",
   "notifications.column_settings.alert": "Tilkynningar á skjáborði",
   "notifications.column_settings.favourite": "Eftirlæti:",
+  "notifications.column_settings.filter_bar.advanced": "Birta alla flokka",
+  "notifications.column_settings.filter_bar.category": "Skyndisíustika",
   "notifications.column_settings.follow": "Nýir fylgjendur:",
   "notifications.column_settings.follow_request": "Nýjar beiðnir um að fylgjast með:",
   "notifications.column_settings.mention": "Tilvísanir:",
@@ -587,6 +589,8 @@
   "refresh": "Endurlesa",
   "regeneration_indicator.label": "Hleð inn…",
   "regeneration_indicator.sublabel": "Verið er að útbúa heimastreymið þitt!",
+  "relationship_severance_notification.relationships": "{count, plural, one {# tengsl} other {# tengsl}}",
+  "relationship_severance_notification.view": "Skoða",
   "relative_time.days": "{number}d",
   "relative_time.full.days": "Fyrir {number, plural, one {# degi} other {# dögum}} síðan",
   "relative_time.full.hours": "Fyrir {number, plural, one {# klukkustund} other {# klukkustundum}} síðan",
diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json
index 7d5df9198d96c6..090278b83b161a 100644
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@@ -484,6 +484,8 @@
   "notifications.column_settings.admin.sign_up": "Nuove iscrizioni:",
   "notifications.column_settings.alert": "Notifiche desktop",
   "notifications.column_settings.favourite": "Preferiti:",
+  "notifications.column_settings.filter_bar.advanced": "Mostra tutte le categorie",
+  "notifications.column_settings.filter_bar.category": "Barra del filtro veloce",
   "notifications.column_settings.follow": "Nuovi seguaci:",
   "notifications.column_settings.follow_request": "Nuove richieste di seguirti:",
   "notifications.column_settings.mention": "Menzioni:",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index 66811eafd67b2f..1f1065f5fd2174 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -89,6 +89,14 @@
   "announcement.announcement": "お知らせ",
   "attachments_list.unprocessed": "(未処理)",
   "audio.hide": "音声を閉じる",
+  "block_modal.remote_users_caveat": "このサーバーはあなたのブロックの意思を尊重するように {domain} へ通知します。しかしながら、ブロックの扱い方はサーバーによってさまざまで、相手のサーバーは必ずしもこのブロックを適切に取り扱うものではないことに留意が必要です。また、あなたの公開投稿はサーバーからログアウトすれば誰からも見ることができます。",
+  "block_modal.show_less": "注意事項を閉じる",
+  "block_modal.show_more": "注意事項",
+  "block_modal.they_cant_mention": "相手はあなたへの返信やフォローができなくなります。",
+  "block_modal.they_cant_see_posts": "相手はあなたの投稿を閲覧できなくなり、あなたも相手の投稿を閲覧できなくなります。",
+  "block_modal.they_will_know": "ブロックは相手からわかります。",
+  "block_modal.title": "ユーザーをブロックしますか？",
+  "block_modal.you_wont_see_mentions": "宛先に相手が入っている投稿も閲覧できなくなります。",
   "boost_modal.combo": "次からは{combo}を押せばスキップできます",
   "bundle_column_error.copy_stacktrace": "エラーレポートをコピー",
   "bundle_column_error.error.body": "要求されたページをレンダリングできませんでした。コードのバグ、またはブラウザの互換性の問題が原因である可能性があります。",
@@ -200,6 +208,14 @@
   "dismissable_banner.explore_statuses": "ネットワーク上で注目を集めている投稿です。ブーストやお気に入り登録の多い新しい投稿が上位に表示されます。",
   "dismissable_banner.explore_tags": "ネットワーク上でトレンドになっているハッシュタグです。たくさんのユーザーに使われたタグほど上位に表示されます。",
   "dismissable_banner.public_timeline": "{domain}のユーザーがリモートフォローしているアカウントからの公開投稿のタイムラインです。",
+  "domain_block_modal.block": "サーバーをブロック",
+  "domain_block_modal.block_account_instead": "@{name} さんのみをブロック",
+  "domain_block_modal.they_can_interact_with_old_posts": "あなたの今までの投稿は、引き続きこのサーバーのユーザーが閲覧できます。",
+  "domain_block_modal.they_cant_follow": "このサーバーのユーザーはあなたをフォローできなくなります。",
+  "domain_block_modal.they_wont_know": "ドメインブロックは相手からはわかりません。",
+  "domain_block_modal.title": "ドメインをブロックしますか？",
+  "domain_block_modal.you_will_lose_followers": "このサーバーのフォロワーはすべてフォロー解除されます。",
+  "domain_block_modal.you_wont_see_posts": "このサーバーのユーザーからの投稿や通知が閲覧できなくなります。",
   "embed.instructions": "下記のコードをコピーしてウェブサイトに埋め込みます。",
   "embed.preview": "表示例:",
   "emoji_button.activity": "活動",
@@ -397,6 +413,15 @@
   "loading_indicator.label": "読み込み中…",
   "media_gallery.toggle_visible": "{number, plural, one {画像を閉じる} other {画像を閉じる}}",
   "moved_to_account_banner.text": "あなたのアカウント『{disabledAccount}』は『{movedToAccount}』に移動したため現在無効になっています。",
+  "mute_modal.hide_from_notifications": "通知をオフにする",
+  "mute_modal.hide_options": "オプションを閉じる",
+  "mute_modal.indefinite": "無期限",
+  "mute_modal.show_options": "オプションを表示",
+  "mute_modal.they_can_mention_and_follow": "相手はあなたへの返信やフォローができますが、あなたには見えません。",
+  "mute_modal.they_wont_know": "ミュートは相手からはわかりません。",
+  "mute_modal.title": "ユーザーをミュートしますか？",
+  "mute_modal.you_wont_see_mentions": "宛先に相手が入っている投稿も閲覧できなくなります。",
+  "mute_modal.you_wont_see_posts": "相手はあなたの投稿を今までどおり閲覧できますが、あなたは相手の投稿を閲覧できなくなります。",
   "navigation_bar.about": "概要",
   "navigation_bar.advanced_interface": "上級者向けUIに戻る",
   "navigation_bar.blocks": "ブロックしたユーザー",
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index da354f39101596..5553636f26740a 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -484,6 +484,7 @@
   "notifications.column_settings.admin.sign_up": "새로운 가입:",
   "notifications.column_settings.alert": "데스크탑 알림",
   "notifications.column_settings.favourite": "좋아요:",
+  "notifications.column_settings.filter_bar.advanced": "모든 범주 표시",
   "notifications.column_settings.follow": "새 팔로워:",
   "notifications.column_settings.follow_request": "새 팔로우 요청:",
   "notifications.column_settings.mention": "멘션:",
diff --git a/app/javascript/mastodon/locales/lt.json b/app/javascript/mastodon/locales/lt.json
index f9ef7e242c00e4..728485b2bc2348 100644
--- a/app/javascript/mastodon/locales/lt.json
+++ b/app/javascript/mastodon/locales/lt.json
@@ -555,6 +555,9 @@
   "refresh": "Atnaujinti",
   "regeneration_indicator.label": "Kraunama…",
   "regeneration_indicator.sublabel": "Ruošiamas tavo pagrindinis srautas!",
+  "relationship_severance_notification.relationships": "{count, plural, one {# santykis} few {# santykiai} many {# santykio} other {# santykių}}",
+  "relationship_severance_notification.types.user_domain_block": "Užblokavai šį domeną",
+  "relationship_severance_notification.view": "Peržiūrėti",
   "relative_time.days": "{number} d.",
   "relative_time.full.days": "prieš {number, plural, one {# dieną} few {# dienas} many {# dienos} other {# dienų}}",
   "relative_time.full.hours": "prieš {number, plural, one {# valandą} few {# valandas} many {# valandos} other {# valandų}}",
diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json
index 4be0808f2352c0..1e710bda45f2fc 100644
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@@ -205,10 +205,10 @@
   "disabled_account_banner.text": "Jouw account {disabledAccount} is momenteel uitgeschakeld.",
   "dismissable_banner.community_timeline": "Dit zijn de meest recente openbare berichten van accounts op {domain}. Je kunt onder 'instellingen > voorkeuren > overig' kiezen welke talen je wilt zien.",
   "dismissable_banner.dismiss": "Sluiten",
-  "dismissable_banner.explore_links": "Dit zijn nieuwsberichten die vandaag het meest op het sociale web worden gedeeld. Nieuwere nieuwsberichten die door meer verschillende mensen zijn geplaatst staan hoger op de lijst.",
-  "dismissable_banner.explore_statuses": "Dit zijn berichten op het sociale web die vandaag aan populariteit winnen. Nieuwere berichten met meer boosts en favorieten staan hoger.",
-  "dismissable_banner.explore_tags": "Deze hashtags winnen aan populariteit op het sociale web. Hashtags die door meer verschillende mensen worden gebruikt staan hoger.",
-  "dismissable_banner.public_timeline": "Dit zijn de meest recente openbare berichten van accounts op het sociale web die door mensen op {domain} worden gevolgd.",
+  "dismissable_banner.explore_links": "Dit zijn nieuwsberichten die vandaag het meest op het sociale web (fediverse) worden gedeeld. Nieuwere nieuwsberichten die door meer verschillende mensen zijn geplaatst staan hoger op de lijst.",
+  "dismissable_banner.explore_statuses": "Dit zijn berichten op het sociale web (fediverse) die vandaag aan populariteit winnen. Nieuwere berichten met meer boosts en favorieten staan hoger.",
+  "dismissable_banner.explore_tags": "Deze hashtags winnen aan populariteit op het sociale web (fediverse). Hashtags die door meer verschillende mensen worden gebruikt staan hoger.",
+  "dismissable_banner.public_timeline": "Dit zijn de meest recente openbare berichten van accounts op het sociale web (fediverse) die door mensen op {domain} worden gevolgd.",
   "domain_block_modal.block": "Server blokkeren",
   "domain_block_modal.block_account_instead": "In plaats hiervan {name} blokkeren",
   "domain_block_modal.they_can_interact_with_old_posts": "Mensen op deze server kunnen interactie hebben met jouw oude berichten.",
@@ -220,14 +220,14 @@
   "domain_pill.activitypub_lets_connect": "Het zorgt ervoor dat je niet alleen maar kunt verbinden en communiceren met mensen op Mastodon, maar ook met andere sociale apps.",
   "domain_pill.activitypub_like_language": "ActivityPub is de taal die Mastodon met andere sociale netwerken spreekt.",
   "domain_pill.server": "Server",
-  "domain_pill.their_handle": "Hun Mastodon-adres:",
+  "domain_pill.their_handle": "Hun fediverse-adres:",
   "domain_pill.their_server": "Hun digitale thuis, waar al hun berichten zich bevinden.",
   "domain_pill.their_username": "Hun unieke identificatie-adres op hun server. Het is mogelijk dat er gebruikers met dezelfde gebruikersnaam op verschillende servers te vinden zijn.",
   "domain_pill.username": "Gebruikersnaam",
-  "domain_pill.whats_in_a_handle": "Wat is een Mastodon-adres?",
-  "domain_pill.who_they_are": "Omdat je aan een Mastodon-adres kunt zien wie iemand is en waar die zich bevindt, kun je met mensen op het door <button>ActivityPub aangedreven</button> sociale web communiceren.",
-  "domain_pill.who_you_are": "Omdat je aan jouw Mastodon-adres kunt zien wie jij bent is en waar je je bevindt, kunnen mensen op het door <button>ActivityPub aangedreven</button> sociale web met jou communiceren.",
-  "domain_pill.your_handle": "Jouw Mastodon-adres:",
+  "domain_pill.whats_in_a_handle": "Wat is een fediverse-adres?",
+  "domain_pill.who_they_are": "Omdat je aan een fediverse-adres kunt zien wie iemand is en waar die zich bevindt, kun je met mensen op het door <button>ActivityPub aangedreven</button> sociale web (fediverse) communiceren.",
+  "domain_pill.who_you_are": "Omdat je aan jouw fediverse-adres kunt zien wie jij bent is en waar je je bevindt, kunnen mensen op het door <button>ActivityPub aangedreven</button> sociale web (fediverse) met jou communiceren.",
+  "domain_pill.your_handle": "Jouw fediverse-adres:",
   "domain_pill.your_server": "Jouw digitale thuis, waar al jouw berichten zich bevinden. Is deze server toch niet naar jouw wens? Dan kun je op elk moment naar een andere server verhuizen en ook jouw volgers overbrengen.",
   "domain_pill.your_username": "Jouw unieke identificatie-adres op deze server. Het is mogelijk dat er gebruikers met dezelfde gebruikersnaam op verschillende servers te vinden zijn.",
   "embed.instructions": "Embed dit bericht op jouw website door de onderstaande code te kopiëren.",
@@ -484,6 +484,8 @@
   "notifications.column_settings.admin.sign_up": "Nieuwe registraties:",
   "notifications.column_settings.alert": "Desktopmeldingen",
   "notifications.column_settings.favourite": "Favorieten:",
+  "notifications.column_settings.filter_bar.advanced": "Alle categorieën tonen",
+  "notifications.column_settings.filter_bar.category": "Snelle filterbalk",
   "notifications.column_settings.follow": "Nieuwe volgers:",
   "notifications.column_settings.follow_request": "Nieuw volgverzoek:",
   "notifications.column_settings.mention": "Vermeldingen:",
diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json
index 782ea9d76298f8..3ee134d6c5c524 100644
--- a/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@@ -471,6 +471,7 @@
   "notification.own_poll": "Twoje głosowanie zakończyło się",
   "notification.poll": "Głosowanie w którym brałeś(-aś) udział zakończyło się",
   "notification.reblog": "Twój post został podbity przez {name}",
+  "notification.severed_relationships": "Zerwano związki z {name}",
   "notification.status": "{name} opublikował(a) nowy wpis",
   "notification.update": "{name} edytował(a) post",
   "notification_requests.accept": "Akceptuj",
@@ -483,6 +484,8 @@
   "notifications.column_settings.admin.sign_up": "Nowe rejestracje:",
   "notifications.column_settings.alert": "Powiadomienia na pulpicie",
   "notifications.column_settings.favourite": "Ulubione:",
+  "notifications.column_settings.filter_bar.advanced": "Wyświetl wszystkie kategorie",
+  "notifications.column_settings.filter_bar.category": "Szybkie filtrowanie",
   "notifications.column_settings.follow": "Nowi obserwujący:",
   "notifications.column_settings.follow_request": "Nowe prośby o możliwość obserwacji:",
   "notifications.column_settings.mention": "Wspomnienia:",
@@ -587,6 +590,12 @@
   "refresh": "Odśwież",
   "regeneration_indicator.label": "Ładuję…",
   "regeneration_indicator.sublabel": "Twoja oś czasu jest przygotowywana!",
+  "relationship_severance_notification.purged_data": "wyczyszczone przez administratorów",
+  "relationship_severance_notification.relationships": "{count, plural, one {# związek} few {# związki} other {# związków}}",
+  "relationship_severance_notification.types.account_suspension": "Konto zostało zawieszone",
+  "relationship_severance_notification.types.domain_block": "Domena została zawieszona",
+  "relationship_severance_notification.types.user_domain_block": "Domena przez ciebie blokowana",
+  "relationship_severance_notification.view": "Pokaż",
   "relative_time.days": "{number} dni",
   "relative_time.full.days": "{number, plural, one {# dzień} few {# dni} many {# dni} other {# dni}} temu",
   "relative_time.full.hours": "{number, plural, one {# godzinę} few {# godziny} many {# godzin} other {# godzin}} temu",
diff --git a/app/javascript/mastodon/locales/pt-PT.json b/app/javascript/mastodon/locales/pt-PT.json
index d4b37ffe6d79df..6732973d5ab3df 100644
--- a/app/javascript/mastodon/locales/pt-PT.json
+++ b/app/javascript/mastodon/locales/pt-PT.json
@@ -471,6 +471,7 @@
   "notification.own_poll": "A sua votação terminou",
   "notification.poll": "Uma votação em que participaste chegou ao fim",
   "notification.reblog": "{name} reforçou a tua publicação",
+  "notification.severed_relationships": "Relações com {name} cessadas",
   "notification.status": "{name} acabou de publicar",
   "notification.update": "{name} editou uma publicação",
   "notification_requests.accept": "Aceitar",
@@ -483,6 +484,8 @@
   "notifications.column_settings.admin.sign_up": "Novas inscrições:",
   "notifications.column_settings.alert": "Notificações no ambiente de trabalho",
   "notifications.column_settings.favourite": "Favoritos:",
+  "notifications.column_settings.filter_bar.advanced": "Mostrar todas as categorias",
+  "notifications.column_settings.filter_bar.category": "Barra de filtros rápidos",
   "notifications.column_settings.follow": "Novos seguidores:",
   "notifications.column_settings.follow_request": "Novos pedidos de seguidor:",
   "notifications.column_settings.mention": "Menções:",
@@ -587,6 +590,12 @@
   "refresh": "Actualizar",
   "regeneration_indicator.label": "A carregar…",
   "regeneration_indicator.sublabel": "A tua página inicial está a ser preparada!",
+  "relationship_severance_notification.purged_data": "purgado pelos administradores",
+  "relationship_severance_notification.relationships": "{count, plural,one {# relação} other {# relações}}",
+  "relationship_severance_notification.types.account_suspension": "A conta foi suspensa",
+  "relationship_severance_notification.types.domain_block": "O domínio foi suspenso",
+  "relationship_severance_notification.types.user_domain_block": "Bloqueou este domínio",
+  "relationship_severance_notification.view": "Visualizar",
   "relative_time.days": "{number}d",
   "relative_time.full.days": "{number, plural,one {# dia} other {# dias}} atrás",
   "relative_time.full.hours": "{number, plural,one {# hora}other {# horas}} atrás",
diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json
index dd21d3030a0b94..0ab14756998ba3 100644
--- a/app/javascript/mastodon/locales/sk.json
+++ b/app/javascript/mastodon/locales/sk.json
@@ -406,6 +406,7 @@
   "loading_indicator.label": "Načítavanie…",
   "media_gallery.toggle_visible": "{number, plural, one {Skryť obrázok} other {Skryť obrázky}}",
   "moved_to_account_banner.text": "Váš účet {disabledAccount} je momentálne deaktivovaný, pretože ste sa presunuli na {movedToAccount}.",
+  "mute_modal.hide_from_notifications": "Ukryť z upozornení",
   "mute_modal.hide_options": "Skryť možnosti",
   "mute_modal.show_options": "Zobraziť možnosti",
   "mute_modal.title": "Stíšiť užívateľa?",
@@ -456,6 +457,7 @@
   "notifications.column_settings.admin.sign_up": "Nové registrácie:",
   "notifications.column_settings.alert": "Upozornenia na ploche",
   "notifications.column_settings.favourite": "Ohviezdičkované:",
+  "notifications.column_settings.filter_bar.advanced": "Zobraziť všetky kategórie",
   "notifications.column_settings.follow": "Nové sledovania od:",
   "notifications.column_settings.follow_request": "Nové žiadosti o sledovanie od:",
   "notifications.column_settings.mention": "Označenia:",
@@ -555,6 +557,7 @@
   "refresh": "Obnoviť",
   "regeneration_indicator.label": "Načítavanie…",
   "regeneration_indicator.sublabel": "Váš domovský kanál sa pripravuje.",
+  "relationship_severance_notification.types.user_domain_block": "Túto doménu si zablokoval/a",
   "relationship_severance_notification.view": "Zobraziť",
   "relative_time.days": "{number} dní",
   "relative_time.full.days": "Pred {number, plural, one {# dňom} other {# dňami}}",
diff --git a/app/javascript/mastodon/locales/sq.json b/app/javascript/mastodon/locales/sq.json
index a5122d098b0393..d69231d8237247 100644
--- a/app/javascript/mastodon/locales/sq.json
+++ b/app/javascript/mastodon/locales/sq.json
@@ -483,6 +483,8 @@
   "notifications.column_settings.admin.sign_up": "Regjistrime të reja:",
   "notifications.column_settings.alert": "Njoftime desktopi",
   "notifications.column_settings.favourite": "Të parapëlqyer:",
+  "notifications.column_settings.filter_bar.advanced": "Shfaq krejt kategoritë",
+  "notifications.column_settings.filter_bar.category": "Shtyllë filtrimesh të shpejta",
   "notifications.column_settings.follow": "Ndjekës të rinj:",
   "notifications.column_settings.follow_request": "Kërkesa të reja për ndjekje:",
   "notifications.column_settings.mention": "Përmendje:",
diff --git a/app/javascript/mastodon/locales/sv.json b/app/javascript/mastodon/locales/sv.json
index 016007f4997417..b28b4826d47d92 100644
--- a/app/javascript/mastodon/locales/sv.json
+++ b/app/javascript/mastodon/locales/sv.json
@@ -471,6 +471,7 @@
   "notifications.column_settings.admin.sign_up": "Nya registreringar:",
   "notifications.column_settings.alert": "Skrivbordsaviseringar",
   "notifications.column_settings.favourite": "Favoriter:",
+  "notifications.column_settings.filter_bar.advanced": "Visa alla kategorier",
   "notifications.column_settings.follow": "Nya följare:",
   "notifications.column_settings.follow_request": "Ny följ-förfrågan:",
   "notifications.column_settings.mention": "Omnämningar:",
diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json
index ce3b4eaa256bc1..4490f038ca8681 100644
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@@ -471,6 +471,7 @@
   "notification.own_poll": "การสำรวจความคิดเห็นของคุณได้สิ้นสุดแล้ว",
   "notification.poll": "การสำรวจความคิดเห็นที่คุณได้ลงคะแนนได้สิ้นสุดแล้ว",
   "notification.reblog": "{name} ได้ดันโพสต์ของคุณ",
+  "notification.severed_relationships": "ตัดขาดความสัมพันธ์กับ {name} แล้ว",
   "notification.status": "{name} เพิ่งโพสต์",
   "notification.update": "{name} ได้แก้ไขโพสต์",
   "notification_requests.accept": "ยอมรับ",
@@ -483,6 +484,8 @@
   "notifications.column_settings.admin.sign_up": "การลงทะเบียนใหม่:",
   "notifications.column_settings.alert": "การแจ้งเตือนบนเดสก์ท็อป",
   "notifications.column_settings.favourite": "รายการโปรด:",
+  "notifications.column_settings.filter_bar.advanced": "แสดงหมวดหมู่ทั้งหมด",
+  "notifications.column_settings.filter_bar.category": "แถบตัวกรองด่วน",
   "notifications.column_settings.follow": "ผู้ติดตามใหม่:",
   "notifications.column_settings.follow_request": "คำขอติดตามใหม่:",
   "notifications.column_settings.mention": "การกล่าวถึง:",
@@ -587,6 +590,12 @@
   "refresh": "รีเฟรช",
   "regeneration_indicator.label": "กำลังโหลด…",
   "regeneration_indicator.sublabel": "กำลังเตรียมฟีดหน้าแรกของคุณ!",
+  "relationship_severance_notification.purged_data": "ล้างข้อมูลโดยผู้ดูแล",
+  "relationship_severance_notification.relationships": "{count, plural, other {# ความสัมพันธ์}}",
+  "relationship_severance_notification.types.account_suspension": "ระงับบัญชีแล้ว",
+  "relationship_severance_notification.types.domain_block": "ระงับโดเมนแล้ว",
+  "relationship_severance_notification.types.user_domain_block": "คุณได้ปิดกั้นโดเมนนี้",
+  "relationship_severance_notification.view": "ดู",
   "relative_time.days": "{number} วัน",
   "relative_time.full.days": "{number, plural, other {# วัน}}ที่แล้ว",
   "relative_time.full.hours": "{number, plural, other {# ชั่วโมง}}ที่แล้ว",
diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json
index 799400ea35db0c..12d82c70ecc38d 100644
--- a/app/javascript/mastodon/locales/tr.json
+++ b/app/javascript/mastodon/locales/tr.json
@@ -484,6 +484,8 @@
   "notifications.column_settings.admin.sign_up": "Yeni kayıtlar:",
   "notifications.column_settings.alert": "Masaüstü bildirimleri",
   "notifications.column_settings.favourite": "Favorilerin:",
+  "notifications.column_settings.filter_bar.advanced": "Tüm kategorileri görüntüle",
+  "notifications.column_settings.filter_bar.category": "Hızlı filtre çubuğu",
   "notifications.column_settings.follow": "Yeni takipçiler:",
   "notifications.column_settings.follow_request": "Yeni takip istekleri:",
   "notifications.column_settings.mention": "Değinmeler:",
diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json
index 3456327a676ba6..f2e58f09374c52 100644
--- a/app/javascript/mastodon/locales/uk.json
+++ b/app/javascript/mastodon/locales/uk.json
@@ -473,6 +473,8 @@
   "notifications.column_settings.admin.sign_up": "Нові реєстрації:",
   "notifications.column_settings.alert": "Сповіщення стільниці",
   "notifications.column_settings.favourite": "Уподобане:",
+  "notifications.column_settings.filter_bar.advanced": "Показати всі категорії",
+  "notifications.column_settings.filter_bar.category": "Панель швидкого фільтру",
   "notifications.column_settings.follow": "Нові підписники:",
   "notifications.column_settings.follow_request": "Нові запити на підписку:",
   "notifications.column_settings.mention": "Згадки:",
diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json
index cc68ab762f749e..52a98d0005d6aa 100644
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@@ -484,6 +484,8 @@
   "notifications.column_settings.admin.sign_up": "新注册：",
   "notifications.column_settings.alert": "桌面通知",
   "notifications.column_settings.favourite": "喜欢：",
+  "notifications.column_settings.filter_bar.advanced": "显示所有类别",
+  "notifications.column_settings.filter_bar.category": "快速筛选栏",
   "notifications.column_settings.follow": "新粉丝：",
   "notifications.column_settings.follow_request": "新关注请求：",
   "notifications.column_settings.mention": "提及：",
diff --git a/app/javascript/mastodon/locales/zh-HK.json b/app/javascript/mastodon/locales/zh-HK.json
index 44a1435b2f3747..68be293df92fdd 100644
--- a/app/javascript/mastodon/locales/zh-HK.json
+++ b/app/javascript/mastodon/locales/zh-HK.json
@@ -471,6 +471,7 @@
   "notification.own_poll": "你的投票已結束",
   "notification.poll": "你參與過的一個投票已經結束",
   "notification.reblog": "{name} 轉推你的文章",
+  "notification.severed_relationships": "已斷絕與 {name} 的關係",
   "notification.status": "{name} 剛發表了文章",
   "notification.update": "{name} 編輯了帖文",
   "notification_requests.accept": "接受",
@@ -587,6 +588,12 @@
   "refresh": "重新整理",
   "regeneration_indicator.label": "載入中……",
   "regeneration_indicator.sublabel": "你的主頁時間軸正在準備中！",
+  "relationship_severance_notification.purged_data": "已被管理員清除",
+  "relationship_severance_notification.relationships": "{count, plural, one {# 個關係} other {# 個關係}}",
+  "relationship_severance_notification.types.account_suspension": "帳號已被停權",
+  "relationship_severance_notification.types.domain_block": "網域已被停權",
+  "relationship_severance_notification.types.user_domain_block": "你封鎖了此網域",
+  "relationship_severance_notification.view": "查看",
   "relative_time.days": "{number}日前",
   "relative_time.full.days": "{number, plural, one {# 天} other {# 天}}前",
   "relative_time.full.hours": "{number, plural, one {# 小時} other {# 小時}}前",
@@ -697,6 +704,7 @@
   "status.edited_x_times": "Edited {count, plural, one {{count} 次} other {{count} 次}}",
   "status.embed": "嵌入",
   "status.favourite": "最愛",
+  "status.favourites": "{count, plural, one {則最愛} other {則最愛}}",
   "status.filter": "篩選此帖文",
   "status.filtered": "已過濾",
   "status.hide": "隱藏帖文",
@@ -717,6 +725,7 @@
   "status.reblog": "轉推",
   "status.reblog_private": "轉推到原讀者",
   "status.reblogged_by": "{name} 轉推",
+  "status.reblogs": "{count, plural, one {則轉推} other {則轉推}}",
   "status.reblogs.empty": "還未有人轉推。有的話會顯示在這裡。",
   "status.redraft": "刪除並編輯",
   "status.remove_bookmark": "移除書籤",
diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json
index 228430dd8045b7..d8e1e1e32b39a5 100644
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@@ -484,6 +484,8 @@
   "notifications.column_settings.admin.sign_up": "新註冊帳號：",
   "notifications.column_settings.alert": "桌面通知",
   "notifications.column_settings.favourite": "最愛：",
+  "notifications.column_settings.filter_bar.advanced": "顯示所有分類",
+  "notifications.column_settings.filter_bar.category": "快速過濾器",
   "notifications.column_settings.follow": "新的跟隨者：",
   "notifications.column_settings.follow_request": "新的跟隨請求：",
   "notifications.column_settings.mention": "提及：",
diff --git a/config/locales/be.yml b/config/locales/be.yml
index 63f605e9fbbfc0..cdfc9cb39c0f80 100644
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -1712,6 +1712,14 @@ be:
     strikes: Папярэджанні мадэратараў
     two_factor_authentication: Двухфактарная аўтэнтыфікацыя
     webauthn_authentication: Ключы бяспекі
+  severed_relationships:
+    download: Спампаваць (%{count})
+    event_type:
+      user_domain_block: Вы заблакіравалі %{target_name}
+    lost_followers: Страчаныя падпісчыкі
+    lost_follows: Страчаныя падпіскі
+    preamble: Вы можаце страціць падпіскі і падпісчыкаў, калі заблакіруеце дамен або калі вашы мадэратары вырашаць прыпыніць зносіны з серверам. Калі гэта адбудзецца, вы зможаце загрузіць спіс страчаных зносін, каб праверыць іх і, магчыма, імпартаваць на іншы сервер.
+    type: Падзея
   statuses:
     attached:
       audio:
diff --git a/config/locales/devise.hu.yml b/config/locales/devise.hu.yml
index 8c9fdf6a5037ad..459bd01d9d1c51 100644
--- a/config/locales/devise.hu.yml
+++ b/config/locales/devise.hu.yml
@@ -54,7 +54,7 @@ hu:
         title: Kétlépcsős hitelesítés kikapcsolva
       two_factor_enabled:
         explanation: Egy párosított TOTP appal generált tokenre lesz szükség a bejelentkezéshez.
-        subject: 'Mastodon: Kétlépcsős azonosítás engedélyezve'
+        subject: 'Mastodon: kétlépcsős hitelesítés engedélyezve'
         subtitle: A kétlépcsős hitelesítés a fiókodhoz aktiválva lett.
         title: Kétlépcsős hitelesítés engedélyezve
       two_factor_recovery_codes_changed:
diff --git a/config/locales/doorkeeper.hu.yml b/config/locales/doorkeeper.hu.yml
index 4559dcbd3133b9..f03f6b58b4e697 100644
--- a/config/locales/doorkeeper.hu.yml
+++ b/config/locales/doorkeeper.hu.yml
@@ -38,7 +38,7 @@ hu:
         application: Alkalmazás
         callback_url: Visszahívási URL
         delete: Eltávolítás
-        empty: Nincsenek saját alkalmazások.
+        empty: Nincsenek saját alkalmazásaid.
         name: Név
         new: Új alkalmazás
         scopes: Hatókörök
@@ -129,7 +129,7 @@ hu:
         crypto: Végpontok közti titkosítás
         favourites: Kedvencek
         filters: Szűrők
-        follow: Követések, Némítások és Letiltások
+        follow: Követések, némítások és letiltások
         follows: Követések
         lists: Listák
         media: Médiamellékletek
diff --git a/config/locales/es-AR.yml b/config/locales/es-AR.yml
index fd53f9d4fd86b8..e10183be15b55a 100644
--- a/config/locales/es-AR.yml
+++ b/config/locales/es-AR.yml
@@ -1046,7 +1046,7 @@ es-AR:
     apply_for_account: Solicitar una cuenta
     captcha_confirmation:
       help_html: Si tenés problemas resolviendo la CAPTCHA, podés ponerte en contacto con nosotros a través de %{email} y te vamos a ayudar.
-      hint_html: ¡Sólo una cosa más! Necesitamos confirmar que sos humano (¡esto es para que podamos mantener el spam fuera!). Resuelvé la CAPTCHA abajo y hacé clic en "Continuar".
+      hint_html: ¡Solo una cosa más! Necesitamos confirmar que sos humano (¡esto es para que podamos mantener el spam fuera!). Resolvé la CAPTCHA abajo y hacé clic en "Continuar".
       title: Comprobación de seguridad
     confirmations:
       awaiting_review: "¡Tu dirección de correo electrónico fue confirmada! El equipo de %{domain} está revisando tu registro. ¡Recibirás un correo electrónico si aprueban tu cuenta!"
diff --git a/config/locales/es-MX.yml b/config/locales/es-MX.yml
index 24b4af7ecdb97c..f497de5683d944 100644
--- a/config/locales/es-MX.yml
+++ b/config/locales/es-MX.yml
@@ -1659,10 +1659,22 @@ es-MX:
     preferences: Preferencias
     profile: Perfil
     relationships: Siguiendo y seguidores
+    severed_relationships: Relaciones cortadas
     statuses_cleanup: Eliminación automática de publicaciones
     strikes: Amonestaciones de moderación
     two_factor_authentication: Autenticación de dos factores
     webauthn_authentication: Claves de seguridad
+  severed_relationships:
+    download: Descargar (%{count})
+    event_type:
+      account_suspension: Suspensión de cuenta (%{target_name})
+      domain_block: Suspensión del servidor (%{target_name})
+      user_domain_block: Bloqueaste %{target_name}
+    lost_followers: Seguidores perdidos
+    lost_follows: Cuentas seguidas perdidas
+    preamble: Puedes perder cuentas seguidas y seguidores cuando bloqueas un dominio o cuando tus moderadores deciden suspender un servidor remoto. Cuando esto suceda, podrás descargar listas de relaciones cortadas, para ser inspeccionadas y posiblemente importadas en otro servidor.
+    purged: La información sobre este servidor ha sido purgada por los administradores de tu servidor.
+    type: Suceso
   statuses:
     attached:
       audio:
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 22ee45d3bf93ac..b5b98bb88f4272 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -1659,10 +1659,22 @@ es:
     preferences: Preferencias
     profile: Perfil
     relationships: Siguiendo y seguidores
+    severed_relationships: Relaciones cortadas
     statuses_cleanup: Eliminación automática de publicaciones
     strikes: Amonestaciones de moderación
     two_factor_authentication: Autenticación de dos factores
     webauthn_authentication: Claves de seguridad
+  severed_relationships:
+    download: Descargar (%{count})
+    event_type:
+      account_suspension: Suspensión de cuenta (%{target_name})
+      domain_block: Suspensión del servidor (%{target_name})
+      user_domain_block: Bloqueaste %{target_name}
+    lost_followers: Seguidores perdidos
+    lost_follows: Cuentas seguidas perdidas
+    preamble: Puedes perder cuentas seguidas y seguidores cuando bloqueas un dominio o cuando tus moderadores deciden suspender un servidor remoto. Cuando esto suceda, podrás descargar listas de relaciones cortadas, para ser inspeccionadas y posiblemente importadas en otro servidor.
+    purged: La información sobre este servidor ha sido purgada por los administradores de tu servidor.
+    type: Suceso
   statuses:
     attached:
       audio:
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 4ea0a9652ffa03..e29ce3752341b0 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -139,7 +139,7 @@ hu:
         only_password: Csak jelszó
         password_and_2fa: Jelszó és kétlépcsős hitelesítés
       sensitive: Kényes
-      sensitized: kényesnek jelölve
+      sensitized: Kényesnek jelölve
       shared_inbox_url: Megosztott bejövő üzenetek URL
       show:
         created_reports: Létrehozott jelentések
@@ -257,7 +257,7 @@ hu:
         destroy_status_html: "%{name} eltávolította %{target} felhasználó bejegyzését"
         destroy_unavailable_domain_html: "%{name} újraindította a kézbesítést a %{target} domainbe"
         destroy_user_role_html: "%{name} törölte a(z) %{target} szerepkört"
-        disable_2fa_user_html: "%{name} kikapcsolta a kétlépcsős azonosítást %{target} felhasználó fiókján"
+        disable_2fa_user_html: "%{name} kikapcsolta a kétlépcsős hitelesítést %{target} felhasználó fiókján"
         disable_custom_emoji_html: "%{name} letiltotta az emodzsit: %{target}"
         disable_sign_in_token_auth_user_html: "%{name} letiltotta a tokenes e-mail hitelesítést %{target} felhasználóra"
         disable_user_html: "%{name} letiltotta %{target} felhasználó bejelentkezését"
@@ -716,7 +716,7 @@ hu:
         manage_taxonomies: Taxonómiák kezelése
         manage_taxonomies_description: Lehetővé teszi, hogy a felhasználó átnézze a felkapott tartalmakat és frissítse a hashtagek beállításait
         manage_user_access: Felhasználói hozzáférések kezelése
-        manage_user_access_description: Lehetővé teszi, hogy a felhasználó letiltsa mások kétlépcsős azonosítását, megváltoztassa az email címüket, és alaphelyzetbe állítsa a jelszavukat
+        manage_user_access_description: Lehetővé teszi, hogy a felhasználó letiltsa mások kétlépcsős hitelesítését, megváltoztassa az e-mail-címüket, és alaphelyzetbe állítsa a jelszavukat
         manage_users: Felhasználók kezelése
         manage_users_description: Lehetővé teszi, hogy a felhasználó megtekintse mások részletes adatait és moderálja őket
         manage_webhooks: Webhookok kezelése
@@ -1057,7 +1057,7 @@ hu:
       redirect_to_app_html: Át kellett volna irányítsunk a <strong>%{app_name}</strong> alkalmazáshoz. Ha ez nem történt meg, próbálkozz a %{clicking_this_link} lehetőséggel vagy térj vissza manuálisan az alkalmazáshoz.
       registration_complete: A regisztrációd %{domain} domainen befejeződött!
       welcome_title: Üdvözlet, %{name}!
-      wrong_email_hint: Ha az emailcím nem helyes, a fiókbeállításokban megváltoztathatod.
+      wrong_email_hint: Ha az e-mail-cím nem helyes, a fiókbeállításokban megváltoztathatod.
     delete_account: Felhasználói fiók törlése
     delete_account_html: Felhasználói fiókod törléséhez <a href="%{path}">kattints ide</a>. A rendszer újbóli megerősítést fog kérni.
     description:
@@ -1074,7 +1074,7 @@ hu:
     login: Bejelentkezés
     logout: Kijelentkezés
     migrate_account: Felhasználói fiók költöztetése
-    migrate_account_html: Ha szeretnéd átirányítani ezt a fiókodat egy másikra, a beállításokat <a href="%{path}">itt találod meg</a>.
+    migrate_account_html: Ha át szeretnéd irányítani ezt a fiókodat egy másikra, akkor <a href="%{path}">itt állíthatod be</a>.
     or_log_in_with: Vagy jelentkezz be ezzel
     privacy_policy_agreement_html: Elolvastam és egyetértek az <a href="%{privacy_policy_path}" target="_blank">adatvédemi nyilatkozattal</a>
     progress:
@@ -1133,7 +1133,7 @@ hu:
       invalid_signature: érvénytelen Ed25519 aláírás
   date:
     formats:
-      default: "%Y.%b.%d."
+      default: "%Y. %b %d."
       with_month_name: "%Y. %B %d"
   datetime:
     distance_in_words:
@@ -1223,17 +1223,17 @@ hu:
   exports:
     archive_takeout:
       date: Dátum
-      download: Archív letöltése
+      download: Archívum letöltése
       hint_html: Itt kérhető egy archív az összes <strong>feltöltött bejegyzésedről és médiádról</strong>. Az exportált adatok ActivityPub formátumban lesznek, melyet bármilyen szabványos program tud olvasni. 7 naponként kérhetsz ilyen archívot.
-      in_progress: Archív összeállítása...
-      request: Archív kérése
+      in_progress: Archívum összeállítása…
+      request: Archívum kérése
       size: Méret
-    blocks: Tiltólistádon
-    bookmarks: Könyvjelzők
+    blocks: Tiltás
+    bookmarks: Könyvjelző
     csv: CSV
-    domain_blocks: Tiltott domainjeid
-    lists: Listáid
-    mutes: Némításaid
+    domain_blocks: Tiltott domain
+    lists: Lista
+    mutes: Némítás
     storage: Médiatároló
   featured_tags:
     add_new: Új hozzáadása
@@ -1413,7 +1413,7 @@ hu:
           follow_request: követési kérelemről email értesítő
           mention: megemlítésről email értesítő
           reblog: megtolásról email értesítő
-      resubscribe_html: Ha tévedésből iratkoztál le, újra feliratkozhatsz az <a href="%{settings_path}">email értesítések beállításainál</a>.
+      resubscribe_html: Ha tévedésből iratkoztál le, újra feliratkozhatsz az <a href="%{settings_path}">e-mail-értesítések beállításainál</a>.
       success_html: 'Mostantól nem kapsz %{type} típusú üzeneket a(z) %{domain} Mastodon-kiszolgálón erre a címedre: %{email}.'
       title: Leiratkozás
   media_attachments:
@@ -1496,7 +1496,7 @@ hu:
       subject: "%{name} szerkesztett egy bejegyzést"
   notifications:
     administration_emails: Adminisztrátori e-mail-értesítések
-    email_events: Események email értesítésekhez
+    email_events: Az e-mail-értesítések eseményei
     email_events_hint: 'Válaszd ki azokat az eseményeket, melyekről értesítést szeretnél:'
   number:
     human:
@@ -1510,7 +1510,7 @@ hu:
           trillion: T
   otp_authentication:
     code_hint: Jóváhagyáshoz írd be a hitelesítő alkalmazás által generált kódot
-    description_html: Ha engedélyezed a <strong>kétlépcsős azonosítást</strong>, a bejelentkezéshez szükséged lesz a telefonodra és egy alkalmazásra, amely hozzáférési kódot generál számodra.
+    description_html: Ha engedélyezed a <strong>kétlépcsős hitelesítést</strong>, akkor a bejelentkezéshez szükséged lesz a telefonodra és egy alkalmazásra, amely hozzáférési kódokat állít elő a belépéshez.
     enable: Engedélyezés
     instructions_html: "<strong>Olvasd be ezt a QR-kódot a telefonodon futó Google Authenticator vagy egyéb TOTP alkalmazással</strong>. A jövőben ez az alkalmazás fog számodra hozzáférési kódot generálni a belépéshez."
     manual_instructions: 'Ha nem sikerült a QR-kód beolvasása, itt a szöveges kulcs, amelyet manuálisan kell begépelned:'
@@ -1639,10 +1639,10 @@ hu:
     revoke: Visszavonás
     revoke_success: Munkamenet sikeresen visszavonva
     title: Munkamenetek
-    view_authentication_history: Fiókod hitelesítési történetének megtekintése
+    view_authentication_history: Fiók hitelesítési előzményeinek megtekintése
   settings:
     account: Fiók
-    account_settings: Fiók beállítások
+    account_settings: Fiókbeállítások
     aliases: Fiók aliasok
     appearance: Megjelenés
     authorized_apps: Jóváhagyott alkalmazások
@@ -1740,7 +1740,7 @@ hu:
     keep_polls: Szavazások megtartása
     keep_polls_hint: Egyetlen szavazásodat sem törli
     keep_self_bookmark: Általad könyvjelzőzött bejegyzések megtartása
-    keep_self_bookmark_hint: Egyetlen olyan bejegyzésedet sem törli, melyet könyvjelzővel láttál el
+    keep_self_bookmark_hint: Egyetlen olyan bejegyzésedet sem törli, melyet könyvjelzőztél
     keep_self_fav: Kedvenc bejegyzések megtartása
     keep_self_fav_hint: Nem törli azon bejegyzéseidet, melyeket kedvencnek jelöltél
     min_age:
@@ -1781,10 +1781,10 @@ hu:
   two_factor_authentication:
     add: Hozzáadás
     disable: Kikapcsolás
-    disabled_success: A kétlépcsős azonosítást sikeresen letiltottuk
+    disabled_success: A kétlépcsős hitelesítés sikeresen letiltva
     edit: Szerkesztés
-    enabled: Kétlépcsős azonosítás engedélyezve
-    enabled_success: A kétlépcsős azonosítást sikeresen engedélyezted
+    enabled: Kétlépcsős hitelesítés engedélyezve
+    enabled_success: A kétlépcsős hitelesítés sikeresen engedélyezve
     generate_recovery_codes: Visszaállítási kódok generálása
     lost_recovery_codes: A visszaállítási kódok segítségével tudsz belépni, ha elveszítenéd a telefonod. Ha a visszaállítási kódjaidat hagytad el, itt generálhatsz újakat. A régi kódokat ebben az esetben érvénytelenítjük.
     methods: Kétlépcsős eljárások
@@ -1925,5 +1925,5 @@ hu:
     nickname_hint: Írd be az új biztonsági kulcsod becenevét
     not_enabled: Még nem engedélyezted a WebAuthn-t
     not_supported: Ez a böngésző nem támogatja a biztonsági kulcsokat
-    otp_required: A biztonsági kulcsok használatához először engedélyezd a kétlépcsős azonosítást.
+    otp_required: A biztonsági kulcsok használatához először engedélyezd a kétlépcsős hitelesítést.
     registered_on: 'Regisztráció ekkor: %{date}'
diff --git a/config/locales/is.yml b/config/locales/is.yml
index 710b35fce95303..fdf54030a15556 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -1666,6 +1666,9 @@ is:
     strikes: Umsýsla refsinga
     two_factor_authentication: Tveggja-þátta auðkenning
     webauthn_authentication: Öryggislyklar
+  severed_relationships:
+    download: Sækja (%{count})
+    type: Atburður
   statuses:
     attached:
       audio:
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 19b2e94db0596b..b7c6813a745d77 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -585,6 +585,9 @@ ja:
       actions_description_html: このレポートを解決するために取るアクションを決定します。 報告されたアカウントに対して懲罰的な措置を取った場合、メール通知が送信されますが<strong>スパム</strong>カテゴリが選択されている場合を除きます。
       actions_description_remote_html: この通報を解決するためのアクションを選択してください。これは<strong>あなたの</strong>サーバーがこのリモートアカウントと通信し、そのコンテンツを処理する時のみ影響します。
       add_to_report: 通報にさらに追加
+      already_suspended_badges:
+        local: このサーバーで停止済み
+        remote: リモートのサーバーで停止済み
       are_you_sure: 本当に実行しますか？
       assign_to_self: 担当になる
       assigned: 担当者
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index c556c9e816b02e..9548c4e449d127 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -14,7 +14,7 @@ ko:
     instance_actor_flash: 이 계정은 서버 자신을 나타내기 위한 가상의 계정이며 개인 사용자가 아닙니다. 이 계정은 연합을 위해 사용되며 정지되지 않아야 합니다.
     last_active: 최근 활동
     link_verified_on: "%{date}에 이 링크의 소유가 확인되었습니다"
-    nothing_here: 텅 비어있네요!
+    nothing_here: 아무 것도 없습니다!
     pin_errors:
       following: 추천하려는 사람을 팔로우 하고 있어야 합니다
     posts:
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 44b5443fc8220b..832d9e9db4a2d0 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -509,7 +509,7 @@ lt:
     software_updates:
       description: Rekomenduojama nuolat atnaujinti Mastodon diegyklę, kad galėtum naudotis naujausiais pataisymais ir funkcijomis. Be to, kartais labai svarbu laiku naujinti Mastodon, kad būtų išvengta saugumo problemų. Dėl šių priežasčių Mastodon kas 30 minučių tikrina, ar yra atnaujinimų, ir praneša tau apie tai pagal tavo el. pašto pranešimų parinktis.
     statuses:
-      back_to_account: Atgal į paskyros puslapį
+      back_to_account: Grįžti į paskyros puslapį
       media:
         title: Medija
       no_status_selected: Jokie statusai nebuvo pakeisti, nes niekas nepasirinkta
@@ -741,16 +741,24 @@ lt:
     browser: Naršyklė
     browsers:
       generic: Nežinoma naršyklė
-    current_session: Dabartinė sesija
+    current_session: Dabartinis seansas
     date: Data
     description: "%{browser} ant %{platform}"
     explanation: Čia rodomos web naršyklės prijungtos prie Jūsų Mastodon paskyros.
+    platforms:
+      android: Android
+      ios: iOS
+      kai_os: KaiOS
+      mac: macOS
+      windows: Windows
+      windows_mobile: Windows Mobile
+      windows_phone: Windows Phone
     revoke: Atšaukti
-    revoke_success: Sesija sėkmingai atšaukta
-    title: Sesijos
+    revoke_success: Seansas sėkmingai panaikintas.
+    title: Seansai
   settings:
     authorized_apps: Autorizuotos aplikacijos
-    back: Atgal į Mastodon
+    back: Grįžti į Mastodon
     delete: Paskyros trynimas
     development: Plėtojimas
     edit_profile: Keisti profilį
@@ -758,6 +766,7 @@ lt:
     featured_tags: Rodomi saitažodžiai(#)
     import: Importuoti
     migrate: Paskyros migracija
+    notifications: El. laiško pranešimai
     preferences: Preferencijos
     two_factor_authentication: Dviejų veiksnių autentikacija
   statuses:
diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index 9dde61ff06a542..666eb0bdd70fa0 100644
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -1659,10 +1659,22 @@ pt-PT:
     preferences: Preferências
     profile: Perfil
     relationships: Seguindo e seguidores
+    severed_relationships: Relações cessadas
     statuses_cleanup: Remoção automática da publicação
     strikes: Punições de moderação
     two_factor_authentication: Autenticação em duas etapas
     webauthn_authentication: Chaves de segurança
+  severed_relationships:
+    download: Transferir (%{count})
+    event_type:
+      account_suspension: Suspensão de conta (%{target_name})
+      domain_block: Suspensão de servidor (%{target_name})
+      user_domain_block: Bloqueou %{target_name}
+    lost_followers: Seguidores perdidos
+    lost_follows: Pessoas que segue perdidas
+    preamble: Pode perder seguidores e pessoas que segue quando bloqueia um domínio ou quando os seus moderadores decidem suspender um servidor remoto. Quando isso acontecer, poderá descarregar listas de relações cessadas, para serem inspeccionadas e possivelmente importadas para outro servidor.
+    purged: Informações sobre este servidor foram purgadas pelos administradores do seu servidor.
+    type: Evento
   statuses:
     attached:
       audio:
diff --git a/config/locales/simple_form.hu.yml b/config/locales/simple_form.hu.yml
index 1d5e149339a9d6..242c86327422cc 100644
--- a/config/locales/simple_form.hu.yml
+++ b/config/locales/simple_form.hu.yml
@@ -54,11 +54,11 @@ hu:
         phrase: Illeszkedni fog kis/nagybetű függetlenül, és tartalmi figyelmeztetések mögött is
         scopes: Mely API-kat érheti el az alkalmazás. Ha felső szintű hatáskört választasz, nem kell egyesével kiválasztanod az alatta lévőeket.
         setting_aggregate_reblogs: Ne mutassunk megtolásokat olyan bejegyzésekhez, melyeket nemrég toltak meg (csak új megtolásokra lép életbe)
-        setting_always_send_emails: Alapesetben nem küldünk e-mail értesítéseket, ha aktívan használod a Mastodont
+        setting_always_send_emails: Alapesetben nem küldünk e-mail-értesítéseket, ha aktívan használod a Mastodont
         setting_default_sensitive: A kényes médiatartalmat alapesetben elrejtjük, de egyetlen kattintással előhozható
         setting_display_media_default: Kényes tartalomnak jelölt média elrejtése
-        setting_display_media_hide_all: Mindig minden média elrejtése
-        setting_display_media_show_all: Mindig mutasd a szenzitív tartalomként jelölt médiát
+        setting_display_media_hide_all: Média elrejtése mindig
+        setting_display_media_show_all: Média megjelenítése mindig
         setting_use_blurhash: A kihomályosítás az eredeti képből történik, de minden részletet elrejt
         setting_use_pending_items: Idővonal frissítése csak kattintásra automatikus görgetés helyett
         username: Betűk, számok és alávonások használhatók
@@ -146,7 +146,7 @@ hu:
           name: Címke
           value: Tartalom
         indexable: Nyilvános bejegyzések szerepeltetése a keresési eredményekben
-        show_collections: Követők és követettek megjelnítése a profilban
+        show_collections: Követők és követettek megjelenítése a profilban
         unlocked: Új követők automatikus elfogadása
       account_alias:
         acct: A régi fiók fiókneve
@@ -187,7 +187,7 @@ hu:
         data: Adatok
         display_name: Megjelenített név
         email: E-mail cím
-        expires_in: Elévül
+        expires_in: Elévülés dátuma
         fields: Profil metaadatai
         header: Fejléc
         honeypot: "%{label} (ne töltsd ki)"
@@ -202,7 +202,7 @@ hu:
         phrase: Kulcsszó vagy kifejezés
         setting_advanced_layout: Speciális webes felület engedélyezése
         setting_aggregate_reblogs: Megtolások csoportosítása az idővonalakon
-        setting_always_send_emails: E-mail értesítések küldése mindig
+        setting_always_send_emails: E-mail-értesítések küldése mindig
         setting_auto_play_gif: GIF-ek automatikus lejátszása
         setting_boost_modal: Megerősítés kérése megtolás előtt
         setting_default_language: Bejegyzések nyelve
diff --git a/config/locales/simple_form.nl.yml b/config/locales/simple_form.nl.yml
index df108a2fecc99d..2f2107b13cec5f 100644
--- a/config/locales/simple_form.nl.yml
+++ b/config/locales/simple_form.nl.yml
@@ -149,9 +149,9 @@ nl:
         show_collections: Accounts die jij volgt en die jou volgen op je profiel tonen
         unlocked: Automatisch nieuwe volgers accepteren
       account_alias:
-        acct: Mastodon-adres van het oude account
+        acct: Fediverse-adres van het oude account
       account_migration:
-        acct: Mastodon-adres van het nieuwe account
+        acct: Fediverse-adres van het nieuwe account
       account_warning_preset:
         text: Tekst van preset
         title: Titel
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 558552362fa15c..69bae8767f8b16 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -1633,10 +1633,21 @@ th:
     preferences: การกำหนดลักษณะ
     profile: โปรไฟล์สาธารณะ
     relationships: การติดตามและผู้ติดตาม
+    severed_relationships: ความสัมพันธ์ที่ตัดขาด
     statuses_cleanup: การลบโพสต์แบบอัตโนมัติ
     strikes: การดำเนินการการกลั่นกรอง
     two_factor_authentication: การรับรองความถูกต้องด้วยสองปัจจัย
     webauthn_authentication: กุญแจความปลอดภัย
+  severed_relationships:
+    download: ดาวน์โหลด (%{count})
+    event_type:
+      account_suspension: การระงับบัญชี (%{target_name})
+      domain_block: การระงับเซิร์ฟเวอร์ (%{target_name})
+      user_domain_block: คุณได้ปิดกั้น %{target_name}
+    lost_followers: ผู้ติดตามที่หายไป
+    lost_follows: การติดตามที่หายไป
+    purged: มีการล้างข้อมูลเกี่ยวกับเซิร์ฟเวอร์นี้โดยผู้ดูแลของเซิร์ฟเวอร์ของคุณ
+    type: เหตุการณ์
   statuses:
     attached:
       audio:
diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml
index 2a0f802a1fd868..af2b3b8698b28f 100644
--- a/config/locales/zh-HK.yml
+++ b/config/locales/zh-HK.yml
@@ -1626,13 +1626,26 @@ zh-HK:
     import: 匯入
     import_and_export: 匯入及匯出
     migrate: 帳戶遷移
+    notifications: 電郵通知
     preferences: 偏好設定
     profile: 個人資料
     relationships: 關注及追隨者
+    severed_relationships: 已切斷關係
     statuses_cleanup: 自動嘟文刪除
     strikes: 審核警告
     two_factor_authentication: 雙重認證
     webauthn_authentication: 安全鑰匙
+  severed_relationships:
+    download: 下載 (%{count})
+    event_type:
+      account_suspension: 停權帳號 (%{target_name})
+      domain_block: 停權伺服器 (%{target_name})
+      user_domain_block: 你封鎖了 %{target_name}
+    lost_followers: 已流失追蹤者
+    lost_follows: 已流失追蹤
+    preamble: 當你封鎖網域或你的管理員決定暫停遠端伺服器，可能會令你失去追蹤中的對象和追蹤者。屆時你可以下載紀錄了被切斷關係的對象的清單進行檢查，或將其匯入到另一台伺服器上。
+    purged: 有關此伺服器的資訊已被你伺服器的管理員清除。
+    type: 事件
   statuses:
     attached:
       audio:

From bbf36836b651f2d69ee2b1988989e46f73862ff9 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 25 Mar 2024 12:07:47 +0100
Subject: [PATCH 0589/2191] Update formatjs monorepo (#29733)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 13ea8583d7e868..67a7876e1c7b3c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2287,9 +2287,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@formatjs/intl@npm:2.10.0":
-  version: 2.10.0
-  resolution: "@formatjs/intl@npm:2.10.0"
+"@formatjs/intl@npm:2.10.1":
+  version: 2.10.1
+  resolution: "@formatjs/intl@npm:2.10.1"
   dependencies:
     "@formatjs/ecma402-abstract": "npm:1.18.2"
     "@formatjs/fast-memoize": "npm:2.2.0"
@@ -2303,7 +2303,7 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 10c0/7566038b011116cee7069165a25836b3fb687948e61b041809a9d978ac6c0882ae8d81a624a415cfb8e43852d097cd1cbc3c6707e717928e39b75c252491a712
+  checksum: 10c0/24eee77382d1efd226aee7590228d3ae80f66a8547a65295f8028986b15b6abbfea3e380f4a338ece0e841e1db6f36554ca48124d84c0830382e3a9d395b5d75
   languageName: node
   linkType: hard
 
@@ -5125,8 +5125,8 @@ __metadata:
   linkType: hard
 
 "babel-plugin-formatjs@npm:^10.5.1":
-  version: 10.5.13
-  resolution: "babel-plugin-formatjs@npm:10.5.13"
+  version: 10.5.14
+  resolution: "babel-plugin-formatjs@npm:10.5.14"
   dependencies:
     "@babel/core": "npm:^7.10.4"
     "@babel/helper-plugin-utils": "npm:^7.10.4"
@@ -5139,7 +5139,7 @@ __metadata:
     "@types/babel__helper-plugin-utils": "npm:^7.10.0"
     "@types/babel__traverse": "npm:^7.1.7"
     tslib: "npm:^2.4.0"
-  checksum: 10c0/1ce0b69478dd3c92126a7e3440f1fad46feebebc9318e8bbb102dea91a60448da4a8511b3c8ffbf2c3675995fca6c8ce7f097c08907455b33a5f9185e39fb94e
+  checksum: 10c0/78d33f0304c7b6e36334b2f32bacd144cbbe08cb22318ff994e7adc7705b7f8208354c9af9f87b4390d11aee1ea81cfee9f224a57fe5265173b92ee7de921359
   languageName: node
   linkType: hard
 
@@ -14317,12 +14317,12 @@ __metadata:
   linkType: hard
 
 "react-intl@npm:^6.4.2":
-  version: 6.6.2
-  resolution: "react-intl@npm:6.6.2"
+  version: 6.6.3
+  resolution: "react-intl@npm:6.6.3"
   dependencies:
     "@formatjs/ecma402-abstract": "npm:1.18.2"
     "@formatjs/icu-messageformat-parser": "npm:2.7.6"
-    "@formatjs/intl": "npm:2.10.0"
+    "@formatjs/intl": "npm:2.10.1"
     "@formatjs/intl-displaynames": "npm:6.6.6"
     "@formatjs/intl-listformat": "npm:7.5.5"
     "@types/hoist-non-react-statics": "npm:^3.3.1"
@@ -14336,7 +14336,7 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 10c0/78288a0fded816735812dca6dcfee3eaa8bb3af7e963ba47639b51cc700a102a526859ff647ca79a5ebcdc69d6d78da90daeeed15cc0b819c7a20a74b2e1469c
+  checksum: 10c0/8a924931668f1bf6364bb41c09fdb54972b8e3372f0768a31478dc3f8a846920caa4dc04ab3950195baa6dbf58a148f43a6a221d5795be2cbb6f4f374a5921d6
   languageName: node
   linkType: hard
 

From 45f8364cd110882a55bbef465064b8bd4d6b7f89 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 25 Mar 2024 11:09:00 +0000
Subject: [PATCH 0590/2191] Update dependency typescript to v5.4.3 (#29744)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 67a7876e1c7b3c..7ef202e095be96 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -17079,22 +17079,22 @@ __metadata:
   linkType: hard
 
 "typescript@npm:5, typescript@npm:^5.0.4":
-  version: 5.4.2
-  resolution: "typescript@npm:5.4.2"
+  version: 5.4.3
+  resolution: "typescript@npm:5.4.3"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
-  checksum: 10c0/583ff68cafb0c076695f72d61df6feee71689568179fb0d3a4834dac343df6b6ed7cf7b6f6c801fa52d43cd1d324e2f2d8ae4497b09f9e6cfe3d80a6d6c9ca52
+  checksum: 10c0/22443a8760c3668e256c0b34b6b45c359ef6cecc10c42558806177a7d500ab1a7d7aac1f976d712e26989ddf6731d2fbdd3212b7c73290a45127c1c43ba2005a
   languageName: node
   linkType: hard
 
 "typescript@patch:typescript@npm%3A5#optional!builtin<compat/typescript>, typescript@patch:typescript@npm%3A^5.0.4#optional!builtin<compat/typescript>":
-  version: 5.4.2
-  resolution: "typescript@patch:typescript@npm%3A5.4.2#optional!builtin<compat/typescript>::version=5.4.2&hash=5adc0c"
+  version: 5.4.3
+  resolution: "typescript@patch:typescript@npm%3A5.4.3#optional!builtin<compat/typescript>::version=5.4.3&hash=5adc0c"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
-  checksum: 10c0/fcf6658073d07283910d9a0e04b1d5d0ebc822c04dbb7abdd74c3151c7aa92fcddbac7d799404e358197222006ccdc4c0db219d223d2ee4ccd9e2b01333b49be
+  checksum: 10c0/6e51f8b7e6ec55b897b9e56b67e864fe8f44e30f4a14357aad5dc0f7432db2f01efc0522df0b6c36d361c51f2dc3dcac5c832efd96a404cfabf884e915d38828
   languageName: node
   linkType: hard
 

From 55e2c827bdc7f96fc746ce43ea303f9e25805099 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 25 Mar 2024 11:09:05 +0000
Subject: [PATCH 0591/2191] Update DefinitelyTyped types (non-major) (#29743)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 7ef202e095be96..a2bc439ee338fb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3679,13 +3679,13 @@ __metadata:
   linkType: hard
 
 "@types/pg@npm:^8.6.6":
-  version: 8.11.2
-  resolution: "@types/pg@npm:8.11.2"
+  version: 8.11.4
+  resolution: "@types/pg@npm:8.11.4"
   dependencies:
     "@types/node": "npm:*"
     pg-protocol: "npm:*"
     pg-types: "npm:^4.0.1"
-  checksum: 10c0/6d873af7f71785d5d4db49311c5c73628918b2b1ece83f17073c4470b2fce6bd24a37de23a42ea0221df4e1c7dc43ea035bb9d0b6274f86ec692b21503a9a55c
+  checksum: 10c0/81158ffa9d2f9b2b299a1650756b90fc418e0040e654d7d9ee46734a3c874d07b638af86d765e22e9c8246054c30a0274ee4dea58a0a7ed5c0c4aa01964a09ef
   languageName: node
   linkType: hard
 
@@ -3697,9 +3697,9 @@ __metadata:
   linkType: hard
 
 "@types/prop-types@npm:*, @types/prop-types@npm:^15.7.5":
-  version: 15.7.11
-  resolution: "@types/prop-types@npm:15.7.11"
-  checksum: 10c0/e53423cf9d510515ef8b47ff42f4f1b65a7b7b37c8704e2dbfcb9a60defe0c0e1f3cb1acfdeb466bad44ca938d7c79bffdd51b48ffb659df2432169d0b27a132
+  version: 15.7.12
+  resolution: "@types/prop-types@npm:15.7.12"
+  checksum: 10c0/1babcc7db6a1177779f8fde0ccc78d64d459906e6ef69a4ed4dd6339c920c2e05b074ee5a92120fe4e9d9f1a01c952f843ebd550bee2332fc2ef81d1706878f8
   languageName: node
   linkType: hard
 
@@ -3842,13 +3842,13 @@ __metadata:
   linkType: hard
 
 "@types/react@npm:*, @types/react@npm:16 || 17 || 18, @types/react@npm:>=16.9.11, @types/react@npm:^18.2.7":
-  version: 18.2.66
-  resolution: "@types/react@npm:18.2.66"
+  version: 18.2.70
+  resolution: "@types/react@npm:18.2.70"
   dependencies:
     "@types/prop-types": "npm:*"
     "@types/scheduler": "npm:*"
     csstype: "npm:^3.0.2"
-  checksum: 10c0/56e4b841f2daf03a0b3268d4f2bcf5841167fe56742b9f1c076fad66587fb59191bdaba4d5727dbfbcff750d5e8797fdd4e57d8d9704b0bfc6ad31ee1e268a70
+  checksum: 10c0/2107b1fa8963cabe33d981cf1c0e3b7534c9d12b98c1046cd9f7975851690a0780db011f6a1d637ae4e612ef00c94ebdbe76a9e2f9e0f3baa6aad3213932af41
   languageName: node
   linkType: hard
 

From 766c1fea2036e2360a9b0620b9d83cc4722620e8 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 25 Mar 2024 13:14:46 +0100
Subject: [PATCH 0592/2191] Update devDependencies (non-major) (#29746)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 79 +++++++++++++++++++++++++++++++++----------------------
 1 file changed, 47 insertions(+), 32 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index a2bc439ee338fb..5bf1095d8fc3c6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1578,7 +1578,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/css-parser-algorithms@npm:^2.5.0, @csstools/css-parser-algorithms@npm:^2.6.1":
+"@csstools/css-parser-algorithms@npm:^2.6.1":
   version: 2.6.1
   resolution: "@csstools/css-parser-algorithms@npm:2.6.1"
   peerDependencies:
@@ -1587,14 +1587,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/css-tokenizer@npm:^2.2.3, @csstools/css-tokenizer@npm:^2.2.4":
+"@csstools/css-tokenizer@npm:^2.2.4":
   version: 2.2.4
   resolution: "@csstools/css-tokenizer@npm:2.2.4"
   checksum: 10c0/23997db5874514f4b951ebd215e1e6cc8baf03adf9a35fc6fd028b84cb52aa2dc053860722108c09859a9b37b455f62b84181fe15539cd37797ea699b9ff85f0
   languageName: node
   linkType: hard
 
-"@csstools/media-query-list-parser@npm:^2.1.7, @csstools/media-query-list-parser@npm:^2.1.9":
+"@csstools/media-query-list-parser@npm:^2.1.9":
   version: 2.1.9
   resolution: "@csstools/media-query-list-parser@npm:2.1.9"
   peerDependencies:
@@ -1970,7 +1970,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/selector-specificity@npm:^3.0.1, @csstools/selector-specificity@npm:^3.0.2":
+"@csstools/selector-specificity@npm:^3.0.2":
   version: 3.0.2
   resolution: "@csstools/selector-specificity@npm:3.0.2"
   peerDependencies:
@@ -1995,6 +1995,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@dual-bundle/import-meta-resolve@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "@dual-bundle/import-meta-resolve@npm:4.0.0"
+  checksum: 10c0/868b8314fc753b7767887108535afe3288de941d92bc8453164dbcb1abe886b171e338f6f7d02ff556256dee69c90e4ac6360e0c6a856a5ad7190274ab52de2e
+  languageName: node
+  linkType: hard
+
 "@emotion/babel-plugin@npm:^11.11.0":
   version: 11.11.0
   resolution: "@emotion/babel-plugin@npm:11.11.0"
@@ -2192,8 +2199,8 @@ __metadata:
   linkType: hard
 
 "@formatjs/cli@npm:^6.1.1":
-  version: 6.2.7
-  resolution: "@formatjs/cli@npm:6.2.7"
+  version: 6.2.8
+  resolution: "@formatjs/cli@npm:6.2.8"
   peerDependencies:
     vue: ^3.3.4
   peerDependenciesMeta:
@@ -2201,7 +2208,7 @@ __metadata:
       optional: true
   bin:
     formatjs: bin/formatjs
-  checksum: 10c0/ee7b0873a734e02721ce1ee107ee60845bb30855f4ca686bfb6c5e9862353249d5d20748b18db93200aabc7a59875ff062f485c64d41cb8e61f1d43e2bb5eceb
+  checksum: 10c0/5d8f95434f4522eee7dd3acf54e5265289ec7e72812448cd7c7547bdedaba8927719800dfa2fc92fb82c609f34255367a80d18bf6c064540d5e11ec6b9d4603e
   languageName: node
   linkType: hard
 
@@ -3311,8 +3318,8 @@ __metadata:
   linkType: hard
 
 "@testing-library/react@npm:^14.0.0":
-  version: 14.2.1
-  resolution: "@testing-library/react@npm:14.2.1"
+  version: 14.2.2
+  resolution: "@testing-library/react@npm:14.2.2"
   dependencies:
     "@babel/runtime": "npm:^7.12.5"
     "@testing-library/dom": "npm:^9.0.0"
@@ -3320,7 +3327,7 @@ __metadata:
   peerDependencies:
     react: ^18.0.0
     react-dom: ^18.0.0
-  checksum: 10c0/83b35cf8bf5640f1b63b32223ebc75799dc1a8e034d819120b26838fba0b0ab10bdbe6ad07dd8ae8287365f2b0c52dc9892a6fa11bb24d3e63ad97dfb7f2f296
+  checksum: 10c0/ab36707f6701a4a56dd217e16e00d6326e0f760bb2e716245422c7500a0b94efcd351d0aa89c4fab2916e6ebc68c983cec6b3ae0804de813cafc913a612668f6
   languageName: node
   linkType: hard
 
@@ -9444,10 +9451,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ignore@npm:^5.2.0, ignore@npm:^5.2.4, ignore@npm:^5.3.0":
-  version: 5.3.0
-  resolution: "ignore@npm:5.3.0"
-  checksum: 10c0/dc06bea5c23aae65d0725a957a0638b57e235ae4568dda51ca142053ed2c352de7e3bc93a69b2b32ac31966a1952e9a93c5ef2e2ab7c6b06aef9808f6b55b571
+"ignore@npm:^5.2.0, ignore@npm:^5.2.4, ignore@npm:^5.3.1":
+  version: 5.3.1
+  resolution: "ignore@npm:5.3.1"
+  checksum: 10c0/703f7f45ffb2a27fb2c5a8db0c32e7dee66b33a225d28e8db4e1be6474795f606686a6e3bcc50e1aa12f2042db4c9d4a7d60af3250511de74620fbed052ea4cd
   languageName: node
   linkType: hard
 
@@ -11150,6 +11157,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"known-css-properties@npm:^0.30.0":
+  version: 0.30.0
+  resolution: "known-css-properties@npm:0.30.0"
+  checksum: 10c0/8b487a6b33487affcec41eb392ceb77acf4d093558dde5c88b5ea06b9a3c81781876d7cb09872e0518b9602f27c8f4112c9ac333e02c90a91c8fbd12e202ed48
+  languageName: node
+  linkType: hard
+
 "language-subtag-registry@npm:^0.3.20":
   version: 0.3.22
   resolution: "language-subtag-registry@npm:0.3.22"
@@ -11641,10 +11655,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"meow@npm:^13.1.0":
-  version: 13.1.0
-  resolution: "meow@npm:13.1.0"
-  checksum: 10c0/2dac9dbf99a17ce29618fe5919072a9b28e2aedb9547f9b1f15d046d5501dd6c14fe1f35f7a5665d0ee7111c98c4d359fcf3f985463ec5896dd50177363f442d
+"meow@npm:^13.2.0":
+  version: 13.2.0
+  resolution: "meow@npm:13.2.0"
+  checksum: 10c0/d5b339ae314715bcd0b619dd2f8a266891928e21526b4800d49b4fba1cc3fff7e2c1ff5edd3344149fac841bc2306157f858e8c4d5eaee4d52ce52ad925664ce
   languageName: node
   linkType: hard
 
@@ -13817,7 +13831,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-selector-parser@npm:^6.0.11, postcss-selector-parser@npm:^6.0.13, postcss-selector-parser@npm:^6.0.15, postcss-selector-parser@npm:^6.0.16, postcss-selector-parser@npm:^6.0.2, postcss-selector-parser@npm:^6.0.4":
+"postcss-selector-parser@npm:^6.0.11, postcss-selector-parser@npm:^6.0.13, postcss-selector-parser@npm:^6.0.16, postcss-selector-parser@npm:^6.0.2, postcss-selector-parser@npm:^6.0.4":
   version: 6.0.16
   resolution: "postcss-selector-parser@npm:6.0.16"
   dependencies:
@@ -13857,7 +13871,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss@npm:^8.2.15, postcss@npm:^8.4.24, postcss@npm:^8.4.33":
+"postcss@npm:^8.2.15, postcss@npm:^8.4.24, postcss@npm:^8.4.38":
   version: 8.4.38
   resolution: "postcss@npm:8.4.38"
   dependencies:
@@ -16428,13 +16442,14 @@ __metadata:
   linkType: hard
 
 "stylelint@npm:^16.0.2":
-  version: 16.2.1
-  resolution: "stylelint@npm:16.2.1"
+  version: 16.3.0
+  resolution: "stylelint@npm:16.3.0"
   dependencies:
-    "@csstools/css-parser-algorithms": "npm:^2.5.0"
-    "@csstools/css-tokenizer": "npm:^2.2.3"
-    "@csstools/media-query-list-parser": "npm:^2.1.7"
-    "@csstools/selector-specificity": "npm:^3.0.1"
+    "@csstools/css-parser-algorithms": "npm:^2.6.1"
+    "@csstools/css-tokenizer": "npm:^2.2.4"
+    "@csstools/media-query-list-parser": "npm:^2.1.9"
+    "@csstools/selector-specificity": "npm:^3.0.2"
+    "@dual-bundle/import-meta-resolve": "npm:^4.0.0"
     balanced-match: "npm:^2.0.0"
     colord: "npm:^2.9.3"
     cosmiconfig: "npm:^9.0.0"
@@ -16448,19 +16463,19 @@ __metadata:
     globby: "npm:^11.1.0"
     globjoin: "npm:^0.1.4"
     html-tags: "npm:^3.3.1"
-    ignore: "npm:^5.3.0"
+    ignore: "npm:^5.3.1"
     imurmurhash: "npm:^0.1.4"
     is-plain-object: "npm:^5.0.0"
-    known-css-properties: "npm:^0.29.0"
+    known-css-properties: "npm:^0.30.0"
     mathml-tag-names: "npm:^2.1.3"
-    meow: "npm:^13.1.0"
+    meow: "npm:^13.2.0"
     micromatch: "npm:^4.0.5"
     normalize-path: "npm:^3.0.0"
     picocolors: "npm:^1.0.0"
-    postcss: "npm:^8.4.33"
+    postcss: "npm:^8.4.38"
     postcss-resolve-nested-selector: "npm:^0.1.1"
     postcss-safe-parser: "npm:^7.0.0"
-    postcss-selector-parser: "npm:^6.0.15"
+    postcss-selector-parser: "npm:^6.0.16"
     postcss-value-parser: "npm:^4.2.0"
     resolve-from: "npm:^5.0.0"
     string-width: "npm:^4.2.3"
@@ -16471,7 +16486,7 @@ __metadata:
     write-file-atomic: "npm:^5.0.1"
   bin:
     stylelint: bin/stylelint.mjs
-  checksum: 10c0/eeaba06885e542c832e5cffc07b2d0dabdc5a72e6ad4d6cb3d01dcc260c29a712b0b935cbd40e059abd68a100e0563fbc617fc4c9bef3b14ecaf6eea651d9d9d
+  checksum: 10c0/98bf770078d727eb7c3ec0932b09c9486481f2d086ea1f4232e00bd1bf58b6b5d3a8d6fc9802df05380cdb06b3d97c5a7c4f27adb221b2a5707ea9829c0ee350
   languageName: node
   linkType: hard
 

From dd061291b1e89b6c67e6dff06ad087abdf7821dc Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 25 Mar 2024 13:45:00 +0100
Subject: [PATCH 0593/2191] Change out-of-band hashtags design in web UI
 (#29732)

---
 app/javascript/styles/mastodon/components.scss | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 4bb3216e459087..55792f22d2ad99 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -9734,18 +9734,24 @@ noscript {
   margin-top: 16px;
   display: flex;
   flex-wrap: wrap;
-  font-size: 14px;
-  line-height: 18px;
-  gap: 4px;
+  font-size: 12px;
+  line-height: 16px;
+  gap: 6px;
   color: $darker-text-color;
 
   a {
     display: inline-flex;
     color: inherit;
     text-decoration: none;
+    padding: 4px 12px;
+    background: $ui-base-color;
+    border-radius: 4px;
+    font-weight: 500;
 
-    &:hover span {
-      text-decoration: underline;
+    &:hover,
+    &:focus,
+    &:active {
+      background: lighten($ui-base-color, 4%);
     }
   }
 

From 29f9dc742eaca1898455e37e01fff087e4bf42a6 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 25 Mar 2024 14:27:38 +0100
Subject: [PATCH 0594/2191] Change design of notification about lost
 connections in web UI (#29731)

---
 .../notifications/components/notification.jsx | 27 ++++----
 .../relationships_severance_event.jsx         | 64 +++++++------------
 app/javascript/mastodon/locales/en.json       | 12 ++--
 .../styles/mastodon/components.scss           | 38 +++++++++++
 4 files changed, 80 insertions(+), 61 deletions(-)

diff --git a/app/javascript/mastodon/features/notifications/components/notification.jsx b/app/javascript/mastodon/features/notifications/components/notification.jsx
index 5527f3d482620f..c09155462809b1 100644
--- a/app/javascript/mastodon/features/notifications/components/notification.jsx
+++ b/app/javascript/mastodon/features/notifications/components/notification.jsx
@@ -12,7 +12,6 @@ import { HotKeys } from 'react-hotkeys';
 
 import EditIcon from '@/material-icons/400-24px/edit.svg?react';
 import FlagIcon from '@/material-icons/400-24px/flag-fill.svg?react';
-import HeartBrokenIcon from '@/material-icons/400-24px/heart_broken-fill.svg?react';
 import HomeIcon from '@/material-icons/400-24px/home-fill.svg?react';
 import InsertChartIcon from '@/material-icons/400-24px/insert_chart.svg?react';
 import PersonIcon from '@/material-icons/400-24px/person-fill.svg?react';
@@ -27,7 +26,7 @@ import { WithRouterPropTypes } from 'mastodon/utils/react_router';
 
 import FollowRequestContainer from '../containers/follow_request_container';
 
-import RelationshipsSeveranceEvent from './relationships_severance_event';
+import { RelationshipsSeveranceEvent } from './relationships_severance_event';
 import Report from './report';
 
 const messages = defineMessages({
@@ -40,6 +39,7 @@ const messages = defineMessages({
   update: { id: 'notification.update', defaultMessage: '{name} edited a post' },
   adminSignUp: { id: 'notification.admin.sign_up', defaultMessage: '{name} signed up' },
   adminReport: { id: 'notification.admin.report', defaultMessage: '{name} reported {target}' },
+  relationshipsSevered: { id: 'notification.relationships_severance_event', defaultMessage: 'Lost connections with {name}' },
 });
 
 const notificationForScreenReader = (intl, message, timestamp) => {
@@ -361,24 +361,23 @@ class Notification extends ImmutablePureComponent {
   }
 
   renderRelationshipsSevered (notification) {
-    const { intl, unread } = this.props;
+    const { intl, unread, hidden } = this.props;
+    const event = notification.get('event');
 
-    if (!notification.get('event')) {
+    if (!event) {
       return null;
     }
 
     return (
       <HotKeys handlers={this.getHandlers()}>
-        <div className={classNames('notification notification-severed-relationships focusable', { unread })} tabIndex={0} aria-label={notificationForScreenReader(intl, intl.formatMessage(messages.adminReport, { name: notification.getIn(['event', 'target_name']) }), notification.get('created_at'))}>
-          <div className='notification__message'>
-            <Icon id='heart_broken' icon={HeartBrokenIcon} />
-
-            <span title={notification.get('created_at')}>
-              <FormattedMessage id='notification.severed_relationships' defaultMessage='Relationships with {name} severed' values={{ name: notification.getIn(['event', 'target_name']) }} />
-            </span>
-          </div>
-
-          <RelationshipsSeveranceEvent event={notification.get('event')} />
+        <div className={classNames('notification notification-severed-relationships focusable', { unread })} tabIndex={0} aria-label={notificationForScreenReader(intl, intl.formatMessage(messages.relationshipsSevered, { name: notification.getIn(['event', 'target_name']) }), notification.get('created_at'))}>
+          <RelationshipsSeveranceEvent
+            type={event.get('type')}
+            target={event.get('target_name')}
+            followersCount={event.get('followers_count')}
+            followingCount={event.get('following_count')}
+            hidden={hidden}
+          />
         </div>
       </HotKeys>
     );
diff --git a/app/javascript/mastodon/features/notifications/components/relationships_severance_event.jsx b/app/javascript/mastodon/features/notifications/components/relationships_severance_event.jsx
index 23d0d2eecf3b20..738159fc5a2ba8 100644
--- a/app/javascript/mastodon/features/notifications/components/relationships_severance_event.jsx
+++ b/app/javascript/mastodon/features/notifications/components/relationships_severance_event.jsx
@@ -2,60 +2,44 @@ import PropTypes from 'prop-types';
 
 import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
 
-import ImmutablePropTypes from 'react-immutable-proptypes';
+import HeartBrokenIcon from '@/material-icons/400-24px/heart_broken-fill.svg?react';
+import { Icon }  from 'mastodon/components/icon';
+import { domain } from 'mastodon/initial_state';
 
-import { RelativeTimestamp } from 'mastodon/components/relative_timestamp';
-
-// This needs to be kept in sync with app/models/relationship_severance_event.rb
+// This needs to be kept in sync with app/models/relationships_severance_event.rb
 const messages = defineMessages({
-  account_suspension: { id: 'relationship_severance_notification.types.account_suspension', defaultMessage: 'Account has been suspended' },
-  domain_block: { id: 'relationship_severance_notification.types.domain_block', defaultMessage: 'Domain has been suspended' },
-  user_domain_block: { id: 'relationship_severance_notification.types.user_domain_block', defaultMessage: 'You blocked this domain' },
+  account_suspension: { id: 'notification.relationships_severance_event.account_suspension', defaultMessage: 'An admin from {from} has suspended {target}, which means you can no longer receive updates from them or interact with them.' },
+  domain_block: { id: 'notification.relationships_severance_event.domain_block', defaultMessage: 'An admin from {from} has blocked {target}, including {followersCount} of your followers and {followingCount, plural, one {# account} other {# accounts}} you follow.' },
+  user_domain_block: { id: 'notification.relationships_severance_event.user_domain_block', defaultMessage: 'You have blocked {target}, removing {followersCount} of your followers and {followingCount, plural, one {# account} other {# accounts}} you follow.' },
 });
 
-const RelationshipsSeveranceEvent = ({ event, hidden }) => {
+export const RelationshipsSeveranceEvent = ({ type, target, followingCount, followersCount, hidden }) => {
   const intl = useIntl();
 
-  if (hidden || !event) {
+  if (hidden) {
     return null;
   }
 
   return (
-    <div className='notification__report'>
-      <div className='notification__report__details'>
-        <div>
-          <RelativeTimestamp timestamp={event.get('created_at')} short={false} />
-          {' · '}
-          { event.get('purged') ? (
-            <FormattedMessage
-              id='relationship_severance_notification.purged_data'
-              defaultMessage='purged by administrators'
-            />
-          ) : (
-            <FormattedMessage
-              id='relationship_severance_notification.relationships'
-              defaultMessage='{count, plural, one {# relationship} other {# relationships}}'
-              values={{ count: event.get('followers_count', 0) + event.get('following_count', 0) }}
-            />
-          )}
-          <br />
-          <strong>{intl.formatMessage(messages[event.get('type')])}</strong>
-        </div>
-
-        <div className='notification__report__actions'>
-          <a href='/severed_relationships' className='button' target='_blank' rel='noopener noreferrer'>
-            <FormattedMessage id='relationship_severance_notification.view' defaultMessage='View' />
-          </a>
-        </div>
+    <a href='/severed_relationships' target='_blank' rel='noopener noreferrer' className='notification__relationships-severance-event'>
+      <Icon id='heart_broken' icon={HeartBrokenIcon} />
+
+      <div className='notification__relationships-severance-event__content'>
+        <p>{intl.formatMessage(messages[type], { from: <strong>{domain}</strong>, target: <strong>{target}</strong>, followingCount, followersCount })}</p>
+        <span className='link-button'><FormattedMessage id='notification.relationships_severance_event.learn_more' defaultMessage='Learn more' /></span>
       </div>
-    </div>
+    </a>
   );
-
 };
 
 RelationshipsSeveranceEvent.propTypes = {
-  event: ImmutablePropTypes.map.isRequired,
+  type: PropTypes.oneOf([
+    'account_suspension',
+    'domain_block',
+    'user_domain_block',
+  ]).isRequired,
+  target: PropTypes.string.isRequired,
+  followersCount: PropTypes.number.isRequired,
+  followingCount: PropTypes.number.isRequired,
   hidden: PropTypes.bool,
 };
-
-export default RelationshipsSeveranceEvent;
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index 1134b393a761e5..5aa3b5c90b4c9b 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -471,7 +471,11 @@
   "notification.own_poll": "Your poll has ended",
   "notification.poll": "A poll you have voted in has ended",
   "notification.reblog": "{name} boosted your post",
-  "notification.severed_relationships": "Relationships with {name} severed",
+  "notification.relationships_severance_event": "Lost connections with {name}",
+  "notification.relationships_severance_event.account_suspension": "An admin from {from} has suspended {target}, which means you can no longer receive updates from them or interact with them.",
+  "notification.relationships_severance_event.domain_block": "An admin from {from} has blocked {target}, including {followersCount} of your followers and {followingCount, plural, one {# account} other {# accounts}} you follow.",
+  "notification.relationships_severance_event.learn_more": "Learn more",
+  "notification.relationships_severance_event.user_domain_block": "You have blocked {target}, removing {followersCount} of your followers and {followingCount, plural, one {# account} other {# accounts}} you follow.",
   "notification.status": "{name} just posted",
   "notification.update": "{name} edited a post",
   "notification_requests.accept": "Accept",
@@ -590,12 +594,6 @@
   "refresh": "Refresh",
   "regeneration_indicator.label": "Loading…",
   "regeneration_indicator.sublabel": "Your home feed is being prepared!",
-  "relationship_severance_notification.purged_data": "purged by administrators",
-  "relationship_severance_notification.relationships": "{count, plural, one {# relationship} other {# relationships}}",
-  "relationship_severance_notification.types.account_suspension": "Account has been suspended",
-  "relationship_severance_notification.types.domain_block": "Domain has been suspended",
-  "relationship_severance_notification.types.user_domain_block": "You blocked this domain",
-  "relationship_severance_notification.view": "View",
   "relative_time.days": "{number}d",
   "relative_time.full.days": "{number, plural, one {# day} other {# days}} ago",
   "relative_time.full.hours": "{number, plural, one {# hour} other {# hours}} ago",
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 55792f22d2ad99..e5cfe235da6042 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -2165,6 +2165,44 @@ a.account__display-name {
   }
 }
 
+.notification__relationships-severance-event {
+  display: flex;
+  gap: 16px;
+  color: $secondary-text-color;
+  text-decoration: none;
+  align-items: flex-start;
+  padding: 16px 32px;
+  border-bottom: 1px solid var(--background-border-color);
+
+  &:hover {
+    color: $primary-text-color;
+  }
+
+  .icon {
+    padding: 2px;
+    color: $highlight-text-color;
+  }
+
+  &__content {
+    display: flex;
+    flex-direction: column;
+    align-items: flex-start;
+    gap: 8px;
+    flex-grow: 1;
+    font-size: 16px;
+    line-height: 24px;
+
+    strong {
+      font-weight: 700;
+    }
+
+    .link-button {
+      font-size: inherit;
+      line-height: inherit;
+    }
+  }
+}
+
 .notification__message {
   padding: 16px;
   padding-bottom: 0;

From 0cea7a623be470c51d7a162265f44f5a3e149275 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 25 Mar 2024 14:39:06 +0100
Subject: [PATCH 0595/2191] Fix background and icon on notification requests in
 web UI (#29706)

---
 .../filtered_notifications_banner.jsx         |  3 +-
 .../components/notification_request.jsx       |  4 +--
 app/javascript/mastodon/locales/en.json       |  1 +
 .../styles/mastodon/components.scss           | 36 +++++++++++--------
 4 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/app/javascript/mastodon/features/notifications/components/filtered_notifications_banner.jsx b/app/javascript/mastodon/features/notifications/components/filtered_notifications_banner.jsx
index adf58afbf0951b..ecf4b74e802269 100644
--- a/app/javascript/mastodon/features/notifications/components/filtered_notifications_banner.jsx
+++ b/app/javascript/mastodon/features/notifications/components/filtered_notifications_banner.jsx
@@ -41,7 +41,8 @@ export const FilteredNotificationsBanner = () => {
       </div>
 
       <div className='filtered-notifications-banner__badge'>
-        {toCappedNumber(policy.getIn(['summary', 'pending_notifications_count']))}
+        <div className='filtered-notifications-banner__badge__badge'>{toCappedNumber(policy.getIn(['summary', 'pending_notifications_count']))}</div>
+        <FormattedMessage id='filtered_notifications_banner.private_mentions' defaultMessage='{count, plural, one {private mention} other {private mentions}}' values={{ count: policy.getIn(['summary', 'pending_notifications_count']) }} />
       </div>
     </Link>
   );
diff --git a/app/javascript/mastodon/features/notifications/components/notification_request.jsx b/app/javascript/mastodon/features/notifications/components/notification_request.jsx
index e24124ca6a2f6f..3a77ef4e2e14ad 100644
--- a/app/javascript/mastodon/features/notifications/components/notification_request.jsx
+++ b/app/javascript/mastodon/features/notifications/components/notification_request.jsx
@@ -7,8 +7,8 @@ import { Link } from 'react-router-dom';
 
 import { useSelector, useDispatch } from 'react-redux';
 
+import DeleteIcon from '@/material-icons/400-24px/delete.svg?react';
 import DoneIcon from '@/material-icons/400-24px/done.svg?react';
-import VolumeOffIcon from '@/material-icons/400-24px/volume_off.svg?react';
 import { acceptNotificationRequest, dismissNotificationRequest } from 'mastodon/actions/notifications';
 import { Avatar } from 'mastodon/components/avatar';
 import { IconButton } from 'mastodon/components/icon_button';
@@ -51,7 +51,7 @@ export const NotificationRequest = ({ id, accountId, notificationsCount }) => {
       </Link>
 
       <div className='notification-request__actions'>
-        <IconButton iconComponent={VolumeOffIcon} onClick={handleDismiss} title={intl.formatMessage(messages.dismiss)} />
+        <IconButton iconComponent={DeleteIcon} onClick={handleDismiss} title={intl.formatMessage(messages.dismiss)} />
         <IconButton iconComponent={DoneIcon} onClick={handleAccept} title={intl.formatMessage(messages.accept)} />
       </div>
     </div>
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index 5aa3b5c90b4c9b..881ed19e0e4506 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -298,6 +298,7 @@
   "filter_modal.select_filter.title": "Filter this post",
   "filter_modal.title.status": "Filter a post",
   "filtered_notifications_banner.pending_requests": "Notifications from {count, plural, =0 {no one} one {one person} other {# people}} you may know",
+  "filtered_notifications_banner.private_mentions": "{count, plural, one {private mention} other {private mentions}}",
   "filtered_notifications_banner.title": "Filtered notifications",
   "firehose.all": "All",
   "firehose.local": "This server",
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index e5cfe235da6042..3704751effdf9c 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -10005,10 +10005,10 @@ noscript {
 .filtered-notifications-banner {
   display: flex;
   align-items: center;
-  background: $ui-base-color;
-  border-bottom: 1px solid lighten($ui-base-color, 8%);
-  padding: 15px;
-  gap: 15px;
+  border: 1px solid var(--background-border-color);
+  border-top: 0;
+  padding: 24px 32px;
+  gap: 16px;
   color: $darker-text-color;
   text-decoration: none;
 
@@ -10016,15 +10016,12 @@ noscript {
   &:active,
   &:focus {
     color: $secondary-text-color;
-
-    .filtered-notifications-banner__badge {
-      background: $secondary-text-color;
-    }
   }
 
   .icon {
     width: 24px;
     height: 24px;
+    padding: 2px;
   }
 
   &__text {
@@ -10040,13 +10037,24 @@ noscript {
   }
 
   &__badge {
-    background: $darker-text-color;
-    color: $ui-base-color;
-    border-radius: 100px;
-    padding: 2px 8px;
+    display: flex;
+    align-items: center;
+    border-radius: 999px;
+    background: var(--background-border-color);
+    color: $darker-text-color;
+    padding: 4px;
+    padding-inline-end: 8px;
+    gap: 6px;
     font-weight: 500;
     font-size: 11px;
     line-height: 16px;
+
+    &__badge {
+      background: $ui-button-background-color;
+      color: $white;
+      border-radius: 100px;
+      padding: 2px 8px;
+    }
   }
 }
 
@@ -10055,7 +10063,7 @@ noscript {
   align-items: center;
   gap: 16px;
   padding: 15px;
-  border-bottom: 1px solid lighten($ui-base-color, 8%);
+  border-bottom: 1px solid var(--background-border-color);
 
   &__link {
     display: flex;
@@ -10103,7 +10111,7 @@ noscript {
 
     .icon-button {
       border-radius: 4px;
-      border: 1px solid lighten($ui-base-color, 8%);
+      border: 1px solid var(--background-border-color);
       padding: 5px;
     }
   }

From 02ea16150647ac3baf0bb8a89203ccc7200b4a2f Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Tue, 26 Mar 2024 10:25:49 +0100
Subject: [PATCH 0596/2191] Support "system" theme setting (light/dark theme
 depending on user system preference) (#29748)

Co-authored-by: Nishiki Liu <hello@nshki.com>
---
 app/helpers/application_helper.rb             |  9 +++++
 .../features/emoji/__tests__/emoji-test.js    | 38 +++++++++---------
 .../mastodon/features/emoji/emoji.js          | 39 +++++++++++++++----
 app/lib/themes.rb                             |  2 +-
 app/views/layouts/application.html.haml       |  2 +-
 app/views/layouts/embedded.html.haml          |  2 +-
 app/views/layouts/error.html.haml             |  2 +-
 config/locales/en.yml                         |  1 +
 config/settings.yml                           |  2 +-
 9 files changed, 65 insertions(+), 32 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 668afe7fde13d9..d46d0674a48c26 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -160,6 +160,15 @@ def body_classes
     output.compact_blank.join(' ')
   end
 
+  def theme_style_tags(theme)
+    if theme == 'system'
+      concat stylesheet_pack_tag('mastodon-light', media: 'not all and (prefers-color-scheme: dark)', crossorigin: 'anonymous')
+      concat stylesheet_pack_tag('default', media: '(prefers-color-scheme: dark)', crossorigin: 'anonymous')
+    else
+      stylesheet_pack_tag theme, media: 'all', crossorigin: 'anonymous'
+    end
+  end
+
   def cdn_host
     Rails.configuration.action_controller.asset_host
   end
diff --git a/app/javascript/mastodon/features/emoji/__tests__/emoji-test.js b/app/javascript/mastodon/features/emoji/__tests__/emoji-test.js
index 7b917ac43b8fc5..9d6ff5226a91a1 100644
--- a/app/javascript/mastodon/features/emoji/__tests__/emoji-test.js
+++ b/app/javascript/mastodon/features/emoji/__tests__/emoji-test.js
@@ -22,23 +22,23 @@ describe('emoji', () => {
 
     it('does unicode', () => {
       expect(emojify('\uD83D\uDC69\u200D\uD83D\uDC69\u200D\uD83D\uDC66\u200D\uD83D\uDC66')).toEqual(
-        '<img draggable="false" class="emojione" alt="👩‍👩‍👦‍👦" title=":woman-woman-boy-boy:" src="/emoji/1f469-200d-1f469-200d-1f466-200d-1f466.svg">');
+        '<picture><img draggable="false" class="emojione" alt="👩‍👩‍👦‍👦" title=":woman-woman-boy-boy:" src="/emoji/1f469-200d-1f469-200d-1f466-200d-1f466.svg"></picture>');
       expect(emojify('👨‍👩‍👧‍👧')).toEqual(
-        '<img draggable="false" class="emojione" alt="👨‍👩‍👧‍👧" title=":man-woman-girl-girl:" src="/emoji/1f468-200d-1f469-200d-1f467-200d-1f467.svg">');
-      expect(emojify('👩‍👩‍👦')).toEqual('<img draggable="false" class="emojione" alt="👩‍👩‍👦" title=":woman-woman-boy:" src="/emoji/1f469-200d-1f469-200d-1f466.svg">');
+        '<picture><img draggable="false" class="emojione" alt="👨‍👩‍👧‍👧" title=":man-woman-girl-girl:" src="/emoji/1f468-200d-1f469-200d-1f467-200d-1f467.svg"></picture>');
+      expect(emojify('👩‍👩‍👦')).toEqual('<picture><img draggable="false" class="emojione" alt="👩‍👩‍👦" title=":woman-woman-boy:" src="/emoji/1f469-200d-1f469-200d-1f466.svg"></picture>');
       expect(emojify('\u2757')).toEqual(
-        '<img draggable="false" class="emojione" alt="❗" title=":exclamation:" src="/emoji/2757.svg">');
+        '<picture><img draggable="false" class="emojione" alt="❗" title=":exclamation:" src="/emoji/2757.svg"></picture>');
     });
 
     it('does multiple unicode', () => {
       expect(emojify('\u2757 #\uFE0F\u20E3')).toEqual(
-        '<img draggable="false" class="emojione" alt="❗" title=":exclamation:" src="/emoji/2757.svg"> <img draggable="false" class="emojione" alt="#️⃣" title=":hash:" src="/emoji/23-20e3.svg">');
+        '<picture><img draggable="false" class="emojione" alt="❗" title=":exclamation:" src="/emoji/2757.svg"></picture> <picture><img draggable="false" class="emojione" alt="#️⃣" title=":hash:" src="/emoji/23-20e3.svg"></picture>');
       expect(emojify('\u2757#\uFE0F\u20E3')).toEqual(
-        '<img draggable="false" class="emojione" alt="❗" title=":exclamation:" src="/emoji/2757.svg"><img draggable="false" class="emojione" alt="#️⃣" title=":hash:" src="/emoji/23-20e3.svg">');
+        '<picture><img draggable="false" class="emojione" alt="❗" title=":exclamation:" src="/emoji/2757.svg"></picture><picture><img draggable="false" class="emojione" alt="#️⃣" title=":hash:" src="/emoji/23-20e3.svg"></picture>');
       expect(emojify('\u2757 #\uFE0F\u20E3 \u2757')).toEqual(
-        '<img draggable="false" class="emojione" alt="❗" title=":exclamation:" src="/emoji/2757.svg"> <img draggable="false" class="emojione" alt="#️⃣" title=":hash:" src="/emoji/23-20e3.svg"> <img draggable="false" class="emojione" alt="❗" title=":exclamation:" src="/emoji/2757.svg">');
+        '<picture><img draggable="false" class="emojione" alt="❗" title=":exclamation:" src="/emoji/2757.svg"></picture> <picture><img draggable="false" class="emojione" alt="#️⃣" title=":hash:" src="/emoji/23-20e3.svg"></picture> <picture><img draggable="false" class="emojione" alt="❗" title=":exclamation:" src="/emoji/2757.svg"></picture>');
       expect(emojify('foo \u2757 #\uFE0F\u20E3 bar')).toEqual(
-        'foo <img draggable="false" class="emojione" alt="❗" title=":exclamation:" src="/emoji/2757.svg"> <img draggable="false" class="emojione" alt="#️⃣" title=":hash:" src="/emoji/23-20e3.svg"> bar');
+        'foo <picture><img draggable="false" class="emojione" alt="❗" title=":exclamation:" src="/emoji/2757.svg"></picture> <picture><img draggable="false" class="emojione" alt="#️⃣" title=":hash:" src="/emoji/23-20e3.svg"></picture> bar');
     });
 
     it('ignores unicode inside of tags', () => {
@@ -46,16 +46,16 @@ describe('emoji', () => {
     });
 
     it('does multiple emoji properly (issue 5188)', () => {
-      expect(emojify('👌🌈💕')).toEqual('<img draggable="false" class="emojione" alt="👌" title=":ok_hand:" src="/emoji/1f44c.svg"><img draggable="false" class="emojione" alt="🌈" title=":rainbow:" src="/emoji/1f308.svg"><img draggable="false" class="emojione" alt="💕" title=":two_hearts:" src="/emoji/1f495.svg">');
-      expect(emojify('👌 🌈 💕')).toEqual('<img draggable="false" class="emojione" alt="👌" title=":ok_hand:" src="/emoji/1f44c.svg"> <img draggable="false" class="emojione" alt="🌈" title=":rainbow:" src="/emoji/1f308.svg"> <img draggable="false" class="emojione" alt="💕" title=":two_hearts:" src="/emoji/1f495.svg">');
+      expect(emojify('👌🌈💕')).toEqual('<picture><img draggable="false" class="emojione" alt="👌" title=":ok_hand:" src="/emoji/1f44c.svg"></picture><picture><img draggable="false" class="emojione" alt="🌈" title=":rainbow:" src="/emoji/1f308.svg"></picture><picture><img draggable="false" class="emojione" alt="💕" title=":two_hearts:" src="/emoji/1f495.svg"></picture>');
+      expect(emojify('👌 🌈 💕')).toEqual('<picture><img draggable="false" class="emojione" alt="👌" title=":ok_hand:" src="/emoji/1f44c.svg"></picture> <picture><img draggable="false" class="emojione" alt="🌈" title=":rainbow:" src="/emoji/1f308.svg"></picture> <picture><img draggable="false" class="emojione" alt="💕" title=":two_hearts:" src="/emoji/1f495.svg"></picture>');
     });
 
     it('does an emoji that has no shortcode', () => {
-      expect(emojify('👁‍🗨')).toEqual('<img draggable="false" class="emojione" alt="👁‍🗨" title="" src="/emoji/1f441-200d-1f5e8.svg">');
+      expect(emojify('👁‍🗨')).toEqual('<picture><img draggable="false" class="emojione" alt="👁‍🗨" title="" src="/emoji/1f441-200d-1f5e8.svg"></picture>');
     });
 
     it('does an emoji whose filename is irregular', () => {
-      expect(emojify('↙️')).toEqual('<img draggable="false" class="emojione" alt="↙️" title=":arrow_lower_left:" src="/emoji/2199.svg">');
+      expect(emojify('↙️')).toEqual('<picture><img draggable="false" class="emojione" alt="↙️" title=":arrow_lower_left:" src="/emoji/2199.svg"></picture>');
     });
 
     it('avoid emojifying on invisible text', () => {
@@ -67,11 +67,11 @@ describe('emoji', () => {
 
     it('avoid emojifying on invisible text with nested tags', () => {
       expect(emojify('<span class="invisible">😄<span class="foo">bar</span>😴</span>😇'))
-        .toEqual('<span class="invisible">😄<span class="foo">bar</span>😴</span><img draggable="false" class="emojione" alt="😇" title=":innocent:" src="/emoji/1f607.svg">');
+        .toEqual('<span class="invisible">😄<span class="foo">bar</span>😴</span><picture><img draggable="false" class="emojione" alt="😇" title=":innocent:" src="/emoji/1f607.svg"></picture>');
       expect(emojify('<span class="invisible">😄<span class="invisible">😕</span>😴</span>😇'))
-        .toEqual('<span class="invisible">😄<span class="invisible">😕</span>😴</span><img draggable="false" class="emojione" alt="😇" title=":innocent:" src="/emoji/1f607.svg">');
+        .toEqual('<span class="invisible">😄<span class="invisible">😕</span>😴</span><picture><img draggable="false" class="emojione" alt="😇" title=":innocent:" src="/emoji/1f607.svg"></picture>');
       expect(emojify('<span class="invisible">😄<br>😴</span>😇'))
-        .toEqual('<span class="invisible">😄<br>😴</span><img draggable="false" class="emojione" alt="😇" title=":innocent:" src="/emoji/1f607.svg">');
+        .toEqual('<span class="invisible">😄<br>😴</span><picture><img draggable="false" class="emojione" alt="😇" title=":innocent:" src="/emoji/1f607.svg"></picture>');
     });
 
     it('does not emojify emojis with textual presentation VS15 character', () => {
@@ -79,19 +79,19 @@ describe('emoji', () => {
         .toEqual('✴︎');
     });
 
-    it('does an simple emoji properly', () => {
+    it('does a simple emoji properly', () => {
       expect(emojify('♀♂'))
-        .toEqual('<img draggable="false" class="emojione" alt="♀" title=":female_sign:" src="/emoji/2640.svg"><img draggable="false" class="emojione" alt="♂" title=":male_sign:" src="/emoji/2642.svg">');
+        .toEqual('<picture><img draggable="false" class="emojione" alt="♀" title=":female_sign:" src="/emoji/2640.svg"></picture><picture><img draggable="false" class="emojione" alt="♂" title=":male_sign:" src="/emoji/2642.svg"></picture>');
     });
 
     it('does an emoji containing ZWJ properly', () => {
       expect(emojify('💂‍♀️💂‍♂️'))
-        .toEqual('<img draggable="false" class="emojione" alt="💂\u200D♀️" title=":female-guard:" src="/emoji/1f482-200d-2640-fe0f_border.svg"><img draggable="false" class="emojione" alt="💂\u200D♂️" title=":male-guard:" src="/emoji/1f482-200d-2642-fe0f_border.svg">');
+        .toEqual('<picture><img draggable="false" class="emojione" alt="💂\u200D♀️" title=":female-guard:" src="/emoji/1f482-200d-2640-fe0f_border.svg"></picture><picture><img draggable="false" class="emojione" alt="💂\u200D♂️" title=":male-guard:" src="/emoji/1f482-200d-2642-fe0f_border.svg"></picture>');
     });
 
     it('keeps ordering as expected (issue fixed by PR 20677)', () => {
       expect(emojify('<p>💕 <a class="hashtag" href="https://example.com/tags/foo" rel="nofollow noopener noreferrer" target="_blank">#<span>foo</span></a> test: foo.</p>'))
-        .toEqual('<p><img draggable="false" class="emojione" alt="💕" title=":two_hearts:" src="/emoji/1f495.svg"> <a class="hashtag" href="https://example.com/tags/foo" rel="nofollow noopener noreferrer" target="_blank">#<span>foo</span></a> test: foo.</p>');
+        .toEqual('<p><picture><img draggable="false" class="emojione" alt="💕" title=":two_hearts:" src="/emoji/1f495.svg"></picture> <a class="hashtag" href="https://example.com/tags/foo" rel="nofollow noopener noreferrer" target="_blank">#<span>foo</span></a> test: foo.</p>');
     });
   });
 });
diff --git a/app/javascript/mastodon/features/emoji/emoji.js b/app/javascript/mastodon/features/emoji/emoji.js
index 5918a65ed7df15..e4aad302f65119 100644
--- a/app/javascript/mastodon/features/emoji/emoji.js
+++ b/app/javascript/mastodon/features/emoji/emoji.js
@@ -17,8 +17,13 @@ const emojiFilenames = (emojis) => {
 const darkEmoji = emojiFilenames(['🎱', '🐜', '⚫', '🖤', '⬛', '◼️', '◾', '◼️', '✒️', '▪️', '💣', '🎳', '📷', '📸', '♣️', '🕶️', '✴️', '🔌', '💂‍♀️', '📽️', '🍳', '🦍', '💂', '🔪', '🕳️', '🕹️', '🕋', '🖊️', '🖋️', '💂‍♂️', '🎤', '🎓', '🎥', '🎼', '♠️', '🎩', '🦃', '📼', '📹', '🎮', '🐃', '🏴', '🐞', '🕺', '📱', '📲', '🚲', '🪮', '🐦‍⬛']);
 const lightEmoji = emojiFilenames(['👽', '⚾', '🐔', '☁️', '💨', '🕊️', '👀', '🍥', '👻', '🐐', '❕', '❔', '⛸️', '🌩️', '🔊', '🔇', '📃', '🌧️', '🐏', '🍚', '🍙', '🐓', '🐑', '💀', '☠️', '🌨️', '🔉', '🔈', '💬', '💭', '🏐', '🏳️', '⚪', '⬜', '◽', '◻️', '▫️', '🪽', '🪿']);
 
-const emojiFilename = (filename) => {
-  const borderedEmoji = (document.body && document.body.classList.contains('theme-mastodon-light')) ? lightEmoji : darkEmoji;
+/**
+ * @param {string} filename
+ * @param {"light" | "dark" } colorScheme
+ * @returns {string}
+ */
+const emojiFilename = (filename, colorScheme) => {
+  const borderedEmoji = colorScheme === "light" ? lightEmoji : darkEmoji;
   return borderedEmoji.includes(filename) ? (filename + '_border') : filename;
 };
 
@@ -92,12 +97,30 @@ const emojifyTextNode = (node, customEmojis) => {
       const { filename, shortCode } = unicodeMapping[unicode_emoji];
       const title = shortCode ? `:${shortCode}:` : '';
 
-      replacement = document.createElement('img');
-      replacement.setAttribute('draggable', 'false');
-      replacement.setAttribute('class', 'emojione');
-      replacement.setAttribute('alt', unicode_emoji);
-      replacement.setAttribute('title', title);
-      replacement.setAttribute('src', `${assetHost}/emoji/${emojiFilename(filename)}.svg`);
+      replacement = document.createElement('picture');
+
+      const isSystemTheme = !!document.body?.classList.contains('theme-system');
+
+      if(isSystemTheme) {
+        let source = document.createElement('source');
+        source.setAttribute('media', '(prefers-color-scheme: dark)');
+        source.setAttribute('srcset', `${assetHost}/emoji/${emojiFilename(filename, "dark")}.svg`);
+        replacement.appendChild(source);
+      }
+
+      let img = document.createElement('img');
+      img.setAttribute('draggable', 'false');
+      img.setAttribute('class', 'emojione');
+      img.setAttribute('alt', unicode_emoji);
+      img.setAttribute('title', title);
+
+      let theme = "light";
+
+      if(!isSystemTheme && !document.body?.classList.contains('theme-mastodon-light'))
+        theme = "dark";
+
+      img.setAttribute('src', `${assetHost}/emoji/${emojiFilename(filename, theme)}.svg`);
+      replacement.appendChild(img);
     }
 
     // Add the processed-up-to-now string and the emoji replacement
diff --git a/app/lib/themes.rb b/app/lib/themes.rb
index 243ffb9ab97cb5..4010d84435c26c 100644
--- a/app/lib/themes.rb
+++ b/app/lib/themes.rb
@@ -11,6 +11,6 @@ def initialize
   end
 
   def names
-    @conf.keys
+    ['system'] + @conf.keys
   end
 end
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 449657f8cab316..0cd7fc9f44a617 100755
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -27,7 +27,7 @@
     %title= html_title
 
     = stylesheet_pack_tag 'common', media: 'all', crossorigin: 'anonymous'
-    = stylesheet_pack_tag current_theme, media: 'all', crossorigin: 'anonymous'
+    = theme_style_tags current_theme
     -# Needed for the wicg-inert polyfill. It needs to be on it's own <style> tag, with this `id`
     = stylesheet_pack_tag 'inert', media: 'all', id: 'inert-style'
 
diff --git a/app/views/layouts/embedded.html.haml b/app/views/layouts/embedded.html.haml
index 54d4ba715764ae..c633fa9e087caa 100644
--- a/app/views/layouts/embedded.html.haml
+++ b/app/views/layouts/embedded.html.haml
@@ -12,7 +12,7 @@
       %link{ rel: 'dns-prefetch', href: storage_host }/
 
     = stylesheet_pack_tag 'common', media: 'all', crossorigin: 'anonymous'
-    = stylesheet_pack_tag Setting.default_settings['theme'], media: 'all', crossorigin: 'anonymous'
+    = theme_style_tags Setting.theme # Use the admin-configured theme here, even if logged in
     = javascript_pack_tag 'common', integrity: true, crossorigin: 'anonymous'
     = preload_pack_asset "locale/#{I18n.locale}-json.js"
     = render_initial_state
diff --git a/app/views/layouts/error.html.haml b/app/views/layouts/error.html.haml
index b7aafe98797ac6..485a69c909fabf 100644
--- a/app/views/layouts/error.html.haml
+++ b/app/views/layouts/error.html.haml
@@ -6,7 +6,7 @@
     %title= safe_join([yield(:page_title), Setting.default_settings['site_title']], ' - ')
     %meta{ content: 'width=device-width,initial-scale=1', name: 'viewport' }/
     = stylesheet_pack_tag 'common', media: 'all', crossorigin: 'anonymous'
-    = stylesheet_pack_tag Setting.default_settings['theme'], media: 'all', crossorigin: 'anonymous'
+    = theme_style_tags Setting.default_settings['theme']
     = javascript_pack_tag 'common', crossorigin: 'anonymous'
     = javascript_pack_tag 'error', crossorigin: 'anonymous'
   %body.error
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 823e720ea75070..6cd996594d9ac2 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1769,6 +1769,7 @@ en:
     contrast: Mastodon (High contrast)
     default: Mastodon (Dark)
     mastodon-light: Mastodon (Light)
+    system: Automatic (use system theme)
   time:
     formats:
       default: "%b %d, %Y, %H:%M"
diff --git a/config/settings.yml b/config/settings.yml
index 208c8e3760c2e5..297bf0281d03ae 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -16,7 +16,7 @@ defaults: &defaults
   show_staff_badge: true
   preview_sensitive_media: false
   noindex: false
-  theme: 'default'
+  theme: 'system'
   trends: true
   trends_as_landing_page: true
   trendable_by_default: false

From 36bc57de959c92806f31a709a18fc15c527cfc1a Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 26 Mar 2024 09:27:05 +0000
Subject: [PATCH 0597/2191] Update dependency cssnano to v6.1.2 (#29754)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 5bf1095d8fc3c6..696e7960f6d555 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6503,12 +6503,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"css-declaration-sorter@npm:^7.1.1":
-  version: 7.1.1
-  resolution: "css-declaration-sorter@npm:7.1.1"
+"css-declaration-sorter@npm:^7.2.0":
+  version: 7.2.0
+  resolution: "css-declaration-sorter@npm:7.2.0"
   peerDependencies:
     postcss: ^8.0.9
-  checksum: 10c0/bea446e441bafde21c3c7b3f7639559311da12eea140db7ee3c61e4f41df455b7b098df107f99bc0cca32a5020841cc94bf8a2d5efb1b383e51f9de478c4816e
+  checksum: 10c0/d8516be94f8f2daa233ef021688b965c08161624cbf830a4d7ee1099429437c0ee124d35c91b1c659cfd891a68e8888aa941726dab12279bc114aaed60a94606
   languageName: node
   linkType: hard
 
@@ -6670,12 +6670,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cssnano-preset-default@npm:^6.1.1":
-  version: 6.1.1
-  resolution: "cssnano-preset-default@npm:6.1.1"
+"cssnano-preset-default@npm:^6.1.2":
+  version: 6.1.2
+  resolution: "cssnano-preset-default@npm:6.1.2"
   dependencies:
     browserslist: "npm:^4.23.0"
-    css-declaration-sorter: "npm:^7.1.1"
+    css-declaration-sorter: "npm:^7.2.0"
     cssnano-utils: "npm:^4.0.2"
     postcss-calc: "npm:^9.0.1"
     postcss-colormin: "npm:^6.1.0"
@@ -6706,7 +6706,7 @@ __metadata:
     postcss-unique-selectors: "npm:^6.0.4"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/dc5927c8538778f859b781dc1fb10f0082cd7b3afdba30e835e472dbf51724d4f18e5170587761150142284a371d6c9d2c3b51d29826c08d2b9dd86a929597ee
+  checksum: 10c0/af99021f936763850f5f35dc9e6a9dfb0da30856dea36e0420b011da2a447099471db2a5f3d1f5f52c0489da186caf9a439d8f048a80f82617077efb018333fa
   languageName: node
   linkType: hard
 
@@ -6720,14 +6720,14 @@ __metadata:
   linkType: hard
 
 "cssnano@npm:^6.0.1":
-  version: 6.1.1
-  resolution: "cssnano@npm:6.1.1"
+  version: 6.1.2
+  resolution: "cssnano@npm:6.1.2"
   dependencies:
-    cssnano-preset-default: "npm:^6.1.1"
+    cssnano-preset-default: "npm:^6.1.2"
     lilconfig: "npm:^3.1.1"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/2db52c2f5e314f05efec8977de392886ef0e7e08568ac45446f2303218180e317cee64c6c0c6d2c1d70a7f339fcead75384e09e187b88ccacd7f9fd51919fdf1
+  checksum: 10c0/4df0dc0389b34b38acb09b7cfb07267b0eda95349c6d5e9b7666acc7200bb33359650869a60168e9d878298b05f4ad2c7f070815c90551720a3f4e1037f79691
   languageName: node
   linkType: hard
 

From 3002a1e89b0271c242ba16851148aacdab5f3473 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 26 Mar 2024 10:27:23 +0100
Subject: [PATCH 0598/2191] Update dependency express to v4.19.2 (#29750)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 696e7960f6d555..a2258375b22dc8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8194,8 +8194,8 @@ __metadata:
   linkType: hard
 
 "express@npm:^4.17.1, express@npm:^4.18.2":
-  version: 4.19.1
-  resolution: "express@npm:4.19.1"
+  version: 4.19.2
+  resolution: "express@npm:4.19.2"
   dependencies:
     accepts: "npm:~1.3.8"
     array-flatten: "npm:1.1.1"
@@ -8228,7 +8228,7 @@ __metadata:
     type-is: "npm:~1.6.18"
     utils-merge: "npm:1.0.1"
     vary: "npm:~1.1.2"
-  checksum: 10c0/1cf6d3c095131f0d730105fac23a713083604d4f3ad9364df53cade50662abcfee2f6f8a955fdf164a5ee63f09f457da0b70cbed435ad302fa6f14162a9757f9
+  checksum: 10c0/e82e2662ea9971c1407aea9fc3c16d6b963e55e3830cd0ef5e00b533feda8b770af4e3be630488ef8a752d7c75c4fcefb15892868eeaafe7353cb9e3e269fdcb
   languageName: node
   linkType: hard
 

From 572a8ef7f9f03561a099b6d59ebb26921cbfa776 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 26 Mar 2024 10:27:41 +0100
Subject: [PATCH 0599/2191] Update dependency rubocop-rails to v2.24.1 (#29745)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index b341ca84b3d070..0b3c8d5a77c8ce 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -668,7 +668,7 @@ GEM
     rubocop-performance (1.20.2)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.30.0, < 2.0)
-    rubocop-rails (2.24.0)
+    rubocop-rails (2.24.1)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)

From 06fc2b3fde8b8bd80912c66bc25d0fbf19cd55f0 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 26 Mar 2024 10:29:38 +0100
Subject: [PATCH 0600/2191] Update dependency faker to v3.3.0 (#29755)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 0b3c8d5a77c8ce..7354e8a60bd0d3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -246,7 +246,7 @@ GEM
       tzinfo
     excon (0.109.0)
     fabrication (2.31.0)
-    faker (3.2.3)
+    faker (3.3.0)
       i18n (>= 1.8.11, < 2)
     faraday (1.10.3)
       faraday-em_http (~> 1.0)

From a3e8b7825056f41617cd469d0fe469d69056953f Mon Sep 17 00:00:00 2001
From: Emelia Smith <ThisIsMissEm@users.noreply.github.com>
Date: Tue, 26 Mar 2024 10:30:07 +0100
Subject: [PATCH 0601/2191] Ensure case-insensitive fields are converted to
 lowercase in Admin Imports (#29739)

---
 app/models/admin/import.rb | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/models/admin/import.rb b/app/models/admin/import.rb
index 0fd4bdb824ea90..c12c9a86b91370 100644
--- a/app/models/admin/import.rb
+++ b/app/models/admin/import.rb
@@ -30,12 +30,14 @@ def csv_data
 
     csv_converter = lambda do |field, field_info|
       case field_info.header
-      when '#domain', '#public_comment'
+      when '#domain'
+        field&.downcase&.strip
+      when '#public_comment'
         field&.strip
       when '#severity'
-        field&.strip&.to_sym
+        field&.downcase&.strip&.to_sym
       when '#reject_media', '#reject_reports', '#obfuscate'
-        ActiveModel::Type::Boolean.new.cast(field)
+        ActiveModel::Type::Boolean.new.cast(field&.downcase)
       else
         field
       end

From eb926b7e6075b1fe5aace4d65cb7749717304b4d Mon Sep 17 00:00:00 2001
From: Emelia Smith <ThisIsMissEm@users.noreply.github.com>
Date: Tue, 26 Mar 2024 10:30:10 +0100
Subject: [PATCH 0602/2191] Ensure case-insensitive fields are converted to
 lowercase in user imports (#29740)

---
 app/models/form/import.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/models/form/import.rb b/app/models/form/import.rb
index fc83d9c58c1fdb..3cc4af064ffafc 100644
--- a/app/models/form/import.rb
+++ b/app/models/form/import.rb
@@ -111,12 +111,14 @@ def csv_data
     csv_converter = lambda do |field, field_info|
       case field_info.header
       when 'Show boosts', 'Notify on new posts', 'Hide notifications'
-        ActiveModel::Type::Boolean.new.cast(field)
+        ActiveModel::Type::Boolean.new.cast(field&.downcase)
       when 'Languages'
         field&.split(',')&.map(&:strip)&.presence
       when 'Account address'
         field.strip.gsub(/\A@/, '')
-      when '#domain', '#uri', 'List name'
+      when '#domain'
+        field&.strip&.downcase
+      when '#uri', 'List name'
         field.strip
       else
         field

From 5e6a600b642cb1b8ea6ba6abe734d16ebe47b63f Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 26 Mar 2024 05:31:24 -0400
Subject: [PATCH 0603/2191] Bundler version update and misc gem version bumps
 (#29717)

---
 Gemfile.lock | 59 ++++++++++++++++++++++++++--------------------------
 1 file changed, 29 insertions(+), 30 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 7354e8a60bd0d3..133dae5b3dffe6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -99,20 +99,20 @@ GEM
     ast (2.4.2)
     attr_encrypted (4.0.0)
       encryptor (~> 3.0.0)
-    attr_required (1.0.1)
+    attr_required (1.0.2)
     awrence (1.2.1)
     aws-eventstream (1.3.0)
-    aws-partitions (1.873.0)
-    aws-sdk-core (3.190.1)
+    aws-partitions (1.899.0)
+    aws-sdk-core (3.191.4)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.8)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.75.0)
-      aws-sdk-core (~> 3, >= 3.188.0)
+    aws-sdk-kms (1.78.0)
+      aws-sdk-core (~> 3, >= 3.191.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.142.0)
-      aws-sdk-core (~> 3, >= 3.189.0)
+    aws-sdk-s3 (1.146.0)
+      aws-sdk-core (~> 3, >= 3.191.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.8)
     aws-sigv4 (1.8.0)
@@ -132,7 +132,7 @@ GEM
       erubi (>= 1.0.0)
       rack (>= 0.9.0)
       rouge (>= 1.0.0)
-    better_html (2.0.2)
+    better_html (2.1.1)
       actionview (>= 6.0)
       activesupport (>= 6.0)
       ast (~> 2.0)
@@ -140,9 +140,9 @@ GEM
       parser (>= 2.4)
       smart_properties
     bigdecimal (3.1.7)
-    bindata (2.4.15)
-    binding_of_caller (1.0.0)
-      debug_inspector (>= 0.0.1)
+    bindata (2.5.0)
+    binding_of_caller (1.0.1)
+      debug_inspector (>= 1.2.0)
     blurhash (0.1.7)
     bootsnap (1.18.3)
       msgpack (~> 1.2)
@@ -167,7 +167,7 @@ GEM
       xpath (~> 3.2)
     case_transform (0.2)
       activesupport
-    cbor (0.5.9.6)
+    cbor (0.5.9.8)
     charlock_holmes (0.7.7)
     chewy (7.5.1)
       activesupport (>= 5.2)
@@ -182,11 +182,11 @@ GEM
     cose (1.3.0)
       cbor (~> 0.5.9)
       openssl-signature_algorithm (~> 1.0)
-    crack (0.4.6)
+    crack (1.0.0)
       bigdecimal
       rexml
     crass (1.0.6)
-    css_parser (1.14.0)
+    css_parser (1.16.0)
       addressable
     csv (3.2.8)
     database_cleaner-active_record (2.1.0)
@@ -197,7 +197,7 @@ GEM
     debug (1.9.1)
       irb (~> 1.10)
       reline (>= 0.3.8)
-    debug_inspector (1.1.0)
+    debug_inspector (1.2.0)
     devise (4.9.3)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
@@ -217,8 +217,7 @@ GEM
     discard (1.3.0)
       activerecord (>= 4.2, < 8)
     docile (1.4.0)
-    domain_name (0.5.20190701)
-      unf (>= 0.0.5, < 1.0.0)
+    domain_name (0.6.20240107)
     doorkeeper (5.6.9)
       railties (>= 5)
     dotenv (2.8.1)
@@ -242,9 +241,9 @@ GEM
       mail (~> 2.7)
     encryptor (3.0.0)
     erubi (1.12.0)
-    et-orbi (1.2.7)
+    et-orbi (1.2.10)
       tzinfo
-    excon (0.109.0)
+    excon (0.110.0)
     fabrication (2.31.0)
     faker (3.3.0)
       i18n (>= 1.8.11, < 2)
@@ -275,7 +274,7 @@ GEM
       faraday (~> 1.0)
     fast_blank (1.0.1)
     fastimage (2.3.0)
-    ffi (1.15.5)
+    ffi (1.16.3)
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
       rake
@@ -291,7 +290,7 @@ GEM
       fog-core (~> 2.1)
       fog-json (>= 1.0)
     formatador (1.1.0)
-    fugit (1.8.1)
+    fugit (1.10.1)
       et-orbi (~> 1, >= 1.2.7)
       raabro (~> 1.4)
     fuubar (2.5.1)
@@ -423,7 +422,7 @@ GEM
       net-imap
       net-pop
       net-smtp
-    marcel (1.0.2)
+    marcel (1.0.4)
     mario-redis-lock (1.2.1)
       redis (>= 3.0.5)
     matrix (0.4.2)
@@ -434,7 +433,7 @@ GEM
     memory_profiler (1.0.1)
     mime-types (3.5.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2023.1205)
+    mime-types-data (3.2024.0305)
     mini_mime (1.1.5)
     mini_portile2 (2.8.5)
     minitest (5.22.3)
@@ -456,7 +455,7 @@ GEM
       timeout
     net-smtp (0.4.0.1)
       net-protocol
-    nio4r (2.5.9)
+    nio4r (2.7.1)
     nokogiri (1.16.3)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
@@ -511,7 +510,7 @@ GEM
     pghero (3.4.1)
       activerecord (>= 6)
     posix-spawn (0.3.15)
-    premailer (1.21.0)
+    premailer (1.23.0)
       addressable
       css_parser (>= 1.12.0)
       htmlentities (>= 4.0.0)
@@ -618,7 +617,7 @@ GEM
       railties (>= 5.2)
     rexml (3.2.6)
     rotp (6.3.0)
-    rouge (4.1.2)
+    rouge (4.2.1)
     rpam2 (4.0.2)
     rqrcode (2.2.0)
       chunky_png (~> 1.0)
@@ -763,7 +762,7 @@ GEM
       tty-cursor (~> 0.7)
       tty-screen (~> 0.8)
       wisper (~> 2.0)
-    tty-screen (0.8.1)
+    tty-screen (0.8.2)
     twitter-text (3.1.0)
       idn-ruby
       unf (~> 0.1.0)
@@ -773,7 +772,7 @@ GEM
       tzinfo (>= 1.0.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.8.2)
+    unf_ext (0.0.9.1)
     unicode-display_width (2.5.0)
     uri (0.12.2)
     validate_email (0.1.6)
@@ -796,7 +795,7 @@ GEM
     webfinger (1.2.0)
       activesupport
       httpclient (>= 2.4)
-    webmock (3.22.0)
+    webmock (3.23.0)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
@@ -956,4 +955,4 @@ RUBY VERSION
    ruby 3.2.2p53
 
 BUNDLED WITH
-   2.5.4
+   2.5.7

From c3e3c600696114065302a81d0be05b7d1a7f0a41 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 26 Mar 2024 05:33:07 -0400
Subject: [PATCH 0604/2191] Remove extraneous `Lint/UselessAccessModifier`
 config (#29749)

---
 .rubocop.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index d968346f6b5681..541da330c73f99 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -41,12 +41,6 @@ Layout/FirstHashElementIndentation:
 Layout/LineLength:
   Max: 320 # Default of 120 causes a duplicate entry in generated todo file
 
-# Reason:
-# https://docs.rubocop.org/rubocop/cops_lint.html#lintuselessaccessmodifier
-Lint/UselessAccessModifier:
-  ContextCreatingMethods:
-    - class_methods
-
 ## Disable most Metrics/*Length cops
 # Reason: those are often triggered and force significant refactors when this happend
 #         but the team feel they are not really improving the code quality.

From b3d970bdb85973023a588389f8a5a17df1ee67ca Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 26 Mar 2024 10:49:19 +0100
Subject: [PATCH 0605/2191] New Crowdin Translations (automated) (#29756)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/be.json    |  3 ---
 app/javascript/mastodon/locales/bg.json    |  9 ++-----
 app/javascript/mastodon/locales/ca.json    | 15 ++++++------
 app/javascript/mastodon/locales/da.json    | 12 +++++-----
 app/javascript/mastodon/locales/de.json    | 13 +++++-----
 app/javascript/mastodon/locales/es-AR.json | 13 +++++-----
 app/javascript/mastodon/locales/es-MX.json | 12 ++++------
 app/javascript/mastodon/locales/es.json    | 12 ++++------
 app/javascript/mastodon/locales/eu.json    | 10 +++-----
 app/javascript/mastodon/locales/fi.json    |  9 ++-----
 app/javascript/mastodon/locales/fo.json    | 13 +++++-----
 app/javascript/mastodon/locales/fr-CA.json |  7 ------
 app/javascript/mastodon/locales/fr.json    |  7 ------
 app/javascript/mastodon/locales/gd.json    |  7 ------
 app/javascript/mastodon/locales/gl.json    |  9 ++-----
 app/javascript/mastodon/locales/he.json    | 13 +++++-----
 app/javascript/mastodon/locales/hu.json    | 15 ++++++------
 app/javascript/mastodon/locales/is.json    |  5 ++--
 app/javascript/mastodon/locales/it.json    | 10 +++-----
 app/javascript/mastodon/locales/ko.json    |  7 ------
 app/javascript/mastodon/locales/lad.json   |  2 --
 app/javascript/mastodon/locales/lt.json    |  3 ---
 app/javascript/mastodon/locales/lv.json    |  4 ++--
 app/javascript/mastodon/locales/nl.json    | 13 +++++-----
 app/javascript/mastodon/locales/nn.json    | 15 ++++++------
 app/javascript/mastodon/locales/pl.json    | 12 ++++------
 app/javascript/mastodon/locales/pt-PT.json |  7 ------
 app/javascript/mastodon/locales/sk.json    |  3 +--
 app/javascript/mastodon/locales/sl.json    |  9 ++-----
 app/javascript/mastodon/locales/sq.json    | 13 +++++-----
 app/javascript/mastodon/locales/sv.json    |  6 +----
 app/javascript/mastodon/locales/th.json    | 13 +++++-----
 app/javascript/mastodon/locales/tr.json    | 13 +++++-----
 app/javascript/mastodon/locales/uk.json    | 10 +++-----
 app/javascript/mastodon/locales/vi.json    | 15 ++++++------
 app/javascript/mastodon/locales/zh-CN.json | 13 +++++-----
 app/javascript/mastodon/locales/zh-HK.json |  7 ------
 app/javascript/mastodon/locales/zh-TW.json | 13 +++++-----
 config/locales/devise.hu.yml               |  6 ++---
 config/locales/doorkeeper.hu.yml           |  4 ++--
 config/locales/hu.yml                      | 28 +++++++++++-----------
 config/locales/is.yml                      | 10 ++++++++
 config/locales/sl.yml                      |  5 ++++
 43 files changed, 171 insertions(+), 254 deletions(-)

diff --git a/app/javascript/mastodon/locales/be.json b/app/javascript/mastodon/locales/be.json
index 754b7156b87e42..fe186222a78d52 100644
--- a/app/javascript/mastodon/locales/be.json
+++ b/app/javascript/mastodon/locales/be.json
@@ -471,7 +471,6 @@
   "notification.own_poll": "Ваша апытанне скончылася",
   "notification.poll": "Апытанне, дзе вы прынялі ўдзел, скончылася",
   "notification.reblog": "{name} пашырыў ваш допіс",
-  "notification.severed_relationships": "Зносіны з {name} былі разарваныя",
   "notification.status": "Новы допіс ад {name}",
   "notification.update": "Допіс {name} адрэдагаваны",
   "notification_requests.accept": "Прыняць",
@@ -589,8 +588,6 @@
   "refresh": "Абнавiць",
   "regeneration_indicator.label": "Загрузка…",
   "regeneration_indicator.sublabel": "Пачакайце, рыхтуем вашу стужку!",
-  "relationship_severance_notification.types.user_domain_block": "Вы заблакіравалі гэты дамен",
-  "relationship_severance_notification.view": "Праглядзець",
   "relative_time.days": "{number} д",
   "relative_time.full.days": "{number, plural, one {# дзень} few {# дні} many {# дзён} other {# дня}} таму",
   "relative_time.full.hours": "{number, plural, one {# гадзіна} few {# гадзіны} many {# гадзін} other {# гадзіны}} таму",
diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json
index 4670a6e2d6d0ef..b7a236d60b2d69 100644
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@@ -471,7 +471,6 @@
   "notification.own_poll": "Анкетата ви приключи",
   "notification.poll": "Анкета, в която гласувахте, приключи",
   "notification.reblog": "{name} подсили ваша публикация",
-  "notification.severed_relationships": "Връзката с {name} е прекъсната",
   "notification.status": "{name} току-що публикува",
   "notification.update": "{name} промени публикация",
   "notification_requests.accept": "Приемам",
@@ -484,6 +483,8 @@
   "notifications.column_settings.admin.sign_up": "Нови регистрации:",
   "notifications.column_settings.alert": "Известия на работния плот",
   "notifications.column_settings.favourite": "Любими:",
+  "notifications.column_settings.filter_bar.advanced": "Показване на всички категории",
+  "notifications.column_settings.filter_bar.category": "Лента за бърз филтър",
   "notifications.column_settings.follow": "Нови последователи:",
   "notifications.column_settings.follow_request": "Нови заявки за последване:",
   "notifications.column_settings.mention": "Споменавания:",
@@ -588,12 +589,6 @@
   "refresh": "Опресняване",
   "regeneration_indicator.label": "Зареждане…",
   "regeneration_indicator.sublabel": "Подготовка на началния ви инфоканал!",
-  "relationship_severance_notification.purged_data": "прочистено от администраторите",
-  "relationship_severance_notification.relationships": "{count, plural, one {# връзка} other {# връзки}}",
-  "relationship_severance_notification.types.account_suspension": "Акаунтът е спрян",
-  "relationship_severance_notification.types.domain_block": "Домейнът е спрян",
-  "relationship_severance_notification.types.user_domain_block": "Блокирахте този домейн",
-  "relationship_severance_notification.view": "Преглед",
   "relative_time.days": "{number} д.",
   "relative_time.full.days": "преди {number, plural, one {# ден} other {# дни}}",
   "relative_time.full.hours": "преди {number, plural, one {# час} other {# часа}}",
diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index c95e8a9502fc9e..eee6d281d07ed9 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -298,6 +298,7 @@
   "filter_modal.select_filter.title": "Filtra aquest tut",
   "filter_modal.title.status": "Filtra un tut",
   "filtered_notifications_banner.pending_requests": "Notificacions {count, plural, =0 {de ningú} one {d'una persona} other {de # persones}} que potser coneixes",
+  "filtered_notifications_banner.private_mentions": "{count, plural, one {menció privada} other {mencions privades}}",
   "filtered_notifications_banner.title": "Notificacions filtrades",
   "firehose.all": "Tots",
   "firehose.local": "Aquest servidor",
@@ -471,7 +472,11 @@
   "notification.own_poll": "La teva enquesta ha finalitzat",
   "notification.poll": "Ha finalitzat una enquesta en què has votat",
   "notification.reblog": "{name} t'ha impulsat",
-  "notification.severed_relationships": "S'han eliminat les relacions amb {name}",
+  "notification.relationships_severance_event": "Connexions perdudes amb {name}",
+  "notification.relationships_severance_event.account_suspension": "Un administrador de {from} ha suspès {target}; això vol dir que ja no en podreu rebre actualitzacions o interactuar-hi.",
+  "notification.relationships_severance_event.domain_block": "Un administrador de {from} ha blocat {target}, incloent-hi {followersCount} dels vostres seguidors i {followingCount, plural, one {# compte} other {# comptes}} que seguiu.",
+  "notification.relationships_severance_event.learn_more": "Per a saber-ne més",
+  "notification.relationships_severance_event.user_domain_block": "Heu blocat {target}, eliminant {followersCount} dels vostres seguidors i {followingCount, plural, one {# compte} other {# comptes}} que seguiu.",
   "notification.status": "{name} acaba de publicar",
   "notification.update": "{name} ha editat un tut",
   "notification_requests.accept": "Accepta",
@@ -484,6 +489,8 @@
   "notifications.column_settings.admin.sign_up": "Registres nous:",
   "notifications.column_settings.alert": "Notificacions d'escriptori",
   "notifications.column_settings.favourite": "Favorits:",
+  "notifications.column_settings.filter_bar.advanced": "Mostra totes les categories",
+  "notifications.column_settings.filter_bar.category": "Barra ràpida de filtres",
   "notifications.column_settings.follow": "Nous seguidors:",
   "notifications.column_settings.follow_request": "Noves sol·licituds de seguiment:",
   "notifications.column_settings.mention": "Mencions:",
@@ -588,12 +595,6 @@
   "refresh": "Actualitza",
   "regeneration_indicator.label": "Es carrega…",
   "regeneration_indicator.sublabel": "Es prepara la teva línia de temps d'Inici!",
-  "relationship_severance_notification.purged_data": "purgat pels administradors",
-  "relationship_severance_notification.relationships": "{count, plural, one {# relació} other {# relacions}}",
-  "relationship_severance_notification.types.account_suspension": "S'ha suspès el compte",
-  "relationship_severance_notification.types.domain_block": "S'ha suspès el domini",
-  "relationship_severance_notification.types.user_domain_block": "Heu blocat aquest domini",
-  "relationship_severance_notification.view": "Visualitza",
   "relative_time.days": "{number}d",
   "relative_time.full.days": "fa {number, plural, one {# dia} other {# dies}}",
   "relative_time.full.hours": "fa {number, plural, one {# hora} other {# hores}}",
diff --git a/app/javascript/mastodon/locales/da.json b/app/javascript/mastodon/locales/da.json
index 97468c6272d1c8..2e5fb21fef565f 100644
--- a/app/javascript/mastodon/locales/da.json
+++ b/app/javascript/mastodon/locales/da.json
@@ -296,6 +296,7 @@
   "filter_modal.select_filter.title": "Filtrér dette indlæg",
   "filter_modal.title.status": "Filtrér et indlæg",
   "filtered_notifications_banner.pending_requests": "Notifikationer fra {count, plural, =0 {ingen} one {én person} other {# personer}} du måske kender",
+  "filtered_notifications_banner.private_mentions": "{count, plural, one {privat omtale} other {private omtaler}}",
   "filtered_notifications_banner.title": "Filtrerede notifikationer",
   "firehose.all": "Alle",
   "firehose.local": "Denne server",
@@ -469,6 +470,11 @@
   "notification.own_poll": "Din afstemning er afsluttet",
   "notification.poll": "En afstemning, hvori du stemte, er slut",
   "notification.reblog": "{name} boostede dit indlæg",
+  "notification.relationships_severance_event": "Mistede forbindelser med {name}",
+  "notification.relationships_severance_event.account_suspension": "En admin fra {from} har suspenderet {target}, hvofor opdateringer herfra eller interaktion hermed ikke længer er mulig.",
+  "notification.relationships_severance_event.domain_block": "En admin fra {from} har blokeret {target}, herunder {followersCount} tilhængere og {followingCount, plural, one {# konto, der} other {# konti, som}} følges.",
+  "notification.relationships_severance_event.learn_more": "Læs mere",
+  "notification.relationships_severance_event.user_domain_block": "{target} er blevet blokeret, og {followersCount} tilhængere samt {followingCount, plural, one {# konto, der} other {# konti, som}} følges, er hermed fjernet.",
   "notification.status": "{name} har netop postet",
   "notification.update": "{name} redigerede et indlæg",
   "notification_requests.accept": "Acceptér",
@@ -587,12 +593,6 @@
   "refresh": "Genindlæs",
   "regeneration_indicator.label": "Indlæser…",
   "regeneration_indicator.sublabel": "Din hjemmetidslinje klargøres!",
-  "relationship_severance_notification.purged_data": "renset af administratorer",
-  "relationship_severance_notification.relationships": "{count, plural, one {# forhold} other {# forhold}}",
-  "relationship_severance_notification.types.account_suspension": "Konto er blevet suspenderet",
-  "relationship_severance_notification.types.domain_block": "Domæne er blevet suspenderet",
-  "relationship_severance_notification.types.user_domain_block": "Dette domæne blev blokeret",
-  "relationship_severance_notification.view": "Vis",
   "relative_time.days": "{number}d",
   "relative_time.full.days": "{number, plural, one {# dag} other {# dage}} siden",
   "relative_time.full.hours": "{number, plural, one {# time} other {# timer}} siden",
diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json
index 8cc77c0725a1f1..b1d0b3ec14a5fc 100644
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@@ -298,6 +298,7 @@
   "filter_modal.select_filter.title": "Diesen Beitrag filtern",
   "filter_modal.title.status": "Beitrag per Filter ausblenden",
   "filtered_notifications_banner.pending_requests": "Benachrichtigungen von {count, plural, =0 {keinem Profil, das du möglicherweise kennst} one {einem Profil, das du möglicherweise kennst} other {# Profilen, die du möglicherweise kennst}}",
+  "filtered_notifications_banner.private_mentions": "{count, plural, one {private Erwähnung} other {private Erwähnungen}}",
   "filtered_notifications_banner.title": "Gefilterte Benachrichtigungen",
   "firehose.all": "Alles",
   "firehose.local": "Dieser Server",
@@ -471,7 +472,11 @@
   "notification.own_poll": "Deine Umfrage ist beendet",
   "notification.poll": "Eine Umfrage, an der du teilgenommen hast, ist beendet",
   "notification.reblog": "{name} teilte deinen Beitrag",
-  "notification.severed_relationships": "Beziehungen zu {name} getrennt",
+  "notification.relationships_severance_event": "Verbindungen mit {name} verloren",
+  "notification.relationships_severance_event.account_suspension": "Ein Admin von {from} hat {target} gesperrt. Du wirst von diesem Profil keine Updates mehr erhalten und auch nicht mit ihm interagieren können.",
+  "notification.relationships_severance_event.domain_block": "Ein Admin von {from} hat {target} blockiert – darunter {followersCount} deiner Follower und {followingCount, plural, one {# Konto, dem} other {# Konten, denen}} du folgst.",
+  "notification.relationships_severance_event.learn_more": "Mehr erfahren",
+  "notification.relationships_severance_event.user_domain_block": "Du hast {target} blockiert – {followersCount} deiner Follower und {followingCount, plural, one {# Konto, dem} other {# Konten, denen}} du folgst, wurden entfernt.",
   "notification.status": "{name} hat gerade etwas gepostet",
   "notification.update": "{name} bearbeitete einen Beitrag",
   "notification_requests.accept": "Akzeptieren",
@@ -590,12 +595,6 @@
   "refresh": "Aktualisieren",
   "regeneration_indicator.label": "Wird geladen …",
   "regeneration_indicator.sublabel": "Deine Startseite wird gerade vorbereitet!",
-  "relationship_severance_notification.purged_data": "von Administrator*innen entfernt",
-  "relationship_severance_notification.relationships": "{count, plural, one {# Beziehung} other {# Beziehungen}}",
-  "relationship_severance_notification.types.account_suspension": "Konto wurde gesperrt",
-  "relationship_severance_notification.types.domain_block": "Domain wurde gesperrt",
-  "relationship_severance_notification.types.user_domain_block": "Du hast diese Domain blockiert",
-  "relationship_severance_notification.view": "Anzeigen",
   "relative_time.days": "{number} T.",
   "relative_time.full.days": "vor {number, plural, one {# Tag} other {# Tagen}}",
   "relative_time.full.hours": "vor {number, plural, one {# Stunde} other {# Stunden}}",
diff --git a/app/javascript/mastodon/locales/es-AR.json b/app/javascript/mastodon/locales/es-AR.json
index a9db8831e2914d..c14edac6bf7e06 100644
--- a/app/javascript/mastodon/locales/es-AR.json
+++ b/app/javascript/mastodon/locales/es-AR.json
@@ -298,6 +298,7 @@
   "filter_modal.select_filter.title": "Filtrar este mensaje",
   "filter_modal.title.status": "Filtrar un mensaje",
   "filtered_notifications_banner.pending_requests": "Notificaciones de {count, plural, =0 {nadie} one {una persona} other {# personas}} que podrías conocer",
+  "filtered_notifications_banner.private_mentions": "{count, plural, one {mención privada} other {menciones privadas}}",
   "filtered_notifications_banner.title": "Notificaciones filtradas",
   "firehose.all": "Todos",
   "firehose.local": "Este servidor",
@@ -471,7 +472,11 @@
   "notification.own_poll": "Tu encuesta finalizó",
   "notification.poll": "Finalizó una encuesta en la que votaste",
   "notification.reblog": "{name} adhirió a tu mensaje",
-  "notification.severed_relationships": "Relaciones con {name} cortadas",
+  "notification.relationships_severance_event": "Conexiones perdidas con {name}",
+  "notification.relationships_severance_event.account_suspension": "Un administrador de {from} suspendió a {target}, lo que significa que ya no podés recibir actualizaciones de esa cuenta o interactuar con la misma.",
+  "notification.relationships_severance_event.domain_block": "Un administrador de {from} bloqueó a {target}, incluyendo {followersCount} de tus seguidores y {followingCount, plural, one {# cuenta} other {# cuentas}} que seguís.",
+  "notification.relationships_severance_event.learn_more": "Aprendé más",
+  "notification.relationships_severance_event.user_domain_block": "Bloqueaste a {target}, eliminando {followersCount} de tus seguidores y {followingCount, plural, one {# cuenta} other {# cuentas}} que seguís.",
   "notification.status": "{name} acaba de enviar un mensaje",
   "notification.update": "{name} editó un mensaje",
   "notification_requests.accept": "Aceptar",
@@ -590,12 +595,6 @@
   "refresh": "Refrescar",
   "regeneration_indicator.label": "Cargando…",
   "regeneration_indicator.sublabel": "¡Se está preparando tu línea temporal principal!",
-  "relationship_severance_notification.purged_data": "purgada por administradores",
-  "relationship_severance_notification.relationships": "{count, plural, one {# relación} other {# relaciones}}",
-  "relationship_severance_notification.types.account_suspension": "La cuenta fue suspendida",
-  "relationship_severance_notification.types.domain_block": "El dominio fue suspendido",
-  "relationship_severance_notification.types.user_domain_block": "Bloqueaste este dominio",
-  "relationship_severance_notification.view": "Ver",
   "relative_time.days": "{number}d",
   "relative_time.full.days": "{number, plural,one {hace # día} other {hace # días}}",
   "relative_time.full.hours": "{number, plural,one {hace # hora} other {hace # horas}}",
diff --git a/app/javascript/mastodon/locales/es-MX.json b/app/javascript/mastodon/locales/es-MX.json
index dea71a93513b6e..fd32d9d903b8c7 100644
--- a/app/javascript/mastodon/locales/es-MX.json
+++ b/app/javascript/mastodon/locales/es-MX.json
@@ -471,7 +471,11 @@
   "notification.own_poll": "Tu encuesta ha terminado",
   "notification.poll": "Una encuesta en la que has votado ha terminado",
   "notification.reblog": "{name} ha retooteado tu estado",
-  "notification.severed_relationships": "Se han cortado las relaciones con {name}",
+  "notification.relationships_severance_event": "Conexiones perdidas con {name}",
+  "notification.relationships_severance_event.account_suspension": "Un administrador de {from} ha suspendido {target}, lo que significa que ya no puedes recibir actualizaciones de sus cuentas o interactuar con ellas.",
+  "notification.relationships_severance_event.domain_block": "Un administrador de {from} ha bloqueado {target}, incluyendo {followersCount} de tus seguidores y {followingCount, plural, one {# cuenta} other {# cuentas}} que sigues.",
+  "notification.relationships_severance_event.learn_more": "Más información",
+  "notification.relationships_severance_event.user_domain_block": "Has bloqueado {target}, eliminando {followersCount} de tus seguidores y {followingCount, plural, one {# cuenta} other {# cuentas}} que sigues.",
   "notification.status": "{name} acaba de publicar",
   "notification.update": "{name} editó una publicación",
   "notification_requests.accept": "Aceptar",
@@ -590,12 +594,6 @@
   "refresh": "Actualizar",
   "regeneration_indicator.label": "Cargando…",
   "regeneration_indicator.sublabel": "¡Tu historia de inicio se está preparando!",
-  "relationship_severance_notification.purged_data": "purgado por administradores",
-  "relationship_severance_notification.relationships": "{count, plural, one {# relación} other {# relaciones}}",
-  "relationship_severance_notification.types.account_suspension": "La cuenta ha sido suspendida",
-  "relationship_severance_notification.types.domain_block": "El dominio ha sido suspendido",
-  "relationship_severance_notification.types.user_domain_block": "Bloqueaste este dominio",
-  "relationship_severance_notification.view": "Ver",
   "relative_time.days": "{number} d",
   "relative_time.full.days": "{number, plural, one {# día} other {# días hace}}",
   "relative_time.full.hours": "{number, plural, one {# hora} other {# horas}} hace",
diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json
index 64bcf7d9c0f70b..9c15a3cae48989 100644
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@@ -471,7 +471,11 @@
   "notification.own_poll": "Tu encuesta ha terminado",
   "notification.poll": "Una encuesta en la que has votado ha terminado",
   "notification.reblog": "{name} ha impulsado tu publicación",
-  "notification.severed_relationships": "Se han cortado las relaciones con {name}",
+  "notification.relationships_severance_event": "Conexiones perdidas con {name}",
+  "notification.relationships_severance_event.account_suspension": "Un administrador de {from} ha suspendido {target}, lo que significa que ya no puedes recibir actualizaciones de sus cuentas o interactuar con ellas.",
+  "notification.relationships_severance_event.domain_block": "Un administrador de {from} ha bloqueado {target}, incluyendo {followersCount} de tus seguidores y {followingCount, plural, one {# cuenta} other {# cuentas}} que sigues.",
+  "notification.relationships_severance_event.learn_more": "Más información",
+  "notification.relationships_severance_event.user_domain_block": "Has bloqueado {target}, eliminando {followersCount} de tus seguidores y {followingCount, plural, one {# cuenta} other {# cuentas}} que sigues.",
   "notification.status": "{name} acaba de publicar",
   "notification.update": "{name} editó una publicación",
   "notification_requests.accept": "Aceptar",
@@ -590,12 +594,6 @@
   "refresh": "Actualizar",
   "regeneration_indicator.label": "Cargando…",
   "regeneration_indicator.sublabel": "¡Tu historia de inicio se está preparando!",
-  "relationship_severance_notification.purged_data": "purgado por administradores",
-  "relationship_severance_notification.relationships": "{count, plural, one {# relación} other {# relaciones}}",
-  "relationship_severance_notification.types.account_suspension": "La cuenta ha sido suspendida",
-  "relationship_severance_notification.types.domain_block": "El dominio ha sido suspendido",
-  "relationship_severance_notification.types.user_domain_block": "Bloqueaste este dominio",
-  "relationship_severance_notification.view": "Ver",
   "relative_time.days": "{number} d",
   "relative_time.full.days": "hace {number, plural, one {# día} other {# días}}",
   "relative_time.full.hours": "hace {number, plural, one {# hora} other {# horas}}",
diff --git a/app/javascript/mastodon/locales/eu.json b/app/javascript/mastodon/locales/eu.json
index 8c3c5f98456a31..40fec4f49cb4ba 100644
--- a/app/javascript/mastodon/locales/eu.json
+++ b/app/javascript/mastodon/locales/eu.json
@@ -471,7 +471,9 @@
   "notification.own_poll": "Zure inkesta amaitu da",
   "notification.poll": "Zuk erantzun duzun inkesta bat bukatu da",
   "notification.reblog": "{name}(e)k bultzada eman dio zure bidalketari",
-  "notification.severed_relationships": "{name} erabiltzailearekin zenuen erlazioa galdu da",
+  "notification.relationships_severance_event": "{name} erabiltzailearekin galdutako konexioak",
+  "notification.relationships_severance_event.account_suspension": "{from} zerbitzariko administratzaile batek {target} bertan behera utzi du, hau da, ezin izango dituzu jaso hango eguneratzerik edo hangoekin elkarreragin.",
+  "notification.relationships_severance_event.learn_more": "Informazio gehiago",
   "notification.status": "{name} erabiltzaileak bidalketa egin berri du",
   "notification.update": "{name} erabiltzaileak bidalketa bat editatu du",
   "notification_requests.accept": "Onartu",
@@ -590,12 +592,6 @@
   "refresh": "Berritu",
   "regeneration_indicator.label": "Kargatzen…",
   "regeneration_indicator.sublabel": "Zure hasiera-jarioa prestatzen ari da!",
-  "relationship_severance_notification.purged_data": "administratzaileek kendua",
-  "relationship_severance_notification.relationships": "{count, plural, one {Erlazio #} other {# erlazio}}",
-  "relationship_severance_notification.types.account_suspension": "Kontua bertan behera utzi da",
-  "relationship_severance_notification.types.domain_block": "Domeinua bertan behera utzi da",
-  "relationship_severance_notification.types.user_domain_block": "Domeinu hau blokeatu duzu",
-  "relationship_severance_notification.view": "Ikusi",
   "relative_time.days": "{number}e",
   "relative_time.full.days": "Duela {number, plural, one {egun #} other {# egun}}",
   "relative_time.full.hours": "Duela {number, plural, one {ordu #} other {# ordu}}",
diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index 16670d9ffed4d3..9dfa61ef4a5c51 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -298,6 +298,7 @@
   "filter_modal.select_filter.title": "Suodata tämä julkaisu",
   "filter_modal.title.status": "Suodata julkaisu",
   "filtered_notifications_banner.pending_requests": "Ilmoitukset {count, plural, =0 {ei keltään} one {yhdeltä henkilöltä} other {# henkilöltä}}, jonka saatat tuntea",
+  "filtered_notifications_banner.private_mentions": "{count, plural, one {yksityismaininta} other {yksityismainintaa}}",
   "filtered_notifications_banner.title": "Suodatetut ilmoitukset",
   "firehose.all": "Kaikki",
   "firehose.local": "Tämä palvelin",
@@ -471,7 +472,7 @@
   "notification.own_poll": "Äänestyksesi on päättynyt",
   "notification.poll": "Kysely, johon osallistuit, on päättynyt",
   "notification.reblog": "{name} tehosti julkaisuasi",
-  "notification.severed_relationships": "Suhteet palvelimeen {name} katkenneet",
+  "notification.relationships_severance_event.learn_more": "Lue lisää",
   "notification.status": "{name} julkaisi juuri",
   "notification.update": "{name} muokkasi julkaisua",
   "notification_requests.accept": "Hyväksy",
@@ -590,12 +591,6 @@
   "refresh": "Päivitä",
   "regeneration_indicator.label": "Ladataan…",
   "regeneration_indicator.sublabel": "Kotisyötettäsi valmistellaan!",
-  "relationship_severance_notification.purged_data": "ylläpitäjien tyhjentämä",
-  "relationship_severance_notification.relationships": "{count, plural, one {# suhde} other {# suhdetta}}",
-  "relationship_severance_notification.types.account_suspension": "Tili on jäädytetty",
-  "relationship_severance_notification.types.domain_block": "Verkkotunnus on jäädytetty",
-  "relationship_severance_notification.types.user_domain_block": "Estit tämän verkkotunnuksen",
-  "relationship_severance_notification.view": "Näytä",
   "relative_time.days": "{number} pv",
   "relative_time.full.days": "{number, plural, one {# päivä} other {# päivää}} sitten",
   "relative_time.full.hours": "{number, plural, one {# tunti} other {# tuntia}} sitten",
diff --git a/app/javascript/mastodon/locales/fo.json b/app/javascript/mastodon/locales/fo.json
index c86829ee30ca84..b8722ee319edf2 100644
--- a/app/javascript/mastodon/locales/fo.json
+++ b/app/javascript/mastodon/locales/fo.json
@@ -298,6 +298,7 @@
   "filter_modal.select_filter.title": "Filtrera hendan postin",
   "filter_modal.title.status": "Filtrera ein post",
   "filtered_notifications_banner.pending_requests": "Fráboðanir frá {count, plural, =0 {ongum} one {einum persóni} other {# persónum}}, sum tú kanska kennir",
+  "filtered_notifications_banner.private_mentions": "{count, plural, one {privat umrøða} other {privatar umrøður}}",
   "filtered_notifications_banner.title": "Sáldaðar fráboðanir",
   "firehose.all": "Allar",
   "firehose.local": "Hesin ambætarin",
@@ -471,7 +472,11 @@
   "notification.own_poll": "Tín atkvøðugreiðsla er endað",
   "notification.poll": "Ein atkvøðugreiðsla, har tú hevur atkvøtt, er endað",
   "notification.reblog": "{name} lyfti tín post",
-  "notification.severed_relationships": "Tilknýti við {name} avbrotið",
+  "notification.relationships_severance_event": "Mist sambond við {name}",
+  "notification.relationships_severance_event.account_suspension": "Ein umsitari frá {from} hevur gjørt {target} óvirkna, sum merkir, at tú ikki kanst móttaka dagføringar ella virka saman við teimum longur.",
+  "notification.relationships_severance_event.domain_block": "Ein umsitari frá {from} hevur blokerað {target}, íroknað {followersCount} av tínum fylgjarum og {followingCount, plural, one {# kontu} other {# kontur}}, sum tú fylgir.",
+  "notification.relationships_severance_event.learn_more": "Lær meira",
+  "notification.relationships_severance_event.user_domain_block": "Tú hevur blokerað {target}, strikað {followersCount} av tínum fylgjarum og {followingCount, plural, one {# kontu} other {# kontur}}, sum tú fylgir.",
   "notification.status": "{name} hevur júst postað",
   "notification.update": "{name} rættaði ein post",
   "notification_requests.accept": "Góðtak",
@@ -590,12 +595,6 @@
   "refresh": "Endurles",
   "regeneration_indicator.label": "Innlesur…",
   "regeneration_indicator.sublabel": "Tín heimarás verður gjørd klár!",
-  "relationship_severance_notification.purged_data": "reinsað av umsitarum",
-  "relationship_severance_notification.relationships": "{count, plural, one {# tilknýti} other {# tilknýti}}",
-  "relationship_severance_notification.types.account_suspension": "Kontan er ógildað",
-  "relationship_severance_notification.types.domain_block": "Økisnavn er ógildað",
-  "relationship_severance_notification.types.user_domain_block": "Tú hevur forðað hesum økisnavni",
-  "relationship_severance_notification.view": "Vís",
   "relative_time.days": "{number}d",
   "relative_time.full.days": "{number, plural, one {# dagur} other {# dagar}} síðani",
   "relative_time.full.hours": "{number, plural, one {# tími} other {# tímar}} síðani",
diff --git a/app/javascript/mastodon/locales/fr-CA.json b/app/javascript/mastodon/locales/fr-CA.json
index 1e1c78f29d6aea..ab4a3f309ce076 100644
--- a/app/javascript/mastodon/locales/fr-CA.json
+++ b/app/javascript/mastodon/locales/fr-CA.json
@@ -471,7 +471,6 @@
   "notification.own_poll": "Votre sondage est terminé",
   "notification.poll": "Un sondage auquel vous avez participé est terminé",
   "notification.reblog": "{name} a boosté votre message",
-  "notification.severed_relationships": "Relation avec {name} rompues",
   "notification.status": "{name} vient de publier",
   "notification.update": "{name} a modifié une publication",
   "notification_requests.accept": "Accepter",
@@ -588,12 +587,6 @@
   "refresh": "Actualiser",
   "regeneration_indicator.label": "Chargement…",
   "regeneration_indicator.sublabel": "Votre fil d'accueil est en cours de préparation!",
-  "relationship_severance_notification.purged_data": "supprimées par les administrateurs",
-  "relationship_severance_notification.relationships": "{count, plural, one {# relation} other {# relations}}",
-  "relationship_severance_notification.types.account_suspension": "Le compte a été suspendu",
-  "relationship_severance_notification.types.domain_block": "Le domaine a été suspendu",
-  "relationship_severance_notification.types.user_domain_block": "Vous avez bloqué ce domaine",
-  "relationship_severance_notification.view": "Afficher",
   "relative_time.days": "{number} j",
   "relative_time.full.days": "il y a {number, plural, one {# jour} other {# jours}}",
   "relative_time.full.hours": "il y a {number, plural, one {# heure} other {# heures}}",
diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json
index af5ed66bd8bd1e..5ae6fac9f7889e 100644
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@@ -471,7 +471,6 @@
   "notification.own_poll": "Votre sondage est terminé",
   "notification.poll": "Un sondage auquel vous avez participé vient de se terminer",
   "notification.reblog": "{name} a partagé votre message",
-  "notification.severed_relationships": "Relation avec {name} rompues",
   "notification.status": "{name} vient de publier",
   "notification.update": "{name} a modifié un message",
   "notification_requests.accept": "Accepter",
@@ -588,12 +587,6 @@
   "refresh": "Actualiser",
   "regeneration_indicator.label": "Chargement…",
   "regeneration_indicator.sublabel": "Votre fil principal est en cours de préparation !",
-  "relationship_severance_notification.purged_data": "supprimées par les administrateurs",
-  "relationship_severance_notification.relationships": "{count, plural, one {# relation} other {# relations}}",
-  "relationship_severance_notification.types.account_suspension": "Le compte a été suspendu",
-  "relationship_severance_notification.types.domain_block": "Le domaine a été suspendu",
-  "relationship_severance_notification.types.user_domain_block": "Vous avez bloqué ce domaine",
-  "relationship_severance_notification.view": "Afficher",
   "relative_time.days": "{number} j",
   "relative_time.full.days": "il y a {number, plural, one {# jour} other {# jours}}",
   "relative_time.full.hours": "il y a {number, plural, one {# heure} other {# heures}}",
diff --git a/app/javascript/mastodon/locales/gd.json b/app/javascript/mastodon/locales/gd.json
index 612e3637749e9f..d835a46863cb68 100644
--- a/app/javascript/mastodon/locales/gd.json
+++ b/app/javascript/mastodon/locales/gd.json
@@ -471,7 +471,6 @@
   "notification.own_poll": "Thàinig an cunntas-bheachd agad gu crìoch",
   "notification.poll": "Thàinig cunntas-bheachd sa bhòt thu gu crìoch",
   "notification.reblog": "Bhrosnaich {name} am post agad",
-  "notification.severed_relationships": "Chaidh na dàimhean le {name} a dhealachadh",
   "notification.status": "Phostaich {name} rud",
   "notification.update": "Dheasaich {name} post",
   "notification_requests.accept": "Gabh ris",
@@ -588,12 +587,6 @@
   "refresh": "Ath-nuadhaich",
   "regeneration_indicator.label": "’Ga luchdadh…",
   "regeneration_indicator.sublabel": "Tha do dhachaigh ’ga ullachadh!",
-  "relationship_severance_notification.purged_data": "chaidh a phurgaideachadh leis na rianairean",
-  "relationship_severance_notification.relationships": "{count, plural, one {# dàimh} two {# dhàimh} few {# dàimhean} other {# dàimh}}",
-  "relationship_severance_notification.types.account_suspension": "Chaidh cunntas a chur à rèim",
-  "relationship_severance_notification.types.domain_block": "Chaidh àrainn a chur à rèim",
-  "relationship_severance_notification.types.user_domain_block": "Bhac thu an àrainn seo",
-  "relationship_severance_notification.view": "Seall",
   "relative_time.days": "{number}l",
   "relative_time.full.days": "{number, plural, one {# latha} two {# latha} few {# làithean} other {# latha}} air ais",
   "relative_time.full.hours": "{number, plural, one {# uair a thìde} two {# uair a thìde} few {# uairean a thìde} other {# uair a thìde}} air ais",
diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json
index 57d13205fbfc02..20de52d30c1599 100644
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@@ -471,7 +471,6 @@
   "notification.own_poll": "A túa enquisa rematou",
   "notification.poll": "Rematou a enquisa na que votaches",
   "notification.reblog": "{name} compartiu a túa publicación",
-  "notification.severed_relationships": "Cortouse a relación con {name}",
   "notification.status": "{name} publicou",
   "notification.update": "{name} editou unha publicación",
   "notification_requests.accept": "Aceptar",
@@ -484,6 +483,8 @@
   "notifications.column_settings.admin.sign_up": "Novas usuarias:",
   "notifications.column_settings.alert": "Notificacións de escritorio",
   "notifications.column_settings.favourite": "Favoritas:",
+  "notifications.column_settings.filter_bar.advanced": "Mostrar todas as categorías",
+  "notifications.column_settings.filter_bar.category": "Barra de filtrado rápido",
   "notifications.column_settings.follow": "Novas seguidoras:",
   "notifications.column_settings.follow_request": "Novas peticións de seguimento:",
   "notifications.column_settings.mention": "Mencións:",
@@ -588,12 +589,6 @@
   "refresh": "Actualizar",
   "regeneration_indicator.label": "Estase a cargar…",
   "regeneration_indicator.sublabel": "Estase a preparar a túa cronoloxía de inicio!",
-  "relationship_severance_notification.purged_data": "purgada pola administración",
-  "relationship_severance_notification.relationships": "{count, plural, one {# relación} other {# relacións}}",
-  "relationship_severance_notification.types.account_suspension": "A conta foi suspendida",
-  "relationship_severance_notification.types.domain_block": "O dominio foi suspendido",
-  "relationship_severance_notification.types.user_domain_block": "Bloqueaches este dominio",
-  "relationship_severance_notification.view": "Ver",
   "relative_time.days": "{number}d",
   "relative_time.full.days": "hai {number, plural, one {# día} other {# días}}",
   "relative_time.full.hours": "hai {number, plural, one {# hora} other {# horas}}",
diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json
index 82dec2d863ebde..155708cfaea547 100644
--- a/app/javascript/mastodon/locales/he.json
+++ b/app/javascript/mastodon/locales/he.json
@@ -298,6 +298,7 @@
   "filter_modal.select_filter.title": "סינון ההודעה הזו",
   "filter_modal.title.status": "סנן הודעה",
   "filtered_notifications_banner.pending_requests": "{count, plural,=0 {אין התראות ממשתמשים ה}one {התראה אחת ממישהו/מישהי ה}two {יש התראותיים ממשתמשים }other {יש # התראות ממשתמשים }}מוכרים לך",
+  "filtered_notifications_banner.private_mentions": "{count, plural, one {איזכור פרטי} other {איזכורים פרטיים}}",
   "filtered_notifications_banner.title": "התראות מסוננות",
   "firehose.all": "הכל",
   "firehose.local": "שרת זה",
@@ -471,7 +472,11 @@
   "notification.own_poll": "הסקר שלך הסתיים",
   "notification.poll": "סקר שהצבעת בו הסתיים",
   "notification.reblog": "הודעתך הודהדה על ידי {name}",
-  "notification.severed_relationships": "חתכתם כל קשר עם {name}",
+  "notification.relationships_severance_event": "אבד הקשר עם {name}",
+  "notification.relationships_severance_event.account_suspension": "מנהל.ת משרת {from} השע(ת)ה את {target}, ולפיכך לא תעודכנו יותר על ידם ולא תוכלו להיות איתם בקשר.",
+  "notification.relationships_severance_event.domain_block": "מנהל.ת מאתר {from} חסמו את {target} ובכלל זה {followersCount} מעוקביך וגם {followingCount, plural, one {חשבון אחד} two {שני חשבונות} many {# חשבונות} other {# חשבונות}} מבין נעקביך.",
+  "notification.relationships_severance_event.learn_more": "למידע נוסף",
+  "notification.relationships_severance_event.user_domain_block": "חסמת את {target} ובכלל זה {followersCount} מעוקביך וגם {followingCount, plural, one {חשבון אחד} two {שני חשבונות} many {# חשבונות} other {# חשבונות}} מבין נעקביך.",
   "notification.status": "{name} הרגע פרסמו",
   "notification.update": "{name} ערכו הודעה",
   "notification_requests.accept": "לקבל",
@@ -590,12 +595,6 @@
   "refresh": "רענון",
   "regeneration_indicator.label": "טוען…",
   "regeneration_indicator.sublabel": "פיד הבית שלך בהכנה!",
-  "relationship_severance_notification.purged_data": "המידע נמחק על ידי ההנהלה",
-  "relationship_severance_notification.relationships": "{count, plural, one {קשר אחד}  other {# קשרים}}",
-  "relationship_severance_notification.types.account_suspension": "החשבון הושעה",
-  "relationship_severance_notification.types.domain_block": "השרת הושעה",
-  "relationship_severance_notification.types.user_domain_block": "חסמת שרת זה",
-  "relationship_severance_notification.view": "הצג",
   "relative_time.days": "{number} ימים",
   "relative_time.full.days": "לפני {number, plural, one {# יום} other {# ימים}}",
   "relative_time.full.hours": "לפני {number, plural, one {# שעה} other {# שעות}}",
diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json
index d9dfd01a26ab7c..c8e57c526f8d3b 100644
--- a/app/javascript/mastodon/locales/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@@ -298,6 +298,7 @@
   "filter_modal.select_filter.title": "E bejegyzés szűrése",
   "filter_modal.title.status": "Egy bejegyzés szűrése",
   "filtered_notifications_banner.pending_requests": "Értesítések {count, plural, =0 {nincsenek} one {egy valósztínűleg ismerős személytől} other {# valószínűleg ismerős személytől}}",
+  "filtered_notifications_banner.private_mentions": "{count, plural, one {privát említés} other {privát említés}}",
   "filtered_notifications_banner.title": "Szűrt értesítések",
   "firehose.all": "Összes",
   "firehose.local": "Ez a kiszolgáló",
@@ -471,7 +472,11 @@
   "notification.own_poll": "A szavazásod véget ért",
   "notification.poll": "Egy szavazás, melyben részt vettél, véget ért",
   "notification.reblog": "{name} megtolta a bejegyzésedet",
-  "notification.severed_relationships": "A kapcsolatok megszakítva ezzel: {name}",
+  "notification.relationships_severance_event": "Elvesztek a kapcsolatok vele: {name}",
+  "notification.relationships_severance_event.account_suspension": "Egy admin a {from} kiszolgálóról felfüggesztette {target} fiókot, ami azt jelenti, hogy mostantól nem tudsz vele interaktálni vagy tőle értesítéseket kapni.",
+  "notification.relationships_severance_event.domain_block": "Egy admin a {from} kiszolgálón letiltotta {target} domaint, beleértve {followersCount} követődet és {followingCount, plural, one {#} other {#}} általad követett személyt.",
+  "notification.relationships_severance_event.learn_more": "További információk",
+  "notification.relationships_severance_event.user_domain_block": "Letiltottad a(z) {target} domaint, ezzel eltávolítva {followersCount} követőt és {followingCount, plural, one {#} other {#}} követett fiókot.",
   "notification.status": "{name} bejegyzést tett közzé",
   "notification.update": "{name} szerkesztett egy bejegyzést",
   "notification_requests.accept": "Elfogadás",
@@ -484,6 +489,8 @@
   "notifications.column_settings.admin.sign_up": "Új regisztrálók:",
   "notifications.column_settings.alert": "Asztali értesítések",
   "notifications.column_settings.favourite": "Kedvencek:",
+  "notifications.column_settings.filter_bar.advanced": "Minden kategória megjelenítése",
+  "notifications.column_settings.filter_bar.category": "Gyorsszűrő sáv",
   "notifications.column_settings.follow": "Új követők:",
   "notifications.column_settings.follow_request": "Új követési kérelmek:",
   "notifications.column_settings.mention": "Megemlítések:",
@@ -588,12 +595,6 @@
   "refresh": "Frissítés",
   "regeneration_indicator.label": "Betöltés…",
   "regeneration_indicator.sublabel": "A saját idővonalad épp készül!",
-  "relationship_severance_notification.purged_data": "rendszergazdák által véglegesen törölve",
-  "relationship_severance_notification.relationships": "{count, plural, one {# kapcsolat} other {# kapcsolat}}",
-  "relationship_severance_notification.types.account_suspension": "A fiók fel van függesztve",
-  "relationship_severance_notification.types.domain_block": "A domain fel van függesztve",
-  "relationship_severance_notification.types.user_domain_block": "Blokkoltad ezt a domaint",
-  "relationship_severance_notification.view": "Megtekintés",
   "relative_time.days": "{number}n",
   "relative_time.full.days": "{number, plural, one {# napja} other {# napja}}",
   "relative_time.full.hours": "{number, plural, one {# órája} other {# órája}}",
diff --git a/app/javascript/mastodon/locales/is.json b/app/javascript/mastodon/locales/is.json
index b65df2fc51cf52..6bcc79f70783c8 100644
--- a/app/javascript/mastodon/locales/is.json
+++ b/app/javascript/mastodon/locales/is.json
@@ -298,6 +298,7 @@
   "filter_modal.select_filter.title": "Sía þessa færslu",
   "filter_modal.title.status": "Sía færslu",
   "filtered_notifications_banner.pending_requests": "Tilkynningar frá {count, plural, =0 {engum} one {einum aðila} other {# aðilum}} sem þú gætir þekkt",
+  "filtered_notifications_banner.private_mentions": "{count, plural, one {einkaspjall} other {einkaspjöll}}",
   "filtered_notifications_banner.title": "Síaðar tilkynningar",
   "firehose.all": "Allt",
   "firehose.local": "þessum netþjóni",
@@ -471,6 +472,8 @@
   "notification.own_poll": "Könnuninni þinni er lokið",
   "notification.poll": "Könnun sem þú tókst þátt í er lokið",
   "notification.reblog": "{name} endurbirti færsluna þína",
+  "notification.relationships_severance_event": "Missti tengingar við {name}",
+  "notification.relationships_severance_event.learn_more": "Kanna nánar",
   "notification.status": "{name} sendi inn rétt í þessu",
   "notification.update": "{name} breytti færslu",
   "notification_requests.accept": "Samþykkja",
@@ -589,8 +592,6 @@
   "refresh": "Endurlesa",
   "regeneration_indicator.label": "Hleð inn…",
   "regeneration_indicator.sublabel": "Verið er að útbúa heimastreymið þitt!",
-  "relationship_severance_notification.relationships": "{count, plural, one {# tengsl} other {# tengsl}}",
-  "relationship_severance_notification.view": "Skoða",
   "relative_time.days": "{number}d",
   "relative_time.full.days": "Fyrir {number, plural, one {# degi} other {# dögum}} síðan",
   "relative_time.full.hours": "Fyrir {number, plural, one {# klukkustund} other {# klukkustundum}} síðan",
diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json
index 090278b83b161a..eddab5f37f6fd4 100644
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@@ -471,7 +471,9 @@
   "notification.own_poll": "Il tuo sondaggio è terminato",
   "notification.poll": "Un sondaggio in cui hai votato è terminato",
   "notification.reblog": "{name} ha rebloggato il tuo post",
-  "notification.severed_relationships": "Relazioni interrotte con {name}",
+  "notification.relationships_severance_event": "Connessioni perse con {name}",
+  "notification.relationships_severance_event.account_suspension": "Un amministratore da {from} ha sospeso {target}, il che significa che non puoi più ricevere aggiornamenti da loro o interagire con loro.",
+  "notification.relationships_severance_event.learn_more": "Scopri di più",
   "notification.status": "{name} ha appena pubblicato un post",
   "notification.update": "{name} ha modificato un post",
   "notification_requests.accept": "Accetta",
@@ -590,12 +592,6 @@
   "refresh": "Ricarica",
   "regeneration_indicator.label": "Caricamento…",
   "regeneration_indicator.sublabel": "Il feed della tua home è in preparazione!",
-  "relationship_severance_notification.purged_data": "rimossi dagli amministratori",
-  "relationship_severance_notification.relationships": "{count, plural,one {# relazione} other {# relazioni}}",
-  "relationship_severance_notification.types.account_suspension": "L'account è stato sospeso",
-  "relationship_severance_notification.types.domain_block": "Il dominio è stato sospeso",
-  "relationship_severance_notification.types.user_domain_block": "Hai bloccato questo dominio",
-  "relationship_severance_notification.view": "Visualizza",
   "relative_time.days": "{number}g",
   "relative_time.full.days": "{number, plural, one {# giorno} other {# giorni}} fa",
   "relative_time.full.hours": "{number, plural, one {# ora} other {# ore}} fa",
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index 5553636f26740a..e15089d0c00c0d 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -471,7 +471,6 @@
   "notification.own_poll": "설문을 마침",
   "notification.poll": "참여한 설문이 종료됨",
   "notification.reblog": "{name} 님이 부스트했습니다",
-  "notification.severed_relationships": "{name} 님과의 관계가 단절되었습니다",
   "notification.status": "{name} 님이 방금 게시물을 올렸습니다",
   "notification.update": "{name} 님이 게시물을 수정했습니다",
   "notification_requests.accept": "수락",
@@ -589,12 +588,6 @@
   "refresh": "새로고침",
   "regeneration_indicator.label": "불러오는 중…",
   "regeneration_indicator.sublabel": "홈 피드를 준비하고 있습니다!",
-  "relationship_severance_notification.purged_data": "관리자에 의해 제거되었습니다",
-  "relationship_severance_notification.relationships": "{count, plural, other {# 건의 관계}}",
-  "relationship_severance_notification.types.account_suspension": "계정이 정지되었습니다",
-  "relationship_severance_notification.types.domain_block": "도메인이 정지되었습니다",
-  "relationship_severance_notification.types.user_domain_block": "내가 이 도메인을 차단했습니다",
-  "relationship_severance_notification.view": "보기",
   "relative_time.days": "{number}일 전",
   "relative_time.full.days": "{number} 일 전",
   "relative_time.full.hours": "{number} 시간 전",
diff --git a/app/javascript/mastodon/locales/lad.json b/app/javascript/mastodon/locales/lad.json
index 1eb8aa4abc6f4c..dd76baaf67d89d 100644
--- a/app/javascript/mastodon/locales/lad.json
+++ b/app/javascript/mastodon/locales/lad.json
@@ -571,8 +571,6 @@
   "refresh": "Arefreska",
   "regeneration_indicator.label": "Eskargando…",
   "regeneration_indicator.sublabel": "Tu linya de tiempo prinsipala esta preparando!",
-  "relationship_severance_notification.types.user_domain_block": "Blokates este domeno",
-  "relationship_severance_notification.view": "Mira",
   "relative_time.days": "{number} d",
   "relative_time.full.days": "antes {number, plural, one {# diya} other {# diyas}}",
   "relative_time.full.hours": "antes {number, plural, one {# ora} other {# oras}}",
diff --git a/app/javascript/mastodon/locales/lt.json b/app/javascript/mastodon/locales/lt.json
index 728485b2bc2348..f9ef7e242c00e4 100644
--- a/app/javascript/mastodon/locales/lt.json
+++ b/app/javascript/mastodon/locales/lt.json
@@ -555,9 +555,6 @@
   "refresh": "Atnaujinti",
   "regeneration_indicator.label": "Kraunama…",
   "regeneration_indicator.sublabel": "Ruošiamas tavo pagrindinis srautas!",
-  "relationship_severance_notification.relationships": "{count, plural, one {# santykis} few {# santykiai} many {# santykio} other {# santykių}}",
-  "relationship_severance_notification.types.user_domain_block": "Užblokavai šį domeną",
-  "relationship_severance_notification.view": "Peržiūrėti",
   "relative_time.days": "{number} d.",
   "relative_time.full.days": "prieš {number, plural, one {# dieną} few {# dienas} many {# dienos} other {# dienų}}",
   "relative_time.full.hours": "prieš {number, plural, one {# valandą} few {# valandas} many {# valandos} other {# valandų}}",
diff --git a/app/javascript/mastodon/locales/lv.json b/app/javascript/mastodon/locales/lv.json
index 21fa46faa60bdc..55ceb564b637d4 100644
--- a/app/javascript/mastodon/locales/lv.json
+++ b/app/javascript/mastodon/locales/lv.json
@@ -626,7 +626,7 @@
   "status.direct_indicator": "Pieminēts privāti",
   "status.edit": "Labot",
   "status.edited_x_times": "Labots {count, plural, one {{count} reizi} other {{count} reizes}}",
-  "status.embed": "Iestrādāt",
+  "status.embed": "Iegult",
   "status.favourite": "Izlasē",
   "status.filter": "Filtrē šo ziņu",
   "status.filtered": "Filtrēts",
@@ -634,7 +634,7 @@
   "status.history.created": "{name} izveidoja {date}",
   "status.history.edited": "{name} laboja {date}",
   "status.load_more": "Ielādēt vairāk",
-  "status.media.open": "Noklikšķini, lai atvērtu",
+  "status.media.open": "Jānoklikšķina, lai atvērtu",
   "status.media.show": "Noklikšķini, lai parādītu",
   "status.media_hidden": "Multivides ir paslēpts",
   "status.mention": "Pieminēt @{name}",
diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json
index 1e710bda45f2fc..c47831b389e9d4 100644
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@@ -298,6 +298,7 @@
   "filter_modal.select_filter.title": "Dit bericht filteren",
   "filter_modal.title.status": "Een bericht filteren",
   "filtered_notifications_banner.pending_requests": "Meldingen van {count, plural, =0 {niemand} one {één persoon} other {# mensen}} die je misschien kent",
+  "filtered_notifications_banner.private_mentions": "{count, plural, one {privébericht} other {privéberichten}}",
   "filtered_notifications_banner.title": "Gefilterde meldingen",
   "firehose.all": "Alles",
   "firehose.local": "Deze server",
@@ -471,7 +472,11 @@
   "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.severed_relationships": "Volgrelaties met {name} verbroken",
+  "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.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.status": "{name} heeft zojuist een bericht geplaatst",
   "notification.update": "{name} heeft een bericht bewerkt",
   "notification_requests.accept": "Accepteren",
@@ -590,12 +595,6 @@
   "refresh": "Vernieuwen",
   "regeneration_indicator.label": "Aan het laden…",
   "regeneration_indicator.sublabel": "Jouw starttijdlijn wordt aangemaakt!",
-  "relationship_severance_notification.purged_data": "verwijderd door beheerders",
-  "relationship_severance_notification.relationships": "{count, plural, one {# volgrelatie} other {# volgrelaties}}",
-  "relationship_severance_notification.types.account_suspension": "Account is opgeschort",
-  "relationship_severance_notification.types.domain_block": "Domein is opgeschort",
-  "relationship_severance_notification.types.user_domain_block": "Je hebt dit domein geblokkeerd",
-  "relationship_severance_notification.view": "Weergeven",
   "relative_time.days": "{number}d",
   "relative_time.full.days": "{number, plural, one {# dag} other {# dagen}} geleden",
   "relative_time.full.hours": "{number, plural, one {# uur} other {# uur}} geleden",
diff --git a/app/javascript/mastodon/locales/nn.json b/app/javascript/mastodon/locales/nn.json
index 7742d83e176630..ab44c691d1b1d6 100644
--- a/app/javascript/mastodon/locales/nn.json
+++ b/app/javascript/mastodon/locales/nn.json
@@ -298,6 +298,7 @@
   "filter_modal.select_filter.title": "Filtrer dette innlegget",
   "filter_modal.title.status": "Filtrer eit innlegg",
   "filtered_notifications_banner.pending_requests": "Varsel frå {count, plural, =0 {ingen} one {ein person} other {# folk}} du kanskje kjenner",
+  "filtered_notifications_banner.private_mentions": "{count, plural, one {privat omtale} other {private omtaler}}",
   "filtered_notifications_banner.title": "Filtrerte varslingar",
   "firehose.all": "Alle",
   "firehose.local": "Denne tenaren",
@@ -471,7 +472,11 @@
   "notification.own_poll": "Rundspørjinga di er ferdig",
   "notification.poll": "Ei rundspørjing du har røysta i er ferdig",
   "notification.reblog": "{name} framheva innlegget ditt",
-  "notification.severed_relationships": "Forholda med {name} er brotne",
+  "notification.relationships_severance_event": "Tapte samband med {name}",
+  "notification.relationships_severance_event.account_suspension": "Ein administrator på {from} har utvist {target}, som tyder at du ikkje lenger får oppdateringar frå dei eller kan samhandla med dei.",
+  "notification.relationships_severance_event.domain_block": "Ein administrator på {from} har blokkert {target}, inkludert {followersCount} av fylgjarane dine og {followingCount, plural, one {# konto} other {# kontoar}} du fylgjer.",
+  "notification.relationships_severance_event.learn_more": "Lær meir",
+  "notification.relationships_severance_event.user_domain_block": "Du har blokkert {target}, fjerna {followersCount} av fylgjarane dine og {followingCount, plural, one {# konto} other {# kontoar}} du fylgjer.",
   "notification.status": "{name} la nettopp ut",
   "notification.update": "{name} redigerte eit innlegg",
   "notification_requests.accept": "Godkjenn",
@@ -484,6 +489,8 @@
   "notifications.column_settings.admin.sign_up": "Nyleg registrerte:",
   "notifications.column_settings.alert": "Skrivebordsvarsel",
   "notifications.column_settings.favourite": "Favorittar:",
+  "notifications.column_settings.filter_bar.advanced": "Vis alle kategoriar",
+  "notifications.column_settings.filter_bar.category": "Snøggfilterline",
   "notifications.column_settings.follow": "Nye fylgjarar:",
   "notifications.column_settings.follow_request": "Ny fylgjarførespurnader:",
   "notifications.column_settings.mention": "Omtalar:",
@@ -588,12 +595,6 @@
   "refresh": "Oppdater",
   "regeneration_indicator.label": "Lastar…",
   "regeneration_indicator.sublabel": "Heimetidslina di vert førebudd!",
-  "relationship_severance_notification.purged_data": "sletta av administratorar",
-  "relationship_severance_notification.relationships": "{count, plural, one {# forhold} other {# forhold}}",
-  "relationship_severance_notification.types.account_suspension": "Kontoen er utvist",
-  "relationship_severance_notification.types.domain_block": "Domenet er utestengt",
-  "relationship_severance_notification.types.user_domain_block": "Du blokkerte dette domenet",
-  "relationship_severance_notification.view": "Sjå",
   "relative_time.days": "{number}dg",
   "relative_time.full.days": "{number, plural, one {# dag} other {# dagar}} sidan",
   "relative_time.full.hours": "{number, plural, one {# time} other {# timar}} sidan",
diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json
index 3ee134d6c5c524..718aa32d2ed5f0 100644
--- a/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@@ -298,6 +298,7 @@
   "filter_modal.select_filter.title": "Filtruj ten wpis",
   "filter_modal.title.status": "Filtruj wpis",
   "filtered_notifications_banner.pending_requests": "Powiadomienia od {count, plural, =0 {żadnej osoby którą możesz znać} one {# osoby którą możesz znać} other {# osób które możesz znać}}",
+  "filtered_notifications_banner.private_mentions": "{count, plural, one {prywatna wzmianka} few {prywatne wzmianki} other {prywatnych wzmianek}}",
   "filtered_notifications_banner.title": "Powiadomienia filtrowane",
   "firehose.all": "Wszystko",
   "firehose.local": "Ten serwer",
@@ -471,7 +472,10 @@
   "notification.own_poll": "Twoje głosowanie zakończyło się",
   "notification.poll": "Głosowanie w którym brałeś(-aś) udział zakończyło się",
   "notification.reblog": "Twój post został podbity przez {name}",
-  "notification.severed_relationships": "Zerwano związki z {name}",
+  "notification.relationships_severance_event": "Utracone związki z {name}",
+  "notification.relationships_severance_event.account_suspension": "Administrator z {from} zawiesił {target}, więc nie dostaniesz wieści ani nie wejdziesz w interakcje z użytkownikami z tego serwera.",
+  "notification.relationships_severance_event.domain_block": "Administrator z {from} zablokował {target}, w tym {followersCount} z Twoich obserwujących i {followingCount, plural, one {# konto} other {# konta}} które obserwujesz.",
+  "notification.relationships_severance_event.learn_more": "Dowiedz się więcej",
   "notification.status": "{name} opublikował(a) nowy wpis",
   "notification.update": "{name} edytował(a) post",
   "notification_requests.accept": "Akceptuj",
@@ -590,12 +594,6 @@
   "refresh": "Odśwież",
   "regeneration_indicator.label": "Ładuję…",
   "regeneration_indicator.sublabel": "Twoja oś czasu jest przygotowywana!",
-  "relationship_severance_notification.purged_data": "wyczyszczone przez administratorów",
-  "relationship_severance_notification.relationships": "{count, plural, one {# związek} few {# związki} other {# związków}}",
-  "relationship_severance_notification.types.account_suspension": "Konto zostało zawieszone",
-  "relationship_severance_notification.types.domain_block": "Domena została zawieszona",
-  "relationship_severance_notification.types.user_domain_block": "Domena przez ciebie blokowana",
-  "relationship_severance_notification.view": "Pokaż",
   "relative_time.days": "{number} dni",
   "relative_time.full.days": "{number, plural, one {# dzień} few {# dni} many {# dni} other {# dni}} temu",
   "relative_time.full.hours": "{number, plural, one {# godzinę} few {# godziny} many {# godzin} other {# godzin}} temu",
diff --git a/app/javascript/mastodon/locales/pt-PT.json b/app/javascript/mastodon/locales/pt-PT.json
index 6732973d5ab3df..3f7f198ef97fec 100644
--- a/app/javascript/mastodon/locales/pt-PT.json
+++ b/app/javascript/mastodon/locales/pt-PT.json
@@ -471,7 +471,6 @@
   "notification.own_poll": "A sua votação terminou",
   "notification.poll": "Uma votação em que participaste chegou ao fim",
   "notification.reblog": "{name} reforçou a tua publicação",
-  "notification.severed_relationships": "Relações com {name} cessadas",
   "notification.status": "{name} acabou de publicar",
   "notification.update": "{name} editou uma publicação",
   "notification_requests.accept": "Aceitar",
@@ -590,12 +589,6 @@
   "refresh": "Actualizar",
   "regeneration_indicator.label": "A carregar…",
   "regeneration_indicator.sublabel": "A tua página inicial está a ser preparada!",
-  "relationship_severance_notification.purged_data": "purgado pelos administradores",
-  "relationship_severance_notification.relationships": "{count, plural,one {# relação} other {# relações}}",
-  "relationship_severance_notification.types.account_suspension": "A conta foi suspensa",
-  "relationship_severance_notification.types.domain_block": "O domínio foi suspenso",
-  "relationship_severance_notification.types.user_domain_block": "Bloqueou este domínio",
-  "relationship_severance_notification.view": "Visualizar",
   "relative_time.days": "{number}d",
   "relative_time.full.days": "{number, plural,one {# dia} other {# dias}} atrás",
   "relative_time.full.hours": "{number, plural,one {# hora}other {# horas}} atrás",
diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json
index 0ab14756998ba3..d143fda52beae3 100644
--- a/app/javascript/mastodon/locales/sk.json
+++ b/app/javascript/mastodon/locales/sk.json
@@ -445,6 +445,7 @@
   "notification.own_poll": "Vaša anketa sa skončila",
   "notification.poll": "Anketa, v ktorej ste hlasovali, sa skončila",
   "notification.reblog": "{name} zdieľa váš príspevok",
+  "notification.relationships_severance_event.learn_more": "Zisti viac",
   "notification.status": "{name} uverejňuje niečo nové",
   "notification.update": "{name} upravuje príspevok",
   "notification_requests.accept": "Prijať",
@@ -557,8 +558,6 @@
   "refresh": "Obnoviť",
   "regeneration_indicator.label": "Načítavanie…",
   "regeneration_indicator.sublabel": "Váš domovský kanál sa pripravuje.",
-  "relationship_severance_notification.types.user_domain_block": "Túto doménu si zablokoval/a",
-  "relationship_severance_notification.view": "Zobraziť",
   "relative_time.days": "{number} dní",
   "relative_time.full.days": "Pred {number, plural, one {# dňom} other {# dňami}}",
   "relative_time.full.hours": "Pred {number, plural, one {# hodinou} other {# hodinami}}",
diff --git a/app/javascript/mastodon/locales/sl.json b/app/javascript/mastodon/locales/sl.json
index d31b4108047cd1..80b52ac100a3e7 100644
--- a/app/javascript/mastodon/locales/sl.json
+++ b/app/javascript/mastodon/locales/sl.json
@@ -471,7 +471,6 @@
   "notification.own_poll": "Vaša anketa je zaključena",
   "notification.poll": "Anketa, v kateri ste sodelovali, je zaključena",
   "notification.reblog": "{name} je izpostavila/a vašo objavo",
-  "notification.severed_relationships": "Veze z {name} prekinjene",
   "notification.status": "{name} je pravkar objavil/a",
   "notification.update": "{name} je uredil(a) objavo",
   "notification_requests.accept": "Sprejmi",
@@ -484,6 +483,8 @@
   "notifications.column_settings.admin.sign_up": "Novi vpisi:",
   "notifications.column_settings.alert": "Namizna obvestila",
   "notifications.column_settings.favourite": "Priljubljeni:",
+  "notifications.column_settings.filter_bar.advanced": "Prikaži vse kategorije",
+  "notifications.column_settings.filter_bar.category": "Vrstica za hitro filtriranje",
   "notifications.column_settings.follow": "Novi sledilci:",
   "notifications.column_settings.follow_request": "Nove prošnje za sledenje:",
   "notifications.column_settings.mention": "Omembe:",
@@ -588,12 +589,6 @@
   "refresh": "Osveži",
   "regeneration_indicator.label": "Nalaganje …",
   "regeneration_indicator.sublabel": "Vaš domači vir se pripravlja!",
-  "relationship_severance_notification.purged_data": "očistili skrbniki",
-  "relationship_severance_notification.relationships": "{count, plural, one {# veza} two {# vezi} few {# veze} other {# vez}}",
-  "relationship_severance_notification.types.account_suspension": "Račun je bil suspendiran",
-  "relationship_severance_notification.types.domain_block": "Domena je bila suspendirana",
-  "relationship_severance_notification.types.user_domain_block": "Domeno ste blokirali",
-  "relationship_severance_notification.view": "Pogled",
   "relative_time.days": "{number} d",
   "relative_time.full.days": "{number, plural, one {pred # dnem} two {pred # dnevoma} few {pred # dnevi} other {pred # dnevi}}",
   "relative_time.full.hours": "{number, plural, one {pred # uro} two {pred # urama} few {pred # urami} other {pred # urami}}",
diff --git a/app/javascript/mastodon/locales/sq.json b/app/javascript/mastodon/locales/sq.json
index d69231d8237247..026e198206c766 100644
--- a/app/javascript/mastodon/locales/sq.json
+++ b/app/javascript/mastodon/locales/sq.json
@@ -297,6 +297,7 @@
   "filter_modal.select_filter.subtitle": "Përdorni një kategori ekzistuese, ose krijoni një të re",
   "filter_modal.select_filter.title": "Filtroje këtë postim",
   "filter_modal.title.status": "Filtroni një postim",
+  "filtered_notifications_banner.private_mentions": "{count, plural, one {përmendje private} other {përmendje private}}",
   "filtered_notifications_banner.title": "Njoftime të filtruar",
   "firehose.all": "Krejt",
   "firehose.local": "Këtë shërbyes",
@@ -470,7 +471,11 @@
   "notification.own_poll": "Pyetësori juaj ka përfunduar",
   "notification.poll": "Ka përfunduar një pyetësor ku keni votuar",
   "notification.reblog": "{name} përforcoi mesazhin tuaj",
-  "notification.severed_relationships": "Marrëdhëniet me {name} u ndërprenë",
+  "notification.relationships_severance_event": "Lidhje të humbura me {name}",
+  "notification.relationships_severance_event.account_suspension": "Një përgjegjës nga {from} ka pezulluar {target}, që do të thotë se s’mund të merrni më përditësime prej tij, apo të ndërveproni me të.",
+  "notification.relationships_severance_event.domain_block": "Një përgjegjës nga {from} ka bllokuar {target}, përfshi {followersCount} të ndjekësve tuaj dhe {followingCount, plural, one {# llogari} other {# llogari}} që ndiqni.",
+  "notification.relationships_severance_event.learn_more": "Mësoni më tepër",
+  "notification.relationships_severance_event.user_domain_block": "Keni bllokuar {target}, duke hequr {followersCount} nga ndjekësit tuaj dhe {followingCount, plural, one {# llogari} other {# llogari}} që ndiqni.",
   "notification.status": "{name} sapo postoi",
   "notification.update": "{name} përpunoi një postim",
   "notification_requests.accept": "Pranoje",
@@ -587,12 +592,6 @@
   "refresh": "Rifreskoje",
   "regeneration_indicator.label": "Po ngarkohet…",
   "regeneration_indicator.sublabel": "Prurja juaj vetjake po përgatitet!",
-  "relationship_severance_notification.purged_data": "spastruar nga përgjegjës",
-  "relationship_severance_notification.relationships": "{count, plural, one {# marrëdhënie} other {# marrëdhënie}}",
-  "relationship_severance_notification.types.account_suspension": "Llogaria është pezulluar",
-  "relationship_severance_notification.types.domain_block": "Përkatësia është pezulluar",
-  "relationship_severance_notification.types.user_domain_block": "E bllokuat këtë përkatësi",
-  "relationship_severance_notification.view": "Shiheni",
   "relative_time.days": "{number}d",
   "relative_time.full.days": "{number, plural, one {# ditë} other {# ditë}} më parë",
   "relative_time.full.hours": "{number, plural, one {# orë} other {# orë}} më parë",
diff --git a/app/javascript/mastodon/locales/sv.json b/app/javascript/mastodon/locales/sv.json
index b28b4826d47d92..770daf37868009 100644
--- a/app/javascript/mastodon/locales/sv.json
+++ b/app/javascript/mastodon/locales/sv.json
@@ -459,6 +459,7 @@
   "notification.own_poll": "Din röstning har avslutats",
   "notification.poll": "En omröstning du röstat i har avslutats",
   "notification.reblog": "{name} boostade ditt inlägg",
+  "notification.relationships_severance_event.learn_more": "Läs mer",
   "notification.status": "{name} publicerade just ett inlägg",
   "notification.update": "{name} redigerade ett inlägg",
   "notification_requests.accept": "Godkänn",
@@ -573,11 +574,6 @@
   "refresh": "Läs om",
   "regeneration_indicator.label": "Laddar…",
   "regeneration_indicator.sublabel": "Ditt hemmaflöde förbereds!",
-  "relationship_severance_notification.purged_data": "rensad av administratörer",
-  "relationship_severance_notification.types.account_suspension": "Ditt konto har blivit avstängt",
-  "relationship_severance_notification.types.domain_block": "Domänen har stängts av",
-  "relationship_severance_notification.types.user_domain_block": "Du blockerade denna domän",
-  "relationship_severance_notification.view": "Visa",
   "relative_time.days": "{number}d",
   "relative_time.full.days": "{number, plural, one {# dag} other {# dagar}} sedan",
   "relative_time.full.hours": "{number, plural, one {# timme} other {# timmar}} sedan",
diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json
index 4490f038ca8681..952ed5adf59e86 100644
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@@ -298,6 +298,7 @@
   "filter_modal.select_filter.title": "กรองโพสต์นี้",
   "filter_modal.title.status": "กรองโพสต์",
   "filtered_notifications_banner.pending_requests": "การแจ้งเตือนจาก {count, plural, =0 {ไม่มีใคร} other {# คน}} ที่คุณอาจรู้จัก",
+  "filtered_notifications_banner.private_mentions": "{count, plural, other {การกล่าวถึงแบบส่วนตัว}}",
   "filtered_notifications_banner.title": "การแจ้งเตือนที่กรองอยู่",
   "firehose.all": "ทั้งหมด",
   "firehose.local": "เซิร์ฟเวอร์นี้",
@@ -471,7 +472,11 @@
   "notification.own_poll": "การสำรวจความคิดเห็นของคุณได้สิ้นสุดแล้ว",
   "notification.poll": "การสำรวจความคิดเห็นที่คุณได้ลงคะแนนได้สิ้นสุดแล้ว",
   "notification.reblog": "{name} ได้ดันโพสต์ของคุณ",
-  "notification.severed_relationships": "ตัดขาดความสัมพันธ์กับ {name} แล้ว",
+  "notification.relationships_severance_event": "สูญเสียการเชื่อมต่อกับ {name}",
+  "notification.relationships_severance_event.account_suspension": "ผู้ดูแลจาก {from} ได้ระงับ {target} ซึ่งหมายความว่าคุณจะไม่สามารถรับการอัปเดตจากเขาหรือโต้ตอบกับเขาได้อีกต่อไป",
+  "notification.relationships_severance_event.domain_block": "ผู้ดูแลจาก {from} ได้ปิดกั้น {target} รวมถึง {followersCount} ผู้ติดตามของคุณและ {followingCount, plural, other {# บัญชี}}ที่คุณติดตาม",
+  "notification.relationships_severance_event.learn_more": "เรียนรู้เพิ่มเติม",
+  "notification.relationships_severance_event.user_domain_block": "คุณได้ปิดกั้น {target} เอา {followersCount} ผู้ติดตามของคุณและ {followingCount, plural, other {# บัญชี}}ที่คุณติดตามออก",
   "notification.status": "{name} เพิ่งโพสต์",
   "notification.update": "{name} ได้แก้ไขโพสต์",
   "notification_requests.accept": "ยอมรับ",
@@ -590,12 +595,6 @@
   "refresh": "รีเฟรช",
   "regeneration_indicator.label": "กำลังโหลด…",
   "regeneration_indicator.sublabel": "กำลังเตรียมฟีดหน้าแรกของคุณ!",
-  "relationship_severance_notification.purged_data": "ล้างข้อมูลโดยผู้ดูแล",
-  "relationship_severance_notification.relationships": "{count, plural, other {# ความสัมพันธ์}}",
-  "relationship_severance_notification.types.account_suspension": "ระงับบัญชีแล้ว",
-  "relationship_severance_notification.types.domain_block": "ระงับโดเมนแล้ว",
-  "relationship_severance_notification.types.user_domain_block": "คุณได้ปิดกั้นโดเมนนี้",
-  "relationship_severance_notification.view": "ดู",
   "relative_time.days": "{number} วัน",
   "relative_time.full.days": "{number, plural, other {# วัน}}ที่แล้ว",
   "relative_time.full.hours": "{number, plural, other {# ชั่วโมง}}ที่แล้ว",
diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json
index 12d82c70ecc38d..8dcd2d202d3b7a 100644
--- a/app/javascript/mastodon/locales/tr.json
+++ b/app/javascript/mastodon/locales/tr.json
@@ -298,6 +298,7 @@
   "filter_modal.select_filter.title": "Bu gönderiyi süzgeçle",
   "filter_modal.title.status": "Bir gönderi süzgeçle",
   "filtered_notifications_banner.pending_requests": "Bildiğiniz {count, plural, =0 {hiç kimseden} one {bir kişiden} other {# kişiden}} bildirim",
+  "filtered_notifications_banner.private_mentions": "{count, plural, one {özel değinme} other {özel değinme}}",
   "filtered_notifications_banner.title": "Filtrelenmiş bildirimler",
   "firehose.all": "Tümü",
   "firehose.local": "Bu sunucu",
@@ -471,7 +472,11 @@
   "notification.own_poll": "Anketiniz sona erdi",
   "notification.poll": "Oy verdiğiniz bir anket sona erdi",
   "notification.reblog": "{name} gönderini yeniden paylaştı",
-  "notification.severed_relationships": "{name} ile ilişkiler koptu",
+  "notification.relationships_severance_event": "{name} ile bağlantılar koptu",
+  "notification.relationships_severance_event.account_suspension": "{from} yöneticisi, {target} askıya aldı, bunun anlamı onlardan artık güncelleme alamayacak veya etkileşemeyeceksiniz demektir.",
+  "notification.relationships_severance_event.domain_block": "{from} yöneticisi {target} engelledi, {followersCount} takipçiniz ve takip ettiğiniz {followingCount, plural, one {# hesap} other {# hesap}} buna dahil.",
+  "notification.relationships_severance_event.learn_more": "Daha fazlası",
+  "notification.relationships_severance_event.user_domain_block": "{target} engellediniz, takipçilerinizden {followersCount} ve takip eden {followingCount, plural, one {# hesap} other {# hesap}} kaldırılıyor.",
   "notification.status": "{name} az önce gönderdi",
   "notification.update": "{name} bir gönderiyi düzenledi",
   "notification_requests.accept": "Onayla",
@@ -590,12 +595,6 @@
   "refresh": "Yenile",
   "regeneration_indicator.label": "Yükleniyor…",
   "regeneration_indicator.sublabel": "Ana akışın hazırlanıyor!",
-  "relationship_severance_notification.purged_data": "yöneticiler tarafından temizlendi",
-  "relationship_severance_notification.relationships": "{count, plural, one {# ilişki} other {# ilişki}}",
-  "relationship_severance_notification.types.account_suspension": "Hesap askıya alındı",
-  "relationship_severance_notification.types.domain_block": "Alan adı askıya alındı",
-  "relationship_severance_notification.types.user_domain_block": "Bu alan adını engellediniz",
-  "relationship_severance_notification.view": "Görüntüle",
   "relative_time.days": "{number}d",
   "relative_time.full.days": "{number, plural, one {# gün} other {# gün}} önce",
   "relative_time.full.hours": "{number, plural, one {# saat} other {# saat}} önce",
diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json
index f2e58f09374c52..0648fde5b3307c 100644
--- a/app/javascript/mastodon/locales/uk.json
+++ b/app/javascript/mastodon/locales/uk.json
@@ -460,7 +460,9 @@
   "notification.own_poll": "Ваше опитування завершилося",
   "notification.poll": "Опитування, у якому ви голосували, скінчилося",
   "notification.reblog": "{name} поширює ваш допис",
-  "notification.severed_relationships": "Зв'язки з {name} розірвані",
+  "notification.relationships_severance_event": "Втрачено з'єднання з {name}",
+  "notification.relationships_severance_event.account_suspension": "Адміністратор з {from} призупинив {target}, що означає, що ви більше не можете отримувати оновлення від них або взаємодіяти з ними.",
+  "notification.relationships_severance_event.learn_more": "Дізнатися більше",
   "notification.status": "{name} щойно дописує",
   "notification.update": "{name} змінює допис",
   "notification_requests.accept": "Прийняти",
@@ -575,12 +577,6 @@
   "refresh": "Оновити",
   "regeneration_indicator.label": "Завантаження…",
   "regeneration_indicator.sublabel": "Хвилинку, ми готуємо вашу стрічку!",
-  "relationship_severance_notification.purged_data": "очищено адміністраторами",
-  "relationship_severance_notification.relationships": "{count, plural, one {# зв'язок} few {# зв'язки} many {# зв'язків} other {# зв'язок}}",
-  "relationship_severance_notification.types.account_suspension": "Обліковий запис призупинено",
-  "relationship_severance_notification.types.domain_block": "Домен призупинено",
-  "relationship_severance_notification.types.user_domain_block": "Ви заблокували цей домен",
-  "relationship_severance_notification.view": "Вигляд",
   "relative_time.days": "{number}д",
   "relative_time.full.days": "{number, plural, one {# день} few {# дні} other {# днів}} тому",
   "relative_time.full.hours": "{number, plural, one {# година} few {# години} other {# годин}} тому",
diff --git a/app/javascript/mastodon/locales/vi.json b/app/javascript/mastodon/locales/vi.json
index 9b09d21450cd11..58c025494c2f5a 100644
--- a/app/javascript/mastodon/locales/vi.json
+++ b/app/javascript/mastodon/locales/vi.json
@@ -298,6 +298,7 @@
   "filter_modal.select_filter.title": "Lọc tút này",
   "filter_modal.title.status": "Lọc một tút",
   "filtered_notifications_banner.pending_requests": "Thông báo từ {count, plural, =0 {không ai} other {# người}} bạn có thể biết",
+  "filtered_notifications_banner.private_mentions": "{count, plural, other {lượt nhắc}}",
   "filtered_notifications_banner.title": "Thông báo đã lọc",
   "firehose.all": "Toàn bộ",
   "firehose.local": "Máy chủ này",
@@ -471,7 +472,11 @@
   "notification.own_poll": "Cuộc bình chọn của bạn đã kết thúc",
   "notification.poll": "Cuộc bình chọn đã kết thúc",
   "notification.reblog": "{name} đăng lại tút của bạn",
-  "notification.severed_relationships": "Mối quan hệ với {name} bị cắt đứt",
+  "notification.relationships_severance_event": "Mất kết nối với {name}",
+  "notification.relationships_severance_event.account_suspension": "Quản trị viên {from} đã vô hiệu hóa {target}, điều này có nghĩa là bạn không còn có thể nhận được cập nhật từ họ hoặc tương tác với họ nữa.",
+  "notification.relationships_severance_event.domain_block": "Quản trị viên {from} đã chặn {target}, bao gồm {followersCount} người theo dõi bạn và {followingCount, plural, other {# người}} mà bạn theo dõi.",
+  "notification.relationships_severance_event.learn_more": "Tìm hiểu thêm",
+  "notification.relationships_severance_event.user_domain_block": "Bạn đã chặn {target}, xóa {followersCount} người theo dõi bạn và {followingCount, plural, other {# người}} theo dõi bạn.",
   "notification.status": "{name} đăng tút mới",
   "notification.update": "{name} đã sửa tút",
   "notification_requests.accept": "Chấp nhận",
@@ -484,6 +489,8 @@
   "notifications.column_settings.admin.sign_up": "Người mới tham gia:",
   "notifications.column_settings.alert": "Báo trên máy tính",
   "notifications.column_settings.favourite": "Lượt thích:",
+  "notifications.column_settings.filter_bar.advanced": "Toàn bộ",
+  "notifications.column_settings.filter_bar.category": "Thanh lọc nhanh",
   "notifications.column_settings.follow": "Người theo dõi:",
   "notifications.column_settings.follow_request": "Yêu cầu theo dõi:",
   "notifications.column_settings.mention": "Lượt nhắc đến:",
@@ -588,12 +595,6 @@
   "refresh": "Làm mới",
   "regeneration_indicator.label": "Đang tải…",
   "regeneration_indicator.sublabel": "Trang chủ của bạn đang được cập nhật!",
-  "relationship_severance_notification.purged_data": "bị quản trị viên xóa",
-  "relationship_severance_notification.relationships": "{count, plural, other {# mối quan hệ}}",
-  "relationship_severance_notification.types.account_suspension": "Người này đã bị vô hiệu hóa",
-  "relationship_severance_notification.types.domain_block": "Máy chủ này đã bị vô hiệu hóa",
-  "relationship_severance_notification.types.user_domain_block": "Bạn đã chặn máy chủ này",
-  "relationship_severance_notification.view": "Chi tiết",
   "relative_time.days": "{number} ngày",
   "relative_time.full.days": "{number, plural, other {# ngày}}",
   "relative_time.full.hours": "{number, plural, other {# giờ}}",
diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json
index 52a98d0005d6aa..ca82c8d7c0957a 100644
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@@ -298,6 +298,7 @@
   "filter_modal.select_filter.title": "过滤此嘟文",
   "filter_modal.title.status": "过滤一条嘟文",
   "filtered_notifications_banner.pending_requests": "来自你可能认识的 {count, plural, =0 {0 个人} other {# 个人}}的通知",
+  "filtered_notifications_banner.private_mentions": "{count, plural, other {私下提及}}",
   "filtered_notifications_banner.title": "通知（已过滤）",
   "firehose.all": "全部",
   "firehose.local": "此服务器",
@@ -471,7 +472,11 @@
   "notification.own_poll": "你的投票已经结束",
   "notification.poll": "你参与的一个投票已经结束",
   "notification.reblog": "{name} 转发了你的嘟文",
-  "notification.severed_relationships": "与 {name} 的关系已被切断",
+  "notification.relationships_severance_event": "与 {name} 的联系已断开",
+  "notification.relationships_severance_event.account_suspension": "一名来自 {from} 的管理员已经封禁了{target}，这意味着你将无法再收到他们的更新或与他们互动。",
+  "notification.relationships_severance_event.domain_block": "一名来自 {from} 的管理员已经屏蔽了 {target}，其中包括你的 {followersCount} 个关注者和 {followingCount, plural, other {# 个关注}}。",
+  "notification.relationships_severance_event.learn_more": "了解更多",
+  "notification.relationships_severance_event.user_domain_block": "你已经屏蔽了 {target}，移除了你的 {followersCount} 个关注者和 {followingCount, plural, other {# 个关注}}。",
   "notification.status": "{name} 刚刚发布嘟文",
   "notification.update": "{name} 编辑了嘟文",
   "notification_requests.accept": "接受",
@@ -590,12 +595,6 @@
   "refresh": "刷新",
   "regeneration_indicator.label": "加载中…",
   "regeneration_indicator.sublabel": "你的主页动态正在准备中！",
-  "relationship_severance_notification.purged_data": "被管理员清除",
-  "relationship_severance_notification.relationships": "{count, plural, other {# 条关系}}",
-  "relationship_severance_notification.types.account_suspension": "账户已被封禁",
-  "relationship_severance_notification.types.domain_block": "域名已被封禁",
-  "relationship_severance_notification.types.user_domain_block": "你屏蔽了这个域名",
-  "relationship_severance_notification.view": "查看",
   "relative_time.days": "{number} 天前",
   "relative_time.full.days": "{number, plural, one {# 天} other {# 天}}前",
   "relative_time.full.hours": "{number, plural, one {# 小时} other {# 小时}}前",
diff --git a/app/javascript/mastodon/locales/zh-HK.json b/app/javascript/mastodon/locales/zh-HK.json
index 68be293df92fdd..d618b68e2d26ed 100644
--- a/app/javascript/mastodon/locales/zh-HK.json
+++ b/app/javascript/mastodon/locales/zh-HK.json
@@ -471,7 +471,6 @@
   "notification.own_poll": "你的投票已結束",
   "notification.poll": "你參與過的一個投票已經結束",
   "notification.reblog": "{name} 轉推你的文章",
-  "notification.severed_relationships": "已斷絕與 {name} 的關係",
   "notification.status": "{name} 剛發表了文章",
   "notification.update": "{name} 編輯了帖文",
   "notification_requests.accept": "接受",
@@ -588,12 +587,6 @@
   "refresh": "重新整理",
   "regeneration_indicator.label": "載入中……",
   "regeneration_indicator.sublabel": "你的主頁時間軸正在準備中！",
-  "relationship_severance_notification.purged_data": "已被管理員清除",
-  "relationship_severance_notification.relationships": "{count, plural, one {# 個關係} other {# 個關係}}",
-  "relationship_severance_notification.types.account_suspension": "帳號已被停權",
-  "relationship_severance_notification.types.domain_block": "網域已被停權",
-  "relationship_severance_notification.types.user_domain_block": "你封鎖了此網域",
-  "relationship_severance_notification.view": "查看",
   "relative_time.days": "{number}日前",
   "relative_time.full.days": "{number, plural, one {# 天} other {# 天}}前",
   "relative_time.full.hours": "{number, plural, one {# 小時} other {# 小時}}前",
diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json
index d8e1e1e32b39a5..22f5420f839d2e 100644
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@@ -298,6 +298,7 @@
   "filter_modal.select_filter.title": "過濾此嘟文",
   "filter_modal.title.status": "過濾一則嘟文",
   "filtered_notifications_banner.pending_requests": "來自您可能認識的 {count, plural, =0 {0 人} other {# 人}} 之通知",
+  "filtered_notifications_banner.private_mentions": "{count, plural, other {# 則私訊}}",
   "filtered_notifications_banner.title": "已過濾之通知",
   "firehose.all": "全部",
   "firehose.local": "本站",
@@ -471,7 +472,11 @@
   "notification.own_poll": "您的投票已結束",
   "notification.poll": "您曾投過的投票已經結束",
   "notification.reblog": "{name} 已轉嘟您的嘟文",
-  "notification.severed_relationships": "已斷絕與 {name} 之服務關係",
+  "notification.relationships_severance_event": "與 {name} 失去連結",
+  "notification.relationships_severance_event.account_suspension": "{from} 之管理員已將 {target} 停權，意味著您將不再收到來自他們的更新或與之互動。",
+  "notification.relationships_severance_event.domain_block": "{from} 之管理員已將 {target} 封鎖，包含 {followersCount} 名您的跟隨者及 {followingCount, plural, other {#}} 名您跟隨的帳號。",
+  "notification.relationships_severance_event.learn_more": "了解更多",
+  "notification.relationships_severance_event.user_domain_block": "您已將 {target} 封鎖，將移除 {followersCount} 名您的跟隨者及 {followingCount, plural, other {#}} 名您跟隨的帳號。",
   "notification.status": "{name} 剛剛嘟文",
   "notification.update": "{name} 已編輯嘟文",
   "notification_requests.accept": "接受",
@@ -590,12 +595,6 @@
   "refresh": "重新整理",
   "regeneration_indicator.label": "載入中…",
   "regeneration_indicator.sublabel": "您的首頁時間軸正在準備中！",
-  "relationship_severance_notification.purged_data": "已被管理員清除",
-  "relationship_severance_notification.relationships": "{count, plural, other {# 個服務關係}}",
-  "relationship_severance_notification.types.account_suspension": "該帳號已被停權",
-  "relationship_severance_notification.types.domain_block": "該網域已被停權",
-  "relationship_severance_notification.types.user_domain_block": "您已封鎖此網域",
-  "relationship_severance_notification.view": "檢視",
   "relative_time.days": "{number} 天",
   "relative_time.full.days": "{number, plural, other {# 天}}前",
   "relative_time.full.hours": "{number, plural, one {# 小時} other {# 小時}}前",
diff --git a/config/locales/devise.hu.yml b/config/locales/devise.hu.yml
index 459bd01d9d1c51..d8958d5fb0db8b 100644
--- a/config/locales/devise.hu.yml
+++ b/config/locales/devise.hu.yml
@@ -43,13 +43,13 @@ hu:
         title: Emailcím megerősítése
       reset_password_instructions:
         action: Jelszó módosítása
-        explanation: A fiókodhoz tartozó jelszó módosítását kezdeményezted.
-        extra: Amennyiben nem te kezdeményezted a módosítást, kérjük tekintsd ezt az emailt tárgytalannak. A jelszavad változatlan marad mindaddig, amíg újat nem hozol létre a fenti linkre kattintva.
+        explanation: Új jelszót kértél a fiókodhoz.
+        extra: Ha nem te kérted, tekintsd ezt az e-mailt tárgytalannak. A jelszavad változatlan marad mindaddig, amíg újat nem hozol létre a fenti hivatkozásra kattintva.
         subject: 'Mastodon: Jelszóvisszaállítási utasítások'
         title: Jelszó visszaállítása
       two_factor_disabled:
         explanation: A bejelentkezés most már csupán email címmel és jelszóval lehetséges.
-        subject: Kétlépcsős azonosítás kikapcsolva
+        subject: 'Mastodon: kétlépcsős hitelesítés letiltva'
         subtitle: A kétlépcsős hitelesítés a fiókodhoz ki lett kapcsolva.
         title: Kétlépcsős hitelesítés kikapcsolva
       two_factor_enabled:
diff --git a/config/locales/doorkeeper.hu.yml b/config/locales/doorkeeper.hu.yml
index f03f6b58b4e697..3822e9c202340a 100644
--- a/config/locales/doorkeeper.hu.yml
+++ b/config/locales/doorkeeper.hu.yml
@@ -43,7 +43,7 @@ hu:
         new: Új alkalmazás
         scopes: Hatókörök
         show: Megjelenítés
-        title: Alkalmazásaid
+        title: Saját alkalmazások
       new:
         title: Új alkalmazás
       show:
@@ -77,7 +77,7 @@ hu:
         never_used: Soha sem volt használva
         scopes: Jogosultságok
         superapp: Belső
-        title: Hitelesített alkalmazásaid
+        title: Hitelesített saját alkalmazások
     errors:
       messages:
         access_denied: Az erőforrás tulajdonosa vagy az engedélyező kiszolgáló elutasította a kérést.
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index e29ce3752341b0..8f8070d7137cc1 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -25,27 +25,27 @@ hu:
   admin:
     account_actions:
       action: Művelet végrehajtása
-      title: "%{acct} moderálása"
+      title: 'Moderálási művelet végrehajtása ezen: %{acct}'
     account_moderation_notes:
-      create: Új moderációs bejegyzés
-      created_msg: Moderációs bejegyzés létrehozva!
-      destroyed_msg: Moderációs bejegyzés törölve!
+      create: Megjegyzés hagyása
+      created_msg: A moderációs megjegyzés sikeresen létrehozva!
+      destroyed_msg: A moderációs megjegyzés sikeresen törölve!
     accounts:
-      add_email_domain_block: Email domain tiltólistára vétele
+      add_email_domain_block: E-mail-domain tiltólistára vétele
       approve: Jóváhagyás
-      approved_msg: A %{username} fiók regisztrációs kérelmét sikeresen elfogadtuk
+      approved_msg: "%{username} regisztrációja sikeresen elfogadva"
       are_you_sure: Biztos vagy benne?
       avatar: Profilkép
       by_domain: Domain
       change_email:
-        changed_msg: Az emailt sikeresen megváltoztattuk!
-        current_email: Jelenlegi e-mail
-        label: E-mail megváltoztatása
-        new_email: Új e-mail
-        submit: E-mail megváltoztatása
-        title: "%{username} felhasználó e-mail változás"
+        changed_msg: Az e-mail-cím sikeresen megváltozott!
+        current_email: Jelenlegi e-mail-cím
+        label: E-mail-cím megváltoztatása
+        new_email: Új e-mail-cím
+        submit: E-mail-cím megváltoztatása
+        title: "%{username} e-mail-címének megváltoztatása"
       change_role:
-        changed_msg: A szerepet sikeresen megváltoztattuk!
+        changed_msg: A szerep sikeresen megváltoztatva!
         label: Szerep megváltoztatása
         no_role: Nincs szerep
         title: "%{username} szerepének megváltoztatása"
@@ -1224,7 +1224,7 @@ hu:
     archive_takeout:
       date: Dátum
       download: Archívum letöltése
-      hint_html: Itt kérhető egy archív az összes <strong>feltöltött bejegyzésedről és médiádról</strong>. Az exportált adatok ActivityPub formátumban lesznek, melyet bármilyen szabványos program tud olvasni. 7 naponként kérhetsz ilyen archívot.
+      hint_html: Itt kérhetsz egy archívumot az összes <strong>bejegyzésedről és médiáfájlodról</strong>. Az exportált adatok ActivityPub formátumban lesznek, mely bármilyen szabványos programmal olvasható. 7 naponta kérhetsz ilyen archívumot.
       in_progress: Archívum összeállítása…
       request: Archívum kérése
       size: Méret
diff --git a/config/locales/is.yml b/config/locales/is.yml
index fdf54030a15556..6f9d0e7c7d253e 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -1659,15 +1659,25 @@ is:
     import: Flytja inn
     import_and_export: Inn- og útflutningur
     migrate: Yfirfærsla notandaaðgangs
+    notifications: Tilkynningar í tölvupósti
     preferences: Kjörstillingar
     profile: Notandasnið
     relationships: Fylgist með og fylgjendur
+    severed_relationships: Rofin tengsl
     statuses_cleanup: Sjálfvirk eyðing færslna
     strikes: Umsýsla refsinga
     two_factor_authentication: Tveggja-þátta auðkenning
     webauthn_authentication: Öryggislyklar
   severed_relationships:
     download: Sækja (%{count})
+    event_type:
+      account_suspension: Frysting notandaaðgangsins (%{target_name})
+      domain_block: Frysting netþjónsins (%{target_name})
+      user_domain_block: Þú útilokaðir %{target_name}
+    lost_followers: Tapaðir fylgjendur
+    lost_follows: Tapað sem þú fylgist með
+    preamble: Þú gætir misst einhverja sem þú fylgist með og eins fylgjendur þegar þú útilokar lén eða þegar umsjónarmenn netþjónsins þíns ákveða að frysta fjartengdan netþjón. Þegar slíkt gerist, geturðu sótt lista yfir slík skemmd tengsl, til að yfirfara og mögulega flytja inn á öðrum netþjóni.
+    purged: Upplýsingum um þennan netþjón hefur verið eytt af stjórnendum netþjónsins þíns.
     type: Atburður
   statuses:
     attached:
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index adb3a041caa6ad..b4285673051551 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -1944,6 +1944,11 @@ sl:
       follows_subtitle: Sledite dobro znanim računom
       follows_title: Komu slediti
       follows_view_more: Pokaži več oseb za sledenje
+      hashtags_recent_count:
+        few: "%{people} osebe v zadnjih dveh dneh"
+        one: "%{people} oseba v zadnjih dveh dneh"
+        other: "%{people} oseb v zadnjih dveh dneh"
+        two: "%{people} osebi v zadnjih dveh dneh"
       hashtags_subtitle: Raziščite, kaj je v trendu zadnja dva dni
       hashtags_title: Ključniki v trendu
       hashtags_view_more: Pokaži več ključnikov v trendu

From b34c08959126676a9acd87aa57ee4e982d0af1ab Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 26 Mar 2024 14:09:35 +0100
Subject: [PATCH 0606/2191] Update dependency csv to v3.3.0 (#29715)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 133dae5b3dffe6..ad70d8274034ae 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -188,7 +188,7 @@ GEM
     crass (1.0.6)
     css_parser (1.16.0)
       addressable
-    csv (3.2.8)
+    csv (3.3.0)
     database_cleaner-active_record (2.1.0)
       activerecord (>= 5.a)
       database_cleaner-core (~> 2.0.0)

From cf76380c9158a7ab2793a66eb3e74d6a3687cac0 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 26 Mar 2024 09:12:09 -0400
Subject: [PATCH 0607/2191] Add `AccountStat.by_recent_status`, use in
 `Account` (#29704)

---
 app/models/account.rb             | 3 ++-
 app/models/account_stat.rb        | 3 +++
 app/models/relationship_filter.rb | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/models/account.rb b/app/models/account.rb
index 322a29248eca40..3739709a13a245 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -132,12 +132,13 @@ class Account < ApplicationRecord
   scope :auditable, -> { where(id: Admin::ActionLog.select(:account_id).distinct) }
   scope :searchable, -> { without_unapproved.without_suspended.where(moved_to_account_id: nil) }
   scope :discoverable, -> { searchable.without_silenced.where(discoverable: true).joins(:account_stat) }
-  scope :by_recent_status, -> { includes(:account_stat).merge(AccountStat.order('last_status_at DESC NULLS LAST')).references(:account_stat) }
+  scope :by_recent_status, -> { includes(:account_stat).merge(AccountStat.by_recent_status).references(:account_stat) }
   scope :by_recent_activity, -> { left_joins(:user, :account_stat).order(coalesced_activity_timestamps.desc).order(id: :desc) }
   scope :popular, -> { order('account_stats.followers_count desc') }
   scope :by_domain_and_subdomains, ->(domain) { where(domain: Instance.by_domain_and_subdomains(domain).select(:domain)) }
   scope :not_excluded_by_account, ->(account) { where.not(id: account.excluded_from_timeline_account_ids) }
   scope :not_domain_blocked_by_account, ->(account) { where(arel_table[:domain].eq(nil).or(arel_table[:domain].not_in(account.excluded_from_timeline_domains))) }
+  scope :dormant, -> { joins(:account_stat).merge(AccountStat.without_recent_activity) }
 
   after_update_commit :trigger_update_webhooks
 
diff --git a/app/models/account_stat.rb b/app/models/account_stat.rb
index 0fea7732e9874c..14aa7ef800787f 100644
--- a/app/models/account_stat.rb
+++ b/app/models/account_stat.rb
@@ -20,6 +20,9 @@ class AccountStat < ApplicationRecord
 
   belongs_to :account, inverse_of: :account_stat
 
+  scope :by_recent_status, -> { order(arel_table[:last_status_at].desc.nulls_last) }
+  scope :without_recent_activity, -> { where(last_status_at: [nil, ...1.month.ago]) }
+
   update_index('accounts', :account)
 
   def following_count
diff --git a/app/models/relationship_filter.rb b/app/models/relationship_filter.rb
index d686f9ed89db44..828610e46a48d6 100644
--- a/app/models/relationship_filter.rb
+++ b/app/models/relationship_filter.rb
@@ -114,7 +114,7 @@ def order_scope(value)
   def activity_scope(value)
     case value
     when 'dormant'
-      Account.joins(:account_stat).where(account_stat: { last_status_at: [nil, ...1.month.ago] })
+      Account.dormant
     else
       raise Mastodon::InvalidParameterError, "Unknown activity: #{value}"
     end

From 32938dadd71b57cb60a70039e1fb018f97571ca9 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 26 Mar 2024 09:21:20 -0400
Subject: [PATCH 0608/2191] Add `not_allowed` scope for `PreviewCardTrend`
 (#29599)

---
 app/models/preview_card_trend.rb | 2 ++
 app/models/trends/links.rb       | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/models/preview_card_trend.rb b/app/models/preview_card_trend.rb
index da2ea2f8c8caba..58155971a368cd 100644
--- a/app/models/preview_card_trend.rb
+++ b/app/models/preview_card_trend.rb
@@ -15,5 +15,7 @@ class PreviewCardTrend < ApplicationRecord
   include RankedTrend
 
   belongs_to :preview_card
+
   scope :allowed, -> { where(allowed: true) }
+  scope :not_allowed, -> { where(allowed: false) }
 end
diff --git a/app/models/trends/links.rb b/app/models/trends/links.rb
index 76e50aa7a2ecb0..0650c4109de8ac 100644
--- a/app/models/trends/links.rb
+++ b/app/models/trends/links.rb
@@ -86,8 +86,8 @@ def refresh(at_time = Time.now.utc)
 
   def request_review
     PreviewCardTrend.pluck('distinct language').flat_map do |language|
-      score_at_threshold  = PreviewCardTrend.where(language: language, allowed: true).by_rank.ranked_below(options[:review_threshold]).first&.score || 0
-      preview_card_trends = PreviewCardTrend.where(language: language, allowed: false).joins(:preview_card)
+      score_at_threshold  = PreviewCardTrend.where(language: language).allowed.by_rank.ranked_below(options[:review_threshold]).first&.score || 0
+      preview_card_trends = PreviewCardTrend.where(language: language).not_allowed.joins(:preview_card)
 
       preview_card_trends.filter_map do |trend|
         preview_card = trend.preview_card

From cfea9cc172fcce5deeafeb4f6f5eba85f7827e96 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 26 Mar 2024 15:45:19 +0100
Subject: [PATCH 0609/2191] Add list of pending releases directly in mail
 notifications for version updates (#29436)

---
 app/mailers/admin_mailer.rb                                   | 4 ++++
 app/views/admin_mailer/new_critical_software_updates.text.erb | 4 ++++
 app/views/admin_mailer/new_software_updates.text.erb          | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/app/mailers/admin_mailer.rb b/app/mailers/admin_mailer.rb
index 8990b2a8470013..8dd7b6e59fb055 100644
--- a/app/mailers/admin_mailer.rb
+++ b/app/mailers/admin_mailer.rb
@@ -46,12 +46,16 @@ def new_trends(links, tags, statuses)
   end
 
   def new_software_updates
+    @software_updates = SoftwareUpdate.all.to_a.sort_by(&:gem_version)
+
     locale_for_account(@me) do
       mail subject: default_i18n_subject(instance: @instance)
     end
   end
 
   def new_critical_software_updates
+    @software_updates = SoftwareUpdate.where(urgent: true).to_a.sort_by(&:gem_version)
+
     headers['Priority'] = 'urgent'
     headers['X-Priority'] = '1'
     headers['Importance'] = 'high'
diff --git a/app/views/admin_mailer/new_critical_software_updates.text.erb b/app/views/admin_mailer/new_critical_software_updates.text.erb
index 63c170dc0d6c83..e4886c26219d19 100644
--- a/app/views/admin_mailer/new_critical_software_updates.text.erb
+++ b/app/views/admin_mailer/new_critical_software_updates.text.erb
@@ -1,3 +1,7 @@
 <%= raw t('admin_mailer.new_critical_software_updates.body') %>
 
+<% @software_updates.each do |update| %>
+- Mastodon #{update.version}: #{update.release_notes}
+<% end %>
+
 <%= raw t('application_mailer.view')%> <%= admin_software_updates_url %>
diff --git a/app/views/admin_mailer/new_software_updates.text.erb b/app/views/admin_mailer/new_software_updates.text.erb
index 96808f3cb3deba..7612b7c59f72d8 100644
--- a/app/views/admin_mailer/new_software_updates.text.erb
+++ b/app/views/admin_mailer/new_software_updates.text.erb
@@ -1,3 +1,7 @@
 <%= raw t('admin_mailer.new_software_updates.body') %>
 
+<% @software_updates.each do |update| %>
+- Mastodon #{update.version}: #{update.release_notes}
+<% end %>
+
 <%= raw t('application_mailer.view')%> <%= admin_software_updates_url %>

From 7508472d843e2adab436024daa6898996c9030c6 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 26 Mar 2024 15:46:05 +0100
Subject: [PATCH 0610/2191] Fix admin interface repeating rule title instead of
 showing hint text (#29758)

---
 app/views/admin/rules/_rule.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/admin/rules/_rule.html.haml b/app/views/admin/rules/_rule.html.haml
index a0896fe806e333..5f37f693543702 100644
--- a/app/views/admin/rules/_rule.html.haml
+++ b/app/views/admin/rules/_rule.html.haml
@@ -5,7 +5,7 @@
 
   .announcements-list__item__action-bar
     .announcements-list__item__meta
-      = rule.text
+      = rule.hint
 
     %div
       = table_link_to 'trash', t('admin.rules.delete'), admin_rule_path(rule), method: :delete, data: { confirm: t('admin.accounts.are_you_sure') } if can?(:destroy, rule)

From 9c24f2d6b17104cac229a126e35fdfda7a557d79 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 26 Mar 2024 15:46:38 +0100
Subject: [PATCH 0611/2191] Undo notification permissions on individual and
 domain blocks (#29570)

---
 .../after_block_domain_from_account_service.rb    |  5 +++++
 app/services/block_service.rb                     |  2 ++
 ...fter_block_domain_from_account_service_spec.rb | 15 ++++++---------
 spec/services/block_service_spec.rb               |  8 +++++---
 4 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/app/services/after_block_domain_from_account_service.rb b/app/services/after_block_domain_from_account_service.rb
index adb17845ccaf29..fc5dc6568103e1 100644
--- a/app/services/after_block_domain_from_account_service.rb
+++ b/app/services/after_block_domain_from_account_service.rb
@@ -12,6 +12,7 @@ def call(account, domain)
     @domain_block_event = nil
 
     clear_notifications!
+    clear_notification_permissions!
     remove_follows!
     reject_existing_followers!
     reject_pending_follow_requests!
@@ -31,6 +32,10 @@ def clear_notifications!
     Notification.where(account: @account).where(from_account: Account.where(domain: @domain)).in_batches.delete_all
   end
 
+  def clear_notification_permissions!
+    NotificationPermission.where(account: @account, from_account: Account.where(domain: @domain)).in_batches.delete_all
+  end
+
   def reject_existing_followers!
     @account.passive_relationships.where(account: Account.where(domain: @domain)).includes(:account).reorder(nil).in_batches do |follows|
       domain_block_event.import_from_passive_follows!(follows)
diff --git a/app/services/block_service.rb b/app/services/block_service.rb
index 266a0f4b9d0384..98229d98c0eaaf 100644
--- a/app/services/block_service.rb
+++ b/app/services/block_service.rb
@@ -10,6 +10,8 @@ def call(account, target_account)
     UnfollowService.new.call(target_account, account) if target_account.following?(account)
     RejectFollowService.new.call(target_account, account) if target_account.requested?(account)
 
+    NotificationPermission.where(account: account, from_account: target_account).destroy_all
+
     block = account.block!(target_account)
 
     BlockWorker.perform_async(account.id, target_account.id)
diff --git a/spec/services/after_block_domain_from_account_service_spec.rb b/spec/services/after_block_domain_from_account_service_spec.rb
index 12e780357de3c3..248648a809e954 100644
--- a/spec/services/after_block_domain_from_account_service_spec.rb
+++ b/spec/services/after_block_domain_from_account_service_spec.rb
@@ -10,20 +10,17 @@
   let(:alice) { Fabricate(:account, username: 'alice') }
 
   before do
+    NotificationPermission.create!(account: alice, from_account: wolf)
+
     wolf.follow!(alice)
     alice.follow!(dog)
   end
 
-  around do |example|
-    Sidekiq::Testing.fake! do
-      example.run
-    end
-  end
-
-  it 'purges followers from blocked domain, sends them Reject->Follow, and records severed relationships', :aggregate_failures do
-    subject.call(alice, 'evil.org')
+  it 'purge followers from blocked domain, remove notification permissions, sends `Reject->Follow`, and records severed relationships', :aggregate_failures do
+    expect { subject.call(alice, 'evil.org') }
+      .to change { wolf.following?(alice) }.from(true).to(false)
+      .and change { NotificationPermission.exists?(account: alice, from_account: wolf) }.from(true).to(false)
 
-    expect(wolf.following?(alice)).to be false
     expect(ActivityPub::DeliveryWorker.jobs.pluck('args')).to contain_exactly(
       [a_string_including('"type":"Reject"'), alice.id, wolf.inbox_url],
       [a_string_including('"type":"Undo"'), alice.id, dog.inbox_url]
diff --git a/spec/services/block_service_spec.rb b/spec/services/block_service_spec.rb
index e72e5282598ce8..d096aa1ea35566 100644
--- a/spec/services/block_service_spec.rb
+++ b/spec/services/block_service_spec.rb
@@ -11,11 +11,13 @@
     let(:bob) { Fabricate(:account, username: 'bob') }
 
     before do
-      subject.call(sender, bob)
+      NotificationPermission.create!(account: sender, from_account: bob)
     end
 
-    it 'creates a blocking relation' do
-      expect(sender.blocking?(bob)).to be true
+    it 'creates a blocking relation and removes notification permissions' do
+      expect { subject.call(sender, bob) }
+        .to change { sender.blocking?(bob) }.from(false).to(true)
+        .and change { NotificationPermission.exists?(account: sender, from_account: bob) }.from(true).to(false)
     end
   end
 

From de740dfb9cb55af5d77ebdcea84133521200de73 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 26 Mar 2024 16:57:08 +0100
Subject: [PATCH 0612/2191] Use `upsert_all` and `insert_all` to reduce
 back-and-forth in costly migrations (#29752)

---
 ..._migrate_interaction_settings_to_policy.rb | 62 +++++++++--------
 ...te_interaction_settings_to_policy_again.rb | 66 +++++++++----------
 2 files changed, 66 insertions(+), 62 deletions(-)

diff --git a/db/migrate/20240304090449_migrate_interaction_settings_to_policy.rb b/db/migrate/20240304090449_migrate_interaction_settings_to_policy.rb
index a0ce0a66381de4..ea4cfccdf9368b 100644
--- a/db/migrate/20240304090449_migrate_interaction_settings_to_policy.rb
+++ b/db/migrate/20240304090449_migrate_interaction_settings_to_policy.rb
@@ -4,46 +4,50 @@ class MigrateInteractionSettingsToPolicy < ActiveRecord::Migration[7.1]
   disable_ddl_transaction!
 
   # Dummy classes, to make migration possible across version changes
-  class Account < ApplicationRecord
-    has_one :user, inverse_of: :account
-    has_one :notification_policy, inverse_of: :account
-  end
-
   class User < ApplicationRecord
-    belongs_to :account
+    belongs_to :notification_policy, foreign_key: 'account_id', primary_key: 'account_id', optional: true, inverse_of: false
   end
 
-  class NotificationPolicy < ApplicationRecord
-    belongs_to :account
-  end
+  class NotificationPolicy < ApplicationRecord; end
 
   def up
-    User.includes(account: :notification_policy).find_each do |user|
-      deserialized_settings = Oj.load(user.attributes_before_type_cast['settings'])
+    User.includes(:notification_policy).in_batches do |users|
+      NotificationPolicy.upsert_all(users.filter_map { |user| policy_for_user(user) })
+    end
+  end
 
-      next if deserialized_settings.nil?
+  def down; end
 
-      policy = user.account.notification_policy || user.account.build_notification_policy
-      requires_new_policy = false
+  private
 
-      if deserialized_settings['interactions.must_be_follower']
-        policy.filter_not_followers = true
-        requires_new_policy = true
-      end
+  def policy_for_user(user)
+    deserialized_settings = Oj.load(user.attributes_before_type_cast['settings'])
+    return if deserialized_settings.nil?
 
-      if deserialized_settings['interactions.must_be_following']
-        policy.filter_not_following = true
-        requires_new_policy = true
-      end
+    requires_new_policy = false
 
-      unless deserialized_settings['interactions.must_be_following_dm']
-        policy.filter_private_mentions = false
-        requires_new_policy = true
-      end
+    policy = {
+      account_id: user.account_id,
+      filter_not_followers: false,
+      filter_not_following: false,
+      filter_private_mentions: true,
+    }
 
-      policy.save if requires_new_policy && policy.changed?
+    if deserialized_settings['interactions.must_be_follower']
+      policy[:filter_not_followers] = true
+      requires_new_policy = true
     end
-  end
 
-  def down; end
+    if deserialized_settings['interactions.must_be_following']
+      policy[:filter_not_following] = true
+      requires_new_policy = true
+    end
+
+    unless deserialized_settings['interactions.must_be_following_dm']
+      policy[:filter_private_mentions] = false
+      requires_new_policy = true
+    end
+
+    policy if requires_new_policy
+  end
 end
diff --git a/db/post_migrate/20240321160706_migrate_interaction_settings_to_policy_again.rb b/db/post_migrate/20240321160706_migrate_interaction_settings_to_policy_again.rb
index 9baefa677549d6..c789b639517ae0 100644
--- a/db/post_migrate/20240321160706_migrate_interaction_settings_to_policy_again.rb
+++ b/db/post_migrate/20240321160706_migrate_interaction_settings_to_policy_again.rb
@@ -4,51 +4,51 @@ class MigrateInteractionSettingsToPolicyAgain < ActiveRecord::Migration[7.1]
   disable_ddl_transaction!
 
   # Dummy classes, to make migration possible across version changes
-  class Account < ApplicationRecord
-    has_one :user, inverse_of: :account
-    has_one :notification_policy, inverse_of: :account
-  end
-
   class User < ApplicationRecord
-    belongs_to :account
+    belongs_to :notification_policy, foreign_key: 'account_id', primary_key: 'account_id', optional: true, inverse_of: false
   end
 
-  class NotificationPolicy < ApplicationRecord
-    belongs_to :account
-  end
+  class NotificationPolicy < ApplicationRecord; end
 
   def up
-    User.includes(account: :notification_policy).find_each do |user|
-      deserialized_settings = Oj.load(user.attributes_before_type_cast['settings'])
+    User.includes(:notification_policy).in_batches do |users|
+      NotificationPolicy.insert_all(users.filter_map { |user| policy_for_user(user) })
+    end
+  end
+
+  def down; end
 
-      next if deserialized_settings.nil?
+  private
 
-      # If the user has configured a notification policy, don't override it
-      next if user.account.notification_policy.present?
+  def policy_for_user(user)
+    deserialized_settings = Oj.load(user.attributes_before_type_cast['settings'])
+    return if deserialized_settings.nil?
+    return if user.notification_policy.present?
 
-      policy = user.account.build_notification_policy
-      requires_new_policy = false
+    requires_new_policy = false
 
-      if deserialized_settings['interactions.must_be_follower']
-        policy.filter_not_followers = true
-        requires_new_policy = true
-      end
+    policy = {
+      account_id: user.account_id,
+      filter_not_followers: false,
+      filter_not_following: false,
+      filter_private_mentions: true,
+    }
 
-      if deserialized_settings['interactions.must_be_following']
-        policy.filter_not_following = true
-        requires_new_policy = true
-      end
+    if deserialized_settings['interactions.must_be_follower']
+      policy[:filter_not_followers] = true
+      requires_new_policy = true
+    end
 
-      unless deserialized_settings['interactions.must_be_following_dm']
-        policy.filter_private_mentions = false
-        requires_new_policy = true
-      end
+    if deserialized_settings['interactions.must_be_following']
+      policy[:filter_not_following] = true
+      requires_new_policy = true
+    end
 
-      policy.save if requires_new_policy && policy.changed?
-    rescue ActiveRecord::RecordNotUnique
-      next
+    unless deserialized_settings['interactions.must_be_following_dm']
+      policy[:filter_private_mentions] = false
+      requires_new_policy = true
     end
-  end
 
-  def down; end
+    policy if requires_new_policy
+  end
 end

From c4feba43476635904a4a0f0dbd9c7b48d4c2985a Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 26 Mar 2024 11:58:48 -0400
Subject: [PATCH 0613/2191] Use existing `MascotHelper#instance_presenter`
 instead of local var in `welcome` email template (#29759)

---
 app/mailers/user_mailer.rb              | 5 +++--
 app/views/user_mailer/welcome.html.haml | 2 --
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb
index 96fcd51efa2ec6..f8c1c9a8d0048b 100644
--- a/app/mailers/user_mailer.rb
+++ b/app/mailers/user_mailer.rb
@@ -5,10 +5,11 @@ class UserMailer < Devise::Mailer
 
   helper :accounts
   helper :application
-  helper :instance
-  helper :statuses
+  helper :mascot
   helper :formatting
+  helper :instance
   helper :routing
+  helper :statuses
 
   before_action :set_instance
 
diff --git a/app/views/user_mailer/welcome.html.haml b/app/views/user_mailer/welcome.html.haml
index e7f9c47e3b86b2..fd8980c234a036 100644
--- a/app/views/user_mailer/welcome.html.haml
+++ b/app/views/user_mailer/welcome.html.haml
@@ -1,5 +1,3 @@
-- instance_presenter = InstancePresenter.new
-
 = content_for :heading do
   .email-desktop-flex
     .email-header-left

From b2d841ce9ae415550d44abecb182ac068ee121e3 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 27 Mar 2024 00:14:11 +0100
Subject: [PATCH 0614/2191] Fix column borders disappearing in advanced
 interface on low width viewports (#29763)

---
 .../styles/mastodon/components.scss           | 47 +++++++++----------
 1 file changed, 23 insertions(+), 24 deletions(-)

diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 3704751effdf9c..2d7aa32d836350 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -2890,24 +2890,31 @@ $ui-header-height: 55px;
     }
   }
 
-  .layout-single-column .ui__header {
-    display: flex;
-    background: var(--background-color-tint);
-    border-bottom: 1px solid var(--background-border-color);
-  }
+  .layout-single-column {
+    .ui__header {
+      display: flex;
+      background: var(--background-color-tint);
+      border-bottom: 1px solid var(--background-border-color);
+    }
 
-  .column > .scrollable,
-  .tabs-bar__wrapper .column-header,
-  .tabs-bar__wrapper .column-back-button {
-    border-left: 0;
-    border-right: 0;
-  }
+    .column > .scrollable,
+    .tabs-bar__wrapper .column-header,
+    .tabs-bar__wrapper .column-back-button {
+      border-left: 0;
+      border-right: 0;
+    }
+
+    .column-header,
+    .column-back-button,
+    .scrollable,
+    .error-column {
+      border-radius: 0 !important;
+    }
 
-  .column-header,
-  .column-back-button,
-  .scrollable,
-  .error-column {
-    border-radius: 0 !important;
+    .column-header,
+    .column-back-button {
+      border-top: 0;
+    }
   }
 }
 
@@ -3466,10 +3473,6 @@ $ui-header-height: 55px;
   &:hover {
     text-decoration: underline;
   }
-
-  @media screen and (max-width: $no-gap-breakpoint) {
-    border-top: 0;
-  }
 }
 
 .column-header__back-button {
@@ -4233,10 +4236,6 @@ a.status-card {
       padding-top: 16px;
     }
   }
-
-  @media screen and (max-width: $no-gap-breakpoint) {
-    border-top: 0;
-  }
 }
 
 .column-header__buttons {

From c5692d2f2f4beede8b8c158954d3ab86df3f3e98 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 27 Mar 2024 10:59:42 +0100
Subject: [PATCH 0615/2191] Update dependency prom-client to v15.1.1 (#29764)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index a2258375b22dc8..268aa244885542 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -14023,12 +14023,12 @@ __metadata:
   linkType: hard
 
 "prom-client@npm:^15.0.0":
-  version: 15.1.0
-  resolution: "prom-client@npm:15.1.0"
+  version: 15.1.1
+  resolution: "prom-client@npm:15.1.1"
   dependencies:
     "@opentelemetry/api": "npm:^1.4.0"
     tdigest: "npm:^0.1.1"
-  checksum: 10c0/c10781adbf49225298e44da5396a51a0bd4d0cddc3c7e237ba50e888e12ead26a8f98261f362a442f1bbcdaddd6e7302d5675b37beac67ea9b6f82e4d39fb3cc
+  checksum: 10c0/b3e6a58fc0ef87cf5b0badf06d7d79c24ac93ba47cccfaad95faeba79824c6a7724d74a257e7268d691245c847173818c16c8153054cccf16b8f033c37c74129
   languageName: node
   linkType: hard
 

From 1d0a43f6a353717ff6e02ab17276228c9cf452a4 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 27 Mar 2024 05:59:45 -0400
Subject: [PATCH 0616/2191] Use composable query in
 `Status.not_domain_blocked_by_account` scope (#29766)

---
 app/models/status.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/status.rb b/app/models/status.rb
index c8effd3da7c698..ae53513ee64f51 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -110,7 +110,7 @@ class Status < ApplicationRecord
   scope :without_reblogs, -> { where(statuses: { reblog_of_id: nil }) }
   scope :tagged_with, ->(tag_ids) { joins(:statuses_tags).where(statuses_tags: { tag_id: tag_ids }) }
   scope :not_excluded_by_account, ->(account) { where.not(account_id: account.excluded_from_timeline_account_ids) }
-  scope :not_domain_blocked_by_account, ->(account) { account.excluded_from_timeline_domains.blank? ? left_outer_joins(:account) : left_outer_joins(:account).where('accounts.domain IS NULL OR accounts.domain NOT IN (?)', account.excluded_from_timeline_domains) }
+  scope :not_domain_blocked_by_account, ->(account) { account.excluded_from_timeline_domains.blank? ? left_outer_joins(:account) : left_outer_joins(:account).merge(Account.not_domain_blocked_by_account(account)) }
   scope :tagged_with_all, lambda { |tag_ids|
     Array(tag_ids).map(&:to_i).reduce(self) do |result, id|
       result.where(<<~SQL.squish, tag_id: id)

From 86f999c1f2db7186c6d43670f78d05ebd9ccc042 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 27 Mar 2024 10:59:50 +0100
Subject: [PATCH 0617/2191] Update dependency json-schema to v4.3.0 (#29769)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index ad70d8274034ae..4d36cf4e9ff37a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -373,7 +373,7 @@ GEM
     json-ld-preloaded (3.3.0)
       json-ld (~> 3.3)
       rdf (~> 3.3)
-    json-schema (4.2.0)
+    json-schema (4.3.0)
       addressable (>= 2.8)
     jsonapi-renderer (0.2.2)
     jwt (2.7.1)

From d49343ed11b3c08c4e81ecd70e17e01bd30154a6 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 27 Mar 2024 10:59:54 +0100
Subject: [PATCH 0618/2191] Update dependency react-intl to v6.6.4 (#29771)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 268aa244885542..bcdd1bd6f884dc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -14331,8 +14331,8 @@ __metadata:
   linkType: hard
 
 "react-intl@npm:^6.4.2":
-  version: 6.6.3
-  resolution: "react-intl@npm:6.6.3"
+  version: 6.6.4
+  resolution: "react-intl@npm:6.6.4"
   dependencies:
     "@formatjs/ecma402-abstract": "npm:1.18.2"
     "@formatjs/icu-messageformat-parser": "npm:2.7.6"
@@ -14350,7 +14350,7 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 10c0/8a924931668f1bf6364bb41c09fdb54972b8e3372f0768a31478dc3f8a846920caa4dc04ab3950195baa6dbf58a148f43a6a221d5795be2cbb6f4f374a5921d6
+  checksum: 10c0/bd874ad3a56b0198903c02c878cfa23b5ae9a44d2c74fd4f01ddb602c97a8115de8cebed00b44f7dc5fb3031e5ef0f9cfb4bdabd105b99a785352462deb106d3
   languageName: node
   linkType: hard
 

From 27d014a7fa4a92117e133adfd1c3e4e1c34ddc9c Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Wed, 27 Mar 2024 13:47:09 +0100
Subject: [PATCH 0619/2191] Rewrite markers reducer in Typescript (#27644)

---
 app/javascript/mastodon/actions/markers.js    | 152 ----------------
 app/javascript/mastodon/actions/markers.ts    | 163 ++++++++++++++++++
 app/javascript/mastodon/api.ts                |   9 +-
 app/javascript/mastodon/api_types/markers.ts  |   7 +
 app/javascript/mastodon/reducers/index.ts     |   4 +-
 app/javascript/mastodon/reducers/markers.js   |  26 ---
 app/javascript/mastodon/reducers/markers.ts   |  18 ++
 .../mastodon/reducers/notifications.js        |   6 +-
 app/serializers/rest/marker_serializer.rb     |   2 +
 9 files changed, 202 insertions(+), 185 deletions(-)
 delete mode 100644 app/javascript/mastodon/actions/markers.js
 create mode 100644 app/javascript/mastodon/actions/markers.ts
 create mode 100644 app/javascript/mastodon/api_types/markers.ts
 delete mode 100644 app/javascript/mastodon/reducers/markers.js
 create mode 100644 app/javascript/mastodon/reducers/markers.ts

diff --git a/app/javascript/mastodon/actions/markers.js b/app/javascript/mastodon/actions/markers.js
deleted file mode 100644
index cfc329a8b75b91..00000000000000
--- a/app/javascript/mastodon/actions/markers.js
+++ /dev/null
@@ -1,152 +0,0 @@
-import { List as ImmutableList } from 'immutable';
-
-import { debounce } from 'lodash';
-
-import api from '../api';
-import { compareId } from '../compare_id';
-
-export const MARKERS_FETCH_REQUEST = 'MARKERS_FETCH_REQUEST';
-export const MARKERS_FETCH_SUCCESS = 'MARKERS_FETCH_SUCCESS';
-export const MARKERS_FETCH_FAIL    = 'MARKERS_FETCH_FAIL';
-export const MARKERS_SUBMIT_SUCCESS = 'MARKERS_SUBMIT_SUCCESS';
-
-export const synchronouslySubmitMarkers = () => (dispatch, getState) => {
-  const accessToken = getState().getIn(['meta', 'access_token'], '');
-  const params      = _buildParams(getState());
-
-  if (Object.keys(params).length === 0 || accessToken === '') {
-    return;
-  }
-
-  // The Fetch API allows us to perform requests that will be carried out
-  // after the page closes. But that only works if the `keepalive` attribute
-  // is supported.
-  if (window.fetch && 'keepalive' in new Request('')) {
-    fetch('/api/v1/markers', {
-      keepalive: true,
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json',
-        'Authorization': `Bearer ${accessToken}`,
-      },
-      body: JSON.stringify(params),
-    });
-
-    return;
-  } else if (navigator && navigator.sendBeacon) {
-    // Failing that, we can use sendBeacon, but we have to encode the data as
-    // FormData for DoorKeeper to recognize the token.
-    const formData = new FormData();
-
-    formData.append('bearer_token', accessToken);
-
-    for (const [id, value] of Object.entries(params)) {
-      formData.append(`${id}[last_read_id]`, value.last_read_id);
-    }
-
-    if (navigator.sendBeacon('/api/v1/markers', formData)) {
-      return;
-    }
-  }
-
-  // If neither Fetch nor sendBeacon worked, try to perform a synchronous
-  // request.
-  try {
-    const client = new XMLHttpRequest();
-
-    client.open('POST', '/api/v1/markers', false);
-    client.setRequestHeader('Content-Type', 'application/json');
-    client.setRequestHeader('Authorization', `Bearer ${accessToken}`);
-    client.send(JSON.stringify(params));
-  } catch (e) {
-    // Do not make the BeforeUnload handler error out
-  }
-};
-
-const _buildParams = (state) => {
-  const params = {};
-
-  const lastHomeId         = state.getIn(['timelines', 'home', 'items'], ImmutableList()).find(item => item !== null);
-  const lastNotificationId = state.getIn(['notifications', 'lastReadId']);
-
-  if (lastHomeId && compareId(lastHomeId, state.getIn(['markers', 'home'])) > 0) {
-    params.home = {
-      last_read_id: lastHomeId,
-    };
-  }
-
-  if (lastNotificationId && compareId(lastNotificationId, state.getIn(['markers', 'notifications'])) > 0) {
-    params.notifications = {
-      last_read_id: lastNotificationId,
-    };
-  }
-
-  return params;
-};
-
-const debouncedSubmitMarkers = debounce((dispatch, getState) => {
-  const accessToken = getState().getIn(['meta', 'access_token'], '');
-  const params      = _buildParams(getState());
-
-  if (Object.keys(params).length === 0 || accessToken === '') {
-    return;
-  }
-
-  api(getState).post('/api/v1/markers', params).then(() => {
-    dispatch(submitMarkersSuccess(params));
-  }).catch(() => {});
-}, 300000, { leading: true, trailing: true });
-
-export function submitMarkersSuccess({ home, notifications }) {
-  return {
-    type: MARKERS_SUBMIT_SUCCESS,
-    home: (home || {}).last_read_id,
-    notifications: (notifications || {}).last_read_id,
-  };
-}
-
-export function submitMarkers(params = {}) {
-  const result = (dispatch, getState) => debouncedSubmitMarkers(dispatch, getState);
-
-  if (params.immediate === true) {
-    debouncedSubmitMarkers.flush();
-  }
-
-  return result;
-}
-
-export const fetchMarkers = () => (dispatch, getState) => {
-  const params = { timeline: ['notifications'] };
-
-  dispatch(fetchMarkersRequest());
-
-  api(getState).get('/api/v1/markers', { params }).then(response => {
-    dispatch(fetchMarkersSuccess(response.data));
-  }).catch(error => {
-    dispatch(fetchMarkersFail(error));
-  });
-};
-
-export function fetchMarkersRequest() {
-  return {
-    type: MARKERS_FETCH_REQUEST,
-    skipLoading: true,
-  };
-}
-
-export function fetchMarkersSuccess(markers) {
-  return {
-    type: MARKERS_FETCH_SUCCESS,
-    markers,
-    skipLoading: true,
-  };
-}
-
-export function fetchMarkersFail(error) {
-  return {
-    type: MARKERS_FETCH_FAIL,
-    error,
-    skipLoading: true,
-    skipAlert: true,
-  };
-}
diff --git a/app/javascript/mastodon/actions/markers.ts b/app/javascript/mastodon/actions/markers.ts
new file mode 100644
index 00000000000000..4e90a9c6bd25cf
--- /dev/null
+++ b/app/javascript/mastodon/actions/markers.ts
@@ -0,0 +1,163 @@
+import { List as ImmutableList } from 'immutable';
+
+import { debounce } from 'lodash';
+
+import type { MarkerJSON } from 'mastodon/api_types/markers';
+import type { RootState } from 'mastodon/store';
+import { createAppAsyncThunk } from 'mastodon/store/typed_functions';
+
+import api, { authorizationTokenFromState } from '../api';
+import { compareId } from '../compare_id';
+
+export const synchronouslySubmitMarkers = createAppAsyncThunk(
+  'markers/submit',
+  async (_args, { getState }) => {
+    const accessToken = authorizationTokenFromState(getState);
+    const params = buildPostMarkersParams(getState());
+
+    if (Object.keys(params).length === 0 || !accessToken) {
+      return;
+    }
+
+    // The Fetch API allows us to perform requests that will be carried out
+    // after the page closes. But that only works if the `keepalive` attribute
+    // is supported.
+    if ('fetch' in window && 'keepalive' in new Request('')) {
+      await fetch('/api/v1/markers', {
+        keepalive: true,
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+          Authorization: `Bearer ${accessToken}`,
+        },
+        body: JSON.stringify(params),
+      });
+
+      return;
+      // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+    } else if ('navigator' && 'sendBeacon' in navigator) {
+      // Failing that, we can use sendBeacon, but we have to encode the data as
+      // FormData for DoorKeeper to recognize the token.
+      const formData = new FormData();
+
+      formData.append('bearer_token', accessToken);
+
+      for (const [id, value] of Object.entries(params)) {
+        if (value.last_read_id)
+          formData.append(`${id}[last_read_id]`, value.last_read_id);
+      }
+
+      if (navigator.sendBeacon('/api/v1/markers', formData)) {
+        return;
+      }
+    }
+
+    // If neither Fetch nor sendBeacon worked, try to perform a synchronous
+    // request.
+    try {
+      const client = new XMLHttpRequest();
+
+      client.open('POST', '/api/v1/markers', false);
+      client.setRequestHeader('Content-Type', 'application/json');
+      client.setRequestHeader('Authorization', `Bearer ${accessToken}`);
+      client.send(JSON.stringify(params));
+    } catch (e) {
+      // Do not make the BeforeUnload handler error out
+    }
+  },
+);
+
+interface MarkerParam {
+  last_read_id?: string;
+}
+
+function getLastHomeId(state: RootState): string | undefined {
+  /* eslint-disable @typescript-eslint/no-unsafe-return, @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access */
+  return (
+    state
+      // @ts-expect-error state.timelines is not yet typed
+      .getIn(['timelines', 'home', 'items'], ImmutableList())
+      // @ts-expect-error state.timelines is not yet typed
+      .find((item) => item !== null)
+  );
+}
+
+function getLastNotificationId(state: RootState): string | undefined {
+  // @ts-expect-error state.notifications is not yet typed
+  return state.getIn(['notifications', 'lastReadId']);
+}
+
+const buildPostMarkersParams = (state: RootState) => {
+  const params = {} as { home?: MarkerParam; notifications?: MarkerParam };
+
+  const lastHomeId = getLastHomeId(state);
+  const lastNotificationId = getLastNotificationId(state);
+
+  if (lastHomeId && compareId(lastHomeId, state.markers.home) > 0) {
+    params.home = {
+      last_read_id: lastHomeId,
+    };
+  }
+
+  if (
+    lastNotificationId &&
+    compareId(lastNotificationId, state.markers.notifications) > 0
+  ) {
+    params.notifications = {
+      last_read_id: lastNotificationId,
+    };
+  }
+
+  return params;
+};
+
+export const submitMarkersAction = createAppAsyncThunk<{
+  home: string | undefined;
+  notifications: string | undefined;
+}>('markers/submitAction', async (_args, { getState }) => {
+  const accessToken = authorizationTokenFromState(getState);
+  const params = buildPostMarkersParams(getState());
+
+  if (Object.keys(params).length === 0 || accessToken === '') {
+    return { home: undefined, notifications: undefined };
+  }
+
+  await api(getState).post<MarkerJSON>('/api/v1/markers', params);
+
+  return {
+    home: params.home?.last_read_id,
+    notifications: params.notifications?.last_read_id,
+  };
+});
+
+const debouncedSubmitMarkers = debounce(
+  (dispatch) => {
+    dispatch(submitMarkersAction());
+  },
+  300000,
+  {
+    leading: true,
+    trailing: true,
+  },
+);
+
+export const submitMarkers = createAppAsyncThunk(
+  'markers/submit',
+  (params: { immediate?: boolean }, { dispatch }) => {
+    debouncedSubmitMarkers(dispatch);
+
+    if (params.immediate) {
+      debouncedSubmitMarkers.flush();
+    }
+  },
+);
+
+export const fetchMarkers = createAppAsyncThunk(
+  'markers/fetch',
+  async (_args, { getState }) => {
+    const response =
+      await api(getState).get<Record<string, MarkerJSON>>(`/api/v1/markers`);
+
+    return { markers: response.data };
+  },
+);
diff --git a/app/javascript/mastodon/api.ts b/app/javascript/mastodon/api.ts
index f262fd85707941..de597a3e3b62f5 100644
--- a/app/javascript/mastodon/api.ts
+++ b/app/javascript/mastodon/api.ts
@@ -29,9 +29,14 @@ const setCSRFHeader = () => {
 
 void ready(setCSRFHeader);
 
+export const authorizationTokenFromState = (getState?: GetState) => {
+  return (
+    getState && (getState().meta.get('access_token', '') as string | false)
+  );
+};
+
 const authorizationHeaderFromState = (getState?: GetState) => {
-  const accessToken =
-    getState && (getState().meta.get('access_token', '') as string);
+  const accessToken = authorizationTokenFromState(getState);
 
   if (!accessToken) {
     return {};
diff --git a/app/javascript/mastodon/api_types/markers.ts b/app/javascript/mastodon/api_types/markers.ts
new file mode 100644
index 00000000000000..f7664fd7c123e6
--- /dev/null
+++ b/app/javascript/mastodon/api_types/markers.ts
@@ -0,0 +1,7 @@
+// See app/serializers/rest/account_serializer.rb
+
+export interface MarkerJSON {
+  last_read_id: string;
+  version: string;
+  updated_at: string;
+}
diff --git a/app/javascript/mastodon/reducers/index.ts b/app/javascript/mastodon/reducers/index.ts
index 3d42cc83f82b80..b88175e77703fa 100644
--- a/app/javascript/mastodon/reducers/index.ts
+++ b/app/javascript/mastodon/reducers/index.ts
@@ -21,7 +21,7 @@ import history from './history';
 import listAdder from './list_adder';
 import listEditor from './list_editor';
 import lists from './lists';
-import markers from './markers';
+import { markersReducer } from './markers';
 import media_attachments from './media_attachments';
 import meta from './meta';
 import { modalReducer } from './modal';
@@ -77,7 +77,7 @@ const reducers = {
   suggestions,
   polls,
   trends,
-  markers,
+  markers: markersReducer,
   picture_in_picture,
   history,
   tags,
diff --git a/app/javascript/mastodon/reducers/markers.js b/app/javascript/mastodon/reducers/markers.js
deleted file mode 100644
index c7c5d99f6143f4..00000000000000
--- a/app/javascript/mastodon/reducers/markers.js
+++ /dev/null
@@ -1,26 +0,0 @@
-import { Map as ImmutableMap } from 'immutable';
-
-import {
-  MARKERS_SUBMIT_SUCCESS,
-} from '../actions/markers';
-
-
-const initialState = ImmutableMap({
-  home: '0',
-  notifications: '0',
-});
-
-export default function markers(state = initialState, action) {
-  switch(action.type) {
-  case MARKERS_SUBMIT_SUCCESS:
-    if (action.home) {
-      state = state.set('home', action.home);
-    }
-    if (action.notifications) {
-      state = state.set('notifications', action.notifications);
-    }
-    return state;
-  default:
-    return state;
-  }
-}
diff --git a/app/javascript/mastodon/reducers/markers.ts b/app/javascript/mastodon/reducers/markers.ts
new file mode 100644
index 00000000000000..ec85d0f17328cb
--- /dev/null
+++ b/app/javascript/mastodon/reducers/markers.ts
@@ -0,0 +1,18 @@
+import { createReducer } from '@reduxjs/toolkit';
+
+import { submitMarkersAction } from 'mastodon/actions/markers';
+
+const initialState = {
+  home: '0',
+  notifications: '0',
+};
+
+export const markersReducer = createReducer(initialState, (builder) => {
+  builder.addCase(
+    submitMarkersAction.fulfilled,
+    (state, { payload: { home, notifications } }) => {
+      if (home) state.home = home;
+      if (notifications) state.notifications = notifications;
+    },
+  );
+});
diff --git a/app/javascript/mastodon/reducers/notifications.js b/app/javascript/mastodon/reducers/notifications.js
index bc859364393365..7230fabcae9046 100644
--- a/app/javascript/mastodon/reducers/notifications.js
+++ b/app/javascript/mastodon/reducers/notifications.js
@@ -13,7 +13,7 @@ import {
   unfocusApp,
 } from '../actions/app';
 import {
-  MARKERS_FETCH_SUCCESS,
+  fetchMarkers,
 } from '../actions/markers';
 import {
   notificationsUpdate,
@@ -255,8 +255,8 @@ const recountUnread = (state, last_read_id) => {
 
 export default function notifications(state = initialState, action) {
   switch(action.type) {
-  case MARKERS_FETCH_SUCCESS:
-    return action.markers.notifications ? recountUnread(state, action.markers.notifications.last_read_id) : state;
+  case fetchMarkers.fulfilled.type:
+    return action.payload.markers.notifications ? recountUnread(state, action.payload.markers.notifications.last_read_id) : state;
   case NOTIFICATIONS_MOUNT:
     return updateMounted(state);
   case NOTIFICATIONS_UNMOUNT:
diff --git a/app/serializers/rest/marker_serializer.rb b/app/serializers/rest/marker_serializer.rb
index 2eaf3d5076724c..b0c1c553ffa621 100644
--- a/app/serializers/rest/marker_serializer.rb
+++ b/app/serializers/rest/marker_serializer.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class REST::MarkerSerializer < ActiveModel::Serializer
+  # Please update `app/javascript/mastodon/api_types/markers.ts` when making changes to the attributes
+
   attributes :last_read_id, :version, :updated_at
 
   def last_read_id

From b016f03637eb19ac22f9eb6dfc26ee07965d2456 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 27 Mar 2024 10:08:04 -0400
Subject: [PATCH 0620/2191] Pull out constant from `AccountWarning.recent`
 scope (#29767)

---
 app/models/account_warning.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/models/account_warning.rb b/app/models/account_warning.rb
index a54387a562f222..7aa474887b4e2a 100644
--- a/app/models/account_warning.rb
+++ b/app/models/account_warning.rb
@@ -27,6 +27,8 @@ class AccountWarning < ApplicationRecord
     suspend: 4_000,
   }, suffix: :action
 
+  RECENT_PERIOD = 3.months.freeze
+
   normalizes :text, with: ->(text) { text.to_s }, apply_to_nil: true
 
   belongs_to :account, inverse_of: :account_warnings
@@ -37,7 +39,7 @@ class AccountWarning < ApplicationRecord
 
   scope :latest, -> { order(id: :desc) }
   scope :custom, -> { where.not(text: '') }
-  scope :recent, -> { where('account_warnings.created_at >= ?', 3.months.ago) }
+  scope :recent, -> { where(created_at: RECENT_PERIOD.ago..) }
 
   def statuses
     Status.with_discarded.where(id: status_ids || [])

From 9fbe8d3a0cf33e1ec7f631b7651e9fb2bca8440e Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Wed, 27 Mar 2024 16:19:33 +0100
Subject: [PATCH 0621/2191] Rewrite PIP state in Typescript (#27645)

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
---
 .../mastodon/actions/picture_in_picture.js    | 46 ----------
 .../mastodon/actions/picture_in_picture.ts    | 31 +++++++
 .../mastodon/containers/status_container.jsx  |  2 +-
 .../picture_in_picture/components/footer.jsx  |  2 +-
 .../picture_in_picture/components/header.jsx  | 51 -----------
 .../picture_in_picture/components/header.tsx  | 46 ++++++++++
 .../features/picture_in_picture/index.jsx     | 89 -------------------
 .../features/picture_in_picture/index.tsx     | 79 ++++++++++++++++
 app/javascript/mastodon/features/ui/index.jsx |  2 +-
 app/javascript/mastodon/reducers/index.ts     |  4 +-
 .../mastodon/reducers/picture_in_picture.js   | 26 ------
 .../mastodon/reducers/picture_in_picture.ts   | 56 ++++++++++++
 app/javascript/mastodon/selectors/index.js    |  2 +-
 13 files changed, 218 insertions(+), 218 deletions(-)
 delete mode 100644 app/javascript/mastodon/actions/picture_in_picture.js
 create mode 100644 app/javascript/mastodon/actions/picture_in_picture.ts
 delete mode 100644 app/javascript/mastodon/features/picture_in_picture/components/header.jsx
 create mode 100644 app/javascript/mastodon/features/picture_in_picture/components/header.tsx
 delete mode 100644 app/javascript/mastodon/features/picture_in_picture/index.jsx
 create mode 100644 app/javascript/mastodon/features/picture_in_picture/index.tsx
 delete mode 100644 app/javascript/mastodon/reducers/picture_in_picture.js
 create mode 100644 app/javascript/mastodon/reducers/picture_in_picture.ts

diff --git a/app/javascript/mastodon/actions/picture_in_picture.js b/app/javascript/mastodon/actions/picture_in_picture.js
deleted file mode 100644
index 898375abeb9337..00000000000000
--- a/app/javascript/mastodon/actions/picture_in_picture.js
+++ /dev/null
@@ -1,46 +0,0 @@
-// @ts-check
-
-export const PICTURE_IN_PICTURE_DEPLOY = 'PICTURE_IN_PICTURE_DEPLOY';
-export const PICTURE_IN_PICTURE_REMOVE = 'PICTURE_IN_PICTURE_REMOVE';
-
-/**
- * @typedef MediaProps
- * @property {string} src
- * @property {boolean} muted
- * @property {number} volume
- * @property {number} currentTime
- * @property {string} poster
- * @property {string} backgroundColor
- * @property {string} foregroundColor
- * @property {string} accentColor
- */
-
-/**
- * @param {string} statusId
- * @param {string} accountId
- * @param {string} playerType
- * @param {MediaProps} props
- * @returns {object}
- */
-export const deployPictureInPicture = (statusId, accountId, playerType, props) => {
-  // @ts-expect-error
-  return (dispatch, getState) => {
-    // Do not open a player for a toot that does not exist
-    if (getState().hasIn(['statuses', statusId])) {
-      dispatch({
-        type: PICTURE_IN_PICTURE_DEPLOY,
-        statusId,
-        accountId,
-        playerType,
-        props,
-      });
-    }
-  };
-};
-
-/*
- * @return {object}
- */
-export const removePictureInPicture = () => ({
-  type: PICTURE_IN_PICTURE_REMOVE,
-});
diff --git a/app/javascript/mastodon/actions/picture_in_picture.ts b/app/javascript/mastodon/actions/picture_in_picture.ts
new file mode 100644
index 00000000000000..d34b508a33f560
--- /dev/null
+++ b/app/javascript/mastodon/actions/picture_in_picture.ts
@@ -0,0 +1,31 @@
+import { createAction } from '@reduxjs/toolkit';
+
+import type { PIPMediaProps } from 'mastodon/reducers/picture_in_picture';
+import { createAppAsyncThunk } from 'mastodon/store/typed_functions';
+
+interface DeployParams {
+  statusId: string;
+  accountId: string;
+  playerType: 'audio' | 'video';
+  props: PIPMediaProps;
+}
+
+export const removePictureInPicture = createAction('pip/remove');
+
+export const deployPictureInPictureAction =
+  createAction<DeployParams>('pip/deploy');
+
+export const deployPictureInPicture = createAppAsyncThunk(
+  'pip/deploy',
+  (args: DeployParams, { dispatch, getState }) => {
+    const { statusId } = args;
+
+    // Do not open a player for a toot that does not exist
+
+    // @ts-expect-error state.statuses is not yet typed
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-call
+    if (getState().hasIn(['statuses', statusId])) {
+      dispatch(deployPictureInPictureAction(args));
+    }
+  },
+);
diff --git a/app/javascript/mastodon/containers/status_container.jsx b/app/javascript/mastodon/containers/status_container.jsx
index 7bd91c8c9d7c06..da93a16b088237 100644
--- a/app/javascript/mastodon/containers/status_container.jsx
+++ b/app/javascript/mastodon/containers/status_container.jsx
@@ -262,7 +262,7 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
   },
 
   deployPictureInPicture (status, type, mediaProps) {
-    dispatch(deployPictureInPicture(status.get('id'), status.getIn(['account', 'id']), type, mediaProps));
+    dispatch(deployPictureInPicture({statusId: status.get('id'), accountId: status.getIn(['account', 'id']), playerType: type, props: mediaProps}));
   },
 
   onInteractionModal (type, status) {
diff --git a/app/javascript/mastodon/features/picture_in_picture/components/footer.jsx b/app/javascript/mastodon/features/picture_in_picture/components/footer.jsx
index 8dfbf54cb649d6..a7d8356be75eff 100644
--- a/app/javascript/mastodon/features/picture_in_picture/components/footer.jsx
+++ b/app/javascript/mastodon/features/picture_in_picture/components/footer.jsx
@@ -210,4 +210,4 @@ class Footer extends ImmutablePureComponent {
 
 }
 
-export default  withRouter(connect(makeMapStateToProps)(injectIntl(Footer)));
+export default  connect(makeMapStateToProps)(withRouter(injectIntl(Footer)));
diff --git a/app/javascript/mastodon/features/picture_in_picture/components/header.jsx b/app/javascript/mastodon/features/picture_in_picture/components/header.jsx
deleted file mode 100644
index 31073d7387c9bc..00000000000000
--- a/app/javascript/mastodon/features/picture_in_picture/components/header.jsx
+++ /dev/null
@@ -1,51 +0,0 @@
-import PropTypes from 'prop-types';
-
-import { defineMessages, injectIntl } from 'react-intl';
-
-import { Link } from 'react-router-dom';
-
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import ImmutablePureComponent from 'react-immutable-pure-component';
-import { connect } from 'react-redux';
-
-import CloseIcon from '@/material-icons/400-24px/close.svg?react';
-import { Avatar } from 'mastodon/components/avatar';
-import { DisplayName } from 'mastodon/components/display_name';
-import { IconButton } from 'mastodon/components/icon_button';
-
-const messages = defineMessages({
-  close: { id: 'lightbox.close', defaultMessage: 'Close' },
-});
-
-const mapStateToProps = (state, { accountId }) => ({
-  account: state.getIn(['accounts', accountId]),
-});
-
-class Header extends ImmutablePureComponent {
-
-  static propTypes = {
-    accountId: PropTypes.string.isRequired,
-    statusId: PropTypes.string.isRequired,
-    account: ImmutablePropTypes.record.isRequired,
-    onClose: PropTypes.func.isRequired,
-    intl: PropTypes.object.isRequired,
-  };
-
-  render () {
-    const { account, statusId, onClose, intl } = this.props;
-
-    return (
-      <div className='picture-in-picture__header'>
-        <Link to={`/@${account.get('acct')}/${statusId}`} className='picture-in-picture__header__account'>
-          <Avatar account={account} size={36} />
-          <DisplayName account={account} />
-        </Link>
-
-        <IconButton icon='times' iconComponent={CloseIcon} onClick={onClose} title={intl.formatMessage(messages.close)} />
-      </div>
-    );
-  }
-
-}
-
-export default connect(mapStateToProps)(injectIntl(Header));
diff --git a/app/javascript/mastodon/features/picture_in_picture/components/header.tsx b/app/javascript/mastodon/features/picture_in_picture/components/header.tsx
new file mode 100644
index 00000000000000..0f897dc44123a5
--- /dev/null
+++ b/app/javascript/mastodon/features/picture_in_picture/components/header.tsx
@@ -0,0 +1,46 @@
+import { defineMessages, useIntl } from 'react-intl';
+
+import { Link } from 'react-router-dom';
+
+import CloseIcon from '@/material-icons/400-24px/close.svg?react';
+import { Avatar } from 'mastodon/components/avatar';
+import { DisplayName } from 'mastodon/components/display_name';
+import { IconButton } from 'mastodon/components/icon_button';
+import { useAppSelector } from 'mastodon/store';
+
+const messages = defineMessages({
+  close: { id: 'lightbox.close', defaultMessage: 'Close' },
+});
+
+interface Props {
+  accountId: string;
+  statusId: string;
+  onClose: () => void;
+}
+
+export const Header: React.FC<Props> = ({ accountId, statusId, onClose }) => {
+  const account = useAppSelector((state) => state.accounts.get(accountId));
+
+  const intl = useIntl();
+
+  if (!account) return null;
+
+  return (
+    <div className='picture-in-picture__header'>
+      <Link
+        to={`/@${account.get('acct')}/${statusId}`}
+        className='picture-in-picture__header__account'
+      >
+        <Avatar account={account} size={36} />
+        <DisplayName account={account} />
+      </Link>
+
+      <IconButton
+        icon='times'
+        iconComponent={CloseIcon}
+        onClick={onClose}
+        title={intl.formatMessage(messages.close)}
+      />
+    </div>
+  );
+};
diff --git a/app/javascript/mastodon/features/picture_in_picture/index.jsx b/app/javascript/mastodon/features/picture_in_picture/index.jsx
deleted file mode 100644
index f087cd1b1d1531..00000000000000
--- a/app/javascript/mastodon/features/picture_in_picture/index.jsx
+++ /dev/null
@@ -1,89 +0,0 @@
-import PropTypes from 'prop-types';
-import { Component } from 'react';
-
-import { connect } from 'react-redux';
-
-import { removePictureInPicture } from 'mastodon/actions/picture_in_picture';
-import Audio from 'mastodon/features/audio';
-import Video from 'mastodon/features/video';
-
-import Footer from './components/footer';
-import Header from './components/header';
-
-const mapStateToProps = state => ({
-  ...state.get('picture_in_picture'),
-});
-
-class PictureInPicture extends Component {
-
-  static propTypes = {
-    statusId: PropTypes.string,
-    accountId: PropTypes.string,
-    type: PropTypes.string,
-    src: PropTypes.string,
-    muted: PropTypes.bool,
-    volume: PropTypes.number,
-    currentTime: PropTypes.number,
-    poster: PropTypes.string,
-    backgroundColor: PropTypes.string,
-    foregroundColor: PropTypes.string,
-    accentColor: PropTypes.string,
-    dispatch: PropTypes.func.isRequired,
-  };
-
-  handleClose = () => {
-    const { dispatch } = this.props;
-    dispatch(removePictureInPicture());
-  };
-
-  render () {
-    const { type, src, currentTime, accountId, statusId } = this.props;
-
-    if (!currentTime) {
-      return null;
-    }
-
-    let player;
-
-    if (type === 'video') {
-      player = (
-        <Video
-          src={src}
-          currentTime={this.props.currentTime}
-          volume={this.props.volume}
-          muted={this.props.muted}
-          autoPlay
-          inline
-          alwaysVisible
-        />
-      );
-    } else if (type === 'audio') {
-      player = (
-        <Audio
-          src={src}
-          currentTime={this.props.currentTime}
-          volume={this.props.volume}
-          muted={this.props.muted}
-          poster={this.props.poster}
-          backgroundColor={this.props.backgroundColor}
-          foregroundColor={this.props.foregroundColor}
-          accentColor={this.props.accentColor}
-          autoPlay
-        />
-      );
-    }
-
-    return (
-      <div className='picture-in-picture'>
-        <Header accountId={accountId} statusId={statusId} onClose={this.handleClose} />
-
-        {player}
-
-        <Footer statusId={statusId} />
-      </div>
-    );
-  }
-
-}
-
-export default connect(mapStateToProps)(PictureInPicture);
diff --git a/app/javascript/mastodon/features/picture_in_picture/index.tsx b/app/javascript/mastodon/features/picture_in_picture/index.tsx
new file mode 100644
index 00000000000000..51b72f97254646
--- /dev/null
+++ b/app/javascript/mastodon/features/picture_in_picture/index.tsx
@@ -0,0 +1,79 @@
+import { useCallback } from 'react';
+
+import { removePictureInPicture } from 'mastodon/actions/picture_in_picture';
+import Audio from 'mastodon/features/audio';
+import Video from 'mastodon/features/video';
+import { useAppDispatch, useAppSelector } from 'mastodon/store/typed_functions';
+
+import Footer from './components/footer';
+import { Header } from './components/header';
+
+export const PictureInPicture: React.FC = () => {
+  const dispatch = useAppDispatch();
+
+  const handleClose = useCallback(() => {
+    dispatch(removePictureInPicture());
+  }, [dispatch]);
+
+  const pipState = useAppSelector((s) => s.picture_in_picture);
+
+  if (pipState.type === null) {
+    return null;
+  }
+
+  const {
+    type,
+    src,
+    currentTime,
+    accountId,
+    statusId,
+    volume,
+    muted,
+    poster,
+    backgroundColor,
+    foregroundColor,
+    accentColor,
+  } = pipState;
+
+  let player;
+
+  switch (type) {
+    case 'video':
+      player = (
+        <Video
+          src={src}
+          currentTime={currentTime}
+          volume={volume}
+          muted={muted}
+          autoPlay
+          inline
+          alwaysVisible
+        />
+      );
+      break;
+    case 'audio':
+      player = (
+        <Audio
+          src={src}
+          currentTime={currentTime}
+          volume={volume}
+          muted={muted}
+          poster={poster}
+          backgroundColor={backgroundColor}
+          foregroundColor={foregroundColor}
+          accentColor={accentColor}
+          autoPlay
+        />
+      );
+  }
+
+  return (
+    <div className='picture-in-picture'>
+      <Header accountId={accountId} statusId={statusId} onClose={handleClose} />
+
+      {player}
+
+      <Footer statusId={statusId} />
+    </div>
+  );
+};
diff --git a/app/javascript/mastodon/features/ui/index.jsx b/app/javascript/mastodon/features/ui/index.jsx
index 34c5dd30253637..77f26fed9111c1 100644
--- a/app/javascript/mastodon/features/ui/index.jsx
+++ b/app/javascript/mastodon/features/ui/index.jsx
@@ -14,7 +14,7 @@ import { HotKeys } from 'react-hotkeys';
 import { focusApp, unfocusApp, changeLayout } from 'mastodon/actions/app';
 import { synchronouslySubmitMarkers, submitMarkers, fetchMarkers } from 'mastodon/actions/markers';
 import { INTRODUCTION_VERSION } from 'mastodon/actions/onboarding';
-import PictureInPicture from 'mastodon/features/picture_in_picture';
+import { PictureInPicture } from 'mastodon/features/picture_in_picture';
 import { layoutFromWindow } from 'mastodon/is_mobile';
 import { WithRouterPropTypes } from 'mastodon/utils/react_router';
 
diff --git a/app/javascript/mastodon/reducers/index.ts b/app/javascript/mastodon/reducers/index.ts
index b88175e77703fa..db5e68a70ca2a5 100644
--- a/app/javascript/mastodon/reducers/index.ts
+++ b/app/javascript/mastodon/reducers/index.ts
@@ -28,7 +28,7 @@ import { modalReducer } from './modal';
 import { notificationPolicyReducer } from './notification_policy';
 import { notificationRequestsReducer } from './notification_requests';
 import notifications from './notifications';
-import picture_in_picture from './picture_in_picture';
+import { pictureInPictureReducer } from './picture_in_picture';
 import polls from './polls';
 import push_notifications from './push_notifications';
 import { relationshipsReducer } from './relationships';
@@ -78,7 +78,7 @@ const reducers = {
   polls,
   trends,
   markers: markersReducer,
-  picture_in_picture,
+  picture_in_picture: pictureInPictureReducer,
   history,
   tags,
   followed_tags,
diff --git a/app/javascript/mastodon/reducers/picture_in_picture.js b/app/javascript/mastodon/reducers/picture_in_picture.js
deleted file mode 100644
index 6824ad9303c328..00000000000000
--- a/app/javascript/mastodon/reducers/picture_in_picture.js
+++ /dev/null
@@ -1,26 +0,0 @@
-import { PICTURE_IN_PICTURE_DEPLOY, PICTURE_IN_PICTURE_REMOVE } from 'mastodon/actions/picture_in_picture';
-
-import { TIMELINE_DELETE } from '../actions/timelines';
-
-const initialState = {
-  statusId: null,
-  accountId: null,
-  type: null,
-  src: null,
-  muted: false,
-  volume: 0,
-  currentTime: 0,
-};
-
-export default function pictureInPicture(state = initialState, action) {
-  switch(action.type) {
-  case PICTURE_IN_PICTURE_DEPLOY:
-    return { statusId: action.statusId, accountId: action.accountId, type: action.playerType, ...action.props };
-  case PICTURE_IN_PICTURE_REMOVE:
-    return { ...initialState };
-  case TIMELINE_DELETE:
-    return (state.statusId === action.id) ? { ...initialState } : state;
-  default:
-    return state;
-  }
-}
diff --git a/app/javascript/mastodon/reducers/picture_in_picture.ts b/app/javascript/mastodon/reducers/picture_in_picture.ts
new file mode 100644
index 00000000000000..0feddcb706319f
--- /dev/null
+++ b/app/javascript/mastodon/reducers/picture_in_picture.ts
@@ -0,0 +1,56 @@
+import type { Reducer } from '@reduxjs/toolkit';
+
+import {
+  deployPictureInPictureAction,
+  removePictureInPicture,
+} from 'mastodon/actions/picture_in_picture';
+
+import { TIMELINE_DELETE } from '../actions/timelines';
+
+export interface PIPMediaProps {
+  src: string;
+  muted: boolean;
+  volume: number;
+  currentTime: number;
+  poster: string;
+  backgroundColor: string;
+  foregroundColor: string;
+  accentColor: string;
+}
+
+interface PIPStateWithValue extends Partial<PIPMediaProps> {
+  statusId: string;
+  accountId: string;
+  type: 'audio' | 'video';
+}
+
+interface PIPStateEmpty extends Partial<PIPMediaProps> {
+  type: null;
+}
+
+type PIPState = PIPStateWithValue | PIPStateEmpty;
+
+const initialState = {
+  type: null,
+  muted: false,
+  volume: 0,
+  currentTime: 0,
+};
+
+export const pictureInPictureReducer: Reducer<PIPState> = (
+  state = initialState,
+  action,
+) => {
+  if (deployPictureInPictureAction.match(action))
+    return {
+      statusId: action.payload.statusId,
+      accountId: action.payload.accountId,
+      type: action.payload.playerType,
+      ...action.payload.props,
+    };
+  else if (removePictureInPicture.match(action)) return initialState;
+  else if (action.type === TIMELINE_DELETE)
+    if (state.type && state.statusId === action.id) return initialState;
+
+  return state;
+};
diff --git a/app/javascript/mastodon/selectors/index.js b/app/javascript/mastodon/selectors/index.js
index b1c60403e9ff60..bd9b53919c3a90 100644
--- a/app/javascript/mastodon/selectors/index.js
+++ b/app/javascript/mastodon/selectors/index.js
@@ -60,7 +60,7 @@ export const makeGetStatus = () => {
 
 export const makeGetPictureInPicture = () => {
   return createSelector([
-    (state, { id }) => state.get('picture_in_picture').statusId === id,
+    (state, { id }) => state.picture_in_picture.statusId === id,
     (state) => state.getIn(['meta', 'layout']) !== 'mobile',
   ], (inUse, available) => ImmutableMap({
     inUse: inUse && available,

From b9982ce578c24fa2dcdbe4fb79610345257681df Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Wed, 27 Mar 2024 16:49:02 +0100
Subject: [PATCH 0622/2191] Fix notifications marker fetch (#29777)

---
 app/javascript/mastodon/actions/markers.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/javascript/mastodon/actions/markers.ts b/app/javascript/mastodon/actions/markers.ts
index 4e90a9c6bd25cf..84e5b33bcc00ec 100644
--- a/app/javascript/mastodon/actions/markers.ts
+++ b/app/javascript/mastodon/actions/markers.ts
@@ -155,8 +155,10 @@ export const submitMarkers = createAppAsyncThunk(
 export const fetchMarkers = createAppAsyncThunk(
   'markers/fetch',
   async (_args, { getState }) => {
-    const response =
-      await api(getState).get<Record<string, MarkerJSON>>(`/api/v1/markers`);
+    const response = await api(getState).get<Record<string, MarkerJSON>>(
+      `/api/v1/markers`,
+      { params: { timeline: ['notifications'] } },
+    );
 
     return { markers: response.data };
   },

From c913e2f3e50eb4f0f7c1459717ede3070b3e6846 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 27 Mar 2024 17:32:00 +0100
Subject: [PATCH 0623/2191] Fix language picker and privacy picker not having a
 backdrop filter (#29779)

---
 app/javascript/styles/mastodon/components.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 2d7aa32d836350..48998097ac7718 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -5084,6 +5084,7 @@ a.status-card {
 .language-dropdown__dropdown {
   box-shadow: var(--dropdown-shadow);
   background: var(--dropdown-background-color);
+  backdrop-filter: var(--background-filter);
   border: 1px solid var(--dropdown-border-color);
   padding: 4px;
   border-radius: 4px;

From 1025fff6b98d87b4050e373d638f890b44568c28 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 27 Mar 2024 22:19:03 +0100
Subject: [PATCH 0624/2191] New Crowdin Translations (automated) (#29772)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/bg.json    |  2 ++
 app/javascript/mastodon/locales/ca.json    |  2 +-
 app/javascript/mastodon/locales/fi.json    |  4 +++
 app/javascript/mastodon/locales/gl.json    |  6 ++++
 app/javascript/mastodon/locales/hu.json    | 30 ++++++++--------
 app/javascript/mastodon/locales/is.json    |  3 ++
 app/javascript/mastodon/locales/it.json    |  3 ++
 app/javascript/mastodon/locales/ja.json    |  1 +
 app/javascript/mastodon/locales/ko.json    |  7 ++++
 app/javascript/mastodon/locales/pt-BR.json | 40 ++++++++++++++++++++++
 app/javascript/mastodon/locales/pt-PT.json |  6 ++++
 app/javascript/mastodon/locales/sl.json    |  6 ++++
 app/javascript/mastodon/locales/sr.json    |  2 ++
 config/locales/bg.yml                      |  1 +
 config/locales/ca.yml                      |  1 +
 config/locales/da.yml                      |  1 +
 config/locales/de.yml                      |  1 +
 config/locales/es-AR.yml                   |  1 +
 config/locales/es-MX.yml                   |  1 +
 config/locales/es.yml                      |  1 +
 config/locales/eu.yml                      |  1 +
 config/locales/fi.yml                      |  1 +
 config/locales/fo.yml                      |  1 +
 config/locales/gl.yml                      |  1 +
 config/locales/he.yml                      |  1 +
 config/locales/hu.yml                      | 23 +++++++------
 config/locales/is.yml                      |  1 +
 config/locales/it.yml                      |  1 +
 config/locales/ko.yml                      |  1 +
 config/locales/nl.yml                      |  1 +
 config/locales/nn.yml                      |  1 +
 config/locales/pl.yml                      |  1 +
 config/locales/pt-BR.yml                   | 10 ++++++
 config/locales/pt-PT.yml                   |  1 +
 config/locales/sl.yml                      |  1 +
 config/locales/sq.yml                      |  1 +
 config/locales/sv.yml                      |  1 +
 config/locales/th.yml                      |  1 +
 config/locales/tr.yml                      |  1 +
 config/locales/uk.yml                      |  1 +
 config/locales/vi.yml                      |  1 +
 config/locales/zh-CN.yml                   |  1 +
 config/locales/zh-TW.yml                   |  1 +
 43 files changed, 146 insertions(+), 27 deletions(-)

diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json
index b7a236d60b2d69..11307051197b9f 100644
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@@ -471,6 +471,8 @@
   "notification.own_poll": "Анкетата ви приключи",
   "notification.poll": "Анкета, в която гласувахте, приключи",
   "notification.reblog": "{name} подсили ваша публикация",
+  "notification.relationships_severance_event": "Изгуби се връзката с {name}",
+  "notification.relationships_severance_event.learn_more": "Научете повече",
   "notification.status": "{name} току-що публикува",
   "notification.update": "{name} промени публикация",
   "notification_requests.accept": "Приемам",
diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index eee6d281d07ed9..37990cdb2ebeaf 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -472,7 +472,7 @@
   "notification.own_poll": "La teva enquesta ha finalitzat",
   "notification.poll": "Ha finalitzat una enquesta en què has votat",
   "notification.reblog": "{name} t'ha impulsat",
-  "notification.relationships_severance_event": "Connexions perdudes amb {name}",
+  "notification.relationships_severance_event": "S'han perdut les connexions amb {name}",
   "notification.relationships_severance_event.account_suspension": "Un administrador de {from} ha suspès {target}; això vol dir que ja no en podreu rebre actualitzacions o interactuar-hi.",
   "notification.relationships_severance_event.domain_block": "Un administrador de {from} ha blocat {target}, incloent-hi {followersCount} dels vostres seguidors i {followingCount, plural, one {# compte} other {# comptes}} que seguiu.",
   "notification.relationships_severance_event.learn_more": "Per a saber-ne més",
diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index 9dfa61ef4a5c51..b23f1254e2427c 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -472,7 +472,11 @@
   "notification.own_poll": "Äänestyksesi on päättynyt",
   "notification.poll": "Kysely, johon osallistuit, on päättynyt",
   "notification.reblog": "{name} tehosti julkaisuasi",
+  "notification.relationships_severance_event": "Menetettiin yhteydet palvelimeen {name}",
+  "notification.relationships_severance_event.account_suspension": "Palvelimen {from} ylläpitäjä on jäädyttänyt verkkotunnuksen {target}, minkä takia et voi enää vastaanottaa heidän päivityksiään tai olla vuorovaikutuksessa heidän kanssaan.",
+  "notification.relationships_severance_event.domain_block": "Palvelimen {from} ylläpitäjä on estänyt verkkotunnuksen {target}, mukaan lukien {followersCount} seuraajistasi ja {followingCount, plural, one {# seuratuistasi} other {# seuratuistasi}}.",
   "notification.relationships_severance_event.learn_more": "Lue lisää",
+  "notification.relationships_severance_event.user_domain_block": "Olet estänyt verkkotunnuksen {target}, mikä poisti {followersCount} seuraajistasi ja {followingCount, plural, one {# seuratuistasi} other {# seuratuistasi}}.",
   "notification.status": "{name} julkaisi juuri",
   "notification.update": "{name} muokkasi julkaisua",
   "notification_requests.accept": "Hyväksy",
diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json
index 20de52d30c1599..c7fed4ed08f368 100644
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@@ -298,6 +298,7 @@
   "filter_modal.select_filter.title": "Filtrar esta publicación",
   "filter_modal.title.status": "Filtrar unha publicación",
   "filtered_notifications_banner.pending_requests": "Notificacións de {count, plural, =0 {ninguén} one {unha persoa} other {# persoas}} que poderías coñecer",
+  "filtered_notifications_banner.private_mentions": "{count, plural, one {mención privada} other {mencións privadas}}",
   "filtered_notifications_banner.title": "Notificacións filtradas",
   "firehose.all": "Todo",
   "firehose.local": "Este servidor",
@@ -471,6 +472,11 @@
   "notification.own_poll": "A túa enquisa rematou",
   "notification.poll": "Rematou a enquisa na que votaches",
   "notification.reblog": "{name} compartiu a túa publicación",
+  "notification.relationships_severance_event": "Perdeuse a conexión con {name}",
+  "notification.relationships_severance_event.account_suspension": "A administración de {from} suspendeu a {target}, o que significa que xa non vas recibir actualizacións de esa conta ou interactuar con ela.",
+  "notification.relationships_severance_event.domain_block": "A administración de {from} bloqueou a {target}, que inclúe a {followersCount} das túas seguidoras e a {followingCount, plural, one {# conta} other {# contas}} que sigues.",
+  "notification.relationships_severance_event.learn_more": "Saber máis",
+  "notification.relationships_severance_event.user_domain_block": "Bloqueaches a {target}, eliminando a {followersCount} das túas seguidoras e a {followingCount, plural, one {# conta} other {# contas}} que sigues.",
   "notification.status": "{name} publicou",
   "notification.update": "{name} editou unha publicación",
   "notification_requests.accept": "Aceptar",
diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json
index c8e57c526f8d3b..1de040a656d290 100644
--- a/app/javascript/mastodon/locales/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@@ -124,7 +124,7 @@
   "column.domain_blocks": "Letiltott domainek",
   "column.favourites": "Kedvencek",
   "column.firehose": "Hírfolyamok",
-  "column.follow_requests": "Követési kérelmek",
+  "column.follow_requests": "Követési kérések",
   "column.home": "Kezdőlap",
   "column.lists": "Listák",
   "column.mutes": "Némított felhasználók",
@@ -133,8 +133,8 @@
   "column.public": "Föderációs idővonal",
   "column_back_button.label": "Vissza",
   "column_header.hide_settings": "Beállítások elrejtése",
-  "column_header.moveLeft_settings": "Oszlop elmozdítása balra",
-  "column_header.moveRight_settings": "Oszlop elmozdítása jobbra",
+  "column_header.moveLeft_settings": "Oszlop áthelyezése balra",
+  "column_header.moveRight_settings": "Oszlop áthelyezése jobbra",
   "column_header.pin": "Kitűzés",
   "column_header.show_settings": "Beállítások megjelenítése",
   "column_header.unpin": "Kitűzés eltávolítása",
@@ -143,7 +143,7 @@
   "community.column_settings.media_only": "Csak média",
   "community.column_settings.remote_only": "Csak távoli",
   "compose.language.change": "Nyelv megváltoztatása",
-  "compose.language.search": "Nyelv keresése...",
+  "compose.language.search": "Nyelvek keresése…",
   "compose.published.body": "A bejegyzés publikálásra került.",
   "compose.published.open": "Megnyitás",
   "compose.saved.body": "A bejegyzés mentve.",
@@ -473,8 +473,8 @@
   "notification.poll": "Egy szavazás, melyben részt vettél, véget ért",
   "notification.reblog": "{name} megtolta a bejegyzésedet",
   "notification.relationships_severance_event": "Elvesztek a kapcsolatok vele: {name}",
-  "notification.relationships_severance_event.account_suspension": "Egy admin a {from} kiszolgálóról felfüggesztette {target} fiókot, ami azt jelenti, hogy mostantól nem tudsz vele interaktálni vagy tőle értesítéseket kapni.",
-  "notification.relationships_severance_event.domain_block": "Egy admin a {from} kiszolgálón letiltotta {target} domaint, beleértve {followersCount} követődet és {followingCount, plural, one {#} other {#}} általad követett személyt.",
+  "notification.relationships_severance_event.account_suspension": "Egy admin a(z) {from} kiszolgálóról felfüggesztette {target} fiókját, ami azt jelenti, hogy mostantól nem fogsz róla értesítést kapni, és nem fogsz tudni vele kapcsolatba lépni.",
+  "notification.relationships_severance_event.domain_block": "Egy admin a(z) {from} kiszolgálón letiltotta {target} domaint, beleértve {followersCount} követőt és {followingCount, plural, one {#} other {#}} követett fiókot.",
   "notification.relationships_severance_event.learn_more": "További információk",
   "notification.relationships_severance_event.user_domain_block": "Letiltottad a(z) {target} domaint, ezzel eltávolítva {followersCount} követőt és {followingCount, plural, one {#} other {#}} követett fiókot.",
   "notification.status": "{name} bejegyzést tett közzé",
@@ -492,7 +492,7 @@
   "notifications.column_settings.filter_bar.advanced": "Minden kategória megjelenítése",
   "notifications.column_settings.filter_bar.category": "Gyorsszűrő sáv",
   "notifications.column_settings.follow": "Új követők:",
-  "notifications.column_settings.follow_request": "Új követési kérelmek:",
+  "notifications.column_settings.follow_request": "Új követési kérések:",
   "notifications.column_settings.mention": "Megemlítések:",
   "notifications.column_settings.poll": "Szavazási eredmények:",
   "notifications.column_settings.push": "Leküldéses értesítések",
@@ -552,14 +552,14 @@
   "onboarding.share.next_steps": "Lehetséges következő lépések:",
   "onboarding.share.title": "Profil megosztása",
   "onboarding.start.lead": "Az új Mastodon-fiók használatra kész. Így hozhatod ki belőle a legtöbbet:",
-  "onboarding.start.skip": "Szeretnél előreugrani?",
+  "onboarding.start.skip": "Nincs szükséged segítségre a kezdéshez?",
   "onboarding.start.title": "Ez sikerült!",
   "onboarding.steps.follow_people.body": "A Mastodon az érdekes emberek követéséről szól.",
-  "onboarding.steps.follow_people.title": "{count, plural, one {egy ember} other {# ember}} követése",
-  "onboarding.steps.publish_status.body": "Üdvözöljük a világot.",
+  "onboarding.steps.follow_people.title": "Szabd személyre a kezdőlapodat",
+  "onboarding.steps.publish_status.body": "Köszöntsd a világot szöveggel, fotókkal, videókkal vagy szavazásokkal {emoji}",
   "onboarding.steps.publish_status.title": "Az első bejegyzés létrehozása",
-  "onboarding.steps.setup_profile.body": "Mások nagyobb valószínűséggel lépnek kapcsolatba veled egy kitöltött profil esetén.",
-  "onboarding.steps.setup_profile.title": "Profilod testreszabása",
+  "onboarding.steps.setup_profile.body": "Növeld az interakciók számát a profilod részletesebb kitöltésével.",
+  "onboarding.steps.setup_profile.title": "Szabd személyre a profilodat",
   "onboarding.steps.share_profile.body": "Tudasd az ismerőseiddel, hogyan találhatnak meg a Mastodonon",
   "onboarding.steps.share_profile.title": "Oszd meg a Mastodon profilodat",
   "onboarding.tips.2fa": "<strong>Tudtad?</strong> A fiókod biztonságossá teheted, ha a fiók beállításaiban beállítod a kétlépcsős hitelesítést. Bármilyen választott TOTP alkalmazással működik, nincs szükség telefonszámra!",
@@ -787,9 +787,9 @@
   "upload_modal.hint": "Kattints vagy húzd a kört az előnézetben arra a fókuszpontra, mely minden bélyegképen látható kell, hogy legyen.",
   "upload_modal.preparing_ocr": "OCR előkészítése…",
   "upload_modal.preview_label": "Előnézet ({ratio})",
-  "upload_progress.label": "Feltöltés...",
+  "upload_progress.label": "Feltöltés…",
   "upload_progress.processing": "Feldolgozás…",
-  "username.taken": "Ez a felhasználónév foglalt. Válassz másikat",
+  "username.taken": "Ez a felhasználónév foglalt. Válassz másikat.",
   "video.close": "Videó bezárása",
   "video.download": "Fájl letöltése",
   "video.exit_fullscreen": "Kilépés teljes képernyőből",
@@ -799,5 +799,5 @@
   "video.mute": "Hang némítása",
   "video.pause": "Szünet",
   "video.play": "Lejátszás",
-  "video.unmute": "Hang némításának vége"
+  "video.unmute": "Hang némításának feloldása"
 }
diff --git a/app/javascript/mastodon/locales/is.json b/app/javascript/mastodon/locales/is.json
index 6bcc79f70783c8..c9a354f4bb7bc4 100644
--- a/app/javascript/mastodon/locales/is.json
+++ b/app/javascript/mastodon/locales/is.json
@@ -473,7 +473,10 @@
   "notification.poll": "Könnun sem þú tókst þátt í er lokið",
   "notification.reblog": "{name} endurbirti færsluna þína",
   "notification.relationships_severance_event": "Missti tengingar við {name}",
+  "notification.relationships_severance_event.account_suspension": "Stjórnandi á {from} hefur fryst {target}, sem þýðir að þú færð ekki lengur skilaboð frá viðkomandi né átt í samskiptum við viðkomandi.",
+  "notification.relationships_severance_event.domain_block": "Stjórnandi á {from} hefur lokað á {target} og þar með {followersCount} fylgjendur þína auk {followingCount, plural, one {# aðgangs} other {# aðganga}} sem þú fylgist með.",
   "notification.relationships_severance_event.learn_more": "Kanna nánar",
+  "notification.relationships_severance_event.user_domain_block": "Þú hefur lokað á {target} og þar með fjarlægt {followersCount} fylgjendur þína auk {followingCount, plural, one {# aðgangs} other {# aðganga}} sem þú fylgist með.",
   "notification.status": "{name} sendi inn rétt í þessu",
   "notification.update": "{name} breytti færslu",
   "notification_requests.accept": "Samþykkja",
diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json
index eddab5f37f6fd4..a6f26bfcee5c4b 100644
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@@ -298,6 +298,7 @@
   "filter_modal.select_filter.title": "Filtra questo post",
   "filter_modal.title.status": "Filtra un post",
   "filtered_notifications_banner.pending_requests": "Notifiche da {count, plural, =0 {nessuno} one {una persona} other {# persone}} che potresti conoscere",
+  "filtered_notifications_banner.private_mentions": "{count, plural,one {menzione privata} other {menzioni private}}",
   "filtered_notifications_banner.title": "Notifiche filtrate",
   "firehose.all": "Tutto",
   "firehose.local": "Questo server",
@@ -473,7 +474,9 @@
   "notification.reblog": "{name} ha rebloggato il tuo post",
   "notification.relationships_severance_event": "Connessioni perse con {name}",
   "notification.relationships_severance_event.account_suspension": "Un amministratore da {from} ha sospeso {target}, il che significa che non puoi più ricevere aggiornamenti da loro o interagire con loro.",
+  "notification.relationships_severance_event.domain_block": "Un amministratore da {from} ha bloccato {target}, inclusi {followersCount} dei tuoi seguaci e {followingCount, plural, one {# account} other {# account}} che segui.",
   "notification.relationships_severance_event.learn_more": "Scopri di più",
+  "notification.relationships_severance_event.user_domain_block": "Tu hai bloccato {target}, rimuovendo {followersCount} dei tuoi seguaci e {followingCount, plural, one {# account} other {# account}} che segui.",
   "notification.status": "{name} ha appena pubblicato un post",
   "notification.update": "{name} ha modificato un post",
   "notification_requests.accept": "Accetta",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index 1f1065f5fd2174..9dff3052715bc2 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -177,6 +177,7 @@
   "confirmations.delete_list.message": "本当にこのリストを完全に削除しますか？",
   "confirmations.discard_edit_media.confirm": "破棄",
   "confirmations.discard_edit_media.message": "メディアの説明またはプレビューに保存されていない変更があります。それでも破棄しますか？",
+  "confirmations.domain_block.confirm": "サーバーをブロック",
   "confirmations.domain_block.message": "本当に{domain}全体を非表示にしますか？ 多くの場合は個別にブロックやミュートするだけで充分であり、また好ましいです。公開タイムラインにそのドメインのコンテンツが表示されなくなり、通知も届かなくなります。そのドメインのフォロワーはアンフォローされます。",
   "confirmations.edit.confirm": "編集",
   "confirmations.edit.message": "今編集すると現在作成中のメッセージが上書きされます。本当に実行しますか？",
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index e15089d0c00c0d..249ba6632b033f 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -298,6 +298,7 @@
   "filter_modal.select_filter.title": "이 게시물을 필터",
   "filter_modal.title.status": "게시물 필터",
   "filtered_notifications_banner.pending_requests": "알 수도 있는 {count, plural, =0 {0 명} one {한 명} other {# 명}}의 사람들로부터의 알림",
+  "filtered_notifications_banner.private_mentions": "{count, plural, other {개인적인 멘션}}",
   "filtered_notifications_banner.title": "걸러진 알림",
   "firehose.all": "모두",
   "firehose.local": "이 서버",
@@ -471,6 +472,11 @@
   "notification.own_poll": "설문을 마침",
   "notification.poll": "참여한 설문이 종료됨",
   "notification.reblog": "{name} 님이 부스트했습니다",
+  "notification.relationships_severance_event": "{name} 님과의 연결이 끊어졌습니다",
+  "notification.relationships_severance_event.account_suspension": "{from}의 관리자가 {target}를 정지시켰기 때문에 그들과 더이상 상호작용 할 수 없고 정보를 받아볼 수 없습니다.",
+  "notification.relationships_severance_event.domain_block": "{from}의 관리자가 {target}를 차단하였고 여기에는 나의 {followersCount} 명의 팔로워와 {followingCount, plural, other {#}} 명의 팔로우가 포함되었습니다.",
+  "notification.relationships_severance_event.learn_more": "더 알아보기",
+  "notification.relationships_severance_event.user_domain_block": "내가 {target}를 차단하여 {followersCount} 명의 팔로워와 {followingCount, plural, other {#}} 명의 팔로우가 제거되었습니다.",
   "notification.status": "{name} 님이 방금 게시물을 올렸습니다",
   "notification.update": "{name} 님이 게시물을 수정했습니다",
   "notification_requests.accept": "수락",
@@ -484,6 +490,7 @@
   "notifications.column_settings.alert": "데스크탑 알림",
   "notifications.column_settings.favourite": "좋아요:",
   "notifications.column_settings.filter_bar.advanced": "모든 범주 표시",
+  "notifications.column_settings.filter_bar.category": "빠른 필터 막대",
   "notifications.column_settings.follow": "새 팔로워:",
   "notifications.column_settings.follow_request": "새 팔로우 요청:",
   "notifications.column_settings.mention": "멘션:",
diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json
index 28a18667ae6450..08ed5c021087c2 100644
--- a/app/javascript/mastodon/locales/pt-BR.json
+++ b/app/javascript/mastodon/locales/pt-BR.json
@@ -89,8 +89,12 @@
   "announcement.announcement": "Comunicados",
   "attachments_list.unprocessed": "(não processado)",
   "audio.hide": "Ocultar áudio",
+  "block_modal.remote_users_caveat": "Pediremos ao servidor {domínio} que respeite sua decisão. No entanto, a conformidade não é garantida pois alguns servidores podem lidar com os blocos de maneira diferente. As postagens públicas ainda podem estar visíveis para usuários não logados.",
   "block_modal.show_less": "Mostrar menos",
   "block_modal.show_more": "Mostrar mais",
+  "block_modal.they_cant_mention": "Eles não podem mencionar ou seguir você.",
+  "block_modal.they_cant_see_posts": "Eles não podem ver suas postagens e você não verá as deles.",
+  "block_modal.they_will_know": "Eles podem ver que estão bloqueados.",
   "block_modal.title": "Bloquear usuário?",
   "block_modal.you_wont_see_mentions": "Você não verá publicações que os mencionem.",
   "boost_modal.combo": "Pressione {combo} para pular isso na próxima vez",
@@ -173,6 +177,7 @@
   "confirmations.delete_list.message": "Você tem certeza de que deseja excluir esta lista?",
   "confirmations.discard_edit_media.confirm": "Descartar",
   "confirmations.discard_edit_media.message": "Há mudanças não salvas na descrição ou pré-visualização da mídia. Descartar assim mesmo?",
+  "confirmations.domain_block.confirm": "Servidor de blocos",
   "confirmations.domain_block.message": "Você tem certeza de que deseja bloquear tudo de {domain}? Você não verá mais o conteúdo desta instância em nenhuma linha do tempo pública ou nas suas notificações. Seus seguidores desta instância serão removidos.",
   "confirmations.edit.confirm": "Editar",
   "confirmations.edit.message": "Editar agora irá substituir a mensagem que está sendo criando. Tem certeza de que deseja continuar?",
@@ -204,8 +209,27 @@
   "dismissable_banner.explore_statuses": "Estas são postagens de toda a rede social que estão ganhando tração hoje. Postagens mais recentes com mais impulsos e favoritos têm classificações mais altas.",
   "dismissable_banner.explore_tags": "Estas hashtags estão ganhando popularidade no momento entre as pessoas deste e de outros servidores da rede descentralizada.",
   "dismissable_banner.public_timeline": "Estas são as publicações públicas mais recentes de pessoas na rede social que pessoas em {domain} seguem.",
+  "domain_block_modal.block": "Servidor de blocos.",
+  "domain_block_modal.block_account_instead": "Bloco @(nome)",
   "domain_block_modal.they_can_interact_with_old_posts": "Pessoas deste servidor podem interagir com suas publicações antigas.",
   "domain_block_modal.they_cant_follow": "Ninguém deste servidor pode lhe seguir.",
+  "domain_block_modal.they_wont_know": "Eles não saberão que foram bloqueados.",
+  "domain_block_modal.title": "Dominio do bloco",
+  "domain_block_modal.you_will_lose_followers": "Todos os seus seguidores deste servidor serão removidos.",
+  "domain_block_modal.you_wont_see_posts": "Você não verá postagens ou notificações de usuários neste servidor.",
+  "domain_pill.activitypub_lets_connect": "Ele permite que você se conecte e interaja com pessoas não apenas no Mastodon, mas também em diferentes aplicativos sociais.",
+  "domain_pill.activitypub_like_language": "ActivityPub é como a linguagem que o Mastodon fala com outras redes sociais.",
+  "domain_pill.server": "Servidor",
+  "domain_pill.their_handle": "Seu identificador:",
+  "domain_pill.their_server": "Sua casa digital, onde ficam todas as suas postagens.",
+  "domain_pill.their_username": "Seu identificador exclusivo em seu servidor. É possível encontrar usuários com o mesmo nome de usuário em servidores diferentes.",
+  "domain_pill.username": "Nome de usuário",
+  "domain_pill.whats_in_a_handle": "O que há em uma alça?",
+  "domain_pill.who_they_are": "Como os identificadores indicam quem alguém é e onde está, você pode interagir com pessoas na web social de <button>plataformas alimentadas pelo ActivityPub</button>.",
+  "domain_pill.who_you_are": "Como seu identificador indica quem você é e onde está, as pessoas podem interagir com você nas redes sociais das <button>plataformas alimentadas pelo ActivityPub</button>.",
+  "domain_pill.your_handle": "Seu identificador:",
+  "domain_pill.your_server": "Sua casa digital, onde ficam todas as suas postagens. Não gosta deste? Transfira servidores a qualquer momento e traga seus seguidores também.",
+  "domain_pill.your_username": "Seu identificador exclusivo neste servidor. É possível encontrar usuários com o mesmo nome de usuário em servidores diferentes.",
   "embed.instructions": "Incorpore este toot no seu site ao copiar o código abaixo.",
   "embed.preview": "Aqui está como vai ficar:",
   "emoji_button.activity": "Atividade",
@@ -273,6 +297,8 @@
   "filter_modal.select_filter.subtitle": "Use uma categoria existente ou crie uma nova",
   "filter_modal.select_filter.title": "Filtrar esta publicação",
   "filter_modal.title.status": "Filtrar uma publicação",
+  "filtered_notifications_banner.pending_requests": "Notificações de {count, plural, =0 {no one} one {one person} other {# people}} que você talvez conheça",
+  "filtered_notifications_banner.private_mentions": "{count, plural, one {private mention} other {private mentions}}",
   "filtered_notifications_banner.title": "Notificações filtradas",
   "firehose.all": "Tudo",
   "firehose.local": "Este servidor",
@@ -402,7 +428,9 @@
   "loading_indicator.label": "Carregando…",
   "media_gallery.toggle_visible": "{number, plural, one {Ocultar mídia} other {Ocultar mídias}}",
   "moved_to_account_banner.text": "Sua conta {disabledAccount} está desativada porque você a moveu para {movedToAccount}.",
+  "mute_modal.hide_from_notifications": "Ocultar das notificações",
   "mute_modal.hide_options": "Ocultar opções",
+  "mute_modal.indefinite": "Até que eu os ative",
   "mute_modal.show_options": "Mostrar opções",
   "mute_modal.they_can_mention_and_follow": "Eles podem mencionar e seguir você, mas você não os verá.",
   "mute_modal.they_wont_know": "Eles não saberão que foram silenciados.",
@@ -444,6 +472,11 @@
   "notification.own_poll": "Sua enquete terminou",
   "notification.poll": "Uma enquete que você votou terminou",
   "notification.reblog": "{name} deu boost no teu toot",
+  "notification.relationships_severance_event": "Conexões perdidas com {name}",
+  "notification.relationships_severance_event.account_suspension": "Um administrador de {from} suspendeu {target}, o que significa que você não pode mais receber atualizações deles ou interagir com eles.",
+  "notification.relationships_severance_event.domain_block": "An admin from {from} has blocked {target}, including {followersCount} of your followers and {followingCount, plural, one {# account} other {# accounts}} you follow.",
+  "notification.relationships_severance_event.learn_more": "Saber mais",
+  "notification.relationships_severance_event.user_domain_block": "You have blocked {target}, removing {followersCount} of your followers and {followingCount, plural, one {# account} other {# accounts}} you follow.",
   "notification.status": "{name} acabou de tootar",
   "notification.update": "{name} editou uma publicação",
   "notification_requests.accept": "Aceitar",
@@ -456,6 +489,8 @@
   "notifications.column_settings.admin.sign_up": "Novas inscrições:",
   "notifications.column_settings.alert": "Notificações no computador",
   "notifications.column_settings.favourite": "Favoritos:",
+  "notifications.column_settings.filter_bar.advanced": "Exibir todas as categorias",
+  "notifications.column_settings.filter_bar.category": "Barra de filtro rápido",
   "notifications.column_settings.follow": "Seguidores:",
   "notifications.column_settings.follow_request": "Seguidores pendentes:",
   "notifications.column_settings.mention": "Menções:",
@@ -481,7 +516,9 @@
   "notifications.permission_denied": "Navegador não tem permissão para ativar notificações no computador.",
   "notifications.permission_denied_alert": "Verifique a permissão do navegador para ativar notificações no computador.",
   "notifications.permission_required": "Ativar notificações no computador exige permissão do navegador.",
+  "notifications.policy.filter_new_accounts.hint": "Created within the past {days, plural, one {one day} other {# days}}",
   "notifications.policy.filter_new_accounts_title": "Novas contas",
+  "notifications.policy.filter_not_followers_hint": "Including people who have been following you fewer than {days, plural, one {one day} other {# days}}",
   "notifications.policy.filter_not_followers_title": "Pessoas que não estão te seguindo",
   "notifications.policy.filter_not_following_hint": "Até que você os aprove manualmente",
   "notifications.policy.filter_not_following_title": "Pessoas que você não segue",
@@ -569,6 +606,7 @@
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "hoje",
+  "reply_indicator.attachments": "{count, plural, one {# attachment} other {# attachments}}",
   "reply_indicator.cancel": "Cancelar",
   "reply_indicator.poll": "Enquete",
   "report.block": "Bloquear",
@@ -667,6 +705,7 @@
   "status.edited_x_times": "Editado {count, plural, one {{count} hora} other {{count} vezes}}",
   "status.embed": "Incorporar",
   "status.favourite": "Favorita",
+  "status.favourites": "{count, plural, one {favorite} other {favorites}}",
   "status.filter": "Filtrar esta publicação",
   "status.filtered": "Filtrado",
   "status.hide": "Ocultar publicação",
@@ -687,6 +726,7 @@
   "status.reblog": "Dar boost",
   "status.reblog_private": "Dar boost para o mesmo público",
   "status.reblogged_by": "{name} deu boost",
+  "status.reblogs": "{count, plural, one {boost} other {boosts}}",
   "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",
diff --git a/app/javascript/mastodon/locales/pt-PT.json b/app/javascript/mastodon/locales/pt-PT.json
index 3f7f198ef97fec..39dfba819d01a3 100644
--- a/app/javascript/mastodon/locales/pt-PT.json
+++ b/app/javascript/mastodon/locales/pt-PT.json
@@ -298,6 +298,7 @@
   "filter_modal.select_filter.title": "Filtrar esta publicação",
   "filter_modal.title.status": "Filtrar uma publicação",
   "filtered_notifications_banner.pending_requests": "Notificações de {count, plural, =0 {ninguém} one {uma pessoa} other {# pessoas}} que talvez conheça",
+  "filtered_notifications_banner.private_mentions": "{count, plural,one {menção privada} other {menções privadas}}",
   "filtered_notifications_banner.title": "Notificações filtradas",
   "firehose.all": "Todas",
   "firehose.local": "Este servidor",
@@ -471,6 +472,11 @@
   "notification.own_poll": "A sua votação terminou",
   "notification.poll": "Uma votação em que participaste chegou ao fim",
   "notification.reblog": "{name} reforçou a tua publicação",
+  "notification.relationships_severance_event": "Perdeu as ligações com {name}",
+  "notification.relationships_severance_event.account_suspension": "Um administrador de {from} suspendeu {target}, o que significa que já não pode receber atualizações dele ou interagir com ele.",
+  "notification.relationships_severance_event.domain_block": "Um administrador de {from} bloqueou {target}, incluindo {followersCount} dos seus seguidores e {followingCount, plural, one {# conta} other {# contas}} que segue.",
+  "notification.relationships_severance_event.learn_more": "Saber mais",
+  "notification.relationships_severance_event.user_domain_block": "Bloqueou {target}, removendo {followersCount} dos seus seguidores e {followingCount, plural, one {# conta} other {# contas}} que segue.",
   "notification.status": "{name} acabou de publicar",
   "notification.update": "{name} editou uma publicação",
   "notification_requests.accept": "Aceitar",
diff --git a/app/javascript/mastodon/locales/sl.json b/app/javascript/mastodon/locales/sl.json
index 80b52ac100a3e7..55091dbee5b1cf 100644
--- a/app/javascript/mastodon/locales/sl.json
+++ b/app/javascript/mastodon/locales/sl.json
@@ -298,6 +298,7 @@
   "filter_modal.select_filter.title": "Filtriraj to objavo",
   "filter_modal.title.status": "Filtrirajte objavo",
   "filtered_notifications_banner.pending_requests": "Obvestila od {count, plural, =0 {nikogar, ki bi ga} one {# človeka, ki bi ga} two {# ljudi, ki bi ju} few {# ljudi, ki bi jih} other {# ljudi, ki bi jih}} lahko poznali",
+  "filtered_notifications_banner.private_mentions": "{count, plural, one {zasebna omemba} two {zasebni omembi} few {zasebne omembe} other {zasebnih omemb}}",
   "filtered_notifications_banner.title": "Filtrirana obvestila",
   "firehose.all": "Vse",
   "firehose.local": "Ta strežnik",
@@ -471,6 +472,11 @@
   "notification.own_poll": "Vaša anketa je zaključena",
   "notification.poll": "Anketa, v kateri ste sodelovali, je zaključena",
   "notification.reblog": "{name} je izpostavila/a vašo objavo",
+  "notification.relationships_severance_event": "Povezave z {name} prekinjene",
+  "notification.relationships_severance_event.account_suspension": "Skrbnik na {from} je suspendiral račun {target}, kar pomeni, da od računa ne morete več prejemati posodobitev ali imeti z njim interakcij.",
+  "notification.relationships_severance_event.domain_block": "Skrbnik na {from} je blokiral domeno {target}, vključno z vašimi sledilci ({followersCount}) in {followingCount, plural, one {# računom, ki mu sledite} two {# računoma, ki jima sledite} few {# računi, ki jim sledite} other {# računi, ki jim sledite}}.",
+  "notification.relationships_severance_event.learn_more": "Več o tem",
+  "notification.relationships_severance_event.user_domain_block": "Blokirali ste domeno {target}, vključno z vašimi sledilci ({followersCount}) in {followingCount, plural, one {# računom, ki mu sledite} two {# računoma, ki jima sledite} few {# računi, ki jim sledite} other {# računi, ki jim sledite}}.",
   "notification.status": "{name} je pravkar objavil/a",
   "notification.update": "{name} je uredil(a) objavo",
   "notification_requests.accept": "Sprejmi",
diff --git a/app/javascript/mastodon/locales/sr.json b/app/javascript/mastodon/locales/sr.json
index 347a3f65a3c071..17ee71099d7962 100644
--- a/app/javascript/mastodon/locales/sr.json
+++ b/app/javascript/mastodon/locales/sr.json
@@ -462,6 +462,7 @@
   "notification.own_poll": "Ваша анкета је завршена",
   "notification.poll": "Завршена је анкета у којој сте гласали",
   "notification.reblog": "{name} је подржао вашу објаву",
+  "notification.relationships_severance_event.learn_more": "Сазнајте више",
   "notification.status": "{name} је управо објавио",
   "notification.update": "{name} је уредио објаву",
   "notification_requests.accept": "Прихвати",
@@ -474,6 +475,7 @@
   "notifications.column_settings.admin.sign_up": "Нове рагистрације:",
   "notifications.column_settings.alert": "Обавештења на радној површини",
   "notifications.column_settings.favourite": "Омиљено:",
+  "notifications.column_settings.filter_bar.advanced": "Прикажи све категорије",
   "notifications.column_settings.follow": "Нови пратиоци:",
   "notifications.column_settings.follow_request": "Нови захтеви за праћење:",
   "notifications.column_settings.mention": "Помињања:",
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index e888c2ea93f385..0c4ce3be491990 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -1768,6 +1768,7 @@ bg:
     contrast: Mastodon (висок контраст)
     default: Mastodon (тъмно)
     mastodon-light: Mastodon (светло)
+    system: Самодейно (употреба на системната тема)
   time:
     formats:
       default: "%d %b, %Y, %H:%M"
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index f94abe265e851c..032dc1e35a1ec6 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -1768,6 +1768,7 @@ ca:
     contrast: Mastodon (alt contrast)
     default: Mastodon (fosc)
     mastodon-light: Mastodon (clar)
+    system: Automàtic (utilitza el tema del sistema)
   time:
     formats:
       default: "%b %d, %Y, %H:%M"
diff --git a/config/locales/da.yml b/config/locales/da.yml
index 63762f740cdafd..acab53d1523d0a 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -1767,6 +1767,7 @@ da:
     contrast: Mastodon (høj kontrast)
     default: Mastodont (mørkt)
     mastodon-light: Mastodon (lyst)
+    system: Automatisk (benyt systemtema)
   time:
     formats:
       default: "%d. %b %Y, %H:%M"
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 620b571f9f50ac..22710265f33862 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -1768,6 +1768,7 @@ de:
     contrast: Mastodon (Hoher Kontrast)
     default: Mastodon (Dunkel)
     mastodon-light: Mastodon (Hell)
+    system: Automatisch (mit System synchronisieren)
   time:
     formats:
       default: "%d. %b %Y, %H:%M Uhr"
diff --git a/config/locales/es-AR.yml b/config/locales/es-AR.yml
index e10183be15b55a..7bfe3b90ba21ed 100644
--- a/config/locales/es-AR.yml
+++ b/config/locales/es-AR.yml
@@ -1768,6 +1768,7 @@ es-AR:
     contrast: Alto contraste
     default: Oscuro
     mastodon-light: Claro
+    system: Automático (usar tema del sistema)
   time:
     formats:
       default: "%Y.%b.%d, %H:%M"
diff --git a/config/locales/es-MX.yml b/config/locales/es-MX.yml
index f497de5683d944..f4f953a0c45c65 100644
--- a/config/locales/es-MX.yml
+++ b/config/locales/es-MX.yml
@@ -1768,6 +1768,7 @@ es-MX:
     contrast: Alto contraste
     default: Mastodon
     mastodon-light: Mastodon (claro)
+    system: Automático (usar tema del sistema)
   time:
     formats:
       default: "%d de %b del %Y, %H:%M"
diff --git a/config/locales/es.yml b/config/locales/es.yml
index b5b98bb88f4272..086e8e2ef61a3f 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -1768,6 +1768,7 @@ es:
     contrast: Alto contraste
     default: Mastodon
     mastodon-light: Mastodon (claro)
+    system: Automático (usar tema del sistema)
   time:
     formats:
       default: "%d de %b del %Y, %H:%M"
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index 3e770b85c96ddc..523b6019780b21 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -1772,6 +1772,7 @@ eu:
     contrast: Mastodon (Kontraste altua)
     default: Mastodon (Iluna)
     mastodon-light: Mastodon (Argia)
+    system: Automatikoa (erabili sistemaren gaia)
   time:
     formats:
       default: "%Y(e)ko %b %d, %H:%M"
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index fe5956fd5846a6..155e4473bf5deb 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -1768,6 +1768,7 @@ fi:
     contrast: Mastodon (Korkea kontrasti)
     default: Mastodon (Tumma)
     mastodon-light: Mastodon (Vaalea)
+    system: Automaattinen (käytä järjestelmän teemaa)
   time:
     formats:
       default: "%d.%m.%Y klo %H.%M"
diff --git a/config/locales/fo.yml b/config/locales/fo.yml
index 1850c2a3b82f64..b6c8b306f010e2 100644
--- a/config/locales/fo.yml
+++ b/config/locales/fo.yml
@@ -1768,6 +1768,7 @@ fo:
     contrast: Mastodon (høgur kontrastur)
     default: Mastodon (myrkt)
     mastodon-light: Mastodon (ljóst)
+    system: Sjálvvirkandi (brúka vanligt uppsetingareyðkenni)
   time:
     formats:
       default: "%b %d, %Y, %H:%M"
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 4b1c9f096b107d..f36d6783c31fc3 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -1768,6 +1768,7 @@ gl:
     contrast: Mastodon (Alto contraste)
     default: Mastodon (Escuro)
     mastodon-light: Mastodon (Claro)
+    system: Automático (seguir ao sistema)
   time:
     formats:
       default: "%d %b, %Y, %H:%M"
diff --git a/config/locales/he.yml b/config/locales/he.yml
index da93925548898e..ddb3417ff893c3 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -1832,6 +1832,7 @@ he:
     contrast: מסטודון (ניגודיות גבוהה)
     default: מסטודון (כהה)
     mastodon-light: מסטודון (בהיר)
+    system: אוטומטי (לפי המערכת)
   time:
     formats:
       default: "%d %b %Y, %H:%M"
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 8f8070d7137cc1..43f7692531313e 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -57,27 +57,27 @@ hu:
       deleted: Törölve
       demote: Lefokozás
       destroyed_msg: A %{username} fiók adatai bekerültek a végleges törlése váró sorba
-      disable: Kikapcsolás
-      disable_sign_in_token_auth: Tokenes e-mail hitelesítés letiltása
+      disable: Befagyasztás
+      disable_sign_in_token_auth: Tokenes e-mail-hitelesítés letiltása
       disable_two_factor_authentication: Kétlépcsős hitelesítés kikapcsolása
-      disabled: Kikapcsolva
-      display_name: Megjelenített név
+      disabled: Befagyasztva
+      display_name: Megjelenítendő név
       domain: Domain
       edit: Szerkesztés
-      email: E-mail
+      email: E-mail-cím
       email_status: E-mail állapot
-      enable: Bekapcsolás
-      enable_sign_in_token_auth: Tokenes e-mail hitelesítés engedélyezése
+      enable: Kiolvasztás
+      enable_sign_in_token_auth: Tokenes e-mail-hitelesítés engedélyezése
       enabled: Bekapcsolva
-      enabled_msg: A %{username} fiók fagyasztását sikeresen visszavontuk
+      enabled_msg: "%{username} fiókja befagyasztása sikeresen visszavonva"
       followers: Követő
       follows: Követett
       header: Fejléc
-      inbox_url: Beérkezett üzenetek URL-je
+      inbox_url: Beérkezett üzenetek webcíme
       invite_request_text: Csatlakozás oka
       invited_by: Meghívta
-      ip: IP
-      joined: Csatlakozott
+      ip: IP-cím
+      joined: Csatlakozva
       location:
         all: Összes
         local: Helyi
@@ -1768,6 +1768,7 @@ hu:
     contrast: Mastodon (nagy kontrasztú)
     default: Mastodon (sötét)
     mastodon-light: Mastodon (világos)
+    system: Automatikus (rendszertéma használata)
   time:
     formats:
       default: "%Y. %b %d., %H:%M"
diff --git a/config/locales/is.yml b/config/locales/is.yml
index 6f9d0e7c7d253e..ba1785d9e67573 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -1772,6 +1772,7 @@ is:
     contrast: Mastodon (mikil birtuskil)
     default: Mastodon (dökkt)
     mastodon-light: Mastodon (ljóst)
+    system: Sjálfvirkt (nota þema kerfis)
   time:
     formats:
       default: "%d. %b, %Y, %H:%M"
diff --git a/config/locales/it.yml b/config/locales/it.yml
index c63d8ef285acbf..59ccb5f27e40be 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -1770,6 +1770,7 @@ it:
     contrast: Mastodon (contrasto elevato)
     default: Mastodon (scuro)
     mastodon-light: Mastodon (chiaro)
+    system: Automatico (usa il tema di sistema)
   time:
     formats:
       default: "%d %b %Y, %H:%M"
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 9548c4e449d127..5ca0324dcc9ec9 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -1738,6 +1738,7 @@ ko:
     contrast: 마스토돈 (고대비)
     default: 마스토돈 (어두움)
     mastodon-light: 마스토돈 (밝음)
+    system: 자동 선택 (시스템 테마 이용)
   time:
     formats:
       default: "%Y-%m-%d %H:%M"
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 91aabb1fa5e1c5..553c780beb8d29 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -1768,6 +1768,7 @@ nl:
     contrast: Mastodon (hoog contrast)
     default: Mastodon (donker)
     mastodon-light: Mastodon (licht)
+    system: Automatisch (systeemthema gebruiken)
   time:
     formats:
       default: "%d %B %Y om %H:%M"
diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index 7145f30377309c..8a7cb18a40ba79 100644
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -1768,6 +1768,7 @@ nn:
     contrast: Mastodon (Høg kontrast)
     default: Mastodon (Mørkt)
     mastodon-light: Mastodon (Lyst)
+    system: Automatisk (bruk systemdrakta)
   time:
     formats:
       default: "%d.%b %Y, %H:%M"
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 89eec685d8903b..d3d16fe373652d 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -1832,6 +1832,7 @@ pl:
     contrast: Mastodon (Wysoki kontrast)
     default: Mastodon (Ciemny)
     mastodon-light: Mastodon (Jasny)
+    system: Automatyczny (odpowiadający motywowi systemu)
   time:
     formats:
       default: "%d. %b %Y, %H:%M"
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 78a20aed0252c1..0b28c8c1b5e740 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -597,6 +597,9 @@ pt-BR:
       actions_description_html: Decida que medidas tomar para resolver esta denúncia. Se você decidir punir a conta denunciada, ela receberá uma notificação por e-mail, exceto quando for selecionada a categoria <strong>spam</strong> for selecionada.
       actions_description_remote_html: Decida quais medidas tomará para resolver esta denúncia. Isso só afetará como <strong>seu servidor</strong> se comunica com esta conta remota e manipula seu conteúdo.
       add_to_report: Adicionar mais à denúncia
+      already_suspended_badges:
+        local: Já suspenso neste servidor
+        remote: Já suspenso em seu servidor
       are_you_sure: Você tem certeza?
       assign_to_self: Atribuir para si
       assigned: Moderador responsável
@@ -1652,13 +1655,20 @@ pt-BR:
     import: Importar
     import_and_export: Importar e exportar
     migrate: Migração de conta
+    notifications: Notificações por e-mail
     preferences: Preferências
     profile: Perfil
     relationships: Seguindo e seguidores
+    severed_relationships: Relacionamentos rompidos
     statuses_cleanup: Exclusão automatizada de publicações
     strikes: Avisos de moderação
     two_factor_authentication: Autenticação de dois fatores
     webauthn_authentication: Chaves de segurança
+  severed_relationships:
+    download: Download  %{count}
+    event_type:
+      account_suspension: Suspensão da conta (%{target_name})
+      domain_block: Suspensão do servidor (%{target_name})
   statuses:
     attached:
       audio:
diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index 666eb0bdd70fa0..8e30a27b8b116b 100644
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -1768,6 +1768,7 @@ pt-PT:
     contrast: Mastodon (Elevado contraste)
     default: Mastodon (Escuro)
     mastodon-light: Mastodon (Claro)
+    system: Automático (usar tema do sistema)
   time:
     formats:
       default: "%H:%M em %d de %b de %Y"
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index b4285673051551..ff23e648414095 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -1832,6 +1832,7 @@ sl:
     contrast: Mastodon (Visok kontrast)
     default: Mastodon (Temna)
     mastodon-light: Mastodon (Svetla)
+    system: Samodejno (uporabi sistemsko temo)
   time:
     formats:
       default: "%b %d %Y, %H:%M"
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index 3742b61427b928..12627434a58d20 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -1762,6 +1762,7 @@ sq:
     contrast: Mastodon (Me shumë kontrast)
     default: Mastodon (I errët)
     mastodon-light: Mastodon (I çelët)
+    system: E automatizuar (përdor temë sistemi)
   time:
     formats:
       default: "%d %b, %Y, %H:%M"
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 8ffb3c1e297334..02c4b8c55b0f51 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -1756,6 +1756,7 @@ sv:
     contrast: Hög kontrast
     default: Mastodon
     mastodon-light: Mastodon (ljust)
+    system: Automatisk (använd systemtema)
   time:
     formats:
       default: "%d %b %Y, %H:%M"
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 69bae8767f8b16..3bedfb82f4d602 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -1735,6 +1735,7 @@ th:
     contrast: Mastodon (ความคมชัดสูง)
     default: Mastodon (มืด)
     mastodon-light: Mastodon (สว่าง)
+    system: อัตโนมัติ (ใช้ชุดรูปแบบของระบบ)
   time:
     formats:
       default: "%d %b %Y %H:%M น."
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 692b3d281fd3e8..4bd0e3455a734c 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -1768,6 +1768,7 @@ tr:
     contrast: Mastodon (Yüksek karşıtlık)
     default: Mastodon (Karanlık)
     mastodon-light: Mastodon (Açık)
+    system: Otomatik (sistem temasını kullan)
   time:
     formats:
       default: "%d %b %Y %H:%M"
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index b02e9c55627f2b..7c7652d699cae1 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -1832,6 +1832,7 @@ uk:
     contrast: Mastodon (Висока контрастність)
     default: Mastodon (Темна)
     mastodon-light: Mastodon (світла)
+    system: Автоматично (використовувати системну тему)
   time:
     formats:
       default: "%b %d, %Y, %H:%M"
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index f71ff741dc4b4e..ec851a82840eca 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -1736,6 +1736,7 @@ vi:
     contrast: Mastodon (Tương phản)
     default: Mastodon (Tối)
     mastodon-light: Mastodon (Sáng)
+    system: Tự động (chủ đề hệ thống)
   time:
     formats:
       default: "%-d.%m.%Y %H:%M"
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index dcc99d7a9167c3..79764539dc68e9 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -1736,6 +1736,7 @@ zh-CN:
     contrast: Mastodon（高对比度）
     default: Mastodon（暗色主题）
     mastodon-light: Mastodon（亮色主题）
+    system: 自动切换（使用系统主题）
   time:
     formats:
       default: "%Y年%m月%d日 %H:%M"
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index e83001e7db4aaf..407931c20c8685 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -1738,6 +1738,7 @@ zh-TW:
     contrast: Mastodon（高對比）
     default: Mastodon（深色）
     mastodon-light: Mastodon（亮色）
+    system: 自動（使用系統佈景主題）
   time:
     formats:
       default: "%Y 年 %b 月 %d 日 %H:%M"

From f2fd1da23fa6bc1847bf7d96a76826f36b29ae8c Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Thu, 28 Mar 2024 11:05:16 +0100
Subject: [PATCH 0625/2191] Fix PropTypes for some record objects (#29786)

---
 app/javascript/mastodon/components/status_action_bar.jsx        | 2 +-
 app/javascript/mastodon/features/getting_started/index.jsx      | 2 +-
 .../mastodon/features/status/components/action_bar.jsx          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/javascript/mastodon/components/status_action_bar.jsx b/app/javascript/mastodon/components/status_action_bar.jsx
index 3c6d26e34951ec..6def49fdbba90c 100644
--- a/app/javascript/mastodon/components/status_action_bar.jsx
+++ b/app/javascript/mastodon/components/status_action_bar.jsx
@@ -81,7 +81,7 @@ class StatusActionBar extends ImmutablePureComponent {
 
   static propTypes = {
     status: ImmutablePropTypes.map.isRequired,
-    relationship: ImmutablePropTypes.map,
+    relationship: ImmutablePropTypes.record,
     onReply: PropTypes.func,
     onFavourite: PropTypes.func,
     onReblog: PropTypes.func,
diff --git a/app/javascript/mastodon/features/getting_started/index.jsx b/app/javascript/mastodon/features/getting_started/index.jsx
index a686a0a8497ab3..db6e0f6ecd4e40 100644
--- a/app/javascript/mastodon/features/getting_started/index.jsx
+++ b/app/javascript/mastodon/features/getting_started/index.jsx
@@ -82,7 +82,7 @@ class GettingStarted extends ImmutablePureComponent {
 
   static propTypes = {
     intl: PropTypes.object.isRequired,
-    myAccount: ImmutablePropTypes.map,
+    myAccount: ImmutablePropTypes.record,
     multiColumn: PropTypes.bool,
     fetchFollowRequests: PropTypes.func.isRequired,
     unreadFollowRequests: PropTypes.number,
diff --git a/app/javascript/mastodon/features/status/components/action_bar.jsx b/app/javascript/mastodon/features/status/components/action_bar.jsx
index a4951260abb4e2..69209e8bd00820 100644
--- a/app/javascript/mastodon/features/status/components/action_bar.jsx
+++ b/app/javascript/mastodon/features/status/components/action_bar.jsx
@@ -74,7 +74,7 @@ class ActionBar extends PureComponent {
 
   static propTypes = {
     status: ImmutablePropTypes.map.isRequired,
-    relationship: ImmutablePropTypes.map,
+    relationship: ImmutablePropTypes.record,
     onReply: PropTypes.func.isRequired,
     onReblog: PropTypes.func.isRequired,
     onFavourite: PropTypes.func.isRequired,

From d08896476100e440d340f19540ae964887bc0a57 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Thu, 28 Mar 2024 11:06:25 +0100
Subject: [PATCH 0626/2191] Fix props for `<Button>` (#29780)

---
 app/javascript/mastodon/components/button.tsx | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/javascript/mastodon/components/button.tsx b/app/javascript/mastodon/components/button.tsx
index 0b6a0f267ebd6e..c76aaea42f26fc 100644
--- a/app/javascript/mastodon/components/button.tsx
+++ b/app/javascript/mastodon/components/button.tsx
@@ -1,26 +1,26 @@
+import type { PropsWithChildren } from 'react';
 import { useCallback } from 'react';
 
 import classNames from 'classnames';
 
-interface BaseProps extends React.ButtonHTMLAttributes<HTMLButtonElement> {
+interface BaseProps
+  extends Omit<React.ButtonHTMLAttributes<HTMLButtonElement>, 'children'> {
   block?: boolean;
   secondary?: boolean;
-  text?: JSX.Element;
 }
 
-interface PropsWithChildren extends BaseProps {
-  text?: never;
+interface PropsChildren extends PropsWithChildren<BaseProps> {
+  text?: undefined;
 }
 
 interface PropsWithText extends BaseProps {
-  text: JSX.Element;
-  children: never;
+  text: JSX.Element | string;
+  children?: undefined;
 }
 
-type Props = PropsWithText | PropsWithChildren;
+type Props = PropsWithText | PropsChildren;
 
 export const Button: React.FC<Props> = ({
-  text,
   type = 'button',
   onClick,
   disabled,
@@ -28,6 +28,7 @@ export const Button: React.FC<Props> = ({
   secondary,
   className,
   title,
+  text,
   children,
   ...props
 }) => {

From 961bb84e4c87555bbce930a87291938a988a483a Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Thu, 28 Mar 2024 11:07:01 +0100
Subject: [PATCH 0627/2191] Fix `<RelativeTimestamp>` types (#29781)

---
 .../mastodon/components/relative_timestamp.tsx    | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/javascript/mastodon/components/relative_timestamp.tsx b/app/javascript/mastodon/components/relative_timestamp.tsx
index b9e1e4f8fd1ff7..ac385e88c651f6 100644
--- a/app/javascript/mastodon/components/relative_timestamp.tsx
+++ b/app/javascript/mastodon/components/relative_timestamp.tsx
@@ -191,7 +191,7 @@ const timeRemainingString = (
 interface Props {
   intl: IntlShape;
   timestamp: string;
-  year: number;
+  year?: number;
   futureDate?: boolean;
   short?: boolean;
 }
@@ -203,11 +203,6 @@ class RelativeTimestamp extends Component<Props, States> {
     now: Date.now(),
   };
 
-  static defaultProps = {
-    year: new Date().getFullYear(),
-    short: true,
-  };
-
   _timer: number | undefined;
 
   shouldComponentUpdate(nextProps: Props, nextState: States) {
@@ -257,7 +252,13 @@ class RelativeTimestamp extends Component<Props, States> {
   }
 
   render() {
-    const { timestamp, intl, year, futureDate, short } = this.props;
+    const {
+      timestamp,
+      intl,
+      futureDate,
+      year = new Date().getFullYear(),
+      short = true,
+    } = this.props;
 
     const timeGiven = timestamp.includes('T');
     const date = new Date(timestamp);

From d44e7a8578a6b9d0ac897d865654dd323e2be28b Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 28 Mar 2024 11:54:16 +0100
Subject: [PATCH 0628/2191] Update dependency node to 20.12 (#29765)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .nvmrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.nvmrc b/.nvmrc
index a3597ecbd10c20..7795cadb579573 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-20.11
+20.12

From e85f24174e5d467974eb160318d20e13f8d43bda Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 28 Mar 2024 06:56:33 -0400
Subject: [PATCH 0629/2191] Simplify checklist step loop in welcome mailer
 (#29761)

---
 app/views/application/mailer/_checklist.html.haml |  8 +++-----
 app/views/user_mailer/welcome.html.haml           | 10 +++++-----
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/app/views/application/mailer/_checklist.html.haml b/app/views/application/mailer/_checklist.html.haml
index 324fd7e6f864b0..91c7c98f26e90f 100644
--- a/app/views/application/mailer/_checklist.html.haml
+++ b/app/views/application/mailer/_checklist.html.haml
@@ -16,16 +16,14 @@
                           = image_tag frontend_asset_url('images/mailer-new/welcome/checkbox-off.png'), alt: '', width: 20, height: 20
                       %td.email-checklist-icons-step-td
                         - if defined?(key)
-                          = image_tag frontend_asset_url("images/mailer-new/welcome-icons/#{key}-#{checked ? 'on' : 'off'}.png"), alt: '', width: 40, height: 40
+                          = image_tag frontend_asset_url("images/mailer-new/welcome-icons/#{key}_step-#{checked ? 'on' : 'off'}.png"), alt: '', width: 40, height: 40
                 %td.email-checklist-text-td
                   .email-desktop-flex
                     /[if mso]
                       <table border="0" cellpadding="0" cellspacing="0" align="center" style="width:100%;" role="presentation"><tr><td vertical-align:top;">
                     %div
-                      - if defined?(title)
-                        %h3= title
-                      - if defined?(text)
-                        %p= text
+                      %h3= t("user_mailer.welcome.#{key}_title")
+                      %p= t("user_mailer.welcome.#{key}_step")
                     /[if mso]
                       </td><td style="vertical-align:top;">
                     %div
diff --git a/app/views/user_mailer/welcome.html.haml b/app/views/user_mailer/welcome.html.haml
index fd8980c234a036..0e55707d36ce58 100644
--- a/app/views/user_mailer/welcome.html.haml
+++ b/app/views/user_mailer/welcome.html.haml
@@ -23,11 +23,11 @@
     %td.email-body-huge-padding-td
       %h2.email-h2= t('user_mailer.welcome.checklist_title')
       %p.email-h-sub= t('user_mailer.welcome.checklist_subtitle')
-      = render 'application/mailer/checklist', key: 'edit_profile_step', title: t('user_mailer.welcome.edit_profile_title'), text: t('user_mailer.welcome.edit_profile_step'), checked: @has_account_fields, button_text: t('user_mailer.welcome.edit_profile_action'), button_url: web_url('start/profile')
-      = render 'application/mailer/checklist', key: 'follow_step', title: t('user_mailer.welcome.follow_title'), text: t('user_mailer.welcome.follow_step'), checked: @has_active_relationships, button_text: t('user_mailer.welcome.follow_action'), button_url: web_url('start/follows')
-      = render 'application/mailer/checklist', key: 'post_step', title: t('user_mailer.welcome.post_title'), text: t('user_mailer.welcome.post_step'), checked: @has_statuses, button_text: t('user_mailer.welcome.post_action'), button_url: web_url
-      = render 'application/mailer/checklist', key: 'share_step', title: t('user_mailer.welcome.share_title'), text: t('user_mailer.welcome.share_step'), checked: false, button_text: t('user_mailer.welcome.share_action'), button_url: web_url('start/share')
-      = render 'application/mailer/checklist', key: 'apps_step', title: t('user_mailer.welcome.apps_title'), text: t('user_mailer.welcome.apps_step'), checked: false, show_apps_buttons: true
+      = render 'application/mailer/checklist', key: 'edit_profile', checked: @has_account_fields, button_text: t('user_mailer.welcome.edit_profile_action'), button_url: web_url('start/profile')
+      = render 'application/mailer/checklist', key: 'follow', checked: @has_active_relationships, button_text: t('user_mailer.welcome.follow_action'), button_url: web_url('start/follows')
+      = render 'application/mailer/checklist', key: 'post', checked: @has_statuses, button_text: t('user_mailer.welcome.post_action'), button_url: web_url
+      = render 'application/mailer/checklist', key: 'share', checked: false, button_text: t('user_mailer.welcome.share_action'), button_url: web_url('start/share')
+      = render 'application/mailer/checklist', key: 'apps', checked: false, show_apps_buttons: true
 %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
   %tr
     %td.email-body-columns-td

From 4f068d4fcc4d134fcbd56faa8f39c608dd343417 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 28 Mar 2024 15:00:57 +0100
Subject: [PATCH 0630/2191] Fix logo pushing header buttons out of view on
 certain conditions in mobile layout (#29787)

---
 app/javascript/styles/mastodon/components.scss | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 48998097ac7718..3961db50de521e 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -2612,6 +2612,7 @@ a.account__display-name {
 }
 
 $ui-header-height: 55px;
+$ui-header-logo-wordmark-width: 99px;
 
 .ui__header {
   display: none;
@@ -2627,6 +2628,10 @@ $ui-header-height: 55px;
   &__logo {
     display: inline-flex;
     padding: 15px;
+    flex-grow: 1;
+    flex-shrink: 1;
+    overflow: hidden;
+    container: header-logo / inline-size;
 
     .logo {
       height: $ui-header-height - 30px;
@@ -2637,7 +2642,7 @@ $ui-header-height: 55px;
       display: none;
     }
 
-    @media screen and (width >= 320px) {
+    @container header-logo (min-width: #{$ui-header-logo-wordmark-width}) {
       .logo--wordmark {
         display: block;
       }
@@ -2654,6 +2659,7 @@ $ui-header-height: 55px;
     gap: 10px;
     padding: 0 10px;
     overflow: hidden;
+    flex-shrink: 0;
 
     .button {
       flex: 0 0 auto;

From 8a498f4e65ecf27cc2c992d02b47f890dafef20b Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 28 Mar 2024 15:48:09 +0100
Subject: [PATCH 0631/2191] New Crowdin Translations (automated) (#29785)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/es-MX.json | 1 +
 app/javascript/mastodon/locales/es.json    | 1 +
 app/javascript/mastodon/locales/kab.json   | 5 +++++
 config/locales/kab.yml                     | 9 +++++++++
 config/locales/ru.yml                      | 1 +
 config/locales/simple_form.kab.yml         | 6 ++++--
 config/locales/th.yml                      | 1 +
 7 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/app/javascript/mastodon/locales/es-MX.json b/app/javascript/mastodon/locales/es-MX.json
index fd32d9d903b8c7..78746d8b4a6bd5 100644
--- a/app/javascript/mastodon/locales/es-MX.json
+++ b/app/javascript/mastodon/locales/es-MX.json
@@ -298,6 +298,7 @@
   "filter_modal.select_filter.title": "Filtrar esta publicación",
   "filter_modal.title.status": "Filtrar una publicación",
   "filtered_notifications_banner.pending_requests": "Notificaciones de {count, plural, =0 {nadie} one {una persona} other {# personas}} que podrías conocer",
+  "filtered_notifications_banner.private_mentions": "{count, plural, one {mención privada} other {menciones privadas}}",
   "filtered_notifications_banner.title": "Notificaciones filtradas",
   "firehose.all": "Todas",
   "firehose.local": "Este servidor",
diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json
index 9c15a3cae48989..e3ed560b5ce3f7 100644
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@@ -298,6 +298,7 @@
   "filter_modal.select_filter.title": "Filtrar esta publicación",
   "filter_modal.title.status": "Filtrar una publicación",
   "filtered_notifications_banner.pending_requests": "Notificaciones de {count, plural, =0 {nadie} one {una persona} other {# personas}} que podrías conocer",
+  "filtered_notifications_banner.private_mentions": "{count, plural, one {mención privada} other {menciones privadas}}",
   "filtered_notifications_banner.title": "Notificaciones filtradas",
   "firehose.all": "Todas",
   "firehose.local": "Este servidor",
diff --git a/app/javascript/mastodon/locales/kab.json b/app/javascript/mastodon/locales/kab.json
index fbe60c3bddd95f..9fdf602992022e 100644
--- a/app/javascript/mastodon/locales/kab.json
+++ b/app/javascript/mastodon/locales/kab.json
@@ -221,6 +221,7 @@
   "filter_modal.select_filter.prompt_new": "Taggayt tamaynutt : {name}",
   "filter_modal.select_filter.search": "Nadi neɣ snulfu-d",
   "filter_modal.select_filter.title": "Sizdeg tassufeɣt-a",
+  "filter_modal.title.status": "Sizdeg tassufeɣt",
   "firehose.all": "Akk",
   "firehose.local": "Deg uqeddac-ayi",
   "firehose.remote": "Iqeddacen nniḍen",
@@ -335,6 +336,7 @@
   "mute_modal.show_options": "Sken-d tinefrunin",
   "mute_modal.title": "Sgugem aseqdac?",
   "navigation_bar.about": "Ɣef",
+  "navigation_bar.advanced_interface": "Ldi deg ugrudem n web leqqayen",
   "navigation_bar.blocks": "Iseqdacen yettusḥebsen",
   "navigation_bar.bookmarks": "Ticraḍ",
   "navigation_bar.community_timeline": "Tasuddemt tadigant",
@@ -364,6 +366,7 @@
   "notification.own_poll": "Tafrant-ik·im tfuk",
   "notification.poll": "Tfukk tefrant ideg tettekkaḍ",
   "notification.reblog": "{name} yebḍa tajewwiqt-ik i tikelt-nniḍen",
+  "notification.relationships_severance_event.learn_more": "Issin ugar",
   "notification.status": "{name} akken i d-yessufeɣ",
   "notification_requests.accept": "Qbel",
   "notification_requests.dismiss": "Agi",
@@ -372,6 +375,8 @@
   "notifications.clear_confirmation": "Tebɣiḍ s tidet ad tekkseḍ akk tilɣa-inek·em i lebda?",
   "notifications.column_settings.alert": "Tilɣa n tnarit",
   "notifications.column_settings.favourite": "Imenyafen:",
+  "notifications.column_settings.filter_bar.advanced": "Sken-d akk taggayin",
+  "notifications.column_settings.filter_bar.category": "Iri n usizdeg uzrib",
   "notifications.column_settings.follow": "Imeḍfaṛen imaynuten:",
   "notifications.column_settings.follow_request": "Isuturen imaynuten n teḍfeṛt:",
   "notifications.column_settings.mention": "Abdar:",
diff --git a/config/locales/kab.yml b/config/locales/kab.yml
index 4ba608c9f9d29f..b2fc9d847735f6 100644
--- a/config/locales/kab.yml
+++ b/config/locales/kab.yml
@@ -391,6 +391,7 @@ kab:
         invites: Iɛeṛṛuḍen
         moderation: Aseɣyed
       delete: Kkes
+      everyone: Tisirag timezwura
       privileges:
         administrator: Anedbal
     rules:
@@ -441,6 +442,10 @@ kab:
     system_checks:
       rules_check:
         action: Sefrek ilugan n uqeddac
+      software_version_critical_check:
+        action: Wali ileqqman yellan
+      software_version_patch_check:
+        action: Wali ileqqman yellan
     title: Tadbelt
     trends:
       allow: Sireg
@@ -602,6 +607,8 @@ kab:
       notifications: Ilɣa
       thread: Idiwenniyen
     edit:
+      add_keyword: Rnu awal tasarut
+      keywords: Awalen n tsarut
       title: Ẓreg amzizdig
     index:
       delete: Kkes
@@ -640,6 +647,7 @@ kab:
       blocking: Tabdart n yimiḍanen iweḥlen
       bookmarks: Ticraḍ
       following: Tabdert n wid teṭṭafareḍ
+      lists: Tibdarin
       muting: Tabdert n wid tesgugmeḍ
     upload: Sali
   invites:
@@ -750,6 +758,7 @@ kab:
       phantom_js: PhantomJS
       qq: Iminig QQ
       safari: Safari
+      unknown_browser: Iminig arussin
       weibo: Weibo
     current_session: Tiɣimit tamirant
     date: Azemz
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 05ea31ff814178..85d8a7a54046c3 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -1899,6 +1899,7 @@ ru:
         suspend: Учётная запись заблокирована
     welcome:
       explanation: Вот несколько советов для новичков
+      feature_action: Подробнее
       subject: Добро пожаловать в Mastodon
       title: Добро пожаловать на борт, %{name}!
   users:
diff --git a/config/locales/simple_form.kab.yml b/config/locales/simple_form.kab.yml
index 8723e83efac3cc..9461f16cd54577 100644
--- a/config/locales/simple_form.kab.yml
+++ b/config/locales/simple_form.kab.yml
@@ -74,8 +74,8 @@ kab:
         setting_default_language: Tutlayt n tira
         setting_default_privacy: Tabaḍnit n tira
         setting_display_media_default: Akk-a kan
-        setting_display_media_hide_all: Ffer kullec
-        setting_display_media_show_all: Ssken kullec
+        setting_display_media_hide_all: Ffer-iten akk
+        setting_display_media_show_all: Sken-iten-id akk
         setting_hide_network: Ffer azetta-k·m
         setting_theme: Asental n wesmel
         setting_use_pending_items: Askar aleɣwayan
@@ -115,6 +115,8 @@ kab:
         text: Alugen
       tag:
         name: Ahacṭag
+      user:
+        time_zone: Tamnaḍt tasragant
       user_role:
         name: Isem
         permissions_as_keys: Tisirag
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 3bedfb82f4d602..2a05c892e76cbe 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -1646,6 +1646,7 @@ th:
       user_domain_block: คุณได้ปิดกั้น %{target_name}
     lost_followers: ผู้ติดตามที่หายไป
     lost_follows: การติดตามที่หายไป
+    preamble: คุณอาจสูญเสียการติดตามและผู้ติดตามเมื่อคุณปิดกั้นโดเมนหรือเมื่อผู้กลั่นกรองของคุณตัดสินใจที่จะระงับเซิร์ฟเวอร์ระยะไกล เมื่อสิ่งนั้นเกิดขึ้น คุณจะสามารถดาวน์โหลดรายการความสัมพันธ์ที่ตัดขาด เพื่อตรวจสอบและอาจนำเข้าในเซิร์ฟเวอร์อื่น
     purged: มีการล้างข้อมูลเกี่ยวกับเซิร์ฟเวอร์นี้โดยผู้ดูแลของเซิร์ฟเวอร์ของคุณ
     type: เหตุการณ์
   statuses:

From 67442f90393c644064bf34d531bdebe15f88d729 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Thu, 28 Mar 2024 16:33:15 +0100
Subject: [PATCH 0632/2191] Remove global `boosts` state and convert boosts
 modal to Typescript (#29774)

---
 app/javascript/mastodon/actions/boosts.js     |  32 ----
 .../mastodon/components/visibility_icon.tsx   |   5 +-
 .../mastodon/containers/status_container.jsx  |   3 +-
 .../containers/notification_container.js      |   4 +-
 .../picture_in_picture/components/footer.jsx  |   3 +-
 .../containers/detailed_status_container.js   |   3 +-
 .../mastodon/features/status/index.jsx        |   3 +-
 .../features/ui/components/boost_modal.jsx    | 125 --------------
 .../features/ui/components/boost_modal.tsx    | 162 ++++++++++++++++++
 .../features/ui/components/modal_root.jsx     |   2 +-
 app/javascript/mastodon/models/status.ts      |   4 +
 app/javascript/mastodon/reducers/boosts.js    |  25 ---
 app/javascript/mastodon/reducers/index.ts     |   2 -
 13 files changed, 175 insertions(+), 198 deletions(-)
 delete mode 100644 app/javascript/mastodon/actions/boosts.js
 delete mode 100644 app/javascript/mastodon/features/ui/components/boost_modal.jsx
 create mode 100644 app/javascript/mastodon/features/ui/components/boost_modal.tsx
 create mode 100644 app/javascript/mastodon/models/status.ts
 delete mode 100644 app/javascript/mastodon/reducers/boosts.js

diff --git a/app/javascript/mastodon/actions/boosts.js b/app/javascript/mastodon/actions/boosts.js
deleted file mode 100644
index 1fc2e391e26827..00000000000000
--- a/app/javascript/mastodon/actions/boosts.js
+++ /dev/null
@@ -1,32 +0,0 @@
-import { openModal } from './modal';
-
-export const BOOSTS_INIT_MODAL = 'BOOSTS_INIT_MODAL';
-export const BOOSTS_CHANGE_PRIVACY = 'BOOSTS_CHANGE_PRIVACY';
-
-export function initBoostModal(props) {
-  return (dispatch, getState) => {
-    const default_privacy = getState().getIn(['compose', 'default_privacy']);
-
-    const privacy = props.status.get('visibility') === 'private' ? 'private' : default_privacy;
-
-    dispatch({
-      type: BOOSTS_INIT_MODAL,
-      privacy,
-    });
-
-    dispatch(openModal({
-      modalType: 'BOOST',
-      modalProps: props,
-    }));
-  };
-}
-
-
-export function changeBoostPrivacy(privacy) {
-  return dispatch => {
-    dispatch({
-      type: BOOSTS_CHANGE_PRIVACY,
-      privacy,
-    });
-  };
-}
diff --git a/app/javascript/mastodon/components/visibility_icon.tsx b/app/javascript/mastodon/components/visibility_icon.tsx
index 753dc0273723ce..3a310cbae22e9c 100644
--- a/app/javascript/mastodon/components/visibility_icon.tsx
+++ b/app/javascript/mastodon/components/visibility_icon.tsx
@@ -4,11 +4,10 @@ import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?re
 import LockIcon from '@/material-icons/400-24px/lock.svg?react';
 import PublicIcon from '@/material-icons/400-24px/public.svg?react';
 import QuietTimeIcon from '@/material-icons/400-24px/quiet_time.svg?react';
+import type { StatusVisibility } from 'mastodon/models/status';
 
 import { Icon } from './icon';
 
-type Visibility = 'public' | 'unlisted' | 'private' | 'direct';
-
 const messages = defineMessages({
   public_short: { id: 'privacy.public.short', defaultMessage: 'Public' },
   unlisted_short: {
@@ -25,7 +24,7 @@ const messages = defineMessages({
   },
 });
 
-export const VisibilityIcon: React.FC<{ visibility: Visibility }> = ({
+export const VisibilityIcon: React.FC<{ visibility: StatusVisibility }> = ({
   visibility,
 }) => {
   const intl = useIntl();
diff --git a/app/javascript/mastodon/containers/status_container.jsx b/app/javascript/mastodon/containers/status_container.jsx
index da93a16b088237..c6842e8df86f1a 100644
--- a/app/javascript/mastodon/containers/status_container.jsx
+++ b/app/javascript/mastodon/containers/status_container.jsx
@@ -8,7 +8,6 @@ import {
 } from '../actions/accounts';
 import { showAlertForError } from '../actions/alerts';
 import { initBlockModal } from '../actions/blocks';
-import { initBoostModal } from '../actions/boosts';
 import {
   replyCompose,
   mentionCompose,
@@ -107,7 +106,7 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
     if ((e && e.shiftKey) || !boostModal) {
       this.onModalReblog(status);
     } else {
-      dispatch(initBoostModal({ status, onReblog: this.onModalReblog }));
+      dispatch(openModal({ modalType: 'BOOST', modalProps: { status, onReblog: this.onModalReblog } }));
     }
   },
 
diff --git a/app/javascript/mastodon/features/notifications/containers/notification_container.js b/app/javascript/mastodon/features/notifications/containers/notification_container.js
index 4458fd7bc3f3f0..de450cd1abe17d 100644
--- a/app/javascript/mastodon/features/notifications/containers/notification_container.js
+++ b/app/javascript/mastodon/features/notifications/containers/notification_container.js
@@ -1,6 +1,5 @@
 import { connect } from 'react-redux';
 
-import { initBoostModal } from '../../../actions/boosts';
 import { mentionCompose } from '../../../actions/compose';
 import {
   reblog,
@@ -8,6 +7,7 @@ import {
   unreblog,
   unfavourite,
 } from '../../../actions/interactions';
+import { openModal } from '../../../actions/modal';
 import {
   hideStatus,
   revealStatus,
@@ -49,7 +49,7 @@ const mapDispatchToProps = dispatch => ({
       if (e.shiftKey || !boostModal) {
         this.onModalReblog(status);
       } else {
-        dispatch(initBoostModal({ status, onReblog: this.onModalReblog }));
+        dispatch(openModal({ modalType: 'BOOST', modalProps: { status, onReblog: this.onModalReblog } }));
       }
     }
   },
diff --git a/app/javascript/mastodon/features/picture_in_picture/components/footer.jsx b/app/javascript/mastodon/features/picture_in_picture/components/footer.jsx
index a7d8356be75eff..7a163a88258c6b 100644
--- a/app/javascript/mastodon/features/picture_in_picture/components/footer.jsx
+++ b/app/javascript/mastodon/features/picture_in_picture/components/footer.jsx
@@ -14,7 +14,6 @@ import RepeatIcon from '@/material-icons/400-24px/repeat.svg?react';
 import ReplyIcon from '@/material-icons/400-24px/reply.svg?react';
 import ReplyAllIcon from '@/material-icons/400-24px/reply_all.svg?react';
 import StarIcon from '@/material-icons/400-24px/star.svg?react';
-import { initBoostModal } from 'mastodon/actions/boosts';
 import { replyCompose } from 'mastodon/actions/compose';
 import { reblog, favourite, unreblog, unfavourite } from 'mastodon/actions/interactions';
 import { openModal } from 'mastodon/actions/modal';
@@ -140,7 +139,7 @@ class Footer extends ImmutablePureComponent {
       } else if ((e && e.shiftKey) || !boostModal) {
         this._performReblog(status);
       } else {
-        dispatch(initBoostModal({ status, onReblog: this._performReblog }));
+        dispatch(openModal({ modalType: 'BOOST', modalProps: { status, onReblog: this._performReblog } }));
       }
     } else {
       dispatch(openModal({
diff --git a/app/javascript/mastodon/features/status/containers/detailed_status_container.js b/app/javascript/mastodon/features/status/containers/detailed_status_container.js
index 3e1f8d4d299237..1c650f544f577b 100644
--- a/app/javascript/mastodon/features/status/containers/detailed_status_container.js
+++ b/app/javascript/mastodon/features/status/containers/detailed_status_container.js
@@ -4,7 +4,6 @@ import { connect } from 'react-redux';
 
 import { showAlertForError } from '../../../actions/alerts';
 import { initBlockModal } from '../../../actions/blocks';
-import { initBoostModal } from '../../../actions/boosts';
 import {
   replyCompose,
   mentionCompose,
@@ -85,7 +84,7 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
       if (e.shiftKey || !boostModal) {
         this.onModalReblog(status);
       } else {
-        dispatch(initBoostModal({ status, onReblog: this.onModalReblog }));
+        dispatch(openModal({ modalType: 'BOOST', modalProps: { status, onReblog: this.onModalReblog } }));
       }
     }
   },
diff --git a/app/javascript/mastodon/features/status/index.jsx b/app/javascript/mastodon/features/status/index.jsx
index 44db9d9c3ffb03..39147597255128 100644
--- a/app/javascript/mastodon/features/status/index.jsx
+++ b/app/javascript/mastodon/features/status/index.jsx
@@ -27,7 +27,6 @@ import {
   unmuteAccount,
 } from '../../actions/accounts';
 import { initBlockModal } from '../../actions/blocks';
-import { initBoostModal } from '../../actions/boosts';
 import {
   replyCompose,
   mentionCompose,
@@ -317,7 +316,7 @@ class Status extends ImmutablePureComponent {
         if ((e && e.shiftKey) || !boostModal) {
           this.handleModalReblog(status);
         } else {
-          dispatch(initBoostModal({ status, onReblog: this.handleModalReblog }));
+          dispatch(openModal({ modalType: 'BOOST', modalProps: { status, onReblog: this.handleModalReblog } }));
         }
       }
     } else {
diff --git a/app/javascript/mastodon/features/ui/components/boost_modal.jsx b/app/javascript/mastodon/features/ui/components/boost_modal.jsx
deleted file mode 100644
index 3b3e1e3f97d4de..00000000000000
--- a/app/javascript/mastodon/features/ui/components/boost_modal.jsx
+++ /dev/null
@@ -1,125 +0,0 @@
-import PropTypes from 'prop-types';
-
-import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
-
-import classNames from 'classnames';
-import { withRouter } from 'react-router-dom';
-
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import ImmutablePureComponent from 'react-immutable-pure-component';
-import { connect } from 'react-redux';
-
-import RepeatIcon from '@/material-icons/400-24px/repeat.svg?react';
-import { changeBoostPrivacy } from 'mastodon/actions/boosts';
-import AttachmentList from 'mastodon/components/attachment_list';
-import { Icon }  from 'mastodon/components/icon';
-import { VisibilityIcon } from 'mastodon/components/visibility_icon';
-import PrivacyDropdown from 'mastodon/features/compose/components/privacy_dropdown';
-import { WithRouterPropTypes } from 'mastodon/utils/react_router';
-
-import { Avatar } from '../../../components/avatar';
-import { Button } from '../../../components/button';
-import { DisplayName } from '../../../components/display_name';
-import { RelativeTimestamp } from '../../../components/relative_timestamp';
-import StatusContent from '../../../components/status_content';
-
-const messages = defineMessages({
-  cancel_reblog: { id: 'status.cancel_reblog_private', defaultMessage: 'Unboost' },
-  reblog: { id: 'status.reblog', defaultMessage: 'Boost' },
-});
-
-const mapStateToProps = state => {
-  return {
-    privacy: state.getIn(['boosts', 'new', 'privacy']),
-  };
-};
-
-const mapDispatchToProps = dispatch => {
-  return {
-    onChangeBoostPrivacy(value) {
-      dispatch(changeBoostPrivacy(value));
-    },
-  };
-};
-
-class BoostModal extends ImmutablePureComponent {
-  static propTypes = {
-    status: ImmutablePropTypes.map.isRequired,
-    onReblog: PropTypes.func.isRequired,
-    onClose: PropTypes.func.isRequired,
-    onChangeBoostPrivacy: PropTypes.func.isRequired,
-    privacy: PropTypes.string.isRequired,
-    intl: PropTypes.object.isRequired,
-    ...WithRouterPropTypes,
-  };
-
-  handleReblog = () => {
-    this.props.onReblog(this.props.status, this.props.privacy);
-    this.props.onClose();
-  };
-
-  handleAccountClick = (e) => {
-    if (e.button === 0 && !(e.ctrlKey || e.metaKey)) {
-      e.preventDefault();
-      this.props.onClose();
-      this.props.history.push(`/@${this.props.status.getIn(['account', 'acct'])}`);
-    }
-  };
-
-  _findContainer = () => {
-    return document.getElementsByClassName('modal-root__container')[0];
-  };
-
-  render () {
-    const { status, privacy, intl } = this.props;
-    const buttonText = status.get('reblogged') ? messages.cancel_reblog : messages.reblog;
-
-    return (
-      <div className='modal-root__modal boost-modal'>
-        <div className='boost-modal__container'>
-          <div className={classNames('status', `status-${status.get('visibility')}`, 'light')}>
-            <div className='status__info'>
-              <a href={`/@${status.getIn(['account', 'acct'])}/${status.get('id')}`} className='status__relative-time' target='_blank' rel='noopener noreferrer'>
-                <span className='status__visibility-icon'><VisibilityIcon visibility={status.get('visibility')} /></span>
-                <RelativeTimestamp timestamp={status.get('created_at')} />
-              </a>
-
-              <a onClick={this.handleAccountClick} href={`/@${status.getIn(['account', 'acct'])}`} className='status__display-name'>
-                <div className='status__avatar'>
-                  <Avatar account={status.get('account')} size={48} />
-                </div>
-
-                <DisplayName account={status.get('account')} />
-              </a>
-            </div>
-
-            <StatusContent status={status} />
-
-            {status.get('media_attachments').size > 0 && (
-              <AttachmentList
-                compact
-                media={status.get('media_attachments')}
-              />
-            )}
-          </div>
-        </div>
-
-        <div className='boost-modal__action-bar'>
-          <div><FormattedMessage id='boost_modal.combo' defaultMessage='You can press {combo} to skip this next time' values={{ combo: <span>Shift + <Icon id='retweet' icon={RepeatIcon} /></span> }} /></div>
-          {status.get('visibility') !== 'private' && !status.get('reblogged') && (
-            <PrivacyDropdown
-              noDirect
-              value={privacy}
-              container={this._findContainer}
-              onChange={this.props.onChangeBoostPrivacy}
-            />
-          )}
-          <Button text={intl.formatMessage(buttonText)} onClick={this.handleReblog} autoFocus />
-        </div>
-      </div>
-    );
-  }
-
-}
-
-export default withRouter(connect(mapStateToProps, mapDispatchToProps)(injectIntl(BoostModal)));
diff --git a/app/javascript/mastodon/features/ui/components/boost_modal.tsx b/app/javascript/mastodon/features/ui/components/boost_modal.tsx
new file mode 100644
index 00000000000000..40b0c81833001a
--- /dev/null
+++ b/app/javascript/mastodon/features/ui/components/boost_modal.tsx
@@ -0,0 +1,162 @@
+import type { MouseEventHandler } from 'react';
+import { useCallback, useState } from 'react';
+
+import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
+
+import classNames from 'classnames';
+import { useHistory } from 'react-router';
+
+import type Immutable from 'immutable';
+
+import RepeatIcon from '@/material-icons/400-24px/repeat.svg?react';
+import AttachmentList from 'mastodon/components/attachment_list';
+import { Icon } from 'mastodon/components/icon';
+import { VisibilityIcon } from 'mastodon/components/visibility_icon';
+import PrivacyDropdown from 'mastodon/features/compose/components/privacy_dropdown';
+import type { Account } from 'mastodon/models/account';
+import type { Status, StatusVisibility } from 'mastodon/models/status';
+import { useAppSelector } from 'mastodon/store';
+
+import { Avatar } from '../../../components/avatar';
+import { Button } from '../../../components/button';
+import { DisplayName } from '../../../components/display_name';
+import { RelativeTimestamp } from '../../../components/relative_timestamp';
+import StatusContent from '../../../components/status_content';
+
+const messages = defineMessages({
+  cancel_reblog: {
+    id: 'status.cancel_reblog_private',
+    defaultMessage: 'Unboost',
+  },
+  reblog: { id: 'status.reblog', defaultMessage: 'Boost' },
+});
+
+export const BoostModal: React.FC<{
+  status: Status;
+  onClose: () => void;
+  onReblog: (status: Status, privacy: StatusVisibility) => void;
+}> = ({ status, onReblog, onClose }) => {
+  const intl = useIntl();
+  const history = useHistory();
+
+  const default_privacy = useAppSelector(
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
+    (state) => state.compose.get('default_privacy') as StatusVisibility,
+  );
+
+  const account = status.get('account') as Account;
+  const statusVisibility = status.get('visibility') as StatusVisibility;
+
+  const [privacy, setPrivacy] = useState<StatusVisibility>(
+    statusVisibility === 'private' ? 'private' : default_privacy,
+  );
+
+  const onPrivacyChange = useCallback((value: StatusVisibility) => {
+    setPrivacy(value);
+  }, []);
+
+  const handleReblog = useCallback(() => {
+    onReblog(status, privacy);
+    onClose();
+  }, [onClose, onReblog, status, privacy]);
+
+  const handleAccountClick = useCallback<MouseEventHandler>(
+    (e) => {
+      if (e.button === 0 && !(e.ctrlKey || e.metaKey)) {
+        e.preventDefault();
+        onClose();
+        history.push(`/@${account.acct}`);
+      }
+    },
+    [history, onClose, account],
+  );
+
+  const buttonText = status.get('reblogged')
+    ? messages.cancel_reblog
+    : messages.reblog;
+
+  const findContainer = useCallback(
+    () => document.getElementsByClassName('modal-root__container')[0],
+    [],
+  );
+
+  return (
+    <div className='modal-root__modal boost-modal'>
+      <div className='boost-modal__container'>
+        <div
+          className={classNames(
+            'status',
+            `status-${statusVisibility}`,
+            'light',
+          )}
+        >
+          <div className='status__info'>
+            <a
+              href={`/@${account.acct}/${status.get('id') as string}`}
+              className='status__relative-time'
+              target='_blank'
+              rel='noopener noreferrer'
+            >
+              <span className='status__visibility-icon'>
+                <VisibilityIcon visibility={statusVisibility} />
+              </span>
+              <RelativeTimestamp
+                timestamp={status.get('created_at') as string}
+              />
+            </a>
+
+            <a
+              onClick={handleAccountClick}
+              href={`/@${account.acct}`}
+              className='status__display-name'
+            >
+              <div className='status__avatar'>
+                <Avatar account={account} size={48} />
+              </div>
+
+              <DisplayName account={account} />
+            </a>
+          </div>
+
+          {/* @ts-expect-error Expected until StatusContent is typed */}
+          <StatusContent status={status} />
+
+          {(status.get('media_attachments') as Immutable.List<unknown>).size >
+            0 && (
+            <AttachmentList compact media={status.get('media_attachments')} />
+          )}
+        </div>
+      </div>
+
+      <div className='boost-modal__action-bar'>
+        <div>
+          <FormattedMessage
+            id='boost_modal.combo'
+            defaultMessage='You can press {combo} to skip this next time'
+            values={{
+              combo: (
+                <span>
+                  Shift + <Icon id='retweet' icon={RepeatIcon} />
+                </span>
+              ),
+            }}
+          />
+        </div>
+        {statusVisibility !== 'private' && !status.get('reblogged') && (
+          <PrivacyDropdown
+            noDirect
+            value={privacy}
+            container={findContainer}
+            onChange={onPrivacyChange}
+          />
+        )}
+        <Button
+          text={intl.formatMessage(buttonText)}
+          onClick={handleReblog}
+          // eslint-disable-next-line jsx-a11y/no-autofocus
+          autoFocus
+        />
+      </div>
+    </div>
+  );
+};
diff --git a/app/javascript/mastodon/features/ui/components/modal_root.jsx b/app/javascript/mastodon/features/ui/components/modal_root.jsx
index 97d7706da44add..404b53c7429ae6 100644
--- a/app/javascript/mastodon/features/ui/components/modal_root.jsx
+++ b/app/javascript/mastodon/features/ui/components/modal_root.jsx
@@ -24,7 +24,7 @@ import BundleContainer from '../containers/bundle_container';
 
 import ActionsModal from './actions_modal';
 import AudioModal from './audio_modal';
-import BoostModal from './boost_modal';
+import { BoostModal } from './boost_modal';
 import BundleModalError from './bundle_modal_error';
 import ConfirmationModal from './confirmation_modal';
 import FocalPointModal from './focal_point_modal';
diff --git a/app/javascript/mastodon/models/status.ts b/app/javascript/mastodon/models/status.ts
new file mode 100644
index 00000000000000..83e9f6b8855141
--- /dev/null
+++ b/app/javascript/mastodon/models/status.ts
@@ -0,0 +1,4 @@
+export type StatusVisibility = 'public' | 'unlisted' | 'private' | 'direct';
+
+// Temporary until we type it correctly
+export type Status = Immutable.Map<string, unknown>;
diff --git a/app/javascript/mastodon/reducers/boosts.js b/app/javascript/mastodon/reducers/boosts.js
deleted file mode 100644
index d0d825057cdfa0..00000000000000
--- a/app/javascript/mastodon/reducers/boosts.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import Immutable from 'immutable';
-
-import {
-  BOOSTS_INIT_MODAL,
-  BOOSTS_CHANGE_PRIVACY,
-} from 'mastodon/actions/boosts';
-
-const initialState = Immutable.Map({
-  new: Immutable.Map({
-    privacy: 'public',
-  }),
-});
-
-export default function mutes(state = initialState, action) {
-  switch (action.type) {
-  case BOOSTS_INIT_MODAL:
-    return state.withMutations((state) => {
-      state.setIn(['new', 'privacy'], action.privacy);
-    });
-  case BOOSTS_CHANGE_PRIVACY:
-    return state.setIn(['new', 'privacy'], action.privacy);
-  default:
-    return state;
-  }
-}
diff --git a/app/javascript/mastodon/reducers/index.ts b/app/javascript/mastodon/reducers/index.ts
index db5e68a70ca2a5..6296ef202690a0 100644
--- a/app/javascript/mastodon/reducers/index.ts
+++ b/app/javascript/mastodon/reducers/index.ts
@@ -7,7 +7,6 @@ import { accountsReducer } from './accounts';
 import accounts_map from './accounts_map';
 import alerts from './alerts';
 import announcements from './announcements';
-import boosts from './boosts';
 import compose from './compose';
 import contexts from './contexts';
 import conversations from './conversations';
@@ -60,7 +59,6 @@ const reducers = {
   relationships: relationshipsReducer,
   settings,
   push_notifications,
-  boosts,
   server,
   contexts,
   compose,

From cd9d11dda6a1244ed8dc9e39d54e40c26407267a Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 29 Mar 2024 14:30:52 +0100
Subject: [PATCH 0633/2191] Update dependency debug to v1.9.2 (#29799)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 4d36cf4e9ff37a..5464dbef705eff 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -194,7 +194,7 @@ GEM
       database_cleaner-core (~> 2.0.0)
     database_cleaner-core (2.0.1)
     date (3.3.4)
-    debug (1.9.1)
+    debug (1.9.2)
       irb (~> 1.10)
       reline (>= 0.3.8)
     debug_inspector (1.2.0)

From 671167f6dad1e62fac8ee0b22c79a6ab4b61b972 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 29 Mar 2024 14:31:13 +0100
Subject: [PATCH 0634/2191] Update dependency glob to v10.3.12 (#29790)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index bcdd1bd6f884dc..b4e20cf96289c0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8863,17 +8863,17 @@ __metadata:
   linkType: hard
 
 "glob@npm:^10.2.2, glob@npm:^10.2.6, glob@npm:^10.3.10, glob@npm:^10.3.7":
-  version: 10.3.10
-  resolution: "glob@npm:10.3.10"
+  version: 10.3.12
+  resolution: "glob@npm:10.3.12"
   dependencies:
     foreground-child: "npm:^3.1.0"
-    jackspeak: "npm:^2.3.5"
+    jackspeak: "npm:^2.3.6"
     minimatch: "npm:^9.0.1"
-    minipass: "npm:^5.0.0 || ^6.0.2 || ^7.0.0"
-    path-scurry: "npm:^1.10.1"
+    minipass: "npm:^7.0.4"
+    path-scurry: "npm:^1.10.2"
   bin:
     glob: dist/esm/bin.mjs
-  checksum: 10c0/13d8a1feb7eac7945f8c8480e11cd4a44b24d26503d99a8d8ac8d5aefbf3e9802a2b6087318a829fad04cb4e829f25c5f4f1110c68966c498720dd261c7e344d
+  checksum: 10c0/f60cefdc1cf3f958b2bb5823e1b233727f04916d489dc4641d76914f016e6704421e06a83cbb68b0cb1cb9382298b7a88075b844ad2127fc9727ea22b18b0711
   languageName: node
   linkType: hard
 
@@ -10334,7 +10334,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jackspeak@npm:^2.3.5":
+"jackspeak@npm:^2.3.6":
   version: 2.3.6
   resolution: "jackspeak@npm:2.3.6"
   dependencies:
@@ -11447,10 +11447,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lru-cache@npm:^10.0.1, lru-cache@npm:^9.1.1 || ^10.0.0":
-  version: 10.0.1
-  resolution: "lru-cache@npm:10.0.1"
-  checksum: 10c0/982dabfb227b9a2daf56d712ae0e72e01115a28c0a2068cd71277bca04568f3417bbf741c6c7941abc5c620fd8059e34f15607f90ebccbfa0a17533322d27a8e
+"lru-cache@npm:^10.0.1, lru-cache@npm:^10.2.0":
+  version: 10.2.0
+  resolution: "lru-cache@npm:10.2.0"
+  checksum: 10c0/c9847612aa2daaef102d30542a8d6d9b2c2bb36581c1bf0dc3ebf5e5f3352c772a749e604afae2e46873b930a9e9523743faac4e5b937c576ab29196774712ee
   languageName: node
   linkType: hard
 
@@ -11916,7 +11916,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"minipass@npm:^5.0.0 || ^6.0.2 || ^7.0.0, minipass@npm:^7.0.2, minipass@npm:^7.0.3":
+"minipass@npm:^5.0.0 || ^6.0.2 || ^7.0.0, minipass@npm:^7.0.2, minipass@npm:^7.0.3, minipass@npm:^7.0.4":
   version: 7.0.4
   resolution: "minipass@npm:7.0.4"
   checksum: 10c0/6c7370a6dfd257bf18222da581ba89a5eaedca10e158781232a8b5542a90547540b4b9b7e7f490e4cda43acfbd12e086f0453728ecf8c19e0ef6921bc5958ac5
@@ -12749,13 +12749,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"path-scurry@npm:^1.10.1":
-  version: 1.10.1
-  resolution: "path-scurry@npm:1.10.1"
+"path-scurry@npm:^1.10.2":
+  version: 1.10.2
+  resolution: "path-scurry@npm:1.10.2"
   dependencies:
-    lru-cache: "npm:^9.1.1 || ^10.0.0"
+    lru-cache: "npm:^10.2.0"
     minipass: "npm:^5.0.0 || ^6.0.2 || ^7.0.0"
-  checksum: 10c0/e5dc78a7348d25eec61ab166317e9e9c7b46818aa2c2b9006c507a6ff48c672d011292d9662527213e558f5652ce0afcc788663a061d8b59ab495681840c0c1e
+  checksum: 10c0/d723777fbf9627f201e64656680f66ebd940957eebacf780e6cce1c2919c29c116678b2d7dbf8821b3a2caa758d125f4444005ccec886a25c8f324504e48e601
   languageName: node
   linkType: hard
 

From 672c9f5f05bde788877ae0dcdb6668366c4c8941 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Fri, 29 Mar 2024 14:32:07 +0100
Subject: [PATCH 0635/2191] Change the `theme-color` value automatically when
 using a built-in theme (#29795)

---
 app/helpers/application_helper.rb       | 5 ++++-
 app/lib/themes.rb                       | 3 +++
 app/views/layouts/application.html.haml | 1 -
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index d46d0674a48c26..c3ee0d930a7fd3 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -164,8 +164,11 @@ def theme_style_tags(theme)
     if theme == 'system'
       concat stylesheet_pack_tag('mastodon-light', media: 'not all and (prefers-color-scheme: dark)', crossorigin: 'anonymous')
       concat stylesheet_pack_tag('default', media: '(prefers-color-scheme: dark)', crossorigin: 'anonymous')
+      concat tag.meta name: 'theme-color', content: Themes::MASTODON_DARK_THEME_COLOR, media: '(prefers-color-scheme: dark)'
+      concat tag.meta name: 'theme-color', content: Themes::MASTODON_LIGHT_THEME_COLOR, media: '(prefers-color-scheme: light)'
     else
-      stylesheet_pack_tag theme, media: 'all', crossorigin: 'anonymous'
+      concat stylesheet_pack_tag theme, media: 'all', crossorigin: 'anonymous'
+      concat tag.meta name: 'theme-color', content: theme == 'mastodon-light' ? Themes::MASTODON_LIGHT_THEME_COLOR : Themes::MASTODON_DARK_THEME_COLOR
     end
   end
 
diff --git a/app/lib/themes.rb b/app/lib/themes.rb
index 4010d84435c26c..3ad2304977fa11 100644
--- a/app/lib/themes.rb
+++ b/app/lib/themes.rb
@@ -6,6 +6,9 @@
 class Themes
   include Singleton
 
+  MASTODON_DARK_THEME_COLOR = '#191b22'
+  MASTODON_LIGHT_THEME_COLOR = '#f3f5f7'
+
   def initialize
     @conf = YAML.load_file(Rails.root.join('config', 'themes.yml'))
   end
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 0cd7fc9f44a617..c353b1d872eb69 100755
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -21,7 +21,6 @@
 
     %link{ rel: 'mask-icon', href: frontend_asset_path('images/logo-symbol-icon.svg'), color: '#6364FF' }/
     %link{ rel: 'manifest', href: manifest_path(format: :json) }/
-    %meta{ name: 'theme-color', content: '#191b22' }/
     %meta{ name: 'apple-mobile-web-app-capable', content: 'yes' }/
 
     %title= html_title

From f96648d41c3faf2d8e20ac9c65132156eab9e6be Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 29 Mar 2024 14:35:50 +0100
Subject: [PATCH 0636/2191] New Crowdin Translations (automated) (#29796)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/ar.json    | 27 ++++++++++++++++++++++
 app/javascript/mastodon/locales/be.json    |  2 ++
 app/javascript/mastodon/locales/bg.json    |  3 +++
 app/javascript/mastodon/locales/fr-CA.json | 12 ++++++++--
 app/javascript/mastodon/locales/fr.json    | 12 ++++++++--
 app/javascript/mastodon/locales/uk.json    |  3 ++-
 app/javascript/mastodon/locales/zh-HK.json |  8 +++++++
 config/locales/ar.yml                      | 21 +++++++++++++++++
 config/locales/devise.ar.yml               |  1 +
 config/locales/fr-CA.yml                   |  1 +
 config/locales/fr.yml                      |  1 +
 config/locales/simple_form.ar.yml          |  4 ++++
 config/locales/sk.yml                      |  4 ++++
 config/locales/zh-HK.yml                   |  4 ++++
 14 files changed, 98 insertions(+), 5 deletions(-)

diff --git a/app/javascript/mastodon/locales/ar.json b/app/javascript/mastodon/locales/ar.json
index 62ac7739d382f0..a231e5e21dd5f7 100644
--- a/app/javascript/mastodon/locales/ar.json
+++ b/app/javascript/mastodon/locales/ar.json
@@ -90,6 +90,8 @@
   "attachments_list.unprocessed": "(غير معالَج)",
   "audio.hide": "إخفاء المقطع الصوتي",
   "block_modal.remote_users_caveat": "Do t’i kërkojmë shërbyesit {domain} të respektojë vendimin tuaj. Por, pajtimi s’është i garantuar, ngaqë disa shërbyes mund t’i trajtojnë ndryshe bllokimet. Psotimet publike mundet të jenë ende të dukshme për përdorues pa bërë hyrje në llogari.",
+  "block_modal.show_less": "اعرض أقلّ",
+  "block_modal.show_more": "أظهر المزيد",
   "boost_modal.combo": "يُمكنك الضّغط على {combo} لتخطي هذا في المرة المُقبلة",
   "bundle_column_error.copy_stacktrace": "انسخ تقرير الخطأ",
   "bundle_column_error.error.body": "لا يمكن تقديم الصفحة المطلوبة. قد يكون بسبب خطأ في التعليمات البرمجية، أو مشكلة توافق المتصفح.",
@@ -201,6 +203,13 @@
   "dismissable_banner.explore_statuses": "هذه هي المنشورات الرائجة على الشبكات الاجتماعيّة اليوم. تظهر المنشورات المعاد نشرها والحائزة على مفضّلات أكثر في مرتبة عليا.",
   "dismissable_banner.explore_tags": "هذه هي الوسوم تكتسب جذب الاهتمام حاليًا على الويب الاجتماعي. الوسوم التي يستخدمها مختلف الناس تحتل مرتبة عليا.",
   "dismissable_banner.public_timeline": "هذه هي أحدث المنشورات العامة من الناس على الشبكة الاجتماعية التي يتبعها الناس على {domain}.",
+  "domain_pill.server": "الخادِم",
+  "domain_pill.their_handle": "مُعرِّفُه:",
+  "domain_pill.their_server": "بيتهم الرقمي، حيث تُستضاف كافة منشوراتهم.",
+  "domain_pill.their_username": "مُعرّفُهم الفريد على الخادم. من الممكن العثور على مستخدمين بنفس اسم المستخدم على خوادم مختلفة.",
+  "domain_pill.username": "اسم المستخدم",
+  "domain_pill.whats_in_a_handle": "ما المقصود بالمُعرِّف؟",
+  "domain_pill.your_handle": "عنوانك الكامل:",
   "embed.instructions": "يمكنكم إدماج هذا المنشور على موقعكم الإلكتروني عن طريق نسخ الشفرة أدناه.",
   "embed.preview": "إليك ما سيبدو عليه:",
   "emoji_button.activity": "الأنشطة",
@@ -395,6 +404,13 @@
   "loading_indicator.label": "جاري التحميل…",
   "media_gallery.toggle_visible": "{number, plural, zero {} one {اخف الصورة} two {اخف الصورتين} few {اخف الصور} many {اخف الصور} other {اخف الصور}}",
   "moved_to_account_banner.text": "حسابك {disabledAccount} معطل حاليًا لأنك انتقلت إلى {movedToAccount}.",
+  "mute_modal.hide_options": "إخفاء الخيارات",
+  "mute_modal.show_options": "إظهار الخيارات",
+  "mute_modal.they_can_mention_and_follow": "سيكون بإمكانه الإشارة إليك ومتابعتك، لكنك لن تره.",
+  "mute_modal.they_wont_know": "لن يَعرف أنه قد تم كتمه.",
+  "mute_modal.title": "أتريد كتم المُستخدم؟",
+  "mute_modal.you_wont_see_mentions": "سوف لن تر المنشورات التي يُشار إليه.",
+  "mute_modal.you_wont_see_posts": "سيكون بإمكانه رؤية منشوراتك، لكنك لن ترى منشوراته.",
   "navigation_bar.about": "عن",
   "navigation_bar.advanced_interface": "افتحه في واجهة الويب المتقدمة",
   "navigation_bar.blocks": "الحسابات المحجوبة",
@@ -430,14 +446,21 @@
   "notification.own_poll": "انتهى استطلاعك للرأي",
   "notification.poll": "لقد انتهى استطلاع رأي شاركتَ فيه",
   "notification.reblog": "قام {name} بمشاركة منشورك",
+  "notification.relationships_severance_event.learn_more": "اعرف المزيد",
   "notification.status": "{name} نشر للتو",
   "notification.update": "عدّلَ {name} منشورًا",
+  "notification_requests.accept": "موافقة",
+  "notification_requests.dismiss": "تخطي",
+  "notification_requests.notifications_from": "إشعارات من {name}",
+  "notification_requests.title": "الإشعارات المصفاة",
   "notifications.clear": "مسح الإشعارات",
   "notifications.clear_confirmation": "متأكد من أنك تود مسح جميع الإشعارات الخاصة بك و المتلقاة إلى حد الآن ؟",
   "notifications.column_settings.admin.report": "التبليغات الجديدة:",
   "notifications.column_settings.admin.sign_up": "التسجيلات الجديدة:",
   "notifications.column_settings.alert": "إشعارات سطح المكتب",
   "notifications.column_settings.favourite": "المفضلة:",
+  "notifications.column_settings.filter_bar.advanced": "عرض جميع الفئات",
+  "notifications.column_settings.filter_bar.category": "شريط التصفية السريعة",
   "notifications.column_settings.follow": "متابعُون جُدُد:",
   "notifications.column_settings.follow_request": "الطلبات الجديد لِمتابَعتك:",
   "notifications.column_settings.mention": "الإشارات:",
@@ -463,6 +486,10 @@
   "notifications.permission_denied": "تنبيهات سطح المكتب غير متوفرة بسبب رفض أذونات المتصفح مسبقاً",
   "notifications.permission_denied_alert": "لا يمكن تفعيل إشعارات سطح المكتب، لأن إذن المتصفح قد تم رفضه سابقاً",
   "notifications.permission_required": "إشعارات سطح المكتب غير متوفرة لأنه لم يتم منح الإذن المطلوب.",
+  "notifications.policy.filter_new_accounts_title": "حسابات جديدة",
+  "notifications.policy.filter_not_followers_title": "أشخاص لا يتابعونك",
+  "notifications.policy.filter_not_following_hint": "حتى توافق عليهم يدويا",
+  "notifications.policy.filter_not_following_title": "أشخاص لا تتابعهم",
   "notifications_permission_banner.enable": "تفعيل إشعارات سطح المكتب",
   "notifications_permission_banner.how_to_control": "لتلقي الإشعارات عندما لا يكون ماستدون مفتوح، قم بتفعيل إشعارات سطح المكتب، يمكنك التحكم بدقة في أنواع التفاعلات التي تولد إشعارات سطح المكتب من خلال زر الـ{icon} أعلاه بمجرد تفعيلها.",
   "notifications_permission_banner.title": "لا تفوت شيئاً أبداً",
diff --git a/app/javascript/mastodon/locales/be.json b/app/javascript/mastodon/locales/be.json
index fe186222a78d52..276f7c712d6d3e 100644
--- a/app/javascript/mastodon/locales/be.json
+++ b/app/javascript/mastodon/locales/be.json
@@ -471,6 +471,7 @@
   "notification.own_poll": "Ваша апытанне скончылася",
   "notification.poll": "Апытанне, дзе вы прынялі ўдзел, скончылася",
   "notification.reblog": "{name} пашырыў ваш допіс",
+  "notification.relationships_severance_event.learn_more": "Даведацца больш",
   "notification.status": "Новы допіс ад {name}",
   "notification.update": "Допіс {name} адрэдагаваны",
   "notification_requests.accept": "Прыняць",
@@ -484,6 +485,7 @@
   "notifications.column_settings.alert": "Апавяшчэнні на працоўным стале",
   "notifications.column_settings.favourite": "Упадабанае:",
   "notifications.column_settings.filter_bar.advanced": "Паказаць усе катэгорыі",
+  "notifications.column_settings.filter_bar.category": "Панэль хуткай фільтрацыі",
   "notifications.column_settings.follow": "Новыя падпісчыкі:",
   "notifications.column_settings.follow_request": "Новыя запыты на падпіску:",
   "notifications.column_settings.mention": "Згадванні:",
diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json
index 11307051197b9f..910d6cb06eb06f 100644
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@@ -472,7 +472,10 @@
   "notification.poll": "Анкета, в която гласувахте, приключи",
   "notification.reblog": "{name} подсили ваша публикация",
   "notification.relationships_severance_event": "Изгуби се връзката с {name}",
+  "notification.relationships_severance_event.account_suspension": "Администратор от {from} спря {target}, което значи че повече не може да получавате новости от тях или да взаимодействате с тях.",
+  "notification.relationships_severance_event.domain_block": "Администратор от {from} блокира {target}, вкючващо {followersCount} от последователите ви и {followingCount, plural, one {# акаунт, който} other {# акаунта, които}} следвате.",
   "notification.relationships_severance_event.learn_more": "Научете повече",
+  "notification.relationships_severance_event.user_domain_block": "Блокирахте {target}, премахвайки {followersCount} от последователите си и {followingCount, plural, one {# акаунт, който} other {# акаунта, които}} следвате.",
   "notification.status": "{name} току-що публикува",
   "notification.update": "{name} промени публикация",
   "notification_requests.accept": "Приемам",
diff --git a/app/javascript/mastodon/locales/fr-CA.json b/app/javascript/mastodon/locales/fr-CA.json
index ab4a3f309ce076..163769253d62b9 100644
--- a/app/javascript/mastodon/locales/fr-CA.json
+++ b/app/javascript/mastodon/locales/fr-CA.json
@@ -222,14 +222,14 @@
   "domain_pill.server": "Serveur",
   "domain_pill.their_handle": "Son identifiant :",
   "domain_pill.their_server": "Son foyer numérique, là où tous ses posts résident.",
-  "domain_pill.their_username": "Son identifiant unique sur leur serveur. Il est possible de rencontrer des utilisateurs avec le même nom sur différents serveurs.",
+  "domain_pill.their_username": "Son identifiant unique sur leur serveur. Il est possible de rencontrer des utilisateur·rice·s avec le même nom sur différents serveurs.",
   "domain_pill.username": "Nom d’utilisateur",
   "domain_pill.whats_in_a_handle": "Qu'est-ce qu'un identifiant ?",
   "domain_pill.who_they_are": "Comme un identifiant contient le nom et le service hébergeant une personne, vous pouvez interagir sur <button>les plateformes sociales implémentant ActivityPub</button>.",
   "domain_pill.who_you_are": "Comme un identifiant indique votre nom et le service vous hébergeant, vous pouvez interagir avec <button>les autres plateformes sociales implémentant ActivityPub</button>.",
   "domain_pill.your_handle": "Votre identifiant :",
   "domain_pill.your_server": "Votre foyer numérique, là où vos messages résident. Vous souhaitez changer ? Lancez un transfert vers un autre serveur quand vous le voulez et vos abonné·e·s suivront automatiquement.",
-  "domain_pill.your_username": "Votre identifiant unique sur ce serveur. Il est possible de trouver des utilisateurs ayant le même nom d'utilisateur sur différents serveurs.",
+  "domain_pill.your_username": "Votre identifiant unique sur ce serveur. Il est possible de rencontrer des utilisateur·rice·s ayant le même nom d'utilisateur sur différents serveurs.",
   "embed.instructions": "Intégrez cette publication à votre site en copiant le code ci-dessous.",
   "embed.preview": "Voici comment il apparaîtra:",
   "emoji_button.activity": "Activité",
@@ -298,6 +298,7 @@
   "filter_modal.select_filter.title": "Filtrer cette publication",
   "filter_modal.title.status": "Filtrer une publication",
   "filtered_notifications_banner.pending_requests": "Notifications {count, plural, =0 {de personne} one {d’une personne} other {de # personnes}} que vous pouvez connaitre",
+  "filtered_notifications_banner.private_mentions": "{count, plural, one {mention privée} other {mentions privées}}",
   "filtered_notifications_banner.title": "Notifications filtrées",
   "firehose.all": "Tout",
   "firehose.local": "Ce serveur",
@@ -471,6 +472,11 @@
   "notification.own_poll": "Votre sondage est terminé",
   "notification.poll": "Un sondage auquel vous avez participé est terminé",
   "notification.reblog": "{name} a boosté votre message",
+  "notification.relationships_severance_event": "Connexions perdues avec {name}",
+  "notification.relationships_severance_event.account_suspension": "Un·e administrateur·rice de {from} a suspendu {target}, ce qui signifie que vous ne pourrez plus recevoir de mises à jour ou interagir avec lui.",
+  "notification.relationships_severance_event.domain_block": "Un·e administrateur·rice de {from} en a bloqué {target}, comprenant {followersCount} de vos abonné·e·s et {followingCount, plural, one {# compte} other {# comptes}} vous suivez.",
+  "notification.relationships_severance_event.learn_more": "En savoir plus",
+  "notification.relationships_severance_event.user_domain_block": "Vous avez bloqué {target}, en supprimant {followersCount} de vos abonnés et {followingCount, plural, one {# compte} other {# comptes}} que vous suivez.",
   "notification.status": "{name} vient de publier",
   "notification.update": "{name} a modifié une publication",
   "notification_requests.accept": "Accepter",
@@ -483,6 +489,8 @@
   "notifications.column_settings.admin.sign_up": "Nouvelles inscriptions:",
   "notifications.column_settings.alert": "Notifications navigateur",
   "notifications.column_settings.favourite": "Favoris:",
+  "notifications.column_settings.filter_bar.advanced": "Afficher toutes les catégories",
+  "notifications.column_settings.filter_bar.category": "Barre de filtre rapide",
   "notifications.column_settings.follow": "Nouveaux⋅elles abonné⋅e⋅s:",
   "notifications.column_settings.follow_request": "Nouvelles demandes d’abonnement:",
   "notifications.column_settings.mention": "Mentions:",
diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json
index 5ae6fac9f7889e..ace3d41e0410e9 100644
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@@ -222,14 +222,14 @@
   "domain_pill.server": "Serveur",
   "domain_pill.their_handle": "Son identifiant :",
   "domain_pill.their_server": "Son foyer numérique, là où tous ses posts résident.",
-  "domain_pill.their_username": "Son identifiant unique sur leur serveur. Il est possible de rencontrer des utilisateurs avec le même nom sur différents serveurs.",
+  "domain_pill.their_username": "Son identifiant unique sur leur serveur. Il est possible de rencontrer des utilisateur·rice·s avec le même nom sur différents serveurs.",
   "domain_pill.username": "Nom d’utilisateur",
   "domain_pill.whats_in_a_handle": "Qu'est-ce qu'un identifiant ?",
   "domain_pill.who_they_are": "Comme un identifiant contient le nom et le service hébergeant une personne, vous pouvez interagir sur <button>les plateformes sociales implémentant ActivityPub</button>.",
   "domain_pill.who_you_are": "Comme un identifiant indique votre nom et le service vous hébergeant, vous pouvez interagir avec <button>les autres plateformes sociales implémentant ActivityPub</button>.",
   "domain_pill.your_handle": "Votre identifiant :",
   "domain_pill.your_server": "Votre foyer numérique, là où vos messages résident. Vous souhaitez changer ? Lancez un transfert vers un autre serveur quand vous le voulez et vos abonné·e·s suivront automatiquement.",
-  "domain_pill.your_username": "Votre identifiant unique sur ce serveur. Il est possible de trouver des utilisateurs ayant le même nom d'utilisateur sur différents serveurs.",
+  "domain_pill.your_username": "Votre identifiant unique sur ce serveur. Il est possible de rencontrer des utilisateur·rice·s ayant le même nom d'utilisateur sur différents serveurs.",
   "embed.instructions": "Intégrez ce message à votre site en copiant le code ci-dessous.",
   "embed.preview": "Il apparaîtra comme cela :",
   "emoji_button.activity": "Activités",
@@ -298,6 +298,7 @@
   "filter_modal.select_filter.title": "Filtrer ce message",
   "filter_modal.title.status": "Filtrer un message",
   "filtered_notifications_banner.pending_requests": "Notifications {count, plural, =0 {de personne} one {d’une personne} other {de # personnes}} que vous pouvez connaitre",
+  "filtered_notifications_banner.private_mentions": "{count, plural, one {mention privée} other {mentions privées}}",
   "filtered_notifications_banner.title": "Notifications filtrées",
   "firehose.all": "Tout",
   "firehose.local": "Ce serveur",
@@ -471,6 +472,11 @@
   "notification.own_poll": "Votre sondage est terminé",
   "notification.poll": "Un sondage auquel vous avez participé vient de se terminer",
   "notification.reblog": "{name} a partagé votre message",
+  "notification.relationships_severance_event": "Connexions perdues avec {name}",
+  "notification.relationships_severance_event.account_suspension": "Un·e administrateur·rice de {from} a suspendu {target}, ce qui signifie que vous ne pourrez plus recevoir de mises à jour ou interagir avec lui.",
+  "notification.relationships_severance_event.domain_block": "Un·e administrateur·rice de {from} en a bloqué {target}, comprenant {followersCount} de vos abonné·e·s et {followingCount, plural, one {# compte} other {# comptes}} vous suivez.",
+  "notification.relationships_severance_event.learn_more": "En savoir plus",
+  "notification.relationships_severance_event.user_domain_block": "Vous avez bloqué {target}, en supprimant {followersCount} de vos abonnés et {followingCount, plural, one {# compte} other {# comptes}} que vous suivez.",
   "notification.status": "{name} vient de publier",
   "notification.update": "{name} a modifié un message",
   "notification_requests.accept": "Accepter",
@@ -483,6 +489,8 @@
   "notifications.column_settings.admin.sign_up": "Nouvelles inscriptions :",
   "notifications.column_settings.alert": "Notifications du navigateur",
   "notifications.column_settings.favourite": "Favoris :",
+  "notifications.column_settings.filter_bar.advanced": "Afficher toutes les catégories",
+  "notifications.column_settings.filter_bar.category": "Barre de filtre rapide",
   "notifications.column_settings.follow": "Nouveaux·elles abonné·e·s :",
   "notifications.column_settings.follow_request": "Nouvelles demandes d’abonnement :",
   "notifications.column_settings.mention": "Mentions :",
diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json
index 0648fde5b3307c..c593ccc9dd44e7 100644
--- a/app/javascript/mastodon/locales/uk.json
+++ b/app/javascript/mastodon/locales/uk.json
@@ -287,6 +287,7 @@
   "filter_modal.select_filter.title": "Фільтрувати цей допис",
   "filter_modal.title.status": "Фільтрувати допис",
   "filtered_notifications_banner.pending_requests": "Сповіщення від {count, plural, =0 {жодної особи} one {однієї особи} few {# осіб} many {# осіб} other {# особи}}, котрих ви можете знати",
+  "filtered_notifications_banner.private_mentions": "{count, plural, one {приватна згадка} few {приватні згадки} many {приватні згадки} other {приватна згадка}}",
   "filtered_notifications_banner.title": "Відфільтровані сповіщення",
   "firehose.all": "Всі",
   "firehose.local": "Цей сервер",
@@ -476,7 +477,7 @@
   "notifications.column_settings.alert": "Сповіщення стільниці",
   "notifications.column_settings.favourite": "Уподобане:",
   "notifications.column_settings.filter_bar.advanced": "Показати всі категорії",
-  "notifications.column_settings.filter_bar.category": "Панель швидкого фільтру",
+  "notifications.column_settings.filter_bar.category": "Панель швидкого фільтра",
   "notifications.column_settings.follow": "Нові підписники:",
   "notifications.column_settings.follow_request": "Нові запити на підписку:",
   "notifications.column_settings.mention": "Згадки:",
diff --git a/app/javascript/mastodon/locales/zh-HK.json b/app/javascript/mastodon/locales/zh-HK.json
index d618b68e2d26ed..c5ebf09b184c6c 100644
--- a/app/javascript/mastodon/locales/zh-HK.json
+++ b/app/javascript/mastodon/locales/zh-HK.json
@@ -298,6 +298,7 @@
   "filter_modal.select_filter.title": "過濾此帖文",
   "filter_modal.title.status": "過濾一則帖文",
   "filtered_notifications_banner.pending_requests": "來自 {count, plural, =0 {0 位} other {# 位}}你可能認識的人的通知",
+  "filtered_notifications_banner.private_mentions": "{count, plural, one {則私人提及} other {則私人提及}}",
   "filtered_notifications_banner.title": "已過濾之通知",
   "firehose.all": "全部",
   "firehose.local": "本伺服器",
@@ -471,6 +472,11 @@
   "notification.own_poll": "你的投票已結束",
   "notification.poll": "你參與過的一個投票已經結束",
   "notification.reblog": "{name} 轉推你的文章",
+  "notification.relationships_severance_event": "失去與 {name} 的連結",
+  "notification.relationships_severance_event.account_suspension": "{from} 的管理員已將 {target} 停權，這表示你無法再收到他們的更新或與他們互動。",
+  "notification.relationships_severance_event.domain_block": "{from} 的管理員已封鎖 {target}，包括你的 {followersCount} 位追蹤者和 {followingCount, plural, other {# 個你追蹤的帳號}}。",
+  "notification.relationships_severance_event.learn_more": "了解更多",
+  "notification.relationships_severance_event.user_domain_block": "你已封鎖 {target}，並移除了你的 {followersCount} 位追蹤者和你追蹤的 {followingCount, plural, other {# 個帳號}}。",
   "notification.status": "{name} 剛發表了文章",
   "notification.update": "{name} 編輯了帖文",
   "notification_requests.accept": "接受",
@@ -483,6 +489,8 @@
   "notifications.column_settings.admin.sign_up": "新註冊：",
   "notifications.column_settings.alert": "顯示桌面通知",
   "notifications.column_settings.favourite": "最愛：",
+  "notifications.column_settings.filter_bar.advanced": "顯示所有分類",
+  "notifications.column_settings.filter_bar.category": "快速篩選欄",
   "notifications.column_settings.follow": "新追蹤者：",
   "notifications.column_settings.follow_request": "新的追蹤請求：",
   "notifications.column_settings.mention": "提及你：",
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index b0579c6f3f3363..9043e23b992083 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -1962,7 +1962,28 @@ ar:
         silence: الحساب محدود
         suspend: الحساب مُعلَّق
     welcome:
+      apps_android_action: احصل عليه من متجر جوجل للتطبيقات
+      apps_ios_action: التنزيل من App Store
+      apps_step: تنزيل تطبيقاتنا الرسمية.
+      apps_title: تطبيقات مَستُدون
+      checklist_subtitle: 'هيا بنا نبدأ مغامرتنا على الويب الاجتماعي الجديد:'
+      checklist_title: الخطوات الترحيبية الأولى
+      edit_profile_action: تخصيص
+      edit_profile_step: قم بتعزيز تفاعلاتك بامتلاك مِلَفّ تعريفي كامل.
+      edit_profile_title: قم بتخصيص ملفك التعريفي
       explanation: ها هي بعض النصائح قبل بداية الاستخدام
+      feature_action: اعرف المزيد
+      follow_action: تابِع
+      follows_title: مَن عليك متابعته
+      hashtags_title: الوسوم الرائجة
+      hashtags_view_more: عرض المزيد من الوسوم الرائجة
+      post_action: إنشاء
+      post_step: قل مرحبا للعالَم عبر نصّ أو صور أو فيديوهات أو استطلاعات رأي.
+      post_title: قم بإنشاء منشورك الأول
+      share_action: شارِك
+      share_step: أخبر أصدقائك بكيفية العثور عليك على مَستُدون.
+      share_title: شارك مِلَفّ مَستُدون التعريفي الخاص بك
+      sign_in_action: تسجيل الدخول
       subject: أهلًا بك على ماستدون
       title: أهلاً بك، %{name}!
   users:
diff --git a/config/locales/devise.ar.yml b/config/locales/devise.ar.yml
index 4e6adf42e5a2a2..e8b6ff7d93983f 100644
--- a/config/locales/devise.ar.yml
+++ b/config/locales/devise.ar.yml
@@ -12,6 +12,7 @@ ar:
       last_attempt: بإمكانك إعادة المحاولة مرة واحدة قبل أن يتم قفل حسابك.
       locked: إن حسابك مقفل.
       not_found_in_database: "%{authentication_keys} أو كلمة سر خاطئة."
+      omniauth_user_creation_failure: خطأ في إنشاء حساب لهذه الهُوِيَّة.
       pending: إنّ حسابك في انتظار مراجعة.
       timeout: لقد انتهت مدة صَلاحِيَة جلستك. قم بتسجيل الدخول من جديد للمواصلة.
       unauthenticated: يجب عليك تسجيل الدخول أو إنشاء حساب قبل المواصلة.
diff --git a/config/locales/fr-CA.yml b/config/locales/fr-CA.yml
index 6e422455c35963..05d6b8864d8d4a 100644
--- a/config/locales/fr-CA.yml
+++ b/config/locales/fr-CA.yml
@@ -1768,6 +1768,7 @@ fr-CA:
     contrast: Mastodon (Contraste élevé)
     default: Mastodon (Sombre)
     mastodon-light: Mastodon (Clair)
+    system: Automatique (utiliser le thème système)
   time:
     formats:
       default: "%d %b %Y, %H:%M"
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 31f5bfa5159f72..6ab42088014fcb 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -1768,6 +1768,7 @@ fr:
     contrast: Mastodon (Contraste élevé)
     default: Mastodon (Sombre)
     mastodon-light: Mastodon (Clair)
+    system: Automatique (utiliser le thème système)
   time:
     formats:
       default: "%d %b %Y, %H:%M"
diff --git a/config/locales/simple_form.ar.yml b/config/locales/simple_form.ar.yml
index 896fcbf3fadbea..da27fd8dc4f977 100644
--- a/config/locales/simple_form.ar.yml
+++ b/config/locales/simple_form.ar.yml
@@ -39,12 +39,14 @@ ar:
         text: يمكنك الطعن في عقوبة مرة واحدة فقط
       defaults:
         autofollow: سوف يتابعك تلقائيًا الأشخاص الذين يقومون بالتسجيل من خلال الدعوة
+        avatar: ملف WEBP أو PNG أو GIF أو JPG. حجمه على أقصى تصدير %{size}. سيتم تقليصه إلى %{dimensions} بيكسل
         bot: يقوم هذا الحساب أساسا بإجراءات آلية وقد لا يتم مراقبته
         context: واحد أو أكثر من السياقات التي يجب أن ينطبق عليها عامل التصفية
         current_password: لأسباب أمنية ، يرجى إدخال الكلمة السرية الخاصة بالحساب الحالي
         current_username: يرجى إدخال اسم المستخدم الخاص بالحساب الحالي قصد التأكيد
         digest: تُرسَل إليك بعد مُضيّ مدة مِن خمول نشاطك و فقط إذا ما تلقيت رسائل شخصية مباشِرة أثناء فترة غيابك مِن الشبكة
         email: سوف تتلقى رسالة إلكترونية للتأكيد
+        header: ملف WEBP أو PNG أو GIF أو JPG. حجمه على أقصى تصدير %{size}. سيتم تقليصه إلى %{dimensions} بيكسل
         inbox_url: نسخ العنوان الذي تريد استخدامه مِن صفحة الاستقبال للمُرحَّل
         irreversible: المنشورات التي تم تصفيتها ستختفي لا محالة حتى و إن تمت إزالة عامِل التصفية لاحقًا
         locale: لغة واجهة المستخدم و الرسائل الإلكترونية و الإشعارات
@@ -114,6 +116,7 @@ ar:
           sign_up_requires_approval: التسجيلات الجديدة سوف تتطلب موافقتك
         severity: اختر ما سيحدث مع الطلبات من هذا الـIP
       rule:
+        hint: اختياري. قدم المزيد من التفاصيل حول القاعدة
         text: صِف قانون أو شرط للمستخدمين على هذا الخادم. حاول أن تُبقيه قصير وبسيط
       sessions:
         otp: 'قم بإدخال رمز المصادقة بخطوتين الذي قام بتوليده تطبيق جهازك أو استخدم أحد رموز النفاذ الاحتياطية:'
@@ -297,6 +300,7 @@ ar:
           patch: إشعاري عند توفّر تحديثات التصحيح
         trending_tag: المتداولة الجديدة تتطلّب مراجعة
       rule:
+        hint: معلومات إضافية
         text: قانون
       settings:
         indexable: السماح لمحركات البحث بفهرسة صفحتك التعريفية
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 8c613e9589f26c..d4cd8658541c95 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -585,6 +585,7 @@ sk:
         administration: Spravovanie
         invites: Pozvánky
         moderation: Moderácia
+        special: Špeciálne
       delete: Vymaž
       edit: Uprav postavenie %{name}
       everyone: Východzie oprávnenia
@@ -804,6 +805,7 @@ sk:
     confirmations:
       clicking_this_link: kliknutím na tento odkaz
       login_link: prihlás sa
+      proceed_to_login_html: Teraz môžeš pokračovať na %{login_link}.
       welcome_title: Vitaj, %{name}!
     delete_account: Vymaž účet
     delete_account_html: Pokiaľ chceš svoj účet odtiaľto vymazať, môžeš tak <a href="%{path}">urobiť tu</a>. Budeš požiadaný/á o potvrdenie tohto kroku.
@@ -822,6 +824,7 @@ sk:
     or_log_in_with: Alebo prihlás s
     progress:
       confirm: Potvrď email
+      details: Tvoje údaje
       rules: Súhlas s pravidlami
     register: Zaregistruj sa
     registration_closed: "%{instance} neprijíma nových členov"
@@ -883,6 +886,7 @@ sk:
       username_unavailable: Tvoja prezývka ostane neprístupná
   disputes:
     strikes:
+      action_taken: Vykonaný zákrok
       appeal: Namietni
       appeals:
         submit: Pošli námietku
diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml
index af2b3b8698b28f..1dc50c2849175f 100644
--- a/config/locales/zh-HK.yml
+++ b/config/locales/zh-HK.yml
@@ -585,6 +585,9 @@ zh-HK:
       actions_description_html: 決定對此檢舉採取哪種措施。如果對被檢舉帳號採取懲罰措施，除非選取了<strong>垃圾訊息</strong>分類，否則將向他們發送一封電郵通知。
       actions_description_remote_html: 決定對此檢舉採取哪種動作。這只會影響<strong>你的伺服器</strong>與此遠端帳號的通訊和處理其內容的方式。
       add_to_report: 加入更多到檢舉
+      already_suspended_badges:
+        local: 已在此伺服器被停權
+        remote: 已在他們的伺服器被停權
       are_you_sure: 你確認嗎？
       assign_to_self: 指派給自己
       assigned: 指派版主
@@ -1733,6 +1736,7 @@ zh-HK:
     contrast: 高對比
     default: 萬象
     mastodon-light: 萬象（亮色主題）
+    system: 自動（使用系統主題）
   time:
     formats:
       default: "%Y年%-m月%d日 %H:%M"

From 69e5771881037e52380712dfc029c101f76efe74 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Fri, 29 Mar 2024 14:57:39 +0100
Subject: [PATCH 0637/2191] Handle `createAppAsyncThunk` rejected actions in
 the errors middleware (#29791)

---
 .../mastodon/store/middlewares/errors.ts      | 27 ++++++++++++++-----
 .../mastodon/store/typed_functions.ts         |  8 +++++-
 2 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/app/javascript/mastodon/store/middlewares/errors.ts b/app/javascript/mastodon/store/middlewares/errors.ts
index e11aa7817822a6..977a09a464e04e 100644
--- a/app/javascript/mastodon/store/middlewares/errors.ts
+++ b/app/javascript/mastodon/store/middlewares/errors.ts
@@ -1,16 +1,27 @@
-import { isAction } from '@reduxjs/toolkit';
+import {
+  isAction,
+  isAsyncThunkAction,
+  isRejectedWithValue,
+} from '@reduxjs/toolkit';
 import type { Action, Middleware } from '@reduxjs/toolkit';
 
 import type { RootState } from '..';
 import { showAlertForError } from '../../actions/alerts';
+import type { AsyncThunkRejectValue } from '../typed_functions';
 
 const defaultFailSuffix = 'FAIL';
 const isFailedAction = new RegExp(`${defaultFailSuffix}$`, 'g');
 
-interface ActionWithMaybeAlertParams extends Action {
-  skipAlert?: boolean;
-  skipNotFound?: boolean;
-  error?: unknown;
+interface ActionWithMaybeAlertParams extends Action, AsyncThunkRejectValue {}
+
+interface RejectedAction extends Action {
+  payload: AsyncThunkRejectValue;
+}
+
+function isRejectedActionWithPayload(
+  action: unknown,
+): action is RejectedAction {
+  return isAsyncThunkAction(action) && isRejectedWithValue(action);
 }
 
 function isActionWithmaybeAlertParams(
@@ -23,7 +34,11 @@ export const errorsMiddleware: Middleware<Record<string, never>, RootState> =
   ({ dispatch }) =>
   (next) =>
   (action) => {
-    if (
+    if (isRejectedActionWithPayload(action) && !action.payload.skipAlert) {
+      dispatch(
+        showAlertForError(action.payload.error, action.payload.skipNotFound),
+      );
+    } else if (
       isActionWithmaybeAlertParams(action) &&
       !action.skipAlert &&
       action.type.match(isFailedAction)
diff --git a/app/javascript/mastodon/store/typed_functions.ts b/app/javascript/mastodon/store/typed_functions.ts
index 4859b82651ec75..b66d7545c5dd4c 100644
--- a/app/javascript/mastodon/store/typed_functions.ts
+++ b/app/javascript/mastodon/store/typed_functions.ts
@@ -7,8 +7,14 @@ import type { AppDispatch, RootState } from './store';
 export const useAppDispatch = useDispatch.withTypes<AppDispatch>();
 export const useAppSelector = useSelector.withTypes<RootState>();
 
+export interface AsyncThunkRejectValue {
+  skipAlert?: boolean;
+  skipNotFound?: boolean;
+  error?: unknown;
+}
+
 export const createAppAsyncThunk = createAsyncThunk.withTypes<{
   state: RootState;
   dispatch: AppDispatch;
-  rejectValue: string;
+  rejectValue: AsyncThunkRejectValue;
 }>();

From 430da0316062d3fabfb74dec68bb6de9d42ee750 Mon Sep 17 00:00:00 2001
From: Michael Stanclift <mx@vmstan.com>
Date: Fri, 29 Mar 2024 12:16:51 -0500
Subject: [PATCH 0638/2191] Fix background tint in single column light theme
 (#29803)

---
 app/javascript/styles/mastodon/components.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 3961db50de521e..a86cedfe43ecdd 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -2677,7 +2677,7 @@ $ui-header-logo-wordmark-width: 99px;
 }
 
 .tabs-bar__wrapper {
-  background: var(--background-color-tint);
+  background: var(--background-color);
   backdrop-filter: var(--background-filter);
   position: sticky;
   top: $ui-header-height;

From 90eb4a5d01f1f1e8a76e7dc814eae992a9c1ee16 Mon Sep 17 00:00:00 2001
From: Michael Stanclift <mx@vmstan.com>
Date: Fri, 29 Mar 2024 16:03:30 -0500
Subject: [PATCH 0639/2191] Fix light theme header on mobile (#29809)

---
 app/javascript/styles/mastodon/components.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index a86cedfe43ecdd..216c0dab07cd33 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -2899,7 +2899,7 @@ $ui-header-logo-wordmark-width: 99px;
   .layout-single-column {
     .ui__header {
       display: flex;
-      background: var(--background-color-tint);
+      background: var(--background-color);
       border-bottom: 1px solid var(--background-border-color);
     }
 

From 589e34d00c5bc9a463486e52ec5f51780ff291ac Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 2 Apr 2024 10:53:44 +0200
Subject: [PATCH 0640/2191] Update dependency selenium-webdriver to v4.19.0
 (#29776)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
---
 Gemfile.lock             | 2 +-
 spec/support/capybara.rb | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 5464dbef705eff..74dfd36841cee3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -693,7 +693,7 @@ GEM
     scenic (1.7.0)
       activerecord (>= 4.0.0)
       railties (>= 4.0.0)
-    selenium-webdriver (4.18.1)
+    selenium-webdriver (4.19.0)
       base64 (~> 0.2)
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 3.0)
diff --git a/spec/support/capybara.rb b/spec/support/capybara.rb
index 4aba65b4047a4f..d4f27e209e11a6 100644
--- a/spec/support/capybara.rb
+++ b/spec/support/capybara.rb
@@ -14,7 +14,6 @@
   options = Selenium::WebDriver::Chrome::Options.new
   options.add_argument '--headless=new'
   options.add_argument '--window-size=1680,1050'
-  options.browser_version = '120'
 
   Capybara::Selenium::Driver.new(
     app,

From 173adb04e29faac56258f4b21730ae45aafafb6d Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 2 Apr 2024 08:57:14 +0000
Subject: [PATCH 0641/2191] Update dependency pg to v8.11.4 (#29813)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 52 ++++++++++++++++++----------------------------------
 1 file changed, 18 insertions(+), 34 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index b4e20cf96289c0..4c24f704c83635 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5620,13 +5620,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"buffer-writer@npm:2.0.0":
-  version: 2.0.0
-  resolution: "buffer-writer@npm:2.0.0"
-  checksum: 10c0/c91b2ab09a200cf0862237e5a4dbd5077003b42d26d4f0c596ec7149f82ef83e0751d670bcdf379ed988d1a08c0fac7759a8cb928cf1a4710a1988a7618b1190
-  languageName: node
-  linkType: hard
-
 "buffer-xor@npm:^1.0.3":
   version: 1.0.3
   resolution: "buffer-xor@npm:1.0.3"
@@ -12594,13 +12587,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"packet-reader@npm:1.0.0":
-  version: 1.0.0
-  resolution: "packet-reader@npm:1.0.0"
-  checksum: 10c0/c86c3321bb07e0f03cc2db59f7701184e0bbfcb914f1fdc963993b03262486deb402292adcef39b64e3530ea66b3b2e2163d6da7b3792a730bdd1c6df3175aaa
-  languageName: node
-  linkType: hard
-
 "pako@npm:~1.0.5":
   version: 1.0.11
   resolution: "pako@npm:1.0.11"
@@ -12816,10 +12802,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pg-connection-string@npm:^2.6.0, pg-connection-string@npm:^2.6.2":
-  version: 2.6.2
-  resolution: "pg-connection-string@npm:2.6.2"
-  checksum: 10c0/e8fdea74fcc8bdc3d7c5c6eadd9425fdba7e67fb7fe836f9c0cecad94c8984e435256657d1d8ce0483d1fedef667e7a57e32449a63cb805cb0289fc34b62da35
+"pg-connection-string@npm:^2.6.0, pg-connection-string@npm:^2.6.3":
+  version: 2.6.3
+  resolution: "pg-connection-string@npm:2.6.3"
+  checksum: 10c0/e7eab3a2bb8dec5067fab8a46c90d8f7920946d46ad771a410de3929490c676ee91950424d4405295dd0fde5acbd39ccd99afd603a15d616d0a4a6fa9bf80ad7
   languageName: node
   linkType: hard
 
@@ -12837,19 +12823,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pg-pool@npm:^3.6.1":
-  version: 3.6.1
-  resolution: "pg-pool@npm:3.6.1"
+"pg-pool@npm:^3.6.2":
+  version: 3.6.2
+  resolution: "pg-pool@npm:3.6.2"
   peerDependencies:
     pg: ">=8.0"
-  checksum: 10c0/47837c4e4c2b9e195cec01bd58b6e276acc915537191707ad4d6ed975fd9bc03c73f63cb7fde4cb0e08ed059e35faf60fbd03744dee3af71d4b4631ab40eeb7f
+  checksum: 10c0/14c524549490954b5e48457a4b808df8f619f6deeb3b395b0cd184a8f4ed65a9273fe0697ba0341a41d6745af197f1437eb1cf51fff0cbbf5b0fb3852ebe5392
   languageName: node
   linkType: hard
 
-"pg-protocol@npm:*, pg-protocol@npm:^1.6.0":
-  version: 1.6.0
-  resolution: "pg-protocol@npm:1.6.0"
-  checksum: 10c0/318a4d1e9cebd3927b10a8bc412f5017117a1f9a5fafb628d75847da7d1ab81c33250de58596bd0990029e14e92a995a851286d60fc236692299faf509572213
+"pg-protocol@npm:*, pg-protocol@npm:^1.6.1":
+  version: 1.6.1
+  resolution: "pg-protocol@npm:1.6.1"
+  checksum: 10c0/7eadef4010ac0a3925c460be7332ca4098a5c6d5181725a62193fcfa800000ae6632d98d814f3989b42cf5fdc3b45e34c714a1959d29174e81e30730e140ae5f
   languageName: node
   linkType: hard
 
@@ -12882,15 +12868,13 @@ __metadata:
   linkType: hard
 
 "pg@npm:^8.5.0":
-  version: 8.11.3
-  resolution: "pg@npm:8.11.3"
+  version: 8.11.4
+  resolution: "pg@npm:8.11.4"
   dependencies:
-    buffer-writer: "npm:2.0.0"
-    packet-reader: "npm:1.0.0"
     pg-cloudflare: "npm:^1.1.1"
-    pg-connection-string: "npm:^2.6.2"
-    pg-pool: "npm:^3.6.1"
-    pg-protocol: "npm:^1.6.0"
+    pg-connection-string: "npm:^2.6.3"
+    pg-pool: "npm:^3.6.2"
+    pg-protocol: "npm:^1.6.1"
     pg-types: "npm:^2.1.0"
     pgpass: "npm:1.x"
   peerDependencies:
@@ -12901,7 +12885,7 @@ __metadata:
   peerDependenciesMeta:
     pg-native:
       optional: true
-  checksum: 10c0/07e6967fc8bd5d72bab9be6620626e8e3ab59128ebf56bf0de83d67f10801a19221d88b3317e90b93339ba48d0498b39967b782ae39686aabda6bc647bceb438
+  checksum: 10c0/b3e473c52572be259a7418ee506a0ee9d66121971e73fe8cdf584addb9ef4d34cf66ea5c8a99ad9226c421d31a1848c39225bd201743ddd529276de1dec81e46
   languageName: node
   linkType: hard
 

From 961102338040e9d74bf24ce73e5dd7a0f43a2aaf Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 2 Apr 2024 10:58:00 +0200
Subject: [PATCH 0642/2191] Update dependency postcss-preset-env to v9.5.3
 (#29816)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 276 +++++++++++++++++++++++++++---------------------------
 1 file changed, 138 insertions(+), 138 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 4c24f704c83635..877639d3a7fc6e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1548,10 +1548,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/color-helpers@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "@csstools/color-helpers@npm:4.0.0"
-  checksum: 10c0/fc78871253f8c92789ed64a0e5555bd2873c2b62a49c30baced88487561fe09fe897b0d16fcf7bf2a94f78ff37530773a4395ce5efc016810c094041b5bbcd42
+"@csstools/color-helpers@npm:^4.1.0":
+  version: 4.1.0
+  resolution: "@csstools/color-helpers@npm:4.1.0"
+  checksum: 10c0/0e41fd04dd28361717b161e7000c3a3b64b8b01119e93758297ea0b8a87c04121c3e3ef02e29c56fdd133227dd879163aa4b52e2370853d9fe64af6b6821668d
   languageName: node
   linkType: hard
 
@@ -1565,16 +1565,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/css-color-parser@npm:^1.6.2":
-  version: 1.6.2
-  resolution: "@csstools/css-color-parser@npm:1.6.2"
+"@csstools/css-color-parser@npm:^1.6.3":
+  version: 1.6.3
+  resolution: "@csstools/css-color-parser@npm:1.6.3"
   dependencies:
-    "@csstools/color-helpers": "npm:^4.0.0"
+    "@csstools/color-helpers": "npm:^4.1.0"
     "@csstools/css-calc": "npm:^1.2.0"
   peerDependencies:
     "@csstools/css-parser-algorithms": ^2.6.1
     "@csstools/css-tokenizer": ^2.2.4
-  checksum: 10c0/f587482fd7a40b6bd4cc790771245477d82203ba08f8f85981908680423476b9733c71fb4f1ba655f4dfb77907b4dfbb654dd7ba89e9edf0ba5229c26830ee8f
+  checksum: 10c0/3b15d9974105fe6e5d5e839953ee06153bc308bd62feacdeb88b7da7486ef1625254d0df908c68654596e477ca6be0c312d0c02a62d6dc4bddee61821be17d27
   languageName: node
   linkType: hard
 
@@ -1604,45 +1604,45 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-cascade-layers@npm:^4.0.3":
-  version: 4.0.3
-  resolution: "@csstools/postcss-cascade-layers@npm:4.0.3"
+"@csstools/postcss-cascade-layers@npm:^4.0.4":
+  version: 4.0.4
+  resolution: "@csstools/postcss-cascade-layers@npm:4.0.4"
   dependencies:
-    "@csstools/selector-specificity": "npm:^3.0.2"
+    "@csstools/selector-specificity": "npm:^3.0.3"
     postcss-selector-parser: "npm:^6.0.13"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/63f29af21eed000130f6f1268c00188a52eafbdeccc6acf5aa46507e499259631aa89f928b01b4698c41f3f68703db4c6e363c0e6f64b04b20c7e6452a5b259a
+  checksum: 10c0/87fdd1e3d846e45c2e415f24f66076e04c3c4539e8b802f1114b2a0fef9421d562d9eb61464ba3599d73805555ad8e95c51a8827cb3ddacfda01ec0df4afbfe0
   languageName: node
   linkType: hard
 
-"@csstools/postcss-color-function@npm:^3.0.12":
-  version: 3.0.12
-  resolution: "@csstools/postcss-color-function@npm:3.0.12"
+"@csstools/postcss-color-function@npm:^3.0.13":
+  version: 3.0.13
+  resolution: "@csstools/postcss-color-function@npm:3.0.13"
   dependencies:
-    "@csstools/css-color-parser": "npm:^1.6.2"
+    "@csstools/css-color-parser": "npm:^1.6.3"
     "@csstools/css-parser-algorithms": "npm:^2.6.1"
     "@csstools/css-tokenizer": "npm:^2.2.4"
-    "@csstools/postcss-progressive-custom-properties": "npm:^3.1.1"
+    "@csstools/postcss-progressive-custom-properties": "npm:^3.2.0"
     "@csstools/utilities": "npm:^1.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/a270aef93e98efb2b184b84a5de8acc28b10aed229807d1e5b5cf43309b281782895322ec98c0c9486b306ec68915e06689d6959c13ea2ab37fbb773ecd02335
+  checksum: 10c0/9d0fa25cd258653ad3227ccf1ee89dfee7099284c28b1d9ae7f7e8b15ed526e4e8cc7724f8e21cc073ed186891c3acb5b9c190a75e3c38d9c75e49197a824db6
   languageName: node
   linkType: hard
 
-"@csstools/postcss-color-mix-function@npm:^2.0.12":
-  version: 2.0.12
-  resolution: "@csstools/postcss-color-mix-function@npm:2.0.12"
+"@csstools/postcss-color-mix-function@npm:^2.0.13":
+  version: 2.0.13
+  resolution: "@csstools/postcss-color-mix-function@npm:2.0.13"
   dependencies:
-    "@csstools/css-color-parser": "npm:^1.6.2"
+    "@csstools/css-color-parser": "npm:^1.6.3"
     "@csstools/css-parser-algorithms": "npm:^2.6.1"
     "@csstools/css-tokenizer": "npm:^2.2.4"
-    "@csstools/postcss-progressive-custom-properties": "npm:^3.1.1"
+    "@csstools/postcss-progressive-custom-properties": "npm:^3.2.0"
     "@csstools/utilities": "npm:^1.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/42c7d48eeb1c1e49265505b560b9e034861254c62c5f78d89538255decab67d70f89bf81b269b208aa2103e9f48a51a33bb009eb17774f07c0459929d97f7056
+  checksum: 10c0/6011ce0b328cd3ee1d5720dc6eb23da807ba5a218a4a3c65a4844a82c0ff37e69d27cbee14abf9b928a3068f429ab86f2dd2bebab4ab64cd8fc7e39e562d7073
   languageName: node
   linkType: hard
 
@@ -1671,59 +1671,59 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-gamut-mapping@npm:^1.0.5":
-  version: 1.0.5
-  resolution: "@csstools/postcss-gamut-mapping@npm:1.0.5"
+"@csstools/postcss-gamut-mapping@npm:^1.0.6":
+  version: 1.0.6
+  resolution: "@csstools/postcss-gamut-mapping@npm:1.0.6"
   dependencies:
-    "@csstools/css-color-parser": "npm:^1.6.2"
+    "@csstools/css-color-parser": "npm:^1.6.3"
     "@csstools/css-parser-algorithms": "npm:^2.6.1"
     "@csstools/css-tokenizer": "npm:^2.2.4"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/33e2185ae8f8a229476bd5a60c0523aef8cb4de552a6c532514b9d87bff579f36fb7640dd14c9ea56906996d43f4d5ab969a4f704e1b8a94f7802beb3df31d08
+  checksum: 10c0/a258a2ceac9d9be4374ec5b504895bd1de1196fe7d8c1377863a25c6cb50ee1fb1c65387c5440bae3c5d59e6ebf4e0c1990595c5cd09291224b31a1d23bdc250
   languageName: node
   linkType: hard
 
-"@csstools/postcss-gradients-interpolation-method@npm:^4.0.13":
-  version: 4.0.13
-  resolution: "@csstools/postcss-gradients-interpolation-method@npm:4.0.13"
+"@csstools/postcss-gradients-interpolation-method@npm:^4.0.14":
+  version: 4.0.14
+  resolution: "@csstools/postcss-gradients-interpolation-method@npm:4.0.14"
   dependencies:
-    "@csstools/css-color-parser": "npm:^1.6.2"
+    "@csstools/css-color-parser": "npm:^1.6.3"
     "@csstools/css-parser-algorithms": "npm:^2.6.1"
     "@csstools/css-tokenizer": "npm:^2.2.4"
-    "@csstools/postcss-progressive-custom-properties": "npm:^3.1.1"
+    "@csstools/postcss-progressive-custom-properties": "npm:^3.2.0"
     "@csstools/utilities": "npm:^1.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/af7c2d9c8e2249ea4cc50c9ef1b5ad75b1ed062020f1a8906ba9baf3143c4e2638b8b2189d7552838558e7b9a8a1ee9aa0baa076f5deabb23c1dc90fd78d7eab
+  checksum: 10c0/88147b2d7067b9bc6c90340c0be8450ca1175a7e927ff7b682c26d377237bec12f1cbe0dd930dd72dec661603348d1e71ca2a56f0a3b6fa2ca7d3f1b962f001d
   languageName: node
   linkType: hard
 
-"@csstools/postcss-hwb-function@npm:^3.0.11":
-  version: 3.0.11
-  resolution: "@csstools/postcss-hwb-function@npm:3.0.11"
+"@csstools/postcss-hwb-function@npm:^3.0.12":
+  version: 3.0.12
+  resolution: "@csstools/postcss-hwb-function@npm:3.0.12"
   dependencies:
-    "@csstools/css-color-parser": "npm:^1.6.2"
+    "@csstools/css-color-parser": "npm:^1.6.3"
     "@csstools/css-parser-algorithms": "npm:^2.6.1"
     "@csstools/css-tokenizer": "npm:^2.2.4"
-    "@csstools/postcss-progressive-custom-properties": "npm:^3.1.1"
+    "@csstools/postcss-progressive-custom-properties": "npm:^3.2.0"
     "@csstools/utilities": "npm:^1.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/d779617ef97ff22a125fbdd65f01dd3dd5bc607dbe7f3b02ae808d2fcccb1d5022b7f8e66e64283f7f9c52b6997bf0dc649566c734f0e3e4f3ba3c66a3b564a8
+  checksum: 10c0/20e0b2a4547fe619f38fe56c33974750d4a8b64a67a4169740ee0e67a9dec9f3a243f2370408901aacc35690aa36135028fafbbc866ff934b66cc4c9e4e89cac
   languageName: node
   linkType: hard
 
-"@csstools/postcss-ic-unit@npm:^3.0.5":
-  version: 3.0.5
-  resolution: "@csstools/postcss-ic-unit@npm:3.0.5"
+"@csstools/postcss-ic-unit@npm:^3.0.6":
+  version: 3.0.6
+  resolution: "@csstools/postcss-ic-unit@npm:3.0.6"
   dependencies:
-    "@csstools/postcss-progressive-custom-properties": "npm:^3.1.1"
+    "@csstools/postcss-progressive-custom-properties": "npm:^3.2.0"
     "@csstools/utilities": "npm:^1.0.0"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/bf21b74e1bdff425481724a36385f1ebe7c8aea6cccfcf6715cad58449d2d19419342e94d33d6626ec09bed8d4ab6e391b8eebaa3bda721e7f41e5c64c485f2a
+  checksum: 10c0/a4b962327d433419fdcfdcf620ce6a5cf09aa3c93029ad08b035df1e2bc35caae31de49f1d14218de0656fced35c0d2e07e5ff7b8099c29dbfb40395fc283234
   languageName: node
   linkType: hard
 
@@ -1736,29 +1736,29 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-is-pseudo-class@npm:^4.0.5":
-  version: 4.0.5
-  resolution: "@csstools/postcss-is-pseudo-class@npm:4.0.5"
+"@csstools/postcss-is-pseudo-class@npm:^4.0.6":
+  version: 4.0.6
+  resolution: "@csstools/postcss-is-pseudo-class@npm:4.0.6"
   dependencies:
-    "@csstools/selector-specificity": "npm:^3.0.2"
+    "@csstools/selector-specificity": "npm:^3.0.3"
     postcss-selector-parser: "npm:^6.0.13"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/5f35d5474957be30f54b89cf46b818390754af8094c4d9a083a79d579ccd817452bb7e2cfef8951c664d4c6ba381d8d45cd89f49339a42941f947ccb032f9d45
+  checksum: 10c0/aa071954e08dc9368fbeddbec6a8da2dea3a771b33bad53f67f3bc5a6b2f0a270909948f3e7b29ec885f4cceee245f16388809aeb0620284a1d66ad1f2026f28
   languageName: node
   linkType: hard
 
-"@csstools/postcss-light-dark-function@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "@csstools/postcss-light-dark-function@npm:1.0.1"
+"@csstools/postcss-light-dark-function@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "@csstools/postcss-light-dark-function@npm:1.0.2"
   dependencies:
     "@csstools/css-parser-algorithms": "npm:^2.6.1"
     "@csstools/css-tokenizer": "npm:^2.2.4"
-    "@csstools/postcss-progressive-custom-properties": "npm:^3.1.1"
+    "@csstools/postcss-progressive-custom-properties": "npm:^3.2.0"
     "@csstools/utilities": "npm:^1.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/538e809b473b91245cb79418949c4a27c0e82b0ea357f9c93b054e07d3194857e53979693226be9448904a7d9d4ad4732ad34183db82927bb172fe6cab1e53a8
+  checksum: 10c0/c7ed0037e68aa6ede2440a598caa776812e602e12f69d0fd8f0975cf3469a3593bd34fd408ed7d0b73af2ae4498bd6334cb3222fedb2a432a9ab8fa731e07108
   languageName: node
   linkType: hard
 
@@ -1862,44 +1862,44 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-oklab-function@npm:^3.0.12":
-  version: 3.0.12
-  resolution: "@csstools/postcss-oklab-function@npm:3.0.12"
+"@csstools/postcss-oklab-function@npm:^3.0.13":
+  version: 3.0.13
+  resolution: "@csstools/postcss-oklab-function@npm:3.0.13"
   dependencies:
-    "@csstools/css-color-parser": "npm:^1.6.2"
+    "@csstools/css-color-parser": "npm:^1.6.3"
     "@csstools/css-parser-algorithms": "npm:^2.6.1"
     "@csstools/css-tokenizer": "npm:^2.2.4"
-    "@csstools/postcss-progressive-custom-properties": "npm:^3.1.1"
+    "@csstools/postcss-progressive-custom-properties": "npm:^3.2.0"
     "@csstools/utilities": "npm:^1.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/1454f57c756bdc882a523b50634823a0c31d7adc35330e13c80f9573c287f2a4ab30bbce48e0e8788dfe5a293d55113db2205373523b202a8828b9088e55e51c
+  checksum: 10c0/26915f65ccc8b631a08542c4b088f9e5155f95a6c1f3a6bd2a33207f96d33438b930de60f493a5bbfee1b9f2abc8dfcab3ecbf20b5c7445d729fc434234fb046
   languageName: node
   linkType: hard
 
-"@csstools/postcss-progressive-custom-properties@npm:^3.1.1":
-  version: 3.1.1
-  resolution: "@csstools/postcss-progressive-custom-properties@npm:3.1.1"
+"@csstools/postcss-progressive-custom-properties@npm:^3.2.0":
+  version: 3.2.0
+  resolution: "@csstools/postcss-progressive-custom-properties@npm:3.2.0"
   dependencies:
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/9303296c8285a8154d2ee22d5a1330c94c5f361d277a1fd27172e868e3511619a6876538beacae0c9e925a9d1e81a32438d405526170faa84cad0c2d2159fdd2
+  checksum: 10c0/829880844fbbeef1c67e0b380057e574659b4caed38c8414c17d7eb4a0cc727afa1cd74a889bc7ca79c819ecae757810356706901cf6bb677a36ca123915cbb7
   languageName: node
   linkType: hard
 
-"@csstools/postcss-relative-color-syntax@npm:^2.0.12":
-  version: 2.0.12
-  resolution: "@csstools/postcss-relative-color-syntax@npm:2.0.12"
+"@csstools/postcss-relative-color-syntax@npm:^2.0.13":
+  version: 2.0.13
+  resolution: "@csstools/postcss-relative-color-syntax@npm:2.0.13"
   dependencies:
-    "@csstools/css-color-parser": "npm:^1.6.2"
+    "@csstools/css-color-parser": "npm:^1.6.3"
     "@csstools/css-parser-algorithms": "npm:^2.6.1"
     "@csstools/css-tokenizer": "npm:^2.2.4"
-    "@csstools/postcss-progressive-custom-properties": "npm:^3.1.1"
+    "@csstools/postcss-progressive-custom-properties": "npm:^3.2.0"
     "@csstools/utilities": "npm:^1.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/e12a59b89372fbc5cc460cfeceeea2ddc8b7a8f5639a767dbd6c7ff799bf740ac5dd7ae6797703f74efeadd696801042bff8770117cf5ed70646dcc598637334
+  checksum: 10c0/5c9fdec029e3d9a5c688d2e04995fec0cf6d91b48dbc5f450cf9c9dbb45e2819afbd63b3279676087a13f54914b0ec7d005e478b70b43e94fc8eeef9c5973390
   languageName: node
   linkType: hard
 
@@ -1927,15 +1927,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-text-decoration-shorthand@npm:^3.0.4":
-  version: 3.0.4
-  resolution: "@csstools/postcss-text-decoration-shorthand@npm:3.0.4"
+"@csstools/postcss-text-decoration-shorthand@npm:^3.0.5":
+  version: 3.0.5
+  resolution: "@csstools/postcss-text-decoration-shorthand@npm:3.0.5"
   dependencies:
-    "@csstools/color-helpers": "npm:^4.0.0"
+    "@csstools/color-helpers": "npm:^4.1.0"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/2e17535bbeed8ca5f095e6aecfb552004c1920597f16146fe6ec773b46af95f9e0e3cf77181d4216a23528de8e042bd85f82df1562447f52e7687ed8628f0adc
+  checksum: 10c0/e7e08c643c7084e60c0b22982e00ce21c579af3810ebbebac6838801b2ac622026ce96fd0cbca785613b1559f2337833cfc0f525685f8543ee39078a32fd7f89
   languageName: node
   linkType: hard
 
@@ -1970,12 +1970,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/selector-specificity@npm:^3.0.2":
-  version: 3.0.2
-  resolution: "@csstools/selector-specificity@npm:3.0.2"
+"@csstools/selector-specificity@npm:^3.0.2, @csstools/selector-specificity@npm:^3.0.3":
+  version: 3.0.3
+  resolution: "@csstools/selector-specificity@npm:3.0.3"
   peerDependencies:
     postcss-selector-parser: ^6.0.13
-  checksum: 10c0/d0c7dae2f1e9536e3e17f00467320a704f3208c76283c29c57fd69d4b83dcf6d062f492ed687c5ffd5f47fada9f0657c2efc89ea18fd4b038f757669553e0095
+  checksum: 10c0/e4f0355165882ddde8bd4a2f0252868150e67b9fae927fd2d94a91cee31e438e7041059f20b9c755a93b0bd8e527a9f78b01168fe67b3539be32091240aa63bf
   languageName: node
   linkType: hard
 
@@ -5045,7 +5045,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"autoprefixer@npm:^10.4.14, autoprefixer@npm:^10.4.18":
+"autoprefixer@npm:^10.4.14, autoprefixer@npm:^10.4.19":
   version: 10.4.19
   resolution: "autoprefixer@npm:10.4.19"
   dependencies:
@@ -6512,16 +6512,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"css-has-pseudo@npm:^6.0.2":
-  version: 6.0.2
-  resolution: "css-has-pseudo@npm:6.0.2"
+"css-has-pseudo@npm:^6.0.3":
+  version: 6.0.3
+  resolution: "css-has-pseudo@npm:6.0.3"
   dependencies:
-    "@csstools/selector-specificity": "npm:^3.0.2"
+    "@csstools/selector-specificity": "npm:^3.0.3"
     postcss-selector-parser: "npm:^6.0.13"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/96f9a6a4f31e11797e583d458535e11fa513b3f1f430ab566964a2f0792eaaa543213598b0a509516f07464234348ab11d56448b6d0c0c8a36988e0c86cf4ca1
+  checksum: 10c0/bbe663eff5256233c7bcce256cd8de7d93d82f2d4f2ca104af8e39e2159170d67746d3a2954385d03ec4ea7ef2728fe9a7d8cb62c52c0a6df1ad3d3bb1e3439d
   languageName: node
   linkType: hard
 
@@ -6647,10 +6647,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cssdb@npm:^7.11.1":
-  version: 7.11.2
-  resolution: "cssdb@npm:7.11.2"
-  checksum: 10c0/5cd8dfee703dfbd7b7a8c3a93d65d26007ec1cd9692379b5868a0ceedf23b88e28d4b98f1cb9a4161f8b01e4a229e08ba9603fb94b756a3df6e07c423fff5b5d
+"cssdb@npm:^8.0.0":
+  version: 8.0.0
+  resolution: "cssdb@npm:8.0.0"
+  checksum: 10c0/d9a31b760214624352000b16a8f7194c357f66b6c445e663ab58dd03b6f0f53efaaca6d6f96200d666e205894d2d1c346664ad993d9522ff9fc1c331804a8d62
   languageName: node
   linkType: hard
 
@@ -13116,18 +13116,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-color-functional-notation@npm:^6.0.7":
-  version: 6.0.7
-  resolution: "postcss-color-functional-notation@npm:6.0.7"
+"postcss-color-functional-notation@npm:^6.0.8":
+  version: 6.0.8
+  resolution: "postcss-color-functional-notation@npm:6.0.8"
   dependencies:
-    "@csstools/css-color-parser": "npm:^1.6.2"
+    "@csstools/css-color-parser": "npm:^1.6.3"
     "@csstools/css-parser-algorithms": "npm:^2.6.1"
     "@csstools/css-tokenizer": "npm:^2.2.4"
-    "@csstools/postcss-progressive-custom-properties": "npm:^3.1.1"
+    "@csstools/postcss-progressive-custom-properties": "npm:^3.2.0"
     "@csstools/utilities": "npm:^1.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/bd3c1831e885f395205d503bf4b24f462dc9f4af74be11c5b0ad7b09eb150b2d3f8b2c727ab9e67c474ff05baa8e8e3c950880ffe2085ed39794d308c0297667
+  checksum: 10c0/ae2ff7769970fb403ea71d5613e041d97bb647cfc54e4a428bcc75f98ff06c888b064384df12b18f609bfcc4395c31d6db4ad2b9c9385a829ba594d2692c31d1
   languageName: node
   linkType: hard
 
@@ -13271,16 +13271,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-double-position-gradients@npm:^5.0.5":
-  version: 5.0.5
-  resolution: "postcss-double-position-gradients@npm:5.0.5"
+"postcss-double-position-gradients@npm:^5.0.6":
+  version: 5.0.6
+  resolution: "postcss-double-position-gradients@npm:5.0.6"
   dependencies:
-    "@csstools/postcss-progressive-custom-properties": "npm:^3.1.1"
+    "@csstools/postcss-progressive-custom-properties": "npm:^3.2.0"
     "@csstools/utilities": "npm:^1.0.0"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/02c22ca055ceca1ecc3c6888eab5c84769c9df37f59855f0ff9e9faaedcb4acf6818e927bff18bd57df161045f775ecca4142b13f968332419976c556a769995
+  checksum: 10c0/9b24b13043fe506c0ddd94e707fe4f21f4f9a6c05ca49a4f45e23412951fd6a4cfa0095002d10b322ca8be60df0badae3715a27eefdeb7bf8da4fdd1ecd5d7a2
   languageName: node
   linkType: hard
 
@@ -13336,18 +13336,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-lab-function@npm:^6.0.12":
-  version: 6.0.12
-  resolution: "postcss-lab-function@npm:6.0.12"
+"postcss-lab-function@npm:^6.0.13":
+  version: 6.0.13
+  resolution: "postcss-lab-function@npm:6.0.13"
   dependencies:
-    "@csstools/css-color-parser": "npm:^1.6.2"
+    "@csstools/css-color-parser": "npm:^1.6.3"
     "@csstools/css-parser-algorithms": "npm:^2.6.1"
     "@csstools/css-tokenizer": "npm:^2.2.4"
-    "@csstools/postcss-progressive-custom-properties": "npm:^3.1.1"
+    "@csstools/postcss-progressive-custom-properties": "npm:^3.2.0"
     "@csstools/utilities": "npm:^1.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/1c96c19d0487346445749777df2af7cc828f3e3c4e8a435cac250d03c14efb0d14ee994ac58d966ed07f8f07aa297f0e3311248b78ba1e816bb18386e435a83c
+  checksum: 10c0/3ffb82d0012e49df49b44f38a131f4b13ba3edeeca5ecc0062c1c1b6bd8961c06f05b1dd8ec620c50c2c406fc61a505d79488745185d69ed325603600f0a1bc8
   languageName: node
   linkType: hard
 
@@ -13503,16 +13503,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-nesting@npm:^12.1.0":
-  version: 12.1.0
-  resolution: "postcss-nesting@npm:12.1.0"
+"postcss-nesting@npm:^12.1.1":
+  version: 12.1.1
+  resolution: "postcss-nesting@npm:12.1.1"
   dependencies:
     "@csstools/selector-resolve-nested": "npm:^1.1.0"
-    "@csstools/selector-specificity": "npm:^3.0.2"
+    "@csstools/selector-specificity": "npm:^3.0.3"
     postcss-selector-parser: "npm:^6.0.13"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/87902723214ec33a81520f51cce1e52f52c02272f2b7838d3aaa795e226104bf4809ef9dad8840f43852c1f229afb5f480ab1f20c7677bd021cf57739b625871
+  checksum: 10c0/8fac718e69ee2ac93179cc59810a8184581c04715fe34621ec5d504fc680cad4a11219ed0c918cbe15c468994c9aba88e729f35eef698c5d44cadd824425c47d
   languageName: node
   linkType: hard
 
@@ -13667,21 +13667,21 @@ __metadata:
   linkType: hard
 
 "postcss-preset-env@npm:^9.5.2":
-  version: 9.5.2
-  resolution: "postcss-preset-env@npm:9.5.2"
+  version: 9.5.3
+  resolution: "postcss-preset-env@npm:9.5.3"
   dependencies:
-    "@csstools/postcss-cascade-layers": "npm:^4.0.3"
-    "@csstools/postcss-color-function": "npm:^3.0.12"
-    "@csstools/postcss-color-mix-function": "npm:^2.0.12"
+    "@csstools/postcss-cascade-layers": "npm:^4.0.4"
+    "@csstools/postcss-color-function": "npm:^3.0.13"
+    "@csstools/postcss-color-mix-function": "npm:^2.0.13"
     "@csstools/postcss-exponential-functions": "npm:^1.0.5"
     "@csstools/postcss-font-format-keywords": "npm:^3.0.2"
-    "@csstools/postcss-gamut-mapping": "npm:^1.0.5"
-    "@csstools/postcss-gradients-interpolation-method": "npm:^4.0.13"
-    "@csstools/postcss-hwb-function": "npm:^3.0.11"
-    "@csstools/postcss-ic-unit": "npm:^3.0.5"
+    "@csstools/postcss-gamut-mapping": "npm:^1.0.6"
+    "@csstools/postcss-gradients-interpolation-method": "npm:^4.0.14"
+    "@csstools/postcss-hwb-function": "npm:^3.0.12"
+    "@csstools/postcss-ic-unit": "npm:^3.0.6"
     "@csstools/postcss-initial": "npm:^1.0.1"
-    "@csstools/postcss-is-pseudo-class": "npm:^4.0.5"
-    "@csstools/postcss-light-dark-function": "npm:^1.0.1"
+    "@csstools/postcss-is-pseudo-class": "npm:^4.0.6"
+    "@csstools/postcss-light-dark-function": "npm:^1.0.2"
     "@csstools/postcss-logical-float-and-clear": "npm:^2.0.1"
     "@csstools/postcss-logical-overflow": "npm:^1.0.1"
     "@csstools/postcss-logical-overscroll-behavior": "npm:^1.0.1"
@@ -13691,38 +13691,38 @@ __metadata:
     "@csstools/postcss-media-queries-aspect-ratio-number-values": "npm:^2.0.7"
     "@csstools/postcss-nested-calc": "npm:^3.0.2"
     "@csstools/postcss-normalize-display-values": "npm:^3.0.2"
-    "@csstools/postcss-oklab-function": "npm:^3.0.12"
-    "@csstools/postcss-progressive-custom-properties": "npm:^3.1.1"
-    "@csstools/postcss-relative-color-syntax": "npm:^2.0.12"
+    "@csstools/postcss-oklab-function": "npm:^3.0.13"
+    "@csstools/postcss-progressive-custom-properties": "npm:^3.2.0"
+    "@csstools/postcss-relative-color-syntax": "npm:^2.0.13"
     "@csstools/postcss-scope-pseudo-class": "npm:^3.0.1"
     "@csstools/postcss-stepped-value-functions": "npm:^3.0.6"
-    "@csstools/postcss-text-decoration-shorthand": "npm:^3.0.4"
+    "@csstools/postcss-text-decoration-shorthand": "npm:^3.0.5"
     "@csstools/postcss-trigonometric-functions": "npm:^3.0.6"
     "@csstools/postcss-unset-value": "npm:^3.0.1"
-    autoprefixer: "npm:^10.4.18"
+    autoprefixer: "npm:^10.4.19"
     browserslist: "npm:^4.22.3"
     css-blank-pseudo: "npm:^6.0.1"
-    css-has-pseudo: "npm:^6.0.2"
+    css-has-pseudo: "npm:^6.0.3"
     css-prefers-color-scheme: "npm:^9.0.1"
-    cssdb: "npm:^7.11.1"
+    cssdb: "npm:^8.0.0"
     postcss-attribute-case-insensitive: "npm:^6.0.3"
     postcss-clamp: "npm:^4.1.0"
-    postcss-color-functional-notation: "npm:^6.0.7"
+    postcss-color-functional-notation: "npm:^6.0.8"
     postcss-color-hex-alpha: "npm:^9.0.4"
     postcss-color-rebeccapurple: "npm:^9.0.3"
     postcss-custom-media: "npm:^10.0.4"
     postcss-custom-properties: "npm:^13.3.6"
     postcss-custom-selectors: "npm:^7.1.8"
     postcss-dir-pseudo-class: "npm:^8.0.1"
-    postcss-double-position-gradients: "npm:^5.0.5"
+    postcss-double-position-gradients: "npm:^5.0.6"
     postcss-focus-visible: "npm:^9.0.1"
     postcss-focus-within: "npm:^8.0.1"
     postcss-font-variant: "npm:^5.0.0"
     postcss-gap-properties: "npm:^5.0.1"
     postcss-image-set-function: "npm:^6.0.3"
-    postcss-lab-function: "npm:^6.0.12"
+    postcss-lab-function: "npm:^6.0.13"
     postcss-logical: "npm:^7.0.1"
-    postcss-nesting: "npm:^12.1.0"
+    postcss-nesting: "npm:^12.1.1"
     postcss-opacity-percentage: "npm:^2.0.0"
     postcss-overflow-shorthand: "npm:^5.0.1"
     postcss-page-break: "npm:^3.0.4"
@@ -13732,7 +13732,7 @@ __metadata:
     postcss-selector-not: "npm:^7.0.2"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/40f94472f2d940cbf1df9974bea29a76ada4c1285b97e7104c0cdf001fcafd0a1f5966822250df0d659ec0ea51e577a1ab78c9f5f8a5683ea9897efe043515c1
+  checksum: 10c0/0f6ed8ec9dc5365d1ca1d29652464f2cfebb6b39dfe39b55712c9251addde3289702ea37e1731da5b16bb70f2fb871d165bb0d33452506fa9121e5f696b63d34
   languageName: node
   linkType: hard
 

From b58666e12e2ca70ce4fa5b6b4fdb821333e4263e Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 2 Apr 2024 08:59:05 +0000
Subject: [PATCH 0643/2191] Update dependency @reduxjs/toolkit to v2.2.3
 (#29817)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 877639d3a7fc6e..4404b24a070fd7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3012,8 +3012,8 @@ __metadata:
   linkType: hard
 
 "@reduxjs/toolkit@npm:^2.0.1":
-  version: 2.2.2
-  resolution: "@reduxjs/toolkit@npm:2.2.2"
+  version: 2.2.3
+  resolution: "@reduxjs/toolkit@npm:2.2.3"
   dependencies:
     immer: "npm:^10.0.3"
     redux: "npm:^5.0.1"
@@ -3027,7 +3027,7 @@ __metadata:
       optional: true
     react-redux:
       optional: true
-  checksum: 10c0/d749181b1bc071698517cba7ce05c42ddfe99363019249722b4dfa3afc71b3a6e4cb9885af574cf81c5d6515f68201ebfedddb5c14b262c941a45112fdc66ce3
+  checksum: 10c0/f10f2c8f4b6c5c7a65d8d60246bdfde86b6cd2f542210ebdda8002223c7f4e99ed32964825e63f37345d9d12532671150fcec2809a40690931ae44afe8aba7f8
   languageName: node
   linkType: hard
 

From 2f7a2d4df702c45022c3e0ea8c349abf4cc9680a Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 2 Apr 2024 10:59:26 +0200
Subject: [PATCH 0644/2191] Update DefinitelyTyped types (non-major) (#29818)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 4404b24a070fd7..50811106799a5e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3746,11 +3746,11 @@ __metadata:
   linkType: hard
 
 "@types/react-dom@npm:^18.0.0, @types/react-dom@npm:^18.2.4":
-  version: 18.2.22
-  resolution: "@types/react-dom@npm:18.2.22"
+  version: 18.2.23
+  resolution: "@types/react-dom@npm:18.2.23"
   dependencies:
     "@types/react": "npm:*"
-  checksum: 10c0/cd85b5f402126e44b8c7b573e74737389816abcc931b2b14d8f946ba81cce8637ea490419488fcae842efb1e2f69853bc30522e43fd8359e1007d4d14b8d8146
+  checksum: 10c0/9348e93558aa67b4b237bd0eab62e72e85f3e17a1c45fde04d874476269730f7c671b3d62390c4fca588da2a026e90cc74148abc349dbfd4ee5535a82ccdf38e
   languageName: node
   linkType: hard
 
@@ -3849,13 +3849,12 @@ __metadata:
   linkType: hard
 
 "@types/react@npm:*, @types/react@npm:16 || 17 || 18, @types/react@npm:>=16.9.11, @types/react@npm:^18.2.7":
-  version: 18.2.70
-  resolution: "@types/react@npm:18.2.70"
+  version: 18.2.73
+  resolution: "@types/react@npm:18.2.73"
   dependencies:
     "@types/prop-types": "npm:*"
-    "@types/scheduler": "npm:*"
     csstype: "npm:^3.0.2"
-  checksum: 10c0/2107b1fa8963cabe33d981cf1c0e3b7534c9d12b98c1046cd9f7975851690a0780db011f6a1d637ae4e612ef00c94ebdbe76a9e2f9e0f3baa6aad3213932af41
+  checksum: 10c0/b6645ab3c20efa41cfccf58ce0be45419517a0ba4594e323dd400342fb1c1f9589d169cf9bfa85b5b0605e9097fe9de7734b6d0c533f5b9bc32aaadb624537a4
   languageName: node
   linkType: hard
 
@@ -3885,13 +3884,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/scheduler@npm:*":
-  version: 0.16.5
-  resolution: "@types/scheduler@npm:0.16.5"
-  checksum: 10c0/625b63cd5dcaf6fb88fe03aa7c797f28cb121f03584126d4811b2d03f39bc3e238ce52cf7685ad8adfe8445d679934e6be47347723a6771ca2058c01f0c33760
-  languageName: node
-  linkType: hard
-
 "@types/semver@npm:^7.5.0":
   version: 7.5.4
   resolution: "@types/semver@npm:7.5.4"

From a4158be4d7a8fb599c89cea1544a7e712e179c41 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 2 Apr 2024 08:59:52 +0000
Subject: [PATCH 0645/2191] Update devDependencies (non-major) (#29819)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 50811106799a5e..e58a030c36e6b7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2199,16 +2199,16 @@ __metadata:
   linkType: hard
 
 "@formatjs/cli@npm:^6.1.1":
-  version: 6.2.8
-  resolution: "@formatjs/cli@npm:6.2.8"
+  version: 6.2.9
+  resolution: "@formatjs/cli@npm:6.2.9"
   peerDependencies:
-    vue: ^3.3.4
+    vue: ^3.4.0
   peerDependenciesMeta:
     vue:
       optional: true
   bin:
     formatjs: bin/formatjs
-  checksum: 10c0/5d8f95434f4522eee7dd3acf54e5265289ec7e72812448cd7c7547bdedaba8927719800dfa2fc92fb82c609f34255367a80d18bf6c064540d5e11ec6b9d4603e
+  checksum: 10c0/498383bcdca7f8f8a748c1151be17392f71eb1861f6a23bc714280533167cba7cdc35a470a380113f6111236e721ff43cbee7b084939dac67b6a5d9b04c0587c
   languageName: node
   linkType: hard
 
@@ -16418,8 +16418,8 @@ __metadata:
   linkType: hard
 
 "stylelint@npm:^16.0.2":
-  version: 16.3.0
-  resolution: "stylelint@npm:16.3.0"
+  version: 16.3.1
+  resolution: "stylelint@npm:16.3.1"
   dependencies:
     "@csstools/css-parser-algorithms": "npm:^2.6.1"
     "@csstools/css-tokenizer": "npm:^2.2.4"
@@ -16462,7 +16462,7 @@ __metadata:
     write-file-atomic: "npm:^5.0.1"
   bin:
     stylelint: bin/stylelint.mjs
-  checksum: 10c0/98bf770078d727eb7c3ec0932b09c9486481f2d086ea1f4232e00bd1bf58b6b5d3a8d6fc9802df05380cdb06b3d97c5a7c4f27adb221b2a5707ea9829c0ee350
+  checksum: 10c0/1660bb359002ff8e07cea044018b13abc73f48cf02a5062953b086f4d58611cd10677787560774c1acabeb192b6d059ce7fcf4c11defa7f64e50dca908fc664f
   languageName: node
   linkType: hard
 

From 143d9553fa0187b9950a802cdedaea5c8cd12f75 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 2 Apr 2024 11:15:24 +0200
Subject: [PATCH 0646/2191] Update dependency fastimage to v2.3.1 (#29822)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 74dfd36841cee3..bd15ad73a2510e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -273,7 +273,7 @@ GEM
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
     fast_blank (1.0.1)
-    fastimage (2.3.0)
+    fastimage (2.3.1)
     ffi (1.16.3)
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)

From fa9574086d1b2cc16a733cd60677054c67eed48d Mon Sep 17 00:00:00 2001
From: Michael Stanclift <mx@vmstan.com>
Date: Tue, 2 Apr 2024 04:15:31 -0500
Subject: [PATCH 0647/2191] Fix search box color on light theme (#29808)

---
 app/javascript/styles/mastodon-light/diff.scss | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/javascript/styles/mastodon-light/diff.scss b/app/javascript/styles/mastodon-light/diff.scss
index 493e377d610023..1de90e00160ebf 100644
--- a/app/javascript/styles/mastodon-light/diff.scss
+++ b/app/javascript/styles/mastodon-light/diff.scss
@@ -80,6 +80,7 @@ html {
 }
 
 .search__input,
+.search__popout,
 .setting-text,
 .report-dialog-modal__textarea,
 .audio-player {
@@ -439,7 +440,8 @@ html {
 .directory__tag > div,
 .card > a,
 .page-header,
-.compose-form .compose-form__warning {
+.compose-form,
+.compose-form__warning {
   box-shadow: none;
 }
 
@@ -475,12 +477,17 @@ html {
   color: $white;
 }
 
-.compose-form .spoiler-input__input {
+.compose-form,
+.spoiler-input__input,
+.search__input,
+.search__popout {
   color: lighten($ui-highlight-color, 8%);
 }
 
 .compose-form .autosuggest-textarea__textarea,
 .compose-form__highlightable,
+.search__input,
+.search__popout,
 .poll__option input[type='text'] {
   background: darken($ui-base-color, 10%);
 }

From c717747603d759c01d638b99146add55d4aa1561 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 2 Apr 2024 11:26:06 +0200
Subject: [PATCH 0648/2191] New Crowdin Translations (automated) (#29812)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/et.json    |  39 +++++
 app/javascript/mastodon/locales/ia.json    | 168 ++++++++++++---------
 app/javascript/mastodon/locales/ie.json    |  41 +++++
 app/javascript/mastodon/locales/it.json    |  20 +--
 app/javascript/mastodon/locales/ja.json    |  13 ++
 app/javascript/mastodon/locales/lad.json   |   3 +
 app/javascript/mastodon/locales/ru.json    |  58 +++++++
 app/javascript/mastodon/locales/sv.json    |  16 ++
 app/javascript/mastodon/locales/zh-TW.json |   2 +-
 config/locales/activerecord.ia.yml         |   6 +
 config/locales/devise.de.yml               |   4 +-
 config/locales/es-MX.yml                   |   2 +-
 config/locales/et.yml                      |  20 +++
 config/locales/ia.yml                      |  13 ++
 config/locales/ie.yml                      |  16 ++
 config/locales/it.yml                      |   2 +-
 config/locales/lad.yml                     |   4 +
 config/locales/simple_form.et.yml          |   2 +
 config/locales/simple_form.ia.yml          |   7 +
 config/locales/simple_form.ie.yml          |   2 +
 20 files changed, 355 insertions(+), 83 deletions(-)

diff --git a/app/javascript/mastodon/locales/et.json b/app/javascript/mastodon/locales/et.json
index f617ced6ea8386..74f3f560d42feb 100644
--- a/app/javascript/mastodon/locales/et.json
+++ b/app/javascript/mastodon/locales/et.json
@@ -92,7 +92,11 @@
   "block_modal.remote_users_caveat": "Serverile {domain} edastatakse palve otsust järgida. Ometi pole see tagatud, kuna mõned serverid võivad blokeeringuid käsitleda omal moel. Avalikud postitused võivad tuvastamata kasutajatele endiselt näha olla.",
   "block_modal.show_less": "Kuva vähem",
   "block_modal.show_more": "Kuva rohkem",
+  "block_modal.they_cant_mention": "Ta ei saa mainida sind ega jälgida.",
+  "block_modal.they_cant_see_posts": "Ta ei näe sinu postitusi ja sa ei näe tema omi.",
+  "block_modal.they_will_know": "Ta näeb, et ta on blokeeritud.",
   "block_modal.title": "Blokeeri kasutaja?",
+  "block_modal.you_wont_see_mentions": "Sa ei näe postitusi, mis mainivad teda.",
   "boost_modal.combo": "Vajutades {combo}, saab selle edaspidi vahele jätta",
   "bundle_column_error.copy_stacktrace": "Kopeeri veateade",
   "bundle_column_error.error.body": "Soovitud lehte ei õnnestunud esitada. See võib olla meie koodiviga või probleem brauseri ühilduvusega.",
@@ -206,8 +210,26 @@
   "dismissable_banner.explore_tags": "Need sildid siit ja teistes serveritest detsentraliseeritud võrgus koguvad tähelepanu just praegu selles serveris.",
   "dismissable_banner.public_timeline": "Need on kõige uuemad avalikud postitused inimestelt sotsiaalvõrgustikus, mida {domain} inimesed jälgivad.",
   "domain_block_modal.block": "Blokeeri server",
+  "domain_block_modal.block_account_instead": "Selle asemel blokeeri @{name}",
+  "domain_block_modal.they_can_interact_with_old_posts": "Inimesed sellest serverist saavad interakteeruda sinu vanade postitustega.",
+  "domain_block_modal.they_cant_follow": "Sellest serverist ei saa keegi sind jälgida.",
+  "domain_block_modal.they_wont_know": "Nad ei tea, et nad on blokeeritud.",
+  "domain_block_modal.title": "Blokeerida domeen?",
+  "domain_block_modal.you_will_lose_followers": "Kõik sinu sellest serverist pärit jälgijad eemaldatakse.",
+  "domain_block_modal.you_wont_see_posts": "Sa ei näe selle serveri kasutajate postitusi ega teavitusi.",
+  "domain_pill.activitypub_lets_connect": "See võimaldab sul ühenduda inimestega ja nendega suhelda mitte ainult Mastodonis, vaid ka teistes suhtlusrakendustes.",
+  "domain_pill.activitypub_like_language": "ActivityPub on nagu keel, mida Mastodon räägib teiste suhtlusvõrgustikega.",
   "domain_pill.server": "Server",
+  "domain_pill.their_handle": "Tema tunnus:",
+  "domain_pill.their_server": "Tema digitaalne kodu, kus kõik tema postitused on.",
+  "domain_pill.their_username": "Tema unikaalne tunnus tema serveris. On võimalik, et mingites teistes serverites on sama kasutajanimega kasutajaid.",
   "domain_pill.username": "Kasutajanimi",
+  "domain_pill.whats_in_a_handle": "Mis on tunnuses?",
+  "domain_pill.who_they_are": "Kuna tunnus ütleb, kes keegi on ja kus, saad suhelda inimestega üle <button>ActivityPub-poolt toetatud sotsiaalvõrkude platvormide</button>.",
+  "domain_pill.who_you_are": "Kuna tunnus ütleb, kes sa oled ja kus, saavad inimesed sinuga suhelda üle <button>ActivityPub-poolt toetatud sotsiaalvõrkude platvormide</button>.",
+  "domain_pill.your_handle": "Sinu tunnus:",
+  "domain_pill.your_server": "Sinu digitaalne kodu, kus on kõik sinu postitused. Sulle ei meeldi see? Vaheta mistahes ajal serverit ja võta jälgijad ka.",
+  "domain_pill.your_username": "Sinu unikaalne identifikaator siin serveris. On võimalik, et leiad teistes serverites samasuguse kasutajanimega kasutajaid.",
   "embed.instructions": "Lisa see postitus oma veebilehele, kopeerides alloleva koodi.",
   "embed.preview": "Nii näeb see välja:",
   "emoji_button.activity": "Tegevus",
@@ -244,6 +266,7 @@
   "empty_column.list": "Siin loetelus pole veel midagi. Kui loetelu liikmed teevad uusi postitusi, näed neid siin.",
   "empty_column.lists": "Pole veel ühtegi nimekirja. Kui lood mõne, näed neid siin.",
   "empty_column.mutes": "Sa pole veel ühtegi kasutajat vaigistanud.",
+  "empty_column.notification_requests": "Kõik tühi! Siin pole mitte midagi. Kui saad uusi teavitusi, ilmuvad need siin vastavalt sinu seadistustele.",
   "empty_column.notifications": "Ei ole veel teateid. Kui keegi suhtleb sinuga, näed seda siin.",
   "empty_column.public": "Siin pole midagi! Kirjuta midagi avalikku või jälgi ise kasutajaid täitmaks seda ruumi",
   "error.unexpected_crash.explanation": "Meie poolse probleemi või veebilehitseja ühilduvusprobleemi tõttu ei suutnud me seda lehekülge korrektselt näidata.",
@@ -275,6 +298,8 @@
   "filter_modal.select_filter.title": "Filtreeri seda postitust",
   "filter_modal.title.status": "Postituse filtreerimine",
   "filtered_notifications_banner.pending_requests": "Teateid {count, plural, =0 {mitte üheltki} one {ühelt} other {#}} inimeselt, keda võid teada",
+  "filtered_notifications_banner.private_mentions": "{count, plural, one {privaatne teavitus} other {privaatsed teavitused}}",
+  "filtered_notifications_banner.title": "Filtreeritud teavitused",
   "firehose.all": "Kõik",
   "firehose.local": "See server",
   "firehose.remote": "Teised serverid",
@@ -403,8 +428,15 @@
   "loading_indicator.label": "Laadimine…",
   "media_gallery.toggle_visible": "{number, plural, one {Varja pilt} other {Varja pildid}}",
   "moved_to_account_banner.text": "Kontot {disabledAccount} ei ole praegu võimalik kasutada, sest kolisid kontole {movedToAccount}.",
+  "mute_modal.hide_from_notifications": "Peida teavituste hulgast",
   "mute_modal.hide_options": "Peida valikud",
+  "mute_modal.indefinite": "Kuni eemaldan neilt vaigistuse",
   "mute_modal.show_options": "Kuva valikud",
+  "mute_modal.they_can_mention_and_follow": "Ta saab sind mainida ja sind jälgida, kuid sa ei näe teda.",
+  "mute_modal.they_wont_know": "Ta ei tea, et ta on vaigistatud.",
+  "mute_modal.title": "Vaigistada kasutaja?",
+  "mute_modal.you_wont_see_mentions": "Sa ei näe postitusi, mis teda mainivad.",
+  "mute_modal.you_wont_see_posts": "Ta näeb jätkuvalt sinu postitusi, kuid sa ei näe tema omi.",
   "navigation_bar.about": "Teave",
   "navigation_bar.advanced_interface": "Ava kohandatud veebiliides",
   "navigation_bar.blocks": "Blokeeritud kasutajad",
@@ -440,6 +472,10 @@
   "notification.own_poll": "Su küsitlus on lõppenud",
   "notification.poll": "Küsitlus, milles osalesid, on lõppenud",
   "notification.reblog": "{name} jagas edasi postitust",
+  "notification.relationships_severance_event": "Kadunud ühendus kasutajaga {name}",
+  "notification.relationships_severance_event.account_suspension": "{from} admin on kustutanud {target}, mis tähendab, et sa ei saa enam neilt uuendusi või suhelda nendega.",
+  "notification.relationships_severance_event.domain_block": "{from} admin on blokeerinud {target}, sealhulgas {followersCount} sinu jälgijat ja {followingCount, plural, one  {# konto} other {# kontot}}, mida jälgid.",
+  "notification.relationships_severance_event.learn_more": "Saa rohkem teada",
   "notification.status": "{name} just postitas",
   "notification.update": "{name} muutis postitust",
   "notification_requests.accept": "Nõus",
@@ -450,6 +486,8 @@
   "notifications.column_settings.admin.sign_up": "Uued kasutajad:",
   "notifications.column_settings.alert": "Töölauateated",
   "notifications.column_settings.favourite": "Lemmikud:",
+  "notifications.column_settings.filter_bar.advanced": "Näita kõiki kategooriaid",
+  "notifications.column_settings.filter_bar.category": "Kiirfiltri riba",
   "notifications.column_settings.follow": "Uued jälgijad:",
   "notifications.column_settings.follow_request": "Uued jälgimistaotlused:",
   "notifications.column_settings.mention": "Mainimised:",
@@ -475,6 +513,7 @@
   "notifications.permission_denied": "Töölauamärguanded pole saadaval, kuna eelnevalt keelduti lehitsejale teavituste luba andmast",
   "notifications.permission_denied_alert": "Töölaua märguandeid ei saa lubada, kuna brauseri luba on varem keeldutud",
   "notifications.permission_required": "Töölaua märguanded ei ole saadaval, kuna vajalik luba pole antud.",
+  "notifications.policy.filter_new_accounts.hint": "Loodud viimase {days, plural, one {ühe päeva} other {# päeva}} jooksul",
   "notifications.policy.filter_new_accounts_title": "Uued kontod",
   "notifications_permission_banner.enable": "Luba töölaua märguanded",
   "notifications_permission_banner.how_to_control": "Et saada teateid, ajal mil Mastodon pole avatud, luba töölauamärguanded. Saad täpselt määrata, mis tüüpi tegevused tekitavad märguandeid, kasutates peale teadaannete sisse lülitamist üleval olevat nuppu {icon}.",
diff --git a/app/javascript/mastodon/locales/ia.json b/app/javascript/mastodon/locales/ia.json
index e587dbc52c12b1..d982381c427cb0 100644
--- a/app/javascript/mastodon/locales/ia.json
+++ b/app/javascript/mastodon/locales/ia.json
@@ -3,15 +3,15 @@
   "about.contact": "Contacto:",
   "about.disclaimer": "Mastodon es software libere, de codice aperte, e un marca de Mastodon gGmbH.",
   "about.domain_blocks.no_reason_available": "Ration non disponibile",
-  "about.domain_blocks.preamble": "Mastodon generalmente permitte vider contento ab e interacter con usatores ab ulle altere servitor in le fediverso. Iste es le exceptiones que ha essite facite in iste servitor particular.",
-  "about.domain_blocks.silenced.explanation": "Generalmente non videras perfiles e contento de iste servitor, a minus que tu expressemente lo cerca o opta pro lo per sequer.",
+  "about.domain_blocks.preamble": "Mastodon generalmente permitte vider le contento de, e interager con, usatores de qualcunque altere servitor in le fediverso. Istes es le exceptiones que ha essite facite sur iste servitor particular.",
+  "about.domain_blocks.silenced.explanation": "Generalmente, tu non videra le profilos e le contento de iste servitor, excepte si tu expressemente cerca le contento o seque le profilos.",
   "about.domain_blocks.silenced.title": "Limitate",
-  "about.domain_blocks.suspended.explanation": "Nulle data de iste servitor essera processate, immagazinate o scambiate, faciente qualcunque interaction o communication con usatores de iste servitor impossibile.",
+  "about.domain_blocks.suspended.explanation": "Nulle datos de iste servitor essera processate, immagazinate o excambiate, rendente omne interaction o communication con usatores de iste servitor impossibile.",
   "about.domain_blocks.suspended.title": "Suspendite",
-  "about.not_available": "Iste information non faceva disponibile in iste servitor.",
+  "about.not_available": "Iste information non ha essite rendite disponibile sur iste servitor.",
   "about.rules": "Regulas del servitor",
   "account.account_note_header": "Nota",
-  "account.add_or_remove_from_list": "Adder o remover ab listas",
+  "account.add_or_remove_from_list": "Adder a, o remover de listas",
   "account.badges.group": "Gruppo",
   "account.block": "Blocar @{name}",
   "account.block_domain": "Blocar dominio {domain}",
@@ -19,31 +19,31 @@
   "account.blocked": "Blocate",
   "account.browse_more_on_origin_server": "Navigar plus sur le profilo original",
   "account.copy": "Copiar ligamine a profilo",
-  "account.direct": "Mentionar privatemente a @{name}",
-  "account.disable_notifications": "Stoppar le notificationes quando @{name} publica",
+  "account.direct": "Mentionar privatemente @{name}",
+  "account.disable_notifications": "Non plus notificar me quando @{name} publica",
   "account.domain_blocked": "Dominio blocate",
   "account.edit_profile": "Modificar profilo",
-  "account.enable_notifications": "Notifica me quando @{name} publica",
+  "account.enable_notifications": "Notificar me quando @{name} publica",
   "account.endorse": "Evidentiar sur le profilo",
-  "account.featured_tags.last_status_at": "Ultime message in {date}",
+  "account.featured_tags.last_status_at": "Ultime message publicate le {date}",
   "account.featured_tags.last_status_never": "Necun messages",
   "account.featured_tags.title": "Hashtags eminente de {name}",
   "account.follow": "Sequer",
-  "account.follow_back": "Sequer etiam",
+  "account.follow_back": "Sequer in retorno",
   "account.followers": "Sequitores",
-  "account.followers.empty": "Iste usator ancora non ha sequitores.",
+  "account.followers.empty": "Necuno seque ancora iste usator.",
   "account.followers_counter": "{count, plural, one {{counter} sequitor} other {{counter} sequitores}}",
   "account.following": "Sequente",
-  "account.follows.empty": "Iste usator ancora non seque nemo.",
+  "account.follows.empty": "Iste usator non seque ancora alcuno.",
   "account.go_to_profile": "Vader al profilo",
   "account.hide_reblogs": "Celar boosts de @{name}",
-  "account.in_memoriam": "In Memoriam.",
+  "account.in_memoriam": "In memoriam.",
   "account.languages": "Cambiar le linguas subscribite",
-  "account.link_verified_on": "Le proprietate de iste ligamine esseva verificate le {date}",
-  "account.locked_info": "Le stato de confidentialitate de iste conto es definite a blocate. Le proprietario revisa manualmente qui pote sequer lo.",
+  "account.link_verified_on": "Le proprietate de iste ligamine ha essite verificate le {date}",
+  "account.locked_info": "Le stato de confidentialitate de iste conto es definite como serrate. Le proprietario determina manualmente qui pote sequer le.",
   "account.media": "Multimedia",
   "account.mention": "Mentionar @{name}",
-  "account.moved_to": "{name} indicava que lor nove conto ora es:",
+  "account.moved_to": "{name} ha indicate que su nove conto ora es:",
   "account.mute": "Silentiar @{name}",
   "account.mute_notifications_short": "Silentiar le notificationes",
   "account.mute_short": "Silentiar",
@@ -53,9 +53,9 @@
   "account.posts": "Messages",
   "account.posts_with_replies": "Messages e responsas",
   "account.requested": "Attendente le approbation. Clicca pro cancellar le requesta de sequer",
-  "account.requested_follow": "{name} habeva requestate sequer te",
+  "account.requested_follow": "{name} ha requestate de sequer te",
   "account.share": "Compartir profilo de @{name}",
-  "account.show_reblogs": "Monstrar responsas de @{name}",
+  "account.show_reblogs": "Monstrar impulsos de @{name}",
   "account.statuses_counter": "{count, plural, one {{counter} message} other {{counter} messages}}",
   "account.unblock": "Disblocar @{name}",
   "account.unblock_domain": "Disblocar dominio {domain}",
@@ -66,23 +66,26 @@
   "account.unmute_notifications_short": "Non plus silentiar le notificationes",
   "account.unmute_short": "Non plus silentiar",
   "account_note.placeholder": "Clicca pro adder un nota",
-  "admin.dashboard.retention.average": "Median",
+  "admin.dashboard.retention.average": "Media",
   "admin.dashboard.retention.cohort_size": "Nove usatores",
-  "admin.impact_report.instance_followers": "Sequitores que nostre usatores poterea perder",
-  "admin.impact_report.instance_follows": "Sequitores que lor usatores poterea perder",
-  "alert.rate_limited.message": "Retenta depost {retry_time, time, medium}.",
-  "alert.unexpected.message": "Ocurreva un error inexpectate.",
+  "admin.impact_report.instance_followers": "Sequitores que nostre usatores perderea",
+  "admin.impact_report.instance_follows": "Sequitores que lor usatores perderea",
+  "alert.rate_limited.message": "Per favor retenta post {retry_time, time, medium}.",
+  "alert.unexpected.message": "Un error inexpectate ha occurrite.",
   "announcement.announcement": "Annuncio",
   "audio.hide": "Celar audio",
-  "bundle_column_error.error.title": "Oh, non!",
+  "block_modal.show_less": "Monstrar minus",
+  "block_modal.show_more": "Monstrar plus",
+  "block_modal.title": "Blocar usator?",
+  "bundle_column_error.error.title": "Oh, no!",
   "bundle_column_error.network.title": "Error de rete",
   "bundle_column_error.retry": "Tentar novemente",
   "bundle_column_error.return": "Retornar al initio",
   "bundle_modal_error.close": "Clauder",
   "bundle_modal_error.retry": "Tentar novemente",
-  "closed_registrations_modal.description": "Crear un conto in {domain} actualmente non es possibile, ma considera que tu non besonia un conto specific in {domain} pro usar Mastodon.",
-  "closed_registrations_modal.find_another_server": "Trovar altere servitor",
-  "column.about": "A proposito de",
+  "closed_registrations_modal.description": "Crear un conto in {domain} actualmente non es possibile, ma considera que non es necessari haber un conto specificamente sur {domain} pro usar Mastodon.",
+  "closed_registrations_modal.find_another_server": "Cercar un altere servitor",
+  "column.about": "A proposito",
   "column.blocks": "Usatores blocate",
   "column.bookmarks": "Marcapaginas",
   "column.community": "Chronologia local",
@@ -90,7 +93,7 @@
   "column.directory": "Navigar profilos",
   "column.domain_blocks": "Dominios blocate",
   "column.favourites": "Favoritos",
-  "column.firehose": "Fluxos in directe",
+  "column.firehose": "Fluxos in directo",
   "column.home": "Initio",
   "column.lists": "Listas",
   "column.mutes": "Usatores silentiate",
@@ -103,7 +106,7 @@
   "column_header.show_settings": "Monstrar le parametros",
   "column_subheading.settings": "Parametros",
   "community.column_settings.local_only": "Solmente local",
-  "community.column_settings.media_only": "Solmente medios",
+  "community.column_settings.media_only": "Solmente multimedia",
   "compose.language.change": "Cambiar le lingua",
   "compose.language.search": "Cercar linguas...",
   "compose.published.body": "Message publicate.",
@@ -111,14 +114,14 @@
   "compose.saved.body": "Message salvate.",
   "compose_form.direct_message_warning_learn_more": "Apprender plus",
   "compose_form.lock_disclaimer": "Tu conto non es {locked}. Quicunque pote sequer te pro vider tu messages solo pro sequitores.",
-  "compose_form.lock_disclaimer.lock": "blocate",
-  "compose_form.poll.duration": "Duration del inquesta",
+  "compose_form.lock_disclaimer.lock": "serrate",
+  "compose_form.poll.duration": "Durata del sondage",
   "compose_form.poll.multiple": "Selection multiple",
   "compose_form.poll.option_placeholder": "Option {number}",
   "compose_form.poll.single": "Seliger un",
-  "compose_form.poll.switch_to_multiple": "Cambiar inquesta pro permitter selectiones multiple",
-  "compose_form.poll.switch_to_single": "Cambiar inquesta pro permitter selection singule",
-  "compose_form.poll.type": "Stylo",
+  "compose_form.poll.switch_to_multiple": "Cambiar le sondage pro permitter selectiones multiple",
+  "compose_form.poll.switch_to_single": "Cambiar le sondage pro permitter selection singule",
+  "compose_form.poll.type": "Stilo",
   "compose_form.publish": "Publicar",
   "compose_form.publish_form": "Nove message",
   "compose_form.reply": "Responder",
@@ -129,18 +132,19 @@
   "confirmation_modal.cancel": "Cancellar",
   "confirmations.block.confirm": "Blocar",
   "confirmations.cancel_follow_request.confirm": "Retirar requesta",
-  "confirmations.cancel_follow_request.message": "Es tu secur que tu vole retirar tu requesta a sequer a {name}?",
+  "confirmations.cancel_follow_request.message": "Es tu secur que tu vole retirar tu requesta de sequer {name}?",
   "confirmations.delete.confirm": "Deler",
   "confirmations.delete.message": "Es tu secur que tu vole deler iste message?",
   "confirmations.delete_list.confirm": "Deler",
   "confirmations.delete_list.message": "Es tu secur que tu vole deler permanentemente iste lista?",
+  "confirmations.domain_block.confirm": "Blocar le servitor",
   "confirmations.edit.confirm": "Modificar",
-  "confirmations.logout.confirm": "Clauder le session",
+  "confirmations.logout.confirm": "Clauder session",
   "confirmations.logout.message": "Es tu secur que tu vole clauder le session?",
   "confirmations.mute.confirm": "Silentiar",
   "confirmations.reply.confirm": "Responder",
   "confirmations.unfollow.confirm": "Non plus sequer",
-  "confirmations.unfollow.message": "Es tu secur que tu vole non plus sequer {name}?",
+  "confirmations.unfollow.message": "Es tu secur que tu vole cessar de sequer {name}?",
   "conversation.delete": "Deler conversation",
   "conversation.mark_as_read": "Marcar como legite",
   "conversation.open": "Vider conversation",
@@ -155,8 +159,11 @@
   "disabled_account_banner.account_settings": "Parametros de conto",
   "disabled_account_banner.text": "Tu conto {disabledAccount} es actualmente disactivate.",
   "dismissable_banner.dismiss": "Dimitter",
+  "domain_block_modal.title": "Blocar dominio?",
+  "domain_block_modal.you_will_lose_followers": "Omne sequitores ab iste servitor essera removite.",
+  "domain_pill.server": "Servitor",
   "domain_pill.username": "Nomine de usator",
-  "embed.preview": "Hic es como il parera:",
+  "embed.preview": "Ecce como illlo parera:",
   "emoji_button.activity": "Activitate",
   "emoji_button.clear": "Rader",
   "emoji_button.custom": "Personalisate",
@@ -170,16 +177,16 @@
   "emoji_button.search_results": "Resultatos de recerca",
   "emoji_button.symbols": "Symbolos",
   "emoji_button.travel": "Viages e locos",
-  "empty_column.account_hides_collections": "Le usator ha seligite non facer iste information disponibile",
+  "empty_column.account_hides_collections": "Le usator non ha rendite iste information disponibile",
   "empty_column.account_suspended": "Conto suspendite",
   "empty_column.account_timeline": "Nulle messages hic!",
   "empty_column.account_unavailable": "Profilo non disponibile",
   "empty_column.blocks": "Tu non ha blocate alcun usator ancora.",
   "empty_column.domain_blocks": "Il non ha dominios blocate ancora.",
-  "empty_column.explore_statuses": "Nihil es in tendentias ora mesme. Retorna postea!",
-  "empty_column.favourited_statuses": "Tu non ha necun messages favorite ancora. Quando tu marca un como favorito, ille essera monstrate hic.",
-  "empty_column.followed_tags": "Tu ancora non ha sequite necun hashtags. Quando tu lo face, illes essera monstrate hic.",
-  "empty_column.hashtag": "Ancora non il ha nihil in iste hashtag.",
+  "empty_column.explore_statuses": "Il non ha tendentias in iste momento. Reveni plus tarde!",
+  "empty_column.favourited_statuses": "Tu non ha alcun message favorite ancora. Quando tu marca un message como favorite, illo apparera hic.",
+  "empty_column.followed_tags": "Tu non ha ancora sequite alcun hashtags. Quando tu lo face, illos apparera hic.",
+  "empty_column.hashtag": "Il non ha ancora alcun cosa in iste hashtag.",
   "errors.unexpected_crash.report_issue": "Signalar un defecto",
   "explore.search_results": "Resultatos de recerca",
   "explore.suggested_follows": "Personas",
@@ -189,7 +196,7 @@
   "explore.trending_tags": "Hashtags",
   "filter_modal.added.review_and_configure_title": "Parametros de filtro",
   "filter_modal.added.settings_link": "pagina de parametros",
-  "filter_modal.added.short_explanation": "Iste message esseva addite al sequente categoria de filtros: {title}.",
+  "filter_modal.added.short_explanation": "Iste message ha essite addite al sequente categoria de filtros: {title}.",
   "filter_modal.added.title": "Filtro addite!",
   "filter_modal.select_filter.prompt_new": "Nove categoria: {name}",
   "filter_modal.select_filter.search": "Cercar o crear",
@@ -203,9 +210,9 @@
   "follow_suggestions.personalized_suggestion": "Suggestion personalisate",
   "follow_suggestions.popular_suggestion": "Suggestion personalisate",
   "follow_suggestions.view_all": "Vider toto",
-  "footer.about": "A proposito de",
+  "footer.about": "A proposito",
   "footer.directory": "Directorio de profilos",
-  "footer.get_app": "Obtene le application",
+  "footer.get_app": "Obtener le application",
   "footer.invite": "Invitar personas",
   "footer.keyboard_shortcuts": "Accessos directe de claviero",
   "footer.privacy_policy": "Politica de confidentialitate",
@@ -221,24 +228,25 @@
   "hashtag.follow": "Sequer hashtag",
   "hashtag.unfollow": "Non sequer plus le hashtag",
   "hashtags.and_other": "…e {count, plural, one {}other {# plus}}",
-  "home.column_settings.show_reblogs": "Monstrar boosts",
+  "home.column_settings.show_reblogs": "Monstrar impulsos",
   "home.column_settings.show_replies": "Monstrar responsas",
   "home.hide_announcements": "Celar annuncios",
   "home.pending_critical_update.body": "Actualisa tu servitor de Mastodon le plus tosto possibile!",
   "home.pending_critical_update.link": "Vider actualisationes",
   "home.pending_critical_update.title": "Actualisation de securitate critic disponibile!",
   "home.show_announcements": "Monstrar annuncios",
-  "interaction_modal.login.prompt": "Dominio de tu servitor, p.e. mastodon.social",
+  "interaction_modal.login.prompt": "Dominio de tu servitor, p.ex. mastodon.social",
   "interaction_modal.no_account_yet": "Non sur Mstodon?",
-  "interaction_modal.on_another_server": "In un servitor differente",
-  "interaction_modal.on_this_server": "In iste servitor",
+  "interaction_modal.on_another_server": "Sur un altere servitor",
+  "interaction_modal.on_this_server": "Sur iste servitor",
   "interaction_modal.title.follow": "Sequer {name}",
-  "interaction_modal.title.reblog": "Facer boost al message de {name}",
+  "interaction_modal.title.reblog": "Impulsar le message de {name}",
   "interaction_modal.title.reply": "Responder al message de {name}",
   "keyboard_shortcuts.blocked": "Aperir lista de usatores blocate",
-  "keyboard_shortcuts.boost": "Facer boost al message",
+  "keyboard_shortcuts.boost": "Impulsar le message",
   "keyboard_shortcuts.description": "Description",
   "keyboard_shortcuts.enter": "Aperir message",
+  "keyboard_shortcuts.favourite": "Message favorite",
   "keyboard_shortcuts.favourites": "Aperir lista de favoritos",
   "keyboard_shortcuts.federated": "Aperir le chronologia federate",
   "keyboard_shortcuts.heading": "Accessos directe de claviero",
@@ -247,22 +255,22 @@
   "keyboard_shortcuts.muted": "Aperir lista de usatores silentiate",
   "keyboard_shortcuts.my_profile": "Aperir tu profilo",
   "keyboard_shortcuts.notifications": "Aperir columna de notificationes",
-  "keyboard_shortcuts.open_media": "Aperir medio",
+  "keyboard_shortcuts.open_media": "Aperir multimedia",
   "keyboard_shortcuts.profile": "Aperir le profilo del autor",
   "keyboard_shortcuts.reply": "Responder al message",
   "keyboard_shortcuts.spoilers": "Monstrar/celar le campo CW",
-  "keyboard_shortcuts.toggle_sensitivity": "Monstrar/celar medios",
+  "keyboard_shortcuts.toggle_sensitivity": "Monstrar/celar multimedia",
   "keyboard_shortcuts.toot": "Initiar un nove message",
   "lightbox.close": "Clauder",
   "lightbox.next": "Sequente",
   "lightbox.previous": "Precedente",
   "link_preview.author": "Per {name}",
   "lists.account.add": "Adder al lista",
-  "lists.account.remove": "Remover ab le lista",
+  "lists.account.remove": "Remover del lista",
   "lists.delete": "Deler lista",
   "lists.edit": "Modificar lista",
   "lists.edit.submit": "Cambiar titulo",
-  "lists.exclusive": "Celar iste messages ab le initio",
+  "lists.exclusive": "Celar iste messages sur le pagina de initio",
   "lists.new.create": "Adder lista",
   "lists.new.title_placeholder": "Nove titulo del lista",
   "lists.replies_policy.none": "Nemo",
@@ -270,8 +278,10 @@
   "lists.subheading": "Tu listas",
   "loading_indicator.label": "Cargante…",
   "media_gallery.toggle_visible": "{number, plural, one {Celar imagine} other {Celar imagines}}",
-  "navigation_bar.about": "A proposito de",
-  "navigation_bar.advanced_interface": "Aperir in un interfacie web avantiate",
+  "mute_modal.hide_options": "Celar optiones",
+  "mute_modal.title": "Silentiar le usator?",
+  "navigation_bar.about": "A proposito",
+  "navigation_bar.advanced_interface": "Aperir in le interfacie web avantiate",
   "navigation_bar.blocks": "Usatores blocate",
   "navigation_bar.bookmarks": "Marcapaginas",
   "navigation_bar.community_timeline": "Chronologia local",
@@ -291,14 +301,18 @@
   "navigation_bar.public_timeline": "Chronologia federate",
   "navigation_bar.search": "Cercar",
   "navigation_bar.security": "Securitate",
-  "notification.own_poll": "Tu inquesta finiva",
-  "notification.update": "{name} modificava un message",
+  "notification.own_poll": "Tu sondage ha finite",
+  "notification.relationships_severance_event.learn_more": "Apprender plus",
+  "notification.update": "{name} ha modificate un message",
+  "notification_requests.notifications_from": "Notificationes de {name}",
   "notifications.clear": "Rader notificationes",
+  "notifications.clear_confirmation": "Es tu secur que tu vole rader permanentemente tote tu notificationes?",
   "notifications.column_settings.alert": "Notificationes de scriptorio",
   "notifications.column_settings.favourite": "Favoritos:",
+  "notifications.column_settings.filter_bar.advanced": "Monstrar tote le categorias",
   "notifications.column_settings.follow": "Nove sequitores:",
   "notifications.column_settings.mention": "Mentiones:",
-  "notifications.column_settings.poll": "Resultatos del inquesta:",
+  "notifications.column_settings.poll": "Resultatos del sondage:",
   "notifications.column_settings.push": "Notificationes push",
   "notifications.column_settings.show": "Monstrar in columna",
   "notifications.column_settings.sound": "Reproducer sono",
@@ -307,10 +321,11 @@
   "notifications.filter.all": "Toto",
   "notifications.filter.favourites": "Favoritos",
   "notifications.filter.mentions": "Mentiones",
-  "notifications.filter.polls": "Resultatos del inquesta",
+  "notifications.filter.polls": "Resultatos del sondage",
   "notifications.filter.statuses": "Actualisationes de personas que tu seque",
   "notifications.grant_permission": "Conceder permission.",
   "notifications.group": "{count} notificationes",
+  "notifications.policy.filter_new_accounts_title": "Nove contos",
   "notifications_permission_banner.enable": "Activar notificationes de scriptorio",
   "onboarding.compose.template": "Salute #Mastodon!",
   "onboarding.profile.save_and_continue": "Salvar e continuar",
@@ -322,7 +337,7 @@
   "onboarding.steps.share_profile.title": "Compartir tu profilo de Mastodon",
   "poll.closed": "Claudite",
   "poll.reveal": "Vider le resultatos",
-  "privacy.change": "Cambiar privacitate del message",
+  "privacy.change": "Cambiar le confidentialitate del message",
   "privacy.public.short": "Public",
   "privacy_policy.last_updated": "Ultime actualisation {date}",
   "privacy_policy.title": "Politica de confidentialitate",
@@ -333,7 +348,7 @@
   "report.categories.other": "Alteres",
   "report.category.title_account": "profilo",
   "report.category.title_status": "message",
-  "report.close": "Preste",
+  "report.close": "Facite",
   "report.mute": "Silentiar",
   "report.next": "Sequente",
   "report.placeholder": "Commentos additional",
@@ -358,14 +373,14 @@
   "server_banner.learn_more": "Apprender plus",
   "server_banner.server_stats": "Statos del servitor:",
   "sign_in_banner.create_account": "Crear un conto",
-  "sign_in_banner.sign_in": "Initiar le session",
+  "sign_in_banner.sign_in": "Aperir session",
   "status.block": "Blocar @{name}",
   "status.copy": "Copiar ligamine a message",
   "status.delete": "Deler",
-  "status.direct": "Mentionar privatemente a @{name}",
+  "status.direct": "Mentionar privatemente @{name}",
   "status.direct_indicator": "Mention private",
   "status.edit": "Modificar",
-  "status.edited_x_times": "Modificate {count, plural, one {{count} tempore} other {{count} tempores}}",
+  "status.edited_x_times": "Modificate {count, plural, one {{count} vice} other {{count} vices}}",
   "status.favourite": "Adder al favoritos",
   "status.filter": "Filtrar iste message",
   "status.hide": "Celar le message",
@@ -376,20 +391,37 @@
   "status.more": "Plus",
   "status.mute_conversation": "Silentiar conversation",
   "status.read_more": "Leger plus",
+  "status.reblogs.empty": "Necuno ha ancora impulsate iste message. Quando alcuno lo face, le impulsos apparera hic.",
+  "status.redraft": "Deler e reconciper",
+  "status.remove_bookmark": "Remover marcapagina",
+  "status.replied_to": "Respondite a {name}",
+  "status.reply": "Responder",
+  "status.replyAll": "Responder al discussion",
+  "status.report": "Signalar @{name}",
+  "status.sensitive_warning": "Contento sensibile",
   "status.share": "Compartir",
+  "status.show_filter_reason": "Monstrar in omne caso",
   "status.show_less": "Monstrar minus",
+  "status.show_less_all": "Monstrar minus pro totes",
   "status.show_more": "Monstrar plus",
+  "status.show_more_all": "Monstrar plus pro totes",
+  "status.show_original": "Monstrar original",
+  "status.title.with_attachments": "{user} ha publicate {attachmentCount, plural, one {un annexo} other {{attachmentCount} annexos}}",
   "status.translate": "Traducer",
   "status.translated_from_with": "Traducite ab {lang} usante {provider}",
   "status.uncached_media_warning": "Previsualisation non disponibile",
+  "status.unmute_conversation": "Non plus silentiar conversation",
+  "status.unpin": "Disfixar del profilo",
+  "subscribed_languages.lead": "Solmente le messages in le linguas seligite apparera in tu chronologias de initio e de listas post le cambiamento. Selige necun pro reciper messages in tote le linguas.",
   "subscribed_languages.save": "Salveguardar le cambiamentos",
+  "subscribed_languages.target": "Cambiar le linguas subscribite pro {target}",
   "tabs_bar.home": "Initio",
   "tabs_bar.notifications": "Notificationes",
   "timeline_hint.resources.statuses": "Messages ancian",
   "trends.trending_now": "Ora in tendentias",
   "upload_button.label": "Adde imagines, un video o un file de audio",
   "upload_modal.choose_image": "Seliger un imagine",
-  "upload_modal.detect_text": "Deteger texto ab un pictura",
+  "upload_modal.detect_text": "Deteger texto de un imagine",
   "video.close": "Clauder le video",
   "video.download": "Discargar le file",
   "video.fullscreen": "Schermo plen",
diff --git a/app/javascript/mastodon/locales/ie.json b/app/javascript/mastodon/locales/ie.json
index 17f312418d40c3..00b6a36c9f2e53 100644
--- a/app/javascript/mastodon/locales/ie.json
+++ b/app/javascript/mastodon/locales/ie.json
@@ -91,6 +91,9 @@
   "audio.hide": "Celar audio",
   "block_modal.show_less": "Monstrar minu",
   "block_modal.show_more": "Monstrar plu",
+  "block_modal.they_cant_mention": "Ne posse mentionar ni sequer te.",
+  "block_modal.they_cant_see_posts": "Ne posse vider tui postas e inversi.",
+  "block_modal.they_will_know": "Va esser conscient que tu ha bloccat.",
   "block_modal.title": "Bloccar usator?",
   "block_modal.you_wont_see_mentions": "Tu ne va vider postas mentionant li usator.",
   "boost_modal.combo": "Li proxim vez tu posse pressar {combo} por passar to-ci",
@@ -206,6 +209,16 @@
   "dismissable_banner.explore_tags": "Tis-ci es hashtags queles es popular che li social retage hodie. Hashtags usat de plu mult persones diferent es monstrat plu alt.",
   "dismissable_banner.public_timeline": "Tis-ci es li max recent public postas de persones che li social retage quem gente che {domain} seque.",
   "domain_block_modal.block": "Bloccar servitor",
+  "domain_block_modal.block_account_instead": "Altrimen, bloccar @{name}",
+  "domain_block_modal.they_can_interact_with_old_posts": "Persones de ti servitor posse interacter con tui old postas.",
+  "domain_block_modal.they_cant_follow": "Nequi de ti-ci servitor posse sequer te.",
+  "domain_pill.activitypub_like_language": "ActivityPub es li lingue usat de Mastodon por parlar con altri social retages.",
+  "domain_pill.server": "Servitor",
+  "domain_pill.their_handle": "Identificator:",
+  "domain_pill.their_server": "Su digital hem e omni su postas.",
+  "domain_pill.username": "Usator-nómine",
+  "domain_pill.whats_in_a_handle": "Ex quo consiste un identificator?",
+  "domain_pill.your_handle": "Tui identificator:",
   "embed.instructions": "Inbedar ti-ci posta per copiar li code in infra.",
   "embed.preview": "Vi qualmen it va aspecter:",
   "emoji_button.activity": "Activitá",
@@ -242,6 +255,7 @@
   "empty_column.list": "Ancor ne hay quocunc in ti-ci liste. Quande membres de ti-ci liste publica nov postas, ili va aparir ci.",
   "empty_column.lists": "Tu ancor have null listes. Quande tu crea un, it va aparir ci.",
   "empty_column.mutes": "Tu ancor ha silentiat null usatores.",
+  "empty_column.notification_requests": "Omnicos clar! Hay necos ci. Nov notificationes va venir ci quande tu recive les secun tui parametres.",
   "empty_column.notifications": "Tu have null notificationes. Quande altri persones interacte con te, tu va vider it ci.",
   "empty_column.public": "Hay nullcos ci! Scri alquo publicmen, o manualmen seque usatores de altri servitores por plenar to-ci",
   "error.unexpected_crash.explanation": "Pro un error in nor code o un problema de compatibilitá in li navigator, ti-ci págine ne posset esser monstrat correctmen.",
@@ -272,6 +286,9 @@
   "filter_modal.select_filter.subtitle": "Usar un existent categorie o crear nov",
   "filter_modal.select_filter.title": "Filtrar ti-ci posta",
   "filter_modal.title.status": "Filtrar un posta",
+  "filtered_notifications_banner.pending_requests": "Notificationes de {count, plural, =0 {nequi} one {un person} other {# persones}} quel tu possibilmen conosse",
+  "filtered_notifications_banner.private_mentions": "{count, plural, one {privat mention} other {privat mentiones}}",
+  "filtered_notifications_banner.title": "Filtrat notificationes",
   "firehose.all": "Omno",
   "firehose.local": "Ti-ci servitor",
   "firehose.remote": "Altri servitores",
@@ -400,6 +417,13 @@
   "loading_indicator.label": "Cargant…",
   "media_gallery.toggle_visible": "{number, plural, one {Celar image} other {Celar images}}",
   "moved_to_account_banner.text": "Tui conto {disabledAccount} es actualmen desactivisat pro que tu movet te a {movedToAccount}.",
+  "mute_modal.hide_from_notifications": "Celar de notificationes",
+  "mute_modal.hide_options": "Celar optiones",
+  "mute_modal.indefinite": "Til quande yo dessilentia li usator",
+  "mute_modal.show_options": "Monstrar optiones",
+  "mute_modal.they_can_mention_and_follow": "Posse mentionar e sequer te, ma va esser ínvisibil a te.",
+  "mute_modal.they_wont_know": "Ne va esser conscient pri li silentation.",
+  "mute_modal.title": "Silentiar usator?",
   "navigation_bar.about": "Information",
   "navigation_bar.advanced_interface": "Aperter in li web-interfacie avansat",
   "navigation_bar.blocks": "Bloccat usatores",
@@ -435,14 +459,20 @@
   "notification.own_poll": "Tui balotation ha finit",
   "notification.poll": "Un balotation in quel tu votat ha finit",
   "notification.reblog": "{name} boostat tui posta",
+  "notification.relationships_severance_event.learn_more": "Aprender plu",
   "notification.status": "{name} just postat",
   "notification.update": "{name} modificat un posta",
+  "notification_requests.accept": "Acceptar",
+  "notification_requests.dismiss": "Demisser",
+  "notification_requests.notifications_from": "Notificationes de {name}",
+  "notification_requests.title": "Filtrat notificationes",
   "notifications.clear": "Aclarar notificationes",
   "notifications.clear_confirmation": "Vole tu vermen permanentmen aclarar omni tui notificationes?",
   "notifications.column_settings.admin.report": "Nov raportas:",
   "notifications.column_settings.admin.sign_up": "Nov registrationes:",
   "notifications.column_settings.alert": "Notificationes sur li computator",
   "notifications.column_settings.favourite": "Favorites:",
+  "notifications.column_settings.filter_bar.advanced": "Monstrar omni categories",
   "notifications.column_settings.follow": "Nov sequitores:",
   "notifications.column_settings.follow_request": "Nov petitiones de sequer:",
   "notifications.column_settings.mention": "Mentiones:",
@@ -468,6 +498,15 @@
   "notifications.permission_denied": "Notificationes sur li computator es índisponibil pro que on ha previamen rejectet un petition por navigator-permissiones",
   "notifications.permission_denied_alert": "Notificationes sur li computator ne posse esser activisat, pro que navigator-permission ha esset previamen rejectet",
   "notifications.permission_required": "Notificationes sur li computator es índisponibil pro que li besonat permission ne ha esset dat.",
+  "notifications.policy.filter_new_accounts.hint": "Creat durant li passat {days, plural, one {un die} other {# dies}}",
+  "notifications.policy.filter_new_accounts_title": "Nov contos",
+  "notifications.policy.filter_not_followers_hint": "Includente tis qui ha sequet te minu quam {days, plural, one {un die} other {# dies}}",
+  "notifications.policy.filter_not_followers_title": "Persones qui ne seque te",
+  "notifications.policy.filter_not_following_hint": "Til quande tu manualmen aproba",
+  "notifications.policy.filter_not_following_title": "Persones queles tu ne seque",
+  "notifications.policy.filter_private_mentions_hint": "Filtrat except si it es un response a tui propri mention o si tu seque li missor",
+  "notifications.policy.filter_private_mentions_title": "Ínsolicitat privat mentiones",
+  "notifications.policy.title": "Filtrar notificationes de…",
   "notifications_permission_banner.enable": "Activisar notificationes sur li computator",
   "notifications_permission_banner.how_to_control": "Por reciver notificationes quande Mastodon ne es apert, activisa notificationes sur li computator. Tu posse decider precisimen quel species de interactiones genera notificationes per li buton {icon} in-supra quande ili es activisat.",
   "notifications_permission_banner.title": "Nequande preterlassa quocunc",
@@ -644,9 +683,11 @@
   "status.direct": "Privatmen mentionar @{name}",
   "status.direct_indicator": "Privat mention",
   "status.edit": "Modificar",
+  "status.edited": "Ultimmen actualisat ye {date}",
   "status.edited_x_times": "Modificat {count, plural, one {{count} vez} other {{count} vezes}}",
   "status.embed": "Inbedar",
   "status.favourite": "Favoritisar",
+  "status.favourites": "{count, plural, one {favorit} other {favorites}}",
   "status.filter": "Filtrar ti-ci posta",
   "status.filtered": "Filtrat",
   "status.hide": "Celar posta",
diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json
index a6f26bfcee5c4b..d7e447626ea242 100644
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@@ -174,7 +174,7 @@
   "confirmations.delete.confirm": "Elimina",
   "confirmations.delete.message": "Sei sicuro di voler eliminare questo post?",
   "confirmations.delete_list.confirm": "Elimina",
-  "confirmations.delete_list.message": "Sei sicuro di voler eliminare permanentemente questa lista?",
+  "confirmations.delete_list.message": "Sei sicuro/a di voler eliminare permanentemente questo elenco?",
   "confirmations.discard_edit_media.confirm": "Scarta",
   "confirmations.discard_edit_media.message": "Hai delle modifiche non salvate alla descrizione o anteprima del media, scartarle comunque?",
   "confirmations.domain_block.confirm": "Blocca il server",
@@ -263,8 +263,8 @@
   "empty_column.followed_tags": "Non hai ancora seguito alcun hashtag. Quando lo farai, appariranno qui.",
   "empty_column.hashtag": "Non c'è ancora nulla in questo hashtag.",
   "empty_column.home": "La cronologia della tua home è vuota! Segui altre persone per riempirla. {suggestions}",
-  "empty_column.list": "Non c'è ancora nulla in questa lista. Quando i membri di questa lista pubblicheranno dei nuovi post, appariranno qui.",
-  "empty_column.lists": "Non hai ancora alcuna lista. Quando ne creerai una, apparirà qui.",
+  "empty_column.list": "Non c'è ancora nulla in questo elenco. Quando i membri di questo elenco pubblicheranno nuovi post, appariranno qui.",
+  "empty_column.lists": "Non hai ancora nessun elenco. Quando ne creerai uno, apparirà qui.",
   "empty_column.mutes": "Non hai ancora silenziato alcun utente.",
   "empty_column.notification_requests": "Tutto chiaro! Non c'è niente qui. Quando ricevi nuove notifiche, verranno visualizzate qui in base alle tue impostazioni.",
   "empty_column.notifications": "Non hai ancora nessuna notifica. Quando altre persone interagiranno con te, le vedrai qui.",
@@ -410,20 +410,20 @@
   "limited_account_hint.action": "Mostra comunque il profilo",
   "limited_account_hint.title": "Questo profilo è stato nascosto dai moderatori di {domain}.",
   "link_preview.author": "Di {name}",
-  "lists.account.add": "Aggiungi alla lista",
-  "lists.account.remove": "Togli dalla lista",
-  "lists.delete": "Elimina lista",
-  "lists.edit": "Modifica lista",
+  "lists.account.add": "Aggiungi all'elenco",
+  "lists.account.remove": "Rimuovi dall'elenco",
+  "lists.delete": "Elimina elenco",
+  "lists.edit": "Modifica elenco",
   "lists.edit.submit": "Cambia il titolo",
   "lists.exclusive": "Nascondi questi post dalla home",
   "lists.new.create": "Aggiungi lista",
-  "lists.new.title_placeholder": "Titolo della nuova lista",
+  "lists.new.title_placeholder": "Titolo del nuovo elenco",
   "lists.replies_policy.followed": "Qualsiasi utente seguito",
-  "lists.replies_policy.list": "Membri della lista",
+  "lists.replies_policy.list": "Membri dell'elenco",
   "lists.replies_policy.none": "Nessuno",
   "lists.replies_policy.title": "Mostra risposte a:",
   "lists.search": "Cerca tra le persone che segui",
-  "lists.subheading": "Le tue liste",
+  "lists.subheading": "I tuoi elenchi",
   "load_pending": "{count, plural, one {# nuovo oggetto} other {# nuovi oggetti}}",
   "loading_indicator.label": "Caricamento…",
   "media_gallery.toggle_visible": "{number, plural, one {Nascondi immagine} other {Nascondi immagini}}",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index 9dff3052715bc2..3bf89fedca4c05 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -217,6 +217,19 @@
   "domain_block_modal.title": "ドメインをブロックしますか？",
   "domain_block_modal.you_will_lose_followers": "このサーバーのフォロワーはすべてフォロー解除されます。",
   "domain_block_modal.you_wont_see_posts": "このサーバーのユーザーからの投稿や通知が閲覧できなくなります。",
+  "domain_pill.activitypub_lets_connect": "Mastodonからほかのソーシャルアプリのユーザーへ、そのまた別のアプリのユーザーへと、それぞれが互いにつながり関わり合うことをこのActivityPubの仕組みが実現しています。",
+  "domain_pill.activitypub_like_language": "ActivityPubとは、Mastodonがほかのサーバーと会話をするときにしゃべる「言葉」のようなものです。",
+  "domain_pill.server": "サーバー",
+  "domain_pill.their_handle": "このユーザーのユーザーID:",
+  "domain_pill.their_server": "ユーザーの仮想の住所です。そのユーザーIDによるすべての投稿を保持しています。",
+  "domain_pill.their_username": "ユーザーを識別する名前です。ユーザー名はひとつのサーバー内においては唯一無二の名前ですが、ほかのサーバーには同名のユーザーがいることもあります。",
+  "domain_pill.username": "ユーザー名",
+  "domain_pill.whats_in_a_handle": "ユーザーIDについて",
+  "domain_pill.who_they_are": "そのユーザーが「誰であるか」「どこに住んでいるか」はユーザーIDから知ることができます。これにより<button>いくつものActivityPub対応のプラットフォーム</button>の集まりからなるネットワークを介してそれぞれのユーザーと関わり合うことができます。",
+  "domain_pill.who_you_are": "ほかのユーザーはあなたが「誰であるか」「どこに住んでいるか」をユーザーIDから認識でき、これにより<button>いくつものActivityPub対応のプラットフォーム</button>の集まりからなるネットワークを介してあなたと関わり合うことができます。",
+  "domain_pill.your_handle": "あなたのユーザーID:",
+  "domain_pill.your_server": "あなたの仮想の住所です。投稿した内容はすべてここに保持されます。もし今いるサーバーが気に入っていない場合は、フォロワーを引き継いで別のサーバーに引っ越すこともできます。",
+  "domain_pill.your_username": "あなたを識別する名前です。ユーザー名はひとつのサーバー内においては唯一無二の名前ですが、ほかのサーバーには同名のユーザーがいることもあります。",
   "embed.instructions": "下記のコードをコピーしてウェブサイトに埋め込みます。",
   "embed.preview": "表示例:",
   "emoji_button.activity": "活動",
diff --git a/app/javascript/mastodon/locales/lad.json b/app/javascript/mastodon/locales/lad.json
index dd76baaf67d89d..898f3b1ce206d8 100644
--- a/app/javascript/mastodon/locales/lad.json
+++ b/app/javascript/mastodon/locales/lad.json
@@ -457,6 +457,7 @@
   "notification.own_poll": "Tu anketa eskapo",
   "notification.poll": "Anketa en ke votates eskapo",
   "notification.reblog": "{name} repartajo tu publikasyon",
+  "notification.relationships_severance_event.learn_more": "Ambezate mas",
   "notification.status": "{name} publiko algo",
   "notification.update": "{name} edito una publikasyon",
   "notification_requests.accept": "Acheta",
@@ -469,6 +470,8 @@
   "notifications.column_settings.admin.sign_up": "Muevas enrejistrasyones:",
   "notifications.column_settings.alert": "Avizos de ensimameza",
   "notifications.column_settings.favourite": "Te plazen:",
+  "notifications.column_settings.filter_bar.advanced": "Amostra todas las kategorias",
+  "notifications.column_settings.filter_bar.category": "Vara de filtrado rapido",
   "notifications.column_settings.follow": "Muevos suivantes:",
   "notifications.column_settings.follow_request": "Muevas solisitudes de segimiento:",
   "notifications.column_settings.mention": "Enmentaduras:",
diff --git a/app/javascript/mastodon/locales/ru.json b/app/javascript/mastodon/locales/ru.json
index 7a60f3bb7c770f..7ff98ba53b729d 100644
--- a/app/javascript/mastodon/locales/ru.json
+++ b/app/javascript/mastodon/locales/ru.json
@@ -89,6 +89,14 @@
   "announcement.announcement": "Объявление",
   "attachments_list.unprocessed": "(не обработан)",
   "audio.hide": "Скрыть аудио",
+  "block_modal.remote_users_caveat": "Мы попросим сервер {domain} уважать ваше решение. Однако, соблюдение требований не гарантировано, поскольку некоторые серверы могут работать с блокировками по-разному. Публичные записи по-прежнему могут быть видны неавторизованным пользователям.",
+  "block_modal.show_less": "Показать меньше",
+  "block_modal.show_more": "Показать больше",
+  "block_modal.they_cant_mention": "Он не может упоминать или подписываться на вас.",
+  "block_modal.they_cant_see_posts": "Он не может видеть ваши сообщения, и вы не увидите его.",
+  "block_modal.they_will_know": "Он может видеть, что он заблокирован.",
+  "block_modal.title": "Заблокировать пользователя?",
+  "block_modal.you_wont_see_mentions": "Вы не увидите записи, которые упоминают его.",
   "boost_modal.combo": "{combo}, чтобы пропустить это в следующий раз",
   "bundle_column_error.copy_stacktrace": "Скопировать отчет об ошибке",
   "bundle_column_error.error.body": "Запрошенная страница не может быть отображена. Это может быть вызвано ошибкой в нашем коде или проблемой совместимости браузера.",
@@ -169,6 +177,7 @@
   "confirmations.delete_list.message": "Вы действительно хотите навсегда удалить этот список?",
   "confirmations.discard_edit_media.confirm": "Отменить",
   "confirmations.discard_edit_media.message": "У вас есть несохранённые изменения описания мультимедиа или предпросмотра, отменить их?",
+  "confirmations.domain_block.confirm": "Заблокировать сервер",
   "confirmations.domain_block.message": "Вы точно уверены, что хотите заблокировать {domain} полностью? В большинстве случаев нескольких блокировок и игнорирований вполне достаточно. Вы перестанете видеть публичную ленту и уведомления оттуда. Ваши подписчики из этого домена будут удалены.",
   "confirmations.edit.confirm": "Редактировать",
   "confirmations.edit.message": "В данный момент, редактирование перезапишет составляемое вами сообщение. Вы уверены, что хотите продолжить?",
@@ -200,6 +209,27 @@
   "dismissable_banner.explore_statuses": "Эти сообщения со связанных серверов сети сейчас набирают популярность.",
   "dismissable_banner.explore_tags": "Эти хэштеги привлекают людей на этом и других серверах децентрализованной сети прямо сейчас.",
   "dismissable_banner.public_timeline": "Это самые последние публичные сообщения от людей в социальной сети, за которыми подписались пользователи {domain}.",
+  "domain_block_modal.block": "Заблокировать сервер",
+  "domain_block_modal.block_account_instead": "Заблокировать @{name} вместо",
+  "domain_block_modal.they_can_interact_with_old_posts": "Люди с этого сервера могут взаимодействовать с вашими старыми записями.",
+  "domain_block_modal.they_cant_follow": "Никто из этого сервера не может подписываться на вас.",
+  "domain_block_modal.they_wont_know": "Он не будет знать, что его заблокировали.",
+  "domain_block_modal.title": "Заблокировать домен?",
+  "domain_block_modal.you_will_lose_followers": "Все ваши подписчики с этого сервера будут удалены.",
+  "domain_block_modal.you_wont_see_posts": "Вы не будете видеть записи или уведомления от пользователей на этом сервере.",
+  "domain_pill.activitypub_lets_connect": "Это позволяет вам общаться и взаимодействовать с людьми не только на Mastodon, но и в различных социальных приложениях.",
+  "domain_pill.activitypub_like_language": "ActivityPub как язык Mastodon говорит с другими социальными сетями.",
+  "domain_pill.server": "Сервер",
+  "domain_pill.their_handle": "Его бейдж:",
+  "domain_pill.their_server": "Цифровой дом, где находятся все записи.",
+  "domain_pill.their_username": "Уникальный идентификатор на сервере. Возможно найти пользователей с одним и тем же именем пользователя на разных серверах.",
+  "domain_pill.username": "Имя пользователя",
+  "domain_pill.whats_in_a_handle": "Что такое бейдж?",
+  "domain_pill.who_they_are": "Поскольку бейджи говорят о том, кто и где находится, вы можете взаимодействовать с людьми в социальной сети <button>платформ, работающих на платформе ActivityPub</button>.",
+  "domain_pill.who_you_are": "Поскольку ваш бейдж говорит о том, кто вы и где находитесь, люди могут взаимодействовать с вами через социальную сеть <button>платформ, работающих на платформе ActivityPub</button>.",
+  "domain_pill.your_handle": "Ваш бейдж:",
+  "domain_pill.your_server": "Сервер, где живут все ваши посты. Этот не нравится? Поменяй сервер в любое время вместе со своими подписчиками.",
+  "domain_pill.your_username": "Ваш уникальный идентификатор на этом сервере. Вы можете найти пользователей с одним именем пользователя на разных серверах.",
   "embed.instructions": "Встройте этот пост на свой сайт, скопировав следующий код:",
   "embed.preview": "Так это будет выглядеть:",
   "emoji_button.activity": "Занятия",
@@ -236,6 +266,7 @@
   "empty_column.list": "В этом списке пока ничего нет.",
   "empty_column.lists": "У вас ещё нет списков. Созданные вами списки будут показаны здесь.",
   "empty_column.mutes": "Вы ещё никого не добавляли в список игнорируемых.",
+  "empty_column.notification_requests": "Здесь ничего нет! Когда вы получите новые уведомления, они здесь появятся согласно вашим настройкам.",
   "empty_column.notifications": "У вас пока нет уведомлений. Взаимодействуйте с другими, чтобы завести разговор.",
   "empty_column.public": "Здесь ничего нет! Опубликуйте что-нибудь или подпишитесь на пользователей с других узлов, чтобы заполнить ленту",
   "error.unexpected_crash.explanation": "Из-за несовместимого браузера или ошибки в нашем коде, эта страница не может быть корректно отображена.",
@@ -266,13 +297,22 @@
   "filter_modal.select_filter.subtitle": "Используйте существующую категорию или создайте новую",
   "filter_modal.select_filter.title": "Фильтровать этот пост",
   "filter_modal.title.status": "Фильтровать пост",
+  "filtered_notifications_banner.pending_requests": "Уведомления от {count, plural, =0 {никого} one {# человека} other {# других людей, с кем вы можете быть знакомы}}",
+  "filtered_notifications_banner.private_mentions": "{count, plural, one {личное упоминание} other {личные упоминания}}",
+  "filtered_notifications_banner.title": "Отфильтрованные уведомления",
   "firehose.all": "Все",
   "firehose.local": "Текущий сервер",
   "firehose.remote": "Другие серверы",
   "follow_request.authorize": "Авторизовать",
   "follow_request.reject": "Отказать",
   "follow_requests.unlocked_explanation": "Хотя ваша учетная запись не закрыта, команда {domain} подумала, что вы захотите просмотреть запросы от этих учетных записей вручную.",
+  "follow_suggestions.curated_suggestion": "Выбор администрации",
   "follow_suggestions.dismiss": "Больше не показывать",
+  "follow_suggestions.hints.featured": "Этот профиль был вручную выбран командой {domain}.",
+  "follow_suggestions.hints.friends_of_friends": "Этот профиль популярен среди людей, на которых вы подписаны.",
+  "follow_suggestions.hints.most_followed": "Этот профиль один из самых отслеживаемых на {domain}.",
+  "follow_suggestions.hints.most_interactions": "Этот профиль в последнее время привлекает много внимания на {domain}.",
+  "follow_suggestions.hints.similar_to_recently_followed": "Этот профиль похож на другие профили, на которые вы подписывались в последнее время.",
   "follow_suggestions.personalized_suggestion": "Персонализированное предложение",
   "follow_suggestions.popular_suggestion": "Популярное предложение",
   "follow_suggestions.view_all": "Посмотреть все",
@@ -388,6 +428,15 @@
   "loading_indicator.label": "Загрузка…",
   "media_gallery.toggle_visible": "Показать/скрыть {number, plural, =1 {изображение} other {изображения}}",
   "moved_to_account_banner.text": "Ваша учетная запись {disabledAccount} в настоящее время заморожена, потому что вы переехали на {movedToAccount}.",
+  "mute_modal.hide_from_notifications": "Скрыть из уведомлений",
+  "mute_modal.hide_options": "Скрыть параметры",
+  "mute_modal.indefinite": "Пока я не разблокирую их",
+  "mute_modal.show_options": "Показать опции",
+  "mute_modal.they_can_mention_and_follow": "Они могут упоминать и следить за вами, но вы не будете их видеть.",
+  "mute_modal.they_wont_know": "Они не будут знать, что их заглушили.",
+  "mute_modal.title": "Заглушить пользователя?",
+  "mute_modal.you_wont_see_mentions": "Вы не увидите постов, которые их упоминают.",
+  "mute_modal.you_wont_see_posts": "Они по-прежнему смогут видеть ваши посты, но вы не сможете видеть их посты.",
   "navigation_bar.about": "О проекте",
   "navigation_bar.advanced_interface": "Включить многоколоночный интерфейс",
   "navigation_bar.blocks": "Заблокированные пользователи",
@@ -423,8 +472,17 @@
   "notification.own_poll": "Ваш опрос закончился",
   "notification.poll": "Опрос, в котором вы приняли участие, завершился",
   "notification.reblog": "{name} продвинул(а) ваш пост",
+  "notification.relationships_severance_event": "Потеряно соединение с {name}",
+  "notification.relationships_severance_event.account_suspension": "Администратор {from} заблокировал {target}, что означает, что вы больше не сможете получать обновления от них или взаймодествовать с ними.",
+  "notification.relationships_severance_event.domain_block": "Администратор {from} заблокировал {target} включая {followersCount} ваших подписчиков и {followingCount, plural, one {# аккаунт} few {# аккаунта} other {# аккаунтов}}, на которые вы подписаны.",
+  "notification.relationships_severance_event.learn_more": "Узнать больше",
+  "notification.relationships_severance_event.user_domain_block": "Вы заблокировали {target} включая {followersCount} ваших подписчиков и {followingCount, plural, one {# аккаунт} few {# аккаунта} other {# аккаунтов}}, на которые вы подписаны.",
   "notification.status": "{name} только что запостил",
   "notification.update": "{name} изменил(а) пост",
+  "notification_requests.accept": "Принять",
+  "notification_requests.dismiss": "Отклонить",
+  "notification_requests.notifications_from": "Уведомления от {name}",
+  "notification_requests.title": "Отфильтрованные уведомления",
   "notifications.clear": "Очистить уведомления",
   "notifications.clear_confirmation": "Вы уверены, что хотите очистить все уведомления?",
   "notifications.column_settings.admin.report": "Новые жалобы:",
diff --git a/app/javascript/mastodon/locales/sv.json b/app/javascript/mastodon/locales/sv.json
index 770daf37868009..85511df8ccbc22 100644
--- a/app/javascript/mastodon/locales/sv.json
+++ b/app/javascript/mastodon/locales/sv.json
@@ -220,8 +220,15 @@
   "domain_pill.activitypub_lets_connect": "Det låter dig ansluta och interagera med människor inte bara på Mastodon, men även på andra sociala appar.",
   "domain_pill.activitypub_like_language": "ActivityPub är som språket Mastodon talar med andra sociala nätverk.",
   "domain_pill.server": "Server",
+  "domain_pill.their_handle": "Deras handtag:",
+  "domain_pill.their_server": "Deras digitala hem, där alla deras tjänster bor.",
   "domain_pill.their_username": "Deras unika identifierare på deras server. Det är möjligt att hitta användare med samma användarnamn på olika servrar.",
   "domain_pill.username": "Användarnamn",
+  "domain_pill.whats_in_a_handle": "Vad finns i ett handtag?",
+  "domain_pill.who_they_are": "Eftersom handtag säger vem någon är och var de är, kan du interagera med människor på det sociala nätet av <button>ActivityPub-drivna plattformar</button>.",
+  "domain_pill.who_you_are": "Eftersom handtag säger vem någon är och var de är, kan människor interagera med dig på det sociala nätet av <button>ActivityPub-drivna plattformar</button>.",
+  "domain_pill.your_handle": "Ditt handtag:",
+  "domain_pill.your_server": "Ditt digitala hem, där alla dina inlägg bor. Gillar du inte just denna? Byt server när som helst och ta med dina anhängare också.",
   "domain_pill.your_username": "Din unika identifierare på denna server. Det är möjligt att hitta användare med samma användarnamn på olika servrar.",
   "embed.instructions": "Bädda in detta inlägg på din webbplats genom att kopiera koden nedan.",
   "embed.preview": "Så här kommer det att se ut:",
@@ -259,6 +266,7 @@
   "empty_column.list": "Det finns inget i denna lista än. När listmedlemmar publicerar nya inlägg kommer de synas här.",
   "empty_column.lists": "Du har inga listor än. När skapar en kommer den dyka upp här.",
   "empty_column.mutes": "Du har ännu inte tystat några användare.",
+  "empty_column.notification_requests": "Allt klart! Det finns inget mer här. När du får nya meddelanden visas de här enligt dina inställningar.",
   "empty_column.notifications": "Du har inga meddelanden än. Interagera med andra för att starta konversationen.",
   "empty_column.public": "Det finns inget här! Skriv något offentligt, eller följ manuellt användarna från andra instanser för att fylla på det",
   "error.unexpected_crash.explanation": "På grund av en bugg i vår kod eller kompatiblitetsproblem i webbläsaren kan den här sidan inte visas korrekt.",
@@ -289,6 +297,9 @@
   "filter_modal.select_filter.subtitle": "Använd en befintlig kategori eller skapa en ny",
   "filter_modal.select_filter.title": "Filtrera detta inlägg",
   "filter_modal.title.status": "Filtrera ett inlägg",
+  "filtered_notifications_banner.pending_requests": "Aviseringar från {count, plural, =0 {ingen} one {en person} other {# personer}} du kanske känner",
+  "filtered_notifications_banner.private_mentions": "{count, plural, one {privat omnämnande} other {privat omnämnande}}",
+  "filtered_notifications_banner.title": "Filtrerade aviseringar",
   "firehose.all": "Allt",
   "firehose.local": "Denna server",
   "firehose.remote": "Andra servrar",
@@ -417,7 +428,9 @@
   "loading_indicator.label": "Laddar…",
   "media_gallery.toggle_visible": "Växla synlighet",
   "moved_to_account_banner.text": "Ditt konto {disabledAccount} är för närvarande inaktiverat eftersom du flyttat till {movedToAccount}.",
+  "mute_modal.hide_from_notifications": "Dölj från aviseringslistan",
   "mute_modal.hide_options": "Dölj alternativ",
+  "mute_modal.indefinite": "Tills jag avtystar dem",
   "mute_modal.show_options": "Visa alternativ",
   "mute_modal.they_can_mention_and_follow": "De kan nämna och följa dig, men du ser dem inte.",
   "mute_modal.they_wont_know": "De vet inte att de har blivit tysta.",
@@ -459,6 +472,9 @@
   "notification.own_poll": "Din röstning har avslutats",
   "notification.poll": "En omröstning du röstat i har avslutats",
   "notification.reblog": "{name} boostade ditt inlägg",
+  "notification.relationships_severance_event": "Förlorade kontakter med {name}",
+  "notification.relationships_severance_event.account_suspension": "En administratör från {from} har stängt av {target}, vilket innebär att du inte längre kan ta emot uppdateringar från dem eller interagera med dem.",
+  "notification.relationships_severance_event.domain_block": "En administratör från {from} har blockerat {target}, inklusive {followersCount} av dina följare och {followingCount, plural, one {# konto} other {# konton}} du följer.",
   "notification.relationships_severance_event.learn_more": "Läs mer",
   "notification.status": "{name} publicerade just ett inlägg",
   "notification.update": "{name} redigerade ett inlägg",
diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json
index 22f5420f839d2e..bf1dfb82343576 100644
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@@ -730,7 +730,7 @@
   "status.reblogs.empty": "還沒有人轉嘟過這則嘟文。當有人轉嘟時，它將於此顯示。",
   "status.redraft": "刪除並重新編輯",
   "status.remove_bookmark": "移除書籤",
-  "status.replied_to": "回覆給 {name}",
+  "status.replied_to": "回覆 {name}",
   "status.reply": "回覆",
   "status.replyAll": "回覆討論串",
   "status.report": "檢舉 @{name}",
diff --git a/config/locales/activerecord.ia.yml b/config/locales/activerecord.ia.yml
index 7d1e7d71903c6c..eec89ad52a5e27 100644
--- a/config/locales/activerecord.ia.yml
+++ b/config/locales/activerecord.ia.yml
@@ -7,3 +7,9 @@ ia:
         password: Contrasigno
       user/account:
         username: Nomine de usator
+    errors:
+      models:
+        status:
+          attributes:
+            reblog:
+              taken: del message jam existe
diff --git a/config/locales/devise.de.yml b/config/locales/devise.de.yml
index 7982f8a743237b..73fa1fa60e3bcd 100644
--- a/config/locales/devise.de.yml
+++ b/config/locales/devise.de.yml
@@ -28,12 +28,12 @@ de:
         title: Verifiziere E-Mail-Adresse
       email_changed:
         explanation: 'Die E-Mail-Adresse deines Kontos wird geändert zu:'
-        extra: Wenn du deine E-Mail-Adresse nicht geändert hast, ist es wahrscheinlich, dass sich jemand Zugang zu deinem Konto verschafft hat. Bitte ändere sofort dein Passwort oder kontaktiere die Serververwaltung, wenn du aus deinem Konto ausgesperrt bist.
+        extra: Wenn du deine E-Mail-Adresse nicht geändert hast, ist es wahrscheinlich, dass sich jemand Zugang zu deinem Konto verschafft hat. Bitte ändere sofort dein Passwort oder kontaktiere die Administrator*innen des Servers, wenn du aus deinem Konto ausgesperrt bist.
         subject: 'Mastodon: E-Mail-Adresse geändert'
         title: Neue E-Mail-Adresse
       password_change:
         explanation: Das Passwort für dein Konto wurde geändert.
-        extra: Wenn du dein Passwort nicht geändert hast, ist es wahrscheinlich, dass sich jemand Zugang zu deinem Konto verschafft hat. Bitte ändere sofort dein Passwort oder kontaktiere die Serververwaltung, wenn du aus deinem Konto ausgesperrt bist.
+        extra: Wenn du dein Passwort nicht geändert hast, ist es wahrscheinlich, dass sich jemand Zugang zu deinem Konto verschafft hat. Bitte ändere sofort dein Passwort oder kontaktiere die Administrator*innen des Servers, wenn du aus deinem Konto ausgesperrt bist.
         subject: 'Mastodon: Passwort geändert'
         title: Passwort geändert
       reconfirmation_instructions:
diff --git a/config/locales/es-MX.yml b/config/locales/es-MX.yml
index f4f953a0c45c65..4d17de4d0a5e58 100644
--- a/config/locales/es-MX.yml
+++ b/config/locales/es-MX.yml
@@ -1674,7 +1674,7 @@ es-MX:
     lost_follows: Cuentas seguidas perdidas
     preamble: Puedes perder cuentas seguidas y seguidores cuando bloqueas un dominio o cuando tus moderadores deciden suspender un servidor remoto. Cuando esto suceda, podrás descargar listas de relaciones cortadas, para ser inspeccionadas y posiblemente importadas en otro servidor.
     purged: La información sobre este servidor ha sido purgada por los administradores de tu servidor.
-    type: Suceso
+    type: Evento
   statuses:
     attached:
       audio:
diff --git a/config/locales/et.yml b/config/locales/et.yml
index 889ddfcff1a60a..a544d8063dbb32 100644
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -597,6 +597,9 @@ et:
       actions_description_html: Otsustus, mida raporti lahendamiseks ette võtta. Karistava tegevuse korral saadetakse e-postiga teade, välja arvatud kategooria <strong>rämpspost</strong> puhul.
       actions_description_remote_html: Otsusta, mida teha selle raporti lahendamiseks. See mõjutab ainult seda, kuidas <strong>Sinu</strong> server selle kaugkontoga suhtleb ning selle sisu käsitleb.
       add_to_report: Lisa raportile juurde
+      already_suspended_badges:
+        local: Juba kustutamisel selles serveris
+        remote: Juba kustutamisel tema serveris
       are_you_sure: Oled kindel?
       assign_to_self: Määra mulle
       assigned: Määratud moderaator
@@ -1652,13 +1655,26 @@ et:
     import: Impordi
     import_and_export: Import / eksport
     migrate: Konto kolimine
+    notifications: E-postiteavitused
     preferences: Eelistused
     profile: Profiil
     relationships: Jälgitud ja jälgijad
+    severed_relationships: Katkestatud seos
     statuses_cleanup: Automaatne kustutamine
     strikes: Modereerimisjuhtumid
     two_factor_authentication: Kaheastmeline autentimine
     webauthn_authentication: Turvavõtmed
+  severed_relationships:
+    download: Allalaadimine (%{count})
+    event_type:
+      account_suspension: Konto kustutamisel (%{target_name})
+      domain_block: Server kustutamisel (%{target_name})
+      user_domain_block: Blokeerisid %{target_name}
+    lost_followers: Kadunud jälgijad
+    lost_follows: Kaotatud jälgimised
+    preamble: Võid kaotada jälgijaid ja jälgitavaid, kui blokeerid domeeni või kui su moderaatorid otsustavad kustutada kaugserveri. Kui see juhtub, saad alla laadida katkestatud seoste loetelu, et see üle vaadata ja võib-olla teise serverisse üles laadida.
+    purged: Selle serveri info on sinu serveri administraatorite poolt tühjendatud.
+    type: Sündmus
   statuses:
     attached:
       audio:
@@ -1754,6 +1770,7 @@ et:
     contrast: Mastodon (Kõrge kontrast)
     default: Mastodon (Tume)
     mastodon-light: Mastodon (Hele)
+    system: Automaatne (kasuta süsteemi teemat)
   time:
     formats:
       default: "%d. %B, %Y. aastal, kell %H:%M"
@@ -1866,6 +1883,9 @@ et:
       follows_subtitle: Jälgi teada-tuntud kasutajaid
       follows_title: Keda jälgida
       follows_view_more: Vaata lähemalt, keda jälgida
+      hashtags_recent_count:
+        one: "%{people} isikut viimase 2 päeva jooksul"
+        other: "%{people} inimest viimase 2 päeva jooksul"
       hashtags_subtitle: Avasta, mis viimase 2 päeva jooksul on toimunud
       hashtags_title: Populaarsed märksõnad
       hashtags_view_more: Vaata teisi trendikaid märksõnu
diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index 52cf861b48e5b1..ecdf73ef9ef514 100644
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -1,7 +1,20 @@
 ---
 ia:
   about:
+    about_mastodon_html: 'Le rete social del futuro: nulle publicitate, nulle surveliantia corporative, conception ethic, e decentralisation! Mantene le controlo de tu datos con Mastodon!'
     contact_missing: Non definite
+    contact_unavailable: N/D
+    hosted_on: Mastodon albergate sur %{domain}
+    title: A proposito
+  accounts:
+    follow: Sequer
+    followers:
+      one: Sequitor
+      other: Sequitores
+    following: Sequente
+    instance_actor_flash: Iste conto es un agente virtual usate pro representar le servitor mesme e non alcun usator individual. Illo es usate pro le federation e non debe esser suspendite.
+    last_active: ultime activitate
+    link_verified_on: Le proprietate de iste ligamine ha essite verificate le %{date}
   admin:
     accounts:
       are_you_sure: Es tu secur?
diff --git a/config/locales/ie.yml b/config/locales/ie.yml
index 6763a8038a5f8f..46e55b9e19feb2 100644
--- a/config/locales/ie.yml
+++ b/config/locales/ie.yml
@@ -597,6 +597,9 @@ ie:
       actions_description_html: Decider quel action a far por soluer ti raporte. Si tu fa un punitiv action contra li raportat conto, li usator va reciver un notification per email, except in li casu que li <strong>Spam</strong> categorie es selectet.
       actions_description_remote_html: Decider quel action a far por soluer ti raporte. It va afecter solmen qualmen <strong>vor</strong> servitor comunica con ti lontan conto e tractar su contenete.
       add_to_report: Adjunter plu al raporte
+      already_suspended_badges:
+        local: Ja suspendet sur ti-ci servitor
+        remote: Ja suspendet sur su servitor
       are_you_sure: Es tu cert?
       assign_to_self: Assignar it a me
       assigned: Assignat moderator
@@ -1652,6 +1655,7 @@ ie:
     import: Importar
     import_and_export: Importation e exportation
     migrate: Migration de conto
+    notifications: E-postal notificationes
     preferences: Preferenties
     profile: Public profil
     relationships: Sequetes e sequitores
@@ -1659,6 +1663,14 @@ ie:
     strikes: Admonimentes moderatori
     two_factor_authentication: 2-factor autentication
     webauthn_authentication: Claves de securitá
+  severed_relationships:
+    download: Descargar (%{count})
+    event_type:
+      account_suspension: Suspension del conto (%{target_name})
+      user_domain_block: Tu bloccat %{target_name}
+    lost_followers: Perdit sequitores
+    preamble: Tu posse perdir tis queles tu seque e tui sequitores quande tu blocca un domonia o quande tui moderatores decide suspender un lontan servitor. Tande, tu va posser descargar listes de dejuntet relationes, a inspecter e possibilmen importar sur un altri servitor.
+    type: Eveniment
   statuses:
     attached:
       audio:
@@ -1752,6 +1764,7 @@ ie:
     contrast: Mastodon (Alt contraste)
     default: Mastodon (Obscur)
     mastodon-light: Mastodon (Luminosi)
+    system: Automatic (usar tema del sistema)
   time:
     formats:
       default: "%d.%m.%Y ye %H:%M"
@@ -1864,6 +1877,9 @@ ie:
       follows_subtitle: Sequer famosi contos
       follows_title: Persones a sequer
       follows_view_more: Vider plu persones a sequer
+      hashtags_recent_count:
+        one: "%{people} person in li passat 2 dies"
+        other: "%{people} persones in li passat 2 dies"
       hashtags_subtitle: Explorar li postas de tendentie durant li passat 2 dies
       hashtags_title: Populari hashtags
       hashtags_view_more: Vider plu hashtags in tendentie
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 59ccb5f27e40be..f12735cfb13c2c 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -1234,7 +1234,7 @@ it:
     bookmarks: Segnalibri
     csv: CSV
     domain_blocks: Blocchi di dominio
-    lists: Liste
+    lists: Elenchi
     mutes: Stai silenziando
     storage: Archiviazione media
   featured_tags:
diff --git a/config/locales/lad.yml b/config/locales/lad.yml
index 3aaac3ab5ab504..e9f18d4bede648 100644
--- a/config/locales/lad.yml
+++ b/config/locales/lad.yml
@@ -1665,6 +1665,10 @@ lad:
     webauthn_authentication: Yaves de sigurita
   severed_relationships:
     download: Abasha (%{count})
+    event_type:
+      user_domain_block: Blokates a %{target_name}
+    lost_followers: Suivantes pedridos
+    lost_follows: Segimyentos pedridos
     type: Evenimiento
   statuses:
     attached:
diff --git a/config/locales/simple_form.et.yml b/config/locales/simple_form.et.yml
index c2df26c1240080..1f7d940049652b 100644
--- a/config/locales/simple_form.et.yml
+++ b/config/locales/simple_form.et.yml
@@ -116,6 +116,7 @@ et:
           sign_up_requires_approval: Uued liitumised vajavad kinnitamist
         severity: Valik, mis juhtub päringutega sellelt IP-aadressilt
       rule:
+        hint: Valikuline. Anna reegli kohta rohkem üksikasju
         text: Reegli või nõude kirjeldus selle serveri kasutajatele. Võimalikult lühidalt ja lihtsalt
       sessions:
         otp: 'Kaheastmelise autentimise kood telefonirakendusest või mõni taastekood:'
@@ -299,6 +300,7 @@ et:
           patch: Teata veaparandusuuendustest
         trending_tag: Uus trend vajab ülevaatust
       rule:
+        hint: Lisainfo
         text: Reegel
       settings:
         indexable: Kaasa profiilileht otsimootoritesse
diff --git a/config/locales/simple_form.ia.yml b/config/locales/simple_form.ia.yml
index af198d932a38f3..16dbcbd187dac9 100644
--- a/config/locales/simple_form.ia.yml
+++ b/config/locales/simple_form.ia.yml
@@ -15,6 +15,7 @@ ia:
         current_password: Contrasigno actual
         new_password: Nove contrasigno
         password: Contrasigno
+        setting_default_language: Lingua de publication
         setting_display_media_default: Predefinite
         setting_display_media_hide_all: Celar toto
         setting_display_media_show_all: Monstrar toto
@@ -35,9 +36,15 @@ ia:
         site_title: Nomine de servitor
         theme: Thema predefinite
         trends: Activar tendentias
+      ip_block:
+        severity: Regula
       notification_emails:
         software_updates:
           label: Un nove version de Mastodon es disponibile
+      rule:
+        text: Regula
+      settings:
+        indexable: Includer pagina de profilo in le motores de recerca
       user:
         time_zone: Fuso horari
       user_role:
diff --git a/config/locales/simple_form.ie.yml b/config/locales/simple_form.ie.yml
index 3cf5c33f2c2121..e142617fcc520a 100644
--- a/config/locales/simple_form.ie.yml
+++ b/config/locales/simple_form.ie.yml
@@ -116,6 +116,7 @@ ie:
           sign_up_requires_approval: Nov registrationes va besonar tui aprobation
         severity: Selecter quo va evenir con demandes ex ti-ci IP
       rule:
+        hint: Optional. Ples provider plu detallies pri li regul
         text: Descrir un regul o postulation por usatores sur ti-ci servitor. Prova scrir un descrition curt e simplic
       sessions:
         otp: 'Intrar li 2-factor code generat del app sur tui portabile o usar un de tui codes de recuperation:'
@@ -299,6 +300,7 @@ ie:
           patch: Notificar pri problema-fixant actualisationes
         trending_tag: Nov tendentie besonant inspection
       rule:
+        hint: Information in plu
         text: Regul
       settings:
         indexable: Includer profil-pagine in serchatores

From a3fe82e359544047aa8f6a37d253f53abd16ad06 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 2 Apr 2024 05:34:44 -0400
Subject: [PATCH 0649/2191] Rename cop `RSpec/Rails/HttpStatus` to
 `RSpecRails/HttpStatus` (#29806)

---
 .rubocop.yml | 10 +++++-----
 Gemfile.lock |  5 ++++-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 541da330c73f99..2aa72d9e5e8938 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -142,11 +142,6 @@ RSpec/NamedSubject:
 RSpec/NotToNot:
   EnforcedStyle: to_not
 
-# Reason: Prevailing style uses numeric status codes, matches Rails/HttpStatus
-# https://docs.rubocop.org/rubocop-rspec/cops_rspec_rails.html#rspecrailshttpstatus
-RSpec/Rails/HttpStatus:
-  EnforcedStyle: numeric
-
 # Reason: Match overrides from Rspec/FilePath rule above
 # https://docs.rubocop.org/rubocop-rspec/cops_rspec.html#rspecspecfilepathformat
 RSpec/SpecFilePathFormat:
@@ -157,6 +152,11 @@ RSpec/SpecFilePathFormat:
     OEmbedController: oembed_controller
     OStatus: ostatus
 
+# Reason: Prevailing style uses numeric status codes, matches Rails/HttpStatus
+# https://docs.rubocop.org/rubocop-rspec/cops_rspec_rails.html#rspecrailshttpstatus
+RSpecRails/HttpStatus:
+  EnforcedStyle: numeric
+
 # Reason:
 # https://docs.rubocop.org/rubocop/cops_style.html#styleclassandmodulechildren
 Style/ClassAndModuleChildren:
diff --git a/Gemfile.lock b/Gemfile.lock
index bd15ad73a2510e..9c36daec92e1d9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -672,10 +672,13 @@ GEM
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rspec (2.27.1)
+    rubocop-rspec (2.28.0)
       rubocop (~> 1.40)
       rubocop-capybara (~> 2.17)
       rubocop-factory_bot (~> 2.22)
+      rubocop-rspec_rails (~> 2.28)
+    rubocop-rspec_rails (2.28.2)
+      rubocop (~> 1.40)
     ruby-prof (1.7.0)
     ruby-progressbar (1.13.0)
     ruby-saml (1.15.0)

From 07635228e2b2182888850cecddd4b09756d9edbc Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Tue, 2 Apr 2024 11:56:03 +0200
Subject: [PATCH 0650/2191] Fix Redux Middleware types (#29800)

---
 app/javascript/mastodon/store/middlewares/errors.ts | 3 ++-
 app/javascript/mastodon/store/middlewares/sounds.ts | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/javascript/mastodon/store/middlewares/errors.ts b/app/javascript/mastodon/store/middlewares/errors.ts
index 977a09a464e04e..e77cec34ed9fb6 100644
--- a/app/javascript/mastodon/store/middlewares/errors.ts
+++ b/app/javascript/mastodon/store/middlewares/errors.ts
@@ -30,7 +30,8 @@ function isActionWithmaybeAlertParams(
   return isAction(action);
 }
 
-export const errorsMiddleware: Middleware<Record<string, never>, RootState> =
+// eslint-disable-next-line @typescript-eslint/ban-types -- we need to use `{}` here to ensure the dispatch types can be merged
+export const errorsMiddleware: Middleware<{}, RootState> =
   ({ dispatch }) =>
   (next) =>
   (action) => {
diff --git a/app/javascript/mastodon/store/middlewares/sounds.ts b/app/javascript/mastodon/store/middlewares/sounds.ts
index 51839f427aee8d..720ee163e9d9ab 100644
--- a/app/javascript/mastodon/store/middlewares/sounds.ts
+++ b/app/javascript/mastodon/store/middlewares/sounds.ts
@@ -51,7 +51,8 @@ const play = (audio: HTMLAudioElement) => {
 };
 
 export const soundsMiddleware = (): Middleware<
-  Record<string, never>,
+  // eslint-disable-next-line @typescript-eslint/ban-types -- we need to use `{}` here to ensure the dispatch types can be merged
+  {},
   RootState
 > => {
   const soundCache: Record<string, HTMLAudioElement> = {};

From e47a3d00fe21fa51ee1aeffbfb5e152f1f715fef Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Tue, 2 Apr 2024 12:03:33 +0200
Subject: [PATCH 0651/2191] Add API types for status and related objects
 (#29792)

---
 .../mastodon/api_types/media_attachments.ts   | 22 +++++
 app/javascript/mastodon/api_types/polls.ts    | 23 +++++
 app/javascript/mastodon/api_types/statuses.ts | 91 +++++++++++++++++++
 app/javascript/mastodon/models/status.ts      |  2 +-
 .../rest/media_attachment_serializer.rb       |  2 +
 app/serializers/rest/poll_serializer.rb       |  2 +
 app/serializers/rest/status_serializer.rb     |  2 +
 7 files changed, 143 insertions(+), 1 deletion(-)
 create mode 100644 app/javascript/mastodon/api_types/media_attachments.ts
 create mode 100644 app/javascript/mastodon/api_types/polls.ts
 create mode 100644 app/javascript/mastodon/api_types/statuses.ts

diff --git a/app/javascript/mastodon/api_types/media_attachments.ts b/app/javascript/mastodon/api_types/media_attachments.ts
new file mode 100644
index 00000000000000..fc027ccd2a5d27
--- /dev/null
+++ b/app/javascript/mastodon/api_types/media_attachments.ts
@@ -0,0 +1,22 @@
+// See app/serializers/rest/media_attachment_serializer.rb
+
+export type MediaAttachmentType =
+  | 'image'
+  | 'gifv'
+  | 'video'
+  | 'unknown'
+  | 'audio';
+
+export interface ApiMediaAttachmentJSON {
+  id: string;
+  type: MediaAttachmentType;
+  url: string;
+  preview_url: string;
+  remoteUrl: string;
+  preview_remote_url: string;
+  text_url: string;
+  // TODO: how to define this?
+  meta: unknown;
+  description?: string;
+  blurhash: string;
+}
diff --git a/app/javascript/mastodon/api_types/polls.ts b/app/javascript/mastodon/api_types/polls.ts
new file mode 100644
index 00000000000000..8181f7b813b82a
--- /dev/null
+++ b/app/javascript/mastodon/api_types/polls.ts
@@ -0,0 +1,23 @@
+import type { ApiCustomEmojiJSON } from './custom_emoji';
+
+// See app/serializers/rest/poll_serializer.rb
+
+export interface ApiPollOptionJSON {
+  title: string;
+  votes_count: number;
+}
+
+export interface ApiPollJSON {
+  id: string;
+  expires_at: string;
+  expired: boolean;
+  multiple: boolean;
+  votes_count: number;
+  voters_count: number;
+
+  options: ApiPollOptionJSON[];
+  emojis: ApiCustomEmojiJSON[];
+
+  voted: boolean;
+  own_votes: number[];
+}
diff --git a/app/javascript/mastodon/api_types/statuses.ts b/app/javascript/mastodon/api_types/statuses.ts
new file mode 100644
index 00000000000000..c7dd33b5dade30
--- /dev/null
+++ b/app/javascript/mastodon/api_types/statuses.ts
@@ -0,0 +1,91 @@
+// See app/serializers/rest/status_serializer.rb
+
+import type { ApiAccountJSON } from './accounts';
+import type { ApiCustomEmojiJSON } from './custom_emoji';
+import type { ApiMediaAttachmentJSON } from './media_attachments';
+import type { ApiPollJSON } from './polls';
+
+// See app/modals/status.rb
+export type StatusVisibility =
+  | 'public'
+  | 'unlisted'
+  | 'private'
+  // | 'limited' // This is never exposed to the API (they become `private`)
+  | 'direct';
+
+export interface ApiStatusApplicationJSON {
+  name: string;
+  website: string;
+}
+
+export interface ApiTagJSON {
+  name: string;
+  url: string;
+}
+
+export interface ApiMentionJSON {
+  id: string;
+  username: string;
+  url: string;
+  acct: string;
+}
+
+export interface ApiPreviewCardJSON {
+  url: string;
+  title: string;
+  description: string;
+  language: string;
+  type: string;
+  author_name: string;
+  author_url: string;
+  provider_name: string;
+  provider_url: string;
+  html: string;
+  width: number;
+  height: number;
+  image: string;
+  image_description: string;
+  embed_url: string;
+  blurhash: string;
+  published_at: string;
+}
+
+export interface ApiStatusJSON {
+  id: string;
+  created_at: string;
+  in_reply_to_id?: string;
+  in_reply_to_account_id?: string;
+  sensitive: boolean;
+  spoiler_text?: string;
+  visibility: StatusVisibility;
+  language: string;
+  uri: string;
+  url: string;
+  replies_count: number;
+  reblogs_count: number;
+  favorites_count: number;
+  edited_at?: string;
+
+  favorited?: boolean;
+  reblogged?: boolean;
+  muted?: boolean;
+  bookmarked?: boolean;
+  pinned?: boolean;
+
+  // filtered: FilterResult[]
+  filtered: unknown; // TODO
+  content?: string;
+  text?: string;
+
+  reblog?: ApiStatusJSON;
+  application?: ApiStatusApplicationJSON;
+  account: ApiAccountJSON;
+  media_attachments: ApiMediaAttachmentJSON[];
+  mentions: ApiMentionJSON[];
+
+  tags: ApiTagJSON[];
+  emojis: ApiCustomEmojiJSON[];
+
+  card?: ApiPreviewCardJSON;
+  poll?: ApiPollJSON;
+}
diff --git a/app/javascript/mastodon/models/status.ts b/app/javascript/mastodon/models/status.ts
index 83e9f6b8855141..7907fc34f8e186 100644
--- a/app/javascript/mastodon/models/status.ts
+++ b/app/javascript/mastodon/models/status.ts
@@ -1,4 +1,4 @@
-export type StatusVisibility = 'public' | 'unlisted' | 'private' | 'direct';
+export type { StatusVisibility } from 'mastodon/api_types/statuses';
 
 // Temporary until we type it correctly
 export type Status = Immutable.Map<string, unknown>;
diff --git a/app/serializers/rest/media_attachment_serializer.rb b/app/serializers/rest/media_attachment_serializer.rb
index f27dda832adeb8..90a2a972750b3d 100644
--- a/app/serializers/rest/media_attachment_serializer.rb
+++ b/app/serializers/rest/media_attachment_serializer.rb
@@ -3,6 +3,8 @@
 class REST::MediaAttachmentSerializer < ActiveModel::Serializer
   include RoutingHelper
 
+  # Please update `app/javascript/mastodon/api_types/media_attachments.ts` when making changes to the attributes
+
   attributes :id, :type, :url, :preview_url,
              :remote_url, :preview_remote_url, :text_url, :meta,
              :description, :blurhash
diff --git a/app/serializers/rest/poll_serializer.rb b/app/serializers/rest/poll_serializer.rb
index df6ebd0d44676c..6e000607352b02 100644
--- a/app/serializers/rest/poll_serializer.rb
+++ b/app/serializers/rest/poll_serializer.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class REST::PollSerializer < ActiveModel::Serializer
+  # Please update `app/javascript/mastodon/api_types/polls.ts` when making changes to the attributes
+
   attributes :id, :expires_at, :expired,
              :multiple, :votes_count, :voters_count
 
diff --git a/app/serializers/rest/status_serializer.rb b/app/serializers/rest/status_serializer.rb
index d32621541aeb8b..e17e8c823e76fa 100644
--- a/app/serializers/rest/status_serializer.rb
+++ b/app/serializers/rest/status_serializer.rb
@@ -3,6 +3,8 @@
 class REST::StatusSerializer < ActiveModel::Serializer
   include FormattingHelper
 
+  # Please update `app/javascript/mastodon/api_types/statuses.ts` when making changes to the attributes
+
   attributes :id, :created_at, :in_reply_to_id, :in_reply_to_account_id,
              :sensitive, :spoiler_text, :visibility, :language,
              :uri, :url, :replies_count, :reblogs_count,

From d05f62391d0f0e2da43de63d888121ad23c479b2 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 2 Apr 2024 10:04:32 +0000
Subject: [PATCH 0652/2191] Update dependency public_suffix to v5.0.5 (#29824)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 9c36daec92e1d9..d38de8e88f961b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -526,7 +526,7 @@ GEM
       railties (>= 7.0.0)
     psych (5.1.2)
       stringio
-    public_suffix (5.0.4)
+    public_suffix (5.0.5)
     puma (6.4.2)
       nio4r (~> 2.0)
     pundit (2.3.1)

From b4d991adaa82e05a2dd95ae5c08bb374391ef568 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Tue, 2 Apr 2024 12:06:26 +0200
Subject: [PATCH 0653/2191] Use integers and not numbers in notification policy
 API counters (#29810)

---
 .../components/filtered_notifications_banner.jsx          | 2 +-
 app/javascript/mastodon/utils/numbers.ts                  | 8 ++++----
 app/serializers/rest/notification_policy_serializer.rb    | 4 ++--
 spec/requests/api/v1/notifications/policies_spec.rb       | 8 ++++----
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/javascript/mastodon/features/notifications/components/filtered_notifications_banner.jsx b/app/javascript/mastodon/features/notifications/components/filtered_notifications_banner.jsx
index ecf4b74e802269..f9b8c0be1467ec 100644
--- a/app/javascript/mastodon/features/notifications/components/filtered_notifications_banner.jsx
+++ b/app/javascript/mastodon/features/notifications/components/filtered_notifications_banner.jsx
@@ -27,7 +27,7 @@ export const FilteredNotificationsBanner = () => {
     };
   }, [dispatch]);
 
-  if (policy === null || policy.getIn(['summary', 'pending_notifications_count']) * 1 === 0) {
+  if (policy === null || policy.getIn(['summary', 'pending_notifications_count']) === 0) {
     return null;
   }
 
diff --git a/app/javascript/mastodon/utils/numbers.ts b/app/javascript/mastodon/utils/numbers.ts
index ee2dabf56684b4..0c11c268ddf2cb 100644
--- a/app/javascript/mastodon/utils/numbers.ts
+++ b/app/javascript/mastodon/utils/numbers.ts
@@ -70,10 +70,10 @@ export function roundTo10(num: number): number {
   return Math.round(num * 0.1) / 0.1;
 }
 
-export function toCappedNumber(num: string): string {
-  if (parseInt(num) > 99) {
-    return '99+';
+export function toCappedNumber(num: number, max = 99): string {
+  if (num > max) {
+    return `${max}+`;
   } else {
-    return num;
+    return num.toString();
   }
 }
diff --git a/app/serializers/rest/notification_policy_serializer.rb b/app/serializers/rest/notification_policy_serializer.rb
index 4967c3e3206b09..a50ba9e66b827f 100644
--- a/app/serializers/rest/notification_policy_serializer.rb
+++ b/app/serializers/rest/notification_policy_serializer.rb
@@ -9,8 +9,8 @@ class REST::NotificationPolicySerializer < ActiveModel::Serializer
 
   def summary
     {
-      pending_requests_count: object.pending_requests_count.to_s,
-      pending_notifications_count: object.pending_notifications_count.to_s,
+      pending_requests_count: object.pending_requests_count.to_i,
+      pending_notifications_count: object.pending_notifications_count.to_i,
     }
   end
 end
diff --git a/spec/requests/api/v1/notifications/policies_spec.rb b/spec/requests/api/v1/notifications/policies_spec.rb
index 9acd47a7b42f68..d02d2ed0d7b27d 100644
--- a/spec/requests/api/v1/notifications/policies_spec.rb
+++ b/spec/requests/api/v1/notifications/policies_spec.rb
@@ -32,8 +32,8 @@
           filter_new_accounts: false,
           filter_private_mentions: true,
           summary: a_hash_including(
-            pending_requests_count: '1',
-            pending_notifications_count: '0'
+            pending_requests_count: 1,
+            pending_notifications_count: 0
           )
         )
       end
@@ -60,8 +60,8 @@
         filter_new_accounts: false,
         filter_private_mentions: true,
         summary: a_hash_including(
-          pending_requests_count: '0',
-          pending_notifications_count: '0'
+          pending_requests_count: 0,
+          pending_notifications_count: 0
         )
       )
     end

From f6e24bbd798b32e683c752c28011fc3b2118d934 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 2 Apr 2024 14:13:43 +0200
Subject: [PATCH 0654/2191] Update dependency postcss-preset-env to v9.5.4
 (#29825)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index e58a030c36e6b7..99f6f99c6cf477 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1748,9 +1748,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-light-dark-function@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "@csstools/postcss-light-dark-function@npm:1.0.2"
+"@csstools/postcss-light-dark-function@npm:^1.0.3":
+  version: 1.0.3
+  resolution: "@csstools/postcss-light-dark-function@npm:1.0.3"
   dependencies:
     "@csstools/css-parser-algorithms": "npm:^2.6.1"
     "@csstools/css-tokenizer": "npm:^2.2.4"
@@ -1758,7 +1758,7 @@ __metadata:
     "@csstools/utilities": "npm:^1.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/c7ed0037e68aa6ede2440a598caa776812e602e12f69d0fd8f0975cf3469a3593bd34fd408ed7d0b73af2ae4498bd6334cb3222fedb2a432a9ab8fa731e07108
+  checksum: 10c0/99a1b72aba08a6fa5c7271d42f4459d86f001fe83f533c0ed3d21556f53ee227f65f94cda1feee1aa910890fc42482f15a4dfb3edbc7afdad828ce8897d0c52b
   languageName: node
   linkType: hard
 
@@ -13659,8 +13659,8 @@ __metadata:
   linkType: hard
 
 "postcss-preset-env@npm:^9.5.2":
-  version: 9.5.3
-  resolution: "postcss-preset-env@npm:9.5.3"
+  version: 9.5.4
+  resolution: "postcss-preset-env@npm:9.5.4"
   dependencies:
     "@csstools/postcss-cascade-layers": "npm:^4.0.4"
     "@csstools/postcss-color-function": "npm:^3.0.13"
@@ -13673,7 +13673,7 @@ __metadata:
     "@csstools/postcss-ic-unit": "npm:^3.0.6"
     "@csstools/postcss-initial": "npm:^1.0.1"
     "@csstools/postcss-is-pseudo-class": "npm:^4.0.6"
-    "@csstools/postcss-light-dark-function": "npm:^1.0.2"
+    "@csstools/postcss-light-dark-function": "npm:^1.0.3"
     "@csstools/postcss-logical-float-and-clear": "npm:^2.0.1"
     "@csstools/postcss-logical-overflow": "npm:^1.0.1"
     "@csstools/postcss-logical-overscroll-behavior": "npm:^1.0.1"
@@ -13724,7 +13724,7 @@ __metadata:
     postcss-selector-not: "npm:^7.0.2"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/0f6ed8ec9dc5365d1ca1d29652464f2cfebb6b39dfe39b55712c9251addde3289702ea37e1731da5b16bb70f2fb871d165bb0d33452506fa9121e5f696b63d34
+  checksum: 10c0/6af900ad2f46b640339b626317288543ebb7c47b739f4776e4006513b32eceabe0be78109aa58446fa0f50284a433b3e3a9bd48aa5730fd0ac59ef51153e8f7b
   languageName: node
   linkType: hard
 

From 695dded7ed3afbc50ed60acfc4402c117c40a21c Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 2 Apr 2024 15:29:46 +0200
Subject: [PATCH 0655/2191] Update dependency aws-sdk-s3 to v1.146.1 (#28961)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index d38de8e88f961b..0a6d6036ea012a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -103,7 +103,7 @@ GEM
     awrence (1.2.1)
     aws-eventstream (1.3.0)
     aws-partitions (1.899.0)
-    aws-sdk-core (3.191.4)
+    aws-sdk-core (3.191.5)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.8)
@@ -111,7 +111,7 @@ GEM
     aws-sdk-kms (1.78.0)
       aws-sdk-core (~> 3, >= 3.191.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.146.0)
+    aws-sdk-s3 (1.146.1)
       aws-sdk-core (~> 3, >= 3.191.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.8)

From b0692d994ff77d0832a471e171e8c770b965d7c8 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 2 Apr 2024 15:31:03 +0200
Subject: [PATCH 0656/2191] Update dependency letter_opener to v1.10.0 (#29189)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 0a6d6036ea012a..913164d18f6095 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -398,8 +398,8 @@ GEM
     language_server-protocol (3.17.0.3)
     launchy (2.5.2)
       addressable (~> 2.8)
-    letter_opener (1.8.1)
-      launchy (>= 2.2, < 3)
+    letter_opener (1.10.0)
+      launchy (>= 2.2, < 4)
     letter_opener_web (2.0.0)
       actionmailer (>= 5.2)
       letter_opener (~> 1.7)

From c70c39cad03824c64564fa7d241e6bf01acbab76 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 2 Apr 2024 15:47:15 +0200
Subject: [PATCH 0657/2191] Update docker/dockerfile Docker tag to v1.7
 (#27993)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Dockerfile           | 2 +-
 streaming/Dockerfile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 8778133e0d17cb..1b007930ebe64f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.4
+# syntax=docker/dockerfile:1.7
 
 # Please see https://docs.docker.com/engine/reference/builder for information about
 # the extended buildx capabilities used in this file.
diff --git a/streaming/Dockerfile b/streaming/Dockerfile
index 241009fe893899..7f373e9cd5aa61 100644
--- a/streaming/Dockerfile
+++ b/streaming/Dockerfile
@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.4
+# syntax=docker/dockerfile:1.7
 
 # Please see https://docs.docker.com/engine/reference/builder for information about
 # the extended buildx capabilities used in this file.

From f56309f5f03f28d35c5e36b8cab282a03522370a Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 2 Apr 2024 09:51:34 -0400
Subject: [PATCH 0658/2191] Add `by_latest_used` scope, move admin area recent
 IPs to partial (#29497)

---
 app/models/user_ip.rb                             | 2 ++
 app/views/admin/accounts/_local_account.html.haml | 8 +-------
 app/views/admin/accounts/_user_ip.html.haml       | 5 +++++
 3 files changed, 8 insertions(+), 7 deletions(-)
 create mode 100644 app/views/admin/accounts/_user_ip.html.haml

diff --git a/app/models/user_ip.rb b/app/models/user_ip.rb
index 87b86a24d43f9a..a6da2c07401b44 100644
--- a/app/models/user_ip.rb
+++ b/app/models/user_ip.rb
@@ -15,4 +15,6 @@ class UserIp < ApplicationRecord
   self.primary_key = :user_id
 
   belongs_to :user
+
+  scope :by_latest_used, -> { order(used_at: :desc) }
 end
diff --git a/app/views/admin/accounts/_local_account.html.haml b/app/views/admin/accounts/_local_account.html.haml
index 82197cda43d9d5..3ed392cd1a53db 100644
--- a/app/views/admin/accounts/_local_account.html.haml
+++ b/app/views/admin/accounts/_local_account.html.haml
@@ -62,13 +62,7 @@
   %td
     %time.formatted{ datetime: account.created_at.iso8601, title: l(account.created_at) }= l account.created_at
   %td
-- recent_ips = account.user.ips.order(used_at: :desc).to_a
-- recent_ips.each_with_index do |recent_ip, i|
-  %tr
-    - if i.zero?
-      %th{ rowspan: recent_ips.size }= t('admin.accounts.most_recent_ip')
-    %td= recent_ip.ip
-    %td= table_link_to 'search', t('admin.accounts.search_same_ip'), admin_accounts_path(ip: recent_ip.ip)
+  = render partial: 'admin/accounts/user_ip', collection: account.user.ips.by_latest_used
 %tr
   %th= t('admin.accounts.most_recent_activity')
   %td
diff --git a/app/views/admin/accounts/_user_ip.html.haml b/app/views/admin/accounts/_user_ip.html.haml
new file mode 100644
index 00000000000000..1938cf7edf09b2
--- /dev/null
+++ b/app/views/admin/accounts/_user_ip.html.haml
@@ -0,0 +1,5 @@
+%tr
+  - if user_ip_iteration.first?
+    %th{ rowspan: user_ip_iteration.size }= t('admin.accounts.most_recent_ip')
+  %td= user_ip.ip
+  %td= table_link_to 'search', t('admin.accounts.search_same_ip'), admin_accounts_path(ip: user_ip.ip)

From 34489591ec4d05fa16049e9e99d39a09a80f2d65 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 2 Apr 2024 09:54:11 -0400
Subject: [PATCH 0659/2191] Add `max_pinned_statuses` to instances serializer
 and api response (#29441)

---
 app/serializers/rest/instance_serializer.rb   |  1 +
 spec/requests/api/v2/instance_spec.rb         | 20 +++++++++++++++++++
 .../rest/instance_serializer_spec.rb          | 11 ++++++++++
 3 files changed, 32 insertions(+)

diff --git a/app/serializers/rest/instance_serializer.rb b/app/serializers/rest/instance_serializer.rb
index fa926cd287227d..42b73f4387cf11 100644
--- a/app/serializers/rest/instance_serializer.rb
+++ b/app/serializers/rest/instance_serializer.rb
@@ -54,6 +54,7 @@ def configuration
 
       accounts: {
         max_featured_tags: FeaturedTag::LIMIT,
+        max_pinned_statuses: StatusPinValidator::PIN_LIMIT,
       },
 
       statuses: {
diff --git a/spec/requests/api/v2/instance_spec.rb b/spec/requests/api/v2/instance_spec.rb
index 74574afbcf7eac..c5c6a26f49e26b 100644
--- a/spec/requests/api/v2/instance_spec.rb
+++ b/spec/requests/api/v2/instance_spec.rb
@@ -18,6 +18,7 @@
         expect(body_as_json)
           .to be_present
           .and include(title: 'Mastodon')
+          .and include_configuration_limits
       end
     end
 
@@ -31,7 +32,26 @@
         expect(body_as_json)
           .to be_present
           .and include(title: 'Mastodon')
+          .and include_configuration_limits
       end
     end
+
+    def include_configuration_limits
+      include(
+        configuration: include(
+          accounts: include(
+            max_featured_tags: FeaturedTag::LIMIT,
+            max_pinned_statuses: StatusPinValidator::PIN_LIMIT
+          ),
+          statuses: include(
+            max_characters: StatusLengthValidator::MAX_CHARS,
+            max_media_attachments: 4 # TODO, move to constant somewhere
+          ),
+          polls: include(
+            max_options: PollValidator::MAX_OPTIONS
+          )
+        )
+      )
+    end
   end
 end
diff --git a/spec/serializers/rest/instance_serializer_spec.rb b/spec/serializers/rest/instance_serializer_spec.rb
index d8f2536d200867..39e6b3820b7049 100644
--- a/spec/serializers/rest/instance_serializer_spec.rb
+++ b/spec/serializers/rest/instance_serializer_spec.rb
@@ -10,11 +10,22 @@
     it 'returns recent usage data' do
       expect(serialization['usage']).to eq({ 'users' => { 'active_month' => 0 } })
     end
+  end
 
+  describe 'configuration' do
     it 'returns the VAPID public key' do
       expect(serialization['configuration']['vapid']).to eq({
         'public_key' => Rails.configuration.x.vapid_public_key,
       })
     end
+
+    it 'returns the max pinned statuses limit' do
+      expect(serialization.deep_symbolize_keys)
+        .to include(
+          configuration: include(
+            accounts: include(max_pinned_statuses: StatusPinValidator::PIN_LIMIT)
+          )
+        )
+    end
   end
 end

From 54119570e69456e3f119cc3e3e968506c3fb4967 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 2 Apr 2024 16:02:07 +0200
Subject: [PATCH 0660/2191] Remove dependency on posix-spawn (#18559)

---
 Gemfile      | 1 -
 Gemfile.lock | 2 --
 2 files changed, 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 35b9ee91db3d8b..e39de40ef5bf5a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -69,7 +69,6 @@ gem 'nsa'
 gem 'oj', '~> 3.14'
 gem 'ox', '~> 2.14'
 gem 'parslet'
-gem 'posix-spawn'
 gem 'public_suffix', '~> 5.0'
 gem 'pundit', '~> 2.3'
 gem 'premailer-rails'
diff --git a/Gemfile.lock b/Gemfile.lock
index 913164d18f6095..f18e736f2182d5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -509,7 +509,6 @@ GEM
     pg (1.5.6)
     pghero (3.4.1)
       activerecord (>= 6)
-    posix-spawn (0.3.15)
     premailer (1.23.0)
       addressable
       css_parser (>= 1.12.0)
@@ -899,7 +898,6 @@ DEPENDENCIES
   parslet
   pg (~> 1.5)
   pghero
-  posix-spawn
   premailer-rails
   private_address_check (~> 0.5)
   propshaft

From f87959ab501ebb63444832369f0fb452768a0a8a Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 2 Apr 2024 10:05:02 -0400
Subject: [PATCH 0661/2191] Fix `RSpec/LetSetup` cop in api/v1/timelines/public
 spec (#28972)

---
 spec/requests/api/v1/timelines/public_spec.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/spec/requests/api/v1/timelines/public_spec.rb b/spec/requests/api/v1/timelines/public_spec.rb
index 30d1bc00cbbb7f..364e48d3d2f824 100644
--- a/spec/requests/api/v1/timelines/public_spec.rb
+++ b/spec/requests/api/v1/timelines/public_spec.rb
@@ -22,13 +22,15 @@
       get '/api/v1/timelines/public', headers: headers, params: params
     end
 
-    let!(:private_status) { Fabricate(:status, visibility: :private) } # rubocop:disable RSpec/LetSetup
     let!(:local_status)   { Fabricate(:status, account: Fabricate.build(:account, domain: nil)) }
     let!(:remote_status)  { Fabricate(:status, account: Fabricate.build(:account, domain: 'example.com')) }
     let!(:media_status)   { Fabricate(:status, media_attachments: [Fabricate.build(:media_attachment)]) }
-
     let(:params) { {} }
 
+    before do
+      Fabricate(:status, visibility: :private)
+    end
+
     context 'when the instance allows public preview' do
       let(:expected_statuses) { [local_status, remote_status, media_status] }
 

From 0b9d4103cb5502faee4cc61717aa5454f63bc8f5 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 2 Apr 2024 16:05:46 +0200
Subject: [PATCH 0662/2191] Fix contrast in notification request badge (#29826)

---
 app/javascript/styles/mastodon/components.scss | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 216c0dab07cd33..a49f162e3bb5ab 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -10104,9 +10104,10 @@ noscript {
     }
 
     .filtered-notifications-banner__badge {
-      background-color: $highlight-text-color;
+      background: $ui-button-background-color;
       border-radius: 4px;
       padding: 1px 6px;
+      color: $white;
     }
   }
 

From 921c4c12731b927d613766c98797de21dfadef4a Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 2 Apr 2024 10:07:31 -0400
Subject: [PATCH 0663/2191] Match comment style of `FeedManager` list/tags
 checks (#29639)

Co-authored-by: Renaud Chaput <renchap@gmail.com>
---
 app/lib/feed_manager.rb | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/lib/feed_manager.rb b/app/lib/feed_manager.rb
index 38a177e6453ef0..bf6e6db598dc6b 100644
--- a/app/lib/feed_manager.rb
+++ b/app/lib/feed_manager.rb
@@ -431,10 +431,10 @@ def filter_from_mentions?(status, receiver_id)
   # @param [List] list
   # @return [Boolean]
   def filter_from_list?(status, list)
-    if status.reply? && status.in_reply_to_account_id != status.account_id
-      should_filter = status.in_reply_to_account_id != list.account_id
-      should_filter &&= !list.show_followed?
-      should_filter &&= !(list.show_list? && ListAccount.exists?(list_id: list.id, account_id: status.in_reply_to_account_id))
+    if status.reply? && status.in_reply_to_account_id != status.account_id                                                       # Status is a reply to account other than status account
+      should_filter = status.in_reply_to_account_id != list.account_id                                                           # Status replies to account id other than list account
+      should_filter &&= !list.show_followed?                                                                                     # List show_followed? is false
+      should_filter &&= !(list.show_list? && ListAccount.exists?(list_id: list.id, account_id: status.in_reply_to_account_id))   # If show_list? true, check for a ListAccount with list and reply to account
 
       return !!should_filter
     end
@@ -449,7 +449,11 @@ def filter_from_list?(status, list)
   # @param [Hash] crutches
   # @return [Boolean]
   def filter_from_tags?(status, receiver_id, crutches)
-    receiver_id == status.account_id || ((crutches[:active_mentions][status.id] || []) + [status.account_id]).any? { |target_account_id| crutches[:blocking][target_account_id] || crutches[:muting][target_account_id] } || crutches[:blocked_by][status.account_id] || crutches[:domain_blocking][status.account.domain]
+    receiver_id == status.account_id ||                                                                                          # Receiver is status account?
+      ((crutches[:active_mentions][status.id] || []) + [status.account_id])                                                      # For mentioned accounts or status account:
+        .any? { |target_account_id| crutches[:blocking][target_account_id] || crutches[:muting][target_account_id] } ||          #   - Target account is muted or blocked?
+      crutches[:blocked_by][status.account_id] ||                                                                                # Blocked by status account?
+      crutches[:domain_blocking][status.account.domain]                                                                          # Blocking domain of status account?
   end
 
   # Adds a status to an account's feed, returning true if a status was

From edde54e991d2f6826c4e7c478bfd03332fb03887 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 2 Apr 2024 11:47:40 -0400
Subject: [PATCH 0664/2191] Update stoplight to version 4.1.0 (#28366)

---
 Gemfile                                            |  2 +-
 Gemfile.lock                                       |  4 ++--
 app/controllers/concerns/signature_verification.rb | 11 +++++------
 app/services/bulk_import_row_service.rb            | 11 +++++------
 app/workers/activitypub/delivery_worker.rb         | 10 ++++++----
 app/workers/import/relationship_worker.rb          |  9 ++++-----
 config/initializers/stoplight.rb                   |  4 ++--
 lib/paperclip/attachment_extensions.rb             | 12 +++++-------
 8 files changed, 30 insertions(+), 33 deletions(-)

diff --git a/Gemfile b/Gemfile
index e39de40ef5bf5a..389ae5035618c5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -88,7 +88,7 @@ gem 'sidekiq-unique-jobs', '~> 7.1'
 gem 'sidekiq-bulk', '~> 0.2.0'
 gem 'simple-navigation', '~> 4.4'
 gem 'simple_form', '~> 5.2'
-gem 'stoplight', '~> 3.0.1'
+gem 'stoplight', '~> 4.1'
 gem 'strong_migrations', '1.8.0'
 gem 'tty-prompt', '~> 0.23', require: false
 gem 'twitter-text', '~> 3.1.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index f18e736f2182d5..2cebe0be84515b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -732,7 +732,7 @@ GEM
     smart_properties (1.17.0)
     stackprof (0.2.26)
     statsd-ruby (1.5.0)
-    stoplight (3.0.2)
+    stoplight (4.1.0)
       redlock (~> 1.0)
     stringio (3.1.0)
     strong_migrations (1.8.0)
@@ -939,7 +939,7 @@ DEPENDENCIES
   simplecov (~> 0.22)
   simplecov-lcov (~> 0.8)
   stackprof
-  stoplight (~> 3.0.1)
+  stoplight (~> 4.1)
   strong_migrations (= 1.8.0)
   test-prof
   thor (~> 1.2)
diff --git a/app/controllers/concerns/signature_verification.rb b/app/controllers/concerns/signature_verification.rb
index 31558662716ba5..68f09ee0238eb2 100644
--- a/app/controllers/concerns/signature_verification.rb
+++ b/app/controllers/concerns/signature_verification.rb
@@ -66,7 +66,7 @@ def signed_request_actor
     compare_signed_string = build_signed_string(include_query_string: false)
     return actor unless verify_signature(actor, signature, compare_signed_string).nil?
 
-    actor = stoplight_wrap_request { actor_refresh_key!(actor) }
+    actor = stoplight_wrapper.run { actor_refresh_key!(actor) }
 
     raise SignatureVerificationError, "Could not refresh public key #{signature_params['keyId']}" if actor.nil?
 
@@ -226,10 +226,10 @@ def actor_from_key_id(key_id)
     end
 
     if key_id.start_with?('acct:')
-      stoplight_wrap_request { ResolveAccountService.new.call(key_id.delete_prefix('acct:'), suppress_errors: false) }
+      stoplight_wrapper.run { ResolveAccountService.new.call(key_id.delete_prefix('acct:'), suppress_errors: false) }
     elsif !ActivityPub::TagManager.instance.local_uri?(key_id)
       account   = ActivityPub::TagManager.instance.uri_to_actor(key_id)
-      account ||= stoplight_wrap_request { ActivityPub::FetchRemoteKeyService.new.call(key_id, suppress_errors: false) }
+      account ||= stoplight_wrapper.run { ActivityPub::FetchRemoteKeyService.new.call(key_id, suppress_errors: false) }
       account
     end
   rescue Mastodon::PrivateNetworkAddressError => e
@@ -238,12 +238,11 @@ def actor_from_key_id(key_id)
     raise SignatureVerificationError, e.message
   end
 
-  def stoplight_wrap_request(&block)
-    Stoplight("source:#{request.remote_ip}", &block)
+  def stoplight_wrapper
+    Stoplight("source:#{request.remote_ip}")
       .with_threshold(1)
       .with_cool_off_time(5.minutes.seconds)
       .with_error_handler { |error, handle| error.is_a?(HTTP::Error) || error.is_a?(OpenSSL::SSL::SSLError) ? handle.call(error) : raise(error) }
-      .run
   end
 
   def actor_refresh_key!(actor)
diff --git a/app/services/bulk_import_row_service.rb b/app/services/bulk_import_row_service.rb
index ef4c18e78953ff..26909dfe04f5c1 100644
--- a/app/services/bulk_import_row_service.rb
+++ b/app/services/bulk_import_row_service.rb
@@ -10,7 +10,7 @@ def call(row)
     when :following, :blocking, :muting, :lists
       target_acct     = @data['acct']
       target_domain   = domain(target_acct)
-      @target_account = stoplight_wrap_request(target_domain) { ResolveAccountService.new.call(target_acct, { check_delivery_availability: true }) }
+      @target_account = stoplight_wrapper(target_domain).run { ResolveAccountService.new.call(target_acct, { check_delivery_availability: true }) }
       return false if @target_account.nil?
     when :bookmarks
       target_uri      = @data['uri']
@@ -18,7 +18,7 @@ def call(row)
       @target_status = ActivityPub::TagManager.instance.uri_to_resource(target_uri, Status)
       return false if @target_status.nil? && ActivityPub::TagManager.instance.local_uri?(target_uri)
 
-      @target_status ||= stoplight_wrap_request(target_domain) { ActivityPub::FetchRemoteStatusService.new.call(target_uri) }
+      @target_status ||= stoplight_wrapper(target_domain).run { ActivityPub::FetchRemoteStatusService.new.call(target_uri) }
       return false if @target_status.nil?
     end
 
@@ -51,16 +51,15 @@ def domain(uri)
     TagManager.instance.local_domain?(domain) ? nil : TagManager.instance.normalize_domain(domain)
   end
 
-  def stoplight_wrap_request(domain, &block)
+  def stoplight_wrapper(domain)
     if domain.present?
-      Stoplight("source:#{domain}", &block)
+      Stoplight("source:#{domain}")
         .with_fallback { nil }
         .with_threshold(1)
         .with_cool_off_time(5.minutes.seconds)
         .with_error_handler { |error, handle| error.is_a?(HTTP::Error) || error.is_a?(OpenSSL::SSL::SSLError) ? handle.call(error) : raise(error) }
-        .run
     else
-      yield
+      Stoplight('domain-blank')
     end
   end
 end
diff --git a/app/workers/activitypub/delivery_worker.rb b/app/workers/activitypub/delivery_worker.rb
index 376c237a98493a..0c6ca026bba071 100644
--- a/app/workers/activitypub/delivery_worker.rb
+++ b/app/workers/activitypub/delivery_worker.rb
@@ -59,7 +59,7 @@ def synchronization_header
   end
 
   def perform_request
-    light = Stoplight(@inbox_url) do
+    stoplight_wrapper.run do
       request_pool.with(@host) do |http_client|
         build_request(http_client).perform do |response|
           raise Mastodon::UnexpectedResponseError, response unless response_successful?(response) || response_error_unsalvageable?(response)
@@ -68,10 +68,12 @@ def perform_request
         end
       end
     end
+  end
 
-    light.with_threshold(STOPLIGHT_FAILURE_THRESHOLD)
-         .with_cool_off_time(STOPLIGHT_COOLDOWN)
-         .run
+  def stoplight_wrapper
+    Stoplight(@inbox_url)
+      .with_threshold(STOPLIGHT_FAILURE_THRESHOLD)
+      .with_cool_off_time(STOPLIGHT_COOLDOWN)
   end
 
   def failure_tracker
diff --git a/app/workers/import/relationship_worker.rb b/app/workers/import/relationship_worker.rb
index a411ab587630bb..2298b095a77807 100644
--- a/app/workers/import/relationship_worker.rb
+++ b/app/workers/import/relationship_worker.rb
@@ -11,7 +11,7 @@ class Import::RelationshipWorker
   def perform(account_id, target_account_uri, relationship, options)
     from_account   = Account.find(account_id)
     target_domain  = domain(target_account_uri)
-    target_account = stoplight_wrap_request(target_domain) { ResolveAccountService.new.call(target_account_uri, { check_delivery_availability: true }) }
+    target_account = stoplight_wrapper(target_domain).run { ResolveAccountService.new.call(target_account_uri, { check_delivery_availability: true }) }
     options.symbolize_keys!
 
     return if target_account.nil?
@@ -43,16 +43,15 @@ def domain(uri)
     TagManager.instance.local_domain?(domain) ? nil : TagManager.instance.normalize_domain(domain)
   end
 
-  def stoplight_wrap_request(domain, &block)
+  def stoplight_wrapper(domain)
     if domain.present?
-      Stoplight("source:#{domain}", &block)
+      Stoplight("source:#{domain}")
         .with_fallback { nil }
         .with_threshold(1)
         .with_cool_off_time(5.minutes.seconds)
         .with_error_handler { |error, handle| error.is_a?(HTTP::Error) || error.is_a?(OpenSSL::SSL::SSLError) ? handle.call(error) : raise(error) }
-        .run
     else
-      yield
+      Stoplight('domain-blank')
     end
   end
 end
diff --git a/config/initializers/stoplight.rb b/config/initializers/stoplight.rb
index 72fe40600e6048..7c13d506378f44 100644
--- a/config/initializers/stoplight.rb
+++ b/config/initializers/stoplight.rb
@@ -3,6 +3,6 @@
 require 'stoplight'
 
 Rails.application.reloader.to_prepare do
-  Stoplight::Light.default_data_store = Stoplight::DataStore::Redis.new(RedisConfiguration.new.connection)
-  Stoplight::Light.default_notifiers  = [Stoplight::Notifier::Logger.new(Rails.logger)]
+  Stoplight.default_data_store = Stoplight::DataStore::Redis.new(RedisConfiguration.new.connection)
+  Stoplight.default_notifiers  = [Stoplight::Notifier::Logger.new(Rails.logger)]
 end
diff --git a/lib/paperclip/attachment_extensions.rb b/lib/paperclip/attachment_extensions.rb
index 7f82138aa8266d..401da112908458 100644
--- a/lib/paperclip/attachment_extensions.rb
+++ b/lib/paperclip/attachment_extensions.rb
@@ -84,13 +84,11 @@ def save
       # Don't go through Stoplight if we don't have anything object-storage-oriented to do
       return super if @queued_for_delete.empty? && @queued_for_write.empty? && !dirty?
 
-      Stoplight('object-storage') { super }.with_threshold(STOPLIGHT_THRESHOLD).with_cool_off_time(STOPLIGHT_COOLDOWN).with_error_handler do |error, handle|
-        if error.is_a?(Seahorse::Client::NetworkingError)
-          handle.call(error)
-        else
-          raise error
-        end
-      end.run
+      Stoplight('object-storage')
+        .with_threshold(STOPLIGHT_THRESHOLD)
+        .with_cool_off_time(STOPLIGHT_COOLDOWN)
+        .with_error_handler { |error, handle| error.is_a?(Seahorse::Client::NetworkingError) ? handle.call(error) : raise(error) }
+        .run { super }
     end
   end
 end

From f8b03c39254ad5c30ed0cf0ea7522e8a5114b38a Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 2 Apr 2024 15:48:27 +0000
Subject: [PATCH 0665/2191] Update dependency faker to v3.3.1 (#29829)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 2cebe0be84515b..702eb39584c6dc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -245,7 +245,7 @@ GEM
       tzinfo
     excon (0.110.0)
     fabrication (2.31.0)
-    faker (3.3.0)
+    faker (3.3.1)
       i18n (>= 1.8.11, < 2)
     faraday (1.10.3)
       faraday-em_http (~> 1.0)

From d27eb181f6ab419d1745a1fe9b94094be17a618f Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 2 Apr 2024 11:50:57 -0400
Subject: [PATCH 0666/2191] Reduce `LineLength` from 320 to 300 (#29636)

---
 .haml-lint.yml | 2 +-
 .rubocop.yml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.haml-lint.yml b/.haml-lint.yml
index 2b553ca56c586f..e493afb85f4adc 100644
--- a/.haml-lint.yml
+++ b/.haml-lint.yml
@@ -11,6 +11,6 @@ linters:
   MiddleDot:
     enabled: true
   LineLength:
-    max: 320
+    max: 300
   ViewLength:
     max: 200 # Override default value of 100 inherited from rubocop
diff --git a/.rubocop.yml b/.rubocop.yml
index 2aa72d9e5e8938..7fb8ab0c55fa82 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -39,7 +39,7 @@ Layout/FirstHashElementIndentation:
 # Reason: Currently disabled in .rubocop_todo.yml
 # https://docs.rubocop.org/rubocop/cops_layout.html#layoutlinelength
 Layout/LineLength:
-  Max: 320 # Default of 120 causes a duplicate entry in generated todo file
+  Max: 300 # Default of 120 causes a duplicate entry in generated todo file
 
 ## Disable most Metrics/*Length cops
 # Reason: those are often triggered and force significant refactors when this happend

From 88c36648895b74b3432a4b8b30fe3820faa2ae3b Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 2 Apr 2024 19:00:07 +0200
Subject: [PATCH 0667/2191] Update dependency rubocop-performance to v1.21.0
 (#29804)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 702eb39584c6dc..acc4394940d3b3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -663,9 +663,9 @@ GEM
       rubocop (~> 1.41)
     rubocop-factory_bot (2.25.1)
       rubocop (~> 1.41)
-    rubocop-performance (1.20.2)
+    rubocop-performance (1.21.0)
       rubocop (>= 1.48.1, < 2.0)
-      rubocop-ast (>= 1.30.0, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
     rubocop-rails (2.24.1)
       activesupport (>= 4.2.0)
       rack (>= 1.1)

From a7b637768e65046728e60bb8ffebff5ff3341ec7 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 2 Apr 2024 15:56:54 -0400
Subject: [PATCH 0668/2191] Regenerate rubocop todo with version 1.62.1
 (#29830)

---
 .rubocop_todo.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 11ac570836da9f..ea1dbe57e19cdd 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config --auto-gen-only-exclude --no-exclude-limit --no-offense-counts --no-auto-gen-timestamp`
-# using RuboCop version 1.60.2.
+# using RuboCop version 1.62.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -36,7 +36,7 @@ Metrics/PerceivedComplexity:
 
 # Configuration parameters: CountAsOne.
 RSpec/ExampleLength:
-  Max: 20 # Override default of 5
+  Max: 18
 
 RSpec/MultipleExpectations:
   Max: 7
@@ -88,7 +88,6 @@ Style/FetchEnvVar:
   Exclude:
     - 'app/lib/redis_configuration.rb'
     - 'app/lib/translation_service.rb'
-    - 'config/environments/development.rb'
     - 'config/environments/production.rb'
     - 'config/initializers/2_limited_federation_mode.rb'
     - 'config/initializers/3_omniauth.rb'
@@ -144,7 +143,6 @@ Style/GuardClause:
     - 'lib/mastodon/cli/accounts.rb'
     - 'lib/mastodon/cli/maintenance.rb'
     - 'lib/mastodon/cli/media.rb'
-    - 'lib/paperclip/attachment_extensions.rb'
     - 'lib/tasks/repo.rake'
 
 # This cop supports safe autocorrection (--autocorrect).

From 54c7d1ad144ada4765415739a3b48dc5e39de67f Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 2 Apr 2024 23:22:22 +0200
Subject: [PATCH 0669/2191] Update dependency pg-connection-string to v2.6.4
 (#29814)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 99f6f99c6cf477..bf79e9b8e953a7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -12795,9 +12795,9 @@ __metadata:
   linkType: hard
 
 "pg-connection-string@npm:^2.6.0, pg-connection-string@npm:^2.6.3":
-  version: 2.6.3
-  resolution: "pg-connection-string@npm:2.6.3"
-  checksum: 10c0/e7eab3a2bb8dec5067fab8a46c90d8f7920946d46ad771a410de3929490c676ee91950424d4405295dd0fde5acbd39ccd99afd603a15d616d0a4a6fa9bf80ad7
+  version: 2.6.4
+  resolution: "pg-connection-string@npm:2.6.4"
+  checksum: 10c0/0d0b617df0fc6507bf6a94bdcd56c7a305788a1402d69bff9773350947c8f525d6d8136128065370749a3325e99658ae40fbdcce620fb8e60126181f0591a6a6
   languageName: node
   linkType: hard
 

From 4233ee1f59cfdeaeb96f060aff8bc0826b321e64 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 2 Apr 2024 23:33:43 +0200
Subject: [PATCH 0670/2191] Update dependency pg to v8.11.5 (#29833)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index bf79e9b8e953a7..8af9bfdb87b557 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -12794,7 +12794,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pg-connection-string@npm:^2.6.0, pg-connection-string@npm:^2.6.3":
+"pg-connection-string@npm:^2.6.0, pg-connection-string@npm:^2.6.4":
   version: 2.6.4
   resolution: "pg-connection-string@npm:2.6.4"
   checksum: 10c0/0d0b617df0fc6507bf6a94bdcd56c7a305788a1402d69bff9773350947c8f525d6d8136128065370749a3325e99658ae40fbdcce620fb8e60126181f0591a6a6
@@ -12860,11 +12860,11 @@ __metadata:
   linkType: hard
 
 "pg@npm:^8.5.0":
-  version: 8.11.4
-  resolution: "pg@npm:8.11.4"
+  version: 8.11.5
+  resolution: "pg@npm:8.11.5"
   dependencies:
     pg-cloudflare: "npm:^1.1.1"
-    pg-connection-string: "npm:^2.6.3"
+    pg-connection-string: "npm:^2.6.4"
     pg-pool: "npm:^3.6.2"
     pg-protocol: "npm:^1.6.1"
     pg-types: "npm:^2.1.0"
@@ -12877,7 +12877,7 @@ __metadata:
   peerDependenciesMeta:
     pg-native:
       optional: true
-  checksum: 10c0/b3e473c52572be259a7418ee506a0ee9d66121971e73fe8cdf584addb9ef4d34cf66ea5c8a99ad9226c421d31a1848c39225bd201743ddd529276de1dec81e46
+  checksum: 10c0/20f29a41a99bad5931faf4d4a01e7be7fb27e5b5338fdfb06d2368e295c3d3d4ef49958ad57d2b17bad108e5c84574db6244ed8221e6b77a767f64ef12564119
   languageName: node
   linkType: hard
 

From 56d13069cdfc1d2a4211e40c0303d13514678681 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 3 Apr 2024 11:04:29 +0200
Subject: [PATCH 0671/2191] New Crowdin Translations (automated) (#29836)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/et.json  | 13 +++++++
 app/javascript/mastodon/locales/fil.json | 23 +++++++++++++
 app/javascript/mastodon/locales/ia.json  | 19 +++++++++++
 app/javascript/mastodon/locales/it.json  |  2 +-
 app/javascript/mastodon/locales/lt.json  |  4 +++
 app/javascript/mastodon/locales/nl.json  |  2 +-
 app/javascript/mastodon/locales/sq.json  |  3 ++
 app/javascript/mastodon/locales/sv.json  |  6 ++++
 config/locales/ia.yml                    | 43 ++++++++++++++++++++++++
 config/locales/sq.yml                    |  6 ++--
 10 files changed, 117 insertions(+), 4 deletions(-)

diff --git a/app/javascript/mastodon/locales/et.json b/app/javascript/mastodon/locales/et.json
index 74f3f560d42feb..eda2099357877a 100644
--- a/app/javascript/mastodon/locales/et.json
+++ b/app/javascript/mastodon/locales/et.json
@@ -476,10 +476,13 @@
   "notification.relationships_severance_event.account_suspension": "{from} admin on kustutanud {target}, mis tähendab, et sa ei saa enam neilt uuendusi või suhelda nendega.",
   "notification.relationships_severance_event.domain_block": "{from} admin on blokeerinud {target}, sealhulgas {followersCount} sinu jälgijat ja {followingCount, plural, one  {# konto} other {# kontot}}, mida jälgid.",
   "notification.relationships_severance_event.learn_more": "Saa rohkem teada",
+  "notification.relationships_severance_event.user_domain_block": "Blokeerisid {target}, eemaldades oma jälgijate hulgast {followersCount} ja jälgitavate hulgast {followingCount, plural, one {# konto} other {# kontot}}.",
   "notification.status": "{name} just postitas",
   "notification.update": "{name} muutis postitust",
   "notification_requests.accept": "Nõus",
   "notification_requests.dismiss": "Hülga",
+  "notification_requests.notifications_from": "Teavitus kasutajalt {name}",
+  "notification_requests.title": "Filtreeritud teavitused",
   "notifications.clear": "Puhasta teated",
   "notifications.clear_confirmation": "Oled kindel, et soovid püsivalt kõik oma teated eemaldada?",
   "notifications.column_settings.admin.report": "Uued teavitused:",
@@ -515,6 +518,13 @@
   "notifications.permission_required": "Töölaua märguanded ei ole saadaval, kuna vajalik luba pole antud.",
   "notifications.policy.filter_new_accounts.hint": "Loodud viimase {days, plural, one {ühe päeva} other {# päeva}} jooksul",
   "notifications.policy.filter_new_accounts_title": "Uued kontod",
+  "notifications.policy.filter_not_followers_hint": "Kaasates kasutajad, kes on sind jälginud vähem kui {days, plural, one {ühe päeva} other {# päeva}}",
+  "notifications.policy.filter_not_followers_title": "Sind mittejälgivad kasutajad",
+  "notifications.policy.filter_not_following_hint": "Kuni sa nad käsitsi kinnitad",
+  "notifications.policy.filter_not_following_title": "Inimesed, keda sa ei jälgi",
+  "notifications.policy.filter_private_mentions_hint": "Filtreeritud, kui see pole vastus sinupoolt mainimisele või kui jälgid saatjat",
+  "notifications.policy.filter_private_mentions_title": "Soovimatud privaatsed mainimised",
+  "notifications.policy.title": "Filtreeri välja teavitused kohast…",
   "notifications_permission_banner.enable": "Luba töölaua märguanded",
   "notifications_permission_banner.how_to_control": "Et saada teateid, ajal mil Mastodon pole avatud, luba töölauamärguanded. Saad täpselt määrata, mis tüüpi tegevused tekitavad märguandeid, kasutates peale teadaannete sisse lülitamist üleval olevat nuppu {icon}.",
   "notifications_permission_banner.title": "Ära jää millestki ilma",
@@ -691,9 +701,11 @@
   "status.direct": "Maini privaatselt @{name}",
   "status.direct_indicator": "Privaatne mainimine",
   "status.edit": "Muuda",
+  "status.edited": "Viimati muudetud {date}",
   "status.edited_x_times": "Muudetud {count, plural, one{{count} kord} other {{count} korda}}",
   "status.embed": "Manustamine",
   "status.favourite": "Lemmik",
+  "status.favourites": "{count, plural, one {lemmik} other {lemmikud}}",
   "status.filter": "Filtreeri seda postitust",
   "status.filtered": "Filtreeritud",
   "status.hide": "Peida postitus",
@@ -714,6 +726,7 @@
   "status.reblog": "Jaga",
   "status.reblog_private": "Jaga algse nähtavusega",
   "status.reblogged_by": "{name} jagas",
+  "status.reblogs": "{count, plural, one {jagamine} other {jagamist}}",
   "status.reblogs.empty": "Keegi pole seda postitust veel jaganud. Kui keegi seda teeb, näeb seda siin.",
   "status.redraft": "Kustuta & alga uuesti",
   "status.remove_bookmark": "Eemalda järjehoidja",
diff --git a/app/javascript/mastodon/locales/fil.json b/app/javascript/mastodon/locales/fil.json
index afa0e5fbc2c5fd..894d73c8cc42ba 100644
--- a/app/javascript/mastodon/locales/fil.json
+++ b/app/javascript/mastodon/locales/fil.json
@@ -50,6 +50,7 @@
   "admin.dashboard.retention.cohort_size": "Mga bagong tagagamit",
   "alert.rate_limited.message": "Mangyaring subukan muli pagkatapos ng {retry_time, time, medium}.",
   "audio.hide": "Itago ang tunog",
+  "block_modal.title": "Harangan ang tagagamit?",
   "bundle_column_error.error.title": "Naku!",
   "bundle_column_error.network.body": "Nagkaroon ng kamalian habang sinusubukang i-karga ang pahinang ito. Maaaring dahil ito sa pansamantalang problema ng iyong koneksyon sa internet o ang server na ito.",
   "bundle_column_error.network.title": "Kamaliang network",
@@ -104,6 +105,7 @@
   "compose_form.poll.multiple": "Maraming pagpipilian",
   "compose_form.poll.single": "Piliin ang isa",
   "compose_form.reply": "Tumugon",
+  "compose_form.spoiler.marked": "Tanggalin ang babala sa nilalaman",
   "compose_form.spoiler.unmarked": "Idagdag ang babala sa nilalaman",
   "confirmation_modal.cancel": "Pagpaliban",
   "confirmations.block.confirm": "Harangan",
@@ -115,6 +117,7 @@
   "confirmations.discard_edit_media.confirm": "Ipagpaliban",
   "confirmations.edit.confirm": "Baguhin",
   "confirmations.reply.confirm": "Tumugon",
+  "conversation.mark_as_read": "Markahan bilang nabasa na",
   "copy_icon_button.copied": "Sinipi sa clipboard",
   "copypaste.copied": "Sinipi",
   "copypaste.copy_to_clipboard": "I-sipi sa clipboard",
@@ -130,6 +133,10 @@
   "dismissable_banner.explore_statuses": "Ito ang mga sumisikat na mga post sa iba't ibang bahagi ng social web ngayon. Ang mga mas bagong post na mas marami ang mga pagpapalakas at paborito ay tinataasan ng antas.",
   "dismissable_banner.explore_tags": "Ito ang mga sumisikat na mga hashtag sa iba't ibang bahagi ng social web ngayon. Ang mga hashtag ginagamit ng mas maraming mga iba't ibang tao ay tinataasan ng antas.",
   "dismissable_banner.public_timeline": "Ito ang mga pinakamakailang nakapublikong post mula sa mga taong nasa social web na sinusundan ng mga tao sa {domain}.",
+  "domain_block_modal.block": "Harangan ang serbiro",
+  "domain_block_modal.title": "Harangan ang domain?",
+  "domain_block_modal.you_will_lose_followers": "Mabubura ang iyong mga tagasunod mula sa serbirong ito.",
+  "domain_pill.server": "Serbiro",
   "embed.instructions": "I-embed ang post na ito sa iyong pook-sapot sa pamamagitan ng pagsipi ng kodigo sa ilalim.",
   "embed.preview": "Ito ang magiging itsura:",
   "emoji_button.activity": "Aktibidad",
@@ -166,6 +173,8 @@
   "empty_column.list": "Wala pang laman ang listahang ito. Kapag naglathala ng mga bagong post ang mga miyembro ng listahang ito, makikita iyon dito.",
   "empty_column.lists": "Wala ka pang mga listahan. Kapag gumawa ka ng isa, makikita yun dito.",
   "explore.search_results": "Mga resulta ng paghahanap",
+  "explore.title": "Tuklasin",
+  "explore.trending_links": "Mga balita",
   "filter_modal.select_filter.search": "Hanapin o gumawa",
   "firehose.all": "Lahat",
   "firehose.local": "Itong serbiro",
@@ -180,6 +189,7 @@
   "generic.saved": "Nakaimbak",
   "hashtag.column_header.tag_mode.all": "at {additional}",
   "hashtag.column_header.tag_mode.any": "o {additional}",
+  "home.column_settings.show_replies": "Ipakita ang mga tugon",
   "home.pending_critical_update.body": "Mangyaring i-update ang iyong serbiro ng Mastodon sa lalong madaling panahon!",
   "interaction_modal.login.action": "Iuwi mo ako",
   "interaction_modal.no_account_yet": "Wala sa Mastodon?",
@@ -216,14 +226,21 @@
   "notification.follow": "Sinundan ka ni {name}",
   "notification.follow_request": "Hinihiling ni {name} na sundan ka",
   "notification.mention": "Binanggit ka ni {name}",
+  "notification.relationships_severance_event.learn_more": "Matuto nang higit pa",
+  "notification_requests.accept": "Tanggapin",
+  "notification_requests.notifications_from": "Mga abiso mula kay/sa {name}",
   "notifications.clear": "Burahin mga abiso",
   "notifications.column_settings.admin.report": "Mga bagong ulat:",
+  "notifications.column_settings.alert": "Mga abiso sa Desktop",
   "notifications.column_settings.favourite": "Mga paborito:",
   "notifications.column_settings.follow": "Mga bagong tagasunod:",
   "notifications.column_settings.unread_notifications.category": "Hindi Nabasang mga Abiso",
   "notifications.column_settings.update": "Mga pagbago:",
   "notifications.filter.all": "Lahat",
+  "notifications.filter.favourites": "Mga paborito",
   "notifications.mark_as_read": "Markahan lahat ng abiso bilang nabasa na",
+  "notifications.policy.filter_not_followers_title": "Mga taong hindi ka susundan",
+  "notifications.policy.filter_not_following_title": "Mga taong hindi mo sinusundan",
   "onboarding.action.back": "Ibalik mo ako",
   "onboarding.actions.back": "Ibalik mo ako",
   "onboarding.profile.note_hint": "Maaari mong @bangitin ang ibang mga tao o mga #hashtag…",
@@ -236,6 +253,8 @@
   "privacy.direct.long": "Lahat ng mga binanggit sa post",
   "privacy.private.long": "Mga tagasunod mo lamang",
   "privacy.private.short": "Mga tagasunod",
+  "privacy.public.long": "Sinumang nasa loob at labas ng Mastodon",
+  "regeneration_indicator.label": "Kumakarga…",
   "relative_time.days": "{number}a",
   "relative_time.full.days": "{number, plural, one {# araw} other {# na araw}} ang nakalipas",
   "relative_time.full.hours": "{number, plural, one {# oras} other {# na oras}} ang nakalipas",
@@ -261,6 +280,10 @@
   "report.thanks.title": "Ayaw mo bang makita ito?",
   "report.thanks.title_actionable": "Salamat sa pag-uulat, titingnan namin ito.",
   "report_notification.categories.other": "Iba pa",
+  "search.quick_action.open_url": "Buksan ang URL sa Mastodon",
+  "search.search_or_paste": "Maghanap o ilagay ang URL",
+  "search_popout.full_text_search_disabled_message": "Hindi magagamit sa {domain}.",
+  "search_popout.full_text_search_logged_out_message": "Magagamit lamang kapag naka-log in.",
   "search_results.all": "Lahat",
   "search_results.see_all": "Ipakita lahat",
   "server_banner.learn_more": "Matuto nang higit pa",
diff --git a/app/javascript/mastodon/locales/ia.json b/app/javascript/mastodon/locales/ia.json
index d982381c427cb0..428abb8c5acde0 100644
--- a/app/javascript/mastodon/locales/ia.json
+++ b/app/javascript/mastodon/locales/ia.json
@@ -159,8 +159,13 @@
   "disabled_account_banner.account_settings": "Parametros de conto",
   "disabled_account_banner.text": "Tu conto {disabledAccount} es actualmente disactivate.",
   "dismissable_banner.dismiss": "Dimitter",
+  "domain_block_modal.block": "Blocar le servitor",
+  "domain_block_modal.block_account_instead": "Blocar @{name} in su loco",
+  "domain_block_modal.they_cant_follow": "Nulle persona ab iste servitor pote sequer te.",
+  "domain_block_modal.they_wont_know": "Illes non sapera que illes ha essite blocate.",
   "domain_block_modal.title": "Blocar dominio?",
   "domain_block_modal.you_will_lose_followers": "Omne sequitores ab iste servitor essera removite.",
+  "domain_block_modal.you_wont_see_posts": "Tu non videra messages e notificationes ab usatores sur iste servitor.",
   "domain_pill.server": "Servitor",
   "domain_pill.username": "Nomine de usator",
   "embed.preview": "Ecce como illlo parera:",
@@ -202,6 +207,7 @@
   "filter_modal.select_filter.search": "Cercar o crear",
   "filter_modal.select_filter.title": "Filtrar iste message",
   "filter_modal.title.status": "Filtrar un message",
+  "filtered_notifications_banner.pending_requests": "Notificationes ab {count, plural, =0 {nemo} one {un persona} other {# personas}} tu poterea cognoscer",
   "firehose.all": "Toto",
   "firehose.local": "Iste servitor",
   "firehose.remote": "Altere servitores",
@@ -251,7 +257,9 @@
   "keyboard_shortcuts.federated": "Aperir le chronologia federate",
   "keyboard_shortcuts.heading": "Accessos directe de claviero",
   "keyboard_shortcuts.home": "Aperir le chronologia de initio",
+  "keyboard_shortcuts.legend": "Monstrar iste legenda",
   "keyboard_shortcuts.local": "Aperir le chronologia local",
+  "keyboard_shortcuts.mention": "Mentionar le author",
   "keyboard_shortcuts.muted": "Aperir lista de usatores silentiate",
   "keyboard_shortcuts.my_profile": "Aperir tu profilo",
   "keyboard_shortcuts.notifications": "Aperir columna de notificationes",
@@ -264,6 +272,8 @@
   "lightbox.close": "Clauder",
   "lightbox.next": "Sequente",
   "lightbox.previous": "Precedente",
+  "limited_account_hint.action": "Monstrar profilo in omne caso",
+  "limited_account_hint.title": "Iste profilo esseva celate per le moderatores de {domain}.",
   "link_preview.author": "Per {name}",
   "lists.account.add": "Adder al lista",
   "lists.account.remove": "Remover del lista",
@@ -278,8 +288,13 @@
   "lists.subheading": "Tu listas",
   "loading_indicator.label": "Cargante…",
   "media_gallery.toggle_visible": "{number, plural, one {Celar imagine} other {Celar imagines}}",
+  "mute_modal.hide_from_notifications": "Celar ab notificationes",
   "mute_modal.hide_options": "Celar optiones",
+  "mute_modal.show_options": "Monstrar optiones",
+  "mute_modal.they_can_mention_and_follow": "Illes pote mentionar te e sequer te, ma tu non potera vider los.",
+  "mute_modal.they_wont_know": "Illes non sapera que illes ha essite silentiate.",
   "mute_modal.title": "Silentiar le usator?",
+  "mute_modal.you_wont_see_mentions": "Tu non videra messages que los mentiona.",
   "navigation_bar.about": "A proposito",
   "navigation_bar.advanced_interface": "Aperir in le interfacie web avantiate",
   "navigation_bar.blocks": "Usatores blocate",
@@ -304,7 +319,10 @@
   "notification.own_poll": "Tu sondage ha finite",
   "notification.relationships_severance_event.learn_more": "Apprender plus",
   "notification.update": "{name} ha modificate un message",
+  "notification_requests.accept": "Acceptar",
+  "notification_requests.dismiss": "Dimitter",
   "notification_requests.notifications_from": "Notificationes de {name}",
+  "notification_requests.title": "Notificationes filtrate",
   "notifications.clear": "Rader notificationes",
   "notifications.clear_confirmation": "Es tu secur que tu vole rader permanentemente tote tu notificationes?",
   "notifications.column_settings.alert": "Notificationes de scriptorio",
@@ -325,6 +343,7 @@
   "notifications.filter.statuses": "Actualisationes de personas que tu seque",
   "notifications.grant_permission": "Conceder permission.",
   "notifications.group": "{count} notificationes",
+  "notifications.mark_as_read": "Marcar cata notification como legite",
   "notifications.policy.filter_new_accounts_title": "Nove contos",
   "notifications_permission_banner.enable": "Activar notificationes de scriptorio",
   "onboarding.compose.template": "Salute #Mastodon!",
diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json
index d7e447626ea242..fd12ee298b956c 100644
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@@ -354,7 +354,7 @@
   "interaction_modal.description.follow": "Con un profilo di Mastodon, puoi seguire {name} per ricevere i suoi post nel feed della tua home.",
   "interaction_modal.description.reblog": "Con un profilo di Mastodon, puoi rebloggare questo post per condividerlo con i tuoi seguaci.",
   "interaction_modal.description.reply": "Con un profilo di Mastodon, puoi rispondere a questo post.",
-  "interaction_modal.login.action": "Torna all’inizio",
+  "interaction_modal.login.action": "Portami alla pagina iniziale",
   "interaction_modal.login.prompt": "Dominio del tuo server principale, ad esempio mastodon.social",
   "interaction_modal.no_account_yet": "Non su Mastodon?",
   "interaction_modal.on_another_server": "Su un altro server",
diff --git a/app/javascript/mastodon/locales/lt.json b/app/javascript/mastodon/locales/lt.json
index f9ef7e242c00e4..b43af3c0aa8496 100644
--- a/app/javascript/mastodon/locales/lt.json
+++ b/app/javascript/mastodon/locales/lt.json
@@ -442,6 +442,8 @@
   "notification.own_poll": "Tavo apklausa baigėsi",
   "notification.poll": "Apklausa, kurioje balsavai, pasibaigė",
   "notification.reblog": "{name} pakėlė tavo įrašą",
+  "notification.relationships_severance_event.learn_more": "Sužinoti daugiau",
+  "notification.relationships_severance_event.user_domain_block": "Tu užblokavai {target}. Pašalinama {followersCount} savo sekėjų ir {followingCount, plural, one {# paskyrą} few {# paskyrai} many {# paskyros} other {# paskyrų}}, kurios seki.",
   "notification.status": "{name} ką tik paskelbė",
   "notification.update": "{name} redagavo įrašą",
   "notification_requests.accept": "Priimti",
@@ -454,6 +456,8 @@
   "notifications.column_settings.admin.sign_up": "Naujos registracijos:",
   "notifications.column_settings.alert": "Darbalaukio pranešimai",
   "notifications.column_settings.favourite": "Mėgstami:",
+  "notifications.column_settings.filter_bar.advanced": "Rodyti visas kategorijas",
+  "notifications.column_settings.filter_bar.category": "Spartaus filtro juosta",
   "notifications.column_settings.follow": "Nauji sekėjai:",
   "notifications.column_settings.follow_request": "Nauji sekimo prašymai:",
   "notifications.column_settings.mention": "Paminėjimai:",
diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json
index c47831b389e9d4..23960e9f8647dc 100644
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@@ -705,7 +705,7 @@
   "status.edited_x_times": "{count, plural, one {{count} keer} other {{count} keer}} bewerkt",
   "status.embed": "Embedden",
   "status.favourite": "Favoriet",
-  "status.favourites": "{count, plural, one {# favoriet} other {# favorieten}}",
+  "status.favourites": "{count, plural, one {favoriet} other {favorieten}}",
   "status.filter": "Dit bericht filteren",
   "status.filtered": "Gefilterd",
   "status.hide": "Bericht verbergen",
diff --git a/app/javascript/mastodon/locales/sq.json b/app/javascript/mastodon/locales/sq.json
index 026e198206c766..95768b811a6638 100644
--- a/app/javascript/mastodon/locales/sq.json
+++ b/app/javascript/mastodon/locales/sq.json
@@ -297,6 +297,7 @@
   "filter_modal.select_filter.subtitle": "Përdorni një kategori ekzistuese, ose krijoni një të re",
   "filter_modal.select_filter.title": "Filtroje këtë postim",
   "filter_modal.title.status": "Filtroni një postim",
+  "filtered_notifications_banner.pending_requests": "Njoftime prej {count, plural, =0 {askujt} one {një personi} other {# vetësh}} që mund të njihni",
   "filtered_notifications_banner.private_mentions": "{count, plural, one {përmendje private} other {përmendje private}}",
   "filtered_notifications_banner.title": "Njoftime të filtruar",
   "firehose.all": "Krejt",
@@ -515,7 +516,9 @@
   "notifications.permission_denied": "S’merren dot njoftime në desktop, ngaqë më herët shfletuesit i janë mohuar lejet për këtë",
   "notifications.permission_denied_alert": "S’mund të aktivizohen njoftimet në desktop, ngaqë lejet e shfletuesit për këtë janë mohuar më herët",
   "notifications.permission_required": "S’merren dot njoftime desktop, ngaqë s’është akorduar leja përkatëse.",
+  "notifications.policy.filter_new_accounts.hint": "Krijuar brenda {days, plural, one {një dite} other {# ditësh}} të shkuara",
   "notifications.policy.filter_new_accounts_title": "Llogari të reja",
+  "notifications.policy.filter_not_followers_hint": "Përfshi persona që ju kanë ndjekur brenda më pak se {days, plural, one {një dite} other {# ditësh}}",
   "notifications.policy.filter_not_followers_title": "Persona që s’ju ndjekin",
   "notifications.policy.filter_not_following_hint": "Deri sa t’i miratoni dorazi",
   "notifications.policy.filter_not_following_title": "Persona që s’i ndiqni",
diff --git a/app/javascript/mastodon/locales/sv.json b/app/javascript/mastodon/locales/sv.json
index 85511df8ccbc22..46a6cb7943f28b 100644
--- a/app/javascript/mastodon/locales/sv.json
+++ b/app/javascript/mastodon/locales/sv.json
@@ -476,6 +476,7 @@
   "notification.relationships_severance_event.account_suspension": "En administratör från {from} har stängt av {target}, vilket innebär att du inte längre kan ta emot uppdateringar från dem eller interagera med dem.",
   "notification.relationships_severance_event.domain_block": "En administratör från {from} har blockerat {target}, inklusive {followersCount} av dina följare och {followingCount, plural, one {# konto} other {# konton}} du följer.",
   "notification.relationships_severance_event.learn_more": "Läs mer",
+  "notification.relationships_severance_event.user_domain_block": "Du har blockerat {target} och tar därmed bort {followersCount} av dina följare samt {followingCount, plural, one {# konto} other {# konton}} du följer.",
   "notification.status": "{name} publicerade just ett inlägg",
   "notification.update": "{name} redigerade ett inlägg",
   "notification_requests.accept": "Godkänn",
@@ -489,6 +490,7 @@
   "notifications.column_settings.alert": "Skrivbordsaviseringar",
   "notifications.column_settings.favourite": "Favoriter:",
   "notifications.column_settings.filter_bar.advanced": "Visa alla kategorier",
+  "notifications.column_settings.filter_bar.category": "Snabbfilter",
   "notifications.column_settings.follow": "Nya följare:",
   "notifications.column_settings.follow_request": "Ny följ-förfrågan:",
   "notifications.column_settings.mention": "Omnämningar:",
@@ -516,8 +518,11 @@
   "notifications.permission_required": "Skrivbordsaviseringar är otillgängliga eftersom att rättigheten som krävs inte har godkänts.",
   "notifications.policy.filter_new_accounts.hint": "Skapad inom de senaste {days, plural, one {dagen} other {# dagarna}}",
   "notifications.policy.filter_new_accounts_title": "Nya konton",
+  "notifications.policy.filter_not_followers_hint": "Inklusive personer som har följt dig kortare än {days, plural, one {en dag} other {# dagar}}",
   "notifications.policy.filter_not_followers_title": "Personer som inte följer dig",
+  "notifications.policy.filter_not_following_hint": "Tills du manuellt godkänner dem",
   "notifications.policy.filter_not_following_title": "Personer du inte följer",
+  "notifications.policy.filter_private_mentions_hint": "Filtrerat om det inte är som svar på ditt eget omnämnande eller om du följer avsändaren",
   "notifications.policy.filter_private_mentions_title": "Oombedda privata omnämnanden",
   "notifications.policy.title": "Filtrera ut aviseringar från…",
   "notifications_permission_banner.enable": "Aktivera skrivbordsaviseringar",
@@ -721,6 +726,7 @@
   "status.reblog": "Boosta",
   "status.reblog_private": "Boosta med ursprunglig synlighet",
   "status.reblogged_by": "{name} boostade",
+  "status.reblogs": "{count, plural, one {# röst} other {# röster}}",
   "status.reblogs.empty": "Ingen har boostat detta inlägg än. När någon gör det kommer de synas här.",
   "status.redraft": "Radera & gör om",
   "status.remove_bookmark": "Ta bort bokmärke",
diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index ecdf73ef9ef514..5065ca7bbbda75 100644
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -15,17 +15,40 @@ ia:
     instance_actor_flash: Iste conto es un agente virtual usate pro representar le servitor mesme e non alcun usator individual. Illo es usate pro le federation e non debe esser suspendite.
     last_active: ultime activitate
     link_verified_on: Le proprietate de iste ligamine ha essite verificate le %{date}
+    posts:
+      one: Message
+      other: Messages
+    posts_tab_heading: Messages
   admin:
+    account_moderation_notes:
+      create: Lassar un nota
     accounts:
+      add_email_domain_block: Blocar dominio de e-mail
       are_you_sure: Es tu secur?
       by_domain: Dominio
+      change_email:
+        changed_msg: Email cambiate con successo!
+        current_email: E-mail actual
+        label: Cambiar e-mail
+        new_email: Nove e-mail
+        submit: Cambiar e-mail
+        title: Cambiar e-mail pro %{username}
+      confirm: Confirmar
+      confirmed: Confirmate
+      confirming: In confirmation
       custom: Personalisate
       delete: Deler datos
       deleted: Delite
+      demote: Degradar
+      destroyed_msg: Le datos de %{username} ora es in cauda pro su imminente deletion
       disable_two_factor_authentication: Disactivar 2FA
       display_name: Nomine visibile
       domain: Dominio
+      edit: Modificar
+      email: E-mail
+      email_status: Stato de e-mail
       enabled: Activate
+      followers: Sequitores
       location:
         all: Toto
         title: Location
@@ -34,31 +57,50 @@ ia:
       most_recent_activity: Activitate plus recente
       most_recent_ip: IP plus recente
       public: Public
+      redownload: Actualisar profilo
+      resend_confirmation:
+        already_confirmed: Iste usator jam es confirmate
+        send: Reinviar ligamine de confirmation
+        success: Ligamine de confirmation inviate con successo!
       reset: Reinitialisar
       reset_password: Reinitialisar contrasigno
       search: Cercar
+      search_same_email_domain: Altere usatores con le mesme dominio de e-mail
+      search_same_ip: Altere usatores con le mesme IP
       security: Securitate
       security_measures:
         only_password: Solmente contrasigno
         password_and_2fa: Contrasigno e 2FA
+      silenced: Limitate
       statuses: Messages
+      subscribe: Subscriber
       title: Contos
+      unblock_email: Disblocar adresse de e-mail
+      unblocked_email_msg: Adresse de e-mail de %{username} disblocate con successo
+      unconfirmed_email: E-mail non confirmate
       username: Nomine de usator
+      view_domain: Vider summario de dominio
     action_logs:
       action_types:
+        confirm_user: Confirmar le usator
         create_announcement: Crear annuncio
         destroy_ip_block: Deler le regula IP
         destroy_status: Deler le message
         destroy_unavailable_domain: Deler le dominio non disponibile
+        disable_2fa_user: Disactivar 2FA
         disable_user: Disactivar le usator
         enable_user: Activar le usator
         reset_password_user: Reinitialisar contrasigno
         update_announcement: Actualisar annuncio
         update_custom_emoji: Actualisar emoji personalisate
+        update_ip_block: Actualisar le regula IP
+        update_status: Actualisar le message
       actions:
         change_email_user_html: "%{name} cambiava le adresse de e-mail address del usator %{target}"
         create_announcement_html: "%{name} creava un nove annuncio %{target}"
+      deleted_account: conto delite
     announcements:
+      destroyed_msg: Annuncio delite con successo!
       edit:
         title: Modificar annuncio
       empty: Necun annuncios trovate.
@@ -80,6 +122,7 @@ ia:
       enabled_msg: Emoji activate con successo
       new:
         title: Adder nove emoji personalisate
+      upload: Incargar
     dashboard:
       active_users: usatores active
       media_storage: Immagazinage de medios
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index 12627434a58d20..dcacb46bf99819 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -844,10 +844,10 @@ sq:
       elasticsearch_index_mismatch:
         message_html: Përshoqërimet e treguesit të Elasticsearch-it janë të vjetruara. Ju lutemi, xhironi <code>tootctl search deploy --only=%{value}</code>
       elasticsearch_preset:
-        action: Shihni documentimin
+        action: Shihni dokumentimin
         message_html: Grupi i instancave tuaja Elasticsearch ka më shumë se një nyjë, por Mastodon-i s’është formësuar t’i përdorë ato.
       elasticsearch_preset_single_node:
-        action: Shihni documentimin
+        action: Shihni dokumentimin
         message_html: Grupi i instancave tuaja Elasticsearch ka vetëm një nyjë, <code>ES_PRESET</code> i duhet dhënë vlera <code>single_node_cluster</code>.
       elasticsearch_reset_chewy:
         message_html: Treguesi juaj i sistemit Elasticsearch është i vjetruar, për shkak të një ndryshimi rregullimesh. Për ta përditësuar, ju lutemi, xhironi <code>tootctl search deploy --reset-chewy</code>.
@@ -1666,6 +1666,8 @@ sq:
       account_suspension: Pezullim llogarie (%{target_name})
       domain_block: Pezullim shërbyesi (%{target_name})
       user_domain_block: Bllokuat %{target_name}
+    lost_followers: Ndjekës të humbur
+    lost_follows: Ndjekje të humbura
     preamble: Mund të humbni ndjekje dhe ndjekës, kur bllokoni një përkatësi, ose kur moderatorët tuaj vendosin të pezullojnë një shërbyes të largët. Kur kjo ndodh, do të jeni në gjendje të shkarkoni lista marrëdhëniesh të dëmtuara, për t’i shqyrtuar dhe mundet për t’i importuar në një shërbyes tjetër.
     purged: Hollësitë rreth këtij shërbyesi janë spastuar nga përgjegjësit e shërbyesit tuaj.
     type: Akt

From 5d67247061770bb4228c479dd03845735b849e3a Mon Sep 17 00:00:00 2001
From: Michael Stanclift <mx@vmstan.com>
Date: Wed, 3 Apr 2024 09:22:50 -0500
Subject: [PATCH 0672/2191] Fix language and emoji search field background
 colors on light theme (#29828)

---
 app/javascript/styles/mastodon-light/diff.scss | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/javascript/styles/mastodon-light/diff.scss b/app/javascript/styles/mastodon-light/diff.scss
index 1de90e00160ebf..07e9d9868b4272 100644
--- a/app/javascript/styles/mastodon-light/diff.scss
+++ b/app/javascript/styles/mastodon-light/diff.scss
@@ -477,10 +477,7 @@ html {
   color: $white;
 }
 
-.compose-form,
-.spoiler-input__input,
-.search__input,
-.search__popout {
+.compose-form .spoiler-input__input {
   color: lighten($ui-highlight-color, 8%);
 }
 
@@ -488,6 +485,8 @@ html {
 .compose-form__highlightable,
 .search__input,
 .search__popout,
+.emoji-mart-search input,
+.language-dropdown__dropdown .emoji-mart-search input,
 .poll__option input[type='text'] {
   background: darken($ui-base-color, 10%);
 }

From e2844173499254bd5f460ca2c205d16de228db62 Mon Sep 17 00:00:00 2001
From: Michael Stanclift <mx@vmstan.com>
Date: Wed, 3 Apr 2024 10:19:10 -0500
Subject: [PATCH 0673/2191] Fix blue border on emoji/language search in Safari
 & Chrome (#29832)

---
 app/javascript/styles/mastodon/emoji_picker.scss | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/javascript/styles/mastodon/emoji_picker.scss b/app/javascript/styles/mastodon/emoji_picker.scss
index 14ce6a14b533a9..947385837125bd 100644
--- a/app/javascript/styles/mastodon/emoji_picker.scss
+++ b/app/javascript/styles/mastodon/emoji_picker.scss
@@ -112,10 +112,9 @@
       border: 0;
     }
 
-    &::-moz-focus-inner,
     &:focus,
     &:active {
-      outline: 0 !important;
+      outline: none !important;
     }
 
     &::-webkit-search-cancel-button {

From 37d984b8bf19f86a8a371a97d8a1a000022448b3 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 3 Apr 2024 20:05:39 +0200
Subject: [PATCH 0674/2191] Update eslint (non-major) (#29820)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
---
 .eslintrc.js                                  |   1 +
 .../mastodon/components/hashtag_bar.tsx       |   2 +-
 app/javascript/mastodon/uuid.ts               |   3 +-
 app/javascript/packs/admin.tsx                |   2 +-
 app/javascript/packs/public.tsx               |   8 +-
 yarn.lock                                     | 108 +++++++++---------
 6 files changed, 63 insertions(+), 61 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index 502b9cefed87c6..759003b55ec3cd 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -363,6 +363,7 @@ module.exports = defineConfig({
             "message": "Use typed hooks `useAppDispatch` and `useAppSelector` instead."
           }
         ],
+        "@typescript-eslint/restrict-template-expressions": ['warn', { allowNumber: true }],
         'jsdoc/require-jsdoc': 'off',
 
         // Those rules set stricter rules for TS files
diff --git a/app/javascript/mastodon/components/hashtag_bar.tsx b/app/javascript/mastodon/components/hashtag_bar.tsx
index 91fa9221983a70..ed5de7d3a5dff0 100644
--- a/app/javascript/mastodon/components/hashtag_bar.tsx
+++ b/app/javascript/mastodon/components/hashtag_bar.tsx
@@ -24,7 +24,7 @@ export type StatusLike = Record<{
 
 function normalizeHashtag(hashtag: string) {
   return (
-    hashtag && hashtag.startsWith('#') ? hashtag.slice(1) : hashtag
+    !!hashtag && hashtag.startsWith('#') ? hashtag.slice(1) : hashtag
   ).normalize('NFKC');
 }
 
diff --git a/app/javascript/mastodon/uuid.ts b/app/javascript/mastodon/uuid.ts
index 4d0a8a803637ba..0b4d55beb615d5 100644
--- a/app/javascript/mastodon/uuid.ts
+++ b/app/javascript/mastodon/uuid.ts
@@ -4,5 +4,6 @@ export function uuid(a?: string): string {
         (a as unknown as number) ^
         ((Math.random() * 16) >> ((a as unknown as number) / 4))
       ).toString(16)
-    : ('' + 1e7 + -1e3 + -4e3 + -8e3 + -1e11).replace(/[018]/g, uuid);
+    : // eslint-disable-next-line @typescript-eslint/restrict-plus-operands
+      ('' + 1e7 + -1e3 + -4e3 + -8e3 + -1e11).replace(/[018]/g, uuid);
 }
diff --git a/app/javascript/packs/admin.tsx b/app/javascript/packs/admin.tsx
index 9fee5605659663..225cb16330fe54 100644
--- a/app/javascript/packs/admin.tsx
+++ b/app/javascript/packs/admin.tsx
@@ -363,6 +363,6 @@ ready(() => {
   document.querySelectorAll('[data-admin-component]').forEach((element) => {
     void mountReactComponent(element);
   });
-}).catch((reason) => {
+}).catch((reason: unknown) => {
   throw reason;
 });
diff --git a/app/javascript/packs/public.tsx b/app/javascript/packs/public.tsx
index 044faeb29605cb..d45927226c282f 100644
--- a/app/javascript/packs/public.tsx
+++ b/app/javascript/packs/public.tsx
@@ -69,7 +69,7 @@ window.addEventListener('message', (e) => {
       },
       '*',
     );
-  }).catch((e) => {
+  }).catch((e: unknown) => {
     console.error('Error in setHeightMessage postMessage', e);
   });
 });
@@ -206,7 +206,7 @@ function loaded() {
 
         return true;
       })
-      .catch((error) => {
+      .catch((error: unknown) => {
         console.error(error);
       });
   }
@@ -448,7 +448,7 @@ Rails.delegate(document, '#registration_new_user,#new_user', 'submit', () => {
 });
 
 function main() {
-  ready(loaded).catch((error) => {
+  ready(loaded).catch((error: unknown) => {
     console.error(error);
   });
 }
@@ -457,6 +457,6 @@ loadPolyfills()
   .then(loadLocale)
   .then(main)
   .then(loadKeyboardExtensions)
-  .catch((error) => {
+  .catch((error: unknown) => {
     console.error(error);
   });
diff --git a/yarn.lock b/yarn.lock
index 8af9bfdb87b557..4475cbc5eb3a8c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4028,14 +4028,14 @@ __metadata:
   linkType: hard
 
 "@typescript-eslint/eslint-plugin@npm:^7.0.0":
-  version: 7.1.1
-  resolution: "@typescript-eslint/eslint-plugin@npm:7.1.1"
+  version: 7.5.0
+  resolution: "@typescript-eslint/eslint-plugin@npm:7.5.0"
   dependencies:
     "@eslint-community/regexpp": "npm:^4.5.1"
-    "@typescript-eslint/scope-manager": "npm:7.1.1"
-    "@typescript-eslint/type-utils": "npm:7.1.1"
-    "@typescript-eslint/utils": "npm:7.1.1"
-    "@typescript-eslint/visitor-keys": "npm:7.1.1"
+    "@typescript-eslint/scope-manager": "npm:7.5.0"
+    "@typescript-eslint/type-utils": "npm:7.5.0"
+    "@typescript-eslint/utils": "npm:7.5.0"
+    "@typescript-eslint/visitor-keys": "npm:7.5.0"
     debug: "npm:^4.3.4"
     graphemer: "npm:^1.4.0"
     ignore: "npm:^5.2.4"
@@ -4048,25 +4048,25 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 10c0/041799604176bbee01f6ff029c5e2fcf1196db2737ba219a20b095f095dc0064ea425d15dd6dc22eaef294daa838209601ec7bc19317258dfa89a13afb8126ba
+  checksum: 10c0/932a7b5a09c0138ef5a0bf00f8e6039fa209d4047092ffc187de048543c21f7ce24dc14f25f4c87b6f3bbb62335fc952e259e271fde88baf793217bde6460cfa
   languageName: node
   linkType: hard
 
 "@typescript-eslint/parser@npm:^7.0.0":
-  version: 7.1.1
-  resolution: "@typescript-eslint/parser@npm:7.1.1"
+  version: 7.5.0
+  resolution: "@typescript-eslint/parser@npm:7.5.0"
   dependencies:
-    "@typescript-eslint/scope-manager": "npm:7.1.1"
-    "@typescript-eslint/types": "npm:7.1.1"
-    "@typescript-eslint/typescript-estree": "npm:7.1.1"
-    "@typescript-eslint/visitor-keys": "npm:7.1.1"
+    "@typescript-eslint/scope-manager": "npm:7.5.0"
+    "@typescript-eslint/types": "npm:7.5.0"
+    "@typescript-eslint/typescript-estree": "npm:7.5.0"
+    "@typescript-eslint/visitor-keys": "npm:7.5.0"
     debug: "npm:^4.3.4"
   peerDependencies:
     eslint: ^8.56.0
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 10c0/84eb44f3767aaa1d7b26176348c89bd6732bc711f7f24186b1354eba95bf9e9c65b5675838772b831391210e525ff1f3bd4b51a3130ec35413aa362920effc57
+  checksum: 10c0/65521202ff024e79594272fbb7e4731ecf9d2fdd2f58fc81450bfd2bca94ce9c17b0eadd7338c01701f5cf16d38b6c025ed3fc322380b1e4b5424b7484098cda
   languageName: node
   linkType: hard
 
@@ -4080,22 +4080,22 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/scope-manager@npm:7.1.1":
-  version: 7.1.1
-  resolution: "@typescript-eslint/scope-manager@npm:7.1.1"
+"@typescript-eslint/scope-manager@npm:7.5.0":
+  version: 7.5.0
+  resolution: "@typescript-eslint/scope-manager@npm:7.5.0"
   dependencies:
-    "@typescript-eslint/types": "npm:7.1.1"
-    "@typescript-eslint/visitor-keys": "npm:7.1.1"
-  checksum: 10c0/a955c8529f24945d448b95982d06b5f15a74fc5df97307f5821d55e9861d6c26d61cbd118c1ca41634164ed1d4f6c74fcb8388761341c49e6902a6fb72036afc
+    "@typescript-eslint/types": "npm:7.5.0"
+    "@typescript-eslint/visitor-keys": "npm:7.5.0"
+  checksum: 10c0/a017b151a6b39ef591f8e2e65598e005e1b4b2d5494e4b91bddb5856b3a4d57dd8a58d2bc7a140e627eb574f93a2c8fe55f1307aa264c928ffd31d9e190bc5dd
   languageName: node
   linkType: hard
 
-"@typescript-eslint/type-utils@npm:7.1.1":
-  version: 7.1.1
-  resolution: "@typescript-eslint/type-utils@npm:7.1.1"
+"@typescript-eslint/type-utils@npm:7.5.0":
+  version: 7.5.0
+  resolution: "@typescript-eslint/type-utils@npm:7.5.0"
   dependencies:
-    "@typescript-eslint/typescript-estree": "npm:7.1.1"
-    "@typescript-eslint/utils": "npm:7.1.1"
+    "@typescript-eslint/typescript-estree": "npm:7.5.0"
+    "@typescript-eslint/utils": "npm:7.5.0"
     debug: "npm:^4.3.4"
     ts-api-utils: "npm:^1.0.1"
   peerDependencies:
@@ -4103,7 +4103,7 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 10c0/6f19dc383718cce42ed7262d134f5f0221bcbf225fea28975cd714c90e57d861608d5187c7ad731f6281813f94b00f22282a99a8a852167366064abc6e256341
+  checksum: 10c0/12915d4d1872638f5281e222a0d191676c478f250699c84864862e95a59e708222acefbf7ffdafc0872a007261219a3a2b1e667ff45eeafea7c4bcc5b955262c
   languageName: node
   linkType: hard
 
@@ -4114,10 +4114,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/types@npm:7.1.1":
-  version: 7.1.1
-  resolution: "@typescript-eslint/types@npm:7.1.1"
-  checksum: 10c0/2bef95ec0c60e67fada336db3e82fac2be16c21a9e54fc45c7aeda3291abcceefa12aa970025db88bc2b3e113b1e70abd7f89c2a651c16b816dff1a0c46e7907
+"@typescript-eslint/types@npm:7.5.0":
+  version: 7.5.0
+  resolution: "@typescript-eslint/types@npm:7.5.0"
+  checksum: 10c0/f3394f71f422dbd89f63b230f20e9769c12e47a287ff30ca03a80714e57ea21279b6f12a8ab14bafb00b59926f20a88894b2d1e72679f7ff298bae112679d4b3
   languageName: node
   linkType: hard
 
@@ -4140,12 +4140,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/typescript-estree@npm:7.1.1":
-  version: 7.1.1
-  resolution: "@typescript-eslint/typescript-estree@npm:7.1.1"
+"@typescript-eslint/typescript-estree@npm:7.5.0":
+  version: 7.5.0
+  resolution: "@typescript-eslint/typescript-estree@npm:7.5.0"
   dependencies:
-    "@typescript-eslint/types": "npm:7.1.1"
-    "@typescript-eslint/visitor-keys": "npm:7.1.1"
+    "@typescript-eslint/types": "npm:7.5.0"
+    "@typescript-eslint/visitor-keys": "npm:7.5.0"
     debug: "npm:^4.3.4"
     globby: "npm:^11.1.0"
     is-glob: "npm:^4.0.3"
@@ -4155,24 +4155,24 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 10c0/2cec9d21cfe46e523a6d29aff554e5450edf1ee30ce9cf644ee8f1f5e1cfd44b94afb3632db97a949c86c4a392ae80f264d56d8747b2b0fdbe5c54139433366a
+  checksum: 10c0/ea3a270c725d6be273188b86110e0393052cd64d1c54a56eb5ea405e6d3fbbe84fb3b1ce1b8496a4078ac1eefd37aedcf12be91876764f6de31d5aa5131c7bcd
   languageName: node
   linkType: hard
 
-"@typescript-eslint/utils@npm:7.1.1":
-  version: 7.1.1
-  resolution: "@typescript-eslint/utils@npm:7.1.1"
+"@typescript-eslint/utils@npm:7.5.0":
+  version: 7.5.0
+  resolution: "@typescript-eslint/utils@npm:7.5.0"
   dependencies:
     "@eslint-community/eslint-utils": "npm:^4.4.0"
     "@types/json-schema": "npm:^7.0.12"
     "@types/semver": "npm:^7.5.0"
-    "@typescript-eslint/scope-manager": "npm:7.1.1"
-    "@typescript-eslint/types": "npm:7.1.1"
-    "@typescript-eslint/typescript-estree": "npm:7.1.1"
+    "@typescript-eslint/scope-manager": "npm:7.5.0"
+    "@typescript-eslint/types": "npm:7.5.0"
+    "@typescript-eslint/typescript-estree": "npm:7.5.0"
     semver: "npm:^7.5.4"
   peerDependencies:
     eslint: ^8.56.0
-  checksum: 10c0/3e70834c5b49e4643ec8da63fa2acaab54283a566af2cedcd4c2f4210833a59bf71c459dde69e738115633c7de9f1339130552ff246e8e1bb4db26910685408b
+  checksum: 10c0/c815ed6909769648953d6963c069038f7cac0c979051b25718feb30e0d3337b9647b75b8de00ac03fe960f0cc8dc4e8a81d4aac4719090a99785e0068712bd24
   languageName: node
   linkType: hard
 
@@ -4203,13 +4203,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/visitor-keys@npm:7.1.1":
-  version: 7.1.1
-  resolution: "@typescript-eslint/visitor-keys@npm:7.1.1"
+"@typescript-eslint/visitor-keys@npm:7.5.0":
+  version: 7.5.0
+  resolution: "@typescript-eslint/visitor-keys@npm:7.5.0"
   dependencies:
-    "@typescript-eslint/types": "npm:7.1.1"
+    "@typescript-eslint/types": "npm:7.5.0"
     eslint-visitor-keys: "npm:^3.4.1"
-  checksum: 10c0/1ab19ec966ff0b86317eddcbfcda645856ec01c3b76a451298031f35e4da0a363e4888ce5ae9e2526e874799a502c49922d83d57d21cb6fef7f3912f51e4a271
+  checksum: 10c0/eecf02b8dd54e83738a143aca87b902af4b357028a90fd34ed7a2f40a3ae2f6a188b9ba53903f23c80e868f1fffbb039e9ddb63525438d659707cc7bfb269317
   languageName: node
   linkType: hard
 
@@ -7793,8 +7793,8 @@ __metadata:
   linkType: hard
 
 "eslint-plugin-jsdoc@npm:^48.0.0":
-  version: 48.2.1
-  resolution: "eslint-plugin-jsdoc@npm:48.2.1"
+  version: 48.2.2
+  resolution: "eslint-plugin-jsdoc@npm:48.2.2"
   dependencies:
     "@es-joy/jsdoccomment": "npm:~0.42.0"
     are-docs-informative: "npm:^0.0.2"
@@ -7807,7 +7807,7 @@ __metadata:
     spdx-expression-parse: "npm:^4.0.0"
   peerDependencies:
     eslint: ^7.0.0 || ^8.0.0 || ^9.0.0
-  checksum: 10c0/92237f08b7dadb21f9eda50eda00bf69ac5e0bfcb9d179bf118e096178d7dc4a62b34fd01b3b7b0ba1142ff6e13814cfe2cf9a60c6cfcc879559b6b509d0d4e1
+  checksum: 10c0/d6911e73d36757de5aef127e795116fbbcdef504f7e91d9c0863faf0b1693271d96188f0f1d54c0d74c56652bfa3fb4f1aa1a2f0876b0c6a5e57a874bcb3ac2b
   languageName: node
   linkType: hard
 
@@ -7856,8 +7856,8 @@ __metadata:
   linkType: hard
 
 "eslint-plugin-react@npm:^7.33.2":
-  version: 7.34.0
-  resolution: "eslint-plugin-react@npm:7.34.0"
+  version: 7.34.1
+  resolution: "eslint-plugin-react@npm:7.34.1"
   dependencies:
     array-includes: "npm:^3.1.7"
     array.prototype.findlast: "npm:^1.2.4"
@@ -7879,7 +7879,7 @@ __metadata:
     string.prototype.matchall: "npm:^4.0.10"
   peerDependencies:
     eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8
-  checksum: 10c0/9bf0b959373ace66e799adbbfb493a7ceae54751e8f90fcce1da1a2a67b277ee23ba845571eaa4d4f05d96dba4e4977bf938b350f18bad26201fa616ee6aa4b8
+  checksum: 10c0/7c61b1314d37a4ac2f2474f9571f801f1a1a5d81dcd4abbb5d07145406518722fb792367267757ee116bde254be9753242d6b93c9619110398b3fe1746e4848c
   languageName: node
   linkType: hard
 

From cde3206478341d0723ff13d8600f1754fd61f650 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 3 Apr 2024 16:10:59 -0400
Subject: [PATCH 0675/2191] Simplify feature loop in welcome mailer (#29760)

---
 app/views/application/mailer/_feature.html.haml | 10 ++++------
 app/views/user_mailer/welcome.html.haml         |  8 ++++----
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/app/views/application/mailer/_feature.html.haml b/app/views/application/mailer/_feature.html.haml
index d051338a9c27bd..5facdd086602bf 100644
--- a/app/views/application/mailer/_feature.html.haml
+++ b/app/views/application/mailer/_feature.html.haml
@@ -11,10 +11,8 @@
                 %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
                   %tr
                     %td.email-column-td
-                      - if defined?(feature_title)
-                        %h2.email-h2= feature_title
-                      - if defined?(feature_text)
-                        %p.email-p= feature_text
+                      %h2.email-h2= t("user_mailer.welcome.feature_#{feature}_title")
+                      %p.email-p= t("user_mailer.welcome.feature_#{feature}")
                       - if defined?(feature_btn_url)
                         = link_to '', href: feature_btn_url, class: 'email-link-with-arrow' do
                           #{t('user_mailer.welcome.feature_action')} 
@@ -25,8 +23,8 @@
                 %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
                   %tr
                     %td.email-column-td
-                      - if defined?(key)
+                      - if defined?(feature)
                         %p{ class: ('email-desktop-text-right' if defined?(text_first_on_desktop) && text_first_on_desktop) }
-                          = image_tag frontend_asset_url("images/mailer-new/welcome/#{key}.png"), alt: '', width: 240, height: 230
+                          = image_tag frontend_asset_url("images/mailer-new/welcome/feature_#{feature}.png"), alt: '', width: 240, height: 230
               /[if mso]
                 </td></tr></table>
diff --git a/app/views/user_mailer/welcome.html.haml b/app/views/user_mailer/welcome.html.haml
index 0e55707d36ce58..97fb0a2c97d49b 100644
--- a/app/views/user_mailer/welcome.html.haml
+++ b/app/views/user_mailer/welcome.html.haml
@@ -68,7 +68,7 @@
 %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
   %tr
     %td.email-extra-td
-      = render 'application/mailer/feature', key: 'feature_control', feature_title: t('user_mailer.welcome.feature_control_title'), feature_text: t('user_mailer.welcome.feature_control'), text_first_on_desktop: true
-      = render 'application/mailer/feature', key: 'feature_audience', feature_title: t('user_mailer.welcome.feature_audience_title'), feature_text: t('user_mailer.welcome.feature_audience'), text_first_on_desktop: false
-      = render 'application/mailer/feature', key: 'feature_moderation', feature_title: t('user_mailer.welcome.feature_moderation_title'), feature_text: t('user_mailer.welcome.feature_moderation'), text_first_on_desktop: true
-      = render 'application/mailer/feature', key: 'feature_creativity', feature_title: t('user_mailer.welcome.feature_creativity_title'), feature_text: t('user_mailer.welcome.feature_creativity'), text_first_on_desktop: false
+      = render 'application/mailer/feature', feature: 'control', text_first_on_desktop: true
+      = render 'application/mailer/feature', feature: 'audience', text_first_on_desktop: false
+      = render 'application/mailer/feature', feature: 'moderation', text_first_on_desktop: true
+      = render 'application/mailer/feature', feature: 'creativity', text_first_on_desktop: false

From c6da3ee828ba2f8ddadfbb8b51a6fba90abc6824 Mon Sep 17 00:00:00 2001
From: nicolas <nclm@users.noreply.github.com>
Date: Wed, 3 Apr 2024 23:10:02 +0200
Subject: [PATCH 0676/2191] Makes the star icon rotate around its actual centre
 axis (#29844)

---
 app/javascript/styles/mastodon/components.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index a49f162e3bb5ab..e35b6962341084 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -2244,14 +2244,14 @@ a.account__display-name {
   &.activate {
     & > .icon {
       animation: spring-rotate-in 1s linear;
-      transform-origin: 50% 55%;
+      transform-origin: 50% 52%;
     }
   }
 
   &.deactivate {
     & > .icon {
       animation: spring-rotate-out 1s linear;
-      transform-origin: 50% 55%;
+      transform-origin: 50% 52%;
     }
   }
 }

From 58dfc12af21f9b87e8c7c6bec2f5f28ab2bcca59 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 4 Apr 2024 09:23:53 +0200
Subject: [PATCH 0677/2191] Update babel monorepo to v7.24.4 (#29840)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 101 ++++++++++++++++++++++++++++++------------------------
 1 file changed, 57 insertions(+), 44 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 4475cbc5eb3a8c..3407619c81e50f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -52,24 +52,24 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/compat-data@npm:^7.22.6, @babel/compat-data@npm:^7.23.5, @babel/compat-data@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/compat-data@npm:7.24.1"
-  checksum: 10c0/8a1935450345c326b14ea632174696566ef9b353bd0d6fb682456c0774342eeee7654877ced410f24a731d386fdcbf980b75083fc764964d6f816b65792af2f5
+"@babel/compat-data@npm:^7.22.6, @babel/compat-data@npm:^7.23.5, @babel/compat-data@npm:^7.24.4":
+  version: 7.24.4
+  resolution: "@babel/compat-data@npm:7.24.4"
+  checksum: 10c0/9cd8a9cd28a5ca6db5d0e27417d609f95a8762b655e8c9c97fd2de08997043ae99f0139007083c5e607601c6122e8432c85fe391731b19bf26ad458fa0c60dd3
   languageName: node
   linkType: hard
 
 "@babel/core@npm:^7.10.4, @babel/core@npm:^7.11.1, @babel/core@npm:^7.11.6, @babel/core@npm:^7.12.3, @babel/core@npm:^7.22.1":
-  version: 7.24.3
-  resolution: "@babel/core@npm:7.24.3"
+  version: 7.24.4
+  resolution: "@babel/core@npm:7.24.4"
   dependencies:
     "@ampproject/remapping": "npm:^2.2.0"
     "@babel/code-frame": "npm:^7.24.2"
-    "@babel/generator": "npm:^7.24.1"
+    "@babel/generator": "npm:^7.24.4"
     "@babel/helper-compilation-targets": "npm:^7.23.6"
     "@babel/helper-module-transforms": "npm:^7.23.3"
-    "@babel/helpers": "npm:^7.24.1"
-    "@babel/parser": "npm:^7.24.1"
+    "@babel/helpers": "npm:^7.24.4"
+    "@babel/parser": "npm:^7.24.4"
     "@babel/template": "npm:^7.24.0"
     "@babel/traverse": "npm:^7.24.1"
     "@babel/types": "npm:^7.24.0"
@@ -78,19 +78,19 @@ __metadata:
     gensync: "npm:^1.0.0-beta.2"
     json5: "npm:^2.2.3"
     semver: "npm:^6.3.1"
-  checksum: 10c0/e6e756b6de27d0312514a005688fa1915c521ad4269a388913eff2120a546538078f8488d6d16e86f851872f263cb45a6bbae08738297afb9382600d2ac342a9
+  checksum: 10c0/fc136966583e64d6f84f4a676368de6ab4583aa87f867186068655b30ef67f21f8e65a88c6d446a7efd219ad7ffb9185c82e8a90183ee033f6f47b5026641e16
   languageName: node
   linkType: hard
 
-"@babel/generator@npm:^7.24.1, @babel/generator@npm:^7.7.2":
-  version: 7.24.1
-  resolution: "@babel/generator@npm:7.24.1"
+"@babel/generator@npm:^7.24.1, @babel/generator@npm:^7.24.4, @babel/generator@npm:^7.7.2":
+  version: 7.24.4
+  resolution: "@babel/generator@npm:7.24.4"
   dependencies:
     "@babel/types": "npm:^7.24.0"
     "@jridgewell/gen-mapping": "npm:^0.3.5"
     "@jridgewell/trace-mapping": "npm:^0.3.25"
     jsesc: "npm:^2.5.1"
-  checksum: 10c0/f0eea7497657cdf68cfb4b7d181588e1498eefd1f303d73b0d8ca9b21a6db27136a6f5beb8f988b6bdcd4249870826080950450fd310951de42ecf36df274881
+  checksum: 10c0/67a1b2f7cc985aaaa11b01e8ddd4fffa4f285837bc7a209738eb8203aa34bdafeb8507ed75fd883ddbabd641a036ca0a8d984e760f28ad4a9d60bff29d0a60bb
   languageName: node
   linkType: hard
 
@@ -135,9 +135,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-create-class-features-plugin@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/helper-create-class-features-plugin@npm:7.24.1"
+"@babel/helper-create-class-features-plugin@npm:^7.24.1, @babel/helper-create-class-features-plugin@npm:^7.24.4":
+  version: 7.24.4
+  resolution: "@babel/helper-create-class-features-plugin@npm:7.24.4"
   dependencies:
     "@babel/helper-annotate-as-pure": "npm:^7.22.5"
     "@babel/helper-environment-visitor": "npm:^7.22.20"
@@ -150,7 +150,7 @@ __metadata:
     semver: "npm:^6.3.1"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10c0/45372890634c37deefc81f44b7d958fe210f7da7d8a2239c9849c6041a56536f74bf3aa2d115bc06d5680d0dc49c1303f74a045d76ae0dd1592c7d5c0c268ebc
+  checksum: 10c0/6ebb38375dcd44c79f40008c2de4d023376cf436c135439f15c9c54603c2d6a8ada39b2e07be545da684d9e40b602a0cb0d1670f3877d056deb5f0d786c4bf86
   languageName: node
   linkType: hard
 
@@ -342,14 +342,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helpers@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/helpers@npm:7.24.1"
+"@babel/helpers@npm:^7.24.4":
+  version: 7.24.4
+  resolution: "@babel/helpers@npm:7.24.4"
   dependencies:
     "@babel/template": "npm:^7.24.0"
     "@babel/traverse": "npm:^7.24.1"
     "@babel/types": "npm:^7.24.0"
-  checksum: 10c0/b3445860ae749fc664682b291f092285e949114e8336784ae29f88eb4c176279b01cc6740005a017a0389ae4b4e928d5bbbc01de7da7e400c972e3d6f792063a
+  checksum: 10c0/747ef62b7fe87de31a2f3c19ff337a86cbb79be2f6c18af63133b614ab5a8f6da5b06ae4b06fb0e71271cb6a27efec6f8b6c9f44c60b8a18777832dc7929e6c5
   languageName: node
   linkType: hard
 
@@ -365,12 +365,24 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.24.0, @babel/parser@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/parser@npm:7.24.1"
+"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.24.0, @babel/parser@npm:^7.24.1, @babel/parser@npm:^7.24.4":
+  version: 7.24.4
+  resolution: "@babel/parser@npm:7.24.4"
   bin:
     parser: ./bin/babel-parser.js
-  checksum: 10c0/d2a8b99aa5f33182b69d5569367403a40e7c027ae3b03a1f81fd8ac9b06ceb85b31f6ee4267fb90726dc2ac99909c6bdaa9cf16c379efab73d8dfe85cee32c50
+  checksum: 10c0/8381e1efead5069cb7ed2abc3a583f4a86289b2f376c75cecc69f59a8eb36df18274b1886cecf2f97a6a0dff5334b27330f58535be9b3e4e26102cc50e12eac8
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-bugfix-firefox-class-in-computed-class-key@npm:^7.24.4":
+  version: 7.24.4
+  resolution: "@babel/plugin-bugfix-firefox-class-in-computed-class-key@npm:7.24.4"
+  dependencies:
+    "@babel/helper-environment-visitor": "npm:^7.22.20"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+  peerDependencies:
+    "@babel/core": ^7.0.0
+  checksum: 10c0/9aed453a1a21e4fd29add0b4a2d82a2c6f43a47c80d28411f8327f2a714064bc93a6f622c701d263970e0d72d7901d28f7f51e91ba91a31306efe8f17c411182
   languageName: node
   linkType: hard
 
@@ -700,14 +712,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-block-scoping@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-block-scoping@npm:7.24.1"
+"@babel/plugin-transform-block-scoping@npm:^7.24.4":
+  version: 7.24.4
+  resolution: "@babel/plugin-transform-block-scoping@npm:7.24.4"
   dependencies:
     "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/1a230ad95d9672626831e22df9b4838901681fa11d44c3811d71ca64ea53f5e87de2abef865f70fe62657053278d9034cc4ea3bab0fd3300bdf9e73b3f85f97a
+  checksum: 10c0/62f55fd1b60a115506e9553c3bf925179b1ab8a42dc31471c4e3ada20573a488b5c5e3317145da352493ef07f1d9750ce1f8a49cb3f39489ac1ab42e5ddc883d
   languageName: node
   linkType: hard
 
@@ -723,16 +735,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-class-static-block@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-class-static-block@npm:7.24.1"
+"@babel/plugin-transform-class-static-block@npm:^7.24.4":
+  version: 7.24.4
+  resolution: "@babel/plugin-transform-class-static-block@npm:7.24.4"
   dependencies:
-    "@babel/helper-create-class-features-plugin": "npm:^7.24.1"
+    "@babel/helper-create-class-features-plugin": "npm:^7.24.4"
     "@babel/helper-plugin-utils": "npm:^7.24.0"
     "@babel/plugin-syntax-class-static-block": "npm:^7.14.5"
   peerDependencies:
     "@babel/core": ^7.12.0
-  checksum: 10c0/3095d02b7932890b82346d42200a89a56b6ca7d25a69a94242ab5b1772f18138b8e639358dd70d23add2df8b0d1640e1e13729c2c275ecce550cbe89048ba85f
+  checksum: 10c0/19dfeaf4a2ac03695034f7211a8b5ad89103b224608ac3e91791055107c5fe4d7ebe5d9fbb31b4a91265694af78762260642eb270f4b239c175984ee4b253f80
   languageName: node
   linkType: hard
 
@@ -1333,13 +1345,14 @@ __metadata:
   linkType: hard
 
 "@babel/preset-env@npm:^7.11.0, @babel/preset-env@npm:^7.12.1, @babel/preset-env@npm:^7.22.4":
-  version: 7.24.3
-  resolution: "@babel/preset-env@npm:7.24.3"
+  version: 7.24.4
+  resolution: "@babel/preset-env@npm:7.24.4"
   dependencies:
-    "@babel/compat-data": "npm:^7.24.1"
+    "@babel/compat-data": "npm:^7.24.4"
     "@babel/helper-compilation-targets": "npm:^7.23.6"
     "@babel/helper-plugin-utils": "npm:^7.24.0"
     "@babel/helper-validator-option": "npm:^7.23.5"
+    "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "npm:^7.24.4"
     "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "npm:^7.24.1"
     "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "npm:^7.24.1"
     "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "npm:^7.24.1"
@@ -1366,9 +1379,9 @@ __metadata:
     "@babel/plugin-transform-async-generator-functions": "npm:^7.24.3"
     "@babel/plugin-transform-async-to-generator": "npm:^7.24.1"
     "@babel/plugin-transform-block-scoped-functions": "npm:^7.24.1"
-    "@babel/plugin-transform-block-scoping": "npm:^7.24.1"
+    "@babel/plugin-transform-block-scoping": "npm:^7.24.4"
     "@babel/plugin-transform-class-properties": "npm:^7.24.1"
-    "@babel/plugin-transform-class-static-block": "npm:^7.24.1"
+    "@babel/plugin-transform-class-static-block": "npm:^7.24.4"
     "@babel/plugin-transform-classes": "npm:^7.24.1"
     "@babel/plugin-transform-computed-properties": "npm:^7.24.1"
     "@babel/plugin-transform-destructuring": "npm:^7.24.1"
@@ -1418,7 +1431,7 @@ __metadata:
     semver: "npm:^6.3.1"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/abd6f3b6c6a71d4ff766cda5b51467677a811240d022492e651065e26ce1a8eb2067eabe5653fce80dda9c5c204fb7b89b419578d7e86eaaf7970929ee7b4885
+  checksum: 10c0/72a79d0cd38cb26f143509dd0c58db34b5b1ae90116863f55a404f0eb06a64a3cdcb1abd0b6435fafe463bbf55b82ffcf56aedee91e8d37797bf53e4ae74c413
   languageName: node
   linkType: hard
 
@@ -1483,11 +1496,11 @@ __metadata:
   linkType: hard
 
 "@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.0, @babel/runtime@npm:^7.12.13, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.13.8, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.2.0, @babel/runtime@npm:^7.20.13, @babel/runtime@npm:^7.22.3, @babel/runtime@npm:^7.23.2, @babel/runtime@npm:^7.3.1, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.6.3, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.8.7, @babel/runtime@npm:^7.9.2":
-  version: 7.24.1
-  resolution: "@babel/runtime@npm:7.24.1"
+  version: 7.24.4
+  resolution: "@babel/runtime@npm:7.24.4"
   dependencies:
     regenerator-runtime: "npm:^0.14.0"
-  checksum: 10c0/500c6a99ddd84f37c7bc5dbc84777af47b1372b20e879941670451d55484faf18a673c5ebee9ca2b0f36208a729417873b35b1b92e76f811620f6adf7b8cb0f1
+  checksum: 10c0/785aff96a3aa8ff97f90958e1e8a7b1d47f793b204b47c6455eaadc3f694f48c97cd5c0a921fe3596d818e71f18106610a164fb0f1c71fd68c622a58269d537c
   languageName: node
   linkType: hard
 

From 91d3b3fb25fe61cb8ebcea30ea42ee2b5d7c28ed Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 4 Apr 2024 07:25:30 +0000
Subject: [PATCH 0678/2191] Update dependency sass to v1.74.1 (#29846)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 3407619c81e50f..8d235a7197a90d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -15300,15 +15300,15 @@ __metadata:
   linkType: hard
 
 "sass@npm:^1.62.1":
-  version: 1.72.0
-  resolution: "sass@npm:1.72.0"
+  version: 1.74.1
+  resolution: "sass@npm:1.74.1"
   dependencies:
     chokidar: "npm:>=3.0.0 <4.0.0"
     immutable: "npm:^4.0.0"
     source-map-js: "npm:>=0.6.2 <2.0.0"
   bin:
     sass: sass.js
-  checksum: 10c0/7df1bb470648edc4b528976b1b165c78d4c6731f680afac7cdc8324142f1ef4304598d317d98dac747a2ae8eee17271d760def90bba072021a8b19b459336ccd
+  checksum: 10c0/4610257ee27823276ce4998a534b4ee9f313e5a0b3d3899e70e0f87096feeae4cd8dd3c2f765b52f57dd87f5dab22370ef63f95a837a189fbb9401396d5ce717
   languageName: node
   linkType: hard
 

From 4045c069f8f91200d0e7c64a8097e425aee71041 Mon Sep 17 00:00:00 2001
From: Jeong Arm <kjwonmail@gmail.com>
Date: Thu, 4 Apr 2024 16:31:30 +0900
Subject: [PATCH 0679/2191] Use `public_visibility` (#29847)

---
 app/lib/annual_report/top_statuses.rb           | 2 +-
 app/views/application/mailer/_hashtag.html.haml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/lib/annual_report/top_statuses.rb b/app/lib/annual_report/top_statuses.rb
index 112e5591ce2170..1ab1709523b7de 100644
--- a/app/lib/annual_report/top_statuses.rb
+++ b/app/lib/annual_report/top_statuses.rb
@@ -16,6 +16,6 @@ def generate
   end
 
   def base_scope
-    @account.statuses.with_public_visibility.joins(:status_stat).where(id: year_as_snowflake_range).reorder(nil)
+    @account.statuses.public_visibility.joins(:status_stat).where(id: year_as_snowflake_range).reorder(nil)
   end
 end
diff --git a/app/views/application/mailer/_hashtag.html.haml b/app/views/application/mailer/_hashtag.html.haml
index fcedfa80a5e247..74a00e67e13834 100644
--- a/app/views/application/mailer/_hashtag.html.haml
+++ b/app/views/application/mailer/_hashtag.html.haml
@@ -1,4 +1,4 @@
-- accounts = hashtag.statuses.with_public_visibility.joins(:account).merge(Account.without_suspended.without_silenced).includes(:account).limit(3).map(&:account)
+- accounts = hashtag.statuses.public_visibility.joins(:account).merge(Account.without_suspended.without_silenced).includes(:account).limit(3).map(&:account)
 
 %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
   %tr

From 966d7f5bf9b6b7088f63cc7f8dca90496700ac05 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 4 Apr 2024 07:33:17 -0400
Subject: [PATCH 0680/2191] Add missing snowflake range correction (#29841)

---
 app/lib/admin/metrics/measure/tag_servers_measure.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/lib/admin/metrics/measure/tag_servers_measure.rb b/app/lib/admin/metrics/measure/tag_servers_measure.rb
index e0f1bf3440d745..f273d739d04aaa 100644
--- a/app/lib/admin/metrics/measure/tag_servers_measure.rb
+++ b/app/lib/admin/metrics/measure/tag_servers_measure.rb
@@ -46,11 +46,11 @@ def sql_query_string
   end
 
   def earliest_status_id
-    Mastodon::Snowflake.id_at(@start_at, with_random: false)
+    Mastodon::Snowflake.id_at(@start_at.beginning_of_day, with_random: false)
   end
 
   def latest_status_id
-    Mastodon::Snowflake.id_at(@end_at, with_random: false)
+    Mastodon::Snowflake.id_at(@end_at.end_of_day, with_random: false)
   end
 
   def tag

From 1c87cb8019bafd2eb5b126ed0e9186ce20e94b1e Mon Sep 17 00:00:00 2001
From: Michael Stanclift <mx@vmstan.com>
Date: Thu, 4 Apr 2024 06:51:06 -0500
Subject: [PATCH 0681/2191] Add purple border to active compose field search
 inputs (#29839)

---
 app/javascript/styles/mastodon/emoji_picker.scss | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/javascript/styles/mastodon/emoji_picker.scss b/app/javascript/styles/mastodon/emoji_picker.scss
index 947385837125bd..b9fdaa58473438 100644
--- a/app/javascript/styles/mastodon/emoji_picker.scss
+++ b/app/javascript/styles/mastodon/emoji_picker.scss
@@ -112,9 +112,11 @@
       border: 0;
     }
 
-    &:focus,
-    &:active {
+    &:active,
+    &:focus {
       outline: none !important;
+      border-width: 1px !important;
+      border-color: $ui-button-background-color;
     }
 
     &::-webkit-search-cancel-button {

From 191bf5876e73e586a04e642bc9b63e42721d30ad Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 4 Apr 2024 12:07:16 -0400
Subject: [PATCH 0682/2191] Add coverage for sanitize failure path in
 api/web/embeds spec (#29851)

---
 spec/requests/api/web/embeds_spec.rb | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/spec/requests/api/web/embeds_spec.rb b/spec/requests/api/web/embeds_spec.rb
index 6314f43aafe6af..0e6195204bcd48 100644
--- a/spec/requests/api/web/embeds_spec.rb
+++ b/spec/requests/api/web/embeds_spec.rb
@@ -137,6 +137,18 @@
         end
       end
 
+      context 'when sanitizing the fragment fails' do
+        let(:call_result) { { html: 'ok' } }
+
+        before { allow(Sanitize).to receive(:fragment).and_raise(ArgumentError) }
+
+        it 'returns http not found' do
+          subject
+
+          expect(response).to have_http_status(404)
+        end
+      end
+
       context 'when failing to fetch OEmbed' do
         let(:call_result) { nil }
 

From 601834d74646955ad878024a8b32d35ad3ac0a56 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 4 Apr 2024 12:13:10 -0400
Subject: [PATCH 0683/2191] Use partial collection render for welcome mailer
 features (#29843)

---
 app/views/application/mailer/_feature.html.haml | 4 ++--
 app/views/user_mailer/welcome.html.haml         | 5 +----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/app/views/application/mailer/_feature.html.haml b/app/views/application/mailer/_feature.html.haml
index 5facdd086602bf..94dd4b9cffdf3a 100644
--- a/app/views/application/mailer/_feature.html.haml
+++ b/app/views/application/mailer/_feature.html.haml
@@ -4,7 +4,7 @@
       %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
         %tr
           %td.email-feature-td
-            .email-desktop-flex{ class: ('email-dir-rtl' if defined?(text_first_on_desktop) && !text_first_on_desktop) }
+            .email-desktop-flex{ class: ('email-dir-rtl' if feature_iteration.index.odd?) }
               /[if mso]
                 <table border="0" cellpadding="0" cellspacing="0" align="center" style="width:100%;" role="presentation"><tr><td style="width:50%; vertical-align:top;">
               .email-desktop-column
@@ -24,7 +24,7 @@
                   %tr
                     %td.email-column-td
                       - if defined?(feature)
-                        %p{ class: ('email-desktop-text-right' if defined?(text_first_on_desktop) && text_first_on_desktop) }
+                        %p{ class: ('email-desktop-text-right' if feature_iteration.index.even?) }
                           = image_tag frontend_asset_url("images/mailer-new/welcome/feature_#{feature}.png"), alt: '', width: 240, height: 230
               /[if mso]
                 </td></tr></table>
diff --git a/app/views/user_mailer/welcome.html.haml b/app/views/user_mailer/welcome.html.haml
index 97fb0a2c97d49b..0f9cbf36ffb263 100644
--- a/app/views/user_mailer/welcome.html.haml
+++ b/app/views/user_mailer/welcome.html.haml
@@ -68,7 +68,4 @@
 %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
   %tr
     %td.email-extra-td
-      = render 'application/mailer/feature', feature: 'control', text_first_on_desktop: true
-      = render 'application/mailer/feature', feature: 'audience', text_first_on_desktop: false
-      = render 'application/mailer/feature', feature: 'moderation', text_first_on_desktop: true
-      = render 'application/mailer/feature', feature: 'creativity', text_first_on_desktop: false
+      = render partial: 'application/mailer/feature', collection: %w(control audience moderation creativity)

From 1f11aa5f042542cbac1191df4e7b657ecda99280 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 5 Apr 2024 09:48:07 +0200
Subject: [PATCH 0684/2191] Add stub for trending tags in user mailer spec
 (#29850)

---
 spec/mailers/user_mailer_spec.rb | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/spec/mailers/user_mailer_spec.rb b/spec/mailers/user_mailer_spec.rb
index 404b8347028d78..5a8c293740bdbd 100644
--- a/spec/mailers/user_mailer_spec.rb
+++ b/spec/mailers/user_mailer_spec.rb
@@ -247,6 +247,12 @@
   describe '#welcome' do
     let(:mail) { described_class.welcome(receiver) }
 
+    before do
+      # This is a bit hacky and low-level but this allows stubbing trending tags
+      tag_ids = Fabricate.times(5, :tag).pluck(:id)
+      allow(Trends.tags).to receive(:query).and_return(instance_double(Trends::Query, allowed: Tag.where(id: tag_ids)))
+    end
+
     it 'renders welcome mail' do
       expect(mail)
         .to be_present

From 38b9d31f632a93a57b03061d573a9c0e4b55bdfd Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 5 Apr 2024 09:48:45 +0200
Subject: [PATCH 0685/2191] Improve email address validation (#29838)

---
 Gemfile                                   |  2 ++
 Gemfile.lock                              |  1 +
 app/models/user.rb                        |  2 ++
 app/validators/email_address_validator.rb | 18 ++++++++++++++++++
 spec/models/user_spec.rb                  |  6 ++++++
 5 files changed, 29 insertions(+)
 create mode 100644 app/validators/email_address_validator.rb

diff --git a/Gemfile b/Gemfile
index 389ae5035618c5..a9affea4177384 100644
--- a/Gemfile
+++ b/Gemfile
@@ -206,3 +206,5 @@ gem 'net-http', '~> 0.4.0'
 gem 'rubyzip', '~> 2.3'
 
 gem 'hcaptcha', '~> 7.1'
+
+gem 'mail', '~> 2.8'
diff --git a/Gemfile.lock b/Gemfile.lock
index acc4394940d3b3..ac50270229b85a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -880,6 +880,7 @@ DEPENDENCIES
   letter_opener_web (~> 2.0)
   link_header (~> 0.0)
   lograge (~> 0.12)
+  mail (~> 2.8)
   mario-redis-lock (~> 1.2)
   md-paperclip-azure (~> 2.2)
   memory_profiler
diff --git a/app/models/user.rb b/app/models/user.rb
index 17ec90c9ee9ea1..c62a6d0de1c465 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -95,6 +95,8 @@ class User < ApplicationRecord
   accepts_nested_attributes_for :invite_request, reject_if: ->(attributes) { attributes['text'].blank? && !Setting.require_invite_text }
   validates :invite_request, presence: true, on: :create, if: :invite_text_required?
 
+  validates :email, presence: true, email_address: true
+
   validates_with BlacklistedEmailValidator, if: -> { ENV['EMAIL_DOMAIN_LISTS_APPLY_AFTER_CONFIRMATION'] == 'true' || !confirmed? }
   validates_with EmailMxValidator, if: :validate_email_dns?
   validates :agreement, acceptance: { allow_nil: false, accept: [true, 'true', '1'] }, on: :create
diff --git a/app/validators/email_address_validator.rb b/app/validators/email_address_validator.rb
new file mode 100644
index 00000000000000..ed0bb116524aec
--- /dev/null
+++ b/app/validators/email_address_validator.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+# NOTE: I initially wrote this as `EmailValidator` but it ended up clashing
+# with an indirect dependency of ours, `validate_email`, which, turns out,
+# has the same approach as we do, but with an extra check disallowing
+# single-label domains. Decided to not switch to `validate_email` because
+# we do want to allow at least `localhost`.
+
+class EmailAddressValidator < ActiveModel::EachValidator
+  def validate_each(record, attribute, value)
+    value = value.strip
+
+    address = Mail::Address.new(value)
+    record.errors.add(attribute, :invalid) if address.address != value
+  rescue Mail::Field::FieldError
+    record.errors.add(attribute, :invalid)
+  end
+end
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 39986f476c0161..2a07263069944d 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -38,6 +38,12 @@
       user.save(validate: false)
       expect(user.valid?).to be true
     end
+
+    it 'is valid with a localhost e-mail address' do
+      user = Fabricate.build(:user, email: 'admin@localhost')
+      user.valid?
+      expect(user.valid?).to be true
+    end
   end
 
   describe 'Normalizations' do

From c7378218ba7d3bac764625b461166fd60eef12fd Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 5 Apr 2024 09:57:20 +0200
Subject: [PATCH 0686/2191] Update dependency rubocop-rspec to v2.29.1 (#29858)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index ac50270229b85a..07d2fc4c40ac85 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -356,7 +356,7 @@ GEM
       rdoc
       reline (>= 0.4.2)
     jmespath (1.6.2)
-    json (2.7.1)
+    json (2.7.2)
     json-canonicalization (1.0.0)
     json-jwt (1.15.3.1)
       activesupport (>= 4.2)
@@ -671,7 +671,7 @@ GEM
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rspec (2.28.0)
+    rubocop-rspec (2.29.1)
       rubocop (~> 1.40)
       rubocop-capybara (~> 2.17)
       rubocop-factory_bot (~> 2.22)

From 906a3996343a9f94b79dc8ef91fc0ca3c04f1719 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Fri, 5 Apr 2024 09:57:44 +0200
Subject: [PATCH 0687/2191] Fix wrong extension for a test file (#29853)

---
 .../mastodon/utils/__tests__/{html-test.s => html-test.ts}    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
 rename app/javascript/mastodon/utils/__tests__/{html-test.s => html-test.ts} (67%)

diff --git a/app/javascript/mastodon/utils/__tests__/html-test.s b/app/javascript/mastodon/utils/__tests__/html-test.ts
similarity index 67%
rename from app/javascript/mastodon/utils/__tests__/html-test.s
rename to app/javascript/mastodon/utils/__tests__/html-test.ts
index d948cf4c5d26a0..99bfdcb8010a4c 100644
--- a/app/javascript/mastodon/utils/__tests__/html-test.s
+++ b/app/javascript/mastodon/utils/__tests__/html-test.ts
@@ -3,7 +3,9 @@ import * as html from '../html';
 describe('html', () => {
   describe('unescapeHTML', () => {
     it('returns unescaped HTML', () => {
-      const output = html.unescapeHTML('<p>lorem</p><p>ipsum</p><br>&lt;br&gt;');
+      const output = html.unescapeHTML(
+        '<p>lorem</p><p>ipsum</p><br>&lt;br&gt;',
+      );
       expect(output).toEqual('lorem\n\nipsum\n<br>');
     });
   });

From 6ac90d4c5da2cf82fff4a6b1403db15b68d79883 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Fri, 5 Apr 2024 10:06:31 +0200
Subject: [PATCH 0688/2191] Add tests for our number formatting function
 (#29852)

---
 .../mastodon/utils/__tests__/numbers.ts       | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 app/javascript/mastodon/utils/__tests__/numbers.ts

diff --git a/app/javascript/mastodon/utils/__tests__/numbers.ts b/app/javascript/mastodon/utils/__tests__/numbers.ts
new file mode 100644
index 00000000000000..d1d1444e8add7d
--- /dev/null
+++ b/app/javascript/mastodon/utils/__tests__/numbers.ts
@@ -0,0 +1,24 @@
+import { DECIMAL_UNITS, toShortNumber } from '../numbers';
+
+interface TableRow {
+  input: number;
+  base: number;
+  unit: number;
+  digits: number;
+}
+
+describe.each`
+  input             | base         | unit                      | digits
+  ${10_000_000}     | ${10}        | ${DECIMAL_UNITS.MILLION}  | ${0}
+  ${2_789_123}      | ${2.789123}  | ${DECIMAL_UNITS.MILLION}  | ${1}
+  ${12_345_789}     | ${12.345789} | ${DECIMAL_UNITS.MILLION}  | ${0}
+  ${10_000_000_000} | ${10}        | ${DECIMAL_UNITS.BILLION}  | ${0}
+  ${12}             | ${12}        | ${DECIMAL_UNITS.ONE}      | ${0}
+  ${123}            | ${123}       | ${DECIMAL_UNITS.ONE}      | ${0}
+  ${1234}           | ${1.234}     | ${DECIMAL_UNITS.THOUSAND} | ${1}
+  ${6666}           | ${6.666}     | ${DECIMAL_UNITS.THOUSAND} | ${1}
+`('toShortNumber', ({ input, base, unit, digits }: TableRow) => {
+  test(`correctly formats ${input}`, () => {
+    expect(toShortNumber(input)).toEqual([base, unit, digits]);
+  });
+});

From 59da591d13e666f5426b72fd4079530c886d9657 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 5 Apr 2024 04:54:11 -0400
Subject: [PATCH 0689/2191] Improve spec for dimension/languages admin metric
 (#29842)

---
 .../dimension/languages_dimension_spec.rb     | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/spec/lib/admin/metrics/dimension/languages_dimension_spec.rb b/spec/lib/admin/metrics/dimension/languages_dimension_spec.rb
index 1722c4c616666f..9d8097069390cc 100644
--- a/spec/lib/admin/metrics/dimension/languages_dimension_spec.rb
+++ b/spec/lib/admin/metrics/dimension/languages_dimension_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 
 describe Admin::Metrics::Dimension::LanguagesDimension do
-  subject(:dimension) { described_class.new(start_at, end_at, limit, params) }
+  subject { described_class.new(start_at, end_at, limit, params) }
 
   let(:start_at) { 2.days.ago }
   let(:end_at) { Time.now.utc }
@@ -11,8 +11,21 @@
   let(:params) { ActionController::Parameters.new }
 
   describe '#data' do
-    it 'runs data query without error' do
-      expect { dimension.data }.to_not raise_error
+    let(:alice) { Fabricate(:user, locale: 'en', current_sign_in_at: 1.day.ago) }
+    let(:bob) { Fabricate(:user, locale: 'en', current_sign_in_at: 30.days.ago) }
+
+    before do
+      alice.update(current_sign_in_at: 1.day.ago)
+      bob.update(current_sign_in_at: 30.days.ago)
+    end
+
+    it 'returns locales with sign in counts' do
+      expect(subject.data.size)
+        .to eq(1)
+      expect(subject.data.map(&:symbolize_keys))
+        .to contain_exactly(
+          include(key: 'en', value: '1')
+        )
     end
   end
 end

From 285a87a77f947cc7085fab45376c21a4b33eac37 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 5 Apr 2024 11:04:10 +0200
Subject: [PATCH 0690/2191] Update dependency scenic to v1.8.0 (#29794)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 07d2fc4c40ac85..3508ad8d543334 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -607,7 +607,7 @@ GEM
     redlock (1.3.2)
       redis (>= 3.0.0, < 6.0)
     regexp_parser (2.9.0)
-    reline (0.4.3)
+    reline (0.5.0)
       io-console (~> 0.5)
     request_store (1.5.1)
       rack (>= 1.4)
@@ -692,7 +692,7 @@ GEM
     sanitize (6.1.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
-    scenic (1.7.0)
+    scenic (1.8.0)
       activerecord (>= 4.0.0)
       railties (>= 4.0.0)
     selenium-webdriver (4.19.0)

From c0fe8a9f1363ae0c34f10f4119f5df407ed58fa0 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 5 Apr 2024 05:17:58 -0400
Subject: [PATCH 0691/2191] Extract shared callback behaviour to
 `CustomFilterCache` concern (#29695)

---
 app/models/concerns/custom_filter_cache.rb | 17 +++++++++++++++++
 app/models/custom_filter_keyword.rb        | 14 ++------------
 app/models/custom_filter_status.rb         | 14 ++------------
 3 files changed, 21 insertions(+), 24 deletions(-)
 create mode 100644 app/models/concerns/custom_filter_cache.rb

diff --git a/app/models/concerns/custom_filter_cache.rb b/app/models/concerns/custom_filter_cache.rb
new file mode 100644
index 00000000000000..79b22f11f1e15b
--- /dev/null
+++ b/app/models/concerns/custom_filter_cache.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module CustomFilterCache
+  extend ActiveSupport::Concern
+
+  included do
+    after_commit :invalidate_cache!
+    before_destroy :prepare_cache_invalidation!
+    before_save :prepare_cache_invalidation!
+
+    delegate(
+      :invalidate_cache!,
+      :prepare_cache_invalidation!,
+      to: :custom_filter
+    )
+  end
+end
diff --git a/app/models/custom_filter_keyword.rb b/app/models/custom_filter_keyword.rb
index 979d0b822e6960..112798b10a91d8 100644
--- a/app/models/custom_filter_keyword.rb
+++ b/app/models/custom_filter_keyword.rb
@@ -13,16 +13,14 @@
 #
 
 class CustomFilterKeyword < ApplicationRecord
+  include CustomFilterCache
+
   belongs_to :custom_filter
 
   validates :keyword, presence: true
 
   alias_attribute :phrase, :keyword
 
-  before_save :prepare_cache_invalidation!
-  before_destroy :prepare_cache_invalidation!
-  after_commit :invalidate_cache!
-
   def to_regex
     if whole_word?
       /(?mix:#{to_regex_sb}#{Regexp.escape(keyword)}#{to_regex_eb})/
@@ -40,12 +38,4 @@ def to_regex_sb
   def to_regex_eb
     /[[:word:]]\z/.match?(keyword) ? '\b' : ''
   end
-
-  def prepare_cache_invalidation!
-    custom_filter.prepare_cache_invalidation!
-  end
-
-  def invalidate_cache!
-    custom_filter.invalidate_cache!
-  end
 end
diff --git a/app/models/custom_filter_status.rb b/app/models/custom_filter_status.rb
index 0a5650204ac9f5..58b61cd79d4021 100644
--- a/app/models/custom_filter_status.rb
+++ b/app/models/custom_filter_status.rb
@@ -12,27 +12,17 @@
 #
 
 class CustomFilterStatus < ApplicationRecord
+  include CustomFilterCache
+
   belongs_to :custom_filter
   belongs_to :status
 
   validates :status, uniqueness: { scope: :custom_filter }
   validate :validate_status_access
 
-  before_save :prepare_cache_invalidation!
-  before_destroy :prepare_cache_invalidation!
-  after_commit :invalidate_cache!
-
   private
 
   def validate_status_access
     errors.add(:status_id, :invalid) unless StatusPolicy.new(custom_filter.account, status).show?
   end
-
-  def prepare_cache_invalidation!
-    custom_filter.prepare_cache_invalidation!
-  end
-
-  def invalidate_cache!
-    custom_filter.invalidate_cache!
-  end
 end

From 52ab8a59c6e77b6409a7d4d81b15751732b3af91 Mon Sep 17 00:00:00 2001
From: ache <ache@ache.one>
Date: Fri, 5 Apr 2024 11:19:43 +0200
Subject: [PATCH 0692/2191] Forward 3035 port (#29710)

---
 Vagrantfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Vagrantfile b/Vagrantfile
index 12bd1ba67a4655..8a95e91f360038 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -173,6 +173,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
   # Otherwise, you can access the site at http://localhost:3000 and http://localhost:4000 , http://localhost:8080
   config.vm.network :forwarded_port, guest: 3000, host: 3000
+  config.vm.network :forwarded_port, guest: 3035, host: 3035
   config.vm.network :forwarded_port, guest: 4000, host: 4000
   config.vm.network :forwarded_port, guest: 8080, host: 8080
   config.vm.network :forwarded_port, guest: 9200, host: 9200

From b61ae28f8d4b6f269f50a05c3e65ec7f2c846d32 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 5 Apr 2024 05:52:43 -0400
Subject: [PATCH 0693/2191] Separate methods for theme style and meta color
 tags (#29802)

---
 app/helpers/application_helper.rb       | 12 ----
 app/helpers/theme_helper.rb             | 27 ++++++++
 app/lib/themes.rb                       |  6 +-
 app/views/layouts/application.html.haml |  1 +
 spec/helpers/theme_helper_spec.rb       | 91 +++++++++++++++++++++++++
 5 files changed, 123 insertions(+), 14 deletions(-)
 create mode 100644 app/helpers/theme_helper.rb
 create mode 100644 spec/helpers/theme_helper_spec.rb

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index c3ee0d930a7fd3..668afe7fde13d9 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -160,18 +160,6 @@ def body_classes
     output.compact_blank.join(' ')
   end
 
-  def theme_style_tags(theme)
-    if theme == 'system'
-      concat stylesheet_pack_tag('mastodon-light', media: 'not all and (prefers-color-scheme: dark)', crossorigin: 'anonymous')
-      concat stylesheet_pack_tag('default', media: '(prefers-color-scheme: dark)', crossorigin: 'anonymous')
-      concat tag.meta name: 'theme-color', content: Themes::MASTODON_DARK_THEME_COLOR, media: '(prefers-color-scheme: dark)'
-      concat tag.meta name: 'theme-color', content: Themes::MASTODON_LIGHT_THEME_COLOR, media: '(prefers-color-scheme: light)'
-    else
-      concat stylesheet_pack_tag theme, media: 'all', crossorigin: 'anonymous'
-      concat tag.meta name: 'theme-color', content: theme == 'mastodon-light' ? Themes::MASTODON_LIGHT_THEME_COLOR : Themes::MASTODON_DARK_THEME_COLOR
-    end
-  end
-
   def cdn_host
     Rails.configuration.action_controller.asset_host
   end
diff --git a/app/helpers/theme_helper.rb b/app/helpers/theme_helper.rb
new file mode 100644
index 00000000000000..83527ce61189c6
--- /dev/null
+++ b/app/helpers/theme_helper.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module ThemeHelper
+  def theme_style_tags(theme)
+    if theme == 'system'
+      concat stylesheet_pack_tag('mastodon-light', media: 'not all and (prefers-color-scheme: dark)', crossorigin: 'anonymous')
+      concat stylesheet_pack_tag('default', media: '(prefers-color-scheme: dark)', crossorigin: 'anonymous')
+    else
+      stylesheet_pack_tag theme, media: 'all', crossorigin: 'anonymous'
+    end
+  end
+
+  def theme_color_tags(theme)
+    if theme == 'system'
+      concat tag.meta(name: 'theme-color', content: Themes::THEME_COLORS[:dark], media: '(prefers-color-scheme: dark)')
+      concat tag.meta(name: 'theme-color', content: Themes::THEME_COLORS[:light], media: '(prefers-color-scheme: light)')
+    else
+      tag.meta name: 'theme-color', content: theme_color_for(theme)
+    end
+  end
+
+  private
+
+  def theme_color_for(theme)
+    theme == 'mastodon-light' ? Themes::THEME_COLORS[:light] : Themes::THEME_COLORS[:dark]
+  end
+end
diff --git a/app/lib/themes.rb b/app/lib/themes.rb
index 3ad2304977fa11..b6da980733fa97 100644
--- a/app/lib/themes.rb
+++ b/app/lib/themes.rb
@@ -6,8 +6,10 @@
 class Themes
   include Singleton
 
-  MASTODON_DARK_THEME_COLOR = '#191b22'
-  MASTODON_LIGHT_THEME_COLOR = '#f3f5f7'
+  THEME_COLORS = {
+    dark: '#191b22',
+    light: '#f3f5f7',
+  }.freeze
 
   def initialize
     @conf = YAML.load_file(Rails.root.join('config', 'themes.yml'))
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index c353b1d872eb69..9d7669d685124a 100755
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -21,6 +21,7 @@
 
     %link{ rel: 'mask-icon', href: frontend_asset_path('images/logo-symbol-icon.svg'), color: '#6364FF' }/
     %link{ rel: 'manifest', href: manifest_path(format: :json) }/
+    = theme_color_tags current_theme
     %meta{ name: 'apple-mobile-web-app-capable', content: 'yes' }/
 
     %title= html_title
diff --git a/spec/helpers/theme_helper_spec.rb b/spec/helpers/theme_helper_spec.rb
new file mode 100644
index 00000000000000..c0b6380a1f2b91
--- /dev/null
+++ b/spec/helpers/theme_helper_spec.rb
@@ -0,0 +1,91 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe ThemeHelper do
+  describe 'theme_style_tags' do
+    let(:result) { helper.theme_style_tags(theme) }
+
+    context 'when using system theme' do
+      let(:theme) { 'system' }
+
+      it 'returns the mastodon-light and default stylesheets with correct color schemes' do
+        expect(html_links.first.attributes.symbolize_keys)
+          .to include(
+            href: have_attributes(value: match(/mastodon-light/)),
+            media: have_attributes(value: 'not all and (prefers-color-scheme: dark)')
+          )
+        expect(html_links.last.attributes.symbolize_keys)
+          .to include(
+            href: have_attributes(value: match(/default/)),
+            media: have_attributes(value: '(prefers-color-scheme: dark)')
+          )
+      end
+    end
+
+    context 'when using other theme' do
+      let(:theme) { 'contrast' }
+
+      it 'returns the theme stylesheet without color scheme information' do
+        expect(html_links.first.attributes.symbolize_keys)
+          .to include(
+            href: have_attributes(value: match(/contrast/)),
+            media: have_attributes(value: 'all')
+          )
+      end
+    end
+  end
+
+  describe 'theme_color_tags' do
+    let(:result) { helper.theme_color_tags(theme) }
+
+    context 'when using system theme' do
+      let(:theme) { 'system' }
+
+      it 'returns the mastodon-light and default stylesheets with correct color schemes' do
+        expect(html_theme_colors.first.attributes.symbolize_keys)
+          .to include(
+            content: have_attributes(value: Themes::THEME_COLORS[:dark]),
+            media: have_attributes(value: '(prefers-color-scheme: dark)')
+          )
+        expect(html_theme_colors.last.attributes.symbolize_keys)
+          .to include(
+            content: have_attributes(value: Themes::THEME_COLORS[:light]),
+            media: have_attributes(value: '(prefers-color-scheme: light)')
+          )
+      end
+    end
+
+    context 'when using mastodon-light theme' do
+      let(:theme) { 'mastodon-light' }
+
+      it 'returns the theme stylesheet without color scheme information' do
+        expect(html_theme_colors.first.attributes.symbolize_keys)
+          .to include(
+            content: have_attributes(value: Themes::THEME_COLORS[:light])
+          )
+      end
+    end
+
+    context 'when using other theme' do
+      let(:theme) { 'contrast' }
+
+      it 'returns the theme stylesheet without color scheme information' do
+        expect(html_theme_colors.first.attributes.symbolize_keys)
+          .to include(
+            content: have_attributes(value: Themes::THEME_COLORS[:dark])
+          )
+      end
+    end
+  end
+
+  private
+
+  def html_links
+    Nokogiri::HTML5.fragment(result).css('link')
+  end
+
+  def html_theme_colors
+    Nokogiri::HTML5.fragment(result).css('meta[name=theme-color]')
+  end
+end

From e73cf356d2f7dc38ef30e5465635c4c0813f4ade Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 5 Apr 2024 18:52:05 +0200
Subject: [PATCH 0694/2191] Move OAuth flow tests from feature tests to system
 tests (#29837)

---
 spec/{features => system}/oauth_spec.rb | 28 ++++++++++++-------------
 1 file changed, 14 insertions(+), 14 deletions(-)
 rename spec/{features => system}/oauth_spec.rb (94%)

diff --git a/spec/features/oauth_spec.rb b/spec/system/oauth_spec.rb
similarity index 94%
rename from spec/features/oauth_spec.rb
rename to spec/system/oauth_spec.rb
index 720c262890d5db..060978217f2721 100644
--- a/spec/features/oauth_spec.rb
+++ b/spec/system/oauth_spec.rb
@@ -3,13 +3,14 @@
 require 'rails_helper'
 
 describe 'Using OAuth from an external app' do
-  let(:client_app) { Doorkeeper::Application.create!(name: 'test', redirect_uri: 'http://localhost/', scopes: 'read') }
+  let(:client_app) { Doorkeeper::Application.create!(name: 'test', redirect_uri: 'http://localhost/health', scopes: 'read') }
 
   context 'when the user is already logged in' do
     let!(:user) { Fabricate(:user) }
 
     before do
-      sign_in user, scope: :user
+      visit new_user_session_path
+      fill_in_auth_details(user.email, user.password)
     end
 
     it 'when accepting the authorization request' do
@@ -164,20 +165,19 @@
         expect(Doorkeeper::AccessGrant.exists?(application: client_app, resource_owner_id: user.id)).to be false
       end
     end
+    # TODO: external auth
+  end
 
-    private
-
-    def fill_in_auth_details(email, password)
-      fill_in 'user_email', with: email
-      fill_in 'user_password', with: password
-      click_on I18n.t('auth.login')
-    end
+  private
 
-    def fill_in_otp_details(value)
-      fill_in 'user_otp_attempt', with: value
-      click_on I18n.t('auth.login')
-    end
+  def fill_in_auth_details(email, password)
+    fill_in 'user_email', with: email
+    fill_in 'user_password', with: password
+    click_on I18n.t('auth.login')
+  end
 
-    # TODO: external auth
+  def fill_in_otp_details(value)
+    fill_in 'user_otp_attempt', with: value
+    click_on I18n.t('auth.login')
   end
 end

From 8a64406d3488e0d093abb3fa5d55a110f8266fbb Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 6 Apr 2024 18:18:06 +0200
Subject: [PATCH 0695/2191] New Crowdin Translations (automated) (#2668)

* New Crowdin translations

* Fix bogus translation files

---------

Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/locales/de.json    | 9 ++++++++-
 app/javascript/flavours/glitch/locales/es-AR.json | 4 ++++
 app/javascript/flavours/glitch/locales/zh-CN.json | 4 ++++
 app/javascript/flavours/glitch/locales/zh-TW.json | 4 ++++
 config/locales-glitch/es-AR.yml                   | 2 +-
 config/locales-glitch/simple_form.es-AR.yml       | 4 ++--
 6 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/app/javascript/flavours/glitch/locales/de.json b/app/javascript/flavours/glitch/locales/de.json
index 11b04a919eb7e5..8fcd43aaa95813 100644
--- a/app/javascript/flavours/glitch/locales/de.json
+++ b/app/javascript/flavours/glitch/locales/de.json
@@ -14,6 +14,7 @@
   "column_subheading.lists": "Listen",
   "column_subheading.navigation": "Navigation",
   "community.column_settings.allow_local_only": "Nur-lokale Toots anzeigen",
+  "compose.attach.doodle": "Male etwas",
   "compose.change_federation": "Föderationseinstellungen ändern",
   "compose.content-type.change": "Erweiterte Formatierungsoptionen ändern",
   "compose.content-type.html": "HTML",
@@ -22,6 +23,8 @@
   "compose.content-type.markdown_meta": "Deine Beiträge mit Markdown formatieren",
   "compose.content-type.plain": "Unformatierter Text",
   "compose.content-type.plain_meta": "Ohne erweiterte Formatierung verfassen",
+  "compose.disable_threaded_mode": "Thread-Modus deaktivieren",
+  "compose.enable_threaded_mode": "Thread-Modus aktivieren",
   "compose_form.sensitive.hide": "{count, plural, one {Mit einer Inhaltswarnung versehen} other {Mit einer Inhaltswarnung versehen}}",
   "compose_form.sensitive.marked": "{count, plural, one {Medien-Datei ist mit einer Inhaltswarnung versehen} other {Medien-Dateien sind mit einer Inhaltswarnung versehen}}",
   "compose_form.sensitive.unmarked": "{count, plural, one {Medien-Datei ist nicht mit einer Inhaltswarnung versehen} other {Medien-Dateien sind nicht mit einer Inhaltswarnung versehen}}",
@@ -61,6 +64,9 @@
   "notification_purge.btn_invert": "Auswahl\numkehren",
   "notification_purge.btn_none": "Auswahl\naufheben",
   "notification_purge.start": "Benachrichtigungen-Aufräumen-Modus starten",
+  "notifications.column_settings.filter_bar.advanced": "Zeige alle Kategorien an",
+  "notifications.column_settings.filter_bar.category": "Schnellfilterleiste",
+  "notifications.column_settings.filter_bar.show_bar": "Filterleiste anzeigen",
   "notifications.marked_clear": "Ausgewählte Benachrichtigungen entfernen",
   "notifications.marked_clear_confirmation": "Möchtest du wirklich alle auswählten Benachrichtigungen für immer entfernen?",
   "settings.always_show_spoilers_field": "Das Inhaltswarnungs-Feld immer aktivieren",
@@ -150,5 +156,6 @@
   "status.in_reply_to": "Dieser Toot ist eine Antwort",
   "status.is_poll": "Dieser Toot ist eine Umfrage",
   "status.local_only": "Nur auf deiner Instanz sichtbar",
-  "status.uncollapse": "Ausklappen"
+  "status.uncollapse": "Ausklappen",
+  "suggestions.dismiss": "Vorschlag ablehnen"
 }
diff --git a/app/javascript/flavours/glitch/locales/es-AR.json b/app/javascript/flavours/glitch/locales/es-AR.json
index 3bba7f27cf6ea7..b82c1f384dbed4 100644
--- a/app/javascript/flavours/glitch/locales/es-AR.json
+++ b/app/javascript/flavours/glitch/locales/es-AR.json
@@ -64,6 +64,9 @@
   "notification_purge.btn_invert": "Invertir\nselección",
   "notification_purge.btn_none": "Seleccionar\nnada",
   "notification_purge.start": "Entrar en modo de limpieza de notificaciones",
+  "notifications.column_settings.filter_bar.advanced": "Mostrar todas las categorías",
+  "notifications.column_settings.filter_bar.category": "Barra de filtrado rápido",
+  "notifications.column_settings.filter_bar.show_bar": "Mostrar barra de filtros",
   "notifications.marked_clear": "Limpiar notificaciones seleccionadas",
   "notifications.marked_clear_confirmation": "¿Deseas borrar permanentemente todas las notificaciones seleccionadas?",
   "settings.always_show_spoilers_field": "Siempre mostrar el campo de advertencia de contenido",
@@ -127,6 +130,7 @@
   "settings.shared_settings_link": "preferencias de usuario",
   "settings.show_action_bar": "Mostrar botones de acción en toots colapsados",
   "settings.show_content_type_choice": "Mostrar selección de tipo de contenido al crear toots",
+  "settings.show_published_toast": "Mostrar brindis al enviar o guardar un mensaje",
   "settings.show_reply_counter": "Mostrar un conteo estimado de respuestas",
   "settings.side_arm": "Botón secundario:",
   "settings.side_arm.none": "Ninguno",
diff --git a/app/javascript/flavours/glitch/locales/zh-CN.json b/app/javascript/flavours/glitch/locales/zh-CN.json
index 49ef64a5e1cc37..9a3dd7f191c3ce 100644
--- a/app/javascript/flavours/glitch/locales/zh-CN.json
+++ b/app/javascript/flavours/glitch/locales/zh-CN.json
@@ -64,6 +64,9 @@
   "notification_purge.btn_invert": "反选",
   "notification_purge.btn_none": "取消全选",
   "notification_purge.start": "进入通知清理模式",
+  "notifications.column_settings.filter_bar.advanced": "显示所有类别",
+  "notifications.column_settings.filter_bar.category": "快速筛选栏",
+  "notifications.column_settings.filter_bar.show_bar": "显示筛选栏",
   "notifications.marked_clear": "清除选择的通知",
   "notifications.marked_clear_confirmation": "你确定要永久清除所有选择的通知吗？",
   "settings.always_show_spoilers_field": "始终显示内容警告框",
@@ -127,6 +130,7 @@
   "settings.shared_settings_link": "用户偏好设置",
   "settings.show_action_bar": "在折叠的嘟文中显示操作按钮",
   "settings.show_content_type_choice": "允许在发嘟时选择格式类型",
+  "settings.show_published_toast": "发布/保存嘟文时显示提示",
   "settings.show_reply_counter": "显示回复的大致数量",
   "settings.side_arm": "辅助发嘟按钮：",
   "settings.side_arm.none": "无",
diff --git a/app/javascript/flavours/glitch/locales/zh-TW.json b/app/javascript/flavours/glitch/locales/zh-TW.json
index 715bee8aef1b62..2dfeed8c5ca3df 100644
--- a/app/javascript/flavours/glitch/locales/zh-TW.json
+++ b/app/javascript/flavours/glitch/locales/zh-TW.json
@@ -60,6 +60,9 @@
   "notification_purge.btn_invert": "反向選擇",
   "notification_purge.btn_none": "取消選取",
   "notification_purge.start": "進入通知清理模式",
+  "notifications.column_settings.filter_bar.advanced": "顯示所有分類",
+  "notifications.column_settings.filter_bar.category": "快速過濾欄",
+  "notifications.column_settings.filter_bar.show_bar": "顯示過濾器",
   "notifications.marked_clear": "清除被選取的通知訊息",
   "notifications.marked_clear_confirmation": "您確定要永久清除所有被選取的通知訊息嗎？",
   "settings.always_show_spoilers_field": "永遠啟用內容警告欄位",
@@ -123,6 +126,7 @@
   "settings.shared_settings_link": "使用者偏好設定",
   "settings.show_action_bar": "在折疊的貼文顯示操作按鈕",
   "settings.show_content_type_choice": "在編寫貼文時顯示內容類型選擇",
+  "settings.show_published_toast": "發布或儲存貼文時顯示提示",
   "settings.show_reply_counter": "顯示回覆數量的估計值",
   "settings.side_arm": "次要發出貼文按鈕",
   "settings.side_arm.none": "無",
diff --git a/config/locales-glitch/es-AR.yml b/config/locales-glitch/es-AR.yml
index fb90f56bb2a4d8..520f4f03a151fa 100644
--- a/config/locales-glitch/es-AR.yml
+++ b/config/locales-glitch/es-AR.yml
@@ -11,7 +11,7 @@ es-AR:
       flavour_and_skin:
         title: Sabor y apariencia
       hide_followers_count:
-        desc_html: No mostrar el conteo de seguidorxs en perfiles de usuarix
+        desc_html: No mostrar el conteo de seguidores en perfiles de usuario
         title: Ocultar conteo de seguidorxs
       other:
         preamble: Varias configuraciones de glitch-soc que no encajan en otras categorías.
diff --git a/config/locales-glitch/simple_form.es-AR.yml b/config/locales-glitch/simple_form.es-AR.yml
index 491ec7ce8cb619..b8e12c3cf92641 100644
--- a/config/locales-glitch/simple_form.es-AR.yml
+++ b/config/locales-glitch/simple_form.es-AR.yml
@@ -16,8 +16,8 @@ es-AR:
         setting_default_content_type_html: HTML
         setting_default_content_type_markdown: Markdown
         setting_default_content_type_plain: Sin formato
-        setting_favourite_modal: Mostrar diálogo de confirmación antes de marcar como favorito (sólo aplica a la edición Glich)
-        setting_show_followers_count: Mostrá el conteo de tus seguidores
+        setting_favourite_modal: Mostrar diálogo de confirmación antes de marcar como favorito (solo aplica a la edición Glitch)
+        setting_show_followers_count: Mostrar el conteo de tus seguidores
         setting_skin: Diseño
         setting_system_emoji_font: Usar la fuente predeterminada del sistema para emojis (sólo aplica a la edición Glitch)
       notification_emails:

From 9451997fa8909acd891188a1ceb8b01b75e78d47 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Sat, 6 Apr 2024 19:34:30 +0200
Subject: [PATCH 0696/2191] Refactor notifications code to reduce differences
 with upstream (#2692)

* Merge back `Follow` notification component

* Merge back part of `FollowRequestContainer` notification container

* Reduce differences with upstream in the `mention` case

* Reduce differences with upstream in the `favourite` case

* Reduce differences with upstream in the `reblog` case

* Reduce differences with upstream in the `status` case

* Reduce differences with upstream in the `update` case

* Reduce differences with upstream in the `poll` case

* Merge back `AdminSignup` notification component

* Merge back `AdminReport` notification container
---
 .../notifications/components/admin_report.jsx | 114 ----
 .../notifications/components/admin_signup.jsx | 107 ----
 .../notifications/components/follow.jsx       | 107 ----
 .../components/follow_request.jsx             | 106 +---
 .../notifications/components/notification.jsx | 572 ++++++++++++------
 .../containers/admin_report_container.js      |  15 -
 .../containers/notification_container.js      |  56 +-
 7 files changed, 434 insertions(+), 643 deletions(-)
 delete mode 100644 app/javascript/flavours/glitch/features/notifications/components/admin_report.jsx
 delete mode 100644 app/javascript/flavours/glitch/features/notifications/components/admin_signup.jsx
 delete mode 100644 app/javascript/flavours/glitch/features/notifications/components/follow.jsx
 delete mode 100644 app/javascript/flavours/glitch/features/notifications/containers/admin_report_container.js

diff --git a/app/javascript/flavours/glitch/features/notifications/components/admin_report.jsx b/app/javascript/flavours/glitch/features/notifications/components/admin_report.jsx
deleted file mode 100644
index 5ca8b59a5e2aad..00000000000000
--- a/app/javascript/flavours/glitch/features/notifications/components/admin_report.jsx
+++ /dev/null
@@ -1,114 +0,0 @@
-import PropTypes from 'prop-types';
-
-import { FormattedMessage } from 'react-intl';
-
-import classNames from 'classnames';
-import { withRouter } from 'react-router-dom';
-
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import ImmutablePureComponent from 'react-immutable-pure-component';
-
-import { HotKeys } from 'react-hotkeys';
-
-import FlagIcon from '@/material-icons/400-24px/flag-fill.svg?react';
-import { Icon } from 'flavours/glitch/components/icon';
-import { Permalink } from 'flavours/glitch/components/permalink';
-import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router';
-
-import NotificationOverlayContainer from '../containers/overlay_container';
-
-import Report from './report';
-
-class AdminReport extends ImmutablePureComponent {
-
-  static propTypes = {
-    hidden: PropTypes.bool,
-    id: PropTypes.string.isRequired,
-    account: ImmutablePropTypes.map.isRequired,
-    notification: ImmutablePropTypes.map.isRequired,
-    unread: PropTypes.bool,
-    report: ImmutablePropTypes.map.isRequired,
-    ...WithRouterPropTypes,
-  };
-
-  handleMoveUp = () => {
-    const { notification, onMoveUp } = this.props;
-    onMoveUp(notification.get('id'));
-  };
-
-  handleMoveDown = () => {
-    const { notification, onMoveDown } = this.props;
-    onMoveDown(notification.get('id'));
-  };
-
-  handleOpen = () => {
-    this.handleOpenProfile();
-  };
-
-  handleOpenProfile = () => {
-    const { history, notification } = this.props;
-    history.push(`/@${notification.getIn(['account', 'acct'])}`);
-  };
-
-  handleMention = e => {
-    e.preventDefault();
-
-    const { history, notification, onMention } = this.props;
-    onMention(notification.get('account'), history);
-  };
-
-  getHandlers () {
-    return {
-      moveUp: this.handleMoveUp,
-      moveDown: this.handleMoveDown,
-      open: this.handleOpen,
-      openProfile: this.handleOpenProfile,
-      mention: this.handleMention,
-      reply: this.handleMention,
-    };
-  }
-
-  render () {
-    const { account, notification, unread, report } = this.props;
-
-    if (!report) {
-      return null;
-    }
-
-    //  Links to the display name.
-    const displayName = account.get('display_name_html') || account.get('username');
-    const link = (
-      <bdi><Permalink
-        className='notification__display-name'
-        href={account.get('url')}
-        title={account.get('acct')}
-        to={`/@${account.get('acct')}`}
-        dangerouslySetInnerHTML={{ __html: displayName }}
-      /></bdi>
-    );
-
-    const targetAccount = report.get('target_account');
-    const targetDisplayNameHtml = { __html: targetAccount.get('display_name_html') };
-    const targetLink = <bdi><Permalink className='notification__display-name' href={targetAccount.get('url')} title={targetAccount.get('acct')} to={`/@${targetAccount.get('acct')}`} dangerouslySetInnerHTML={targetDisplayNameHtml} /></bdi>;
-
-    return (
-      <HotKeys handlers={this.getHandlers()}>
-        <div className={classNames('notification notification-admin-report focusable', { unread })} tabIndex={0}>
-          <div className='notification__message'>
-            <Icon id='flag' icon={FlagIcon} />
-
-            <span title={notification.get('created_at')}>
-              <FormattedMessage id='notification.admin.report' defaultMessage='{name} reported {target}' values={{ name: link, target: targetLink }} />
-            </span>
-          </div>
-
-          <Report account={account} report={notification.get('report')} hidden={this.props.hidden} />
-          <NotificationOverlayContainer notification={notification} />
-        </div>
-      </HotKeys>
-    );
-  }
-
-}
-
-export default withRouter(AdminReport);
diff --git a/app/javascript/flavours/glitch/features/notifications/components/admin_signup.jsx b/app/javascript/flavours/glitch/features/notifications/components/admin_signup.jsx
deleted file mode 100644
index 4c815099b12f60..00000000000000
--- a/app/javascript/flavours/glitch/features/notifications/components/admin_signup.jsx
+++ /dev/null
@@ -1,107 +0,0 @@
-import PropTypes from 'prop-types';
-
-import { FormattedMessage } from 'react-intl';
-
-import classNames from 'classnames';
-import { withRouter } from 'react-router-dom';
-
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import ImmutablePureComponent from 'react-immutable-pure-component';
-
-import { HotKeys } from 'react-hotkeys';
-
-import PersonAddIcon from '@/material-icons/400-24px/person_add-fill.svg?react';
-import { Icon } from 'flavours/glitch/components/icon';
-import { Permalink } from 'flavours/glitch/components/permalink';
-import AccountContainer from 'flavours/glitch/containers/account_container';
-import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router';
-
-import NotificationOverlayContainer from '../containers/overlay_container';
-
-class NotificationAdminSignup extends ImmutablePureComponent {
-
-  static propTypes = {
-    hidden: PropTypes.bool,
-    id: PropTypes.string.isRequired,
-    account: ImmutablePropTypes.map.isRequired,
-    notification: ImmutablePropTypes.map.isRequired,
-    unread: PropTypes.bool,
-    ...WithRouterPropTypes,
-  };
-
-  handleMoveUp = () => {
-    const { notification, onMoveUp } = this.props;
-    onMoveUp(notification.get('id'));
-  };
-
-  handleMoveDown = () => {
-    const { notification, onMoveDown } = this.props;
-    onMoveDown(notification.get('id'));
-  };
-
-  handleOpen = () => {
-    this.handleOpenProfile();
-  };
-
-  handleOpenProfile = () => {
-    const { history, notification } = this.props;
-    history.push(`/@${notification.getIn(['account', 'acct'])}`);
-  };
-
-  handleMention = e => {
-    e.preventDefault();
-
-    const { history, notification, onMention } = this.props;
-    onMention(notification.get('account'), history);
-  };
-
-  getHandlers () {
-    return {
-      moveUp: this.handleMoveUp,
-      moveDown: this.handleMoveDown,
-      open: this.handleOpen,
-      openProfile: this.handleOpenProfile,
-      mention: this.handleMention,
-      reply: this.handleMention,
-    };
-  }
-
-  render () {
-    const { account, notification, hidden, unread } = this.props;
-
-    //  Links to the display name.
-    const displayName = account.get('display_name_html') || account.get('username');
-    const link = (
-      <bdi><Permalink
-        className='notification__display-name'
-        href={account.get('url')}
-        title={account.get('acct')}
-        to={`/@${account.get('acct')}`}
-        dangerouslySetInnerHTML={{ __html: displayName }}
-      /></bdi>
-    );
-
-    //  Renders.
-    return (
-      <HotKeys handlers={this.getHandlers()}>
-        <div className={classNames('notification notification-admin-sign-up focusable', { unread })} tabIndex={0}>
-          <div className='notification__message'>
-            <Icon id='user-plus' icon={PersonAddIcon} />
-
-            <FormattedMessage
-              id='notification.admin.sign_up'
-              defaultMessage='{name} signed up'
-              values={{ name: link }}
-            />
-          </div>
-
-          <AccountContainer hidden={hidden} id={account.get('id')} withNote={false} />
-          <NotificationOverlayContainer notification={notification} />
-        </div>
-      </HotKeys>
-    );
-  }
-
-}
-
-export default withRouter(NotificationAdminSignup);
diff --git a/app/javascript/flavours/glitch/features/notifications/components/follow.jsx b/app/javascript/flavours/glitch/features/notifications/components/follow.jsx
deleted file mode 100644
index d26039fd5faf06..00000000000000
--- a/app/javascript/flavours/glitch/features/notifications/components/follow.jsx
+++ /dev/null
@@ -1,107 +0,0 @@
-import PropTypes from 'prop-types';
-
-import { FormattedMessage } from 'react-intl';
-
-import classNames from 'classnames';
-import { withRouter } from 'react-router-dom';
-
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import ImmutablePureComponent from 'react-immutable-pure-component';
-
-import { HotKeys } from 'react-hotkeys';
-
-import PersonAddIcon from '@/material-icons/400-24px/person_add-fill.svg?react';
-import { Icon } from 'flavours/glitch/components/icon';
-import { Permalink } from 'flavours/glitch/components/permalink';
-import AccountContainer from 'flavours/glitch/containers/account_container';
-import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router';
-
-import NotificationOverlayContainer from '../containers/overlay_container';
-
-class NotificationFollow extends ImmutablePureComponent {
-
-  static propTypes = {
-    hidden: PropTypes.bool,
-    id: PropTypes.string.isRequired,
-    account: ImmutablePropTypes.map.isRequired,
-    notification: ImmutablePropTypes.map.isRequired,
-    unread: PropTypes.bool,
-    ...WithRouterPropTypes,
-  };
-
-  handleMoveUp = () => {
-    const { notification, onMoveUp } = this.props;
-    onMoveUp(notification.get('id'));
-  };
-
-  handleMoveDown = () => {
-    const { notification, onMoveDown } = this.props;
-    onMoveDown(notification.get('id'));
-  };
-
-  handleOpen = () => {
-    this.handleOpenProfile();
-  };
-
-  handleOpenProfile = () => {
-    const { history, notification } = this.props;
-    history.push(`/@${notification.getIn(['account', 'acct'])}`);
-  };
-
-  handleMention = e => {
-    e.preventDefault();
-
-    const { history, notification, onMention } = this.props;
-    onMention(notification.get('account'), history);
-  };
-
-  getHandlers () {
-    return {
-      moveUp: this.handleMoveUp,
-      moveDown: this.handleMoveDown,
-      open: this.handleOpen,
-      openProfile: this.handleOpenProfile,
-      mention: this.handleMention,
-      reply: this.handleMention,
-    };
-  }
-
-  render () {
-    const { account, notification, hidden, unread } = this.props;
-
-    //  Links to the display name.
-    const displayName = account.get('display_name_html') || account.get('username');
-    const link = (
-      <bdi><Permalink
-        className='notification__display-name'
-        href={account.get('url')}
-        title={account.get('acct')}
-        to={`/@${account.get('acct')}`}
-        dangerouslySetInnerHTML={{ __html: displayName }}
-      /></bdi>
-    );
-
-    //  Renders.
-    return (
-      <HotKeys handlers={this.getHandlers()}>
-        <div className={classNames('notification notification-follow focusable', { unread })} tabIndex={0}>
-          <div className='notification__message'>
-            <Icon id='user-plus' icon={PersonAddIcon} />
-
-            <FormattedMessage
-              id='notification.follow'
-              defaultMessage='{name} followed you'
-              values={{ name: link }}
-            />
-          </div>
-
-          <AccountContainer hidden={hidden} id={account.get('id')} withNote={false} />
-          <NotificationOverlayContainer notification={notification} />
-        </div>
-      </HotKeys>
-    );
-  }
-
-}
-
-export default withRouter(NotificationFollow);
diff --git a/app/javascript/flavours/glitch/features/notifications/components/follow_request.jsx b/app/javascript/flavours/glitch/features/notifications/components/follow_request.jsx
index 11aa343609a735..bd45e1f826c0fa 100644
--- a/app/javascript/flavours/glitch/features/notifications/components/follow_request.jsx
+++ b/app/javascript/flavours/glitch/features/notifications/components/follow_request.jsx
@@ -1,26 +1,16 @@
 import PropTypes from 'prop-types';
 
-import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
-
-import classNames from 'classnames';
-import { withRouter } from 'react-router-dom';
+import { defineMessages, injectIntl } from 'react-intl';
 
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-import { HotKeys } from 'react-hotkeys';
-
 import CheckIcon from '@/material-icons/400-24px/check.svg?react';
 import CloseIcon from '@/material-icons/400-24px/close.svg?react';
-import PersonIcon from '@/material-icons/400-24px/person-fill.svg?react';
 import { Avatar } from 'flavours/glitch/components/avatar';
 import { DisplayName } from 'flavours/glitch/components/display_name';
-import { Icon } from 'flavours/glitch/components/icon';
 import { IconButton } from 'flavours/glitch/components/icon_button';
 import { Permalink } from 'flavours/glitch/components/permalink';
-import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router';
-
-import NotificationOverlayContainer from '../containers/overlay_container';
 
 const messages = defineMessages({
   authorize: { id: 'follow_request.authorize', defaultMessage: 'Authorize' },
@@ -34,50 +24,10 @@ class FollowRequest extends ImmutablePureComponent {
     onAuthorize: PropTypes.func.isRequired,
     onReject: PropTypes.func.isRequired,
     intl: PropTypes.object.isRequired,
-    notification: ImmutablePropTypes.map.isRequired,
-    unread: PropTypes.bool,
-    ...WithRouterPropTypes,
-  };
-
-  handleMoveUp = () => {
-    const { notification, onMoveUp } = this.props;
-    onMoveUp(notification.get('id'));
-  };
-
-  handleMoveDown = () => {
-    const { notification, onMoveDown } = this.props;
-    onMoveDown(notification.get('id'));
-  };
-
-  handleOpen = () => {
-    this.handleOpenProfile();
   };
 
-  handleOpenProfile = () => {
-    const { history, notification } = this.props;
-    history.push(`/@${notification.getIn(['account', 'acct'])}`);
-  };
-
-  handleMention = e => {
-    e.preventDefault();
-
-    const { history, notification, onMention } = this.props;
-    onMention(notification.get('account'), history);
-  };
-
-  getHandlers () {
-    return {
-      moveUp: this.handleMoveUp,
-      moveDown: this.handleMoveDown,
-      open: this.handleOpen,
-      openProfile: this.handleOpenProfile,
-      mention: this.handleMention,
-      reply: this.handleMention,
-    };
-  }
-
   render () {
-    const { intl, hidden, account, onAuthorize, onReject, notification, unread } = this.props;
+    const { intl, hidden, account, onAuthorize, onReject } = this.props;
 
     if (!account) {
       return <div />;
@@ -92,51 +42,23 @@ class FollowRequest extends ImmutablePureComponent {
       );
     }
 
-    //  Links to the display name.
-    const displayName = account.get('display_name_html') || account.get('username');
-    const link = (
-      <bdi><Permalink
-        className='notification__display-name'
-        href={account.get('url')}
-        title={account.get('acct')}
-        to={`/@${account.get('acct')}`}
-        dangerouslySetInnerHTML={{ __html: displayName }}
-      /></bdi>
-    );
-
     return (
-      <HotKeys handlers={this.getHandlers()}>
-        <div className={classNames('notification notification-follow-request focusable', { unread })} tabIndex={0}>
-          <div className='notification__message'>
-            <Icon id='user' icon={PersonIcon} />
-
-            <FormattedMessage
-              id='notification.follow_request'
-              defaultMessage='{name} has requested to follow you'
-              values={{ name: link }}
-            />
+      <div className='account'>
+        <div className='account__wrapper'>
+          <Permalink key={account.get('id')} className='account__display-name' title={account.get('acct')} href={account.get('url')} to={`/@${account.get('acct')}`}>
+            <div className='account__avatar-wrapper'><Avatar account={account} size={36} /></div>
+            <DisplayName account={account} />
+          </Permalink>
+
+          <div className='account__relationship'>
+            <IconButton title={intl.formatMessage(messages.authorize)} icon='check' iconComponent={CheckIcon} onClick={onAuthorize} />
+            <IconButton title={intl.formatMessage(messages.reject)} icon='times' iconComponent={CloseIcon} onClick={onReject} />
           </div>
-
-          <div className='account'>
-            <div className='account__wrapper'>
-              <Permalink key={account.get('id')} className='account__display-name' title={account.get('acct')} href={account.get('url')} to={`/@${account.get('acct')}`}>
-                <div className='account__avatar-wrapper'><Avatar account={account} size={36} /></div>
-                <DisplayName account={account} />
-              </Permalink>
-
-              <div className='account__relationship'>
-                <IconButton title={intl.formatMessage(messages.authorize)} icon='check' iconComponent={CheckIcon} onClick={onAuthorize} />
-                <IconButton title={intl.formatMessage(messages.reject)} icon='times' iconComponent={CloseIcon} onClick={onReject} />
-              </div>
-            </div>
-          </div>
-
-          <NotificationOverlayContainer notification={notification} />
         </div>
-      </HotKeys>
+      </div>
     );
   }
 
 }
 
-export default withRouter(injectIntl(FollowRequest));
+export default injectIntl(FollowRequest);
diff --git a/app/javascript/flavours/glitch/features/notifications/components/notification.jsx b/app/javascript/flavours/glitch/features/notifications/components/notification.jsx
index 1d476969cb3d72..4aac5e8d6d2365 100644
--- a/app/javascript/flavours/glitch/features/notifications/components/notification.jsx
+++ b/app/javascript/flavours/glitch/features/notifications/components/notification.jsx
@@ -1,236 +1,410 @@
-//  Package imports.
 import PropTypes from 'prop-types';
 
+import { injectIntl, FormattedMessage, defineMessages } from 'react-intl';
+
+import classNames from 'classnames';
+import { withRouter } from 'react-router-dom';
+
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-//  Our imports,
+import { HotKeys } from 'react-hotkeys';
+
+import FlagIcon from '@/material-icons/400-24px/flag-fill.svg?react';
+import PersonIcon from '@/material-icons/400-24px/person-fill.svg?react';
+import PersonAddIcon from '@/material-icons/400-24px/person_add-fill.svg?react';
+import { Icon }  from 'flavours/glitch/components/icon';
+import { Permalink } from 'flavours/glitch/components/permalink';
+import AccountContainer from 'flavours/glitch/containers/account_container';
 import StatusContainer from 'flavours/glitch/containers/status_container';
+import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router';
+
+import FollowRequestContainer from '../containers/follow_request_container';
+import NotificationOverlayContainer from '../containers/overlay_container';
+
+import Report from './report';
+
+const messages = defineMessages({
+  follow: { id: 'notification.follow', defaultMessage: '{name} followed you' },
+  adminSignUp: { id: 'notification.admin.sign_up', defaultMessage: '{name} signed up' },
+  adminReport: { id: 'notification.admin.report', defaultMessage: '{name} reported {target}' },
+});
 
-import NotificationAdminReportContainer from '../containers/admin_report_container';
-import NotificationFollowRequestContainer from '../containers/follow_request_container';
+const notificationForScreenReader = (intl, message, timestamp) => {
+  const output = [message];
 
-import NotificationAdminSignup from './admin_signup';
-import NotificationFollow from './follow';
+  output.push(intl.formatDate(timestamp, { hour: '2-digit', minute: '2-digit', month: 'short', day: 'numeric' }));
 
-export default class Notification extends ImmutablePureComponent {
+  return output.join(', ');
+};
 
+class Notification extends ImmutablePureComponent {
   static propTypes = {
     notification: ImmutablePropTypes.map.isRequired,
     hidden: PropTypes.bool,
     onMoveUp: PropTypes.func.isRequired,
     onMoveDown: PropTypes.func.isRequired,
     onMention: PropTypes.func.isRequired,
+    onFavourite: PropTypes.func.isRequired,
+    onReblog: PropTypes.func.isRequired,
+    onToggleHidden: PropTypes.func.isRequired,
+    status: ImmutablePropTypes.map,
+    intl: PropTypes.object.isRequired,
     getScrollPosition: PropTypes.func,
     updateScrollBottom: PropTypes.func,
     cacheMediaWidth: PropTypes.func,
     cachedMediaWidth: PropTypes.number,
     onUnmount: PropTypes.func,
     unread: PropTypes.bool,
+    ...WithRouterPropTypes,
+  };
+
+  handleMoveUp = () => {
+    const { notification, onMoveUp } = this.props;
+    onMoveUp(notification.get('id'));
+  };
+
+  handleMoveDown = () => {
+    const { notification, onMoveDown } = this.props;
+    onMoveDown(notification.get('id'));
+  };
+
+  handleOpen = () => {
+    const { notification } = this.props;
+
+    if (notification.get('status')) {
+      this.props.history.push(`/@${notification.getIn(['status', 'account', 'acct'])}/${notification.get('status')}`);
+    } else {
+      this.handleOpenProfile();
+    }
+  };
+
+  handleOpenProfile = () => {
+    const { notification } = this.props;
+    this.props.history.push(`/@${notification.getIn(['account', 'acct'])}`);
+  };
+
+  handleMention = e => {
+    e.preventDefault();
+
+    const { notification, onMention } = this.props;
+    onMention(notification.get('account'), this.props.history);
+  };
+
+  handleHotkeyFavourite = () => {
+    const { status } = this.props;
+    if (status) this.props.onFavourite(status);
   };
 
+  handleHotkeyBoost = e => {
+    const { status } = this.props;
+    if (status) this.props.onReblog(status, e);
+  };
+
+  getHandlers () {
+    return {
+      reply: this.handleMention,
+      favourite: this.handleHotkeyFavourite,
+      boost: this.handleHotkeyBoost,
+      mention: this.handleMention,
+      open: this.handleOpen,
+      openProfile: this.handleOpenProfile,
+      moveUp: this.handleMoveUp,
+      moveDown: this.handleMoveDown,
+    };
+  }
+
+  renderFollow (notification, account, link) {
+    const { intl, unread } = this.props;
+
+    return (
+      <HotKeys handlers={this.getHandlers()}>
+        <div className={classNames('notification notification-follow focusable', { unread })} tabIndex={0} aria-label={notificationForScreenReader(intl, intl.formatMessage(messages.follow, { name: account.get('acct') }), notification.get('created_at'))}>
+          <div className='notification__message'>
+            <Icon id='user-plus' icon={PersonAddIcon} />
+
+            <span title={notification.get('created_at')}>
+              <FormattedMessage id='notification.follow' defaultMessage='{name} followed you' values={{ name: link }} />
+            </span>
+          </div>
+
+          <AccountContainer id={account.get('id')} hidden={this.props.hidden} />
+          <NotificationOverlayContainer notification={notification} />
+        </div>
+      </HotKeys>
+    );
+  }
+
+  renderFollowRequest (notification, account, link) {
+    const { intl, unread } = this.props;
+
+    return (
+      <HotKeys handlers={this.getHandlers()}>
+        <div className={classNames('notification notification-follow-request focusable', { unread })} tabIndex={0} aria-label={notificationForScreenReader(intl, intl.formatMessage({ id: 'notification.follow_request', defaultMessage: '{name} has requested to follow you' }, { name: account.get('acct') }), notification.get('created_at'))}>
+          <div className='notification__message'>
+            <Icon id='user' icon={PersonIcon} />
+
+            <span title={notification.get('created_at')}>
+              <FormattedMessage id='notification.follow_request' defaultMessage='{name} has requested to follow you' values={{ name: link }} />
+            </span>
+          </div>
+
+          <FollowRequestContainer id={account.get('id')} withNote={false} hidden={this.props.hidden} />
+          <NotificationOverlayContainer notification={notification} />
+        </div>
+      </HotKeys>
+    );
+  }
+
+  renderMention (notification) {
+    return (
+      <StatusContainer
+        id={notification.get('status')}
+        containerId={notification.get('id')}
+        withDismiss
+        hidden={this.props.hidden}
+        onMoveDown={this.handleMoveDown}
+        onMoveUp={this.handleMoveUp}
+        onMention={this.props.onMention}
+        contextType='notifications'
+        getScrollPosition={this.props.getScrollPosition}
+        updateScrollBottom={this.props.updateScrollBottom}
+        notification={notification}
+        cachedMediaWidth={this.props.cachedMediaWidth}
+        cacheMediaWidth={this.props.cacheMediaWidth}
+        unread={this.props.unread}
+        onUnmount={this.props.onUnmount}
+      />
+    );
+  }
+
+  renderFavourite (notification) {
+    return (
+      <StatusContainer
+        containerId={notification.get('id')}
+        hidden={!!this.props.hidden}
+        id={notification.get('status')}
+        account={notification.get('account')}
+        prepend='favourite'
+        muted
+        withDismiss
+        notification={notification}
+        onMoveDown={this.handleMoveDown}
+        onMoveUp={this.handleMoveUp}
+        onMention={this.props.onMention}
+        contextType='notifications'
+        getScrollPosition={this.props.getScrollPosition}
+        updateScrollBottom={this.props.updateScrollBottom}
+        cachedMediaWidth={this.props.cachedMediaWidth}
+        cacheMediaWidth={this.props.cacheMediaWidth}
+        onUnmount={this.props.onUnmount}
+        unread={this.props.unread}
+      />
+    );
+  }
+
+  renderReblog (notification) {
+    return (
+      <StatusContainer
+        containerId={notification.get('id')}
+        hidden={!!this.props.hidden}
+        id={notification.get('status')}
+        account={notification.get('account')}
+        prepend='reblog'
+        muted
+        notification={notification}
+        onMoveDown={this.handleMoveDown}
+        onMoveUp={this.handleMoveUp}
+        onMention={this.props.onMention}
+        contextType='notifications'
+        getScrollPosition={this.props.getScrollPosition}
+        updateScrollBottom={this.props.updateScrollBottom}
+        cachedMediaWidth={this.props.cachedMediaWidth}
+        cacheMediaWidth={this.props.cacheMediaWidth}
+        onUnmount={this.props.onUnmount}
+        withDismiss
+        unread={this.props.unread}
+      />
+    );
+  }
+
+  renderStatus (notification) {
+    return (
+      <StatusContainer
+        containerId={notification.get('id')}
+        hidden={!!this.props.hidden}
+        id={notification.get('status')}
+        account={notification.get('account')}
+        prepend='status'
+        muted
+        notification={notification}
+        onMoveDown={this.handleMoveDown}
+        onMoveUp={this.handleMoveUp}
+        onMention={this.props.onMention}
+        contextType='notifications'
+        getScrollPosition={this.props.getScrollPosition}
+        updateScrollBottom={this.props.updateScrollBottom}
+        cachedMediaWidth={this.props.cachedMediaWidth}
+        cacheMediaWidth={this.props.cacheMediaWidth}
+        onUnmount={this.props.onUnmount}
+        withDismiss
+        unread={this.props.unread}
+      />
+    );
+  }
+
+  renderUpdate (notification) {
+    return (
+      <StatusContainer
+        containerId={notification.get('id')}
+        hidden={!!this.props.hidden}
+        id={notification.get('status')}
+        account={notification.get('account')}
+        prepend='update'
+        muted
+        notification={notification}
+        onMoveDown={this.handleMoveDown}
+        onMoveUp={this.handleMoveUp}
+        onMention={this.props.onMention}
+        contextType='notifications'
+        getScrollPosition={this.props.getScrollPosition}
+        updateScrollBottom={this.props.updateScrollBottom}
+        cachedMediaWidth={this.props.cachedMediaWidth}
+        cacheMediaWidth={this.props.cacheMediaWidth}
+        onUnmount={this.props.onUnmount}
+        withDismiss
+        unread={this.props.unread}
+      />
+    );
+  }
+
+  renderPoll (notification) {
+    return (
+      <StatusContainer
+        containerId={notification.get('id')}
+        hidden={!!this.props.hidden}
+        id={notification.get('status')}
+        account={notification.get('account')}
+        prepend='poll'
+        muted
+        notification={notification}
+        onMoveDown={this.handleMoveDown}
+        onMoveUp={this.handleMoveUp}
+        onMention={this.props.onMention}
+        contextType='notifications'
+        getScrollPosition={this.props.getScrollPosition}
+        updateScrollBottom={this.props.updateScrollBottom}
+        cachedMediaWidth={this.props.cachedMediaWidth}
+        cacheMediaWidth={this.props.cacheMediaWidth}
+        onUnmount={this.props.onUnmount}
+        withDismiss
+        unread={this.props.unread}
+      />
+    );
+  }
+
+  renderAdminSignUp (notification, account, link) {
+    const { intl, unread } = this.props;
+
+    return (
+      <HotKeys handlers={this.getHandlers()}>
+        <div className={classNames('notification notification-admin-sign-up focusable', { unread })} tabIndex={0} aria-label={notificationForScreenReader(intl, intl.formatMessage(messages.adminSignUp, { name: account.get('acct') }), notification.get('created_at'))}>
+          <div className='notification__message'>
+            <Icon id='user-plus' icon={PersonAddIcon} />
+
+            <span title={notification.get('created_at')}>
+              <FormattedMessage id='notification.admin.sign_up' defaultMessage='{name} signed up' values={{ name: link }} />
+            </span>
+          </div>
+
+          <AccountContainer id={account.get('id')} hidden={this.props.hidden} />
+          <NotificationOverlayContainer notification={notification} />
+        </div>
+      </HotKeys>
+    );
+  }
+
+  renderAdminReport (notification, account, link) {
+    const { intl, unread, report } = this.props;
+
+    if (!report) {
+      return null;
+    }
+
+    const targetAccount = report.get('target_account');
+    const targetDisplayNameHtml = { __html: targetAccount.get('display_name_html') };
+    const targetLink = (
+      <bdi>
+        <Permalink
+          className='notification__display-name'
+          href={account.get('url')}
+          title={targetAccount.get('acct')}
+          to={`/@${targetAccount.get('acct')}`}
+          dangerouslySetInnerHTML={targetDisplayNameHtml}
+        />
+      </bdi>
+    );
+
+    return (
+      <HotKeys handlers={this.getHandlers()}>
+        <div className={classNames('notification notification-admin-report focusable', { unread })} tabIndex={0} aria-label={notificationForScreenReader(intl, intl.formatMessage(messages.adminReport, { name: account.get('acct'), target: notification.getIn(['report', 'target_account', 'acct']) }), notification.get('created_at'))}>
+          <div className='notification__message'>
+            <Icon id='flag' icon={FlagIcon} />
+
+            <span title={notification.get('created_at')}>
+              <FormattedMessage id='notification.admin.report' defaultMessage='{name} reported {target}' values={{ name: link, target: targetLink }} />
+            </span>
+          </div>
+
+          <Report account={account} report={notification.get('report')} hidden={this.props.hidden} />
+          <NotificationOverlayContainer notification={notification} />
+        </div>
+      </HotKeys>
+    );
+  }
+
   render () {
-    const {
-      hidden,
-      notification,
-      onMoveDown,
-      onMoveUp,
-      onMention,
-      getScrollPosition,
-      updateScrollBottom,
-    } = this.props;
+    const { notification } = this.props;
+    const account          = notification.get('account');
+    const displayNameHtml  = { __html: account.get('display_name_html') };
+    const link             = (
+      <bdi>
+        <Permalink
+          className='notification__display-name'
+          href={`/@${account.get('acct')}`}
+          title={account.get('acct')}
+          to={`/@${account.get('acct')}`}
+          dangerouslySetInnerHTML={displayNameHtml}
+        />
+      </bdi>
+    );
 
     switch(notification.get('type')) {
     case 'follow':
-      return (
-        <NotificationFollow
-          hidden={hidden}
-          id={notification.get('id')}
-          account={notification.get('account')}
-          notification={notification}
-          onMoveDown={onMoveDown}
-          onMoveUp={onMoveUp}
-          onMention={onMention}
-          unread={this.props.unread}
-        />
-      );
+      return this.renderFollow(notification, account, link);
     case 'follow_request':
-      return (
-        <NotificationFollowRequestContainer
-          hidden={hidden}
-          id={notification.get('id')}
-          account={notification.get('account')}
-          notification={notification}
-          onMoveDown={onMoveDown}
-          onMoveUp={onMoveUp}
-          onMention={onMention}
-          unread={this.props.unread}
-        />
-      );
-    case 'admin.sign_up':
-      return (
-        <NotificationAdminSignup
-          hidden={hidden}
-          id={notification.get('id')}
-          account={notification.get('account')}
-          notification={notification}
-          onMoveDown={onMoveDown}
-          onMoveUp={onMoveUp}
-          onMention={onMention}
-          unread={this.props.unread}
-        />
-      );
-    case 'admin.report':
-      return (
-        <NotificationAdminReportContainer
-          hidden={hidden}
-          id={notification.get('id')}
-          account={notification.get('account')}
-          notification={notification}
-          onMoveDown={onMoveDown}
-          onMoveUp={onMoveUp}
-          onMention={onMention}
-          unread={this.props.unread}
-        />
-      );
+      return this.renderFollowRequest(notification, account, link);
     case 'mention':
-      return (
-        <StatusContainer
-          containerId={notification.get('id')}
-          hidden={hidden}
-          id={notification.get('status')}
-          notification={notification}
-          onMoveDown={onMoveDown}
-          onMoveUp={onMoveUp}
-          onMention={onMention}
-          contextType='notifications'
-          getScrollPosition={getScrollPosition}
-          updateScrollBottom={updateScrollBottom}
-          cachedMediaWidth={this.props.cachedMediaWidth}
-          cacheMediaWidth={this.props.cacheMediaWidth}
-          onUnmount={this.props.onUnmount}
-          withDismiss
-          unread={this.props.unread}
-        />
-      );
-    case 'status':
-      return (
-        <StatusContainer
-          containerId={notification.get('id')}
-          hidden={hidden}
-          id={notification.get('status')}
-          account={notification.get('account')}
-          prepend='status'
-          muted
-          notification={notification}
-          onMoveDown={onMoveDown}
-          onMoveUp={onMoveUp}
-          onMention={onMention}
-          contextType='notifications'
-          getScrollPosition={getScrollPosition}
-          updateScrollBottom={updateScrollBottom}
-          cachedMediaWidth={this.props.cachedMediaWidth}
-          cacheMediaWidth={this.props.cacheMediaWidth}
-          onUnmount={this.props.onUnmount}
-          withDismiss
-          unread={this.props.unread}
-        />
-      );
+      return this.renderMention(notification);
     case 'favourite':
-      return (
-        <StatusContainer
-          containerId={notification.get('id')}
-          hidden={hidden}
-          id={notification.get('status')}
-          account={notification.get('account')}
-          prepend='favourite'
-          muted
-          notification={notification}
-          onMoveDown={onMoveDown}
-          onMoveUp={onMoveUp}
-          onMention={onMention}
-          contextType='notifications'
-          getScrollPosition={getScrollPosition}
-          updateScrollBottom={updateScrollBottom}
-          cachedMediaWidth={this.props.cachedMediaWidth}
-          cacheMediaWidth={this.props.cacheMediaWidth}
-          onUnmount={this.props.onUnmount}
-          withDismiss
-          unread={this.props.unread}
-        />
-      );
+      return this.renderFavourite(notification);
     case 'reblog':
-      return (
-        <StatusContainer
-          containerId={notification.get('id')}
-          hidden={hidden}
-          id={notification.get('status')}
-          account={notification.get('account')}
-          prepend='reblog'
-          muted
-          notification={notification}
-          onMoveDown={onMoveDown}
-          onMoveUp={onMoveUp}
-          onMention={onMention}
-          contextType='notifications'
-          getScrollPosition={getScrollPosition}
-          updateScrollBottom={updateScrollBottom}
-          cachedMediaWidth={this.props.cachedMediaWidth}
-          cacheMediaWidth={this.props.cacheMediaWidth}
-          onUnmount={this.props.onUnmount}
-          withDismiss
-          unread={this.props.unread}
-        />
-      );
-    case 'poll':
-      return (
-        <StatusContainer
-          containerId={notification.get('id')}
-          hidden={hidden}
-          id={notification.get('status')}
-          account={notification.get('account')}
-          prepend='poll'
-          muted
-          notification={notification}
-          onMoveDown={onMoveDown}
-          onMoveUp={onMoveUp}
-          onMention={onMention}
-          contextType='notifications'
-          getScrollPosition={getScrollPosition}
-          updateScrollBottom={updateScrollBottom}
-          cachedMediaWidth={this.props.cachedMediaWidth}
-          cacheMediaWidth={this.props.cacheMediaWidth}
-          onUnmount={this.props.onUnmount}
-          withDismiss
-          unread={this.props.unread}
-        />
-      );
+      return this.renderReblog(notification);
+    case 'status':
+      return this.renderStatus(notification);
     case 'update':
-      return (
-        <StatusContainer
-          containerId={notification.get('id')}
-          hidden={hidden}
-          id={notification.get('status')}
-          account={notification.get('account')}
-          prepend='update'
-          muted
-          notification={notification}
-          onMoveDown={onMoveDown}
-          onMoveUp={onMoveUp}
-          onMention={onMention}
-          contextType='notifications'
-          getScrollPosition={getScrollPosition}
-          updateScrollBottom={updateScrollBottom}
-          cachedMediaWidth={this.props.cachedMediaWidth}
-          cacheMediaWidth={this.props.cacheMediaWidth}
-          onUnmount={this.props.onUnmount}
-          withDismiss
-          unread={this.props.unread}
-        />
-      );
-    default:
-      return null;
+      return this.renderUpdate(notification);
+    case 'poll':
+      return this.renderPoll(notification);
+    case 'admin.sign_up':
+      return this.renderAdminSignUp(notification, account, link);
+    case 'admin.report':
+      return this.renderAdminReport(notification, account, link);
     }
+
+    return null;
   }
 
 }
+
+export default withRouter(injectIntl(Notification));
diff --git a/app/javascript/flavours/glitch/features/notifications/containers/admin_report_container.js b/app/javascript/flavours/glitch/features/notifications/containers/admin_report_container.js
deleted file mode 100644
index 62809b57b2bc8f..00000000000000
--- a/app/javascript/flavours/glitch/features/notifications/containers/admin_report_container.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import { connect } from 'react-redux';
-
-import { makeGetReport } from 'flavours/glitch/selectors';
-
-import AdminReport from '../components/admin_report';
-
-const mapStateToProps = (state, { notification }) => {
-  const getReport = makeGetReport();
-
-  return {
-    report: notification.get('report') ? getReport(state, notification.get('report'), notification.getIn(['report', 'target_account', 'id'])) : null,
-  };
-};
-
-export default connect(mapStateToProps)(AdminReport);
diff --git a/app/javascript/flavours/glitch/features/notifications/containers/notification_container.js b/app/javascript/flavours/glitch/features/notifications/containers/notification_container.js
index 2fda4ac3a2c7d2..8a4b5c8ed56978 100644
--- a/app/javascript/flavours/glitch/features/notifications/containers/notification_container.js
+++ b/app/javascript/flavours/glitch/features/notifications/containers/notification_container.js
@@ -1,24 +1,62 @@
 import { connect } from 'react-redux';
 
-import { mentionCompose } from 'flavours/glitch/actions/compose';
-import { makeGetNotification } from 'flavours/glitch/selectors';
-
+import { initBoostModal } from '../../../actions/boosts';
+import { mentionCompose } from '../../../actions/compose';
+import {
+  reblog,
+  favourite,
+  unreblog,
+  unfavourite,
+} from '../../../actions/interactions';
+import { boostModal } from '../../../initial_state';
+import { makeGetNotification, makeGetStatus, makeGetReport } from '../../../selectors';
 import Notification from '../components/notification';
 
 const makeMapStateToProps = () => {
   const getNotification = makeGetNotification();
+  const getStatus = makeGetStatus();
+  const getReport = makeGetReport();
 
-  const mapStateToProps = (state, props) => ({
-    notification: getNotification(state, props.notification, props.accountId),
-    notifCleaning: state.getIn(['notifications', 'cleaningMode']),
-  });
+  const mapStateToProps = (state, props) => {
+    const notification = getNotification(state, props.notification, props.accountId);
+    return {
+      notification: notification,
+      status: notification.get('status') ? getStatus(state, { id: notification.get('status'), contextType: 'notifications' }) : null,
+      report: notification.get('report') ? getReport(state, notification.get('report'), notification.getIn(['report', 'target_account', 'id'])) : null,
+      notifCleaning: state.getIn(['notifications', 'cleaningMode']),
+    };
+  };
 
   return mapStateToProps;
 };
 
 const mapDispatchToProps = dispatch => ({
-  onMention: (account, history) => {
-    dispatch(mentionCompose(account, history));
+  onMention: (account, router) => {
+    dispatch(mentionCompose(account, router));
+  },
+
+  onModalReblog (status, privacy) {
+    dispatch(reblog(status, privacy));
+  },
+
+  onReblog (status, e) {
+    if (status.get('reblogged')) {
+      dispatch(unreblog(status));
+    } else {
+      if (e.shiftKey || !boostModal) {
+        this.onModalReblog(status);
+      } else {
+        dispatch(initBoostModal({ status, onReblog: this.onModalReblog }));
+      }
+    }
+  },
+
+  onFavourite (status) {
+    if (status.get('favourited')) {
+      dispatch(unfavourite(status));
+    } else {
+      dispatch(favourite(status));
+    }
   },
 });
 

From 0f966209ca4a16dbf6f3163d0a29dc6740215b9f Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 20 Mar 2024 16:37:21 +0100
Subject: [PATCH 0697/2191] [Glitch] Add notifications of severed relationships

Port 44bf7b812894f9c8d67cbfbb1a23b0091aa601c5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../notifications/components/notification.jsx | 29 +++++++++
 .../relationships_severance_event.jsx         | 61 +++++++++++++++++++
 .../flavours/glitch/reducers/notifications.js |  1 +
 3 files changed, 91 insertions(+)
 create mode 100644 app/javascript/flavours/glitch/features/notifications/components/relationships_severance_event.jsx

diff --git a/app/javascript/flavours/glitch/features/notifications/components/notification.jsx b/app/javascript/flavours/glitch/features/notifications/components/notification.jsx
index 4aac5e8d6d2365..c0d0a30eeb2ce0 100644
--- a/app/javascript/flavours/glitch/features/notifications/components/notification.jsx
+++ b/app/javascript/flavours/glitch/features/notifications/components/notification.jsx
@@ -11,6 +11,7 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
 import { HotKeys } from 'react-hotkeys';
 
 import FlagIcon from '@/material-icons/400-24px/flag-fill.svg?react';
+import LinkOffIcon from '@/material-icons/400-24px/link_off.svg?react';
 import PersonIcon from '@/material-icons/400-24px/person-fill.svg?react';
 import PersonAddIcon from '@/material-icons/400-24px/person_add-fill.svg?react';
 import { Icon }  from 'flavours/glitch/components/icon';
@@ -22,10 +23,12 @@ import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router';
 import FollowRequestContainer from '../containers/follow_request_container';
 import NotificationOverlayContainer from '../containers/overlay_container';
 
+import RelationshipsSeveranceEvent from './relationships_severance_event';
 import Report from './report';
 
 const messages = defineMessages({
   follow: { id: 'notification.follow', defaultMessage: '{name} followed you' },
+  severedRelationships: { id: 'notification.severed_relationships', defaultMessage: 'Relationships with {name} severed' },
   adminSignUp: { id: 'notification.admin.sign_up', defaultMessage: '{name} signed up' },
   adminReport: { id: 'notification.admin.report', defaultMessage: '{name} reported {target}' },
 });
@@ -303,6 +306,30 @@ class Notification extends ImmutablePureComponent {
     );
   }
 
+  renderRelationshipsSevered (notification) {
+    const { intl, unread } = this.props;
+
+    if (!notification.get('event')) {
+      return null;
+    }
+
+    return (
+      <HotKeys handlers={this.getHandlers()}>
+        <div className={classNames('notification notification-severed-relationships focusable', { unread })} tabIndex={0} aria-label={notificationForScreenReader(intl, intl.formatMessage(messages.adminReport, { name: notification.getIn(['event', 'target_name']) }), notification.get('created_at'))}>
+          <div className='notification__message'>
+            <Icon id='unlink' icon={LinkOffIcon} />
+
+            <span title={notification.get('created_at')}>
+              <FormattedMessage id='notification.severedRelationships' defaultMessage='Relationships with {name} severed' values={{ name: notification.getIn(['event', 'target_name']) }} />
+            </span>
+          </div>
+
+          <RelationshipsSeveranceEvent event={notification.get('event')} />
+        </div>
+      </HotKeys>
+    );
+  }
+
   renderAdminSignUp (notification, account, link) {
     const { intl, unread } = this.props;
 
@@ -396,6 +423,8 @@ class Notification extends ImmutablePureComponent {
       return this.renderUpdate(notification);
     case 'poll':
       return this.renderPoll(notification);
+    case 'severed_relationships':
+      return this.renderRelationshipsSevered(notification);
     case 'admin.sign_up':
       return this.renderAdminSignUp(notification, account, link);
     case 'admin.report':
diff --git a/app/javascript/flavours/glitch/features/notifications/components/relationships_severance_event.jsx b/app/javascript/flavours/glitch/features/notifications/components/relationships_severance_event.jsx
new file mode 100644
index 00000000000000..62da3102fb5b25
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/notifications/components/relationships_severance_event.jsx
@@ -0,0 +1,61 @@
+import PropTypes from 'prop-types';
+
+import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
+
+import ImmutablePropTypes from 'react-immutable-proptypes';
+
+import { RelativeTimestamp } from 'flavours/glitch/components/relative_timestamp';
+
+// This needs to be kept in sync with app/models/relationship_severance_event.rb
+const messages = defineMessages({
+  account_suspension: { id: 'relationship_severance_notification.types.account_suspension', defaultMessage: 'Account has been suspended' },
+  domain_block: { id: 'relationship_severance_notification.types.domain_block', defaultMessage: 'Domain has been suspended' },
+  user_domain_block: { id: 'relationship_severance_notification.types.user_domain_block', defaultMessage: 'You blocked this domain' },
+});
+
+const RelationshipsSeveranceEvent = ({ event, hidden }) => {
+  const intl = useIntl();
+
+  if (hidden || !event) {
+    return null;
+  }
+
+  return (
+    <div className='notification__report'>
+      <div className='notification__report__details'>
+        <div>
+          <RelativeTimestamp timestamp={event.get('created_at')} short={false} />
+          {' · '}
+          { event.get('purged') ? (
+            <FormattedMessage
+              id='relationship_severance_notification.purged_data'
+              defaultMessage='purged by administrators'
+            />
+          ) : (
+            <FormattedMessage
+              id='relationship_severance_notification.relationships'
+              defaultMessage='{count, plural, one {# relationship} other {# relationships}}'
+              values={{ count: event.get('relationships_count', 0) }}
+            />
+          )}
+          <br />
+          <strong>{intl.formatMessage(messages[event.get('type')])}</strong>
+        </div>
+
+        <div className='notification__report__actions'>
+          <a href='/severed_relationships' className='button' target='_blank' rel='noopener noreferrer'>
+            <FormattedMessage id='relationship_severance_notification.view' defaultMessage='View' />
+          </a>
+        </div>
+      </div>
+    </div>
+  );
+
+};
+
+RelationshipsSeveranceEvent.propTypes = {
+  event: ImmutablePropTypes.map.isRequired,
+  hidden: PropTypes.bool,
+};
+
+export default RelationshipsSeveranceEvent;
diff --git a/app/javascript/flavours/glitch/reducers/notifications.js b/app/javascript/flavours/glitch/reducers/notifications.js
index c6d70945ba9a79..14862bef0790aa 100644
--- a/app/javascript/flavours/glitch/reducers/notifications.js
+++ b/app/javascript/flavours/glitch/reducers/notifications.js
@@ -61,6 +61,7 @@ export const notificationToMap = (notification, markForDelete = false) => Immuta
   markedForDelete: markForDelete,
   status: notification.status ? notification.status.id : null,
   report: notification.report ? fromJS(notification.report) : null,
+  event: notification.event ? fromJS(notification.event) : null,
 });
 
 const normalizeNotification = (state, notification, usePendingItems) => {

From 375af259a2721a70055f3cfd9d0782b9a41fcc5c Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 20 Mar 2024 18:21:03 +0100
Subject: [PATCH 0698/2191] [Glitch] Change back button to always appear in
 advanced web UI

Port be52633ee4ce4a14b48f82156cf64c0a3eb9835b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../glitch/components/column_header.jsx       | 23 ++++++++-----------
 .../glitch/features/follow_requests/index.jsx |  2 +-
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/app/javascript/flavours/glitch/components/column_header.jsx b/app/javascript/flavours/glitch/components/column_header.jsx
index c2524b6dd9e9bf..01778124802096 100644
--- a/app/javascript/flavours/glitch/components/column_header.jsx
+++ b/app/javascript/flavours/glitch/components/column_header.jsx
@@ -13,7 +13,7 @@ import ChevronRightIcon from '@/material-icons/400-24px/chevron_right.svg?react'
 import CloseIcon from '@/material-icons/400-24px/close.svg?react';
 import SettingsIcon from '@/material-icons/400-24px/settings.svg?react';
 import { Icon }  from 'flavours/glitch/components/icon';
-import { ButtonInTabsBar, useColumnsContext } from 'flavours/glitch/features/ui/util/columns_context';
+import { ButtonInTabsBar } from 'flavours/glitch/features/ui/util/columns_context';
 import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router';
 
 import { useAppHistory } from './router';
@@ -26,10 +26,9 @@ const messages = defineMessages({
   back: { id: 'column_back_button.label', defaultMessage: 'Back' },
 });
 
-const BackButton = ({ pinned, show, onlyIcon }) => {
+const BackButton = ({ onlyIcon }) => {
   const history = useAppHistory();
   const intl = useIntl();
-  const { multiColumn } = useColumnsContext();
 
   const handleBackClick = useCallback(() => {
     if (history.location?.state?.fromMastodon) {
@@ -39,10 +38,6 @@ const BackButton = ({ pinned, show, onlyIcon }) => {
     }
   }, [history]);
 
-  const showButton = history && !pinned && ((multiColumn && history.location?.state?.fromMastodon) || show);
-
-  if (!showButton) return null;
-
   return (
     <button onClick={handleBackClick} className={classNames('column-header__back-button', { 'compact': onlyIcon })} aria-label={intl.formatMessage(messages.back)}>
       <Icon id='chevron-left' icon={ArrowBackIcon} className='column-back-button__icon' />
@@ -52,8 +47,6 @@ const BackButton = ({ pinned, show, onlyIcon }) => {
 };
 
 BackButton.propTypes = {
-  pinned: PropTypes.bool,
-  show: PropTypes.bool,
   onlyIcon: PropTypes.bool,
 };
 
@@ -118,7 +111,7 @@ class ColumnHeader extends PureComponent {
   };
 
   render () {
-    const { title, icon, iconComponent, active, children, pinned, multiColumn, extraButton, showBackButton, intl: { formatMessage }, placeholder, appendContent, collapseIssues } = this.props;
+    const { title, icon, iconComponent, active, children, pinned, multiColumn, extraButton, showBackButton, intl: { formatMessage }, placeholder, appendContent, collapseIssues, history } = this.props;
     const { collapsed, animating } = this.state;
 
     const wrapperClassName = classNames('column-header__wrapper', {
@@ -161,7 +154,9 @@ class ColumnHeader extends PureComponent {
       pinButton = <button className='text-btn column-header__setting-btn' onClick={this.handlePin}><Icon id='plus' icon={AddIcon} /> <FormattedMessage id='column_header.pin' defaultMessage='Pin' /></button>;
     }
 
-    backButton = <BackButton pinned={pinned} show={showBackButton} onlyIcon={!!title} />;
+    if (history && !pinned && ((multiColumn && history.location?.state?.fromMastodon) || showBackButton)) {
+      backButton = <BackButton onlyIcon={!!title} />;
+    }
 
     const collapsedContent = [
       extraContent,
@@ -199,16 +194,16 @@ class ColumnHeader extends PureComponent {
         <h1 className={buttonClassName}>
           {hasTitle && (
             <>
-              {showBackButton && backButton}
+              {backButton}
 
               <button onClick={this.handleTitleClick} className='column-header__title'>
-                {!showBackButton && <Icon id={icon} icon={iconComponent} className='column-header__icon' />}
+                {!backButton && <Icon id={icon} icon={iconComponent} className='column-header__icon' />}
                 {title}
               </button>
             </>
           )}
 
-          {!hasTitle && showBackButton && backButton}
+          {!hasTitle && backButton}
 
           <div className='column-header__buttons'>
             {extraButton}
diff --git a/app/javascript/flavours/glitch/features/follow_requests/index.jsx b/app/javascript/flavours/glitch/features/follow_requests/index.jsx
index 7d651f2ca69c24..a8f40a31d0d007 100644
--- a/app/javascript/flavours/glitch/features/follow_requests/index.jsx
+++ b/app/javascript/flavours/glitch/features/follow_requests/index.jsx
@@ -68,7 +68,7 @@ class FollowRequests extends ImmutablePureComponent {
     );
 
     return (
-      <Column bindToDocument={!multiColumn} icon='user-plus' iconComponent={PersonAddIcon} heading={intl.formatMessage(messages.heading)} alwaysShowBackButton>
+      <Column bindToDocument={!multiColumn} icon='user-plus' iconComponent={PersonAddIcon} heading={intl.formatMessage(messages.heading)}>
         <ScrollableList
           scrollKey='follow_requests'
           onLoadMore={this.handleLoadMore}

From f14b6f3d99969b9fa108a268fc2d8f4180e73705 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 21 Mar 2024 11:06:21 +0100
Subject: [PATCH 0699/2191] [Glitch] Fix duplicate translation string for
 severed relationships

Port 885d0faf83d55f2f67ad76f7f34c51afcd72efe5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../glitch/features/notifications/components/notification.jsx  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/javascript/flavours/glitch/features/notifications/components/notification.jsx b/app/javascript/flavours/glitch/features/notifications/components/notification.jsx
index c0d0a30eeb2ce0..1fef05ad6d5692 100644
--- a/app/javascript/flavours/glitch/features/notifications/components/notification.jsx
+++ b/app/javascript/flavours/glitch/features/notifications/components/notification.jsx
@@ -28,7 +28,6 @@ import Report from './report';
 
 const messages = defineMessages({
   follow: { id: 'notification.follow', defaultMessage: '{name} followed you' },
-  severedRelationships: { id: 'notification.severed_relationships', defaultMessage: 'Relationships with {name} severed' },
   adminSignUp: { id: 'notification.admin.sign_up', defaultMessage: '{name} signed up' },
   adminReport: { id: 'notification.admin.report', defaultMessage: '{name} reported {target}' },
 });
@@ -320,7 +319,7 @@ class Notification extends ImmutablePureComponent {
             <Icon id='unlink' icon={LinkOffIcon} />
 
             <span title={notification.get('created_at')}>
-              <FormattedMessage id='notification.severedRelationships' defaultMessage='Relationships with {name} severed' values={{ name: notification.getIn(['event', 'target_name']) }} />
+              <FormattedMessage id='notification.severed_relationships' defaultMessage='Relationships with {name} severed' values={{ name: notification.getIn(['event', 'target_name']) }} />
             </span>
           </div>
 

From 576c085ea032a6a72cc2b58ee65320ab73d782ff Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Fri, 22 Mar 2024 12:59:35 +0100
Subject: [PATCH 0700/2191] [Glitch] Add the role ID to the badge component

Port ec1e770feaef81574482b841bc04a286f9dc7249 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/components/badge.jsx          | 5 +++--
 .../flavours/glitch/features/account/components/header.jsx   | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/javascript/flavours/glitch/components/badge.jsx b/app/javascript/flavours/glitch/components/badge.jsx
index 646655c249b872..5e0b2587bd6560 100644
--- a/app/javascript/flavours/glitch/components/badge.jsx
+++ b/app/javascript/flavours/glitch/components/badge.jsx
@@ -7,8 +7,8 @@ import PersonIcon from '@/material-icons/400-24px/person.svg?react';
 import SmartToyIcon from '@/material-icons/400-24px/smart_toy.svg?react';
 
 
-export const Badge = ({ icon, label, domain }) => (
-  <div className='account-role'>
+export const Badge = ({ icon, label, domain, roleId }) => (
+  <div className='account-role' data-account-role-id={roleId}>
     {icon}
     {label}
     {domain && <span className='account-role__domain'>{domain}</span>}
@@ -19,6 +19,7 @@ Badge.propTypes = {
   icon: PropTypes.node,
   label: PropTypes.node,
   domain: PropTypes.node,
+  roleId: PropTypes.string
 };
 
 Badge.defaultProps = {
diff --git a/app/javascript/flavours/glitch/features/account/components/header.jsx b/app/javascript/flavours/glitch/features/account/components/header.jsx
index b97de5aeabe720..e311936af95978 100644
--- a/app/javascript/flavours/glitch/features/account/components/header.jsx
+++ b/app/javascript/flavours/glitch/features/account/components/header.jsx
@@ -329,7 +329,7 @@ class Header extends ImmutablePureComponent {
     }
 
     account.get('roles', []).forEach((role) => {
-      badges.push(<Badge key={`role-badge-${role.get('id')}`} label={<span>{role.get('name')}</span>} domain={domain} />);
+      badges.push(<Badge key={`role-badge-${role.get('id')}`} label={<span>{role.get('name')}</span>} domain={domain} roleId={role.get('id')} />);
     });
 
     return (

From 0f8b33238f9b58547f2b2ec5cc454c8882d46f3d Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 22 Mar 2024 16:45:04 +0100
Subject: [PATCH 0701/2191] [Glitch] Change icon of severed relationships
 notifications

Port 387c78ddf9c7654090b7b529ccebfb96f5cab534 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../glitch/features/notifications/components/notification.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/javascript/flavours/glitch/features/notifications/components/notification.jsx b/app/javascript/flavours/glitch/features/notifications/components/notification.jsx
index 1fef05ad6d5692..31bafe626f8999 100644
--- a/app/javascript/flavours/glitch/features/notifications/components/notification.jsx
+++ b/app/javascript/flavours/glitch/features/notifications/components/notification.jsx
@@ -11,7 +11,7 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
 import { HotKeys } from 'react-hotkeys';
 
 import FlagIcon from '@/material-icons/400-24px/flag-fill.svg?react';
-import LinkOffIcon from '@/material-icons/400-24px/link_off.svg?react';
+import HeartBrokenIcon from '@/material-icons/400-24px/heart_broken-fill.svg?react';
 import PersonIcon from '@/material-icons/400-24px/person-fill.svg?react';
 import PersonAddIcon from '@/material-icons/400-24px/person_add-fill.svg?react';
 import { Icon }  from 'flavours/glitch/components/icon';
@@ -316,7 +316,7 @@ class Notification extends ImmutablePureComponent {
       <HotKeys handlers={this.getHandlers()}>
         <div className={classNames('notification notification-severed-relationships focusable', { unread })} tabIndex={0} aria-label={notificationForScreenReader(intl, intl.formatMessage(messages.adminReport, { name: notification.getIn(['event', 'target_name']) }), notification.get('created_at'))}>
           <div className='notification__message'>
-            <Icon id='unlink' icon={LinkOffIcon} />
+            <Icon id='heart_broken' icon={HeartBrokenIcon} />
 
             <span title={notification.get('created_at')}>
               <FormattedMessage id='notification.severed_relationships' defaultMessage='Relationships with {name} severed' values={{ name: notification.getIn(['event', 'target_name']) }} />

From f635cde756adc5863a8a8ec58c9626dab1ee9c06 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 22 Mar 2024 17:21:50 +0100
Subject: [PATCH 0702/2191] [Glitch] Change new modals to allow vertical
 scrolling

Port de6c9e0fcd9d9768b3696b27122334aaf955c231 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/styles/components.scss | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index 42a262c9fcc3b4..674ec02d9f1946 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -9411,8 +9411,9 @@ noscript {
 
 .safety-action-modal,
 .interaction-modal {
-  max-width: 90vw;
+  max-width: 100vw;
   width: 600px;
+  overflow-y: auto;
 }
 
 .interaction-modal {

From 7953261a1fc7bbaa3465728cd7c08fee584a6744 Mon Sep 17 00:00:00 2001
From: Jeremy Kescher <jeremy@kescher.at>
Date: Sat, 6 Apr 2024 21:06:05 +0200
Subject: [PATCH 0703/2191] Bump Catstodon revision to 1.1.1

---
 lib/mastodon/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index 3402bc7a53a2da..f36c06a0b3b64d 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -25,7 +25,7 @@ def prerelease
     end
 
     def catstodon_revision
-      '1.1.0'
+      '1.1.1'
     end
 
     def build_metadata

From afaad0755f86dc77bb39f32fb189ca6cd0445620 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 22 Mar 2024 17:24:04 +0100
Subject: [PATCH 0704/2191] [Glitch] Remove setting for unfollow confirmation
 modal, and make it unconditional

Port 37ca59815cd3a3b2662e20f0c28185eb0d604dd4 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../glitch/containers/account_container.jsx   | 21 +++-----
 .../containers/header_container.jsx           | 41 ++++++---------
 .../directory/components/account_card.jsx     | 52 ++++++++-----------
 .../flavours/glitch/initial_state.js          |  1 -
 4 files changed, 46 insertions(+), 69 deletions(-)

diff --git a/app/javascript/flavours/glitch/containers/account_container.jsx b/app/javascript/flavours/glitch/containers/account_container.jsx
index a134452e77210f..f171fcc2fe5d19 100644
--- a/app/javascript/flavours/glitch/containers/account_container.jsx
+++ b/app/javascript/flavours/glitch/containers/account_container.jsx
@@ -13,7 +13,6 @@ import {
 import { openModal } from '../actions/modal';
 import { initMuteModal } from '../actions/mutes';
 import Account from '../components/account';
-import { unfollowModal } from '../initial_state';
 import { makeGetAccount } from '../selectors';
 
 const messages = defineMessages({
@@ -34,18 +33,14 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
 
   onFollow (account) {
     if (account.getIn(['relationship', 'following']) || account.getIn(['relationship', 'requested'])) {
-      if (unfollowModal) {
-        dispatch(openModal({
-          modalType: 'CONFIRM',
-          modalProps: {
-            message: <FormattedMessage id='confirmations.unfollow.message' defaultMessage='Are you sure you want to unfollow {name}?' values={{ name: <strong>@{account.get('acct')}</strong> }} />,
-            confirm: intl.formatMessage(messages.unfollowConfirm),
-            onConfirm: () => dispatch(unfollowAccount(account.get('id'))),
-          },
-        }));
-      } else {
-        dispatch(unfollowAccount(account.get('id')));
-      }
+      dispatch(openModal({
+        modalType: 'CONFIRM',
+        modalProps: {
+          message: <FormattedMessage id='confirmations.unfollow.message' defaultMessage='Are you sure you want to unfollow {name}?' values={{ name: <strong>@{account.get('acct')}</strong> }} />,
+          confirm: intl.formatMessage(messages.unfollowConfirm),
+          onConfirm: () => dispatch(unfollowAccount(account.get('id'))),
+        },
+      }));
     } else {
       dispatch(followAccount(account.get('id')));
     }
diff --git a/app/javascript/flavours/glitch/features/account_timeline/containers/header_container.jsx b/app/javascript/flavours/glitch/features/account_timeline/containers/header_container.jsx
index d42bb2c251eddc..a87c7fd3e4bd8e 100644
--- a/app/javascript/flavours/glitch/features/account_timeline/containers/header_container.jsx
+++ b/app/javascript/flavours/glitch/features/account_timeline/containers/header_container.jsx
@@ -19,7 +19,6 @@ import { initDomainBlockModal, unblockDomain } from '../../../actions/domain_blo
 import { openModal } from '../../../actions/modal';
 import { initMuteModal } from '../../../actions/mutes';
 import { initReport } from '../../../actions/reports';
-import { unfollowModal } from '../../../initial_state';
 import { makeGetAccount, getAccountHidden } from '../../../selectors';
 import Header from '../components/header';
 
@@ -45,31 +44,23 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
 
   onFollow (account) {
     if (account.getIn(['relationship', 'following'])) {
-      if (unfollowModal) {
-        dispatch(openModal({
-          modalType: 'CONFIRM',
-          modalProps: {
-            message: <FormattedMessage id='confirmations.unfollow.message' defaultMessage='Are you sure you want to unfollow {name}?' values={{ name: <strong>@{account.get('acct')}</strong> }} />,
-            confirm: intl.formatMessage(messages.unfollowConfirm),
-            onConfirm: () => dispatch(unfollowAccount(account.get('id'))),
-          },
-        }));
-      } else {
-        dispatch(unfollowAccount(account.get('id')));
-      }
+      dispatch(openModal({
+        modalType: 'CONFIRM',
+        modalProps: {
+          message: <FormattedMessage id='confirmations.unfollow.message' defaultMessage='Are you sure you want to unfollow {name}?' values={{ name: <strong>@{account.get('acct')}</strong> }} />,
+          confirm: intl.formatMessage(messages.unfollowConfirm),
+          onConfirm: () => dispatch(unfollowAccount(account.get('id'))),
+        },
+      }));
     } else if (account.getIn(['relationship', 'requested'])) {
-      if (unfollowModal) {
-        dispatch(openModal({
-          modalType: 'CONFIRM',
-          modalProps: {
-            message: <FormattedMessage id='confirmations.cancel_follow_request.message' defaultMessage='Are you sure you want to withdraw your request to follow {name}?' values={{ name: <strong>@{account.get('acct')}</strong> }} />,
-            confirm: intl.formatMessage(messages.cancelFollowRequestConfirm),
-            onConfirm: () => dispatch(unfollowAccount(account.get('id'))),
-          },
-        }));
-      } else {
-        dispatch(unfollowAccount(account.get('id')));
-      }
+      dispatch(openModal({
+        modalType: 'CONFIRM',
+        modalProps: {
+          message: <FormattedMessage id='confirmations.cancel_follow_request.message' defaultMessage='Are you sure you want to withdraw your request to follow {name}?' values={{ name: <strong>@{account.get('acct')}</strong> }} />,
+          confirm: intl.formatMessage(messages.cancelFollowRequestConfirm),
+          onConfirm: () => dispatch(unfollowAccount(account.get('id'))),
+        },
+      }));
     } else {
       dispatch(followAccount(account.get('id')));
     }
diff --git a/app/javascript/flavours/glitch/features/directory/components/account_card.jsx b/app/javascript/flavours/glitch/features/directory/components/account_card.jsx
index 60927f81c36be4..ed4736d7e67cf2 100644
--- a/app/javascript/flavours/glitch/features/directory/components/account_card.jsx
+++ b/app/javascript/flavours/glitch/features/directory/components/account_card.jsx
@@ -21,7 +21,7 @@ import { DisplayName } from 'flavours/glitch/components/display_name';
 import { IconButton } from 'flavours/glitch/components/icon_button';
 import { Permalink } from 'flavours/glitch/components/permalink';
 import { ShortNumber } from 'flavours/glitch/components/short_number';
-import { autoPlayGif, me, unfollowModal } from 'flavours/glitch/initial_state';
+import { autoPlayGif, me } from 'flavours/glitch/initial_state';
 import { makeGetAccount } from 'flavours/glitch/selectors';
 
 const messages = defineMessages({
@@ -50,38 +50,30 @@ const makeMapStateToProps = () => {
 const mapDispatchToProps = (dispatch, { intl }) => ({
   onFollow(account) {
     if (account.getIn(['relationship', 'following'])) {
-      if (unfollowModal) {
-        dispatch(
-          openModal({
-            modalType: 'CONFIRM',
-            modalProps: {
-              message: (
-                <FormattedMessage
-                  id='confirmations.unfollow.message'
-                  defaultMessage='Are you sure you want to unfollow {name}?'
-                  values={{ name: <strong>@{account.get('acct')}</strong> }}
-                />
-              ),
-              confirm: intl.formatMessage(messages.unfollowConfirm),
-              onConfirm: () => dispatch(unfollowAccount(account.get('id'))),
-            } }),
-        );
-      } else {
-        dispatch(unfollowAccount(account.get('id')));
-      }
-    } else if (account.getIn(['relationship', 'requested'])) {
-      if (unfollowModal) {
-        dispatch(openModal({
+      dispatch(
+        openModal({
           modalType: 'CONFIRM',
           modalProps: {
-            message: <FormattedMessage id='confirmations.cancel_follow_request.message' defaultMessage='Are you sure you want to withdraw your request to follow {name}?' values={{ name: <strong>@{account.get('acct')}</strong> }} />,
-            confirm: intl.formatMessage(messages.cancelFollowRequestConfirm),
+            message: (
+              <FormattedMessage
+                id='confirmations.unfollow.message'
+                defaultMessage='Are you sure you want to unfollow {name}?'
+                values={{ name: <strong>@{account.get('acct')}</strong> }}
+              />
+            ),
+            confirm: intl.formatMessage(messages.unfollowConfirm),
             onConfirm: () => dispatch(unfollowAccount(account.get('id'))),
-          },
-        }));
-      } else {
-        dispatch(unfollowAccount(account.get('id')));
-      }
+          } }),
+      );
+    } else if (account.getIn(['relationship', 'requested'])) {
+      dispatch(openModal({
+        modalType: 'CONFIRM',
+        modalProps: {
+          message: <FormattedMessage id='confirmations.cancel_follow_request.message' defaultMessage='Are you sure you want to withdraw your request to follow {name}?' values={{ name: <strong>@{account.get('acct')}</strong> }} />,
+          confirm: intl.formatMessage(messages.cancelFollowRequestConfirm),
+          onConfirm: () => dispatch(unfollowAccount(account.get('id'))),
+        },
+      }));
     } else {
       dispatch(followAccount(account.get('id')));
     }
diff --git a/app/javascript/flavours/glitch/initial_state.js b/app/javascript/flavours/glitch/initial_state.js
index 93991b19cfdaac..3e84966cb42708 100644
--- a/app/javascript/flavours/glitch/initial_state.js
+++ b/app/javascript/flavours/glitch/initial_state.js
@@ -118,7 +118,6 @@ export const source_url = getMeta('source_url');
 export const timelinePreview = getMeta('timeline_preview');
 export const title = getMeta('title');
 export const trendsAsLanding = getMeta('trends_as_landing_page');
-export const unfollowModal = getMeta('unfollow_modal');
 export const useBlurhash = getMeta('use_blurhash');
 export const usePendingItems = getMeta('use_pending_items');
 export const version = getMeta('version');

From c3a128f31eefb2925130dc11912f018361bf276e Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Sat, 6 Apr 2024 21:25:04 +0200
Subject: [PATCH 0705/2191] Remove strings already defined upstream

---
 app/javascript/flavours/glitch/locales/en.json | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/javascript/flavours/glitch/locales/en.json b/app/javascript/flavours/glitch/locales/en.json
index 990c8afe4ca169..76f7ed535ea4f6 100644
--- a/app/javascript/flavours/glitch/locales/en.json
+++ b/app/javascript/flavours/glitch/locales/en.json
@@ -64,8 +64,6 @@
   "notification_purge.btn_invert": "Invert\nselection",
   "notification_purge.btn_none": "Select\nnone",
   "notification_purge.start": "Enter notification cleaning mode",
-  "notifications.column_settings.filter_bar.advanced": "Display all categories",
-  "notifications.column_settings.filter_bar.category": "Quick filter bar",
   "notifications.column_settings.filter_bar.show_bar": "Show filter bar",
   "notifications.marked_clear": "Clear selected notifications",
   "notifications.marked_clear_confirmation": "Are you sure you want to permanently clear all selected notifications?",

From a844a6a5770bf82749e1f89e6d375a2ff388b3d5 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 22 Mar 2024 16:44:31 +0100
Subject: [PATCH 0706/2191] [Glitch] Change `AccountRelationshipSeveranceEvent`
 model to store lost followers and following counts separately

Port dfa43707eb88276b8268e49c7853d226006bf140 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../notifications/components/relationships_severance_event.jsx  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/flavours/glitch/features/notifications/components/relationships_severance_event.jsx b/app/javascript/flavours/glitch/features/notifications/components/relationships_severance_event.jsx
index 62da3102fb5b25..7c71776ffc0ef2 100644
--- a/app/javascript/flavours/glitch/features/notifications/components/relationships_severance_event.jsx
+++ b/app/javascript/flavours/glitch/features/notifications/components/relationships_severance_event.jsx
@@ -35,7 +35,7 @@ const RelationshipsSeveranceEvent = ({ event, hidden }) => {
             <FormattedMessage
               id='relationship_severance_notification.relationships'
               defaultMessage='{count, plural, one {# relationship} other {# relationships}}'
-              values={{ count: event.get('relationships_count', 0) }}
+              values={{ count: event.get('followers_count', 0) + event.get('following_count', 0) }}
             />
           )}
           <br />

From 1ae08ae25710cc90de8fe8d987c5702eca327ed5 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 25 Mar 2024 13:45:00 +0100
Subject: [PATCH 0707/2191] [Glitch] Change out-of-band hashtags design in web
 UI

Port dd061291b1e89b6c67e6dff06ad087abdf7821dc to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/styles/components.scss       | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index 674ec02d9f1946..0b5a3f455bdaf1 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -10322,18 +10322,24 @@ noscript {
   margin-top: 16px;
   display: flex;
   flex-wrap: wrap;
-  font-size: 14px;
-  line-height: 18px;
-  gap: 4px;
+  font-size: 12px;
+  line-height: 16px;
+  gap: 6px;
   color: $darker-text-color;
 
   a {
     display: inline-flex;
     color: inherit;
     text-decoration: none;
+    padding: 4px 12px;
+    background: $ui-base-color;
+    border-radius: 4px;
+    font-weight: 500;
 
-    &:hover span {
-      text-decoration: underline;
+    &:hover,
+    &:focus,
+    &:active {
+      background: lighten($ui-base-color, 4%);
     }
   }
 

From b55bbfa2b3facc397a13199fb19e82bbac8c473b Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 25 Mar 2024 14:27:38 +0100
Subject: [PATCH 0708/2191] [Glitch] Change design of notification about lost
 connections in web UI

Port 29f9dc742eaca1898455e37e01fff087e4bf42a6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../notifications/components/notification.jsx | 27 ++++----
 .../relationships_severance_event.jsx         | 64 +++++++------------
 .../flavours/glitch/styles/components.scss    | 38 +++++++++++
 3 files changed, 75 insertions(+), 54 deletions(-)

diff --git a/app/javascript/flavours/glitch/features/notifications/components/notification.jsx b/app/javascript/flavours/glitch/features/notifications/components/notification.jsx
index 31bafe626f8999..211a319679c722 100644
--- a/app/javascript/flavours/glitch/features/notifications/components/notification.jsx
+++ b/app/javascript/flavours/glitch/features/notifications/components/notification.jsx
@@ -11,7 +11,6 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
 import { HotKeys } from 'react-hotkeys';
 
 import FlagIcon from '@/material-icons/400-24px/flag-fill.svg?react';
-import HeartBrokenIcon from '@/material-icons/400-24px/heart_broken-fill.svg?react';
 import PersonIcon from '@/material-icons/400-24px/person-fill.svg?react';
 import PersonAddIcon from '@/material-icons/400-24px/person_add-fill.svg?react';
 import { Icon }  from 'flavours/glitch/components/icon';
@@ -23,13 +22,14 @@ import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router';
 import FollowRequestContainer from '../containers/follow_request_container';
 import NotificationOverlayContainer from '../containers/overlay_container';
 
-import RelationshipsSeveranceEvent from './relationships_severance_event';
+import { RelationshipsSeveranceEvent } from './relationships_severance_event';
 import Report from './report';
 
 const messages = defineMessages({
   follow: { id: 'notification.follow', defaultMessage: '{name} followed you' },
   adminSignUp: { id: 'notification.admin.sign_up', defaultMessage: '{name} signed up' },
   adminReport: { id: 'notification.admin.report', defaultMessage: '{name} reported {target}' },
+  relationshipsSevered: { id: 'notification.relationships_severance_event', defaultMessage: 'Lost connections with {name}' },
 });
 
 const notificationForScreenReader = (intl, message, timestamp) => {
@@ -306,24 +306,23 @@ class Notification extends ImmutablePureComponent {
   }
 
   renderRelationshipsSevered (notification) {
-    const { intl, unread } = this.props;
+    const { intl, unread, hidden } = this.props;
+    const event = notification.get('event');
 
-    if (!notification.get('event')) {
+    if (!event) {
       return null;
     }
 
     return (
       <HotKeys handlers={this.getHandlers()}>
-        <div className={classNames('notification notification-severed-relationships focusable', { unread })} tabIndex={0} aria-label={notificationForScreenReader(intl, intl.formatMessage(messages.adminReport, { name: notification.getIn(['event', 'target_name']) }), notification.get('created_at'))}>
-          <div className='notification__message'>
-            <Icon id='heart_broken' icon={HeartBrokenIcon} />
-
-            <span title={notification.get('created_at')}>
-              <FormattedMessage id='notification.severed_relationships' defaultMessage='Relationships with {name} severed' values={{ name: notification.getIn(['event', 'target_name']) }} />
-            </span>
-          </div>
-
-          <RelationshipsSeveranceEvent event={notification.get('event')} />
+        <div className={classNames('notification notification-severed-relationships focusable', { unread })} tabIndex={0} aria-label={notificationForScreenReader(intl, intl.formatMessage(messages.relationshipsSevered, { name: notification.getIn(['event', 'target_name']) }), notification.get('created_at'))}>
+          <RelationshipsSeveranceEvent
+            type={event.get('type')}
+            target={event.get('target_name')}
+            followersCount={event.get('followers_count')}
+            followingCount={event.get('following_count')}
+            hidden={hidden}
+          />
         </div>
       </HotKeys>
     );
diff --git a/app/javascript/flavours/glitch/features/notifications/components/relationships_severance_event.jsx b/app/javascript/flavours/glitch/features/notifications/components/relationships_severance_event.jsx
index 7c71776ffc0ef2..05cee6aaa14bf8 100644
--- a/app/javascript/flavours/glitch/features/notifications/components/relationships_severance_event.jsx
+++ b/app/javascript/flavours/glitch/features/notifications/components/relationships_severance_event.jsx
@@ -2,60 +2,44 @@ import PropTypes from 'prop-types';
 
 import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
 
-import ImmutablePropTypes from 'react-immutable-proptypes';
+import HeartBrokenIcon from '@/material-icons/400-24px/heart_broken-fill.svg?react';
+import { Icon }  from 'flavours/glitch/components/icon';
+import { domain } from 'flavours/glitch/initial_state';
 
-import { RelativeTimestamp } from 'flavours/glitch/components/relative_timestamp';
-
-// This needs to be kept in sync with app/models/relationship_severance_event.rb
+// This needs to be kept in sync with app/models/relationships_severance_event.rb
 const messages = defineMessages({
-  account_suspension: { id: 'relationship_severance_notification.types.account_suspension', defaultMessage: 'Account has been suspended' },
-  domain_block: { id: 'relationship_severance_notification.types.domain_block', defaultMessage: 'Domain has been suspended' },
-  user_domain_block: { id: 'relationship_severance_notification.types.user_domain_block', defaultMessage: 'You blocked this domain' },
+  account_suspension: { id: 'notification.relationships_severance_event.account_suspension', defaultMessage: 'An admin from {from} has suspended {target}, which means you can no longer receive updates from them or interact with them.' },
+  domain_block: { id: 'notification.relationships_severance_event.domain_block', defaultMessage: 'An admin from {from} has blocked {target}, including {followersCount} of your followers and {followingCount, plural, one {# account} other {# accounts}} you follow.' },
+  user_domain_block: { id: 'notification.relationships_severance_event.user_domain_block', defaultMessage: 'You have blocked {target}, removing {followersCount} of your followers and {followingCount, plural, one {# account} other {# accounts}} you follow.' },
 });
 
-const RelationshipsSeveranceEvent = ({ event, hidden }) => {
+export const RelationshipsSeveranceEvent = ({ type, target, followingCount, followersCount, hidden }) => {
   const intl = useIntl();
 
-  if (hidden || !event) {
+  if (hidden) {
     return null;
   }
 
   return (
-    <div className='notification__report'>
-      <div className='notification__report__details'>
-        <div>
-          <RelativeTimestamp timestamp={event.get('created_at')} short={false} />
-          {' · '}
-          { event.get('purged') ? (
-            <FormattedMessage
-              id='relationship_severance_notification.purged_data'
-              defaultMessage='purged by administrators'
-            />
-          ) : (
-            <FormattedMessage
-              id='relationship_severance_notification.relationships'
-              defaultMessage='{count, plural, one {# relationship} other {# relationships}}'
-              values={{ count: event.get('followers_count', 0) + event.get('following_count', 0) }}
-            />
-          )}
-          <br />
-          <strong>{intl.formatMessage(messages[event.get('type')])}</strong>
-        </div>
-
-        <div className='notification__report__actions'>
-          <a href='/severed_relationships' className='button' target='_blank' rel='noopener noreferrer'>
-            <FormattedMessage id='relationship_severance_notification.view' defaultMessage='View' />
-          </a>
-        </div>
+    <a href='/severed_relationships' target='_blank' rel='noopener noreferrer' className='notification__relationships-severance-event'>
+      <Icon id='heart_broken' icon={HeartBrokenIcon} />
+
+      <div className='notification__relationships-severance-event__content'>
+        <p>{intl.formatMessage(messages[type], { from: <strong>{domain}</strong>, target: <strong>{target}</strong>, followingCount, followersCount })}</p>
+        <span className='link-button'><FormattedMessage id='notification.relationships_severance_event.learn_more' defaultMessage='Learn more' /></span>
       </div>
-    </div>
+    </a>
   );
-
 };
 
 RelationshipsSeveranceEvent.propTypes = {
-  event: ImmutablePropTypes.map.isRequired,
+  type: PropTypes.oneOf([
+    'account_suspension',
+    'domain_block',
+    'user_domain_block',
+  ]).isRequired,
+  target: PropTypes.string.isRequired,
+  followersCount: PropTypes.number.isRequired,
+  followingCount: PropTypes.number.isRequired,
   hidden: PropTypes.bool,
 };
-
-export default RelationshipsSeveranceEvent;
diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index 0b5a3f455bdaf1..5399bace34e0bf 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -2379,6 +2379,44 @@ a.account__display-name {
   }
 }
 
+.notification__relationships-severance-event {
+  display: flex;
+  gap: 16px;
+  color: $secondary-text-color;
+  text-decoration: none;
+  align-items: flex-start;
+  padding: 16px 32px;
+  border-bottom: 1px solid var(--background-border-color);
+
+  &:hover {
+    color: $primary-text-color;
+  }
+
+  .icon {
+    padding: 2px;
+    color: $highlight-text-color;
+  }
+
+  &__content {
+    display: flex;
+    flex-direction: column;
+    align-items: flex-start;
+    gap: 8px;
+    flex-grow: 1;
+    font-size: 16px;
+    line-height: 24px;
+
+    strong {
+      font-weight: 700;
+    }
+
+    .link-button {
+      font-size: inherit;
+      line-height: inherit;
+    }
+  }
+}
+
 .notification__message {
   padding: 8px 14px; // glitch: reduced padding
   padding-bottom: 0;

From fc533cfad3a6801503d3e8b0ead337f9805fe1c4 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 25 Mar 2024 14:39:06 +0100
Subject: [PATCH 0709/2191] [Glitch] Fix background and icon on notification
 requests in web UI

Port 0cea7a623be470c51d7a162265f44f5a3e149275 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../filtered_notifications_banner.jsx         |  3 +-
 .../components/notification_request.jsx       |  4 +--
 .../flavours/glitch/styles/components.scss    | 36 +++++++++++--------
 3 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/app/javascript/flavours/glitch/features/notifications/components/filtered_notifications_banner.jsx b/app/javascript/flavours/glitch/features/notifications/components/filtered_notifications_banner.jsx
index 59496628288476..4239d3d3e5e5e5 100644
--- a/app/javascript/flavours/glitch/features/notifications/components/filtered_notifications_banner.jsx
+++ b/app/javascript/flavours/glitch/features/notifications/components/filtered_notifications_banner.jsx
@@ -41,7 +41,8 @@ export const FilteredNotificationsBanner = () => {
       </div>
 
       <div className='filtered-notifications-banner__badge'>
-        {toCappedNumber(policy.getIn(['summary', 'pending_notifications_count']))}
+        <div className='filtered-notifications-banner__badge__badge'>{toCappedNumber(policy.getIn(['summary', 'pending_notifications_count']))}</div>
+        <FormattedMessage id='filtered_notifications_banner.private_mentions' defaultMessage='{count, plural, one {private mention} other {private mentions}}' values={{ count: policy.getIn(['summary', 'pending_notifications_count']) }} />
       </div>
     </Link>
   );
diff --git a/app/javascript/flavours/glitch/features/notifications/components/notification_request.jsx b/app/javascript/flavours/glitch/features/notifications/components/notification_request.jsx
index 6ba97066ce8eb0..6c9e2980deca42 100644
--- a/app/javascript/flavours/glitch/features/notifications/components/notification_request.jsx
+++ b/app/javascript/flavours/glitch/features/notifications/components/notification_request.jsx
@@ -7,8 +7,8 @@ import { Link } from 'react-router-dom';
 
 import { useSelector, useDispatch } from 'react-redux';
 
+import DeleteIcon from '@/material-icons/400-24px/delete.svg?react';
 import DoneIcon from '@/material-icons/400-24px/done.svg?react';
-import VolumeOffIcon from '@/material-icons/400-24px/volume_off.svg?react';
 import { acceptNotificationRequest, dismissNotificationRequest } from 'flavours/glitch/actions/notifications';
 import { Avatar } from 'flavours/glitch/components/avatar';
 import { IconButton } from 'flavours/glitch/components/icon_button';
@@ -51,7 +51,7 @@ export const NotificationRequest = ({ id, accountId, notificationsCount }) => {
       </Link>
 
       <div className='notification-request__actions'>
-        <IconButton iconComponent={VolumeOffIcon} onClick={handleDismiss} title={intl.formatMessage(messages.dismiss)} />
+        <IconButton iconComponent={DeleteIcon} onClick={handleDismiss} title={intl.formatMessage(messages.dismiss)} />
         <IconButton iconComponent={DoneIcon} onClick={handleAccept} title={intl.formatMessage(messages.accept)} />
       </div>
     </div>
diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index 5399bace34e0bf..4496179d6d4b7a 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -10593,10 +10593,10 @@ noscript {
 .filtered-notifications-banner {
   display: flex;
   align-items: center;
-  background: $ui-base-color;
-  border-bottom: 1px solid lighten($ui-base-color, 8%);
-  padding: 15px;
-  gap: 15px;
+  border: 1px solid var(--background-border-color);
+  border-top: 0;
+  padding: 24px 32px;
+  gap: 16px;
   color: $darker-text-color;
   text-decoration: none;
 
@@ -10604,15 +10604,12 @@ noscript {
   &:active,
   &:focus {
     color: $secondary-text-color;
-
-    .filtered-notifications-banner__badge {
-      background: $secondary-text-color;
-    }
   }
 
   .icon {
     width: 24px;
     height: 24px;
+    padding: 2px;
   }
 
   &__text {
@@ -10628,13 +10625,24 @@ noscript {
   }
 
   &__badge {
-    background: $darker-text-color;
-    color: $ui-base-color;
-    border-radius: 100px;
-    padding: 2px 8px;
+    display: flex;
+    align-items: center;
+    border-radius: 999px;
+    background: var(--background-border-color);
+    color: $darker-text-color;
+    padding: 4px;
+    padding-inline-end: 8px;
+    gap: 6px;
     font-weight: 500;
     font-size: 11px;
     line-height: 16px;
+
+    &__badge {
+      background: $ui-button-background-color;
+      color: $white;
+      border-radius: 100px;
+      padding: 2px 8px;
+    }
   }
 }
 
@@ -10643,7 +10651,7 @@ noscript {
   align-items: center;
   gap: 16px;
   padding: 15px;
-  border-bottom: 1px solid lighten($ui-base-color, 8%);
+  border-bottom: 1px solid var(--background-border-color);
 
   &__link {
     display: flex;
@@ -10691,7 +10699,7 @@ noscript {
 
     .icon-button {
       border-radius: 4px;
-      border: 1px solid lighten($ui-base-color, 8%);
+      border: 1px solid var(--background-border-color);
       padding: 5px;
     }
   }

From 91531e9586026b81cffd89171526d4b359b87602 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 25 Mar 2024 11:29:55 +0100
Subject: [PATCH 0710/2191] [Glitch] Add ability to reorder uploaded media
 before posting in web UI

Port 8e7e86ee354fca36b989b6de40904f38e6db103b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/actions/compose.js        |   7 +
 .../compose/components/compose_form.jsx       |   4 +-
 .../features/compose/components/upload.jsx    | 124 +++++++++---------
 .../compose/components/upload_form.jsx        |  85 +++++++-----
 .../compose/components/upload_progress.jsx    |  67 +++++-----
 .../compose/containers/upload_container.js    |  27 ----
 .../containers/upload_form_container.js       |   9 --
 .../containers/upload_progress_container.js   |  11 --
 .../ui/components/focal_point_modal.jsx       |   2 +-
 .../flavours/glitch/reducers/compose.js       |   9 ++
 10 files changed, 166 insertions(+), 179 deletions(-)
 delete mode 100644 app/javascript/flavours/glitch/features/compose/containers/upload_container.js
 delete mode 100644 app/javascript/flavours/glitch/features/compose/containers/upload_form_container.js
 delete mode 100644 app/javascript/flavours/glitch/features/compose/containers/upload_progress_container.js

diff --git a/app/javascript/flavours/glitch/actions/compose.js b/app/javascript/flavours/glitch/actions/compose.js
index 2646aa7b02471f..1dca94ae680574 100644
--- a/app/javascript/flavours/glitch/actions/compose.js
+++ b/app/javascript/flavours/glitch/actions/compose.js
@@ -81,6 +81,7 @@ export const INIT_MEDIA_EDIT_MODAL = 'INIT_MEDIA_EDIT_MODAL';
 
 export const COMPOSE_CHANGE_MEDIA_DESCRIPTION = 'COMPOSE_CHANGE_MEDIA_DESCRIPTION';
 export const COMPOSE_CHANGE_MEDIA_FOCUS       = 'COMPOSE_CHANGE_MEDIA_FOCUS';
+export const COMPOSE_CHANGE_MEDIA_ORDER       = 'COMPOSE_CHANGE_MEDIA_ORDER';
 
 export const COMPOSE_SET_STATUS = 'COMPOSE_SET_STATUS';
 export const COMPOSE_FOCUS = 'COMPOSE_FOCUS';
@@ -845,3 +846,9 @@ export function changePollSettings(expiresIn, isMultiple) {
     isMultiple,
   };
 }
+
+export const changeMediaOrder = (a, b) => ({
+  type: COMPOSE_CHANGE_MEDIA_ORDER,
+  a,
+  b,
+});
diff --git a/app/javascript/flavours/glitch/features/compose/components/compose_form.jsx b/app/javascript/flavours/glitch/features/compose/components/compose_form.jsx
index a09830d2c6eb84..6f16abfc7f1023 100644
--- a/app/javascript/flavours/glitch/features/compose/components/compose_form.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/compose_form.jsx
@@ -21,7 +21,6 @@ import PollButtonContainer from '../containers/poll_button_container';
 import PrivacyDropdownContainer from '../containers/privacy_dropdown_container';
 import SpoilerButtonContainer from '../containers/spoiler_button_container';
 import UploadButtonContainer from '../containers/upload_button_container';
-import UploadFormContainer from '../containers/upload_form_container';
 import WarningContainer from '../containers/warning_container';
 import { countableText } from '../util/counter';
 
@@ -34,6 +33,7 @@ import { PollForm } from "./poll_form";
 import { ReplyIndicator } from './reply_indicator';
 import { SecondaryPrivacyButton } from './secondary_privacy_button';
 import { ThreadModeButton } from './thread_mode_button';
+import { UploadForm } from './upload_form';
 
 const allowedAroundShortCode = '><\u0085\u0020\u00a0\u1680\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029\u0009\u000a\u000b\u000c\u000d';
 
@@ -308,7 +308,7 @@ class ComposeForm extends ImmutablePureComponent {
             />
           </div>
 
-          <UploadFormContainer />
+          <UploadForm />
           <PollForm />
 
           <div className='compose-form__footer'>
diff --git a/app/javascript/flavours/glitch/features/compose/components/upload.jsx b/app/javascript/flavours/glitch/features/compose/components/upload.jsx
index a6115184e348a7..790d76264d2bdd 100644
--- a/app/javascript/flavours/glitch/features/compose/components/upload.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/upload.jsx
@@ -1,77 +1,81 @@
 import PropTypes from 'prop-types';
+import { useCallback } from 'react';
 
 import { FormattedMessage } from 'react-intl';
 
 import classNames from 'classnames';
 
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import ImmutablePureComponent from 'react-immutable-pure-component';
+import { useDispatch, useSelector } from 'react-redux';
 
 import spring from 'react-motion/lib/spring';
 
 import CloseIcon from '@/material-icons/400-20px/close.svg?react';
 import EditIcon from '@/material-icons/400-24px/edit.svg?react';
 import WarningIcon from '@/material-icons/400-24px/warning.svg?react';
+import { undoUploadCompose, initMediaEditModal } from 'flavours/glitch/actions/compose';
 import { Blurhash } from 'flavours/glitch/components/blurhash';
 import { Icon }  from 'flavours/glitch/components/icon';
+import Motion from 'flavours/glitch/features/ui/util/optional_motion';
 
-import Motion from '../../ui/util/optional_motion';
-
-export default class Upload extends ImmutablePureComponent {
-
-  static propTypes = {
-    media: ImmutablePropTypes.map.isRequired,
-    sensitive: PropTypes.bool,
-    onUndo: PropTypes.func.isRequired,
-    onOpenFocalPoint: PropTypes.func.isRequired,
-  };
-
-  handleUndoClick = e => {
-    e.stopPropagation();
-    this.props.onUndo(this.props.media.get('id'));
-  };
-
-  handleFocalPointClick = e => {
-    e.stopPropagation();
-    this.props.onOpenFocalPoint(this.props.media.get('id'));
-  };
-
-  render () {
-    const { media, sensitive } = this.props;
-
-    if (!media) {
-      return null;
-    }
-
-    const focusX = media.getIn(['meta', 'focus', 'x']);
-    const focusY = media.getIn(['meta', 'focus', 'y']);
-    const x = ((focusX /  2) + .5) * 100;
-    const y = ((focusY / -2) + .5) * 100;
-    const missingDescription = (media.get('description') || '').length === 0;
-
-    return (
-      <div className='compose-form__upload'>
-        <Motion defaultStyle={{ scale: 0.8 }} style={{ scale: spring(1, { stiffness: 180, damping: 12 }) }}>
-          {({ scale }) => (
-            <div className='compose-form__upload__thumbnail' style={{ transform: `scale(${scale})`, backgroundImage: !sensitive ? `url(${media.get('preview_url')})` : null, backgroundPosition: `${x}% ${y}%` }}>
-              {sensitive && <Blurhash
-                hash={media.get('blurhash')}
-                className='compose-form__upload__preview'
-              />}
-
-              <div className='compose-form__upload__actions'>
-                <button type='button' className='icon-button compose-form__upload__delete' onClick={this.handleUndoClick}><Icon icon={CloseIcon} /></button>
-                <button type='button' className='icon-button' onClick={this.handleFocalPointClick}><Icon icon={EditIcon} /> <FormattedMessage id='upload_form.edit' defaultMessage='Edit' /></button>
-              </div>
-
-              <div className='compose-form__upload__warning'>
-                <button type='button' className={classNames('icon-button', { active: missingDescription })} onClick={this.handleFocalPointClick}>{missingDescription && <Icon icon={WarningIcon} />} ALT</button>
-              </div>
-            </div>
-          )}
-        </Motion>
-      </div>
-    );
+export const Upload = ({ id, onDragStart, onDragEnter, onDragEnd }) => {
+  const dispatch = useDispatch();
+  const media = useSelector(state => state.getIn(['compose', 'media_attachments']).find(item => item.get('id') === id));
+  const sensitive = useSelector(state => state.getIn(['compose', 'sensitive']));
+
+  const handleUndoClick = useCallback(() => {
+    dispatch(undoUploadCompose(id));
+  }, [dispatch, id]);
+
+  const handleFocalPointClick = useCallback(() => {
+    dispatch(initMediaEditModal(id));
+  }, [dispatch, id]);
+
+  const handleDragStart = useCallback(() => {
+    onDragStart(id);
+  }, [onDragStart, id]);
+
+  const handleDragEnter = useCallback(() => {
+    onDragEnter(id);
+  }, [onDragEnter, id]);
+
+  if (!media) {
+    return null;
   }
 
-}
+  const focusX = media.getIn(['meta', 'focus', 'x']);
+  const focusY = media.getIn(['meta', 'focus', 'y']);
+  const x = ((focusX /  2) + .5) * 100;
+  const y = ((focusY / -2) + .5) * 100;
+  const missingDescription = (media.get('description') || '').length === 0;
+
+  return (
+    <div className='compose-form__upload' draggable onDragStart={handleDragStart} onDragEnter={handleDragEnter} onDragEnd={onDragEnd}>
+      <Motion defaultStyle={{ scale: 0.8 }} style={{ scale: spring(1, { stiffness: 180, damping: 12 }) }}>
+        {({ scale }) => (
+          <div className='compose-form__upload__thumbnail' style={{ transform: `scale(${scale})`, backgroundImage: !sensitive ? `url(${media.get('preview_url')})` : null, backgroundPosition: `${x}% ${y}%` }}>
+            {sensitive && <Blurhash
+              hash={media.get('blurhash')}
+              className='compose-form__upload__preview'
+            />}
+
+            <div className='compose-form__upload__actions'>
+              <button type='button' className='icon-button compose-form__upload__delete' onClick={handleUndoClick}><Icon icon={CloseIcon} /></button>
+              <button type='button' className='icon-button' onClick={handleFocalPointClick}><Icon icon={EditIcon} /> <FormattedMessage id='upload_form.edit' defaultMessage='Edit' /></button>
+            </div>
+
+            <div className='compose-form__upload__warning'>
+              <button type='button' className={classNames('icon-button', { active: missingDescription })} onClick={handleFocalPointClick}>{missingDescription && <Icon icon={WarningIcon} />} ALT</button>
+            </div>
+          </div>
+        )}
+      </Motion>
+    </div>
+  );
+};
+
+Upload.propTypes = {
+  id: PropTypes.string,
+  onDragEnter: PropTypes.func,
+  onDragStart: PropTypes.func,
+  onDragEnd: PropTypes.func,
+};
diff --git a/app/javascript/flavours/glitch/features/compose/components/upload_form.jsx b/app/javascript/flavours/glitch/features/compose/components/upload_form.jsx
index 5c6406c3bacacc..2b26735f5e1cc5 100644
--- a/app/javascript/flavours/glitch/features/compose/components/upload_form.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/upload_form.jsx
@@ -1,35 +1,56 @@
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import ImmutablePureComponent from 'react-immutable-pure-component';
+import { useRef, useCallback } from 'react';
 
-import UploadContainer from '../containers/upload_container';
-import UploadProgressContainer from '../containers/upload_progress_container';
+import { useSelector, useDispatch } from 'react-redux';
 
-import { SensitiveButton } from './sensitive_button';
-
-export default class UploadForm extends ImmutablePureComponent {
-
-  static propTypes = {
-    mediaIds: ImmutablePropTypes.list.isRequired,
-  };
-
-  render () {
-    const { mediaIds } = this.props;
+import { changeMediaOrder } from 'flavours/glitch/actions/compose';
 
-    return (
-      <>
-        <UploadProgressContainer />
-
-        {mediaIds.size > 0 && (
-          <div className='compose-form__uploads'>
-            {mediaIds.map(id => (
-              <UploadContainer id={id} key={id} />
-            ))}
-          </div>
-        )}
-
-        {!mediaIds.isEmpty() && <SensitiveButton />}
-      </>
-    );
-  }
-
-}
+import { SensitiveButton } from './sensitive_button';
+import { Upload } from './upload';
+import { UploadProgress } from './upload_progress';
+
+export const UploadForm = () => {
+  const dispatch = useDispatch();
+  const mediaIds = useSelector(state => state.getIn(['compose', 'media_attachments']).map(item => item.get('id')));
+  const active = useSelector(state => state.getIn(['compose', 'is_uploading']));
+  const progress = useSelector(state => state.getIn(['compose', 'progress']));
+  const isProcessing = useSelector(state => state.getIn(['compose', 'is_processing']));
+
+  const dragItem = useRef();
+  const dragOverItem = useRef();
+
+  const handleDragStart = useCallback(id => {
+    dragItem.current = id;
+  }, [dragItem]);
+
+  const handleDragEnter = useCallback(id => {
+    dragOverItem.current = id;
+  }, [dragOverItem]);
+
+  const handleDragEnd = useCallback(() => {
+    dispatch(changeMediaOrder(dragItem.current, dragOverItem.current));
+    dragItem.current = null;
+    dragOverItem.current = null;
+  }, [dispatch, dragItem, dragOverItem]);
+
+  return (
+    <>
+      <UploadProgress active={active} progress={progress} isProcessing={isProcessing} />
+
+      {mediaIds.size > 0 && (
+        <div className='compose-form__uploads'>
+          {mediaIds.map(id => (
+            <Upload
+              key={id}
+              id={id}
+              onDragStart={handleDragStart}
+              onDragEnter={handleDragEnter}
+              onDragEnd={handleDragEnd}
+            />
+          ))}
+        </div>
+      )}
+
+      {!mediaIds.isEmpty() && <SensitiveButton />}
+    </>
+  );
+};
diff --git a/app/javascript/flavours/glitch/features/compose/components/upload_progress.jsx b/app/javascript/flavours/glitch/features/compose/components/upload_progress.jsx
index 7af5d9090e795b..f72f2c4603ebac 100644
--- a/app/javascript/flavours/glitch/features/compose/components/upload_progress.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/upload_progress.jsx
@@ -1,5 +1,4 @@
 import PropTypes from 'prop-types';
-import { PureComponent } from 'react';
 
 import { FormattedMessage } from 'react-intl';
 
@@ -10,46 +9,40 @@ import { Icon }  from 'flavours/glitch/components/icon';
 
 import Motion from '../../ui/util/optional_motion';
 
-export default class UploadProgress extends PureComponent {
-
-  static propTypes = {
-    active: PropTypes.bool,
-    progress: PropTypes.number,
-    isProcessing: PropTypes.bool,
-  };
-
-  render () {
-    const { active, progress, isProcessing } = this.props;
-
-    if (!active) {
-      return null;
-    }
+export const UploadProgress = ({ active, progress, isProcessing }) => {
+  if (!active) {
+    return null;
+  }
 
-    let message;
+  let message;
 
-    if (isProcessing) {
-      message = <FormattedMessage id='upload_progress.processing' defaultMessage='Processing…' />;
-    } else {
-      message = <FormattedMessage id='upload_progress.label' defaultMessage='Uploading…' />;
-    }
+  if (isProcessing) {
+    message = <FormattedMessage id='upload_progress.processing' defaultMessage='Processing…' />;
+  } else {
+    message = <FormattedMessage id='upload_progress.label' defaultMessage='Uploading…' />;
+  }
 
-    return (
-      <div className='upload-progress'>
-        <Icon id='upload' icon={UploadFileIcon} />
+  return (
+    <div className='upload-progress'>
+      <Icon id='upload' icon={UploadFileIcon} />
 
-        <div className='upload-progress__message'>
-          {message}
+      <div className='upload-progress__message'>
+        {message}
 
-          <div className='upload-progress__backdrop'>
-            <Motion defaultStyle={{ width: 0 }} style={{ width: spring(progress) }}>
-              {({ width }) =>
-                <div className='upload-progress__tracker' style={{ width: `${width}%` }} />
-              }
-            </Motion>
-          </div>
+        <div className='upload-progress__backdrop'>
+          <Motion defaultStyle={{ width: 0 }} style={{ width: spring(progress) }}>
+            {({ width }) =>
+              <div className='upload-progress__tracker' style={{ width: `${width}%` }} />
+            }
+          </Motion>
         </div>
       </div>
-    );
-  }
-
-}
+    </div>
+  );
+};
+
+UploadProgress.propTypes = {
+  active: PropTypes.bool,
+  progress: PropTypes.number,
+  isProcessing: PropTypes.bool,
+};
diff --git a/app/javascript/flavours/glitch/features/compose/containers/upload_container.js b/app/javascript/flavours/glitch/features/compose/containers/upload_container.js
deleted file mode 100644
index 5afe6eaa1adb01..00000000000000
--- a/app/javascript/flavours/glitch/features/compose/containers/upload_container.js
+++ /dev/null
@@ -1,27 +0,0 @@
-import { connect } from 'react-redux';
-
-import { undoUploadCompose, initMediaEditModal, submitCompose } from '../../../actions/compose';
-import Upload from '../components/upload';
-
-const mapStateToProps = (state, { id }) => ({
-  media: state.getIn(['compose', 'media_attachments']).find(item => item.get('id') === id),
-  sensitive: state.getIn(['compose', 'sensitive']),
-});
-
-const mapDispatchToProps = dispatch => ({
-
-  onUndo: id => {
-    dispatch(undoUploadCompose(id));
-  },
-
-  onOpenFocalPoint: id => {
-    dispatch(initMediaEditModal(id));
-  },
-
-  onSubmit (router) {
-    dispatch(submitCompose(router));
-  },
-
-});
-
-export default connect(mapStateToProps, mapDispatchToProps)(Upload);
diff --git a/app/javascript/flavours/glitch/features/compose/containers/upload_form_container.js b/app/javascript/flavours/glitch/features/compose/containers/upload_form_container.js
deleted file mode 100644
index 336525cf5399d6..00000000000000
--- a/app/javascript/flavours/glitch/features/compose/containers/upload_form_container.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import { connect } from 'react-redux';
-
-import UploadForm from '../components/upload_form';
-
-const mapStateToProps = state => ({
-  mediaIds: state.getIn(['compose', 'media_attachments']).map(item => item.get('id')),
-});
-
-export default connect(mapStateToProps)(UploadForm);
diff --git a/app/javascript/flavours/glitch/features/compose/containers/upload_progress_container.js b/app/javascript/flavours/glitch/features/compose/containers/upload_progress_container.js
deleted file mode 100644
index ffff321c3fcdf1..00000000000000
--- a/app/javascript/flavours/glitch/features/compose/containers/upload_progress_container.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import { connect } from 'react-redux';
-
-import UploadProgress from '../components/upload_progress';
-
-const mapStateToProps = state => ({
-  active: state.getIn(['compose', 'is_uploading']),
-  progress: state.getIn(['compose', 'progress']),
-  isProcessing: state.getIn(['compose', 'is_processing']),
-});
-
-export default connect(mapStateToProps)(UploadProgress);
diff --git a/app/javascript/flavours/glitch/features/ui/components/focal_point_modal.jsx b/app/javascript/flavours/glitch/features/ui/components/focal_point_modal.jsx
index bf31c137f19521..0ee84dd0c220e7 100644
--- a/app/javascript/flavours/glitch/features/ui/components/focal_point_modal.jsx
+++ b/app/javascript/flavours/glitch/features/ui/components/focal_point_modal.jsx
@@ -22,7 +22,7 @@ import { GIFV } from 'flavours/glitch/components/gifv';
 import { IconButton } from 'flavours/glitch/components/icon_button';
 import Audio from 'flavours/glitch/features/audio';
 import { CharacterCounter } from 'flavours/glitch/features/compose/components/character_counter';
-import UploadProgress from 'flavours/glitch/features/compose/components/upload_progress';
+import { UploadProgress } from 'flavours/glitch/features/compose/components/upload_progress';
 import { Tesseract as fetchTesseract } from 'flavours/glitch/features/ui/util/async-components';
 import { me } from 'flavours/glitch/initial_state';
 import { assetHost } from 'flavours/glitch/utils/config';
diff --git a/app/javascript/flavours/glitch/reducers/compose.js b/app/javascript/flavours/glitch/reducers/compose.js
index f96d9e959f16cb..36430e823872d3 100644
--- a/app/javascript/flavours/glitch/reducers/compose.js
+++ b/app/javascript/flavours/glitch/reducers/compose.js
@@ -48,6 +48,7 @@ import {
   INIT_MEDIA_EDIT_MODAL,
   COMPOSE_CHANGE_MEDIA_DESCRIPTION,
   COMPOSE_CHANGE_MEDIA_FOCUS,
+  COMPOSE_CHANGE_MEDIA_ORDER,
   COMPOSE_SET_STATUS,
   COMPOSE_FOCUS,
 } from '../actions/compose';
@@ -656,6 +657,14 @@ export default function compose(state = initialState, action) {
     return state.set('language', action.language);
   case COMPOSE_FOCUS:
     return state.set('focusDate', new Date()).update('text', text => text.length > 0 ? text : action.defaultText);
+  case COMPOSE_CHANGE_MEDIA_ORDER:
+    return state.update('media_attachments', list => {
+      const indexA = list.findIndex(x => x.get('id') === action.a);
+      const moveItem = list.get(indexA);
+      const indexB = list.findIndex(x => x.get('id') === action.b);
+
+      return list.splice(indexA, 1).splice(indexB, 0, moveItem);
+    });
   default:
     return state;
   }

From 79bbb2023da903a72cb8698ff1b6430c6ca4583b Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 8 Apr 2024 10:15:46 +0200
Subject: [PATCH 0711/2191] Update dependency react-intl to v6.6.5 (#29864)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 8d235a7197a90d..86c0c3eeb4661b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -14320,8 +14320,8 @@ __metadata:
   linkType: hard
 
 "react-intl@npm:^6.4.2":
-  version: 6.6.4
-  resolution: "react-intl@npm:6.6.4"
+  version: 6.6.5
+  resolution: "react-intl@npm:6.6.5"
   dependencies:
     "@formatjs/ecma402-abstract": "npm:1.18.2"
     "@formatjs/icu-messageformat-parser": "npm:2.7.6"
@@ -14339,7 +14339,7 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 10c0/bd874ad3a56b0198903c02c878cfa23b5ae9a44d2c74fd4f01ddb602c97a8115de8cebed00b44f7dc5fb3031e5ef0f9cfb4bdabd105b99a785352462deb106d3
+  checksum: 10c0/31f231701af080bc923fdf25ff22ae7ad56bd7892602879fe6fa3de0c6ab95aab10ff86595372be155e0be45a7130a2cca91dbab73e558359cebc1785711ded2
   languageName: node
   linkType: hard
 

From 499b184fcdca2d97999785d77226a6d689987a7e Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 8 Apr 2024 10:16:20 +0200
Subject: [PATCH 0712/2191] Update dependency pino to v8.20.0 (#29865)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 86c0c3eeb4661b..a4ee14835ea159 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -12963,7 +12963,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pino-abstract-transport@npm:^1.0.0, pino-abstract-transport@npm:v1.1.0":
+"pino-abstract-transport@npm:^1.0.0, pino-abstract-transport@npm:^1.1.0":
   version: 1.1.0
   resolution: "pino-abstract-transport@npm:1.1.0"
   dependencies:
@@ -13017,13 +13017,13 @@ __metadata:
   linkType: hard
 
 "pino@npm:^8.17.1, pino@npm:^8.17.2":
-  version: 8.19.0
-  resolution: "pino@npm:8.19.0"
+  version: 8.20.0
+  resolution: "pino@npm:8.20.0"
   dependencies:
     atomic-sleep: "npm:^1.0.0"
     fast-redact: "npm:^3.1.1"
     on-exit-leak-free: "npm:^2.1.0"
-    pino-abstract-transport: "npm:v1.1.0"
+    pino-abstract-transport: "npm:^1.1.0"
     pino-std-serializers: "npm:^6.0.0"
     process-warning: "npm:^3.0.0"
     quick-format-unescaped: "npm:^4.0.3"
@@ -13033,7 +13033,7 @@ __metadata:
     thread-stream: "npm:^2.0.0"
   bin:
     pino: bin.js
-  checksum: 10c0/53e6e9db91e451163e93294b0a7c5c8135742d58909dfc4a6fa1afc155b2b0dc44448ec3d057e08351951f9a3ea67e6ea8e72e952b64a1d889f4d5376cbd1a5d
+  checksum: 10c0/6b973474160e1fa01fa150de0f69b7db9c6c06ae15f992d369669751825c8f2af3bb5600348eaf9be65b4952326bbdfa226f51e425820eb511f0f594fbddbaa7
   languageName: node
   linkType: hard
 

From b06510d579bb1eccccc7e4881f17cac09f9c44a3 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 8 Apr 2024 08:16:36 +0000
Subject: [PATCH 0713/2191] Update DefinitelyTyped types (non-major) (#29874)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index a4ee14835ea159..257a1729bcf692 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3759,11 +3759,11 @@ __metadata:
   linkType: hard
 
 "@types/react-dom@npm:^18.0.0, @types/react-dom@npm:^18.2.4":
-  version: 18.2.23
-  resolution: "@types/react-dom@npm:18.2.23"
+  version: 18.2.24
+  resolution: "@types/react-dom@npm:18.2.24"
   dependencies:
     "@types/react": "npm:*"
-  checksum: 10c0/9348e93558aa67b4b237bd0eab62e72e85f3e17a1c45fde04d874476269730f7c671b3d62390c4fca588da2a026e90cc74148abc349dbfd4ee5535a82ccdf38e
+  checksum: 10c0/9ec38e5ab4727c56ef17bd8e938ead88748ba19db314b8d9807714a5cae430f5b799514667b221b4f2dc8d9b4ca17dd1c3da8c41c083c2de9eddcc31bec6b8ff
   languageName: node
   linkType: hard
 
@@ -3862,12 +3862,12 @@ __metadata:
   linkType: hard
 
 "@types/react@npm:*, @types/react@npm:16 || 17 || 18, @types/react@npm:>=16.9.11, @types/react@npm:^18.2.7":
-  version: 18.2.73
-  resolution: "@types/react@npm:18.2.73"
+  version: 18.2.74
+  resolution: "@types/react@npm:18.2.74"
   dependencies:
     "@types/prop-types": "npm:*"
     csstype: "npm:^3.0.2"
-  checksum: 10c0/b6645ab3c20efa41cfccf58ce0be45419517a0ba4594e323dd400342fb1c1f9589d169cf9bfa85b5b0605e9097fe9de7734b6d0c533f5b9bc32aaadb624537a4
+  checksum: 10c0/347e38b4c5dc20d50ff71bf04b7caaef490e5ff695e74a0088a13fbb2a0c5d125a5ecfd142adfa30f0176da0e2734942c91ba61d95ce269c43b3265bd7379361
   languageName: node
   linkType: hard
 

From 2441fe6fd4863f12d5b9af445a08b36c5f6edb21 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 8 Apr 2024 08:16:57 +0000
Subject: [PATCH 0714/2191] Update dependency stylelint-config-standard-scss to
 v13.1.0 (#29876)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 257a1729bcf692..bb521f1c95f703 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -16389,18 +16389,18 @@ __metadata:
   linkType: hard
 
 "stylelint-config-standard-scss@npm:^13.0.0":
-  version: 13.0.0
-  resolution: "stylelint-config-standard-scss@npm:13.0.0"
+  version: 13.1.0
+  resolution: "stylelint-config-standard-scss@npm:13.1.0"
   dependencies:
     stylelint-config-recommended-scss: "npm:^14.0.0"
     stylelint-config-standard: "npm:^36.0.0"
   peerDependencies:
     postcss: ^8.3.3
-    stylelint: ^16.1.0
+    stylelint: ^16.3.1
   peerDependenciesMeta:
     postcss:
       optional: true
-  checksum: 10c0/4abf317676184f4aaace6ce72b9fc9e2dffe051d43dd5637afc5803b062ea381e2807ae983c045dff22e96af58388a8b1fe9a8bdda9f97bc3660280cf24fb4d3
+  checksum: 10c0/d07cae806ee8b3e77684f019a8b22cc32642373da8053e6ae7ed716f8ddbe6ea1f7323633a6a1bbc9aa08c6a3dceb1dcf053d83fdd10d076b5a01da6e86801ae
   languageName: node
   linkType: hard
 

From a1277a9b2b2a47f274725802ce120a90bfb1bcf0 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 8 Apr 2024 08:17:23 +0000
Subject: [PATCH 0715/2191] Update eslint (non-major) (#29877)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index bb521f1c95f703..49d36702da0365 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7758,8 +7758,8 @@ __metadata:
   linkType: hard
 
 "eslint-plugin-formatjs@npm:^4.10.1":
-  version: 4.12.2
-  resolution: "eslint-plugin-formatjs@npm:4.12.2"
+  version: 4.13.0
+  resolution: "eslint-plugin-formatjs@npm:4.13.0"
   dependencies:
     "@formatjs/icu-messageformat-parser": "npm:2.7.6"
     "@formatjs/ts-transformer": "npm:3.13.12"
@@ -7774,7 +7774,7 @@ __metadata:
     unicode-emoji-utils: "npm:^1.2.0"
   peerDependencies:
     eslint: 7 || 8
-  checksum: 10c0/77cc1a2959903fcb6639d9fec89e7dfc55cf1e4ea58fca7d3bd6d12fa540aa173cbf5f90fc629b6aaf2ea3b8e61ed0a3cfce940fd2bec6f0796353315e2dbeef
+  checksum: 10c0/3dbe4ffd3e72d4ce5b14afdcf6dd5db889dd09cb15bc875f29bcc5b49295e0ae4a3eb672ed89ed33f22aacbfe655151398ca4307fd0610508e568a6e4db50aa8
   languageName: node
   linkType: hard
 
@@ -7806,8 +7806,8 @@ __metadata:
   linkType: hard
 
 "eslint-plugin-jsdoc@npm:^48.0.0":
-  version: 48.2.2
-  resolution: "eslint-plugin-jsdoc@npm:48.2.2"
+  version: 48.2.3
+  resolution: "eslint-plugin-jsdoc@npm:48.2.3"
   dependencies:
     "@es-joy/jsdoccomment": "npm:~0.42.0"
     are-docs-informative: "npm:^0.0.2"
@@ -7820,7 +7820,7 @@ __metadata:
     spdx-expression-parse: "npm:^4.0.0"
   peerDependencies:
     eslint: ^7.0.0 || ^8.0.0 || ^9.0.0
-  checksum: 10c0/d6911e73d36757de5aef127e795116fbbcdef504f7e91d9c0863faf0b1693271d96188f0f1d54c0d74c56652bfa3fb4f1aa1a2f0876b0c6a5e57a874bcb3ac2b
+  checksum: 10c0/e755923d96118890c6fd28b1c2298e1fe67ccbce08060ffc091b29ced59d0058ad8820323c56eef6f85c2954c783fc4076e78c0e5bc64838ae099b4e62ea702e
   languageName: node
   linkType: hard
 

From 730e2127e1fa0e81952bb83d91cede91d8b47b72 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Mon, 8 Apr 2024 10:17:51 +0200
Subject: [PATCH 0716/2191] Fix webpack warnings due to unhandled extensions
 (`LICENCE` and `README.md`) (#29869)

---
 app/javascript/mastodon/common.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/common.js b/app/javascript/mastodon/common.js
index 0ec8449343e290..511568aa0f748a 100644
--- a/app/javascript/mastodon/common.js
+++ b/app/javascript/mastodon/common.js
@@ -2,7 +2,7 @@ import Rails from '@rails/ujs';
 import 'font-awesome/css/font-awesome.css';
 
 export function start() {
-  require.context('../images/', true);
+  require.context('../images/', true, /\.(jpg|png|svg)$/);
 
   try {
     Rails.start();

From 13faf26315f9ee7b03326fe8dfdf979d2a06191d Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 8 Apr 2024 15:44:54 +0200
Subject: [PATCH 0717/2191] New Crowdin Translations (automated) (#29859)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/ar.json | 18 ++++++++++++++++++
 app/javascript/mastodon/locales/bg.json |  1 +
 app/javascript/mastodon/locales/de.json |  2 +-
 app/javascript/mastodon/locales/gd.json | 12 ++++++++++--
 app/javascript/mastodon/locales/ja.json |  5 +++++
 app/javascript/mastodon/locales/lt.json |  1 +
 config/locales/ar.yml                   | 16 ++++++++++++++++
 config/locales/devise.es.yml            |  4 ++--
 config/locales/devise.lt.yml            |  8 ++++----
 config/locales/doorkeeper.lt.yml        | 12 ++++++------
 config/locales/doorkeeper.sr.yml        |  4 ++--
 config/locales/gd.yml                   |  1 +
 config/locales/ja.yml                   |  1 +
 config/locales/lt.yml                   |  5 +++--
 config/locales/simple_form.ko.yml       |  2 +-
 config/locales/sr-Latn.yml              |  2 +-
 config/locales/sr.yml                   | 18 +++++++++---------
 config/locales/sv.yml                   | 12 ++++++++++++
 18 files changed, 94 insertions(+), 30 deletions(-)

diff --git a/app/javascript/mastodon/locales/ar.json b/app/javascript/mastodon/locales/ar.json
index a231e5e21dd5f7..dd13f10aa3467f 100644
--- a/app/javascript/mastodon/locales/ar.json
+++ b/app/javascript/mastodon/locales/ar.json
@@ -92,6 +92,11 @@
   "block_modal.remote_users_caveat": "Do t’i kërkojmë shërbyesit {domain} të respektojë vendimin tuaj. Por, pajtimi s’është i garantuar, ngaqë disa shërbyes mund t’i trajtojnë ndryshe bllokimet. Psotimet publike mundet të jenë ende të dukshme për përdorues pa bërë hyrje në llogari.",
   "block_modal.show_less": "اعرض أقلّ",
   "block_modal.show_more": "أظهر المزيد",
+  "block_modal.they_cant_mention": "لن يستطيع ذِكرك أو متابعتك.",
+  "block_modal.they_cant_see_posts": "لن يستطيع رؤية منشوراتك ولن ترى منشوراته.",
+  "block_modal.they_will_know": "يمكنه أن يرى أنه قد تم حجبه.",
+  "block_modal.title": "أتريد حظر المستخدم؟",
+  "block_modal.you_wont_see_mentions": "لن تر المنشورات التي يُشار فيهم إليه.",
   "boost_modal.combo": "يُمكنك الضّغط على {combo} لتخطي هذا في المرة المُقبلة",
   "bundle_column_error.copy_stacktrace": "انسخ تقرير الخطأ",
   "bundle_column_error.error.body": "لا يمكن تقديم الصفحة المطلوبة. قد يكون بسبب خطأ في التعليمات البرمجية، أو مشكلة توافق المتصفح.",
@@ -172,6 +177,7 @@
   "confirmations.delete_list.message": "هل أنتَ مُتأكدٌ أنكَ تُريدُ حَذفَ هذِهِ القائمة بشكلٍ دائم؟",
   "confirmations.discard_edit_media.confirm": "تجاهل",
   "confirmations.discard_edit_media.message": "لديك تغييرات غير محفوظة لوصف الوسائط أو معاينتها، أتريد تجاهلها على أي حال؟",
+  "confirmations.domain_block.confirm": "حظر الخادم",
   "confirmations.domain_block.message": "متأكد من أنك تود حظر اسم النطاق {domain} بالكامل ؟ في غالب الأحيان يُستَحسَن كتم أو حظر بعض الحسابات بدلا من حظر نطاق بالكامل.\nلن تتمكن مِن رؤية محتوى هذا النطاق لا على خيوطك العمومية و لا في إشعاراتك. سوف يتم كذلك إزالة كافة متابعيك المنتمين إلى هذا النطاق.",
   "confirmations.edit.confirm": "تعديل",
   "confirmations.edit.message": "التعديل في الحين سوف يُعيد كتابة الرسالة التي أنت بصدد تحريرها. متأكد من أنك تريد المواصلة؟",
@@ -203,6 +209,16 @@
   "dismissable_banner.explore_statuses": "هذه هي المنشورات الرائجة على الشبكات الاجتماعيّة اليوم. تظهر المنشورات المعاد نشرها والحائزة على مفضّلات أكثر في مرتبة عليا.",
   "dismissable_banner.explore_tags": "هذه هي الوسوم تكتسب جذب الاهتمام حاليًا على الويب الاجتماعي. الوسوم التي يستخدمها مختلف الناس تحتل مرتبة عليا.",
   "dismissable_banner.public_timeline": "هذه هي أحدث المنشورات العامة من الناس على الشبكة الاجتماعية التي يتبعها الناس على {domain}.",
+  "domain_block_modal.block": "حظر الخادم",
+  "domain_block_modal.block_account_instead": "أحجب @{name} بدلاً من ذلك",
+  "domain_block_modal.they_can_interact_with_old_posts": "يمكن للأشخاص من هذا الخادم التفاعل مع منشوراتك القديمة.",
+  "domain_block_modal.they_cant_follow": "لا أحد من هذا الخادم يمكنه متابعتك.",
+  "domain_block_modal.they_wont_know": "لن يَعرف أنه قد تم حظره.",
+  "domain_block_modal.title": "أتريد حظر النطاق؟",
+  "domain_block_modal.you_will_lose_followers": "سيتم إزالة جميع متابعيك من هذا الخادم.",
+  "domain_block_modal.you_wont_see_posts": "لن ترى منشورات أو إشعارات من المستخدمين على هذا الخادم.",
+  "domain_pill.activitypub_lets_connect": "يتيح لك التواصل والتفاعل مع الناس ليس فقط على ماستدون، ولكن عبر تطبيقات اجتماعية مختلفة أيضا.",
+  "domain_pill.activitypub_like_language": "إنّ ActivityPub مثل لغة ماستدون التي يتحدث بها مع شبكات اجتماعية أخرى.",
   "domain_pill.server": "الخادِم",
   "domain_pill.their_handle": "مُعرِّفُه:",
   "domain_pill.their_server": "بيتهم الرقمي، حيث تُستضاف كافة منشوراتهم.",
@@ -276,6 +292,7 @@
   "filter_modal.select_filter.subtitle": "استخدم فئة موجودة أو قم بإنشاء فئة جديدة",
   "filter_modal.select_filter.title": "تصفية هذا المنشور",
   "filter_modal.title.status": "تصفية منشور",
+  "filtered_notifications_banner.title": "الإشعارات المصفاة",
   "firehose.all": "الكل",
   "firehose.local": "هذا الخادم",
   "firehose.remote": "خوادم أخرى",
@@ -666,6 +683,7 @@
   "status.direct": "إشارة خاصة لـ @{name}",
   "status.direct_indicator": "إشارة خاصة",
   "status.edit": "تعديل",
+  "status.edited": "آخر تعديل يوم {date}",
   "status.edited_x_times": "عُدّل {count, plural, zero {} one {مرةً واحدة} two {مرّتان} few {{count} مرات} many {{count} مرة} other {{count} مرة}}",
   "status.embed": "إدماج",
   "status.favourite": "فضّل",
diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json
index 910d6cb06eb06f..2acedbc4d1f539 100644
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@@ -298,6 +298,7 @@
   "filter_modal.select_filter.title": "Филтриране на публ.",
   "filter_modal.title.status": "Филтриране на публ.",
   "filtered_notifications_banner.pending_requests": "Известията от {count, plural, =0 {никого, когото може да познавате} one {едно лице, което може да познавате} other {# души, които може да познавате}}",
+  "filtered_notifications_banner.private_mentions": "{count, plural, one {частно споменаване} other {частни споменавания}}",
   "filtered_notifications_banner.title": "Филтрирани известия",
   "firehose.all": "Всичко",
   "firehose.local": "Този сървър",
diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json
index b1d0b3ec14a5fc..5a5acb383586f8 100644
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@@ -85,7 +85,7 @@
   "alert.rate_limited.message": "Bitte versuche es nach {retry_time, time, medium} erneut.",
   "alert.rate_limited.title": "Anfragelimit überschritten",
   "alert.unexpected.message": "Ein unerwarteter Fehler ist aufgetreten.",
-  "alert.unexpected.title": "Ups!",
+  "alert.unexpected.title": "Oha!",
   "announcement.announcement": "Ankündigung",
   "attachments_list.unprocessed": "(ausstehend)",
   "audio.hide": "Audio ausblenden",
diff --git a/app/javascript/mastodon/locales/gd.json b/app/javascript/mastodon/locales/gd.json
index d835a46863cb68..4aaa0cbf74821c 100644
--- a/app/javascript/mastodon/locales/gd.json
+++ b/app/javascript/mastodon/locales/gd.json
@@ -12,7 +12,7 @@
   "about.powered_by": "Lìonra sòisealta sgaoilte le cumhachd {mastodon}",
   "about.rules": "Riaghailtean an fhrithealaiche",
   "account.account_note_header": "Nòta",
-  "account.add_or_remove_from_list": "Cuir ris no thoir air falbh o na liostaichean",
+  "account.add_or_remove_from_list": "Cuir ris no thoir air falbh o liostaichean",
   "account.badges.bot": "Fèin-obrachail",
   "account.badges.group": "Buidheann",
   "account.block": "Bac @{name}",
@@ -298,6 +298,7 @@
   "filter_modal.select_filter.title": "Criathraich am post seo",
   "filter_modal.title.status": "Criathraich post",
   "filtered_notifications_banner.pending_requests": "{count, plural, =0 {Chan eil brath ann o dhaoine} one {Tha brathan ann o # neach} two {Tha brathan ann o # neach} few {Tha brathan ann o # daoine} other {Tha brathan ann o # duine}} air a bheil thu eòlach ’s dòcha",
+  "filtered_notifications_banner.private_mentions": "{count, plural, one {iomradh prìobhaideach} two {iomradh prìobhaideach} few {iomraidhean prìobhaideach} other {iomradh prìobhaideach}}",
   "filtered_notifications_banner.title": "Brathan criathraichte",
   "firehose.all": "Na h-uile",
   "firehose.local": "Am frithealaiche seo",
@@ -471,6 +472,11 @@
   "notification.own_poll": "Thàinig an cunntas-bheachd agad gu crìoch",
   "notification.poll": "Thàinig cunntas-bheachd sa bhòt thu gu crìoch",
   "notification.reblog": "Bhrosnaich {name} am post agad",
+  "notification.relationships_severance_event": "Chaill thu dàimhean le {name}",
+  "notification.relationships_severance_event.account_suspension": "Chuir rianaire aig {from} {target} à rèim agus is ciall dha sin nach fhaigh thu naidheachdan uapa ’s nach urrainn dhut conaltradh leotha.",
+  "notification.relationships_severance_event.domain_block": "Bhac rianaire aig {from} {target}, a’ gabhail a-staigh {followersCount} dhen luchd-leantainn agad agus {followingCount, plural, one {# chunntas} two {# chunntas} few {# cunntasan} other {# cunntas}} a tha thu fhèin a’ leantainn.",
+  "notification.relationships_severance_event.learn_more": "Barrachd fiosrachaidh",
+  "notification.relationships_severance_event.user_domain_block": "Bhac thu {target} agus thug sin air falbh {followersCount} dhen luchd-leantainn agad agus {followingCount, plural, one {# chunntas} two {# chunntas} few {# cunntasan} other {# cunntas}} a tha thu fhèin a’ leantainn.",
   "notification.status": "Phostaich {name} rud",
   "notification.update": "Dheasaich {name} post",
   "notification_requests.accept": "Gabh ris",
@@ -483,6 +489,8 @@
   "notifications.column_settings.admin.sign_up": "Clàraidhean ùra:",
   "notifications.column_settings.alert": "Brathan deasga",
   "notifications.column_settings.favourite": "Annsachdan:",
+  "notifications.column_settings.filter_bar.advanced": "Seall a h-uile roinn-seòrsa",
+  "notifications.column_settings.filter_bar.category": "Bàr-criathraidh luath",
   "notifications.column_settings.follow": "Luchd-leantainn ùr:",
   "notifications.column_settings.follow_request": "Iarrtasan leantainn ùra:",
   "notifications.column_settings.mention": "Iomraidhean:",
@@ -508,7 +516,7 @@
   "notifications.permission_denied": "Chan eil brathan deasga ri fhaighinn on a chaidh iarrtas ceadan a’ bhrabhsair a dhiùltadh cheana",
   "notifications.permission_denied_alert": "Cha ghabh brathan deasga a chur an comas on a chaidh iarrtas ceadan a’ bhrabhsair a dhiùltadh cheana",
   "notifications.permission_required": "Chan eil brathan deasga ri fhaighinn on nach deach an cead riatanach a thoirt seachad.",
-  "notifications.policy.filter_new_accounts.hint": "Chaidh a chruthachadh o chionn {days, plural, one {# latha} two {# latha} few {# làithean} other {# latha}}",
+  "notifications.policy.filter_new_accounts.hint": "A chaidh a chruthachadh o chionn {days, plural, one {# latha} two {# latha} few {# làithean} other {# latha}}",
   "notifications.policy.filter_new_accounts_title": "Cunntasan ùra",
   "notifications.policy.filter_not_followers_hint": "A’ gabhail a-staigh an fheadhainn a lean ort nas lugha na {days, plural, one {# latha} two {# latha} few {# làithean} other {# latha}} seo chaidh",
   "notifications.policy.filter_not_followers_title": "Daoine nach eil gad leantainn",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index 3bf89fedca4c05..16e7e6c4480294 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -471,6 +471,11 @@
   "notification.own_poll": "アンケートが終了しました",
   "notification.poll": "アンケートが終了しました",
   "notification.reblog": "{name}さんがあなたの投稿をブーストしました",
+  "notification.relationships_severance_event": "{name} との関係が失われました",
+  "notification.relationships_severance_event.account_suspension": "{from} の管理者が {target} さんを停止したため、今後このユーザーとの交流や新しい投稿の受け取りができなくなりました。",
+  "notification.relationships_severance_event.domain_block": "{from} の管理者が {target} をブロックしました。これにより{followersCount}フォロワーと{followingCount, plural, other {#フォロー}}が失われました。",
+  "notification.relationships_severance_event.learn_more": "詳細を確認",
+  "notification.relationships_severance_event.user_domain_block": "{target} のブロックにより{followersCount}フォロワーと{followingCount, plural, other {#フォロー}}が解除されました。",
   "notification.status": "{name}さんが投稿しました",
   "notification.update": "{name}さんが投稿を編集しました",
   "notification_requests.accept": "受け入れる",
diff --git a/app/javascript/mastodon/locales/lt.json b/app/javascript/mastodon/locales/lt.json
index b43af3c0aa8496..0d416be2aaeb9b 100644
--- a/app/javascript/mastodon/locales/lt.json
+++ b/app/javascript/mastodon/locales/lt.json
@@ -279,6 +279,7 @@
   "filter_modal.select_filter.subtitle": "Naudok esamą kategoriją arba sukurk naują.",
   "filter_modal.select_filter.title": "Filtruoti šį įrašą",
   "filter_modal.title.status": "Filtruoti įrašą",
+  "filtered_notifications_banner.private_mentions": "{count, plural, one {privatus paminėjimas} few {privatūs paminėjimai} many {privataus paminėjimo} other {privačių paminėjimų}}",
   "firehose.all": "Visi",
   "firehose.local": "Šis serveris",
   "firehose.remote": "Kiti serveriai",
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 9043e23b992083..93a0720b8a51f5 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -1751,13 +1751,17 @@ ar:
     import: استيراد
     import_and_export: استيراد وتصدير
     migrate: تهجير الحساب
+    notifications: إشعارات البريد الإلكتروني
     preferences: التفضيلات
     profile: الملف التعريفي
     relationships: المتابِعون والمتابَعون
+    severed_relationships: العلاقات المنفصلة
     statuses_cleanup: الحذف الآلي للمنشورات
     strikes: عقوبات الإشراف
     two_factor_authentication: المُصادقة بخُطوَتَيْن
     webauthn_authentication: مفاتيح الأمان
+  severed_relationships:
+    download: تنزيل (%{count})
   statuses:
     attached:
       audio:
@@ -1875,6 +1879,7 @@ ar:
     contrast: ماستدون (تباين عالٍ)
     default: ماستدون (داكن)
     mastodon-light: ماستدون (فاتح)
+    system: تلقائي (استخدم سمة النظام)
   time:
     formats:
       default: "%b %d, %Y, %H:%M"
@@ -1973,8 +1978,19 @@ ar:
       edit_profile_title: قم بتخصيص ملفك التعريفي
       explanation: ها هي بعض النصائح قبل بداية الاستخدام
       feature_action: اعرف المزيد
+      feature_audience_title: اِبنوا جُمهورَكم بِثِقَة
+      feature_control: أنتم الأدرى بالمحتوى الذي تريدون أن تطالعوه في فيض المنشورات الرئيس. لا خوارزميات تتحكم فيما يظهر لكم ولا إعلانات تضيع وقتكم. بحساب واحد تمكنكم متابعة من تشاؤون على أيّ خادوم ماستدون، وتلقّى منشوراتهم بترتيبها الزمني، لتصنعوا ركنكم الأليف في الإنترنت.
+      feature_control_title: تحكَّموا في فيض المنشورات الخاص بكم
+      feature_creativity: ماستدون يدعم المشاركات الصوتية والفيديو والصورة، وصوفات الوصولية، واستطلاعات الرأي، وتحذيرات المحتوى، والصور الرمزية المتحركة، ورموز الإيموجي المطوّعة، والتحكم في قص مصغّرات الصور، والمزيد، لأجل مساعدتكم على التعبير عن أنفسكم عبر الإنترنت. فسواء كنتم تنشرون فنونكم البصرية أو الموسيقية أو البودكاستات، فستجدون ماستدون مفيدًا.
+      feature_creativity_title: إبداعٌ بلا نظير
+      feature_moderation: ماستدون يُرجع القرار لكم، حيث يضع كل خادوم قواعده ولوائحه الخاصة لإدارة المحتوى ومجتمع المشاركين، وهي تُطبّق محليا، ليس من أعلى إلى أسفل مثل منصات التواصل الاجتماعي التجارية. هذا يجعلها أكثر مرونة في الاستجابة لاحتياجات مختلف فئات الناس. انضم إلى خادوم يُطبّق القواعد التي توافق عليها، وإلا فشغّلوا خادومكم بأنفسكم.
+      feature_moderation_title: الإشرَافُ كما يَنبغي أن يكون
       follow_action: تابِع
+      follow_step: إن متابعة الأشخاص المثيرين للاهتمام هي غاية ماستدون.
+      follow_title: أضفِ طابعا شخصيا على موجزات خيطك الرئيس
+      follows_subtitle: اتبع الحسابات المشهورة
       follows_title: مَن عليك متابعته
+      follows_view_more: متابعة المزيد من الأشخاص
       hashtags_title: الوسوم الرائجة
       hashtags_view_more: عرض المزيد من الوسوم الرائجة
       post_action: إنشاء
diff --git a/config/locales/devise.es.yml b/config/locales/devise.es.yml
index 0d8fc0ac67dcbe..0fc329e0b60ea5 100644
--- a/config/locales/devise.es.yml
+++ b/config/locales/devise.es.yml
@@ -32,8 +32,8 @@ es:
         subject: 'Mastodon: Correo electrónico cambiado'
         title: Nueva dirección de correo electrónico
       password_change:
-        explanation: La contraseña de su cuenta a sido cambiada.
-        extra: Si usted no a cambiado su contraseña. es probable que alguien a conseguido acceso a su cuenta. Por favor cambie su contraseña inmediatamente o contacte a el administrador de la instancia si usted esta bloqueado de su cuenta.
+        explanation: La contraseña de su cuenta ha sido cambiada.
+        extra: Si usted no ha cambiado su contraseña, es probable que alguien a conseguido acceso a su cuenta. Por favor cambie su contraseña inmediatamente o contacte al administrador de la instancia si usted está bloqueado de su cuenta.
         subject: 'Mastodon: Contraseña cambiada'
         title: Contraseña cambiada
       reconfirmation_instructions:
diff --git a/config/locales/devise.lt.yml b/config/locales/devise.lt.yml
index 548894cca0748c..ec5b852727c87a 100644
--- a/config/locales/devise.lt.yml
+++ b/config/locales/devise.lt.yml
@@ -54,9 +54,9 @@ lt:
         title: 2FA išjungta
       two_factor_enabled:
         explanation: Prisijungiant reikės susietos TOTP programėlės sugeneruoto priegos rakto.
-        subject: 'Mastodon: dviejų tapatybės patikrinimas įgalintas'
+        subject: 'Mastodon: dviejų tapatybės patvirtinimas įjungtas'
         subtitle: Tavo paskyrai įjungtas dviejų tapatybės patikrinimas.
-        title: 2FA įgalinta
+        title: 2FA įjungta
       two_factor_recovery_codes_changed:
         explanation: Ankstesnieji atkūrimo kodai yra negaliojantys ir sugeneruojami nauji.
         subject: 'Mastodon: dviejų tapatybės atkūrimo kodai iš naujo sugeneruoti'
@@ -81,8 +81,8 @@ lt:
       webauthn_enabled:
         explanation: Tavo paskyrai įjungtas saugumo rakto tapatybės nustatymas.
         extra: Tavo saugumo raktą dabar galima naudoti prisijungimui.
-        subject: 'Mastodon: saugumo rakto tapatybės nustatymas įgalintas'
-        title: Saugumo raktai įgalinti
+        subject: 'Mastodon: saugumo rakto tapatybės nustatymas įjungtas'
+        title: Saugumo raktai įjungti
     omniauth_callbacks:
       failure: Nepavyko nustatyti tapatybės iš %{kind}, nes „%{reason}“.
       success: Sėkmingai nustatyta tapatybė iš %{kind} paskyros.
diff --git a/config/locales/doorkeeper.lt.yml b/config/locales/doorkeeper.lt.yml
index 1012160f62a2ce..6f63e0309d5058 100644
--- a/config/locales/doorkeeper.lt.yml
+++ b/config/locales/doorkeeper.lt.yml
@@ -19,7 +19,7 @@ lt:
   doorkeeper:
     applications:
       buttons:
-        authorize: Įgalinti
+        authorize: Leisti
         cancel: Atšaukti
         destroy: Sunaikinti
         edit: Redaguoti
@@ -55,14 +55,14 @@ lt:
         title: 'Programėlė: %{name}'
     authorizations:
       buttons:
-        authorize: Įgalinti
+        authorize: Leisti
         deny: Atmesti
       error:
         title: Įvyko klaida.
       new:
-        prompt_html: "%{client_name} norėtų gauti leidimą prieigos prie tavo paskyros. Tai trečiosios šalies programėlė. <strong>Jei ja nepasitiki, neturėtum jai leisti.</strong>"
+        prompt_html: "%{client_name} norėtų gauti leidimą prieigos prie tavo paskyros. Tai trečiosios šalies programėlė. <strong>Jei ja nepasitiki, neturėtum leisti.</strong>"
         review_permissions: Peržiūrėti leidimus
-        title: Reikalingas įgaliojimas
+        title: Reikalingas leidimas
       show:
         title: Nukopijuok šį įgaliojimo kodą ir įklijuok jį į programėlę.
     authorized_applications:
@@ -77,7 +77,7 @@ lt:
         never_used: Niekada nenaudotas
         scopes: Leidimai
         superapp: Vidinis
-        title: Tavo įgaliotos programėlės
+        title: Tavo leidžiamos programėlės
     errors:
       messages:
         access_denied: Išteklių savininkas (-ė) arba įgaliojimų serveris atmetė užklausą.
@@ -145,7 +145,7 @@ lt:
           applications: Programėlės
           oauth2_provider: OAuth2 teikėjas
       application:
-        title: Reikalingas OAuth įgaliojimas
+        title: Reikalingas OAuth leidimas
     scopes:
       admin:read: skaityti visus serveryje esančius duomenis
       admin:read:accounts: skaityti neskelbtiną visų paskyrų informaciją
diff --git a/config/locales/doorkeeper.sr.yml b/config/locales/doorkeeper.sr.yml
index a0439d606086bd..010eb23eb585c5 100644
--- a/config/locales/doorkeeper.sr.yml
+++ b/config/locales/doorkeeper.sr.yml
@@ -22,12 +22,12 @@ sr:
         authorize: Ауторизуј
         cancel: Поништи
         destroy: Уништи
-        edit: Измени
+        edit: Уреди
         submit: Пошаљи
       confirmations:
         destroy: Да ли сте сигурни?
       edit:
-        title: Измени апликацију
+        title: Уреди апликацију
       form:
         error: Опс! Проверите формулар за евентуалне грешке
       help:
diff --git a/config/locales/gd.yml b/config/locales/gd.yml
index 11402d3f56e484..70bace05cf43a2 100644
--- a/config/locales/gd.yml
+++ b/config/locales/gd.yml
@@ -1832,6 +1832,7 @@ gd:
     contrast: Mastodon (iomsgaradh àrd)
     default: Mastodon (dorcha)
     mastodon-light: Mastodon (soilleir)
+    system: Fèin-obrachail (cleachd ùrlar an t-siostaim)
   time:
     formats:
       default: "%d %b %Y, %H:%M"
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index b7c6813a745d77..0d585131ed7272 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -1723,6 +1723,7 @@ ja:
     contrast: Mastodon (ハイコントラスト)
     default: Mastodon (ダーク)
     mastodon-light: Mastodon (ライト)
+    system: 自動 (システムのテーマを使用)
   time:
     formats:
       default: "%Y年%m月%d日 %H:%M"
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 832d9e9db4a2d0..9664a4ab57b56c 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -410,9 +410,9 @@ lt:
           silence: Riboti
           suspend: Pristabdyti
         title: Naujos domeno blokas
-      reject_media: Atmesti medijos failai
+      reject_media: Atmesti medijos failus
       reject_media_hint: Panaikina lokaliai saugomus medijos failus bei atsisako jų parsisiuntimo ateityje. Neliečia užblokavimu
-      reject_reports: Atmesti skundai
+      reject_reports: Atmesti ataskaitas
       reject_reports_hint: Ignoruoti visus skundus, kurie siunčiami iš šio domeno. Neliečia užblokavimu
       undo: Atkurti domeno bloką
     email_domain_blocks:
@@ -799,6 +799,7 @@ lt:
     contrast: Mastodon (Didelio Kontrasto)
     default: Mastodon (Tamsus)
     mastodon-light: Mastodon (Šviesus)
+    system: Automatinis (naudoti sistemos temą)
   two_factor_authentication:
     disable: Išjungti
     enabled: Dviejų veiksnių autentikacija įjungta
diff --git a/config/locales/simple_form.ko.yml b/config/locales/simple_form.ko.yml
index 627d96df022f16..790bcd061be15d 100644
--- a/config/locales/simple_form.ko.yml
+++ b/config/locales/simple_form.ko.yml
@@ -295,7 +295,7 @@ ko:
         software_updates:
           all: 모든 업데이트에 대해 알림
           critical: 긴급 업데이트에 대해서만 알림
-          label: 새 마스토돈 버전이 사용 가능합니다
+          label: 새 마스토돈 버전이 있을 때
           none: 업데이트에 대해 알리지 않기 (비추천)
           patch: 버그픽스 업데이트에 대해 알림
         trending_tag: 검토해야 할 새 유행
diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml
index 4f10fe8649a197..8b876b8a140cf4 100644
--- a/config/locales/sr-Latn.yml
+++ b/config/locales/sr-Latn.yml
@@ -1396,7 +1396,7 @@ sr-Latn:
       '43200': 12 sati
       '604800': 1 nedelja
       '86400': 1 dan
-    expires_in_prompt: Nikad
+    expires_in_prompt: Nikada
     generate: Generiši
     invalid: Ova pozivnica nije važeća
     invited_by: 'Pozvao Vas je:'
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 382f196bd0beeb..faed5854fbbe78 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -65,7 +65,7 @@ sr:
       disabled: Замрзнут
       display_name: Име за приказ
       domain: Домен
-      edit: Измени
+      edit: Уреди
       email: Е-пошта
       email_status: Статус е-поште
       enable: Омогући
@@ -402,7 +402,7 @@ sr:
       created_msg: Блокирање домена се обрађује
       destroyed_msg: Блокирање домена је опозвано
       domain: Домен
-      edit: Измени блок домена
+      edit: Уреди блок домена
       existing_domain_block: Већ сте успоставили строжа ограничења према кориснику %{name}.
       existing_domain_block_html: Већ сте успоставили строжа ограничења према %{name}, потребно је да га прво <a href="%{unblock_url}">одблокирате</a>.
       export: Извоз
@@ -690,7 +690,7 @@ sr:
         special: Посебно
       delete: Избриши
       description_html: Помоћу <strong>корисничких улога</strong> можете да подесите којим функцијама и деловима Mastodon-а ваши корисници могу да приступе.
-      edit: Измени улогу '%{name}'
+      edit: Уреди улогу '%{name}
       everyone: Подразумевана овлашћења
       everyone_full_description_html: Ово је <strong>основна улога</strong> која се односи на <strong>све кориснике</strong>, чак и оне којима није додељена улога. Све друге улоге наслеђују овлашћења од основне улоге.
       permissions_count:
@@ -970,7 +970,7 @@ sr:
       description_html: "<strong>Webhook</strong> омогућава Mastodon-у да вашој апликацији испоручује <strong>обавештења у реалном времену</strong> о одабраним догађајима, тако да ваша апликација може да <strong>aутоматски изазове реакцију</strong>."
       disable: Онемогући
       disabled: Онемогућено
-      edit: Измени крајњу тачку
+      edit: Уреди крајњу тачку
       empty: Још увек немате ниједну конфигурисану webhook крајњу тачку.
       enable: Омогући
       enabled: Активно
@@ -1267,7 +1267,7 @@ sr:
       keywords: Кључне речи
       statuses: Засебне објаве
       statuses_hint_html: Овај филтер важи за одабране засебне објаве без обзира на то да ли садрже кључне речи наведене испод. <a href="%{path}">Прегледајте или уклоните објаве из филтера</a>.
-      title: Измени филтер
+      title: Уреди филтер
     errors:
       deprecated_api_multiple_keywords: Ови параметри не могу бити промењени у овој апликацији зато што се односе на више од једне кључне речи. Користите ажурнију апликацију или веб интерфејс.
       invalid_context: Ниједан или неважећи контекст испоручен
@@ -1396,7 +1396,7 @@ sr:
       '43200': 12 сати
       '604800': 1 недеља
       '86400': 1 дан
-    expires_in_prompt: Никад
+    expires_in_prompt: Никада
     generate: Генериши
     invalid: Ова позивница није важећа
     invited_by: 'Позвао Вас је:'
@@ -1516,7 +1516,7 @@ sr:
     status:
       subject: "%{name} jе управо поставио/-ла објаву"
     update:
-      subject: "%{name} је изменио/-ла објаву"
+      subject: "%{name} је уредио/-ла објаву"
   notifications:
     administration_emails: Обавештења е-поштом од администратора
     email_events: Догађаји за обавештења е-поштом
@@ -1707,7 +1707,7 @@ sr:
       few: 'садржи забрањене хеш ознаке: %{tags}'
       one: 'садржи забрањену хеш ознаку: %{tags}'
       other: 'садржи забрањене хеш ознаке: %{tags}'
-    edited_at_html: Измењено %{date}
+    edited_at_html: Уређено %{date}
     errors:
       in_reply_not_found: Објава на коју покушавате да одговорите наизглед не постоји.
     open_in_web: Отвори у вебу
@@ -1798,7 +1798,7 @@ sr:
     add: Додај
     disable: Искључи
     disabled_success: Двофакторска аутентификација је успешно онемогућена
-    edit: Измени
+    edit: Уреди
     enabled: Двофакторска идентификација је укључена
     enabled_success: Двофакторска идентификација је успешно укључена
     generate_recovery_codes: Генериши кодове за опоравак
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 02c4b8c55b0f51..d078cf720073ab 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -597,6 +597,9 @@ sv:
       actions_description_html: Välj vilken åtgärd som skall vidtas för att lösa denna rapport. Om du vidtar en bestraffningsåtgärd mot det rapporterade kontot kommer en e-postnotis att skickas till dem, förutom om du valt kategorin <strong>Skräppost</strong>.
       actions_description_remote_html: Bestäm vilka åtgärder som ska vidtas för att lösa denna rapport. Detta kommer bara att påverka hur <strong>din</strong> server kommunicerar med detta fjärrkonto och hanterar dess innehåll.
       add_to_report: Lägg till mer i rapporten
+      already_suspended_badges:
+        local: Redan avstängd på denna server
+        remote: Redan avstängd på deras server
       are_you_sure: Är du säker?
       assign_to_self: Tilldela till mig
       assigned: Tilldelad moderator
@@ -1656,12 +1659,21 @@ sv:
     preferences: Inställningar
     profile: Profil
     relationships: Följer och följare
+    severed_relationships: Avbrutna relationer
     statuses_cleanup: Automatisk radering av inlägg
     strikes: Modereringsprickar
     two_factor_authentication: Tvåfaktorsautentisering
     webauthn_authentication: Säkerhetsnycklar
   severed_relationships:
+    download: Hämta (%{count})
+    event_type:
+      account_suspension: Kontoavstängning (%{target_name})
+      domain_block: Serveravstängning (%{target_name})
+      user_domain_block: Du blockerade %{target_name}
+    lost_followers: Förlorade följare
     lost_follows: Förlorade följare
+    preamble: Du kan förlora följer och följare när du blockerar en domän eller när din moderator väljer att stänga av en fjärrserver. När det händer kommer du kunna hämta listor över avbrutna relationer som kan inspekteras och eventuellt importeras på en annan server.
+    purged: Information om denna server har rensats av din servers administratörer.
     type: Händelse
   statuses:
     attached:

From f3430eebbb3256a9037827d5e6c3d6c9013e8b43 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 8 Apr 2024 15:45:25 +0200
Subject: [PATCH 0718/2191] Fix hashtag string interpolation in welcome email
 (#29879)

---
 app/views/application/mailer/_hashtag.html.haml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/views/application/mailer/_hashtag.html.haml b/app/views/application/mailer/_hashtag.html.haml
index 74a00e67e13834..b740ba31b99437 100644
--- a/app/views/application/mailer/_hashtag.html.haml
+++ b/app/views/application/mailer/_hashtag.html.haml
@@ -17,4 +17,5 @@
                           %span.email-mini-hashtag-img-span
                             = image_tag full_asset_url(account.avatar.url), alt: '', width: 16, height: 16
                       %td
-                        %p= t('user_mailer.welcome.hashtags_recent_count', people: number_with_delimiter(hashtag.history.aggregate(2.days.ago.to_date..Time.zone.today).accounts))
+                        - people = hashtag.history.aggregate(2.days.ago.to_date..Time.zone.today).accounts
+                        %p= t('user_mailer.welcome.hashtags_recent_count', people: number_with_delimiter(people), count: people)

From babbf6017d3f00e730f2c1e28542b3af3967acde Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 8 Apr 2024 15:46:13 +0200
Subject: [PATCH 0719/2191] Remove caching in `cache_collection` (#29862)

---
 app/controllers/concerns/cache_concern.rb     | 22 ++++--------
 app/models/concerns/cacheable.rb              |  4 +++
 app/models/feed.rb                            |  2 +-
 app/models/public_feed.rb                     |  2 +-
 app/models/status.rb                          | 32 -----------------
 app/models/tag_feed.rb                        |  2 +-
 .../application_controller_spec.rb            | 35 -------------------
 spec/models/home_feed_spec.rb                 |  1 -
 8 files changed, 14 insertions(+), 86 deletions(-)

diff --git a/app/controllers/concerns/cache_concern.rb b/app/controllers/concerns/cache_concern.rb
index 62f763fe2f28f0..4656539f85ee23 100644
--- a/app/controllers/concerns/cache_concern.rb
+++ b/app/controllers/concerns/cache_concern.rb
@@ -46,27 +46,19 @@ def render_with_cache(**options)
     end
   end
 
+  # TODO: Rename this method, as it does not perform any caching anymore.
   def cache_collection(raw, klass)
-    return raw unless klass.respond_to?(:with_includes)
+    return raw unless klass.respond_to?(:preload_cacheable_associations)
 
-    raw = raw.cache_ids.to_a if raw.is_a?(ActiveRecord::Relation)
-    return [] if raw.empty?
+    records = raw.to_a
 
-    cached_keys_with_value = Rails.cache.read_multi(*raw).transform_keys(&:id)
+    klass.preload_cacheable_associations(records)
 
-    uncached_ids = raw.map(&:id) - cached_keys_with_value.keys
-
-    klass.reload_stale_associations!(cached_keys_with_value.values) if klass.respond_to?(:reload_stale_associations!)
-
-    unless uncached_ids.empty?
-      uncached = klass.where(id: uncached_ids).with_includes.index_by(&:id)
-      Rails.cache.write_multi(uncached.values.to_h { |i| [i, i] })
-    end
-
-    raw.filter_map { |item| cached_keys_with_value[item.id] || uncached[item.id] }
+    records
   end
 
+  # TODO: Rename this method, as it does not perform any caching anymore.
   def cache_collection_paginated_by_id(raw, klass, limit, options)
-    cache_collection raw.cache_ids.to_a_paginated_by_id(limit, options), klass
+    cache_collection raw.to_a_paginated_by_id(limit, options), klass
   end
 end
diff --git a/app/models/concerns/cacheable.rb b/app/models/concerns/cacheable.rb
index d7524cdfd011b0..0633f20c779681 100644
--- a/app/models/concerns/cacheable.rb
+++ b/app/models/concerns/cacheable.rb
@@ -14,6 +14,10 @@ def with_includes
       includes(@cache_associated)
     end
 
+    def preload_cacheable_associations(records)
+      ActiveRecord::Associations::Preloader.new(records: records, associations: @cache_associated).call
+    end
+
     def cache_ids
       select(:id, :updated_at)
     end
diff --git a/app/models/feed.rb b/app/models/feed.rb
index d9cab2cd1e558f..27e12809947882 100644
--- a/app/models/feed.rb
+++ b/app/models/feed.rb
@@ -28,7 +28,7 @@ def from_redis(limit, max_id, since_id, min_id)
       unhydrated = redis.zrangebyscore(key, "(#{min_id}", "(#{max_id}", limit: [0, limit], with_scores: true).map { |id| id.first.to_i }
     end
 
-    Status.where(id: unhydrated).cache_ids
+    Status.where(id: unhydrated)
   end
 
   def key
diff --git a/app/models/public_feed.rb b/app/models/public_feed.rb
index 1e2cca4d383832..ba9473db0ba201 100644
--- a/app/models/public_feed.rb
+++ b/app/models/public_feed.rb
@@ -29,7 +29,7 @@ def get(limit, max_id = nil, since_id = nil, min_id = nil)
     scope.merge!(media_only_scope) if media_only?
     scope.merge!(language_scope) if account&.chosen_languages.present?
 
-    scope.cache_ids.to_a_paginated_by_id(limit, max_id: max_id, since_id: since_id, min_id: min_id)
+    scope.to_a_paginated_by_id(limit, max_id: max_id, since_id: since_id, min_id: min_id)
   end
 
   private
diff --git a/app/models/status.rb b/app/models/status.rb
index ae53513ee64f51..78186623c32e5b 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -346,38 +346,6 @@ def pins_map(status_ids, account_id)
       StatusPin.select('status_id').where(status_id: status_ids).where(account_id: account_id).each_with_object({}) { |p, h| h[p.status_id] = true }
     end
 
-    def reload_stale_associations!(cached_items)
-      account_ids = []
-
-      cached_items.each do |item|
-        account_ids << item.account_id
-        account_ids << item.reblog.account_id if item.reblog?
-      end
-
-      account_ids.uniq!
-
-      status_ids = cached_items.map { |item| item.reblog? ? item.reblog_of_id : item.id }.uniq
-
-      return if account_ids.empty?
-
-      accounts = Account.where(id: account_ids).includes(:account_stat, :user).index_by(&:id)
-
-      status_stats = StatusStat.where(status_id: status_ids).index_by(&:status_id)
-
-      cached_items.each do |item|
-        item.account = accounts[item.account_id]
-        item.reblog.account = accounts[item.reblog.account_id] if item.reblog?
-
-        if item.reblog?
-          status_stat = status_stats[item.reblog.id]
-          item.reblog.status_stat = status_stat if status_stat.present?
-        else
-          status_stat = status_stats[item.id]
-          item.status_stat = status_stat if status_stat.present?
-        end
-      end
-    end
-
     def from_text(text)
       return [] if text.blank?
 
diff --git a/app/models/tag_feed.rb b/app/models/tag_feed.rb
index b8cd63557e56f7..6b5831d246cdc0 100644
--- a/app/models/tag_feed.rb
+++ b/app/models/tag_feed.rb
@@ -33,7 +33,7 @@ def get(limit, max_id = nil, since_id = nil, min_id = nil)
     scope.merge!(account_filters_scope) if account?
     scope.merge!(media_only_scope) if media_only?
 
-    scope.cache_ids.to_a_paginated_by_id(limit, max_id: max_id, since_id: since_id, min_id: min_id)
+    scope.to_a_paginated_by_id(limit, max_id: max_id, since_id: since_id, min_id: min_id)
   end
 
   private
diff --git a/spec/controllers/application_controller_spec.rb b/spec/controllers/application_controller_spec.rb
index a309e933ee4c82..f595e8ca19e6dc 100644
--- a/spec/controllers/application_controller_spec.rb
+++ b/spec/controllers/application_controller_spec.rb
@@ -218,39 +218,4 @@ def route_unprocessable_entity
 
     include_examples 'respond_with_error', 422
   end
-
-  describe 'cache_collection' do
-    subject do
-      Class.new(ApplicationController) do
-        public :cache_collection
-      end
-    end
-
-    shared_examples 'receives :with_includes' do |fabricator, klass|
-      it 'uses raw if it is not an ActiveRecord::Relation' do
-        record = Fabricate(fabricator)
-        expect(subject.new.cache_collection([record], klass)).to eq [record]
-      end
-    end
-
-    shared_examples 'cacheable' do |fabricator, klass|
-      include_examples 'receives :with_includes', fabricator, klass
-
-      it 'calls cache_ids of raw if it is an ActiveRecord::Relation' do
-        record = Fabricate(fabricator)
-        relation = klass.none
-        allow(relation).to receive(:cache_ids).and_return([record])
-        expect(subject.new.cache_collection(relation, klass)).to eq [record]
-      end
-    end
-
-    it 'returns raw unless class responds to :with_includes' do
-      raw = Object.new
-      expect(subject.new.cache_collection(raw, Object)).to eq raw
-    end
-
-    context 'with a Status' do
-      include_examples 'cacheable', :status, Status
-    end
-  end
 end
diff --git a/spec/models/home_feed_spec.rb b/spec/models/home_feed_spec.rb
index bd649d82693ce0..06bb63b1a42be8 100644
--- a/spec/models/home_feed_spec.rb
+++ b/spec/models/home_feed_spec.rb
@@ -27,7 +27,6 @@
         results = subject.get(3)
 
         expect(results.map(&:id)).to eq [3, 2]
-        expect(results.first.attributes.keys).to eq %w(id updated_at)
       end
     end
 

From 285f63c02ed34c5faa99c08713fa77fbf8ed4318 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 8 Apr 2024 09:53:49 -0400
Subject: [PATCH 0720/2191] Use composable query in `User.active` scope
 (#29775)

---
 app/lib/feed_manager.rb                     |  2 +-
 app/lib/vacuum/feeds_vacuum.rb              |  2 +-
 app/models/concerns/account/interactions.rb |  4 +-
 app/models/user.rb                          |  6 ++-
 spec/models/user_spec.rb                    | 42 ++++++++++++++++++---
 5 files changed, 45 insertions(+), 11 deletions(-)

diff --git a/app/lib/feed_manager.rb b/app/lib/feed_manager.rb
index bf6e6db598dc6b..9ddc54c169c932 100644
--- a/app/lib/feed_manager.rb
+++ b/app/lib/feed_manager.rb
@@ -18,7 +18,7 @@ class FeedManager
   # @yield [Account]
   # @return [void]
   def with_active_accounts(&block)
-    Account.joins(:user).where('users.current_sign_in_at > ?', User::ACTIVE_DURATION.ago).find_each(&block)
+    Account.joins(:user).merge(User.signed_in_recently).find_each(&block)
   end
 
   # Redis key of a feed
diff --git a/app/lib/vacuum/feeds_vacuum.rb b/app/lib/vacuum/feeds_vacuum.rb
index fb0b8a8472911a..4292157601925f 100644
--- a/app/lib/vacuum/feeds_vacuum.rb
+++ b/app/lib/vacuum/feeds_vacuum.rb
@@ -21,7 +21,7 @@ def vacuum_inactive_list_feeds!
   end
 
   def inactive_users
-    User.confirmed.inactive
+    User.confirmed.not_signed_in_recently
   end
 
   def inactive_users_lists
diff --git a/app/models/concerns/account/interactions.rb b/app/models/concerns/account/interactions.rb
index a32697b66eb830..536afba17faf3b 100644
--- a/app/models/concerns/account/interactions.rb
+++ b/app/models/concerns/account/interactions.rb
@@ -255,13 +255,13 @@ def status_matches_filters(status)
   def followers_for_local_distribution
     followers.local
              .joins(:user)
-             .where('users.current_sign_in_at > ?', User::ACTIVE_DURATION.ago)
+             .merge(User.signed_in_recently)
   end
 
   def lists_for_local_distribution
     scope = lists.joins(account: :user)
     scope.where.not(list_accounts: { follow_id: nil }).or(scope.where(account_id: id))
-         .where('users.current_sign_in_at > ?', User::ACTIVE_DURATION.ago)
+         .merge(User.signed_in_recently)
   end
 
   def remote_followers_hash(url)
diff --git a/app/models/user.rb b/app/models/user.rb
index c62a6d0de1c465..584120cf2eb1b6 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -109,14 +109,16 @@ class User < ApplicationRecord
   validates :confirm_password, absence: true, on: :create
   validate :validate_role_elevation
 
+  scope :account_not_suspended, -> { joins(:account).merge(Account.without_suspended) }
   scope :recent, -> { order(id: :desc) }
   scope :pending, -> { where(approved: false) }
   scope :approved, -> { where(approved: true) }
   scope :confirmed, -> { where.not(confirmed_at: nil) }
   scope :enabled, -> { where(disabled: false) }
   scope :disabled, -> { where(disabled: true) }
-  scope :inactive, -> { where(arel_table[:current_sign_in_at].lt(ACTIVE_DURATION.ago)) }
-  scope :active, -> { confirmed.where(arel_table[:current_sign_in_at].gteq(ACTIVE_DURATION.ago)).joins(:account).where(accounts: { suspended_at: nil }) }
+  scope :active, -> { confirmed.signed_in_recently.account_not_suspended }
+  scope :signed_in_recently, -> { where(current_sign_in_at: ACTIVE_DURATION.ago..) }
+  scope :not_signed_in_recently, -> { where(current_sign_in_at: ...ACTIVE_DURATION.ago) }
   scope :matches_email, ->(value) { where(arel_table[:email].matches("#{value}%")) }
   scope :matches_ip, ->(value) { left_joins(:ips).where('user_ips.ip <<= ?', value).group('users.id') }
 
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 2a07263069944d..714d595dc12764 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -107,12 +107,36 @@
       end
     end
 
-    describe 'inactive' do
-      it 'returns a relation of inactive users' do
-        specified = Fabricate(:user, current_sign_in_at: 15.days.ago)
-        Fabricate(:user, current_sign_in_at: 6.days.ago)
+    describe 'signed_in_recently' do
+      it 'returns a relation of users who have signed in during the recent period' do
+        recent_sign_in_user = Fabricate(:user, current_sign_in_at: within_duration_window_days.ago)
+        Fabricate(:user, current_sign_in_at: exceed_duration_window_days.ago)
 
-        expect(described_class.inactive).to contain_exactly(specified)
+        expect(described_class.signed_in_recently)
+          .to contain_exactly(recent_sign_in_user)
+      end
+    end
+
+    describe 'not_signed_in_recently' do
+      it 'returns a relation of users who have not signed in during the recent period' do
+        no_recent_sign_in_user = Fabricate(:user, current_sign_in_at: exceed_duration_window_days.ago)
+        Fabricate(:user, current_sign_in_at: within_duration_window_days.ago)
+
+        expect(described_class.not_signed_in_recently)
+          .to contain_exactly(no_recent_sign_in_user)
+      end
+    end
+
+    describe 'account_not_suspended' do
+      it 'returns with linked accounts that are not suspended' do
+        suspended_account = Fabricate(:account, suspended_at: 10.days.ago)
+        non_suspended_account = Fabricate(:account, suspended_at: nil)
+        suspended_user = Fabricate(:user, account: suspended_account)
+        non_suspended_user = Fabricate(:user, account: non_suspended_account)
+
+        expect(described_class.account_not_suspended)
+          .to include(non_suspended_user)
+          .and not_include(suspended_user)
       end
     end
 
@@ -137,6 +161,14 @@
         expect(described_class.matches_ip('2160:2160::/32')).to contain_exactly(user1)
       end
     end
+
+    def exceed_duration_window_days
+      described_class::ACTIVE_DURATION + 2.days
+    end
+
+    def within_duration_window_days
+      described_class::ACTIVE_DURATION - 2.days
+    end
   end
 
   describe 'blacklist' do

From b8dca8d22a7b8d41b6512ac4174152ae5115788c Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 8 Apr 2024 16:08:32 +0200
Subject: [PATCH 0721/2191] Update dependency typescript to v5.4.4 (#29875)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 49d36702da0365..c4efdb4ad7ad84 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -17083,22 +17083,22 @@ __metadata:
   linkType: hard
 
 "typescript@npm:5, typescript@npm:^5.0.4":
-  version: 5.4.3
-  resolution: "typescript@npm:5.4.3"
+  version: 5.4.4
+  resolution: "typescript@npm:5.4.4"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
-  checksum: 10c0/22443a8760c3668e256c0b34b6b45c359ef6cecc10c42558806177a7d500ab1a7d7aac1f976d712e26989ddf6731d2fbdd3212b7c73290a45127c1c43ba2005a
+  checksum: 10c0/4d8de0291204ed61ca97ad0cba2ce064e09c4988ca1c451c787e4653ba76296ba35177a52694e8a00cf4ef899d0ee83338663b926d8b7d55167ff0ba81549999
   languageName: node
   linkType: hard
 
 "typescript@patch:typescript@npm%3A5#optional!builtin<compat/typescript>, typescript@patch:typescript@npm%3A^5.0.4#optional!builtin<compat/typescript>":
-  version: 5.4.3
-  resolution: "typescript@patch:typescript@npm%3A5.4.3#optional!builtin<compat/typescript>::version=5.4.3&hash=5adc0c"
+  version: 5.4.4
+  resolution: "typescript@patch:typescript@npm%3A5.4.4#optional!builtin<compat/typescript>::version=5.4.4&hash=5adc0c"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
-  checksum: 10c0/6e51f8b7e6ec55b897b9e56b67e864fe8f44e30f4a14357aad5dc0f7432db2f01efc0522df0b6c36d361c51f2dc3dcac5c832efd96a404cfabf884e915d38828
+  checksum: 10c0/1fa41b9964a9ff0ed913b339c90b46031b2d2da3cb1a192af516610733f7f1d5f7f9754a8e22b9ac7076d3d8aedd2c4f84db3f113bad060eac3a95962443a1bf
   languageName: node
   linkType: hard
 

From 4948a063d20c94cf9eb6dc60c2c30898cb05f4c1 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 10 Apr 2024 05:20:21 -0400
Subject: [PATCH 0722/2191] Use `tt` extension for form scaffold template
 (#29676)

---
 .haml-lint.yml                                                   | 1 -
 .../haml/scaffold/{_form.html.haml => _form.html.haml.tt}        | 0
 2 files changed, 1 deletion(-)
 rename lib/templates/haml/scaffold/{_form.html.haml => _form.html.haml.tt} (100%)

diff --git a/.haml-lint.yml b/.haml-lint.yml
index e493afb85f4adc..74d243a3ad63f9 100644
--- a/.haml-lint.yml
+++ b/.haml-lint.yml
@@ -1,6 +1,5 @@
 exclude:
   - 'vendor/**/*'
-  - lib/templates/haml/scaffold/_form.html.haml
 
 require:
   - ./lib/linter/haml_middle_dot.rb
diff --git a/lib/templates/haml/scaffold/_form.html.haml b/lib/templates/haml/scaffold/_form.html.haml.tt
similarity index 100%
rename from lib/templates/haml/scaffold/_form.html.haml
rename to lib/templates/haml/scaffold/_form.html.haml.tt

From b57ee5cf5ba312b6e5f5df9208be8e2b02e13242 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 10 Apr 2024 08:46:39 -0400
Subject: [PATCH 0723/2191] Fix `Style/MapIntoArray` cop in context helper
 (#29885)

---
 app/helpers/context_helper.rb | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/helpers/context_helper.rb b/app/helpers/context_helper.rb
index 2d7a4f98fdcc25..cbefe0fe538908 100644
--- a/app/helpers/context_helper.rb
+++ b/app/helpers/context_helper.rb
@@ -48,13 +48,11 @@ def full_context
   end
 
   def serialized_context(named_contexts_map, context_extensions_map)
-    context_array = []
-
     named_contexts     = named_contexts_map.keys
     context_extensions = context_extensions_map.keys
 
-    named_contexts.each do |key|
-      context_array << NAMED_CONTEXT_MAP[key]
+    context_array = named_contexts.map do |key|
+      NAMED_CONTEXT_MAP[key]
     end
 
     extensions = context_extensions.each_with_object({}) do |key, h|

From 45650156159ad2e71ac5cf04c8b780455ca90deb Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 10 Apr 2024 08:46:43 -0400
Subject: [PATCH 0724/2191] Fix `Style/MapIntoArray` cop in cli progress helper
 (#29884)

---
 lib/mastodon/cli/progress_helper.rb | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/lib/mastodon/cli/progress_helper.rb b/lib/mastodon/cli/progress_helper.rb
index 4fcc47a7f74b2f..f22492afcf45b8 100644
--- a/lib/mastodon/cli/progress_helper.rb
+++ b/lib/mastodon/cli/progress_helper.rb
@@ -35,10 +35,8 @@ def parallelize_with_progress(scope)
       aggregate = Concurrent::AtomicFixnum.new(0)
 
       scope.reorder(nil).find_in_batches do |items|
-        futures = []
-
-        items.each do |item|
-          futures << Concurrent::Future.execute(executor: pool) do
+        futures = items.map do |item|
+          Concurrent::Future.execute(executor: pool) do
             if !progress.total.nil? && progress.progress + 1 > progress.total
               # The number of items has changed between start and now,
               # since there is no good way to predict the final count from

From db5a5636d97aa754ac7cc1fb4cd974ff9d953335 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 10 Apr 2024 15:03:40 +0200
Subject: [PATCH 0725/2191] New Crowdin Translations (automated) (#29888)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/ca.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index 37990cdb2ebeaf..6f0dd93760c53d 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -705,7 +705,7 @@
   "status.edited_x_times": "Editat {count, plural, one {{count} vegada} other {{count} vegades}}",
   "status.embed": "Incrusta",
   "status.favourite": "Favorit",
-  "status.favourites": "{count, plural, one {# favorit} other {# favorits}}",
+  "status.favourites": "{count, plural, one {favorit} other {favorits}}",
   "status.filter": "Filtra aquest tut",
   "status.filtered": "Filtrada",
   "status.hide": "Amaga el tut",
@@ -726,7 +726,7 @@
   "status.reblog": "Impulsa",
   "status.reblog_private": "Impulsa amb la visibilitat original",
   "status.reblogged_by": "impulsat per {name}",
-  "status.reblogs": "{count, plural, one {# impuls} other {# impulsos}}",
+  "status.reblogs": "{count, plural, one {impuls} other {impulsos}}",
   "status.reblogs.empty": "Encara no ha impulsat ningú aquest tut. Quan algú ho faci, apareixerà aquí.",
   "status.redraft": "Esborra i reescriu",
   "status.remove_bookmark": "Elimina el marcador",

From 96bdeeed0eeaed2c06c9e5c59049a35171ff798a Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 11 Apr 2024 10:50:34 +0200
Subject: [PATCH 0726/2191] Update dependency nokogiri to v1.16.4 (#29900)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 3508ad8d543334..af80af306d44b6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -456,7 +456,7 @@ GEM
     net-smtp (0.4.0.1)
       net-protocol
     nio4r (2.7.1)
-    nokogiri (1.16.3)
+    nokogiri (1.16.4)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     nsa (0.3.0)

From 576554b19bea0f95d110be0df779bf220d9f5b0b Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 11 Apr 2024 04:59:01 -0400
Subject: [PATCH 0727/2191] Use fabrication sequence in domain values (#29895)

---
 spec/fabricators/preview_card_provider_fabricator.rb | 2 +-
 spec/fabricators/unavailable_domain_fabricator.rb    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/fabricators/preview_card_provider_fabricator.rb b/spec/fabricators/preview_card_provider_fabricator.rb
index 78db710003d477..3a027623f7a669 100644
--- a/spec/fabricators/preview_card_provider_fabricator.rb
+++ b/spec/fabricators/preview_card_provider_fabricator.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 Fabricator(:preview_card_provider) do
-  domain { Faker::Internet.domain_name }
+  domain { sequence(:domain) { |i| "#{i}#{Faker::Internet.domain_name}" } }
 end
diff --git a/spec/fabricators/unavailable_domain_fabricator.rb b/spec/fabricators/unavailable_domain_fabricator.rb
index cb9707020ae04e..88e605c36e5e4e 100644
--- a/spec/fabricators/unavailable_domain_fabricator.rb
+++ b/spec/fabricators/unavailable_domain_fabricator.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 Fabricator(:unavailable_domain) do
-  domain { Faker::Internet.domain_name }
+  domain { sequence(:domain) { |i| "#{i}#{Faker::Internet.domain_name}" } }
 end

From 4826c1da8ab2ede258ec0e5913fd7523eec7a607 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 11 Apr 2024 11:00:15 +0200
Subject: [PATCH 0728/2191] Update dependency devise to v4.9.4 (#29890)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index af80af306d44b6..3de5ab5c7caec5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -198,7 +198,7 @@ GEM
       irb (~> 1.10)
       reline (>= 0.3.8)
     debug_inspector (1.2.0)
-    devise (4.9.3)
+    devise (4.9.4)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0)
@@ -607,7 +607,7 @@ GEM
     redlock (1.3.2)
       redis (>= 3.0.0, < 6.0)
     regexp_parser (2.9.0)
-    reline (0.5.0)
+    reline (0.5.1)
       io-console (~> 0.5)
     request_store (1.5.1)
       rack (>= 1.4)

From 20b1e55f24a87868d661fc7b033bbbbd48b1a918 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 11 Apr 2024 12:30:31 +0200
Subject: [PATCH 0729/2191] New Crowdin Translations (automated) (#29903)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/it.json |  2 +-
 app/javascript/mastodon/locales/tt.json |  6 +++---
 config/locales/tt.yml                   | 18 +++++++++---------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json
index fd12ee298b956c..4679d834101b91 100644
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@@ -83,7 +83,7 @@
   "admin.impact_report.instance_follows": "I seguaci che i loro utenti perderebbero",
   "admin.impact_report.title": "Riepilogo dell'impatto",
   "alert.rate_limited.message": "Sei pregato di riprovare dopo le {retry_time, time, medium}.",
-  "alert.rate_limited.title": "Tasso limitato",
+  "alert.rate_limited.title": "Limitazione per eccesso di richieste",
   "alert.unexpected.message": "Si è verificato un errore imprevisto.",
   "alert.unexpected.title": "Oops!",
   "announcement.announcement": "Annuncio",
diff --git a/app/javascript/mastodon/locales/tt.json b/app/javascript/mastodon/locales/tt.json
index 82d45205c2143f..9a402472d9136e 100644
--- a/app/javascript/mastodon/locales/tt.json
+++ b/app/javascript/mastodon/locales/tt.json
@@ -449,9 +449,9 @@
   "time_remaining.seconds": "{number, plural, one {# секунд} other {# секунд}} калды",
   "timeline_hint.resources.statuses": "Older toots",
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {# days}}",
-  "units.short.billion": "{count}Млрд",
-  "units.short.million": "{count}Млн",
-  "units.short.thousand": "{count}М",
+  "units.short.billion": "{count} млрд",
+  "units.short.million": "{count} млн",
+  "units.short.thousand": "{count} мең",
   "upload_form.audio_description": "Describe for people with hearing loss",
   "upload_form.description": "Describe for the visually impaired",
   "upload_form.edit": "Үзгәртү",
diff --git a/config/locales/tt.yml b/config/locales/tt.yml
index c1a22a4ca8c354..82bb18c9ae6052 100644
--- a/config/locales/tt.yml
+++ b/config/locales/tt.yml
@@ -6,7 +6,7 @@ tt:
   accounts:
     follow: Языл
     followers:
-      other: Язылучы
+      other: язылучы
     following: Язылгансыз
     posts:
       other: Язма
@@ -137,14 +137,14 @@ tt:
       new_users: яңа кулланучылар
       software: Программа тәэминаты
       title: Идарә аслыгы
-      website: Вебсайт
+      website: Веб-сайт
     domain_allows:
-      export: Экспортлау
-      import: Импортлау
+      export: Экспорт
+      import: Импорт
     domain_blocks:
       domain: Домен
-      export: Экспортлау
-      import: Импортлау
+      export: Экспорт
+      import: Импорт
       new:
         severity:
           noop: Бернинди дә
@@ -438,8 +438,8 @@ tt:
       decimal_units:
         format: "%n %u"
         units:
-          billion: Млрд
-          million: Млн
+          billion: млрд
+          million: млн
           quadrillion: Квадрлн
           thousand: Мең
           trillion: Трлн
@@ -455,7 +455,7 @@ tt:
   preferences:
     other: Башка
   privacy_policy:
-    title: Хосусыйлык Сәясәте
+    title: Хосусыйлык сәясәте
   relationships:
     dormant: Актив түгел
     followers: Язылучылар

From 3e02b6063a8d1d93c422949a6eafeea4debe991c Mon Sep 17 00:00:00 2001
From: Jeremy Kescher <jeremy@kescher.at>
Date: Thu, 11 Apr 2024 21:52:10 +0200
Subject: [PATCH 0730/2191] Bump Catstodon revision to 1.1.2

---
 lib/mastodon/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index f36c06a0b3b64d..a859bc2666d903 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -25,7 +25,7 @@ def prerelease
     end
 
     def catstodon_revision
-      '1.1.1'
+      '1.1.2'
     end
 
     def build_metadata

From 44216ccce1c89888425c641bf827a928ba4328b1 Mon Sep 17 00:00:00 2001
From: Jeremy Kescher <jeremy@kescher.at>
Date: Thu, 11 Apr 2024 21:53:57 +0200
Subject: [PATCH 0731/2191] Add changelog for v4.3.0-alpha.3+glitch+cat+1.1.2

---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b64c0dea0a77c4..cfdd0955b0cded 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 All changes to Catstodon that aren't Mastodon or glitch-soc Mastodon changes will be documented here.
 
+## [v4.3.0-alpha.3+glitch+cat+1.1.2] - 2024-04-11
+
+- Glitch-soc changes, most notably notifications about severed connections.
+  - Wow, my Python code to do the same manually was finally rendered obsolete!
+
 ## [v4.3.0-alpha.3+glitch+cat+1.0.9] - 2024-03-03
 
 - Glitch-soc changes again (this time, among other stuff, the search bar icon position is fixed)

From 449f99e168b8048c82fd6014c029705c061018bd Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 11 Apr 2024 19:37:07 -0400
Subject: [PATCH 0732/2191] Fix repeated concat output buffer duplicating
 layout markup (#29918)

---
 app/helpers/theme_helper.rb             | 8 ++++----
 spec/requests/account_show_page_spec.rb | 6 ++++++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/app/helpers/theme_helper.rb b/app/helpers/theme_helper.rb
index 83527ce61189c6..d15259851c0315 100644
--- a/app/helpers/theme_helper.rb
+++ b/app/helpers/theme_helper.rb
@@ -3,8 +3,8 @@
 module ThemeHelper
   def theme_style_tags(theme)
     if theme == 'system'
-      concat stylesheet_pack_tag('mastodon-light', media: 'not all and (prefers-color-scheme: dark)', crossorigin: 'anonymous')
-      concat stylesheet_pack_tag('default', media: '(prefers-color-scheme: dark)', crossorigin: 'anonymous')
+      stylesheet_pack_tag('mastodon-light', media: 'not all and (prefers-color-scheme: dark)', crossorigin: 'anonymous') +
+        stylesheet_pack_tag('default', media: '(prefers-color-scheme: dark)', crossorigin: 'anonymous')
     else
       stylesheet_pack_tag theme, media: 'all', crossorigin: 'anonymous'
     end
@@ -12,8 +12,8 @@ def theme_style_tags(theme)
 
   def theme_color_tags(theme)
     if theme == 'system'
-      concat tag.meta(name: 'theme-color', content: Themes::THEME_COLORS[:dark], media: '(prefers-color-scheme: dark)')
-      concat tag.meta(name: 'theme-color', content: Themes::THEME_COLORS[:light], media: '(prefers-color-scheme: light)')
+      tag.meta(name: 'theme-color', content: Themes::THEME_COLORS[:dark], media: '(prefers-color-scheme: dark)') +
+        tag.meta(name: 'theme-color', content: Themes::THEME_COLORS[:light], media: '(prefers-color-scheme: light)')
     else
       tag.meta name: 'theme-color', content: theme_color_for(theme)
     end
diff --git a/spec/requests/account_show_page_spec.rb b/spec/requests/account_show_page_spec.rb
index e84c46c47f29f3..81e965e6e6c7fe 100644
--- a/spec/requests/account_show_page_spec.rb
+++ b/spec/requests/account_show_page_spec.rb
@@ -9,12 +9,18 @@
 
     get '/@alice'
 
+    expect(head_link_icons.size).to eq(4) # One general favicon and three with sizes
+
     expect(head_meta_content('og:title')).to match alice.display_name
     expect(head_meta_content('og:type')).to eq 'profile'
     expect(head_meta_content('og:image')).to match '.+'
     expect(head_meta_content('og:url')).to match 'http://.+'
   end
 
+  def head_link_icons
+    head_section.css('link[rel=icon]')
+  end
+
   def head_meta_content(property)
     head_section.meta("[@property='#{property}']")[:content]
   end

From 5992df07622e00c9bfcdcac95ef834c955ca60a7 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 12 Apr 2024 10:19:48 +0200
Subject: [PATCH 0733/2191] New Crowdin Translations (automated) (#29920)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/en-GB.json | 22 ++++++++
 app/javascript/mastodon/locales/eu.json    |  8 +--
 app/javascript/mastodon/locales/ko.json    |  2 +-
 app/javascript/mastodon/locales/th.json    |  4 +-
 config/locales/devise.en-GB.yml            |  1 +
 config/locales/en-GB.yml                   | 59 ++++++++++++++++++++++
 config/locales/simple_form.en-GB.yml       |  4 ++
 config/locales/simple_form.eu.yml          |  2 +-
 config/locales/simple_form.tr.yml          |  4 +-
 config/locales/th.yml                      |  1 +
 10 files changed, 97 insertions(+), 10 deletions(-)

diff --git a/app/javascript/mastodon/locales/en-GB.json b/app/javascript/mastodon/locales/en-GB.json
index 228a16def241e9..80a3479b465ec8 100644
--- a/app/javascript/mastodon/locales/en-GB.json
+++ b/app/javascript/mastodon/locales/en-GB.json
@@ -89,6 +89,14 @@
   "announcement.announcement": "Announcement",
   "attachments_list.unprocessed": "(unprocessed)",
   "audio.hide": "Hide audio",
+  "block_modal.remote_users_caveat": "We will ask the server {domain} to respect your decision. However, compliance is not guaranteed since some servers may handle blocks differently. Public posts may still be visible to non-logged-in users.",
+  "block_modal.show_less": "Show less",
+  "block_modal.show_more": "Show more",
+  "block_modal.they_cant_mention": "They can't mention or follow you.",
+  "block_modal.they_cant_see_posts": "They can't see your posts and you won't see theirs.",
+  "block_modal.they_will_know": "They can see that they're blocked.",
+  "block_modal.title": "Block user?",
+  "block_modal.you_wont_see_mentions": "You won't see posts that mention them.",
   "boost_modal.combo": "You can press {combo} to skip this next time",
   "bundle_column_error.copy_stacktrace": "Copy error report",
   "bundle_column_error.error.body": "The requested page could not be rendered. It could be due to a bug in our code, or a browser compatibility issue.",
@@ -169,6 +177,7 @@
   "confirmations.delete_list.message": "Are you sure you want to permanently delete this list?",
   "confirmations.discard_edit_media.confirm": "Discard",
   "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
+  "confirmations.domain_block.confirm": "Block server",
   "confirmations.domain_block.message": "Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable. You will not see content from that domain in any public timelines or your notifications. Your followers from that domain will be removed.",
   "confirmations.edit.confirm": "Edit",
   "confirmations.edit.message": "Editing now will overwrite the message you are currently composing. Are you sure you want to proceed?",
@@ -431,6 +440,7 @@
   "notifications.column_settings.admin.sign_up": "New sign-ups:",
   "notifications.column_settings.alert": "Desktop notifications",
   "notifications.column_settings.favourite": "Favourites:",
+  "notifications.column_settings.filter_bar.category": "Quick filter bar",
   "notifications.column_settings.follow": "New followers:",
   "notifications.column_settings.follow_request": "New follow requests:",
   "notifications.column_settings.mention": "Mentions:",
@@ -456,6 +466,15 @@
   "notifications.permission_denied": "Desktop notifications are unavailable due to previously denied browser permissions request",
   "notifications.permission_denied_alert": "Desktop notifications can't be enabled, as browser permission has been denied before",
   "notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
+  "notifications.policy.filter_new_accounts.hint": "Created within the past {days, plural, one {one day} other {# days}}",
+  "notifications.policy.filter_new_accounts_title": "New accounts",
+  "notifications.policy.filter_not_followers_hint": "Including people who have been following you fewer than {days, plural, one {one day} other {# days}}",
+  "notifications.policy.filter_not_followers_title": "People not following you",
+  "notifications.policy.filter_not_following_hint": "Until you manually approve them",
+  "notifications.policy.filter_not_following_title": "People you don't follow",
+  "notifications.policy.filter_private_mentions_hint": "Filtered unless it's in reply to your own mention or if you follow the sender",
+  "notifications.policy.filter_private_mentions_title": "Unsolicited private mentions",
+  "notifications.policy.title": "Filter out notifications from…",
   "notifications_permission_banner.enable": "Enable desktop notifications",
   "notifications_permission_banner.how_to_control": "To receive notifications when Mastodon isn't open, enable desktop notifications. You can control precisely which types of interactions generate desktop notifications through the {icon} button above once they're enabled.",
   "notifications_permission_banner.title": "Never miss a thing",
@@ -632,9 +651,11 @@
   "status.direct": "Privately mention @{name}",
   "status.direct_indicator": "Private mention",
   "status.edit": "Edit",
+  "status.edited": "Last edited {date}",
   "status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",
   "status.embed": "Embed",
   "status.favourite": "Favourite",
+  "status.favourites": "{count, plural, one {favorite} other {favorites}}",
   "status.filter": "Filter this post",
   "status.filtered": "Filtered",
   "status.hide": "Hide post",
@@ -655,6 +676,7 @@
   "status.reblog": "Boost",
   "status.reblog_private": "Boost with original visibility",
   "status.reblogged_by": "{name} boosted",
+  "status.reblogs": "{count, plural, one {boost} other {boosts}}",
   "status.reblogs.empty": "No one has boosted this post yet. When someone does, they will show up here.",
   "status.redraft": "Delete & re-draft",
   "status.remove_bookmark": "Remove bookmark",
diff --git a/app/javascript/mastodon/locales/eu.json b/app/javascript/mastodon/locales/eu.json
index 40fec4f49cb4ba..bc57c4cee5cee7 100644
--- a/app/javascript/mastodon/locales/eu.json
+++ b/app/javascript/mastodon/locales/eu.json
@@ -148,7 +148,7 @@
   "compose.published.open": "Ireki",
   "compose.saved.body": "Argitalpena gorde da.",
   "compose_form.direct_message_warning_learn_more": "Ikasi gehiago",
-  "compose_form.encryption_warning": "Mastodoneko bidalketak ez daude muturretik muturrera enkriptatuta. Ez partekatu informazio sentikorrik Mastodonen.",
+  "compose_form.encryption_warning": "Mastodon-go bidalketak ez daude muturretik muturrera enkriptatuta. Ez partekatu informazio sentikorrik Mastodonen.",
   "compose_form.hashtag_warning": "Tut hau ez da inolako traolatan zerrendatuko, ez baita publikoa. Tut publikoak soilik traolen bitartez bila daitezke.",
   "compose_form.lock_disclaimer": "Zure kontua ez dago {locked}. Edonork jarraitu zaitzake zure jarraitzaileentzako soilik diren bidalketak ikusteko.",
   "compose_form.lock_disclaimer.lock": "giltzapetuta",
@@ -345,7 +345,7 @@
   "home.column_settings.show_reblogs": "Erakutsi bultzadak",
   "home.column_settings.show_replies": "Erakutsi erantzunak",
   "home.hide_announcements": "Ezkutatu iragarpenak",
-  "home.pending_critical_update.body": "Eguneratu zure Mastodoneko zerbitzaria leheinbailehen!",
+  "home.pending_critical_update.body": "Eguneratu zure Mastodon-go zerbitzaria leheinbailehen!",
   "home.pending_critical_update.link": "Ikusi eguneraketak",
   "home.pending_critical_update.title": "Segurtasun eguneraketa kritikoa eskuragarri!",
   "home.show_announcements": "Erakutsi iragarpenak",
@@ -548,7 +548,7 @@
   "onboarding.share.message": "{username} naiz #Mastodon-en! Jarrai nazazu hemen: {url}",
   "onboarding.share.next_steps": "Hurrengo urrats posibleak:",
   "onboarding.share.title": "Partekatu zure profila",
-  "onboarding.start.lead": "Mastodonen parte zara orain, bakarra eta deszentralizatua den sare-sozialaren plataforma, non zuk, eta ez algoritmo batek, zeure esperientzia pertsonaliza dezakezun. Igaro ezazu muga soziala:",
+  "onboarding.start.lead": "Mastodon-en parte zara orain, bakarra eta deszentralizatua den sare sozialaren plataforma, non zuk, eta ez algoritmo batek, zeure esperientzia pertsonaliza dezakezun. Igaro ezazu muga soziala:",
   "onboarding.start.skip": "Urrats guztiak saltatu nahi dituzu?",
   "onboarding.start.title": "Lortu duzu!",
   "onboarding.steps.follow_people.body": "Zure jarioa zuk pertsonalizatzen duzu. Bete dezagun jende interesgarriaz.",
@@ -562,7 +562,7 @@
   "onboarding.tips.2fa": "<strong>Bazenekien?</strong> Zure kontua babes dezakezu, bi faktoreko autentifikazioa zure kontuko ezarpenetan ezarriaz. Edozein TOTP aplikaziorekin dabil, ez da telefono-zenbakirik behar!",
   "onboarding.tips.accounts_from_other_servers": "<strong>Badakizu?</strong> Mastodon deszentralizatua denez, beste zerbitzarietako profilak topatuko dituzu. Eta, hala ere, arazorik gabe jardun dezakezu haiekin! Haien zerbitzaria erabiltzaile-izenaren bigarren erdian dago!",
   "onboarding.tips.migration": "<strong>Bazenekien?</strong> Uste baduzu {domain} ez dela aukera on bat zuretzako etorkizunari begira, beste Mastodon zerbitzari batera alda zaitezke, zure jarraitzaileak galdu gabe. Zure zerbitzaria propioa ere ostata dezakezu!",
-  "onboarding.tips.verification": "<strong>Bazenekien?</strong> Zure kontua egiazta dezakezu zure webgunean zure Mastodoneko profilaren esteka jarriz, eta profilean webgunea gehituz. Ordainketa edo dokumenturik gabe!",
+  "onboarding.tips.verification": "<strong>Bazenekien?</strong> Zure kontua egiazta dezakezu zure webgunean zure Mastodon-go profilaren esteka jarriz, eta profilean webgunea gehituz. Ordainketa edo dokumenturik gabe!",
   "password_confirmation.exceeds_maxlength": "Pasahitzaren berrespenak pasahitzaren gehienezko luzera gainditzen du",
   "password_confirmation.mismatching": "Pasahitzaren berrespena ez dator bat",
   "picture_in_picture.restore": "Leheneratu",
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index 249ba6632b033f..f1e1074ff4446a 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -701,7 +701,7 @@
   "status.direct": "@{name} 님에게 개인적으로 멘션",
   "status.direct_indicator": "개인적인 멘션",
   "status.edit": "수정",
-  "status.edited": "%{date}에 마지막으로 편집됨",
+  "status.edited": "{date}에 마지막으로 편집됨",
   "status.edited_x_times": "{count}번 수정됨",
   "status.embed": "임베드",
   "status.favourite": "좋아요",
diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json
index 952ed5adf59e86..4a7c22439560ab 100644
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@@ -16,12 +16,12 @@
   "account.badges.bot": "อัตโนมัติ",
   "account.badges.group": "กลุ่ม",
   "account.block": "ปิดกั้น @{name}",
-  "account.block_domain": "ปิดกั้นโดเมน {domain}",
+  "account.block_domain": "เลิกปิดกั้นโดเมน {domain} แล้ว",
   "account.block_short": "ปิดกั้น",
   "account.blocked": "ปิดกั้นอยู่",
   "account.browse_more_on_origin_server": "เรียกดูเพิ่มเติมในโปรไฟล์ดั้งเดิม",
   "account.cancel_follow_request": "ยกเลิกการติดตาม",
-  "account.copy": "คัดลอกลิงก์ไปยังโปรไฟล์",
+  "account.copy": "Copy link to profile",
   "account.direct": "กล่าวถึง @{name} แบบส่วนตัว",
   "account.disable_notifications": "หยุดแจ้งเตือนฉันเมื่อ @{name} โพสต์",
   "account.domain_blocked": "ปิดกั้นโดเมนอยู่",
diff --git a/config/locales/devise.en-GB.yml b/config/locales/devise.en-GB.yml
index 823be9aa6c9fad..3e8a534e1fbca0 100644
--- a/config/locales/devise.en-GB.yml
+++ b/config/locales/devise.en-GB.yml
@@ -12,6 +12,7 @@ en-GB:
       last_attempt: You have one more attempt before your account is locked.
       locked: Your account is locked.
       not_found_in_database: Invalid %{authentication_keys} or password.
+      omniauth_user_creation_failure: Error creating an account for this identity.
       pending: Your account is still under review.
       timeout: Your session expired. Please log in again to continue.
       unauthenticated: You need to log in or sign up before continuing.
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index a2f84b0932aca0..df956902a6e904 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -597,6 +597,9 @@ en-GB:
       actions_description_html: Decide which action to take to resolve this report. If you take a punitive action against the reported account, an e-mail notification will be sent to them, except when the <strong>Spam</strong> category is selected.
       actions_description_remote_html: Decide which action to take to resolve this report. This will only affect how <strong>your</strong> server communicates with this remote account and handle its content.
       add_to_report: Add more to report
+      already_suspended_badges:
+        local: Already suspended on this server
+        remote: Already suspended on their server
       are_you_sure: Are you sure?
       assign_to_self: Assign to me
       assigned: Assigned moderator
@@ -767,6 +770,7 @@ en-GB:
         disabled: To no one
         users: To logged-in local users
       registrations:
+        moderation_recommandation: Please make sure you have an adequate and reactive moderation team before you open registrations to everyone!
         preamble: Control who can create an account on your server.
         title: Registrations
       registrations_mode:
@@ -774,6 +778,7 @@ en-GB:
           approved: Approval required for sign up
           none: Nobody can sign up
           open: Anyone can sign up
+        warning_hint: We recommend using “Approval required for sign up” unless you are confident your moderation team can handle spam and malicious registrations in a timely fashion.
       security:
         authorized_fetch: Require authentication from federated servers
         authorized_fetch_hint: Requiring authentication from federated servers enables stricter enforcement of both user-level and server-level blocks. However, this comes at the cost of a performance penalty, reduces the reach of your replies, and may introduce compatibility issues with some federated services. In addition, this will not prevent dedicated actors from fetching your public posts and accounts.
@@ -966,6 +971,9 @@ en-GB:
       title: Webhooks
       webhook: Webhook
   admin_mailer:
+    auto_close_registrations:
+      body: Due to a lack of recent moderator activity, registrations on %{instance} have been automatically switched to requiring manual review, to prevent %{instance} from being used as a platform for potential bad actors. You can switch it back to open registrations at any time.
+      subject: Registrations for %{instance} have been automatically switched to requiring approval
     new_appeal:
       actions:
         delete_statuses: to delete their posts
@@ -1647,13 +1655,26 @@ en-GB:
     import: Import
     import_and_export: Import and export
     migrate: Account migration
+    notifications: E-mail notifications
     preferences: Preferences
     profile: Profile
     relationships: Follows and followers
+    severed_relationships: Severed relationships
     statuses_cleanup: Automated post deletion
     strikes: Moderation strikes
     two_factor_authentication: Two-factor Auth
     webauthn_authentication: Security keys
+  severed_relationships:
+    download: Download (%{count})
+    event_type:
+      account_suspension: Account suspension (%{target_name})
+      domain_block: Server suspension (%{target_name})
+      user_domain_block: You blocked %{target_name}
+    lost_followers: Lost followers
+    lost_follows: Lost follows
+    preamble: You may lose follows and followers when you block a domain or when your moderators decide to suspend a remote server. When that happens, you will be able to download lists of severed relationships, to be inspected and possibly imported on another server.
+    purged: Information about this server has been purged by your server's administrators.
+    type: Event
   statuses:
     attached:
       audio:
@@ -1747,6 +1768,7 @@ en-GB:
     contrast: Mastodon (High contrast)
     default: Mastodon (Dark)
     mastodon-light: Mastodon (Light)
+    system: Automatic (use system theme)
   time:
     formats:
       default: "%b %d, %Y, %H:%M"
@@ -1834,7 +1856,44 @@ en-GB:
         silence: Account limited
         suspend: Account suspended
     welcome:
+      apps_android_action: Get it on Google Play
+      apps_ios_action: Download on the App Store
+      apps_step: Download our official apps.
+      apps_title: Mastodon apps
+      checklist_subtitle: 'Let''s get you started on this new social frontier:'
+      checklist_title: Welcome Checklist
+      edit_profile_action: Personalise
+      edit_profile_step: Boost your interactions by having a comprehensive profile.
+      edit_profile_title: Personalise your profile
       explanation: Here are some tips to get you started
+      feature_action: Learn more
+      feature_audience: Mastodon provides you with a unique possibility of managing your audience without middlemen. Mastodon deployed on your own infrastructure allows you to follow and be followed from any other Mastodon server online and is under no one's control but yours.
+      feature_audience_title: Build your audience in confidence
+      feature_control: You know best what you want to see on your home feed. No algorithms or ads to waste your time. Follow anyone across any Mastodon server from a single account and receive their posts in chronological order, and make your corner of the Internet a little more like you.
+      feature_control_title: Stay in control of your own timeline
+      feature_creativity: Mastodon supports audio, video and picture posts, accessibility descriptions, polls, content warnings, animated avatars, custom emojis, thumbnail crop control, and more, to help you express yourself online. Whether you're publishing your art, your music, or your podcast, Mastodon is there for you.
+      feature_creativity_title: Unparalleled creativity
+      feature_moderation: Mastodon puts decision making back in your hands. Each server creates their own rules and regulations, which are enforced locally and not top-down like corporate social media, making it the most flexible in responding to the needs of different groups of people. Join a server with the rules you agree with, or host your own.
+      feature_moderation_title: Moderating the way it should be
+      follow_action: Follow
+      follow_step: Following interesting people is what Mastodon is all about.
+      follow_title: Personalise your home feed
+      follows_subtitle: Follow well-known accounts
+      follows_title: Who to follow
+      follows_view_more: View more people to follow
+      hashtags_recent_count:
+        one: "%{people} person in the past 2 days"
+        other: "%{people} people in the past 2 days"
+      hashtags_subtitle: Explore what’s trending since past 2 days
+      hashtags_title: Trending hashtags
+      hashtags_view_more: View more trending hashtags
+      post_action: Compose
+      post_step: Say hello to the world with text, photos, videos, or polls.
+      post_title: Make your first post
+      share_action: Share
+      share_step: Let your friends know how to find you on Mastodon.
+      share_title: Share your Mastodon profile
+      sign_in_action: Sign in
       subject: Welcome to Mastodon
       title: Welcome aboard, %{name}!
   users:
diff --git a/config/locales/simple_form.en-GB.yml b/config/locales/simple_form.en-GB.yml
index 2ac4508b05500b..e5c9b1b2b7f2b3 100644
--- a/config/locales/simple_form.en-GB.yml
+++ b/config/locales/simple_form.en-GB.yml
@@ -39,12 +39,14 @@ en-GB:
         text: You can only appeal a strike once
       defaults:
         autofollow: People who sign up through the invite will automatically follow you
+        avatar: WEBP, PNG, GIF or JPG. At most %{size}. Will be downscaled to %{dimensions}px
         bot: Signal to others that the account mainly performs automated actions and might not be monitored
         context: One or multiple contexts where the filter should apply
         current_password: For security purposes please enter the password of the current account
         current_username: To confirm, please enter the username of the current account
         digest: Only sent after a long period of inactivity and only if you have received any personal messages in your absence
         email: You will be sent a confirmation e-mail
+        header: WEBP, PNG, GIF or JPG. At most %{size}. Will be downscaled to %{dimensions}px
         inbox_url: Copy the URL from the frontpage of the relay you want to use
         irreversible: Filtered posts will disappear irreversibly, even if filter is later removed
         locale: The language of the user interface, e-mails and push notifications
@@ -114,6 +116,7 @@ en-GB:
           sign_up_requires_approval: New sign-ups will require your approval
         severity: Choose what will happen with requests from this IP
       rule:
+        hint: Optional. Provide more details about the rule
         text: Describe a rule or requirement for users on this server. Try to keep it short and simple
       sessions:
         otp: 'Enter the two-factor code generated by your phone app or use one of your recovery codes:'
@@ -297,6 +300,7 @@ en-GB:
           patch: Notify on bugfix updates
         trending_tag: New trend requires review
       rule:
+        hint: Additional information
         text: Rule
       settings:
         indexable: Include profile page in search engines
diff --git a/config/locales/simple_form.eu.yml b/config/locales/simple_form.eu.yml
index 03ba1aea6cc527..5ed3b9efa1eb07 100644
--- a/config/locales/simple_form.eu.yml
+++ b/config/locales/simple_form.eu.yml
@@ -3,7 +3,7 @@ eu:
   simple_form:
     hints:
       account:
-        discoverable: Zure bidalketa publikoak eta profila nabarmendu edo gomendatu egin daitezke Mastodoneko hainbat eremutan eta zure profila beste erabiltzaile batzuei iradoki dakieke.
+        discoverable: Zure bidalketa publikoak eta profila nabarmendu edo gomendatu egin daitezke Mastodon-go hainbat eremutan eta zure profila beste erabiltzaile batzuei iradoki dakieke.
         display_name: Zure izena edo ezizena.
         fields: Zure webgunea, izenordainak, adina, nahi duzun guztia.
         indexable: Zure argitalpen publikoak bilaketa-emaitzetan ager daitezke Mastodonen. Zure argitalpenekin elkarregin duten jendeak ikusi ahal izango dituzte, hala ere.
diff --git a/config/locales/simple_form.tr.yml b/config/locales/simple_form.tr.yml
index 16c23caeb0bd59..758d1dc4de02fc 100644
--- a/config/locales/simple_form.tr.yml
+++ b/config/locales/simple_form.tr.yml
@@ -228,7 +228,7 @@ tr:
         title: Başlık
         type: İçeri aktarma türü
         username: Kullanıcı adı
-        username_or_email: Kullanıcı adı ya da e-posta
+        username_or_email: Kullanıcı adı veya e-posta
         whole_word: Tam sözcük
       email_domain_block:
         with_dns_records: Alan adının MX kayıtlarını ve IP'lerini ekleyin
@@ -269,7 +269,7 @@ tr:
       interactions:
         must_be_follower: Takipçim olmayan kişilerden gelen bildirimleri engelle
         must_be_following: Takip etmediğim kişilerden gelen bildirimleri engelle
-        must_be_following_dm: Takip etmediğiniz kişilerden gelen direkt mesajları engelle
+        must_be_following_dm: Takip etmediğiniz kişilerden gelen doğrudan iletileri engelle
       invite:
         comment: Yorum
       invite_request:
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 2a05c892e76cbe..17ff6a5ccbe87f 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -1835,6 +1835,7 @@ th:
       edit_profile_title: ปรับแต่งโปรไฟล์ของคุณ
       explanation: นี่คือเคล็ดลับบางส่วนที่จะช่วยให้คุณเริ่มต้นใช้งาน
       feature_action: เรียนรู้เพิ่มเติม
+      feature_audience: Mastodon มีความพิเศษที่ให้คุณจัดการผู้รับสารของคุณได้โดยไม่มีตัวกลาง นอกจากนี้ การติดตั้ง Mastodon บนโครงสร้างพื้นฐานของคุณจะทำให้คุณสามารถติดตาม (และติดตามโดย) เซิร์ฟเวอร์ Mastodon แห่งไหนก็ได้ที่ทำงานอยู่ โดยไม่มีใครสามารถควบคุมได้นอกจากคุณ
       follow_action: ติดตาม
       follow_step: การติดตามผู้คนที่น่าสนใจคือสิ่งที่ Mastodon ให้ความสำคัญ
       follow_title: ปรับแต่งฟีดหน้าแรกของคุณ

From 13bbde22469c6217878e64e458f1ce6f8f18a93f Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 12 Apr 2024 05:04:23 -0400
Subject: [PATCH 0734/2191] Use existing `DEFAULT_FIELDS_SIZE` constant to
 limit `Account#fields` (#29911)

---
 app/models/account.rb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/models/account.rb b/app/models/account.rb
index 3739709a13a245..2bf00b2be5909e 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -64,6 +64,7 @@ class Account < ApplicationRecord
   )
 
   BACKGROUND_REFRESH_INTERVAL = 1.week.freeze
+  DEFAULT_FIELDS_SIZE = 4
   INSTANCE_ACTOR_ID = -99
 
   USERNAME_RE   = /[a-z0-9_]+([a-z0-9_.-]+[a-z0-9_]+)?/i
@@ -103,7 +104,7 @@ class Account < ApplicationRecord
   validates_with UnreservedUsernameValidator, if: -> { local? && will_save_change_to_username? && actor_type != 'Application' }
   validates :display_name, length: { maximum: 30 }, if: -> { local? && will_save_change_to_display_name? }
   validates :note, note_length: { maximum: 500 }, if: -> { local? && will_save_change_to_note? }
-  validates :fields, length: { maximum: 4 }, if: -> { local? && will_save_change_to_fields? }
+  validates :fields, length: { maximum: DEFAULT_FIELDS_SIZE }, if: -> { local? && will_save_change_to_fields? }
   validates :uri, absence: true, if: :local?, on: :create
   validates :inbox_url, absence: true, if: :local?, on: :create
   validates :shared_inbox_url, absence: true, if: :local?, on: :create
@@ -353,8 +354,6 @@ def fields_attributes=(attributes)
     self[:fields] = fields
   end
 
-  DEFAULT_FIELDS_SIZE = 4
-
   def build_fields
     return if fields.size >= DEFAULT_FIELDS_SIZE
 

From ec5a0e0f5e14a512f8e247a22742ec0f85e14f5c Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 12 Apr 2024 05:18:35 -0400
Subject: [PATCH 0735/2191] Expand coverage for admin/metrics/dimension/*
 classes (#29913)

---
 .../instance_accounts_dimension_spec.rb       | 24 ++++++++++++---
 .../instance_languages_dimension_spec.rb      | 22 +++++++++++---
 .../dimension/servers_dimension_spec.rb       | 22 ++++++++++++--
 .../software_versions_dimension_spec.rb       | 10 +++++--
 .../dimension/sources_dimension_spec.rb       | 19 ++++++++++--
 .../dimension/space_usage_dimension_spec.rb   | 11 +++++--
 .../dimension/tag_languages_dimension_spec.rb | 28 +++++++++++++++---
 .../dimension/tag_servers_dimension_spec.rb   | 29 ++++++++++++++++---
 8 files changed, 137 insertions(+), 28 deletions(-)

diff --git a/spec/lib/admin/metrics/dimension/instance_accounts_dimension_spec.rb b/spec/lib/admin/metrics/dimension/instance_accounts_dimension_spec.rb
index 106717f97b922f..2b14e6956c8d6c 100644
--- a/spec/lib/admin/metrics/dimension/instance_accounts_dimension_spec.rb
+++ b/spec/lib/admin/metrics/dimension/instance_accounts_dimension_spec.rb
@@ -3,16 +3,32 @@
 require 'rails_helper'
 
 describe Admin::Metrics::Dimension::InstanceAccountsDimension do
-  subject(:dimension) { described_class.new(start_at, end_at, limit, params) }
+  subject { described_class.new(start_at, end_at, limit, params) }
 
   let(:start_at) { 2.days.ago }
   let(:end_at) { Time.now.utc }
   let(:limit) { 10 }
-  let(:params) { ActionController::Parameters.new }
+  let(:params) { ActionController::Parameters.new(domain: domain) }
 
   describe '#data' do
-    it 'runs data query without error' do
-      expect { dimension.data }.to_not raise_error
+    let(:domain) { 'host.example' }
+    let(:alice) { Fabricate(:account, domain: domain) }
+    let(:bob) { Fabricate(:account) }
+
+    before do
+      Fabricate :follow, target_account: alice
+      Fabricate :follow, target_account: bob
+      Fabricate :status, account: alice
+      Fabricate :status, account: bob
+    end
+
+    it 'returns instances with follow counts' do
+      expect(subject.data.size)
+        .to eq(1)
+      expect(subject.data.map(&:symbolize_keys))
+        .to contain_exactly(
+          include(key: alice.username, value: '1')
+        )
     end
   end
 end
diff --git a/spec/lib/admin/metrics/dimension/instance_languages_dimension_spec.rb b/spec/lib/admin/metrics/dimension/instance_languages_dimension_spec.rb
index f9f6430ca0dec8..e4e9fbe2b7b0a8 100644
--- a/spec/lib/admin/metrics/dimension/instance_languages_dimension_spec.rb
+++ b/spec/lib/admin/metrics/dimension/instance_languages_dimension_spec.rb
@@ -3,16 +3,30 @@
 require 'rails_helper'
 
 describe Admin::Metrics::Dimension::InstanceLanguagesDimension do
-  subject(:dimension) { described_class.new(start_at, end_at, limit, params) }
+  subject { described_class.new(start_at, end_at, limit, params) }
 
   let(:start_at) { 2.days.ago }
   let(:end_at) { Time.now.utc }
   let(:limit) { 10 }
-  let(:params) { ActionController::Parameters.new }
+  let(:params) { ActionController::Parameters.new(domain: domain) }
 
   describe '#data' do
-    it 'runs data query without error' do
-      expect { dimension.data }.to_not raise_error
+    let(:domain) { 'host.example' }
+    let(:alice) { Fabricate(:account, domain: domain) }
+    let(:bob) { Fabricate(:account) }
+
+    before do
+      Fabricate :status, account: alice, language: 'en'
+      Fabricate :status, account: bob, language: 'es'
+    end
+
+    it 'returns locales with status counts' do
+      expect(subject.data.size)
+        .to eq(1)
+      expect(subject.data.map(&:symbolize_keys))
+        .to contain_exactly(
+          include(key: 'en', value: '1')
+        )
     end
   end
 end
diff --git a/spec/lib/admin/metrics/dimension/servers_dimension_spec.rb b/spec/lib/admin/metrics/dimension/servers_dimension_spec.rb
index 7e2bb9ac0b7993..5661441d5d0c0f 100644
--- a/spec/lib/admin/metrics/dimension/servers_dimension_spec.rb
+++ b/spec/lib/admin/metrics/dimension/servers_dimension_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 
 describe Admin::Metrics::Dimension::ServersDimension do
-  subject(:dimension) { described_class.new(start_at, end_at, limit, params) }
+  subject { described_class.new(start_at, end_at, limit, params) }
 
   let(:start_at) { 2.days.ago }
   let(:end_at) { Time.now.utc }
@@ -11,8 +11,24 @@
   let(:params) { ActionController::Parameters.new }
 
   describe '#data' do
-    it 'runs data query without error' do
-      expect { dimension.data }.to_not raise_error
+    let(:domain) { 'host.example' }
+    let(:alice) { Fabricate(:account, domain: domain) }
+    let(:bob) { Fabricate(:account) }
+
+    before do
+      Fabricate :status, account: alice, created_at: 1.day.ago
+      Fabricate :status, account: alice, created_at: 30.days.ago
+      Fabricate :status, account: bob, created_at: 1.day.ago
+    end
+
+    it 'returns domains with status counts' do
+      expect(subject.data.size)
+        .to eq(2)
+      expect(subject.data.map(&:symbolize_keys))
+        .to contain_exactly(
+          include(key: domain, value: '1'),
+          include(key: Rails.configuration.x.local_domain, value: '1')
+        )
     end
   end
 end
diff --git a/spec/lib/admin/metrics/dimension/software_versions_dimension_spec.rb b/spec/lib/admin/metrics/dimension/software_versions_dimension_spec.rb
index ee14917330fdf2..5d31121ab3bd10 100644
--- a/spec/lib/admin/metrics/dimension/software_versions_dimension_spec.rb
+++ b/spec/lib/admin/metrics/dimension/software_versions_dimension_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 
 describe Admin::Metrics::Dimension::SoftwareVersionsDimension do
-  subject(:dimension) { described_class.new(start_at, end_at, limit, params) }
+  subject { described_class.new(start_at, end_at, limit, params) }
 
   let(:start_at) { 2.days.ago }
   let(:end_at) { Time.now.utc }
@@ -11,8 +11,12 @@
   let(:params) { ActionController::Parameters.new }
 
   describe '#data' do
-    it 'runs data query without error' do
-      expect { dimension.data }.to_not raise_error
+    it 'reports on the running software' do
+      expect(subject.data.map(&:symbolize_keys))
+        .to include(
+          include(key: 'mastodon', value: Mastodon::Version.to_s),
+          include(key: 'ruby', value: include(RUBY_VERSION))
+        )
     end
   end
 end
diff --git a/spec/lib/admin/metrics/dimension/sources_dimension_spec.rb b/spec/lib/admin/metrics/dimension/sources_dimension_spec.rb
index d6b581a9bbe682..5fa5aa8af51730 100644
--- a/spec/lib/admin/metrics/dimension/sources_dimension_spec.rb
+++ b/spec/lib/admin/metrics/dimension/sources_dimension_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 
 describe Admin::Metrics::Dimension::SourcesDimension do
-  subject(:dimension) { described_class.new(start_at, end_at, limit, params) }
+  subject { described_class.new(start_at, end_at, limit, params) }
 
   let(:start_at) { 2.days.ago }
   let(:end_at) { Time.now.utc }
@@ -11,8 +11,21 @@
   let(:params) { ActionController::Parameters.new }
 
   describe '#data' do
-    it 'runs data query without error' do
-      expect { dimension.data }.to_not raise_error
+    let(:app) { Fabricate(:application) }
+    let(:alice) { Fabricate(:user) }
+    let(:bob) { Fabricate(:user) }
+
+    before do
+      alice.update(created_by_application: app)
+    end
+
+    it 'returns OAuth applications with user counts' do
+      expect(subject.data.size)
+        .to eq(1)
+      expect(subject.data.map(&:symbolize_keys))
+        .to contain_exactly(
+          include(key: app.name, value: '1')
+        )
     end
   end
 end
diff --git a/spec/lib/admin/metrics/dimension/space_usage_dimension_spec.rb b/spec/lib/admin/metrics/dimension/space_usage_dimension_spec.rb
index 65d04cfedd81e8..96ff9c66dc7f55 100644
--- a/spec/lib/admin/metrics/dimension/space_usage_dimension_spec.rb
+++ b/spec/lib/admin/metrics/dimension/space_usage_dimension_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 
 describe Admin::Metrics::Dimension::SpaceUsageDimension do
-  subject(:dimension) { described_class.new(start_at, end_at, limit, params) }
+  subject { described_class.new(start_at, end_at, limit, params) }
 
   let(:start_at) { 2.days.ago }
   let(:end_at) { Time.now.utc }
@@ -11,8 +11,13 @@
   let(:params) { ActionController::Parameters.new }
 
   describe '#data' do
-    it 'runs data query without error' do
-      expect { dimension.data }.to_not raise_error
+    it 'reports on used storage space' do
+      expect(subject.data.map(&:symbolize_keys))
+        .to include(
+          include(key: 'media', value: /\d/),
+          include(key: 'postgresql', value: /\d/),
+          include(key: 'redis', value: /\d/)
+        )
     end
   end
 end
diff --git a/spec/lib/admin/metrics/dimension/tag_languages_dimension_spec.rb b/spec/lib/admin/metrics/dimension/tag_languages_dimension_spec.rb
index 721d24fa188aec..c1dfd0eaf4eb2e 100644
--- a/spec/lib/admin/metrics/dimension/tag_languages_dimension_spec.rb
+++ b/spec/lib/admin/metrics/dimension/tag_languages_dimension_spec.rb
@@ -3,16 +3,36 @@
 require 'rails_helper'
 
 describe Admin::Metrics::Dimension::TagLanguagesDimension do
-  subject(:dimension) { described_class.new(start_at, end_at, limit, params) }
+  subject { described_class.new(start_at, end_at, limit, params) }
 
   let(:start_at) { 2.days.ago }
   let(:end_at) { Time.now.utc }
   let(:limit) { 10 }
-  let(:params) { ActionController::Parameters.new }
+  let(:params) { ActionController::Parameters.new(id: tag.id) }
 
   describe '#data' do
-    it 'runs data query without error' do
-      expect { dimension.data }.to_not raise_error
+    let(:alice) { Fabricate(:account) }
+    let(:bob) { Fabricate(:account) }
+    let(:tag) { Fabricate(:tag) }
+
+    before do
+      alice_status_recent = Fabricate :status, account: alice, created_at: 1.day.ago, language: 'en'
+      alice_status_older = Fabricate :status, account: alice, created_at: 30.days.ago, language: 'en'
+      bob_status_recent = Fabricate :status, account: bob, created_at: 1.day.ago, language: 'es'
+
+      alice_status_older.tags << tag
+      alice_status_recent.tags << tag
+      bob_status_recent.tags << tag
+    end
+
+    it 'returns languages with tag usage counts' do
+      expect(subject.data.size)
+        .to eq(2)
+      expect(subject.data.map(&:symbolize_keys))
+        .to contain_exactly(
+          include(key: 'en', value: '1'),
+          include(key: 'es', value: '1')
+        )
     end
   end
 end
diff --git a/spec/lib/admin/metrics/dimension/tag_servers_dimension_spec.rb b/spec/lib/admin/metrics/dimension/tag_servers_dimension_spec.rb
index 30547168161e47..025cf1b7ec7870 100644
--- a/spec/lib/admin/metrics/dimension/tag_servers_dimension_spec.rb
+++ b/spec/lib/admin/metrics/dimension/tag_servers_dimension_spec.rb
@@ -3,16 +3,37 @@
 require 'rails_helper'
 
 describe Admin::Metrics::Dimension::TagServersDimension do
-  subject(:dimension) { described_class.new(start_at, end_at, limit, params) }
+  subject { described_class.new(start_at, end_at, limit, params) }
 
   let(:start_at) { 2.days.ago }
   let(:end_at) { Time.now.utc }
   let(:limit) { 10 }
-  let(:params) { ActionController::Parameters.new }
+  let(:params) { ActionController::Parameters.new(id: tag.id) }
 
   describe '#data' do
-    it 'runs data query without error' do
-      expect { dimension.data }.to_not raise_error
+    let(:alice) { Fabricate(:account, domain: domain) }
+    let(:bob) { Fabricate(:account) }
+    let(:domain) { 'host.example' }
+    let(:tag) { Fabricate(:tag) }
+
+    before do
+      alice_status_recent = Fabricate :status, account: alice, created_at: 1.day.ago
+      alice_status_older = Fabricate :status, account: alice, created_at: 30.days.ago
+      bob_status_recent = Fabricate :status, account: bob, created_at: 1.day.ago
+
+      alice_status_older.tags << tag
+      alice_status_recent.tags << tag
+      bob_status_recent.tags << tag
+    end
+
+    it 'returns servers with tag usage counts' do
+      expect(subject.data.size)
+        .to eq(2)
+      expect(subject.data.map(&:symbolize_keys))
+        .to contain_exactly(
+          include(key: domain, value: '1'),
+          include(key: Rails.configuration.x.local_domain, value: '1')
+        )
     end
   end
 end

From da6b9238f53c6660e6cd9feedaa96a1b7ce01f92 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 12 Apr 2024 05:38:24 -0400
Subject: [PATCH 0736/2191] Expand coverage for admin/metrics/measure/* classes
 (#29914)

---
 .../measure/active_users_measure_spec.rb      | 29 +++++++++++++--
 .../measure/instance_accounts_measure_spec.rb | 20 +++++++---
 .../instance_followers_measure_spec.rb        | 21 ++++++++---
 .../measure/instance_follows_measure_spec.rb  | 19 +++++++---
 ...instance_media_attachments_measure_spec.rb | 23 +++++++++---
 .../measure/instance_reports_measure_spec.rb  | 19 +++++++---
 .../measure/instance_statuses_measure_spec.rb | 19 +++++++---
 .../measure/interactions_measure_spec.rb      | 29 +++++++++++++--
 .../metrics/measure/new_users_measure_spec.rb | 21 +++++++++--
 .../measure/opened_reports_measure_spec.rb    | 21 +++++++++--
 .../measure/resolved_reports_measure_spec.rb  | 21 +++++++++--
 .../measure/tag_accounts_measure_spec.rb      | 37 +++++++++++++++++--
 .../measure/tag_servers_measure_spec.rb       | 36 ++++++++++++++++--
 .../metrics/measure/tag_uses_measure_spec.rb  | 37 +++++++++++++++++--
 14 files changed, 292 insertions(+), 60 deletions(-)

diff --git a/spec/lib/admin/metrics/measure/active_users_measure_spec.rb b/spec/lib/admin/metrics/measure/active_users_measure_spec.rb
index 55164ed88acbd3..38ee14075b3e38 100644
--- a/spec/lib/admin/metrics/measure/active_users_measure_spec.rb
+++ b/spec/lib/admin/metrics/measure/active_users_measure_spec.rb
@@ -3,15 +3,38 @@
 require 'rails_helper'
 
 describe Admin::Metrics::Measure::ActiveUsersMeasure do
-  subject(:measure) { described_class.new(start_at, end_at, params) }
+  subject { described_class.new(start_at, end_at, params) }
 
   let(:start_at) { 2.days.ago }
   let(:end_at)   { Time.now.utc }
   let(:params) { ActionController::Parameters.new }
 
   describe '#data' do
-    it 'runs data query without error' do
-      expect { measure.data }.to_not raise_error
+    context 'with activity tracking records' do
+      before do
+        3.times do
+          travel_to(2.days.ago) { record_login_activity }
+        end
+        2.times do
+          travel_to(1.day.ago) { record_login_activity }
+        end
+        travel_to(0.days.ago) { record_login_activity }
+      end
+
+      it 'returns correct activity tracker counts' do
+        expect(subject.data.size)
+          .to eq(3)
+        expect(subject.data.map(&:symbolize_keys))
+          .to contain_exactly(
+            include(date: 2.days.ago.midnight.to_time, value: '3'),
+            include(date: 1.day.ago.midnight.to_time, value: '2'),
+            include(date: 0.days.ago.midnight.to_time, value: '1')
+          )
+      end
+
+      def record_login_activity
+        ActivityTracker.record('activity:logins', Fabricate(:user).id)
+      end
     end
   end
 end
diff --git a/spec/lib/admin/metrics/measure/instance_accounts_measure_spec.rb b/spec/lib/admin/metrics/measure/instance_accounts_measure_spec.rb
index 8e414963f337ba..0d2ad31c399a45 100644
--- a/spec/lib/admin/metrics/measure/instance_accounts_measure_spec.rb
+++ b/spec/lib/admin/metrics/measure/instance_accounts_measure_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 
 describe Admin::Metrics::Measure::InstanceAccountsMeasure do
-  subject(:measure) { described_class.new(start_at, end_at, params) }
+  subject { described_class.new(start_at, end_at, params) }
 
   let(:domain) { 'example.com' }
 
@@ -20,12 +20,13 @@
     Fabricate(:account, domain: "foo.#{domain}", created_at: 1.year.ago)
     Fabricate(:account, domain: "foo.#{domain}")
     Fabricate(:account, domain: "bar.#{domain}")
+    Fabricate(:account, domain: 'other-host.example')
   end
 
-  describe 'total' do
+  describe '#total' do
     context 'without include_subdomains' do
       it 'returns the expected number of accounts' do
-        expect(measure.total).to eq 3
+        expect(subject.total).to eq 3
       end
     end
 
@@ -33,14 +34,21 @@
       let(:params) { ActionController::Parameters.new(domain: domain, include_subdomains: 'true') }
 
       it 'returns the expected number of accounts' do
-        expect(measure.total).to eq 6
+        expect(subject.total).to eq 6
       end
     end
   end
 
   describe '#data' do
-    it 'runs data query without error' do
-      expect { measure.data }.to_not raise_error
+    it 'returns correct instance_accounts counts' do
+      expect(subject.data.size)
+        .to eq(3)
+      expect(subject.data.map(&:symbolize_keys))
+        .to contain_exactly(
+          include(date: 2.days.ago.midnight.to_time, value: '0'),
+          include(date: 1.day.ago.midnight.to_time, value: '0'),
+          include(date: 0.days.ago.midnight.to_time, value: '1')
+        )
     end
   end
 end
diff --git a/spec/lib/admin/metrics/measure/instance_followers_measure_spec.rb b/spec/lib/admin/metrics/measure/instance_followers_measure_spec.rb
index c627e6cede08ff..27bf30d17d5f49 100644
--- a/spec/lib/admin/metrics/measure/instance_followers_measure_spec.rb
+++ b/spec/lib/admin/metrics/measure/instance_followers_measure_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 
 describe Admin::Metrics::Measure::InstanceFollowersMeasure do
-  subject(:measure) { described_class.new(start_at, end_at, params) }
+  subject { described_class.new(start_at, end_at, params) }
 
   let(:domain) { 'example.com' }
 
@@ -22,12 +22,14 @@
     Fabricate(:account, domain: "foo.#{domain}").follow!(local_account)
     Fabricate(:account, domain: "foo.#{domain}").follow!(local_account)
     Fabricate(:account, domain: "bar.#{domain}")
+
+    Fabricate(:account, domain: 'other.example').follow!(local_account)
   end
 
-  describe 'total' do
+  describe '#total' do
     context 'without include_subdomains' do
       it 'returns the expected number of accounts' do
-        expect(measure.total).to eq 2
+        expect(subject.total).to eq 2
       end
     end
 
@@ -35,14 +37,21 @@
       let(:params) { ActionController::Parameters.new(domain: domain, include_subdomains: 'true') }
 
       it 'returns the expected number of accounts' do
-        expect(measure.total).to eq 4
+        expect(subject.total).to eq 4
       end
     end
   end
 
   describe '#data' do
-    it 'runs data query without error' do
-      expect { measure.data }.to_not raise_error
+    it 'returns correct instance_followers counts' do
+      expect(subject.data.size)
+        .to eq(3)
+      expect(subject.data.map(&:symbolize_keys))
+        .to contain_exactly(
+          include(date: 2.days.ago.midnight.to_time, value: '0'),
+          include(date: 1.day.ago.midnight.to_time, value: '0'),
+          include(date: 0.days.ago.midnight.to_time, value: '2')
+        )
     end
   end
 end
diff --git a/spec/lib/admin/metrics/measure/instance_follows_measure_spec.rb b/spec/lib/admin/metrics/measure/instance_follows_measure_spec.rb
index 42f33dfc35fc94..9961ea56c42b1d 100644
--- a/spec/lib/admin/metrics/measure/instance_follows_measure_spec.rb
+++ b/spec/lib/admin/metrics/measure/instance_follows_measure_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 
 describe Admin::Metrics::Measure::InstanceFollowsMeasure do
-  subject(:measure) { described_class.new(start_at, end_at, params) }
+  subject { described_class.new(start_at, end_at, params) }
 
   let(:domain) { 'example.com' }
 
@@ -24,10 +24,10 @@
     Fabricate(:account, domain: "bar.#{domain}")
   end
 
-  describe 'total' do
+  describe '#total' do
     context 'without include_subdomains' do
       it 'returns the expected number of accounts' do
-        expect(measure.total).to eq 2
+        expect(subject.total).to eq 2
       end
     end
 
@@ -35,14 +35,21 @@
       let(:params) { ActionController::Parameters.new(domain: domain, include_subdomains: 'true') }
 
       it 'returns the expected number of accounts' do
-        expect(measure.total).to eq 4
+        expect(subject.total).to eq 4
       end
     end
   end
 
   describe '#data' do
-    it 'runs data query without error' do
-      expect { measure.data }.to_not raise_error
+    it 'returns correct instance_followers counts' do
+      expect(subject.data.size)
+        .to eq(3)
+      expect(subject.data.map(&:symbolize_keys))
+        .to contain_exactly(
+          include(date: 2.days.ago.midnight.to_time, value: '0'),
+          include(date: 1.day.ago.midnight.to_time, value: '0'),
+          include(date: 0.days.ago.midnight.to_time, value: '2')
+        )
     end
   end
 end
diff --git a/spec/lib/admin/metrics/measure/instance_media_attachments_measure_spec.rb b/spec/lib/admin/metrics/measure/instance_media_attachments_measure_spec.rb
index c103307f971c29..3634450930656b 100644
--- a/spec/lib/admin/metrics/measure/instance_media_attachments_measure_spec.rb
+++ b/spec/lib/admin/metrics/measure/instance_media_attachments_measure_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 
 describe Admin::Metrics::Measure::InstanceMediaAttachmentsMeasure do
-  subject(:measure) { described_class.new(start_at, end_at, params) }
+  subject { described_class.new(start_at, end_at, params) }
 
   let(:domain) { 'example.com' }
 
@@ -20,11 +20,11 @@
     remote_account_on_subdomain.media_attachments.create!(file: attachment_fixture('attachment.jpg'))
   end
 
-  describe 'total' do
+  describe '#total' do
     context 'without include_subdomains' do
       it 'returns the expected number of accounts' do
         expected_total = remote_account.media_attachments.sum(:file_file_size) + remote_account.media_attachments.sum(:thumbnail_file_size)
-        expect(measure.total).to eq expected_total
+        expect(subject.total).to eq expected_total
       end
     end
 
@@ -36,14 +36,25 @@
           account.media_attachments.sum(:file_file_size) + account.media_attachments.sum(:thumbnail_file_size)
         end
 
-        expect(measure.total).to eq expected_total
+        expect(subject.total).to eq expected_total
       end
     end
   end
 
   describe '#data' do
-    it 'runs data query without error' do
-      expect { measure.data }.to_not raise_error
+    it 'returns correct media_attachments counts' do
+      expect(subject.data.size)
+        .to eq(3)
+      expect(subject.data.map(&:symbolize_keys))
+        .to contain_exactly(
+          include(date: 2.days.ago.midnight.to_time, value: '0'),
+          include(date: 1.day.ago.midnight.to_time, value: '0'),
+          include(date: 0.days.ago.midnight.to_time, value: expected_domain_only_total.to_s)
+        )
+    end
+
+    def expected_domain_only_total
+      remote_account.media_attachments.sum(:file_file_size) + remote_account.media_attachments.sum(:thumbnail_file_size)
     end
   end
 end
diff --git a/spec/lib/admin/metrics/measure/instance_reports_measure_spec.rb b/spec/lib/admin/metrics/measure/instance_reports_measure_spec.rb
index 62fcf84ac13caa..ca64049d9265bd 100644
--- a/spec/lib/admin/metrics/measure/instance_reports_measure_spec.rb
+++ b/spec/lib/admin/metrics/measure/instance_reports_measure_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 
 describe Admin::Metrics::Measure::InstanceReportsMeasure do
-  subject(:measure) { described_class.new(start_at, end_at, params) }
+  subject { described_class.new(start_at, end_at, params) }
 
   let(:domain) { 'example.com' }
 
@@ -21,10 +21,10 @@
     Fabricate(:report, target_account: Fabricate(:account, domain: "bar.#{domain}"))
   end
 
-  describe 'total' do
+  describe '#total' do
     context 'without include_subdomains' do
       it 'returns the expected number of accounts' do
-        expect(measure.total).to eq 2
+        expect(subject.total).to eq 2
       end
     end
 
@@ -32,14 +32,21 @@
       let(:params) { ActionController::Parameters.new(domain: domain, include_subdomains: 'true') }
 
       it 'returns the expected number of accounts' do
-        expect(measure.total).to eq 5
+        expect(subject.total).to eq 5
       end
     end
   end
 
   describe '#data' do
-    it 'runs data query without error' do
-      expect { measure.data }.to_not raise_error
+    it 'returns correct instance_reports counts' do
+      expect(subject.data.size)
+        .to eq(3)
+      expect(subject.data.map(&:symbolize_keys))
+        .to contain_exactly(
+          include(date: 2.days.ago.midnight.to_time, value: '0'),
+          include(date: 1.day.ago.midnight.to_time, value: '0'),
+          include(date: 0.days.ago.midnight.to_time, value: '2')
+        )
     end
   end
 end
diff --git a/spec/lib/admin/metrics/measure/instance_statuses_measure_spec.rb b/spec/lib/admin/metrics/measure/instance_statuses_measure_spec.rb
index df4cfe207bcd66..ac28658ea07b67 100644
--- a/spec/lib/admin/metrics/measure/instance_statuses_measure_spec.rb
+++ b/spec/lib/admin/metrics/measure/instance_statuses_measure_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 
 describe Admin::Metrics::Measure::InstanceStatusesMeasure do
-  subject(:measure) { described_class.new(start_at, end_at, params) }
+  subject { described_class.new(start_at, end_at, params) }
 
   let(:domain) { 'example.com' }
 
@@ -21,10 +21,10 @@
     Fabricate(:status, account: Fabricate(:account, domain: "bar.#{domain}"))
   end
 
-  describe 'total' do
+  describe '#total' do
     context 'without include_subdomains' do
       it 'returns the expected number of accounts' do
-        expect(measure.total).to eq 2
+        expect(subject.total).to eq 2
       end
     end
 
@@ -32,14 +32,21 @@
       let(:params) { ActionController::Parameters.new(domain: domain, include_subdomains: 'true') }
 
       it 'returns the expected number of accounts' do
-        expect(measure.total).to eq 5
+        expect(subject.total).to eq 5
       end
     end
   end
 
   describe '#data' do
-    it 'runs data query without error' do
-      expect { measure.data }.to_not raise_error
+    it 'returns correct instance_statuses counts' do
+      expect(subject.data.size)
+        .to eq(3)
+      expect(subject.data.map(&:symbolize_keys))
+        .to contain_exactly(
+          include(date: 2.days.ago.midnight.to_time, value: '0'),
+          include(date: 1.day.ago.midnight.to_time, value: '0'),
+          include(date: 0.days.ago.midnight.to_time, value: '2')
+        )
     end
   end
 end
diff --git a/spec/lib/admin/metrics/measure/interactions_measure_spec.rb b/spec/lib/admin/metrics/measure/interactions_measure_spec.rb
index e98c8305989d85..ed333380cfbe9d 100644
--- a/spec/lib/admin/metrics/measure/interactions_measure_spec.rb
+++ b/spec/lib/admin/metrics/measure/interactions_measure_spec.rb
@@ -3,15 +3,38 @@
 require 'rails_helper'
 
 describe Admin::Metrics::Measure::InteractionsMeasure do
-  subject(:measure) { described_class.new(start_at, end_at, params) }
+  subject { described_class.new(start_at, end_at, params) }
 
   let(:start_at) { 2.days.ago }
   let(:end_at)   { Time.now.utc }
   let(:params) { ActionController::Parameters.new }
 
   describe '#data' do
-    it 'runs data query without error' do
-      expect { measure.data }.to_not raise_error
+    context 'with activity tracking records' do
+      before do
+        3.times do
+          travel_to(2.days.ago) { record_interaction_activity }
+        end
+        2.times do
+          travel_to(1.day.ago) { record_interaction_activity }
+        end
+        travel_to(0.days.ago) { record_interaction_activity }
+      end
+
+      it 'returns correct activity tracker counts' do
+        expect(subject.data.size)
+          .to eq(3)
+        expect(subject.data.map(&:symbolize_keys))
+          .to contain_exactly(
+            include(date: 2.days.ago.midnight.to_time, value: '3'),
+            include(date: 1.day.ago.midnight.to_time, value: '2'),
+            include(date: 0.days.ago.midnight.to_time, value: '1')
+          )
+      end
+
+      def record_interaction_activity
+        ActivityTracker.increment('activity:interactions')
+      end
     end
   end
 end
diff --git a/spec/lib/admin/metrics/measure/new_users_measure_spec.rb b/spec/lib/admin/metrics/measure/new_users_measure_spec.rb
index fe82f8219b116e..085acbcede811b 100644
--- a/spec/lib/admin/metrics/measure/new_users_measure_spec.rb
+++ b/spec/lib/admin/metrics/measure/new_users_measure_spec.rb
@@ -3,15 +3,30 @@
 require 'rails_helper'
 
 describe Admin::Metrics::Measure::NewUsersMeasure do
-  subject(:measure) { described_class.new(start_at, end_at, params) }
+  subject { described_class.new(start_at, end_at, params) }
 
   let(:start_at) { 2.days.ago }
   let(:end_at)   { Time.now.utc }
   let(:params) { ActionController::Parameters.new }
 
   describe '#data' do
-    it 'runs data query without error' do
-      expect { measure.data }.to_not raise_error
+    context 'with user records' do
+      before do
+        3.times { Fabricate :user, created_at: 2.days.ago }
+        2.times { Fabricate :user, created_at: 1.day.ago }
+        Fabricate :user, created_at: 0.days.ago
+      end
+
+      it 'returns correct user counts' do
+        expect(subject.data.size)
+          .to eq(3)
+        expect(subject.data.map(&:symbolize_keys))
+          .to contain_exactly(
+            include(date: 2.days.ago.midnight.to_time, value: '3'),
+            include(date: 1.day.ago.midnight.to_time, value: '2'),
+            include(date: 0.days.ago.midnight.to_time, value: '1')
+          )
+      end
     end
   end
 end
diff --git a/spec/lib/admin/metrics/measure/opened_reports_measure_spec.rb b/spec/lib/admin/metrics/measure/opened_reports_measure_spec.rb
index deed64ae888b7d..d5ba78527ea2ac 100644
--- a/spec/lib/admin/metrics/measure/opened_reports_measure_spec.rb
+++ b/spec/lib/admin/metrics/measure/opened_reports_measure_spec.rb
@@ -3,15 +3,30 @@
 require 'rails_helper'
 
 describe Admin::Metrics::Measure::OpenedReportsMeasure do
-  subject(:measure) { described_class.new(start_at, end_at, params) }
+  subject { described_class.new(start_at, end_at, params) }
 
   let(:start_at) { 2.days.ago }
   let(:end_at)   { Time.now.utc }
   let(:params) { ActionController::Parameters.new }
 
   describe '#data' do
-    it 'runs data query without error' do
-      expect { measure.data }.to_not raise_error
+    context 'with report records' do
+      before do
+        3.times { Fabricate :report, created_at: 2.days.ago }
+        2.times { Fabricate :report, created_at: 1.day.ago }
+        Fabricate :report, created_at: 0.days.ago
+      end
+
+      it 'returns correct report counts' do
+        expect(subject.data.size)
+          .to eq(3)
+        expect(subject.data.map(&:symbolize_keys))
+          .to contain_exactly(
+            include(date: 2.days.ago.midnight.to_time, value: '3'),
+            include(date: 1.day.ago.midnight.to_time, value: '2'),
+            include(date: 0.days.ago.midnight.to_time, value: '1')
+          )
+      end
     end
   end
 end
diff --git a/spec/lib/admin/metrics/measure/resolved_reports_measure_spec.rb b/spec/lib/admin/metrics/measure/resolved_reports_measure_spec.rb
index cb98df2dc24b0a..f7b497590d3df9 100644
--- a/spec/lib/admin/metrics/measure/resolved_reports_measure_spec.rb
+++ b/spec/lib/admin/metrics/measure/resolved_reports_measure_spec.rb
@@ -3,15 +3,30 @@
 require 'rails_helper'
 
 describe Admin::Metrics::Measure::ResolvedReportsMeasure do
-  subject(:measure) { described_class.new(start_at, end_at, params) }
+  subject { described_class.new(start_at, end_at, params) }
 
   let(:start_at) { 2.days.ago }
   let(:end_at)   { Time.now.utc }
   let(:params) { ActionController::Parameters.new }
 
   describe '#data' do
-    it 'runs data query without error' do
-      expect { measure.data }.to_not raise_error
+    context 'with report records' do
+      before do
+        3.times { Fabricate :report, action_taken_at: 2.days.ago }
+        2.times { Fabricate :report, action_taken_at: 1.day.ago }
+        Fabricate :report, action_taken_at: 0.days.ago
+      end
+
+      it 'returns correct report counts' do
+        expect(subject.data.size)
+          .to eq(3)
+        expect(subject.data.map(&:symbolize_keys))
+          .to contain_exactly(
+            include(date: 2.days.ago.midnight.to_time, value: '3'),
+            include(date: 1.day.ago.midnight.to_time, value: '2'),
+            include(date: 0.days.ago.midnight.to_time, value: '1')
+          )
+      end
     end
   end
 end
diff --git a/spec/lib/admin/metrics/measure/tag_accounts_measure_spec.rb b/spec/lib/admin/metrics/measure/tag_accounts_measure_spec.rb
index 938b67afa32d03..b33ae7bb7106f3 100644
--- a/spec/lib/admin/metrics/measure/tag_accounts_measure_spec.rb
+++ b/spec/lib/admin/metrics/measure/tag_accounts_measure_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 
 describe Admin::Metrics::Measure::TagAccountsMeasure do
-  subject(:measure) { described_class.new(start_at, end_at, params) }
+  subject { described_class.new(start_at, end_at, params) }
 
   let!(:tag) { Fabricate(:tag) }
 
@@ -12,8 +12,39 @@
   let(:params) { ActionController::Parameters.new(id: tag.id) }
 
   describe '#data' do
-    it 'runs data query without error' do
-      expect { measure.data }.to_not raise_error
+    context 'with tagged accounts' do
+      let(:alice) { Fabricate(:account, domain: 'alice.example') }
+      let(:bob) { Fabricate(:account, domain: 'bob.example') }
+
+      before do
+        3.times do
+          travel_to(2.days.ago) { add_tag_history(alice) }
+        end
+
+        2.times do
+          travel_to(1.day.ago) do
+            add_tag_history(alice)
+            add_tag_history(bob)
+          end
+        end
+
+        add_tag_history(bob)
+      end
+
+      it 'returns correct tag_accounts counts' do
+        expect(subject.data.size)
+          .to eq(3)
+        expect(subject.data.map(&:symbolize_keys))
+          .to contain_exactly(
+            include(date: 2.days.ago.midnight.to_time, value: '1'),
+            include(date: 1.day.ago.midnight.to_time, value: '2'),
+            include(date: 0.days.ago.midnight.to_time, value: '1')
+          )
+      end
+
+      def add_tag_history(account)
+        tag.history.add(account.id)
+      end
     end
   end
 end
diff --git a/spec/lib/admin/metrics/measure/tag_servers_measure_spec.rb b/spec/lib/admin/metrics/measure/tag_servers_measure_spec.rb
index e09a2b04e5fe86..e1e2ced43a5802 100644
--- a/spec/lib/admin/metrics/measure/tag_servers_measure_spec.rb
+++ b/spec/lib/admin/metrics/measure/tag_servers_measure_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 
 describe Admin::Metrics::Measure::TagServersMeasure do
-  subject(:measure) { described_class.new(start_at, end_at, params) }
+  subject { described_class.new(start_at, end_at, params) }
 
   let!(:tag) { Fabricate(:tag) }
 
@@ -12,8 +12,38 @@
   let(:params) { ActionController::Parameters.new(id: tag.id) }
 
   describe '#data' do
-    it 'runs data query without error' do
-      expect { measure.data }.to_not raise_error
+    context 'with tagged statuses' do
+      let(:alice) { Fabricate(:account, domain: 'alice.example') }
+      let(:bob) { Fabricate(:account, domain: 'bob.example') }
+
+      before do
+        3.times do
+          status_alice = Fabricate(:status, account: alice, created_at: 2.days.ago)
+          status_alice.tags << tag
+        end
+
+        2.times do
+          status_alice = Fabricate(:status, account: alice, created_at: 1.day.ago)
+          status_alice.tags << tag
+
+          status_bob = Fabricate(:status, account: bob, created_at: 1.day.ago)
+          status_bob.tags << tag
+        end
+
+        status_bob = Fabricate(:status, account: bob, created_at: 0.days.ago)
+        status_bob.tags << tag
+      end
+
+      it 'returns correct tag counts' do
+        expect(subject.data.size)
+          .to eq(3)
+        expect(subject.data.map(&:symbolize_keys))
+          .to contain_exactly(
+            include(date: 2.days.ago.midnight.to_time, value: '1'),
+            include(date: 1.day.ago.midnight.to_time, value: '2'),
+            include(date: 0.days.ago.midnight.to_time, value: '1')
+          )
+      end
     end
   end
 end
diff --git a/spec/lib/admin/metrics/measure/tag_uses_measure_spec.rb b/spec/lib/admin/metrics/measure/tag_uses_measure_spec.rb
index 869e9374459f48..dd66f00de05694 100644
--- a/spec/lib/admin/metrics/measure/tag_uses_measure_spec.rb
+++ b/spec/lib/admin/metrics/measure/tag_uses_measure_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 
 describe Admin::Metrics::Measure::TagUsesMeasure do
-  subject(:measure) { described_class.new(start_at, end_at, params) }
+  subject { described_class.new(start_at, end_at, params) }
 
   let!(:tag) { Fabricate(:tag) }
 
@@ -12,8 +12,39 @@
   let(:params) { ActionController::Parameters.new(id: tag.id) }
 
   describe '#data' do
-    it 'runs data query without error' do
-      expect { measure.data }.to_not raise_error
+    context 'with tagged accounts' do
+      let(:alice) { Fabricate(:account, domain: 'alice.example') }
+      let(:bob) { Fabricate(:account, domain: 'bob.example') }
+
+      before do
+        3.times do
+          travel_to(2.days.ago) { add_tag_history(alice) }
+        end
+
+        2.times do
+          travel_to(1.day.ago) do
+            add_tag_history(alice)
+            add_tag_history(bob)
+          end
+        end
+
+        add_tag_history(bob)
+      end
+
+      it 'returns correct tag_uses counts' do
+        expect(subject.data.size)
+          .to eq(3)
+        expect(subject.data.map(&:symbolize_keys))
+          .to contain_exactly(
+            include(date: 2.days.ago.midnight.to_time, value: '3'),
+            include(date: 1.day.ago.midnight.to_time, value: '4'),
+            include(date: 0.days.ago.midnight.to_time, value: '1')
+          )
+      end
+
+      def add_tag_history(account)
+        tag.history.add(account.id)
+      end
     end
   end
 end

From 3f821e0d5e7b518370661b442b99840092ca9451 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 12 Apr 2024 11:41:44 +0200
Subject: [PATCH 0737/2191] Update dependency postcss-preset-env to v9.5.5
 (#29912)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index c4efdb4ad7ad84..3b8e522d53ac7f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -13200,9 +13200,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-custom-properties@npm:^13.3.6":
-  version: 13.3.6
-  resolution: "postcss-custom-properties@npm:13.3.6"
+"postcss-custom-properties@npm:^13.3.7":
+  version: 13.3.7
+  resolution: "postcss-custom-properties@npm:13.3.7"
   dependencies:
     "@csstools/cascade-layer-name-parser": "npm:^1.0.9"
     "@csstools/css-parser-algorithms": "npm:^2.6.1"
@@ -13211,7 +13211,7 @@ __metadata:
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/faa3b692966314a6dfcba93e74d91f20f2484ea328f88c809b1d0daa8ecc0d8d5125e06d1d7c18b5455ac30cb3501c7069b6e56e5efac61523a6ed75c3d73a30
+  checksum: 10c0/5d8767efae956f98d9a62a8f54d913c9ea95eaab1c906679ddeee64d87f0fb37d99c8ac1d16ec199794ed7c13a42d39ca2ea0a98df1056d400d4cbc9f31d6b94
   languageName: node
   linkType: hard
 
@@ -13672,8 +13672,8 @@ __metadata:
   linkType: hard
 
 "postcss-preset-env@npm:^9.5.2":
-  version: 9.5.4
-  resolution: "postcss-preset-env@npm:9.5.4"
+  version: 9.5.5
+  resolution: "postcss-preset-env@npm:9.5.5"
   dependencies:
     "@csstools/postcss-cascade-layers": "npm:^4.0.4"
     "@csstools/postcss-color-function": "npm:^3.0.13"
@@ -13716,7 +13716,7 @@ __metadata:
     postcss-color-hex-alpha: "npm:^9.0.4"
     postcss-color-rebeccapurple: "npm:^9.0.3"
     postcss-custom-media: "npm:^10.0.4"
-    postcss-custom-properties: "npm:^13.3.6"
+    postcss-custom-properties: "npm:^13.3.7"
     postcss-custom-selectors: "npm:^7.1.8"
     postcss-dir-pseudo-class: "npm:^8.0.1"
     postcss-double-position-gradients: "npm:^5.0.6"
@@ -13737,7 +13737,7 @@ __metadata:
     postcss-selector-not: "npm:^7.0.2"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/6af900ad2f46b640339b626317288543ebb7c47b739f4776e4006513b32eceabe0be78109aa58446fa0f50284a433b3e3a9bd48aa5730fd0ac59ef51153e8f7b
+  checksum: 10c0/afc31fb75bc5e8e223d38fd34b81da08ee340818f5e392df1781728f2ff2a9dbc75e458673ce9f52deafefa90bbc99e0bd1453271498f5e02746c785180bad07
   languageName: node
   linkType: hard
 

From c386c36866881ac3bd3d0b156264231f7b4c8053 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 12 Apr 2024 11:42:12 +0200
Subject: [PATCH 0738/2191] Add `/` keyboard shortcut to focus the search field
 (#29921)

---
 app/javascript/mastodon/features/keyboard_shortcuts/index.jsx | 2 +-
 app/javascript/mastodon/features/ui/index.jsx                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/javascript/mastodon/features/keyboard_shortcuts/index.jsx b/app/javascript/mastodon/features/keyboard_shortcuts/index.jsx
index 622ca525c1a7b2..e34295848024bb 100644
--- a/app/javascript/mastodon/features/keyboard_shortcuts/index.jsx
+++ b/app/javascript/mastodon/features/keyboard_shortcuts/index.jsx
@@ -107,7 +107,7 @@ class KeyboardShortcuts extends ImmutablePureComponent {
                 <td><FormattedMessage id='keyboard_shortcuts.back' defaultMessage='to navigate back' /></td>
               </tr>
               <tr>
-                <td><kbd>s</kbd></td>
+                <td><kbd>s</kbd>, <kbd>/</kbd></td>
                 <td><FormattedMessage id='keyboard_shortcuts.search' defaultMessage='to focus search' /></td>
               </tr>
               <tr>
diff --git a/app/javascript/mastodon/features/ui/index.jsx b/app/javascript/mastodon/features/ui/index.jsx
index 77f26fed9111c1..c84a2c51a46e3e 100644
--- a/app/javascript/mastodon/features/ui/index.jsx
+++ b/app/javascript/mastodon/features/ui/index.jsx
@@ -89,7 +89,7 @@ const mapStateToProps = state => ({
 const keyMap = {
   help: '?',
   new: 'n',
-  search: 's',
+  search: ['s', '/'],
   forceNew: 'option+n',
   toggleComposeSpoilers: 'option+x',
   focusColumn: ['1', '2', '3', '4', '5', '6', '7', '8', '9'],

From 8986e3b088db901e64a7cd3faa23dbb3b5ca9116 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 12 Apr 2024 11:48:13 +0200
Subject: [PATCH 0739/2191] Update dependency webpack-bundle-analyzer to
 v4.10.2 (#29909)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 3b8e522d53ac7f..f4e99c075155f6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -17619,8 +17619,8 @@ __metadata:
   linkType: hard
 
 "webpack-bundle-analyzer@npm:^4.8.0":
-  version: 4.10.1
-  resolution: "webpack-bundle-analyzer@npm:4.10.1"
+  version: 4.10.2
+  resolution: "webpack-bundle-analyzer@npm:4.10.2"
   dependencies:
     "@discoveryjs/json-ext": "npm:0.5.7"
     acorn: "npm:^8.0.4"
@@ -17630,14 +17630,13 @@ __metadata:
     escape-string-regexp: "npm:^4.0.0"
     gzip-size: "npm:^6.0.0"
     html-escaper: "npm:^2.0.2"
-    is-plain-object: "npm:^5.0.0"
     opener: "npm:^1.5.2"
     picocolors: "npm:^1.0.0"
     sirv: "npm:^2.0.3"
     ws: "npm:^7.3.1"
   bin:
     webpack-bundle-analyzer: lib/bin/analyzer.js
-  checksum: 10c0/6a94c8f6aa03296fb2eb00d6ad3b27bd5c551590fd253772bc61debf3177414d42701014079d4f85c74ba1ca685ae9f0cb4063812b58c21f294d108e9908e5cd
+  checksum: 10c0/00603040e244ead15b2d92981f0559fa14216381349412a30070a7358eb3994cd61a8221d34a3b3fb8202dc3d1c5ee1fbbe94c5c52da536e5b410aa1cf279a48
   languageName: node
   linkType: hard
 

From 61d108f415bc4689c52f6d0ae693568f2f25ad97 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 12 Apr 2024 05:50:46 -0400
Subject: [PATCH 0740/2191] Extract `header_tags` method in statuses/show view
 spec (#29907)

---
 spec/views/statuses/show.html.haml_spec.rb | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/spec/views/statuses/show.html.haml_spec.rb b/spec/views/statuses/show.html.haml_spec.rb
index 92ba678b6d5cd6..c74377d985ac89 100644
--- a/spec/views/statuses/show.html.haml_spec.rb
+++ b/spec/views/statuses/show.html.haml_spec.rb
@@ -21,12 +21,11 @@
 
     render
 
-    header_tags = view.content_for(:header_tags)
-
-    expect(header_tags).to match(/<meta content=".+" property="og:title">/)
-    expect(header_tags).to match(/<meta content="article" property="og:type">/)
-    expect(header_tags).to match(/<meta content=".+" property="og:image">/)
-    expect(header_tags).to match(%r{<meta content="http://.+" property="og:url">})
+    expect(header_tags)
+      .to match(/<meta content=".+" property="og:title">/)
+      .and match(/<meta content="article" property="og:type">/)
+      .and match(/<meta content=".+" property="og:image">/)
+      .and match(%r{<meta content="http://.+" property="og:url">})
   end
 
   it 'has twitter player tag' do
@@ -40,9 +39,12 @@
 
     render
 
-    header_tags = view.content_for(:header_tags)
+    expect(header_tags)
+      .to match(%r{<meta content="http://.+/media/.+/player" property="twitter:player">})
+      .and match(/<meta content="player" property="twitter:card">/)
+  end
 
-    expect(header_tags).to match(%r{<meta content="http://.+/media/.+/player" property="twitter:player">})
-    expect(header_tags).to match(/<meta content="player" property="twitter:card">/)
+  def header_tags
+    view.content_for(:header_tags)
   end
 end

From 67a37c72794be929b8dbfb182dbbda164aed99ec Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 12 Apr 2024 12:56:49 +0200
Subject: [PATCH 0741/2191] Update dependency sass to v1.75.0 (#29919)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index f4e99c075155f6..6e5330af53b304 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -15300,15 +15300,15 @@ __metadata:
   linkType: hard
 
 "sass@npm:^1.62.1":
-  version: 1.74.1
-  resolution: "sass@npm:1.74.1"
+  version: 1.75.0
+  resolution: "sass@npm:1.75.0"
   dependencies:
     chokidar: "npm:>=3.0.0 <4.0.0"
     immutable: "npm:^4.0.0"
     source-map-js: "npm:>=0.6.2 <2.0.0"
   bin:
     sass: sass.js
-  checksum: 10c0/4610257ee27823276ce4998a534b4ee9f313e5a0b3d3899e70e0f87096feeae4cd8dd3c2f765b52f57dd87f5dab22370ef63f95a837a189fbb9401396d5ce717
+  checksum: 10c0/1564ab2c8041c99a330cec93127fe8abcf65ac63eecb471610ed7f3126a2599a58b788a3a98eb8719f7f40b9b04e00c92bc9e11a9c2180ad582b8cba9fb030b0
   languageName: node
   linkType: hard
 

From c4d6e10115bfe5f336476058b44405d72dc57b2b Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 12 Apr 2024 10:57:37 +0000
Subject: [PATCH 0742/2191] Update dependency rubocop to v1.63.1 (#29878)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 3de5ab5c7caec5..9df16248cf9f6b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -646,7 +646,7 @@ GEM
       rspec-mocks (~> 3.0)
       sidekiq (>= 5, < 8)
     rspec-support (3.13.1)
-    rubocop (1.62.1)
+    rubocop (1.63.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)

From 86c53e175d5473ad49e5c321aab67465c81fabac Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 15 Apr 2024 09:26:41 +0200
Subject: [PATCH 0743/2191] Update dependency @testing-library/react to v14.3.1
 (#29947)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 6e5330af53b304..38cb311f828c74 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3331,8 +3331,8 @@ __metadata:
   linkType: hard
 
 "@testing-library/react@npm:^14.0.0":
-  version: 14.2.2
-  resolution: "@testing-library/react@npm:14.2.2"
+  version: 14.3.1
+  resolution: "@testing-library/react@npm:14.3.1"
   dependencies:
     "@babel/runtime": "npm:^7.12.5"
     "@testing-library/dom": "npm:^9.0.0"
@@ -3340,7 +3340,7 @@ __metadata:
   peerDependencies:
     react: ^18.0.0
     react-dom: ^18.0.0
-  checksum: 10c0/ab36707f6701a4a56dd217e16e00d6326e0f760bb2e716245422c7500a0b94efcd351d0aa89c4fab2916e6ebc68c983cec6b3ae0804de813cafc913a612668f6
+  checksum: 10c0/1ccf4eb1510500cc20a805cb0244c9098dca28a8745173a8f71ea1274d63774f0b7898a35c878b43c797b89c13621548909ff37843b835c1a27ee1efbbdd098c
   languageName: node
   linkType: hard
 

From e3dd60cce1b865d20e90875657d90638476216d5 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 15 Apr 2024 09:26:57 +0200
Subject: [PATCH 0744/2191] Update peter-evans/create-pull-request action to
 v6.0.3 (#29946)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .github/workflows/crowdin-download.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/crowdin-download.yml b/.github/workflows/crowdin-download.yml
index e3ad7371a86c4b..14b0542d7ea3b6 100644
--- a/.github/workflows/crowdin-download.yml
+++ b/.github/workflows/crowdin-download.yml
@@ -52,7 +52,7 @@ jobs:
 
       # Create or update the pull request
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v6.0.2
+        uses: peter-evans/create-pull-request@v6.0.3
         with:
           commit-message: 'New Crowdin translations'
           title: 'New Crowdin Translations (automated)'

From 80edd7a317ba76ffb740db27442016030babf3a9 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 15 Apr 2024 09:27:33 +0200
Subject: [PATCH 0745/2191] Update DefinitelyTyped types (non-major) (#29944)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 38cb311f828c74..46f904a4f3da43 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3699,13 +3699,13 @@ __metadata:
   linkType: hard
 
 "@types/pg@npm:^8.6.6":
-  version: 8.11.4
-  resolution: "@types/pg@npm:8.11.4"
+  version: 8.11.5
+  resolution: "@types/pg@npm:8.11.5"
   dependencies:
     "@types/node": "npm:*"
     pg-protocol: "npm:*"
     pg-types: "npm:^4.0.1"
-  checksum: 10c0/81158ffa9d2f9b2b299a1650756b90fc418e0040e654d7d9ee46734a3c874d07b638af86d765e22e9c8246054c30a0274ee4dea58a0a7ed5c0c4aa01964a09ef
+  checksum: 10c0/d64d183bee2df96cd0558231190ff629558e8c0fd3203b880f48a7d34b1eaea528d20c09b57b19c0939f369136e6c6941533592eadd71174be78d1ec0ca5e60e
   languageName: node
   linkType: hard
 
@@ -3759,11 +3759,11 @@ __metadata:
   linkType: hard
 
 "@types/react-dom@npm:^18.0.0, @types/react-dom@npm:^18.2.4":
-  version: 18.2.24
-  resolution: "@types/react-dom@npm:18.2.24"
+  version: 18.2.25
+  resolution: "@types/react-dom@npm:18.2.25"
   dependencies:
     "@types/react": "npm:*"
-  checksum: 10c0/9ec38e5ab4727c56ef17bd8e938ead88748ba19db314b8d9807714a5cae430f5b799514667b221b4f2dc8d9b4ca17dd1c3da8c41c083c2de9eddcc31bec6b8ff
+  checksum: 10c0/87604407eca6884c5b4d4657cb511dc5ba28ea1cfa5d0ce1fc2d659a7ad1b64ae85dcda60e3f010641f9a52a6a60dfcaa6be3b0d0de9d624475052a13dae01f4
   languageName: node
   linkType: hard
 
@@ -3862,12 +3862,12 @@ __metadata:
   linkType: hard
 
 "@types/react@npm:*, @types/react@npm:16 || 17 || 18, @types/react@npm:>=16.9.11, @types/react@npm:^18.2.7":
-  version: 18.2.74
-  resolution: "@types/react@npm:18.2.74"
+  version: 18.2.78
+  resolution: "@types/react@npm:18.2.78"
   dependencies:
     "@types/prop-types": "npm:*"
     csstype: "npm:^3.0.2"
-  checksum: 10c0/347e38b4c5dc20d50ff71bf04b7caaef490e5ff695e74a0088a13fbb2a0c5d125a5ecfd142adfa30f0176da0e2734942c91ba61d95ce269c43b3265bd7379361
+  checksum: 10c0/5eb8e1dd98c29aeddf40b90f466d1a9ce83b113d42a096633d632b834e7ae9821f24ba7999928de9d98cca37764532a7ea35355a8103a377d8baa750f1841b5c
   languageName: node
   linkType: hard
 

From 1906330d1389ebf88223c86f58812a32d903b73d Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 15 Apr 2024 09:27:56 +0200
Subject: [PATCH 0746/2191] Update dependency react-redux to v9.1.1 (#29943)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 46f904a4f3da43..6be5b6cbe1dc9f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -14430,8 +14430,8 @@ __metadata:
   linkType: hard
 
 "react-redux@npm:^9.0.4":
-  version: 9.1.0
-  resolution: "react-redux@npm:9.1.0"
+  version: 9.1.1
+  resolution: "react-redux@npm:9.1.1"
   dependencies:
     "@types/use-sync-external-store": "npm:^0.0.3"
     use-sync-external-store: "npm:^1.0.0"
@@ -14447,7 +14447,7 @@ __metadata:
       optional: true
     redux:
       optional: true
-  checksum: 10c0/53161b5dc4d109020fbc42d26906ace92fed9ba1d7ab6274af60e9c0684583d20d1c8ec6d58601ac7b833c6468a652bbf3d4a102149d1793cb8a28b05b042f73
+  checksum: 10c0/40ccdc8d48aefeed02c025f46e4a2e6641a2996fe985feb70d25feaaf8f101f6ef937cd1420909cad4c8869a8c79323ee071f5b090b011b950e5ae09100f5767
   languageName: node
   linkType: hard
 

From 34e826f373d20f6230d1ef0aa03ad41a3bdf5998 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 15 Apr 2024 09:28:29 +0200
Subject: [PATCH 0747/2191] Update dependency typescript to v5.4.5 (#29945)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 6be5b6cbe1dc9f..7504e3d93dd2cc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -17083,22 +17083,22 @@ __metadata:
   linkType: hard
 
 "typescript@npm:5, typescript@npm:^5.0.4":
-  version: 5.4.4
-  resolution: "typescript@npm:5.4.4"
+  version: 5.4.5
+  resolution: "typescript@npm:5.4.5"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
-  checksum: 10c0/4d8de0291204ed61ca97ad0cba2ce064e09c4988ca1c451c787e4653ba76296ba35177a52694e8a00cf4ef899d0ee83338663b926d8b7d55167ff0ba81549999
+  checksum: 10c0/2954022ada340fd3d6a9e2b8e534f65d57c92d5f3989a263754a78aba549f7e6529acc1921913560a4b816c46dce7df4a4d29f9f11a3dc0d4213bb76d043251e
   languageName: node
   linkType: hard
 
 "typescript@patch:typescript@npm%3A5#optional!builtin<compat/typescript>, typescript@patch:typescript@npm%3A^5.0.4#optional!builtin<compat/typescript>":
-  version: 5.4.4
-  resolution: "typescript@patch:typescript@npm%3A5.4.4#optional!builtin<compat/typescript>::version=5.4.4&hash=5adc0c"
+  version: 5.4.5
+  resolution: "typescript@patch:typescript@npm%3A5.4.5#optional!builtin<compat/typescript>::version=5.4.5&hash=5adc0c"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
-  checksum: 10c0/1fa41b9964a9ff0ed913b339c90b46031b2d2da3cb1a192af516610733f7f1d5f7f9754a8e22b9ac7076d3d8aedd2c4f84db3f113bad060eac3a95962443a1bf
+  checksum: 10c0/db2ad2a16ca829f50427eeb1da155e7a45e598eec7b086d8b4e8ba44e5a235f758e606d681c66992230d3fc3b8995865e5fd0b22a2c95486d0b3200f83072ec9
   languageName: node
   linkType: hard
 

From ee4ea83a879ca755c38fa374dea05b5d8b973f3e Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Mon, 15 Apr 2024 11:05:19 +0200
Subject: [PATCH 0748/2191] Remove `image_pack_tag` usage (#29925)

---
 app/helpers/branding_helper.rb      | 2 +-
 app/views/shared/_web_app.html.haml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/helpers/branding_helper.rb b/app/helpers/branding_helper.rb
index f72d6df5d9fddc..8201f36e3c2d1b 100644
--- a/app/helpers/branding_helper.rb
+++ b/app/helpers/branding_helper.rb
@@ -19,6 +19,6 @@ def _logo_as_symbol_icon
   end
 
   def render_logo
-    image_pack_tag('logo.svg', alt: 'Mastodon', class: 'logo logo--icon')
+    image_tag(frontend_asset_path('images/logo.svg'), alt: 'Mastodon', class: 'logo logo--icon')
   end
 end
diff --git a/app/views/shared/_web_app.html.haml b/app/views/shared/_web_app.html.haml
index e9ca541691db53..89d6ee567d4845 100644
--- a/app/views/shared/_web_app.html.haml
+++ b/app/views/shared/_web_app.html.haml
@@ -12,7 +12,7 @@
 
 .notranslate.app-holder#mastodon{ data: { props: Oj.dump(default_props) } }
   %noscript
-    = image_pack_tag 'logo.svg', alt: 'Mastodon'
+    = image_tag frontend_asset_path('images/logo.svg'), alt: 'Mastodon'
 
     %div
       = t('errors.noscript_html', apps_path: 'https://joinmastodon.org/apps')

From 67dd1763bb79cf6441cdd1eac15edcac72397ceb Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Mon, 15 Apr 2024 11:06:06 +0200
Subject: [PATCH 0749/2191] Fix PostCSS config (#29926)

---
 postcss.config.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/postcss.config.js b/postcss.config.js
index b6ea8130b5d234..63aeafb36d9939 100644
--- a/postcss.config.js
+++ b/postcss.config.js
@@ -1,7 +1,10 @@
-module.exports = ({ env }) => ({
+/** @type {import('postcss-load-config').Config} */
+const config = ({ env }) => ({
   plugins: [
-    'postcss-preset-env',
-    'autoprefixer',
-    env === 'production' ? 'cssnano' : '',
+    require('postcss-preset-env'),
+    require('autoprefixer'),
+    env === 'production' ? require('cssnano') : '',
   ],
 });
+
+module.exports = config;

From bf5d948237ae9e48ba38666b58ce8baee477d0df Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 15 Apr 2024 05:15:32 -0400
Subject: [PATCH 0750/2191] Fix `Style/SingleArgumentDig` cop in
 webpacker/manifest_extensions (#29929)

---
 .rubocop_todo.yml                    | 5 -----
 lib/webpacker/manifest_extensions.rb | 4 ++--
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index ea1dbe57e19cdd..d7320aa9f89a07 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -250,11 +250,6 @@ Style/SignalException:
     - 'lib/devise/strategies/two_factor_ldap_authenticatable.rb'
     - 'lib/devise/strategies/two_factor_pam_authenticatable.rb'
 
-# This cop supports unsafe autocorrection (--autocorrect-all).
-Style/SingleArgumentDig:
-  Exclude:
-    - 'lib/webpacker/manifest_extensions.rb'
-
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: Mode.
 Style/StringConcatenation:
diff --git a/lib/webpacker/manifest_extensions.rb b/lib/webpacker/manifest_extensions.rb
index 789eb81ccf3173..8a184bc52f915d 100644
--- a/lib/webpacker/manifest_extensions.rb
+++ b/lib/webpacker/manifest_extensions.rb
@@ -5,9 +5,9 @@ def lookup(name, pack_type = {})
     asset = super
 
     if pack_type[:with_integrity] && asset.respond_to?(:dig)
-      [asset.dig('src'), asset.dig('integrity')]
+      [asset['src'], asset['integrity']]
     elsif asset.respond_to?(:dig)
-      asset.dig('src')
+      asset['src']
     else
       asset
     end

From 0d9ad96d3fbbc3c88cba78d1e1e1a1e5d2a3ad79 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 15 Apr 2024 05:16:59 -0400
Subject: [PATCH 0751/2191] Rename `PremailerWebpackStrategy` ->
 `PremailerBundledAssetStrategy` (#29934)

---
 .rubocop_todo.yml                                             | 1 -
 config/initializers/premailer_rails.rb                        | 4 ++--
 ...ebpack_strategy.rb => premailer_bundled_asset_strategy.rb} | 4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)
 rename lib/{premailer_webpack_strategy.rb => premailer_bundled_asset_strategy.rb} (80%)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index d7320aa9f89a07..63d9d675748647 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -97,7 +97,6 @@ Style/FetchEnvVar:
     - 'config/initializers/paperclip.rb'
     - 'config/initializers/vapid.rb'
     - 'lib/mastodon/redis_config.rb'
-    - 'lib/premailer_webpack_strategy.rb'
     - 'lib/tasks/repo.rake'
     - 'spec/features/profile_spec.rb'
 
diff --git a/config/initializers/premailer_rails.rb b/config/initializers/premailer_rails.rb
index 5e9576be7ab108..1c8df970db3400 100644
--- a/config/initializers/premailer_rails.rb
+++ b/config/initializers/premailer_rails.rb
@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require_relative '../../lib/premailer_webpack_strategy'
+require_relative '../../lib/premailer_bundled_asset_strategy'
 
 Premailer::Rails.config.merge!(remove_ids: true,
                                adapter: :nokogiri,
                                generate_text_part: false,
                                css_to_attributes: false,
-                               strategies: [PremailerWebpackStrategy])
+                               strategies: [PremailerBundledAssetStrategy])
diff --git a/lib/premailer_webpack_strategy.rb b/lib/premailer_bundled_asset_strategy.rb
similarity index 80%
rename from lib/premailer_webpack_strategy.rb
rename to lib/premailer_bundled_asset_strategy.rb
index 6816d04745a907..fbe50cd4fc6108 100644
--- a/lib/premailer_webpack_strategy.rb
+++ b/lib/premailer_bundled_asset_strategy.rb
@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-module PremailerWebpackStrategy
+module PremailerBundledAssetStrategy
   def load(url)
-    asset_host = ENV['CDN_HOST'] || ENV['WEB_DOMAIN'] || ENV['LOCAL_DOMAIN']
+    asset_host = ENV['CDN_HOST'] || ENV['WEB_DOMAIN'] || ENV.fetch('LOCAL_DOMAIN', nil)
 
     if Webpacker.dev_server.running?
       asset_host = "#{Webpacker.dev_server.protocol}://#{Webpacker.dev_server.host_with_port}"

From 4e78cb99886f550b7f91848ea2b5bd97bce1893d Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 15 Apr 2024 11:29:39 +0200
Subject: [PATCH 0752/2191] New Crowdin Translations (automated) (#29939)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/lt.json |  5 ++++-
 app/javascript/mastodon/locales/pa.json | 14 ++++++++++++++
 app/javascript/mastodon/locales/ru.json |  1 +
 app/javascript/mastodon/locales/th.json |  4 ++--
 config/locales/ja.yml                   | 13 +++++++++++++
 config/locales/pt-BR.yml                |  6 ++++++
 6 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/app/javascript/mastodon/locales/lt.json b/app/javascript/mastodon/locales/lt.json
index 0d416be2aaeb9b..580af4f3da42af 100644
--- a/app/javascript/mastodon/locales/lt.json
+++ b/app/javascript/mastodon/locales/lt.json
@@ -83,12 +83,15 @@
   "admin.impact_report.instance_follows": "Sekėjai, kuriuos prarastų jų naudotojai",
   "admin.impact_report.title": "Poveikio apibendrinimas",
   "alert.rate_limited.message": "Pabandyk vėliau po {retry_time, time, medium}.",
-  "alert.rate_limited.title": "Sparta ribota",
+  "alert.rate_limited.title": "Sparta ribota.",
   "alert.unexpected.message": "Įvyko netikėta klaida.",
   "alert.unexpected.title": "Ups!",
   "announcement.announcement": "Skelbimas",
   "attachments_list.unprocessed": "(neapdorotas)",
   "audio.hide": "Slėpti garsą",
+  "block_modal.remote_users_caveat": "Paprašysime serverio {domain} gerbti tavo sprendimą. Tačiau atitiktis negarantuojama, nes kai kurie serveriai gali skirtingai tvarkyti blokavimus. Vieši įrašai vis tiek gali būti matomi neprisijungusiems naudotojams.",
+  "block_modal.show_less": "Rodyti mažiau",
+  "block_modal.show_more": "Rodyti daugiau",
   "boost_modal.combo": "Galima paspausti {combo}, kad praleisti kitą kartą.",
   "bundle_column_error.copy_stacktrace": "Kopijuoti klaidos ataskaitą",
   "bundle_column_error.error.body": "Paprašytos puslapio nepavyko atvaizduoti. Tai gali būti dėl mūsų kodo klaidos arba naršyklės suderinamumo problemos.",
diff --git a/app/javascript/mastodon/locales/pa.json b/app/javascript/mastodon/locales/pa.json
index e09dd9067ab079..c693c24721c6e9 100644
--- a/app/javascript/mastodon/locales/pa.json
+++ b/app/javascript/mastodon/locales/pa.json
@@ -15,21 +15,32 @@
   "account.cancel_follow_request": "ਫ਼ਾਲੋ ਕਰਨ ਨੂੰ ਰੱਦ ਕਰੋ",
   "account.copy": "ਪਰੋਫਾਇਲ ਲਈ ਲਿੰਕ ਕਾਪੀ ਕਰੋ",
   "account.direct": "ਨਿੱਜੀ ਜ਼ਿਕਰ @{name}",
+  "account.domain_blocked": "ਡੋਮੇਨ ਉੱਤੇ ਪਾਬੰਦੀ",
   "account.edit_profile": "ਪਰੋਫਾਈਲ ਨੂੰ ਸੋਧੋ",
+  "account.enable_notifications": "ਜਦੋਂ {name} ਪੋਸਟ ਕਰੇ ਤਾਂ ਮੈਨੂੰ ਸੂਚਨਾ ਦਿਓ",
+  "account.endorse": "ਪਰੋਫਾਇਲ ਉੱਤੇ ਫ਼ੀਚਰ",
   "account.featured_tags.last_status_at": "{date} ਨੂੰ ਆਖਰੀ ਪੋਸਟ",
   "account.featured_tags.last_status_never": "ਕੋਈ ਪੋਸਟ ਨਹੀਂ",
   "account.follow": "ਫ਼ਾਲੋ",
+  "account.follow_back": "ਵਾਪਸ ਫਾਲ਼ੋ ਕਰੋ",
   "account.followers": "ਫ਼ਾਲੋਅਰ",
   "account.followers.empty": "ਇਸ ਵਰਤੋਂਕਾਰ ਨੂੰ ਹਾਲੇ ਕੋਈ ਫ਼ਾਲੋ ਨਹੀਂ ਕਰਦਾ ਹੈ।",
+  "account.followers_counter": "{count, plural, one {{counter} ਫ਼ਾਲੋਅਰ} other {{counter} ਫ਼ਾਲੋਅਰ}}",
   "account.following": "ਫ਼ਾਲੋ ਕੀਤਾ",
+  "account.following_counter": "{count, plural, one {{counter} ਨੂੰ ਫ਼ਾਲੋ} other {{counter} ਨੂੰ ਫ਼ਾਲੋ}}",
   "account.follows.empty": "ਇਹ ਵਰਤੋਂਕਾਰ ਹਾਲੇ ਕਿਸੇ ਨੂੰ ਫ਼ਾਲੋ ਨਹੀਂ ਕਰਦਾ ਹੈ।",
   "account.go_to_profile": "ਪਰੋਫਾਇਲ ਉੱਤੇ ਜਾਓ",
   "account.media": "ਮੀਡੀਆ",
   "account.muted": "ਮੌਨ ਕੀਤੀਆਂ",
+  "account.mutual": "ਸਾਂਝੇ",
+  "account.no_bio": "ਕੋਈ ਵਰਣਨ ਨਹੀਂ ਦਿੱਤਾ।",
+  "account.open_original_page": "ਅਸਲ ਸਫ਼ੇ ਨੂੰ ਖੋਲ੍ਹੋ",
   "account.posts": "ਪੋਸਟਾਂ",
   "account.posts_with_replies": "ਪੋਸਤਾਂ ਅਤੇ ਜਵਾਬ",
+  "account.report": "{name} ਬਾਰੇ ਰਿਪੋਰਟ ਕਰੋ",
   "account.requested": "ਮਨਜ਼ੂਰੀ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ। ਫ਼ਾਲੋ ਬੇਨਤੀਆਂ ਨੂੰ ਰੱਦ ਕਰਨ ਲਈ ਕਲਿੱਕ ਕਰੋ",
   "account.requested_follow": "{name} ਨੇ ਤੁਹਾਨੂੰ ਫ਼ਾਲੋ ਕਰਨ ਦੀ ਬੇਨਤੀ ਕੀਤੀ ਹੈ",
+  "account.share": "{name} ਦਾ ਪਰੋਫ਼ਾਇਲ ਸਾਂਝਾ ਕਰੋ",
   "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
   "account.unblock": "@{name} ਤੋਂ ਪਾਬੰਦੀ ਹਟਾਓ",
   "account.unblock_domain": "{domain} ਡੋਮੇਨ ਤੋਂ ਪਾਬੰਦੀ ਹਟਾਓ",
@@ -41,6 +52,9 @@
   "admin.dashboard.retention.cohort_size": "ਨਵੇਂ ਵਰਤੋਂਕਾਰ",
   "alert.unexpected.title": "ਓਹੋ!",
   "announcement.announcement": "ਹੋਕਾ",
+  "block_modal.show_less": "ਘੱਟ ਦਿਖਾਓ",
+  "block_modal.show_more": "ਵੱਧ ਦਿਖਾਓ",
+  "block_modal.title": "ਵਰਤੋਂਕਾਰ ਉੱਤੇ ਪਾਬੰਦੀ ਲਾਉਣੀ ਹੈ?",
   "bundle_column_error.error.title": "ਓਹ ਹੋ!",
   "bundle_column_error.network.title": "ਨੈੱਟਵਰਕ ਦੀ ਸਮੱਸਿਆ",
   "bundle_column_error.retry": "ਮੁੜ-ਕੋਸ਼ਿਸ਼ ਕਰੋ",
diff --git a/app/javascript/mastodon/locales/ru.json b/app/javascript/mastodon/locales/ru.json
index 7ff98ba53b729d..16c4d19985b59b 100644
--- a/app/javascript/mastodon/locales/ru.json
+++ b/app/javascript/mastodon/locales/ru.json
@@ -514,6 +514,7 @@
   "notifications.permission_denied": "Уведомления на рабочем столе недоступны, так как вы запретили их отправку в браузере. Проверьте настройки для сайта, чтобы включить их обратно.",
   "notifications.permission_denied_alert": "Уведомления на рабочем столе недоступны, так как вы ранее отклонили запрос на их отправку.",
   "notifications.permission_required": "Чтобы включить уведомления на рабочем столе, необходимо разрешить их в браузере.",
+  "notifications.policy.filter_new_accounts_title": "Новые учётные записи",
   "notifications_permission_banner.enable": "Включить уведомления",
   "notifications_permission_banner.how_to_control": "Получайте уведомления даже когда Mastodon закрыт, включив уведомления на рабочем столе. А чтобы лишний шум не отвлекал, вы можете настроить какие уведомления вы хотите получать, нажав на кнопку {icon} выше.",
   "notifications_permission_banner.title": "Будьте в курсе происходящего",
diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json
index 4a7c22439560ab..952ed5adf59e86 100644
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@@ -16,12 +16,12 @@
   "account.badges.bot": "อัตโนมัติ",
   "account.badges.group": "กลุ่ม",
   "account.block": "ปิดกั้น @{name}",
-  "account.block_domain": "เลิกปิดกั้นโดเมน {domain} แล้ว",
+  "account.block_domain": "ปิดกั้นโดเมน {domain}",
   "account.block_short": "ปิดกั้น",
   "account.blocked": "ปิดกั้นอยู่",
   "account.browse_more_on_origin_server": "เรียกดูเพิ่มเติมในโปรไฟล์ดั้งเดิม",
   "account.cancel_follow_request": "ยกเลิกการติดตาม",
-  "account.copy": "Copy link to profile",
+  "account.copy": "คัดลอกลิงก์ไปยังโปรไฟล์",
   "account.direct": "กล่าวถึง @{name} แบบส่วนตัว",
   "account.disable_notifications": "หยุดแจ้งเตือนฉันเมื่อ @{name} โพสต์",
   "account.domain_blocked": "ปิดกั้นโดเมนอยู่",
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 0d585131ed7272..f9cbb6a75e64d0 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -1629,13 +1629,26 @@ ja:
     import: データのインポート
     import_and_export: インポート・エクスポート
     migrate: アカウントの引っ越し
+    notifications: メール通知
     preferences: ユーザー設定
     profile: プロフィール
     relationships: フォロー・フォロワー
+    severed_relationships: 途切れたフォロー関係
     statuses_cleanup: 投稿の自動削除
     strikes: モデレーションストライク
     two_factor_authentication: 二要素認証
     webauthn_authentication: セキュリティキー
+  severed_relationships:
+    download: 取り出す (%{count}件)
+    event_type:
+      account_suspension: アカウントの停止 (%{target_name})
+      domain_block: 管理者によるサーバーの停止 (%{target_name})
+      user_domain_block: ユーザーによるドメインブロック (%{target_name})
+    lost_followers: 解除されたフォロワー
+    lost_follows: 解除されたフォロー
+    preamble: ドメインをブロックしたりモデレーターによってリモートのサーバーが停止された場合、巻き込みでフォロー・フォロワー関係が失われることがあります。このようにして解除されたフォロー・フォロワーはリスト形式で取り出して内容を確認したり、対応している場合は他のサーバーでインポートできます。
+    purged: 管理者がサーバーの情報を削除したため表示できません。
+    type: 理由
   statuses:
     attached:
       audio:
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 0b28c8c1b5e740..4c22335eaa9cf3 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -1669,6 +1669,9 @@ pt-BR:
     event_type:
       account_suspension: Suspensão da conta (%{target_name})
       domain_block: Suspensão do servidor (%{target_name})
+      user_domain_block: Você bloqueou %{target_name}
+    lost_followers: Seguidores perdidos
+    type: Evento
   statuses:
     attached:
       audio:
@@ -1874,6 +1877,9 @@ pt-BR:
       follows_subtitle: Siga contas conhecidas
       follows_title: Quem seguir
       follows_view_more: Veja mais pessoas para seguir
+      hashtags_recent_count:
+        one: "%{people} Pessoas nos últimos 2 dias"
+        other: "%{people} pessoas nos últimos 2 dias"
       hashtags_subtitle: Explorar o que está em alta nos últimos 2 dias
       hashtags_title: Hashtags em alta
       hashtags_view_more: Ver mais hashtags em alta

From 1549e6a9dc46c31c723216041d798b470b708080 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 15 Apr 2024 06:19:23 -0400
Subject: [PATCH 0753/2191] Drop support for Ruby 3.0 (reaching EOL) (#29702)

---
 .github/workflows/test-ruby.yml | 3 ---
 .rubocop.yml                    | 8 +++++++-
 Gemfile                         | 2 +-
 README.md                       | 2 +-
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/test-ruby.yml b/.github/workflows/test-ruby.yml
index 624c3b7a2f7e02..172b5271d880de 100644
--- a/.github/workflows/test-ruby.yml
+++ b/.github/workflows/test-ruby.yml
@@ -111,7 +111,6 @@ jobs:
       fail-fast: false
       matrix:
         ruby-version:
-          - '3.0'
           - '3.1'
           - '.ruby-version'
           - '3.3'
@@ -187,7 +186,6 @@ jobs:
       fail-fast: false
       matrix:
         ruby-version:
-          - '3.0'
           - '3.1'
           - '.ruby-version'
           - '3.3'
@@ -287,7 +285,6 @@ jobs:
       fail-fast: false
       matrix:
         ruby-version:
-          - '3.0'
           - '3.1'
           - '.ruby-version'
           - '3.3'
diff --git a/.rubocop.yml b/.rubocop.yml
index 7fb8ab0c55fa82..e80f3b2938e77c 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -14,7 +14,7 @@ require:
   - ./lib/linter/rubocop_middle_dot
 
 AllCops:
-  TargetRubyVersion: 3.0 # Set to minimum supported version of CI
+  TargetRubyVersion: 3.1 # Set to minimum supported version of CI
   DisplayCopNames: true
   DisplayStyleGuide: true
   ExtraDetails: true
@@ -80,6 +80,11 @@ Metrics/CyclomaticComplexity:
 Metrics/ParameterLists:
   CountKeywordArgs: false
 
+# Reason: Prefer seeing a variable name
+# https://docs.rubocop.org/rubocop/cops_naming.html#namingblockforwarding
+Naming/BlockForwarding:
+  EnforcedStyle: explicit
+
 # Reason: Prevailing style is argument file paths
 # https://docs.rubocop.org/rubocop-rails/cops_rails.html#railsfilepath
 Rails/FilePath:
@@ -180,6 +185,7 @@ Style/FormatStringToken:
 # https://docs.rubocop.org/rubocop/cops_style.html#stylehashsyntax
 Style/HashSyntax:
   EnforcedStyle: ruby19_no_mixed_keys
+  EnforcedShorthandSyntax: either
 
 # Reason:
 # https://docs.rubocop.org/rubocop/cops_style.html#stylenumericliterals
diff --git a/Gemfile b/Gemfile
index a9affea4177384..35e0b2928099df 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 source 'https://rubygems.org'
-ruby '>= 3.0.0'
+ruby '>= 3.1.0'
 
 gem 'puma', '~> 6.3'
 gem 'rails', '~> 7.1.1'
diff --git a/README.md b/README.md
index 7f9b115c4f9341..1d0e75dabad762 100644
--- a/README.md
+++ b/README.md
@@ -69,7 +69,7 @@ Mastodon acts as an OAuth2 provider, so 3rd party apps can use the REST and Stre
 
 - **PostgreSQL** 12+
 - **Redis** 4+
-- **Ruby** 3.0+
+- **Ruby** 3.1+
 - **Node.js** 16+
 
 The repository includes deployment configurations for **Docker and docker-compose** as well as specific platforms like **Heroku**, **Scalingo**, and **Nanobox**. For Helm charts, reference the [mastodon/chart repository](https://github.com/mastodon/chart). The [**standalone** installation guide](https://docs.joinmastodon.org/admin/install/) is available in the documentation.

From 4117c8f6b88f72a9f2a3177f2c02708b7e05c772 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 15 Apr 2024 13:56:48 +0200
Subject: [PATCH 0754/2191] Fix unfollow button being out of frame on small
 screens on old browsers (#29923)

---
 app/javascript/styles/mastodon/components.scss | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index e35b6962341084..87e13ee45e2fa3 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -7863,8 +7863,13 @@ noscript {
         }
       }
 
-      @container account-header (max-width: 372px) {
-        .optional {
+      .optional {
+        @container account-header (max-width: 372px) {
+          display: none;
+        }
+
+        // Fallback for older browsers with no container queries support
+        @media screen and (max-width: 372px + 55px) {
           display: none;
         }
       }

From 7fed4a974096ddbbbf23f8b0bb2b672f922b8b47 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 15 Apr 2024 11:24:31 -0400
Subject: [PATCH 0755/2191] Pull out repeated setup to shared setup in
 statusus/show view spec (#29927)

---
 spec/views/statuses/show.html.haml_spec.rb | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/spec/views/statuses/show.html.haml_spec.rb b/spec/views/statuses/show.html.haml_spec.rb
index c74377d985ac89..1c408db6c5ea7e 100644
--- a/spec/views/statuses/show.html.haml_spec.rb
+++ b/spec/views/statuses/show.html.haml_spec.rb
@@ -3,22 +3,23 @@
 require 'rails_helper'
 
 describe 'statuses/show.html.haml', :without_verify_partial_doubles do
+  let(:alice) { Fabricate(:account, username: 'alice', display_name: 'Alice') }
+  let(:status) { Fabricate(:status, account: alice, text: 'Hello World') }
+
   before do
     allow(view).to receive_messages(api_oembed_url: '', site_title: 'example site', site_hostname: 'example.com', full_asset_url: '//asset.host/image.svg', current_account: nil, single_user_mode?: false)
     allow(view).to receive(:local_time)
     allow(view).to receive(:local_time_ago)
     assign(:instance_presenter, InstancePresenter.new)
-  end
 
-  it 'has valid opengraph tags' do
-    alice  = Fabricate(:account, username: 'alice', display_name: 'Alice')
-    status = Fabricate(:status, account: alice, text: 'Hello World')
     Fabricate(:media_attachment, account: alice, status: status, type: :video)
 
     assign(:status, status)
     assign(:account, alice)
     assign(:descendant_threads, [])
+  end
 
+  it 'has valid opengraph tags' do
     render
 
     expect(header_tags)
@@ -29,14 +30,6 @@
   end
 
   it 'has twitter player tag' do
-    alice  = Fabricate(:account, username: 'alice', display_name: 'Alice')
-    status = Fabricate(:status, account: alice, text: 'Hello World')
-    Fabricate(:media_attachment, account: alice, status: status, type: :video)
-
-    assign(:status, status)
-    assign(:account, alice)
-    assign(:descendant_threads, [])
-
     render
 
     expect(header_tags)

From 285d4123b5e8cf4b9cfc51a8ce506054f481ce95 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 16 Apr 2024 10:36:21 +0200
Subject: [PATCH 0756/2191] New Crowdin Translations (automated) (#29955)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/eu.json  |  2 +-
 app/javascript/mastodon/locales/fr.json  |  2 +-
 app/javascript/mastodon/locales/fy.json  | 32 ++++++++++-
 app/javascript/mastodon/locales/ia.json  | 73 ++++++++++++++++++++++--
 app/javascript/mastodon/locales/nl.json  |  4 +-
 app/javascript/mastodon/locales/tok.json | 23 ++++++--
 config/locales/de.yml                    |  2 +-
 7 files changed, 124 insertions(+), 14 deletions(-)

diff --git a/app/javascript/mastodon/locales/eu.json b/app/javascript/mastodon/locales/eu.json
index bc57c4cee5cee7..529c1ab9c94d60 100644
--- a/app/javascript/mastodon/locales/eu.json
+++ b/app/javascript/mastodon/locales/eu.json
@@ -408,7 +408,7 @@
   "lightbox.previous": "Aurrekoa",
   "limited_account_hint.action": "Erakutsi profila hala ere",
   "limited_account_hint.title": "Profil hau ezkutatu egin dute {domain} zerbitzariko moderatzaileek.",
-  "link_preview.author": "{name}(r)en eskutik",
+  "link_preview.author": "Egilea: {name}",
   "lists.account.add": "Gehitu zerrendara",
   "lists.account.remove": "Kendu zerrendatik",
   "lists.delete": "Ezabatu zerrenda",
diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json
index ace3d41e0410e9..18fce401b25c07 100644
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@@ -534,7 +534,7 @@
   "onboarding.actions.go_to_home": "Allers vers mon flux principal",
   "onboarding.compose.template": "Bonjour #Mastodon !",
   "onboarding.follows.empty": "Malheureusement, aucun résultat ne peut être affiché pour le moment. Vous pouvez essayer d'utiliser la recherche ou parcourir la page de découverte pour trouver des personnes à suivre, ou réessayez plus tard.",
-  "onboarding.follows.lead": "You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!",
+  "onboarding.follows.lead": "Votre flux principal est le principal moyen de découvrir Mastodon. Plus vous suivez de personnes, plus il sera actif et intéressant. Pour commencer, voici quelques suggestions :",
   "onboarding.follows.title": "Personnaliser votre flux principal",
   "onboarding.profile.discoverable": "Rendre mon profil découvrable",
   "onboarding.profile.discoverable_hint": "Lorsque vous acceptez d'être découvert sur Mastodon, vos messages peuvent apparaître dans les résultats de recherche et les tendances, et votre profil peut être suggéré à des personnes ayant des intérêts similaires aux vôtres.",
diff --git a/app/javascript/mastodon/locales/fy.json b/app/javascript/mastodon/locales/fy.json
index 97119e30c0b8fb..a22f4767a65ae8 100644
--- a/app/javascript/mastodon/locales/fy.json
+++ b/app/javascript/mastodon/locales/fy.json
@@ -13,7 +13,7 @@
   "about.rules": "Serverrigels",
   "account.account_note_header": "Opmerking",
   "account.add_or_remove_from_list": "Tafoegje oan of fuortsmite út listen",
-  "account.badges.bot": "Bot",
+  "account.badges.bot": "Automatisearre",
   "account.badges.group": "Groep",
   "account.block": "@{name} blokkearje",
   "account.block_domain": "Domein {domain} blokkearje",
@@ -89,6 +89,11 @@
   "announcement.announcement": "Oankundiging",
   "attachments_list.unprocessed": "(net ferwurke)",
   "audio.hide": "Audio ferstopje",
+  "block_modal.show_less": "Minder toane",
+  "block_modal.show_more": "Mear toane",
+  "block_modal.they_cant_mention": "Sy kinne jo net fermelde of folgje.",
+  "block_modal.title": "Brûker blokkearje?",
+  "block_modal.you_wont_see_mentions": "Jo sjogge gjin berjochten mear dy’t dizze account fermelde.",
   "boost_modal.combo": "Jo kinne op {combo} drukke om dit de folgjende kear oer te slaan",
   "bundle_column_error.copy_stacktrace": "Flaterrapport kopiearje",
   "bundle_column_error.error.body": "De opfrege side koe net werjûn wurde. It kin wêze troch in flater yn ús koade, of in probleem mei browserkompatibiliteit.",
@@ -169,6 +174,7 @@
   "confirmations.delete_list.message": "Binne jo wis dat jo dizze list foar permanint fuortsmite wolle?",
   "confirmations.discard_edit_media.confirm": "Fuortsmite",
   "confirmations.discard_edit_media.message": "Jo hawwe net-bewarre wizigingen yn de mediabeskriuwing of foarfertoaning, wolle jo dizze dochs fuortsmite?",
+  "confirmations.domain_block.confirm": "Server blokkearje",
   "confirmations.domain_block.message": "Binne jo echt wis dat jo alles fan {domain} negearje wolle? Yn de measte gefallen is it blokkearjen of negearjen fan in pear spesifike persoanen genôch en better. Jo sille gjin berjochten fan dizze server op iepenbiere tiidlinen sjen of yn jo meldingen. Jo folgers fan dizze server wurde fuortsmiten.",
   "confirmations.edit.confirm": "Bewurkje",
   "confirmations.edit.message": "Troch no te bewurkjen sil it berjocht dat jo no oan it skriuwen binne oerskreaun wurde. Wolle jo trochgean?",
@@ -200,6 +206,20 @@
   "dismissable_banner.explore_statuses": "Dizze berjochten winne oan populariteit op dizze en oare servers binnen it desintrale netwurk. Nijere berjochten mei mear boosts en favoriten stean heger.",
   "dismissable_banner.explore_tags": "Dizze hashtags winne oan populariteit op dizze en oare servers binnen it desintrale netwurk.",
   "dismissable_banner.public_timeline": "Dit binne de meast resinte iepenbiere berjochten fan accounts op it sosjale web dy’t troch minsken op {domain} folge wurde.",
+  "domain_block_modal.block": "Server blokkearje",
+  "domain_block_modal.block_account_instead": "Yn stee hjirfan {name} blokkearje",
+  "domain_block_modal.they_can_interact_with_old_posts": "Minsken op dizze server kinne ynteraksje hawwe mei jo âlde berjochten.",
+  "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_followers": "Al jo folgers fan dizze server wurde ûntfolge.",
+  "domain_block_modal.you_wont_see_posts": "Jo sjogge gjin berjochten of meldingen mear fan brûkers op dizze server.",
+  "domain_pill.server": "Server",
+  "domain_pill.their_handle": "Harren fediverse-adres:",
+  "domain_pill.their_server": "Harren digitale thús, wer’t al harren berjochten binne.",
+  "domain_pill.username": "Brûkersnamme",
+  "domain_pill.whats_in_a_handle": "Wat is in fediverse-adres?",
+  "domain_pill.your_handle": "Jo fediverse-adres:",
   "embed.instructions": "Embed this status on your website by copying the code below.",
   "embed.preview": "Sa komt it der út te sjen:",
   "emoji_button.activity": "Aktiviteiten",
@@ -266,6 +286,7 @@
   "filter_modal.select_filter.subtitle": "In besteande kategory brûke of in nije oanmeitsje",
   "filter_modal.select_filter.title": "Dit berjocht filterje",
   "filter_modal.title.status": "In berjocht filterje",
+  "filtered_notifications_banner.title": "Filtere meldingen",
   "firehose.all": "Alles",
   "firehose.local": "Dizze server",
   "firehose.remote": "Oare servers",
@@ -394,6 +415,9 @@
   "loading_indicator.label": "Lade…",
   "media_gallery.toggle_visible": "{number, plural, one {ôfbylding ferstopje} other {ôfbyldingen ferstopje}}",
   "moved_to_account_banner.text": "Omdat jo nei {movedToAccount} ferhuze binne is jo account {disabledAccount} op dit stuit útskeakele.",
+  "mute_modal.hide_options": "Opsjes ferstopje",
+  "mute_modal.indefinite": "Oant ik se net mear negearje",
+  "mute_modal.show_options": "Opsjes toane",
   "navigation_bar.about": "Oer",
   "navigation_bar.advanced_interface": "Yn avansearre webomjouwing iepenje",
   "navigation_bar.blocks": "Blokkearre brûkers",
@@ -429,14 +453,20 @@
   "notification.own_poll": "Jo poll is beëinige",
   "notification.poll": "In enkête dêr’t jo yn stimd hawwe is beëinige",
   "notification.reblog": "{name} hat jo berjocht boost",
+  "notification.relationships_severance_event.learn_more": "Mear ynfo",
   "notification.status": "{name} hat in berjocht pleatst",
   "notification.update": "{name} hat in berjocht bewurke",
+  "notification_requests.accept": "Akseptearje",
+  "notification_requests.dismiss": "Ofwize",
+  "notification_requests.notifications_from": "Meldingen fan {name}",
+  "notification_requests.title": "Filtere meldingen",
   "notifications.clear": "Meldingen wiskje",
   "notifications.clear_confirmation": "Binne jo wis dat jo al jo meldingen permanint fuortsmite wolle?",
   "notifications.column_settings.admin.report": "Nije rapportaazjes:",
   "notifications.column_settings.admin.sign_up": "Nije registraasjes:",
   "notifications.column_settings.alert": "Desktopmeldingen",
   "notifications.column_settings.favourite": "Favoriten:",
+  "notifications.column_settings.filter_bar.advanced": "Alle kategoryen toane",
   "notifications.column_settings.follow": "Nije folgers:",
   "notifications.column_settings.follow_request": "Nij folchfersyk:",
   "notifications.column_settings.mention": "Fermeldingen:",
diff --git a/app/javascript/mastodon/locales/ia.json b/app/javascript/mastodon/locales/ia.json
index 428abb8c5acde0..af28f9ce37be35 100644
--- a/app/javascript/mastodon/locales/ia.json
+++ b/app/javascript/mastodon/locales/ia.json
@@ -9,15 +9,18 @@
   "about.domain_blocks.suspended.explanation": "Nulle datos de iste servitor essera processate, immagazinate o excambiate, rendente omne interaction o communication con usatores de iste servitor impossibile.",
   "about.domain_blocks.suspended.title": "Suspendite",
   "about.not_available": "Iste information non ha essite rendite disponibile sur iste servitor.",
+  "about.powered_by": "Rete social decentralisate, actionate per {mastodon}",
   "about.rules": "Regulas del servitor",
   "account.account_note_header": "Nota",
   "account.add_or_remove_from_list": "Adder a, o remover de listas",
+  "account.badges.bot": "Automatisate",
   "account.badges.group": "Gruppo",
   "account.block": "Blocar @{name}",
   "account.block_domain": "Blocar dominio {domain}",
   "account.block_short": "Blocar",
   "account.blocked": "Blocate",
   "account.browse_more_on_origin_server": "Navigar plus sur le profilo original",
+  "account.cancel_follow_request": "Cancellar sequimento",
   "account.copy": "Copiar ligamine a profilo",
   "account.direct": "Mentionar privatemente @{name}",
   "account.disable_notifications": "Non plus notificar me quando @{name} publica",
@@ -26,7 +29,7 @@
   "account.enable_notifications": "Notificar me quando @{name} publica",
   "account.endorse": "Evidentiar sur le profilo",
   "account.featured_tags.last_status_at": "Ultime message publicate le {date}",
-  "account.featured_tags.last_status_never": "Necun messages",
+  "account.featured_tags.last_status_never": "Necun message",
   "account.featured_tags.title": "Hashtags eminente de {name}",
   "account.follow": "Sequer",
   "account.follow_back": "Sequer in retorno",
@@ -34,9 +37,10 @@
   "account.followers.empty": "Necuno seque ancora iste usator.",
   "account.followers_counter": "{count, plural, one {{counter} sequitor} other {{counter} sequitores}}",
   "account.following": "Sequente",
+  "account.following_counter": "{count, plural, one {{counter} sequite} other {{counter} sequites}}",
   "account.follows.empty": "Iste usator non seque ancora alcuno.",
   "account.go_to_profile": "Vader al profilo",
-  "account.hide_reblogs": "Celar boosts de @{name}",
+  "account.hide_reblogs": "Celar impulsos de @{name}",
   "account.in_memoriam": "In memoriam.",
   "account.languages": "Cambiar le linguas subscribite",
   "account.link_verified_on": "Le proprietate de iste ligamine ha essite verificate le {date}",
@@ -74,9 +78,13 @@
   "alert.unexpected.message": "Un error inexpectate ha occurrite.",
   "announcement.announcement": "Annuncio",
   "audio.hide": "Celar audio",
+  "block_modal.remote_users_caveat": "Nos demandera al servitor {domain} de respectar tu decision. Nonobstante, le conformitate non es garantite perque alcun servitores pote tractar le blocadas de maniera differente. Le messages public pote esser totevia visibile pro le usatores non authenticate.",
   "block_modal.show_less": "Monstrar minus",
   "block_modal.show_more": "Monstrar plus",
+  "block_modal.they_cant_see_posts": "Iste persona non potera vider tu messages e tu non videra le sues.",
   "block_modal.title": "Blocar usator?",
+  "block_modal.you_wont_see_mentions": "Tu non videra le messages que mentiona iste persona.",
+  "boost_modal.combo": "Tu pote premer {combo} pro saltar isto le proxime vice",
   "bundle_column_error.error.title": "Oh, no!",
   "bundle_column_error.network.title": "Error de rete",
   "bundle_column_error.retry": "Tentar novemente",
@@ -98,6 +106,7 @@
   "column.lists": "Listas",
   "column.mutes": "Usatores silentiate",
   "column.notifications": "Notificationes",
+  "column.pins": "Messages fixate",
   "column.public": "Chronologia federate",
   "column_back_button.label": "Retro",
   "column_header.hide_settings": "Celar le parametros",
@@ -113,6 +122,8 @@
   "compose.published.open": "Aperir",
   "compose.saved.body": "Message salvate.",
   "compose_form.direct_message_warning_learn_more": "Apprender plus",
+  "compose_form.encryption_warning": "Le messages sur Mastodon non es cryptate de puncta a puncta. Non condivide alcun information sensibile usante Mastodon.",
+  "compose_form.hashtag_warning": "Iste message non essera listate sub alcun hashtag perque illo non es public. Solmente le messages public pote esser cercate per hashtag.",
   "compose_form.lock_disclaimer": "Tu conto non es {locked}. Quicunque pote sequer te pro vider tu messages solo pro sequitores.",
   "compose_form.lock_disclaimer.lock": "serrate",
   "compose_form.poll.duration": "Durata del sondage",
@@ -142,6 +153,7 @@
   "confirmations.logout.confirm": "Clauder session",
   "confirmations.logout.message": "Es tu secur que tu vole clauder le session?",
   "confirmations.mute.confirm": "Silentiar",
+  "confirmations.redraft.message": "Es tu secur de voler deler iste message e rescriber lo? Le favorites e le impulsos essera perdite, e le responsas al message original essera orphanate.",
   "confirmations.reply.confirm": "Responder",
   "confirmations.unfollow.confirm": "Non plus sequer",
   "confirmations.unfollow.message": "Es tu secur que tu vole cessar de sequer {name}?",
@@ -158,16 +170,24 @@
   "directory.recently_active": "Recentemente active",
   "disabled_account_banner.account_settings": "Parametros de conto",
   "disabled_account_banner.text": "Tu conto {disabledAccount} es actualmente disactivate.",
+  "dismissable_banner.community_timeline": "Ecce le messages public le plus recente del personas con contos sur {domain}.",
   "dismissable_banner.dismiss": "Dimitter",
+  "dismissable_banner.explore_links": "Istes es le articulos de novas que se condivide le plus sur le rete social hodie. Le articulos de novas le plus recente, publicate per plus personas differente, se classifica plus in alto.",
+  "dismissable_banner.explore_statuses": "Ecce le messages de tote le rete social que gania popularitate hodie. Le messages plus nove con plus impulsos e favorites se classifica plus in alto.",
+  "dismissable_banner.public_timeline": "Istes es le messages public le plus recente del personas sur le rete social que le gente sur {domain} seque.",
   "domain_block_modal.block": "Blocar le servitor",
   "domain_block_modal.block_account_instead": "Blocar @{name} in su loco",
+  "domain_block_modal.they_can_interact_with_old_posts": "Le personas de iste servitor pote interager con tu messages ancian.",
   "domain_block_modal.they_cant_follow": "Nulle persona ab iste servitor pote sequer te.",
   "domain_block_modal.they_wont_know": "Illes non sapera que illes ha essite blocate.",
   "domain_block_modal.title": "Blocar dominio?",
   "domain_block_modal.you_will_lose_followers": "Omne sequitores ab iste servitor essera removite.",
   "domain_block_modal.you_wont_see_posts": "Tu non videra messages e notificationes ab usatores sur iste servitor.",
   "domain_pill.server": "Servitor",
+  "domain_pill.their_server": "Su casa digital, ubi vive tote su messages.",
   "domain_pill.username": "Nomine de usator",
+  "domain_pill.your_server": "Tu casa digital, ubi vive tote tu messages. Non te place? Cambia de servitor a omne momento e porta tu sequitores con te.",
+  "embed.instructions": "Incorpora iste message sur tu sito web con le codice sequente.",
   "embed.preview": "Ecce como illlo parera:",
   "emoji_button.activity": "Activitate",
   "emoji_button.clear": "Rader",
@@ -187,11 +207,15 @@
   "empty_column.account_timeline": "Nulle messages hic!",
   "empty_column.account_unavailable": "Profilo non disponibile",
   "empty_column.blocks": "Tu non ha blocate alcun usator ancora.",
+  "empty_column.bookmarked_statuses": "Tu non ha ancora messages in marcapaginas. Quando tu adde un message al marcapaginas, illo apparera hic.",
   "empty_column.domain_blocks": "Il non ha dominios blocate ancora.",
   "empty_column.explore_statuses": "Il non ha tendentias in iste momento. Reveni plus tarde!",
   "empty_column.favourited_statuses": "Tu non ha alcun message favorite ancora. Quando tu marca un message como favorite, illo apparera hic.",
+  "empty_column.favourites": "Necuno ha ancora marcate iste message como favorite. Quando alcuno lo face, ille apparera hic.",
   "empty_column.followed_tags": "Tu non ha ancora sequite alcun hashtags. Quando tu lo face, illos apparera hic.",
   "empty_column.hashtag": "Il non ha ancora alcun cosa in iste hashtag.",
+  "empty_column.home": "Tu chronologia de initio es vacue! Seque plus personas pro plenar lo.",
+  "empty_column.list": "Iste lista es ancora vacue. Quando le membros de iste lista publica nove messages, illos apparera hic.",
   "errors.unexpected_crash.report_issue": "Signalar un defecto",
   "explore.search_results": "Resultatos de recerca",
   "explore.suggested_follows": "Personas",
@@ -199,6 +223,7 @@
   "explore.trending_links": "Novas",
   "explore.trending_statuses": "Messages",
   "explore.trending_tags": "Hashtags",
+  "filter_modal.added.context_mismatch_explanation": "Iste categoria de filtros non se applica al contexto in le qual tu ha accedite a iste message. Pro filtrar le message in iste contexto tamben, modifica le filtro.",
   "filter_modal.added.review_and_configure_title": "Parametros de filtro",
   "filter_modal.added.settings_link": "pagina de parametros",
   "filter_modal.added.short_explanation": "Iste message ha essite addite al sequente categoria de filtros: {title}.",
@@ -231,6 +256,8 @@
   "hashtag.column_header.tag_mode.none": "sin {additional}",
   "hashtag.column_settings.select.no_options_message": "Nulle suggestiones trovate",
   "hashtag.column_settings.select.placeholder": "Insere hashtags…",
+  "hashtag.counter_by_uses": "{count, plural, one {{counter} message} other {{counter} messages}}",
+  "hashtag.counter_by_uses_today": "{count, plural, one {{counter} message} other {{counter} messages}} hodie",
   "hashtag.follow": "Sequer hashtag",
   "hashtag.unfollow": "Non sequer plus le hashtag",
   "hashtags.and_other": "…e {count, plural, one {}other {# plus}}",
@@ -241,10 +268,16 @@
   "home.pending_critical_update.link": "Vider actualisationes",
   "home.pending_critical_update.title": "Actualisation de securitate critic disponibile!",
   "home.show_announcements": "Monstrar annuncios",
+  "interaction_modal.description.favourite": "Con un conto sur Mastodon, tu pote marcar iste message como favorite pro informar le autor que tu lo apprecia e salveguarda pro plus tarde.",
+  "interaction_modal.description.follow": "Con un conto sur Mastodon, tu pote sequer {name} e reciper su messages in tu fluxo de initio.",
+  "interaction_modal.description.reblog": "Con un conto sur Mastodon, tu pote impulsar iste message pro condivider lo con tu proprie sequitores.",
+  "interaction_modal.description.reply": "Con un conto sur Mastodon, tu pote responder a iste message.",
+  "interaction_modal.login.action": "Porta me a casa",
   "interaction_modal.login.prompt": "Dominio de tu servitor, p.ex. mastodon.social",
   "interaction_modal.no_account_yet": "Non sur Mstodon?",
   "interaction_modal.on_another_server": "Sur un altere servitor",
   "interaction_modal.on_this_server": "Sur iste servitor",
+  "interaction_modal.title.favourite": "Marcar le message de {name} como favorite",
   "interaction_modal.title.follow": "Sequer {name}",
   "interaction_modal.title.reblog": "Impulsar le message de {name}",
   "interaction_modal.title.reply": "Responder al message de {name}",
@@ -264,6 +297,7 @@
   "keyboard_shortcuts.my_profile": "Aperir tu profilo",
   "keyboard_shortcuts.notifications": "Aperir columna de notificationes",
   "keyboard_shortcuts.open_media": "Aperir multimedia",
+  "keyboard_shortcuts.pinned": "Aperir le lista de messages fixate",
   "keyboard_shortcuts.profile": "Aperir le profilo del autor",
   "keyboard_shortcuts.reply": "Responder al message",
   "keyboard_shortcuts.spoilers": "Monstrar/celar le campo CW",
@@ -294,7 +328,8 @@
   "mute_modal.they_can_mention_and_follow": "Illes pote mentionar te e sequer te, ma tu non potera vider los.",
   "mute_modal.they_wont_know": "Illes non sapera que illes ha essite silentiate.",
   "mute_modal.title": "Silentiar le usator?",
-  "mute_modal.you_wont_see_mentions": "Tu non videra messages que los mentiona.",
+  "mute_modal.you_wont_see_mentions": "Tu non videra le messages que mentiona iste persona.",
+  "mute_modal.you_wont_see_posts": "Iste persona pote totevia vider tu messages, ma tu non videra le sues.",
   "navigation_bar.about": "A proposito",
   "navigation_bar.advanced_interface": "Aperir in le interfacie web avantiate",
   "navigation_bar.blocks": "Usatores blocate",
@@ -312,12 +347,16 @@
   "navigation_bar.mutes": "Usatores silentiate",
   "navigation_bar.opened_in_classic_interface": "Messages, contos e altere paginas specific es aperite per predefinition in le interfacie web classic.",
   "navigation_bar.personal": "Personal",
+  "navigation_bar.pins": "Messages fixate",
   "navigation_bar.preferences": "Preferentias",
   "navigation_bar.public_timeline": "Chronologia federate",
   "navigation_bar.search": "Cercar",
   "navigation_bar.security": "Securitate",
+  "notification.favourite": "{name} ha marcate tu message como favorite",
   "notification.own_poll": "Tu sondage ha finite",
+  "notification.reblog": "{name} ha impulsate tu message",
   "notification.relationships_severance_event.learn_more": "Apprender plus",
+  "notification.status": "{name} ha justo ora publicate",
   "notification.update": "{name} ha modificate un message",
   "notification_requests.accept": "Acceptar",
   "notification_requests.dismiss": "Dimitter",
@@ -332,11 +371,13 @@
   "notifications.column_settings.mention": "Mentiones:",
   "notifications.column_settings.poll": "Resultatos del sondage:",
   "notifications.column_settings.push": "Notificationes push",
+  "notifications.column_settings.reblog": "Impulsos:",
   "notifications.column_settings.show": "Monstrar in columna",
   "notifications.column_settings.sound": "Reproducer sono",
   "notifications.column_settings.status": "Nove messages:",
   "notifications.column_settings.unread_notifications.category": "Notificationes non legite",
   "notifications.filter.all": "Toto",
+  "notifications.filter.boosts": "Impulsos",
   "notifications.filter.favourites": "Favoritos",
   "notifications.filter.mentions": "Mentiones",
   "notifications.filter.polls": "Resultatos del sondage",
@@ -346,38 +387,52 @@
   "notifications.mark_as_read": "Marcar cata notification como legite",
   "notifications.policy.filter_new_accounts_title": "Nove contos",
   "notifications_permission_banner.enable": "Activar notificationes de scriptorio",
+  "onboarding.actions.go_to_home": "Porta me a mi fluxo de initio",
   "onboarding.compose.template": "Salute #Mastodon!",
+  "onboarding.follows.lead": "Le fluxo de initio es le maniera principal de discoperir Mastodon. Quanto plus personas tu seque, tanto plus active e interessante illo essera. Pro comenciar, ecce alcun suggestiones:",
+  "onboarding.follows.title": "Personalisar tu fluxo de initio",
+  "onboarding.profile.discoverable_hint": "Quando tu opta pro devenir discoperibile sur Mastodon, tu messages pote apparer in resultatos de recerca e in tendentias, e tu profilo pote esser suggerite al personas con interesses simile al tues.",
   "onboarding.profile.save_and_continue": "Salvar e continuar",
   "onboarding.share.next_steps": "Sequente passos possibile:",
   "onboarding.share.title": "Compartir tu profilo",
-  "onboarding.steps.follow_people.title": "Personalisa tu fluxo de initio",
+  "onboarding.steps.follow_people.title": "Personalisar tu fluxo de initio",
   "onboarding.steps.publish_status.title": "Face tu prime message",
+  "onboarding.steps.setup_profile.body": "Impulsa tu interactiones con un profilo comprehensive.",
   "onboarding.steps.setup_profile.title": "Personalisa tu profilo",
   "onboarding.steps.share_profile.title": "Compartir tu profilo de Mastodon",
   "poll.closed": "Claudite",
   "poll.reveal": "Vider le resultatos",
   "privacy.change": "Cambiar le confidentialitate del message",
+  "privacy.direct.long": "Tote le personas mentionate in le message",
   "privacy.public.short": "Public",
+  "privacy.unlisted.additional": "Isto es exactemente como public, excepte que le message non apparera in fluxos in directo, in hashtags, in Explorar, o in le recerca de Mastodon, mesmo si tu ha optate pro render tote le conto discoperibile.",
   "privacy_policy.last_updated": "Ultime actualisation {date}",
   "privacy_policy.title": "Politica de confidentialitate",
+  "regeneration_indicator.sublabel": "Tu fluxo de initio es in preparation!",
   "relative_time.just_now": "ora",
   "relative_time.today": "hodie",
   "reply_indicator.cancel": "Cancellar",
   "report.block": "Blocar",
+  "report.block_explanation": "Tu non videra le messages de iste persona. Ille non potera vider tu messages o sequer te. Ille potera saper de esser blocate.",
   "report.categories.other": "Alteres",
   "report.category.title_account": "profilo",
   "report.category.title_status": "message",
   "report.close": "Facite",
   "report.mute": "Silentiar",
+  "report.mute_explanation": "Tu non videra le messages de iste persona. Ille pote totevia sequer te e vider tu messages e non sapera de esser silentiate.",
   "report.next": "Sequente",
   "report.placeholder": "Commentos additional",
   "report.reasons.dislike": "Non me place",
+  "report.statuses.title": "Existe alcun messages que appoia iste reporto?",
+  "report.unfollow_explanation": "Tu seque iste conto. Pro non plus vider su messages in tu fluxo de initio, cessa de sequer lo.",
+  "report_notification.attached_statuses": "{count, plural, one {{count} message} other {{count} messages}} annexate",
   "report_notification.categories.other": "Alteres",
   "report_notification.open": "Aperir reporto",
   "search.no_recent_searches": "Nulle recercas recente",
   "search.quick_action.go_to_account": "Vader al profilo {x}",
   "search.quick_action.go_to_hashtag": "Vader al hashtag {x}",
   "search.quick_action.open_url": "Aperir URL in Mastodon",
+  "search.quick_action.status_search": "Messages correspondente a {x}",
   "search_popout.full_text_search_disabled_message": "Non disponibile sur {domain}.",
   "search_popout.language_code": "Codice de lingua ISO",
   "search_popout.options": "Optiones de recerca",
@@ -393,7 +448,11 @@
   "server_banner.server_stats": "Statos del servitor:",
   "sign_in_banner.create_account": "Crear un conto",
   "sign_in_banner.sign_in": "Aperir session",
+  "sign_in_banner.text": "Aperi session pro sequer profilos o hashtags, marcar messages como favorite, e condivider e responder a messages. Tu pote etiam interager desde tu conto sur un altere servitor.",
+  "status.admin_status": "Aperir iste message in le interfacie de moderation",
   "status.block": "Blocar @{name}",
+  "status.cancel_reblog_private": "Disfacer impulso",
+  "status.cannot_reblog": "Iste message non pote esser impulsate",
   "status.copy": "Copiar ligamine a message",
   "status.delete": "Deler",
   "status.direct": "Mentionar privatemente @{name}",
@@ -409,7 +468,13 @@
   "status.media.show": "Clicca pro monstrar",
   "status.more": "Plus",
   "status.mute_conversation": "Silentiar conversation",
+  "status.open": "Expander iste message",
+  "status.pinned": "Message fixate",
   "status.read_more": "Leger plus",
+  "status.reblog": "Impulsar",
+  "status.reblog_private": "Impulsar con visibilitate original",
+  "status.reblogged_by": "Impulsate per {name}",
+  "status.reblogs": "{count, plural, one {impulso} other {impulsos}}",
   "status.reblogs.empty": "Necuno ha ancora impulsate iste message. Quando alcuno lo face, le impulsos apparera hic.",
   "status.redraft": "Deler e reconciper",
   "status.remove_bookmark": "Remover marcapagina",
diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json
index 23960e9f8647dc..1025c32048fbf3 100644
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@@ -225,8 +225,8 @@
   "domain_pill.their_username": "Hun unieke identificatie-adres op hun server. Het is mogelijk dat er gebruikers met dezelfde gebruikersnaam op verschillende servers te vinden zijn.",
   "domain_pill.username": "Gebruikersnaam",
   "domain_pill.whats_in_a_handle": "Wat is een fediverse-adres?",
-  "domain_pill.who_they_are": "Omdat je aan een fediverse-adres kunt zien wie iemand is en waar die zich bevindt, kun je met mensen op het door <button>ActivityPub aangedreven</button> sociale web (fediverse) communiceren.",
-  "domain_pill.who_you_are": "Omdat je aan jouw fediverse-adres kunt zien wie jij bent is en waar je je bevindt, kunnen mensen op het door <button>ActivityPub aangedreven</button> sociale web (fediverse) met jou communiceren.",
+  "domain_pill.who_they_are": "Omdat je aan een fediverse-adres kunt zien hoe iemand heet en op welke server die zich bevindt, kun je met mensen op het door <button>ActivityPub aangedreven</button> sociale web (fediverse) communiceren.",
+  "domain_pill.who_you_are": "Omdat je aan jouw fediverse-adres kunt zien hoe je heet en op welke server je je bevindt, kunnen mensen op het door <button>ActivityPub aangedreven</button> sociale web (fediverse) met jou communiceren.",
   "domain_pill.your_handle": "Jouw fediverse-adres:",
   "domain_pill.your_server": "Jouw digitale thuis, waar al jouw berichten zich bevinden. Is deze server toch niet naar jouw wens? Dan kun je op elk moment naar een andere server verhuizen en ook jouw volgers overbrengen.",
   "domain_pill.your_username": "Jouw unieke identificatie-adres op deze server. Het is mogelijk dat er gebruikers met dezelfde gebruikersnaam op verschillende servers te vinden zijn.",
diff --git a/app/javascript/mastodon/locales/tok.json b/app/javascript/mastodon/locales/tok.json
index c3f184e15d4917..80d412a20bc35a 100644
--- a/app/javascript/mastodon/locales/tok.json
+++ b/app/javascript/mastodon/locales/tok.json
@@ -36,6 +36,7 @@
   "account.go_to_profile": "o tawa lipu jan",
   "account.hide_reblogs": "o lukin ala e pana toki tan @{name}",
   "account.in_memoriam": "jan ni li moli. pona o tawa ona.",
+  "account.joined_short": "li kama",
   "account.languages": "sina wile lukin e sitelen pi toki seme",
   "account.locked_info": "sina wile kute e jan ni la ona o toki e ken",
   "account.media": "sitelen",
@@ -70,6 +71,10 @@
   "alert.unexpected.title": "pakala a!",
   "announcement.announcement": "toki suli",
   "audio.hide": "o len e kalama",
+  "block_modal.show_less": "o lili e lukin",
+  "block_modal.show_more": "o mute e lukin",
+  "block_modal.they_cant_mention": "ona li ken ala toki e sina li ken ala alasa e sina",
+  "block_modal.title": "o weka ala weka e jan",
   "boost_modal.combo": "sina ken luka e nena {combo} tawa ni: sina wile ala luka e nena lon tenpo kama",
   "bundle_column_error.copy_stacktrace": "o awen e sona pakala lon ilo sina",
   "bundle_column_error.error.body": "ilo li ken ala pana e lipu ni. ni li ken tan pakala ilo.",
@@ -86,10 +91,15 @@
   "column.about": "sona",
   "column.blocks": "kulupu pi jan weka",
   "column.bookmarks": "awen toki",
+  "column.community": "linja tenpo pi ma ni",
+  "column.favourites": "ijo pona",
+  "column.firehose": "toki pi tenpo ni",
+  "column.follow_requests": "wile alasa pi jan ante",
   "column.home": "lipu open",
   "column.lists": "kulupu lipu",
   "column.mutes": "jan len",
   "column.pins": "toki sewi",
+  "column_back_button.label": "o tawa monsi",
   "column_header.hide_settings": "o len e lawa",
   "column_header.pin": "o sewi",
   "column_header.show_settings": "o lukin e lawa",
@@ -157,6 +167,9 @@
   "dismissable_banner.explore_statuses": "suni ni la jan mute li lukin e toki ni. jan mute li wawa e toki li suli e toki la toki ni li lon sewi. toki li sin la toki ni li lon sewi.",
   "dismissable_banner.explore_tags": "suni ni la jan mute li lukin e toki pi toki ni. jan mute li kepeken toki la toki ni li lon sewi.",
   "dismissable_banner.public_timeline": "toki ni li sin. jan li pali e toki ni la jan ante mute pi ma {domain} li kute e jan ni.",
+  "domain_block_modal.block": "o weka e ma",
+  "domain_block_modal.you_will_lose_followers": "ma ni la jan alasa ale sina li weka",
+  "domain_block_modal.you_wont_see_posts": "sina ken ala lukin e toki tan jan pi ma ni",
   "embed.preview": "ni li jo e sitelen ni:",
   "emoji_button.activity": "musi",
   "emoji_button.flags": "len ma",
@@ -232,7 +245,7 @@
   "keyboard_shortcuts.boost": "o pana sin e toki",
   "keyboard_shortcuts.down": "o tawa anpa lon lipu",
   "keyboard_shortcuts.enter": "o lukin e toki",
-  "keyboard_shortcuts.favourite": "o suli e toki",
+  "keyboard_shortcuts.favourite": "o sitelen pona e toki",
   "keyboard_shortcuts.favourites": "o lukin e lipu sina pi toki suli",
   "keyboard_shortcuts.muted": "o lukin e lipu sina pi jan len",
   "keyboard_shortcuts.my_profile": "o lukin e lipu sina",
@@ -264,7 +277,7 @@
   "navigation_bar.about": "sona",
   "navigation_bar.blocks": "jan weka",
   "navigation_bar.compose": "o pali e toki sin",
-  "navigation_bar.favourites": "toki suli",
+  "navigation_bar.favourites": "ijo pona",
   "navigation_bar.filters": "nimi len",
   "navigation_bar.lists": "kulupu lipu",
   "navigation_bar.mutes": "sina wile ala kute e jan ni",
@@ -273,7 +286,7 @@
   "navigation_bar.search": "o alasa",
   "notification.admin.report": "jan {name} li toki e jan {target} tawa lawa",
   "notification.admin.sign_up": "{name} li kama",
-  "notification.favourite": "{name} li suli e toki sina",
+  "notification.favourite": "toki sina li pona tawa {name}",
   "notification.follow": " {name} li kute e sina",
   "notification.follow_request": "{name} li wile kute e sina",
   "notification.mention": "jan {name} li toki e sina",
@@ -281,11 +294,13 @@
   "notification.reblog": "{name} li wawa e toki sina",
   "notification.status": "{name} li toki",
   "notification.update": "{name} li ante e toki",
+  "notifications.column_settings.favourite": "ijo pona:",
   "notifications.column_settings.follow": "jan kute sin",
   "notifications.column_settings.poll": "pana lon pana ni:",
   "notifications.column_settings.reblog": "wawa:",
   "notifications.column_settings.update": "ante toki:",
   "notifications.filter.all": "ale",
+  "notifications.filter.favourites": "ijo pona",
   "notifications.filter.polls": "pana lon pana ni",
   "onboarding.compose.template": "toki a, #Mastodon o!",
   "onboarding.profile.display_name": "nimi tawa jan ante",
@@ -333,7 +348,7 @@
   "status.delete": "o weka",
   "status.edit": "o ante",
   "status.embed": "ni o lon insa pi lipu ante",
-  "status.favourite": "o suli",
+  "status.favourite": "o sitelen pona",
   "status.hide": "o len",
   "status.history.created": "{name} li pali e ni lon {date}",
   "status.history.edited": "{name} li ante lon {date}",
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 22710265f33862..67aad1587364f3 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -615,7 +615,7 @@ de:
       created_at: Gemeldet
       delete_and_resolve: Beiträge löschen
       forwarded: Weitergeleitet
-      forwarded_replies_explanation: Diese Meldung stammt von einem externen Profil und betrifft einen externen Inhalt. Der Inhalt wurde an Dich weitergeleitet, weil er eine Antwort auf ein bei Dir registriertes Profil ist.
+      forwarded_replies_explanation: Diese Meldung stammt von einem externen Profil und betrifft einen externen Inhalt. Der Inhalt wurde an dich weitergeleitet, weil er eine Antwort auf ein bei dir registriertes Profil ist.
       forwarded_to: Weitergeleitet an %{domain}
       mark_as_resolved: Als geklärt markieren
       mark_as_sensitive: Mit einer Inhaltswarnung versehen

From 6ee1b034b649d0089596d8162902dc9699dd5f75 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 16 Apr 2024 10:45:20 +0200
Subject: [PATCH 0757/2191] Update dependency prom-client to v15.1.2 (#29957)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 7504e3d93dd2cc..0ee399a9de5c17 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -14012,12 +14012,12 @@ __metadata:
   linkType: hard
 
 "prom-client@npm:^15.0.0":
-  version: 15.1.1
-  resolution: "prom-client@npm:15.1.1"
+  version: 15.1.2
+  resolution: "prom-client@npm:15.1.2"
   dependencies:
     "@opentelemetry/api": "npm:^1.4.0"
     tdigest: "npm:^0.1.1"
-  checksum: 10c0/b3e6a58fc0ef87cf5b0badf06d7d79c24ac93ba47cccfaad95faeba79824c6a7724d74a257e7268d691245c847173818c16c8153054cccf16b8f033c37c74129
+  checksum: 10c0/a221db148fa64e29dfd4c6cdcaaae14635495a4272b68917e2b44fcfd988bc57027d275b04489ceeea4d0c4d64d058af842c1300966d2c1ffa255f1fa6af1277
   languageName: node
   linkType: hard
 

From e6927db2fe167202d234e029cadaeca1b0b17899 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 16 Apr 2024 10:58:04 +0200
Subject: [PATCH 0758/2191] Update dependency rubocop to v1.63.2 (#29959)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 9df16248cf9f6b..9c0adce16d1150 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -646,7 +646,7 @@ GEM
       rspec-mocks (~> 3.0)
       sidekiq (>= 5, < 8)
     rspec-support (3.13.1)
-    rubocop (1.63.1)
+    rubocop (1.63.2)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)

From 3159c0a54784f808f90a549a87b6440fee03a412 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 16 Apr 2024 05:17:03 -0400
Subject: [PATCH 0759/2191] Add scope `Status.list_eligible_visibility`
 (#29951)

---
 app/lib/feed_manager.rb | 6 +++---
 app/models/status.rb    | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/lib/feed_manager.rb b/app/lib/feed_manager.rb
index 9ddc54c169c932..95a687fa41d335 100644
--- a/app/lib/feed_manager.rb
+++ b/app/lib/feed_manager.rb
@@ -109,7 +109,7 @@ def unpush_from_list(list, status, update: false)
   def merge_into_home(from_account, into_account)
     timeline_key = key(:home, into_account.id)
     aggregate    = into_account.user&.aggregates_reblogs?
-    query        = from_account.statuses.where(visibility: [:public, :unlisted, :private]).includes(:preloadable_poll, :media_attachments, reblog: :account).limit(FeedManager::MAX_ITEMS / 4)
+    query        = from_account.statuses.list_eligible_visibility.includes(:preloadable_poll, :media_attachments, reblog: :account).limit(FeedManager::MAX_ITEMS / 4)
 
     if redis.zcard(timeline_key) >= FeedManager::MAX_ITEMS / 4
       oldest_home_score = redis.zrange(timeline_key, 0, 0, with_scores: true).first.last.to_i
@@ -135,7 +135,7 @@ def merge_into_home(from_account, into_account)
   def merge_into_list(from_account, list)
     timeline_key = key(:list, list.id)
     aggregate    = list.account.user&.aggregates_reblogs?
-    query        = from_account.statuses.where(visibility: [:public, :unlisted, :private]).includes(:preloadable_poll, :media_attachments, reblog: :account).limit(FeedManager::MAX_ITEMS / 4)
+    query        = from_account.statuses.list_eligible_visibility.includes(:preloadable_poll, :media_attachments, reblog: :account).limit(FeedManager::MAX_ITEMS / 4)
 
     if redis.zcard(timeline_key) >= FeedManager::MAX_ITEMS / 4
       oldest_home_score = redis.zrange(timeline_key, 0, 0, with_scores: true).first.last.to_i
@@ -274,7 +274,7 @@ def populate_home(account)
         next if last_status_score < oldest_home_score
       end
 
-      statuses = target_account.statuses.where(visibility: [:public, :unlisted, :private]).includes(:preloadable_poll, :media_attachments, :account, reblog: :account).limit(limit)
+      statuses = target_account.statuses.list_eligible_visibility.includes(:preloadable_poll, :media_attachments, :account, reblog: :account).limit(limit)
       crutches = build_crutches(account.id, statuses)
 
       statuses.each do |status|
diff --git a/app/models/status.rb b/app/models/status.rb
index 78186623c32e5b..8ab78d09d6ed0f 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -121,6 +121,7 @@ class Status < ApplicationRecord
   scope :tagged_with_none, lambda { |tag_ids|
     where('NOT EXISTS (SELECT * FROM statuses_tags forbidden WHERE forbidden.status_id = statuses.id AND forbidden.tag_id IN (?))', tag_ids)
   }
+  scope :list_eligible_visibility, -> { where(visibility: %i(public unlisted private)) }
 
   after_create_commit :trigger_create_webhooks
   after_update_commit :trigger_update_webhooks

From 66ee0d4a1f35ce4455418921879b8d2f96538d57 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 16 Apr 2024 11:25:23 +0200
Subject: [PATCH 0760/2191] Fix incorrect label for filtered notifications
 badge (#29922)

---
 .../notifications/components/filtered_notifications_banner.jsx  | 2 +-
 app/javascript/mastodon/locales/en.json                         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/javascript/mastodon/features/notifications/components/filtered_notifications_banner.jsx b/app/javascript/mastodon/features/notifications/components/filtered_notifications_banner.jsx
index f9b8c0be1467ec..56da7ba62629c4 100644
--- a/app/javascript/mastodon/features/notifications/components/filtered_notifications_banner.jsx
+++ b/app/javascript/mastodon/features/notifications/components/filtered_notifications_banner.jsx
@@ -42,7 +42,7 @@ export const FilteredNotificationsBanner = () => {
 
       <div className='filtered-notifications-banner__badge'>
         <div className='filtered-notifications-banner__badge__badge'>{toCappedNumber(policy.getIn(['summary', 'pending_notifications_count']))}</div>
-        <FormattedMessage id='filtered_notifications_banner.private_mentions' defaultMessage='{count, plural, one {private mention} other {private mentions}}' values={{ count: policy.getIn(['summary', 'pending_notifications_count']) }} />
+        <FormattedMessage id='filtered_notifications_banner.mentions' defaultMessage='{count, plural, one {mention} other {mentions}}' values={{ count: policy.getIn(['summary', 'pending_notifications_count']) }} />
       </div>
     </Link>
   );
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index 881ed19e0e4506..fd44b3952bcacb 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -297,8 +297,8 @@
   "filter_modal.select_filter.subtitle": "Use an existing category or create a new one",
   "filter_modal.select_filter.title": "Filter this post",
   "filter_modal.title.status": "Filter a post",
+  "filtered_notifications_banner.mentions": "{count, plural, one {mention} other {mentions}}",
   "filtered_notifications_banner.pending_requests": "Notifications from {count, plural, =0 {no one} one {one person} other {# people}} you may know",
-  "filtered_notifications_banner.private_mentions": "{count, plural, one {private mention} other {private mentions}}",
   "filtered_notifications_banner.title": "Filtered notifications",
   "firehose.all": "All",
   "firehose.local": "This server",

From 6b33d3f81be36b772c0f0436c14a7a742062e2de Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 16 Apr 2024 05:29:34 -0400
Subject: [PATCH 0761/2191] Add `CustomFilter.unexpired` scope (#29896)

---
 app/models/custom_filter.rb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/models/custom_filter.rb b/app/models/custom_filter.rb
index 7c148e877ff198..2d8f5b6cba8206 100644
--- a/app/models/custom_filter.rb
+++ b/app/models/custom_filter.rb
@@ -42,6 +42,7 @@ class CustomFilter < ApplicationRecord
   validate :context_must_be_valid
 
   normalizes :context, with: ->(context) { context.map(&:strip).filter_map(&:presence) }
+  scope :unexpired, -> { where(expires_at: nil).or where.not(expires_at: ..Time.zone.now) }
 
   before_save :prepare_cache_invalidation!
   before_destroy :prepare_cache_invalidation!
@@ -66,14 +67,16 @@ def self.cached_filters_for(account_id)
     active_filters = Rails.cache.fetch("filters:v3:#{account_id}") do
       filters_hash = {}
 
-      scope = CustomFilterKeyword.includes(:custom_filter).where(custom_filter: { account_id: account_id }).where(Arel.sql('expires_at IS NULL OR expires_at > NOW()'))
+      scope = CustomFilterKeyword.left_outer_joins(:custom_filter).merge(unexpired.where(account_id: account_id))
+
       scope.to_a.group_by(&:custom_filter).each do |filter, keywords|
         keywords.map!(&:to_regex)
 
         filters_hash[filter.id] = { keywords: Regexp.union(keywords), filter: filter }
       end.to_h
 
-      scope = CustomFilterStatus.includes(:custom_filter).where(custom_filter: { account_id: account_id }).where(Arel.sql('expires_at IS NULL OR expires_at > NOW()'))
+      scope = CustomFilterStatus.left_outer_joins(:custom_filter).merge(unexpired.where(account_id: account_id))
+
       scope.to_a.group_by(&:custom_filter).each do |filter, statuses|
         filters_hash[filter.id] ||= { filter: filter }
         filters_hash[filter.id].merge!(status_ids: statuses.map(&:status_id))

From 0622107449e72d35b22afeeba2f0ba983e914803 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 16 Apr 2024 11:44:02 +0200
Subject: [PATCH 0762/2191] Update dependency @testing-library/react to v15
 (#29893)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 package.json |   2 +-
 yarn.lock    | 101 ++++++++++-----------------------------------------
 2 files changed, 21 insertions(+), 82 deletions(-)

diff --git a/package.json b/package.json
index ed59a68a417b7c..787ca3600c0b64 100644
--- a/package.json
+++ b/package.json
@@ -139,7 +139,7 @@
   "devDependencies": {
     "@formatjs/cli": "^6.1.1",
     "@testing-library/jest-dom": "^6.0.0",
-    "@testing-library/react": "^14.0.0",
+    "@testing-library/react": "^15.0.0",
     "@types/babel__core": "^7.20.1",
     "@types/emoji-mart": "^3.0.9",
     "@types/escape-html": "^1.0.2",
diff --git a/yarn.lock b/yarn.lock
index 0ee399a9de5c17..af17402bc15636 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2738,7 +2738,7 @@ __metadata:
     "@reduxjs/toolkit": "npm:^2.0.1"
     "@svgr/webpack": "npm:^5.5.0"
     "@testing-library/jest-dom": "npm:^6.0.0"
-    "@testing-library/react": "npm:^14.0.0"
+    "@testing-library/react": "npm:^15.0.0"
     "@types/babel__core": "npm:^7.20.1"
     "@types/emoji-mart": "npm:^3.0.9"
     "@types/escape-html": "npm:^1.0.2"
@@ -3281,19 +3281,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@testing-library/dom@npm:^9.0.0":
-  version: 9.3.1
-  resolution: "@testing-library/dom@npm:9.3.1"
+"@testing-library/dom@npm:^10.0.0":
+  version: 10.0.0
+  resolution: "@testing-library/dom@npm:10.0.0"
   dependencies:
     "@babel/code-frame": "npm:^7.10.4"
     "@babel/runtime": "npm:^7.12.5"
     "@types/aria-query": "npm:^5.0.1"
-    aria-query: "npm:5.1.3"
+    aria-query: "npm:5.3.0"
     chalk: "npm:^4.1.0"
     dom-accessibility-api: "npm:^0.5.9"
     lz-string: "npm:^1.5.0"
     pretty-format: "npm:^27.0.2"
-  checksum: 10c0/25d1deddba014c107fd9703181fbb7063ed376d3ad42d7918ee752e7e677edfb5abaf672b22afc5257ffe760c9c7e5cc981656297c328bc61578d23c6b65b4dc
+  checksum: 10c0/2d12d2a6018a6f1d15e91834180bc068932c699ff1fcbfb80aa21aba519a4f5329c861dfa852e06ee5615bcb92ef2a0f0e755e32684ea3dada63bc34248382ab
   languageName: node
   linkType: hard
 
@@ -3330,17 +3330,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@testing-library/react@npm:^14.0.0":
-  version: 14.3.1
-  resolution: "@testing-library/react@npm:14.3.1"
+"@testing-library/react@npm:^15.0.0":
+  version: 15.0.2
+  resolution: "@testing-library/react@npm:15.0.2"
   dependencies:
     "@babel/runtime": "npm:^7.12.5"
-    "@testing-library/dom": "npm:^9.0.0"
+    "@testing-library/dom": "npm:^10.0.0"
     "@types/react-dom": "npm:^18.0.0"
   peerDependencies:
     react: ^18.0.0
     react-dom: ^18.0.0
-  checksum: 10c0/1ccf4eb1510500cc20a805cb0244c9098dca28a8745173a8f71ea1274d63774f0b7898a35c878b43c797b89c13621548909ff37843b835c1a27ee1efbbdd098c
+  checksum: 10c0/8d75e4850f8f749244bf4f30b0f99a5d4aa1156ee5a59eea0772f47971c38535d1fb31d021c4f0f0b816346ae664870dc223d5d997ab399dfb1b6211f0e2acf1
   languageName: node
   linkType: hard
 
@@ -4712,16 +4712,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"aria-query@npm:5.1.3":
-  version: 5.1.3
-  resolution: "aria-query@npm:5.1.3"
-  dependencies:
-    deep-equal: "npm:^2.0.5"
-  checksum: 10c0/edcbc8044c4663d6f88f785e983e6784f98cb62b4ba1e9dd8d61b725d0203e4cfca38d676aee984c31f354103461102a3d583aa4fbe4fd0a89b679744f4e5faf
-  languageName: node
-  linkType: hard
-
-"aria-query@npm:^5.0.0, aria-query@npm:^5.3.0":
+"aria-query@npm:5.3.0, aria-query@npm:^5.0.0, aria-query@npm:^5.3.0":
   version: 5.3.0
   resolution: "aria-query@npm:5.3.0"
   dependencies:
@@ -4751,7 +4742,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"array-buffer-byte-length@npm:^1.0.0, array-buffer-byte-length@npm:^1.0.1":
+"array-buffer-byte-length@npm:^1.0.1":
   version: 1.0.1
   resolution: "array-buffer-byte-length@npm:1.0.1"
   dependencies:
@@ -6905,32 +6896,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"deep-equal@npm:^2.0.5":
-  version: 2.2.1
-  resolution: "deep-equal@npm:2.2.1"
-  dependencies:
-    array-buffer-byte-length: "npm:^1.0.0"
-    call-bind: "npm:^1.0.2"
-    es-get-iterator: "npm:^1.1.3"
-    get-intrinsic: "npm:^1.2.0"
-    is-arguments: "npm:^1.1.1"
-    is-array-buffer: "npm:^3.0.2"
-    is-date-object: "npm:^1.0.5"
-    is-regex: "npm:^1.1.4"
-    is-shared-array-buffer: "npm:^1.0.2"
-    isarray: "npm:^2.0.5"
-    object-is: "npm:^1.1.5"
-    object-keys: "npm:^1.1.1"
-    object.assign: "npm:^4.1.4"
-    regexp.prototype.flags: "npm:^1.5.0"
-    side-channel: "npm:^1.0.4"
-    which-boxed-primitive: "npm:^1.0.2"
-    which-collection: "npm:^1.0.1"
-    which-typed-array: "npm:^1.1.9"
-  checksum: 10c0/9e32606f0e24ef4d6b100c68cadae81495c3638944e933afc4b8389b042e95c5fe1381492cf7a6d385bcbae564c9cfb7086f37f277e37521a632b008a6b208dc
-  languageName: node
-  linkType: hard
-
 "deep-is@npm:^0.1.3":
   version: 0.1.4
   resolution: "deep-is@npm:0.1.4"
@@ -7585,23 +7550,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"es-get-iterator@npm:^1.1.3":
-  version: 1.1.3
-  resolution: "es-get-iterator@npm:1.1.3"
-  dependencies:
-    call-bind: "npm:^1.0.2"
-    get-intrinsic: "npm:^1.1.3"
-    has-symbols: "npm:^1.0.3"
-    is-arguments: "npm:^1.1.1"
-    is-map: "npm:^2.0.2"
-    is-set: "npm:^2.0.2"
-    is-string: "npm:^1.0.7"
-    isarray: "npm:^2.0.5"
-    stop-iteration-iterator: "npm:^1.0.0"
-  checksum: 10c0/ebd11effa79851ea75d7f079405f9d0dc185559fd65d986c6afea59a0ff2d46c2ed8675f19f03dce7429d7f6c14ff9aede8d121fbab78d75cfda6a263030bac0
-  languageName: node
-  linkType: hard
-
 "es-iterator-helpers@npm:^1.0.15, es-iterator-helpers@npm:^1.0.17":
   version: 1.0.17
   resolution: "es-iterator-helpers@npm:1.0.17"
@@ -8755,7 +8703,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"get-intrinsic@npm:^1.0.2, get-intrinsic@npm:^1.1.1, get-intrinsic@npm:^1.1.3, get-intrinsic@npm:^1.2.0, get-intrinsic@npm:^1.2.1, get-intrinsic@npm:^1.2.2, get-intrinsic@npm:^1.2.3, get-intrinsic@npm:^1.2.4":
+"get-intrinsic@npm:^1.0.2, get-intrinsic@npm:^1.1.1, get-intrinsic@npm:^1.1.3, get-intrinsic@npm:^1.2.1, get-intrinsic@npm:^1.2.2, get-intrinsic@npm:^1.2.3, get-intrinsic@npm:^1.2.4":
   version: 1.2.4
   resolution: "get-intrinsic@npm:1.2.4"
   dependencies:
@@ -9594,7 +9542,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"internal-slot@npm:^1.0.4, internal-slot@npm:^1.0.5, internal-slot@npm:^1.0.7":
+"internal-slot@npm:^1.0.5, internal-slot@npm:^1.0.7":
   version: 1.0.7
   resolution: "internal-slot@npm:1.0.7"
   dependencies:
@@ -9710,7 +9658,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-arguments@npm:^1.0.4, is-arguments@npm:^1.1.1":
+"is-arguments@npm:^1.0.4":
   version: 1.1.1
   resolution: "is-arguments@npm:1.1.1"
   dependencies:
@@ -9720,7 +9668,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-array-buffer@npm:^3.0.2, is-array-buffer@npm:^3.0.4":
+"is-array-buffer@npm:^3.0.4":
   version: 3.0.4
   resolution: "is-array-buffer@npm:3.0.4"
   dependencies:
@@ -9967,7 +9915,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-map@npm:^2.0.1, is-map@npm:^2.0.2":
+"is-map@npm:^2.0.1":
   version: 2.0.2
   resolution: "is-map@npm:2.0.2"
   checksum: 10c0/119ff9137a37fd131a72fab3f4ab8c9d6a24b0a1ee26b4eff14dc625900d8675a97785eea5f4174265e2006ed076cc24e89f6e57ebd080a48338d914ec9168a5
@@ -10092,7 +10040,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-set@npm:^2.0.1, is-set@npm:^2.0.2":
+"is-set@npm:^2.0.1":
   version: 2.0.2
   resolution: "is-set@npm:2.0.2"
   checksum: 10c0/5f8bd1880df8c0004ce694e315e6e1e47a3452014be792880bb274a3b2cdb952fdb60789636ca6e084c7947ca8b7ae03ccaf54c93a7fcfed228af810559e5432
@@ -12288,7 +12236,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"object-is@npm:^1.0.1, object-is@npm:^1.1.5":
+"object-is@npm:^1.0.1":
   version: 1.1.5
   resolution: "object-is@npm:1.1.5"
   dependencies:
@@ -16075,15 +16023,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"stop-iteration-iterator@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "stop-iteration-iterator@npm:1.0.0"
-  dependencies:
-    internal-slot: "npm:^1.0.4"
-  checksum: 10c0/c4158d6188aac510d9e92925b58709207bd94699e9c31186a040c80932a687f84a51356b5895e6dc72710aad83addb9411c22171832c9ae0e6e11b7d61b0dfb9
-  languageName: node
-  linkType: hard
-
 "stream-browserify@npm:^2.0.1":
   version: 2.0.2
   resolution: "stream-browserify@npm:2.0.2"

From caad1e2628c78d2dfcd86e3a79b0849dc89baf16 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 16 Apr 2024 09:16:54 -0400
Subject: [PATCH 0763/2191] Add scope `Status.distributable_visibility`
 (#29950)

---
 app/controllers/accounts_controller.rb                          | 2 +-
 app/controllers/activitypub/replies_controller.rb               | 2 +-
 .../api/v1/statuses/reblogged_by_accounts_controller.rb         | 2 +-
 app/lib/account_statuses_filter.rb                              | 2 +-
 app/models/admin/status_filter.rb                               | 2 +-
 app/models/announcement.rb                                      | 2 +-
 app/models/concerns/status/threading_concern.rb                 | 2 +-
 app/models/featured_tag.rb                                      | 2 +-
 app/models/status.rb                                            | 1 +
 9 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb
index 4e475fe78263b1..32549e15169e5f 100644
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@@ -46,7 +46,7 @@ def filtered_statuses
   end
 
   def default_statuses
-    @account.statuses.where(visibility: [:public, :unlisted])
+    @account.statuses.distributable_visibility
   end
 
   def only_media_scope
diff --git a/app/controllers/activitypub/replies_controller.rb b/app/controllers/activitypub/replies_controller.rb
index 3f43e89a5e0798..11aac48c9c34b1 100644
--- a/app/controllers/activitypub/replies_controller.rb
+++ b/app/controllers/activitypub/replies_controller.rb
@@ -31,7 +31,7 @@ def set_status
 
   def set_replies
     @replies = only_other_accounts? ? Status.where.not(account_id: @account.id).joins(:account).merge(Account.without_suspended) : @account.statuses
-    @replies = @replies.where(in_reply_to_id: @status.id, visibility: [:public, :unlisted])
+    @replies = @replies.distributable_visibility.where(in_reply_to_id: @status.id)
     @replies = @replies.paginate_by_min_id(DESCENDANTS_LIMIT, params[:min_id])
   end
 
diff --git a/app/controllers/api/v1/statuses/reblogged_by_accounts_controller.rb b/app/controllers/api/v1/statuses/reblogged_by_accounts_controller.rb
index eaa5ef725501f2..bac96b032bef4b 100644
--- a/app/controllers/api/v1/statuses/reblogged_by_accounts_controller.rb
+++ b/app/controllers/api/v1/statuses/reblogged_by_accounts_controller.rb
@@ -23,7 +23,7 @@ def default_accounts
   end
 
   def paginated_statuses
-    Status.where(reblog_of_id: @status.id).where(visibility: [:public, :unlisted]).paginate_by_max_id(
+    Status.where(reblog_of_id: @status.id).distributable_visibility.paginate_by_max_id(
       limit_param(DEFAULT_ACCOUNTS_LIMIT),
       params[:max_id],
       params[:since_id]
diff --git a/app/lib/account_statuses_filter.rb b/app/lib/account_statuses_filter.rb
index eb7592cdce09e1..cfc9be96608387 100644
--- a/app/lib/account_statuses_filter.rb
+++ b/app/lib/account_statuses_filter.rb
@@ -35,7 +35,7 @@ def initial_scope
     return Status.none if account.unavailable?
 
     if anonymous?
-      account.statuses.where(visibility: %i(public unlisted))
+      account.statuses.distributable_visibility
     elsif author?
       account.statuses.all # NOTE: #merge! does not work without the #all
     elsif blocked?
diff --git a/app/models/admin/status_filter.rb b/app/models/admin/status_filter.rb
index 4708785e7d4b74..8d20e4f6abce94 100644
--- a/app/models/admin/status_filter.rb
+++ b/app/models/admin/status_filter.rb
@@ -16,7 +16,7 @@ def initialize(account, params)
   end
 
   def results
-    scope = @account.statuses.where(visibility: [:public, :unlisted])
+    scope = @account.statuses.distributable_visibility
 
     params.each do |key, value|
       next if IGNORED_PARAMS.include?(key.to_s)
diff --git a/app/models/announcement.rb b/app/models/announcement.rb
index e630570020ea57..5ce382dc18f8b4 100644
--- a/app/models/announcement.rb
+++ b/app/models/announcement.rb
@@ -62,7 +62,7 @@ def statuses
     @statuses ||= if status_ids.nil?
                     []
                   else
-                    Status.where(id: status_ids, visibility: [:public, :unlisted])
+                    Status.where(id: status_ids).distributable_visibility
                   end
   end
 
diff --git a/app/models/concerns/status/threading_concern.rb b/app/models/concerns/status/threading_concern.rb
index 2606fd2f2783c2..ca8c4481409fdc 100644
--- a/app/models/concerns/status/threading_concern.rb
+++ b/app/models/concerns/status/threading_concern.rb
@@ -12,7 +12,7 @@ def descendants(limit, account = nil, depth = nil)
   end
 
   def self_replies(limit)
-    account.statuses.where(in_reply_to_id: id, visibility: [:public, :unlisted]).reorder(id: :asc).limit(limit)
+    account.statuses.distributable_visibility.where(in_reply_to_id: id).reorder(id: :asc).limit(limit)
   end
 
   private
diff --git a/app/models/featured_tag.rb b/app/models/featured_tag.rb
index ea8aa4787c4335..cdd97205eb71f8 100644
--- a/app/models/featured_tag.rb
+++ b/app/models/featured_tag.rb
@@ -74,6 +74,6 @@ def tag_already_featured_for_account?
   end
 
   def visible_tagged_account_statuses
-    account.statuses.where(visibility: %i(public unlisted)).tagged_with(tag)
+    account.statuses.distributable_visibility.tagged_with(tag)
   end
 end
diff --git a/app/models/status.rb b/app/models/status.rb
index 8ab78d09d6ed0f..c2d7985b4dc6aa 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -121,6 +121,7 @@ class Status < ApplicationRecord
   scope :tagged_with_none, lambda { |tag_ids|
     where('NOT EXISTS (SELECT * FROM statuses_tags forbidden WHERE forbidden.status_id = statuses.id AND forbidden.tag_id IN (?))', tag_ids)
   }
+  scope :distributable_visibility, -> { where(visibility: %i(public unlisted)) }
   scope :list_eligible_visibility, -> { where(visibility: %i(public unlisted private)) }
 
   after_create_commit :trigger_create_webhooks

From 5915bd7f455aeffd539536f40c09810c8b1c3177 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 16 Apr 2024 19:30:32 +0200
Subject: [PATCH 0764/2191] Fix development environment admin account not being
 auto-approved (#29958)

---
 db/seeds/04_admin.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/db/seeds/04_admin.rb b/db/seeds/04_admin.rb
index c9b0369c9f3281..887b4a22130376 100644
--- a/db/seeds/04_admin.rb
+++ b/db/seeds/04_admin.rb
@@ -7,5 +7,7 @@
   admin = Account.where(username: 'admin').first_or_initialize(username: 'admin')
   admin.save(validate: false)
 
-  User.where(email: "admin@#{domain}").first_or_initialize(email: "admin@#{domain}", password: 'mastodonadmin', password_confirmation: 'mastodonadmin', confirmed_at: Time.now.utc, role: UserRole.find_by(name: 'Owner'), account: admin, agreement: true, approved: true).save!
+  user = User.where(email: "admin@#{domain}").first_or_initialize(email: "admin@#{domain}", password: 'mastodonadmin', password_confirmation: 'mastodonadmin', confirmed_at: Time.now.utc, role: UserRole.find_by(name: 'Owner'), account: admin, agreement: true, approved: true)
+  user.save!
+  user.approve!
 end

From 6fed108703c88d5c8e44658cc7fec82dde53454c Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 17 Apr 2024 04:16:51 -0400
Subject: [PATCH 0765/2191] Use Rails `upsert` to generate update_count! query
 in Counters concern (#28738)

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
---
 app/models/concerns/account/counters.rb       | 55 ++++++++-----------
 spec/models/concerns/account/counters_spec.rb | 13 +++++
 2 files changed, 37 insertions(+), 31 deletions(-)

diff --git a/app/models/concerns/account/counters.rb b/app/models/concerns/account/counters.rb
index 4488398128aab5..536d5ca7bcdabc 100644
--- a/app/models/concerns/account/counters.rb
+++ b/app/models/concerns/account/counters.rb
@@ -35,40 +35,11 @@ def update_count!(key, value)
     raise ArgumentError, "Invalid key #{key}" unless ALLOWED_COUNTER_KEYS.include?(key)
     raise ArgumentError, 'Do not call update_count! on dirty objects' if association(:account_stat).loaded? && account_stat&.changed? && account_stat.changed_attribute_names_to_save == %w(id)
 
-    value = value.to_i
-    default_value = value.positive? ? value : 0
-
-    # We do an upsert using manually written SQL, as Rails' upsert method does
-    # not seem to support writing expressions in the UPDATE clause, but only
-    # re-insert the provided values instead.
-    # Even ARel seem to be missing proper handling of upserts.
-    sql = if value.positive? && key == :statuses_count
-            <<-SQL.squish
-              INSERT INTO account_stats(account_id, #{key}, created_at, updated_at, last_status_at)
-                VALUES (:account_id, :default_value, now(), now(), now())
-              ON CONFLICT (account_id) DO UPDATE
-              SET #{key} = account_stats.#{key} + :value,
-                  last_status_at = now(),
-                  updated_at = now()
-              RETURNING id;
-            SQL
-          else
-            <<-SQL.squish
-              INSERT INTO account_stats(account_id, #{key}, created_at, updated_at)
-                VALUES (:account_id, :default_value, now(), now())
-              ON CONFLICT (account_id) DO UPDATE
-              SET #{key} = account_stats.#{key} + :value,
-                  updated_at = now()
-              RETURNING id;
-            SQL
-          end
-
-    sql = AccountStat.sanitize_sql([sql, account_id: id, default_value: default_value, value: value])
-    account_stat_id = AccountStat.connection.exec_query(sql)[0]['id']
+    result = updated_account_stat(key, value.to_i)
 
     # Reload account_stat if it was loaded, taking into account newly-created unsaved records
     if association(:account_stat).loaded?
-      account_stat.id = account_stat_id if account_stat.new_record?
+      account_stat.id = result.first['id'] if account_stat.new_record?
       account_stat.reload
     end
   end
@@ -79,6 +50,28 @@ def account_stat
 
   private
 
+  def updated_account_stat(key, value)
+    AccountStat.upsert(
+      initial_values(key, value),
+      on_duplicate: Arel.sql(
+        duplicate_values(key, value).join(', ')
+      ),
+      unique_by: :account_id
+    )
+  end
+
+  def initial_values(key, value)
+    { :account_id => id, key => [value, 0].max }.tap do |values|
+      values.merge!(last_status_at: Time.current) if key == :statuses_count
+    end
+  end
+
+  def duplicate_values(key, value)
+    ["#{key} = (account_stats.#{key} + #{value})", 'updated_at = CURRENT_TIMESTAMP'].tap do |values|
+      values << 'last_status_at = CURRENT_TIMESTAMP' if key == :statuses_count && value.positive?
+    end
+  end
+
   def save_account_stat
     return unless association(:account_stat).loaded? && account_stat&.changed?
 
diff --git a/spec/models/concerns/account/counters_spec.rb b/spec/models/concerns/account/counters_spec.rb
index 3c063a2fa2901f..ccac9e95de6712 100644
--- a/spec/models/concerns/account/counters_spec.rb
+++ b/spec/models/concerns/account/counters_spec.rb
@@ -44,5 +44,18 @@
 
       expect(account.statuses_count).to eq 5
     end
+
+    it 'preserves last_status_at when decrementing statuses_count' do
+      account_stat = Fabricate(
+        :account_stat,
+        account: account,
+        last_status_at: 3.days.ago,
+        statuses_count: 10
+      )
+
+      expect { account.decrement_count!(:statuses_count) }
+        .to change(account_stat.reload, :statuses_count).by(-1)
+        .and not_change(account_stat.reload, :last_status_at)
+    end
   end
 end

From 9ce2db4136c109798b76adb82c1d12479d29018b Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 17 Apr 2024 04:23:25 -0400
Subject: [PATCH 0766/2191] Combine double subject runs and DRY up change check
 in bulk import service spec (#29402)

---
 spec/services/bulk_import_row_service_spec.rb | 50 +++++++------------
 1 file changed, 18 insertions(+), 32 deletions(-)

diff --git a/spec/services/bulk_import_row_service_spec.rb b/spec/services/bulk_import_row_service_spec.rb
index d295c280676f89..b9af795a5d2868 100644
--- a/spec/services/bulk_import_row_service_spec.rb
+++ b/spec/services/bulk_import_row_service_spec.rb
@@ -95,23 +95,27 @@
     context 'when importing a list row' do
       let(:import_type) { 'lists' }
       let(:target_account) { Fabricate(:account) }
+      let(:list_name) { 'my list' }
       let(:data) do
-        { 'acct' => target_account.acct, 'list_name' => 'my list' }
+        { 'acct' => target_account.acct, 'list_name' => list_name }
       end
 
       shared_examples 'common behavior' do
+        shared_examples 'row import success and list addition' do
+          it 'returns true and adds the target account to the list' do
+            result = nil
+            expect { result = subject.call(import_row) }
+              .to change { result }.from(nil).to(true)
+              .and add_target_account_to_list
+          end
+        end
+
         context 'when the target account is already followed' do
           before do
             account.follow!(target_account)
           end
 
-          it 'returns true' do
-            expect(subject.call(import_row)).to be true
-          end
-
-          it 'adds the target account to the list' do
-            expect { subject.call(import_row) }.to add_target_account_to_list
-          end
+          include_examples 'row import success and list addition'
         end
 
         context 'when the user already requested to follow the target account' do
@@ -119,35 +123,17 @@
             account.request_follow!(target_account)
           end
 
-          it 'returns true' do
-            expect(subject.call(import_row)).to be true
-          end
-
-          it 'adds the target account to the list' do
-            expect { subject.call(import_row) }.to add_target_account_to_list
-          end
+          include_examples 'row import success and list addition'
         end
 
         context 'when the target account is neither followed nor requested' do
-          it 'returns true' do
-            expect(subject.call(import_row)).to be true
-          end
-
-          it 'adds the target account to the list' do
-            expect { subject.call(import_row) }.to add_target_account_to_list
-          end
+          include_examples 'row import success and list addition'
         end
 
         context 'when the target account is the user themself' do
           let(:target_account) { account }
 
-          it 'returns true' do
-            expect(subject.call(import_row)).to be true
-          end
-
-          it 'adds the target account to the list' do
-            expect { subject.call(import_row) }.to add_target_account_to_list
-          end
+          include_examples 'row import success and list addition'
         end
 
         def add_target_account_to_list
@@ -161,7 +147,7 @@ def target_account_on_list?
             .joins(:list)
             .exists?(
               account_id: target_account.id,
-              list: { title: 'my list' }
+              list: { title: list_name }
             )
         end
       end
@@ -172,7 +158,7 @@ def target_account_on_list?
 
       context 'when the list exists' do
         before do
-          Fabricate(:list, account: account, title: 'my list')
+          Fabricate(:list, account: account, title: list_name)
         end
 
         include_examples 'common behavior'
@@ -180,7 +166,7 @@ def target_account_on_list?
         it 'does not create a new list' do
           account.follow!(target_account)
 
-          expect { subject.call(import_row) }.to_not(change { List.where(title: 'my list').count })
+          expect { subject.call(import_row) }.to_not(change { List.where(title: list_name).count })
         end
       end
     end

From 03abff3b30be2d8efe478a714fcccd0b1375f722 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 17 Apr 2024 10:30:58 +0200
Subject: [PATCH 0767/2191] Update dependency aws-sdk-s3 to v1.147.0 (#29967)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 9c0adce16d1150..ffeeebe9d3c482 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -102,17 +102,17 @@ GEM
     attr_required (1.0.2)
     awrence (1.2.1)
     aws-eventstream (1.3.0)
-    aws-partitions (1.899.0)
-    aws-sdk-core (3.191.5)
+    aws-partitions (1.914.0)
+    aws-sdk-core (3.192.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.8)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.78.0)
+    aws-sdk-kms (1.79.0)
       aws-sdk-core (~> 3, >= 3.191.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.146.1)
-      aws-sdk-core (~> 3, >= 3.191.0)
+    aws-sdk-s3 (1.147.0)
+      aws-sdk-core (~> 3, >= 3.192.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.8)
     aws-sigv4 (1.8.0)

From 9ae25947263cd4cc376fc210240e7b0f984a05d3 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 17 Apr 2024 05:00:08 -0400
Subject: [PATCH 0768/2191] Add reusable duplicate ID finder methods in
 maintenance CLI (#28910)

---
 lib/mastodon/cli/maintenance.rb | 61 ++++++++++++++++++++-------------
 1 file changed, 38 insertions(+), 23 deletions(-)

diff --git a/lib/mastodon/cli/maintenance.rb b/lib/mastodon/cli/maintenance.rb
index d16d55eae1ec08..0b84047a1cb161 100644
--- a/lib/mastodon/cli/maintenance.rb
+++ b/lib/mastodon/cli/maintenance.rb
@@ -254,7 +254,7 @@ def deduplicate_accounts!
 
       say 'Deduplicating accounts… for local accounts, you will be asked to chose which account to keep unchanged.'
 
-      find_duplicate_accounts.each do |row|
+      duplicate_record_ids(:accounts, "lower(username), COALESCE(lower(domain), '')").each do |row|
         accounts = Account.where(id: row['ids'].split(','))
 
         if accounts.first.local?
@@ -306,7 +306,7 @@ def deduplicate_users!
     end
 
     def deduplicate_users_process_email
-      database_connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM users GROUP BY email HAVING count(*) > 1").each do |row|
+      duplicate_record_ids(:users, 'email').each do |row|
         users = User.where(id: row['ids'].split(',')).order(updated_at: :desc).includes(:account).to_a
         ref_user = users.shift
         say "Multiple users registered with e-mail address #{ref_user.email}.", :yellow
@@ -320,7 +320,7 @@ def deduplicate_users_process_email
     end
 
     def deduplicate_users_process_confirmation_token
-      database_connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM users WHERE confirmation_token IS NOT NULL GROUP BY confirmation_token HAVING count(*) > 1").each do |row|
+      duplicate_record_ids_without_nulls(:users, 'confirmation_token').each do |row|
         users = User.where(id: row['ids'].split(',')).order(created_at: :desc).includes(:account).to_a.drop(1)
         say "Unsetting confirmation token for those accounts: #{users.map { |user| user.account.acct }.join(', ')}", :yellow
 
@@ -332,7 +332,7 @@ def deduplicate_users_process_confirmation_token
 
     def deduplicate_users_process_remember_token
       if migrator_version < 2022_01_18_183010
-        database_connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM users WHERE remember_token IS NOT NULL GROUP BY remember_token HAVING count(*) > 1").each do |row|
+        duplicate_record_ids_without_nulls(:users, 'remember_token').each do |row|
           users = User.where(id: row['ids'].split(',')).order(updated_at: :desc).to_a.drop(1)
           say "Unsetting remember token for those accounts: #{users.map { |user| user.account.acct }.join(', ')}", :yellow
 
@@ -344,7 +344,7 @@ def deduplicate_users_process_remember_token
     end
 
     def deduplicate_users_process_password_token
-      database_connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM users WHERE reset_password_token IS NOT NULL GROUP BY reset_password_token HAVING count(*) > 1").each do |row|
+      duplicate_record_ids_without_nulls(:users, 'reset_password_token').each do |row|
         users = User.where(id: row['ids'].split(',')).order(updated_at: :desc).includes(:account).to_a.drop(1)
         say "Unsetting password reset token for those accounts: #{users.map { |user| user.account.acct }.join(', ')}", :yellow
 
@@ -358,7 +358,7 @@ def deduplicate_account_domain_blocks!
       remove_index_if_exists!(:account_domain_blocks, 'index_account_domain_blocks_on_account_id_and_domain')
 
       say 'Removing duplicate account domain blocks…'
-      database_connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM account_domain_blocks GROUP BY account_id, domain HAVING count(*) > 1").each do |row|
+      duplicate_record_ids(:account_domain_blocks, 'account_id, domain').each do |row|
         AccountDomainBlock.where(id: row['ids'].split(',').drop(1)).delete_all
       end
 
@@ -372,7 +372,7 @@ def deduplicate_account_identity_proofs!
       remove_index_if_exists!(:account_identity_proofs, 'index_account_proofs_on_account_and_provider_and_username')
 
       say 'Removing duplicate account identity proofs…'
-      database_connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM account_identity_proofs GROUP BY account_id, provider, provider_username HAVING count(*) > 1").each do |row|
+      duplicate_record_ids(:account_identity_proofs, 'account_id, provider, provider_username').each do |row|
         AccountIdentityProof.where(id: row['ids'].split(',')).order(id: :desc).to_a.drop(1).each(&:destroy)
       end
 
@@ -386,7 +386,7 @@ def deduplicate_announcement_reactions!
       remove_index_if_exists!(:announcement_reactions, 'index_announcement_reactions_on_account_id_and_announcement_id')
 
       say 'Removing duplicate announcement reactions…'
-      database_connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM announcement_reactions GROUP BY account_id, announcement_id, name HAVING count(*) > 1").each do |row|
+      duplicate_record_ids(:announcement_reactions, 'account_id, announcement_id, name').each do |row|
         AnnouncementReaction.where(id: row['ids'].split(',')).order(id: :desc).to_a.drop(1).each(&:destroy)
       end
 
@@ -398,7 +398,7 @@ def deduplicate_conversations!
       remove_index_if_exists!(:conversations, 'index_conversations_on_uri')
 
       say 'Deduplicating conversations…'
-      database_connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM conversations WHERE uri IS NOT NULL GROUP BY uri HAVING count(*) > 1").each do |row|
+      duplicate_record_ids_without_nulls(:conversations, 'uri').each do |row|
         conversations = Conversation.where(id: row['ids'].split(',')).order(id: :desc).to_a
 
         ref_conversation = conversations.shift
@@ -421,7 +421,7 @@ def deduplicate_custom_emojis!
       remove_index_if_exists!(:custom_emojis, 'index_custom_emojis_on_shortcode_and_domain')
 
       say 'Deduplicating custom_emojis…'
-      database_connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM custom_emojis GROUP BY shortcode, domain HAVING count(*) > 1").each do |row|
+      duplicate_record_ids(:custom_emojis, 'shortcode, domain').each do |row|
         emojis = CustomEmoji.where(id: row['ids'].split(',')).order(id: :desc).to_a
 
         ref_emoji = emojis.shift
@@ -440,7 +440,7 @@ def deduplicate_custom_emoji_categories!
       remove_index_if_exists!(:custom_emoji_categories, 'index_custom_emoji_categories_on_name')
 
       say 'Deduplicating custom_emoji_categories…'
-      database_connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM custom_emoji_categories GROUP BY name HAVING count(*) > 1").each do |row|
+      duplicate_record_ids(:custom_emoji_categories, 'name').each do |row|
         categories = CustomEmojiCategory.where(id: row['ids'].split(',')).order(id: :desc).to_a
 
         ref_category = categories.shift
@@ -459,7 +459,7 @@ def deduplicate_domain_allows!
       remove_index_if_exists!(:domain_allows, 'index_domain_allows_on_domain')
 
       say 'Deduplicating domain_allows…'
-      database_connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM domain_allows GROUP BY domain HAVING count(*) > 1").each do |row|
+      duplicate_record_ids(:domain_allows, 'domain').each do |row|
         DomainAllow.where(id: row['ids'].split(',')).order(id: :desc).to_a.drop(1).each(&:destroy)
       end
 
@@ -471,7 +471,7 @@ def deduplicate_domain_blocks!
       remove_index_if_exists!(:domain_blocks, 'index_domain_blocks_on_domain')
 
       say 'Deduplicating domain_blocks…'
-      database_connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM domain_blocks GROUP BY domain HAVING count(*) > 1").each do |row|
+      duplicate_record_ids(:domain_blocks, 'domain').each do |row|
         domain_blocks = DomainBlock.where(id: row['ids'].split(',')).by_severity.reverse.to_a
 
         reject_media = domain_blocks.any?(&:reject_media?)
@@ -497,7 +497,7 @@ def deduplicate_unavailable_domains!
       remove_index_if_exists!(:unavailable_domains, 'index_unavailable_domains_on_domain')
 
       say 'Deduplicating unavailable_domains…'
-      database_connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM unavailable_domains GROUP BY domain HAVING count(*) > 1").each do |row|
+      duplicate_record_ids(:unavailable_domains, 'domain').each do |row|
         UnavailableDomain.where(id: row['ids'].split(',')).order(id: :desc).to_a.drop(1).each(&:destroy)
       end
 
@@ -509,7 +509,7 @@ def deduplicate_email_domain_blocks!
       remove_index_if_exists!(:email_domain_blocks, 'index_email_domain_blocks_on_domain')
 
       say 'Deduplicating email_domain_blocks…'
-      database_connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM email_domain_blocks GROUP BY domain HAVING count(*) > 1").each do |row|
+      duplicate_record_ids(:email_domain_blocks, 'domain').each do |row|
         domain_blocks = EmailDomainBlock.where(id: row['ids'].split(',')).order(EmailDomainBlock.arel_table[:parent_id].asc.nulls_first).to_a
         domain_blocks.drop(1).each(&:destroy)
       end
@@ -522,7 +522,7 @@ def deduplicate_media_attachments!
       remove_index_if_exists!(:media_attachments, 'index_media_attachments_on_shortcode')
 
       say 'Deduplicating media_attachments…'
-      database_connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM media_attachments WHERE shortcode IS NOT NULL GROUP BY shortcode HAVING count(*) > 1").each do |row|
+      duplicate_record_ids_without_nulls(:media_attachments, 'shortcode').each do |row|
         MediaAttachment.where(id: row['ids'].split(',').drop(1)).update_all(shortcode: nil)
       end
 
@@ -538,7 +538,7 @@ def deduplicate_preview_cards!
       remove_index_if_exists!(:preview_cards, 'index_preview_cards_on_url')
 
       say 'Deduplicating preview_cards…'
-      database_connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM preview_cards GROUP BY url HAVING count(*) > 1").each do |row|
+      duplicate_record_ids(:preview_cards, 'url').each do |row|
         PreviewCard.where(id: row['ids'].split(',')).order(id: :desc).to_a.drop(1).each(&:destroy)
       end
 
@@ -550,7 +550,7 @@ def deduplicate_statuses!
       remove_index_if_exists!(:statuses, 'index_statuses_on_uri')
 
       say 'Deduplicating statuses…'
-      database_connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM statuses WHERE uri IS NOT NULL GROUP BY uri HAVING count(*) > 1").each do |row|
+      duplicate_record_ids_without_nulls(:statuses, 'uri').each do |row|
         statuses = Status.where(id: row['ids'].split(',')).order(id: :asc).to_a
         ref_status = statuses.shift
         statuses.each do |status|
@@ -572,7 +572,7 @@ def deduplicate_tags!
       remove_index_if_exists!(:tags, 'index_tags_on_name_lower_btree')
 
       say 'Deduplicating tags…'
-      database_connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM tags GROUP BY lower((name)::text) HAVING count(*) > 1").each do |row|
+      duplicate_record_ids(:tags, 'lower((name)::text)').each do |row|
         tags = Tag.where(id: row['ids'].split(',')).order(Arel.sql('(usable::int + trendable::int + listable::int) desc')).to_a
         ref_tag = tags.shift
         tags.each do |tag|
@@ -595,7 +595,7 @@ def deduplicate_webauthn_credentials!
       remove_index_if_exists!(:webauthn_credentials, 'index_webauthn_credentials_on_external_id')
 
       say 'Deduplicating webauthn_credentials…'
-      database_connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM webauthn_credentials GROUP BY external_id HAVING count(*) > 1").each do |row|
+      duplicate_record_ids(:webauthn_credentials, 'external_id').each do |row|
         WebauthnCredential.where(id: row['ids'].split(',')).order(id: :desc).to_a.drop(1).each(&:destroy)
       end
 
@@ -609,7 +609,7 @@ def deduplicate_webhooks!
       remove_index_if_exists!(:webhooks, 'index_webhooks_on_url')
 
       say 'Deduplicating webhooks…'
-      database_connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM webhooks GROUP BY url HAVING count(*) > 1").each do |row|
+      duplicate_record_ids(:webhooks, 'url').each do |row|
         Webhook.where(id: row['ids'].split(',')).order(id: :desc).drop(1).each(&:destroy)
       end
 
@@ -746,8 +746,23 @@ def migrator_version
       ActiveRecord::Migrator.current_version
     end
 
-    def find_duplicate_accounts
-      database_connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM accounts GROUP BY lower(username), COALESCE(lower(domain), '') HAVING count(*) > 1")
+    def duplicate_record_ids_without_nulls(table, group_by)
+      database_connection.select_all(<<~SQL.squish)
+        SELECT string_agg(id::text, ',') AS ids
+        FROM #{table}
+        WHERE #{group_by} IS NOT NULL
+        GROUP BY #{group_by}
+        HAVING COUNT(*) > 1
+      SQL
+    end
+
+    def duplicate_record_ids(table, group_by)
+      database_connection.select_all(<<~SQL.squish)
+        SELECT string_agg(id::text, ',') AS ids
+        FROM #{table}
+        GROUP BY #{group_by}
+        HAVING COUNT(*) > 1
+      SQL
     end
 
     def remove_index_if_exists!(table, name)

From fc89ecc6cace1362d40158e9614494a242a7b06a Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 17 Apr 2024 11:06:23 +0200
Subject: [PATCH 0769/2191] Change `/api/v1/announcements` to return regular
 `Status` entities (#26736)

---
 app/models/announcement.rb                      | 12 +++++++-----
 app/serializers/rest/announcement_serializer.rb | 14 +-------------
 2 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/app/models/announcement.rb b/app/models/announcement.rb
index 5ce382dc18f8b4..54923ed0819e6a 100644
--- a/app/models/announcement.rb
+++ b/app/models/announcement.rb
@@ -59,11 +59,13 @@ def mentions
   end
 
   def statuses
-    @statuses ||= if status_ids.nil?
-                    []
-                  else
-                    Status.where(id: status_ids).distributable_visibility
-                  end
+    @statuses ||= begin
+      if status_ids.nil?
+        []
+      else
+        Status.with_includes.distributable_visibility.where(id: status_ids)
+      end
+    end
   end
 
   def tags
diff --git a/app/serializers/rest/announcement_serializer.rb b/app/serializers/rest/announcement_serializer.rb
index 8cee27127241e9..d1a011425dd3d1 100644
--- a/app/serializers/rest/announcement_serializer.rb
+++ b/app/serializers/rest/announcement_serializer.rb
@@ -9,7 +9,7 @@ class REST::AnnouncementSerializer < ActiveModel::Serializer
   attribute :read, if: :current_user?
 
   has_many :mentions
-  has_many :statuses
+  has_many :statuses, serializer: REST::StatusSerializer
   has_many :tags, serializer: REST::StatusSerializer::TagSerializer
   has_many :emojis, serializer: REST::CustomEmojiSerializer
   has_many :reactions, serializer: REST::ReactionSerializer
@@ -49,16 +49,4 @@ def acct
       object.pretty_acct
     end
   end
-
-  class StatusSerializer < ActiveModel::Serializer
-    attributes :id, :url
-
-    def id
-      object.id.to_s
-    end
-
-    def url
-      ActivityPub::TagManager.instance.url_for(object)
-    end
-  end
 end

From c35042b7eb4ff969a504d47d97d5201f18d8ec40 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 17 Apr 2024 09:07:13 +0000
Subject: [PATCH 0770/2191] New Crowdin Translations (automated) (#29972)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/bg.json      |  1 -
 app/javascript/mastodon/locales/br.json      |  1 +
 app/javascript/mastodon/locales/ca.json      |  2 +-
 app/javascript/mastodon/locales/cs.json      | 37 ++++++++
 app/javascript/mastodon/locales/da.json      |  2 +-
 app/javascript/mastodon/locales/de.json      |  2 +-
 app/javascript/mastodon/locales/es-AR.json   |  2 +-
 app/javascript/mastodon/locales/es-MX.json   |  1 -
 app/javascript/mastodon/locales/es.json      |  1 -
 app/javascript/mastodon/locales/et.json      |  1 -
 app/javascript/mastodon/locales/eu.json      |  1 +
 app/javascript/mastodon/locales/fi.json      |  2 +-
 app/javascript/mastodon/locales/fo.json      |  2 +-
 app/javascript/mastodon/locales/fr-CA.json   |  1 -
 app/javascript/mastodon/locales/fr.json      |  1 -
 app/javascript/mastodon/locales/gd.json      |  1 -
 app/javascript/mastodon/locales/gl.json      |  2 +-
 app/javascript/mastodon/locales/he.json      |  2 +-
 app/javascript/mastodon/locales/hu.json      |  2 +-
 app/javascript/mastodon/locales/ie.json      |  1 -
 app/javascript/mastodon/locales/is.json      |  2 +-
 app/javascript/mastodon/locales/it.json      |  2 +-
 app/javascript/mastodon/locales/ko.json      |  2 +-
 app/javascript/mastodon/locales/lad.json     |  1 +
 app/javascript/mastodon/locales/lt.json      |  1 -
 app/javascript/mastodon/locales/nl.json      |  2 +-
 app/javascript/mastodon/locales/nn.json      |  1 -
 app/javascript/mastodon/locales/pl.json      |  2 +-
 app/javascript/mastodon/locales/pt-BR.json   |  1 -
 app/javascript/mastodon/locales/pt-PT.json   |  2 +-
 app/javascript/mastodon/locales/ru.json      |  1 -
 app/javascript/mastodon/locales/sl.json      |  2 +-
 app/javascript/mastodon/locales/sq.json      |  1 -
 app/javascript/mastodon/locales/sr-Latn.json | 93 +++++++++++++++-----
 app/javascript/mastodon/locales/sr.json      | 15 ++++
 app/javascript/mastodon/locales/sv.json      |  1 -
 app/javascript/mastodon/locales/th.json      |  1 -
 app/javascript/mastodon/locales/tr.json      |  8 +-
 app/javascript/mastodon/locales/uk.json      |  1 -
 app/javascript/mastodon/locales/vi.json      |  2 +-
 app/javascript/mastodon/locales/zh-CN.json   |  2 +-
 app/javascript/mastodon/locales/zh-HK.json   |  1 -
 app/javascript/mastodon/locales/zh-TW.json   |  2 +-
 config/locales/sr-Latn.yml                   | 21 +++++
 config/locales/sr.yml                        | 17 ++++
 45 files changed, 186 insertions(+), 63 deletions(-)

diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json
index 2acedbc4d1f539..910d6cb06eb06f 100644
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@@ -298,7 +298,6 @@
   "filter_modal.select_filter.title": "Филтриране на публ.",
   "filter_modal.title.status": "Филтриране на публ.",
   "filtered_notifications_banner.pending_requests": "Известията от {count, plural, =0 {никого, когото може да познавате} one {едно лице, което може да познавате} other {# души, които може да познавате}}",
-  "filtered_notifications_banner.private_mentions": "{count, plural, one {частно споменаване} other {частни споменавания}}",
   "filtered_notifications_banner.title": "Филтрирани известия",
   "firehose.all": "Всичко",
   "firehose.local": "Този сървър",
diff --git a/app/javascript/mastodon/locales/br.json b/app/javascript/mastodon/locales/br.json
index 609e7f7158083d..f51121bcdc27be 100644
--- a/app/javascript/mastodon/locales/br.json
+++ b/app/javascript/mastodon/locales/br.json
@@ -256,6 +256,7 @@
   "filter_modal.select_filter.subtitle": "Implijout ur rummad a zo anezhañ pe krouiñ unan nevez",
   "filter_modal.select_filter.title": "Silañ an toud-mañ",
   "filter_modal.title.status": "Silañ un toud",
+  "filtered_notifications_banner.mentions": "{count, plural, one {meneg} two {veneg} few {meneg} other {a venegoù}}",
   "firehose.all": "Pep tra",
   "firehose.local": "Ar servijer-mañ",
   "firehose.remote": "Servijerioù all",
diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index 6f0dd93760c53d..40d9771df1a2ee 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -297,8 +297,8 @@
   "filter_modal.select_filter.subtitle": "Usa una categoria existent o crea'n una de nova",
   "filter_modal.select_filter.title": "Filtra aquest tut",
   "filter_modal.title.status": "Filtra un tut",
+  "filtered_notifications_banner.mentions": "{count, plural, one {menció} other {mencions}}",
   "filtered_notifications_banner.pending_requests": "Notificacions {count, plural, =0 {de ningú} one {d'una persona} other {de # persones}} que potser coneixes",
-  "filtered_notifications_banner.private_mentions": "{count, plural, one {menció privada} other {mencions privades}}",
   "filtered_notifications_banner.title": "Notificacions filtrades",
   "firehose.all": "Tots",
   "firehose.local": "Aquest servidor",
diff --git a/app/javascript/mastodon/locales/cs.json b/app/javascript/mastodon/locales/cs.json
index 273e8bf499d14d..f55caf14b5863a 100644
--- a/app/javascript/mastodon/locales/cs.json
+++ b/app/javascript/mastodon/locales/cs.json
@@ -89,6 +89,14 @@
   "announcement.announcement": "Oznámení",
   "attachments_list.unprocessed": "(nezpracováno)",
   "audio.hide": "Skrýt zvuk",
+  "block_modal.remote_users_caveat": "Požádáme server {domain}, aby respektoval vaše rozhodnutí. Úplné dodržování nastavení však není zaručeno, protože některé servery mohou řešit blokování různě. Veřejné příspěvky mohou být stále viditelné pro nepřihlášené uživatele.",
+  "block_modal.show_less": "Zobrazit méně",
+  "block_modal.show_more": "Zobrazit více",
+  "block_modal.they_cant_mention": "Nemůže vás zmiňovat ani sledovat.",
+  "block_modal.they_cant_see_posts": "Nemůže vidět vaše příspěvky a vy neuvidíte jeho.",
+  "block_modal.they_will_know": "Může vidět, že je zablokovaný.",
+  "block_modal.title": "Zablokovat uživatele?",
+  "block_modal.you_wont_see_mentions": "Neuvidíte příspěvky, které ho zmiňují.",
   "boost_modal.combo": "Příště můžete pro přeskočení stisknout {combo}",
   "bundle_column_error.copy_stacktrace": "Zkopírovat zprávu o chybě",
   "bundle_column_error.error.body": "Požadovanou stránku nelze vykreslit. Může to být způsobeno chybou v našem kódu nebo problémem s kompatibilitou prohlížeče.",
@@ -169,6 +177,7 @@
   "confirmations.delete_list.message": "Opravdu chcete tento seznam navždy smazat?",
   "confirmations.discard_edit_media.confirm": "Zahodit",
   "confirmations.discard_edit_media.message": "Máte neuložené změny popisku médií nebo náhledu, chcete je přesto zahodit?",
+  "confirmations.domain_block.confirm": "Blokovat server",
   "confirmations.domain_block.message": "Opravdu chcete blokovat celou doménu {domain}? Ve většině případů stačí blokovat nebo skrýt pár konkrétních uživatelů, což také doporučujeme. Z této domény neuvidíte obsah v žádné veřejné časové ose ani v oznámeních. Vaši sledující z této domény budou odstraněni.",
   "confirmations.edit.confirm": "Upravit",
   "confirmations.edit.message": "Editovat teď znamená přepsání zprávy, kterou právě tvoříte. Opravdu chcete pokračovat?",
@@ -200,6 +209,27 @@
   "dismissable_banner.explore_statuses": "Toto jsou příspěvky ze sociálních sítí, které dnes získávají na popularitě. Novější příspěvky s větším počtem boostů a oblíbení jsou hodnoceny výše.",
   "dismissable_banner.explore_tags": "Tyto hashtagy právě teď získávají na popularitě mezi lidmi na tomto a dalších serverech decentralizované sítě.",
   "dismissable_banner.public_timeline": "Toto jsou nejnovější veřejné příspěvky od lidí na sociální síti, které sledují lidé na {domain}.",
+  "domain_block_modal.block": "Blokovat server",
+  "domain_block_modal.block_account_instead": "Raději blokovat @{name}",
+  "domain_block_modal.they_can_interact_with_old_posts": "Lidé z tohoto serveru mohou interagovat s vašimi starými příspěvky.",
+  "domain_block_modal.they_cant_follow": "Nikdo z tohoto serveru vás nemůže sledovat.",
+  "domain_block_modal.they_wont_know": "Nebude vědět, že je zablokován.",
+  "domain_block_modal.title": "Blokovat doménu?",
+  "domain_block_modal.you_will_lose_followers": "Všichni vaši sledující z tohoto serveru budou odstraněni.",
+  "domain_block_modal.you_wont_see_posts": "Neuvidíte příspěvky ani upozornění od uživatelů z tohoto serveru.",
+  "domain_pill.activitypub_lets_connect": "Umožňuje vám spojit se a komunikovat s lidmi nejen na Mastodonu, ale i s dalšími sociálními aplikacemi.",
+  "domain_pill.activitypub_like_language": "ActivityPub je jako jazyk, kterým Mastodon mluví s jinými sociálními sítěmi.",
+  "domain_pill.server": "Server",
+  "domain_pill.their_handle": "Handle:",
+  "domain_pill.their_server": "Digitální domov, kde žijí všechny příspěvky.",
+  "domain_pill.their_username": "Jedinečný identikátor na serveru. Je možné najít uživatele se stejným uživatelským jménem na různých serverech.",
+  "domain_pill.username": "Uživatelské jméno",
+  "domain_pill.whats_in_a_handle": "Co obsahuje handle?",
+  "domain_pill.who_they_are": "Protože handle říkají kdo je kdo a také kde, je možné interagovat s lidmi napříč sociálními weby <button>platforem postavených na ActivityPub</button>.",
+  "domain_pill.who_you_are": "Protože handle říká kdo jsi a kde jsi, mohou s tebou lidé komunikovat napříč sociálními weby <button>platforem postavených na ActivityPub</button>.",
+  "domain_pill.your_handle": "Tvůj handle:",
+  "domain_pill.your_server": "Tvůj digitální domov, kde žijí všechny tvé příspěvky. Nelíbí se ti? Kdykoliv se přesuň na jiný server a vezmi si sebou i své sledující.",
+  "domain_pill.your_username": "Tvůj jedinečný identifikátor na tomto serveru. Je možné najít uživatele se stejným uživatelským jménem na jiných serverech.",
   "embed.instructions": "Pro přidání příspěvku na vaši webovou stránku zkopírujte níže uvedený kód.",
   "embed.preview": "Takhle to bude vypadat:",
   "emoji_button.activity": "Aktivita",
@@ -236,6 +266,7 @@
   "empty_column.list": "V tomto seznamu zatím nic není. Až nějaký člen z tohoto seznamu zveřejní nový příspěvek, objeví se zde.",
   "empty_column.lists": "Zatím nemáte žádné seznamy. Až nějaký vytvoříte, zobrazí se zde.",
   "empty_column.mutes": "Zatím jste neskryli žádného uživatele.",
+  "empty_column.notification_requests": "Vyčištěno! Nic tu není. Jakmile obdržíš nové notifikace, objeví se zde podle tvého nastavení.",
   "empty_column.notifications": "Zatím nemáte žádná oznámení. Až s vámi někdo bude interagovat, uvidíte to zde.",
   "empty_column.public": "Tady nic není! Napište něco veřejně, nebo začněte ručně sledovat uživatele z jiných serverů, aby tu něco přibylo",
   "error.unexpected_crash.explanation": "Kvůli chybě v našem kódu nebo problému s kompatibilitou prohlížeče nemohla být tato stránka správně zobrazena.",
@@ -266,6 +297,7 @@
   "filter_modal.select_filter.subtitle": "Použít existující kategorii nebo vytvořit novou kategorii",
   "filter_modal.select_filter.title": "Filtrovat tento příspěvek",
   "filter_modal.title.status": "Filtrovat příspěvek",
+  "filtered_notifications_banner.title": "Filtrovaná oznámení",
   "firehose.all": "Vše",
   "firehose.local": "Tento server",
   "firehose.remote": "Ostatní servery",
@@ -394,6 +426,8 @@
   "loading_indicator.label": "Načítání…",
   "media_gallery.toggle_visible": "{number, plural, one {Skrýt obrázek} few {Skrýt obrázky} many {Skrýt obrázky} other {Skrýt obrázky}}",
   "moved_to_account_banner.text": "Váš účet {disabledAccount} je momentálně deaktivován, protože jste se přesunul/a na {movedToAccount}.",
+  "mute_modal.hide_from_notifications": "Skrýt z notifikací",
+  "mute_modal.title": "Ztlumit uživatele?",
   "navigation_bar.about": "O aplikaci",
   "navigation_bar.advanced_interface": "Otevřít pokročilé webové rozhraní",
   "navigation_bar.blocks": "Blokovaní uživatelé",
@@ -429,8 +463,11 @@
   "notification.own_poll": "Vaše anketa skončila",
   "notification.poll": "Anketa, ve které jste hlasovali, skončila",
   "notification.reblog": "Uživatel {name} boostnul váš příspěvek",
+  "notification.relationships_severance_event.learn_more": "Zjistit více",
   "notification.status": "Uživatel {name} právě přidal příspěvek",
   "notification.update": "Uživatel {name} upravil příspěvek",
+  "notification_requests.accept": "Přijmout",
+  "notification_requests.dismiss": "Zamítnout",
   "notifications.clear": "Vyčistit oznámení",
   "notifications.clear_confirmation": "Opravdu chcete trvale smazat všechna vaše oznámení?",
   "notifications.column_settings.admin.report": "Nová hlášení:",
diff --git a/app/javascript/mastodon/locales/da.json b/app/javascript/mastodon/locales/da.json
index 2e5fb21fef565f..a7c8a049eadb37 100644
--- a/app/javascript/mastodon/locales/da.json
+++ b/app/javascript/mastodon/locales/da.json
@@ -295,8 +295,8 @@
   "filter_modal.select_filter.subtitle": "Vælg en eksisterende kategori eller opret en ny",
   "filter_modal.select_filter.title": "Filtrér dette indlæg",
   "filter_modal.title.status": "Filtrér et indlæg",
+  "filtered_notifications_banner.mentions": "{count, plural, one {omtale} other {omtaler}}",
   "filtered_notifications_banner.pending_requests": "Notifikationer fra {count, plural, =0 {ingen} one {én person} other {# personer}} du måske kender",
-  "filtered_notifications_banner.private_mentions": "{count, plural, one {privat omtale} other {private omtaler}}",
   "filtered_notifications_banner.title": "Filtrerede notifikationer",
   "firehose.all": "Alle",
   "firehose.local": "Denne server",
diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json
index 5a5acb383586f8..a1ba25fede9816 100644
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@@ -297,8 +297,8 @@
   "filter_modal.select_filter.subtitle": "Einem vorhandenen Filter hinzufügen oder einen neuen erstellen",
   "filter_modal.select_filter.title": "Diesen Beitrag filtern",
   "filter_modal.title.status": "Beitrag per Filter ausblenden",
+  "filtered_notifications_banner.mentions": "{count, plural, one {Erwähnung} other {Erwähnungen}}",
   "filtered_notifications_banner.pending_requests": "Benachrichtigungen von {count, plural, =0 {keinem Profil, das du möglicherweise kennst} one {einem Profil, das du möglicherweise kennst} other {# Profilen, die du möglicherweise kennst}}",
-  "filtered_notifications_banner.private_mentions": "{count, plural, one {private Erwähnung} other {private Erwähnungen}}",
   "filtered_notifications_banner.title": "Gefilterte Benachrichtigungen",
   "firehose.all": "Alles",
   "firehose.local": "Dieser Server",
diff --git a/app/javascript/mastodon/locales/es-AR.json b/app/javascript/mastodon/locales/es-AR.json
index c14edac6bf7e06..2cf4198625042d 100644
--- a/app/javascript/mastodon/locales/es-AR.json
+++ b/app/javascript/mastodon/locales/es-AR.json
@@ -297,8 +297,8 @@
   "filter_modal.select_filter.subtitle": "Usar una categoría existente o crear una nueva",
   "filter_modal.select_filter.title": "Filtrar este mensaje",
   "filter_modal.title.status": "Filtrar un mensaje",
+  "filtered_notifications_banner.mentions": "{count, plural, one {mención} other {menciones}}",
   "filtered_notifications_banner.pending_requests": "Notificaciones de {count, plural, =0 {nadie} one {una persona} other {# personas}} que podrías conocer",
-  "filtered_notifications_banner.private_mentions": "{count, plural, one {mención privada} other {menciones privadas}}",
   "filtered_notifications_banner.title": "Notificaciones filtradas",
   "firehose.all": "Todos",
   "firehose.local": "Este servidor",
diff --git a/app/javascript/mastodon/locales/es-MX.json b/app/javascript/mastodon/locales/es-MX.json
index 78746d8b4a6bd5..fd32d9d903b8c7 100644
--- a/app/javascript/mastodon/locales/es-MX.json
+++ b/app/javascript/mastodon/locales/es-MX.json
@@ -298,7 +298,6 @@
   "filter_modal.select_filter.title": "Filtrar esta publicación",
   "filter_modal.title.status": "Filtrar una publicación",
   "filtered_notifications_banner.pending_requests": "Notificaciones de {count, plural, =0 {nadie} one {una persona} other {# personas}} que podrías conocer",
-  "filtered_notifications_banner.private_mentions": "{count, plural, one {mención privada} other {menciones privadas}}",
   "filtered_notifications_banner.title": "Notificaciones filtradas",
   "firehose.all": "Todas",
   "firehose.local": "Este servidor",
diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json
index e3ed560b5ce3f7..9c15a3cae48989 100644
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@@ -298,7 +298,6 @@
   "filter_modal.select_filter.title": "Filtrar esta publicación",
   "filter_modal.title.status": "Filtrar una publicación",
   "filtered_notifications_banner.pending_requests": "Notificaciones de {count, plural, =0 {nadie} one {una persona} other {# personas}} que podrías conocer",
-  "filtered_notifications_banner.private_mentions": "{count, plural, one {mención privada} other {menciones privadas}}",
   "filtered_notifications_banner.title": "Notificaciones filtradas",
   "firehose.all": "Todas",
   "firehose.local": "Este servidor",
diff --git a/app/javascript/mastodon/locales/et.json b/app/javascript/mastodon/locales/et.json
index eda2099357877a..b2759d66c64861 100644
--- a/app/javascript/mastodon/locales/et.json
+++ b/app/javascript/mastodon/locales/et.json
@@ -298,7 +298,6 @@
   "filter_modal.select_filter.title": "Filtreeri seda postitust",
   "filter_modal.title.status": "Postituse filtreerimine",
   "filtered_notifications_banner.pending_requests": "Teateid {count, plural, =0 {mitte üheltki} one {ühelt} other {#}} inimeselt, keda võid teada",
-  "filtered_notifications_banner.private_mentions": "{count, plural, one {privaatne teavitus} other {privaatsed teavitused}}",
   "filtered_notifications_banner.title": "Filtreeritud teavitused",
   "firehose.all": "Kõik",
   "firehose.local": "See server",
diff --git a/app/javascript/mastodon/locales/eu.json b/app/javascript/mastodon/locales/eu.json
index 529c1ab9c94d60..7e2ecf69cdb9d4 100644
--- a/app/javascript/mastodon/locales/eu.json
+++ b/app/javascript/mastodon/locales/eu.json
@@ -297,6 +297,7 @@
   "filter_modal.select_filter.subtitle": "Hautatu lehendik dagoen kategoria bat edo sortu berria",
   "filter_modal.select_filter.title": "Iragazi bidalketa hau",
   "filter_modal.title.status": "Iragazi bidalketa bat",
+  "filtered_notifications_banner.mentions": "{count, plural, one {aipamen} other {aipamen}}",
   "filtered_notifications_banner.pending_requests": "Ezagutu {count, plural, =0 {dezakezun inoren} one {dezakezun pertsona baten} other {ditzakezun # pertsonen}} jakinarazpenak",
   "filtered_notifications_banner.title": "Iragazitako jakinarazpenak",
   "firehose.all": "Guztiak",
diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index b23f1254e2427c..a32bb13153b29a 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -297,8 +297,8 @@
   "filter_modal.select_filter.subtitle": "Käytä olemassa olevaa luokkaa tai luo uusi",
   "filter_modal.select_filter.title": "Suodata tämä julkaisu",
   "filter_modal.title.status": "Suodata julkaisu",
+  "filtered_notifications_banner.mentions": "{count, plural, one {maininta} other {mainintaa}}",
   "filtered_notifications_banner.pending_requests": "Ilmoitukset {count, plural, =0 {ei keltään} one {yhdeltä henkilöltä} other {# henkilöltä}}, jonka saatat tuntea",
-  "filtered_notifications_banner.private_mentions": "{count, plural, one {yksityismaininta} other {yksityismainintaa}}",
   "filtered_notifications_banner.title": "Suodatetut ilmoitukset",
   "firehose.all": "Kaikki",
   "firehose.local": "Tämä palvelin",
diff --git a/app/javascript/mastodon/locales/fo.json b/app/javascript/mastodon/locales/fo.json
index b8722ee319edf2..68faf6d81f2c55 100644
--- a/app/javascript/mastodon/locales/fo.json
+++ b/app/javascript/mastodon/locales/fo.json
@@ -297,8 +297,8 @@
   "filter_modal.select_filter.subtitle": "Brúka ein verandi bólk ella skapa ein nýggjan",
   "filter_modal.select_filter.title": "Filtrera hendan postin",
   "filter_modal.title.status": "Filtrera ein post",
+  "filtered_notifications_banner.mentions": "{count, plural, one {umrøða} other {umrøður}}",
   "filtered_notifications_banner.pending_requests": "Fráboðanir frá {count, plural, =0 {ongum} one {einum persóni} other {# persónum}}, sum tú kanska kennir",
-  "filtered_notifications_banner.private_mentions": "{count, plural, one {privat umrøða} other {privatar umrøður}}",
   "filtered_notifications_banner.title": "Sáldaðar fráboðanir",
   "firehose.all": "Allar",
   "firehose.local": "Hesin ambætarin",
diff --git a/app/javascript/mastodon/locales/fr-CA.json b/app/javascript/mastodon/locales/fr-CA.json
index 163769253d62b9..9e29852904107c 100644
--- a/app/javascript/mastodon/locales/fr-CA.json
+++ b/app/javascript/mastodon/locales/fr-CA.json
@@ -298,7 +298,6 @@
   "filter_modal.select_filter.title": "Filtrer cette publication",
   "filter_modal.title.status": "Filtrer une publication",
   "filtered_notifications_banner.pending_requests": "Notifications {count, plural, =0 {de personne} one {d’une personne} other {de # personnes}} que vous pouvez connaitre",
-  "filtered_notifications_banner.private_mentions": "{count, plural, one {mention privée} other {mentions privées}}",
   "filtered_notifications_banner.title": "Notifications filtrées",
   "firehose.all": "Tout",
   "firehose.local": "Ce serveur",
diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json
index 18fce401b25c07..58ab46d5c997b4 100644
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@@ -298,7 +298,6 @@
   "filter_modal.select_filter.title": "Filtrer ce message",
   "filter_modal.title.status": "Filtrer un message",
   "filtered_notifications_banner.pending_requests": "Notifications {count, plural, =0 {de personne} one {d’une personne} other {de # personnes}} que vous pouvez connaitre",
-  "filtered_notifications_banner.private_mentions": "{count, plural, one {mention privée} other {mentions privées}}",
   "filtered_notifications_banner.title": "Notifications filtrées",
   "firehose.all": "Tout",
   "firehose.local": "Ce serveur",
diff --git a/app/javascript/mastodon/locales/gd.json b/app/javascript/mastodon/locales/gd.json
index 4aaa0cbf74821c..8ab515e1a8fdab 100644
--- a/app/javascript/mastodon/locales/gd.json
+++ b/app/javascript/mastodon/locales/gd.json
@@ -298,7 +298,6 @@
   "filter_modal.select_filter.title": "Criathraich am post seo",
   "filter_modal.title.status": "Criathraich post",
   "filtered_notifications_banner.pending_requests": "{count, plural, =0 {Chan eil brath ann o dhaoine} one {Tha brathan ann o # neach} two {Tha brathan ann o # neach} few {Tha brathan ann o # daoine} other {Tha brathan ann o # duine}} air a bheil thu eòlach ’s dòcha",
-  "filtered_notifications_banner.private_mentions": "{count, plural, one {iomradh prìobhaideach} two {iomradh prìobhaideach} few {iomraidhean prìobhaideach} other {iomradh prìobhaideach}}",
   "filtered_notifications_banner.title": "Brathan criathraichte",
   "firehose.all": "Na h-uile",
   "firehose.local": "Am frithealaiche seo",
diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json
index c7fed4ed08f368..901bca7498792f 100644
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@@ -297,8 +297,8 @@
   "filter_modal.select_filter.subtitle": "Usar unha categoría existente ou crear unha nova",
   "filter_modal.select_filter.title": "Filtrar esta publicación",
   "filter_modal.title.status": "Filtrar unha publicación",
+  "filtered_notifications_banner.mentions": "{count, plural, one {mención} other {mencións}}",
   "filtered_notifications_banner.pending_requests": "Notificacións de {count, plural, =0 {ninguén} one {unha persoa} other {# persoas}} que poderías coñecer",
-  "filtered_notifications_banner.private_mentions": "{count, plural, one {mención privada} other {mencións privadas}}",
   "filtered_notifications_banner.title": "Notificacións filtradas",
   "firehose.all": "Todo",
   "firehose.local": "Este servidor",
diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json
index 155708cfaea547..d696186bf5cfcd 100644
--- a/app/javascript/mastodon/locales/he.json
+++ b/app/javascript/mastodon/locales/he.json
@@ -297,8 +297,8 @@
   "filter_modal.select_filter.subtitle": "שימוש בקטגורייה קיימת או יצירת אחת חדשה",
   "filter_modal.select_filter.title": "סינון ההודעה הזו",
   "filter_modal.title.status": "סנן הודעה",
+  "filtered_notifications_banner.mentions": "{count, plural, one {איזכור} other {איזכורים} two {איזכוריים}}",
   "filtered_notifications_banner.pending_requests": "{count, plural,=0 {אין התראות ממשתמשים ה}one {התראה אחת ממישהו/מישהי ה}two {יש התראותיים ממשתמשים }other {יש # התראות ממשתמשים }}מוכרים לך",
-  "filtered_notifications_banner.private_mentions": "{count, plural, one {איזכור פרטי} other {איזכורים פרטיים}}",
   "filtered_notifications_banner.title": "התראות מסוננות",
   "firehose.all": "הכל",
   "firehose.local": "שרת זה",
diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json
index 1de040a656d290..16dcea642dd823 100644
--- a/app/javascript/mastodon/locales/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@@ -297,8 +297,8 @@
   "filter_modal.select_filter.subtitle": "Válassz egy meglévő kategóriát, vagy hozz létre egy újat",
   "filter_modal.select_filter.title": "E bejegyzés szűrése",
   "filter_modal.title.status": "Egy bejegyzés szűrése",
+  "filtered_notifications_banner.mentions": "{count, plural, one {említés} other {említés}}",
   "filtered_notifications_banner.pending_requests": "Értesítések {count, plural, =0 {nincsenek} one {egy valósztínűleg ismerős személytől} other {# valószínűleg ismerős személytől}}",
-  "filtered_notifications_banner.private_mentions": "{count, plural, one {privát említés} other {privát említés}}",
   "filtered_notifications_banner.title": "Szűrt értesítések",
   "firehose.all": "Összes",
   "firehose.local": "Ez a kiszolgáló",
diff --git a/app/javascript/mastodon/locales/ie.json b/app/javascript/mastodon/locales/ie.json
index 00b6a36c9f2e53..8d491412c0155a 100644
--- a/app/javascript/mastodon/locales/ie.json
+++ b/app/javascript/mastodon/locales/ie.json
@@ -287,7 +287,6 @@
   "filter_modal.select_filter.title": "Filtrar ti-ci posta",
   "filter_modal.title.status": "Filtrar un posta",
   "filtered_notifications_banner.pending_requests": "Notificationes de {count, plural, =0 {nequi} one {un person} other {# persones}} quel tu possibilmen conosse",
-  "filtered_notifications_banner.private_mentions": "{count, plural, one {privat mention} other {privat mentiones}}",
   "filtered_notifications_banner.title": "Filtrat notificationes",
   "firehose.all": "Omno",
   "firehose.local": "Ti-ci servitor",
diff --git a/app/javascript/mastodon/locales/is.json b/app/javascript/mastodon/locales/is.json
index c9a354f4bb7bc4..435f98f30fc7c4 100644
--- a/app/javascript/mastodon/locales/is.json
+++ b/app/javascript/mastodon/locales/is.json
@@ -297,8 +297,8 @@
   "filter_modal.select_filter.subtitle": "Notaðu fyrirliggjandi flokk eða útbúðu nýjan",
   "filter_modal.select_filter.title": "Sía þessa færslu",
   "filter_modal.title.status": "Sía færslu",
+  "filtered_notifications_banner.mentions": "{count, plural, one {tilvísun} other {tilvísanir}}",
   "filtered_notifications_banner.pending_requests": "Tilkynningar frá {count, plural, =0 {engum} one {einum aðila} other {# aðilum}} sem þú gætir þekkt",
-  "filtered_notifications_banner.private_mentions": "{count, plural, one {einkaspjall} other {einkaspjöll}}",
   "filtered_notifications_banner.title": "Síaðar tilkynningar",
   "firehose.all": "Allt",
   "firehose.local": "þessum netþjóni",
diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json
index 4679d834101b91..fcfd09d75ff9a4 100644
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@@ -297,8 +297,8 @@
   "filter_modal.select_filter.subtitle": "Usa una categoria esistente o creane una nuova",
   "filter_modal.select_filter.title": "Filtra questo post",
   "filter_modal.title.status": "Filtra un post",
+  "filtered_notifications_banner.mentions": "{count, plural, one {menzione} other {menzioni}}",
   "filtered_notifications_banner.pending_requests": "Notifiche da {count, plural, =0 {nessuno} one {una persona} other {# persone}} che potresti conoscere",
-  "filtered_notifications_banner.private_mentions": "{count, plural,one {menzione privata} other {menzioni private}}",
   "filtered_notifications_banner.title": "Notifiche filtrate",
   "firehose.all": "Tutto",
   "firehose.local": "Questo server",
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index f1e1074ff4446a..8628dbb336e763 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -297,8 +297,8 @@
   "filter_modal.select_filter.subtitle": "기존의 카테고리를 사용하거나 새로 하나를 만듧니다",
   "filter_modal.select_filter.title": "이 게시물을 필터",
   "filter_modal.title.status": "게시물 필터",
+  "filtered_notifications_banner.mentions": "{count, plural, other {멘션}}",
   "filtered_notifications_banner.pending_requests": "알 수도 있는 {count, plural, =0 {0 명} one {한 명} other {# 명}}의 사람들로부터의 알림",
-  "filtered_notifications_banner.private_mentions": "{count, plural, other {개인적인 멘션}}",
   "filtered_notifications_banner.title": "걸러진 알림",
   "firehose.all": "모두",
   "firehose.local": "이 서버",
diff --git a/app/javascript/mastodon/locales/lad.json b/app/javascript/mastodon/locales/lad.json
index 898f3b1ce206d8..cf6c3f772f7200 100644
--- a/app/javascript/mastodon/locales/lad.json
+++ b/app/javascript/mastodon/locales/lad.json
@@ -457,6 +457,7 @@
   "notification.own_poll": "Tu anketa eskapo",
   "notification.poll": "Anketa en ke votates eskapo",
   "notification.reblog": "{name} repartajo tu publikasyon",
+  "notification.relationships_severance_event": "Koneksyones pedridas kon {name}",
   "notification.relationships_severance_event.learn_more": "Ambezate mas",
   "notification.status": "{name} publiko algo",
   "notification.update": "{name} edito una publikasyon",
diff --git a/app/javascript/mastodon/locales/lt.json b/app/javascript/mastodon/locales/lt.json
index 580af4f3da42af..7b3511cfe142b8 100644
--- a/app/javascript/mastodon/locales/lt.json
+++ b/app/javascript/mastodon/locales/lt.json
@@ -282,7 +282,6 @@
   "filter_modal.select_filter.subtitle": "Naudok esamą kategoriją arba sukurk naują.",
   "filter_modal.select_filter.title": "Filtruoti šį įrašą",
   "filter_modal.title.status": "Filtruoti įrašą",
-  "filtered_notifications_banner.private_mentions": "{count, plural, one {privatus paminėjimas} few {privatūs paminėjimai} many {privataus paminėjimo} other {privačių paminėjimų}}",
   "firehose.all": "Visi",
   "firehose.local": "Šis serveris",
   "firehose.remote": "Kiti serveriai",
diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json
index 1025c32048fbf3..46d1f978350ae2 100644
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@@ -297,8 +297,8 @@
   "filter_modal.select_filter.subtitle": "Een bestaande categorie gebruiken of een nieuwe aanmaken",
   "filter_modal.select_filter.title": "Dit bericht filteren",
   "filter_modal.title.status": "Een bericht filteren",
+  "filtered_notifications_banner.mentions": "{count, plural, one {vermelding} other {vermeldingen}}",
   "filtered_notifications_banner.pending_requests": "Meldingen van {count, plural, =0 {niemand} one {één persoon} other {# mensen}} die je misschien kent",
-  "filtered_notifications_banner.private_mentions": "{count, plural, one {privébericht} other {privéberichten}}",
   "filtered_notifications_banner.title": "Gefilterde meldingen",
   "firehose.all": "Alles",
   "firehose.local": "Deze server",
diff --git a/app/javascript/mastodon/locales/nn.json b/app/javascript/mastodon/locales/nn.json
index ab44c691d1b1d6..2cfb0d1247c890 100644
--- a/app/javascript/mastodon/locales/nn.json
+++ b/app/javascript/mastodon/locales/nn.json
@@ -298,7 +298,6 @@
   "filter_modal.select_filter.title": "Filtrer dette innlegget",
   "filter_modal.title.status": "Filtrer eit innlegg",
   "filtered_notifications_banner.pending_requests": "Varsel frå {count, plural, =0 {ingen} one {ein person} other {# folk}} du kanskje kjenner",
-  "filtered_notifications_banner.private_mentions": "{count, plural, one {privat omtale} other {private omtaler}}",
   "filtered_notifications_banner.title": "Filtrerte varslingar",
   "firehose.all": "Alle",
   "firehose.local": "Denne tenaren",
diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json
index 718aa32d2ed5f0..72f1ba58f50dbb 100644
--- a/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@@ -297,8 +297,8 @@
   "filter_modal.select_filter.subtitle": "Użyj istniejącej kategorii lub utwórz nową",
   "filter_modal.select_filter.title": "Filtruj ten wpis",
   "filter_modal.title.status": "Filtruj wpis",
+  "filtered_notifications_banner.mentions": "{count, plural, one {wzmianka} few {wzmianki} other {wzmianek}}",
   "filtered_notifications_banner.pending_requests": "Powiadomienia od {count, plural, =0 {żadnej osoby którą możesz znać} one {# osoby którą możesz znać} other {# osób które możesz znać}}",
-  "filtered_notifications_banner.private_mentions": "{count, plural, one {prywatna wzmianka} few {prywatne wzmianki} other {prywatnych wzmianek}}",
   "filtered_notifications_banner.title": "Powiadomienia filtrowane",
   "firehose.all": "Wszystko",
   "firehose.local": "Ten serwer",
diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json
index 08ed5c021087c2..1bb73db238611f 100644
--- a/app/javascript/mastodon/locales/pt-BR.json
+++ b/app/javascript/mastodon/locales/pt-BR.json
@@ -298,7 +298,6 @@
   "filter_modal.select_filter.title": "Filtrar esta publicação",
   "filter_modal.title.status": "Filtrar uma publicação",
   "filtered_notifications_banner.pending_requests": "Notificações de {count, plural, =0 {no one} one {one person} other {# people}} que você talvez conheça",
-  "filtered_notifications_banner.private_mentions": "{count, plural, one {private mention} other {private mentions}}",
   "filtered_notifications_banner.title": "Notificações filtradas",
   "firehose.all": "Tudo",
   "firehose.local": "Este servidor",
diff --git a/app/javascript/mastodon/locales/pt-PT.json b/app/javascript/mastodon/locales/pt-PT.json
index 39dfba819d01a3..7e98cde5fa967e 100644
--- a/app/javascript/mastodon/locales/pt-PT.json
+++ b/app/javascript/mastodon/locales/pt-PT.json
@@ -297,8 +297,8 @@
   "filter_modal.select_filter.subtitle": "Utilize uma categoria existente ou crie uma nova",
   "filter_modal.select_filter.title": "Filtrar esta publicação",
   "filter_modal.title.status": "Filtrar uma publicação",
+  "filtered_notifications_banner.mentions": "{count, plural, one {menção} other {menções}}",
   "filtered_notifications_banner.pending_requests": "Notificações de {count, plural, =0 {ninguém} one {uma pessoa} other {# pessoas}} que talvez conheça",
-  "filtered_notifications_banner.private_mentions": "{count, plural,one {menção privada} other {menções privadas}}",
   "filtered_notifications_banner.title": "Notificações filtradas",
   "firehose.all": "Todas",
   "firehose.local": "Este servidor",
diff --git a/app/javascript/mastodon/locales/ru.json b/app/javascript/mastodon/locales/ru.json
index 16c4d19985b59b..cd09a505b3e93c 100644
--- a/app/javascript/mastodon/locales/ru.json
+++ b/app/javascript/mastodon/locales/ru.json
@@ -298,7 +298,6 @@
   "filter_modal.select_filter.title": "Фильтровать этот пост",
   "filter_modal.title.status": "Фильтровать пост",
   "filtered_notifications_banner.pending_requests": "Уведомления от {count, plural, =0 {никого} one {# человека} other {# других людей, с кем вы можете быть знакомы}}",
-  "filtered_notifications_banner.private_mentions": "{count, plural, one {личное упоминание} other {личные упоминания}}",
   "filtered_notifications_banner.title": "Отфильтрованные уведомления",
   "firehose.all": "Все",
   "firehose.local": "Текущий сервер",
diff --git a/app/javascript/mastodon/locales/sl.json b/app/javascript/mastodon/locales/sl.json
index 55091dbee5b1cf..ed4fa8dfaf7317 100644
--- a/app/javascript/mastodon/locales/sl.json
+++ b/app/javascript/mastodon/locales/sl.json
@@ -297,8 +297,8 @@
   "filter_modal.select_filter.subtitle": "Uporabite obstoječo kategorijo ali ustvarite novo",
   "filter_modal.select_filter.title": "Filtriraj to objavo",
   "filter_modal.title.status": "Filtrirajte objavo",
+  "filtered_notifications_banner.mentions": "{count, plural, one {omemba} two {omembi} few {omembe} other {omemb}}",
   "filtered_notifications_banner.pending_requests": "Obvestila od {count, plural, =0 {nikogar, ki bi ga} one {# človeka, ki bi ga} two {# ljudi, ki bi ju} few {# ljudi, ki bi jih} other {# ljudi, ki bi jih}} lahko poznali",
-  "filtered_notifications_banner.private_mentions": "{count, plural, one {zasebna omemba} two {zasebni omembi} few {zasebne omembe} other {zasebnih omemb}}",
   "filtered_notifications_banner.title": "Filtrirana obvestila",
   "firehose.all": "Vse",
   "firehose.local": "Ta strežnik",
diff --git a/app/javascript/mastodon/locales/sq.json b/app/javascript/mastodon/locales/sq.json
index 95768b811a6638..da35b3d43ba57a 100644
--- a/app/javascript/mastodon/locales/sq.json
+++ b/app/javascript/mastodon/locales/sq.json
@@ -298,7 +298,6 @@
   "filter_modal.select_filter.title": "Filtroje këtë postim",
   "filter_modal.title.status": "Filtroni një postim",
   "filtered_notifications_banner.pending_requests": "Njoftime prej {count, plural, =0 {askujt} one {një personi} other {# vetësh}} që mund të njihni",
-  "filtered_notifications_banner.private_mentions": "{count, plural, one {përmendje private} other {përmendje private}}",
   "filtered_notifications_banner.title": "Njoftime të filtruar",
   "firehose.all": "Krejt",
   "firehose.local": "Këtë shërbyes",
diff --git a/app/javascript/mastodon/locales/sr-Latn.json b/app/javascript/mastodon/locales/sr-Latn.json
index 2d795c76cc5ae3..3eea87d5ecabef 100644
--- a/app/javascript/mastodon/locales/sr-Latn.json
+++ b/app/javascript/mastodon/locales/sr-Latn.json
@@ -13,14 +13,14 @@
   "about.rules": "Pravila servera",
   "account.account_note_header": "Napomena",
   "account.add_or_remove_from_list": "Dodaj ili ukloni sa lista",
-  "account.badges.bot": "Bot",
+  "account.badges.bot": "Automatizovano",
   "account.badges.group": "Grupa",
   "account.block": "Blokiraj @{name}",
   "account.block_domain": "Blokiraj domen {domain}",
   "account.block_short": "Blokiraj",
   "account.blocked": "Blokiran",
   "account.browse_more_on_origin_server": "Pregledajte još na originalnom profilu",
-  "account.cancel_follow_request": "Povuci zahtev za praćenje",
+  "account.cancel_follow_request": "Otkaži praćenje",
   "account.copy": "Kopiraj vezu u profil",
   "account.direct": "Privatno pomeni @{name}",
   "account.disable_notifications": "Zaustavi obaveštavanje za objave korisnika @{name}",
@@ -89,6 +89,14 @@
   "announcement.announcement": "Najava",
   "attachments_list.unprocessed": "(neobrađeno)",
   "audio.hide": "Sakrij audio",
+  "block_modal.remote_users_caveat": "Zamolićemo server {domain} da poštuje vašu odluku. Međutim, usklađenost nije zagarantovana jer neki serveri mogu drugačije da obrađuju blokove. Javne objave mogu i dalje biti vidljive korisnicima koji nisu prijavljeni.",
+  "block_modal.show_less": "Prikaži manje",
+  "block_modal.show_more": "Prikaži više",
+  "block_modal.they_cant_mention": "Ne mogu da vas pominju ili prate.",
+  "block_modal.they_cant_see_posts": "Ne mogu da vide vaše objave, a vi nećete videti njihove.",
+  "block_modal.they_will_know": "Mogu da vide da su blokirani.",
+  "block_modal.title": "Blokirati korisnika?",
+  "block_modal.you_wont_see_mentions": "Nećete videti objave koje ih pominju.",
   "boost_modal.combo": "Možete pritisnuti {combo} da preskočite ovo sledeći put",
   "bundle_column_error.copy_stacktrace": "Kopiraj izveštaj o grešci",
   "bundle_column_error.error.body": "Nije moguće prikazati traženu stranicu. Razlog može biti greška u našem kodu ili problem sa kompatibilnošću pretraživača.",
@@ -153,7 +161,7 @@
   "compose_form.poll.switch_to_single": "Promenite anketu da biste omogućili jedan izbor",
   "compose_form.poll.type": "Stil",
   "compose_form.publish": "Objavi",
-  "compose_form.publish_form": "Objavi",
+  "compose_form.publish_form": "Nova objava",
   "compose_form.reply": "Odgovori",
   "compose_form.save_changes": "Ažuriraj",
   "compose_form.spoiler.marked": "Ukloni upozorenje o sadržaju",
@@ -169,6 +177,7 @@
   "confirmations.delete_list.message": "Da li ste sigurni da želite da trajno izbrišete ovu listu?",
   "confirmations.discard_edit_media.confirm": "Odbaci",
   "confirmations.discard_edit_media.message": "Imate nesačuvane promene u opisu ili pregledu medija, da li ipak hoćete da ih odbacite?",
+  "confirmations.domain_block.confirm": "Blokiraj server",
   "confirmations.domain_block.message": "Da li ste zaista sigurni da želite da blokirate ceo domen {domain}? U većini slučajeva, dovoljno je i poželjno nekoliko ciljanih blokiranja ili ignorisanja. Nećete videti sadržaj sa tog domena ni u jednoj javnoj vremenskoj liniji ili u vašim obaveštenjima. Vaši pratioci sa tog domena će biti uklonjeni.",
   "confirmations.edit.confirm": "Uredi",
   "confirmations.edit.message": "Uređivanjem će se obrisati poruka koju trenutno sastavljate. Da li ste sigurni da želite da nastavite?",
@@ -196,10 +205,31 @@
   "disabled_account_banner.text": "Vaš nalog {disabledAccount} je trenutno onemogućen.",
   "dismissable_banner.community_timeline": "Ovo su najnovije javne objave ljudi čije naloge hostuje {domain}.",
   "dismissable_banner.dismiss": "Odbaci",
-  "dismissable_banner.explore_links": "O ovim vestima trenutno razgovaraju ljudi na ovom i drugim serverima decentralizovane mreže.",
+  "dismissable_banner.explore_links": "Ovo su vesti koje se danas najviše dele na društvenoj mreži. Novije vesti koje je objavilo više različitih ljudi su bolje rangirane.",
   "dismissable_banner.explore_statuses": "Ovo su objave širom društvenog veba koje danas postaju sve popularnije. Novije objave sa više podržavanja i omiljene su rangirane više.",
-  "dismissable_banner.explore_tags": "Ove heš oznake postaju sve popularnije među ljudima na ovom i drugim serverima decentralizovane mreže.",
+  "dismissable_banner.explore_tags": "Ovo su heš oznake koje danas postaju sve popularnije na društvenoj mreži. Heš oznake koje koristi više različitih ljudi su rangirane više.",
   "dismissable_banner.public_timeline": "Ovo su najnovije javne objave ljudi sa društvenog veba koje ljudi na {domain}-u prate.",
+  "domain_block_modal.block": "Blokiraj server",
+  "domain_block_modal.block_account_instead": "Umesto toga, blokiraj @{name}",
+  "domain_block_modal.they_can_interact_with_old_posts": "Ljudi sa ovog servera mogu da imaju interakciju sa vašim starim objavama.",
+  "domain_block_modal.they_cant_follow": "Niko sa ovog servera ne može da vas prati.",
+  "domain_block_modal.they_wont_know": "Neće znati da su blokirani.",
+  "domain_block_modal.title": "Blokirati domen?",
+  "domain_block_modal.you_will_lose_followers": "Svi vaši pratioci sa ovog servera će biti uklonjeni.",
+  "domain_block_modal.you_wont_see_posts": "Nećete videti objave ili obaveštenja korisnika na ovom serveru.",
+  "domain_pill.activitypub_lets_connect": "Omogućuje vam da se povežete i komunicirate sa ljudima ne samo na Mastodon-u, već i u različitim društvenim aplikacijama.",
+  "domain_pill.activitypub_like_language": "ActivityPub je kao jezik kojim Mastodon govori sa drugim društvenim mrežama.",
+  "domain_pill.server": "Server",
+  "domain_pill.their_handle": "Njegov regulator:",
+  "domain_pill.their_server": "Njihov digitalni dom, gde žive sve njihove objave.",
+  "domain_pill.their_username": "Njihov jedinstveni identifikator na njihovom serveru. Moguće je pronaći korisnike sa istim korisničkim imenom na različitim serverima.",
+  "domain_pill.username": "Korisničko ime",
+  "domain_pill.whats_in_a_handle": "Šta je regulator?",
+  "domain_pill.who_they_are": "Pošto regulatori govore ko je neko i gde se nalazi, možete da komunicirate sa ljudima širom društvenog veba na <button>platformama koje pokreće ActivityPub</button>.",
+  "domain_pill.who_you_are": "Pošto vaši regulatori govori ko ste i gde ste, ljudi mogu da komuniciraju sa vama širom društvenog veba na <button>platformama koje pokreće ActivityPub</button>.",
+  "domain_pill.your_handle": "Vaš regulator:",
+  "domain_pill.your_server": "Vaš digitalni dom, gde žive sve vaše objave. Ne sviđa vam se ovaj? Prenesite servere u bilo koje vreme i dovedite i svoje pratioce.",
+  "domain_pill.your_username": "Njihov jedinstveni identifikator na njihovom serveru. Moguće je pronaći korisnike sa istim korisničkim imenom na različitim serverima.",
   "embed.instructions": "Ugradite ovu objavu na svoj veb sajt kopiranjem koda ispod.",
   "embed.preview": "Evo kako će to izgledati:",
   "emoji_button.activity": "Aktivnosti",
@@ -232,11 +262,11 @@
   "empty_column.follow_requests": "Još uvek nemate nijedan zahtev za praćenje. Kada primite zahtev, on će se pojaviti ovde.",
   "empty_column.followed_tags": "Još uvek niste zapratili nijednu heš oznaku. Kada to uradite, one će se pojaviti ovde.",
   "empty_column.hashtag": "Još uvek nema ničega u ovoj heš oznaci.",
-  "empty_column.home": "Vaša početna vremenska linija je prazna! Pratite više ljudi da biste je popunili. {suggestions}",
+  "empty_column.home": "Vaša početna vremenska linija je prazna! Pratite više ljudi da biste je popunili.",
   "empty_column.list": "U ovoj listi još nema ničega. Kada članovi ove liste objave nešto novo, pojaviće se ovde.",
   "empty_column.lists": "Još uvek nemate nijednu listu. Kada napravite jednu, ona će se pojaviti ovde.",
   "empty_column.mutes": "Još uvek ne ignorišete nijednog korisnika.",
-  "empty_column.notification_requests": "Sve je čisto! Ovde nema ničega. Kada dobijete nova obaveštenja, ona će se pojaviti ovde u skladu sa vašim podešavanjima.",
+  "empty_column.notification_requests": "Sve je čisto! Ovde nema ničega. Kada dobijete nova obaveštenja, ona će se pojaviti ovde u skladu sa vašim podešavanjima.",
   "empty_column.notifications": "Još uvek nemate nikakva obaveštenja. Kada drugi ljudi budu u interakciji sa vama, videćete to ovde.",
   "empty_column.public": "Ovde nema ničega! Napišite nešto javno ili ručno pratite korisnike sa drugih servera da biste ovo popunili",
   "error.unexpected_crash.explanation": "Zbog greške u našem kodu ili problema sa kompatibilnošću pregledača, ova stranica se nije mogla pravilno prikazati.",
@@ -267,6 +297,7 @@
   "filter_modal.select_filter.subtitle": "Koristite postojeću kategoriju ili kreirajte novu",
   "filter_modal.select_filter.title": "Filtriraj ovu objavu",
   "filter_modal.title.status": "Filtriraj objavu",
+  "filtered_notifications_banner.mentions": "{count, plural, one {pominjanje} few {pominjanja} other {pominjanja}}",
   "filtered_notifications_banner.pending_requests": "Obaveštenja od {count, plural, =0 {nikoga koga možda poznajete} one {# osobe koju možda poznajete} few {# osobe koje možda poznajete} other {# osoba koje možda poznajete}}",
   "filtered_notifications_banner.title": "Filtrirana obaveštenja",
   "firehose.all": "Sve",
@@ -279,7 +310,7 @@
   "follow_suggestions.dismiss": "Ne prikazuj ponovo",
   "follow_suggestions.hints.featured": "Ovaj profil je ručno izabrao tim {domain}.",
   "follow_suggestions.hints.friends_of_friends": "Ovaj profil je popularan među ljudima koje pratite.",
-  "follow_suggestions.hints.most_followed": "Ovaj profil je jedan od najpraćenijih na {domain}.",
+  "follow_suggestions.hints.most_followed": "Ovaj profil je jedan od najpraćenijih na {domain}.",
   "follow_suggestions.hints.most_interactions": "Ovaj profil je nedavno dobio veliku pažnju na {domain}.",
   "follow_suggestions.hints.similar_to_recently_followed": "Ovaj profil je sličan profilima koje ste nedavno zapratili.",
   "follow_suggestions.personalized_suggestion": "Personalizovani predlog",
@@ -315,7 +346,7 @@
   "home.column_settings.show_reblogs": "Prikaži podržavanja",
   "home.column_settings.show_replies": "Prikaži odgovore",
   "home.hide_announcements": "Sakrij najave",
-  "home.pending_critical_update.body": "Ažurirajte svoj Mastodon server što je pre moguće!",
+  "home.pending_critical_update.body": "Ažurirajte svoj Mastodon server što je pre moguće!",
   "home.pending_critical_update.link": "Pogledajte ažuriranja",
   "home.pending_critical_update.title": "Dostupno je kritično bezbednosno ažuriranje!",
   "home.show_announcements": "Prijaži najave",
@@ -329,7 +360,7 @@
   "interaction_modal.on_another_server": "Na drugom serveru",
   "interaction_modal.on_this_server": "Na ovom serveru",
   "interaction_modal.sign_in": "Niste prijavljeni na ovaj server. Gde je hostovan vaš nalog?",
-  "interaction_modal.sign_in_hint": "Savet: To je veb sajt na kome ste se registrovali. Ako se ne sećate, potražite e-poruku dobrodošlice u svom prijemnom sandučetu. Takođe možete uneti svoje puno korisničko ime! (npr. @Mastodon@mastodon.social)",
+  "interaction_modal.sign_in_hint": "Savet: To je veb sajt na kome ste se registrovali. Ako se ne sećate, potražite e-poruku dobrodošlice u svom prijemnom sandučetu. Takođe možete uneti svoje puno korisničko ime! (npr. @Mastodon@mastodon.social)",
   "interaction_modal.title.favourite": "Označi objavu korisnika {name} kao omiljenu",
   "interaction_modal.title.follow": "Zaprati {name}",
   "interaction_modal.title.reblog": "Podrži objavu korisnika {name}",
@@ -397,6 +428,15 @@
   "loading_indicator.label": "Učitavanje…",
   "media_gallery.toggle_visible": "{number, plural, one {Sakrij sliku} few {Sakrij slike} other {Sakrij slike}}",
   "moved_to_account_banner.text": "Vaš nalog {disabledAccount} je trenutno onemogućen jer ste prešli na {movedToAccount}.",
+  "mute_modal.hide_from_notifications": "Sakrij iz obaveštenja",
+  "mute_modal.hide_options": "Sakrij opcije",
+  "mute_modal.indefinite": "Dok ih ne uklonim iz ignorisanih",
+  "mute_modal.show_options": "Prikaži opcije",
+  "mute_modal.they_can_mention_and_follow": "Mogu da vas pominju i prate, ali ih nećete videti.",
+  "mute_modal.they_wont_know": "Neće znati da su ignorisani.",
+  "mute_modal.title": "Ignorisati korisnika?",
+  "mute_modal.you_wont_see_mentions": "Nećete videti objave koje ga pominju.",
+  "mute_modal.you_wont_see_posts": "I dalje može da vidi vaše objave, ali vi nećete videti njegove.",
   "navigation_bar.about": "Osnovni podaci",
   "navigation_bar.advanced_interface": "Otvori u naprednom veb okruženju",
   "navigation_bar.blocks": "Blokirani korisnici",
@@ -432,6 +472,11 @@
   "notification.own_poll": "Vaša anketa je završena",
   "notification.poll": "Završena je anketa u kojoj ste glasali",
   "notification.reblog": "{name} je podržao vašu objavu",
+  "notification.relationships_severance_event": "Izgubljena veza sa {name}",
+  "notification.relationships_severance_event.account_suspension": "Administrator sa {from} je suspendovao {target}, što znači da više ne možete da primate ažuriranja od njih niti da komunicirate sa njima.",
+  "notification.relationships_severance_event.domain_block": "Administrator sa {from} je blokirao {target}, uključujući vaše pratioce: {followersCount} i {followingCount, plural, one {# nalog} few {# naloga} other {# naloga}} koje pratite.",
+  "notification.relationships_severance_event.learn_more": "Saznajte više",
+  "notification.relationships_severance_event.user_domain_block": "Blokirači ste {target}, uključujući vaše pratioce: {followersCount} i {followingCount, plural, one {# nalog} few {# naloga} other {# naloga}} koje pratite.",
   "notification.status": "{name} je upravo objavio",
   "notification.update": "{name} je uredio objavu",
   "notification_requests.accept": "Prihvati",
@@ -444,6 +489,8 @@
   "notifications.column_settings.admin.sign_up": "Nove ragistracije:",
   "notifications.column_settings.alert": "Obaveštenja na radnoj površini",
   "notifications.column_settings.favourite": "Omiljeno:",
+  "notifications.column_settings.filter_bar.advanced": "Prikaži sve kategorije",
+  "notifications.column_settings.filter_bar.category": "Traka za brzo filtriranje",
   "notifications.column_settings.follow": "Novi pratioci:",
   "notifications.column_settings.follow_request": "Novi zahtevi za praćenje:",
   "notifications.column_settings.mention": "Pominjanja:",
@@ -471,7 +518,7 @@
   "notifications.permission_required": "Obaveštenja na radnoj površini nisu dostupna jer potrebna dozvola nije dodeljena.",
   "notifications.policy.filter_new_accounts.hint": "Kreirano {days, plural, one {u poslednjeg # dana} few {u poslednja # dana} other {u poslednjih # dana}}",
   "notifications.policy.filter_new_accounts_title": "Novi nalozi",
-  "notifications.policy.filter_not_followers_hint": "Uključujući ljude koji su vas pratili manje od {days, plural, one {# dana} few {# dana} other {# dana}}",
+  "notifications.policy.filter_not_followers_hint": "Uključujući ljude koji su vas pratili manje od {days, plural, one {# dana} few {# dana} other {# dana}}",
   "notifications.policy.filter_not_followers_title": "Ljudi koji vas ne prate",
   "notifications.policy.filter_not_following_hint": "Dok ih ručno ne odobrite",
   "notifications.policy.filter_not_following_title": "Ljudi koje ne pratite",
@@ -483,14 +530,14 @@
   "notifications_permission_banner.title": "Nikada ništa ne propustite",
   "onboarding.action.back": "Vrati me nazad",
   "onboarding.actions.back": "Vrati me nazad",
-  "onboarding.actions.go_to_explore": "Pogledaj šta je u trendu",
-  "onboarding.actions.go_to_home": "Idi na početnu stranicu",
+  "onboarding.actions.go_to_explore": "Odvedi me u trending",
+  "onboarding.actions.go_to_home": "Odvedi me na početnu stranicu",
   "onboarding.compose.template": "Zdravo #Mastodon!",
   "onboarding.follows.empty": "Nažalost, trenutno se ne mogu prikazati rezultati. Možete pokušati sa korišćenjem pretrage ili pregledanjem stranice za istraživanje da biste pronašli ljude koje ćete pratiti ili pokušajte ponovo kasnije.",
-  "onboarding.follows.lead": "Vi sami birate svoju početnu stranicu. Što više ljudi pratite, to će biti aktivnije i zanimljivije. Ovi profili mogu biti dobra polazna tačka—uvek možete da ih prestanete pratiti kasnije!",
+  "onboarding.follows.lead": "Vaša početna stranica je primarni način da doživite Mastodon. Što više ljudi budete pratili, to će biti aktivnije i zanimljivije. Da biste započeli, evo nekoliko predloga:",
   "onboarding.follows.title": "Personalizujte svoju početnu stranicu",
   "onboarding.profile.discoverable": "Neka se moj profil može otkriti drugima",
-  "onboarding.profile.discoverable_hint": "Kada omogućite mogućnost otkrivanja na Mastodon-u, vaše objave se mogu pojaviti u rezultatima pretrage i u trendu, a vaš profil može biti predložen ljudima sa sličnim interesovanjima.",
+  "onboarding.profile.discoverable_hint": "Kada omogućite mogućnost otkrivanja na Mastodon-u, vaše objave se mogu pojaviti u rezultatima pretrage i u trendu, a vaš profil može biti predložen ljudima sa sličnim interesovanjima.",
   "onboarding.profile.display_name": "Ime za prikaz",
   "onboarding.profile.display_name_hint": "Vaše puno ime ili nadimak…",
   "onboarding.profile.lead": "Ovo možete uvek dovršiti kasnije u podešavanjima, gde je dostupno još više opcija prilagođavanja.",
@@ -504,17 +551,17 @@
   "onboarding.share.message": "Ja sam {username} na #Mastodon-u! Pratite me na {url}",
   "onboarding.share.next_steps": "Mogući sledeći koraci:",
   "onboarding.share.title": "Podelite svoj profil",
-  "onboarding.start.lead": "Vaš novi Mastodon nalog je spreman. Evo kako to možete iskoristiti na najbolji način:",
-  "onboarding.start.skip": "Želite da preskočite?",
+  "onboarding.start.lead": "Sada ste deo Mastodon-a, jedinstvene, decentralizovane platforme društvenih medija na kojoj vi – a ne algoritam – birate svoje iskustvo. Hajde da počnemo na ovoj novoj društvenoj granici:",
+  "onboarding.start.skip": "Ne treba vam pomoć za početak?",
   "onboarding.start.title": "Uspeli ste!",
-  "onboarding.steps.follow_people.body": "Vi sami birate svoju početnu stranicu. Hajde da ga ispunimo zanimljivim ljudima.",
+  "onboarding.steps.follow_people.body": "Praćenje zanimljivih ljudi je ono o čemu se radi u Mastodon-u.",
   "onboarding.steps.follow_people.title": "Personalizujte svoju početnu stranicu",
-  "onboarding.steps.publish_status.body": "Reci zdravo svetu.",
+  "onboarding.steps.publish_status.body": "Pozdravite svet tekstom, slikama, video snimcima ili anketama {emoji}",
   "onboarding.steps.publish_status.title": "Napišite svoju prvu objavu",
-  "onboarding.steps.setup_profile.body": "Veća je verovatnoća da će drugi komunicirati sa vama sa popunjenim profilom.",
-  "onboarding.steps.setup_profile.title": "Prilagodite svoj profil",
+  "onboarding.steps.setup_profile.body": "Pojačajte svoje interakcije tako što ćete imati sveobuhvatan profil.",
+  "onboarding.steps.setup_profile.title": "Personalizujte svoj profil",
   "onboarding.steps.share_profile.body": "Neka vaši prijatelji znaju kako da vas pronađu na Mastodon-u!",
-  "onboarding.steps.share_profile.title": "Podelite svoj profil",
+  "onboarding.steps.share_profile.title": "Podelite svoj Mastodon profil",
   "onboarding.tips.2fa": "<strong>Da li ste znali?</strong> Možete da zaštitite svoj nalog podešavanjem dvostruke potvrde identiteta u podešavanjima naloga. Radi sa bilo kojom TOTP aplikacijom po vašem izboru, nije potreban broj telefona!",
   "onboarding.tips.accounts_from_other_servers": "<strong>Da li ste znali?</strong> Pošto je Mastodon decentralizovan, neki profili na koje naiđete biće smešteni na serverima različitim od vašeg. A ipak možete da komunicirate sa njima besprekorno! Njihov server je u drugoj polovini njihovog korisničkog imena!",
   "onboarding.tips.migration": "<strong>Da li ste znali?</strong> Ako smatrate da {domain} nije odličan izbor servera za vas u budućnosti, možete da pređete na drugi Mastodon server bez gubitka pratilaca. Možete čak i da hostujete sopstveni server!",
@@ -539,7 +586,7 @@
   "privacy.private.short": "Pratioci",
   "privacy.public.long": "Bilo ko na Mastodon-u i van njega",
   "privacy.public.short": "Javno",
-  "privacy.unlisted.additional": "Ovo se ponaša potpuno kao javno, osim što se objava neće pojavljivati u izvorima uživo ili heš oznakama, istraživanjima ili pretrazi Mastodon-a, čak i ako ste uključeni u celom nalogu.",
+  "privacy.unlisted.additional": "Ovo se ponaša potpuno kao javno, osim što se objava neće pojavljivati u izvorima uživo ili heš oznakama, istraživanjima ili pretrazi Mastodon-a, čak i ako ste uključeni u celom nalogu.",
   "privacy.unlisted.long": "Manje algoritamskih fanfara",
   "privacy.unlisted.short": "Tiha javnost",
   "privacy_policy.last_updated": "Poslednje ažuriranje {date}",
diff --git a/app/javascript/mastodon/locales/sr.json b/app/javascript/mastodon/locales/sr.json
index 17ee71099d7962..69f755a0b630cb 100644
--- a/app/javascript/mastodon/locales/sr.json
+++ b/app/javascript/mastodon/locales/sr.json
@@ -220,7 +220,16 @@
   "domain_pill.activitypub_lets_connect": "Омогућује вам да се повежете и комуницирате са људима не само на Mastodon-у, већ и у различитим друштвеним апликацијама.",
   "domain_pill.activitypub_like_language": "ActivityPub је као језик којим Mastodon говори са другим друштвеним мрежама.",
   "domain_pill.server": "Сервер",
+  "domain_pill.their_handle": "Његов регулатор:",
+  "domain_pill.their_server": "Њихов дигитални дом, где живе све њихове објаве.",
+  "domain_pill.their_username": "Њихов јединствени идентификатор на њиховом серверу. Могуће је пронаћи кориснике са истим корисничким именом на различитим серверима.",
   "domain_pill.username": "Корисничко име",
+  "domain_pill.whats_in_a_handle": "Шта је регулатор?",
+  "domain_pill.who_they_are": "Пошто регулатори говоре ко је неко и где се налази, можете да комуницирате са људима широм друштвеног веба на <button>платформама које покреће ActivityPub</button>.",
+  "domain_pill.who_you_are": "Пошто ваши регулатори говори ко сте и где сте, људи могу да комуницирају са вама широм друштвеног веба на <button>платформама које покреће ActivityPub</button>.",
+  "domain_pill.your_handle": "Ваш регулатор:",
+  "domain_pill.your_server": "Ваш дигитални дом, где живе све ваше објаве. Не свиђа вам се овај? Пренесите сервере у било које време и доведите и своје пратиоце.",
+  "domain_pill.your_username": "Њихов јединствени идентификатор на њиховом серверу. Могуће је пронаћи кориснике са истим корисничким именом на различитим серверима.",
   "embed.instructions": "Уградите ову објаву на свој веб сајт копирањем кода испод.",
   "embed.preview": "Ево како ће то изгледати:",
   "emoji_button.activity": "Активности",
@@ -288,6 +297,7 @@
   "filter_modal.select_filter.subtitle": "Користите постојећу категорију или креирајте нову",
   "filter_modal.select_filter.title": "Филтрирај ову објаву",
   "filter_modal.title.status": "Филтрирај објаву",
+  "filtered_notifications_banner.mentions": "{count, plural, one {помињање} few {помињања} other {помињања}}",
   "filtered_notifications_banner.pending_requests": "Обавештења од {count, plural, =0 {никога кога можда познајете} one {# особе коју можда познајете} few {# особе које можда познајете} other {# особа које можда познајете}}",
   "filtered_notifications_banner.title": "Филтрирана обавештења",
   "firehose.all": "Све",
@@ -462,7 +472,11 @@
   "notification.own_poll": "Ваша анкета је завршена",
   "notification.poll": "Завршена је анкета у којој сте гласали",
   "notification.reblog": "{name} је подржао вашу објаву",
+  "notification.relationships_severance_event": "Изгубљена веза са {name}",
+  "notification.relationships_severance_event.account_suspension": "Администратор са {from} је суспендовао {target}, што значи да више не можете да примате ажурирања од њих нити да комуницирате са њима.",
+  "notification.relationships_severance_event.domain_block": "Администратор са {from} је блокирао {target}, укључујући ваше пратиоце: {followersCount} и {followingCount, plural, one {# налог} few {# налогa} other {# налога}} које пратите.",
   "notification.relationships_severance_event.learn_more": "Сазнајте више",
+  "notification.relationships_severance_event.user_domain_block": "Блокирачи сте {target}, укључујући ваше пратиоце: {followersCount} и {followingCount, plural, one {# налог} few {# налогa} other {# налога}} које пратите.",
   "notification.status": "{name} је управо објавио",
   "notification.update": "{name} је уредио објаву",
   "notification_requests.accept": "Прихвати",
@@ -476,6 +490,7 @@
   "notifications.column_settings.alert": "Обавештења на радној површини",
   "notifications.column_settings.favourite": "Омиљено:",
   "notifications.column_settings.filter_bar.advanced": "Прикажи све категорије",
+  "notifications.column_settings.filter_bar.category": "Трака за брзо филтрирање",
   "notifications.column_settings.follow": "Нови пратиоци:",
   "notifications.column_settings.follow_request": "Нови захтеви за праћење:",
   "notifications.column_settings.mention": "Помињања:",
diff --git a/app/javascript/mastodon/locales/sv.json b/app/javascript/mastodon/locales/sv.json
index 46a6cb7943f28b..80c2031128b513 100644
--- a/app/javascript/mastodon/locales/sv.json
+++ b/app/javascript/mastodon/locales/sv.json
@@ -298,7 +298,6 @@
   "filter_modal.select_filter.title": "Filtrera detta inlägg",
   "filter_modal.title.status": "Filtrera ett inlägg",
   "filtered_notifications_banner.pending_requests": "Aviseringar från {count, plural, =0 {ingen} one {en person} other {# personer}} du kanske känner",
-  "filtered_notifications_banner.private_mentions": "{count, plural, one {privat omnämnande} other {privat omnämnande}}",
   "filtered_notifications_banner.title": "Filtrerade aviseringar",
   "firehose.all": "Allt",
   "firehose.local": "Denna server",
diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json
index 952ed5adf59e86..c43bf858145a39 100644
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@@ -298,7 +298,6 @@
   "filter_modal.select_filter.title": "กรองโพสต์นี้",
   "filter_modal.title.status": "กรองโพสต์",
   "filtered_notifications_banner.pending_requests": "การแจ้งเตือนจาก {count, plural, =0 {ไม่มีใคร} other {# คน}} ที่คุณอาจรู้จัก",
-  "filtered_notifications_banner.private_mentions": "{count, plural, other {การกล่าวถึงแบบส่วนตัว}}",
   "filtered_notifications_banner.title": "การแจ้งเตือนที่กรองอยู่",
   "firehose.all": "ทั้งหมด",
   "firehose.local": "เซิร์ฟเวอร์นี้",
diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json
index 8dcd2d202d3b7a..76739fe314856a 100644
--- a/app/javascript/mastodon/locales/tr.json
+++ b/app/javascript/mastodon/locales/tr.json
@@ -297,8 +297,8 @@
   "filter_modal.select_filter.subtitle": "Mevcut bir kategoriyi kullan veya yeni bir tane oluştur",
   "filter_modal.select_filter.title": "Bu gönderiyi süzgeçle",
   "filter_modal.title.status": "Bir gönderi süzgeçle",
+  "filtered_notifications_banner.mentions": "{count, plural, one {bahsetme} other {bahsetme}}",
   "filtered_notifications_banner.pending_requests": "Bildiğiniz {count, plural, =0 {hiç kimseden} one {bir kişiden} other {# kişiden}} bildirim",
-  "filtered_notifications_banner.private_mentions": "{count, plural, one {özel değinme} other {özel değinme}}",
   "filtered_notifications_banner.title": "Filtrelenmiş bildirimler",
   "firehose.all": "Tümü",
   "firehose.local": "Bu sunucu",
@@ -468,7 +468,7 @@
   "notification.favourite": "{name} gönderinizi beğendi",
   "notification.follow": "{name} seni takip etti",
   "notification.follow_request": "{name} size takip isteği gönderdi",
-  "notification.mention": "{name} sana değindi",
+  "notification.mention": "{name} senden bahsetti",
   "notification.own_poll": "Anketiniz sona erdi",
   "notification.poll": "Oy verdiğiniz bir anket sona erdi",
   "notification.reblog": "{name} gönderini yeniden paylaştı",
@@ -493,7 +493,7 @@
   "notifications.column_settings.filter_bar.category": "Hızlı filtre çubuğu",
   "notifications.column_settings.follow": "Yeni takipçiler:",
   "notifications.column_settings.follow_request": "Yeni takip istekleri:",
-  "notifications.column_settings.mention": "Değinmeler:",
+  "notifications.column_settings.mention": "Bahsetmeler:",
   "notifications.column_settings.poll": "Anket sonuçları:",
   "notifications.column_settings.push": "Anlık bildirimler",
   "notifications.column_settings.reblog": "Yeniden paylaşanlar:",
@@ -507,7 +507,7 @@
   "notifications.filter.boosts": "Yeniden paylaşımlar",
   "notifications.filter.favourites": "Favorilerin",
   "notifications.filter.follows": "Takip edilenler",
-  "notifications.filter.mentions": "Değinmeler",
+  "notifications.filter.mentions": "Bahsetmeler",
   "notifications.filter.polls": "Anket sonuçları",
   "notifications.filter.statuses": "Takip ettiğiniz kişilerden gelen güncellemeler",
   "notifications.grant_permission": "İzin ver.",
diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json
index c593ccc9dd44e7..6ae4e162b33432 100644
--- a/app/javascript/mastodon/locales/uk.json
+++ b/app/javascript/mastodon/locales/uk.json
@@ -287,7 +287,6 @@
   "filter_modal.select_filter.title": "Фільтрувати цей допис",
   "filter_modal.title.status": "Фільтрувати допис",
   "filtered_notifications_banner.pending_requests": "Сповіщення від {count, plural, =0 {жодної особи} one {однієї особи} few {# осіб} many {# осіб} other {# особи}}, котрих ви можете знати",
-  "filtered_notifications_banner.private_mentions": "{count, plural, one {приватна згадка} few {приватні згадки} many {приватні згадки} other {приватна згадка}}",
   "filtered_notifications_banner.title": "Відфільтровані сповіщення",
   "firehose.all": "Всі",
   "firehose.local": "Цей сервер",
diff --git a/app/javascript/mastodon/locales/vi.json b/app/javascript/mastodon/locales/vi.json
index 58c025494c2f5a..e1f886b1f50fde 100644
--- a/app/javascript/mastodon/locales/vi.json
+++ b/app/javascript/mastodon/locales/vi.json
@@ -297,8 +297,8 @@
   "filter_modal.select_filter.subtitle": "Sử dụng một danh mục hiện có hoặc tạo một danh mục mới",
   "filter_modal.select_filter.title": "Lọc tút này",
   "filter_modal.title.status": "Lọc một tút",
+  "filtered_notifications_banner.mentions": "{count, plural, other {lượt nhắc}}",
   "filtered_notifications_banner.pending_requests": "Thông báo từ {count, plural, =0 {không ai} other {# người}} bạn có thể biết",
-  "filtered_notifications_banner.private_mentions": "{count, plural, other {lượt nhắc}}",
   "filtered_notifications_banner.title": "Thông báo đã lọc",
   "firehose.all": "Toàn bộ",
   "firehose.local": "Máy chủ này",
diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json
index ca82c8d7c0957a..83fa723388b591 100644
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@@ -297,8 +297,8 @@
   "filter_modal.select_filter.subtitle": "使用一个已存在类别，或创建一个新类别",
   "filter_modal.select_filter.title": "过滤此嘟文",
   "filter_modal.title.status": "过滤一条嘟文",
+  "filtered_notifications_banner.mentions": "{count, plural, other {提及}}",
   "filtered_notifications_banner.pending_requests": "来自你可能认识的 {count, plural, =0 {0 个人} other {# 个人}}的通知",
-  "filtered_notifications_banner.private_mentions": "{count, plural, other {私下提及}}",
   "filtered_notifications_banner.title": "通知（已过滤）",
   "firehose.all": "全部",
   "firehose.local": "此服务器",
diff --git a/app/javascript/mastodon/locales/zh-HK.json b/app/javascript/mastodon/locales/zh-HK.json
index c5ebf09b184c6c..0b328c7386523e 100644
--- a/app/javascript/mastodon/locales/zh-HK.json
+++ b/app/javascript/mastodon/locales/zh-HK.json
@@ -298,7 +298,6 @@
   "filter_modal.select_filter.title": "過濾此帖文",
   "filter_modal.title.status": "過濾一則帖文",
   "filtered_notifications_banner.pending_requests": "來自 {count, plural, =0 {0 位} other {# 位}}你可能認識的人的通知",
-  "filtered_notifications_banner.private_mentions": "{count, plural, one {則私人提及} other {則私人提及}}",
   "filtered_notifications_banner.title": "已過濾之通知",
   "firehose.all": "全部",
   "firehose.local": "本伺服器",
diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json
index bf1dfb82343576..33a7070a51797c 100644
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@@ -297,8 +297,8 @@
   "filter_modal.select_filter.subtitle": "使用既有的類別或是新增",
   "filter_modal.select_filter.title": "過濾此嘟文",
   "filter_modal.title.status": "過濾一則嘟文",
+  "filtered_notifications_banner.mentions": "{count, plural, other {# 則提及}}",
   "filtered_notifications_banner.pending_requests": "來自您可能認識的 {count, plural, =0 {0 人} other {# 人}} 之通知",
-  "filtered_notifications_banner.private_mentions": "{count, plural, other {# 則私訊}}",
   "filtered_notifications_banner.title": "已過濾之通知",
   "firehose.all": "全部",
   "firehose.local": "本站",
diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml
index 8b876b8a140cf4..e0fe9a710dc6bb 100644
--- a/config/locales/sr-Latn.yml
+++ b/config/locales/sr-Latn.yml
@@ -609,6 +609,9 @@ sr-Latn:
       actions_description_html: Odlučite koju radnju da sprovedete radi rešavanja ove prijave. Ukoliko sprovedete kaznenu radnju protiv prijavljenog naloga, vlasnik naloga će biti obavešten putem i-mejla, osim ukoliko oznaka <strong>„Nepoželjne poruke”</strong> nije odabrana.
       actions_description_remote_html: Odlučite koju radnju da preduzmete radi rešavanja ove prijave. Ovo će uticati samo na to kako <strong>Vaš</strong> server komunicira sa ovim udaljenim nalogom i obrađuje njegov sadržaj.
       add_to_report: Dodaj još u prijavu
+      already_suspended_badges:
+        local: Već suspendovan na ovom serveru
+        remote: Već suspendovan na njihovom serveru
       are_you_sure: Da li ste sigurni?
       assign_to_self: Dodeli meni
       assigned: Dodeljeni moderator
@@ -1678,13 +1681,26 @@ sr-Latn:
     import: Uvoz
     import_and_export: Uvoz i izvoz
     migrate: Prebacivanje naloga
+    notifications: Obaveštenja e-poštom
     preferences: Podešavanja
     profile: Javni profil
     relationships: Praćenja i pratioci
+    severed_relationships: Prekinute veze
     statuses_cleanup: Automatsko brisanje objava
     strikes: Moderacijski prestupi
     two_factor_authentication: Dvofaktorska identifikacija
     webauthn_authentication: Sigurnosni ključevi
+  severed_relationships:
+    download: Preuzmi (%{count})
+    event_type:
+      account_suspension: Suspenzija naloga (%{target_name})
+      domain_block: Suspenzija servera (%{target_name})
+      user_domain_block: Blokirali ste %{target_name}
+    lost_followers: Izgubljeni pratioci
+    lost_follows: Izgubljena praćenja
+    preamble: Možete izgubiti praćenja i pratioce kada blokirate domen ili kada vaši moderatori odluče da suspenduju udaljeni server. Kada se to desi, moći ćete da preuzmete liste prekinutih veza, koje treba pregledati i eventualno uvesti na drugi server.
+    purged: Administratori vašeg servera su obrisali informacije o ovom serveru.
+    type: Događaj
   statuses:
     attached:
       audio:
@@ -1784,6 +1800,7 @@ sr-Latn:
     contrast: Veliki kontrast
     default: Mastodon (tamna)
     mastodon-light: Mastodon (svetla)
+    system: Automatski (korišćenje sistemske teme)
   time:
     formats:
       default: "%d %b %Y, %H:%M"
@@ -1896,6 +1913,10 @@ sr-Latn:
       follows_subtitle: Pratite dobro poznate naloge
       follows_title: Koga pratiti
       follows_view_more: Pogledajte još ljudi za praćenje
+      hashtags_recent_count:
+        few: "%{people} osobe u poslednja 2 dana"
+        one: "%{people} osoba u poslednja 2 dana"
+        other: "%{people} osoba u poslednja 2 dana"
       hashtags_subtitle: Istražite šta je u trendu u poslednja 2 dana
       hashtags_title: Heš oznake u trendu
       hashtags_view_more: Pogledajte još heš oznaka u trendu
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index faed5854fbbe78..1c4ffc8c09c0f7 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -609,6 +609,9 @@ sr:
       actions_description_html: Одлучите коју радњу да спроведете ради решавања ове пријаве. Уколико спроведете казнену радњу против пријављеног налога, власник налога ће бити обавештен путем и-мејла, осим уколико ознака <strong>„Непожељне поруке”</strong> није одабрана.
       actions_description_remote_html: Одлучите коју радњу да предузмете ради решавања ове пријаве. Ово ће утицати само на то како <strong>Ваш</strong> сервер комуницира са овим удаљеним налогом и обрађује његов садржај.
       add_to_report: Додај још у пријаву
+      already_suspended_badges:
+        local: Већ суспендован на овом серверу
+        remote: Већ суспендован на њиховом серверу
       are_you_sure: Да ли сте сигурни?
       assign_to_self: Додели мени
       assigned: Додељени модератор
@@ -1678,13 +1681,26 @@ sr:
     import: Увоз
     import_and_export: Увоз и извоз
     migrate: Пребацивање налога
+    notifications: Обавештења е-поштом
     preferences: Подешавања
     profile: Јавни профил
     relationships: Праћења и пратиоци
+    severed_relationships: Прекинуте везе
     statuses_cleanup: Аутоматско брисање објава
     strikes: Модерацијски преступи
     two_factor_authentication: Двофакторска идентификација
     webauthn_authentication: Сигурносни кључеви
+  severed_relationships:
+    download: Преузми (%{count})
+    event_type:
+      account_suspension: Суспензија налога (%{target_name})
+      domain_block: Суспензија сервера (%{target_name})
+      user_domain_block: Блокирали сте %{target_name}
+    lost_followers: Изгубљени пратиоци
+    lost_follows: Изгубљена праћења
+    preamble: Можете изгубити праћења и пратиоце када блокирате домен или када ваши модератори одлуче да суспендују удаљени сервер. Када се то деси, моћи ћете да преузмете листе прекинутих веза, које треба прегледати и евентуално увести на други сервер.
+    purged: Администратори вашег сервера су обрисали информације о овом серверу.
+    type: Догађај
   statuses:
     attached:
       audio:
@@ -1784,6 +1800,7 @@ sr:
     contrast: Велики контраст
     default: Mastodon (тамна)
     mastodon-light: Mastodon (светла)
+    system: Аутоматски (коришћење системске теме)
   time:
     formats:
       default: "%d %b %Y, %H:%M"

From ee8f999a7bdec6092e7e2d4895206614cbd6dca6 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 17 Apr 2024 11:08:08 +0200
Subject: [PATCH 0771/2191] Update dependency core-js to v3.37.0 (#29968)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index af17402bc15636..e323b75cb2d28a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6312,9 +6312,9 @@ __metadata:
   linkType: hard
 
 "core-js@npm:^3.30.2":
-  version: 3.36.1
-  resolution: "core-js@npm:3.36.1"
-  checksum: 10c0/4f0ad2464535d809ba659226feca15bff14b9b5452518bddff8d81b9c94b0227b3027d9838f22f1dce664958acb4107b935cc0037695ae545edc2a303bca98bf
+  version: 3.37.0
+  resolution: "core-js@npm:3.37.0"
+  checksum: 10c0/7e00331f346318ca3f595c08ce9e74ddae744715aef137486c1399163afd79792fb94c3161280863adfdc3e30f8026912d56bd3036f93cacfc689d33e185f2ee
   languageName: node
   linkType: hard
 

From a3902997440c71f161e392f1ad6c5cdcf6aba95d Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 17 Apr 2024 11:08:19 +0200
Subject: [PATCH 0772/2191] Update dependency ioredis to v5.4.0 (#29969)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index e323b75cb2d28a..e2f741c5b33cb0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9589,8 +9589,8 @@ __metadata:
   linkType: hard
 
 "ioredis@npm:^5.3.2":
-  version: 5.3.2
-  resolution: "ioredis@npm:5.3.2"
+  version: 5.4.0
+  resolution: "ioredis@npm:5.4.0"
   dependencies:
     "@ioredis/commands": "npm:^1.1.1"
     cluster-key-slot: "npm:^1.1.0"
@@ -9601,7 +9601,7 @@ __metadata:
     redis-errors: "npm:^1.2.0"
     redis-parser: "npm:^3.0.0"
     standard-as-callback: "npm:^2.1.0"
-  checksum: 10c0/0dd2b5b8004e891f5b62edf18ac223194f1f5204698ec827c903e789ea05b0b36f73395491749ec63c66470485bdfb228ccdf1714fbf631a0f78f33211f2c883
+  checksum: 10c0/a0214a004928cd35f7103179c8d236a8df609265994d554046fd130446b9989125b7133177936015a31925190f66c90bec4de7303819fe81383dc4576d947d47
   languageName: node
   linkType: hard
 

From 828299e71c127d4406de3add93afa5b28bdb116a Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 17 Apr 2024 05:19:02 -0400
Subject: [PATCH 0773/2191] Enable AR Encryption (#29831)

---
 .env.development                              |  4 +++
 .env.test                                     |  5 ++++
 .github/workflows/test-ruby.yml               |  3 +++
 .gitignore                                    |  1 -
 Dockerfile                                    |  7 ++++-
 .../initializers/active_record_encryption.rb  | 26 +++++++++++++++++++
 lib/tasks/mastodon.rake                       |  9 +++++++
 7 files changed, 53 insertions(+), 2 deletions(-)
 create mode 100644 .env.development
 create mode 100644 config/initializers/active_record_encryption.rb

diff --git a/.env.development b/.env.development
new file mode 100644
index 00000000000000..0330da83776199
--- /dev/null
+++ b/.env.development
@@ -0,0 +1,4 @@
+# Required by ActiveRecord encryption feature
+ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=fkSxKD2bF396kdQbrP1EJ7WbU7ZgNokR
+ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=r0hvVmzBVsjxC7AMlwhOzmtc36ZCOS1E
+ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY=PhdFyyfy5xJ7WVd2lWBpcPScRQHzRTNr
diff --git a/.env.test b/.env.test
index 2f8c1afd6e26e7..9e6abea5c9a058 100644
--- a/.env.test
+++ b/.env.test
@@ -3,3 +3,8 @@ NODE_ENV=production
 # Federation
 LOCAL_DOMAIN=cb6e6126.ngrok.io
 LOCAL_HTTPS=true
+
+# Required by ActiveRecord encryption feature
+ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=fkSxKD2bF396kdQbrP1EJ7WbU7ZgNokR
+ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=r0hvVmzBVsjxC7AMlwhOzmtc36ZCOS1E
+ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY=PhdFyyfy5xJ7WVd2lWBpcPScRQHzRTNr
diff --git a/.github/workflows/test-ruby.yml b/.github/workflows/test-ruby.yml
index 172b5271d880de..3a78f8b43d4162 100644
--- a/.github/workflows/test-ruby.yml
+++ b/.github/workflows/test-ruby.yml
@@ -28,6 +28,9 @@ jobs:
     env:
       RAILS_ENV: ${{ matrix.mode }}
       BUNDLE_WITH: ${{ matrix.mode }}
+      ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY: precompile_placeholder
+      ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT: precompile_placeholder
+      ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY: precompile_placeholder
       OTP_SECRET: precompile_placeholder
       SECRET_KEY_BASE: precompile_placeholder
 
diff --git a/.gitignore b/.gitignore
index c5af8eb67f8304..2f94b751ab7f79 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,7 +24,6 @@
 /public/packs-test
 .env
 .env.production
-.env.development
 /node_modules/
 /build/
 
diff --git a/Dockerfile b/Dockerfile
index 1b007930ebe64f..43bc24295d72c7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -205,7 +205,12 @@ ARG TARGETPLATFORM
 
 RUN \
 # Use Ruby on Rails to create Mastodon assets
-  OTP_SECRET=precompile_placeholder SECRET_KEY_BASE=precompile_placeholder bundle exec rails assets:precompile; \
+  ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=precompile_placeholder \
+  ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=precompile_placeholder \
+  ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY=precompile_placeholder \
+  OTP_SECRET=precompile_placeholder \
+  SECRET_KEY_BASE=precompile_placeholder \
+  bundle exec rails assets:precompile; \
 # Cleanup temporary files
   rm -fr /opt/mastodon/tmp;
 
diff --git a/config/initializers/active_record_encryption.rb b/config/initializers/active_record_encryption.rb
new file mode 100644
index 00000000000000..f99585b4ada6eb
--- /dev/null
+++ b/config/initializers/active_record_encryption.rb
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+%w(
+  ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY
+  ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT
+  ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY
+).each do |key|
+  ENV.fetch(key) do
+    raise <<~MESSAGE
+
+      The ActiveRecord encryption feature requires that these variables are set:
+
+        - ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY
+        - ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT
+        - ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY
+
+      Run `bin/rails db:encryption:init` to generate values and then assign the environment variables.
+    MESSAGE
+  end
+end
+
+Rails.application.configure do
+  config.active_record.encryption.deterministic_key = ENV.fetch('ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY')
+  config.active_record.encryption.key_derivation_salt = ENV.fetch('ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT')
+  config.active_record.encryption.primary_key = ENV.fetch('ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY')
+end
diff --git a/lib/tasks/mastodon.rake b/lib/tasks/mastodon.rake
index cb364b30217c94..2822f2eeb126ed 100644
--- a/lib/tasks/mastodon.rake
+++ b/lib/tasks/mastodon.rake
@@ -36,6 +36,15 @@ namespace :mastodon do
         env[key] = SecureRandom.hex(64)
       end
 
+      # Required by ActiveRecord encryption feature
+      %w(
+        ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY
+        ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT
+        ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY
+      ).each do |key|
+        env[key] = SecureRandom.alphanumeric(32)
+      end
+
       vapid_key = Webpush.generate_key
 
       env['VAPID_PRIVATE_KEY'] = vapid_key.private_key

From 1d3ecd3fbaf15450890c1ece7955846fba82a58d Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 17 Apr 2024 05:22:45 -0400
Subject: [PATCH 0774/2191] Add `API::Pagination` concern (#28826)

---
 app/controllers/api/base_controller.rb     | 28 +----------------
 app/controllers/concerns/api/pagination.rb | 36 ++++++++++++++++++++++
 2 files changed, 37 insertions(+), 27 deletions(-)
 create mode 100644 app/controllers/concerns/api/pagination.rb

diff --git a/app/controllers/api/base_controller.rb b/app/controllers/api/base_controller.rb
index f87d596ce3a441..c1a5e43f882dd0 100644
--- a/app/controllers/api/base_controller.rb
+++ b/app/controllers/api/base_controller.rb
@@ -9,6 +9,7 @@ class Api::BaseController < ApplicationController
   include Api::CachingConcern
   include Api::ContentSecurityPolicy
   include Api::ErrorHandling
+  include Api::Pagination
 
   skip_before_action :require_functional!, unless: :limited_federation_mode?
 
@@ -29,21 +30,6 @@ def doorkeeper_forbidden_render_options(*)
 
   protected
 
-  def pagination_max_id
-    pagination_collection.last.id
-  end
-
-  def pagination_since_id
-    pagination_collection.first.id
-  end
-
-  def set_pagination_headers(next_path = nil, prev_path = nil)
-    links = []
-    links << [next_path, [%w(rel next)]] if next_path
-    links << [prev_path, [%w(rel prev)]] if prev_path
-    response.headers['Link'] = LinkHeader.new(links) unless links.empty?
-  end
-
   def limit_param(default_limit)
     return default_limit unless params[:limit]
 
@@ -72,10 +58,6 @@ def require_not_suspended!
     render json: { error: 'Your login is currently disabled' }, status: 403 if current_user&.account&.unavailable?
   end
 
-  def require_valid_pagination_options!
-    render json: { error: 'Pagination values for `offset` and `limit` must be positive' }, status: 400 if pagination_options_invalid?
-  end
-
   def require_user!
     if !current_user
       render json: { error: 'This method requires an authenticated user' }, status: 422
@@ -104,14 +86,6 @@ def disallow_unauthenticated_api_access?
 
   private
 
-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
-  def pagination_options_invalid?
-    params.slice(:limit, :offset).values.map(&:to_i).any?(&:negative?)
-  end
-
   def respond_with_error(code)
     render json: { error: Rack::Utils::HTTP_STATUS_CODES[code] }, status: code
   end
diff --git a/app/controllers/concerns/api/pagination.rb b/app/controllers/concerns/api/pagination.rb
new file mode 100644
index 00000000000000..d84a1d99f76efe
--- /dev/null
+++ b/app/controllers/concerns/api/pagination.rb
@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Api::Pagination
+  extend ActiveSupport::Concern
+
+  protected
+
+  def pagination_max_id
+    pagination_collection.last.id
+  end
+
+  def pagination_since_id
+    pagination_collection.first.id
+  end
+
+  def set_pagination_headers(next_path = nil, prev_path = nil)
+    links = []
+    links << [next_path, [%w(rel next)]] if next_path
+    links << [prev_path, [%w(rel prev)]] if prev_path
+    response.headers['Link'] = LinkHeader.new(links) unless links.empty?
+  end
+
+  def require_valid_pagination_options!
+    render json: { error: 'Pagination values for `offset` and `limit` must be positive' }, status: 400 if pagination_options_invalid?
+  end
+
+  private
+
+  def insert_pagination_headers
+    set_pagination_headers(next_path, prev_path)
+  end
+
+  def pagination_options_invalid?
+    params.slice(:limit, :offset).values.map(&:to_i).any?(&:negative?)
+  end
+end

From 650c548c31b993990f38c9a29570bf7c82e4b15e Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 17 Apr 2024 06:05:38 -0400
Subject: [PATCH 0775/2191] Add `not_featured_by` scope to Tag (#28815)

---
 .../featured_tags/suggestions_controller.rb   |  6 +-----
 .../settings/featured_tags_controller.rb      |  2 +-
 app/models/tag.rb                             |  2 ++
 spec/models/tag_spec.rb                       | 19 +++++++++++++++++++
 4 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/app/controllers/api/v1/featured_tags/suggestions_controller.rb b/app/controllers/api/v1/featured_tags/suggestions_controller.rb
index 4f732ed2d5a474..9c72e4380d887f 100644
--- a/app/controllers/api/v1/featured_tags/suggestions_controller.rb
+++ b/app/controllers/api/v1/featured_tags/suggestions_controller.rb
@@ -12,10 +12,6 @@ def index
   private
 
   def set_recently_used_tags
-    @recently_used_tags = Tag.recently_used(current_account).where.not(id: featured_tag_ids).limit(10)
-  end
-
-  def featured_tag_ids
-    current_account.featured_tags.pluck(:tag_id)
+    @recently_used_tags = Tag.suggestions_for_account(current_account).limit(10)
   end
 end
diff --git a/app/controllers/settings/featured_tags_controller.rb b/app/controllers/settings/featured_tags_controller.rb
index c384402650981e..90c112e21960e7 100644
--- a/app/controllers/settings/featured_tags_controller.rb
+++ b/app/controllers/settings/featured_tags_controller.rb
@@ -38,7 +38,7 @@ def set_featured_tags
   end
 
   def set_recently_used_tags
-    @recently_used_tags = Tag.recently_used(current_account).where.not(id: @featured_tags.map(&:id)).limit(10)
+    @recently_used_tags = Tag.suggestions_for_account(current_account).limit(10)
   end
 
   def featured_tag_params
diff --git a/app/models/tag.rb b/app/models/tag.rb
index f2168ae90470e7..58baa48c05dd17 100644
--- a/app/models/tag.rb
+++ b/app/models/tag.rb
@@ -53,6 +53,8 @@ class Tag < ApplicationRecord
   scope :listable, -> { where(listable: [true, nil]) }
   scope :trendable, -> { Setting.trendable_by_default ? where(trendable: [true, nil]) : where(trendable: true) }
   scope :not_trendable, -> { where(trendable: false) }
+  scope :suggestions_for_account, ->(account) { recently_used(account).not_featured_by(account) }
+  scope :not_featured_by, ->(account) { where.not(id: account.featured_tags.select(:tag_id)) }
   scope :recently_used, lambda { |account|
                           joins(:statuses)
                             .where(statuses: { id: account.statuses.select(:id).limit(RECENT_STATUS_LIMIT) })
diff --git a/spec/models/tag_spec.rb b/spec/models/tag_spec.rb
index 5a1d620884864a..4c2bdd52f4b579 100644
--- a/spec/models/tag_spec.rb
+++ b/spec/models/tag_spec.rb
@@ -142,6 +142,25 @@
     end
   end
 
+  describe '.not_featured_by' do
+    let!(:account) { Fabricate(:account) }
+    let!(:fun) { Fabricate(:tag, name: 'fun') }
+    let!(:games) { Fabricate(:tag, name: 'games') }
+
+    before do
+      Fabricate :featured_tag, account: account, name: 'games'
+      Fabricate :featured_tag, name: 'fun'
+    end
+
+    it 'returns tags not featured by the account' do
+      results = described_class.not_featured_by(account)
+
+      expect(results)
+        .to include(fun)
+        .and not_include(games)
+    end
+  end
+
   describe '.matches_name' do
     it 'returns tags for multibyte case-insensitive names' do
       upcase_string   = 'abcABCａｂｃＡＢＣやゆよ'

From 013671f29f3ebe791078d9e1ea92950a608d0ecb Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 17 Apr 2024 06:23:07 -0400
Subject: [PATCH 0776/2191] Rename JS testing section in GH Actions config
 (#29931)

---
 .github/workflows/test-js.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-js.yml b/.github/workflows/test-js.yml
index 79622b6c1f605d..481afdba30366d 100644
--- a/.github/workflows/test-js.yml
+++ b/.github/workflows/test-js.yml
@@ -38,5 +38,5 @@ jobs:
       - name: Set up Javascript environment
         uses: ./.github/actions/setup-javascript
 
-      - name: Jest testing
+      - name: JavaScript testing
         run: yarn jest --reporters github-actions summary

From 8bece467f821e587208284188d8c517118cd87b0 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 17 Apr 2024 13:13:52 +0200
Subject: [PATCH 0777/2191] Change `have_enqueued_sidekiq_job` usage to always
 make argument expectations explicit (#29974)

---
 spec/services/create_featured_tag_service_spec.rb | 2 +-
 spec/services/unmute_service_spec.rb              | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/spec/services/create_featured_tag_service_spec.rb b/spec/services/create_featured_tag_service_spec.rb
index 29a7c5b309124c..f057bc8538bdbb 100644
--- a/spec/services/create_featured_tag_service_spec.rb
+++ b/spec/services/create_featured_tag_service_spec.rb
@@ -24,7 +24,7 @@
         expect { subject.call(account, tag) }
           .to change(FeaturedTag, :count).by(1)
         expect(ActivityPub::AccountRawDistributionWorker)
-          .to_not have_enqueued_sidekiq_job
+          .to_not have_enqueued_sidekiq_job(any_args)
       end
     end
   end
diff --git a/spec/services/unmute_service_spec.rb b/spec/services/unmute_service_spec.rb
index 00135b5ac09106..92c7a70d65d105 100644
--- a/spec/services/unmute_service_spec.rb
+++ b/spec/services/unmute_service_spec.rb
@@ -24,7 +24,7 @@
         it 'removes the account mute and does not create a merge' do
           expect { subject.call(account, target_account) }
             .to remove_account_mute
-          expect(MergeWorker).to_not have_enqueued_sidekiq_job
+          expect(MergeWorker).to_not have_enqueued_sidekiq_job(any_args)
         end
       end
 
@@ -39,7 +39,7 @@ def remove_account_mute
       it 'does nothing and returns' do
         expect { subject.call(account, target_account) }
           .to_not(change { account.reload.muting?(target_account) })
-        expect(MergeWorker).to_not have_enqueued_sidekiq_job
+        expect(MergeWorker).to_not have_enqueued_sidekiq_job(any_args)
       end
     end
   end

From 1ad119941ff672b93f2b04dc29f82443349bb69c Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 17 Apr 2024 13:14:09 +0200
Subject: [PATCH 0778/2191] Update dependency rspec-sidekiq to v4.2.0 (#29964)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index ffeeebe9d3c482..752d4e05e01b55 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -640,7 +640,7 @@ GEM
       rspec-expectations (~> 3.13)
       rspec-mocks (~> 3.13)
       rspec-support (~> 3.13)
-    rspec-sidekiq (4.1.0)
+    rspec-sidekiq (4.2.0)
       rspec-core (~> 3.0)
       rspec-expectations (~> 3.0)
       rspec-mocks (~> 3.0)

From 630572323f95b382c552d18fa8bba23898cbd9c3 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 17 Apr 2024 23:52:26 +0200
Subject: [PATCH 0779/2191] Update dependency ioredis to v5.4.1 (#29977)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index e2f741c5b33cb0..bf217a074fe16c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9589,8 +9589,8 @@ __metadata:
   linkType: hard
 
 "ioredis@npm:^5.3.2":
-  version: 5.4.0
-  resolution: "ioredis@npm:5.4.0"
+  version: 5.4.1
+  resolution: "ioredis@npm:5.4.1"
   dependencies:
     "@ioredis/commands": "npm:^1.1.1"
     cluster-key-slot: "npm:^1.1.0"
@@ -9601,7 +9601,7 @@ __metadata:
     redis-errors: "npm:^1.2.0"
     redis-parser: "npm:^3.0.0"
     standard-as-callback: "npm:^2.1.0"
-  checksum: 10c0/a0214a004928cd35f7103179c8d236a8df609265994d554046fd130446b9989125b7133177936015a31925190f66c90bec4de7303819fe81383dc4576d947d47
+  checksum: 10c0/5d28b7c89a3cab5b76d75923d7d4ce79172b3a1ca9be690133f6e8e393a7a4b4ffd55513e618bbb5504fed80d9e1395c9d9531a7c5c5c84aa4c4e765cca75456
   languageName: node
   linkType: hard
 

From 11e0049b08c721eb98d8220405c2ffc16041ed17 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 18 Apr 2024 06:13:35 -0400
Subject: [PATCH 0780/2191] Use enum-generated scopes/queries for `BulkImport`
 (#29975)

---
 app/controllers/settings/imports_controller.rb | 4 ++--
 app/lib/vacuum/imports_vacuum.rb               | 2 +-
 app/models/bulk_import.rb                      | 2 +-
 app/views/settings/imports/index.html.haml     | 4 ++--
 spec/models/form/import_spec.rb                | 2 +-
 spec/services/bulk_import_service_spec.rb      | 4 ++--
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/controllers/settings/imports_controller.rb b/app/controllers/settings/imports_controller.rb
index 983caf22fabc7f..569aa07c533ece 100644
--- a/app/controllers/settings/imports_controller.rb
+++ b/app/controllers/settings/imports_controller.rb
@@ -31,7 +31,7 @@ def index
   def show; end
 
   def failures
-    @bulk_import = current_account.bulk_imports.where(state: :finished).find(params[:id])
+    @bulk_import = current_account.bulk_imports.state_finished.find(params[:id])
 
     respond_to do |format|
       format.csv do
@@ -92,7 +92,7 @@ def import_params
   end
 
   def set_bulk_import
-    @bulk_import = current_account.bulk_imports.where(state: :unconfirmed).find(params[:id])
+    @bulk_import = current_account.bulk_imports.state_unconfirmed.find(params[:id])
   end
 
   def set_recent_imports
diff --git a/app/lib/vacuum/imports_vacuum.rb b/app/lib/vacuum/imports_vacuum.rb
index ffb9449a4283d0..8c8bb783acb84f 100644
--- a/app/lib/vacuum/imports_vacuum.rb
+++ b/app/lib/vacuum/imports_vacuum.rb
@@ -9,7 +9,7 @@ def perform
   private
 
   def clean_unconfirmed_imports!
-    BulkImport.where(state: :unconfirmed).where('created_at <= ?', 10.minutes.ago).reorder(nil).in_batches.delete_all
+    BulkImport.state_unconfirmed.where('created_at <= ?', 10.minutes.ago).reorder(nil).in_batches.delete_all
   end
 
   def clean_old_imports!
diff --git a/app/models/bulk_import.rb b/app/models/bulk_import.rb
index 4cd228705a860a..9b3f4c8a3ae64a 100644
--- a/app/models/bulk_import.rb
+++ b/app/models/bulk_import.rb
@@ -38,7 +38,7 @@ class BulkImport < ApplicationRecord
     scheduled: 1,
     in_progress: 2,
     finished: 3,
-  }
+  }, prefix: true
 
   validates :type, presence: true
 
diff --git a/app/views/settings/imports/index.html.haml b/app/views/settings/imports/index.html.haml
index d5ca252dc15b73..ca815720fd6bd7 100644
--- a/app/views/settings/imports/index.html.haml
+++ b/app/views/settings/imports/index.html.haml
@@ -49,7 +49,7 @@
           %tr
             %td= t("imports.types.#{import.type}")
             %td
-              - if import.unconfirmed?
+              - if import.state_unconfirmed?
                 = link_to t("imports.states.#{import.state}"), settings_import_path(import)
               - else
                 = t("imports.states.#{import.state}")
@@ -59,7 +59,7 @@
             %td
               - num_failed = import.processed_items - import.imported_items
               - if num_failed.positive?
-                - if import.finished?
+                - if import.state_finished?
                   = link_to num_failed, failures_settings_import_path(import, format: 'csv')
                 - else
                   = num_failed
diff --git a/spec/models/form/import_spec.rb b/spec/models/form/import_spec.rb
index c2f41d442c96a6..22ffdfd877c0d1 100644
--- a/spec/models/form/import_spec.rb
+++ b/spec/models/form/import_spec.rb
@@ -281,7 +281,7 @@
         end
 
         it 'defaults to unconfirmed true' do
-          expect(bulk_import.unconfirmed?).to be true
+          expect(bulk_import.state_unconfirmed?).to be true
         end
       end
     end
diff --git a/spec/services/bulk_import_service_spec.rb b/spec/services/bulk_import_service_spec.rb
index c3a71605804d1c..e8bec96c8577bb 100644
--- a/spec/services/bulk_import_service_spec.rb
+++ b/spec/services/bulk_import_service_spec.rb
@@ -291,7 +291,7 @@
 
       it 'marks the import as finished' do
         subject.call(import)
-        expect(import.reload.finished?).to be true
+        expect(import.reload.state_finished?).to be true
       end
     end
 
@@ -319,7 +319,7 @@
 
       it 'marks the import as finished' do
         subject.call(import)
-        expect(import.reload.finished?).to be true
+        expect(import.reload.state_finished?).to be true
       end
     end
 

From 443186ff405112520e95836916eb2731b6a64c03 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 18 Apr 2024 13:18:39 +0200
Subject: [PATCH 0781/2191] New Crowdin Translations (automated) (#29980)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/en-GB.json | 50 ++++++++++++
 app/javascript/mastodon/locales/es-MX.json |  1 +
 app/javascript/mastodon/locales/es.json    |  1 +
 app/javascript/mastodon/locales/ia.json    | 91 ++++++++++++++++++++++
 config/locales/cs.yml                      | 56 +++++++++++++
 config/locales/eu.yml                      |  4 +-
 config/locales/simple_form.cs.yml          |  2 +
 7 files changed, 203 insertions(+), 2 deletions(-)

diff --git a/app/javascript/mastodon/locales/en-GB.json b/app/javascript/mastodon/locales/en-GB.json
index 80a3479b465ec8..6c24d5a2615c7e 100644
--- a/app/javascript/mastodon/locales/en-GB.json
+++ b/app/javascript/mastodon/locales/en-GB.json
@@ -209,6 +209,27 @@
   "dismissable_banner.explore_statuses": "These are posts from across the social web that are gaining traction today. Newer posts with more boosts and favourites are ranked higher.",
   "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralised network right now.",
   "dismissable_banner.public_timeline": "These are the most recent public posts from people on the social web that people on {domain} follow.",
+  "domain_block_modal.block": "Block server",
+  "domain_block_modal.block_account_instead": "Block @{name} instead",
+  "domain_block_modal.they_can_interact_with_old_posts": "People from this server can interact with your old posts.",
+  "domain_block_modal.they_cant_follow": "Nobody from this server can follow you.",
+  "domain_block_modal.they_wont_know": "They won't know they've been blocked.",
+  "domain_block_modal.title": "Block domain?",
+  "domain_block_modal.you_will_lose_followers": "All your followers from this server will be removed.",
+  "domain_block_modal.you_wont_see_posts": "You won't see posts or notifications from users on this server.",
+  "domain_pill.activitypub_lets_connect": "It lets you connect and interact with people not just on Mastodon, but across different social apps too.",
+  "domain_pill.activitypub_like_language": "ActivityPub is like the language Mastodon speaks with other social networks.",
+  "domain_pill.server": "Server",
+  "domain_pill.their_handle": "Their handle:",
+  "domain_pill.their_server": "Their digital home, where all of their posts live.",
+  "domain_pill.their_username": "Their unique identifier on their server. It’s possible to find users with the same username on different servers.",
+  "domain_pill.username": "Username",
+  "domain_pill.whats_in_a_handle": "What's in a handle?",
+  "domain_pill.who_they_are": "Since handles say who someone is and where they are, you can interact with people across the social web of <button>ActivityPub-powered platforms</button>.",
+  "domain_pill.who_you_are": "Because your handle says who you are and where you are, people can interact with you across the social web of <button>ActivityPub-powered platforms</button>.",
+  "domain_pill.your_handle": "Your handle:",
+  "domain_pill.your_server": "Your digital home, where all of your posts live. Don’t like this one? Transfer servers at any time and bring your followers, too.",
+  "domain_pill.your_username": "Your unique identifier on this server. It’s possible to find users with the same username on different servers.",
   "embed.instructions": "Embed this post on your website by copying the code below.",
   "embed.preview": "Here is what it will look like:",
   "emoji_button.activity": "Activity",
@@ -245,6 +266,7 @@
   "empty_column.list": "There is nothing in this list yet. When members of this list post new statuses, they will appear here.",
   "empty_column.lists": "You don't have any lists yet. When you create one, it will show up here.",
   "empty_column.mutes": "You haven't muted any users yet.",
+  "empty_column.notification_requests": "All clear! There is nothing here. When you receive new notifications, they will appear here according to your settings.",
   "empty_column.notifications": "You don't have any notifications yet. When other people interact with you, you will see it here.",
   "empty_column.public": "There is nothing here! Write something publicly, or manually follow users from other servers to fill it up",
   "error.unexpected_crash.explanation": "Due to a bug in our code or a browser compatibility issue, this page could not be displayed correctly.",
@@ -275,13 +297,22 @@
   "filter_modal.select_filter.subtitle": "Use an existing category or create a new one",
   "filter_modal.select_filter.title": "Filter this post",
   "filter_modal.title.status": "Filter a post",
+  "filtered_notifications_banner.mentions": "{count, plural, one {mention} other {mentions}}",
+  "filtered_notifications_banner.pending_requests": "Notifications from {count, plural, =0 {no one} one {one person} other {# people}} you may know",
+  "filtered_notifications_banner.title": "Filtered notifications",
   "firehose.all": "All",
   "firehose.local": "This server",
   "firehose.remote": "Other servers",
   "follow_request.authorize": "Authorise",
   "follow_request.reject": "Reject",
   "follow_requests.unlocked_explanation": "Even though your account is not locked, the {domain} staff thought you might want to review follow requests from these accounts manually.",
+  "follow_suggestions.curated_suggestion": "Staff pick",
   "follow_suggestions.dismiss": "Don't show again",
+  "follow_suggestions.hints.featured": "This profile has been hand-picked by the {domain} team.",
+  "follow_suggestions.hints.friends_of_friends": "This profile is popular among the people you follow.",
+  "follow_suggestions.hints.most_followed": "This profile is one of the most followed on {domain}.",
+  "follow_suggestions.hints.most_interactions": "This profile has been recently getting a lot of attention on {domain}.",
+  "follow_suggestions.hints.similar_to_recently_followed": "This profile is similar to the profiles you have most recently followed.",
   "follow_suggestions.personalized_suggestion": "Personalised suggestion",
   "follow_suggestions.popular_suggestion": "Popular suggestion",
   "follow_suggestions.view_all": "View all",
@@ -397,6 +428,15 @@
   "loading_indicator.label": "Loading…",
   "media_gallery.toggle_visible": "{number, plural, one {Hide image} other {Hide images}}",
   "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.",
+  "mute_modal.hide_from_notifications": "Hide from notifications",
+  "mute_modal.hide_options": "Hide options",
+  "mute_modal.indefinite": "Until I unmute them",
+  "mute_modal.show_options": "Show options",
+  "mute_modal.they_can_mention_and_follow": "They can mention and follow you, but you won't see them.",
+  "mute_modal.they_wont_know": "They won't know they've been muted.",
+  "mute_modal.title": "Mute user?",
+  "mute_modal.you_wont_see_mentions": "You won't see posts that mention them.",
+  "mute_modal.you_wont_see_posts": "They can still see your posts, but you won't see theirs.",
   "navigation_bar.about": "About",
   "navigation_bar.advanced_interface": "Open in advanced web interface",
   "navigation_bar.blocks": "Blocked users",
@@ -432,14 +472,24 @@
   "notification.own_poll": "Your poll has ended",
   "notification.poll": "A poll you have voted in has ended",
   "notification.reblog": "{name} boosted your status",
+  "notification.relationships_severance_event": "Lost connections with {name}",
+  "notification.relationships_severance_event.account_suspension": "An admin from {from} has suspended {target}, which means you can no longer receive updates from them or interact with them.",
+  "notification.relationships_severance_event.domain_block": "An admin from {from} has blocked {target}, including {followersCount} of your followers and {followingCount, plural, one {# account} other {# accounts}} you follow.",
+  "notification.relationships_severance_event.learn_more": "Learn more",
+  "notification.relationships_severance_event.user_domain_block": "You have blocked {target}, removing {followersCount} of your followers and {followingCount, plural, one {# account} other {# accounts}} you follow.",
   "notification.status": "{name} just posted",
   "notification.update": "{name} edited a post",
+  "notification_requests.accept": "Accept",
+  "notification_requests.dismiss": "Dismiss",
+  "notification_requests.notifications_from": "Notifications from {name}",
+  "notification_requests.title": "Filtered notifications",
   "notifications.clear": "Clear notifications",
   "notifications.clear_confirmation": "Are you sure you want to permanently clear all your notifications?",
   "notifications.column_settings.admin.report": "New reports:",
   "notifications.column_settings.admin.sign_up": "New sign-ups:",
   "notifications.column_settings.alert": "Desktop notifications",
   "notifications.column_settings.favourite": "Favourites:",
+  "notifications.column_settings.filter_bar.advanced": "Display all categories",
   "notifications.column_settings.filter_bar.category": "Quick filter bar",
   "notifications.column_settings.follow": "New followers:",
   "notifications.column_settings.follow_request": "New follow requests:",
diff --git a/app/javascript/mastodon/locales/es-MX.json b/app/javascript/mastodon/locales/es-MX.json
index fd32d9d903b8c7..1d8d4cedf83d32 100644
--- a/app/javascript/mastodon/locales/es-MX.json
+++ b/app/javascript/mastodon/locales/es-MX.json
@@ -297,6 +297,7 @@
   "filter_modal.select_filter.subtitle": "Usar una categoría existente o crear una nueva",
   "filter_modal.select_filter.title": "Filtrar esta publicación",
   "filter_modal.title.status": "Filtrar una publicación",
+  "filtered_notifications_banner.mentions": "{count, plural, one {mención} other {menciones}}",
   "filtered_notifications_banner.pending_requests": "Notificaciones de {count, plural, =0 {nadie} one {una persona} other {# personas}} que podrías conocer",
   "filtered_notifications_banner.title": "Notificaciones filtradas",
   "firehose.all": "Todas",
diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json
index 9c15a3cae48989..68e5349a57737a 100644
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@@ -297,6 +297,7 @@
   "filter_modal.select_filter.subtitle": "Usar una categoría existente o crear una nueva",
   "filter_modal.select_filter.title": "Filtrar esta publicación",
   "filter_modal.title.status": "Filtrar una publicación",
+  "filtered_notifications_banner.mentions": "{count, plural, one {mención} other {menciones}}",
   "filtered_notifications_banner.pending_requests": "Notificaciones de {count, plural, =0 {nadie} one {una persona} other {# personas}} que podrías conocer",
   "filtered_notifications_banner.title": "Notificaciones filtradas",
   "firehose.all": "Todas",
diff --git a/app/javascript/mastodon/locales/ia.json b/app/javascript/mastodon/locales/ia.json
index af28f9ce37be35..e0ae8b58c69116 100644
--- a/app/javascript/mastodon/locales/ia.json
+++ b/app/javascript/mastodon/locales/ia.json
@@ -42,6 +42,7 @@
   "account.go_to_profile": "Vader al profilo",
   "account.hide_reblogs": "Celar impulsos de @{name}",
   "account.in_memoriam": "In memoriam.",
+  "account.joined_short": "Inscribite",
   "account.languages": "Cambiar le linguas subscribite",
   "account.link_verified_on": "Le proprietate de iste ligamine ha essite verificate le {date}",
   "account.locked_info": "Le stato de confidentialitate de iste conto es definite como serrate. Le proprietario determina manualmente qui pote sequer le.",
@@ -52,10 +53,12 @@
   "account.mute_notifications_short": "Silentiar le notificationes",
   "account.mute_short": "Silentiar",
   "account.muted": "Silentiate",
+  "account.mutual": "Mutue",
   "account.no_bio": "Nulle description fornite.",
   "account.open_original_page": "Aperir le pagina original",
   "account.posts": "Messages",
   "account.posts_with_replies": "Messages e responsas",
+  "account.report": "Signalar @{name}",
   "account.requested": "Attendente le approbation. Clicca pro cancellar le requesta de sequer",
   "account.requested_follow": "{name} ha requestate de sequer te",
   "account.share": "Compartir profilo de @{name}",
@@ -70,29 +73,48 @@
   "account.unmute_notifications_short": "Non plus silentiar le notificationes",
   "account.unmute_short": "Non plus silentiar",
   "account_note.placeholder": "Clicca pro adder un nota",
+  "admin.dashboard.daily_retention": "Retention de usatores per die post inscription",
+  "admin.dashboard.monthly_retention": "Retention de usatores per mense post inscription",
   "admin.dashboard.retention.average": "Media",
+  "admin.dashboard.retention.cohort": "Mense de inscription",
   "admin.dashboard.retention.cohort_size": "Nove usatores",
+  "admin.impact_report.instance_accounts": "Numero de contos que isto delerea",
   "admin.impact_report.instance_followers": "Sequitores que nostre usatores perderea",
   "admin.impact_report.instance_follows": "Sequitores que lor usatores perderea",
+  "admin.impact_report.title": "Summario de impacto",
   "alert.rate_limited.message": "Per favor retenta post {retry_time, time, medium}.",
+  "alert.rate_limited.title": "Excesso de requestas",
   "alert.unexpected.message": "Un error inexpectate ha occurrite.",
+  "alert.unexpected.title": "Ups!",
   "announcement.announcement": "Annuncio",
+  "attachments_list.unprocessed": "(non processate)",
   "audio.hide": "Celar audio",
   "block_modal.remote_users_caveat": "Nos demandera al servitor {domain} de respectar tu decision. Nonobstante, le conformitate non es garantite perque alcun servitores pote tractar le blocadas de maniera differente. Le messages public pote esser totevia visibile pro le usatores non authenticate.",
   "block_modal.show_less": "Monstrar minus",
   "block_modal.show_more": "Monstrar plus",
+  "block_modal.they_cant_mention": "Le persona non pote mentionar te o sequer te.",
   "block_modal.they_cant_see_posts": "Iste persona non potera vider tu messages e tu non videra le sues.",
+  "block_modal.they_will_know": "Le persona pote saper de esser blocate.",
   "block_modal.title": "Blocar usator?",
   "block_modal.you_wont_see_mentions": "Tu non videra le messages que mentiona iste persona.",
   "boost_modal.combo": "Tu pote premer {combo} pro saltar isto le proxime vice",
+  "bundle_column_error.copy_stacktrace": "Copiar reporto de error",
+  "bundle_column_error.error.body": "Le pagina requestate non pote esser visualisate. Pote esser a causa de un defecto in nostre codice o de un problema de compatibilitate del navigator.",
   "bundle_column_error.error.title": "Oh, no!",
+  "bundle_column_error.network.body": "Un error ha occurrite durante le cargamento de iste pagina. Isto pote esser a causa de un problema temporari con tu connexion a internet o con iste servitor.",
   "bundle_column_error.network.title": "Error de rete",
   "bundle_column_error.retry": "Tentar novemente",
   "bundle_column_error.return": "Retornar al initio",
+  "bundle_column_error.routing.body": "Le pagina requestate non pote esser trovate. Es tu secur que le URL in le barra de adresse es correcte?",
+  "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Clauder",
+  "bundle_modal_error.message": "Un error ha occurrite durante le cargamento de iste componente.",
   "bundle_modal_error.retry": "Tentar novemente",
+  "closed_registrations.other_server_instructions": "Perque Mastodon es decentralisate, tu pote crear un conto sur un altere servitor e totevia interager con iste servitor.",
   "closed_registrations_modal.description": "Crear un conto in {domain} actualmente non es possibile, ma considera que non es necessari haber un conto specificamente sur {domain} pro usar Mastodon.",
   "closed_registrations_modal.find_another_server": "Cercar un altere servitor",
+  "closed_registrations_modal.preamble": "Mastodon es decentralisate, dunque, non importa ubi tu crea tu conto, tu pote sequer e communicar con omne persona sur iste servitor. Tu pote mesmo hospitar tu proprie servitor!",
+  "closed_registrations_modal.title": "Crear un conto sur Mastodon",
   "column.about": "A proposito",
   "column.blocks": "Usatores blocate",
   "column.bookmarks": "Marcapaginas",
@@ -102,6 +124,7 @@
   "column.domain_blocks": "Dominios blocate",
   "column.favourites": "Favoritos",
   "column.firehose": "Fluxos in directo",
+  "column.follow_requests": "Requestas de sequimento",
   "column.home": "Initio",
   "column.lists": "Listas",
   "column.mutes": "Usatores silentiate",
@@ -112,10 +135,13 @@
   "column_header.hide_settings": "Celar le parametros",
   "column_header.moveLeft_settings": "Mover columna al sinistra",
   "column_header.moveRight_settings": "Mover columna al dextra",
+  "column_header.pin": "Fixar",
   "column_header.show_settings": "Monstrar le parametros",
+  "column_header.unpin": "Disfixar",
   "column_subheading.settings": "Parametros",
   "community.column_settings.local_only": "Solmente local",
   "community.column_settings.media_only": "Solmente multimedia",
+  "community.column_settings.remote_only": "A distantia solmente",
   "compose.language.change": "Cambiar le lingua",
   "compose.language.search": "Cercar linguas...",
   "compose.published.body": "Message publicate.",
@@ -126,6 +152,7 @@
   "compose_form.hashtag_warning": "Iste message non essera listate sub alcun hashtag perque illo non es public. Solmente le messages public pote esser cercate per hashtag.",
   "compose_form.lock_disclaimer": "Tu conto non es {locked}. Quicunque pote sequer te pro vider tu messages solo pro sequitores.",
   "compose_form.lock_disclaimer.lock": "serrate",
+  "compose_form.placeholder": "Que ha tu in mente?",
   "compose_form.poll.duration": "Durata del sondage",
   "compose_form.poll.multiple": "Selection multiple",
   "compose_form.poll.option_placeholder": "Option {number}",
@@ -148,13 +175,19 @@
   "confirmations.delete.message": "Es tu secur que tu vole deler iste message?",
   "confirmations.delete_list.confirm": "Deler",
   "confirmations.delete_list.message": "Es tu secur que tu vole deler permanentemente iste lista?",
+  "confirmations.discard_edit_media.confirm": "Abandonar",
+  "confirmations.discard_edit_media.message": "Tu ha cambiamentos non salvate in le description o previsualisation del objecto multimedial. Abandonar los?",
   "confirmations.domain_block.confirm": "Blocar le servitor",
+  "confirmations.domain_block.message": "Es tu realmente, absolutemente secur de voler blocar tote le dominio {domain}? In le major parte del casos es preferibile blocar o silentiar alcun personas specific. Si tu bloca tote le dominio, tu non videra alcun contento de ille dominio in alcun chronologia public o in tu notificationes, e tu sequitores de ille dominio essera removite.",
   "confirmations.edit.confirm": "Modificar",
+  "confirmations.edit.message": "Si tu modifica isto ora, le message in curso de composition essera perdite. Es tu secur de voler continuar?",
   "confirmations.logout.confirm": "Clauder session",
   "confirmations.logout.message": "Es tu secur que tu vole clauder le session?",
   "confirmations.mute.confirm": "Silentiar",
+  "confirmations.redraft.confirm": "Deler e rescriber",
   "confirmations.redraft.message": "Es tu secur de voler deler iste message e rescriber lo? Le favorites e le impulsos essera perdite, e le responsas al message original essera orphanate.",
   "confirmations.reply.confirm": "Responder",
+  "confirmations.reply.message": "Si tu responde ora, le message in curso de composition essera perdite. Es tu secur de voler continuar?",
   "confirmations.unfollow.confirm": "Non plus sequer",
   "confirmations.unfollow.message": "Es tu secur que tu vole cessar de sequer {name}?",
   "conversation.delete": "Deler conversation",
@@ -174,6 +207,7 @@
   "dismissable_banner.dismiss": "Dimitter",
   "dismissable_banner.explore_links": "Istes es le articulos de novas que se condivide le plus sur le rete social hodie. Le articulos de novas le plus recente, publicate per plus personas differente, se classifica plus in alto.",
   "dismissable_banner.explore_statuses": "Ecce le messages de tote le rete social que gania popularitate hodie. Le messages plus nove con plus impulsos e favorites se classifica plus in alto.",
+  "dismissable_banner.explore_tags": "Ecce le hashtags que gania popularitate sur le rete social hodie. Le hashtags usate per plus personas differente se classifica plus in alto.",
   "dismissable_banner.public_timeline": "Istes es le messages public le plus recente del personas sur le rete social que le gente sur {domain} seque.",
   "domain_block_modal.block": "Blocar le servitor",
   "domain_block_modal.block_account_instead": "Blocar @{name} in su loco",
@@ -183,10 +217,19 @@
   "domain_block_modal.title": "Blocar dominio?",
   "domain_block_modal.you_will_lose_followers": "Omne sequitores ab iste servitor essera removite.",
   "domain_block_modal.you_wont_see_posts": "Tu non videra messages e notificationes ab usatores sur iste servitor.",
+  "domain_pill.activitypub_lets_connect": "Illo te permitte connecter e interager con personas non solmente sur Mastodon, ma tamben sur altere applicationes social.",
+  "domain_pill.activitypub_like_language": "ActivityPub es como le linguage commun que Mastodon parla con altere retes social.",
   "domain_pill.server": "Servitor",
+  "domain_pill.their_handle": "Su pseudonymo:",
   "domain_pill.their_server": "Su casa digital, ubi vive tote su messages.",
+  "domain_pill.their_username": "Su identificator unic sur su servitor. Es possibile trovar usatores con le mesme nomine de usator sur servitores differente.",
   "domain_pill.username": "Nomine de usator",
+  "domain_pill.whats_in_a_handle": "Que significa un pseudonymo?",
+  "domain_pill.who_they_are": "Un pseudonymo indica qui un persona es e ubi se trova, de maniera que tu pote interager con personas sur tote le rete social de <button>platteformas basate sur ActivityPub</button>.",
+  "domain_pill.who_you_are": "Perque tu pseudonymo indica qui tu es e ubi tu te trova, le gente pote interager con te desde tote le rete social de <button>platteformas basate sur ActivityPub</button>.",
+  "domain_pill.your_handle": "Tu pseudonymo:",
   "domain_pill.your_server": "Tu casa digital, ubi vive tote tu messages. Non te place? Cambia de servitor a omne momento e porta tu sequitores con te.",
+  "domain_pill.your_username": "Tu identificator unic sur iste servitor. Es possibile trovar usatores con le mesme nomine de usator sur servitores differente.",
   "embed.instructions": "Incorpora iste message sur tu sito web con le codice sequente.",
   "embed.preview": "Ecce como illlo parera:",
   "emoji_button.activity": "Activitate",
@@ -196,6 +239,8 @@
   "emoji_button.food": "Alimentos e bibitas",
   "emoji_button.label": "Inserer emoji",
   "emoji_button.nature": "Natura",
+  "emoji_button.not_found": "Necun emoji correspondente trovate",
+  "emoji_button.objects": "Objectos",
   "emoji_button.people": "Personas",
   "emoji_button.recent": "Frequentemente usate",
   "emoji_button.search": "Cercar...",
@@ -208,14 +253,27 @@
   "empty_column.account_unavailable": "Profilo non disponibile",
   "empty_column.blocks": "Tu non ha blocate alcun usator ancora.",
   "empty_column.bookmarked_statuses": "Tu non ha ancora messages in marcapaginas. Quando tu adde un message al marcapaginas, illo apparera hic.",
+  "empty_column.community": "Le chronologia local es vacue. Scribe qualcosa public pro poner le cosas in marcha!",
+  "empty_column.direct": "Tu non ha ancora mentiones private. Quando tu invia o recipe un mention, illo apparera hic.",
   "empty_column.domain_blocks": "Il non ha dominios blocate ancora.",
   "empty_column.explore_statuses": "Il non ha tendentias in iste momento. Reveni plus tarde!",
   "empty_column.favourited_statuses": "Tu non ha alcun message favorite ancora. Quando tu marca un message como favorite, illo apparera hic.",
   "empty_column.favourites": "Necuno ha ancora marcate iste message como favorite. Quando alcuno lo face, ille apparera hic.",
+  "empty_column.follow_requests": "Tu non ha ancora requestas de sequimento. Quando tu recipe un, illo apparera hic.",
   "empty_column.followed_tags": "Tu non ha ancora sequite alcun hashtags. Quando tu lo face, illos apparera hic.",
   "empty_column.hashtag": "Il non ha ancora alcun cosa in iste hashtag.",
   "empty_column.home": "Tu chronologia de initio es vacue! Seque plus personas pro plenar lo.",
   "empty_column.list": "Iste lista es ancora vacue. Quando le membros de iste lista publica nove messages, illos apparera hic.",
+  "empty_column.lists": "Tu non ha ancora listas. Quando tu crea un, illo apparera hic.",
+  "empty_column.mutes": "Tu non ha ancora silentiate alcun usator.",
+  "empty_column.notification_requests": "Iste lista es toto vacue! Quando tu recipe notificationes, illos apparera hic como configurate in tu parametros.",
+  "empty_column.notifications": "Tu non ha ancora notificationes. Quando altere personas interage con te, tu lo videra hic.",
+  "empty_column.public": "Il ha nihil hic! Scribe qualcosa public, o manualmente seque usatores de altere servitores, pro plenar lo",
+  "error.unexpected_crash.explanation": "A causa de un defecto in nostre codice o de un problema de compatibilitate del navigator, iste pagina non pote esser visualisate correctemente.",
+  "error.unexpected_crash.explanation_addons": "Iste pagina non pote esser visualisate correctemente. Iste error es probabilemente causate per un additivo al navigator o per un utensile de traduction automatic.",
+  "error.unexpected_crash.next_steps": "Tenta refrescar le pagina. Si isto non remedia le problema, es possibile que tu pote totevia usar Mastodon per medio de un altere navigator o application native.",
+  "error.unexpected_crash.next_steps_addons": "Tenta disactivar istes e refrescar le pagina. Si isto non remedia le problema, es possibile que tu pote totevia usar Mastodon per medio de un altere navigator o application native.",
+  "errors.unexpected_crash.copy_stacktrace": "Copiar le traciamento del pila al area de transferentia",
   "errors.unexpected_crash.report_issue": "Signalar un defecto",
   "explore.search_results": "Resultatos de recerca",
   "explore.suggested_follows": "Personas",
@@ -224,23 +282,42 @@
   "explore.trending_statuses": "Messages",
   "explore.trending_tags": "Hashtags",
   "filter_modal.added.context_mismatch_explanation": "Iste categoria de filtros non se applica al contexto in le qual tu ha accedite a iste message. Pro filtrar le message in iste contexto tamben, modifica le filtro.",
+  "filter_modal.added.context_mismatch_title": "Contexto incoherente!",
+  "filter_modal.added.expired_explanation": "Iste categoria de filtros ha expirate. Tu debe modificar le data de expiration pro applicar lo.",
+  "filter_modal.added.expired_title": "Filtro expirate!",
+  "filter_modal.added.review_and_configure": "Pro revider e configurar ulteriormente iste categoria de filtros, visita le {settings_link}.",
   "filter_modal.added.review_and_configure_title": "Parametros de filtro",
   "filter_modal.added.settings_link": "pagina de parametros",
   "filter_modal.added.short_explanation": "Iste message ha essite addite al sequente categoria de filtros: {title}.",
   "filter_modal.added.title": "Filtro addite!",
+  "filter_modal.select_filter.context_mismatch": "non se applica a iste contexto",
+  "filter_modal.select_filter.expired": "expirate",
   "filter_modal.select_filter.prompt_new": "Nove categoria: {name}",
   "filter_modal.select_filter.search": "Cercar o crear",
+  "filter_modal.select_filter.subtitle": "Usa un categoria existente o crea un nove",
   "filter_modal.select_filter.title": "Filtrar iste message",
   "filter_modal.title.status": "Filtrar un message",
+  "filtered_notifications_banner.mentions": "{count, plural, one {mention} other {mentiones}}",
   "filtered_notifications_banner.pending_requests": "Notificationes ab {count, plural, =0 {nemo} one {un persona} other {# personas}} tu poterea cognoscer",
+  "filtered_notifications_banner.title": "Notificationes filtrate",
   "firehose.all": "Toto",
   "firehose.local": "Iste servitor",
   "firehose.remote": "Altere servitores",
+  "follow_request.authorize": "Autorisar",
   "follow_request.reject": "Rejectar",
+  "follow_requests.unlocked_explanation": "Benque tu conto non es serrate, le personal de {domain} pensa que es un bon idea que tu revide manualmente le sequente requestas de iste contos.",
+  "follow_suggestions.curated_suggestion": "Selection del equipa",
   "follow_suggestions.dismiss": "Non monstrar novemente",
+  "follow_suggestions.hints.featured": "Iste profilo ha essite seligite manualmente per le equipa de {domain}.",
+  "follow_suggestions.hints.friends_of_friends": "Iste profilo es popular inter le gente que tu seque.",
+  "follow_suggestions.hints.most_followed": "Iste profilo es un del plus sequites sur {domain}.",
+  "follow_suggestions.hints.most_interactions": "Iste profilo ha recentemente recipite multe attention sur {domain}.",
+  "follow_suggestions.hints.similar_to_recently_followed": "Iste profilo es similar al profilos que tu ha recentemente sequite.",
   "follow_suggestions.personalized_suggestion": "Suggestion personalisate",
   "follow_suggestions.popular_suggestion": "Suggestion personalisate",
   "follow_suggestions.view_all": "Vider toto",
+  "follow_suggestions.who_to_follow": "Qui sequer",
+  "followed_tags": "Hashtags sequite",
   "footer.about": "A proposito",
   "footer.directory": "Directorio de profilos",
   "footer.get_app": "Obtener le application",
@@ -256,6 +333,11 @@
   "hashtag.column_header.tag_mode.none": "sin {additional}",
   "hashtag.column_settings.select.no_options_message": "Nulle suggestiones trovate",
   "hashtag.column_settings.select.placeholder": "Insere hashtags…",
+  "hashtag.column_settings.tag_mode.all": "Tote istes",
+  "hashtag.column_settings.tag_mode.any": "Un o plus de istes",
+  "hashtag.column_settings.tag_mode.none": "Necun de istes",
+  "hashtag.column_settings.tag_toggle": "Includer etiquettas additional pro iste columna",
+  "hashtag.counter_by_accounts": "{count, plural, one {{counter} participante} other {{counter} participantes}}",
   "hashtag.counter_by_uses": "{count, plural, one {{counter} message} other {{counter} messages}}",
   "hashtag.counter_by_uses_today": "{count, plural, one {{counter} message} other {{counter} messages}} hodie",
   "hashtag.follow": "Sequer hashtag",
@@ -277,13 +359,22 @@
   "interaction_modal.no_account_yet": "Non sur Mstodon?",
   "interaction_modal.on_another_server": "Sur un altere servitor",
   "interaction_modal.on_this_server": "Sur iste servitor",
+  "interaction_modal.sign_in": "Tu non es in session sur iste servitor. Sur qual servitor se trova tu conto?",
+  "interaction_modal.sign_in_hint": "Consilio: Se tracta del sito web ubi tu te ha inscribite. Si tu non te lo rememora, cerca le e-mail de benvenita in tu cassa de entrata. Tu pote etiam inserer tu pseudonymo complete! (p.ex. @Mastodon@mastodon.social)",
   "interaction_modal.title.favourite": "Marcar le message de {name} como favorite",
   "interaction_modal.title.follow": "Sequer {name}",
   "interaction_modal.title.reblog": "Impulsar le message de {name}",
   "interaction_modal.title.reply": "Responder al message de {name}",
+  "intervals.full.days": "{number, plural, one {# die} other {# dies}}",
+  "intervals.full.hours": "{number, plural, one {# hora} other {# horas}}",
+  "intervals.full.minutes": "{number, plural, one {# minuta} other {# minutas}}",
+  "keyboard_shortcuts.back": "Navigar retro",
   "keyboard_shortcuts.blocked": "Aperir lista de usatores blocate",
   "keyboard_shortcuts.boost": "Impulsar le message",
+  "keyboard_shortcuts.column": "Focalisar al columna",
+  "keyboard_shortcuts.compose": "Focalisar al area de composition de texto",
   "keyboard_shortcuts.description": "Description",
+  "keyboard_shortcuts.direct": "aperir le columna de mentiones private",
   "keyboard_shortcuts.enter": "Aperir message",
   "keyboard_shortcuts.favourite": "Message favorite",
   "keyboard_shortcuts.favourites": "Aperir lista de favoritos",
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index b44b01beeed656..bccbb75c4deb92 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -621,6 +621,9 @@ cs:
       actions_description_html: Rozhodněte, který krok učinit pro vyřešení tohoto hlášení. Pokud podniknete kárný krok proti nahlášenému účtu, bude mu zasláno e-mailové oznámení, s výjimkou případu, kdy je zvolena kategorie <strong>Spam</strong>.
       actions_description_remote_html: Rozhodněte, co podniknout pro vyřešení tohoto hlášení. Toto ovlivní pouze to, jak <strong>váš</strong> server komunikuje s tímto vzdáleným účtem, a zpracuje jeho obsah.
       add_to_report: Přidat do hlášení další
+      already_suspended_badges:
+        local: Již pozastaveno na tomto serveru
+        remote: Již pozastaveno na jejich serveru
       are_you_sure: Jste si jisti?
       assign_to_self: Přidělit ke mně
       assigned: Přiřazený moderátor
@@ -1704,13 +1707,26 @@ cs:
     import: Import
     import_and_export: Import a export
     migrate: Přesun účtu
+    notifications: E-mailová upozornění
     preferences: Předvolby
     profile: Profil
     relationships: Sledovaní a sledující
+    severed_relationships: Přerušené vztahy
     statuses_cleanup: Automatické mazání příspěvků
     strikes: Moderační prohřešky
     two_factor_authentication: Dvoufázové ověřování
     webauthn_authentication: Bezpečnostní klíče
+  severed_relationships:
+    download: Stáhnout (%{count})
+    event_type:
+      account_suspension: Pozastavení účtu (%{target_name})
+      domain_block: Pozastavení serveru (%{target_name})
+      user_domain_block: Zablokovali jste %{target_name}
+    lost_followers: Ztracení sledující
+    lost_follows: Ztracená sledování
+    preamble: Když zablokujete doménu nebo když se moderátoři rozhodnou pozastavit vzdálený server, můžete přijít o sledování a sledující. Když k tomu dojde, budete si moci stáhnout seznamy přerušených vztahů, abyste je mohli zkontrolovat a případně importovat na jiný server.
+    purged: Informace o tomto serveru byly správci serveru vymazány.
+    type: Událost
   statuses:
     attached:
       audio:
@@ -1816,6 +1832,7 @@ cs:
     contrast: Mastodon (vysoký kontrast)
     default: Mastodon (tmavý)
     mastodon-light: Mastodon (světlý)
+    system: Automaticky (dle motivu systému)
   time:
     formats:
       default: "%d. %b %Y, %H:%M"
@@ -1903,7 +1920,46 @@ cs:
         silence: Účet omezen
         suspend: Účet pozastaven
     welcome:
+      apps_android_action: Získejte na Google Play
+      apps_ios_action: Stáhnout z App Store
+      apps_step: Stáhněte si naše oficiální aplikace.
+      apps_title: Aplikace Mastodon
+      checklist_subtitle: 'Začněme na této nové sociální hranici:'
+      checklist_title: Uvítací kontrolní seznam
+      edit_profile_action: Přizpůsobit
+      edit_profile_step: Zlepšete své interakce tím, že si vytvoříte komplexní profil.
+      edit_profile_title: Přizpůsobte si svůj profil
       explanation: Zde je pár tipů do začátku
+      feature_action: Zjistit více
+      feature_audience: Mastodon vám nabízí jedinečnou možnost správy publika bez prostředníků. Mastodon nasazený na vaší vlastní infrastruktuře vám umožňuje sledovat a být sledován z jakéhokoli jiného Mastodon serveru online a není pod kontrolou nikoho jiného než vás.
+      feature_audience_title: Vytvořte si svědomě své publikum
+      feature_control: Sami nejlépe víte, co chcete vidět na svém domovském kanálu. Žádné algoritmy ani reklamy, které by plýtvaly vaším časem. Sledujte kohokoli z libovolného Mastodon serveru z jediného účtu, dostávejte jejich příspěvky v chronologickém pořadí a udělejte si svůj kout internetu trochu více podle sebe.
+      feature_control_title: Mějte pod kontrolou vlastní časovou osu
+      feature_creativity: Mastodon podporuje zvukové, video a obrázkové příspěvky, popisy přístupnosti, ankety, upozornění na obsah, animované avatary, vlastní emotikony, ovládání ořezu miniatur a další funkce, které vám pomohou vyjádřit se online. Ať už publikujete své umění, hudbu nebo podcast, Mastodon je tu pro vás.
+      feature_creativity_title: Bezkonkurenční kreativita
+      feature_moderation: Mastodon dává rozhodování zpět do vašich rukou. Každý server si vytváří svá vlastní pravidla a předpisy, které jsou prosazovány lokálně, nikoli shora jako v případě firemních sociálních médií, díky čemuž lze nejpružněji reagovat na potřeby různých skupin lidí. Připojte se k serveru s pravidly, se kterými souhlasíte, nebo si založte vlastní.
+      feature_moderation_title: Moderování způsobem, jakým by to mělo být
+      follow_action: Sledovat
+      follow_step: Mastodon je o sledování zajimavých lidí.
+      follow_title: Přizpůsobte si svůj domovský kanál
+      follows_subtitle: Sledujte známé účty
+      follows_title: Koho sledovat
+      follows_view_more: Zobrazit více lidí ke sledování
+      hashtags_recent_count:
+        few: "%{people} osoby v posledních 2 dnech"
+        many: "%{people} osob v posledních 2 dnech"
+        one: "%{people} osoba v posledních 2 dnech"
+        other: "%{people} osob v posledních 2 dnech"
+      hashtags_subtitle: Prozkoumejte, co je populární od posledních 2 dnů
+      hashtags_title: Populární hashtagy
+      hashtags_view_more: Zobrazit více populárních hashtagů
+      post_action: Sepsat
+      post_step: Řekněte světu ahoj pomocí textu, fotografií, videí nebo anket.
+      post_title: Vytvořte svůj první příspěvek
+      share_action: Sdílet
+      share_step: Dejte přátelům vědět, jak vás mohou na Mastodonu najít.
+      share_title: Sdílejte svůj Mastodon profil
+      sign_in_action: Přihlásit se
       subject: Vítejte na Mastodonu
       title: Vítejte na palubě, %{name}!
   users:
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index 523b6019780b21..a05aa3c92f00ec 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -1241,7 +1241,7 @@ eu:
     add_new: Gehitu berria
     errors:
       limit: Gehienezko traola kopurua erakutsi duzu jada
-    hint_html: "<strong>Zer dira nabarmendutako traolak?</strong> Zure profilean toki nabarmendu batean agertzen dira eta jendeari traola hau daukaten bidalketa publikoak arakatzea ahalbidetzen diote. Sormen lana edo epe luzerako proiektuak jarraitzeko primerakoak dira."
+    hint_html: "<strong>Zer dira nabarmendutako traolak?</strong> Zure profileko toki nabarmendu batean agertzen dira eta jendeari traola haue dituzten bidalketa publikoak arakatzea ahalbidetzen diote. Sormen-lanak edo epe luzerako proiektuak jarraitzeko primerakoak dira."
   filters:
     contexts:
       account: Profilak
@@ -1910,7 +1910,7 @@ eu:
     signed_in_as: 'Saioa honela hasita:'
   verification:
     extra_instructions_html: <strong>Aholkua:</strong> webguneko esteka ikusezina izan daiteke. Muina <code>rel="me"</code> da, erabiltzaileak sortutako edukia duten webguneetan beste inor zure burutzat aurkeztea eragozten duena. <code>a</code> beharrean <code>esteka</code> motako etiketa bat ere erabil dezakezu orriaren goiburuan, baina HTMLak erabilgarri egon behar du JavaScript exekutatu gabe.
-    here_is_how: Hemen duzu nola
+    here_is_how: Argibidea
     hint_html: "<strong>Mastodonen nortasun-egiaztapena guztiontzat da.</strong> Web estandar irekietan oinarritua, orain eta betiko doan. Behar duzun guztia jendeak ezagutzen duen webgune pertsonal bat da. Mastodon profiletik webgune honetara estekatzen duzunean, webguneak Mastodon profilera estekatzen duela egiaztatuko dugu eta adierazle bat erakutsiko du."
     instructions_html: Kopiatu eta itsatsi ondoko kodea zure webguneko HTMLan. Ondoren, gehitu zure webgunearen helbidea zure profileko eremu gehigarrietako batean, "Editatu profila" fitxatik eta gorde aldaketak.
     verification: Egiaztaketa
diff --git a/config/locales/simple_form.cs.yml b/config/locales/simple_form.cs.yml
index ca8cc49a98aa66..f91f8267306c98 100644
--- a/config/locales/simple_form.cs.yml
+++ b/config/locales/simple_form.cs.yml
@@ -116,6 +116,7 @@ cs:
           sign_up_requires_approval: Nové registrace budou vyžadovat schválení
         severity: Zvolte, jak naložit s požadavky z dané IP
       rule:
+        hint: Nepovinné. Uveďte další podrobnosti o pravidle
         text: Popište pravidlo nebo požadavek uživatelům tohoto serveru. Snažte se ho držet krátký a jednoduchý
       sessions:
         otp: 'Zadejte kód pro dvoufázové ověření vygenerovaný vaší mobilní aplikací, nebo použijte jeden z vašich záložních kódů:'
@@ -299,6 +300,7 @@ cs:
           patch: Upozornit na aktualizace chyb
         trending_tag: Nový trend vyžaduje posouzení
       rule:
+        hint: Další informace
         text: Pravidlo
       settings:
         indexable: Zahrnout stránku profilu do vyhledávačů

From 75f9c652e21c0fbb76c90820646b66516d12ad9b Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 18 Apr 2024 12:24:22 -0400
Subject: [PATCH 0782/2191] Fix `Bundler/OrderedGems` cop (#28400)

---
 .rubocop_todo.yml |  7 -------
 Gemfile           | 26 +++++++++++++-------------
 2 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 63d9d675748647..9ca7ba6f115738 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -6,13 +6,6 @@
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: TreatCommentsAsGroupSeparators, ConsiderPunctuation, Include.
-# Include: **/*.gemfile, **/Gemfile, **/gems.rb
-Bundler/OrderedGems:
-  Exclude:
-    - 'Gemfile'
-
 Lint/NonLocalExitFromIterator:
   Exclude:
     - 'app/helpers/jsonld_helper.rb'
diff --git a/Gemfile b/Gemfile
index 35e0b2928099df..3361f2dc3395cd 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,26 +3,26 @@
 source 'https://rubygems.org'
 ruby '>= 3.1.0'
 
+gem 'propshaft'
 gem 'puma', '~> 6.3'
+gem 'rack', '~> 2.2.7'
 gem 'rails', '~> 7.1.1'
-gem 'propshaft'
 gem 'thor', '~> 1.2'
-gem 'rack', '~> 2.2.7'
 
 # For why irb is in the Gemfile, see: https://ruby.social/@st0012/111444685161478182
 gem 'irb', '~> 1.8'
 
+gem 'dotenv-rails', '~> 2.8'
 gem 'haml-rails', '~>2.0'
 gem 'pg', '~> 1.5'
 gem 'pghero'
-gem 'dotenv-rails', '~> 2.8'
 
 gem 'aws-sdk-s3', '~> 1.123', require: false
+gem 'blurhash', '~> 0.1'
 gem 'fog-core', '<= 2.4.0'
 gem 'fog-openstack', '~> 1.0', require: false
 gem 'kt-paperclip', '~> 7.2'
 gem 'md-paperclip-azure', '~> 2.2', require: false
-gem 'blurhash', '~> 0.1'
 
 gem 'active_model_serializers', '~> 0.10'
 gem 'addressable', '~> 2.8'
@@ -39,11 +39,11 @@ end
 
 gem 'net-ldap', '~> 0.18'
 
+gem 'omniauth', '~> 2.0'
 gem 'omniauth-cas', '~> 3.0.0.beta.1'
-gem 'omniauth-saml', '~> 2.0'
 gem 'omniauth_openid_connect', '~> 0.6.1'
-gem 'omniauth', '~> 2.0'
 gem 'omniauth-rails_csrf_protection', '~> 1.0'
+gem 'omniauth-saml', '~> 2.0'
 
 gem 'color_diff', '~> 0.1'
 gem 'csv', '~> 3.2'
@@ -53,7 +53,6 @@ gem 'ed25519', '~> 1.3'
 gem 'fast_blank', '~> 1.0'
 gem 'fastimage'
 gem 'hiredis', '~> 0.6'
-gem 'redis-namespace', '~> 1.10'
 gem 'htmlentities', '~> 4.3'
 gem 'http', '~> 5.1'
 gem 'http_accept_language', '~> 2.1'
@@ -63,39 +62,40 @@ gem 'idn-ruby', require: 'idn'
 gem 'inline_svg'
 gem 'kaminari', '~> 1.2'
 gem 'link_header', '~> 0.0'
+gem 'mario-redis-lock', '~> 1.2', require: 'redis_lock'
 gem 'mime-types', '~> 3.5.0', require: 'mime/types/columnar'
 gem 'nokogiri', '~> 1.15'
 gem 'nsa'
 gem 'oj', '~> 3.14'
 gem 'ox', '~> 2.14'
 gem 'parslet'
+gem 'premailer-rails'
 gem 'public_suffix', '~> 5.0'
 gem 'pundit', '~> 2.3'
-gem 'premailer-rails'
 gem 'rack-attack', '~> 6.6'
 gem 'rack-cors', '~> 2.0', require: 'rack/cors'
 gem 'rails-i18n', '~> 7.0'
 gem 'redcarpet', '~> 3.6'
 gem 'redis', '~> 4.5', require: ['redis', 'redis/connection/hiredis']
-gem 'mario-redis-lock', '~> 1.2', require: 'redis_lock'
+gem 'redis-namespace', '~> 1.10'
 gem 'rqrcode', '~> 2.2'
 gem 'ruby-progressbar', '~> 1.13'
 gem 'sanitize', '~> 6.0'
 gem 'scenic', '~> 1.7'
 gem 'sidekiq', '~> 6.5'
+gem 'sidekiq-bulk', '~> 0.2.0'
 gem 'sidekiq-scheduler', '~> 5.0'
 gem 'sidekiq-unique-jobs', '~> 7.1'
-gem 'sidekiq-bulk', '~> 0.2.0'
-gem 'simple-navigation', '~> 4.4'
 gem 'simple_form', '~> 5.2'
+gem 'simple-navigation', '~> 4.4'
 gem 'stoplight', '~> 4.1'
 gem 'strong_migrations', '1.8.0'
 gem 'tty-prompt', '~> 0.23', require: false
 gem 'twitter-text', '~> 3.1.0'
 gem 'tzinfo-data', '~> 1.2023'
+gem 'webauthn', '~> 3.0'
 gem 'webpacker', '~> 5.4'
 gem 'webpush', github: 'ClearlyClaire/webpush', ref: 'f14a4d52e201128b1b00245d11b6de80d6cfdcd9'
-gem 'webauthn', '~> 3.0'
 
 gem 'json-ld'
 gem 'json-ld-preloaded', '~> 3.2'
@@ -197,10 +197,10 @@ group :production do
   gem 'lograge', '~> 0.12'
 end
 
+gem 'cocoon', '~> 1.2'
 gem 'concurrent-ruby', require: false
 gem 'connection_pool', require: false
 gem 'xorcist', '~> 1.1'
-gem 'cocoon', '~> 1.2'
 
 gem 'net-http', '~> 0.4.0'
 gem 'rubyzip', '~> 2.3'

From e5d5bd7ff114c43babc4ca563112bf31c5fee65a Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 18 Apr 2024 18:24:55 +0200
Subject: [PATCH 0783/2191] Update dependency postcss-preset-env to v9.5.6
 (#29983)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index bf217a074fe16c..c0d1e91b62d410 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6481,14 +6481,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"css-blank-pseudo@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "css-blank-pseudo@npm:6.0.1"
+"css-blank-pseudo@npm:^6.0.2":
+  version: 6.0.2
+  resolution: "css-blank-pseudo@npm:6.0.2"
   dependencies:
     postcss-selector-parser: "npm:^6.0.13"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/04f2dc1c39a429cb4958b60a9d00b03e29a78e3e55fe111b3a0660b7c6c478455d5907eda7c7a495cf72dbe83ae3c80b409e0468ca1ba5ccef992e69a8f49df8
+  checksum: 10c0/609303551c2a518ca23ed12fed43945ca4f7af04140da68a5536f5dc9d42f33412c13ac3fe5c616d7401a9e13a23d80b4cfa87149a45f94b244d8067bb11f3dd
   languageName: node
   linkType: hard
 
@@ -13620,8 +13620,8 @@ __metadata:
   linkType: hard
 
 "postcss-preset-env@npm:^9.5.2":
-  version: 9.5.5
-  resolution: "postcss-preset-env@npm:9.5.5"
+  version: 9.5.6
+  resolution: "postcss-preset-env@npm:9.5.6"
   dependencies:
     "@csstools/postcss-cascade-layers": "npm:^4.0.4"
     "@csstools/postcss-color-function": "npm:^3.0.13"
@@ -13654,7 +13654,7 @@ __metadata:
     "@csstools/postcss-unset-value": "npm:^3.0.1"
     autoprefixer: "npm:^10.4.19"
     browserslist: "npm:^4.22.3"
-    css-blank-pseudo: "npm:^6.0.1"
+    css-blank-pseudo: "npm:^6.0.2"
     css-has-pseudo: "npm:^6.0.3"
     css-prefers-color-scheme: "npm:^9.0.1"
     cssdb: "npm:^8.0.0"
@@ -13685,7 +13685,7 @@ __metadata:
     postcss-selector-not: "npm:^7.0.2"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/afc31fb75bc5e8e223d38fd34b81da08ee340818f5e392df1781728f2ff2a9dbc75e458673ce9f52deafefa90bbc99e0bd1453271498f5e02746c785180bad07
+  checksum: 10c0/21738ecac400cca9a96841959308538516ed00ca80d4c53beb20e080c7d963120fa77b7435b02e1beefc20043abce666419b81eccf6dacdc4298f540778c111d
   languageName: node
   linkType: hard
 

From 4837bfcc6ab38dc86c619167b7c2e260a92a270a Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 19 Apr 2024 09:57:32 -0400
Subject: [PATCH 0784/2191] Use shared `form` partial for `admin/announcements`
 views (#29608)

---
 app/views/admin/announcements/_form.html.haml | 28 +++++++++++++++
 app/views/admin/announcements/edit.html.haml  | 35 +++---------------
 app/views/admin/announcements/new.html.haml   | 36 +++----------------
 3 files changed, 38 insertions(+), 61 deletions(-)
 create mode 100644 app/views/admin/announcements/_form.html.haml

diff --git a/app/views/admin/announcements/_form.html.haml b/app/views/admin/announcements/_form.html.haml
new file mode 100644
index 00000000000000..3a9b371907776b
--- /dev/null
+++ b/app/views/admin/announcements/_form.html.haml
@@ -0,0 +1,28 @@
+.fields-group
+  = form.input :starts_at,
+               html5: true,
+               include_blank: true,
+               input_html: { pattern: datetime_pattern, placeholder: datetime_placeholder },
+               wrapper: :with_block_label
+  = form.input :ends_at,
+               html5: true,
+               include_blank: true,
+               input_html: { pattern: datetime_pattern, placeholder: datetime_placeholder },
+               wrapper: :with_block_label
+
+.fields-group
+  = form.input :all_day,
+               as: :boolean,
+               wrapper: :with_label
+
+.fields-group
+  = form.input :text,
+               wrapper: :with_block_label
+
+- unless form.object.published?
+  .fields-group
+    = form.input :scheduled_at,
+                 html5: true,
+                 include_blank: true,
+                 input_html: { pattern: datetime_pattern, placeholder: datetime_placeholder },
+                 wrapper: :with_block_label
diff --git a/app/views/admin/announcements/edit.html.haml b/app/views/admin/announcements/edit.html.haml
index 23c568a885d99a..8cec7d36c2d9e1 100644
--- a/app/views/admin/announcements/edit.html.haml
+++ b/app/views/admin/announcements/edit.html.haml
@@ -1,37 +1,12 @@
 - content_for :page_title do
   = t('.title')
 
-= simple_form_for @announcement, url: admin_announcement_path(@announcement), html: { novalidate: false } do |f|
+= simple_form_for @announcement, url: admin_announcement_path(@announcement), html: { novalidate: false } do |form|
   = render 'shared/error_messages', object: @announcement
 
-  .fields-group
-    = f.input :starts_at,
-              html5: true,
-              include_blank: true,
-              input_html: { pattern: datetime_pattern, placeholder: datetime_placeholder },
-              wrapper: :with_block_label
-    = f.input :ends_at,
-              html5: true,
-              include_blank: true,
-              input_html: { pattern: datetime_pattern, placeholder: datetime_placeholder },
-              wrapper: :with_block_label
-
-  .fields-group
-    = f.input :all_day,
-              as: :boolean,
-              wrapper: :with_label
-
-  .fields-group
-    = f.input :text,
-              wrapper: :with_block_label
-
-  - unless @announcement.published?
-    .fields-group
-      = f.input :scheduled_at,
-                html5: true,
-                include_blank: true,
-                input_html: { pattern: datetime_pattern, placeholder: datetime_placeholder },
-                wrapper: :with_block_label
+  = render form
 
   .actions
-    = f.button :button, t('generic.save_changes'), type: :submit
+    = form.button :button,
+                  t('generic.save_changes'),
+                  type: :submit
diff --git a/app/views/admin/announcements/new.html.haml b/app/views/admin/announcements/new.html.haml
index a681ed789ec149..266ca65e80ef9e 100644
--- a/app/views/admin/announcements/new.html.haml
+++ b/app/views/admin/announcements/new.html.haml
@@ -1,38 +1,12 @@
 - content_for :page_title do
   = t('.title')
 
-= simple_form_for @announcement, url: admin_announcements_path, html: { novalidate: false } do |f|
+= simple_form_for @announcement, url: admin_announcements_path, html: { novalidate: false } do |form|
   = render 'shared/error_messages', object: @announcement
 
-  .fields-group
-    = f.input :starts_at,
-              html5: true,
-              include_blank: true,
-              input_html: { pattern: datetime_pattern, placeholder: datetime_placeholder },
-              wrapper: :with_block_label
-    = f.input :ends_at,
-              html5: true,
-              include_blank: true,
-              input_html: { pattern: datetime_pattern, placeholder: datetime_placeholder },
-              wrapper: :with_block_label
-
-  .fields-group
-    = f.input :all_day,
-              as: :boolean,
-              wrapper: :with_label
-
-  .fields-group
-    = f.input :text,
-              wrapper: :with_block_label
-
-  .fields-group
-    = f.input :scheduled_at,
-              html5: true,
-              include_blank: true,
-              input_html: { pattern: datetime_pattern, placeholder: datetime_placeholder },
-              wrapper: :with_block_label
+  = render form
 
   .actions
-    = f.button :button,
-               t('.create'),
-               type: :submit
+    = form.button :button,
+                  t('.create'),
+                  type: :submit

From ec71c02c4b028c3541742f023729aeb295a51559 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 19 Apr 2024 15:57:43 +0200
Subject: [PATCH 0785/2191] New Crowdin Translations (automated) (#29994)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/cs.json | 29 +++++++++++++++++++++++++
 app/javascript/mastodon/locales/th.json |  1 +
 app/javascript/mastodon/locales/tr.json |  4 ++--
 config/locales/fi.yml                   |  6 ++---
 config/locales/ko.yml                   |  8 +++----
 5 files changed, 39 insertions(+), 9 deletions(-)

diff --git a/app/javascript/mastodon/locales/cs.json b/app/javascript/mastodon/locales/cs.json
index f55caf14b5863a..2fc01f3acc2835 100644
--- a/app/javascript/mastodon/locales/cs.json
+++ b/app/javascript/mastodon/locales/cs.json
@@ -297,6 +297,8 @@
   "filter_modal.select_filter.subtitle": "Použít existující kategorii nebo vytvořit novou kategorii",
   "filter_modal.select_filter.title": "Filtrovat tento příspěvek",
   "filter_modal.title.status": "Filtrovat příspěvek",
+  "filtered_notifications_banner.mentions": "{count, plural, one {zmínka} few {zmínky} many {zmínek} other {zmínek}}",
+  "filtered_notifications_banner.pending_requests": "Oznámení od {count, plural, =0 {nikoho} one {jednoho člověka, kterého znáte} few {# lidí, které znáte} many {# lidí, které znáte} other {# lidí, které znáte}}",
   "filtered_notifications_banner.title": "Filtrovaná oznámení",
   "firehose.all": "Vše",
   "firehose.local": "Tento server",
@@ -427,7 +429,14 @@
   "media_gallery.toggle_visible": "{number, plural, one {Skrýt obrázek} few {Skrýt obrázky} many {Skrýt obrázky} other {Skrýt obrázky}}",
   "moved_to_account_banner.text": "Váš účet {disabledAccount} je momentálně deaktivován, protože jste se přesunul/a na {movedToAccount}.",
   "mute_modal.hide_from_notifications": "Skrýt z notifikací",
+  "mute_modal.hide_options": "Skrýt možnosti",
+  "mute_modal.indefinite": "Dokud je neodkryju",
+  "mute_modal.show_options": "Zobrazit možnosti",
+  "mute_modal.they_can_mention_and_follow": "Mohou vás zmínit a sledovat, ale neuvidíte je.",
+  "mute_modal.they_wont_know": "Nebudou vědět, že byli skryti.",
   "mute_modal.title": "Ztlumit uživatele?",
+  "mute_modal.you_wont_see_mentions": "Neuvidíte příspěvky, které je zmiňují.",
+  "mute_modal.you_wont_see_posts": "Stále budou moci vidět vaše příspěvky, ale vy jejich neuvidíte.",
   "navigation_bar.about": "O aplikaci",
   "navigation_bar.advanced_interface": "Otevřít pokročilé webové rozhraní",
   "navigation_bar.blocks": "Blokovaní uživatelé",
@@ -463,17 +472,25 @@
   "notification.own_poll": "Vaše anketa skončila",
   "notification.poll": "Anketa, ve které jste hlasovali, skončila",
   "notification.reblog": "Uživatel {name} boostnul váš příspěvek",
+  "notification.relationships_severance_event": "Kontakt ztracen s {name}",
+  "notification.relationships_severance_event.account_suspension": "Administrátor z {from} pozastavil {target}, což znamená, že již od nich nemůžete přijímat aktualizace nebo s nimi interagovat.",
+  "notification.relationships_severance_event.domain_block": "Administrátor z {from} pozastavil {target}, včetně {followersCount} z vašich sledujících a {followingCount, plural, one {# účet, který sledujete} few {# účty, které sledujete} many {# účtů, které sledujete} other {# účtů, které sledujete}}.",
   "notification.relationships_severance_event.learn_more": "Zjistit více",
+  "notification.relationships_severance_event.user_domain_block": "Zablokovali jste {target}, čímž jste odebrali {followersCount} z vašich sledujících a {followingCount, plural, one {# účet, který sledujete} few {# účty, které sledujete} many {# účtů, které sledujete} other {# účtů, které sledujete}}.",
   "notification.status": "Uživatel {name} právě přidal příspěvek",
   "notification.update": "Uživatel {name} upravil příspěvek",
   "notification_requests.accept": "Přijmout",
   "notification_requests.dismiss": "Zamítnout",
+  "notification_requests.notifications_from": "Oznámení od {name}",
+  "notification_requests.title": "Vyfiltrovaná oznámení",
   "notifications.clear": "Vyčistit oznámení",
   "notifications.clear_confirmation": "Opravdu chcete trvale smazat všechna vaše oznámení?",
   "notifications.column_settings.admin.report": "Nová hlášení:",
   "notifications.column_settings.admin.sign_up": "Nové registrace:",
   "notifications.column_settings.alert": "Oznámení na počítači",
   "notifications.column_settings.favourite": "Oblíbené:",
+  "notifications.column_settings.filter_bar.advanced": "Zobrazit všechny kategorie",
+  "notifications.column_settings.filter_bar.category": "Panel rychlého filtrování",
   "notifications.column_settings.follow": "Noví sledující:",
   "notifications.column_settings.follow_request": "Nové žádosti o sledování:",
   "notifications.column_settings.mention": "Zmínky:",
@@ -499,6 +516,15 @@
   "notifications.permission_denied": "Oznámení na ploše nejsou k dispozici, protože byla zamítnuta žádost o oprávnění je zobrazovat",
   "notifications.permission_denied_alert": "Oznámení na ploše není možné zapnout, protože oprávnění bylo v minulosti zamítnuto",
   "notifications.permission_required": "Oznámení na ploše nejsou k dispozici, protože nebylo uděleno potřebné oprávnění.",
+  "notifications.policy.filter_new_accounts.hint": "Vytvořeno během {days, plural, one {včerejška} few {posledních # dnů} many {posledních # dní} other {posledních # dní}}",
+  "notifications.policy.filter_new_accounts_title": "Nové účty",
+  "notifications.policy.filter_not_followers_hint": "Včetně lidí, kteří vás sledovali méně než {days, plural, one {jeden den} few {# dny} many {# dní} other {# dní}}",
+  "notifications.policy.filter_not_followers_title": "Lidé, kteří vás nesledují",
+  "notifications.policy.filter_not_following_hint": "Dokud je ručně neschválíte",
+  "notifications.policy.filter_not_following_title": "Lidé, které nesledujete",
+  "notifications.policy.filter_private_mentions_hint": "Vyfiltrováno, pokud to není odpověď na vaši zmínku nebo pokud sledujete odesílatele",
+  "notifications.policy.filter_private_mentions_title": "Nevyžádané soukromé zmínky",
+  "notifications.policy.title": "Vyfiltrovat oznámení od…",
   "notifications_permission_banner.enable": "Povolit oznámení na ploše",
   "notifications_permission_banner.how_to_control": "Chcete-li dostávat oznámení, i když nemáte Mastodon otevřený, povolte oznámení na ploše. Můžete si zvolit, o kterých druzích interakcí chcete být oznámením na ploše informování pod tlačítkem {icon} výše.",
   "notifications_permission_banner.title": "Nenechte si nic uniknout",
@@ -675,9 +701,11 @@
   "status.direct": "Soukromě zmínit @{name}",
   "status.direct_indicator": "Soukromá zmínka",
   "status.edit": "Upravit",
+  "status.edited": "Naposledy upraveno {date}",
   "status.edited_x_times": "Upraveno {count, plural, one {{count}krát} few {{count}krát} many {{count}krát} other {{count}krát}}",
   "status.embed": "Vložit na web",
   "status.favourite": "Oblíbit",
+  "status.favourites": "{count, plural, one {oblíbený} few {oblíbené} many {oblíbených} other {oblíbených}}",
   "status.filter": "Filtrovat tento příspěvek",
   "status.filtered": "Filtrováno",
   "status.hide": "Skrýt příspěvek",
@@ -698,6 +726,7 @@
   "status.reblog": "Boostnout",
   "status.reblog_private": "Boostnout s původní viditelností",
   "status.reblogged_by": "Uživatel {name} boostnul",
+  "status.reblogs": "{count, plural, one {boost} few {boosty} many {boostů} other {boostů}}",
   "status.reblogs.empty": "Tento příspěvek ještě nikdo neboostnul. Pokud to někdo udělá, zobrazí se zde.",
   "status.redraft": "Smazat a přepsat",
   "status.remove_bookmark": "Odstranit ze záložek",
diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json
index c43bf858145a39..379aebbb1fd97f 100644
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@@ -297,6 +297,7 @@
   "filter_modal.select_filter.subtitle": "ใช้หมวดหมู่ที่มีอยู่หรือสร้างหมวดหมู่ใหม่",
   "filter_modal.select_filter.title": "กรองโพสต์นี้",
   "filter_modal.title.status": "กรองโพสต์",
+  "filtered_notifications_banner.mentions": "{count, plural, other {การกล่าวถึง}}",
   "filtered_notifications_banner.pending_requests": "การแจ้งเตือนจาก {count, plural, =0 {ไม่มีใคร} other {# คน}} ที่คุณอาจรู้จัก",
   "filtered_notifications_banner.title": "การแจ้งเตือนที่กรองอยู่",
   "firehose.all": "ทั้งหมด",
diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json
index 76739fe314856a..dc07480ef6f6b4 100644
--- a/app/javascript/mastodon/locales/tr.json
+++ b/app/javascript/mastodon/locales/tr.json
@@ -777,10 +777,10 @@
   "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",
-  "upload_modal.analyzing_picture": "Resim analiz ediliyor…",
+  "upload_modal.analyzing_picture": "Görsel analiz ediliyor…",
   "upload_modal.apply": "Uygula",
   "upload_modal.applying": "Uygulanıyor…",
-  "upload_modal.choose_image": "Resim seç",
+  "upload_modal.choose_image": "Görsel seç",
   "upload_modal.description_placeholder": "Pijamalı hasta yağız şoföre çabucak güvendi",
   "upload_modal.detect_text": "Resimdeki metni algıla",
   "upload_modal.edit_media": "Medyayı düzenle",
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 155e4473bf5deb..ab92e106a36cbe 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -1765,9 +1765,9 @@ fi:
   tags:
     does_not_match_previous_name: ei vastaa edellistä nimeä
   themes:
-    contrast: Mastodon (Korkea kontrasti)
-    default: Mastodon (Tumma)
-    mastodon-light: Mastodon (Vaalea)
+    contrast: Mastodon (suuri kontrasti)
+    default: Mastodon (tumma)
+    mastodon-light: Mastodon (vaalea)
     system: Automaattinen (käytä järjestelmän teemaa)
   time:
     formats:
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 5ca0324dcc9ec9..0e90cc723e9546 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -979,7 +979,7 @@ ko:
     new_report:
       body: "%{reporter} 님이 %{target}를 신고했습니다"
       body_remote: "%{domain}의 누군가가 %{target}을 신고했습니다"
-      subject: "%{instance} 에 새 신고 등록됨 (#%{id})"
+      subject: "%{instance}의 새로운 신고(#%{id})"
     new_software_updates:
       body: 새 마스토돈 버전이 릴리스되었습니다. 업데이트 할 수 있습니다!
       subject: "%{instance}에 대해 새 마스토돈 버전이 사용 가능합니다!"
@@ -1118,7 +1118,7 @@ ko:
   date:
     formats:
       default: "%Y-%m-%d"
-      with_month_name: "%Y년 %f월 %e일"
+      with_month_name: "%Y년 %B %d일"
   datetime:
     distance_in_words:
       about_x_hours: "%{count}시간"
@@ -1742,7 +1742,7 @@ ko:
   time:
     formats:
       default: "%Y-%m-%d %H:%M"
-      month: "%Y년 %f월"
+      month: "%Y년 %b"
       time: "%H:%M"
       with_time_zone: "%Y-%m-%d %H:%M %Z"
   translation:
@@ -1896,4 +1896,4 @@ ko:
     not_enabled: 아직 WebAuthn을 활성화 하지 않았습니다.
     not_supported: 이 브라우저는 보안 키를 지원하지 않습니다
     otp_required: 보안 키를 사용하기 위해서는 2단계 인증을 먼저 활성화 해 주세요
-    registered_on: "%{date} 에 등록됨"
+    registered_on: "%{date}에 등록됨"

From f386eb6c6300440cd96e47af4b19481d2ee2f219 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 19 Apr 2024 10:25:14 -0400
Subject: [PATCH 0786/2191] Replace deprecated `dotenv-rails` gem with `dotenv`
 gem (#29173)

---
 Gemfile               | 2 +-
 Gemfile.lock          | 7 ++-----
 config/application.rb | 2 +-
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/Gemfile b/Gemfile
index 3361f2dc3395cd..3f621ddc52c3b7 100644
--- a/Gemfile
+++ b/Gemfile
@@ -12,7 +12,7 @@ gem 'thor', '~> 1.2'
 # For why irb is in the Gemfile, see: https://ruby.social/@st0012/111444685161478182
 gem 'irb', '~> 1.8'
 
-gem 'dotenv-rails', '~> 2.8'
+gem 'dotenv'
 gem 'haml-rails', '~>2.0'
 gem 'pg', '~> 1.5'
 gem 'pghero'
diff --git a/Gemfile.lock b/Gemfile.lock
index 752d4e05e01b55..6e5611b23ec4e1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -220,10 +220,7 @@ GEM
     domain_name (0.6.20240107)
     doorkeeper (5.6.9)
       railties (>= 5)
-    dotenv (2.8.1)
-    dotenv-rails (2.8.1)
-      dotenv (= 2.8.1)
-      railties (>= 3.2)
+    dotenv (3.1.0)
     drb (2.2.1)
     ed25519 (1.3.0)
     elasticsearch (7.13.3)
@@ -848,7 +845,7 @@ DEPENDENCIES
   devise_pam_authenticatable2 (~> 9.2)
   discard (~> 1.2)
   doorkeeper (~> 5.6)
-  dotenv-rails (~> 2.8)
+  dotenv
   ed25519 (~> 1.3)
   email_spec
   fabrication (~> 2.30)
diff --git a/config/application.rb b/config/application.rb
index bab1b46cb0cb7d..a17a48b093bad7 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -52,7 +52,7 @@
 require_relative '../lib/simple_navigation/item_extensions'
 require_relative '../lib/http_extensions'
 
-Dotenv::Railtie.load
+Dotenv::Rails.load
 
 Bundler.require(:pam_authentication) if ENV['PAM_ENABLED'] == 'true'
 

From f5d341382e549c00e40d6f280444de40064d910a Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 19 Apr 2024 15:44:59 -0400
Subject: [PATCH 0787/2191] Add `any_args` to have_enqueued_sidekiq_job call
 (quiets deprecation) (#29999)

---
 spec/services/remove_featured_tag_service_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/services/remove_featured_tag_service_spec.rb b/spec/services/remove_featured_tag_service_spec.rb
index 6cf5388c7feb89..2f0694bc6557a5 100644
--- a/spec/services/remove_featured_tag_service_spec.rb
+++ b/spec/services/remove_featured_tag_service_spec.rb
@@ -29,7 +29,7 @@
           expect { featured_tag.reload }
             .to raise_error(ActiveRecord::RecordNotFound)
           expect(ActivityPub::AccountRawDistributionWorker)
-            .to_not have_enqueued_sidekiq_job
+            .to_not have_enqueued_sidekiq_job(any_args)
         end
       end
     end

From fa5e154ee379b3f84c032b692b1f7bb774a844e9 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 19 Apr 2024 15:45:41 -0400
Subject: [PATCH 0788/2191] Indirect deps gem version bumps (#29998)

---
 Gemfile.lock | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 6e5611b23ec4e1..78fe1faf700296 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -102,8 +102,8 @@ GEM
     attr_required (1.0.2)
     awrence (1.2.1)
     aws-eventstream (1.3.0)
-    aws-partitions (1.914.0)
-    aws-sdk-core (3.192.0)
+    aws-partitions (1.916.0)
+    aws-sdk-core (3.192.1)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.8)
@@ -186,7 +186,7 @@ GEM
       bigdecimal
       rexml
     crass (1.0.6)
-    css_parser (1.16.0)
+    css_parser (1.17.1)
       addressable
     csv (3.3.0)
     database_cleaner-active_record (2.1.0)
@@ -238,7 +238,7 @@ GEM
       mail (~> 2.7)
     encryptor (3.0.0)
     erubi (1.12.0)
-    et-orbi (1.2.10)
+    et-orbi (1.2.11)
       tzinfo
     excon (0.110.0)
     fabrication (2.31.0)
@@ -272,8 +272,8 @@ GEM
     fast_blank (1.0.1)
     fastimage (2.3.1)
     ffi (1.16.3)
-    ffi-compiler (1.0.1)
-      ffi (>= 1.0.0)
+    ffi-compiler (1.3.2)
+      ffi (>= 1.15.5)
       rake
     fog-core (2.4.0)
       builder
@@ -314,7 +314,7 @@ GEM
     hashie (5.0.0)
     hcaptcha (7.1.0)
       json
-    highline (2.1.0)
+    highline (3.0.1)
     hiredis (0.6.3)
     hkdf (0.3.0)
     htmlentities (4.3.4)
@@ -432,11 +432,11 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2024.0305)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.5)
+    mini_portile2 (2.8.6)
     minitest (5.22.3)
     msgpack (1.7.2)
     multi_json (1.15.0)
-    multipart-post (2.3.0)
+    multipart-post (2.4.0)
     mutex_m (0.2.0)
     net-http (0.4.1)
       uri
@@ -450,7 +450,7 @@ GEM
       net-protocol
     net-protocol (0.2.2)
       timeout
-    net-smtp (0.4.0.1)
+    net-smtp (0.5.0)
       net-protocol
     nio4r (2.7.1)
     nokogiri (1.16.4)
@@ -543,7 +543,7 @@ GEM
     rack-protection (3.2.0)
       base64 (>= 0.1.0)
       rack (~> 2.2, >= 2.2.4)
-    rack-proxy (0.7.6)
+    rack-proxy (0.7.7)
       rack
     rack-session (1.0.2)
       rack (< 3)
@@ -589,7 +589,7 @@ GEM
       thor (~> 1.0, >= 1.2.2)
       zeitwerk (~> 2.6)
     rainbow (3.1.1)
-    rake (13.1.0)
+    rake (13.2.1)
     rdf (3.3.1)
       bcp47_spec (~> 0.2)
       link_header (~> 0.0, >= 0.0.8)
@@ -604,9 +604,9 @@ GEM
     redlock (1.3.2)
       redis (>= 3.0.0, < 6.0)
     regexp_parser (2.9.0)
-    reline (0.5.1)
+    reline (0.5.2)
       io-console (~> 0.5)
-    request_store (1.5.1)
+    request_store (1.6.0)
       rack (>= 1.4)
     responders (3.1.1)
       actionpack (>= 5.2)
@@ -673,11 +673,11 @@ GEM
       rubocop-capybara (~> 2.17)
       rubocop-factory_bot (~> 2.22)
       rubocop-rspec_rails (~> 2.28)
-    rubocop-rspec_rails (2.28.2)
+    rubocop-rspec_rails (2.28.3)
       rubocop (~> 1.40)
     ruby-prof (1.7.0)
     ruby-progressbar (1.13.0)
-    ruby-saml (1.15.0)
+    ruby-saml (1.16.0)
       nokogiri (>= 1.13.10)
       rexml
     ruby2_keywords (0.0.5)
@@ -773,7 +773,7 @@ GEM
       unf_ext
     unf_ext (0.0.9.1)
     unicode-display_width (2.5.0)
-    uri (0.12.2)
+    uri (0.13.0)
     validate_email (0.1.6)
       activemodel (>= 3.0)
       mail (>= 2.2.5)

From d24462c81adbf289077f70e6f836b82d3adf5cb4 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 19 Apr 2024 19:46:13 +0000
Subject: [PATCH 0789/2191] Update dependency test-prof to v1.3.3 (#30000)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 78fe1faf700296..aadd52d6419ae2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -744,7 +744,7 @@ GEM
       unicode-display_width (>= 1.1.1, < 3)
     terrapin (1.0.1)
       climate_control
-    test-prof (1.3.2)
+    test-prof (1.3.3)
     thor (1.3.1)
     tilt (2.3.0)
     timeout (0.4.1)

From 8d47ba893a714a52183b57be83eb38bcb7ffef57 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 19 Apr 2024 16:32:26 -0400
Subject: [PATCH 0790/2191] Fix `Style/PercentLiteralDelimiters` cop (#30006)

---
 .rubocop_todo.yml                 | 7 -------
 config/deploy.rb                  | 4 ++--
 config/initializers/doorkeeper.rb | 2 +-
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 9ca7ba6f115738..ac65c1589531c3 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -197,13 +197,6 @@ Style/OptionalBooleanParameter:
     - 'app/workers/unfollow_follow_worker.rb'
     - 'lib/mastodon/redis_config.rb'
 
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: PreferredDelimiters.
-Style/PercentLiteralDelimiters:
-  Exclude:
-    - 'config/deploy.rb'
-    - 'config/initializers/doorkeeper.rb'
-
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: short, verbose
diff --git a/config/deploy.rb b/config/deploy.rb
index 75bfcc26f4a739..28c83877069c08 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -13,8 +13,8 @@
 append :linked_files, '.env.production', 'public/robots.txt'
 append :linked_dirs, 'vendor/bundle', 'node_modules', 'public/system'
 
-SYSTEMD_SERVICES = %i[sidekiq streaming web].freeze
-SERVICE_ACTIONS = %i[reload restart status].freeze
+SYSTEMD_SERVICES = %i(sidekiq streaming web).freeze
+SERVICE_ACTIONS = %i(reload restart status).freeze
 
 namespace :systemd do
   SYSTEMD_SERVICES.each do |service|
diff --git a/config/initializers/doorkeeper.rb b/config/initializers/doorkeeper.rb
index f9d47a205ccd9c..428e4739139a50 100644
--- a/config/initializers/doorkeeper.rb
+++ b/config/initializers/doorkeeper.rb
@@ -150,7 +150,7 @@
   #
   # You can use this option in order to forbid URI's with 'javascript' scheme
   # for example.
-  forbid_redirect_uri { |uri| %w[data vbscript javascript].include?(uri.scheme.to_s.downcase) }
+  forbid_redirect_uri { |uri| %w(data vbscript javascript).include?(uri.scheme.to_s.downcase) }
 
   # Specify what grant flows are enabled in array of Strings. The valid
   # strings and the flows they enable are:

From 933189887bcfa9d84e0d4176446a99002a80ebb8 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 19 Apr 2024 16:33:00 -0400
Subject: [PATCH 0791/2191] Fix `Style/StringLiterals` cop (#30005)

---
 .rubocop_todo.yml                          | 12 ------------
 config/environments/production.rb          |  4 ++--
 config/initializers/backtrace_silencers.rb |  2 +-
 config/initializers/http_client_proxy.rb   |  4 ++--
 config/initializers/rack_attack.rb         |  2 +-
 config/initializers/webauthn.rb            |  2 +-
 config/routes.rb                           |  2 +-
 7 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index ac65c1589531c3..13f7b8c09bc24d 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -241,18 +241,6 @@ Style/StringConcatenation:
   Exclude:
     - 'config/initializers/paperclip.rb'
 
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle, ConsistentQuotesInMultiline.
-# SupportedStyles: single_quotes, double_quotes
-Style/StringLiterals:
-  Exclude:
-    - 'config/environments/production.rb'
-    - 'config/initializers/backtrace_silencers.rb'
-    - 'config/initializers/http_client_proxy.rb'
-    - 'config/initializers/rack_attack.rb'
-    - 'config/initializers/webauthn.rb'
-    - 'config/routes.rb'
-
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyleForMultiline.
 # SupportedStylesForMultiline: comma, consistent_comma, no_comma
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 11da32f18ab275..6587acfb3acb9b 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "active_support/core_ext/integer/time"
+require 'active_support/core_ext/integer/time'
 
 Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
@@ -44,7 +44,7 @@
   config.force_ssl = true
   config.ssl_options = {
     redirect: {
-      exclude: ->(request) { request.path.start_with?('/health') || request.headers["Host"].end_with?('.onion') || request.headers["Host"].end_with?('.i2p') }
+      exclude: ->(request) { request.path.start_with?('/health') || request.headers['Host'].end_with?('.onion') || request.headers['Host'].end_with?('.i2p') }
     }
   }
 
diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb
index 74f30e88755917..d43cc1d2fe8d9b 100644
--- a/config/initializers/backtrace_silencers.rb
+++ b/config/initializers/backtrace_silencers.rb
@@ -7,4 +7,4 @@
 
 # You can also remove all the silencers if you're trying to debug a problem that might stem from framework code
 # by setting BACKTRACE=1 before calling your invocation, like "BACKTRACE=1 ./bin/rails runner 'MyClass.perform'".
-Rails.backtrace_cleaner.remove_silencers! if ENV["BACKTRACE"]
+Rails.backtrace_cleaner.remove_silencers! if ENV['BACKTRACE']
diff --git a/config/initializers/http_client_proxy.rb b/config/initializers/http_client_proxy.rb
index 7332ffb53baed3..93a8d33ff99053 100644
--- a/config/initializers/http_client_proxy.rb
+++ b/config/initializers/http_client_proxy.rb
@@ -7,7 +7,7 @@
     proxy = URI.parse(ENV['http_proxy'])
 
     raise "Unsupported proxy type: #{proxy.scheme}" unless %w(http https).include? proxy.scheme
-    raise "No proxy host" unless proxy.host
+    raise 'No proxy host' unless proxy.host
 
     host = proxy.host
     host = host[1...-1] if host[0] == '[' # for IPv6 address
@@ -24,7 +24,7 @@
     proxy = URI.parse(ENV['http_hidden_proxy'])
 
     raise "Unsupported proxy type: #{proxy.scheme}" unless %w(http https).include? proxy.scheme
-    raise "No proxy host" unless proxy.host
+    raise 'No proxy host' unless proxy.host
 
     host = proxy.host
     host = host[1...-1] if host[0] == '[' # for IPv6 address
diff --git a/config/initializers/rack_attack.rb b/config/initializers/rack_attack.rb
index 429dbd3248f814..fa1bdca5448401 100644
--- a/config/initializers/rack_attack.rb
+++ b/config/initializers/rack_attack.rb
@@ -14,7 +14,7 @@ def authenticated_token
     end
 
     def remote_ip
-      @remote_ip ||= (@env["action_dispatch.remote_ip"] || ip).to_s
+      @remote_ip ||= (@env['action_dispatch.remote_ip'] || ip).to_s
     end
 
     def throttleable_remote_ip
diff --git a/config/initializers/webauthn.rb b/config/initializers/webauthn.rb
index 924ce6d877c4b0..40dfeb831752db 100644
--- a/config/initializers/webauthn.rb
+++ b/config/initializers/webauthn.rb
@@ -6,7 +6,7 @@
   config.origin = "#{Rails.configuration.x.use_https ? 'https' : 'http'}://#{Rails.configuration.x.web_domain}"
 
   # Relying Party name for display purposes
-  config.rp_name = "Mastodon"
+  config.rp_name = 'Mastodon'
 
   # Optionally configure a client timeout hint, in milliseconds.
   # This hint specifies how long the browser should wait for an
diff --git a/config/routes.rb b/config/routes.rb
index d032b5110f6b95..3d3c94096c1662 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -139,7 +139,7 @@ def redirect_with_vary(path)
 
   resource :inbox, only: [:create], module: :activitypub
 
-  get '/:encoded_at(*path)', to: redirect("/@%{path}"), constraints: { encoded_at: /%40/ }
+  get '/:encoded_at(*path)', to: redirect('/@%{path}'), constraints: { encoded_at: /%40/ }
 
   constraints(username: %r{[^@/.]+}) do
     with_options to: 'accounts#show' do

From b6f04aed356e5e588dc4fe9d1e3adf82c2b12994 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 19 Apr 2024 16:35:00 -0400
Subject: [PATCH 0792/2191] Silence warning about requiring
 `rubocop-rspec_rails` (#30002)

---
 .rubocop.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.rubocop.yml b/.rubocop.yml
index e80f3b2938e77c..1b5ce67ee7c480 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -9,6 +9,7 @@ inherit_mode:
 require:
   - rubocop-rails
   - rubocop-rspec
+  - rubocop-rspec_rails
   - rubocop-performance
   - rubocop-capybara
   - ./lib/linter/rubocop_middle_dot

From c7384adc0087cb91d60b0f572aab14420271e608 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 19 Apr 2024 16:37:18 -0400
Subject: [PATCH 0793/2191] Fix `Style/TrailingCommaInArguments` cop (#30003)

---
 .rubocop_todo.yml                | 7 -------
 config/initializers/paperclip.rb | 4 ++--
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 13f7b8c09bc24d..5354c54887d1fe 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -241,13 +241,6 @@ Style/StringConcatenation:
   Exclude:
     - 'config/initializers/paperclip.rb'
 
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyleForMultiline.
-# SupportedStylesForMultiline: comma, consistent_comma, no_comma
-Style/TrailingCommaInArguments:
-  Exclude:
-    - 'config/initializers/paperclip.rb'
-
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyleForMultiline.
 # SupportedStylesForMultiline: comma, consistent_comma, no_comma
diff --git a/config/initializers/paperclip.rb b/config/initializers/paperclip.rb
index a44c2ab8477105..b54fc6cf0c1764 100644
--- a/config/initializers/paperclip.rb
+++ b/config/initializers/paperclip.rb
@@ -73,7 +73,7 @@
   if ENV.has_key?('S3_ENDPOINT')
     Paperclip::Attachment.default_options[:s3_options].merge!(
       endpoint: ENV['S3_ENDPOINT'],
-      force_path_style: ENV['S3_OVERRIDE_PATH_STYLE'] != 'true',
+      force_path_style: ENV['S3_OVERRIDE_PATH_STYLE'] != 'true'
     )
 
     Paperclip::Attachment.default_options[:url] = ':s3_path_url'
@@ -159,7 +159,7 @@ def copy_to_local_file(style, local_dest_path)
   Paperclip::Attachment.default_options.merge!(
     storage: :filesystem,
     path: File.join(ENV.fetch('PAPERCLIP_ROOT_PATH', File.join(':rails_root', 'public', 'system')), ':prefix_path:class', ':attachment', ':id_partition', ':style', ':filename'),
-    url: ENV.fetch('PAPERCLIP_ROOT_URL', '/system') + '/:prefix_url:class/:attachment/:id_partition/:style/:filename',
+    url: ENV.fetch('PAPERCLIP_ROOT_URL', '/system') + '/:prefix_url:class/:attachment/:id_partition/:style/:filename'
   )
 end
 

From 369b2ef0ed666686958cdbf81d52b5173c108e61 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 19 Apr 2024 16:52:01 -0400
Subject: [PATCH 0794/2191] Fix `Style/TrailingCommaInHashLiteral` cop (#30004)

---
 .rubocop_todo.yml                 | 8 --------
 config/environments/production.rb | 4 ++--
 config/environments/test.rb       | 2 +-
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 5354c54887d1fe..0bc9d2831c96c6 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -241,14 +241,6 @@ Style/StringConcatenation:
   Exclude:
     - 'config/initializers/paperclip.rb'
 
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyleForMultiline.
-# SupportedStylesForMultiline: comma, consistent_comma, no_comma
-Style/TrailingCommaInHashLiteral:
-  Exclude:
-    - 'config/environments/production.rb'
-    - 'config/environments/test.rb'
-
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: WordRegex.
 # SupportedStyles: percent, brackets
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 6587acfb3acb9b..49e02b53d396cb 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -44,8 +44,8 @@
   config.force_ssl = true
   config.ssl_options = {
     redirect: {
-      exclude: ->(request) { request.path.start_with?('/health') || request.headers['Host'].end_with?('.onion') || request.headers['Host'].end_with?('.i2p') }
-    }
+      exclude: ->(request) { request.path.start_with?('/health') || request.headers['Host'].end_with?('.onion') || request.headers['Host'].end_with?('.i2p') },
+    },
   }
 
   # Info include generic and useful information about system operation, but avoids logging too much
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 0b2f57fba7c339..13e197338075c6 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -88,7 +88,7 @@
       usernames: Set['pam_user1', 'pam_user2'],
       servicenames: Set['pam_test', 'pam_test_controlled'],
       password: '123456',
-      env: { email: 'pam@example.com' }
+      env: { email: 'pam@example.com' },
     }
 end
 

From 35b517c207a5a5b24d5ac67ed9ad98943dcc3d7f Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 19 Apr 2024 16:53:01 -0400
Subject: [PATCH 0795/2191] Remove remnants of capistrano (#30009)

---
 config/deploy.rb | 35 -----------------------------------
 1 file changed, 35 deletions(-)
 delete mode 100644 config/deploy.rb

diff --git a/config/deploy.rb b/config/deploy.rb
deleted file mode 100644
index 28c83877069c08..00000000000000
--- a/config/deploy.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-# frozen_string_literal: true
-
-lock '3.17.2'
-
-set :repo_url, ENV.fetch('REPO', 'https://github.com/mastodon/mastodon.git')
-set :branch, ENV.fetch('BRANCH', 'main')
-
-set :application, 'mastodon'
-set :rbenv_type, :user
-set :rbenv_ruby, File.read('.ruby-version').strip
-set :migration_role, :app
-
-append :linked_files, '.env.production', 'public/robots.txt'
-append :linked_dirs, 'vendor/bundle', 'node_modules', 'public/system'
-
-SYSTEMD_SERVICES = %i(sidekiq streaming web).freeze
-SERVICE_ACTIONS = %i(reload restart status).freeze
-
-namespace :systemd do
-  SYSTEMD_SERVICES.each do |service|
-    SERVICE_ACTIONS.each do |action|
-      desc "Perform a #{action} on #{service} service"
-      task :"#{service}:#{action}" do
-        on roles(:app) do
-          # runs e.g. "sudo restart mastodon-sidekiq.service"
-          sudo :systemctl, action, "#{fetch(:application)}-#{service}.service"
-        end
-      end
-    end
-  end
-end
-
-after 'deploy:publishing', 'systemd:web:reload'
-after 'deploy:publishing', 'systemd:sidekiq:restart'
-after 'deploy:publishing', 'systemd:streaming:restart'

From c61130af33c92b138ca6b5b54502d2af9c35a760 Mon Sep 17 00:00:00 2001
From: GitHub Actions <noreply@github.com>
Date: Mon, 22 Apr 2024 04:27:38 +0000
Subject: [PATCH 0796/2191] New Crowdin translations

---
 app/javascript/flavours/glitch/locales/de.json    |  2 --
 app/javascript/flavours/glitch/locales/es-AR.json |  6 ++----
 app/javascript/flavours/glitch/locales/es-MX.json | 13 +++++++++++++
 app/javascript/flavours/glitch/locales/es.json    | 13 +++++++++++++
 app/javascript/flavours/glitch/locales/ja.json    |  8 ++++++++
 app/javascript/flavours/glitch/locales/zh-CN.json |  2 --
 app/javascript/flavours/glitch/locales/zh-TW.json |  2 --
 config/locales-glitch/no.yml                      |  2 +-
 config/locales-glitch/simple_form.no.yml          |  2 +-
 9 files changed, 38 insertions(+), 12 deletions(-)

diff --git a/app/javascript/flavours/glitch/locales/de.json b/app/javascript/flavours/glitch/locales/de.json
index 8fcd43aaa95813..caad1ebcfe1ebe 100644
--- a/app/javascript/flavours/glitch/locales/de.json
+++ b/app/javascript/flavours/glitch/locales/de.json
@@ -64,8 +64,6 @@
   "notification_purge.btn_invert": "Auswahl\numkehren",
   "notification_purge.btn_none": "Auswahl\naufheben",
   "notification_purge.start": "Benachrichtigungen-Aufräumen-Modus starten",
-  "notifications.column_settings.filter_bar.advanced": "Zeige alle Kategorien an",
-  "notifications.column_settings.filter_bar.category": "Schnellfilterleiste",
   "notifications.column_settings.filter_bar.show_bar": "Filterleiste anzeigen",
   "notifications.marked_clear": "Ausgewählte Benachrichtigungen entfernen",
   "notifications.marked_clear_confirmation": "Möchtest du wirklich alle auswählten Benachrichtigungen für immer entfernen?",
diff --git a/app/javascript/flavours/glitch/locales/es-AR.json b/app/javascript/flavours/glitch/locales/es-AR.json
index b82c1f384dbed4..95dc7c85a6fdaf 100644
--- a/app/javascript/flavours/glitch/locales/es-AR.json
+++ b/app/javascript/flavours/glitch/locales/es-AR.json
@@ -23,8 +23,8 @@
   "compose.content-type.markdown_meta": "Formatear tus mensajes con Markdown",
   "compose.content-type.plain": "Texto plano",
   "compose.content-type.plain_meta": "Escribir sin formato avanzado",
-  "compose.disable_threaded_mode": "Deshabilitar Modo Hilo",
-  "compose.enable_threaded_mode": "Habilitar Modo Hilo",
+  "compose.disable_threaded_mode": "Deshabilitar modo de hilo",
+  "compose.enable_threaded_mode": "Habilitar modo de hilo",
   "compose_form.sensitive.hide": "{count, plural, one {Marca medios como sensible} other {Marca los medios como sensibles}}",
   "compose_form.sensitive.marked": "{count, plural, one {El medio está marcado como sensible} other {Los medios están marcados como sensibles}}",
   "compose_form.sensitive.unmarked": "{count, plural, one {El medio no está marcado como sensible} other {Los medios no están marcados como sensibles}}",
@@ -64,8 +64,6 @@
   "notification_purge.btn_invert": "Invertir\nselección",
   "notification_purge.btn_none": "Seleccionar\nnada",
   "notification_purge.start": "Entrar en modo de limpieza de notificaciones",
-  "notifications.column_settings.filter_bar.advanced": "Mostrar todas las categorías",
-  "notifications.column_settings.filter_bar.category": "Barra de filtrado rápido",
   "notifications.column_settings.filter_bar.show_bar": "Mostrar barra de filtros",
   "notifications.marked_clear": "Limpiar notificaciones seleccionadas",
   "notifications.marked_clear_confirmation": "¿Deseas borrar permanentemente todas las notificaciones seleccionadas?",
diff --git a/app/javascript/flavours/glitch/locales/es-MX.json b/app/javascript/flavours/glitch/locales/es-MX.json
index d6d2633d350d68..bcd25fe23a61b3 100644
--- a/app/javascript/flavours/glitch/locales/es-MX.json
+++ b/app/javascript/flavours/glitch/locales/es-MX.json
@@ -14,9 +14,17 @@
   "column_subheading.lists": "Listas",
   "column_subheading.navigation": "Navegación",
   "community.column_settings.allow_local_only": "Mostrar sólo toots locales",
+  "compose.attach.doodle": "Dibujar algo",
+  "compose.change_federation": "Cambiar configuración de la federación",
+  "compose.content-type.change": "Cambiar opciones avanzadas de formato",
   "compose.content-type.html": "HTML",
+  "compose.content-type.html_meta": "Formatear tus publicaciones con HTML",
   "compose.content-type.markdown": "Markdown",
+  "compose.content-type.markdown_meta": "Formatear tus publicaciones con Markdown",
   "compose.content-type.plain": "Texto plano",
+  "compose.content-type.plain_meta": "Escribir sin formato avanzado",
+  "compose.disable_threaded_mode": "Deshabilitar modo de hilo",
+  "compose.enable_threaded_mode": "Habilitar modo de hilo",
   "confirmation_modal.do_not_ask_again": "No preguntar por la confirmación de nuevo",
   "confirmations.deprecated_settings.confirm": "Usar las preferencias de Mastodon",
   "confirmations.deprecated_settings.message": "Algunas de las {app_settings} de glitch-soc, específicas para el dispositivo que estás usando han sido reemplazadas en las {preferences} de Mastodon y serán sobreescritas:",
@@ -30,6 +38,10 @@
   "direct.group_by_conversations": "Agrupar por conversación",
   "endorsed_accounts_editor.endorsed_accounts": "Cuentas destacadas",
   "favourite_modal.combo": "Puedes presionar {combo} para omitir esto la próxima vez",
+  "federation.federated.long": "Permitir que esta publicación llegue a otros servidores",
+  "federation.federated.short": "Federado",
+  "federation.local_only.long": "Evitar que esta publicación llegue a otros servidores",
+  "federation.local_only.short": "Solo local",
   "firehose.column_settings.allow_local_only": "Mostrar mensajes solo-locales en \"Todo\"",
   "home.column_settings.advanced": "Avanzado",
   "home.column_settings.filter_regex": "Filtrar por expresiones regulares",
@@ -112,6 +124,7 @@
   "settings.shared_settings_link": "preferencias de usuario",
   "settings.show_action_bar": "Mostrar botones de acción en toots colapsados",
   "settings.show_content_type_choice": "Mostrar selección de tipo de contenido al crear toots",
+  "settings.show_published_toast": "Mostrar mensaje al publicar/guardar una publicación",
   "settings.show_reply_counter": "Mostrar un conteo estimado de respuestas",
   "settings.side_arm": "Botón secundario:",
   "settings.side_arm.none": "Ninguno",
diff --git a/app/javascript/flavours/glitch/locales/es.json b/app/javascript/flavours/glitch/locales/es.json
index d6ebd95231b9eb..b7f768e19e6688 100644
--- a/app/javascript/flavours/glitch/locales/es.json
+++ b/app/javascript/flavours/glitch/locales/es.json
@@ -14,9 +14,17 @@
   "column_subheading.lists": "Listas",
   "column_subheading.navigation": "Navegación",
   "community.column_settings.allow_local_only": "Mostrar toots solo-locales",
+  "compose.attach.doodle": "Dibujar algo",
+  "compose.change_federation": "Cambiar configuración de la federación",
+  "compose.content-type.change": "Cambiar opciones avanzadas de formato",
   "compose.content-type.html": "HTML",
+  "compose.content-type.html_meta": "Formatear tus publicaciones con HTML",
   "compose.content-type.markdown": "Markdown",
+  "compose.content-type.markdown_meta": "Formatear tus publicaciones con Markdown",
   "compose.content-type.plain": "Texto plano",
+  "compose.content-type.plain_meta": "Escribir sin formato avanzado",
+  "compose.disable_threaded_mode": "Deshabilitar modo de hilo",
+  "compose.enable_threaded_mode": "Habilitar modo de hilo",
   "confirmation_modal.do_not_ask_again": "No preguntar por la confirmación de nuevo",
   "confirmations.deprecated_settings.confirm": "Usar las preferencias de Mastodon",
   "confirmations.deprecated_settings.message": "Algunas de las {app_settings} de glitch-soc, específicas para el dispositivo que estás usando han sido reemplazadas en las {preferences} de Mastodon y serán sobreescritas:",
@@ -30,6 +38,10 @@
   "direct.group_by_conversations": "Agrupar por conversación",
   "endorsed_accounts_editor.endorsed_accounts": "Cuentas destacadas",
   "favourite_modal.combo": "Puedes presionar {combo} para omitir esto la próxima vez",
+  "federation.federated.long": "Permitir que esta publicación llegue a otros servidores",
+  "federation.federated.short": "Federado",
+  "federation.local_only.long": "Evitar que esta publicación llegue a otros servidores",
+  "federation.local_only.short": "Solo local",
   "firehose.column_settings.allow_local_only": "Mostrar mensajes solo-locales en \"Todo\"",
   "home.column_settings.advanced": "Avanzado",
   "home.column_settings.filter_regex": "Filtrar por expresiones regulares",
@@ -112,6 +124,7 @@
   "settings.shared_settings_link": "preferencias de usuario",
   "settings.show_action_bar": "Mostrar botones de acción en publicaciones colapsadas",
   "settings.show_content_type_choice": "Mostrar selección de tipo de contenido al crear publicaciones",
+  "settings.show_published_toast": "Mostrar mensaje al publicar/guardar una publicación",
   "settings.show_reply_counter": "Mostrar un conteo estimado de respuestas",
   "settings.side_arm": "Botón secundario:",
   "settings.side_arm.none": "Ninguno",
diff --git a/app/javascript/flavours/glitch/locales/ja.json b/app/javascript/flavours/glitch/locales/ja.json
index 44c8642d1cb63b..a28206d4b4d459 100644
--- a/app/javascript/flavours/glitch/locales/ja.json
+++ b/app/javascript/flavours/glitch/locales/ja.json
@@ -2,6 +2,7 @@
   "about.fork_disclaimer": "Glitch-socはMastodonからフォークされたフリーなオープンソースソフトウェアです。",
   "account.disclaimer_full": "このユーザー情報は不正確な可能性があります。",
   "account.follows": "フォロー",
+  "account.follows_you": "フォローされています",
   "account.suspended_disclaimer_full": "このユーザーはモデレータにより停止されました。",
   "account.view_full_profile": "正確な情報を見る",
   "boost_modal.missing_description": "このトゥートには少なくとも1つの画像に説明が付与されていません",
@@ -14,8 +15,12 @@
   "column_subheading.navigation": "ナビゲーション",
   "community.column_settings.allow_local_only": "ローカル限定投稿を表示する",
   "compose.content-type.html": "HTML",
+  "compose.content-type.html_meta": "投稿に HTML を使用する",
   "compose.content-type.markdown": "マークダウン",
+  "compose.content-type.markdown_meta": "投稿に Markdown を使用する",
   "compose.content-type.plain": "プレーンテキスト",
+  "compose.disable_threaded_mode": "スレッドモードを無効にする",
+  "compose.enable_threaded_mode": "スレッドモードを有効にする",
   "confirmation_modal.do_not_ask_again": "もう１度尋ねない",
   "confirmations.deprecated_settings.confirm": "Mastodonの設定を使用",
   "confirmations.missing_media_description.confirm": "このまま投稿",
@@ -28,6 +33,8 @@
   "direct.group_by_conversations": "会話でグループ化",
   "endorsed_accounts_editor.endorsed_accounts": "紹介しているユーザー",
   "favourite_modal.combo": "次からは {combo} を押せば、これをスキップできます。",
+  "federation.federated.short": "連合",
+  "federation.local_only.short": "ローカル限定",
   "home.column_settings.advanced": "高度",
   "home.column_settings.filter_regex": "正規表現でフィルター",
   "home.column_settings.show_direct": "DMを表示",
@@ -97,6 +104,7 @@
   "settings.rewrite_mentions_acct": "ユーザー名とドメイン名（アカウントがリモートの場合）を表示するように書き換える",
   "settings.rewrite_mentions_no": "書き換えない",
   "settings.rewrite_mentions_username": "ユーザー名を表示するように書き換える",
+  "settings.shared_settings_link": "ユーザー設定",
   "settings.show_action_bar": "アクションバーを表示",
   "settings.show_content_type_choice": "トゥートを書くときコンテンツ形式の選択ボタンを表示する",
   "settings.show_reply_counter": "投稿に対するリプライの数を表示する",
diff --git a/app/javascript/flavours/glitch/locales/zh-CN.json b/app/javascript/flavours/glitch/locales/zh-CN.json
index 9a3dd7f191c3ce..26f142807abd88 100644
--- a/app/javascript/flavours/glitch/locales/zh-CN.json
+++ b/app/javascript/flavours/glitch/locales/zh-CN.json
@@ -64,8 +64,6 @@
   "notification_purge.btn_invert": "反选",
   "notification_purge.btn_none": "取消全选",
   "notification_purge.start": "进入通知清理模式",
-  "notifications.column_settings.filter_bar.advanced": "显示所有类别",
-  "notifications.column_settings.filter_bar.category": "快速筛选栏",
   "notifications.column_settings.filter_bar.show_bar": "显示筛选栏",
   "notifications.marked_clear": "清除选择的通知",
   "notifications.marked_clear_confirmation": "你确定要永久清除所有选择的通知吗？",
diff --git a/app/javascript/flavours/glitch/locales/zh-TW.json b/app/javascript/flavours/glitch/locales/zh-TW.json
index 2dfeed8c5ca3df..2fcb217434afd4 100644
--- a/app/javascript/flavours/glitch/locales/zh-TW.json
+++ b/app/javascript/flavours/glitch/locales/zh-TW.json
@@ -60,8 +60,6 @@
   "notification_purge.btn_invert": "反向選擇",
   "notification_purge.btn_none": "取消選取",
   "notification_purge.start": "進入通知清理模式",
-  "notifications.column_settings.filter_bar.advanced": "顯示所有分類",
-  "notifications.column_settings.filter_bar.category": "快速過濾欄",
   "notifications.column_settings.filter_bar.show_bar": "顯示過濾器",
   "notifications.marked_clear": "清除被選取的通知訊息",
   "notifications.marked_clear_confirmation": "您確定要永久清除所有被選取的通知訊息嗎？",
diff --git a/config/locales-glitch/no.yml b/config/locales-glitch/no.yml
index d36c60a4ac0a92..d2a4697e5dc65e 100644
--- a/config/locales-glitch/no.yml
+++ b/config/locales-glitch/no.yml
@@ -1 +1 @@
-'no':
+no:
diff --git a/config/locales-glitch/simple_form.no.yml b/config/locales-glitch/simple_form.no.yml
index d36c60a4ac0a92..d2a4697e5dc65e 100644
--- a/config/locales-glitch/simple_form.no.yml
+++ b/config/locales-glitch/simple_form.no.yml
@@ -1 +1 @@
-'no':
+no:

From 2ec9bff36e3a7efef501ec796d27cd73cede904c Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 22 Apr 2024 04:04:05 -0400
Subject: [PATCH 0797/2191] Fix Rubocop `Rails/UniqueValidationWithoutIndex`
 cop (#27461)

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
---
 .rubocop_todo.yml                             |  9 ----
 ...o_webauthn_credentials_user_id_nickname.rb | 49 +++++++++++++++++++
 ...d_index_to_account_alias_uri_account_id.rb | 49 +++++++++++++++++++
 ...om_filter_statuses_status_custom_filter.rb | 49 +++++++++++++++++++
 ...59_add_index_to_identities_uid_provider.rb | 49 +++++++++++++++++++
 db/schema.rb                                  |  4 ++
 lib/tasks/tests.rake                          | 39 +++++++++++++++
 7 files changed, 239 insertions(+), 9 deletions(-)
 create mode 100644 db/migrate/20231018192110_add_index_to_webauthn_credentials_user_id_nickname.rb
 create mode 100644 db/migrate/20231018193209_add_index_to_account_alias_uri_account_id.rb
 create mode 100644 db/migrate/20231018193355_add_index_to_custom_filter_statuses_status_custom_filter.rb
 create mode 100644 db/migrate/20231018193659_add_index_to_identities_uid_provider.rb

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 0bc9d2831c96c6..3f2e9aee62e852 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -54,15 +54,6 @@ Rails/OutputSafety:
   Exclude:
     - 'config/initializers/simple_form.rb'
 
-# Configuration parameters: Include.
-# Include: app/models/**/*.rb
-Rails/UniqueValidationWithoutIndex:
-  Exclude:
-    - 'app/models/account_alias.rb'
-    - 'app/models/custom_filter_status.rb'
-    - 'app/models/identity.rb'
-    - 'app/models/webauthn_credential.rb'
-
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: AllowedMethods, AllowedPatterns.
 # AllowedMethods: ==, equal?, eql?
diff --git a/db/migrate/20231018192110_add_index_to_webauthn_credentials_user_id_nickname.rb b/db/migrate/20231018192110_add_index_to_webauthn_credentials_user_id_nickname.rb
new file mode 100644
index 00000000000000..2e608eeade84d3
--- /dev/null
+++ b/db/migrate/20231018192110_add_index_to_webauthn_credentials_user_id_nickname.rb
@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+class AddIndexToWebauthnCredentialsUserIdNickname < ActiveRecord::Migration[7.0]
+  disable_ddl_transaction!
+
+  def up
+    add_index_to_table
+  rescue ActiveRecord::RecordNotUnique
+    remove_duplicates_and_reindex
+  end
+
+  def down
+    remove_index_from_table
+  end
+
+  private
+
+  def remove_duplicates_and_reindex
+    deduplicate_records
+    reindex_records
+  rescue ActiveRecord::RecordNotUnique
+    retry
+  end
+
+  def reindex_records
+    remove_index_from_table
+    add_index_to_table
+  end
+
+  def add_index_to_table
+    add_index :webauthn_credentials, [:user_id, :nickname], unique: true, algorithm: :concurrently
+  end
+
+  def remove_index_from_table
+    remove_index :webauthn_credentials, [:user_id, :nickname]
+  end
+
+  def deduplicate_records
+    safety_assured do
+      execute <<~SQL.squish
+        DELETE FROM webauthn_credentials
+          WHERE id NOT IN (
+          SELECT DISTINCT ON(user_id, nickname) id FROM webauthn_credentials
+          ORDER BY user_id, nickname, id ASC
+        )
+      SQL
+    end
+  end
+end
diff --git a/db/migrate/20231018193209_add_index_to_account_alias_uri_account_id.rb b/db/migrate/20231018193209_add_index_to_account_alias_uri_account_id.rb
new file mode 100644
index 00000000000000..4d9036fdf8e6fa
--- /dev/null
+++ b/db/migrate/20231018193209_add_index_to_account_alias_uri_account_id.rb
@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+class AddIndexToAccountAliasUriAccountId < ActiveRecord::Migration[7.0]
+  disable_ddl_transaction!
+
+  def up
+    add_index_to_table
+  rescue ActiveRecord::RecordNotUnique
+    remove_duplicates_and_reindex
+  end
+
+  def down
+    remove_index_from_table
+  end
+
+  private
+
+  def remove_duplicates_and_reindex
+    deduplicate_records
+    reindex_records
+  rescue ActiveRecord::RecordNotUnique
+    retry
+  end
+
+  def reindex_records
+    remove_index_from_table
+    add_index_to_table
+  end
+
+  def add_index_to_table
+    add_index :account_aliases, [:account_id, :uri], unique: true, algorithm: :concurrently
+  end
+
+  def remove_index_from_table
+    remove_index :account_aliases, [:account_id, :uri]
+  end
+
+  def deduplicate_records
+    safety_assured do
+      execute <<~SQL.squish
+        DELETE FROM account_aliases
+          WHERE id NOT IN (
+          SELECT DISTINCT ON(account_id, uri) id FROM account_aliases
+          ORDER BY account_id, uri, id ASC
+        )
+      SQL
+    end
+  end
+end
diff --git a/db/migrate/20231018193355_add_index_to_custom_filter_statuses_status_custom_filter.rb b/db/migrate/20231018193355_add_index_to_custom_filter_statuses_status_custom_filter.rb
new file mode 100644
index 00000000000000..4a23a8a9431179
--- /dev/null
+++ b/db/migrate/20231018193355_add_index_to_custom_filter_statuses_status_custom_filter.rb
@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+class AddIndexToCustomFilterStatusesStatusCustomFilter < ActiveRecord::Migration[7.0]
+  disable_ddl_transaction!
+
+  def up
+    add_index_to_table
+  rescue ActiveRecord::RecordNotUnique
+    remove_duplicates_and_reindex
+  end
+
+  def down
+    remove_index_from_table
+  end
+
+  private
+
+  def remove_duplicates_and_reindex
+    deduplicate_records
+    reindex_records
+  rescue ActiveRecord::RecordNotUnique
+    retry
+  end
+
+  def reindex_records
+    remove_index_from_table
+    add_index_to_table
+  end
+
+  def add_index_to_table
+    add_index :custom_filter_statuses, [:status_id, :custom_filter_id], unique: true, algorithm: :concurrently
+  end
+
+  def remove_index_from_table
+    remove_index :custom_filter_statuses, [:status_id, :custom_filter_id]
+  end
+
+  def deduplicate_records
+    safety_assured do
+      execute <<~SQL.squish
+        DELETE FROM custom_filter_statuses
+          WHERE id NOT IN (
+          SELECT DISTINCT ON(status_id, custom_filter_id) id FROM custom_filter_statuses
+          ORDER BY status_id, custom_filter_id, id ASC
+        )
+      SQL
+    end
+  end
+end
diff --git a/db/migrate/20231018193659_add_index_to_identities_uid_provider.rb b/db/migrate/20231018193659_add_index_to_identities_uid_provider.rb
new file mode 100644
index 00000000000000..f0ba08b57b434b
--- /dev/null
+++ b/db/migrate/20231018193659_add_index_to_identities_uid_provider.rb
@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+class AddIndexToIdentitiesUidProvider < ActiveRecord::Migration[7.0]
+  disable_ddl_transaction!
+
+  def up
+    add_index_to_table
+  rescue ActiveRecord::RecordNotUnique
+    remove_duplicates_and_reindex
+  end
+
+  def down
+    remove_index_from_table
+  end
+
+  private
+
+  def remove_duplicates_and_reindex
+    deduplicate_records
+    reindex_records
+  rescue ActiveRecord::RecordNotUnique
+    retry
+  end
+
+  def reindex_records
+    remove_index_from_table
+    add_index_to_table
+  end
+
+  def add_index_to_table
+    add_index :identities, [:uid, :provider], unique: true, algorithm: :concurrently
+  end
+
+  def remove_index_from_table
+    remove_index :identities, [:uid, :provider]
+  end
+
+  def deduplicate_records
+    safety_assured do
+      execute <<~SQL.squish
+        DELETE FROM identities
+          WHERE id NOT IN (
+          SELECT DISTINCT ON(uid, provider) id FROM identities
+          ORDER BY uid, provider, id ASC
+        )
+      SQL
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 27c486487d8a22..6a52333a80e2ef 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -20,6 +20,7 @@
     t.string "uri", default: "", null: false
     t.datetime "created_at", precision: nil, null: false
     t.datetime "updated_at", precision: nil, null: false
+    t.index ["account_id", "uri"], name: "index_account_aliases_on_account_id_and_uri", unique: true
     t.index ["account_id"], name: "index_account_aliases_on_account_id"
   end
 
@@ -395,6 +396,7 @@
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.index ["custom_filter_id"], name: "index_custom_filter_statuses_on_custom_filter_id"
+    t.index ["status_id", "custom_filter_id"], name: "index_custom_filter_statuses_on_status_id_and_custom_filter_id", unique: true
     t.index ["status_id"], name: "index_custom_filter_statuses_on_status_id"
   end
 
@@ -545,6 +547,7 @@
     t.datetime "created_at", precision: nil, null: false
     t.datetime "updated_at", precision: nil, null: false
     t.bigint "user_id"
+    t.index ["uid", "provider"], name: "index_identities_on_uid_and_provider", unique: true
     t.index ["user_id"], name: "index_identities_on_user_id"
   end
 
@@ -1235,6 +1238,7 @@
     t.datetime "created_at", precision: nil, null: false
     t.datetime "updated_at", precision: nil, null: false
     t.index ["external_id"], name: "index_webauthn_credentials_on_external_id", unique: true
+    t.index ["user_id", "nickname"], name: "index_webauthn_credentials_on_user_id_and_nickname", unique: true
     t.index ["user_id"], name: "index_webauthn_credentials_on_user_id"
   end
 
diff --git a/lib/tasks/tests.rake b/lib/tasks/tests.rake
index 6afc013eded42d..0caebf92a18115 100644
--- a/lib/tasks/tests.rake
+++ b/lib/tasks/tests.rake
@@ -8,6 +8,7 @@ namespace :tests do
         '2' => 2017_10_10_025614,
         '2_4' => 2018_05_14_140000,
         '2_4_3' => 2018_07_07_154237,
+        '3_3_0' => 2020_12_18_054746,
       }.each do |release, version|
         ActiveRecord::Tasks::DatabaseTasks
           .migration_connection
@@ -111,9 +112,41 @@ namespace :tests do
         exit(1)
       end
 
+      unless Identity.where(provider: 'foo', uid: 0).count == 1
+        puts 'Identities not deduplicated as expected'
+        exit(1)
+      end
+
+      unless WebauthnCredential.where(user_id: 1, nickname: 'foo').count == 1
+        puts 'Webauthn credentials not deduplicated as expected'
+        exit(1)
+      end
+
+      unless AccountAlias.where(account_id: 1, uri: 'https://example.com/users/foobar').count == 1
+        puts 'Account aliases not deduplicated as expected'
+        exit(1)
+      end
+
       puts 'No errors found. Database state is consistent with a successful migration process.'
     end
 
+    desc 'Populate the database with test data for 3.3.0'
+    task populate_v3_3_0: :environment do # rubocop:disable Naming/VariableNumber
+      ActiveRecord::Base.connection.execute(<<~SQL.squish)
+        INSERT INTO "webauthn_credentials"
+          (user_id, nickname, external_id, public_key, created_at, updated_at)
+        VALUES
+          (1, 'foo', 1, 'foo', now(), now()),
+          (1, 'foo', 2, 'bar', now(), now());
+
+        INSERT INTO "account_aliases"
+          (account_id, uri, acct, created_at, updated_at)
+        VALUES
+          (1, 'https://example.com/users/foobar', 'foobar@example.com', now(), now()),
+          (1, 'https://example.com/users/foobar', 'foobar@example.com', now(), now());
+      SQL
+    end
+
     desc 'Populate the database with test data for 2.4.3'
     task populate_v2_4_3: :environment do # rubocop:disable Naming/VariableNumber
       user_key = OpenSSL::PKey::RSA.new(2048)
@@ -189,6 +222,12 @@ namespace :tests do
         VALUES
           (5, 'User', 4, 'default_language', E'--- kmr\n', now(), now()),
           (6, 'User', 1, 'interactions', E'--- !ruby/hash:ActiveSupport::HashWithIndifferentAccess\nmust_be_follower: false\nmust_be_following: true\nmust_be_following_dm: false\n', now(), now());
+
+        INSERT INTO "identities"
+          (provider, uid, user_id, created_at, updated_at)
+        VALUES
+          ('foo', 0, 1, now(), now()),
+          ('foo', 0, 1, now(), now());
       SQL
     end
 

From 223936c2e8237d83fcf403c8dcca80aa201157f0 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 22 Apr 2024 10:13:04 +0200
Subject: [PATCH 0798/2191] Update eslint (non-major) to v7.7.0 (#30026)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 161 ++++++++++++++++++++++++++++--------------------------
 1 file changed, 85 insertions(+), 76 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index c0d1e91b62d410..e0001120af08e7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2154,7 +2154,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@eslint-community/regexpp@npm:^4.5.1, @eslint-community/regexpp@npm:^4.6.1":
+"@eslint-community/regexpp@npm:^4.10.0, @eslint-community/regexpp@npm:^4.6.1":
   version: 4.10.0
   resolution: "@eslint-community/regexpp@npm:4.10.0"
   checksum: 10c0/c5f60ef1f1ea7649fa7af0e80a5a79f64b55a8a8fa5086de4727eb4c86c652aedee407a9c143b8995d2c0b2d75c1222bec9ba5d73dbfc1f314550554f0979ef4
@@ -3619,10 +3619,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/json-schema@npm:*, @types/json-schema@npm:^7.0.12, @types/json-schema@npm:^7.0.5, @types/json-schema@npm:^7.0.8":
-  version: 7.0.14
-  resolution: "@types/json-schema@npm:7.0.14"
-  checksum: 10c0/da68689ccd44cb93ca4c9a4af3b25c6091ecf45fb370d1ed0d0ac5b780e235bf0b9bdc1f7e28f19e6713b22567c3db11fefcbcc6d48ac6b356d035a8f9f4ea30
+"@types/json-schema@npm:*, @types/json-schema@npm:^7.0.12, @types/json-schema@npm:^7.0.15, @types/json-schema@npm:^7.0.5, @types/json-schema@npm:^7.0.8":
+  version: 7.0.15
+  resolution: "@types/json-schema@npm:7.0.15"
+  checksum: 10c0/a996a745e6c5d60292f36731dd41341339d4eeed8180bb09226e5c8d23759067692b1d88e5d91d72ee83dfc00d3aca8e7bd43ea120516c17922cbcb7c3e252db
   languageName: node
   linkType: hard
 
@@ -3897,10 +3897,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/semver@npm:^7.5.0":
-  version: 7.5.4
-  resolution: "@types/semver@npm:7.5.4"
-  checksum: 10c0/dee66a71d9f089c118be74b5937d4fef42864d68d9472a3f4f5399b9e3ad74d56a8e155020c846667b9ecf9de78fdb9ea55a53fff5067af28e06779b282b6c40
+"@types/semver@npm:^7.5.0, @types/semver@npm:^7.5.8":
+  version: 7.5.8
+  resolution: "@types/semver@npm:7.5.8"
+  checksum: 10c0/8663ff927234d1c5fcc04b33062cb2b9fcfbe0f5f351ed26c4d1e1581657deebd506b41ff7fdf89e787e3d33ce05854bc01686379b89e9c49b564c4cfa988efa
   languageName: node
   linkType: hard
 
@@ -4041,45 +4041,45 @@ __metadata:
   linkType: hard
 
 "@typescript-eslint/eslint-plugin@npm:^7.0.0":
-  version: 7.5.0
-  resolution: "@typescript-eslint/eslint-plugin@npm:7.5.0"
-  dependencies:
-    "@eslint-community/regexpp": "npm:^4.5.1"
-    "@typescript-eslint/scope-manager": "npm:7.5.0"
-    "@typescript-eslint/type-utils": "npm:7.5.0"
-    "@typescript-eslint/utils": "npm:7.5.0"
-    "@typescript-eslint/visitor-keys": "npm:7.5.0"
+  version: 7.7.0
+  resolution: "@typescript-eslint/eslint-plugin@npm:7.7.0"
+  dependencies:
+    "@eslint-community/regexpp": "npm:^4.10.0"
+    "@typescript-eslint/scope-manager": "npm:7.7.0"
+    "@typescript-eslint/type-utils": "npm:7.7.0"
+    "@typescript-eslint/utils": "npm:7.7.0"
+    "@typescript-eslint/visitor-keys": "npm:7.7.0"
     debug: "npm:^4.3.4"
     graphemer: "npm:^1.4.0"
-    ignore: "npm:^5.2.4"
+    ignore: "npm:^5.3.1"
     natural-compare: "npm:^1.4.0"
-    semver: "npm:^7.5.4"
-    ts-api-utils: "npm:^1.0.1"
+    semver: "npm:^7.6.0"
+    ts-api-utils: "npm:^1.3.0"
   peerDependencies:
     "@typescript-eslint/parser": ^7.0.0
     eslint: ^8.56.0
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 10c0/932a7b5a09c0138ef5a0bf00f8e6039fa209d4047092ffc187de048543c21f7ce24dc14f25f4c87b6f3bbb62335fc952e259e271fde88baf793217bde6460cfa
+  checksum: 10c0/d1f4c40523d284bce4b8272750c68aae5c0289ddb1c9267dd3477e0bfb8c8855bfb0c6e86dfec9911ca8302ef729d5f4e47d686a566f363b0f89bf7dc7670b5c
   languageName: node
   linkType: hard
 
 "@typescript-eslint/parser@npm:^7.0.0":
-  version: 7.5.0
-  resolution: "@typescript-eslint/parser@npm:7.5.0"
+  version: 7.7.0
+  resolution: "@typescript-eslint/parser@npm:7.7.0"
   dependencies:
-    "@typescript-eslint/scope-manager": "npm:7.5.0"
-    "@typescript-eslint/types": "npm:7.5.0"
-    "@typescript-eslint/typescript-estree": "npm:7.5.0"
-    "@typescript-eslint/visitor-keys": "npm:7.5.0"
+    "@typescript-eslint/scope-manager": "npm:7.7.0"
+    "@typescript-eslint/types": "npm:7.7.0"
+    "@typescript-eslint/typescript-estree": "npm:7.7.0"
+    "@typescript-eslint/visitor-keys": "npm:7.7.0"
     debug: "npm:^4.3.4"
   peerDependencies:
     eslint: ^8.56.0
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 10c0/65521202ff024e79594272fbb7e4731ecf9d2fdd2f58fc81450bfd2bca94ce9c17b0eadd7338c01701f5cf16d38b6c025ed3fc322380b1e4b5424b7484098cda
+  checksum: 10c0/d756c2292737499a93913647af7493aded5dc720a5f4ab6f8e96d6cc81f19cf6a1769a1df0f516f8facd276d34f8464f1711e57b0216082e32eb6b75da81b12e
   languageName: node
   linkType: hard
 
@@ -4093,30 +4093,30 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/scope-manager@npm:7.5.0":
-  version: 7.5.0
-  resolution: "@typescript-eslint/scope-manager@npm:7.5.0"
+"@typescript-eslint/scope-manager@npm:7.7.0":
+  version: 7.7.0
+  resolution: "@typescript-eslint/scope-manager@npm:7.7.0"
   dependencies:
-    "@typescript-eslint/types": "npm:7.5.0"
-    "@typescript-eslint/visitor-keys": "npm:7.5.0"
-  checksum: 10c0/a017b151a6b39ef591f8e2e65598e005e1b4b2d5494e4b91bddb5856b3a4d57dd8a58d2bc7a140e627eb574f93a2c8fe55f1307aa264c928ffd31d9e190bc5dd
+    "@typescript-eslint/types": "npm:7.7.0"
+    "@typescript-eslint/visitor-keys": "npm:7.7.0"
+  checksum: 10c0/014a3631c12bfbd5e33146a48e4b9eb5cc1c5c95bb458de33f8847eed33c04d7b9e66283971e48297673c4b92c3239d67e6dc3717efbe5836e0269a538c13d2e
   languageName: node
   linkType: hard
 
-"@typescript-eslint/type-utils@npm:7.5.0":
-  version: 7.5.0
-  resolution: "@typescript-eslint/type-utils@npm:7.5.0"
+"@typescript-eslint/type-utils@npm:7.7.0":
+  version: 7.7.0
+  resolution: "@typescript-eslint/type-utils@npm:7.7.0"
   dependencies:
-    "@typescript-eslint/typescript-estree": "npm:7.5.0"
-    "@typescript-eslint/utils": "npm:7.5.0"
+    "@typescript-eslint/typescript-estree": "npm:7.7.0"
+    "@typescript-eslint/utils": "npm:7.7.0"
     debug: "npm:^4.3.4"
-    ts-api-utils: "npm:^1.0.1"
+    ts-api-utils: "npm:^1.3.0"
   peerDependencies:
     eslint: ^8.56.0
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 10c0/12915d4d1872638f5281e222a0d191676c478f250699c84864862e95a59e708222acefbf7ffdafc0872a007261219a3a2b1e667ff45eeafea7c4bcc5b955262c
+  checksum: 10c0/064c28d4087a97fd175e07e02c0a9cf4526f61cc6a17b4199fba626932979210037643a30f868bda8174fad567a8ac6aed34120631d1ecfd502e0ea1e830f9e9
   languageName: node
   linkType: hard
 
@@ -4127,10 +4127,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/types@npm:7.5.0":
-  version: 7.5.0
-  resolution: "@typescript-eslint/types@npm:7.5.0"
-  checksum: 10c0/f3394f71f422dbd89f63b230f20e9769c12e47a287ff30ca03a80714e57ea21279b6f12a8ab14bafb00b59926f20a88894b2d1e72679f7ff298bae112679d4b3
+"@typescript-eslint/types@npm:7.7.0":
+  version: 7.7.0
+  resolution: "@typescript-eslint/types@npm:7.7.0"
+  checksum: 10c0/eb50793650c9a911c73586150807912e7b7a0ae12eeb26c7a322ac8ebb8edef15960cc9a4b7049dbb89b82500079963145f67d15583f5de270fe8290974db533
   languageName: node
   linkType: hard
 
@@ -4153,39 +4153,39 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/typescript-estree@npm:7.5.0":
-  version: 7.5.0
-  resolution: "@typescript-eslint/typescript-estree@npm:7.5.0"
+"@typescript-eslint/typescript-estree@npm:7.7.0":
+  version: 7.7.0
+  resolution: "@typescript-eslint/typescript-estree@npm:7.7.0"
   dependencies:
-    "@typescript-eslint/types": "npm:7.5.0"
-    "@typescript-eslint/visitor-keys": "npm:7.5.0"
+    "@typescript-eslint/types": "npm:7.7.0"
+    "@typescript-eslint/visitor-keys": "npm:7.7.0"
     debug: "npm:^4.3.4"
     globby: "npm:^11.1.0"
     is-glob: "npm:^4.0.3"
-    minimatch: "npm:9.0.3"
-    semver: "npm:^7.5.4"
-    ts-api-utils: "npm:^1.0.1"
+    minimatch: "npm:^9.0.4"
+    semver: "npm:^7.6.0"
+    ts-api-utils: "npm:^1.3.0"
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 10c0/ea3a270c725d6be273188b86110e0393052cd64d1c54a56eb5ea405e6d3fbbe84fb3b1ce1b8496a4078ac1eefd37aedcf12be91876764f6de31d5aa5131c7bcd
+  checksum: 10c0/19da9bf0948c9800fde19c5a408a80a3a4cf357ff67d47b516df5d2a05701a4fdd2b9ab5b692866bd84bfc17cea9132d1575a1423e01763a4c2918b5d77d0b34
   languageName: node
   linkType: hard
 
-"@typescript-eslint/utils@npm:7.5.0":
-  version: 7.5.0
-  resolution: "@typescript-eslint/utils@npm:7.5.0"
+"@typescript-eslint/utils@npm:7.7.0":
+  version: 7.7.0
+  resolution: "@typescript-eslint/utils@npm:7.7.0"
   dependencies:
     "@eslint-community/eslint-utils": "npm:^4.4.0"
-    "@types/json-schema": "npm:^7.0.12"
-    "@types/semver": "npm:^7.5.0"
-    "@typescript-eslint/scope-manager": "npm:7.5.0"
-    "@typescript-eslint/types": "npm:7.5.0"
-    "@typescript-eslint/typescript-estree": "npm:7.5.0"
-    semver: "npm:^7.5.4"
+    "@types/json-schema": "npm:^7.0.15"
+    "@types/semver": "npm:^7.5.8"
+    "@typescript-eslint/scope-manager": "npm:7.7.0"
+    "@typescript-eslint/types": "npm:7.7.0"
+    "@typescript-eslint/typescript-estree": "npm:7.7.0"
+    semver: "npm:^7.6.0"
   peerDependencies:
     eslint: ^8.56.0
-  checksum: 10c0/c815ed6909769648953d6963c069038f7cac0c979051b25718feb30e0d3337b9647b75b8de00ac03fe960f0cc8dc4e8a81d4aac4719090a99785e0068712bd24
+  checksum: 10c0/c5f18ce198b420bdc201fd4278b4fa97bfe86178db565f3c4e1991bb452c9ea0b657e7980572555e2ec2fe218d07c42c794d217b9369903019cf784eea7e2164
   languageName: node
   linkType: hard
 
@@ -4216,13 +4216,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/visitor-keys@npm:7.5.0":
-  version: 7.5.0
-  resolution: "@typescript-eslint/visitor-keys@npm:7.5.0"
+"@typescript-eslint/visitor-keys@npm:7.7.0":
+  version: 7.7.0
+  resolution: "@typescript-eslint/visitor-keys@npm:7.7.0"
   dependencies:
-    "@typescript-eslint/types": "npm:7.5.0"
-    eslint-visitor-keys: "npm:^3.4.1"
-  checksum: 10c0/eecf02b8dd54e83738a143aca87b902af4b357028a90fd34ed7a2f40a3ae2f6a188b9ba53903f23c80e868f1fffbb039e9ddb63525438d659707cc7bfb269317
+    "@typescript-eslint/types": "npm:7.7.0"
+    eslint-visitor-keys: "npm:^3.4.3"
+  checksum: 10c0/0f3b9720a962c04462a75d4872714c07320c8f672841881ada797ae960f9f6bd0e5f7494178917034f42635ef76f0f09fa3c8d4bd84f31ec58ee968fe75bada7
   languageName: node
   linkType: hard
 
@@ -9397,7 +9397,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ignore@npm:^5.2.0, ignore@npm:^5.2.4, ignore@npm:^5.3.1":
+"ignore@npm:^5.2.0, ignore@npm:^5.3.1":
   version: 5.3.1
   resolution: "ignore@npm:5.3.1"
   checksum: 10c0/703f7f45ffb2a27fb2c5a8db0c32e7dee66b33a225d28e8db4e1be6474795f606686a6e3bcc50e1aa12f2042db4c9d4a7d60af3250511de74620fbed052ea4cd
@@ -11761,7 +11761,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"minimatch@npm:9.0.3, minimatch@npm:^9.0.1":
+"minimatch@npm:9.0.3":
   version: 9.0.3
   resolution: "minimatch@npm:9.0.3"
   dependencies:
@@ -11788,6 +11788,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"minimatch@npm:^9.0.1, minimatch@npm:^9.0.4":
+  version: 9.0.4
+  resolution: "minimatch@npm:9.0.4"
+  dependencies:
+    brace-expansion: "npm:^2.0.1"
+  checksum: 10c0/2c16f21f50e64922864e560ff97c587d15fd491f65d92a677a344e970fe62aafdbeafe648965fa96d33c061b4d0eabfe0213466203dd793367e7f28658cf6414
+  languageName: node
+  linkType: hard
+
 "minimist@npm:^1.2.0, minimist@npm:^1.2.6":
   version: 1.2.8
   resolution: "minimist@npm:1.2.8"
@@ -16861,12 +16870,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ts-api-utils@npm:^1.0.1":
-  version: 1.0.3
-  resolution: "ts-api-utils@npm:1.0.3"
+"ts-api-utils@npm:^1.0.1, ts-api-utils@npm:^1.3.0":
+  version: 1.3.0
+  resolution: "ts-api-utils@npm:1.3.0"
   peerDependencies:
     typescript: ">=4.2.0"
-  checksum: 10c0/9408338819c3aca2a709f0bc54e3f874227901506cacb1163612a6c8a43df224174feb965a5eafdae16f66fc68fd7bfee8d3275d0fa73fbb8699e03ed26520c9
+  checksum: 10c0/f54a0ba9ed56ce66baea90a3fa087a484002e807f28a8ccb2d070c75e76bde64bd0f6dce98b3802834156306050871b67eec325cb4e918015a360a3f0868c77c
   languageName: node
   linkType: hard
 

From 88f946890d29cd78dd71e4bd17a13da93d9e92ee Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 22 Apr 2024 10:13:28 +0200
Subject: [PATCH 0799/2191] Update peter-evans/create-pull-request action to
 v6.0.4 (#30025)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .github/workflows/crowdin-download.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/crowdin-download.yml b/.github/workflows/crowdin-download.yml
index 14b0542d7ea3b6..256dcffc77fe0a 100644
--- a/.github/workflows/crowdin-download.yml
+++ b/.github/workflows/crowdin-download.yml
@@ -52,7 +52,7 @@ jobs:
 
       # Create or update the pull request
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v6.0.3
+        uses: peter-evans/create-pull-request@v6.0.4
         with:
           commit-message: 'New Crowdin translations'
           title: 'New Crowdin Translations (automated)'

From 3e21af3e4aecef9298c0e2392750b2d005f75c0a Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 22 Apr 2024 08:14:09 +0000
Subject: [PATCH 0800/2191] Update dependency @types/react to v18.2.79 (#30024)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index e0001120af08e7..1f5a3275b072d1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3862,12 +3862,12 @@ __metadata:
   linkType: hard
 
 "@types/react@npm:*, @types/react@npm:16 || 17 || 18, @types/react@npm:>=16.9.11, @types/react@npm:^18.2.7":
-  version: 18.2.78
-  resolution: "@types/react@npm:18.2.78"
+  version: 18.2.79
+  resolution: "@types/react@npm:18.2.79"
   dependencies:
     "@types/prop-types": "npm:*"
     csstype: "npm:^3.0.2"
-  checksum: 10c0/5eb8e1dd98c29aeddf40b90f466d1a9ce83b113d42a096633d632b834e7ae9821f24ba7999928de9d98cca37764532a7ea35355a8103a377d8baa750f1841b5c
+  checksum: 10c0/c8a8a005d8830a48cc1ef93c3510c4935a2a03e5557dbecaa8f1038450cbfcb18eb206fa7fba7077d54b8da21faeb25577e897a333392770a7797f625b62c78a
   languageName: node
   linkType: hard
 

From 24e67c4394bc545fc4b3e9bc4c3b87b0d98f36ee Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 22 Apr 2024 10:24:08 +0200
Subject: [PATCH 0801/2191] Update dependency postcss-preset-env to v9.5.8
 (#30018)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 164 +++++++++++++++++++++++++++---------------------------
 1 file changed, 82 insertions(+), 82 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 1f5a3275b072d1..e6e130e2d6b815 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1561,10 +1561,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/color-helpers@npm:^4.1.0":
-  version: 4.1.0
-  resolution: "@csstools/color-helpers@npm:4.1.0"
-  checksum: 10c0/0e41fd04dd28361717b161e7000c3a3b64b8b01119e93758297ea0b8a87c04121c3e3ef02e29c56fdd133227dd879163aa4b52e2370853d9fe64af6b6821668d
+"@csstools/color-helpers@npm:^4.2.0":
+  version: 4.2.0
+  resolution: "@csstools/color-helpers@npm:4.2.0"
+  checksum: 10c0/3f1feac43c2ef35f38b3b06fe74e0acc130283d7efb6874f6624e45e178c1a7b3c7e39816c7421cddbffc2666430906aa6f0d3dd7c7209db1369c0afd4a29b1b
   languageName: node
   linkType: hard
 
@@ -1578,16 +1578,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/css-color-parser@npm:^1.6.3":
-  version: 1.6.3
-  resolution: "@csstools/css-color-parser@npm:1.6.3"
+"@csstools/css-color-parser@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "@csstools/css-color-parser@npm:2.0.0"
   dependencies:
-    "@csstools/color-helpers": "npm:^4.1.0"
+    "@csstools/color-helpers": "npm:^4.2.0"
     "@csstools/css-calc": "npm:^1.2.0"
   peerDependencies:
     "@csstools/css-parser-algorithms": ^2.6.1
     "@csstools/css-tokenizer": ^2.2.4
-  checksum: 10c0/3b15d9974105fe6e5d5e839953ee06153bc308bd62feacdeb88b7da7486ef1625254d0df908c68654596e477ca6be0c312d0c02a62d6dc4bddee61821be17d27
+  checksum: 10c0/295f844a194dec4f51439e8760dbb4a142901b8b60cd9d676a62c15c0e8408eb7bcdcbb40be52cdd5f67d020e655a1c3267a28923cfc4f6bae2b74aa48fce426
   languageName: node
   linkType: hard
 
@@ -1629,33 +1629,33 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-color-function@npm:^3.0.13":
-  version: 3.0.13
-  resolution: "@csstools/postcss-color-function@npm:3.0.13"
+"@csstools/postcss-color-function@npm:^3.0.14":
+  version: 3.0.14
+  resolution: "@csstools/postcss-color-function@npm:3.0.14"
   dependencies:
-    "@csstools/css-color-parser": "npm:^1.6.3"
+    "@csstools/css-color-parser": "npm:^2.0.0"
     "@csstools/css-parser-algorithms": "npm:^2.6.1"
     "@csstools/css-tokenizer": "npm:^2.2.4"
     "@csstools/postcss-progressive-custom-properties": "npm:^3.2.0"
     "@csstools/utilities": "npm:^1.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/9d0fa25cd258653ad3227ccf1ee89dfee7099284c28b1d9ae7f7e8b15ed526e4e8cc7724f8e21cc073ed186891c3acb5b9c190a75e3c38d9c75e49197a824db6
+  checksum: 10c0/81592b0eb3ad7022313ecafd028908b167de42acc6765f708c9b10631f86123c2b803aca27378f021c2b3dab8cc47770c0364fe5a3c1e18ec006deaf72e17c38
   languageName: node
   linkType: hard
 
-"@csstools/postcss-color-mix-function@npm:^2.0.13":
-  version: 2.0.13
-  resolution: "@csstools/postcss-color-mix-function@npm:2.0.13"
+"@csstools/postcss-color-mix-function@npm:^2.0.14":
+  version: 2.0.14
+  resolution: "@csstools/postcss-color-mix-function@npm:2.0.14"
   dependencies:
-    "@csstools/css-color-parser": "npm:^1.6.3"
+    "@csstools/css-color-parser": "npm:^2.0.0"
     "@csstools/css-parser-algorithms": "npm:^2.6.1"
     "@csstools/css-tokenizer": "npm:^2.2.4"
     "@csstools/postcss-progressive-custom-properties": "npm:^3.2.0"
     "@csstools/utilities": "npm:^1.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/6011ce0b328cd3ee1d5720dc6eb23da807ba5a218a4a3c65a4844a82c0ff37e69d27cbee14abf9b928a3068f429ab86f2dd2bebab4ab64cd8fc7e39e562d7073
+  checksum: 10c0/1dd3c63bbbbb9d3094699f169bbb9d26e86a49accb5f9abaa2441b54cb8a6f4cd332409666684a275eca867e3ef0ea3f6eafdf9fb87f2cbfa17c6296fb1ed4d7
   languageName: node
   linkType: hard
 
@@ -1684,46 +1684,46 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-gamut-mapping@npm:^1.0.6":
-  version: 1.0.6
-  resolution: "@csstools/postcss-gamut-mapping@npm:1.0.6"
+"@csstools/postcss-gamut-mapping@npm:^1.0.7":
+  version: 1.0.7
+  resolution: "@csstools/postcss-gamut-mapping@npm:1.0.7"
   dependencies:
-    "@csstools/css-color-parser": "npm:^1.6.3"
+    "@csstools/css-color-parser": "npm:^2.0.0"
     "@csstools/css-parser-algorithms": "npm:^2.6.1"
     "@csstools/css-tokenizer": "npm:^2.2.4"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/a258a2ceac9d9be4374ec5b504895bd1de1196fe7d8c1377863a25c6cb50ee1fb1c65387c5440bae3c5d59e6ebf4e0c1990595c5cd09291224b31a1d23bdc250
+  checksum: 10c0/7b349db44fcd697d57172ab63b7a02a56c0b49bce17e48cb72aa0fa246bd2be83fe693c507fd400a9ed83597a711d18ece9319ee3af8000c8fd3a2761e228a11
   languageName: node
   linkType: hard
 
-"@csstools/postcss-gradients-interpolation-method@npm:^4.0.14":
-  version: 4.0.14
-  resolution: "@csstools/postcss-gradients-interpolation-method@npm:4.0.14"
+"@csstools/postcss-gradients-interpolation-method@npm:^4.0.15":
+  version: 4.0.15
+  resolution: "@csstools/postcss-gradients-interpolation-method@npm:4.0.15"
   dependencies:
-    "@csstools/css-color-parser": "npm:^1.6.3"
+    "@csstools/css-color-parser": "npm:^2.0.0"
     "@csstools/css-parser-algorithms": "npm:^2.6.1"
     "@csstools/css-tokenizer": "npm:^2.2.4"
     "@csstools/postcss-progressive-custom-properties": "npm:^3.2.0"
     "@csstools/utilities": "npm:^1.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/88147b2d7067b9bc6c90340c0be8450ca1175a7e927ff7b682c26d377237bec12f1cbe0dd930dd72dec661603348d1e71ca2a56f0a3b6fa2ca7d3f1b962f001d
+  checksum: 10c0/dc0bbf6a4787d5ad3f9fe268dfa9776ecdc25b6cc0a49486bf53238341a339647f1e475240ead3cec1f4af9a237f6518ace015103e90ce8afe4d44539a566e04
   languageName: node
   linkType: hard
 
-"@csstools/postcss-hwb-function@npm:^3.0.12":
-  version: 3.0.12
-  resolution: "@csstools/postcss-hwb-function@npm:3.0.12"
+"@csstools/postcss-hwb-function@npm:^3.0.13":
+  version: 3.0.13
+  resolution: "@csstools/postcss-hwb-function@npm:3.0.13"
   dependencies:
-    "@csstools/css-color-parser": "npm:^1.6.3"
+    "@csstools/css-color-parser": "npm:^2.0.0"
     "@csstools/css-parser-algorithms": "npm:^2.6.1"
     "@csstools/css-tokenizer": "npm:^2.2.4"
     "@csstools/postcss-progressive-custom-properties": "npm:^3.2.0"
     "@csstools/utilities": "npm:^1.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/20e0b2a4547fe619f38fe56c33974750d4a8b64a67a4169740ee0e67a9dec9f3a243f2370408901aacc35690aa36135028fafbbc866ff934b66cc4c9e4e89cac
+  checksum: 10c0/684c3d408ceb027e7276c4f25c9a17ef9bd52f0948268cf58b5184097e9b71f5364a41b42bab44691938c6fadffcba0c8e66f809a339a8b282f4a432d32d00ef
   languageName: node
   linkType: hard
 
@@ -1875,18 +1875,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-oklab-function@npm:^3.0.13":
-  version: 3.0.13
-  resolution: "@csstools/postcss-oklab-function@npm:3.0.13"
+"@csstools/postcss-oklab-function@npm:^3.0.14":
+  version: 3.0.14
+  resolution: "@csstools/postcss-oklab-function@npm:3.0.14"
   dependencies:
-    "@csstools/css-color-parser": "npm:^1.6.3"
+    "@csstools/css-color-parser": "npm:^2.0.0"
     "@csstools/css-parser-algorithms": "npm:^2.6.1"
     "@csstools/css-tokenizer": "npm:^2.2.4"
     "@csstools/postcss-progressive-custom-properties": "npm:^3.2.0"
     "@csstools/utilities": "npm:^1.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/26915f65ccc8b631a08542c4b088f9e5155f95a6c1f3a6bd2a33207f96d33438b930de60f493a5bbfee1b9f2abc8dfcab3ecbf20b5c7445d729fc434234fb046
+  checksum: 10c0/dfe0b12c2256dded995c64825fac9507be9c747d776cfa09eeefff6dee0efa5eed6a92a1ecba39069a751a7fc3cefa8891c34209a7a3c7ea33d356c95d01a02d
   languageName: node
   linkType: hard
 
@@ -1901,18 +1901,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-relative-color-syntax@npm:^2.0.13":
-  version: 2.0.13
-  resolution: "@csstools/postcss-relative-color-syntax@npm:2.0.13"
+"@csstools/postcss-relative-color-syntax@npm:^2.0.14":
+  version: 2.0.14
+  resolution: "@csstools/postcss-relative-color-syntax@npm:2.0.14"
   dependencies:
-    "@csstools/css-color-parser": "npm:^1.6.3"
+    "@csstools/css-color-parser": "npm:^2.0.0"
     "@csstools/css-parser-algorithms": "npm:^2.6.1"
     "@csstools/css-tokenizer": "npm:^2.2.4"
     "@csstools/postcss-progressive-custom-properties": "npm:^3.2.0"
     "@csstools/utilities": "npm:^1.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/5c9fdec029e3d9a5c688d2e04995fec0cf6d91b48dbc5f450cf9c9dbb45e2819afbd63b3279676087a13f54914b0ec7d005e478b70b43e94fc8eeef9c5973390
+  checksum: 10c0/64cd5f8054e4403f4e25ed11a5b9d157098af639dbc30ac25b94660b3af489c0bacc49fc439cba1ccceefa4caa5831a913e3d1d889a9796cc6fbf3902c7c31c1
   languageName: node
   linkType: hard
 
@@ -1940,15 +1940,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-text-decoration-shorthand@npm:^3.0.5":
-  version: 3.0.5
-  resolution: "@csstools/postcss-text-decoration-shorthand@npm:3.0.5"
+"@csstools/postcss-text-decoration-shorthand@npm:^3.0.6":
+  version: 3.0.6
+  resolution: "@csstools/postcss-text-decoration-shorthand@npm:3.0.6"
   dependencies:
-    "@csstools/color-helpers": "npm:^4.1.0"
+    "@csstools/color-helpers": "npm:^4.2.0"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/e7e08c643c7084e60c0b22982e00ce21c579af3810ebbebac6838801b2ac622026ce96fd0cbca785613b1559f2337833cfc0f525685f8543ee39078a32fd7f89
+  checksum: 10c0/5abdc4fad1c3f15e9d47c7af3995dec9cdf4e6f87c5857eb2e149764779b8389f4f4b21d11e6f2509c57c554a0dc5c11f68f212acd04bbc47defa15911ac3eb9
   languageName: node
   linkType: hard
 
@@ -13078,18 +13078,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-color-functional-notation@npm:^6.0.8":
-  version: 6.0.8
-  resolution: "postcss-color-functional-notation@npm:6.0.8"
+"postcss-color-functional-notation@npm:^6.0.9":
+  version: 6.0.9
+  resolution: "postcss-color-functional-notation@npm:6.0.9"
   dependencies:
-    "@csstools/css-color-parser": "npm:^1.6.3"
+    "@csstools/css-color-parser": "npm:^2.0.0"
     "@csstools/css-parser-algorithms": "npm:^2.6.1"
     "@csstools/css-tokenizer": "npm:^2.2.4"
     "@csstools/postcss-progressive-custom-properties": "npm:^3.2.0"
     "@csstools/utilities": "npm:^1.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/ae2ff7769970fb403ea71d5613e041d97bb647cfc54e4a428bcc75f98ff06c888b064384df12b18f609bfcc4395c31d6db4ad2b9c9385a829ba594d2692c31d1
+  checksum: 10c0/120f7bc23bf46dd1c008b3aa806fb02dd988ae180f9c0c10dca9f5ea3473bf20d7743aafae1441df5b4a3945a63ebb0dae1d4d55f7c8bcd34540529b627c4e3e
   languageName: node
   linkType: hard
 
@@ -13298,18 +13298,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-lab-function@npm:^6.0.13":
-  version: 6.0.13
-  resolution: "postcss-lab-function@npm:6.0.13"
+"postcss-lab-function@npm:^6.0.14":
+  version: 6.0.14
+  resolution: "postcss-lab-function@npm:6.0.14"
   dependencies:
-    "@csstools/css-color-parser": "npm:^1.6.3"
+    "@csstools/css-color-parser": "npm:^2.0.0"
     "@csstools/css-parser-algorithms": "npm:^2.6.1"
     "@csstools/css-tokenizer": "npm:^2.2.4"
     "@csstools/postcss-progressive-custom-properties": "npm:^3.2.0"
     "@csstools/utilities": "npm:^1.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/3ffb82d0012e49df49b44f38a131f4b13ba3edeeca5ecc0062c1c1b6bd8961c06f05b1dd8ec620c50c2c406fc61a505d79488745185d69ed325603600f0a1bc8
+  checksum: 10c0/0b5d998ddb98ec6243448f1eca216f6e23872431885b152843feef1e844fc5b6b3ebe16ea8940f3d6abea732aa0c51b2ec0e57437e4326e5b2cb2bcb949e6d9f
   languageName: node
   linkType: hard
 
@@ -13465,16 +13465,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-nesting@npm:^12.1.1":
-  version: 12.1.1
-  resolution: "postcss-nesting@npm:12.1.1"
+"postcss-nesting@npm:^12.1.2":
+  version: 12.1.2
+  resolution: "postcss-nesting@npm:12.1.2"
   dependencies:
     "@csstools/selector-resolve-nested": "npm:^1.1.0"
     "@csstools/selector-specificity": "npm:^3.0.3"
     postcss-selector-parser: "npm:^6.0.13"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/8fac718e69ee2ac93179cc59810a8184581c04715fe34621ec5d504fc680cad4a11219ed0c918cbe15c468994c9aba88e729f35eef698c5d44cadd824425c47d
+  checksum: 10c0/39d1d100f61863f904393b17169be83cdf82bd50d530efb3e3ae0c7b0f838b254e10e5d12e25119cf31dce9e351a2b770a03f9b2029ff33bef0ec924c0d2f642
   languageName: node
   linkType: hard
 
@@ -13629,17 +13629,17 @@ __metadata:
   linkType: hard
 
 "postcss-preset-env@npm:^9.5.2":
-  version: 9.5.6
-  resolution: "postcss-preset-env@npm:9.5.6"
+  version: 9.5.8
+  resolution: "postcss-preset-env@npm:9.5.8"
   dependencies:
     "@csstools/postcss-cascade-layers": "npm:^4.0.4"
-    "@csstools/postcss-color-function": "npm:^3.0.13"
-    "@csstools/postcss-color-mix-function": "npm:^2.0.13"
+    "@csstools/postcss-color-function": "npm:^3.0.14"
+    "@csstools/postcss-color-mix-function": "npm:^2.0.14"
     "@csstools/postcss-exponential-functions": "npm:^1.0.5"
     "@csstools/postcss-font-format-keywords": "npm:^3.0.2"
-    "@csstools/postcss-gamut-mapping": "npm:^1.0.6"
-    "@csstools/postcss-gradients-interpolation-method": "npm:^4.0.14"
-    "@csstools/postcss-hwb-function": "npm:^3.0.12"
+    "@csstools/postcss-gamut-mapping": "npm:^1.0.7"
+    "@csstools/postcss-gradients-interpolation-method": "npm:^4.0.15"
+    "@csstools/postcss-hwb-function": "npm:^3.0.13"
     "@csstools/postcss-ic-unit": "npm:^3.0.6"
     "@csstools/postcss-initial": "npm:^1.0.1"
     "@csstools/postcss-is-pseudo-class": "npm:^4.0.6"
@@ -13653,12 +13653,12 @@ __metadata:
     "@csstools/postcss-media-queries-aspect-ratio-number-values": "npm:^2.0.7"
     "@csstools/postcss-nested-calc": "npm:^3.0.2"
     "@csstools/postcss-normalize-display-values": "npm:^3.0.2"
-    "@csstools/postcss-oklab-function": "npm:^3.0.13"
+    "@csstools/postcss-oklab-function": "npm:^3.0.14"
     "@csstools/postcss-progressive-custom-properties": "npm:^3.2.0"
-    "@csstools/postcss-relative-color-syntax": "npm:^2.0.13"
+    "@csstools/postcss-relative-color-syntax": "npm:^2.0.14"
     "@csstools/postcss-scope-pseudo-class": "npm:^3.0.1"
     "@csstools/postcss-stepped-value-functions": "npm:^3.0.6"
-    "@csstools/postcss-text-decoration-shorthand": "npm:^3.0.5"
+    "@csstools/postcss-text-decoration-shorthand": "npm:^3.0.6"
     "@csstools/postcss-trigonometric-functions": "npm:^3.0.6"
     "@csstools/postcss-unset-value": "npm:^3.0.1"
     autoprefixer: "npm:^10.4.19"
@@ -13669,7 +13669,7 @@ __metadata:
     cssdb: "npm:^8.0.0"
     postcss-attribute-case-insensitive: "npm:^6.0.3"
     postcss-clamp: "npm:^4.1.0"
-    postcss-color-functional-notation: "npm:^6.0.8"
+    postcss-color-functional-notation: "npm:^6.0.9"
     postcss-color-hex-alpha: "npm:^9.0.4"
     postcss-color-rebeccapurple: "npm:^9.0.3"
     postcss-custom-media: "npm:^10.0.4"
@@ -13682,30 +13682,30 @@ __metadata:
     postcss-font-variant: "npm:^5.0.0"
     postcss-gap-properties: "npm:^5.0.1"
     postcss-image-set-function: "npm:^6.0.3"
-    postcss-lab-function: "npm:^6.0.13"
+    postcss-lab-function: "npm:^6.0.14"
     postcss-logical: "npm:^7.0.1"
-    postcss-nesting: "npm:^12.1.1"
+    postcss-nesting: "npm:^12.1.2"
     postcss-opacity-percentage: "npm:^2.0.0"
     postcss-overflow-shorthand: "npm:^5.0.1"
     postcss-page-break: "npm:^3.0.4"
     postcss-place: "npm:^9.0.1"
-    postcss-pseudo-class-any-link: "npm:^9.0.1"
+    postcss-pseudo-class-any-link: "npm:^9.0.2"
     postcss-replace-overflow-wrap: "npm:^4.0.0"
     postcss-selector-not: "npm:^7.0.2"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/21738ecac400cca9a96841959308538516ed00ca80d4c53beb20e080c7d963120fa77b7435b02e1beefc20043abce666419b81eccf6dacdc4298f540778c111d
+  checksum: 10c0/5f77272eb7a938e5bedc3a0877f3fb0cdc6f20c8829730ccafbbd999db78ba4e6ac60f485aa7c292f70e011cf3edfadb7d2cc5459cbf9851abc25139eeb061b7
   languageName: node
   linkType: hard
 
-"postcss-pseudo-class-any-link@npm:^9.0.1":
-  version: 9.0.1
-  resolution: "postcss-pseudo-class-any-link@npm:9.0.1"
+"postcss-pseudo-class-any-link@npm:^9.0.2":
+  version: 9.0.2
+  resolution: "postcss-pseudo-class-any-link@npm:9.0.2"
   dependencies:
     postcss-selector-parser: "npm:^6.0.13"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/2d33f486af442a0ee095b7b8875701ed3f54ea3f80d2c4d1c1b35d105088b569c847e1c71fde2adf6cefb4920e8fb7d057ff1ad56e62c65892c7b68e26213b98
+  checksum: 10c0/cc2cb455a793b1f5dc0ac290e02296eafb317d9ce987dc9f2102027e22f265299666dbd1e78f1d7836fce549dead73f41e24251c08a2dd0cf482f3cc43cf7909
   languageName: node
   linkType: hard
 

From a15139bc02d279b9ef85e95990f41e3e88838d20 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 22 Apr 2024 04:30:38 -0400
Subject: [PATCH 0802/2191] Fix intermittent order based failure in
 `UpdateStatusService` spec (#30008)

---
 spec/services/update_status_service_spec.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/spec/services/update_status_service_spec.rb b/spec/services/update_status_service_spec.rb
index 930f673e10a75c..47be53f4fc7add 100644
--- a/spec/services/update_status_service_spec.rb
+++ b/spec/services/update_status_service_spec.rb
@@ -40,7 +40,7 @@
     end
 
     it 'saves edit history' do
-      expect(status.edits.pluck(:text)).to eq %w(Foo Bar)
+      expect(status.edits.ordered.pluck(:text)).to eq %w(Foo Bar)
     end
   end
 
@@ -58,7 +58,7 @@
     end
 
     it 'saves edit history' do
-      expect(status.edits.pluck(:text, :spoiler_text)).to eq [['Foo', ''], ['Foo', 'Bar']]
+      expect(status.edits.ordered.pluck(:text, :spoiler_text)).to eq [['Foo', ''], ['Foo', 'Bar']]
     end
   end
 
@@ -85,7 +85,7 @@
     end
 
     it 'saves edit history' do
-      expect(status.edits.pluck(:ordered_media_attachment_ids)).to eq [[detached_media_attachment.id], [attached_media_attachment.id]]
+      expect(status.edits.ordered.pluck(:ordered_media_attachment_ids)).to eq [[detached_media_attachment.id], [attached_media_attachment.id]]
     end
   end
 
@@ -107,7 +107,7 @@
     end
 
     it 'saves edit history' do
-      expect(status.edits.map { |edit| edit.ordered_media_attachments.map(&:description) }).to eq [['Old description'], ['New description']]
+      expect(status.edits.ordered.map { |edit| edit.ordered_media_attachments.map(&:description) }).to eq [['Old description'], ['New description']]
     end
   end
 
@@ -136,7 +136,7 @@
     end
 
     it 'saves edit history' do
-      expect(status.edits.pluck(:poll_options)).to eq [%w(Foo Bar), %w(Bar Baz Foo)]
+      expect(status.edits.ordered.pluck(:poll_options)).to eq [%w(Foo Bar), %w(Bar Baz Foo)]
     end
 
     it 'requeues expiration notification' do

From 18737aad49911f00b94f9cf6fc582670cbdeda93 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 22 Apr 2024 04:31:20 -0400
Subject: [PATCH 0803/2191] Rely on dotenv autoload instead of explicit call
 (#30007)

---
 config/application.rb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/config/application.rb b/config/application.rb
index a17a48b093bad7..b777018b5a106f 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -52,8 +52,6 @@
 require_relative '../lib/simple_navigation/item_extensions'
 require_relative '../lib/http_extensions'
 
-Dotenv::Rails.load
-
 Bundler.require(:pam_authentication) if ENV['PAM_ENABLED'] == 'true'
 
 require_relative '../lib/mastodon/redis_config'

From 3655fb6a22576ac1b0e0fed4910483f8550c6529 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 22 Apr 2024 10:42:35 +0200
Subject: [PATCH 0804/2191] New Crowdin Translations (automated) (#30014)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/be.json |   1 +
 app/javascript/mastodon/locales/es.json |   2 +-
 app/javascript/mastodon/locales/fi.json |  14 +-
 app/javascript/mastodon/locales/fr.json |   4 +-
 app/javascript/mastodon/locales/ia.json | 195 ++++++++++++++++++++++++
 app/javascript/mastodon/locales/id.json |  17 +++
 app/javascript/mastodon/locales/ja.json |   6 +
 config/locales/devise.ia.yml            |   2 +
 config/locales/fi.yml                   |   8 +-
 config/locales/ia.yml                   |  61 ++++++++
 config/locales/ja.yml                   |   2 +
 config/locales/simple_form.fi.yml       |   2 +-
 config/locales/simple_form.ia.yml       |  45 ++++++
 13 files changed, 344 insertions(+), 15 deletions(-)

diff --git a/app/javascript/mastodon/locales/be.json b/app/javascript/mastodon/locales/be.json
index 276f7c712d6d3e..2b7673312fbe57 100644
--- a/app/javascript/mastodon/locales/be.json
+++ b/app/javascript/mastodon/locales/be.json
@@ -297,6 +297,7 @@
   "filter_modal.select_filter.subtitle": "Скарыстайцеся існуючай катэгорыяй або стварыце новую",
   "filter_modal.select_filter.title": "Фільтраваць гэты допіс",
   "filter_modal.title.status": "Фільтраваць допіс",
+  "filtered_notifications_banner.mentions": "{count, plural, one {згадванне} few {згадванні} many {згадванняў} other {згадвання}}",
   "filtered_notifications_banner.pending_requests": "Апавяшчэнні ад {count, plural, =0 {# людзей якіх} one {# чалавека якіх} few {# чалавек якіх} many {# людзей якіх} other {# чалавека якіх}} вы магчыма ведаеце",
   "filtered_notifications_banner.title": "Адфільтраваныя апавяшчэнні",
   "firehose.all": "Усе",
diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json
index 68e5349a57737a..149a37d74e4d08 100644
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@@ -642,7 +642,7 @@
   "report.statuses.subtitle": "Selecciona todos los que correspondan",
   "report.statuses.title": "¿Hay alguna publicación que respalde este informe?",
   "report.submit": "Enviar",
-  "report.target": "Reportando",
+  "report.target": "Reportando {target}",
   "report.thanks.take_action": "Aquí están tus opciones para controlar lo que ves en Mastodon:",
   "report.thanks.take_action_actionable": "Mientras revisamos esto, puedes tomar medidas contra @{name}:",
   "report.thanks.title": "¿No quieres esto?",
diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index a32bb13153b29a..246bb56fcc28c5 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -298,7 +298,7 @@
   "filter_modal.select_filter.title": "Suodata tämä julkaisu",
   "filter_modal.title.status": "Suodata julkaisu",
   "filtered_notifications_banner.mentions": "{count, plural, one {maininta} other {mainintaa}}",
-  "filtered_notifications_banner.pending_requests": "Ilmoitukset {count, plural, =0 {ei keltään} one {yhdeltä henkilöltä} other {# henkilöltä}}, jonka saatat tuntea",
+  "filtered_notifications_banner.pending_requests": "Sinulle on ilmoituksia mahdollisesti tuntemiltasi henkilöiltä seuraavasti: {count, plural, =0 {Ei keltään} one {Yhdeltä henkilöltä} other {# henkilöltä}}",
   "filtered_notifications_banner.title": "Suodatetut ilmoitukset",
   "firehose.all": "Kaikki",
   "firehose.local": "Tämä palvelin",
@@ -306,11 +306,11 @@
   "follow_request.authorize": "Valtuuta",
   "follow_request.reject": "Hylkää",
   "follow_requests.unlocked_explanation": "Vaikkei tiliäsi ole lukittu, palvelimen {domain} ylläpito on arvioinut, että saatat olla halukas tarkistamaan nämä seuraamispyynnöt erikseen.",
-  "follow_suggestions.curated_suggestion": "Ylläpidon valinta",
+  "follow_suggestions.curated_suggestion": "Ehdotus ylläpidolta",
   "follow_suggestions.dismiss": "Älä näytä uudelleen",
   "follow_suggestions.hints.featured": "Tämän profiilin on valinnut palvelimen {domain} tiimi.",
-  "follow_suggestions.hints.friends_of_friends": "Tämä profiili on suosittu seuraamiesi henkilöiden parissa.",
-  "follow_suggestions.hints.most_followed": "Tämä profiili on yksi seuratuimmista palvelimella {domain}.",
+  "follow_suggestions.hints.friends_of_friends": "Seuraamasi käyttäjät suosivat tätä profiilia.",
+  "follow_suggestions.hints.most_followed": "Tämä profiili on palvelimen {domain} seuratuimpia.",
   "follow_suggestions.hints.most_interactions": "Tämä profiili on viime aikoina saanut paljon huomiota palvelimella {domain}.",
   "follow_suggestions.hints.similar_to_recently_followed": "Tämä profiili on samankaltainen kuin profiilit, joita olet viimeksi seurannut.",
   "follow_suggestions.personalized_suggestion": "Mukautettu ehdotus",
@@ -473,10 +473,10 @@
   "notification.poll": "Kysely, johon osallistuit, on päättynyt",
   "notification.reblog": "{name} tehosti julkaisuasi",
   "notification.relationships_severance_event": "Menetettiin yhteydet palvelimeen {name}",
-  "notification.relationships_severance_event.account_suspension": "Palvelimen {from} ylläpitäjä on jäädyttänyt verkkotunnuksen {target}, minkä takia et voi enää vastaanottaa heidän päivityksiään tai olla vuorovaikutuksessa heidän kanssaan.",
-  "notification.relationships_severance_event.domain_block": "Palvelimen {from} ylläpitäjä on estänyt verkkotunnuksen {target}, mukaan lukien {followersCount} seuraajistasi ja {followingCount, plural, one {# seuratuistasi} other {# seuratuistasi}}.",
+  "notification.relationships_severance_event.account_suspension": "Palvelimen {from} ylläpitäjä on jäädyttänyt palvelimen {target} vuorovaikutuksen. Enää et voi siis vastaanottaa päivityksiä heiltä tai olla yhteyksissä heidän kanssaan.",
+  "notification.relationships_severance_event.domain_block": "Palvelimen {from} ylläpitäjä on estänyt palvelimen {target} vuorovaikutuksen – mukaan lukien {followersCount} seuraajistasi ja {followingCount, plural, one {# seuratuistasi} other {# seuratuistasi}}.",
   "notification.relationships_severance_event.learn_more": "Lue lisää",
-  "notification.relationships_severance_event.user_domain_block": "Olet estänyt verkkotunnuksen {target}, mikä poisti {followersCount} seuraajistasi ja {followingCount, plural, one {# seuratuistasi} other {# seuratuistasi}}.",
+  "notification.relationships_severance_event.user_domain_block": "Olet estänyt palvelimen {target}, mikä poisti {followersCount} seuraajistasi ja {followingCount, plural, one {# seuratuistasi} other {# seuratuistasi}}.",
   "notification.status": "{name} julkaisi juuri",
   "notification.update": "{name} muokkasi julkaisua",
   "notification_requests.accept": "Hyväksy",
diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json
index 58ab46d5c997b4..1a5803623f0037 100644
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@@ -550,10 +550,10 @@
   "onboarding.share.message": "Je suis {username} sur #Mastodon ! Suivez-moi sur {url}",
   "onboarding.share.next_steps": "Étapes suivantes possibles :",
   "onboarding.share.title": "Partager votre profil",
-  "onboarding.start.lead": "Your new Mastodon account is ready to go. Here's how you can make the most of it:",
+  "onboarding.start.lead": "Vous faites désormais partie de Mastodon, une plateforme de médias sociaux unique et décentralisée où c'est vous, et non un algorithme, qui créez votre propre expérience. Nous allons vous aider à vous lancer dans cette nouvelle frontière sociale :",
   "onboarding.start.skip": "Vous n’avez donc pas besoin d’aide pour commencer ?",
   "onboarding.start.title": "Vous avez réussi !",
-  "onboarding.steps.follow_people.body": "You curate your own feed. Lets fill it with interesting people.",
+  "onboarding.steps.follow_people.body": "Suivre des personnes intéressantes, c'est la raison d'être de Mastodon.",
   "onboarding.steps.follow_people.title": "Personnaliser votre flux principal",
   "onboarding.steps.publish_status.body": "Dites bonjour au monde avec du texte, des photos, des vidéos ou des sondages {emoji}",
   "onboarding.steps.publish_status.title": "Rédigez votre premier message",
diff --git a/app/javascript/mastodon/locales/ia.json b/app/javascript/mastodon/locales/ia.json
index e0ae8b58c69116..808b57278c43dd 100644
--- a/app/javascript/mastodon/locales/ia.json
+++ b/app/javascript/mastodon/locales/ia.json
@@ -375,12 +375,14 @@
   "keyboard_shortcuts.compose": "Focalisar al area de composition de texto",
   "keyboard_shortcuts.description": "Description",
   "keyboard_shortcuts.direct": "aperir le columna de mentiones private",
+  "keyboard_shortcuts.down": "Displaciar a basso in le lista",
   "keyboard_shortcuts.enter": "Aperir message",
   "keyboard_shortcuts.favourite": "Message favorite",
   "keyboard_shortcuts.favourites": "Aperir lista de favoritos",
   "keyboard_shortcuts.federated": "Aperir le chronologia federate",
   "keyboard_shortcuts.heading": "Accessos directe de claviero",
   "keyboard_shortcuts.home": "Aperir le chronologia de initio",
+  "keyboard_shortcuts.hotkey": "Clave accelerator",
   "keyboard_shortcuts.legend": "Monstrar iste legenda",
   "keyboard_shortcuts.local": "Aperir le chronologia local",
   "keyboard_shortcuts.mention": "Mentionar le author",
@@ -391,10 +393,18 @@
   "keyboard_shortcuts.pinned": "Aperir le lista de messages fixate",
   "keyboard_shortcuts.profile": "Aperir le profilo del autor",
   "keyboard_shortcuts.reply": "Responder al message",
+  "keyboard_shortcuts.requests": "Aperir le lista de requestas de sequimento",
+  "keyboard_shortcuts.search": "Focalisar barra de recerca",
   "keyboard_shortcuts.spoilers": "Monstrar/celar le campo CW",
+  "keyboard_shortcuts.start": "Aperir columna “comenciar”",
+  "keyboard_shortcuts.toggle_hidden": "Monstrar/celar texto detra advertimento de contento",
   "keyboard_shortcuts.toggle_sensitivity": "Monstrar/celar multimedia",
   "keyboard_shortcuts.toot": "Initiar un nove message",
+  "keyboard_shortcuts.unfocus": "Disfocalisar le area de composition de texto/de recerca",
+  "keyboard_shortcuts.up": "Displaciar in alto in le lista",
   "lightbox.close": "Clauder",
+  "lightbox.compress": "Comprimer le quadro de visualisation de imagine",
+  "lightbox.expand": "Expander le quadro de visualisation de imagine",
   "lightbox.next": "Sequente",
   "lightbox.previous": "Precedente",
   "limited_account_hint.action": "Monstrar profilo in omne caso",
@@ -408,13 +418,19 @@
   "lists.exclusive": "Celar iste messages sur le pagina de initio",
   "lists.new.create": "Adder lista",
   "lists.new.title_placeholder": "Nove titulo del lista",
+  "lists.replies_policy.followed": "Qualcunque usator sequite",
+  "lists.replies_policy.list": "Membros del lista",
   "lists.replies_policy.none": "Nemo",
   "lists.replies_policy.title": "Monstrar responsas a:",
+  "lists.search": "Cercar inter le gente que tu seque",
   "lists.subheading": "Tu listas",
+  "load_pending": "{count, plural, one {# nove entrata} other {# nove entratas}}",
   "loading_indicator.label": "Cargante…",
   "media_gallery.toggle_visible": "{number, plural, one {Celar imagine} other {Celar imagines}}",
+  "moved_to_account_banner.text": "Tu conto {disabledAccount} es actualmente disactivate perque tu ha cambiate de conto a {movedToAccount}.",
   "mute_modal.hide_from_notifications": "Celar ab notificationes",
   "mute_modal.hide_options": "Celar optiones",
+  "mute_modal.indefinite": "Usque io dissilentia iste persona",
   "mute_modal.show_options": "Monstrar optiones",
   "mute_modal.they_can_mention_and_follow": "Illes pote mentionar te e sequer te, ma tu non potera vider los.",
   "mute_modal.they_wont_know": "Illes non sapera que illes ha essite silentiate.",
@@ -433,6 +449,9 @@
   "navigation_bar.explore": "Explorar",
   "navigation_bar.favourites": "Favoritos",
   "navigation_bar.filters": "Parolas silentiate",
+  "navigation_bar.follow_requests": "Requestas de sequimento",
+  "navigation_bar.followed_tags": "Hashtags sequite",
+  "navigation_bar.follows_and_followers": "Sequites e sequitores",
   "navigation_bar.lists": "Listas",
   "navigation_bar.logout": "Clauder le session",
   "navigation_bar.mutes": "Usatores silentiate",
@@ -443,10 +462,21 @@
   "navigation_bar.public_timeline": "Chronologia federate",
   "navigation_bar.search": "Cercar",
   "navigation_bar.security": "Securitate",
+  "not_signed_in_indicator.not_signed_in": "Es necessari aperir session pro acceder a iste ressource.",
+  "notification.admin.report": "{name} ha signalate {target}",
+  "notification.admin.sign_up": "{name} se ha inscribite",
   "notification.favourite": "{name} ha marcate tu message como favorite",
+  "notification.follow": "{name} te ha sequite",
+  "notification.follow_request": "{name} ha requestate de sequer te",
+  "notification.mention": "{name} te ha mentionate",
   "notification.own_poll": "Tu sondage ha finite",
+  "notification.poll": "Un sondage in le qual tu ha votate ha finite",
   "notification.reblog": "{name} ha impulsate tu message",
+  "notification.relationships_severance_event": "Connexiones perdite con {name}",
+  "notification.relationships_severance_event.account_suspension": "Un administrator de {from} ha suspendiute {target}. Isto significa que tu non pote plus reciper actualisationes de iste persona o interager con ille.",
+  "notification.relationships_severance_event.domain_block": "Un administrator de {from} ha blocate {target}, includente {followersCount} de tu sequitores e {followingCount, plural, one {# conto} other {# contos}} que tu seque.",
   "notification.relationships_severance_event.learn_more": "Apprender plus",
+  "notification.relationships_severance_event.user_domain_block": "Tu ha blocate {target}, assi removente {followersCount} de tu sequitores e {followingCount, plural, one {# conto} other {# contos}} que tu seque.",
   "notification.status": "{name} ha justo ora publicate",
   "notification.update": "{name} ha modificate un message",
   "notification_requests.accept": "Acceptar",
@@ -455,10 +485,14 @@
   "notification_requests.title": "Notificationes filtrate",
   "notifications.clear": "Rader notificationes",
   "notifications.clear_confirmation": "Es tu secur que tu vole rader permanentemente tote tu notificationes?",
+  "notifications.column_settings.admin.report": "Nove signalationes:",
+  "notifications.column_settings.admin.sign_up": "Nove inscriptiones:",
   "notifications.column_settings.alert": "Notificationes de scriptorio",
   "notifications.column_settings.favourite": "Favoritos:",
   "notifications.column_settings.filter_bar.advanced": "Monstrar tote le categorias",
+  "notifications.column_settings.filter_bar.category": "Barra de filtro rapide",
   "notifications.column_settings.follow": "Nove sequitores:",
+  "notifications.column_settings.follow_request": "Nove requestas de sequimento:",
   "notifications.column_settings.mention": "Mentiones:",
   "notifications.column_settings.poll": "Resultatos del sondage:",
   "notifications.column_settings.push": "Notificationes push",
@@ -467,99 +501,226 @@
   "notifications.column_settings.sound": "Reproducer sono",
   "notifications.column_settings.status": "Nove messages:",
   "notifications.column_settings.unread_notifications.category": "Notificationes non legite",
+  "notifications.column_settings.unread_notifications.highlight": "Marcar le notificationes non legite",
+  "notifications.column_settings.update": "Modificationes:",
   "notifications.filter.all": "Toto",
   "notifications.filter.boosts": "Impulsos",
   "notifications.filter.favourites": "Favoritos",
+  "notifications.filter.follows": "Sequites",
   "notifications.filter.mentions": "Mentiones",
   "notifications.filter.polls": "Resultatos del sondage",
   "notifications.filter.statuses": "Actualisationes de personas que tu seque",
   "notifications.grant_permission": "Conceder permission.",
   "notifications.group": "{count} notificationes",
   "notifications.mark_as_read": "Marcar cata notification como legite",
+  "notifications.permission_denied": "Le notificationes de scriptorio es indisponibile a causa de un requesta anteriormente refusate de permissiones del navigator",
+  "notifications.permission_denied_alert": "Le notificationes de scriptorio non pote esser activate perque le permission del navigator ha essite refusate anteriormente",
+  "notifications.permission_required": "Le notificationes de scriptorio es indisponibile perque le permission necessari non ha essite concedite.",
+  "notifications.policy.filter_new_accounts.hint": "Create in le ultime {days, plural, one {die} other {# dies}}",
   "notifications.policy.filter_new_accounts_title": "Nove contos",
+  "notifications.policy.filter_not_followers_hint": "Includente le personas que te ha sequite durante minus de {days, plural, one {un die} other {# dies}}",
+  "notifications.policy.filter_not_followers_title": "Personas qui non te seque",
+  "notifications.policy.filter_not_following_hint": "Usque tu les approba manualmente",
+  "notifications.policy.filter_not_following_title": "Personas que tu non seque",
+  "notifications.policy.filter_private_mentions_hint": "Filtrate, excepte si es in responsa a tu proprie mention o si tu seque le expeditor",
+  "notifications.policy.filter_private_mentions_title": "Mentiones private indesirate",
+  "notifications.policy.title": "Filtrar notificationes de…",
   "notifications_permission_banner.enable": "Activar notificationes de scriptorio",
+  "notifications_permission_banner.how_to_control": "Pro reciper notificationes quando Mastodon non es aperte, activa le notificationes de scriptorio. Post lor activation, es possibile controlar precisemente qual typos de interaction genera notificationes de scriptorio per medio del button {icon} hic supra.",
+  "notifications_permission_banner.title": "Non mancar jammais a un cosa",
+  "onboarding.action.back": "Porta me retro",
+  "onboarding.actions.back": "Porta me retro",
+  "onboarding.actions.go_to_explore": "Porta me al tendentias",
   "onboarding.actions.go_to_home": "Porta me a mi fluxo de initio",
   "onboarding.compose.template": "Salute #Mastodon!",
+  "onboarding.follows.empty": "Regrettabilemente, non es possibile monstrar resultatos al momento. Tu pote tentar usar le recerca o percurrer le pagina de exploration pro cercar personas a sequer, o tentar lo de novo plus tarde.",
   "onboarding.follows.lead": "Le fluxo de initio es le maniera principal de discoperir Mastodon. Quanto plus personas tu seque, tanto plus active e interessante illo essera. Pro comenciar, ecce alcun suggestiones:",
   "onboarding.follows.title": "Personalisar tu fluxo de initio",
+  "onboarding.profile.discoverable": "Render mi profilo discoperibile",
   "onboarding.profile.discoverable_hint": "Quando tu opta pro devenir discoperibile sur Mastodon, tu messages pote apparer in resultatos de recerca e in tendentias, e tu profilo pote esser suggerite al personas con interesses simile al tues.",
+  "onboarding.profile.display_name": "Nomine a monstrar",
+  "onboarding.profile.display_name_hint": "Tu nomine complete o tu supernomine…",
+  "onboarding.profile.lead": "Tu pote sempre completar isto plus tarde in le parametros, ubi se trova mesmo plus optiones de personalisation.",
+  "onboarding.profile.note": "Bio",
+  "onboarding.profile.note_hint": "Tu pote @mentionar altere personas o #hashtags…",
   "onboarding.profile.save_and_continue": "Salvar e continuar",
+  "onboarding.profile.title": "Configuration del profilo",
+  "onboarding.profile.upload_avatar": "Incargar imagine de profilo",
+  "onboarding.profile.upload_header": "Actualisar capite de profilo",
+  "onboarding.share.lead": "Face saper al gente como illes pote trovar te sur Mastodon!",
+  "onboarding.share.message": "Io es {username} sur Mastodon! Veni sequer me a {url}",
   "onboarding.share.next_steps": "Sequente passos possibile:",
   "onboarding.share.title": "Compartir tu profilo",
+  "onboarding.start.lead": "Tu face ora parte de Mastodon, un platteforma de medios social unic e decentralisate ubi es tu, e non un algorithmo, qui crea tu proprie experientia. Nos va adjutar te a lancear te in iste nove frontiera social:",
+  "onboarding.start.skip": "Non require adjuta a comenciar?",
+  "onboarding.start.title": "Tu ha arrivate!",
+  "onboarding.steps.follow_people.body": "Sequer personas interessante es le ration de esser de Mastodon.",
   "onboarding.steps.follow_people.title": "Personalisar tu fluxo de initio",
+  "onboarding.steps.publish_status.body": "Saluta le mundo con texto, photos, videos o sondages {emoji}",
   "onboarding.steps.publish_status.title": "Face tu prime message",
   "onboarding.steps.setup_profile.body": "Impulsa tu interactiones con un profilo comprehensive.",
   "onboarding.steps.setup_profile.title": "Personalisa tu profilo",
+  "onboarding.steps.share_profile.body": "Face saper a tu amicos como trovar te sur Mastodon",
   "onboarding.steps.share_profile.title": "Compartir tu profilo de Mastodon",
+  "onboarding.tips.2fa": "<strong>Lo sapeva tu?</strong> Tu pote securisar tu conto configurante le authentication bifactorial in le parametros de tu conto. Isto functiona con le application TOTP de tu preferentia, sin necessitate de un numero de telephono!",
+  "onboarding.tips.accounts_from_other_servers": "<strong>Lo sapeva tu?</strong> Perque Mastodon es decentralisate, le profilos que tu incontra pote esser hospitate sur servitores altere que le tue. Nonobstante, tu pote interager con illos sin problema! Lor servitor se trova in le secunde medietate de lor nomine de usator!",
+  "onboarding.tips.migration": "<strong>Lo sapeva tu?</strong> Si tu pensa que {domain} non es un bon servitor pro te in le futuro, tu pote cambiar a un altere servitor Mastodon sin perder tu sequitores. Tu pote mesmo hospitar tu proprie servitor!",
+  "onboarding.tips.verification": "<strong>Lo sapeva tu?</strong> Pro verificar tu conto, insere un ligamine a tu profilo Mastodon sur tu proprie sito web e adde le sito web a tu profilo. Nulle moneta o documentos necessari!",
+  "password_confirmation.exceeds_maxlength": "Le confirmation del contrasigno excede le longitude maxime del contrasigno",
+  "password_confirmation.mismatching": "Le confirmation del contrasigno non corresponde",
+  "picture_in_picture.restore": "Restaurar",
   "poll.closed": "Claudite",
+  "poll.refresh": "Refrescar",
   "poll.reveal": "Vider le resultatos",
+  "poll.total_people": "{count, plural, one {# persona} other {# personas}}",
+  "poll.total_votes": "{count, plural, one {# voto} other {# votos}}",
+  "poll.vote": "Votar",
+  "poll.voted": "Tu ha votate pro iste responsa",
+  "poll.votes": "{votes, plural, one {# voto} other {# votos}}",
+  "poll_button.add_poll": "Adder un inquesta",
+  "poll_button.remove_poll": "Remover un inquesta",
   "privacy.change": "Cambiar le confidentialitate del message",
   "privacy.direct.long": "Tote le personas mentionate in le message",
+  "privacy.direct.short": "Personas specific",
+  "privacy.private.long": "Solmente tu sequitores",
+  "privacy.private.short": "Sequitores",
+  "privacy.public.long": "Quicunque, sur Mastodon o non",
   "privacy.public.short": "Public",
   "privacy.unlisted.additional": "Isto es exactemente como public, excepte que le message non apparera in fluxos in directo, in hashtags, in Explorar, o in le recerca de Mastodon, mesmo si tu ha optate pro render tote le conto discoperibile.",
+  "privacy.unlisted.long": "Minus fanfares algorithmic",
+  "privacy.unlisted.short": "Public, non listate",
   "privacy_policy.last_updated": "Ultime actualisation {date}",
   "privacy_policy.title": "Politica de confidentialitate",
+  "recommended": "Recommendate",
+  "refresh": "Refrescar",
+  "regeneration_indicator.label": "Cargamento…",
   "regeneration_indicator.sublabel": "Tu fluxo de initio es in preparation!",
+  "relative_time.days": "{number}d",
+  "relative_time.full.days": "{number, plural, one {# die} other {# dies}} retro",
+  "relative_time.full.hours": "{number, plural, one {# hora} other {# horas}} retro",
+  "relative_time.full.just_now": "justo ora",
+  "relative_time.full.minutes": "{number, plural, one {# minuta} other {# minutas}} retro",
+  "relative_time.full.seconds": "{number, plural, one {# secunda} other {# secundas}} retro",
+  "relative_time.hours": "{number}h",
   "relative_time.just_now": "ora",
+  "relative_time.minutes": "{number}m",
+  "relative_time.seconds": "{number}s",
   "relative_time.today": "hodie",
+  "reply_indicator.attachments": "{count, plural, one {# annexo} other {# annexos}}",
   "reply_indicator.cancel": "Cancellar",
+  "reply_indicator.poll": "Inquesta",
   "report.block": "Blocar",
   "report.block_explanation": "Tu non videra le messages de iste persona. Ille non potera vider tu messages o sequer te. Ille potera saper de esser blocate.",
+  "report.categories.legal": "Juridic",
   "report.categories.other": "Alteres",
+  "report.categories.spam": "Spam",
+  "report.categories.violation": "Le contento viola un o plus regulas del servitor",
+  "report.category.subtitle": "Elige le option plus adequate",
+  "report.category.title": "Describe le problema con iste {type}",
   "report.category.title_account": "profilo",
   "report.category.title_status": "message",
   "report.close": "Facite",
+  "report.comment.title": "Ha il altere cosas que nos deberea saper?",
+  "report.forward": "Reinviar a {target}",
+  "report.forward_hint": "Le conto es de un altere servitor. Inviar un copia anonymisate del signalation a illo tamben?",
   "report.mute": "Silentiar",
   "report.mute_explanation": "Tu non videra le messages de iste persona. Ille pote totevia sequer te e vider tu messages e non sapera de esser silentiate.",
   "report.next": "Sequente",
   "report.placeholder": "Commentos additional",
   "report.reasons.dislike": "Non me place",
+  "report.reasons.dislike_description": "Non es qualcosa que tu vole vider",
+  "report.reasons.legal": "Es illegal",
+  "report.reasons.legal_description": "Tu crede que viola le lege de tu pais o del pais del servitor",
+  "report.reasons.other": "Es altere cosa",
+  "report.reasons.other_description": "Le problema non entra in altere categorias",
+  "report.reasons.spam": "Es spam",
+  "report.reasons.spam_description": "Ligamines malevolente, interaction false, o responsas repetitive",
+  "report.reasons.violation": "Viola le regulas del servitor",
+  "report.reasons.violation_description": "Tu sape que viola regulas specific",
+  "report.rules.subtitle": "Selige tote le responsas appropriate",
+  "report.rules.title": "Qual regulas es violate?",
+  "report.statuses.subtitle": "Selige tote le responsas appropriate",
   "report.statuses.title": "Existe alcun messages que appoia iste reporto?",
+  "report.submit": "Submitter",
+  "report.target": "Signalamento de {target}",
+  "report.thanks.take_action": "Ecce tu optiones pro controlar lo que tu vide sur Mastodon:",
+  "report.thanks.take_action_actionable": "Durante que nos revide isto, tu pote prender mesuras contra @{name}:",
+  "report.thanks.title": "Non vole vider isto?",
+  "report.thanks.title_actionable": "Gratias pro signalar, nos investigara isto.",
+  "report.unfollow": "Cessar de sequer @{name}",
   "report.unfollow_explanation": "Tu seque iste conto. Pro non plus vider su messages in tu fluxo de initio, cessa de sequer lo.",
   "report_notification.attached_statuses": "{count, plural, one {{count} message} other {{count} messages}} annexate",
+  "report_notification.categories.legal": "Juridic",
   "report_notification.categories.other": "Alteres",
+  "report_notification.categories.spam": "Spam",
+  "report_notification.categories.violation": "Violation del regulas",
   "report_notification.open": "Aperir reporto",
   "search.no_recent_searches": "Nulle recercas recente",
+  "search.placeholder": "Cercar",
+  "search.quick_action.account_search": "Profilos correspondente a {x}",
   "search.quick_action.go_to_account": "Vader al profilo {x}",
   "search.quick_action.go_to_hashtag": "Vader al hashtag {x}",
   "search.quick_action.open_url": "Aperir URL in Mastodon",
   "search.quick_action.status_search": "Messages correspondente a {x}",
+  "search.search_or_paste": "Cerca o colla un URL",
   "search_popout.full_text_search_disabled_message": "Non disponibile sur {domain}.",
+  "search_popout.full_text_search_logged_out_message": "Solmente disponibile al initiar le session.",
   "search_popout.language_code": "Codice de lingua ISO",
   "search_popout.options": "Optiones de recerca",
   "search_popout.quick_actions": "Actiones rapide",
   "search_popout.recent": "Recercas recente",
+  "search_popout.specific_date": "data specific",
   "search_popout.user": "usator",
   "search_results.accounts": "Profilos",
+  "search_results.all": "Toto",
   "search_results.hashtags": "Hashtags",
+  "search_results.nothing_found": "Nihil trovate pro iste terminos de recerca",
   "search_results.see_all": "Vider toto",
   "search_results.statuses": "Messages",
+  "search_results.title": "Cercar {q}",
+  "server_banner.about_active_users": "Personas que ha usate iste servitor in le ultime 30 dies (usatores active per mense)",
   "server_banner.active_users": "usatores active",
+  "server_banner.administered_by": "Administrate per:",
+  "server_banner.introduction": "{domain} face parte del rete social decentralisate actionate per {mastodon}.",
   "server_banner.learn_more": "Apprender plus",
   "server_banner.server_stats": "Statos del servitor:",
   "sign_in_banner.create_account": "Crear un conto",
   "sign_in_banner.sign_in": "Aperir session",
+  "sign_in_banner.sso_redirect": "Aperir session o crear conto",
   "sign_in_banner.text": "Aperi session pro sequer profilos o hashtags, marcar messages como favorite, e condivider e responder a messages. Tu pote etiam interager desde tu conto sur un altere servitor.",
+  "status.admin_account": "Aperir le interfacie de moderation pro @{name}",
+  "status.admin_domain": "Aperir le interfacie de moderation pro {domain}",
   "status.admin_status": "Aperir iste message in le interfacie de moderation",
   "status.block": "Blocar @{name}",
+  "status.bookmark": "Adder al marcapaginas",
   "status.cancel_reblog_private": "Disfacer impulso",
   "status.cannot_reblog": "Iste message non pote esser impulsate",
   "status.copy": "Copiar ligamine a message",
   "status.delete": "Deler",
+  "status.detailed_status": "Vista detaliate del conversation",
   "status.direct": "Mentionar privatemente @{name}",
   "status.direct_indicator": "Mention private",
   "status.edit": "Modificar",
+  "status.edited": "Ultime modification le {date}",
   "status.edited_x_times": "Modificate {count, plural, one {{count} vice} other {{count} vices}}",
+  "status.embed": "Incastrar",
   "status.favourite": "Adder al favoritos",
+  "status.favourites": "{count, plural, one {favorite} other {favorites}}",
   "status.filter": "Filtrar iste message",
+  "status.filtered": "Filtrate",
   "status.hide": "Celar le message",
   "status.history.created": "create per {name} le {date}",
   "status.history.edited": "modificate per {name} le {date}",
+  "status.load_more": "Cargar plus",
   "status.media.open": "Clicca pro aperir",
   "status.media.show": "Clicca pro monstrar",
+  "status.media_hidden": "Medios celate",
+  "status.mention": "Mentionar @{name}",
   "status.more": "Plus",
+  "status.mute": "Silentiar @{name}",
   "status.mute_conversation": "Silentiar conversation",
   "status.open": "Expander iste message",
+  "status.pin": "Fixar sur profilo",
   "status.pinned": "Message fixate",
   "status.read_more": "Leger plus",
   "status.reblog": "Impulsar",
@@ -592,13 +753,47 @@
   "subscribed_languages.target": "Cambiar le linguas subscribite pro {target}",
   "tabs_bar.home": "Initio",
   "tabs_bar.notifications": "Notificationes",
+  "time_remaining.days": "{number, plural, one {# die} other {# dies}} restante",
+  "time_remaining.hours": "{number, plural, one {# hora} other {# horas}} restante",
+  "time_remaining.minutes": "{number, plural, one {# minuta} other {# minutas}} restante",
+  "time_remaining.moments": "Qualque momentos restante",
+  "time_remaining.seconds": "{number, plural, one {# secunda} other {# secundas}} restante",
+  "timeline_hint.remote_resource_not_displayed": "Le {resource} de altere servitores non appare hic.",
+  "timeline_hint.resources.followers": "Sequitores",
+  "timeline_hint.resources.follows": "Sequites",
   "timeline_hint.resources.statuses": "Messages ancian",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} persona} other {{counter} personas}} in le passate {days, plural, one {die} other {{days} dies}}",
   "trends.trending_now": "Ora in tendentias",
+  "ui.beforeunload": "Tu esbosso essera predite si tu exi de Mastodon.",
+  "units.short.billion": "{count}B",
+  "units.short.million": "{count}M",
+  "units.short.thousand": "{count}K",
+  "upload_area.title": "Traher e deponer pro incargar",
   "upload_button.label": "Adde imagines, un video o un file de audio",
+  "upload_error.limit": "Limite de incargamento de files excedite.",
+  "upload_error.poll": "Incargamento de files non permittite con sondages.",
+  "upload_form.audio_description": "Describe lo pro le gente con difficultates auditive",
+  "upload_form.description": "Describe lo pro le gente con difficultates visual",
+  "upload_form.edit": "Modificar",
+  "upload_form.thumbnail": "Cambiar le miniatura",
+  "upload_form.video_description": "Describe lo pro le gente con difficultates auditive o visual",
+  "upload_modal.analyzing_picture": "Analysa imagine…",
+  "upload_modal.apply": "Applicar",
+  "upload_modal.applying": "Applicante…",
   "upload_modal.choose_image": "Seliger un imagine",
+  "upload_modal.description_placeholder": "Le clown uzbek dogmatic justo foras quasi se asphyxiava",
   "upload_modal.detect_text": "Deteger texto de un imagine",
+  "upload_modal.edit_media": "Modificar le medio",
+  "upload_modal.hint": "Clicca o trahe le circulo sur le previsualisation pro eliger le puncto focal que essera sempre visibile sur tote le miniaturas.",
+  "upload_modal.preparing_ocr": "Preparation del OCR…",
+  "upload_modal.preview_label": "Previsualisation ({ratio})",
+  "upload_progress.label": "Incargante...",
+  "upload_progress.processing": "Processante…",
+  "username.taken": "Iste nomine de usator es ja in uso. Proba con un altere",
   "video.close": "Clauder le video",
   "video.download": "Discargar le file",
+  "video.exit_fullscreen": "Sortir del schermo plen",
+  "video.expand": "Expander video",
   "video.fullscreen": "Schermo plen",
   "video.hide": "Celar video",
   "video.mute": "Silentiar le sono",
diff --git a/app/javascript/mastodon/locales/id.json b/app/javascript/mastodon/locales/id.json
index 764c081119b54a..90a48b6343418f 100644
--- a/app/javascript/mastodon/locales/id.json
+++ b/app/javascript/mastodon/locales/id.json
@@ -21,6 +21,7 @@
   "account.blocked": "Terblokir",
   "account.browse_more_on_origin_server": "Lihat lebih lanjut di profil asli",
   "account.cancel_follow_request": "Batalkan permintaan ikut",
+  "account.copy": "Salin tautan ke profil",
   "account.direct": "Sebut secara pribadi @{name}",
   "account.disable_notifications": "Berhenti memberitahu saya ketika @{name} memposting",
   "account.domain_blocked": "Domain diblokir",
@@ -31,6 +32,7 @@
   "account.featured_tags.last_status_never": "Tidak ada kiriman",
   "account.featured_tags.title": "Tagar {name} yang difiturkan",
   "account.follow": "Ikuti",
+  "account.follow_back": "Ikuti balik",
   "account.followers": "Pengikut",
   "account.followers.empty": "Pengguna ini belum ada pengikut.",
   "account.followers_counter": "{count, plural, other {{counter} Pengikut}}",
@@ -51,6 +53,7 @@
   "account.mute_notifications_short": "Senyapkan Notifikasi",
   "account.mute_short": "Senyapkan",
   "account.muted": "Dibisukan",
+  "account.mutual": "Saling ikuti",
   "account.no_bio": "Tidak ada deskripsi yang diberikan.",
   "account.open_original_page": "Buka halaman asli",
   "account.posts": "Kiriman",
@@ -75,6 +78,10 @@
   "admin.dashboard.retention.average": "Rata-rata",
   "admin.dashboard.retention.cohort": "Bulan pendaftaran",
   "admin.dashboard.retention.cohort_size": "Pengguna baru",
+  "admin.impact_report.instance_accounts": "Akun profil yang akan terhapus",
+  "admin.impact_report.instance_followers": "Pengikut yang akan kehilangan oleh pengguna kita",
+  "admin.impact_report.instance_follows": "Pengikut yang akan kehilangan oleh pengguna lain",
+  "admin.impact_report.title": "Ringkasan dampak",
   "alert.rate_limited.message": "Mohon ulangi setelah {retry_time, time, medium}.",
   "alert.rate_limited.title": "Jumlah akses dibatasi",
   "alert.unexpected.message": "Terjadi kesalahan yang tidak terduga.",
@@ -82,6 +89,14 @@
   "announcement.announcement": "Pengumuman",
   "attachments_list.unprocessed": "(tidak diproses)",
   "audio.hide": "Sembunyikan audio",
+  "block_modal.remote_users_caveat": "Kami akan meminta {domain} server untuk menghargai keputusan Anda. Namun, kepatuhan tak dapat dipastikan karena beberapa server dapat menangani blokir secara beragam. Postingan publik masih dapat terlihat oleh pengguna tanpa masuk.",
+  "block_modal.show_less": "Tampilkan lebih sedikit",
+  "block_modal.show_more": "Tampilkan lebih banyak",
+  "block_modal.they_cant_mention": "Mereka tidak dapat menyebut atau mengikuti Anda.",
+  "block_modal.they_cant_see_posts": "Mereka tidak dapat melihat postingan Anda dan Anda tidak dapat melihat postingan mereka.",
+  "block_modal.they_will_know": "Mereka dapat melihat bahwa mereka diblokir.",
+  "block_modal.title": "Blokir pengguna?",
+  "block_modal.you_wont_see_mentions": "Anda tidak akan melihat kiriman yang menyebutkan mereka.",
   "boost_modal.combo": "Anda dapat menekan {combo} untuk melewati ini",
   "bundle_column_error.copy_stacktrace": "Salin laporan kesalahan",
   "bundle_column_error.error.body": "Laman yang diminta tidak dapat ditampilkan. Mungkin karena sebuah kutu dalam kode kami, atau masalah kompatibilitas peramban.",
@@ -104,8 +119,10 @@
   "column.blocks": "Pengguna yang diblokir",
   "column.bookmarks": "Markah",
   "column.community": "Linimasa Lokal",
+  "column.direct": "Sebut secara pribadi",
   "column.directory": "Jelajahi profil",
   "column.domain_blocks": "Domain tersembunyi",
+  "column.favourites": "Favorit",
   "column.follow_requests": "Permintaan mengikuti",
   "column.home": "Beranda",
   "column.lists": "List",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index 16e7e6c4480294..30c9eb77a9e219 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -297,6 +297,7 @@
   "filter_modal.select_filter.subtitle": "既存のカテゴリーを使用するか新規作成します",
   "filter_modal.select_filter.title": "この投稿をフィルターする",
   "filter_modal.title.status": "投稿をフィルターする",
+  "filtered_notifications_banner.mentions": "{count, plural, one {メンション} other {メンション}}",
   "filtered_notifications_banner.pending_requests": "{count, plural, =0 {アカウント} other {#アカウント}}からの通知がブロックされています",
   "filtered_notifications_banner.title": "ブロック済みの通知",
   "firehose.all": "すべて",
@@ -488,6 +489,8 @@
   "notifications.column_settings.admin.sign_up": "新規登録:",
   "notifications.column_settings.alert": "デスクトップ通知",
   "notifications.column_settings.favourite": "お気に入り:",
+  "notifications.column_settings.filter_bar.advanced": "すべてのカテゴリを表示",
+  "notifications.column_settings.filter_bar.category": "クイックフィルターバー:",
   "notifications.column_settings.follow": "新しいフォロワー:",
   "notifications.column_settings.follow_request": "新しいフォローリクエスト:",
   "notifications.column_settings.mention": "返信:",
@@ -698,9 +701,11 @@
   "status.direct": "@{name}さんに非公開で投稿",
   "status.direct_indicator": "非公開の返信",
   "status.edit": "編集",
+  "status.edited": "最終更新日 {date}",
   "status.edited_x_times": "{count}回編集",
   "status.embed": "埋め込み",
   "status.favourite": "お気に入り",
+  "status.favourites": "{count, plural, one {お気に入り} other {お気に入り}}",
   "status.filter": "この投稿をフィルターする",
   "status.filtered": "フィルターされました",
   "status.hide": "投稿を非表示",
@@ -721,6 +726,7 @@
   "status.reblog": "ブースト",
   "status.reblog_private": "ブースト",
   "status.reblogged_by": "{name}さんがブースト",
+  "status.reblogs": "{count, plural, one {ブースト} other {ブースト}}",
   "status.reblogs.empty": "まだ誰もブーストしていません。ブーストされるとここに表示されます。",
   "status.redraft": "削除して下書きに戻す",
   "status.remove_bookmark": "ブックマークを削除",
diff --git a/config/locales/devise.ia.yml b/config/locales/devise.ia.yml
index 4b4d1f441b3a85..62f106bcf7a46a 100644
--- a/config/locales/devise.ia.yml
+++ b/config/locales/devise.ia.yml
@@ -2,6 +2,8 @@
 ia:
   devise:
     failure:
+      already_authenticated: Tu jam initiava le session.
+      inactive: Tu conto ancora non es activate.
       locked: Tu conto es blocate.
     mailer:
       confirmation_instructions:
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index ab92e106a36cbe..f82a592ec39215 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -770,7 +770,7 @@ fi:
         disabled: Ei kenellekkään
         users: Kirjautuneille paikallisille käyttäjille
       registrations:
-        moderation_recommandation: Varmista, että sinulla on riittävä ja toimintavalmis joukko moderaattoreita ennen kuin avaat rekisteröitymiset kaikille!
+        moderation_recommandation: Varmista, että sinulla on riittävä ja toimintavalmis joukko moderaattoreita, ennen kuin vapautat rekisteröitymismenettelyn kaikille!
         preamble: Määritä, kuka voi luoda tilin palvelimellesi.
         title: Rekisteröityminen
       registrations_mode:
@@ -972,7 +972,7 @@ fi:
       webhook: Webhook
   admin_mailer:
     auto_close_registrations:
-      body: Viimeaikaisen moderaattoritoiminnan puutteen vuoksi palvelimen %{instance} rekisteröitymiset on vaihdettu automaattisesti manuaaliseen tarkasteluun, jotta palvelinta %{instance} ei käytetä mahdollisten huonojen toimijoiden alustana. Voit vaihtaa takaisin avoimiin rekisteröitymisiin milloin tahansa.
+      body: Palvelimen %{instance} moderaattorit eivät ole olleet viime aikoina aktiivisia. Tästä syystä rekisteröitymismenettely on automaattisesti vaihdettu erillishyväksyntöjä edellyttäväksi. Näin vähennetään riskiä palvelimen %{instance} käyttöön haitallisten toimijoiden alustana. Voit koska tahansa palauttaa käyttöön vapaat rekisteröitymiset.
       subject: Rekisteröitymiset palvelimelle %{instance} on automaattisesti vaihdettu vaatimaan hyväksyntää
     new_appeal:
       actions:
@@ -1882,8 +1882,8 @@ fi:
       follows_title: Ehdotuksia seurattavaksi
       follows_view_more: Näytä lisää seurattavia henkilöitä
       hashtags_recent_count:
-        one: "%{people} henkilö viimeisenä 2 päivänä"
-        other: "%{people} henkilöä viimeisenä 2 päivänä"
+        one: "%{people} henkilö viimeisen 2 päivän aikana"
+        other: "%{people} henkilöä viimeisen 2 päivän aikana"
       hashtags_subtitle: Tutki, mikä on ollut suosittua viimeisenä 2 päivänä
       hashtags_title: Suositut aihetunnisteet
       hashtags_view_more: Näytä lisää suosittuja aihetunnisteita
diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index 5065ca7bbbda75..3ba7a514800ea5 100644
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -53,7 +53,10 @@ ia:
         all: Toto
         title: Location
       moderation:
+        active: Active
+        all: Toto
         disabled: Disactivate
+      moderation_notes: Notas de moderation
       most_recent_activity: Activitate plus recente
       most_recent_ip: IP plus recente
       public: Public
@@ -83,13 +86,19 @@ ia:
     action_logs:
       action_types:
         confirm_user: Confirmar le usator
+        create_account_warning: Crear un advertimento
         create_announcement: Crear annuncio
+        create_ip_block: Crear un regula IP
+        destroy_announcement: Deler annuncio
         destroy_ip_block: Deler le regula IP
         destroy_status: Deler le message
         destroy_unavailable_domain: Deler le dominio non disponibile
         disable_2fa_user: Disactivar 2FA
+        disable_custom_emoji: Disactivar emoji personalisate
         disable_user: Disactivar le usator
+        enable_custom_emoji: Activar emoji personalisate
         enable_user: Activar le usator
+        promote_user: Promover usator
         reset_password_user: Reinitialisar contrasigno
         update_announcement: Actualisar annuncio
         update_custom_emoji: Actualisar emoji personalisate
@@ -112,8 +121,10 @@ ia:
       title: Annuncios
     custom_emojis:
       by_domain: Dominio
+      copied_msg: Copia local del emoji create con successo
       copy: Copiar
       create_new_category: Crear nove categoria
+      created_msg: Emoji create con successo!
       delete: Deler
       disable: Disactivar
       disabled: Disactivate
@@ -125,16 +136,22 @@ ia:
       upload: Incargar
     dashboard:
       active_users: usatores active
+      interactions: interactiones
       media_storage: Immagazinage de medios
       new_users: nove usatores
       opened_reports: reportos aperte
+      top_languages: Linguas le plus active
+      top_servers: Servitores le plus active
       website: Sito web
     domain_allows:
       add_new: Permitter federation con dominio
+      export: Exportar
+      import: Importar
     domain_blocks:
       confirm_suspension:
         cancel: Cancellar
       domain: Dominio
+      edit: Modificar un bloco de dominio
       export: Exportar
       import: Importar
       private_comment: Commento private
@@ -145,19 +162,31 @@ ia:
       domain: Dominio
       new:
         create: Adder un dominio
+        title: Blocar un nove dominio de e-mail
+      title: Dominios de e-mail blocate
     export_domain_allows:
       no_file: Necun file seligite
+    export_domain_blocks:
+      no_file: Necun file seligite
     follow_recommendations:
       language: Per lingua
       status: Stato
+      title: Sequer le recommendationes
     instances:
+      back_to_warning: Advertimento
+      by_domain: Dominio
+      content_policies:
+        reason: Ration public
       dashboard:
+        instance_accounts_dimension: Contos le plus sequite
         instance_languages_dimension: Linguas principal
       delivery:
         unavailable: Non disponibile
       empty: Necun dominios trovate.
       private_comment: Commento private
       public_comment: Commento public
+      total_blocked_by_us: Blocate per nos
+      total_followed_by_us: Sequite per nos
     invites:
       deactivate_all: Disactivar toto
       filter:
@@ -179,12 +208,17 @@ ia:
       disabled: Disactivate
       enable: Activar
       enabled: Activate
+      save_and_enable: Salveguardar e activar
+      status: Stato
     reports:
       add_to_report: Adder plus al reporto
       are_you_sure: Es tu secur?
       cancel: Cancellar
+      category: Categoria
+      confirm: Confirmar
       delete_and_resolve: Deler le messages
       notes:
+        create: Adder un nota
         delete: Deler
       skip_to_actions: Saltar al actiones
       status: Stato
@@ -193,6 +227,11 @@ ia:
     roles:
       everyone: Permissiones predefinite
       privileges:
+        delete_user_data: Deler le datos de usator
+        manage_announcements: Gerer le annuncios
+        manage_invites: Gerer le invitationes
+        manage_rules: Gerer le regulas
+        manage_settings: Gerer le parametros
         manage_users: Gerer usatores
     rules:
       delete: Deler
@@ -294,6 +333,13 @@ ia:
       not_found: non poterea esser trovate
   preferences:
     public_timelines: Chronologias public
+  statuses:
+    poll:
+      vote: Votar
+    show_more: Monstrar plus
+    visibilities:
+      private_long: Solmente monstrar a sequitores
+      public: Public
   statuses_cleanup:
     min_age:
       '1209600': 2 septimanas
@@ -307,11 +353,26 @@ ia:
   themes:
     default: Mastodon (Obscur)
     mastodon-light: Mastodon (Clar)
+    system: Automatic (usar thema del systema)
   two_factor_authentication:
     add: Adder
     disable: Disactivar 2FA
+    edit: Modificar
   user_mailer:
+    appeal_approved:
+      action: Parametros de conto
     welcome:
+      apps_android_action: Obtene lo sur Google Play
+      apps_ios_action: Discargar sur le App Store
+      apps_step: Discarga nostre applicationes official.
+      apps_title: Applicationes de Mastodon
+      edit_profile_action: Personalisar
+      edit_profile_title: Personalisar tu profilo
+      feature_action: Apprender plus
+      share_title: Compartir tu profilo de Mastodon
       subject: Benvenite in Mastodon
+  verification:
+    verified_links: Tu ligamines verificate
   webauthn_credentials:
+    add: Adder un nove clave de securitate
     delete: Deler
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index f9cbb6a75e64d0..da9a4214117720 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -1849,6 +1849,8 @@ ja:
       follows_subtitle: 人気アカウントをフォロー
       follows_title: フォローを増やしてみませんか？
       follows_view_more: フォローするユーザーを探す
+      hashtags_recent_count:
+        other: 過去 2 日間で %{people} 人が共有
       hashtags_subtitle: 過去2日間のトレンドを見る
       hashtags_title: トレンドのハッシュタグ
       hashtags_view_more: トレンドのハッシュタグをもっと見る
diff --git a/config/locales/simple_form.fi.yml b/config/locales/simple_form.fi.yml
index b1c2e91a1ee3e7..c3fbd437204c8f 100644
--- a/config/locales/simple_form.fi.yml
+++ b/config/locales/simple_form.fi.yml
@@ -116,7 +116,7 @@ fi:
           sign_up_requires_approval: Uudet rekisteröitymiset edellyttävät hyväksyntääsi
         severity: Valitse, mitä tapahtuu tämän IP-osoitteen pyynnöille
       rule:
-        hint: Valinnainen. Anna lisätietoja säännöstä
+        hint: Vapaaehtoinen. Anna yksityiskohtaisempia tietoja säännöstä
         text: Kuvaile sääntöä tai edellytystä palvelimesi käyttäjille. Suosi tiivistä, yksinkertaista ilmaisua
       sessions:
         otp: 'Näppäile mobiilisovelluksessa näkyvä kaksivaiheisen todennuksen tunnusluku, tai käytä tarvittaessa palautuskoodia:'
diff --git a/config/locales/simple_form.ia.yml b/config/locales/simple_form.ia.yml
index 16dbcbd187dac9..2f04ce982e78d4 100644
--- a/config/locales/simple_form.ia.yml
+++ b/config/locales/simple_form.ia.yml
@@ -1,20 +1,44 @@
 ---
 ia:
   simple_form:
+    hints:
+      account:
+        note: 'Tu pote @mentionar altere personas o #hashtags.'
+      defaults:
+        setting_display_media_hide_all: Sempre celar le medios
+        setting_display_media_show_all: Sempre monstrar le medios
+      webhook:
+        events: Selige le eventos a inviar
+        url: Ubi le eventos essera inviate
     labels:
       account:
+        discoverable: Evidentiar le profilo e messages in le algorithmos de discoperta
         fields:
           name: Etiquetta
           value: Contento
+        indexable: Includer messages public in le resultatos de recerca
+        show_collections: Monstrar sequites e sequitores in le profilo
+        unlocked: Acceptar automaticamente nove sequitores
+      account_warning_preset:
+        title: Titulo
       admin_account_action:
         type: Action
+        types:
+          none: Inviar un advertimento
+      announcement:
+        text: Annuncio
       defaults:
+        autofollow: Invitar a sequer tu conto
         avatar: Pictura de profilo
         confirm_new_password: Confirmar nove contrasigno
         confirm_password: Confirmar contrasigno
         current_password: Contrasigno actual
+        display_name: Nomine a monstrar
+        email: Adresse de e-mail
+        locale: Lingua de interfacie
         new_password: Nove contrasigno
         password: Contrasigno
+        setting_advanced_layout: Activar le interfacie web avantiate
         setting_default_language: Lingua de publication
         setting_display_media_default: Predefinite
         setting_display_media_hide_all: Celar toto
@@ -26,29 +50,50 @@ ia:
         title: Titulo
         username: Nomine de usator
         username_or_email: Nomine de usator o e-mail
+      featured_tag:
+        name: Hashtag
+      filters:
+        actions:
+          hide: Celar completemente
+          warn: Celar con un advertimento
       form_admin_settings:
         bootstrap_timeline_accounts: Recommenda sempre iste contos a nove usatores
         custom_css: CSS personalisate
         profile_directory: Activar directorio de profilos
         site_contact_email: Adresse de e-mail de contacto
         site_contact_username: Nomine de usator de contacto
+        site_short_description: Description de servitor
         site_terms: Politica de confidentialitate
         site_title: Nomine de servitor
+        status_page_url: URL del pagina de stato
         theme: Thema predefinite
         trends: Activar tendentias
       ip_block:
+        comment: Commento
         severity: Regula
       notification_emails:
         software_updates:
+          all: Notificar sur tote le actualisationes
+          critical: Notificar solmente sur actualisationes critic
           label: Un nove version de Mastodon es disponibile
+          none: Nunquam notificar sur actualisationes (non recommendate)
       rule:
+        hint: Information additional
         text: Regula
       settings:
         indexable: Includer pagina de profilo in le motores de recerca
+      tag:
+        listable: Permitter a iste hashtag apparer in le recercas e suggestiones
+        name: Hashtag
+        usable: Permitter al messages usar iste hashtag
       user:
         time_zone: Fuso horari
       user_role:
         name: Nomine
         permissions_as_keys: Permissiones
         position: Prioritate
+    not_recommended: Non recommendate
+    recommended: Recommendate
+    required:
+      text: requirite
     'yes': Si

From 75163d9daf831a0562bcf35bffb883c2e7b239b7 Mon Sep 17 00:00:00 2001
From: Tim Rogers <rogers.timothy.john@gmail.com>
Date: Mon, 22 Apr 2024 03:53:08 -0500
Subject: [PATCH 0805/2191] Fixed rendering error on /start when not logged in
 (#30023)

---
 .../mastodon/features/onboarding/index.jsx    | 71 ++++++++++---------
 1 file changed, 37 insertions(+), 34 deletions(-)

diff --git a/app/javascript/mastodon/features/onboarding/index.jsx b/app/javascript/mastodon/features/onboarding/index.jsx
index 5900b9ec76db14..529d53f2574781 100644
--- a/app/javascript/mastodon/features/onboarding/index.jsx
+++ b/app/javascript/mastodon/features/onboarding/index.jsx
@@ -16,6 +16,7 @@ import EditNoteIcon from '@/material-icons/400-24px/edit_note.svg?react';
 import PersonAddIcon from '@/material-icons/400-24px/person_add.svg?react';
 import { focusCompose } from 'mastodon/actions/compose';
 import { Icon }  from 'mastodon/components/icon';
+import { NotSignedInIndicator } from 'mastodon/components/not_signed_in_indicator';
 import Column from 'mastodon/features/ui/components/column';
 import { me } from 'mastodon/initial_state';
 import { useAppSelector } from 'mastodon/store';
@@ -42,42 +43,44 @@ const Onboarding = () => {
 
   return (
     <Column>
-      <Switch>
-        <Route path='/start' exact>
-          <div className='scrollable privacy-policy'>
-            <div className='column-title'>
-              <img src={illustration} alt='' className='onboarding__illustration' />
-              <h3><FormattedMessage id='onboarding.start.title' defaultMessage="You've made it!" /></h3>
-              <p><FormattedMessage id='onboarding.start.lead' defaultMessage="Your new Mastodon account is ready to go. Here's how you can make the most of it:" /></p>
+      {account ? (
+        <Switch>
+          <Route path='/start' exact>
+            <div className='scrollable privacy-policy'>
+              <div className='column-title'>
+                <img src={illustration} alt='' className='onboarding__illustration' />
+                <h3><FormattedMessage id='onboarding.start.title' defaultMessage="You've made it!" /></h3>
+                <p><FormattedMessage id='onboarding.start.lead' defaultMessage="Your new Mastodon account is ready to go. Here's how you can make the most of it:" /></p>
+              </div>
+
+              <div className='onboarding__steps'>
+                <Step to='/start/profile' completed={(!account.get('avatar').endsWith('missing.png')) || (account.get('display_name').length > 0 && account.get('note').length > 0)} icon='address-book-o' iconComponent={AccountCircleIcon} label={<FormattedMessage id='onboarding.steps.setup_profile.title' defaultMessage='Customize your profile' />} description={<FormattedMessage id='onboarding.steps.setup_profile.body' defaultMessage='Others are more likely to interact with you with a filled out profile.' />} />
+                <Step to='/start/follows' completed={(account.get('following_count') * 1) >= 1} icon='user-plus' iconComponent={PersonAddIcon} label={<FormattedMessage id='onboarding.steps.follow_people.title' defaultMessage='Find at least {count, plural, one {one person} other {# people}} to follow' values={{ count: 7 }} />} description={<FormattedMessage id='onboarding.steps.follow_people.body' defaultMessage="You curate your own home feed. Let's fill it with interesting people." />} />
+                <Step onClick={handleComposeClick} completed={(account.get('statuses_count') * 1) >= 1} icon='pencil-square-o' iconComponent={EditNoteIcon} label={<FormattedMessage id='onboarding.steps.publish_status.title' defaultMessage='Make your first post' />} description={<FormattedMessage id='onboarding.steps.publish_status.body' defaultMessage='Say hello to the world.' values={{ emoji: <img className='emojione' alt='🐘' src={`${assetHost}/emoji/1f418.svg`} /> }} />} />
+                <Step to='/start/share' icon='copy' iconComponent={ContentCopyIcon} label={<FormattedMessage id='onboarding.steps.share_profile.title' defaultMessage='Share your profile' />} description={<FormattedMessage id='onboarding.steps.share_profile.body' defaultMessage='Let your friends know how to find you on Mastodon!' />} />
+              </div>
+
+              <p className='onboarding__lead'><FormattedMessage id='onboarding.start.skip' defaultMessage="Don't need help getting started?" /></p>
+
+              <div className='onboarding__links'>
+                <Link to='/explore' className='onboarding__link'>
+                  <FormattedMessage id='onboarding.actions.go_to_explore' defaultMessage='Take me to trending' />
+                  <Icon icon={ArrowRightAltIcon} />
+                </Link>
+
+                <Link to='/home' className='onboarding__link'>
+                  <FormattedMessage id='onboarding.actions.go_to_home' defaultMessage='Take me to my home feed' />
+                  <Icon icon={ArrowRightAltIcon} />
+                </Link>
+              </div>
             </div>
+          </Route>
 
-            <div className='onboarding__steps'>
-              <Step to='/start/profile' completed={(!account.get('avatar').endsWith('missing.png')) || (account.get('display_name').length > 0 && account.get('note').length > 0)} icon='address-book-o' iconComponent={AccountCircleIcon} label={<FormattedMessage id='onboarding.steps.setup_profile.title' defaultMessage='Customize your profile' />} description={<FormattedMessage id='onboarding.steps.setup_profile.body' defaultMessage='Others are more likely to interact with you with a filled out profile.' />} />
-              <Step to='/start/follows' completed={(account.get('following_count') * 1) >= 1} icon='user-plus' iconComponent={PersonAddIcon} label={<FormattedMessage id='onboarding.steps.follow_people.title' defaultMessage='Find at least {count, plural, one {one person} other {# people}} to follow' values={{ count: 7 }} />} description={<FormattedMessage id='onboarding.steps.follow_people.body' defaultMessage="You curate your own home feed. Let's fill it with interesting people." />} />
-              <Step onClick={handleComposeClick} completed={(account.get('statuses_count') * 1) >= 1} icon='pencil-square-o' iconComponent={EditNoteIcon} label={<FormattedMessage id='onboarding.steps.publish_status.title' defaultMessage='Make your first post' />} description={<FormattedMessage id='onboarding.steps.publish_status.body' defaultMessage='Say hello to the world.' values={{ emoji: <img className='emojione' alt='🐘' src={`${assetHost}/emoji/1f418.svg`} /> }} />} />
-              <Step to='/start/share' icon='copy' iconComponent={ContentCopyIcon} label={<FormattedMessage id='onboarding.steps.share_profile.title' defaultMessage='Share your profile' />} description={<FormattedMessage id='onboarding.steps.share_profile.body' defaultMessage='Let your friends know how to find you on Mastodon!' />} />
-            </div>
-
-            <p className='onboarding__lead'><FormattedMessage id='onboarding.start.skip' defaultMessage="Don't need help getting started?" /></p>
-
-            <div className='onboarding__links'>
-              <Link to='/explore' className='onboarding__link'>
-                <FormattedMessage id='onboarding.actions.go_to_explore' defaultMessage='Take me to trending' />
-                <Icon icon={ArrowRightAltIcon} />
-              </Link>
-
-              <Link to='/home' className='onboarding__link'>
-                <FormattedMessage id='onboarding.actions.go_to_home' defaultMessage='Take me to my home feed' />
-                <Icon icon={ArrowRightAltIcon} />
-              </Link>
-            </div>
-          </div>
-        </Route>
-
-        <Route path='/start/profile' component={Profile} />
-        <Route path='/start/follows' component={Follows} />
-        <Route path='/start/share' component={Share} />
-      </Switch>
+          <Route path='/start/profile' component={Profile} />
+          <Route path='/start/follows' component={Follows} />
+          <Route path='/start/share' component={Share} />
+        </Switch>
+      ) : <NotSignedInIndicator />}
 
       <Helmet>
         <meta name='robots' content='noindex' />

From 1ca6ff8ca537a51dc2ed83ee3a262e7ec01b9f00 Mon Sep 17 00:00:00 2001
From: Tim Rogers <rogers.timothy.john@gmail.com>
Date: Mon, 22 Apr 2024 04:00:24 -0500
Subject: [PATCH 0806/2191] Fixed crash when supplying FFMPEG_BINARY
 environment variable (#30022)

---
 app/lib/video_metadata_extractor.rb | 2 +-
 config/initializers/ffmpeg.rb       | 5 +++--
 lib/paperclip/image_extractor.rb    | 2 +-
 lib/paperclip/transcoder.rb         | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/lib/video_metadata_extractor.rb b/app/lib/video_metadata_extractor.rb
index f27d34868a2798..df5409375f16ef 100644
--- a/app/lib/video_metadata_extractor.rb
+++ b/app/lib/video_metadata_extractor.rb
@@ -22,7 +22,7 @@ def valid?
   private
 
   def ffmpeg_command_output
-    command = Terrapin::CommandLine.new('ffprobe', '-i :path -print_format :format -show_format -show_streams -show_error -loglevel :loglevel')
+    command = Terrapin::CommandLine.new(Rails.configuration.x.ffprobe_binary, '-i :path -print_format :format -show_format -show_streams -show_error -loglevel :loglevel')
     command.run(path: @path, format: 'json', loglevel: 'fatal')
   end
 
diff --git a/config/initializers/ffmpeg.rb b/config/initializers/ffmpeg.rb
index 30ea617fcd2a86..87f85eeec70007 100644
--- a/config/initializers/ffmpeg.rb
+++ b/config/initializers/ffmpeg.rb
@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
-if ENV['FFMPEG_BINARY'].present?
-  FFMPEG.ffmpeg_binary = ENV['FFMPEG_BINARY']
+Rails.application.configure do
+  config.x.ffmpeg_binary = ENV['FFMPEG_BINARY'] || 'ffmpeg'
+  config.x.ffprobe_binary = ENV['FFPROBE_BINARY'] || 'ffprobe'
 end
diff --git a/lib/paperclip/image_extractor.rb b/lib/paperclip/image_extractor.rb
index 17fe4326fdbf08..8a565d0469e1f5 100644
--- a/lib/paperclip/image_extractor.rb
+++ b/lib/paperclip/image_extractor.rb
@@ -35,7 +35,7 @@ def extract_image_from_file!
       dst.binmode
 
       begin
-        command = Terrapin::CommandLine.new('ffmpeg', '-i :source -loglevel :loglevel -y :destination', logger: Paperclip.logger)
+        command = Terrapin::CommandLine.new(Rails.configuration.x.ffmpeg_binary, '-i :source -loglevel :loglevel -y :destination', logger: Paperclip.logger)
         command.run(source: @file.path, destination: dst.path, loglevel: 'fatal')
       rescue Terrapin::ExitStatusError
         dst.close(true)
diff --git a/lib/paperclip/transcoder.rb b/lib/paperclip/transcoder.rb
index d2d946d3ade491..3efffa355a52d1 100644
--- a/lib/paperclip/transcoder.rb
+++ b/lib/paperclip/transcoder.rb
@@ -61,7 +61,7 @@ def make
       command_arguments, interpolations = prepare_command(destination)
 
       begin
-        command = Terrapin::CommandLine.new('ffmpeg', command_arguments.join(' '), logger: Paperclip.logger)
+        command = Terrapin::CommandLine.new(Rails.configuration.x.ffmpeg_binary, command_arguments.join(' '), logger: Paperclip.logger)
         command.run(interpolations)
       rescue Terrapin::ExitStatusError => e
         raise Paperclip::Error, "Error while transcoding #{@basename}: #{e}"

From 56b095edebebfcb0931edebd27ecd36504e19c5c Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 22 Apr 2024 05:01:24 -0400
Subject: [PATCH 0807/2191] Update Gemfile.lock ruby and bundler versions
 (#30011)

---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index aadd52d6419ae2..990994a488f525 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -951,7 +951,7 @@ DEPENDENCIES
   xorcist (~> 1.1)
 
 RUBY VERSION
-   ruby 3.2.2p53
+   ruby 3.2.3p157
 
 BUNDLED WITH
-   2.5.7
+   2.5.9

From ffbbf74c50bc6a3d91e194ee7ac446dae2db5c76 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 22 Apr 2024 05:01:36 -0400
Subject: [PATCH 0808/2191] Limit `http` gem version to 5.1.x series (#30010)

---
 Gemfile      | 2 +-
 Gemfile.lock | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile b/Gemfile
index 3f621ddc52c3b7..e26efcbd553bc8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -54,7 +54,7 @@ gem 'fast_blank', '~> 1.0'
 gem 'fastimage'
 gem 'hiredis', '~> 0.6'
 gem 'htmlentities', '~> 4.3'
-gem 'http', '~> 5.1'
+gem 'http', '~> 5.1.0'
 gem 'http_accept_language', '~> 2.1'
 gem 'httplog', '~> 1.6.2'
 gem 'i18n', '1.14.1' # TODO: Remove version when resolved: https://github.com/glebm/i18n-tasks/issues/552 / https://github.com/ruby-i18n/i18n/pull/688
diff --git a/Gemfile.lock b/Gemfile.lock
index 990994a488f525..2198efa79a499a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -860,7 +860,7 @@ DEPENDENCIES
   hcaptcha (~> 7.1)
   hiredis (~> 0.6)
   htmlentities (~> 4.3)
-  http (~> 5.1)
+  http (~> 5.1.0)
   http_accept_language (~> 2.1)
   httplog (~> 1.6.2)
   i18n (= 1.14.1)

From 33e829763dd7e4629ce62389c488aee12c35e94b Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 22 Apr 2024 08:22:16 -0400
Subject: [PATCH 0809/2191] Use shared `form` partial for `admin/domain_blocks`
 views (#29609)

---
 app/views/admin/domain_blocks/_form.html.haml | 46 ++++++++++++++
 app/views/admin/domain_blocks/edit.html.haml  | 61 ++-----------------
 app/views/admin/domain_blocks/new.html.haml   | 59 ++----------------
 3 files changed, 56 insertions(+), 110 deletions(-)
 create mode 100644 app/views/admin/domain_blocks/_form.html.haml

diff --git a/app/views/admin/domain_blocks/_form.html.haml b/app/views/admin/domain_blocks/_form.html.haml
new file mode 100644
index 00000000000000..f1785a1fddb8e0
--- /dev/null
+++ b/app/views/admin/domain_blocks/_form.html.haml
@@ -0,0 +1,46 @@
+.fields-row
+  .fields-row__column.fields-row__column-6.fields-group
+    = form.input :domain,
+                 disabled: form.object.persisted?,
+                 hint: t('admin.domain_blocks.new.hint'),
+                 label: t('admin.domain_blocks.domain'),
+                 readonly: form.object.persisted?,
+                 required: true,
+                 wrapper: :with_label
+  .fields-row__column.fields-row__column-6.fields-group
+    = form.input :severity,
+                 collection: DomainBlock.severities.keys,
+                 hint: t('admin.domain_blocks.new.severity.desc_html'),
+                 include_blank: false,
+                 label_method: ->(type) { t("admin.domain_blocks.new.severity.#{type}") },
+                 wrapper: :with_label
+.fields-group
+  = form.input :reject_media,
+               as: :boolean,
+               hint: I18n.t('admin.domain_blocks.reject_media_hint'),
+               label: I18n.t('admin.domain_blocks.reject_media'),
+               wrapper: :with_label
+.fields-group
+  = form.input :reject_reports,
+               as: :boolean,
+               hint: I18n.t('admin.domain_blocks.reject_reports_hint'),
+               label: I18n.t('admin.domain_blocks.reject_reports'),
+               wrapper: :with_label
+.fields-group
+  = form.input :obfuscate,
+               as: :boolean,
+               hint: I18n.t('admin.domain_blocks.obfuscate_hint'),
+               label: I18n.t('admin.domain_blocks.obfuscate'),
+               wrapper: :with_label
+.field-group
+  = form.input :private_comment,
+               as: :string,
+               hint: t('admin.domain_blocks.private_comment_hint'),
+               label: I18n.t('admin.domain_blocks.private_comment'),
+               wrapper: :with_label
+.field-group
+  = form.input :public_comment,
+               as: :string,
+               hint: t('admin.domain_blocks.public_comment_hint'),
+               label: I18n.t('admin.domain_blocks.public_comment'),
+               wrapper: :with_label
diff --git a/app/views/admin/domain_blocks/edit.html.haml b/app/views/admin/domain_blocks/edit.html.haml
index 7c0a9823a0e472..40c46b8b6b9404 100644
--- a/app/views/admin/domain_blocks/edit.html.haml
+++ b/app/views/admin/domain_blocks/edit.html.haml
@@ -1,63 +1,12 @@
 - content_for :page_title do
   = t('admin.domain_blocks.edit')
 
-= simple_form_for @domain_block, url: admin_domain_block_path(@domain_block), method: :put do |f|
+= simple_form_for @domain_block, url: admin_domain_block_path(@domain_block), method: :put do |form|
   = render 'shared/error_messages', object: @domain_block
 
-  .fields-row
-    .fields-row__column.fields-row__column-6.fields-group
-      = f.input :domain,
-                disabled: true,
-                hint: t('admin.domain_blocks.new.hint'),
-                label: t('admin.domain_blocks.domain'),
-                readonly: true,
-                required: true,
-                wrapper: :with_label
-
-    .fields-row__column.fields-row__column-6.fields-group
-      = f.input :severity,
-                collection: DomainBlock.severities.keys,
-                hint: t('admin.domain_blocks.new.severity.desc_html'),
-                include_blank: false,
-                label_method: ->(type) { t("admin.domain_blocks.new.severity.#{type}") },
-                wrapper: :with_label
-
-  .fields-group
-    = f.input :reject_media,
-              as: :boolean,
-              hint: I18n.t('admin.domain_blocks.reject_media_hint'),
-              label: I18n.t('admin.domain_blocks.reject_media'),
-              wrapper: :with_label
-
-  .fields-group
-    = f.input :reject_reports,
-              as: :boolean,
-              hint: I18n.t('admin.domain_blocks.reject_reports_hint'),
-              label: I18n.t('admin.domain_blocks.reject_reports'),
-              wrapper: :with_label
-
-  .fields-group
-    = f.input :obfuscate,
-              as: :boolean,
-              hint: I18n.t('admin.domain_blocks.obfuscate_hint'),
-              label: I18n.t('admin.domain_blocks.obfuscate'),
-              wrapper: :with_label
-
-  .field-group
-    = f.input :private_comment,
-              as: :string,
-              hint: t('admin.domain_blocks.private_comment_hint'),
-              label: I18n.t('admin.domain_blocks.private_comment'),
-              wrapper: :with_label
-
-  .field-group
-    = f.input :public_comment,
-              as: :string,
-              hint: t('admin.domain_blocks.public_comment_hint'),
-              label: I18n.t('admin.domain_blocks.public_comment'),
-              wrapper: :with_label
+  = render form
 
   .actions
-    = f.button :button,
-               t('generic.save_changes'),
-               type: :submit
+    = form.button :button,
+                  t('generic.save_changes'),
+                  type: :submit
diff --git a/app/views/admin/domain_blocks/new.html.haml b/app/views/admin/domain_blocks/new.html.haml
index 6a9855529f6d79..78bcfcba8e737d 100644
--- a/app/views/admin/domain_blocks/new.html.haml
+++ b/app/views/admin/domain_blocks/new.html.haml
@@ -1,61 +1,12 @@
 - content_for :page_title do
   = t('.title')
 
-= simple_form_for @domain_block, url: admin_domain_blocks_path do |f|
+= simple_form_for @domain_block, url: admin_domain_blocks_path do |form|
   = render 'shared/error_messages', object: @domain_block
 
-  .fields-row
-    .fields-row__column.fields-row__column-6.fields-group
-      = f.input :domain,
-                hint: t('.hint'),
-                label: t('admin.domain_blocks.domain'),
-                required: true,
-                wrapper: :with_label
-
-    .fields-row__column.fields-row__column-6.fields-group
-      = f.input :severity,
-                collection: DomainBlock.severities.keys,
-                hint: t('.severity.desc_html'),
-                include_blank: false,
-                label_method: ->(type) { t(".severity.#{type}") },
-                wrapper: :with_label
-
-  .fields-group
-    = f.input :reject_media,
-              as: :boolean,
-              hint: I18n.t('admin.domain_blocks.reject_media_hint'),
-              label: I18n.t('admin.domain_blocks.reject_media'),
-              wrapper: :with_label
-
-  .fields-group
-    = f.input :reject_reports,
-              as: :boolean,
-              hint: I18n.t('admin.domain_blocks.reject_reports_hint'),
-              label: I18n.t('admin.domain_blocks.reject_reports'),
-              wrapper: :with_label
-
-  .fields-group
-    = f.input :obfuscate,
-              as: :boolean,
-              hint: I18n.t('admin.domain_blocks.obfuscate_hint'),
-              label: I18n.t('admin.domain_blocks.obfuscate'),
-              wrapper: :with_label
-
-  .field-group
-    = f.input :private_comment,
-              as: :string,
-              hint: t('admin.domain_blocks.private_comment_hint'),
-              label: I18n.t('admin.domain_blocks.private_comment'),
-              wrapper: :with_label
-
-  .field-group
-    = f.input :public_comment,
-              as: :string,
-              hint: t('admin.domain_blocks.public_comment_hint'),
-              label: I18n.t('admin.domain_blocks.public_comment'),
-              wrapper: :with_label
+  = render form
 
   .actions
-    = f.button :button,
-               t('.create'),
-               type: :submit
+    = form.button :button,
+                  t('.create'),
+                  type: :submit

From 2ef098d01c69f667383f5d523a48ce7a09405957 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 22 Apr 2024 16:02:24 +0200
Subject: [PATCH 0810/2191] Revert "Rely on dotenv autoload instead of explicit
 call (#30007)" (#30028)

---
 config/application.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/config/application.rb b/config/application.rb
index b777018b5a106f..a17a48b093bad7 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -52,6 +52,8 @@
 require_relative '../lib/simple_navigation/item_extensions'
 require_relative '../lib/http_extensions'
 
+Dotenv::Rails.load
+
 Bundler.require(:pam_authentication) if ENV['PAM_ENABLED'] == 'true'
 
 require_relative '../lib/mastodon/redis_config'

From 483fabf48a0a89aed405e6472ad07552bc8befd5 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 22 Apr 2024 16:02:47 +0200
Subject: [PATCH 0811/2191] Update dependency http to '~> 5.2.0' (#30027)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
---
 Gemfile                | 2 +-
 Gemfile.lock           | 9 +++++----
 config/application.rb  | 1 -
 lib/http_extensions.rb | 8 --------
 4 files changed, 6 insertions(+), 14 deletions(-)
 delete mode 100644 lib/http_extensions.rb

diff --git a/Gemfile b/Gemfile
index e26efcbd553bc8..a10613b30b9fc9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -54,7 +54,7 @@ gem 'fast_blank', '~> 1.0'
 gem 'fastimage'
 gem 'hiredis', '~> 0.6'
 gem 'htmlentities', '~> 4.3'
-gem 'http', '~> 5.1.0'
+gem 'http', '~> 5.2.0'
 gem 'http_accept_language', '~> 2.1'
 gem 'httplog', '~> 1.6.2'
 gem 'i18n', '1.14.1' # TODO: Remove version when resolved: https://github.com/glebm/i18n-tasks/issues/552 / https://github.com/ruby-i18n/i18n/pull/688
diff --git a/Gemfile.lock b/Gemfile.lock
index 2198efa79a499a..ab73754607d88f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -318,11 +318,12 @@ GEM
     hiredis (0.6.3)
     hkdf (0.3.0)
     htmlentities (4.3.4)
-    http (5.1.1)
+    http (5.2.0)
       addressable (~> 2.8)
+      base64 (~> 0.1)
       http-cookie (~> 1.0)
       http-form_data (~> 2.2)
-      llhttp-ffi (~> 0.4.0)
+      llhttp-ffi (~> 0.5.0)
     http-cookie (1.0.5)
       domain_name (~> 0.5)
     http-form_data (2.3.0)
@@ -403,7 +404,7 @@ GEM
       railties (>= 5.2)
       rexml
     link_header (0.0.8)
-    llhttp-ffi (0.4.0)
+    llhttp-ffi (0.5.0)
       ffi-compiler (~> 1.0)
       rake (~> 13.0)
     lograge (0.14.0)
@@ -860,7 +861,7 @@ DEPENDENCIES
   hcaptcha (~> 7.1)
   hiredis (~> 0.6)
   htmlentities (~> 4.3)
-  http (~> 5.1.0)
+  http (~> 5.2.0)
   http_accept_language (~> 2.1)
   httplog (~> 1.6.2)
   i18n (= 1.14.1)
diff --git a/config/application.rb b/config/application.rb
index a17a48b093bad7..1b387899273471 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -50,7 +50,6 @@
 require_relative '../lib/active_record/database_tasks_extensions'
 require_relative '../lib/active_record/batches'
 require_relative '../lib/simple_navigation/item_extensions'
-require_relative '../lib/http_extensions'
 
 Dotenv::Rails.load
 
diff --git a/lib/http_extensions.rb b/lib/http_extensions.rb
deleted file mode 100644
index 048f85f87b88ed..00000000000000
--- a/lib/http_extensions.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-# frozen_string_literal: true
-
-# Monkey patching until https://github.com/httprb/http/pull/757 is merged
-unless HTTP::Request::METHODS.include?(:purge)
-  methods = HTTP::Request::METHODS.dup
-  HTTP::Request.send(:remove_const, :METHODS)
-  HTTP::Request.const_set(:METHODS, methods.push(:purge).freeze)
-end

From 1471c0d4e060efcc9f3cb7be72151dc95c81029c Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 23 Apr 2024 10:41:33 +0200
Subject: [PATCH 0812/2191] Update dependency rubocop to v1.63.3 (#30031)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index ab73754607d88f..7068f5dd55d344 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -644,7 +644,7 @@ GEM
       rspec-mocks (~> 3.0)
       sidekiq (>= 5, < 8)
     rspec-support (3.13.1)
-    rubocop (1.63.2)
+    rubocop (1.63.3)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)

From 91c7406b599f1b09a68fe38c6e812b338478841a Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 23 Apr 2024 10:41:50 +0200
Subject: [PATCH 0813/2191] Update dependency postcss-preset-env to v9.5.9
 (#30029)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index e6e130e2d6b815..b9f1c3d4d5f599 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -13157,9 +13157,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-custom-properties@npm:^13.3.7":
-  version: 13.3.7
-  resolution: "postcss-custom-properties@npm:13.3.7"
+"postcss-custom-properties@npm:^13.3.8":
+  version: 13.3.8
+  resolution: "postcss-custom-properties@npm:13.3.8"
   dependencies:
     "@csstools/cascade-layer-name-parser": "npm:^1.0.9"
     "@csstools/css-parser-algorithms": "npm:^2.6.1"
@@ -13168,7 +13168,7 @@ __metadata:
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/5d8767efae956f98d9a62a8f54d913c9ea95eaab1c906679ddeee64d87f0fb37d99c8ac1d16ec199794ed7c13a42d39ca2ea0a98df1056d400d4cbc9f31d6b94
+  checksum: 10c0/03dd1918f897005b23d09615ebb2c3faf4a01cac67462069c9cfa87c024b2a878f64948b0cf668971bc0ca00cfc349080879b3864deb3808a32d52ff2b473319
   languageName: node
   linkType: hard
 
@@ -13629,8 +13629,8 @@ __metadata:
   linkType: hard
 
 "postcss-preset-env@npm:^9.5.2":
-  version: 9.5.8
-  resolution: "postcss-preset-env@npm:9.5.8"
+  version: 9.5.9
+  resolution: "postcss-preset-env@npm:9.5.9"
   dependencies:
     "@csstools/postcss-cascade-layers": "npm:^4.0.4"
     "@csstools/postcss-color-function": "npm:^3.0.14"
@@ -13673,7 +13673,7 @@ __metadata:
     postcss-color-hex-alpha: "npm:^9.0.4"
     postcss-color-rebeccapurple: "npm:^9.0.3"
     postcss-custom-media: "npm:^10.0.4"
-    postcss-custom-properties: "npm:^13.3.7"
+    postcss-custom-properties: "npm:^13.3.8"
     postcss-custom-selectors: "npm:^7.1.8"
     postcss-dir-pseudo-class: "npm:^8.0.1"
     postcss-double-position-gradients: "npm:^5.0.6"
@@ -13694,7 +13694,7 @@ __metadata:
     postcss-selector-not: "npm:^7.0.2"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/5f77272eb7a938e5bedc3a0877f3fb0cdc6f20c8829730ccafbbd999db78ba4e6ac60f485aa7c292f70e011cf3edfadb7d2cc5459cbf9851abc25139eeb061b7
+  checksum: 10c0/dbe020e3fc08f0b71a3ee9d3c8a66a93bb6ba62281ac89fa59c82b8632ca58d6a911ddd9c65f15355c36aad63477633fc101cc0f3ce494dbc757193ba42eb61c
   languageName: node
   linkType: hard
 

From d754b15afb01dfbccb25ca1a4d01127a7c0ac919 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 23 Apr 2024 11:07:05 +0200
Subject: [PATCH 0814/2191] New Crowdin Translations (automated) (#30034)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/ia.json |  2 +-
 config/locales/activerecord.ia.yml      | 44 +++++++++++++++++++++++++
 config/locales/devise.ia.yml            | 11 +++++++
 config/locales/doorkeeper.ia.yml        | 18 ++++++++++
 config/locales/ia.yml                   | 12 +++++++
 5 files changed, 86 insertions(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/locales/ia.json b/app/javascript/mastodon/locales/ia.json
index 808b57278c43dd..73634b99c159aa 100644
--- a/app/javascript/mastodon/locales/ia.json
+++ b/app/javascript/mastodon/locales/ia.json
@@ -781,7 +781,7 @@
   "upload_modal.apply": "Applicar",
   "upload_modal.applying": "Applicante…",
   "upload_modal.choose_image": "Seliger un imagine",
-  "upload_modal.description_placeholder": "Le clown uzbek dogmatic justo foras quasi se asphyxiava",
+  "upload_modal.description_placeholder": "Cinque expertos del zoo jam bibeva whisky frigide",
   "upload_modal.detect_text": "Deteger texto de un imagine",
   "upload_modal.edit_media": "Modificar le medio",
   "upload_modal.hint": "Clicca o trahe le circulo sur le previsualisation pro eliger le puncto focal que essera sempre visibile sur tote le miniaturas.",
diff --git a/config/locales/activerecord.ia.yml b/config/locales/activerecord.ia.yml
index eec89ad52a5e27..b1dd90bc368b9c 100644
--- a/config/locales/activerecord.ia.yml
+++ b/config/locales/activerecord.ia.yml
@@ -2,14 +2,58 @@
 ia:
   activerecord:
     attributes:
+      poll:
+        expires_at: Data limite
+        options: Optiones
       user:
+        agreement: Accordo de servicio
         email: Adresse de e-mail
+        locale: Region
         password: Contrasigno
       user/account:
         username: Nomine de usator
+      user/invite_request:
+        text: Motivo
     errors:
       models:
+        account:
+          attributes:
+            username:
+              invalid: debe continer solmente litteras, numeros e tractos de sublineamento
+              reserved: es reservate
+        admin/webhook:
+          attributes:
+            url:
+              invalid: non es un URL valide
+        doorkeeper/application:
+          attributes:
+            website:
+              invalid: non es un URL valide
+        import:
+          attributes:
+            data:
+              malformed: es mal formate
         status:
           attributes:
             reblog:
               taken: del message jam existe
+        user:
+          attributes:
+            email:
+              blocked: usa un fornitor de e-mail prohibite
+              unreachable: non pare exister
+            role_id:
+              elevated: non pote esser superior a tu rolo actual
+        user_role:
+          attributes:
+            permissions_as_keys:
+              dangerous: includer permissiones non secur pro le rolo de base
+              elevated: non pote includer permissiones que tu rolo actual non possede
+              own_role: non pote esser cambiate con tu rolo actual
+            position:
+              elevated: non pote esser superior a tu rolo actual
+              own_role: non pote esser cambiate con tu rolo actual
+        webhook:
+          attributes:
+            events:
+              invalid_permissions: non pote includer eventos pro le quales tu non ha le derectos
diff --git a/config/locales/devise.ia.yml b/config/locales/devise.ia.yml
index 62f106bcf7a46a..d180a46a6f905a 100644
--- a/config/locales/devise.ia.yml
+++ b/config/locales/devise.ia.yml
@@ -1,10 +1,21 @@
 ---
 ia:
   devise:
+    confirmations:
+      confirmed: Tu conto de e-mail ha essite confirmate con successo.
+      send_instructions: Tu recipera un e-mail con instructiones pro confirmar tu adresse de e-mail in poc minutas. Per favor verifica tu dossier de spam si tu non lo recipe.
+      send_paranoid_instructions: Si tu adresse de e-mail existe in nostre base de datos, tu recipera un e-mail con instructiones pro confirmar tu adresse de e-mail in poc minutas. Per favor verifica tu dossier de spam si tu non lo recipe.
     failure:
       already_authenticated: Tu jam initiava le session.
       inactive: Tu conto ancora non es activate.
+      invalid: "%{authentication_keys} o contrasigno non valide."
+      last_attempt: Tu ha solmente un altere tentativa ante que tu conto es serrate.
       locked: Tu conto es blocate.
+      not_found_in_database: "%{authentication_keys} o contrasigno non valide."
+      omniauth_user_creation_failure: Error creante un conto pro iste identitate.
+      pending: Tu conto es ancora sub revision.
+      timeout: Tu session ha expirate. Per favor reaperi session pro continuar.
+      unauthenticated: Es necessari aperir session o crear un conto ante de continuar.
     mailer:
       confirmation_instructions:
         action: Verificar adresse de e-mail
diff --git a/config/locales/doorkeeper.ia.yml b/config/locales/doorkeeper.ia.yml
index 443342b404760c..b41531a1b15675 100644
--- a/config/locales/doorkeeper.ia.yml
+++ b/config/locales/doorkeeper.ia.yml
@@ -5,9 +5,16 @@ ia:
       doorkeeper/application:
         name: Nomine de application
         website: Sito web de application
+    errors:
+      models:
+        doorkeeper/application:
+          attributes:
+            redirect_uri:
+              invalid_uri: debe esser un URI valide.
   doorkeeper:
     applications:
       buttons:
+        authorize: Autorisar
         cancel: Cancellar
         edit: Modificar
       confirmations:
@@ -28,6 +35,8 @@ ia:
         actions: Actiones
         title: 'Application: %{name}'
     authorizations:
+      buttons:
+        authorize: Autorisar
       error:
         title: Ocurreva un error
     authorized_applications:
@@ -50,14 +59,17 @@ ia:
       title:
         accounts: Contos
         admin/accounts: Gestion de contos
+        admin/reports: Gestion de reportos
         all: Accesso plen a tu conto de Mastodon
         bookmarks: Marcapaginas
         conversations: Conversationes
         favourites: Favoritos
+        filters: Filtros
         lists: Listas
         mutes: Silentiates
         notifications: Notificationes
         push: Notificationes push
+        reports: Reportos
         search: Cercar
         statuses: Messages
     layouts:
@@ -67,16 +79,21 @@ ia:
           oauth2_provider: Fornitor OAuth2
     scopes:
       admin:read: leger tote le datos in le servitor
+      admin:write: modificar tote le datos in le servitor
       read: leger tote le datos de tu conto
       read:accounts: vider informationes de conto
+      read:bookmarks: vider tu marcapaginas
       read:favourites: vider tu favoritos
       read:filters: vider tu filtros
+      read:follows: vider tu sequites
       read:lists: vider tu listas
       read:notifications: vider tu notificationes
       read:reports: vider tu reportos
       read:statuses: vider tote le messages
+      write: modificar tote le datos de tu conto
       write:accounts: modificar tu profilo
       write:blocks: blocar contos e dominios
+      write:bookmarks: adder messages al marcapaginas
       write:conversations: silentiar e deler conversationes
       write:favourites: messages favorite
       write:filters: crear filtros
@@ -85,4 +102,5 @@ ia:
       write:media: incargar files de medios
       write:mutes: silentiar personas e conversationes
       write:notifications: rader tu notificationes
+      write:reports: signalar altere personas
       write:statuses: publicar messages
diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index 3ba7a514800ea5..a167b5d8cdb9c9 100644
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -22,6 +22,7 @@ ia:
   admin:
     account_moderation_notes:
       create: Lassar un nota
+      created_msg: Nota de moderation create con successo!
     accounts:
       add_email_domain_block: Blocar dominio de e-mail
       are_you_sure: Es tu secur?
@@ -74,13 +75,19 @@ ia:
       security_measures:
         only_password: Solmente contrasigno
         password_and_2fa: Contrasigno e 2FA
+      show:
+        created_reports: Reportos facite
+        targeted_reports: Signalate per alteres
       silenced: Limitate
       statuses: Messages
       subscribe: Subscriber
+      suspended: Suspendite
       title: Contos
       unblock_email: Disblocar adresse de e-mail
       unblocked_email_msg: Adresse de e-mail de %{username} disblocate con successo
       unconfirmed_email: E-mail non confirmate
+      undo_silenced: Disfacer le limite
+      undo_suspension: Disfacer le suspension
       username: Nomine de usator
       view_domain: Vider summario de dominio
     action_logs:
@@ -100,6 +107,9 @@ ia:
         enable_user: Activar le usator
         promote_user: Promover usator
         reset_password_user: Reinitialisar contrasigno
+        silence_account: Limitar conto
+        unblock_email_account: Disblocar adresse de e-mail
+        unsilence_account: Disfacer le limite de conto
         update_announcement: Actualisar annuncio
         update_custom_emoji: Actualisar emoji personalisate
         update_ip_block: Actualisar le regula IP
@@ -133,6 +143,7 @@ ia:
       enabled_msg: Emoji activate con successo
       new:
         title: Adder nove emoji personalisate
+      title: Emojis personalisate
       upload: Incargar
     dashboard:
       active_users: usatores active
@@ -150,6 +161,7 @@ ia:
     domain_blocks:
       confirm_suspension:
         cancel: Cancellar
+        stop_communication: Tu servitor stoppara le communication con iste servitores.
       domain: Dominio
       edit: Modificar un bloco de dominio
       export: Exportar

From 049b159beb672ca50b239a2275f78870ee7787da Mon Sep 17 00:00:00 2001
From: Emelia Smith <ThisIsMissEm@users.noreply.github.com>
Date: Tue, 23 Apr 2024 13:47:00 +0200
Subject: [PATCH 0815/2191] Add read:me OAuth 2.0 scope, allowing more limited
 access to user data (#29087)

---
 .../api/v1/accounts/credentials_controller.rb      |  2 +-
 config/initializers/doorkeeper.rb                  |  1 +
 config/locales/doorkeeper.en.yml                   |  1 +
 spec/requests/api/v1/accounts/credentials_spec.rb  | 14 ++++++++++++++
 4 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/app/controllers/api/v1/accounts/credentials_controller.rb b/app/controllers/api/v1/accounts/credentials_controller.rb
index 8f31336b9f81a7..e8f712457eee78 100644
--- a/app/controllers/api/v1/accounts/credentials_controller.rb
+++ b/app/controllers/api/v1/accounts/credentials_controller.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Api::V1::Accounts::CredentialsController < Api::BaseController
-  before_action -> { doorkeeper_authorize! :read, :'read:accounts' }, except: [:update]
+  before_action -> { doorkeeper_authorize! :read, :'read:accounts', :'read:me' }, except: [:update]
   before_action -> { doorkeeper_authorize! :write, :'write:accounts' }, only: [:update]
   before_action :require_user!
 
diff --git a/config/initializers/doorkeeper.rb b/config/initializers/doorkeeper.rb
index 428e4739139a50..1e8f9ad50617b9 100644
--- a/config/initializers/doorkeeper.rb
+++ b/config/initializers/doorkeeper.rb
@@ -89,6 +89,7 @@
                   :'write:reports',
                   :'write:statuses',
                   :read,
+                  :'read:me',
                   :'read:accounts',
                   :'read:blocks',
                   :'read:bookmarks',
diff --git a/config/locales/doorkeeper.en.yml b/config/locales/doorkeeper.en.yml
index 0432a5e3fb04cc..98776f2193fba6 100644
--- a/config/locales/doorkeeper.en.yml
+++ b/config/locales/doorkeeper.en.yml
@@ -174,6 +174,7 @@ en:
       read:filters: see your filters
       read:follows: see your follows
       read:lists: see your lists
+      read:me: read only your account's basic information
       read:mutes: see your mutes
       read:notifications: see your notifications
       read:reports: see your reports
diff --git a/spec/requests/api/v1/accounts/credentials_spec.rb b/spec/requests/api/v1/accounts/credentials_spec.rb
index 737348c2dddff8..8ae9c78a0e50b3 100644
--- a/spec/requests/api/v1/accounts/credentials_spec.rb
+++ b/spec/requests/api/v1/accounts/credentials_spec.rb
@@ -28,6 +28,20 @@
         locked: true,
       })
     end
+
+    describe 'allows the read:me scope' do
+      let(:scopes) { 'read:me' }
+
+      it 'returns the response successfully' do
+        subject
+
+        expect(response).to have_http_status(200)
+
+        expect(body_as_json).to include({
+          locked: true,
+        })
+      end
+    end
   end
 
   describe 'PATCH /api/v1/accounts/update_credentials' do

From a2399046ca600d492b492b8dae88011de687bece Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 23 Apr 2024 14:54:52 +0200
Subject: [PATCH 0816/2191] Fix string interpolation for software updates admin
 mailer (#30035)

---
 app/views/admin_mailer/new_critical_software_updates.text.erb | 2 +-
 app/views/admin_mailer/new_software_updates.text.erb          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/admin_mailer/new_critical_software_updates.text.erb b/app/views/admin_mailer/new_critical_software_updates.text.erb
index e4886c26219d19..a3f031bdad21a4 100644
--- a/app/views/admin_mailer/new_critical_software_updates.text.erb
+++ b/app/views/admin_mailer/new_critical_software_updates.text.erb
@@ -1,7 +1,7 @@
 <%= raw t('admin_mailer.new_critical_software_updates.body') %>
 
 <% @software_updates.each do |update| %>
-- Mastodon #{update.version}: #{update.release_notes}
+- Mastodon <%= update.version %>: <%= update.release_notes %>
 <% end %>
 
 <%= raw t('application_mailer.view')%> <%= admin_software_updates_url %>
diff --git a/app/views/admin_mailer/new_software_updates.text.erb b/app/views/admin_mailer/new_software_updates.text.erb
index 7612b7c59f72d8..0eccbbf9efa575 100644
--- a/app/views/admin_mailer/new_software_updates.text.erb
+++ b/app/views/admin_mailer/new_software_updates.text.erb
@@ -1,7 +1,7 @@
 <%= raw t('admin_mailer.new_software_updates.body') %>
 
 <% @software_updates.each do |update| %>
-- Mastodon #{update.version}: #{update.release_notes}
+- Mastodon <%= update.version %>: <%= update.release_notes %>
 <% end %>
 
 <%= raw t('application_mailer.view')%> <%= admin_software_updates_url %>

From 32ead51e5a8d6abbc0b4bacb00192ddc72a9817a Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 23 Apr 2024 12:43:49 -0400
Subject: [PATCH 0817/2191] Add material design icons to admin/settings views
 (#27780)

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
---
 app/helpers/application_helper.rb                    |  8 ++++++++
 app/javascript/styles/mastodon/admin.scss            |  7 +++++++
 .../account_warnings/_account_warning.html.haml      |  2 +-
 app/views/admin/accounts/_remote_account.html.haml   |  4 ++--
 app/views/admin/accounts/index.html.haml             |  6 +++---
 app/views/admin/accounts/show.html.haml              |  2 +-
 app/views/admin/custom_emojis/index.html.haml        |  8 ++++----
 app/views/admin/dashboard/index.html.haml            |  8 ++++----
 app/views/admin/email_domain_blocks/index.html.haml  |  2 +-
 .../export_domain_blocks/_domain_block.html.haml     |  2 +-
 .../admin/export_domain_blocks/import.html.haml      |  2 +-
 .../admin/follow_recommendations/show.html.haml      |  4 ++--
 app/views/admin/instances/show.html.haml             |  2 +-
 app/views/admin/invites/_invite.html.haml            |  2 +-
 app/views/admin/ip_blocks/index.html.haml            |  2 +-
 app/views/admin/relationships/index.html.haml        |  4 ++--
 app/views/admin/relays/_relay.html.haml              |  4 ++--
 app/views/admin/reports/_header_card.html.haml       |  2 +-
 app/views/admin/reports/_status.html.haml            |  2 +-
 app/views/admin/reports/actions/preview.html.haml    |  2 +-
 app/views/admin/reports/show.html.haml               |  4 ++--
 app/views/admin/roles/_role.html.haml                |  4 ++--
 app/views/admin/settings/shared/_links.html.haml     |  2 +-
 app/views/admin/status_edits/_status_edit.html.haml  |  2 +-
 app/views/admin/statuses/index.html.haml             |  4 ++--
 app/views/admin/tags/show.html.haml                  | 12 ++++++------
 app/views/admin/trends/links/index.html.haml         | 10 +++++-----
 .../links/preview_card_providers/index.html.haml     |  6 +++---
 app/views/admin/trends/statuses/_status.html.haml    |  2 +-
 app/views/admin/trends/statuses/index.html.haml      |  8 ++++----
 app/views/admin/trends/tags/_tag.html.haml           |  2 +-
 app/views/admin/trends/tags/index.html.haml          |  4 ++--
 config/initializers/propshaft.rb                     |  4 ++++
 33 files changed, 79 insertions(+), 60 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 668afe7fde13d9..4cf959f2d8e0aa 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -113,6 +113,14 @@ def fa_icon(icon, attributes = {})
     content_tag(:i, nil, attributes.merge(class: class_names.join(' ')))
   end
 
+  def material_symbol(icon, attributes = {})
+    inline_svg_tag(
+      "400-24px/#{icon}.svg",
+      class: %w(icon).concat(attributes[:class].to_s.split),
+      role: :img
+    )
+  end
+
   def check_icon
     inline_svg_tag 'check.svg'
   end
diff --git a/app/javascript/styles/mastodon/admin.scss b/app/javascript/styles/mastodon/admin.scss
index fadd77d13d92d5..06a3b520216d04 100644
--- a/app/javascript/styles/mastodon/admin.scss
+++ b/app/javascript/styles/mastodon/admin.scss
@@ -10,6 +10,13 @@ $content-width: 840px;
   width: 100%;
   min-height: 100vh;
 
+  .icon {
+    width: 16px;
+    height: 16px;
+    vertical-align: middle;
+    margin: 0 2px;
+  }
+
   .sidebar-wrapper {
     min-height: 100vh;
     overflow: hidden;
diff --git a/app/views/admin/account_warnings/_account_warning.html.haml b/app/views/admin/account_warnings/_account_warning.html.haml
index 5702e4f6d27652..368e69e63e20bb 100644
--- a/app/views/admin/account_warnings/_account_warning.html.haml
+++ b/app/views/admin/account_warnings/_account_warning.html.haml
@@ -2,7 +2,7 @@
   .log-entry__header
     .log-entry__avatar
       .indicator-icon{ class: account_warning.overruled? ? 'success' : 'failure' }
-        = fa_icon 'warning'
+        = material_symbol 'warning'
     .log-entry__content
       .log-entry__title
         = t(account_warning.action,
diff --git a/app/views/admin/accounts/_remote_account.html.haml b/app/views/admin/accounts/_remote_account.html.haml
index 99996e1d46d657..6755af2496c10c 100644
--- a/app/views/admin/accounts/_remote_account.html.haml
+++ b/app/views/admin/accounts/_remote_account.html.haml
@@ -2,14 +2,14 @@
   %th= t('admin.accounts.inbox_url')
   %td
     = account.inbox_url
-    = fa_icon DeliveryFailureTracker.available?(account.inbox_url) ? 'check' : 'times'
+    = material_symbol DeliveryFailureTracker.available?(account.inbox_url) ? 'check' : 'close'
   %td
     = table_link_to 'search', domain_block.present? ? t('admin.domain_blocks.view') : t('admin.accounts.view_domain'), admin_instance_path(account.domain)
 %tr
   %th= t('admin.accounts.shared_inbox_url')
   %td
     = account.shared_inbox_url
-    = fa_icon DeliveryFailureTracker.available?(account.shared_inbox_url) ? 'check' : 'times'
+    = material_symbol DeliveryFailureTracker.available?(account.shared_inbox_url) ? 'check' : 'close'
   %td
     - if domain_block.nil?
       = table_link_to 'ban', t('admin.domain_blocks.add_new'), new_admin_domain_block_path(_domain: account.domain)
diff --git a/app/views/admin/accounts/index.html.haml b/app/views/admin/accounts/index.html.haml
index 0ca457f39eeb54..01b072938d1d14 100644
--- a/app/views/admin/accounts/index.html.haml
+++ b/app/views/admin/accounts/index.html.haml
@@ -53,19 +53,19 @@
         = check_box_tag :batch_checkbox_all, nil, false
       .batch-table__toolbar__actions
         - if @accounts.any?(&:user_pending?)
-          = f.button safe_join([fa_icon('check'), t('admin.accounts.approve')]),
+          = f.button safe_join([material_symbol('check'), t('admin.accounts.approve')]),
                      class: 'table-action-link',
                      data: { confirm: t('admin.reports.are_you_sure') },
                      name: :approve,
                      type: :submit
 
-          = f.button safe_join([fa_icon('times'), t('admin.accounts.reject')]),
+          = f.button safe_join([material_symbol('close'), t('admin.accounts.reject')]),
                      class: 'table-action-link',
                      data: { confirm: t('admin.reports.are_you_sure') },
                      name: :reject,
                      type: :submit
 
-        = f.button safe_join([fa_icon('lock'), t('admin.accounts.perform_full_suspension')]),
+        = f.button safe_join([material_symbol('lock'), t('admin.accounts.perform_full_suspension')]),
                    class: 'table-action-link',
                    data: { confirm: t('admin.reports.are_you_sure') },
                    name: :suspend,
diff --git a/app/views/admin/accounts/show.html.haml b/app/views/admin/accounts/show.html.haml
index d380d807a3ccca..41fcafa29d5af8 100644
--- a/app/views/admin/accounts/show.html.haml
+++ b/app/views/admin/accounts/show.html.haml
@@ -20,7 +20,7 @@
               %dd{ title: field.value, class: custom_field_classes(field) }
                 - if field.verified?
                   %span.verified__mark{ title: t('accounts.link_verified_on', date: l(field.verified_at)) }
-                    = fa_icon 'check'
+                    = material_symbol 'check'
                 = prerender_custom_emojis(account_field_value_format(field, with_rel_me: false), account.emojis)
 
     - if account.note.present?
diff --git a/app/views/admin/custom_emojis/index.html.haml b/app/views/admin/custom_emojis/index.html.haml
index bea6a7cd21e1f4..e87dd4128297c2 100644
--- a/app/views/admin/custom_emojis/index.html.haml
+++ b/app/views/admin/custom_emojis/index.html.haml
@@ -48,19 +48,19 @@
         - if params[:local] == '1'
           = f.button safe_join([fa_icon('save'), t('generic.save_changes')]), name: :update, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
 
-          = f.button safe_join([fa_icon('eye'), t('admin.custom_emojis.list')]), name: :list, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
+          = f.button safe_join([material_symbol('visibility'), t('admin.custom_emojis.list')]), name: :list, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
 
-          = f.button safe_join([fa_icon('eye-slash'), t('admin.custom_emojis.unlist')]), name: :unlist, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
+          = f.button safe_join([material_symbol('visibility_off'), t('admin.custom_emojis.unlist')]), name: :unlist, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
 
         = f.button safe_join([fa_icon('power-off'), t('admin.custom_emojis.enable')]), name: :enable, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
 
         = f.button safe_join([fa_icon('power-off'), t('admin.custom_emojis.disable')]), name: :disable, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
 
         - if can?(:destroy, :custom_emoji)
-          = f.button safe_join([fa_icon('times'), t('admin.custom_emojis.delete')]), name: :delete, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
+          = f.button safe_join([material_symbol('close'), t('admin.custom_emojis.delete')]), name: :delete, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
 
         - if can?(:copy, :custom_emoji) && params[:local] != '1'
-          = f.button safe_join([fa_icon('copy'), t('admin.custom_emojis.copy')]), name: :copy, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
+          = f.button safe_join([material_symbol('content_copy'), t('admin.custom_emojis.copy')]), name: :copy, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
 
     - if params[:local] == '1'
       .batch-table__form.simple_form
diff --git a/app/views/admin/dashboard/index.html.haml b/app/views/admin/dashboard/index.html.haml
index 8a80992785c21b..8430dd3c4f1327 100644
--- a/app/views/admin/dashboard/index.html.haml
+++ b/app/views/admin/dashboard/index.html.haml
@@ -57,19 +57,19 @@
   .dashboard__item
     = link_to admin_reports_path, class: 'dashboard__quick-access' do
       %span= t('admin.dashboard.pending_reports_html', count: @pending_reports_count)
-      = fa_icon 'chevron-right fw'
+      = material_symbol 'chevron_right'
 
     = link_to admin_accounts_path(status: 'pending'), class: 'dashboard__quick-access' do
       %span= t('admin.dashboard.pending_users_html', count: @pending_users_count)
-      = fa_icon 'chevron-right fw'
+      = material_symbol 'chevron_right'
 
     = link_to admin_trends_tags_path(status: 'pending_review'), class: 'dashboard__quick-access' do
       %span= t('admin.dashboard.pending_tags_html', count: @pending_tags_count)
-      = fa_icon 'chevron-right fw'
+      = material_symbol 'chevron_right'
 
     = link_to admin_disputes_appeals_path(status: 'pending'), class: 'dashboard__quick-access' do
       %span= t('admin.dashboard.pending_appeals_html', count: @pending_appeals_count)
-      = fa_icon 'chevron-right fw'
+      = material_symbol 'chevron_right'
   .dashboard__item
     = react_admin_component :dimension,
                             dimension: 'sources',
diff --git a/app/views/admin/email_domain_blocks/index.html.haml b/app/views/admin/email_domain_blocks/index.html.haml
index 59036f899f9faa..684735c2070e5d 100644
--- a/app/views/admin/email_domain_blocks/index.html.haml
+++ b/app/views/admin/email_domain_blocks/index.html.haml
@@ -12,7 +12,7 @@
       %label.batch-table__toolbar__select.batch-checkbox-all
         = check_box_tag :batch_checkbox_all, nil, false
       .batch-table__toolbar__actions
-        = f.button safe_join([fa_icon('times'), t('admin.email_domain_blocks.delete')]),
+        = f.button safe_join([material_symbol('close'), t('admin.email_domain_blocks.delete')]),
                    class: 'table-action-link',
                    data: { confirm: t('admin.reports.are_you_sure') },
                    name: :delete,
diff --git a/app/views/admin/export_domain_blocks/_domain_block.html.haml b/app/views/admin/export_domain_blocks/_domain_block.html.haml
index cdce4fd28a908c..79cc5595ca1ccd 100644
--- a/app/views/admin/export_domain_blocks/_domain_block.html.haml
+++ b/app/views/admin/export_domain_blocks/_domain_block.html.haml
@@ -23,5 +23,5 @@
         = f.object.public_comment
       - if existing_relationships
         ·
-        = fa_icon 'warning fw'
+        = material_symbol 'warning'
         = t('admin.export_domain_blocks.import.existing_relationships_warning')
diff --git a/app/views/admin/export_domain_blocks/import.html.haml b/app/views/admin/export_domain_blocks/import.html.haml
index 48016a9abe1f5e..52ffc3d465ce01 100644
--- a/app/views/admin/export_domain_blocks/import.html.haml
+++ b/app/views/admin/export_domain_blocks/import.html.haml
@@ -12,7 +12,7 @@
       %label.batch-table__toolbar__select.batch-checkbox-all
         = check_box_tag :batch_checkbox_all, nil, false
       .batch-table__toolbar__actions
-        = f.button safe_join([fa_icon('copy'), t('admin.domain_blocks.import')]),
+        = f.button safe_join([material_symbol('content_copy'), t('admin.domain_blocks.import')]),
                    class: 'table-action-link',
                    data: { confirm: t('admin.reports.are_you_sure') },
                    name: :save,
diff --git a/app/views/admin/follow_recommendations/show.html.haml b/app/views/admin/follow_recommendations/show.html.haml
index 9d23f9ba5160a5..c8ad653a88a95f 100644
--- a/app/views/admin/follow_recommendations/show.html.haml
+++ b/app/views/admin/follow_recommendations/show.html.haml
@@ -31,13 +31,13 @@
         = check_box_tag :batch_checkbox_all, nil, false
       .batch-table__toolbar__actions
         - if params[:status].blank? && can?(:suppress, :follow_recommendation)
-          = f.button safe_join([fa_icon('times'), t('admin.follow_recommendations.suppress')]),
+          = f.button safe_join([material_symbol('close'), t('admin.follow_recommendations.suppress')]),
                      class: 'table-action-link',
                      data: { confirm: t('admin.reports.are_you_sure') },
                      name: :suppress,
                      type: :submit
         - if params[:status] == 'suppressed' && can?(:unsuppress, :follow_recommendation)
-          = f.button safe_join([fa_icon('plus'), t('admin.follow_recommendations.unsuppress')]),
+          = f.button safe_join([material_symbol('add'), t('admin.follow_recommendations.unsuppress')]),
                      class: 'table-action-link',
                      name: :unsuppress,
                      type: :submit
diff --git a/app/views/admin/instances/show.html.haml b/app/views/admin/instances/show.html.haml
index 5bf4e899f3cf44..d916203d0c664f 100644
--- a/app/views/admin/instances/show.html.haml
+++ b/app/views/admin/instances/show.html.haml
@@ -9,7 +9,7 @@
 
   - if @instance.persisted?
     %p
-      = fa_icon 'info fw'
+      = material_symbol 'info'
       = t('admin.instances.totals_time_period_hint_html')
 
     .dashboard
diff --git a/app/views/admin/invites/_invite.html.haml b/app/views/admin/invites/_invite.html.haml
index e6ad9de34c9edc..f9cd6003f3da81 100644
--- a/app/views/admin/invites/_invite.html.haml
+++ b/app/views/admin/invites/_invite.html.haml
@@ -12,7 +12,7 @@
 
   - if invite.valid_for_use?
     %td
-      = fa_icon 'user fw'
+      = material_symbol 'person'
       = invite.uses
       = " / #{invite.max_uses}" unless invite.max_uses.nil?
     %td
diff --git a/app/views/admin/ip_blocks/index.html.haml b/app/views/admin/ip_blocks/index.html.haml
index f1d2b3dc477d7e..9eba6c68ffbd62 100644
--- a/app/views/admin/ip_blocks/index.html.haml
+++ b/app/views/admin/ip_blocks/index.html.haml
@@ -14,7 +14,7 @@
         = check_box_tag :batch_checkbox_all, nil, false
       .batch-table__toolbar__actions
         - if can?(:destroy, :ip_block)
-          = f.button safe_join([fa_icon('times'), t('admin.ip_blocks.delete')]),
+          = f.button safe_join([material_symbol('close'), t('admin.ip_blocks.delete')]),
                      class: 'table-action-link',
                      data: { confirm: t('admin.reports.are_you_sure') },
                      name: :delete,
diff --git a/app/views/admin/relationships/index.html.haml b/app/views/admin/relationships/index.html.haml
index 8260430d80fb6e..c2daefb4242962 100644
--- a/app/views/admin/relationships/index.html.haml
+++ b/app/views/admin/relationships/index.html.haml
@@ -19,7 +19,7 @@
 
   .back-link
     = link_to admin_account_path(@account.id) do
-      = fa_icon 'chevron-left fw'
+      = material_symbol 'chevron_left'
       = t('admin.statuses.back_to_account')
 
 %hr.spacer/
@@ -30,7 +30,7 @@
       %label.batch-table__toolbar__select.batch-checkbox-all
         = check_box_tag :batch_checkbox_all, nil, false
       .batch-table__toolbar__actions
-        = f.button safe_join([fa_icon('lock'), t('admin.accounts.perform_full_suspension')]),
+        = f.button safe_join([material_symbol('lock'), t('admin.accounts.perform_full_suspension')]),
                    class: 'table-action-link',
                    data: { confirm: t('admin.reports.are_you_sure') },
                    name: :suspend,
diff --git a/app/views/admin/relays/_relay.html.haml b/app/views/admin/relays/_relay.html.haml
index f1dd2b2dd14be3..0960124ccfae4e 100644
--- a/app/views/admin/relays/_relay.html.haml
+++ b/app/views/admin/relays/_relay.html.haml
@@ -4,7 +4,7 @@
   %td
     - if relay.accepted?
       %span.positive-hint
-        = fa_icon('check')
+        = material_symbol('check')
         &nbsp;
         = t 'admin.relays.enabled'
     - elsif relay.pending?
@@ -13,7 +13,7 @@
       = t 'admin.relays.pending'
     - else
       %span.negative-hint
-        = fa_icon('times')
+        = material_symbol('close')
         &nbsp;
         = t 'admin.relays.disabled'
   %td
diff --git a/app/views/admin/reports/_header_card.html.haml b/app/views/admin/reports/_header_card.html.haml
index e90e3f9c906851..52e62b44998f5d 100644
--- a/app/views/admin/reports/_header_card.html.haml
+++ b/app/views/admin/reports/_header_card.html.haml
@@ -16,7 +16,7 @@
           %strong.emojify.p-name= display_name(report.target_account, custom_emojify: true)
         %span
           = acct(report.target_account)
-          = fa_icon('lock') if report.target_account.locked?
+          = material_symbol('lock') if report.target_account.locked?
     - if report.target_account.note.present?
       .account-card__bio.emojify
         = prerender_custom_emojis(account_bio_format(report.target_account), report.target_account.emojis)
diff --git a/app/views/admin/reports/_status.html.haml b/app/views/admin/reports/_status.html.haml
index 3775a1101cb0a8..66820f0a6e7fb2 100644
--- a/app/views/admin/reports/_status.html.haml
+++ b/app/views/admin/reports/_status.html.haml
@@ -37,5 +37,5 @@
         = t("statuses.visibilities.#{status.visibility}")
       - if status.proper.sensitive?
         ·
-        = fa_icon('eye-slash fw')
+        = material_symbol('visibility_off')
         = t('stream_entries.sensitive_content')
diff --git a/app/views/admin/reports/actions/preview.html.haml b/app/views/admin/reports/actions/preview.html.haml
index 8634bb215c4e19..7a737d4f727f29 100644
--- a/app/views/admin/reports/actions/preview.html.haml
+++ b/app/views/admin/reports/actions/preview.html.haml
@@ -58,7 +58,7 @@
 
                   - status.ordered_media_attachments.each do |media_attachment|
                     %abbr{ title: media_attachment.description }
-                      = fa_icon 'link'
+                      = material_symbol 'link'
                       = media_attachment.file_file_name
                 .strike-card__statuses-list__item__meta
                   = link_to ActivityPub::TagManager.instance.url_for(status), target: '_blank', rel: 'noopener noreferrer' do
diff --git a/app/views/admin/reports/show.html.haml b/app/views/admin/reports/show.html.haml
index e37fa2590a408a..c880021cffbcaf 100644
--- a/app/views/admin/reports/show.html.haml
+++ b/app/views/admin/reports/show.html.haml
@@ -41,7 +41,7 @@
 %p
   = t 'admin.reports.statuses_description_html'
   —
-  = link_to safe_join([fa_icon('plus'), t('admin.reports.add_to_report')]),
+  = link_to safe_join([material_symbol('add'), t('admin.reports.add_to_report')]),
             admin_account_statuses_path(@report.target_account_id, report_id: @report.id),
             class: 'table-action-link'
 
@@ -52,7 +52,7 @@
         = check_box_tag :batch_checkbox_all, nil, false
       .batch-table__toolbar__actions
         - if !@statuses.empty? && @report.unresolved?
-          = f.button safe_join([fa_icon('times'), t('admin.statuses.batch.remove_from_report')]), name: :remove_from_report, class: 'table-action-link', type: :submit
+          = f.button safe_join([material_symbol('close'), t('admin.statuses.batch.remove_from_report')]), name: :remove_from_report, class: 'table-action-link', type: :submit
     .batch-table__body
       - if @statuses.empty?
         = nothing_here 'nothing-here--under-tabs'
diff --git a/app/views/admin/roles/_role.html.haml b/app/views/admin/roles/_role.html.haml
index d6c6b62c81b667..fd37644c835f90 100644
--- a/app/views/admin/roles/_role.html.haml
+++ b/app/views/admin/roles/_role.html.haml
@@ -2,7 +2,7 @@
   - if can?(:update, role)
     = link_to edit_admin_role_path(role), class: 'announcements-list__item__title' do
       %span.user-role{ class: "user-role-#{role.id}" }
-        = fa_icon 'users fw'
+        = material_symbol 'group'
 
         - if role.everyone?
           = t('admin.roles.everyone')
@@ -11,7 +11,7 @@
   - else
     %span.announcements-list__item__title
       %span.user-role{ class: "user-role-#{role.id}" }
-        = fa_icon 'users fw'
+        = material_symbol 'group'
 
         - if role.everyone?
           = t('admin.roles.everyone')
diff --git a/app/views/admin/settings/shared/_links.html.haml b/app/views/admin/settings/shared/_links.html.haml
index d8b697592a57ed..8b0678d4c91a37 100644
--- a/app/views/admin/settings/shared/_links.html.haml
+++ b/app/views/admin/settings/shared/_links.html.haml
@@ -3,7 +3,7 @@
     :ruby
       primary.item :branding, safe_join([fa_icon('pencil fw'), t('admin.settings.branding.title')]), admin_settings_branding_path
       primary.item :about, safe_join([fa_icon('file-text fw'), t('admin.settings.about.title')]), admin_settings_about_path
-      primary.item :registrations, safe_join([fa_icon('users fw'), t('admin.settings.registrations.title')]), admin_settings_registrations_path
+      primary.item :registrations, safe_join([material_symbol('group'), t('admin.settings.registrations.title')]), admin_settings_registrations_path
       primary.item :discovery, safe_join([fa_icon('search fw'), t('admin.settings.discovery.title')]), admin_settings_discovery_path
       primary.item :content_retention, safe_join([fa_icon('history fw'), t('admin.settings.content_retention.title')]), admin_settings_content_retention_path
       primary.item :appearance, safe_join([fa_icon('desktop fw'), t('admin.settings.appearance.title')]), admin_settings_appearance_path
diff --git a/app/views/admin/status_edits/_status_edit.html.haml b/app/views/admin/status_edits/_status_edit.html.haml
index 72547772132ec4..0bec0159ee49f2 100644
--- a/app/views/admin/status_edits/_status_edit.html.haml
+++ b/app/views/admin/status_edits/_status_edit.html.haml
@@ -26,5 +26,5 @@
 
         - if status_edit.sensitive?
           ·
-          = fa_icon('eye-slash fw')
+          = material_symbol('visibility_off')
           = t('stream_entries.sensitive_content')
diff --git a/app/views/admin/statuses/index.html.haml b/app/views/admin/statuses/index.html.haml
index 33a41bd36520ab..a41a6332dd1af0 100644
--- a/app/views/admin/statuses/index.html.haml
+++ b/app/views/admin/statuses/index.html.haml
@@ -12,11 +12,11 @@
   .back-link
     - if params[:report_id]
       = link_to admin_report_path(params[:report_id].to_i) do
-        = fa_icon 'chevron-left fw'
+        = material_symbol 'chevron_left'
         = t('admin.statuses.back_to_report')
     - else
       = link_to admin_account_path(@account.id) do
-        = fa_icon 'chevron-left fw'
+        = material_symbol 'chevron_left'
         = t('admin.statuses.back_to_account')
 
 %hr.spacer/
diff --git a/app/views/admin/tags/show.html.haml b/app/views/admin/tags/show.html.haml
index 2e4424bec6cde0..f2d87b54b04378 100644
--- a/app/views/admin/tags/show.html.haml
+++ b/app/views/admin/tags/show.html.haml
@@ -52,26 +52,26 @@
       = link_to admin_tag_path(@tag.id), class: ['dashboard__quick-access', @tag.usable? ? 'positive' : 'negative'] do
         - if @tag.usable?
           %span= t('admin.trends.tags.usable')
-          = fa_icon 'check fw'
+          = material_symbol 'check'
         - else
           %span= t('admin.trends.tags.not_usable')
-          = fa_icon 'lock fw'
+          = material_symbol 'lock'
 
       = link_to admin_tag_path(@tag.id), class: ['dashboard__quick-access', @tag.trendable? ? 'positive' : 'negative'] do
         - if @tag.trendable?
           %span= t('admin.trends.tags.trendable')
-          = fa_icon 'check fw'
+          = material_symbol 'check'
         - else
           %span= t('admin.trends.tags.not_trendable')
-          = fa_icon 'lock fw'
+          = material_symbol 'lock'
 
       = link_to admin_tag_path(@tag.id), class: ['dashboard__quick-access', @tag.listable? ? 'positive' : 'negative'] do
         - if @tag.listable?
           %span= t('admin.trends.tags.listable')
-          = fa_icon 'check fw'
+          = material_symbol 'check'
         - else
           %span= t('admin.trends.tags.not_listable')
-          = fa_icon 'lock fw'
+          = material_symbol 'lock'
 
   %hr.spacer/
 
diff --git a/app/views/admin/trends/links/index.html.haml b/app/views/admin/trends/links/index.html.haml
index 965d2b2e5684fa..c503b2d39675ab 100644
--- a/app/views/admin/trends/links/index.html.haml
+++ b/app/views/admin/trends/links/index.html.haml
@@ -24,7 +24,7 @@
     .back-link
       = link_to admin_trends_links_preview_card_providers_path do
         = t('admin.trends.preview_card_providers.title')
-        = fa_icon 'chevron-right fw'
+        = material_symbol 'chevron_right'
 
 = form_for(@form, url: batch_admin_trends_links_path) do |f|
   = hidden_field_tag :page, params[:page] || 1
@@ -37,22 +37,22 @@
       %label.batch-table__toolbar__select.batch-checkbox-all
         = check_box_tag :batch_checkbox_all, nil, false
       .batch-table__toolbar__actions
-        = f.button safe_join([fa_icon('check'), t('admin.trends.links.allow')]),
+        = f.button safe_join([material_symbol('check'), t('admin.trends.links.allow')]),
                    class: 'table-action-link',
                    data: { confirm: t('admin.reports.are_you_sure') },
                    name: :approve,
                    type: :submit
-        = f.button safe_join([fa_icon('check'), t('admin.trends.links.allow_provider')]),
+        = f.button safe_join([material_symbol('check'), t('admin.trends.links.allow_provider')]),
                    class: 'table-action-link',
                    data: { confirm: t('admin.reports.are_you_sure') },
                    name: :approve_providers,
                    type: :submit
-        = f.button safe_join([fa_icon('times'), t('admin.trends.links.disallow')]),
+        = f.button safe_join([material_symbol('close'), t('admin.trends.links.disallow')]),
                    class: 'table-action-link',
                    data: { confirm: t('admin.reports.are_you_sure') },
                    name: :reject,
                    type: :submit
-        = f.button safe_join([fa_icon('times'), t('admin.trends.links.disallow_provider')]),
+        = f.button safe_join([material_symbol('close'), t('admin.trends.links.disallow_provider')]),
                    class: 'table-action-link',
                    data: { confirm: t('admin.reports.are_you_sure') },
                    name: :reject_providers,
diff --git a/app/views/admin/trends/links/preview_card_providers/index.html.haml b/app/views/admin/trends/links/preview_card_providers/index.html.haml
index c91822fb7491b6..706c6070100727 100644
--- a/app/views/admin/trends/links/preview_card_providers/index.html.haml
+++ b/app/views/admin/trends/links/preview_card_providers/index.html.haml
@@ -15,7 +15,7 @@
       %li= filter_link_to safe_join([t('admin.accounts.moderation.pending'), "(#{PreviewCardProvider.pending_review.count})"], ' '), status: 'pending_review'
   .back-link
     = link_to admin_trends_links_path do
-      = fa_icon 'chevron-left fw'
+      = material_symbol 'chevron_left'
       = t('admin.trends.links.title')
 
 %hr.spacer/
@@ -31,12 +31,12 @@
       %label.batch-table__toolbar__select.batch-checkbox-all
         = check_box_tag :batch_checkbox_all, nil, false
       .batch-table__toolbar__actions
-        = f.button safe_join([fa_icon('check'), t('admin.trends.allow')]),
+        = f.button safe_join([material_symbol('check'), t('admin.trends.allow')]),
                    class: 'table-action-link',
                    data: { confirm: t('admin.reports.are_you_sure') },
                    name: :approve,
                    type: :submit
-        = f.button safe_join([fa_icon('times'), t('admin.trends.disallow')]),
+        = f.button safe_join([material_symbol('close'), t('admin.trends.disallow')]),
                    class: 'table-action-link',
                    data: { confirm: t('admin.reports.are_you_sure') },
                    name: :reject,
diff --git a/app/views/admin/trends/statuses/_status.html.haml b/app/views/admin/trends/statuses/_status.html.haml
index 095f3f2187c983..09547ff0369a8b 100644
--- a/app/views/admin/trends/statuses/_status.html.haml
+++ b/app/views/admin/trends/statuses/_status.html.haml
@@ -11,7 +11,7 @@
 
         - status.ordered_media_attachments.each do |media_attachment|
           %abbr{ title: media_attachment.description }
-            = fa_icon 'link'
+            = material_symbol 'link'
             = media_attachment.file_file_name
 
     = t 'admin.trends.statuses.shared_by',
diff --git a/app/views/admin/trends/statuses/index.html.haml b/app/views/admin/trends/statuses/index.html.haml
index 0891d15fcf0bfb..66151ad31e0695 100644
--- a/app/views/admin/trends/statuses/index.html.haml
+++ b/app/views/admin/trends/statuses/index.html.haml
@@ -31,22 +31,22 @@
       %label.batch-table__toolbar__select.batch-checkbox-all
         = check_box_tag :batch_checkbox_all, nil, false
       .batch-table__toolbar__actions
-        = f.button safe_join([fa_icon('check'), t('admin.trends.statuses.allow')]),
+        = f.button safe_join([material_symbol('check'), t('admin.trends.statuses.allow')]),
                    class: 'table-action-link',
                    data: { confirm: t('admin.reports.are_you_sure') },
                    name: :approve,
                    type: :submit
-        = f.button safe_join([fa_icon('check'), t('admin.trends.statuses.allow_account')]),
+        = f.button safe_join([material_symbol('check'), t('admin.trends.statuses.allow_account')]),
                    class: 'table-action-link',
                    data: { confirm: t('admin.reports.are_you_sure') },
                    name: :approve_accounts,
                    type: :submit
-        = f.button safe_join([fa_icon('times'), t('admin.trends.statuses.disallow')]),
+        = f.button safe_join([material_symbol('close'), t('admin.trends.statuses.disallow')]),
                    class: 'table-action-link',
                    data: { confirm: t('admin.reports.are_you_sure') },
                    name: :reject,
                    type: :submit
-        = f.button safe_join([fa_icon('times'), t('admin.trends.statuses.disallow_account')]),
+        = f.button safe_join([material_symbol('close'), t('admin.trends.statuses.disallow_account')]),
                    class: 'table-action-link',
                    data: { confirm: t('admin.reports.are_you_sure') },
                    name: :reject_accounts,
diff --git a/app/views/admin/trends/tags/_tag.html.haml b/app/views/admin/trends/tags/_tag.html.haml
index 70c7d8dbd42cd7..8cc0d713b9e178 100644
--- a/app/views/admin/trends/tags/_tag.html.haml
+++ b/app/views/admin/trends/tags/_tag.html.haml
@@ -5,7 +5,7 @@
   .batch-table__row__content.pending-account
     .pending-account__header
       = link_to admin_tag_path(tag.id) do
-        = fa_icon 'hashtag'
+        = material_symbol 'tag'
         = tag.display_name
 
       %br/
diff --git a/app/views/admin/trends/tags/index.html.haml b/app/views/admin/trends/tags/index.html.haml
index effde7b0ec69f9..655955f7f63bfe 100644
--- a/app/views/admin/trends/tags/index.html.haml
+++ b/app/views/admin/trends/tags/index.html.haml
@@ -25,12 +25,12 @@
       %label.batch-table__toolbar__select.batch-checkbox-all
         = check_box_tag :batch_checkbox_all, nil, false
       .batch-table__toolbar__actions
-        = f.button safe_join([fa_icon('check'), t('admin.trends.allow')]),
+        = f.button safe_join([material_symbol('check'), t('admin.trends.allow')]),
                    class: 'table-action-link',
                    data: { confirm: t('admin.reports.are_you_sure') },
                    name: :approve,
                    type: :submit
-        = f.button safe_join([fa_icon('times'), t('admin.trends.disallow')]),
+        = f.button safe_join([material_symbol('close'), t('admin.trends.disallow')]),
                    class: 'table-action-link',
                    data: { confirm: t('admin.reports.are_you_sure') },
                    name: :reject,
diff --git a/config/initializers/propshaft.rb b/config/initializers/propshaft.rb
index 6cf368d5b7dd41..eff7ec90b8e974 100644
--- a/config/initializers/propshaft.rb
+++ b/config/initializers/propshaft.rb
@@ -1,3 +1,7 @@
 # frozen_string_literal: true
 
+# SVG icons
 Rails.application.config.assets.paths << Rails.root.join('app', 'javascript', 'images')
+
+# Material Design icons
+Rails.application.config.assets.paths << Rails.root.join('app', 'javascript', 'material-icons')

From 3f6887557b23d363e7f8f18518db4447739d64bb Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 23 Apr 2024 12:45:12 -0400
Subject: [PATCH 0818/2191] Move JS source from `packs` to `entrypoints`
 (#30037)

---
 app/javascript/{packs => entrypoints}/admin.tsx                 | 0
 app/javascript/{packs => entrypoints}/application.js            | 0
 app/javascript/{packs => entrypoints}/error.js                  | 0
 app/javascript/{packs => entrypoints}/inert.js                  | 0
 app/javascript/{packs => entrypoints}/mailer.js                 | 0
 app/javascript/{packs => entrypoints}/public-path.js            | 0
 app/javascript/{packs => entrypoints}/public.tsx                | 0
 .../{packs => entrypoints}/remote_interaction_helper.ts         | 0
 app/javascript/{packs => entrypoints}/share.jsx                 | 0
 app/javascript/{packs => entrypoints}/sign_up.js                | 0
 .../{packs => entrypoints}/two_factor_authentication.js         | 0
 config/webpacker.yml                                            | 2 +-
 tsconfig.json                                                   | 2 +-
 13 files changed, 2 insertions(+), 2 deletions(-)
 rename app/javascript/{packs => entrypoints}/admin.tsx (100%)
 rename app/javascript/{packs => entrypoints}/application.js (100%)
 rename app/javascript/{packs => entrypoints}/error.js (100%)
 rename app/javascript/{packs => entrypoints}/inert.js (100%)
 rename app/javascript/{packs => entrypoints}/mailer.js (100%)
 rename app/javascript/{packs => entrypoints}/public-path.js (100%)
 rename app/javascript/{packs => entrypoints}/public.tsx (100%)
 rename app/javascript/{packs => entrypoints}/remote_interaction_helper.ts (100%)
 rename app/javascript/{packs => entrypoints}/share.jsx (100%)
 rename app/javascript/{packs => entrypoints}/sign_up.js (100%)
 rename app/javascript/{packs => entrypoints}/two_factor_authentication.js (100%)

diff --git a/app/javascript/packs/admin.tsx b/app/javascript/entrypoints/admin.tsx
similarity index 100%
rename from app/javascript/packs/admin.tsx
rename to app/javascript/entrypoints/admin.tsx
diff --git a/app/javascript/packs/application.js b/app/javascript/entrypoints/application.js
similarity index 100%
rename from app/javascript/packs/application.js
rename to app/javascript/entrypoints/application.js
diff --git a/app/javascript/packs/error.js b/app/javascript/entrypoints/error.js
similarity index 100%
rename from app/javascript/packs/error.js
rename to app/javascript/entrypoints/error.js
diff --git a/app/javascript/packs/inert.js b/app/javascript/entrypoints/inert.js
similarity index 100%
rename from app/javascript/packs/inert.js
rename to app/javascript/entrypoints/inert.js
diff --git a/app/javascript/packs/mailer.js b/app/javascript/entrypoints/mailer.js
similarity index 100%
rename from app/javascript/packs/mailer.js
rename to app/javascript/entrypoints/mailer.js
diff --git a/app/javascript/packs/public-path.js b/app/javascript/entrypoints/public-path.js
similarity index 100%
rename from app/javascript/packs/public-path.js
rename to app/javascript/entrypoints/public-path.js
diff --git a/app/javascript/packs/public.tsx b/app/javascript/entrypoints/public.tsx
similarity index 100%
rename from app/javascript/packs/public.tsx
rename to app/javascript/entrypoints/public.tsx
diff --git a/app/javascript/packs/remote_interaction_helper.ts b/app/javascript/entrypoints/remote_interaction_helper.ts
similarity index 100%
rename from app/javascript/packs/remote_interaction_helper.ts
rename to app/javascript/entrypoints/remote_interaction_helper.ts
diff --git a/app/javascript/packs/share.jsx b/app/javascript/entrypoints/share.jsx
similarity index 100%
rename from app/javascript/packs/share.jsx
rename to app/javascript/entrypoints/share.jsx
diff --git a/app/javascript/packs/sign_up.js b/app/javascript/entrypoints/sign_up.js
similarity index 100%
rename from app/javascript/packs/sign_up.js
rename to app/javascript/entrypoints/sign_up.js
diff --git a/app/javascript/packs/two_factor_authentication.js b/app/javascript/entrypoints/two_factor_authentication.js
similarity index 100%
rename from app/javascript/packs/two_factor_authentication.js
rename to app/javascript/entrypoints/two_factor_authentication.js
diff --git a/config/webpacker.yml b/config/webpacker.yml
index f8462e53a094be..e07f577c5eece9 100644
--- a/config/webpacker.yml
+++ b/config/webpacker.yml
@@ -2,7 +2,7 @@
 
 default: &default
   source_path: app/javascript
-  source_entry_path: packs
+  source_entry_path: entrypoints
   public_root_path: public
   public_output_path: packs
   cache_path: tmp/cache/webpacker
diff --git a/tsconfig.json b/tsconfig.json
index a193ea35f2fdac..7010dda1fce20a 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -20,7 +20,7 @@
   },
   "include": [
     "app/javascript/mastodon",
-    "app/javascript/packs",
+    "app/javascript/entrypoints",
     "app/javascript/types"
   ]
 }

From 0e585b9a52c499f76068cfd1cd85b1a6eedcc02e Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Wed, 24 Apr 2024 10:21:05 +0200
Subject: [PATCH 0819/2191] Update to Ruby 3.2.4 (#30036)

---
 .ruby-version |  2 +-
 Dockerfile    | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.ruby-version b/.ruby-version
index b347b11eac8ae6..351227fca344ed 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-3.2.3
+3.2.4
diff --git a/Dockerfile b/Dockerfile
index 43bc24295d72c7..a95d41a65b5762 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,15 +7,15 @@
 ARG TARGETPLATFORM=${TARGETPLATFORM}
 ARG BUILDPLATFORM=${BUILDPLATFORM}
 
-# Ruby image to use for base image, change with [--build-arg RUBY_VERSION="3.2.3"]
-ARG RUBY_VERSION="3.2.3"
+# Ruby image to use for base image, change with [--build-arg RUBY_VERSION="3.2.4"]
+ARG RUBY_VERSION="3.2.4"
 # # Node version to use in base image, change with [--build-arg NODE_MAJOR_VERSION="20"]
 ARG NODE_MAJOR_VERSION="20"
 # Debian image to use for base image, change with [--build-arg DEBIAN_VERSION="bookworm"]
 ARG DEBIAN_VERSION="bookworm"
 # Node image to use for base image based on combined variables (ex: 20-bookworm-slim)
 FROM docker.io/node:${NODE_MAJOR_VERSION}-${DEBIAN_VERSION}-slim as node
-# Ruby image to use for base image based on combined variables (ex: 3.2.3-slim-bookworm)
+# Ruby image to use for base image based on combined variables (ex: 3.2.4-slim-bookworm)
 FROM docker.io/ruby:${RUBY_VERSION}-slim-${DEBIAN_VERSION} as ruby
 
 # Resulting version string is vX.X.X-MASTODON_VERSION_PRERELEASE+MASTODON_VERSION_METADATA
@@ -29,7 +29,7 @@ ARG MASTODON_VERSION_METADATA=""
 # See: https://docs.joinmastodon.org/admin/config/#rails_serve_static_files
 ARG RAILS_SERVE_STATIC_FILES="true"
 # Allow to use YJIT compiler
-# See: https://github.com/ruby/ruby/blob/v3_2_3/doc/yjit/yjit.md
+# See: https://github.com/ruby/ruby/blob/v3_2_4/doc/yjit/yjit.md
 ARG RUBY_YJIT_ENABLE="1"
 # Timezone used by the Docker container and runtime, change with [--build-arg TZ=Europe/Berlin]
 ARG TZ="Etc/UTC"
@@ -262,4 +262,4 @@ USER mastodon
 # Expose default Puma ports
 EXPOSE 3000
 # Set container tini as default entry point
-ENTRYPOINT ["/usr/bin/tini", "--"]
\ No newline at end of file
+ENTRYPOINT ["/usr/bin/tini", "--"]

From b903e6909e8d534330d19d5ecefcc1296a92ec36 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 24 Apr 2024 04:32:18 -0400
Subject: [PATCH 0820/2191] Disable `Style/HashAsLastArrayItem` cop (#30041)

---
 .rubocop.yml      |  5 +++++
 .rubocop_todo.yml | 13 -------------
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 1b5ce67ee7c480..542e90b5e337c1 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -182,6 +182,11 @@ Style/FormatStringToken:
   AllowedMethods:
     - redirect_with_vary
 
+# Reason: Prevailing style choice
+# https://docs.rubocop.org/rubocop/cops_style.html#stylehashaslastarrayitem
+Style/HashAsLastArrayItem:
+  Enabled: false
+
 # Reason: Enforce modern Ruby style
 # https://docs.rubocop.org/rubocop/cops_style.html#stylehashsyntax
 Style/HashSyntax:
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 3f2e9aee62e852..c2826d718c7b19 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -128,19 +128,6 @@ Style/GuardClause:
     - 'lib/mastodon/cli/media.rb'
     - 'lib/tasks/repo.rake'
 
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: braces, no_braces
-Style/HashAsLastArrayItem:
-  Exclude:
-    - 'app/controllers/admin/statuses_controller.rb'
-    - 'app/controllers/api/v1/statuses_controller.rb'
-    - 'app/models/concerns/account/counters.rb'
-    - 'app/models/concerns/status/threading_concern.rb'
-    - 'app/models/status.rb'
-    - 'app/services/batched_remove_status_service.rb'
-    - 'app/services/notify_service.rb'
-
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Style/HashTransformValues:
   Exclude:

From 74012831f61a36b7f52540c5ccafa0f9692a6596 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 24 Apr 2024 10:45:12 +0200
Subject: [PATCH 0821/2191] Change mute options to be in dropdown on muted
 users list in web UI (#30049)

---
 .../mastodon/components/account.jsx           | 272 +++++++++---------
 .../styles/mastodon/components.scss           |  14 +-
 2 files changed, 150 insertions(+), 136 deletions(-)

diff --git a/app/javascript/mastodon/components/account.jsx b/app/javascript/mastodon/components/account.jsx
index 4a99dd0bbf1297..3282696d341b17 100644
--- a/app/javascript/mastodon/components/account.jsx
+++ b/app/javascript/mastodon/components/account.jsx
@@ -1,17 +1,19 @@
 import PropTypes from 'prop-types';
+import { useCallback } from 'react';
 
-import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
+import { defineMessages, useIntl, FormattedMessage } from 'react-intl';
 
 import classNames from 'classnames';
 import { Link } from 'react-router-dom';
 
 import ImmutablePropTypes from 'react-immutable-proptypes';
-import ImmutablePureComponent from 'react-immutable-pure-component';
 
+import MoreHorizIcon from '@/material-icons/400-24px/more_horiz.svg?react';
 import { EmptyAccount } from 'mastodon/components/empty_account';
 import { ShortNumber } from 'mastodon/components/short_number';
 import { VerifiedBadge } from 'mastodon/components/verified_badge';
 
+import DropdownMenuContainer from '../containers/dropdown_menu_container';
 import { me } from '../initial_state';
 
 import { Avatar } from './avatar';
@@ -30,151 +32,151 @@ const messages = defineMessages({
   unmute_notifications: { id: 'account.unmute_notifications_short', defaultMessage: 'Unmute notifications' },
   mute: { id: 'account.mute_short', defaultMessage: 'Mute' },
   block: { id: 'account.block_short', defaultMessage: 'Block' },
+  more: { id: 'status.more', defaultMessage: 'More' },
 });
 
-class Account extends ImmutablePureComponent {
-
-  static propTypes = {
-    size: PropTypes.number,
-    account: ImmutablePropTypes.record,
-    onFollow: PropTypes.func,
-    onBlock: PropTypes.func,
-    onMute: PropTypes.func,
-    onMuteNotifications: PropTypes.func,
-    intl: PropTypes.object.isRequired,
-    hidden: PropTypes.bool,
-    minimal: PropTypes.bool,
-    defaultAction: PropTypes.string,
-    withBio: PropTypes.bool,
-  };
-
-  static defaultProps = {
-    size: 46,
-  };
-
-  handleFollow = () => {
-    this.props.onFollow(this.props.account);
-  };
-
-  handleBlock = () => {
-    this.props.onBlock(this.props.account);
-  };
-
-  handleMute = () => {
-    this.props.onMute(this.props.account);
-  };
-
-  handleMuteNotifications = () => {
-    this.props.onMuteNotifications(this.props.account, true);
-  };
-
-  handleUnmuteNotifications = () => {
-    this.props.onMuteNotifications(this.props.account, false);
-  };
-
-  render () {
-    const { account, intl, hidden, withBio, defaultAction, size, minimal } = this.props;
-
-    if (!account) {
-      return <EmptyAccount size={size} minimal={minimal} />;
-    }
+const Account = ({ size = 46, account, onFollow, onBlock, onMute, onMuteNotifications, hidden, minimal, defaultAction, withBio }) => {
+  const intl = useIntl();
 
-    if (hidden) {
-      return (
-        <>
-          {account.get('display_name')}
-          {account.get('username')}
-        </>
-      );
-    }
+  const handleFollow = useCallback(() => {
+    onFollow(account);
+  }, [onFollow, account]);
+
+  const handleBlock = useCallback(() => {
+    onBlock(account);
+  }, [onBlock, account]);
+
+  const handleMute = useCallback(() => {
+    onMute(account);
+  }, [onMute, account]);
+
+  const handleMuteNotifications = useCallback(() => {
+    onMuteNotifications(account, true);
+  }, [onMuteNotifications, account]);
+
+  const handleUnmuteNotifications = useCallback(() => {
+    onMuteNotifications(account, false);
+  }, [onMuteNotifications, account]);
+
+  if (!account) {
+    return <EmptyAccount size={size} minimal={minimal} />;
+  }
+
+  if (hidden) {
+    return (
+      <>
+        {account.get('display_name')}
+        {account.get('username')}
+      </>
+    );
+  }
 
-    let buttons;
-
-    if (account.get('id') !== me && account.get('relationship', null) !== null) {
-      const following = account.getIn(['relationship', 'following']);
-      const requested = account.getIn(['relationship', 'requested']);
-      const blocking  = account.getIn(['relationship', 'blocking']);
-      const muting  = account.getIn(['relationship', 'muting']);
-
-      if (requested) {
-        buttons = <Button text={intl.formatMessage(messages.cancel_follow_request)} onClick={this.handleFollow} />;
-      } else if (blocking) {
-        buttons = <Button text={intl.formatMessage(messages.unblock)} onClick={this.handleBlock} />;
-      } else if (muting) {
-        let hidingNotificationsButton;
-
-        if (account.getIn(['relationship', 'muting_notifications'])) {
-          hidingNotificationsButton = <Button text={intl.formatMessage(messages.unmute_notifications)} onClick={this.handleUnmuteNotifications} />;
-        } else {
-          hidingNotificationsButton = <Button text={intl.formatMessage(messages.mute_notifications)} onClick={this.handleMuteNotifications} />;
-        }
-
-        buttons = (
-          <>
-            <Button text={intl.formatMessage(messages.unmute)} onClick={this.handleMute} />
-            {hidingNotificationsButton}
-          </>
-        );
-      } else if (defaultAction === 'mute') {
-        buttons = <Button title={intl.formatMessage(messages.mute)} onClick={this.handleMute} />;
-      } else if (defaultAction === 'block') {
-        buttons = <Button text={intl.formatMessage(messages.block)} onClick={this.handleBlock} />;
-      } else if (!account.get('suspended') && !account.get('moved') || following) {
-        buttons = <Button text={intl.formatMessage(following ? messages.unfollow : messages.follow)} onClick={this.handleFollow} />;
+  let buttons;
+
+  if (account.get('id') !== me && account.get('relationship', null) !== null) {
+    const following = account.getIn(['relationship', 'following']);
+    const requested = account.getIn(['relationship', 'requested']);
+    const blocking  = account.getIn(['relationship', 'blocking']);
+    const muting  = account.getIn(['relationship', 'muting']);
+
+    if (requested) {
+      buttons = <Button text={intl.formatMessage(messages.cancel_follow_request)} onClick={handleFollow} />;
+    } else if (blocking) {
+      buttons = <Button text={intl.formatMessage(messages.unblock)} onClick={handleBlock} />;
+    } else if (muting) {
+      let menu;
+
+      if (account.getIn(['relationship', 'muting_notifications'])) {
+        menu = [{ text: intl.formatMessage(messages.unmute_notifications), action: handleUnmuteNotifications }];
+      } else {
+        menu = [{ text: intl.formatMessage(messages.mute_notifications), action: handleMuteNotifications }];
       }
-    }
 
-    let muteTimeRemaining;
+      buttons = (
+        <>
+          <DropdownMenuContainer
+            items={menu}
+            icon='ellipsis-h'
+            iconComponent={MoreHorizIcon}
+            direction='right'
+            title={intl.formatMessage(messages.more)}
+          />
 
-    if (account.get('mute_expires_at')) {
-      muteTimeRemaining = <>· <RelativeTimestamp timestamp={account.get('mute_expires_at')} futureDate /></>;
+          <Button text={intl.formatMessage(messages.unmute)} onClick={handleMute} />
+        </>
+      );
+    } else if (defaultAction === 'mute') {
+      buttons = <Button title={intl.formatMessage(messages.mute)} onClick={handleMute} />;
+    } else if (defaultAction === 'block') {
+      buttons = <Button text={intl.formatMessage(messages.block)} onClick={handleBlock} />;
+    } else if (!account.get('suspended') && !account.get('moved') || following) {
+      buttons = <Button text={intl.formatMessage(following ? messages.unfollow : messages.follow)} onClick={handleFollow} />;
     }
+  }
+
+  let muteTimeRemaining;
 
-    let verification;
+  if (account.get('mute_expires_at')) {
+    muteTimeRemaining = <>· <RelativeTimestamp timestamp={account.get('mute_expires_at')} futureDate /></>;
+  }
 
-    const firstVerifiedField = account.get('fields').find(item => !!item.get('verified_at'));
+  let verification;
 
-    if (firstVerifiedField) {
-      verification = <VerifiedBadge link={firstVerifiedField.get('value')} />;
-    }
+  const firstVerifiedField = account.get('fields').find(item => !!item.get('verified_at'));
 
-    return (
-      <div className={classNames('account', { 'account--minimal': minimal })}>
-        <div className='account__wrapper'>
-          <Link key={account.get('id')} className='account__display-name' title={account.get('acct')} to={`/@${account.get('acct')}`}>
-            <div className='account__avatar-wrapper'>
-              <Avatar account={account} size={size} />
-            </div>
-
-            <div className='account__contents'>
-              <DisplayName account={account} />
-              {!minimal && (
-                <div className='account__details'>
-                  <ShortNumber value={account.get('followers_count')} renderer={FollowersCounter} /> {verification} {muteTimeRemaining}
-                </div>
-              )}
-            </div>
-          </Link>
-
-          {!minimal && (
-            <div className='account__relationship'>
-              {buttons}
-            </div>
-          )}
-        </div>
-
-        {withBio && (account.get('note').length > 0 ? (
-          <div
-            className='account__note translate'
-            dangerouslySetInnerHTML={{ __html: account.get('note_emojified') }}
-          />
-        ) : (
-          <div className='account__note account__note--missing'><FormattedMessage id='account.no_bio' defaultMessage='No description provided.' /></div>
-        ))}
-      </div>
-    );
+  if (firstVerifiedField) {
+    verification = <VerifiedBadge link={firstVerifiedField.get('value')} />;
   }
 
-}
+  return (
+    <div className={classNames('account', { 'account--minimal': minimal })}>
+      <div className='account__wrapper'>
+        <Link key={account.get('id')} className='account__display-name' title={account.get('acct')} to={`/@${account.get('acct')}`}>
+          <div className='account__avatar-wrapper'>
+            <Avatar account={account} size={size} />
+          </div>
+
+          <div className='account__contents'>
+            <DisplayName account={account} />
+            {!minimal && (
+              <div className='account__details'>
+                <ShortNumber value={account.get('followers_count')} renderer={FollowersCounter} /> {verification} {muteTimeRemaining}
+              </div>
+            )}
+          </div>
+        </Link>
+
+        {!minimal && (
+          <div className='account__relationship'>
+            {buttons}
+          </div>
+        )}
+      </div>
 
-export default injectIntl(Account);
+      {withBio && (account.get('note').length > 0 ? (
+        <div
+          className='account__note translate'
+          dangerouslySetInnerHTML={{ __html: account.get('note_emojified') }}
+        />
+      ) : (
+        <div className='account__note account__note--missing'><FormattedMessage id='account.no_bio' defaultMessage='No description provided.' /></div>
+      ))}
+    </div>
+  );
+};
+
+Account.propTypes = {
+  size: PropTypes.number,
+  account: ImmutablePropTypes.record,
+  onFollow: PropTypes.func,
+  onBlock: PropTypes.func,
+  onMute: PropTypes.func,
+  onMuteNotifications: PropTypes.func,
+  intl: PropTypes.object.isRequired,
+  hidden: PropTypes.bool,
+  minimal: PropTypes.bool,
+  defaultAction: PropTypes.string,
+  withBio: PropTypes.bool,
+};
+
+export default Account;
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 87e13ee45e2fa3..b2139169a596ef 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -2015,7 +2015,19 @@ a .account__avatar {
   white-space: nowrap;
   display: flex;
   align-items: center;
-  gap: 4px;
+  gap: 8px;
+
+  .icon-button {
+    border: 1px solid var(--background-border-color);
+    border-radius: 4px;
+    box-sizing: content-box;
+    padding: 5px;
+
+    .icon {
+      width: 24px;
+      height: 24px;
+    }
+  }
 }
 
 .account-authorize {

From ebcf9840f4720056ff12055741351b36eb84961a Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 24 Apr 2024 10:45:24 +0200
Subject: [PATCH 0822/2191] New Crowdin Translations (automated) (#30050)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/bg.json    |  1 +
 app/javascript/mastodon/locales/id.json    | 39 ++++++++++++++
 app/javascript/mastodon/locales/zh-HK.json |  1 +
 config/locales/devise.eo.yml               |  3 +-
 config/locales/doorkeeper.bg.yml           |  1 +
 config/locales/doorkeeper.ca.yml           |  1 +
 config/locales/doorkeeper.da.yml           |  1 +
 config/locales/doorkeeper.de.yml           |  1 +
 config/locales/doorkeeper.es-AR.yml        |  1 +
 config/locales/doorkeeper.eu.yml           |  1 +
 config/locales/doorkeeper.fi.yml           |  1 +
 config/locales/doorkeeper.fo.yml           |  1 +
 config/locales/doorkeeper.gl.yml           |  1 +
 config/locales/doorkeeper.he.yml           |  1 +
 config/locales/doorkeeper.hu.yml           |  1 +
 config/locales/doorkeeper.ia.yml           |  1 +
 config/locales/doorkeeper.is.yml           |  1 +
 config/locales/doorkeeper.it.yml           |  1 +
 config/locales/doorkeeper.ko.yml           |  1 +
 config/locales/doorkeeper.nl.yml           |  1 +
 config/locales/doorkeeper.nn.yml           |  1 +
 config/locales/doorkeeper.pl.yml           |  1 +
 config/locales/doorkeeper.sl.yml           |  1 +
 config/locales/doorkeeper.tr.yml           |  1 +
 config/locales/doorkeeper.uk.yml           |  1 +
 config/locales/doorkeeper.vi.yml           |  1 +
 config/locales/doorkeeper.zh-CN.yml        |  1 +
 config/locales/doorkeeper.zh-HK.yml        |  1 +
 config/locales/doorkeeper.zh-TW.yml        |  1 +
 config/locales/eo.yml                      | 63 +++++++++++-----------
 config/locales/ia.yml                      | 52 ++++++++++++++++++
 config/locales/pt-BR.yml                   |  2 +
 config/locales/simple_form.ia.yml          |  2 +
 33 files changed, 157 insertions(+), 31 deletions(-)

diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json
index 910d6cb06eb06f..dabefd1f45e1f3 100644
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@@ -297,6 +297,7 @@
   "filter_modal.select_filter.subtitle": "Изберете съществуваща категория или създайте нова",
   "filter_modal.select_filter.title": "Филтриране на публ.",
   "filter_modal.title.status": "Филтриране на публ.",
+  "filtered_notifications_banner.mentions": "{count, plural, one {споменаване} other {споменавания}}",
   "filtered_notifications_banner.pending_requests": "Известията от {count, plural, =0 {никого, когото може да познавате} one {едно лице, което може да познавате} other {# души, които може да познавате}}",
   "filtered_notifications_banner.title": "Филтрирани известия",
   "firehose.all": "Всичко",
diff --git a/app/javascript/mastodon/locales/id.json b/app/javascript/mastodon/locales/id.json
index 90a48b6343418f..33161f888251d9 100644
--- a/app/javascript/mastodon/locales/id.json
+++ b/app/javascript/mastodon/locales/id.json
@@ -123,6 +123,7 @@
   "column.directory": "Jelajahi profil",
   "column.domain_blocks": "Domain tersembunyi",
   "column.favourites": "Favorit",
+  "column.firehose": "Feed yang sedang berlangsung",
   "column.follow_requests": "Permintaan mengikuti",
   "column.home": "Beranda",
   "column.lists": "List",
@@ -143,7 +144,9 @@
   "community.column_settings.remote_only": "Hanya jarak jauh",
   "compose.language.change": "Ganti bahasa",
   "compose.language.search": "Telusuri bahasa...",
+  "compose.published.body": "Postingan diterbitkan.",
   "compose.published.open": "Buka",
+  "compose.saved.body": "Postingan tersimpan.",
   "compose_form.direct_message_warning_learn_more": "Pelajari lebih lanjut",
   "compose_form.encryption_warning": "Kiriman di Mastodon tidak dienkripsi secara end-to-end. Jangan bagikan informasi sensitif melalui Mastodon.",
   "compose_form.hashtag_warning": "Kiriman ini tidak akan didaftarkan di bawah tagar apapun selama tidak diatur ke publik. Hanya kiriman publik yang dapat dicari dengan tagar.",
@@ -151,11 +154,19 @@
   "compose_form.lock_disclaimer.lock": "terkunci",
   "compose_form.placeholder": "Apa yang ada di pikiran Anda?",
   "compose_form.poll.duration": "Durasi japat",
+  "compose_form.poll.multiple": "Pilihan ganda",
+  "compose_form.poll.option_placeholder": "Opsi {number}",
+  "compose_form.poll.single": "Pilih Satu",
   "compose_form.poll.switch_to_multiple": "Ubah japat menjadi pilihan ganda",
   "compose_form.poll.switch_to_single": "Ubah japat menjadi pilihan tunggal",
+  "compose_form.poll.type": "Gaya",
+  "compose_form.publish": "Postingan",
   "compose_form.publish_form": "Terbitkan",
+  "compose_form.reply": "Balas",
+  "compose_form.save_changes": "Perbarui",
   "compose_form.spoiler.marked": "Hapus peringatan tentang isi konten",
   "compose_form.spoiler.unmarked": "Tambahkan peringatan tentang isi konten",
+  "compose_form.spoiler_placeholder": "Peringatan konten (opsional)",
   "confirmation_modal.cancel": "Batal",
   "confirmations.block.confirm": "Blokir",
   "confirmations.cancel_follow_request.confirm": "Batalkan permintaan",
@@ -166,12 +177,15 @@
   "confirmations.delete_list.message": "Apakah Anda yakin untuk menghapus daftar ini secara permanen?",
   "confirmations.discard_edit_media.confirm": "Buang",
   "confirmations.discard_edit_media.message": "Anda belum menyimpan perubahan deskripsi atau pratinjau media, buang saja?",
+  "confirmations.domain_block.confirm": "Blokir server",
   "confirmations.domain_block.message": "Apakah Anda benar-benar yakin untuk memblokir keseluruhan {domain}? Dalam kasus tertentu beberapa pemblokiran atau penyembunyian lebih baik.",
   "confirmations.edit.confirm": "Ubah",
+  "confirmations.edit.message": "Mengubah akan menimpa pesan yang sedang anda tulis. Apakah anda yakin ingin melanjutkan?",
   "confirmations.logout.confirm": "Keluar",
   "confirmations.logout.message": "Apakah Anda yakin ingin keluar?",
   "confirmations.mute.confirm": "Bisukan",
   "confirmations.redraft.confirm": "Hapus dan susun ulang",
+  "confirmations.redraft.message": "Apakah anda yakin ingin menghapus postingan ini dan menyusun ulang postingan ini? Favorit dan peningkatan akan hilang, dan balasan ke postingan asli tidak akan terhubung ke postingan manapun.",
   "confirmations.reply.confirm": "Balas",
   "confirmations.reply.message": "Membalas sekarang akan menimpa pesan yang sedang Anda buat. Anda yakin ingin melanjutkan?",
   "confirmations.unfollow.confirm": "Berhenti mengikuti",
@@ -180,6 +194,7 @@
   "conversation.mark_as_read": "Tandai sudah dibaca",
   "conversation.open": "Lihat percakapan",
   "conversation.with": "Dengan {names}",
+  "copy_icon_button.copied": "Disalin ke clipboard",
   "copypaste.copied": "Disalin",
   "copypaste.copy_to_clipboard": "Salin ke clipboard",
   "directory.federated": "Dari fediverse yang dikenal",
@@ -191,7 +206,27 @@
   "dismissable_banner.community_timeline": "Ini adalah kiriman publik terkini dari orang yang akunnya berada di {domain}.",
   "dismissable_banner.dismiss": "Abaikan",
   "dismissable_banner.explore_links": "Cerita berita ini sekarang sedang dibicarakan oleh orang di server ini dan lainnya dalam jaringan terdesentralisasi.",
+  "dismissable_banner.explore_statuses": "Ini adalah postingan dari seluruh web sosial yang mendapatkan daya tarik saat ini. Postingan baru dengan lebih banyak peningkatan dan favorit memiliki peringkat lebih tinggi.",
   "dismissable_banner.explore_tags": "Tagar ini sekarang sedang tren di antara orang di server ini dan lainnya dalam jaringan terdesentralisasi.",
+  "dismissable_banner.public_timeline": "Ini adalah postingan publik dari orang-orang di web sosial yang diikuti oleh {domain}.",
+  "domain_block_modal.block": "Blokir server",
+  "domain_block_modal.block_account_instead": "Blokir @{name} saja",
+  "domain_block_modal.they_can_interact_with_old_posts": "Orang-orang dari server ini dapat berinteraksi dengan kiriman lama anda.",
+  "domain_block_modal.they_cant_follow": "Tidak ada seorangpun dari server ini yang dapat mengikuti anda.",
+  "domain_block_modal.they_wont_know": "Mereka tidak akan tahu bahwa mereka diblokir.",
+  "domain_block_modal.title": "Blokir domain?",
+  "domain_block_modal.you_will_lose_followers": "Semua pengikut anda dari server ini akan dihapus.",
+  "domain_block_modal.you_wont_see_posts": "Anda tidak akan melihat postingan atau notifikasi dari pengguna di server ini.",
+  "domain_pill.activitypub_lets_connect": "Ini memungkinkan anda terhubung dan berinteraksi dengan orang-orang tidak hanya di Mastodon, tetapi juga di berbagai aplikasi sosial.",
+  "domain_pill.activitypub_like_language": "ActivityPub seperti bahasa yang digunakan Mastodon dengan jejaring sosial lainnya.",
+  "domain_pill.server": "Server",
+  "domain_pill.their_handle": "Nama penggunanya:",
+  "domain_pill.their_server": "Rumah digital mereka, di mana semua postingan mereka tersedia.",
+  "domain_pill.their_username": "Pengenal unik mereka di server tersebut. Itu memungkinkan dapat mencari pengguna dengan nama yang sama di server lain.",
+  "domain_pill.username": "Nama pengguna",
+  "domain_pill.whats_in_a_handle": "Apa itu nama pengguna?",
+  "domain_pill.who_they_are": "Karena nama pengguna menunjukkan siapa seseorang dan di mana server mereka berada, anda dapat berinteraksi dengan orang-orang di seluruh web sosial  <button>ActivityPub-powered platforms</button>.",
+  "domain_pill.your_handle": "Nama pengguna anda:",
   "embed.instructions": "Sematkan kiriman ini di situs web Anda dengan menyalin kode di bawah ini.",
   "embed.preview": "Tampilan akan seperti ini nantinya:",
   "emoji_button.activity": "Aktivitas",
@@ -260,6 +295,10 @@
   "follow_request.authorize": "Izinkan",
   "follow_request.reject": "Tolak",
   "follow_requests.unlocked_explanation": "Meskipun akun Anda tidak dikunci, staf {domain} menyarankan Anda untuk meninjau permintaan mengikuti dari akun-akun ini secara manual.",
+  "follow_suggestions.curated_suggestion": "Pilihan staf",
+  "follow_suggestions.dismiss": "Jangan tampilkan lagi",
+  "follow_suggestions.hints.featured": "Profil ini telah dipilih sendiri oleh tim {domain}.",
+  "follow_suggestions.hints.friends_of_friends": "Profil ini populer di kalangan orang yang anda ikuti.",
   "followed_tags": "Tagar yang diikuti",
   "footer.about": "Tentang",
   "footer.directory": "Direktori profil",
diff --git a/app/javascript/mastodon/locales/zh-HK.json b/app/javascript/mastodon/locales/zh-HK.json
index 0b328c7386523e..3ca9a8d11e6130 100644
--- a/app/javascript/mastodon/locales/zh-HK.json
+++ b/app/javascript/mastodon/locales/zh-HK.json
@@ -297,6 +297,7 @@
   "filter_modal.select_filter.subtitle": "使用既有類別，或創建一個新類別",
   "filter_modal.select_filter.title": "過濾此帖文",
   "filter_modal.title.status": "過濾一則帖文",
+  "filtered_notifications_banner.mentions": "{count, plural, one {則提及} other {則提及}}",
   "filtered_notifications_banner.pending_requests": "來自 {count, plural, =0 {0 位} other {# 位}}你可能認識的人的通知",
   "filtered_notifications_banner.title": "已過濾之通知",
   "firehose.all": "全部",
diff --git a/config/locales/devise.eo.yml b/config/locales/devise.eo.yml
index af1769aa66f13b..193fecc757201a 100644
--- a/config/locales/devise.eo.yml
+++ b/config/locales/devise.eo.yml
@@ -12,6 +12,7 @@ eo:
       last_attempt: Vi ankoraŭ povas provi unufoje antaŭ ol via konto estos ŝlosita.
       locked: Via konto estas ŝlosita.
       not_found_in_database: Nevalida %{authentication_keys} aŭ pasvorto.
+      omniauth_user_creation_failure: Eraro okazis kreinte konton por ĉi tiu identeco.
       pending: Via konto ankoraŭ estas kontrolata.
       timeout: Via seanco eksvalidiĝis. Bonvolu ensaluti denove por daŭrigi.
       unauthenticated: Vi devas ensaluti aŭ registriĝi antaŭ ol daŭrigi.
@@ -39,7 +40,7 @@ eo:
         explanation: Retajpu la novan adreson por ŝanĝi vian retpoŝtadreson.
         extra: Se ĉi tiu ŝanĝo ne estis komencita de vi, bonvolu ignori ĉi tiun retmesaĝon. La retadreso por la Mastodon-konto ne ŝanĝiĝos se vi ne aliras la supran ligilon.
         subject: 'Mastodon: Konfirmi retpoŝton por %{instance}'
-        title: Kontrolu retpoŝtadreson
+        title: Kontroli retpoŝtadreson
       reset_password_instructions:
         action: Ŝanĝi pasvorton
         explanation: Vi petis novan pasvorton por via konto.
diff --git a/config/locales/doorkeeper.bg.yml b/config/locales/doorkeeper.bg.yml
index 8e026794ee8532..7633156d789b8d 100644
--- a/config/locales/doorkeeper.bg.yml
+++ b/config/locales/doorkeeper.bg.yml
@@ -174,6 +174,7 @@ bg:
       read:filters: преглед на вашите филтри
       read:follows: преглед на вашите последвания
       read:lists: преглед на вашите списъци
+      read:me: четене само на основните сведения за акаунта ви
       read:mutes: преглед на вашите заглушавания
       read:notifications: преглед на вашите известия
       read:reports: преглед на вашите докладвания
diff --git a/config/locales/doorkeeper.ca.yml b/config/locales/doorkeeper.ca.yml
index 9706f3db70384f..80827a87da20bb 100644
--- a/config/locales/doorkeeper.ca.yml
+++ b/config/locales/doorkeeper.ca.yml
@@ -174,6 +174,7 @@ ca:
       read:filters: mira els teus filtres
       read:follows: mira els teus seguiments
       read:lists: mira les teves llistes
+      read:me: llegir només la informació bàsica del vostre compte
       read:mutes: mira els teus silenciats
       read:notifications: mira les teves notificacions
       read:reports: mira els teus informes
diff --git a/config/locales/doorkeeper.da.yml b/config/locales/doorkeeper.da.yml
index 2c8b0d13e17736..ed10e14e249d7a 100644
--- a/config/locales/doorkeeper.da.yml
+++ b/config/locales/doorkeeper.da.yml
@@ -174,6 +174,7 @@ da:
       read:filters: se dine filtre
       read:follows: se dine følger
       read:lists: se dine lister
+      read:me: læs kun kontoens basisoplysninger
       read:mutes: se dine tavsgørelser
       read:notifications: se dine notifikationer
       read:reports: se dine anmeldelser
diff --git a/config/locales/doorkeeper.de.yml b/config/locales/doorkeeper.de.yml
index 552dfeba371840..80d612255b9cc3 100644
--- a/config/locales/doorkeeper.de.yml
+++ b/config/locales/doorkeeper.de.yml
@@ -174,6 +174,7 @@ de:
       read:filters: deine Filter einsehen
       read:follows: sehen, wem du folgst
       read:lists: deine Listen sehen
+      read:me: nur deine grundlegenden Kontoinformationen lesen
       read:mutes: deine Stummschaltungen einsehen
       read:notifications: deine Benachrichtigungen sehen
       read:reports: deine Meldungen sehen
diff --git a/config/locales/doorkeeper.es-AR.yml b/config/locales/doorkeeper.es-AR.yml
index 532db1f30d13b2..47cfc451aa2668 100644
--- a/config/locales/doorkeeper.es-AR.yml
+++ b/config/locales/doorkeeper.es-AR.yml
@@ -174,6 +174,7 @@ es-AR:
       read:filters: ver tus filtros
       read:follows: ver qué cuentas seguís
       read:lists: ver tus listas
+      read:me: leer solo la información básica de tu cuenta
       read:mutes: ver qué cuentas silenciaste
       read:notifications: ver tus notificaciones
       read:reports: ver tus denuncias
diff --git a/config/locales/doorkeeper.eu.yml b/config/locales/doorkeeper.eu.yml
index e7963672fae5d3..88a63f698bbd80 100644
--- a/config/locales/doorkeeper.eu.yml
+++ b/config/locales/doorkeeper.eu.yml
@@ -174,6 +174,7 @@ eu:
       read:filters: ikusi zure iragazkiak
       read:follows: ikusi zuk jarraitutakoak
       read:lists: ikusi zure zerrendak
+      read:me: irakurri soilik zure kontuaren oinarrizko informazioa
       read:mutes: ikusi zuk mutututakoak
       read:notifications: ikusi zure jakinarazpenak
       read:reports: ikusi zure salaketak
diff --git a/config/locales/doorkeeper.fi.yml b/config/locales/doorkeeper.fi.yml
index fea01d107660cd..ae8963c76fcf09 100644
--- a/config/locales/doorkeeper.fi.yml
+++ b/config/locales/doorkeeper.fi.yml
@@ -174,6 +174,7 @@ fi:
       read:filters: katso suodattimiasi
       read:follows: katso seurattujasi
       read:lists: katso listojasi
+      read:me: lue tilisi perustietoja
       read:mutes: katso mykistyksiäsi
       read:notifications: katso ilmoituksiasi
       read:reports: katso raporttejasi
diff --git a/config/locales/doorkeeper.fo.yml b/config/locales/doorkeeper.fo.yml
index 78f8701ae92bab..4f5cc5a645ba12 100644
--- a/config/locales/doorkeeper.fo.yml
+++ b/config/locales/doorkeeper.fo.yml
@@ -174,6 +174,7 @@ fo:
       read:filters: síggja tíni filtur
       read:follows: síggja hvørji tú fylgir
       read:lists: síggja tínar listar
+      read:me: les bara grundleggjandi upplýsingar av tínari kontu
       read:mutes: síggja tínar doyvingar
       read:notifications: síggja tínar fráboðanir
       read:reports: síggja tínar meldingar
diff --git a/config/locales/doorkeeper.gl.yml b/config/locales/doorkeeper.gl.yml
index aa0eae2844e8c7..d34c58decc4077 100644
--- a/config/locales/doorkeeper.gl.yml
+++ b/config/locales/doorkeeper.gl.yml
@@ -174,6 +174,7 @@ gl:
       read:filters: ver os filtros
       read:follows: ver a quen segues
       read:lists: ver as tuas listaxes
+      read:me: ler só a información básica da túa conta
       read:mutes: ver a quen tes acalado
       read:notifications: ver as notificacións
       read:reports: ver as túas denuncias
diff --git a/config/locales/doorkeeper.he.yml b/config/locales/doorkeeper.he.yml
index 9030e45e0c4662..a6376fa4c1d27a 100644
--- a/config/locales/doorkeeper.he.yml
+++ b/config/locales/doorkeeper.he.yml
@@ -174,6 +174,7 @@ he:
       read:filters: צפייה במסננים
       read:follows: צפייה בנעקבים
       read:lists: צפיה ברשימותיך
+      read:me: לקריאה בלבד של פרטי חשבונך הבסיסיים
       read:mutes: צפיה במושתקיך
       read:notifications: צפיה בהתראותיך
       read:reports: צפיה בדוחותיך
diff --git a/config/locales/doorkeeper.hu.yml b/config/locales/doorkeeper.hu.yml
index 3822e9c202340a..28ce283ffaf850 100644
--- a/config/locales/doorkeeper.hu.yml
+++ b/config/locales/doorkeeper.hu.yml
@@ -174,6 +174,7 @@ hu:
       read:filters: szűrök megtekintése
       read:follows: követések megtekintése
       read:lists: listák megtekintése
+      read:me: csak a fiókod alapvető adatainak elolvasása
       read:mutes: némítások megtekintése
       read:notifications: értesítések megtekintése
       read:reports: bejelentések megtekintése
diff --git a/config/locales/doorkeeper.ia.yml b/config/locales/doorkeeper.ia.yml
index b41531a1b15675..fd7d7a08367fbf 100644
--- a/config/locales/doorkeeper.ia.yml
+++ b/config/locales/doorkeeper.ia.yml
@@ -87,6 +87,7 @@ ia:
       read:filters: vider tu filtros
       read:follows: vider tu sequites
       read:lists: vider tu listas
+      read:me: leger solmente le information basic de tu conto
       read:notifications: vider tu notificationes
       read:reports: vider tu reportos
       read:statuses: vider tote le messages
diff --git a/config/locales/doorkeeper.is.yml b/config/locales/doorkeeper.is.yml
index c1e2d4cfc36111..995d507f5bd3d0 100644
--- a/config/locales/doorkeeper.is.yml
+++ b/config/locales/doorkeeper.is.yml
@@ -174,6 +174,7 @@ is:
       read:filters: skoða síurnar þínar
       read:follows: sjá hverjum þú fylgist með
       read:lists: skoða listana þína
+      read:me: lesa einungis grunnupplýsingar aðgangsins þíns
       read:mutes: skoða hverja þú þaggar
       read:notifications: sjá tilkynningarnar þínar
       read:reports: skoða skýrslurnar þína
diff --git a/config/locales/doorkeeper.it.yml b/config/locales/doorkeeper.it.yml
index 3fd998fc4a61b6..f39f78466540f1 100644
--- a/config/locales/doorkeeper.it.yml
+++ b/config/locales/doorkeeper.it.yml
@@ -174,6 +174,7 @@ it:
       read:filters: visualizzare i tuoi filtri
       read:follows: visualizzare i tuoi seguiti
       read:lists: visualizzare i tuoi elenchi
+      read:me: leggi solo le informazioni di base del tuo account
       read:mutes: visualizzare i tuoi silenziamenti
       read:notifications: visualizzare le tue notifiche
       read:reports: visualizzare le tue segnalazioni
diff --git a/config/locales/doorkeeper.ko.yml b/config/locales/doorkeeper.ko.yml
index 4721e3acdb63e3..12674cc125e20e 100644
--- a/config/locales/doorkeeper.ko.yml
+++ b/config/locales/doorkeeper.ko.yml
@@ -174,6 +174,7 @@ ko:
       read:filters: 필터 보기
       read:follows: 팔로우 보기
       read:lists: 리스트 보기
+      read:me: 내 계정의 기본 정보만을 읽습니다
       read:mutes: 뮤트 보기
       read:notifications: 알림 보기
       read:reports: 신고 보기
diff --git a/config/locales/doorkeeper.nl.yml b/config/locales/doorkeeper.nl.yml
index b3e6e79a1a3d62..9554c0ee6f5d19 100644
--- a/config/locales/doorkeeper.nl.yml
+++ b/config/locales/doorkeeper.nl.yml
@@ -174,6 +174,7 @@ nl:
       read:filters: jouw filters bekijken
       read:follows: de accounts die jij volgt bekijken
       read:lists: jouw lijsten bekijken
+      read:me: alleen de basisgegevens van jouw account lezen
       read:mutes: jouw genegeerde gebruikers bekijken
       read:notifications: jouw meldingen bekijken
       read:reports: jouw gerapporteerde berichten bekijken
diff --git a/config/locales/doorkeeper.nn.yml b/config/locales/doorkeeper.nn.yml
index 0e5d1ca455ae4d..ab0380c6fa789d 100644
--- a/config/locales/doorkeeper.nn.yml
+++ b/config/locales/doorkeeper.nn.yml
@@ -174,6 +174,7 @@ nn:
       read:filters: sjå filtera dine
       read:follows: sjå fylgjarane dine
       read:lists: sjå listene dine
+      read:me: les berre kontoen din sin grunnleggjande informasjon
       read:mutes: sjå kven du har målbunde
       read:notifications: sjå varsla dine
       read:reports: sjå rapportane dine
diff --git a/config/locales/doorkeeper.pl.yml b/config/locales/doorkeeper.pl.yml
index 226c0d403c8491..eefca2de658fb4 100644
--- a/config/locales/doorkeeper.pl.yml
+++ b/config/locales/doorkeeper.pl.yml
@@ -174,6 +174,7 @@ pl:
       read:filters: dostęp do filtrów
       read:follows: dostęp do listy obserwowanych
       read:lists: dostęp do Twoich list
+      read:me: odczytaj tylko podstawowe informacje o koncie
       read:mutes: dostęp do listy wyciszonych
       read:notifications: możliwość odczytu powiadomień
       read:reports: dostęp do Twoich zgłoszeń
diff --git a/config/locales/doorkeeper.sl.yml b/config/locales/doorkeeper.sl.yml
index a613308b28afbf..55e00ff96d6a06 100644
--- a/config/locales/doorkeeper.sl.yml
+++ b/config/locales/doorkeeper.sl.yml
@@ -174,6 +174,7 @@ sl:
       read:filters: oglejte si svoje filtre
       read:follows: oglejte si svoje sledilce
       read:lists: oglejte si svoje sezname
+      read:me: preberi le osnovne podatke računa
       read:mutes: oglejte si svoje utišane
       read:notifications: oglejte si svoja obvestila
       read:reports: oglejte si svoje prijave
diff --git a/config/locales/doorkeeper.tr.yml b/config/locales/doorkeeper.tr.yml
index 47a15e1b8a7bad..f5ebbc5fd84383 100644
--- a/config/locales/doorkeeper.tr.yml
+++ b/config/locales/doorkeeper.tr.yml
@@ -174,6 +174,7 @@ tr:
       read:filters: süzgeçlerinizi görün
       read:follows: takip ettiklerinizi görün
       read:lists: listelerinizi görün
+      read:me: hesabınızın sadece temel bilgilerini okuma
       read:mutes: sessize aldıklarınızı görün
       read:notifications: bildirimlerinizi görün
       read:reports: raporlarınızı görün
diff --git a/config/locales/doorkeeper.uk.yml b/config/locales/doorkeeper.uk.yml
index 8af404a7366c19..ac7fbbe15d7dfc 100644
--- a/config/locales/doorkeeper.uk.yml
+++ b/config/locales/doorkeeper.uk.yml
@@ -180,6 +180,7 @@ uk:
       read:filters: бачити Ваші фільтри
       read:follows: бачити Ваші підписки
       read:lists: бачити Ваші списки
+      read:me: читайте лише основну інформацію вашого облікового запису
       read:mutes: бачити ваші нехтування
       read:notifications: бачити Ваші сповіщення
       read:reports: бачити Ваші скарги
diff --git a/config/locales/doorkeeper.vi.yml b/config/locales/doorkeeper.vi.yml
index 8375795273060f..84684d24ca7e59 100644
--- a/config/locales/doorkeeper.vi.yml
+++ b/config/locales/doorkeeper.vi.yml
@@ -174,6 +174,7 @@ vi:
       read:filters: xem bộ lọc
       read:follows: xem những người theo dõi
       read:lists: xem danh sách
+      read:me: chỉ đọc thông tin cơ bản tài khoản
       read:mutes: xem những người đã ẩn
       read:notifications: xem thông báo
       read:reports: xem báo cáo của bạn
diff --git a/config/locales/doorkeeper.zh-CN.yml b/config/locales/doorkeeper.zh-CN.yml
index 36c7fb81277b8c..73f1f9725ce6ad 100644
--- a/config/locales/doorkeeper.zh-CN.yml
+++ b/config/locales/doorkeeper.zh-CN.yml
@@ -174,6 +174,7 @@ zh-CN:
       read:filters: 查看你的过滤器
       read:follows: 查看你的关注
       read:lists: 查看你的列表
+      read:me: 只读取你账户的基本信息
       read:mutes: 查看你的隐藏列表
       read:notifications: 查看你的通知
       read:reports: 查看你的举报
diff --git a/config/locales/doorkeeper.zh-HK.yml b/config/locales/doorkeeper.zh-HK.yml
index 79629b12febf39..76d13a74a5b7c6 100644
--- a/config/locales/doorkeeper.zh-HK.yml
+++ b/config/locales/doorkeeper.zh-HK.yml
@@ -174,6 +174,7 @@ zh-HK:
       read:filters: 檢視你的過濾條件
       read:follows: 檢視你關注的人
       read:lists: 檢視你的清單
+      read:me: 僅讀取帳號的基本資訊
       read:mutes: 檢視被你靜音的人
       read:notifications: 檢視你的通知
       read:reports: 檢視你的檢舉
diff --git a/config/locales/doorkeeper.zh-TW.yml b/config/locales/doorkeeper.zh-TW.yml
index f2250b79cbce02..86827a7122435d 100644
--- a/config/locales/doorkeeper.zh-TW.yml
+++ b/config/locales/doorkeeper.zh-TW.yml
@@ -174,6 +174,7 @@ zh-TW:
       read:filters: 檢視您的過濾條件
       read:follows: 檢視您跟隨之使用者
       read:lists: 檢視您的列表
+      read:me: 僅讀取您的帳號基本資訊
       read:mutes: 檢視您靜音的人
       read:notifications: 檢視您的通知
       read:reports: 檢視您的檢舉
diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index d59eadd5286fd1..749f80687df6de 100644
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -74,7 +74,7 @@ eo:
       follows: Sekvatoj
       header: Kapa bildo
       inbox_url: Enira URL
-      invite_request_text: 가입하려는 이유
+      invite_request_text: Kialoj por aliĝi
       invited_by: Invitita de
       ip: IP
       joined: Aliĝis
@@ -104,7 +104,7 @@ eo:
       no_role_assigned: Sen rolo
       not_subscribed: Ne abonita
       pending: Pritraktata recenzo
-      perform_full_suspension: Suspendi
+      perform_full_suspension: Haltigi
       previous_strikes: Antaǔaj admonoj
       previous_strikes_description_html:
         one: Ĉi tiu konto havas <strong>unu</strong> admonon.
@@ -121,7 +121,7 @@ eo:
       remote_suspension_reversible_hint_html: La konto estas suspendita, kaj la datumoj estos komplete forigitaj je %{date}. Ĝis tiam, la konto povas esti malsuspendita sen flankefiko. Se vi deziras tuj forigi ĉiujn datumojn de la konto, vi povas fari tion sube.
       remove_avatar: Forigi la profilbildon
       remove_header: Forigi kapan bildon
-      removed_avatar_msg: La rolfiguro de %{username} estas sukcese forigita
+      removed_avatar_msg: La profilbildo de %{username} estas sukcese forigita
       removed_header_msg: Kapbildo de %{username} suksece forigita
       resend_confirmation:
         already_confirmed: Ĉi tiu uzanto jam estas konfirmita
@@ -184,7 +184,7 @@ eo:
         create_domain_block: Krei Blokadon De Domajno
         create_email_domain_block: Krei Blokadon De Retpoŝta Domajno
         create_ip_block: Krei IP-regulon
-        create_unavailable_domain: Krei nehaveblan domajnon
+        create_unavailable_domain: Krei Nehaveblan Domajnon
         create_user_role: Krei Rolon
         demote_user: Malpromocii Uzanton
         destroy_announcement: Forigi Anoncon
@@ -193,9 +193,9 @@ eo:
         destroy_domain_allow: Forigi Domajnan Permeson
         destroy_domain_block: Forigi blokadon de domajno
         destroy_email_domain_block: Forigi blokadon de retpoŝta domajno
-        destroy_instance: Forigi domajnon
+        destroy_instance: Forigi Domajnon
         destroy_ip_block: Forigi IP-regulon
-        destroy_status: Forigi mesaĝon
+        destroy_status: Forigi Afiŝon
         destroy_unavailable_domain: Forigi Nehaveblan Domajnon
         destroy_user_role: Detrui Rolon
         disable_2fa_user: Malebligi 2FA
@@ -285,7 +285,7 @@ eo:
         update_custom_emoji_html: "%{name} ĝisdatigis la emoĝion %{target}"
         update_domain_block_html: "%{name} ĝisdatigis domajnblokon por %{target}"
         update_ip_block_html: "%{name} ŝanĝis regulon por IP %{target}"
-        update_status_html: "%{name} ĝisdatigis mesaĝon de %{target}"
+        update_status_html: "%{name} ĝisdatigis afiŝon de %{target}"
         update_user_role_html: "%{name} ŝanĝis la rolon %{target}"
       deleted_account: forigita konto
       empty: Neniu ĵurnalo trovita.
@@ -567,7 +567,7 @@ eo:
       disable: Malebligi
       disabled: Malebligita
       enable: Ebligi
-      enable_hint: Post ebligo, via servilo abonos ĉiujn publikajn mesaĝojn de tiu ripetilo, kaj komencos sendi publikajn mesaĝojn de la servilo al ĝi.
+      enable_hint: Post ebligo, via servilo abonos ĉiujn publikajn mesaĝojn de tiu ripetilo, kaj komencos sendi publikajn afiŝojn de la servilo al ĝi.
       enabled: Ebligita
       inbox_url: URL de la ripetilo
       pending: Atendante aprobon de la ripetilo
@@ -587,7 +587,7 @@ eo:
       action_log: Ĵurnalo de revizo
       action_taken_by: Ago farita de
       actions:
-        delete_description_html: Raportitaj mesaĝoj forigotas kaj admono rekorditas.
+        delete_description_html: Raportitaj afiŝoj estos forigita kaj admono estos rekordita por helpi vin indiki estontajn afiŝojn de la sama konto kontraŭ reguloj.
         mark_as_sensitive_description_html: La audovidaĵo en la raportita mesaĝo markotas kiel sentema kaj admono rekorditas.
         other_description_html: Vidu pli da ebloj por regi la sintenon de la konto kaj por personigi la komunikadon kun la raportita konto.
         resolve_description_html: Nenio okazotas al la raportita konto kaj la raporto fermotas.
@@ -634,7 +634,7 @@ eo:
       resolved: Solvitaj
       resolved_msg: Signalo sukcese solvita!
       skip_to_actions: Salti al agoj
-      status: Mesaĝoj
+      status: Afiŝo
       statuses: Raportita enhavo
       statuses_description_html: Sentema enhavo referencitas kun la raportita konto
       summary:
@@ -787,6 +787,7 @@ eo:
       types:
         major: Ĉefa eldono
         minor: Neĉefa eldono
+      version: Versio
     statuses:
       account: Skribanto
       application: Aplikaĵo
@@ -803,12 +804,12 @@ eo:
       media:
         title: Aŭdovidaĵoj
       metadata: Metadatumoj
-      no_status_selected: Neniu mesaĝo estis ŝanĝita ĉar neniu estis elektita
+      no_status_selected: Neniu afiŝo estis ŝanĝita ĉar neniu estis elektita
       open: Malfermi afiŝojn
       original_status: Originala afiŝo
       reblogs: Reblogaĵoj
       status_changed: Afiŝo ŝanĝiĝis
-      title: Mesaĝoj de la konto
+      title: Afiŝoj de la konto
       trending: Popularaĵoj
       visibility: Videbleco
       with_media: Kun aŭdovidaĵoj
@@ -816,7 +817,7 @@ eo:
       actions:
         delete_statuses: "%{name} forigis afiŝojn de %{target}"
         disable: "%{name} frostigis la konton de %{target}"
-        mark_statuses_as_sensitive: "%{name} markis mesaĝojn de %{target} kiel sentemaj"
+        mark_statuses_as_sensitive: "%{name} markis afiŝojn de %{target} kiel tiklan"
         none: "%{name} sendis averton al %{target}"
         sensitive: "%{name} markis konton de %{target} kiel sentema"
         silence: "%{name} limigis la konton de %{target}"
@@ -827,6 +828,8 @@ eo:
     system_checks:
       database_schema_check:
         message_html: Estas pritraktataj datumbazaj migradoj. Bonvolu ekzekuti ilin por certigi, ke la apliko kondutas kiel atendite
+      elasticsearch_preset:
+        action: Legi dokumentaron
       elasticsearch_running_check:
         message_html: Ne eblas konekti Elasticsearch. Bonvolu kontroli ke ĝi funkcias, aǔ malŝaltu plentekstan serĉon
       elasticsearch_version_check:
@@ -940,7 +943,7 @@ eo:
   admin_mailer:
     new_appeal:
       actions:
-        delete_statuses: por forigi iliajn mesaĝojn
+        delete_statuses: por forigi iliajn afiŝojn
         disable: por frostigi ties konton
         mark_statuses_as_sensitive: por marki iliajn mesaĝojn kiel sentemaj
         none: averto
@@ -991,7 +994,7 @@ eo:
     unsubscribe: Malabonu
     view: 'Vidi:'
     view_profile: Vidi profilon
-    view_status: Vidi mesaĝon
+    view_status: Vidi afiŝon
   applications:
     created: Aplikaĵo sukcese kreita
     destroyed: Aplikaĵo sukcese forigita
@@ -1131,7 +1134,7 @@ eo:
       recipient: Senditas por
       reject_appeal: Malakcepti apelacion
       status: 'Afiŝo #%{id}'
-      status_removed: Mesaĝo jam forigitas de sistemo
+      status_removed: Afiŝo jam estas forigita de sistemo
       title: "%{action} de %{date}"
       title_actions:
         delete_statuses: Forigo de afiŝo
@@ -1199,8 +1202,8 @@ eo:
     edit:
       add_keyword: Aldoni ĉefvorton
       keywords: Ĉefvortoj
-      statuses: Individuaj mesaĝoj
-      statuses_hint_html: Ĉi tiu filtrilo kongruas kelkajn mesaĝojn. <a href="%{path}">Kontrolu mesaĝojn de la filtrilo</a>.
+      statuses: Individuaj afiŝoj
+      statuses_hint_html: Ĉi tiu filtrilo kongruas kelkajn afiŝojn. <a href="%{path}">Kontroli afiŝojn de la filtrilo</a>.
       title: Ŝanĝi filtrilojn
     errors:
       deprecated_api_multiple_keywords: Ĉi tiuj parametroj ne povas ŝanĝitis de ĉi tiu programaro. Uzu pli novan programaron.
@@ -1218,8 +1221,8 @@ eo:
         one: "%{count} afiŝo"
         other: "%{count} afiŝoj"
       statuses_long:
-        one: "%{count} mesaĝo kaŝita"
-        other: "%{count} mesaĝoj kaŝita"
+        one: "%{count} afiŝo estas kaŝita"
+        other: "%{count} afiŝoj estas kaŝitaj"
       title: Filtriloj
     new:
       save: Konservi novan filtrilon
@@ -1230,7 +1233,7 @@ eo:
         remove: Forigi de filtrilo
       index:
         hint: Ĉi tiu filtrilo kongruas kelkaj mesaĝoj sendepende de aliaj kriterioj.
-        title: Filtritaj mesaĝoj
+        title: Filtritaj afiŝoj
   generic:
     all: Ĉio
     all_items_on_page_selected_html:
@@ -1644,16 +1647,16 @@ eo:
     interaction_exceptions_explanation: Sciu ke estas neniu garantio ke mesaĝo estos forigita se ĝi iras sub la limo de diskonigoj aŭ stelumoj post atingi ĝin.
     keep_direct: Konservi rektajn mesaĝojn
     keep_direct_hint: Ne forigos viajn rektajn mesagôjn
-    keep_media: Konservi mesaĝojn kun aŭdovidaj aldonaĵoj
+    keep_media: Konservi afiŝojn kun aŭdovidaj aldonaĵoj
     keep_media_hint: Ne forigi mesaĝojn kiuj enhavas aŭdovidajn aldonaĵojn
-    keep_pinned: Konservi alpinglitajn mesaĝojn
+    keep_pinned: Konservi alpinglitajn afiŝojn
     keep_pinned_hint: Ne forigi viajn ajn alpinglitajn mesaĝojn
     keep_polls: Konservi enketojn
     keep_polls_hint: Ne forigi viajn ajn enketojn
-    keep_self_bookmark: Konservi mesaĝojn kiun vi legsignis
+    keep_self_bookmark: Konservi afiŝojn kiun vi legsignis
     keep_self_bookmark_hint: Ne forigi viajn siajn mesaĝojn se vi legsignis ilin
-    keep_self_fav: Konservi mesaĝojn kiujn vi stelumis
-    keep_self_fav_hint: Ne forigi proprajn mesaĝojn se vi stelumis ilin
+    keep_self_fav: Konservi afiŝojn kiujn vi stelumis
+    keep_self_fav_hint: Ne forigi proprajn afiŝojn se vi stelumis ilin
     min_age:
       '1209600': 2 semajnoj
       '15778476': 6 monatoj
@@ -1664,7 +1667,7 @@ eo:
       '63113904': 2 jaroj
       '7889238': 3 monatoj
     min_age_label: Aĝlimo
-    min_favs: Konservi mesaĝojn stelumitajn almenaŭ
+    min_favs: Konservi afiŝojn stelumitajn almenaŭ
     min_favs_hint: Oni ne forigas viajn afiŝojn, kiuj estas diskonigitaj almenaŭ ĉi tiun nombron da fojoj. Lasu malplena por forigi afiŝojn sendepende de iliaj nombroj da diskonigoj
     min_reblogs: Konservi diskonitajn mesaĝojn almenau
     min_reblogs_hint: Oni ne forigas viajn afiŝojn kiuj estas diskonigitaj almenaŭ ĉi tiun nombron da fojoj. Lasu malplena por forigi afiŝojn sendepende de iliaj nombroj da diskonigoj
@@ -1738,11 +1741,11 @@ eo:
         silence: Vi ankorau povas uzi vian konton, sed nur personoj kiuj jam sekvas vin vidos viajn mesaĝojn en tiu ĉi servilo, kaj vi eble estos ekskluzive el diversaj malkovrigaj funkcioj. Tamen, aliaj ankoraŭ povas permane eksekvi vin.
         suspend: Vi ne povas uzi vian konton plu, kaj via profilo kaj aliaj datumoj ne estas disponeblaj plu.
       reason: 'Kialo:'
-      statuses: 'Mesaĝoj ripetitaj:'
+      statuses: 'Afiŝoj citataj:'
       subject:
-        delete_statuses: Viaj mesaĝoj ĉe %{acct} forigitas
+        delete_statuses: Viaj afiŝoj ĉe %{acct} estas forigitaj
         disable: Via konto %{acct} estas frostigita
-        mark_statuses_as_sensitive: Viaj mesaĝoj ĉe %{acct} markitas kiel sentemaj
+        mark_statuses_as_sensitive: Viaj afiŝoj ĉe %{acct} estas markitaj kiel tiklemaj
         none: Averto por %{acct}
         sensitive: Viaj mesaĝoj ĉe %{acct} markitas kiel sentemaj malantau ol nun
         silence: Oni limigis vian konton %{acct}
diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index a167b5d8cdb9c9..6c9929315610bc 100644
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -15,17 +15,27 @@ ia:
     instance_actor_flash: Iste conto es un agente virtual usate pro representar le servitor mesme e non alcun usator individual. Illo es usate pro le federation e non debe esser suspendite.
     last_active: ultime activitate
     link_verified_on: Le proprietate de iste ligamine ha essite verificate le %{date}
+    nothing_here: Il ha nihil ci!
+    pin_errors:
+      following: Tu debe primo sequer le persona que tu vole indorsar
     posts:
       one: Message
       other: Messages
     posts_tab_heading: Messages
   admin:
+    account_actions:
+      action: Exequer action
+      title: Exequer action de moderation sur %{acct}
     account_moderation_notes:
       create: Lassar un nota
       created_msg: Nota de moderation create con successo!
+      destroyed_msg: Nota de moderation destruite con successo!
     accounts:
       add_email_domain_block: Blocar dominio de e-mail
+      approve: Approbar
+      approved_msg: Demanda de inscription de %{username} approbate con successo
       are_you_sure: Es tu secur?
+      avatar: Avatar
       by_domain: Dominio
       change_email:
         changed_msg: Email cambiate con successo!
@@ -34,6 +44,11 @@ ia:
         new_email: Nove e-mail
         submit: Cambiar e-mail
         title: Cambiar e-mail pro %{username}
+      change_role:
+        changed_msg: Rolo cambiate con successo!
+        label: Cambiar rolo
+        no_role: Necun rolo
+        title: Cambiar rolo pro %{username}
       confirm: Confirmar
       confirmed: Confirmate
       confirming: In confirmation
@@ -42,25 +57,59 @@ ia:
       deleted: Delite
       demote: Degradar
       destroyed_msg: Le datos de %{username} ora es in cauda pro su imminente deletion
+      disable: Gelar
+      disable_sign_in_token_auth: Disactivar le authentication per token in e-mail
       disable_two_factor_authentication: Disactivar 2FA
+      disabled: Gelate
       display_name: Nomine visibile
       domain: Dominio
       edit: Modificar
       email: E-mail
       email_status: Stato de e-mail
+      enable: Disgelar
+      enable_sign_in_token_auth: Activar le authentication per token in e-mail
       enabled: Activate
+      enabled_msg: Conto de %{username} disgelate con successo
       followers: Sequitores
+      follows: Sequites
+      header: Capite
+      inbox_url: URL de cassa de entrata
+      invite_request_text: Motivos pro le inscription
+      invited_by: Invitate per
+      ip: IP
+      joined: Inscription
       location:
         all: Toto
+        local: Local
+        remote: Remote
         title: Location
+      login_status: Stato de session
+      media_attachments: Annexos multimedial
+      memorialize: Render commemorative
+      memorialized: Conto commemorative
+      memorialized_msg: "%{username} ha essite convertite in un conto commemorative"
       moderation:
         active: Active
         all: Toto
         disabled: Disactivate
+        pending: In tractamento
+        silenced: Limitate
+        suspended: Suspendite
+        title: Moderation
       moderation_notes: Notas de moderation
       most_recent_activity: Activitate plus recente
       most_recent_ip: IP plus recente
+      no_account_selected: Necun conto ha essite cambiate perque necun ha essite seligite
+      no_limits_imposed: Necun limite imponite
+      no_role_assigned: Necun rolo assignate
+      not_subscribed: Non subscribite
+      pending: Attende revision
+      perform_full_suspension: Suspender
+      previous_strikes: Previe admonitiones
+      promote: Promover
+      protocol: Protocollo
       public: Public
+      push_subscription_expires: Subscription PuSH expira le
       redownload: Actualisar profilo
       resend_confirmation:
         already_confirmed: Iste usator jam es confirmate
@@ -237,6 +286,9 @@ ia:
       updated_at: Actualisate
       view_profile: Vider profilo
     roles:
+      assigned_users:
+        one: "%{count} usator"
+        other: "%{count} usatores"
       everyone: Permissiones predefinite
       privileges:
         delete_user_data: Deler le datos de usator
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 4c22335eaa9cf3..8de8e4887ef682 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -1671,6 +1671,7 @@ pt-BR:
       domain_block: Suspensão do servidor (%{target_name})
       user_domain_block: Você bloqueou %{target_name}
     lost_followers: Seguidores perdidos
+    purged: As informações sobre este servidor foram eliminadas pelos administradores do seu servidor.
     type: Evento
   statuses:
     attached:
@@ -1765,6 +1766,7 @@ pt-BR:
     contrast: Mastodon  (Alto contraste)
     default: Mastodon (Noturno)
     mastodon-light: Mastodon (Diurno)
+    system: Automático (usar tema do sistema)
   time:
     formats:
       default: "%H:%M em %d de %b de %Y"
diff --git a/config/locales/simple_form.ia.yml b/config/locales/simple_form.ia.yml
index 2f04ce982e78d4..7012cdb1cd0833 100644
--- a/config/locales/simple_form.ia.yml
+++ b/config/locales/simple_form.ia.yml
@@ -30,6 +30,7 @@ ia:
       defaults:
         autofollow: Invitar a sequer tu conto
         avatar: Pictura de profilo
+        chosen_languages: Filtrar linguas
         confirm_new_password: Confirmar nove contrasigno
         confirm_password: Confirmar contrasigno
         current_password: Contrasigno actual
@@ -39,6 +40,7 @@ ia:
         new_password: Nove contrasigno
         password: Contrasigno
         setting_advanced_layout: Activar le interfacie web avantiate
+        setting_always_send_emails: Sempre inviar notificationes per e-mail
         setting_default_language: Lingua de publication
         setting_display_media_default: Predefinite
         setting_display_media_hide_all: Celar toto

From f4a53f3fb480bb1b9f0fa0d2849b6dc4300f679b Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 24 Apr 2024 04:56:28 -0400
Subject: [PATCH 0823/2191] Extract constants for column size length validation
 limits (#30045)

---
 app/models/account_moderation_note.rb | 4 +++-
 app/models/account_note.rb            | 4 +++-
 app/models/invite.rb                  | 4 +++-
 app/models/report.rb                  | 4 +++-
 app/models/report_note.rb             | 4 +++-
 app/models/rule.rb                    | 4 +++-
 app/models/user_invite_request.rb     | 4 +++-
 7 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/app/models/account_moderation_note.rb b/app/models/account_moderation_note.rb
index ff399bab0c0edf..ad49b24229f2de 100644
--- a/app/models/account_moderation_note.rb
+++ b/app/models/account_moderation_note.rb
@@ -13,10 +13,12 @@
 #
 
 class AccountModerationNote < ApplicationRecord
+  CONTENT_SIZE_LIMIT = 500
+
   belongs_to :account
   belongs_to :target_account, class_name: 'Account'
 
   scope :latest, -> { reorder('created_at DESC') }
 
-  validates :content, presence: true, length: { maximum: 500 }
+  validates :content, presence: true, length: { maximum: CONTENT_SIZE_LIMIT }
 end
diff --git a/app/models/account_note.rb b/app/models/account_note.rb
index 9bc704d988f83d..317e6873fa701e 100644
--- a/app/models/account_note.rb
+++ b/app/models/account_note.rb
@@ -14,9 +14,11 @@
 class AccountNote < ApplicationRecord
   include RelationshipCacheable
 
+  COMMENT_SIZE_LIMIT = 2_000
+
   belongs_to :account
   belongs_to :target_account, class_name: 'Account'
 
   validates :account_id, uniqueness: { scope: :target_account_id }
-  validates :comment, length: { maximum: 2_000 }
+  validates :comment, length: { maximum: COMMENT_SIZE_LIMIT }
 end
diff --git a/app/models/invite.rb b/app/models/invite.rb
index c0cbc584586196..2fe9f22fbe1339 100644
--- a/app/models/invite.rb
+++ b/app/models/invite.rb
@@ -19,12 +19,14 @@
 class Invite < ApplicationRecord
   include Expireable
 
+  COMMENT_SIZE_LIMIT = 420
+
   belongs_to :user, inverse_of: :invites
   has_many :users, inverse_of: :invite, dependent: nil
 
   scope :available, -> { where(expires_at: nil).or(where('expires_at >= ?', Time.now.utc)) }
 
-  validates :comment, length: { maximum: 420 }
+  validates :comment, length: { maximum: COMMENT_SIZE_LIMIT }
 
   before_validation :set_code
 
diff --git a/app/models/report.rb b/app/models/report.rb
index df7e3d2efc0f62..3df5a20e1819c1 100644
--- a/app/models/report.rb
+++ b/app/models/report.rb
@@ -26,6 +26,8 @@ class Report < ApplicationRecord
   include Paginable
   include RateLimitable
 
+  COMMENT_SIZE_LIMIT = 1_000
+
   rate_limit by: :account, family: :reports
 
   belongs_to :account
@@ -46,7 +48,7 @@ class Report < ApplicationRecord
   # A report is considered local if the reporter is local
   delegate :local?, to: :account
 
-  validates :comment, length: { maximum: 1_000 }, if: :local?
+  validates :comment, length: { maximum: COMMENT_SIZE_LIMIT }, if: :local?
   validates :rule_ids, absence: true, if: -> { (category_changed? || rule_ids_changed?) && !violation? }
 
   validate :validate_rule_ids, if: -> { (category_changed? || rule_ids_changed?) && violation? }
diff --git a/app/models/report_note.rb b/app/models/report_note.rb
index 74b46027e8bb42..b5c40a18b1487e 100644
--- a/app/models/report_note.rb
+++ b/app/models/report_note.rb
@@ -13,10 +13,12 @@
 #
 
 class ReportNote < ApplicationRecord
+  CONTENT_SIZE_LIMIT = 500
+
   belongs_to :account
   belongs_to :report, inverse_of: :notes, touch: true
 
   scope :latest, -> { reorder(created_at: :desc) }
 
-  validates :content, presence: true, length: { maximum: 500 }
+  validates :content, presence: true, length: { maximum: CONTENT_SIZE_LIMIT }
 end
diff --git a/app/models/rule.rb b/app/models/rule.rb
index f28dc2ffeb4995..99a36397aa3736 100644
--- a/app/models/rule.rb
+++ b/app/models/rule.rb
@@ -15,9 +15,11 @@
 class Rule < ApplicationRecord
   include Discard::Model
 
+  TEXT_SIZE_LIMIT = 300
+
   self.discard_column = :deleted_at
 
-  validates :text, presence: true, length: { maximum: 300 }
+  validates :text, presence: true, length: { maximum: TEXT_SIZE_LIMIT }
 
   scope :ordered, -> { kept.order(priority: :asc, id: :asc) }
 end
diff --git a/app/models/user_invite_request.rb b/app/models/user_invite_request.rb
index 2b76c88b944dcd..9dd67751668835 100644
--- a/app/models/user_invite_request.rb
+++ b/app/models/user_invite_request.rb
@@ -12,6 +12,8 @@
 #
 
 class UserInviteRequest < ApplicationRecord
+  TEXT_SIZE_LIMIT = 420
+
   belongs_to :user, inverse_of: :invite_request
-  validates :text, presence: true, length: { maximum: 420 }
+  validates :text, presence: true, length: { maximum: TEXT_SIZE_LIMIT }
 end

From b12847462597cf590ec3d9c05635cd736024d335 Mon Sep 17 00:00:00 2001
From: Tim Rogers <rogers.timothy.john@gmail.com>
Date: Wed, 24 Apr 2024 04:09:21 -0500
Subject: [PATCH 0824/2191] Fixed rendering of excess whitespace in status card
 titles (#30017)

---
 app/lib/link_details_extractor.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/lib/link_details_extractor.rb b/app/lib/link_details_extractor.rb
index bb031986d68186..bec7d3a4550df4 100644
--- a/app/lib/link_details_extractor.rb
+++ b/app/lib/link_details_extractor.rb
@@ -156,7 +156,7 @@ def height
   end
 
   def title
-    html_entities.decode(structured_data&.headline || opengraph_tag('og:title') || document.xpath('//title').map(&:content).first)
+    html_entities.decode(structured_data&.headline || opengraph_tag('og:title') || document.xpath('//title').map(&:content).first).strip
   end
 
   def description

From 0e071edccc40f50e7ac7a8e2ec009cf9254838d6 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 24 Apr 2024 12:36:32 +0200
Subject: [PATCH 0825/2191] Fix bogus translation files

---
 config/locales-glitch/no.yml             | 2 +-
 config/locales-glitch/simple_form.no.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/locales-glitch/no.yml b/config/locales-glitch/no.yml
index d2a4697e5dc65e..d36c60a4ac0a92 100644
--- a/config/locales-glitch/no.yml
+++ b/config/locales-glitch/no.yml
@@ -1 +1 @@
-no:
+'no':
diff --git a/config/locales-glitch/simple_form.no.yml b/config/locales-glitch/simple_form.no.yml
index d2a4697e5dc65e..d36c60a4ac0a92 100644
--- a/config/locales-glitch/simple_form.no.yml
+++ b/config/locales-glitch/simple_form.no.yml
@@ -1 +1 @@
-no:
+'no':

From d9eee9bf9a3a3e99acb1cea12082faf0fe8de0f9 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 24 Apr 2024 10:56:54 -0400
Subject: [PATCH 0826/2191] Remove column defaults for `status_pins` timestamp
 columns (#29261)

---
 ...17171534_remove_defaults_for_status_pins_timestamps.rb | 8 ++++++++
 db/schema.rb                                              | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)
 create mode 100644 db/migrate/20240217171534_remove_defaults_for_status_pins_timestamps.rb

diff --git a/db/migrate/20240217171534_remove_defaults_for_status_pins_timestamps.rb b/db/migrate/20240217171534_remove_defaults_for_status_pins_timestamps.rb
new file mode 100644
index 00000000000000..301371a02d6c32
--- /dev/null
+++ b/db/migrate/20240217171534_remove_defaults_for_status_pins_timestamps.rb
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class RemoveDefaultsForStatusPinsTimestamps < ActiveRecord::Migration[7.1]
+  def change
+    change_column_default :status_pins, :created_at, from: -> { 'CURRENT_TIMESTAMP' }, to: nil
+    change_column_default :status_pins, :updated_at, from: -> { 'CURRENT_TIMESTAMP' }, to: nil
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 6a52333a80e2ef..a875c6ffc793a3 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1030,8 +1030,8 @@
   create_table "status_pins", force: :cascade do |t|
     t.bigint "account_id", null: false
     t.bigint "status_id", null: false
-    t.datetime "created_at", precision: nil, default: -> { "now()" }, null: false
-    t.datetime "updated_at", precision: nil, default: -> { "now()" }, null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.index ["account_id", "status_id"], name: "index_status_pins_on_account_id_and_status_id", unique: true
     t.index ["status_id"], name: "index_status_pins_on_status_id"
   end

From 113c931cdafd06147fe443b5b94c802710e519f0 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 24 Apr 2024 17:00:48 +0200
Subject: [PATCH 0827/2191] Fix follow request notifications not being
 displayed (#2695)

---
 .../containers/follow_request_container.js    | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/app/javascript/flavours/glitch/features/notifications/containers/follow_request_container.js b/app/javascript/flavours/glitch/features/notifications/containers/follow_request_container.js
index d66b24991df5de..ad87da84aab7a1 100644
--- a/app/javascript/flavours/glitch/features/notifications/containers/follow_request_container.js
+++ b/app/javascript/flavours/glitch/features/notifications/containers/follow_request_container.js
@@ -1,17 +1,28 @@
 import { connect } from 'react-redux';
 
 import { authorizeFollowRequest, rejectFollowRequest } from 'flavours/glitch/actions/accounts';
+import { makeGetAccount } from 'flavours/glitch/selectors';
 
 import FollowRequest from '../components/follow_request';
 
-const mapDispatchToProps = (dispatch, { account }) => ({
+const makeMapStateToProps = () => {
+  const getAccount = makeGetAccount();
+
+  const mapStateToProps = (state, props) => ({
+    account: getAccount(state, props.id),
+  });
+
+  return mapStateToProps;
+};
+
+const mapDispatchToProps = (dispatch, { id }) => ({
   onAuthorize () {
-    dispatch(authorizeFollowRequest(account.get('id')));
+    dispatch(authorizeFollowRequest(id));
   },
 
   onReject () {
-    dispatch(rejectFollowRequest(account.get('id')));
+    dispatch(rejectFollowRequest(id));
   },
 });
 
-export default connect(null, mapDispatchToProps)(FollowRequest);
+export default connect(makeMapStateToProps, mapDispatchToProps)(FollowRequest);

From 85fdbd0ad53837c9209acf3fb45811d5bae41cd9 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 25 Apr 2024 10:50:54 +0200
Subject: [PATCH 0828/2191] New Crowdin Translations (automated) (#30062)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/de.json    | 10 +++++-----
 app/javascript/mastodon/locales/ig.json    | 12 ++++++++++++
 app/javascript/mastodon/locales/ja.json    |  2 +-
 app/javascript/mastodon/locales/pt-BR.json |  1 +
 app/javascript/mastodon/locales/sv.json    |  1 +
 config/locales/de.yml                      |  2 +-
 config/locales/devise.de.yml               |  2 +-
 config/locales/doorkeeper.es-MX.yml        |  1 +
 config/locales/doorkeeper.es.yml           |  1 +
 config/locales/doorkeeper.pt-BR.yml        |  1 +
 config/locales/doorkeeper.sv.yml           |  1 +
 config/locales/pt-BR.yml                   |  2 ++
 config/locales/simple_form.pt-BR.yml       |  1 +
 13 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json
index a1ba25fede9816..8b52cdb3cc8388 100644
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@@ -536,11 +536,11 @@
   "onboarding.follows.empty": "Bedauerlicherweise können aktuell keine Ergebnisse angezeigt werden. Du kannst die Suche verwenden oder den Reiter „Entdecken“ auswählen, um neue Leute zum Folgen zu finden – oder du versuchst es später erneut.",
   "onboarding.follows.lead": "Deine Startseite ist der primäre Anlaufpunkt, um Mastodon zu erleben. Je mehr Profilen du folgst, umso aktiver und interessanter wird sie. Damit du direkt loslegen kannst, gibt es hier ein paar Vorschläge:",
   "onboarding.follows.title": "Personalisiere deine Startseite",
-  "onboarding.profile.discoverable": "Mein Profil auffindbar machen",
+  "onboarding.profile.discoverable": "Mein Profil darf entdeckt werden",
   "onboarding.profile.discoverable_hint": "Wenn du entdeckt werden möchtest, dann können deine Beiträge in Suchergebnissen und Trends erscheinen. Dein Profil kann ebenfalls anderen mit ähnlichen Interessen vorgeschlagen werden.",
   "onboarding.profile.display_name": "Anzeigename",
   "onboarding.profile.display_name_hint": "Dein richtiger Name oder dein Fantasiename …",
-  "onboarding.profile.lead": "Du kannst das später in den Einstellungen vervollständigen, wo noch mehr Anpassungsmöglichkeiten zur Verfügung stehen.",
+  "onboarding.profile.lead": "Du kannst dein Profil später in den Einstellungen vervollständigen. Dort stehen weitere Anpassungsmöglichkeiten zur Verfügung.",
   "onboarding.profile.note": "Über mich",
   "onboarding.profile.note_hint": "Du kannst andere @Profile erwähnen oder #Hashtags verwenden …",
   "onboarding.profile.save_and_continue": "Speichern und fortfahren",
@@ -556,16 +556,16 @@
   "onboarding.start.title": "Du hast es geschafft!",
   "onboarding.steps.follow_people.body": "Interessanten Profilen zu folgen ist das, was Mastodon ausmacht.",
   "onboarding.steps.follow_people.title": "Personalisiere deine Startseite",
-  "onboarding.steps.publish_status.body": "Begrüße die Welt mit Text, Fotos, Videos oder Umfragen {emoji}",
+  "onboarding.steps.publish_status.body": "Begrüße die Welt mit Text, Fotos, Videos oder Umfragen. {emoji}",
   "onboarding.steps.publish_status.title": "Erstelle deinen ersten Beitrag",
   "onboarding.steps.setup_profile.body": "Mit einem vollständigen Profil interagieren andere eher mit dir.",
   "onboarding.steps.setup_profile.title": "Personalisiere dein Profil",
-  "onboarding.steps.share_profile.body": "Lass deine Freund*innen wissen, wie sie dich auf Mastodon finden können",
+  "onboarding.steps.share_profile.body": "Lass deine Freund*innen wissen, wie sie dich auf Mastodon finden können.",
   "onboarding.steps.share_profile.title": "Teile dein Mastodon-Profil",
   "onboarding.tips.2fa": "<strong>Wusstest du schon?</strong> Du kannst die Sicherheit deines Kontos erhöhen, indem du die Zwei-Faktor-Authentisierung in deinen Kontoeinstellungen aktivierst. Dafür ist keine Telefonnummer notwendig und es funktioniert jede beliebige TOTP-App!",
   "onboarding.tips.accounts_from_other_servers": "<strong>Wusstest du schon?</strong> Da Mastodon dezentralisiert ist, werden einige Profile, denen du begegnest, auf anderen Servern als deinem bereitgestellt. Und trotzdem kannst du uneingeschränkt mit ihnen interagieren! Der Servername befindet sich in der zweiten Hälfte ihres Profilnamens!",
   "onboarding.tips.migration": "<strong>Wusstest du schon?</strong> Wenn du das Gefühl hast, dass {domain} in Zukunft nicht die richtige Serverwahl für dich ist, kannst du auf einen anderen Mastodon-Server umziehen, ohne deine Follower zu verlieren. Du kannst sogar deinen eigenen Server betreiben!",
-  "onboarding.tips.verification": "<strong>Wusstest du schon?</strong> Du kannst dein Konto verifizieren, indem du auf deiner Website auf dein Mastodon-Profil verlinkst und den Link deiner Website zu deinem Profil hinzufügst. Keine Gebühren oder Dokumente erforderlich!",
+  "onboarding.tips.verification": "<strong>Wusstest du schon?</strong> Du kannst dein Konto verifizieren, indem du auf deiner Website auf dein Mastodon-Profil verlinkst und den Link deiner Website zu deinem Profil hinzufügst. Völlig kostenlos und ohne Dokumente einsenden zu müssen!",
   "password_confirmation.exceeds_maxlength": "Passwortbestätigung überschreitet die maximal erlaubte Zeichenanzahl",
   "password_confirmation.mismatching": "Passwortbestätigung stimmt nicht überein",
   "picture_in_picture.restore": "Zurücksetzen",
diff --git a/app/javascript/mastodon/locales/ig.json b/app/javascript/mastodon/locales/ig.json
index a9b300fa4f2a96..90253743fca0fb 100644
--- a/app/javascript/mastodon/locales/ig.json
+++ b/app/javascript/mastodon/locales/ig.json
@@ -20,6 +20,7 @@
   "column.bookmarks": "Ebenrụtụakā",
   "column.home": "Be",
   "column.lists": "Ndepụta",
+  "column.notifications": "Nziọkwà",
   "column.pins": "Pinned post",
   "column_header.pin": "Gbado na profaịlụ gị",
   "column_subheading.settings": "Mwube",
@@ -42,17 +43,28 @@
   "confirmations.reply.confirm": "Zaa",
   "confirmations.unfollow.confirm": "Kwụsị iso",
   "conversation.delete": "Hichapụ nkata",
+  "disabled_account_banner.account_settings": "Mwube akaụntụ",
   "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
   "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.",
+  "domain_pill.username": "Ahaojiaru",
   "embed.instructions": "Embed this status on your website by copying the code below.",
+  "emoji_button.activity": "Mmemme",
+  "emoji_button.label": "Tibanye emoji",
   "emoji_button.search": "Chọọ...",
+  "emoji_button.symbols": "Ọdịmara",
   "empty_column.account_timeline": "No posts found",
   "empty_column.home": "Your home timeline is empty! Follow more people to fill it up. {suggestions}",
   "empty_column.list": "There is nothing in this list yet. When members of this list post new statuses, they will appear here.",
   "errors.unexpected_crash.report_issue": "Kpesa nsogbu",
+  "explore.trending_links": "Akụkọ",
+  "firehose.all": "Ha niine",
+  "follow_request.authorize": "Nye ikike",
   "footer.privacy_policy": "Iwu nzuzu",
   "getting_started.heading": "Mbido",
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+  "home.column_settings.show_replies": "Gosi nzaghachị",
+  "home.hide_announcements": "Zoo ọkwa",
+  "home.show_announcements": "Gosi ọkwa",
   "keyboard_shortcuts.back": "to navigate back",
   "keyboard_shortcuts.blocked": "to open blocked users list",
   "keyboard_shortcuts.boost": "to boost",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index 30c9eb77a9e219..f20d93753b7f80 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -298,7 +298,7 @@
   "filter_modal.select_filter.title": "この投稿をフィルターする",
   "filter_modal.title.status": "投稿をフィルターする",
   "filtered_notifications_banner.mentions": "{count, plural, one {メンション} other {メンション}}",
-  "filtered_notifications_banner.pending_requests": "{count, plural, =0 {アカウント} other {#アカウント}}からの通知がブロックされています",
+  "filtered_notifications_banner.pending_requests": "{count, plural, =0 {通知がブロックされているアカウントはありません} other {#アカウントからの通知がブロックされています}}",
   "filtered_notifications_banner.title": "ブロック済みの通知",
   "firehose.all": "すべて",
   "firehose.local": "このサーバー",
diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json
index 1bb73db238611f..6bda11058ffadb 100644
--- a/app/javascript/mastodon/locales/pt-BR.json
+++ b/app/javascript/mastodon/locales/pt-BR.json
@@ -297,6 +297,7 @@
   "filter_modal.select_filter.subtitle": "Use uma categoria existente ou crie uma nova",
   "filter_modal.select_filter.title": "Filtrar esta publicação",
   "filter_modal.title.status": "Filtrar uma publicação",
+  "filtered_notifications_banner.mentions": "{count, plural, one {menção} other {menções}}",
   "filtered_notifications_banner.pending_requests": "Notificações de {count, plural, =0 {no one} one {one person} other {# people}} que você talvez conheça",
   "filtered_notifications_banner.title": "Notificações filtradas",
   "firehose.all": "Tudo",
diff --git a/app/javascript/mastodon/locales/sv.json b/app/javascript/mastodon/locales/sv.json
index 80c2031128b513..2b9f0a51b905c0 100644
--- a/app/javascript/mastodon/locales/sv.json
+++ b/app/javascript/mastodon/locales/sv.json
@@ -297,6 +297,7 @@
   "filter_modal.select_filter.subtitle": "Använd en befintlig kategori eller skapa en ny",
   "filter_modal.select_filter.title": "Filtrera detta inlägg",
   "filter_modal.title.status": "Filtrera ett inlägg",
+  "filtered_notifications_banner.mentions": "{count, plural, one {mention} other {mentions}}",
   "filtered_notifications_banner.pending_requests": "Aviseringar från {count, plural, =0 {ingen} one {en person} other {# personer}} du kanske känner",
   "filtered_notifications_banner.title": "Filtrerade aviseringar",
   "firehose.all": "Allt",
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 67aad1587364f3..27073ff9eececd 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -1046,7 +1046,7 @@ de:
     apply_for_account: Konto beantragen
     captcha_confirmation:
       help_html: Falls du Probleme beim Lösen des CAPTCHA hast, dann kannst uns über %{email} kontaktieren und wir werden versuchen, dir zu helfen.
-      hint_html: Fast geschafft! Wir müssen uns vergewissern, dass du ein Mensch bist (damit wir Spam verhindern können!). Bitte löse das CAPTCHA und klicke auf „Weiter“.
+      hint_html: Fast geschafft! Wir müssen uns vergewissern, dass du ein Mensch bist (damit wir Spam verhindern können!). Bitte löse das CAPTCHA und klicke auf „Fortfahren“.
       title: Sicherheitsüberprüfung
     confirmations:
       awaiting_review: Deine E-Mail-Adresse wurde bestätigt und das Team von %{domain} überprüft nun deine Registrierung. Sobald es dein Konto genehmigt, wirst du eine E-Mail erhalten.
diff --git a/config/locales/devise.de.yml b/config/locales/devise.de.yml
index 73fa1fa60e3bcd..032132cf5cb16b 100644
--- a/config/locales/devise.de.yml
+++ b/config/locales/devise.de.yml
@@ -25,7 +25,7 @@ de:
         explanation_when_pending: Du hast dich für eine Einladung bei %{host} mit dieser E-Mail-Adresse beworben. Sobald du deine E-Mail-Adresse bestätigt hast, werden wir deine Anfrage überprüfen. Du kannst dich in dieser Zeit nicht anmelden. Wenn deine Anfrage abgelehnt wird, werden deine Daten entfernt – von dir ist keine weitere Handlung notwendig. Wenn du das nicht warst, dann kannst du diese E-Mail ignorieren.
         extra_html: Bitte beachte auch die <a href="%{terms_path}">Serverregeln</a> und <a href="%{policy_path}">unsere Datenschutzerklärung</a>.
         subject: 'Mastodon: Anleitung zum Bestätigen deines Kontos auf %{instance}'
-        title: Verifiziere E-Mail-Adresse
+        title: Verifiziere deine E-Mail-Adresse
       email_changed:
         explanation: 'Die E-Mail-Adresse deines Kontos wird geändert zu:'
         extra: Wenn du deine E-Mail-Adresse nicht geändert hast, ist es wahrscheinlich, dass sich jemand Zugang zu deinem Konto verschafft hat. Bitte ändere sofort dein Passwort oder kontaktiere die Administrator*innen des Servers, wenn du aus deinem Konto ausgesperrt bist.
diff --git a/config/locales/doorkeeper.es-MX.yml b/config/locales/doorkeeper.es-MX.yml
index 082d656bc5d012..e56e0df3ba9bfa 100644
--- a/config/locales/doorkeeper.es-MX.yml
+++ b/config/locales/doorkeeper.es-MX.yml
@@ -174,6 +174,7 @@ es-MX:
       read:filters: ver tus filtros
       read:follows: ver a quién sigues
       read:lists: ver tus listas
+      read:me: leer solo la información básica de tu cuenta
       read:mutes: ver a quién has silenciado
       read:notifications: ver tus notificaciones
       read:reports: ver tus informes
diff --git a/config/locales/doorkeeper.es.yml b/config/locales/doorkeeper.es.yml
index 002f813b326836..44e165a2156ccb 100644
--- a/config/locales/doorkeeper.es.yml
+++ b/config/locales/doorkeeper.es.yml
@@ -174,6 +174,7 @@ es:
       read:filters: ver tus filtros
       read:follows: ver a quién sigues
       read:lists: ver tus listas
+      read:me: leer solo la información básica de tu cuenta
       read:mutes: ver a quién has silenciado
       read:notifications: ver tus notificaciones
       read:reports: ver tus informes
diff --git a/config/locales/doorkeeper.pt-BR.yml b/config/locales/doorkeeper.pt-BR.yml
index d7e9353b59be3e..150b4339e46e15 100644
--- a/config/locales/doorkeeper.pt-BR.yml
+++ b/config/locales/doorkeeper.pt-BR.yml
@@ -174,6 +174,7 @@ pt-BR:
       read:filters: ver seus filtros
       read:follows: ver quem você segue
       read:lists: ver suas listas
+      read:me: ler só as informações básicas da sua conta
       read:mutes: ver seus silenciados
       read:notifications: ver suas notificações
       read:reports: ver suas denúncias
diff --git a/config/locales/doorkeeper.sv.yml b/config/locales/doorkeeper.sv.yml
index f2c8bd34b8c6c2..d336f08c560a3c 100644
--- a/config/locales/doorkeeper.sv.yml
+++ b/config/locales/doorkeeper.sv.yml
@@ -174,6 +174,7 @@ sv:
       read:filters: se dina filter
       read:follows: se vem du följer
       read:lists: se dina listor
+      read:me: läs endast den grundläggande informationen för ditt konto
       read:mutes: se dina tystningar
       read:notifications: se dina notiser
       read:reports: se dina rapporter
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 8de8e4887ef682..9cb9cadee975a4 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -1671,6 +1671,8 @@ pt-BR:
       domain_block: Suspensão do servidor (%{target_name})
       user_domain_block: Você bloqueou %{target_name}
     lost_followers: Seguidores perdidos
+    lost_follows: Seguidores perdidos
+    preamble: Você poderá perder seguidores e seguidores quando bloquear um domínio ou quando os seus moderadores decidirem suspender um servidor remoto. Quando isso acontecer, você poderá baixar listas de relações desfeitas, a serem inspecionadas e possivelmente importadas para outro servidor.
     purged: As informações sobre este servidor foram eliminadas pelos administradores do seu servidor.
     type: Evento
   statuses:
diff --git a/config/locales/simple_form.pt-BR.yml b/config/locales/simple_form.pt-BR.yml
index 676f5e37a3f354..c3eea9f1182d08 100644
--- a/config/locales/simple_form.pt-BR.yml
+++ b/config/locales/simple_form.pt-BR.yml
@@ -116,6 +116,7 @@ pt-BR:
           sign_up_requires_approval: Novas inscrições exigirão sua aprovação
         severity: Escolha o que acontecerá com as solicitações deste IP
       rule:
+        hint: Opcional. Forneça mais detalhes sobre a regra
         text: Descreva uma regra ou requisito para os usuários neste servidor. Tente mantê-la curta e simples.
       sessions:
         otp: 'Digite o código de dois fatores gerado pelo aplicativo no seu celular ou use um dos códigos de recuperação:'

From 0ec061aa8f7383330b26b3323d2fafd9ec7663e3 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 25 Apr 2024 18:25:33 +0200
Subject: [PATCH 0829/2191] Change design of people tab on explore in web UI
 (#30059)

---
 .../features/explore/components/card.jsx      | 88 +++++++++++++++++++
 .../mastodon/features/explore/suggestions.jsx |  9 +-
 app/javascript/mastodon/locales/en.json       |  4 +
 .../styles/mastodon/components.scss           | 79 ++++++++++++++++-
 4 files changed, 175 insertions(+), 5 deletions(-)
 create mode 100644 app/javascript/mastodon/features/explore/components/card.jsx

diff --git a/app/javascript/mastodon/features/explore/components/card.jsx b/app/javascript/mastodon/features/explore/components/card.jsx
new file mode 100644
index 00000000000000..316203060a2a5a
--- /dev/null
+++ b/app/javascript/mastodon/features/explore/components/card.jsx
@@ -0,0 +1,88 @@
+import PropTypes from 'prop-types';
+import { useCallback } from 'react';
+
+import { FormattedMessage, useIntl, defineMessages } from 'react-intl';
+
+import { Link } from 'react-router-dom';
+
+import { useDispatch, useSelector } from 'react-redux';
+
+import CloseIcon from '@/material-icons/400-24px/close.svg?react';
+import { followAccount, unfollowAccount } from 'mastodon/actions/accounts';
+import { dismissSuggestion } from 'mastodon/actions/suggestions';
+import { Avatar } from 'mastodon/components/avatar';
+import { Button } from 'mastodon/components/button';
+import { DisplayName } from 'mastodon/components/display_name';
+import { IconButton } from 'mastodon/components/icon_button';
+import { domain } from 'mastodon/initial_state';
+
+const messages = defineMessages({
+  follow: { id: 'account.follow', defaultMessage: 'Follow' },
+  unfollow: { id: 'account.unfollow', defaultMessage: 'Unfollow' },
+  dismiss: { id: 'follow_suggestions.dismiss', defaultMessage: "Don't show again" },
+});
+
+export const Card = ({ id, source }) => {
+  const intl = useIntl();
+  const account = useSelector(state => state.getIn(['accounts', id]));
+  const relationship = useSelector(state => state.getIn(['relationships', id]));
+  const dispatch = useDispatch();
+  const following = relationship?.get('following') ?? relationship?.get('requested');
+
+  const handleFollow = useCallback(() => {
+    if (following) {
+      dispatch(unfollowAccount(id));
+    } else {
+      dispatch(followAccount(id));
+    }
+  }, [id, following, dispatch]);
+
+  const handleDismiss = useCallback(() => {
+    dispatch(dismissSuggestion(id));
+  }, [id, dispatch]);
+
+  let label;
+
+  switch (source) {
+  case 'friends_of_friends':
+    label = <FormattedMessage id='follow_suggestions.friends_of_friends_longer' defaultMessage='Popular among people you follow' />;
+    break;
+  case 'similar_to_recently_followed':
+    label = <FormattedMessage id='follow_suggestions.similar_to_recently_followed_longer' defaultMessage='Similar to profiles you recently followed' />;
+    break;
+  case 'featured':
+    label = <FormattedMessage id='follow_suggestions.featured_longer' defaultMessage='Hand-picked by the {domain} team' values={{ domain }} />;
+    break;
+  case 'most_followed':
+    label = <FormattedMessage id='follow_suggestions.popular_suggestion_longer' defaultMessage='Popular on {domain}' values={{ domain }} />;
+    break;
+  case 'most_interactions':
+    label = <FormattedMessage id='follow_suggestions.popular_suggestion_longer' defaultMessage='Popular on {domain}' values={{ domain }} />;
+    break;
+  }
+
+  return (
+    <div className='explore__suggestions__card'>
+      <div className='explore__suggestions__card__source'>
+        {label}
+      </div>
+
+      <div className='explore__suggestions__card__body'>
+        <Link to={`/@${account.get('acct')}`}><Avatar account={account} size={48} /></Link>
+
+        <div className='explore__suggestions__card__body__main'>
+          <div className='explore__suggestions__card__body__main__name-button'>
+            <Link className='explore__suggestions__card__body__main__name-button__name' to={`/@${account.get('acct')}`}><DisplayName account={account} /></Link>
+            <IconButton iconComponent={CloseIcon} onClick={handleDismiss} title={intl.formatMessage(messages.dismiss)} />
+            <Button text={intl.formatMessage(following ? messages.unfollow : messages.follow)} secondary={following} onClick={handleFollow} />
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+};
+
+Card.propTypes = {
+  id: PropTypes.string.isRequired,
+  source: PropTypes.oneOf(['friends_of_friends', 'similar_to_recently_followed', 'featured', 'most_followed', 'most_interactions']),
+};
diff --git a/app/javascript/mastodon/features/explore/suggestions.jsx b/app/javascript/mastodon/features/explore/suggestions.jsx
index ba33c4d0812000..101ec0d1958d76 100644
--- a/app/javascript/mastodon/features/explore/suggestions.jsx
+++ b/app/javascript/mastodon/features/explore/suggestions.jsx
@@ -10,9 +10,10 @@ import { connect } from 'react-redux';
 
 import { fetchSuggestions } from 'mastodon/actions/suggestions';
 import { LoadingIndicator } from 'mastodon/components/loading_indicator';
-import AccountCard from 'mastodon/features/directory/components/account_card';
 import { WithRouterPropTypes } from 'mastodon/utils/react_router';
 
+import { Card } from './components/card';
+
 const mapStateToProps = state => ({
   suggestions: state.getIn(['suggestions', 'items']),
   isLoading: state.getIn(['suggestions', 'isLoading']),
@@ -54,7 +55,11 @@ class Suggestions extends PureComponent {
     return (
       <div className='explore__suggestions scrollable' data-nosnippet>
         {isLoading ? <LoadingIndicator /> : suggestions.map(suggestion => (
-          <AccountCard key={suggestion.get('account')} id={suggestion.get('account')} />
+          <Card
+            key={suggestion.get('account')}
+            id={suggestion.get('account')}
+            source={suggestion.getIn(['sources', 0])}
+          />
         ))}
       </div>
     );
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index fd44b3952bcacb..a1b79881c51f9e 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -308,6 +308,8 @@
   "follow_requests.unlocked_explanation": "Even though your account is not locked, the {domain} staff thought you might want to review follow requests from these accounts manually.",
   "follow_suggestions.curated_suggestion": "Staff pick",
   "follow_suggestions.dismiss": "Don't show again",
+  "follow_suggestions.featured_longer": "Hand-picked by the {domain} team",
+  "follow_suggestions.friends_of_friends_longer": "Popular among people you follow",
   "follow_suggestions.hints.featured": "This profile has been hand-picked by the {domain} team.",
   "follow_suggestions.hints.friends_of_friends": "This profile is popular among the people you follow.",
   "follow_suggestions.hints.most_followed": "This profile is one of the most followed on {domain}.",
@@ -315,6 +317,8 @@
   "follow_suggestions.hints.similar_to_recently_followed": "This profile is similar to the profiles you have most recently followed.",
   "follow_suggestions.personalized_suggestion": "Personalized suggestion",
   "follow_suggestions.popular_suggestion": "Popular suggestion",
+  "follow_suggestions.popular_suggestion_longer": "Popular on {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Similar to profiles you recently followed",
   "follow_suggestions.view_all": "View all",
   "follow_suggestions.who_to_follow": "Who to follow",
   "followed_tags": "Followed hashtags",
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index b2139169a596ef..a1864a4562d650 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -2016,7 +2016,10 @@ a .account__avatar {
   display: flex;
   align-items: center;
   gap: 8px;
+}
 
+.account__relationship,
+.explore__suggestions__card {
   .icon-button {
     border: 1px solid var(--background-border-color);
     border-radius: 4px;
@@ -2964,6 +2967,75 @@ $ui-header-logo-wordmark-width: 99px;
   display: none;
 }
 
+.explore__suggestions__card {
+  padding: 12px 16px;
+  gap: 8px;
+  display: flex;
+  flex-direction: column;
+  border-bottom: 1px solid var(--background-border-color);
+
+  &:last-child {
+    border-bottom: 0;
+  }
+
+  &__source {
+    padding-inline-start: 60px;
+    font-size: 13px;
+    line-height: 16px;
+    color: $dark-text-color;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    white-space: nowrap;
+  }
+
+  &__body {
+    display: flex;
+    gap: 12px;
+    align-items: center;
+
+    &__main {
+      flex: 1 1 auto;
+      display: flex;
+      flex-direction: column;
+      gap: 8px;
+      min-width: 0;
+
+      &__name-button {
+        display: flex;
+        align-items: center;
+        gap: 8px;
+
+        &__name {
+          display: block;
+          color: inherit;
+          text-decoration: none;
+          flex: 1 1 auto;
+          min-width: 0;
+        }
+
+        .button {
+          min-width: 80px;
+        }
+
+        .display-name {
+          font-size: 15px;
+          line-height: 20px;
+          color: $secondary-text-color;
+
+          strong {
+            font-weight: 700;
+          }
+
+          &__account {
+            color: $darker-text-color;
+            display: block;
+          }
+        }
+      }
+    }
+  }
+}
+
 @media screen and (max-width: $no-gap-breakpoint - 1px) {
   .columns-area__panels__pane--compositional {
     display: none;
@@ -7293,10 +7365,11 @@ a.status-card {
         content: '';
         position: absolute;
         bottom: -1px;
-        left: 0;
-        width: 100%;
+        left: 50%;
+        transform: translateX(-50%);
+        width: 40px;
         height: 3px;
-        border-radius: 4px;
+        border-radius: 4px 4px 0 0;
         background: $highlight-text-color;
       }
     }

From 4ef0b48b951d65920d3a3d9cdfd099967c5e4f6d Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 25 Apr 2024 19:26:05 +0200
Subject: [PATCH 0830/2191] Add in-app notifications for moderation
 actions/warnings (#30065)

---
 .../components/moderation_warning.tsx         | 78 +++++++++++++++++++
 .../notifications/components/notification.jsx | 25 ++++++
 app/javascript/mastodon/locales/en.json       |  9 +++
 .../mastodon/reducers/notifications.js        |  1 +
 .../styles/mastodon/components.scss           |  3 +-
 app/models/admin/account_action.rb            |  9 ++-
 app/models/admin/status_batch_action.rb       | 12 ++-
 app/models/notification.rb                    |  6 +-
 .../rest/account_warning_serializer.rb        | 16 ++++
 app/serializers/rest/appeal_serializer.rb     | 15 ++++
 .../rest/notification_serializer.rb           |  5 ++
 app/services/notify_service.rb                |  4 +-
 spec/models/admin/account_action_spec.rb      | 28 +++----
 13 files changed, 189 insertions(+), 22 deletions(-)
 create mode 100644 app/javascript/mastodon/features/notifications/components/moderation_warning.tsx
 create mode 100644 app/serializers/rest/account_warning_serializer.rb
 create mode 100644 app/serializers/rest/appeal_serializer.rb

diff --git a/app/javascript/mastodon/features/notifications/components/moderation_warning.tsx b/app/javascript/mastodon/features/notifications/components/moderation_warning.tsx
new file mode 100644
index 00000000000000..02ae9b371ef6a8
--- /dev/null
+++ b/app/javascript/mastodon/features/notifications/components/moderation_warning.tsx
@@ -0,0 +1,78 @@
+import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
+
+import WarningIcon from '@/material-icons/400-24px/warning-fill.svg?react';
+import { Icon } from 'mastodon/components/icon';
+
+// This needs to be kept in sync with app/models/account_warning.rb
+const messages = defineMessages({
+  none: {
+    id: 'notification.moderation_warning.action_none',
+    defaultMessage: 'Your account has received a moderation warning.',
+  },
+  disable: {
+    id: 'notification.moderation_warning.action_disable',
+    defaultMessage: 'Your account has been disabled.',
+  },
+  mark_statuses_as_sensitive: {
+    id: 'notification.moderation_warning.action_mark_statuses_as_sensitive',
+    defaultMessage: 'Some of your posts have been marked as sensitive.',
+  },
+  delete_statuses: {
+    id: 'notification.moderation_warning.action_delete_statuses',
+    defaultMessage: 'Some of your posts have been removed.',
+  },
+  sensitive: {
+    id: 'notification.moderation_warning.action_sensitive',
+    defaultMessage: 'Your posts will be marked as sensitive from now on.',
+  },
+  silence: {
+    id: 'notification.moderation_warning.action_silence',
+    defaultMessage: 'Your account has been limited.',
+  },
+  suspend: {
+    id: 'notification.moderation_warning.action_suspend',
+    defaultMessage: 'Your account has been suspended.',
+  },
+});
+
+interface Props {
+  action:
+    | 'none'
+    | 'disable'
+    | 'mark_statuses_as_sensitive'
+    | 'delete_statuses'
+    | 'sensitive'
+    | 'silence'
+    | 'suspend';
+  id: string;
+  hidden: boolean;
+}
+
+export const ModerationWarning: React.FC<Props> = ({ action, id, hidden }) => {
+  const intl = useIntl();
+
+  if (hidden) {
+    return null;
+  }
+
+  return (
+    <a
+      href={`/disputes/strikes/${id}`}
+      target='_blank'
+      rel='noopener noreferrer'
+      className='notification__moderation-warning'
+    >
+      <Icon id='warning' icon={WarningIcon} />
+
+      <div className='notification__moderation-warning__content'>
+        <p>{intl.formatMessage(messages[action])}</p>
+        <span className='link-button'>
+          <FormattedMessage
+            id='notification.moderation-warning.learn_more'
+            defaultMessage='Learn more'
+          />
+        </span>
+      </div>
+    </a>
+  );
+};
diff --git a/app/javascript/mastodon/features/notifications/components/notification.jsx b/app/javascript/mastodon/features/notifications/components/notification.jsx
index c09155462809b1..caf7f9bdc104ae 100644
--- a/app/javascript/mastodon/features/notifications/components/notification.jsx
+++ b/app/javascript/mastodon/features/notifications/components/notification.jsx
@@ -26,6 +26,7 @@ import { WithRouterPropTypes } from 'mastodon/utils/react_router';
 
 import FollowRequestContainer from '../containers/follow_request_container';
 
+import { ModerationWarning } from './moderation_warning';
 import { RelationshipsSeveranceEvent } from './relationships_severance_event';
 import Report from './report';
 
@@ -40,6 +41,7 @@ const messages = defineMessages({
   adminSignUp: { id: 'notification.admin.sign_up', defaultMessage: '{name} signed up' },
   adminReport: { id: 'notification.admin.report', defaultMessage: '{name} reported {target}' },
   relationshipsSevered: { id: 'notification.relationships_severance_event', defaultMessage: 'Lost connections with {name}' },
+  moderationWarning: { id: 'notification.moderation_warning', defaultMessage: 'Your have received a moderation warning' },
 });
 
 const notificationForScreenReader = (intl, message, timestamp) => {
@@ -383,6 +385,27 @@ class Notification extends ImmutablePureComponent {
     );
   }
 
+  renderModerationWarning (notification) {
+    const { intl, unread, hidden } = this.props;
+    const warning = notification.get('moderation_warning');
+
+    if (!warning) {
+      return null;
+    }
+
+    return (
+      <HotKeys handlers={this.getHandlers()}>
+        <div className={classNames('notification notification-moderation-warning focusable', { unread })} tabIndex={0} aria-label={notificationForScreenReader(intl, intl.formatMessage(messages.moderationWarning), notification.get('created_at'))}>
+          <ModerationWarning
+            action={warning.get('action')}
+            id={warning.get('id')}
+            hidden={hidden}
+          />
+        </div>
+      </HotKeys>
+    );
+  }
+
   renderAdminSignUp (notification, account, link) {
     const { intl, unread } = this.props;
 
@@ -456,6 +479,8 @@ class Notification extends ImmutablePureComponent {
       return this.renderPoll(notification, account);
     case 'severed_relationships':
       return this.renderRelationshipsSevered(notification);
+    case 'moderation_warning':
+      return this.renderModerationWarning(notification);
     case 'admin.sign_up':
       return this.renderAdminSignUp(notification, account, link);
     case 'admin.report':
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index a1b79881c51f9e..9d127b6b03b06c 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -473,6 +473,15 @@
   "notification.follow": "{name} followed you",
   "notification.follow_request": "{name} has requested to follow you",
   "notification.mention": "{name} mentioned you",
+  "notification.moderation-warning.learn_more": "Learn more",
+  "notification.moderation_warning": "Your have received a moderation warning",
+  "notification.moderation_warning.action_delete_statuses": "Some of your posts have been removed.",
+  "notification.moderation_warning.action_disable": "Your account has been disabled.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Some of your posts have been marked as sensitive.",
+  "notification.moderation_warning.action_none": "Your account has received a moderation warning.",
+  "notification.moderation_warning.action_sensitive": "Your posts will be marked as sensitive from now on.",
+  "notification.moderation_warning.action_silence": "Your account has been limited.",
+  "notification.moderation_warning.action_suspend": "Your account has been suspended.",
   "notification.own_poll": "Your poll has ended",
   "notification.poll": "A poll you have voted in has ended",
   "notification.reblog": "{name} boosted your post",
diff --git a/app/javascript/mastodon/reducers/notifications.js b/app/javascript/mastodon/reducers/notifications.js
index 7230fabcae9046..64cddcb666864f 100644
--- a/app/javascript/mastodon/reducers/notifications.js
+++ b/app/javascript/mastodon/reducers/notifications.js
@@ -56,6 +56,7 @@ export const notificationToMap = notification => ImmutableMap({
   status: notification.status ? notification.status.id : null,
   report: notification.report ? fromJS(notification.report) : null,
   event: notification.event ? fromJS(notification.event) : null,
+  moderation_warning: notification.moderation_warning ? fromJS(notification.moderation_warning) : null,
 });
 
 const normalizeNotification = (state, notification, usePendingItems) => {
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index a1864a4562d650..9cb03bedf186ae 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -2180,7 +2180,8 @@ a.account__display-name {
   }
 }
 
-.notification__relationships-severance-event {
+.notification__relationships-severance-event,
+.notification__moderation-warning {
   display: flex;
   gap: 16px;
   color: $secondary-text-color;
diff --git a/app/models/admin/account_action.rb b/app/models/admin/account_action.rb
index 2b5560e2eba877..3700ce4cd6c735 100644
--- a/app/models/admin/account_action.rb
+++ b/app/models/admin/account_action.rb
@@ -52,7 +52,7 @@ def save!
       process_reports!
     end
 
-    process_email!
+    process_notification!
     process_queue!
   end
 
@@ -158,8 +158,11 @@ def process_queue!
     queue_suspension_worker! if type == 'suspend'
   end
 
-  def process_email!
-    UserMailer.warning(target_account.user, warning).deliver_later! if warnable?
+  def process_notification!
+    return unless warnable?
+
+    UserMailer.warning(target_account.user, warning).deliver_later!
+    LocalNotificationWorker.perform_async(target_account.id, warning.id, 'AccountWarning', 'moderation_warning')
   end
 
   def warnable?
diff --git a/app/models/admin/status_batch_action.rb b/app/models/admin/status_batch_action.rb
index 8a8e2fa3785497..4a10001935155a 100644
--- a/app/models/admin/status_batch_action.rb
+++ b/app/models/admin/status_batch_action.rb
@@ -65,7 +65,8 @@ def handle_delete!
       statuses.each { |status| Tombstone.find_or_create_by(uri: status.uri, account: status.account, by_moderator: true) } unless target_account.local?
     end
 
-    UserMailer.warning(target_account.user, @warning).deliver_later! if warnable?
+    process_notification!
+
     RemovalWorker.push_bulk(status_ids) { |status_id| [status_id, { 'preserve' => target_account.local?, 'immediate' => !target_account.local? }] }
   end
 
@@ -101,7 +102,7 @@ def handle_mark_as_sensitive!
       text: text
     )
 
-    UserMailer.warning(target_account.user, @warning).deliver_later! if warnable?
+    process_notification!
   end
 
   def handle_report!
@@ -127,6 +128,13 @@ def with_report?
     !report.nil?
   end
 
+  def process_notification!
+    return unless warnable?
+
+    UserMailer.warning(target_account.user, @warning).deliver_later!
+    LocalNotificationWorker.perform_async(target_account.id, @warning.id, 'AccountWarning', 'moderation_warning')
+  end
+
   def warnable?
     send_email_notification && target_account.local?
   end
diff --git a/app/models/notification.rb b/app/models/notification.rb
index b2376c78a3df2b..7e0e62683ae15d 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -57,6 +57,9 @@ class Notification < ApplicationRecord
     severed_relationships: {
       filterable: false,
     }.freeze,
+    moderation_warning: {
+      filterable: false,
+    }.freeze,
     'admin.sign_up': {
       filterable: false,
     }.freeze,
@@ -90,6 +93,7 @@ class Notification < ApplicationRecord
     belongs_to :poll, inverse_of: false
     belongs_to :report, inverse_of: false
     belongs_to :account_relationship_severance_event, inverse_of: false
+    belongs_to :account_warning, inverse_of: false
   end
 
   validates :type, inclusion: { in: TYPES }
@@ -180,7 +184,7 @@ def set_from_account
     return unless new_record?
 
     case activity_type
-    when 'Status', 'Follow', 'Favourite', 'FollowRequest', 'Poll', 'Report'
+    when 'Status', 'Follow', 'Favourite', 'FollowRequest', 'Poll', 'Report', 'AccountWarning'
       self.from_account_id = activity&.account_id
     when 'Mention'
       self.from_account_id = activity&.status&.account_id
diff --git a/app/serializers/rest/account_warning_serializer.rb b/app/serializers/rest/account_warning_serializer.rb
new file mode 100644
index 00000000000000..a0ef341d259d26
--- /dev/null
+++ b/app/serializers/rest/account_warning_serializer.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class REST::AccountWarningSerializer < ActiveModel::Serializer
+  attributes :id, :action, :text, :status_ids, :created_at
+
+  has_one :target_account, serializer: REST::AccountSerializer
+  has_one :appeal, serializer: REST::AppealSerializer
+
+  def id
+    object.id.to_s
+  end
+
+  def status_ids
+    object&.status_ids&.map(&:to_s)
+  end
+end
diff --git a/app/serializers/rest/appeal_serializer.rb b/app/serializers/rest/appeal_serializer.rb
new file mode 100644
index 00000000000000..a24cabc2728c35
--- /dev/null
+++ b/app/serializers/rest/appeal_serializer.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class REST::AppealSerializer < ActiveModel::Serializer
+  attributes :text, :state
+
+  def state
+    if object.approved?
+      'approved'
+    elsif object.rejected?
+      'rejected'
+    else
+      'pending'
+    end
+  end
+end
diff --git a/app/serializers/rest/notification_serializer.rb b/app/serializers/rest/notification_serializer.rb
index 36a0adfec46d5e..417245d19dda7a 100644
--- a/app/serializers/rest/notification_serializer.rb
+++ b/app/serializers/rest/notification_serializer.rb
@@ -7,6 +7,7 @@ class REST::NotificationSerializer < ActiveModel::Serializer
   belongs_to :target_status, key: :status, if: :status_type?, serializer: REST::StatusSerializer
   belongs_to :report, if: :report_type?, serializer: REST::ReportSerializer
   belongs_to :account_relationship_severance_event, key: :event, if: :relationship_severance_event?, serializer: REST::AccountRelationshipSeveranceEventSerializer
+  belongs_to :account_warning, key: :moderation_warning, if: :moderation_warning_event?, serializer: REST::AccountWarningSerializer
 
   def id
     object.id.to_s
@@ -23,4 +24,8 @@ def report_type?
   def relationship_severance_event?
     object.type == :severed_relationships
   end
+
+  def moderation_warning_event?
+    object.type == :moderation_warning
+  end
 end
diff --git a/app/services/notify_service.rb b/app/services/notify_service.rb
index c83e4c017fe599..e56562c0a59c58 100644
--- a/app/services/notify_service.rb
+++ b/app/services/notify_service.rb
@@ -9,6 +9,7 @@ class NotifyService < BaseService
     update
     poll
     status
+    moderation_warning
     # TODO: this probably warrants an email notification
     severed_relationships
   ).freeze
@@ -22,7 +23,7 @@ def initialize(notification)
 
     def dismiss?
       blocked   = @recipient.unavailable?
-      blocked ||= from_self? && @notification.type != :poll && @notification.type != :severed_relationships
+      blocked ||= from_self? && %i(poll severed_relationships moderation_warning).exclude?(@notification.type)
 
       return blocked if message? && from_staff?
 
@@ -75,6 +76,7 @@ class FilterCondition
       admin.report
       poll
       update
+      account_warning
     ).freeze
 
     def initialize(notification)
diff --git a/spec/models/admin/account_action_spec.rb b/spec/models/admin/account_action_spec.rb
index 9bc9f8061d7f10..a9dcf352dcdaea 100644
--- a/spec/models/admin/account_action_spec.rb
+++ b/spec/models/admin/account_action_spec.rb
@@ -69,22 +69,22 @@
       end
     end
 
-    it 'creates Admin::ActionLog' do
-      expect do
-        subject
-      end.to change(Admin::ActionLog, :count).by 1
-    end
+    it 'sends notification, log the action, and closes other reports', :aggregate_failures do
+      other_report = Fabricate(:report, target_account: target_account)
 
-    it 'calls process_email!' do
-      allow(account_action).to receive(:process_email!)
-      subject
-      expect(account_action).to have_received(:process_email!)
-    end
+      emails = []
+      expect do
+        emails = capture_emails { subject }
+      end.to (change(Admin::ActionLog.where(action: type), :count).by 1)
+         .and(change { other_report.reload.action_taken? }.from(false).to(true))
+
+      expect(emails).to contain_exactly(
+        have_attributes(
+          to: contain_exactly(target_account.user.email)
+        )
+      )
 
-    it 'calls process_reports!' do
-      allow(account_action).to receive(:process_reports!)
-      subject
-      expect(account_action).to have_received(:process_reports!)
+      expect(LocalNotificationWorker).to have_enqueued_sidekiq_job(target_account.id, anything, 'AccountWarning', 'moderation_warning')
     end
   end
 

From 5201882a2389bbd3477440509fe12b2019edb4e7 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 26 Apr 2024 12:05:18 +0200
Subject: [PATCH 0831/2191] New Crowdin Translations (automated) (#30077)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/ca.json    |  4 ++++
 app/javascript/mastodon/locales/da.json    | 13 +++++++++++++
 app/javascript/mastodon/locales/de.json    | 13 +++++++++++++
 app/javascript/mastodon/locales/eu.json    | 13 +++++++++++++
 app/javascript/mastodon/locales/fi.json    | 13 +++++++++++++
 app/javascript/mastodon/locales/fo.json    | 13 +++++++++++++
 app/javascript/mastodon/locales/gd.json    |  4 ++++
 app/javascript/mastodon/locales/gl.json    | 13 +++++++++++++
 app/javascript/mastodon/locales/he.json    |  4 ++++
 app/javascript/mastodon/locales/hu.json    | 13 +++++++++++++
 app/javascript/mastodon/locales/is.json    | 13 +++++++++++++
 app/javascript/mastodon/locales/it.json    | 13 +++++++++++++
 app/javascript/mastodon/locales/nl.json    | 15 ++++++++++++++-
 app/javascript/mastodon/locales/nn.json    |  9 +++++++++
 app/javascript/mastodon/locales/pl.json    | 13 +++++++++++++
 app/javascript/mastodon/locales/pt-PT.json | 13 +++++++++++++
 app/javascript/mastodon/locales/sv.json    |  6 +++++-
 app/javascript/mastodon/locales/zh-CN.json | 13 +++++++++++++
 app/javascript/mastodon/locales/zh-TW.json | 13 +++++++++++++
 config/locales/de.yml                      |  4 ++--
 config/locales/doorkeeper.pt-PT.yml        |  1 +
 21 files changed, 212 insertions(+), 4 deletions(-)

diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index 40d9771df1a2ee..6dfe06a92e210c 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -308,6 +308,8 @@
   "follow_requests.unlocked_explanation": "Tot i que el teu compte no està blocat, el personal de {domain} ha pensat que és possible que vulguis revisar manualment les sol·licituds de seguiment d’aquests comptes.",
   "follow_suggestions.curated_suggestion": "Tria de l'equip",
   "follow_suggestions.dismiss": "No ho tornis a mostrar",
+  "follow_suggestions.featured_longer": "Triat personalment per l'equip de {domain}",
+  "follow_suggestions.friends_of_friends_longer": "Popular entre la gent que segueixes",
   "follow_suggestions.hints.featured": "L'equip de {domain} ha seleccionat aquest perfil.",
   "follow_suggestions.hints.friends_of_friends": "Aquest perfil és popular entre la gent que seguiu.",
   "follow_suggestions.hints.most_followed": "Aquest perfil és un dels més seguits a {domain}.",
@@ -315,6 +317,8 @@
   "follow_suggestions.hints.similar_to_recently_followed": "Aquest perfil és similar a d'altres que heu seguit recentment.",
   "follow_suggestions.personalized_suggestion": "Suggeriment personalitzat",
   "follow_suggestions.popular_suggestion": "Suggeriment popular",
+  "follow_suggestions.popular_suggestion_longer": "Popular a {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Semblant a perfils que has seguit fa poc",
   "follow_suggestions.view_all": "Mostra-ho tot",
   "follow_suggestions.who_to_follow": "A qui seguir",
   "followed_tags": "Etiquetes seguides",
diff --git a/app/javascript/mastodon/locales/da.json b/app/javascript/mastodon/locales/da.json
index a7c8a049eadb37..a23d537331651a 100644
--- a/app/javascript/mastodon/locales/da.json
+++ b/app/javascript/mastodon/locales/da.json
@@ -306,6 +306,8 @@
   "follow_requests.unlocked_explanation": "Selvom din konto ikke er låst, synes {domain}-personalet, du måske bør gennemgå disse anmodninger manuelt.",
   "follow_suggestions.curated_suggestion": "Personaleudvalgt",
   "follow_suggestions.dismiss": "Vis ikke igen",
+  "follow_suggestions.featured_longer": "Håndplukket af {domain}-teamet",
+  "follow_suggestions.friends_of_friends_longer": "Populært blandt personer, som følges",
   "follow_suggestions.hints.featured": "Denne profil er håndplukket af {domain}-teamet.",
   "follow_suggestions.hints.friends_of_friends": "Denne profil er populær blandt de personer, som følges.",
   "follow_suggestions.hints.most_followed": "Denne profil er en af de mest fulgte på {domain}.",
@@ -313,6 +315,8 @@
   "follow_suggestions.hints.similar_to_recently_followed": "Denne profil svarer til de profiler, som senest er blevet fulgt.",
   "follow_suggestions.personalized_suggestion": "Personligt forslag",
   "follow_suggestions.popular_suggestion": "Populært forslag",
+  "follow_suggestions.popular_suggestion_longer": "Populært på {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Svarende til profiler, som for nylig er fulgt",
   "follow_suggestions.view_all": "Vis alle",
   "follow_suggestions.who_to_follow": "Hvem, som skal følges",
   "followed_tags": "Hashtag, som følges",
@@ -467,6 +471,15 @@
   "notification.follow": "{name} begyndte at følge dig",
   "notification.follow_request": "{name} har anmodet om at følge dig",
   "notification.mention": "{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.",
+  "notification.moderation_warning.action_disable": "Din konto er blevet deaktiveret.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Nogle af dine indlæg er blevet markeret som sensitive.",
+  "notification.moderation_warning.action_none": "Din konto er tildelt en moderationsadvarsel.",
+  "notification.moderation_warning.action_sensitive": "Dine indlæg markeres fra nu af som sensitive.",
+  "notification.moderation_warning.action_silence": "Din konto er blevet begrænset.",
+  "notification.moderation_warning.action_suspend": "Din konto er suspenderet.",
   "notification.own_poll": "Din afstemning er afsluttet",
   "notification.poll": "En afstemning, hvori du stemte, er slut",
   "notification.reblog": "{name} boostede dit indlæg",
diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json
index 8b52cdb3cc8388..59d3d0965afd2a 100644
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@@ -308,6 +308,8 @@
   "follow_requests.unlocked_explanation": "Auch wenn dein Konto öffentlich bzw. nicht geschützt ist, haben die Moderator*innen von {domain} gedacht, dass du diesen Follower lieber manuell bestätigen solltest.",
   "follow_suggestions.curated_suggestion": "Vom Server-Team empfohlen",
   "follow_suggestions.dismiss": "Nicht mehr anzeigen",
+  "follow_suggestions.featured_longer": "Vom {domain}-Team ausgewählt",
+  "follow_suggestions.friends_of_friends_longer": "Beliebt bei Leuten, denen du folgst",
   "follow_suggestions.hints.featured": "Dieses Profil wurde vom {domain}-Team ausgewählt.",
   "follow_suggestions.hints.friends_of_friends": "Dieses Profil ist bei deinen Followern beliebt.",
   "follow_suggestions.hints.most_followed": "Dieses Profil ist eines der am meisten gefolgten auf {domain}.",
@@ -315,6 +317,8 @@
   "follow_suggestions.hints.similar_to_recently_followed": "Dieses Profil ähnelt den Profilen, denen du in letzter Zeit gefolgt hast.",
   "follow_suggestions.personalized_suggestion": "Persönliche Empfehlung",
   "follow_suggestions.popular_suggestion": "Beliebte Empfehlung",
+  "follow_suggestions.popular_suggestion_longer": "Beliebt auf {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Ähnlich zu Profilen, denen du seit kurzem folgst",
   "follow_suggestions.view_all": "Alle anzeigen",
   "follow_suggestions.who_to_follow": "Empfohlene Profile",
   "followed_tags": "Gefolgte Hashtags",
@@ -469,6 +473,15 @@
   "notification.follow": "{name} folgt dir",
   "notification.follow_request": "{name} möchte dir folgen",
   "notification.mention": "{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.",
+  "notification.moderation_warning.action_disable": "Dein Konto wurde deaktiviert.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Einige deiner Beiträge wurden mit einer Inhaltswarnung versehen.",
+  "notification.moderation_warning.action_none": "Dein Konto ist von den Moderator*innen verwarnt worden.",
+  "notification.moderation_warning.action_sensitive": "Deine zukünftigen Beiträge werden mit einer Inhaltswarnung versehen.",
+  "notification.moderation_warning.action_silence": "Dein Konto wurde eingeschränkt.",
+  "notification.moderation_warning.action_suspend": "Dein Konto wurde gesperrt.",
   "notification.own_poll": "Deine Umfrage ist beendet",
   "notification.poll": "Eine Umfrage, an der du teilgenommen hast, ist beendet",
   "notification.reblog": "{name} teilte deinen Beitrag",
diff --git a/app/javascript/mastodon/locales/eu.json b/app/javascript/mastodon/locales/eu.json
index 7e2ecf69cdb9d4..9fae0748780aad 100644
--- a/app/javascript/mastodon/locales/eu.json
+++ b/app/javascript/mastodon/locales/eu.json
@@ -308,6 +308,8 @@
   "follow_requests.unlocked_explanation": "Zure kontua blokeatuta ez badago ere, {domain} domeinuko arduradunek uste dute kontu hauetako jarraipen eskaerak agian eskuz begiratu nahiko dituzula.",
   "follow_suggestions.curated_suggestion": "Domeinuaren iradokizuna",
   "follow_suggestions.dismiss": "Ez erakutsi berriro",
+  "follow_suggestions.featured_longer": "{domain} domeinuko taldeak hautaturikoak",
+  "follow_suggestions.friends_of_friends_longer": "Jarraitzen duzun jendearen artean ezagunak direnak",
   "follow_suggestions.hints.featured": "Profil hau {domain} domeinuko taldeak eskuz aukeratu du.",
   "follow_suggestions.hints.friends_of_friends": "Profil hau ezaguna da jarraitzen duzun jendearen artean.",
   "follow_suggestions.hints.most_followed": "Profil hau {domain} domeinuan gehien jarraitzen den profiletako bat da.",
@@ -315,6 +317,8 @@
   "follow_suggestions.hints.similar_to_recently_followed": "Profil hau duela gutxi jarraitu dituzun profil askoren antzekoa da.",
   "follow_suggestions.personalized_suggestion": "Iradokizun pertsonalizatua",
   "follow_suggestions.popular_suggestion": "Iradokizun ezaguna",
+  "follow_suggestions.popular_suggestion_longer": "{domain} domeinuan ezagunak direnak",
+  "follow_suggestions.similar_to_recently_followed_longer": "Berriki jarraitu dituzun profilen antzekoa",
   "follow_suggestions.view_all": "Ikusi denak",
   "follow_suggestions.who_to_follow": "Zein jarraitu",
   "followed_tags": "Jarraitutako traolak",
@@ -469,6 +473,15 @@
   "notification.follow": "{name}(e)k jarraitzen dizu",
   "notification.follow_request": "{name}(e)k zu jarraitzeko eskaera egin du",
   "notification.mention": "{name}(e)k aipatu zaitu",
+  "notification.moderation-warning.learn_more": "Informazio gehiago",
+  "notification.moderation_warning": "Moderazio-abisu bat jaso duzu",
+  "notification.moderation_warning.action_delete_statuses": "Argitalpen batzuk kendu dira.",
+  "notification.moderation_warning.action_disable": "Zure kontua desaktibatua izan da.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Argitalpen batzuk hunkigarri gisa ezarri dira.",
+  "notification.moderation_warning.action_none": "Kontuak moderazio-abisu bat jaso du.",
+  "notification.moderation_warning.action_sensitive": "Argitalpenak hunkigarri gisa markatuko dira hemendik aurrera.",
+  "notification.moderation_warning.action_silence": "Kontua murriztu egin da.",
+  "notification.moderation_warning.action_suspend": "Kontua itxi da.",
   "notification.own_poll": "Zure inkesta amaitu da",
   "notification.poll": "Zuk erantzun duzun inkesta bat bukatu da",
   "notification.reblog": "{name}(e)k bultzada eman dio zure bidalketari",
diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index 246bb56fcc28c5..5a5031fd14ae49 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -308,6 +308,8 @@
   "follow_requests.unlocked_explanation": "Vaikkei tiliäsi ole lukittu, palvelimen {domain} ylläpito on arvioinut, että saatat olla halukas tarkistamaan nämä seuraamispyynnöt erikseen.",
   "follow_suggestions.curated_suggestion": "Ehdotus ylläpidolta",
   "follow_suggestions.dismiss": "Älä näytä uudelleen",
+  "follow_suggestions.featured_longer": "Käsin valinnut palvelimen {domain} tiimi",
+  "follow_suggestions.friends_of_friends_longer": "Suosittu seuraamiesi ihmisten keskuudessa",
   "follow_suggestions.hints.featured": "Tämän profiilin on valinnut palvelimen {domain} tiimi.",
   "follow_suggestions.hints.friends_of_friends": "Seuraamasi käyttäjät suosivat tätä profiilia.",
   "follow_suggestions.hints.most_followed": "Tämä profiili on palvelimen {domain} seuratuimpia.",
@@ -315,6 +317,8 @@
   "follow_suggestions.hints.similar_to_recently_followed": "Tämä profiili on samankaltainen kuin profiilit, joita olet viimeksi seurannut.",
   "follow_suggestions.personalized_suggestion": "Mukautettu ehdotus",
   "follow_suggestions.popular_suggestion": "Suosittu ehdotus",
+  "follow_suggestions.popular_suggestion_longer": "Suosittu palvelimella {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Samankaltainen kuin äskettäin seuraamasi profiilit",
   "follow_suggestions.view_all": "Näytä kaikki",
   "follow_suggestions.who_to_follow": "Ehdotuksia seurattavaksi",
   "followed_tags": "Seuratut aihetunnisteet",
@@ -469,6 +473,15 @@
   "notification.follow": "{name} seurasi sinua",
   "notification.follow_request": "{name} on pyytänyt lupaa saada seurata sinua",
   "notification.mention": "{name} mainitsi sinut",
+  "notification.moderation-warning.learn_more": "Lue lisää",
+  "notification.moderation_warning": "Olet saanut moderointivaroituksen",
+  "notification.moderation_warning.action_delete_statuses": "Jotkin julkaisusi on poistettu.",
+  "notification.moderation_warning.action_disable": "Tilisi on poistettu käytöstä.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Jotkin julkaisusi on merkitty arkaluonteisiksi.",
+  "notification.moderation_warning.action_none": "Tilisi on saanut moderointivaroituksen.",
+  "notification.moderation_warning.action_sensitive": "Tästä lähtien julkaisusi merkitään arkaluonteisiksi.",
+  "notification.moderation_warning.action_silence": "Tiliäsi on rajoitettu.",
+  "notification.moderation_warning.action_suspend": "Tilisi on jäädytetty.",
   "notification.own_poll": "Äänestyksesi on päättynyt",
   "notification.poll": "Kysely, johon osallistuit, on päättynyt",
   "notification.reblog": "{name} tehosti julkaisuasi",
diff --git a/app/javascript/mastodon/locales/fo.json b/app/javascript/mastodon/locales/fo.json
index 68faf6d81f2c55..77257413fdf54e 100644
--- a/app/javascript/mastodon/locales/fo.json
+++ b/app/javascript/mastodon/locales/fo.json
@@ -308,6 +308,8 @@
   "follow_requests.unlocked_explanation": "Sjálvt um konta tín ikki er læst, so hugsa {domain} starvsfólkini, at tú kanska hevur hug at kanna umbønir um at fylgja frá hesum kontum við hond.",
   "follow_suggestions.curated_suggestion": "Val hjá ábyrgdarfólki",
   "follow_suggestions.dismiss": "Lat vera við at vísa",
+  "follow_suggestions.featured_longer": "Vald burturúr av {domain} toyminum",
+  "follow_suggestions.friends_of_friends_longer": "Vælumtókt millum fólk, sum tú fylgir",
   "follow_suggestions.hints.featured": "Hesin vangin er úrvaldur av toyminum handan {domain}.",
   "follow_suggestions.hints.friends_of_friends": "Hesin vangin er vælumtóktur millum tey, tú fylgir.",
   "follow_suggestions.hints.most_followed": "Hesin vangin er ein av teimum, sum er mest fylgdur á {domain}.",
@@ -315,6 +317,8 @@
   "follow_suggestions.hints.similar_to_recently_followed": "Hesin vangin líkist teimum, sum tú nýliga hevur fylgt.",
   "follow_suggestions.personalized_suggestion": "Persónligt uppskot",
   "follow_suggestions.popular_suggestion": "Vælumtókt uppskot",
+  "follow_suggestions.popular_suggestion_longer": "Vælumtókt á {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Líkist vangum, sum tú nýliga hevur fylgt",
   "follow_suggestions.view_all": "Vís øll",
   "follow_suggestions.who_to_follow": "Hvørji tú átti at fylgt",
   "followed_tags": "Fylgd frámerki",
@@ -469,6 +473,15 @@
   "notification.follow": "{name} fylgdi tær",
   "notification.follow_request": "{name} biður um at fylgja tær",
   "notification.mention": "{name} nevndi teg",
+  "notification.moderation-warning.learn_more": "Lær meira",
+  "notification.moderation_warning": "Tú hevur móttikið eina umsjónarávarðing",
+  "notification.moderation_warning.action_delete_statuses": "Onkrir av tínum postum eru strikaðir.",
+  "notification.moderation_warning.action_disable": "Konta tín er gjørd óvirkin.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Nakrir av postum tínum eru merktir sum viðkvæmir.",
+  "notification.moderation_warning.action_none": "Konta tín hevur móttikið eina umsjónarávarðing.",
+  "notification.moderation_warning.action_sensitive": "Postar tínir verða merktir sum viðkvæmir frá nú av.",
+  "notification.moderation_warning.action_silence": "Konta tín er avmarkað.",
+  "notification.moderation_warning.action_suspend": "Konta tín er ógildað.",
   "notification.own_poll": "Tín atkvøðugreiðsla er endað",
   "notification.poll": "Ein atkvøðugreiðsla, har tú hevur atkvøtt, er endað",
   "notification.reblog": "{name} lyfti tín post",
diff --git a/app/javascript/mastodon/locales/gd.json b/app/javascript/mastodon/locales/gd.json
index 8ab515e1a8fdab..9e79793de1080a 100644
--- a/app/javascript/mastodon/locales/gd.json
+++ b/app/javascript/mastodon/locales/gd.json
@@ -297,6 +297,7 @@
   "filter_modal.select_filter.subtitle": "Cleachd roinn-seòrsa a tha ann no cruthaich tè ùr",
   "filter_modal.select_filter.title": "Criathraich am post seo",
   "filter_modal.title.status": "Criathraich post",
+  "filtered_notifications_banner.mentions": "{count, plural, one {iomradh} two {iomradh} few {iomraidhean} other {iomradh}}",
   "filtered_notifications_banner.pending_requests": "{count, plural, =0 {Chan eil brath ann o dhaoine} one {Tha brathan ann o # neach} two {Tha brathan ann o # neach} few {Tha brathan ann o # daoine} other {Tha brathan ann o # duine}} air a bheil thu eòlach ’s dòcha",
   "filtered_notifications_banner.title": "Brathan criathraichte",
   "firehose.all": "Na h-uile",
@@ -307,6 +308,7 @@
   "follow_requests.unlocked_explanation": "Ged nach eil an cunntas agad glaiste, tha sgioba {domain} dhen bheachd gum b’ fheàirrde thu lèirmheas a dhèanamh air na h-iarrtasan leantainn o na cunntasan seo a làimh.",
   "follow_suggestions.curated_suggestion": "Roghainn an sgioba",
   "follow_suggestions.dismiss": "Na seall seo a-rithist",
+  "follow_suggestions.friends_of_friends_longer": "Fèill mhòr am measg nan daoine a leanas tu",
   "follow_suggestions.hints.featured": "Chaidh a’ phròifil seo a thaghadh le sgioba {domain} a làimh.",
   "follow_suggestions.hints.friends_of_friends": "Tha fèill mhòr air a’ phròifil seo am measg nan daoine a leanas tu.",
   "follow_suggestions.hints.most_followed": "Tha a’ phròifil seo am measg an fheadhainn a leanar as trice air {domain}.",
@@ -314,6 +316,7 @@
   "follow_suggestions.hints.similar_to_recently_followed": "Tha a’ phròifil seo coltach ris na pròifilean air an lean thu o chionn goirid.",
   "follow_suggestions.personalized_suggestion": "Moladh pearsanaichte",
   "follow_suggestions.popular_suggestion": "Moladh air a bheil fèill mhòr",
+  "follow_suggestions.popular_suggestion_longer": "Fèill mhòr air {domain}",
   "follow_suggestions.view_all": "Seall na h-uile",
   "follow_suggestions.who_to_follow": "Molaidhean leantainn",
   "followed_tags": "Tagaichean hais ’gan leantainn",
@@ -468,6 +471,7 @@
   "notification.follow": "Tha {name} ’gad leantainn a-nis",
   "notification.follow_request": "Dh’iarr {name} ’gad leantainn",
   "notification.mention": "Thug {name} iomradh ort",
+  "notification.moderation-warning.learn_more": "Barrachd fiosrachaidh",
   "notification.own_poll": "Thàinig an cunntas-bheachd agad gu crìoch",
   "notification.poll": "Thàinig cunntas-bheachd sa bhòt thu gu crìoch",
   "notification.reblog": "Bhrosnaich {name} am post agad",
diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json
index 901bca7498792f..49802ac48876f5 100644
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@@ -308,6 +308,8 @@
   "follow_requests.unlocked_explanation": "Malia que a túa conta non é privada, a administración de {domain} pensou que quizabes terías que revisar de xeito manual as solicitudes de seguiminto.",
   "follow_suggestions.curated_suggestion": "Suxestións do Servidor",
   "follow_suggestions.dismiss": "Non mostrar máis",
+  "follow_suggestions.featured_longer": "Elección persoal do equipo de {domain}",
+  "follow_suggestions.friends_of_friends_longer": "Popular entre as persoas que sigues",
   "follow_suggestions.hints.featured": "Este perfil foi escollido pola administración de {domain}.",
   "follow_suggestions.hints.friends_of_friends": "Este perfil é popular entre as persoas que segues.",
   "follow_suggestions.hints.most_followed": "Este perfil é un dos máis seguidos en {domain}.",
@@ -315,6 +317,8 @@
   "follow_suggestions.hints.similar_to_recently_followed": "Este perfil ten semellanzas cos perfís que ti seguiches últimamente.",
   "follow_suggestions.personalized_suggestion": "Suxestión personalizada",
   "follow_suggestions.popular_suggestion": "Suxestión popular",
+  "follow_suggestions.popular_suggestion_longer": "Popular en {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Perfís semellantes aos que seguiches recentemente",
   "follow_suggestions.view_all": "Ver todas",
   "follow_suggestions.who_to_follow": "A quen seguir",
   "followed_tags": "Cancelos seguidos",
@@ -469,6 +473,15 @@
   "notification.follow": "{name} comezou a seguirte",
   "notification.follow_request": "{name} solicitou seguirte",
   "notification.mention": "{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.",
+  "notification.moderation_warning.action_disable": "A túa conta foi desactivada.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Algunha das túas publicacións foron marcadas como sensibles.",
+  "notification.moderation_warning.action_none": "A túa conta recibeu unha advertencia da moderación.",
+  "notification.moderation_warning.action_sensitive": "De agora en diante as túas publicacións van ser marcadas como sensibles.",
+  "notification.moderation_warning.action_silence": "A túa conta foi limitada.",
+  "notification.moderation_warning.action_suspend": "A túa conta foi suspendida.",
   "notification.own_poll": "A túa enquisa rematou",
   "notification.poll": "Rematou a enquisa na que votaches",
   "notification.reblog": "{name} compartiu a túa publicación",
diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json
index d696186bf5cfcd..0b66a27fa96bd8 100644
--- a/app/javascript/mastodon/locales/he.json
+++ b/app/javascript/mastodon/locales/he.json
@@ -308,6 +308,8 @@
   "follow_requests.unlocked_explanation": "למרות שחשבונך אינו נעול, צוות {domain} חושב שאולי כדאי לוודא את בקשות המעקב האלה ידנית.",
   "follow_suggestions.curated_suggestion": "בחירת הצוות",
   "follow_suggestions.dismiss": "לא להציג שוב",
+  "follow_suggestions.featured_longer": "נבחר ידנית על ידי הצוות של {domain}",
+  "follow_suggestions.friends_of_friends_longer": "פופולרי בין הנעקבים שלך",
   "follow_suggestions.hints.featured": "החשבון הזה נבחר אישית על ידי צוות {domain}.",
   "follow_suggestions.hints.friends_of_friends": "חשבון זה פופולרי בין הנעקבים שלך.",
   "follow_suggestions.hints.most_followed": "חשבון זה הוא מבין הנעקבים ביותר בשרת {domain}.",
@@ -315,6 +317,8 @@
   "follow_suggestions.hints.similar_to_recently_followed": "חשבון זה דומה לחשבונות אחרים שאחריהם התחלת לעקוב לאחרונה.",
   "follow_suggestions.personalized_suggestion": "הצעות מותאמות אישית",
   "follow_suggestions.popular_suggestion": "הצעה פופולרית",
+  "follow_suggestions.popular_suggestion_longer": "פופולרי בקהילת {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "דומה למשתמשות.ים שעקבת אחריהן.ם לאחרונה",
   "follow_suggestions.view_all": "צפיה בכל",
   "follow_suggestions.who_to_follow": "אחרי מי לעקוב",
   "followed_tags": "התגיות שהחשבון שלך עוקב אחריהן",
diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json
index 16dcea642dd823..42ce842585d094 100644
--- a/app/javascript/mastodon/locales/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@@ -308,6 +308,8 @@
   "follow_requests.unlocked_explanation": "Bár a fiókod nincs zárolva, a(z) {domain} csapata úgy gondolta, hogy talán kézzel szeretnéd ellenőrizni ezen fiókok követési kéréseit.",
   "follow_suggestions.curated_suggestion": "A stáb választása",
   "follow_suggestions.dismiss": "Ne jelenjen meg újra",
+  "follow_suggestions.featured_longer": "A {domain} csapata által kézzel kiválasztott",
+  "follow_suggestions.friends_of_friends_longer": "Népszerű az Ön által követett emberek körében",
   "follow_suggestions.hints.featured": "Ezt a profilt a(z) {domain} csapata választotta ki.",
   "follow_suggestions.hints.friends_of_friends": "Ez a profil népszerű az általad követett emberek körében.",
   "follow_suggestions.hints.most_followed": "Ez a profil a leginkább követett a(z) {domain} oldalon.",
@@ -315,6 +317,8 @@
   "follow_suggestions.hints.similar_to_recently_followed": "Ez a profil hasonló azokhoz a profilokhoz, melyeket nemrég kezdtél el követni.",
   "follow_suggestions.personalized_suggestion": "Személyre szabott javaslat",
   "follow_suggestions.popular_suggestion": "Népszerű javaslat",
+  "follow_suggestions.popular_suggestion_longer": "Népszerű itt: {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Hasonló profilok, melyeket nemrég követett",
   "follow_suggestions.view_all": "Összes megtekintése",
   "follow_suggestions.who_to_follow": "Kit érdemes követni",
   "followed_tags": "Követett hashtagek",
@@ -469,6 +473,15 @@
   "notification.follow": "{name} követ téged",
   "notification.follow_request": "{name} követni szeretne téged",
   "notification.mention": "{name} megemlített",
+  "notification.moderation-warning.learn_more": "További információk",
+  "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.",
+  "notification.moderation_warning.action_disable": "A fiókod le van tiltva.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Néhány bejegyzésedet kényesnek jelölték.",
+  "notification.moderation_warning.action_none": "A fiókod moderációs figyelmeztetést kapott.",
+  "notification.moderation_warning.action_sensitive": "A bejegyzéseid mostantól érzékenynek lesznek jelölve.",
+  "notification.moderation_warning.action_silence": "A fiókod korlátozásra került.",
+  "notification.moderation_warning.action_suspend": "A fiókod felfüggesztésre került.",
   "notification.own_poll": "A szavazásod véget ért",
   "notification.poll": "Egy szavazás, melyben részt vettél, véget ért",
   "notification.reblog": "{name} megtolta a bejegyzésedet",
diff --git a/app/javascript/mastodon/locales/is.json b/app/javascript/mastodon/locales/is.json
index 435f98f30fc7c4..f5bf7c328165d5 100644
--- a/app/javascript/mastodon/locales/is.json
+++ b/app/javascript/mastodon/locales/is.json
@@ -308,6 +308,8 @@
   "follow_requests.unlocked_explanation": "Jafnvel þótt aðgangurinn þinn sé ekki læstur, hafa umsjónarmenn {domain} ímyndað sér að þú gætir viljað yfirfara handvirkt fylgjendabeiðnir frá þessum notendum.",
   "follow_suggestions.curated_suggestion": "Úrval starfsfólks",
   "follow_suggestions.dismiss": "Ekki birta þetta aftur",
+  "follow_suggestions.featured_longer": "Handvalið af {domain}-teyminu",
+  "follow_suggestions.friends_of_friends_longer": "Vinsælt hjá fólki sem þú fylgist með",
   "follow_suggestions.hints.featured": "Þetta notandasnið hefur verið handvalið af {domain}-teyminu.",
   "follow_suggestions.hints.friends_of_friends": "Þetta notandasnið er vinsælt hjá fólki sem þú fylgist með.",
   "follow_suggestions.hints.most_followed": "Þetta notandasnið er eitt af þeim sem mest er fylgst með á {domain}.",
@@ -315,6 +317,8 @@
   "follow_suggestions.hints.similar_to_recently_followed": "Þetta notandasnið er líkt þeim sniðum sem þú hefur valið að fylgjast með að undanförnu.",
   "follow_suggestions.personalized_suggestion": "Persónuaðlöguð tillaga",
   "follow_suggestions.popular_suggestion": "Vinsæl tillaga",
+  "follow_suggestions.popular_suggestion_longer": "Vinsælt á {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Svipar til notenda sem þú hefur nýlega farið að fylgjast með",
   "follow_suggestions.view_all": "Skoða allt",
   "follow_suggestions.who_to_follow": "Hverjum á að fylgjast með",
   "followed_tags": "Myllumerki sem fylgst er með",
@@ -469,6 +473,15 @@
   "notification.follow": "{name} fylgist með þér",
   "notification.follow_request": "{name} hefur beðið um að fylgjast með þér",
   "notification.mention": "{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.",
+  "notification.moderation_warning.action_disable": "Aðgangurinn þinn hefur verið gerður óvirkur.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Sumar færslurnar þínar hafa verið merktar sem viðkvæmt efni.",
+  "notification.moderation_warning.action_none": "Aðgangurinn þinn hefur fengið aðvörun frá umsjónarmanni.",
+  "notification.moderation_warning.action_sensitive": "Færslur þínar á verða héðan í frá merktar sem viðkvæmar.",
+  "notification.moderation_warning.action_silence": "Notandaaðgangurinn þinn hefur verið takmarkaður.",
+  "notification.moderation_warning.action_suspend": "Notandaaðgangurinn þinn hefur verið settur í frysti.",
   "notification.own_poll": "Könnuninni þinni er lokið",
   "notification.poll": "Könnun sem þú tókst þátt í er lokið",
   "notification.reblog": "{name} endurbirti færsluna þína",
diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json
index fcfd09d75ff9a4..8ab5db1b171678 100644
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@@ -308,6 +308,8 @@
   "follow_requests.unlocked_explanation": "Anche se il tuo profilo non è privato, lo staff di {domain} ha pensato che potresti voler revisionare manualmente le richieste di seguirti da questi profili.",
   "follow_suggestions.curated_suggestion": "Scelta personale",
   "follow_suggestions.dismiss": "Non visualizzare più",
+  "follow_suggestions.featured_longer": "Selezionato personalmente dal team di {domain}",
+  "follow_suggestions.friends_of_friends_longer": "Popolare tra le persone che segui",
   "follow_suggestions.hints.featured": "Questo profilo è stato selezionato personalmente dal team di {domain}.",
   "follow_suggestions.hints.friends_of_friends": "Questo profilo è popolare tra le persone che segui.",
   "follow_suggestions.hints.most_followed": "Questo profilo è uno dei più seguiti su {domain}.",
@@ -315,6 +317,8 @@
   "follow_suggestions.hints.similar_to_recently_followed": "Questo profilo è simile ai profili che hai seguito più recentemente.",
   "follow_suggestions.personalized_suggestion": "Suggerimenti personalizzati",
   "follow_suggestions.popular_suggestion": "Suggerimento frequente",
+  "follow_suggestions.popular_suggestion_longer": "Popolare su {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Simile ai profili che hai seguito di recente",
   "follow_suggestions.view_all": "Vedi tutto",
   "follow_suggestions.who_to_follow": "Chi seguire",
   "followed_tags": "Hashtag seguiti",
@@ -469,6 +473,15 @@
   "notification.follow": "{name} ha iniziato a seguirti",
   "notification.follow_request": "{name} ha richiesto di seguirti",
   "notification.mention": "{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.",
+  "notification.moderation_warning.action_disable": "Il tuo account è stato disattivato.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Alcuni dei tuoi post sono stati contrassegnati come sensibili.",
+  "notification.moderation_warning.action_none": "Il tuo account ha ricevuto un avviso di moderazione.",
+  "notification.moderation_warning.action_sensitive": "I tuoi post d'ora in poi saranno contrassegnati come sensibili.",
+  "notification.moderation_warning.action_silence": "Il tuo account è stato limitato.",
+  "notification.moderation_warning.action_suspend": "Il tuo account è stato sospeso.",
   "notification.own_poll": "Il tuo sondaggio è terminato",
   "notification.poll": "Un sondaggio in cui hai votato è terminato",
   "notification.reblog": "{name} ha rebloggato il tuo post",
diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json
index 46d1f978350ae2..1958e4a6a09410 100644
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@@ -308,13 +308,17 @@
   "follow_requests.unlocked_explanation": "Ook al is jouw account niet besloten, de medewerkers van {domain} denken dat jij misschien de volgende volgverzoeken handmatig wil controleren.",
   "follow_suggestions.curated_suggestion": "Speciaal geselecteerd",
   "follow_suggestions.dismiss": "Niet meer weergeven",
-  "follow_suggestions.hints.featured": "Deze gebruiker is geselecteerd door het team van {domain}.",
+  "follow_suggestions.featured_longer": "Handmatig geselecteerd door het team van {domain}",
+  "follow_suggestions.friends_of_friends_longer": "Populair onder mensen die je volgt",
+  "follow_suggestions.hints.featured": "Deze gebruiker is handmatig geselecteerd door het team van {domain}.",
   "follow_suggestions.hints.friends_of_friends": "Deze gebruiker is populair onder de mensen die jij volgt.",
   "follow_suggestions.hints.most_followed": "Deze gebruiker is een van de meest gevolgde gebruikers op {domain}.",
   "follow_suggestions.hints.most_interactions": "Deze gebruiker is de laatste tijd erg populair op {domain}.",
   "follow_suggestions.hints.similar_to_recently_followed": "Deze gebruiker is vergelijkbaar met gebruikers die je recentelijk hebt gevolgd.",
   "follow_suggestions.personalized_suggestion": "Gepersonaliseerde aanbeveling",
   "follow_suggestions.popular_suggestion": "Populaire aanbeveling",
+  "follow_suggestions.popular_suggestion_longer": "Populair op {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Vergelijkbaar met accounts die je recentelijk bent gaan volgen",
   "follow_suggestions.view_all": "Alles weergeven",
   "follow_suggestions.who_to_follow": "Wie te volgen",
   "followed_tags": "Gevolgde hashtags",
@@ -469,6 +473,15 @@
   "notification.follow": "{name} volgt jou nu",
   "notification.follow_request": "{name} wil jou graag volgen",
   "notification.mention": "{name} vermeldde jou",
+  "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_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.",
+  "notification.moderation_warning.action_silence": "Jouw account is beperkt.",
+  "notification.moderation_warning.action_suspend": "Jouw account is opgeschort.",
   "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",
diff --git a/app/javascript/mastodon/locales/nn.json b/app/javascript/mastodon/locales/nn.json
index 2cfb0d1247c890..14b355233b640e 100644
--- a/app/javascript/mastodon/locales/nn.json
+++ b/app/javascript/mastodon/locales/nn.json
@@ -468,6 +468,15 @@
   "notification.follow": "{name} fylgde deg",
   "notification.follow_request": "{name} har bedt om å fylgja deg",
   "notification.mention": "{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.",
+  "notification.moderation_warning.action_disable": "Kontoen din har blitt deaktivert.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Nokre av innlegga dine har blitt markert som sensitive.",
+  "notification.moderation_warning.action_none": "Kontoen din har mottatt ei moderasjonsåtvaring.",
+  "notification.moderation_warning.action_sensitive": "Innlegga dine vil bli markerte som sensitive frå no av.",
+  "notification.moderation_warning.action_silence": "Kontoen din har blitt avgrensa.",
+  "notification.moderation_warning.action_suspend": "Kontoen din har blitt suspendert.",
   "notification.own_poll": "Rundspørjinga di er ferdig",
   "notification.poll": "Ei rundspørjing du har røysta i er ferdig",
   "notification.reblog": "{name} framheva innlegget ditt",
diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json
index 72f1ba58f50dbb..b763f740a2ef91 100644
--- a/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@@ -308,6 +308,8 @@
   "follow_requests.unlocked_explanation": "Mimo że Twoje konto nie jest zablokowane, zespół {domain} uznał że możesz chcieć ręcznie przejrzeć prośby o możliwość obserwacji.",
   "follow_suggestions.curated_suggestion": "Wybrane przez personel",
   "follow_suggestions.dismiss": "Nie pokazuj ponownie",
+  "follow_suggestions.featured_longer": "Wybrane przez zespół {domain}",
+  "follow_suggestions.friends_of_friends_longer": "Popularni wśród ludzi których obserwujesz",
   "follow_suggestions.hints.featured": "Ten profil został wybrany przez zespół {domain}.",
   "follow_suggestions.hints.friends_of_friends": "Ten profil jest popularny w gronie użytkowników, których obserwujesz.",
   "follow_suggestions.hints.most_followed": "Ten profil jest jednym z najczęściej obserwowanych na {domain}.",
@@ -315,6 +317,8 @@
   "follow_suggestions.hints.similar_to_recently_followed": "Ten profil jest podobny do profili ostatnio przez ciebie zaobserwowanych.",
   "follow_suggestions.personalized_suggestion": "Sugestia spersonalizowana",
   "follow_suggestions.popular_suggestion": "Sugestia popularna",
+  "follow_suggestions.popular_suggestion_longer": "Popularni na {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Podobne do ostatnio zaobserwowanych przez ciebie profilów",
   "follow_suggestions.view_all": "Pokaż wszystkie",
   "follow_suggestions.who_to_follow": "Kogo obserwować",
   "followed_tags": "Obserwowane hasztagi",
@@ -469,6 +473,15 @@
   "notification.follow": "{name} obserwuje Cię",
   "notification.follow_request": "{name} chce cię zaobserwować",
   "notification.mention": "Wspomniało o Tobie przez {name}",
+  "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.",
+  "notification.moderation_warning.action_disable": "Twoje konto zostało wyłączone.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Niektóre twoje wpisy zostały oznaczone jako wrażliwe.",
+  "notification.moderation_warning.action_none": "Twoje konto otrzymało ostrzeżenie moderacyjne.",
+  "notification.moderation_warning.action_sensitive": "Twoje wpisy będą od teraz oznaczane jako wrażliwe.",
+  "notification.moderation_warning.action_silence": "Twoje konto zostało ograniczone.",
+  "notification.moderation_warning.action_suspend": "Twoje konto zostało zawieszone.",
   "notification.own_poll": "Twoje głosowanie zakończyło się",
   "notification.poll": "Głosowanie w którym brałeś(-aś) udział zakończyło się",
   "notification.reblog": "Twój post został podbity przez {name}",
diff --git a/app/javascript/mastodon/locales/pt-PT.json b/app/javascript/mastodon/locales/pt-PT.json
index 7e98cde5fa967e..70903065da1aae 100644
--- a/app/javascript/mastodon/locales/pt-PT.json
+++ b/app/javascript/mastodon/locales/pt-PT.json
@@ -308,6 +308,8 @@
   "follow_requests.unlocked_explanation": "Apesar de a sua não ser privada, a administração de {domain} pensa que poderá querer rever manualmente os pedidos de seguimento dessas contas.",
   "follow_suggestions.curated_suggestion": "Escolha da equipe",
   "follow_suggestions.dismiss": "Não mostrar novamente",
+  "follow_suggestions.featured_longer": "Escolhido a dedo pela equipa de {domain}",
+  "follow_suggestions.friends_of_friends_longer": "Popular entre as pessoas que segue",
   "follow_suggestions.hints.featured": "Este perfil foi escolhido a dedo pela equipe {domain}.",
   "follow_suggestions.hints.friends_of_friends": "Este perfil é popular entre as pessoas que você segue.",
   "follow_suggestions.hints.most_followed": "Este perfil é um dos mais seguidos no {domain}.",
@@ -315,6 +317,8 @@
   "follow_suggestions.hints.similar_to_recently_followed": "Este perfil é semelhante aos perfis que você seguiu mais recentemente.",
   "follow_suggestions.personalized_suggestion": "Sugestão personalizada",
   "follow_suggestions.popular_suggestion": "Sugestão popular",
+  "follow_suggestions.popular_suggestion_longer": "Popular em {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Semelhantes aos perfis que seguiu recentemente",
   "follow_suggestions.view_all": "Ver tudo",
   "follow_suggestions.who_to_follow": "Quem seguir",
   "followed_tags": "Hashtags seguidas",
@@ -469,6 +473,15 @@
   "notification.follow": "{name} começou a seguir-te",
   "notification.follow_request": "{name} pediu para segui-lo",
   "notification.mention": "{name} mencionou-te",
+  "notification.moderation-warning.learn_more": "Saber mais",
+  "notification.moderation_warning": "Recebeu um aviso de moderação",
+  "notification.moderation_warning.action_delete_statuses": "Algumas das suas publicações foram removidas.",
+  "notification.moderation_warning.action_disable": "A sua conta foi desativada.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Algumas das suas publicações foram assinaladas como sensíveis.",
+  "notification.moderation_warning.action_none": "A sua conta recebeu um aviso de moderação.",
+  "notification.moderation_warning.action_sensitive": "As suas publicações serão, a partir de agora, assinaladas como sensíveis.",
+  "notification.moderation_warning.action_silence": "A sua conta foi limitada.",
+  "notification.moderation_warning.action_suspend": "A sua conta foi suspensa.",
   "notification.own_poll": "A sua votação terminou",
   "notification.poll": "Uma votação em que participaste chegou ao fim",
   "notification.reblog": "{name} reforçou a tua publicação",
diff --git a/app/javascript/mastodon/locales/sv.json b/app/javascript/mastodon/locales/sv.json
index 2b9f0a51b905c0..c2dd5297db1315 100644
--- a/app/javascript/mastodon/locales/sv.json
+++ b/app/javascript/mastodon/locales/sv.json
@@ -297,7 +297,6 @@
   "filter_modal.select_filter.subtitle": "Använd en befintlig kategori eller skapa en ny",
   "filter_modal.select_filter.title": "Filtrera detta inlägg",
   "filter_modal.title.status": "Filtrera ett inlägg",
-  "filtered_notifications_banner.mentions": "{count, plural, one {mention} other {mentions}}",
   "filtered_notifications_banner.pending_requests": "Aviseringar från {count, plural, =0 {ingen} one {en person} other {# personer}} du kanske känner",
   "filtered_notifications_banner.title": "Filtrerade aviseringar",
   "firehose.all": "Allt",
@@ -469,6 +468,11 @@
   "notification.follow": "{name} följer dig",
   "notification.follow_request": "{name} har begärt att följa dig",
   "notification.mention": "{name} nämnde dig",
+  "notification.moderation-warning.learn_more": "Läs mer",
+  "notification.moderation_warning.action_delete_statuses": "Några av dina inlägg har tagits bort.",
+  "notification.moderation_warning.action_disable": "Ditt konto har inaktiverats.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Några av dina inlägg har markerats som känsliga.",
+  "notification.moderation_warning.action_silence": "Ditt konto har begränsats.",
   "notification.own_poll": "Din röstning har avslutats",
   "notification.poll": "En omröstning du röstat i har avslutats",
   "notification.reblog": "{name} boostade ditt inlägg",
diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json
index 83fa723388b591..ab6fe0bd70f77a 100644
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@@ -308,6 +308,8 @@
   "follow_requests.unlocked_explanation": "尽管你没有锁嘟，但是 {domain} 的工作人员认为你也许会想手动审核审核这些账号的关注请求。",
   "follow_suggestions.curated_suggestion": "站务人员精选",
   "follow_suggestions.dismiss": "不再显示",
+  "follow_suggestions.featured_longer": "由 {domain} 管理团队精选",
+  "follow_suggestions.friends_of_friends_longer": "在你关注的人中很受欢迎",
   "follow_suggestions.hints.featured": "该用户已被 {domain} 管理团队精选。",
   "follow_suggestions.hints.friends_of_friends": "该用户在您关注的人中很受欢迎。",
   "follow_suggestions.hints.most_followed": "该用户是 {domain} 上关注度最高的用户之一。",
@@ -315,6 +317,8 @@
   "follow_suggestions.hints.similar_to_recently_followed": "该用户与您最近关注的用户类似。",
   "follow_suggestions.personalized_suggestion": "个性化建议",
   "follow_suggestions.popular_suggestion": "热门建议",
+  "follow_suggestions.popular_suggestion_longer": "在 {domain} 上很受欢迎",
+  "follow_suggestions.similar_to_recently_followed_longer": "与你近期关注的用户相似",
   "follow_suggestions.view_all": "查看全部",
   "follow_suggestions.who_to_follow": "推荐关注",
   "followed_tags": "关注的话题标签",
@@ -469,6 +473,15 @@
   "notification.follow": "{name} 开始关注你",
   "notification.follow_request": "{name} 向你发送了关注请求",
   "notification.mention": "{name} 提及了你",
+  "notification.moderation-warning.learn_more": "了解更多",
+  "notification.moderation_warning": "你收到了一条管理警告",
+  "notification.moderation_warning.action_delete_statuses": "你的一些嘟文已被移除。",
+  "notification.moderation_warning.action_disable": "你的账号已被禁用。",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "你的一些嘟文已被标记为敏感内容。",
+  "notification.moderation_warning.action_none": "你的账号收到了管理警告。",
+  "notification.moderation_warning.action_sensitive": "今后你的嘟文都会被标记为敏感内容。",
+  "notification.moderation_warning.action_silence": "你的账号已被限制。",
+  "notification.moderation_warning.action_suspend": "你的账号已被封禁.",
   "notification.own_poll": "你的投票已经结束",
   "notification.poll": "你参与的一个投票已经结束",
   "notification.reblog": "{name} 转发了你的嘟文",
diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json
index 33a7070a51797c..f00d62c0762483 100644
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@@ -308,6 +308,8 @@
   "follow_requests.unlocked_explanation": "即便您的帳號未被鎖定，{domain} 的管理員認為您可能想要自己審核這些帳號的跟隨請求。",
   "follow_suggestions.curated_suggestion": "精選內容",
   "follow_suggestions.dismiss": "不再顯示",
+  "follow_suggestions.featured_longer": "{domain} 團隊精選",
+  "follow_suggestions.friends_of_friends_longer": "受您跟隨之使用者愛戴的風雲人物",
   "follow_suggestions.hints.featured": "這個個人檔案是 {domain} 管理團隊精心挑選。",
   "follow_suggestions.hints.friends_of_friends": "這個個人檔案於您跟隨的帳號中很受歡迎。",
   "follow_suggestions.hints.most_followed": "這個個人檔案是 {domain} 中最受歡迎的帳號之一。",
@@ -315,6 +317,8 @@
   "follow_suggestions.hints.similar_to_recently_followed": "這個個人檔案與您最近跟隨之帳號類似。",
   "follow_suggestions.personalized_suggestion": "個人化推薦",
   "follow_suggestions.popular_suggestion": "熱門推薦",
+  "follow_suggestions.popular_suggestion_longer": "{domain} 上的人氣王",
+  "follow_suggestions.similar_to_recently_followed_longer": "與您近日跟隨相近之帳號",
   "follow_suggestions.view_all": "檢視全部",
   "follow_suggestions.who_to_follow": "推薦跟隨帳號",
   "followed_tags": "已跟隨主題標籤",
@@ -469,6 +473,15 @@
   "notification.follow": "{name} 已跟隨您",
   "notification.follow_request": "{name} 要求跟隨您",
   "notification.mention": "{name} 已提到您",
+  "notification.moderation-warning.learn_more": "了解更多",
+  "notification.moderation_warning": "您已收到管理員警告",
+  "notification.moderation_warning.action_delete_statuses": "某些您的嘟文已被刪除。",
+  "notification.moderation_warning.action_disable": "您的帳號已被停用。",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "某些您的嘟文已被標記為敏感內容。",
+  "notification.moderation_warning.action_none": "您的帳號已收到管理員警告。",
+  "notification.moderation_warning.action_sensitive": "即日起，您的嘟文將會被標記為敏感內容。",
+  "notification.moderation_warning.action_silence": "您的帳號已被限制。",
+  "notification.moderation_warning.action_suspend": "您的帳號已被停權。",
   "notification.own_poll": "您的投票已結束",
   "notification.poll": "您曾投過的投票已經結束",
   "notification.reblog": "{name} 已轉嘟您的嘟文",
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 27073ff9eececd..923682ea12ae89 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -1449,7 +1449,7 @@ de:
       cooldown: Nach dem Umzug wird es eine Weile dauern, bis du erneut umziehen darfst
       disabled_account: Dein altes Konto ist nur noch eingeschränkt nutzbar. Du kannst jedoch deine Daten exportieren und das Konto wieder reaktivieren.
       followers: Alle Follower werden vom alten zum neuen Konto übertragen
-      only_redirect_html: Alternativ kannst du auch <a href="%{path}">nur eine Weiterleitung zu deinem neuen Profil</a> einrichten, ohne die Follower zu übertragen.
+      only_redirect_html: Alternativ kannst du auch <a href="%{path}">nur eine Weiterleitung zu deinem neuen Konto</a> einrichten, ohne die Follower zu übertragen.
       other_data: Keine anderen Daten werden automatisch zum neuen Konto übertragen
       redirect: Dein altes Konto wird einen Hinweis erhalten, dass du umgezogen bist. Außerdem wird das Profil von Suchanfragen ausgeschlossen
   moderation:
@@ -1845,7 +1845,7 @@ de:
         mark_statuses_as_sensitive: Deine Beiträge von %{acct} wurden mit einer Inhaltswarnung versehen
         none: Warnung für %{acct}
         sensitive: Deine Beiträge von %{acct} werden künftig mit einer Inhaltswarnung versehen
-        silence: Dein Konto %{acct} wurde stummgeschaltet
+        silence: Dein Konto %{acct} wurde eingeschränkt
         suspend: Dein Konto %{acct} wurde gesperrt
       title:
         delete_statuses: Beiträge entfernt
diff --git a/config/locales/doorkeeper.pt-PT.yml b/config/locales/doorkeeper.pt-PT.yml
index 31f6e462784f54..0457190cda149c 100644
--- a/config/locales/doorkeeper.pt-PT.yml
+++ b/config/locales/doorkeeper.pt-PT.yml
@@ -174,6 +174,7 @@ pt-PT:
       read:filters: ver os seus filtros
       read:follows: ver quem você segue
       read:lists: ver as suas listas
+      read:me: ler apenas as informações básicas da sua conta
       read:mutes: ver os utilizadores que silenciou
       read:notifications: ver as suas notificações
       read:reports: ver as suas denúncias

From e8455948780d4c4b8d2d42fa1115fa7f7df87f7f Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 26 Apr 2024 14:42:06 +0200
Subject: [PATCH 0832/2191] Fix moderator account being exposed in account
 moderation notification (#30082)

---
 app/models/notification.rb       |  4 ++--
 spec/models/notification_spec.rb | 11 +++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/app/models/notification.rb b/app/models/notification.rb
index 7e0e62683ae15d..7cbab4dc8c3510 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -184,13 +184,13 @@ def set_from_account
     return unless new_record?
 
     case activity_type
-    when 'Status', 'Follow', 'Favourite', 'FollowRequest', 'Poll', 'Report', 'AccountWarning'
+    when 'Status', 'Follow', 'Favourite', 'FollowRequest', 'Poll', 'Report'
       self.from_account_id = activity&.account_id
     when 'Mention'
       self.from_account_id = activity&.status&.account_id
     when 'Account'
       self.from_account_id = activity&.id
-    when 'AccountRelationshipSeveranceEvent'
+    when 'AccountRelationshipSeveranceEvent', 'AccountWarning'
       # These do not really have an originating account, but this is mandatory
       # in the data model, and the recipient's account will by definition
       # always exist
diff --git a/spec/models/notification_spec.rb b/spec/models/notification_spec.rb
index 172d1c65b99f47..3c7d51ae1a3217 100644
--- a/spec/models/notification_spec.rb
+++ b/spec/models/notification_spec.rb
@@ -138,6 +138,17 @@
         expect(notification.account).to eq(account)
       end
     end
+
+    context 'when activity_type is an AccountWarning' do
+      it 'sets the notification from_account to the recipient of the notification' do
+        account = Fabricate(:account)
+        account_warning = Fabricate(:account_warning, target_account: account)
+
+        notification = Fabricate.build(:notification, activity_type: 'AccountWarning', activity: account_warning, account: account)
+
+        expect(notification.from_account).to eq(account)
+      end
+    end
   end
 
   describe '.preload_cache_collection_target_statuses' do

From 91ca90e25b2de95ef44dc149866b16df2663e205 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 26 Apr 2024 15:19:02 +0200
Subject: [PATCH 0833/2191] Fix Idempotency-Key ignored when scheduling a post
 (#30084)

---
 app/services/post_status_service.rb       | 4 ++--
 spec/services/post_status_service_spec.rb | 7 +++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/services/post_status_service.rb b/app/services/post_status_service.rb
index 8aa43ab2452ed4..22a6a24afd2e23 100644
--- a/app/services/post_status_service.rb
+++ b/app/services/post_status_service.rb
@@ -160,7 +160,7 @@ def idempotency_given?
 
   def idempotency_duplicate
     if scheduled?
-      @account.schedule_statuses.find(@idempotency_duplicate)
+      @account.scheduled_statuses.find(@idempotency_duplicate)
     else
       @account.statuses.find(@idempotency_duplicate)
     end
@@ -211,7 +211,7 @@ def poll_attributes
   end
 
   def scheduled_options
-    @options.tap do |options_hash|
+    @options.dup.tap do |options_hash|
       options_hash[:in_reply_to_id]  = options_hash.delete(:thread)&.id
       options_hash[:application_id]  = options_hash.delete(:application)&.id
       options_hash[:scheduled_at]    = nil
diff --git a/spec/services/post_status_service_spec.rb b/spec/services/post_status_service_spec.rb
index 3c2e4f3a79c193..18891bf118646a 100644
--- a/spec/services/post_status_service_spec.rb
+++ b/spec/services/post_status_service_spec.rb
@@ -54,6 +54,13 @@
         .to not_change { account.statuses_count }
         .and(not_change { previous_status.replies_count })
     end
+
+    it 'returns existing status when used twice with idempotency key' do
+      account = Fabricate(:account)
+      status1 = subject.call(account, text: 'test', idempotency: 'meepmeep', scheduled_at: future)
+      status2 = subject.call(account, text: 'test', idempotency: 'meepmeep', scheduled_at: future)
+      expect(status2.id).to eq status1.id
+    end
   end
 
   it 'creates response to the original status of boost' do

From ac82f34f7dd87a45860dd206e4244ae39c2d449e Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 26 Apr 2024 16:49:54 +0200
Subject: [PATCH 0834/2191] Update dependency pino to v9 (#30057)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 streaming/package.json |  2 +-
 yarn.lock              | 41 +++++++++++++++++++++++++++++++----------
 2 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/streaming/package.json b/streaming/package.json
index f90a1e4404642e..a0e7d96bb5ba31 100644
--- a/streaming/package.json
+++ b/streaming/package.json
@@ -24,7 +24,7 @@
     "jsdom": "^24.0.0",
     "pg": "^8.5.0",
     "pg-connection-string": "^2.6.0",
-    "pino": "^8.17.2",
+    "pino": "^9.0.0",
     "pino-http": "^9.0.0",
     "prom-client": "^15.0.0",
     "uuid": "^9.0.0",
diff --git a/yarn.lock b/yarn.lock
index b9f1c3d4d5f599..c8a9476f257c09 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2904,7 +2904,7 @@ __metadata:
     jsdom: "npm:^24.0.0"
     pg: "npm:^8.5.0"
     pg-connection-string: "npm:^2.6.0"
-    pino: "npm:^8.17.2"
+    pino: "npm:^9.0.0"
     pino-http: "npm:^9.0.0"
     pino-pretty: "npm:^11.0.0"
     prom-client: "npm:^15.0.0"
@@ -12920,13 +12920,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pino-abstract-transport@npm:^1.0.0, pino-abstract-transport@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "pino-abstract-transport@npm:1.1.0"
+"pino-abstract-transport@npm:^1.0.0, pino-abstract-transport@npm:^1.1.0, pino-abstract-transport@npm:^1.2.0":
+  version: 1.2.0
+  resolution: "pino-abstract-transport@npm:1.2.0"
   dependencies:
     readable-stream: "npm:^4.0.0"
     split2: "npm:^4.0.0"
-  checksum: 10c0/6e9b9d5a2c0a37f91ecaf224d335daae1ae682b1c79a05b06ef9e0f0a5d289f8e597992217efc857796dae6f1067e9b4882f95c6228ff433ddc153532cae8aca
+  checksum: 10c0/b4ab59529b7a91f488440147fc58ee0827a6c1c5ca3627292339354b1381072c1a6bfa9b46d03ad27872589e8477ecf74da12cf286e1e6b665ac64a3b806bf07
   languageName: node
   linkType: hard
 
@@ -12973,7 +12973,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pino@npm:^8.17.1, pino@npm:^8.17.2":
+"pino@npm:^8.17.1":
   version: 8.20.0
   resolution: "pino@npm:8.20.0"
   dependencies:
@@ -12994,6 +12994,27 @@ __metadata:
   languageName: node
   linkType: hard
 
+"pino@npm:^9.0.0":
+  version: 9.0.0
+  resolution: "pino@npm:9.0.0"
+  dependencies:
+    atomic-sleep: "npm:^1.0.0"
+    fast-redact: "npm:^3.1.1"
+    on-exit-leak-free: "npm:^2.1.0"
+    pino-abstract-transport: "npm:^1.2.0"
+    pino-std-serializers: "npm:^6.0.0"
+    process-warning: "npm:^3.0.0"
+    quick-format-unescaped: "npm:^4.0.3"
+    real-require: "npm:^0.2.0"
+    safe-stable-stringify: "npm:^2.3.1"
+    sonic-boom: "npm:^3.7.0"
+    thread-stream: "npm:^2.6.0"
+  bin:
+    pino: bin.js
+  checksum: 10c0/10ef10aee0cf80af8ed83468cff2e29d642b6794b53cf641e1abcaf9e9958d8bcbc6e09d62757054aef3b4415c45d66a5018da11d43b81a23ba299ef5dc4e8b1
+  languageName: node
+  linkType: hard
+
 "pirates@npm:^4.0.4":
   version: 4.0.6
   resolution: "pirates@npm:4.0.6"
@@ -16703,12 +16724,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"thread-stream@npm:^2.0.0":
-  version: 2.4.1
-  resolution: "thread-stream@npm:2.4.1"
+"thread-stream@npm:^2.0.0, thread-stream@npm:^2.6.0":
+  version: 2.6.0
+  resolution: "thread-stream@npm:2.6.0"
   dependencies:
     real-require: "npm:^0.2.0"
-  checksum: 10c0/ce29265810b9550ce896726301ff006ebfe96b90292728f07cfa4c379740585583046e2a8018afc53aca66b18fed12b33a84f3883e7ebc317185f6682898b8f8
+  checksum: 10c0/276e2545b33273232eb2c22c53fc11844951c1322f8a78c522477af716ebcfe0d106ccf1fbc455f6e48d928e93231fed6377ce91fdcb3885086e8ffa1f011c88
   languageName: node
   linkType: hard
 

From b67b61b963df686ccdb9f69d8600090e3d88e5a3 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 26 Apr 2024 10:50:39 -0400
Subject: [PATCH 0835/2191] Ignore dotenv *.local files (#29932)

---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index 2f94b751ab7f79..a70f30f952854e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -68,3 +68,6 @@ yarn-debug.log
 
 # Ignore Docker option files
 docker-compose.override.yml
+
+# Ignore dotenv .local files
+.env*.local

From bb8c6346fbedc67b6ce447deb9cc2efa16fad70a Mon Sep 17 00:00:00 2001
From: Michael Stanclift <mx@vmstan.com>
Date: Fri, 26 Apr 2024 10:17:41 -0500
Subject: [PATCH 0836/2191] Reword and rearrange Content Retention page
 (#27733)

---
 .../admin/settings/content_retention/show.html.haml    | 10 +++++++---
 config/locales/en.yml                                  |  1 +
 config/locales/simple_form.en.yml                      |  8 ++++----
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/app/views/admin/settings/content_retention/show.html.haml b/app/views/admin/settings/content_retention/show.html.haml
index 4b2ee572e31fc3..57485c1108ff3e 100644
--- a/app/views/admin/settings/content_retention/show.html.haml
+++ b/app/views/admin/settings/content_retention/show.html.haml
@@ -14,14 +14,18 @@
     = f.input :media_cache_retention_period,
               input_html: { pattern: '[0-9]+' },
               wrapper: :with_block_label
+    = f.input :backups_retention_period,
+              input_html: { pattern: '[0-9]+' },
+              wrapper: :with_block_label
+
+  %h4= t('admin.settings.content_retention.danger_zone')
+
+  .fields-group
     = f.input :content_cache_retention_period,
               hint: false,
               input_html: { pattern: '[0-9]+' },
               warning_hint: t('simple_form.hints.form_admin_settings.content_cache_retention_period'),
               wrapper: :with_block_label
-    = f.input :backups_retention_period,
-              input_html: { pattern: '[0-9]+' },
-              wrapper: :with_block_label
 
   .actions
     = f.button :button, t('generic.save_changes'), type: :submit
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 6cd996594d9ac2..446d06f0d1f1d5 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -751,6 +751,7 @@ en:
         desc_html: This relies on external scripts from hCaptcha, which may be a security and privacy concern. In addition, <strong>this can make the registration process significantly less accessible to some (especially disabled) people</strong>. For these reasons, please consider alternative measures such as approval-based or invite-based registration.
         title: Require new users to solve a CAPTCHA to confirm their account
       content_retention:
+        danger_zone: Danger zone
         preamble: Control how user-generated content is stored in Mastodon.
         title: Content retention
       default_noindex:
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml
index 4ba6e88f418183..7304bdc22f8e81 100644
--- a/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@@ -77,13 +77,13 @@ en:
           warn: Hide the filtered content behind a warning mentioning the filter's title
       form_admin_settings:
         activity_api_enabled: Counts of locally published posts, active users, and new registrations in weekly buckets
-        backups_retention_period: Keep generated user archives for the specified number of days.
+        backups_retention_period: Users have the ability to generate archives of their posts to download later. When set to a positive value, these archives will be automatically deleted from your storage after the specified number of days.
         bootstrap_timeline_accounts: These accounts will be pinned to the top of new users' follow recommendations.
         closed_registrations_message: Displayed when sign-ups are closed
-        content_cache_retention_period: All posts and boosts from other servers will be deleted after the specified number of days. Some posts may not be recoverable. All related bookmarks, favourites and boosts will also be lost and impossible to undo.
+        content_cache_retention_period: All posts from other servers (including boosts and replies) will be deleted after the specified number of days, without regard to any local user interaction with those posts. This includes posts where a local user has marked it as bookmarks or favorites. Private mentions between users from different instances will also be lost and impossible to restore. Use of this setting is intended for special purpose instances and breaks many user expectations when implemented for general purpose use.
         custom_css: You can apply custom styles on the web version of Mastodon.
         mascot: Overrides the illustration in the advanced web interface.
-        media_cache_retention_period: Downloaded media files will be deleted after the specified number of days when set to a positive value, and re-downloaded on demand.
+        media_cache_retention_period: Media files from posts made by remote users are cached on your server. When set to a positive value, media will be deleted after the specified number of days. If the media data is requested after it is deleted, it will be re-downloaded, if the source content is still available. Due to restrictions on how often link preview cards poll third-party sites, it is recommended to set this value to at least 14 days, or link preview cards will not be updated on demand before that time.
         peers_api_enabled: A list of domain names this server has encountered in the fediverse. No data is included here about whether you federate with a given server, just that your server knows about it. This is used by services that collect statistics on federation in a general sense.
         profile_directory: The profile directory lists all users who have opted-in to be discoverable.
         require_invite_text: When sign-ups require manual approval, make the “Why do you want to join?” text input mandatory rather than optional
@@ -243,7 +243,7 @@ en:
         backups_retention_period: User archive retention period
         bootstrap_timeline_accounts: Always recommend these accounts to new users
         closed_registrations_message: Custom message when sign-ups are not available
-        content_cache_retention_period: Content cache retention period
+        content_cache_retention_period: Remote content retention period
         custom_css: Custom CSS
         mascot: Custom mascot (legacy)
         media_cache_retention_period: Media cache retention period

From 17e0a31fe3b1bdfd5f4fd950ea6641f23b2b3a99 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 26 Apr 2024 17:32:38 +0200
Subject: [PATCH 0837/2191] Update dependency cssnano to v7 (#30061)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 package.json |   2 +-
 yarn.lock    | 324 +++++++++++++++++++++++++--------------------------
 2 files changed, 163 insertions(+), 163 deletions(-)

diff --git a/package.json b/package.json
index 787ca3600c0b64..0b5c3484d2a6c9 100644
--- a/package.json
+++ b/package.json
@@ -66,7 +66,7 @@
     "core-js": "^3.30.2",
     "cross-env": "^7.0.3",
     "css-loader": "^5.2.7",
-    "cssnano": "^6.0.1",
+    "cssnano": "^7.0.0",
     "detect-passive-events": "^2.0.3",
     "emoji-mart": "npm:emoji-mart-lazyload@latest",
     "escape-html": "^1.0.3",
diff --git a/yarn.lock b/yarn.lock
index c8a9476f257c09..0b60c39c91c911 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2787,7 +2787,7 @@ __metadata:
     core-js: "npm:^3.30.2"
     cross-env: "npm:^7.0.3"
     css-loader: "npm:^5.2.7"
-    cssnano: "npm:^6.0.1"
+    cssnano: "npm:^7.0.0"
     detect-passive-events: "npm:^2.0.3"
     emoji-mart: "npm:emoji-mart-lazyload@latest"
     escape-html: "npm:^1.0.3"
@@ -6659,64 +6659,64 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cssnano-preset-default@npm:^6.1.2":
-  version: 6.1.2
-  resolution: "cssnano-preset-default@npm:6.1.2"
+"cssnano-preset-default@npm:^7.0.1":
+  version: 7.0.1
+  resolution: "cssnano-preset-default@npm:7.0.1"
   dependencies:
     browserslist: "npm:^4.23.0"
     css-declaration-sorter: "npm:^7.2.0"
-    cssnano-utils: "npm:^4.0.2"
-    postcss-calc: "npm:^9.0.1"
-    postcss-colormin: "npm:^6.1.0"
-    postcss-convert-values: "npm:^6.1.0"
-    postcss-discard-comments: "npm:^6.0.2"
-    postcss-discard-duplicates: "npm:^6.0.3"
-    postcss-discard-empty: "npm:^6.0.3"
-    postcss-discard-overridden: "npm:^6.0.2"
-    postcss-merge-longhand: "npm:^6.0.5"
-    postcss-merge-rules: "npm:^6.1.1"
-    postcss-minify-font-values: "npm:^6.1.0"
-    postcss-minify-gradients: "npm:^6.0.3"
-    postcss-minify-params: "npm:^6.1.0"
-    postcss-minify-selectors: "npm:^6.0.4"
-    postcss-normalize-charset: "npm:^6.0.2"
-    postcss-normalize-display-values: "npm:^6.0.2"
-    postcss-normalize-positions: "npm:^6.0.2"
-    postcss-normalize-repeat-style: "npm:^6.0.2"
-    postcss-normalize-string: "npm:^6.0.2"
-    postcss-normalize-timing-functions: "npm:^6.0.2"
-    postcss-normalize-unicode: "npm:^6.1.0"
-    postcss-normalize-url: "npm:^6.0.2"
-    postcss-normalize-whitespace: "npm:^6.0.2"
-    postcss-ordered-values: "npm:^6.0.2"
-    postcss-reduce-initial: "npm:^6.1.0"
-    postcss-reduce-transforms: "npm:^6.0.2"
-    postcss-svgo: "npm:^6.0.3"
-    postcss-unique-selectors: "npm:^6.0.4"
+    cssnano-utils: "npm:^5.0.0"
+    postcss-calc: "npm:^10.0.0"
+    postcss-colormin: "npm:^7.0.0"
+    postcss-convert-values: "npm:^7.0.0"
+    postcss-discard-comments: "npm:^7.0.0"
+    postcss-discard-duplicates: "npm:^7.0.0"
+    postcss-discard-empty: "npm:^7.0.0"
+    postcss-discard-overridden: "npm:^7.0.0"
+    postcss-merge-longhand: "npm:^7.0.0"
+    postcss-merge-rules: "npm:^7.0.0"
+    postcss-minify-font-values: "npm:^7.0.0"
+    postcss-minify-gradients: "npm:^7.0.0"
+    postcss-minify-params: "npm:^7.0.0"
+    postcss-minify-selectors: "npm:^7.0.0"
+    postcss-normalize-charset: "npm:^7.0.0"
+    postcss-normalize-display-values: "npm:^7.0.0"
+    postcss-normalize-positions: "npm:^7.0.0"
+    postcss-normalize-repeat-style: "npm:^7.0.0"
+    postcss-normalize-string: "npm:^7.0.0"
+    postcss-normalize-timing-functions: "npm:^7.0.0"
+    postcss-normalize-unicode: "npm:^7.0.0"
+    postcss-normalize-url: "npm:^7.0.0"
+    postcss-normalize-whitespace: "npm:^7.0.0"
+    postcss-ordered-values: "npm:^7.0.0"
+    postcss-reduce-initial: "npm:^7.0.0"
+    postcss-reduce-transforms: "npm:^7.0.0"
+    postcss-svgo: "npm:^7.0.0"
+    postcss-unique-selectors: "npm:^7.0.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/af99021f936763850f5f35dc9e6a9dfb0da30856dea36e0420b011da2a447099471db2a5f3d1f5f52c0489da186caf9a439d8f048a80f82617077efb018333fa
+  checksum: 10c0/bee65239d25de2ba87e85b4091cbc1cac9ba1b57c9f803dff5a71ea8a55a885045805840dd732be284c28cca6343dece37fc76d7096aba37cfa02eff2ee7714c
   languageName: node
   linkType: hard
 
-"cssnano-utils@npm:^4.0.2":
-  version: 4.0.2
-  resolution: "cssnano-utils@npm:4.0.2"
+"cssnano-utils@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "cssnano-utils@npm:5.0.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/260b8c8ffa48b908aa77ef129f9b8648ecd92aed405b20e7fe6b8370779dd603530344fc9d96683d53533246e48b36ac9d2aa5a476b4f81c547bbad86d187f35
+  checksum: 10c0/492593fb45151e8622357bb958d0d80475372de38523ef0587d77e9c5f386beb55c30b41f2f3c735a374a230bc61404eb7ae9c2beeab0666afb499442c62ecba
   languageName: node
   linkType: hard
 
-"cssnano@npm:^6.0.1":
-  version: 6.1.2
-  resolution: "cssnano@npm:6.1.2"
+"cssnano@npm:^7.0.0":
+  version: 7.0.1
+  resolution: "cssnano@npm:7.0.1"
   dependencies:
-    cssnano-preset-default: "npm:^6.1.2"
+    cssnano-preset-default: "npm:^7.0.1"
     lilconfig: "npm:^3.1.1"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/4df0dc0389b34b38acb09b7cfb07267b0eda95349c6d5e9b7666acc7200bb33359650869a60168e9d878298b05f4ad2c7f070815c90551720a3f4e1037f79691
+  checksum: 10c0/8b17d13efe98ec2db2fbde9ca24e91842b9afe2f80becc5e4271ee1170d77cf73eed3cdc2f35ed51bacdeac763ff85db45ae8e9627a8862bf01d457a819a640e
   languageName: node
   linkType: hard
 
@@ -13076,15 +13076,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-calc@npm:^9.0.1":
-  version: 9.0.1
-  resolution: "postcss-calc@npm:9.0.1"
+"postcss-calc@npm:^10.0.0":
+  version: 10.0.0
+  resolution: "postcss-calc@npm:10.0.0"
   dependencies:
-    postcss-selector-parser: "npm:^6.0.11"
+    postcss-selector-parser: "npm:^6.0.16"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
-    postcss: ^8.2.2
-  checksum: 10c0/e0df07337162dbcaac5d6e030c7fd289e21da8766a9daca5d6b2b3c8094bb524ae5d74c70048ea7fe5fe4960ce048c60ac97922d917c3bbff34f58e9d2b0eb0e
+    postcss: ^8.4.38
+  checksum: 10c0/d4d529f2f71b49f17441eed74a7564ccd2779c72ed8648d4bb2530261a27c0ca01fe6a07260e7bf57e55f46dd68dea07e52fd1a6b538db7bc13015124be258a5
   languageName: node
   linkType: hard
 
@@ -13138,9 +13138,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-colormin@npm:^6.1.0":
-  version: 6.1.0
-  resolution: "postcss-colormin@npm:6.1.0"
+"postcss-colormin@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-colormin@npm:7.0.0"
   dependencies:
     browserslist: "npm:^4.23.0"
     caniuse-api: "npm:^3.0.0"
@@ -13148,19 +13148,19 @@ __metadata:
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/0802963fa0d8f2fe408b2e088117670f5303c69a58c135f0ecf0e5ceff69e95e87111b22c4e29c9adb2f69aa8d3bc175f4e8e8708eeb99c9ffc36c17064de427
+  checksum: 10c0/d365a5365e0a94748309d32c7208cd06249bc53eb82cc32c771de4073b109fa8552e58d60dbe84d7e69e68081ed8a01fbf645d38a650e90cb2e13b21043cd796
   languageName: node
   linkType: hard
 
-"postcss-convert-values@npm:^6.1.0":
-  version: 6.1.0
-  resolution: "postcss-convert-values@npm:6.1.0"
+"postcss-convert-values@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-convert-values@npm:7.0.0"
   dependencies:
     browserslist: "npm:^4.23.0"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/a80066965cb58fe8fcaf79f306b32c83fc678e1f0678e43f4db3e9fee06eed6db92cf30631ad348a17492769d44757400493c91a33ee865ee8dedea9234a11f5
+  checksum: 10c0/5d7cfa06f307e024574a1842016f006691e0c1932352f53a99ce8f2f9930c64c3c1ae17518e9e4e5176630b99f1beaab37bc339bc779fb07dc543670ae66bb21
   languageName: node
   linkType: hard
 
@@ -13218,39 +13218,39 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-discard-comments@npm:^6.0.2":
-  version: 6.0.2
-  resolution: "postcss-discard-comments@npm:6.0.2"
+"postcss-discard-comments@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-discard-comments@npm:7.0.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/338a1fcba7e2314d956e5e5b9bd1e12e6541991bf85ac72aed6e229a029bf60edb31f11576b677623576169aa7d9c75e1be259ac7b50d0b735b841b5518f9da9
+  checksum: 10c0/7fef7deea85c1e68161f69057be19a3aedd54d23c9b464c9b1531faa7a115f0c96a4f0ee3a560ce300578599dbc8114fe0fb744208b20b9d2fd8df1b4b39c58a
   languageName: node
   linkType: hard
 
-"postcss-discard-duplicates@npm:^6.0.3":
-  version: 6.0.3
-  resolution: "postcss-discard-duplicates@npm:6.0.3"
+"postcss-discard-duplicates@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-discard-duplicates@npm:7.0.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/24d2f00e54668f2837eb38a64b1751d7a4a73b2752f9749e61eb728f1fae837984bc2b339f7f5207aff5f66f72551253489114b59b9ba21782072677a81d7d1b
+  checksum: 10c0/37d568dc18d47b8b9f0fd6d5115b1faf96c2bf429fc4586508a773533479e18627d6260cad6a3ca7d3bfc2f220fd9448410aee40e07f2ec6c6f96bbe3595dbc8
   languageName: node
   linkType: hard
 
-"postcss-discard-empty@npm:^6.0.3":
-  version: 6.0.3
-  resolution: "postcss-discard-empty@npm:6.0.3"
+"postcss-discard-empty@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-discard-empty@npm:7.0.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/1af08bb29f18eda41edf3602b257d89a4cf0a16f79fc773cfebd4a37251f8dbd9b77ac18efe55d0677d000b43a8adf2ef9328d31961c810e9433a38494a1fa65
+  checksum: 10c0/b54fc9ad59a6015f6b82b8c826717a4a2f82b272608f6ae37a0b568f4f6c503f5ac7d13d415853a946a0422cb37b9fe1d5ddcee91fe0c2086001138710600d8b
   languageName: node
   linkType: hard
 
-"postcss-discard-overridden@npm:^6.0.2":
-  version: 6.0.2
-  resolution: "postcss-discard-overridden@npm:6.0.2"
+"postcss-discard-overridden@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-discard-overridden@npm:7.0.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/fda70ef3cd4cb508369c5bbbae44d7760c40ec9f2e65df1cd1b6e0314317fb1d25ae7f64987ca84e66889c1e9d1862487a6ce391c159dfe04d536597bfc5030d
+  checksum: 10c0/ca00ed1d4e8793fc780039f235fa2caef123d3aa28cae47cc1472ca03b21386c39fae1f11fbf319dcb94c6bda923824067254c7e20e8b00354b47015dc754658
   languageName: node
   linkType: hard
 
@@ -13368,77 +13368,77 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-merge-longhand@npm:^6.0.5":
-  version: 6.0.5
-  resolution: "postcss-merge-longhand@npm:6.0.5"
+"postcss-merge-longhand@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-merge-longhand@npm:7.0.0"
   dependencies:
     postcss-value-parser: "npm:^4.2.0"
-    stylehacks: "npm:^6.1.1"
+    stylehacks: "npm:^7.0.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/5a223a7f698c05ab42e9997108a7ff27ea1e0c33a11a353d65a04fc89c3b5b750b9e749550d76b6406329117a055adfc79dde7fee48dca5c8e167a2854ae3fea
+  checksum: 10c0/5f814f396a5107dcb5e74c2d4e55ebcd03b9bc2b3619ed7aea63a441854023ce349bc371d30aec1ac33a375139afac02709e7721e055b5e624701ac6576e8a10
   languageName: node
   linkType: hard
 
-"postcss-merge-rules@npm:^6.1.1":
-  version: 6.1.1
-  resolution: "postcss-merge-rules@npm:6.1.1"
+"postcss-merge-rules@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-merge-rules@npm:7.0.0"
   dependencies:
     browserslist: "npm:^4.23.0"
     caniuse-api: "npm:^3.0.0"
-    cssnano-utils: "npm:^4.0.2"
+    cssnano-utils: "npm:^5.0.0"
     postcss-selector-parser: "npm:^6.0.16"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/6d8952dbb19b1e59bf5affe0871fa1be6515103466857cff5af879d6cf619659f8642ec7a931cabb7cdbd393d8c1e91748bf70bee70fa3edea010d4e25786d04
+  checksum: 10c0/d9cb3a4e55db57aa7ba0bb1caefb82db93c8493d2b3db66091dae9d5794ca04729e660115765ff254d0eb960e4db037f6c5b92562b396b05216888d12acc08e0
   languageName: node
   linkType: hard
 
-"postcss-minify-font-values@npm:^6.1.0":
-  version: 6.1.0
-  resolution: "postcss-minify-font-values@npm:6.1.0"
+"postcss-minify-font-values@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-minify-font-values@npm:7.0.0"
   dependencies:
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/0d6567170c22a7db42096b5eac298f041614890fbe01759a9fa5ccda432f2bb09efd399d92c11bf6675ae13ccd259db4602fad3c358317dee421df5f7ab0a003
+  checksum: 10c0/f8be40099a6986d96b9cd2eb9c32a9c681efc6ecd6504c9ab7e01feb9e688c8b9656dfd7f35aa6de2585a86d607f62152ee81d0175e712e4658d184d25f63d58
   languageName: node
   linkType: hard
 
-"postcss-minify-gradients@npm:^6.0.3":
-  version: 6.0.3
-  resolution: "postcss-minify-gradients@npm:6.0.3"
+"postcss-minify-gradients@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-minify-gradients@npm:7.0.0"
   dependencies:
     colord: "npm:^2.9.3"
-    cssnano-utils: "npm:^4.0.2"
+    cssnano-utils: "npm:^5.0.0"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/7fcbcec94fe5455b89fe1b424a451198e60e0407c894bbacdc062d9fdef2f8571b483b5c3bb17f22d2f1249431251b2de22e1e4e8b0614d10624f8ee6e71afd2
+  checksum: 10c0/15d162192b598242e14def81a62e30cf273ab14f1db702c391e6bdd442c570a1aa76fc326874253a2d67f75b4d4fe73ba4f664e85dbff883f24b7090c340bfad
   languageName: node
   linkType: hard
 
-"postcss-minify-params@npm:^6.1.0":
-  version: 6.1.0
-  resolution: "postcss-minify-params@npm:6.1.0"
+"postcss-minify-params@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-minify-params@npm:7.0.0"
   dependencies:
     browserslist: "npm:^4.23.0"
-    cssnano-utils: "npm:^4.0.2"
+    cssnano-utils: "npm:^5.0.0"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/e5c38c3e5fb42e2ca165764f983716e57d854a63a477f7389ccc94cd2ab8123707006613bd7f29acc6eafd296fff513aa6d869c98ac52590f886d641cb21a59e
+  checksum: 10c0/28a7ae313a197aeaff8b3fa1e695a6443b11a74258374a05adee6a1b05f5849ef52037b7a5069d6910614b03b4610acdaf4a76f38b89cb42e813a8cb5ec2fc01
   languageName: node
   linkType: hard
 
-"postcss-minify-selectors@npm:^6.0.4":
-  version: 6.0.4
-  resolution: "postcss-minify-selectors@npm:6.0.4"
+"postcss-minify-selectors@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-minify-selectors@npm:7.0.0"
   dependencies:
     postcss-selector-parser: "npm:^6.0.16"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/695ec2e1e3a7812b0cabe1105d0ed491760be3d8e9433914fb5af1fc30a84e6dc24089cd31b7e300de620b8e7adf806526c1acf8dd14077a7d1d2820c60a327c
+  checksum: 10c0/6baf0ea71b8dfd01bdb5b516d01aa00244c55cad8d9c674358d735cef2a6aca6586dd480d419cc8d3f470e6d2d7d19354592044f19766993caf9800d3d7e0d36
   languageName: node
   linkType: hard
 
@@ -13499,101 +13499,101 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-normalize-charset@npm:^6.0.2":
-  version: 6.0.2
-  resolution: "postcss-normalize-charset@npm:6.0.2"
+"postcss-normalize-charset@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-normalize-charset@npm:7.0.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/af32a3b4cf94163d728b8aa935b2494c9f69fbc96a33b35f67ae15dbdef7fcc8732569df97cbaaf20ca6c0103c39adad0cfce2ba07ffed283796787f6c36f410
+  checksum: 10c0/06d9c4487a4b0e195133a1fb7a115db7014e49d2567cce73e24c59f473f0e65a1999850a726afb3bdb2d36017a3e5c92ac4fd2a7ecc427da4ff79522765fabdd
   languageName: node
   linkType: hard
 
-"postcss-normalize-display-values@npm:^6.0.2":
-  version: 6.0.2
-  resolution: "postcss-normalize-display-values@npm:6.0.2"
+"postcss-normalize-display-values@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-normalize-display-values@npm:7.0.0"
   dependencies:
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/782761850c7e697fdb6c3ff53076de716a71b60f9e835efb2f7ef238de347c88b5d55f0d43cf5c608e1ee58de65360e3d9fccd5f20774bba08ded7c87d8a5651
+  checksum: 10c0/439524e1d3ed36d6265c05da10540e17aa8605e1b396f71ca4364ab3b8b98ca97763c58c211fb9492662429d43613a7fe7009a8638c84a8db327e572c382272a
   languageName: node
   linkType: hard
 
-"postcss-normalize-positions@npm:^6.0.2":
-  version: 6.0.2
-  resolution: "postcss-normalize-positions@npm:6.0.2"
+"postcss-normalize-positions@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-normalize-positions@npm:7.0.0"
   dependencies:
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/9fdd42a47226bbda5f68774f3c4c3a90eb4fa708aef5a997c6a52fe6cac06585c9774038fe3bc1aa86a203c29223b8d8db6ebe7580c1aa293154f2b48db0b038
+  checksum: 10c0/428763c937cd178c8ee544cd93a9d1fef667dc9a8700ffe2e61b0beeea7f64f712492b9aeb8a1ef927ab752ec34be7ddeb23d2b50e4bc6eba02b0e58312b27a7
   languageName: node
   linkType: hard
 
-"postcss-normalize-repeat-style@npm:^6.0.2":
-  version: 6.0.2
-  resolution: "postcss-normalize-repeat-style@npm:6.0.2"
+"postcss-normalize-repeat-style@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-normalize-repeat-style@npm:7.0.0"
   dependencies:
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/9133ccbdf1286920c1cd0d01c1c5fa0bd3251b717f2f3e47d691dcc44978ac1dc419d20d9ae5428bd48ee542059e66b823ba699356f5968ccced5606c7c7ca34
+  checksum: 10c0/cf7cd9f355fd26f1c9b0c11a923029ac5ea3020520db5a9778dd19c5ee1f48a1f1f368b4ae75fc6b63cb5761eef72333e486ab0de1537b9cb62d213a8c5576d0
   languageName: node
   linkType: hard
 
-"postcss-normalize-string@npm:^6.0.2":
-  version: 6.0.2
-  resolution: "postcss-normalize-string@npm:6.0.2"
+"postcss-normalize-string@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-normalize-string@npm:7.0.0"
   dependencies:
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/fecc2d52c4029b24fecf2ca2fb45df5dbdf9f35012194ad4ea80bc7be3252cdcb21a0976400902320595aa6178f2cc625cc804c6b6740aef6efa42105973a205
+  checksum: 10c0/8857563f85841ce432bb9a5a9ba129847890b61693adff96d565b69dc2d5456f54dec33f4f6ce5b0abf0a484dbfb0145846d99f988959c5ac875a86a2a180576
   languageName: node
   linkType: hard
 
-"postcss-normalize-timing-functions@npm:^6.0.2":
-  version: 6.0.2
-  resolution: "postcss-normalize-timing-functions@npm:6.0.2"
+"postcss-normalize-timing-functions@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-normalize-timing-functions@npm:7.0.0"
   dependencies:
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/a22af0b3374704e59ae70bbbcc66b7029137e284f04e30a2ad548818d1540d6c1ed748dd8f689b9b6df5c1064085a00ad07b6f7e25ffaad49d4e661b616cdeae
+  checksum: 10c0/bc5f6999b4c9e28e5be785ef90fe68fd48d44059ecc73ee194c2603260597d685b13a1e1751df9a2cee100fea7abb7e1b1cbcf1a7a428a576961705c9d426788
   languageName: node
   linkType: hard
 
-"postcss-normalize-unicode@npm:^6.1.0":
-  version: 6.1.0
-  resolution: "postcss-normalize-unicode@npm:6.1.0"
+"postcss-normalize-unicode@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-normalize-unicode@npm:7.0.0"
   dependencies:
     browserslist: "npm:^4.23.0"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/ff5746670d94dd97b49a0955c3c71ff516fb4f54bbae257f877d179bacc44a62e50a0fd6e7ddf959f2ca35c335de4266b0c275d880bb57ad7827189339ab1582
+  checksum: 10c0/f2d6ab0076c006dcf3ed33ba30686f2d29e81a408c66acced22e2c942df6d613697ea786137833dd258aafab5fda4d3eb27df13a82df830357dbad9b79154881
   languageName: node
   linkType: hard
 
-"postcss-normalize-url@npm:^6.0.2":
-  version: 6.0.2
-  resolution: "postcss-normalize-url@npm:6.0.2"
+"postcss-normalize-url@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-normalize-url@npm:7.0.0"
   dependencies:
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/4718f1c0657788d2c560b340ee8e0a4eb3eb053eba6fbbf489e9a6e739b4c5f9ce1957f54bd03497c50a1f39962bf6ab9ff6ba4976b69dd160f6afd1670d69b7
+  checksum: 10c0/3050e228be48fe0121d1316c267e629b232e8401a547128d142c3dea55eeae1e232c9beeea5c76439009188993b14925c5cf40e3a44856d076a7b8fcf4721f86
   languageName: node
   linkType: hard
 
-"postcss-normalize-whitespace@npm:^6.0.2":
-  version: 6.0.2
-  resolution: "postcss-normalize-whitespace@npm:6.0.2"
+"postcss-normalize-whitespace@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-normalize-whitespace@npm:7.0.0"
   dependencies:
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/d5275a88e29a894aeb83a2a833e816d2456dbf3f39961628df596ce205dcc4895186a023812ff691945e0804241ccc53e520d16591b5812288474b474bbaf652
+  checksum: 10c0/8d61234962a4850fc61292592171e1d13de2e90d96a2eaed8c85672a05caceda02a3bd1cb495cb72414741f99d50083362df14923efaca1b3e09657d24cea34b
   languageName: node
   linkType: hard
 
@@ -13606,15 +13606,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-ordered-values@npm:^6.0.2":
-  version: 6.0.2
-  resolution: "postcss-ordered-values@npm:6.0.2"
+"postcss-ordered-values@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-ordered-values@npm:7.0.0"
   dependencies:
-    cssnano-utils: "npm:^4.0.2"
+    cssnano-utils: "npm:^5.0.0"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/aece23a289228aa804217a85f8da198d22b9123f02ca1310b81834af380d6fbe115e4300683599b4a2ab7f1c6a1dbd6789724c47c38e2b0a3774f2ea4b4f0963
+  checksum: 10c0/42b14f9518b573318594c2aeb2f13fd1fbe44936d14f1b28a438e7a82644ace9a2946699bebfe7a2d383534dc24e7203c35308d749f3c585a86daa238ad920a4
   languageName: node
   linkType: hard
 
@@ -13730,26 +13730,26 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-reduce-initial@npm:^6.1.0":
-  version: 6.1.0
-  resolution: "postcss-reduce-initial@npm:6.1.0"
+"postcss-reduce-initial@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-reduce-initial@npm:7.0.0"
   dependencies:
     browserslist: "npm:^4.23.0"
     caniuse-api: "npm:^3.0.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/a8f28cf51ce9a1b9423cce1a01c1d7cbee90125930ec36435a0073e73aef402d90affe2fd3600c964b679cf738869fda447b95a9acce74414e9d67d5c6ba8646
+  checksum: 10c0/ed50cd680ce258df953b82ce9b3fb52564d08548724577810800e236d017d80430cbccb4b1ad38b0f4d521663598e44ab93136b20064231181ef49e1e113ae10
   languageName: node
   linkType: hard
 
-"postcss-reduce-transforms@npm:^6.0.2":
-  version: 6.0.2
-  resolution: "postcss-reduce-transforms@npm:6.0.2"
+"postcss-reduce-transforms@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-reduce-transforms@npm:7.0.0"
   dependencies:
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/755ef27b3d083f586ac831f0c611a66e76f504d27e2100dc7674f6b86afad597901b4520cb889fe58ca70e852aa7fd0c0acb69a63d39dfe6a95860b472394e7c
+  checksum: 10c0/b2d4b65e71d38b604b41937850d1d64794964d6eced90f05891cfae8a78c7a9fed49911f51da9dcc5d715ac18e8bc7eacf691f2c5321dfe4d781f3e4442dfea9
   languageName: node
   linkType: hard
 
@@ -13798,7 +13798,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-selector-parser@npm:^6.0.11, postcss-selector-parser@npm:^6.0.13, postcss-selector-parser@npm:^6.0.16, postcss-selector-parser@npm:^6.0.2, postcss-selector-parser@npm:^6.0.4":
+"postcss-selector-parser@npm:^6.0.13, postcss-selector-parser@npm:^6.0.16, postcss-selector-parser@npm:^6.0.2, postcss-selector-parser@npm:^6.0.4":
   version: 6.0.16
   resolution: "postcss-selector-parser@npm:6.0.16"
   dependencies:
@@ -13808,26 +13808,26 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-svgo@npm:^6.0.3":
-  version: 6.0.3
-  resolution: "postcss-svgo@npm:6.0.3"
+"postcss-svgo@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-svgo@npm:7.0.0"
   dependencies:
     postcss-value-parser: "npm:^4.2.0"
     svgo: "npm:^3.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/994b15a88cbb411f32cfa98957faa5623c76f2d75fede51f5f47238f06b367ebe59c204fecbdaf21ccb9e727239a4b290087e04c502392658a0c881ddfbd61f2
+  checksum: 10c0/0e724069b5de83aa2b8f8a4746cb60cb663e0a8bbab0e4ba995649cb0562205af57d1f54b89fb90d8ae04a4b7ac3ac6e3751afffc3cff697cb19f7a36b71b195
   languageName: node
   linkType: hard
 
-"postcss-unique-selectors@npm:^6.0.4":
-  version: 6.0.4
-  resolution: "postcss-unique-selectors@npm:6.0.4"
+"postcss-unique-selectors@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-unique-selectors@npm:7.0.0"
   dependencies:
     postcss-selector-parser: "npm:^6.0.16"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/bfb99d8a7c675c93f2e65c9d9d563477bfd46fdce9e2727d42d57982b31ccbaaf944e8034bfbefe48b3119e77fba7eb1b181c19b91cb3a5448058fa66a7c9ae9
+  checksum: 10c0/33b532ad0e9271c5a379859e18adfdc72986bb538672cc0fbc06295d824f82dba3f7b57264e18a3214901bc5244ff5408d28b530374d24a088507287c7f520ce
   languageName: node
   linkType: hard
 
@@ -16319,15 +16319,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"stylehacks@npm:^6.1.1":
-  version: 6.1.1
-  resolution: "stylehacks@npm:6.1.1"
+"stylehacks@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "stylehacks@npm:7.0.0"
   dependencies:
     browserslist: "npm:^4.23.0"
     postcss-selector-parser: "npm:^6.0.16"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/2dd2bccfd8311ff71492e63a7b8b86c3d7b1fff55d4ba5a2357aff97743e633d351cdc2f5ae3c0057637d00dab4ef5fc5b218a1b370e4585a41df22b5a5128be
+  checksum: 10c0/c1c0231974ab7922af3a535a9cb78bfe84997767da7defe111cc76d7f10c9e139fe8cb0f9d5bea87b0c0cc0166c82a6ec98a3d6242d7e29ef90adceecfd330ae
   languageName: node
   linkType: hard
 

From 0cf6cf457d478427900299dffd009a9bfafeeb13 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 26 Apr 2024 17:32:48 +0200
Subject: [PATCH 0838/2191] Update dependency selenium-webdriver to v4.20.1
 (#30060)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 7068f5dd55d344..620da849924426 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -693,7 +693,7 @@ GEM
     scenic (1.8.0)
       activerecord (>= 4.0.0)
       railties (>= 4.0.0)
-    selenium-webdriver (4.19.0)
+    selenium-webdriver (4.20.1)
       base64 (~> 0.2)
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 3.0)

From de4a7bf53159f72a9a122bf8df21e8d5f4ad7512 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 26 Apr 2024 17:33:15 +0200
Subject: [PATCH 0839/2191] Change moderation warning notification icon
 (#30081)

---
 .../features/notifications/components/moderation_warning.tsx  | 4 ++--
 app/javascript/material-icons/400-24px/gavel-fill.svg         | 1 +
 app/javascript/material-icons/400-24px/gavel.svg              | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 app/javascript/material-icons/400-24px/gavel-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/gavel.svg

diff --git a/app/javascript/mastodon/features/notifications/components/moderation_warning.tsx b/app/javascript/mastodon/features/notifications/components/moderation_warning.tsx
index 02ae9b371ef6a8..2c1683e218e6ab 100644
--- a/app/javascript/mastodon/features/notifications/components/moderation_warning.tsx
+++ b/app/javascript/mastodon/features/notifications/components/moderation_warning.tsx
@@ -1,6 +1,6 @@
 import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
 
-import WarningIcon from '@/material-icons/400-24px/warning-fill.svg?react';
+import GavelIcon from '@/material-icons/400-24px/gavel.svg?react';
 import { Icon } from 'mastodon/components/icon';
 
 // This needs to be kept in sync with app/models/account_warning.rb
@@ -62,7 +62,7 @@ export const ModerationWarning: React.FC<Props> = ({ action, id, hidden }) => {
       rel='noopener noreferrer'
       className='notification__moderation-warning'
     >
-      <Icon id='warning' icon={WarningIcon} />
+      <Icon id='warning' icon={GavelIcon} />
 
       <div className='notification__moderation-warning__content'>
         <p>{intl.formatMessage(messages[action])}</p>
diff --git a/app/javascript/material-icons/400-24px/gavel-fill.svg b/app/javascript/material-icons/400-24px/gavel-fill.svg
new file mode 100644
index 00000000000000..9699b8480a8479
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/gavel-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M160-120v-80h480v80H160Zm226-194L160-540l84-86 228 226-86 86Zm254-254L414-796l86-84 226 226-86 86Zm184 408L302-682l56-56 522 522-56 56Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/gavel.svg b/app/javascript/material-icons/400-24px/gavel.svg
new file mode 100644
index 00000000000000..9699b8480a8479
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/gavel.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M160-120v-80h480v80H160Zm226-194L160-540l84-86 228 226-86 86Zm254-254L414-796l86-84 226 226-86 86Zm184 408L302-682l56-56 522 522-56 56Z"/></svg>
\ No newline at end of file

From 65093c619fdd1b18a4cf0c288051d8c524d5f434 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Fri, 26 Apr 2024 19:11:27 +0200
Subject: [PATCH 0840/2191] Fix marker thunks to not ignore eslint directives
 for the whole file (#30089)

---
 app/javascript/mastodon/actions/markers.ts | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/javascript/mastodon/actions/markers.ts b/app/javascript/mastodon/actions/markers.ts
index 84e5b33bcc00ec..6ecc867169f1a6 100644
--- a/app/javascript/mastodon/actions/markers.ts
+++ b/app/javascript/mastodon/actions/markers.ts
@@ -3,7 +3,7 @@ import { List as ImmutableList } from 'immutable';
 import { debounce } from 'lodash';
 
 import type { MarkerJSON } from 'mastodon/api_types/markers';
-import type { RootState } from 'mastodon/store';
+import type { AppDispatch, RootState } from 'mastodon/store';
 import { createAppAsyncThunk } from 'mastodon/store/typed_functions';
 
 import api, { authorizationTokenFromState } from '../api';
@@ -72,18 +72,21 @@ interface MarkerParam {
 }
 
 function getLastHomeId(state: RootState): string | undefined {
-  /* eslint-disable @typescript-eslint/no-unsafe-return, @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access */
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-return
   return (
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-call
     state
       // @ts-expect-error state.timelines is not yet typed
       .getIn(['timelines', 'home', 'items'], ImmutableList())
       // @ts-expect-error state.timelines is not yet typed
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
       .find((item) => item !== null)
   );
 }
 
 function getLastNotificationId(state: RootState): string | undefined {
   // @ts-expect-error state.notifications is not yet typed
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-return, @typescript-eslint/no-unsafe-call
   return state.getIn(['notifications', 'lastReadId']);
 }
 
@@ -131,8 +134,8 @@ export const submitMarkersAction = createAppAsyncThunk<{
 });
 
 const debouncedSubmitMarkers = debounce(
-  (dispatch) => {
-    dispatch(submitMarkersAction());
+  (dispatch: AppDispatch) => {
+    void dispatch(submitMarkersAction());
   },
   300000,
   {

From ef30d71a55d9fe3d6a097f4638d02dbb9c9f84ab Mon Sep 17 00:00:00 2001
From: Jeremy Kescher <jeremy@kescher.at>
Date: Fri, 26 Apr 2024 21:28:50 +0200
Subject: [PATCH 0841/2191] Add changelog for v4.3.0-alpha.3+glitch+cat+1.1.3

---
 CHANGELOG.md            | 4 ++++
 lib/mastodon/version.rb | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cfdd0955b0cded..b2561ab0aed0a4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All changes to Catstodon that aren't Mastodon or glitch-soc Mastodon changes will be documented here.
 
+## [v4.3.0-alpha.3+glitch+cat+1.1.3] - 2024-04-26
+
+- Glitch-soc changes, most notably fixing the display of follow request notifications.
+
 ## [v4.3.0-alpha.3+glitch+cat+1.1.2] - 2024-04-11
 
 - Glitch-soc changes, most notably notifications about severed connections.
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index a859bc2666d903..012b0070c138f8 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -25,7 +25,7 @@ def prerelease
     end
 
     def catstodon_revision
-      '1.1.2'
+      '1.1.3'
     end
 
     def build_metadata

From 62bc36416f2d2defc77a501226afd0679b6ca252 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Sat, 27 Apr 2024 17:50:44 +0200
Subject: [PATCH 0842/2191] Get rid of `app/javascript/core`

Have all flavors implement everything they need instead.
---
 app/controllers/concerns/theming_concern.rb   |   1 -
 app/controllers/statuses_controller.rb        |   2 +-
 app/javascript/core/admin.ts                  | 340 ------------------
 app/javascript/core/auth.js                   |   3 -
 app/javascript/core/common.js                 |   6 -
 app/javascript/core/embed.ts                  |  41 ---
 app/javascript/core/settings.ts               |  70 ----
 app/javascript/core/theme.yml                 |  24 --
 .../flavours/glitch/packs/admin.tsx           | 331 +++++++++++++++++
 .../flavours/glitch/packs/common.js           |   1 +
 app/javascript/flavours/glitch/packs/inert.js |   4 +
 .../flavours/glitch/packs/mailer.js           |   3 +
 .../flavours/glitch/packs/public.tsx          | 103 ++++++
 .../packs}/remote_interaction_helper.ts       |   0
 .../glitch/packs/two_factor_authentication.js | 119 ++++++
 app/javascript/flavours/glitch/theme.yml      |  36 +-
 app/javascript/flavours/vanilla/theme.yml     |  12 +-
 app/javascript/packs/admin.tsx                | 331 +++++++++++++++++
 app/javascript/packs/common.js                |   3 +
 app/javascript/{core => packs}/inert.js       |   0
 app/javascript/{core => packs}/mailer.js      |   0
 app/javascript/packs/public.tsx               | 103 ++++++
 .../packs/remote_interaction_helper.ts        | 174 +++++++++
 .../two_factor_authentication.js              |   2 -
 app/lib/themes.rb                             |   6 -
 app/views/layouts/_theme.html.haml            |   2 +-
 app/views/layouts/application.html.haml       |   3 +-
 app/views/layouts/embedded.html.haml          |   1 -
 app/views/layouts/error.html.haml             |   1 -
 app/views/layouts/mailer.html.haml            |   2 +-
 app/views/media/player.html.haml              |   1 -
 .../remote_interaction_helper/index.html.haml |   2 +-
 config/webpack/configuration.js               |  10 -
 config/webpack/shared.js                      |   5 +-
 34 files changed, 1212 insertions(+), 530 deletions(-)
 delete mode 100644 app/javascript/core/admin.ts
 delete mode 100644 app/javascript/core/auth.js
 delete mode 100644 app/javascript/core/common.js
 delete mode 100644 app/javascript/core/embed.ts
 delete mode 100644 app/javascript/core/settings.ts
 delete mode 100644 app/javascript/core/theme.yml
 create mode 100644 app/javascript/flavours/glitch/packs/inert.js
 create mode 100644 app/javascript/flavours/glitch/packs/mailer.js
 rename app/javascript/{core => flavours/glitch/packs}/remote_interaction_helper.ts (100%)
 create mode 100644 app/javascript/flavours/glitch/packs/two_factor_authentication.js
 rename app/javascript/{core => packs}/inert.js (100%)
 rename app/javascript/{core => packs}/mailer.js (100%)
 create mode 100644 app/javascript/packs/remote_interaction_helper.ts
 rename app/javascript/{core => packs}/two_factor_authentication.js (99%)

diff --git a/app/controllers/concerns/theming_concern.rb b/app/controllers/concerns/theming_concern.rb
index 82a53dbf510e06..5d24001bbf3489 100644
--- a/app/controllers/concerns/theming_concern.rb
+++ b/app/controllers/concerns/theming_concern.rb
@@ -4,7 +4,6 @@ module ThemingConcern
   extend ActiveSupport::Concern
 
   def use_pack(pack_name)
-    @core = resolve_pack_with_common(Themes.instance.core, pack_name)
     @theme = resolve_pack_with_common(Themes.instance.flavour(current_flavour), pack_name, current_skin)
   end
 
diff --git a/app/controllers/statuses_controller.rb b/app/controllers/statuses_controller.rb
index 02fea13502db18..7f9127d3a6319d 100644
--- a/app/controllers/statuses_controller.rb
+++ b/app/controllers/statuses_controller.rb
@@ -41,7 +41,7 @@ def activity
   end
 
   def embed
-    use_pack 'embed'
+    use_pack 'public'
     return not_found if @status.hidden? || @status.reblog?
 
     expires_in 180, public: true
diff --git a/app/javascript/core/admin.ts b/app/javascript/core/admin.ts
deleted file mode 100644
index 0642affef0894e..00000000000000
--- a/app/javascript/core/admin.ts
+++ /dev/null
@@ -1,340 +0,0 @@
-//  This file will be loaded on admin pages, regardless of theme.
-
-import 'packs/public-path';
-
-import Rails from '@rails/ujs';
-
-import ready from '../mastodon/ready';
-
-const setAnnouncementEndsAttributes = (target: HTMLInputElement) => {
-  const valid = target.value && target.validity.valid;
-  const element = document.querySelector<HTMLInputElement>(
-    'input[type="datetime-local"]#announcement_ends_at',
-  );
-
-  if (!element) return;
-
-  if (valid) {
-    element.classList.remove('optional');
-    element.required = true;
-    element.min = target.value;
-  } else {
-    element.classList.add('optional');
-    element.removeAttribute('required');
-    element.removeAttribute('min');
-  }
-};
-
-Rails.delegate(
-  document,
-  'input[type="datetime-local"]#announcement_starts_at',
-  'change',
-  ({ target }) => {
-    if (target instanceof HTMLInputElement)
-      setAnnouncementEndsAttributes(target);
-  },
-);
-
-const batchCheckboxClassName = '.batch-checkbox input[type="checkbox"]';
-
-const showSelectAll = () => {
-  const selectAllMatchingElement = document.querySelector(
-    '.batch-table__select-all',
-  );
-  selectAllMatchingElement?.classList.add('active');
-};
-
-const hideSelectAll = () => {
-  const selectAllMatchingElement = document.querySelector(
-    '.batch-table__select-all',
-  );
-  const hiddenField = document.querySelector<HTMLInputElement>(
-    'input#select_all_matching',
-  );
-  const selectedMsg = document.querySelector(
-    '.batch-table__select-all .selected',
-  );
-  const notSelectedMsg = document.querySelector(
-    '.batch-table__select-all .not-selected',
-  );
-
-  selectAllMatchingElement?.classList.remove('active');
-  selectedMsg?.classList.remove('active');
-  notSelectedMsg?.classList.add('active');
-  if (hiddenField) hiddenField.value = '0';
-};
-
-Rails.delegate(document, '#batch_checkbox_all', 'change', ({ target }) => {
-  if (!(target instanceof HTMLInputElement)) return;
-
-  const selectAllMatchingElement = document.querySelector(
-    '.batch-table__select-all',
-  );
-
-  document
-    .querySelectorAll<HTMLInputElement>(batchCheckboxClassName)
-    .forEach((content) => {
-      content.checked = target.checked;
-    });
-
-  if (selectAllMatchingElement) {
-    if (target.checked) {
-      showSelectAll();
-    } else {
-      hideSelectAll();
-    }
-  }
-});
-
-Rails.delegate(document, '.batch-table__select-all button', 'click', () => {
-  const hiddenField = document.querySelector<HTMLInputElement>(
-    '#select_all_matching',
-  );
-
-  if (!hiddenField) return;
-
-  const active = hiddenField.value === '1';
-  const selectedMsg = document.querySelector(
-    '.batch-table__select-all .selected',
-  );
-  const notSelectedMsg = document.querySelector(
-    '.batch-table__select-all .not-selected',
-  );
-
-  if (!selectedMsg || !notSelectedMsg) return;
-
-  if (active) {
-    hiddenField.value = '0';
-    selectedMsg.classList.remove('active');
-    notSelectedMsg.classList.add('active');
-  } else {
-    hiddenField.value = '1';
-    notSelectedMsg.classList.remove('active');
-    selectedMsg.classList.add('active');
-  }
-});
-
-Rails.delegate(document, batchCheckboxClassName, 'change', () => {
-  const checkAllElement = document.querySelector<HTMLInputElement>(
-    'input#batch_checkbox_all',
-  );
-  const selectAllMatchingElement = document.querySelector(
-    '.batch-table__select-all',
-  );
-
-  if (checkAllElement) {
-    const allCheckboxes = Array.from(
-      document.querySelectorAll<HTMLInputElement>(batchCheckboxClassName),
-    );
-    checkAllElement.checked = allCheckboxes.every((content) => content.checked);
-    checkAllElement.indeterminate =
-      !checkAllElement.checked &&
-      allCheckboxes.some((content) => content.checked);
-
-    if (selectAllMatchingElement) {
-      if (checkAllElement.checked) {
-        showSelectAll();
-      } else {
-        hideSelectAll();
-      }
-    }
-  }
-});
-
-Rails.delegate(
-  document,
-  '.filter-subset--with-select select',
-  'change',
-  ({ target }) => {
-    if (target instanceof HTMLSelectElement) target.form?.submit();
-  },
-);
-
-const onDomainBlockSeverityChange = (target: HTMLSelectElement) => {
-  const rejectMediaDiv = document.querySelector(
-    '.input.with_label.domain_block_reject_media',
-  );
-  const rejectReportsDiv = document.querySelector(
-    '.input.with_label.domain_block_reject_reports',
-  );
-
-  if (rejectMediaDiv && rejectMediaDiv instanceof HTMLElement) {
-    rejectMediaDiv.style.display =
-      target.value === 'suspend' ? 'none' : 'block';
-  }
-
-  if (rejectReportsDiv && rejectReportsDiv instanceof HTMLElement) {
-    rejectReportsDiv.style.display =
-      target.value === 'suspend' ? 'none' : 'block';
-  }
-};
-
-Rails.delegate(document, '#domain_block_severity', 'change', ({ target }) => {
-  if (target instanceof HTMLSelectElement) onDomainBlockSeverityChange(target);
-});
-
-const onEnableBootstrapTimelineAccountsChange = (target: HTMLInputElement) => {
-  const bootstrapTimelineAccountsField =
-    document.querySelector<HTMLInputElement>(
-      '#form_admin_settings_bootstrap_timeline_accounts',
-    );
-
-  if (bootstrapTimelineAccountsField) {
-    bootstrapTimelineAccountsField.disabled = !target.checked;
-    if (target.checked) {
-      bootstrapTimelineAccountsField.parentElement?.classList.remove(
-        'disabled',
-      );
-      bootstrapTimelineAccountsField.parentElement?.parentElement?.classList.remove(
-        'disabled',
-      );
-    } else {
-      bootstrapTimelineAccountsField.parentElement?.classList.add('disabled');
-      bootstrapTimelineAccountsField.parentElement?.parentElement?.classList.add(
-        'disabled',
-      );
-    }
-  }
-};
-
-Rails.delegate(
-  document,
-  '#form_admin_settings_enable_bootstrap_timeline_accounts',
-  'change',
-  ({ target }) => {
-    if (target instanceof HTMLInputElement)
-      onEnableBootstrapTimelineAccountsChange(target);
-  },
-);
-
-const onChangeRegistrationMode = (target: HTMLSelectElement) => {
-  const enabled = target.value === 'approved';
-
-  document
-    .querySelectorAll<HTMLElement>(
-      '.form_admin_settings_registrations_mode .warning-hint',
-    )
-    .forEach((warning_hint) => {
-      warning_hint.style.display = target.value === 'open' ? 'inline' : 'none';
-    });
-
-  document
-    .querySelectorAll<HTMLInputElement>(
-      'input#form_admin_settings_require_invite_text',
-    )
-    .forEach((input) => {
-      input.disabled = !enabled;
-      if (enabled) {
-        let element: HTMLElement | null = input;
-        do {
-          element.classList.remove('disabled');
-          element = element.parentElement;
-        } while (element && !element.classList.contains('fields-group'));
-      } else {
-        let element: HTMLElement | null = input;
-        do {
-          element.classList.add('disabled');
-          element = element.parentElement;
-        } while (element && !element.classList.contains('fields-group'));
-      }
-    });
-};
-
-const convertUTCDateTimeToLocal = (value: string) => {
-  const date = new Date(value + 'Z');
-  const twoChars = (x: number) => x.toString().padStart(2, '0');
-  return `${date.getFullYear()}-${twoChars(date.getMonth() + 1)}-${twoChars(date.getDate())}T${twoChars(date.getHours())}:${twoChars(date.getMinutes())}`;
-};
-
-function convertLocalDatetimeToUTC(value: string) {
-  const date = new Date(value);
-  const fullISO8601 = date.toISOString();
-  return fullISO8601.slice(0, fullISO8601.indexOf('T') + 6);
-}
-
-Rails.delegate(
-  document,
-  '#form_admin_settings_registrations_mode',
-  'change',
-  ({ target }) => {
-    if (target instanceof HTMLSelectElement) onChangeRegistrationMode(target);
-  },
-);
-
-ready(() => {
-  const domainBlockSeveritySelect = document.querySelector<HTMLSelectElement>(
-    'select#domain_block_severity',
-  );
-  if (domainBlockSeveritySelect)
-    onDomainBlockSeverityChange(domainBlockSeveritySelect);
-
-  const enableBootstrapTimelineAccounts =
-    document.querySelector<HTMLInputElement>(
-      'input#form_admin_settings_enable_bootstrap_timeline_accounts',
-    );
-  if (enableBootstrapTimelineAccounts)
-    onEnableBootstrapTimelineAccountsChange(enableBootstrapTimelineAccounts);
-
-  const registrationMode = document.querySelector<HTMLSelectElement>(
-    'select#form_admin_settings_registrations_mode',
-  );
-  if (registrationMode) onChangeRegistrationMode(registrationMode);
-
-  const checkAllElement = document.querySelector<HTMLInputElement>(
-    'input#batch_checkbox_all',
-  );
-  if (checkAllElement) {
-    const allCheckboxes = Array.from(
-      document.querySelectorAll<HTMLInputElement>(batchCheckboxClassName),
-    );
-    checkAllElement.checked = allCheckboxes.every((content) => content.checked);
-    checkAllElement.indeterminate =
-      !checkAllElement.checked &&
-      allCheckboxes.some((content) => content.checked);
-  }
-
-  document
-    .querySelector('a#add-instance-button')
-    ?.addEventListener('click', (e) => {
-      const domain = document.querySelector<HTMLInputElement>(
-        'input[type="text"]#by_domain',
-      )?.value;
-
-      if (domain && e.target instanceof HTMLAnchorElement) {
-        const url = new URL(e.target.href);
-        url.searchParams.set('_domain', domain);
-        e.target.href = url.toString();
-      }
-    });
-
-  document
-    .querySelectorAll<HTMLInputElement>('input[type="datetime-local"]')
-    .forEach((element) => {
-      if (element.value) {
-        element.value = convertUTCDateTimeToLocal(element.value);
-      }
-      if (element.placeholder) {
-        element.placeholder = convertUTCDateTimeToLocal(element.placeholder);
-      }
-    });
-
-  Rails.delegate(document, 'form', 'submit', ({ target }) => {
-    if (target instanceof HTMLFormElement)
-      target
-        .querySelectorAll<HTMLInputElement>('input[type="datetime-local"]')
-        .forEach((element) => {
-          if (element.value && element.validity.valid) {
-            element.value = convertLocalDatetimeToUTC(element.value);
-          }
-        });
-  });
-
-  const announcementStartsAt = document.querySelector<HTMLInputElement>(
-    'input[type="datetime-local"]#announcement_starts_at',
-  );
-  if (announcementStartsAt) {
-    setAnnouncementEndsAttributes(announcementStartsAt);
-  }
-}).catch((reason) => {
-  throw reason;
-});
diff --git a/app/javascript/core/auth.js b/app/javascript/core/auth.js
deleted file mode 100644
index d1d14d99e8df93..00000000000000
--- a/app/javascript/core/auth.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import 'packs/public-path';
-import './settings';
-import './two_factor_authentication';
diff --git a/app/javascript/core/common.js b/app/javascript/core/common.js
deleted file mode 100644
index 1cee2f6036f08c..00000000000000
--- a/app/javascript/core/common.js
+++ /dev/null
@@ -1,6 +0,0 @@
-//  This file will be loaded on all pages, regardless of theme.
-
-import 'packs/public-path';
-import 'font-awesome/css/font-awesome.css';
-
-require.context('../images/', true);
diff --git a/app/javascript/core/embed.ts b/app/javascript/core/embed.ts
deleted file mode 100644
index 6766cd7788aec0..00000000000000
--- a/app/javascript/core/embed.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-//  This file will be loaded on embed pages, regardless of theme.
-
-import 'packs/public-path';
-import ready from '../mastodon/ready';
-
-interface SetHeightMessage {
-  type: 'setHeight';
-  id: string;
-  height: number;
-}
-
-function isSetHeightMessage(data: unknown): data is SetHeightMessage {
-  if (
-    data &&
-    typeof data === 'object' &&
-    'type' in data &&
-    data.type === 'setHeight'
-  )
-    return true;
-  else return false;
-}
-
-window.addEventListener('message', (e) => {
-  // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition -- typings are not correct, it can be null in very rare cases
-  if (!e.data || !isSetHeightMessage(e.data) || !window.parent) return;
-
-  const data = e.data;
-
-  ready(() => {
-    window.parent.postMessage(
-      {
-        type: 'setHeight',
-        id: data.id,
-        height: document.getElementsByTagName('html')[0].scrollHeight,
-      },
-      '*',
-    );
-  }).catch((e) => {
-    console.error('Error in setHeightMessage postMessage', e);
-  });
-});
diff --git a/app/javascript/core/settings.ts b/app/javascript/core/settings.ts
deleted file mode 100644
index ea6a99ec80f671..00000000000000
--- a/app/javascript/core/settings.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-//  This file will be loaded on settings pages, regardless of theme.
-
-import 'packs/public-path';
-import Rails from '@rails/ujs';
-
-Rails.delegate(
-  document,
-  '#edit_profile input[type=file]',
-  'change',
-  ({ target }) => {
-    if (!(target instanceof HTMLInputElement)) return;
-
-    const avatar = document.querySelector<HTMLImageElement>(
-      `img#${target.id}-preview`,
-    );
-
-    if (!avatar) return;
-
-    let file: File | undefined;
-    if (target.files) file = target.files[0];
-
-    const url = file ? URL.createObjectURL(file) : avatar.dataset.originalSrc;
-
-    if (url) avatar.src = url;
-  },
-);
-
-Rails.delegate(document, '.input-copy input', 'click', ({ target }) => {
-  if (!(target instanceof HTMLInputElement)) return;
-
-  target.focus();
-  target.select();
-  target.setSelectionRange(0, target.value.length);
-});
-
-Rails.delegate(document, '.input-copy button', 'click', ({ target }) => {
-  if (!(target instanceof HTMLButtonElement)) return;
-
-  const input = target.parentNode?.querySelector<HTMLInputElement>(
-    '.input-copy__wrapper input',
-  );
-
-  if (!input) return;
-
-  const oldReadOnly = input.readOnly;
-
-  input.readOnly = false;
-  input.focus();
-  input.select();
-  input.setSelectionRange(0, input.value.length);
-
-  try {
-    if (document.execCommand('copy')) {
-      input.blur();
-
-      const parent = target.parentElement;
-
-      if (!parent) return;
-      parent.classList.add('copied');
-
-      setTimeout(() => {
-        parent.classList.remove('copied');
-      }, 700);
-    }
-  } catch (err) {
-    console.error(err);
-  }
-
-  input.readOnly = oldReadOnly;
-});
diff --git a/app/javascript/core/theme.yml b/app/javascript/core/theme.yml
deleted file mode 100644
index 12c23e20359ecf..00000000000000
--- a/app/javascript/core/theme.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-#  These packs will be loaded on every appropriate page, regardless of
-#  theme.
-pack:
-  about:
-  admin: admin.ts
-  auth: auth.js
-  common:
-    filename: common.js
-    stylesheet: true
-  embed: embed.ts
-  error:
-  home:
-  inert:
-    filename: inert.js
-    stylesheet: true
-  mailer:
-    filename: mailer.js
-    stylesheet: true
-  modal:
-  public:
-  settings: settings.ts
-  sign_up:
-  share:
-  remote_interaction_helper: remote_interaction_helper.ts
diff --git a/app/javascript/flavours/glitch/packs/admin.tsx b/app/javascript/flavours/glitch/packs/admin.tsx
index e20e74b2387b28..57a017ff7db3c8 100644
--- a/app/javascript/flavours/glitch/packs/admin.tsx
+++ b/app/javascript/flavours/glitch/packs/admin.tsx
@@ -1,8 +1,265 @@
 import 'packs/public-path';
 import { createRoot } from 'react-dom/client';
 
+import Rails from '@rails/ujs';
+
 import ready from 'flavours/glitch/ready';
 
+const setAnnouncementEndsAttributes = (target: HTMLInputElement) => {
+  const valid = target.value && target.validity.valid;
+  const element = document.querySelector<HTMLInputElement>(
+    'input[type="datetime-local"]#announcement_ends_at',
+  );
+
+  if (!element) return;
+
+  if (valid) {
+    element.classList.remove('optional');
+    element.required = true;
+    element.min = target.value;
+  } else {
+    element.classList.add('optional');
+    element.removeAttribute('required');
+    element.removeAttribute('min');
+  }
+};
+
+Rails.delegate(
+  document,
+  'input[type="datetime-local"]#announcement_starts_at',
+  'change',
+  ({ target }) => {
+    if (target instanceof HTMLInputElement)
+      setAnnouncementEndsAttributes(target);
+  },
+);
+
+const batchCheckboxClassName = '.batch-checkbox input[type="checkbox"]';
+
+const showSelectAll = () => {
+  const selectAllMatchingElement = document.querySelector(
+    '.batch-table__select-all',
+  );
+  selectAllMatchingElement?.classList.add('active');
+};
+
+const hideSelectAll = () => {
+  const selectAllMatchingElement = document.querySelector(
+    '.batch-table__select-all',
+  );
+  const hiddenField = document.querySelector<HTMLInputElement>(
+    'input#select_all_matching',
+  );
+  const selectedMsg = document.querySelector(
+    '.batch-table__select-all .selected',
+  );
+  const notSelectedMsg = document.querySelector(
+    '.batch-table__select-all .not-selected',
+  );
+
+  selectAllMatchingElement?.classList.remove('active');
+  selectedMsg?.classList.remove('active');
+  notSelectedMsg?.classList.add('active');
+  if (hiddenField) hiddenField.value = '0';
+};
+
+Rails.delegate(document, '#batch_checkbox_all', 'change', ({ target }) => {
+  if (!(target instanceof HTMLInputElement)) return;
+
+  const selectAllMatchingElement = document.querySelector(
+    '.batch-table__select-all',
+  );
+
+  document
+    .querySelectorAll<HTMLInputElement>(batchCheckboxClassName)
+    .forEach((content) => {
+      content.checked = target.checked;
+    });
+
+  if (selectAllMatchingElement) {
+    if (target.checked) {
+      showSelectAll();
+    } else {
+      hideSelectAll();
+    }
+  }
+});
+
+Rails.delegate(document, '.batch-table__select-all button', 'click', () => {
+  const hiddenField = document.querySelector<HTMLInputElement>(
+    '#select_all_matching',
+  );
+
+  if (!hiddenField) return;
+
+  const active = hiddenField.value === '1';
+  const selectedMsg = document.querySelector(
+    '.batch-table__select-all .selected',
+  );
+  const notSelectedMsg = document.querySelector(
+    '.batch-table__select-all .not-selected',
+  );
+
+  if (!selectedMsg || !notSelectedMsg) return;
+
+  if (active) {
+    hiddenField.value = '0';
+    selectedMsg.classList.remove('active');
+    notSelectedMsg.classList.add('active');
+  } else {
+    hiddenField.value = '1';
+    notSelectedMsg.classList.remove('active');
+    selectedMsg.classList.add('active');
+  }
+});
+
+Rails.delegate(document, batchCheckboxClassName, 'change', () => {
+  const checkAllElement = document.querySelector<HTMLInputElement>(
+    'input#batch_checkbox_all',
+  );
+  const selectAllMatchingElement = document.querySelector(
+    '.batch-table__select-all',
+  );
+
+  if (checkAllElement) {
+    const allCheckboxes = Array.from(
+      document.querySelectorAll<HTMLInputElement>(batchCheckboxClassName),
+    );
+    checkAllElement.checked = allCheckboxes.every((content) => content.checked);
+    checkAllElement.indeterminate =
+      !checkAllElement.checked &&
+      allCheckboxes.some((content) => content.checked);
+
+    if (selectAllMatchingElement) {
+      if (checkAllElement.checked) {
+        showSelectAll();
+      } else {
+        hideSelectAll();
+      }
+    }
+  }
+});
+
+Rails.delegate(
+  document,
+  '.filter-subset--with-select select',
+  'change',
+  ({ target }) => {
+    if (target instanceof HTMLSelectElement) target.form?.submit();
+  },
+);
+
+const onDomainBlockSeverityChange = (target: HTMLSelectElement) => {
+  const rejectMediaDiv = document.querySelector(
+    '.input.with_label.domain_block_reject_media',
+  );
+  const rejectReportsDiv = document.querySelector(
+    '.input.with_label.domain_block_reject_reports',
+  );
+
+  if (rejectMediaDiv && rejectMediaDiv instanceof HTMLElement) {
+    rejectMediaDiv.style.display =
+      target.value === 'suspend' ? 'none' : 'block';
+  }
+
+  if (rejectReportsDiv && rejectReportsDiv instanceof HTMLElement) {
+    rejectReportsDiv.style.display =
+      target.value === 'suspend' ? 'none' : 'block';
+  }
+};
+
+Rails.delegate(document, '#domain_block_severity', 'change', ({ target }) => {
+  if (target instanceof HTMLSelectElement) onDomainBlockSeverityChange(target);
+});
+
+const onEnableBootstrapTimelineAccountsChange = (target: HTMLInputElement) => {
+  const bootstrapTimelineAccountsField =
+    document.querySelector<HTMLInputElement>(
+      '#form_admin_settings_bootstrap_timeline_accounts',
+    );
+
+  if (bootstrapTimelineAccountsField) {
+    bootstrapTimelineAccountsField.disabled = !target.checked;
+    if (target.checked) {
+      bootstrapTimelineAccountsField.parentElement?.classList.remove(
+        'disabled',
+      );
+      bootstrapTimelineAccountsField.parentElement?.parentElement?.classList.remove(
+        'disabled',
+      );
+    } else {
+      bootstrapTimelineAccountsField.parentElement?.classList.add('disabled');
+      bootstrapTimelineAccountsField.parentElement?.parentElement?.classList.add(
+        'disabled',
+      );
+    }
+  }
+};
+
+Rails.delegate(
+  document,
+  '#form_admin_settings_enable_bootstrap_timeline_accounts',
+  'change',
+  ({ target }) => {
+    if (target instanceof HTMLInputElement)
+      onEnableBootstrapTimelineAccountsChange(target);
+  },
+);
+
+const onChangeRegistrationMode = (target: HTMLSelectElement) => {
+  const enabled = target.value === 'approved';
+
+  document
+    .querySelectorAll<HTMLElement>(
+      '.form_admin_settings_registrations_mode .warning-hint',
+    )
+    .forEach((warning_hint) => {
+      warning_hint.style.display = target.value === 'open' ? 'inline' : 'none';
+    });
+
+  document
+    .querySelectorAll<HTMLInputElement>(
+      'input#form_admin_settings_require_invite_text',
+    )
+    .forEach((input) => {
+      input.disabled = !enabled;
+      if (enabled) {
+        let element: HTMLElement | null = input;
+        do {
+          element.classList.remove('disabled');
+          element = element.parentElement;
+        } while (element && !element.classList.contains('fields-group'));
+      } else {
+        let element: HTMLElement | null = input;
+        do {
+          element.classList.add('disabled');
+          element = element.parentElement;
+        } while (element && !element.classList.contains('fields-group'));
+      }
+    });
+};
+
+const convertUTCDateTimeToLocal = (value: string) => {
+  const date = new Date(value + 'Z');
+  const twoChars = (x: number) => x.toString().padStart(2, '0');
+  return `${date.getFullYear()}-${twoChars(date.getMonth() + 1)}-${twoChars(date.getDate())}T${twoChars(date.getHours())}:${twoChars(date.getMinutes())}`;
+};
+
+function convertLocalDatetimeToUTC(value: string) {
+  const date = new Date(value);
+  const fullISO8601 = date.toISOString();
+  return fullISO8601.slice(0, fullISO8601.indexOf('T') + 6);
+}
+
+Rails.delegate(
+  document,
+  '#form_admin_settings_registrations_mode',
+  'change',
+  ({ target }) => {
+    if (target instanceof HTMLSelectElement) onChangeRegistrationMode(target);
+  },
+);
+
 async function mountReactComponent(element: Element) {
   const componentName = element.getAttribute('data-admin-component');
   const stringProps = element.getAttribute('data-props');
@@ -29,6 +286,80 @@ async function mountReactComponent(element: Element) {
 }
 
 ready(() => {
+  const domainBlockSeveritySelect = document.querySelector<HTMLSelectElement>(
+    'select#domain_block_severity',
+  );
+  if (domainBlockSeveritySelect)
+    onDomainBlockSeverityChange(domainBlockSeveritySelect);
+
+  const enableBootstrapTimelineAccounts =
+    document.querySelector<HTMLInputElement>(
+      'input#form_admin_settings_enable_bootstrap_timeline_accounts',
+    );
+  if (enableBootstrapTimelineAccounts)
+    onEnableBootstrapTimelineAccountsChange(enableBootstrapTimelineAccounts);
+
+  const registrationMode = document.querySelector<HTMLSelectElement>(
+    'select#form_admin_settings_registrations_mode',
+  );
+  if (registrationMode) onChangeRegistrationMode(registrationMode);
+
+  const checkAllElement = document.querySelector<HTMLInputElement>(
+    'input#batch_checkbox_all',
+  );
+  if (checkAllElement) {
+    const allCheckboxes = Array.from(
+      document.querySelectorAll<HTMLInputElement>(batchCheckboxClassName),
+    );
+    checkAllElement.checked = allCheckboxes.every((content) => content.checked);
+    checkAllElement.indeterminate =
+      !checkAllElement.checked &&
+      allCheckboxes.some((content) => content.checked);
+  }
+
+  document
+    .querySelector('a#add-instance-button')
+    ?.addEventListener('click', (e) => {
+      const domain = document.querySelector<HTMLInputElement>(
+        'input[type="text"]#by_domain',
+      )?.value;
+
+      if (domain && e.target instanceof HTMLAnchorElement) {
+        const url = new URL(e.target.href);
+        url.searchParams.set('_domain', domain);
+        e.target.href = url.toString();
+      }
+    });
+
+  document
+    .querySelectorAll<HTMLInputElement>('input[type="datetime-local"]')
+    .forEach((element) => {
+      if (element.value) {
+        element.value = convertUTCDateTimeToLocal(element.value);
+      }
+      if (element.placeholder) {
+        element.placeholder = convertUTCDateTimeToLocal(element.placeholder);
+      }
+    });
+
+  Rails.delegate(document, 'form', 'submit', ({ target }) => {
+    if (target instanceof HTMLFormElement)
+      target
+        .querySelectorAll<HTMLInputElement>('input[type="datetime-local"]')
+        .forEach((element) => {
+          if (element.value && element.validity.valid) {
+            element.value = convertLocalDatetimeToUTC(element.value);
+          }
+        });
+  });
+
+  const announcementStartsAt = document.querySelector<HTMLInputElement>(
+    'input[type="datetime-local"]#announcement_starts_at',
+  );
+  if (announcementStartsAt) {
+    setAnnouncementEndsAttributes(announcementStartsAt);
+  }
+
   document.querySelectorAll('[data-admin-component]').forEach((element) => {
     void mountReactComponent(element);
   });
diff --git a/app/javascript/flavours/glitch/packs/common.js b/app/javascript/flavours/glitch/packs/common.js
index caad60a8c3ce70..48e414909dca39 100644
--- a/app/javascript/flavours/glitch/packs/common.js
+++ b/app/javascript/flavours/glitch/packs/common.js
@@ -1,4 +1,5 @@
 import 'packs/public-path';
+import 'font-awesome/css/font-awesome.css';
 import Rails from '@rails/ujs';
 import 'flavours/glitch/styles/index.scss';
 
diff --git a/app/javascript/flavours/glitch/packs/inert.js b/app/javascript/flavours/glitch/packs/inert.js
new file mode 100644
index 00000000000000..a5d7e548be1ad6
--- /dev/null
+++ b/app/javascript/flavours/glitch/packs/inert.js
@@ -0,0 +1,4 @@
+/* Placeholder file to have `inert.scss` compiled by Webpack
+   This is used by the `wicg-inert` polyfill */
+
+import '@/styles/inert.scss';
diff --git a/app/javascript/flavours/glitch/packs/mailer.js b/app/javascript/flavours/glitch/packs/mailer.js
new file mode 100644
index 00000000000000..28cbb906f5f7ce
--- /dev/null
+++ b/app/javascript/flavours/glitch/packs/mailer.js
@@ -0,0 +1,3 @@
+import '@/styles/mailer.scss';
+
+require.context('@/icons');
diff --git a/app/javascript/flavours/glitch/packs/public.tsx b/app/javascript/flavours/glitch/packs/public.tsx
index 1ecc3fa42f43df..db6edfdc98f5d3 100644
--- a/app/javascript/flavours/glitch/packs/public.tsx
+++ b/app/javascript/flavours/glitch/packs/public.tsx
@@ -34,6 +34,43 @@ const messages = defineMessages({
   },
 });
 
+interface SetHeightMessage {
+  type: 'setHeight';
+  id: string;
+  height: number;
+}
+
+function isSetHeightMessage(data: unknown): data is SetHeightMessage {
+  if (
+    data &&
+    typeof data === 'object' &&
+    'type' in data &&
+    data.type === 'setHeight'
+  )
+    return true;
+  else return false;
+}
+
+window.addEventListener('message', (e) => {
+  // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition -- typings are not correct, it can be null in very rare cases
+  if (!e.data || !isSetHeightMessage(e.data) || !window.parent) return;
+
+  const data = e.data;
+
+  ready(() => {
+    window.parent.postMessage(
+      {
+        type: 'setHeight',
+        id: data.id,
+        height: document.getElementsByTagName('html')[0].scrollHeight,
+      },
+      '*',
+    );
+  }).catch((e) => {
+    console.error('Error in setHeightMessage postMessage', e);
+  });
+});
+
 function loaded() {
   const { messages: localeData } = getLocale();
 
@@ -285,6 +322,72 @@ function loaded() {
     });
 }
 
+Rails.delegate(
+  document,
+  '#edit_profile input[type=file]',
+  'change',
+  ({ target }) => {
+    if (!(target instanceof HTMLInputElement)) return;
+
+    const avatar = document.querySelector<HTMLImageElement>(
+      `img#${target.id}-preview`,
+    );
+
+    if (!avatar) return;
+
+    let file: File | undefined;
+    if (target.files) file = target.files[0];
+
+    const url = file ? URL.createObjectURL(file) : avatar.dataset.originalSrc;
+
+    if (url) avatar.src = url;
+  },
+);
+
+Rails.delegate(document, '.input-copy input', 'click', ({ target }) => {
+  if (!(target instanceof HTMLInputElement)) return;
+
+  target.focus();
+  target.select();
+  target.setSelectionRange(0, target.value.length);
+});
+
+Rails.delegate(document, '.input-copy button', 'click', ({ target }) => {
+  if (!(target instanceof HTMLButtonElement)) return;
+
+  const input = target.parentNode?.querySelector<HTMLInputElement>(
+    '.input-copy__wrapper input',
+  );
+
+  if (!input) return;
+
+  const oldReadOnly = input.readOnly;
+
+  input.readOnly = false;
+  input.focus();
+  input.select();
+  input.setSelectionRange(0, input.value.length);
+
+  try {
+    if (document.execCommand('copy')) {
+      input.blur();
+
+      const parent = target.parentElement;
+
+      if (!parent) return;
+      parent.classList.add('copied');
+
+      setTimeout(() => {
+        parent.classList.remove('copied');
+      }, 700);
+    }
+  } catch (err) {
+    console.error(err);
+  }
+
+  input.readOnly = oldReadOnly;
+});
+
 const toggleSidebar = () => {
   const sidebar = document.querySelector<HTMLUListElement>('.sidebar ul');
   const toggleButton = document.querySelector<HTMLAnchorElement>(
diff --git a/app/javascript/core/remote_interaction_helper.ts b/app/javascript/flavours/glitch/packs/remote_interaction_helper.ts
similarity index 100%
rename from app/javascript/core/remote_interaction_helper.ts
rename to app/javascript/flavours/glitch/packs/remote_interaction_helper.ts
diff --git a/app/javascript/flavours/glitch/packs/two_factor_authentication.js b/app/javascript/flavours/glitch/packs/two_factor_authentication.js
new file mode 100644
index 00000000000000..8b606fcc7abe6d
--- /dev/null
+++ b/app/javascript/flavours/glitch/packs/two_factor_authentication.js
@@ -0,0 +1,119 @@
+import * as WebAuthnJSON from '@github/webauthn-json';
+import axios from 'axios';
+
+import ready from 'flavours/glitch/ready';
+import 'regenerator-runtime/runtime';
+
+function getCSRFToken() {
+  var CSRFSelector = document.querySelector('meta[name="csrf-token"]');
+  if (CSRFSelector) {
+    return CSRFSelector.getAttribute('content');
+  } else {
+    return null;
+  }
+}
+
+function hideFlashMessages() {
+  Array.from(document.getElementsByClassName('flash-message')).forEach(function(flashMessage) {
+    flashMessage.classList.add('hidden');
+  });
+}
+
+function callback(url, body) {
+  axios.post(url, JSON.stringify(body), {
+    headers: {
+      'Content-Type': 'application/json',
+      'Accept': 'application/json',
+      'X-CSRF-Token': getCSRFToken(),
+    },
+    credentials: 'same-origin',
+  }).then(function(response) {
+    window.location.replace(response.data.redirect_path);
+  }).catch(function(error) {
+    if (error.response.status === 422) {
+      const errorMessage = document.getElementById('security-key-error-message');
+      errorMessage.classList.remove('hidden');
+      console.error(error.response.data.error);
+    } else {
+      console.error(error);
+    }
+  });
+}
+
+ready(() => {
+  if (!WebAuthnJSON.supported()) {
+    const unsupported_browser_message = document.getElementById('unsupported-browser-message');
+    if (unsupported_browser_message) {
+      unsupported_browser_message.classList.remove('hidden');
+      document.querySelector('.btn.js-webauthn').disabled = true;
+    }
+  }
+
+
+  const webAuthnCredentialRegistrationForm = document.getElementById('new_webauthn_credential');
+  if (webAuthnCredentialRegistrationForm) {
+    webAuthnCredentialRegistrationForm.addEventListener('submit', (event) => {
+      event.preventDefault();
+
+      var nickname = event.target.querySelector('input[name="new_webauthn_credential[nickname]"]');
+      if (nickname.value) {
+        axios.get('/settings/security_keys/options')
+          .then((response) => {
+            const credentialOptions = response.data;
+
+            WebAuthnJSON.create({ 'publicKey': credentialOptions }).then((credential) => {
+              var params = { 'credential': credential, 'nickname': nickname.value };
+              callback('/settings/security_keys', params);
+            }).catch((error) => {
+              const errorMessage = document.getElementById('security-key-error-message');
+              errorMessage.classList.remove('hidden');
+              console.error(error);
+            });
+          }).catch((error) => {
+            console.error(error.response.data.error);
+          });
+      } else {
+        nickname.focus();
+      }
+    });
+  }
+
+  const webAuthnCredentialAuthenticationForm = document.getElementById('webauthn-form');
+  if (webAuthnCredentialAuthenticationForm) {
+    webAuthnCredentialAuthenticationForm.addEventListener('submit', (event) => {
+      event.preventDefault();
+
+      axios.get('sessions/security_key_options')
+        .then((response) => {
+          const credentialOptions = response.data;
+
+          WebAuthnJSON.get({ 'publicKey': credentialOptions }).then((credential) => {
+            var params = { 'user': { 'credential': credential } };
+            callback('sign_in', params);
+          }).catch((error) => {
+            const errorMessage = document.getElementById('security-key-error-message');
+            errorMessage.classList.remove('hidden');
+            console.error(error);
+          });
+        }).catch((error) => {
+          console.error(error.response.data.error);
+        });
+    });
+
+    const otpAuthenticationForm = document.getElementById('otp-authentication-form');
+
+    const linkToOtp = document.getElementById('link-to-otp');
+    linkToOtp.addEventListener('click', () => {
+      webAuthnCredentialAuthenticationForm.classList.add('hidden');
+      otpAuthenticationForm.classList.remove('hidden');
+      hideFlashMessages();
+    });
+
+    const linkToWebAuthn = document.getElementById('link-to-webauthn');
+    linkToWebAuthn.addEventListener('click', () => {
+      otpAuthenticationForm.classList.add('hidden');
+      webAuthnCredentialAuthenticationForm.classList.remove('hidden');
+      hideFlashMessages();
+    });
+  }
+});
diff --git a/app/javascript/flavours/glitch/theme.yml b/app/javascript/flavours/glitch/theme.yml
index 1aa31df187bf55..a037834e2b67fe 100644
--- a/app/javascript/flavours/glitch/theme.yml
+++ b/app/javascript/flavours/glitch/theme.yml
@@ -1,26 +1,32 @@
 #  (REQUIRED) The location of the pack files.
 pack:
   admin:
-    - packs/admin.tsx
-    - packs/public.tsx
-  auth: packs/public.tsx
+    - admin.tsx
+    - public.tsx
+  auth:
+    - public.tsx
+    - two_factor_authentication.js
   common:
-    filename: packs/common.js
+    filename: common.js
     stylesheet: true
-  embed: packs/public.tsx
-  error: packs/error.js
+  error: error.js
   home:
-    filename: packs/home.js
+    filename: home.js
     preload:
       - flavours/glitch/async/compose
       - flavours/glitch/async/home_timeline
       - flavours/glitch/async/notifications
+  inert:
+    filename: inert.js
+    stylesheet: true
   mailer:
-  modal:
-  public: packs/public.tsx
-  settings: packs/public.tsx
-  sign_up: packs/sign_up.js
-  share: packs/share.jsx
+    filename: mailer.js
+    stylesheet: true
+  public: public.tsx
+  settings: public.tsx
+  sign_up: sign_up.js
+  share: share.jsx
+  remote_interaction_helper: remote_interaction_helper.ts
 
 #  (OPTIONAL) The directory which contains localization files for
 #  the flavour, relative to this directory. The contents of this
@@ -35,6 +41,12 @@ inherit_locales: vanilla
 #  or an array thereof. These are the full path from `app/javascript/`.
 screenshot: flavours/glitch/images/glitch-preview.png
 
+#  (OPTIONAL) The directory which contains the pack files.
+#  Defaults to this directory (`app/javascript/flavour/[flavour]`),
+#  but in the case of the vanilla Mastodon flavour the pack files are
+#  somewhere else.
+pack_directory: app/javascript/flavours/glitch/packs
+
 #  (OPTIONAL) The directory which contains the pack files.
 #  Defaults to the theme directory (`app/javascript/themes/[theme]`),
 #  which should be sufficient for like 99% of use-cases lol.
diff --git a/app/javascript/flavours/vanilla/theme.yml b/app/javascript/flavours/vanilla/theme.yml
index 7c7df295d3823b..553a2023795977 100644
--- a/app/javascript/flavours/vanilla/theme.yml
+++ b/app/javascript/flavours/vanilla/theme.yml
@@ -3,11 +3,12 @@ pack:
   admin:
     - admin.tsx
     - public.tsx
-  auth: public.tsx
+  auth:
+    - public.tsx
+    - two_factor_authentication.js
   common:
     filename: common.js
     stylesheet: true
-  embed: public.tsx
   error: error.js
   home:
     filename: application.js
@@ -15,12 +16,17 @@ pack:
       - features/compose
       - features/home_timeline
       - features/notifications
+  inert:
+    filename: inert.js
+    stylesheet: true
   mailer:
-  modal:
+    filename: mailer.js
+    stylesheet: true
   public: public.tsx
   settings: public.tsx
   sign_up: sign_up.js
   share: share.jsx
+  remote_interaction_helper: remote_interaction_helper.ts
 
 #  (OPTIONAL) The directory which contains localization files for
 #  the flavour, relative to this directory.
diff --git a/app/javascript/packs/admin.tsx b/app/javascript/packs/admin.tsx
index 13e740b1902027..9fee5605659663 100644
--- a/app/javascript/packs/admin.tsx
+++ b/app/javascript/packs/admin.tsx
@@ -1,8 +1,265 @@
 import './public-path';
 import { createRoot } from 'react-dom/client';
 
+import Rails from '@rails/ujs';
+
 import ready from '../mastodon/ready';
 
+const setAnnouncementEndsAttributes = (target: HTMLInputElement) => {
+  const valid = target.value && target.validity.valid;
+  const element = document.querySelector<HTMLInputElement>(
+    'input[type="datetime-local"]#announcement_ends_at',
+  );
+
+  if (!element) return;
+
+  if (valid) {
+    element.classList.remove('optional');
+    element.required = true;
+    element.min = target.value;
+  } else {
+    element.classList.add('optional');
+    element.removeAttribute('required');
+    element.removeAttribute('min');
+  }
+};
+
+Rails.delegate(
+  document,
+  'input[type="datetime-local"]#announcement_starts_at',
+  'change',
+  ({ target }) => {
+    if (target instanceof HTMLInputElement)
+      setAnnouncementEndsAttributes(target);
+  },
+);
+
+const batchCheckboxClassName = '.batch-checkbox input[type="checkbox"]';
+
+const showSelectAll = () => {
+  const selectAllMatchingElement = document.querySelector(
+    '.batch-table__select-all',
+  );
+  selectAllMatchingElement?.classList.add('active');
+};
+
+const hideSelectAll = () => {
+  const selectAllMatchingElement = document.querySelector(
+    '.batch-table__select-all',
+  );
+  const hiddenField = document.querySelector<HTMLInputElement>(
+    'input#select_all_matching',
+  );
+  const selectedMsg = document.querySelector(
+    '.batch-table__select-all .selected',
+  );
+  const notSelectedMsg = document.querySelector(
+    '.batch-table__select-all .not-selected',
+  );
+
+  selectAllMatchingElement?.classList.remove('active');
+  selectedMsg?.classList.remove('active');
+  notSelectedMsg?.classList.add('active');
+  if (hiddenField) hiddenField.value = '0';
+};
+
+Rails.delegate(document, '#batch_checkbox_all', 'change', ({ target }) => {
+  if (!(target instanceof HTMLInputElement)) return;
+
+  const selectAllMatchingElement = document.querySelector(
+    '.batch-table__select-all',
+  );
+
+  document
+    .querySelectorAll<HTMLInputElement>(batchCheckboxClassName)
+    .forEach((content) => {
+      content.checked = target.checked;
+    });
+
+  if (selectAllMatchingElement) {
+    if (target.checked) {
+      showSelectAll();
+    } else {
+      hideSelectAll();
+    }
+  }
+});
+
+Rails.delegate(document, '.batch-table__select-all button', 'click', () => {
+  const hiddenField = document.querySelector<HTMLInputElement>(
+    '#select_all_matching',
+  );
+
+  if (!hiddenField) return;
+
+  const active = hiddenField.value === '1';
+  const selectedMsg = document.querySelector(
+    '.batch-table__select-all .selected',
+  );
+  const notSelectedMsg = document.querySelector(
+    '.batch-table__select-all .not-selected',
+  );
+
+  if (!selectedMsg || !notSelectedMsg) return;
+
+  if (active) {
+    hiddenField.value = '0';
+    selectedMsg.classList.remove('active');
+    notSelectedMsg.classList.add('active');
+  } else {
+    hiddenField.value = '1';
+    notSelectedMsg.classList.remove('active');
+    selectedMsg.classList.add('active');
+  }
+});
+
+Rails.delegate(document, batchCheckboxClassName, 'change', () => {
+  const checkAllElement = document.querySelector<HTMLInputElement>(
+    'input#batch_checkbox_all',
+  );
+  const selectAllMatchingElement = document.querySelector(
+    '.batch-table__select-all',
+  );
+
+  if (checkAllElement) {
+    const allCheckboxes = Array.from(
+      document.querySelectorAll<HTMLInputElement>(batchCheckboxClassName),
+    );
+    checkAllElement.checked = allCheckboxes.every((content) => content.checked);
+    checkAllElement.indeterminate =
+      !checkAllElement.checked &&
+      allCheckboxes.some((content) => content.checked);
+
+    if (selectAllMatchingElement) {
+      if (checkAllElement.checked) {
+        showSelectAll();
+      } else {
+        hideSelectAll();
+      }
+    }
+  }
+});
+
+Rails.delegate(
+  document,
+  '.filter-subset--with-select select',
+  'change',
+  ({ target }) => {
+    if (target instanceof HTMLSelectElement) target.form?.submit();
+  },
+);
+
+const onDomainBlockSeverityChange = (target: HTMLSelectElement) => {
+  const rejectMediaDiv = document.querySelector(
+    '.input.with_label.domain_block_reject_media',
+  );
+  const rejectReportsDiv = document.querySelector(
+    '.input.with_label.domain_block_reject_reports',
+  );
+
+  if (rejectMediaDiv && rejectMediaDiv instanceof HTMLElement) {
+    rejectMediaDiv.style.display =
+      target.value === 'suspend' ? 'none' : 'block';
+  }
+
+  if (rejectReportsDiv && rejectReportsDiv instanceof HTMLElement) {
+    rejectReportsDiv.style.display =
+      target.value === 'suspend' ? 'none' : 'block';
+  }
+};
+
+Rails.delegate(document, '#domain_block_severity', 'change', ({ target }) => {
+  if (target instanceof HTMLSelectElement) onDomainBlockSeverityChange(target);
+});
+
+const onEnableBootstrapTimelineAccountsChange = (target: HTMLInputElement) => {
+  const bootstrapTimelineAccountsField =
+    document.querySelector<HTMLInputElement>(
+      '#form_admin_settings_bootstrap_timeline_accounts',
+    );
+
+  if (bootstrapTimelineAccountsField) {
+    bootstrapTimelineAccountsField.disabled = !target.checked;
+    if (target.checked) {
+      bootstrapTimelineAccountsField.parentElement?.classList.remove(
+        'disabled',
+      );
+      bootstrapTimelineAccountsField.parentElement?.parentElement?.classList.remove(
+        'disabled',
+      );
+    } else {
+      bootstrapTimelineAccountsField.parentElement?.classList.add('disabled');
+      bootstrapTimelineAccountsField.parentElement?.parentElement?.classList.add(
+        'disabled',
+      );
+    }
+  }
+};
+
+Rails.delegate(
+  document,
+  '#form_admin_settings_enable_bootstrap_timeline_accounts',
+  'change',
+  ({ target }) => {
+    if (target instanceof HTMLInputElement)
+      onEnableBootstrapTimelineAccountsChange(target);
+  },
+);
+
+const onChangeRegistrationMode = (target: HTMLSelectElement) => {
+  const enabled = target.value === 'approved';
+
+  document
+    .querySelectorAll<HTMLElement>(
+      '.form_admin_settings_registrations_mode .warning-hint',
+    )
+    .forEach((warning_hint) => {
+      warning_hint.style.display = target.value === 'open' ? 'inline' : 'none';
+    });
+
+  document
+    .querySelectorAll<HTMLInputElement>(
+      'input#form_admin_settings_require_invite_text',
+    )
+    .forEach((input) => {
+      input.disabled = !enabled;
+      if (enabled) {
+        let element: HTMLElement | null = input;
+        do {
+          element.classList.remove('disabled');
+          element = element.parentElement;
+        } while (element && !element.classList.contains('fields-group'));
+      } else {
+        let element: HTMLElement | null = input;
+        do {
+          element.classList.add('disabled');
+          element = element.parentElement;
+        } while (element && !element.classList.contains('fields-group'));
+      }
+    });
+};
+
+const convertUTCDateTimeToLocal = (value: string) => {
+  const date = new Date(value + 'Z');
+  const twoChars = (x: number) => x.toString().padStart(2, '0');
+  return `${date.getFullYear()}-${twoChars(date.getMonth() + 1)}-${twoChars(date.getDate())}T${twoChars(date.getHours())}:${twoChars(date.getMinutes())}`;
+};
+
+function convertLocalDatetimeToUTC(value: string) {
+  const date = new Date(value);
+  const fullISO8601 = date.toISOString();
+  return fullISO8601.slice(0, fullISO8601.indexOf('T') + 6);
+}
+
+Rails.delegate(
+  document,
+  '#form_admin_settings_registrations_mode',
+  'change',
+  ({ target }) => {
+    if (target instanceof HTMLSelectElement) onChangeRegistrationMode(target);
+  },
+);
+
 async function mountReactComponent(element: Element) {
   const componentName = element.getAttribute('data-admin-component');
   const stringProps = element.getAttribute('data-props');
@@ -29,6 +286,80 @@ async function mountReactComponent(element: Element) {
 }
 
 ready(() => {
+  const domainBlockSeveritySelect = document.querySelector<HTMLSelectElement>(
+    'select#domain_block_severity',
+  );
+  if (domainBlockSeveritySelect)
+    onDomainBlockSeverityChange(domainBlockSeveritySelect);
+
+  const enableBootstrapTimelineAccounts =
+    document.querySelector<HTMLInputElement>(
+      'input#form_admin_settings_enable_bootstrap_timeline_accounts',
+    );
+  if (enableBootstrapTimelineAccounts)
+    onEnableBootstrapTimelineAccountsChange(enableBootstrapTimelineAccounts);
+
+  const registrationMode = document.querySelector<HTMLSelectElement>(
+    'select#form_admin_settings_registrations_mode',
+  );
+  if (registrationMode) onChangeRegistrationMode(registrationMode);
+
+  const checkAllElement = document.querySelector<HTMLInputElement>(
+    'input#batch_checkbox_all',
+  );
+  if (checkAllElement) {
+    const allCheckboxes = Array.from(
+      document.querySelectorAll<HTMLInputElement>(batchCheckboxClassName),
+    );
+    checkAllElement.checked = allCheckboxes.every((content) => content.checked);
+    checkAllElement.indeterminate =
+      !checkAllElement.checked &&
+      allCheckboxes.some((content) => content.checked);
+  }
+
+  document
+    .querySelector('a#add-instance-button')
+    ?.addEventListener('click', (e) => {
+      const domain = document.querySelector<HTMLInputElement>(
+        'input[type="text"]#by_domain',
+      )?.value;
+
+      if (domain && e.target instanceof HTMLAnchorElement) {
+        const url = new URL(e.target.href);
+        url.searchParams.set('_domain', domain);
+        e.target.href = url.toString();
+      }
+    });
+
+  document
+    .querySelectorAll<HTMLInputElement>('input[type="datetime-local"]')
+    .forEach((element) => {
+      if (element.value) {
+        element.value = convertUTCDateTimeToLocal(element.value);
+      }
+      if (element.placeholder) {
+        element.placeholder = convertUTCDateTimeToLocal(element.placeholder);
+      }
+    });
+
+  Rails.delegate(document, 'form', 'submit', ({ target }) => {
+    if (target instanceof HTMLFormElement)
+      target
+        .querySelectorAll<HTMLInputElement>('input[type="datetime-local"]')
+        .forEach((element) => {
+          if (element.value && element.validity.valid) {
+            element.value = convertLocalDatetimeToUTC(element.value);
+          }
+        });
+  });
+
+  const announcementStartsAt = document.querySelector<HTMLInputElement>(
+    'input[type="datetime-local"]#announcement_starts_at',
+  );
+  if (announcementStartsAt) {
+    setAnnouncementEndsAttributes(announcementStartsAt);
+  }
+
   document.querySelectorAll('[data-admin-component]').forEach((element) => {
     void mountReactComponent(element);
   });
diff --git a/app/javascript/packs/common.js b/app/javascript/packs/common.js
index 05dff8e49482ca..9a889937c4a260 100644
--- a/app/javascript/packs/common.js
+++ b/app/javascript/packs/common.js
@@ -1,2 +1,5 @@
 import './public-path';
+import 'font-awesome/css/font-awesome.css';
 import 'styles/application.scss';
+
+require.context('../images/', true);
diff --git a/app/javascript/core/inert.js b/app/javascript/packs/inert.js
similarity index 100%
rename from app/javascript/core/inert.js
rename to app/javascript/packs/inert.js
diff --git a/app/javascript/core/mailer.js b/app/javascript/packs/mailer.js
similarity index 100%
rename from app/javascript/core/mailer.js
rename to app/javascript/packs/mailer.js
diff --git a/app/javascript/packs/public.tsx b/app/javascript/packs/public.tsx
index 17befbd2242fd2..044faeb29605cb 100644
--- a/app/javascript/packs/public.tsx
+++ b/app/javascript/packs/public.tsx
@@ -37,6 +37,43 @@ const messages = defineMessages({
   },
 });
 
+interface SetHeightMessage {
+  type: 'setHeight';
+  id: string;
+  height: number;
+}
+
+function isSetHeightMessage(data: unknown): data is SetHeightMessage {
+  if (
+    data &&
+    typeof data === 'object' &&
+    'type' in data &&
+    data.type === 'setHeight'
+  )
+    return true;
+  else return false;
+}
+
+window.addEventListener('message', (e) => {
+  // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition -- typings are not correct, it can be null in very rare cases
+  if (!e.data || !isSetHeightMessage(e.data) || !window.parent) return;
+
+  const data = e.data;
+
+  ready(() => {
+    window.parent.postMessage(
+      {
+        type: 'setHeight',
+        id: data.id,
+        height: document.getElementsByTagName('html')[0].scrollHeight,
+      },
+      '*',
+    );
+  }).catch((e) => {
+    console.error('Error in setHeightMessage postMessage', e);
+  });
+});
+
 function loaded() {
   const { messages: localeData } = getLocale();
 
@@ -288,6 +325,72 @@ function loaded() {
     });
 }
 
+Rails.delegate(
+  document,
+  '#edit_profile input[type=file]',
+  'change',
+  ({ target }) => {
+    if (!(target instanceof HTMLInputElement)) return;
+
+    const avatar = document.querySelector<HTMLImageElement>(
+      `img#${target.id}-preview`,
+    );
+
+    if (!avatar) return;
+
+    let file: File | undefined;
+    if (target.files) file = target.files[0];
+
+    const url = file ? URL.createObjectURL(file) : avatar.dataset.originalSrc;
+
+    if (url) avatar.src = url;
+  },
+);
+
+Rails.delegate(document, '.input-copy input', 'click', ({ target }) => {
+  if (!(target instanceof HTMLInputElement)) return;
+
+  target.focus();
+  target.select();
+  target.setSelectionRange(0, target.value.length);
+});
+
+Rails.delegate(document, '.input-copy button', 'click', ({ target }) => {
+  if (!(target instanceof HTMLButtonElement)) return;
+
+  const input = target.parentNode?.querySelector<HTMLInputElement>(
+    '.input-copy__wrapper input',
+  );
+
+  if (!input) return;
+
+  const oldReadOnly = input.readOnly;
+
+  input.readOnly = false;
+  input.focus();
+  input.select();
+  input.setSelectionRange(0, input.value.length);
+
+  try {
+    if (document.execCommand('copy')) {
+      input.blur();
+
+      const parent = target.parentElement;
+
+      if (!parent) return;
+      parent.classList.add('copied');
+
+      setTimeout(() => {
+        parent.classList.remove('copied');
+      }, 700);
+    }
+  } catch (err) {
+    console.error(err);
+  }
+
+  input.readOnly = oldReadOnly;
+});
+
 const toggleSidebar = () => {
   const sidebar = document.querySelector<HTMLUListElement>('.sidebar ul');
   const toggleButton = document.querySelector<HTMLAnchorElement>(
diff --git a/app/javascript/packs/remote_interaction_helper.ts b/app/javascript/packs/remote_interaction_helper.ts
new file mode 100644
index 00000000000000..d5834c6c3d2ee9
--- /dev/null
+++ b/app/javascript/packs/remote_interaction_helper.ts
@@ -0,0 +1,174 @@
+/*
+
+This script is meant to to be used in an `iframe` with the sole purpose of doing webfinger queries
+client-side without being restricted by a strict `connect-src` Content-Security-Policy directive.
+
+It communicates with the parent window through message events that are authenticated by origin,
+and performs no other task.
+
+*/
+
+import './public-path';
+
+import axios from 'axios';
+
+interface JRDLink {
+  rel: string;
+  template?: string;
+  href?: string;
+}
+
+const isJRDLink = (link: unknown): link is JRDLink =>
+  typeof link === 'object' &&
+  link !== null &&
+  'rel' in link &&
+  typeof link.rel === 'string' &&
+  (!('template' in link) || typeof link.template === 'string') &&
+  (!('href' in link) || typeof link.href === 'string');
+
+const findLink = (rel: string, data: unknown): JRDLink | undefined => {
+  if (
+    typeof data === 'object' &&
+    data !== null &&
+    'links' in data &&
+    data.links instanceof Array
+  ) {
+    return data.links.find(
+      (link): link is JRDLink => isJRDLink(link) && link.rel === rel,
+    );
+  } else {
+    return undefined;
+  }
+};
+
+const findTemplateLink = (data: unknown) =>
+  findLink('http://ostatus.org/schema/1.0/subscribe', data)?.template;
+
+const fetchInteractionURLSuccess = (
+  uri_or_domain: string,
+  template: string,
+) => {
+  window.parent.postMessage(
+    {
+      type: 'fetchInteractionURL-success',
+      uri_or_domain,
+      template,
+    },
+    window.origin,
+  );
+};
+
+const fetchInteractionURLFailure = () => {
+  window.parent.postMessage(
+    {
+      type: 'fetchInteractionURL-failure',
+    },
+    window.origin,
+  );
+};
+
+const isValidDomain = (value: string) => {
+  const url = new URL('https:///path');
+  url.hostname = value;
+  return url.hostname === value;
+};
+
+// Attempt to find a remote interaction URL from a domain
+const fromDomain = (domain: string) => {
+  const fallbackTemplate = `https://${domain}/authorize_interaction?uri={uri}`;
+
+  axios
+    .get(`https://${domain}/.well-known/webfinger`, {
+      params: { resource: `https://${domain}` },
+    })
+    .then(({ data }) => {
+      const template = findTemplateLink(data);
+      fetchInteractionURLSuccess(domain, template ?? fallbackTemplate);
+      return;
+    })
+    .catch(() => {
+      fetchInteractionURLSuccess(domain, fallbackTemplate);
+    });
+};
+
+// Attempt to find a remote interaction URL from an arbitrary URL
+const fromURL = (url: string) => {
+  const domain = new URL(url).host;
+  const fallbackTemplate = `https://${domain}/authorize_interaction?uri={uri}`;
+
+  axios
+    .get(`https://${domain}/.well-known/webfinger`, {
+      params: { resource: url },
+    })
+    .then(({ data }) => {
+      const template = findTemplateLink(data);
+      fetchInteractionURLSuccess(url, template ?? fallbackTemplate);
+      return;
+    })
+    .catch(() => {
+      fromDomain(domain);
+    });
+};
+
+// Attempt to find a remote interaction URL from a `user@domain` string
+const fromAcct = (acct: string) => {
+  acct = acct.replace(/^@/, '');
+
+  const segments = acct.split('@');
+
+  if (segments.length !== 2 || !segments[0] || !isValidDomain(segments[1])) {
+    fetchInteractionURLFailure();
+    return;
+  }
+
+  const domain = segments[1];
+  const fallbackTemplate = `https://${domain}/authorize_interaction?uri={uri}`;
+
+  axios
+    .get(`https://${domain}/.well-known/webfinger`, {
+      params: { resource: `acct:${acct}` },
+    })
+    .then(({ data }) => {
+      const template = findTemplateLink(data);
+      fetchInteractionURLSuccess(acct, template ?? fallbackTemplate);
+      return;
+    })
+    .catch(() => {
+      // TODO: handle host-meta?
+      fromDomain(domain);
+    });
+};
+
+const fetchInteractionURL = (uri_or_domain: string) => {
+  if (uri_or_domain === '') {
+    fetchInteractionURLFailure();
+  } else if (/^https?:\/\//.test(uri_or_domain)) {
+    fromURL(uri_or_domain);
+  } else if (uri_or_domain.includes('@')) {
+    fromAcct(uri_or_domain);
+  } else {
+    fromDomain(uri_or_domain);
+  }
+};
+
+window.addEventListener('message', (event: MessageEvent<unknown>) => {
+  // Check message origin
+  if (
+    !window.origin ||
+    window.parent !== event.source ||
+    event.origin !== window.origin
+  ) {
+    return;
+  }
+
+  if (
+    event.data &&
+    typeof event.data === 'object' &&
+    'type' in event.data &&
+    event.data.type === 'fetchInteractionURL' &&
+    'uri_or_domain' in event.data &&
+    typeof event.data.uri_or_domain === 'string'
+  ) {
+    fetchInteractionURL(event.data.uri_or_domain);
+  }
+});
diff --git a/app/javascript/core/two_factor_authentication.js b/app/javascript/packs/two_factor_authentication.js
similarity index 99%
rename from app/javascript/core/two_factor_authentication.js
rename to app/javascript/packs/two_factor_authentication.js
index e76700a480a747..e77965c757fd0e 100644
--- a/app/javascript/core/two_factor_authentication.js
+++ b/app/javascript/packs/two_factor_authentication.js
@@ -1,5 +1,3 @@
-import 'packs/public-path';
-
 import * as WebAuthnJSON from '@github/webauthn-json';
 import axios from 'axios';
 
diff --git a/app/lib/themes.rb b/app/lib/themes.rb
index 45ba47780b5ffe..d7097e62c03fc5 100644
--- a/app/lib/themes.rb
+++ b/app/lib/themes.rb
@@ -7,9 +7,6 @@ class Themes
   include Singleton
 
   def initialize
-    core = YAML.load_file(Rails.root.join('app', 'javascript', 'core', 'theme.yml'))
-    core['pack'] = {} unless core['pack']
-
     result = {}
     Rails.root.glob('app/javascript/flavours/*/theme.yml') do |pathname|
       data = YAML.load_file(pathname)
@@ -61,12 +58,9 @@ def initialize
       result[name]['skin'][skin] = pack if skin != 'default'
     end
 
-    @core = core
     @conf = result
   end
 
-  attr_reader :core
-
   def flavour(name)
     @conf[name]
   end
diff --git a/app/views/layouts/_theme.html.haml b/app/views/layouts/_theme.html.haml
index 2b40d408f25ae8..7c21da3246691d 100644
--- a/app/views/layouts/_theme.html.haml
+++ b/app/views/layouts/_theme.html.haml
@@ -1,7 +1,7 @@
 - if theme
   = render partial: 'layouts/theme', object: theme[:common] if theme[:pack] != 'common' && theme[:common]
   - if theme[:pack]
-    - pack_path = theme[:flavour] ? "flavours/#{theme[:flavour]}/#{theme[:pack]}" : "core/#{theme[:pack]}"
+    - pack_path = "flavours/#{theme[:flavour]}/#{theme[:pack]}"
     = javascript_pack_tag pack_path, crossorigin: 'anonymous'
     - if theme[:skin]
       - if !theme[:flavour] || theme[:skin] == 'default'
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 3e11e79052cee2..b1b705669cd8a7 100755
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -29,7 +29,7 @@
     = javascript_pack_tag 'common', crossorigin: 'anonymous'
 
     -# Needed for the wicg-inert polyfill. It needs to be on it's own <style> tag, with this `id`
-    = stylesheet_pack_tag 'core/inert', media: 'all', id: 'inert-style'
+    = stylesheet_pack_tag 'flavours/vanilla/inert', media: 'all', id: 'inert-style'
 
     - if @theme
       - if @theme[:supported_locales].include? I18n.locale.to_s
@@ -42,7 +42,6 @@
     = yield :header_tags
 
     -# These must come after :header_tags to ensure our initial state has been defined.
-    = render partial: 'layouts/theme', object: @core
     = render partial: 'layouts/theme', object: @theme
 
     = stylesheet_link_tag custom_css_path, skip_pipeline: true, host: root_url, media: 'all'
diff --git a/app/views/layouts/embedded.html.haml b/app/views/layouts/embedded.html.haml
index bb45835511bc92..9339ad34e88e01 100644
--- a/app/views/layouts/embedded.html.haml
+++ b/app/views/layouts/embedded.html.haml
@@ -18,7 +18,6 @@
         = preload_pack_asset "locales/#{@theme[:flavour]}/#{I18n.locale}-json.js"
       - elsif @theme[:supported_locales].include? 'en'
         = preload_pack_asset "locales/#{@theme[:flavour]}/en-json.js"
-    = render partial: 'layouts/theme', object: @core
     = render partial: 'layouts/theme', object: @theme
 
   %body.embed
diff --git a/app/views/layouts/error.html.haml b/app/views/layouts/error.html.haml
index 6ecf1e4637d0c4..8581db8b8f597c 100644
--- a/app/views/layouts/error.html.haml
+++ b/app/views/layouts/error.html.haml
@@ -6,7 +6,6 @@
     %title= safe_join([yield(:page_title), Setting.default_settings['site_title']], ' - ')
     %meta{ content: 'width=device-width,initial-scale=1', name: 'viewport' }/
     = javascript_pack_tag 'common', crossorigin: 'anonymous'
-    = render partial: 'layouts/theme', object: @core || { pack: 'common' }
     = render partial: 'layouts/theme', object: @theme || { pack: 'error', flavour: 'glitch', common: { pack: 'common', flavour: 'glitch', skin: 'default' } }
   %body.error
     .dialog
diff --git a/app/views/layouts/mailer.html.haml b/app/views/layouts/mailer.html.haml
index c16f29bd77694c..76f9b827a0e8bf 100644
--- a/app/views/layouts/mailer.html.haml
+++ b/app/views/layouts/mailer.html.haml
@@ -18,7 +18,7 @@
       <o:PixelsPerInch>96</o:PixelsPerInch>
       </o:OfficeDocumentSettings>
       </xml>
-    = stylesheet_pack_tag 'core/mailer'
+    = stylesheet_pack_tag 'flavours/vanilla/mailer'
   %body
     .email{ dir: locale_direction }
       %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
diff --git a/app/views/media/player.html.haml b/app/views/media/player.html.haml
index d4e3c1cfa76ef0..9a0c420fc3d73f 100644
--- a/app/views/media/player.html.haml
+++ b/app/views/media/player.html.haml
@@ -6,7 +6,6 @@
       = preload_pack_asset "locales/#{@theme[:flavour]}/#{I18n.locale}-json.js"
     - elsif @theme[:supported_locales].include? 'en'
       = preload_pack_asset "locales/#{@theme[:flavour]}/en-json.js"
-  = render partial: 'layouts/theme', object: @core
   = render partial: 'layouts/theme', object: @theme
 
 :ruby
diff --git a/app/views/remote_interaction_helper/index.html.haml b/app/views/remote_interaction_helper/index.html.haml
index 7a1d975c3057ed..84a48bf05757f8 100644
--- a/app/views/remote_interaction_helper/index.html.haml
+++ b/app/views/remote_interaction_helper/index.html.haml
@@ -1,4 +1,4 @@
 - content_for :header_tags do
   %meta{ name: 'robots', content: 'noindex' }/
 
-  = javascript_pack_tag 'core/remote_interaction_helper', crossorigin: 'anonymous'
+  = javascript_pack_tag 'flavours/vanilla/remote_interaction_helper', crossorigin: 'anonymous'
diff --git a/config/webpack/configuration.js b/config/webpack/configuration.js
index 82d5b2e3da70c9..04c84c85ee4f2a 100644
--- a/config/webpack/configuration.js
+++ b/config/webpack/configuration.js
@@ -13,15 +13,6 @@ const flavourFiles = glob.sync('app/javascript/flavours/*/theme.yml');
 const skinFiles = glob.sync('app/javascript/skins/*/*');
 const flavours = {};
 
-const core = function () {
-  const coreFile = resolve('app', 'javascript', 'core', 'theme.yml');
-  const data = load(readFileSync(coreFile), 'utf8');
-  if (!data.pack_directory) {
-    data.pack_directory = dirname(coreFile);
-  }
-  return data.pack ? data : {};
-}();
-
 flavourFiles.forEach((flavourFile) => {
   const data = load(readFileSync(flavourFile), 'utf8');
   data.name = basename(dirname(flavourFile));
@@ -62,7 +53,6 @@ const output = {
 
 module.exports = {
   settings,
-  core,
   flavours,
   env: {
     NODE_ENV: env.NODE_ENV,
diff --git a/config/webpack/shared.js b/config/webpack/shared.js
index 896225da91fa5b..1099e2916c84b3 100644
--- a/config/webpack/shared.js
+++ b/config/webpack/shared.js
@@ -7,7 +7,7 @@ const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 const webpack = require('webpack');
 const AssetsManifestPlugin = require('webpack-assets-manifest');
 
-const { env, settings, core, flavours, output } = require('./configuration');
+const { env, settings, flavours, output } = require('./configuration');
 const rules = require('./rules');
 
 function reducePacks (data, into = {}) {
@@ -26,7 +26,7 @@ function reducePacks (data, into = {}) {
       packFiles = [pack.filename];
 
     if (packFiles) {
-      into[data.name ? `flavours/${data.name}/${entry}` : `core/${entry}`] = packFiles.map(packFile => resolve(data.pack_directory, packFile));
+      into[`flavours/${data.name}/${entry}`] = packFiles.map(packFile => resolve(data.pack_directory, packFile));
     }
   }
 
@@ -48,7 +48,6 @@ function reducePacks (data, into = {}) {
 }
 
 const entries = Object.assign(
-  reducePacks(core),
   Object.values(flavours).reduce((map, data) => reducePacks(data, map), {}),
 );
 

From 9a8be8cf4976d1ccdc280a9c0adfc92e7a0205aa Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Sat, 27 Apr 2024 19:38:11 +0200
Subject: [PATCH 0843/2191] Remove theme fallback mechanism

Remove the `fallback` property and do not fallback to using another flavour
when a pack is not available in the selected flavour.

Flavours should define all packs, and should they wish to piggy-back on
another one, they can import that other one's pack explicitly instead.
---
 app/controllers/concerns/theming_concern.rb | 12 ------------
 app/javascript/flavours/glitch/theme.yml    |  7 -------
 app/javascript/flavours/vanilla/theme.yml   |  6 ------
 3 files changed, 25 deletions(-)

diff --git a/app/controllers/concerns/theming_concern.rb b/app/controllers/concerns/theming_concern.rb
index 5d24001bbf3489..4992788a0458d0 100644
--- a/app/controllers/concerns/theming_concern.rb
+++ b/app/controllers/concerns/theming_concern.rb
@@ -65,18 +65,6 @@ def resolve_pack(data, pack_name, skin)
     return pack(data, pack_name, skin) if valid_pack_data?(data, pack_name)
     return if data['name'].blank?
 
-    fallbacks = []
-    if data.key?('fallback')
-      fallbacks = data['fallback'] if data['fallback'].is_a?(Array)
-      fallbacks = [data['fallback']] if data['fallback'].is_a?(String)
-    elsif data['name'] != Setting.default_settings['flavour']
-      fallbacks = [Setting.default_settings['flavour']]
-    end
-
-    fallbacks.each do |fallback|
-      return resolve_pack(Themes.instance.flavour(fallback), pack_name, skin) if Themes.instance.flavour(fallback)
-    end
-
     nil
   end
 
diff --git a/app/javascript/flavours/glitch/theme.yml b/app/javascript/flavours/glitch/theme.yml
index a037834e2b67fe..670a163fcd39be 100644
--- a/app/javascript/flavours/glitch/theme.yml
+++ b/app/javascript/flavours/glitch/theme.yml
@@ -46,15 +46,8 @@ screenshot: flavours/glitch/images/glitch-preview.png
 #  but in the case of the vanilla Mastodon flavour the pack files are
 #  somewhere else.
 pack_directory: app/javascript/flavours/glitch/packs
-
 #  (OPTIONAL) The directory which contains the pack files.
 #  Defaults to the theme directory (`app/javascript/themes/[theme]`),
 #  which should be sufficient for like 99% of use-cases lol.
 
 #      pack_directory: app/javascript/packs
-
-#  (OPTIONAL) By default the theme will fallback to the default theme
-#  if a particular pack is not provided. You can specify different
-#  fallbacks here, or disable fallback behaviours altogether by
-#  specifying a `null` value.
-fallback:
diff --git a/app/javascript/flavours/vanilla/theme.yml b/app/javascript/flavours/vanilla/theme.yml
index 553a2023795977..ea02dee6cf9f81 100644
--- a/app/javascript/flavours/vanilla/theme.yml
+++ b/app/javascript/flavours/vanilla/theme.yml
@@ -41,9 +41,3 @@ screenshot: images/screenshot.png
 #  but in the case of the vanilla Mastodon flavour the pack files are
 #  somewhere else.
 pack_directory: app/javascript/packs
-
-#  (OPTIONAL) By default the theme will fallback to the default flavour
-#  if a particular pack is not provided. You can specify different
-#  fallbacks here, or disable fallback behaviours altogether by
-#  specifying a `null` value.
-fallback:

From dee57982f101a29bc9b2c44a331e33305b422307 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Sat, 27 Apr 2024 20:01:31 +0200
Subject: [PATCH 0844/2191] =?UTF-8?q?Rename=20=E2=80=9Chome=E2=80=9D=20pac?=
 =?UTF-8?q?k=20to=20=E2=80=9Capplication=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/concerns/web_app_controller_concern.rb        | 2 +-
 .../flavours/glitch/packs/{home.js => application.js}         | 0
 app/javascript/flavours/glitch/theme.yml                      | 4 ++--
 app/javascript/flavours/vanilla/theme.yml                     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename app/javascript/flavours/glitch/packs/{home.js => application.js} (100%)

diff --git a/app/controllers/concerns/web_app_controller_concern.rb b/app/controllers/concerns/web_app_controller_concern.rb
index a6af62af97f7d8..d20643e66ca1db 100644
--- a/app/controllers/concerns/web_app_controller_concern.rb
+++ b/app/controllers/concerns/web_app_controller_concern.rb
@@ -39,6 +39,6 @@ def redirect_unauthenticated_to_permalinks!
   end
 
   def set_pack
-    use_pack 'home'
+    use_pack 'application'
   end
 end
diff --git a/app/javascript/flavours/glitch/packs/home.js b/app/javascript/flavours/glitch/packs/application.js
similarity index 100%
rename from app/javascript/flavours/glitch/packs/home.js
rename to app/javascript/flavours/glitch/packs/application.js
diff --git a/app/javascript/flavours/glitch/theme.yml b/app/javascript/flavours/glitch/theme.yml
index 670a163fcd39be..99a31cb663fe5e 100644
--- a/app/javascript/flavours/glitch/theme.yml
+++ b/app/javascript/flavours/glitch/theme.yml
@@ -10,8 +10,8 @@ pack:
     filename: common.js
     stylesheet: true
   error: error.js
-  home:
-    filename: home.js
+  application:
+    filename: application.js
     preload:
       - flavours/glitch/async/compose
       - flavours/glitch/async/home_timeline
diff --git a/app/javascript/flavours/vanilla/theme.yml b/app/javascript/flavours/vanilla/theme.yml
index ea02dee6cf9f81..61ee528f962c15 100644
--- a/app/javascript/flavours/vanilla/theme.yml
+++ b/app/javascript/flavours/vanilla/theme.yml
@@ -10,7 +10,7 @@ pack:
     filename: common.js
     stylesheet: true
   error: error.js
-  home:
+  application:
     filename: application.js
     preload:
       - features/compose

From 93cdc66e64b6ce2fbe10b952d8c1341af0eec187 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Sat, 27 Apr 2024 22:01:49 +0200
Subject: [PATCH 0845/2191] Make `common` inheritence unconditional and
 simplify theming code

---
 app/controllers/concerns/theming_concern.rb | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/app/controllers/concerns/theming_concern.rb b/app/controllers/concerns/theming_concern.rb
index 4992788a0458d0..9ef436ba8a5e83 100644
--- a/app/controllers/concerns/theming_concern.rb
+++ b/app/controllers/concerns/theming_concern.rb
@@ -24,7 +24,6 @@ def valid_pack_data?(data, pack_name)
 
   def nil_pack(data)
     {
-      use_common: true,
       flavour: data['name'],
       pack: nil,
       preload: nil,
@@ -35,7 +34,6 @@ def nil_pack(data)
 
   def pack(data, pack_name, skin)
     pack_data = {
-      use_common: true,
       flavour: data['name'],
       pack: pack_name,
       preload: nil,
@@ -45,7 +43,6 @@ def pack(data, pack_name, skin)
 
     return pack_data unless data['pack'][pack_name].is_a?(Hash)
 
-    pack_data[:use_common] = false if data['pack'][pack_name]['use_common'] == false
     pack_data[:pack] = nil unless data['pack'][pack_name]['filename']
 
     preloads = data['pack'][pack_name]['preload']
@@ -62,15 +59,12 @@ def pack(data, pack_name, skin)
   end
 
   def resolve_pack(data, pack_name, skin)
-    return pack(data, pack_name, skin) if valid_pack_data?(data, pack_name)
-    return if data['name'].blank?
-
-    nil
+    pack(data, pack_name, skin) if valid_pack_data?(data, pack_name)
   end
 
   def resolve_pack_with_common(data, pack_name, skin = 'default')
     result = resolve_pack(data, pack_name, skin) || nil_pack(data)
-    result[:common] = resolve_pack(data, 'common', skin) if result.delete(:use_common)
+    result[:common] = resolve_pack(data, 'common', skin)
     result
   end
 end

From c3e12a4dfa10d7678855ba7f3e4c37f6ea1cb09d Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Sat, 27 Apr 2024 22:34:41 +0200
Subject: [PATCH 0846/2191] Change how theme style packs are loaded

Load the `common` style pack, and then charge the style pack for the current
skin, independent from any selected JS pack.
---
 app/controllers/application_controller.rb     |  1 +
 app/controllers/concerns/theming_concern.rb   | 41 ++++---------------
 app/javascript/flavours/glitch/common.js      | 12 ++++++
 .../flavours/glitch/packs/application.js      |  4 ++
 .../flavours/glitch/packs/common.js           |  9 ++--
 .../flavours/glitch/packs/public.tsx          |  3 ++
 .../flavours/glitch/packs/share.jsx           |  3 ++
 app/javascript/packs/common.js                |  6 +--
 .../skins/glitch/default/common.scss          |  1 +
 .../skins/vanilla/default/common.scss         |  1 +
 app/lib/themes.rb                             | 27 +++++-------
 app/views/layouts/_theme.html.haml            | 17 +++-----
 app/views/layouts/application.html.haml       |  8 ++--
 app/views/layouts/embedded.html.haml          |  7 +++-
 app/views/layouts/error.html.haml             |  2 +
 config/webpack/configuration.js               |  9 ++--
 config/webpack/shared.js                      |  7 +---
 lib/tasks/assets.rake                         |  8 ++++
 18 files changed, 82 insertions(+), 84 deletions(-)
 create mode 100644 app/javascript/flavours/glitch/common.js
 create mode 100644 app/javascript/skins/glitch/default/common.scss
 create mode 100644 app/javascript/skins/vanilla/default/common.scss

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index c76110dba74d9a..cf953fcf2c3c2d 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -19,6 +19,7 @@ class ApplicationController < ActionController::Base
   helper_method :current_session
   helper_method :current_flavour
   helper_method :current_skin
+  helper_method :current_theme
   helper_method :single_user_mode?
   helper_method :use_seamless_external_login?
   helper_method :omniauth_only?
diff --git a/app/controllers/concerns/theming_concern.rb b/app/controllers/concerns/theming_concern.rb
index 9ef436ba8a5e83..7da04e1531df31 100644
--- a/app/controllers/concerns/theming_concern.rb
+++ b/app/controllers/concerns/theming_concern.rb
@@ -4,7 +4,7 @@ module ThemingConcern
   extend ActiveSupport::Concern
 
   def use_pack(pack_name)
-    @theme = resolve_pack_with_common(Themes.instance.flavour(current_flavour), pack_name, current_skin)
+    @theme = resolve_pack(Themes.instance.flavour(current_flavour), pack_name)
   end
 
   private
@@ -18,29 +18,22 @@ def current_skin
     [current_user&.setting_skin, Setting.skin, 'default'].find { |skin| skins.include?(skin) }
   end
 
-  def valid_pack_data?(data, pack_name)
-    data['pack'].is_a?(Hash) && data['pack'][pack_name].present?
+  def current_theme
+    # NOTE: this is slightly different from upstream, as it's a derived value used
+    # for the sole purpose of pointing to the appropriate stylesheet pack
+    "skins/#{current_flavour}/#{current_skin}"
   end
 
-  def nil_pack(data)
-    {
-      flavour: data['name'],
-      pack: nil,
-      preload: nil,
-      skin: nil,
-      supported_locales: data['locales'],
-    }
-  end
-
-  def pack(data, pack_name, skin)
+  def resolve_pack(data, pack_name)
     pack_data = {
       flavour: data['name'],
-      pack: pack_name,
+      pack: nil,
       preload: nil,
-      skin: nil,
       supported_locales: data['locales'],
     }
+    return pack_data unless data['pack'].is_a?(Hash) && data['pack'][pack_name].present?
 
+    pack_data[:pack] = pack_name
     return pack_data unless data['pack'][pack_name].is_a?(Hash)
 
     pack_data[:pack] = nil unless data['pack'][pack_name]['filename']
@@ -49,22 +42,6 @@ def pack(data, pack_name, skin)
     pack_data[:preload] = [preloads] if preloads.is_a?(String)
     pack_data[:preload] = preloads if preloads.is_a?(Array)
 
-    if skin != 'default' && data['skin'][skin]
-      pack_data[:skin] = skin if data['skin'][skin].include?(pack_name)
-    elsif data['pack'][pack_name]['stylesheet']
-      pack_data[:skin] = 'default'
-    end
-
     pack_data
   end
-
-  def resolve_pack(data, pack_name, skin)
-    pack(data, pack_name, skin) if valid_pack_data?(data, pack_name)
-  end
-
-  def resolve_pack_with_common(data, pack_name, skin = 'default')
-    result = resolve_pack(data, pack_name, skin) || nil_pack(data)
-    result[:common] = resolve_pack(data, 'common', skin)
-    result
-  end
 end
diff --git a/app/javascript/flavours/glitch/common.js b/app/javascript/flavours/glitch/common.js
new file mode 100644
index 00000000000000..40a324a59bceb0
--- /dev/null
+++ b/app/javascript/flavours/glitch/common.js
@@ -0,0 +1,12 @@
+import Rails from '@rails/ujs';
+import 'font-awesome/css/font-awesome.css';
+
+export function start() {
+  require.context('@/images/', true);
+
+  try {
+    Rails.start();
+  } catch (e) {
+    // If called twice
+  }
+}
diff --git a/app/javascript/flavours/glitch/packs/application.js b/app/javascript/flavours/glitch/packs/application.js
index 842430354d34f0..336a250f54a0c0 100644
--- a/app/javascript/flavours/glitch/packs/application.js
+++ b/app/javascript/flavours/glitch/packs/application.js
@@ -1,8 +1,12 @@
 import 'packs/public-path';
+
+import { start } from 'flavours/glitch/common';
 import { loadLocale } from 'flavours/glitch/locales';
 import main from "flavours/glitch/main";
 import { loadPolyfills } from 'flavours/glitch/polyfills';
 
+start();
+
 loadPolyfills()
   .then(loadLocale)
   .then(main)
diff --git a/app/javascript/flavours/glitch/packs/common.js b/app/javascript/flavours/glitch/packs/common.js
index 48e414909dca39..79467fc493987e 100644
--- a/app/javascript/flavours/glitch/packs/common.js
+++ b/app/javascript/flavours/glitch/packs/common.js
@@ -1,9 +1,8 @@
+/* This file is a hack to have something more reliable than the upstream `common` tag
+  that is implicitly generated as the common chunk through webpack's `splitChunks` config */
+
 import 'packs/public-path';
 import 'font-awesome/css/font-awesome.css';
-import Rails from '@rails/ujs';
-import 'flavours/glitch/styles/index.scss';
-
-Rails.start();
 
-//  This ensures that webpack compiles our images.
+// This is a hack to ensures that webpack compiles our images.
 require.context('../images', true);
diff --git a/app/javascript/flavours/glitch/packs/public.tsx b/app/javascript/flavours/glitch/packs/public.tsx
index db6edfdc98f5d3..6087f7b7c1f962 100644
--- a/app/javascript/flavours/glitch/packs/public.tsx
+++ b/app/javascript/flavours/glitch/packs/public.tsx
@@ -10,6 +10,7 @@ import Rails from '@rails/ujs';
 import axios from 'axios';
 import { throttle } from 'lodash';
 
+import { start } from 'flavours/glitch/common';
 import { timeAgoString } from 'flavours/glitch/components/relative_timestamp';
 import emojify from 'flavours/glitch/features/emoji/emoji';
 import loadKeyboardExtensions from 'flavours/glitch/load_keyboard_extensions';
@@ -19,6 +20,8 @@ import ready from 'flavours/glitch/ready';
 
 import 'cocoon-js-vanilla';
 
+start();
+
 const messages = defineMessages({
   usernameTaken: {
     id: 'username.taken',
diff --git a/app/javascript/flavours/glitch/packs/share.jsx b/app/javascript/flavours/glitch/packs/share.jsx
index 7a4e333653f8d8..3d938f5b2a3f3e 100644
--- a/app/javascript/flavours/glitch/packs/share.jsx
+++ b/app/javascript/flavours/glitch/packs/share.jsx
@@ -1,10 +1,13 @@
 import 'packs/public-path';
 import { createRoot } from 'react-dom/client';
 
+import { start } from 'flavours/glitch/common';
 import ComposeContainer from 'flavours/glitch/containers/compose_container';
 import { loadPolyfills } from 'flavours/glitch/polyfills';
 import ready from 'flavours/glitch/ready';
 
+start();
+
 function loaded() {
   const mountNode = document.getElementById('mastodon-compose');
 
diff --git a/app/javascript/packs/common.js b/app/javascript/packs/common.js
index 9a889937c4a260..489041458f3700 100644
--- a/app/javascript/packs/common.js
+++ b/app/javascript/packs/common.js
@@ -1,5 +1,5 @@
+/* This file is a hack to have something more reliable than the upstream `common` tag
+  that is implicitly generated as the common chunk through webpack's `splitChunks` config */
+
 import './public-path';
 import 'font-awesome/css/font-awesome.css';
-import 'styles/application.scss';
-
-require.context('../images/', true);
diff --git a/app/javascript/skins/glitch/default/common.scss b/app/javascript/skins/glitch/default/common.scss
new file mode 100644
index 00000000000000..d2f673fde871a7
--- /dev/null
+++ b/app/javascript/skins/glitch/default/common.scss
@@ -0,0 +1 @@
+@import 'flavours/glitch/styles/index';
diff --git a/app/javascript/skins/vanilla/default/common.scss b/app/javascript/skins/vanilla/default/common.scss
new file mode 100644
index 00000000000000..71ac01180a62b4
--- /dev/null
+++ b/app/javascript/skins/vanilla/default/common.scss
@@ -0,0 +1 @@
+@import 'styles/application';
diff --git a/app/lib/themes.rb b/app/lib/themes.rb
index d7097e62c03fc5..b379e139e92973 100644
--- a/app/lib/themes.rb
+++ b/app/lib/themes.rb
@@ -7,7 +7,8 @@ class Themes
   include Singleton
 
   def initialize
-    result = {}
+    @flavours = {}
+
     Rails.root.glob('app/javascript/flavours/*/theme.yml') do |pathname|
       data = YAML.load_file(pathname)
       next unless data['pack']
@@ -35,42 +36,34 @@ def initialize
       data['name'] = name
       data['locales'] = locales
       data['screenshot'] = screenshots
-      data['skin'] = { 'default' => [] }
-      result[name] = data
+      data['skins'] = []
+      @flavours[name] = data
     end
 
     Rails.root.glob('app/javascript/skins/*/*') do |pathname|
       ext = pathname.extname.to_s
       skin = pathname.basename.to_s
       name = pathname.dirname.basename.to_s
-      next unless result[name]
+      next unless @flavours[name]
 
       if pathname.directory?
-        pack = []
-        pathname.glob('*.{css,scss}') do |sheet|
-          pack.push(sheet.basename(sheet.extname).to_s)
-        end
+        @flavours[name]['skins'] << skin if pathname.glob('{common,index,application}.{css,scss}').any?
       elsif /^\.s?css$/i.match?(ext)
-        skin = pathname.basename(ext).to_s
-        pack = ['common']
+        @flavours[name]['skins'] << pathname.basename(ext).to_s
       end
-
-      result[name]['skin'][skin] = pack if skin != 'default'
     end
-
-    @conf = result
   end
 
   def flavour(name)
-    @conf[name]
+    @flavours[name]
   end
 
   def flavours
-    @conf.keys
+    @flavours.keys
   end
 
   def skins_for(name)
-    @conf[name]['skin'].keys
+    @flavours[name]['skins']
   end
 
   def flavours_and_skins
diff --git a/app/views/layouts/_theme.html.haml b/app/views/layouts/_theme.html.haml
index 7c21da3246691d..fd493bf89928d9 100644
--- a/app/views/layouts/_theme.html.haml
+++ b/app/views/layouts/_theme.html.haml
@@ -1,12 +1,5 @@
-- if theme
-  = render partial: 'layouts/theme', object: theme[:common] if theme[:pack] != 'common' && theme[:common]
-  - if theme[:pack]
-    - pack_path = "flavours/#{theme[:flavour]}/#{theme[:pack]}"
-    = javascript_pack_tag pack_path, crossorigin: 'anonymous'
-    - if theme[:skin]
-      - if !theme[:flavour] || theme[:skin] == 'default'
-        = stylesheet_pack_tag pack_path, media: 'all', crossorigin: 'anonymous'
-      - else
-        = stylesheet_pack_tag "skins/#{theme[:flavour]}/#{theme[:skin]}/#{theme[:pack]}", media: 'all', crossorigin: 'anonymous'
-    - theme[:preload]&.each do |link|
-      %link{ href: asset_pack_path("#{link}.js"), crossorigin: 'anonymous', rel: 'preload', as: 'script' }/
+- if theme && theme[:pack]
+  - pack_path = "flavours/#{theme[:flavour]}/#{theme[:pack]}"
+  = javascript_pack_tag pack_path, crossorigin: 'anonymous'
+  - theme[:preload]&.each do |link|
+    %link{ href: asset_pack_path("#{link}.js"), crossorigin: 'anonymous', rel: 'preload', as: 'script' }/
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index b1b705669cd8a7..8734f7e7d43bb4 100755
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -26,11 +26,13 @@
 
     %title= html_title
 
-    = javascript_pack_tag 'common', crossorigin: 'anonymous'
+    = stylesheet_pack_tag 'flavours/vanilla/common', media: 'all', crossorigin: 'anonymous' # upstream uses `common` but that's implicitly defined
+    = stylesheet_pack_tag current_theme, media: 'all', crossorigin: 'anonymous'
 
     -# Needed for the wicg-inert polyfill. It needs to be on it's own <style> tag, with this `id`
     = stylesheet_pack_tag 'flavours/vanilla/inert', media: 'all', id: 'inert-style'
 
+    = javascript_pack_tag 'common', crossorigin: 'anonymous'
     - if @theme
       - if @theme[:supported_locales].include? I18n.locale.to_s
         = preload_pack_asset "locales/#{@theme[:flavour]}/#{I18n.locale}-json.js"
@@ -39,13 +41,13 @@
     = csrf_meta_tags unless skip_csrf_meta_tags?
     %meta{ name: 'style-nonce', content: request.content_security_policy_nonce }
 
+    = stylesheet_link_tag custom_css_path, skip_pipeline: true, host: root_url, media: 'all'
+
     = yield :header_tags
 
     -# These must come after :header_tags to ensure our initial state has been defined.
     = render partial: 'layouts/theme', object: @theme
 
-    = stylesheet_link_tag custom_css_path, skip_pipeline: true, host: root_url, media: 'all'
-
   %body{ class: body_classes }
     = content_for?(:content) ? yield(:content) : yield
 
diff --git a/app/views/layouts/embedded.html.haml b/app/views/layouts/embedded.html.haml
index 9339ad34e88e01..19df497533e65f 100644
--- a/app/views/layouts/embedded.html.haml
+++ b/app/views/layouts/embedded.html.haml
@@ -11,13 +11,16 @@
     - if storage_host?
       %link{ rel: 'dns-prefetch', href: storage_host }/
 
-    = render_initial_state
-    = javascript_pack_tag 'common', crossorigin: 'anonymous'
+    = stylesheet_pack_tag 'flavours/vanilla/common', media: 'all', crossorigin: 'anonymous' # upstream uses `common` but that's implicitly defined
+    = stylesheet_pack_tag current_theme, media: 'all', crossorigin: 'anonymous'
+    = javascript_pack_tag 'common', integrity: true, crossorigin: 'anonymous'
     - if @theme
       - if @theme[:supported_locales].include? I18n.locale.to_s
         = preload_pack_asset "locales/#{@theme[:flavour]}/#{I18n.locale}-json.js"
       - elsif @theme[:supported_locales].include? 'en'
         = preload_pack_asset "locales/#{@theme[:flavour]}/en-json.js"
+    = preload_pack_asset "locale/#{I18n.locale}-json.js"
+    = render_initial_state
     = render partial: 'layouts/theme', object: @theme
 
   %body.embed
diff --git a/app/views/layouts/error.html.haml b/app/views/layouts/error.html.haml
index 8581db8b8f597c..49224daa83b699 100644
--- a/app/views/layouts/error.html.haml
+++ b/app/views/layouts/error.html.haml
@@ -5,6 +5,8 @@
     %meta{ charset: 'utf-8' }/
     %title= safe_join([yield(:page_title), Setting.default_settings['site_title']], ' - ')
     %meta{ content: 'width=device-width,initial-scale=1', name: 'viewport' }/
+    = stylesheet_pack_tag 'flavours/vanilla/common', media: 'all', crossorigin: 'anonymous' # upstream uses `common` but that's implicitly defined
+    = stylesheet_pack_tag current_theme, media: 'all', crossorigin: 'anonymous'
     = javascript_pack_tag 'common', crossorigin: 'anonymous'
     = render partial: 'layouts/theme', object: @theme || { pack: 'error', flavour: 'glitch', common: { pack: 'common', flavour: 'glitch', skin: 'default' } }
   %body.error
diff --git a/config/webpack/configuration.js b/config/webpack/configuration.js
index 04c84c85ee4f2a..7ec28158e72ace 100644
--- a/config/webpack/configuration.js
+++ b/config/webpack/configuration.js
@@ -1,7 +1,7 @@
 // Common configuration for webpacker loaded from config/webpacker.yml
 
 const { lstatSync, readFileSync } = require('fs');
-const { basename, dirname, extname, join, resolve } = require('path');
+const { basename, dirname, join, resolve } = require('path');
 const { env } = require('process');
 
 const glob = require('glob');
@@ -37,12 +37,13 @@ skinFiles.forEach((skinFile) => {
   const data = flavours[name].skin;
   if (lstatSync(skinFile).isDirectory()) {
     data[skin] = {};
-    const skinPacks = glob.sync(join(skinFile, '*.{css,scss}'));
+    // TODO: more cleanly take the first match
+    const skinPacks = glob.sync(join(skinFile, '{common,index,application}.{css,scss}'));
     skinPacks.forEach((pack) => {
-      data[skin][basename(pack, extname(pack))] = pack;
+      data[skin] = pack;
     });
   } else if ((skin = skin.match(/^(.*)\.s?css$/i))) {
-    data[skin[1]] = { common: skinFile };
+    data[skin[1]] = skinFile;
   }
 });
 
diff --git a/config/webpack/shared.js b/config/webpack/shared.js
index 1099e2916c84b3..404dc23d6ec51d 100644
--- a/config/webpack/shared.js
+++ b/config/webpack/shared.js
@@ -36,12 +36,7 @@ function reducePacks (data, into = {}) {
     const skin = data.skin[skinName];
     if (!skin) continue;
 
-    for (const entry in skin) {
-      const packFile = skin[entry];
-      if (!packFile) continue;
-
-      into[`skins/${data.name}/${skinName}/${entry}`] = resolve(packFile);
-    }
+    into[`skins/${data.name}/${skinName}`] = resolve(skin);
   }
 
   return into;
diff --git a/lib/tasks/assets.rake b/lib/tasks/assets.rake
index 76e190f70a3624..8eb5ea69c98bda 100644
--- a/lib/tasks/assets.rake
+++ b/lib/tasks/assets.rake
@@ -8,6 +8,14 @@ namespace :assets do
         def current_user
           nil
         end
+
+        def current_flavour
+          Setting.default_settings['flavour']
+        end
+
+        def current_skin
+          Setting.default_settings['skin']
+        end
       end
 
       html = renderer.render(action, opts)

From 7208edbd37a90e3b417c3846c7cc2ec099e1e0ba Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Sun, 28 Apr 2024 12:08:08 +0200
Subject: [PATCH 0847/2191] Replace `use_pack`, `layouts/theme` and `@theme` by
 new helpers

Packs are now loaded from views, just like upstream, and are
identified by their filenames. The definition of `theme.yml` has
changed as such:
- `pack_directory` is now required
- `pack` is now unused
- `signed_in_preload` has been introduced
---
 app/controllers/admin/base_controller.rb      |  5 --
 app/controllers/application_controller.rb     | 10 +---
 app/controllers/auth/challenges_controller.rb |  7 ---
 .../auth/confirmations_controller.rb          |  5 --
 app/controllers/auth/passwords_controller.rb  |  5 --
 .../auth/registrations_controller.rb          |  5 --
 app/controllers/auth/sessions_controller.rb   |  5 --
 app/controllers/auth/setup_controller.rb      |  5 --
 .../auth/two_factor_authentication_concern.rb |  2 -
 app/controllers/concerns/theming_concern.rb   | 33 ++-----------
 .../concerns/web_app_controller_concern.rb    |  5 --
 app/controllers/disputes/base_controller.rb   |  5 --
 .../filters/statuses_controller.rb            |  5 --
 app/controllers/filters_controller.rb         |  5 --
 app/controllers/invites_controller.rb         |  5 --
 app/controllers/media_controller.rb           |  5 --
 .../oauth/authorizations_controller.rb        |  5 --
 .../authorized_applications_controller.rb     |  5 --
 app/controllers/redirect/base_controller.rb   |  5 --
 app/controllers/relationships_controller.rb   |  5 --
 app/controllers/settings/base_controller.rb   |  5 --
 .../settings/login_activities_controller.rb   |  6 ---
 .../webauthn_credentials_controller.rb        |  4 --
 app/controllers/shares_controller.rb          |  5 --
 .../statuses_cleanup_controller.rb            |  5 --
 app/controllers/statuses_controller.rb        |  1 -
 app/helpers/application_helper.rb             | 15 ++++++
 app/javascript/flavours/glitch/theme.yml      | 49 ++++---------------
 app/javascript/flavours/vanilla/theme.yml     | 44 ++++-------------
 app/lib/themes.rb                             |  2 +-
 app/views/auth/sessions/two_factor.html.haml  |  2 +
 app/views/auth/setup/show.html.haml           |  2 +
 app/views/layouts/_theme.html.haml            |  5 --
 app/views/layouts/admin.html.haml             |  2 +
 app/views/layouts/application.html.haml       |  9 +---
 app/views/layouts/auth.html.haml              |  3 ++
 app/views/layouts/embedded.html.haml          |  9 +---
 app/views/layouts/error.html.haml             |  2 +-
 app/views/layouts/modal.html.haml             |  3 ++
 app/views/media/player.html.haml              |  8 +--
 app/views/relationships/show.html.haml        |  3 ++
 .../remote_interaction_helper/index.html.haml |  2 +-
 .../webauthn_credentials/new.html.haml        |  2 +
 app/views/shared/_web_app.html.haml           |  2 +
 app/views/shares/show.html.haml               |  1 +
 config/webpack/configuration.js               | 21 ++++----
 config/webpack/shared.js                      | 32 +++++-------
 spec/views/statuses/show.html.haml_spec.rb    |  2 +-
 48 files changed, 88 insertions(+), 290 deletions(-)
 delete mode 100644 app/views/layouts/_theme.html.haml

diff --git a/app/controllers/admin/base_controller.rb b/app/controllers/admin/base_controller.rb
index a71bb61298e613..4b5afbe157c84b 100644
--- a/app/controllers/admin/base_controller.rb
+++ b/app/controllers/admin/base_controller.rb
@@ -7,7 +7,6 @@ class BaseController < ApplicationController
 
     layout 'admin'
 
-    before_action :set_pack
     before_action :set_body_classes
     before_action :set_cache_headers
 
@@ -19,10 +18,6 @@ def set_body_classes
       @body_classes = 'admin'
     end
 
-    def set_pack
-      use_pack 'admin'
-    end
-
     def set_cache_headers
       response.cache_control.replace(private: true, no_store: true)
     end
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index cf953fcf2c3c2d..bd152dbb66d5ff 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -165,10 +165,7 @@ def body_class_string
 
   def respond_with_error(code)
     respond_to do |format|
-      format.any do
-        use_pack 'error'
-        render "errors/#{code}", layout: 'error', status: code, formats: [:html]
-      end
+      format.any  { render "errors/#{code}", layout: 'error', status: code, formats: [:html] }
       format.json { render json: { error: Rack::Utils::HTTP_STATUS_CODES[code] }, status: code }
     end
   end
@@ -177,10 +174,7 @@ def check_self_destruct!
     return unless self_destruct?
 
     respond_to do |format|
-      format.any do
-        use_pack 'error'
-        render 'errors/self_destruct', layout: 'auth', status: 410, formats: [:html]
-      end
+      format.any  { render 'errors/self_destruct', layout: 'auth', status: 410, formats: [:html] }
       format.json { render json: { error: Rack::Utils::HTTP_STATUS_CODES[410] }, status: 410 }
     end
   end
diff --git a/app/controllers/auth/challenges_controller.rb b/app/controllers/auth/challenges_controller.rb
index 1e585de1897ae4..7ede420b512764 100644
--- a/app/controllers/auth/challenges_controller.rb
+++ b/app/controllers/auth/challenges_controller.rb
@@ -5,7 +5,6 @@ class Auth::ChallengesController < ApplicationController
 
   layout 'auth'
 
-  before_action :set_pack
   before_action :authenticate_user!
 
   skip_before_action :check_self_destruct!
@@ -21,10 +20,4 @@ def create
       render_challenge
     end
   end
-
-  private
-
-  def set_pack
-    use_pack 'auth'
-  end
 end
diff --git a/app/controllers/auth/confirmations_controller.rb b/app/controllers/auth/confirmations_controller.rb
index 8b8a27d26063bc..7ca7be5f8ef8ec 100644
--- a/app/controllers/auth/confirmations_controller.rb
+++ b/app/controllers/auth/confirmations_controller.rb
@@ -6,7 +6,6 @@ class Auth::ConfirmationsController < Devise::ConfirmationsController
   layout 'auth'
 
   before_action :set_body_classes
-  before_action :set_pack
   before_action :set_confirmation_user!, only: [:show, :confirm_captcha]
   before_action :redirect_confirmed_user, if: :signed_in_confirmed_user?
 
@@ -66,10 +65,6 @@ def captcha_user_bypass?
     @confirmation_user.nil? || @confirmation_user.confirmed?
   end
 
-  def set_pack
-    use_pack 'auth'
-  end
-
   def redirect_confirmed_user
     redirect_to(current_user.approved? ? root_path : edit_user_registration_path)
   end
diff --git a/app/controllers/auth/passwords_controller.rb b/app/controllers/auth/passwords_controller.rb
index f0d47bf77419d4..de001f062b04d7 100644
--- a/app/controllers/auth/passwords_controller.rb
+++ b/app/controllers/auth/passwords_controller.rb
@@ -3,7 +3,6 @@
 class Auth::PasswordsController < Devise::PasswordsController
   skip_before_action :check_self_destruct!
   before_action :redirect_invalid_reset_token, only: :edit, unless: :reset_password_token_is_valid?
-  before_action :set_pack
   before_action :set_body_classes
 
   layout 'auth'
@@ -32,8 +31,4 @@ def set_body_classes
   def reset_password_token_is_valid?
     resource_class.with_reset_password_token(params[:reset_password_token]).present?
   end
-
-  def set_pack
-    use_pack 'auth'
-  end
 end
diff --git a/app/controllers/auth/registrations_controller.rb b/app/controllers/auth/registrations_controller.rb
index 838869b2eef5ab..acfc0af0d9c0b6 100644
--- a/app/controllers/auth/registrations_controller.rb
+++ b/app/controllers/auth/registrations_controller.rb
@@ -9,7 +9,6 @@ class Auth::RegistrationsController < Devise::RegistrationsController
   before_action :set_invite, only: [:new, :create]
   before_action :check_enabled_registrations, only: [:new, :create]
   before_action :configure_sign_up_params, only: [:create]
-  before_action :set_pack
   before_action :set_sessions, only: [:edit, :update]
   before_action :set_strikes, only: [:edit, :update]
   before_action :set_body_classes, only: [:new, :create, :edit, :update]
@@ -97,10 +96,6 @@ def invite_code
 
   private
 
-  def set_pack
-    use_pack %w(edit update).include?(action_name) ? 'admin' : 'auth'
-  end
-
   def set_body_classes
     @body_classes = %w(edit update).include?(action_name) ? 'admin' : 'lighter'
   end
diff --git a/app/controllers/auth/sessions_controller.rb b/app/controllers/auth/sessions_controller.rb
index 67d369b8593a56..6ed7b2baacc7c4 100644
--- a/app/controllers/auth/sessions_controller.rb
+++ b/app/controllers/auth/sessions_controller.rb
@@ -12,7 +12,6 @@ class Auth::SessionsController < Devise::SessionsController
   skip_before_action :require_functional!
   skip_before_action :update_user_sign_in
 
-  prepend_before_action :set_pack
   prepend_before_action :check_suspicious!, only: [:create]
 
   include Auth::TwoFactorAuthenticationConcern
@@ -104,10 +103,6 @@ def require_no_authentication
 
   private
 
-  def set_pack
-    use_pack 'auth'
-  end
-
   def set_body_classes
     @body_classes = 'lighter'
   end
diff --git a/app/controllers/auth/setup_controller.rb b/app/controllers/auth/setup_controller.rb
index 8edca4d01b32ee..40916d2887702c 100644
--- a/app/controllers/auth/setup_controller.rb
+++ b/app/controllers/auth/setup_controller.rb
@@ -3,7 +3,6 @@
 class Auth::SetupController < ApplicationController
   layout 'auth'
 
-  before_action :set_pack
   before_action :authenticate_user!
   before_action :require_unconfirmed_or_pending!
   before_action :set_body_classes
@@ -43,8 +42,4 @@ def set_body_classes
   def user_params
     params.require(:user).permit(:email)
   end
-
-  def set_pack
-    use_pack 'sign_up'
-  end
 end
diff --git a/app/controllers/concerns/auth/two_factor_authentication_concern.rb b/app/controllers/concerns/auth/two_factor_authentication_concern.rb
index edcdd2990ffed9..404164751a86cb 100644
--- a/app/controllers/concerns/auth/two_factor_authentication_concern.rb
+++ b/app/controllers/concerns/auth/two_factor_authentication_concern.rb
@@ -83,8 +83,6 @@ def authenticate_with_two_factor_via_otp(user)
   def prompt_for_two_factor(user)
     register_attempt_in_session(user)
 
-    use_pack 'auth'
-
     @body_classes     = 'lighter'
     @webauthn_enabled = user.webauthn_enabled?
     @scheme_type      = if user.webauthn_enabled? && user_params[:otp_attempt].blank?
diff --git a/app/controllers/concerns/theming_concern.rb b/app/controllers/concerns/theming_concern.rb
index 7da04e1531df31..ebdaf54c056e24 100644
--- a/app/controllers/concerns/theming_concern.rb
+++ b/app/controllers/concerns/theming_concern.rb
@@ -3,19 +3,17 @@
 module ThemingConcern
   extend ActiveSupport::Concern
 
-  def use_pack(pack_name)
-    @theme = resolve_pack(Themes.instance.flavour(current_flavour), pack_name)
-  end
-
   private
 
   def current_flavour
-    [current_user&.setting_flavour, Setting.flavour, 'glitch', 'vanilla'].find { |flavour| Themes.instance.flavours.include?(flavour) }
+    @current_flavour ||= [current_user&.setting_flavour, Setting.flavour, 'glitch', 'vanilla'].find { |flavour| Themes.instance.flavours.include?(flavour) }
   end
 
   def current_skin
-    skins = Themes.instance.skins_for(current_flavour)
-    [current_user&.setting_skin, Setting.skin, 'default'].find { |skin| skins.include?(skin) }
+    @current_skin ||= begin
+      skins = Themes.instance.skins_for(current_flavour)
+      [current_user&.setting_skin, Setting.skin, 'default'].find { |skin| skins.include?(skin) }
+    end
   end
 
   def current_theme
@@ -23,25 +21,4 @@ def current_theme
     # for the sole purpose of pointing to the appropriate stylesheet pack
     "skins/#{current_flavour}/#{current_skin}"
   end
-
-  def resolve_pack(data, pack_name)
-    pack_data = {
-      flavour: data['name'],
-      pack: nil,
-      preload: nil,
-      supported_locales: data['locales'],
-    }
-    return pack_data unless data['pack'].is_a?(Hash) && data['pack'][pack_name].present?
-
-    pack_data[:pack] = pack_name
-    return pack_data unless data['pack'][pack_name].is_a?(Hash)
-
-    pack_data[:pack] = nil unless data['pack'][pack_name]['filename']
-
-    preloads = data['pack'][pack_name]['preload']
-    pack_data[:preload] = [preloads] if preloads.is_a?(String)
-    pack_data[:preload] = preloads if preloads.is_a?(Array)
-
-    pack_data
-  end
 end
diff --git a/app/controllers/concerns/web_app_controller_concern.rb b/app/controllers/concerns/web_app_controller_concern.rb
index d20643e66ca1db..24cccf166770c5 100644
--- a/app/controllers/concerns/web_app_controller_concern.rb
+++ b/app/controllers/concerns/web_app_controller_concern.rb
@@ -7,7 +7,6 @@ module WebAppControllerConcern
     vary_by 'Accept, Accept-Language, Cookie'
 
     before_action :redirect_unauthenticated_to_permalinks!
-    before_action :set_pack
     before_action :set_app_body_class
   end
 
@@ -37,8 +36,4 @@ def redirect_unauthenticated_to_permalinks!
       end
     end
   end
-
-  def set_pack
-    use_pack 'application'
-  end
 end
diff --git a/app/controllers/disputes/base_controller.rb b/app/controllers/disputes/base_controller.rb
index f51f44c620e396..1054f3db805593 100644
--- a/app/controllers/disputes/base_controller.rb
+++ b/app/controllers/disputes/base_controller.rb
@@ -9,15 +9,10 @@ class Disputes::BaseController < ApplicationController
 
   before_action :set_body_classes
   before_action :authenticate_user!
-  before_action :set_pack
   before_action :set_cache_headers
 
   private
 
-  def set_pack
-    use_pack 'admin'
-  end
-
   def set_body_classes
     @body_classes = 'admin'
   end
diff --git a/app/controllers/filters/statuses_controller.rb b/app/controllers/filters/statuses_controller.rb
index 97206c7eda4914..94993f938b5318 100644
--- a/app/controllers/filters/statuses_controller.rb
+++ b/app/controllers/filters/statuses_controller.rb
@@ -6,7 +6,6 @@ class Filters::StatusesController < ApplicationController
   before_action :authenticate_user!
   before_action :set_filter
   before_action :set_status_filters
-  before_action :set_pack
   before_action :set_body_classes
   before_action :set_cache_headers
 
@@ -27,10 +26,6 @@ def batch
 
   private
 
-  def set_pack
-    use_pack 'admin'
-  end
-
   def set_filter
     @filter = current_account.custom_filters.find(params[:filter_id])
   end
diff --git a/app/controllers/filters_controller.rb b/app/controllers/filters_controller.rb
index 1b19269b239e9d..bd9964426b8064 100644
--- a/app/controllers/filters_controller.rb
+++ b/app/controllers/filters_controller.rb
@@ -5,7 +5,6 @@ class FiltersController < ApplicationController
 
   before_action :authenticate_user!
   before_action :set_filter, only: [:edit, :update, :destroy]
-  before_action :set_pack
   before_action :set_body_classes
   before_action :set_cache_headers
 
@@ -45,10 +44,6 @@ def destroy
 
   private
 
-  def set_pack
-    use_pack 'settings'
-  end
-
   def set_filter
     @filter = current_account.custom_filters.find(params[:id])
   end
diff --git a/app/controllers/invites_controller.rb b/app/controllers/invites_controller.rb
index 2db4bc5cbdf956..9bc5164d599b50 100644
--- a/app/controllers/invites_controller.rb
+++ b/app/controllers/invites_controller.rb
@@ -6,7 +6,6 @@ class InvitesController < ApplicationController
   layout 'admin'
 
   before_action :authenticate_user!
-  before_action :set_pack
   before_action :set_body_classes
   before_action :set_cache_headers
 
@@ -40,10 +39,6 @@ def destroy
 
   private
 
-  def set_pack
-    use_pack 'settings'
-  end
-
   def invites
     current_user.invites.order(id: :desc)
   end
diff --git a/app/controllers/media_controller.rb b/app/controllers/media_controller.rb
index 4c028dbef03405..53eee40012a612 100644
--- a/app/controllers/media_controller.rb
+++ b/app/controllers/media_controller.rb
@@ -10,7 +10,6 @@ class MediaController < ApplicationController
   before_action :verify_permitted_status!
   before_action :check_playable, only: :player
   before_action :allow_iframing, only: :player
-  before_action :set_pack, only: :player
 
   content_security_policy only: :player do |policy|
     policy.frame_ancestors(false)
@@ -48,8 +47,4 @@ def check_playable
   def allow_iframing
     response.headers.delete('X-Frame-Options')
   end
-
-  def set_pack
-    use_pack 'public'
-  end
 end
diff --git a/app/controllers/oauth/authorizations_controller.rb b/app/controllers/oauth/authorizations_controller.rb
index 62fc9c1b0d149b..66e774425d7081 100644
--- a/app/controllers/oauth/authorizations_controller.rb
+++ b/app/controllers/oauth/authorizations_controller.rb
@@ -5,7 +5,6 @@ class Oauth::AuthorizationsController < Doorkeeper::AuthorizationsController
 
   before_action :store_current_location
   before_action :authenticate_resource_owner!
-  before_action :set_pack
   before_action :set_cache_headers
 
   content_security_policy do |p|
@@ -20,10 +19,6 @@ def store_current_location
     store_location_for(:user, request.url)
   end
 
-  def set_pack
-    use_pack 'auth'
-  end
-
   def render_success
     if skip_authorization? || (matching_token? && !truthy_param?('force_login'))
       redirect_or_render authorize_response
diff --git a/app/controllers/oauth/authorized_applications_controller.rb b/app/controllers/oauth/authorized_applications_controller.rb
index 778912c9489fe3..8440df6b7e69a9 100644
--- a/app/controllers/oauth/authorized_applications_controller.rb
+++ b/app/controllers/oauth/authorized_applications_controller.rb
@@ -5,7 +5,6 @@ class Oauth::AuthorizedApplicationsController < Doorkeeper::AuthorizedApplicatio
 
   before_action :store_current_location
   before_action :authenticate_resource_owner!
-  before_action :set_pack
   before_action :require_not_suspended!, only: :destroy
   before_action :set_body_classes
   before_action :set_cache_headers
@@ -31,10 +30,6 @@ def store_current_location
     store_location_for(:user, request.url)
   end
 
-  def set_pack
-    use_pack 'settings'
-  end
-
   def require_not_suspended!
     forbidden if current_account.unavailable?
   end
diff --git a/app/controllers/redirect/base_controller.rb b/app/controllers/redirect/base_controller.rb
index ce55cfc53a72dc..90894ec1ed832c 100644
--- a/app/controllers/redirect/base_controller.rb
+++ b/app/controllers/redirect/base_controller.rb
@@ -3,7 +3,6 @@
 class Redirect::BaseController < ApplicationController
   vary_by 'Accept-Language'
 
-  before_action :set_pack
   before_action :set_resource
   before_action :set_app_body_class
 
@@ -22,8 +21,4 @@ def set_app_body_class
   def set_resource
     raise NotImplementedError
   end
-
-  def set_pack
-    use_pack 'public'
-  end
 end
diff --git a/app/controllers/relationships_controller.rb b/app/controllers/relationships_controller.rb
index e6e7c24752c31d..dd794f3199eeec 100644
--- a/app/controllers/relationships_controller.rb
+++ b/app/controllers/relationships_controller.rb
@@ -5,7 +5,6 @@ class RelationshipsController < ApplicationController
 
   before_action :authenticate_user!
   before_action :set_accounts, only: :show
-  before_action :set_pack
   before_action :set_relationships, only: :show
   before_action :set_body_classes
   before_action :set_cache_headers
@@ -73,10 +72,6 @@ def set_body_classes
     @body_classes = 'admin'
   end
 
-  def set_pack
-    use_pack 'admin'
-  end
-
   def set_cache_headers
     response.cache_control.replace(private: true, no_store: true)
   end
diff --git a/app/controllers/settings/base_controller.rb b/app/controllers/settings/base_controller.rb
index 4d3d6e6a1b7506..f15140aa2be3da 100644
--- a/app/controllers/settings/base_controller.rb
+++ b/app/controllers/settings/base_controller.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 class Settings::BaseController < ApplicationController
-  before_action :set_pack
   layout 'admin'
 
   before_action :authenticate_user!
@@ -10,10 +9,6 @@ class Settings::BaseController < ApplicationController
 
   private
 
-  def set_pack
-    use_pack 'settings'
-  end
-
   def set_body_classes
     @body_classes = 'admin'
   end
diff --git a/app/controllers/settings/login_activities_controller.rb b/app/controllers/settings/login_activities_controller.rb
index 018fc7e950b5f7..50e2d70cb9ad1b 100644
--- a/app/controllers/settings/login_activities_controller.rb
+++ b/app/controllers/settings/login_activities_controller.rb
@@ -7,10 +7,4 @@ class Settings::LoginActivitiesController < Settings::BaseController
   def index
     @login_activities = LoginActivity.where(user: current_user).order(id: :desc).page(params[:page])
   end
-
-  private
-
-  def set_pack
-    use_pack 'settings'
-  end
 end
diff --git a/app/controllers/settings/two_factor_authentication/webauthn_credentials_controller.rb b/app/controllers/settings/two_factor_authentication/webauthn_credentials_controller.rb
index aed5af6e790490..9714d54f954ffe 100644
--- a/app/controllers/settings/two_factor_authentication/webauthn_credentials_controller.rb
+++ b/app/controllers/settings/two_factor_authentication/webauthn_credentials_controller.rb
@@ -85,10 +85,6 @@ def destroy
 
       private
 
-      def set_pack
-        use_pack 'auth'
-      end
-
       def redirect_invalid_otp
         flash[:error] = t('webauthn_credentials.otp_required')
         redirect_to settings_two_factor_authentication_methods_path
diff --git a/app/controllers/shares_controller.rb b/app/controllers/shares_controller.rb
index e13e7e8b656014..6546b8497808c4 100644
--- a/app/controllers/shares_controller.rb
+++ b/app/controllers/shares_controller.rb
@@ -4,17 +4,12 @@ class SharesController < ApplicationController
   layout 'modal'
 
   before_action :authenticate_user!
-  before_action :set_pack
   before_action :set_body_classes
 
   def show; end
 
   private
 
-  def set_pack
-    use_pack 'share'
-  end
-
   def set_body_classes
     @body_classes = 'modal-layout compose-standalone'
   end
diff --git a/app/controllers/statuses_cleanup_controller.rb b/app/controllers/statuses_cleanup_controller.rb
index 88cf26d74d1f5c..4a3fc10ca4fbd5 100644
--- a/app/controllers/statuses_cleanup_controller.rb
+++ b/app/controllers/statuses_cleanup_controller.rb
@@ -6,7 +6,6 @@ class StatusesCleanupController < ApplicationController
   before_action :authenticate_user!
   before_action :set_policy
   before_action :set_body_classes
-  before_action :set_pack
   before_action :set_cache_headers
 
   def show; end
@@ -27,10 +26,6 @@ def require_functional!
 
   private
 
-  def set_pack
-    use_pack 'settings'
-  end
-
   def set_policy
     @policy = current_account.statuses_cleanup_policy || current_account.build_statuses_cleanup_policy(enabled: false)
   end
diff --git a/app/controllers/statuses_controller.rb b/app/controllers/statuses_controller.rb
index 7f9127d3a6319d..db7eddd78b35d5 100644
--- a/app/controllers/statuses_controller.rb
+++ b/app/controllers/statuses_controller.rb
@@ -41,7 +41,6 @@ def activity
   end
 
   def embed
-    use_pack 'public'
     return not_found if @status.hidden? || @status.reblog?
 
     expires_in 180, public: true
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 233c242e4a1d33..62c0e78d239140 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -233,6 +233,21 @@ def prerender_custom_emojis(html, custom_emojis, other_options = {})
     EmojiFormatter.new(html, custom_emojis, other_options.merge(animate: prefers_autoplay?)).to_s
   end
 
+  # glitch-soc addition to handle the multiple flavors
+  def preload_locale_pack
+    supported_locales = Themes.instance.flavour(current_flavour)['locales']
+    preload_pack_asset "locales/#{current_flavour}/#{I18n.locale}-json.js" if supported_locales.include?(I18n.locale.to_s)
+  end
+
+  def flavoured_javascript_pack_tag(pack_name, **options)
+    javascript_pack_tag("flavours/#{current_flavour}/#{pack_name}", **options)
+  end
+
+  def preload_signed_in_js_packs
+    preload_files = Themes.instance.flavour(current_flavour)&.fetch('signed_in_preload', nil) || []
+    safe_join(preload_files.map { |entry| preload_pack_asset entry })
+  end
+
   private
 
   def storage_host_var
diff --git a/app/javascript/flavours/glitch/theme.yml b/app/javascript/flavours/glitch/theme.yml
index 99a31cb663fe5e..ca18fd7b867755 100644
--- a/app/javascript/flavours/glitch/theme.yml
+++ b/app/javascript/flavours/glitch/theme.yml
@@ -1,32 +1,12 @@
-#  (REQUIRED) The location of the pack files.
-pack:
-  admin:
-    - admin.tsx
-    - public.tsx
-  auth:
-    - public.tsx
-    - two_factor_authentication.js
-  common:
-    filename: common.js
-    stylesheet: true
-  error: error.js
-  application:
-    filename: application.js
-    preload:
-      - flavours/glitch/async/compose
-      - flavours/glitch/async/home_timeline
-      - flavours/glitch/async/notifications
-  inert:
-    filename: inert.js
-    stylesheet: true
-  mailer:
-    filename: mailer.js
-    stylesheet: true
-  public: public.tsx
-  settings: public.tsx
-  sign_up: sign_up.js
-  share: share.jsx
-  remote_interaction_helper: remote_interaction_helper.ts
+#  (REQUIRED) The directory which contains the entry point files.
+pack_directory: app/javascript/flavours/glitch/packs
+
+#  (OPTIONAL) Define files to be preloaded when a logged-in user is
+#  visiting the main web app.
+signed_in_preload:
+  - flavours/glitch/async/compose.js
+  - flavours/glitch/async/home_timeline.js
+  - flavours/glitch/async/notifications.js
 
 #  (OPTIONAL) The directory which contains localization files for
 #  the flavour, relative to this directory. The contents of this
@@ -40,14 +20,3 @@ inherit_locales: vanilla
 #  (OPTIONAL) A file to use as the preview screenshot for the flavour,
 #  or an array thereof. These are the full path from `app/javascript/`.
 screenshot: flavours/glitch/images/glitch-preview.png
-
-#  (OPTIONAL) The directory which contains the pack files.
-#  Defaults to this directory (`app/javascript/flavour/[flavour]`),
-#  but in the case of the vanilla Mastodon flavour the pack files are
-#  somewhere else.
-pack_directory: app/javascript/flavours/glitch/packs
-#  (OPTIONAL) The directory which contains the pack files.
-#  Defaults to the theme directory (`app/javascript/themes/[theme]`),
-#  which should be sufficient for like 99% of use-cases lol.
-
-#      pack_directory: app/javascript/packs
diff --git a/app/javascript/flavours/vanilla/theme.yml b/app/javascript/flavours/vanilla/theme.yml
index 61ee528f962c15..d155324beb1503 100644
--- a/app/javascript/flavours/vanilla/theme.yml
+++ b/app/javascript/flavours/vanilla/theme.yml
@@ -1,32 +1,12 @@
-#  (REQUIRED) The location of the pack files inside `pack_directory`.
-pack:
-  admin:
-    - admin.tsx
-    - public.tsx
-  auth:
-    - public.tsx
-    - two_factor_authentication.js
-  common:
-    filename: common.js
-    stylesheet: true
-  error: error.js
-  application:
-    filename: application.js
-    preload:
-      - features/compose
-      - features/home_timeline
-      - features/notifications
-  inert:
-    filename: inert.js
-    stylesheet: true
-  mailer:
-    filename: mailer.js
-    stylesheet: true
-  public: public.tsx
-  settings: public.tsx
-  sign_up: sign_up.js
-  share: share.jsx
-  remote_interaction_helper: remote_interaction_helper.ts
+#  (REQUIRED) The directory which contains the pack files.
+pack_directory: app/javascript/packs
+
+#  (OPTIONAL) Define files to be preloaded when a logged-in user is
+#  visiting the main web app.
+signed_in_preload:
+  - features/compose.js
+  - features/home_timeline.js
+  - features/notifications.js
 
 #  (OPTIONAL) The directory which contains localization files for
 #  the flavour, relative to this directory.
@@ -35,9 +15,3 @@ locales: ../../mastodon/locales
 #  (OPTIONAL) A file to use as the preview screenshot for the flavour,
 #  or an array thereof. These are the full path from `app/javascript/`.
 screenshot: images/screenshot.png
-
-#  (OPTIONAL) The directory which contains the pack files.
-#  Defaults to this directory (`app/javascript/flavour/[flavour]`),
-#  but in the case of the vanilla Mastodon flavour the pack files are
-#  somewhere else.
-pack_directory: app/javascript/packs
diff --git a/app/lib/themes.rb b/app/lib/themes.rb
index b379e139e92973..89730c9b3128c0 100644
--- a/app/lib/themes.rb
+++ b/app/lib/themes.rb
@@ -11,7 +11,7 @@ def initialize
 
     Rails.root.glob('app/javascript/flavours/*/theme.yml') do |pathname|
       data = YAML.load_file(pathname)
-      next unless data['pack']
+      next unless data['pack_directory']
 
       dir = pathname.dirname
       name = dir.basename.to_s
diff --git a/app/views/auth/sessions/two_factor.html.haml b/app/views/auth/sessions/two_factor.html.haml
index 0892101b57cc67..63c8b0a2cb86e7 100644
--- a/app/views/auth/sessions/two_factor.html.haml
+++ b/app/views/auth/sessions/two_factor.html.haml
@@ -1,6 +1,8 @@
 - content_for :page_title do
   = t('auth.login')
 
+= flavoured_javascript_pack_tag 'two_factor_authentication', crossorigin: 'anonymous'
+
 - if webauthn_enabled?
   = render partial: 'auth/sessions/two_factor/webauthn_form', locals: { hidden: @scheme_type != 'webauthn' }
 
diff --git a/app/views/auth/setup/show.html.haml b/app/views/auth/setup/show.html.haml
index 097e3416e2cd12..6ba219e729a603 100644
--- a/app/views/auth/setup/show.html.haml
+++ b/app/views/auth/setup/show.html.haml
@@ -1,6 +1,8 @@
 - content_for :page_title do
   = t('auth.setup.title')
 
+= flavoured_javascript_pack_tag 'sign_up', crossorigin: 'anonymous'
+
 = simple_form_for(@user, url: auth_setup_path) do |f|
   = render 'auth/shared/progress', stage: 'confirm'
 
diff --git a/app/views/layouts/_theme.html.haml b/app/views/layouts/_theme.html.haml
deleted file mode 100644
index fd493bf89928d9..00000000000000
--- a/app/views/layouts/_theme.html.haml
+++ /dev/null
@@ -1,5 +0,0 @@
-- if theme && theme[:pack]
-  - pack_path = "flavours/#{theme[:flavour]}/#{theme[:pack]}"
-  = javascript_pack_tag pack_path, crossorigin: 'anonymous'
-  - theme[:preload]&.each do |link|
-    %link{ href: asset_pack_path("#{link}.js"), crossorigin: 'anonymous', rel: 'preload', as: 'script' }/
diff --git a/app/views/layouts/admin.html.haml b/app/views/layouts/admin.html.haml
index 3048e0e6adbf41..a95d5caef54217 100644
--- a/app/views/layouts/admin.html.haml
+++ b/app/views/layouts/admin.html.haml
@@ -1,5 +1,7 @@
 - content_for :header_tags do
   = render_initial_state
+  = flavoured_javascript_pack_tag 'public', crossorigin: 'anonymous'
+  = flavoured_javascript_pack_tag 'admin', async: true, crossorigin: 'anonymous'
 
 - content_for :content do
   .admin-wrapper
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 8734f7e7d43bb4..4fe314eb4b88b5 100755
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -33,11 +33,7 @@
     = stylesheet_pack_tag 'flavours/vanilla/inert', media: 'all', id: 'inert-style'
 
     = javascript_pack_tag 'common', crossorigin: 'anonymous'
-    - if @theme
-      - if @theme[:supported_locales].include? I18n.locale.to_s
-        = preload_pack_asset "locales/#{@theme[:flavour]}/#{I18n.locale}-json.js"
-      - elsif @theme[:supported_locales].include? 'en'
-        = preload_pack_asset "locales/#{@theme[:flavour]}/en-json.js"
+    = preload_locale_pack
     = csrf_meta_tags unless skip_csrf_meta_tags?
     %meta{ name: 'style-nonce', content: request.content_security_policy_nonce }
 
@@ -45,9 +41,6 @@
 
     = yield :header_tags
 
-    -# These must come after :header_tags to ensure our initial state has been defined.
-    = render partial: 'layouts/theme', object: @theme
-
   %body{ class: body_classes }
     = content_for?(:content) ? yield(:content) : yield
 
diff --git a/app/views/layouts/auth.html.haml b/app/views/layouts/auth.html.haml
index 34f6b38ec8682d..efd2569d777f72 100644
--- a/app/views/layouts/auth.html.haml
+++ b/app/views/layouts/auth.html.haml
@@ -1,3 +1,6 @@
+- content_for :header_tags do
+  = flavoured_javascript_pack_tag 'public', crossorigin: 'anonymous'
+
 - content_for :content do
   .container-alt
     .logo-container
diff --git a/app/views/layouts/embedded.html.haml b/app/views/layouts/embedded.html.haml
index 19df497533e65f..e8764567d1b58a 100644
--- a/app/views/layouts/embedded.html.haml
+++ b/app/views/layouts/embedded.html.haml
@@ -14,14 +14,9 @@
     = stylesheet_pack_tag 'flavours/vanilla/common', media: 'all', crossorigin: 'anonymous' # upstream uses `common` but that's implicitly defined
     = stylesheet_pack_tag current_theme, media: 'all', crossorigin: 'anonymous'
     = javascript_pack_tag 'common', integrity: true, crossorigin: 'anonymous'
-    - if @theme
-      - if @theme[:supported_locales].include? I18n.locale.to_s
-        = preload_pack_asset "locales/#{@theme[:flavour]}/#{I18n.locale}-json.js"
-      - elsif @theme[:supported_locales].include? 'en'
-        = preload_pack_asset "locales/#{@theme[:flavour]}/en-json.js"
-    = preload_pack_asset "locale/#{I18n.locale}-json.js"
+    = preload_locale_pack
     = render_initial_state
-    = render partial: 'layouts/theme', object: @theme
+    = flavoured_javascript_pack_tag 'public', integrity: true, crossorigin: 'anonymous'
 
   %body.embed
     = yield
diff --git a/app/views/layouts/error.html.haml b/app/views/layouts/error.html.haml
index 49224daa83b699..7ad2ad3d696df5 100644
--- a/app/views/layouts/error.html.haml
+++ b/app/views/layouts/error.html.haml
@@ -8,7 +8,7 @@
     = stylesheet_pack_tag 'flavours/vanilla/common', media: 'all', crossorigin: 'anonymous' # upstream uses `common` but that's implicitly defined
     = stylesheet_pack_tag current_theme, media: 'all', crossorigin: 'anonymous'
     = javascript_pack_tag 'common', crossorigin: 'anonymous'
-    = render partial: 'layouts/theme', object: @theme || { pack: 'error', flavour: 'glitch', common: { pack: 'common', flavour: 'glitch', skin: 'default' } }
+    = flavoured_javascript_pack_tag 'error', crossorigin: 'anonymous'
   %body.error
     .dialog
       .dialog__illustration
diff --git a/app/views/layouts/modal.html.haml b/app/views/layouts/modal.html.haml
index 5d08d7848967ec..8d5b158eb5c339 100644
--- a/app/views/layouts/modal.html.haml
+++ b/app/views/layouts/modal.html.haml
@@ -1,3 +1,6 @@
+- content_for :header_tags do
+  = flavoured_javascript_pack_tag 'public', crossorigin: 'anonymous'
+
 - content_for :content do
   - if user_signed_in? && !@hide_header
     .account-header
diff --git a/app/views/media/player.html.haml b/app/views/media/player.html.haml
index 9a0c420fc3d73f..c5ba8680a0db71 100644
--- a/app/views/media/player.html.haml
+++ b/app/views/media/player.html.haml
@@ -1,12 +1,6 @@
 - content_for :header_tags do
   = render_initial_state
-  = javascript_pack_tag 'common', crossorigin: 'anonymous'
-  - if @theme
-    - if @theme[:supported_locales].include? I18n.locale.to_s
-      = preload_pack_asset "locales/#{@theme[:flavour]}/#{I18n.locale}-json.js"
-    - elsif @theme[:supported_locales].include? 'en'
-      = preload_pack_asset "locales/#{@theme[:flavour]}/en-json.js"
-  = render partial: 'layouts/theme', object: @theme
+  = flavoured_javascript_pack_tag 'public', crossorigin: 'anonymous'
 
 :ruby
   meta = @media_attachment.file.meta || {}
diff --git a/app/views/relationships/show.html.haml b/app/views/relationships/show.html.haml
index 6b87bef2ecdaee..066f5d17fb94c4 100644
--- a/app/views/relationships/show.html.haml
+++ b/app/views/relationships/show.html.haml
@@ -1,6 +1,9 @@
 - content_for :page_title do
   = t('settings.relationships')
 
+- content_for :header_tags do
+  = flavoured_javascript_pack_tag 'admin', async: true, crossorigin: 'anonymous'
+
 .filters
   .filter-subset
     %strong= t 'relationships.relationship'
diff --git a/app/views/remote_interaction_helper/index.html.haml b/app/views/remote_interaction_helper/index.html.haml
index 84a48bf05757f8..e67fe6b6b7a7c3 100644
--- a/app/views/remote_interaction_helper/index.html.haml
+++ b/app/views/remote_interaction_helper/index.html.haml
@@ -1,4 +1,4 @@
 - content_for :header_tags do
   %meta{ name: 'robots', content: 'noindex' }/
 
-  = javascript_pack_tag 'flavours/vanilla/remote_interaction_helper', crossorigin: 'anonymous'
+  = flavoured_javascript_pack_tag 'remote_interaction_helper', crossorigin: 'anonymous'
diff --git a/app/views/settings/two_factor_authentication/webauthn_credentials/new.html.haml b/app/views/settings/two_factor_authentication/webauthn_credentials/new.html.haml
index 5ec0247577de91..444cf6ae74e04d 100644
--- a/app/views/settings/two_factor_authentication/webauthn_credentials/new.html.haml
+++ b/app/views/settings/two_factor_authentication/webauthn_credentials/new.html.haml
@@ -12,3 +12,5 @@
 
   .actions
     = f.button :button, t('webauthn_credentials.add'), class: 'js-webauthn', type: :submit
+
+= flavoured_javascript_pack_tag 'two_factor_authentication', crossorigin: 'anonymous'
diff --git a/app/views/shared/_web_app.html.haml b/app/views/shared/_web_app.html.haml
index b53c25e77c00d7..cb9f7f4cfd0067 100644
--- a/app/views/shared/_web_app.html.haml
+++ b/app/views/shared/_web_app.html.haml
@@ -1,10 +1,12 @@
 - content_for :header_tags do
   - if user_signed_in?
+    = preload_signed_in_js_packs
     %meta{ name: 'initialPath', content: request.path }
 
   %meta{ name: 'applicationServerKey', content: Rails.configuration.x.vapid_public_key }
 
   = render_initial_state
+  = flavoured_javascript_pack_tag 'application', crossorigin: 'anonymous'
 
 .notranslate.app-holder#mastodon{ data: { props: Oj.dump(default_props) } }
   %noscript
diff --git a/app/views/shares/show.html.haml b/app/views/shares/show.html.haml
index 28910d3abdfb1d..350604527ddfad 100644
--- a/app/views/shares/show.html.haml
+++ b/app/views/shares/show.html.haml
@@ -1,4 +1,5 @@
 - content_for :header_tags do
   = render_initial_state
+  = flavoured_javascript_pack_tag 'share', crossorigin: 'anonymous'
 
 #mastodon-compose{ data: { props: Oj.dump(default_props) } }
diff --git a/config/webpack/configuration.js b/config/webpack/configuration.js
index 7ec28158e72ace..c9a1fe268abe24 100644
--- a/config/webpack/configuration.js
+++ b/config/webpack/configuration.js
@@ -14,18 +14,15 @@ const skinFiles = glob.sync('app/javascript/skins/*/*');
 const flavours = {};
 
 flavourFiles.forEach((flavourFile) => {
-  const data = load(readFileSync(flavourFile), 'utf8');
-  data.name = basename(dirname(flavourFile));
-  data.skin = {};
-  if (!data.pack_directory) {
-    data.pack_directory = dirname(flavourFile);
-  }
-  if (data.locales) {
-    data.locales = join(dirname(flavourFile), data.locales);
-  }
-  if (data.pack && typeof data.pack === 'object') {
-    flavours[data.name] = data;
-  }
+  const { locales, inherit_locales, pack_directory } = load(readFileSync(flavourFile), 'utf8');
+
+  flavours[basename(dirname(flavourFile))] = {
+    name: basename(dirname(flavourFile)),
+    locales: locales ? join(dirname(flavourFile), locales) : null,
+    inherit_locales,
+    pack_directory: pack_directory,
+    skin: {},
+  };
 });
 
 skinFiles.forEach((skinFile) => {
diff --git a/config/webpack/shared.js b/config/webpack/shared.js
index 404dc23d6ec51d..df61dff312cc5e 100644
--- a/config/webpack/shared.js
+++ b/config/webpack/shared.js
@@ -1,36 +1,26 @@
 // Note: You must restart bin/webpack-dev-server for changes to take effect
 
-const { resolve } = require('path');
+const { basename, dirname, join, relative, resolve } = require('path');
 
 const CircularDependencyPlugin = require('circular-dependency-plugin');
+const { sync } = require('glob');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
+const extname = require('path-complete-extname');
 const webpack = require('webpack');
 const AssetsManifestPlugin = require('webpack-assets-manifest');
 
 const { env, settings, flavours, output } = require('./configuration');
 const rules = require('./rules');
 
-function reducePacks (data, into = {}) {
-  if (!data.pack) return into;
+const extensionGlob = `**/*{${settings.extensions.join(',')}}*`;
 
-  for (const entry in data.pack) {
-    const pack = data.pack[entry];
-    if (!pack) continue;
+function reduceFlavourPacks(data, into = {}) {
+  const packPaths = sync(join(data.pack_directory, extensionGlob));
 
-    let packFiles = [];
-    if (typeof pack === 'string')
-      packFiles = [pack];
-    else if (Array.isArray(pack))
-      packFiles = pack;
-    else
-      packFiles = [pack.filename];
-
-    if (packFiles) {
-      into[`flavours/${data.name}/${entry}`] = packFiles.map(packFile => resolve(data.pack_directory, packFile));
-    }
-  }
-
-  if (!data.name) return into;
+  packPaths.forEach((entry) => {
+    const namespace = relative(join(data.pack_directory), dirname(entry));
+    into[`flavours/${data.name}/${join(namespace, basename(entry, extname(entry)))}`] = resolve(entry);
+  });
 
   for (const skinName in data.skin) {
     const skin = data.skin[skinName];
@@ -43,7 +33,7 @@ function reducePacks (data, into = {}) {
 }
 
 const entries = Object.assign(
-  Object.values(flavours).reduce((map, data) => reducePacks(data, map), {}),
+  Object.values(flavours).reduce((map, data) => reduceFlavourPacks(data, map), {}),
 );
 
 
diff --git a/spec/views/statuses/show.html.haml_spec.rb b/spec/views/statuses/show.html.haml_spec.rb
index 92ba678b6d5cd6..779fe6e5f44534 100644
--- a/spec/views/statuses/show.html.haml_spec.rb
+++ b/spec/views/statuses/show.html.haml_spec.rb
@@ -4,7 +4,7 @@
 
 describe 'statuses/show.html.haml', :without_verify_partial_doubles do
   before do
-    allow(view).to receive_messages(api_oembed_url: '', site_title: 'example site', site_hostname: 'example.com', full_asset_url: '//asset.host/image.svg', current_account: nil, single_user_mode?: false)
+    allow(view).to receive_messages(api_oembed_url: '', site_title: 'example site', site_hostname: 'example.com', full_asset_url: '//asset.host/image.svg', current_flavour: 'glitch', current_account: nil, single_user_mode?: false)
     allow(view).to receive(:local_time)
     allow(view).to receive(:local_time_ago)
     assign(:instance_presenter, InstancePresenter.new)

From e0a3662d7be57166cedc2e320b7dc10499b02e38 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Sun, 28 Apr 2024 22:38:11 +0200
Subject: [PATCH 0848/2191] Drop hardcoded reliance on vanilla flavor

---
 app/helpers/application_helper.rb       | 4 ++++
 app/views/layouts/application.html.haml | 4 ++--
 app/views/layouts/embedded.html.haml    | 2 +-
 app/views/layouts/error.html.haml       | 2 +-
 app/views/layouts/mailer.html.haml      | 2 +-
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 62c0e78d239140..b0114132ccfaff 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -243,6 +243,10 @@ def flavoured_javascript_pack_tag(pack_name, **options)
     javascript_pack_tag("flavours/#{current_flavour}/#{pack_name}", **options)
   end
 
+  def flavoured_stylesheet_pack_tag(pack_name, **options)
+    stylesheet_pack_tag("flavours/#{current_flavour}/#{pack_name}", **options)
+  end
+
   def preload_signed_in_js_packs
     preload_files = Themes.instance.flavour(current_flavour)&.fetch('signed_in_preload', nil) || []
     safe_join(preload_files.map { |entry| preload_pack_asset entry })
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 4fe314eb4b88b5..7d69ea88e6ca84 100755
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -26,11 +26,11 @@
 
     %title= html_title
 
-    = stylesheet_pack_tag 'flavours/vanilla/common', media: 'all', crossorigin: 'anonymous' # upstream uses `common` but that's implicitly defined
+    = flavoured_stylesheet_pack_tag 'common', media: 'all', crossorigin: 'anonymous' # upstream uses `common` but that's implicitly defined
     = stylesheet_pack_tag current_theme, media: 'all', crossorigin: 'anonymous'
 
     -# Needed for the wicg-inert polyfill. It needs to be on it's own <style> tag, with this `id`
-    = stylesheet_pack_tag 'flavours/vanilla/inert', media: 'all', id: 'inert-style'
+    = flavoured_stylesheet_pack_tag 'inert', media: 'all', id: 'inert-style'
 
     = javascript_pack_tag 'common', crossorigin: 'anonymous'
     = preload_locale_pack
diff --git a/app/views/layouts/embedded.html.haml b/app/views/layouts/embedded.html.haml
index e8764567d1b58a..b8b0c8683b5698 100644
--- a/app/views/layouts/embedded.html.haml
+++ b/app/views/layouts/embedded.html.haml
@@ -11,7 +11,7 @@
     - if storage_host?
       %link{ rel: 'dns-prefetch', href: storage_host }/
 
-    = stylesheet_pack_tag 'flavours/vanilla/common', media: 'all', crossorigin: 'anonymous' # upstream uses `common` but that's implicitly defined
+    = flavoured_stylesheet_pack_tag 'common', media: 'all', crossorigin: 'anonymous' # upstream uses `common` but that's implicitly defined
     = stylesheet_pack_tag current_theme, media: 'all', crossorigin: 'anonymous'
     = javascript_pack_tag 'common', integrity: true, crossorigin: 'anonymous'
     = preload_locale_pack
diff --git a/app/views/layouts/error.html.haml b/app/views/layouts/error.html.haml
index 7ad2ad3d696df5..b5f9292bba821c 100644
--- a/app/views/layouts/error.html.haml
+++ b/app/views/layouts/error.html.haml
@@ -5,7 +5,7 @@
     %meta{ charset: 'utf-8' }/
     %title= safe_join([yield(:page_title), Setting.default_settings['site_title']], ' - ')
     %meta{ content: 'width=device-width,initial-scale=1', name: 'viewport' }/
-    = stylesheet_pack_tag 'flavours/vanilla/common', media: 'all', crossorigin: 'anonymous' # upstream uses `common` but that's implicitly defined
+    = flavoured_stylesheet_pack_tag 'common', media: 'all', crossorigin: 'anonymous' # upstream uses `common` but that's implicitly defined
     = stylesheet_pack_tag current_theme, media: 'all', crossorigin: 'anonymous'
     = javascript_pack_tag 'common', crossorigin: 'anonymous'
     = flavoured_javascript_pack_tag 'error', crossorigin: 'anonymous'
diff --git a/app/views/layouts/mailer.html.haml b/app/views/layouts/mailer.html.haml
index 76f9b827a0e8bf..f632b4d111a1a0 100644
--- a/app/views/layouts/mailer.html.haml
+++ b/app/views/layouts/mailer.html.haml
@@ -18,7 +18,7 @@
       <o:PixelsPerInch>96</o:PixelsPerInch>
       </o:OfficeDocumentSettings>
       </xml>
-    = stylesheet_pack_tag 'flavours/vanilla/mailer'
+    = stylesheet_pack_tag "flavours/#{Setting.default_settings['flavour'] || 'glitch'}/mailer"
   %body
     .email{ dir: locale_direction }
       %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }

From 7201f99cf83a74331febd1624ca9aaace68af5e6 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 29 Apr 2024 03:41:59 -0400
Subject: [PATCH 0849/2191] Change default ruby version to 3.3.1 (#28013)

---
 .github/workflows/test-ruby.yml | 6 +++---
 .ruby-version                   | 2 +-
 Dockerfile                      | 6 +++---
 Gemfile.lock                    | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/test-ruby.yml b/.github/workflows/test-ruby.yml
index 3a78f8b43d4162..b28f5261c2e886 100644
--- a/.github/workflows/test-ruby.yml
+++ b/.github/workflows/test-ruby.yml
@@ -115,8 +115,8 @@ jobs:
       matrix:
         ruby-version:
           - '3.1'
+          - '3.2'
           - '.ruby-version'
-          - '3.3'
     steps:
       - uses: actions/checkout@v4
 
@@ -190,8 +190,8 @@ jobs:
       matrix:
         ruby-version:
           - '3.1'
+          - '3.2'
           - '.ruby-version'
-          - '3.3'
 
     steps:
       - uses: actions/checkout@v4
@@ -289,8 +289,8 @@ jobs:
       matrix:
         ruby-version:
           - '3.1'
+          - '3.2'
           - '.ruby-version'
-          - '3.3'
         search-image:
           - docker.elastic.co/elasticsearch/elasticsearch:7.17.13
         include:
diff --git a/.ruby-version b/.ruby-version
index 351227fca344ed..bea438e9ade770 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-3.2.4
+3.3.1
diff --git a/Dockerfile b/Dockerfile
index a95d41a65b5762..4278242bc9fcc7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,15 +7,15 @@
 ARG TARGETPLATFORM=${TARGETPLATFORM}
 ARG BUILDPLATFORM=${BUILDPLATFORM}
 
-# Ruby image to use for base image, change with [--build-arg RUBY_VERSION="3.2.4"]
-ARG RUBY_VERSION="3.2.4"
+# Ruby image to use for base image, change with [--build-arg RUBY_VERSION="3.3.1"]
+ARG RUBY_VERSION="3.3.1"
 # # Node version to use in base image, change with [--build-arg NODE_MAJOR_VERSION="20"]
 ARG NODE_MAJOR_VERSION="20"
 # Debian image to use for base image, change with [--build-arg DEBIAN_VERSION="bookworm"]
 ARG DEBIAN_VERSION="bookworm"
 # Node image to use for base image based on combined variables (ex: 20-bookworm-slim)
 FROM docker.io/node:${NODE_MAJOR_VERSION}-${DEBIAN_VERSION}-slim as node
-# Ruby image to use for base image based on combined variables (ex: 3.2.4-slim-bookworm)
+# Ruby image to use for base image based on combined variables (ex: 3.3.1-slim-bookworm)
 FROM docker.io/ruby:${RUBY_VERSION}-slim-${DEBIAN_VERSION} as ruby
 
 # Resulting version string is vX.X.X-MASTODON_VERSION_PRERELEASE+MASTODON_VERSION_METADATA
diff --git a/Gemfile.lock b/Gemfile.lock
index 620da849924426..18564ea68b2e4c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -952,7 +952,7 @@ DEPENDENCIES
   xorcist (~> 1.1)
 
 RUBY VERSION
-   ruby 3.2.3p157
+   ruby 3.3.1p55
 
 BUNDLED WITH
    2.5.9

From 4f4b77920eeb3ba65346862d489945494dfeab64 Mon Sep 17 00:00:00 2001
From: David Beck <davbeck@users.noreply.github.com>
Date: Mon, 29 Apr 2024 00:55:58 -0700
Subject: [PATCH 0850/2191] Remove home marker updates (#22721)

---
 app/javascript/mastodon/actions/markers.ts | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/app/javascript/mastodon/actions/markers.ts b/app/javascript/mastodon/actions/markers.ts
index 6ecc867169f1a6..91f78ee2867c2c 100644
--- a/app/javascript/mastodon/actions/markers.ts
+++ b/app/javascript/mastodon/actions/markers.ts
@@ -1,5 +1,3 @@
-import { List as ImmutableList } from 'immutable';
-
 import { debounce } from 'lodash';
 
 import type { MarkerJSON } from 'mastodon/api_types/markers';
@@ -71,19 +69,6 @@ interface MarkerParam {
   last_read_id?: string;
 }
 
-function getLastHomeId(state: RootState): string | undefined {
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-return
-  return (
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-call
-    state
-      // @ts-expect-error state.timelines is not yet typed
-      .getIn(['timelines', 'home', 'items'], ImmutableList())
-      // @ts-expect-error state.timelines is not yet typed
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-      .find((item) => item !== null)
-  );
-}
-
 function getLastNotificationId(state: RootState): string | undefined {
   // @ts-expect-error state.notifications is not yet typed
   // eslint-disable-next-line @typescript-eslint/no-unsafe-return, @typescript-eslint/no-unsafe-call
@@ -93,15 +78,8 @@ function getLastNotificationId(state: RootState): string | undefined {
 const buildPostMarkersParams = (state: RootState) => {
   const params = {} as { home?: MarkerParam; notifications?: MarkerParam };
 
-  const lastHomeId = getLastHomeId(state);
   const lastNotificationId = getLastNotificationId(state);
 
-  if (lastHomeId && compareId(lastHomeId, state.markers.home) > 0) {
-    params.home = {
-      last_read_id: lastHomeId,
-    };
-  }
-
   if (
     lastNotificationId &&
     compareId(lastNotificationId, state.markers.notifications) > 0

From 36909065b544d06e8487f1e0679e595fd01a7f22 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Mon, 29 Apr 2024 10:02:41 +0200
Subject: [PATCH 0851/2191] Convert easy entrypoints files to Typescript
 (#30102)

---
 .../{application.js => application.ts}           |  4 ++--
 .../entrypoints/{error.js => error.ts}           |  6 +++++-
 .../entrypoints/{inert.js => inert.ts}           |  0
 .../entrypoints/{mailer.js => mailer.ts}         |  0
 .../{public-path.js => public-path.ts}           | 10 ++++++----
 .../entrypoints/{share.jsx => share.tsx}         | 16 ++++++++++------
 package.json                                     |  1 +
 yarn.lock                                        |  8 ++++++++
 8 files changed, 32 insertions(+), 13 deletions(-)
 rename app/javascript/entrypoints/{application.js => application.ts} (81%)
 rename app/javascript/entrypoints/{error.js => error.ts} (64%)
 rename app/javascript/entrypoints/{inert.js => inert.ts} (100%)
 rename app/javascript/entrypoints/{mailer.js => mailer.ts} (100%)
 rename app/javascript/entrypoints/{public-path.js => public-path.ts} (69%)
 rename app/javascript/entrypoints/{share.jsx => share.tsx} (64%)

diff --git a/app/javascript/entrypoints/application.js b/app/javascript/entrypoints/application.ts
similarity index 81%
rename from app/javascript/entrypoints/application.js
rename to app/javascript/entrypoints/application.ts
index d13388b4791620..1087b1c4cb5c86 100644
--- a/app/javascript/entrypoints/application.js
+++ b/app/javascript/entrypoints/application.ts
@@ -1,5 +1,5 @@
 import './public-path';
-import main from "mastodon/main";
+import main from 'mastodon/main';
 
 import { start } from '../mastodon/common';
 import { loadLocale } from '../mastodon/locales';
@@ -10,6 +10,6 @@ start();
 loadPolyfills()
   .then(loadLocale)
   .then(main)
-  .catch(e => {
+  .catch((e: unknown) => {
     console.error(e);
   });
diff --git a/app/javascript/entrypoints/error.js b/app/javascript/entrypoints/error.ts
similarity index 64%
rename from app/javascript/entrypoints/error.js
rename to app/javascript/entrypoints/error.ts
index 6376dc2f5dfcc1..db68484f3a886c 100644
--- a/app/javascript/entrypoints/error.js
+++ b/app/javascript/entrypoints/error.ts
@@ -2,7 +2,9 @@ import './public-path';
 import ready from '../mastodon/ready';
 
 ready(() => {
-  const image = document.querySelector('img');
+  const image = document.querySelector<HTMLImageElement>('img');
+
+  if (!image) return;
 
   image.addEventListener('mouseenter', () => {
     image.src = '/oops.gif';
@@ -11,4 +13,6 @@ ready(() => {
   image.addEventListener('mouseleave', () => {
     image.src = '/oops.png';
   });
+}).catch((e: unknown) => {
+  console.error(e);
 });
diff --git a/app/javascript/entrypoints/inert.js b/app/javascript/entrypoints/inert.ts
similarity index 100%
rename from app/javascript/entrypoints/inert.js
rename to app/javascript/entrypoints/inert.ts
diff --git a/app/javascript/entrypoints/mailer.js b/app/javascript/entrypoints/mailer.ts
similarity index 100%
rename from app/javascript/entrypoints/mailer.js
rename to app/javascript/entrypoints/mailer.ts
diff --git a/app/javascript/entrypoints/public-path.js b/app/javascript/entrypoints/public-path.ts
similarity index 69%
rename from app/javascript/entrypoints/public-path.js
rename to app/javascript/entrypoints/public-path.ts
index f4d166a77134cb..ac4b9355b952d7 100644
--- a/app/javascript/entrypoints/public-path.js
+++ b/app/javascript/entrypoints/public-path.ts
@@ -2,7 +2,7 @@
 // to share the same assets regardless of instance configuration.
 // See https://webpack.js.org/guides/public-path/#on-the-fly
 
-function removeOuterSlashes(string) {
+function removeOuterSlashes(string: string) {
   return string.replace(/^\/*/, '').replace(/\/*$/, '');
 }
 
@@ -15,7 +15,9 @@ function formatPublicPath(host = '', path = '') {
   return `${formattedHost}/${formattedPath}/`;
 }
 
-const cdnHost = document.querySelector('meta[name=cdn-host]');
+const cdnHost = document.querySelector<HTMLMetaElement>('meta[name=cdn-host]');
 
-// eslint-disable-next-line no-undef
-__webpack_public_path__ = formatPublicPath(cdnHost ? cdnHost.content : '', process.env.PUBLIC_OUTPUT_PATH);
+__webpack_public_path__ = formatPublicPath(
+  cdnHost ? cdnHost.content : '',
+  process.env.PUBLIC_OUTPUT_PATH,
+);
diff --git a/app/javascript/entrypoints/share.jsx b/app/javascript/entrypoints/share.tsx
similarity index 64%
rename from app/javascript/entrypoints/share.jsx
rename to app/javascript/entrypoints/share.tsx
index 7b5723091c81e8..792625085106dc 100644
--- a/app/javascript/entrypoints/share.jsx
+++ b/app/javascript/entrypoints/share.tsx
@@ -2,7 +2,7 @@ import './public-path';
 import { createRoot } from 'react-dom/client';
 
 import { start } from '../mastodon/common';
-import ComposeContainer  from '../mastodon/containers/compose_container';
+import ComposeContainer from '../mastodon/containers/compose_container';
 import { loadPolyfills } from '../mastodon/polyfills';
 import ready from '../mastodon/ready';
 
@@ -16,7 +16,7 @@ function loaded() {
 
     if (!attr) return;
 
-    const props = JSON.parse(attr);
+    const props = JSON.parse(attr) as object;
     const root = createRoot(mountNode);
 
     root.render(<ComposeContainer {...props} />);
@@ -24,9 +24,13 @@ function loaded() {
 }
 
 function main() {
-  ready(loaded);
+  ready(loaded).catch((error: unknown) => {
+    console.error(error);
+  });
 }
 
-loadPolyfills().then(main).catch(error => {
-  console.error(error);
-});
+loadPolyfills()
+  .then(main)
+  .catch((error: unknown) => {
+    console.error(error);
+  });
diff --git a/package.json b/package.json
index 0b5c3484d2a6c9..24d81ea476ae6f 100644
--- a/package.json
+++ b/package.json
@@ -167,6 +167,7 @@
     "@types/redux-immutable": "^4.0.3",
     "@types/requestidlecallback": "^0.3.5",
     "@types/webpack": "^4.41.33",
+    "@types/webpack-env": "^1.18.4",
     "@typescript-eslint/eslint-plugin": "^7.0.0",
     "@typescript-eslint/parser": "^7.0.0",
     "babel-jest": "^29.5.0",
diff --git a/yarn.lock b/yarn.lock
index 0b60c39c91c911..ffc64ba08c270f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2766,6 +2766,7 @@ __metadata:
     "@types/redux-immutable": "npm:^4.0.3"
     "@types/requestidlecallback": "npm:^0.3.5"
     "@types/webpack": "npm:^4.41.33"
+    "@types/webpack-env": "npm:^1.18.4"
     "@typescript-eslint/eslint-plugin": "npm:^7.0.0"
     "@typescript-eslint/parser": "npm:^7.0.0"
     arrow-key-navigation: "npm:^1.2.0"
@@ -3990,6 +3991,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/webpack-env@npm:^1.18.4":
+  version: 1.18.4
+  resolution: "@types/webpack-env@npm:1.18.4"
+  checksum: 10c0/3fa77dbff0ed71685404576b0a1cf74587567fe2ee1cfd11d56d6eefcab7a61e4c9ead0eced264e289d2cf0fc74296dbd55ed6c95774fe0fd6264d156c5a59f0
+  languageName: node
+  linkType: hard
+
 "@types/webpack-sources@npm:*":
   version: 3.2.2
   resolution: "@types/webpack-sources@npm:3.2.2"

From d8a4cea41b7def0815912cfba01aee7f95a24cde Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2024 10:08:43 +0200
Subject: [PATCH 0852/2191] Update dependency haml_lint to v0.58.0 (#30094)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 18564ea68b2e4c..f57562370072a6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -304,7 +304,7 @@ GEM
       activesupport (>= 5.1)
       haml (>= 4.0.6)
       railties (>= 5.1)
-    haml_lint (0.57.0)
+    haml_lint (0.58.0)
       haml (>= 5.0)
       parallel (~> 1.10)
       rainbow
@@ -498,7 +498,7 @@ GEM
     orm_adapter (0.5.0)
     ox (2.14.18)
     parallel (1.24.0)
-    parser (3.3.0.5)
+    parser (3.3.1.0)
       ast (~> 2.4.1)
       racc
     parslet (2.0.0)

From 31f3dd57e08282b679bb0033b6b69f0172fde678 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2024 10:08:58 +0200
Subject: [PATCH 0853/2191] Update dependency rubocop to v1.63.4 (#30096)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index f57562370072a6..4f4ca89dc22ac6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -644,7 +644,7 @@ GEM
       rspec-mocks (~> 3.0)
       sidekiq (>= 5, < 8)
     rspec-support (3.13.1)
-    rubocop (1.63.3)
+    rubocop (1.63.4)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)

From c0584a6f4f91c00b28bf6a1e307c0f0228b5ad67 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2024 08:09:27 +0000
Subject: [PATCH 0854/2191] Update devDependencies (non-major) (#30109)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 64 +++++++++++++++++++++++++++----------------------------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index ffc64ba08c270f..0ef97cdd84713e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1983,7 +1983,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/selector-specificity@npm:^3.0.2, @csstools/selector-specificity@npm:^3.0.3":
+"@csstools/selector-specificity@npm:^3.0.3":
   version: 3.0.3
   resolution: "@csstools/selector-specificity@npm:3.0.3"
   peerDependencies:
@@ -3332,8 +3332,8 @@ __metadata:
   linkType: hard
 
 "@testing-library/react@npm:^15.0.0":
-  version: 15.0.2
-  resolution: "@testing-library/react@npm:15.0.2"
+  version: 15.0.5
+  resolution: "@testing-library/react@npm:15.0.5"
   dependencies:
     "@babel/runtime": "npm:^7.12.5"
     "@testing-library/dom": "npm:^10.0.0"
@@ -3341,7 +3341,7 @@ __metadata:
   peerDependencies:
     react: ^18.0.0
     react-dom: ^18.0.0
-  checksum: 10c0/8d75e4850f8f749244bf4f30b0f99a5d4aa1156ee5a59eea0772f47971c38535d1fb31d021c4f0f0b816346ae664870dc223d5d997ab399dfb1b6211f0e2acf1
+  checksum: 10c0/8759cc8e7e6b4d8964f151d8872ea3c91b6ef6d8fb3b9116fae53350b9a6b29e5ad45b18408c22525924d050263f7ea77cd17ca803918759f22a760f68a42227
   languageName: node
   linkType: hard
 
@@ -6509,10 +6509,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"css-functions-list@npm:^3.2.1":
-  version: 3.2.1
-  resolution: "css-functions-list@npm:3.2.1"
-  checksum: 10c0/e6e2d9580437ad6df9f2cf18cff3f941691ec5cbbaebd4cb17a5da40d8d5dac50004807ddd05c00a121d2f21a224e2c5d339fe8e13614af21c00181d7d1c22b9
+"css-functions-list@npm:^3.2.2":
+  version: 3.2.2
+  resolution: "css-functions-list@npm:3.2.2"
+  checksum: 10c0/8638a63d0cf1bdc50d4a752ec1c94a57e9953c3b03eace4f5526db20bec3c061e95089f905dbb4999c44b9780ce777ba856967560f6d15119a303f6030901c10
   languageName: node
   linkType: hard
 
@@ -14329,10 +14329,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-is@npm:^16.12.0 || ^17.0.0 || ^18.0.0, react-is@npm:^18.0.0, react-is@npm:^18.2.0":
-  version: 18.2.0
-  resolution: "react-is@npm:18.2.0"
-  checksum: 10c0/6eb5e4b28028c23e2bfcf73371e72cd4162e4ac7ab445ddae2afe24e347a37d6dc22fae6e1748632cd43c6d4f9b8f86dcf26bf9275e1874f436d129952528ae0
+"react-is@npm:^16.12.0 || ^17.0.0 || ^18.0.0, react-is@npm:^18.0.0, react-is@npm:^18.3.1":
+  version: 18.3.1
+  resolution: "react-is@npm:18.3.1"
+  checksum: 10c0/f2f1e60010c683479e74c63f96b09fb41603527cd131a9959e2aee1e5a8b0caf270b365e5ca77d4a6b18aae659b60a86150bb3979073528877029b35aecd2072
   languageName: node
   linkType: hard
 
@@ -14581,15 +14581,15 @@ __metadata:
   linkType: hard
 
 "react-test-renderer@npm:^18.2.0":
-  version: 18.2.0
-  resolution: "react-test-renderer@npm:18.2.0"
+  version: 18.3.1
+  resolution: "react-test-renderer@npm:18.3.1"
   dependencies:
-    react-is: "npm:^18.2.0"
+    react-is: "npm:^18.3.1"
     react-shallow-renderer: "npm:^16.15.0"
-    scheduler: "npm:^0.23.0"
+    scheduler: "npm:^0.23.2"
   peerDependencies:
-    react: ^18.2.0
-  checksum: 10c0/53dfada1da1e8dd0498a5601e9eea3dc6ca23c6c2694d1cab9712faea869c11e4ce1c9a618d674cb668a668b41fb6bcf9a7b0a078cd853b1922f002fa22f42c8
+    react: ^18.3.1
+  checksum: 10c0/c633558ef9af33bc68f0c4dbb5163a004c4fb9eade7bd0a7cfc0355fb367f36bd9d96533c90b7e85a146be6c525113a15f58683d269e0177ad77e2b04d4fe51c
   languageName: node
   linkType: hard
 
@@ -15314,12 +15314,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"scheduler@npm:^0.23.0":
-  version: 0.23.0
-  resolution: "scheduler@npm:0.23.0"
+"scheduler@npm:^0.23.0, scheduler@npm:^0.23.2":
+  version: 0.23.2
+  resolution: "scheduler@npm:0.23.2"
   dependencies:
     loose-envify: "npm:^1.1.0"
-  checksum: 10c0/b777f7ca0115e6d93e126ac490dbd82642d14983b3079f58f35519d992fa46260be7d6e6cede433a92db70306310c6f5f06e144f0e40c484199e09c1f7be53dd
+  checksum: 10c0/26383305e249651d4c58e6705d5f8425f153211aef95f15161c151f7b8de885f24751b377e4a0b3dd42cce09aad3f87a61dab7636859c0d89b7daf1a1e2a5c78
   languageName: node
   linkType: hard
 
@@ -16408,18 +16408,18 @@ __metadata:
   linkType: hard
 
 "stylelint@npm:^16.0.2":
-  version: 16.3.1
-  resolution: "stylelint@npm:16.3.1"
+  version: 16.4.0
+  resolution: "stylelint@npm:16.4.0"
   dependencies:
     "@csstools/css-parser-algorithms": "npm:^2.6.1"
     "@csstools/css-tokenizer": "npm:^2.2.4"
     "@csstools/media-query-list-parser": "npm:^2.1.9"
-    "@csstools/selector-specificity": "npm:^3.0.2"
+    "@csstools/selector-specificity": "npm:^3.0.3"
     "@dual-bundle/import-meta-resolve": "npm:^4.0.0"
     balanced-match: "npm:^2.0.0"
     colord: "npm:^2.9.3"
     cosmiconfig: "npm:^9.0.0"
-    css-functions-list: "npm:^3.2.1"
+    css-functions-list: "npm:^3.2.2"
     css-tree: "npm:^2.3.1"
     debug: "npm:^4.3.4"
     fast-glob: "npm:^3.3.2"
@@ -16448,11 +16448,11 @@ __metadata:
     strip-ansi: "npm:^7.1.0"
     supports-hyperlinks: "npm:^3.0.0"
     svg-tags: "npm:^1.0.0"
-    table: "npm:^6.8.1"
+    table: "npm:^6.8.2"
     write-file-atomic: "npm:^5.0.1"
   bin:
     stylelint: bin/stylelint.mjs
-  checksum: 10c0/1660bb359002ff8e07cea044018b13abc73f48cf02a5062953b086f4d58611cd10677787560774c1acabeb192b6d059ce7fcf4c11defa7f64e50dca908fc664f
+  checksum: 10c0/7e603a0d88732180b60528c9f2edfca7fdf8c966f42c260af16131854c3acb5acfa30403b1f4fd72cd1470eb9ba625ca4de84e8cb379942df54127c55afc1288
   languageName: node
   linkType: hard
 
@@ -16584,16 +16584,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"table@npm:^6.8.1":
-  version: 6.8.1
-  resolution: "table@npm:6.8.1"
+"table@npm:^6.8.2":
+  version: 6.8.2
+  resolution: "table@npm:6.8.2"
   dependencies:
     ajv: "npm:^8.0.1"
     lodash.truncate: "npm:^4.4.2"
     slice-ansi: "npm:^4.0.0"
     string-width: "npm:^4.2.3"
     strip-ansi: "npm:^6.0.1"
-  checksum: 10c0/591ed84b2438b01c9bc02248e2238e21e8bfb73654bc5acca0d469053eb39be3db2f57d600dcf08ac983b6f50f80842c44612c03877567c2afee3aec4a033e5f
+  checksum: 10c0/f8b348af38ee34e419d8ce7306ba00671ce6f20e861ccff22555f491ba264e8416086063ce278a8d81abfa8d23b736ec2cca7ac4029b5472f63daa4b4688b803
   languageName: node
   linkType: hard
 

From 23223369e083a38e0234c9c9552ddfebba967ad8 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2024 10:09:50 +0200
Subject: [PATCH 0855/2191] Update eslint (non-major) (#30110)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 102 +++++++++++++++++++++++++++---------------------------
 1 file changed, 51 insertions(+), 51 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 0ef97cdd84713e..e8f4075e22c31d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4049,14 +4049,14 @@ __metadata:
   linkType: hard
 
 "@typescript-eslint/eslint-plugin@npm:^7.0.0":
-  version: 7.7.0
-  resolution: "@typescript-eslint/eslint-plugin@npm:7.7.0"
+  version: 7.7.1
+  resolution: "@typescript-eslint/eslint-plugin@npm:7.7.1"
   dependencies:
     "@eslint-community/regexpp": "npm:^4.10.0"
-    "@typescript-eslint/scope-manager": "npm:7.7.0"
-    "@typescript-eslint/type-utils": "npm:7.7.0"
-    "@typescript-eslint/utils": "npm:7.7.0"
-    "@typescript-eslint/visitor-keys": "npm:7.7.0"
+    "@typescript-eslint/scope-manager": "npm:7.7.1"
+    "@typescript-eslint/type-utils": "npm:7.7.1"
+    "@typescript-eslint/utils": "npm:7.7.1"
+    "@typescript-eslint/visitor-keys": "npm:7.7.1"
     debug: "npm:^4.3.4"
     graphemer: "npm:^1.4.0"
     ignore: "npm:^5.3.1"
@@ -4069,25 +4069,25 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 10c0/d1f4c40523d284bce4b8272750c68aae5c0289ddb1c9267dd3477e0bfb8c8855bfb0c6e86dfec9911ca8302ef729d5f4e47d686a566f363b0f89bf7dc7670b5c
+  checksum: 10c0/11a085240e7daf4bdeb011aa53ac7cfeea6263c60d53607823f5c314eb5c9d559b28fce0d6686acb9702ee3d0cb0406534fafae61163e5a903eaf818c48194ad
   languageName: node
   linkType: hard
 
 "@typescript-eslint/parser@npm:^7.0.0":
-  version: 7.7.0
-  resolution: "@typescript-eslint/parser@npm:7.7.0"
+  version: 7.7.1
+  resolution: "@typescript-eslint/parser@npm:7.7.1"
   dependencies:
-    "@typescript-eslint/scope-manager": "npm:7.7.0"
-    "@typescript-eslint/types": "npm:7.7.0"
-    "@typescript-eslint/typescript-estree": "npm:7.7.0"
-    "@typescript-eslint/visitor-keys": "npm:7.7.0"
+    "@typescript-eslint/scope-manager": "npm:7.7.1"
+    "@typescript-eslint/types": "npm:7.7.1"
+    "@typescript-eslint/typescript-estree": "npm:7.7.1"
+    "@typescript-eslint/visitor-keys": "npm:7.7.1"
     debug: "npm:^4.3.4"
   peerDependencies:
     eslint: ^8.56.0
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 10c0/d756c2292737499a93913647af7493aded5dc720a5f4ab6f8e96d6cc81f19cf6a1769a1df0f516f8facd276d34f8464f1711e57b0216082e32eb6b75da81b12e
+  checksum: 10c0/ace43eeb8123bbee61e936650e1d57a2cf70f2030870c6dcad8602fce3f7cdf2cce350121dbbc66cffd60bac36652f426a1c5293c45ed28998b90cd95673b5c9
   languageName: node
   linkType: hard
 
@@ -4101,22 +4101,22 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/scope-manager@npm:7.7.0":
-  version: 7.7.0
-  resolution: "@typescript-eslint/scope-manager@npm:7.7.0"
+"@typescript-eslint/scope-manager@npm:7.7.1":
+  version: 7.7.1
+  resolution: "@typescript-eslint/scope-manager@npm:7.7.1"
   dependencies:
-    "@typescript-eslint/types": "npm:7.7.0"
-    "@typescript-eslint/visitor-keys": "npm:7.7.0"
-  checksum: 10c0/014a3631c12bfbd5e33146a48e4b9eb5cc1c5c95bb458de33f8847eed33c04d7b9e66283971e48297673c4b92c3239d67e6dc3717efbe5836e0269a538c13d2e
+    "@typescript-eslint/types": "npm:7.7.1"
+    "@typescript-eslint/visitor-keys": "npm:7.7.1"
+  checksum: 10c0/4032da8fce8922044a6b659c8435ba203377778d5b7de6a5572c1172f2e3cf8ddd890a0f9e083c5d5315a9c2dba323707528ee4ad3cc1be2bd334de2527ef5cb
   languageName: node
   linkType: hard
 
-"@typescript-eslint/type-utils@npm:7.7.0":
-  version: 7.7.0
-  resolution: "@typescript-eslint/type-utils@npm:7.7.0"
+"@typescript-eslint/type-utils@npm:7.7.1":
+  version: 7.7.1
+  resolution: "@typescript-eslint/type-utils@npm:7.7.1"
   dependencies:
-    "@typescript-eslint/typescript-estree": "npm:7.7.0"
-    "@typescript-eslint/utils": "npm:7.7.0"
+    "@typescript-eslint/typescript-estree": "npm:7.7.1"
+    "@typescript-eslint/utils": "npm:7.7.1"
     debug: "npm:^4.3.4"
     ts-api-utils: "npm:^1.3.0"
   peerDependencies:
@@ -4124,7 +4124,7 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 10c0/064c28d4087a97fd175e07e02c0a9cf4526f61cc6a17b4199fba626932979210037643a30f868bda8174fad567a8ac6aed34120631d1ecfd502e0ea1e830f9e9
+  checksum: 10c0/bd083c4106e207aa8c2a71251eca52d23c7ea905399b8c62004f3bb1e85b9c88d601db9dcecae88beef0f8362d53450bb2721aab353ee731c1665496fea3fbda
   languageName: node
   linkType: hard
 
@@ -4135,10 +4135,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/types@npm:7.7.0":
-  version: 7.7.0
-  resolution: "@typescript-eslint/types@npm:7.7.0"
-  checksum: 10c0/eb50793650c9a911c73586150807912e7b7a0ae12eeb26c7a322ac8ebb8edef15960cc9a4b7049dbb89b82500079963145f67d15583f5de270fe8290974db533
+"@typescript-eslint/types@npm:7.7.1":
+  version: 7.7.1
+  resolution: "@typescript-eslint/types@npm:7.7.1"
+  checksum: 10c0/7d240503d9d0b12d68c8204167690609f02ededb77dcb035c1c8b932da08cf43553829c29a5f7889824a7337463c300343bc5abe532479726d4c83443a7e2704
   languageName: node
   linkType: hard
 
@@ -4161,12 +4161,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/typescript-estree@npm:7.7.0":
-  version: 7.7.0
-  resolution: "@typescript-eslint/typescript-estree@npm:7.7.0"
+"@typescript-eslint/typescript-estree@npm:7.7.1":
+  version: 7.7.1
+  resolution: "@typescript-eslint/typescript-estree@npm:7.7.1"
   dependencies:
-    "@typescript-eslint/types": "npm:7.7.0"
-    "@typescript-eslint/visitor-keys": "npm:7.7.0"
+    "@typescript-eslint/types": "npm:7.7.1"
+    "@typescript-eslint/visitor-keys": "npm:7.7.1"
     debug: "npm:^4.3.4"
     globby: "npm:^11.1.0"
     is-glob: "npm:^4.0.3"
@@ -4176,24 +4176,24 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 10c0/19da9bf0948c9800fde19c5a408a80a3a4cf357ff67d47b516df5d2a05701a4fdd2b9ab5b692866bd84bfc17cea9132d1575a1423e01763a4c2918b5d77d0b34
+  checksum: 10c0/c6b32bd96fd13b9da0a30de01935066f7505f6214f5759e3cd019f7d1852f7bf19358765f62e51de72be47647656aa0e8f07ac0ab316c4149a4e6bd1dd12cbb6
   languageName: node
   linkType: hard
 
-"@typescript-eslint/utils@npm:7.7.0":
-  version: 7.7.0
-  resolution: "@typescript-eslint/utils@npm:7.7.0"
+"@typescript-eslint/utils@npm:7.7.1":
+  version: 7.7.1
+  resolution: "@typescript-eslint/utils@npm:7.7.1"
   dependencies:
     "@eslint-community/eslint-utils": "npm:^4.4.0"
     "@types/json-schema": "npm:^7.0.15"
     "@types/semver": "npm:^7.5.8"
-    "@typescript-eslint/scope-manager": "npm:7.7.0"
-    "@typescript-eslint/types": "npm:7.7.0"
-    "@typescript-eslint/typescript-estree": "npm:7.7.0"
+    "@typescript-eslint/scope-manager": "npm:7.7.1"
+    "@typescript-eslint/types": "npm:7.7.1"
+    "@typescript-eslint/typescript-estree": "npm:7.7.1"
     semver: "npm:^7.6.0"
   peerDependencies:
     eslint: ^8.56.0
-  checksum: 10c0/c5f18ce198b420bdc201fd4278b4fa97bfe86178db565f3c4e1991bb452c9ea0b657e7980572555e2ec2fe218d07c42c794d217b9369903019cf784eea7e2164
+  checksum: 10c0/0986b8c297d6bfdbd2ac8cd3bcf447ef9b934e2dae536771d3368a5c284a0b16c0ea041f82aa100c48d05acc33198e1a3d9d721d3319ae80abba0f5e69c21633
   languageName: node
   linkType: hard
 
@@ -4224,13 +4224,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/visitor-keys@npm:7.7.0":
-  version: 7.7.0
-  resolution: "@typescript-eslint/visitor-keys@npm:7.7.0"
+"@typescript-eslint/visitor-keys@npm:7.7.1":
+  version: 7.7.1
+  resolution: "@typescript-eslint/visitor-keys@npm:7.7.1"
   dependencies:
-    "@typescript-eslint/types": "npm:7.7.0"
+    "@typescript-eslint/types": "npm:7.7.1"
     eslint-visitor-keys: "npm:^3.4.3"
-  checksum: 10c0/0f3b9720a962c04462a75d4872714c07320c8f672841881ada797ae960f9f6bd0e5f7494178917034f42635ef76f0f09fa3c8d4bd84f31ec58ee968fe75bada7
+  checksum: 10c0/19cbd14ac9a234d847f457cbd880cbd98b83c331a46d2dc2d8c0e6cb54ce6159552f6dd2f7236035be1a71f13f48df4a2aa09e70ad1f1e2ff3da7c3622927bd3
   languageName: node
   linkType: hard
 
@@ -7816,11 +7816,11 @@ __metadata:
   linkType: hard
 
 "eslint-plugin-react-hooks@npm:^4.6.0":
-  version: 4.6.0
-  resolution: "eslint-plugin-react-hooks@npm:4.6.0"
+  version: 4.6.2
+  resolution: "eslint-plugin-react-hooks@npm:4.6.2"
   peerDependencies:
     eslint: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0
-  checksum: 10c0/58c7e10ea5792c33346fcf5cb4024e14837035ce412ff99c2dcb7c4f903dc9b17939078f80bfef826301ce326582c396c00e8e0ac9d10ac2cde2b42d33763c65
+  checksum: 10c0/4844e58c929bc05157fb70ba1e462e34f1f4abcbc8dd5bbe5b04513d33e2699effb8bca668297976ceea8e7ebee4e8fc29b9af9d131bcef52886feaa2308b2cc
   languageName: node
   linkType: hard
 

From 0efa9854a1ff8123782ebc6a420d430da4a3c7a1 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2024 10:10:04 +0200
Subject: [PATCH 0856/2191] Update libretranslate/libretranslate Docker tag to
 v1.5.7 (#30111)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .devcontainer/docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
index d14af5d7d98ae4..97331f74ea7a01 100644
--- a/.devcontainer/docker-compose.yml
+++ b/.devcontainer/docker-compose.yml
@@ -70,7 +70,7 @@ services:
         hard: -1
 
   libretranslate:
-    image: libretranslate/libretranslate:v1.5.6
+    image: libretranslate/libretranslate:v1.5.7
     restart: unless-stopped
     volumes:
       - lt-data:/home/libretranslate/.local

From 00aec2f33a03e173e8e4a2de346846e8388686ae Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2024 08:10:20 +0000
Subject: [PATCH 0857/2191] Update peter-evans/create-pull-request action to
 v6.0.5 (#30112)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .github/workflows/crowdin-download.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/crowdin-download.yml b/.github/workflows/crowdin-download.yml
index 256dcffc77fe0a..1df7672d6c0833 100644
--- a/.github/workflows/crowdin-download.yml
+++ b/.github/workflows/crowdin-download.yml
@@ -52,7 +52,7 @@ jobs:
 
       # Create or update the pull request
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v6.0.4
+        uses: peter-evans/create-pull-request@v6.0.5
         with:
           commit-message: 'New Crowdin translations'
           title: 'New Crowdin Translations (automated)'

From 9be7efedf09491fefc5c287a1c67660eb7a6b633 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2024 08:15:43 +0000
Subject: [PATCH 0858/2191] New Crowdin Translations (automated) (#30092)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/bg.json    | 13 +++++++++++++
 app/javascript/mastodon/locales/br.json    |  3 +++
 app/javascript/mastodon/locales/ca.json    | 10 +++++++++-
 app/javascript/mastodon/locales/cs.json    | 13 +++++++++++++
 app/javascript/mastodon/locales/es-AR.json | 15 ++++++++++++++-
 app/javascript/mastodon/locales/es-MX.json | 13 +++++++++++++
 app/javascript/mastodon/locales/es.json    | 13 +++++++++++++
 app/javascript/mastodon/locales/he.json    |  9 +++++++++
 app/javascript/mastodon/locales/hu.json    |  6 +++---
 app/javascript/mastodon/locales/ja.json    |  4 ++++
 app/javascript/mastodon/locales/ko.json    | 13 +++++++++++++
 app/javascript/mastodon/locales/lad.json   |  4 ++++
 app/javascript/mastodon/locales/sk.json    |  2 ++
 app/javascript/mastodon/locales/sv.json    |  9 +++++++++
 app/javascript/mastodon/locales/th.json    | 15 ++++++++++++++-
 app/javascript/mastodon/locales/tr.json    | 13 +++++++++++++
 app/javascript/mastodon/locales/vi.json    | 13 +++++++++++++
 app/javascript/mastodon/locales/zh-HK.json | 13 +++++++++++++
 config/locales/be.yml                      |  8 ++++++++
 config/locales/bg.yml                      |  1 +
 config/locales/br.yml                      |  2 ++
 config/locales/ca.yml                      |  1 +
 config/locales/cs.yml                      |  1 +
 config/locales/da.yml                      |  1 +
 config/locales/de.yml                      |  1 +
 config/locales/doorkeeper.be.yml           |  1 +
 config/locales/doorkeeper.cs.yml           |  1 +
 config/locales/doorkeeper.ja.yml           |  1 +
 config/locales/doorkeeper.th.yml           |  1 +
 config/locales/es-AR.yml                   |  1 +
 config/locales/es-MX.yml                   |  1 +
 config/locales/es.yml                      |  5 +++--
 config/locales/eu.yml                      |  1 +
 config/locales/fi.yml                      |  1 +
 config/locales/fo.yml                      |  1 +
 config/locales/he.yml                      |  1 +
 config/locales/hu.yml                      |  1 +
 config/locales/is.yml                      |  1 +
 config/locales/it.yml                      |  1 +
 config/locales/nl.yml                      |  3 ++-
 config/locales/nn.yml                      |  1 +
 config/locales/pl.yml                      |  1 +
 config/locales/simple_form.an.yml          |  4 ----
 config/locales/simple_form.ar.yml          |  4 ----
 config/locales/simple_form.ast.yml         |  3 ---
 config/locales/simple_form.be.yml          |  4 ----
 config/locales/simple_form.bg.yml          |  8 ++++----
 config/locales/simple_form.ca.yml          |  8 ++++----
 config/locales/simple_form.cs.yml          |  8 ++++----
 config/locales/simple_form.cy.yml          |  4 ----
 config/locales/simple_form.da.yml          |  8 ++++----
 config/locales/simple_form.de.yml          |  8 ++++----
 config/locales/simple_form.el.yml          |  4 ----
 config/locales/simple_form.en-GB.yml       |  4 ----
 config/locales/simple_form.eo.yml          |  4 ----
 config/locales/simple_form.es-AR.yml       |  8 ++++----
 config/locales/simple_form.es-MX.yml       |  8 ++++----
 config/locales/simple_form.es.yml          |  8 ++++----
 config/locales/simple_form.et.yml          |  4 ----
 config/locales/simple_form.eu.yml          |  8 ++++----
 config/locales/simple_form.fa.yml          |  4 ----
 config/locales/simple_form.fi.yml          |  5 +----
 config/locales/simple_form.fo.yml          |  8 ++++----
 config/locales/simple_form.fr-CA.yml       |  4 ----
 config/locales/simple_form.fr.yml          |  4 ----
 config/locales/simple_form.fy.yml          |  4 ----
 config/locales/simple_form.gd.yml          |  4 ----
 config/locales/simple_form.gl.yml          |  4 ----
 config/locales/simple_form.he.yml          |  5 +----
 config/locales/simple_form.hu.yml          |  8 ++++----
 config/locales/simple_form.id.yml          |  4 ----
 config/locales/simple_form.ie.yml          |  4 ----
 config/locales/simple_form.io.yml          |  4 ----
 config/locales/simple_form.is.yml          |  6 ++----
 config/locales/simple_form.it.yml          |  8 ++++----
 config/locales/simple_form.ja.yml          |  4 ----
 config/locales/simple_form.ko.yml          |  4 ----
 config/locales/simple_form.ku.yml          |  4 ----
 config/locales/simple_form.lad.yml         |  4 ----
 config/locales/simple_form.lt.yml          |  2 --
 config/locales/simple_form.lv.yml          |  4 ----
 config/locales/simple_form.ms.yml          |  4 ----
 config/locales/simple_form.my.yml          |  4 ----
 config/locales/simple_form.nl.yml          |  8 ++++----
 config/locales/simple_form.nn.yml          |  8 ++++----
 config/locales/simple_form.no.yml          |  4 ----
 config/locales/simple_form.pl.yml          |  8 ++++----
 config/locales/simple_form.pt-BR.yml       |  4 ----
 config/locales/simple_form.pt-PT.yml       |  4 ----
 config/locales/simple_form.ru.yml          |  4 ----
 config/locales/simple_form.sco.yml         |  4 ----
 config/locales/simple_form.sl.yml          |  4 ----
 config/locales/simple_form.sq.yml          |  4 ----
 config/locales/simple_form.sr-Latn.yml     |  4 ----
 config/locales/simple_form.sr.yml          |  4 ----
 config/locales/simple_form.sv.yml          |  4 ----
 config/locales/simple_form.th.yml          |  5 +----
 config/locales/simple_form.tr.yml          |  8 ++++----
 config/locales/simple_form.uk.yml          |  8 +-------
 config/locales/simple_form.vi.yml          |  8 ++++----
 config/locales/simple_form.zh-CN.yml       |  8 ++++----
 config/locales/simple_form.zh-HK.yml       |  8 ++++----
 config/locales/simple_form.zh-TW.yml       |  8 ++++----
 config/locales/th.yml                      |  1 +
 config/locales/tr.yml                      |  1 +
 config/locales/uk.yml                      |  1 +
 config/locales/vi.yml                      |  1 +
 config/locales/zh-CN.yml                   |  1 +
 config/locales/zh-HK.yml                   |  1 +
 config/locales/zh-TW.yml                   |  1 +
 110 files changed, 303 insertions(+), 253 deletions(-)

diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json
index dabefd1f45e1f3..95d60b71ebfae7 100644
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@@ -308,6 +308,8 @@
   "follow_requests.unlocked_explanation": "Въпреки че акаунтът ви не е заключен, служителите на {domain} помислиха, че може да искате да преглеждате ръчно заявките за последване на тези профили.",
   "follow_suggestions.curated_suggestion": "Избор на персонал",
   "follow_suggestions.dismiss": "Без ново показване",
+  "follow_suggestions.featured_longer": "Ръчно избрано от отбора на {domain}",
+  "follow_suggestions.friends_of_friends_longer": "Популярно измежду хората, които следвате",
   "follow_suggestions.hints.featured": "Този профил е ръчно подбран от отбора на {domain}.",
   "follow_suggestions.hints.friends_of_friends": "Този профил е популярен измежду хората, които следвате.",
   "follow_suggestions.hints.most_followed": "Този профил е един от най-следваните при {domain}.",
@@ -315,6 +317,8 @@
   "follow_suggestions.hints.similar_to_recently_followed": "Този профил е подобен на профилите, които сте последвали наскоро.",
   "follow_suggestions.personalized_suggestion": "Персонализирано предложение",
   "follow_suggestions.popular_suggestion": "Популярно предложение",
+  "follow_suggestions.popular_suggestion_longer": "Популярно из {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Подобни на профилите, които наскоро сте последвали",
   "follow_suggestions.view_all": "Преглед на всички",
   "follow_suggestions.who_to_follow": "Кого да се следва",
   "followed_tags": "Последвани хаштагове",
@@ -469,6 +473,15 @@
   "notification.follow": "{name} ви последва",
   "notification.follow_request": "{name} поиска да ви последва",
   "notification.mention": "{name} ви спомена",
+  "notification.moderation-warning.learn_more": "Научете повече",
+  "notification.moderation_warning": "Получихте предупреждение за модериране",
+  "notification.moderation_warning.action_delete_statuses": "Някои от публикациите ви са премахнати.",
+  "notification.moderation_warning.action_disable": "Вашият акаунт е изключен.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Някои от публикациите ви са означени като деликатни.",
+  "notification.moderation_warning.action_none": "Акаунтът ви получи предупреждение за модериране.",
+  "notification.moderation_warning.action_sensitive": "Публикациите ви ще се означават като деликатни от сега нататък.",
+  "notification.moderation_warning.action_silence": "Вашият акаунт е ограничен.",
+  "notification.moderation_warning.action_suspend": "Вашият акаунт е спрян.",
   "notification.own_poll": "Анкетата ви приключи",
   "notification.poll": "Анкета, в която гласувахте, приключи",
   "notification.reblog": "{name} подсили ваша публикация",
diff --git a/app/javascript/mastodon/locales/br.json b/app/javascript/mastodon/locales/br.json
index f51121bcdc27be..9ec26c8c123877 100644
--- a/app/javascript/mastodon/locales/br.json
+++ b/app/javascript/mastodon/locales/br.json
@@ -263,6 +263,8 @@
   "follow_request.authorize": "Aotren",
   "follow_request.reject": "Nac'hañ",
   "follow_requests.unlocked_explanation": "Daoust ma n'eo ket ho kont prennet, skipailh {domain} a soñj e fellfe deoc'h gwiriekaat pedadennoù heuliañ deus ar c'hontoù-se diwar-zorn.",
+  "follow_suggestions.friends_of_friends_longer": "Diouzh ar c'hiz e-touez an dud heuliet ganeoc'h",
+  "follow_suggestions.popular_suggestion_longer": "Diouzh ar c'hiz war {domain}",
   "follow_suggestions.view_all": "Gwelet pep tra",
   "followed_tags": "Hashtagoù o heuliañ",
   "footer.about": "Diwar-benn",
@@ -395,6 +397,7 @@
   "notification.follow": "heuliañ a ra {name} ac'hanoc'h",
   "notification.follow_request": "Gant {name} eo bet goulennet ho heuliañ",
   "notification.mention": "Gant {name} oc'h bet meneget",
+  "notification.moderation-warning.learn_more": "Gouzout hiroc'h",
   "notification.own_poll": "Echu eo ho sontadeg",
   "notification.poll": "Ur sontadeg ho deus mouezhet warnañ a zo echuet",
   "notification.reblog": "Gant {name} eo bet skignet ho toud",
diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index 6dfe06a92e210c..25aeea9b465b4e 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -318,7 +318,7 @@
   "follow_suggestions.personalized_suggestion": "Suggeriment personalitzat",
   "follow_suggestions.popular_suggestion": "Suggeriment popular",
   "follow_suggestions.popular_suggestion_longer": "Popular a {domain}",
-  "follow_suggestions.similar_to_recently_followed_longer": "Semblant a perfils que has seguit fa poc",
+  "follow_suggestions.similar_to_recently_followed_longer": "Semblant a perfils que seguiu fa poc",
   "follow_suggestions.view_all": "Mostra-ho tot",
   "follow_suggestions.who_to_follow": "A qui seguir",
   "followed_tags": "Etiquetes seguides",
@@ -473,6 +473,14 @@
   "notification.follow": "{name} et segueix",
   "notification.follow_request": "{name} ha sol·licitat de seguir-te",
   "notification.mention": "{name} t'ha esmentat",
+  "notification.moderation_warning": "Heu rebut un avís de moderació",
+  "notification.moderation_warning.action_delete_statuses": "S'han eliminat algunes de les vostres publicacions.",
+  "notification.moderation_warning.action_disable": "S'ha desactivat el vostre compte.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "S'ha marcat com a sensibles algunes de les vostres publicacions.",
+  "notification.moderation_warning.action_none": "El vostre compte ha rebut un avís de moderació.",
+  "notification.moderation_warning.action_sensitive": "A partir d'ara les vostres publicacions es marcaran com sensibles.",
+  "notification.moderation_warning.action_silence": "S'ha limitat el vostre compte.",
+  "notification.moderation_warning.action_suspend": "S'ha suspès el vostre compte.",
   "notification.own_poll": "La teva enquesta ha finalitzat",
   "notification.poll": "Ha finalitzat una enquesta en què has votat",
   "notification.reblog": "{name} t'ha impulsat",
diff --git a/app/javascript/mastodon/locales/cs.json b/app/javascript/mastodon/locales/cs.json
index 2fc01f3acc2835..f2a1f023a3191b 100644
--- a/app/javascript/mastodon/locales/cs.json
+++ b/app/javascript/mastodon/locales/cs.json
@@ -308,6 +308,8 @@
   "follow_requests.unlocked_explanation": "Přestože váš účet není uzamčen, personál {domain} usoudil, že byste mohli chtít tyto požadavky na sledování zkontrolovat ručně.",
   "follow_suggestions.curated_suggestion": "Výběr personálů",
   "follow_suggestions.dismiss": "Znovu nezobrazovat",
+  "follow_suggestions.featured_longer": "Ručně vybráno týmem {domain}",
+  "follow_suggestions.friends_of_friends_longer": "Populární mezi lidmi, které sledujete",
   "follow_suggestions.hints.featured": "Tento profil byl ručně vybrán týmem {domain}.",
   "follow_suggestions.hints.friends_of_friends": "Tento profil je populární mezi lidmi, které sledujete.",
   "follow_suggestions.hints.most_followed": "Tento profil je jedním z nejvíce sledovaných na {domain}.",
@@ -315,6 +317,8 @@
   "follow_suggestions.hints.similar_to_recently_followed": "Tento profil je podobný profilům, které jste nedávno sledovali.",
   "follow_suggestions.personalized_suggestion": "Přizpůsobený návrh",
   "follow_suggestions.popular_suggestion": "Populární návrh",
+  "follow_suggestions.popular_suggestion_longer": "Populární na {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Podobné profilům, které jste nedávno sledovali",
   "follow_suggestions.view_all": "Zobrazit vše",
   "follow_suggestions.who_to_follow": "Koho sledovat",
   "followed_tags": "Sledované hashtagy",
@@ -469,6 +473,15 @@
   "notification.follow": "Uživatel {name} vás začal sledovat",
   "notification.follow_request": "Uživatel {name} požádal o povolení vás sledovat",
   "notification.mention": "Uživatel {name} vás zmínil",
+  "notification.moderation-warning.learn_more": "Zjistit více",
+  "notification.moderation_warning": "Obdrželi jste moderační varování",
+  "notification.moderation_warning.action_delete_statuses": "Některé z vašich příspěvků byly odstraněny.",
+  "notification.moderation_warning.action_disable": "Váš účet je zablokován.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Některé z vašich příspěvků byly označeny jako citlivé.",
+  "notification.moderation_warning.action_none": "Váš účet obdržel moderační varování.",
+  "notification.moderation_warning.action_sensitive": "Vaše příspěvky budou od nynějška označeny jako citlivé.",
+  "notification.moderation_warning.action_silence": "Váš účet byl omezen.",
+  "notification.moderation_warning.action_suspend": "Váš účet byl pozastaven.",
   "notification.own_poll": "Vaše anketa skončila",
   "notification.poll": "Anketa, ve které jste hlasovali, skončila",
   "notification.reblog": "Uživatel {name} boostnul váš příspěvek",
diff --git a/app/javascript/mastodon/locales/es-AR.json b/app/javascript/mastodon/locales/es-AR.json
index 2cf4198625042d..2d42b3e9498205 100644
--- a/app/javascript/mastodon/locales/es-AR.json
+++ b/app/javascript/mastodon/locales/es-AR.json
@@ -241,7 +241,7 @@
   "emoji_button.nature": "Naturaleza",
   "emoji_button.not_found": "No se encontraron emojis coincidentes",
   "emoji_button.objects": "Objetos",
-  "emoji_button.people": "Gente",
+  "emoji_button.people": "Cuentas",
   "emoji_button.recent": "Usados frecuentemente",
   "emoji_button.search": "Buscar...",
   "emoji_button.search_results": "Resultados de búsqueda",
@@ -308,6 +308,8 @@
   "follow_requests.unlocked_explanation": "A pesar de que tu cuenta no es privada, el equipo de {domain} pensó que podrías querer revisar manualmente las solicitudes de seguimiento de estas cuentas.",
   "follow_suggestions.curated_suggestion": "Selección del equipo",
   "follow_suggestions.dismiss": "No mostrar de nuevo",
+  "follow_suggestions.featured_longer": "Seleccionada a mano por el equipo de {domain}",
+  "follow_suggestions.friends_of_friends_longer": "Populares entre las cuentas que seguís",
   "follow_suggestions.hints.featured": "Este perfil fue seleccionado a mano por el equipo de {domain}.",
   "follow_suggestions.hints.friends_of_friends": "Este perfil es popular entre las cuentas que seguís.",
   "follow_suggestions.hints.most_followed": "Este perfil es uno de los más seguidos en {domain}.",
@@ -315,6 +317,8 @@
   "follow_suggestions.hints.similar_to_recently_followed": "Este perfil es similar a los que comenzaste a seguir.",
   "follow_suggestions.personalized_suggestion": "Sugerencia personalizada",
   "follow_suggestions.popular_suggestion": "Sugerencia popular",
+  "follow_suggestions.popular_suggestion_longer": "Popular en {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Similares a perfiles que comenzaste a seguir recientemente",
   "follow_suggestions.view_all": "Ver todo",
   "follow_suggestions.who_to_follow": "A quién seguir",
   "followed_tags": "Etiquetas seguidas",
@@ -469,6 +473,15 @@
   "notification.follow": "{name} te empezó a seguir",
   "notification.follow_request": "{name} solicitó seguirte",
   "notification.mention": "{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.",
+  "notification.moderation_warning.action_disable": "Se deshabilitó tu cuenta.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Se marcaron como sensibles a algunos de tus mensajes.",
+  "notification.moderation_warning.action_none": "Tu cuenta recibió una advertencia de moderación.",
+  "notification.moderation_warning.action_sensitive": "A partir de ahora, tus mensajes serán marcados como sensibles.",
+  "notification.moderation_warning.action_silence": "Tu cuenta fue limitada.",
+  "notification.moderation_warning.action_suspend": "Tu cuenta fue suspendida.",
   "notification.own_poll": "Tu encuesta finalizó",
   "notification.poll": "Finalizó una encuesta en la que votaste",
   "notification.reblog": "{name} adhirió a tu mensaje",
diff --git a/app/javascript/mastodon/locales/es-MX.json b/app/javascript/mastodon/locales/es-MX.json
index 1d8d4cedf83d32..b529f48ebe17dc 100644
--- a/app/javascript/mastodon/locales/es-MX.json
+++ b/app/javascript/mastodon/locales/es-MX.json
@@ -308,6 +308,8 @@
   "follow_requests.unlocked_explanation": "A pesar de que tu cuenta no es privada, el personal de {domain} ha pensado que quizás deberías revisar manualmente las solicitudes de seguimiento de estas cuentas.",
   "follow_suggestions.curated_suggestion": "Recomendaciones del equipo",
   "follow_suggestions.dismiss": "No mostrar de nuevo",
+  "follow_suggestions.featured_longer": "Escogidos por el equipo de {domain}",
+  "follow_suggestions.friends_of_friends_longer": "Populares entre las personas a las que sigues",
   "follow_suggestions.hints.featured": "Este perfil ha sido seleccionado a mano por el equipo de {domain}.",
   "follow_suggestions.hints.friends_of_friends": "Este perfil es popular entre las personas que sigues.",
   "follow_suggestions.hints.most_followed": "Este perfil es uno de los más seguidos en {domain}.",
@@ -315,6 +317,8 @@
   "follow_suggestions.hints.similar_to_recently_followed": "Este perfil es similar a los perfiles que has seguido recientemente.",
   "follow_suggestions.personalized_suggestion": "Sugerencia personalizada",
   "follow_suggestions.popular_suggestion": "Sugerencia popular",
+  "follow_suggestions.popular_suggestion_longer": "Populares en {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Similares a los perfiles que has seguido recientemente",
   "follow_suggestions.view_all": "Ver todo",
   "follow_suggestions.who_to_follow": "Recomendamos seguir",
   "followed_tags": "Hashtags seguidos",
@@ -469,6 +473,15 @@
   "notification.follow": "{name} te empezó a seguir",
   "notification.follow_request": "{name} ha solicitado seguirte",
   "notification.mention": "{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.",
+  "notification.moderation_warning.action_disable": "Se ha desactivado su cuenta.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Se han marcado como sensibles algunas de tus publicaciones.",
+  "notification.moderation_warning.action_none": "Tu cuenta ha recibido un aviso de moderación.",
+  "notification.moderation_warning.action_sensitive": "De ahora en adelante, todas tus publicaciones se marcarán como sensibles.",
+  "notification.moderation_warning.action_silence": "Se ha limitado tu cuenta.",
+  "notification.moderation_warning.action_suspend": "Se ha suspendido tu cuenta.",
   "notification.own_poll": "Tu encuesta ha terminado",
   "notification.poll": "Una encuesta en la que has votado ha terminado",
   "notification.reblog": "{name} ha retooteado tu estado",
diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json
index 149a37d74e4d08..ed01a333750151 100644
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@@ -308,6 +308,8 @@
   "follow_requests.unlocked_explanation": "A pesar de que tu cuenta no es privada, el personal de {domain} ha pensado que quizás deberías revisar manualmente las solicitudes de seguimiento de estas cuentas.",
   "follow_suggestions.curated_suggestion": "Recomendaciones del equipo",
   "follow_suggestions.dismiss": "No mostrar de nuevo",
+  "follow_suggestions.featured_longer": "Escogidos por el equipo de {domain}",
+  "follow_suggestions.friends_of_friends_longer": "Populares entre las personas a las que sigues",
   "follow_suggestions.hints.featured": "Este perfil ha sido elegido a mano por el equipo de {domain}.",
   "follow_suggestions.hints.friends_of_friends": "Este perfil es popular entre las personas que sigues.",
   "follow_suggestions.hints.most_followed": "Este perfil es uno de los más seguidos en {domain}.",
@@ -315,6 +317,8 @@
   "follow_suggestions.hints.similar_to_recently_followed": "Este perfil es similar a los perfiles que has seguido recientemente.",
   "follow_suggestions.personalized_suggestion": "Sugerencia personalizada",
   "follow_suggestions.popular_suggestion": "Sugerencia popular",
+  "follow_suggestions.popular_suggestion_longer": "Populares en {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Similares a los perfiles que has seguido recientemente",
   "follow_suggestions.view_all": "Ver todo",
   "follow_suggestions.who_to_follow": "A quién seguir",
   "followed_tags": "Etiquetas seguidas",
@@ -469,6 +473,15 @@
   "notification.follow": "{name} te empezó a seguir",
   "notification.follow_request": "{name} ha solicitado seguirte",
   "notification.mention": "{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.",
+  "notification.moderation_warning.action_disable": "Se ha desactivado su cuenta.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Se han marcado como sensibles algunas de tus publicaciones.",
+  "notification.moderation_warning.action_none": "Tu cuenta ha recibido un aviso de moderación.",
+  "notification.moderation_warning.action_sensitive": "De ahora en adelante, todas tus publicaciones se marcarán como sensibles.",
+  "notification.moderation_warning.action_silence": "Se ha limitado tu cuenta.",
+  "notification.moderation_warning.action_suspend": "Se ha suspendido tu cuenta.",
   "notification.own_poll": "Tu encuesta ha terminado",
   "notification.poll": "Una encuesta en la que has votado ha terminado",
   "notification.reblog": "{name} ha impulsado tu publicación",
diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json
index 0b66a27fa96bd8..600de395979b44 100644
--- a/app/javascript/mastodon/locales/he.json
+++ b/app/javascript/mastodon/locales/he.json
@@ -473,6 +473,15 @@
   "notification.follow": "{name} במעקב אחרייך",
   "notification.follow_request": "{name} ביקשו לעקוב אחריך",
   "notification.mention": "אוזכרת על ידי {name}",
+  "notification.moderation-warning.learn_more": "למידע נוסף",
+  "notification.moderation_warning": "קיבלת אזהרה מצוות ניהול התוכן",
+  "notification.moderation_warning.action_delete_statuses": "חלק מהודעותיך הוסרו.",
+  "notification.moderation_warning.action_disable": "חשבונך הושבת.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "חלק מהודעותיך סומנו כרגישות.",
+  "notification.moderation_warning.action_none": "חשבונך קיבל אזהרה מצוות ניהול התוכן.",
+  "notification.moderation_warning.action_sensitive": "הודעותיך יסומנו כרגישות מעתה ואילך.",
+  "notification.moderation_warning.action_silence": "חשבונך הוגבל.",
+  "notification.moderation_warning.action_suspend": "חשבונך הושעה.",
   "notification.own_poll": "הסקר שלך הסתיים",
   "notification.poll": "סקר שהצבעת בו הסתיים",
   "notification.reblog": "הודעתך הודהדה על ידי {name}",
diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json
index 42ce842585d094..ba7fd6ddc2d802 100644
--- a/app/javascript/mastodon/locales/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@@ -309,7 +309,7 @@
   "follow_suggestions.curated_suggestion": "A stáb választása",
   "follow_suggestions.dismiss": "Ne jelenjen meg újra",
   "follow_suggestions.featured_longer": "A {domain} csapata által kézzel kiválasztott",
-  "follow_suggestions.friends_of_friends_longer": "Népszerű az Ön által követett emberek körében",
+  "follow_suggestions.friends_of_friends_longer": "Népszerű az általad követett emberek körében",
   "follow_suggestions.hints.featured": "Ezt a profilt a(z) {domain} csapata választotta ki.",
   "follow_suggestions.hints.friends_of_friends": "Ez a profil népszerű az általad követett emberek körében.",
   "follow_suggestions.hints.most_followed": "Ez a profil a leginkább követett a(z) {domain} oldalon.",
@@ -318,7 +318,7 @@
   "follow_suggestions.personalized_suggestion": "Személyre szabott javaslat",
   "follow_suggestions.popular_suggestion": "Népszerű javaslat",
   "follow_suggestions.popular_suggestion_longer": "Népszerű itt: {domain}",
-  "follow_suggestions.similar_to_recently_followed_longer": "Hasonló profilok, melyeket nemrég követett",
+  "follow_suggestions.similar_to_recently_followed_longer": "Hasonló azokhoz a profilokhoz, melyeket nemrég követtél be",
   "follow_suggestions.view_all": "Összes megtekintése",
   "follow_suggestions.who_to_follow": "Kit érdemes követni",
   "followed_tags": "Követett hashtagek",
@@ -473,7 +473,7 @@
   "notification.follow": "{name} követ téged",
   "notification.follow_request": "{name} követni szeretne téged",
   "notification.mention": "{name} megemlített",
-  "notification.moderation-warning.learn_more": "További információk",
+  "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.",
   "notification.moderation_warning.action_disable": "A fiókod le van tiltva.",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index f20d93753b7f80..6824a76a31610e 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -308,6 +308,8 @@
   "follow_requests.unlocked_explanation": "あなたのアカウントは承認制ではありませんが、{domain}のスタッフはこれらのアカウントからのフォローリクエストの確認が必要であると判断しました。",
   "follow_suggestions.curated_suggestion": "サーバースタッフ公認",
   "follow_suggestions.dismiss": "今後表示しない",
+  "follow_suggestions.featured_longer": "{domain} スタッフ公認",
+  "follow_suggestions.friends_of_friends_longer": "フォロー中のユーザーに人気",
   "follow_suggestions.hints.featured": "{domain} の運営スタッフが選んだアカウントです。",
   "follow_suggestions.hints.friends_of_friends": "フォロー中のユーザーのあいだで人気のアカウントです。",
   "follow_suggestions.hints.most_followed": "{domain} でもっともフォローされているアカウントのひとつです。",
@@ -315,6 +317,8 @@
   "follow_suggestions.hints.similar_to_recently_followed": "最近フォローしたユーザーに似ているアカウントです。",
   "follow_suggestions.personalized_suggestion": "フォローに基づく提案",
   "follow_suggestions.popular_suggestion": "人気のアカウント",
+  "follow_suggestions.popular_suggestion_longer": "{domain} で人気",
+  "follow_suggestions.similar_to_recently_followed_longer": "最近フォローしたユーザーと似ているアカウント",
   "follow_suggestions.view_all": "すべて表示",
   "follow_suggestions.who_to_follow": "フォローを増やしてみませんか？",
   "followed_tags": "フォロー中のハッシュタグ",
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index 8628dbb336e763..52ce9455a94533 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -308,6 +308,8 @@
   "follow_requests.unlocked_explanation": "귀하의 계정이 잠긴 계정이 아닐지라도, {domain} 스태프는 이 계정들의 팔로우 요청을 수동으로 처리해 주시면 좋겠다고 생각했습니다.",
   "follow_suggestions.curated_suggestion": "스태프의 추천",
   "follow_suggestions.dismiss": "다시 보지 않기",
+  "follow_suggestions.featured_longer": "{domain} 팀이 손수 고름",
+  "follow_suggestions.friends_of_friends_longer": "내가 팔로우 하는 사람들 사이에서 인기",
   "follow_suggestions.hints.featured": "이 프로필은 {domain} 팀이 손수 선택했습니다.",
   "follow_suggestions.hints.friends_of_friends": "이 프로필은 내가 팔로우 하는 사람들에게서 유명합니다.",
   "follow_suggestions.hints.most_followed": "이 프로필은 {domain}에서 가장 많이 팔로우 된 사람들 중 하나입니다.",
@@ -315,6 +317,8 @@
   "follow_suggestions.hints.similar_to_recently_followed": "이 프로필은 내가 최근에 팔로우 한 프로필들과 유사합니다.",
   "follow_suggestions.personalized_suggestion": "개인화된 추천",
   "follow_suggestions.popular_suggestion": "인기있는 추천",
+  "follow_suggestions.popular_suggestion_longer": "{domain}에서 인기",
+  "follow_suggestions.similar_to_recently_followed_longer": "내가 최근에 팔로우 한 프로필들과 유사",
   "follow_suggestions.view_all": "모두 보기",
   "follow_suggestions.who_to_follow": "팔로우할 만한 사람",
   "followed_tags": "팔로우 중인 해시태그",
@@ -469,6 +473,15 @@
   "notification.follow": "{name} 님이 나를 팔로우했습니다",
   "notification.follow_request": "{name} 님이 팔로우 요청을 보냈습니다",
   "notification.mention": "{name} 님의 멘션",
+  "notification.moderation-warning.learn_more": "더 알아보기",
+  "notification.moderation_warning": "중재 경고를 받았습니다",
+  "notification.moderation_warning.action_delete_statuses": "게시물 몇 개가 삭제되었습니다.",
+  "notification.moderation_warning.action_disable": "계정이 비활성화되었습니다.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "게시물 몇 개가 민감함 처리되었습니다.",
+  "notification.moderation_warning.action_none": "계정에 중재 경고를 받았습니다.",
+  "notification.moderation_warning.action_sensitive": "앞으로의 게시물을 민감한 것으로 표시됩니다.",
+  "notification.moderation_warning.action_silence": "계정이 제한되었습니다.",
+  "notification.moderation_warning.action_suspend": "계정이 정지되었습니다.",
   "notification.own_poll": "설문을 마침",
   "notification.poll": "참여한 설문이 종료됨",
   "notification.reblog": "{name} 님이 부스트했습니다",
diff --git a/app/javascript/mastodon/locales/lad.json b/app/javascript/mastodon/locales/lad.json
index cf6c3f772f7200..533f074004caf6 100644
--- a/app/javascript/mastodon/locales/lad.json
+++ b/app/javascript/mastodon/locales/lad.json
@@ -295,6 +295,7 @@
   "follow_requests.unlocked_explanation": "Aunke tu kuento no esta serrado, la taifa de {domain} kreye ke talvez keres revizar manualmente las solisitudes de segimento de estos kuentos.",
   "follow_suggestions.curated_suggestion": "Seleksyon de la taifa",
   "follow_suggestions.dismiss": "No amostra mas",
+  "follow_suggestions.friends_of_friends_longer": "Popular entre personas a las kualas siges",
   "follow_suggestions.hints.featured": "Este profil tiene sido eskojido por la taifa de {domain}.",
   "follow_suggestions.hints.friends_of_friends": "Este profil es popular entre las personas ke siges.",
   "follow_suggestions.hints.most_followed": "Este profil es uno de los mas segidos en {domain}.",
@@ -454,6 +455,9 @@
   "notification.follow": "{name} te ampeso a segir",
   "notification.follow_request": "{name} tiene solisitado segirte",
   "notification.mention": "{name} te enmento",
+  "notification.moderation-warning.learn_more": "Ambezate mas",
+  "notification.moderation_warning.action_silence": "Tu kuento tiene sido limitado.",
+  "notification.moderation_warning.action_suspend": "Tu kuento tiene sido suspendido.",
   "notification.own_poll": "Tu anketa eskapo",
   "notification.poll": "Anketa en ke votates eskapo",
   "notification.reblog": "{name} repartajo tu publikasyon",
diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json
index d143fda52beae3..ea46b8223549ed 100644
--- a/app/javascript/mastodon/locales/sk.json
+++ b/app/javascript/mastodon/locales/sk.json
@@ -293,6 +293,7 @@
   "follow_suggestions.hints.similar_to_recently_followed": "Tento profil je podobný profilom, ktoré ste nedávno začali sledovať.",
   "follow_suggestions.personalized_suggestion": "Prispôsobený návrh",
   "follow_suggestions.popular_suggestion": "Obľúbený návrh",
+  "follow_suggestions.popular_suggestion_longer": "Populárne na {domain}",
   "follow_suggestions.view_all": "Zobraziť všetky",
   "follow_suggestions.who_to_follow": "Koho sledovať",
   "followed_tags": "Sledované hashtagy",
@@ -442,6 +443,7 @@
   "notification.follow": "{name} vás sleduje",
   "notification.follow_request": "{name} vás žiada sledovať",
   "notification.mention": "{name} vás spomína",
+  "notification.moderation-warning.learn_more": "Zisti viac",
   "notification.own_poll": "Vaša anketa sa skončila",
   "notification.poll": "Anketa, v ktorej ste hlasovali, sa skončila",
   "notification.reblog": "{name} zdieľa váš príspevok",
diff --git a/app/javascript/mastodon/locales/sv.json b/app/javascript/mastodon/locales/sv.json
index c2dd5297db1315..5ac4b4648ff410 100644
--- a/app/javascript/mastodon/locales/sv.json
+++ b/app/javascript/mastodon/locales/sv.json
@@ -297,6 +297,7 @@
   "filter_modal.select_filter.subtitle": "Använd en befintlig kategori eller skapa en ny",
   "filter_modal.select_filter.title": "Filtrera detta inlägg",
   "filter_modal.title.status": "Filtrera ett inlägg",
+  "filtered_notifications_banner.mentions": "{count, plural, one {omnämning} other {omnämnanden}}",
   "filtered_notifications_banner.pending_requests": "Aviseringar från {count, plural, =0 {ingen} one {en person} other {# personer}} du kanske känner",
   "filtered_notifications_banner.title": "Filtrerade aviseringar",
   "firehose.all": "Allt",
@@ -307,6 +308,8 @@
   "follow_requests.unlocked_explanation": "Även om ditt konto inte är låst tror {domain}-personalen att du kanske vill granska dessa följares förfrågningar manuellt.",
   "follow_suggestions.curated_suggestion": "Utvald av personalen",
   "follow_suggestions.dismiss": "Visa inte igen",
+  "follow_suggestions.featured_longer": "Handplockad av {domain}-teamet",
+  "follow_suggestions.friends_of_friends_longer": "Populärt bland personer du följer",
   "follow_suggestions.hints.featured": "Denna profil är handplockad av {domain}-teamet.",
   "follow_suggestions.hints.friends_of_friends": "Denna profil är populär bland de personer du följer.",
   "follow_suggestions.hints.most_followed": "Denna profil är en av de mest följda på {domain}.",
@@ -314,6 +317,8 @@
   "follow_suggestions.hints.similar_to_recently_followed": "Denna profil liknar de profiler som du nyligen har följt.",
   "follow_suggestions.personalized_suggestion": "Personligt förslag",
   "follow_suggestions.popular_suggestion": "Populärt förslag",
+  "follow_suggestions.popular_suggestion_longer": "Populärt på {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Liknar profiler du nyligen följde",
   "follow_suggestions.view_all": "Visa alla",
   "follow_suggestions.who_to_follow": "Rekommenderade profiler",
   "followed_tags": "Följda hashtags",
@@ -469,10 +474,14 @@
   "notification.follow_request": "{name} har begärt att följa dig",
   "notification.mention": "{name} nämnde dig",
   "notification.moderation-warning.learn_more": "Läs mer",
+  "notification.moderation_warning": "Du har mottagit en modereringsvarning",
   "notification.moderation_warning.action_delete_statuses": "Några av dina inlägg har tagits bort.",
   "notification.moderation_warning.action_disable": "Ditt konto har inaktiverats.",
   "notification.moderation_warning.action_mark_statuses_as_sensitive": "Några av dina inlägg har markerats som känsliga.",
+  "notification.moderation_warning.action_none": "Ditt konto har mottagit en modereringsvarning.",
+  "notification.moderation_warning.action_sensitive": "Dina inlägg kommer markeras som känsliga från och med nu.",
   "notification.moderation_warning.action_silence": "Ditt konto har begränsats.",
+  "notification.moderation_warning.action_suspend": "Ditt konto har stängts av.",
   "notification.own_poll": "Din röstning har avslutats",
   "notification.poll": "En omröstning du röstat i har avslutats",
   "notification.reblog": "{name} boostade ditt inlägg",
diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json
index 379aebbb1fd97f..7c6b2ade4e3629 100644
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@@ -308,13 +308,17 @@
   "follow_requests.unlocked_explanation": "แม้ว่าไม่มีการล็อคบัญชีของคุณ พนักงานของ {domain} คิดว่าคุณอาจต้องการตรวจทานคำขอติดตามจากบัญชีเหล่านี้ด้วยตนเอง",
   "follow_suggestions.curated_suggestion": "คัดสรรโดยพนักงาน",
   "follow_suggestions.dismiss": "ไม่ต้องแสดงอีก",
+  "follow_suggestions.featured_longer": "คัดสรรโดยทีม {domain}",
+  "follow_suggestions.friends_of_friends_longer": "เป็นที่นิยมในหมู่ผู้คนที่คุณติดตาม",
   "follow_suggestions.hints.featured": "โปรไฟล์นี้ได้รับการคัดสรรโดยทีม {domain}",
-  "follow_suggestions.hints.friends_of_friends": "โปรไฟล์นี้ได้รับความนิยมในหมู่ผู้คนที่คุณติดตาม",
+  "follow_suggestions.hints.friends_of_friends": "โปรไฟล์นี้เป็นที่นิยมในหมู่ผู้คนที่คุณติดตาม",
   "follow_suggestions.hints.most_followed": "โปรไฟล์นี้เป็นหนึ่งในโปรไฟล์ที่ได้รับการติดตามมากที่สุดใน {domain}",
   "follow_suggestions.hints.most_interactions": "โปรไฟล์นี้เพิ่งได้รับความสนใจอย่างมากใน {domain}",
   "follow_suggestions.hints.similar_to_recently_followed": "โปรไฟล์นี้คล้ายกับโปรไฟล์ที่คุณได้ติดตามล่าสุด",
   "follow_suggestions.personalized_suggestion": "ข้อเสนอแนะเฉพาะบุคคล",
   "follow_suggestions.popular_suggestion": "ข้อเสนอแนะยอดนิยม",
+  "follow_suggestions.popular_suggestion_longer": "เป็นที่นิยมใน {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "คล้ายกับโปรไฟล์ที่คุณได้ติดตามล่าสุด",
   "follow_suggestions.view_all": "ดูทั้งหมด",
   "follow_suggestions.who_to_follow": "ติดตามใครดี",
   "followed_tags": "แฮชแท็กที่ติดตาม",
@@ -469,6 +473,15 @@
   "notification.follow": "{name} ได้ติดตามคุณ",
   "notification.follow_request": "{name} ได้ขอติดตามคุณ",
   "notification.mention": "{name} ได้กล่าวถึงคุณ",
+  "notification.moderation-warning.learn_more": "เรียนรู้เพิ่มเติม",
+  "notification.moderation_warning": "คุณได้รับคำเตือนการกลั่นกรอง",
+  "notification.moderation_warning.action_delete_statuses": "เอาโพสต์บางส่วนของคุณออกแล้ว",
+  "notification.moderation_warning.action_disable": "ปิดใช้งานบัญชีของคุณแล้ว",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "ทำเครื่องหมายโพสต์บางส่วนของคุณว่าละเอียดอ่อนแล้ว",
+  "notification.moderation_warning.action_none": "บัญชีของคุณได้รับคำเตือนการกลั่นกรอง",
+  "notification.moderation_warning.action_sensitive": "จะทำเครื่องหมายโพสต์ของคุณว่าละเอียดอ่อนนับจากนี้ไป",
+  "notification.moderation_warning.action_silence": "จำกัดบัญชีของคุณแล้ว",
+  "notification.moderation_warning.action_suspend": "ระงับบัญชีของคุณแล้ว",
   "notification.own_poll": "การสำรวจความคิดเห็นของคุณได้สิ้นสุดแล้ว",
   "notification.poll": "การสำรวจความคิดเห็นที่คุณได้ลงคะแนนได้สิ้นสุดแล้ว",
   "notification.reblog": "{name} ได้ดันโพสต์ของคุณ",
diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json
index dc07480ef6f6b4..c46080cfb226a1 100644
--- a/app/javascript/mastodon/locales/tr.json
+++ b/app/javascript/mastodon/locales/tr.json
@@ -308,6 +308,8 @@
   "follow_requests.unlocked_explanation": "Hesabınız kilitli olmasa da, {domain} personeli bu hesaplardan gelen takip isteklerini gözden geçirmek isteyebileceğinizi düşündü.",
   "follow_suggestions.curated_suggestion": "Çalışanların seçtikleri",
   "follow_suggestions.dismiss": "Tekrar gösterme",
+  "follow_suggestions.featured_longer": "{domain} takımı tarafından elle seçildi",
+  "follow_suggestions.friends_of_friends_longer": "Takip ettiğiniz kişiler arasında popüler",
   "follow_suggestions.hints.featured": "Bu profil {domain} ekibi tarafından elle seçilmiştir.",
   "follow_suggestions.hints.friends_of_friends": "Bu profil takip ettiğiniz insanlar arasında popülerdir.",
   "follow_suggestions.hints.most_followed": "Bu, {domain} sunucusunda en fazla izlenen profildir.",
@@ -315,6 +317,8 @@
   "follow_suggestions.hints.similar_to_recently_followed": "Bu profil, son zamanlarda takip ettiğiniz profillere benziyor.",
   "follow_suggestions.personalized_suggestion": "Kişiselleşmiş öneriler",
   "follow_suggestions.popular_suggestion": "Popüler öneriler",
+  "follow_suggestions.popular_suggestion_longer": "{domain} üzerinde popüler",
+  "follow_suggestions.similar_to_recently_followed_longer": "Yakın zamanda takip ettiğiniz hesaplara benziyor",
   "follow_suggestions.view_all": "Tümünü gör",
   "follow_suggestions.who_to_follow": "Takip edebileceklerin",
   "followed_tags": "Takip edilen etiketler",
@@ -469,6 +473,15 @@
   "notification.follow": "{name} seni takip etti",
   "notification.follow_request": "{name} size takip isteği gönderdi",
   "notification.mention": "{name} senden bahsetti",
+  "notification.moderation-warning.learn_more": "Daha fazlası",
+  "notification.moderation_warning": "Bir denetim uyarısı aldınız",
+  "notification.moderation_warning.action_delete_statuses": "Bazı gönderileriniz kaldırıldı.",
+  "notification.moderation_warning.action_disable": "Hesabınız devre dışı bırakıldı.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Bazı gönderileriniz hassas olarak işaretlendi.",
+  "notification.moderation_warning.action_none": "Hesabınız bir denetim uyarısı aldı.",
+  "notification.moderation_warning.action_sensitive": "Gönderileriniz artık hassas olarak işaretlenecek.",
+  "notification.moderation_warning.action_silence": "Hesabınız sınırlandırıldı.",
+  "notification.moderation_warning.action_suspend": "Hesabınız askıya alındı.",
   "notification.own_poll": "Anketiniz sona erdi",
   "notification.poll": "Oy verdiğiniz bir anket sona erdi",
   "notification.reblog": "{name} gönderini yeniden paylaştı",
diff --git a/app/javascript/mastodon/locales/vi.json b/app/javascript/mastodon/locales/vi.json
index e1f886b1f50fde..b188488f0b135b 100644
--- a/app/javascript/mastodon/locales/vi.json
+++ b/app/javascript/mastodon/locales/vi.json
@@ -308,6 +308,8 @@
   "follow_requests.unlocked_explanation": "Mặc dù tài khoản của bạn đang ở chế độ công khai, quản trị viên của {domain} vẫn tin rằng bạn sẽ muốn xem lại yêu cầu theo dõi từ những người khác.",
   "follow_suggestions.curated_suggestion": "Gợi ý từ máy chủ",
   "follow_suggestions.dismiss": "Không hiện lại",
+  "follow_suggestions.featured_longer": "Tuyển chọn bởi {domain}",
+  "follow_suggestions.friends_of_friends_longer": "Nổi tiếng với những người mà bạn theo dõi",
   "follow_suggestions.hints.featured": "Người này được đội ngũ {domain} đề xuất.",
   "follow_suggestions.hints.friends_of_friends": "Người này nổi tiếng với những người bạn theo dõi.",
   "follow_suggestions.hints.most_followed": "Người này được theo dõi nhiều nhất trên {domain}.",
@@ -315,6 +317,8 @@
   "follow_suggestions.hints.similar_to_recently_followed": "Người này có nét giống những người mà bạn theo dõi gần đây.",
   "follow_suggestions.personalized_suggestion": "Gợi ý cá nhân hóa",
   "follow_suggestions.popular_suggestion": "Những người nổi tiếng",
+  "follow_suggestions.popular_suggestion_longer": "Nổi tiếng trên {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Tương tự những người mà bạn theo dõi gần đây",
   "follow_suggestions.view_all": "Xem tất cả",
   "follow_suggestions.who_to_follow": "Gợi ý theo dõi",
   "followed_tags": "Hashtag theo dõi",
@@ -469,6 +473,15 @@
   "notification.follow": "{name} theo dõi bạn",
   "notification.follow_request": "{name} yêu cầu theo dõi bạn",
   "notification.mention": "{name} nhắc đến bạn",
+  "notification.moderation-warning.learn_more": "Tìm hiểu",
+  "notification.moderation_warning": "Bạn đã 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ỡ.",
+  "notification.moderation_warning.action_disable": "Tài khoản của bạn đã bị vô hiệu hóa.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Vài tút bạn bị đánh dấu nhạy cảm.",
+  "notification.moderation_warning.action_none": "Bạn đã nhận một cảnh báo kiểm duyệt.",
+  "notification.moderation_warning.action_sensitive": "Tút của bạn sẽ bị đánh dấu nhạy cảm kể từ bây giờ.",
+  "notification.moderation_warning.action_silence": "Tài khoản của bạn đã bị hạn chế.",
+  "notification.moderation_warning.action_suspend": "Tài khoản của bạn đã bị vô hiệu hóa.",
   "notification.own_poll": "Cuộc bình chọn của bạn đã kết thúc",
   "notification.poll": "Cuộc bình chọn đã kết thúc",
   "notification.reblog": "{name} đăng lại tút của bạn",
diff --git a/app/javascript/mastodon/locales/zh-HK.json b/app/javascript/mastodon/locales/zh-HK.json
index 3ca9a8d11e6130..6b08e40284b177 100644
--- a/app/javascript/mastodon/locales/zh-HK.json
+++ b/app/javascript/mastodon/locales/zh-HK.json
@@ -308,6 +308,8 @@
   "follow_requests.unlocked_explanation": "即使您的帳號未上鎖，{domain} 的工作人員認為您可能會想手動審核來自這些帳號的追蹤請求。",
   "follow_suggestions.curated_suggestion": "編輯精選",
   "follow_suggestions.dismiss": "不再顯示",
+  "follow_suggestions.featured_longer": "{domain} 團隊精選",
+  "follow_suggestions.friends_of_friends_longer": "受你的追蹤對象歡迎",
   "follow_suggestions.hints.featured": "這個人檔案是由 {domain} 團隊精挑細選。",
   "follow_suggestions.hints.friends_of_friends": "這個人檔案在你追蹤的人當中很受歡迎。",
   "follow_suggestions.hints.most_followed": "這個人檔案是在 {domain} 上最多追蹤之一。",
@@ -315,6 +317,8 @@
   "follow_suggestions.hints.similar_to_recently_followed": "這個人檔案與你最近追蹤的類似。",
   "follow_suggestions.personalized_suggestion": "個人化推薦",
   "follow_suggestions.popular_suggestion": "熱門推薦",
+  "follow_suggestions.popular_suggestion_longer": "{domain} 熱門",
+  "follow_suggestions.similar_to_recently_followed_longer": "與你最近追蹤的帳號相似",
   "follow_suggestions.view_all": "查看所有",
   "follow_suggestions.who_to_follow": "追蹤對象",
   "followed_tags": "已追蹤標籤",
@@ -469,6 +473,15 @@
   "notification.follow": "{name} 開始追蹤你",
   "notification.follow_request": "{name} 要求追蹤你",
   "notification.mention": "{name} 提及你",
+  "notification.moderation-warning.learn_more": "了解更多",
+  "notification.moderation_warning": "你收到一則審核警告",
+  "notification.moderation_warning.action_delete_statuses": "你的部份帖文已被刪除。",
+  "notification.moderation_warning.action_disable": "你的帳號已被停用。",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "你某些帖文已被標記為敏感內容。",
+  "notification.moderation_warning.action_none": "你的帳號收到一則審核警告。",
+  "notification.moderation_warning.action_sensitive": "從現在起，你的帖文將被標記為敏感內容。",
+  "notification.moderation_warning.action_silence": "你的帳號已受到限制。",
+  "notification.moderation_warning.action_suspend": "你的帳號已被停權。",
   "notification.own_poll": "你的投票已結束",
   "notification.poll": "你參與過的一個投票已經結束",
   "notification.reblog": "{name} 轉推你的文章",
diff --git a/config/locales/be.yml b/config/locales/be.yml
index cdfc9cb39c0f80..13daa9897e7534 100644
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -621,6 +621,9 @@ be:
       actions_description_html: Вырашыце, якія дзеянні распачаць, каб вырашыць гэтую скаргу. Калі вы прымеце меры пакарання ў дачыненні да ўліковага запісу, пра які паведамляецца, ім будзе адпраўлена апавяшчэнне па электроннай пошце, за выключэннем выпадкаў, калі выбрана катэгорыя <strong>Спам</strong>.
       actions_description_remote_html: Вырашыце як паступіць з гэтай скаргай. Гэта паўплывае толькі на тое як <strong>ваш</strong> сервер звязваецца з аддалёным уліковым запісам і апрацоўвае яго кантэнт.
       add_to_report: Дадаць яшчэ дэталяў да скаргі
+      already_suspended_badges:
+        local: Ужо прыпынена на гэтым сэрвэры
+        remote: Ужо прыпынена на іх сэрвэры
       are_you_sure: Вы ўпэўнены?
       assign_to_self: Прызначыць мне
       assigned: Прызначаны мадэратар
@@ -1708,6 +1711,7 @@ be:
     preferences: Налады
     profile: Профіль
     relationships: Падпіскі і падпісчыкі
+    severed_relationships: Разрыў сувязяў
     statuses_cleanup: Аўтавыдаленне допісаў
     strikes: Папярэджанні мадэратараў
     two_factor_authentication: Двухфактарная аўтэнтыфікацыя
@@ -1715,10 +1719,13 @@ be:
   severed_relationships:
     download: Спампаваць (%{count})
     event_type:
+      account_suspension: Прыпыненне ўліковага запісу (%{target_name})
+      domain_block: Прыпыненне сервера (%{target_name})
       user_domain_block: Вы заблакіравалі %{target_name}
     lost_followers: Страчаныя падпісчыкі
     lost_follows: Страчаныя падпіскі
     preamble: Вы можаце страціць падпіскі і падпісчыкаў, калі заблакіруеце дамен або калі вашы мадэратары вырашаць прыпыніць зносіны з серверам. Калі гэта адбудзецца, вы зможаце загрузіць спіс страчаных зносін, каб праверыць іх і, магчыма, імпартаваць на іншы сервер.
+    purged: Інфармацыя аб гэтым серверы была выдалена адміністратарамі вашага сервера.
     type: Падзея
   statuses:
     attached:
@@ -1825,6 +1832,7 @@ be:
     contrast: Mastodon (высокі кантраст)
     default: Mastodon (цёмная)
     mastodon-light: Mastodon (светлая)
+    system: Аўтаматычна (выкарыстоўваць сістэмную тэму)
   time:
     formats:
       default: "%d.%m.%Y %H:%M"
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 0c4ce3be491990..f242039ed8dbf8 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -751,6 +751,7 @@ bg:
         desc_html: Това разчита на външни скриптове от hCaptcha, което може да е проблем за сигурността и поверителността. В допълнение <strong>това може да направи процеса на регистриране значимо по-малко достъпно за някои хора (особено с увреждания).</strong>. Заради тези причини, то обмислете алтернативни мерки такива като регистрация на базата на одобрение или на покана.
         title: Изисква се новите потребители да разгадават капчата, за да потвърдят акаунтите си
       content_retention:
+        danger_zone: Опасна зона
         preamble: Управление на това как съдържание, породено от потребители, се съхранява в Mastodon.
         title: Задържане на съдържание
       default_noindex:
diff --git a/config/locales/br.yml b/config/locales/br.yml
index fa6d266f627890..03537a5b806912 100644
--- a/config/locales/br.yml
+++ b/config/locales/br.yml
@@ -245,6 +245,8 @@ br:
         title: Diwar-benn
       appearance:
         title: Neuz
+      content_retention:
+        danger_zone: Takad dañjer
       discovery:
         title: Dizoloadur
         trends: Luskadoù
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 032dc1e35a1ec6..08fef736420556 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -751,6 +751,7 @@ ca:
         desc_html: Això es basa en scripts externs de hCaptcha, que poden ser un problema de privacitat i seguretat. A més, <strong>això pot fer que el procés de registre sigui significativament menys accesible per algunes (especialment discapacitades) persones</strong>. Per aquestes raons, si us plau considera alternatives com ara registre amb aprovació necessària o basada en invitacions.
         title: Demana als nous usuaris que resolguin un CAPTCHA per a confirmar el seu compte
       content_retention:
+        danger_zone: Zona de perill
         preamble: Controla com es desa a Mastodon el contingut generat per l'usuari.
         title: Retenció de contingut
       default_noindex:
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index bccbb75c4deb92..56930773193a40 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -779,6 +779,7 @@ cs:
         desc_html: Toto spoléhá na externí skripty z hCaptcha, což může být budit obavy o bezpečnost a soukromí. Navíc <strong>to může způsobit, že proces registrace bude pro některé osoby (zejména se zdravotním postižením) hůře přístupný</strong>. Z těchto důvodů zvažte alternativní přístup, jako je schvalování registrace nebo pozvánky.
         title: Vyžadovat po nových uživatelích, aby vyřešili CAPTCHU pro potvrzení jejich účtu
       content_retention:
+        danger_zone: Nebezpečná zóna
         preamble: Určuje, jak je obsah generovaný uživatelem uložen v Mastodonu.
         title: Uchovávání obsahu
       default_noindex:
diff --git a/config/locales/da.yml b/config/locales/da.yml
index acab53d1523d0a..252d0e2b580158 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -751,6 +751,7 @@ da:
         desc_html: Dette er afhængig af eksterne scripts fra hCaptcha, som kan være en sikkerhed og privatlivets fred. Derudover kan <strong>dette gøre registreringsprocessen betydeligt mindre tilgængelig for nogle (især deaktiveret) personer</strong>. Af disse grunde bedes De overveje alternative foranstaltninger såsom godkendelsesbaseret eller inviteret til at blive registreret.
         title: Kræv nye brugere for at løse en CAPTCHA for at bekræfte deres konto
       content_retention:
+        danger_zone: Farezone
         preamble: Styr, hvordan Mastodon gemmer brugergenereret indhold.
         title: Indholdsopbevaring
       default_noindex:
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 923682ea12ae89..b19315e3942d95 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -751,6 +751,7 @@ de:
         desc_html: Dies beruht auf externen Skripten von hCaptcha, die ein Sicherheits- und Datenschutzproblem darstellen könnten. Darüber hinaus <strong>kann das den Registrierungsprozess für manche Menschen (insbesondere für Menschen mit Behinderung) erheblich erschweren</strong>. Aus diesen Gründen solltest du alternative Maßnahmen in Betracht ziehen, z. B. eine Registrierung basierend auf einer Einladung oder auf Genehmigungen.
         title: Neue Nutzer*innen müssen ein CAPTCHA lösen, um das Konto zu bestätigen
       content_retention:
+        danger_zone: Gefahrenzone
         preamble: Lege fest, wie lange Inhalte von Nutzer*innen auf deinem Mastodon-Server gespeichert bleiben.
         title: Cache & Archive
       default_noindex:
diff --git a/config/locales/doorkeeper.be.yml b/config/locales/doorkeeper.be.yml
index 748cbeafa122e5..5f0536c8da0730 100644
--- a/config/locales/doorkeeper.be.yml
+++ b/config/locales/doorkeeper.be.yml
@@ -174,6 +174,7 @@ be:
       read:filters: бачыць свае фільтры
       read:follows: бачыць свае падпіскі
       read:lists: бачыць свае спісы
+      read:me: чытайце толькі базавую інфармацыю аб сваім уліковым запісе
       read:mutes: бачыць свае ігнараванні
       read:notifications: бачыць свае абвесткі
       read:reports: бачыць свае скаргі
diff --git a/config/locales/doorkeeper.cs.yml b/config/locales/doorkeeper.cs.yml
index be2a4d971a5039..9719a9a246ae3e 100644
--- a/config/locales/doorkeeper.cs.yml
+++ b/config/locales/doorkeeper.cs.yml
@@ -174,6 +174,7 @@ cs:
       read:filters: vidět vaše filtry
       read:follows: vidět vaše sledování
       read:lists: vidět vaše seznamy
+      read:me: číst pouze základní informace vašeho účtu
       read:mutes: vidět vaše skrytí
       read:notifications: vidět vaše oznámení
       read:reports: vidět vaše hlášení
diff --git a/config/locales/doorkeeper.ja.yml b/config/locales/doorkeeper.ja.yml
index 62f2a3eb0ae415..af61dbdcb788d3 100644
--- a/config/locales/doorkeeper.ja.yml
+++ b/config/locales/doorkeeper.ja.yml
@@ -174,6 +174,7 @@ ja:
       read:filters: フィルターの読み取り
       read:follows: フォローの読み取り
       read:lists: リストの読み取り
+      read:me: 自分のアカウントの基本的な情報の読み取りのみ
       read:mutes: ミュートの読み取り
       read:notifications: 通知の読み取り
       read:reports: 通報の読み取り
diff --git a/config/locales/doorkeeper.th.yml b/config/locales/doorkeeper.th.yml
index 067e0655884691..8a28566a0d5bca 100644
--- a/config/locales/doorkeeper.th.yml
+++ b/config/locales/doorkeeper.th.yml
@@ -174,6 +174,7 @@ th:
       read:filters: ดูตัวกรองของคุณ
       read:follows: ดูการติดตามของคุณ
       read:lists: ดูรายการของคุณ
+      read:me: อ่านเฉพาะข้อมูลพื้นฐานของบัญชีของคุณเท่านั้น
       read:mutes: ดูการซ่อนของคุณ
       read:notifications: ดูการแจ้งเตือนของคุณ
       read:reports: ดูรายงานของคุณ
diff --git a/config/locales/es-AR.yml b/config/locales/es-AR.yml
index 7bfe3b90ba21ed..aa3668d92adbeb 100644
--- a/config/locales/es-AR.yml
+++ b/config/locales/es-AR.yml
@@ -751,6 +751,7 @@ es-AR:
         desc_html: Esto depende de scripts externos de hCaptcha, que pueden ser una preocupación de seguridad y privacidad. Además, <strong>esto puede hacer el proceso de registro significativamente menos accesible para algunas personas (especialmente para gente con discapacidades)</strong>. Por estas razones, por favor, considerá medidas alternativas, como el registro basado en la aprobación o la invitación.
         title: Solicitar a los nuevos usuarios que resuelvan una CAPTCHA para confirmar su cuenta
       content_retention:
+        danger_zone: Zona de peligro
         preamble: Controlá cómo el contenido generado por el usuario se almacena en Mastodon.
         title: Retención de contenido
       default_noindex:
diff --git a/config/locales/es-MX.yml b/config/locales/es-MX.yml
index 4d17de4d0a5e58..6a306b07b061f5 100644
--- a/config/locales/es-MX.yml
+++ b/config/locales/es-MX.yml
@@ -751,6 +751,7 @@ es-MX:
         desc_html: Esto se basa en scripts externos de hCaptcha, que pueden suponer una preocupación de seguridad y privacidad. Además, <strong>esto puede volver el proceso de registro significativamente menos accesible para algunas personas (especialmente con discapacidades)</strong>. Por estas razones, por favor, considera medidas alternativas como el registro por aprobación manual o con invitación.
         title: Solicita a los nuevos usuarios que resuelvan un CAPTCHA para confirmar su cuenta
       content_retention:
+        danger_zone: Zona peligrosa
         preamble: Controlar cómo el contenido generado por el usuario se almacena en Mastodon.
         title: Retención de contenido
       default_noindex:
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 086e8e2ef61a3f..e7db7c8b04d439 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -214,12 +214,12 @@ es:
         resend_user: Reenviar Correo de Confirmación
         reset_password_user: Restablecer Contraseña
         resolve_report: Resolver Reporte
-        sensitive_account: Marcar multimedia en tu cuenta como sensible
+        sensitive_account: Marcar cuenta como sensible
         silence_account: Silenciar Cuenta
         suspend_account: Suspender Cuenta
         unassigned_report: Desasignar Reporte
         unblock_email_account: Desbloquear dirección de correo
-        unsensitive_account: Desmarcar multimedia en tu cuenta como sensible
+        unsensitive_account: Desmarcar cuenta como sensible
         unsilence_account: Dejar de Silenciar Cuenta
         unsuspend_account: Dejar de Suspender Cuenta
         update_announcement: Actualizar Anuncio
@@ -751,6 +751,7 @@ es:
         desc_html: Esto se basa en scripts externos de hCaptcha, que pueden suponer una preocupación de seguridad y privacidad. Además, <strong>esto puede volver el proceso de registro significativamente menos accesible para algunas personas (especialmente con discapacidades)</strong>. Por estas razones, por favor, considera medidas alternativas como el registro por aprobación manual o con invitación.
         title: Solicita a los nuevos usuarios que resuelvan un CAPTCHA para confirmar su cuenta
       content_retention:
+        danger_zone: Zona peligrosa
         preamble: Controlar cómo el contenido generado por el usuario se almacena en Mastodon.
         title: Retención de contenido
       default_noindex:
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index a05aa3c92f00ec..22ca8135d51262 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -753,6 +753,7 @@ eu:
         desc_html: Hori egiteko hCaptcha-ko scriptak behar dira, hirugarrenenak izanik, segurtasun eta pribatutasun arazoak ekarri ditzaketeenak. Horrez gain, <strong>script horiengatik nabarmen zailagoa egiten zaie pertsona batzuei izena ematea (batez ere desgaitasunen bat duenei)</strong>. Hori dela eta, hausnartu beste neurri batzuk hartu ditzakezun, esaterako onarpenean oinarritutako izen ematea, edo gonbidapenen bidezkoa.
         title: Eskatu erabiltzaile berriei CAPTCHA bat ebazteko beren kontua berresteko
       content_retention:
+        danger_zone: Eremu arriskutsua
         preamble: Kontrolatu erabiltzaileek sortutako edukia nola biltegiratzen den Mastodonen.
         title: Edukia atxikitzea
       default_noindex:
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index f82a592ec39215..5f96f611b403c2 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -751,6 +751,7 @@ fi:
         desc_html: Tämä perustuu ulkoisiin skripteihin hCaptchasta, mikä voi olla turvallisuus- ja yksityisyysongelma. Lisäksi <strong>tämä voi tehdä rekisteröinnin ihmisille huomattavasti (erityisesti vammaisten) helpommaksi</strong>. Harkitse vaihtoehtoisia toimenpiteitä, kuten hyväksymisperusteista tai kutsupohjaista rekisteröintiä.
         title: Vaadi uusia käyttäjiä vahvistaamaan tilinsä ratkaisemalla CAPTCHA-vahvistus
       content_retention:
+        danger_zone: Vaaravyöhyke
         preamble: Määritä, miten käyttäjän luoma sisältö tallennetaan Mastodoniin.
         title: Sisällön säilyttäminen
       default_noindex:
diff --git a/config/locales/fo.yml b/config/locales/fo.yml
index b6c8b306f010e2..15c9c7dc043e65 100644
--- a/config/locales/fo.yml
+++ b/config/locales/fo.yml
@@ -751,6 +751,7 @@ fo:
         desc_html: Hetta er bundið at uttanhýsis skriptum frá hCaptcha, sum kann vera ein trygdar- og privatlívsváði. Harafturat, so <strong>kann hetta gera skrásetingartilgongdina munandi minni atkomuliga til summi (brekaði) fólk</strong>. Tískil eigur tú at umhugsa aðrar hættir sosum góðkenningar-grundaða ella innbjóðingar-grundaða skráseting.
         title: Set krav til nýggjar brúkarar at loysa eina CAPTHA fyri at vátta teirra kontu
       content_retention:
+        danger_zone: Vandaøki
         preamble: Stýr hvussu brúkara-skapt tilfar er goymt í Mastodon.
         title: Varðveitsla av tilfari
       default_noindex:
diff --git a/config/locales/he.yml b/config/locales/he.yml
index ddb3417ff893c3..14da27ec75e281 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -779,6 +779,7 @@ he:
         desc_html: אפשרות זו ניסמכת על קטעי קוד חיצוניים של hCaptcha שעלולים להיות סיכון אבטחה ופרטיות. בנוסף, <strong>זה עשוי להפוך את תהליך ההרשמה לבלתי נגיש לא.נשים, במיוחד בעלות ובעלי מוגבלויות</strong>. מסיבות אלו, כדאי לשקול חלופות כמו אשרור מנהלים ידני או הרשמה רק על בסיס הזמנה.
         title: לדרוש פתרון CAPTCHA כדי לאשרר למשתמשים את חשבונם
       content_retention:
+        danger_zone: אזור מסוכן
         preamble: שליטה על דרך אחסון תוכן המשתמשים במסטודון.
         title: תקופת השמירה של תכנים
       default_noindex:
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 43f7692531313e..c48d527cafa74f 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -751,6 +751,7 @@ hu:
         desc_html: Ez hCaptcha-ból származó külső scripteket használ, mely biztonsági vagy adatvédelmi résnek bizonyulhat. Ezen kívül ez <strong>a regisztrációs folyamatot jelentősen megnehezítheti bizonyos (kifejezetten különleges szükségletű) emberek számára</strong>. Emiatt fontold meg más módszerek, mint pl. jóváhagyás-alapú vagy meghívásalapú regisztráció használatát.
         title: Az új felhasználóknak egy CAPTCHA-t kell megoldaniuk, hogy megerősítsék a fiókjuk regisztrációját
       content_retention:
+        danger_zone: Veszélyzóna
         preamble: A felhasználók által előállított tartalom Mastodonon való tárolásának szabályozása.
         title: Tartalom megtartása
       default_noindex:
diff --git a/config/locales/is.yml b/config/locales/is.yml
index ba1785d9e67573..2eeba976bcc30a 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -753,6 +753,7 @@ is:
           Aukinheldur <strong> gæti þetta gert nýskráningarferlið óaðgengilegra sumum (sérstaklega fyrir fatlaða)</strong>. Þess vegna er rétt að skoða aðra valmöguleika svo sem nýskráningar háðar samþykki eða boði.
         title: Nýir notendur munu þurfa að standast Turing skynpróf til að staðfesta notendaaðganginn
       content_retention:
+        danger_zone: Hættusvæði
         preamble: Stýrðu hvernig efni frá notendum sé geymt í Mastodon.
         title: Geymsla efnis
       default_noindex:
diff --git a/config/locales/it.yml b/config/locales/it.yml
index f12735cfb13c2c..bda681ac084583 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -751,6 +751,7 @@ it:
         desc_html: Questo si basa su script esterni da hCaptcha, che possono rappresentare un problema di sicurezza e privacy. Inoltre, <strong>questo può rendere il processo di registrazione significativamente meno accessibile ad alcune persone (soprattutto disabili)</strong>. Per questi motivi, prendi in considerazione misure alternative come la registrazione basata su approvazione o su invito.
         title: Richiedi ai nuovi utenti di risolvere un CAPTCHA per confermare il loro account
       content_retention:
+        danger_zone: Zona pericolosa
         preamble: Controlla come vengono memorizzati i contenuti generati dall'utente in Mastodon.
         title: Conservazione dei contenuti
       default_noindex:
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 553c780beb8d29..74dea29b0e3558 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -745,12 +745,13 @@ nl:
         preamble: Mastodons webomgeving aanpassen.
         title: Weergave
       branding:
-        preamble: De branding van jouw server laat zien hoe het met andere servers in het netwerk verschilt. Deze informatie wordt op verschillende plekken getoond, zoals in de webomgeving van Mastodon, in mobiele apps, in voorvertoningen op andere websites en berichten-apps, enz. Daarom is het belangrijk om de informatie helder, kort en beknopt te houden.
+        preamble: De branding van jouw server laat zien hoe het met andere servers in het netwerk verschilt. Deze informatie wordt op verschillende plekken getoond, zoals in de webomgeving van Mastodon, in mobiele apps, in linkvoorbeelden op andere websites en berichten-apps, enz. Daarom is het belangrijk om de informatie helder, kort en beknopt te houden.
         title: Branding
       captcha_enabled:
         desc_html: Dit is afhankelijk van externe scripts van hCaptcha, wat veiligheids- en privacyrisico's met zich mee kan brengen. Bovendien kan <strong>dit het registratieproces aanzienlijk minder toegankelijk maken voor sommige (vooral gehandicapte) mensen</strong>. Om deze redenen kun je het beste alternatieve maatregelen overwegen, zoals registratie op basis van goedkeuring of op uitnodiging.
         title: Nieuwe gebruikers dienen een CAPTCHA op te lossen om hun account te bevestigen
       content_retention:
+        danger_zone: Gevarenzone
         preamble: Toezicht houden op hoe berichten en media van gebruikers op Mastodon worden bewaard.
         title: Bewaartermijn berichten
       default_noindex:
diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index 8a7cb18a40ba79..013674ca514133 100644
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -751,6 +751,7 @@ nn:
         desc_html: Dette baserer seg på eksterne skript frå hCaptcha, noko som kan vera eit tryggleiks- og personvernsproblem. <strong>I tillegg kan dette gjera registreringsprosessen monaleg mindre tilgjengeleg (særleg for folk med nedsett funksjonsevne)</strong>. Dette gjer at du bør du vurdera alternative tiltak, som til dømes godkjennings- eller invitasjonsbasert registrering.
         title: Krev at nye brukarar løyser ein CAPTCHA for å bekrefte kontoen sin
       content_retention:
+        danger_zone: Faresone
         preamble: Styr korleis brukargenerert innhald blir lagra i Mastodon.
         title: Bevaring av innhald
       default_noindex:
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index d3d16fe373652d..7c037d7d002bf3 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -779,6 +779,7 @@ pl:
         desc_html: Wymaga użycia zewnętrznych skryptów hCaptcha, co może negatywnie wpływać na bezpieczeństwo i prywatność. <strong>Może również przyczynić się do znaczącego utrudnienia procesu rejestracji niektórym, np. niepełnosprawnym, osobom.</strong> Dlatego sugeruje się używanie zaproszeń bądź ręcznie potwierdzanie kont.
         title: W celu potwierdzenia ich kont wymagaj rozwiązania zadania CAPTCHA przez nowych użytkowników
       content_retention:
+        danger_zone: Strefa niebezpieczeństwa
         preamble: Kontroluj, jak treści generowane przez użytkownika są przechowywane w Mastodon.
         title: Retencja treści
       default_noindex:
diff --git a/config/locales/simple_form.an.yml b/config/locales/simple_form.an.yml
index 6ec8380f2a8408..e409c39ae10f29 100644
--- a/config/locales/simple_form.an.yml
+++ b/config/locales/simple_form.an.yml
@@ -66,13 +66,10 @@ an:
           warn: Amagar lo conteniu filtrau dezaga d'una alvertencia mencionando lo titol d'o filtro
       form_admin_settings:
         activity_api_enabled: Conteyo de publicacions locals, usuarios activos y nuevos rechistros en periodos semanals
-        backups_retention_period: Mantener los fichers d'usuario cheneraus entre lo numero de días especificau.
         bootstrap_timeline_accounts: Estas cuentas amaneixerán en a parte superior d'as recomendacions d'os nuevos usuarios.
         closed_registrations_message: Amostrau quan los rechistros son zarraus
-        content_cache_retention_period: Las publicacions d'atros servidors s'eliminarán dimpués d'o numero especificau de días quan s'estableixca una valor positiva. Esto puede estar irreversible.
         custom_css: Puetz aplicar estilos personalizaus a la versión web de Mastodon.
         mascot: Reemplaza la ilustración en a interficie web abanzada.
-        media_cache_retention_period: Los fichers multimedia descargaus s'eliminarán dimpués d'o numero especificau de días quan s'estableixca una valor positiva, y se redescargarán baixo demanda.
         peers_api_enabled: Una lista de nombres de dominio que este servidor ha trobau en o Fediverso. Aquí no s'incluye garra dato sobre si federas con un servidor determinau, nomás que lo tuyo servidor lo conoixe. Esto ye emplegau per los servicios que replegan estatisticas sobre la federación en un sentiu cheneral.
         profile_directory: Lo directorio de perfils lista a totz los usuarios que han optado per que la suya cuenta pueda estar descubierta.
         require_invite_text: Quan los rechistros requieren aprebación manual, fa obligatoria la dentrada de texto "Per qué quiers unir-te?" en cuenta d'opcional
@@ -221,7 +218,6 @@ an:
         backups_retention_period: Periodo de retención d'o fichero d'usuario
         bootstrap_timeline_accounts: Recomendar siempre estas cuentas a nuevos usuarios
         closed_registrations_message: Mensache personalizau quan los rechistros no son disponibles
-        content_cache_retention_period: Periodo de retención de caché de conteniu
         custom_css: CSS personalizau
         mascot: Mascota personalizada (legado)
         media_cache_retention_period: Periodo de retención de caché multimedia
diff --git a/config/locales/simple_form.ar.yml b/config/locales/simple_form.ar.yml
index da27fd8dc4f977..29e525b2c857cc 100644
--- a/config/locales/simple_form.ar.yml
+++ b/config/locales/simple_form.ar.yml
@@ -77,13 +77,10 @@ ar:
           warn: إخفاء المحتوى الذي تم تصفيته خلف تحذير يذكر عنوان الفلتر
       form_admin_settings:
         activity_api_enabled: عدد المنشورات المحلية و المستخدمين الناشطين و التسجيلات الأسبوعية الجديدة
-        backups_retention_period: الاحتفاظ بأرشيف المستخدم الذي تم إنشاؤه لعدد محدد من الأيام.
         bootstrap_timeline_accounts: سيتم تثبيت هذه الحسابات على قمة التوصيات للمستخدمين الجدد.
         closed_registrations_message: ما سيعرض عند إغلاق التسجيلات
-        content_cache_retention_period: سيتم حذف كافة المنشورات والمعاد نشرها من الخوادم الأخرى بعد عدد الأيام المحدد. قد لا تكون بعض المنشورات قابلة للاسترداد. كافة الفواصل المرجعية والمفضلات والمعاد نشرها ذات الصلة سوف تضيع ويستحيل التراجع عن هذا الإجراء.
         custom_css: يمكنك تطبيق أساليب مخصصة على نسخة الويب من ماستدون.
         mascot: تجاوز الرسوم التوضيحية في واجهة الويب المتقدمة.
-        media_cache_retention_period: سيتم حذف ملفات الوسائط التي تم تنزيلها بعد عدد الأيام المحدد عند تعيينها إلى قيمة موجبة، وإعادة تنزيلها عند الطلب.
         peers_api_enabled: قائمة بأسماء النطاقات التي صادفها هذا الخادم في الفدرالية. لا توجد بيانات هنا حول ما إذا كنت تتحد مع خادم معين، فقط أن خادمك يعرف عنها. ويستخدم هذا الخدمات التي تجمع الإحصاءات المتعلقة بالاتحاد بشكل عام.
         profile_directory: دليل الملف الشخصي يسرد جميع المستخدمين الذين اختاروا الدخول ليكونوا قابلين للاكتشاف.
         require_invite_text: عندما تتطلب التسجيلات الموافقة اليدوية، اجعل إدخال النص "لماذا تريد الانضمام ؟" إلزاميا بدلا من اختياري
@@ -243,7 +240,6 @@ ar:
         backups_retention_period: فترة الاحتفاظ بأرشيف المستخدم
         bootstrap_timeline_accounts: أوصي دائما بهذه الحسابات للمستخدمين الجدد
         closed_registrations_message: رسالة مخصصة عندما يكون التسجيل غير متاح
-        content_cache_retention_period: مدة الاحتفاظ بالتخزين المؤقت للوسائط
         custom_css: سي أس أس CSS مخصص
         mascot: جالب حظ مخصص (قديم)
         media_cache_retention_period: مدة الاحتفاظ بالتخزين المؤقت للوسائط
diff --git a/config/locales/simple_form.ast.yml b/config/locales/simple_form.ast.yml
index e3969625670018..d1950ab15f87e2 100644
--- a/config/locales/simple_form.ast.yml
+++ b/config/locales/simple_form.ast.yml
@@ -33,11 +33,9 @@ ast:
       featured_tag:
         name: 'Equí tán dalgunes de les etiquetes qu''usesti apocayá:'
       form_admin_settings:
-        backups_retention_period: Caltién los archivos xeneraos polos perfiles demientres el númberu de díes especificáu.
         closed_registrations_message: Apaez cuando'l rexistru ta desactiváu
         custom_css: Pues aplicar estilos personalizaos a la versión web de Mastodon.
         mascot: Anula la ilustración na interfaz web avanzada.
-        media_cache_retention_period: Los ficheros multimedia baxaos desaníciense dempués del númberu de díes especificáu al configurar un valor positivu, ya vuelven baxase baxo demanda.
         require_invite_text: Cuando los rexistros riquen una aprobación manual, el campu «¿Por qué quies xunite?» vuélvese obligatoriu
         site_extended_description: Cualesquier tipu d'información adicional que pueda ser útil pa visitantes ya pa perfiles rexistraos. El testu pue estructurase cola sintaxis de Mastodon.
         site_short_description: Un descripción curtia qu'ayuda a identificar de forma única al sirvidor. ¿Quién lu lleva?, ¿pa quién ye?
@@ -134,7 +132,6 @@ ast:
       form_admin_settings:
         backups_retention_period: Periodu de retención de los archivos de los perfiles
         closed_registrations_message: Mensaxe personalizáu cuando'l rexistru nun ta disponible
-        content_cache_retention_period: Periodu de retención de la caché de conteníu
         media_cache_retention_period: Periodu de retención de la caché multimedia
         registrations_mode: Quién pue rexistrase
         require_invite_text: Riquir un motivu pa rexistrase
diff --git a/config/locales/simple_form.be.yml b/config/locales/simple_form.be.yml
index 245c1e8528ea90..f8000a1c81ca64 100644
--- a/config/locales/simple_form.be.yml
+++ b/config/locales/simple_form.be.yml
@@ -77,13 +77,10 @@ be:
           warn: Схаваць адфільтраваны кантэнт за папярэджаннем з назвай фільтру
       form_admin_settings:
         activity_api_enabled: Падлік лакальна апублікаваных пастоў, актыўных карыстальнікаў і новых рэгістрацый у тыдзень
-        backups_retention_period: Захоўваць створаныя архівы карыстальніка адзначаную колькасць дзён.
         bootstrap_timeline_accounts: Гэтыя ўліковыя запісы будуць замацаваны ў топе рэкамендацый для новых карыстальнікаў.
         closed_registrations_message: Паказваецца, калі рэгістрацыя закрытая
-        content_cache_retention_period: Допісы з іншых сервераў будуць выдаляцца пасля выстаўленай колькасці дзён, калі выстаўлены станоўчы лік. Гэта можа быць незваротным.
         custom_css: Вы можаце прымяняць карыстальніцкія стылі ў вэб-версіі Mastodon.
         mascot: Замяняе ілюстрацыю ў пашыраным вэб-інтэрфейсе.
-        media_cache_retention_period: Спампаваныя медыя будуць выдаляцца пасля выстаўленай колькасці дзён, калі выстаўлены станоўчы лік, і спампоўвацца нанова па запыце.
         peers_api_enabled: Спіс даменных імён, з якімі сутыкнуўся гэты сервер у федэсвеце. Дадзеныя аб тым, ці знаходзіцеся вы з пэўным серверам у федэрацыі, не ўключаныя, ёсць толькі тое, што ваш сервер ведае пра гэта. Гэта выкарыстоўваецца сэрвісамі, якія збіраюць статыстыку па федэрацыі ў агульным сэнсе.
         profile_directory: Дырэкторыя профіляў змяшчае спіс усіх карыстальнікаў, якія вырашылі быць бачнымі.
         require_invite_text: Калі рэгістрацыя патрабуе ручнога пацвержання, зрабіце поле "Чаму вы хочаце далучыцца?" абавязковым
@@ -243,7 +240,6 @@ be:
         backups_retention_period: Працягласць захавання архіву карыстальніка
         bootstrap_timeline_accounts: Заўсёды раіць гэтыя ўліковыя запісы новым карыстальнікам
         closed_registrations_message: Уласнае паведамленне, калі рэгістрацыя немагчымая
-        content_cache_retention_period: Працягласць захавання кэшу для змесціва
         custom_css: CSS карыстальніка
         mascot: Уласны маскот(спадчына)
         media_cache_retention_period: Працягласць захавання кэшу для медыя
diff --git a/config/locales/simple_form.bg.yml b/config/locales/simple_form.bg.yml
index e85e753e887773..a4a2027137c4c3 100644
--- a/config/locales/simple_form.bg.yml
+++ b/config/locales/simple_form.bg.yml
@@ -77,13 +77,13 @@ bg:
           warn: Скриване на филтрираното съдържание зад предупреждение, споменавайки заглавието на филтъра
       form_admin_settings:
         activity_api_enabled: Броят на местните публикувани публикации, дейни потребители и нови регистрации в седмични кофи
-        backups_retention_period: Задържане на породените потребителски архиви за определения брой дни.
+        backups_retention_period: Потребителите имат способността да пораждат архиви от публикациите си за по-късно изтегляне. Задавайки положителна стойност, тези архиви самодейно ще се изтрият от хранилището ви след определения брой дни.
         bootstrap_timeline_accounts: Тези акаунти ще се закачат в горния край на препоръките за следване на нови потребители.
         closed_registrations_message: Показва се, когато е затворено за регистрации
-        content_cache_retention_period: Всички публикации и подсилвания от други сървъри ще се изтрият след определен брой дни. Някои публикации може да не се възстановят. Всички сродни отметки, любими и подсилвания също ще се загубят и невъзможно да се отмени.
+        content_cache_retention_period: Всички публикации от други сървъри, включително подсилвания и отговори, ще се изтрият след посочения брой дни, без да се взема предвид каквото и да е взаимодействие на местния потребител с тези публикации. Това включва публикации, които местния потребител е означил като отметки или любими. Личните споменавания между потребители от различни инстанции също ще се загубят и невъзможно да се възстановят. Употребата на тази настройка е предназначена за случаи със специално предназначение и разбива очакванията на много потребители, когато се изпълнява за употреба с общо предназначение.
         custom_css: Може да прилагате собствени стилове в уебверсията на Mastodon.
         mascot: Замества илюстрацията в разширения уеб интерфейс.
-        media_cache_retention_period: Изтеглените мултимедийни файлове ще се изтрият след посочения брой дни, задавайки положително число, и ще се изтеглят пак при поискване.
+        media_cache_retention_period: Мултимедийни файлове от публикации, направени от отдалечени потребители, се сринаха в сървъра ви. Задавайки положителна стойност, мултимедията ще се изтрие след посочения брой дни. Ако се искат мултимедийни данни след изтриването, то ще се изтегли пак, ако още е наличен източникът на съдържание. Поради ограниченията за това колко често картите за предварващ преглед на връзките анкетират сайтове на трети страни, се препоръчва да зададете тази стойност на поне 14 дни или картите за предварващ преглед на връзките няма да се обновяват при поискване преди този момент.
         peers_api_enabled: Списък от имена на домейни, с които сървърът се е свързал във федивселената. Тук не се включват данни за това дали федерирате с даден сървър, а само за това дали сървърът ви знае за него. Това се ползва от услуги, събиращи статистика за федерацията в общия смисъл.
         profile_directory: Указателят на профили вписва всички потребители, избрали да бъдат откриваеми.
         require_invite_text: Когато регистрацията изисква ръчно одобрение, то направете текстовото поле за това "Защо желаете да се присъедините?" по-скоро задължително, отколкото по желание
@@ -243,7 +243,7 @@ bg:
         backups_retention_period: Период за съхранение на потребителския архив
         bootstrap_timeline_accounts: Винаги да се препоръчват следните акаунти на нови потребители
         closed_registrations_message: Съобщение при неналична регистрация
-        content_cache_retention_period: Период на съхранение на кеша за съдържание
+        content_cache_retention_period: Период на запазване на отдалечено съдържание
         custom_css: Персонализиран CSS
         mascot: Плашило талисман по избор (остаряло)
         media_cache_retention_period: Период на запазване на мултимедийния кеш
diff --git a/config/locales/simple_form.ca.yml b/config/locales/simple_form.ca.yml
index e4bee0214c0349..62c1da55b5ad3e 100644
--- a/config/locales/simple_form.ca.yml
+++ b/config/locales/simple_form.ca.yml
@@ -77,13 +77,13 @@ ca:
           warn: Oculta el contingut filtrat darrere d'un avís mencionant el títol del filtre
       form_admin_settings:
         activity_api_enabled: Contador de tuts publicats localment, usuaris actius i registres nous en períodes setmanals
-        backups_retention_period: Manté els arxius d'usuari generats durant el nombre de dies especificats.
+        backups_retention_period: Els usuaris poden generar arxius de les seves publicacions per a baixar-los més endavant. Quan tingui un valor positiu, els arxius s'esborraran del vostre emmagatzematge després del nombre donat de dies.
         bootstrap_timeline_accounts: Aquests comptes es fixaran en la part superior de les recomanacions de seguiment dels nous usuaris.
         closed_registrations_message: Es mostra quan el registres estan tancats
-        content_cache_retention_period: Els tuts d'altres servidors se suprimiran després del nombre de dies especificat quan s'estableix un valor positiu. Això pot ser irreversible.
+        content_cache_retention_period: S'esborraran totes les publicacions d'altres servidors (impulsos i respostes inclosos) passats els dies indicats, sense tenir en consideració les interaccions d'usuaris locals amb aquestes publicacions. Això inclou les publicacions que un usuari local hagi marcat com a favorites. També es perdran, i no es podran recuperar, les mencions privades entre usuaris d'instàncies diferents. Aquest paràmetre està pensat per a instàncies amb un propòsit especial i trencarà les expectatives dels usuaris si s'utilitza en una instància convencional.
         custom_css: Pots aplicar estils personalitzats en la versió web de Mastodon.
         mascot: Anul·la la il·lustració en la interfície web avançada.
-        media_cache_retention_period: Els fitxers multimèdia descarregats s'esborraran després del nombre de dies especificat quan el valor configurat és positiu, i tornats a descarregats sota demanda.
+        media_cache_retention_period: El vostre servidor conserva una còpia dels fitxers multimèdia de les publicacions dels usuaris remots. Si s'indica un valor positiu, s'esborraran passats els dies indicats. Si el fitxer es torna a demanar un cop esborrat, es tornarà a baixar si el contingut origen segueix disponible. Per causa de les restriccions en la freqüència amb què es poden demanar les targetes de previsualització d'altres servidors, es recomana definir aquest valor com a mínim a 14 dies, o les targetes de previsualització no s'actualizaran a demanda abans d'aquest termini.
         peers_api_enabled: Una llista de noms de domini que aquest servidor ha trobat al fedivers. No inclou cap dada sobre si estàs federat amb un servidor determinat, només si el teu en sap res. La fan servir, en un sentit general, serveis que recol·lecten estadístiques sobre la federació.
         profile_directory: El directori de perfils llista tots els usuaris que tenen activat ser descoberts.
         require_invite_text: Quan el registre requereixi aprovació manual, fes que sigui obligatori en lloc d'opcional d'escriure el text de la sol·licitud d'invitació "Per què vols unir-te?"
@@ -243,7 +243,7 @@ ca:
         backups_retention_period: Període de retenció del arxiu d'usuari
         bootstrap_timeline_accounts: Recomana sempre aquests comptes als nous usuaris
         closed_registrations_message: Missatge personalitzat quan el registre no és accessible
-        content_cache_retention_period: Període de retenció de la memòria cau de contingut
+        content_cache_retention_period: Període de retenció del contingut remot
         custom_css: CSS personalitzat
         mascot: Mascota personalitzada (llegat)
         media_cache_retention_period: Període de retenció del cau multimèdia
diff --git a/config/locales/simple_form.cs.yml b/config/locales/simple_form.cs.yml
index f91f8267306c98..54edc4149df4a6 100644
--- a/config/locales/simple_form.cs.yml
+++ b/config/locales/simple_form.cs.yml
@@ -77,13 +77,13 @@ cs:
           warn: Schovat filtrovaný obsah za varováním zmiňujicím název filtru
       form_admin_settings:
         activity_api_enabled: Počty lokálně zveřejnělých příspěvků, aktivních uživatelů a nových registrací v týdenních intervalech
-        backups_retention_period: Zachovat generované uživatelské archivy pro zadaný počet dní.
+        backups_retention_period: Uživatelé mají možnost vytvářet archivy svých příspěvků, které si mohou stáhnout později. Pokud je nastaveno na kladnou hodnotu, budou tyto archivy po zadaném počtu dní automaticky odstraněny z úložiště.
         bootstrap_timeline_accounts: Tyto účty budou připnuty na vrchol nových uživatelů podle doporučení.
         closed_registrations_message: Zobrazeno při zavření registrace
-        content_cache_retention_period: Příspěvky z jiných serverů budou odstraněny po zadaném počtu dní, pokud je nastavena kladná hodnota. To může být nevratné.
+        content_cache_retention_period: Všechny příspěvky z jiných serverů (včetně boostů a odpovědí) budou po uplynutí stanoveného počtu dní smazány bez ohledu na interakci místního uživatele s těmito příspěvky. To se týká i příspěvků, které místní uživatel přidal do záložek nebo oblíbených. Soukromé zmínky mezi uživateli z různých instancí budou rovněž ztraceny a nebude možné je obnovit. Použití tohoto nastavení je určeno pro instance pro speciální účely a při implementaci pro obecné použití porušuje mnohá očekávání uživatelů.
         custom_css: Můžete použít vlastní styly ve verzi Mastodonu.
         mascot: Přepíše ilustraci v pokročilém webovém rozhraní.
-        media_cache_retention_period: Stažené mediální soubory budou po zadaném počtu dní odstraněny, pokud je nastavena kladná hodnota, a na požádání znovu staženy.
+        media_cache_retention_period: Mediální soubory z příspěvků vzdálených uživatelů se ukládají do mezipaměti na vašem serveru. Pokud je nastaveno na kladnou hodnotu, budou média po zadaném počtu dní odstraněna. Pokud jsou mediální data vyžádána po jejich odstranění, budou znovu stažena, pokud je zdrojový obsah stále k dispozici. Vzhledem k omezením týkajícím se četnosti dotazů karet náhledů odkazů na weby třetích stran se doporučuje nastavit tuto hodnotu alespoň na 14 dní, jinak nebudou karty náhledů odkazů na vyžádání aktualizovány dříve.
         peers_api_enabled: Seznam názvů domén se kterými se tento server setkal ve fediversu. Neobsahuje žádná data o tom, zda jste federovali s daným serverem, pouze že o něm váš server ví. Toto je využíváno službami, které sbírají o federování statistiku v obecném smyslu.
         profile_directory: Adresář profilu obsahuje seznam všech uživatelů, kteří se přihlásili, aby mohli být nalezeni.
         require_invite_text: Pokud přihlášení vyžaduje ruční schválení, měl by být textový vstup „Proč se chcete připojit?“ povinný spíše než volitelný
@@ -243,7 +243,7 @@ cs:
         backups_retention_period: Doba uchovávání archivu uživatelů
         bootstrap_timeline_accounts: Vždy doporučovat tyto účty novým uživatelům
         closed_registrations_message: Vlastní zpráva, když přihlášení není k dispozici
-        content_cache_retention_period: Doba uchování mezipaměti obsahu
+        content_cache_retention_period: Doba uchovávání vzdáleného obsahu
         custom_css: Vlastní CSS
         mascot: Vlastní maskot (zastaralé)
         media_cache_retention_period: Doba uchovávání mezipaměti médií
diff --git a/config/locales/simple_form.cy.yml b/config/locales/simple_form.cy.yml
index 21cd1ddc0afd54..6b5e8787dd7937 100644
--- a/config/locales/simple_form.cy.yml
+++ b/config/locales/simple_form.cy.yml
@@ -77,13 +77,10 @@ cy:
           warn: Cuddiwch y cynnwys wedi'i hidlo y tu ôl i rybudd sy'n sôn am deitl yr hidlydd
       form_admin_settings:
         activity_api_enabled: Cyfrif o bostiadau a gyhoeddir yn lleol, defnyddwyr gweithredol, a chofrestriadau newydd mewn bwcedi wythnosol
-        backups_retention_period: Cadw archifau defnyddwyr a gynhyrchwyd am y nifer penodedig o ddyddiau.
         bootstrap_timeline_accounts: Bydd y cyfrifon hyn yn cael eu pinio i frig argymhellion dilynol defnyddwyr newydd.
         closed_registrations_message: Yn cael eu dangos pan fydd cofrestriadau wedi cau
-        content_cache_retention_period: Bydd postiadau o weinyddion eraill yn cael eu dileu ar ôl y nifer penodedig o ddyddiau pan fyddan nhw wedi'u gosod i werth positif. Gall nad oes modd dadwneud hyn.
         custom_css: Gallwch gymhwyso arddulliau cyfaddas ar fersiwn gwe Mastodon.
         mascot: Yn diystyru'r darlun yn y rhyngwyneb gwe uwch.
-        media_cache_retention_period: Bydd ffeiliau cyfryngau wedi'u llwytho i lawr yn cael eu dileu ar ôl y nifer penodedig o ddyddiau pan gânt eu gosod i werth cadarnhaol, a'u hail-lwytho i lawr ar alw.
         peers_api_enabled: Rhestr o enwau parth y mae'r gweinydd hwn wedi dod ar eu traws yn y ffediws. Nid oes unrhyw ddata wedi'i gynnwys yma ynghylch a ydych chi'n ffedereiddio â gweinydd penodol, dim ond bod eich gweinydd yn gwybod amdano. Defnyddir hwn gan wasanaethau sy'n casglu ystadegau ar ffedereiddio mewn ystyr cyffredinol.
         profile_directory: Mae'r cyfeiriadur proffil yn rhestru'r holl ddefnyddwyr sydd wedi dewis i fod yn ddarganfyddiadwy.
         require_invite_text: Pan fydd angen cymeradwyaeth â llaw ar gyfer cofrestriadau, gwnewch y “Pam ydych chi am ymuno?” mewnbwn testun yn orfodol yn hytrach na dewisol
@@ -243,7 +240,6 @@ cy:
         backups_retention_period: Cyfnod cadw archif defnyddwyr
         bootstrap_timeline_accounts: Argymhellwch y cyfrifon hyn i ddefnyddwyr newydd bob amser
         closed_registrations_message: Neges bersonol pan nad yw cofrestriadau ar gael
-        content_cache_retention_period: Cyfnod cadw storfa cynnwys
         custom_css: CSS cyfaddas
         mascot: Mascot cyfaddas (hen)
         media_cache_retention_period: Cyfnod cadw storfa cyfryngau
diff --git a/config/locales/simple_form.da.yml b/config/locales/simple_form.da.yml
index 6c8d995bfdb1a9..c9dcd4fa839279 100644
--- a/config/locales/simple_form.da.yml
+++ b/config/locales/simple_form.da.yml
@@ -77,13 +77,13 @@ da:
           warn: Skjul filtreret indhold bag en advarsel, der nævner filterets titel
       form_admin_settings:
         activity_api_enabled: Antal lokalt opslåede indlæg, aktive brugere samt nye tilmeldinger i ugentlige opdelinger
-        backups_retention_period: Behold genererede brugerarkiver i det angivne antal dage.
+        backups_retention_period: Brugere har mulighed for at generere arkiver af deres indlæg til senere downloade. Når sat til positiv værdi, vil disse arkiver automatisk blive slettet fra lagerpladsen efter det angivne antal dage.
         bootstrap_timeline_accounts: Disse konti fastgøres øverst på nye brugeres følg-anbefalinger.
         closed_registrations_message: Vises, når tilmeldinger er lukket
-        content_cache_retention_period: Indlæg fra andre servere slettes efter det angivne antal dage, når sat til en positiv værdi. Dette kan være irreversibelt.
+        content_cache_retention_period: Alle indlæg fra andre servere (herunder boosts og besvarelser) slettes efter det angivne antal dage uden hensyn til lokal brugerinteraktion med disse indlæg. Dette omfatter indlæg, hvor en lokal bruger har markeret dem som bogmærker eller favoritter. Private omtaler mellem brugere fra forskellige instanser vil også være tabt og umulige at gendanne. Brugen af denne indstilling er beregnet til særlige formål instanser og bryder mange brugerforventninger ved implementering til almindelig brug.
         custom_css: Man kan anvende tilpassede stilarter på Mastodon-webversionen.
         mascot: Tilsidesætter illustrationen i den avancerede webgrænseflade.
-        media_cache_retention_period: Downloadede mediefiler slettes efter det angivne antal dage, når sat til en positiv værdi, og gendownloades på forlangende.
+        media_cache_retention_period: Mediefiler fra indlæg oprettet af eksterne brugere er cachet på din server. Når sat til positiv værdi, slettes medier efter det angivne antal dage. Anmodes om mediedata efter de er slettet, gendownloades de, hvis kildeindholdet stadig er tilgængeligt. Grundet begrænsninger på, hvor ofte linkforhåndsvisningskort forespørger tredjeparts websteder, anbefales det at sætte denne værdi til mindst 14 dage, ellers opdateres linkforhåndsvisningskort ikke efter behov før det tidspunkt.
         peers_api_enabled: En liste med domænenavne, som denne server har stødt på i fediverset. Ingen data inkluderes her om, hvorvidt der fødereres med en given server, blot at din server kender til det. Dette bruges af tjenester, som indsamler generelle føderationsstatistikker.
         profile_directory: Profilmappen oplister alle brugere, som har valgt at kunne opdages.
         require_invite_text: Når tilmelding kræver manuel godkendelse, så gør “Hvorfor ønsker du at deltage?” tekstinput obligatorisk i stedet for valgfrit
@@ -243,7 +243,7 @@ da:
         backups_retention_period: Brugerarkivs opbevaringsperiode
         bootstrap_timeline_accounts: Anbefal altid disse konti til nye brugere
         closed_registrations_message: Tilpasset besked, når tilmelding er utilgængelig
-        content_cache_retention_period: Indholds-cache opbevaringsperiode
+        content_cache_retention_period: Opbevaringsperiode for eksternt indhold
         custom_css: Tilpasset CSS
         mascot: Tilpasset maskot (ældre funktion)
         media_cache_retention_period: Media-cache opbevaringsperiode
diff --git a/config/locales/simple_form.de.yml b/config/locales/simple_form.de.yml
index 1d3fba7876aaf3..758d0202826a80 100644
--- a/config/locales/simple_form.de.yml
+++ b/config/locales/simple_form.de.yml
@@ -77,13 +77,13 @@ de:
           warn: Den gefilterten Beitrag hinter einer Warnung, die den Filtertitel beinhaltet, ausblenden
       form_admin_settings:
         activity_api_enabled: Anzahl der wöchentlichen Beiträge, aktiven Profile und Registrierungen auf diesem Server
-        backups_retention_period: Behalte die Archive, die von den Benutzer*innen erstellt worden sind, für die angegebene Anzahl an Tagen.
+        backups_retention_period: Nutzer*innen haben die Möglichkeit, Archive ihrer Beiträge zu erstellen, die sie später herunterladen können. Wenn ein positiver Wert gesetzt ist, werden diese Archive nach der festgelegten Anzahl von Tagen automatisch aus deinem Speicher gelöscht.
         bootstrap_timeline_accounts: Diese Konten werden bei den Follower-Empfehlungen für neu registrierte Nutzer*innen oben angeheftet.
         closed_registrations_message: Wird angezeigt, wenn Registrierungen deaktiviert sind
-        content_cache_retention_period: Sowohl alle Beiträge als auch geteilte Beiträge von anderen Servern werden nach der angegebenen Anzahl von Tagen gelöscht. Alle zugehörigen Lesezeichen, Favoriten und geteilte Beiträge werden ebenfalls verloren gehen. Dies kann nicht mehr rückgängig gemacht werden.
+        content_cache_retention_period: Sämtliche Beiträge von anderen Servern (einschließlich geteilte Beiträge und Antworten) werden, unabhängig von der Interaktion der lokalen Nutzer*innen mit diesen Beiträgen, nach der festgelegten Anzahl von Tagen gelöscht. Das betrifft auch Beiträge, die von lokalen Nutzer*innen favorisiert oder als Lesezeichen gespeichert wurden. Private Erwähnungen zwischen Nutzer*innen von verschiedenen Servern werden ebenfalls verloren gehen und können nicht wiederhergestellt werden. Das Verwenden dieser Option richtet sich ausschließlich an Server für spezielle Zwecke und wird die allgemeine Nutzungserfahrung beeinträchtigen, wenn sie für den allgemeinen Gebrauch aktiviert ist.
         custom_css: Du kannst benutzerdefinierte Stile auf die Web-Version von Mastodon anwenden.
         mascot: Überschreibt die Abbildung in der erweiterten Weboberfläche.
-        media_cache_retention_period: Von anderen Servern übertragene Mediendateien werden nach der angegebenen Anzahl an Tagen – sofern das Feld eine positive Zahl enthält – aus dem Cache gelöscht und bei Bedarf erneut heruntergeladen.
+        media_cache_retention_period: Mediendateien aus Beiträgen von externen Nutzer*innen werden auf deinem Server zwischengespeichert. Wenn ein positiver Wert gesetzt ist, werden die Medien nach der festgelegten Anzahl von Tagen gelöscht. Sollten die Medien nach dem Löschvorgang wieder angefragt werden, werden sie erneut heruntergeladen, sofern der ursprüngliche Inhalt noch vorhanden ist. Es wird empfohlen, diesen Wert auf mindestens 14 Tage festzulegen, da die Häufigkeit der Abfrage von Linkvorschaukarten für Websites von Dritten begrenzt ist und die Linkvorschaukarten sonst nicht vor Ablauf dieser Zeit aktualisiert werden.
         peers_api_enabled: Eine Liste von Domains, die diesem Server im Fediverse begegnet sind. Hierbei werden keine Angaben darüber gemacht, ob du mit einem bestimmten Server föderierst, sondern nur, dass dein Server davon weiß. Dies wird von Diensten verwendet, die allgemein Statistiken übers Ferdiverse sammeln.
         profile_directory: Dieses Verzeichnis zeigt alle Profile an, die sich dafür entschieden haben, entdeckt zu werden.
         require_invite_text: Wenn Registrierungen eine manuelle Genehmigung erfordern, dann werden Nutzer einen Grund für ihre Registrierung angeben müssen
@@ -243,7 +243,7 @@ de:
         backups_retention_period: Aufbewahrungsfrist für Archive
         bootstrap_timeline_accounts: Neuen Nutzern immer diese Konten empfehlen
         closed_registrations_message: Nachricht, falls Registrierungen deaktiviert sind
-        content_cache_retention_period: Aufbewahrungsfrist für Inhalte im Cache
+        content_cache_retention_period: Aufbewahrungsfrist für externe Inhalte
         custom_css: Eigenes CSS
         mascot: Benutzerdefiniertes Maskottchen (Legacy)
         media_cache_retention_period: Aufbewahrungsfrist für Medien im Cache
diff --git a/config/locales/simple_form.el.yml b/config/locales/simple_form.el.yml
index 4ffc496d020ca1..29b9f59e14a87d 100644
--- a/config/locales/simple_form.el.yml
+++ b/config/locales/simple_form.el.yml
@@ -67,13 +67,10 @@ el:
           warn: Απόκρυψη φιλτραρισμένου περιεχομένου πίσω από μια προειδοποίηση που αναφέρει τον τίτλο του φίλτρου
       form_admin_settings:
         activity_api_enabled: Καταμέτρηση τοπικά δημοσιευμένων δημοσιεύσεων, ενεργών χρηστών και νέων εγγραφών σε εβδομαδιαία πακέτα
-        backups_retention_period: Διατήρηση αρχείων χρηστών που δημιουργήθηκαν για τον καθορισμένο αριθμό ημερών.
         bootstrap_timeline_accounts: Αυτοί οι λογαριασμοί θα καρφιτσωθούν στην κορυφή των νέων χρηστών που ακολουθούν τις συστάσεις.
         closed_registrations_message: Εμφανίζεται όταν κλείνουν οι εγγραφές
-        content_cache_retention_period: Αναρτήσεις από άλλους διακομιστές θα διαγραφούν μετά τον καθορισμένο αριθμό ημερών όταν οριστεί μια θετική τιμή. Αυτό μπορεί να είναι μη αναστρέψιμο.
         custom_css: Μπορείς να εφαρμόσεις προσαρμοσμένα στυλ στην έκδοση ιστοσελίδας του Mastodon.
         mascot: Παρακάμπτει την εικονογραφία στην προηγμένη διεπαφή ιστού.
-        media_cache_retention_period: Τα ληφθέντα αρχεία πολυμέσων θα διαγραφούν μετά τον καθορισμένο αριθμό ημερών, όταν οριστεί σε θετική τιμή, και να γίνει εκ νέου λήψη κατά απαίτηση.
         peers_api_enabled: Μια λίστα με ονόματα τομέα που συνάντησε αυτός ο διακομιστής στο fediverse. Δεν περιλαμβάνονται δεδομένα εδώ για το αν συναλλάσσετε με ένα συγκεκριμένο διακομιστή, μόνο ότι ο διακομιστής σας το ξέρει. Χρησιμοποιείται από υπηρεσίες που συλλέγουν στατιστικά στοιχεία για την συναλλαγή με γενική έννοια.
         profile_directory: Ο κατάλογος προφίλ παραθέτει όλους τους χρήστες που έχουν επιλέξει να είναι ανακαλύψιμοι.
         require_invite_text: 'Όταν η εγγραφή απαιτεί χειροκίνητη έγκριση, κάνε το πεδίο κειμένου: «Γιατί θέλετε να συμμετάσχετε;» υποχρεωτικό αντί για προαιρετικό'
@@ -224,7 +221,6 @@ el:
         backups_retention_period: Περίοδος αρχειοθέτησης του χρήστη
         bootstrap_timeline_accounts: Πρότεινε πάντα αυτούς τους λογαριασμούς σε νέους χρήστες
         closed_registrations_message: Προσαρμοσμένο μήνυμα όταν οι εγγραφές δεν είναι διαθέσιμες
-        content_cache_retention_period: Περίοδος διατήρησης προσωρινής μνήμης περιεχομένου
         custom_css: Προσαρμοσμένο CSS
         mascot: Προσαρμοσμένη μασκότ (απαρχαιωμένο)
         media_cache_retention_period: Περίοδος διατήρησης προσωρινής μνήμης πολυμέσων
diff --git a/config/locales/simple_form.en-GB.yml b/config/locales/simple_form.en-GB.yml
index e5c9b1b2b7f2b3..f4668ccada1c38 100644
--- a/config/locales/simple_form.en-GB.yml
+++ b/config/locales/simple_form.en-GB.yml
@@ -77,13 +77,10 @@ en-GB:
           warn: Hide the filtered content behind a warning mentioning the filter's title
       form_admin_settings:
         activity_api_enabled: Counts of locally published posts, active users, and new registrations in weekly buckets
-        backups_retention_period: Keep generated user archives for the specified number of days.
         bootstrap_timeline_accounts: These accounts will be pinned to the top of new users' follow recommendations.
         closed_registrations_message: Displayed when sign-ups are closed
-        content_cache_retention_period: Posts from other servers will be deleted after the specified number of days when set to a positive value. This may be irreversible.
         custom_css: You can apply custom styles on the web version of Mastodon.
         mascot: Overrides the illustration in the advanced web interface.
-        media_cache_retention_period: Downloaded media files will be deleted after the specified number of days when set to a positive value, and re-downloaded on demand.
         peers_api_enabled: A list of domain names this server has encountered in the fediverse. No data is included here about whether you federate with a given server, just that your server knows about it. This is used by services that collect statistics on federation in a general sense.
         profile_directory: The profile directory lists all users who have opted-in to be discoverable.
         require_invite_text: When sign-ups require manual approval, make the “Why do you want to join?” text input mandatory rather than optional
@@ -243,7 +240,6 @@ en-GB:
         backups_retention_period: User archive retention period
         bootstrap_timeline_accounts: Always recommend these accounts to new users
         closed_registrations_message: Custom message when sign-ups are not available
-        content_cache_retention_period: Content cache retention period
         custom_css: Custom CSS
         mascot: Custom mascot (legacy)
         media_cache_retention_period: Media cache retention period
diff --git a/config/locales/simple_form.eo.yml b/config/locales/simple_form.eo.yml
index ef4641d3e78777..e83f71a2cb5210 100644
--- a/config/locales/simple_form.eo.yml
+++ b/config/locales/simple_form.eo.yml
@@ -75,13 +75,10 @@ eo:
           warn: Kaŝi la enhavon filtritan malantaŭ averto mencianta la nomon de la filtro
       form_admin_settings:
         activity_api_enabled: Nombroj de loke publikigitaj afiŝoj, aktivaj uzantoj kaj novaj registradoj en semajnaj siteloj
-        backups_retention_period: Konservi generitajn uzantoarkivojn por la kvanto de tagoj.
         bootstrap_timeline_accounts: Ĉi tiuj kontoj pinglitas al la supro de sekvorekomendoj de novaj uzantoj.
         closed_registrations_message: Montrita kiam registroj fermitas
-        content_cache_retention_period: Mesaĝoj de aliaj serviloj forigitas post la kvanto de tagoj kiam fiksitas al pozitiva nombro.
         custom_css: Vi povas meti propajn stilojn en la retversio de Mastodon.
         mascot: Anstatauigi la ilustraĵon en la altnivela retinterfaco.
-        media_cache_retention_period: Elŝutitaj audovidaĵojn forigotas post la kvanto de tagoj kiam fiksitas al pozitiva nombro.
         peers_api_enabled: Listo de domajnaj nomoj kiujn ĉi tiu servilo renkontis en la fediverso. Neniuj datumoj estas inkluditaj ĉi tie pri ĉu vi federacias kun donita servilo, nur ke via servilo scias pri ĝi. Ĉi tio estas uzata de servoj kiuj kolektas statistikojn pri federacio en ĝenerala signifo.
         profile_directory: La profilujo listigas ĉiujn uzantojn kiu volonte malkovrebli.
         require_invite_text: Kiam registroj bezonas permanan aprobon, igi la "Kial vi volas aliĝi?" tekstoenigon deviga anstau nedeviga
@@ -240,7 +237,6 @@ eo:
         backups_retention_period: Uzantoarkivretendauro
         bootstrap_timeline_accounts: Ĉiam rekomendi ĉi tiujn kontojn al novaj uzantoj
         closed_registrations_message: Kutima mesaĝo kiam registroj ne estas disponeblaj
-        content_cache_retention_period: Enhavkaŝaĵretendauro
         custom_css: Propa CSS
         mascot: Propa maskoto
         media_cache_retention_period: Audovidaĵkaŝaĵretendauro
diff --git a/config/locales/simple_form.es-AR.yml b/config/locales/simple_form.es-AR.yml
index 0111624082a8c2..cd1b681688e188 100644
--- a/config/locales/simple_form.es-AR.yml
+++ b/config/locales/simple_form.es-AR.yml
@@ -77,13 +77,13 @@ es-AR:
           warn: Ocultar el contenido filtrado detrás de una advertencia mencionando el título del filtro
       form_admin_settings:
         activity_api_enabled: Conteos de mensajes publicados localmente, cuentas activas y nuevos registros en tandas semanales
-        backups_retention_period: Conservar los archivos historiales generados por el usuario durante el número de días especificado.
+        backups_retention_period: Los usuarios tienen la capacidad de generar archivos historiales de sus mensajes para descargar más adelante. Cuando se establece un valor positivo, estos archivos se eliminarán automáticamente de su almacenamiento después del número especificado de días.
         bootstrap_timeline_accounts: Estas cuentas serán fijadas a la parte superior de las recomendaciones de cuentas a seguir para nuevos usuarios.
         closed_registrations_message: Mostrado cuando los registros están cerrados
-        content_cache_retention_period: Todos los mensajes y adhesiones de otros servidores se eliminarán después del número especificado de días. Es posible que algunos mensajes no sean recuperables. Todos los marcadores relacionados, mensajes marcados como favoritos y adhesiones también se perderán y será imposible de deshacer.
+        content_cache_retention_period: Todos los mensajes de otros servidores (incluyendo adhesiones y respuestas) se eliminarán después del número de días especificado, sin tener en cuenta la interacción del usuario local con esos mensajes. Esto incluye mensajes que un usuario local haya agregado a marcadores o los haya marcado como favoritos. Las menciones privadas entre usuarios de diferentes servidores también se perderán y también serán imposibles de restaurar. El uso de esta configuración está destinado a servidores de propósito especial y rompe muchas expectativas de los usuarios cuando se implementa para uso general.
         custom_css: Podés aplicar estilos personalizados a la versión web de Mastodon.
         mascot: Reemplaza la ilustración en la interface web avanzada.
-        media_cache_retention_period: Los archivos de medios descargados se eliminarán después del número especificado de días cuando se establezca un valor positivo, y se volverán a descargar a pedido.
+        media_cache_retention_period: Los archivos de medios de mensajes publicados por usuarios remotos se almacenan en la memoria caché en tu servidor. Cuando se establece un valor positivo, los medios se eliminarán después del número especificado de días. Si los datos multimedia se solicitan después de eliminarse, se volverán a descargar, si es que el contenido fuente todavía está disponible. Debido a restricciones en la frecuencia con la que las tarjetas de previsualización de enlace consultan a sitios web de terceros, se recomienda establecer este valor a, al menos, 14 días, o las tarjetas de previsualización de enlaces no se actualizarán a pedido antes de ese momento.
         peers_api_enabled: Una lista de nombres de dominio que este servidor ha encontrado en el Fediverso. Acá no se incluye ningún dato sobre si federás con un servidor determinado, sólo que tu servidor lo conoce. Esto es usado por los servicios que recopilan estadísticas sobre la federación en un sentido general.
         profile_directory: El directorio de perfiles lista a todos los usuarios que han optado a que su cuenta pueda ser descubierta.
         require_invite_text: Cuando registros aprobación manual, hacé que la solicitud de invitación "¿Por qué querés unirte?" sea obligatoria, en vez de opcional
@@ -243,7 +243,7 @@ es-AR:
         backups_retention_period: Período de retención del archivo historial del usuario
         bootstrap_timeline_accounts: Siempre recomendar estas cuentas a usuarios nuevos
         closed_registrations_message: Mensaje personalizado cuando los registros no están disponibles
-        content_cache_retention_period: Período de retención de la caché de contenido
+        content_cache_retention_period: Período de retención de contenido remoto
         custom_css: CSS personalizado
         mascot: Mascota personalizada (legado)
         media_cache_retention_period: Período de retención de la caché de medios
diff --git a/config/locales/simple_form.es-MX.yml b/config/locales/simple_form.es-MX.yml
index 28253d385b6520..90e223dec3edfc 100644
--- a/config/locales/simple_form.es-MX.yml
+++ b/config/locales/simple_form.es-MX.yml
@@ -77,13 +77,13 @@ es-MX:
           warn: Ocultar el contenido filtrado detrás de una advertencia mencionando el título del filtro
       form_admin_settings:
         activity_api_enabled: Conteo de publicaciones publicadas localmente, usuarios activos, y nuevos registros en periodos semanales
-        backups_retention_period: Mantener los archivos de usuario generados durante el número de días especificado.
+        backups_retention_period: Los usuarios tienen la capacidad de generar archivos de sus mensajes para descargar más adelante. Cuando se establece un valor positivo, estos archivos se eliminarán automáticamente del almacenamiento después del número de días especificado.
         bootstrap_timeline_accounts: Estas cuentas aparecerán en la parte superior de las recomendaciones de los nuevos usuarios.
         closed_registrations_message: Mostrado cuando los registros están cerrados
-        content_cache_retention_period: Las publicaciones de otros servidores se eliminarán después del número especificado de días cuando se establezca un valor positivo. Esto puede ser irreversible.
+        content_cache_retention_period: Todas las publicaciones de otros servidores (incluso impulsos y respuestas) se eliminarán después del número de días especificado, sin tener en cuenta la interacción del usuario local con esos mensajes. Esto incluye mensajes donde un usuario local los ha marcado como marcadores o favoritos. Las menciones privadas entre usuarios de diferentes instancias también se perderán sin posibilidad de recuperación. El uso de esta configuración está destinado a instancias de propósito especial, y rompe muchas expectativas de los usuarios cuando se implementa para un uso de propósito general.
         custom_css: Puedes aplicar estilos personalizados a la versión web de Mastodon.
         mascot: Reemplaza la ilustración en la interfaz web avanzada.
-        media_cache_retention_period: Los archivos multimedia descargados se eliminarán después del número especificado de días cuando se establezca un valor positivo, y se redescargarán bajo demanda.
+        media_cache_retention_period: Los archivos multimedia de las publicaciones creadas por usuarios remotos se almacenan en caché en tu servidor. Cuando se establece un valor positivo, estos archivos se eliminarán después del número especificado de días. Si los datos multimedia se solicitan después de eliminarse, se volverán a descargar, si el contenido fuente todavía está disponible. Debido a restricciones en la frecuencia con la que las tarjetas de previsualización de enlaces realizan peticiones a sitios de terceros, se recomienda establecer este valor a al menos 14 días, o las tarjetas de previsualización de enlaces no se actualizarán bajo demanda antes de ese momento.
         peers_api_enabled: Una lista de nombres de dominio que este servidor ha encontrado en el fediverso. Aquí no se incluye ningún dato sobre si usted federa con un servidor determinado, sólo que su servidor lo sabe. Esto es utilizado por los servicios que recopilan estadísticas sobre la federación en un sentido general.
         profile_directory: El directorio de perfiles lista a todos los usuarios que han optado por que su cuenta pueda ser descubierta.
         require_invite_text: Cuando los registros requieren aprobación manual, hace obligatoria la entrada de texto "¿Por qué quieres unirte?" en lugar de opcional
@@ -243,7 +243,7 @@ es-MX:
         backups_retention_period: Período de retención del archivo de usuario
         bootstrap_timeline_accounts: Recomendar siempre estas cuentas a nuevos usuarios
         closed_registrations_message: Mensaje personalizado cuando los registros no están disponibles
-        content_cache_retention_period: Período de retención de caché de contenido
+        content_cache_retention_period: Período de retención de contenido remoto
         custom_css: CSS personalizado
         mascot: Mascota personalizada (legado)
         media_cache_retention_period: Período de retención de caché multimedia
diff --git a/config/locales/simple_form.es.yml b/config/locales/simple_form.es.yml
index 008ac16073d1f3..1d75bc4234ea0c 100644
--- a/config/locales/simple_form.es.yml
+++ b/config/locales/simple_form.es.yml
@@ -77,13 +77,13 @@ es:
           warn: Ocultar el contenido filtrado detrás de una advertencia mencionando el título del filtro
       form_admin_settings:
         activity_api_enabled: Conteo de publicaciones publicadas localmente, usuarios activos y registros nuevos cada semana
-        backups_retention_period: Mantener los archivos de usuario generados durante el número de días especificado.
+        backups_retention_period: Los usuarios tienen la capacidad de generar archivos de sus mensajes para descargar más adelante. Cuando se establece un valor positivo, estos archivos se eliminarán automáticamente del almacenamiento después del número de días especificado.
         bootstrap_timeline_accounts: Estas cuentas aparecerán en la parte superior de las recomendaciones de los nuevos usuarios.
         closed_registrations_message: Mostrado cuando los registros están cerrados
-        content_cache_retention_period: Las publicaciones de otros servidores se eliminarán después del número especificado de días cuando se establezca un valor positivo. Esto puede ser irreversible.
+        content_cache_retention_period: Todas las publicaciones de otros servidores (incluso impulsos y respuestas) se eliminarán después del número de días especificado, sin tener en cuenta la interacción del usuario local con esos mensajes. Esto incluye mensajes donde un usuario local los ha marcado como marcadores o favoritos. Las menciones privadas entre usuarios de diferentes instancias también se perderán sin posibilidad de recuperación. El uso de esta configuración está destinado a instancias de propósito especial, y rompe muchas expectativas de los usuarios cuando se implementa para un uso de propósito general.
         custom_css: Puedes aplicar estilos personalizados a la versión web de Mastodon.
         mascot: Reemplaza la ilustración en la interfaz web avanzada.
-        media_cache_retention_period: Los archivos multimedia descargados se eliminarán después del número especificado de días cuando se establezca un valor positivo, y se redescargarán bajo demanda.
+        media_cache_retention_period: Los archivos multimedia de las publicaciones creadas por usuarios remotos se almacenan en caché en tu servidor. Cuando se establece un valor positivo, estos archivos se eliminarán después del número especificado de días. Si los datos multimedia se solicitan después de eliminarse, se volverán a descargar, si el contenido fuente todavía está disponible. Debido a restricciones en la frecuencia con la que las tarjetas de previsualización de enlaces realizan peticiones a sitios de terceros, se recomienda establecer este valor a al menos 14 días, o las tarjetas de previsualización de enlaces no se actualizarán bajo demanda antes de ese momento.
         peers_api_enabled: Una lista de nombres de dominio que este servidor ha encontrado en el Fediverso. Aquí no se incluye ningún dato sobre si federas con un servidor determinado, solo que tu servidor lo conoce. Esto es utilizado por los servicios que recopilan estadísticas sobre la federación en un sentido general.
         profile_directory: El directorio de perfiles lista a todos los usuarios que han optado por que su cuenta pueda ser descubierta.
         require_invite_text: Cuando los registros requieren aprobación manual, hace obligatoria la entrada de texto "¿Por qué quieres unirte?" en lugar de opcional
@@ -243,7 +243,7 @@ es:
         backups_retention_period: Período de retención del archivo de usuario
         bootstrap_timeline_accounts: Recomendar siempre estas cuentas a nuevos usuarios
         closed_registrations_message: Mensaje personalizado cuando los registros no están disponibles
-        content_cache_retention_period: Período de retención de caché de contenido
+        content_cache_retention_period: Período de retención de contenido remoto
         custom_css: CSS personalizado
         mascot: Mascota personalizada (legado)
         media_cache_retention_period: Período de retención de caché multimedia
diff --git a/config/locales/simple_form.et.yml b/config/locales/simple_form.et.yml
index 1f7d940049652b..b2ad4c51cfc714 100644
--- a/config/locales/simple_form.et.yml
+++ b/config/locales/simple_form.et.yml
@@ -77,13 +77,10 @@ et:
           warn: Varja filtreeritud sisu hoiatusega, nimetades filtri pealkirja
       form_admin_settings:
         activity_api_enabled: Kohalike postituste, aktiivsete kasutajate ja uute registreerumistr arv nädala kaupa grupeeritult
-        backups_retention_period: Talleta genereeritud kasutajaarhiivid määratud arv päevi.
         bootstrap_timeline_accounts: Need kasutajad kinnitatakse uute kasutajate jälgimissoovituste esiritta.
         closed_registrations_message: Kuvatakse, kui liitumised pole võimalikud
-        content_cache_retention_period: Teiste serverite postitused kustutatakse pärast määratud päevade arvu, kui see on seatud positiivsele väärtusele. See võib olla pöördumatu.
         custom_css: Kohandatud stiile on võimalik kasutada Mastodoni veebiliideses.
         mascot: Asendab kohandatud veebiliidese illustratsiooni.
-        media_cache_retention_period: Positiivse väärtuse korral kustutatakse allalaetud meediafailid määratud päevade möödudes. Vajadusel laaditakse need uuesti alla.
         peers_api_enabled: Domeeninimede loetelu, mida see server on Fediversumis kohanud. Mitte mingeid andmeid selle serveri födereerumise kohta antud serverite pole, vaid üksnes info, et sellest serverist ollakse teadlik. Seda kasutavad teenused, mis koguvad üldist födereerumise statistikat.
         profile_directory: Kasutajate kataloog kuvab nimekirja kasutajatest, kes on seda lubanud.
         require_invite_text: Kui liitumisi on tarvis kinnitada, oleks "Miks soovid liituda?" vastus vajalik
@@ -243,7 +240,6 @@ et:
         backups_retention_period: Kasutajate arhiivi talletusperiood
         bootstrap_timeline_accounts: Alati soovita neid kontosid uutele kasutajatele
         closed_registrations_message: Kohandatud teade, kui liitumine pole võimalik
-        content_cache_retention_period: Meediapuhvri talletusperiood
         custom_css: Kohandatud CSS
         mascot: Kohandatud maskott (kunagine)
         media_cache_retention_period: Meediapuhvri talletusperiood
diff --git a/config/locales/simple_form.eu.yml b/config/locales/simple_form.eu.yml
index 5ed3b9efa1eb07..ba4c9ebcf801a8 100644
--- a/config/locales/simple_form.eu.yml
+++ b/config/locales/simple_form.eu.yml
@@ -77,13 +77,13 @@ eu:
           warn: Ezkutatu iragazitako edukia iragazkiaren izenburua duen abisu batekin
       form_admin_settings:
         activity_api_enabled: Lokalki argitaratutako bidalketak, erabiltzaile aktiboak, eta izen-emateen kopuruak astero zenbatzen ditu
-        backups_retention_period: Mantendu sortutako erabiltzailearen artxiboa zehazturiko egun kopuruan.
+        backups_retention_period: Erabiltzaileek geroago deskarga dezaketen beren argitalpenen artxiboak sor ditzakete. Balio positibo bat ezartzean, artxibo hauek biltegiratzetik automatikoki ezabatuko dira zehazturiko egunen buruan.
         bootstrap_timeline_accounts: Kontu hauek erabiltzaile berrien jarraitzeko gomendioen goiko aldean ainguratuko dira.
         closed_registrations_message: Izen-ematea itxia dagoenean bistaratua
-        content_cache_retention_period: Balio positibo bat ezarriz gero, egun kopuru horretara iristean beste zerbitzarietako bidalketak ezabatuko dira. Hau ezin da desegin.
+        content_cache_retention_period: Beste zerbitzarietako argitalpen guztiak (bultzadak eta erantzunak barne) ezabatuko dira zehazturiko egunen buruan, argitalpen horiek izan ditzaketen erabiltzaile lokalaren interakzioa kontuan izanik gabe. Instantzia desberdinetako erabiltzaileen arteko aipamen pribatuak ere galdu egingo dira eta ezin izango dira berreskuratu. Ezarpen honen erabilera xede berezia duten instantziei zuzendua dago eta erabiltzaileen itxaropena hausten da orotariko erabilerarako inplementatzean.
         custom_css: Estilo pertsonalizatuak aplikatu ditzakezu Mastodonen web bertsioan.
         mascot: Web interfaze aurreratuko ilustrazioa gainidazten du.
-        media_cache_retention_period: Balio positibo bat ezarriz gero, egun kopuru horretara iristean beste zerbitzarietatik deskargatutako multimedia fitxategiak ezabatuko dira. Ondoren, eskatu ahala deskargatuko dira berriz.
+        media_cache_retention_period: Multimedia-fitxategiak dituzten urruneko erabiltzaileen argitalpenak zure zerbitzarian gordetzen dira cachean. Balio positiboa ezartzean, multimedia zehazturiko egunen buruan ezabatuko da. Multimedia-datuak eskatzen badira ezabatu ostean, berriro deskargatuko dira, iturburuko edukia oraindik erabilgarri badago. Estekaren aurrebistako txartelek hirugarrenen guneei zenbatetan dei diezaieketen mugatzen dieten murrizketak direla eta, balio honi, gutxienez, 14 egunen balioa ezartzea gomendatzen da, bestela, esteken aurrebistako txartelak ez dira eguneratuko eskatu ahala denbora horren aurretik.
         peers_api_enabled: Zerbitzari honek fedibertsoan ikusi dituen zerbitzarien domeinu-izenen zerrenda. Ez da daturik ematen zerbitzari jakin batekin federatzearen ala ez federatzearen inguruan, zerbitzariak haien berri duela soilik. Federazioari buruzko estatistika orokorrak biltzen dituzten zerbitzuek erabiltzen dute hau.
         profile_directory: Profilen direktorioan ikusgai egotea aukeratu duten erabiltzaile guztiak zerrendatzen dira.
         require_invite_text: Izen emateak eskuz onartu behar direnean, "Zergatik elkartu nahi duzu?" testu sarrera derrigorrezko bezala ezarri, ez hautazko
@@ -243,7 +243,7 @@ eu:
         backups_retention_period: Erabiltzailearen artxiboa gordetzeko epea
         bootstrap_timeline_accounts: Gomendatu beti kontu hauek erabiltzaile berriei
         closed_registrations_message: Izen-emateak itxita daudenerako mezu pertsonalizatua
-        content_cache_retention_period: Edukiaren cache-a atxikitzeko epea
+        content_cache_retention_period: Urruneko edukiaren atxikipen-aldia
         custom_css: CSS pertsonalizatua
         mascot: Maskota pertsonalizatua (zaharkitua)
         media_cache_retention_period: Multimediaren cachea atxikitzeko epea
diff --git a/config/locales/simple_form.fa.yml b/config/locales/simple_form.fa.yml
index 03f18754519162..dd1c56e3bddaeb 100644
--- a/config/locales/simple_form.fa.yml
+++ b/config/locales/simple_form.fa.yml
@@ -75,13 +75,10 @@ fa:
           warn: نهفتن محتوای پالوده پشت هشداری که به عنوان پالایه اشاره می‌کند
       form_admin_settings:
         activity_api_enabled: تعداد بوق‌های منتشرهٔ محلی، کاربران فعال، و کاربران تازه در هر هفته
-        backups_retention_period: نگه داشتن بایگانی‌های کاربری برای روزهای مشخّص شده.
         bootstrap_timeline_accounts: سنجاق کردنThese accounts will be pinned to the top of new users' follow recommendations.
         closed_registrations_message: نمایش داده هنگام بسته بودن ثبت‌نام‌ها
-        content_cache_retention_period: همهٔ فرسته‌ها و تقویت‌ها از دیگر کارسازها پس از روزهای نشخّص حذف خواهند شد. ممکن است برخی فرسته‌ها قابل بازیابی نباشند. همهٔ نشانک‌ها، پسندها و تقویت‌ها نیز از دست خواهند رفت و قابل بازگشت نخواهند بود.
         custom_css: می‌توانیدروی نگارش وب ماستودون سبک‌های سفارشی اعمال کنید.
         mascot: نقش میانای وب پیش‌رفته را پایمال می‌کند.
-        media_cache_retention_period: اگر به مقدار مثبتی تنظیم شود، پرونده‌های رسانهٔ بارگرفته پس از روزهای مشخّص شده حذف خواهند شد و هنگام درخواست دوباره بارگرفته می‌شوند.
         peers_api_enabled: فهرستی از نام‌های دامنه‌ای که این کارساز در فدیورس با آن مواجه شده است. هیچ اطلاعاتی در مورد اینکه آیا شما با یک کارساز داده شده متعهد هستید، در اینجا گنجانده نشده است، فقط کارساز شما در مورد آن می‌داند. این توسط خدماتی استفاده می‌شود که آمار مربوط به فدراسیون را به معنای کلی جمع‌آوری می‌کنند.
         profile_directory: شاخهٔ نمایه، همهٔ کاربرانی که کشف‌پذیری را برگزیده‌اند سیاهه می‌کند.
         require_invite_text: زمانی که نام‌نویسی ها نیازمند تایید دستی است، متن «چرا می‌خواهید بپیوندید؟» بخش درخواست دعوت را به جای اختیاری، اجباری کنید
@@ -225,7 +222,6 @@ fa:
         backups_retention_period: دورهٔ نگه‌داری بایگانی کاربری
         bootstrap_timeline_accounts: پیشنهاد همیشگی این حساب‌ها به کاربران جدید
         closed_registrations_message: پیام سفارشی هنگام در دسترس نبودن ثبت‌نام‌ها
-        content_cache_retention_period: دورهٔ نگه‌داری انبارهٔ محتوا
         custom_css: سبک CSS سفارشی
         mascot: نشان سفارشی (قدیمی)
         media_cache_retention_period: دورهٔ نگه‌داری انبارهٔ رسانه
diff --git a/config/locales/simple_form.fi.yml b/config/locales/simple_form.fi.yml
index c3fbd437204c8f..c342dde33e8f39 100644
--- a/config/locales/simple_form.fi.yml
+++ b/config/locales/simple_form.fi.yml
@@ -77,13 +77,10 @@ fi:
           warn: Piilota suodatettu sisältö varoituksen taakse, jossa mainitaan suodattimen nimi
       form_admin_settings:
         activity_api_enabled: Paikallisesti julkaistujen julkaisujen, aktiivisten käyttäjien ja rekisteröitymisten viikoittainen määrä
-        backups_retention_period: Säilytä luodut arkistot määritetyn määrän päiviä.
         bootstrap_timeline_accounts: Nämä tilit kiinnitetään uusien käyttäjien seuraamissuosituslistojen alkuun.
         closed_registrations_message: Näkyy, kun rekisteröityminen on suljettu
-        content_cache_retention_period: Kaikki julkaisut ja tehostukset muilta palvelimilta poistetaan, kun määritelty määrä päiviä on kulunut. Osaa julkaisuista voi olla mahdoton palauttaa. Kaikki julkaisuihin liittyvät kirjanmerkit, suosikit ja tehostukset menetetään, eikä niitä voi palauttaa.
         custom_css: Voit käyttää mukautettuja tyylejä Mastodonin verkkoversiossa.
         mascot: Ohittaa kuvituksen edistyneessä selainkäyttöliittymässä.
-        media_cache_retention_period: Ladatut mediatiedostot poistetaan määritetyn määrän päiviä jälkeen, kun arvo on positiivinen ja ladataan uudelleen pyynnöstä.
         peers_api_enabled: Luettelo verkkotunnuksista, jotka tämä palvelin on kohdannut fediversumissa. Se ei kerro, oletko liitossa tietyn palvelimen kanssa, vaan että palvelimesi on ylipäätään tietoinen siitä. Tätä tietoa käytetään palveluissa, jotka keräävät tilastoja federoinnista yleisellä tasolla.
         profile_directory: Profiilihakemisto lueteloi kaikki käyttäjät, jotka ovat ilmoittaneet olevansa löydettävissä.
         require_invite_text: Kun rekisteröityminen vaatii manuaalisen hyväksynnän, tee ”Miksi haluat liittyä?” -tekstikentästä pakollinen vapaaehtoisen sijaan
@@ -243,7 +240,7 @@ fi:
         backups_retention_period: Käyttäjän arkiston säilytysaika
         bootstrap_timeline_accounts: Suosittele aina näitä tilejä uusille käyttäjille
         closed_registrations_message: Mukautettu viesti, kun rekisteröityminen ei ole saatavilla
-        content_cache_retention_period: Sisällön välimuistin säilytysaika
+        content_cache_retention_period: Etäsisällön säilytysaika
         custom_css: Mukautettu CSS
         mascot: Mukautettu maskotti (vanhentunut ominaisuus)
         media_cache_retention_period: Mediasisältövälimuistin säilytysaika
diff --git a/config/locales/simple_form.fo.yml b/config/locales/simple_form.fo.yml
index 599e79ea2f64ff..c7c00332253e87 100644
--- a/config/locales/simple_form.fo.yml
+++ b/config/locales/simple_form.fo.yml
@@ -77,13 +77,13 @@ fo:
           warn: Fjal filtreraða innihaldið aftan fyri eina ávaring, sum nevnir heitið á filtrinum
       form_admin_settings:
         activity_api_enabled: Tal av lokalt útgivnum postum, virknum brúkarum og nýggjum skrásetingum býtt vikuliga
-        backups_retention_period: Varðveit gjørd brúkarasøvn í ásetta talið av døgum.
+        backups_retention_period: Brúkarar hava møguleika at gera trygdaravrit av teirra postum, sum tey kunnu taka niður seinni. Tá hetta er sett til eitt virði størri enn 0, so verða hesi trygdaravrit strikaði av sær sjálvum frá tínar goymslu eftir ásetta talið av døgum.
         bootstrap_timeline_accounts: Hesar kontur verða festar ovast á listanum yvir brúkarar, sum tey nýggju verða mælt til at fylgja.
         closed_registrations_message: Víst tá stongt er fyri tilmeldingum
-        content_cache_retention_period: Postar frá øðrum ambætarum verða strikaðir eftir ásetta talið av døgum, tá hetta er sett til eitt positivt virði. Hetta kann møguliga ikki broytast.
+        content_cache_retention_period: Allir postar frá øðrum ambætarum (íroknað stimbranir og svar) verða strikaði eftir ásetta talið av døgum, óansæð hvussu lokalir brúkarar hava samvirkað við hesar postar. Hetta fevnir eisini um postar, sum lokalir brúkarar hava bókamerkt ella yndismerkt. Privatar umrøður millum brúkarar frá ymiskum ambætarum verða eisini burturmistar og ómøguligar at endurskapa. Brúk av hesi stillingini er einans hugsað til serligar støður og oyðileggur nógv, sum brúkarar vænta av einum vanligum ambætara.
         custom_css: Tú kanst seta títt egna snið upp í net-útgávuni av Mastodon.
         mascot: Skúgvar til viks myndprýðingina í framkomna vev-markamótinum.
-        media_cache_retention_period: Miðlafílur, sum eru tiknar niður, verða strikaðar eftir ásetta talið av døgum, tá hetta er sett til eitt positivt virði, og takast niður umaftur eftir ynski.
+        media_cache_retention_period: Miðlafílur frá postum, sum fjarbrúkarar hava gjørt, verða goymdir á tínum ambætara. Tá hetta er sett til eitt virði størri enn 0, so verða miðlafílurnar strikaðar eftir ásetta talið av døgum. Um miðladátur verða umbidnar eftir at tær eru strikaðar, verða tær tiknar innaftur á ambætaran, um keldutilfarið enn er tøkt. Vegna avmarkingar á hvussu ofta undanvísingarkort til leinki spyrja triðjapartsstøð, so verður mælt til at seta hetta virðið til í minsta lagi 14 dagar. Annars verða umbønir um dagføringar av undanvísingarkortum til leinki ikki gjørdar áðrenn hetta.
         peers_api_enabled: Ein listi við navnaøkjum, sum hesin ambætarin er komin framat í fediversinum. Ongar dátur eru tiknar við her um tú er sameind/ur við ein givnan ambætara, einans at tín ambætari veit um hann. Hetta verður brúkt av tænastum, sum gera hagtøl um sameining yvirhøvur.
         profile_directory: Vangaskráin listar allar brúkarar, sum hava valt at kunna uppdagast.
         require_invite_text: Tá tilmeldingar krevja serskilda góðkenning, set so "Hví vil tú vera við?" tekstateigin til at vera kravdan heldur enn valfrían
@@ -243,7 +243,7 @@ fo:
         backups_retention_period: Hvussu leingi verða brúkarasøvn goymd
         bootstrap_timeline_accounts: Mæl altíð nýggjum brúkarum at fylgja hesar kontur
         closed_registrations_message: Serskild boð, tá tað ikki er møguligt at tilmelda seg
-        content_cache_retention_period: Tíðarskeið, har innihaldgoymslan verður varðveitt
+        content_cache_retention_period: Tíðarskeið fyri varðveiðslu av fjartilfari
         custom_css: Serskilt CSS
         mascot: Serskildur maskottur (arvur)
         media_cache_retention_period: Tíðarskeið, har miðlagoymslur verða varðveittar
diff --git a/config/locales/simple_form.fr-CA.yml b/config/locales/simple_form.fr-CA.yml
index 823929c550e104..4b3f53e22233f7 100644
--- a/config/locales/simple_form.fr-CA.yml
+++ b/config/locales/simple_form.fr-CA.yml
@@ -77,13 +77,10 @@ fr-CA:
           warn: Cacher le contenu filtré derrière un avertissement mentionnant le nom du filtre
       form_admin_settings:
         activity_api_enabled: Nombre de messages publiés localement, de comptes actifs et de nouvelles inscriptions par tranche hebdomadaire
-        backups_retention_period: Conserve les archives générées par l'utilisateur selon le nombre de jours spécifié.
         bootstrap_timeline_accounts: Ces comptes seront épinglés en tête de liste des recommandations pour les nouveaux utilisateurs.
         closed_registrations_message: Affiché lorsque les inscriptions sont fermées
-        content_cache_retention_period: Les publications depuis d'autres serveurs seront supprimées après un nombre de jours spécifiés lorsque défini sur une valeur positive. Cela peut être irréversible.
         custom_css: Vous pouvez appliquer des styles personnalisés sur la version Web de Mastodon.
         mascot: Remplace l'illustration dans l'interface Web avancée.
-        media_cache_retention_period: Les fichiers multimédias téléchargés seront supprimés après le nombre de jours spécifiés lorsque la valeur est positive, et seront téléchargés à nouveau sur demande.
         peers_api_enabled: Une liste de noms de domaine que ce serveur a rencontrés dans le fédiverse. Aucune donnée indiquant si vous vous fédérez ou non avec un serveur particulier n'est incluse ici, seulement l'information que votre serveur connaît un autre serveur. Cette option est utilisée par les services qui collectent des statistiques sur la fédération en général.
         profile_directory: L'annuaire des profils répertorie tous les utilisateurs qui ont opté pour être découverts.
         require_invite_text: Lorsque les inscriptions nécessitent une approbation manuelle, rendre le texte de l’invitation "Pourquoi voulez-vous vous inscrire ?" obligatoire plutôt que facultatif
@@ -243,7 +240,6 @@ fr-CA:
         backups_retention_period: Période d'archivage utilisateur
         bootstrap_timeline_accounts: Toujours recommander ces comptes aux nouveaux utilisateurs
         closed_registrations_message: Message personnalisé lorsque les inscriptions ne sont pas disponibles
-        content_cache_retention_period: Durée de rétention du contenu dans le cache
         custom_css: CSS personnalisé
         mascot: Mascotte personnalisée (héritée)
         media_cache_retention_period: Durée de rétention des médias dans le cache
diff --git a/config/locales/simple_form.fr.yml b/config/locales/simple_form.fr.yml
index 4c8de1b20d4dc1..476f197f417b09 100644
--- a/config/locales/simple_form.fr.yml
+++ b/config/locales/simple_form.fr.yml
@@ -77,13 +77,10 @@ fr:
           warn: Cacher le contenu filtré derrière un avertissement mentionnant le nom du filtre
       form_admin_settings:
         activity_api_enabled: Nombre de messages publiés localement, de comptes actifs et de nouvelles inscriptions par tranche hebdomadaire
-        backups_retention_period: Conserve les archives générées par l'utilisateur selon le nombre de jours spécifié.
         bootstrap_timeline_accounts: Ces comptes seront épinglés en tête de liste des recommandations pour les nouveaux utilisateurs.
         closed_registrations_message: Affiché lorsque les inscriptions sont fermées
-        content_cache_retention_period: Lorsque la valeur est positive, les messages publiés depuis d'autres serveurs seront supprimés après le nombre de jours défini. Cela peut être irréversible.
         custom_css: Vous pouvez appliquer des styles personnalisés sur la version Web de Mastodon.
         mascot: Remplace l'illustration dans l'interface Web avancée.
-        media_cache_retention_period: Lorsque la valeur est positive, les fichiers multimédias téléchargés seront supprimés après le nombre de jours défini et pourront être à nouveau téléchargés sur demande.
         peers_api_enabled: Une liste de noms de domaine que ce serveur a rencontrés dans le fédiverse. Aucune donnée indiquant si vous vous fédérez ou non avec un serveur particulier n'est incluse ici, seulement l'information que votre serveur connaît un autre serveur. Cette option est utilisée par les services qui collectent des statistiques sur la fédération en général.
         profile_directory: L'annuaire des profils répertorie tous les comptes qui choisi d'être découvrables.
         require_invite_text: Lorsque les inscriptions nécessitent une approbation manuelle, rendre le texte de l’invitation "Pourquoi voulez-vous vous inscrire ?" obligatoire plutôt que facultatif
@@ -243,7 +240,6 @@ fr:
         backups_retention_period: Durée de rétention des archives utilisateur
         bootstrap_timeline_accounts: Toujours recommander ces comptes aux nouveaux⋅elles utilisateur⋅rice⋅s
         closed_registrations_message: Message personnalisé lorsque les inscriptions ne sont pas disponibles
-        content_cache_retention_period: Durée de rétention du contenu dans le cache
         custom_css: CSS personnalisé
         mascot: Mascotte personnalisée (héritée)
         media_cache_retention_period: Durée de rétention des médias dans le cache
diff --git a/config/locales/simple_form.fy.yml b/config/locales/simple_form.fy.yml
index e2e40f04dd53a9..fa1633c9016005 100644
--- a/config/locales/simple_form.fy.yml
+++ b/config/locales/simple_form.fy.yml
@@ -77,13 +77,10 @@ fy:
           warn: Ferstopje de filtere ynhâld efter in warskôging, mei de titel fan it filter as warskôgingstekst
       form_admin_settings:
         activity_api_enabled: Tal lokaal publisearre artikelen, aktive brûkers en nije registraasjes yn wyklikse werjefte
-        backups_retention_period: De oanmakke brûkersargiven foar it opjûne oantal dagen behâlde.
         bootstrap_timeline_accounts: Dizze accounts wurde boppe oan de oanrekommandaasjes oan nije brûkers toand. Meardere brûkersnammen troch komma’s skiede.
         closed_registrations_message: Werjûn wannear’t registraasje fan nije accounts útskeakele is
-        content_cache_retention_period: 'Berjochten fan oare servers wurde nei it opjûne oantal dagen fuortsmiten. Let op: Dit is definityf.'
         custom_css: Jo kinne oanpaste CSS tapasse op de webferzje fan dizze Mastodon-server.
         mascot: Oerskriuwt de yllustraasje yn de avansearre webomjouwing.
-        media_cache_retention_period: Mediabestannen dy’t fan oare servers download binne wurde nei it opjûne oantal dagen fuortsmiten en wurde op fersyk opnij download.
         peers_api_enabled: In list mei domeinnammen, dêr’t dizze server yn fediverse kontakt hân mei hat. Hjir wurdt gjin data dield, oft jo mei in bepaalde server federearrest, mar alinnich, dat jo server dat wit. Dit wurdt foar tsjinsten brûkt, dy’t statistiken oer federaasje yn algemiene sin sammelet.
         profile_directory: De brûkersgids befettet in list fan alle brûkers dy¥t derfoar keazen hawwe om ûntdekt wurde te kinnen.
         require_invite_text: Meitsje it ynfoljen fan ‘Wêrom wolle jo jo hjir registrearje?’ ferplicht yn stee fan opsjoneel, wannear’t registraasjes hânmjittich goedkard wurde moatte
@@ -243,7 +240,6 @@ fy:
         backups_retention_period: Bewartermyn brûkersargyf
         bootstrap_timeline_accounts: Accounts dy’t altyd oan nije brûkers oanrekommandearre wurde
         closed_registrations_message: Oanpast berjocht wannear registraasje útskeakele is
-        content_cache_retention_period: Bewartermyn berjochtebuffer
         custom_css: Oanpaste CSS
         mascot: Oanpaste maskotte (legacy)
         media_cache_retention_period: Bewartermyn mediabuffer
diff --git a/config/locales/simple_form.gd.yml b/config/locales/simple_form.gd.yml
index 168e7168ed5eef..8a36f73dc1de35 100644
--- a/config/locales/simple_form.gd.yml
+++ b/config/locales/simple_form.gd.yml
@@ -77,13 +77,10 @@ gd:
           warn: Falaich an t-susbaint chriathraichte air cùlaibh rabhaidh a dh’innseas tiotal na criathraige
       form_admin_settings:
         activity_api_enabled: Cunntasan nam postaichean a chaidh fhoillseachadh gu h-ionadail, nan cleachdaichean gnìomhach ’s nan clàraidhean ùra an am bucaidean seachdaineil
-        backups_retention_period: Cùm na tasg-lannan a chaidh a ghintinn dhan luchd-cleachdaidh rè an àireamh de làithean a shònraich thu.
         bootstrap_timeline_accounts: Thèid na cunntasan seo a phrìneachadh air bàrr nam molaidhean leantainn dhan luchd-cleachdaidh ùr.
         closed_registrations_message: Thèid seo a shealltainn nuair a bhios an clàradh dùinte
-        content_cache_retention_period: Thèid gach post is brosnachadh o fhrithealaichean eile a sguabadh às às dèidh an àireamh de làithean a shònraicheas tu. Dh’fhaoidte nach gabh a h-uile post aiseag. Thèid gach comharran-lìn, annsachd is brosnachadh co-cheangailte riutha air chall cuideachd agus cha ghabh sin a neo-dhèanamh.
         custom_css: "’S urrainn dhut stoidhlean gnàthaichte a chur an sàs air an tionndadh-lìn de Mhastodon."
         mascot: Tar-àithnidh seo an sgead-dhealbh san eadar-aghaidh-lìn adhartach.
-        media_cache_retention_period: Thèid na faidhlichean meadhain air an luchdadh a-nuas a sguabadh às às dèidh an àireamh de làithean a shònraich thu nuair a bhios luach dearbh air agus an ath-luachdadh nuair a thèid an iarraidh an uairsin.
         peers_api_enabled: Seo liosta de dh’ainmean àrainne ris an do thachair am frithealaiche seo sa cho-shaoghal. Chan eil dàta sam bith ’ga ghabhail a-staigh an-seo mu a bheil thu co-naisgte ri frithealaiche sònraichte gus nach eil ach dìreach gu bheil am frithealaiche agad eòlach air. Thèid seo a chleachdadh le seirbheisean a chruinnicheas stadastaireachd air a’ cho-nasgadh san fharsaingeachd.
         profile_directory: Seallaidh eòlaire nam pròifil liosta dhen luchd-cleachdaidh a dh’aontaich gun gabh an rùrachadh.
         require_invite_text: Nuair a bhios aontachadh a làimh riatanach dhan chlàradh, dèan an raon teacsa “Carson a bu mhiann leat ballrachd fhaighinn?” riatanach seach roghainneil
@@ -243,7 +240,6 @@ gd:
         backups_retention_period: Ùine glèidhidh aig tasg-lannan an luchd-cleachdaidh
         bootstrap_timeline_accounts: Mol na cunntasan seo do chleachdaichean ùra an-còmhnaidh
         closed_registrations_message: Teachdaireachd ghnàthaichte nuair nach eil clàradh ri fhaighinn
-        content_cache_retention_period: Ùine glèidhidh aig tasgadan na susbainte
         custom_css: CSS gnàthaichte
         mascot: Suaichnean gnàthaichte (dìleabach)
         media_cache_retention_period: Ùine glèidhidh aig tasgadan nam meadhanan
diff --git a/config/locales/simple_form.gl.yml b/config/locales/simple_form.gl.yml
index ffb12d31bcefce..bd7c850df479c4 100644
--- a/config/locales/simple_form.gl.yml
+++ b/config/locales/simple_form.gl.yml
@@ -77,13 +77,10 @@ gl:
           warn: Agochar o contido filtrado tras un aviso que conteña o nome do filtro
       form_admin_settings:
         activity_api_enabled: Conta do número de publicacións locais, usuarias activas, e novos rexistros en acumulados semanais
-        backups_retention_period: Gardar os arquivos xerados pola usuaria durante o número de días indicado.
         bootstrap_timeline_accounts: Estas contas aparecerán fixas na parte superior das recomendacións para as usuarias.
         closed_registrations_message: Móstrase cando non se admiten novas usuarias
-        content_cache_retention_period: As publicacións desde outros servidores serán eliminadas despois do número de días indicados ao poñer un valor positivo. É unha acción irreversible.
         custom_css: Podes aplicar deseños personalizados na versión web de Mastodon.
         mascot: Sobrescribe a ilustración na interface web avanzada.
-        media_cache_retention_period: Os ficheiros multimedia descargados serán eliminados despois do número de días indicado ao establecer un valor positivo, e voltos a descargar baixo petición.
         peers_api_enabled: Unha lista dos nomes de dominio que este servidor atopou no fediverso. Non se inclúen aquí datos acerca de se estás a federar con eles ou non, só que o teu servidor os recoñeceu. Ten utilidade para servizos que recollen estatísticas acerca da federación nun amplo senso.
         profile_directory: O directorio de perfís inclúe a tódalas usuarias que optaron por ser descubribles.
         require_invite_text: Cando os rexistros requiren aprobación manual, facer que o texto "Por que te queres rexistrar?" do convite sexa obrigatorio en lugar de optativo
@@ -243,7 +240,6 @@ gl:
         backups_retention_period: Período de retención do arquivo da usuaria
         bootstrap_timeline_accounts: Recomendar sempre estas contas ás novas usuarias
         closed_registrations_message: Mensaxe personalizada para cando o rexistro está pechado
-        content_cache_retention_period: Período de retención da caché do contido
         custom_css: CSS personalizado
         mascot: Mascota propia (herdado)
         media_cache_retention_period: Período de retención da caché multimedia
diff --git a/config/locales/simple_form.he.yml b/config/locales/simple_form.he.yml
index 4f2611666afb21..b07ed8b8b5f6e6 100644
--- a/config/locales/simple_form.he.yml
+++ b/config/locales/simple_form.he.yml
@@ -77,13 +77,10 @@ he:
           warn: הסתר את התוכן המסונן מאחורי אזהרה עם כותרת המסנן
       form_admin_settings:
         activity_api_enabled: מספר ההודעות שפורסמו מקומית, משתמשים פעילים, והרשמות חדשות בדליים שבועיים
-        backups_retention_period: לשמור ארכיון משתמש שנוצר למשך מספר הימים המצוין.
         bootstrap_timeline_accounts: חשבונות אלו יוצמדו לראש רשימת המלצות המעקב של משתמשים חדשים.
         closed_registrations_message: להציג כאשר הרשמות חדשות אינן מאופשרות
-        content_cache_retention_period: הודעות משרתים אחרים ימחקו אחרי מספר הימים המצוין כאשר מצוין מספר חיובי. פעולה זו אינה הפיכה.
         custom_css: ניתן לבחור ערכות סגנון אישיות בגרסת הדפדפן של מסטודון.
         mascot: בחירת ציור למנשק הווב המתקדם.
-        media_cache_retention_period: קבצי מדיה שהורדו ימחקו אחרי מספר הימים שיצוינו אם נבחר מספר חיובי, או-אז יורדו שוב מחדש בהתאם לצורך.
         peers_api_enabled: רשימת השרתים ששרת זה פגש בפדיוורס. לא כולל מידע לגבי קשר ישיר עם שרת נתון, אלא רק שידוע לשרת זה על קיומו. מידע זה משמש שירותים האוספים סטטיסטיקות כלליות על הפדרציה.
         profile_directory: ספריית הפרופילים מציגה ברשימה את כל המשתמשים שביקשו להיות ניתנים לגילוי.
         require_invite_text: כאשר הרשמות דורשות אישור ידני, הפיכת טקסט ה"מדוע את/ה רוצה להצטרף" להכרחי במקום אופציונלי
@@ -243,7 +240,7 @@ he:
         backups_retention_period: תקופת השמירה של ארכיון המשתמש
         bootstrap_timeline_accounts: המלצה על חשבונות אלה למשתמשים חדשים
         closed_registrations_message: הודעה מיוחדת כשההרשמה לא מאופשרת
-        content_cache_retention_period: תקופת שמירת מטמון תוכן
+        content_cache_retention_period: תקופת השמירה על תוכן חיצוני
         custom_css: CSS בהתאמה אישית
         mascot: סמל השרת (ישן)
         media_cache_retention_period: תקופת שמירת מטמון מדיה
diff --git a/config/locales/simple_form.hu.yml b/config/locales/simple_form.hu.yml
index 242c86327422cc..e2040cafd8e290 100644
--- a/config/locales/simple_form.hu.yml
+++ b/config/locales/simple_form.hu.yml
@@ -77,13 +77,13 @@ hu:
           warn: A szűrt tartalom a szűrő címét említő figyelmeztetés mögé rejtése
       form_admin_settings:
         activity_api_enabled: Helyi bejegyzések, aktív felhasználók és új regisztrációk száma heti bontásban
-        backups_retention_period: Az előállított felhasználói archívumok megtartása a megadott napokig.
+        backups_retention_period: A felhasználók archívumokat állíthatnak elő a bejegyzéseikből, hogy később letöltsék azokat. Ha pozitív értékre van állítva, akkor a megadott számú nap után automatikusan törölve lesznek a tárhelyedről.
         bootstrap_timeline_accounts: Ezek a fiókok ki lesznek tűzve az új felhasználók követési javaslatainak élére.
         closed_registrations_message: Akkor jelenik meg, amikor a regisztráció le van zárva
-        content_cache_retention_period: A más kiszolgálókról származó bejegyzések megadott számú nap után törölve lesznek, ha pozitív értékre van állítva. Ez lehet, hogy nem fordítható vissza.
+        content_cache_retention_period: Minden más kiszolgálóról származó bejegyzés (megtolásokkal és válaszokkal együtt) törölve lesz a megadott számú nap elteltével, függetlenül a helyi felhasználók ezekkel a bejegyzésekkel történő interakcióitól. Ebben azok a bejegyzések is benne vannak, melyeket a helyi felhasználó könyvjelzőzött vagy kedvencnek jelölt. A különböző kiszolgálók felhasználói közötti privát üzenetek is el fognak veszni visszaállíthatatlanul. Ennek a beállításnak a használata különleges felhasználási esetekre javasolt, mert számos felhasználói elvárás fog eltörni, ha általános céllal használják.
         custom_css: A Mastodon webes verziójában használhatsz egyéni stílusokat.
         mascot: Felülbírálja a speciális webes felületen található illusztrációt.
-        media_cache_retention_period: A letöltött médiafájlok megadott számú nap után törölve lesznek, ha pozitív értékre van állítva, és igény szerint újból le lesznek töltve.
+        media_cache_retention_period: A távoli felhasználók bejegyzéseinek médiatartalmait a kiszolgálód gyorsítótárazza. Ha pozitív értékre állítják, ezek a médiatartalmak a megadott számú nap után törölve lesznek. Ha a médiát újra lekérik, miután törlődött, újra le fogjuk tölteni, ha az eredeti még elérhető. A hivatkozások előnézeti kártyáinak harmadik fél weboldalai felé történő hivatkozásaira alkalmazott megkötései miatt javasolt, hogy ezt az értéket legalább 14 napra állítsuk, ellenkező esetben a hivatkozások előnézeti kártyái szükség esetén nem fognak tudni frissülni ezen idő előtt.
         peers_api_enabled: Azon domainek listája, melyekkel ez a kiszolgáló találkozott a fediverzumban. Nem csatolunk adatot arról, hogy föderált kapcsolatban vagy-e az adott kiszolgálóval, csak arról, hogy a kiszolgálód tud a másikról. Ezt olyan szolgáltatások használják, melyek általában a föderációról készítenek statisztikákat.
         profile_directory: A profilok jegyzéke minden olyan felhasználót felsorol, akik engedélyezték a felfedezhetőségüket.
         require_invite_text: Ha a regisztrációhoz manuális jóváhagyásra van szükség, akkor a „Miért akarsz csatlakozni?” válasz kitöltése legyen kötelező, és ne opcionális
@@ -243,7 +243,7 @@ hu:
         backups_retention_period: Felhasználói archívum megtartási időszaka
         bootstrap_timeline_accounts: Mindig javasoljuk ezeket a fiókokat az új felhasználók számára
         closed_registrations_message: A feliratkozáskor megjelenő egyéni üzenet nem érhető el
-        content_cache_retention_period: Tartalom-gyorsítótár megtartási időszaka
+        content_cache_retention_period: Távoli tartalmak megtartási időszaka
         custom_css: Egyéni CSS
         mascot: Egyéni kabala (örökölt)
         media_cache_retention_period: Média-gyorsítótár megtartási időszaka
diff --git a/config/locales/simple_form.id.yml b/config/locales/simple_form.id.yml
index 8b9e74406a7a2f..856f312eda4765 100644
--- a/config/locales/simple_form.id.yml
+++ b/config/locales/simple_form.id.yml
@@ -63,13 +63,10 @@ id:
           hide: Sembunyikan konten yang disaring, seperti itu tidak ada
           warn: Sembunyikan konten yang disaring di belakang sebuah peringatan menyebutkan judul saringan
       form_admin_settings:
-        backups_retention_period: Simpan arsip pengguna yang dibuat untuk jumlah hari yang ditetapkan.
         bootstrap_timeline_accounts: Akun ini akan disematkan di atas rekomendasi ikut pengguna baru.
         closed_registrations_message: Ditampilkan ketika pendaftaran ditutup
-        content_cache_retention_period: Kiriman dari server lain akan dihapus setelah jumlah hari yang ditentukan jika nilai positif ditetapkan. Ini mungkin tidak dapat diurungkan.
         custom_css: Anda dapat menerapkan gaya kustom di versi web Mastodon.
         mascot: Menimpa ilustrasi di antarmuka web tingkat lanjut.
-        media_cache_retention_period: File media yang diunduh akan dihapus setelah beberapa hari yang ditentukan ketika ditetapkan ke nilai yang positif, dan diunduh ulang pada permintaan.
         profile_directory: Direktori profil mendaftarka semua pengguna yang ingin untuk dapat ditemukan.
         require_invite_text: Ketika pendaftaran membutuhkan persetujuan manual, buat masukan teks "Mengapa Anda ingin bergabung?" dibutuhkan daripada opsional
         site_contact_email: Bagaimana orang dapat menghubungi Anda untuk kebutuhan hukum atau dukungan.
@@ -216,7 +213,6 @@ id:
         backups_retention_period: Rentang retensi arsip pengguna
         bootstrap_timeline_accounts: Selalu rekomendasikan akun ini ke pengguna baru
         closed_registrations_message: Pesan kustom ketika pendaftaran tidak tersedia
-        content_cache_retention_period: Rentang retensi tembolok konten
         custom_css: CSS kustom
         mascot: Maskot kustom (lawas)
         media_cache_retention_period: Rentang retensi tembolok media
diff --git a/config/locales/simple_form.ie.yml b/config/locales/simple_form.ie.yml
index e142617fcc520a..e482bd828c899b 100644
--- a/config/locales/simple_form.ie.yml
+++ b/config/locales/simple_form.ie.yml
@@ -77,13 +77,10 @@ ie:
           warn: Celar li contenete filtrat detra un avise mentionant li titul del filtre
       form_admin_settings:
         activity_api_enabled: Númeres de postas publicat localmen, activ usatores, e nov adhesiones in periodes semanal
-        backups_retention_period: Mantener usator-generat archives por li specificat quantitá de dies.
         bootstrap_timeline_accounts: Ti-ci contos va esser pinglat al parte superiori del recomandationes por nov usatores.
         closed_registrations_message: Monstrat quande adhesiones es cludet
-        content_cache_retention_period: Omni postas e boosts de altri servitores va esser deletet pos li specificat quantitá de dies. Quelc postas fórsan va esser ínrestaurabil. Omni pertinent marcatores, favorites e boosts anc va esser perdit e ínpossibil a restaurar.
         custom_css: On posse aplicar customisat stiles al web-version de Mastodon.
         mascot: Substitue li ilustration in li avansat interfacie web.
-        media_cache_retention_period: Descargat files de media va esser deletet pos li specificat quantitá de dies quande li valore es positiv, e re-descargat sur demanda.
         peers_api_enabled: Un liste de nómines de dominia queles ti-ci servitor ha incontrat in li fediverse. Ci null data es includet pri ca tu confedera con un cert servitor o ne; it indica solmen que tui servitor conosse it. Usat per servicies colectent general statisticas pri federation.
         profile_directory: Li profilarium monstra omni usatores volent esser decovribil.
         require_invite_text: Quande registrationes besona manual aprobation, fa que li textu "Pro quo tu vole registrar te?" es obligatori vice facultativ
@@ -243,7 +240,6 @@ ie:
         backups_retention_period: Periode de retener archives de usator
         bootstrap_timeline_accounts: Sempre recomandar ti-ci contos a nov usatores
         closed_registrations_message: Customisat missage quande registration ne disponibil
-        content_cache_retention_period: Periode de retention por cachat contenete
         custom_css: Custom CSS
         mascot: Customisat mascot (hereditat)
         media_cache_retention_period: Periode de retention por cachat medie
diff --git a/config/locales/simple_form.io.yml b/config/locales/simple_form.io.yml
index 57a2aeb64d4f51..81f298249ee2a2 100644
--- a/config/locales/simple_form.io.yml
+++ b/config/locales/simple_form.io.yml
@@ -75,13 +75,10 @@ io:
           warn: Celez filtrita kontenajo dop avert quo montras titulo di filtrilo
       form_admin_settings:
         activity_api_enabled: Quanto de lokale publikigita posti, aktiva uzanti e nova registri, donita semanope
-        backups_retention_period: Retenez igita uzantoarkivi por la diiquanto.
         bootstrap_timeline_accounts: Ca konti pinglagesos a super sequorekomendi di nova uzanti.
         closed_registrations_message: Montresas kande registradi klozesas
-        content_cache_retention_period: Omna posti e repeti de altra servili efacesos pos la specigita nombro de dii. Kelka posti forsan ne esos restaurebla. Omna relata libromarki, favoriziti e repeti anke esos perdita e neposible restaurota.
         custom_css: Vu povas pozar kustumizita staili en retverso di Mastodon.
         mascot: Remplas montreso en avanca retintervizajo.
-        media_cache_retention_period: Deschargita mediifaili efacesos pos la diiquanto kande fixesas a positiva nombro, e rideschargesas irgatempe.
         peers_api_enabled: Listo di domeni quin ca servilo trovis en la fediverso. Nula informo inkluzesas hike pri ka vu federas kun partikulara servilo, nur ke vua servilo savas pri lo. Co es uzata da enti qui kolektas statistiki pri federeso generale.
         profile_directory: La profilcheflisto montras omna uzanti quo voluntale volas esar deskovrebla.
         require_invite_text: Kande registradi bezonas manuala aprobo, ol kauzigas "Por quo vu volas juntas?" textoenpozo esar obliganta
@@ -239,7 +236,6 @@ io:
         backups_retention_period: Uzantoarkivretendurtempo
         bootstrap_timeline_accounts: Sempre rekomendez ca konti a nova uzanti
         closed_registrations_message: Kustumizita mesajo kande registradi ne esas disponebla
-        content_cache_retention_period: Kontenajmemorajretendurtempo
         custom_css: Kustumizita CSS
         mascot: Kustumizita reprezentimajo (oldo)
         media_cache_retention_period: Mediimemorajretendurtempo
diff --git a/config/locales/simple_form.is.yml b/config/locales/simple_form.is.yml
index cae9bbed5fa7cc..a2c437a3256830 100644
--- a/config/locales/simple_form.is.yml
+++ b/config/locales/simple_form.is.yml
@@ -77,13 +77,11 @@ is:
           warn: Fela síað efni á bakvið aðvörun sem tekur fram titil síunnar
       form_admin_settings:
         activity_api_enabled: Fjöldi staðværra stöðufærslna, virkra notenda og nýskráninga í vikulegum skömmtum
-        backups_retention_period: Halda safni notandans í tiltekinn fjölda daga.
+        backups_retention_period: Notendur hafa kost á að útbúa safnskrár með færslunum sínum til að sækja svo síðar. Þegar þetta er stillt á jákvætt gildi, verður þessum safnskrám eytt sjáfkrafa eftir þeim tiltekna fjölda daga.
         bootstrap_timeline_accounts: Þessir notendaaðgangar verða festir efst í meðmælum til nýrra notenda um að fylgjast með þeim.
         closed_registrations_message: Birtist þegar lokað er á nýskráningar
-        content_cache_retention_period: Færslum af öðrum netþjónum verður eytt eftir tiltekinn fjölda daga þegar þetta er jákvætt gildi. Þetta gæti verið óafturkallanleg aðgerð.
         custom_css: Þú getur virkjað sérsniðna stíla í vefútgáfu Mastodon.
         mascot: Þetta tekyr yfir myndskreytinguna í ítarlega vefviðmótinu.
-        media_cache_retention_period: Sóttu myndefni verður eytt eftir tiltekinn fjölda daga þegar þetta er jákvætt gildi og síðan sótt aftur eftir þörfum.
         peers_api_enabled: Listi yfir þau lénaheiti sem þessi netþjónn hefur rekist á í skýjasambandinu. Engin gögn eru hér sem gefa til kynna hvort þú sért í sambandi við tiltekinn netþjón, bara að netþjónninn þinn viti um hann. Þetta er notað af þjónustum sem safna tölfræði um skýjasambönd á almennan hátt.
         profile_directory: Notendamappan telur upp alla þá notendur sem hafa valið að vera uppgötvanlegir.
         require_invite_text: Þegar nýskráningar krefjast handvirks samþykkis, þá skal gera textann í “Hvers vegna viltu taka þátt?” að kröfu en ekki valkvæðan
@@ -243,7 +241,7 @@ is:
         backups_retention_period: Tímalengd sem safni notandans er haldið eftir
         bootstrap_timeline_accounts: Alltaf mæla með þessum notendaaðgöngum fyrir nýja notendur
         closed_registrations_message: Sérsniðin skilaboð þegar ekki er hægt að nýskrá
-        content_cache_retention_period: Tímalengd sem haldið er í biðminni
+        content_cache_retention_period: Tímabil sem á að geyma fjartengt efni
         custom_css: Sérsniðið CSS
         mascot: Sérsniðið gæludýr (eldra)
         media_cache_retention_period: Tímalengd sem myndefni haldið
diff --git a/config/locales/simple_form.it.yml b/config/locales/simple_form.it.yml
index bf294a48c660b6..5c0e6aa4e829f6 100644
--- a/config/locales/simple_form.it.yml
+++ b/config/locales/simple_form.it.yml
@@ -77,13 +77,13 @@ it:
           warn: Nascondi il contenuto filtrato e mostra invece un avviso, citando il titolo del filtro
       form_admin_settings:
         activity_api_enabled: Conteggi di post pubblicati localmente, utenti attivi e nuove registrazioni in gruppi settimanali
-        backups_retention_period: Conserva gli archivi utente generati per il numero di giorni specificato.
+        backups_retention_period: Gli utenti hanno la possibilità di generare archivi dei propri post da scaricare successivamente. Se impostati su un valore positivo, questi archivi verranno automaticamente eliminati dallo spazio di archiviazione dopo il numero di giorni specificato.
         bootstrap_timeline_accounts: Questi account verranno aggiunti in cima ai consigli da seguire dei nuovi utenti.
         closed_registrations_message: Visualizzato alla chiusura delle iscrizioni
-        content_cache_retention_period: I post da altri server verranno eliminati dopo il numero di giorni specificato se impostato su un valore positivo. Questo potrebbe essere irreversibile.
+        content_cache_retention_period: Tutti i post da altri server (inclusi booster e risposte) verranno eliminati dopo il numero specificato di giorni, senza tener conto di eventuali interazioni con gli utenti locali con tali post. Questo include i post in cui un utente locale ha contrassegnato come segnalibri o preferiti. Anche le menzioni private tra utenti di diverse istanze andranno perse e impossibile da ripristinare. L'uso di questa impostazione è inteso per casi di scopo speciale e rompe molte aspettative dell'utente quando implementato per uso generale.
         custom_css: È possibile applicare stili personalizzati sulla versione web di Mastodon.
         mascot: Sostituisce l'illustrazione nell'interfaccia web avanzata.
-        media_cache_retention_period: I file multimediali scaricati verranno eliminati dopo il numero di giorni specificato se impostati su un valore positivo e scaricati nuovamente su richiesta.
+        media_cache_retention_period: I file multimediali da post fatti da utenti remoti sono memorizzati nella cache sul tuo server. Quando impostato a un valore positivo, i media verranno eliminati dopo il numero specificato di giorni. Se i dati multimediali sono richiesti dopo che sono stati eliminati, saranno nuovamente scaricati, se il contenuto sorgente è ancora disponibile. A causa di restrizioni su quanto spesso link anteprima carte sondaggio siti di terze parti, si consiglia di impostare questo valore ad almeno 14 giorni, o le schede di anteprima link non saranno aggiornate su richiesta prima di quel tempo.
         peers_api_enabled: Un elenco di nomi di dominio che questo server ha incontrato nel fediverse. Qui non sono inclusi dati sul fatto se si federano con un dato server, solo che il server ne è a conoscenza. Questo viene utilizzato dai servizi che raccolgono statistiche sulla federazione in senso generale.
         profile_directory: La directory del profilo elenca tutti gli utenti che hanno acconsentito ad essere individuabili.
         require_invite_text: 'Quando le iscrizioni richiedono l''approvazione manuale, rendi la domanda: "Perché vuoi unirti?" obbligatoria anziché facoltativa'
@@ -243,7 +243,7 @@ it:
         backups_retention_period: Periodo di conservazione dell'archivio utente
         bootstrap_timeline_accounts: Consiglia sempre questi account ai nuovi utenti
         closed_registrations_message: Messaggio personalizzato quando le iscrizioni non sono disponibili
-        content_cache_retention_period: Periodo di conservazione della cache dei contenuti
+        content_cache_retention_period: Periodo di ritenzione del contenuto remoto
         custom_css: Personalizza CSS
         mascot: Personalizza mascotte (legacy)
         media_cache_retention_period: Periodo di conservazione della cache multimediale
diff --git a/config/locales/simple_form.ja.yml b/config/locales/simple_form.ja.yml
index 81615c134420e9..5e35bc14c04a4b 100644
--- a/config/locales/simple_form.ja.yml
+++ b/config/locales/simple_form.ja.yml
@@ -77,13 +77,10 @@ ja:
           warn: フィルタに一致した投稿を非表示にし、フィルタのタイトルを含む警告を表示します
       form_admin_settings:
         activity_api_enabled: 週単位でローカルで公開された投稿数、アクティブユーザー数、新規登録者数を表示します
-        backups_retention_period: 生成されたユーザーのアーカイブを指定した日数の間保持します。
         bootstrap_timeline_accounts: これらのアカウントは、新しいユーザー向けのおすすめユーザーの一番上にピン留めされます。
         closed_registrations_message: アカウント作成を停止している時に表示されます
-        content_cache_retention_period: 指定した日数が経過した他のサーバーの投稿とブーストを削除します。削除された投稿は再取得できない場合があります。削除された投稿についたブックマークやお気に入り、ブーストも失われ、元に戻せません。
         custom_css: ウェブ版のMastodonでカスタムスタイルを適用できます。
         mascot: 上級者向けWebインターフェースのイラストを上書きします。
-        media_cache_retention_period: 正の値に設定されている場合、ダウンロードされたメディアファイルは指定された日数の後に削除され、リクエストに応じて再ダウンロードされます。
         peers_api_enabled: このサーバーが Fediverse で遭遇したドメイン名のリストです。このサーバーが知っているだけで、特定のサーバーと連合しているかのデータは含まれません。これは一般的に Fediverse に関する統計情報を収集するサービスによって使用されます。
         profile_directory: ディレクトリには、掲載する設定をしたすべてのユーザーが一覧表示されます。
         require_invite_text: アカウント登録が承認制の場合、登録の際の申請事由の入力を必須にします
@@ -243,7 +240,6 @@ ja:
         backups_retention_period: ユーザーアーカイブの保持期間
         bootstrap_timeline_accounts: おすすめユーザーに常に表示するアカウント
         closed_registrations_message: アカウント作成を停止している時のカスタムメッセージ
-        content_cache_retention_period: コンテンツキャッシュの保持期間
         custom_css: カスタムCSS
         mascot: カスタムマスコット（レガシー）
         media_cache_retention_period: メディアキャッシュの保持期間
diff --git a/config/locales/simple_form.ko.yml b/config/locales/simple_form.ko.yml
index 790bcd061be15d..6ab4e03222dd1d 100644
--- a/config/locales/simple_form.ko.yml
+++ b/config/locales/simple_form.ko.yml
@@ -77,13 +77,10 @@ ko:
           warn: 필터 제목을 언급하는 경고 뒤에 걸러진 내용을 숨기기
       form_admin_settings:
         activity_api_enabled: 주별 로컬에 게시된 글, 활성 사용자 및 새로운 가입자 수
-        backups_retention_period: 생성된 사용자 아카이브를 며칠동안 저장할 지.
         bootstrap_timeline_accounts: 이 계정들은 팔로우 추천 목록 상단에 고정됩니다.
         closed_registrations_message: 새 가입을 차단했을 때 표시됩니다
-        content_cache_retention_period: 다른 서버의 게시물과 부스트들은 지정한 일수가 지나면 삭제될 것입니다. 몇몇 게시물들은 복구가 불가능할 것입니다. 관련된 북마크, 좋아요, 부스트 또한 잃어버릴 것이며 취소도 할 수 없습니다.
         custom_css: 사용자 지정 스타일을 웹 버전의 마스토돈에 지정할 수 있습니다.
         mascot: 고급 웹 인터페이스의 그림을 대체합니다.
-        media_cache_retention_period: 양수로 설정된 경우 다운로드된 미디어 파일들은 지정된 일수가 지나면 삭제될 것이고 필요할 때 다시 다운로드 될 것입니다.
         peers_api_enabled: 이 서버가 연합우주에서 만났던 서버들에 대한 도메인 네임의 목록입니다. 해당 서버와 어떤 연합을 했는지에 대한 정보는 전혀 포함되지 않고, 단순히 그 서버를 알고 있는지에 대한 것입니다. 이것은 일반적으로 연합에 대한 통계를 수집할 때 사용됩니다.
         profile_directory: 프로필 책자는 발견되기를 희망하는 모든 사람들의 목록을 나열합니다.
         require_invite_text: 가입이 수동 승인을 필요로 할 때, "왜 가입하려고 하나요?" 항목을 선택사항으로 두는 것보다는 필수로 두는 것이 낫습니다
@@ -243,7 +240,6 @@ ko:
         backups_retention_period: 사용자 아카이브 유지 기한
         bootstrap_timeline_accounts: 새로운 사용자들에게 추천할 계정들
         closed_registrations_message: 가입이 불가능 할 때의 사용자 지정 메시지
-        content_cache_retention_period: 콘텐츠 캐시 유지 기한
         custom_css: 사용자 정의 CSS
         mascot: 사용자 정의 마스코트 (legacy)
         media_cache_retention_period: 미디어 캐시 유지 기한
diff --git a/config/locales/simple_form.ku.yml b/config/locales/simple_form.ku.yml
index aa8501bf2477c6..0c4f8721313213 100644
--- a/config/locales/simple_form.ku.yml
+++ b/config/locales/simple_form.ku.yml
@@ -65,13 +65,10 @@ ku:
           hide: Naveroka parzûnkirî bi tevahî veşêre, mîna ku ew tune be tevbigere
           warn: Naveroka parzûnkirî li pişt hişyariyek ku sernavê parzûnê qal dike veşêre
       form_admin_settings:
-        backups_retention_period: Arşîvên bikarhênerên çêkirî ji bo rojên diyarkirî tomar bike.
         bootstrap_timeline_accounts: Ev ajimêr wê di pêşnîyarên şopandina bikarhênerên nû de werin derzîkirin.
         closed_registrations_message: Dema ku tomarkirin girtî bin têne xuyakirin
-        content_cache_retention_period: Şandiyên ji rajekarên din wê piştî çend rojên diyarkirî dema ku li ser nirxek erênî were danîn werin jêbirin. Dibe ku ev bê veger be.
         custom_css: Tu dikarî awayên kesane li ser guhertoya malperê ya Mastodon bicîh bikî.
         mascot: Îlustrasyona navrûyê webê yê pêşketî bêbandor dike.
-        media_cache_retention_period: Pelên medyayê yên daxistî wê piştî çend rojên diyarkirî dema ku li ser nirxek erênî were danîn werin jêbirin, û li gorî daxwazê ​​ji nû ve werin daxistin.
         profile_directory: Pelrêça profîlê hemû bikarhênerên keşfbûnê hilbijartine lîste dike.
         require_invite_text: Gava ku tomarkirin pêdiviya pejirandina destan dike, Têketina nivîsê "Tu çima dixwazî beşdar bibî?" Bike sereke ji devla vebijêrkî
         site_contact_email: Mirov dikarin ji bo pirsên qanûnî yan jî yên piştgiriyê çawa xwe digihînin te.
@@ -218,7 +215,6 @@ ku:
         backups_retention_period: Serdema tomarkirina arşîva bikarhêner
         bootstrap_timeline_accounts: Van ajimêran ji bikarhênerên nû re pêşniyar bike
         closed_registrations_message: Peyama kesane dema ku tomarkirin peyda nebin
-        content_cache_retention_period: Serdema tomarkirina bîrdanka naverokê
         custom_css: CSS a kesanekirî
         mascot: Mascot a kesanekirî (legacy)
         media_cache_retention_period: Serdema tomarkirina bîrdanka medyayê
diff --git a/config/locales/simple_form.lad.yml b/config/locales/simple_form.lad.yml
index 75113be18b6669..cef58e46016011 100644
--- a/config/locales/simple_form.lad.yml
+++ b/config/locales/simple_form.lad.yml
@@ -77,13 +77,10 @@ lad:
           warn: Eskonde el kontenido filtrado detras de una avertensya enmentando el titolo del filtro
       form_admin_settings:
         activity_api_enabled: Numero de publikasyones publikadas lokalmente, utilizadores activos i enrejistrasyones muevas kada semana
-        backups_retention_period: Manten las dosyas de utilizador djeneradas durante el numero de diyas espesifikado.
         bootstrap_timeline_accounts: Estos kuentos apareseran en la parte superior de las rekomendasiones de los muevos utilizadores.
         closed_registrations_message: Amostrado kuando las enrejistrasyones estan serrados
-        content_cache_retention_period: Las publikasyones de otros sirvidores se supremiran dempues del numero espesifikado de diyas kuando se establezka una valuta pozitiva. Esto puede ser irreversivle.
         custom_css: Puedes aplikar estilos personalizados a la version web de Mastodon.
         mascot: Reemplaza la ilustrasyon en la enterfaz web avanzada.
-        media_cache_retention_period: Las dosyas de multimedia abashadas se supremiran dempues del numero espesifikado de diyas kuando se establezka una valuta pozitiva, i se reabasharan basho demanda.
         peers_api_enabled: Una lista de nombres de domeno ke este sirvidor tiene topado en el Fediverso. Aki no se inkluye dingun dato sovre si federas kon un sirvidor determinado, solo ke tu sirvidor lo konese. Esto es utilizado por los servisyos ke rekopilan estatistikas sovre la federasyon en un senso djeneral.
         profile_directory: El katalogo de profiles lista a todos los utilizadores ke tienen optado por ke sus kuento pueda ser deskuvierto.
         require_invite_text: Kuando las enrejistrasyones rekieren achetasyon manuala, faze obligatoria la entrada de teksto "Por ke keres unirte?" en lugar de ser opsyonal
@@ -243,7 +240,6 @@ lad:
         backups_retention_period: Periodo de retensyon de la dosya de utilizador
         bootstrap_timeline_accounts: Rekomenda siempre estos kuentos a muevos utilizadores
         closed_registrations_message: Mesaj personalizado kuando las enrejistrasyones no estan desponivles
-        content_cache_retention_period: Periodo de retensyon de kashe de kontenido
         custom_css: CSS personalizado
         mascot: Maskota personalizada (legado)
         media_cache_retention_period: Periodo de retensyon de kashe multimedia
diff --git a/config/locales/simple_form.lt.yml b/config/locales/simple_form.lt.yml
index 5431ea1b100877..00485fc8736898 100644
--- a/config/locales/simple_form.lt.yml
+++ b/config/locales/simple_form.lt.yml
@@ -74,7 +74,6 @@ lt:
           warn: Slėpti filtruojamą turinį po įspėjimu, paminint filtro pavadinimą
       form_admin_settings:
         activity_api_enabled: Vietinių paskelbtų įrašų, aktyvių naudotojų ir naujų registracijų skaičiai kas savaitę
-        backups_retention_period: Laikyti sukurtus naudotojų archyvus nurodytą dienų skaičių.
         peers_api_enabled: Domenų pavadinimų sąrašas, su kuriais šis serveris susidūrė fediverse. Čia nėra duomenų apie tai, ar tu bendrauji su tam tikru serveriu, tik apie tai, kad tavo serveris apie jį žino. Tai naudojama tarnybose, kurios renka federacijos statistiką bendrąja prasme.
         site_contact_email: Kaip žmonės gali su tavimi susisiekti teisiniais ar pagalbos užklausimais.
         site_contact_username: Kaip žmonės gali tave pasiekti Mastodon.
@@ -146,7 +145,6 @@ lt:
       form_admin_settings:
         activity_api_enabled: Skelbti suvestinį statistiką apie naudotojų veiklą per API
         bootstrap_timeline_accounts: Visada rekomenduoti šias paskyras naujiems naudotojams
-        content_cache_retention_period: Turinio talpyklos išlaikymo laikotarpis
         custom_css: Pasirinktinis CSS
         mascot: Pasirinktinis talismanas (pasenęs)
         registrations_mode: Kas gali užsiregistruoti
diff --git a/config/locales/simple_form.lv.yml b/config/locales/simple_form.lv.yml
index 002761065d5de2..711484b642d70f 100644
--- a/config/locales/simple_form.lv.yml
+++ b/config/locales/simple_form.lv.yml
@@ -77,13 +77,10 @@ lv:
           warn: Paslēp filtrēto saturu aiz brīdinājuma, kurā minēts filtra nosaukums
       form_admin_settings:
         activity_api_enabled: Vietēji publicēto ziņu, aktīvo lietotāju un jauno reģistrāciju skaits nedēļas kopās
-        backups_retention_period: Saglabā ģenerētos lietotāju arhīvus norādīto dienu skaitā.
         bootstrap_timeline_accounts: Šie konti tiks piesprausti jauno lietotāju ieteikumu augšdaļā.
         closed_registrations_message: Tiek rādīts, kad reģistrēšanās ir slēgta
-        content_cache_retention_period: Ziņas no citiem serveriem tiks dzēstas pēc norādītā dienu skaita, ja ir iestatīta pozitīva vērtība. Tas var būt neatgriezeniski.
         custom_css: Vari lietot pielāgotus stilus Mastodon tīmekļa versijā.
         mascot: Ignorē ilustrāciju uzlabotajā tīmekļa saskarnē.
-        media_cache_retention_period: Lejupielādētie multivides faili tiks dzēsti pēc norādītā dienu skaita, kad tie būs iestatīti uz pozitīvu vērtību, un pēc pieprasījuma tiks lejupielādēti atkārtoti.
         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'
@@ -242,7 +239,6 @@ lv:
         backups_retention_period: Lietotāja arhīva glabāšanas periods
         bootstrap_timeline_accounts: Vienmēr iesaki šos kontus jaunajiem lietotājiem
         closed_registrations_message: Pielāgots ziņojums, ja reģistrēšanās nav pieejama
-        content_cache_retention_period: Satura arhīva glabāšanas periods
         custom_css: Pielāgots CSS
         mascot: Pielāgots talismans (mantots)
         media_cache_retention_period: Multivides kešatmiņas saglabāšanas periods
diff --git a/config/locales/simple_form.ms.yml b/config/locales/simple_form.ms.yml
index 9e9931cc3e0547..ae375149eb582f 100644
--- a/config/locales/simple_form.ms.yml
+++ b/config/locales/simple_form.ms.yml
@@ -75,13 +75,10 @@ ms:
           warn: Sembunyikan kandungan yang ditapis di sebalik amaran yang menyebut tajuk penapis
       form_admin_settings:
         activity_api_enabled: Kiraan siaran tempatan yang diterbitkan, pengguna aktif dan pendaftaran baharu dalam baldi mingguan
-        backups_retention_period: Simpan arkib pengguna yang dijana untuk bilangan hari yang ditentukan.
         bootstrap_timeline_accounts: Akaun ini akan disematkan pada bahagian atas cadangan ikutan pengguna baharu.
         closed_registrations_message: Dipaparkan semasa pendaftaran ditutup
-        content_cache_retention_period: Semua pos dan rangsangan daripada server lain akan dipadamkan selepas bilangan hari yang ditentukan. Sesetengah siaran mungkin tidak boleh dipulihkan. Semua penanda halaman, kegemaran dan rangsangan yang berkaitan juga akan hilang dan mustahil untuk dibuat asal.
         custom_css: Anda boleh menggunakan gaya tersuai pada versi web Mastodon.
         mascot: Mengatasi ilustrasi dalam antara muka web lanjutan.
-        media_cache_retention_period: Fail media yang dimuat turun akan dipadamkan selepas bilangan hari yang ditetapkan apabila ditetapkan kepada nilai positif dan dimuat turun semula atas permintaan.
         peers_api_enabled: Senarai nama domain yang pernah ditemui oleh server ini dalam fediverse. Tiada data disertakan di sini tentang sama ada anda bersekutu dengan server tertentu, cuma server anda mengetahuinya. Ini digunakan oleh perkhidmatan yang mengumpul statistik mengenai persekutuan dalam pengertian umum.
         profile_directory: Direktori profil menyenaraikan semua pengguna yang telah mengikut serta untuk ditemui.
         require_invite_text: Apabila pendaftaran memerlukan kelulusan manual, buat "Mengapa anda mahu menyertai?" input teks wajib dan bukannya pilihan
@@ -240,7 +237,6 @@ ms:
         backups_retention_period: Tempoh pengekalan arkib pengguna
         bootstrap_timeline_accounts: Sentiasa mengesyorkan akaun ini kepada pengguna baharu
         closed_registrations_message: Mesej tersuai apabila pendaftaran tidak tersedia
-        content_cache_retention_period: Tempoh pengekalan cache kandungan
         custom_css: CSS tersuai
         mascot: Maskot tersuai (warisan)
         media_cache_retention_period: Tempoh pengekalan cache media
diff --git a/config/locales/simple_form.my.yml b/config/locales/simple_form.my.yml
index 4f8a39782a5ae2..20c862ab27a0cd 100644
--- a/config/locales/simple_form.my.yml
+++ b/config/locales/simple_form.my.yml
@@ -75,13 +75,10 @@ my:
           warn: စစ်ထုတ်မှုခေါင်းစဉ်ကိုဖော်ပြသည့်သတိပေးချက်နောက်တွင် စစ်ထုတ်ထားသောအကြောင်းအရာကို ဖျောက်ထားပါ
       form_admin_settings:
         activity_api_enabled: အပတ်စဉ် စာရင်းများတွင် ဒေသတွင်းတင်ထားသောပို့စ်များ၊ လက်ရှိအသုံးပြုသူများနှင့် စာရင်းသွင်းမှုအသစ်များ
-        backups_retention_period: သတ်မှတ်ထားသော ရက်အရေအတွက်အလိုက် အသုံးပြုသူမှတ်တမ်းများကို သိမ်းဆည်းပါ။
         bootstrap_timeline_accounts: ဤအကောင့်များကို အသုံးပြုသူအသစ်များ၏ စောင့်ကြည့်မှု အကြံပြုချက်များ၏ထိပ်ဆုံးတွင် ပင်ချိတ်ထားပါမည်။
         closed_registrations_message: အကောင့်ဖွင့်ခြင်းများကို ပိတ်ထားသည့်အခါတွင် ပြသထားသည်
-        content_cache_retention_period: သတ်မှတ်ထားသောရက်များပြီးနောက် အခြားဆာဗာများမှ ပို့စ်များကို ဖျက်လိုက်ပါမည်။ ပြန်လည်ပြင်ဆင်၍မရပါ။
         custom_css: Mastodon ဝဘ်ဗားရှင်းတွင် စိတ်ကြိုက်စတိုင်များကို အသုံးပြုနိုင်ပါသည်။
         mascot: အဆင့်မြင့် ဝဘ်ပုံစံတွင်တွင် ရုပ်ပုံဖြင့်ဖော်ပြထားသည်။
-        media_cache_retention_period: သတ်မှတ်ထားသောရက်များပြီးနောက် ဒေါင်းလုဒ်လုပ်ထားသော မီဒီယာဖိုင်များကို ဖျက်လိုက်ပါမည်။ တောင်းဆိုပါက ပြန်လည်ဒေါင်းလုဒ် လုပ်ခွင့်ရှိသည်။
         peers_api_enabled: ဤဆာဗာမှတွေ့ရသော ဖက်ဒီနယ်ပယ်ပေါင်းစုံရှိ ဒိုမိန်းအမည်များစာရင်း။ ဖက်ဒီနယ်ပယ်များမှာ သင်အသုံးပြုနေသည့်ဆာဗာနှင့် ပေါင်းစပ်ခြင်းရှိသည်ဖြစ်စေ၊ မရှိသည်ဖြစ်စေ ဤနေရာတွင် အချက်အလက်များကို မပြသထားပါ။ ယေဘုယျအားဖြင့် ဖက်ဒရယ်ဆိုင်ရာ စာရင်းအင်းများစုဆောင်းသည့် ဝန်ဆောင်မှုကိုသာ အသုံးပြုထားသည်။
         profile_directory: ပရိုဖိုင်လမ်းညွှန်တွင် ရှာဖွေ‌နိုင်သည့်အသုံးပြုသူအားလုံးကို စာရင်းပြုစုထားသည်။
         require_invite_text: အကောင့်ဖွင့်ရာတွင် လူကိုယ်တိုင်ခွင့်ပြုချက်လိုအပ်သောအခါ “ဘာကြောင့်ပါဝင်ချင်သလဲ” ဟုလုပ်ပါ။ စိတ်ကြိုက်ရွေးချယ်မည့်အစား စာသားထည့်သွင်းရန်မဖြစ်မနေထည့်သွင်းပါ။
@@ -240,7 +237,6 @@ my:
         backups_retention_period: အသုံးပြုသူ၏ မှတ်တမ်းကာလ
         bootstrap_timeline_accounts: ဤအကောင့်များကို အသုံးပြုသူအသစ်များအတွက် အကြံပြုပေးပါ
         closed_registrations_message: အကောင့်ဖွင့်ခြင်းများ မရတော့သောအခါ စိတ်ကြိုက်မက်ဆေ့ချ်ပို့ခြင်း
-        content_cache_retention_period: အကြောင်းအရာ ကက်ရှ်ထိန်းသိမ်းသည့်ကာလ
         custom_css: စိတ်ကြိုက်ပြုလုပ်ထားသော CSS
         mascot: စိတ်ကြိုက်ပြုလုပ်ထားသော mascot (legacy)
         media_cache_retention_period: မီဒီယာကက်ရှ် ထိန်းသိမ်းသည့်ကာလ
diff --git a/config/locales/simple_form.nl.yml b/config/locales/simple_form.nl.yml
index 2f2107b13cec5f..3b100531966413 100644
--- a/config/locales/simple_form.nl.yml
+++ b/config/locales/simple_form.nl.yml
@@ -77,13 +77,13 @@ nl:
           warn: Verberg de gefilterde inhoud achter een waarschuwing, met de titel van het filter als waarschuwingstekst
       form_admin_settings:
         activity_api_enabled: Aantallen lokaal gepubliceerde berichten, actieve gebruikers en nieuwe registraties per week
-        backups_retention_period: De aangemaakte gebruikersarchieven voor het opgegeven aantal dagen behouden.
+        backups_retention_period: Gebruikers hebben de mogelijkheid om archieven van hun berichten te genereren om later te downloaden. Indien ingesteld op een positieve waarde, worden deze archieven automatisch verwijderd uit jouw opslag na het opgegeven aantal dagen.
         bootstrap_timeline_accounts: Deze accounts worden bovenaan de aanbevelingen aan nieuwe gebruikers getoond. Meerdere gebruikersnamen met komma's scheiden.
         closed_registrations_message: Weergegeven wanneer registratie van nieuwe accounts is uitgeschakeld
-        content_cache_retention_period: Alle berichten van andere servers worden na het opgegeven aantal dagen verwijderd. Deze berichten kunnen daarna hoogstwaarschijnlijk niet meer worden hersteld. Alle gerelateerde bladwijzers, favorieten en boosts worden eveneens onomkeerbaar verwijderd.
+        content_cache_retention_period: Alle berichten van andere servers (inclusief boosts en reacties) worden verwijderd na het opgegeven aantal dagen, ongeacht enige lokale gebruikersinteractie met die berichten. Dit betreft ook berichten die een lokale gebruiker aan diens bladwijzers heeft toegevoegd of als favoriet heeft gemarkeerd. Privéberichten tussen gebruikers van verschillende servers gaan ook verloren en zijn onmogelijk te herstellen. Het gebruik van deze instelling is bedoeld voor servers die een speciaal doel dienen en overtreedt veel gebruikersverwachtingen wanneer deze voor algemeen gebruik wordt geïmplementeerd.
         custom_css: Je kunt aangepaste CSS toepassen op de webversie van deze Mastodon-server.
         mascot: Overschrijft de illustratie in de geavanceerde webomgeving.
-        media_cache_retention_period: Mediabestanden die van andere servers zijn gedownload worden na het opgegeven aantal dagen verwijderd en worden op verzoek opnieuw gedownload.
+        media_cache_retention_period: Mediabestanden van berichten van externe gebruikers worden op jouw server in de cache opgeslagen. Indien ingesteld op een positieve waarde, worden media verwijderd na het opgegeven aantal dagen. Als de mediagegevens worden opgevraagd nadat ze zijn verwijderd, worden ze opnieuw gedownload wanneer de originele inhoud nog steeds beschikbaar is. Vanwege beperkingen op hoe vaak linkvoorbeelden sites van derden raadplegen, wordt aanbevolen om deze waarde in te stellen op ten minste 14 dagen. Anders worden linkvoorbeelden niet op aanvraag bijgewerkt.
         peers_api_enabled: Een lijst met domeinnamen die deze server heeft aangetroffen in de fediverse. Er zijn hier geen gegevens inbegrepen over de vraag of je verbonden bent met een bepaalde server, alleen dat je server er van weet. Dit wordt gebruikt door diensten die statistieken over de federatie in algemene zin verzamelen.
         profile_directory: De gebruikersgids bevat een lijst van alle gebruikers die ervoor gekozen hebben om ontdekt te kunnen worden.
         require_invite_text: Maak het invullen van "Waarom wil je je hier registreren?" verplicht in plaats van optioneel, wanneer registraties handmatig moeten worden goedgekeurd
@@ -243,7 +243,7 @@ nl:
         backups_retention_period: Bewaartermijn gebruikersarchief
         bootstrap_timeline_accounts: Accounts die altijd aan nieuwe gebruikers worden aanbevolen
         closed_registrations_message: Aangepast bericht wanneer registratie is uitgeschakeld
-        content_cache_retention_period: Bewaartermijn berichtencache
+        content_cache_retention_period: Bewaartermijn voor externe inhoud
         custom_css: Aangepaste CSS
         mascot: Aangepaste mascotte (legacy)
         media_cache_retention_period: Bewaartermijn mediacache
diff --git a/config/locales/simple_form.nn.yml b/config/locales/simple_form.nn.yml
index a9f5f609fafb14..51dce245d2f62b 100644
--- a/config/locales/simple_form.nn.yml
+++ b/config/locales/simple_form.nn.yml
@@ -77,13 +77,13 @@ nn:
           warn: Skjul det filtrerte innhaldet bak ei åtvaring som nemner tittelen på filteret
       form_admin_settings:
         activity_api_enabled: Tal på lokale innlegg, aktive brukarar og nyregistreringar kvar veke
-        backups_retention_period: Ta vare på genererte brukararkiv i angitt antal dagar.
+        backups_retention_period: Brukarar har moglegheit til å generere arkiv av sine innlegg for å laste ned seinare. Når sett til ein positiv verdi, blir desse arkiva automatisk sletta frå lagringa etter eit gitt antal dagar.
         bootstrap_timeline_accounts: Desse kontoane vil bli festa øverst på fylgjaranbefalingane til nye brukarar.
         closed_registrations_message: Vist når det er stengt for registrering
-        content_cache_retention_period: Innlegg frå andre tenarar vil bli sletta etter det angitte talet på dagar når det er sett til ein positiv verdi. Dette kan vera irreversibelt.
+        content_cache_retention_period: Alle innlegg frå andre serverar (inkludert boostar og svar) vil bli sletta etter dei gitte antal dagar, uten hensyn til lokale brukarinteraksjonar med desse innlegga. Dette inkluderer innlegg der ein lokal brukar har merka det som bokmerker eller som favorittar. Òg private nemningar mellom brukarar frå ulike førekomstar vil gå tapt og vere umogleg å gjenskape. Bruk av denne innstillinga er rekna på spesielle førekomstar og bryt mange brukarforventingar når dette blir tatt i generell bruk.
         custom_css: Du kan bruka eigendefinerte stilar på nettversjonen av Mastodon.
         mascot: Overstyrer illustrasjonen i det avanserte webgrensesnittet.
-        media_cache_retention_period: Mediafiler som har blitt lasta ned vil bli sletta etter det angitte talet på dagar når det er sett til ein positiv verdi, og lasta ned på nytt ved etterspørsel.
+        media_cache_retention_period: Mediafiler frå innlegg laga av eksterne brukarar blir bufra på serveren din. Når sett til ein positiv verdi, slettast media etter eit gitt antal dagar. Viss mediedata blir førespurt etter det er sletta, vil dei bli lasta ned på nytt viss kjelda sitt innhald framleis er tilgjengeleg. På grunn av restriksjonar på kor ofte lenkeførehandsvisningskort lastar tredjepart-nettstadar, rådast det til å setje denne verdien til minst 14 dagar, eller at førehandsvisningskort ikkje blir oppdatert på førespurnad før det tidspunktet.
         peers_api_enabled: Ei liste over domenenamn denne tenaren har møtt på i allheimen. Det står ingenting om tenaren din samhandlar med ein annan tenar, berre om tenaren din veit om den andre. Dette blir brukt av tenester som samlar statistikk om føderering i det heile.
         profile_directory: Profilkatalogen viser alle brukarar som har valt å kunne bli oppdaga.
         require_invite_text: Når registrering krev manuell godkjenning, lyt du gjera tekstfeltet "Kvifor vil du bli med?" obligatorisk i staden for valfritt
@@ -243,7 +243,7 @@ nn:
         backups_retention_period: Arkiveringsperiode for brukararkiv
         bootstrap_timeline_accounts: Tilrå alltid desse kontoane for nye brukarar
         closed_registrations_message: Eigendefinert melding når registrering ikkje er mogleg
-        content_cache_retention_period: Oppbevaringsperiode for innhaldsbuffer
+        content_cache_retention_period: Oppbevaringstid for eksternt innhald
         custom_css: Egendefinert CSS
         mascot: Eigendefinert maskot (eldre funksjon)
         media_cache_retention_period: Oppbevaringsperiode for mediebuffer
diff --git a/config/locales/simple_form.no.yml b/config/locales/simple_form.no.yml
index a1050c9f91ed82..de3788aa42d256 100644
--- a/config/locales/simple_form.no.yml
+++ b/config/locales/simple_form.no.yml
@@ -77,13 +77,10 @@
           warn: Skjul det filtrerte innholdet bak et varsel som omtaler filterets tittel
       form_admin_settings:
         activity_api_enabled: Teller med lokale publiserte innlegg, aktive brukere og nye registreringer i ukentlige bøtter
-        backups_retention_period: Behold genererte brukerarkiv i det angitte antall dager.
         bootstrap_timeline_accounts: Disse kontoene vil bli festet til toppen av nye brukeres følge-anbefalinger.
         closed_registrations_message: Vises når det er stengt for registrering
-        content_cache_retention_period: Innlegg fra andre tjenere vil slettes etter det angitte antall dager når det er satt til en positiv verdi. Dette kan være irreversibelt.
         custom_css: Du kan bruke egendefinerte stiler på nettversjonen av Mastodon.
         mascot: Overstyrer illustrasjonen i det avanserte webgrensesnittet.
-        media_cache_retention_period: Mediafiler som lastes ned vil bli slettet etter det angitte antall dager når det settes til en positiv verdi, og blir lastet ned på nytt ved behov.
         peers_api_enabled: En liste over domenenavn denne serveren har oppstått i fødiverset. Det finnes ikke data om du føderer med en gitt server, for akkurat det serveren din vet om. Dette brukes av tjenester som i all hovedsak innhenter føderasjonsstatistikk.
         profile_directory: Profilkatalogen viser alle brukere som har valgt å kunne bli oppdaget.
         require_invite_text: Når registreringer krever manuell godkjenning, må du gjøre «Hvorfor vil du bli med?»-tekstinput obligatorisk i stedet for valgfritt
@@ -242,7 +239,6 @@
         backups_retention_period: Brukers oppbevaringsperiode for arkiv
         bootstrap_timeline_accounts: Anbefaler alltid disse kontoene til nye brukere
         closed_registrations_message: Egendefinert melding når registrering ikke er tilgjengelig
-        content_cache_retention_period: Oppbevaringsperiode for innholdsbuffer
         custom_css: Egendefinert CSS
         mascot: Egendefinert maskot (legacy)
         media_cache_retention_period: Oppbevaringsperiode for mediebuffer
diff --git a/config/locales/simple_form.pl.yml b/config/locales/simple_form.pl.yml
index 3a1c619f70652d..5c0c6402879552 100644
--- a/config/locales/simple_form.pl.yml
+++ b/config/locales/simple_form.pl.yml
@@ -77,13 +77,13 @@ pl:
           warn: Ukryj filtrowaną zawartość za ostrzeżeniem wskazującym tytuł filtra
       form_admin_settings:
         activity_api_enabled: Liczby opublikowanych lokalnych postów, aktywnych użytkowników i nowych rejestracji w tygodniowych przedziałach
-        backups_retention_period: Zachowaj wygenerowane archiwa użytkownika przez określoną liczbę dni.
+        backups_retention_period: Użytkownicy mogą generować archiwa wpisów do późniejszego pobrania. Jeżeli ta wartość jest dodatnia, te archiwa zostaną automatycznie usunięte z twojego serwera po danej liczbie dni.
         bootstrap_timeline_accounts: Te konta zostaną przypięte na górze rekomendacji obserwacji nowych użytkowników.
         closed_registrations_message: Wyświetlane po zamknięciu rejestracji
-        content_cache_retention_period: Posty z innych serwerów zostaną usunięte po określonej liczbie dni, kiedy liczba jest ustawiona na wartość dodatnią. Może to być nieodwracalne.
+        content_cache_retention_period: Wszystkie wpisy z innych serwerów (w tym podbicia i odpowiedzi) zostaną usunięte po danej liczbie dni, bez względu na interakcje z nimi twoich użytkowników. Zawierają się w tym wpisy, które twoi użytkownicy dodali do zakładek lub ulubionych. Prywatne wzmianki od innych instancji zostaną utracone i będą nieprzywracalne. To ustawienie jest przeznaczone dla instancji zastosowania specjalnego i jest niezgodne z wieloma oczekiwaniami użytkowników.
         custom_css: Możesz zastosować niestandardowe style w internetowej wersji Mastodon.
         mascot: Nadpisuje ilustrację w zaawansowanym interfejsie internetowym.
-        media_cache_retention_period: Pobrane pliki multimedialne zostaną usunięte po określonej liczbie dni po ustawieniu na wartość dodatnią i ponownie pobrane na żądanie.
+        media_cache_retention_period: Media z wpisów od obcych użytkowników są cache'owane na twoim serwerze. Kiedy dana wartość jest dodatnia, media te będą usunięte po tylu dniach. Jeżeli usunięte media zostaną potem zażądane, oryginał zostanie ponownie pobrany (o ile jest dalej dostępny). Z powodu ograniczeń dot. częstotliwości z jaką karty podglądu linków dopytują się o dane od stron trzecich, zalecana wartość to min. 14 dni, bo karty podglądu linków nie będą wcześniej odświeżane na żądane.
         peers_api_enabled: Lista nazw domen, z którymi ten serwer spotkał się w fediverse. Nie są tu zawarte żadne dane o tym, czy użytkownik dokonuje federacji z danym serwerem, a jedynie, że jego serwer o tym wie. Jest to wykorzystywane przez serwisy, które zbierają statystyki dotyczące federacji w ogólnym sensie.
         profile_directory: Katalog profili zawiera listę wszystkich użytkowników, którzy zgodzili się na bycie znalezionymi.
         require_invite_text: Kiedy rejestracje wymagają ręcznego zatwierdzenia, ustaw pole "Dlaczego chcesz dołączyć?" jako obowiązkowe, a nie opcjonalne
@@ -243,7 +243,7 @@ pl:
         backups_retention_period: Okres przechowywania archiwum użytkownika
         bootstrap_timeline_accounts: Zawsze rekomenduj te konta nowym użytkownikom
         closed_registrations_message: Niestandardowa wiadomość, gdy rejestracje nie są dostępne
-        content_cache_retention_period: Okres przechowywania pamięci podręcznej
+        content_cache_retention_period: Okres zachowywania zdalnych treści
         custom_css: Niestandardowy CSS
         mascot: Własna ikona
         media_cache_retention_period: Okres przechowywania pamięci podręcznej
diff --git a/config/locales/simple_form.pt-BR.yml b/config/locales/simple_form.pt-BR.yml
index c3eea9f1182d08..f68eef8a6327b6 100644
--- a/config/locales/simple_form.pt-BR.yml
+++ b/config/locales/simple_form.pt-BR.yml
@@ -77,13 +77,10 @@ pt-BR:
           warn: Ocultar o conteúdo filtrado por trás de um aviso mencionando o título do filtro
       form_admin_settings:
         activity_api_enabled: Contagem de publicações locais, usuários ativos e novos usuários semanais
-        backups_retention_period: Manter os arquivos de usuário gerados pelo número de dias especificados.
         bootstrap_timeline_accounts: Estas contas serão fixadas no topo das recomendações de novos usuários para seguir.
         closed_registrations_message: Exibido quando as inscrições estiverem fechadas
-        content_cache_retention_period: Postagens de outros servidores serão excluídas após o número de dias especificados, quando definido com um valor positivo. Isso pode ser irreversível.
         custom_css: Você pode aplicar estilos personalizados na versão da web do Mastodon.
         mascot: Substitui a ilustração na interface web avançada.
-        media_cache_retention_period: Os arquivos de mídia baixados serão excluídos após o número especificado de dias, quando definido para um valor positivo, e baixados novamente na demanda.
         peers_api_enabled: Uma lista de nomes de domínio que este servidor encontrou no "fediverse". Nenhum dado é incluído aqui sobre se você concorda com os padroes operacionais de um determinado servidor, apenas que o seu servidor sabe disso. Esta ferramenta é utilizado por serviços que recolhem estatísticas sob as normas da federação (grupo de empresas que concordam sob paramentros operacionais específicos), em termos gerais.
         profile_directory: O diretório de perfis lista todos os usuários que optaram por permitir que suas contas sejam descobertas.
         require_invite_text: 'Quando o cadastro de novas contas exigir aprovação manual, tornar obrigatório, ao invés de opcional, o texto de solicitação de convite: "Por que você deseja ingressar nessa comunidade?"'
@@ -243,7 +240,6 @@ pt-BR:
         backups_retention_period: Período de retenção do arquivo de usuário
         bootstrap_timeline_accounts: Sempre recomendar essas contas para novos usuários
         closed_registrations_message: Mensagem personalizada quando inscrições não estão disponíveis
-        content_cache_retention_period: Período de retenção do cachê de conteúdo
         custom_css: CSS personalizável
         mascot: Mascote personalizado (legado)
         media_cache_retention_period: Período de retenção do cachê de mídia
diff --git a/config/locales/simple_form.pt-PT.yml b/config/locales/simple_form.pt-PT.yml
index a84f97f88d7e6d..3292c48289aca1 100644
--- a/config/locales/simple_form.pt-PT.yml
+++ b/config/locales/simple_form.pt-PT.yml
@@ -77,13 +77,10 @@ pt-PT:
           warn: Ocultar o conteúdo filtrado por trás de um aviso mencionando o título do filtro
       form_admin_settings:
         activity_api_enabled: Contagem, em blocos semanais, de publicações locais, utilizadores ativos e novos registos
-        backups_retention_period: Manter os ficheiros gerados pelos utilizadores durante um número concreto de dias.
         bootstrap_timeline_accounts: Estas contas serão destacadas no topo das recomendações aos novos utilizadores.
         closed_registrations_message: Apresentado quando as inscrições estiverem encerradas
-        content_cache_retention_period: Publicações de outros servidores serão apagadas decorrido o número de dias especificado, se estiver definido um valor positivo. Isso pode ser irreversível.
         custom_css: Pode aplicar estilos personalizados na versão web do Mastodon.
         mascot: Sobrepõe-se à ilustração na interface web avançada.
-        media_cache_retention_period: Os ficheiros de media descarregados serão apagados decorrido o número de dias especificado, quando definido com um valor positivo, e descarregados novamente quando solicitados.
         peers_api_enabled: Uma lista de nomes de domínio que este servidor encontrou no fediverso. Nenhum dado é incluído aqui sobre se você federa com um determinado servidor, apenas que o seu servidor o conhece. Este serviço é utilizado por serviços que recolhem estatísticas na federação, em termos gerais.
         profile_directory: O diretório de perfis lista todos os utilizadores que optaram por ter a sua conta a ser sugerida a outros.
         require_invite_text: Quando as incrições exigirem aprovação manual, faça o texto "Por que se quer juntar a nós?" da solicitação de convite ser obrigatório, em vez de opcional
@@ -243,7 +240,6 @@ pt-PT:
         backups_retention_period: Período de retenção de arquivos de utilizador
         bootstrap_timeline_accounts: Recomendar sempre estas contas para novos utilizadores
         closed_registrations_message: Mensagem personalizada quando as inscrições não estiverem disponíveis
-        content_cache_retention_period: Período de retenção de conteúdo em cache
         custom_css: CSS personalizado
         mascot: Mascote personalizada (legado)
         media_cache_retention_period: Período de retenção de ficheiros de media em cache
diff --git a/config/locales/simple_form.ru.yml b/config/locales/simple_form.ru.yml
index 192a2f96df1f6d..a050b5a529fce1 100644
--- a/config/locales/simple_form.ru.yml
+++ b/config/locales/simple_form.ru.yml
@@ -75,13 +75,10 @@ ru:
           warn: Скрыть отфильтрованный контент за предупреждением с указанием названия фильтра
       form_admin_settings:
         activity_api_enabled: Подсчёт количества локальных постов, активных пользователей и новых регистраций на еженедельной основе
-        backups_retention_period: Сохранять сгенерированные пользовательские архивы для указанного количества дней.
         bootstrap_timeline_accounts: Эти аккаунты будут рекомендованы для подписки новым пользователям.
         closed_registrations_message: Отображается, когда регистрация закрыта
-        content_cache_retention_period: Записи с других серверов будут удалены после указанного количества дней, когда установлено положительное значение. Это может быть необратимо.
         custom_css: Вы можете применять пользовательские стили в веб-версии Mastodon.
         mascot: Заменяет иллюстрацию в расширенном веб-интерфейсе.
-        media_cache_retention_period: Скачанные медиа-файлы будут удалены после указанного количества дней, когда установлено положительное значение и повторно загружены по требованию.
         peers_api_enabled: Список доменных имен, с которыми сервер столкнулся в fediverse. Здесь нет данных о том, федерировались ли вы с данным сервером, только что ваш сервер знает об этом. Это используется службами, которые собирают статистику по федерации в общем смысле.
         profile_directory: В каталоге профилей перечислены все пользователи, которые согласились быть доступными для обнаружения.
         require_invite_text: Когда регистрация требует ручного одобрения, сделайте текстовый ввод "Почему вы хотите присоединиться?" обязательным, а не опциональным
@@ -240,7 +237,6 @@ ru:
         backups_retention_period: Период хранения архива пользователя
         bootstrap_timeline_accounts: Всегда рекомендовать эти учетные записи новым пользователям
         closed_registrations_message: Сообщение, когда регистрация недоступна
-        content_cache_retention_period: Период хранения кэша содержимого
         custom_css: Пользовательский CSS
         mascot: Пользовательский маскот (устаревшее)
         media_cache_retention_period: Период хранения кэша медиафайлов
diff --git a/config/locales/simple_form.sco.yml b/config/locales/simple_form.sco.yml
index 7eeaca375a8868..f9dc4ba29118a4 100644
--- a/config/locales/simple_form.sco.yml
+++ b/config/locales/simple_form.sco.yml
@@ -63,13 +63,10 @@ sco:
           hide: Totally plank the filtert content, ackin as if it didnae exist
           warn: Plank the filtert content ahin a warnin menshiein the filter's title
       form_admin_settings:
-        backups_retention_period: Haud generatit uiser archives fir the specified nummer o days.
         bootstrap_timeline_accounts: Thir accoonts wull get preenit tae the tap o new uisers' follae recommendations.
         closed_registrations_message: Displayit whan sign-ups is shut
-        content_cache_retention_period: Posts fae ither servers wull get deletit efter the specified nummer o days whan set tae a positive value. This wull mibbie be irreversible.
         custom_css: Ye kin pit custom styles on tae the web version o Mastodon.
         mascot: Owerrides the illustration in the advanced web interface.
-        media_cache_retention_period: Doonloadit media files wull be deletit efter the specified nummer o days whan set tae a positive value, an re-doonloadit on demand.
         profile_directory: The profile directory lists aw uisers thit hae opted-in fir tae be discoverable.
         require_invite_text: Whan sign-ups require approval bi haun, mak the “Hou dae ye want tae jyne?” text input mandatory raither nor optional
         site_contact_email: Hou fowk kin reach ye fir legal or support inquiries.
@@ -216,7 +213,6 @@ sco:
         backups_retention_period: Uiser archive retention period
         bootstrap_timeline_accounts: Aye recommend thir accoonts tae new uisers
         closed_registrations_message: Custom message whan sign-ups urnae available
-        content_cache_retention_period: Content cache retention period
         custom_css: Custom CSS
         mascot: Custom mascot (legacy)
         media_cache_retention_period: Media cache retention period
diff --git a/config/locales/simple_form.sl.yml b/config/locales/simple_form.sl.yml
index cbf0570187117f..a4abb737c0ecc5 100644
--- a/config/locales/simple_form.sl.yml
+++ b/config/locales/simple_form.sl.yml
@@ -77,13 +77,10 @@ sl:
           warn: Skrij filtrirano vsebino za opozorilom, ki pomenja naslov filtra
       form_admin_settings:
         activity_api_enabled: Številke krajevno objavljenih objav, dejavnih uporabnikov in novih registracij na tedenskih seznamih
-        backups_retention_period: Hani tvorjene arhive uporabnikov navedeno število dni.
         bootstrap_timeline_accounts: Ti računi bodo pripeti na vrh priporočenih sledenj za nove uporabnike.
         closed_registrations_message: Prikazano, ko so registracije zaprte
-        content_cache_retention_period: Objave z drugih strežnikov bodo izbrisane po navedenem številu dni, če je vrednost pozitivna. Ta dejanja lahko nepovratna.
         custom_css: Spletni različici Mastodona lahko uveljavite sloge po meri.
         mascot: Preglasi ilustracijo v naprednem spletnem vmesniku.
-        media_cache_retention_period: Prenesene predstavnostne datoteke bodo izbrisane po navedenem številu dni, če je vrednost pozitivna, in ponovno prenesene na zahtevo.
         peers_api_enabled: Seznam imen domen, na katere je ta strežnik naletel v fediverzumu. Sem niso vključeni podatki o tem, ali ste v federaciji z danim strežnikom, zgolj to, ali vaš strežnik ve zanj. To uporabljajo storitve, ki zbirajo statistične podatke o federaciji v splošnem smislu.
         profile_directory: Imenik profilov izpiše vse uporabnike, ki so dovolili, da so v njem navedeni.
         require_invite_text: Če registracije zahtevajo ročno potrditev, nastavite vnos besedila pod »Zakaj se želite pridružiti?« za obveznega.
@@ -243,7 +240,6 @@ sl:
         backups_retention_period: Obdobje hrambe arhivov uporabnikov
         bootstrap_timeline_accounts: Vedno priporočaj te račune novim uporabnikom
         closed_registrations_message: Sporočilo po meri, ko registracije niso na voljo
-        content_cache_retention_period: Obdobje hrambe predpomnilnika vsebine
         custom_css: CSS po meri
         mascot: Maskota po meri (opuščeno)
         media_cache_retention_period: Obdobje hrambe predpomnilnika predstavnosti
diff --git a/config/locales/simple_form.sq.yml b/config/locales/simple_form.sq.yml
index 41ee3d9bd5bcdf..a6c93033801eb2 100644
--- a/config/locales/simple_form.sq.yml
+++ b/config/locales/simple_form.sq.yml
@@ -77,13 +77,10 @@ sq:
           warn: Fshihe lëndën e filtruar pas një sinjalizimi që përmend titullin e filtrit
       form_admin_settings:
         activity_api_enabled: Numër postimesh të botuar lokalisht, përdoruesish aktiv dhe regjistrimesh të reja sipas matjesh javore
-        backups_retention_period: Mbaji arkivat e prodhuara të përdoruesve për aq ditë sa numri i dhënë.
         bootstrap_timeline_accounts: Këto llogari do të fiksohen në krye të rekomandimeve për ndjekje nga përdorues të rinj.
         closed_registrations_message: Shfaqur kur mbyllen dritare regjistrimesh
-        content_cache_retention_period: Postimet prej shërbyesve të tjerë do të fshihen pas numrit të dhënë të ditëve, kur këtij i jepet një vlerë pozitive. Kjo mund të jetë e pakthyeshme.
         custom_css: Stile vetjakë mund të aplikoni në versionin web të Mastodon-it.
         mascot: Anashkalon ilustrimin te ndërfaqja web e thelluar.
-        media_cache_retention_period: Kartelat media të shkarkuara do të fshihen pas numrit të dhënë të ditëve, kur këtij i jepet një vlerë pozitive dhe rishkarkohen po u kërkua.
         peers_api_enabled: Një listë emrash përkatësish që ky shërbyes ka hasur në fedivers. Këtu s’jepen të dhëna nëse jeni i federuar me shërbyesin e dhënë, thjesht tregohet se shërbyesi juaj e njeh. Kjo përdoret nga shërbime që mbledhin statistika mbi federimin në kuptimin e përgjithshëm.
         profile_directory: Drejtoria e profileve paraqet krejt përdoruesit që kanë zgjedhur të jenë të zbulueshëm.
         require_invite_text: Kur regjistrimet lypin miratim dorazi, bëje tekstin “Përse doni të bëheni pjesë?” të detyrueshëm, në vend se opsional
@@ -243,7 +240,6 @@ sq:
         backups_retention_period: Periudhë mbajtjeje arkivash përdoruesish
         bootstrap_timeline_accounts: Rekomandoju përherë këto llogari përdoruesve të rinj
         closed_registrations_message: Mesazh vetjak për pamundësi regjistrimesh të reja
-        content_cache_retention_period: Periudhë mbajtjeje lënde fshehtine
         custom_css: CSS Vetjake
         mascot: Simbol vetjak (e dikurshme)
         media_cache_retention_period: Periudhë mbajtjeje lënde media
diff --git a/config/locales/simple_form.sr-Latn.yml b/config/locales/simple_form.sr-Latn.yml
index 13296a04ce9984..bc4eafb9658499 100644
--- a/config/locales/simple_form.sr-Latn.yml
+++ b/config/locales/simple_form.sr-Latn.yml
@@ -77,13 +77,10 @@ sr-Latn:
           warn: Sakrij filtrirani sadržaj iza upozorenja u kome se navodi naziv filtera
       form_admin_settings:
         activity_api_enabled: Brojevi lokalno postavljenih objava, aktivnih korisnika i novih registracija na nedeljnoj bazi
-        backups_retention_period: Čuvaj generisane korisničke arhive navedeni broj dana.
         bootstrap_timeline_accounts: Ovi nalozi će biti zakačeni na vrh preporuka za praćenje novih korisnika.
         closed_registrations_message: Prikazuje se kada su registracije zatvorene
-        content_cache_retention_period: Sve objave i podržavanja sa drugih servera će biti izbrisani nakon navedenog broja dana. Neke objave se možda neće moći oporaviti. Svi povezani obeleživači, omiljeni i podržavanja će takođe biti izgubljeni i nemoguće je opozvati radnju.
         custom_css: Možete da primenite prilagođene stilove na veb verziji Mastodon-a.
         mascot: Zamenjuje ilustraciju u naprednom veb okruženju.
-        media_cache_retention_period: Kada se postavi na pozitivnu vrednost, preuzete medijske datoteke će biti izbrisane nakon navedenog broja dana, i ponovo preuzete na zahtev.
         peers_api_enabled: Lista domena sa kojima se ovaj server susreo u fediverzumu. Ovde nisu sadržani podaci o tome da li se Vaš server federiše sa drugim serverima, već samo da Vaš server zna za njih. Ove informacije koriste servisi koji prikupljaju podatke i vode statistiku o federaciji u širem smislu.
         profile_directory: Direktorijum profila navodi sve korisnike koji su se opredelili da budu vidljivi.
         require_invite_text: Kada registracije zahtevaju ručno odobrenje, postavite da odgovor na „Zašto želite da se pridružite?“ bude obavezan, a ne opcionalan
@@ -243,7 +240,6 @@ sr-Latn:
         backups_retention_period: Period čuvanja korisničke arhive
         bootstrap_timeline_accounts: Uvek preporuči ove naloge novim korisnicima
         closed_registrations_message: Prilagođena poruka kada prijave nisu moguće
-        content_cache_retention_period: Period čuvanja keša sadržaja
         custom_css: Prilagođeni CSS
         mascot: Prilagođena maskota (nasleđe)
         media_cache_retention_period: Period čuvanja keša medija
diff --git a/config/locales/simple_form.sr.yml b/config/locales/simple_form.sr.yml
index 9820482182cca6..006f4cf6d27f83 100644
--- a/config/locales/simple_form.sr.yml
+++ b/config/locales/simple_form.sr.yml
@@ -77,13 +77,10 @@ sr:
           warn: Сакриј филтрирани садржај иза упозорења у коме се наводи назив филтера
       form_admin_settings:
         activity_api_enabled: Бројеви локално постављених објава, активних корисника и нових регистрација на недељној бази
-        backups_retention_period: Чувај генерисане корисничке архиве наведени број дана.
         bootstrap_timeline_accounts: Ови налози ће бити закачени на врх препорука за праћење нових корисника.
         closed_registrations_message: Приказује се када су регистрације затворене
-        content_cache_retention_period: Све објаве и подржавања са других сервера ће бити избрисани након наведеног броја дана. Неке објаве се можда неће моћи опоравити. Сви повезани обележивачи, омиљени и подржавања ће такође бити изгубљени и немогуће је опозвати радњу.
         custom_css: Можете да примените прилагођене стилове на веб верзији Mastodon-а.
         mascot: Замењује илустрацију у напредном веб окружењу.
-        media_cache_retention_period: Када се постави на позитивну вредност, преузете медијске датотеке ће бити избрисане након наведеног броја дана, и поново преузете на захтев.
         peers_api_enabled: Листа домена са којима се овај сервер сусрео у федиверзуму. Овде нису садржани подаци о томе да ли се Ваш сервер федерише са другим серверима, већ само да Ваш сервер зна за њих. Ове информације користе сервиси који прикупљају податке и воде статистику о федерацији у ширем смислу.
         profile_directory: Директоријум профила наводи све кориснике који су се определили да буду видљиви.
         require_invite_text: Када регистрације захтевају ручно одобрење, поставите да одговор на „Зашто желите да се придружите?“ буде обавезан, а не опционалан
@@ -243,7 +240,6 @@ sr:
         backups_retention_period: Период чувања корисничке архиве
         bootstrap_timeline_accounts: Увек препоручи ове налоге новим корисницима
         closed_registrations_message: Прилагођена порука када пријаве нису могуће
-        content_cache_retention_period: Период чувања кеша садржаја
         custom_css: Прилагођени CSS
         mascot: Прилагођена маскота (наслеђе)
         media_cache_retention_period: Период чувања кеша медија
diff --git a/config/locales/simple_form.sv.yml b/config/locales/simple_form.sv.yml
index 37372cac2791ff..3ab16bf69be35c 100644
--- a/config/locales/simple_form.sv.yml
+++ b/config/locales/simple_form.sv.yml
@@ -77,13 +77,10 @@ sv:
           warn: Dölj det filtrerade innehållet bakom en varning som visar filtrets rubrik
       form_admin_settings:
         activity_api_enabled: Antalet lokalt publicerade inlägg, aktiva användare och nya registrerade konton per vecka
-        backups_retention_period: Behåll genererade användararkiv i det angivna antalet dagar.
         bootstrap_timeline_accounts: Dessa konton kommer fästas högst upp i nya användares följrekommendationer.
         closed_registrations_message: Visas när nyregistreringar är avstängda
-        content_cache_retention_period: Inlägg från andra servrar kommer att raderas efter det angivna antalet dagar när detta är inställt på ett positivt värde. Åtgärden kan vara oåterkallelig.
         custom_css: Du kan använda anpassade stilar på webbversionen av Mastodon.
         mascot: Åsidosätter illustrationen i det avancerade webbgränssnittet.
-        media_cache_retention_period: Nedladdade mediefiler kommer raderas efter det angivna antalet dagar, om inställt till ett positivt värde, och laddas ned på nytt vid behov.
         peers_api_enabled: En lista över domänen den här servern har stött på i fediversum. Ingen data inkluderas om du har federerat med servern, bara att din server känner till den. Detta används av tjänster som samlar statistik om federering i allmänhet.
         profile_directory: Profilkatalogen visar alla användare som har samtyckt till att bli upptäckbara.
         require_invite_text: Gör fältet "Varför vill du gå med?" obligatoriskt när nyregistreringar kräver manuellt godkännande
@@ -243,7 +240,6 @@ sv:
         backups_retention_period: Lagringsperiod för användararkivet
         bootstrap_timeline_accounts: Rekommendera alltid dessa konton till nya användare
         closed_registrations_message: Anpassat meddelande när nyregistreringar inte är tillgängliga
-        content_cache_retention_period: Tid för bibehållande av innehållscache
         custom_css: Anpassad CSS
         mascot: Anpassad maskot (tekniskt arv)
         media_cache_retention_period: Tid för bibehållande av mediecache
diff --git a/config/locales/simple_form.th.yml b/config/locales/simple_form.th.yml
index b41cf0bea68fcb..bfc2d2e6b6289d 100644
--- a/config/locales/simple_form.th.yml
+++ b/config/locales/simple_form.th.yml
@@ -77,13 +77,10 @@ th:
           warn: ซ่อนเนื้อหาที่กรองอยู่หลังคำเตือนที่กล่าวถึงชื่อเรื่องของตัวกรอง
       form_admin_settings:
         activity_api_enabled: จำนวนโพสต์ที่เผยแพร่ในเซิร์ฟเวอร์, ผู้ใช้ที่ใช้งานอยู่ และการลงทะเบียนใหม่ในบักเก็ตรายสัปดาห์
-        backups_retention_period: เก็บการเก็บถาวรผู้ใช้ที่สร้างขึ้นตามจำนวนวันที่ระบุ
         bootstrap_timeline_accounts: จะปักหมุดบัญชีเหล่านี้ไว้ด้านบนสุดของคำแนะนำการติดตามของผู้ใช้ใหม่
         closed_registrations_message: แสดงเมื่อมีการปิดการลงทะเบียน
-        content_cache_retention_period: จะลบโพสต์และการดันทั้งหมดจากเซิร์ฟเวอร์อื่น ๆ หลังจากจำนวนวันที่ระบุ โพสต์บางส่วนอาจไม่สามารถกู้คืนได้ ที่คั่นหน้า, รายการโปรด และการดันที่เกี่ยวข้องทั้งหมดจะสูญหายและไม่สามารถเลิกทำได้เช่นกัน
         custom_css: คุณสามารถนำไปใช้ลักษณะที่กำหนดเองใน Mastodon รุ่นเว็บ
         mascot: เขียนทับภาพประกอบในส่วนติดต่อเว็บขั้นสูง
-        media_cache_retention_period: จะลบไฟล์สื่อที่ดาวน์โหลดหลังจากจำนวนวันที่ระบุเมื่อตั้งเป็นค่าบวก และดาวน์โหลดใหม่ตามความต้องการ
         peers_api_enabled: รายการชื่อโดเมนที่เซิร์ฟเวอร์นี้พบในจักรวาลสหพันธ์ ไม่มีข้อมูลรวมอยู่ที่นี่เกี่ยวกับว่าคุณติดต่อกับเซิร์ฟเวอร์ที่กำหนดหรือไม่ เพียงแค่ว่าเซิร์ฟเวอร์ของคุณทราบเกี่ยวกับเซิร์ฟเวอร์ที่กำหนด มีการใช้สิ่งนี้โดยบริการที่เก็บรวบรวมสถิติในการติดต่อกับภายนอกในความหมายทั่วไป
         profile_directory: ไดเรกทอรีโปรไฟล์แสดงรายการผู้ใช้ทั้งหมดที่ได้เลือกรับให้สามารถค้นพบได้
         require_invite_text: เมื่อการลงทะเบียนต้องการการอนุมัติด้วยตนเอง ทำให้การป้อนข้อความ “ทำไมคุณจึงต้องการเข้าร่วม?” บังคับแทนที่จะไม่จำเป็น
@@ -243,7 +240,7 @@ th:
         backups_retention_period: ระยะเวลาการเก็บรักษาการเก็บถาวรผู้ใช้
         bootstrap_timeline_accounts: แนะนำบัญชีเหล่านี้ให้กับผู้ใช้ใหม่เสมอ
         closed_registrations_message: ข้อความที่กำหนดเองเมื่อการลงทะเบียนไม่พร้อมใช้งาน
-        content_cache_retention_period: ระยะเวลาการเก็บรักษาแคชเนื้อหา
+        content_cache_retention_period: ระยะเวลาการเก็บรักษาเนื้อหาระยะไกล
         custom_css: CSS ที่กำหนดเอง
         mascot: มาสคอตที่กำหนดเอง (ดั้งเดิม)
         media_cache_retention_period: ระยะเวลาการเก็บรักษาแคชสื่อ
diff --git a/config/locales/simple_form.tr.yml b/config/locales/simple_form.tr.yml
index 758d1dc4de02fc..4ec35f102410b0 100644
--- a/config/locales/simple_form.tr.yml
+++ b/config/locales/simple_form.tr.yml
@@ -77,13 +77,13 @@ tr:
           warn: Süzgeçlenmiş içeriği, süzgecinin başlığından söz eden bir uyarının arkasında gizle
       form_admin_settings:
         activity_api_enabled: Yerel olarak yayınlanan gönderi, etkin kullanıcı ve yeni kayıtların haftalık sayıları
-        backups_retention_period: Üretilen kullanıcı arşivlerini belirli gün sayısı kadar sakla.
+        backups_retention_period: Kullanıcılar, gönderilerinin arşivlerini daha sonra indirmek üzere oluşturabilirler. Pozitif bir değer verdilğinde bu arşivler verilmiş olan gün sonunda deponuzdan otomatik olarak silinecektir.
         bootstrap_timeline_accounts: Bu hesaplar, yeni kullanıcıların takip önerilerinin tepesinde sabitlenecektir.
         closed_registrations_message: Kayıt olma kapalıyken görüntülenir
-        content_cache_retention_period: Pozitif bir sayı girildiğinde, diğer sunuculardan gelen gönderiler belirli bir gün sonra silinecektir. Silme geri alınamayabilir.
+        content_cache_retention_period: Diğer sunuculardaki (öne çıkarma ve yanıtlar da dahil olmak üzere) tüm gönderiler belirlenen gün sonunda, yerel bir kullanıcının etkileşimine bakılmadan, silinecektir. Yerel bir kullanıcının yerimlerine veya favorilerine eklediği gönderiler de dahildir. Farklı sunuculardaki kullanıcılar arasındaki özel bahsetmeler de kaybolacak ve geri getirilmeleri mümkün olmayacaktır. Bu ayarın kullanımı özel amaçlı sunucular içindir ve genel amaçlı kullanımda etkinleştirildiğinde kullanıcı beklentilerini karşılamayabilir.
         custom_css: Mastodon'un web sürümüne özel biçimler uygulayabilirsiniz.
         mascot: Gelişmiş web arayüzündeki illüstrasyonu geçersiz kılar.
-        media_cache_retention_period: Pozitif bir sayı girildiğinde, diğer sunuculardan indirilen medya dosyaları belirli bir gün sonra silinecektir, isteğe bağlı olarak tekrar indirilebilir.
+        media_cache_retention_period: Uzak kullanıcıların gönderilerindeki ortam dosyaları sunucunuzda önbelleklenir. Pozitif bir değer verildiğinde, ortam dosyaları belirlenen gün sonunda silinecektir. Eğer ortam dosyaları silindikten sonra istenirse, kaynak içerik hala mevcutsa, tekrar indirilecektir. Bağlantı önizleme kartlarının üçüncü parti siteleri yoklamasına ilişkin kısıtlamalar nedeniyle, bu değeri en azından 14 gün olarak ayarlamanız önerilir, yoksa bağlantı önizleme kartları bu süreden önce isteğe bağlı olarak güncellenmeyecektir.
         peers_api_enabled: Bu sunucunun fediverse'te karşılaştığı alan adlarının bir listesi. İlgili sunucuyla birleştirme mi yapıyorsunuz yoksa sunucunuz sadece onu biliyor mu hakkında bir bilgi burada yok. Bu blgi genel olarak federasyın hakkında istatistik toplamak isteyen hizmetler tarafından kullanılıyor.
         profile_directory: Profil dizini keşfedilebilir olmayı kabul eden tüm kullanıcıları listeler.
         require_invite_text: Kayıt olmak elle doğrulama gerektiriyorsa, "Neden katılmak istiyorsunuz?" metin girdisini isteğe bağlı yerine zorunlu yapın
@@ -243,7 +243,7 @@ tr:
         backups_retention_period: Kullanıcı arşivi saklama süresi
         bootstrap_timeline_accounts: Bu hesapları yeni kullanıcılara her zaman öner
         closed_registrations_message: Kayıt olma mevcut değilken gösterilen özel ileti
-        content_cache_retention_period: İçerik önbelleği saklama süresi
+        content_cache_retention_period: Uzak içerik saklama süresi
         custom_css: Özel CSS
         mascot: Özel maskot (eski)
         media_cache_retention_period: Medya önbelleği saklama süresi
diff --git a/config/locales/simple_form.uk.yml b/config/locales/simple_form.uk.yml
index db8e4b4d27713e..1d69f5c57994ca 100644
--- a/config/locales/simple_form.uk.yml
+++ b/config/locales/simple_form.uk.yml
@@ -77,16 +77,10 @@ uk:
           warn: Сховати відфільтрований вміст за попередженням, у якому вказано заголовок фільтра
       form_admin_settings:
         activity_api_enabled: Кількість локальних опублікованих дописів, активних і нових користувачів у тижневих розрізах
-        backups_retention_period: Зберігати створені архіви користувача вказану кількість днів.
         bootstrap_timeline_accounts: Ці облікові записи будуть закріплені в топі пропозицій для нових користувачів.
         closed_registrations_message: Показується, коли реєстрація закрита
-        content_cache_retention_period: |-
-          Матеріали з інших серверів будуть видалені після вказаної кількості днів, коли встановлено позитивне значення. Ця дія може бути незворотна.
-
-          Матеріали з інших серверів будуть видалені після вказаної кількості днів. Ця дія може бути незворотна. Усі пов'язані з ними закладки та поширення також будуть втрачені.
         custom_css: Ви можете застосувати користувацькі стилі у вебверсії Mastodon.
         mascot: Змінює ілюстрацію в розширеному вебінтерфейсі.
-        media_cache_retention_period: Завантажені медіафайли будуть видалені після вказаної кількості днів після встановлення додатного значення та повторного завантаження за запитом.
         peers_api_enabled: Список доменів імен цього сервера з'явився у федівсесвіті. Сюди не входять дані чи ви пов'язані федерацією з цим сервером, а лише відомості, що вашому серверу відомо про нього. Його використовують служби, які збирають загальну статистику про федерації.
         profile_directory: У каталозі профілів перераховані всі користувачі, які погодились бути видимими.
         require_invite_text: Якщо реєстрація вимагає власноручного затвердження, зробіть текстове поле «Чому ви хочете приєднатися?» обов'язковим, а не додатковим
@@ -246,7 +240,7 @@ uk:
         backups_retention_period: Період утримання архіву користувача
         bootstrap_timeline_accounts: Завжди рекомендувати новим користувачам ці облікові записи
         closed_registrations_message: Показуване повідомлення, якщо реєстрація недоступна
-        content_cache_retention_period: Час зберігання кешу контенту
+        content_cache_retention_period: Період збереження віддаленого вмісту
         custom_css: Користувацький CSS
         mascot: Користувацький символ (застарілий)
         media_cache_retention_period: Період збереження кешу медіа
diff --git a/config/locales/simple_form.vi.yml b/config/locales/simple_form.vi.yml
index f4d9f526b6988a..bc9a181ed35d8e 100644
--- a/config/locales/simple_form.vi.yml
+++ b/config/locales/simple_form.vi.yml
@@ -77,13 +77,13 @@ vi:
           warn: Ẩn nội dung đã lọc đằng sau một cảnh báo đề cập đến tiêu đề của bộ lọc
       form_admin_settings:
         activity_api_enabled: Số lượng tút được đăng trong máy chủ, người dùng đang hoạt động và đăng ký mới hàng tuần
-        backups_retention_period: Lưu trữ dữ liệu người dùng đã tạo trong số ngày được chỉ định.
+        backups_retention_period: Người dùng có khả năng tạo bản sao lưu các tút của họ để tải xuống sau. Các bản sao lưu này sẽ tự động bị xóa khỏi bộ nhớ của bạn sau số ngày được chỉ định.
         bootstrap_timeline_accounts: Những người này sẽ được ghim vào đầu các gợi ý theo dõi của người mới.
         closed_registrations_message: Được hiển thị khi đóng đăng ký
-        content_cache_retention_period: Tút từ các máy chủ khác sẽ bị xóa sau số ngày được chỉ định. Sau đó có thể không thể phục hồi được.
+        content_cache_retention_period: Tất cả tút từ các máy chủ khác (bao gồm cả đăng lại và trả lời) sẽ bị xóa sau số ngày được chỉ định mà không tính đến bất kỳ tương tác nào của người dùng cục bộ với các tút đó. Điều này bao gồm các tút mà người dùng cục bộ đã đánh dấu nó là dấu trang hoặc mục yêu thích. Những lượt nhắc riêng tư giữa những người dùng từ các máy chủ khác nhau cũng sẽ bị mất và không thể khôi phục. Việc sử dụng cài đặt này dành cho các trường hợp có mục đích đặc biệt và phá vỡ nhiều kỳ vọng của người dùng khi được triển khai cho mục đích sử dụng chung.
         custom_css: Bạn có thể tùy chỉnh phong cách trên bản web của Mastodon.
         mascot: Ghi đè hình minh họa trong giao diện web nâng cao.
-        media_cache_retention_period: Media đã tải xuống sẽ bị xóa sau số ngày được chỉ định và sẽ tải xuống lại theo yêu cầu.
+        media_cache_retention_period: Các tệp phương tiện từ các tút do người dùng máy chủ khác thực hiện sẽ được lưu vào bộ đệm trên máy chủ của bạn. Khi được đặt thành giá trị dương, phương tiện sẽ bị xóa sau số ngày được chỉ định. Nếu dữ liệu phương tiện được yêu cầu sau khi bị xóa, dữ liệu đó sẽ được tải xuống lại nếu nội dung nguồn vẫn còn. Do những hạn chế về tần suất thẻ xem trước liên kết thăm dò ý kiến ​​các trang web của bên thứ ba, bạn nên đặt giá trị này thành ít nhất 14 ngày, nếu không thẻ xem trước liên kết sẽ không được cập nhật theo yêu cầu trước thời gian đó.
         peers_api_enabled: Danh sách các máy chủ khác mà máy chủ này đã liên hợp. Không có dữ liệu nào được đưa vào đây về việc bạn có liên kết với một máy chủ nhất định hay không, chỉ là máy chủ của bạn biết về nó. Điều này được sử dụng bởi các dịch vụ thu thập số liệu thống kê về liên kết theo nghĩa chung.
         profile_directory: Liệt kê tất cả người đã chọn tham gia để có thể khám phá.
         require_invite_text: Khi đăng ký yêu cầu phê duyệt thủ công, hãy đặt câu hỏi "Tại sao bạn muốn tham gia?" nhập văn bản bắt buộc thay vì tùy chọn
@@ -243,7 +243,7 @@ vi:
         backups_retention_period: Thời hạn lưu trữ nội dung người dùng sao lưu
         bootstrap_timeline_accounts: Luôn đề xuất những người này đến người mới
         closed_registrations_message: Thông báo tùy chỉnh khi tắt đăng ký
-        content_cache_retention_period: Thời hạn lưu trữ cache nội dung
+        content_cache_retention_period: Khoảng thời gian lưu giữ nội dung máy chủ khác
         custom_css: Tùy chỉnh CSS
         mascot: Tùy chỉnh linh vật (kế thừa)
         media_cache_retention_period: Thời hạn lưu trữ cache media
diff --git a/config/locales/simple_form.zh-CN.yml b/config/locales/simple_form.zh-CN.yml
index 7f2eee023cfddc..a06a5ab4e46d9e 100644
--- a/config/locales/simple_form.zh-CN.yml
+++ b/config/locales/simple_form.zh-CN.yml
@@ -77,13 +77,13 @@ zh-CN:
           warn: 在警告中提及过滤器标题后，隐藏过滤内容
       form_admin_settings:
         activity_api_enabled: 本站每周的嘟文数、活跃用户数和新注册用户数
-        backups_retention_period: 将在指定天数内保留生成的用户存档。
+        backups_retention_period: 用户可以生成其嘟文存档以供之后下载。当该值被设为正值时，这些存档将在指定的天数后自动从您的存储中删除。
         bootstrap_timeline_accounts: 这些账号将在新用户关注推荐中置顶。
         closed_registrations_message: 在关闭注册时显示
-        content_cache_retention_period: 设为正数值时，来自其他服务器的嘟文将在指定天数后被删除。删除有可能会是不可逆的。
+        content_cache_retention_period: 来自其它实例的所有嘟文（包括转嘟与回复）都将在指定天数后被删除，不论本实例用户是否与这些嘟文产生过交互。这包括被本实例用户喜欢和收藏的嘟文。实例间用户的私下提及也将丢失并无法恢复。此设置针对的是特殊用途的实例，用于一般用途时会打破许多用户的期望。
         custom_css: 你可以为网页版 Mastodon 应用自定义样式。
         mascot: 覆盖高级网页界面中的绘图形象。
-        media_cache_retention_period: 设为正数值时，来自其他服务器的媒体文件将在指定天数后被删除，并在需要时再次下载。
+        media_cache_retention_period: 来自外站用户嘟文的媒体文件将被缓存到你的实例上。当该值被设为正值时，缓存的媒体文件将在指定天数后被清除。如果媒体文件在被清除后重新被请求，且源站内容仍然可用，它将被重新下载。由于链接预览卡拉取第三方站点的频率受到限制，建议将此值设置为至少 14 天，如果小于该值，链接预览卡将不会按需更新。
         peers_api_enabled: 此服务器在联邦宇宙中遇到的域名列表。 这里不包含关于您是否与给定服务器联合的数据，只是您的服务器知道它。 这由收集一般意义上的联邦统计信息的服务使用。
         profile_directory: 个人资料目录会列出所有选择可被发现的用户。
         require_invite_text: 当注册需要手动批准时，将“你为什么想要加入？”设为必填项
@@ -243,7 +243,7 @@ zh-CN:
         backups_retention_period: 用户存档保留期
         bootstrap_timeline_accounts: 推荐新用户关注以下账号
         closed_registrations_message: 在关闭注册时显示的自定义消息
-        content_cache_retention_period: 内容缓存保留期
+        content_cache_retention_period: 外站内容保留期
         custom_css: 自定义 CSS
         mascot: 自定义吉祥物（旧）
         media_cache_retention_period: 媒体缓存保留期
diff --git a/config/locales/simple_form.zh-HK.yml b/config/locales/simple_form.zh-HK.yml
index f6e40720feb1b3..0e2ee81db7f2c8 100644
--- a/config/locales/simple_form.zh-HK.yml
+++ b/config/locales/simple_form.zh-HK.yml
@@ -77,13 +77,13 @@ zh-HK:
           warn: 將已篩選的內容隱藏在篩選器標題的警告後面。
       form_admin_settings:
         activity_api_enabled: 每週本站發佈的帖文、活躍使用者及新註冊的數量
-        backups_retention_period: 繼續封存生成的使用者到指定的天數。
+        backups_retention_period: 使用者可以生成帖文存檔，以便日後下載。如果設定為正值，這些存檔將在指定天數後自動從你的儲存空間中刪除。
         bootstrap_timeline_accounts: 這些帳號會被置頂在新使用者的追蹤建議上。
         closed_registrations_message: 關閉註冊時顯示
-        content_cache_retention_period: 當設定為正數時，來自其他伺服器的帖文將在指定天數後被刪除。無法還原這個操作。
+        content_cache_retention_period: 所有來自其他伺服器的帖文（包括轉推和回覆），不論本站使用者有否與這些帖文互動，帖文都將在指定天數後被刪除。這包括本地使用者標記為書籤或加入最愛的帖文。不同站點之間的私人提及也將丟失，並且無法恢復。此設定適用於有特殊用途的站點，一般使用可能會破壞使用者體驗。
         custom_css: 你可以在 Mastodon 網頁版套用自訂樣式。
         mascot: 覆蓋進階網頁介面中的插圖。
-        media_cache_retention_period: 當設定為正數時，已下載的媒體檔案將在指定天數後被刪除，並視乎需要重新下載。
+        media_cache_retention_period: 遠端使用者帖文中的媒體檔案會緩存到你的伺服器上。當設定為正值時，媒體將在指定天數後被刪除。如果媒體資料在刪除後被請求，而源內容仍然可用，則會重新下載該媒體。由於連結預覽卡輪詢第三方網站的頻率有限制，建議將此值設定為至少 14 天，否則在此之前不會按需要更新連結預覽卡。
         peers_api_enabled: 本伺服器於聯邦宇宙相遇的網域名單。這裏不包括你與某伺服器有否聯網的數據，僅表示你的伺服器已知的網域。這是供收集一般跨站數據的服務使用。
         profile_directory: 個人檔案目錄羅列了所有選擇被發現的使用者。
         require_invite_text: 如果需要手動審核註冊，請將「為何你想加入？」文字欄設定為必填，而非選填。
@@ -243,7 +243,7 @@ zh-HK:
         backups_retention_period: 封存使用者保留期
         bootstrap_timeline_accounts: 總是向新使用者推薦這些帳號
         closed_registrations_message: 無法註冊時的自訂訊息
-        content_cache_retention_period: 內容快取保留期
+        content_cache_retention_period: 遠端內容保留期
         custom_css: 自訂 CSS
         mascot: 自訂吉祥物 (舊版)
         media_cache_retention_period: 媒體快取保留期
diff --git a/config/locales/simple_form.zh-TW.yml b/config/locales/simple_form.zh-TW.yml
index 69a2794e6c406f..a9e5921be00d07 100644
--- a/config/locales/simple_form.zh-TW.yml
+++ b/config/locales/simple_form.zh-TW.yml
@@ -77,13 +77,13 @@ zh-TW:
           warn: 隱藏過濾內容於過濾器標題之警告後
       form_admin_settings:
         activity_api_enabled: 本站使用者的嘟文數量，以及本站的活躍使用者與一週內新使用者數量
-        backups_retention_period: 將已產生的使用者封存資料保存特定天數。
+        backups_retention_period: 使用者能產生他們嘟文的備份以便日後下載。當設定為正值時，這些嘟文備份將於指定之天數後自您的儲存空間中自動刪除。
         bootstrap_timeline_accounts: 這些帳號將被釘選於新帳號跟隨推薦之上。
         closed_registrations_message: 於註冊關閉時顯示
-        content_cache_retention_period: 所有來自其他伺服器之嘟文及轉嘟將於指定天數後被刪除。這項操作可能是不可逆的。所有相關之書籤、最愛、轉嘟將會遺失並且無法回復。
+        content_cache_retention_period: 所有來自其他伺服器之嘟文（包括轉嘟與回嘟）將於指定之天數後自動刪除，不論這些嘟文與本地使用者間的任何互動。這將包含本地使用者已標記為書籤或最愛之嘟文。不同站點使用者間之私訊亦將遺失且不可回復。此設定應適用於特殊情況，若常規使用將超乎多數使用者預期。
         custom_css: 您於 Mastodon 網頁版本中能套用客製化風格。
         mascot: 覆寫進階網頁介面中的圖例。
-        media_cache_retention_period: 當設定成正值時，已下載的多媒體檔案會於指定天數後被刪除，並且視需要重新下載。
+        media_cache_retention_period: 來自遠端伺服器嘟文中之多媒體內容將快取於您的伺服器。當設定為正值時，這些多媒體內容將於指定之天數後自您的儲存空間中自動刪除。若多媒體資料於刪除後被請求，且原始內容仍可存取，它們將被重新下載。由於連結預覽中第三方網站查詢頻率限制，建議將其設定為至少 14 日，否則於此之前連結預覽將不被即時更新。
         peers_api_enabled: 浩瀚聯邦宇宙中與此伺服器曾經擦肩而過的網域列表。不包含關於您是否與此伺服器是否有與之串連，僅僅表示您的伺服器已知此網域。這是供收集聯邦宇宙中一般性統計資料服務使用。
         profile_directory: 個人檔案目錄將會列出那些有選擇被發現的使用者。
         require_invite_text: 如果已設定為手動審核註冊，請將「為什麼想要加入呢？」設定為必填項目。
@@ -243,7 +243,7 @@ zh-TW:
         backups_retention_period: 使用者封存資料保留期間
         bootstrap_timeline_accounts: 永遠推薦這些帳號給新使用者
         closed_registrations_message: 當註冊關閉時的客製化訊息
-        content_cache_retention_period: 內容快取資料保留期間
+        content_cache_retention_period: 遠端內容保留期限
         custom_css: 自訂 CSS
         mascot: 自訂吉祥物 (legacy)
         media_cache_retention_period: 多媒體快取資料保留期間
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 17ff6a5ccbe87f..0d7483d79ae9b7 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -737,6 +737,7 @@ th:
         desc_html: สิ่งนี้พึ่งพาสคริปต์ภายนอกจาก hCaptcha ซึ่งอาจเป็นข้อกังวลด้านความปลอดภัยและความเป็นส่วนตัว นอกจากนี้ <strong>สิ่งนี้สามารถทำให้กระบวนการการลงทะเบียนเข้าถึงได้น้อยลงอย่างมีนัยสำคัญสำหรับผู้คนบางส่วน (โดยเฉพาะอย่างยิ่งผู้พิการ)</strong> ด้วยเหตุผลเหล่านี้ โปรดพิจารณามาตรการทางเลือก เช่น การลงทะเบียนตามการอนุมัติหรือตามคำเชิญ
         title: ต้องให้ผู้ใช้ใหม่แก้ CAPTCHA เพื่อยืนยันบัญชีของเขา
       content_retention:
+        danger_zone: โซนอันตราย
         preamble: ควบคุมวิธีการจัดเก็บเนื้อหาที่ผู้ใช้สร้างขึ้นใน Mastodon
         title: การเก็บรักษาเนื้อหา
       default_noindex:
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 4bd0e3455a734c..7b9cf50aaf86ea 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -751,6 +751,7 @@ tr:
         desc_html: Bu, güvenlik ve gizlilikle ilgili bir endişe kaynağı olabilecek hCaptcha'nın harici komut dosyalarına dayanır. Ayrıca <strong>bu, kayıt sürecini bazı (özellikle engelli) kişiler için önemli ölçüde daha az erişilebilir hale getirebilir</strong>. Bu nedenlerle, lütfen onaya dayalı veya davete dayalı kayıt gibi alternatif önlemleri göz önünde bulundurun.
         title: Yeni kullanıcıların hesaplarını doğrulamaları için bir CAPTCHA çözmelerini gerektir
       content_retention:
+        danger_zone: Tehlikeli bölge
         preamble: Kullanıcıların ürettiği içeriğin Mastodon'da nasıl saklanacağını denetleyin.
         title: İçerik saklama
       default_noindex:
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 7c7652d699cae1..5d0ebe2de04883 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -779,6 +779,7 @@ uk:
         desc_html: Це залежить від зовнішніх скриптів hCaptcha, що може становити загрозу безпеці та приватності. Крім того, <strong>це може зробити процес реєстрації значно менш доступним для деяких людей (особливо з обмеженими можливостями)</strong>. З цих причин, будь ласка, розгляньте альтернативні заходи, такі як реєстрація на основі схвалення або на основі запрошення.
         title: Вимагати нових користувачів розв'язувати CAPTCHA для підтвердження облікового запису
       content_retention:
+        danger_zone: Зони небезпеки
         preamble: Контролюйте, як зберігаються користувацькі матеріали в Mastodon.
         title: Зберігання вмісту
       default_noindex:
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index ec851a82840eca..5d9e881ea43a2d 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -737,6 +737,7 @@ vi:
         desc_html: Điều này phụ thuộc vào các mã lệnh bên ngoài từ hCaptcha, đây có thể là mối lo ngại về bảo mật và quyền riêng tư. Thêm vào đó, <strong>điều này có thể làm cho quá trình đăng ký khó hơn đối với một số người (đặc biệt là người khuyết tật)</strong>. Vì những lý do này, vui lòng xem xét các biện pháp thay thế như duyệt đăng ký thủ công hoặc tạo thư mời.
         title: Yêu cầu người dùng mới dùng CAPTCHA để xác minh tài khoản của họ
       content_retention:
+        danger_zone: Khu vực nguy hiểm
         preamble: Kiểm soát cách lưu trữ nội dung cá nhân trong Mastodon.
         title: Lưu giữ nội dung
       default_noindex:
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 79764539dc68e9..3140ebdd309aee 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -737,6 +737,7 @@ zh-CN:
         desc_html: 这依赖于来自hCaptcha的外部脚本，可能会带来安全和隐私问题。此外，<strong>这可能使注册过程对某些人（尤其是残疾人）的注册简易程度大幅下降</strong>。出于这些原因，请考虑采取其他措施，如基于批准或邀请的注册方式。
         title: 要求新用户输入验证码以确认他们的账户
       content_retention:
+        danger_zone: 危险操作区
         preamble: 控制用户生成的内容在 Mastodon 中如何存储。
         title: 内容保留
       default_noindex:
diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml
index 1dc50c2849175f..1bfbe38bb52e72 100644
--- a/config/locales/zh-HK.yml
+++ b/config/locales/zh-HK.yml
@@ -737,6 +737,7 @@ zh-HK:
         desc_html: 這倚賴 hCaptcha 的外部腳本，或會引起安全和私隱疑慮。此外，<strong>此註冊流程亦可能對特定人士（尤其是殘疾人士）有較多障礙</strong>。有鑑於此，請考慮使用其他以審核或邀請的註冊方式。
         title: 要求新使用者解答 CAPTCHA 以驗證帳號
       content_retention:
+        danger_zone: 危險區域
         preamble: 控制使用者生成的內容如何儲存在 Mastodon。
         title: 內容留存
       default_noindex:
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 407931c20c8685..cdedd759eae866 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -739,6 +739,7 @@ zh-TW:
           此外，<strong>這將大幅降低註冊流程對某些族群之易用性，特別是無障礙需求人士</strong>。基於此因，請考慮其他替代性方案，例如審核制或是邀請制之註冊流程。
         title: 要求新使用者完成 CAPTCHA 挑戰以確認帳號
       content_retention:
+        danger_zone: 危險區域！
         preamble: 控制使用者產生內容如何儲存於 Mastodon 上。
         title: 內容保留期間
       default_noindex:

From 4527e012daa61dc07258eaedf3e03179b59fca8d Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Mon, 29 Apr 2024 10:23:05 +0200
Subject: [PATCH 0859/2191] Convert `entrypoints/sign_up` to Typescript
 (#30106)

---
 app/javascript/entrypoints/sign_up.js | 42 -----------------------
 app/javascript/entrypoints/sign_up.ts | 48 +++++++++++++++++++++++++++
 2 files changed, 48 insertions(+), 42 deletions(-)
 delete mode 100644 app/javascript/entrypoints/sign_up.js
 create mode 100644 app/javascript/entrypoints/sign_up.ts

diff --git a/app/javascript/entrypoints/sign_up.js b/app/javascript/entrypoints/sign_up.js
deleted file mode 100644
index cf9c837773444c..00000000000000
--- a/app/javascript/entrypoints/sign_up.js
+++ /dev/null
@@ -1,42 +0,0 @@
-import './public-path';
-import axios from 'axios';
-
-import ready from '../mastodon/ready';
-
-ready(() => {
-  setInterval(() => {
-    axios.get('/api/v1/emails/check_confirmation').then((response) => {
-      if (response.data) {
-        window.location = '/start';
-      }
-    }).catch(error => {
-      console.error(error);
-    });
-  }, 5000);
-
-  document.querySelectorAll('.timer-button').forEach(button => {
-    let counter = 30;
-
-    const container = document.createElement('span');
-
-    const updateCounter = () => {
-      container.innerText = ` (${counter})`;
-    };
-
-    updateCounter();
-
-    const countdown = setInterval(() => {
-      counter--;
-
-      if (counter === 0) {
-        button.disabled = false;
-        button.removeChild(container);
-        clearInterval(countdown);
-      } else {
-        updateCounter();
-      }
-    }, 1000);
-
-    button.appendChild(container);
-  });
-});
diff --git a/app/javascript/entrypoints/sign_up.ts b/app/javascript/entrypoints/sign_up.ts
new file mode 100644
index 00000000000000..880738fcb771da
--- /dev/null
+++ b/app/javascript/entrypoints/sign_up.ts
@@ -0,0 +1,48 @@
+import './public-path';
+import axios from 'axios';
+
+import ready from '../mastodon/ready';
+
+async function checkConfirmation() {
+  const response = await axios.get('/api/v1/emails/check_confirmation');
+
+  if (response.data) {
+    window.location.href = '/start';
+  }
+}
+
+ready(() => {
+  setInterval(() => {
+    void checkConfirmation();
+  }, 5000);
+
+  document
+    .querySelectorAll<HTMLButtonElement>('button.timer-button')
+    .forEach((button) => {
+      let counter = 30;
+
+      const container = document.createElement('span');
+
+      const updateCounter = () => {
+        container.innerText = ` (${counter})`;
+      };
+
+      updateCounter();
+
+      const countdown = setInterval(() => {
+        counter--;
+
+        if (counter === 0) {
+          button.disabled = false;
+          button.removeChild(container);
+          clearInterval(countdown);
+        } else {
+          updateCounter();
+        }
+      }, 1000);
+
+      button.appendChild(container);
+    });
+}).catch((e: unknown) => {
+  throw e;
+});

From f0c9cbaf3b079700b8179222d409c644dfd8ff66 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 29 Apr 2024 05:01:46 -0400
Subject: [PATCH 0860/2191] Use `EXPIRATION_DURATIONS` constant in
 `CustomFilter` class (#30088)

---
 app/models/custom_filter.rb                | 4 +++-
 app/views/filters/_filter_fields.html.haml | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/models/custom_filter.rb b/app/models/custom_filter.rb
index 2d8f5b6cba8206..94fadc70022c82 100644
--- a/app/models/custom_filter.rb
+++ b/app/models/custom_filter.rb
@@ -28,6 +28,8 @@ class CustomFilter < ApplicationRecord
     account
   ).freeze
 
+  EXPIRATION_DURATIONS = [30.minutes, 1.hour, 6.hours, 12.hours, 1.day, 1.week].freeze
+
   include Expireable
   include Redisable
 
@@ -52,7 +54,7 @@ def expires_in
     return @expires_in if defined?(@expires_in)
     return nil if expires_at.nil?
 
-    [30.minutes, 1.hour, 6.hours, 12.hours, 1.day, 1.week].find { |expires_in| expires_in.from_now >= expires_at }
+    EXPIRATION_DURATIONS.find { |expires_in| expires_in.from_now >= expires_at }
   end
 
   def irreversible=(value)
diff --git a/app/views/filters/_filter_fields.html.haml b/app/views/filters/_filter_fields.html.haml
index 5b297a6a9eb81e..0f4049ffb61979 100644
--- a/app/views/filters/_filter_fields.html.haml
+++ b/app/views/filters/_filter_fields.html.haml
@@ -6,7 +6,7 @@
               wrapper: :with_label
   .fields-row__column.fields-row__column-6.fields-group
     = f.input :expires_in,
-              collection: [30.minutes, 1.hour, 6.hours, 12.hours, 1.day, 1.week].map(&:to_i),
+              collection: CustomFilter::EXPIRATION_DURATIONS.map(&:to_i),
               include_blank: I18n.t('invites.expires_in_prompt'),
               label_method: ->(i) { I18n.t("invites.expires_in.#{i}") },
               wrapper: :with_label

From 2123281f7c24620f81dde503b83674cb3824a8cd Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 29 Apr 2024 05:02:47 -0400
Subject: [PATCH 0861/2191] Move `Account` limits to constants (#30087)

---
 app/models/account.rb | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/models/account.rb b/app/models/account.rb
index 2bf00b2be5909e..3efa7d88bd7603 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -71,6 +71,9 @@ class Account < ApplicationRecord
   MENTION_RE    = %r{(?<![=/[:word:]])@((#{USERNAME_RE})(?:@[[:word:].-]+[[:word:]]+)?)}i
   URL_PREFIX_RE = %r{\Ahttp(s?)://[^/]+}
   USERNAME_ONLY_RE = /\A#{USERNAME_RE}\z/i
+  USERNAME_LENGTH_LIMIT = 30
+  DISPLAY_NAME_LENGTH_LIMIT = 30
+  NOTE_LENGTH_LIMIT = 500
 
   include Attachmentable # Load prior to Avatar & Header concerns
 
@@ -100,10 +103,10 @@ class Account < ApplicationRecord
   validates :uri, presence: true, unless: :local?, on: :create
 
   # Local user validations
-  validates :username, format: { with: /\A[a-z0-9_]+\z/i }, length: { maximum: 30 }, if: -> { local? && will_save_change_to_username? && actor_type != 'Application' }
+  validates :username, format: { with: /\A[a-z0-9_]+\z/i }, length: { maximum: USERNAME_LENGTH_LIMIT }, if: -> { local? && will_save_change_to_username? && actor_type != 'Application' }
   validates_with UnreservedUsernameValidator, if: -> { local? && will_save_change_to_username? && actor_type != 'Application' }
-  validates :display_name, length: { maximum: 30 }, if: -> { local? && will_save_change_to_display_name? }
-  validates :note, note_length: { maximum: 500 }, if: -> { local? && will_save_change_to_note? }
+  validates :display_name, length: { maximum: DISPLAY_NAME_LENGTH_LIMIT }, if: -> { local? && will_save_change_to_display_name? }
+  validates :note, note_length: { maximum: NOTE_LENGTH_LIMIT }, if: -> { local? && will_save_change_to_note? }
   validates :fields, length: { maximum: DEFAULT_FIELDS_SIZE }, if: -> { local? && will_save_change_to_fields? }
   validates :uri, absence: true, if: :local?, on: :create
   validates :inbox_url, absence: true, if: :local?, on: :create

From 6931cf5727907f9bc28568e028f28c4adc4caf6e Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2024 09:03:27 +0000
Subject: [PATCH 0862/2191] Update dependency aws-sdk-s3 to v1.148.0 (#30076)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 4f4ca89dc22ac6..d73de0320f6e2b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -102,17 +102,17 @@ GEM
     attr_required (1.0.2)
     awrence (1.2.1)
     aws-eventstream (1.3.0)
-    aws-partitions (1.916.0)
-    aws-sdk-core (3.192.1)
+    aws-partitions (1.920.0)
+    aws-sdk-core (3.193.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.8)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.79.0)
-      aws-sdk-core (~> 3, >= 3.191.0)
+    aws-sdk-kms (1.80.0)
+      aws-sdk-core (~> 3, >= 3.193.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.147.0)
-      aws-sdk-core (~> 3, >= 3.192.0)
+    aws-sdk-s3 (1.148.0)
+      aws-sdk-core (~> 3, >= 3.193.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.8)
     aws-sigv4 (1.8.0)

From bbf1b603e0bb3c0ffeb4eba8a1d5faf645335d91 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 29 Apr 2024 05:04:35 -0400
Subject: [PATCH 0863/2191] Remove unused `Account.popular` scope (#30068)

---
 app/models/account.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/models/account.rb b/app/models/account.rb
index 3efa7d88bd7603..3c533822fdce9f 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -138,7 +138,6 @@ class Account < ApplicationRecord
   scope :discoverable, -> { searchable.without_silenced.where(discoverable: true).joins(:account_stat) }
   scope :by_recent_status, -> { includes(:account_stat).merge(AccountStat.by_recent_status).references(:account_stat) }
   scope :by_recent_activity, -> { left_joins(:user, :account_stat).order(coalesced_activity_timestamps.desc).order(id: :desc) }
-  scope :popular, -> { order('account_stats.followers_count desc') }
   scope :by_domain_and_subdomains, ->(domain) { where(domain: Instance.by_domain_and_subdomains(domain).select(:domain)) }
   scope :not_excluded_by_account, ->(account) { where.not(id: account.excluded_from_timeline_account_ids) }
   scope :not_domain_blocked_by_account, ->(account) { where(arel_table[:domain].eq(nil).or(arel_table[:domain].not_in(account.excluded_from_timeline_domains))) }

From 2739d8d5a493db7e6845ce85dc8534c275ab2cdc Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 29 Apr 2024 05:10:23 -0400
Subject: [PATCH 0864/2191] Use shorter `render` call in `admin/webhooks` view
 (#30071)

---
 app/views/admin/webhooks/edit.html.haml | 2 +-
 app/views/admin/webhooks/new.html.haml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/admin/webhooks/edit.html.haml b/app/views/admin/webhooks/edit.html.haml
index 2c2a7aa0342153..abc9bdfabc4aa3 100644
--- a/app/views/admin/webhooks/edit.html.haml
+++ b/app/views/admin/webhooks/edit.html.haml
@@ -2,6 +2,6 @@
   = t('admin.webhooks.edit')
 
 = simple_form_for @webhook, url: admin_webhook_path(@webhook) do |form|
-  = render partial: 'form', object: form
+  = render form
   .actions
     = form.button :button, t('generic.save_changes'), type: :submit
diff --git a/app/views/admin/webhooks/new.html.haml b/app/views/admin/webhooks/new.html.haml
index f51b039ce8e888..50fcdc2be7f954 100644
--- a/app/views/admin/webhooks/new.html.haml
+++ b/app/views/admin/webhooks/new.html.haml
@@ -2,6 +2,6 @@
   = t('admin.webhooks.new')
 
 = simple_form_for @webhook, url: admin_webhooks_path do |form|
-  = render partial: 'form', object: form
+  = render form
   .actions
     = form.button :button, t('admin.webhooks.add_new'), type: :submit

From b9b4db483cc588a2eb334b63fe6740c8dad9b57b Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Mon, 29 Apr 2024 11:29:59 +0200
Subject: [PATCH 0865/2191] Remove usage of deprecated `defaultTypes` on React
 functional components (#30099)

---
 app/javascript/mastodon/components/badge.jsx | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/javascript/mastodon/components/badge.jsx b/app/javascript/mastodon/components/badge.jsx
index 5e0b2587bd6560..2a335d7f5062fb 100644
--- a/app/javascript/mastodon/components/badge.jsx
+++ b/app/javascript/mastodon/components/badge.jsx
@@ -7,7 +7,7 @@ import PersonIcon from '@/material-icons/400-24px/person.svg?react';
 import SmartToyIcon from '@/material-icons/400-24px/smart_toy.svg?react';
 
 
-export const Badge = ({ icon, label, domain, roleId }) => (
+export const Badge = ({ icon = <PersonIcon />, label, domain, roleId }) => (
   <div className='account-role' data-account-role-id={roleId}>
     {icon}
     {label}
@@ -22,10 +22,6 @@ Badge.propTypes = {
   roleId: PropTypes.string
 };
 
-Badge.defaultProps = {
-  icon: <PersonIcon />,
-};
-
 export const GroupBadge = () => (
   <Badge icon={<GroupsIcon />} label={<FormattedMessage id='account.badges.group' defaultMessage='Group' />} />
 );

From a9816f051d3a83763b5a07423da2684fa2d05ca9 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 29 Apr 2024 05:33:06 -0400
Subject: [PATCH 0866/2191] Use shared form partial for `admin/warning_presets`
 views (#30069)

---
 app/views/admin/warning_presets/_form.html.haml |  7 +++++++
 app/views/admin/warning_presets/edit.html.haml  | 10 +++-------
 app/views/admin/warning_presets/index.html.haml | 10 +++-------
 3 files changed, 13 insertions(+), 14 deletions(-)
 create mode 100644 app/views/admin/warning_presets/_form.html.haml

diff --git a/app/views/admin/warning_presets/_form.html.haml b/app/views/admin/warning_presets/_form.html.haml
new file mode 100644
index 00000000000000..cba74163c5f455
--- /dev/null
+++ b/app/views/admin/warning_presets/_form.html.haml
@@ -0,0 +1,7 @@
+.fields-group
+  = form.input :title,
+               wrapper: :with_block_label
+
+.fields-group
+  = form.input :text,
+               wrapper: :with_block_label
diff --git a/app/views/admin/warning_presets/edit.html.haml b/app/views/admin/warning_presets/edit.html.haml
index b5c5107ef4a658..f0bd9c12ece44c 100644
--- a/app/views/admin/warning_presets/edit.html.haml
+++ b/app/views/admin/warning_presets/edit.html.haml
@@ -1,14 +1,10 @@
 - content_for :page_title do
   = t('admin.warning_presets.edit_preset')
 
-= simple_form_for @warning_preset, url: admin_warning_preset_path(@warning_preset) do |f|
+= simple_form_for @warning_preset, url: admin_warning_preset_path(@warning_preset) do |form|
   = render 'shared/error_messages', object: @warning_preset
 
-  .fields-group
-    = f.input :title, wrapper: :with_block_label
-
-  .fields-group
-    = f.input :text, wrapper: :with_block_label
+  = render form
 
   .actions
-    = f.button :button, t('generic.save_changes'), type: :submit
+    = form.button :button, t('generic.save_changes'), type: :submit
diff --git a/app/views/admin/warning_presets/index.html.haml b/app/views/admin/warning_presets/index.html.haml
index b26a13d9668dc9..22fee21050782f 100644
--- a/app/views/admin/warning_presets/index.html.haml
+++ b/app/views/admin/warning_presets/index.html.haml
@@ -2,17 +2,13 @@
   = t('admin.warning_presets.title')
 
 - if can? :create, :account_warning_preset
-  = simple_form_for @warning_preset, url: admin_warning_presets_path do |f|
+  = simple_form_for @warning_preset, url: admin_warning_presets_path do |form|
     = render 'shared/error_messages', object: @warning_preset
 
-    .fields-group
-      = f.input :title, wrapper: :with_block_label
-
-    .fields-group
-      = f.input :text, wrapper: :with_block_label
+    = render form
 
     .actions
-      = f.button :button, t('admin.warning_presets.add_new'), type: :submit
+      = form.button :button, t('admin.warning_presets.add_new'), type: :submit
 
   %hr.spacer/
 

From e3364668946e4426b15df664a69624a9ea647263 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 29 Apr 2024 05:33:27 -0400
Subject: [PATCH 0867/2191] Use shared form partial for `admin/rules` views
 (#30067)

---
 app/views/admin/rules/_form.html.haml |  7 +++++++
 app/views/admin/rules/edit.html.haml  | 10 +++-------
 app/views/admin/rules/index.html.haml | 10 +++-------
 3 files changed, 13 insertions(+), 14 deletions(-)
 create mode 100644 app/views/admin/rules/_form.html.haml

diff --git a/app/views/admin/rules/_form.html.haml b/app/views/admin/rules/_form.html.haml
new file mode 100644
index 00000000000000..9fc54e28873ee3
--- /dev/null
+++ b/app/views/admin/rules/_form.html.haml
@@ -0,0 +1,7 @@
+.fields-group
+  = form.input :text,
+               wrapper: :with_block_label
+
+.fields-group
+  = form.input :hint,
+               wrapper: :with_block_label
diff --git a/app/views/admin/rules/edit.html.haml b/app/views/admin/rules/edit.html.haml
index 77815588d220b9..9e3c9158120c1e 100644
--- a/app/views/admin/rules/edit.html.haml
+++ b/app/views/admin/rules/edit.html.haml
@@ -1,14 +1,10 @@
 - content_for :page_title do
   = t('admin.rules.edit')
 
-= simple_form_for @rule, url: admin_rule_path(@rule) do |f|
+= simple_form_for @rule, url: admin_rule_path(@rule) do |form|
   = render 'shared/error_messages', object: @rule
 
-  .fields-group
-    = f.input :text, wrapper: :with_block_label
-
-  .fields-group
-    = f.input :hint, wrapper: :with_block_label
+  = render form
 
   .actions
-    = f.button :button, t('generic.save_changes'), type: :submit
+    = form.button :button, t('generic.save_changes'), type: :submit
diff --git a/app/views/admin/rules/index.html.haml b/app/views/admin/rules/index.html.haml
index dd15ce03c0298a..5a2789edcfce4c 100644
--- a/app/views/admin/rules/index.html.haml
+++ b/app/views/admin/rules/index.html.haml
@@ -6,17 +6,13 @@
 %hr.spacer/
 
 - if can? :create, :rule
-  = simple_form_for @rule, url: admin_rules_path do |f|
+  = simple_form_for @rule, url: admin_rules_path do |form|
     = render 'shared/error_messages', object: @rule
 
-    .fields-group
-      = f.input :text, wrapper: :with_block_label
-
-    .fields-group
-      = f.input :hint, wrapper: :with_block_label
+    = render form
 
     .actions
-      = f.button :button, t('admin.rules.add_new'), type: :submit
+      = form.button :button, t('admin.rules.add_new'), type: :submit
 
   %hr.spacer/
 

From 95e9de577752a71ed8804ecc5fcd314bca47adee Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 29 Apr 2024 11:45:58 +0200
Subject: [PATCH 0868/2191] Prevent accidental serialization of `Account` and
 `User` records (#30079)

---
 app/models/application_record.rb | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/models/application_record.rb b/app/models/application_record.rb
index 014a73997d9793..299aad6340461f 100644
--- a/app/models/application_record.rb
+++ b/app/models/application_record.rb
@@ -22,4 +22,10 @@ def boolean_with_default(key, default_value)
       value
     end
   end
+
+  # Prevent implicit serialization in ActiveModel::Serializer or other code paths.
+  # This is a hardening step to avoid accidental leaking of attributes.
+  def as_json
+    raise NotImplementedError
+  end
 end

From ac7f4d57bb8f92ce0fbc91736cba8665174f41d4 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 29 Apr 2024 05:55:37 -0400
Subject: [PATCH 0869/2191] Use composable query in `Status.without_replies`
 scope (#30086)

---
 app/models/status.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/models/status.rb b/app/models/status.rb
index c2d7985b4dc6aa..2ff803bf0b356f 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -106,7 +106,9 @@ class Status < ApplicationRecord
   scope :remote, -> { where(local: false).where.not(uri: nil) }
   scope :local,  -> { where(local: true).or(where(uri: nil)) }
   scope :with_accounts, ->(ids) { where(id: ids).includes(:account) }
-  scope :without_replies, -> { where('statuses.reply = FALSE OR statuses.in_reply_to_account_id = statuses.account_id') }
+  scope :without_replies, -> { not_reply.or(reply_to_account) }
+  scope :not_reply, -> { where(reply: false) }
+  scope :reply_to_account, -> { where(arel_table[:in_reply_to_account_id].eq arel_table[:account_id]) }
   scope :without_reblogs, -> { where(statuses: { reblog_of_id: nil }) }
   scope :tagged_with, ->(tag_ids) { joins(:statuses_tags).where(statuses_tags: { tag_id: tag_ids }) }
   scope :not_excluded_by_account, ->(account) { where.not(account_id: account.excluded_from_timeline_account_ids) }

From 7d3fe2b4c3cd9511df8f8026890c71b2119719f3 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 29 Apr 2024 11:55:41 +0200
Subject: [PATCH 0870/2191] Add loading indicator and empty result message to
 advanced interface search (#30085)

---
 .../compose/components/search_results.jsx     | 124 +++++++++---------
 .../containers/search_results_container.js    |  20 ---
 .../mastodon/features/compose/index.jsx       |   4 +-
 app/javascript/mastodon/reducers/search.js    |   1 +
 4 files changed, 68 insertions(+), 81 deletions(-)
 delete mode 100644 app/javascript/mastodon/features/compose/containers/search_results_container.js

diff --git a/app/javascript/mastodon/features/compose/components/search_results.jsx b/app/javascript/mastodon/features/compose/components/search_results.jsx
index 667662781e0345..6a482c8ec27a73 100644
--- a/app/javascript/mastodon/features/compose/components/search_results.jsx
+++ b/app/javascript/mastodon/features/compose/components/search_results.jsx
@@ -1,16 +1,16 @@
-import PropTypes from 'prop-types';
+import { useCallback } from 'react';
 
 import { FormattedMessage } from 'react-intl';
 
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import ImmutablePureComponent from 'react-immutable-pure-component';
-
 import FindInPageIcon from '@/material-icons/400-24px/find_in_page.svg?react';
 import PeopleIcon from '@/material-icons/400-24px/group.svg?react';
 import TagIcon from '@/material-icons/400-24px/tag.svg?react';
+import { expandSearch } from 'mastodon/actions/search';
 import { Icon }  from 'mastodon/components/icon';
 import { LoadMore } from 'mastodon/components/load_more';
+import { LoadingIndicator } from 'mastodon/components/loading_indicator';
 import { SearchSection } from 'mastodon/features/explore/components/search_section';
+import { useAppDispatch, useAppSelector } from 'mastodon/store';
 
 import { ImmutableHashtag as Hashtag } from '../../../components/hashtag';
 import AccountContainer from '../../../containers/account_container';
@@ -26,62 +26,68 @@ const withoutLastResult = list => {
   }
 };
 
-class SearchResults extends ImmutablePureComponent {
-
-  static propTypes = {
-    results: ImmutablePropTypes.map.isRequired,
-    expandSearch: PropTypes.func.isRequired,
-    searchTerm: PropTypes.string,
-  };
-
-  handleLoadMoreAccounts = () => this.props.expandSearch('accounts');
-
-  handleLoadMoreStatuses = () => this.props.expandSearch('statuses');
-
-  handleLoadMoreHashtags = () => this.props.expandSearch('hashtags');
-
-  render () {
-    const { results } = this.props;
-
-    let accounts, statuses, hashtags;
-
-    if (results.get('accounts') && results.get('accounts').size > 0) {
-      accounts = (
-        <SearchSection title={<><Icon id='users' icon={PeopleIcon} /><FormattedMessage id='search_results.accounts' defaultMessage='Profiles' /></>}>
-          {withoutLastResult(results.get('accounts')).map(accountId => <AccountContainer key={accountId} id={accountId} />)}
-          {(results.get('accounts').size > INITIAL_PAGE_LIMIT && results.get('accounts').size % INITIAL_PAGE_LIMIT === 1) && <LoadMore visible onClick={this.handleLoadMoreAccounts} />}
-        </SearchSection>
-      );
-    }
-
-    if (results.get('hashtags') && results.get('hashtags').size > 0) {
-      hashtags = (
-        <SearchSection title={<><Icon id='hashtag' icon={TagIcon} /><FormattedMessage id='search_results.hashtags' defaultMessage='Hashtags' /></>}>
-          {withoutLastResult(results.get('hashtags')).map(hashtag => <Hashtag key={hashtag.get('name')} hashtag={hashtag} />)}
-          {(results.get('hashtags').size > INITIAL_PAGE_LIMIT && results.get('hashtags').size % INITIAL_PAGE_LIMIT === 1) && <LoadMore visible onClick={this.handleLoadMoreHashtags} />}
-        </SearchSection>
-      );
-    }
-
-    if (results.get('statuses') && results.get('statuses').size > 0) {
-      statuses = (
-        <SearchSection title={<><Icon id='quote-right' icon={FindInPageIcon} /><FormattedMessage id='search_results.statuses' defaultMessage='Posts' /></>}>
-          {withoutLastResult(results.get('statuses')).map(statusId => <StatusContainer key={statusId} id={statusId} />)}
-          {(results.get('statuses').size > INITIAL_PAGE_LIMIT && results.get('statuses').size % INITIAL_PAGE_LIMIT === 1) && <LoadMore visible onClick={this.handleLoadMoreStatuses} />}
-        </SearchSection>
-      );
-    }
-
-
-    return (
-      <div className='search-results'>
-        {accounts}
-        {hashtags}
-        {statuses}
-      </div>
+export const SearchResults = () => {
+  const results = useAppSelector((state) => state.getIn(['search', 'results']));
+  const isLoading = useAppSelector((state) => state.getIn(['search', 'isLoading']));
+
+  const dispatch = useAppDispatch();
+
+  const handleLoadMoreAccounts = useCallback(() => {
+    dispatch(expandSearch('accounts'));
+  }, [dispatch]);
+
+  const handleLoadMoreStatuses = useCallback(() => {
+    dispatch(expandSearch('statuses'));
+  }, [dispatch]);
+
+  const handleLoadMoreHashtags = useCallback(() => {
+    dispatch(expandSearch('hashtags'));
+  }, [dispatch]);
+
+  let accounts, statuses, hashtags;
+
+  if (results.get('accounts') && results.get('accounts').size > 0) {
+    accounts = (
+      <SearchSection title={<><Icon id='users' icon={PeopleIcon} /><FormattedMessage id='search_results.accounts' defaultMessage='Profiles' /></>}>
+        {withoutLastResult(results.get('accounts')).map(accountId => <AccountContainer key={accountId} id={accountId} />)}
+        {(results.get('accounts').size > INITIAL_PAGE_LIMIT && results.get('accounts').size % INITIAL_PAGE_LIMIT === 1) && <LoadMore visible onClick={handleLoadMoreAccounts} />}
+      </SearchSection>
     );
   }
 
-}
+  if (results.get('hashtags') && results.get('hashtags').size > 0) {
+    hashtags = (
+      <SearchSection title={<><Icon id='hashtag' icon={TagIcon} /><FormattedMessage id='search_results.hashtags' defaultMessage='Hashtags' /></>}>
+        {withoutLastResult(results.get('hashtags')).map(hashtag => <Hashtag key={hashtag.get('name')} hashtag={hashtag} />)}
+        {(results.get('hashtags').size > INITIAL_PAGE_LIMIT && results.get('hashtags').size % INITIAL_PAGE_LIMIT === 1) && <LoadMore visible onClick={handleLoadMoreHashtags} />}
+      </SearchSection>
+    );
+  }
 
-export default SearchResults;
+  if (results.get('statuses') && results.get('statuses').size > 0) {
+    statuses = (
+      <SearchSection title={<><Icon id='quote-right' icon={FindInPageIcon} /><FormattedMessage id='search_results.statuses' defaultMessage='Posts' /></>}>
+        {withoutLastResult(results.get('statuses')).map(statusId => <StatusContainer key={statusId} id={statusId} />)}
+        {(results.get('statuses').size > INITIAL_PAGE_LIMIT && results.get('statuses').size % INITIAL_PAGE_LIMIT === 1) && <LoadMore visible onClick={handleLoadMoreStatuses} />}
+      </SearchSection>
+    );
+  }
+
+  return (
+    <div className='search-results'>
+      {!accounts && !hashtags && !statuses && (
+        isLoading ? (
+          <LoadingIndicator />
+        ) : (
+          <div className='empty-column-indicator'>
+            <FormattedMessage id='search_results.nothing_found' defaultMessage='Could not find anything for these search terms' />
+          </div>
+        )
+      )}
+      {accounts}
+      {hashtags}
+      {statuses}
+    </div>
+  );
+
+};
diff --git a/app/javascript/mastodon/features/compose/containers/search_results_container.js b/app/javascript/mastodon/features/compose/containers/search_results_container.js
deleted file mode 100644
index 54c2af31776a4e..00000000000000
--- a/app/javascript/mastodon/features/compose/containers/search_results_container.js
+++ /dev/null
@@ -1,20 +0,0 @@
-import { connect } from 'react-redux';
-
-import { expandSearch } from 'mastodon/actions/search';
-import { fetchSuggestions, dismissSuggestion } from 'mastodon/actions/suggestions';
-
-import SearchResults from '../components/search_results';
-
-const mapStateToProps = state => ({
-  results: state.getIn(['search', 'results']),
-  suggestions: state.getIn(['suggestions', 'items']),
-  searchTerm: state.getIn(['search', 'searchTerm']),
-});
-
-const mapDispatchToProps = dispatch => ({
-  fetchSuggestions: () => dispatch(fetchSuggestions()),
-  expandSearch: type => dispatch(expandSearch(type)),
-  dismissSuggestion: account => dispatch(dismissSuggestion(account.get('id'))),
-});
-
-export default connect(mapStateToProps, mapDispatchToProps)(SearchResults);
diff --git a/app/javascript/mastodon/features/compose/index.jsx b/app/javascript/mastodon/features/compose/index.jsx
index ce8eb9e05dd475..83c741fd19119e 100644
--- a/app/javascript/mastodon/features/compose/index.jsx
+++ b/app/javascript/mastodon/features/compose/index.jsx
@@ -29,9 +29,9 @@ import { mascot } from '../../initial_state';
 import { isMobile } from '../../is_mobile';
 import Motion from '../ui/util/optional_motion';
 
+import { SearchResults } from './components/search_results';
 import ComposeFormContainer from './containers/compose_form_container';
 import SearchContainer from './containers/search_container';
-import SearchResultsContainer from './containers/search_results_container';
 
 const messages = defineMessages({
   start: { id: 'getting_started.heading', defaultMessage: 'Getting started' },
@@ -138,7 +138,7 @@ class Compose extends PureComponent {
             <Motion defaultStyle={{ x: -100 }} style={{ x: spring(showSearch ? 0 : -100, { stiffness: 210, damping: 20 }) }}>
               {({ x }) => (
                 <div className='drawer__inner darker' style={{ transform: `translateX(${x}%)`, visibility: x === -100 ? 'hidden' : 'visible' }}>
-                  <SearchResultsContainer />
+                  <SearchResults />
                 </div>
               )}
             </Motion>
diff --git a/app/javascript/mastodon/reducers/search.js b/app/javascript/mastodon/reducers/search.js
index 72835eb91745f3..7828d49eeedd9a 100644
--- a/app/javascript/mastodon/reducers/search.js
+++ b/app/javascript/mastodon/reducers/search.js
@@ -50,6 +50,7 @@ export default function search(state = initialState, action) {
     return state.set('hidden', true);
   case SEARCH_FETCH_REQUEST:
     return state.withMutations(map => {
+      map.set('results', ImmutableMap());
       map.set('isLoading', true);
       map.set('submitted', true);
       map.set('type', action.searchType);

From f1a4b4e228ed077692c5bbe6af094308b87c2874 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 29 Apr 2024 08:32:06 -0400
Subject: [PATCH 0871/2191] Disable `Style/SignalException` cop (#30064)

---
 .rubocop_todo.yml                                        | 8 --------
 lib/devise/strategies/two_factor_ldap_authenticatable.rb | 2 +-
 lib/devise/strategies/two_factor_pam_authenticatable.rb  | 2 +-
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index c2826d718c7b19..e656578149b035 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -205,14 +205,6 @@ Style/SafeNavigation:
   Exclude:
     - 'app/models/concerns/account/finder_concern.rb'
 
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: only_raise, only_fail, semantic
-Style/SignalException:
-  Exclude:
-    - 'lib/devise/strategies/two_factor_ldap_authenticatable.rb'
-    - 'lib/devise/strategies/two_factor_pam_authenticatable.rb'
-
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: Mode.
 Style/StringConcatenation:
diff --git a/lib/devise/strategies/two_factor_ldap_authenticatable.rb b/lib/devise/strategies/two_factor_ldap_authenticatable.rb
index 065aa2de88acab..c8258deb16ddb1 100644
--- a/lib/devise/strategies/two_factor_ldap_authenticatable.rb
+++ b/lib/devise/strategies/two_factor_ldap_authenticatable.rb
@@ -16,7 +16,7 @@ def authenticate!
         if resource && !resource.otp_required_for_login?
           success!(resource)
         else
-          fail(:invalid)
+          fail(:invalid) # rubocop:disable Style/SignalException -- method is from Warden::Strategies::Base
         end
       end
 
diff --git a/lib/devise/strategies/two_factor_pam_authenticatable.rb b/lib/devise/strategies/two_factor_pam_authenticatable.rb
index 5ce723b331d319..a9db1b6a29ff96 100644
--- a/lib/devise/strategies/two_factor_pam_authenticatable.rb
+++ b/lib/devise/strategies/two_factor_pam_authenticatable.rb
@@ -15,7 +15,7 @@ def authenticate!
         if resource && !resource.otp_required_for_login?
           success!(resource)
         else
-          fail(:invalid)
+          fail(:invalid) # rubocop:disable Style/SignalException -- method is from Warden::Strategies::Base
         end
       end
 

From 924af400da330f8a168afe2b4ffb5dc50dbd8ce9 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 29 Apr 2024 08:49:31 -0400
Subject: [PATCH 0872/2191] Remove unused memoization in
 `CustomFilter#expires_in` method (#30117)

---
 app/models/custom_filter.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/models/custom_filter.rb b/app/models/custom_filter.rb
index 94fadc70022c82..bacf1582618edc 100644
--- a/app/models/custom_filter.rb
+++ b/app/models/custom_filter.rb
@@ -51,7 +51,6 @@ class CustomFilter < ApplicationRecord
   after_commit :invalidate_cache!
 
   def expires_in
-    return @expires_in if defined?(@expires_in)
     return nil if expires_at.nil?
 
     EXPIRATION_DURATIONS.find { |expires_in| expires_in.from_now >= expires_at }

From f5d6362e9013fa5a1c53ebb7a422916a412a05dd Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2024 17:48:34 +0200
Subject: [PATCH 0873/2191] Update dependency ws to v8.17.0 (#30097)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index e8f4075e22c31d..878d43d100e7f1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -18276,8 +18276,8 @@ __metadata:
   linkType: hard
 
 "ws@npm:^8.11.0, ws@npm:^8.12.1, ws@npm:^8.16.0":
-  version: 8.16.0
-  resolution: "ws@npm:8.16.0"
+  version: 8.17.0
+  resolution: "ws@npm:8.17.0"
   peerDependencies:
     bufferutil: ^4.0.1
     utf-8-validate: ">=5.0.2"
@@ -18286,7 +18286,7 @@ __metadata:
       optional: true
     utf-8-validate:
       optional: true
-  checksum: 10c0/a7783bb421c648b1e622b423409cb2a58ac5839521d2f689e84bc9dc41d59379c692dd405b15a997ea1d4c0c2e5314ad707332d0c558f15232d2bc07c0b4618a
+  checksum: 10c0/55241ec93a66fdfc4bf4f8bc66c8eb038fda2c7a4ee8f6f157f2ca7dc7aa76aea0c0da0bf3adb2af390074a70a0e45456a2eaf80e581e630b75df10a64b0a990
   languageName: node
   linkType: hard
 

From b8f0a504350a4c30339a755cac0edeadafa9841d Mon Sep 17 00:00:00 2001
From: Shlee <github@shl.ee>
Date: Tue, 30 Apr 2024 03:31:14 +1000
Subject: [PATCH 0874/2191] docker-compose.yml  `version` is obsolete (#30120)

---
 docker-compose.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 154754d45f61bd..3f2336f1d96241 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,4 +1,3 @@
-version: '3'
 services:
   db:
     restart: always

From 81f0002e7653b03c65f4c8feeaa4730fdf681b0d Mon Sep 17 00:00:00 2001
From: Emelia Smith <ThisIsMissEm@users.noreply.github.com>
Date: Tue, 30 Apr 2024 10:48:02 +0200
Subject: [PATCH 0875/2191] Fix missing destory audit logs for Domain Allows
 (#30125)

---
 app/controllers/admin/domain_allows_controller.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/controllers/admin/domain_allows_controller.rb b/app/controllers/admin/domain_allows_controller.rb
index 31be1978bbbb10..b0f139e3a8284e 100644
--- a/app/controllers/admin/domain_allows_controller.rb
+++ b/app/controllers/admin/domain_allows_controller.rb
@@ -25,6 +25,8 @@ def create
   def destroy
     authorize @domain_allow, :destroy?
     UnallowDomainService.new.call(@domain_allow)
+    log_action :destroy, @domain_allow
+
     redirect_to admin_instances_path, notice: I18n.t('admin.domain_allows.destroyed_msg')
   end
 

From f5376c477d142d4c43826b5cea0f9b2f53bf64b7 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 30 Apr 2024 10:50:42 +0200
Subject: [PATCH 0876/2191] Update babel monorepo to v7.24.5 (#30124)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 290 +++++++++++++++++++++++++++---------------------------
 1 file changed, 145 insertions(+), 145 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 878d43d100e7f1..70395894b8b515 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -42,7 +42,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.10.4, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.23.5, @babel/code-frame@npm:^7.24.1, @babel/code-frame@npm:^7.24.2":
+"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.10.4, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.23.5, @babel/code-frame@npm:^7.24.2":
   version: 7.24.2
   resolution: "@babel/code-frame@npm:7.24.2"
   dependencies:
@@ -60,37 +60,37 @@ __metadata:
   linkType: hard
 
 "@babel/core@npm:^7.10.4, @babel/core@npm:^7.11.1, @babel/core@npm:^7.11.6, @babel/core@npm:^7.12.3, @babel/core@npm:^7.22.1":
-  version: 7.24.4
-  resolution: "@babel/core@npm:7.24.4"
+  version: 7.24.5
+  resolution: "@babel/core@npm:7.24.5"
   dependencies:
     "@ampproject/remapping": "npm:^2.2.0"
     "@babel/code-frame": "npm:^7.24.2"
-    "@babel/generator": "npm:^7.24.4"
+    "@babel/generator": "npm:^7.24.5"
     "@babel/helper-compilation-targets": "npm:^7.23.6"
-    "@babel/helper-module-transforms": "npm:^7.23.3"
-    "@babel/helpers": "npm:^7.24.4"
-    "@babel/parser": "npm:^7.24.4"
+    "@babel/helper-module-transforms": "npm:^7.24.5"
+    "@babel/helpers": "npm:^7.24.5"
+    "@babel/parser": "npm:^7.24.5"
     "@babel/template": "npm:^7.24.0"
-    "@babel/traverse": "npm:^7.24.1"
-    "@babel/types": "npm:^7.24.0"
+    "@babel/traverse": "npm:^7.24.5"
+    "@babel/types": "npm:^7.24.5"
     convert-source-map: "npm:^2.0.0"
     debug: "npm:^4.1.0"
     gensync: "npm:^1.0.0-beta.2"
     json5: "npm:^2.2.3"
     semver: "npm:^6.3.1"
-  checksum: 10c0/fc136966583e64d6f84f4a676368de6ab4583aa87f867186068655b30ef67f21f8e65a88c6d446a7efd219ad7ffb9185c82e8a90183ee033f6f47b5026641e16
+  checksum: 10c0/e26ba810a77bc8e21579a12fc36c79a0a60554404dc9447f2d64eb1f26d181c48d3b97d39d9f158e9911ec7162a8280acfaf2b4b210e975f0dd4bd4dbb1ee159
   languageName: node
   linkType: hard
 
-"@babel/generator@npm:^7.24.1, @babel/generator@npm:^7.24.4, @babel/generator@npm:^7.7.2":
-  version: 7.24.4
-  resolution: "@babel/generator@npm:7.24.4"
+"@babel/generator@npm:^7.24.5, @babel/generator@npm:^7.7.2":
+  version: 7.24.5
+  resolution: "@babel/generator@npm:7.24.5"
   dependencies:
-    "@babel/types": "npm:^7.24.0"
+    "@babel/types": "npm:^7.24.5"
     "@jridgewell/gen-mapping": "npm:^0.3.5"
     "@jridgewell/trace-mapping": "npm:^0.3.25"
     jsesc: "npm:^2.5.1"
-  checksum: 10c0/67a1b2f7cc985aaaa11b01e8ddd4fffa4f285837bc7a209738eb8203aa34bdafeb8507ed75fd883ddbabd641a036ca0a8d984e760f28ad4a9d60bff29d0a60bb
+  checksum: 10c0/0d64f880150e7dfb92ceff2b4ac865f36aa1e295120920246492ffd0146562dabf79ba8699af1c8833f8a7954818d4d146b7b02f808df4d6024fb99f98b2f78d
   languageName: node
   linkType: hard
 
@@ -135,22 +135,22 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-create-class-features-plugin@npm:^7.24.1, @babel/helper-create-class-features-plugin@npm:^7.24.4":
-  version: 7.24.4
-  resolution: "@babel/helper-create-class-features-plugin@npm:7.24.4"
+"@babel/helper-create-class-features-plugin@npm:^7.24.1, @babel/helper-create-class-features-plugin@npm:^7.24.4, @babel/helper-create-class-features-plugin@npm:^7.24.5":
+  version: 7.24.5
+  resolution: "@babel/helper-create-class-features-plugin@npm:7.24.5"
   dependencies:
     "@babel/helper-annotate-as-pure": "npm:^7.22.5"
     "@babel/helper-environment-visitor": "npm:^7.22.20"
     "@babel/helper-function-name": "npm:^7.23.0"
-    "@babel/helper-member-expression-to-functions": "npm:^7.23.0"
+    "@babel/helper-member-expression-to-functions": "npm:^7.24.5"
     "@babel/helper-optimise-call-expression": "npm:^7.22.5"
     "@babel/helper-replace-supers": "npm:^7.24.1"
     "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.22.5"
-    "@babel/helper-split-export-declaration": "npm:^7.22.6"
+    "@babel/helper-split-export-declaration": "npm:^7.24.5"
     semver: "npm:^6.3.1"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10c0/6ebb38375dcd44c79f40008c2de4d023376cf436c135439f15c9c54603c2d6a8ada39b2e07be545da684d9e40b602a0cb0d1670f3877d056deb5f0d786c4bf86
+  checksum: 10c0/afc72e8075a249663f8024ef1760de4c0b9252bdde16419ac955fa7e15b8d4096ca1e01f796df4fa8cfdb056708886f60b631ad492242a8e47307974fc305920
   languageName: node
   linkType: hard
 
@@ -208,12 +208,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-member-expression-to-functions@npm:^7.23.0":
-  version: 7.23.0
-  resolution: "@babel/helper-member-expression-to-functions@npm:7.23.0"
+"@babel/helper-member-expression-to-functions@npm:^7.23.0, @babel/helper-member-expression-to-functions@npm:^7.24.5":
+  version: 7.24.5
+  resolution: "@babel/helper-member-expression-to-functions@npm:7.24.5"
   dependencies:
-    "@babel/types": "npm:^7.23.0"
-  checksum: 10c0/b810daddf093ffd0802f1429052349ed9ea08ef7d0c56da34ffbcdecbdafac86f95bdea2fe30e0e0e629febc7dd41b56cb5eacc10d1a44336d37b755dac31fa4
+    "@babel/types": "npm:^7.24.5"
+  checksum: 10c0/a3c0276a1ede8648a0e6fd86ad846cd57421d05eddfa29446b8b5a013db650462022b9ec1e65ea32c747d0542d729c80866830697f94fb12d603e87c51f080a5
   languageName: node
   linkType: hard
 
@@ -226,18 +226,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-module-transforms@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/helper-module-transforms@npm:7.23.3"
+"@babel/helper-module-transforms@npm:^7.23.3, @babel/helper-module-transforms@npm:^7.24.5":
+  version: 7.24.5
+  resolution: "@babel/helper-module-transforms@npm:7.24.5"
   dependencies:
     "@babel/helper-environment-visitor": "npm:^7.22.20"
-    "@babel/helper-module-imports": "npm:^7.22.15"
-    "@babel/helper-simple-access": "npm:^7.22.5"
-    "@babel/helper-split-export-declaration": "npm:^7.22.6"
-    "@babel/helper-validator-identifier": "npm:^7.22.20"
+    "@babel/helper-module-imports": "npm:^7.24.3"
+    "@babel/helper-simple-access": "npm:^7.24.5"
+    "@babel/helper-split-export-declaration": "npm:^7.24.5"
+    "@babel/helper-validator-identifier": "npm:^7.24.5"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10c0/211e1399d0c4993671e8e5c2b25383f08bee40004ace5404ed4065f0e9258cc85d99c1b82fd456c030ce5cfd4d8f310355b54ef35de9924eabfc3dff1331d946
+  checksum: 10c0/6e77d72f62b7e87abaea800ea0bccd4d54cde26485750969f5f493c032eb63251eb50c3522cace557781565d51c1d0c4bcc866407d24becfb109c18fb92c978d
   languageName: node
   linkType: hard
 
@@ -250,10 +250,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-plugin-utils@npm:^7.0.0, @babel/helper-plugin-utils@npm:^7.10.4, @babel/helper-plugin-utils@npm:^7.12.13, @babel/helper-plugin-utils@npm:^7.14.5, @babel/helper-plugin-utils@npm:^7.18.6, @babel/helper-plugin-utils@npm:^7.22.5, @babel/helper-plugin-utils@npm:^7.24.0, @babel/helper-plugin-utils@npm:^7.8.0, @babel/helper-plugin-utils@npm:^7.8.3":
-  version: 7.24.0
-  resolution: "@babel/helper-plugin-utils@npm:7.24.0"
-  checksum: 10c0/90f41bd1b4dfe7226b1d33a4bb745844c5c63e400f9e4e8bf9103a7ceddd7d425d65333b564d9daba3cebd105985764d51b4bd4c95822b97c2e3ac1201a8a5da
+"@babel/helper-plugin-utils@npm:^7.0.0, @babel/helper-plugin-utils@npm:^7.10.4, @babel/helper-plugin-utils@npm:^7.12.13, @babel/helper-plugin-utils@npm:^7.14.5, @babel/helper-plugin-utils@npm:^7.18.6, @babel/helper-plugin-utils@npm:^7.22.5, @babel/helper-plugin-utils@npm:^7.24.0, @babel/helper-plugin-utils@npm:^7.24.5, @babel/helper-plugin-utils@npm:^7.8.0, @babel/helper-plugin-utils@npm:^7.8.3":
+  version: 7.24.5
+  resolution: "@babel/helper-plugin-utils@npm:7.24.5"
+  checksum: 10c0/4ae40094e6a2f183281213344f4df60c66b16b19a2bc38d2bb11810a6dc0a0e7ec638957d0e433ff8b615775b8f3cd1b7edbf59440d1b50e73c389fc22913377
   languageName: node
   linkType: hard
 
@@ -283,12 +283,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-simple-access@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/helper-simple-access@npm:7.22.5"
+"@babel/helper-simple-access@npm:^7.22.5, @babel/helper-simple-access@npm:^7.24.5":
+  version: 7.24.5
+  resolution: "@babel/helper-simple-access@npm:7.24.5"
   dependencies:
-    "@babel/types": "npm:^7.22.5"
-  checksum: 10c0/f0cf81a30ba3d09a625fd50e5a9069e575c5b6719234e04ee74247057f8104beca89ed03e9217b6e9b0493434cedc18c5ecca4cea6244990836f1f893e140369
+    "@babel/types": "npm:^7.24.5"
+  checksum: 10c0/d96a0ab790a400f6c2dcbd9457b9ca74b9ba6d0f67ff9cd5bcc73792c8fbbd0847322a0dddbd8987dd98610ee1637c680938c7d83d3ffce7d06d7519d823d996
   languageName: node
   linkType: hard
 
@@ -301,26 +301,26 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-split-export-declaration@npm:^7.22.6":
-  version: 7.22.6
-  resolution: "@babel/helper-split-export-declaration@npm:7.22.6"
+"@babel/helper-split-export-declaration@npm:^7.24.5":
+  version: 7.24.5
+  resolution: "@babel/helper-split-export-declaration@npm:7.24.5"
   dependencies:
-    "@babel/types": "npm:^7.22.5"
-  checksum: 10c0/d83e4b623eaa9622c267d3c83583b72f3aac567dc393dda18e559d79187961cb29ae9c57b2664137fc3d19508370b12ec6a81d28af73a50e0846819cb21c6e44
+    "@babel/types": "npm:^7.24.5"
+  checksum: 10c0/d7a812d67d031a348f3fb0e6263ce2dbe6038f81536ba7fb16db385383bcd6542b71833194303bf6d3d0e4f7b6b584c9c8fae8772122e2ce68fc9bdf07f4135d
   languageName: node
   linkType: hard
 
-"@babel/helper-string-parser@npm:^7.23.4":
-  version: 7.23.4
-  resolution: "@babel/helper-string-parser@npm:7.23.4"
-  checksum: 10c0/f348d5637ad70b6b54b026d6544bd9040f78d24e7ec245a0fc42293968181f6ae9879c22d89744730d246ce8ec53588f716f102addd4df8bbc79b73ea10004ac
+"@babel/helper-string-parser@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/helper-string-parser@npm:7.24.1"
+  checksum: 10c0/2f9bfcf8d2f9f083785df0501dbab92770111ece2f90d120352fda6dd2a7d47db11b807d111e6f32aa1ba6d763fe2dc6603d153068d672a5d0ad33ca802632b2
   languageName: node
   linkType: hard
 
-"@babel/helper-validator-identifier@npm:^7.22.20":
-  version: 7.22.20
-  resolution: "@babel/helper-validator-identifier@npm:7.22.20"
-  checksum: 10c0/dcad63db345fb110e032de46c3688384b0008a42a4845180ce7cd62b1a9c0507a1bed727c4d1060ed1a03ae57b4d918570259f81724aaac1a5b776056f37504e
+"@babel/helper-validator-identifier@npm:^7.22.20, @babel/helper-validator-identifier@npm:^7.24.5":
+  version: 7.24.5
+  resolution: "@babel/helper-validator-identifier@npm:7.24.5"
+  checksum: 10c0/05f957229d89ce95a137d04e27f7d0680d84ae48b6ad830e399db0779341f7d30290f863a93351b4b3bde2166737f73a286ea42856bb07c8ddaa95600d38645c
   languageName: node
   linkType: hard
 
@@ -342,14 +342,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helpers@npm:^7.24.4":
-  version: 7.24.4
-  resolution: "@babel/helpers@npm:7.24.4"
+"@babel/helpers@npm:^7.24.5":
+  version: 7.24.5
+  resolution: "@babel/helpers@npm:7.24.5"
   dependencies:
     "@babel/template": "npm:^7.24.0"
-    "@babel/traverse": "npm:^7.24.1"
-    "@babel/types": "npm:^7.24.0"
-  checksum: 10c0/747ef62b7fe87de31a2f3c19ff337a86cbb79be2f6c18af63133b614ab5a8f6da5b06ae4b06fb0e71271cb6a27efec6f8b6c9f44c60b8a18777832dc7929e6c5
+    "@babel/traverse": "npm:^7.24.5"
+    "@babel/types": "npm:^7.24.5"
+  checksum: 10c0/0630b0223c3a9a34027ddc05b3bac54d68d5957f84e92d2d4814b00448a76e12f9188f9c85cfce2011696d82a8ffcbd8189da097c0af0181d32eb27eca34185e
   languageName: node
   linkType: hard
 
@@ -365,24 +365,24 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.24.0, @babel/parser@npm:^7.24.1, @babel/parser@npm:^7.24.4":
-  version: 7.24.4
-  resolution: "@babel/parser@npm:7.24.4"
+"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.24.0, @babel/parser@npm:^7.24.5":
+  version: 7.24.5
+  resolution: "@babel/parser@npm:7.24.5"
   bin:
     parser: ./bin/babel-parser.js
-  checksum: 10c0/8381e1efead5069cb7ed2abc3a583f4a86289b2f376c75cecc69f59a8eb36df18274b1886cecf2f97a6a0dff5334b27330f58535be9b3e4e26102cc50e12eac8
+  checksum: 10c0/8333a6ad5328bad34fa0e12bcee147c3345ea9a438c0909e7c68c6cfbea43c464834ffd7eabd1cbc1c62df0a558e22ffade9f5b29440833ba7b33d96a71f88c0
   languageName: node
   linkType: hard
 
-"@babel/plugin-bugfix-firefox-class-in-computed-class-key@npm:^7.24.4":
-  version: 7.24.4
-  resolution: "@babel/plugin-bugfix-firefox-class-in-computed-class-key@npm:7.24.4"
+"@babel/plugin-bugfix-firefox-class-in-computed-class-key@npm:^7.24.5":
+  version: 7.24.5
+  resolution: "@babel/plugin-bugfix-firefox-class-in-computed-class-key@npm:7.24.5"
   dependencies:
     "@babel/helper-environment-visitor": "npm:^7.22.20"
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-plugin-utils": "npm:^7.24.5"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10c0/9aed453a1a21e4fd29add0b4a2d82a2c6f43a47c80d28411f8327f2a714064bc93a6f622c701d263970e0d72d7901d28f7f51e91ba91a31306efe8f17c411182
+  checksum: 10c0/b471972dcc4a3ba32821329a57725e2b563421e975d7ffec7fcabd70af0fced6a50bcc9ed2a8cbd4a9ac7c09cfbf43c7116e82f3b9064b33a22309500b632108
   languageName: node
   linkType: hard
 
@@ -712,14 +712,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-block-scoping@npm:^7.24.4":
-  version: 7.24.4
-  resolution: "@babel/plugin-transform-block-scoping@npm:7.24.4"
+"@babel/plugin-transform-block-scoping@npm:^7.24.5":
+  version: 7.24.5
+  resolution: "@babel/plugin-transform-block-scoping@npm:7.24.5"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-plugin-utils": "npm:^7.24.5"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/62f55fd1b60a115506e9553c3bf925179b1ab8a42dc31471c4e3ada20573a488b5c5e3317145da352493ef07f1d9750ce1f8a49cb3f39489ac1ab42e5ddc883d
+  checksum: 10c0/85997fc8179b7d26e8af30865aeb91789f3bc1f0cd5643ed25f25891ff9c071460ec1220599b19070b424a3b902422f682e9b02e515872540173eae2e25f760c
   languageName: node
   linkType: hard
 
@@ -748,21 +748,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-classes@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-classes@npm:7.24.1"
+"@babel/plugin-transform-classes@npm:^7.24.5":
+  version: 7.24.5
+  resolution: "@babel/plugin-transform-classes@npm:7.24.5"
   dependencies:
     "@babel/helper-annotate-as-pure": "npm:^7.22.5"
     "@babel/helper-compilation-targets": "npm:^7.23.6"
     "@babel/helper-environment-visitor": "npm:^7.22.20"
     "@babel/helper-function-name": "npm:^7.23.0"
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-plugin-utils": "npm:^7.24.5"
     "@babel/helper-replace-supers": "npm:^7.24.1"
-    "@babel/helper-split-export-declaration": "npm:^7.22.6"
+    "@babel/helper-split-export-declaration": "npm:^7.24.5"
     globals: "npm:^11.1.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/586a95826be4d68056fa23d8e6c34353ce2ea59bf3ca8cf62bc784e60964d492d76e1b48760c43fd486ffb65a79d3fed9a4f91289e4f526f88c3b6acc0dfb00e
+  checksum: 10c0/4affcbb7cb01fa4764c7a4b534c30fd24a4b68e680a2d6e242dd7ca8726490f0f1426c44797deff84a38a162e0629718900c68d28daffe2b12adf5b4194156a7
   languageName: node
   linkType: hard
 
@@ -778,14 +778,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-destructuring@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-destructuring@npm:7.24.1"
+"@babel/plugin-transform-destructuring@npm:^7.24.5":
+  version: 7.24.5
+  resolution: "@babel/plugin-transform-destructuring@npm:7.24.5"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-plugin-utils": "npm:^7.24.5"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/a08e706a9274a699abc3093f38c72d4a5354eac11c44572cc9ea049915b6e03255744297069fd94fcce82380725c5d6b1b11b9a84c0081aa3aa6fc2fdab98ef6
+  checksum: 10c0/6a37953a95f04b335bf3e2118fb93f50dd9593c658d1b2f8918a380a2ee30f1b420139eccf7ec3873c86a8208527895fcf6b7e21c0e734a6ad6e5d5042eace4d
   languageName: node
   linkType: hard
 
@@ -1017,17 +1017,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-object-rest-spread@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-object-rest-spread@npm:7.24.1"
+"@babel/plugin-transform-object-rest-spread@npm:^7.24.5":
+  version: 7.24.5
+  resolution: "@babel/plugin-transform-object-rest-spread@npm:7.24.5"
   dependencies:
     "@babel/helper-compilation-targets": "npm:^7.23.6"
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-plugin-utils": "npm:^7.24.5"
     "@babel/plugin-syntax-object-rest-spread": "npm:^7.8.3"
-    "@babel/plugin-transform-parameters": "npm:^7.24.1"
+    "@babel/plugin-transform-parameters": "npm:^7.24.5"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/e301f1a66b63bafc2bce885305cc88ab30ec875b5e2c7933fb7f9cbf0d954685aa10334ffcecf147ba19d6a1d7ffab37baf4ce871849d395941c56fdb3060f73
+  checksum: 10c0/91d7303af9b5744b8f569c1b8e45c9c9322ded05e7ee94e71b9ff2327f0d2c7b5aa87e040697a6baacc2dcb5c5e5e00913087c36f24c006bdaa4f958fd5bfd2d
   languageName: node
   linkType: hard
 
@@ -1055,27 +1055,27 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-optional-chaining@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-optional-chaining@npm:7.24.1"
+"@babel/plugin-transform-optional-chaining@npm:^7.24.1, @babel/plugin-transform-optional-chaining@npm:^7.24.5":
+  version: 7.24.5
+  resolution: "@babel/plugin-transform-optional-chaining@npm:7.24.5"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-plugin-utils": "npm:^7.24.5"
     "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.22.5"
     "@babel/plugin-syntax-optional-chaining": "npm:^7.8.3"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/b4688795229c9e9ce978eccf979fe515eb4e8d864d2dcd696baa937c8db13e3d46cff664a3cd6119dfe60e261f5d359b10c6783effab7cc91d75d03ad7f43d05
+  checksum: 10c0/f4e9446ec69f58f40b7843ce7603cfc50332976e6e794d4ddbe6b24670cd50ebc7766c4e3cbaecf0fbb744e98cbfbb54146f4e966314b1d58511b8bbf3d2722b
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-parameters@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-parameters@npm:7.24.1"
+"@babel/plugin-transform-parameters@npm:^7.24.5":
+  version: 7.24.5
+  resolution: "@babel/plugin-transform-parameters@npm:7.24.5"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-plugin-utils": "npm:^7.24.5"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/eee8d2f72d3ee0876dc8d85f949f4adf34685cfe36c814ebc20c96315f3891a53d43c764d636b939e34d55e6a6a4af9aa57ed0d7f9439eb5771a07277c669e55
+  checksum: 10c0/e08b8c46a24b1b21dde7783cb0aeb56ffe9ef6d6f1795649ce76273657158d3bfa5370c6594200ed7d371983b599c8e194b76108dffed9ab5746fe630ef2e8f5
   languageName: node
   linkType: hard
 
@@ -1091,17 +1091,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-private-property-in-object@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-private-property-in-object@npm:7.24.1"
+"@babel/plugin-transform-private-property-in-object@npm:^7.24.5":
+  version: 7.24.5
+  resolution: "@babel/plugin-transform-private-property-in-object@npm:7.24.5"
   dependencies:
     "@babel/helper-annotate-as-pure": "npm:^7.22.5"
-    "@babel/helper-create-class-features-plugin": "npm:^7.24.1"
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-create-class-features-plugin": "npm:^7.24.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.5"
     "@babel/plugin-syntax-private-property-in-object": "npm:^7.14.5"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/33d2b9737de7667d7a1b704eef99bfecc6736157d9ea28c2e09010d5f25e33ff841c41d89a4430c5d47f4eb3384e24770fa0ec79600e1e38d6d16e2f9333b4b5
+  checksum: 10c0/de7182bfde298e56c08a5d7ee1156f83c9af8c856bbe2248438848846a4ce544e050666bd0482e16a6006195e8be4923abd14650bef51fa0edd7f82014c2efcd
   languageName: node
   linkType: hard
 
@@ -1272,14 +1272,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-typeof-symbol@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-typeof-symbol@npm:7.24.1"
+"@babel/plugin-transform-typeof-symbol@npm:^7.24.5":
+  version: 7.24.5
+  resolution: "@babel/plugin-transform-typeof-symbol@npm:7.24.5"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-plugin-utils": "npm:^7.24.5"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/d392f549bfd13414f59feecdf3fb286f266a3eb9107a9de818e57907bda56eed08d1f6f8e314d09bf99252df026a7fd4d5df839acd45078a777abcebaa9a8593
+  checksum: 10c0/5f0b5e33a86b84d89673829ffa2b5f175e102d3d0f45917cda121bc2b3650e1e5bb7a653f8cc1059c5b3a7b2e91e1aafd6623028b96ae752715cc5c2171c96e5
   languageName: node
   linkType: hard
 
@@ -1345,14 +1345,14 @@ __metadata:
   linkType: hard
 
 "@babel/preset-env@npm:^7.11.0, @babel/preset-env@npm:^7.12.1, @babel/preset-env@npm:^7.22.4":
-  version: 7.24.4
-  resolution: "@babel/preset-env@npm:7.24.4"
+  version: 7.24.5
+  resolution: "@babel/preset-env@npm:7.24.5"
   dependencies:
     "@babel/compat-data": "npm:^7.24.4"
     "@babel/helper-compilation-targets": "npm:^7.23.6"
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-plugin-utils": "npm:^7.24.5"
     "@babel/helper-validator-option": "npm:^7.23.5"
-    "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "npm:^7.24.4"
+    "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "npm:^7.24.5"
     "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "npm:^7.24.1"
     "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "npm:^7.24.1"
     "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "npm:^7.24.1"
@@ -1379,12 +1379,12 @@ __metadata:
     "@babel/plugin-transform-async-generator-functions": "npm:^7.24.3"
     "@babel/plugin-transform-async-to-generator": "npm:^7.24.1"
     "@babel/plugin-transform-block-scoped-functions": "npm:^7.24.1"
-    "@babel/plugin-transform-block-scoping": "npm:^7.24.4"
+    "@babel/plugin-transform-block-scoping": "npm:^7.24.5"
     "@babel/plugin-transform-class-properties": "npm:^7.24.1"
     "@babel/plugin-transform-class-static-block": "npm:^7.24.4"
-    "@babel/plugin-transform-classes": "npm:^7.24.1"
+    "@babel/plugin-transform-classes": "npm:^7.24.5"
     "@babel/plugin-transform-computed-properties": "npm:^7.24.1"
-    "@babel/plugin-transform-destructuring": "npm:^7.24.1"
+    "@babel/plugin-transform-destructuring": "npm:^7.24.5"
     "@babel/plugin-transform-dotall-regex": "npm:^7.24.1"
     "@babel/plugin-transform-duplicate-keys": "npm:^7.24.1"
     "@babel/plugin-transform-dynamic-import": "npm:^7.24.1"
@@ -1404,13 +1404,13 @@ __metadata:
     "@babel/plugin-transform-new-target": "npm:^7.24.1"
     "@babel/plugin-transform-nullish-coalescing-operator": "npm:^7.24.1"
     "@babel/plugin-transform-numeric-separator": "npm:^7.24.1"
-    "@babel/plugin-transform-object-rest-spread": "npm:^7.24.1"
+    "@babel/plugin-transform-object-rest-spread": "npm:^7.24.5"
     "@babel/plugin-transform-object-super": "npm:^7.24.1"
     "@babel/plugin-transform-optional-catch-binding": "npm:^7.24.1"
-    "@babel/plugin-transform-optional-chaining": "npm:^7.24.1"
-    "@babel/plugin-transform-parameters": "npm:^7.24.1"
+    "@babel/plugin-transform-optional-chaining": "npm:^7.24.5"
+    "@babel/plugin-transform-parameters": "npm:^7.24.5"
     "@babel/plugin-transform-private-methods": "npm:^7.24.1"
-    "@babel/plugin-transform-private-property-in-object": "npm:^7.24.1"
+    "@babel/plugin-transform-private-property-in-object": "npm:^7.24.5"
     "@babel/plugin-transform-property-literals": "npm:^7.24.1"
     "@babel/plugin-transform-regenerator": "npm:^7.24.1"
     "@babel/plugin-transform-reserved-words": "npm:^7.24.1"
@@ -1418,7 +1418,7 @@ __metadata:
     "@babel/plugin-transform-spread": "npm:^7.24.1"
     "@babel/plugin-transform-sticky-regex": "npm:^7.24.1"
     "@babel/plugin-transform-template-literals": "npm:^7.24.1"
-    "@babel/plugin-transform-typeof-symbol": "npm:^7.24.1"
+    "@babel/plugin-transform-typeof-symbol": "npm:^7.24.5"
     "@babel/plugin-transform-unicode-escapes": "npm:^7.24.1"
     "@babel/plugin-transform-unicode-property-regex": "npm:^7.24.1"
     "@babel/plugin-transform-unicode-regex": "npm:^7.24.1"
@@ -1431,7 +1431,7 @@ __metadata:
     semver: "npm:^6.3.1"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/72a79d0cd38cb26f143509dd0c58db34b5b1ae90116863f55a404f0eb06a64a3cdcb1abd0b6435fafe463bbf55b82ffcf56aedee91e8d37797bf53e4ae74c413
+  checksum: 10c0/2cc0edae09205d6409a75d02e53aaa1c590e89adbb7b389019c7b75e4c47b6b63eeb1a816df5c42b672ce410747e7ddc23b6747e8e41a6c95d6fa00c665509e2
   languageName: node
   linkType: hard
 
@@ -1496,11 +1496,11 @@ __metadata:
   linkType: hard
 
 "@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.0, @babel/runtime@npm:^7.12.13, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.13.8, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.2.0, @babel/runtime@npm:^7.20.13, @babel/runtime@npm:^7.22.3, @babel/runtime@npm:^7.23.2, @babel/runtime@npm:^7.3.1, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.6.3, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.8.7, @babel/runtime@npm:^7.9.2":
-  version: 7.24.4
-  resolution: "@babel/runtime@npm:7.24.4"
+  version: 7.24.5
+  resolution: "@babel/runtime@npm:7.24.5"
   dependencies:
     regenerator-runtime: "npm:^0.14.0"
-  checksum: 10c0/785aff96a3aa8ff97f90958e1e8a7b1d47f793b204b47c6455eaadc3f694f48c97cd5c0a921fe3596d818e71f18106610a164fb0f1c71fd68c622a58269d537c
+  checksum: 10c0/05730e43e8ba6550eae9fd4fb5e7d9d3cb91140379425abcb2a1ff9cebad518a280d82c4c4b0f57ada26a863106ac54a748d90c775790c0e2cd0ddd85ccdf346
   languageName: node
   linkType: hard
 
@@ -1515,32 +1515,32 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/traverse@npm:7, @babel/traverse@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/traverse@npm:7.24.1"
+"@babel/traverse@npm:7, @babel/traverse@npm:^7.24.5":
+  version: 7.24.5
+  resolution: "@babel/traverse@npm:7.24.5"
   dependencies:
-    "@babel/code-frame": "npm:^7.24.1"
-    "@babel/generator": "npm:^7.24.1"
+    "@babel/code-frame": "npm:^7.24.2"
+    "@babel/generator": "npm:^7.24.5"
     "@babel/helper-environment-visitor": "npm:^7.22.20"
     "@babel/helper-function-name": "npm:^7.23.0"
     "@babel/helper-hoist-variables": "npm:^7.22.5"
-    "@babel/helper-split-export-declaration": "npm:^7.22.6"
-    "@babel/parser": "npm:^7.24.1"
-    "@babel/types": "npm:^7.24.0"
+    "@babel/helper-split-export-declaration": "npm:^7.24.5"
+    "@babel/parser": "npm:^7.24.5"
+    "@babel/types": "npm:^7.24.5"
     debug: "npm:^4.3.1"
     globals: "npm:^11.1.0"
-  checksum: 10c0/c087b918f6823776537ba246136c70e7ce0719fc05361ebcbfd16f4e6f2f6f1f8f4f9167f1d9b675f27d12074839605189cc9d689de20b89a85e7c140f23daab
+  checksum: 10c0/3f22534bc2b2ed9208e55ef48af3b32939032b23cb9dc4037447cb108640df70bbb0b9fea86e9c58648949fdc2cb14e89aa79ffa3c62a5dd43459a52fe8c01d1
   languageName: node
   linkType: hard
 
-"@babel/types@npm:^7.0.0, @babel/types@npm:^7.0.0-beta.49, @babel/types@npm:^7.12.11, @babel/types@npm:^7.12.6, @babel/types@npm:^7.20.7, @babel/types@npm:^7.22.10, @babel/types@npm:^7.22.15, @babel/types@npm:^7.22.19, @babel/types@npm:^7.22.5, @babel/types@npm:^7.23.0, @babel/types@npm:^7.23.4, @babel/types@npm:^7.24.0, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3":
-  version: 7.24.0
-  resolution: "@babel/types@npm:7.24.0"
+"@babel/types@npm:^7.0.0, @babel/types@npm:^7.0.0-beta.49, @babel/types@npm:^7.12.11, @babel/types@npm:^7.12.6, @babel/types@npm:^7.20.7, @babel/types@npm:^7.22.10, @babel/types@npm:^7.22.15, @babel/types@npm:^7.22.19, @babel/types@npm:^7.22.5, @babel/types@npm:^7.23.0, @babel/types@npm:^7.23.4, @babel/types@npm:^7.24.0, @babel/types@npm:^7.24.5, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3":
+  version: 7.24.5
+  resolution: "@babel/types@npm:7.24.5"
   dependencies:
-    "@babel/helper-string-parser": "npm:^7.23.4"
-    "@babel/helper-validator-identifier": "npm:^7.22.20"
+    "@babel/helper-string-parser": "npm:^7.24.1"
+    "@babel/helper-validator-identifier": "npm:^7.24.5"
     to-fast-properties: "npm:^2.0.0"
-  checksum: 10c0/777a0bb5dbe038ca4c905fdafb1cdb6bdd10fe9d63ce13eca0bd91909363cbad554a53dc1f902004b78c1dcbc742056f877f2c99eeedff647333b1fadf51235d
+  checksum: 10c0/e1284eb046c5e0451b80220d1200e2327e0a8544a2fe45bb62c952e5fdef7099c603d2336b17b6eac3cc046b7a69bfbce67fe56e1c0ea48cd37c65cb88638f2a
   languageName: node
   linkType: hard
 

From 40d7a553d222157aac56b2f5d9e224403e57eec3 Mon Sep 17 00:00:00 2001
From: Shlee <github@shl.ee>
Date: Tue, 30 Apr 2024 18:51:39 +1000
Subject: [PATCH 0877/2191] Minor phrasing on tootcli statuses remove (#30122)

---
 lib/mastodon/cli/statuses.rb | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/mastodon/cli/statuses.rb b/lib/mastodon/cli/statuses.rb
index 57b03c941c4a87..f441dbcd8494eb 100644
--- a/lib/mastodon/cli/statuses.rb
+++ b/lib/mastodon/cli/statuses.rb
@@ -191,24 +191,24 @@ def remove_orphans_conversations
 
     def vacuum_and_analyze_statuses
       if options[:compress_database]
-        say('Run VACUUM FULL ANALYZE to statuses...')
+        say('Running "VACUUM FULL ANALYZE statuses"...')
         ActiveRecord::Base.connection.execute('VACUUM FULL ANALYZE statuses')
-        say('Run REINDEX to statuses...')
+        say('Running "REINDEX TABLE statuses"...')
         ActiveRecord::Base.connection.execute('REINDEX TABLE statuses')
       else
-        say('Run ANALYZE to statuses...')
+        say('Running "ANALYZE statuses"...')
         ActiveRecord::Base.connection.execute('ANALYZE statuses')
       end
     end
 
     def vacuum_and_analyze_conversations
       if options[:compress_database]
-        say('Run VACUUM FULL ANALYZE to conversations...')
+        say('Running "VACUUM FULL ANALYZE conversations"...')
         ActiveRecord::Base.connection.execute('VACUUM FULL ANALYZE conversations')
-        say('Run REINDEX to conversations...')
+        say('Running "REINDEX TABLE conversations"...')
         ActiveRecord::Base.connection.execute('REINDEX TABLE conversations')
       else
-        say('Run ANALYZE to conversations...')
+        say('Running "ANALYZE conversations"...')
         ActiveRecord::Base.connection.execute('ANALYZE conversations')
       end
     end

From 56821ed87991eab3609dae53b2e2416053e42fd0 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 30 Apr 2024 11:05:53 +0200
Subject: [PATCH 0878/2191] New Crowdin Translations (automated) (#30128)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/cy.json | 64 +++++++++++++++++++++++++
 app/javascript/mastodon/locales/ia.json |  1 +
 app/javascript/mastodon/locales/ja.json |  4 +-
 app/javascript/mastodon/locales/lt.json | 14 ++++++
 app/javascript/mastodon/locales/sk.json |  1 +
 config/locales/cy.yml                   | 27 ++++++++++-
 config/locales/doorkeeper.cy.yml        |  1 +
 config/locales/doorkeeper.lt.yml        |  1 +
 config/locales/gl.yml                   |  1 +
 config/locales/ia.yml                   |  5 ++
 config/locales/lt.yml                   |  2 +
 config/locales/simple_form.cy.yml       |  4 ++
 config/locales/simple_form.fi.yml       |  1 +
 config/locales/simple_form.gl.yml       |  4 ++
 config/locales/simple_form.ia.yml       |  5 ++
 config/locales/simple_form.is.yml       |  2 +
 config/locales/simple_form.lt.yml       |  4 ++
 config/locales/sv.yml                   |  1 +
 18 files changed, 139 insertions(+), 3 deletions(-)

diff --git a/app/javascript/mastodon/locales/cy.json b/app/javascript/mastodon/locales/cy.json
index d2731b6294e4d5..fd8fc74be88788 100644
--- a/app/javascript/mastodon/locales/cy.json
+++ b/app/javascript/mastodon/locales/cy.json
@@ -89,6 +89,14 @@
   "announcement.announcement": "Cyhoeddiad",
   "attachments_list.unprocessed": "(heb eu prosesu)",
   "audio.hide": "Cuddio sain",
+  "block_modal.remote_users_caveat": "Byddwn yn gofyn i'r gweinydd {domain} barchu eich penderfyniad. Fodd bynnag, nid yw cydymffurfiad wedi'i warantu gan y gall rhai gweinyddwyr drin rhwystro mewn ffyrdd gwahanol. Mae'n bosibl y bydd postiadau cyhoeddus yn dal i fod yn weladwy i ddefnyddwyr nad ydynt wedi mewngofnodi.",
+  "block_modal.show_less": "Dangos llai",
+  "block_modal.show_more": "Dangos mwy",
+  "block_modal.they_cant_mention": "Nid ydynt yn gallu eich crybwyll na'ch dilyn.",
+  "block_modal.they_cant_see_posts": "Nid ydynt yn gallu gweld eich postiadau ac ni fyddwch yn gweld eu rhai hwy.",
+  "block_modal.they_will_know": "Gallant weld eu bod wedi'u rhwystro.",
+  "block_modal.title": "Rhwystro defnyddiwr?",
+  "block_modal.you_wont_see_mentions": "Ni welwch bostiadau sy'n sôn amdanynt.",
   "boost_modal.combo": "Mae modd pwyso {combo} er mwyn hepgor hyn tro nesa",
   "bundle_column_error.copy_stacktrace": "Copïo'r adroddiad gwall",
   "bundle_column_error.error.body": "Nid oedd modd cynhyrchu'r dudalen honno. Gall fod oherwydd gwall yn ein cod neu fater cydnawsedd porwr.",
@@ -169,6 +177,7 @@
   "confirmations.delete_list.message": "Ydych chi'n siŵr eich bod eisiau dileu'r rhestr hwn am byth?",
   "confirmations.discard_edit_media.confirm": "Dileu",
   "confirmations.discard_edit_media.message": "Mae gennych newidiadau heb eu cadw i'r disgrifiad cyfryngau neu'r rhagolwg - eu dileu beth bynnag?",
+  "confirmations.domain_block.confirm": "Rhwystro gweinydd",
   "confirmations.domain_block.message": "Ydych chi wir, wir eisiau blocio'r holl {domain}? Fel arfer, mae blocio neu dewi pobl penodol yn broses mwy effeithiol. Fyddwch chi ddim yn gweld cynnwys o'r parth hwnnw mewn ffrydiau cyhoeddus neu yn eich hysbysiadau. Bydd eich dilynwyr o'r parth hwnnw yn cael eu ddileu.",
   "confirmations.edit.confirm": "Golygu",
   "confirmations.edit.message": "Bydd golygu nawr yn trosysgrifennu'r neges rydych yn ei ysgrifennu ar hyn o bryd. Ydych chi'n siŵr eich bod eisiau gwneud hyn?",
@@ -200,6 +209,27 @@
   "dismissable_banner.explore_statuses": "Mae'r rhain yn bostiadau o bob rhan o'r we gymdeithasol sydd ar gynnydd heddiw. Mae postiadau mwy diweddar sydd â mwy o hybiau a ffefrynu'n cael eu graddio'n uwch.",
   "dismissable_banner.explore_tags": "Mae'r rhain yn hashnodau sydd ar gynnydd ar y we gymdeithasol heddiw. Mae hashnodau sy'n cael eu defnyddio gan fwy o unigolion gwahanol yn cael eu graddio'n uwch.",
   "dismissable_banner.public_timeline": "Dyma'r postiadau cyhoeddus diweddaraf gan bobl ar y we gymdeithasol y mae pobl ar {domain} yn eu dilyn.",
+  "domain_block_modal.block": "Rhwystro gweinydd",
+  "domain_block_modal.block_account_instead": "Rhwystro @{name} yn lle hynny",
+  "domain_block_modal.they_can_interact_with_old_posts": "Gall pobl o'r gweinydd hwn ryngweithio â'ch hen bostiadau.",
+  "domain_block_modal.they_cant_follow": "Ni all neb o'r gweinydd hwn eich dilyn.",
+  "domain_block_modal.they_wont_know": "Fyddan nhw ddim yn gwybod eu bod wedi cael eu rhwystro.",
+  "domain_block_modal.title": "Rhwystro parth?",
+  "domain_block_modal.you_will_lose_followers": "Bydd eich holl ddilynwyr o'r gweinydd hwn yn cael eu tynnu.",
+  "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.",
+  "domain_pill.server": "Gweinydd",
+  "domain_pill.their_handle": "Eu handlen:",
+  "domain_pill.their_server": "Eu cartref digidol, lle mae eu holl negeseuon yn byw.",
+  "domain_pill.their_username": "Eu dynodwr unigryw ar eu gweinydd. Mae'n bosibl dod o hyd i ddefnyddwyr gyda'r un enw defnyddiwr ar wahanol weinyddion.",
+  "domain_pill.username": "Enw Defnyddiwr",
+  "domain_pill.whats_in_a_handle": "Beth sydd mewn handlen?",
+  "domain_pill.who_they_are": "Gan fod handlen yn dweud pwy yw rhywun a ble maen nhw, gallwch chi ryngweithio â phobl ar draws gwe gymdeithasol <button>llwyfannau wedi'u pweru gan ActivityPub</button> .",
+  "domain_pill.who_you_are": "Oherwydd bod eich handlen yn dweud pwy ydych chi a ble rydych chi, gall pobl ryngweithio â chi ar draws gwe gymdeithasol <button>llwyfannau wedi'u pweru gan ActivityPub</button> .",
+  "domain_pill.your_handle": "Eich handlen:",
+  "domain_pill.your_server": "Eich cartref digidol, lle mae'ch holl bostiadau'n byw. Ddim yn hoffi'r un hon? Trosglwyddwch weinyddion ar unrhyw adeg a dewch â'ch dilynwyr hefyd.",
+  "domain_pill.your_username": "Eich dynodwr unigryw ar y gweinydd hwn. Mae'n bosibl dod o hyd i ddefnyddwyr gyda'r un enw defnyddiwr ar wahanol weinyddion.",
   "embed.instructions": "Gosodwch y post hwn ar eich gwefan drwy gopïo'r côd isod.",
   "embed.preview": "Dyma sut olwg fydd arno:",
   "emoji_button.activity": "Gweithgarwch",
@@ -267,6 +297,8 @@
   "filter_modal.select_filter.subtitle": "Defnyddiwch gategori sy'n bodoli eisoes neu crëu un newydd",
   "filter_modal.select_filter.title": "Hidlo'r postiad hwn",
   "filter_modal.title.status": "Hidlo postiad",
+  "filtered_notifications_banner.mentions": "{count, plural, one {crybwylliad} other {crybwylliad}}",
+  "filtered_notifications_banner.pending_requests": "Hysbysiadau gan {count, plural, =0 {neb} one {un person} other {# person}} efallai y gwyddoch amdanyn nhw",
   "filtered_notifications_banner.title": "Hysbysiadau wedi'u hidlo",
   "firehose.all": "Popeth",
   "firehose.local": "Gweinydd hwn",
@@ -276,6 +308,8 @@
   "follow_requests.unlocked_explanation": "Er nid yw eich cyfrif wedi'i gloi, roedd y staff {domain} yn meddwl efallai hoffech adolygu ceisiadau dilyn o'r cyfrifau rhain wrth law.",
   "follow_suggestions.curated_suggestion": "Dewis staff",
   "follow_suggestions.dismiss": "Peidio â dangos hwn eto",
+  "follow_suggestions.featured_longer": "Wedi'i ddewis â llaw gan dîm {domain}",
+  "follow_suggestions.friends_of_friends_longer": "Yn boblogaidd ymhlith y bobl rydych chi'n eu dilyn",
   "follow_suggestions.hints.featured": "Mae'r proffil hwn wedi'i ddewis yn arbennig gan dîm {domain}.",
   "follow_suggestions.hints.friends_of_friends": "Mae'r proffil hwn yn boblogaidd ymhlith y bobl rydych chi'n eu dilyn.",
   "follow_suggestions.hints.most_followed": "Mae'r proffil hwn yn un o'r rhai sy'n cael ei ddilyn fwyaf ar {domain}.",
@@ -283,6 +317,8 @@
   "follow_suggestions.hints.similar_to_recently_followed": "Mae'r proffil hwn yn debyg i'r proffiliau rydych chi wedi'u dilyn yn fwyaf diweddar.",
   "follow_suggestions.personalized_suggestion": "Awgrym personol",
   "follow_suggestions.popular_suggestion": "Awgrym poblogaidd",
+  "follow_suggestions.popular_suggestion_longer": "Yn boblogaidd ar {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Yn debyg i broffiliau y gwnaethoch chi eu dilyn yn ddiweddar",
   "follow_suggestions.view_all": "Gweld y cyfan",
   "follow_suggestions.who_to_follow": "Pwy i ddilyn",
   "followed_tags": "Hashnodau rydych yn eu dilyn",
@@ -396,6 +432,15 @@
   "loading_indicator.label": "Yn llwytho…",
   "media_gallery.toggle_visible": "{number, plural, one {Cuddio delwedd} other {Cuddio delwedd}}",
   "moved_to_account_banner.text": "Ar hyn y bryd, mae eich cyfrif {disabledAccount} wedi ei analluogi am i chi symud i {movedToAccount}.",
+  "mute_modal.hide_from_notifications": "Cuddio rhag hysbysiadau",
+  "mute_modal.hide_options": "Cuddio'r dewis",
+  "mute_modal.indefinite": "Nes i mi eu dad-dewi",
+  "mute_modal.show_options": "Dangos y dewis",
+  "mute_modal.they_can_mention_and_follow": "Gallan nhw eich crybwyll a'ch dilyn, ond fyddwch chi ddim yn eu gweld.",
+  "mute_modal.they_wont_know": "Fyddan nhw ddim yn gwybod eu bod wedi cael eu tawelu.",
+  "mute_modal.title": "Tewi defnyddiwr?",
+  "mute_modal.you_wont_see_mentions": "Welwch chi ddim postiadau sy'n sôn amdanyn nhw.",
+  "mute_modal.you_wont_see_posts": "Gallan nhw weld eich postiadau o hyd, ond fyddwch chi ddim yn gweld eu rhai hwy.",
   "navigation_bar.about": "Ynghylch",
   "navigation_bar.advanced_interface": "Agor mewn rhyngwyneb gwe uwch",
   "navigation_bar.blocks": "Defnyddwyr wedi eu blocio",
@@ -428,9 +473,23 @@
   "notification.follow": "Dilynodd {name} chi",
   "notification.follow_request": "Mae {name} wedi gwneud cais i'ch dilyn",
   "notification.mention": "Crybwyllodd {name} amdanoch chi",
+  "notification.moderation-warning.learn_more": "Dysgu mwy",
+  "notification.moderation_warning": "Rydych wedi derbyn rhybudd cymedroli",
+  "notification.moderation_warning.action_delete_statuses": "Mae rhai o'ch postiadau wedi'u dileu.",
+  "notification.moderation_warning.action_disable": "Mae eich cyfrif wedi'i analluogi.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Mae rhai o'ch postiadau wedi'u marcio'n sensitif.",
+  "notification.moderation_warning.action_none": "Mae eich cyfrif wedi derbyn rhybudd cymedroli.",
+  "notification.moderation_warning.action_sensitive": "Bydd eich postiadau'n cael eu marcio'n sensitif o hyn ymlaen.",
+  "notification.moderation_warning.action_silence": "Mae eich cyfrif wedi'i gyfyngu.",
+  "notification.moderation_warning.action_suspend": "Mae eich cyfrif wedi'i hatal.",
   "notification.own_poll": "Mae eich pleidlais wedi dod i ben",
   "notification.poll": "Mae pleidlais rydych wedi pleidleisio ynddi wedi dod i ben",
   "notification.reblog": "Hybodd {name} eich post",
+  "notification.relationships_severance_event": "Wedi colli cysylltiad â {name}",
+  "notification.relationships_severance_event.account_suspension": "Mae gweinyddwr o {from} wedi atal {target}, sy'n golygu na allwch dderbyn diweddariadau ganddynt mwyach na rhyngweithio â nhw.",
+  "notification.relationships_severance_event.domain_block": "Mae gweinyddwr o {from} wedi rhwystro {target}, gan gynnwys {followersCount} o'ch dilynwyr a {followingCount, plural, one {# cyfrif} other {# cyfrif}} arall rydych chi'n ei ddilyn.",
+  "notification.relationships_severance_event.learn_more": "Dysgu mwy",
+  "notification.relationships_severance_event.user_domain_block": "Rydych wedi rhwystro {target}, gan ddileu {followersCount} o'ch dilynwyr a {followingCount, plural, one {# cyfrif} other {#cyfrifon}} arall rydych yn ei ddilyn.",
   "notification.status": "{name} newydd ei bostio",
   "notification.update": "Golygodd {name} bostiad",
   "notification_requests.accept": "Derbyn",
@@ -443,6 +502,8 @@
   "notifications.column_settings.admin.sign_up": "Cofrestriadau newydd:",
   "notifications.column_settings.alert": "Hysbysiadau bwrdd gwaith",
   "notifications.column_settings.favourite": "Ffefrynnau:",
+  "notifications.column_settings.filter_bar.advanced": "Dangos pob categori",
+  "notifications.column_settings.filter_bar.category": "Bar hidlo cyflym",
   "notifications.column_settings.follow": "Dilynwyr newydd:",
   "notifications.column_settings.follow_request": "Ceisiadau dilyn newydd:",
   "notifications.column_settings.mention": "Crybwylliadau:",
@@ -653,9 +714,11 @@
   "status.direct": "Crybwyll yn breifat @{name}",
   "status.direct_indicator": "Crybwyll preifat",
   "status.edit": "Golygu",
+  "status.edited": "Golygwyd ddiwethaf {date}",
   "status.edited_x_times": "Golygwyd {count, plural, one {count} two {count} other {{count} gwaith}}",
   "status.embed": "Mewnblannu",
   "status.favourite": "Hoffi",
+  "status.favourites": "{count, plural, one {ffefryn} other {ffefryn}}",
   "status.filter": "Hidlo'r postiad hwn",
   "status.filtered": "Wedi'i hidlo",
   "status.hide": "Cuddio'r postiad",
@@ -676,6 +739,7 @@
   "status.reblog": "Hybu",
   "status.reblog_private": "Hybu i'r gynulleidfa wreiddiol",
   "status.reblogged_by": "Hybodd {name}",
+  "status.reblogs": "{count, plural, one {hwb} other {hwb}}",
   "status.reblogs.empty": "Does neb wedi hybio'r post yma eto. Pan y bydd rhywun yn gwneud, byddent yn ymddangos yma.",
   "status.redraft": "Dileu ac ailddrafftio",
   "status.remove_bookmark": "Tynnu nod tudalen",
diff --git a/app/javascript/mastodon/locales/ia.json b/app/javascript/mastodon/locales/ia.json
index 73634b99c159aa..1b969639dcb2d5 100644
--- a/app/javascript/mastodon/locales/ia.json
+++ b/app/javascript/mastodon/locales/ia.json
@@ -469,6 +469,7 @@
   "notification.follow": "{name} te ha sequite",
   "notification.follow_request": "{name} ha requestate de sequer te",
   "notification.mention": "{name} te ha mentionate",
+  "notification.moderation-warning.learn_more": "Apprender plus",
   "notification.own_poll": "Tu sondage ha finite",
   "notification.poll": "Un sondage in le qual tu ha votate ha finite",
   "notification.reblog": "{name} ha impulsate tu message",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index 6824a76a31610e..c11e4a2afdef77 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -299,7 +299,7 @@
   "filter_modal.title.status": "投稿をフィルターする",
   "filtered_notifications_banner.mentions": "{count, plural, one {メンション} other {メンション}}",
   "filtered_notifications_banner.pending_requests": "{count, plural, =0 {通知がブロックされているアカウントはありません} other {#アカウントからの通知がブロックされています}}",
-  "filtered_notifications_banner.title": "ブロック済みの通知",
+  "filtered_notifications_banner.title": "保留中の通知",
   "firehose.all": "すべて",
   "firehose.local": "このサーバー",
   "firehose.remote": "ほかのサーバー",
@@ -486,7 +486,7 @@
   "notification_requests.accept": "受け入れる",
   "notification_requests.dismiss": "無視",
   "notification_requests.notifications_from": "{name}からの通知",
-  "notification_requests.title": "ブロック済みの通知",
+  "notification_requests.title": "保留中の通知",
   "notifications.clear": "通知を消去",
   "notifications.clear_confirmation": "本当に通知を消去しますか？",
   "notifications.column_settings.admin.report": "新しい通報:",
diff --git a/app/javascript/mastodon/locales/lt.json b/app/javascript/mastodon/locales/lt.json
index 7b3511cfe142b8..546b9b75521b8e 100644
--- a/app/javascript/mastodon/locales/lt.json
+++ b/app/javascript/mastodon/locales/lt.json
@@ -282,6 +282,7 @@
   "filter_modal.select_filter.subtitle": "Naudok esamą kategoriją arba sukurk naują.",
   "filter_modal.select_filter.title": "Filtruoti šį įrašą",
   "filter_modal.title.status": "Filtruoti įrašą",
+  "filtered_notifications_banner.mentions": "{count, plural, one {paminėjimas} few {paminėjimai} many {paminėjimo} other {paminėjimų}}",
   "firehose.all": "Visi",
   "firehose.local": "Šis serveris",
   "firehose.remote": "Kiti serveriai",
@@ -290,6 +291,8 @@
   "follow_requests.unlocked_explanation": "Nors tavo paskyra neužrakinta, {domain} personalas mano, kad galbūt norėsi rankiniu būdu patikrinti šių paskyrų sekimo prašymus.",
   "follow_suggestions.curated_suggestion": "Personalo pasirinkimai",
   "follow_suggestions.dismiss": "Daugiau nerodyti",
+  "follow_suggestions.featured_longer": "Rankomis atrinkta {domain} komanda",
+  "follow_suggestions.friends_of_friends_longer": "Populiarus tarp žmonių, kurių seki",
   "follow_suggestions.hints.featured": "Šį profilį atrinko {domain} komanda.",
   "follow_suggestions.hints.friends_of_friends": "Šis profilis yra populiarus tarp žmonių, kuriuos seki.",
   "follow_suggestions.hints.most_followed": "Šis profilis yra vienas iš labiausiai sekamų {domain}.",
@@ -297,6 +300,8 @@
   "follow_suggestions.hints.similar_to_recently_followed": "Šis profilis panašus į profilius, kuriuos neseniai sekei.",
   "follow_suggestions.personalized_suggestion": "Suasmenintas pasiūlymas",
   "follow_suggestions.popular_suggestion": "Populiarus pasiūlymas",
+  "follow_suggestions.popular_suggestion_longer": "Populiarus domene {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Panašūs į profilius, kuriuos neseniai seki",
   "follow_suggestions.view_all": "Peržiūrėti viską",
   "follow_suggestions.who_to_follow": "Ką sekti",
   "followed_tags": "Sekami saitažodžiai",
@@ -442,6 +447,15 @@
   "notification.follow": "{name} seka tave",
   "notification.follow_request": "{name} paprašė tave sekti",
   "notification.mention": "{name} paminėjo tave",
+  "notification.moderation-warning.learn_more": "Sužinoti daugiau",
+  "notification.moderation_warning": "Gavai prižiūrėjimo įspėjimą",
+  "notification.moderation_warning.action_delete_statuses": "Kai kurie tavo įrašai buvo pašalintos.",
+  "notification.moderation_warning.action_disable": "Tavo paskyra buvo išjungta.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Kai kurie tavo įrašai buvo pažymėtos kaip jautrios.",
+  "notification.moderation_warning.action_none": "Tavo paskyra gavo prižiūrėjimo įspėjimą.",
+  "notification.moderation_warning.action_sensitive": "Nuo šiol tavo įrašai bus pažymėti kaip jautrūs.",
+  "notification.moderation_warning.action_silence": "Tavo paskyra buvo apribota.",
+  "notification.moderation_warning.action_suspend": "Tavo paskyra buvo sustabdyta.",
   "notification.own_poll": "Tavo apklausa baigėsi",
   "notification.poll": "Apklausa, kurioje balsavai, pasibaigė",
   "notification.reblog": "{name} pakėlė tavo įrašą",
diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json
index ea46b8223549ed..e126fdef029a92 100644
--- a/app/javascript/mastodon/locales/sk.json
+++ b/app/javascript/mastodon/locales/sk.json
@@ -246,6 +246,7 @@
   "empty_column.list": "Tento zoznam je zatiaľ prázdny. Keď ale členovia tohoto zoznamu uverejnia nové príspevky, objavia sa tu.",
   "empty_column.lists": "Zatiaľ nemáte žiadne zoznamy. Keď nejaký vytvoríte, zobrazí sa tu.",
   "empty_column.mutes": "Zatiaľ ste si nikoho nestíšili.",
+  "empty_column.notification_requests": "Všetko čisté! Nič tu nieje. Keď dostaneš nové oboznámenia, zobrazia sa tu podľa tvojich nastavení.",
   "empty_column.notifications": "Zatiaľ nemáte žiadne upozornenia. Začnú vám pribúdať, keď s vami začnú interagovať ostatní.",
   "empty_column.public": "Zatiaľ tu nič nie je. Napíšte niečo verejné alebo začnite sledovať účty z iných serverov, aby tu niečo pribudlo.",
   "error.unexpected_crash.explanation": "Pre chybu v našom kóde alebo problém s kompatibilitou prehliadača nebolo túto stránku možné zobraziť správne.",
diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index 93d249cb507c26..f96068f212b083 100644
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@@ -645,6 +645,9 @@ cy:
       actions_description_html: Penderfynwch pa gamau i'w cymryd i ddatrys yr adroddiad hwn. Os byddwch yn cymryd camau cosbol yn erbyn y cyfrif a adroddwyd, bydd hysbysiad e-bost yn cael ei anfon atyn nhw, ac eithrio pan fydd y categori <strong>Sbam</strong> yn cael ei ddewis.
       actions_description_remote_html: Penderfynwch pa gamau i'w cymryd i ddatrys yr adroddiad hwn. Bydd hyn ond yn effeithio ar sut <strong>mae'ch</strong> gweinydd yn cyfathrebu â'r cyfrif hwn o bell ac yn trin ei gynnwys.
       add_to_report: Ychwanegu rhagor i adroddiad
+      already_suspended_badges:
+        local: Wedi atal dros dro ar y gweinydd hwn yn barod
+        remote: Wedi'i atal eisoes ar eu gweinydd
       are_you_sure: Ydych chi'n siŵr?
       assign_to_self: Neilltuo i mi
       assigned: Cymedrolwr wedi'i neilltuo
@@ -804,6 +807,7 @@ cy:
         desc_html: Mae hyn yn dibynnu ar sgriptiau allanol gan hCaptcha, a all fod yn bryder diogelwch a phreifatrwydd. Yn ogystal, <strong>gall hyn wneud y broses gofrestru yn llawer llai hygyrch i rai pobl (yn enwedig yr anabl)</strong>. Am y rhesymau hyn, ystyriwch fesurau eraill fel cofrestru ar sail cymeradwyaeth neu ar sail gwahoddiad.
         title: Ei gwneud yn ofynnol i ddefnyddwyr newydd ddatrys CAPTCHA i gadarnhau eu cyfrif
       content_retention:
+        danger_zone: Parth perygl
         preamble: Rheoli sut mae cynnwys sy'n cael ei gynhyrchu gan ddefnyddwyr yn cael ei storio yn Mastodon.
         title: Cadw cynnwys
       default_noindex:
@@ -1756,13 +1760,26 @@ cy:
     import: Mewnforio
     import_and_export: Mewnforio ac allforio
     migrate: Mudo cyfrif
+    notifications: Hysbysiadau e-bost
     preferences: Dewisiadau
     profile: Proffil cyhoeddus
     relationships: Yn dilyn a dilynwyr
+    severed_relationships: Perthynasau wedi'u torri
     statuses_cleanup: Dileu postiadau'n awtomatig
     strikes: Rhybuddion cymedroli
     two_factor_authentication: Dilysu dau-ffactor
     webauthn_authentication: Allweddi diogelwch
+  severed_relationships:
+    download: Llwytho i lawr (%{count})
+    event_type:
+      account_suspension: Atal cyfrif (%{target_name})
+      domain_block: Ataliad gweinydd (%{target_name})
+      user_domain_block: Rydych wedi rhwystro %{target_name}
+    lost_followers: Dilynwyr coll
+    lost_follows: Yn dilyn coll
+    preamble: Efallai y byddwch yn colli dilynwyr a'r rhai rydych yn eu dilyn pan fyddwch yn rhwystro parth neu pan fydd eich cymedrolwyr yn penderfynu atal gweinydd o bell. Pan fydd hynny'n digwydd, byddwch yn gallu llwytho i lawr rhestrau o berthnasoedd wedi'u torri, i'w harchwilio ac o bosibl eu mewnforio ar weinydd arall.
+    purged: Mae gwybodaeth am y gweinydd hwn wedi'i dynnu gan weinyddwyr eich gweinydd.
+    type: Digwyddiad
   statuses:
     attached:
       audio:
@@ -1880,6 +1897,7 @@ cy:
     contrast: Mastodon (Cyferbyniad uchel)
     default: Mastodon (Tywyll)
     mastodon-light: Mastodon (Golau)
+    system: Awtomatig (defnyddio thema system)
   time:
     formats:
       default: "%b %d, %Y, %H:%M"
@@ -1992,6 +2010,13 @@ cy:
       follows_subtitle: Dilynwch gyfrifon adnabyddus
       follows_title: Pwy i ddilyn
       follows_view_more: Gweld mwy o bobl i ddilyn
+      hashtags_recent_count:
+        few: "%{people} o bobl yn y 2 ddiwrnod diwethaf"
+        many: "%{people} o bobl yn y 2 ddiwrnod diwethaf"
+        one: "%{people} person yn ystod y 2 ddiwrnod diwethaf"
+        other: "%{people} o bobl yn y 2 ddiwrnod diwethaf"
+        two: "%{people} o bobl yn y 2 ddiwrnod diwethaf"
+        zero: "%{people} o bobl yn y 2 ddiwrnod diwethaf"
       hashtags_subtitle: Gweld beth sy'n tueddu dros y 2 ddiwrnod diwethaf
       hashtags_title: Hashnodau tuedd
       hashtags_view_more: Gweld mwy o hashnodau tuedd
@@ -1999,7 +2024,7 @@ cy:
       post_step: Dywedwch helo wrth y byd gyda thestun, lluniau, fideos neu arolygon barn.
       post_title: Creu'ch postiad cyntaf
       share_action: Rhannu
-      share_step: Gadewch i'ch ffrindiau wybod sut i ddod o hyd i chi ar Mastodon!
+      share_step: Gadewch i'ch ffrindiau wybod sut i ddod o hyd i chi ar Mastodon.
       share_title: Rhannwch eich proffil Mastodon
       sign_in_action: Mewngofnodi
       subject: Croeso i Mastodon
diff --git a/config/locales/doorkeeper.cy.yml b/config/locales/doorkeeper.cy.yml
index e79aa0359f67b8..88cd2b9d53cb77 100644
--- a/config/locales/doorkeeper.cy.yml
+++ b/config/locales/doorkeeper.cy.yml
@@ -174,6 +174,7 @@ cy:
       read:filters: gweld eich hidlwyr
       read:follows: gweld eich dilynwyr
       read:lists: gweld eich rhestrau
+      read:me: darllen dim ond manylion elfennol eich cyfrif
       read:mutes: gweld eich anwybyddiadau
       read:notifications: gweld eich hysbysiadau
       read:reports: gweld eich adroddiadau
diff --git a/config/locales/doorkeeper.lt.yml b/config/locales/doorkeeper.lt.yml
index 6f63e0309d5058..847f41e816b8a7 100644
--- a/config/locales/doorkeeper.lt.yml
+++ b/config/locales/doorkeeper.lt.yml
@@ -174,6 +174,7 @@ lt:
       read:filters: matyti tavo filtrus
       read:follows: matyti tavo sekimus
       read:lists: matyti tavo sąrašus
+      read:me: skaityti tik pagrindinę paskyros informaciją
       read:mutes: matyti tavo nutildymus
       read:notifications: matyti tavo pranešimus
       read:reports: matyti tavo ataskaitas
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index f36d6783c31fc3..bdf6e5a75f2958 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -751,6 +751,7 @@ gl:
         desc_html: Ten dependencia de scripts externos desde hCaptcha, que podería ser un problema de seguridade e privacidade. Ademáis, <strong>pode diminuír a accesiblidade para algunhas persoas (principalmente as discapacitadas)</strong>. Por estas razóns, considera medidas alternativas como o rexistro por convite e a aprobación manual das contas.
         title: Pedirlle ás novas usuarias resolver un CAPTCHA para confirmar a súa conta
       content_retention:
+        danger_zone: Zona perigosa
         preamble: Controla como se gardan en Mastodon os contidos creados polas usuarias.
         title: Retención do contido
       default_noindex:
diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index 6c9929315610bc..9ec64b1390eb9d 100644
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -130,6 +130,7 @@ ia:
       silenced: Limitate
       statuses: Messages
       subscribe: Subscriber
+      suspend: Suspender
       suspended: Suspendite
       title: Contos
       unblock_email: Disblocar adresse de e-mail
@@ -141,6 +142,8 @@ ia:
       view_domain: Vider summario de dominio
     action_logs:
       action_types:
+        change_email_user: Cambiar e-mail pro le usator
+        change_role_user: Cambiar le rolo del usator
         confirm_user: Confirmar le usator
         create_account_warning: Crear un advertimento
         create_announcement: Crear annuncio
@@ -155,6 +158,7 @@ ia:
         enable_custom_emoji: Activar emoji personalisate
         enable_user: Activar le usator
         promote_user: Promover usator
+        resend_user: Reinviar message de confirmation
         reset_password_user: Reinitialisar contrasigno
         silence_account: Limitar conto
         unblock_email_account: Disblocar adresse de e-mail
@@ -187,6 +191,7 @@ ia:
       delete: Deler
       disable: Disactivar
       disabled: Disactivate
+      disabled_msg: Emoji disactivate con successo
       enable: Activar
       enabled: Activate
       enabled_msg: Emoji activate con successo
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 9664a4ab57b56c..82fbde6ce1a211 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -502,6 +502,8 @@ lt:
     settings:
       captcha_enabled:
         desc_html: Tai priklauso nuo hCaptcha išorinių skriptų, kurie gali kelti susirūpinimą dėl saugumo ir privatumo. Be to, <strong>dėl to registracijos procesas kai kuriems žmonėms (ypač neįgaliesiems) gali būti gerokai sunkiau prieinami</strong>. Dėl šių priežasčių apsvarstyk alternatyvias priemones, pavyzdžiui, patvirtinimu arba kvietimu grindžiamą registraciją.
+      content_retention:
+        danger_zone: Pavojinga zona
       domain_blocks:
         all: Visiems
       registrations:
diff --git a/config/locales/simple_form.cy.yml b/config/locales/simple_form.cy.yml
index 6b5e8787dd7937..51a3aac273c07c 100644
--- a/config/locales/simple_form.cy.yml
+++ b/config/locales/simple_form.cy.yml
@@ -77,10 +77,13 @@ cy:
           warn: Cuddiwch y cynnwys wedi'i hidlo y tu ôl i rybudd sy'n sôn am deitl yr hidlydd
       form_admin_settings:
         activity_api_enabled: Cyfrif o bostiadau a gyhoeddir yn lleol, defnyddwyr gweithredol, a chofrestriadau newydd mewn bwcedi wythnosol
+        backups_retention_period: Mae gan ddefnyddwyr y gallu i gynhyrchu archifau o'u postiadau i'w llwytho i lawr yn ddiweddarach. Pan gânt eu gosod i werth positif, bydd yr archifau hyn yn cael eu dileu'n awtomatig o'ch storfa ar ôl y nifer penodedig o ddyddiau.
         bootstrap_timeline_accounts: Bydd y cyfrifon hyn yn cael eu pinio i frig argymhellion dilynol defnyddwyr newydd.
         closed_registrations_message: Yn cael eu dangos pan fydd cofrestriadau wedi cau
+        content_cache_retention_period: Bydd yr holl bostiadau gan weinyddion eraill (gan gynnwys hwb ac atebion) yn cael eu dileu ar ôl y nifer penodedig o ddyddiau, heb ystyried unrhyw ryngweithio defnyddiwr lleol â'r postiadau hynny. Mae hyn yn cynnwys postiadau lle mae defnyddiwr lleol wedi ei farcio fel nodau tudalen neu ffefrynnau. Bydd cyfeiriadau preifat rhwng defnyddwyr o wahanol achosion hefyd yn cael eu colli ac yn amhosibl eu hadfer. Mae'r defnydd o'r gosodiad hwn wedi'i fwriadu ar gyfer achosion pwrpas arbennig ac mae'n torri llawer o ddisgwyliadau defnyddwyr pan gaiff ei weithredu at ddibenion cyffredinol.
         custom_css: Gallwch gymhwyso arddulliau cyfaddas ar fersiwn gwe Mastodon.
         mascot: Yn diystyru'r darlun yn y rhyngwyneb gwe uwch.
+        media_cache_retention_period: Mae ffeiliau cyfryngau o bostiadau a wneir gan ddefnyddwyr o bell yn cael eu storio ar eich gweinydd. Pan gaiff ei osod i werth positif, bydd y cyfryngau yn cael eu dileu ar ôl y nifer penodedig o ddyddiau. Os gofynnir am y data cyfryngau ar ôl iddo gael ei ddileu, caiff ei ail-lwytho i lawr, os yw'r cynnwys ffynhonnell yn dal i fod ar gael. Oherwydd cyfyngiadau ar ba mor aml y mae cardiau rhagolwg cyswllt yn pleidleisio i wefannau trydydd parti, argymhellir gosod y gwerth hwn i o leiaf 14 diwrnod, neu ni fydd cardiau rhagolwg cyswllt yn cael eu diweddaru ar alw cyn yr amser hwnnw.
         peers_api_enabled: Rhestr o enwau parth y mae'r gweinydd hwn wedi dod ar eu traws yn y ffediws. Nid oes unrhyw ddata wedi'i gynnwys yma ynghylch a ydych chi'n ffedereiddio â gweinydd penodol, dim ond bod eich gweinydd yn gwybod amdano. Defnyddir hwn gan wasanaethau sy'n casglu ystadegau ar ffedereiddio mewn ystyr cyffredinol.
         profile_directory: Mae'r cyfeiriadur proffil yn rhestru'r holl ddefnyddwyr sydd wedi dewis i fod yn ddarganfyddiadwy.
         require_invite_text: Pan fydd angen cymeradwyaeth â llaw ar gyfer cofrestriadau, gwnewch y “Pam ydych chi am ymuno?” mewnbwn testun yn orfodol yn hytrach na dewisol
@@ -240,6 +243,7 @@ cy:
         backups_retention_period: Cyfnod cadw archif defnyddwyr
         bootstrap_timeline_accounts: Argymhellwch y cyfrifon hyn i ddefnyddwyr newydd bob amser
         closed_registrations_message: Neges bersonol pan nad yw cofrestriadau ar gael
+        content_cache_retention_period: Cyfnod cadw cynnwys o bell
         custom_css: CSS cyfaddas
         mascot: Mascot cyfaddas (hen)
         media_cache_retention_period: Cyfnod cadw storfa cyfryngau
diff --git a/config/locales/simple_form.fi.yml b/config/locales/simple_form.fi.yml
index c342dde33e8f39..510b880e3b8744 100644
--- a/config/locales/simple_form.fi.yml
+++ b/config/locales/simple_form.fi.yml
@@ -77,6 +77,7 @@ fi:
           warn: Piilota suodatettu sisältö varoituksen taakse, jossa mainitaan suodattimen nimi
       form_admin_settings:
         activity_api_enabled: Paikallisesti julkaistujen julkaisujen, aktiivisten käyttäjien ja rekisteröitymisten viikoittainen määrä
+        backups_retention_period: Käyttäjillä on mahdollisuus arkistoida julkaisujaan myöhemmin ladattaviksi. Kun tämä on asetettu positiiviseksi arvoksi, nämä arkistot poistetaan automaattisesti asetetun päivien määrän jälkeen.
         bootstrap_timeline_accounts: Nämä tilit kiinnitetään uusien käyttäjien seuraamissuosituslistojen alkuun.
         closed_registrations_message: Näkyy, kun rekisteröityminen on suljettu
         custom_css: Voit käyttää mukautettuja tyylejä Mastodonin verkkoversiossa.
diff --git a/config/locales/simple_form.gl.yml b/config/locales/simple_form.gl.yml
index bd7c850df479c4..0433496013ed33 100644
--- a/config/locales/simple_form.gl.yml
+++ b/config/locales/simple_form.gl.yml
@@ -77,10 +77,13 @@ gl:
           warn: Agochar o contido filtrado tras un aviso que conteña o nome do filtro
       form_admin_settings:
         activity_api_enabled: Conta do número de publicacións locais, usuarias activas, e novos rexistros en acumulados semanais
+        backups_retention_period: As usuarias poden crear arquivos das súas publicacións para descargalos. Cando se establece un valor positivo, estes arquivos serán borrados automáticamente da túa almacenaxe despois do número de días establecido.
         bootstrap_timeline_accounts: Estas contas aparecerán fixas na parte superior das recomendacións para as usuarias.
         closed_registrations_message: Móstrase cando non se admiten novas usuarias
+        content_cache_retention_period: Todas as publicacións procedentes de outros servidores (incluído promocións e respostas) van ser eliminadas despois do número de días indicado, sen importar as interaccións das usuarias locais con esas publicacións. Esto inclúe publicacións que a usuaria local marcou como favoritas ou incluíu nos marcadores. As mencións privadas entre usuarias de diferentes instancias tamén se eliminarán e non se poderán restablecer. O uso desta ferramenta esta orientado a situacións especiais e estraga moitas das expectativas das usuarias ao implementala cun propósito de uso xeral.
         custom_css: Podes aplicar deseños personalizados na versión web de Mastodon.
         mascot: Sobrescribe a ilustración na interface web avanzada.
+        media_cache_retention_period: Os ficheiros multimedia de publicacións de usuarias remotas están almacenados no teu servidor. Ao establecer un valor positivo, o multimedia vaise eliminar despois do número de días establecido. Se o multimedia fose requerido após ser eliminado entón descargaríase outra vez, se aínda está dispoñible na orixe. Debido a restricións sobre a frecuencia en que o servizo de vista previa trae recursos de terceiras partes, é recomendable establecer este valor polo menos en 14 días, ou as tarxetas de vista previa non se actualizarán baixo demanda para casos anteriores a ese prazo.
         peers_api_enabled: Unha lista dos nomes de dominio que este servidor atopou no fediverso. Non se inclúen aquí datos acerca de se estás a federar con eles ou non, só que o teu servidor os recoñeceu. Ten utilidade para servizos que recollen estatísticas acerca da federación nun amplo senso.
         profile_directory: O directorio de perfís inclúe a tódalas usuarias que optaron por ser descubribles.
         require_invite_text: Cando os rexistros requiren aprobación manual, facer que o texto "Por que te queres rexistrar?" do convite sexa obrigatorio en lugar de optativo
@@ -240,6 +243,7 @@ gl:
         backups_retention_period: Período de retención do arquivo da usuaria
         bootstrap_timeline_accounts: Recomendar sempre estas contas ás novas usuarias
         closed_registrations_message: Mensaxe personalizada para cando o rexistro está pechado
+        content_cache_retention_period: Período de retención de contido remoto
         custom_css: CSS personalizado
         mascot: Mascota propia (herdado)
         media_cache_retention_period: Período de retención da caché multimedia
diff --git a/config/locales/simple_form.ia.yml b/config/locales/simple_form.ia.yml
index 7012cdb1cd0833..5e9dda2a1332af 100644
--- a/config/locales/simple_form.ia.yml
+++ b/config/locales/simple_form.ia.yml
@@ -5,8 +5,10 @@ ia:
       account:
         note: 'Tu pote @mentionar altere personas o #hashtags.'
       defaults:
+        password: Usa al minus 8 characteres
         setting_display_media_hide_all: Sempre celar le medios
         setting_display_media_show_all: Sempre monstrar le medios
+        username: Tu pote usar litteras, numeros e tractos de sublineamento
       webhook:
         events: Selige le eventos a inviar
         url: Ubi le eventos essera inviate
@@ -24,7 +26,10 @@ ia:
       admin_account_action:
         type: Action
         types:
+          disable: Gelar
           none: Inviar un advertimento
+          silence: Limitar
+          suspend: Suspender
       announcement:
         text: Annuncio
       defaults:
diff --git a/config/locales/simple_form.is.yml b/config/locales/simple_form.is.yml
index a2c437a3256830..6f3072758ca780 100644
--- a/config/locales/simple_form.is.yml
+++ b/config/locales/simple_form.is.yml
@@ -80,8 +80,10 @@ is:
         backups_retention_period: Notendur hafa kost á að útbúa safnskrár með færslunum sínum til að sækja svo síðar. Þegar þetta er stillt á jákvætt gildi, verður þessum safnskrám eytt sjáfkrafa eftir þeim tiltekna fjölda daga.
         bootstrap_timeline_accounts: Þessir notendaaðgangar verða festir efst í meðmælum til nýrra notenda um að fylgjast með þeim.
         closed_registrations_message: Birtist þegar lokað er á nýskráningar
+        content_cache_retention_period: Öllum færslum af öðrum netþjónum (þar með taldar endurbirtingar og svör) verður eytt eftir uppgefinn fjölda daga, án tillits til gagnvirkni staðværra notenda við þessar færslur. Þetta á einnig við um færslur sem notandinn hefur merkt sem bókamerki eða eftirlæti. Beinar tilvísanir (einkaspjall) milli notenda af mismunandi netþjónum munu einnig tapast og er engin leið til að endurheimta þær. Notkun á þessari stillingu er einungis ætluð sérstilltum netþjónum og mun skemma fyrir notendum ef þetta er sett upp fyrir almenna notkun.
         custom_css: Þú getur virkjað sérsniðna stíla í vefútgáfu Mastodon.
         mascot: Þetta tekyr yfir myndskreytinguna í ítarlega vefviðmótinu.
+        media_cache_retention_period: Myndefnisskrár úr færslum sem gerðar eru af fjartengdum notendum eru geymdar á netþjóninum þínum. Þegar þetta er stillt á jákvætt gildi, verður þessum skrám eytt sjáfkrafa eftir þeim tiltekna fjölda daga. Ef beðið er um myndefnið eftir að því er eytt, mun það verða sótt aftur ef frumgögnin eru ennþá aðgengileg. Vegna takmarkana á hversu oft forskoðunarspjöld tengla eru sótt á utanaðkomandi netþjóna, þá er mælt með því að setja þetta gildi á að minnsta kosti 14 daga, annars gæti mistekist að uppfæra forskoðunarspjöld tengla eftir þörfum fyrir þann tíma.
         peers_api_enabled: Listi yfir þau lénaheiti sem þessi netþjónn hefur rekist á í skýjasambandinu. Engin gögn eru hér sem gefa til kynna hvort þú sért í sambandi við tiltekinn netþjón, bara að netþjónninn þinn viti um hann. Þetta er notað af þjónustum sem safna tölfræði um skýjasambönd á almennan hátt.
         profile_directory: Notendamappan telur upp alla þá notendur sem hafa valið að vera uppgötvanlegir.
         require_invite_text: Þegar nýskráningar krefjast handvirks samþykkis, þá skal gera textann í “Hvers vegna viltu taka þátt?” að kröfu en ekki valkvæðan
diff --git a/config/locales/simple_form.lt.yml b/config/locales/simple_form.lt.yml
index 00485fc8736898..f6a3ad9372f7a3 100644
--- a/config/locales/simple_form.lt.yml
+++ b/config/locales/simple_form.lt.yml
@@ -74,6 +74,9 @@ lt:
           warn: Slėpti filtruojamą turinį po įspėjimu, paminint filtro pavadinimą
       form_admin_settings:
         activity_api_enabled: Vietinių paskelbtų įrašų, aktyvių naudotojų ir naujų registracijų skaičiai kas savaitę
+        backups_retention_period: Naudotojai gali generuoti savo įrašų archyvus, kuriuos vėliau galės atsisiųsti. Nustačius teigiamą reikšmę, šie archyvai po nurodyto dienų skaičiaus bus automatiškai ištrinti iš saugyklos.
+        content_cache_retention_period: Visi įrašai iš kitų serverių (įskaitant pakėlimus ir atsakymus) bus ištrinti po nurodyto dienų skaičiaus, neatsižvelgiant į bet kokią vietinio naudotojo sąveiką su tais įrašais. Tai taikoma ir tiems įrašams, kuriuos vietinis naudotojas yra pažymėjęs kaip žymes ar mėgstamus. Privačios paminėjimai tarp naudotojų iš skirtingų instancijų taip pat bus prarastos ir jų bus neįmanoma atkurti. Šis nustatymas skirtas naudoti ypatingos paskirties instancijose, o įgyvendinus jį bendram naudojimui, pažeidžiami daugelio naudotojų lūkesčiai.
+        media_cache_retention_period: Nuotolinių naudotojų įrašytų įrašų medijos failai talpinami tavo serveryje. Nustačius teigiamą reikšmę, medijos bus ištrinamos po nurodyto dienų skaičiaus. Jei medijos duomenų bus paprašyta po to, kai jie bus ištrinti, jie bus atsiųsti iš naujo, jei šaltinio turinys vis dar prieinamas. Dėl apribojimų, susijusių su nuorodų peržiūros kortelių apklausos dažnumu trečiųjų šalių svetainėse, rekomenduojama nustatyti šią reikšmę ne trumpesnę kaip 14 dienų, kitaip nuorodų peržiūros kortelės nebus atnaujinamos pagal pareikalavimą iki to laiko.
         peers_api_enabled: Domenų pavadinimų sąrašas, su kuriais šis serveris susidūrė fediverse. Čia nėra duomenų apie tai, ar tu bendrauji su tam tikru serveriu, tik apie tai, kad tavo serveris apie jį žino. Tai naudojama tarnybose, kurios renka federacijos statistiką bendrąja prasme.
         site_contact_email: Kaip žmonės gali su tavimi susisiekti teisiniais ar pagalbos užklausimais.
         site_contact_username: Kaip žmonės gali tave pasiekti Mastodon.
@@ -145,6 +148,7 @@ lt:
       form_admin_settings:
         activity_api_enabled: Skelbti suvestinį statistiką apie naudotojų veiklą per API
         bootstrap_timeline_accounts: Visada rekomenduoti šias paskyras naujiems naudotojams
+        content_cache_retention_period: Nuotolinio turinio saugojimo laikotarpis
         custom_css: Pasirinktinis CSS
         mascot: Pasirinktinis talismanas (pasenęs)
         registrations_mode: Kas gali užsiregistruoti
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index d078cf720073ab..11e1fce3fe6739 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -751,6 +751,7 @@ sv:
         desc_html: Detta bygger på externa skript från hCaptcha vilket kan vara ett säkerhets- och integritetsproblem. Dessutom,<strong>kan detta göra registreringsprocessen betydligt mindre tillgänglig för vissa personer (särskilt funktionsnedsatta)</strong>. Av dessa skäl bör du överväga alternativa åtgärder såsom godkänningsbaserad eller inbjudningsbaserad registrering.
         title: Kräv att nya användare löser en CAPTCHA för att erkänna sitt konto
       content_retention:
+        danger_zone: Farozon
         preamble: Kontrollera hur användargenererat innehåll lagras i Mastodon.
         title: Bibehållande av innehåll
       default_noindex:

From f3ea90b89eea93d0a4d86ac1eef9ae52f93a61fd Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 30 Apr 2024 11:12:25 +0200
Subject: [PATCH 0879/2191] Update workbox monorepo to v7.1.0 (#30047)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 361 +++++++++++++++++++++++++++++-------------------------
 1 file changed, 197 insertions(+), 164 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 70395894b8b515..5e83223a2af6fb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -59,7 +59,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/core@npm:^7.10.4, @babel/core@npm:^7.11.1, @babel/core@npm:^7.11.6, @babel/core@npm:^7.12.3, @babel/core@npm:^7.22.1":
+"@babel/core@npm:^7.10.4, @babel/core@npm:^7.11.6, @babel/core@npm:^7.12.3, @babel/core@npm:^7.22.1, @babel/core@npm:^7.24.4":
   version: 7.24.5
   resolution: "@babel/core@npm:7.24.5"
   dependencies:
@@ -3073,19 +3073,22 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rollup/plugin-node-resolve@npm:^11.2.1":
-  version: 11.2.1
-  resolution: "@rollup/plugin-node-resolve@npm:11.2.1"
+"@rollup/plugin-node-resolve@npm:^15.2.3":
+  version: 15.2.3
+  resolution: "@rollup/plugin-node-resolve@npm:15.2.3"
   dependencies:
-    "@rollup/pluginutils": "npm:^3.1.0"
-    "@types/resolve": "npm:1.17.1"
-    builtin-modules: "npm:^3.1.0"
+    "@rollup/pluginutils": "npm:^5.0.1"
+    "@types/resolve": "npm:1.20.2"
     deepmerge: "npm:^4.2.2"
+    is-builtin-module: "npm:^3.2.1"
     is-module: "npm:^1.0.0"
-    resolve: "npm:^1.19.0"
+    resolve: "npm:^1.22.1"
   peerDependencies:
-    rollup: ^1.20.0||^2.0.0
-  checksum: 10c0/a8226b01352ee1f7133b1b59b3906267e11c99020a55e3b7a313e03889f790d1cd94e7f7769d3963261e897c3265082533ba595976f8e3f08cf70aa88bf1ddd7
+    rollup: ^2.78.0||^3.0.0||^4.0.0
+  peerDependenciesMeta:
+    rollup:
+      optional: true
+  checksum: 10c0/598c15615086f26e28c4b3dbf966682af7fb0e5bc277cc4e57f559668a3be675a63ab261eb34729ce9569c3a51342c48863e50b5efe02e0fc1571828f0113f9d
   languageName: node
   linkType: hard
 
@@ -3101,6 +3104,22 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@rollup/plugin-terser@npm:^0.4.3":
+  version: 0.4.4
+  resolution: "@rollup/plugin-terser@npm:0.4.4"
+  dependencies:
+    serialize-javascript: "npm:^6.0.1"
+    smob: "npm:^1.0.0"
+    terser: "npm:^5.17.4"
+  peerDependencies:
+    rollup: ^2.0.0||^3.0.0||^4.0.0
+  peerDependenciesMeta:
+    rollup:
+      optional: true
+  checksum: 10c0/b9cb6c8f02ac1c1344019e9fb854321b74f880efebc41b6bdd84f18331fce0f4a2aadcdb481042245cd3f409b429ac363af71f9efec4a2024731d67d32af36ee
+  languageName: node
+  linkType: hard
+
 "@rollup/pluginutils@npm:^3.1.0":
   version: 3.1.0
   resolution: "@rollup/pluginutils@npm:3.1.0"
@@ -3114,6 +3133,22 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@rollup/pluginutils@npm:^5.0.1":
+  version: 5.1.0
+  resolution: "@rollup/pluginutils@npm:5.1.0"
+  dependencies:
+    "@types/estree": "npm:^1.0.0"
+    estree-walker: "npm:^2.0.2"
+    picomatch: "npm:^2.3.1"
+  peerDependencies:
+    rollup: ^1.20.0||^2.0.0||^3.0.0||^4.0.0
+  peerDependenciesMeta:
+    rollup:
+      optional: true
+  checksum: 10c0/c7bed15711f942d6fdd3470fef4105b73991f99a478605e13d41888963330a6f9e32be37e6ddb13f012bc7673ff5e54f06f59fd47109436c1c513986a8a7612d
+  languageName: node
+  linkType: hard
+
 "@sinclair/typebox@npm:^0.27.8":
   version: 0.27.8
   resolution: "@sinclair/typebox@npm:0.27.8"
@@ -3470,10 +3505,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/estree@npm:*":
-  version: 1.0.3
-  resolution: "@types/estree@npm:1.0.3"
-  checksum: 10c0/5171f467fdd77852e28d7eec575222bc6c900e117a44e916a5ff65807ae8e1ed15f57d21e8954d6bd532e37c49a8ecfee730fcb152b7b44234d38681978b2caa
+"@types/estree@npm:*, @types/estree@npm:^1.0.0":
+  version: 1.0.5
+  resolution: "@types/estree@npm:1.0.5"
+  checksum: 10c0/b3b0e334288ddb407c7b3357ca67dbee75ee22db242ca7c56fe27db4e1a31989cb8af48a84dd401deb787fe10cc6b2ab1ee82dc4783be87ededbe3d53c79c70d
   languageName: node
   linkType: hard
 
@@ -3889,12 +3924,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/resolve@npm:1.17.1":
-  version: 1.17.1
-  resolution: "@types/resolve@npm:1.17.1"
-  dependencies:
-    "@types/node": "npm:*"
-  checksum: 10c0/6eeb9c27d99bf4b393bf168d43208f63e78cefca5644662a0bdb2bdbf8352386f4f3aca66add138fc41bce5f66fd48a0de430a1473f11b612fbed0375ae78031
+"@types/resolve@npm:1.20.2":
+  version: 1.20.2
+  resolution: "@types/resolve@npm:1.20.2"
+  checksum: 10c0/c5b7e1770feb5ccfb6802f6ad82a7b0d50874c99331e0c9b259e415e55a38d7a86ad0901c57665d93f75938be2a6a0bc9aa06c9749192cadb2e4512800bbc6e6
   languageName: node
   linkType: hard
 
@@ -5662,7 +5695,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"builtin-modules@npm:^3.1.0, builtin-modules@npm:^3.3.0":
+"builtin-modules@npm:^3.3.0":
   version: 3.3.0
   resolution: "builtin-modules@npm:3.3.0"
   checksum: 10c0/2cb3448b4f7306dc853632a4fcddc95e8d4e4b9868c139400027b71938fc6806d4ff44007deffb362ac85724bd40c2c6452fb6a0aa4531650eeddb98d8e5ee8a
@@ -7987,6 +8020,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"estree-walker@npm:^2.0.2":
+  version: 2.0.2
+  resolution: "estree-walker@npm:2.0.2"
+  checksum: 10c0/53a6c54e2019b8c914dc395890153ffdc2322781acf4bd7d1a32d7aedc1710807bdcd866ac133903d5629ec601fbb50abe8c2e5553c7f5a0afdd9b6af6c945af
+  languageName: node
+  linkType: hard
+
 "esutils@npm:^2.0.2":
   version: 2.0.3
   resolution: "esutils@npm:2.0.3"
@@ -10744,7 +10784,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-worker@npm:^26.2.1, jest-worker@npm:^26.5.0":
+"jest-worker@npm:^26.5.0":
   version: 26.6.2
   resolution: "jest-worker@npm:26.6.2"
   dependencies:
@@ -15023,7 +15063,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"resolve@npm:^1.14.2, resolve@npm:^1.19.0, resolve@npm:^1.20.0, resolve@npm:^1.22.4":
+"resolve@npm:^1.14.2, resolve@npm:^1.19.0, resolve@npm:^1.20.0, resolve@npm:^1.22.1, resolve@npm:^1.22.4":
   version: 1.22.8
   resolution: "resolve@npm:1.22.8"
   dependencies:
@@ -15049,7 +15089,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"resolve@patch:resolve@npm%3A^1.14.2#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.19.0#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.20.0#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.22.4#optional!builtin<compat/resolve>":
+"resolve@patch:resolve@npm%3A^1.14.2#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.19.0#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.20.0#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.22.1#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.22.4#optional!builtin<compat/resolve>":
   version: 1.22.8
   resolution: "resolve@patch:resolve@npm%3A1.22.8#optional!builtin<compat/resolve>::version=1.22.8&hash=c3c19d"
   dependencies:
@@ -15156,20 +15196,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rollup-plugin-terser@npm:^7.0.0":
-  version: 7.0.2
-  resolution: "rollup-plugin-terser@npm:7.0.2"
-  dependencies:
-    "@babel/code-frame": "npm:^7.10.4"
-    jest-worker: "npm:^26.2.1"
-    serialize-javascript: "npm:^4.0.0"
-    terser: "npm:^5.0.0"
-  peerDependencies:
-    rollup: ^2.0.0
-  checksum: 10c0/f79b851c6f7b06555d3a8ce7a4e32abd2b7cb8318e89fb8db73e662fa6e3af1a59920e881d111efc65a7437fd9582b61b1f4859b6fd839ba948616829d92432d
-  languageName: node
-  linkType: hard
-
 "rollup@npm:^2.43.1":
   version: 2.79.1
   resolution: "rollup@npm:2.79.1"
@@ -15439,21 +15465,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"serialize-javascript@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "serialize-javascript@npm:4.0.0"
+"serialize-javascript@npm:^5.0.1":
+  version: 5.0.1
+  resolution: "serialize-javascript@npm:5.0.1"
   dependencies:
     randombytes: "npm:^2.1.0"
-  checksum: 10c0/510dfe7f0311c0b2f7ab06311afa1668ba2969ab2f1faaac0a4924ede76b7f22ba85cfdeaa0052ec5a047bca42c8cd8ac8df8f0efe52f9bd290b3a39ae69fe9d
+  checksum: 10c0/646bd92a8298d764d38316f3006bce0b0def6d0e254791396ac34403847654d9346b0b6ed7865efd799d93d4c47d900e08a8fa7a6f7f8d2dbaebab5444c3b431
   languageName: node
   linkType: hard
 
-"serialize-javascript@npm:^5.0.1":
-  version: 5.0.1
-  resolution: "serialize-javascript@npm:5.0.1"
+"serialize-javascript@npm:^6.0.1":
+  version: 6.0.2
+  resolution: "serialize-javascript@npm:6.0.2"
   dependencies:
     randombytes: "npm:^2.1.0"
-  checksum: 10c0/646bd92a8298d764d38316f3006bce0b0def6d0e254791396ac34403847654d9346b0b6ed7865efd799d93d4c47d900e08a8fa7a6f7f8d2dbaebab5444c3b431
+  checksum: 10c0/2dd09ef4b65a1289ba24a788b1423a035581bef60817bea1f01eda8e3bda623f86357665fe7ac1b50f6d4f583f97db9615b3f07b2a2e8cbcb75033965f771dd2
   languageName: node
   linkType: hard
 
@@ -15697,6 +15723,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"smob@npm:^1.0.0":
+  version: 1.5.0
+  resolution: "smob@npm:1.5.0"
+  checksum: 10c0/a1067f23265812de8357ed27312101af49b89129eb973e3f26ab5856ea774f88cace13342e66e32470f933ccfa916e0e9d0f7ca8bbd4f92dfab2af45c15956c2
+  languageName: node
+  linkType: hard
+
 "snapdragon-node@npm:^2.0.1":
   version: 2.1.1
   resolution: "snapdragon-node@npm:2.1.1"
@@ -16672,9 +16705,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"terser@npm:^5.0.0, terser@npm:^5.3.4":
-  version: 5.19.4
-  resolution: "terser@npm:5.19.4"
+"terser@npm:^5.17.4, terser@npm:^5.3.4":
+  version: 5.31.0
+  resolution: "terser@npm:5.31.0"
   dependencies:
     "@jridgewell/source-map": "npm:^0.3.3"
     acorn: "npm:^8.8.2"
@@ -16682,7 +16715,7 @@ __metadata:
     source-map-support: "npm:~0.5.20"
   bin:
     terser: bin/terser
-  checksum: 10c0/39c6687609f5b9061f2fb82bee02d2f9d7756fcb5bd50c67da1482f52cf5977e03e0c5df5cb4ce17e549428024c8859075137c461ec4a9ae8cf91a505759255a
+  checksum: 10c0/cb127a579b03fb9dcee0d293ff24814deedcd430f447933b618e8593b7454f615b5c8493c68e86a4b0188769d5ea2af5251b5d507edb208114f7e8aebdc7c850
   languageName: node
   linkType: hard
 
@@ -17975,36 +18008,37 @@ __metadata:
   languageName: node
   linkType: hard
 
-"workbox-background-sync@npm:7.0.0":
-  version: 7.0.0
-  resolution: "workbox-background-sync@npm:7.0.0"
+"workbox-background-sync@npm:7.1.0":
+  version: 7.1.0
+  resolution: "workbox-background-sync@npm:7.1.0"
   dependencies:
     idb: "npm:^7.0.1"
-    workbox-core: "npm:7.0.0"
-  checksum: 10c0/91eb064c608cfb4cf7aa4f062215d8217a99b93d67c4ae571e5abdda1b020c5ab45c7bddab99cb77d334aae8d259f0fe91b7c42ee6e7ad10db32b4a971991489
+    workbox-core: "npm:7.1.0"
+  checksum: 10c0/9538c49a377d8eb06acee3848fbca09bac1940a2ca9e904fed765c39aa32f77c20d72c3ba6fa1eb47bee81289b1d527556a1cd3e02728960a4c40400ce6d0e91
   languageName: node
   linkType: hard
 
-"workbox-broadcast-update@npm:7.0.0":
-  version: 7.0.0
-  resolution: "workbox-broadcast-update@npm:7.0.0"
+"workbox-broadcast-update@npm:7.1.0":
+  version: 7.1.0
+  resolution: "workbox-broadcast-update@npm:7.1.0"
   dependencies:
-    workbox-core: "npm:7.0.0"
-  checksum: 10c0/3c3a6e1e72c19d2971d187297b99b242f304b1ec442f6f1ec84ea9c6e125dc01cd626d51e6ecf1c8d89226e6a286dccaa9f950bd5ef6183518af10ba0f4f524e
+    workbox-core: "npm:7.1.0"
+  checksum: 10c0/4a6e201cedcbc11b9d2f63f63477ba4564a35ce07bd54640198db6ff6a3b8347a65e0b4973c8f8463e8a622fd1ad93d7b3bab42338608811d23c7db01fef475e
   languageName: node
   linkType: hard
 
-"workbox-build@npm:7.0.0":
-  version: 7.0.0
-  resolution: "workbox-build@npm:7.0.0"
+"workbox-build@npm:7.1.0":
+  version: 7.1.0
+  resolution: "workbox-build@npm:7.1.0"
   dependencies:
     "@apideck/better-ajv-errors": "npm:^0.3.1"
-    "@babel/core": "npm:^7.11.1"
+    "@babel/core": "npm:^7.24.4"
     "@babel/preset-env": "npm:^7.11.0"
     "@babel/runtime": "npm:^7.11.2"
     "@rollup/plugin-babel": "npm:^5.2.0"
-    "@rollup/plugin-node-resolve": "npm:^11.2.1"
+    "@rollup/plugin-node-resolve": "npm:^15.2.3"
     "@rollup/plugin-replace": "npm:^2.4.1"
+    "@rollup/plugin-terser": "npm:^0.4.3"
     "@surma/rollup-plugin-off-main-thread": "npm:^2.2.3"
     ajv: "npm:^8.6.0"
     common-tags: "npm:^1.8.0"
@@ -18014,169 +18048,168 @@ __metadata:
     lodash: "npm:^4.17.20"
     pretty-bytes: "npm:^5.3.0"
     rollup: "npm:^2.43.1"
-    rollup-plugin-terser: "npm:^7.0.0"
     source-map: "npm:^0.8.0-beta.0"
     stringify-object: "npm:^3.3.0"
     strip-comments: "npm:^2.0.1"
     tempy: "npm:^0.6.0"
     upath: "npm:^1.2.0"
-    workbox-background-sync: "npm:7.0.0"
-    workbox-broadcast-update: "npm:7.0.0"
-    workbox-cacheable-response: "npm:7.0.0"
-    workbox-core: "npm:7.0.0"
-    workbox-expiration: "npm:7.0.0"
-    workbox-google-analytics: "npm:7.0.0"
-    workbox-navigation-preload: "npm:7.0.0"
-    workbox-precaching: "npm:7.0.0"
-    workbox-range-requests: "npm:7.0.0"
-    workbox-recipes: "npm:7.0.0"
-    workbox-routing: "npm:7.0.0"
-    workbox-strategies: "npm:7.0.0"
-    workbox-streams: "npm:7.0.0"
-    workbox-sw: "npm:7.0.0"
-    workbox-window: "npm:7.0.0"
-  checksum: 10c0/a090aeee836f59d42ca9eda8b82aa5a0ee8f4ce3f3095b6fcbe157a9a154c492e4ba86b5c4d6aa50ef7c37ea1c38c965442b56d1404911fd0351d0fc9a859a3c
-  languageName: node
-  linkType: hard
-
-"workbox-cacheable-response@npm:7.0.0":
-  version: 7.0.0
-  resolution: "workbox-cacheable-response@npm:7.0.0"
+    workbox-background-sync: "npm:7.1.0"
+    workbox-broadcast-update: "npm:7.1.0"
+    workbox-cacheable-response: "npm:7.1.0"
+    workbox-core: "npm:7.1.0"
+    workbox-expiration: "npm:7.1.0"
+    workbox-google-analytics: "npm:7.1.0"
+    workbox-navigation-preload: "npm:7.1.0"
+    workbox-precaching: "npm:7.1.0"
+    workbox-range-requests: "npm:7.1.0"
+    workbox-recipes: "npm:7.1.0"
+    workbox-routing: "npm:7.1.0"
+    workbox-strategies: "npm:7.1.0"
+    workbox-streams: "npm:7.1.0"
+    workbox-sw: "npm:7.1.0"
+    workbox-window: "npm:7.1.0"
+  checksum: 10c0/c482fde713bad582bd7d4861113d7367ab4722eba9c102864c71048815792c623e9117a8f79957e0388d0c08e8303962d1fb23931456da73909e87d06638d101
+  languageName: node
+  linkType: hard
+
+"workbox-cacheable-response@npm:7.1.0":
+  version: 7.1.0
+  resolution: "workbox-cacheable-response@npm:7.1.0"
   dependencies:
-    workbox-core: "npm:7.0.0"
-  checksum: 10c0/ddf123b3461070e215af51d88c672f3302b540b93ecf61ad5f3853f0a997194973eedb2c9ed21e849b7419f68804ef8a8d876dced3836a7eb2c697099e3d408f
+    workbox-core: "npm:7.1.0"
+  checksum: 10c0/52ea73bb184c9ef9280cc8f00a1ab7d103d495e12a7a6378fae02fd0aa1a9b893aac5d8074f14ed8c198527123e4401f4703fbfd2be98e184ca783b9216cb4c5
   languageName: node
   linkType: hard
 
-"workbox-core@npm:7.0.0":
-  version: 7.0.0
-  resolution: "workbox-core@npm:7.0.0"
-  checksum: 10c0/aaaf7b66978456bf5d6a90b1068b5acd82bf451f4a23c5a416201524b50ea4e0bc62a01365499bc088b4c18cddc513fdebbe8b048ab15aff960fe7cbbf55d5bd
+"workbox-core@npm:7.1.0":
+  version: 7.1.0
+  resolution: "workbox-core@npm:7.1.0"
+  checksum: 10c0/fb0b6e23a52e085da00b7a74b1f1854f06c695eb2bd4c244aa335165f59156a4febb4f116b9893b9fb7e0e8bac092d32eecceb4d00f930a93f64737cb2be9531
   languageName: node
   linkType: hard
 
-"workbox-expiration@npm:7.0.0, workbox-expiration@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "workbox-expiration@npm:7.0.0"
+"workbox-expiration@npm:7.1.0, workbox-expiration@npm:^7.0.0":
+  version: 7.1.0
+  resolution: "workbox-expiration@npm:7.1.0"
   dependencies:
     idb: "npm:^7.0.1"
-    workbox-core: "npm:7.0.0"
-  checksum: 10c0/990a6c2c9b177d796c012b0112913621e41b283e2736d83acb58cb9645591ddc7a6aef585145c5686f9b071d73ce12b4b1887765754624322545b0f4125d649f
+    workbox-core: "npm:7.1.0"
+  checksum: 10c0/669d76f87c1550ce9b425232c3202a26fdea4c4c9bdc1b71c1cee741a5d011423098994452e508576174d3c0b4bec0f4b35012b6d7257e300684c87fdddb7949
   languageName: node
   linkType: hard
 
-"workbox-google-analytics@npm:7.0.0":
-  version: 7.0.0
-  resolution: "workbox-google-analytics@npm:7.0.0"
+"workbox-google-analytics@npm:7.1.0":
+  version: 7.1.0
+  resolution: "workbox-google-analytics@npm:7.1.0"
   dependencies:
-    workbox-background-sync: "npm:7.0.0"
-    workbox-core: "npm:7.0.0"
-    workbox-routing: "npm:7.0.0"
-    workbox-strategies: "npm:7.0.0"
-  checksum: 10c0/7656ab4bff15fbcbc7f546d86628ccbc74736a99139ec70a166c465fc4ff59656aecd44cc0aef45b4690fd88a4980d6c9f27ce8c6606fd12d026162259a8069d
+    workbox-background-sync: "npm:7.1.0"
+    workbox-core: "npm:7.1.0"
+    workbox-routing: "npm:7.1.0"
+    workbox-strategies: "npm:7.1.0"
+  checksum: 10c0/4178d94fb7f3f7b789f117c104b2ff33945256dc550418b0e9c81130c1e2c2bcd72ec6a1661d91326c04de360e6592edd505f0e2142e8e1043fe0c45f9c1a3fe
   languageName: node
   linkType: hard
 
-"workbox-navigation-preload@npm:7.0.0":
-  version: 7.0.0
-  resolution: "workbox-navigation-preload@npm:7.0.0"
+"workbox-navigation-preload@npm:7.1.0":
+  version: 7.1.0
+  resolution: "workbox-navigation-preload@npm:7.1.0"
   dependencies:
-    workbox-core: "npm:7.0.0"
-  checksum: 10c0/f29ac8364c7f7f392daa1f886134adc780057199b218ab6c6eef298841b8825d6cbc4bc88e655299929bdf14c700edfb9f217ca5c0b46094627247528f655011
+    workbox-core: "npm:7.1.0"
+  checksum: 10c0/b667a3ba0cae4d43a53a6e211f0f33f6ebc1d9fec6cbb93de83f72a37b81cc39d887b969db9b1cd5c396a1ce34636c89c3b157cc64a5265635d0b274e362db0e
   languageName: node
   linkType: hard
 
-"workbox-precaching@npm:7.0.0, workbox-precaching@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "workbox-precaching@npm:7.0.0"
+"workbox-precaching@npm:7.1.0, workbox-precaching@npm:^7.0.0":
+  version: 7.1.0
+  resolution: "workbox-precaching@npm:7.1.0"
   dependencies:
-    workbox-core: "npm:7.0.0"
-    workbox-routing: "npm:7.0.0"
-    workbox-strategies: "npm:7.0.0"
-  checksum: 10c0/1b47cb151bb6ec7442b2dc8981203feff22527a4383510f2399730338b620ef0d03076bd3dbc1eb9a05272d5d6f4803fb4262f320bf5645f0818981e91077f39
+    workbox-core: "npm:7.1.0"
+    workbox-routing: "npm:7.1.0"
+    workbox-strategies: "npm:7.1.0"
+  checksum: 10c0/53b2d0a658109b4d83ee2b1913f884ee1c757a12b8931a7102272bd1e228d29f9430e7d060f328f465bca2aa24bf0719d026eef4f4d21395fa1f678f8d6a3c06
   languageName: node
   linkType: hard
 
-"workbox-range-requests@npm:7.0.0":
-  version: 7.0.0
-  resolution: "workbox-range-requests@npm:7.0.0"
+"workbox-range-requests@npm:7.1.0":
+  version: 7.1.0
+  resolution: "workbox-range-requests@npm:7.1.0"
   dependencies:
-    workbox-core: "npm:7.0.0"
-  checksum: 10c0/909f0ed7a176e5dc55692792825e67b577dacf1015a3f3775389fcec34ff5b3441b15595109455fe226f0bc4dce4789a7c86e5e9c5963c13b4d6482f6d01d44f
+    workbox-core: "npm:7.1.0"
+  checksum: 10c0/bf4aa597d04cbb533796af64f4006a1f472f8a14ea91f96fe37b2d5e63ffe86dcb944dab9a41317e69d368d83bee20f03ff32b339ae5addef50f325703ad4b77
   languageName: node
   linkType: hard
 
-"workbox-recipes@npm:7.0.0":
-  version: 7.0.0
-  resolution: "workbox-recipes@npm:7.0.0"
+"workbox-recipes@npm:7.1.0":
+  version: 7.1.0
+  resolution: "workbox-recipes@npm:7.1.0"
   dependencies:
-    workbox-cacheable-response: "npm:7.0.0"
-    workbox-core: "npm:7.0.0"
-    workbox-expiration: "npm:7.0.0"
-    workbox-precaching: "npm:7.0.0"
-    workbox-routing: "npm:7.0.0"
-    workbox-strategies: "npm:7.0.0"
-  checksum: 10c0/c024141f24b0778355bdfbfe2b4a24a3f74e279f6f7541635758533e79318e15986f9f556a899c97717a9c25a1738d9e112d17dd36aa19cebf901462ebeeb8e4
+    workbox-cacheable-response: "npm:7.1.0"
+    workbox-core: "npm:7.1.0"
+    workbox-expiration: "npm:7.1.0"
+    workbox-precaching: "npm:7.1.0"
+    workbox-routing: "npm:7.1.0"
+    workbox-strategies: "npm:7.1.0"
+  checksum: 10c0/5a8c2444f6338c6092be87cc6fd69c8b0cbb413bfc0a11a8f10961bfb2b8059359c4be0264ffa0c01deff3ab5dba15bbcf61d4dedbc93d8bfe1f8a2841b1657c
   languageName: node
   linkType: hard
 
-"workbox-routing@npm:7.0.0, workbox-routing@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "workbox-routing@npm:7.0.0"
+"workbox-routing@npm:7.1.0, workbox-routing@npm:^7.0.0":
+  version: 7.1.0
+  resolution: "workbox-routing@npm:7.1.0"
   dependencies:
-    workbox-core: "npm:7.0.0"
-  checksum: 10c0/74ad651a0643506cfd3ca51eee754f5fe34e3f1460e6b772ed213e0422028cf002d70f91da32d13261bc5ee2160527ffb5436ac209fdbe8d0e7071784aa65190
+    workbox-core: "npm:7.1.0"
+  checksum: 10c0/efd630fff594bd50276770840bce274660972587e79c097a9f1a84e8347351736aac13f11c6d7655ff550b13195d370d5c3b81a075bf452f358fc144ee868ad9
   languageName: node
   linkType: hard
 
-"workbox-strategies@npm:7.0.0, workbox-strategies@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "workbox-strategies@npm:7.0.0"
+"workbox-strategies@npm:7.1.0, workbox-strategies@npm:^7.0.0":
+  version: 7.1.0
+  resolution: "workbox-strategies@npm:7.1.0"
   dependencies:
-    workbox-core: "npm:7.0.0"
-  checksum: 10c0/4fe122b80e547b347bedf187aeb2c2eb34efc3fbde2733b7709530cccb6b6e03b29adcbccecf301e4fcaad0d5cd4a74e1e704f769d949c32439dca358130a613
+    workbox-core: "npm:7.1.0"
+  checksum: 10c0/b08712a69b1b13e354345cc228c29f0c759043f7ca7cf6ce9b82fe79c9d423142bfa4a118f91f1a57054047a730127fa4474d59d9306fb2ed42fe9ef568be01a
   languageName: node
   linkType: hard
 
-"workbox-streams@npm:7.0.0":
-  version: 7.0.0
-  resolution: "workbox-streams@npm:7.0.0"
+"workbox-streams@npm:7.1.0":
+  version: 7.1.0
+  resolution: "workbox-streams@npm:7.1.0"
   dependencies:
-    workbox-core: "npm:7.0.0"
-    workbox-routing: "npm:7.0.0"
-  checksum: 10c0/9a1a9b8200f5b315523ac49c61a9b88791009377bbdedd44cf19c4b2258e710bd2fbc6f74ef53b72db7849da7ce9965ced5983f167785ccfc7efa1df761e3371
+    workbox-core: "npm:7.1.0"
+    workbox-routing: "npm:7.1.0"
+  checksum: 10c0/1d75c046fcb7b25e1cf85457e3610309dd5513f68752ef333529fcf155df2114b72f3d6f416bb68393e51b5396e3f6df7171e8e2889d0e9e1805e315754b771e
   languageName: node
   linkType: hard
 
-"workbox-sw@npm:7.0.0":
-  version: 7.0.0
-  resolution: "workbox-sw@npm:7.0.0"
-  checksum: 10c0/06d9713398ca92d8b2cad70a7d302825ec7650e05e2e0c8e68f453442fdf9a9227350c856484f7b649df6cb429cc03a103f8ecd9596e83bfa52e845bf25ffbcd
+"workbox-sw@npm:7.1.0":
+  version: 7.1.0
+  resolution: "workbox-sw@npm:7.1.0"
+  checksum: 10c0/2084f1b58c8509d7ca53ce8a13d93e57d1f13307e0279fedc87942e83c8cb96bc2e5ed3992a89af6245ad2a66897a92908cb60d0717fb90492056eb6fbf20dc6
   languageName: node
   linkType: hard
 
 "workbox-webpack-plugin@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "workbox-webpack-plugin@npm:7.0.0"
+  version: 7.1.0
+  resolution: "workbox-webpack-plugin@npm:7.1.0"
   dependencies:
     fast-json-stable-stringify: "npm:^2.1.0"
     pretty-bytes: "npm:^5.4.1"
     upath: "npm:^1.2.0"
     webpack-sources: "npm:^1.4.3"
-    workbox-build: "npm:7.0.0"
+    workbox-build: "npm:7.1.0"
   peerDependencies:
-    webpack: ^4.4.0 || ^5.9.0
-  checksum: 10c0/3d585842bb6f801db5571e4d3e5c1d7c141f91d9ba2ed0c36b617d86a00b37bdefc055e6cc981c557f21f878ff4a9cf8b82e4b0b31084ddf4d9d149673ce8882
+    webpack: ^4.4.0 || ^5.91.0
+  checksum: 10c0/516fa68a6a6958ee1560299dd1146032dda68474a2ab01643cbde78fc65b75a3157aef60cb45dcc1984cc458ce44d4e3090cda08dd7cefd0952351270e963a00
   languageName: node
   linkType: hard
 
-"workbox-window@npm:7.0.0, workbox-window@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "workbox-window@npm:7.0.0"
+"workbox-window@npm:7.1.0, workbox-window@npm:^7.0.0":
+  version: 7.1.0
+  resolution: "workbox-window@npm:7.1.0"
   dependencies:
     "@types/trusted-types": "npm:^2.0.2"
-    workbox-core: "npm:7.0.0"
-  checksum: 10c0/8070fb80734a8543248ed6e3b186b8d3ee64419400a6d6d75f78809c44bf16321c5d9739bdf60ee62f631461ebb67a8a7dd78192504678d00bf2a9d3683f1324
+    workbox-core: "npm:7.1.0"
+  checksum: 10c0/c989a6e3a0488f049eead3892f8249387604fb04898aa79d0cf14cd7b684f0758f1edf1996745f4755bd30c31c449f628803e507d39b2ea91cc9c36f7d5e9c72
   languageName: node
   linkType: hard
 

From 75470f1256cbc962be5ed7d92f4e522146cfaac5 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 30 Apr 2024 09:00:39 -0400
Subject: [PATCH 0880/2191] Use implicit dotenv load (#30121)

---
 config/application.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/config/application.rb b/config/application.rb
index 1b387899273471..402c7f0614de22 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -51,12 +51,8 @@
 require_relative '../lib/active_record/batches'
 require_relative '../lib/simple_navigation/item_extensions'
 
-Dotenv::Rails.load
-
 Bundler.require(:pam_authentication) if ENV['PAM_ENABLED'] == 'true'
 
-require_relative '../lib/mastodon/redis_config'
-
 module Mastodon
   class Application < Rails::Application
     # Initialize configuration defaults for originally generated Rails version.
@@ -98,6 +94,10 @@ class Application < Rails::Application
       app.deprecators[:mastodon] = ActiveSupport::Deprecation.new('4.3', 'mastodon/mastodon')
     end
 
+    config.before_configuration do
+      require 'mastodon/redis_config'
+    end
+
     config.to_prepare do
       Doorkeeper::AuthorizationsController.layout 'modal'
       Doorkeeper::AuthorizedApplicationsController.layout 'admin'

From 8a34c42341a73751689960229ad32ce680a78e6e Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 30 Apr 2024 21:03:04 +0200
Subject: [PATCH 0881/2191] Rename
 `app/javascript/flavours/glitch/styles/index.scss` to `application.scss`

This is just to reduce differences with upstream.
---
 .../flavours/glitch/styles/{index.scss => application.scss} | 6 +++---
 app/javascript/flavours/glitch/styles/contrast.scss         | 2 +-
 app/javascript/flavours/glitch/styles/mastodon-light.scss   | 2 +-
 app/javascript/skins/glitch/default/common.scss             | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)
 rename app/javascript/flavours/glitch/styles/{index.scss => application.scss} (100%)

diff --git a/app/javascript/flavours/glitch/styles/index.scss b/app/javascript/flavours/glitch/styles/application.scss
similarity index 100%
rename from app/javascript/flavours/glitch/styles/index.scss
rename to app/javascript/flavours/glitch/styles/application.scss
index 9820101fe6c681..6a0ed80b3081fd 100644
--- a/app/javascript/flavours/glitch/styles/index.scss
+++ b/app/javascript/flavours/glitch/styles/application.scss
@@ -8,20 +8,20 @@
 @import 'branding';
 @import 'containers';
 @import 'lists';
-@import 'modal';
 @import 'widgets';
 @import 'forms';
 @import 'accounts';
 @import 'statuses';
 @import 'components';
 @import 'polls';
+@import 'modal';
 @import 'emoji_picker';
 @import 'about';
 @import 'tables';
 @import 'admin';
-@import 'accessibility';
-@import 'rtl';
 @import 'dashboard';
+@import 'rtl';
+@import 'accessibility';
 @import 'rich_text';
 @import 'glitch_local_settings';
 @import 'glitch_doodle';
diff --git a/app/javascript/flavours/glitch/styles/contrast.scss b/app/javascript/flavours/glitch/styles/contrast.scss
index 4de31db9aec577..5b43aecbe7d876 100644
--- a/app/javascript/flavours/glitch/styles/contrast.scss
+++ b/app/javascript/flavours/glitch/styles/contrast.scss
@@ -1,3 +1,3 @@
 @import 'contrast/variables';
-@import 'index';
+@import 'application';
 @import 'contrast/diff';
diff --git a/app/javascript/flavours/glitch/styles/mastodon-light.scss b/app/javascript/flavours/glitch/styles/mastodon-light.scss
index 8fc132651bdf67..756a12d868961c 100644
--- a/app/javascript/flavours/glitch/styles/mastodon-light.scss
+++ b/app/javascript/flavours/glitch/styles/mastodon-light.scss
@@ -1,3 +1,3 @@
 @import 'mastodon-light/variables';
-@import 'index';
+@import 'application';
 @import 'mastodon-light/diff';
diff --git a/app/javascript/skins/glitch/default/common.scss b/app/javascript/skins/glitch/default/common.scss
index d2f673fde871a7..ff0d0831e084d1 100644
--- a/app/javascript/skins/glitch/default/common.scss
+++ b/app/javascript/skins/glitch/default/common.scss
@@ -1 +1 @@
-@import 'flavours/glitch/styles/index';
+@import 'flavours/glitch/styles/application';

From d6048d3a6cb746d8dce57c3f0bf36c85975cd27f Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 30 Apr 2024 21:27:04 +0200
Subject: [PATCH 0882/2191] Add compatibility
 `app/javascript/flavours/glitch/styles/index.scss`

---
 app/javascript/flavours/glitch/styles/index.scss | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 app/javascript/flavours/glitch/styles/index.scss

diff --git a/app/javascript/flavours/glitch/styles/index.scss b/app/javascript/flavours/glitch/styles/index.scss
new file mode 100644
index 00000000000000..9475b4c3c86f5b
--- /dev/null
+++ b/app/javascript/flavours/glitch/styles/index.scss
@@ -0,0 +1,5 @@
+/* This is a compat file so that third-party themes do not have to immediately
+  update their implementation, as the previous `index.scss` has been renamed
+  to `application.scss`. */
+
+@import 'application';

From 26e10aa203d18e452cdf836209875f05a6e01882 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 1 May 2024 01:39:28 +0200
Subject: [PATCH 0883/2191] Change width breakpoint for mobile placement
 behavior (#30131)

---
 app/javascript/styles/mastodon/components.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 9cb03bedf186ae..51596ec2444c54 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -5616,7 +5616,7 @@ a.status-card {
   user-select: text;
   display: flex;
 
-  @media screen and (max-width: $no-gap-breakpoint) {
+  @media screen and (width <= 630px) {
     margin-top: auto;
   }
 }

From d63c0a2879bc74978eb94e27c8f2d45857df00d6 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Tue, 26 Mar 2024 10:25:49 +0100
Subject: [PATCH 0884/2191] [Glitch] Support "system" theme setting (light/dark
 theme depending on user system preference)

Port 02ea16150647ac3baf0bb8a89203ccc7200b4a2f to glitch-soc

Co-authored-by: Nishiki Liu <hello@nshki.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/features/emoji/emoji.js   | 39 +++++++++++++++----
 1 file changed, 31 insertions(+), 8 deletions(-)

diff --git a/app/javascript/flavours/glitch/features/emoji/emoji.js b/app/javascript/flavours/glitch/features/emoji/emoji.js
index 6fed8a3190d5b4..9761c940599adb 100644
--- a/app/javascript/flavours/glitch/features/emoji/emoji.js
+++ b/app/javascript/flavours/glitch/features/emoji/emoji.js
@@ -17,8 +17,13 @@ const emojiFilenames = (emojis) => {
 const darkEmoji = emojiFilenames(['🎱', '🐜', '⚫', '🖤', '⬛', '◼️', '◾', '◼️', '✒️', '▪️', '💣', '🎳', '📷', '📸', '♣️', '🕶️', '✴️', '🔌', '💂‍♀️', '📽️', '🍳', '🦍', '💂', '🔪', '🕳️', '🕹️', '🕋', '🖊️', '🖋️', '💂‍♂️', '🎤', '🎓', '🎥', '🎼', '♠️', '🎩', '🦃', '📼', '📹', '🎮', '🐃', '🏴', '🐞', '🕺', '📱', '📲', '🚲', '🪮', '🐦‍⬛']);
 const lightEmoji = emojiFilenames(['👽', '⚾', '🐔', '☁️', '💨', '🕊️', '👀', '🍥', '👻', '🐐', '❕', '❔', '⛸️', '🌩️', '🔊', '🔇', '📃', '🌧️', '🐏', '🍚', '🍙', '🐓', '🐑', '💀', '☠️', '🌨️', '🔉', '🔈', '💬', '💭', '🏐', '🏳️', '⚪', '⬜', '◽', '◻️', '▫️', '🪽', '🪿']);
 
-const emojiFilename = (filename) => {
-  const borderedEmoji = (document.body && document.body.classList.contains('skin-mastodon-light')) ? lightEmoji : darkEmoji;
+/**
+ * @param {string} filename
+ * @param {"light" | "dark" } colorScheme
+ * @returns {string}
+ */
+const emojiFilename = (filename, colorScheme) => {
+  const borderedEmoji = colorScheme === "light" ? lightEmoji : darkEmoji;
   return borderedEmoji.includes(filename) ? (filename + '_border') : filename;
 };
 
@@ -92,12 +97,30 @@ const emojifyTextNode = (node, customEmojis) => {
       const { filename, shortCode } = unicodeMapping[unicode_emoji];
       const title = shortCode ? `:${shortCode}:` : '';
 
-      replacement = document.createElement('img');
-      replacement.setAttribute('draggable', 'false');
-      replacement.setAttribute('class', 'emojione');
-      replacement.setAttribute('alt', unicode_emoji);
-      replacement.setAttribute('title', title);
-      replacement.setAttribute('src', `${assetHost}/emoji/${emojiFilename(filename)}.svg`);
+      replacement = document.createElement('picture');
+
+      const isSystemTheme = !!document.body?.classList.contains('theme-system');
+
+      if(isSystemTheme) {
+        let source = document.createElement('source');
+        source.setAttribute('media', '(prefers-color-scheme: dark)');
+        source.setAttribute('srcset', `${assetHost}/emoji/${emojiFilename(filename, "dark")}.svg`);
+        replacement.appendChild(source);
+      }
+
+      let img = document.createElement('img');
+      img.setAttribute('draggable', 'false');
+      img.setAttribute('class', 'emojione');
+      img.setAttribute('alt', unicode_emoji);
+      img.setAttribute('title', title);
+
+      let theme = "light";
+
+      if(!isSystemTheme && !document.body?.classList.contains('skin-mastodon-light'))
+        theme = "dark";
+
+      img.setAttribute('src', `${assetHost}/emoji/${emojiFilename(filename, theme)}.svg`);
+      replacement.appendChild(img);
     }
 
     // Add the processed-up-to-now string and the emoji replacement

From 03af271d3dad88f880a18d77fd4c24159f891d8c Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 27 Mar 2024 00:14:11 +0100
Subject: [PATCH 0885/2191] [Glitch] Fix column borders disappearing in
 advanced interface on low width viewports

Port b2d841ce9ae415550d44abecb182ac068ee121e3 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/styles/components.scss    | 47 +++++++++----------
 1 file changed, 23 insertions(+), 24 deletions(-)

diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index 4496179d6d4b7a..83011bacea0ce1 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -3104,24 +3104,31 @@ $ui-header-height: 55px;
     }
   }
 
-  .layout-single-column .ui__header {
-    display: flex;
-    background: var(--background-color-tint);
-    border-bottom: 1px solid var(--background-border-color);
-  }
+  .layout-single-column {
+    .ui__header {
+      display: flex;
+      background: var(--background-color-tint);
+      border-bottom: 1px solid var(--background-border-color);
+    }
 
-  .column > .scrollable,
-  .tabs-bar__wrapper .column-header,
-  .tabs-bar__wrapper .column-back-button {
-    border-left: 0;
-    border-right: 0;
-  }
+    .column > .scrollable,
+    .tabs-bar__wrapper .column-header,
+    .tabs-bar__wrapper .column-back-button {
+      border-left: 0;
+      border-right: 0;
+    }
+
+    .column-header,
+    .column-back-button,
+    .scrollable,
+    .error-column {
+      border-radius: 0 !important;
+    }
 
-  .column-header,
-  .column-back-button,
-  .scrollable,
-  .error-column {
-    border-radius: 0 !important;
+    .column-header,
+    .column-back-button {
+      border-top: 0;
+    }
   }
 }
 
@@ -3680,10 +3687,6 @@ $ui-header-height: 55px;
   &:hover {
     text-decoration: underline;
   }
-
-  @media screen and (max-width: $no-gap-breakpoint) {
-    border-top: 0;
-  }
 }
 
 .column-header__back-button {
@@ -4470,10 +4473,6 @@ a.status-card {
       padding-top: 16px;
     }
   }
-
-  @media screen and (max-width: $no-gap-breakpoint) {
-    border-top: 0;
-  }
 }
 
 .column-header__buttons {

From 059e10e546a0ec09528b732bcbdc1add4f1a575d Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Wed, 27 Mar 2024 13:47:09 +0100
Subject: [PATCH 0886/2191] [Glitch] Rewrite markers reducer in Typescript

Port 27d014a7fa4a92117e133adfd1c3e4e1c34ddc9c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/actions/markers.js        | 152 ----------------
 .../flavours/glitch/actions/markers.ts        | 164 ++++++++++++++++++
 app/javascript/flavours/glitch/api.ts         |   9 +-
 .../flavours/glitch/api_types/markers.ts      |   7 +
 .../flavours/glitch/reducers/index.ts         |   4 +-
 .../flavours/glitch/reducers/markers.js       |  26 ---
 .../flavours/glitch/reducers/markers.ts       |  18 ++
 .../flavours/glitch/reducers/notifications.js |   6 +-
 8 files changed, 201 insertions(+), 185 deletions(-)
 delete mode 100644 app/javascript/flavours/glitch/actions/markers.js
 create mode 100644 app/javascript/flavours/glitch/actions/markers.ts
 create mode 100644 app/javascript/flavours/glitch/api_types/markers.ts
 delete mode 100644 app/javascript/flavours/glitch/reducers/markers.js
 create mode 100644 app/javascript/flavours/glitch/reducers/markers.ts

diff --git a/app/javascript/flavours/glitch/actions/markers.js b/app/javascript/flavours/glitch/actions/markers.js
deleted file mode 100644
index ccb1b23d6f9f54..00000000000000
--- a/app/javascript/flavours/glitch/actions/markers.js
+++ /dev/null
@@ -1,152 +0,0 @@
-import { List as ImmutableList } from 'immutable';
-
-import { debounce } from 'lodash';
-
-import api from '../api';
-import { compareId } from '../compare_id';
-
-export const MARKERS_FETCH_REQUEST = 'MARKERS_FETCH_REQUEST';
-export const MARKERS_FETCH_SUCCESS = 'MARKERS_FETCH_SUCCESS';
-export const MARKERS_FETCH_FAIL    = 'MARKERS_FETCH_FAIL';
-export const MARKERS_SUBMIT_SUCCESS = 'MARKERS_SUBMIT_SUCCESS';
-
-export const synchronouslySubmitMarkers = () => (dispatch, getState) => {
-  const accessToken = getState().getIn(['meta', 'access_token'], '');
-  const params      = _buildParams(getState());
-
-  if (Object.keys(params).length === 0 || accessToken === '') {
-    return;
-  }
-
-  // The Fetch API allows us to perform requests that will be carried out
-  // after the page closes. But that only works if the `keepalive` attribute
-  // is supported.
-  if (window.fetch && 'keepalive' in new Request('')) {
-    fetch('/api/v1/markers', {
-      keepalive: true,
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json',
-        'Authorization': `Bearer ${accessToken}`,
-      },
-      body: JSON.stringify(params),
-    });
-
-    return;
-  } else if (navigator && navigator.sendBeacon) {
-    // Failing that, we can use sendBeacon, but we have to encode the data as
-    // FormData for DoorKeeper to recognize the token.
-    const formData = new FormData();
-
-    formData.append('bearer_token', accessToken);
-
-    for (const [id, value] of Object.entries(params)) {
-      formData.append(`${id}[last_read_id]`, value.last_read_id);
-    }
-
-    if (navigator.sendBeacon('/api/v1/markers', formData)) {
-      return;
-    }
-  }
-
-  // If neither Fetch nor sendBeacon worked, try to perform a synchronous
-  // request.
-  try {
-    const client = new XMLHttpRequest();
-
-    client.open('POST', '/api/v1/markers', false);
-    client.setRequestHeader('Content-Type', 'application/json');
-    client.setRequestHeader('Authorization', `Bearer ${accessToken}`);
-    client.send(JSON.stringify(params));
-  } catch (e) {
-    // Do not make the BeforeUnload handler error out
-  }
-};
-
-const _buildParams = (state) => {
-  const params = {};
-
-  const lastHomeId         = state.getIn(['timelines', 'home', 'items'], ImmutableList()).find(item => item !== null);
-  const lastNotificationId = state.getIn(['notifications', 'lastReadId']);
-
-  if (lastHomeId && compareId(lastHomeId, state.getIn(['markers', 'home'])) > 0) {
-    params.home = {
-      last_read_id: lastHomeId,
-    };
-  }
-
-  if (lastNotificationId && lastNotificationId !== '0' && compareId(lastNotificationId, state.getIn(['markers', 'notifications'])) > 0) {
-    params.notifications = {
-      last_read_id: lastNotificationId,
-    };
-  }
-
-  return params;
-};
-
-const debouncedSubmitMarkers = debounce((dispatch, getState) => {
-  const accessToken = getState().getIn(['meta', 'access_token'], '');
-  const params      = _buildParams(getState());
-
-  if (Object.keys(params).length === 0 || accessToken === '') {
-    return;
-  }
-
-  api(getState).post('/api/v1/markers', params).then(() => {
-    dispatch(submitMarkersSuccess(params));
-  }).catch(() => {});
-}, 300000, { leading: true, trailing: true });
-
-export function submitMarkersSuccess({ home, notifications }) {
-  return {
-    type: MARKERS_SUBMIT_SUCCESS,
-    home: (home || {}).last_read_id,
-    notifications: (notifications || {}).last_read_id,
-  };
-}
-
-export function submitMarkers(params = {}) {
-  const result = (dispatch, getState) => debouncedSubmitMarkers(dispatch, getState);
-
-  if (params.immediate === true) {
-    debouncedSubmitMarkers.flush();
-  }
-
-  return result;
-}
-
-export const fetchMarkers = () => (dispatch, getState) => {
-  const params = { timeline: ['notifications'] };
-
-  dispatch(fetchMarkersRequest());
-
-  api(getState).get('/api/v1/markers', { params }).then(response => {
-    dispatch(fetchMarkersSuccess(response.data));
-  }).catch(error => {
-    dispatch(fetchMarkersFail(error));
-  });
-};
-
-export function fetchMarkersRequest() {
-  return {
-    type: MARKERS_FETCH_REQUEST,
-    skipLoading: true,
-  };
-}
-
-export function fetchMarkersSuccess(markers) {
-  return {
-    type: MARKERS_FETCH_SUCCESS,
-    markers,
-    skipLoading: true,
-  };
-}
-
-export function fetchMarkersFail(error) {
-  return {
-    type: MARKERS_FETCH_FAIL,
-    error,
-    skipLoading: true,
-    skipAlert: true,
-  };
-}
diff --git a/app/javascript/flavours/glitch/actions/markers.ts b/app/javascript/flavours/glitch/actions/markers.ts
new file mode 100644
index 00000000000000..5afb2cb109ddd8
--- /dev/null
+++ b/app/javascript/flavours/glitch/actions/markers.ts
@@ -0,0 +1,164 @@
+import { List as ImmutableList } from 'immutable';
+
+import { debounce } from 'lodash';
+
+import type { MarkerJSON } from 'flavours/glitch/api_types/markers';
+import type { RootState } from 'flavours/glitch/store';
+import { createAppAsyncThunk } from 'flavours/glitch/store/typed_functions';
+
+import api, { authorizationTokenFromState } from '../api';
+import { compareId } from '../compare_id';
+
+export const synchronouslySubmitMarkers = createAppAsyncThunk(
+  'markers/submit',
+  async (_args, { getState }) => {
+    const accessToken = authorizationTokenFromState(getState);
+    const params = buildPostMarkersParams(getState());
+
+    if (Object.keys(params).length === 0 || !accessToken) {
+      return;
+    }
+
+    // The Fetch API allows us to perform requests that will be carried out
+    // after the page closes. But that only works if the `keepalive` attribute
+    // is supported.
+    if ('fetch' in window && 'keepalive' in new Request('')) {
+      await fetch('/api/v1/markers', {
+        keepalive: true,
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+          Authorization: `Bearer ${accessToken}`,
+        },
+        body: JSON.stringify(params),
+      });
+
+      return;
+      // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+    } else if ('navigator' && 'sendBeacon' in navigator) {
+      // Failing that, we can use sendBeacon, but we have to encode the data as
+      // FormData for DoorKeeper to recognize the token.
+      const formData = new FormData();
+
+      formData.append('bearer_token', accessToken);
+
+      for (const [id, value] of Object.entries(params)) {
+        if (value.last_read_id)
+          formData.append(`${id}[last_read_id]`, value.last_read_id);
+      }
+
+      if (navigator.sendBeacon('/api/v1/markers', formData)) {
+        return;
+      }
+    }
+
+    // If neither Fetch nor sendBeacon worked, try to perform a synchronous
+    // request.
+    try {
+      const client = new XMLHttpRequest();
+
+      client.open('POST', '/api/v1/markers', false);
+      client.setRequestHeader('Content-Type', 'application/json');
+      client.setRequestHeader('Authorization', `Bearer ${accessToken}`);
+      client.send(JSON.stringify(params));
+    } catch (e) {
+      // Do not make the BeforeUnload handler error out
+    }
+  },
+);
+
+interface MarkerParam {
+  last_read_id?: string;
+}
+
+function getLastHomeId(state: RootState): string | undefined {
+  /* eslint-disable @typescript-eslint/no-unsafe-return, @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access */
+  return (
+    state
+      // @ts-expect-error state.timelines is not yet typed
+      .getIn(['timelines', 'home', 'items'], ImmutableList())
+      // @ts-expect-error state.timelines is not yet typed
+      .find((item) => item !== null)
+  );
+}
+
+function getLastNotificationId(state: RootState): string | undefined {
+  // @ts-expect-error state.notifications is not yet typed
+  return state.getIn(['notifications', 'lastReadId']);
+}
+
+const buildPostMarkersParams = (state: RootState) => {
+  const params = {} as { home?: MarkerParam; notifications?: MarkerParam };
+
+  const lastHomeId = getLastHomeId(state);
+  const lastNotificationId = getLastNotificationId(state);
+
+  if (lastHomeId && compareId(lastHomeId, state.markers.home) > 0) {
+    params.home = {
+      last_read_id: lastHomeId,
+    };
+  }
+
+  if (
+    lastNotificationId &&
+    lastNotificationId !== '0' &&
+    compareId(lastNotificationId, state.markers.notifications) > 0
+  ) {
+    params.notifications = {
+      last_read_id: lastNotificationId,
+    };
+  }
+
+  return params;
+};
+
+export const submitMarkersAction = createAppAsyncThunk<{
+  home: string | undefined;
+  notifications: string | undefined;
+}>('markers/submitAction', async (_args, { getState }) => {
+  const accessToken = authorizationTokenFromState(getState);
+  const params = buildPostMarkersParams(getState());
+
+  if (Object.keys(params).length === 0 || accessToken === '') {
+    return { home: undefined, notifications: undefined };
+  }
+
+  await api(getState).post<MarkerJSON>('/api/v1/markers', params);
+
+  return {
+    home: params.home?.last_read_id,
+    notifications: params.notifications?.last_read_id,
+  };
+});
+
+const debouncedSubmitMarkers = debounce(
+  (dispatch) => {
+    dispatch(submitMarkersAction());
+  },
+  300000,
+  {
+    leading: true,
+    trailing: true,
+  },
+);
+
+export const submitMarkers = createAppAsyncThunk(
+  'markers/submit',
+  (params: { immediate?: boolean }, { dispatch }) => {
+    debouncedSubmitMarkers(dispatch);
+
+    if (params.immediate) {
+      debouncedSubmitMarkers.flush();
+    }
+  },
+);
+
+export const fetchMarkers = createAppAsyncThunk(
+  'markers/fetch',
+  async (_args, { getState }) => {
+    const response =
+      await api(getState).get<Record<string, MarkerJSON>>(`/api/v1/markers`);
+
+    return { markers: response.data };
+  },
+);
diff --git a/app/javascript/flavours/glitch/api.ts b/app/javascript/flavours/glitch/api.ts
index f262fd85707941..de597a3e3b62f5 100644
--- a/app/javascript/flavours/glitch/api.ts
+++ b/app/javascript/flavours/glitch/api.ts
@@ -29,9 +29,14 @@ const setCSRFHeader = () => {
 
 void ready(setCSRFHeader);
 
+export const authorizationTokenFromState = (getState?: GetState) => {
+  return (
+    getState && (getState().meta.get('access_token', '') as string | false)
+  );
+};
+
 const authorizationHeaderFromState = (getState?: GetState) => {
-  const accessToken =
-    getState && (getState().meta.get('access_token', '') as string);
+  const accessToken = authorizationTokenFromState(getState);
 
   if (!accessToken) {
     return {};
diff --git a/app/javascript/flavours/glitch/api_types/markers.ts b/app/javascript/flavours/glitch/api_types/markers.ts
new file mode 100644
index 00000000000000..f7664fd7c123e6
--- /dev/null
+++ b/app/javascript/flavours/glitch/api_types/markers.ts
@@ -0,0 +1,7 @@
+// See app/serializers/rest/account_serializer.rb
+
+export interface MarkerJSON {
+  last_read_id: string;
+  version: string;
+  updated_at: string;
+}
diff --git a/app/javascript/flavours/glitch/reducers/index.ts b/app/javascript/flavours/glitch/reducers/index.ts
index c67349e51f8491..fe88661cd825b8 100644
--- a/app/javascript/flavours/glitch/reducers/index.ts
+++ b/app/javascript/flavours/glitch/reducers/index.ts
@@ -22,7 +22,7 @@ import listAdder from './list_adder';
 import listEditor from './list_editor';
 import lists from './lists';
 import local_settings from './local_settings';
-import markers from './markers';
+import { markersReducer } from './markers';
 import media_attachments from './media_attachments';
 import meta from './meta';
 import { modalReducer } from './modal';
@@ -81,7 +81,7 @@ const reducers = {
   pinnedAccountsEditor,
   polls,
   trends,
-  markers,
+  markers: markersReducer,
   picture_in_picture,
   history,
   tags,
diff --git a/app/javascript/flavours/glitch/reducers/markers.js b/app/javascript/flavours/glitch/reducers/markers.js
deleted file mode 100644
index c7c5d99f6143f4..00000000000000
--- a/app/javascript/flavours/glitch/reducers/markers.js
+++ /dev/null
@@ -1,26 +0,0 @@
-import { Map as ImmutableMap } from 'immutable';
-
-import {
-  MARKERS_SUBMIT_SUCCESS,
-} from '../actions/markers';
-
-
-const initialState = ImmutableMap({
-  home: '0',
-  notifications: '0',
-});
-
-export default function markers(state = initialState, action) {
-  switch(action.type) {
-  case MARKERS_SUBMIT_SUCCESS:
-    if (action.home) {
-      state = state.set('home', action.home);
-    }
-    if (action.notifications) {
-      state = state.set('notifications', action.notifications);
-    }
-    return state;
-  default:
-    return state;
-  }
-}
diff --git a/app/javascript/flavours/glitch/reducers/markers.ts b/app/javascript/flavours/glitch/reducers/markers.ts
new file mode 100644
index 00000000000000..380e9d39952378
--- /dev/null
+++ b/app/javascript/flavours/glitch/reducers/markers.ts
@@ -0,0 +1,18 @@
+import { createReducer } from '@reduxjs/toolkit';
+
+import { submitMarkersAction } from 'flavours/glitch/actions/markers';
+
+const initialState = {
+  home: '0',
+  notifications: '0',
+};
+
+export const markersReducer = createReducer(initialState, (builder) => {
+  builder.addCase(
+    submitMarkersAction.fulfilled,
+    (state, { payload: { home, notifications } }) => {
+      if (home) state.home = home;
+      if (notifications) state.notifications = notifications;
+    },
+  );
+});
diff --git a/app/javascript/flavours/glitch/reducers/notifications.js b/app/javascript/flavours/glitch/reducers/notifications.js
index 14862bef0790aa..6edf84b67a134f 100644
--- a/app/javascript/flavours/glitch/reducers/notifications.js
+++ b/app/javascript/flavours/glitch/reducers/notifications.js
@@ -9,7 +9,7 @@ import {
   rejectFollowRequestSuccess,
 } from '../actions/accounts';
 import {
-  MARKERS_FETCH_SUCCESS,
+  fetchMarkers,
 } from '../actions/markers';
 import {
   NOTIFICATIONS_MOUNT,
@@ -297,8 +297,8 @@ export default function notifications(state = initialState, action) {
   let st;
 
   switch(action.type) {
-  case MARKERS_FETCH_SUCCESS:
-    return action.markers.notifications ? recountUnread(state, action.markers.notifications.last_read_id) : state;
+  case fetchMarkers.fulfilled.type:
+    return action.payload.markers.notifications ? recountUnread(state, action.payload.markers.notifications.last_read_id) : state;
   case NOTIFICATIONS_MOUNT:
     return updateMounted(state);
   case NOTIFICATIONS_UNMOUNT:

From 371c5e59eb63f96f2dfcd77b7315b8457487f823 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Wed, 27 Mar 2024 16:19:33 +0100
Subject: [PATCH 0887/2191] [Glitch] Rewrite PIP state in Typescript

Port 9fbe8d3a0cf33e1ec7f631b7651e9fb2bca8440e to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../glitch/actions/picture_in_picture.js      | 46 ---------
 .../glitch/actions/picture_in_picture.ts      | 31 +++++++
 .../glitch/containers/status_container.js     |  2 +-
 .../picture_in_picture/components/footer.jsx  |  2 +-
 .../picture_in_picture/components/header.jsx  | 51 ----------
 .../picture_in_picture/components/header.tsx  | 46 +++++++++
 .../features/picture_in_picture/index.jsx     | 93 -------------------
 .../features/picture_in_picture/index.tsx     | 90 ++++++++++++++++++
 .../flavours/glitch/features/ui/index.jsx     |  2 +-
 .../flavours/glitch/reducers/index.ts         |  4 +-
 .../glitch/reducers/picture_in_picture.js     | 26 ------
 .../glitch/reducers/picture_in_picture.ts     | 56 +++++++++++
 .../flavours/glitch/selectors/index.js        |  2 +-
 13 files changed, 229 insertions(+), 222 deletions(-)
 delete mode 100644 app/javascript/flavours/glitch/actions/picture_in_picture.js
 create mode 100644 app/javascript/flavours/glitch/actions/picture_in_picture.ts
 delete mode 100644 app/javascript/flavours/glitch/features/picture_in_picture/components/header.jsx
 create mode 100644 app/javascript/flavours/glitch/features/picture_in_picture/components/header.tsx
 delete mode 100644 app/javascript/flavours/glitch/features/picture_in_picture/index.jsx
 create mode 100644 app/javascript/flavours/glitch/features/picture_in_picture/index.tsx
 delete mode 100644 app/javascript/flavours/glitch/reducers/picture_in_picture.js
 create mode 100644 app/javascript/flavours/glitch/reducers/picture_in_picture.ts

diff --git a/app/javascript/flavours/glitch/actions/picture_in_picture.js b/app/javascript/flavours/glitch/actions/picture_in_picture.js
deleted file mode 100644
index 898375abeb9337..00000000000000
--- a/app/javascript/flavours/glitch/actions/picture_in_picture.js
+++ /dev/null
@@ -1,46 +0,0 @@
-// @ts-check
-
-export const PICTURE_IN_PICTURE_DEPLOY = 'PICTURE_IN_PICTURE_DEPLOY';
-export const PICTURE_IN_PICTURE_REMOVE = 'PICTURE_IN_PICTURE_REMOVE';
-
-/**
- * @typedef MediaProps
- * @property {string} src
- * @property {boolean} muted
- * @property {number} volume
- * @property {number} currentTime
- * @property {string} poster
- * @property {string} backgroundColor
- * @property {string} foregroundColor
- * @property {string} accentColor
- */
-
-/**
- * @param {string} statusId
- * @param {string} accountId
- * @param {string} playerType
- * @param {MediaProps} props
- * @returns {object}
- */
-export const deployPictureInPicture = (statusId, accountId, playerType, props) => {
-  // @ts-expect-error
-  return (dispatch, getState) => {
-    // Do not open a player for a toot that does not exist
-    if (getState().hasIn(['statuses', statusId])) {
-      dispatch({
-        type: PICTURE_IN_PICTURE_DEPLOY,
-        statusId,
-        accountId,
-        playerType,
-        props,
-      });
-    }
-  };
-};
-
-/*
- * @return {object}
- */
-export const removePictureInPicture = () => ({
-  type: PICTURE_IN_PICTURE_REMOVE,
-});
diff --git a/app/javascript/flavours/glitch/actions/picture_in_picture.ts b/app/javascript/flavours/glitch/actions/picture_in_picture.ts
new file mode 100644
index 00000000000000..9ad88ae29bd6bd
--- /dev/null
+++ b/app/javascript/flavours/glitch/actions/picture_in_picture.ts
@@ -0,0 +1,31 @@
+import { createAction } from '@reduxjs/toolkit';
+
+import type { PIPMediaProps } from 'flavours/glitch/reducers/picture_in_picture';
+import { createAppAsyncThunk } from 'flavours/glitch/store/typed_functions';
+
+interface DeployParams {
+  statusId: string;
+  accountId: string;
+  playerType: 'audio' | 'video';
+  props: PIPMediaProps;
+}
+
+export const removePictureInPicture = createAction('pip/remove');
+
+export const deployPictureInPictureAction =
+  createAction<DeployParams>('pip/deploy');
+
+export const deployPictureInPicture = createAppAsyncThunk(
+  'pip/deploy',
+  (args: DeployParams, { dispatch, getState }) => {
+    const { statusId } = args;
+
+    // Do not open a player for a toot that does not exist
+
+    // @ts-expect-error state.statuses is not yet typed
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-call
+    if (getState().hasIn(['statuses', statusId])) {
+      dispatch(deployPictureInPictureAction(args));
+    }
+  },
+);
diff --git a/app/javascript/flavours/glitch/containers/status_container.js b/app/javascript/flavours/glitch/containers/status_container.js
index f6bdf9400d415e..ed48ea8f9cdf09 100644
--- a/app/javascript/flavours/glitch/containers/status_container.js
+++ b/app/javascript/flavours/glitch/containers/status_container.js
@@ -282,7 +282,7 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
   deployPictureInPicture (status, type, mediaProps) {
     dispatch((_, getState) => {
       if (getState().getIn(['local_settings', 'media', 'pop_in_player'])) {
-        dispatch(deployPictureInPicture(status.get('id'), status.getIn(['account', 'id']), type, mediaProps));
+        dispatch(deployPictureInPicture({statusId: status.get('id'), accountId: status.getIn(['account', 'id']), playerType: type, props: mediaProps}));
       }
     });
   },
diff --git a/app/javascript/flavours/glitch/features/picture_in_picture/components/footer.jsx b/app/javascript/flavours/glitch/features/picture_in_picture/components/footer.jsx
index 3bf4f3b8577887..1260ecc7ba7e7a 100644
--- a/app/javascript/flavours/glitch/features/picture_in_picture/components/footer.jsx
+++ b/app/javascript/flavours/glitch/features/picture_in_picture/components/footer.jsx
@@ -237,4 +237,4 @@ class Footer extends ImmutablePureComponent {
 
 }
 
-export default  withRouter(connect(makeMapStateToProps)(injectIntl(Footer)));
+export default  connect(makeMapStateToProps)(withRouter(injectIntl(Footer)));
diff --git a/app/javascript/flavours/glitch/features/picture_in_picture/components/header.jsx b/app/javascript/flavours/glitch/features/picture_in_picture/components/header.jsx
deleted file mode 100644
index 5996ab240d3bc7..00000000000000
--- a/app/javascript/flavours/glitch/features/picture_in_picture/components/header.jsx
+++ /dev/null
@@ -1,51 +0,0 @@
-import PropTypes from 'prop-types';
-
-import { defineMessages, injectIntl } from 'react-intl';
-
-import { Link } from 'react-router-dom';
-
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import ImmutablePureComponent from 'react-immutable-pure-component';
-import { connect } from 'react-redux';
-
-import CloseIcon from '@/material-icons/400-24px/close.svg?react';
-import { Avatar } from 'flavours/glitch/components/avatar';
-import { DisplayName } from 'flavours/glitch/components/display_name';
-import { IconButton } from 'flavours/glitch/components/icon_button';
-
-const messages = defineMessages({
-  close: { id: 'lightbox.close', defaultMessage: 'Close' },
-});
-
-const mapStateToProps = (state, { accountId }) => ({
-  account: state.getIn(['accounts', accountId]),
-});
-
-class Header extends ImmutablePureComponent {
-
-  static propTypes = {
-    accountId: PropTypes.string.isRequired,
-    statusId: PropTypes.string.isRequired,
-    account: ImmutablePropTypes.record.isRequired,
-    onClose: PropTypes.func.isRequired,
-    intl: PropTypes.object.isRequired,
-  };
-
-  render () {
-    const { account, statusId, onClose, intl } = this.props;
-
-    return (
-      <div className='picture-in-picture__header'>
-        <Link to={`/@${account.get('acct')}/${statusId}`} className='picture-in-picture__header__account'>
-          <Avatar account={account} size={36} />
-          <DisplayName account={account} />
-        </Link>
-
-        <IconButton icon='times' iconComponent={CloseIcon} onClick={onClose} title={intl.formatMessage(messages.close)} />
-      </div>
-    );
-  }
-
-}
-
-export default connect(mapStateToProps)(injectIntl(Header));
diff --git a/app/javascript/flavours/glitch/features/picture_in_picture/components/header.tsx b/app/javascript/flavours/glitch/features/picture_in_picture/components/header.tsx
new file mode 100644
index 00000000000000..3bbd8294293f72
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/picture_in_picture/components/header.tsx
@@ -0,0 +1,46 @@
+import { defineMessages, useIntl } from 'react-intl';
+
+import { Link } from 'react-router-dom';
+
+import CloseIcon from '@/material-icons/400-24px/close.svg?react';
+import { Avatar } from 'flavours/glitch/components/avatar';
+import { DisplayName } from 'flavours/glitch/components/display_name';
+import { IconButton } from 'flavours/glitch/components/icon_button';
+import { useAppSelector } from 'flavours/glitch/store';
+
+const messages = defineMessages({
+  close: { id: 'lightbox.close', defaultMessage: 'Close' },
+});
+
+interface Props {
+  accountId: string;
+  statusId: string;
+  onClose: () => void;
+}
+
+export const Header: React.FC<Props> = ({ accountId, statusId, onClose }) => {
+  const account = useAppSelector((state) => state.accounts.get(accountId));
+
+  const intl = useIntl();
+
+  if (!account) return null;
+
+  return (
+    <div className='picture-in-picture__header'>
+      <Link
+        to={`/@${account.get('acct')}/${statusId}`}
+        className='picture-in-picture__header__account'
+      >
+        <Avatar account={account} size={36} />
+        <DisplayName account={account} />
+      </Link>
+
+      <IconButton
+        icon='times'
+        iconComponent={CloseIcon}
+        onClick={onClose}
+        title={intl.formatMessage(messages.close)}
+      />
+    </div>
+  );
+};
diff --git a/app/javascript/flavours/glitch/features/picture_in_picture/index.jsx b/app/javascript/flavours/glitch/features/picture_in_picture/index.jsx
deleted file mode 100644
index ed229384c4a04b..00000000000000
--- a/app/javascript/flavours/glitch/features/picture_in_picture/index.jsx
+++ /dev/null
@@ -1,93 +0,0 @@
-import PropTypes from 'prop-types';
-import { Component } from 'react';
-
-import classNames from 'classnames';
-
-import { connect } from 'react-redux';
-
-import { removePictureInPicture } from 'flavours/glitch/actions/picture_in_picture';
-import Audio from 'flavours/glitch/features/audio';
-import Video from 'flavours/glitch/features/video';
-
-import Footer from './components/footer';
-import Header from './components/header';
-
-const mapStateToProps = state => ({
-  ...state.get('picture_in_picture'),
-  left: state.getIn(['local_settings', 'media', 'pop_in_position']) === 'left',
-});
-
-class PictureInPicture extends Component {
-
-  static propTypes = {
-    statusId: PropTypes.string,
-    accountId: PropTypes.string,
-    type: PropTypes.string,
-    src: PropTypes.string,
-    muted: PropTypes.bool,
-    volume: PropTypes.number,
-    currentTime: PropTypes.number,
-    poster: PropTypes.string,
-    backgroundColor: PropTypes.string,
-    foregroundColor: PropTypes.string,
-    accentColor: PropTypes.string,
-    dispatch: PropTypes.func.isRequired,
-    left: PropTypes.bool,
-  };
-
-  handleClose = () => {
-    const { dispatch } = this.props;
-    dispatch(removePictureInPicture());
-  };
-
-  render () {
-    const { type, src, currentTime, accountId, statusId, left } = this.props;
-
-    if (!currentTime) {
-      return null;
-    }
-
-    let player;
-
-    if (type === 'video') {
-      player = (
-        <Video
-          src={src}
-          currentTime={this.props.currentTime}
-          volume={this.props.volume}
-          muted={this.props.muted}
-          autoPlay
-          inline
-          alwaysVisible
-        />
-      );
-    } else if (type === 'audio') {
-      player = (
-        <Audio
-          src={src}
-          currentTime={this.props.currentTime}
-          volume={this.props.volume}
-          muted={this.props.muted}
-          poster={this.props.poster}
-          backgroundColor={this.props.backgroundColor}
-          foregroundColor={this.props.foregroundColor}
-          accentColor={this.props.accentColor}
-          autoPlay
-        />
-      );
-    }
-
-    return (
-      <div className={classNames('picture-in-picture', { left })}>
-        <Header accountId={accountId} statusId={statusId} onClose={this.handleClose} />
-
-        {player}
-
-        <Footer statusId={statusId} />
-      </div>
-    );
-  }
-
-}
-
-export default connect(mapStateToProps)(PictureInPicture);
diff --git a/app/javascript/flavours/glitch/features/picture_in_picture/index.tsx b/app/javascript/flavours/glitch/features/picture_in_picture/index.tsx
new file mode 100644
index 00000000000000..3541e5fdd3adb9
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/picture_in_picture/index.tsx
@@ -0,0 +1,90 @@
+import { useCallback } from 'react';
+
+import classNames from 'classnames';
+
+import { removePictureInPicture } from 'flavours/glitch/actions/picture_in_picture';
+import Audio from 'flavours/glitch/features/audio';
+import Video from 'flavours/glitch/features/video';
+import {
+  useAppDispatch,
+  useAppSelector,
+} from 'flavours/glitch/store/typed_functions';
+
+import Footer from './components/footer';
+import { Header } from './components/header';
+
+export const PictureInPicture: React.FC = () => {
+  const dispatch = useAppDispatch();
+
+  const handleClose = useCallback(() => {
+    dispatch(removePictureInPicture());
+  }, [dispatch]);
+
+  const pipState = useAppSelector((s) => s.picture_in_picture);
+
+  const left = useAppSelector(
+    // @ts-expect-error - `local_settings` is not yet typed
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-call
+    (s) => s.getIn(['local_settings', 'media', 'pop_in_position']) === 'left',
+  );
+
+  if (pipState.type === null) {
+    return null;
+  }
+
+  const {
+    type,
+    src,
+    currentTime,
+    accountId,
+    statusId,
+    volume,
+    muted,
+    poster,
+    backgroundColor,
+    foregroundColor,
+    accentColor,
+  } = pipState;
+
+  let player;
+
+  switch (type) {
+    case 'video':
+      player = (
+        <Video
+          src={src}
+          currentTime={currentTime}
+          volume={volume}
+          muted={muted}
+          autoPlay
+          inline
+          alwaysVisible
+        />
+      );
+      break;
+    case 'audio':
+      player = (
+        <Audio
+          src={src}
+          currentTime={currentTime}
+          volume={volume}
+          muted={muted}
+          poster={poster}
+          backgroundColor={backgroundColor}
+          foregroundColor={foregroundColor}
+          accentColor={accentColor}
+          autoPlay
+        />
+      );
+  }
+
+  return (
+    <div className={classNames('picture-in-picture', { left })}>
+      <Header accountId={accountId} statusId={statusId} onClose={handleClose} />
+
+      {player}
+
+      <Footer statusId={statusId} />
+    </div>
+  );
+};
diff --git a/app/javascript/flavours/glitch/features/ui/index.jsx b/app/javascript/flavours/glitch/features/ui/index.jsx
index 51ac4ac145ae1a..05855f89d7c8b6 100644
--- a/app/javascript/flavours/glitch/features/ui/index.jsx
+++ b/app/javascript/flavours/glitch/features/ui/index.jsx
@@ -16,7 +16,7 @@ import { changeLayout } from 'flavours/glitch/actions/app';
 import { synchronouslySubmitMarkers, submitMarkers, fetchMarkers } from 'flavours/glitch/actions/markers';
 import { INTRODUCTION_VERSION } from 'flavours/glitch/actions/onboarding';
 import { Permalink } from 'flavours/glitch/components/permalink';
-import PictureInPicture from 'flavours/glitch/features/picture_in_picture';
+import { PictureInPicture } from 'flavours/glitch/features/picture_in_picture';
 import { layoutFromWindow } from 'flavours/glitch/is_mobile';
 import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router';
 
diff --git a/app/javascript/flavours/glitch/reducers/index.ts b/app/javascript/flavours/glitch/reducers/index.ts
index fe88661cd825b8..9a8f7e204f64a7 100644
--- a/app/javascript/flavours/glitch/reducers/index.ts
+++ b/app/javascript/flavours/glitch/reducers/index.ts
@@ -29,7 +29,7 @@ import { modalReducer } from './modal';
 import { notificationPolicyReducer } from './notification_policy';
 import { notificationRequestsReducer } from './notification_requests';
 import notifications from './notifications';
-import picture_in_picture from './picture_in_picture';
+import { pictureInPictureReducer } from './picture_in_picture';
 import pinnedAccountsEditor from './pinned_accounts_editor';
 import polls from './polls';
 import push_notifications from './push_notifications';
@@ -82,7 +82,7 @@ const reducers = {
   polls,
   trends,
   markers: markersReducer,
-  picture_in_picture,
+  picture_in_picture: pictureInPictureReducer,
   history,
   tags,
   followed_tags,
diff --git a/app/javascript/flavours/glitch/reducers/picture_in_picture.js b/app/javascript/flavours/glitch/reducers/picture_in_picture.js
deleted file mode 100644
index 961fc5699c1b3b..00000000000000
--- a/app/javascript/flavours/glitch/reducers/picture_in_picture.js
+++ /dev/null
@@ -1,26 +0,0 @@
-import { PICTURE_IN_PICTURE_DEPLOY, PICTURE_IN_PICTURE_REMOVE } from 'flavours/glitch/actions/picture_in_picture';
-
-import { TIMELINE_DELETE } from '../actions/timelines';
-
-const initialState = {
-  statusId: null,
-  accountId: null,
-  type: null,
-  src: null,
-  muted: false,
-  volume: 0,
-  currentTime: 0,
-};
-
-export default function pictureInPicture(state = initialState, action) {
-  switch(action.type) {
-  case PICTURE_IN_PICTURE_DEPLOY:
-    return { statusId: action.statusId, accountId: action.accountId, type: action.playerType, ...action.props };
-  case PICTURE_IN_PICTURE_REMOVE:
-    return { ...initialState };
-  case TIMELINE_DELETE:
-    return (state.statusId === action.id) ? { ...initialState } : state;
-  default:
-    return state;
-  }
-}
diff --git a/app/javascript/flavours/glitch/reducers/picture_in_picture.ts b/app/javascript/flavours/glitch/reducers/picture_in_picture.ts
new file mode 100644
index 00000000000000..35eb10cf577f18
--- /dev/null
+++ b/app/javascript/flavours/glitch/reducers/picture_in_picture.ts
@@ -0,0 +1,56 @@
+import type { Reducer } from '@reduxjs/toolkit';
+
+import {
+  deployPictureInPictureAction,
+  removePictureInPicture,
+} from 'flavours/glitch/actions/picture_in_picture';
+
+import { TIMELINE_DELETE } from '../actions/timelines';
+
+export interface PIPMediaProps {
+  src: string;
+  muted: boolean;
+  volume: number;
+  currentTime: number;
+  poster: string;
+  backgroundColor: string;
+  foregroundColor: string;
+  accentColor: string;
+}
+
+interface PIPStateWithValue extends Partial<PIPMediaProps> {
+  statusId: string;
+  accountId: string;
+  type: 'audio' | 'video';
+}
+
+interface PIPStateEmpty extends Partial<PIPMediaProps> {
+  type: null;
+}
+
+type PIPState = PIPStateWithValue | PIPStateEmpty;
+
+const initialState = {
+  type: null,
+  muted: false,
+  volume: 0,
+  currentTime: 0,
+};
+
+export const pictureInPictureReducer: Reducer<PIPState> = (
+  state = initialState,
+  action,
+) => {
+  if (deployPictureInPictureAction.match(action))
+    return {
+      statusId: action.payload.statusId,
+      accountId: action.payload.accountId,
+      type: action.payload.playerType,
+      ...action.payload.props,
+    };
+  else if (removePictureInPicture.match(action)) return initialState;
+  else if (action.type === TIMELINE_DELETE)
+    if (state.type && state.statusId === action.id) return initialState;
+
+  return state;
+};
diff --git a/app/javascript/flavours/glitch/selectors/index.js b/app/javascript/flavours/glitch/selectors/index.js
index 0bec708116eb1c..b3bf22fcab9aa9 100644
--- a/app/javascript/flavours/glitch/selectors/index.js
+++ b/app/javascript/flavours/glitch/selectors/index.js
@@ -61,7 +61,7 @@ export const makeGetStatus = () => {
 
 export const makeGetPictureInPicture = () => {
   return createSelector([
-    (state, { id }) => state.get('picture_in_picture').statusId === id,
+    (state, { id }) => state.picture_in_picture.statusId === id,
     (state) => state.getIn(['meta', 'layout']) !== 'mobile',
   ], (inUse, available) => ImmutableMap({
     inUse: inUse && available,

From 555f45f2491f96a2dd1b8a957198ddf78c9bda30 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Wed, 27 Mar 2024 16:49:02 +0100
Subject: [PATCH 0888/2191] [Glitch] Fix notifications marker fetch

Port b9982ce578c24fa2dcdbe4fb79610345257681df to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/actions/markers.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/javascript/flavours/glitch/actions/markers.ts b/app/javascript/flavours/glitch/actions/markers.ts
index 5afb2cb109ddd8..78362a9ca302e4 100644
--- a/app/javascript/flavours/glitch/actions/markers.ts
+++ b/app/javascript/flavours/glitch/actions/markers.ts
@@ -156,8 +156,10 @@ export const submitMarkers = createAppAsyncThunk(
 export const fetchMarkers = createAppAsyncThunk(
   'markers/fetch',
   async (_args, { getState }) => {
-    const response =
-      await api(getState).get<Record<string, MarkerJSON>>(`/api/v1/markers`);
+    const response = await api(getState).get<Record<string, MarkerJSON>>(
+      `/api/v1/markers`,
+      { params: { timeline: ['notifications'] } },
+    );
 
     return { markers: response.data };
   },

From 5cb4adbf4e312b1b54f4a25b057d43306e5f33fe Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 27 Mar 2024 17:32:00 +0100
Subject: [PATCH 0889/2191] [Glitch] Fix language picker and privacy picker not
 having a backdrop filter

Port c913e2f3e50eb4f0f7c1459717ede3070b3e6846 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/styles/components.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index 83011bacea0ce1..3ff06d76147bf7 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -5470,6 +5470,7 @@ a.status-card {
 .language-dropdown__dropdown {
   box-shadow: var(--dropdown-shadow);
   background: var(--dropdown-background-color);
+  backdrop-filter: var(--background-filter);
   border: 1px solid var(--dropdown-border-color);
   padding: 4px;
   border-radius: 4px;

From 02f9ce9ce394e9ef5b7dec2da51a897e6827976a Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Thu, 28 Mar 2024 11:05:16 +0100
Subject: [PATCH 0890/2191] [Glitch] Fix PropTypes for some record objects

Port f2fd1da23fa6bc1847bf7d96a76826f36b29ae8c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/features/getting_started/index.jsx          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/flavours/glitch/features/getting_started/index.jsx b/app/javascript/flavours/glitch/features/getting_started/index.jsx
index 585abb8b6c56e0..145cb09a303db9 100644
--- a/app/javascript/flavours/glitch/features/getting_started/index.jsx
+++ b/app/javascript/flavours/glitch/features/getting_started/index.jsx
@@ -106,7 +106,7 @@ class GettingStarted extends ImmutablePureComponent {
 
   static propTypes = {
     intl: PropTypes.object.isRequired,
-    myAccount: ImmutablePropTypes.map,
+    myAccount: ImmutablePropTypes.record,
     columns: ImmutablePropTypes.list,
     multiColumn: PropTypes.bool,
     fetchFollowRequests: PropTypes.func.isRequired,

From 0ab212f6a92b21e2899b3a66ebbbf64ae3e6dec6 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Thu, 28 Mar 2024 11:06:25 +0100
Subject: [PATCH 0891/2191] [Glitch] Fix props for `<Button>`

Port d08896476100e440d340f19540ae964887bc0a57 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/components/button.tsx       | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/javascript/flavours/glitch/components/button.tsx b/app/javascript/flavours/glitch/components/button.tsx
index 0b6a0f267ebd6e..c76aaea42f26fc 100644
--- a/app/javascript/flavours/glitch/components/button.tsx
+++ b/app/javascript/flavours/glitch/components/button.tsx
@@ -1,26 +1,26 @@
+import type { PropsWithChildren } from 'react';
 import { useCallback } from 'react';
 
 import classNames from 'classnames';
 
-interface BaseProps extends React.ButtonHTMLAttributes<HTMLButtonElement> {
+interface BaseProps
+  extends Omit<React.ButtonHTMLAttributes<HTMLButtonElement>, 'children'> {
   block?: boolean;
   secondary?: boolean;
-  text?: JSX.Element;
 }
 
-interface PropsWithChildren extends BaseProps {
-  text?: never;
+interface PropsChildren extends PropsWithChildren<BaseProps> {
+  text?: undefined;
 }
 
 interface PropsWithText extends BaseProps {
-  text: JSX.Element;
-  children: never;
+  text: JSX.Element | string;
+  children?: undefined;
 }
 
-type Props = PropsWithText | PropsWithChildren;
+type Props = PropsWithText | PropsChildren;
 
 export const Button: React.FC<Props> = ({
-  text,
   type = 'button',
   onClick,
   disabled,
@@ -28,6 +28,7 @@ export const Button: React.FC<Props> = ({
   secondary,
   className,
   title,
+  text,
   children,
   ...props
 }) => {

From cc720cd38f82ebcd6fb55aaf938e53aa174ac688 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Thu, 28 Mar 2024 11:07:01 +0100
Subject: [PATCH 0892/2191] [Glitch] Fix `<RelativeTimestamp>` types

Port 961bb84e4c87555bbce930a87291938a988a483a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../glitch/components/relative_timestamp.tsx      | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/javascript/flavours/glitch/components/relative_timestamp.tsx b/app/javascript/flavours/glitch/components/relative_timestamp.tsx
index b9e1e4f8fd1ff7..ac385e88c651f6 100644
--- a/app/javascript/flavours/glitch/components/relative_timestamp.tsx
+++ b/app/javascript/flavours/glitch/components/relative_timestamp.tsx
@@ -191,7 +191,7 @@ const timeRemainingString = (
 interface Props {
   intl: IntlShape;
   timestamp: string;
-  year: number;
+  year?: number;
   futureDate?: boolean;
   short?: boolean;
 }
@@ -203,11 +203,6 @@ class RelativeTimestamp extends Component<Props, States> {
     now: Date.now(),
   };
 
-  static defaultProps = {
-    year: new Date().getFullYear(),
-    short: true,
-  };
-
   _timer: number | undefined;
 
   shouldComponentUpdate(nextProps: Props, nextState: States) {
@@ -257,7 +252,13 @@ class RelativeTimestamp extends Component<Props, States> {
   }
 
   render() {
-    const { timestamp, intl, year, futureDate, short } = this.props;
+    const {
+      timestamp,
+      intl,
+      futureDate,
+      year = new Date().getFullYear(),
+      short = true,
+    } = this.props;
 
     const timeGiven = timestamp.includes('T');
     const date = new Date(timestamp);

From bc370938ef8e29a32a2563388fd220983b454bb9 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 28 Mar 2024 15:00:57 +0100
Subject: [PATCH 0893/2191] [Glitch] Fix logo pushing header buttons out of
 view on certain conditions in mobile layout

Port 4f068d4fcc4d134fcbd56faa8f39c608dd343417 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/styles/components.scss | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index 3ff06d76147bf7..475e25dab12bc5 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -2826,6 +2826,7 @@ a.account__display-name {
 }
 
 $ui-header-height: 55px;
+$ui-header-logo-wordmark-width: 99px;
 
 .ui__header {
   display: none;
@@ -2841,6 +2842,10 @@ $ui-header-height: 55px;
   &__logo {
     display: inline-flex;
     padding: 15px;
+    flex-grow: 1;
+    flex-shrink: 1;
+    overflow: hidden;
+    container: header-logo / inline-size;
 
     .logo {
       height: $ui-header-height - 30px;
@@ -2851,7 +2856,7 @@ $ui-header-height: 55px;
       display: none;
     }
 
-    @media screen and (width >= 320px) {
+    @container header-logo (min-width: #{$ui-header-logo-wordmark-width}) {
       .logo--wordmark {
         display: block;
       }
@@ -2868,6 +2873,7 @@ $ui-header-height: 55px;
     gap: 10px;
     padding: 0 10px;
     overflow: hidden;
+    flex-shrink: 0;
 
     .button {
       flex: 0 0 auto;

From b3d5567bd0b78e3b69eecdcbdb85f46bf1df1521 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Thu, 28 Mar 2024 16:33:15 +0100
Subject: [PATCH 0894/2191] [Glitch] Remove global `boosts` state and convert
 boosts modal to Typescript

Port 67442f90393c644064bf34d531bdebe15f88d729 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/actions/boosts.js         |  32 ----
 .../glitch/components/visibility_icon.tsx     |   5 +-
 .../glitch/containers/status_container.js     |   5 +-
 .../containers/notification_container.js      |   4 +-
 .../picture_in_picture/components/footer.jsx  |   3 +-
 .../containers/detailed_status_container.js   |   3 +-
 .../flavours/glitch/features/status/index.jsx |   5 +-
 .../features/ui/components/boost_modal.jsx    | 131 --------------
 .../features/ui/components/boost_modal.tsx    | 170 ++++++++++++++++++
 .../features/ui/components/modal_root.jsx     |   2 +-
 .../flavours/glitch/models/status.ts          |   4 +
 .../flavours/glitch/reducers/boosts.js        |  25 ---
 .../flavours/glitch/reducers/index.ts         |   2 -
 13 files changed, 185 insertions(+), 206 deletions(-)
 delete mode 100644 app/javascript/flavours/glitch/actions/boosts.js
 delete mode 100644 app/javascript/flavours/glitch/features/ui/components/boost_modal.jsx
 create mode 100644 app/javascript/flavours/glitch/features/ui/components/boost_modal.tsx
 create mode 100644 app/javascript/flavours/glitch/models/status.ts
 delete mode 100644 app/javascript/flavours/glitch/reducers/boosts.js

diff --git a/app/javascript/flavours/glitch/actions/boosts.js b/app/javascript/flavours/glitch/actions/boosts.js
deleted file mode 100644
index 1fc2e391e26827..00000000000000
--- a/app/javascript/flavours/glitch/actions/boosts.js
+++ /dev/null
@@ -1,32 +0,0 @@
-import { openModal } from './modal';
-
-export const BOOSTS_INIT_MODAL = 'BOOSTS_INIT_MODAL';
-export const BOOSTS_CHANGE_PRIVACY = 'BOOSTS_CHANGE_PRIVACY';
-
-export function initBoostModal(props) {
-  return (dispatch, getState) => {
-    const default_privacy = getState().getIn(['compose', 'default_privacy']);
-
-    const privacy = props.status.get('visibility') === 'private' ? 'private' : default_privacy;
-
-    dispatch({
-      type: BOOSTS_INIT_MODAL,
-      privacy,
-    });
-
-    dispatch(openModal({
-      modalType: 'BOOST',
-      modalProps: props,
-    }));
-  };
-}
-
-
-export function changeBoostPrivacy(privacy) {
-  return dispatch => {
-    dispatch({
-      type: BOOSTS_CHANGE_PRIVACY,
-      privacy,
-    });
-  };
-}
diff --git a/app/javascript/flavours/glitch/components/visibility_icon.tsx b/app/javascript/flavours/glitch/components/visibility_icon.tsx
index dd24c5c9272dbe..1ae2c242727503 100644
--- a/app/javascript/flavours/glitch/components/visibility_icon.tsx
+++ b/app/javascript/flavours/glitch/components/visibility_icon.tsx
@@ -4,11 +4,10 @@ import LockIcon from '@/material-icons/400-24px/lock.svg?react';
 import MailIcon from '@/material-icons/400-24px/mail.svg?react';
 import PublicIcon from '@/material-icons/400-24px/public.svg?react';
 import QuietTimeIcon from '@/material-icons/400-24px/quiet_time.svg?react';
+import type { StatusVisibility } from 'flavours/glitch/models/status';
 
 import { Icon } from './icon';
 
-type Visibility = 'public' | 'unlisted' | 'private' | 'direct';
-
 const messages = defineMessages({
   public_short: { id: 'privacy.public.short', defaultMessage: 'Public' },
   unlisted_short: {
@@ -25,7 +24,7 @@ const messages = defineMessages({
   },
 });
 
-export const VisibilityIcon: React.FC<{ visibility: Visibility }> = ({
+export const VisibilityIcon: React.FC<{ visibility: StatusVisibility }> = ({
   visibility,
 }) => {
   const intl = useIntl();
diff --git a/app/javascript/flavours/glitch/containers/status_container.js b/app/javascript/flavours/glitch/containers/status_container.js
index ed48ea8f9cdf09..d304af5ec72429 100644
--- a/app/javascript/flavours/glitch/containers/status_container.js
+++ b/app/javascript/flavours/glitch/containers/status_container.js
@@ -3,7 +3,6 @@ import { defineMessages, injectIntl } from 'react-intl';
 import { connect } from 'react-redux';
 
 import { initBlockModal } from 'flavours/glitch/actions/blocks';
-import { initBoostModal } from 'flavours/glitch/actions/boosts';
 import {
   replyCompose,
   mentionCompose,
@@ -126,11 +125,11 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
     dispatch((_, getState) => {
       let state = getState();
       if (state.getIn(['local_settings', 'confirm_boost_missing_media_description']) && status.get('media_attachments').some(item => !item.get('description')) && !status.get('reblogged')) {
-        dispatch(initBoostModal({ status, onReblog: this.onModalReblog, missingMediaDescription: true }));
+        dispatch(openModal({ modalType: 'BOOST', modalProps: { status, onReblog: this.onModalReblog, missingMediaDescription: true } }));
       } else if (e.shiftKey || !boostModal) {
         this.onModalReblog(status);
       } else {
-        dispatch(initBoostModal({ status, onReblog: this.onModalReblog }));
+        dispatch(openModal({ modalType: 'BOOST', modalProps: { status, onReblog: this.onModalReblog } }));
       }
     });
   },
diff --git a/app/javascript/flavours/glitch/features/notifications/containers/notification_container.js b/app/javascript/flavours/glitch/features/notifications/containers/notification_container.js
index 8a4b5c8ed56978..de5cb2b11ee2fc 100644
--- a/app/javascript/flavours/glitch/features/notifications/containers/notification_container.js
+++ b/app/javascript/flavours/glitch/features/notifications/containers/notification_container.js
@@ -1,6 +1,5 @@
 import { connect } from 'react-redux';
 
-import { initBoostModal } from '../../../actions/boosts';
 import { mentionCompose } from '../../../actions/compose';
 import {
   reblog,
@@ -8,6 +7,7 @@ import {
   unreblog,
   unfavourite,
 } from '../../../actions/interactions';
+import { openModal } from '../../../actions/modal';
 import { boostModal } from '../../../initial_state';
 import { makeGetNotification, makeGetStatus, makeGetReport } from '../../../selectors';
 import Notification from '../components/notification';
@@ -46,7 +46,7 @@ const mapDispatchToProps = dispatch => ({
       if (e.shiftKey || !boostModal) {
         this.onModalReblog(status);
       } else {
-        dispatch(initBoostModal({ status, onReblog: this.onModalReblog }));
+        dispatch(openModal({ modalType: 'BOOST', modalProps: { status, onReblog: this.onModalReblog } }));
       }
     }
   },
diff --git a/app/javascript/flavours/glitch/features/picture_in_picture/components/footer.jsx b/app/javascript/flavours/glitch/features/picture_in_picture/components/footer.jsx
index 1260ecc7ba7e7a..e21ee2d3d3e07d 100644
--- a/app/javascript/flavours/glitch/features/picture_in_picture/components/footer.jsx
+++ b/app/javascript/flavours/glitch/features/picture_in_picture/components/footer.jsx
@@ -14,7 +14,6 @@ import RepeatIcon from '@/material-icons/400-24px/repeat.svg?react';
 import ReplyIcon from '@/material-icons/400-24px/reply.svg?react';
 import ReplyAllIcon from '@/material-icons/400-24px/reply_all.svg?react';
 import StarIcon from '@/material-icons/400-24px/star.svg?react';
-import { initBoostModal } from 'flavours/glitch/actions/boosts';
 import { replyCompose } from 'flavours/glitch/actions/compose';
 import { reblog, favourite, unreblog, unfavourite } from 'flavours/glitch/actions/interactions';
 import { openModal } from 'flavours/glitch/actions/modal';
@@ -142,7 +141,7 @@ class Footer extends ImmutablePureComponent {
       } else if ((e && e.shiftKey) || !boostModal) {
         this._performReblog(status);
       } else {
-        dispatch(initBoostModal({ status, onReblog: this._performReblog }));
+        dispatch(openModal({ modalType: 'BOOST', modalProps: { status, onReblog: this._performReblog } }));
       }
     } else {
       dispatch(openModal({
diff --git a/app/javascript/flavours/glitch/features/status/containers/detailed_status_container.js b/app/javascript/flavours/glitch/features/status/containers/detailed_status_container.js
index 40803441d201d2..7e8fe49b237d10 100644
--- a/app/javascript/flavours/glitch/features/status/containers/detailed_status_container.js
+++ b/app/javascript/flavours/glitch/features/status/containers/detailed_status_container.js
@@ -4,7 +4,6 @@ import { connect } from 'react-redux';
 
 import { showAlertForError } from '../../../actions/alerts';
 import { initBlockModal } from '../../../actions/blocks';
-import { initBoostModal } from '../../../actions/boosts';
 import {
   replyCompose,
   mentionCompose,
@@ -82,7 +81,7 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
       if (e.shiftKey || !boostModal) {
         this.onModalReblog(status);
       } else {
-        dispatch(initBoostModal({ status, onReblog: this.onModalReblog }));
+        dispatch(openModal({ modalType: 'BOOST', modalProps: { status, onReblog: this.onModalReblog } }));
       }
     }
   },
diff --git a/app/javascript/flavours/glitch/features/status/index.jsx b/app/javascript/flavours/glitch/features/status/index.jsx
index f9b864076252dc..6274bf672c0322 100644
--- a/app/javascript/flavours/glitch/features/status/index.jsx
+++ b/app/javascript/flavours/glitch/features/status/index.jsx
@@ -25,7 +25,6 @@ import { autoUnfoldCW } from 'flavours/glitch/utils/content_warning';
 import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router';
 
 import { initBlockModal } from '../../actions/blocks';
-import { initBoostModal } from '../../actions/boosts';
 import {
   replyCompose,
   mentionCompose,
@@ -362,11 +361,11 @@ class Status extends ImmutablePureComponent {
 
     if (signedIn) {
       if (settings.get('confirm_boost_missing_media_description') && status.get('media_attachments').some(item => !item.get('description')) && !status.get('reblogged')) {
-        dispatch(initBoostModal({ status, onReblog: this.handleModalReblog, missingMediaDescription: true }));
+        dispatch(openModal({ modalType: 'BOOST', modalProps: { status, onReblog: this.handleModalReblog, missingMediaDescription: true } }));
       } else if ((e && e.shiftKey) || !boostModal) {
         this.handleModalReblog(status);
       } else {
-        dispatch(initBoostModal({ status, onReblog: this.handleModalReblog }));
+        dispatch(openModal({ modalType: 'BOOST', modalProps: { status, onReblog: this.handleModalReblog } }));
       }
     } else {
       dispatch(openModal({
diff --git a/app/javascript/flavours/glitch/features/ui/components/boost_modal.jsx b/app/javascript/flavours/glitch/features/ui/components/boost_modal.jsx
deleted file mode 100644
index c16ed71cb8c657..00000000000000
--- a/app/javascript/flavours/glitch/features/ui/components/boost_modal.jsx
+++ /dev/null
@@ -1,131 +0,0 @@
-import PropTypes from 'prop-types';
-
-import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
-
-import classNames from 'classnames';
-import { withRouter } from 'react-router-dom';
-
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import ImmutablePureComponent from 'react-immutable-pure-component';
-import { connect } from 'react-redux';
-
-import RepeatIcon from '@/material-icons/400-24px/repeat.svg?react';
-import { changeBoostPrivacy } from 'flavours/glitch/actions/boosts';
-import AttachmentList from 'flavours/glitch/components/attachment_list';
-import { Icon }  from 'flavours/glitch/components/icon';
-import { VisibilityIcon } from 'flavours/glitch/components/visibility_icon';
-import PrivacyDropdown from 'flavours/glitch/features/compose/components/privacy_dropdown';
-import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router';
-
-import { Avatar } from '../../../components/avatar';
-import { Button } from '../../../components/button';
-import { DisplayName } from '../../../components/display_name';
-import { RelativeTimestamp } from '../../../components/relative_timestamp';
-import StatusContent from '../../../components/status_content';
-
-const messages = defineMessages({
-  cancel_reblog: { id: 'status.cancel_reblog_private', defaultMessage: 'Unboost' },
-  reblog: { id: 'status.reblog', defaultMessage: 'Boost' },
-});
-
-const mapStateToProps = state => {
-  return {
-    privacy: state.getIn(['boosts', 'new', 'privacy']),
-  };
-};
-
-const mapDispatchToProps = dispatch => {
-  return {
-    onChangeBoostPrivacy(value) {
-      dispatch(changeBoostPrivacy(value));
-    },
-  };
-};
-
-class BoostModal extends ImmutablePureComponent {
-  static propTypes = {
-    status: ImmutablePropTypes.map.isRequired,
-    onReblog: PropTypes.func.isRequired,
-    onClose: PropTypes.func.isRequired,
-    missingMediaDescription: PropTypes.bool,
-    intl: PropTypes.object.isRequired,
-    ...WithRouterPropTypes,
-  };
-
-  handleReblog = () => {
-    this.props.onReblog(this.props.status, this.props.privacy);
-    this.props.onClose();
-  };
-
-  handleAccountClick = (e) => {
-    if (e.button === 0) {
-      e.preventDefault();
-      this.props.onClose();
-      this.props.history.push(`/@${this.props.status.getIn(['account', 'acct'])}`);
-    }
-  };
-
-  _findContainer = () => {
-    return document.getElementsByClassName('modal-root__container')[0];
-  };
-
-  render () {
-    const { status, missingMediaDescription, privacy, intl } = this.props;
-    const buttonText = status.get('reblogged') ? messages.cancel_reblog : messages.reblog;
-
-    return (
-      <div className='modal-root__modal boost-modal'>
-        <div className='boost-modal__container'>
-          <div className={classNames('status', `status-${status.get('visibility')}`, 'light')}>
-            <div className='status__info'>
-              <a href={status.get('url')} className='status__relative-time' target='_blank' rel='noopener noreferrer'>
-                <span className='status__visibility-icon'><VisibilityIcon visibility={status.get('visibility')} /></span>
-                <RelativeTimestamp timestamp={status.get('created_at')} />
-              </a>
-
-              <a onClick={this.handleAccountClick} href={status.getIn(['account', 'url'])} className='status__display-name'>
-                <div className='status__avatar'>
-                  <Avatar account={status.get('account')} size={48} />
-                </div>
-
-                <DisplayName account={status.get('account')} />
-              </a>
-            </div>
-
-            <StatusContent status={status} />
-
-            {status.get('media_attachments').size > 0 && (
-              <AttachmentList
-                compact
-                media={status.get('media_attachments')}
-              />
-            )}
-          </div>
-        </div>
-
-        <div className='boost-modal__action-bar'>
-          <div>
-            { missingMediaDescription ?
-              <FormattedMessage id='boost_modal.missing_description' defaultMessage='This toot contains some media without description' />
-              :
-              <FormattedMessage id='boost_modal.combo' defaultMessage='You can press {combo} to skip this next time' values={{ combo: <span>Shift + <Icon id='retweet' icon={RepeatIcon} /></span> }} />
-            }
-          </div>
-
-          {status.get('visibility') !== 'private' && !status.get('reblogged') && (
-            <PrivacyDropdown
-              noDirect
-              value={privacy}
-              container={this._findContainer}
-              onChange={this.props.onChangeBoostPrivacy}
-            />
-          )}
-          <Button text={intl.formatMessage(buttonText)} onClick={this.handleReblog} autoFocus />
-        </div>
-      </div>
-    );
-  }
-
-}
-
-export default withRouter(connect(mapStateToProps, mapDispatchToProps)(injectIntl(BoostModal)));
diff --git a/app/javascript/flavours/glitch/features/ui/components/boost_modal.tsx b/app/javascript/flavours/glitch/features/ui/components/boost_modal.tsx
new file mode 100644
index 00000000000000..452a022a7d554e
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/ui/components/boost_modal.tsx
@@ -0,0 +1,170 @@
+import type { MouseEventHandler } from 'react';
+import { useCallback, useState } from 'react';
+
+import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
+
+import classNames from 'classnames';
+import { useHistory } from 'react-router';
+
+import type Immutable from 'immutable';
+
+import RepeatIcon from '@/material-icons/400-24px/repeat.svg?react';
+import AttachmentList from 'flavours/glitch/components/attachment_list';
+import { Icon } from 'flavours/glitch/components/icon';
+import { VisibilityIcon } from 'flavours/glitch/components/visibility_icon';
+import PrivacyDropdown from 'flavours/glitch/features/compose/components/privacy_dropdown';
+import type { Account } from 'flavours/glitch/models/account';
+import type { Status, StatusVisibility } from 'flavours/glitch/models/status';
+import { useAppSelector } from 'flavours/glitch/store';
+
+import { Avatar } from '../../../components/avatar';
+import { Button } from '../../../components/button';
+import { DisplayName } from '../../../components/display_name';
+import { RelativeTimestamp } from '../../../components/relative_timestamp';
+import StatusContent from '../../../components/status_content';
+
+const messages = defineMessages({
+  cancel_reblog: {
+    id: 'status.cancel_reblog_private',
+    defaultMessage: 'Unboost',
+  },
+  reblog: { id: 'status.reblog', defaultMessage: 'Boost' },
+});
+
+export const BoostModal: React.FC<{
+  status: Status;
+  onClose: () => void;
+  onReblog: (status: Status, privacy: StatusVisibility) => void;
+  missingMediaDescription?: boolean;
+}> = ({ status, onReblog, onClose, missingMediaDescription }) => {
+  const intl = useIntl();
+  const history = useHistory();
+
+  const default_privacy = useAppSelector(
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
+    (state) => state.compose.get('default_privacy') as StatusVisibility,
+  );
+
+  const account = status.get('account') as Account;
+  const statusVisibility = status.get('visibility') as StatusVisibility;
+
+  const [privacy, setPrivacy] = useState<StatusVisibility>(
+    statusVisibility === 'private' ? 'private' : default_privacy,
+  );
+
+  const onPrivacyChange = useCallback((value: StatusVisibility) => {
+    setPrivacy(value);
+  }, []);
+
+  const handleReblog = useCallback(() => {
+    onReblog(status, privacy);
+    onClose();
+  }, [onClose, onReblog, status, privacy]);
+
+  const handleAccountClick = useCallback<MouseEventHandler>(
+    (e) => {
+      if (e.button === 0 && !(e.ctrlKey || e.metaKey)) {
+        e.preventDefault();
+        onClose();
+        history.push(`/@${account.acct}`);
+      }
+    },
+    [history, onClose, account],
+  );
+
+  const buttonText = status.get('reblogged')
+    ? messages.cancel_reblog
+    : messages.reblog;
+
+  const findContainer = useCallback(
+    () => document.getElementsByClassName('modal-root__container')[0],
+    [],
+  );
+
+  return (
+    <div className='modal-root__modal boost-modal'>
+      <div className='boost-modal__container'>
+        <div
+          className={classNames(
+            'status',
+            `status-${statusVisibility}`,
+            'light',
+          )}
+        >
+          <div className='status__info'>
+            <a
+              href={status.get('url') as string}
+              className='status__relative-time'
+              target='_blank'
+              rel='noopener noreferrer'
+            >
+              <span className='status__visibility-icon'>
+                <VisibilityIcon visibility={statusVisibility} />
+              </span>
+              <RelativeTimestamp
+                timestamp={status.get('created_at') as string}
+              />
+            </a>
+
+            <a
+              onClick={handleAccountClick}
+              href={account.url}
+              className='status__display-name'
+            >
+              <div className='status__avatar'>
+                <Avatar account={account} size={48} />
+              </div>
+
+              <DisplayName account={account} />
+            </a>
+          </div>
+
+          {/* @ts-expect-error Expected until StatusContent is typed */}
+          <StatusContent status={status} />
+
+          {(status.get('media_attachments') as Immutable.List<unknown>).size >
+            0 && (
+            <AttachmentList compact media={status.get('media_attachments')} />
+          )}
+        </div>
+      </div>
+
+      <div className='boost-modal__action-bar'>
+        <div>
+          {missingMediaDescription ? (
+            <FormattedMessage
+              id='boost_modal.missing_description'
+              defaultMessage='This toot contains some media without description'
+            />
+          ) : (
+            <FormattedMessage
+              id='boost_modal.combo'
+              defaultMessage='You can press {combo} to skip this next time'
+              values={{
+                combo: (
+                  <span>
+                    Shift + <Icon id='retweet' icon={RepeatIcon} />
+                  </span>
+                ),
+              }}
+            />
+          )}
+        </div>
+        {statusVisibility !== 'private' && !status.get('reblogged') && (
+          <PrivacyDropdown
+            noDirect
+            value={privacy}
+            container={findContainer}
+            onChange={onPrivacyChange}
+          />
+        )}
+        <Button
+          text={intl.formatMessage(buttonText)}
+          onClick={handleReblog}
+          // eslint-disable-next-line jsx-a11y/no-autofocus
+          autoFocus
+        />
+      </div>
+    </div>
+  );
+};
diff --git a/app/javascript/flavours/glitch/features/ui/components/modal_root.jsx b/app/javascript/flavours/glitch/features/ui/components/modal_root.jsx
index 3f7e291e7b72c4..063316ef1b7db2 100644
--- a/app/javascript/flavours/glitch/features/ui/components/modal_root.jsx
+++ b/app/javascript/flavours/glitch/features/ui/components/modal_root.jsx
@@ -26,7 +26,7 @@ import BundleContainer from '../containers/bundle_container';
 
 import ActionsModal from './actions_modal';
 import AudioModal from './audio_modal';
-import BoostModal from './boost_modal';
+import { BoostModal } from './boost_modal';
 import BundleModalError from './bundle_modal_error';
 import ConfirmationModal from './confirmation_modal';
 import DeprecatedSettingsModal from './deprecated_settings_modal';
diff --git a/app/javascript/flavours/glitch/models/status.ts b/app/javascript/flavours/glitch/models/status.ts
new file mode 100644
index 00000000000000..83e9f6b8855141
--- /dev/null
+++ b/app/javascript/flavours/glitch/models/status.ts
@@ -0,0 +1,4 @@
+export type StatusVisibility = 'public' | 'unlisted' | 'private' | 'direct';
+
+// Temporary until we type it correctly
+export type Status = Immutable.Map<string, unknown>;
diff --git a/app/javascript/flavours/glitch/reducers/boosts.js b/app/javascript/flavours/glitch/reducers/boosts.js
deleted file mode 100644
index 3541ca0c28e6ff..00000000000000
--- a/app/javascript/flavours/glitch/reducers/boosts.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import Immutable from 'immutable';
-
-import {
-  BOOSTS_INIT_MODAL,
-  BOOSTS_CHANGE_PRIVACY,
-} from 'flavours/glitch/actions/boosts';
-
-const initialState = Immutable.Map({
-  new: Immutable.Map({
-    privacy: 'public',
-  }),
-});
-
-export default function mutes(state = initialState, action) {
-  switch (action.type) {
-  case BOOSTS_INIT_MODAL:
-    return state.withMutations((state) => {
-      state.setIn(['new', 'privacy'], action.privacy);
-    });
-  case BOOSTS_CHANGE_PRIVACY:
-    return state.setIn(['new', 'privacy'], action.privacy);
-  default:
-    return state;
-  }
-}
diff --git a/app/javascript/flavours/glitch/reducers/index.ts b/app/javascript/flavours/glitch/reducers/index.ts
index 9a8f7e204f64a7..3fee5818f981d5 100644
--- a/app/javascript/flavours/glitch/reducers/index.ts
+++ b/app/javascript/flavours/glitch/reducers/index.ts
@@ -7,7 +7,6 @@ import { accountsReducer } from './accounts';
 import accounts_map from './accounts_map';
 import alerts from './alerts';
 import announcements from './announcements';
-import boosts from './boosts';
 import compose from './compose';
 import contexts from './contexts';
 import conversations from './conversations';
@@ -63,7 +62,6 @@ const reducers = {
   settings,
   local_settings,
   push_notifications,
-  boosts,
   server,
   contexts,
   compose,

From 375bd52d97fde84cab3c2d1c480bc6397217ef7b Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Fri, 29 Mar 2024 14:57:39 +0100
Subject: [PATCH 0895/2191] [Glitch] Handle `createAppAsyncThunk` rejected
 actions in the errors middleware

Port 69e5771881037e52380712dfc029c101f76efe74 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../glitch/store/middlewares/errors.ts        | 27 ++++++++++++++-----
 .../flavours/glitch/store/typed_functions.ts  |  8 +++++-
 2 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/app/javascript/flavours/glitch/store/middlewares/errors.ts b/app/javascript/flavours/glitch/store/middlewares/errors.ts
index e11aa7817822a6..977a09a464e04e 100644
--- a/app/javascript/flavours/glitch/store/middlewares/errors.ts
+++ b/app/javascript/flavours/glitch/store/middlewares/errors.ts
@@ -1,16 +1,27 @@
-import { isAction } from '@reduxjs/toolkit';
+import {
+  isAction,
+  isAsyncThunkAction,
+  isRejectedWithValue,
+} from '@reduxjs/toolkit';
 import type { Action, Middleware } from '@reduxjs/toolkit';
 
 import type { RootState } from '..';
 import { showAlertForError } from '../../actions/alerts';
+import type { AsyncThunkRejectValue } from '../typed_functions';
 
 const defaultFailSuffix = 'FAIL';
 const isFailedAction = new RegExp(`${defaultFailSuffix}$`, 'g');
 
-interface ActionWithMaybeAlertParams extends Action {
-  skipAlert?: boolean;
-  skipNotFound?: boolean;
-  error?: unknown;
+interface ActionWithMaybeAlertParams extends Action, AsyncThunkRejectValue {}
+
+interface RejectedAction extends Action {
+  payload: AsyncThunkRejectValue;
+}
+
+function isRejectedActionWithPayload(
+  action: unknown,
+): action is RejectedAction {
+  return isAsyncThunkAction(action) && isRejectedWithValue(action);
 }
 
 function isActionWithmaybeAlertParams(
@@ -23,7 +34,11 @@ export const errorsMiddleware: Middleware<Record<string, never>, RootState> =
   ({ dispatch }) =>
   (next) =>
   (action) => {
-    if (
+    if (isRejectedActionWithPayload(action) && !action.payload.skipAlert) {
+      dispatch(
+        showAlertForError(action.payload.error, action.payload.skipNotFound),
+      );
+    } else if (
       isActionWithmaybeAlertParams(action) &&
       !action.skipAlert &&
       action.type.match(isFailedAction)
diff --git a/app/javascript/flavours/glitch/store/typed_functions.ts b/app/javascript/flavours/glitch/store/typed_functions.ts
index 4859b82651ec75..b66d7545c5dd4c 100644
--- a/app/javascript/flavours/glitch/store/typed_functions.ts
+++ b/app/javascript/flavours/glitch/store/typed_functions.ts
@@ -7,8 +7,14 @@ import type { AppDispatch, RootState } from './store';
 export const useAppDispatch = useDispatch.withTypes<AppDispatch>();
 export const useAppSelector = useSelector.withTypes<RootState>();
 
+export interface AsyncThunkRejectValue {
+  skipAlert?: boolean;
+  skipNotFound?: boolean;
+  error?: unknown;
+}
+
 export const createAppAsyncThunk = createAsyncThunk.withTypes<{
   state: RootState;
   dispatch: AppDispatch;
-  rejectValue: string;
+  rejectValue: AsyncThunkRejectValue;
 }>();

From 1783820acd6918e5f757897a10b1d41303eeb4ba Mon Sep 17 00:00:00 2001
From: Michael Stanclift <mx@vmstan.com>
Date: Fri, 29 Mar 2024 12:16:51 -0500
Subject: [PATCH 0896/2191] [Glitch] Fix background tint in single column light
 theme

Port 430da0316062d3fabfb74dec68bb6de9d42ee750 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/styles/components.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index 475e25dab12bc5..e04288fc0b3fd2 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -2891,7 +2891,7 @@ $ui-header-logo-wordmark-width: 99px;
 }
 
 .tabs-bar__wrapper {
-  background: var(--background-color-tint);
+  background: var(--background-color);
   backdrop-filter: var(--background-filter);
   position: sticky;
   top: $ui-header-height;

From 3b1c8d56b28406dcbac12e6485b5a90d159d69d1 Mon Sep 17 00:00:00 2001
From: Michael Stanclift <mx@vmstan.com>
Date: Fri, 29 Mar 2024 16:03:30 -0500
Subject: [PATCH 0897/2191] [Glitch] Fix light theme header on mobile

Port 90eb4a5d01f1f1e8a76e7dc814eae992a9c1ee16 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/styles/components.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index e04288fc0b3fd2..7008b75ed0df07 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -3113,7 +3113,7 @@ $ui-header-logo-wordmark-width: 99px;
   .layout-single-column {
     .ui__header {
       display: flex;
-      background: var(--background-color-tint);
+      background: var(--background-color);
       border-bottom: 1px solid var(--background-border-color);
     }
 

From 0f756eaed263311b82f5a6430497bb535ee31a32 Mon Sep 17 00:00:00 2001
From: Michael Stanclift <mx@vmstan.com>
Date: Tue, 2 Apr 2024 04:15:31 -0500
Subject: [PATCH 0898/2191] [Glitch] Fix search box color on light theme

Port fa9574086d1b2cc16a733cd60677054c67eed48d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/styles/mastodon-light/diff.scss   | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss b/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss
index 50cd0aded56f0c..77e737a6eb2ce1 100644
--- a/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss
+++ b/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss
@@ -80,6 +80,7 @@ html {
 }
 
 .search__input,
+.search__popout,
 .setting-text,
 .report-dialog-modal__textarea,
 .audio-player {
@@ -439,7 +440,8 @@ html {
 .directory__tag > div,
 .card > a,
 .page-header,
-.compose-form .compose-form__warning {
+.compose-form,
+.compose-form__warning {
   box-shadow: none;
 }
 
@@ -545,12 +547,17 @@ html {
   color: $white;
 }
 
-.compose-form .spoiler-input__input {
+.compose-form,
+.spoiler-input__input,
+.search__input,
+.search__popout {
   color: lighten($ui-highlight-color, 8%);
 }
 
 .compose-form .autosuggest-textarea__textarea,
 .compose-form__highlightable,
+.search__input,
+.search__popout,
 .poll__option input[type='text'] {
   background: darken($ui-base-color, 10%);
 }

From 297c8c37b11d5e1c83fa3ed0fea654ffe8aa64dc Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Tue, 2 Apr 2024 11:56:03 +0200
Subject: [PATCH 0899/2191] [Glitch] Fix Redux Middleware types

Port 07635228e2b2182888850cecddd4b09756d9edbc to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/store/middlewares/errors.ts | 3 ++-
 app/javascript/flavours/glitch/store/middlewares/sounds.ts | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/javascript/flavours/glitch/store/middlewares/errors.ts b/app/javascript/flavours/glitch/store/middlewares/errors.ts
index 977a09a464e04e..e77cec34ed9fb6 100644
--- a/app/javascript/flavours/glitch/store/middlewares/errors.ts
+++ b/app/javascript/flavours/glitch/store/middlewares/errors.ts
@@ -30,7 +30,8 @@ function isActionWithmaybeAlertParams(
   return isAction(action);
 }
 
-export const errorsMiddleware: Middleware<Record<string, never>, RootState> =
+// eslint-disable-next-line @typescript-eslint/ban-types -- we need to use `{}` here to ensure the dispatch types can be merged
+export const errorsMiddleware: Middleware<{}, RootState> =
   ({ dispatch }) =>
   (next) =>
   (action) => {
diff --git a/app/javascript/flavours/glitch/store/middlewares/sounds.ts b/app/javascript/flavours/glitch/store/middlewares/sounds.ts
index 52d5f6b5073c65..ab04f6c94b38be 100644
--- a/app/javascript/flavours/glitch/store/middlewares/sounds.ts
+++ b/app/javascript/flavours/glitch/store/middlewares/sounds.ts
@@ -51,7 +51,8 @@ const play = (audio: HTMLAudioElement) => {
 };
 
 export const soundsMiddleware = (): Middleware<
-  Record<string, never>,
+  // eslint-disable-next-line @typescript-eslint/ban-types -- we need to use `{}` here to ensure the dispatch types can be merged
+  {},
   RootState
 > => {
   const soundCache: Record<string, HTMLAudioElement> = {};

From c316852a65dbac2b77d2c1300eeae9a154d0b37e Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Tue, 2 Apr 2024 12:03:33 +0200
Subject: [PATCH 0900/2191] [Glitch] Add API types for status and related
 objects

Port e47a3d00fe21fa51ee1aeffbfb5e152f1f715fef to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../glitch/api_types/media_attachments.ts     | 22 +++++
 .../flavours/glitch/api_types/polls.ts        | 23 +++++
 .../flavours/glitch/api_types/statuses.ts     | 95 +++++++++++++++++++
 .../flavours/glitch/models/status.ts          |  2 +-
 4 files changed, 141 insertions(+), 1 deletion(-)
 create mode 100644 app/javascript/flavours/glitch/api_types/media_attachments.ts
 create mode 100644 app/javascript/flavours/glitch/api_types/polls.ts
 create mode 100644 app/javascript/flavours/glitch/api_types/statuses.ts

diff --git a/app/javascript/flavours/glitch/api_types/media_attachments.ts b/app/javascript/flavours/glitch/api_types/media_attachments.ts
new file mode 100644
index 00000000000000..fc027ccd2a5d27
--- /dev/null
+++ b/app/javascript/flavours/glitch/api_types/media_attachments.ts
@@ -0,0 +1,22 @@
+// See app/serializers/rest/media_attachment_serializer.rb
+
+export type MediaAttachmentType =
+  | 'image'
+  | 'gifv'
+  | 'video'
+  | 'unknown'
+  | 'audio';
+
+export interface ApiMediaAttachmentJSON {
+  id: string;
+  type: MediaAttachmentType;
+  url: string;
+  preview_url: string;
+  remoteUrl: string;
+  preview_remote_url: string;
+  text_url: string;
+  // TODO: how to define this?
+  meta: unknown;
+  description?: string;
+  blurhash: string;
+}
diff --git a/app/javascript/flavours/glitch/api_types/polls.ts b/app/javascript/flavours/glitch/api_types/polls.ts
new file mode 100644
index 00000000000000..8181f7b813b82a
--- /dev/null
+++ b/app/javascript/flavours/glitch/api_types/polls.ts
@@ -0,0 +1,23 @@
+import type { ApiCustomEmojiJSON } from './custom_emoji';
+
+// See app/serializers/rest/poll_serializer.rb
+
+export interface ApiPollOptionJSON {
+  title: string;
+  votes_count: number;
+}
+
+export interface ApiPollJSON {
+  id: string;
+  expires_at: string;
+  expired: boolean;
+  multiple: boolean;
+  votes_count: number;
+  voters_count: number;
+
+  options: ApiPollOptionJSON[];
+  emojis: ApiCustomEmojiJSON[];
+
+  voted: boolean;
+  own_votes: number[];
+}
diff --git a/app/javascript/flavours/glitch/api_types/statuses.ts b/app/javascript/flavours/glitch/api_types/statuses.ts
new file mode 100644
index 00000000000000..d63441873d5415
--- /dev/null
+++ b/app/javascript/flavours/glitch/api_types/statuses.ts
@@ -0,0 +1,95 @@
+// See app/serializers/rest/status_serializer.rb
+
+import type { ApiAccountJSON } from './accounts';
+import type { ApiCustomEmojiJSON } from './custom_emoji';
+import type { ApiMediaAttachmentJSON } from './media_attachments';
+import type { ApiPollJSON } from './polls';
+
+// See app/modals/status.rb
+export type StatusVisibility =
+  | 'public'
+  | 'unlisted'
+  | 'private'
+  // | 'limited' // This is never exposed to the API (they become `private`)
+  | 'direct';
+
+export interface ApiStatusApplicationJSON {
+  name: string;
+  website: string;
+}
+
+export interface ApiTagJSON {
+  name: string;
+  url: string;
+}
+
+export interface ApiMentionJSON {
+  id: string;
+  username: string;
+  url: string;
+  acct: string;
+}
+
+export interface ApiPreviewCardJSON {
+  url: string;
+  title: string;
+  description: string;
+  language: string;
+  type: string;
+  author_name: string;
+  author_url: string;
+  provider_name: string;
+  provider_url: string;
+  html: string;
+  width: number;
+  height: number;
+  image: string;
+  image_description: string;
+  embed_url: string;
+  blurhash: string;
+  published_at: string;
+}
+
+export interface ApiStatusJSON {
+  id: string;
+  created_at: string;
+  in_reply_to_id?: string;
+  in_reply_to_account_id?: string;
+  sensitive: boolean;
+  spoiler_text?: string;
+  visibility: StatusVisibility;
+  language: string;
+  uri: string;
+  url: string;
+  replies_count: number;
+  reblogs_count: number;
+  favorites_count: number;
+  edited_at?: string;
+
+  favorited?: boolean;
+  reblogged?: boolean;
+  muted?: boolean;
+  bookmarked?: boolean;
+  pinned?: boolean;
+
+  // filtered: FilterResult[]
+  filtered: unknown; // TODO
+  content?: string;
+  text?: string;
+
+  reblog?: ApiStatusJSON;
+  application?: ApiStatusApplicationJSON;
+  account: ApiAccountJSON;
+  media_attachments: ApiMediaAttachmentJSON[];
+  mentions: ApiMentionJSON[];
+
+  tags: ApiTagJSON[];
+  emojis: ApiCustomEmojiJSON[];
+
+  card?: ApiPreviewCardJSON;
+  poll?: ApiPollJSON;
+
+  // glitch-soc additions
+  local_only?: boolean;
+  content_type?: string;
+}
diff --git a/app/javascript/flavours/glitch/models/status.ts b/app/javascript/flavours/glitch/models/status.ts
index 83e9f6b8855141..d9566daf3997b4 100644
--- a/app/javascript/flavours/glitch/models/status.ts
+++ b/app/javascript/flavours/glitch/models/status.ts
@@ -1,4 +1,4 @@
-export type StatusVisibility = 'public' | 'unlisted' | 'private' | 'direct';
+export type { StatusVisibility } from 'flavours/glitch/api_types/statuses';
 
 // Temporary until we type it correctly
 export type Status = Immutable.Map<string, unknown>;

From 87b9b23025c0323747d9ca919edc5653a5a5ebab Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Tue, 2 Apr 2024 12:06:26 +0200
Subject: [PATCH 0901/2191] [Glitch] Use integers and not numbers in
 notification policy API counters

Port b4d991adaa82e05a2dd95ae5c08bb374391ef568 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../components/filtered_notifications_banner.jsx          | 2 +-
 app/javascript/flavours/glitch/utils/numbers.ts           | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/javascript/flavours/glitch/features/notifications/components/filtered_notifications_banner.jsx b/app/javascript/flavours/glitch/features/notifications/components/filtered_notifications_banner.jsx
index 4239d3d3e5e5e5..a2149ce89e68f0 100644
--- a/app/javascript/flavours/glitch/features/notifications/components/filtered_notifications_banner.jsx
+++ b/app/javascript/flavours/glitch/features/notifications/components/filtered_notifications_banner.jsx
@@ -27,7 +27,7 @@ export const FilteredNotificationsBanner = () => {
     };
   }, [dispatch]);
 
-  if (policy === null || policy.getIn(['summary', 'pending_notifications_count']) * 1 === 0) {
+  if (policy === null || policy.getIn(['summary', 'pending_notifications_count']) === 0) {
     return null;
   }
 
diff --git a/app/javascript/flavours/glitch/utils/numbers.ts b/app/javascript/flavours/glitch/utils/numbers.ts
index 03235cea810009..89526404b36b0d 100644
--- a/app/javascript/flavours/glitch/utils/numbers.ts
+++ b/app/javascript/flavours/glitch/utils/numbers.ts
@@ -70,10 +70,10 @@ export function roundTo10(num: number): number {
   return Math.round(num * 0.1) / 0.1;
 }
 
-export function toCappedNumber(num: string): string {
-  if (parseInt(num) > 99) {
-    return '99+';
+export function toCappedNumber(num: number, max = 99): string {
+  if (num > max) {
+    return `${max}+`;
   } else {
-    return num;
+    return num.toString();
   }
 }

From 46cc9141c9dcd4b8b0ca1b77162bfa6b0ea8291c Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 2 Apr 2024 16:05:46 +0200
Subject: [PATCH 0902/2191] [Glitch] Fix contrast in notification request badge

Port 0b9d4103cb5502faee4cc61717aa5454f63bc8f5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/styles/components.scss | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index 7008b75ed0df07..9bfc58d5b22f3c 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -10692,9 +10692,10 @@ noscript {
     }
 
     .filtered-notifications-banner__badge {
-      background-color: $highlight-text-color;
+      background: $ui-button-background-color;
       border-radius: 4px;
       padding: 1px 6px;
+      color: $white;
     }
   }
 

From 4543bb9384bac388c34a58771f7131c8fa5ad794 Mon Sep 17 00:00:00 2001
From: Michael Stanclift <mx@vmstan.com>
Date: Wed, 3 Apr 2024 09:22:50 -0500
Subject: [PATCH 0903/2191] [Glitch] Fix language and emoji search field
 background colors on light theme

Port 5d67247061770bb4228c479dd03845735b849e3a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/styles/mastodon-light/diff.scss        | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss b/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss
index 77e737a6eb2ce1..119b0fc2a48f32 100644
--- a/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss
+++ b/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss
@@ -547,10 +547,7 @@ html {
   color: $white;
 }
 
-.compose-form,
-.spoiler-input__input,
-.search__input,
-.search__popout {
+.compose-form .spoiler-input__input {
   color: lighten($ui-highlight-color, 8%);
 }
 
@@ -558,6 +555,8 @@ html {
 .compose-form__highlightable,
 .search__input,
 .search__popout,
+.emoji-mart-search input,
+.language-dropdown__dropdown .emoji-mart-search input,
 .poll__option input[type='text'] {
   background: darken($ui-base-color, 10%);
 }

From b21322b406bf798954c55a72bb93c111c4643694 Mon Sep 17 00:00:00 2001
From: Michael Stanclift <mx@vmstan.com>
Date: Wed, 3 Apr 2024 10:19:10 -0500
Subject: [PATCH 0904/2191] [Glitch] Fix blue border on emoji/language search
 in Safari & Chrome

Port e2844173499254bd5f460ca2c205d16de228db62 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/styles/emoji_picker.scss | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/javascript/flavours/glitch/styles/emoji_picker.scss b/app/javascript/flavours/glitch/styles/emoji_picker.scss
index 14ce6a14b533a9..947385837125bd 100644
--- a/app/javascript/flavours/glitch/styles/emoji_picker.scss
+++ b/app/javascript/flavours/glitch/styles/emoji_picker.scss
@@ -112,10 +112,9 @@
       border: 0;
     }
 
-    &::-moz-focus-inner,
     &:focus,
     &:active {
-      outline: 0 !important;
+      outline: none !important;
     }
 
     &::-webkit-search-cancel-button {

From 41c43168fbcd94f9cd989c69ee7e55b853be6d0d Mon Sep 17 00:00:00 2001
From: nicolas <nclm@users.noreply.github.com>
Date: Wed, 3 Apr 2024 23:10:02 +0200
Subject: [PATCH 0905/2191] [Glitch] Makes the star icon rotate around its
 actual centre axis

Port c6da3ee828ba2f8ddadfbb8b51a6fba90abc6824 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/styles/components.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index 9bfc58d5b22f3c..408ebf91911d22 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -2458,14 +2458,14 @@ a.account__display-name {
   &.activate {
     & > .icon {
       animation: spring-rotate-in 1s linear;
-      transform-origin: 50% 55%;
+      transform-origin: 50% 52%;
     }
   }
 
   &.deactivate {
     & > .icon {
       animation: spring-rotate-out 1s linear;
-      transform-origin: 50% 55%;
+      transform-origin: 50% 52%;
     }
   }
 }

From 3739dda2f6c4da44c536813ea0adcc4ae70238cc Mon Sep 17 00:00:00 2001
From: Michael Stanclift <mx@vmstan.com>
Date: Thu, 4 Apr 2024 06:51:06 -0500
Subject: [PATCH 0906/2191] [Glitch] Add purple border to active compose field
 search inputs

Port 1c87cb8019bafd2eb5b126ed0e9186ce20e94b1e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/styles/emoji_picker.scss | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/javascript/flavours/glitch/styles/emoji_picker.scss b/app/javascript/flavours/glitch/styles/emoji_picker.scss
index 947385837125bd..b9fdaa58473438 100644
--- a/app/javascript/flavours/glitch/styles/emoji_picker.scss
+++ b/app/javascript/flavours/glitch/styles/emoji_picker.scss
@@ -112,9 +112,11 @@
       border: 0;
     }
 
-    &:focus,
-    &:active {
+    &:active,
+    &:focus {
       outline: none !important;
+      border-width: 1px !important;
+      border-color: $ui-button-background-color;
     }
 
     &::-webkit-search-cancel-button {

From 2d43547934d17d88e1e055c2a84673c20c7e6fde Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Mon, 8 Apr 2024 10:17:51 +0200
Subject: [PATCH 0907/2191] [Glitch] Fix webpack warnings due to unhandled
 extensions (`LICENCE` and `README.md`)

Port 730e2127e1fa0e81952bb83d91cede91d8b47b72 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/common.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/flavours/glitch/common.js b/app/javascript/flavours/glitch/common.js
index 40a324a59bceb0..1bcb1d00f1b87e 100644
--- a/app/javascript/flavours/glitch/common.js
+++ b/app/javascript/flavours/glitch/common.js
@@ -2,7 +2,7 @@ import Rails from '@rails/ujs';
 import 'font-awesome/css/font-awesome.css';
 
 export function start() {
-  require.context('@/images/', true);
+  require.context('@/images/', true, /\.(jpg|png|svg)$/);
 
   try {
     Rails.start();

From e76ddf79bc9dee7290541b7274a2b997efcbc343 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 12 Apr 2024 11:42:12 +0200
Subject: [PATCH 0908/2191] [Glitch] Add `/` keyboard shortcut to focus the
 search field

Port c386c36866881ac3bd3d0b156264231f7b4c8053 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/features/keyboard_shortcuts/index.jsx       | 2 +-
 app/javascript/flavours/glitch/features/ui/index.jsx            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/javascript/flavours/glitch/features/keyboard_shortcuts/index.jsx b/app/javascript/flavours/glitch/features/keyboard_shortcuts/index.jsx
index 858d760c24dbd1..bc435fbfb18eea 100644
--- a/app/javascript/flavours/glitch/features/keyboard_shortcuts/index.jsx
+++ b/app/javascript/flavours/glitch/features/keyboard_shortcuts/index.jsx
@@ -123,7 +123,7 @@ class KeyboardShortcuts extends ImmutablePureComponent {
                 <td><FormattedMessage id='keyboard_shortcuts.back' defaultMessage='to navigate back' /></td>
               </tr>
               <tr>
-                <td><kbd>s</kbd></td>
+                <td><kbd>s</kbd>, <kbd>/</kbd></td>
                 <td><FormattedMessage id='keyboard_shortcuts.search' defaultMessage='to focus search' /></td>
               </tr>
               <tr>
diff --git a/app/javascript/flavours/glitch/features/ui/index.jsx b/app/javascript/flavours/glitch/features/ui/index.jsx
index 05855f89d7c8b6..c257b8cdf57b0a 100644
--- a/app/javascript/flavours/glitch/features/ui/index.jsx
+++ b/app/javascript/flavours/glitch/features/ui/index.jsx
@@ -96,7 +96,7 @@ const mapStateToProps = state => ({
 const keyMap = {
   help: '?',
   new: 'n',
-  search: 's',
+  search: ['s', '/'],
   forceNew: 'option+n',
   toggleComposeSpoilers: 'option+x',
   focusColumn: ['1', '2', '3', '4', '5', '6', '7', '8', '9'],

From ac5113d524dd7d18f66a8dcfcc23fab1d8850c76 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 3 Apr 2024 20:05:39 +0200
Subject: [PATCH 0909/2191] [Glitch] Update eslint (non-major)

Port 37d984b8bf19f86a8a371a97d8a1a000022448b3 to glitch-soc

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/components/hashtag_bar.tsx | 2 +-
 app/javascript/flavours/glitch/packs/admin.tsx            | 2 +-
 app/javascript/flavours/glitch/packs/public.tsx           | 8 ++++----
 app/javascript/flavours/glitch/uuid.ts                    | 3 ++-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/javascript/flavours/glitch/components/hashtag_bar.tsx b/app/javascript/flavours/glitch/components/hashtag_bar.tsx
index 91fa9221983a70..ed5de7d3a5dff0 100644
--- a/app/javascript/flavours/glitch/components/hashtag_bar.tsx
+++ b/app/javascript/flavours/glitch/components/hashtag_bar.tsx
@@ -24,7 +24,7 @@ export type StatusLike = Record<{
 
 function normalizeHashtag(hashtag: string) {
   return (
-    hashtag && hashtag.startsWith('#') ? hashtag.slice(1) : hashtag
+    !!hashtag && hashtag.startsWith('#') ? hashtag.slice(1) : hashtag
   ).normalize('NFKC');
 }
 
diff --git a/app/javascript/flavours/glitch/packs/admin.tsx b/app/javascript/flavours/glitch/packs/admin.tsx
index 57a017ff7db3c8..5c1e43d1cf4df4 100644
--- a/app/javascript/flavours/glitch/packs/admin.tsx
+++ b/app/javascript/flavours/glitch/packs/admin.tsx
@@ -363,6 +363,6 @@ ready(() => {
   document.querySelectorAll('[data-admin-component]').forEach((element) => {
     void mountReactComponent(element);
   });
-}).catch((reason) => {
+}).catch((reason: unknown) => {
   throw reason;
 });
diff --git a/app/javascript/flavours/glitch/packs/public.tsx b/app/javascript/flavours/glitch/packs/public.tsx
index 6087f7b7c1f962..d4002a7a3b9952 100644
--- a/app/javascript/flavours/glitch/packs/public.tsx
+++ b/app/javascript/flavours/glitch/packs/public.tsx
@@ -69,7 +69,7 @@ window.addEventListener('message', (e) => {
       },
       '*',
     );
-  }).catch((e) => {
+  }).catch((e: unknown) => {
     console.error('Error in setHeightMessage postMessage', e);
   });
 });
@@ -206,7 +206,7 @@ function loaded() {
 
         return true;
       })
-      .catch((error) => {
+      .catch((error: unknown) => {
         console.error(error);
       });
   }
@@ -448,7 +448,7 @@ Rails.delegate(document, '#registration_new_user,#new_user', 'submit', () => {
 });
 
 function main() {
-  ready(loaded).catch((error) => {
+  ready(loaded).catch((error: unknown) => {
     console.error(error);
   });
 }
@@ -457,6 +457,6 @@ loadPolyfills()
   .then(loadLocale)
   .then(main)
   .then(loadKeyboardExtensions)
-  .catch((error) => {
+  .catch((error: unknown) => {
     console.error(error);
   });
diff --git a/app/javascript/flavours/glitch/uuid.ts b/app/javascript/flavours/glitch/uuid.ts
index 4d0a8a803637ba..0b4d55beb615d5 100644
--- a/app/javascript/flavours/glitch/uuid.ts
+++ b/app/javascript/flavours/glitch/uuid.ts
@@ -4,5 +4,6 @@ export function uuid(a?: string): string {
         (a as unknown as number) ^
         ((Math.random() * 16) >> ((a as unknown as number) / 4))
       ).toString(16)
-    : ('' + 1e7 + -1e3 + -4e3 + -8e3 + -1e11).replace(/[018]/g, uuid);
+    : // eslint-disable-next-line @typescript-eslint/restrict-plus-operands
+      ('' + 1e7 + -1e3 + -4e3 + -8e3 + -1e11).replace(/[018]/g, uuid);
 }

From 62b3f284dba9ce811235494062d0f3bf65a1e2a3 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 15 Apr 2024 13:56:48 +0200
Subject: [PATCH 0910/2191] [Glitch] Fix unfollow button being out of frame on
 small screens on old browsers

Port 4117c8f6b88f72a9f2a3177f2c02708b7e05c772 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/styles/components.scss | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index 408ebf91911d22..3430568f7f42b8 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -8445,8 +8445,13 @@ noscript {
         }
       }
 
-      @container account-header (max-width: 372px) {
-        .optional {
+      .optional {
+        @container account-header (max-width: 372px) {
+          display: none;
+        }
+
+        // Fallback for older browsers with no container queries support
+        @media screen and (max-width: 372px + 55px) {
           display: none;
         }
       }

From df933836caaf136c2ee3fcd977aaab85821d0bfa Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 16 Apr 2024 11:25:23 +0200
Subject: [PATCH 0911/2191] [Glitch] Fix incorrect label for filtered
 notifications badge

Port 66ee0d4a1f35ce4455418921879b8d2f96538d57 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../notifications/components/filtered_notifications_banner.jsx  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/flavours/glitch/features/notifications/components/filtered_notifications_banner.jsx b/app/javascript/flavours/glitch/features/notifications/components/filtered_notifications_banner.jsx
index a2149ce89e68f0..8c8b9e4b867a3d 100644
--- a/app/javascript/flavours/glitch/features/notifications/components/filtered_notifications_banner.jsx
+++ b/app/javascript/flavours/glitch/features/notifications/components/filtered_notifications_banner.jsx
@@ -42,7 +42,7 @@ export const FilteredNotificationsBanner = () => {
 
       <div className='filtered-notifications-banner__badge'>
         <div className='filtered-notifications-banner__badge__badge'>{toCappedNumber(policy.getIn(['summary', 'pending_notifications_count']))}</div>
-        <FormattedMessage id='filtered_notifications_banner.private_mentions' defaultMessage='{count, plural, one {private mention} other {private mentions}}' values={{ count: policy.getIn(['summary', 'pending_notifications_count']) }} />
+        <FormattedMessage id='filtered_notifications_banner.mentions' defaultMessage='{count, plural, one {mention} other {mentions}}' values={{ count: policy.getIn(['summary', 'pending_notifications_count']) }} />
       </div>
     </Link>
   );

From a9dd68b90a8f8ae5bffb7ad97a34919bcf0f9d17 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 2 May 2024 10:00:43 +0200
Subject: [PATCH 0912/2191] Update dependency react-redux to v9.1.2 (#30146)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 5e83223a2af6fb..f6e89bb2660c51 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -14456,24 +14456,21 @@ __metadata:
   linkType: hard
 
 "react-redux@npm:^9.0.4":
-  version: 9.1.1
-  resolution: "react-redux@npm:9.1.1"
+  version: 9.1.2
+  resolution: "react-redux@npm:9.1.2"
   dependencies:
     "@types/use-sync-external-store": "npm:^0.0.3"
     use-sync-external-store: "npm:^1.0.0"
   peerDependencies:
     "@types/react": ^18.2.25
     react: ^18.0
-    react-native: ">=0.69"
     redux: ^5.0.0
   peerDependenciesMeta:
     "@types/react":
       optional: true
-    react-native:
-      optional: true
     redux:
       optional: true
-  checksum: 10c0/40ccdc8d48aefeed02c025f46e4a2e6641a2996fe985feb70d25feaaf8f101f6ef937cd1420909cad4c8869a8c79323ee071f5b090b011b950e5ae09100f5767
+  checksum: 10c0/56ac98228e011b26e0202346af9c8dd408ad5ea8235d8761c8e05ea0953b8ca801cdf9d1f481fdec7b285d7f30ceef7238b46b3df7636ef77dd5c2ea8c5be5b2
   languageName: node
   linkType: hard
 

From 62992ba54a102a52ba49087f13c86a662f9d5807 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 2 May 2024 10:14:45 +0200
Subject: [PATCH 0913/2191] Update dependency sass to v1.76.0 (#30138)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index f6e89bb2660c51..e45da3a4808090 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -15309,15 +15309,15 @@ __metadata:
   linkType: hard
 
 "sass@npm:^1.62.1":
-  version: 1.75.0
-  resolution: "sass@npm:1.75.0"
+  version: 1.76.0
+  resolution: "sass@npm:1.76.0"
   dependencies:
     chokidar: "npm:>=3.0.0 <4.0.0"
     immutable: "npm:^4.0.0"
     source-map-js: "npm:>=0.6.2 <2.0.0"
   bin:
     sass: sass.js
-  checksum: 10c0/1564ab2c8041c99a330cec93127fe8abcf65ac63eecb471610ed7f3126a2599a58b788a3a98eb8719f7f40b9b04e00c92bc9e11a9c2180ad582b8cba9fb030b0
+  checksum: 10c0/976baf2c378e104f8d4ffca5375c8aa6f3d24f59d5c0a5db8d68a51f89edce45dedc25cfcd304b309fc8568d146de9e2c6cd189395e97bb2840d39feb13932ff
   languageName: node
   linkType: hard
 

From 474e5ffaaeba42db6abacd0194720cdfc66f79f3 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 2 May 2024 10:15:49 +0200
Subject: [PATCH 0914/2191] Update dependency dotenv to v3.1.1 (#30133)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index d73de0320f6e2b..45815e6b44431b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -220,7 +220,7 @@ GEM
     domain_name (0.6.20240107)
     doorkeeper (5.6.9)
       railties (>= 5)
-    dotenv (3.1.0)
+    dotenv (3.1.1)
     drb (2.2.1)
     ed25519 (1.3.0)
     elasticsearch (7.13.3)

From ac1d830e6cd795b7658d0ae7fe7cec52cd24cf6e Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 2 May 2024 10:27:47 +0200
Subject: [PATCH 0915/2191] Update dependency aws-sdk-s3 to v1.149.0 (#30136)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 45815e6b44431b..ad94d004766783 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -102,8 +102,8 @@ GEM
     attr_required (1.0.2)
     awrence (1.2.1)
     aws-eventstream (1.3.0)
-    aws-partitions (1.920.0)
-    aws-sdk-core (3.193.0)
+    aws-partitions (1.922.0)
+    aws-sdk-core (3.194.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.8)
@@ -111,8 +111,8 @@ GEM
     aws-sdk-kms (1.80.0)
       aws-sdk-core (~> 3, >= 3.193.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.148.0)
-      aws-sdk-core (~> 3, >= 3.193.0)
+    aws-sdk-s3 (1.149.0)
+      aws-sdk-core (~> 3, >= 3.194.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.8)
     aws-sigv4 (1.8.0)

From d97d31cce664281d868e4c661451687a301c97c8 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 2 May 2024 10:28:13 +0200
Subject: [PATCH 0916/2191] Update dependency irb to v1.13.0 (#30143)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index ad94d004766783..3394930e0d155c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -350,8 +350,8 @@ GEM
       activesupport (>= 3.0)
       nokogiri (>= 1.6)
     io-console (0.7.2)
-    irb (1.12.0)
-      rdoc
+    irb (1.13.0)
+      rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     jmespath (1.6.2)
     json (2.7.2)
@@ -605,7 +605,7 @@ GEM
     redlock (1.3.2)
       redis (>= 3.0.0, < 6.0)
     regexp_parser (2.9.0)
-    reline (0.5.2)
+    reline (0.5.4)
       io-console (~> 0.5)
     request_store (1.6.0)
       rack (>= 1.4)

From 2447497a4cc6ea305f9431e4d8002b7abb750c7e Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 2 May 2024 04:31:06 -0400
Subject: [PATCH 0917/2191] Status length validation spec updates (#30132)

---
 .../status_length_validator_spec.rb           | 35 +++++++++++++------
 1 file changed, 24 insertions(+), 11 deletions(-)

diff --git a/spec/validators/status_length_validator_spec.rb b/spec/validators/status_length_validator_spec.rb
index 06625917bdc6e0..ead69dfe21df6e 100644
--- a/spec/validators/status_length_validator_spec.rb
+++ b/spec/validators/status_length_validator_spec.rb
@@ -4,6 +4,8 @@
 
 describe StatusLengthValidator do
   describe '#validate' do
+    before { stub_const("#{described_class}::MAX_CHARS", 500) } # Example values below are relative to this baseline
+
     it 'does not add errors onto remote statuses' do
       status = instance_double(Status, local?: false)
       allow(status).to receive(:errors)
@@ -22,27 +24,27 @@
       expect(status).to_not have_received(:errors)
     end
 
-    it 'adds an error when content warning is over 500 characters' do
-      status = instance_double(Status, spoiler_text: 'a' * 520, text: '', errors: activemodel_errors, local?: true, reblog?: false)
+    it 'adds an error when content warning is over character limit' do
+      status = status_double(spoiler_text: 'a' * 520)
       subject.validate(status)
       expect(status.errors).to have_received(:add)
     end
 
-    it 'adds an error when text is over 500 characters' do
-      status = instance_double(Status, spoiler_text: '', text: 'a' * 520, errors: activemodel_errors, local?: true, reblog?: false)
+    it 'adds an error when text is over character limit' do
+      status = status_double(text: 'a' * 520)
       subject.validate(status)
       expect(status.errors).to have_received(:add)
     end
 
-    it 'adds an error when text and content warning are over 500 characters total' do
-      status = instance_double(Status, spoiler_text: 'a' * 250, text: 'b' * 251, errors: activemodel_errors, local?: true, reblog?: false)
+    it 'adds an error when text and content warning are over character limit total' do
+      status = status_double(spoiler_text: 'a' * 250, text: 'b' * 251)
       subject.validate(status)
       expect(status.errors).to have_received(:add)
     end
 
     it 'counts URLs as 23 characters flat' do
       text   = ('a' * 476) + " http://#{'b' * 30}.com/example"
-      status = instance_double(Status, spoiler_text: '', text: text, errors: activemodel_errors, local?: true, reblog?: false)
+      status = status_double(text: text)
 
       subject.validate(status)
       expect(status.errors).to_not have_received(:add)
@@ -50,7 +52,7 @@
 
     it 'does not count non-autolinkable URLs as 23 characters flat' do
       text   = ('a' * 476) + "http://#{'b' * 30}.com/example"
-      status = instance_double(Status, spoiler_text: '', text: text, errors: activemodel_errors, local?: true, reblog?: false)
+      status = status_double(text: text)
 
       subject.validate(status)
       expect(status.errors).to have_received(:add)
@@ -58,14 +60,14 @@
 
     it 'does not count overly long URLs as 23 characters flat' do
       text = "http://example.com/valid?#{'#foo?' * 1000}"
-      status = instance_double(Status, spoiler_text: '', text: text, errors: activemodel_errors, local?: true, reblog?: false)
+      status = status_double(text: text)
       subject.validate(status)
       expect(status.errors).to have_received(:add)
     end
 
     it 'counts only the front part of remote usernames' do
       text   = ('a' * 475) + " @alice@#{'b' * 30}.com"
-      status = instance_double(Status, spoiler_text: '', text: text, errors: activemodel_errors, local?: true, reblog?: false)
+      status = status_double(text: text)
 
       subject.validate(status)
       expect(status.errors).to_not have_received(:add)
@@ -73,7 +75,7 @@
 
     it 'does count both parts of remote usernames for overly long domains' do
       text   = "@alice@#{'b' * 500}.com"
-      status = instance_double(Status, spoiler_text: '', text: text, errors: activemodel_errors, local?: true, reblog?: false)
+      status = status_double(text: text)
 
       subject.validate(status)
       expect(status.errors).to have_received(:add)
@@ -82,6 +84,17 @@
 
   private
 
+  def status_double(spoiler_text: '', text: '')
+    instance_double(
+      Status,
+      spoiler_text: spoiler_text,
+      text: text,
+      errors: activemodel_errors,
+      local?: true,
+      reblog?: false
+    )
+  end
+
   def activemodel_errors
     instance_double(ActiveModel::Errors, add: nil)
   end

From 309f352e6a2fe68729ef5b723c986bc536fe0773 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 2 May 2024 10:57:30 +0200
Subject: [PATCH 0918/2191] New Crowdin Translations (automated) (#30140)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/ia.json      | 12 +++
 app/javascript/mastodon/locales/pt-BR.json   | 13 +++
 app/javascript/mastodon/locales/sk.json      |  2 +
 app/javascript/mastodon/locales/sr-Latn.json | 13 +++
 app/javascript/mastodon/locales/sr.json      | 13 +++
 config/locales/devise.ia.yml                 |  1 +
 config/locales/doorkeeper.fy.yml             |  1 +
 config/locales/doorkeeper.sr-Latn.yml        |  1 +
 config/locales/doorkeeper.sr.yml             |  1 +
 config/locales/fy.yml                        | 34 ++++++++
 config/locales/ia.yml                        | 92 ++++++++++++++++++++
 config/locales/simple_form.fy.yml            |  4 +
 config/locales/simple_form.ia.yml            | 57 ++++++++++++
 config/locales/simple_form.pt-BR.yml         |  1 +
 config/locales/simple_form.sr-Latn.yml       |  4 +
 config/locales/simple_form.sr.yml            |  4 +
 config/locales/sk.yml                        | 79 +++++++++++++++++
 config/locales/sr-Latn.yml                   |  1 +
 config/locales/sr.yml                        |  1 +
 19 files changed, 334 insertions(+)

diff --git a/app/javascript/mastodon/locales/ia.json b/app/javascript/mastodon/locales/ia.json
index 1b969639dcb2d5..d30038d9ccef6a 100644
--- a/app/javascript/mastodon/locales/ia.json
+++ b/app/javascript/mastodon/locales/ia.json
@@ -308,6 +308,8 @@
   "follow_requests.unlocked_explanation": "Benque tu conto non es serrate, le personal de {domain} pensa que es un bon idea que tu revide manualmente le sequente requestas de iste contos.",
   "follow_suggestions.curated_suggestion": "Selection del equipa",
   "follow_suggestions.dismiss": "Non monstrar novemente",
+  "follow_suggestions.featured_longer": "Seligite con cura per le equipa de {domain}",
+  "follow_suggestions.friends_of_friends_longer": "Popular inter le gente que tu seque",
   "follow_suggestions.hints.featured": "Iste profilo ha essite seligite manualmente per le equipa de {domain}.",
   "follow_suggestions.hints.friends_of_friends": "Iste profilo es popular inter le gente que tu seque.",
   "follow_suggestions.hints.most_followed": "Iste profilo es un del plus sequites sur {domain}.",
@@ -315,6 +317,8 @@
   "follow_suggestions.hints.similar_to_recently_followed": "Iste profilo es similar al profilos que tu ha recentemente sequite.",
   "follow_suggestions.personalized_suggestion": "Suggestion personalisate",
   "follow_suggestions.popular_suggestion": "Suggestion personalisate",
+  "follow_suggestions.popular_suggestion_longer": "Popular sur {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Similar al profilos que tu ha sequite recentemente",
   "follow_suggestions.view_all": "Vider toto",
   "follow_suggestions.who_to_follow": "Qui sequer",
   "followed_tags": "Hashtags sequite",
@@ -470,6 +474,14 @@
   "notification.follow_request": "{name} ha requestate de sequer te",
   "notification.mention": "{name} te ha mentionate",
   "notification.moderation-warning.learn_more": "Apprender plus",
+  "notification.moderation_warning": "Tu ha recipite un advertimento de moderation",
+  "notification.moderation_warning.action_delete_statuses": "Alcunes de tu messages ha essite removite.",
+  "notification.moderation_warning.action_disable": "Tu conto ha essite disactivate.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Alcunes de tu messages ha essite marcate como sensibile.",
+  "notification.moderation_warning.action_none": "Tu conto ha recipite un advertimento de moderation.",
+  "notification.moderation_warning.action_sensitive": "Tu messages essera marcate como sensibile a partir de ora.",
+  "notification.moderation_warning.action_silence": "Tu conto ha essite limitate.",
+  "notification.moderation_warning.action_suspend": "Tu conto ha essite suspendite.",
   "notification.own_poll": "Tu sondage ha finite",
   "notification.poll": "Un sondage in le qual tu ha votate ha finite",
   "notification.reblog": "{name} ha impulsate tu message",
diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json
index 6bda11058ffadb..b11daeaaa7e7b5 100644
--- a/app/javascript/mastodon/locales/pt-BR.json
+++ b/app/javascript/mastodon/locales/pt-BR.json
@@ -308,6 +308,8 @@
   "follow_requests.unlocked_explanation": "Apesar de seu perfil não ser trancado, {domain} exige que você revise a solicitação para te seguir destes perfis manualmente.",
   "follow_suggestions.curated_suggestion": "Escolha da equipe",
   "follow_suggestions.dismiss": "Não mostrar novamente",
+  "follow_suggestions.featured_longer": "Escolhido à mão pela equipe de {domain}",
+  "follow_suggestions.friends_of_friends_longer": "Popular entre as pessoas que você segue",
   "follow_suggestions.hints.featured": "Este perfil foi escolhido a dedo pela equipe {domain}.",
   "follow_suggestions.hints.friends_of_friends": "Este perfil é popular entre as pessoas que você segue.",
   "follow_suggestions.hints.most_followed": "Este perfil é um dos mais seguidos em {domain}.",
@@ -315,6 +317,8 @@
   "follow_suggestions.hints.similar_to_recently_followed": "Este perfil é semelhante aos perfis que você seguiu recentemente.",
   "follow_suggestions.personalized_suggestion": "Sugestão personalizada",
   "follow_suggestions.popular_suggestion": "Sugestão popular",
+  "follow_suggestions.popular_suggestion_longer": "Popular em {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Similar a perfis que você seguiu recentemente",
   "follow_suggestions.view_all": "Visualizar tudo",
   "follow_suggestions.who_to_follow": "Quem seguir",
   "followed_tags": "Hashtags seguidas",
@@ -469,6 +473,15 @@
   "notification.follow": "{name} te seguiu",
   "notification.follow_request": "{name} quer te seguir",
   "notification.mention": "{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.",
+  "notification.moderation_warning.action_disable": "Sua conta foi desativada.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Algumas de suas publicações foram marcadas por ter conteúdo sensível.",
+  "notification.moderation_warning.action_none": "Sua conta recebeu um aviso de moderação.",
+  "notification.moderation_warning.action_sensitive": "Suas publicações serão marcadas como sensíveis a partir de agora.",
+  "notification.moderation_warning.action_silence": "Sua conta foi limitada.",
+  "notification.moderation_warning.action_suspend": "Sua conta foi suspensa.",
   "notification.own_poll": "Sua enquete terminou",
   "notification.poll": "Uma enquete que você votou terminou",
   "notification.reblog": "{name} deu boost no teu toot",
diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json
index e126fdef029a92..2863442415cf1d 100644
--- a/app/javascript/mastodon/locales/sk.json
+++ b/app/javascript/mastodon/locales/sk.json
@@ -448,6 +448,7 @@
   "notification.own_poll": "Vaša anketa sa skončila",
   "notification.poll": "Anketa, v ktorej ste hlasovali, sa skončila",
   "notification.reblog": "{name} zdieľa váš príspevok",
+  "notification.relationships_severance_event": "Stratené prepojenia s {name}",
   "notification.relationships_severance_event.learn_more": "Zisti viac",
   "notification.status": "{name} uverejňuje niečo nové",
   "notification.update": "{name} upravuje príspevok",
@@ -490,6 +491,7 @@
   "notifications.policy.filter_new_accounts_title": "Nové účty",
   "notifications.policy.filter_not_followers_title": "Ľudia, ktorí ťa nenasledujú",
   "notifications.policy.filter_not_following_title": "Ľudia, ktorých nenasleduješ",
+  "notifications.policy.filter_private_mentions_title": "Nevyžiadané priame spomenutia",
   "notifications.policy.title": "Filtrovať oznámenia od…",
   "notifications_permission_banner.enable": "Povoliť upozornenia na ploche",
   "notifications_permission_banner.how_to_control": "Ak chcete dostávať upozornenia, keď Mastodon nie je otvorený, povoľte upozornenia na ploche. Po ich zapnutí môžete presne kontrolovať, ktoré typy interakcií generujú upozornenia na ploche, a to prostredníctvom tlačidla {icon} vyššie.",
diff --git a/app/javascript/mastodon/locales/sr-Latn.json b/app/javascript/mastodon/locales/sr-Latn.json
index 3eea87d5ecabef..67b706fa130b9b 100644
--- a/app/javascript/mastodon/locales/sr-Latn.json
+++ b/app/javascript/mastodon/locales/sr-Latn.json
@@ -308,6 +308,8 @@
   "follow_requests.unlocked_explanation": "Iako vaš nalog nije zaključan, osoblje {domain} smatra da biste možda želeli da ručno pregledate zahteve za praćenje sa ovih naloga.",
   "follow_suggestions.curated_suggestion": "Izbor osoblja",
   "follow_suggestions.dismiss": "Ne prikazuj ponovo",
+  "follow_suggestions.featured_longer": "Ručno odabrao tim {domain}",
+  "follow_suggestions.friends_of_friends_longer": "Popularno među ljudima koje pratite",
   "follow_suggestions.hints.featured": "Ovaj profil je ručno izabrao tim {domain}.",
   "follow_suggestions.hints.friends_of_friends": "Ovaj profil je popularan među ljudima koje pratite.",
   "follow_suggestions.hints.most_followed": "Ovaj profil je jedan od najpraćenijih na {domain}.",
@@ -315,6 +317,8 @@
   "follow_suggestions.hints.similar_to_recently_followed": "Ovaj profil je sličan profilima koje ste nedavno zapratili.",
   "follow_suggestions.personalized_suggestion": "Personalizovani predlog",
   "follow_suggestions.popular_suggestion": "Popularni predlog",
+  "follow_suggestions.popular_suggestion_longer": "Popularno na {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Slično profilima koje ste nedavno zapratili",
   "follow_suggestions.view_all": "Prikaži sve",
   "follow_suggestions.who_to_follow": "Koga pratiti",
   "followed_tags": "Praćene heš oznake",
@@ -469,6 +473,15 @@
   "notification.follow": "{name} vas je zapratio",
   "notification.follow_request": "{name} je zatražio da vas prati",
   "notification.mention": "{name} vas je pomenuo",
+  "notification.moderation-warning.learn_more": "Saznajte više",
+  "notification.moderation_warning": "Dobili ste moderatorsko upozorenje",
+  "notification.moderation_warning.action_delete_statuses": "Neke od vaših objava su uklonjene.",
+  "notification.moderation_warning.action_disable": "Vaš nalog je onemogućen.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Neke od vaših objava su obeležene kao osetljive.",
+  "notification.moderation_warning.action_none": "Vaš nalog je dobio moderatorsko upozorenje.",
+  "notification.moderation_warning.action_sensitive": "Vaše objave će ubuduće biti označene kao osetljive.",
+  "notification.moderation_warning.action_silence": "Vaš nalog je ograničen.",
+  "notification.moderation_warning.action_suspend": "Vaš nalog je suspendovan.",
   "notification.own_poll": "Vaša anketa je završena",
   "notification.poll": "Završena je anketa u kojoj ste glasali",
   "notification.reblog": "{name} je podržao vašu objavu",
diff --git a/app/javascript/mastodon/locales/sr.json b/app/javascript/mastodon/locales/sr.json
index 69f755a0b630cb..9898a10a3e2f12 100644
--- a/app/javascript/mastodon/locales/sr.json
+++ b/app/javascript/mastodon/locales/sr.json
@@ -308,6 +308,8 @@
   "follow_requests.unlocked_explanation": "Иако ваш налог није закључан, особље {domain} сматра да бисте можда желели да ручно прегледате захтеве за праћење са ових налога.",
   "follow_suggestions.curated_suggestion": "Избор особља",
   "follow_suggestions.dismiss": "Не приказуј поново",
+  "follow_suggestions.featured_longer": "Ручно одабрао тим {domain}",
+  "follow_suggestions.friends_of_friends_longer": "Популарно међу људима које пратите",
   "follow_suggestions.hints.featured": "Овај профил је ручно изабрао тим {domain}.",
   "follow_suggestions.hints.friends_of_friends": "Овај профил је популаран међу људима које пратите.",
   "follow_suggestions.hints.most_followed": "Овај профил је један од најпраћенијих на {domain}.",
@@ -315,6 +317,8 @@
   "follow_suggestions.hints.similar_to_recently_followed": "Овај профил је сличан профилима које сте недавно запратили.",
   "follow_suggestions.personalized_suggestion": "Персонализовани предлог",
   "follow_suggestions.popular_suggestion": "Популарни предлог",
+  "follow_suggestions.popular_suggestion_longer": "Популарно на {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Слично профилима које сте недавно запратили",
   "follow_suggestions.view_all": "Прикажи све",
   "follow_suggestions.who_to_follow": "Кога пратити",
   "followed_tags": "Праћене хеш ознаке",
@@ -469,6 +473,15 @@
   "notification.follow": "{name} вас је запратио",
   "notification.follow_request": "{name} је затражио да вас прати",
   "notification.mention": "{name} вас је поменуо",
+  "notification.moderation-warning.learn_more": "Сазнајте више",
+  "notification.moderation_warning": "Добили сте модераторско упозорење",
+  "notification.moderation_warning.action_delete_statuses": "Неке од ваших објава су уклоњене.",
+  "notification.moderation_warning.action_disable": "Ваш налог је онемогућен.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Неке од ваших објава су обележене као осетљиве.",
+  "notification.moderation_warning.action_none": "Ваш налог је добио модераторско упозорење.",
+  "notification.moderation_warning.action_sensitive": "Ваше објаве ће убудуће бити означене као осетљиве.",
+  "notification.moderation_warning.action_silence": "Ваш налог је ограничен.",
+  "notification.moderation_warning.action_suspend": "Ваш налог је суспендован.",
   "notification.own_poll": "Ваша анкета је завршена",
   "notification.poll": "Завршена је анкета у којој сте гласали",
   "notification.reblog": "{name} је подржао вашу објаву",
diff --git a/config/locales/devise.ia.yml b/config/locales/devise.ia.yml
index d180a46a6f905a..6c89f4c6d4f189 100644
--- a/config/locales/devise.ia.yml
+++ b/config/locales/devise.ia.yml
@@ -16,6 +16,7 @@ ia:
       pending: Tu conto es ancora sub revision.
       timeout: Tu session ha expirate. Per favor reaperi session pro continuar.
       unauthenticated: Es necessari aperir session o crear un conto ante de continuar.
+      unconfirmed: Es necessari confirmar tu adresse de e-mail ante de continuar.
     mailer:
       confirmation_instructions:
         action: Verificar adresse de e-mail
diff --git a/config/locales/doorkeeper.fy.yml b/config/locales/doorkeeper.fy.yml
index a43defc427ef67..51f0055ff6076a 100644
--- a/config/locales/doorkeeper.fy.yml
+++ b/config/locales/doorkeeper.fy.yml
@@ -174,6 +174,7 @@ fy:
       read:filters: jo filters besjen
       read:follows: de accounts dy’tsto folgest besjen
       read:lists: jo listen besjen
+      read:me: allinnich de basisgegevens fan jo account lêze
       read:mutes: jo negearre brûkers besjen
       read:notifications: jo meldingen besjen
       read:reports: jo rapportearre berjochten besjen
diff --git a/config/locales/doorkeeper.sr-Latn.yml b/config/locales/doorkeeper.sr-Latn.yml
index a4eb7bd33e6e6d..58ed5e8b68d8f9 100644
--- a/config/locales/doorkeeper.sr-Latn.yml
+++ b/config/locales/doorkeeper.sr-Latn.yml
@@ -174,6 +174,7 @@ sr-Latn:
       read:filters: pogledaj svoje filtere
       read:follows: pogledaj koga pratiš
       read:lists: pogledaj svoje liste
+      read:me: čita samo osnovne informacije o vašem nalogu
       read:mutes: pogledaj ignorisanja
       read:notifications: pogledaj svoja obaveštenja
       read:reports: pogledaj svoje prijave
diff --git a/config/locales/doorkeeper.sr.yml b/config/locales/doorkeeper.sr.yml
index 010eb23eb585c5..f40a05e90d5dea 100644
--- a/config/locales/doorkeeper.sr.yml
+++ b/config/locales/doorkeeper.sr.yml
@@ -174,6 +174,7 @@ sr:
       read:filters: погледај своје филтере
       read:follows: погледај кога пратиш
       read:lists: погледај своје листе
+      read:me: чита само основне информације о вашем налогу
       read:mutes: погледај игнорисања
       read:notifications: погледај своја обавештења
       read:reports: погледај своје пријаве
diff --git a/config/locales/fy.yml b/config/locales/fy.yml
index 1d62f7c6af012c..1f1a27fec4b41c 100644
--- a/config/locales/fy.yml
+++ b/config/locales/fy.yml
@@ -597,6 +597,9 @@ fy:
       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.
       add_to_report: Mear oan de rapportaazje tafoegje
+      already_suspended_badges:
+        local: Al opskoarte op dizze server
+        remote: Al opskoarte op harren server
       are_you_sure: Binne jo wis?
       assign_to_self: Oan my tawize
       assigned: Tawizen moderator
@@ -748,6 +751,7 @@ fy:
         desc_html: Dit is ôfhinklik fan eksterne scripts fan hCaptcha, wat feilichheids- en privacyrisiko’s meibringe kin. Boppe dat kin <strong>dit it registraasjeproses bot minder tagonklik meitsje foar guon (foaral handicapte) minsken</strong>. Om dizze redenen kinne jo it beste alternative maatregels oerweagje, lykas registraasje op basis fan goedkarring of op útnûging.
         title: Nije brûkers moatte in CAPTCHA oplosse om harren account te befêstigjen
       content_retention:
+        danger_zone: Gefaresône
         preamble: Tafersjoch hâlde op hoe’t berjochten en media fan brûkers op Mastodon bewarre wurde.
         title: Bewartermyn berjochten
       default_noindex:
@@ -767,6 +771,7 @@ fy:
         disabled: Oan net ien
         users: Oan oanmelde lokale brûkers
       registrations:
+        moderation_recommandation: Soargje derfoar dat jo in adekwaat en responsyf moderaasjeteam hawwe eardat jo registraasjes foar elkenien iepenstelle!
         preamble: Tafersjoch hâlde op wa’t in account op dizze server registrearje kin.
         title: Registraasjes
       registrations_mode:
@@ -1647,13 +1652,24 @@ fy:
     import: Ymportearje
     import_and_export: Ymportearje en eksportearje
     migrate: Accountmigraasje
+    notifications: E-mailmeldingen
     preferences: Ynstellingen
     profile: Profyl
     relationships: Folgers en folgjenden
+    severed_relationships: Ferbrutsen folchrelaasjes
     statuses_cleanup: Automatysk berjochten fuortsmite
     strikes: Fêststelde skeiningen
     two_factor_authentication: Twa-stapsferifikaasje
     webauthn_authentication: Befeiligingskaaien
+  severed_relationships:
+    download: Downloade (%{count})
+    event_type:
+      account_suspension: Accountopskoarting (%{target_name})
+      domain_block: Serveropskoarting (%{target_name})
+      user_domain_block: Jo hawwe %{target_name} blokkearre
+    lost_followers: Ferlerne folgers
+    lost_follows: Ferlerne folge accounts
+    type: Barren
   statuses:
     attached:
       audio:
@@ -1747,6 +1763,7 @@ fy:
     contrast: Mastodon (heech kontrast)
     default: Mastodon (donker)
     mastodon-light: Mastodon (ljocht)
+    system: Automatysk (systeemtema brûke)
   time:
     formats:
       default: "%d %B %Y om %H:%M"
@@ -1838,13 +1855,30 @@ fy:
       apps_ios_action: Fia de App Store downloade
       apps_step: Us offisjele apps downloade
       apps_title: Mastodon-apps
+      checklist_subtitle: 'Litte wy oan dit nije sosjale aventoer begjinne:'
+      checklist_title: Wolkomstkontrôlelist
       edit_profile_action: Personalisearje
+      edit_profile_step: Wannear’t jo mear oer josels fertelle, krije jo mear ynteraksje mei oare minsken.
       edit_profile_title: Jo profyl personalisearje
       explanation: Hjir binne inkelde tips om jo op wei te helpen
       feature_action: Mear ynfo
+      feature_audience: Mastodon biedt jo in unike mooglikheid om jo publyk te behearen sûnder tuskenpersoanen. Mastodon, ymplemintearre yn jo eigen ynfrastruktuer, stelt jo yn steat om elke oare Mastodon-server online te folgjen en troch harren folge te wurden, en stiet ûnder kontrôle fan net ien, útsein dy fan jo.
+      feature_audience_title: Bou jo publyk yn fertrouwen op
+      feature_control: Jo witte sels it bêste wat jo op jo tiidline sjen wolle. Gjin algoritmen of advertinsjes om jo tiid te fergriemen. Folgje elkenien op elke Mastodon-server fan ien account ôf en ûntfang harren berjochten yn gronologyske folchoarder, en meitsje jo hoekje op it ynternet in bytsje mear as josels.
+      feature_control_title: Hâld kontrôle oer jo eigen tiidline
+      feature_creativity: Mastodon stipet audio-, fideo- en fotoberjochten, tagonklikheidsbeskriuwingen, enkêten, ynhâldswarskôgingen, animearre avatars, oanpaste emoji, kontrôle oer it bywurkjen fan miniatueren en mear, om jo te helpen josels online te uterjen. Oft jo no jo keunst, muzyk of podcast publisearje, Mastodon stiet foar jo klear.
+      feature_creativity_title: Bjusterbaarlike kreativiteit
+      feature_moderation: Mastodon leit de beslútfoarming wer yn jo hannen. Elke server makket harren eigen rigels en foarskriften, dy’t lokaal hanthavene wurde en net fan boppe ôf, lykas sosjale media fan bedriuwen, wêrtroch it it meast fleksibel is yn it reagearjen op de behoeften fan ferskate groepen minsken. Wurd lid fan in server mei de rigels wêrmei’t jo akkoard geane, of host jo eigen.
+      feature_moderation_title: Moderaasje sa as it heart
       follow_action: Folgje
+      follow_step: Op Mastodon draait it hielendal om it folgjen fan ynteressante minsken.
+      follow_title: Personalisearje jo starttiidline
+      follows_subtitle: Folgje bekende accounts
       follows_title: Wa te folgjen
       follows_view_more: Mear minsken om te folgjen besjen
+      hashtags_recent_count:
+        one: "%{people} persoan yn de ôfrûne 2 dagen"
+        other: "%{people} persoanen yn de ôfrûne 2 dagen"
       hashtags_subtitle: Wat der yn de ôfrûne 2 dagen bard is ferkenne
       hashtags_title: Populêre hashtags
       hashtags_view_more: Mear populêre hashtags besjen
diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index 9ec64b1390eb9d..ff7b47c1febd59 100644
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -111,12 +111,23 @@ ia:
       public: Public
       push_subscription_expires: Subscription PuSH expira le
       redownload: Actualisar profilo
+      redownloaded_msg: Le profilo de %{username} ha essite actualisate desde le origine
+      reject: Rejectar
+      rejected_msg: Le demanda de inscription de %{username} ha essite rejectate
+      remote_suspension_irreversible: Le datos de iste conto ha essite irreversibilemente delite.
+      remote_suspension_reversible_hint_html: Le conto ha essite suspendite sur su servitor, e le datos essera removite completemente le %{date}. Usque alora, le servitor remote pote restaurar iste conto sin effectos negative. Si tu vole remover immediatemente tote le datos del conto, tu pote facer lo hic infra.
+      remove_avatar: Remover avatar
+      remove_header: Remover capite
+      removed_avatar_msg: Le imagine de avatar de %{username} ha essite removite
+      removed_header_msg: Le imagine de capite de %{username} ha essite removite
       resend_confirmation:
         already_confirmed: Iste usator jam es confirmate
         send: Reinviar ligamine de confirmation
         success: Ligamine de confirmation inviate con successo!
       reset: Reinitialisar
       reset_password: Reinitialisar contrasigno
+      resubscribe: Resubscriber
+      role: Rolo
       search: Cercar
       search_same_email_domain: Altere usatores con le mesme dominio de e-mail
       search_same_ip: Altere usatores con le mesme IP
@@ -124,22 +135,34 @@ ia:
       security_measures:
         only_password: Solmente contrasigno
         password_and_2fa: Contrasigno e 2FA
+      sensitive: Fortiar sensibile
+      sensitized: Marcate como sensibile
+      shared_inbox_url: URL del cassa de entrata condividite
       show:
         created_reports: Reportos facite
         targeted_reports: Signalate per alteres
+      silence: Limitar
       silenced: Limitate
       statuses: Messages
+      strikes: Previe admonitiones
       subscribe: Subscriber
       suspend: Suspender
       suspended: Suspendite
+      suspension_irreversible: Le datos de iste conto ha essite irreversibilemente delite. Tu pote disfacer le suspension de iste conto pro render lo usabile, ma isto non recuperara alcun datos precedente.
+      suspension_reversible_hint_html: Le conto ha essite suspendite, e le datos essera removite completemente le %{date}. Usque alora, le conto pote esser restaurate sin effectos negative. Si tu vole remover immediatemente tote le datos del conto, tu pote facer lo hic infra.
       title: Contos
       unblock_email: Disblocar adresse de e-mail
       unblocked_email_msg: Adresse de e-mail de %{username} disblocate con successo
       unconfirmed_email: E-mail non confirmate
+      undo_sensitized: Non plus fortiar sensibile
       undo_silenced: Disfacer le limite
       undo_suspension: Disfacer le suspension
+      unsilenced_msg: Le limite del conto de %{username} ha essite cancellate
+      unsubscribe: Desubscriber
       username: Nomine de usator
       view_domain: Vider summario de dominio
+      warn: Avisar
+      web: Web
     action_logs:
       action_types:
         change_email_user: Cambiar e-mail pro le usator
@@ -148,6 +171,7 @@ ia:
         create_account_warning: Crear un advertimento
         create_announcement: Crear annuncio
         create_ip_block: Crear un regula IP
+        create_user_role: Crear un rolo
         destroy_announcement: Deler annuncio
         destroy_ip_block: Deler le regula IP
         destroy_status: Deler le message
@@ -167,6 +191,7 @@ ia:
         update_custom_emoji: Actualisar emoji personalisate
         update_ip_block: Actualisar le regula IP
         update_status: Actualisar le message
+        update_user_role: Actualisar rolo
       actions:
         change_email_user_html: "%{name} cambiava le adresse de e-mail address del usator %{target}"
         create_announcement_html: "%{name} creava un nove annuncio %{target}"
@@ -205,6 +230,7 @@ ia:
       media_storage: Immagazinage de medios
       new_users: nove usatores
       opened_reports: reportos aperte
+      software: Software
       top_languages: Linguas le plus active
       top_servers: Servitores le plus active
       website: Sito web
@@ -220,6 +246,10 @@ ia:
       edit: Modificar un bloco de dominio
       export: Exportar
       import: Importar
+      new:
+        severity:
+          silence: Limitar
+          suspend: Suspender
       private_comment: Commento private
       public_comment: Commento public
     email_domain_blocks:
@@ -239,9 +269,16 @@ ia:
       status: Stato
       title: Sequer le recommendationes
     instances:
+      back_to_all: Toto
+      back_to_limited: Limitate
       back_to_warning: Advertimento
       by_domain: Dominio
       content_policies:
+        comment: Nota interne
+        policies:
+          silence: Limitar
+          suspend: Suspender
+        policy: Politica
         reason: Ration public
       dashboard:
         instance_accounts_dimension: Contos le plus sequite
@@ -249,14 +286,23 @@ ia:
       delivery:
         unavailable: Non disponibile
       empty: Necun dominios trovate.
+      moderation:
+        all: Toto
+        limited: Limitate
+        title: Moderation
       private_comment: Commento private
       public_comment: Commento public
+      title: Federation
       total_blocked_by_us: Blocate per nos
       total_followed_by_us: Sequite per nos
     invites:
       deactivate_all: Disactivar toto
       filter:
+        all: Toto
         available: Disponibile
+        expired: Expirate
+        title: Filtro
+      title: Invitationes
     ip_blocks:
       add_new: Crear regula
       delete: Deler
@@ -264,15 +310,19 @@ ia:
         '1209600': 2 septimanas
         '15778476': 6 menses
         '2629746': 1 mense
+        '31556952': 1 anno
         '86400': 1 die
+        '94670856': 3 annos
       new:
         title: Crear un nove regula IP
       title: Regulas IP
     relays:
       delete: Deler
+      description_html: Un <strong>repetitor de federation</strong> es un servitor intermediari que excambia grande volumines de messages public inter le servitores que se inscribe e publica a illo. <strong>Illo pote adjutar le servitores micre e medie a discoperir le contento del fediverso</strong>, sin requirer que le usatores local seque manualmente altere personas sur servitores distante.
       disable: Disactivar
       disabled: Disactivate
       enable: Activar
+      enable_hint: Un vice activate, tu servitor se inscribera a tote le messages public de iste repetitor, e comenciara a inviar le messages public de iste servitor a illo.
       enabled: Activate
       save_and_enable: Salveguardar e activar
       status: Stato
@@ -283,9 +333,11 @@ ia:
       category: Categoria
       confirm: Confirmar
       delete_and_resolve: Deler le messages
+      no_one_assigned: Nemo
       notes:
         create: Adder un nota
         delete: Deler
+        title: Notas
       skip_to_actions: Saltar al actiones
       status: Stato
       updated_at: Actualisate
@@ -294,6 +346,11 @@ ia:
       assigned_users:
         one: "%{count} usator"
         other: "%{count} usatores"
+      categories:
+        invites: Invitationes
+        moderation: Moderation
+        special: Special
+      delete: Deler
       everyone: Permissiones predefinite
       privileges:
         delete_user_data: Deler le datos de usator
@@ -302,6 +359,7 @@ ia:
         manage_rules: Gerer le regulas
         manage_settings: Gerer le parametros
         manage_users: Gerer usatores
+      title: Rolos
     rules:
       delete: Deler
     settings:
@@ -317,8 +375,25 @@ ia:
       title: Parametros de servitor
     site_uploads:
       delete: Deler file incargate
+    software_updates:
+      documentation_link: Pro saper plus
+      title: Actualisationes disponibile
+      type: Typo
+      types:
+        major: Version major
+        minor: Version minor
+      version: Version
     statuses:
+      account: Autor
+      application: Application
+      batch:
+        report: Reporto
+      deleted: Delite
+      favourites: Favoritos
+      history: Chronologia del versiones
       language: Lingua
+      media:
+        title: Medios
       metadata: Metadatos
       open: Aperir message
       original_status: Message original
@@ -337,6 +412,8 @@ ia:
         action: Vider le actualisationes disponibile
       upload_check_privacy_error:
         action: Verifica hic pro plus de information
+  application_mailer:
+    unsubscribe: Desubscriber
   edit_profile:
     other: Alteres
   existing_username_validator:
@@ -397,6 +474,21 @@ ia:
   login_activities:
     authentication_methods:
       password: contrasigno
+  mail_subscriptions:
+    unsubscribe:
+      action: Si, desubscriber
+      complete: Desubscribite
+      confirmation_html: Es tu secur de voler cancellar le subscription al %{type} de Mastodon sur %{domain} pro tu adresse de e-mail %{email}? Tu pote sempre resubscriber te a partir del <a href="%{settings_path}">parametros de notification in e-mail</a>.
+      emails:
+        notification_emails:
+          favourite: notificationes de favorites in e-mail
+          follow: notificationes de sequimento in e-mail
+          follow_request: requestas de sequimento in e-mail
+          mention: notificationes de mentiones in e-mail
+          reblog: notificationes de impulsos in e-mail
+      resubscribe_html: Si tu ha cancellate le subscription in error, tu pote resubscriber te a partir del <a href="%{settings_path}">parametros de notification in e-mail</a>.
+      success_html: Tu non recipera plus %{type} pro Mastodon sur %{domain} a tu adresse de e-mail %{email}.
+      title: Desubcriber
   migrations:
     errors:
       not_found: non poterea esser trovate
diff --git a/config/locales/simple_form.fy.yml b/config/locales/simple_form.fy.yml
index fa1633c9016005..8d599324b33be8 100644
--- a/config/locales/simple_form.fy.yml
+++ b/config/locales/simple_form.fy.yml
@@ -77,10 +77,13 @@ fy:
           warn: Ferstopje de filtere ynhâld efter in warskôging, mei de titel fan it filter as warskôgingstekst
       form_admin_settings:
         activity_api_enabled: Tal lokaal publisearre artikelen, aktive brûkers en nije registraasjes yn wyklikse werjefte
+        backups_retention_period: Brûkers hawwe de mooglikheid om argiven fan harren berjochten te generearjen om letter te downloaden. Wannear ynsteld op in positive wearde, wurde dizze argiven automatysk fuortsmiten út jo ûnthâld nei it opjûne oantal dagen.
         bootstrap_timeline_accounts: Dizze accounts wurde boppe oan de oanrekommandaasjes oan nije brûkers toand. Meardere brûkersnammen troch komma’s skiede.
         closed_registrations_message: Werjûn wannear’t registraasje fan nije accounts útskeakele is
+        content_cache_retention_period: Alle berjochten fan oare servers (ynklusyf boosts en reaksjes) wurde fuortsmiten nei it opjûne oantal dagen, nettsjinsteande iennige lokale brûkersynteraksje mei dy berjochten. Dit oanbelanget ek berjochten dy’t in lokale brûker oan harren blêdwizers tafoege hat of as favoryt markearre hat. Priveeberjochten tusken brûkers fan ferskate servers gean ek ferlern en binne ûnmooglik te werstellen. It gebrûk fan dizze ynstelling is bedoeld foar servers dy’t in spesjaal doel tsjinje en oertrêdet in protte brûkersferwachtingen wannear’t dizze foar algemien gebrûk ymplemintearre wurdt.
         custom_css: Jo kinne oanpaste CSS tapasse op de webferzje fan dizze Mastodon-server.
         mascot: Oerskriuwt de yllustraasje yn de avansearre webomjouwing.
+        media_cache_retention_period: Mediabestannen fan berjochten fan eksterne brûkers wurde op jo server yn de buffer bewarre. Wannear ynsteld op in positive wearde, wurde media fuortsmiten nei it opjûne oantal dagen. As de mediagegevens opfrege wurde neidat se fuortsmiten binne, wurde se opnij download wannear de orizjinele ynhâld noch hieltyd beskikber is. Fanwegen beheiningen op hoe faak keppelingsfoarbylden websites fan tredden rieplachtsje, wurdt oanrekommandearre om dizze wearde yn te stellen op op syn minste 14 dagen. Oars wurde keppelingsfoarbylden net op oanfraach bywurke.
         peers_api_enabled: In list mei domeinnammen, dêr’t dizze server yn fediverse kontakt hân mei hat. Hjir wurdt gjin data dield, oft jo mei in bepaalde server federearrest, mar alinnich, dat jo server dat wit. Dit wurdt foar tsjinsten brûkt, dy’t statistiken oer federaasje yn algemiene sin sammelet.
         profile_directory: De brûkersgids befettet in list fan alle brûkers dy¥t derfoar keazen hawwe om ûntdekt wurde te kinnen.
         require_invite_text: Meitsje it ynfoljen fan ‘Wêrom wolle jo jo hjir registrearje?’ ferplicht yn stee fan opsjoneel, wannear’t registraasjes hânmjittich goedkard wurde moatte
@@ -240,6 +243,7 @@ fy:
         backups_retention_period: Bewartermyn brûkersargyf
         bootstrap_timeline_accounts: Accounts dy’t altyd oan nije brûkers oanrekommandearre wurde
         closed_registrations_message: Oanpast berjocht wannear registraasje útskeakele is
+        content_cache_retention_period: Bewartermyn foar eksterne ynhâld
         custom_css: Oanpaste CSS
         mascot: Oanpaste maskotte (legacy)
         media_cache_retention_period: Bewartermyn mediabuffer
diff --git a/config/locales/simple_form.ia.yml b/config/locales/simple_form.ia.yml
index 5e9dda2a1332af..05a5fa5013d07a 100644
--- a/config/locales/simple_form.ia.yml
+++ b/config/locales/simple_form.ia.yml
@@ -3,12 +3,58 @@ ia:
   simple_form:
     hints:
       account:
+        discoverable: Tu messages public e tu profilo pote esser consiliate o recommendate in varie areas de Mastodon e tu profilo pote esser suggerite a altere usatores.
+        display_name: Tu prenomine e nomine de familia o tu pseudonymo.
+        fields: Tu pagina principal, pronomines, etate, toto lo que tu vole.
+        indexable: Tu messages public pote apparer in resultatos del recerca sur Mastodon. Illes qui ha interagite con tu messages totevia pote cercar les.
         note: 'Tu pote @mentionar altere personas o #hashtags.'
+        show_collections: Le personas potera navigar per tu sequites e sequaces. Le personas potera navigar per tu sequites e sequaces.
+        unlocked: Le personas potera sequer te sin requestar approbation. Dismarca si tu desira revider le requestas de sequer e selige si acceptar o rejectar nove sequaces.
+      account_alias:
+        acct: Specifica le nomine_de_usator@dominio del conto ab que tu vole mover
+      account_migration:
+        acct: Specifica le nomine_de_usator@dominio del conto a que tu vole mover
+      account_warning_preset:
+        text: Tu pote usar le syntaxe de message, tal como URLs, hashtags e mentiones
+        title: Optional. Non visibile al destinatario
+      admin_account_action:
+        include_statuses: Le usator videra que messages ha causate le action o aviso de moderation
+        send_email_notification: Le usator recipera un explication de cosa eveniva con lor conto
+        text_html: Optional. Tu pote usar le syntaxe de message. Tu pote <a href="%{path}">adder avisos preconfigurate</a> pro sparniar tempore
+        type_html: Selige lo que tu vole facer con <strong>%{acct}</strong>
+        types:
+          disable: Impedir al usator de usar lor conto, sin deler o celar lor contentos.
+          none: Usar lo pro inviar un aviso al usator, sin discatenar ulle altere action.
+          sensitive: Fortiar tote le annexos multimedial de iste usator a esser signalate como sensibile.
+          silence: Impedir al usator de poter publicar messages con public visibilitate, celar lor messages e notificationes ab gente non sequente illes. Clauder tote le reportos contra iste conto.
+          suspend: Impedir ulle interaction de o a iste conto e deler su contentos. Reversibile intra 30 dies. Clauder tote le reportos contra iste conto.
+        warning_preset_id: Optional. Tu pote ancora adder personal texto a fin del preconfigurate
+      announcement:
+        all_day: Si marcate, solo le datas del campo tempore sera monstrate
+        ends_at: Le annuncio sera automaticamente obscurate a iste tempore
+        scheduled_at: Lassar blanc pro publicar le annuncio immediatemente
+        starts_at: Optional. In caso tu annuncio es ligate con un specific campo tempore
+        text: Tu pote usar le syntaxe de message. Presta attention al spatio que le annuncio occupara sur le schermo de usator
+      appeal:
+        text: Tu pote solo appellar te un vice
       defaults:
+        autofollow: Illes qui se inscribe per le invitation automaticamente devenira tu sequaces
+        avatar: WEBP, PNG, GIF or JPG. Al maximo %{size}. Sera diminuite a %{dimensions}px
+        bot: Signala a alteres que le conto principalmente exeque actiones automatisate e poterea non esser surveliate
+        context: Un o plure contextos ubi le filtro deberea applicar se
+        current_password: Pro propositos de securitate insere le contrasigno del conto actual
+        current_username: Pro confirmar, insere le nomine de usator del conto actual
+        digest: Solo inviate post un longe periodo de inactivitate e solo si tu ha recipite alcun messages personal in tu absentia
+        email: Te sera inviate un email de confirmation
+        header: WEBP, PNG, GIF or JPG. Al maximo %{size}. Sera diminuite a %{dimensions}px
+        inbox_url: Copia le URL ab le pagina principal del repetitor que tu vole usar
         password: Usa al minus 8 characteres
         setting_display_media_hide_all: Sempre celar le medios
         setting_display_media_show_all: Sempre monstrar le medios
         username: Tu pote usar litteras, numeros e tractos de sublineamento
+      ip_block:
+        severities:
+          no_access: Blocar accesso a tote le ressources
       webhook:
         events: Selige le eventos a inviar
         url: Ubi le eventos essera inviate
@@ -28,6 +74,7 @@ ia:
         types:
           disable: Gelar
           none: Inviar un advertimento
+          sensitive: Sensibile
           silence: Limitar
           suspend: Suspender
       announcement:
@@ -53,10 +100,12 @@ ia:
         setting_system_font_ui: Usar typo de litteras predefinite del systema
         setting_theme: Thema de sito
         setting_trends: Monstrar le tendentias de hodie
+        severity: Severitate
         sign_in_token_attempt: Codice de securitate
         title: Titulo
         username: Nomine de usator
         username_or_email: Nomine de usator o e-mail
+        whole_word: Parola integre
       featured_tag:
         name: Hashtag
       filters:
@@ -75,8 +124,13 @@ ia:
         status_page_url: URL del pagina de stato
         theme: Thema predefinite
         trends: Activar tendentias
+      invite:
+        comment: Commento
       ip_block:
         comment: Commento
+        ip: IP
+        severities:
+          no_access: Blocar le accesso
         severity: Regula
       notification_emails:
         software_updates:
@@ -94,11 +148,14 @@ ia:
         name: Hashtag
         usable: Permitter al messages usar iste hashtag
       user:
+        role: Rolo
         time_zone: Fuso horari
       user_role:
         name: Nomine
         permissions_as_keys: Permissiones
         position: Prioritate
+      webhook:
+        events: Eventos activate
     not_recommended: Non recommendate
     recommended: Recommendate
     required:
diff --git a/config/locales/simple_form.pt-BR.yml b/config/locales/simple_form.pt-BR.yml
index f68eef8a6327b6..9044546f2b12fc 100644
--- a/config/locales/simple_form.pt-BR.yml
+++ b/config/locales/simple_form.pt-BR.yml
@@ -240,6 +240,7 @@ pt-BR:
         backups_retention_period: Período de retenção do arquivo de usuário
         bootstrap_timeline_accounts: Sempre recomendar essas contas para novos usuários
         closed_registrations_message: Mensagem personalizada quando inscrições não estão disponíveis
+        content_cache_retention_period: Período de retenção de conteúdo remoto
         custom_css: CSS personalizável
         mascot: Mascote personalizado (legado)
         media_cache_retention_period: Período de retenção do cachê de mídia
diff --git a/config/locales/simple_form.sr-Latn.yml b/config/locales/simple_form.sr-Latn.yml
index bc4eafb9658499..6bee31a42c73a4 100644
--- a/config/locales/simple_form.sr-Latn.yml
+++ b/config/locales/simple_form.sr-Latn.yml
@@ -77,10 +77,13 @@ sr-Latn:
           warn: Sakrij filtrirani sadržaj iza upozorenja u kome se navodi naziv filtera
       form_admin_settings:
         activity_api_enabled: Brojevi lokalno postavljenih objava, aktivnih korisnika i novih registracija na nedeljnoj bazi
+        backups_retention_period: Korisnici imaju mogućnost da generišu arhive svojih objava za kasnije preuzimanje. Kada se podese na pozitivnu vrednost, ove arhive će se automatski izbrisati iz vašeg skladišta nakon navedenog broja dana.
         bootstrap_timeline_accounts: Ovi nalozi će biti zakačeni na vrh preporuka za praćenje novih korisnika.
         closed_registrations_message: Prikazuje se kada su registracije zatvorene
+        content_cache_retention_period: Sve objave sa drugih servera (uključujući podržavanja i odgovore) će biti izbrisane nakon navedenog broja dana, bez obzira na bilo kakvu interakciju lokalnog korisnika sa tim objavama. Ovo uključuje objave u kojima ih je lokalni korisnik označio kao obeleživače ili omiljene. Privatna pominjanja između korisnika sa različitih instanci će takođe biti izgubljena i nemoguće ih je vratiti. Korišćenje ove postavke je namenjeno za slučajeve posebne namene i krši mnoga očekivanja korisnika kada se primeni za upotrebu opšte namene.
         custom_css: Možete da primenite prilagođene stilove na veb verziji Mastodon-a.
         mascot: Zamenjuje ilustraciju u naprednom veb okruženju.
+        media_cache_retention_period: Medijske datoteke iz objava udaljenih korisnika se keširaju na vašem serveru. Kada se podesi na pozitivnu vrednost, mediji će biti izbrisani nakon navedenog broja dana. Ako se medijski podaci zahtevaju nakon brisanja, biće ponovo preuzeti, ako je izvorni sadržaj i dalje dostupan. Zbog ograničenja koliko često kartice za pregled veza anketiraju sajtove trećih strana, preporučuje se da ovu vrednost postavite na najmanje 14 dana, inače kartice za pregled veza neće biti ažurirane na zahtev pre tog vremena.
         peers_api_enabled: Lista domena sa kojima se ovaj server susreo u fediverzumu. Ovde nisu sadržani podaci o tome da li se Vaš server federiše sa drugim serverima, već samo da Vaš server zna za njih. Ove informacije koriste servisi koji prikupljaju podatke i vode statistiku o federaciji u širem smislu.
         profile_directory: Direktorijum profila navodi sve korisnike koji su se opredelili da budu vidljivi.
         require_invite_text: Kada registracije zahtevaju ručno odobrenje, postavite da odgovor na „Zašto želite da se pridružite?“ bude obavezan, a ne opcionalan
@@ -240,6 +243,7 @@ sr-Latn:
         backups_retention_period: Period čuvanja korisničke arhive
         bootstrap_timeline_accounts: Uvek preporuči ove naloge novim korisnicima
         closed_registrations_message: Prilagođena poruka kada prijave nisu moguće
+        content_cache_retention_period: Period zadržavanja udaljenog sadržaja
         custom_css: Prilagođeni CSS
         mascot: Prilagođena maskota (nasleđe)
         media_cache_retention_period: Period čuvanja keša medija
diff --git a/config/locales/simple_form.sr.yml b/config/locales/simple_form.sr.yml
index 006f4cf6d27f83..4ec8374075188a 100644
--- a/config/locales/simple_form.sr.yml
+++ b/config/locales/simple_form.sr.yml
@@ -77,10 +77,13 @@ sr:
           warn: Сакриј филтрирани садржај иза упозорења у коме се наводи назив филтера
       form_admin_settings:
         activity_api_enabled: Бројеви локално постављених објава, активних корисника и нових регистрација на недељној бази
+        backups_retention_period: Корисници имају могућност да генеришу архиве својих објава за касније преузимање. Када се подесе на позитивну вредност, ове архиве ће се аутоматски избрисати из вашег складишта након наведеног броја дана.
         bootstrap_timeline_accounts: Ови налози ће бити закачени на врх препорука за праћење нових корисника.
         closed_registrations_message: Приказује се када су регистрације затворене
+        content_cache_retention_period: Све објаве са других сервера (укључујући подржавања и одговоре) ће бити избрисане након наведеног броја дана, без обзира на било какву интеракцију локалног корисника са тим објавама. Ово укључује објаве у којима их је локални корисник означио као обележиваче или омиљене. Приватна помињања између корисника са различитих инстанци ће такође бити изгубљена и немогуће их је вратити. Коришћење ове поставке је намењено за случајеве посебне намене и крши многа очекивања корисника када се примени за употребу опште намене.
         custom_css: Можете да примените прилагођене стилове на веб верзији Mastodon-а.
         mascot: Замењује илустрацију у напредном веб окружењу.
+        media_cache_retention_period: Медијске датотеке из објава удаљених корисника се кеширају на вашем серверу. Када се подеси на позитивну вредност, медији ће бити избрисани након наведеног броја дана. Ако се медијски подаци захтевају након брисања, биће поново преузети, ако је изворни садржај и даље доступан. Због ограничења колико често картице за преглед веза анкетирају сајтове трећих страна, препоручује се да ову вредност поставите на најмање 14 дана, иначе картице за преглед веза неће бити ажуриране на захтев пре тог времена.
         peers_api_enabled: Листа домена са којима се овај сервер сусрео у федиверзуму. Овде нису садржани подаци о томе да ли се Ваш сервер федерише са другим серверима, већ само да Ваш сервер зна за њих. Ове информације користе сервиси који прикупљају податке и воде статистику о федерацији у ширем смислу.
         profile_directory: Директоријум профила наводи све кориснике који су се определили да буду видљиви.
         require_invite_text: Када регистрације захтевају ручно одобрење, поставите да одговор на „Зашто желите да се придружите?“ буде обавезан, а не опционалан
@@ -240,6 +243,7 @@ sr:
         backups_retention_period: Период чувања корисничке архиве
         bootstrap_timeline_accounts: Увек препоручи ове налоге новим корисницима
         closed_registrations_message: Прилагођена порука када пријаве нису могуће
+        content_cache_retention_period: Период задржавања удаљеног садржаја
         custom_css: Прилагођени CSS
         mascot: Прилагођена маскота (наслеђе)
         media_cache_retention_period: Период чувања кеша медија
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index d4cd8658541c95..400059770b76c6 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -236,10 +236,12 @@ sk:
         confirm_user_html: "%{name} potvrdil/a emailovú adresu používateľa %{target}"
         create_account_warning_html: "%{name} poslal/a upozornenie užívateľovi %{target}"
         create_announcement_html: "%{name} vytvoril/a nové oboznámenie %{target}"
+        create_canonical_email_block_html: "%{name} zablokoval/a email s hašom %{target}"
         create_custom_emoji_html: "%{name} nahral/a novú emotikonu %{target}"
         create_domain_allow_html: "%{name} povolil/a federáciu s doménou %{target}"
         create_domain_block_html: "%{name} zablokoval/a doménu %{target}"
         create_email_domain_block_html: "%{name} zablokoval/a e-mailovú doménu %{target}"
+        create_ip_block_html: "%{name} vytvoril/a pravidlo pre IP %{target}"
         create_user_role_html: "%{name} vytvoril/a rolu pre %{target}"
         demote_user_html: "%{name} degradoval/a užívateľa %{target}"
         destroy_announcement_html: "%{name} vymazal/a oboznámenie %{target}"
@@ -621,6 +623,7 @@ sk:
       branding:
         title: Značka
       content_retention:
+        danger_zone: Riziková zóna
         title: Ponechanie obsahu
       discovery:
         follow_recommendations: Odporúčania pre nasledovanie
@@ -726,10 +729,16 @@ sk:
       tags:
         dashboard:
           tag_accounts_measure: unikátnych použití
+          tag_languages_dimension: Najpoužívanejšie jazyky
+          tag_servers_dimension: Najpoužívanejšie servery
           tag_servers_measure: iné servery
           tag_uses_measure: užívateľov celkovo
+        listable: Môže byť navrhnutý
+        not_listable: Nebude navrhnutý
+        not_trendable: Neobjaví sa medzi trendmi
         not_usable: Nemôže byť použitý
         title: Populárne štítky
+        trendable: Môže sa objaviť medzi trendmi
         trending_rank: 'Populárne #%{rank}'
         usable: Môže byť použitý
       title: Trendy
@@ -752,6 +761,7 @@ sk:
     new_appeal:
       actions:
         delete_statuses: vymazať ich príspevky
+        disable: zmraziť ich účet
         none: varovanie
         silence: obmedziť ich účet
     new_pending_account:
@@ -888,14 +898,21 @@ sk:
     strikes:
       action_taken: Vykonaný zákrok
       appeal: Namietni
+      appeal_submitted_at: Námietka odoslaná
       appeals:
         submit: Pošli námietku
       approve_appeal: Schváľ námietku
       created_at: Dátumom
       recipient: Adresované pre
+      reject_appeal: Zamietni námietku
       title_actions:
+        disable: Zmrazenie účtu
+        mark_statuses_as_sensitive: Označenie príspevkov za chúlostivé
         none: Varovanie
+        sensitive: Označenie účtu ako chúlostivý
         silence: Obmedzenie účtu
+      your_appeal_approved: Tvoja námietka bola schválená
+      your_appeal_pending: Odoslal si námietku
   domain_validator:
     invalid_domain: nieje správny tvar domény
   edit_profile:
@@ -956,7 +973,11 @@ sk:
       expires_on: Expiruje dňa %{date}
       title: Triedenia
     new:
+      save: Uložiť nový filter
       title: Pridaj nové triedenie
+    statuses:
+      batch:
+        remove: Odstrániť z filtrovania
   generic:
     all: Všetko
     cancel: Zruš
@@ -975,15 +996,28 @@ sk:
   imports:
     errors:
       over_rows_processing_limit: obsahuje viac než %{count} riadkov
+      too_large: Súbor je príliš veľký
+    failures: Zlyhaní(a)
+    imported: Nahrané
     modes:
       merge: Spoj dohromady
       merge_long: Ponechaj existujúce záznamy a pridaj k nim nové
       overwrite: Prepíš
       overwrite_long: Nahraď súčasné záznamy novými
     preface: Môžeš nahrať dáta ktoré si exportoval/a z iného Mastodon serveru, ako sú napríklad zoznamy ľudí ktorých sleduješ, alebo blokuješ.
+    recent_imports: Nedávne nahrania
+    states:
+      finished: Dokončené
+      unconfirmed: Nepotvrdených
+    status: Stav
     success: Tvoje dáta boli nahraté úspešne, a teraz budú spracované v danom čase
+    titles:
+      bookmarks: Nahrávanie záložiek
+      domain_blocking: Nahrávanie blokovaných domén
+      lists: Nahrávanie zoznamov
     type_groups:
       constructive: Sledovania a záložky
+      destructive: Blokovania a utíšenia
     types:
       blocking: Zoznam blokovaných
       bookmarks: Záložky
@@ -1026,6 +1060,9 @@ sk:
       sign_in_token: emailovým bezpečtnostným kódom
       webauthn: bezpečnostnými kľúčmi
     title: História overení
+  mail_subscriptions:
+    unsubscribe:
+      title: Ukonči odber
   media_attachments:
     validations:
       images_and_video: K príspevku ktorý už obsahuje obrázky nemôžeš priložiť video
@@ -1121,7 +1158,11 @@ sk:
     posting_defaults: Východiskové nastavenia príspevkov
     public_timelines: Verejné časové osi
   privacy:
+    privacy: Súkromie
+    search: Vyhľadávanie
     title: Súkromie a dosah
+  privacy_policy:
+    title: Pravidlá ochrany súkromia
   reactions:
     errors:
       limit_reached: Maximálny počet rôznorodých reakcií bol dosiahnutý
@@ -1152,6 +1193,11 @@ sk:
     status: Stav účtu
   remote_follow:
     missing_resource: Nemožno nájsť potrebnú presmerovaciu adresu k tvojmu účtu
+  rss:
+    content_warning: 'Varovanie o obsahu:'
+    descriptions:
+      account: Verejné príspevky od @%{acct}
+      tag: 'Verejné príspevky otagované #%{hashtag}'
   scheduled_statuses:
     over_daily_limit: Prekročil/a si denný limit %{limit} predplánovaných príspevkov
     over_total_limit: Prekročil/a si limit %{limit} predplánovaných príspevkov
@@ -1203,6 +1249,7 @@ sk:
     profile: Profil
     relationships: Sledovania a následovatelia
     two_factor_authentication: Dvojfázové overenie
+    webauthn_authentication: Bezpečnostné kľúče
   severed_relationships:
     lost_followers: Stratení nasledovatelia
     lost_follows: Stratené sledovania
@@ -1216,11 +1263,13 @@ sk:
         other: "%{count} obrázky"
     boosted_from_html: Vyzdvihnuté od %{acct_link}
     content_warning: 'Varovanie o obsahu: %{warning}'
+    default_language: Rovnaký ako jazyk rozhrania
     disallowed_hashtags:
       few: 'obsah nepovolených haštagov: %{tags}'
       many: 'obsah nepovolených haštagov: %{tags}'
       one: 'obsahoval nepovolený haštag: %{tags}'
       other: 'obsahoval nepovolené haštagy: %{tags}'
+    edited_at_html: Upravené %{date}
     errors:
       in_reply_not_found: Príspevok, na ktorý sa snažíš odpovedať, pravdepodobne neexistuje.
     open_in_web: Otvor v okne na webe
@@ -1245,6 +1294,7 @@ sk:
     show_thread: Ukáž diskusné vlákno
     title: '%{name}: „%{quote}"'
     visibilities:
+      direct: Súkromne
       private: Iba pre sledovateľov
       private_long: Ukáž iba následovateľom
       public: Verejné
@@ -1252,10 +1302,24 @@ sk:
       unlisted: Nezaradené
       unlisted_long: Všetci môžu vidieť, ale nieje zaradené do verejnej osi
   statuses_cleanup:
+    exceptions: Výnimky
+    ignore_favs: Ignoruj obľúbené
+    ignore_reblogs: Ignoruj vyzdvihnutia
+    keep_direct: Ponechaj súkromné správy
     keep_pinned: Ponechaj pripnuté príspevky
     keep_pinned_hint: Nevymaže žiadne s tvojich pripnutých príspevkov
+    keep_polls: Ponechaj ankety
     keep_self_bookmark: Ponechaj príspevky, ktoré sú záložkami
     keep_self_fav: Ponechať príspevky, ktoré si si obľúbil/a
+    min_age:
+      '1209600': 2 týždne
+      '15778476': 6 mesačné
+      '2629746': 1 mesačné
+      '31556952': 1 ročné
+      '5259492': 2 mesačné
+      '604800': 1 týždeň
+      '63113904': 2 ročné
+      '7889238': 3 mesačné
   stream_entries:
     sensitive_content: Senzitívny obsah
   tags:
@@ -1282,8 +1346,10 @@ sk:
   user_mailer:
     appeal_approved:
       action: Nastavenia účtu
+      title: Námietka schválená
     appeal_rejected:
       subtitle: Tvoje odvolanie bolo zamietnuté.
+      title: Námietka zamietnutá
     backup_ready:
       explanation: Vyžiadal/a si si úplnú zálohu svojho Mastodon účtu.
       extra: Teraz je pripravená na stiahnutie!
@@ -1291,23 +1357,36 @@ sk:
       title: Odber archívu
     failed_2fa:
       details: 'Tu sú podrobnosti o pokuse o prihlásenie:'
+    suspicious_sign_in:
+      change_password: zmeň svoje heslo
+      title: Nové prihlásenie
     warning:
+      appeal: Pošli námietku
+      reason: 'Dôvod:'
       subject:
         disable: Tvoj účet %{acct} bol zamrazený
         none: Varovanie pre %{acct}
         silence: Tvoj účet %{acct} bol obmedzený
         suspend: Tvoj účet %{acct} bol vylúčený
       title:
+        delete_statuses: Príspevky vymazané
         disable: Účet bol zamrazený
+        mark_statuses_as_sensitive: Príspevky označené za chúlostivé
         none: Varovanie
+        sensitive: Účet označený za chúlostivý
         silence: Účet bol obmedzený
         suspend: Tvoj účet bol vylúčený
     welcome:
+      apps_android_action: Získaj ju na Google Play
+      apps_ios_action: Stiahni z App Store
+      apps_step: Stiahni naše oficiálne aplikácie.
       apps_title: Mastodon aplikácie
       edit_profile_action: Prispôsob
+      edit_profile_title: Prispôsob si svoj profil
       explanation: Tu nájdeš nejaké tipy do začiatku
       feature_action: Zisti viac
       follow_action: Nasleduj
+      follows_title: Koho nasledovať
       post_title: Vytvor svoj prvý príspevok
       share_action: Zdieľaj
       sign_in_action: Prihlás sa
diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml
index e0fe9a710dc6bb..b4976f8985da90 100644
--- a/config/locales/sr-Latn.yml
+++ b/config/locales/sr-Latn.yml
@@ -765,6 +765,7 @@ sr-Latn:
         desc_html: Ovo se oslanja na eksterne skripte iz hCaptcha, što može predstavljati zabrinutost za bezbednost i privatnost. Pored toga, <strong>ovo može učiniti proces registracije znatno manje dostupnim nekim (posebno osobama sa invaliditetom)</strong>. Iz ovih razloga, razmotrite alternativne mere kao što je registracija zasnovana na odobrenju ili na pozivu.
         title: Zahtevaj od novih korisnika da reše CAPTCHA da bi potvrdili svoj nalog
       content_retention:
+        danger_zone: Opasna zona
         preamble: Kontrolišite kako se sadržaj generisan od strane korisnika skladišti na Mastodon-u.
         title: Zadržavanje sadržaja
       default_noindex:
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 1c4ffc8c09c0f7..aec6d399d58639 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -765,6 +765,7 @@ sr:
         desc_html: Ово се ослања на екстерне скрипте из hCaptcha, што може представљати забринутост за безбедност и приватност. Поред тога, <strong>ово може учинити процес регистрације знатно мање доступним неким (посебно особама са инвалидитетом)</strong>. Из ових разлога, размотрите алтернативне мере као што је регистрација заснована на одобрењу или на позиву.
         title: Захтевај од нових корисника да реше CAPTCHA да би потврдили свој налог
       content_retention:
+        danger_zone: Опасна зона
         preamble: Контролишите како се садржај генерисан од стране корисника складишти на Mastodon-у.
         title: Задржавање садржаја
       default_noindex:

From 1e7d5d2957678788fdea8ade77eced98848ff4ff Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 2 May 2024 05:31:41 -0400
Subject: [PATCH 0919/2191] Update `devise-two-factor` to version 5.0.0
 (#28325)

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
---
 Gemfile                                       |  2 +-
 Gemfile.lock                                  |  8 +-
 app/models/concerns/legacy_otp_secret.rb      | 77 +++++++++++++++++++
 app/models/user.rb                            |  8 +-
 config/environments/development.rb            |  3 +-
 config/environments/production.rb             |  1 +
 config/environments/test.rb                   |  1 +
 .../20231210154528_add_otp_secret_to_user.rb  |  7 ++
 ...80905_migrate_devise_two_factor_secrets.rb | 39 ++++++++++
 db/schema.rb                                  |  1 +
 lib/tasks/tests.rake                          | 20 ++++-
 spec/models/user_spec.rb                      | 15 +++-
 12 files changed, 163 insertions(+), 19 deletions(-)
 create mode 100644 app/models/concerns/legacy_otp_secret.rb
 create mode 100644 db/migrate/20231210154528_add_otp_secret_to_user.rb
 create mode 100644 db/post_migrate/20240307180905_migrate_devise_two_factor_secrets.rb

diff --git a/Gemfile b/Gemfile
index a10613b30b9fc9..eb507e9d1859ff 100644
--- a/Gemfile
+++ b/Gemfile
@@ -31,7 +31,7 @@ gem 'browser'
 gem 'charlock_holmes', '~> 0.7.7'
 gem 'chewy', '~> 7.3'
 gem 'devise', '~> 4.9'
-gem 'devise-two-factor', '~> 4.1'
+gem 'devise-two-factor'
 
 group :pam_authentication, optional: true do
   gem 'devise_pam_authenticatable2', '~> 9.2'
diff --git a/Gemfile.lock b/Gemfile.lock
index 3394930e0d155c..a231785402e1ab 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -97,8 +97,6 @@ GEM
       activerecord (>= 3.2, < 8.0)
       rake (>= 10.4, < 14.0)
     ast (2.4.2)
-    attr_encrypted (4.0.0)
-      encryptor (~> 3.0.0)
     attr_required (1.0.2)
     awrence (1.2.1)
     aws-eventstream (1.3.0)
@@ -204,9 +202,8 @@ GEM
       railties (>= 4.1.0)
       responders
       warden (~> 1.2.3)
-    devise-two-factor (4.1.1)
+    devise-two-factor (5.0.0)
       activesupport (~> 7.0)
-      attr_encrypted (>= 1.3, < 5, != 2)
       devise (~> 4.0)
       railties (~> 7.0)
       rotp (~> 6.0)
@@ -236,7 +233,6 @@ GEM
       htmlentities (~> 4.3.3)
       launchy (~> 2.1)
       mail (~> 2.7)
-    encryptor (3.0.0)
     erubi (1.12.0)
     et-orbi (1.2.11)
       tzinfo
@@ -842,7 +838,7 @@ DEPENDENCIES
   database_cleaner-active_record
   debug (~> 1.8)
   devise (~> 4.9)
-  devise-two-factor (~> 4.1)
+  devise-two-factor
   devise_pam_authenticatable2 (~> 9.2)
   discard (~> 1.2)
   doorkeeper (~> 5.6)
diff --git a/app/models/concerns/legacy_otp_secret.rb b/app/models/concerns/legacy_otp_secret.rb
new file mode 100644
index 00000000000000..466c4ec9bb3e98
--- /dev/null
+++ b/app/models/concerns/legacy_otp_secret.rb
@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+# TODO: This file is here for legacy support during devise-two-factor upgrade.
+# It should be removed after all records have been migrated.
+
+module LegacyOtpSecret
+  extend ActiveSupport::Concern
+
+  private
+
+  # Decrypt and return the `encrypted_otp_secret` attribute which was used in
+  # prior versions of devise-two-factor
+  # @return [String] The decrypted OTP secret
+  def legacy_otp_secret
+    return nil unless self[:encrypted_otp_secret]
+    return nil unless self.class.otp_secret_encryption_key
+
+    hmac_iterations = 2000 # a default set by the Encryptor gem
+    key = self.class.otp_secret_encryption_key
+    salt = Base64.decode64(encrypted_otp_secret_salt)
+    iv = Base64.decode64(encrypted_otp_secret_iv)
+
+    raw_cipher_text = Base64.decode64(encrypted_otp_secret)
+    # The last 16 bytes of the ciphertext are the authentication tag - we use
+    # Galois Counter Mode which is an authenticated encryption mode
+    cipher_text = raw_cipher_text[0..-17]
+    auth_tag =  raw_cipher_text[-16..-1] # rubocop:disable Style/SlicingWithRange
+
+    # this alrorithm lifted from
+    # https://github.com/attr-encrypted/encryptor/blob/master/lib/encryptor.rb#L54
+
+    # create an OpenSSL object which will decrypt the AES cipher with 256 bit
+    # keys in Galois Counter Mode (GCM). See
+    # https://ruby.github.io/openssl/OpenSSL/Cipher.html
+    cipher = OpenSSL::Cipher.new('aes-256-gcm')
+
+    # tell the cipher we want to decrypt. Symmetric algorithms use a very
+    # similar process for encryption and decryption, hence the same object can
+    # do both.
+    cipher.decrypt
+
+    # Use a Password-Based Key Derivation Function to generate the key actually
+    # used for encryptoin from the key we got as input.
+    cipher.key = OpenSSL::PKCS5.pbkdf2_hmac_sha1(key, salt, hmac_iterations, cipher.key_len)
+
+    # set the Initialization Vector (IV)
+    cipher.iv = iv
+
+    # The tag must be set after calling Cipher#decrypt, Cipher#key= and
+    # Cipher#iv=, but before calling Cipher#final. After all decryption is
+    # performed, the tag is verified automatically in the call to Cipher#final.
+    #
+    # If the auth_tag does not verify, then #final will raise OpenSSL::Cipher::CipherError
+    cipher.auth_tag = auth_tag
+
+    # auth_data must be set after auth_tag has been set when decrypting See
+    # http://ruby-doc.org/stdlib-2.0.0/libdoc/openssl/rdoc/OpenSSL/Cipher.html#method-i-auth_data-3D
+    # we are not adding any authenticated data but OpenSSL docs say this should
+    # still be called.
+    cipher.auth_data = ''
+
+    # #update is (somewhat confusingly named) the method which actually
+    # performs the decryption on the given chunk of data. Our OTP secret is
+    # short so we only need to call it once.
+    #
+    # It is very important that we call #final because:
+    #
+    # 1. The authentication tag is checked during the call to #final
+    # 2. Block based cipher modes (e.g. CBC) work on fixed size chunks. We need
+    #    to call #final to get it to process the last chunk properly. The output
+    #    of #final should be appended to the decrypted value. This isn't
+    #    required for streaming cipher modes but including it is a best practice
+    #    so that your code will continue to function correctly even if you later
+    #    change to a block cipher mode.
+    cipher.update(cipher_text) + cipher.final
+  end
+end
diff --git a/app/models/user.rb b/app/models/user.rb
index 584120cf2eb1b6..8bc0b23ce848e8 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -39,6 +39,7 @@
 #  role_id                   :bigint(8)
 #  settings                  :text
 #  time_zone                 :string
+#  otp_secret                :string
 #
 
 class User < ApplicationRecord
@@ -72,6 +73,8 @@ class User < ApplicationRecord
   devise :two_factor_authenticatable,
          otp_secret_encryption_key: Rails.configuration.x.otp_secret
 
+  include LegacyOtpSecret # Must be after the above `devise` line in order to override the legacy method
+
   devise :two_factor_backupable,
          otp_number_of_backup_codes: 10
 
@@ -131,11 +134,6 @@ class User < ApplicationRecord
   normalizes :time_zone, with: ->(time_zone) { ActiveSupport::TimeZone[time_zone].nil? ? nil : time_zone }
   normalizes :chosen_languages, with: ->(chosen_languages) { chosen_languages.compact_blank.presence }
 
-  # This avoids a deprecation warning from Rails 5.1
-  # It seems possible that a future release of devise-two-factor will
-  # handle this itself, and this can be removed from our User class.
-  attribute :otp_secret
-
   has_many :session_activations, dependent: :destroy
 
   delegate :can?, to: :role
diff --git a/config/environments/development.rb b/config/environments/development.rb
index a855f5a16be0a3..a3254125c039be 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -87,8 +87,7 @@
   # Otherwise, use letter_opener, which launches a browser window to view sent mail.
   config.action_mailer.delivery_method = ENV['HEROKU'] || ENV['VAGRANT'] || ENV['REMOTE_DEV'] ? :letter_opener_web : :letter_opener
 
-  # We provide a default secret for the development environment here.
-  # This value should not be used in production environments!
+  # TODO: Remove once devise-two-factor data migration complete
   config.x.otp_secret = ENV.fetch('OTP_SECRET', '1fc2b87989afa6351912abeebe31ffc5c476ead9bf8b3d74cbc4a302c7b69a45b40b1bbef3506ddad73e942e15ed5ca4b402bf9a66423626051104f4b5f05109')
 
   # Raise error when a before_action's only/except options reference missing actions
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 49e02b53d396cb..6b1101ea1ba9f9 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -157,6 +157,7 @@
     'Referrer-Policy' => 'same-origin',
   }
 
+  # TODO: Remove once devise-two-factor data migration complete
   config.x.otp_secret = ENV.fetch('OTP_SECRET')
 
   # Enable DNS rebinding protection and other `Host` header attacks.
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 13e197338075c6..49b0c1f3031b8d 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -44,6 +44,7 @@
   # Print deprecation notices to the stderr.
   config.active_support.deprecation = :stderr
 
+  # TODO: Remove once devise-two-factor data migration complete
   config.x.otp_secret = '100c7faeef00caa29242f6b04156742bf76065771fd4117990c4282b8748ff3d99f8fdae97c982ab5bd2e6756a159121377cce4421f4a8ecd2d67bd7749a3fb4'
 
   # Generate random VAPID keys
diff --git a/db/migrate/20231210154528_add_otp_secret_to_user.rb b/db/migrate/20231210154528_add_otp_secret_to_user.rb
new file mode 100644
index 00000000000000..b2ce0a4f79be06
--- /dev/null
+++ b/db/migrate/20231210154528_add_otp_secret_to_user.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddOtpSecretToUser < ActiveRecord::Migration[7.1]
+  def change
+    add_column :users, :otp_secret, :string
+  end
+end
diff --git a/db/post_migrate/20240307180905_migrate_devise_two_factor_secrets.rb b/db/post_migrate/20240307180905_migrate_devise_two_factor_secrets.rb
new file mode 100644
index 00000000000000..360e4806da21f7
--- /dev/null
+++ b/db/post_migrate/20240307180905_migrate_devise_two_factor_secrets.rb
@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+class MigrateDeviseTwoFactorSecrets < ActiveRecord::Migration[7.1]
+  disable_ddl_transaction!
+
+  class MigrationUser < ApplicationRecord
+    self.table_name = :users
+
+    devise :two_factor_authenticatable,
+           otp_secret_encryption_key: Rails.configuration.x.otp_secret
+
+    include LegacyOtpSecret # Must be after the above `devise` line in order to override the legacy method
+  end
+
+  def up
+    MigrationUser.reset_column_information
+
+    users_with_otp_enabled.find_each do |user|
+      # Gets the new value on already-updated users
+      # Falls back to legacy value on not-yet-migrated users
+      otp_secret = user.otp_secret
+
+      Rails.logger.debug { "Processing #{user.email}" }
+
+      # This is a no-op for migrated users and updates format for not migrated
+      user.update!(otp_secret: otp_secret)
+    end
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+
+  private
+
+  def users_with_otp_enabled
+    MigrationUser.where(otp_required_for_login: true, otp_secret: nil)
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index a875c6ffc793a3..11f1a202f79e95 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1199,6 +1199,7 @@
     t.bigint "role_id"
     t.text "settings"
     t.string "time_zone"
+    t.string "otp_secret"
     t.index ["account_id"], name: "index_users_on_account_id"
     t.index ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true
     t.index ["created_by_application_id"], name: "index_users_on_created_by_application_id", where: "(created_by_application_id IS NOT NULL)"
diff --git a/lib/tasks/tests.rake b/lib/tasks/tests.rake
index 0caebf92a18115..c8e0312bbd8ef1 100644
--- a/lib/tasks/tests.rake
+++ b/lib/tasks/tests.rake
@@ -127,6 +127,14 @@ namespace :tests do
         exit(1)
       end
 
+      # This is checking the attribute rather than the method, to avoid the legacy fallback
+      # and ensure the data has been migrated
+      unless Account.find_local('qcuser').user[:otp_secret] == 'anotpsecretthatshouldbeencrypted'
+        puts "DEBUG: #{Account.find_local('qcuser').user.inspect}"
+        puts 'OTP secret for user not preserved as expected'
+        exit(1)
+      end
+
       puts 'No errors found. Database state is consistent with a successful migration process.'
     end
 
@@ -213,9 +221,15 @@ namespace :tests do
           (4, 10, 'kmruser@localhost', now(), now(), false, 'ku', '{en,kmr,ku,ckb}');
 
         INSERT INTO "users"
-          (id, account_id, email, created_at, updated_at, locale)
-        VALUES
-          (5, 11, 'qcuser@localhost', now(), now(), 'fr-QC');
+          (id, account_id, email, created_at, updated_at, locale,
+           encrypted_otp_secret, encrypted_otp_secret_iv, encrypted_otp_secret_salt,
+           otp_required_for_login)
+        VALUES
+          (5, 11, 'qcuser@localhost', now(), now(), 'fr-QC',
+           E'Fttsy7QAa0edaDfdfSz094rRLAxc8cJweDQ4BsWH/zozcdVA8o9GLqcKhn2b\nGi/V\n',
+           'rys3THICkr60BoWC',
+           '_LMkAGvdg7a+sDIKjI3mR2Q==',
+           true);
 
         INSERT INTO "settings"
           (id, thing_type, thing_id, var, value, created_at, updated_at)
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 714d595dc12764..fa0a0503a6561d 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -9,14 +9,25 @@
 
   it_behaves_like 'two_factor_backupable'
 
-  describe 'otp_secret' do
+  describe 'legacy_otp_secret' do
     it 'is encrypted with OTP_SECRET environment variable' do
       user = Fabricate(:user,
                        encrypted_otp_secret: "Fttsy7QAa0edaDfdfSz094rRLAxc8cJweDQ4BsWH/zozcdVA8o9GLqcKhn2b\nGi/V\n",
                        encrypted_otp_secret_iv: 'rys3THICkr60BoWC',
                        encrypted_otp_secret_salt: '_LMkAGvdg7a+sDIKjI3mR2Q==')
 
-      expect(user.otp_secret).to eq 'anotpsecretthatshouldbeencrypted'
+      expect(user.send(:legacy_otp_secret)).to eq 'anotpsecretthatshouldbeencrypted'
+    end
+  end
+
+  describe 'otp_secret' do
+    it 'encrypts the saved value' do
+      user = Fabricate(:user, otp_secret: '123123123')
+
+      user.reload
+
+      expect(user.otp_secret).to eq '123123123'
+      expect(user.attributes_before_type_cast[:otp_secret]).to_not eq '123123123'
     end
   end
 

From 88882fbbeefe0a5a91985a4c50c44f897e30aabd Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 2 May 2024 05:40:05 -0400
Subject: [PATCH 0920/2191] Move Rails/HABTM cop out of todo (#30118)

---
 .rubocop_todo.yml                           | 8 --------
 app/models/concerns/account/associations.rb | 2 +-
 app/models/status.rb                        | 2 +-
 app/models/tag.rb                           | 2 ++
 4 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index e656578149b035..25b573017b89bc 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -42,14 +42,6 @@ RSpec/MultipleMemoizedHelpers:
 RSpec/NestedGroups:
   Max: 6
 
-# Configuration parameters: Include.
-# Include: app/models/**/*.rb
-Rails/HasAndBelongsToMany:
-  Exclude:
-    - 'app/models/concerns/account/associations.rb'
-    - 'app/models/status.rb'
-    - 'app/models/tag.rb'
-
 Rails/OutputSafety:
   Exclude:
     - 'config/initializers/simple_form.rb'
diff --git a/app/models/concerns/account/associations.rb b/app/models/concerns/account/associations.rb
index b2e9d255fd8adf..1c67b07e511618 100644
--- a/app/models/concerns/account/associations.rb
+++ b/app/models/concerns/account/associations.rb
@@ -62,7 +62,7 @@ module Account::Associations
     has_many :aliases, class_name: 'AccountAlias', dependent: :destroy, inverse_of: :account
 
     # Hashtags
-    has_and_belongs_to_many :tags
+    has_and_belongs_to_many :tags # rubocop:disable Rails/HasAndBelongsToMany
     has_many :featured_tags, -> { includes(:tag) }, dependent: :destroy, inverse_of: :account
 
     # Account deletion requests
diff --git a/app/models/status.rb b/app/models/status.rb
index 2ff803bf0b356f..0bb5c0ce2353eb 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -82,7 +82,7 @@ class Status < ApplicationRecord
   has_many :local_reblogged, -> { merge(Account.local) }, through: :reblogs, source: :account
   has_many :local_bookmarked, -> { merge(Account.local) }, through: :bookmarks, source: :account
 
-  has_and_belongs_to_many :tags
+  has_and_belongs_to_many :tags # rubocop:disable Rails/HasAndBelongsToMany
 
   has_one :preview_cards_status, inverse_of: :status, dependent: :delete
 
diff --git a/app/models/tag.rb b/app/models/tag.rb
index 58baa48c05dd17..35be921e2d00a4 100644
--- a/app/models/tag.rb
+++ b/app/models/tag.rb
@@ -21,8 +21,10 @@
 
 class Tag < ApplicationRecord
   include Paginable
+  # rubocop:disable Rails/HasAndBelongsToMany
   has_and_belongs_to_many :statuses
   has_and_belongs_to_many :accounts
+  # rubocop:enable Rails/HasAndBelongsToMany
 
   has_many :passive_relationships, class_name: 'TagFollow', inverse_of: :tag, dependent: :destroy
   has_many :featured_tags, dependent: :destroy, inverse_of: :tag

From 616e2f26668d578ae81043a3836e881178d3e806 Mon Sep 17 00:00:00 2001
From: mogaminsk <mgmnjp@icloud.com>
Date: Thu, 2 May 2024 18:40:18 +0900
Subject: [PATCH 0921/2191] Fix word breaking in filtered notifications badge
 (#30114)

---
 app/javascript/styles/mastodon/components.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 51596ec2444c54..12c987a02f39d0 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -10145,6 +10145,7 @@ noscript {
     font-weight: 500;
     font-size: 11px;
     line-height: 16px;
+    word-break: keep-all;
 
     &__badge {
       background: $ui-button-background-color;

From 9e260014c72fa83740d70d2d603e836f86e64b55 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Thu, 2 May 2024 14:02:13 +0200
Subject: [PATCH 0922/2191] Convert `entrypoints/two_factor_authentication` to
 Typescript (#30105)

---
 .../entrypoints/two_factor_authentication.js  | 119 -----------
 .../entrypoints/two_factor_authentication.ts  | 197 ++++++++++++++++++
 2 files changed, 197 insertions(+), 119 deletions(-)
 delete mode 100644 app/javascript/entrypoints/two_factor_authentication.js
 create mode 100644 app/javascript/entrypoints/two_factor_authentication.ts

diff --git a/app/javascript/entrypoints/two_factor_authentication.js b/app/javascript/entrypoints/two_factor_authentication.js
deleted file mode 100644
index e77965c757fd0e..00000000000000
--- a/app/javascript/entrypoints/two_factor_authentication.js
+++ /dev/null
@@ -1,119 +0,0 @@
-import * as WebAuthnJSON from '@github/webauthn-json';
-import axios from 'axios';
-
-import ready from '../mastodon/ready';
-import 'regenerator-runtime/runtime';
-
-function getCSRFToken() {
-  var CSRFSelector = document.querySelector('meta[name="csrf-token"]');
-  if (CSRFSelector) {
-    return CSRFSelector.getAttribute('content');
-  } else {
-    return null;
-  }
-}
-
-function hideFlashMessages() {
-  Array.from(document.getElementsByClassName('flash-message')).forEach(function(flashMessage) {
-    flashMessage.classList.add('hidden');
-  });
-}
-
-function callback(url, body) {
-  axios.post(url, JSON.stringify(body), {
-    headers: {
-      'Content-Type': 'application/json',
-      'Accept': 'application/json',
-      'X-CSRF-Token': getCSRFToken(),
-    },
-    credentials: 'same-origin',
-  }).then(function(response) {
-    window.location.replace(response.data.redirect_path);
-  }).catch(function(error) {
-    if (error.response.status === 422) {
-      const errorMessage = document.getElementById('security-key-error-message');
-      errorMessage.classList.remove('hidden');
-      console.error(error.response.data.error);
-    } else {
-      console.error(error);
-    }
-  });
-}
-
-ready(() => {
-  if (!WebAuthnJSON.supported()) {
-    const unsupported_browser_message = document.getElementById('unsupported-browser-message');
-    if (unsupported_browser_message) {
-      unsupported_browser_message.classList.remove('hidden');
-      document.querySelector('.btn.js-webauthn').disabled = true;
-    }
-  }
-
-
-  const webAuthnCredentialRegistrationForm = document.getElementById('new_webauthn_credential');
-  if (webAuthnCredentialRegistrationForm) {
-    webAuthnCredentialRegistrationForm.addEventListener('submit', (event) => {
-      event.preventDefault();
-
-      var nickname = event.target.querySelector('input[name="new_webauthn_credential[nickname]"]');
-      if (nickname.value) {
-        axios.get('/settings/security_keys/options')
-          .then((response) => {
-            const credentialOptions = response.data;
-
-            WebAuthnJSON.create({ 'publicKey': credentialOptions }).then((credential) => {
-              var params = { 'credential': credential, 'nickname': nickname.value };
-              callback('/settings/security_keys', params);
-            }).catch((error) => {
-              const errorMessage = document.getElementById('security-key-error-message');
-              errorMessage.classList.remove('hidden');
-              console.error(error);
-            });
-          }).catch((error) => {
-            console.error(error.response.data.error);
-          });
-      } else {
-        nickname.focus();
-      }
-    });
-  }
-
-  const webAuthnCredentialAuthenticationForm = document.getElementById('webauthn-form');
-  if (webAuthnCredentialAuthenticationForm) {
-    webAuthnCredentialAuthenticationForm.addEventListener('submit', (event) => {
-      event.preventDefault();
-
-      axios.get('sessions/security_key_options')
-        .then((response) => {
-          const credentialOptions = response.data;
-
-          WebAuthnJSON.get({ 'publicKey': credentialOptions }).then((credential) => {
-            var params = { 'user': { 'credential': credential } };
-            callback('sign_in', params);
-          }).catch((error) => {
-            const errorMessage = document.getElementById('security-key-error-message');
-            errorMessage.classList.remove('hidden');
-            console.error(error);
-          });
-        }).catch((error) => {
-          console.error(error.response.data.error);
-        });
-    });
-
-    const otpAuthenticationForm = document.getElementById('otp-authentication-form');
-
-    const linkToOtp = document.getElementById('link-to-otp');
-    linkToOtp.addEventListener('click', () => {
-      webAuthnCredentialAuthenticationForm.classList.add('hidden');
-      otpAuthenticationForm.classList.remove('hidden');
-      hideFlashMessages();
-    });
-
-    const linkToWebAuthn = document.getElementById('link-to-webauthn');
-    linkToWebAuthn.addEventListener('click', () => {
-      otpAuthenticationForm.classList.add('hidden');
-      webAuthnCredentialAuthenticationForm.classList.remove('hidden');
-      hideFlashMessages();
-    });
-  }
-});
diff --git a/app/javascript/entrypoints/two_factor_authentication.ts b/app/javascript/entrypoints/two_factor_authentication.ts
new file mode 100644
index 00000000000000..981481694b8f7a
--- /dev/null
+++ b/app/javascript/entrypoints/two_factor_authentication.ts
@@ -0,0 +1,197 @@
+import * as WebAuthnJSON from '@github/webauthn-json';
+import axios, { AxiosError } from 'axios';
+
+import ready from '../mastodon/ready';
+
+import 'regenerator-runtime/runtime';
+
+type PublicKeyCredentialCreationOptionsJSON =
+  WebAuthnJSON.CredentialCreationOptionsJSON['publicKey'];
+
+function exceptionHasAxiosError(
+  error: unknown,
+): error is AxiosError<{ error: unknown }> {
+  return (
+    error instanceof AxiosError &&
+    typeof error.response?.data === 'object' &&
+    'error' in error.response.data
+  );
+}
+
+function logAxiosResponseError(error: unknown) {
+  if (exceptionHasAxiosError(error)) console.error(error);
+}
+
+function getCSRFToken() {
+  return document
+    .querySelector<HTMLMetaElement>('meta[name="csrf-token"]')
+    ?.getAttribute('content');
+}
+
+function hideFlashMessages() {
+  document.querySelectorAll('.flash-message').forEach((flashMessage) => {
+    flashMessage.classList.add('hidden');
+  });
+}
+
+async function callback(
+  url: string,
+  body:
+    | {
+        credential: WebAuthnJSON.PublicKeyCredentialWithAttestationJSON;
+        nickname: string;
+      }
+    | {
+        user: { credential: WebAuthnJSON.PublicKeyCredentialWithAssertionJSON };
+      },
+) {
+  try {
+    const response = await axios.post<{ redirect_path: string }>(
+      url,
+      JSON.stringify(body),
+      {
+        headers: {
+          'Content-Type': 'application/json',
+          Accept: 'application/json',
+          'X-CSRF-Token': getCSRFToken(),
+        },
+      },
+    );
+
+    window.location.replace(response.data.redirect_path);
+  } catch (error) {
+    if (error instanceof AxiosError && error.response?.status === 422) {
+      const errorMessage = document.getElementById(
+        'security-key-error-message',
+      );
+      errorMessage?.classList.remove('hidden');
+
+      logAxiosResponseError(error);
+    } else {
+      console.error(error);
+    }
+  }
+}
+
+async function handleWebauthnCredentialRegistration(nickname: string) {
+  try {
+    const response = await axios.get<PublicKeyCredentialCreationOptionsJSON>(
+      '/settings/security_keys/options',
+    );
+
+    const credentialOptions = response.data;
+
+    try {
+      const credential = await WebAuthnJSON.create({
+        publicKey: credentialOptions,
+      });
+
+      const params = {
+        credential: credential,
+        nickname: nickname,
+      };
+
+      await callback('/settings/security_keys', params);
+    } catch (error) {
+      const errorMessage = document.getElementById(
+        'security-key-error-message',
+      );
+      errorMessage?.classList.remove('hidden');
+      console.error(error);
+    }
+  } catch (error) {
+    logAxiosResponseError(error);
+  }
+}
+
+async function handleWebauthnCredentialAuthentication() {
+  try {
+    const response = await axios.get<PublicKeyCredentialCreationOptionsJSON>(
+      'sessions/security_key_options',
+    );
+
+    const credentialOptions = response.data;
+
+    try {
+      const credential = await WebAuthnJSON.get({
+        publicKey: credentialOptions,
+      });
+
+      const params = { user: { credential: credential } };
+      void callback('sign_in', params);
+    } catch (error) {
+      const errorMessage = document.getElementById(
+        'security-key-error-message',
+      );
+      errorMessage?.classList.remove('hidden');
+      console.error(error);
+    }
+  } catch (error) {
+    logAxiosResponseError(error);
+  }
+}
+
+ready(() => {
+  if (!WebAuthnJSON.supported()) {
+    const unsupported_browser_message = document.getElementById(
+      'unsupported-browser-message',
+    );
+    if (unsupported_browser_message) {
+      unsupported_browser_message.classList.remove('hidden');
+      const button = document.querySelector<HTMLButtonElement>(
+        'button.btn.js-webauthn',
+      );
+      if (button) button.disabled = true;
+    }
+  }
+
+  const webAuthnCredentialRegistrationForm =
+    document.querySelector<HTMLFormElement>('form#new_webauthn_credential');
+  if (webAuthnCredentialRegistrationForm) {
+    webAuthnCredentialRegistrationForm.addEventListener('submit', (event) => {
+      event.preventDefault();
+
+      if (!(event.target instanceof HTMLFormElement)) return;
+
+      const nickname = event.target.querySelector<HTMLInputElement>(
+        'input[name="new_webauthn_credential[nickname]"]',
+      );
+
+      if (nickname?.value) {
+        void handleWebauthnCredentialRegistration(nickname.value);
+      } else {
+        nickname?.focus();
+      }
+    });
+  }
+
+  const webAuthnCredentialAuthenticationForm =
+    document.getElementById('webauthn-form');
+  if (webAuthnCredentialAuthenticationForm) {
+    webAuthnCredentialAuthenticationForm.addEventListener('submit', (event) => {
+      event.preventDefault();
+      void handleWebauthnCredentialAuthentication();
+    });
+
+    const otpAuthenticationForm = document.getElementById(
+      'otp-authentication-form',
+    );
+
+    const linkToOtp = document.getElementById('link-to-otp');
+
+    linkToOtp?.addEventListener('click', () => {
+      webAuthnCredentialAuthenticationForm.classList.add('hidden');
+      otpAuthenticationForm?.classList.remove('hidden');
+      hideFlashMessages();
+    });
+
+    const linkToWebAuthn = document.getElementById('link-to-webauthn');
+    linkToWebAuthn?.addEventListener('click', () => {
+      otpAuthenticationForm?.classList.add('hidden');
+      webAuthnCredentialAuthenticationForm.classList.remove('hidden');
+      hideFlashMessages();
+    });
+  }
+}).catch((e: unknown) => {
+  throw e;
+});

From 253ead3aa7f69053eb6b275ba3016c43be2d3675 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 2 May 2024 22:56:21 +0200
Subject: [PATCH 0923/2191] Fix not being able to block a subdomain of an
 already-blocked domain through the API (#30119)

---
 .../api/v1/admin/domain_blocks_controller.rb  |  9 +++-
 .../api/v1/admin/domain_blocks_spec.rb        | 41 ++++++++++++++++++-
 2 files changed, 46 insertions(+), 4 deletions(-)

diff --git a/app/controllers/api/v1/admin/domain_blocks_controller.rb b/app/controllers/api/v1/admin/domain_blocks_controller.rb
index b589d277d5f0b4..ae94ac59cd96cc 100644
--- a/app/controllers/api/v1/admin/domain_blocks_controller.rb
+++ b/app/controllers/api/v1/admin/domain_blocks_controller.rb
@@ -29,10 +29,11 @@ def show
   def create
     authorize :domain_block, :create?
 
+    @domain_block = DomainBlock.new(resource_params)
     existing_domain_block = resource_params[:domain].present? ? DomainBlock.rule_for(resource_params[:domain]) : nil
-    return render json: existing_domain_block, serializer: REST::Admin::ExistingDomainBlockErrorSerializer, status: 422 if existing_domain_block.present?
+    return render json: existing_domain_block, serializer: REST::Admin::ExistingDomainBlockErrorSerializer, status: 422 if conflicts_with_existing_block?(@domain_block, existing_domain_block)
 
-    @domain_block = DomainBlock.create!(resource_params)
+    @domain_block.save!
     DomainBlockWorker.perform_async(@domain_block.id)
     log_action :create, @domain_block
     render json: @domain_block, serializer: REST::Admin::DomainBlockSerializer
@@ -55,6 +56,10 @@ def destroy
 
   private
 
+  def conflicts_with_existing_block?(domain_block, existing_domain_block)
+    existing_domain_block.present? && (existing_domain_block.domain == TagManager.instance.normalize_domain(domain_block.domain) || !domain_block.stricter_than?(existing_domain_block))
+  end
+
   def set_domain_blocks
     @domain_blocks = filtered_domain_blocks.order(id: :desc).to_a_paginated_by_id(limit_param(LIMIT), params_slice(:max_id, :since_id, :min_id))
   end
diff --git a/spec/requests/api/v1/admin/domain_blocks_spec.rb b/spec/requests/api/v1/admin/domain_blocks_spec.rb
index 47aaf44d8054b3..415281a932747d 100644
--- a/spec/requests/api/v1/admin/domain_blocks_spec.rb
+++ b/spec/requests/api/v1/admin/domain_blocks_spec.rb
@@ -130,7 +130,7 @@
     it_behaves_like 'forbidden for wrong role', ''
     it_behaves_like 'forbidden for wrong role', 'Moderator'
 
-    it 'returns expected domain name and severity', :aggregate_failures do
+    it 'creates a domain block with the expected domain name and severity', :aggregate_failures do
       subject
 
       body = body_as_json
@@ -146,7 +146,44 @@
       expect(DomainBlock.find_by(domain: 'foo.bar.com')).to be_present
     end
 
-    context 'when a stricter domain block already exists' do
+    context 'when a looser domain block already exists on a higher level domain' do
+      let(:params) { { domain: 'foo.bar.com', severity: :suspend } }
+
+      before do
+        Fabricate(:domain_block, domain: 'bar.com', severity: :silence)
+      end
+
+      it 'creates a domain block with the expected domain name and severity', :aggregate_failures do
+        subject
+
+        body = body_as_json
+
+        expect(response).to have_http_status(200)
+        expect(body).to match a_hash_including(
+          {
+            domain: 'foo.bar.com',
+            severity: 'suspend',
+          }
+        )
+
+        expect(DomainBlock.find_by(domain: 'foo.bar.com')).to be_present
+      end
+    end
+
+    context 'when a domain block already exists on the same domain' do
+      before do
+        Fabricate(:domain_block, domain: 'foo.bar.com', severity: :silence)
+      end
+
+      it 'returns existing domain block in error', :aggregate_failures do
+        subject
+
+        expect(response).to have_http_status(422)
+        expect(body_as_json[:existing_domain_block][:domain]).to eq('foo.bar.com')
+      end
+    end
+
+    context 'when a stricter domain block already exists on a higher level domain' do
       before do
         Fabricate(:domain_block, domain: 'bar.com', severity: :suspend)
       end

From 4b2054ee57b41c304f85eab6236baebe0b732d95 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 2 May 2024 23:22:26 +0200
Subject: [PATCH 0924/2191] Update Yarn to v4.2.1 (#30153)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 package.json           | 2 +-
 streaming/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 24d81ea476ae6f..3abc11c34b09bc 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@mastodon/mastodon",
   "license": "AGPL-3.0-or-later",
-  "packageManager": "yarn@4.1.1",
+  "packageManager": "yarn@4.2.1",
   "engines": {
     "node": ">=18"
   },
diff --git a/streaming/package.json b/streaming/package.json
index a0e7d96bb5ba31..c4dcccf1f57acc 100644
--- a/streaming/package.json
+++ b/streaming/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@mastodon/streaming",
   "license": "AGPL-3.0-or-later",
-  "packageManager": "yarn@4.1.1",
+  "packageManager": "yarn@4.2.1",
   "engines": {
     "node": ">=18"
   },

From 9380805fc15f0a0bfc4ed9e70c393191f64e2718 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 3 May 2024 10:48:09 +0200
Subject: [PATCH 0925/2191] Update dependency rubocop-rspec to v2.29.2 (#30158)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index a231785402e1ab..cb36bc2ddc2b2b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -651,8 +651,8 @@ GEM
       rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.31.2)
-      parser (>= 3.3.0.4)
+    rubocop-ast (1.31.3)
+      parser (>= 3.3.1.0)
     rubocop-capybara (2.20.0)
       rubocop (~> 1.41)
     rubocop-factory_bot (2.25.1)
@@ -665,7 +665,7 @@ GEM
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rspec (2.29.1)
+    rubocop-rspec (2.29.2)
       rubocop (~> 1.40)
       rubocop-capybara (~> 2.17)
       rubocop-factory_bot (~> 2.22)

From d5444a2c6c6bf9597503297dba9181e6d9bfad46 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 3 May 2024 11:15:06 +0200
Subject: [PATCH 0926/2191] New Crowdin Translations (automated) (#30160)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 config/locales/ia.yml             | 52 +++++++++++++++++++++++++++
 config/locales/simple_form.ia.yml | 60 +++++++++++++++++++++++++++++++
 config/locales/simple_form.sv.yml |  4 +++
 3 files changed, 116 insertions(+)

diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index ff7b47c1febd59..59dd2dbc0fcb10 100644
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -159,42 +159,94 @@ ia:
       undo_suspension: Disfacer le suspension
       unsilenced_msg: Le limite del conto de %{username} ha essite cancellate
       unsubscribe: Desubscriber
+      unsuspended_msg: Annullate suspension del conto %{username} con successo
       username: Nomine de usator
       view_domain: Vider summario de dominio
       warn: Avisar
       web: Web
+      whitelisted: Permittite pro federation
     action_logs:
       action_types:
+        approve_appeal: Approbar appello
+        approve_user: Approbar usator
+        assigned_to_self_report: Assignar reporto
         change_email_user: Cambiar e-mail pro le usator
         change_role_user: Cambiar le rolo del usator
         confirm_user: Confirmar le usator
         create_account_warning: Crear un advertimento
         create_announcement: Crear annuncio
+        create_canonical_email_block: Crear blocada de email
+        create_custom_emoji: Crear emoticone personalisate
+        create_domain_allow: Crear permisso de dominio
+        create_domain_block: Crear blocada de dominio
+        create_email_domain_block: Crear blocada de dominio email
         create_ip_block: Crear un regula IP
+        create_unavailable_domain: Crear dominio indisponibile
         create_user_role: Crear un rolo
+        demote_user: Degradar usator
         destroy_announcement: Deler annuncio
+        destroy_canonical_email_block: Deler blocada de email
+        destroy_custom_emoji: Deler emoticone personalisate
+        destroy_domain_allow: Deler permisso de dominio
+        destroy_domain_block: Deler blocada de dominio
+        destroy_email_domain_block: Crear blocada de dominio email
+        destroy_instance: Purgar dominio
         destroy_ip_block: Deler le regula IP
         destroy_status: Deler le message
         destroy_unavailable_domain: Deler le dominio non disponibile
+        destroy_user_role: Destruer rolo
         disable_2fa_user: Disactivar 2FA
         disable_custom_emoji: Disactivar emoji personalisate
+        disable_sign_in_token_auth_user: Disactivar le authentication per testimonio via email pro usator
         disable_user: Disactivar le usator
         enable_custom_emoji: Activar emoji personalisate
+        enable_sign_in_token_auth_user: Activar le authentication per testimonio via email pro usator
         enable_user: Activar le usator
+        memorialize_account: Commemorar conto
         promote_user: Promover usator
+        reject_appeal: Rejectar appello
+        reject_user: Rejectar usator
+        remove_avatar_user: Remover avatar
+        reopen_report: Reaperir reporto
         resend_user: Reinviar message de confirmation
         reset_password_user: Reinitialisar contrasigno
+        resolve_report: Resolver reporto
+        sensitive_account: Marcar como sensibile le medios del conto
         silence_account: Limitar conto
+        suspend_account: Suspender conto
+        unassigned_report: Disassignar reporto
         unblock_email_account: Disblocar adresse de e-mail
+        unsensitive_account: Dismarcar como sensibile le medios del conto
         unsilence_account: Disfacer le limite de conto
+        unsuspend_account: Annullar suspension de conto
         update_announcement: Actualisar annuncio
         update_custom_emoji: Actualisar emoji personalisate
+        update_domain_block: Actualisar blocada de dominio
         update_ip_block: Actualisar le regula IP
         update_status: Actualisar le message
         update_user_role: Actualisar rolo
       actions:
+        approve_appeal_html: "%{name} approbava appello del decision de moderation de %{target}"
+        approve_user_html: "%{name} approbava inscription de %{target}"
+        assigned_to_self_report_html: "%{name} assignava reporto %{target} a se mesme"
         change_email_user_html: "%{name} cambiava le adresse de e-mail address del usator %{target}"
+        change_role_user_html: "%{name} cambiava rolo de %{target}"
+        confirm_user_html: "%{name} confirmava le adresse email del usator %{target}"
+        create_account_warning_html: "%{name} inviava un advertimento a %{target}"
         create_announcement_html: "%{name} creava un nove annuncio %{target}"
+        create_canonical_email_block_html: "%{name} blocava email con le hash %{target}"
+        create_custom_emoji_html: "%{name} cargava nove emoticone %{target}"
+        create_domain_allow_html: "%{name} permitteva federation con dominio %{target}"
+        create_domain_block_html: "%{name} blocava dominio %{target}"
+        create_email_domain_block_html: "%{name} blocava dominio email %{target}"
+        create_ip_block_html: "%{name} creava regula pro IP %{target}"
+        create_unavailable_domain_html: "%{name} stoppava consignation a dominio %{target}"
+        create_user_role_html: "%{name} creava rolo de %{target}"
+        demote_user_html: "%{name} degradava usator %{target}"
+        destroy_announcement_html: "%{name} deleva annuncio %{target}"
+        destroy_custom_emoji_html: "%{name} deleva emoji %{target}"
+        destroy_domain_block_html: "%{name} disblocava dominio %{target}"
+        destroy_user_role_html: "%{name} deleva le rolo de %{target}"
       deleted_account: conto delite
     announcements:
       destroyed_msg: Annuncio delite con successo!
diff --git a/config/locales/simple_form.ia.yml b/config/locales/simple_form.ia.yml
index 05a5fa5013d07a..b5ec14e60e040b 100644
--- a/config/locales/simple_form.ia.yml
+++ b/config/locales/simple_form.ia.yml
@@ -48,10 +48,48 @@ ia:
         email: Te sera inviate un email de confirmation
         header: WEBP, PNG, GIF or JPG. Al maximo %{size}. Sera diminuite a %{dimensions}px
         inbox_url: Copia le URL ab le pagina principal del repetitor que tu vole usar
+        irreversible: Le messages filtrate disparera irreversibilemente, mesmo si le filtro es plus tarde removite
+        locale: Le lingua del interfacie de usator, del emails e del notificationes pulsate
         password: Usa al minus 8 characteres
+        phrase: Sera concordate ignorante majuscule/minuscule in le texto o avisos de contento de un message
+        scopes: A que APIs sera permittite acceder al application. Si tu selige un ambito de maxime nivello, tu non besonia de seliger los singulemente.
+        setting_aggregate_reblogs: Non monstra nove stimulos pro messages que ha essite recentemente stimulate (stimulos solo affice los novemente recipite)
+        setting_always_send_emails: Normalmente le avisos de email non sera inviate quando tu activemente usa Mastodon
+        setting_default_sensitive: Le medios sensibile es celate de ordinario e pote esser revelate con un clic
+        setting_display_media_default: Celar le medios marcate como sensibile
         setting_display_media_hide_all: Sempre celar le medios
         setting_display_media_show_all: Sempre monstrar le medios
+        setting_use_blurhash: Le imagines degradate es basate sur le colores del medios visual celate, ma illos offusca qualcunque detalios
+        setting_use_pending_items: Celar le classification temporal detra un clic in vice que automaticamente rolante le fluxo
         username: Tu pote usar litteras, numeros e tractos de sublineamento
+        whole_word: Quando le parola o expression clave es solo alphanumeric, illo sera solo applicate si illo concorda con tote le parola
+      domain_allow:
+        domain: Iste dominio potera reportar datos ab iste servitor e le datos in ingresso ab illo sera processate e immagazinate
+      email_domain_block:
+        domain: Isto pote esser le nomine de dominio que apparera in le adresse email o le registration MX que illo usa. Illos sera verificate durante le inscription.
+        with_dns_records: Un tentativa sera facite pro resolver le registrationes de DNS del dominio date e le resultatos sera alsi blocate
+      featured_tag:
+        name: 'Ecce alcun del hashtags que tu usava le plus recentemente:'
+      filters:
+        action: Selige que action exequer quando un message concorda con le filtro
+        actions:
+          hide: Completemente celar le contento filtrate, comportar se como si illo non existerea
+          warn: Celar le contento filtrate detra un aviso citante le titulo del filtro
+      form_admin_settings:
+        activity_api_enabled: Numeros de messages localmente publicate, usatores active, e nove registrationes in gruppos septimanal
+        backups_retention_period: Le usatores pote generar archivos de lor messages pro discargar los plus tarde. Quando predefinite a un valor positive, iste archivos sera automaticamente delite de tu immagazinage post le specificate numero de dies.
+        bootstrap_timeline_accounts: Iste contos sera appunctate al summitate del recommendationes a sequer del nove usatores.
+        closed_registrations_message: Monstrate quando le inscriptiones es claudite
+        content_cache_retention_period: Tote messages de altere servitores (includite stimulos e responsas) sera delite post le specificate numero de dies, sin considerar alcun interaction de usator local con ille messages. Isto include messages ubi un usator local los ha marcate como marcapaginas o favoritos. Mentiones private inter usatores de differente instantias sera alsi perdite e impossibile a restaurar. Le uso de iste parametros es intendite pro specific instantias e infringe multe expectationes de usator quando implementate pro uso general.
+        custom_css: Tu pote applicar stilos personalisate sur le version de web de Mastodon.
+        mascot: Illo substitue le illustration in le interfacie web avantiate.
+        media_cache_retention_period: Le files multimedial de messages producite per usatores remote es in cache sur tu servitor. Quando predefinite a un valor positive, le medios sera delite post le numero de dies specificate. Le datos multimedial requirite post que illo es delite, sera re-discargate, si le contento original sera ancora disponibile. Per limitationes sur le frequentia con que le schedas de pre-visualisation de ligamine scruta le sitos de tertie partes, il es recommendate de predefinir iste valor a al minus 14 dies, o le schedas de pre-visualisation de ligamine non sera actualisate sur demanda ante ille tempore.
+        peers_api_enabled: Un lista de nomines de dominio que iste servitor ha incontrate in le fediverso. Nulle datos es includite ci re tu federation con un date servitor, justo que tu servitor lo cognosce. Isto es usate per servicios que collige statistica re le federation in senso general.
+        profile_directory: Le directorio de profilo lista tote le usatores qui ha optate pro esser detectabile.
+        require_invite_text: Quando le inscriptiones require approbation manual, rende obligatori, plus tosto que optional, le entrata de texto “Perque vole tu junger te?”
+        site_contact_email: Como pote contactar te le personas pro questiones legal o de supporto.
+        site_contact_username: Como pote contactar te le personas re Mastodon.
+        site_extended_description: Qualcunque information additional que pote esser utile al visitatores e a tu usatores. Pote esser structurate con syntaxe de markdown.
       ip_block:
         severities:
           no_access: Blocar accesso a tote le ressources
@@ -68,8 +106,11 @@ ia:
         show_collections: Monstrar sequites e sequitores in le profilo
         unlocked: Acceptar automaticamente nove sequitores
       account_warning_preset:
+        text: Texto predefinite
         title: Titulo
       admin_account_action:
+        send_email_notification: Notificar le usator per e-mail
+        text: Advertimento personalisate
         type: Action
         types:
           disable: Gelar
@@ -78,6 +119,7 @@ ia:
           silence: Limitar
           suspend: Suspender
       announcement:
+        starts_at: Initio del evento
         text: Annuncio
       defaults:
         autofollow: Invitar a sequer tu conto
@@ -85,24 +127,38 @@ ia:
         chosen_languages: Filtrar linguas
         confirm_new_password: Confirmar nove contrasigno
         confirm_password: Confirmar contrasigno
+        context: Contextos del filtro
         current_password: Contrasigno actual
+        data: Datos
         display_name: Nomine a monstrar
         email: Adresse de e-mail
+        expires_in: Expira post
+        fields: Campos extra
+        header: Imagine titulo
+        honeypot: "%{label} (non compilar)"
+        inbox_url: URL del cassa de ingresso de repetitor
         locale: Lingua de interfacie
+        max_uses: Numero max de usos
         new_password: Nove contrasigno
+        note: Bio
+        otp_attempt: Codice a duo factores
         password: Contrasigno
+        phrase: Parola o phrase clave
         setting_advanced_layout: Activar le interfacie web avantiate
         setting_always_send_emails: Sempre inviar notificationes per e-mail
         setting_default_language: Lingua de publication
+        setting_display_media: Visualisation de medios
         setting_display_media_default: Predefinite
         setting_display_media_hide_all: Celar toto
         setting_display_media_show_all: Monstrar toto
         setting_system_font_ui: Usar typo de litteras predefinite del systema
         setting_theme: Thema de sito
         setting_trends: Monstrar le tendentias de hodie
+        setting_use_pending_items: Modo lente
         severity: Severitate
         sign_in_token_attempt: Codice de securitate
         title: Titulo
+        type: Importar le typo
         username: Nomine de usator
         username_or_email: Nomine de usator o e-mail
         whole_word: Parola integre
@@ -123,6 +179,7 @@ ia:
         site_title: Nomine de servitor
         status_page_url: URL del pagina de stato
         theme: Thema predefinite
+        thumbnail: Miniatura de servitor
         trends: Activar tendentias
       invite:
         comment: Commento
@@ -133,6 +190,7 @@ ia:
           no_access: Blocar le accesso
         severity: Regula
       notification_emails:
+        digest: Inviar emails compendio
         software_updates:
           all: Notificar sur tote le actualisationes
           critical: Notificar solmente sur actualisationes critic
@@ -156,8 +214,10 @@ ia:
         position: Prioritate
       webhook:
         events: Eventos activate
+    'no': 'No'
     not_recommended: Non recommendate
     recommended: Recommendate
     required:
+      mark: "*"
       text: requirite
     'yes': Si
diff --git a/config/locales/simple_form.sv.yml b/config/locales/simple_form.sv.yml
index 3ab16bf69be35c..5e5c6f95491507 100644
--- a/config/locales/simple_form.sv.yml
+++ b/config/locales/simple_form.sv.yml
@@ -77,10 +77,13 @@ sv:
           warn: Dölj det filtrerade innehållet bakom en varning som visar filtrets rubrik
       form_admin_settings:
         activity_api_enabled: Antalet lokalt publicerade inlägg, aktiva användare och nya registrerade konton per vecka
+        backups_retention_period: Användare har möjlighet att generera arkiv av sina inlägg för att ladda ned senare. När det sätts till ett positivt värde raderas dessa arkiv automatiskt från din lagring efter det angivna antalet dagar.
         bootstrap_timeline_accounts: Dessa konton kommer fästas högst upp i nya användares följrekommendationer.
         closed_registrations_message: Visas när nyregistreringar är avstängda
+        content_cache_retention_period: Alla inlägg från andra servrar (inklusive booster och svar) kommer att raderas efter det angivna antalet dagar, utan hänsyn till någon lokal användarinteraktion med dessa inlägg. Detta inkluderar inlägg där en lokal användare har markerat det som bokmärke eller favoriter. Privata omnämnanden mellan användare från olika instanser kommer också att gå förlorade och blir omöjliga att återställa. Användningen av denna inställning är avsedd för specialfall och bryter många användarförväntningar när de implementeras för allmänt bruk.
         custom_css: Du kan använda anpassade stilar på webbversionen av Mastodon.
         mascot: Åsidosätter illustrationen i det avancerade webbgränssnittet.
+        media_cache_retention_period: Mediafiler från inlägg som gjorts av fjärranvändare cachas på din server. När inställd på ett positivt värde kommer media att raderas efter det angivna antalet dagar. Om mediadatat begärs efter att det har raderats, kommer det att laddas ned igen om källinnehållet fortfarande är tillgängligt. På grund av begränsningar för hur ofta förhandsgranskningskort för länkar hämtas från tredjepartswebbplatser, rekommenderas det att ange detta värde till minst 14 dagar, annars kommer förhandsgranskningskorten inte att uppdateras på begäran före den tiden.
         peers_api_enabled: En lista över domänen den här servern har stött på i fediversum. Ingen data inkluderas om du har federerat med servern, bara att din server känner till den. Detta används av tjänster som samlar statistik om federering i allmänhet.
         profile_directory: Profilkatalogen visar alla användare som har samtyckt till att bli upptäckbara.
         require_invite_text: Gör fältet "Varför vill du gå med?" obligatoriskt när nyregistreringar kräver manuellt godkännande
@@ -240,6 +243,7 @@ sv:
         backups_retention_period: Lagringsperiod för användararkivet
         bootstrap_timeline_accounts: Rekommendera alltid dessa konton till nya användare
         closed_registrations_message: Anpassat meddelande när nyregistreringar inte är tillgängliga
+        content_cache_retention_period: Förvaringsperiod för fjärrinnehåll
         custom_css: Anpassad CSS
         mascot: Anpassad maskot (tekniskt arv)
         media_cache_retention_period: Tid för bibehållande av mediecache

From 9aa31be8d3fd7f20a537bfb08b5e4ef11f636c34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A2u=20Cao?= <842+raucao@users.noreply.github.com>
Date: Fri, 3 May 2024 11:22:48 +0200
Subject: [PATCH 0927/2191] Fix local account search on LDAP login being
 case-sensitive (#30113)

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
---
 app/models/concerns/user/ldap_authenticable.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/concerns/user/ldap_authenticable.rb b/app/models/concerns/user/ldap_authenticable.rb
index 180df9d3101ebb..c8e9fa93484917 100644
--- a/app/models/concerns/user/ldap_authenticable.rb
+++ b/app/models/concerns/user/ldap_authenticable.rb
@@ -22,7 +22,7 @@ def ldap_get_user(attributes = {})
         safe_username = safe_username.gsub(keys, replacement)
       end
 
-      resource = joins(:account).find_by(accounts: { username: safe_username })
+      resource = joins(:account).merge(Account.where(Account.arel_table[:username].lower.eq safe_username.downcase)).take
 
       if resource.blank?
         resource = new(

From 33368e3e79a6edfcaf65fd2b80b636a7c1e56e48 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 3 May 2024 11:26:24 +0200
Subject: [PATCH 0928/2191] Change ActiveRecordEncryption variable to be more
 explicit (#30151)

---
 config/initializers/active_record_encryption.rb |  4 ++--
 lib/tasks/db.rake                               | 16 ++++++++++++++++
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/config/initializers/active_record_encryption.rb b/config/initializers/active_record_encryption.rb
index f99585b4ada6eb..7cda8c621c2b69 100644
--- a/config/initializers/active_record_encryption.rb
+++ b/config/initializers/active_record_encryption.rb
@@ -6,9 +6,9 @@
   ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY
 ).each do |key|
   ENV.fetch(key) do
-    raise <<~MESSAGE
+    abort <<~MESSAGE
 
-      The ActiveRecord encryption feature requires that these variables are set:
+      Mastodon now requires that these variables are set:
 
         - ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY
         - ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT
diff --git a/lib/tasks/db.rake b/lib/tasks/db.rake
index 4208c2ae4b5bca..07de087766d8eb 100644
--- a/lib/tasks/db.rake
+++ b/lib/tasks/db.rake
@@ -1,6 +1,22 @@
 # frozen_string_literal: true
 
+# We are providing our own task with our own format
+Rake::Task['db:encryption:init'].clear
+
 namespace :db do
+  namespace :encryption do
+    desc 'Generate a set of keys for configuring Active Record encryption in a given environment'
+    task init: :environment do
+      puts <<~MSG
+        Add these environment variables to your Mastodon environment:#{' '}
+
+        ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=#{SecureRandom.alphanumeric(32)}
+        ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=#{SecureRandom.alphanumeric(32)}
+        ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY=#{SecureRandom.alphanumeric(32)}
+      MSG
+    end
+  end
+
   namespace :migrate do
     desc 'Setup the db or migrate depending on state of db'
     task setup: :environment do

From b7902225d698a107df2cf8b4ca221caad38fa464 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 3 May 2024 10:56:48 -0400
Subject: [PATCH 0929/2191] Use built-in github annotation output for
 `stylelint` (#30165)

---
 .github/stylelint-matcher.json | 21 ---------------------
 .github/workflows/lint-css.yml |  6 +-----
 2 files changed, 1 insertion(+), 26 deletions(-)
 delete mode 100644 .github/stylelint-matcher.json

diff --git a/.github/stylelint-matcher.json b/.github/stylelint-matcher.json
deleted file mode 100644
index cdfd4086bd4200..00000000000000
--- a/.github/stylelint-matcher.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "problemMatcher": [
-    {
-      "owner": "stylelint",
-      "pattern": [
-        {
-          "regexp": "^([^\\s].*)$",
-          "file": 1
-        },
-        {
-          "regexp": "^\\s+((\\d+):(\\d+))?\\s+(✖|×)\\s+(.*)\\s{2,}(.*)$",
-          "line": 2,
-          "column": 3,
-          "message": 5,
-          "code": 6,
-          "loop": true
-        }
-      ]
-    }
-  ]
-}
diff --git a/.github/workflows/lint-css.yml b/.github/workflows/lint-css.yml
index e5f487487719f1..d3b8035cd86521 100644
--- a/.github/workflows/lint-css.yml
+++ b/.github/workflows/lint-css.yml
@@ -38,9 +38,5 @@ jobs:
       - name: Set up Javascript environment
         uses: ./.github/actions/setup-javascript
 
-      - uses: xt0rted/stylelint-problem-matcher@v1
-
-      - run: echo "::add-matcher::.github/stylelint-matcher.json"
-
       - name: Stylelint
-        run: yarn lint:css
+        run: yarn lint:css -f github

From 333905b2d54b33b6c0e1103ecb5c113ab77843a0 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 24 Apr 2024 10:45:12 +0200
Subject: [PATCH 0930/2191] [Glitch] Change mute options to be in dropdown on
 muted users list in web UI

Port 74012831f61a36b7f52540c5ccafa0f9692a6596 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/components/account.jsx    | 276 +++++++++---------
 .../flavours/glitch/styles/components.scss    |  14 +-
 2 files changed, 152 insertions(+), 138 deletions(-)

diff --git a/app/javascript/flavours/glitch/components/account.jsx b/app/javascript/flavours/glitch/components/account.jsx
index 7e5209653eb333..326d4fcb696c58 100644
--- a/app/javascript/flavours/glitch/components/account.jsx
+++ b/app/javascript/flavours/glitch/components/account.jsx
@@ -1,16 +1,18 @@
 import PropTypes from 'prop-types';
+import { useCallback } from 'react';
 
-import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
+import { defineMessages, useIntl, FormattedMessage } from 'react-intl';
 
 import classNames from 'classnames';
 
 import ImmutablePropTypes from 'react-immutable-proptypes';
-import ImmutablePureComponent from 'react-immutable-pure-component';
 
+import MoreHorizIcon from '@/material-icons/400-24px/more_horiz.svg?react';
 import { EmptyAccount } from 'flavours/glitch/components/empty_account';
 import { ShortNumber } from 'flavours/glitch/components/short_number';
 import { VerifiedBadge } from 'flavours/glitch/components/verified_badge';
 
+import DropdownMenuContainer from '../containers/dropdown_menu_container';
 import { me } from '../initial_state';
 
 import { Avatar } from './avatar';
@@ -30,153 +32,153 @@ const messages = defineMessages({
   unmute_notifications: { id: 'account.unmute_notifications_short', defaultMessage: 'Unmute notifications' },
   mute: { id: 'account.mute_short', defaultMessage: 'Mute' },
   block: { id: 'account.block_short', defaultMessage: 'Block' },
+  more: { id: 'status.more', defaultMessage: 'More' },
 });
 
-class Account extends ImmutablePureComponent {
-
-  static propTypes = {
-    size: PropTypes.number,
-    account: ImmutablePropTypes.record,
-    onFollow: PropTypes.func,
-    onBlock: PropTypes.func,
-    onMute: PropTypes.func,
-    onMuteNotifications: PropTypes.func,
-    intl: PropTypes.object.isRequired,
-    hidden: PropTypes.bool,
-    minimal: PropTypes.bool,
-    defaultAction: PropTypes.string,
-    withBio: PropTypes.bool,
-  };
-
-  static defaultProps = {
-    size: 46,
-  };
-
-  handleFollow = () => {
-    this.props.onFollow(this.props.account);
-  };
-
-  handleBlock = () => {
-    this.props.onBlock(this.props.account);
-  };
-
-  handleMute = () => {
-    this.props.onMute(this.props.account);
-  };
-
-  handleMuteNotifications = () => {
-    this.props.onMuteNotifications(this.props.account, true);
-  };
-
-  handleUnmuteNotifications = () => {
-    this.props.onMuteNotifications(this.props.account, false);
-  };
-
-  render () {
-    const { account, intl, hidden, withBio, defaultAction, size, minimal } = this.props;
-
-    if (!account) {
-      return <EmptyAccount size={size} minimal={minimal} />;
-    }
+const Account = ({ size = 46, account, onFollow, onBlock, onMute, onMuteNotifications, hidden, minimal, defaultAction, withBio }) => {
+  const intl = useIntl();
 
-    if (hidden) {
-      return (
-        <>
-          {account.get('display_name')}
-          {account.get('username')}
-        </>
-      );
-    }
+  const handleFollow = useCallback(() => {
+    onFollow(account);
+  }, [onFollow, account]);
+
+  const handleBlock = useCallback(() => {
+    onBlock(account);
+  }, [onBlock, account]);
+
+  const handleMute = useCallback(() => {
+    onMute(account);
+  }, [onMute, account]);
+
+  const handleMuteNotifications = useCallback(() => {
+    onMuteNotifications(account, true);
+  }, [onMuteNotifications, account]);
+
+  const handleUnmuteNotifications = useCallback(() => {
+    onMuteNotifications(account, false);
+  }, [onMuteNotifications, account]);
+
+  if (!account) {
+    return <EmptyAccount size={size} minimal={minimal} />;
+  }
+
+  if (hidden) {
+    return (
+      <>
+        {account.get('display_name')}
+        {account.get('username')}
+      </>
+    );
+  }
 
-    let buttons;
-
-    if (account.get('id') !== me && account.get('relationship', null) !== null) {
-      const following = account.getIn(['relationship', 'following']);
-      const requested = account.getIn(['relationship', 'requested']);
-      const blocking  = account.getIn(['relationship', 'blocking']);
-      const muting  = account.getIn(['relationship', 'muting']);
-
-      if (requested) {
-        buttons = <Button text={intl.formatMessage(messages.cancel_follow_request)} onClick={this.handleFollow} />;
-      } else if (blocking) {
-        buttons = <Button text={intl.formatMessage(messages.unblock)} onClick={this.handleBlock} />;
-      } else if (muting) {
-        let hidingNotificationsButton;
-
-        if (account.getIn(['relationship', 'muting_notifications'])) {
-          hidingNotificationsButton = <Button text={intl.formatMessage(messages.unmute_notifications)} onClick={this.handleUnmuteNotifications} />;
-        } else {
-          hidingNotificationsButton = <Button text={intl.formatMessage(messages.mute_notifications)} onClick={this.handleMuteNotifications} />;
-        }
-
-        buttons = (
-          <>
-            <Button text={intl.formatMessage(messages.unmute)} onClick={this.handleMute} />
-            {hidingNotificationsButton}
-          </>
-        );
-      } else if (defaultAction === 'mute') {
-        buttons = <Button title={intl.formatMessage(messages.mute)} onClick={this.handleMute} />;
-      } else if (defaultAction === 'block') {
-        buttons = <Button text={intl.formatMessage(messages.block)} onClick={this.handleBlock} />;
-      } else if (!account.get('suspended') && !account.get('moved') || following) {
-        buttons = <Button text={intl.formatMessage(following ? messages.unfollow : messages.follow)} onClick={this.handleFollow} />;
+  let buttons;
+
+  if (account.get('id') !== me && account.get('relationship', null) !== null) {
+    const following = account.getIn(['relationship', 'following']);
+    const requested = account.getIn(['relationship', 'requested']);
+    const blocking  = account.getIn(['relationship', 'blocking']);
+    const muting  = account.getIn(['relationship', 'muting']);
+
+    if (requested) {
+      buttons = <Button text={intl.formatMessage(messages.cancel_follow_request)} onClick={handleFollow} />;
+    } else if (blocking) {
+      buttons = <Button text={intl.formatMessage(messages.unblock)} onClick={handleBlock} />;
+    } else if (muting) {
+      let menu;
+
+      if (account.getIn(['relationship', 'muting_notifications'])) {
+        menu = [{ text: intl.formatMessage(messages.unmute_notifications), action: handleUnmuteNotifications }];
+      } else {
+        menu = [{ text: intl.formatMessage(messages.mute_notifications), action: handleMuteNotifications }];
       }
-    }
 
-    let muteTimeRemaining;
+      buttons = (
+        <>
+          <DropdownMenuContainer
+            items={menu}
+            icon='ellipsis-h'
+            iconComponent={MoreHorizIcon}
+            direction='right'
+            title={intl.formatMessage(messages.more)}
+          />
 
-    if (account.get('mute_expires_at')) {
-      muteTimeRemaining = <>· <RelativeTimestamp timestamp={account.get('mute_expires_at')} futureDate /></>;
+          <Button text={intl.formatMessage(messages.unmute)} onClick={handleMute} />
+        </>
+      );
+    } else if (defaultAction === 'mute') {
+      buttons = <Button title={intl.formatMessage(messages.mute)} onClick={handleMute} />;
+    } else if (defaultAction === 'block') {
+      buttons = <Button text={intl.formatMessage(messages.block)} onClick={handleBlock} />;
+    } else if (!account.get('suspended') && !account.get('moved') || following) {
+      buttons = <Button text={intl.formatMessage(following ? messages.unfollow : messages.follow)} onClick={handleFollow} />;
     }
+  }
+
+  let muteTimeRemaining;
 
-    let verification;
+  if (account.get('mute_expires_at')) {
+    muteTimeRemaining = <>· <RelativeTimestamp timestamp={account.get('mute_expires_at')} futureDate /></>;
+  }
 
-    const firstVerifiedField = account.get('fields').find(item => !!item.get('verified_at'));
+  let verification;
 
-    if (firstVerifiedField) {
-      verification = <VerifiedBadge link={firstVerifiedField.get('value')} />;
-    }
+  const firstVerifiedField = account.get('fields').find(item => !!item.get('verified_at'));
 
-    return (
-      <div className={classNames('account', { 'account--minimal': minimal })}>
-        <div className='account__wrapper'>
-          <Permalink key={account.get('id')} className='account__display-name' title={account.get('acct')} href={account.get('url')} to={`/@${account.get('acct')}`}>
-            <div className='account__avatar-wrapper'>
-              <Avatar account={account} size={size} />
-            </div>
-
-            <div className='account__contents'>
-              <DisplayName account={account} />
-              {!minimal && (
-                <div className='account__details'>
-                  {account.get('followers_count') !== -1 && (
-                    <ShortNumber value={account.get('followers_count')} renderer={FollowersCounter} />
-                  )} {verification} {muteTimeRemaining}
-                </div>
-              )}
-            </div>
-          </Permalink>
-
-          {!minimal && (
-            <div className='account__relationship'>
-              {buttons}
-            </div>
-          )}
-        </div>
-
-        {withBio && (account.get('note').length > 0 ? (
-          <div
-            className='account__note translate'
-            dangerouslySetInnerHTML={{ __html: account.get('note_emojified') }}
-          />
-        ) : (
-          <div className='account__note account__note--missing'><FormattedMessage id='account.no_bio' defaultMessage='No description provided.' /></div>
-        ))}
-      </div>
-    );
+  if (firstVerifiedField) {
+    verification = <VerifiedBadge link={firstVerifiedField.get('value')} />;
   }
 
-}
+  return (
+    <div className={classNames('account', { 'account--minimal': minimal })}>
+      <div className='account__wrapper'>
+        <Permalink key={account.get('id')} className='account__display-name' title={account.get('acct')} href={account.get('url')} to={`/@${account.get('acct')}`}>
+          <div className='account__avatar-wrapper'>
+            <Avatar account={account} size={size} />
+          </div>
+
+          <div className='account__contents'>
+            <DisplayName account={account} />
+            {!minimal && (
+              <div className='account__details'>
+                {account.get('followers_count') !== -1 && (
+                  <ShortNumber value={account.get('followers_count')} renderer={FollowersCounter} />
+                )} {verification} {muteTimeRemaining}
+              </div>
+            )}
+          </div>
+        </Permalink>
+
+        {!minimal && (
+          <div className='account__relationship'>
+            {buttons}
+          </div>
+        )}
+      </div>
 
-export default injectIntl(Account);
+      {withBio && (account.get('note').length > 0 ? (
+        <div
+          className='account__note translate'
+          dangerouslySetInnerHTML={{ __html: account.get('note_emojified') }}
+        />
+      ) : (
+        <div className='account__note account__note--missing'><FormattedMessage id='account.no_bio' defaultMessage='No description provided.' /></div>
+      ))}
+    </div>
+  );
+};
+
+Account.propTypes = {
+  size: PropTypes.number,
+  account: ImmutablePropTypes.record,
+  onFollow: PropTypes.func,
+  onBlock: PropTypes.func,
+  onMute: PropTypes.func,
+  onMuteNotifications: PropTypes.func,
+  intl: PropTypes.object.isRequired,
+  hidden: PropTypes.bool,
+  minimal: PropTypes.bool,
+  defaultAction: PropTypes.string,
+  withBio: PropTypes.bool,
+};
+
+export default Account;
diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index 3430568f7f42b8..3a5420c35c7adb 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -2228,7 +2228,19 @@ a .account__avatar {
   white-space: nowrap;
   display: flex;
   align-items: center;
-  gap: 4px;
+  gap: 8px;
+
+  .icon-button {
+    border: 1px solid var(--background-border-color);
+    border-radius: 4px;
+    box-sizing: content-box;
+    padding: 5px;
+
+    .icon {
+      width: 24px;
+      height: 24px;
+    }
+  }
 }
 
 .account-authorize {

From 8dbcf8a2873e5fa5dc7a3d35cb8d54abcef27b2f Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 25 Apr 2024 18:25:33 +0200
Subject: [PATCH 0931/2191] [Glitch] Change design of people tab on explore in
 web UI

Port 0ec061aa8f7383330b26b3323d2fafd9ec7663e3 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../features/explore/components/card.jsx      | 88 +++++++++++++++++++
 .../glitch/features/explore/suggestions.jsx   |  9 +-
 .../flavours/glitch/styles/components.scss    | 79 ++++++++++++++++-
 3 files changed, 171 insertions(+), 5 deletions(-)
 create mode 100644 app/javascript/flavours/glitch/features/explore/components/card.jsx

diff --git a/app/javascript/flavours/glitch/features/explore/components/card.jsx b/app/javascript/flavours/glitch/features/explore/components/card.jsx
new file mode 100644
index 00000000000000..85faa92e577020
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/explore/components/card.jsx
@@ -0,0 +1,88 @@
+import PropTypes from 'prop-types';
+import { useCallback } from 'react';
+
+import { FormattedMessage, useIntl, defineMessages } from 'react-intl';
+
+import { Link } from 'react-router-dom';
+
+import { useDispatch, useSelector } from 'react-redux';
+
+import CloseIcon from '@/material-icons/400-24px/close.svg?react';
+import { followAccount, unfollowAccount } from 'flavours/glitch/actions/accounts';
+import { dismissSuggestion } from 'flavours/glitch/actions/suggestions';
+import { Avatar } from 'flavours/glitch/components/avatar';
+import { Button } from 'flavours/glitch/components/button';
+import { DisplayName } from 'flavours/glitch/components/display_name';
+import { IconButton } from 'flavours/glitch/components/icon_button';
+import { domain } from 'flavours/glitch/initial_state';
+
+const messages = defineMessages({
+  follow: { id: 'account.follow', defaultMessage: 'Follow' },
+  unfollow: { id: 'account.unfollow', defaultMessage: 'Unfollow' },
+  dismiss: { id: 'follow_suggestions.dismiss', defaultMessage: "Don't show again" },
+});
+
+export const Card = ({ id, source }) => {
+  const intl = useIntl();
+  const account = useSelector(state => state.getIn(['accounts', id]));
+  const relationship = useSelector(state => state.getIn(['relationships', id]));
+  const dispatch = useDispatch();
+  const following = relationship?.get('following') ?? relationship?.get('requested');
+
+  const handleFollow = useCallback(() => {
+    if (following) {
+      dispatch(unfollowAccount(id));
+    } else {
+      dispatch(followAccount(id));
+    }
+  }, [id, following, dispatch]);
+
+  const handleDismiss = useCallback(() => {
+    dispatch(dismissSuggestion(id));
+  }, [id, dispatch]);
+
+  let label;
+
+  switch (source) {
+  case 'friends_of_friends':
+    label = <FormattedMessage id='follow_suggestions.friends_of_friends_longer' defaultMessage='Popular among people you follow' />;
+    break;
+  case 'similar_to_recently_followed':
+    label = <FormattedMessage id='follow_suggestions.similar_to_recently_followed_longer' defaultMessage='Similar to profiles you recently followed' />;
+    break;
+  case 'featured':
+    label = <FormattedMessage id='follow_suggestions.featured_longer' defaultMessage='Hand-picked by the {domain} team' values={{ domain }} />;
+    break;
+  case 'most_followed':
+    label = <FormattedMessage id='follow_suggestions.popular_suggestion_longer' defaultMessage='Popular on {domain}' values={{ domain }} />;
+    break;
+  case 'most_interactions':
+    label = <FormattedMessage id='follow_suggestions.popular_suggestion_longer' defaultMessage='Popular on {domain}' values={{ domain }} />;
+    break;
+  }
+
+  return (
+    <div className='explore__suggestions__card'>
+      <div className='explore__suggestions__card__source'>
+        {label}
+      </div>
+
+      <div className='explore__suggestions__card__body'>
+        <Link to={`/@${account.get('acct')}`}><Avatar account={account} size={48} /></Link>
+
+        <div className='explore__suggestions__card__body__main'>
+          <div className='explore__suggestions__card__body__main__name-button'>
+            <Link className='explore__suggestions__card__body__main__name-button__name' to={`/@${account.get('acct')}`}><DisplayName account={account} /></Link>
+            <IconButton iconComponent={CloseIcon} onClick={handleDismiss} title={intl.formatMessage(messages.dismiss)} />
+            <Button text={intl.formatMessage(following ? messages.unfollow : messages.follow)} secondary={following} onClick={handleFollow} />
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+};
+
+Card.propTypes = {
+  id: PropTypes.string.isRequired,
+  source: PropTypes.oneOf(['friends_of_friends', 'similar_to_recently_followed', 'featured', 'most_followed', 'most_interactions']),
+};
diff --git a/app/javascript/flavours/glitch/features/explore/suggestions.jsx b/app/javascript/flavours/glitch/features/explore/suggestions.jsx
index 1590e19aba89d2..18a40c28b6c3af 100644
--- a/app/javascript/flavours/glitch/features/explore/suggestions.jsx
+++ b/app/javascript/flavours/glitch/features/explore/suggestions.jsx
@@ -10,9 +10,10 @@ import { connect } from 'react-redux';
 
 import { fetchSuggestions, dismissSuggestion } from 'flavours/glitch/actions/suggestions';
 import { LoadingIndicator } from 'flavours/glitch/components/loading_indicator';
-import AccountCard from 'flavours/glitch/features/directory/components/account_card';
 import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router';
 
+import { Card } from './components/card';
+
 const mapStateToProps = state => ({
   suggestions: state.getIn(['suggestions', 'items']),
   isLoading: state.getIn(['suggestions', 'isLoading']),
@@ -59,7 +60,11 @@ class Suggestions extends PureComponent {
     return (
       <div className='explore__suggestions scrollable' data-nosnippet>
         {isLoading ? <LoadingIndicator /> : suggestions.map(suggestion => (
-          <AccountCard key={suggestion.get('account')} id={suggestion.get('account')} onDismiss={suggestion.get('source') === 'past_interactions' ? this.handleDismiss : null} />
+          <Card
+            key={suggestion.get('account')}
+            id={suggestion.get('account')}
+            source={suggestion.getIn(['sources', 0])}
+          />
         ))}
       </div>
     );
diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index 3a5420c35c7adb..a52f38465753b4 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -2229,7 +2229,10 @@ a .account__avatar {
   display: flex;
   align-items: center;
   gap: 8px;
+}
 
+.account__relationship,
+.explore__suggestions__card {
   .icon-button {
     border: 1px solid var(--background-border-color);
     border-radius: 4px;
@@ -3178,6 +3181,75 @@ $ui-header-logo-wordmark-width: 99px;
   display: none;
 }
 
+.explore__suggestions__card {
+  padding: 12px 16px;
+  gap: 8px;
+  display: flex;
+  flex-direction: column;
+  border-bottom: 1px solid var(--background-border-color);
+
+  &:last-child {
+    border-bottom: 0;
+  }
+
+  &__source {
+    padding-inline-start: 60px;
+    font-size: 13px;
+    line-height: 16px;
+    color: $dark-text-color;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    white-space: nowrap;
+  }
+
+  &__body {
+    display: flex;
+    gap: 12px;
+    align-items: center;
+
+    &__main {
+      flex: 1 1 auto;
+      display: flex;
+      flex-direction: column;
+      gap: 8px;
+      min-width: 0;
+
+      &__name-button {
+        display: flex;
+        align-items: center;
+        gap: 8px;
+
+        &__name {
+          display: block;
+          color: inherit;
+          text-decoration: none;
+          flex: 1 1 auto;
+          min-width: 0;
+        }
+
+        .button {
+          min-width: 80px;
+        }
+
+        .display-name {
+          font-size: 15px;
+          line-height: 20px;
+          color: $secondary-text-color;
+
+          strong {
+            font-weight: 700;
+          }
+
+          &__account {
+            color: $darker-text-color;
+            display: block;
+          }
+        }
+      }
+    }
+  }
+}
+
 @media screen and (max-width: $no-gap-breakpoint - 1px) {
   .columns-area__panels__pane--compositional {
     display: none;
@@ -7874,10 +7946,11 @@ img.modal-warning {
         content: '';
         position: absolute;
         bottom: -1px;
-        left: 0;
-        width: 100%;
+        left: 50%;
+        transform: translateX(-50%);
+        width: 40px;
         height: 3px;
-        border-radius: 4px;
+        border-radius: 4px 4px 0 0;
         background: $highlight-text-color;
       }
     }

From aac59a34ed120ad269aad70fb6600782cdd2bae8 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 25 Apr 2024 19:26:05 +0200
Subject: [PATCH 0932/2191] [Glitch] Add in-app notifications for moderation
 actions/warnings

Port 4ef0b48b951d65920d3a3d9cdfd099967c5e4f6d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../components/moderation_warning.tsx         | 78 +++++++++++++++++++
 .../notifications/components/notification.jsx | 25 ++++++
 .../flavours/glitch/reducers/notifications.js |  1 +
 .../flavours/glitch/styles/components.scss    |  3 +-
 4 files changed, 106 insertions(+), 1 deletion(-)
 create mode 100644 app/javascript/flavours/glitch/features/notifications/components/moderation_warning.tsx

diff --git a/app/javascript/flavours/glitch/features/notifications/components/moderation_warning.tsx b/app/javascript/flavours/glitch/features/notifications/components/moderation_warning.tsx
new file mode 100644
index 00000000000000..28c3aa19841191
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/notifications/components/moderation_warning.tsx
@@ -0,0 +1,78 @@
+import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
+
+import WarningIcon from '@/material-icons/400-24px/warning-fill.svg?react';
+import { Icon } from 'flavours/glitch/components/icon';
+
+// This needs to be kept in sync with app/models/account_warning.rb
+const messages = defineMessages({
+  none: {
+    id: 'notification.moderation_warning.action_none',
+    defaultMessage: 'Your account has received a moderation warning.',
+  },
+  disable: {
+    id: 'notification.moderation_warning.action_disable',
+    defaultMessage: 'Your account has been disabled.',
+  },
+  mark_statuses_as_sensitive: {
+    id: 'notification.moderation_warning.action_mark_statuses_as_sensitive',
+    defaultMessage: 'Some of your posts have been marked as sensitive.',
+  },
+  delete_statuses: {
+    id: 'notification.moderation_warning.action_delete_statuses',
+    defaultMessage: 'Some of your posts have been removed.',
+  },
+  sensitive: {
+    id: 'notification.moderation_warning.action_sensitive',
+    defaultMessage: 'Your posts will be marked as sensitive from now on.',
+  },
+  silence: {
+    id: 'notification.moderation_warning.action_silence',
+    defaultMessage: 'Your account has been limited.',
+  },
+  suspend: {
+    id: 'notification.moderation_warning.action_suspend',
+    defaultMessage: 'Your account has been suspended.',
+  },
+});
+
+interface Props {
+  action:
+    | 'none'
+    | 'disable'
+    | 'mark_statuses_as_sensitive'
+    | 'delete_statuses'
+    | 'sensitive'
+    | 'silence'
+    | 'suspend';
+  id: string;
+  hidden: boolean;
+}
+
+export const ModerationWarning: React.FC<Props> = ({ action, id, hidden }) => {
+  const intl = useIntl();
+
+  if (hidden) {
+    return null;
+  }
+
+  return (
+    <a
+      href={`/disputes/strikes/${id}`}
+      target='_blank'
+      rel='noopener noreferrer'
+      className='notification__moderation-warning'
+    >
+      <Icon id='warning' icon={WarningIcon} />
+
+      <div className='notification__moderation-warning__content'>
+        <p>{intl.formatMessage(messages[action])}</p>
+        <span className='link-button'>
+          <FormattedMessage
+            id='notification.moderation-warning.learn_more'
+            defaultMessage='Learn more'
+          />
+        </span>
+      </div>
+    </a>
+  );
+};
diff --git a/app/javascript/flavours/glitch/features/notifications/components/notification.jsx b/app/javascript/flavours/glitch/features/notifications/components/notification.jsx
index 211a319679c722..d03674bd573ebb 100644
--- a/app/javascript/flavours/glitch/features/notifications/components/notification.jsx
+++ b/app/javascript/flavours/glitch/features/notifications/components/notification.jsx
@@ -22,6 +22,7 @@ import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router';
 import FollowRequestContainer from '../containers/follow_request_container';
 import NotificationOverlayContainer from '../containers/overlay_container';
 
+import { ModerationWarning } from './moderation_warning';
 import { RelationshipsSeveranceEvent } from './relationships_severance_event';
 import Report from './report';
 
@@ -30,6 +31,7 @@ const messages = defineMessages({
   adminSignUp: { id: 'notification.admin.sign_up', defaultMessage: '{name} signed up' },
   adminReport: { id: 'notification.admin.report', defaultMessage: '{name} reported {target}' },
   relationshipsSevered: { id: 'notification.relationships_severance_event', defaultMessage: 'Lost connections with {name}' },
+  moderationWarning: { id: 'notification.moderation_warning', defaultMessage: 'Your have received a moderation warning' },
 });
 
 const notificationForScreenReader = (intl, message, timestamp) => {
@@ -328,6 +330,27 @@ class Notification extends ImmutablePureComponent {
     );
   }
 
+  renderModerationWarning (notification) {
+    const { intl, unread, hidden } = this.props;
+    const warning = notification.get('moderation_warning');
+
+    if (!warning) {
+      return null;
+    }
+
+    return (
+      <HotKeys handlers={this.getHandlers()}>
+        <div className={classNames('notification notification-moderation-warning focusable', { unread })} tabIndex={0} aria-label={notificationForScreenReader(intl, intl.formatMessage(messages.moderationWarning), notification.get('created_at'))}>
+          <ModerationWarning
+            action={warning.get('action')}
+            id={warning.get('id')}
+            hidden={hidden}
+          />
+        </div>
+      </HotKeys>
+    );
+  }
+
   renderAdminSignUp (notification, account, link) {
     const { intl, unread } = this.props;
 
@@ -423,6 +446,8 @@ class Notification extends ImmutablePureComponent {
       return this.renderPoll(notification);
     case 'severed_relationships':
       return this.renderRelationshipsSevered(notification);
+    case 'moderation_warning':
+      return this.renderModerationWarning(notification);
     case 'admin.sign_up':
       return this.renderAdminSignUp(notification, account, link);
     case 'admin.report':
diff --git a/app/javascript/flavours/glitch/reducers/notifications.js b/app/javascript/flavours/glitch/reducers/notifications.js
index 6edf84b67a134f..c5f36dd94aecbb 100644
--- a/app/javascript/flavours/glitch/reducers/notifications.js
+++ b/app/javascript/flavours/glitch/reducers/notifications.js
@@ -62,6 +62,7 @@ export const notificationToMap = (notification, markForDelete = false) => Immuta
   status: notification.status ? notification.status.id : null,
   report: notification.report ? fromJS(notification.report) : null,
   event: notification.event ? fromJS(notification.event) : null,
+  moderation_warning: notification.moderation_warning ? fromJS(notification.moderation_warning) : null,
 });
 
 const normalizeNotification = (state, notification, usePendingItems) => {
diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index a52f38465753b4..96f0c81665a6a5 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -2394,7 +2394,8 @@ a.account__display-name {
   }
 }
 
-.notification__relationships-severance-event {
+.notification__relationships-severance-event,
+.notification__moderation-warning {
   display: flex;
   gap: 16px;
   color: $secondary-text-color;

From a4ce53df2721a4ec16bbc41001f8f1c430204490 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 26 Apr 2024 17:33:15 +0200
Subject: [PATCH 0933/2191] [Glitch] Change moderation warning notification
 icon

Port de4a7bf53159f72a9a122bf8df21e8d5f4ad7512 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../features/notifications/components/moderation_warning.tsx  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/javascript/flavours/glitch/features/notifications/components/moderation_warning.tsx b/app/javascript/flavours/glitch/features/notifications/components/moderation_warning.tsx
index 28c3aa19841191..2fd19c51080344 100644
--- a/app/javascript/flavours/glitch/features/notifications/components/moderation_warning.tsx
+++ b/app/javascript/flavours/glitch/features/notifications/components/moderation_warning.tsx
@@ -1,6 +1,6 @@
 import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
 
-import WarningIcon from '@/material-icons/400-24px/warning-fill.svg?react';
+import GavelIcon from '@/material-icons/400-24px/gavel.svg?react';
 import { Icon } from 'flavours/glitch/components/icon';
 
 // This needs to be kept in sync with app/models/account_warning.rb
@@ -62,7 +62,7 @@ export const ModerationWarning: React.FC<Props> = ({ action, id, hidden }) => {
       rel='noopener noreferrer'
       className='notification__moderation-warning'
     >
-      <Icon id='warning' icon={WarningIcon} />
+      <Icon id='warning' icon={GavelIcon} />
 
       <div className='notification__moderation-warning__content'>
         <p>{intl.formatMessage(messages[action])}</p>

From 552e09d57f195633e635b9d036b1c74fd1b2a643 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Fri, 26 Apr 2024 19:11:27 +0200
Subject: [PATCH 0934/2191] [Glitch] Fix marker thunks to not ignore eslint
 directives for the whole file

Port 65093c619fdd1b18a4cf0c288051d8c524d5f434 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/actions/markers.ts | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/javascript/flavours/glitch/actions/markers.ts b/app/javascript/flavours/glitch/actions/markers.ts
index 78362a9ca302e4..8fc7d1fb402343 100644
--- a/app/javascript/flavours/glitch/actions/markers.ts
+++ b/app/javascript/flavours/glitch/actions/markers.ts
@@ -3,7 +3,7 @@ import { List as ImmutableList } from 'immutable';
 import { debounce } from 'lodash';
 
 import type { MarkerJSON } from 'flavours/glitch/api_types/markers';
-import type { RootState } from 'flavours/glitch/store';
+import type { AppDispatch, RootState } from 'flavours/glitch/store';
 import { createAppAsyncThunk } from 'flavours/glitch/store/typed_functions';
 
 import api, { authorizationTokenFromState } from '../api';
@@ -72,18 +72,21 @@ interface MarkerParam {
 }
 
 function getLastHomeId(state: RootState): string | undefined {
-  /* eslint-disable @typescript-eslint/no-unsafe-return, @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access */
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-return
   return (
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-call
     state
       // @ts-expect-error state.timelines is not yet typed
       .getIn(['timelines', 'home', 'items'], ImmutableList())
       // @ts-expect-error state.timelines is not yet typed
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
       .find((item) => item !== null)
   );
 }
 
 function getLastNotificationId(state: RootState): string | undefined {
   // @ts-expect-error state.notifications is not yet typed
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-return, @typescript-eslint/no-unsafe-call
   return state.getIn(['notifications', 'lastReadId']);
 }
 
@@ -132,8 +135,8 @@ export const submitMarkersAction = createAppAsyncThunk<{
 });
 
 const debouncedSubmitMarkers = debounce(
-  (dispatch) => {
-    dispatch(submitMarkersAction());
+  (dispatch: AppDispatch) => {
+    void dispatch(submitMarkersAction());
   },
   300000,
   {

From defd1e4024ffb89b8dbcc82fb7384903cd2c3e79 Mon Sep 17 00:00:00 2001
From: David Beck <davbeck@users.noreply.github.com>
Date: Mon, 29 Apr 2024 00:55:58 -0700
Subject: [PATCH 0935/2191] [Glitch] Remove home marker updates

Port 4f4b77920eeb3ba65346862d489945494dfeab64 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/actions/markers.ts        | 22 -------------------
 1 file changed, 22 deletions(-)

diff --git a/app/javascript/flavours/glitch/actions/markers.ts b/app/javascript/flavours/glitch/actions/markers.ts
index 8fc7d1fb402343..3f810cf99ae523 100644
--- a/app/javascript/flavours/glitch/actions/markers.ts
+++ b/app/javascript/flavours/glitch/actions/markers.ts
@@ -1,5 +1,3 @@
-import { List as ImmutableList } from 'immutable';
-
 import { debounce } from 'lodash';
 
 import type { MarkerJSON } from 'flavours/glitch/api_types/markers';
@@ -71,19 +69,6 @@ interface MarkerParam {
   last_read_id?: string;
 }
 
-function getLastHomeId(state: RootState): string | undefined {
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-return
-  return (
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-call
-    state
-      // @ts-expect-error state.timelines is not yet typed
-      .getIn(['timelines', 'home', 'items'], ImmutableList())
-      // @ts-expect-error state.timelines is not yet typed
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-      .find((item) => item !== null)
-  );
-}
-
 function getLastNotificationId(state: RootState): string | undefined {
   // @ts-expect-error state.notifications is not yet typed
   // eslint-disable-next-line @typescript-eslint/no-unsafe-return, @typescript-eslint/no-unsafe-call
@@ -93,15 +78,8 @@ function getLastNotificationId(state: RootState): string | undefined {
 const buildPostMarkersParams = (state: RootState) => {
   const params = {} as { home?: MarkerParam; notifications?: MarkerParam };
 
-  const lastHomeId = getLastHomeId(state);
   const lastNotificationId = getLastNotificationId(state);
 
-  if (lastHomeId && compareId(lastHomeId, state.markers.home) > 0) {
-    params.home = {
-      last_read_id: lastHomeId,
-    };
-  }
-
   if (
     lastNotificationId &&
     lastNotificationId !== '0' &&

From fe7db7905fe9b8a120b6f6f7169eefd3df976727 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Mon, 29 Apr 2024 10:02:41 +0200
Subject: [PATCH 0936/2191] [Glitch] Convert easy entrypoints files to
 Typescript

Port 36909065b544d06e8487f1e0679e595fd01a7f22 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../entrypoints/{application.js => application.ts} |  4 ++--
 .../glitch/entrypoints/{error.js => error.ts}      |  6 +++++-
 .../glitch/entrypoints/{inert.js => inert.ts}      |  0
 .../glitch/entrypoints/{mailer.js => mailer.ts}    |  0
 .../glitch/entrypoints/{share.jsx => share.tsx}    | 14 +++++++++-----
 5 files changed, 16 insertions(+), 8 deletions(-)
 rename app/javascript/flavours/glitch/entrypoints/{application.js => application.ts} (80%)
 rename app/javascript/flavours/glitch/entrypoints/{error.js => error.ts} (66%)
 rename app/javascript/flavours/glitch/entrypoints/{inert.js => inert.ts} (100%)
 rename app/javascript/flavours/glitch/entrypoints/{mailer.js => mailer.ts} (100%)
 rename app/javascript/flavours/glitch/entrypoints/{share.jsx => share.tsx} (74%)

diff --git a/app/javascript/flavours/glitch/entrypoints/application.js b/app/javascript/flavours/glitch/entrypoints/application.ts
similarity index 80%
rename from app/javascript/flavours/glitch/entrypoints/application.js
rename to app/javascript/flavours/glitch/entrypoints/application.ts
index a0b5d714c4def7..3659d8212b98f1 100644
--- a/app/javascript/flavours/glitch/entrypoints/application.js
+++ b/app/javascript/flavours/glitch/entrypoints/application.ts
@@ -2,7 +2,7 @@ import '@/entrypoints/public-path';
 
 import { start } from 'flavours/glitch/common';
 import { loadLocale } from 'flavours/glitch/locales';
-import main from "flavours/glitch/main";
+import main from 'flavours/glitch/main';
 import { loadPolyfills } from 'flavours/glitch/polyfills';
 
 start();
@@ -10,6 +10,6 @@ start();
 loadPolyfills()
   .then(loadLocale)
   .then(main)
-  .catch(e => {
+  .catch((e: unknown) => {
     console.error(e);
   });
diff --git a/app/javascript/flavours/glitch/entrypoints/error.js b/app/javascript/flavours/glitch/entrypoints/error.ts
similarity index 66%
rename from app/javascript/flavours/glitch/entrypoints/error.js
rename to app/javascript/flavours/glitch/entrypoints/error.ts
index 4315d20de14b1d..9e067d4caa2b55 100644
--- a/app/javascript/flavours/glitch/entrypoints/error.js
+++ b/app/javascript/flavours/glitch/entrypoints/error.ts
@@ -2,7 +2,9 @@ import '@/entrypoints/public-path';
 import ready from 'flavours/glitch/ready';
 
 ready(() => {
-  const image = document.querySelector('img');
+  const image = document.querySelector<HTMLImageElement>('img');
+
+  if (!image) return;
 
   image.addEventListener('mouseenter', () => {
     image.src = '/oops.gif';
@@ -11,4 +13,6 @@ ready(() => {
   image.addEventListener('mouseleave', () => {
     image.src = '/oops.png';
   });
+}).catch((e: unknown) => {
+  console.error(e);
 });
diff --git a/app/javascript/flavours/glitch/entrypoints/inert.js b/app/javascript/flavours/glitch/entrypoints/inert.ts
similarity index 100%
rename from app/javascript/flavours/glitch/entrypoints/inert.js
rename to app/javascript/flavours/glitch/entrypoints/inert.ts
diff --git a/app/javascript/flavours/glitch/entrypoints/mailer.js b/app/javascript/flavours/glitch/entrypoints/mailer.ts
similarity index 100%
rename from app/javascript/flavours/glitch/entrypoints/mailer.js
rename to app/javascript/flavours/glitch/entrypoints/mailer.ts
diff --git a/app/javascript/flavours/glitch/entrypoints/share.jsx b/app/javascript/flavours/glitch/entrypoints/share.tsx
similarity index 74%
rename from app/javascript/flavours/glitch/entrypoints/share.jsx
rename to app/javascript/flavours/glitch/entrypoints/share.tsx
index 62d2f6df42157a..0eda4425068951 100644
--- a/app/javascript/flavours/glitch/entrypoints/share.jsx
+++ b/app/javascript/flavours/glitch/entrypoints/share.tsx
@@ -16,7 +16,7 @@ function loaded() {
 
     if (!attr) return;
 
-    const props = JSON.parse(attr);
+    const props = JSON.parse(attr) as object;
     const root = createRoot(mountNode);
 
     root.render(<ComposeContainer {...props} />);
@@ -24,9 +24,13 @@ function loaded() {
 }
 
 function main() {
-  ready(loaded);
+  ready(loaded).catch((error: unknown) => {
+    console.error(error);
+  });
 }
 
-loadPolyfills().then(main).catch(error => {
-  console.error(error);
-});
+loadPolyfills()
+  .then(main)
+  .catch((error: unknown) => {
+    console.error(error);
+  });

From 494d28bb563caac94f8f4fda3683525b69a6f69f Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Mon, 29 Apr 2024 10:23:05 +0200
Subject: [PATCH 0937/2191] [Glitch] Convert `entrypoints/sign_up` to
 Typescript

Port 4527e012daa61dc07258eaedf3e03179b59fca8d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/entrypoints/sign_up.js    | 42 ----------------
 .../flavours/glitch/entrypoints/sign_up.ts    | 48 +++++++++++++++++++
 2 files changed, 48 insertions(+), 42 deletions(-)
 delete mode 100644 app/javascript/flavours/glitch/entrypoints/sign_up.js
 create mode 100644 app/javascript/flavours/glitch/entrypoints/sign_up.ts

diff --git a/app/javascript/flavours/glitch/entrypoints/sign_up.js b/app/javascript/flavours/glitch/entrypoints/sign_up.js
deleted file mode 100644
index ded1d4cbdea3b6..00000000000000
--- a/app/javascript/flavours/glitch/entrypoints/sign_up.js
+++ /dev/null
@@ -1,42 +0,0 @@
-import '@/entrypoints/public-path';
-import axios from 'axios';
-
-import ready from 'flavours/glitch/ready';
-
-ready(() => {
-  setInterval(() => {
-    axios.get('/api/v1/emails/check_confirmation').then((response) => {
-      if (response.data) {
-        window.location = '/start';
-      }
-    }).catch(error => {
-      console.error(error);
-    });
-  }, 5000);
-
-  document.querySelectorAll('.timer-button').forEach(button => {
-    let counter = 30;
-
-    const container = document.createElement('span');
-
-    const updateCounter = () => {
-      container.innerText = ` (${counter})`;
-    };
-
-    updateCounter();
-
-    const countdown = setInterval(() => {
-      counter--;
-
-      if (counter === 0) {
-        button.disabled = false;
-        button.removeChild(container);
-        clearInterval(countdown);
-      } else {
-        updateCounter();
-      }
-    }, 1000);
-
-    button.appendChild(container);
-  });
-});
diff --git a/app/javascript/flavours/glitch/entrypoints/sign_up.ts b/app/javascript/flavours/glitch/entrypoints/sign_up.ts
new file mode 100644
index 00000000000000..18e293154623c4
--- /dev/null
+++ b/app/javascript/flavours/glitch/entrypoints/sign_up.ts
@@ -0,0 +1,48 @@
+import '@/entrypoints/public-path';
+import axios from 'axios';
+
+import ready from 'flavours/glitch/ready';
+
+async function checkConfirmation() {
+  const response = await axios.get('/api/v1/emails/check_confirmation');
+
+  if (response.data) {
+    window.location.href = '/start';
+  }
+}
+
+ready(() => {
+  setInterval(() => {
+    void checkConfirmation();
+  }, 5000);
+
+  document
+    .querySelectorAll<HTMLButtonElement>('button.timer-button')
+    .forEach((button) => {
+      let counter = 30;
+
+      const container = document.createElement('span');
+
+      const updateCounter = () => {
+        container.innerText = ` (${counter})`;
+      };
+
+      updateCounter();
+
+      const countdown = setInterval(() => {
+        counter--;
+
+        if (counter === 0) {
+          button.disabled = false;
+          button.removeChild(container);
+          clearInterval(countdown);
+        } else {
+          updateCounter();
+        }
+      }, 1000);
+
+      button.appendChild(container);
+    });
+}).catch((e: unknown) => {
+  throw e;
+});

From e62595c9667151ec5038da9232639c97250f9c64 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Mon, 29 Apr 2024 11:29:59 +0200
Subject: [PATCH 0938/2191] [Glitch] Remove usage of deprecated `defaultTypes`
 on React functional components

Port b9b4db483cc588a2eb334b63fe6740c8dad9b57b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/components/badge.jsx | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/javascript/flavours/glitch/components/badge.jsx b/app/javascript/flavours/glitch/components/badge.jsx
index 5e0b2587bd6560..2a335d7f5062fb 100644
--- a/app/javascript/flavours/glitch/components/badge.jsx
+++ b/app/javascript/flavours/glitch/components/badge.jsx
@@ -7,7 +7,7 @@ import PersonIcon from '@/material-icons/400-24px/person.svg?react';
 import SmartToyIcon from '@/material-icons/400-24px/smart_toy.svg?react';
 
 
-export const Badge = ({ icon, label, domain, roleId }) => (
+export const Badge = ({ icon = <PersonIcon />, label, domain, roleId }) => (
   <div className='account-role' data-account-role-id={roleId}>
     {icon}
     {label}
@@ -22,10 +22,6 @@ Badge.propTypes = {
   roleId: PropTypes.string
 };
 
-Badge.defaultProps = {
-  icon: <PersonIcon />,
-};
-
 export const GroupBadge = () => (
   <Badge icon={<GroupsIcon />} label={<FormattedMessage id='account.badges.group' defaultMessage='Group' />} />
 );

From 6662d604c161716856ca5a7f55d78d4a63207040 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 29 Apr 2024 11:55:41 +0200
Subject: [PATCH 0939/2191] [Glitch] Add loading indicator and empty result
 message to advanced interface search

Port 7d3fe2b4c3cd9511df8f8026890c71b2119719f3 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../compose/components/search_results.jsx     | 124 +++++++++---------
 .../containers/search_results_container.js    |  20 ---
 .../glitch/features/compose/index.jsx         |   4 +-
 .../flavours/glitch/reducers/search.js        |   1 +
 4 files changed, 68 insertions(+), 81 deletions(-)
 delete mode 100644 app/javascript/flavours/glitch/features/compose/containers/search_results_container.js

diff --git a/app/javascript/flavours/glitch/features/compose/components/search_results.jsx b/app/javascript/flavours/glitch/features/compose/components/search_results.jsx
index 3df025db558e7e..350fc41c51568a 100644
--- a/app/javascript/flavours/glitch/features/compose/components/search_results.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/search_results.jsx
@@ -1,16 +1,16 @@
-import PropTypes from 'prop-types';
+import { useCallback } from 'react';
 
 import { FormattedMessage } from 'react-intl';
 
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import ImmutablePureComponent from 'react-immutable-pure-component';
-
 import FindInPageIcon from '@/material-icons/400-24px/find_in_page.svg?react';
 import PeopleIcon from '@/material-icons/400-24px/group.svg?react';
 import TagIcon from '@/material-icons/400-24px/tag.svg?react';
+import { expandSearch } from 'flavours/glitch/actions/search';
 import { Icon }  from 'flavours/glitch/components/icon';
 import { LoadMore } from 'flavours/glitch/components/load_more';
+import { LoadingIndicator } from 'flavours/glitch/components/loading_indicator';
 import { SearchSection } from 'flavours/glitch/features/explore/components/search_section';
+import { useAppDispatch, useAppSelector } from 'flavours/glitch/store';
 
 import { ImmutableHashtag as Hashtag } from '../../../components/hashtag';
 import AccountContainer from '../../../containers/account_container';
@@ -26,62 +26,68 @@ const withoutLastResult = list => {
   }
 };
 
-class SearchResults extends ImmutablePureComponent {
-
-  static propTypes = {
-    results: ImmutablePropTypes.map.isRequired,
-    expandSearch: PropTypes.func.isRequired,
-    searchTerm: PropTypes.string,
-  };
-
-  handleLoadMoreAccounts = () => this.props.expandSearch('accounts');
-
-  handleLoadMoreStatuses = () => this.props.expandSearch('statuses');
-
-  handleLoadMoreHashtags = () => this.props.expandSearch('hashtags');
-
-  render () {
-    const { results } = this.props;
-
-    let accounts, statuses, hashtags;
-
-    if (results.get('accounts') && results.get('accounts').size > 0) {
-      accounts = (
-        <SearchSection title={<><Icon id='users' icon={PeopleIcon} /><FormattedMessage id='search_results.accounts' defaultMessage='Profiles' /></>}>
-          {withoutLastResult(results.get('accounts')).map(accountId => <AccountContainer key={accountId} id={accountId} />)}
-          {(results.get('accounts').size > INITIAL_PAGE_LIMIT && results.get('accounts').size % INITIAL_PAGE_LIMIT === 1) && <LoadMore visible onClick={this.handleLoadMoreAccounts} />}
-        </SearchSection>
-      );
-    }
-
-    if (results.get('hashtags') && results.get('hashtags').size > 0) {
-      hashtags = (
-        <SearchSection title={<><Icon id='hashtag' icon={TagIcon} /><FormattedMessage id='search_results.hashtags' defaultMessage='Hashtags' /></>}>
-          {withoutLastResult(results.get('hashtags')).map(hashtag => <Hashtag key={hashtag.get('name')} hashtag={hashtag} />)}
-          {(results.get('hashtags').size > INITIAL_PAGE_LIMIT && results.get('hashtags').size % INITIAL_PAGE_LIMIT === 1) && <LoadMore visible onClick={this.handleLoadMoreHashtags} />}
-        </SearchSection>
-      );
-    }
-
-    if (results.get('statuses') && results.get('statuses').size > 0) {
-      statuses = (
-        <SearchSection title={<><Icon id='quote-right' icon={FindInPageIcon} /><FormattedMessage id='search_results.statuses' defaultMessage='Posts' /></>}>
-          {withoutLastResult(results.get('statuses')).map(statusId => <StatusContainer key={statusId} id={statusId} />)}
-          {(results.get('statuses').size > INITIAL_PAGE_LIMIT && results.get('statuses').size % INITIAL_PAGE_LIMIT === 1) && <LoadMore visible onClick={this.handleLoadMoreStatuses} />}
-        </SearchSection>
-      );
-    }
-
-
-    return (
-      <div className='search-results'>
-        {accounts}
-        {hashtags}
-        {statuses}
-      </div>
+export const SearchResults = () => {
+  const results = useAppSelector((state) => state.getIn(['search', 'results']));
+  const isLoading = useAppSelector((state) => state.getIn(['search', 'isLoading']));
+
+  const dispatch = useAppDispatch();
+
+  const handleLoadMoreAccounts = useCallback(() => {
+    dispatch(expandSearch('accounts'));
+  }, [dispatch]);
+
+  const handleLoadMoreStatuses = useCallback(() => {
+    dispatch(expandSearch('statuses'));
+  }, [dispatch]);
+
+  const handleLoadMoreHashtags = useCallback(() => {
+    dispatch(expandSearch('hashtags'));
+  }, [dispatch]);
+
+  let accounts, statuses, hashtags;
+
+  if (results.get('accounts') && results.get('accounts').size > 0) {
+    accounts = (
+      <SearchSection title={<><Icon id='users' icon={PeopleIcon} /><FormattedMessage id='search_results.accounts' defaultMessage='Profiles' /></>}>
+        {withoutLastResult(results.get('accounts')).map(accountId => <AccountContainer key={accountId} id={accountId} />)}
+        {(results.get('accounts').size > INITIAL_PAGE_LIMIT && results.get('accounts').size % INITIAL_PAGE_LIMIT === 1) && <LoadMore visible onClick={handleLoadMoreAccounts} />}
+      </SearchSection>
     );
   }
 
-}
+  if (results.get('hashtags') && results.get('hashtags').size > 0) {
+    hashtags = (
+      <SearchSection title={<><Icon id='hashtag' icon={TagIcon} /><FormattedMessage id='search_results.hashtags' defaultMessage='Hashtags' /></>}>
+        {withoutLastResult(results.get('hashtags')).map(hashtag => <Hashtag key={hashtag.get('name')} hashtag={hashtag} />)}
+        {(results.get('hashtags').size > INITIAL_PAGE_LIMIT && results.get('hashtags').size % INITIAL_PAGE_LIMIT === 1) && <LoadMore visible onClick={handleLoadMoreHashtags} />}
+      </SearchSection>
+    );
+  }
 
-export default SearchResults;
+  if (results.get('statuses') && results.get('statuses').size > 0) {
+    statuses = (
+      <SearchSection title={<><Icon id='quote-right' icon={FindInPageIcon} /><FormattedMessage id='search_results.statuses' defaultMessage='Posts' /></>}>
+        {withoutLastResult(results.get('statuses')).map(statusId => <StatusContainer key={statusId} id={statusId} />)}
+        {(results.get('statuses').size > INITIAL_PAGE_LIMIT && results.get('statuses').size % INITIAL_PAGE_LIMIT === 1) && <LoadMore visible onClick={handleLoadMoreStatuses} />}
+      </SearchSection>
+    );
+  }
+
+  return (
+    <div className='search-results'>
+      {!accounts && !hashtags && !statuses && (
+        isLoading ? (
+          <LoadingIndicator />
+        ) : (
+          <div className='empty-column-indicator'>
+            <FormattedMessage id='search_results.nothing_found' defaultMessage='Could not find anything for these search terms' />
+          </div>
+        )
+      )}
+      {accounts}
+      {hashtags}
+      {statuses}
+    </div>
+  );
+
+};
diff --git a/app/javascript/flavours/glitch/features/compose/containers/search_results_container.js b/app/javascript/flavours/glitch/features/compose/containers/search_results_container.js
deleted file mode 100644
index 7287a022b4be25..00000000000000
--- a/app/javascript/flavours/glitch/features/compose/containers/search_results_container.js
+++ /dev/null
@@ -1,20 +0,0 @@
-import { connect } from 'react-redux';
-
-import { expandSearch } from 'flavours/glitch/actions/search';
-import { fetchSuggestions, dismissSuggestion } from 'flavours/glitch/actions/suggestions';
-
-import SearchResults from '../components/search_results';
-
-const mapStateToProps = state => ({
-  results: state.getIn(['search', 'results']),
-  suggestions: state.getIn(['suggestions', 'items']),
-  searchTerm: state.getIn(['search', 'searchTerm']),
-});
-
-const mapDispatchToProps = dispatch => ({
-  fetchSuggestions: () => dispatch(fetchSuggestions()),
-  expandSearch: type => dispatch(expandSearch(type)),
-  dismissSuggestion: account => dispatch(dismissSuggestion(account.get('id'))),
-});
-
-export default connect(mapStateToProps, mapDispatchToProps)(SearchResults);
diff --git a/app/javascript/flavours/glitch/features/compose/index.jsx b/app/javascript/flavours/glitch/features/compose/index.jsx
index 0bba28b78702ba..b59fafe0481676 100644
--- a/app/javascript/flavours/glitch/features/compose/index.jsx
+++ b/app/javascript/flavours/glitch/features/compose/index.jsx
@@ -32,9 +32,9 @@ import { mascot } from '../../initial_state';
 import { isMobile } from '../../is_mobile';
 import Motion from '../ui/util/optional_motion';
 
+import { SearchResults } from './components/search_results';
 import ComposeFormContainer from './containers/compose_form_container';
 import SearchContainer from './containers/search_container';
-import SearchResultsContainer from './containers/search_results_container';
 
 const messages = defineMessages({
   start: { id: 'getting_started.heading', defaultMessage: 'Getting started' },
@@ -183,7 +183,7 @@ class Compose extends PureComponent {
             <Motion defaultStyle={{ x: -100 }} style={{ x: spring(showSearch ? 0 : -100, { stiffness: 210, damping: 20 }) }}>
               {({ x }) => (
                 <div className='drawer__inner darker' style={{ transform: `translateX(${x}%)`, visibility: x === -100 ? 'hidden' : 'visible' }}>
-                  <SearchResultsContainer />
+                  <SearchResults />
                 </div>
               )}
             </Motion>
diff --git a/app/javascript/flavours/glitch/reducers/search.js b/app/javascript/flavours/glitch/reducers/search.js
index 72835eb91745f3..7828d49eeedd9a 100644
--- a/app/javascript/flavours/glitch/reducers/search.js
+++ b/app/javascript/flavours/glitch/reducers/search.js
@@ -50,6 +50,7 @@ export default function search(state = initialState, action) {
     return state.set('hidden', true);
   case SEARCH_FETCH_REQUEST:
     return state.withMutations(map => {
+      map.set('results', ImmutableMap());
       map.set('isLoading', true);
       map.set('submitted', true);
       map.set('type', action.searchType);

From 4b82dc84f520f459063c2a7c9ad59653a2a95181 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 1 May 2024 01:39:28 +0200
Subject: [PATCH 0940/2191] [Glitch] Change width breakpoint for mobile
 placement behavior

Port 26e10aa203d18e452cdf836209875f05a6e01882 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/styles/components.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index 96f0c81665a6a5..2fcee38eb44034 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -6114,7 +6114,7 @@ a.status-card {
   user-select: text;
   display: flex;
 
-  @media screen and (max-width: $no-gap-breakpoint) {
+  @media screen and (width <= 630px) {
     margin-top: auto;
   }
 }

From b6ada33ad4d98015df27878352955a4d5bc7d630 Mon Sep 17 00:00:00 2001
From: mogaminsk <mgmnjp@icloud.com>
Date: Thu, 2 May 2024 18:40:18 +0900
Subject: [PATCH 0941/2191] [Glitch] Fix word breaking in filtered
 notifications badge

Port 616e2f26668d578ae81043a3836e881178d3e806 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/styles/components.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index 2fcee38eb44034..f5518907ce18cd 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -10733,6 +10733,7 @@ noscript {
     font-weight: 500;
     font-size: 11px;
     line-height: 16px;
+    word-break: keep-all;
 
     &__badge {
       background: $ui-button-background-color;

From c59f6ef5b8789f9b7879ef5d3491231f3a36cb4a Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Thu, 2 May 2024 14:02:13 +0200
Subject: [PATCH 0942/2191] [Glitch] Convert
 `entrypoints/two_factor_authentication` to Typescript

Port 9e260014c72fa83740d70d2d603e836f86e64b55 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../entrypoints/two_factor_authentication.js  | 119 -----------
 .../entrypoints/two_factor_authentication.ts  | 197 ++++++++++++++++++
 2 files changed, 197 insertions(+), 119 deletions(-)
 delete mode 100644 app/javascript/flavours/glitch/entrypoints/two_factor_authentication.js
 create mode 100644 app/javascript/flavours/glitch/entrypoints/two_factor_authentication.ts

diff --git a/app/javascript/flavours/glitch/entrypoints/two_factor_authentication.js b/app/javascript/flavours/glitch/entrypoints/two_factor_authentication.js
deleted file mode 100644
index 8b606fcc7abe6d..00000000000000
--- a/app/javascript/flavours/glitch/entrypoints/two_factor_authentication.js
+++ /dev/null
@@ -1,119 +0,0 @@
-import * as WebAuthnJSON from '@github/webauthn-json';
-import axios from 'axios';
-
-import ready from 'flavours/glitch/ready';
-import 'regenerator-runtime/runtime';
-
-function getCSRFToken() {
-  var CSRFSelector = document.querySelector('meta[name="csrf-token"]');
-  if (CSRFSelector) {
-    return CSRFSelector.getAttribute('content');
-  } else {
-    return null;
-  }
-}
-
-function hideFlashMessages() {
-  Array.from(document.getElementsByClassName('flash-message')).forEach(function(flashMessage) {
-    flashMessage.classList.add('hidden');
-  });
-}
-
-function callback(url, body) {
-  axios.post(url, JSON.stringify(body), {
-    headers: {
-      'Content-Type': 'application/json',
-      'Accept': 'application/json',
-      'X-CSRF-Token': getCSRFToken(),
-    },
-    credentials: 'same-origin',
-  }).then(function(response) {
-    window.location.replace(response.data.redirect_path);
-  }).catch(function(error) {
-    if (error.response.status === 422) {
-      const errorMessage = document.getElementById('security-key-error-message');
-      errorMessage.classList.remove('hidden');
-      console.error(error.response.data.error);
-    } else {
-      console.error(error);
-    }
-  });
-}
-
-ready(() => {
-  if (!WebAuthnJSON.supported()) {
-    const unsupported_browser_message = document.getElementById('unsupported-browser-message');
-    if (unsupported_browser_message) {
-      unsupported_browser_message.classList.remove('hidden');
-      document.querySelector('.btn.js-webauthn').disabled = true;
-    }
-  }
-
-
-  const webAuthnCredentialRegistrationForm = document.getElementById('new_webauthn_credential');
-  if (webAuthnCredentialRegistrationForm) {
-    webAuthnCredentialRegistrationForm.addEventListener('submit', (event) => {
-      event.preventDefault();
-
-      var nickname = event.target.querySelector('input[name="new_webauthn_credential[nickname]"]');
-      if (nickname.value) {
-        axios.get('/settings/security_keys/options')
-          .then((response) => {
-            const credentialOptions = response.data;
-
-            WebAuthnJSON.create({ 'publicKey': credentialOptions }).then((credential) => {
-              var params = { 'credential': credential, 'nickname': nickname.value };
-              callback('/settings/security_keys', params);
-            }).catch((error) => {
-              const errorMessage = document.getElementById('security-key-error-message');
-              errorMessage.classList.remove('hidden');
-              console.error(error);
-            });
-          }).catch((error) => {
-            console.error(error.response.data.error);
-          });
-      } else {
-        nickname.focus();
-      }
-    });
-  }
-
-  const webAuthnCredentialAuthenticationForm = document.getElementById('webauthn-form');
-  if (webAuthnCredentialAuthenticationForm) {
-    webAuthnCredentialAuthenticationForm.addEventListener('submit', (event) => {
-      event.preventDefault();
-
-      axios.get('sessions/security_key_options')
-        .then((response) => {
-          const credentialOptions = response.data;
-
-          WebAuthnJSON.get({ 'publicKey': credentialOptions }).then((credential) => {
-            var params = { 'user': { 'credential': credential } };
-            callback('sign_in', params);
-          }).catch((error) => {
-            const errorMessage = document.getElementById('security-key-error-message');
-            errorMessage.classList.remove('hidden');
-            console.error(error);
-          });
-        }).catch((error) => {
-          console.error(error.response.data.error);
-        });
-    });
-
-    const otpAuthenticationForm = document.getElementById('otp-authentication-form');
-
-    const linkToOtp = document.getElementById('link-to-otp');
-    linkToOtp.addEventListener('click', () => {
-      webAuthnCredentialAuthenticationForm.classList.add('hidden');
-      otpAuthenticationForm.classList.remove('hidden');
-      hideFlashMessages();
-    });
-
-    const linkToWebAuthn = document.getElementById('link-to-webauthn');
-    linkToWebAuthn.addEventListener('click', () => {
-      otpAuthenticationForm.classList.add('hidden');
-      webAuthnCredentialAuthenticationForm.classList.remove('hidden');
-      hideFlashMessages();
-    });
-  }
-});
diff --git a/app/javascript/flavours/glitch/entrypoints/two_factor_authentication.ts b/app/javascript/flavours/glitch/entrypoints/two_factor_authentication.ts
new file mode 100644
index 00000000000000..31061671171cee
--- /dev/null
+++ b/app/javascript/flavours/glitch/entrypoints/two_factor_authentication.ts
@@ -0,0 +1,197 @@
+import * as WebAuthnJSON from '@github/webauthn-json';
+import axios, { AxiosError } from 'axios';
+
+import ready from 'flavours/glitch/ready';
+
+import 'regenerator-runtime/runtime';
+
+type PublicKeyCredentialCreationOptionsJSON =
+  WebAuthnJSON.CredentialCreationOptionsJSON['publicKey'];
+
+function exceptionHasAxiosError(
+  error: unknown,
+): error is AxiosError<{ error: unknown }> {
+  return (
+    error instanceof AxiosError &&
+    typeof error.response?.data === 'object' &&
+    'error' in error.response.data
+  );
+}
+
+function logAxiosResponseError(error: unknown) {
+  if (exceptionHasAxiosError(error)) console.error(error);
+}
+
+function getCSRFToken() {
+  return document
+    .querySelector<HTMLMetaElement>('meta[name="csrf-token"]')
+    ?.getAttribute('content');
+}
+
+function hideFlashMessages() {
+  document.querySelectorAll('.flash-message').forEach((flashMessage) => {
+    flashMessage.classList.add('hidden');
+  });
+}
+
+async function callback(
+  url: string,
+  body:
+    | {
+        credential: WebAuthnJSON.PublicKeyCredentialWithAttestationJSON;
+        nickname: string;
+      }
+    | {
+        user: { credential: WebAuthnJSON.PublicKeyCredentialWithAssertionJSON };
+      },
+) {
+  try {
+    const response = await axios.post<{ redirect_path: string }>(
+      url,
+      JSON.stringify(body),
+      {
+        headers: {
+          'Content-Type': 'application/json',
+          Accept: 'application/json',
+          'X-CSRF-Token': getCSRFToken(),
+        },
+      },
+    );
+
+    window.location.replace(response.data.redirect_path);
+  } catch (error) {
+    if (error instanceof AxiosError && error.response?.status === 422) {
+      const errorMessage = document.getElementById(
+        'security-key-error-message',
+      );
+      errorMessage?.classList.remove('hidden');
+
+      logAxiosResponseError(error);
+    } else {
+      console.error(error);
+    }
+  }
+}
+
+async function handleWebauthnCredentialRegistration(nickname: string) {
+  try {
+    const response = await axios.get<PublicKeyCredentialCreationOptionsJSON>(
+      '/settings/security_keys/options',
+    );
+
+    const credentialOptions = response.data;
+
+    try {
+      const credential = await WebAuthnJSON.create({
+        publicKey: credentialOptions,
+      });
+
+      const params = {
+        credential: credential,
+        nickname: nickname,
+      };
+
+      await callback('/settings/security_keys', params);
+    } catch (error) {
+      const errorMessage = document.getElementById(
+        'security-key-error-message',
+      );
+      errorMessage?.classList.remove('hidden');
+      console.error(error);
+    }
+  } catch (error) {
+    logAxiosResponseError(error);
+  }
+}
+
+async function handleWebauthnCredentialAuthentication() {
+  try {
+    const response = await axios.get<PublicKeyCredentialCreationOptionsJSON>(
+      'sessions/security_key_options',
+    );
+
+    const credentialOptions = response.data;
+
+    try {
+      const credential = await WebAuthnJSON.get({
+        publicKey: credentialOptions,
+      });
+
+      const params = { user: { credential: credential } };
+      void callback('sign_in', params);
+    } catch (error) {
+      const errorMessage = document.getElementById(
+        'security-key-error-message',
+      );
+      errorMessage?.classList.remove('hidden');
+      console.error(error);
+    }
+  } catch (error) {
+    logAxiosResponseError(error);
+  }
+}
+
+ready(() => {
+  if (!WebAuthnJSON.supported()) {
+    const unsupported_browser_message = document.getElementById(
+      'unsupported-browser-message',
+    );
+    if (unsupported_browser_message) {
+      unsupported_browser_message.classList.remove('hidden');
+      const button = document.querySelector<HTMLButtonElement>(
+        'button.btn.js-webauthn',
+      );
+      if (button) button.disabled = true;
+    }
+  }
+
+  const webAuthnCredentialRegistrationForm =
+    document.querySelector<HTMLFormElement>('form#new_webauthn_credential');
+  if (webAuthnCredentialRegistrationForm) {
+    webAuthnCredentialRegistrationForm.addEventListener('submit', (event) => {
+      event.preventDefault();
+
+      if (!(event.target instanceof HTMLFormElement)) return;
+
+      const nickname = event.target.querySelector<HTMLInputElement>(
+        'input[name="new_webauthn_credential[nickname]"]',
+      );
+
+      if (nickname?.value) {
+        void handleWebauthnCredentialRegistration(nickname.value);
+      } else {
+        nickname?.focus();
+      }
+    });
+  }
+
+  const webAuthnCredentialAuthenticationForm =
+    document.getElementById('webauthn-form');
+  if (webAuthnCredentialAuthenticationForm) {
+    webAuthnCredentialAuthenticationForm.addEventListener('submit', (event) => {
+      event.preventDefault();
+      void handleWebauthnCredentialAuthentication();
+    });
+
+    const otpAuthenticationForm = document.getElementById(
+      'otp-authentication-form',
+    );
+
+    const linkToOtp = document.getElementById('link-to-otp');
+
+    linkToOtp?.addEventListener('click', () => {
+      webAuthnCredentialAuthenticationForm.classList.add('hidden');
+      otpAuthenticationForm?.classList.remove('hidden');
+      hideFlashMessages();
+    });
+
+    const linkToWebAuthn = document.getElementById('link-to-webauthn');
+    linkToWebAuthn?.addEventListener('click', () => {
+      otpAuthenticationForm?.classList.add('hidden');
+      webAuthnCredentialAuthenticationForm.classList.remove('hidden');
+      hideFlashMessages();
+    });
+  }
+}).catch((e: unknown) => {
+  throw e;
+});

From 2f73e486b7e107763e92b47b8659e152f363d988 Mon Sep 17 00:00:00 2001
From: Tim Rogers <rogers.timothy.john@gmail.com>
Date: Sat, 4 May 2024 21:24:10 -0500
Subject: [PATCH 0943/2191] =?UTF-8?q?Switched=20HTMLEntities=20to=20the=20?=
 =?UTF-8?q?expanded=20flavor=20which=20supports=20a=20larger=20=E2=80=A6?=
 =?UTF-8?q?=20(#30173)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/lib/link_details_extractor.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/lib/link_details_extractor.rb b/app/lib/link_details_extractor.rb
index bec7d3a4550df4..07776c36991b56 100644
--- a/app/lib/link_details_extractor.rb
+++ b/app/lib/link_details_extractor.rb
@@ -282,6 +282,6 @@ def detector
   end
 
   def html_entities
-    @html_entities ||= HTMLEntities.new
+    @html_entities ||= HTMLEntities.new(:expanded)
   end
 end

From e4841ca82b58f33ec42742b40211f38fef1e7338 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 6 May 2024 10:26:12 +0200
Subject: [PATCH 0944/2191] Update dependency irb to v1.13.1 (#30177)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index cb36bc2ddc2b2b..27d858ed05f69d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -346,7 +346,7 @@ GEM
       activesupport (>= 3.0)
       nokogiri (>= 1.6)
     io-console (0.7.2)
-    irb (1.13.0)
+    irb (1.13.1)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     jmespath (1.6.2)
@@ -601,7 +601,7 @@ GEM
     redlock (1.3.2)
       redis (>= 3.0.0, < 6.0)
     regexp_parser (2.9.0)
-    reline (0.5.4)
+    reline (0.5.5)
       io-console (~> 0.5)
     request_store (1.6.0)
       rack (>= 1.4)

From d544b83f917773749f9664be4bca4eec4078a2b6 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 6 May 2024 10:26:28 +0200
Subject: [PATCH 0945/2191] Update formatjs monorepo (#30175)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index e45da3a4808090..7f0747faa18d2b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2307,23 +2307,23 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@formatjs/intl@npm:2.10.1":
-  version: 2.10.1
-  resolution: "@formatjs/intl@npm:2.10.1"
+"@formatjs/intl@npm:2.10.2":
+  version: 2.10.2
+  resolution: "@formatjs/intl@npm:2.10.2"
   dependencies:
     "@formatjs/ecma402-abstract": "npm:1.18.2"
     "@formatjs/fast-memoize": "npm:2.2.0"
     "@formatjs/icu-messageformat-parser": "npm:2.7.6"
     "@formatjs/intl-displaynames": "npm:6.6.6"
     "@formatjs/intl-listformat": "npm:7.5.5"
-    intl-messageformat: "npm:10.5.11"
+    intl-messageformat: "npm:10.5.12"
     tslib: "npm:^2.4.0"
   peerDependencies:
     typescript: ^4.7 || 5
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 10c0/24eee77382d1efd226aee7590228d3ae80f66a8547a65295f8028986b15b6abbfea3e380f4a338ece0e841e1db6f36554ca48124d84c0830382e3a9d395b5d75
+  checksum: 10c0/20df407e141055e8c7b2605c06e952b643be7ea01d992862e13fc623ca2db034069744eae2be16655bf7888b3add1bfc2653fd0a08bcfdb67fb9b72a306f7718
   languageName: node
   linkType: hard
 
@@ -9615,15 +9615,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"intl-messageformat@npm:10.5.11, intl-messageformat@npm:^10.3.5":
-  version: 10.5.11
-  resolution: "intl-messageformat@npm:10.5.11"
+"intl-messageformat@npm:10.5.12, intl-messageformat@npm:^10.3.5":
+  version: 10.5.12
+  resolution: "intl-messageformat@npm:10.5.12"
   dependencies:
     "@formatjs/ecma402-abstract": "npm:1.18.2"
     "@formatjs/fast-memoize": "npm:2.2.0"
     "@formatjs/icu-messageformat-parser": "npm:2.7.6"
     tslib: "npm:^2.4.0"
-  checksum: 10c0/423f1c879ce2d0e7b9e0b4c1787a81ead7fe4d1734e0366a20fef56b06c09146e7ca3618e2e78b4f8b8f2b59cafe6237ceed21530fe0c16cfb47d915fc80222d
+  checksum: 10c0/f95734e98a05ef7f51de0c27904d3a994528e3a174963bd1b3a6db9416b5fd84bbd8f7d26d84fc547d51af69ccf46dd3f73a3f4f20a2ccef5c9cd90e946ad82c
   languageName: node
   linkType: hard
 
@@ -14346,18 +14346,18 @@ __metadata:
   linkType: hard
 
 "react-intl@npm:^6.4.2":
-  version: 6.6.5
-  resolution: "react-intl@npm:6.6.5"
+  version: 6.6.6
+  resolution: "react-intl@npm:6.6.6"
   dependencies:
     "@formatjs/ecma402-abstract": "npm:1.18.2"
     "@formatjs/icu-messageformat-parser": "npm:2.7.6"
-    "@formatjs/intl": "npm:2.10.1"
+    "@formatjs/intl": "npm:2.10.2"
     "@formatjs/intl-displaynames": "npm:6.6.6"
     "@formatjs/intl-listformat": "npm:7.5.5"
     "@types/hoist-non-react-statics": "npm:^3.3.1"
     "@types/react": "npm:16 || 17 || 18"
     hoist-non-react-statics: "npm:^3.3.2"
-    intl-messageformat: "npm:10.5.11"
+    intl-messageformat: "npm:10.5.12"
     tslib: "npm:^2.4.0"
   peerDependencies:
     react: ^16.6.0 || 17 || 18
@@ -14365,7 +14365,7 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 10c0/31f231701af080bc923fdf25ff22ae7ad56bd7892602879fe6fa3de0c6ab95aab10ff86595372be155e0be45a7130a2cca91dbab73e558359cebc1785711ded2
+  checksum: 10c0/04c1d1ca783f2a5e605544290c93e57629500be6811d7c2c3342903bf9f9a720d2e4c9cf3924133bf84e510ee879bf3d870a3ff269f5b197f894a49047bd089d
   languageName: node
   linkType: hard
 

From a96b82802380f2220d7e2a059ca3c773c9ce3472 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 6 May 2024 10:26:33 +0200
Subject: [PATCH 0946/2191] Update dependency postcss-preset-env to v9.5.11
 (#30171)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 376 +++++++++++++++++++++++++++---------------------------
 1 file changed, 188 insertions(+), 188 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 7f0747faa18d2b..ddc789b5feb2d6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1551,13 +1551,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/cascade-layer-name-parser@npm:^1.0.9":
-  version: 1.0.9
-  resolution: "@csstools/cascade-layer-name-parser@npm:1.0.9"
+"@csstools/cascade-layer-name-parser@npm:^1.0.11":
+  version: 1.0.11
+  resolution: "@csstools/cascade-layer-name-parser@npm:1.0.11"
   peerDependencies:
-    "@csstools/css-parser-algorithms": ^2.6.1
-    "@csstools/css-tokenizer": ^2.2.4
-  checksum: 10c0/f6e28c7cdeca44711288400cf20de9ebc4db71eafa39ca9a6b3e9f5d3295ba636dd986aac9fcb9e6171c84d436712d68ced923504d78d5fda0601c880eb352fe
+    "@csstools/css-parser-algorithms": ^2.6.3
+    "@csstools/css-tokenizer": ^2.3.1
+  checksum: 10c0/52ac8369877c8072ff5c111f656bd87e9a2a4b9e44e48fe005c26faeb6cffd83bfe2f463f4f385a2ae5cfe1f82bbf95d26ddaabca18b66c6b657c4fe1520fb43
   languageName: node
   linkType: hard
 
@@ -1568,52 +1568,52 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/css-calc@npm:^1.2.0":
-  version: 1.2.0
-  resolution: "@csstools/css-calc@npm:1.2.0"
+"@csstools/css-calc@npm:^1.2.2":
+  version: 1.2.2
+  resolution: "@csstools/css-calc@npm:1.2.2"
   peerDependencies:
-    "@csstools/css-parser-algorithms": ^2.6.1
-    "@csstools/css-tokenizer": ^2.2.4
-  checksum: 10c0/ef12dc08ccdb9903e5cb24d81b469080b94c79123415f62f707196a85c53420b7729be608930314c7a9404f50c832fe5256f647c0567d1c825079cb77f6a8719
+    "@csstools/css-parser-algorithms": ^2.6.3
+    "@csstools/css-tokenizer": ^2.3.1
+  checksum: 10c0/6032b482764a11c1b882d7502928950ab11760044fa7a2c23ecee802002902f6ea8fca045ee2919302af5a5c399e7baa9f68dff001ac6246ac7fef48fb3f6df7
   languageName: node
   linkType: hard
 
-"@csstools/css-color-parser@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "@csstools/css-color-parser@npm:2.0.0"
+"@csstools/css-color-parser@npm:^2.0.2":
+  version: 2.0.2
+  resolution: "@csstools/css-color-parser@npm:2.0.2"
   dependencies:
     "@csstools/color-helpers": "npm:^4.2.0"
-    "@csstools/css-calc": "npm:^1.2.0"
+    "@csstools/css-calc": "npm:^1.2.2"
   peerDependencies:
-    "@csstools/css-parser-algorithms": ^2.6.1
-    "@csstools/css-tokenizer": ^2.2.4
-  checksum: 10c0/295f844a194dec4f51439e8760dbb4a142901b8b60cd9d676a62c15c0e8408eb7bcdcbb40be52cdd5f67d020e655a1c3267a28923cfc4f6bae2b74aa48fce426
+    "@csstools/css-parser-algorithms": ^2.6.3
+    "@csstools/css-tokenizer": ^2.3.1
+  checksum: 10c0/c5ae4ad78745e425dce56da9f1ab053fb4f7963399735df3303305b32123bed0b2237689c2e7e99da2c62387e3226c12ea85e70e275c4027c7507e4ac929bffa
   languageName: node
   linkType: hard
 
-"@csstools/css-parser-algorithms@npm:^2.6.1":
-  version: 2.6.1
-  resolution: "@csstools/css-parser-algorithms@npm:2.6.1"
+"@csstools/css-parser-algorithms@npm:^2.6.1, @csstools/css-parser-algorithms@npm:^2.6.3":
+  version: 2.6.3
+  resolution: "@csstools/css-parser-algorithms@npm:2.6.3"
   peerDependencies:
-    "@csstools/css-tokenizer": ^2.2.4
-  checksum: 10c0/2c60377c4ffc96bbeb962cab19c09fccbcc834785928747219ed3bd916a34e52977393935d1d36501403f3f95ff59d358dd741d1dddcdaf9564ab36d73926aa6
+    "@csstools/css-tokenizer": ^2.3.1
+  checksum: 10c0/6648fda75a1c08096320fb5c04fd13656a0168de13584d2795547fecfb26c2c7d8b3b1fb79ba7aa758714851e98bfbec20d89e28697f999f41f91133eafe4207
   languageName: node
   linkType: hard
 
-"@csstools/css-tokenizer@npm:^2.2.4":
-  version: 2.2.4
-  resolution: "@csstools/css-tokenizer@npm:2.2.4"
-  checksum: 10c0/23997db5874514f4b951ebd215e1e6cc8baf03adf9a35fc6fd028b84cb52aa2dc053860722108c09859a9b37b455f62b84181fe15539cd37797ea699b9ff85f0
+"@csstools/css-tokenizer@npm:^2.2.4, @csstools/css-tokenizer@npm:^2.3.1":
+  version: 2.3.1
+  resolution: "@csstools/css-tokenizer@npm:2.3.1"
+  checksum: 10c0/fed6619fb5108e109d4dd10b0e967035a92793bae8fb84544e1342058b6df4e306d9d075623e2201fe88831b1ada797aea3546a8d12229d2d81cd7a5dfee4444
   languageName: node
   linkType: hard
 
-"@csstools/media-query-list-parser@npm:^2.1.9":
-  version: 2.1.9
-  resolution: "@csstools/media-query-list-parser@npm:2.1.9"
+"@csstools/media-query-list-parser@npm:^2.1.11, @csstools/media-query-list-parser@npm:^2.1.9":
+  version: 2.1.11
+  resolution: "@csstools/media-query-list-parser@npm:2.1.11"
   peerDependencies:
-    "@csstools/css-parser-algorithms": ^2.6.1
-    "@csstools/css-tokenizer": ^2.2.4
-  checksum: 10c0/602e9b5631928c078e670018df20b959bfb8e42ea11024d5218f1604e5ef94e070a74934a919ccbff3713e506d99096057947fa0c2e4768939f7b22479553534
+    "@csstools/css-parser-algorithms": ^2.6.3
+    "@csstools/css-tokenizer": ^2.3.1
+  checksum: 10c0/9bcd99f7d28ae3cdaba73fbbfef571b0393dd4e841f522cc796fe5161744f17e327ba1713dad3c481626fade1357c55890e3d365177abed50e857b69130a9be5
   languageName: node
   linkType: hard
 
@@ -1629,46 +1629,46 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-color-function@npm:^3.0.14":
-  version: 3.0.14
-  resolution: "@csstools/postcss-color-function@npm:3.0.14"
+"@csstools/postcss-color-function@npm:^3.0.16":
+  version: 3.0.16
+  resolution: "@csstools/postcss-color-function@npm:3.0.16"
   dependencies:
-    "@csstools/css-color-parser": "npm:^2.0.0"
-    "@csstools/css-parser-algorithms": "npm:^2.6.1"
-    "@csstools/css-tokenizer": "npm:^2.2.4"
+    "@csstools/css-color-parser": "npm:^2.0.2"
+    "@csstools/css-parser-algorithms": "npm:^2.6.3"
+    "@csstools/css-tokenizer": "npm:^2.3.1"
     "@csstools/postcss-progressive-custom-properties": "npm:^3.2.0"
     "@csstools/utilities": "npm:^1.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/81592b0eb3ad7022313ecafd028908b167de42acc6765f708c9b10631f86123c2b803aca27378f021c2b3dab8cc47770c0364fe5a3c1e18ec006deaf72e17c38
+  checksum: 10c0/41756a4601a3f1086290dab6ca92b54e201bd94637b54b439c66a04fd628a14e2a0bd1452ad294d2981e2f4bb306758fa5f44639b1c4332320435050749aa487
   languageName: node
   linkType: hard
 
-"@csstools/postcss-color-mix-function@npm:^2.0.14":
-  version: 2.0.14
-  resolution: "@csstools/postcss-color-mix-function@npm:2.0.14"
+"@csstools/postcss-color-mix-function@npm:^2.0.16":
+  version: 2.0.16
+  resolution: "@csstools/postcss-color-mix-function@npm:2.0.16"
   dependencies:
-    "@csstools/css-color-parser": "npm:^2.0.0"
-    "@csstools/css-parser-algorithms": "npm:^2.6.1"
-    "@csstools/css-tokenizer": "npm:^2.2.4"
+    "@csstools/css-color-parser": "npm:^2.0.2"
+    "@csstools/css-parser-algorithms": "npm:^2.6.3"
+    "@csstools/css-tokenizer": "npm:^2.3.1"
     "@csstools/postcss-progressive-custom-properties": "npm:^3.2.0"
     "@csstools/utilities": "npm:^1.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/1dd3c63bbbbb9d3094699f169bbb9d26e86a49accb5f9abaa2441b54cb8a6f4cd332409666684a275eca867e3ef0ea3f6eafdf9fb87f2cbfa17c6296fb1ed4d7
+  checksum: 10c0/70cd5b291dd615e20e4475517bf0027c90c433241397a66866f89acedb12cb91f45552a162bdd1000636ec56f7d6a099b65e44fe100fd03228fc65f17cfae285
   languageName: node
   linkType: hard
 
-"@csstools/postcss-exponential-functions@npm:^1.0.5":
-  version: 1.0.5
-  resolution: "@csstools/postcss-exponential-functions@npm:1.0.5"
+"@csstools/postcss-exponential-functions@npm:^1.0.7":
+  version: 1.0.7
+  resolution: "@csstools/postcss-exponential-functions@npm:1.0.7"
   dependencies:
-    "@csstools/css-calc": "npm:^1.2.0"
-    "@csstools/css-parser-algorithms": "npm:^2.6.1"
-    "@csstools/css-tokenizer": "npm:^2.2.4"
+    "@csstools/css-calc": "npm:^1.2.2"
+    "@csstools/css-parser-algorithms": "npm:^2.6.3"
+    "@csstools/css-tokenizer": "npm:^2.3.1"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/45e18ca9025597da29cbef214cef39fcabef1e169bbb1f5c015de5f677e2927a1c3b8ae18558d815701e8d3e64db1043412a222af35036c92c25011a0e1e027d
+  checksum: 10c0/2079c81c3437686ef432d88502fa3a13bf8a27b7af105b4c6c2eb8e779f14adc8967a5a3ed03271ab919eeaf999fc4489fe4b37d32a8f61ab3212439517bddcc
   languageName: node
   linkType: hard
 
@@ -1684,46 +1684,46 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-gamut-mapping@npm:^1.0.7":
-  version: 1.0.7
-  resolution: "@csstools/postcss-gamut-mapping@npm:1.0.7"
+"@csstools/postcss-gamut-mapping@npm:^1.0.9":
+  version: 1.0.9
+  resolution: "@csstools/postcss-gamut-mapping@npm:1.0.9"
   dependencies:
-    "@csstools/css-color-parser": "npm:^2.0.0"
-    "@csstools/css-parser-algorithms": "npm:^2.6.1"
-    "@csstools/css-tokenizer": "npm:^2.2.4"
+    "@csstools/css-color-parser": "npm:^2.0.2"
+    "@csstools/css-parser-algorithms": "npm:^2.6.3"
+    "@csstools/css-tokenizer": "npm:^2.3.1"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/7b349db44fcd697d57172ab63b7a02a56c0b49bce17e48cb72aa0fa246bd2be83fe693c507fd400a9ed83597a711d18ece9319ee3af8000c8fd3a2761e228a11
+  checksum: 10c0/412ae1410f3fce240401576441637c2c4e71d1a54153ac9b7a991b3de7519c253d03e10db78b09872eb10b0776d7f960b442779efabc11332b5be6672163c836
   languageName: node
   linkType: hard
 
-"@csstools/postcss-gradients-interpolation-method@npm:^4.0.15":
-  version: 4.0.15
-  resolution: "@csstools/postcss-gradients-interpolation-method@npm:4.0.15"
+"@csstools/postcss-gradients-interpolation-method@npm:^4.0.17":
+  version: 4.0.17
+  resolution: "@csstools/postcss-gradients-interpolation-method@npm:4.0.17"
   dependencies:
-    "@csstools/css-color-parser": "npm:^2.0.0"
-    "@csstools/css-parser-algorithms": "npm:^2.6.1"
-    "@csstools/css-tokenizer": "npm:^2.2.4"
+    "@csstools/css-color-parser": "npm:^2.0.2"
+    "@csstools/css-parser-algorithms": "npm:^2.6.3"
+    "@csstools/css-tokenizer": "npm:^2.3.1"
     "@csstools/postcss-progressive-custom-properties": "npm:^3.2.0"
     "@csstools/utilities": "npm:^1.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/dc0bbf6a4787d5ad3f9fe268dfa9776ecdc25b6cc0a49486bf53238341a339647f1e475240ead3cec1f4af9a237f6518ace015103e90ce8afe4d44539a566e04
+  checksum: 10c0/465ac42856ca1a57aa2b9ea41ede31d9e2bcf2fe84345dbc182ae41f463069a0cfd41041b834b5133108c702cd85ecb8636b51b0b88fff8a221628639b59f386
   languageName: node
   linkType: hard
 
-"@csstools/postcss-hwb-function@npm:^3.0.13":
-  version: 3.0.13
-  resolution: "@csstools/postcss-hwb-function@npm:3.0.13"
+"@csstools/postcss-hwb-function@npm:^3.0.15":
+  version: 3.0.15
+  resolution: "@csstools/postcss-hwb-function@npm:3.0.15"
   dependencies:
-    "@csstools/css-color-parser": "npm:^2.0.0"
-    "@csstools/css-parser-algorithms": "npm:^2.6.1"
-    "@csstools/css-tokenizer": "npm:^2.2.4"
+    "@csstools/css-color-parser": "npm:^2.0.2"
+    "@csstools/css-parser-algorithms": "npm:^2.6.3"
+    "@csstools/css-tokenizer": "npm:^2.3.1"
     "@csstools/postcss-progressive-custom-properties": "npm:^3.2.0"
     "@csstools/utilities": "npm:^1.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/684c3d408ceb027e7276c4f25c9a17ef9bd52f0948268cf58b5184097e9b71f5364a41b42bab44691938c6fadffcba0c8e66f809a339a8b282f4a432d32d00ef
+  checksum: 10c0/fdfaeefbab1008ab1e4a98a2b45cc3db002b2724c404fa0600954b411a68b1fa4028286250bf9898eed10fa80c44e4d6b4e55f1aca073c3dfce8198a0aaedf3f
   languageName: node
   linkType: hard
 
@@ -1761,17 +1761,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-light-dark-function@npm:^1.0.3":
-  version: 1.0.3
-  resolution: "@csstools/postcss-light-dark-function@npm:1.0.3"
+"@csstools/postcss-light-dark-function@npm:^1.0.5":
+  version: 1.0.5
+  resolution: "@csstools/postcss-light-dark-function@npm:1.0.5"
   dependencies:
-    "@csstools/css-parser-algorithms": "npm:^2.6.1"
-    "@csstools/css-tokenizer": "npm:^2.2.4"
+    "@csstools/css-parser-algorithms": "npm:^2.6.3"
+    "@csstools/css-tokenizer": "npm:^2.3.1"
     "@csstools/postcss-progressive-custom-properties": "npm:^3.2.0"
     "@csstools/utilities": "npm:^1.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/99a1b72aba08a6fa5c7271d42f4459d86f001fe83f533c0ed3d21556f53ee227f65f94cda1feee1aa910890fc42482f15a4dfb3edbc7afdad828ce8897d0c52b
+  checksum: 10c0/4fbeda98372d0da25d3ed87da09903c9a0a5d0b8c13cc9de82a98acce4a8f8367e5ba33bfc25c2534d10f2b1db9d5b4278df4ebab755e27ef2b03a95e0ebe264
   languageName: node
   linkType: hard
 
@@ -1813,42 +1813,42 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-logical-viewport-units@npm:^2.0.7":
-  version: 2.0.7
-  resolution: "@csstools/postcss-logical-viewport-units@npm:2.0.7"
+"@csstools/postcss-logical-viewport-units@npm:^2.0.9":
+  version: 2.0.9
+  resolution: "@csstools/postcss-logical-viewport-units@npm:2.0.9"
   dependencies:
-    "@csstools/css-tokenizer": "npm:^2.2.4"
+    "@csstools/css-tokenizer": "npm:^2.3.1"
     "@csstools/utilities": "npm:^1.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/9493f5395ccfe88d0d0740e54f77f0c844afc79b164068fdd907aed75004b4252ba9423dea22194ad98114dd1a2e77c14e307604305d926425251d4ab3013949
+  checksum: 10c0/25b01e36b08c571806d09046be63582dbebf97a4612df59be405fa8a92e6eebcd4e768ad7fbe53b0b8739d6ab04d56957964fb04d6a3ea129fc5f72e6d0adf95
   languageName: node
   linkType: hard
 
-"@csstools/postcss-media-minmax@npm:^1.1.4":
-  version: 1.1.4
-  resolution: "@csstools/postcss-media-minmax@npm:1.1.4"
+"@csstools/postcss-media-minmax@npm:^1.1.6":
+  version: 1.1.6
+  resolution: "@csstools/postcss-media-minmax@npm:1.1.6"
   dependencies:
-    "@csstools/css-calc": "npm:^1.2.0"
-    "@csstools/css-parser-algorithms": "npm:^2.6.1"
-    "@csstools/css-tokenizer": "npm:^2.2.4"
-    "@csstools/media-query-list-parser": "npm:^2.1.9"
+    "@csstools/css-calc": "npm:^1.2.2"
+    "@csstools/css-parser-algorithms": "npm:^2.6.3"
+    "@csstools/css-tokenizer": "npm:^2.3.1"
+    "@csstools/media-query-list-parser": "npm:^2.1.11"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/620bb85065195c72cf9c0abe9af822f9feeaf919b53bfd47ec09f75b644cb544bd967b09278c48f829348808b34c552718c1aa3eb5342e2dec983e22eb63b0a0
+  checksum: 10c0/2cbfb3728a232c655d82f63d5ac7da36876d14e5fee5d62a0738efed40c58f20ef11f600395ade24d5063d750e8e093251dd93cc361f782b5a6c0e0f80288f51
   languageName: node
   linkType: hard
 
-"@csstools/postcss-media-queries-aspect-ratio-number-values@npm:^2.0.7":
-  version: 2.0.7
-  resolution: "@csstools/postcss-media-queries-aspect-ratio-number-values@npm:2.0.7"
+"@csstools/postcss-media-queries-aspect-ratio-number-values@npm:^2.0.9":
+  version: 2.0.9
+  resolution: "@csstools/postcss-media-queries-aspect-ratio-number-values@npm:2.0.9"
   dependencies:
-    "@csstools/css-parser-algorithms": "npm:^2.6.1"
-    "@csstools/css-tokenizer": "npm:^2.2.4"
-    "@csstools/media-query-list-parser": "npm:^2.1.9"
+    "@csstools/css-parser-algorithms": "npm:^2.6.3"
+    "@csstools/css-tokenizer": "npm:^2.3.1"
+    "@csstools/media-query-list-parser": "npm:^2.1.11"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/d5d52a744f9a9466d86a506aab430811778dfa681d3f52f5486ee9b686390919eaae9ad356b84bc782d263227f35913ef68d9a6c3eefcfc38d8ffaccc9b94de0
+  checksum: 10c0/d431d2900a7177c938d9dc2d5bdf3c1930758adc214cc72f94b34e6bbd02fd917c200dc81482db515519c97d4f1e766ba3200f3ec9b55081887f2f8111f68e20
   languageName: node
   linkType: hard
 
@@ -1875,18 +1875,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-oklab-function@npm:^3.0.14":
-  version: 3.0.14
-  resolution: "@csstools/postcss-oklab-function@npm:3.0.14"
+"@csstools/postcss-oklab-function@npm:^3.0.16":
+  version: 3.0.16
+  resolution: "@csstools/postcss-oklab-function@npm:3.0.16"
   dependencies:
-    "@csstools/css-color-parser": "npm:^2.0.0"
-    "@csstools/css-parser-algorithms": "npm:^2.6.1"
-    "@csstools/css-tokenizer": "npm:^2.2.4"
+    "@csstools/css-color-parser": "npm:^2.0.2"
+    "@csstools/css-parser-algorithms": "npm:^2.6.3"
+    "@csstools/css-tokenizer": "npm:^2.3.1"
     "@csstools/postcss-progressive-custom-properties": "npm:^3.2.0"
     "@csstools/utilities": "npm:^1.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/dfe0b12c2256dded995c64825fac9507be9c747d776cfa09eeefff6dee0efa5eed6a92a1ecba39069a751a7fc3cefa8891c34209a7a3c7ea33d356c95d01a02d
+  checksum: 10c0/9c67ee5f51116df16ab6baffa1b3c6c7aa93d53b836f421125ae8824075bd3cfaa1a93594466de0ac935c89c4fc8171e80974e1a15bafa23ea864e4cf1f1c1f2
   languageName: node
   linkType: hard
 
@@ -1901,18 +1901,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-relative-color-syntax@npm:^2.0.14":
-  version: 2.0.14
-  resolution: "@csstools/postcss-relative-color-syntax@npm:2.0.14"
+"@csstools/postcss-relative-color-syntax@npm:^2.0.16":
+  version: 2.0.16
+  resolution: "@csstools/postcss-relative-color-syntax@npm:2.0.16"
   dependencies:
-    "@csstools/css-color-parser": "npm:^2.0.0"
-    "@csstools/css-parser-algorithms": "npm:^2.6.1"
-    "@csstools/css-tokenizer": "npm:^2.2.4"
+    "@csstools/css-color-parser": "npm:^2.0.2"
+    "@csstools/css-parser-algorithms": "npm:^2.6.3"
+    "@csstools/css-tokenizer": "npm:^2.3.1"
     "@csstools/postcss-progressive-custom-properties": "npm:^3.2.0"
     "@csstools/utilities": "npm:^1.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/64cd5f8054e4403f4e25ed11a5b9d157098af639dbc30ac25b94660b3af489c0bacc49fc439cba1ccceefa4caa5831a913e3d1d889a9796cc6fbf3902c7c31c1
+  checksum: 10c0/cdc965706212dcbc03394f55c79a0ad043d1e0174059c4d0d90e4267fe8e6fd9eef7cfed4f5bbc1f8e89c225c1c042ae792e115bba198eb2daae763d65f44679
   languageName: node
   linkType: hard
 
@@ -1927,16 +1927,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-stepped-value-functions@npm:^3.0.6":
-  version: 3.0.6
-  resolution: "@csstools/postcss-stepped-value-functions@npm:3.0.6"
+"@csstools/postcss-stepped-value-functions@npm:^3.0.8":
+  version: 3.0.8
+  resolution: "@csstools/postcss-stepped-value-functions@npm:3.0.8"
   dependencies:
-    "@csstools/css-calc": "npm:^1.2.0"
-    "@csstools/css-parser-algorithms": "npm:^2.6.1"
-    "@csstools/css-tokenizer": "npm:^2.2.4"
+    "@csstools/css-calc": "npm:^1.2.2"
+    "@csstools/css-parser-algorithms": "npm:^2.6.3"
+    "@csstools/css-tokenizer": "npm:^2.3.1"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/a198aedc4fffe88909c92bfaa36031e6803e739a2578ba4a81c01b9f1525e6a6876d6ffacbbe21701298598dcade8b2ac8423d8ab0fc5d9f4ba86ed60f53cbca
+  checksum: 10c0/2be66aa769808245137be8ff14308aa17c3a0d75433f6fd6789114966a78c365dbf173d087e7ff5bc80118c75be2ff740baab83ed39fc0671980f6217779956b
   languageName: node
   linkType: hard
 
@@ -1952,16 +1952,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-trigonometric-functions@npm:^3.0.6":
-  version: 3.0.6
-  resolution: "@csstools/postcss-trigonometric-functions@npm:3.0.6"
+"@csstools/postcss-trigonometric-functions@npm:^3.0.8":
+  version: 3.0.8
+  resolution: "@csstools/postcss-trigonometric-functions@npm:3.0.8"
   dependencies:
-    "@csstools/css-calc": "npm:^1.2.0"
-    "@csstools/css-parser-algorithms": "npm:^2.6.1"
-    "@csstools/css-tokenizer": "npm:^2.2.4"
+    "@csstools/css-calc": "npm:^1.2.2"
+    "@csstools/css-parser-algorithms": "npm:^2.6.3"
+    "@csstools/css-tokenizer": "npm:^2.3.1"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/4b484af853d9eb59a4a4b1c063fcf48e2658bb2d6930dfab1d79e676986534687e6440b8cdcd2731ddcb7726537f4ed484208a2b80ef2c9359053762ba35e5e7
+  checksum: 10c0/aeed8d1026f4a5cb7afafbadd739af84291d5bfcbcdef2f79b77174f003d0cd0c7f9deb3fe0b9377efab37ce9bb17a2499efd4af8211f5ff9eb01b878b0b62b3
   languageName: node
   linkType: hard
 
@@ -13147,18 +13147,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-color-functional-notation@npm:^6.0.9":
-  version: 6.0.9
-  resolution: "postcss-color-functional-notation@npm:6.0.9"
+"postcss-color-functional-notation@npm:^6.0.11":
+  version: 6.0.11
+  resolution: "postcss-color-functional-notation@npm:6.0.11"
   dependencies:
-    "@csstools/css-color-parser": "npm:^2.0.0"
-    "@csstools/css-parser-algorithms": "npm:^2.6.1"
-    "@csstools/css-tokenizer": "npm:^2.2.4"
+    "@csstools/css-color-parser": "npm:^2.0.2"
+    "@csstools/css-parser-algorithms": "npm:^2.6.3"
+    "@csstools/css-tokenizer": "npm:^2.3.1"
     "@csstools/postcss-progressive-custom-properties": "npm:^3.2.0"
     "@csstools/utilities": "npm:^1.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/120f7bc23bf46dd1c008b3aa806fb02dd988ae180f9c0c10dca9f5ea3473bf20d7743aafae1441df5b4a3945a63ebb0dae1d4d55f7c8bcd34540529b627c4e3e
+  checksum: 10c0/7fd75e6881cf62f536f79dfc0ae1b709ea0b8b84833cce1671372711f6019ab4360c6a17089b654b2d376b87e7f9455b94f0d13b45ab0ab767e547b604709b3d
   languageName: node
   linkType: hard
 
@@ -13212,46 +13212,46 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-custom-media@npm:^10.0.4":
-  version: 10.0.4
-  resolution: "postcss-custom-media@npm:10.0.4"
+"postcss-custom-media@npm:^10.0.6":
+  version: 10.0.6
+  resolution: "postcss-custom-media@npm:10.0.6"
   dependencies:
-    "@csstools/cascade-layer-name-parser": "npm:^1.0.9"
-    "@csstools/css-parser-algorithms": "npm:^2.6.1"
-    "@csstools/css-tokenizer": "npm:^2.2.4"
-    "@csstools/media-query-list-parser": "npm:^2.1.9"
+    "@csstools/cascade-layer-name-parser": "npm:^1.0.11"
+    "@csstools/css-parser-algorithms": "npm:^2.6.3"
+    "@csstools/css-tokenizer": "npm:^2.3.1"
+    "@csstools/media-query-list-parser": "npm:^2.1.11"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/2384a40f0e38abe92fbfc707000b264e4bdfe65bd0086ab18c6aab71049198f9dd1431bc4f9bbf68f7cca86b4ff0da352bac4a6ecd04e3671b7ddf6ed6ec3d04
+  checksum: 10c0/98a524bc46b780a86094bbe8007f1e577137da5490823631a683d4b3df4a13e40c5e1ab52380275a54f7011abfd98bb597c6293d964c14f9f22ec6cf9d75c550
   languageName: node
   linkType: hard
 
-"postcss-custom-properties@npm:^13.3.8":
-  version: 13.3.8
-  resolution: "postcss-custom-properties@npm:13.3.8"
+"postcss-custom-properties@npm:^13.3.10":
+  version: 13.3.10
+  resolution: "postcss-custom-properties@npm:13.3.10"
   dependencies:
-    "@csstools/cascade-layer-name-parser": "npm:^1.0.9"
-    "@csstools/css-parser-algorithms": "npm:^2.6.1"
-    "@csstools/css-tokenizer": "npm:^2.2.4"
+    "@csstools/cascade-layer-name-parser": "npm:^1.0.11"
+    "@csstools/css-parser-algorithms": "npm:^2.6.3"
+    "@csstools/css-tokenizer": "npm:^2.3.1"
     "@csstools/utilities": "npm:^1.0.0"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/03dd1918f897005b23d09615ebb2c3faf4a01cac67462069c9cfa87c024b2a878f64948b0cf668971bc0ca00cfc349080879b3864deb3808a32d52ff2b473319
+  checksum: 10c0/52688fd0aaadccfdf4a3d86d3a2ab988163e8108088c5e33fc9145d261f75b92b8321c044a8161345abda10df5715d674330309dcc0c17f2980db5515f6a76d6
   languageName: node
   linkType: hard
 
-"postcss-custom-selectors@npm:^7.1.8":
-  version: 7.1.8
-  resolution: "postcss-custom-selectors@npm:7.1.8"
+"postcss-custom-selectors@npm:^7.1.10":
+  version: 7.1.10
+  resolution: "postcss-custom-selectors@npm:7.1.10"
   dependencies:
-    "@csstools/cascade-layer-name-parser": "npm:^1.0.9"
-    "@csstools/css-parser-algorithms": "npm:^2.6.1"
-    "@csstools/css-tokenizer": "npm:^2.2.4"
+    "@csstools/cascade-layer-name-parser": "npm:^1.0.11"
+    "@csstools/css-parser-algorithms": "npm:^2.6.3"
+    "@csstools/css-tokenizer": "npm:^2.3.1"
     postcss-selector-parser: "npm:^6.0.13"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/6a7d8248342177a222821531ea3b4008764362e4f7e8f7f2d5767e5880c37ffa39ac5adced2c686baeb9c1f4ed4c283fcc8a8d30ef3b4fc5f63d4ef9a691285e
+  checksum: 10c0/11311ae6f306420223c6bf926fb1798738f3aa525a267de204de8e8ee9de467bf63b580d9ad5dbb0fff4bd9266770a3fa7e27a24af08a2e0a4115d0727d1d043
   languageName: node
   linkType: hard
 
@@ -13367,18 +13367,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-lab-function@npm:^6.0.14":
-  version: 6.0.14
-  resolution: "postcss-lab-function@npm:6.0.14"
+"postcss-lab-function@npm:^6.0.16":
+  version: 6.0.16
+  resolution: "postcss-lab-function@npm:6.0.16"
   dependencies:
-    "@csstools/css-color-parser": "npm:^2.0.0"
-    "@csstools/css-parser-algorithms": "npm:^2.6.1"
-    "@csstools/css-tokenizer": "npm:^2.2.4"
+    "@csstools/css-color-parser": "npm:^2.0.2"
+    "@csstools/css-parser-algorithms": "npm:^2.6.3"
+    "@csstools/css-tokenizer": "npm:^2.3.1"
     "@csstools/postcss-progressive-custom-properties": "npm:^3.2.0"
     "@csstools/utilities": "npm:^1.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/0b5d998ddb98ec6243448f1eca216f6e23872431885b152843feef1e844fc5b6b3ebe16ea8940f3d6abea732aa0c51b2ec0e57437e4326e5b2cb2bcb949e6d9f
+  checksum: 10c0/ba8717cd8a197ec17acaac1b61631cd4403f07bd406b0c92f2e430a55e3f786cd6c338b626c3326e9178a0f3e58ff838ebaded19f480f39197a9cb17349ecdcd
   languageName: node
   linkType: hard
 
@@ -13698,37 +13698,37 @@ __metadata:
   linkType: hard
 
 "postcss-preset-env@npm:^9.5.2":
-  version: 9.5.9
-  resolution: "postcss-preset-env@npm:9.5.9"
+  version: 9.5.11
+  resolution: "postcss-preset-env@npm:9.5.11"
   dependencies:
     "@csstools/postcss-cascade-layers": "npm:^4.0.4"
-    "@csstools/postcss-color-function": "npm:^3.0.14"
-    "@csstools/postcss-color-mix-function": "npm:^2.0.14"
-    "@csstools/postcss-exponential-functions": "npm:^1.0.5"
+    "@csstools/postcss-color-function": "npm:^3.0.16"
+    "@csstools/postcss-color-mix-function": "npm:^2.0.16"
+    "@csstools/postcss-exponential-functions": "npm:^1.0.7"
     "@csstools/postcss-font-format-keywords": "npm:^3.0.2"
-    "@csstools/postcss-gamut-mapping": "npm:^1.0.7"
-    "@csstools/postcss-gradients-interpolation-method": "npm:^4.0.15"
-    "@csstools/postcss-hwb-function": "npm:^3.0.13"
+    "@csstools/postcss-gamut-mapping": "npm:^1.0.9"
+    "@csstools/postcss-gradients-interpolation-method": "npm:^4.0.17"
+    "@csstools/postcss-hwb-function": "npm:^3.0.15"
     "@csstools/postcss-ic-unit": "npm:^3.0.6"
     "@csstools/postcss-initial": "npm:^1.0.1"
     "@csstools/postcss-is-pseudo-class": "npm:^4.0.6"
-    "@csstools/postcss-light-dark-function": "npm:^1.0.3"
+    "@csstools/postcss-light-dark-function": "npm:^1.0.5"
     "@csstools/postcss-logical-float-and-clear": "npm:^2.0.1"
     "@csstools/postcss-logical-overflow": "npm:^1.0.1"
     "@csstools/postcss-logical-overscroll-behavior": "npm:^1.0.1"
     "@csstools/postcss-logical-resize": "npm:^2.0.1"
-    "@csstools/postcss-logical-viewport-units": "npm:^2.0.7"
-    "@csstools/postcss-media-minmax": "npm:^1.1.4"
-    "@csstools/postcss-media-queries-aspect-ratio-number-values": "npm:^2.0.7"
+    "@csstools/postcss-logical-viewport-units": "npm:^2.0.9"
+    "@csstools/postcss-media-minmax": "npm:^1.1.6"
+    "@csstools/postcss-media-queries-aspect-ratio-number-values": "npm:^2.0.9"
     "@csstools/postcss-nested-calc": "npm:^3.0.2"
     "@csstools/postcss-normalize-display-values": "npm:^3.0.2"
-    "@csstools/postcss-oklab-function": "npm:^3.0.14"
+    "@csstools/postcss-oklab-function": "npm:^3.0.16"
     "@csstools/postcss-progressive-custom-properties": "npm:^3.2.0"
-    "@csstools/postcss-relative-color-syntax": "npm:^2.0.14"
+    "@csstools/postcss-relative-color-syntax": "npm:^2.0.16"
     "@csstools/postcss-scope-pseudo-class": "npm:^3.0.1"
-    "@csstools/postcss-stepped-value-functions": "npm:^3.0.6"
+    "@csstools/postcss-stepped-value-functions": "npm:^3.0.8"
     "@csstools/postcss-text-decoration-shorthand": "npm:^3.0.6"
-    "@csstools/postcss-trigonometric-functions": "npm:^3.0.6"
+    "@csstools/postcss-trigonometric-functions": "npm:^3.0.8"
     "@csstools/postcss-unset-value": "npm:^3.0.1"
     autoprefixer: "npm:^10.4.19"
     browserslist: "npm:^4.22.3"
@@ -13738,12 +13738,12 @@ __metadata:
     cssdb: "npm:^8.0.0"
     postcss-attribute-case-insensitive: "npm:^6.0.3"
     postcss-clamp: "npm:^4.1.0"
-    postcss-color-functional-notation: "npm:^6.0.9"
+    postcss-color-functional-notation: "npm:^6.0.11"
     postcss-color-hex-alpha: "npm:^9.0.4"
     postcss-color-rebeccapurple: "npm:^9.0.3"
-    postcss-custom-media: "npm:^10.0.4"
-    postcss-custom-properties: "npm:^13.3.8"
-    postcss-custom-selectors: "npm:^7.1.8"
+    postcss-custom-media: "npm:^10.0.6"
+    postcss-custom-properties: "npm:^13.3.10"
+    postcss-custom-selectors: "npm:^7.1.10"
     postcss-dir-pseudo-class: "npm:^8.0.1"
     postcss-double-position-gradients: "npm:^5.0.6"
     postcss-focus-visible: "npm:^9.0.1"
@@ -13751,7 +13751,7 @@ __metadata:
     postcss-font-variant: "npm:^5.0.0"
     postcss-gap-properties: "npm:^5.0.1"
     postcss-image-set-function: "npm:^6.0.3"
-    postcss-lab-function: "npm:^6.0.14"
+    postcss-lab-function: "npm:^6.0.16"
     postcss-logical: "npm:^7.0.1"
     postcss-nesting: "npm:^12.1.2"
     postcss-opacity-percentage: "npm:^2.0.0"
@@ -13763,7 +13763,7 @@ __metadata:
     postcss-selector-not: "npm:^7.0.2"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/dbe020e3fc08f0b71a3ee9d3c8a66a93bb6ba62281ac89fa59c82b8632ca58d6a911ddd9c65f15355c36aad63477633fc101cc0f3ce494dbc757193ba42eb61c
+  checksum: 10c0/9460f4ce18cf1af7582d0a1f366151f59b6e9b0c7cbb62e59081dc91da14760a749f59fa52bc190e5e2c8fd531952c647719d19c4740aa1a0ebcb93f075ad931
   languageName: node
   linkType: hard
 

From 9be2c02e52b9c3534fa1bd16ade00a135034d2cb Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 6 May 2024 10:36:29 +0200
Subject: [PATCH 0947/2191] New Crowdin Translations (automated) (#30169)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/ar.json |  39 +-
 app/javascript/mastodon/locales/de.json |   4 +-
 app/javascript/mastodon/locales/ja.json |   9 +
 app/javascript/mastodon/locales/sl.json |  13 +
 app/javascript/mastodon/locales/sq.json |  14 +
 config/locales/ar.yml                   |   1 +
 config/locales/devise.ia.yml            |   3 +
 config/locales/doorkeeper.ia.yml        |   1 +
 config/locales/doorkeeper.sq.yml        |   1 +
 config/locales/ia.yml                   | 584 +++++++++++++++++++++++-
 config/locales/ja.yml                   |   1 +
 config/locales/lt.yml                   |  20 +-
 config/locales/pt-PT.yml                |   1 +
 config/locales/simple_form.ar.yml       |   1 +
 config/locales/simple_form.he.yml       |   3 +
 config/locales/simple_form.ia.yml       | 113 +++++
 config/locales/simple_form.ja.yml       |   4 +
 config/locales/simple_form.pt-PT.yml    |   4 +
 config/locales/simple_form.sq.yml       |   4 +
 config/locales/simple_form.th.yml       |   2 +
 config/locales/sk.yml                   |   1 +
 config/locales/sl.yml                   |   1 +
 config/locales/sq.yml                   |   1 +
 config/locales/th.yml                   |   1 +
 24 files changed, 807 insertions(+), 19 deletions(-)

diff --git a/app/javascript/mastodon/locales/ar.json b/app/javascript/mastodon/locales/ar.json
index dd13f10aa3467f..68e32dd2aab6e7 100644
--- a/app/javascript/mastodon/locales/ar.json
+++ b/app/javascript/mastodon/locales/ar.json
@@ -5,7 +5,7 @@
   "about.domain_blocks.no_reason_available": "السبب غير متوفر",
   "about.domain_blocks.preamble": "يسمح لك ماستدون عموماً بعرض المحتوى من المستخدمين من أي خادم آخر في الفدرالية والتفاعل معهم. وهذه هي الاستثناءات التي وضعت على هذا الخادم بالذات.",
   "about.domain_blocks.silenced.explanation": "عموماً، لن ترى ملفات التعريف والمحتوى من هذا الخادم، إلا إذا كنت تبحث عنه بشكل صريح أو تختار أن تتابعه.",
-  "about.domain_blocks.silenced.title": "تم كتمه",
+  "about.domain_blocks.silenced.title": "محدود",
   "about.domain_blocks.suspended.explanation": "لن يتم معالجة أي بيانات من هذا الخادم أو تخزينها أو تبادلها، مما يجعل أي تفاعل أو اتصال مع المستخدمين من هذا الخادم مستحيلا.",
   "about.domain_blocks.suspended.title": "مُعلّق",
   "about.not_available": "لم يتم توفير هذه المعلومات على هذا الخادم.",
@@ -21,7 +21,7 @@
   "account.blocked": "محظور",
   "account.browse_more_on_origin_server": "تصفح المزيد في الملف الشخصي الأصلي",
   "account.cancel_follow_request": "إلغاء طلب المتابعة",
-  "account.copy": "نسخ الرابط إلى الملف الشخصي",
+  "account.copy": "نسخ الرابط إلى الحساب",
   "account.direct": "إشارة خاصة لـ @{name}",
   "account.disable_notifications": "توقف عن إشعاري عندما ينشر @{name}",
   "account.domain_blocked": "اسم النِّطاق محظور",
@@ -32,7 +32,7 @@
   "account.featured_tags.last_status_never": "لا توجد رسائل",
   "account.featured_tags.title": "وسوم {name} المميَّزة",
   "account.follow": "متابعة",
-  "account.follow_back": "تابعه بدورك",
+  "account.follow_back": "رد المتابعة",
   "account.followers": "مُتابِعون",
   "account.followers.empty": "لا أحدَ يُتابع هذا المُستخدم إلى حد الآن.",
   "account.followers_counter": "{count, plural, zero{لا مُتابع} one {مُتابعٌ واحِد} two {مُتابعانِ اِثنان} few {{counter} مُتابِعين} many {{counter} مُتابِعًا} other {{counter} مُتابع}}",
@@ -89,12 +89,12 @@
   "announcement.announcement": "إعلان",
   "attachments_list.unprocessed": "(غير معالَج)",
   "audio.hide": "إخفاء المقطع الصوتي",
-  "block_modal.remote_users_caveat": "Do t’i kërkojmë shërbyesit {domain} të respektojë vendimin tuaj. Por, pajtimi s’është i garantuar, ngaqë disa shërbyes mund t’i trajtojnë ndryshe bllokimet. Psotimet publike mundet të jenë ende të dukshme për përdorues pa bërë hyrje në llogari.",
-  "block_modal.show_less": "اعرض أقلّ",
+  "block_modal.remote_users_caveat": "سوف نطلب من الخادم {domain} أن يحترم قرارك، لكن الالتزام غير مضمون لأن بعض الخواديم قد تتعامل مع نصوص الكتل بشكل مختلف. قد تظل المنشورات العامة مرئية للمستخدمين غير المسجلين الدخول.",
+  "block_modal.show_less": "أظهر الأقل",
   "block_modal.show_more": "أظهر المزيد",
   "block_modal.they_cant_mention": "لن يستطيع ذِكرك أو متابعتك.",
   "block_modal.they_cant_see_posts": "لن يستطيع رؤية منشوراتك ولن ترى منشوراته.",
-  "block_modal.they_will_know": "يمكنه أن يرى أنه قد تم حجبه.",
+  "block_modal.they_will_know": "يمكنه أن يرى أنه قد تم حظره.",
   "block_modal.title": "أتريد حظر المستخدم؟",
   "block_modal.you_wont_see_mentions": "لن تر المنشورات التي يُشار فيهم إليه.",
   "boost_modal.combo": "يُمكنك الضّغط على {combo} لتخطي هذا في المرة المُقبلة",
@@ -220,7 +220,7 @@
   "domain_pill.activitypub_lets_connect": "يتيح لك التواصل والتفاعل مع الناس ليس فقط على ماستدون، ولكن عبر تطبيقات اجتماعية مختلفة أيضا.",
   "domain_pill.activitypub_like_language": "إنّ ActivityPub مثل لغة ماستدون التي يتحدث بها مع شبكات اجتماعية أخرى.",
   "domain_pill.server": "الخادِم",
-  "domain_pill.their_handle": "مُعرِّفُه:",
+  "domain_pill.their_handle": "مُعرفه:",
   "domain_pill.their_server": "بيتهم الرقمي، حيث تُستضاف كافة منشوراتهم.",
   "domain_pill.their_username": "مُعرّفُهم الفريد على الخادم. من الممكن العثور على مستخدمين بنفس اسم المستخدم على خوادم مختلفة.",
   "domain_pill.username": "اسم المستخدم",
@@ -308,6 +308,8 @@
   "follow_suggestions.hints.similar_to_recently_followed": "هذا الملف الشخصي مشابه للملفات الشخصية التي تابعتها مؤخرا.",
   "follow_suggestions.personalized_suggestion": "توصية مخصصة",
   "follow_suggestions.popular_suggestion": "توصية رائجة",
+  "follow_suggestions.popular_suggestion_longer": "رائج على {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "مشابهة لمواصفات الملفات الشخصية التي تابعتَها حديثًا",
   "follow_suggestions.view_all": "عرض الكل",
   "follow_suggestions.who_to_follow": "حسابات للمُتابَعة",
   "followed_tags": "الوسوم المتابَعة",
@@ -360,8 +362,8 @@
   "interaction_modal.title.reply": "الرد على منشور {name}",
   "intervals.full.days": "{number, plural, one {# يوم} other {# أيام}}",
   "intervals.full.hours": "{number, plural, one {# ساعة} other {# ساعات}}",
-  "intervals.full.minutes": "{number, plural, one {# دقيقة} other {# دقائق}}",
-  "keyboard_shortcuts.back": "للعودة",
+  "intervals.full.minutes": "{number, plural, one {دقيقة واحدة}two {دقيقتان} other {# دقائق}}",
+  "keyboard_shortcuts.back": "للرجوع",
   "keyboard_shortcuts.blocked": "لفتح قائمة المستخدمين المحظورين",
   "keyboard_shortcuts.boost": "لإعادة النشر",
   "keyboard_shortcuts.column": "للتركيز على منشور على أحد الأعمدة",
@@ -421,7 +423,9 @@
   "loading_indicator.label": "جاري التحميل…",
   "media_gallery.toggle_visible": "{number, plural, zero {} one {اخف الصورة} two {اخف الصورتين} few {اخف الصور} many {اخف الصور} other {اخف الصور}}",
   "moved_to_account_banner.text": "حسابك {disabledAccount} معطل حاليًا لأنك انتقلت إلى {movedToAccount}.",
+  "mute_modal.hide_from_notifications": "إخفاء من قائمة الإشعارات",
   "mute_modal.hide_options": "إخفاء الخيارات",
+  "mute_modal.indefinite": "إلى أن أفسخ كتمها",
   "mute_modal.show_options": "إظهار الخيارات",
   "mute_modal.they_can_mention_and_follow": "سيكون بإمكانه الإشارة إليك ومتابعتك، لكنك لن تره.",
   "mute_modal.they_wont_know": "لن يَعرف أنه قد تم كتمه.",
@@ -460,10 +464,20 @@
   "notification.follow": "يتابعك {name}",
   "notification.follow_request": "لقد طلب {name} متابعتك",
   "notification.mention": "{name} ذكرك",
+  "notification.moderation-warning.learn_more": "اعرف المزيد",
+  "notification.moderation_warning.action_disable": "تم تعطيل حسابك.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "بعض من منشوراتك تم تصنيفها على أنها حساسة.",
+  "notification.moderation_warning.action_none": "لقد تلقى حسابك تحذيرا بالإشراف.",
+  "notification.moderation_warning.action_sensitive": "سيتم وضع علامة على منشوراتك على أنها حساسة من الآن فصاعدا.",
+  "notification.moderation_warning.action_suspend": "لقد تم تعليق حسابك.",
   "notification.own_poll": "انتهى استطلاعك للرأي",
   "notification.poll": "لقد انتهى استطلاع رأي شاركتَ فيه",
   "notification.reblog": "قام {name} بمشاركة منشورك",
+  "notification.relationships_severance_event": "فقدت الاتصالات مع {name}",
+  "notification.relationships_severance_event.account_suspension": "قام مشرف من {from} بتعليق {target}، مما يعني أنك لم يعد بإمكانك تلقي التحديثات منهم أو التفاعل معهم.",
+  "notification.relationships_severance_event.domain_block": "قام مشرف من {from} بحظر {target}، بما في ذلك {followersCount} من متابعينك و {followingCount, plural, one {# حساب} other {# حسابات}} تتابعها.",
   "notification.relationships_severance_event.learn_more": "اعرف المزيد",
+  "notification.relationships_severance_event.user_domain_block": "لقد قمت بحظر {target}، مما أدى إلى إزالة {followersCount} من متابعينك و {followingCount, plural, one {# حساب} other {# حسابات}} تتابعها.",
   "notification.status": "{name} نشر للتو",
   "notification.update": "عدّلَ {name} منشورًا",
   "notification_requests.accept": "موافقة",
@@ -503,10 +517,15 @@
   "notifications.permission_denied": "تنبيهات سطح المكتب غير متوفرة بسبب رفض أذونات المتصفح مسبقاً",
   "notifications.permission_denied_alert": "لا يمكن تفعيل إشعارات سطح المكتب، لأن إذن المتصفح قد تم رفضه سابقاً",
   "notifications.permission_required": "إشعارات سطح المكتب غير متوفرة لأنه لم يتم منح الإذن المطلوب.",
+  "notifications.policy.filter_new_accounts.hint": "تم إنشاؤها منذ {days, plural, zero {}one {يوم واحد} two {يومان} few {# أيام} many {# أيام} other {# أيام}}",
   "notifications.policy.filter_new_accounts_title": "حسابات جديدة",
+  "notifications.policy.filter_not_followers_hint": "بما في ذلك الأشخاص الذين يتابعونك أقل من {days, plural, zero {}one {يوم واحد} two {يومان} few {# أيام} many {# أيام} other {# أيام}}",
   "notifications.policy.filter_not_followers_title": "أشخاص لا يتابعونك",
   "notifications.policy.filter_not_following_hint": "حتى توافق عليهم يدويا",
   "notifications.policy.filter_not_following_title": "أشخاص لا تتابعهم",
+  "notifications.policy.filter_private_mentions_hint": "تمت تصفيته إلا إذا أن يكون ردًا على ذكرك أو إذا كنت تتابع الحساب",
+  "notifications.policy.filter_private_mentions_title": "إشارات خاصة غير مرغوب فيها",
+  "notifications.policy.title": "تصفية الإشعارات من…",
   "notifications_permission_banner.enable": "تفعيل إشعارات سطح المكتب",
   "notifications_permission_banner.how_to_control": "لتلقي الإشعارات عندما لا يكون ماستدون مفتوح، قم بتفعيل إشعارات سطح المكتب، يمكنك التحكم بدقة في أنواع التفاعلات التي تولد إشعارات سطح المكتب من خلال زر الـ{icon} أعلاه بمجرد تفعيلها.",
   "notifications_permission_banner.title": "لا تفوت شيئاً أبداً",
@@ -687,6 +706,7 @@
   "status.edited_x_times": "عُدّل {count, plural, zero {} one {مرةً واحدة} two {مرّتان} few {{count} مرات} many {{count} مرة} other {{count} مرة}}",
   "status.embed": "إدماج",
   "status.favourite": "فضّل",
+  "status.favourites": "{count, plural, zero {}one {مفضلة واحدة} two {مفضلتان} few {# مفضلات} many {# مفضلات} other {# مفضلات}}",
   "status.filter": "تصفية هذه الرسالة",
   "status.filtered": "مُصفّى",
   "status.hide": "إخفاء المنشور",
@@ -707,6 +727,7 @@
   "status.reblog": "إعادة النشر",
   "status.reblog_private": "إعادة النشر إلى الجمهور الأصلي",
   "status.reblogged_by": "شارَكَه {name}",
+  "status.reblogs": "{count, plural, one {تعزيز واحد} two {تعزيزتان} few {# تعزيزات} many {# تعزيزات} other {# تعزيزات}}",
   "status.reblogs.empty": "لم يقم أي أحد بمشاركة هذا المنشور بعد. عندما يقوم أحدهم بذلك سوف يظهر هنا.",
   "status.redraft": "إزالة وإعادة الصياغة",
   "status.remove_bookmark": "احذفه مِن الفواصل المرجعية",
diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json
index 59d3d0965afd2a..577664107946a5 100644
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@@ -331,7 +331,7 @@
   "footer.source_code": "Quellcode anzeigen",
   "footer.status": "Status",
   "generic.saved": "Gespeichert",
-  "getting_started.heading": "Auf geht’s!",
+  "getting_started.heading": "Auf gehts!",
   "hashtag.column_header.tag_mode.all": "und {additional}",
   "hashtag.column_header.tag_mode.any": "oder {additional}",
   "hashtag.column_header.tag_mode.none": "ohne {additional}",
@@ -400,7 +400,7 @@
   "keyboard_shortcuts.requests": "Liste der Follower-Anfragen aufrufen",
   "keyboard_shortcuts.search": "Suchleiste fokussieren",
   "keyboard_shortcuts.spoilers": "Feld für Inhaltswarnung anzeigen/ausblenden",
-  "keyboard_shortcuts.start": "„Auf geht’s!“ öffnen",
+  "keyboard_shortcuts.start": "„Auf gehts!“ öffnen",
   "keyboard_shortcuts.toggle_hidden": "Beitragstext hinter der Inhaltswarnung anzeigen/ausblenden",
   "keyboard_shortcuts.toggle_sensitivity": "Medien anzeigen/ausblenden",
   "keyboard_shortcuts.toot": "Neuen Beitrag erstellen",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index c11e4a2afdef77..6e590678fb3cb3 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -473,6 +473,15 @@
   "notification.follow": "{name}さんにフォローされました",
   "notification.follow_request": "{name}さんがあなたにフォローリクエストしました",
   "notification.mention": "{name}さんがあなたに返信しました",
+  "notification.moderation-warning.learn_more": "さらに詳しく",
+  "notification.moderation_warning": "あなたは管理者からの警告を受けています。",
+  "notification.moderation_warning.action_delete_statuses": "あなたによるいくつかの投稿が削除されました。",
+  "notification.moderation_warning.action_disable": "あなたのアカウントは無効になりました。",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "あなたの投稿のいくつかは閲覧注意として判定されています。",
+  "notification.moderation_warning.action_none": "あなたのアカウントは管理者からの警告を受けています。",
+  "notification.moderation_warning.action_sensitive": "あなたの投稿はこれから閲覧注意としてマークされます。",
+  "notification.moderation_warning.action_silence": "あなたのアカウントは制限されています。",
+  "notification.moderation_warning.action_suspend": "あなたのアカウントは停止されました。",
   "notification.own_poll": "アンケートが終了しました",
   "notification.poll": "アンケートが終了しました",
   "notification.reblog": "{name}さんがあなたの投稿をブーストしました",
diff --git a/app/javascript/mastodon/locales/sl.json b/app/javascript/mastodon/locales/sl.json
index ed4fa8dfaf7317..7806abc6b55fbb 100644
--- a/app/javascript/mastodon/locales/sl.json
+++ b/app/javascript/mastodon/locales/sl.json
@@ -308,6 +308,8 @@
   "follow_requests.unlocked_explanation": "Čeprav vaš račun ni zaklenjen, zaposleni pri {domain} menijo, da bi morda želeli pregledati zahteve za sledenje teh računov ročno.",
   "follow_suggestions.curated_suggestion": "Izbor osebja",
   "follow_suggestions.dismiss": "Ne pokaži več",
+  "follow_suggestions.featured_longer": "Osebno izbrala ekipa {domain}",
+  "follow_suggestions.friends_of_friends_longer": "Priljubljeno med osebami, ki jim sledite",
   "follow_suggestions.hints.featured": "Ta profil so izbrali skrbniki strežnika {domain}.",
   "follow_suggestions.hints.friends_of_friends": "Ta profil je priljubljen med osebami, ki jim sledite.",
   "follow_suggestions.hints.most_followed": "Ta profil na strežniku {domain} je en izmed najbolj sledenih.",
@@ -315,6 +317,8 @@
   "follow_suggestions.hints.similar_to_recently_followed": "Ta profil je podoben profilom, ki ste jim nedavno začeli slediti.",
   "follow_suggestions.personalized_suggestion": "Osebno prilagojen predlog",
   "follow_suggestions.popular_suggestion": "Priljubljen predlog",
+  "follow_suggestions.popular_suggestion_longer": "Priljubljeno na {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Podobno profilom, ki ste jim pred kratkim sledili",
   "follow_suggestions.view_all": "Pokaži vse",
   "follow_suggestions.who_to_follow": "Komu slediti",
   "followed_tags": "Sledeni ključniki",
@@ -469,6 +473,15 @@
   "notification.follow": "{name} vam sledi",
   "notification.follow_request": "{name} vam želi slediti",
   "notification.mention": "{name} vas je omenil/a",
+  "notification.moderation-warning.learn_more": "Več o tem",
+  "notification.moderation_warning": "Prejeli ste opozorilo moderatorjev",
+  "notification.moderation_warning.action_delete_statuses": "Nekatere vaše objave so odstranjene.",
+  "notification.moderation_warning.action_disable": "Vaš račun je bil onemogočen.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Nekatere vaše objave so bile označene kot občutljive.",
+  "notification.moderation_warning.action_none": "Vaš račun je prejel opozorilo moderatorjev.",
+  "notification.moderation_warning.action_sensitive": "Vaše objave bodo odslej označene kot občutljive.",
+  "notification.moderation_warning.action_silence": "Vaš račun je bil omejen.",
+  "notification.moderation_warning.action_suspend": "Vaš račun je bil suspendiran.",
   "notification.own_poll": "Vaša anketa je zaključena",
   "notification.poll": "Anketa, v kateri ste sodelovali, je zaključena",
   "notification.reblog": "{name} je izpostavila/a vašo objavo",
diff --git a/app/javascript/mastodon/locales/sq.json b/app/javascript/mastodon/locales/sq.json
index da35b3d43ba57a..a25eab9cbfe66e 100644
--- a/app/javascript/mastodon/locales/sq.json
+++ b/app/javascript/mastodon/locales/sq.json
@@ -297,6 +297,7 @@
   "filter_modal.select_filter.subtitle": "Përdorni një kategori ekzistuese, ose krijoni një të re",
   "filter_modal.select_filter.title": "Filtroje këtë postim",
   "filter_modal.title.status": "Filtroni një postim",
+  "filtered_notifications_banner.mentions": "{count, plural, one {përmendje} other {përmendje}}",
   "filtered_notifications_banner.pending_requests": "Njoftime prej {count, plural, =0 {askujt} one {një personi} other {# vetësh}} që mund të njihni",
   "filtered_notifications_banner.title": "Njoftime të filtruar",
   "firehose.all": "Krejt",
@@ -307,6 +308,8 @@
   "follow_requests.unlocked_explanation": "Edhe pse llogaria juaj s’është e kyçur, ekipi i {domain} mendoi se mund të donit të shqyrtonit dorazi kërkesa ndjekjeje prej këtyre llogarive.",
   "follow_suggestions.curated_suggestion": "Zgjedhur nga ekipi",
   "follow_suggestions.dismiss": "Mos shfaq më",
+  "follow_suggestions.featured_longer": "Zgjedhur enkas nga ekipi {domain}",
+  "follow_suggestions.friends_of_friends_longer": "Popullore mes personash që ndiqni",
   "follow_suggestions.hints.featured": "Ky profil është zgjedhur nga ekipi {domain}.",
   "follow_suggestions.hints.friends_of_friends": "Ky profil është popullor mes personave që ndiqni.",
   "follow_suggestions.hints.most_followed": "Ky profil është një nga më të ndjekur në {domain}.",
@@ -314,6 +317,8 @@
   "follow_suggestions.hints.similar_to_recently_followed": "Ky profil është i ngjashëm me profile që keni ndjekur tani afër.",
   "follow_suggestions.personalized_suggestion": "Sugjerim i personalizuar",
   "follow_suggestions.popular_suggestion": "Sugjerim popullor",
+  "follow_suggestions.popular_suggestion_longer": "Popullore në {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "I ngjashëm me profile që keni zënë të ndiqni së fundi",
   "follow_suggestions.view_all": "Shihni krejt",
   "follow_suggestions.who_to_follow": "Cilët të ndiqen",
   "followed_tags": "Hashtag-ë të ndjekur",
@@ -468,6 +473,15 @@
   "notification.follow": "{name} zuri t’ju ndjekë",
   "notification.follow_request": "{name} ka kërkuar t’ju ndjekë",
   "notification.mention": "{name} ju ka përmendur",
+  "notification.moderation-warning.learn_more": "Mësoni më tepër",
+  "notification.moderation_warning": "Keni marrë një sinjalizim moderimi",
+  "notification.moderation_warning.action_delete_statuses": "Disa nga postimet tuaja janë hequr.",
+  "notification.moderation_warning.action_disable": "Llogaria juaj është çaktivizuar.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Disa prej postimeve tuaja u është vënë shenjë si me spec.",
+  "notification.moderation_warning.action_none": "Llogaria juaj ka marrë një sinjalizim moderimi.",
+  "notification.moderation_warning.action_sensitive": "Postimeve tuaja do t’u vihet shenjë si me spec, nga tani e tutje.",
+  "notification.moderation_warning.action_silence": "Llogaria juaj është kufizuar.",
+  "notification.moderation_warning.action_suspend": "Llogaria juaj është pezulluar.",
   "notification.own_poll": "Pyetësori juaj ka përfunduar",
   "notification.poll": "Ka përfunduar një pyetësor ku keni votuar",
   "notification.reblog": "{name} përforcoi mesazhin tuaj",
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 93a0720b8a51f5..02ba56d0b23213 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -804,6 +804,7 @@ ar:
         desc_html: ويعتمد هذا على نصوص برمجية خارجية من hCaptcha، والتي قد تكون مصدر قلق يتعلق بالأمان والخصوصية. بالإضافة إلى ذلك، <strong>قد يؤدي ذلك إلى جعل عملية التسجيل أقل سهولة بالنسبة لبعض الأشخاص (وخاصة المعاقين)</strong>. لهذه الأسباب، يرجى النظر في تدابير بديلة مثل التسجيل على أساس الموافقة أو على أساس الدعوة.
         title: مطالبة المستخدمين الجدد بحل اختبار CAPTCHA لتأكيد حساباتهم
       content_retention:
+        danger_zone: منطقة خطرة
         preamble: التحكم في كيفية تخزين المحتوى الذي ينشئه المستخدم في ماستدون.
         title: الاحتفاظ بالمحتوى
       default_noindex:
diff --git a/config/locales/devise.ia.yml b/config/locales/devise.ia.yml
index 6c89f4c6d4f189..56875078188301 100644
--- a/config/locales/devise.ia.yml
+++ b/config/locales/devise.ia.yml
@@ -23,8 +23,11 @@ ia:
         action_with_app: Confirmar e retornar a %{app}
         title: Verificar adresse de e-mail
       email_changed:
+        explanation: 'Le adresse de e-mail pro tu conto essera cambiate a:'
+        subject: 'Mastodon: E-mail cambiate'
         title: Nove adresse de e-mail
       password_change:
+        explanation: Le contrasigno de tu conto ha essite cambiate.
         subject: 'Mastodon: Contrasigno cambiate'
         title: Contrasigno cambiate
       reconfirmation_instructions:
diff --git a/config/locales/doorkeeper.ia.yml b/config/locales/doorkeeper.ia.yml
index fd7d7a08367fbf..86bd1ad9853ca2 100644
--- a/config/locales/doorkeeper.ia.yml
+++ b/config/locales/doorkeeper.ia.yml
@@ -17,6 +17,7 @@ ia:
         authorize: Autorisar
         cancel: Cancellar
         edit: Modificar
+        submit: Submitter
       confirmations:
         destroy: Es tu secur?
       edit:
diff --git a/config/locales/doorkeeper.sq.yml b/config/locales/doorkeeper.sq.yml
index 308a5429a6da88..793819c597419e 100644
--- a/config/locales/doorkeeper.sq.yml
+++ b/config/locales/doorkeeper.sq.yml
@@ -174,6 +174,7 @@ sq:
       read:filters: të shohë filtrat tuaj
       read:follows: të shohë ndjekësit tuaj
       read:lists: të shohë listat tuaja
+      read:me: të shohë vetëm hollësi elementare të llogarisë tuaj
       read:mutes: të shohë ç’keni heshtuar
       read:notifications: të shohë njoftimet tuaja
       read:reports: të shohë raportimet tuaja
diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index 59dd2dbc0fcb10..85d7c0ed859592 100644
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -106,6 +106,9 @@ ia:
       pending: Attende revision
       perform_full_suspension: Suspender
       previous_strikes: Previe admonitiones
+      previous_strikes_description_html:
+        one: Iste conto ha <strong>un</strong> admonition.
+        other: Iste conto ha <strong>%{count}</strong> admonitiones.
       promote: Promover
       protocol: Protocollo
       public: Public
@@ -159,10 +162,10 @@ ia:
       undo_suspension: Disfacer le suspension
       unsilenced_msg: Le limite del conto de %{username} ha essite cancellate
       unsubscribe: Desubscriber
-      unsuspended_msg: Annullate suspension del conto %{username} con successo
+      unsuspended_msg: Le suspension del conto %{username} ha essite annullate
       username: Nomine de usator
       view_domain: Vider summario de dominio
-      warn: Avisar
+      warn: Advertir
       web: Web
       whitelisted: Permittite pro federation
     action_logs:
@@ -244,37 +247,102 @@ ia:
         create_user_role_html: "%{name} creava rolo de %{target}"
         demote_user_html: "%{name} degradava usator %{target}"
         destroy_announcement_html: "%{name} deleva annuncio %{target}"
+        destroy_canonical_email_block_html: "%{name} disblocava email con le hash %{target}"
         destroy_custom_emoji_html: "%{name} deleva emoji %{target}"
+        destroy_domain_allow_html: "%{name} impediva le federation con dominio %{target}"
         destroy_domain_block_html: "%{name} disblocava dominio %{target}"
+        destroy_email_domain_block_html: "%{name} disblocava le dominio email %{target}"
+        destroy_instance_html: "%{name} purgava le dominio %{target}"
+        destroy_ip_block_html: "%{name} deleva le regula pro IP %{target}"
+        destroy_status_html: "%{name} removeva le message de %{target}"
+        destroy_unavailable_domain_html: "%{name} resumeva le consignation al dominio %{target}"
         destroy_user_role_html: "%{name} deleva le rolo de %{target}"
+        disable_2fa_user_html: "%{name} disactivava le authentication a duo factores pro le usator %{target}"
+        disable_custom_emoji_html: "%{name} disactivava le emoticone %{target}"
+        disable_sign_in_token_auth_user_html: "%{name} disactivava authentication per testimonio via email pro %{target}"
+        disable_user_html: "%{name} disactivava le accesso pro le usator %{target}"
+        enable_custom_emoji_html: "%{name} activava le emoticone %{target}"
+        enable_sign_in_token_auth_user_html: "%{name} activava le authentication per testimonio via email pro %{target}"
+        enable_user_html: "%{name} activava le accesso pro le usator %{target}"
+        memorialize_account_html: "%{name} mutava le conto de %{target} in un pagina commemorative"
+        promote_user_html: "%{name} promoveva le usator %{target}"
+        reject_appeal_html: "%{name} refusava le appello del decision de moderation de %{target}"
+        reject_user_html: "%{name} refusava le inscription de %{target}"
+        remove_avatar_user_html: "%{name} removeva le avatar de %{target}"
+        reopen_report_html: "%{name} reaperiva le reporto %{target}"
+        resend_user_html: "%{name} reinviava le email de confirmation pro %{target}"
+        reset_password_user_html: "%{name} reinitialisava le contrasigno del usator %{target}"
+        resolve_report_html: "%{name} resolveva le reporto %{target}"
+        sensitive_account_html: "%{name} marcava como sensibile le medios de %{target}"
+        silence_account_html: "%{name} limitava le conto de %{target}"
+        suspend_account_html: "%{name} suspendeva le conto de %{target}"
+        unassigned_report_html: "%{name} de-assignava le reporto %{target}"
+        unblock_email_account_html: "%{name} disblocava le adresse email de %{target}"
+        unsensitive_account_html: "%{name} dismarcava como sensibile le medios de %{target}"
+        unsilence_account_html: "%{name} removeva le limite del conto de %{target}"
+        unsuspend_account_html: "%{name} removeva le suspension del conto de %{target}"
+        update_announcement_html: "%{name} actualisava le annuncio %{target}"
+        update_custom_emoji_html: "%{name} actualisava le emoticone %{target}"
+        update_domain_block_html: "%{name} actualisava le blocada de dominio pro %{target}"
+        update_ip_block_html: "%{name} cambiava le regula pro IP %{target}"
+        update_status_html: "%{name} actualisava le message per %{target}"
+        update_user_role_html: "%{name} cambiava le rolo de %{target}"
       deleted_account: conto delite
+      empty: Nulle registrationes trovate.
+      filter_by_action: Filtrar per action
+      filter_by_user: Filtrar per usator
+      title: Registro de inspection
     announcements:
       destroyed_msg: Annuncio delite con successo!
       edit:
         title: Modificar annuncio
       empty: Necun annuncios trovate.
+      live: Al vivo
       new:
         create: Crear annuncio
         title: Nove annuncio
       publish: Publicar
       published_msg: Annuncio publicate con successo!
+      scheduled_for: Programmate pro %{time}
+      scheduled_msg: Annuncio programmate pro le publication!
       title: Annuncios
+      unpublish: Depublicar
+      unpublished_msg: Le publication del annuncio ha essite disfacite!
+      updated_msg: Annuncio actualisate con successo!
+    critical_update_pending: Actualisation critic pendente
     custom_emojis:
+      assign_category: Assignar categoria
       by_domain: Dominio
       copied_msg: Copia local del emoji create con successo
       copy: Copiar
+      copy_failed_msg: Impossibile crear un copia local de ille emoticone
       create_new_category: Crear nove categoria
       created_msg: Emoji create con successo!
       delete: Deler
+      destroyed_msg: Emoticone destruite con successo destroyed!
       disable: Disactivar
       disabled: Disactivate
       disabled_msg: Emoji disactivate con successo
+      emoji: Emoticone
       enable: Activar
       enabled: Activate
       enabled_msg: Emoji activate con successo
+      image_hint: PNG o GIF usque %{size}
+      list: Listar
+      listed: Listate
       new:
         title: Adder nove emoji personalisate
+      no_emoji_selected: Nulle emoticones ha essite cambiate perque nulle ha essite seligite
+      not_permitted: Tu non es autorisate a exequer iste action
+      overwrite: Superscriber
+      shortcode: Via breve
+      shortcode_hint: Al minus 2 characteres, solo characteres alphanumeric e lineettas basse
       title: Emojis personalisate
+      uncategorized: Sin categoria
+      unlist: Non listar
+      unlisted: Non listate
+      update_failed_msg: Impossibile actualisar ille emoticone
+      updated_msg: Emoticone actualisate con successo!
       upload: Incargar
     dashboard:
       active_users: usatores active
@@ -282,71 +350,180 @@ ia:
       media_storage: Immagazinage de medios
       new_users: nove usatores
       opened_reports: reportos aperte
+      resolved_reports: reportos resolvite
       software: Software
+      sources: Fontes de inscription
+      space: Uso de spatio
+      title: Pannello de controlo
       top_languages: Linguas le plus active
       top_servers: Servitores le plus active
       website: Sito web
+    disputes:
+      appeals:
+        empty: Nulle appellos trovate.
+        title: Appellos
     domain_allows:
       add_new: Permitter federation con dominio
+      created_msg: Le dominio ha essite permittite con successo pro federation
+      destroyed_msg: Le dominio ha essite prohibite pro federation
       export: Exportar
       import: Importar
+      undo: Prohiber federation con dominio
     domain_blocks:
+      add_new: Adder nove blocada de dominio
       confirm_suspension:
         cancel: Cancellar
+        confirm: Suspender
+        permanent_action: Disfacer le suspension non restaurara alcun datos o relation.
+        preamble_html: Tu es sur le puncto de suspender <strong>%{domain}</strong> e su subdominios.
+        remove_all_data: Isto removera de tu servitor tote le contento, multimedia e datos de profilo del contos de iste dominio.
         stop_communication: Tu servitor stoppara le communication con iste servitores.
+        title: Confirmar le blocada del dominio %{domain}
+        undo_relationships: Isto disfacera omne relation de sequimento inter le contos de iste servitores e illos del tue.
+      created_msg: Le blocada del dominio es ora in tractamento
+      destroyed_msg: Le blocada del dominio ha essite disfacite
       domain: Dominio
-      edit: Modificar un bloco de dominio
+      edit: Modificar un blocada de dominio
+      existing_domain_block: Tu ha ja imponite limites plus stricte sur %{name}.
+      existing_domain_block_html: Tu ha ja imponite limites plus stricte sur %{name}; ora es necessari <a href="%{unblock_url}">disblocar lo</a> primo.
       export: Exportar
       import: Importar
       new:
+        create: Crear blocada
+        hint: Le blocada del dominio non impedira le creation de entratas de conto in le base de datos, ma applicara retroactive- e automaticamente le methodos specific de moderation a iste contos.
         severity:
+          desc_html: "<strong>Limitar</strong> rendera le messages del contos de iste dominio invisibile pro tote persona que non los seque. <strong>Suspender</strong> removera de tu servitor tote le contento, multimedia e datos de profilo del contos de iste dominio. Usa <strong>Necun</strong> si tu solmente vole rejectar le files multimedial."
+          noop: Nemo
           silence: Limitar
           suspend: Suspender
+        title: Nove blocada de dominio
+      no_domain_block_selected: Necun blocada de dominio ha essite cambiate perque necun ha essite seligite
+      not_permitted: Tu non es autorisate a exequer iste action
+      obfuscate: Offuscar le nomine de dominio
+      obfuscate_hint: Offuscar partialmente le nomine de dominio in le lista si le diffusion del lista de limitationes del dominio es activate
       private_comment: Commento private
+      private_comment_hint: Commentar iste limitation de dominio pro uso interne per le moderatores.
       public_comment: Commento public
+      public_comment_hint: Commentar iste limitation de dominio pro le publico general, si le diffusion del lista de limitationes del dominio es activate.
+      reject_media: Refusar files multimedial
+      reject_media_hint: Remove le files multimedial immagazinate localmente e refusa de discargar tales in futuro. Irrelevante pro le suspensiones
+      reject_reports: Refusar reportos
+      reject_reports_hint: Ignorar tote le reportos proveniente de iste dominio. Irrelevante pro le suspensiones
+      undo: Disfacer blocada de dominio
+      view: Examinar blocada de dominio
     email_domain_blocks:
       add_new: Adder nove
+      allow_registrations_with_approval: Permitter inscriptiones con approbation
+      attempts_over_week:
+        one: "%{count} tentativa de inscription in le ultime septimana"
+        other: "%{count} tentativas de inscription in le ultime septimana"
+      created_msg: Le dominio de e-mail ha essite blocate
       delete: Deler
+      dns:
+        types:
+          mx: Registro MX
       domain: Dominio
       new:
         create: Adder un dominio
+        resolve: Resolver dominio
         title: Blocar un nove dominio de e-mail
+      no_email_domain_block_selected: Necun blocadas de dominio de e-mail ha essite cambiate perque necun ha essite seligite
+      not_permitted: Non permittite
+      resolved_dns_records_hint_html: Le nomine de dominio se resolve al sequente dominios MX, le quales ha le ultime responsibilitate pro le reception de e-mail. Blocar un dominio MX blocara le inscriptiones de qualcunque adresse de e-mail que usa le mesme dominio MX, mesmo si le nomine de dominio visibile es differente. <strong>Presta attention a evitar de blocar le grande fornitores de e-mail.</strong>
+      resolved_through_html: Resolvite per %{domain}
       title: Dominios de e-mail blocate
     export_domain_allows:
+      new:
+        title: Importar permissiones de dominio
       no_file: Necun file seligite
     export_domain_blocks:
+      import:
+        description_html: Tu es sur le puncto de importar un lista de blocadas de dominio. Per favor revide con grande cura iste lista, particularmente si tu non lo ha scribite tu mesme.
+        existing_relationships_warning: Relationes existente de sequimento
+        private_comment_description_html: 'Pro adjutar te a traciar de ubi proveni le blocadas importate, le blocadas importate essera create con le sequente commento private: <q>%{comment}</q>'
+        private_comment_template: Importate de %{source} le %{date}
+        title: Importar blocadas de dominio
+      invalid_domain_block: 'Un o plus blocadas de dominio ha essite saltate a causa del sequente error(es): %{error}'
+      new:
+        title: Importar blocadas de dominio
       no_file: Necun file seligite
     follow_recommendations:
+      description_html: "<strong>Le recommendationes de sequimento adjuta le nove usatores a trovar rapidemente contento interessante.</strong> Quando un usator non ha un historia sufficiente de interactiones con alteres pro formar recommendationes personalisate de sequimento, iste contos es recommendate. Illos se recalcula cata die a partir de un mixtura de contos con le plus grande numero de ingagiamentos recente e le numero de sequitores local le plus alte pro un lingua date."
       language: Per lingua
       status: Stato
+      suppress: Supprimer recommendation de sequimento
+      suppressed: Supprimite
       title: Sequer le recommendationes
+      unsuppress: Restaurar recommendation de sequimento
     instances:
+      availability:
+        description_html:
+          one: Si le livration al dominio falle <strong>%{count} die</strong> sin succeder, necun tentativa ulterior de livration essera facite, excepte si es recipite un livration <em>ab</em> le dominio.
+          other: Si le livration al dominio falle durante <strong>%{count} dies differente</strong> sin succeder, necun tentativa ulterior de livration essera facite, excepte si es recipite un livration <em>ab</em> le dominio.
+        failure_threshold_reached: Limine de fallimentos attingite le %{date}.
+        failures_recorded:
+          one: Tentativa fallite durante %{count} die.
+          other: Tentativa fallite durante %{count} dies differente.
+        no_failures_recorded: Necun fallimento cognoscite.
+        title: Disponibilitate
+        warning: Le ultime tentativa de connexion a iste servitor non ha succedite
       back_to_all: Toto
       back_to_limited: Limitate
       back_to_warning: Advertimento
       by_domain: Dominio
+      confirm_purge: Es tu secur que tu vole deler permanentemente le datos de iste dominio?
       content_policies:
         comment: Nota interne
+        description_html: Tu pote definir politicas de contento que se applicara a tote le contos de iste dominio e a qualcunque de su subdominios.
+        limited_federation_mode_description_html: Tu pote decider si permitter le federation con iste dominio.
         policies:
+          reject_media: Rejectar multimedia
+          reject_reports: Rejectar reportos
           silence: Limitar
           suspend: Suspender
         policy: Politica
         reason: Ration public
+        title: Politicas de contento
       dashboard:
         instance_accounts_dimension: Contos le plus sequite
+        instance_accounts_measure: contos immagazinate
+        instance_followers_measure: nostre sequitores illac
+        instance_follows_measure: lor sequitores hic
         instance_languages_dimension: Linguas principal
+        instance_media_attachments_measure: annexos multimedial immagazinate
+        instance_reports_measure: signalationes sur illos
+        instance_statuses_measure: messages immagazinate
       delivery:
+        all: Totes
+        clear: Rader errores de livration
+        failing: Fallente
+        restart: Recomenciar livration
+        stop: Cessar livration
         unavailable: Non disponibile
+      delivery_available: Livration es disponibile
+      delivery_error_days: Dies de errores de livration
+      delivery_error_hint: Si le livration non es possibile durante %{count} dies, illo essera automaticamente marcate como non livrabile.
+      destroyed_msg: Le datos de %{domain} es ora in cauda pro deletion imminente.
       empty: Necun dominios trovate.
+      known_accounts:
+        one: "%{count} conto cognoscite"
+        other: "%{count} contos cognoscite"
       moderation:
         all: Toto
         limited: Limitate
         title: Moderation
       private_comment: Commento private
       public_comment: Commento public
+      purge: Purgar
+      purge_description_html: Si tu crede que iste dominio es foras de linea pro sempre, tu pote deler de tu immagazinage tote le registros del conto e le datos associate de iste dominio. Isto pote prender un tempore.
       title: Federation
       total_blocked_by_us: Blocate per nos
+      total_followed_by_them: Sequite per illes
       total_followed_by_us: Sequite per nos
+      total_reported: Signalationes sur illes
+      total_storage: Annexos multimedial
+      totals_time_period_hint_html: Le totales monstrate hic infra include le datos de tote le tempore.
+      unknown_instance: Iste dominio non es actualmente cognoscite sur iste servitor.
     invites:
       deactivate_all: Disactivar toto
       filter:
@@ -357,6 +534,7 @@ ia:
       title: Invitationes
     ip_blocks:
       add_new: Crear regula
+      created_msg: Le nove regula IP ha essite addite
       delete: Deler
       expires_in:
         '1209600': 2 septimanas
@@ -367,8 +545,12 @@ ia:
         '94670856': 3 annos
       new:
         title: Crear un nove regula IP
+      no_ip_block_selected: Necun regula IP ha essite cambiate perque necun ha essite seligite
       title: Regulas IP
+    relationships:
+      title: Relationes de %{acct}
     relays:
+      add_new: Adder nove repetitor
       delete: Deler
       description_html: Un <strong>repetitor de federation</strong> es un servitor intermediari que excambia grande volumines de messages public inter le servitores que se inscribe e publica a illo. <strong>Illo pote adjutar le servitores micre e medie a discoperir le contento del fediverso</strong>, sin requirer que le usatores local seque manualmente altere personas sur servitores distante.
       disable: Disactivar
@@ -376,59 +558,212 @@ ia:
       enable: Activar
       enable_hint: Un vice activate, tu servitor se inscribera a tote le messages public de iste repetitor, e comenciara a inviar le messages public de iste servitor a illo.
       enabled: Activate
+      inbox_url: URL del repetitor
+      pending: Attende le approbation del repetitor
       save_and_enable: Salveguardar e activar
+      setup: Crear un connexion con un repetitor
+      signatures_not_enabled: Le repetitores pote non functionar correctemente durante que le modo secur o le modo de federation limitate es activate
       status: Stato
+      title: Repetitores
+    report_notes:
+      created_msg: Nota de signalation create con successo!
+      destroyed_msg: Nota de signalation delite con successo!
     reports:
+      account:
+        notes:
+          one: "%{count} nota"
+          other: "%{count} notas"
+      action_log: Registro de inspection
+      action_taken_by: Action prendite per
+      actions:
+        delete_description_html: Le messages signalate essera delite e un admonition essera registrate pro adjutar te a prender mesuras in caso de futur infractiones proveniente del mesme conto.
+        mark_as_sensitive_description_html: Le files multimedial in le messages reportate essera marcate como sensibile e un admonition essera registrate pro adjutar te a prender mesuras in caso de futur infractiones proveniente del mesme conto.
+        other_description_html: Vider plus optiones pro controlar le comportamento del conto e personalisar le communication al conto signalate.
+        resolve_description_html: Necun action essera prendite contra le conto signalate, necun admonition registrate, e le signalation essera claudite.
+        silence_description_html: Iste conto essera visibile solmente a qui ja lo seque o manualmente lo cerca, limitante gravemente su portata. Pote sempre esser revertite. Claude tote le signalationes contra iste conto.
+        suspend_description_html: Le conto e tote su contento essera inaccessible e finalmente delite, e interager con illo essera impossibile. Reversibile intra 30 dies. Claude tote le signalationes contra iste conto.
+      actions_description_html: Decide qual action prender pro resolver iste signalation. Si tu prende un action punitive contra le conto signalate, le persona recipera un notification in e-mail, excepte si le categoria <strong>Spam</strong> es seligite.
+      actions_description_remote_html: Decide qual action prender pro resolver iste signalation. Isto affectara solmente le maniera in que <strong>tu</strong> servitor communica con iste conto remote e gere su contento.
       add_to_report: Adder plus al reporto
+      already_suspended_badges:
+        local: Ja suspendite sur iste servitor
+        remote: Ja suspendite sur su servitor
       are_you_sure: Es tu secur?
+      assign_to_self: Assignar a me
+      assigned: Moderator assignate
+      by_target_domain: Dominio del conto signalate
       cancel: Cancellar
       category: Categoria
+      category_description_html: Le motivo pro le qual iste conto e/o contento ha essite signalate essera citate in le communication con le conto signalate
+      comment:
+        none: Necun
+      comment_description_html: 'Pro fornir plus information, %{name} ha scribite:'
       confirm: Confirmar
+      confirm_action: Confirmar le action de moderation contra %{acct}
+      created_at: Signalate
       delete_and_resolve: Deler le messages
+      forwarded: Reexpedite
+      forwarded_replies_explanation: Iste signalation proveni de un usator remote e concerne contento remote. Illo te ha essite reexpedite perque le contento signalate es in responsa a un usator tue.
+      forwarded_to: Reexpedite a %{domain}
+      mark_as_resolved: Marcar como resolvite
+      mark_as_sensitive: Marcar como sensibile
+      mark_as_unresolved: Marcar como non resolvite
       no_one_assigned: Nemo
       notes:
         create: Adder un nota
+        create_and_resolve: Resolver con nota
+        create_and_unresolve: Reaperir con nota
         delete: Deler
+        placeholder: Describe le actiones prendite, o insere altere information pertinente...
         title: Notas
+      notes_description_html: Vider e lassar notas pro altere moderatores e pro tu proprie futuro
+      processed_msg: 'Reporto #%{id} elaborate con successo'
+      quick_actions_description_html: 'Face un rapide action o rola a basso pro vider le contento reportate:'
+      remote_user_placeholder: le usator remote ab %{instance}
+      reopen: Reaperir reporto
+      report: 'Reporto #%{id}'
+      reported_account: Conto signalate
+      reported_by: Signalate per
+      resolved: Resolvite
+      resolved_msg: Reporto resolvite con successo!
       skip_to_actions: Saltar al actiones
       status: Stato
+      statuses: Contento signalate
+      statuses_description_html: Le contento offensive sera citate in communication con le conto reportate
+      summary:
+        action_preambles:
+          delete_html: 'Tu va <strong>remover</strong> parte de messages de <strong>@%{acct}</strong>. Isto ira:'
+          mark_as_sensitive_html: 'Tu va <strong>marcar</strong> parte de messages de <strong>@%{acct}</strong> como <strong>sensibile</strong>. Isto ira:'
+          silence_html: 'Tu va <strong>limitar</strong> le conto de <strong>@%{acct}</strong>. Isto ira:'
+          suspend_html: 'Tu va <strong>limitar</strong> le conto de <strong>@%{acct}</strong>. Isto ira:'
+        actions:
+          delete_html: Remover le messages offensive
+          mark_as_sensitive_html: Marcar le medios de messages offensive como sensibile
+          silence_html: Limitar gravemente le portata de <strong>@%{acct}</strong> rendente le profilo e contento visibile solmente a qui ja lo seque o lo cerca manualmente
+          suspend_html: Suspender <strong>@%{acct}</strong>, rendente le profilo e contento inaccessibile e le interaction con illo impossibile
+        close_report: Marcar le signalation №%{id} como resolvite
+        close_reports_html: Marcar <strong>tote</strong> le signalationes contra <strong>@%{acct}</strong> como resolvite
+        delete_data_html: Deler le profilo e contento de <strong>@%{acct}</strong> in 30 dies excepte si le suspension es disfacite intertanto
+        preview_preamble_html: "<strong>@%{acct}</strong> recipera un advertimento con le sequente contento:"
+        record_strike_html: Registrar un admonition contra <strong>@%{acct}</strong> pro adjutar te a imponer sanctiones in caso de futur violationes de iste conto
+        send_email_html: Inviar un e-mail de advertimento a <strong>@%{acct}</strong>
+        warning_placeholder: Motivation supplementari facultative pro le action de moderation.
+      target_origin: Origine del conto signalate
+      title: Reportos
+      unassign: Disassignar
+      unknown_action_msg: 'Action incognite: %{action}'
+      unresolved: Non resolvite
       updated_at: Actualisate
       view_profile: Vider profilo
     roles:
+      add_new: Adder rolo
       assigned_users:
         one: "%{count} usator"
         other: "%{count} usatores"
       categories:
+        administration: Administration
+        devops: DevOps
         invites: Invitationes
         moderation: Moderation
         special: Special
       delete: Deler
+      description_html: Le <strong>rolos de usator</strong> permitte personalisar le functiones e areas de Mastodon al quales le usator pote acceder.
+      edit: Modificar le rolo '%{name}'
       everyone: Permissiones predefinite
+      everyone_full_description_html: Iste es le <strong>rolo de base</strong> que affecta <strong>tote le usatores</strong>, mesmo illes sin rolo assignate. Tote le altere rolos heredita le permissiones de illo.
+      permissions_count:
+        one: "%{count} permission"
+        other: "%{count} permissiones"
       privileges:
+        administrator: Administrator
+        administrator_description: Le usatores con iste permission pote contornar tote permission
         delete_user_data: Deler le datos de usator
+        delete_user_data_description: Permitte que usatores dele immediatemente le datos de altere usatores
+        invite_users: Invitar usatores
+        invite_users_description: Permitte que usatores invita nove personas al servitor
         manage_announcements: Gerer le annuncios
+        manage_announcements_description: Permitte que usatores genere annuncios sur le servitor
+        manage_appeals: Gerer appellos
+        manage_appeals_description: Permitte que usatores revide appellos contra actiones de moderation
+        manage_blocks: Gerer blocadas
+        manage_blocks_description: Permitter que usatores bloca le fornitores de e-mail e le adresses IP
+        manage_custom_emojis: Gerer emojis personalisate
+        manage_custom_emojis_description: Permitte que usatores gere emojis personalisate sur le servitor
+        manage_federation: Gerer federation
+        manage_federation_description: Permitte que le usatores bloca o permitte le federation con altere dominios, e controla le livration
         manage_invites: Gerer le invitationes
+        manage_invites_description: Permitte que usatores examina e deactiva ligamines de invitation
+        manage_reports: Gerer le reportos
+        manage_reports_description: Permitte que usatores revide signalationes e exeque actiones de moderation a base de illos
+        manage_roles: Gerer le rolos
+        manage_roles_description: Permitte que usatores gere e assigna rolos inferior a lor privilegios actual
         manage_rules: Gerer le regulas
+        manage_rules_description: Permitte que usatores cambia le regulas del servitor
         manage_settings: Gerer le parametros
+        manage_settings_description: Permitte que usatores cambia le parametros del sito
+        manage_taxonomies: Gerer taxonomias
+        manage_taxonomies_description: Permitte que usatores revide contento in tendentias e actualisa le parametros de hashtag
+        manage_user_access: Gerer le accessos de usator
+        manage_user_access_description: Permitte que usatores disactiva le authentication bifactorial de altere usatores, cambia lor adresses de e-mail, e reinitialisa lor contrasigno
         manage_users: Gerer usatores
+        manage_users_description: Permitte que usatores vide le detalios de altere usatores e exeque actiones de moderation contra illes
+        manage_webhooks: Gerer Webhooks
+        manage_webhooks_description: Permitte que usatores installa “webhooks” pro eventos administrative
+        view_audit_log: Vider le registro de inspection
+        view_audit_log_description: Permitte que usatores vide un historia de actiones administrative sur le servitor
+        view_dashboard: Vider le tabuliero de instrumentos
+        view_dashboard_description: Permitte que usatores accede al tabuliero de instrumentos e a varie statisticas
+        view_devops: DevOps
+        view_devops_description: Permitte que usatores accede al tabulieros de instrumentos de Sidekiq e pgHero
       title: Rolos
     rules:
+      add_new: Adder regula
       delete: Deler
+      description_html: Ben que multes affirma de haber legite e acceptate le conditiones de servicio, generalmente le gente non los lege completemente usque un problema surge. <strong>Facilita le visibilitate del regulas de tu servitor in un colpo de oculo forniente los in un lista a punctos.</strong> Tenta mantener le regulas individual curte e simple, ma sin divider los in multe punctos separate.
+      edit: Modificar regula
+      empty: Necun regula del servitor ha essite definite ancora.
+      title: Regulas del servitor
     settings:
       about:
+        manage_rules: Gerer le regulas del servitor
+        preamble: Fornir information detaliate sur le functionamento, moderation e financiamento del servitor.
+        rules_hint: Il ha un area dedicate al regulas que tu usatores debe acceptar.
         title: A proposito de
       appearance:
         preamble: Personalisar le interfacie web de Mastodon.
         title: Apparentia
+      branding:
+        preamble: Le marca de tu servitor lo differentia de altere servitores in le rete. Iste information pote esser monstrate in diverse ambientes, como le interfacie web de Mastodon, applicationes native, in previsualisationes de ligamines sur altere sitos web, in applicationes de messageria, etc. Pro iste ration, il es melior mantener iste information clar, breve e concise.
+        title: Marca
+      captcha_enabled:
+        desc_html: Iste depende de scripts externe de hCaptcha, que pote esser un problema de securitate e vita private. De plus, <strong>isto pote render le processo de inscription multo minus accessibile a certe personas (particularmente personas con discapacitates)</strong>. Pro iste rationes, considera altere mesuras como le inscription basate sur approbation o invitation.
+        title: Require que nove usatores solve un CAPTCHA pro confirmar lor conto
+      content_retention:
+        danger_zone: Zona periculose
       discovery:
         profile_directory: Directorio de profilos
         public_timelines: Chronologias public
+        title: Discoperi
         trends: Tendentias
+      domain_blocks:
+        all: A omnes
+        disabled: A necuno
+        users: A usators local in session
+      registrations:
+        title: Registrationes
+      registrations_mode:
+        modes:
+          none: Nemo pote inscriber se
+          open: Quicunque pote inscriber se
+      security:
+        authorized_fetch_hint: Requirer authentication de servitores federate permitte un application plus stricte de blocadas a nivello de usator e de servitor. Nonobstante, isto diminue le prestationes del servitor, reduce le portata de tu responsas e pote introducer problemas de compatibilitate con certe servicios federate. In plus, isto non impedira le actores dedicate a recuperar tu messages public e tu contos.
       title: Parametros de servitor
     site_uploads:
       delete: Deler file incargate
+      destroyed_msg: Incarga de sito delite con successo!
     software_updates:
       documentation_link: Pro saper plus
+      release_notes: Notas de version
       title: Actualisationes disponibile
       type: Typo
       types:
@@ -443,31 +778,136 @@ ia:
       deleted: Delite
       favourites: Favoritos
       history: Chronologia del versiones
+      in_reply_to: Replicante a
       language: Lingua
       media:
         title: Medios
       metadata: Metadatos
       open: Aperir message
       original_status: Message original
+      status_changed: Messages cambiate
       title: Messages del conto
       trending: Tendentias
       visibility: Visibilitate
+      with_media: Con medios
     strikes:
       actions:
+        delete_statuses: "%{name} ha delite le messages de %{target}"
+        disable: "%{name} ha gelate le conto de %{target}"
+        mark_statuses_as_sensitive: "%{name} ha marcate le messages de %{target} como sensibile"
         none: "%{name} ha inviate un advertimento a %{target}"
+        sensitive: "%{name} ha marcate le conto de %{target} como sensibile"
+        silence: "%{name} ha limitate le conto de %{target}"
+        suspend: "%{name} ha suspendite le conto de %{target}"
+      appeal_approved: Appello facite
+      appeal_pending: Appello pendente
+      appeal_rejected: Appello rejectate
     system_checks:
+      elasticsearch_preset:
+        action: Vide documentation
+      elasticsearch_preset_single_node:
+        action: Vide documentation
       rules_check:
         action: Gerer le regulas del servitor
       software_version_critical_check:
         action: Vider le actualisationes disponibile
+        message_html: Un actualisation critic de Mastodon es disponibile, actualisa lo le plus rapide possibile.
       software_version_patch_check:
         action: Vider le actualisationes disponibile
       upload_check_privacy_error:
         action: Verifica hic pro plus de information
+      upload_check_privacy_error_object_storage:
+        action: Verifica hic pro plus de information
+    trends:
+      approved: Approbate
+      rejected: Rejectate
+      tags:
+        not_usable: Non pote esser usate
+      title: Tendentias
+    warning_presets:
+      add_new: Adder nove
+      delete: Deler
+    webhooks:
+      delete: Deler
+      disable: Disactivar
+      disabled: Disactivate
+      enable: Activar
+      events: Eventos
+      status: Stato
+  admin_mailer:
+    new_critical_software_updates:
+      subject: Actualisationes critic de Mastodon es disponibile pro %{instance}!
+    new_software_updates:
+      subject: Nove versiones de Mastodon es disponibile pro %{instance}!
+  appearance:
+    advanced_web_interface: Interfacie web avantiate
+    sensitive_content: Contento sensibile
   application_mailer:
+    notification_preferences: Cambiar preferentias de e-mail
+    settings: 'Cambiar preferentias de e-mail: %{link}'
     unsubscribe: Desubscriber
+    view: 'Vider:'
+    view_profile: Vider profilo
+    view_status: Vider message
+  applications:
+    created: Application create con successo
+    destroyed: Application delite con successo
+    logout: Clauder le session
+  auth:
+    confirmations:
+      welcome_title: Benvenite, %{name}!
+    delete_account: Deler le conto
+    logout: Clauder le session
+    progress:
+      details: Tu detalios
+    set_new_password: Definir un nove contrasigno
+    status:
+      account_status: Stato del conto
+      view_strikes: Examinar le admonitiones passate contra tu conto
+  challenge:
+    invalid_password: Contrasigno non valide
+  deletes:
+    proceed: Deler le conto
+    success_msg: Tu conto esseva delite con successo
+    warning:
+      data_removal: Tu messages e altere datos essera removite permanentemente
+      email_change_html: Tu pote <a href="%{path}">cambiar tu adresse de e-mail</a> sin deler tu conto
+  disputes:
+    strikes:
+      action_taken: Action prendite
+      appeal: Facer appello
+      appeal_approved: Iste admonition ha essite annullate in appello e non es plus valide
+      appeal_rejected: Le appello ha essite rejectate
+      appeal_submitted_at: Appello submittite
+      appealed_msg: Tu appello ha essite submittite. Si es approbate, tu recipera notification.
+      appeals:
+        submit: Submitter appello
+      approve_appeal: Approbar apello
+      associated_report: Signalation associate
+      created_at: Del data
+      description_html: Istes es le actiones prendite contra tu conto e le advertimentos que te ha essite inviate per le personal de %{instance}.
+      recipient: Adressate a
+      reject_appeal: Rejectar appello
+      status: Message №%{id}
+      status_removed: Le message ha ja essite removite del systema
+      title: "%{action} del %{date}"
+      title_actions:
+        delete_statuses: Elimination de messages
+        disable: Gelamento del conto
+        mark_statuses_as_sensitive: Marcation de messages como sensibile
+        none: Advertimento
+        sensitive: Marcation del conto como sensibile
+        silence: Limitation del conto
+        suspend: Suspension del conto
+      your_appeal_approved: Tu appello ha essite approbate
+      your_appeal_pending: Tu ha submittite un appello
+      your_appeal_rejected: Tu appello ha essite rejectate
   edit_profile:
+    basic_information: Information basic
     other: Alteres
+  errors:
+    '422':
+      content: Le verification de securitate ha fallite. Bloca tu le cookies?
   existing_username_validator:
     not_found_multiple: non poteva trovar %{usernames}
   exports:
@@ -478,6 +918,7 @@ ia:
     blocks: Tu ha blocate
     bookmarks: Marcapaginas
     csv: CSV
+    domain_blocks: Blocadas de dominio
     mutes: Tu ha silentiate
     storage: Immagazinage de medios
   featured_tags:
@@ -496,6 +937,10 @@ ia:
       title: Modificar filtro
     index:
       delete: Deler
+      title: Filtros
+    new:
+      save: Salveguardar nove filtro
+      title: Adder nove filtro
   generic:
     all: Toto
     cancel: Cancellar
@@ -509,12 +954,37 @@ ia:
   imports:
     errors:
       empty: File CSV vacue
+      invalid_csv_file: 'File CSV non valide. Error: %{error}'
       too_large: Le file es troppo longe
     failures: Fallimentos
+    overwrite_preambles:
+      blocking_html: Tu es sur le puncto de <strong>reimplaciar tu lista de blocadas</strong> per usque a <strong>%{total_items} contos</strong> proveniente de <strong>%{filename}</strong>.
+      domain_blocking_html: Tu es sur le puncto de <strong>reimplaciar tu lista de blocadas de dominio</strong> per usque a <strong>%{total_items} dominios</strong> proveniente de <strong>%{filename}</strong>.
+    preambles:
+      blocking_html: Tu es sur le puncto de <strong>blocar</strong> usque a <strong>%{total_items} contos</strong> a partir de <strong>%{filename}</strong>.
+      domain_blocking_html: Tu es sur le puncto de <strong>blocar</strong> usque a <strong>%{total_items} dominios</strong> a partir de <strong>%{filename}</strong>.
+    preface: Tu pote importar datos que tu ha exportate de un altere servitor, como un lista de personas que tu seque o bloca.
+    recent_imports: Importationes recente
     status: Stato
+    titles:
+      blocking: Importation de contos blocate
+      bookmarks: Importation de marcapaginas
+      domain_blocking: Importation de dominios blocate
+      lists: Importation de listas
+      muting: Importation de contos silentiate
+    type: Typo de importation
+    type_groups:
+      constructive: Sequites e marcapaginas
+      destructive: Blocadas e silentiamentos
     types:
+      blocking: Lista de blocadas
+      bookmarks: Marcapaginas
+      domain_blocking: Lista de dominios blocate
       lists: Listas
+    upload: Incargar
   invites:
+    delete: Disactivar
+    expired: Expirate
     expires_in:
       '1800': 30 minutas
       '21600': 6 horas
@@ -544,9 +1014,90 @@ ia:
   migrations:
     errors:
       not_found: non poterea esser trovate
+  move_handler:
+    carry_blocks_over_text: Iste usator ha cambiate de conto desde %{acct}, que tu habeva blocate.
+  notification_mailer:
+    follow:
+      title: Nove sequitor
+    follow_request:
+      title: Nove requesta de sequimento
+    mention:
+      action: Responder
+    poll:
+      subject: Un inquesta de %{name} ha finite
+  pagination:
+    next: Sequente
   preferences:
+    other: Altere
     public_timelines: Chronologias public
+  privacy_policy:
+    title: Politica de confidentialitate
+  relationships:
+    activity: Activitate del conto
+    most_recent: Plus recente
+    status: Stato del conto
+  sessions:
+    activity: Ultime activitate
+    browser: Navigator
+    browsers:
+      alipay: Alipay
+      blackberry: BlackBerry
+      chrome: Chrome
+      edge: Microsoft Edge
+      electron: Electron
+      firefox: Firefox
+      generic: Navigator incognite
+      huawei_browser: Huawei Browser
+      ie: Internet Explorer
+      micro_messenger: MicroMessenger
+      nokia: Navigator de Nokia S40 Ovi
+      opera: Opera
+      otter: Otter
+      phantom_js: PhantomJS
+      qq: QQ Browser
+      safari: Safari
+      uc_browser: UC Browser
+      unknown_browser: Navigator Incognite
+      weibo: Weibo
+    current_session: Session actual
+    date: Data
+    description: "%{browser} sur %{platform}"
+    platforms:
+      adobe_air: Adobe Air
+      android: Android
+      blackberry: BlackBerry
+      chrome_os: ChromeOS
+      firefox_os: Firefox OS
+      ios: iOS
+      kai_os: KaiOS
+      linux: Linux
+      mac: macOS
+      unknown_platform: Platteforma incognite
+      windows: Windows
+      windows_mobile: Windows Mobile
+      windows_phone: Windows Phone
+  settings:
+    account: Conto
+    account_settings: Parametros de conto
+    appearance: Apparentia
+    delete: Deletion de conto
+    development: Disveloppamento
+    edit_profile: Modificar profilo
+    import: Importar
+    migrate: Migration de conto
+    notifications: Notificationes de e-mail
+    preferences: Preferentias
+    profile: Profilo public
+    relationships: Sequites e sequitores
+    strikes: Admonitiones de moderation
+  severed_relationships:
+    event_type:
+      domain_block: Suspension del servitor (%{target_name})
+      user_domain_block: Tu ha blocate %{target_name}
+    preamble: Tu pote perder sequites e sequitores quando tu bloca un dominio o quando tu moderatores decide suspender un servitor remote. Quando isto occurre, tu potera discargar listas de relationes rumpite, a inspectar e eventualmente importar in un altere servitor.
+    type: Evento
   statuses:
+    open_in_web: Aperir in le web
     poll:
       vote: Votar
     show_more: Monstrar plus
@@ -563,7 +1114,13 @@ ia:
       '604800': 1 septimana
       '63113904': 2 annos
       '7889238': 3 menses
+  stream_entries:
+    sensitive_content: Contento sensibile
+  strikes:
+    errors:
+      too_late: Es troppo tarde pro facer appello contra iste admonition
   themes:
+    contrast: Mastodon (Alte contrasto)
     default: Mastodon (Obscur)
     mastodon-light: Mastodon (Clar)
     system: Automatic (usar thema del systema)
@@ -574,6 +1131,24 @@ ia:
   user_mailer:
     appeal_approved:
       action: Parametros de conto
+      explanation: Le appello contra le admonition contra tu conto del %{strike_date}, que tu ha submittite le %{appeal_date}, ha essite approbate. Tu conto ha de novo un bon reputation.
+    appeal_rejected:
+      explanation: Le appello contra le admonition contra tu conto del %{strike_date}, que tu ha submittite le %{appeal_date}, ha essite rejectate.
+    warning:
+      appeal: Submitter un appello
+      subject:
+        none: Advertimento pro %{acct}
+        sensitive: Tu messages sur %{acct} essera marcate como sensibile a partir de ora
+        silence: Tu conto %{acct} ha essite limitate
+        suspend: Tu conto %{acct} ha essite suspendite
+      title:
+        delete_statuses: Messages removite
+        disable: Conto gelate
+        mark_statuses_as_sensitive: Messages marcate como sensibile
+        none: Advertimento
+        sensitive: Conto marcate como sensibile
+        silence: Conto limitate
+        suspend: Conto suspendite
     welcome:
       apps_android_action: Obtene lo sur Google Play
       apps_ios_action: Discargar sur le App Store
@@ -582,6 +1157,9 @@ ia:
       edit_profile_action: Personalisar
       edit_profile_title: Personalisar tu profilo
       feature_action: Apprender plus
+      follow_action: Sequer
+      post_title: Face tu prime message
+      share_action: Compartir
       share_title: Compartir tu profilo de Mastodon
       subject: Benvenite in Mastodon
   verification:
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index da9a4214117720..0712ba380ad947 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -737,6 +737,7 @@ ja:
         desc_html: この機能は hCaptcha による外部スクリプトを使用しますが、hCaptcha にはセキュリティとプライバシーの懸念が考えられます。また、<strong>CAPTCHAにより新規登録のアクセシビリティが大幅に損なわれる可能性があり、身体および精神障害者においては特に顕著です。</strong>以上の理由から、承認制や招待制を基本とするなど、代わりの登録手順を提供することを検討してください。
         title: 新規ユーザーのアカウント確認にCHAPCHAを要求する
       content_retention:
+        danger_zone: 危険な操作
         preamble: ユーザーが生成したコンテンツがどのように Mastodon に保存されるかを管理します。
         title: コンテンツの保持
       default_noindex:
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 82fbde6ce1a211..3449f1d5d72399 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -410,6 +410,8 @@ lt:
           silence: Riboti
           suspend: Pristabdyti
         title: Naujos domeno blokas
+      public_comment: Viešas komentaras
+      public_comment_hint: Komentaras apie šį domeno apribojimą plačiajai visuomenei, jei įjungtas domenų apribojimų sąrašo reklamavimas.
       reject_media: Atmesti medijos failus
       reject_media_hint: Panaikina lokaliai saugomus medijos failus bei atsisako jų parsisiuntimo ateityje. Neliečia užblokavimu
       reject_reports: Atmesti ataskaitas
@@ -427,11 +429,14 @@ lt:
       title: El pašto juodasis sąrašas
     instances:
       by_domain: Domenas
+      content_policies:
+        reason: Viešoji priežastis
       delivery_available: Pristatymas galimas
       moderation:
         all: Visi
         limited: Limituotas
         title: Moderacija
+      public_comment: Viešas komentaras
       title: Federacija
       total_blocked_by_us: Mes užblokavome
       total_followed_by_them: Jų sekami
@@ -449,11 +454,11 @@ lt:
     relays:
       add_new: Pridėti naują pamainą
       delete: Ištrinti
-      description_html: "<strong>Federacijos perjungėjas</strong> tai tarpinis serveris, kuris apsikeičia didelios apimties informacija tarp kitų serverių. <strong> Tai gali padėti mažesniems serveriams atrasti turinį iš fedi-visatos</strong>, kuris kitaip reikalautų vartotojų lokaliai sekti kitus žmones naudojantis kitus tolimus serverius."
+      description_html: "<strong>Federacijos perdavimas</strong> – tai tarpinis serveris, kuris keičiasi dideliais viešų įrašų kiekiais tarp jį prenumeruojančių ir skelbiančių serverių. <strong>Jis gali padėti mažiems ir vidutiniams serveriams atrasti fediverse esantį turinį</strong>, nes priešingu atveju vietiniams naudotojams reikėtų rankiniu būdu sekti kitus žmones iš nutolusių serverių."
       disable: Išjungti
       disabled: Išjungtas
       enable: Įjungti
-      enable_hint: Kai įjungta, Jūsų serveris prenumeruos visas viešas žinutes iš šio tinklo, ir pradės siųsti šio serverio viešas žinutes į tinklą.
+      enable_hint: Kai bus įjungtas, tavo serveris užsiprenumeruos visus šio perdavimo viešus įrašus ir pradės į jį siųsti šio serverio viešus įrašus.
       enabled: Įjungtas
       inbox_url: Perdavimo URL
       pending: Laukiama perdavimo patvirtinimo
@@ -504,6 +509,8 @@ lt:
         desc_html: Tai priklauso nuo hCaptcha išorinių skriptų, kurie gali kelti susirūpinimą dėl saugumo ir privatumo. Be to, <strong>dėl to registracijos procesas kai kuriems žmonėms (ypač neįgaliesiems) gali būti gerokai sunkiau prieinami</strong>. Dėl šių priežasčių apsvarstyk alternatyvias priemones, pavyzdžiui, patvirtinimu arba kvietimu grindžiamą registraciją.
       content_retention:
         danger_zone: Pavojinga zona
+      discovery:
+        public_timelines: Viešieji laiko skalės
       domain_blocks:
         all: Visiems
       registrations:
@@ -543,7 +550,7 @@ lt:
       body: Mastodon verčia savanoriai.
       guide_link_text: Visi gali prisidėti.
   application_mailer:
-    notification_preferences: Keisti el pašto parinktis
+    notification_preferences: Keisti el. pašto nuostatas
     settings: 'Keisti el. pašto nuostatas: %{link}'
     view: 'Peržiūra:'
     view_profile: Peržiurėti profilį
@@ -635,7 +642,7 @@ lt:
     contexts:
       home: Namų laiko juosta
       notifications: Priminimai
-      public: Viešos laiko juostos
+      public: Viešieji laiko skalės
       thread: Pokalbiai
     edit:
       title: Keisti filtrą
@@ -727,6 +734,8 @@ lt:
     prev: Ankstesnis
   preferences:
     other: Kita
+    posting_defaults: Skelbimo numatytosios nuostatos
+    public_timelines: Viešieji laiko skalės
   privacy:
     hint_html: "<strong>Tikrink, kaip nori, kad tavo profilis ir įrašai būtų randami.</strong> Įjungus įvairias Mastodon funkcijas, jos gali padėti pasiekti platesnę auditoriją. Akimirką peržiūrėk šiuos nustatymus, kad įsitikintum, jog jie atitinka tavo naudojimo būdą."
   redirects:
@@ -769,7 +778,8 @@ lt:
     import: Importuoti
     migrate: Paskyros migracija
     notifications: El. laiško pranešimai
-    preferences: Preferencijos
+    preferences: Nuostatos
+    profile: Viešas profilis
     two_factor_authentication: Dviejų veiksnių autentikacija
   statuses:
     attached:
diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index 8e30a27b8b116b..0c2e6cfd6d782d 100644
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -751,6 +751,7 @@ pt-PT:
         desc_html: Isto depende de scripts externos da hCaptcha, o que pode ser uma preocupação de segurança e privacidade. Além disso, <strong>isto pode tornar o processo de registo menos acessível para algumas pessoas (especialmente as com limitações físicas)</strong>. Por isso, considere medidas alternativas tais como registo mediante aprovação ou sob convite.
         title: Requerer que novos utilizadores resolvam um CAPTCHA para confirmar a sua conta
       content_retention:
+        danger_zone: Zona de perigo
         preamble: Controle como o conteúdo gerado pelos utilizadores é armazenado no Mastodon.
         title: Retenção de conteúdo
       default_noindex:
diff --git a/config/locales/simple_form.ar.yml b/config/locales/simple_form.ar.yml
index 29e525b2c857cc..a1406b1ad9d2f9 100644
--- a/config/locales/simple_form.ar.yml
+++ b/config/locales/simple_form.ar.yml
@@ -240,6 +240,7 @@ ar:
         backups_retention_period: فترة الاحتفاظ بأرشيف المستخدم
         bootstrap_timeline_accounts: أوصي دائما بهذه الحسابات للمستخدمين الجدد
         closed_registrations_message: رسالة مخصصة عندما يكون التسجيل غير متاح
+        content_cache_retention_period: مدة الاحتفاظ بالمحتوى البعيد
         custom_css: سي أس أس CSS مخصص
         mascot: جالب حظ مخصص (قديم)
         media_cache_retention_period: مدة الاحتفاظ بالتخزين المؤقت للوسائط
diff --git a/config/locales/simple_form.he.yml b/config/locales/simple_form.he.yml
index b07ed8b8b5f6e6..841745dbc0e294 100644
--- a/config/locales/simple_form.he.yml
+++ b/config/locales/simple_form.he.yml
@@ -77,10 +77,13 @@ he:
           warn: הסתר את התוכן המסונן מאחורי אזהרה עם כותרת המסנן
       form_admin_settings:
         activity_api_enabled: מספר ההודעות שפורסמו מקומית, משתמשים פעילים, והרשמות חדשות בדליים שבועיים
+        backups_retention_period: למשתמשים יש יכולת לבקש ארכיון של הודעותיהם להורדה מאוחר יותר. כאשר נבחר ערך חיובי, הארכיונים הללו ימחקו מאחסון לאחר מספר הימים שצוינו.
         bootstrap_timeline_accounts: חשבונות אלו יוצמדו לראש רשימת המלצות המעקב של משתמשים חדשים.
         closed_registrations_message: להציג כאשר הרשמות חדשות אינן מאופשרות
+        content_cache_retention_period: כל ההודעות משרתים אחרים (לרבות הדהודים ותגובות) ימחקו אחרי מספר ימים, ללא קשר לאינטראקציה של משתמשים מקומיים איתם. בכלל זה הודעות שהמתשתמשים המקומיים סימנו בסימניה או חיבוב. איזכורים פרטיים ("דיאם") בין משתמשים בין שרתים שונים יאבדו גם הם ולא תהיה אפשרות לשחזרם. השימוש באפשרות הזו מיועד לשרתים עם ייעוד מיוחד ושובר את ציפיותיהם של רב המשתמשים כאשר האפשרות מופעלת בשרת לשימוש כללי.
         custom_css: ניתן לבחור ערכות סגנון אישיות בגרסת הדפדפן של מסטודון.
         mascot: בחירת ציור למנשק הווב המתקדם.
+        media_cache_retention_period: קבצי מדיה מהודעות שהגיעו משרתים רחוקים נשמרות על השרת שלך. כאשר יבחר פה מספר חיובי, המדיה תמחק לאחר מספר ימים כמצוין. אם המידע יבוקש שוב לאחר שנמחק, הוא יורד מחדש, אם המידע עדיין זמין בצד הרחוק. עקב מגבלות על תכיפות שליפת כרטיסי קדימון מאתרים מרוחקים, מומלץ לכוון את הערך ל־14 יום לפחות, או שכרטיסי קדימונים לא יעודכנו לפי דרישה לפני חלוף חלון הזמן הזה.
         peers_api_enabled: רשימת השרתים ששרת זה פגש בפדיוורס. לא כולל מידע לגבי קשר ישיר עם שרת נתון, אלא רק שידוע לשרת זה על קיומו. מידע זה משמש שירותים האוספים סטטיסטיקות כלליות על הפדרציה.
         profile_directory: ספריית הפרופילים מציגה ברשימה את כל המשתמשים שביקשו להיות ניתנים לגילוי.
         require_invite_text: כאשר הרשמות דורשות אישור ידני, הפיכת טקסט ה"מדוע את/ה רוצה להצטרף" להכרחי במקום אופציונלי
diff --git a/config/locales/simple_form.ia.yml b/config/locales/simple_form.ia.yml
index b5ec14e60e040b..c796cb5fac51e3 100644
--- a/config/locales/simple_form.ia.yml
+++ b/config/locales/simple_form.ia.yml
@@ -90,11 +90,54 @@ ia:
         site_contact_email: Como pote contactar te le personas pro questiones legal o de supporto.
         site_contact_username: Como pote contactar te le personas re Mastodon.
         site_extended_description: Qualcunque information additional que pote esser utile al visitatores e a tu usatores. Pote esser structurate con syntaxe de markdown.
+        site_short_description: Un breve description pro adjutar a univocamente identificar tu servitor. Qui ha exequite illo, proque es illo?
+        site_terms: Usa tu proprie politica de confidentialitate o lassa blanc pro usar le predefinite. Pote esser structurate con syntaxe de markdown.
+        site_title: Como le personas pote referer se a tu servitor in addition su nomine de dominio.
+        status_page_url: URL de un pagina ubi le personas pote vider le stato de iste servitor durante un interruption
+        theme: Thema que le visitatores disconnexe e le nove usatores vide.
+        thumbnail: Un imagine approximativemente 2:1 monstrate al latere del informationes de tu servitor.
+        timeline_preview: Le visitatores disconnexe potera navigar per le plus recente messages public disponibile sur le servitor.
+        trendable_by_default: Saltar le revision manual del contento de tendentia. Elementos singule pote ancora esser removite de tendentias post le facto.
+        trends: Tendentias monstra que messages, hashtags e novas gania traction sur tu servitor.
+        trends_as_landing_page: Monstrar contento de tendentia a usatores disconnexe e visitatores in vice que un description de iste servitor. Require tendentias esser activate.
+      form_challenge:
+        current_password: Tu entra in un area secur
+      imports:
+        data: File CSV exportate ab un altere servitor de Mastodon
+      invite_request:
+        text: Isto nos adjutara a revider tu application
       ip_block:
+        comment: Optional. Memorar perque tu ha addite iste regula.
+        expires_in: Le adresses IP es un ressource finite, illos es aliquando compartite e sovente cambia manos. Pro iste ration, blocadas de IP indefinite non es recommendate.
+        ip: Inserer un adresse IPv4 o IPv6. Tu pote blocar campos integre per le syntaxe CIDR. Sia attente pro non disconnecter te!
         severities:
           no_access: Blocar accesso a tote le ressources
+          sign_up_block: Nove inscriptiones non sera possibile
+          sign_up_requires_approval: Nove inscriptiones requirera tu approbation
+        severity: Seliger que evenira con requestas ab iste IP
+      rule:
+        hint: Optional. Forni altere detalios re le regula
+        text: Describe un regula o requisito pro usatores sur iste servitor. Tenta de mantener lo breve e simple
+      sessions:
+        otp: 'Insere le codice a duo factores generate per le app de tu telephono o usa un de tu codices de recuperation:'
+        webauthn: Si illo es un clave USB cura de inserer lo e, si necessari, tocca lo.
+      settings:
+        indexable: Tu pagina del profilo pote apparer in resultatos del recerca sur Google, Bing, e alteros.
+        show_application: Tu sempre sera capace totevia de vider que app publicava tu message.
+      tag:
+        name: Tu pote solo cambiar le inveloppe del litteras, per exemplo, pro render lo plus legibile
+      user:
+        chosen_languages: Si marcate, solo le messages in le linguas seligite sera monstrate in chronologias public
+        role: Le rolo controla que permissos ha le usator
+      user_role:
+        color: Color a esser usate pro le rolo in omne parte del UI, como RGB in formato hexadecimal
+        highlighted: Iste rende le rolo publicamente visibile
+        name: Nomine public del rolo, si rolo es definite a esser monstrate como insignia
+        permissions_as_keys: Usatores con iste rolo habera accesso a...
+        position: Rolo superior decide resolution de conflicto in certe situationes. Certe actiones pote solo esser exequite sur rolos con un prioritate inferior
       webhook:
         events: Selige le eventos a inviar
+        template: Compone tu proprie carga utile JSON per interpolation de variabile. Lassar blanc pro JSON predefinite.
         url: Ubi le eventos essera inviate
     labels:
       account:
@@ -105,10 +148,15 @@ ia:
         indexable: Includer messages public in le resultatos de recerca
         show_collections: Monstrar sequites e sequitores in le profilo
         unlocked: Acceptar automaticamente nove sequitores
+      account_alias:
+        acct: Pseudonymo del vetere conto
+      account_migration:
+        acct: Pseudonymo del nove conto
       account_warning_preset:
         text: Texto predefinite
         title: Titulo
       admin_account_action:
+        include_statuses: Includer messages reportate in le email
         send_email_notification: Notificar le usator per e-mail
         text: Advertimento personalisate
         type: Action
@@ -118,12 +166,19 @@ ia:
           sensitive: Sensibile
           silence: Limitar
           suspend: Suspender
+        warning_preset_id: Usar un aviso predefinite
       announcement:
+        all_day: Evento quotidian
+        ends_at: Fin del evento
+        scheduled_at: Planificar publication
         starts_at: Initio del evento
         text: Annuncio
+      appeal:
+        text: Explicar perque iste decision deberea esser revertite
       defaults:
         autofollow: Invitar a sequer tu conto
         avatar: Pictura de profilo
+        bot: Isto es un conto automatisate
         chosen_languages: Filtrar linguas
         confirm_new_password: Confirmar nove contrasigno
         confirm_password: Confirmar contrasigno
@@ -137,6 +192,7 @@ ia:
         header: Imagine titulo
         honeypot: "%{label} (non compilar)"
         inbox_url: URL del cassa de ingresso de repetitor
+        irreversible: Declinar in vice que celar
         locale: Lingua de interfacie
         max_uses: Numero max de usos
         new_password: Nove contrasigno
@@ -145,15 +201,27 @@ ia:
         password: Contrasigno
         phrase: Parola o phrase clave
         setting_advanced_layout: Activar le interfacie web avantiate
+        setting_aggregate_reblogs: Gruppa promotiones in classificationes temporal
         setting_always_send_emails: Sempre inviar notificationes per e-mail
+        setting_auto_play_gif: Auto-reproduce GIFs animate
+        setting_boost_modal: Monstrar dialogo de confirmation ante promover
         setting_default_language: Lingua de publication
+        setting_default_privacy: Confidentialitate del messages
+        setting_default_sensitive: Sempre marcar le medios cmo sensbile
+        setting_delete_modal: Monstrar le dialogo de confirmation ante deler un message
+        setting_disable_swiping: Disactivar le movimentos per glissamento
         setting_display_media: Visualisation de medios
         setting_display_media_default: Predefinite
         setting_display_media_hide_all: Celar toto
         setting_display_media_show_all: Monstrar toto
+        setting_expand_spoilers: Sempre expander messages marcate con avisos de contento
+        setting_hide_network: Cela tu rete social
+        setting_reduce_motion: Reducer movimento in animationes
         setting_system_font_ui: Usar typo de litteras predefinite del systema
         setting_theme: Thema de sito
         setting_trends: Monstrar le tendentias de hodie
+        setting_unfollow_modal: Monstrar dialogo de confirmation ante cessar de sequer alcuno
+        setting_use_blurhash: Monstrar imagines degradate multicolor pro medios celate
         setting_use_pending_items: Modo lente
         severity: Severitate
         sign_in_token_attempt: Codice de securitate
@@ -162,6 +230,8 @@ ia:
         username: Nomine de usator
         username_or_email: Nomine de usator o e-mail
         whole_word: Parola integre
+      email_domain_block:
+        with_dns_records: Includer registrationes MX e IPs del dominio
       featured_tag:
         name: Hashtag
       filters:
@@ -169,55 +239,98 @@ ia:
           hide: Celar completemente
           warn: Celar con un advertimento
       form_admin_settings:
+        activity_api_enabled: Publicar statisticas aggregate re le activitate de usator in le API
+        backups_retention_period: Periodo de retention del archivo de usator
         bootstrap_timeline_accounts: Recommenda sempre iste contos a nove usatores
+        closed_registrations_message: Message personalisate quando le inscriptiones non es disponibile
+        content_cache_retention_period: Periodo de retention del contento remote
         custom_css: CSS personalisate
+        mascot: Personalisar le mascotte (hereditage)
+        media_cache_retention_period: Periodo de retention del cache multimedial
+        peers_api_enabled: Publicar le lista de servitores discoperite in le API
         profile_directory: Activar directorio de profilos
+        registrations_mode: Qui pote inscriber se
+        require_invite_text: Requirer un ration pro junger se
+        show_domain_blocks: Monstrar le blocadas de dominio
+        show_domain_blocks_rationale: Monstrar perque le dominios era blocate
         site_contact_email: Adresse de e-mail de contacto
         site_contact_username: Nomine de usator de contacto
+        site_extended_description: Description extense
         site_short_description: Description de servitor
         site_terms: Politica de confidentialitate
         site_title: Nomine de servitor
         status_page_url: URL del pagina de stato
         theme: Thema predefinite
         thumbnail: Miniatura de servitor
+        timeline_preview: Permitter accesso non authenticate a chronologias public
+        trendable_by_default: Permitter tendentias sin revision previe
         trends: Activar tendentias
+        trends_as_landing_page: Usar tendentias como pagina de destination
+      interactions:
+        must_be_follower: Blocar notificationes de non-sequaces
+        must_be_following: Blocar notificationes de gente que tu non sequer
+        must_be_following_dm: Blocar messages directe de gente que tu non seque
       invite:
         comment: Commento
+      invite_request:
+        text: Perque vole tu junger te?
       ip_block:
         comment: Commento
         ip: IP
         severities:
           no_access: Blocar le accesso
+          sign_up_block: Blocar inscriptiones
+          sign_up_requires_approval: Limitar inscriptiones
         severity: Regula
       notification_emails:
+        appeal: Alcuno appella un decision de moderator
         digest: Inviar emails compendio
+        favourite: Alcuno appreciava tu message
+        follow: Alcuno te sequeva
+        follow_request: Alcuno requireva de sequer te
+        mention: Alcuno te mentionava
+        pending_account: Nove conto besonia de revision
+        reblog: Alcuno promoveva tu message
+        report: Un nove reporto es inviate
         software_updates:
           all: Notificar sur tote le actualisationes
           critical: Notificar solmente sur actualisationes critic
           label: Un nove version de Mastodon es disponibile
           none: Nunquam notificar sur actualisationes (non recommendate)
+          patch: Notificar re actualisationes de correction de bug
+        trending_tag: Un nove tendentia require revision
       rule:
         hint: Information additional
         text: Regula
       settings:
         indexable: Includer pagina de profilo in le motores de recerca
+        show_application: Monstrar ab que app tu ha inviate un message
       tag:
         listable: Permitter a iste hashtag apparer in le recercas e suggestiones
         name: Hashtag
+        trendable: Permitter a iste hashtag de sub tendentias
         usable: Permitter al messages usar iste hashtag
       user:
         role: Rolo
         time_zone: Fuso horari
       user_role:
+        color: Color de insignia
+        highlighted: Monstrar le rolo como insignia sur le profilos de usator
         name: Nomine
         permissions_as_keys: Permissiones
         position: Prioritate
       webhook:
         events: Eventos activate
+        template: Modello de carga utile
+        url: URL de extremo
     'no': 'No'
     not_recommended: Non recommendate
+    overridden: Supplantate
     recommended: Recommendate
     required:
       mark: "*"
       text: requirite
+    title:
+      sessions:
+        webauthn: Usa un de tu claves de securitate pro acceder
     'yes': Si
diff --git a/config/locales/simple_form.ja.yml b/config/locales/simple_form.ja.yml
index 5e35bc14c04a4b..caf4c5429965b2 100644
--- a/config/locales/simple_form.ja.yml
+++ b/config/locales/simple_form.ja.yml
@@ -77,10 +77,13 @@ ja:
           warn: フィルタに一致した投稿を非表示にし、フィルタのタイトルを含む警告を表示します
       form_admin_settings:
         activity_api_enabled: 週単位でローカルで公開された投稿数、アクティブユーザー数、新規登録者数を表示します
+        backups_retention_period: ユーザーには、後でダウンロードするために投稿のアーカイブを生成する機能があります。正の値に設定すると、これらのアーカイブは指定された日数後に自動的にストレージから削除されます。
         bootstrap_timeline_accounts: これらのアカウントは、新しいユーザー向けのおすすめユーザーの一番上にピン留めされます。
         closed_registrations_message: アカウント作成を停止している時に表示されます
+        content_cache_retention_period: 他のサーバーからのすべての投稿（ブーストや返信を含む）は、指定された日数が経過すると、ローカルユーザーとのやりとりに関係なく削除されます。これには、ローカルユーザーがブックマークやお気に入りとして登録した投稿も含まれます。異なるサーバーのユーザー間の非公開な変身も失われ、復元することは不可能です。この設定の使用は特別な目的のインスタンスのためのものであり、一般的な目的のサーバーで使用するした場合、多くのユーザーの期待を裏切ることになります。
         custom_css: ウェブ版のMastodonでカスタムスタイルを適用できます。
         mascot: 上級者向けWebインターフェースのイラストを上書きします。
+        media_cache_retention_period: リモートユーザーが投稿したメディアファイルは、あなたのサーバーにキャッシュされます。正の値を設定すると、メディアは指定した日数後に削除されます。削除後にメディアデータが要求された場合、ソースコンテンツがまだ利用可能であれば、再ダウンロードされます。リンクプレビューカードがサードパーティのサイトを更新する頻度に制限があるため、この値を少なくとも14日に設定することをお勧めします。
         peers_api_enabled: このサーバーが Fediverse で遭遇したドメイン名のリストです。このサーバーが知っているだけで、特定のサーバーと連合しているかのデータは含まれません。これは一般的に Fediverse に関する統計情報を収集するサービスによって使用されます。
         profile_directory: ディレクトリには、掲載する設定をしたすべてのユーザーが一覧表示されます。
         require_invite_text: アカウント登録が承認制の場合、登録の際の申請事由の入力を必須にします
@@ -240,6 +243,7 @@ ja:
         backups_retention_period: ユーザーアーカイブの保持期間
         bootstrap_timeline_accounts: おすすめユーザーに常に表示するアカウント
         closed_registrations_message: アカウント作成を停止している時のカスタムメッセージ
+        content_cache_retention_period: リモートコンテンツの保存期間
         custom_css: カスタムCSS
         mascot: カスタムマスコット（レガシー）
         media_cache_retention_period: メディアキャッシュの保持期間
diff --git a/config/locales/simple_form.pt-PT.yml b/config/locales/simple_form.pt-PT.yml
index 3292c48289aca1..a26468894b9a33 100644
--- a/config/locales/simple_form.pt-PT.yml
+++ b/config/locales/simple_form.pt-PT.yml
@@ -77,10 +77,13 @@ pt-PT:
           warn: Ocultar o conteúdo filtrado por trás de um aviso mencionando o título do filtro
       form_admin_settings:
         activity_api_enabled: Contagem, em blocos semanais, de publicações locais, utilizadores ativos e novos registos
+        backups_retention_period: Os utilizadores têm a possibilidade de gerar arquivos das suas mensagens para descarregar mais tarde. Quando definido para um valor positivo, estes arquivos serão automaticamente eliminados do seu armazenamento após o número de dias especificado.
         bootstrap_timeline_accounts: Estas contas serão destacadas no topo das recomendações aos novos utilizadores.
         closed_registrations_message: Apresentado quando as inscrições estiverem encerradas
+        content_cache_retention_period: Todas as publicações de outros servidores (incluindo boosts e respostas) serão eliminadas após o número de dias especificado, independentemente de qualquer interação do utilizador local com essas publicações. Isto inclui publicações em que um utilizador local as tenha marcado como favoritas ou adicionado aos items salvos. As menções privadas entre utilizadores de instâncias diferentes também se perderão e serão impossíveis de restaurar. A utilização desta definição destina-se a instâncias para fins especiais e quebra muitas expectativas dos utilizadores quando implementada para utilização geral.
         custom_css: Pode aplicar estilos personalizados na versão web do Mastodon.
         mascot: Sobrepõe-se à ilustração na interface web avançada.
+        media_cache_retention_period: Os ficheiros multimédia de publicações feitas por utilizadores remotos são armazenados em cache no seu servidor. Quando definido para um valor positivo, os ficheiros multimédia serão eliminados após o número de dias especificado. Se os ficheiros multimédia forem solicitados depois de terem sido eliminados, serão transferidos novamente, se o conteúdo de origem ainda estiver disponível. Devido a restrições sobre a frequência com que os cartões de pré-visualização de links pesquisam sites de terceiros, recomenda-se que este valor seja definido para, pelo menos, 14 dias, ou os cartões de pré-visualização de links não serão atualizados a pedido antes desse período.
         peers_api_enabled: Uma lista de nomes de domínio que este servidor encontrou no fediverso. Nenhum dado é incluído aqui sobre se você federa com um determinado servidor, apenas que o seu servidor o conhece. Este serviço é utilizado por serviços que recolhem estatísticas na federação, em termos gerais.
         profile_directory: O diretório de perfis lista todos os utilizadores que optaram por ter a sua conta a ser sugerida a outros.
         require_invite_text: Quando as incrições exigirem aprovação manual, faça o texto "Por que se quer juntar a nós?" da solicitação de convite ser obrigatório, em vez de opcional
@@ -240,6 +243,7 @@ pt-PT:
         backups_retention_period: Período de retenção de arquivos de utilizador
         bootstrap_timeline_accounts: Recomendar sempre estas contas para novos utilizadores
         closed_registrations_message: Mensagem personalizada quando as inscrições não estiverem disponíveis
+        content_cache_retention_period: Período de retenção de conteúdos remotos
         custom_css: CSS personalizado
         mascot: Mascote personalizada (legado)
         media_cache_retention_period: Período de retenção de ficheiros de media em cache
diff --git a/config/locales/simple_form.sq.yml b/config/locales/simple_form.sq.yml
index a6c93033801eb2..d545f2cd341cba 100644
--- a/config/locales/simple_form.sq.yml
+++ b/config/locales/simple_form.sq.yml
@@ -77,10 +77,13 @@ sq:
           warn: Fshihe lëndën e filtruar pas një sinjalizimi që përmend titullin e filtrit
       form_admin_settings:
         activity_api_enabled: Numër postimesh të botuar lokalisht, përdoruesish aktiv dhe regjistrimesh të reja sipas matjesh javore
+        backups_retention_period: Përdorues kanë aftësinë të prodhojnë arkiva të postimeve të tyre për t’i shkarkuar më vonë. Kur i jepet një vlerë pozitive, këto arkiva do të fshihen automatikisht prej depozitës tuaj pas numrit të dhënë të ditëve.
         bootstrap_timeline_accounts: Këto llogari do të fiksohen në krye të rekomandimeve për ndjekje nga përdorues të rinj.
         closed_registrations_message: Shfaqur kur mbyllen dritare regjistrimesh
+        content_cache_retention_period: Krejt postimet prej shërbyesve të tjerë (përfshi përforcime dhe përgjigje) do të fshihen pas numrit të caktuar të ditëve, pa marrë parasysh çfarëdo ndërveprimi përdoruesi me këto postime. Kjo përfshin postime kur një përdorues vendor u ka vënë shenjë si faqerojtës, ose të parapëlqyer. Do të humbin gjithashtu dhe përmendje private mes përdoruesish nga instanca të ndryshme dhe s’do të jetë e mundshme të rikthehen. Përdorimi i këtij rregullimi është menduar për instanca me qëllim të caktuar dhe ndërhyn në çka presin mjaft përdorues, kur sendërtohet për përdorim të përgjithshëm.
         custom_css: Stile vetjakë mund të aplikoni në versionin web të Mastodon-it.
         mascot: Anashkalon ilustrimin te ndërfaqja web e thelluar.
+        media_cache_retention_period: Kartela media nga postime të bëra nga përdorues të largët ruhen në një fshehtinë në shërbyesin tuaj. Kur i jepet një vlerë pozitive, media do të fshihet pas numrit të dhënë të ditëve. Nëse të dhënat e medias duhen pas fshirjes, do të rishkarkohen, nëse lënda burim mund të kihet ende. Për shkak kufizimesh mbi sa shpesh skeda paraparjesh lidhjesh ndërveprojnë me sajte palësh të treta, rekomandohet të vihet kjo vlerë të paktën 14 ditë, ose skedat e paraparjes së lidhje s’do të përditësohen duke e kërkuar para asaj kohe.
         peers_api_enabled: Një listë emrash përkatësish që ky shërbyes ka hasur në fedivers. Këtu s’jepen të dhëna nëse jeni i federuar me shërbyesin e dhënë, thjesht tregohet se shërbyesi juaj e njeh. Kjo përdoret nga shërbime që mbledhin statistika mbi federimin në kuptimin e përgjithshëm.
         profile_directory: Drejtoria e profileve paraqet krejt përdoruesit që kanë zgjedhur të jenë të zbulueshëm.
         require_invite_text: Kur regjistrimet lypin miratim dorazi, bëje tekstin “Përse doni të bëheni pjesë?” të detyrueshëm, në vend se opsional
@@ -240,6 +243,7 @@ sq:
         backups_retention_period: Periudhë mbajtjeje arkivash përdoruesish
         bootstrap_timeline_accounts: Rekomandoju përherë këto llogari përdoruesve të rinj
         closed_registrations_message: Mesazh vetjak për pamundësi regjistrimesh të reja
+        content_cache_retention_period: Periudhë mbajtjeje lënde të largët
         custom_css: CSS Vetjake
         mascot: Simbol vetjak (e dikurshme)
         media_cache_retention_period: Periudhë mbajtjeje lënde media
diff --git a/config/locales/simple_form.th.yml b/config/locales/simple_form.th.yml
index bfc2d2e6b6289d..e68642c2f636dc 100644
--- a/config/locales/simple_form.th.yml
+++ b/config/locales/simple_form.th.yml
@@ -77,8 +77,10 @@ th:
           warn: ซ่อนเนื้อหาที่กรองอยู่หลังคำเตือนที่กล่าวถึงชื่อเรื่องของตัวกรอง
       form_admin_settings:
         activity_api_enabled: จำนวนโพสต์ที่เผยแพร่ในเซิร์ฟเวอร์, ผู้ใช้ที่ใช้งานอยู่ และการลงทะเบียนใหม่ในบักเก็ตรายสัปดาห์
+        backups_retention_period: ผู้ใช้มีความสามารถในการสร้างการเก็บถาวรของโพสต์ของเขาเพื่อดาวน์โหลดในภายหลัง เมื่อตั้งเป็นค่าบวก จะลบการเก็บถาวรเหล่านี้ออกจากที่เก็บข้อมูลของคุณโดยอัตโนมัติหลังจากจำนวนวันที่ระบุ
         bootstrap_timeline_accounts: จะปักหมุดบัญชีเหล่านี้ไว้ด้านบนสุดของคำแนะนำการติดตามของผู้ใช้ใหม่
         closed_registrations_message: แสดงเมื่อมีการปิดการลงทะเบียน
+        content_cache_retention_period: จะลบโพสต์ทั้งหมดจากเซิร์ฟเวอร์อื่น ๆ (รวมถึงการดันและการตอบกลับ) หลังจากจำนวนวันที่ระบุ โดยไม่คำนึงถึงการโต้ตอบใด ๆ ของผู้ใช้ในเซิร์ฟเวอร์กับโพสต์เหล่านั้น สิ่งนี้รวมถึงโพสต์ที่ผู้ใช้ในเซิร์ฟเวอร์ได้ทำเครื่องหมายโพสต์ว่าเป็นที่คั่นหน้าหรือรายการโปรด การกล่าวถึงแบบส่วนตัวระหว่างผู้ใช้จากอินสแตนซ์ที่แตกต่างกันจะหายไปและไม่สามารถคืนค่าได้เช่นกัน การใช้การตั้งค่านี้มีไว้สำหรับอินสแตนซ์ที่มีวัตถุประสงค์พิเศษและทำลายความคาดหวังของผู้ใช้จำนวนมากเมื่อนำไปใช้สำหรับการใช้งานที่มีวัตถุประสงค์ทั่วไป
         custom_css: คุณสามารถนำไปใช้ลักษณะที่กำหนดเองใน Mastodon รุ่นเว็บ
         mascot: เขียนทับภาพประกอบในส่วนติดต่อเว็บขั้นสูง
         peers_api_enabled: รายการชื่อโดเมนที่เซิร์ฟเวอร์นี้พบในจักรวาลสหพันธ์ ไม่มีข้อมูลรวมอยู่ที่นี่เกี่ยวกับว่าคุณติดต่อกับเซิร์ฟเวอร์ที่กำหนดหรือไม่ เพียงแค่ว่าเซิร์ฟเวอร์ของคุณทราบเกี่ยวกับเซิร์ฟเวอร์ที่กำหนด มีการใช้สิ่งนี้โดยบริการที่เก็บรวบรวมสถิติในการติดต่อกับภายนอกในความหมายทั่วไป
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 400059770b76c6..78e7bdb25eafc1 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -524,6 +524,7 @@ sk:
           many: "%{count} poznámok"
           one: "%{count} poznámka"
           other: "%{count} poznámky"
+      action_log: Denník auditu
       action_taken_by: Zákrok vykonal/a
       actions:
         suspend_description_html: Tento účet a všetok jeho obsah bude nedostupný a nakoniec zmazaný, interaktovať s ním bude nemožné. Zvrátiteľné v rámci 30 dní. Uzatvára všetky hlásenia voči tomuto účtu.
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index ff23e648414095..6c26511ad6968a 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -779,6 +779,7 @@ sl:
         desc_html: To se zanaša na zunanje skripte hCaptcha in lahko predstavlja tveganje za varnost in zasebnost. Poleg tega <strong>to lahko nekaterim ljudem (posebno invalidom) občutno oteži dostopnost registracijskega postopka</strong>. Zato svetujemo, da razmislite o drugih ukrepih, kot je na primer registracija na podlagi odobritve ali povabila.
         title: Od novih uporabnikov zahtevaj reševanje CAPTCHA za potrditev računov
       content_retention:
+        danger_zone: Območje nevarnosti
         preamble: Nazdor nad hrambo vsebine uporabnikov v Mastodonu.
         title: Hramba vsebin
       default_noindex:
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index dcacb46bf99819..8319cfcaecac48 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -748,6 +748,7 @@ sq:
         desc_html: Kjo bazohet në programthe të jashtëm prej hCaptcha, çka mund të përbëjë një shqetësim për sigurinë dhe privatësinë. Veç kësaj, <strong>kjo mund ta bëjë procesin e regjistrimit në shkallë të madhe më pak të përdorshëm për disa persona (veçanërisht ata me paaftësi)</strong>. Për këto arsye, ju lutemi, shihni mundësinë e masave alternative, fjala vjen, bazuar në miratim, ose regjistrim vetëm me ftesa.
         title: Kërko prej përdoruesve të rinj të zgjidhin një CAPTCHA, si ripohim të llogarisë të tyre
       content_retention:
+        danger_zone: Zonë rreziku
         preamble: Kontrolloni se si depozitohen në Mastodon lënda e prodhuar nga përdoruesit.
         title: Mbajtje lënde
       default_noindex:
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 0d7483d79ae9b7..8a001d875581c5 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -1837,6 +1837,7 @@ th:
       explanation: นี่คือเคล็ดลับบางส่วนที่จะช่วยให้คุณเริ่มต้นใช้งาน
       feature_action: เรียนรู้เพิ่มเติม
       feature_audience: Mastodon มีความพิเศษที่ให้คุณจัดการผู้รับสารของคุณได้โดยไม่มีตัวกลาง นอกจากนี้ การติดตั้ง Mastodon บนโครงสร้างพื้นฐานของคุณจะทำให้คุณสามารถติดตาม (และติดตามโดย) เซิร์ฟเวอร์ Mastodon แห่งไหนก็ได้ที่ทำงานอยู่ โดยไม่มีใครสามารถควบคุมได้นอกจากคุณ
+      feature_audience_title: สร้างผู้ชมของคุณด้วยความมั่นใจ
       follow_action: ติดตาม
       follow_step: การติดตามผู้คนที่น่าสนใจคือสิ่งที่ Mastodon ให้ความสำคัญ
       follow_title: ปรับแต่งฟีดหน้าแรกของคุณ

From 86f17e4b32eb5da3dfcd82c4be72d529d8a72565 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 6 May 2024 10:46:17 +0200
Subject: [PATCH 0948/2191] Update devDependencies (non-major) (#30185)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 55 ++++++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 40 insertions(+), 15 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index ddc789b5feb2d6..26ffbcee1fb768 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2212,16 +2212,37 @@ __metadata:
   linkType: hard
 
 "@formatjs/cli@npm:^6.1.1":
-  version: 6.2.9
-  resolution: "@formatjs/cli@npm:6.2.9"
-  peerDependencies:
+  version: 6.2.10
+  resolution: "@formatjs/cli@npm:6.2.10"
+  peerDependencies:
+    "@glimmer/env": ^0.1.7
+    "@glimmer/reference": ^0.91.1
+    "@glimmer/syntax": ^0.91.1
+    "@glimmer/validator": ^0.91.1
+    "@vue/compiler-core": ^3.4.0
+    content-tag: ^2.0.1
+    ember-template-recast: ^6.1.4
     vue: ^3.4.0
   peerDependenciesMeta:
+    "@glimmer/env":
+      optional: true
+    "@glimmer/reference":
+      optional: true
+    "@glimmer/syntax":
+      optional: true
+    "@glimmer/validator":
+      optional: true
+    "@vue/compiler-core":
+      optional: true
+    content-tag:
+      optional: true
+    ember-template-recast:
+      optional: true
     vue:
       optional: true
   bin:
     formatjs: bin/formatjs
-  checksum: 10c0/498383bcdca7f8f8a748c1151be17392f71eb1861f6a23bc714280533167cba7cdc35a470a380113f6111236e721ff43cbee7b084939dac67b6a5d9b04c0587c
+  checksum: 10c0/34b1b0b3be25d945111c1f57913f50da7308ecd05501a27eaca210a774eb50c616b5706ba796d37ffa223ac4c5cddd5f36fe0ca8d31ad8c8ade79cdd497ccfb9
   languageName: node
   linkType: hard
 
@@ -3334,8 +3355,8 @@ __metadata:
   linkType: hard
 
 "@testing-library/jest-dom@npm:^6.0.0":
-  version: 6.4.2
-  resolution: "@testing-library/jest-dom@npm:6.4.2"
+  version: 6.4.5
+  resolution: "@testing-library/jest-dom@npm:6.4.5"
   dependencies:
     "@adobe/css-tools": "npm:^4.3.2"
     "@babel/runtime": "npm:^7.9.2"
@@ -3343,7 +3364,7 @@ __metadata:
     chalk: "npm:^3.0.0"
     css.escape: "npm:^1.5.1"
     dom-accessibility-api: "npm:^0.6.3"
-    lodash: "npm:^4.17.15"
+    lodash: "npm:^4.17.21"
     redent: "npm:^3.0.0"
   peerDependencies:
     "@jest/globals": ">= 28"
@@ -3362,21 +3383,25 @@ __metadata:
       optional: true
     vitest:
       optional: true
-  checksum: 10c0/e7eba527b34ce30cde94424d2ec685bdfed51daaafb7df9b68b51aec6052e99a50c8bfe654612dacdf857a1eb81d68cf294fc89de558ee3a992bf7a6019fffcc
+  checksum: 10c0/4cfdd44e2abab2b9d399c47cbfe686729bb65160d7df0f9e2329aaaea7702f6e852a9eefb29b468f00c1e5a5274b684f8cac76959d33299dfa909ba007ea191d
   languageName: node
   linkType: hard
 
 "@testing-library/react@npm:^15.0.0":
-  version: 15.0.5
-  resolution: "@testing-library/react@npm:15.0.5"
+  version: 15.0.6
+  resolution: "@testing-library/react@npm:15.0.6"
   dependencies:
     "@babel/runtime": "npm:^7.12.5"
     "@testing-library/dom": "npm:^10.0.0"
     "@types/react-dom": "npm:^18.0.0"
   peerDependencies:
+    "@types/react": ^18.0.0
     react: ^18.0.0
     react-dom: ^18.0.0
-  checksum: 10c0/8759cc8e7e6b4d8964f151d8872ea3c91b6ef6d8fb3b9116fae53350b9a6b29e5ad45b18408c22525924d050263f7ea77cd17ca803918759f22a760f68a42227
+  peerDependenciesMeta:
+    "@types/react":
+      optional: true
+  checksum: 10c0/3705a2272f929f2f848f5d7e6ac9829bf7ecc1725a35733ffae7e7a261d4bdab470b080558e8544edb1f9ba25db9fbc4232527df9b4ec6ab6ae4462a902a7f95
   languageName: node
   linkType: hard
 
@@ -11403,7 +11428,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lodash@npm:^4.17.10, lodash@npm:^4.17.11, lodash@npm:^4.17.14, lodash@npm:^4.17.15, lodash@npm:^4.17.20, lodash@npm:^4.17.21":
+"lodash@npm:^4.17.10, lodash@npm:^4.17.11, lodash@npm:^4.17.14, lodash@npm:^4.17.20, lodash@npm:^4.17.21":
   version: 4.17.21
   resolution: "lodash@npm:4.17.21"
   checksum: 10c0/d8cbea072bb08655bb4c989da418994b073a608dffa608b09ac04b43a791b12aeae7cd7ad919aa4c925f33b48490b5cfe6c1f71d827956071dae2e7bb3a6b74c
@@ -16438,8 +16463,8 @@ __metadata:
   linkType: hard
 
 "stylelint@npm:^16.0.2":
-  version: 16.4.0
-  resolution: "stylelint@npm:16.4.0"
+  version: 16.5.0
+  resolution: "stylelint@npm:16.5.0"
   dependencies:
     "@csstools/css-parser-algorithms": "npm:^2.6.1"
     "@csstools/css-tokenizer": "npm:^2.2.4"
@@ -16482,7 +16507,7 @@ __metadata:
     write-file-atomic: "npm:^5.0.1"
   bin:
     stylelint: bin/stylelint.mjs
-  checksum: 10c0/7e603a0d88732180b60528c9f2edfca7fdf8c966f42c260af16131854c3acb5acfa30403b1f4fd72cd1470eb9ba625ca4de84e8cb379942df54127c55afc1288
+  checksum: 10c0/9281693ff6c1918e07fdcf7a950531f79678a28261a0d5bd36ca2fcf524e53d7305158d20ba890f5dd01c0ff90c09a13453dce2fe6887f4c157d8c2c0acf3666
   languageName: node
   linkType: hard
 

From 00c34070ae3679116f4962b5608b53fa95a61e1b Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 6 May 2024 10:46:22 +0200
Subject: [PATCH 0949/2191] Update eslint (non-major) (#30186)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 102 +++++++++++++++++++++++++++---------------------------
 1 file changed, 51 insertions(+), 51 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 26ffbcee1fb768..785df92e5122a1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4107,14 +4107,14 @@ __metadata:
   linkType: hard
 
 "@typescript-eslint/eslint-plugin@npm:^7.0.0":
-  version: 7.7.1
-  resolution: "@typescript-eslint/eslint-plugin@npm:7.7.1"
+  version: 7.8.0
+  resolution: "@typescript-eslint/eslint-plugin@npm:7.8.0"
   dependencies:
     "@eslint-community/regexpp": "npm:^4.10.0"
-    "@typescript-eslint/scope-manager": "npm:7.7.1"
-    "@typescript-eslint/type-utils": "npm:7.7.1"
-    "@typescript-eslint/utils": "npm:7.7.1"
-    "@typescript-eslint/visitor-keys": "npm:7.7.1"
+    "@typescript-eslint/scope-manager": "npm:7.8.0"
+    "@typescript-eslint/type-utils": "npm:7.8.0"
+    "@typescript-eslint/utils": "npm:7.8.0"
+    "@typescript-eslint/visitor-keys": "npm:7.8.0"
     debug: "npm:^4.3.4"
     graphemer: "npm:^1.4.0"
     ignore: "npm:^5.3.1"
@@ -4127,25 +4127,25 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 10c0/11a085240e7daf4bdeb011aa53ac7cfeea6263c60d53607823f5c314eb5c9d559b28fce0d6686acb9702ee3d0cb0406534fafae61163e5a903eaf818c48194ad
+  checksum: 10c0/37ca22620d1834ff0baa28fa4b8fd92039a3903cb95748353de32d56bae2a81ce50d1bbaed27487eebc884e0a0f9387fcb0f1647593e4e6df5111ef674afa9f0
   languageName: node
   linkType: hard
 
 "@typescript-eslint/parser@npm:^7.0.0":
-  version: 7.7.1
-  resolution: "@typescript-eslint/parser@npm:7.7.1"
+  version: 7.8.0
+  resolution: "@typescript-eslint/parser@npm:7.8.0"
   dependencies:
-    "@typescript-eslint/scope-manager": "npm:7.7.1"
-    "@typescript-eslint/types": "npm:7.7.1"
-    "@typescript-eslint/typescript-estree": "npm:7.7.1"
-    "@typescript-eslint/visitor-keys": "npm:7.7.1"
+    "@typescript-eslint/scope-manager": "npm:7.8.0"
+    "@typescript-eslint/types": "npm:7.8.0"
+    "@typescript-eslint/typescript-estree": "npm:7.8.0"
+    "@typescript-eslint/visitor-keys": "npm:7.8.0"
     debug: "npm:^4.3.4"
   peerDependencies:
     eslint: ^8.56.0
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 10c0/ace43eeb8123bbee61e936650e1d57a2cf70f2030870c6dcad8602fce3f7cdf2cce350121dbbc66cffd60bac36652f426a1c5293c45ed28998b90cd95673b5c9
+  checksum: 10c0/0dd994c1b31b810c25e1b755b8d352debb7bf21a31f9a91acaec34acf4e471320bcceaa67cf64c110c0b8f5fac10a037dbabac6ec423e17adf037e59a7bce9c1
   languageName: node
   linkType: hard
 
@@ -4159,22 +4159,22 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/scope-manager@npm:7.7.1":
-  version: 7.7.1
-  resolution: "@typescript-eslint/scope-manager@npm:7.7.1"
+"@typescript-eslint/scope-manager@npm:7.8.0":
+  version: 7.8.0
+  resolution: "@typescript-eslint/scope-manager@npm:7.8.0"
   dependencies:
-    "@typescript-eslint/types": "npm:7.7.1"
-    "@typescript-eslint/visitor-keys": "npm:7.7.1"
-  checksum: 10c0/4032da8fce8922044a6b659c8435ba203377778d5b7de6a5572c1172f2e3cf8ddd890a0f9e083c5d5315a9c2dba323707528ee4ad3cc1be2bd334de2527ef5cb
+    "@typescript-eslint/types": "npm:7.8.0"
+    "@typescript-eslint/visitor-keys": "npm:7.8.0"
+  checksum: 10c0/c253b98e96d4bf0375f473ca2c4d081726f1fd926cdfa65ee14c9ee99cca8eddb763b2d238ac365daa7246bef21b0af38180d04e56e9df7443c0e6f8474d097c
   languageName: node
   linkType: hard
 
-"@typescript-eslint/type-utils@npm:7.7.1":
-  version: 7.7.1
-  resolution: "@typescript-eslint/type-utils@npm:7.7.1"
+"@typescript-eslint/type-utils@npm:7.8.0":
+  version: 7.8.0
+  resolution: "@typescript-eslint/type-utils@npm:7.8.0"
   dependencies:
-    "@typescript-eslint/typescript-estree": "npm:7.7.1"
-    "@typescript-eslint/utils": "npm:7.7.1"
+    "@typescript-eslint/typescript-estree": "npm:7.8.0"
+    "@typescript-eslint/utils": "npm:7.8.0"
     debug: "npm:^4.3.4"
     ts-api-utils: "npm:^1.3.0"
   peerDependencies:
@@ -4182,7 +4182,7 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 10c0/bd083c4106e207aa8c2a71251eca52d23c7ea905399b8c62004f3bb1e85b9c88d601db9dcecae88beef0f8362d53450bb2721aab353ee731c1665496fea3fbda
+  checksum: 10c0/00f6315626b64f7dbc1f7fba6f365321bb8d34141ed77545b2a07970e59a81dbdf768c1e024225ea00953750d74409ddd8a16782fc4a39261e507c04192dacab
   languageName: node
   linkType: hard
 
@@ -4193,10 +4193,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/types@npm:7.7.1":
-  version: 7.7.1
-  resolution: "@typescript-eslint/types@npm:7.7.1"
-  checksum: 10c0/7d240503d9d0b12d68c8204167690609f02ededb77dcb035c1c8b932da08cf43553829c29a5f7889824a7337463c300343bc5abe532479726d4c83443a7e2704
+"@typescript-eslint/types@npm:7.8.0":
+  version: 7.8.0
+  resolution: "@typescript-eslint/types@npm:7.8.0"
+  checksum: 10c0/b2fdbfc21957bfa46f7d8809b607ad8c8b67c51821d899064d09392edc12f28b2318a044f0cd5d523d782e84e8f0558778877944964cf38e139f88790cf9d466
   languageName: node
   linkType: hard
 
@@ -4219,12 +4219,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/typescript-estree@npm:7.7.1":
-  version: 7.7.1
-  resolution: "@typescript-eslint/typescript-estree@npm:7.7.1"
+"@typescript-eslint/typescript-estree@npm:7.8.0":
+  version: 7.8.0
+  resolution: "@typescript-eslint/typescript-estree@npm:7.8.0"
   dependencies:
-    "@typescript-eslint/types": "npm:7.7.1"
-    "@typescript-eslint/visitor-keys": "npm:7.7.1"
+    "@typescript-eslint/types": "npm:7.8.0"
+    "@typescript-eslint/visitor-keys": "npm:7.8.0"
     debug: "npm:^4.3.4"
     globby: "npm:^11.1.0"
     is-glob: "npm:^4.0.3"
@@ -4234,24 +4234,24 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 10c0/c6b32bd96fd13b9da0a30de01935066f7505f6214f5759e3cd019f7d1852f7bf19358765f62e51de72be47647656aa0e8f07ac0ab316c4149a4e6bd1dd12cbb6
+  checksum: 10c0/1690b62679685073dcb0f62499f0b52b445b37ae6e12d02aa4acbafe3fb023cf999b01f714b6282e88f84fd934fe3e2eefb21a64455d19c348d22bbc68ca8e47
   languageName: node
   linkType: hard
 
-"@typescript-eslint/utils@npm:7.7.1":
-  version: 7.7.1
-  resolution: "@typescript-eslint/utils@npm:7.7.1"
+"@typescript-eslint/utils@npm:7.8.0":
+  version: 7.8.0
+  resolution: "@typescript-eslint/utils@npm:7.8.0"
   dependencies:
     "@eslint-community/eslint-utils": "npm:^4.4.0"
     "@types/json-schema": "npm:^7.0.15"
     "@types/semver": "npm:^7.5.8"
-    "@typescript-eslint/scope-manager": "npm:7.7.1"
-    "@typescript-eslint/types": "npm:7.7.1"
-    "@typescript-eslint/typescript-estree": "npm:7.7.1"
+    "@typescript-eslint/scope-manager": "npm:7.8.0"
+    "@typescript-eslint/types": "npm:7.8.0"
+    "@typescript-eslint/typescript-estree": "npm:7.8.0"
     semver: "npm:^7.6.0"
   peerDependencies:
     eslint: ^8.56.0
-  checksum: 10c0/0986b8c297d6bfdbd2ac8cd3bcf447ef9b934e2dae536771d3368a5c284a0b16c0ea041f82aa100c48d05acc33198e1a3d9d721d3319ae80abba0f5e69c21633
+  checksum: 10c0/31fb58388d15b082eb7bd5bce889cc11617aa1131dfc6950471541b3df64c82d1c052e2cccc230ca4ae80456d4f63a3e5dccb79899a8f3211ce36c089b7d7640
   languageName: node
   linkType: hard
 
@@ -4282,13 +4282,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/visitor-keys@npm:7.7.1":
-  version: 7.7.1
-  resolution: "@typescript-eslint/visitor-keys@npm:7.7.1"
+"@typescript-eslint/visitor-keys@npm:7.8.0":
+  version: 7.8.0
+  resolution: "@typescript-eslint/visitor-keys@npm:7.8.0"
   dependencies:
-    "@typescript-eslint/types": "npm:7.7.1"
+    "@typescript-eslint/types": "npm:7.8.0"
     eslint-visitor-keys: "npm:^3.4.3"
-  checksum: 10c0/19cbd14ac9a234d847f457cbd880cbd98b83c331a46d2dc2d8c0e6cb54ce6159552f6dd2f7236035be1a71f13f48df4a2aa09e70ad1f1e2ff3da7c3622927bd3
+  checksum: 10c0/5892fb5d9c58efaf89adb225f7dbbb77f9363961f2ff420b6b130bdd102dddd7aa8a16c46a5a71c19889d27b781e966119a89270555ea2cb5653a04d8994123d
   languageName: node
   linkType: hard
 
@@ -7772,8 +7772,8 @@ __metadata:
   linkType: hard
 
 "eslint-plugin-formatjs@npm:^4.10.1":
-  version: 4.13.0
-  resolution: "eslint-plugin-formatjs@npm:4.13.0"
+  version: 4.13.1
+  resolution: "eslint-plugin-formatjs@npm:4.13.1"
   dependencies:
     "@formatjs/icu-messageformat-parser": "npm:2.7.6"
     "@formatjs/ts-transformer": "npm:3.13.12"
@@ -7788,7 +7788,7 @@ __metadata:
     unicode-emoji-utils: "npm:^1.2.0"
   peerDependencies:
     eslint: 7 || 8
-  checksum: 10c0/3dbe4ffd3e72d4ce5b14afdcf6dd5db889dd09cb15bc875f29bcc5b49295e0ae4a3eb672ed89ed33f22aacbfe655151398ca4307fd0610508e568a6e4db50aa8
+  checksum: 10c0/ce18141dff84e8fe026127085c1a63279acb3a1bc0b70dc1ddce2fc65bb37d68ccf6d097231428745eda2caea42080e1c80a01a1895803155c15123a01bfeee3
   languageName: node
   linkType: hard
 

From 4f0d18168c39a52250b8be07558675716bf292ee Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 6 May 2024 10:46:43 +0200
Subject: [PATCH 0950/2191] Update DefinitelyTyped types (non-major) (#30184)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 785df92e5122a1..acaab739aa779b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3702,9 +3702,9 @@ __metadata:
   linkType: hard
 
 "@types/lodash@npm:^4.14.195":
-  version: 4.17.0
-  resolution: "@types/lodash@npm:4.17.0"
-  checksum: 10c0/4c5b41c9a6c41e2c05d08499e96f7940bcf194dcfa84356235b630da920c2a5e05f193618cea76006719bec61c76617dff02defa9d29934f9f6a76a49291bd8f
+  version: 4.17.1
+  resolution: "@types/lodash@npm:4.17.1"
+  checksum: 10c0/af2ad8a3c8d7deb170a7ec6e18afc5ae8980576e5f7fe798d8a95a1df7222c15bdf967a25a35879f575a3b64743de00145710ee461a0051e055e94e4fe253f45
   languageName: node
   linkType: hard
 
@@ -3760,13 +3760,13 @@ __metadata:
   linkType: hard
 
 "@types/pg@npm:^8.6.6":
-  version: 8.11.5
-  resolution: "@types/pg@npm:8.11.5"
+  version: 8.11.6
+  resolution: "@types/pg@npm:8.11.6"
   dependencies:
     "@types/node": "npm:*"
     pg-protocol: "npm:*"
     pg-types: "npm:^4.0.1"
-  checksum: 10c0/d64d183bee2df96cd0558231190ff629558e8c0fd3203b880f48a7d34b1eaea528d20c09b57b19c0939f369136e6c6941533592eadd71174be78d1ec0ca5e60e
+  checksum: 10c0/e68e057d9500b25cd776f4fcc547b4880c4f3b0c7b6e03c8a0e5e262b6189dd7a00f4edc8937ffc55a9f6a136a78d7e4a9b6bbe6a46122a95c134f7be66f6842
   languageName: node
   linkType: hard
 
@@ -3820,11 +3820,11 @@ __metadata:
   linkType: hard
 
 "@types/react-dom@npm:^18.0.0, @types/react-dom@npm:^18.2.4":
-  version: 18.2.25
-  resolution: "@types/react-dom@npm:18.2.25"
+  version: 18.3.0
+  resolution: "@types/react-dom@npm:18.3.0"
   dependencies:
     "@types/react": "npm:*"
-  checksum: 10c0/87604407eca6884c5b4d4657cb511dc5ba28ea1cfa5d0ce1fc2d659a7ad1b64ae85dcda60e3f010641f9a52a6a60dfcaa6be3b0d0de9d624475052a13dae01f4
+  checksum: 10c0/6c90d2ed72c5a0e440d2c75d99287e4b5df3e7b011838cdc03ae5cd518ab52164d86990e73246b9d812eaf02ec351d74e3b4f5bd325bf341e13bf980392fd53b
   languageName: node
   linkType: hard
 
@@ -3896,11 +3896,11 @@ __metadata:
   linkType: hard
 
 "@types/react-test-renderer@npm:^18.0.0":
-  version: 18.0.7
-  resolution: "@types/react-test-renderer@npm:18.0.7"
+  version: 18.3.0
+  resolution: "@types/react-test-renderer@npm:18.3.0"
   dependencies:
     "@types/react": "npm:*"
-  checksum: 10c0/45cbe963354acee2ab090979d856763c84f59ef7b63477d1fef5d0fd52760b69aa67bbd205fbd3bd36264620fce72c8e407735a9f2009c40ca50da59b0058c34
+  checksum: 10c0/3c9748be52e8e659e7adf91dea6939486463264e6f633bf21c4cb116de18af7bef0595568a1e588160420b2f65289473075dda1cb417c2875df8cf7a09f5d913
   languageName: node
   linkType: hard
 
@@ -3923,12 +3923,12 @@ __metadata:
   linkType: hard
 
 "@types/react@npm:*, @types/react@npm:16 || 17 || 18, @types/react@npm:>=16.9.11, @types/react@npm:^18.2.7":
-  version: 18.2.79
-  resolution: "@types/react@npm:18.2.79"
+  version: 18.3.1
+  resolution: "@types/react@npm:18.3.1"
   dependencies:
     "@types/prop-types": "npm:*"
     csstype: "npm:^3.0.2"
-  checksum: 10c0/c8a8a005d8830a48cc1ef93c3510c4935a2a03e5557dbecaa8f1038450cbfcb18eb206fa7fba7077d54b8da21faeb25577e897a333392770a7797f625b62c78a
+  checksum: 10c0/18d856c12a4ec93f3cda2d58ef3d77a9480818afd3af895f812896fb82cfca1f35a692ab1add4ce826a4eb58a071624c7d1c8c6c4ccfb81c100d2916dc607614
   languageName: node
   linkType: hard
 

From e5062b713588cbdc7249a65311a2e59a08bf9731 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 6 May 2024 11:52:34 +0200
Subject: [PATCH 0951/2191] Fix post deletion not being deferred when those are
 part of an account warning (#30163)

---
 app/models/status.rb       |  2 +-
 spec/models/status_spec.rb | 42 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/app/models/status.rb b/app/models/status.rb
index 0bb5c0ce2353eb..72a8d6c40e7c5d 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -266,7 +266,7 @@ def non_sensitive_with_media?
   end
 
   def reported?
-    @reported ||= Report.where(target_account: account).unresolved.exists?(['? = ANY(status_ids)', id])
+    @reported ||= account.targeted_reports.unresolved.exists?(['? = ANY(status_ids)', id]) || account.strikes.exists?(['? = ANY(status_ids)', id.to_s])
   end
 
   def emojis
diff --git a/spec/models/status_spec.rb b/spec/models/status_spec.rb
index 284576cedab6d9..271cf8690ecd7b 100644
--- a/spec/models/status_spec.rb
+++ b/spec/models/status_spec.rb
@@ -205,6 +205,48 @@
     end
   end
 
+  describe '#reported?' do
+    context 'when the status is not reported' do
+      it 'returns false' do
+        expect(subject.reported?).to be false
+      end
+    end
+
+    context 'when the status is part of an open report' do
+      before do
+        Fabricate(:report, target_account: subject.account, status_ids: [subject.id])
+      end
+
+      it 'returns true' do
+        expect(subject.reported?).to be true
+      end
+    end
+
+    context 'when the status is part of a closed report with an account warning mentioning the account' do
+      before do
+        report = Fabricate(:report, target_account: subject.account, status_ids: [subject.id])
+        report.resolve!(Fabricate(:account))
+        Fabricate(:account_warning, target_account: subject.account, status_ids: [subject.id], report: report)
+      end
+
+      it 'returns true' do
+        expect(subject.reported?).to be true
+      end
+    end
+
+    context 'when the status is part of a closed report with an account warning not mentioning the account' do
+      before do
+        report = Fabricate(:report, target_account: subject.account, status_ids: [subject.id])
+        report.resolve!(Fabricate(:account))
+        Fabricate(:account_warning, target_account: subject.account, report: report)
+      end
+
+      it 'returns false' do
+        expect(subject.reported?).to be false
+      end
+    end
+  end
+
   describe '.mutes_map' do
     subject { described_class.mutes_map([status.conversation.id], account) }
 

From dbaa4ed891f5eb97e74600ddd4e38a9be40f9180 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 6 May 2024 07:50:45 -0400
Subject: [PATCH 0952/2191] Use `chewy` which relaxes ES version reqs (#30157)

---
 Gemfile.lock                                     | 16 ++++++++--------
 .../system_check/elasticsearch_check_spec.rb     |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 27d858ed05f69d..190888ddb81ba7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -167,9 +167,9 @@ GEM
       activesupport
     cbor (0.5.9.8)
     charlock_holmes (0.7.7)
-    chewy (7.5.1)
+    chewy (7.6.0)
       activesupport (>= 5.2)
-      elasticsearch (>= 7.12.0, < 7.14.0)
+      elasticsearch (>= 7.14.0, < 8)
       elasticsearch-dsl
     chunky_png (1.4.0)
     climate_control (1.2.0)
@@ -220,14 +220,14 @@ GEM
     dotenv (3.1.1)
     drb (2.2.1)
     ed25519 (1.3.0)
-    elasticsearch (7.13.3)
-      elasticsearch-api (= 7.13.3)
-      elasticsearch-transport (= 7.13.3)
-    elasticsearch-api (7.13.3)
+    elasticsearch (7.17.10)
+      elasticsearch-api (= 7.17.10)
+      elasticsearch-transport (= 7.17.10)
+    elasticsearch-api (7.17.10)
       multi_json
     elasticsearch-dsl (0.1.10)
-    elasticsearch-transport (7.13.3)
-      faraday (~> 1)
+    elasticsearch-transport (7.17.10)
+      faraday (>= 1, < 3)
       multi_json
     email_spec (2.2.2)
       htmlentities (~> 4.3.3)
diff --git a/spec/lib/admin/system_check/elasticsearch_check_spec.rb b/spec/lib/admin/system_check/elasticsearch_check_spec.rb
index a885640ce0c603..8f210579d000ac 100644
--- a/spec/lib/admin/system_check/elasticsearch_check_spec.rb
+++ b/spec/lib/admin/system_check/elasticsearch_check_spec.rb
@@ -127,7 +127,7 @@
   end
 
   def stub_elasticsearch_error
-    client = instance_double(Elasticsearch::Transport::Client)
+    client = instance_double(Elasticsearch::Client)
     allow(client).to receive(:info).and_raise(Elasticsearch::Transport::Transport::Error)
     allow(Chewy).to receive(:client).and_return(client)
   end

From 8e4fea77e311399e4bcfff729aa06fed4e82e57c Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 6 May 2024 14:41:14 +0200
Subject: [PATCH 0953/2191] Fix race condition in `POST
 /api/v1/push/subscription` (#30166)

---
 .../api/v1/push/subscriptions_controller.rb   | 33 ++++++++++++-------
 app/lib/access_token_extension.rb             |  2 ++
 2 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/app/controllers/api/v1/push/subscriptions_controller.rb b/app/controllers/api/v1/push/subscriptions_controller.rb
index 3634acf95662db..e1ad89ee3e02e2 100644
--- a/app/controllers/api/v1/push/subscriptions_controller.rb
+++ b/app/controllers/api/v1/push/subscriptions_controller.rb
@@ -1,9 +1,12 @@
 # frozen_string_literal: true
 
 class Api::V1::Push::SubscriptionsController < Api::BaseController
+  include Redisable
+  include Lockable
+
   before_action -> { doorkeeper_authorize! :push }
   before_action :require_user!
-  before_action :set_push_subscription
+  before_action :set_push_subscription, only: [:show, :update]
   before_action :check_push_subscription, only: [:show, :update]
 
   def show
@@ -11,16 +14,18 @@ def show
   end
 
   def create
-    @push_subscription&.destroy!
+    with_redis_lock("push_subscription:#{current_user.id}") do
+      destroy_web_push_subscriptions!
 
-    @push_subscription = Web::PushSubscription.create!(
-      endpoint: subscription_params[:endpoint],
-      key_p256dh: subscription_params[:keys][:p256dh],
-      key_auth: subscription_params[:keys][:auth],
-      data: data_params,
-      user_id: current_user.id,
-      access_token_id: doorkeeper_token.id
-    )
+      @push_subscription = Web::PushSubscription.create!(
+        endpoint: subscription_params[:endpoint],
+        key_p256dh: subscription_params[:keys][:p256dh],
+        key_auth: subscription_params[:keys][:auth],
+        data: data_params,
+        user_id: current_user.id,
+        access_token_id: doorkeeper_token.id
+      )
+    end
 
     render json: @push_subscription, serializer: REST::WebPushSubscriptionSerializer
   end
@@ -31,14 +36,18 @@ def update
   end
 
   def destroy
-    @push_subscription&.destroy!
+    destroy_web_push_subscriptions!
     render_empty
   end
 
   private
 
+  def destroy_web_push_subscriptions!
+    doorkeeper_token.web_push_subscriptions.destroy_all
+  end
+
   def set_push_subscription
-    @push_subscription = Web::PushSubscription.find_by(access_token_id: doorkeeper_token.id)
+    @push_subscription = doorkeeper_token.web_push_subscriptions.first
   end
 
   def check_push_subscription
diff --git a/app/lib/access_token_extension.rb b/app/lib/access_token_extension.rb
index f51bde492736ef..4e9585dd1e6583 100644
--- a/app/lib/access_token_extension.rb
+++ b/app/lib/access_token_extension.rb
@@ -6,6 +6,8 @@ module AccessTokenExtension
   included do
     include Redisable
 
+    has_many :web_push_subscriptions, class_name: 'Web::PushSubscription', inverse_of: :access_token
+
     after_commit :push_to_streaming_api
   end
 

From 30ef9fccf0c603ba917191ddbefdd497523d3d67 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 6 May 2024 14:47:19 +0200
Subject: [PATCH 0954/2191] Fix hashtag matching pattern matching some link
 anchors (#30190)

---
 app/models/tag.rb       | 2 +-
 spec/models/tag_spec.rb | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/models/tag.rb b/app/models/tag.rb
index 35be921e2d00a4..3f88cb06807c73 100644
--- a/app/models/tag.rb
+++ b/app/models/tag.rb
@@ -37,7 +37,7 @@ class Tag < ApplicationRecord
   HASHTAG_LAST_SEQUENCE = '([[:word:]_]*[[:alpha:]][[:word:]_]*)'
   HASHTAG_NAME_PAT = "#{HASHTAG_FIRST_SEQUENCE}|#{HASHTAG_LAST_SEQUENCE}"
 
-  HASHTAG_RE = %r{(?<![=/)\w])#(#{HASHTAG_NAME_PAT})}i
+  HASHTAG_RE = %r{(?<![=/)\p{Alnum}])#(#{HASHTAG_NAME_PAT})}i
   HASHTAG_NAME_RE = /\A(#{HASHTAG_NAME_PAT})\z/i
   HASHTAG_INVALID_CHARS_RE = /[^[:alnum:]\u0E47-\u0E4E#{HASHTAG_SEPARATORS}]/
 
diff --git a/spec/models/tag_spec.rb b/spec/models/tag_spec.rb
index 4c2bdd52f4b579..7799afe44b2708 100644
--- a/spec/models/tag_spec.rb
+++ b/spec/models/tag_spec.rb
@@ -36,6 +36,10 @@
       expect(subject.match('https://gcc.gnu.org/bugzilla/show_bug.cgi?id=111895#c4')).to be_nil
     end
 
+    it 'does not match URLs with hashtag-like anchors after a non-ascii character' do
+      expect(subject.match('https://example.org/testé#foo')).to be_nil
+    end
+
     it 'does not match URLs with hashtag-like anchors after an empty query parameter' do
       expect(subject.match('https://en.wikipedia.org/wiki/Ghostbusters_(song)?foo=#Lawsuit')).to be_nil
     end

From 116f01ec7d1e0793fc6c1749867d660d7c19a5b7 Mon Sep 17 00:00:00 2001
From: Emelia Smith <ThisIsMissEm@users.noreply.github.com>
Date: Mon, 6 May 2024 15:17:56 +0200
Subject: [PATCH 0955/2191] Implement RFC 8414 for OAuth 2.0 server metadata
 (#29191)

---
 .../well_known/oauth_metadata_controller.rb   | 23 +++++++
 app/presenters/oauth_metadata_presenter.rb    | 67 +++++++++++++++++++
 app/serializers/oauth_metadata_serializer.rb  |  9 +++
 config/routes.rb                              |  1 +
 .../well_known/oauth_metadata_spec.rb         | 37 ++++++++++
 5 files changed, 137 insertions(+)
 create mode 100644 app/controllers/well_known/oauth_metadata_controller.rb
 create mode 100644 app/presenters/oauth_metadata_presenter.rb
 create mode 100644 app/serializers/oauth_metadata_serializer.rb
 create mode 100644 spec/requests/well_known/oauth_metadata_spec.rb

diff --git a/app/controllers/well_known/oauth_metadata_controller.rb b/app/controllers/well_known/oauth_metadata_controller.rb
new file mode 100644
index 00000000000000..c80be2d65258c5
--- /dev/null
+++ b/app/controllers/well_known/oauth_metadata_controller.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module WellKnown
+  class OauthMetadataController < ActionController::Base # rubocop:disable Rails/ApplicationController
+    include CacheConcern
+
+    # Prevent `active_model_serializer`'s `ActionController::Serialization` from calling `current_user`
+    # and thus re-issuing session cookies
+    serialization_scope nil
+
+    def show
+      # Due to this document potentially changing between Mastodon versions (as
+      # new OAuth scopes are added), we don't use expires_in to cache upstream,
+      # instead just caching in the rails cache:
+      render_with_cache(
+        json: ::OauthMetadataPresenter.new,
+        serializer: ::OauthMetadataSerializer,
+        content_type: 'application/json',
+        expires_in: 15.minutes
+      )
+    end
+  end
+end
diff --git a/app/presenters/oauth_metadata_presenter.rb b/app/presenters/oauth_metadata_presenter.rb
new file mode 100644
index 00000000000000..546503bfcca22e
--- /dev/null
+++ b/app/presenters/oauth_metadata_presenter.rb
@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+class OauthMetadataPresenter < ActiveModelSerializers::Model
+  include RoutingHelper
+
+  attributes :issuer, :authorization_endpoint, :token_endpoint,
+             :revocation_endpoint, :scopes_supported,
+             :response_types_supported, :response_modes_supported,
+             :grant_types_supported, :token_endpoint_auth_methods_supported,
+             :service_documentation, :app_registration_endpoint
+
+  def issuer
+    root_url
+  end
+
+  def service_documentation
+    'https://docs.joinmastodon.org/'
+  end
+
+  def authorization_endpoint
+    oauth_authorization_url
+  end
+
+  def token_endpoint
+    oauth_token_url
+  end
+
+  # As the api_v1_apps route doesn't technically conform to the specification
+  # for OAuth 2.0 Dynamic Client Registration defined in RFC 7591 we use a
+  # non-standard property for now to indicate the mastodon specific registration
+  # endpoint. See: https://datatracker.ietf.org/doc/html/rfc7591
+  def app_registration_endpoint
+    api_v1_apps_url
+  end
+
+  def revocation_endpoint
+    oauth_revoke_url
+  end
+
+  def scopes_supported
+    doorkeeper.scopes
+  end
+
+  def response_types_supported
+    doorkeeper.authorization_response_types
+  end
+
+  def response_modes_supported
+    doorkeeper.authorization_response_flows.flat_map(&:response_mode_matches).uniq
+  end
+
+  def grant_types_supported
+    grant_types_supported = doorkeeper.grant_flows.dup
+    grant_types_supported << 'refresh_token' if doorkeeper.refresh_token_enabled?
+    grant_types_supported
+  end
+
+  def token_endpoint_auth_methods_supported
+    %w(client_secret_basic client_secret_post)
+  end
+
+  private
+
+  def doorkeeper
+    @doorkeeper ||= Doorkeeper.configuration
+  end
+end
diff --git a/app/serializers/oauth_metadata_serializer.rb b/app/serializers/oauth_metadata_serializer.rb
new file mode 100644
index 00000000000000..5f3dc7b87e2e05
--- /dev/null
+++ b/app/serializers/oauth_metadata_serializer.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class OauthMetadataSerializer < ActiveModel::Serializer
+  attributes :issuer, :authorization_endpoint, :token_endpoint,
+             :revocation_endpoint, :scopes_supported,
+             :response_types_supported, :response_modes_supported,
+             :grant_types_supported, :token_endpoint_auth_methods_supported,
+             :service_documentation, :app_registration_endpoint
+end
diff --git a/config/routes.rb b/config/routes.rb
index 3d3c94096c1662..f4662dd5da447d 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -62,6 +62,7 @@ def redirect_with_vary(path)
                 tokens: 'oauth/tokens'
   end
 
+  get '.well-known/oauth-authorization-server', to: 'well_known/oauth_metadata#show', as: :oauth_metadata, defaults: { format: 'json' }
   get '.well-known/host-meta', to: 'well_known/host_meta#show', as: :host_meta, defaults: { format: 'xml' }
   get '.well-known/nodeinfo', to: 'well_known/node_info#index', as: :nodeinfo, defaults: { format: 'json' }
   get '.well-known/webfinger', to: 'well_known/webfinger#show', as: :webfinger
diff --git a/spec/requests/well_known/oauth_metadata_spec.rb b/spec/requests/well_known/oauth_metadata_spec.rb
new file mode 100644
index 00000000000000..deef189ac909f3
--- /dev/null
+++ b/spec/requests/well_known/oauth_metadata_spec.rb
@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'The /.well-known/oauth-authorization-server request' do
+  let(:protocol) { ENV.fetch('LOCAL_HTTPS', true) ? :https : :http }
+
+  before do
+    host! ENV.fetch('LOCAL_DOMAIN')
+  end
+
+  it 'returns http success with valid JSON response' do
+    get '/.well-known/oauth-authorization-server'
+
+    expect(response)
+      .to have_http_status(200)
+      .and have_attributes(
+        media_type: 'application/json'
+      )
+
+    grant_types_supported = Doorkeeper.configuration.grant_flows.dup
+    grant_types_supported << 'refresh_token' if Doorkeeper.configuration.refresh_token_enabled?
+
+    expect(body_as_json).to include(
+      issuer: root_url(protocol: protocol),
+      service_documentation: 'https://docs.joinmastodon.org/',
+      authorization_endpoint: oauth_authorization_url(protocol: protocol),
+      token_endpoint: oauth_token_url(protocol: protocol),
+      revocation_endpoint: oauth_revoke_url(protocol: protocol),
+      scopes_supported: Doorkeeper.configuration.scopes.map(&:to_s),
+      response_types_supported: Doorkeeper.configuration.authorization_response_types,
+      grant_types_supported: grant_types_supported,
+      # non-standard extension:
+      app_registration_endpoint: api_v1_apps_url(protocol: protocol)
+    )
+  end
+end

From 05126d106fd972e4baf5a1cec857e44a451b90a9 Mon Sep 17 00:00:00 2001
From: Fawaz Farid <fawwazally@gmail.com>
Date: Mon, 6 May 2024 16:31:39 +0300
Subject: [PATCH 0956/2191] Redirect back after site upload deletion (#30141)

---
 app/controllers/admin/site_uploads_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/admin/site_uploads_controller.rb b/app/controllers/admin/site_uploads_controller.rb
index a5d2cf41cf121d..96e61cf6bbc194 100644
--- a/app/controllers/admin/site_uploads_controller.rb
+++ b/app/controllers/admin/site_uploads_controller.rb
@@ -9,7 +9,7 @@ def destroy
 
       @site_upload.destroy!
 
-      redirect_to admin_settings_path, notice: I18n.t('admin.site_uploads.destroyed_msg')
+      redirect_back fallback_location: admin_settings_path, notice: I18n.t('admin.site_uploads.destroyed_msg')
     end
 
     private

From b152f936c1361cc82e21c853335557c3ffa80409 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 6 May 2024 11:05:12 -0400
Subject: [PATCH 0957/2191] Migrate paperclip `_file_size` columns to bigint
 (#29263)

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
---
 .../instance_media_attachments_measure.rb     |  2 +-
 ...51_convert_file_size_columns_to_big_int.rb | 42 +++++++++++++++++++
 db/schema.rb                                  | 16 +++----
 3 files changed, 51 insertions(+), 9 deletions(-)
 create mode 100644 db/migrate/20240217175251_convert_file_size_columns_to_big_int.rb

diff --git a/app/lib/admin/metrics/measure/instance_media_attachments_measure.rb b/app/lib/admin/metrics/measure/instance_media_attachments_measure.rb
index 1d2dbbe4146a86..65f444624e493b 100644
--- a/app/lib/admin/metrics/measure/instance_media_attachments_measure.rb
+++ b/app/lib/admin/metrics/measure/instance_media_attachments_measure.rb
@@ -50,7 +50,7 @@ def sql_query_string
           WHERE date_trunc('day', media_attachments.created_at)::date = axis.period
             AND #{account_domain_sql(params[:include_subdomains])}
         )
-        SELECT COALESCE(SUM(size), 0) FROM new_media_attachments
+        SELECT COALESCE(SUM(size), 0)::bigint FROM new_media_attachments
       ) AS value
       FROM (
         SELECT generate_series(date_trunc('day', :start_at::timestamp)::date, date_trunc('day', :end_at::timestamp)::date, interval '1 day') AS period
diff --git a/db/migrate/20240217175251_convert_file_size_columns_to_big_int.rb b/db/migrate/20240217175251_convert_file_size_columns_to_big_int.rb
new file mode 100644
index 00000000000000..f8223f9c9321d0
--- /dev/null
+++ b/db/migrate/20240217175251_convert_file_size_columns_to_big_int.rb
@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require_relative '../../lib/mastodon/migration_helpers'
+
+class ConvertFileSizeColumnsToBigInt < ActiveRecord::Migration[7.1]
+  include Mastodon::MigrationHelpers
+
+  TABLE_COLUMN_MAPPING = [
+    [:accounts, :avatar_file_size],
+    [:accounts, :header_file_size],
+    [:custom_emojis, :image_file_size],
+    [:imports, :data_file_size],
+    [:media_attachments, :file_file_size],
+    [:media_attachments, :thumbnail_file_size],
+    [:preview_cards, :image_file_size],
+    [:site_uploads, :file_file_size],
+  ].freeze
+
+  disable_ddl_transaction!
+
+  def migrate_columns(to_type)
+    TABLE_COLUMN_MAPPING.each do |column_parts|
+      table, column = column_parts
+
+      # Skip this if we're resuming and already did this one.
+      next if column_for(table, column).sql_type == to_type.to_s
+
+      safety_assured do
+        change_column_type_concurrently table, column, to_type
+        cleanup_concurrent_column_type_change table, column
+      end
+    end
+  end
+
+  def up
+    migrate_columns(:bigint)
+  end
+
+  def down
+    migrate_columns(:integer)
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 11f1a202f79e95..ee41a0c3a15e74 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -166,11 +166,11 @@
     t.string "url"
     t.string "avatar_file_name"
     t.string "avatar_content_type"
-    t.integer "avatar_file_size"
+    t.bigint "avatar_file_size"
     t.datetime "avatar_updated_at", precision: nil
     t.string "header_file_name"
     t.string "header_content_type"
-    t.integer "header_file_size"
+    t.bigint "header_file_size"
     t.datetime "header_updated_at", precision: nil
     t.string "avatar_remote_url"
     t.boolean "locked", default: false, null: false
@@ -368,7 +368,7 @@
     t.string "domain"
     t.string "image_file_name"
     t.string "image_content_type"
-    t.integer "image_file_size"
+    t.bigint "image_file_size"
     t.datetime "image_updated_at", precision: nil
     t.datetime "created_at", precision: nil, null: false
     t.datetime "updated_at", precision: nil, null: false
@@ -558,7 +558,7 @@
     t.datetime "updated_at", precision: nil, null: false
     t.string "data_file_name"
     t.string "data_content_type"
-    t.integer "data_file_size"
+    t.bigint "data_file_size"
     t.datetime "data_updated_at", precision: nil
     t.bigint "account_id", null: false
     t.boolean "overwrite", default: false, null: false
@@ -635,7 +635,7 @@
     t.bigint "status_id"
     t.string "file_file_name"
     t.string "file_content_type"
-    t.integer "file_file_size"
+    t.bigint "file_file_size"
     t.datetime "file_updated_at", precision: nil
     t.string "remote_url", default: "", null: false
     t.datetime "created_at", precision: nil, null: false
@@ -651,7 +651,7 @@
     t.integer "file_storage_schema_version"
     t.string "thumbnail_file_name"
     t.string "thumbnail_content_type"
-    t.integer "thumbnail_file_size"
+    t.bigint "thumbnail_file_size"
     t.datetime "thumbnail_updated_at", precision: nil
     t.string "thumbnail_remote_url"
     t.index ["account_id", "status_id"], name: "index_media_attachments_on_account_id_and_status_id", order: { status_id: :desc }
@@ -855,7 +855,7 @@
     t.string "description", default: "", null: false
     t.string "image_file_name"
     t.string "image_content_type"
-    t.integer "image_file_size"
+    t.bigint "image_file_size"
     t.datetime "image_updated_at", precision: nil
     t.integer "type", default: 0, null: false
     t.text "html", default: "", null: false
@@ -993,7 +993,7 @@
     t.string "var", default: "", null: false
     t.string "file_file_name"
     t.string "file_content_type"
-    t.integer "file_file_size"
+    t.bigint "file_file_size"
     t.datetime "file_updated_at", precision: nil
     t.json "meta"
     t.datetime "created_at", precision: nil, null: false

From bc24c4792d0bef744ff1d39e8eb543b1b6aa98c2 Mon Sep 17 00:00:00 2001
From: Fawaz Farid <fawwazally@gmail.com>
Date: Mon, 6 May 2024 18:06:52 +0300
Subject: [PATCH 0958/2191] Allow admins to configure instance favicon and logo
 (#30040)

---
 app/helpers/application_helper.rb             |  7 +++++
 app/models/form/admin_settings.rb             |  4 +++
 app/models/site_upload.rb                     |  8 ++++++
 app/serializers/manifest_serializer.rb        | 20 ++++---------
 .../admin/settings/branding/show.html.haml    | 28 +++++++++++++++++++
 app/views/layouts/application.html.haml       | 10 +++----
 config/locales/simple_form.en-GB.yml          |  3 ++
 config/locales/simple_form.en.yml             |  2 ++
 spec/helpers/application_helper_spec.rb       | 24 ++++++++++++++++
 9 files changed, 87 insertions(+), 19 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 4cf959f2d8e0aa..ff351429e0a238 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -240,6 +240,13 @@ def prerender_custom_emojis(html, custom_emojis, other_options = {})
     EmojiFormatter.new(html, custom_emojis, other_options.merge(animate: prefers_autoplay?)).to_s
   end
 
+  def site_icon_path(type, size = '48')
+    icon = SiteUpload.find_by(var: type)
+    return nil unless icon
+
+    icon.file.url(size)
+  end
+
   private
 
   def storage_host_var
diff --git a/app/models/form/admin_settings.rb b/app/models/form/admin_settings.rb
index cb37a522174d43..85b913cf80aadc 100644
--- a/app/models/form/admin_settings.rb
+++ b/app/models/form/admin_settings.rb
@@ -37,6 +37,8 @@ class Form::AdminSettings
     status_page_url
     captcha_enabled
     authorized_fetch
+    app_icon
+    favicon
   ).freeze
 
   INTEGER_KEYS = %i(
@@ -63,6 +65,8 @@ class Form::AdminSettings
   UPLOAD_KEYS = %i(
     thumbnail
     mascot
+    app_icon
+    favicon
   ).freeze
 
   OVERRIDEN_SETTINGS = {
diff --git a/app/models/site_upload.rb b/app/models/site_upload.rb
index 03d472cdb2e737..b3926ec7ed5986 100644
--- a/app/models/site_upload.rb
+++ b/app/models/site_upload.rb
@@ -19,7 +19,15 @@
 class SiteUpload < ApplicationRecord
   include Attachmentable
 
+  FAVICON_SIZES = [16, 32, 48].freeze
+  APPLE_ICON_SIZES   = [57, 60, 72, 76, 114, 120, 144, 152, 167, 180, 1024].freeze
+  ANDROID_ICON_SIZES = [36, 48, 72, 96, 144, 192, 256, 384, 512].freeze
+
+  APP_ICON_SIZES = (APPLE_ICON_SIZES + ANDROID_ICON_SIZES).uniq.freeze
+
   STYLES = {
+    app_icon: APP_ICON_SIZES.each_with_object({}) { |size, hash| hash[size.to_s.to_sym] = "#{size}x#{size}#" }.freeze,
+    favicon: FAVICON_SIZES.each_with_object({}) { |size, hash| hash[size.to_s.to_sym] = "#{size}x#{size}#" }.freeze,
     thumbnail: {
       '@1x': {
         format: 'png',
diff --git a/app/serializers/manifest_serializer.rb b/app/serializers/manifest_serializer.rb
index 1c1f7d0ad534a3..759490228c04bf 100644
--- a/app/serializers/manifest_serializer.rb
+++ b/app/serializers/manifest_serializer.rb
@@ -1,21 +1,10 @@
 # frozen_string_literal: true
 
 class ManifestSerializer < ActiveModel::Serializer
+  include ApplicationHelper
   include RoutingHelper
   include ActionView::Helpers::TextHelper
 
-  ICON_SIZES = %w(
-    36
-    48
-    72
-    96
-    144
-    192
-    256
-    384
-    512
-  ).freeze
-
   attributes :id, :name, :short_name,
              :icons, :theme_color, :background_color,
              :display, :start_url, :scope,
@@ -37,9 +26,12 @@ def short_name
   end
 
   def icons
-    ICON_SIZES.map do |size|
+    SiteUpload::ANDROID_ICON_SIZES.map do |size|
+      src = site_icon_path('app_icon', size.to_i)
+      src = URI.join(root_url, src).to_s if src.present?
+
       {
-        src: frontend_asset_url("icons/android-chrome-#{size}x#{size}.png"),
+        src: src || frontend_asset_url("icons/android-chrome-#{size}x#{size}.png"),
         sizes: "#{size}x#{size}",
         type: 'image/png',
         purpose: 'any maskable',
diff --git a/app/views/admin/settings/branding/show.html.haml b/app/views/admin/settings/branding/show.html.haml
index 769c0dafe81d5f..71aac5ead1c1f0 100644
--- a/app/views/admin/settings/branding/show.html.haml
+++ b/app/views/admin/settings/branding/show.html.haml
@@ -40,5 +40,33 @@
           = fa_icon 'trash fw'
           = t('admin.site_uploads.delete')
 
+  .fields-row
+    .fields-row__column.fields-row__column-6.fields-group
+      = f.input :favicon,
+                as: :file,
+                input_html: { accept: ['image/jpeg', 'image/png', 'image/gif', 'image/webp'].join(',') },
+                wrapper: :with_block_label
+
+    .fields-row__column.fields-row__column-6.fields-group
+      - if @admin_settings.favicon.persisted?
+        = image_tag @admin_settings.favicon.file.url('48'), class: 'fields-group__thumbnail'
+        = link_to admin_site_upload_path(@admin_settings.favicon), data: { method: :delete }, class: 'link-button link-button--destructive' do
+          = fa_icon 'trash fw'
+          = t('admin.site_uploads.delete')
+
+  .fields-row
+    .fields-row__column.fields-row__column-6.fields-group
+      = f.input :app_icon,
+                as: :file,
+                input_html: { accept: ['image/jpeg', 'image/png', 'image/gif', 'image/webp'].join(',') },
+                wrapper: :with_block_label
+
+    .fields-row__column.fields-row__column-6.fields-group
+      - if @admin_settings.app_icon.persisted?
+        = image_tag @admin_settings.app_icon.file.url('48'), class: 'fields-group__thumbnail'
+        = link_to admin_site_upload_path(@admin_settings.app_icon), data: { method: :delete }, class: 'link-button link-button--destructive' do
+          = fa_icon 'trash fw'
+          = t('admin.site_uploads.delete')
+
   .actions
     = f.button :button, t('generic.save_changes'), type: :submit
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 9d7669d685124a..56857b2b635c14 100755
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -11,13 +11,13 @@
     - if storage_host?
       %link{ rel: 'dns-prefetch', href: storage_host }/
 
-    %link{ rel: 'icon', href: '/favicon.ico', type: 'image/x-icon' }/
+    %link{ rel: 'icon', href: site_icon_path('favicon') || '/favicon.ico', type: 'image/x-icon' }/
 
-    - %w(16 32 48).each do |size|
-      %link{ rel: 'icon', sizes: "#{size}x#{size}", href: frontend_asset_path("icons/favicon-#{size}x#{size}.png"), type: 'image/png' }/
+    - SiteUpload::FAVICON_SIZES.each do |size|
+      %link{ rel: 'icon', sizes: "#{size}x#{size}", href: site_icon_path('favicon', size.to_i) || frontend_asset_path("icons/favicon-#{size}x#{size}.png"), type: 'image/png' }/
 
-    - %w(57 60 72 76 114 120 144 152 167 180 1024).each do |size|
-      %link{ rel: 'apple-touch-icon', sizes: "#{size}x#{size}", href: frontend_asset_path("icons/apple-touch-icon-#{size}x#{size}.png") }/
+    - SiteUpload::APPLE_ICON_SIZES.each do |size|
+      %link{ rel: 'apple-touch-icon', sizes: "#{size}x#{size}", href: site_icon_path('app_icon', size.to_i) || frontend_asset_path("icons/apple-touch-icon-#{size}x#{size}.png") }/
 
     %link{ rel: 'mask-icon', href: frontend_asset_path('images/logo-symbol-icon.svg'), color: '#6364FF' }/
     %link{ rel: 'manifest', href: manifest_path(format: :json) }/
diff --git a/config/locales/simple_form.en-GB.yml b/config/locales/simple_form.en-GB.yml
index f4668ccada1c38..9aedac15f3dbdd 100644
--- a/config/locales/simple_form.en-GB.yml
+++ b/config/locales/simple_form.en-GB.yml
@@ -77,9 +77,12 @@ en-GB:
           warn: Hide the filtered content behind a warning mentioning the filter's title
       form_admin_settings:
         activity_api_enabled: Counts of locally published posts, active users, and new registrations in weekly buckets
+        app_icon: WEBP, PNG, GIF or JPG. Overrides the default app icon on mobile devices with a custom icon.
+        backups_retention_period: Keep generated user archives for the specified number of days.
         bootstrap_timeline_accounts: These accounts will be pinned to the top of new users' follow recommendations.
         closed_registrations_message: Displayed when sign-ups are closed
         custom_css: You can apply custom styles on the web version of Mastodon.
+        favicon: WEBP, PNG, GIF or JPG. Overrides the default Mastodon favicon with a custom icon.
         mascot: Overrides the illustration in the advanced web interface.
         peers_api_enabled: A list of domain names this server has encountered in the fediverse. No data is included here about whether you federate with a given server, just that your server knows about it. This is used by services that collect statistics on federation in a general sense.
         profile_directory: The profile directory lists all users who have opted-in to be discoverable.
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml
index 7304bdc22f8e81..fdc9f61813d9c7 100644
--- a/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@@ -77,11 +77,13 @@ en:
           warn: Hide the filtered content behind a warning mentioning the filter's title
       form_admin_settings:
         activity_api_enabled: Counts of locally published posts, active users, and new registrations in weekly buckets
+        app_icon: WEBP, PNG, GIF or JPG. Overrides the default app icon on mobile devices with a custom icon.
         backups_retention_period: Users have the ability to generate archives of their posts to download later. When set to a positive value, these archives will be automatically deleted from your storage after the specified number of days.
         bootstrap_timeline_accounts: These accounts will be pinned to the top of new users' follow recommendations.
         closed_registrations_message: Displayed when sign-ups are closed
         content_cache_retention_period: All posts from other servers (including boosts and replies) will be deleted after the specified number of days, without regard to any local user interaction with those posts. This includes posts where a local user has marked it as bookmarks or favorites. Private mentions between users from different instances will also be lost and impossible to restore. Use of this setting is intended for special purpose instances and breaks many user expectations when implemented for general purpose use.
         custom_css: You can apply custom styles on the web version of Mastodon.
+        favicon: WEBP, PNG, GIF or JPG. Overrides the default Mastodon favicon with a custom icon.
         mascot: Overrides the illustration in the advanced web interface.
         media_cache_retention_period: Media files from posts made by remote users are cached on your server. When set to a positive value, media will be deleted after the specified number of days. If the media data is requested after it is deleted, it will be re-downloaded, if the source content is still available. Due to restrictions on how often link preview cards poll third-party sites, it is recommended to set this value to at least 14 days, or link preview cards will not be updated on demand before that time.
         peers_api_enabled: A list of domain names this server has encountered in the fediverse. No data is included here about whether you federate with a given server, just that your server knows about it. This is used by services that collect statistics on federation in a general sense.
diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
index 9330eb0dae1105..56501034b2ddd8 100644
--- a/spec/helpers/application_helper_spec.rb
+++ b/spec/helpers/application_helper_spec.rb
@@ -285,4 +285,28 @@ def current_theme = 'default'
       end
     end
   end
+
+  describe '#site_icon_path' do
+    context 'when an icon exists' do
+      let!(:favicon) { Fabricate(:site_upload, var: 'favicon') }
+
+      it 'returns the URL of the icon' do
+        expect(helper.site_icon_path('favicon')).to eq(favicon.file.url('48'))
+      end
+
+      it 'returns the URL of the icon with size parameter' do
+        expect(helper.site_icon_path('favicon', 16)).to eq(favicon.file.url('16'))
+      end
+    end
+
+    context 'when an icon does not exist' do
+      it 'returns nil' do
+        expect(helper.site_icon_path('favicon')).to be_nil
+      end
+
+      it 'returns nil with size parameter' do
+        expect(helper.site_icon_path('favicon', 16)).to be_nil
+      end
+    end
+  end
 end

From 2fe1b8d1695d8faa452a69872fde94ccc4611576 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 6 May 2024 17:19:15 +0200
Subject: [PATCH 0959/2191] Add API to get multiple accounts and statuses
 (#27871)

Co-authored-by: noellabo <noel.yoshiba@gmail.com>
---
 app/controllers/api/v1/accounts_controller.rb | 30 ++++++++++++++++---
 app/controllers/api/v1/statuses_controller.rb | 29 ++++++++++++++++--
 .../concerns/status/threading_concern.rb      | 27 +++++++++++------
 config/routes/api.rb                          |  4 +--
 spec/requests/api/v1/accounts_spec.rb         | 16 ++++++++++
 spec/requests/api/v1/statuses_spec.rb         | 16 ++++++++++
 6 files changed, 104 insertions(+), 18 deletions(-)

diff --git a/app/controllers/api/v1/accounts_controller.rb b/app/controllers/api/v1/accounts_controller.rb
index 23fc85b4754268..be7b302d3be7c3 100644
--- a/app/controllers/api/v1/accounts_controller.rb
+++ b/app/controllers/api/v1/accounts_controller.rb
@@ -9,16 +9,22 @@ class Api::V1::AccountsController < Api::BaseController
   before_action -> { doorkeeper_authorize! :follow, :write, :'write:blocks' }, only: [:block, :unblock]
   before_action -> { doorkeeper_authorize! :write, :'write:accounts' }, only: [:create]
 
-  before_action :require_user!, except: [:show, :create]
-  before_action :set_account, except: [:create]
-  before_action :check_account_approval, except: [:create]
-  before_action :check_account_confirmation, except: [:create]
+  before_action :require_user!, except: [:index, :show, :create]
+  before_action :set_account, except: [:index, :create]
+  before_action :set_accounts, only: [:index]
+  before_action :check_account_approval, except: [:index, :create]
+  before_action :check_account_confirmation, except: [:index, :create]
   before_action :check_enabled_registrations, only: [:create]
+  before_action :check_accounts_limit, only: [:index]
 
   skip_before_action :require_authenticated_user!, only: :create
 
   override_rate_limit_headers :follow, family: :follows
 
+  def index
+    render json: @accounts, each_serializer: REST::AccountSerializer
+  end
+
   def show
     cache_if_unauthenticated!
     render json: @account, serializer: REST::AccountSerializer
@@ -79,6 +85,10 @@ def set_account
     @account = Account.find(params[:id])
   end
 
+  def set_accounts
+    @accounts = Account.where(id: account_ids).without_unapproved
+  end
+
   def check_account_approval
     raise(ActiveRecord::RecordNotFound) if @account.local? && @account.user_pending?
   end
@@ -87,10 +97,22 @@ def check_account_confirmation
     raise(ActiveRecord::RecordNotFound) if @account.local? && !@account.user_confirmed?
   end
 
+  def check_accounts_limit
+    raise(Mastodon::ValidationError) if account_ids.size > DEFAULT_ACCOUNTS_LIMIT
+  end
+
   def relationships(**options)
     AccountRelationshipsPresenter.new([@account], current_user.account_id, **options)
   end
 
+  def account_ids
+    Array(accounts_params[:ids]).uniq.map(&:to_i)
+  end
+
+  def accounts_params
+    params.permit(ids: [])
+  end
+
   def account_params
     params.permit(:username, :email, :password, :agreement, :locale, :reason, :time_zone, :invite_code)
   end
diff --git a/app/controllers/api/v1/statuses_controller.rb b/app/controllers/api/v1/statuses_controller.rb
index 01c3718763f824..36a9ec6325b11e 100644
--- a/app/controllers/api/v1/statuses_controller.rb
+++ b/app/controllers/api/v1/statuses_controller.rb
@@ -5,9 +5,11 @@ class Api::V1::StatusesController < Api::BaseController
 
   before_action -> { authorize_if_got_token! :read, :'read:statuses' }, except: [:create, :update, :destroy]
   before_action -> { doorkeeper_authorize! :write, :'write:statuses' }, only:   [:create, :update, :destroy]
-  before_action :require_user!, except:  [:show, :context]
-  before_action :set_status, only:       [:show, :context]
-  before_action :set_thread, only:       [:create]
+  before_action :require_user!, except:      [:index, :show, :context]
+  before_action :set_statuses, only:         [:index]
+  before_action :set_status, only:           [:show, :context]
+  before_action :set_thread, only:           [:create]
+  before_action :check_statuses_limit, only: [:index]
 
   override_rate_limit_headers :create, family: :statuses
   override_rate_limit_headers :update, family: :statuses
@@ -23,6 +25,11 @@ class Api::V1::StatusesController < Api::BaseController
   DESCENDANTS_LIMIT       = 60
   DESCENDANTS_DEPTH_LIMIT = 20
 
+  def index
+    @statuses = cache_collection(@statuses, Status)
+    render json: @statuses, each_serializer: REST::StatusSerializer
+  end
+
   def show
     cache_if_unauthenticated!
     @status = cache_collection([@status], Status).first
@@ -111,6 +118,10 @@ def destroy
 
   private
 
+  def set_statuses
+    @statuses = Status.permitted_statuses_from_ids(status_ids, current_account)
+  end
+
   def set_status
     @status = Status.find(params[:id])
     authorize @status, :show?
@@ -125,6 +136,18 @@ def set_thread
     render json: { error: I18n.t('statuses.errors.in_reply_not_found') }, status: 404
   end
 
+  def check_statuses_limit
+    raise(Mastodon::ValidationError) if status_ids.size > DEFAULT_STATUSES_LIMIT
+  end
+
+  def status_ids
+    Array(statuses_params[:ids]).uniq.map(&:to_i)
+  end
+
+  def statuses_params
+    params.permit(ids: [])
+  end
+
   def status_params
     params.permit(
       :status,
diff --git a/app/models/concerns/status/threading_concern.rb b/app/models/concerns/status/threading_concern.rb
index ca8c4481409fdc..478a139d633be2 100644
--- a/app/models/concerns/status/threading_concern.rb
+++ b/app/models/concerns/status/threading_concern.rb
@@ -3,6 +3,23 @@
 module Status::ThreadingConcern
   extend ActiveSupport::Concern
 
+  class_methods do
+    def permitted_statuses_from_ids(ids, account, stable: false)
+      statuses    = Status.with_accounts(ids).to_a
+      account_ids = statuses.map(&:account_id).uniq
+      domains     = statuses.filter_map(&:account_domain).uniq
+      relations   = account&.relations_map(account_ids, domains) || {}
+
+      statuses.reject! { |status| StatusFilter.new(status, account, relations).filtered? }
+
+      if stable
+        statuses.sort_by! { |status| ids.index(status.id) }
+      else
+        statuses
+      end
+    end
+  end
+
   def ancestors(limit, account = nil)
     find_statuses_from_tree_path(ancestor_ids(limit), account)
   end
@@ -76,15 +93,7 @@ def descendant_ids(limit, depth)
   end
 
   def find_statuses_from_tree_path(ids, account, promote: false)
-    statuses    = Status.with_accounts(ids).to_a
-    account_ids = statuses.map(&:account_id).uniq
-    domains     = statuses.filter_map(&:account_domain).uniq
-    relations   = account&.relations_map(account_ids, domains) || {}
-
-    statuses.reject! { |status| StatusFilter.new(status, account, relations).filtered? }
-
-    # Order ancestors/descendants by tree path
-    statuses.sort_by! { |status| ids.index(status.id) }
+    statuses = Status.permitted_statuses_from_ids(ids, account, stable: true)
 
     # Bring self-replies to the top
     if promote
diff --git a/config/routes/api.rb b/config/routes/api.rb
index 60fb0394e769f3..bf3cee0c10e447 100644
--- a/config/routes/api.rb
+++ b/config/routes/api.rb
@@ -6,7 +6,7 @@
 
   # JSON / REST API
   namespace :v1 do
-    resources :statuses, only: [:create, :show, :update, :destroy] do
+    resources :statuses, only: [:index, :create, :show, :update, :destroy] do
       scope module: :statuses do
         resources :reblogged_by, controller: :reblogged_by_accounts, only: :index
         resources :favourited_by, controller: :favourited_by_accounts, only: :index
@@ -182,7 +182,7 @@
       resources :familiar_followers, only: :index
     end
 
-    resources :accounts, only: [:create, :show] do
+    resources :accounts, only: [:index, :create, :show] do
       scope module: :accounts do
         resources :statuses, only: :index
         resources :followers, only: :index, controller: :follower_accounts
diff --git a/spec/requests/api/v1/accounts_spec.rb b/spec/requests/api/v1/accounts_spec.rb
index e543c4136049dc..55f8e1c6fa71b8 100644
--- a/spec/requests/api/v1/accounts_spec.rb
+++ b/spec/requests/api/v1/accounts_spec.rb
@@ -8,6 +8,22 @@
   let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
   let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
 
+  describe 'GET /api/v1/accounts?ids[]=:id' do
+    let(:account) { Fabricate(:account) }
+    let(:other_account) { Fabricate(:account) }
+    let(:scopes) { 'read:accounts' }
+
+    it 'returns expected response' do
+      get '/api/v1/accounts', headers: headers, params: { ids: [account.id, other_account.id, 123_123] }
+
+      expect(response).to have_http_status(200)
+      expect(body_as_json).to contain_exactly(
+        hash_including(id: account.id.to_s),
+        hash_including(id: other_account.id.to_s)
+      )
+    end
+  end
+
   describe 'GET /api/v1/accounts/:id' do
     context 'when logged out' do
       let(:account) { Fabricate(:account) }
diff --git a/spec/requests/api/v1/statuses_spec.rb b/spec/requests/api/v1/statuses_spec.rb
index a3b84afa261d25..0b2d1f90cfaa59 100644
--- a/spec/requests/api/v1/statuses_spec.rb
+++ b/spec/requests/api/v1/statuses_spec.rb
@@ -9,6 +9,22 @@
     let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, application: client_app, scopes: scopes) }
     let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
 
+    describe 'GET /api/v1/statuses?ids[]=:id' do
+      let(:status) { Fabricate(:status) }
+      let(:other_status) { Fabricate(:status) }
+      let(:scopes) { 'read:statuses' }
+
+      it 'returns expected response' do
+        get '/api/v1/statuses', headers: headers, params: { ids: [status.id, other_status.id, 123_123] }
+
+        expect(response).to have_http_status(200)
+        expect(body_as_json).to contain_exactly(
+          hash_including(id: status.id.to_s),
+          hash_including(id: other_status.id.to_s)
+        )
+      end
+    end
+
     describe 'GET /api/v1/statuses/:id' do
       subject do
         get "/api/v1/statuses/#{status.id}", headers: headers

From 616789454707be00b334070646491b5e028d3be6 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 6 May 2024 19:14:46 +0200
Subject: [PATCH 0960/2191] Update dependency pino-http to v10 (#30191)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 streaming/package.json |  2 +-
 yarn.lock              | 42 ++++++++++++++----------------------------
 2 files changed, 15 insertions(+), 29 deletions(-)

diff --git a/streaming/package.json b/streaming/package.json
index c4dcccf1f57acc..f08d2a4c2d1e86 100644
--- a/streaming/package.json
+++ b/streaming/package.json
@@ -25,7 +25,7 @@
     "pg": "^8.5.0",
     "pg-connection-string": "^2.6.0",
     "pino": "^9.0.0",
-    "pino-http": "^9.0.0",
+    "pino-http": "^10.0.0",
     "prom-client": "^15.0.0",
     "uuid": "^9.0.0",
     "ws": "^8.12.1"
diff --git a/yarn.lock b/yarn.lock
index acaab739aa779b..399dae2057e497 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2927,7 +2927,7 @@ __metadata:
     pg: "npm:^8.5.0"
     pg-connection-string: "npm:^2.6.0"
     pino: "npm:^9.0.0"
-    pino-http: "npm:^9.0.0"
+    pino-http: "npm:^10.0.0"
     pino-pretty: "npm:^11.0.0"
     prom-client: "npm:^15.0.0"
     typescript: "npm:^5.0.4"
@@ -12993,7 +12993,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pino-abstract-transport@npm:^1.0.0, pino-abstract-transport@npm:^1.1.0, pino-abstract-transport@npm:^1.2.0":
+"pino-abstract-transport@npm:^1.0.0, pino-abstract-transport@npm:^1.2.0":
   version: 1.2.0
   resolution: "pino-abstract-transport@npm:1.2.0"
   dependencies:
@@ -13003,15 +13003,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pino-http@npm:^9.0.0":
-  version: 9.0.0
-  resolution: "pino-http@npm:9.0.0"
+"pino-http@npm:^10.0.0":
+  version: 10.0.0
+  resolution: "pino-http@npm:10.0.0"
   dependencies:
     get-caller-file: "npm:^2.0.5"
-    pino: "npm:^8.17.1"
-    pino-std-serializers: "npm:^6.2.2"
+    pino: "npm:^9.0.0"
+    pino-std-serializers: "npm:^7.0.0"
     process-warning: "npm:^3.0.0"
-  checksum: 10c0/05496cb76cc9908658e50c4620fbdf7b0b5d99fb529493d601c3e4635b0bf7ce12b8a8eed7b5b520089f643b099233d61dd71f7cdfad8b66e59b9b81d79b6512
+  checksum: 10c0/40d2dcb2bc0c51f1ce45d3d7144c54f087fe1a122d82d0f497d65656151a1603a64f82f62d7fc6a3c172754c5a5cf6105b3096620eece31cefbc8cf95b26c062
   languageName: node
   linkType: hard
 
@@ -13039,31 +13039,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pino-std-serializers@npm:^6.0.0, pino-std-serializers@npm:^6.2.2":
+"pino-std-serializers@npm:^6.0.0":
   version: 6.2.2
   resolution: "pino-std-serializers@npm:6.2.2"
   checksum: 10c0/8f1c7f0f0d8f91e6c6b5b2a6bfb48f06441abeb85f1c2288319f736f9c6d814fbeebe928d2314efc2ba6018fa7db9357a105eca9fc99fc1f28945a8a8b28d3d5
   languageName: node
   linkType: hard
 
-"pino@npm:^8.17.1":
-  version: 8.20.0
-  resolution: "pino@npm:8.20.0"
-  dependencies:
-    atomic-sleep: "npm:^1.0.0"
-    fast-redact: "npm:^3.1.1"
-    on-exit-leak-free: "npm:^2.1.0"
-    pino-abstract-transport: "npm:^1.1.0"
-    pino-std-serializers: "npm:^6.0.0"
-    process-warning: "npm:^3.0.0"
-    quick-format-unescaped: "npm:^4.0.3"
-    real-require: "npm:^0.2.0"
-    safe-stable-stringify: "npm:^2.3.1"
-    sonic-boom: "npm:^3.7.0"
-    thread-stream: "npm:^2.0.0"
-  bin:
-    pino: bin.js
-  checksum: 10c0/6b973474160e1fa01fa150de0f69b7db9c6c06ae15f992d369669751825c8f2af3bb5600348eaf9be65b4952326bbdfa226f51e425820eb511f0f594fbddbaa7
+"pino-std-serializers@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "pino-std-serializers@npm:7.0.0"
+  checksum: 10c0/73e694d542e8de94445a03a98396cf383306de41fd75ecc07085d57ed7a57896198508a0dec6eefad8d701044af21eb27253ccc352586a03cf0d4a0bd25b4133
   languageName: node
   linkType: hard
 
@@ -16787,7 +16773,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"thread-stream@npm:^2.0.0, thread-stream@npm:^2.6.0":
+"thread-stream@npm:^2.6.0":
   version: 2.6.0
   resolution: "thread-stream@npm:2.6.0"
   dependencies:

From 996292cd55e661f3390792b60b130150b1f4ff40 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 7 May 2024 10:41:53 +0200
Subject: [PATCH 0961/2191] Fix `db:encryption:init` requiring ActiveRecord
 encryption variables to be set (#30202)

---
 lib/tasks/db.rake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/tasks/db.rake b/lib/tasks/db.rake
index 07de087766d8eb..d6377c9c82c347 100644
--- a/lib/tasks/db.rake
+++ b/lib/tasks/db.rake
@@ -6,7 +6,7 @@ Rake::Task['db:encryption:init'].clear
 namespace :db do
   namespace :encryption do
     desc 'Generate a set of keys for configuring Active Record encryption in a given environment'
-    task init: :environment do
+    task :init do # rubocop:disable Rails/RakeEnvironment
       puts <<~MSG
         Add these environment variables to your Mastodon environment:#{' '}
 

From 96fb6e491ffa526e800b5c3d1835022a90930c88 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 7 May 2024 10:46:05 +0200
Subject: [PATCH 0962/2191] Revert "Migrate paperclip `_file_size` columns to
 bigint (#29263)" (#30203)

---
 .../instance_media_attachments_measure.rb     |  2 +-
 ...51_convert_file_size_columns_to_big_int.rb | 42 -------------------
 db/schema.rb                                  | 16 +++----
 3 files changed, 9 insertions(+), 51 deletions(-)
 delete mode 100644 db/migrate/20240217175251_convert_file_size_columns_to_big_int.rb

diff --git a/app/lib/admin/metrics/measure/instance_media_attachments_measure.rb b/app/lib/admin/metrics/measure/instance_media_attachments_measure.rb
index 65f444624e493b..1d2dbbe4146a86 100644
--- a/app/lib/admin/metrics/measure/instance_media_attachments_measure.rb
+++ b/app/lib/admin/metrics/measure/instance_media_attachments_measure.rb
@@ -50,7 +50,7 @@ def sql_query_string
           WHERE date_trunc('day', media_attachments.created_at)::date = axis.period
             AND #{account_domain_sql(params[:include_subdomains])}
         )
-        SELECT COALESCE(SUM(size), 0)::bigint FROM new_media_attachments
+        SELECT COALESCE(SUM(size), 0) FROM new_media_attachments
       ) AS value
       FROM (
         SELECT generate_series(date_trunc('day', :start_at::timestamp)::date, date_trunc('day', :end_at::timestamp)::date, interval '1 day') AS period
diff --git a/db/migrate/20240217175251_convert_file_size_columns_to_big_int.rb b/db/migrate/20240217175251_convert_file_size_columns_to_big_int.rb
deleted file mode 100644
index f8223f9c9321d0..00000000000000
--- a/db/migrate/20240217175251_convert_file_size_columns_to_big_int.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-# frozen_string_literal: true
-
-require_relative '../../lib/mastodon/migration_helpers'
-
-class ConvertFileSizeColumnsToBigInt < ActiveRecord::Migration[7.1]
-  include Mastodon::MigrationHelpers
-
-  TABLE_COLUMN_MAPPING = [
-    [:accounts, :avatar_file_size],
-    [:accounts, :header_file_size],
-    [:custom_emojis, :image_file_size],
-    [:imports, :data_file_size],
-    [:media_attachments, :file_file_size],
-    [:media_attachments, :thumbnail_file_size],
-    [:preview_cards, :image_file_size],
-    [:site_uploads, :file_file_size],
-  ].freeze
-
-  disable_ddl_transaction!
-
-  def migrate_columns(to_type)
-    TABLE_COLUMN_MAPPING.each do |column_parts|
-      table, column = column_parts
-
-      # Skip this if we're resuming and already did this one.
-      next if column_for(table, column).sql_type == to_type.to_s
-
-      safety_assured do
-        change_column_type_concurrently table, column, to_type
-        cleanup_concurrent_column_type_change table, column
-      end
-    end
-  end
-
-  def up
-    migrate_columns(:bigint)
-  end
-
-  def down
-    migrate_columns(:integer)
-  end
-end
diff --git a/db/schema.rb b/db/schema.rb
index ee41a0c3a15e74..11f1a202f79e95 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -166,11 +166,11 @@
     t.string "url"
     t.string "avatar_file_name"
     t.string "avatar_content_type"
-    t.bigint "avatar_file_size"
+    t.integer "avatar_file_size"
     t.datetime "avatar_updated_at", precision: nil
     t.string "header_file_name"
     t.string "header_content_type"
-    t.bigint "header_file_size"
+    t.integer "header_file_size"
     t.datetime "header_updated_at", precision: nil
     t.string "avatar_remote_url"
     t.boolean "locked", default: false, null: false
@@ -368,7 +368,7 @@
     t.string "domain"
     t.string "image_file_name"
     t.string "image_content_type"
-    t.bigint "image_file_size"
+    t.integer "image_file_size"
     t.datetime "image_updated_at", precision: nil
     t.datetime "created_at", precision: nil, null: false
     t.datetime "updated_at", precision: nil, null: false
@@ -558,7 +558,7 @@
     t.datetime "updated_at", precision: nil, null: false
     t.string "data_file_name"
     t.string "data_content_type"
-    t.bigint "data_file_size"
+    t.integer "data_file_size"
     t.datetime "data_updated_at", precision: nil
     t.bigint "account_id", null: false
     t.boolean "overwrite", default: false, null: false
@@ -635,7 +635,7 @@
     t.bigint "status_id"
     t.string "file_file_name"
     t.string "file_content_type"
-    t.bigint "file_file_size"
+    t.integer "file_file_size"
     t.datetime "file_updated_at", precision: nil
     t.string "remote_url", default: "", null: false
     t.datetime "created_at", precision: nil, null: false
@@ -651,7 +651,7 @@
     t.integer "file_storage_schema_version"
     t.string "thumbnail_file_name"
     t.string "thumbnail_content_type"
-    t.bigint "thumbnail_file_size"
+    t.integer "thumbnail_file_size"
     t.datetime "thumbnail_updated_at", precision: nil
     t.string "thumbnail_remote_url"
     t.index ["account_id", "status_id"], name: "index_media_attachments_on_account_id_and_status_id", order: { status_id: :desc }
@@ -855,7 +855,7 @@
     t.string "description", default: "", null: false
     t.string "image_file_name"
     t.string "image_content_type"
-    t.bigint "image_file_size"
+    t.integer "image_file_size"
     t.datetime "image_updated_at", precision: nil
     t.integer "type", default: 0, null: false
     t.text "html", default: "", null: false
@@ -993,7 +993,7 @@
     t.string "var", default: "", null: false
     t.string "file_file_name"
     t.string "file_content_type"
-    t.bigint "file_file_size"
+    t.integer "file_file_size"
     t.datetime "file_updated_at", precision: nil
     t.json "meta"
     t.datetime "created_at", precision: nil, null: false

From ed556db3953d7585cc78a92597f1e3dca9cc2b53 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 7 May 2024 11:36:16 +0200
Subject: [PATCH 0963/2191] New Crowdin Translations (automated) (#30201)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/ca.json |   3 +-
 app/javascript/mastodon/locales/fi.json |   4 +-
 app/javascript/mastodon/locales/lt.json |   3 +-
 app/javascript/mastodon/locales/uk.json |  31 +++++
 config/locales/devise.ia.yml            |   2 +
 config/locales/doorkeeper.lt.yml        |   8 +-
 config/locales/ia.yml                   | 171 ++++++++++++++++++++++++
 config/locales/lt.yml                   |  78 ++++++++---
 config/locales/simple_form.ca.yml       |   2 +
 config/locales/simple_form.da.yml       |   2 +
 config/locales/simple_form.de.yml       |   2 +
 config/locales/simple_form.en-GB.yml    |   3 -
 config/locales/simple_form.es-AR.yml    |   2 +
 config/locales/simple_form.eu.yml       |   2 +
 config/locales/simple_form.fi.yml       |   2 +
 config/locales/simple_form.fo.yml       |   2 +
 config/locales/simple_form.gl.yml       |   2 +
 config/locales/simple_form.he.yml       |   2 +
 config/locales/simple_form.hu.yml       |   2 +
 config/locales/simple_form.is.yml       |   2 +
 config/locales/simple_form.lt.yml       |  25 +++-
 config/locales/simple_form.nl.yml       |   2 +
 config/locales/simple_form.nn.yml       |   1 +
 config/locales/simple_form.pl.yml       |   2 +
 config/locales/simple_form.pt-PT.yml    |   2 +
 config/locales/simple_form.sr-Latn.yml  |   2 +
 config/locales/simple_form.sr.yml       |   2 +
 config/locales/simple_form.th.yml       |   3 +
 config/locales/simple_form.tr.yml       |   2 +
 config/locales/simple_form.vi.yml       |   2 +
 config/locales/simple_form.zh-CN.yml    |   2 +
 config/locales/simple_form.zh-TW.yml    |   2 +
 32 files changed, 338 insertions(+), 34 deletions(-)

diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index 25aeea9b465b4e..ea67d217dad94e 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -318,7 +318,7 @@
   "follow_suggestions.personalized_suggestion": "Suggeriment personalitzat",
   "follow_suggestions.popular_suggestion": "Suggeriment popular",
   "follow_suggestions.popular_suggestion_longer": "Popular a {domain}",
-  "follow_suggestions.similar_to_recently_followed_longer": "Semblant a perfils que seguiu fa poc",
+  "follow_suggestions.similar_to_recently_followed_longer": "Semblant a perfils que seguiu de fa poc",
   "follow_suggestions.view_all": "Mostra-ho tot",
   "follow_suggestions.who_to_follow": "A qui seguir",
   "followed_tags": "Etiquetes seguides",
@@ -473,6 +473,7 @@
   "notification.follow": "{name} et segueix",
   "notification.follow_request": "{name} ha sol·licitat de seguir-te",
   "notification.mention": "{name} t'ha esmentat",
+  "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.",
   "notification.moderation_warning.action_disable": "S'ha desactivat el vostre compte.",
diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index 5a5031fd14ae49..bae714b1d2fe5c 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -298,7 +298,7 @@
   "filter_modal.select_filter.title": "Suodata tämä julkaisu",
   "filter_modal.title.status": "Suodata julkaisu",
   "filtered_notifications_banner.mentions": "{count, plural, one {maininta} other {mainintaa}}",
-  "filtered_notifications_banner.pending_requests": "Sinulle on ilmoituksia mahdollisesti tuntemiltasi henkilöiltä seuraavasti: {count, plural, =0 {Ei keltään} one {Yhdeltä henkilöltä} other {# henkilöltä}}",
+  "filtered_notifications_banner.pending_requests": "Ilmoituksia {count, plural, =0 {ei ole} one {1 henkilöltä} other {# henkilöltä}}, jonka saatat tuntea",
   "filtered_notifications_banner.title": "Suodatetut ilmoitukset",
   "firehose.all": "Kaikki",
   "firehose.local": "Tämä palvelin",
@@ -308,7 +308,7 @@
   "follow_requests.unlocked_explanation": "Vaikkei tiliäsi ole lukittu, palvelimen {domain} ylläpito on arvioinut, että saatat olla halukas tarkistamaan nämä seuraamispyynnöt erikseen.",
   "follow_suggestions.curated_suggestion": "Ehdotus ylläpidolta",
   "follow_suggestions.dismiss": "Älä näytä uudelleen",
-  "follow_suggestions.featured_longer": "Käsin valinnut palvelimen {domain} tiimi",
+  "follow_suggestions.featured_longer": "Valinnut käsin palvelimen {domain} tiimi",
   "follow_suggestions.friends_of_friends_longer": "Suosittu seuraamiesi ihmisten keskuudessa",
   "follow_suggestions.hints.featured": "Tämän profiilin on valinnut palvelimen {domain} tiimi.",
   "follow_suggestions.hints.friends_of_friends": "Seuraamasi käyttäjät suosivat tätä profiilia.",
diff --git a/app/javascript/mastodon/locales/lt.json b/app/javascript/mastodon/locales/lt.json
index 546b9b75521b8e..083a922012b46f 100644
--- a/app/javascript/mastodon/locales/lt.json
+++ b/app/javascript/mastodon/locales/lt.json
@@ -143,7 +143,7 @@
   "compose.published.open": "Atidaryti",
   "compose.saved.body": "Įrašas išsaugotas.",
   "compose_form.direct_message_warning_learn_more": "Sužinoti daugiau",
-  "compose_form.encryption_warning": "Mastodon įrašai nėra šifruojami nuo galo iki galo. Per Mastodon nesidalyk jokia slapta informacija.",
+  "compose_form.encryption_warning": "Mastodon įrašai nėra visapusiškai šifruojami. Per Mastodon nesidalyk jokia slapta informacija.",
   "compose_form.hashtag_warning": "Šis įrašas nebus įtraukta į jokį saitažodį, nes ji nėra vieša. Tik viešų įrašų galima ieškoti pagal saitažodį.",
   "compose_form.lock_disclaimer": "Tavo paskyra nėra {locked}. Bet kas gali sekti tave ir peržiūrėti tik sekėjams skirtus įrašus.",
   "compose_form.lock_disclaimer.lock": "užrakinta",
@@ -415,6 +415,7 @@
   "loading_indicator.label": "Kraunama…",
   "media_gallery.toggle_visible": "{number, plural, one {Slėpti vaizdą} few {Slėpti vaizdus} many {Slėpti vaizdo} other {Slėpti vaizdų}}",
   "moved_to_account_banner.text": "Tavo paskyra {disabledAccount} šiuo metu išjungta, nes persikėlei į {movedToAccount}.",
+  "mute_modal.show_options": "Rodyti parinktis",
   "navigation_bar.about": "Apie",
   "navigation_bar.advanced_interface": "Atidaryti išplėstinę žiniatinklio sąsają",
   "navigation_bar.blocks": "Užblokuoti naudotojai",
diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json
index 6ae4e162b33432..3a7f63206d37e7 100644
--- a/app/javascript/mastodon/locales/uk.json
+++ b/app/javascript/mastodon/locales/uk.json
@@ -217,8 +217,19 @@
   "domain_block_modal.title": "Заблокувати домен?",
   "domain_block_modal.you_will_lose_followers": "Усіх ваших підписників з цього сервера буде вилучено.",
   "domain_block_modal.you_wont_see_posts": "Ви не бачитимете дописів і сповіщень від користувачів на цьому сервері.",
+  "domain_pill.activitypub_lets_connect": "Це дозволяє вам спілкуватися та взаємодіяти з людьми не лише на Mastodon, але й у різних соціальних додатках.",
+  "domain_pill.activitypub_like_language": "ActivityPub - це як мова, якою Мастодонт розмовляє з іншими соціальними мережами.",
   "domain_pill.server": "Сервер",
+  "domain_pill.their_handle": "Їхня адреса:",
+  "domain_pill.their_server": "Їхній цифровий дім, де живуть усі їхні пости.",
+  "domain_pill.their_username": "Їхній унікальний ідентифікатор на їхньому сервері. Ви можете знайти користувачів з однаковими іменами на різних серверах.",
   "domain_pill.username": "Ім'я користувача",
+  "domain_pill.whats_in_a_handle": "Що є в адресі?",
+  "domain_pill.who_they_are": "Оскільки дескриптори вказують, хто це і де він знаходиться, ви можете взаємодіяти з людьми через соціальну мережу платформ на основі <button>ActivityPub</button>.",
+  "domain_pill.who_you_are": "Оскільки ваш нікнейм вказує, хто ви та де ви, люди можуть взаємодіяти з вами через соціальну мережу платформ на основі <button>ActivityPub</button>.",
+  "domain_pill.your_handle": "Ваша адреса:",
+  "domain_pill.your_server": "Ваш цифровий дім, де живуть усі ваші публікації. Не подобається цей? Перенесіть сервери в будь-який час і залучайте своїх підписників.",
+  "domain_pill.your_username": "Ваш унікальний ідентифікатор на цьому сервері. Ви можете знайти користувачів з однаковими іменами на різних серверах.",
   "embed.instructions": "Вбудуйте цей допис до вашого вебсайту, скопіювавши код нижче.",
   "embed.preview": "Ось який вигляд це матиме:",
   "emoji_button.activity": "Діяльність",
@@ -286,6 +297,7 @@
   "filter_modal.select_filter.subtitle": "Використати наявну категорію або створити нову",
   "filter_modal.select_filter.title": "Фільтрувати цей допис",
   "filter_modal.title.status": "Фільтрувати допис",
+  "filtered_notifications_banner.mentions": "{count, plural, one {mention} other {mentions}}",
   "filtered_notifications_banner.pending_requests": "Сповіщення від {count, plural, =0 {жодної особи} one {однієї особи} few {# осіб} many {# осіб} other {# особи}}, котрих ви можете знати",
   "filtered_notifications_banner.title": "Відфільтровані сповіщення",
   "firehose.all": "Всі",
@@ -296,6 +308,8 @@
   "follow_requests.unlocked_explanation": "Хоча ваш обліковий запис не заблоковано, персонал {domain} припускає, що, можливо, ви хотіли б переглянути ці запити на підписку.",
   "follow_suggestions.curated_suggestion": "Відібрано командою",
   "follow_suggestions.dismiss": "Більше не показувати",
+  "follow_suggestions.featured_longer": "Вибрано командою {domain} вручну",
+  "follow_suggestions.friends_of_friends_longer": "Популярні серед людей, за якими ви слідкуєте",
   "follow_suggestions.hints.featured": "Цей профіль був обраний командою {domain}.",
   "follow_suggestions.hints.friends_of_friends": "Цей профіль популярний серед тих людей, на яких ви підписані.",
   "follow_suggestions.hints.most_followed": "За цим профілем один з найпопулярніших на {domain}.",
@@ -303,6 +317,8 @@
   "follow_suggestions.hints.similar_to_recently_followed": "Цей профіль схожий на профілі, за якими ви стежили останнім часом.",
   "follow_suggestions.personalized_suggestion": "Персоналізована пропозиція",
   "follow_suggestions.popular_suggestion": "Популярна пропозиція",
+  "follow_suggestions.popular_suggestion_longer": "Популярно на {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Схожі на профілі, за якими ви нещодавно стежили",
   "follow_suggestions.view_all": "Переглянути все",
   "follow_suggestions.who_to_follow": "На кого підписатися",
   "followed_tags": "Відстежувані хештеґи",
@@ -457,12 +473,23 @@
   "notification.follow": "{name} підписалися на вас",
   "notification.follow_request": "{name} відправили запит на підписку",
   "notification.mention": "{name} згадали вас",
+  "notification.moderation-warning.learn_more": "Дізнатися більше",
+  "notification.moderation_warning": "Ви отримали попередження модерації",
+  "notification.moderation_warning.action_delete_statuses": "Деякі з ваших дописів було видалено.",
+  "notification.moderation_warning.action_disable": "Ваш обліковий запис було вимкнено.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Деякі з ваших дописів були позначені як чутливі.",
+  "notification.moderation_warning.action_none": "Ваш обліковий запис отримав попередження модерації.",
+  "notification.moderation_warning.action_sensitive": "Відтепер ваші дописи будуть позначені як чутливі.",
+  "notification.moderation_warning.action_silence": "Ваш обліковий запис було обмежено.",
+  "notification.moderation_warning.action_suspend": "Ваш обліковий запис було заблоковано.",
   "notification.own_poll": "Ваше опитування завершилося",
   "notification.poll": "Опитування, у якому ви голосували, скінчилося",
   "notification.reblog": "{name} поширює ваш допис",
   "notification.relationships_severance_event": "Втрачено з'єднання з {name}",
   "notification.relationships_severance_event.account_suspension": "Адміністратор з {from} призупинив {target}, що означає, що ви більше не можете отримувати оновлення від них або взаємодіяти з ними.",
+  "notification.relationships_severance_event.domain_block": "Адміністратор з {from} заблокував {target}, включаючи {followersCount} ваших підписників і {{followingCount, plural, one {# account} other {# accounts}}, на які ви підписані.",
   "notification.relationships_severance_event.learn_more": "Дізнатися більше",
+  "notification.relationships_severance_event.user_domain_block": "Ви заблокували {target}, видаливши {followersCount} ваших підписників і {followingCount, plural, one {# account} other {# accounts}}, за якими ви стежите.",
   "notification.status": "{name} щойно дописує",
   "notification.update": "{name} змінює допис",
   "notification_requests.accept": "Прийняти",
@@ -504,9 +531,13 @@
   "notifications.permission_required": "Сповіщення на стільниці не доступні, оскільки необхідний дозвіл не надано.",
   "notifications.policy.filter_new_accounts.hint": "Створено впродовж {days, plural, one {одного} few {# днів} many {# днів} other {# дня}}",
   "notifications.policy.filter_new_accounts_title": "Нові облікові записи",
+  "notifications.policy.filter_not_followers_hint": "Включаючи людей, які стежать за вами менше {days, plural, one {one day} other {# days}}",
   "notifications.policy.filter_not_followers_title": "Люди не підписані на вас",
   "notifications.policy.filter_not_following_hint": "Доки ви не схвалюєте їх вручну",
   "notifications.policy.filter_not_following_title": "Люди, на яких ви не підписані",
+  "notifications.policy.filter_private_mentions_hint": "Відфільтровується, якщо це не відповідь на вашу власну згадку або якщо ви відстежуєте відправника",
+  "notifications.policy.filter_private_mentions_title": "Небажані приватні згадки",
+  "notifications.policy.title": "Відфільтрувати сповіщення від…",
   "notifications_permission_banner.enable": "Увімкнути сповіщення стільниці",
   "notifications_permission_banner.how_to_control": "Щоб отримувати сповіщення, коли Mastodon не відкрито, увімкніть сповіщення стільниці. Ви можете контролювати, які типи взаємодій створюють сповіщення через кнопку {icon} вгорі після їхнього увімкнення.",
   "notifications_permission_banner.title": "Не проґавте нічого",
diff --git a/config/locales/devise.ia.yml b/config/locales/devise.ia.yml
index 56875078188301..b365668210fb0c 100644
--- a/config/locales/devise.ia.yml
+++ b/config/locales/devise.ia.yml
@@ -21,6 +21,7 @@ ia:
       confirmation_instructions:
         action: Verificar adresse de e-mail
         action_with_app: Confirmar e retornar a %{app}
+        subject: 'Mastodon: Instructiones de confirmation pro %{instance}'
         title: Verificar adresse de e-mail
       email_changed:
         explanation: 'Le adresse de e-mail pro tu conto essera cambiate a:'
@@ -32,6 +33,7 @@ ia:
         title: Contrasigno cambiate
       reconfirmation_instructions:
         explanation: Confirma le nove adresse pro cambiar tu email.
+        subject: 'Mastodon: Confirmar e-mail pro %{instance}'
         title: Verificar adresse de e-mail
       reset_password_instructions:
         action: Cambiar contrasigno
diff --git a/config/locales/doorkeeper.lt.yml b/config/locales/doorkeeper.lt.yml
index 847f41e816b8a7..5be291bf89e604 100644
--- a/config/locales/doorkeeper.lt.yml
+++ b/config/locales/doorkeeper.lt.yml
@@ -64,7 +64,7 @@ lt:
         review_permissions: Peržiūrėti leidimus
         title: Reikalingas leidimas
       show:
-        title: Nukopijuok šį įgaliojimo kodą ir įklijuok jį į programėlę.
+        title: Nukopijuok šį tapatybės patvirtinimo kodą ir įklijuok jį į programėlę.
     authorized_applications:
       buttons:
         revoke: Naikinti
@@ -126,7 +126,7 @@ lt:
         blocks: Blokavimai
         bookmarks: Žymės
         conversations: Pokalbiai
-        crypto: Galo iki galo užšifravimas
+        crypto: Visapusis šifravimas
         favourites: Mėgstami
         filters: Filtrai
         follow: Sekimai, nutildymai ir blokavimai
@@ -163,8 +163,8 @@ lt:
       admin:write:email_domain_blocks: atlikti prižiūrėjimo veiksmus su el. laiško domenų blokavimais
       admin:write:ip_blocks: atlikti prižiūrėjimo veiksmus su IP blokavimais
       admin:write:reports: atlikti paskyrų prižiūrėjimo veiksmus atsakaitams
-      crypto: naudoti galo iki galo šifravimą
-      follow: modifikuoti paskyros santykius
+      crypto: naudoti visapusį šifravimą
+      follow: modifikuoti paskyros sąryšius
       push: gauti tavo stumiamuosius pranešimus
       read: skaityti tavo visus paskyros duomenis
       read:accounts: matyti paskyrų informaciją
diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index 85d7c0ed859592..193f2b0d5972b2 100644
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -740,9 +740,18 @@ ia:
         title: Require que nove usatores solve un CAPTCHA pro confirmar lor conto
       content_retention:
         danger_zone: Zona periculose
+        preamble: Controlar como contento generate per le usator es immagazinate in Mastodon.
+        title: Retention de contento
+      default_noindex:
+        desc_html: Affice tote le usatores qui non ha cambiate iste parametro per se mesme
+        title: Refusar de ordinario le indexation del usatores per le motores de recerca
       discovery:
+        follow_recommendations: Sequer le recommendationes
+        preamble: Presentar contento interessante es instrumental in introducer nove usatores qui pote non cognoscer alcuno de Mastodon.
         profile_directory: Directorio de profilos
         public_timelines: Chronologias public
+        publish_discovered_servers: Publicar servitores discoperite
+        publish_statistics: Publicar statistica
         title: Discoperi
         trends: Tendentias
       domain_blocks:
@@ -750,18 +759,27 @@ ia:
         disabled: A necuno
         users: A usators local in session
       registrations:
+        moderation_recommandation: Per favor verifica que tu ha un adequate e reactive equipa de moderation ante que tu aperi registrationes a quicunque!
+        preamble: Controla qui pote crear un conto sur tu servitor.
         title: Registrationes
       registrations_mode:
         modes:
+          approved: Approbation necessari pro le inscription
           none: Nemo pote inscriber se
           open: Quicunque pote inscriber se
+        warning_hint: Nos consilia usar “Approbation necessari pro le inscription” si tu non crede que tu equipa de moderation pote tractar spam e registrationes maligne in un modo opportun.
       security:
+        authorized_fetch: Require authentication ab servitores federate
         authorized_fetch_hint: Requirer authentication de servitores federate permitte un application plus stricte de blocadas a nivello de usator e de servitor. Nonobstante, isto diminue le prestationes del servitor, reduce le portata de tu responsas e pote introducer problemas de compatibilitate con certe servicios federate. In plus, isto non impedira le actores dedicate a recuperar tu messages public e tu contos.
+        authorized_fetch_overridden_hint: Tu actualmente non pote cambiar iste parametros perque il es superate per un variabile de ambiente.
+        federation_authentication: Application del authentication de federation
       title: Parametros de servitor
     site_uploads:
       delete: Deler file incargate
       destroyed_msg: Incarga de sito delite con successo!
     software_updates:
+      critical_update: Critic! Actualisa tosto
+      description: Il es recommendate de mantener actualisate tu installation de Mastodon pro beneficiar del ultime reparationes e functiones. In ultra, il es aliquando critic actualisar Mastodon in maniera opportun pro evitar problemas de securitate. Pro iste rationes, Mastodon controla pro actualisationes cata 30 minutas, e te notificara secundo tu preferentias de notificationes per email.
       documentation_link: Pro saper plus
       release_notes: Notas de version
       title: Actualisationes disponibile
@@ -769,11 +787,15 @@ ia:
       types:
         major: Version major
         minor: Version minor
+        patch: 'Version de pecias: remedios de bugs e cambiamentos facile a applicar'
       version: Version
     statuses:
       account: Autor
       application: Application
+      back_to_account: Retro al pagina de conto
+      back_to_report: Retro al pagina de reporto
       batch:
+        remove_from_report: Remover ab reporto
         report: Reporto
       deleted: Delite
       favourites: Favoritos
@@ -783,8 +805,10 @@ ia:
       media:
         title: Medios
       metadata: Metadatos
+      no_status_selected: Nulle messages era cambiate perque necun era seligite
       open: Aperir message
       original_status: Message original
+      reblogs: Promotiones
       status_changed: Messages cambiate
       title: Messages del conto
       trending: Tendentias
@@ -803,35 +827,127 @@ ia:
       appeal_pending: Appello pendente
       appeal_rejected: Appello rejectate
     system_checks:
+      database_schema_check:
+        message_html: Il ha migrationes de base de datos pendente. Per favor exeque los pro assecurar que le application se comporta como expectate
+      elasticsearch_health_red:
+        message_html: Le aggregation Elasticsearch es malsan (stato rubie), le functiones de recerca es indisponibile
+      elasticsearch_health_yellow:
+        message_html: Le aggregation Elasticsearch es malsan (stato jalne), tu poterea voler investigar le ration
+      elasticsearch_index_mismatch:
+        message_html: Le mappas de indice Elasticsearch es obsolete. Per favor exeque <code>tootctl search deploy --only=%{value}</code>
       elasticsearch_preset:
         action: Vide documentation
+        message_html: Tu aggregation Elasticsearch ha plus que un nodo, ma Mastodon non es configurate a usar los.
       elasticsearch_preset_single_node:
         action: Vide documentation
+        message_html: Tu aggregation Elasticsearch ha un sol nodo, <code>ES_PRESET</code> deberea esser predefinite a <code>single_node_cluster</code>.
+      elasticsearch_reset_chewy:
+        message_html: Le indexation de tu systema Elasticsearch es obsolete per un cambio de configuration. Per cfavor exeque <code>tootctl search deploy --reset-chewy</code> pro actualisar lo.
+      elasticsearch_running_check:
+        message_html: Impossibile connecter se a Elasticsearch. Verifica que illo flue, o disactiva le recerca a plen texto
+      elasticsearch_version_check:
+        message_html: 'Version de Elasticsearch incompatibile: %{value}'
+        version_comparison: Elasticsearch %{running_version} es currente dum %{required_version} es necesse
       rules_check:
         action: Gerer le regulas del servitor
+        message_html: Tu non ha definite ulle regulas de servitor.
+      sidekiq_process_check:
+        message_html: Nulle processo Sidekiq currente pro le %{value} cauda(s). Controla tu configuration de Sidekiq
       software_version_critical_check:
         action: Vider le actualisationes disponibile
         message_html: Un actualisation critic de Mastodon es disponibile, actualisa lo le plus rapide possibile.
       software_version_patch_check:
         action: Vider le actualisationes disponibile
+        message_html: Un actualisation de remedio de bug pro Mastodon es disponibile.
       upload_check_privacy_error:
         action: Verifica hic pro plus de information
+        message_html: "<strong>Tu servitor de web es mal-configurate. Le confidentialitate de tu usatores es a risco.</strong>"
       upload_check_privacy_error_object_storage:
         action: Verifica hic pro plus de information
+        message_html: "<strong>Tu immagazinage de objectos es mal-configurate. Le confidentialitate de tu usatores es a risco.</strong>"
+    tags:
+      review: Revide le stato
+      updated_msg: Parametros de hashtag actualisate con successo
+    title: Administration
     trends:
+      allow: Permitter
       approved: Approbate
+      disallow: Impedir
+      links:
+        allow: Permitter ligamine
+        allow_provider: Permitter editor
+        description_html: Istos es ligamines que es actualmente multo compartite per contos de que tu servitor vide messages. Illo pote adjutar tu usatores a discoperir lo que eveni in le mundo. Nulle ligamines es monstrate publicamente usque tu non approba le editor. Tu alsi pote permitter o rejectar ligamines singule.
+        disallow: Impedir ligamine
+        disallow_provider: Impedir editor
+        no_link_selected: Nulle ligamine era cambiate perque nulle era seligite
+        publishers:
+          no_publisher_selected: Nulle editores era cambiate perque nemo era seligite
+        shared_by_over_week:
+          one: Compartite per un persona le septimana passate
+          other: Compartite per %{count} personas le septimana passate
+        title: Ligamines de tendentia
+      not_allowed_to_trend: Non permittite haber tendentia
+      only_allowed: Solo permittite
+      pending_review: Attende revision
+      preview_card_providers:
+        allowed: Ligamines ab iste editor pote haber tendentia
+        description_html: Il ha dominios ab que ligamines es sovente compartite sur tu servitor. Ligamines non habera publicamente tendentia salvo que le dominio del ligamine es approbate. Tu approbation (o rejection) se extende al sub-dominios.
+        rejected: Ligamines ab iste editor non habera tendentia
+        title: Editores
       rejected: Rejectate
+      statuses:
+        allow: Permitter message
+        allow_account: Permitter autor
+        description_html: Istos es messages que tu servitor cognosce perque illos es al momento multo compartite e favorite. Isto pote adjutar tu nove e renovate usatores a trovar altere personas a sequer. Nulle messages es monstrate publicamente usque tu approba le autor, e le autor permitte que su conto es suggerite a alteres. Tu alsi pote permitter o rejectar messages singule.
+        disallow: Impedir message
+        disallow_account: Impedir autor
+        no_status_selected: Nulle messages era cambiate perque nulle era seligite
+        not_discoverable: Le autor non ha optate pro esser detectabile
+        shared_by:
+          one: Compartite e favorite un tempore
+          other: Compartite e favorite %{friendly_count} tempores
+        title: Messages de tendentia
       tags:
+        current_score: Punctuage actual %{score}
+        dashboard:
+          tag_accounts_measure: usos unic
+          tag_languages_dimension: Linguas principal
+          tag_servers_dimension: Servitores principal
+          tag_servers_measure: servitores differente
+          tag_uses_measure: usos total
+        listable: Pote esser suggerite
+        no_tag_selected: Nulle placas era cambiate perque nulle era seligite
+        not_listable: Non sera suggerite
+        not_trendable: Non apparera sub tendentias
         not_usable: Non pote esser usate
+        peaked_on_and_decaying: Habeva un picco %{date}, ora decade
+        title: Hashtags de tendentia
+        trendable: Pote apparer sub tendentias
+        trending_rank: 'De tendentia #%{rank}'
+        usable: Pote esser usate
+        usage_comparison: Usate %{today} vices hodie, al contrario del %{yesterday} de heri
+        used_by_over_week:
+          one: Usate per un persona le ultime septimana
+          other: Usate per %{count} personas le ultime septimana
       title: Tendentias
+      trending: Tendentias
     warning_presets:
       add_new: Adder nove
       delete: Deler
+      edit_preset: Rediger aviso predefinite
+      empty: Tu non ha ancora definite alcun avisos predefinite.
+      title: Gerer avisos predefinite
     webhooks:
+      add_new: Adder terminal
       delete: Deler
       disable: Disactivar
       disabled: Disactivate
+      edit: Rediger terminal
       enable: Activar
+      enabled: Active
+      enabled_events:
+        one: 1 evento activate
+        other: "%{count} eventos activate"
       events: Eventos
       status: Stato
   admin_mailer:
@@ -839,11 +955,19 @@ ia:
       subject: Actualisationes critic de Mastodon es disponibile pro %{instance}!
     new_software_updates:
       subject: Nove versiones de Mastodon es disponibile pro %{instance}!
+  aliases:
+    add_new: Crear alias
   appearance:
     advanced_web_interface: Interfacie web avantiate
+    confirmation_dialogs: Dialogos de confirmation
+    discovery: Discoperta
+    localization:
+      guide_link: https://crowdin.com/project/mastodon
+      guide_link_text: Totes pote contribuer.
     sensitive_content: Contento sensibile
   application_mailer:
     notification_preferences: Cambiar preferentias de e-mail
+    salutation: "%{name},"
     settings: 'Cambiar preferentias de e-mail: %{link}'
     unsubscribe: Desubscriber
     view: 'Vider:'
@@ -853,25 +977,65 @@ ia:
     created: Application create con successo
     destroyed: Application delite con successo
     logout: Clauder le session
+    regenerate_token: Regenerar testimonio de accesso
+    token_regenerated: Testimonio de accesso regenerate con successo
+    warning: Sia multo attente con iste datos. Jammais compartir los con quicunque!
+    your_token: Tu testimonio de accesso
   auth:
+    apply_for_account: Peter un conto
+    captcha_confirmation:
+      hint_html: Justo un altere cosa! Nos debe confirmar que tu es un human (isto es assi proque nos pote mantener foras le spam!). Solve le CAPTCHA infra e clicca "Continuar".
+      title: Controlo de securitate
     confirmations:
+      awaiting_review_title: Tu registration es revidite
+      clicking_this_link: cliccante iste ligamine
+      login_link: acceder
+      proceed_to_login_html: Ora tu pote continuar a %{login_link}.
       welcome_title: Benvenite, %{name}!
     delete_account: Deler le conto
+    description:
+      prefix_sign_up: Inscribe te sur Mastodon hodie!
+    didnt_get_confirmation: Non recipeva tu un ligamine de confirmation?
+    dont_have_your_security_key: Non ha tu le clave de securitate?
+    forgot_password: Contrasigno oblidate?
+    invalid_reset_password_token: Pete un nove.
+    link_to_webauth: Usa tu apparato clave de securitate
+    log_in_with: Accede con
+    login: Accede
     logout: Clauder le session
+    migrate_account: Move a un conto differente
+    or_log_in_with: O accede con
     progress:
+      confirm: Confirma le email
       details: Tu detalios
+      review: Nostre revision
+      rules: Accepta le regulas
+    providers:
+      cas: CAS
+      saml: SAML
+    register: Inscribe te
+    resend_confirmation: Reinviar ligamine de confirmation
+    reset_password: Remontar le contrasigno
+    rules:
+      accept: Acceptar
+      back: Retro
+      title: Alcun regulas base.
+    security: Securitate
     set_new_password: Definir un nove contrasigno
     status:
       account_status: Stato del conto
       view_strikes: Examinar le admonitiones passate contra tu conto
   challenge:
     invalid_password: Contrasigno non valide
+    prompt: Confirma le contrasigno pro continuar
   deletes:
+    confirm_password: Insere tu contrasigno actual pro verificar tu identitate
     proceed: Deler le conto
     success_msg: Tu conto esseva delite con successo
     warning:
       data_removal: Tu messages e altere datos essera removite permanentemente
       email_change_html: Tu pote <a href="%{path}">cambiar tu adresse de e-mail</a> sin deler tu conto
+      username_available: Tu nomine de usator essera disponibile novemente
   disputes:
     strikes:
       action_taken: Action prendite
@@ -908,6 +1072,7 @@ ia:
   errors:
     '422':
       content: Le verification de securitate ha fallite. Bloca tu le cookies?
+      title: Falleva le verification de securitate
   existing_username_validator:
     not_found_multiple: non poteva trovar %{usernames}
   exports:
@@ -937,6 +1102,9 @@ ia:
       title: Modificar filtro
     index:
       delete: Deler
+      statuses:
+        one: "%{count} message"
+        other: "%{count} messages"
       title: Filtros
     new:
       save: Salveguardar nove filtro
@@ -970,6 +1138,7 @@ ia:
       blocking: Importation de contos blocate
       bookmarks: Importation de marcapaginas
       domain_blocking: Importation de dominios blocate
+      following: Importation de contos sequite
       lists: Importation de listas
       muting: Importation de contos silentiate
     type: Typo de importation
@@ -993,6 +1162,7 @@ ia:
       '604800': 1 septimana
       '86400': 1 die
     expires_in_prompt: Nunquam
+    title: Invitar personas
   login_activities:
     authentication_methods:
       password: contrasigno
@@ -1137,6 +1307,7 @@ ia:
     warning:
       appeal: Submitter un appello
       subject:
+        disable: Tu conto %{acct} ha essite gelate
         none: Advertimento pro %{acct}
         sensitive: Tu messages sur %{acct} essera marcate como sensibile a partir de ora
         silence: Tu conto %{acct} ha essite limitate
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 3449f1d5d72399..35111ad39643ee 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -428,9 +428,12 @@ lt:
         title: Naujas el pašto juodojo sąrašo įtraukimas
       title: El pašto juodasis sąrašas
     instances:
+      back_to_all: Visi
       by_domain: Domenas
       content_policies:
         reason: Viešoji priežastis
+      delivery:
+        all: Visi
       delivery_available: Pristatymas galimas
       moderation:
         all: Visi
@@ -537,6 +540,8 @@ lt:
       delete: Ištrinti
       edit_preset: Keisti įspėjimo nustatymus
       title: Valdyti įspėjimo nustatymus
+    webhooks:
+      events: Įvykiai
   admin_mailer:
     auto_close_registrations:
       body: Dėl pastarojo meto peržiūrėtojų aktyvumo trūkumo %{instance} registracija buvo automatiškai pakeista į reikalaujančią rankinės būdo peržiūros, kad %{instance} nebūtų naudojama kaip platforma potencialiems blogiems veikėjams. Bet kuriuo metu gali ją vėl perjungti į atvirą registraciją.
@@ -546,9 +551,15 @@ lt:
       body_remote: Kažkas iš %{domain} parašė skundą apie %{target}
       subject: Naujas skundas %{instance} (#%{id})
   appearance:
+    advanced_web_interface: Išplėstinė žiniatinklio sąsaja
+    advanced_web_interface_hint: 'Jei nori išnaudoti visą ekrano plotį, išplėstinė žiniatinklio sąsaja leidžia sukonfigūruoti daug skirtingų stulpelių, kad vienu metu matytum tiek informacijos, kiek tik nori: Pagrindinis, pranešimai, federacinė laiko skalė, bet kokie sąrašai ir saitažodžiai.'
+    animations_and_accessibility: Animacijos ir pritaikymas neįgaliesiems
+    confirmation_dialogs: Patvirtinimo dialogai
+    discovery: Atradimas
     localization:
       body: Mastodon verčia savanoriai.
       guide_link_text: Visi gali prisidėti.
+    sensitive_content: Jautrus turinys
   application_mailer:
     notification_preferences: Keisti el. pašto nuostatas
     settings: 'Keisti el. pašto nuostatas: %{link}'
@@ -581,6 +592,7 @@ lt:
     security: Apsauga
     set_new_password: Nustatyti naują slaptažodį
     status:
+      account_status: Paskyros būsena
       redirecting_to: Tavo paskyra yra neaktyvi, nes šiuo metu ji nukreipiama į %{acct}.
       self_destruct: Kadangi %{domain} uždaromas, turėsi tik ribotą prieigą prie savo paskyros.
       view_strikes: Peržiūrėti ankstesnius savo paskyros pažeidimus
@@ -611,13 +623,15 @@ lt:
       your_appeal_approved: Tavo apeliacija buvo patvirtinta
       your_appeal_pending: Pateikei apeliaciją
       your_appeal_rejected: Tavo apeliacija buvo atmesta
+  edit_profile:
+    hint_html: "<strong>Tinkink tai, ką žmonės mato tavo viešame profilyje ir šalia įrašų.</strong> Kiti žmonės labiau linkę sekti atgal ir bendrauti su tavimi, jei tavo profilis yra užpildytas ir turi profilio nuotrauką."
   errors:
     '403': Jūs neturie prieigos matyti šiam puslapiui.
     '404': Puslapis nerastas.
     '410': Puslapis neegzistuoja.
     '422':
-      content: Apsaugos patvirtinmas klaidingas. Ar jūs blokuojate sausainius?
-      title: Apsaugos patvirtinimas nepavyko
+      content: Nepavyko saugumo patvirtinimas. Ar blokuoji slapukus?
+      title: Nepavyko saugumo patvirtinimas
     '429': Stabdomas
     '500':
       content: Atsiprašome, tačiau mūsų pusėje įvyko klaida.
@@ -638,6 +652,7 @@ lt:
     storage: Medijos sandėlis
   featured_tags:
     add_new: Pridėti naują
+    hint_html: "<strong>Savo profilyje parodyk svarbiausius saitažodžius.</strong> Tai puikus įrankis kūrybiniams darbams ir ilgalaikiams projektams sekti, todėl svarbiausios saitažodžiai rodomi matomoje vietoje profilyje ir leidžia greitai pasiekti tavo paties įrašus."
   filters:
     contexts:
       home: Namų laiko juosta
@@ -654,8 +669,10 @@ lt:
     new:
       title: Pridėti naują filtrą
   generic:
+    all: Visi
     changes_saved_msg: Pakeitimai sėkmingai išsaugoti!
     copy: Kopijuoti
+    order_by: Tvarkyti pagal
     save_changes: Išsaugoti pakeitimus
   imports:
     modes:
@@ -686,10 +703,10 @@ lt:
     invalid: Šis kvietimas negalioja.
     invited_by: 'Jus pakvietė:'
     max_uses:
-      few: "%{count} panaudojimai"
-      many: "%{count} panaudojimo"
-      one: 1 panaudojimas
-      other: "%{count} panaudojimų"
+      few: "%{count} naudojimai"
+      many: "%{count} naudojimo"
+      one: 1 naudojimas
+      other: "%{count} naudojimų"
     max_uses_prompt: Nėra limito
     prompt: Generuok ir bendrink nuorodas su kitais, kad suteiktum prieigą prie šio serverio
     table:
@@ -727,6 +744,9 @@ lt:
       body: 'Tavo įrašą pakėlė %{name}:'
       subject: "%{name} pakėlė tavo įrašą"
       title: Naujas pakėlimas
+  notifications:
+    email_events: Įvykiai, skirti el. laiško pranešimams
+    email_events_hint: 'Pasirink įvykius, apie kuriuos nori gauti pranešimus:'
   pagination:
     newer: Naujesnis
     next: Kitas
@@ -738,9 +758,30 @@ lt:
     public_timelines: Viešieji laiko skalės
   privacy:
     hint_html: "<strong>Tikrink, kaip nori, kad tavo profilis ir įrašai būtų randami.</strong> Įjungus įvairias Mastodon funkcijas, jos gali padėti pasiekti platesnę auditoriją. Akimirką peržiūrėk šiuos nustatymus, kad įsitikintum, jog jie atitinka tavo naudojimo būdą."
+    privacy: Privatumas
+    privacy_hint_html: Valdyk, kiek informacijos norėtum atskleisti kitų labui. Žmonės atranda įdomių profilių ir šaunių programėlių, naršydami kitų žmonių sekamus profilius ir žiūrėdami, iš kokių programėlių jie skelbia įrašus, bet tu galbūt norėsi tai slėpti.
+    reach: Pasiekiamumas
+    reach_hint_html: Valdyk, ar norėtum, kad tave atrastų ir sektų nauji žmonės. Ar nori, kad įrašai būtų rodomi Naršyti ekrane? Ar nori, kad kiti žmonės tave matytų savo sekimo rekomendacijose? Ar nori automatiškai priimti visus naujus sekėjus, ar detaliai valdyti kiekvieną iš jų?
+    search: Paieška
+    search_hint_html: Valdyk, kaip norėtum būti surastas. Ar nori, kad žmonės tave rastų pagal tai, apie ką viešai paskelbi? Ar nori, kad ne Mastodon žmonės, ieškantys profilio internete, rastų tavo profilį? Atmink, kad visiško pašalinimo iš visų paieškos variklių viešai skelbiamai informacijai užtikrinti negalima.
+    title: Privatumas ir pasiekiamumas
+  privacy_policy:
+    title: Privatumo politika
   redirects:
     prompt: Jei pasitiki šia nuoroda, spustelėk ją, kad tęstum.
     title: Palieki %{instance}
+  relationships:
+    activity: Paskyros aktyvumas
+    dormant: Neaktyvus
+    followers: Sekėjai
+    following: Sekama
+    last_active: Paskutinį kartą aktyvus
+    most_recent: Naujausias
+    moved: Perkelta
+    mutual: Bendri
+    primary: Pirminis
+    relationship: Sąryšis
+    status: Paskyros būsena
   remote_follow:
     missing_resource: Jūsų paskyros nukreipimo URL nerasta
   scheduled_statuses:
@@ -774,13 +815,17 @@ lt:
     development: Plėtojimas
     edit_profile: Keisti profilį
     export: Informacijos eksportas
-    featured_tags: Rodomi saitažodžiai(#)
+    featured_tags: Rodomi saitažodžiai
     import: Importuoti
     migrate: Paskyros migracija
     notifications: El. laiško pranešimai
     preferences: Nuostatos
     profile: Viešas profilis
+    relationships: Sekimai ir sekėjai
+    severed_relationships: Nutrūkę sąryšiai
     two_factor_authentication: Dviejų veiksnių autentikacija
+  severed_relationships:
+    preamble: Užblokavus domeną arba prižiūrėtojams nusprendus pristabdyti nuotolinio serverio veiklą, gali prarasti sekimus ir sekėjus. Kai taip atsitiks, galėsi atsisiųsti nutrauktų sąryšių sąrašus, kad juos patikrinti ir galbūt importuoti į kitą serverį.
   statuses:
     attached:
       description: 'Pridėta: %{attached}'
@@ -795,11 +840,11 @@ lt:
     show_more: Daugiau
     visibilities:
       private: Tik sekėjams
-      private_long: Rodyti tik sekėjams
+      private_long: rodyti tik sekėjams
       public: Viešas
-      public_long: Visi gali matyti
+      public_long: visi gali matyti
       unlisted: Neįtrauktas į sąrašus
-      unlisted_long: Matyti gali visi, tačiau nėra įtraukti į viešąsias laiko skales
+      unlisted_long: matyti gali visi, bet nėra išvardyti į viešąsias laiko skales
   statuses_cleanup:
     enabled_hint: Automatiškai ištrina įrašus, kai jie pasiekia nustatytą amžiaus ribą, nebent jie atitinka vieną iš toliau nurodytų išimčių
     keep_polls_hint: Neištrina jokių tavo apklausų
@@ -808,9 +853,9 @@ lt:
   stream_entries:
     sensitive_content: Jautrus turinys
   themes:
-    contrast: Mastodon (Didelio Kontrasto)
-    default: Mastodon (Tamsus)
-    mastodon-light: Mastodon (Šviesus)
+    contrast: Mastodon (didelis kontrastas)
+    default: Mastodon (tamsi)
+    mastodon-light: Mastodon (šviesi)
     system: Automatinis (naudoti sistemos temą)
   two_factor_authentication:
     disable: Išjungti
@@ -876,7 +921,7 @@ lt:
       follows_title: Ką sekti
       follows_view_more: Peržiūrėti daugiau sekamų žmonių
       hashtags_subtitle: Naršyk, kas tendencinga per pastarąsias 2 dienas.
-      hashtags_title: Tendencijos saitažodžiai
+      hashtags_title: Trendingiausi saitažodžiai
       hashtags_view_more: Peržiūrėti daugiau tendencingų saitažodžių
       post_action: Sukurti
       post_step: Sakyk labas pasauliui tekstu, nuotraukomis, vaizdo įrašais arba apklausomis.
@@ -896,9 +941,10 @@ lt:
     seamless_external_login: Esi prisijungęs (-usi) per išorinę paslaugą, todėl slaptažodžio ir el. pašto nustatymai nepasiekiami.
     signed_in_as: 'Prisijungta kaip:'
   verification:
-    extra_instructions_html: <strong>Patarimas:</strong> nuoroda tavo svetainėje gali būti nematoma. Svarbi dalis – tai, kas <code>rel="me"</code> neleidžia apsimesti interneto svetainėse, kuriose yra naudotojų sukurto turinio. Vietoj to gali naudoti net <code>nuorodą</code> puslapio antraštėje esančią žymę <code>a</code>, tačiau HTML turi būti pasiekiamas nevykdant JavaScript.
+    extra_instructions_html: <strong>Patarimas:</strong> nuoroda tavo svetainėje gali būti nematoma. Svarbi dalis – tai, kad <code>rel="me"</code> neleidžia apsimesti interneto svetainėse, kuriose yra naudotojų sukurto turinio. Vietoj to gali naudoti net <code>nuorodą</code> puslapio antraštėje esančią žymę <code>a</code>, tačiau HTML turi būti pasiekiamas nevykdant JavaScript.
+    here_is_how: Štai kaip
     hint_html: "<strong>Savo tapatybės patvirtinimas Mastodon skirtas visiems.</strong> Remiantis atviraisiais žiniatinklio standartais, dabar ir visam laikui nemokamas. Viskas, ko tau reikia, yra asmeninė svetainė, pagal kurią žmonės tave atpažįsta. Kai iš savo profilio pateiksi nuorodą į šią svetainę, patikrinsime, ar svetainėje yra nuoroda į tavo profilį, ir parodysime vizualinį indikatorių."
-    instructions_html: Nukopijuok ir įklijuok toliau pateiktą kodą į savo svetainės HTML. Tada į vieną iš papildomų profilio laukų skirtuke „Redaguoti profilį“ įrašyk savo svetainės adresą ir išsaugok pakeitimus.
+    instructions_html: Nukopijuok ir įklijuok toliau pateiktą kodą į savo svetainės HTML. Tada į vieną iš papildomų profilio laukų skirtuke Redaguoti profilį įrašyk savo svetainės adresą ir išsaugok pakeitimus.
     verification: Patvirtinimas
     verified_links: Tavo patikrintos nuorodos
   webauthn_credentials:
diff --git a/config/locales/simple_form.ca.yml b/config/locales/simple_form.ca.yml
index 62c1da55b5ad3e..d3dc4b13f113f2 100644
--- a/config/locales/simple_form.ca.yml
+++ b/config/locales/simple_form.ca.yml
@@ -77,11 +77,13 @@ ca:
           warn: Oculta el contingut filtrat darrere d'un avís mencionant el títol del filtre
       form_admin_settings:
         activity_api_enabled: Contador de tuts publicats localment, usuaris actius i registres nous en períodes setmanals
+        app_icon: WEBP, PNG, GIF o JPG. Canvia la icona per defecte de l'app en dispositius mòbils per una de personalitzada.
         backups_retention_period: Els usuaris poden generar arxius de les seves publicacions per a baixar-los més endavant. Quan tingui un valor positiu, els arxius s'esborraran del vostre emmagatzematge després del nombre donat de dies.
         bootstrap_timeline_accounts: Aquests comptes es fixaran en la part superior de les recomanacions de seguiment dels nous usuaris.
         closed_registrations_message: Es mostra quan el registres estan tancats
         content_cache_retention_period: S'esborraran totes les publicacions d'altres servidors (impulsos i respostes inclosos) passats els dies indicats, sense tenir en consideració les interaccions d'usuaris locals amb aquestes publicacions. Això inclou les publicacions que un usuari local hagi marcat com a favorites. També es perdran, i no es podran recuperar, les mencions privades entre usuaris d'instàncies diferents. Aquest paràmetre està pensat per a instàncies amb un propòsit especial i trencarà les expectatives dels usuaris si s'utilitza en una instància convencional.
         custom_css: Pots aplicar estils personalitzats en la versió web de Mastodon.
+        favicon: WEBP, PNG, GIF o JPG. Canvia la icona per defecte de Mastodon a la pestanya del navegador per una de personalitzada.
         mascot: Anul·la la il·lustració en la interfície web avançada.
         media_cache_retention_period: El vostre servidor conserva una còpia dels fitxers multimèdia de les publicacions dels usuaris remots. Si s'indica un valor positiu, s'esborraran passats els dies indicats. Si el fitxer es torna a demanar un cop esborrat, es tornarà a baixar si el contingut origen segueix disponible. Per causa de les restriccions en la freqüència amb què es poden demanar les targetes de previsualització d'altres servidors, es recomana definir aquest valor com a mínim a 14 dies, o les targetes de previsualització no s'actualizaran a demanda abans d'aquest termini.
         peers_api_enabled: Una llista de noms de domini que aquest servidor ha trobat al fedivers. No inclou cap dada sobre si estàs federat amb un servidor determinat, només si el teu en sap res. La fan servir, en un sentit general, serveis que recol·lecten estadístiques sobre la federació.
diff --git a/config/locales/simple_form.da.yml b/config/locales/simple_form.da.yml
index c9dcd4fa839279..0719e26430dd4c 100644
--- a/config/locales/simple_form.da.yml
+++ b/config/locales/simple_form.da.yml
@@ -77,11 +77,13 @@ da:
           warn: Skjul filtreret indhold bag en advarsel, der nævner filterets titel
       form_admin_settings:
         activity_api_enabled: Antal lokalt opslåede indlæg, aktive brugere samt nye tilmeldinger i ugentlige opdelinger
+        app_icon: WEBP, PNG, GIF eller JPG. Tilsidesætter standard app-ikonet på mobilenheder med et tilpasset ikon.
         backups_retention_period: Brugere har mulighed for at generere arkiver af deres indlæg til senere downloade. Når sat til positiv værdi, vil disse arkiver automatisk blive slettet fra lagerpladsen efter det angivne antal dage.
         bootstrap_timeline_accounts: Disse konti fastgøres øverst på nye brugeres følg-anbefalinger.
         closed_registrations_message: Vises, når tilmeldinger er lukket
         content_cache_retention_period: Alle indlæg fra andre servere (herunder boosts og besvarelser) slettes efter det angivne antal dage uden hensyn til lokal brugerinteraktion med disse indlæg. Dette omfatter indlæg, hvor en lokal bruger har markeret dem som bogmærker eller favoritter. Private omtaler mellem brugere fra forskellige instanser vil også være tabt og umulige at gendanne. Brugen af denne indstilling er beregnet til særlige formål instanser og bryder mange brugerforventninger ved implementering til almindelig brug.
         custom_css: Man kan anvende tilpassede stilarter på Mastodon-webversionen.
+        favicon: WEBP, PNG, GIF eller JPG. Tilsidesætter standard Mastodon favikonet på mobilenheder med et tilpasset ikon.
         mascot: Tilsidesætter illustrationen i den avancerede webgrænseflade.
         media_cache_retention_period: Mediefiler fra indlæg oprettet af eksterne brugere er cachet på din server. Når sat til positiv værdi, slettes medier efter det angivne antal dage. Anmodes om mediedata efter de er slettet, gendownloades de, hvis kildeindholdet stadig er tilgængeligt. Grundet begrænsninger på, hvor ofte linkforhåndsvisningskort forespørger tredjeparts websteder, anbefales det at sætte denne værdi til mindst 14 dage, ellers opdateres linkforhåndsvisningskort ikke efter behov før det tidspunkt.
         peers_api_enabled: En liste med domænenavne, som denne server har stødt på i fediverset. Ingen data inkluderes her om, hvorvidt der fødereres med en given server, blot at din server kender til det. Dette bruges af tjenester, som indsamler generelle føderationsstatistikker.
diff --git a/config/locales/simple_form.de.yml b/config/locales/simple_form.de.yml
index 758d0202826a80..c1056260bbf975 100644
--- a/config/locales/simple_form.de.yml
+++ b/config/locales/simple_form.de.yml
@@ -77,11 +77,13 @@ de:
           warn: Den gefilterten Beitrag hinter einer Warnung, die den Filtertitel beinhaltet, ausblenden
       form_admin_settings:
         activity_api_enabled: Anzahl der wöchentlichen Beiträge, aktiven Profile und Registrierungen auf diesem Server
+        app_icon: WEBP, PNG, GIF oder JPG Überschreibt das Standard-App-Symbol auf mobilen Geräten mit einem benutzerdefinierten Symbol.
         backups_retention_period: Nutzer*innen haben die Möglichkeit, Archive ihrer Beiträge zu erstellen, die sie später herunterladen können. Wenn ein positiver Wert gesetzt ist, werden diese Archive nach der festgelegten Anzahl von Tagen automatisch aus deinem Speicher gelöscht.
         bootstrap_timeline_accounts: Diese Konten werden bei den Follower-Empfehlungen für neu registrierte Nutzer*innen oben angeheftet.
         closed_registrations_message: Wird angezeigt, wenn Registrierungen deaktiviert sind
         content_cache_retention_period: Sämtliche Beiträge von anderen Servern (einschließlich geteilte Beiträge und Antworten) werden, unabhängig von der Interaktion der lokalen Nutzer*innen mit diesen Beiträgen, nach der festgelegten Anzahl von Tagen gelöscht. Das betrifft auch Beiträge, die von lokalen Nutzer*innen favorisiert oder als Lesezeichen gespeichert wurden. Private Erwähnungen zwischen Nutzer*innen von verschiedenen Servern werden ebenfalls verloren gehen und können nicht wiederhergestellt werden. Das Verwenden dieser Option richtet sich ausschließlich an Server für spezielle Zwecke und wird die allgemeine Nutzungserfahrung beeinträchtigen, wenn sie für den allgemeinen Gebrauch aktiviert ist.
         custom_css: Du kannst benutzerdefinierte Stile auf die Web-Version von Mastodon anwenden.
+        favicon: WEBP, PNG, GIF oder JPG überschreibt das Standard-Mastodon favicon mit einem benutzerdefinierten Icon.
         mascot: Überschreibt die Abbildung in der erweiterten Weboberfläche.
         media_cache_retention_period: Mediendateien aus Beiträgen von externen Nutzer*innen werden auf deinem Server zwischengespeichert. Wenn ein positiver Wert gesetzt ist, werden die Medien nach der festgelegten Anzahl von Tagen gelöscht. Sollten die Medien nach dem Löschvorgang wieder angefragt werden, werden sie erneut heruntergeladen, sofern der ursprüngliche Inhalt noch vorhanden ist. Es wird empfohlen, diesen Wert auf mindestens 14 Tage festzulegen, da die Häufigkeit der Abfrage von Linkvorschaukarten für Websites von Dritten begrenzt ist und die Linkvorschaukarten sonst nicht vor Ablauf dieser Zeit aktualisiert werden.
         peers_api_enabled: Eine Liste von Domains, die diesem Server im Fediverse begegnet sind. Hierbei werden keine Angaben darüber gemacht, ob du mit einem bestimmten Server föderierst, sondern nur, dass dein Server davon weiß. Dies wird von Diensten verwendet, die allgemein Statistiken übers Ferdiverse sammeln.
diff --git a/config/locales/simple_form.en-GB.yml b/config/locales/simple_form.en-GB.yml
index 9aedac15f3dbdd..f4668ccada1c38 100644
--- a/config/locales/simple_form.en-GB.yml
+++ b/config/locales/simple_form.en-GB.yml
@@ -77,12 +77,9 @@ en-GB:
           warn: Hide the filtered content behind a warning mentioning the filter's title
       form_admin_settings:
         activity_api_enabled: Counts of locally published posts, active users, and new registrations in weekly buckets
-        app_icon: WEBP, PNG, GIF or JPG. Overrides the default app icon on mobile devices with a custom icon.
-        backups_retention_period: Keep generated user archives for the specified number of days.
         bootstrap_timeline_accounts: These accounts will be pinned to the top of new users' follow recommendations.
         closed_registrations_message: Displayed when sign-ups are closed
         custom_css: You can apply custom styles on the web version of Mastodon.
-        favicon: WEBP, PNG, GIF or JPG. Overrides the default Mastodon favicon with a custom icon.
         mascot: Overrides the illustration in the advanced web interface.
         peers_api_enabled: A list of domain names this server has encountered in the fediverse. No data is included here about whether you federate with a given server, just that your server knows about it. This is used by services that collect statistics on federation in a general sense.
         profile_directory: The profile directory lists all users who have opted-in to be discoverable.
diff --git a/config/locales/simple_form.es-AR.yml b/config/locales/simple_form.es-AR.yml
index cd1b681688e188..e346a23a0282e8 100644
--- a/config/locales/simple_form.es-AR.yml
+++ b/config/locales/simple_form.es-AR.yml
@@ -77,11 +77,13 @@ es-AR:
           warn: Ocultar el contenido filtrado detrás de una advertencia mencionando el título del filtro
       form_admin_settings:
         activity_api_enabled: Conteos de mensajes publicados localmente, cuentas activas y nuevos registros en tandas semanales
+        app_icon: WEBP, PNG, GIF o JPG. Reemplaza el ícono de aplicación predeterminado en dispositivos móviles con uno personalizado.
         backups_retention_period: Los usuarios tienen la capacidad de generar archivos historiales de sus mensajes para descargar más adelante. Cuando se establece un valor positivo, estos archivos se eliminarán automáticamente de su almacenamiento después del número especificado de días.
         bootstrap_timeline_accounts: Estas cuentas serán fijadas a la parte superior de las recomendaciones de cuentas a seguir para nuevos usuarios.
         closed_registrations_message: Mostrado cuando los registros están cerrados
         content_cache_retention_period: Todos los mensajes de otros servidores (incluyendo adhesiones y respuestas) se eliminarán después del número de días especificado, sin tener en cuenta la interacción del usuario local con esos mensajes. Esto incluye mensajes que un usuario local haya agregado a marcadores o los haya marcado como favoritos. Las menciones privadas entre usuarios de diferentes servidores también se perderán y también serán imposibles de restaurar. El uso de esta configuración está destinado a servidores de propósito especial y rompe muchas expectativas de los usuarios cuando se implementa para uso general.
         custom_css: Podés aplicar estilos personalizados a la versión web de Mastodon.
+        favicon: WEBP, PNG, GIF o JPG. Reemplaza el favicón predeterminado de Mastodon con uno personalizado.
         mascot: Reemplaza la ilustración en la interface web avanzada.
         media_cache_retention_period: Los archivos de medios de mensajes publicados por usuarios remotos se almacenan en la memoria caché en tu servidor. Cuando se establece un valor positivo, los medios se eliminarán después del número especificado de días. Si los datos multimedia se solicitan después de eliminarse, se volverán a descargar, si es que el contenido fuente todavía está disponible. Debido a restricciones en la frecuencia con la que las tarjetas de previsualización de enlace consultan a sitios web de terceros, se recomienda establecer este valor a, al menos, 14 días, o las tarjetas de previsualización de enlaces no se actualizarán a pedido antes de ese momento.
         peers_api_enabled: Una lista de nombres de dominio que este servidor ha encontrado en el Fediverso. Acá no se incluye ningún dato sobre si federás con un servidor determinado, sólo que tu servidor lo conoce. Esto es usado por los servicios que recopilan estadísticas sobre la federación en un sentido general.
diff --git a/config/locales/simple_form.eu.yml b/config/locales/simple_form.eu.yml
index ba4c9ebcf801a8..8c467bc9bff422 100644
--- a/config/locales/simple_form.eu.yml
+++ b/config/locales/simple_form.eu.yml
@@ -77,11 +77,13 @@ eu:
           warn: Ezkutatu iragazitako edukia iragazkiaren izenburua duen abisu batekin
       form_admin_settings:
         activity_api_enabled: Lokalki argitaratutako bidalketak, erabiltzaile aktiboak, eta izen-emateen kopuruak astero zenbatzen ditu
+        app_icon: WEBP, PNG, GIF edo JPG. Aplikazioaren ikono lehenetsia gainidazten du ikono pertsonalizatu batekin gailu mugikorretan.
         backups_retention_period: Erabiltzaileek geroago deskarga dezaketen beren argitalpenen artxiboak sor ditzakete. Balio positibo bat ezartzean, artxibo hauek biltegiratzetik automatikoki ezabatuko dira zehazturiko egunen buruan.
         bootstrap_timeline_accounts: Kontu hauek erabiltzaile berrien jarraitzeko gomendioen goiko aldean ainguratuko dira.
         closed_registrations_message: Izen-ematea itxia dagoenean bistaratua
         content_cache_retention_period: Beste zerbitzarietako argitalpen guztiak (bultzadak eta erantzunak barne) ezabatuko dira zehazturiko egunen buruan, argitalpen horiek izan ditzaketen erabiltzaile lokalaren interakzioa kontuan izanik gabe. Instantzia desberdinetako erabiltzaileen arteko aipamen pribatuak ere galdu egingo dira eta ezin izango dira berreskuratu. Ezarpen honen erabilera xede berezia duten instantziei zuzendua dago eta erabiltzaileen itxaropena hausten da orotariko erabilerarako inplementatzean.
         custom_css: Estilo pertsonalizatuak aplikatu ditzakezu Mastodonen web bertsioan.
+        favicon: WEBP, PNG, GIF or JPG. Mastodon-en favicon-a gainidazten du ikono pertsonalizatu batekin.
         mascot: Web interfaze aurreratuko ilustrazioa gainidazten du.
         media_cache_retention_period: Multimedia-fitxategiak dituzten urruneko erabiltzaileen argitalpenak zure zerbitzarian gordetzen dira cachean. Balio positiboa ezartzean, multimedia zehazturiko egunen buruan ezabatuko da. Multimedia-datuak eskatzen badira ezabatu ostean, berriro deskargatuko dira, iturburuko edukia oraindik erabilgarri badago. Estekaren aurrebistako txartelek hirugarrenen guneei zenbatetan dei diezaieketen mugatzen dieten murrizketak direla eta, balio honi, gutxienez, 14 egunen balioa ezartzea gomendatzen da, bestela, esteken aurrebistako txartelak ez dira eguneratuko eskatu ahala denbora horren aurretik.
         peers_api_enabled: Zerbitzari honek fedibertsoan ikusi dituen zerbitzarien domeinu-izenen zerrenda. Ez da daturik ematen zerbitzari jakin batekin federatzearen ala ez federatzearen inguruan, zerbitzariak haien berri duela soilik. Federazioari buruzko estatistika orokorrak biltzen dituzten zerbitzuek erabiltzen dute hau.
diff --git a/config/locales/simple_form.fi.yml b/config/locales/simple_form.fi.yml
index 510b880e3b8744..4971e250222077 100644
--- a/config/locales/simple_form.fi.yml
+++ b/config/locales/simple_form.fi.yml
@@ -77,10 +77,12 @@ fi:
           warn: Piilota suodatettu sisältö varoituksen taakse, jossa mainitaan suodattimen nimi
       form_admin_settings:
         activity_api_enabled: Paikallisesti julkaistujen julkaisujen, aktiivisten käyttäjien ja rekisteröitymisten viikoittainen määrä
+        app_icon: WEBP, PNG, GIF tai JPG. Korvaa oletusarvoisen mobiililaitteiden sovelluskuvakkeen omalla kuvakkeella.
         backups_retention_period: Käyttäjillä on mahdollisuus arkistoida julkaisujaan myöhemmin ladattaviksi. Kun tämä on asetettu positiiviseksi arvoksi, nämä arkistot poistetaan automaattisesti asetetun päivien määrän jälkeen.
         bootstrap_timeline_accounts: Nämä tilit kiinnitetään uusien käyttäjien seuraamissuosituslistojen alkuun.
         closed_registrations_message: Näkyy, kun rekisteröityminen on suljettu
         custom_css: Voit käyttää mukautettuja tyylejä Mastodonin verkkoversiossa.
+        favicon: WEBP, PNG, GIF tai JPG. Korvaa oletusarvoisen Mastodonin suosikkikuvakkeen omalla kuvakkeella.
         mascot: Ohittaa kuvituksen edistyneessä selainkäyttöliittymässä.
         peers_api_enabled: Luettelo verkkotunnuksista, jotka tämä palvelin on kohdannut fediversumissa. Se ei kerro, oletko liitossa tietyn palvelimen kanssa, vaan että palvelimesi on ylipäätään tietoinen siitä. Tätä tietoa käytetään palveluissa, jotka keräävät tilastoja federoinnista yleisellä tasolla.
         profile_directory: Profiilihakemisto lueteloi kaikki käyttäjät, jotka ovat ilmoittaneet olevansa löydettävissä.
diff --git a/config/locales/simple_form.fo.yml b/config/locales/simple_form.fo.yml
index c7c00332253e87..7d4da2b51ee38e 100644
--- a/config/locales/simple_form.fo.yml
+++ b/config/locales/simple_form.fo.yml
@@ -77,11 +77,13 @@ fo:
           warn: Fjal filtreraða innihaldið aftan fyri eina ávaring, sum nevnir heitið á filtrinum
       form_admin_settings:
         activity_api_enabled: Tal av lokalt útgivnum postum, virknum brúkarum og nýggjum skrásetingum býtt vikuliga
+        app_icon: WEBP, PNG, GIF ella JPG. Býtir vanligu ikonina á fartelefoneindum um við eina ser-ikon.
         backups_retention_period: Brúkarar hava møguleika at gera trygdaravrit av teirra postum, sum tey kunnu taka niður seinni. Tá hetta er sett til eitt virði størri enn 0, so verða hesi trygdaravrit strikaði av sær sjálvum frá tínar goymslu eftir ásetta talið av døgum.
         bootstrap_timeline_accounts: Hesar kontur verða festar ovast á listanum yvir brúkarar, sum tey nýggju verða mælt til at fylgja.
         closed_registrations_message: Víst tá stongt er fyri tilmeldingum
         content_cache_retention_period: Allir postar frá øðrum ambætarum (íroknað stimbranir og svar) verða strikaði eftir ásetta talið av døgum, óansæð hvussu lokalir brúkarar hava samvirkað við hesar postar. Hetta fevnir eisini um postar, sum lokalir brúkarar hava bókamerkt ella yndismerkt. Privatar umrøður millum brúkarar frá ymiskum ambætarum verða eisini burturmistar og ómøguligar at endurskapa. Brúk av hesi stillingini er einans hugsað til serligar støður og oyðileggur nógv, sum brúkarar vænta av einum vanligum ambætara.
         custom_css: Tú kanst seta títt egna snið upp í net-útgávuni av Mastodon.
+        favicon: WEBP, PNG, GIF ella JPG. Býtir vanligu Mastodon fav-ikonina um við eina ser-ikon.
         mascot: Skúgvar til viks myndprýðingina í framkomna vev-markamótinum.
         media_cache_retention_period: Miðlafílur frá postum, sum fjarbrúkarar hava gjørt, verða goymdir á tínum ambætara. Tá hetta er sett til eitt virði størri enn 0, so verða miðlafílurnar strikaðar eftir ásetta talið av døgum. Um miðladátur verða umbidnar eftir at tær eru strikaðar, verða tær tiknar innaftur á ambætaran, um keldutilfarið enn er tøkt. Vegna avmarkingar á hvussu ofta undanvísingarkort til leinki spyrja triðjapartsstøð, so verður mælt til at seta hetta virðið til í minsta lagi 14 dagar. Annars verða umbønir um dagføringar av undanvísingarkortum til leinki ikki gjørdar áðrenn hetta.
         peers_api_enabled: Ein listi við navnaøkjum, sum hesin ambætarin er komin framat í fediversinum. Ongar dátur eru tiknar við her um tú er sameind/ur við ein givnan ambætara, einans at tín ambætari veit um hann. Hetta verður brúkt av tænastum, sum gera hagtøl um sameining yvirhøvur.
diff --git a/config/locales/simple_form.gl.yml b/config/locales/simple_form.gl.yml
index 0433496013ed33..0411c45bc169f4 100644
--- a/config/locales/simple_form.gl.yml
+++ b/config/locales/simple_form.gl.yml
@@ -77,11 +77,13 @@ gl:
           warn: Agochar o contido filtrado tras un aviso que conteña o nome do filtro
       form_admin_settings:
         activity_api_enabled: Conta do número de publicacións locais, usuarias activas, e novos rexistros en acumulados semanais
+        app_icon: WEBP, PNG, GIF ou JPG. Sobrescribe a icona por defecto da aplicación nos dispositivos móbiles cunha icona personalizada.
         backups_retention_period: As usuarias poden crear arquivos das súas publicacións para descargalos. Cando se establece un valor positivo, estes arquivos serán borrados automáticamente da túa almacenaxe despois do número de días establecido.
         bootstrap_timeline_accounts: Estas contas aparecerán fixas na parte superior das recomendacións para as usuarias.
         closed_registrations_message: Móstrase cando non se admiten novas usuarias
         content_cache_retention_period: Todas as publicacións procedentes de outros servidores (incluído promocións e respostas) van ser eliminadas despois do número de días indicado, sen importar as interaccións das usuarias locais con esas publicacións. Esto inclúe publicacións que a usuaria local marcou como favoritas ou incluíu nos marcadores. As mencións privadas entre usuarias de diferentes instancias tamén se eliminarán e non se poderán restablecer. O uso desta ferramenta esta orientado a situacións especiais e estraga moitas das expectativas das usuarias ao implementala cun propósito de uso xeral.
         custom_css: Podes aplicar deseños personalizados na versión web de Mastodon.
+        favicon: WEBP, PNG, GIF ou JPG. Sobrescribe a icona de favoritos de Mastodon por defecto cunha icona personalizada.
         mascot: Sobrescribe a ilustración na interface web avanzada.
         media_cache_retention_period: Os ficheiros multimedia de publicacións de usuarias remotas están almacenados no teu servidor. Ao establecer un valor positivo, o multimedia vaise eliminar despois do número de días establecido. Se o multimedia fose requerido após ser eliminado entón descargaríase outra vez, se aínda está dispoñible na orixe. Debido a restricións sobre a frecuencia en que o servizo de vista previa trae recursos de terceiras partes, é recomendable establecer este valor polo menos en 14 días, ou as tarxetas de vista previa non se actualizarán baixo demanda para casos anteriores a ese prazo.
         peers_api_enabled: Unha lista dos nomes de dominio que este servidor atopou no fediverso. Non se inclúen aquí datos acerca de se estás a federar con eles ou non, só que o teu servidor os recoñeceu. Ten utilidade para servizos que recollen estatísticas acerca da federación nun amplo senso.
diff --git a/config/locales/simple_form.he.yml b/config/locales/simple_form.he.yml
index 841745dbc0e294..65c6f6110fc2bf 100644
--- a/config/locales/simple_form.he.yml
+++ b/config/locales/simple_form.he.yml
@@ -77,11 +77,13 @@ he:
           warn: הסתר את התוכן המסונן מאחורי אזהרה עם כותרת המסנן
       form_admin_settings:
         activity_api_enabled: מספר ההודעות שפורסמו מקומית, משתמשים פעילים, והרשמות חדשות בדליים שבועיים
+        app_icon: WEBP, PNG, GIF או JPG. גובר על אייקון ברירת המחדל ביישומון על מכשירים ניידים ומחליף אותו באייקון נבחר.
         backups_retention_period: למשתמשים יש יכולת לבקש ארכיון של הודעותיהם להורדה מאוחר יותר. כאשר נבחר ערך חיובי, הארכיונים הללו ימחקו מאחסון לאחר מספר הימים שצוינו.
         bootstrap_timeline_accounts: חשבונות אלו יוצמדו לראש רשימת המלצות המעקב של משתמשים חדשים.
         closed_registrations_message: להציג כאשר הרשמות חדשות אינן מאופשרות
         content_cache_retention_period: כל ההודעות משרתים אחרים (לרבות הדהודים ותגובות) ימחקו אחרי מספר ימים, ללא קשר לאינטראקציה של משתמשים מקומיים איתם. בכלל זה הודעות שהמתשתמשים המקומיים סימנו בסימניה או חיבוב. איזכורים פרטיים ("דיאם") בין משתמשים בין שרתים שונים יאבדו גם הם ולא תהיה אפשרות לשחזרם. השימוש באפשרות הזו מיועד לשרתים עם ייעוד מיוחד ושובר את ציפיותיהם של רב המשתמשים כאשר האפשרות מופעלת בשרת לשימוש כללי.
         custom_css: ניתן לבחור ערכות סגנון אישיות בגרסת הדפדפן של מסטודון.
+        favicon: WEBP, PNG, GIF או JPG. גובר על "פאבאייקון" ברירת המחדל ומחליף אותו באייקון נבחר בדפדפן.
         mascot: בחירת ציור למנשק הווב המתקדם.
         media_cache_retention_period: קבצי מדיה מהודעות שהגיעו משרתים רחוקים נשמרות על השרת שלך. כאשר יבחר פה מספר חיובי, המדיה תמחק לאחר מספר ימים כמצוין. אם המידע יבוקש שוב לאחר שנמחק, הוא יורד מחדש, אם המידע עדיין זמין בצד הרחוק. עקב מגבלות על תכיפות שליפת כרטיסי קדימון מאתרים מרוחקים, מומלץ לכוון את הערך ל־14 יום לפחות, או שכרטיסי קדימונים לא יעודכנו לפי דרישה לפני חלוף חלון הזמן הזה.
         peers_api_enabled: רשימת השרתים ששרת זה פגש בפדיוורס. לא כולל מידע לגבי קשר ישיר עם שרת נתון, אלא רק שידוע לשרת זה על קיומו. מידע זה משמש שירותים האוספים סטטיסטיקות כלליות על הפדרציה.
diff --git a/config/locales/simple_form.hu.yml b/config/locales/simple_form.hu.yml
index e2040cafd8e290..8fee5b414d4c8a 100644
--- a/config/locales/simple_form.hu.yml
+++ b/config/locales/simple_form.hu.yml
@@ -77,11 +77,13 @@ hu:
           warn: A szűrt tartalom a szűrő címét említő figyelmeztetés mögé rejtése
       form_admin_settings:
         activity_api_enabled: Helyi bejegyzések, aktív felhasználók és új regisztrációk száma heti bontásban
+        app_icon: WEBP, PNG, GIF vagy JPG. Mobileszközökön az alkalmazás alapértelmezett ikonját felülírja egy egyéni ikonnal.
         backups_retention_period: A felhasználók archívumokat állíthatnak elő a bejegyzéseikből, hogy később letöltsék azokat. Ha pozitív értékre van állítva, akkor a megadott számú nap után automatikusan törölve lesznek a tárhelyedről.
         bootstrap_timeline_accounts: Ezek a fiókok ki lesznek tűzve az új felhasználók követési javaslatainak élére.
         closed_registrations_message: Akkor jelenik meg, amikor a regisztráció le van zárva
         content_cache_retention_period: Minden más kiszolgálóról származó bejegyzés (megtolásokkal és válaszokkal együtt) törölve lesz a megadott számú nap elteltével, függetlenül a helyi felhasználók ezekkel a bejegyzésekkel történő interakcióitól. Ebben azok a bejegyzések is benne vannak, melyeket a helyi felhasználó könyvjelzőzött vagy kedvencnek jelölt. A különböző kiszolgálók felhasználói közötti privát üzenetek is el fognak veszni visszaállíthatatlanul. Ennek a beállításnak a használata különleges felhasználási esetekre javasolt, mert számos felhasználói elvárás fog eltörni, ha általános céllal használják.
         custom_css: A Mastodon webes verziójában használhatsz egyéni stílusokat.
+        favicon: WEBP, PNG, GIF vagy JPG. Az alapértelmezett Mastodon favicon felülírása egy egyéni ikonnal.
         mascot: Felülbírálja a speciális webes felületen található illusztrációt.
         media_cache_retention_period: A távoli felhasználók bejegyzéseinek médiatartalmait a kiszolgálód gyorsítótárazza. Ha pozitív értékre állítják, ezek a médiatartalmak a megadott számú nap után törölve lesznek. Ha a médiát újra lekérik, miután törlődött, újra le fogjuk tölteni, ha az eredeti még elérhető. A hivatkozások előnézeti kártyáinak harmadik fél weboldalai felé történő hivatkozásaira alkalmazott megkötései miatt javasolt, hogy ezt az értéket legalább 14 napra állítsuk, ellenkező esetben a hivatkozások előnézeti kártyái szükség esetén nem fognak tudni frissülni ezen idő előtt.
         peers_api_enabled: Azon domainek listája, melyekkel ez a kiszolgáló találkozott a fediverzumban. Nem csatolunk adatot arról, hogy föderált kapcsolatban vagy-e az adott kiszolgálóval, csak arról, hogy a kiszolgálód tud a másikról. Ezt olyan szolgáltatások használják, melyek általában a föderációról készítenek statisztikákat.
diff --git a/config/locales/simple_form.is.yml b/config/locales/simple_form.is.yml
index 6f3072758ca780..044e24deb03ac9 100644
--- a/config/locales/simple_form.is.yml
+++ b/config/locales/simple_form.is.yml
@@ -77,11 +77,13 @@ is:
           warn: Fela síað efni á bakvið aðvörun sem tekur fram titil síunnar
       form_admin_settings:
         activity_api_enabled: Fjöldi staðværra stöðufærslna, virkra notenda og nýskráninga í vikulegum skömmtum
+        app_icon: WEBP, PNG, GIF eða JPG. Tekur yfir sjálfgefna táknmynd forrits á snjalltækjum með sérsniðinni táknmynd.
         backups_retention_period: Notendur hafa kost á að útbúa safnskrár með færslunum sínum til að sækja svo síðar. Þegar þetta er stillt á jákvætt gildi, verður þessum safnskrám eytt sjáfkrafa eftir þeim tiltekna fjölda daga.
         bootstrap_timeline_accounts: Þessir notendaaðgangar verða festir efst í meðmælum til nýrra notenda um að fylgjast með þeim.
         closed_registrations_message: Birtist þegar lokað er á nýskráningar
         content_cache_retention_period: Öllum færslum af öðrum netþjónum (þar með taldar endurbirtingar og svör) verður eytt eftir uppgefinn fjölda daga, án tillits til gagnvirkni staðværra notenda við þessar færslur. Þetta á einnig við um færslur sem notandinn hefur merkt sem bókamerki eða eftirlæti. Beinar tilvísanir (einkaspjall) milli notenda af mismunandi netþjónum munu einnig tapast og er engin leið til að endurheimta þær. Notkun á þessari stillingu er einungis ætluð sérstilltum netþjónum og mun skemma fyrir notendum ef þetta er sett upp fyrir almenna notkun.
         custom_css: Þú getur virkjað sérsniðna stíla í vefútgáfu Mastodon.
+        favicon: WEBP, PNG, GIF eða JPG. Tekur yfir sjálfgefna Mastodon favicon-táknmynd með sérsniðinni táknmynd.
         mascot: Þetta tekyr yfir myndskreytinguna í ítarlega vefviðmótinu.
         media_cache_retention_period: Myndefnisskrár úr færslum sem gerðar eru af fjartengdum notendum eru geymdar á netþjóninum þínum. Þegar þetta er stillt á jákvætt gildi, verður þessum skrám eytt sjáfkrafa eftir þeim tiltekna fjölda daga. Ef beðið er um myndefnið eftir að því er eytt, mun það verða sótt aftur ef frumgögnin eru ennþá aðgengileg. Vegna takmarkana á hversu oft forskoðunarspjöld tengla eru sótt á utanaðkomandi netþjóna, þá er mælt með því að setja þetta gildi á að minnsta kosti 14 daga, annars gæti mistekist að uppfæra forskoðunarspjöld tengla eftir þörfum fyrir þann tíma.
         peers_api_enabled: Listi yfir þau lénaheiti sem þessi netþjónn hefur rekist á í skýjasambandinu. Engin gögn eru hér sem gefa til kynna hvort þú sért í sambandi við tiltekinn netþjón, bara að netþjónninn þinn viti um hann. Þetta er notað af þjónustum sem safna tölfræði um skýjasambönd á almennan hátt.
diff --git a/config/locales/simple_form.lt.yml b/config/locales/simple_form.lt.yml
index f6a3ad9372f7a3..1be95a9f1b471a 100644
--- a/config/locales/simple_form.lt.yml
+++ b/config/locales/simple_form.lt.yml
@@ -40,7 +40,7 @@ lt:
       defaults:
         autofollow: Žmonės, kurie užsiregistruos per kvietimą, automatiškai seks tave
         avatar: WEBP, PNG, GIF arba JPG. Ne daugiau kaip %{size}. Bus sumažintas iki %{dimensions} tšk.
-        bot: Signalizuoti kitiems, kad paskyroje daugiausia atliekami automatiniai veiksmai ir kad ji gali būti nestebima
+        bot: Signalizuoti kitiems, kad paskyroje daugiausia atliekami automatiniai veiksmai ir kad ji gali būti nestebima.
         context: Vienas arba keli kontekstai, kuriems turėtų būti taikomas filtras
         current_password: Saugumo sumetimais įvesk dabartinės paskyros slaptažodį
         current_username: Kad patvirtintum, įvesk dabartinės paskyros naudotojo vardą
@@ -53,14 +53,14 @@ lt:
         password: Naudok bent 8 simbolius
         phrase: Bus suderinta, neatsižvelgiant į teksto lygį arba įrašo turinio įspėjimą
         scopes: Prie kurių API programai bus leidžiama pasiekti. Pasirinkus aukščiausio lygio sritį, atskirų sričių pasirinkti nereikia.
-        setting_aggregate_reblogs: Nerodyti naujų pakėlimų įrašams, kurie neseniai buvo pakelti (taikoma tik naujai gautiems pakėlimams)
-        setting_always_send_emails: Paprastai pranešimai el. paštu nebus siunčiami, kai aktyviai naudoji Mastodon
-        setting_default_sensitive: Jautrioji medija pagal numatytuosius nustatymus yra paslėpta ir gali būti atskleista paspaudus
+        setting_aggregate_reblogs: Nerodyti naujų pakėlimų įrašams, kurie neseniai buvo pakelti (taikoma tik naujai gautiems pakėlimams).
+        setting_always_send_emails: Paprastai el. laiško pranešimai nebus siunčiami, kai aktyviai naudoji Mastodon.
+        setting_default_sensitive: Jautrioji medija pagal numatytuosius nustatymus yra paslėpta ir gali būti atskleista spustelėjus.
         setting_display_media_default: Slėpti mediją, pažymėtą kaip jautrią
         setting_display_media_hide_all: Visada slėpti mediją
         setting_display_media_show_all: Visada rodyti mediją
-        setting_use_blurhash: Gradientai pagrįsti paslėptų vaizdų spalvomis, tačiau užgožia bet kokias detales
-        setting_use_pending_items: Slėpti laiko skalės naujienas po paspaudimo, vietoj automatinio kanalo slinkimo
+        setting_use_blurhash: Gradientai pagrįsti paslėptų vizualizacijų spalvomis, bet užgožia bet kokias detales.
+        setting_use_pending_items: Slėpti laiko skalės naujienas po paspaudimo, vietoj automatinio srauto slinkimo.
         username: Gali naudoti raides, skaičius ir pabraukimus
         whole_word: Kai raktažodis ar frazė yra tik raidinis ir skaitmeninis, jis bus taikomas tik tada, jei atitiks visą žodį
       email_domain_block:
@@ -76,6 +76,7 @@ lt:
         activity_api_enabled: Vietinių paskelbtų įrašų, aktyvių naudotojų ir naujų registracijų skaičiai kas savaitę
         backups_retention_period: Naudotojai gali generuoti savo įrašų archyvus, kuriuos vėliau galės atsisiųsti. Nustačius teigiamą reikšmę, šie archyvai po nurodyto dienų skaičiaus bus automatiškai ištrinti iš saugyklos.
         content_cache_retention_period: Visi įrašai iš kitų serverių (įskaitant pakėlimus ir atsakymus) bus ištrinti po nurodyto dienų skaičiaus, neatsižvelgiant į bet kokią vietinio naudotojo sąveiką su tais įrašais. Tai taikoma ir tiems įrašams, kuriuos vietinis naudotojas yra pažymėjęs kaip žymes ar mėgstamus. Privačios paminėjimai tarp naudotojų iš skirtingų instancijų taip pat bus prarastos ir jų bus neįmanoma atkurti. Šis nustatymas skirtas naudoti ypatingos paskirties instancijose, o įgyvendinus jį bendram naudojimui, pažeidžiami daugelio naudotojų lūkesčiai.
+        mascot: Pakeičia išplėstinės žiniatinklio sąsajos iliustraciją.
         media_cache_retention_period: Nuotolinių naudotojų įrašytų įrašų medijos failai talpinami tavo serveryje. Nustačius teigiamą reikšmę, medijos bus ištrinamos po nurodyto dienų skaičiaus. Jei medijos duomenų bus paprašyta po to, kai jie bus ištrinti, jie bus atsiųsti iš naujo, jei šaltinio turinys vis dar prieinamas. Dėl apribojimų, susijusių su nuorodų peržiūros kortelių apklausos dažnumu trečiųjų šalių svetainėse, rekomenduojama nustatyti šią reikšmę ne trumpesnę kaip 14 dienų, kitaip nuorodų peržiūros kortelės nebus atnaujinamos pagal pareikalavimą iki to laiko.
         peers_api_enabled: Domenų pavadinimų sąrašas, su kuriais šis serveris susidūrė fediverse. Čia nėra duomenų apie tai, ar tu bendrauji su tam tikru serveriu, tik apie tai, kad tavo serveris apie jį žino. Tai naudojama tarnybose, kurios renka federacijos statistiką bendrąja prasme.
         site_contact_email: Kaip žmonės gali su tavimi susisiekti teisiniais ar pagalbos užklausimais.
@@ -91,11 +92,13 @@ lt:
         webauthn: Jei tai USB raktas, būtinai jį įkišk ir, jei reikia, paspausk.
       settings:
         indexable: Tavo profilio puslapis gali būti rodomas paieškos rezultatuose Google, Bing ir kituose.
+        show_application: Neatsižvelgiant į tai, visada galėsi matyti, kuri programėlė paskelbė tavo įrašą.
       user:
-        chosen_languages: Kai pažymėta, viešose laiko skalėse bus rodomi tik įrašai pasirinktomis kalbomis
+        chosen_languages: Kai pažymėta, viešose laiko skalėse bus rodomi tik įrašai pasirinktomis kalbomis.
         role: Vaidmuo valdo, kokius leidimus naudotojas (-a) turi
     labels:
       account:
+        discoverable: Rekomenduoti profilį ir įrašus į atradimo algoritmus
         indexable: Įtraukti viešus įrašus į paieškos rezultatus
         show_collections: Rodyti sekimus ir sekėjus profilyje
         unlocked: Automatiškai priimti naujus sekėjus
@@ -118,19 +121,26 @@ lt:
         note: Biografija
         password: Slaptažodis
         phrase: Raktažodis arba frazė
+        setting_advanced_layout: Įjungti išplėstinę žiniatinklio sąsają
+        setting_aggregate_reblogs: Grupuoti pakėlimus laiko skalėse
+        setting_always_send_emails: Visada siųsti el. laiško pranešimus
         setting_auto_play_gif: Automatiškai leisti animuotų GIF
         setting_boost_modal: Rodyti patvirtinimo dialogą prieš pakėliant įrašą
         setting_default_language: Skelbimo kalba
         setting_default_privacy: Skelbimo privatumas
         setting_default_sensitive: Visada žymėti mediją kaip jautrią
         setting_delete_modal: Rodyti patvirtinimo dialogą prieš ištrinant įrašą
+        setting_disable_swiping: Išjungti perbraukimo judėjimus
         setting_display_media: Medijos rodymas
         setting_display_media_hide_all: Slėpti viską
         setting_display_media_show_all: Rodyti viską
         setting_expand_spoilers: Visada išplėsti įrašus, pažymėtus turinio įspėjimais
         setting_hide_network: Slėpti savo socialinę diagramą
+        setting_reduce_motion: Sumažinti judėjimą animacijose
         setting_system_font_ui: Naudoti numatytąjį sistemos šriftą
         setting_theme: Svetainės tema
+        setting_trends: Rodyti šiandienos trendus
+        setting_use_blurhash: Rodyti spalvingus paslėptos medijos gradientus
         setting_use_pending_items: Lėtas režimas
         title: Pavadinimas
         type: Importo tipas
@@ -175,6 +185,7 @@ lt:
         hint: Papildoma informacija
         text: Taisyklė
       settings:
+        indexable: Įtraukti profilio puslapį į paieškos variklius
         show_application: Rodyti, iš kurios programėles išsiuntei įrašą
       tag:
         listable: Leisti šį saitažodį rodyti paieškose ir pasiūlymuose
diff --git a/config/locales/simple_form.nl.yml b/config/locales/simple_form.nl.yml
index 3b100531966413..8bc717fe1fa172 100644
--- a/config/locales/simple_form.nl.yml
+++ b/config/locales/simple_form.nl.yml
@@ -77,11 +77,13 @@ nl:
           warn: Verberg de gefilterde inhoud achter een waarschuwing, met de titel van het filter als waarschuwingstekst
       form_admin_settings:
         activity_api_enabled: Aantallen lokaal gepubliceerde berichten, actieve gebruikers en nieuwe registraties per week
+        app_icon: WEBP, PNG, GIF of JPG. Vervangt op mobiele apparaten het standaard app-pictogram met een aangepast pictogram.
         backups_retention_period: Gebruikers hebben de mogelijkheid om archieven van hun berichten te genereren om later te downloaden. Indien ingesteld op een positieve waarde, worden deze archieven automatisch verwijderd uit jouw opslag na het opgegeven aantal dagen.
         bootstrap_timeline_accounts: Deze accounts worden bovenaan de aanbevelingen aan nieuwe gebruikers getoond. Meerdere gebruikersnamen met komma's scheiden.
         closed_registrations_message: Weergegeven wanneer registratie van nieuwe accounts is uitgeschakeld
         content_cache_retention_period: Alle berichten van andere servers (inclusief boosts en reacties) worden verwijderd na het opgegeven aantal dagen, ongeacht enige lokale gebruikersinteractie met die berichten. Dit betreft ook berichten die een lokale gebruiker aan diens bladwijzers heeft toegevoegd of als favoriet heeft gemarkeerd. Privéberichten tussen gebruikers van verschillende servers gaan ook verloren en zijn onmogelijk te herstellen. Het gebruik van deze instelling is bedoeld voor servers die een speciaal doel dienen en overtreedt veel gebruikersverwachtingen wanneer deze voor algemeen gebruik wordt geïmplementeerd.
         custom_css: Je kunt aangepaste CSS toepassen op de webversie van deze Mastodon-server.
+        favicon: WEBP, PNG, GIF of JPG. Vervangt de standaard Mastodon favicon met een aangepast pictogram.
         mascot: Overschrijft de illustratie in de geavanceerde webomgeving.
         media_cache_retention_period: Mediabestanden van berichten van externe gebruikers worden op jouw server in de cache opgeslagen. Indien ingesteld op een positieve waarde, worden media verwijderd na het opgegeven aantal dagen. Als de mediagegevens worden opgevraagd nadat ze zijn verwijderd, worden ze opnieuw gedownload wanneer de originele inhoud nog steeds beschikbaar is. Vanwege beperkingen op hoe vaak linkvoorbeelden sites van derden raadplegen, wordt aanbevolen om deze waarde in te stellen op ten minste 14 dagen. Anders worden linkvoorbeelden niet op aanvraag bijgewerkt.
         peers_api_enabled: Een lijst met domeinnamen die deze server heeft aangetroffen in de fediverse. Er zijn hier geen gegevens inbegrepen over de vraag of je verbonden bent met een bepaalde server, alleen dat je server er van weet. Dit wordt gebruikt door diensten die statistieken over de federatie in algemene zin verzamelen.
diff --git a/config/locales/simple_form.nn.yml b/config/locales/simple_form.nn.yml
index 51dce245d2f62b..bdd3db040d1b38 100644
--- a/config/locales/simple_form.nn.yml
+++ b/config/locales/simple_form.nn.yml
@@ -77,6 +77,7 @@ nn:
           warn: Skjul det filtrerte innhaldet bak ei åtvaring som nemner tittelen på filteret
       form_admin_settings:
         activity_api_enabled: Tal på lokale innlegg, aktive brukarar og nyregistreringar kvar veke
+        app_icon: WEBP, PNG, GIF eller JPG. Overstyrer standard-ikonet på mobile einingar med eit tilpassa ikon.
         backups_retention_period: Brukarar har moglegheit til å generere arkiv av sine innlegg for å laste ned seinare. Når sett til ein positiv verdi, blir desse arkiva automatisk sletta frå lagringa etter eit gitt antal dagar.
         bootstrap_timeline_accounts: Desse kontoane vil bli festa øverst på fylgjaranbefalingane til nye brukarar.
         closed_registrations_message: Vist når det er stengt for registrering
diff --git a/config/locales/simple_form.pl.yml b/config/locales/simple_form.pl.yml
index 5c0c6402879552..9d82384af9d4a9 100644
--- a/config/locales/simple_form.pl.yml
+++ b/config/locales/simple_form.pl.yml
@@ -77,11 +77,13 @@ pl:
           warn: Ukryj filtrowaną zawartość za ostrzeżeniem wskazującym tytuł filtra
       form_admin_settings:
         activity_api_enabled: Liczby opublikowanych lokalnych postów, aktywnych użytkowników i nowych rejestracji w tygodniowych przedziałach
+        app_icon: WEBP, PNG, GIF, albo JPEG. Nadpisuje domyślną ikonę aplikacji na urządzeniach mobilnych.
         backups_retention_period: Użytkownicy mogą generować archiwa wpisów do późniejszego pobrania. Jeżeli ta wartość jest dodatnia, te archiwa zostaną automatycznie usunięte z twojego serwera po danej liczbie dni.
         bootstrap_timeline_accounts: Te konta zostaną przypięte na górze rekomendacji obserwacji nowych użytkowników.
         closed_registrations_message: Wyświetlane po zamknięciu rejestracji
         content_cache_retention_period: Wszystkie wpisy z innych serwerów (w tym podbicia i odpowiedzi) zostaną usunięte po danej liczbie dni, bez względu na interakcje z nimi twoich użytkowników. Zawierają się w tym wpisy, które twoi użytkownicy dodali do zakładek lub ulubionych. Prywatne wzmianki od innych instancji zostaną utracone i będą nieprzywracalne. To ustawienie jest przeznaczone dla instancji zastosowania specjalnego i jest niezgodne z wieloma oczekiwaniami użytkowników.
         custom_css: Możesz zastosować niestandardowe style w internetowej wersji Mastodon.
+        favicon: WEBP, PNG, GIF, albo JPEG. Nadpisuje domyślną faviconę Mastodona.
         mascot: Nadpisuje ilustrację w zaawansowanym interfejsie internetowym.
         media_cache_retention_period: Media z wpisów od obcych użytkowników są cache'owane na twoim serwerze. Kiedy dana wartość jest dodatnia, media te będą usunięte po tylu dniach. Jeżeli usunięte media zostaną potem zażądane, oryginał zostanie ponownie pobrany (o ile jest dalej dostępny). Z powodu ograniczeń dot. częstotliwości z jaką karty podglądu linków dopytują się o dane od stron trzecich, zalecana wartość to min. 14 dni, bo karty podglądu linków nie będą wcześniej odświeżane na żądane.
         peers_api_enabled: Lista nazw domen, z którymi ten serwer spotkał się w fediverse. Nie są tu zawarte żadne dane o tym, czy użytkownik dokonuje federacji z danym serwerem, a jedynie, że jego serwer o tym wie. Jest to wykorzystywane przez serwisy, które zbierają statystyki dotyczące federacji w ogólnym sensie.
diff --git a/config/locales/simple_form.pt-PT.yml b/config/locales/simple_form.pt-PT.yml
index a26468894b9a33..7fcbb210c5b145 100644
--- a/config/locales/simple_form.pt-PT.yml
+++ b/config/locales/simple_form.pt-PT.yml
@@ -77,11 +77,13 @@ pt-PT:
           warn: Ocultar o conteúdo filtrado por trás de um aviso mencionando o título do filtro
       form_admin_settings:
         activity_api_enabled: Contagem, em blocos semanais, de publicações locais, utilizadores ativos e novos registos
+        app_icon: WEBP, PNG, GIF ou JPG. Substitui o ícone padrão do aplicativo em dispositivos móveis por um ícone personalizado.
         backups_retention_period: Os utilizadores têm a possibilidade de gerar arquivos das suas mensagens para descarregar mais tarde. Quando definido para um valor positivo, estes arquivos serão automaticamente eliminados do seu armazenamento após o número de dias especificado.
         bootstrap_timeline_accounts: Estas contas serão destacadas no topo das recomendações aos novos utilizadores.
         closed_registrations_message: Apresentado quando as inscrições estiverem encerradas
         content_cache_retention_period: Todas as publicações de outros servidores (incluindo boosts e respostas) serão eliminadas após o número de dias especificado, independentemente de qualquer interação do utilizador local com essas publicações. Isto inclui publicações em que um utilizador local as tenha marcado como favoritas ou adicionado aos items salvos. As menções privadas entre utilizadores de instâncias diferentes também se perderão e serão impossíveis de restaurar. A utilização desta definição destina-se a instâncias para fins especiais e quebra muitas expectativas dos utilizadores quando implementada para utilização geral.
         custom_css: Pode aplicar estilos personalizados na versão web do Mastodon.
+        favicon: WEBP, PNG, GIF ou JPG. Substitui o ícone de favorito padrão do Mastodon por um ícone personalizado.
         mascot: Sobrepõe-se à ilustração na interface web avançada.
         media_cache_retention_period: Os ficheiros multimédia de publicações feitas por utilizadores remotos são armazenados em cache no seu servidor. Quando definido para um valor positivo, os ficheiros multimédia serão eliminados após o número de dias especificado. Se os ficheiros multimédia forem solicitados depois de terem sido eliminados, serão transferidos novamente, se o conteúdo de origem ainda estiver disponível. Devido a restrições sobre a frequência com que os cartões de pré-visualização de links pesquisam sites de terceiros, recomenda-se que este valor seja definido para, pelo menos, 14 dias, ou os cartões de pré-visualização de links não serão atualizados a pedido antes desse período.
         peers_api_enabled: Uma lista de nomes de domínio que este servidor encontrou no fediverso. Nenhum dado é incluído aqui sobre se você federa com um determinado servidor, apenas que o seu servidor o conhece. Este serviço é utilizado por serviços que recolhem estatísticas na federação, em termos gerais.
diff --git a/config/locales/simple_form.sr-Latn.yml b/config/locales/simple_form.sr-Latn.yml
index 6bee31a42c73a4..8dd19865636755 100644
--- a/config/locales/simple_form.sr-Latn.yml
+++ b/config/locales/simple_form.sr-Latn.yml
@@ -77,11 +77,13 @@ sr-Latn:
           warn: Sakrij filtrirani sadržaj iza upozorenja u kome se navodi naziv filtera
       form_admin_settings:
         activity_api_enabled: Brojevi lokalno postavljenih objava, aktivnih korisnika i novih registracija na nedeljnoj bazi
+        app_icon: WEBP, PNG, GIF ili JPG. Zamenjuje podrazumevanu ikonicu aplikacije na mobilnim uređajima prilagođenom ikonicom.
         backups_retention_period: Korisnici imaju mogućnost da generišu arhive svojih objava za kasnije preuzimanje. Kada se podese na pozitivnu vrednost, ove arhive će se automatski izbrisati iz vašeg skladišta nakon navedenog broja dana.
         bootstrap_timeline_accounts: Ovi nalozi će biti zakačeni na vrh preporuka za praćenje novih korisnika.
         closed_registrations_message: Prikazuje se kada su registracije zatvorene
         content_cache_retention_period: Sve objave sa drugih servera (uključujući podržavanja i odgovore) će biti izbrisane nakon navedenog broja dana, bez obzira na bilo kakvu interakciju lokalnog korisnika sa tim objavama. Ovo uključuje objave u kojima ih je lokalni korisnik označio kao obeleživače ili omiljene. Privatna pominjanja između korisnika sa različitih instanci će takođe biti izgubljena i nemoguće ih je vratiti. Korišćenje ove postavke je namenjeno za slučajeve posebne namene i krši mnoga očekivanja korisnika kada se primeni za upotrebu opšte namene.
         custom_css: Možete da primenite prilagođene stilove na veb verziji Mastodon-a.
+        favicon: WEBP, PNG, GIF ili JPG. Zamenjuje podrazumevani Mastodon favikon prilagođenom ikonicom.
         mascot: Zamenjuje ilustraciju u naprednom veb okruženju.
         media_cache_retention_period: Medijske datoteke iz objava udaljenih korisnika se keširaju na vašem serveru. Kada se podesi na pozitivnu vrednost, mediji će biti izbrisani nakon navedenog broja dana. Ako se medijski podaci zahtevaju nakon brisanja, biće ponovo preuzeti, ako je izvorni sadržaj i dalje dostupan. Zbog ograničenja koliko često kartice za pregled veza anketiraju sajtove trećih strana, preporučuje se da ovu vrednost postavite na najmanje 14 dana, inače kartice za pregled veza neće biti ažurirane na zahtev pre tog vremena.
         peers_api_enabled: Lista domena sa kojima se ovaj server susreo u fediverzumu. Ovde nisu sadržani podaci o tome da li se Vaš server federiše sa drugim serverima, već samo da Vaš server zna za njih. Ove informacije koriste servisi koji prikupljaju podatke i vode statistiku o federaciji u širem smislu.
diff --git a/config/locales/simple_form.sr.yml b/config/locales/simple_form.sr.yml
index 4ec8374075188a..e88a99df13af7d 100644
--- a/config/locales/simple_form.sr.yml
+++ b/config/locales/simple_form.sr.yml
@@ -77,11 +77,13 @@ sr:
           warn: Сакриј филтрирани садржај иза упозорења у коме се наводи назив филтера
       form_admin_settings:
         activity_api_enabled: Бројеви локално постављених објава, активних корисника и нових регистрација на недељној бази
+        app_icon: WEBP, PNG, GIF или JPG. Замењује подразумевану иконицу апликације на мобилним уређајима прилагођеном иконицом.
         backups_retention_period: Корисници имају могућност да генеришу архиве својих објава за касније преузимање. Када се подесе на позитивну вредност, ове архиве ће се аутоматски избрисати из вашег складишта након наведеног броја дана.
         bootstrap_timeline_accounts: Ови налози ће бити закачени на врх препорука за праћење нових корисника.
         closed_registrations_message: Приказује се када су регистрације затворене
         content_cache_retention_period: Све објаве са других сервера (укључујући подржавања и одговоре) ће бити избрисане након наведеног броја дана, без обзира на било какву интеракцију локалног корисника са тим објавама. Ово укључује објаве у којима их је локални корисник означио као обележиваче или омиљене. Приватна помињања између корисника са различитих инстанци ће такође бити изгубљена и немогуће их је вратити. Коришћење ове поставке је намењено за случајеве посебне намене и крши многа очекивања корисника када се примени за употребу опште намене.
         custom_css: Можете да примените прилагођене стилове на веб верзији Mastodon-а.
+        favicon: WEBP, PNG, GIF или JPG. Замењује подразумевани Mastodon фавикон прилагођеном иконицом.
         mascot: Замењује илустрацију у напредном веб окружењу.
         media_cache_retention_period: Медијске датотеке из објава удаљених корисника се кеширају на вашем серверу. Када се подеси на позитивну вредност, медији ће бити избрисани након наведеног броја дана. Ако се медијски подаци захтевају након брисања, биће поново преузети, ако је изворни садржај и даље доступан. Због ограничења колико често картице за преглед веза анкетирају сајтове трећих страна, препоручује се да ову вредност поставите на најмање 14 дана, иначе картице за преглед веза неће бити ажуриране на захтев пре тог времена.
         peers_api_enabled: Листа домена са којима се овај сервер сусрео у федиверзуму. Овде нису садржани подаци о томе да ли се Ваш сервер федерише са другим серверима, већ само да Ваш сервер зна за њих. Ове информације користе сервиси који прикупљају податке и воде статистику о федерацији у ширем смислу.
diff --git a/config/locales/simple_form.th.yml b/config/locales/simple_form.th.yml
index e68642c2f636dc..0816efcc5f343b 100644
--- a/config/locales/simple_form.th.yml
+++ b/config/locales/simple_form.th.yml
@@ -77,12 +77,15 @@ th:
           warn: ซ่อนเนื้อหาที่กรองอยู่หลังคำเตือนที่กล่าวถึงชื่อเรื่องของตัวกรอง
       form_admin_settings:
         activity_api_enabled: จำนวนโพสต์ที่เผยแพร่ในเซิร์ฟเวอร์, ผู้ใช้ที่ใช้งานอยู่ และการลงทะเบียนใหม่ในบักเก็ตรายสัปดาห์
+        app_icon: WEBP, PNG, GIF หรือ JPG เขียนทับไอคอนแอปเริ่มต้นในอุปกรณ์มือถือด้วยไอคอนที่กำหนดเอง
         backups_retention_period: ผู้ใช้มีความสามารถในการสร้างการเก็บถาวรของโพสต์ของเขาเพื่อดาวน์โหลดในภายหลัง เมื่อตั้งเป็นค่าบวก จะลบการเก็บถาวรเหล่านี้ออกจากที่เก็บข้อมูลของคุณโดยอัตโนมัติหลังจากจำนวนวันที่ระบุ
         bootstrap_timeline_accounts: จะปักหมุดบัญชีเหล่านี้ไว้ด้านบนสุดของคำแนะนำการติดตามของผู้ใช้ใหม่
         closed_registrations_message: แสดงเมื่อมีการปิดการลงทะเบียน
         content_cache_retention_period: จะลบโพสต์ทั้งหมดจากเซิร์ฟเวอร์อื่น ๆ (รวมถึงการดันและการตอบกลับ) หลังจากจำนวนวันที่ระบุ โดยไม่คำนึงถึงการโต้ตอบใด ๆ ของผู้ใช้ในเซิร์ฟเวอร์กับโพสต์เหล่านั้น สิ่งนี้รวมถึงโพสต์ที่ผู้ใช้ในเซิร์ฟเวอร์ได้ทำเครื่องหมายโพสต์ว่าเป็นที่คั่นหน้าหรือรายการโปรด การกล่าวถึงแบบส่วนตัวระหว่างผู้ใช้จากอินสแตนซ์ที่แตกต่างกันจะหายไปและไม่สามารถคืนค่าได้เช่นกัน การใช้การตั้งค่านี้มีไว้สำหรับอินสแตนซ์ที่มีวัตถุประสงค์พิเศษและทำลายความคาดหวังของผู้ใช้จำนวนมากเมื่อนำไปใช้สำหรับการใช้งานที่มีวัตถุประสงค์ทั่วไป
         custom_css: คุณสามารถนำไปใช้ลักษณะที่กำหนดเองใน Mastodon รุ่นเว็บ
+        favicon: WEBP, PNG, GIF หรือ JPG เขียนทับ Favicon ของ Mastodon เริ่มต้นด้วยไอคอนที่กำหนดเอง
         mascot: เขียนทับภาพประกอบในส่วนติดต่อเว็บขั้นสูง
+        media_cache_retention_period: จะแคชไฟล์สื่อจากโพสต์ที่สร้างโดยผู้ใช้ระยะไกลในเซิร์ฟเวอร์ของคุณ เมื่อตั้งเป็นค่าบวก จะลบสื่อหลังจากจำนวนวันที่ระบุ หากมีการขอข้อมูลสื่อหลังจากมีการลบสื่อ จะดาวน์โหลดสื่อใหม่ หากเนื้อหาต้นฉบับยังคงใช้งานได้ เนื่องจากข้อจำกัดเกี่ยวกับความถี่ที่บัตรตัวอย่างลิงก์สำรวจไซต์จากบุคคลที่สาม ขอแนะนำให้ตั้งค่านี้เป็นอย่างน้อย 14 วัน มิฉะนั้นจะไม่อัปเดตบัตรตัวอย่างลิงก์ตามความต้องการก่อนเวลานั้น
         peers_api_enabled: รายการชื่อโดเมนที่เซิร์ฟเวอร์นี้พบในจักรวาลสหพันธ์ ไม่มีข้อมูลรวมอยู่ที่นี่เกี่ยวกับว่าคุณติดต่อกับเซิร์ฟเวอร์ที่กำหนดหรือไม่ เพียงแค่ว่าเซิร์ฟเวอร์ของคุณทราบเกี่ยวกับเซิร์ฟเวอร์ที่กำหนด มีการใช้สิ่งนี้โดยบริการที่เก็บรวบรวมสถิติในการติดต่อกับภายนอกในความหมายทั่วไป
         profile_directory: ไดเรกทอรีโปรไฟล์แสดงรายการผู้ใช้ทั้งหมดที่ได้เลือกรับให้สามารถค้นพบได้
         require_invite_text: เมื่อการลงทะเบียนต้องการการอนุมัติด้วยตนเอง ทำให้การป้อนข้อความ “ทำไมคุณจึงต้องการเข้าร่วม?” บังคับแทนที่จะไม่จำเป็น
diff --git a/config/locales/simple_form.tr.yml b/config/locales/simple_form.tr.yml
index 4ec35f102410b0..697417a5415956 100644
--- a/config/locales/simple_form.tr.yml
+++ b/config/locales/simple_form.tr.yml
@@ -77,11 +77,13 @@ tr:
           warn: Süzgeçlenmiş içeriği, süzgecinin başlığından söz eden bir uyarının arkasında gizle
       form_admin_settings:
         activity_api_enabled: Yerel olarak yayınlanan gönderi, etkin kullanıcı ve yeni kayıtların haftalık sayıları
+        app_icon: WEBP, PNG, GIF veya JPG. Mobil aygıtlarda varsayılan uygulama simgesini isteğe bağlı bir simgeyle değiştirir.
         backups_retention_period: Kullanıcılar, gönderilerinin arşivlerini daha sonra indirmek üzere oluşturabilirler. Pozitif bir değer verdilğinde bu arşivler verilmiş olan gün sonunda deponuzdan otomatik olarak silinecektir.
         bootstrap_timeline_accounts: Bu hesaplar, yeni kullanıcıların takip önerilerinin tepesinde sabitlenecektir.
         closed_registrations_message: Kayıt olma kapalıyken görüntülenir
         content_cache_retention_period: Diğer sunuculardaki (öne çıkarma ve yanıtlar da dahil olmak üzere) tüm gönderiler belirlenen gün sonunda, yerel bir kullanıcının etkileşimine bakılmadan, silinecektir. Yerel bir kullanıcının yerimlerine veya favorilerine eklediği gönderiler de dahildir. Farklı sunuculardaki kullanıcılar arasındaki özel bahsetmeler de kaybolacak ve geri getirilmeleri mümkün olmayacaktır. Bu ayarın kullanımı özel amaçlı sunucular içindir ve genel amaçlı kullanımda etkinleştirildiğinde kullanıcı beklentilerini karşılamayabilir.
         custom_css: Mastodon'un web sürümüne özel biçimler uygulayabilirsiniz.
+        favicon: WEBP, PNG, GIF veya JPG. Varsayılan Mastodon simgesini isteğe bağlı bir simgeyle değiştirir.
         mascot: Gelişmiş web arayüzündeki illüstrasyonu geçersiz kılar.
         media_cache_retention_period: Uzak kullanıcıların gönderilerindeki ortam dosyaları sunucunuzda önbelleklenir. Pozitif bir değer verildiğinde, ortam dosyaları belirlenen gün sonunda silinecektir. Eğer ortam dosyaları silindikten sonra istenirse, kaynak içerik hala mevcutsa, tekrar indirilecektir. Bağlantı önizleme kartlarının üçüncü parti siteleri yoklamasına ilişkin kısıtlamalar nedeniyle, bu değeri en azından 14 gün olarak ayarlamanız önerilir, yoksa bağlantı önizleme kartları bu süreden önce isteğe bağlı olarak güncellenmeyecektir.
         peers_api_enabled: Bu sunucunun fediverse'te karşılaştığı alan adlarının bir listesi. İlgili sunucuyla birleştirme mi yapıyorsunuz yoksa sunucunuz sadece onu biliyor mu hakkında bir bilgi burada yok. Bu blgi genel olarak federasyın hakkında istatistik toplamak isteyen hizmetler tarafından kullanılıyor.
diff --git a/config/locales/simple_form.vi.yml b/config/locales/simple_form.vi.yml
index bc9a181ed35d8e..e5063e611225de 100644
--- a/config/locales/simple_form.vi.yml
+++ b/config/locales/simple_form.vi.yml
@@ -77,11 +77,13 @@ vi:
           warn: Ẩn nội dung đã lọc đằng sau một cảnh báo đề cập đến tiêu đề của bộ lọc
       form_admin_settings:
         activity_api_enabled: Số lượng tút được đăng trong máy chủ, người dùng đang hoạt động và đăng ký mới hàng tuần
+        app_icon: WEBP, PNG, GIF hoặc JPG. Dùng biểu tượng tùy chỉnh trên thiết bị di động.
         backups_retention_period: Người dùng có khả năng tạo bản sao lưu các tút của họ để tải xuống sau. Các bản sao lưu này sẽ tự động bị xóa khỏi bộ nhớ của bạn sau số ngày được chỉ định.
         bootstrap_timeline_accounts: Những người này sẽ được ghim vào đầu các gợi ý theo dõi của người mới.
         closed_registrations_message: Được hiển thị khi đóng đăng ký
         content_cache_retention_period: Tất cả tút từ các máy chủ khác (bao gồm cả đăng lại và trả lời) sẽ bị xóa sau số ngày được chỉ định mà không tính đến bất kỳ tương tác nào của người dùng cục bộ với các tút đó. Điều này bao gồm các tút mà người dùng cục bộ đã đánh dấu nó là dấu trang hoặc mục yêu thích. Những lượt nhắc riêng tư giữa những người dùng từ các máy chủ khác nhau cũng sẽ bị mất và không thể khôi phục. Việc sử dụng cài đặt này dành cho các trường hợp có mục đích đặc biệt và phá vỡ nhiều kỳ vọng của người dùng khi được triển khai cho mục đích sử dụng chung.
         custom_css: Bạn có thể tùy chỉnh phong cách trên bản web của Mastodon.
+        favicon: WEBP, PNG, GIF hoặc JPG. Dùng favicon Maston tùy chỉnh.
         mascot: Ghi đè hình minh họa trong giao diện web nâng cao.
         media_cache_retention_period: Các tệp phương tiện từ các tút do người dùng máy chủ khác thực hiện sẽ được lưu vào bộ đệm trên máy chủ của bạn. Khi được đặt thành giá trị dương, phương tiện sẽ bị xóa sau số ngày được chỉ định. Nếu dữ liệu phương tiện được yêu cầu sau khi bị xóa, dữ liệu đó sẽ được tải xuống lại nếu nội dung nguồn vẫn còn. Do những hạn chế về tần suất thẻ xem trước liên kết thăm dò ý kiến ​​các trang web của bên thứ ba, bạn nên đặt giá trị này thành ít nhất 14 ngày, nếu không thẻ xem trước liên kết sẽ không được cập nhật theo yêu cầu trước thời gian đó.
         peers_api_enabled: Danh sách các máy chủ khác mà máy chủ này đã liên hợp. Không có dữ liệu nào được đưa vào đây về việc bạn có liên kết với một máy chủ nhất định hay không, chỉ là máy chủ của bạn biết về nó. Điều này được sử dụng bởi các dịch vụ thu thập số liệu thống kê về liên kết theo nghĩa chung.
diff --git a/config/locales/simple_form.zh-CN.yml b/config/locales/simple_form.zh-CN.yml
index a06a5ab4e46d9e..6058cc00cff3ac 100644
--- a/config/locales/simple_form.zh-CN.yml
+++ b/config/locales/simple_form.zh-CN.yml
@@ -77,11 +77,13 @@ zh-CN:
           warn: 在警告中提及过滤器标题后，隐藏过滤内容
       form_admin_settings:
         activity_api_enabled: 本站每周的嘟文数、活跃用户数和新注册用户数
+        app_icon: WEBP、PNG、GIF 或 JPG。使用自定义图标覆盖移动设备上的默认应用图标。
         backups_retention_period: 用户可以生成其嘟文存档以供之后下载。当该值被设为正值时，这些存档将在指定的天数后自动从您的存储中删除。
         bootstrap_timeline_accounts: 这些账号将在新用户关注推荐中置顶。
         closed_registrations_message: 在关闭注册时显示
         content_cache_retention_period: 来自其它实例的所有嘟文（包括转嘟与回复）都将在指定天数后被删除，不论本实例用户是否与这些嘟文产生过交互。这包括被本实例用户喜欢和收藏的嘟文。实例间用户的私下提及也将丢失并无法恢复。此设置针对的是特殊用途的实例，用于一般用途时会打破许多用户的期望。
         custom_css: 你可以为网页版 Mastodon 应用自定义样式。
+        favicon: WEBP、PNG、GIF 或 JPG。使用自定义图标覆盖 Mastodon 的默认图标。
         mascot: 覆盖高级网页界面中的绘图形象。
         media_cache_retention_period: 来自外站用户嘟文的媒体文件将被缓存到你的实例上。当该值被设为正值时，缓存的媒体文件将在指定天数后被清除。如果媒体文件在被清除后重新被请求，且源站内容仍然可用，它将被重新下载。由于链接预览卡拉取第三方站点的频率受到限制，建议将此值设置为至少 14 天，如果小于该值，链接预览卡将不会按需更新。
         peers_api_enabled: 此服务器在联邦宇宙中遇到的域名列表。 这里不包含关于您是否与给定服务器联合的数据，只是您的服务器知道它。 这由收集一般意义上的联邦统计信息的服务使用。
diff --git a/config/locales/simple_form.zh-TW.yml b/config/locales/simple_form.zh-TW.yml
index a9e5921be00d07..b7a67c6a6fb8a9 100644
--- a/config/locales/simple_form.zh-TW.yml
+++ b/config/locales/simple_form.zh-TW.yml
@@ -77,11 +77,13 @@ zh-TW:
           warn: 隱藏過濾內容於過濾器標題之警告後
       form_admin_settings:
         activity_api_enabled: 本站使用者的嘟文數量，以及本站的活躍使用者與一週內新使用者數量
+        app_icon: WEBP、PNG、GIF、或 JPG。於行動裝置上使用自訂圖示替代預設應用程式圖示。
         backups_retention_period: 使用者能產生他們嘟文的備份以便日後下載。當設定為正值時，這些嘟文備份將於指定之天數後自您的儲存空間中自動刪除。
         bootstrap_timeline_accounts: 這些帳號將被釘選於新帳號跟隨推薦之上。
         closed_registrations_message: 於註冊關閉時顯示
         content_cache_retention_period: 所有來自其他伺服器之嘟文（包括轉嘟與回嘟）將於指定之天數後自動刪除，不論這些嘟文與本地使用者間的任何互動。這將包含本地使用者已標記為書籤或最愛之嘟文。不同站點使用者間之私訊亦將遺失且不可回復。此設定應適用於特殊情況，若常規使用將超乎多數使用者預期。
         custom_css: 您於 Mastodon 網頁版本中能套用客製化風格。
+        favicon: WEBP、PNG、GIF、或 JPG。使用自訂圖示替代預設 Mastodon favicon 圖示。
         mascot: 覆寫進階網頁介面中的圖例。
         media_cache_retention_period: 來自遠端伺服器嘟文中之多媒體內容將快取於您的伺服器。當設定為正值時，這些多媒體內容將於指定之天數後自您的儲存空間中自動刪除。若多媒體資料於刪除後被請求，且原始內容仍可存取，它們將被重新下載。由於連結預覽中第三方網站查詢頻率限制，建議將其設定為至少 14 日，否則於此之前連結預覽將不被即時更新。
         peers_api_enabled: 浩瀚聯邦宇宙中與此伺服器曾經擦肩而過的網域列表。不包含關於您是否與此伺服器是否有與之串連，僅僅表示您的伺服器已知此網域。這是供收集聯邦宇宙中一般性統計資料服務使用。

From 8540004f7b473df47e49d8dc5397ff590245553a Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 7 May 2024 09:39:04 +0000
Subject: [PATCH 0964/2191] Update dependency dotenv to v3.1.2 (#30197)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 190888ddb81ba7..23c29cabd2f29a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -217,7 +217,7 @@ GEM
     domain_name (0.6.20240107)
     doorkeeper (5.6.9)
       railties (>= 5)
-    dotenv (3.1.1)
+    dotenv (3.1.2)
     drb (2.2.1)
     ed25519 (1.3.0)
     elasticsearch (7.17.10)

From 5cd13ee4f19c112ea855063c2495e2874746f23a Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 7 May 2024 11:39:20 +0200
Subject: [PATCH 0965/2191] Update dependency aws-sdk-s3 to v1.149.1 (#30196)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 23c29cabd2f29a..435144700f255f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -101,7 +101,7 @@ GEM
     awrence (1.2.1)
     aws-eventstream (1.3.0)
     aws-partitions (1.922.0)
-    aws-sdk-core (3.194.0)
+    aws-sdk-core (3.194.1)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.8)
@@ -109,7 +109,7 @@ GEM
     aws-sdk-kms (1.80.0)
       aws-sdk-core (~> 3, >= 3.193.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.149.0)
+    aws-sdk-s3 (1.149.1)
       aws-sdk-core (~> 3, >= 3.194.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.8)

From c9ccba7045f1127be0d89bf941b9ba381e2cb722 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 7 May 2024 14:43:11 +0200
Subject: [PATCH 0966/2191] Update dependency sass to v1.77.0 (#30200)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 399dae2057e497..95a3923e25d008 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -15320,15 +15320,15 @@ __metadata:
   linkType: hard
 
 "sass@npm:^1.62.1":
-  version: 1.76.0
-  resolution: "sass@npm:1.76.0"
+  version: 1.77.0
+  resolution: "sass@npm:1.77.0"
   dependencies:
     chokidar: "npm:>=3.0.0 <4.0.0"
     immutable: "npm:^4.0.0"
     source-map-js: "npm:>=0.6.2 <2.0.0"
   bin:
     sass: sass.js
-  checksum: 10c0/976baf2c378e104f8d4ffca5375c8aa6f3d24f59d5c0a5db8d68a51f89edce45dedc25cfcd304b309fc8568d146de9e2c6cd189395e97bb2840d39feb13932ff
+  checksum: 10c0/bce0e5f5b535491e4e775045a79f19cbe10d800ef53b5f7698958d2992505d7b124c968169b05a0190842d8e0a24c2aa6d75dfbdd7c213820d9d59e227009c19
   languageName: node
   linkType: hard
 

From d8c428472356abd70aaf1f514b99114464ee7f61 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 7 May 2024 20:15:17 +0200
Subject: [PATCH 0967/2191] Ensure custom favicon is converted to PNG and ICO
 (#30208)

---
 app/models/site_upload.rb               | 19 +++++++++++++++++--
 app/views/layouts/application.html.haml |  2 +-
 config/imagemagick/policy.xml           |  2 +-
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/app/models/site_upload.rb b/app/models/site_upload.rb
index b3926ec7ed5986..6431d1007d1434 100644
--- a/app/models/site_upload.rb
+++ b/app/models/site_upload.rb
@@ -26,8 +26,23 @@ class SiteUpload < ApplicationRecord
   APP_ICON_SIZES = (APPLE_ICON_SIZES + ANDROID_ICON_SIZES).uniq.freeze
 
   STYLES = {
-    app_icon: APP_ICON_SIZES.each_with_object({}) { |size, hash| hash[size.to_s.to_sym] = "#{size}x#{size}#" }.freeze,
-    favicon: FAVICON_SIZES.each_with_object({}) { |size, hash| hash[size.to_s.to_sym] = "#{size}x#{size}#" }.freeze,
+    app_icon:
+      APP_ICON_SIZES.to_h do |size|
+        [:"#{size}", { format: 'png', geometry: "#{size}x#{size}#", file_geometry_parser: FastGeometryParser }]
+      end.freeze,
+
+    favicon: {
+      ico: {
+        format: 'ico',
+        geometry: '48x48#',
+        file_geometry_parser: FastGeometryParser,
+      }.freeze,
+    }.merge(
+      FAVICON_SIZES.to_h do |size|
+        [:"#{size}", { format: 'png', geometry: "#{size}x#{size}#", file_geometry_parser: FastGeometryParser }]
+      end
+    ).freeze,
+
     thumbnail: {
       '@1x': {
         format: 'png',
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 56857b2b635c14..e3d05226eefad0 100755
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -11,7 +11,7 @@
     - if storage_host?
       %link{ rel: 'dns-prefetch', href: storage_host }/
 
-    %link{ rel: 'icon', href: site_icon_path('favicon') || '/favicon.ico', type: 'image/x-icon' }/
+    %link{ rel: 'icon', href: site_icon_path('favicon', 'ico') || '/favicon.ico', type: 'image/x-icon' }/
 
     - SiteUpload::FAVICON_SIZES.each do |size|
       %link{ rel: 'icon', sizes: "#{size}x#{size}", href: site_icon_path('favicon', size.to_i) || frontend_asset_path("icons/favicon-#{size}x#{size}.png"), type: 'image/png' }/
diff --git a/config/imagemagick/policy.xml b/config/imagemagick/policy.xml
index e2aa202f274433..2730a9f84e3d46 100644
--- a/config/imagemagick/policy.xml
+++ b/config/imagemagick/policy.xml
@@ -23,5 +23,5 @@
   <!-- Disallow any coder by default, and only enable ones required by Mastodon -->
   <policy domain="coder" rights="none" pattern="*" />
   <policy domain="coder" rights="read | write" pattern="{JPEG,PNG,GIF,WEBP,HEIC,AVIF}" />
-  <policy domain="coder" rights="write" pattern="{HISTOGRAM,RGB,INFO}" />
+  <policy domain="coder" rights="write" pattern="{HISTOGRAM,RGB,INFO,ICO}" />
 </policymap>

From 5a3062f723abefe4ec49898256e1d81b01fbf6f4 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Fri, 10 May 2024 10:00:02 +0200
Subject: [PATCH 0968/2191] Pass the CodeCov token from the secret to the
 action (#30219)

---
 .github/workflows/test-ruby.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/test-ruby.yml b/.github/workflows/test-ruby.yml
index b28f5261c2e886..84b907570837f2 100644
--- a/.github/workflows/test-ruby.yml
+++ b/.github/workflows/test-ruby.yml
@@ -145,6 +145,8 @@ jobs:
         uses: codecov/codecov-action@v4
         with:
           files: coverage/lcov/mastodon.lcov
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 
   test-e2e:
     name: End to End testing

From 6819bcc4b6772075a8fd45b995b9e1bf92ef7868 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 10 May 2024 11:18:52 +0200
Subject: [PATCH 0969/2191] Update dependency glob to v10.3.14 (#30230)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 95a3923e25d008..22f81166f859d2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8882,17 +8882,17 @@ __metadata:
   linkType: hard
 
 "glob@npm:^10.2.2, glob@npm:^10.2.6, glob@npm:^10.3.10, glob@npm:^10.3.7":
-  version: 10.3.12
-  resolution: "glob@npm:10.3.12"
+  version: 10.3.14
+  resolution: "glob@npm:10.3.14"
   dependencies:
     foreground-child: "npm:^3.1.0"
     jackspeak: "npm:^2.3.6"
     minimatch: "npm:^9.0.1"
     minipass: "npm:^7.0.4"
-    path-scurry: "npm:^1.10.2"
+    path-scurry: "npm:^1.11.0"
   bin:
     glob: dist/esm/bin.mjs
-  checksum: 10c0/f60cefdc1cf3f958b2bb5823e1b233727f04916d489dc4641d76914f016e6704421e06a83cbb68b0cb1cb9382298b7a88075b844ad2127fc9727ea22b18b0711
+  checksum: 10c0/19126e53b99c94dea9b3509500e22b325e24d2674523fc95b9fe710f1549ad7e091fbb0704c325c53d3a172fc21a8251acce5395c4f3efd872a2e65a376c82a1
   languageName: node
   linkType: hard
 
@@ -12770,13 +12770,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"path-scurry@npm:^1.10.2":
-  version: 1.10.2
-  resolution: "path-scurry@npm:1.10.2"
+"path-scurry@npm:^1.11.0":
+  version: 1.11.0
+  resolution: "path-scurry@npm:1.11.0"
   dependencies:
     lru-cache: "npm:^10.2.0"
     minipass: "npm:^5.0.0 || ^6.0.2 || ^7.0.0"
-  checksum: 10c0/d723777fbf9627f201e64656680f66ebd940957eebacf780e6cce1c2919c29c116678b2d7dbf8821b3a2caa758d125f4444005ccec886a25c8f324504e48e601
+  checksum: 10c0/a5cd5dfbc6d5bb01d06bc2eb16ccdf303d617865438a21fe15431b8ad334f23351f73259abeb7e4be56f9c68d237b26b4dba51c78b508586035dfc2b55085493
   languageName: node
   linkType: hard
 

From 6ccee2600bf8920131f9b4ad5706cf632262556b Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 10 May 2024 11:19:06 +0200
Subject: [PATCH 0970/2191] Update dependency rubocop to v1.63.5 (#30225)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 435144700f255f..9df960e61809b5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -640,7 +640,7 @@ GEM
       rspec-mocks (~> 3.0)
       sidekiq (>= 5, < 8)
     rspec-support (3.13.1)
-    rubocop (1.63.4)
+    rubocop (1.63.5)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)

From c36a8786c10c36e5181c9c53d848fa8e7b24b692 Mon Sep 17 00:00:00 2001
From: Chee Aun <cheeaun@gmail.com>
Date: Fri, 10 May 2024 17:19:27 +0800
Subject: [PATCH 0971/2191] Fix typo (#30224)

---
 .../mastodon/features/notifications/components/notification.jsx | 2 +-
 app/javascript/mastodon/locales/en.json                         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/javascript/mastodon/features/notifications/components/notification.jsx b/app/javascript/mastodon/features/notifications/components/notification.jsx
index caf7f9bdc104ae..69084c2111b47e 100644
--- a/app/javascript/mastodon/features/notifications/components/notification.jsx
+++ b/app/javascript/mastodon/features/notifications/components/notification.jsx
@@ -41,7 +41,7 @@ const messages = defineMessages({
   adminSignUp: { id: 'notification.admin.sign_up', defaultMessage: '{name} signed up' },
   adminReport: { id: 'notification.admin.report', defaultMessage: '{name} reported {target}' },
   relationshipsSevered: { id: 'notification.relationships_severance_event', defaultMessage: 'Lost connections with {name}' },
-  moderationWarning: { id: 'notification.moderation_warning', defaultMessage: 'Your have received a moderation warning' },
+  moderationWarning: { id: 'notification.moderation_warning', defaultMessage: 'You have received a moderation warning' },
 });
 
 const notificationForScreenReader = (intl, message, timestamp) => {
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index 9d127b6b03b06c..56e4612c1ce2bf 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -474,7 +474,7 @@
   "notification.follow_request": "{name} has requested to follow you",
   "notification.mention": "{name} mentioned you",
   "notification.moderation-warning.learn_more": "Learn more",
-  "notification.moderation_warning": "Your have received a moderation warning",
+  "notification.moderation_warning": "You have received a moderation warning",
   "notification.moderation_warning.action_delete_statuses": "Some of your posts have been removed.",
   "notification.moderation_warning.action_disable": "Your account has been disabled.",
   "notification.moderation_warning.action_mark_statuses_as_sensitive": "Some of your posts have been marked as sensitive.",

From 0a4a93038fa08e0f64f3b1f267853f38f41cd0cf Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 10 May 2024 09:22:47 +0000
Subject: [PATCH 0972/2191] Update Yarn to v4.2.2 (#30220)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 package.json           | 2 +-
 streaming/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 3abc11c34b09bc..d8848833311297 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@mastodon/mastodon",
   "license": "AGPL-3.0-or-later",
-  "packageManager": "yarn@4.2.1",
+  "packageManager": "yarn@4.2.2",
   "engines": {
     "node": ">=18"
   },
diff --git a/streaming/package.json b/streaming/package.json
index f08d2a4c2d1e86..cf1fe4ba69b7a0 100644
--- a/streaming/package.json
+++ b/streaming/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@mastodon/streaming",
   "license": "AGPL-3.0-or-later",
-  "packageManager": "yarn@4.2.1",
+  "packageManager": "yarn@4.2.2",
   "engines": {
     "node": ">=18"
   },

From 1aa3976f280efed1ae4c72c1ac58e3e4ff9061f1 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 10 May 2024 11:23:45 +0200
Subject: [PATCH 0973/2191] Update dependency pino-http to v10.1.0 (#30199)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 22f81166f859d2..28cf500466b1cf 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -13004,14 +13004,14 @@ __metadata:
   linkType: hard
 
 "pino-http@npm:^10.0.0":
-  version: 10.0.0
-  resolution: "pino-http@npm:10.0.0"
+  version: 10.1.0
+  resolution: "pino-http@npm:10.1.0"
   dependencies:
     get-caller-file: "npm:^2.0.5"
     pino: "npm:^9.0.0"
     pino-std-serializers: "npm:^7.0.0"
     process-warning: "npm:^3.0.0"
-  checksum: 10c0/40d2dcb2bc0c51f1ce45d3d7144c54f087fe1a122d82d0f497d65656151a1603a64f82f62d7fc6a3c172754c5a5cf6105b3096620eece31cefbc8cf95b26c062
+  checksum: 10c0/d97691f2ee248b0aca0e49169d0c7ca0d4c604ee57b63ae264a6f9914fc7277cace74686d5088a876f8152a8d5b8211af904b2d24a516728a662de0e9cc79e9f
   languageName: node
   linkType: hard
 

From 3a5a1b2e5838d8915bd2d08e5d3ea363d66b611e Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 10 May 2024 09:25:07 +0000
Subject: [PATCH 0974/2191] Update dependency node to 20.13 (#30211)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .nvmrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.nvmrc b/.nvmrc
index 7795cadb579573..973f49d55ca1e3 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-20.12
+20.13

From c9557bdd3bc7c67f6513295b0ab633cfca8cbfdd Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 10 May 2024 11:34:48 +0200
Subject: [PATCH 0975/2191] New Crowdin Translations (automated) (#30215)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/gl.json |  8 +--
 app/javascript/mastodon/locales/hi.json |  5 ++
 app/javascript/mastodon/locales/ie.json | 29 ++++++++
 app/javascript/mastodon/locales/lt.json | 93 +++++++++++++++----------
 app/javascript/mastodon/locales/lv.json | 35 ++++++++--
 config/locales/devise.ia.yml            | 25 +++++++
 config/locales/doorkeeper.ia.yml        |  4 ++
 config/locales/doorkeeper.ie.yml        |  1 +
 config/locales/doorkeeper.lt.yml        | 50 ++++++-------
 config/locales/gl.yml                   | 10 +--
 config/locales/ia.yml                   | 44 ++++++++++++
 config/locales/ie.yml                   |  2 +
 config/locales/ko.yml                   |  1 +
 config/locales/lt.yml                   |  5 ++
 config/locales/lv.yml                   | 21 ++++++
 config/locales/pt-BR.yml                |  1 +
 config/locales/ro.yml                   |  9 +++
 config/locales/simple_form.ar.yml       |  5 ++
 config/locales/simple_form.bg.yml       |  2 +
 config/locales/simple_form.de.yml       |  4 +-
 config/locales/simple_form.hu.yml       |  2 +-
 config/locales/simple_form.ia.yml       |  2 +
 config/locales/simple_form.it.yml       |  2 +
 config/locales/simple_form.ko.yml       |  3 +
 config/locales/simple_form.lt.yml       |  2 +-
 config/locales/simple_form.nn.yml       |  3 +-
 config/locales/simple_form.pt-BR.yml    |  5 ++
 config/locales/simple_form.ro.yml       |  1 +
 config/locales/simple_form.sq.yml       |  2 +
 config/locales/uk.yml                   |  2 +-
 30 files changed, 296 insertions(+), 82 deletions(-)

diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json
index 49802ac48876f5..88d4f5f60e059a 100644
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@@ -2,7 +2,7 @@
   "about.blocks": "Servidores suxeitos a moderación",
   "about.contact": "Contacto:",
   "about.disclaimer": "Mastodon é software libre, de código aberto, e unha marca comercial de Mastodon gGmbH.",
-  "about.domain_blocks.no_reason_available": "Motivo non indicado. ",
+  "about.domain_blocks.no_reason_available": "Motivo non indicado",
   "about.domain_blocks.preamble": "Mastodon de xeito xeral permíteche ver contidos doutros servidores do fediverso e interactuar coas súas usuarias. Estas son as excepcións que se estabeleceron neste servidor en particular.",
   "about.domain_blocks.silenced.explanation": "Por defecto non verás perfís e contido desde este servidor, a menos que mires de xeito explícito ou optes por seguir ese contido ou usuaria.",
   "about.domain_blocks.silenced.title": "Limitado",
@@ -115,7 +115,7 @@
   "closed_registrations_modal.find_another_server": "Atopa outro servidor",
   "closed_registrations_modal.preamble": "Mastodon é descentralizado, así que non importa onde crees a conta, poderás seguir e interactuar con calquera conta deste servidor. Incluso podes ter o teu servidor!",
   "closed_registrations_modal.title": "Crear conta en Mastodon",
-  "column.about": "Acerca de",
+  "column.about": "Sobre",
   "column.blocks": "Usuarias bloqueadas",
   "column.bookmarks": "Marcadores",
   "column.community": "Cronoloxía local",
@@ -322,7 +322,7 @@
   "follow_suggestions.view_all": "Ver todas",
   "follow_suggestions.who_to_follow": "A quen seguir",
   "followed_tags": "Cancelos seguidos",
-  "footer.about": "Acerca de",
+  "footer.about": "Sobre",
   "footer.directory": "Directorio de perfís",
   "footer.get_app": "Descarga a app",
   "footer.invite": "Convidar persoas",
@@ -441,7 +441,7 @@
   "mute_modal.title": "Acalar usuaria?",
   "mute_modal.you_wont_see_mentions": "Non verás as publicacións que a mencionen.",
   "mute_modal.you_wont_see_posts": "Seguirá podendo ler as túas publicacións, pero non verás as súas.",
-  "navigation_bar.about": "Acerca de",
+  "navigation_bar.about": "Sobre",
   "navigation_bar.advanced_interface": "Abrir coa interface web avanzada",
   "navigation_bar.blocks": "Usuarias bloqueadas",
   "navigation_bar.bookmarks": "Marcadores",
diff --git a/app/javascript/mastodon/locales/hi.json b/app/javascript/mastodon/locales/hi.json
index 372eb09fa78fd4..5dc99dd76e40b1 100644
--- a/app/javascript/mastodon/locales/hi.json
+++ b/app/javascript/mastodon/locales/hi.json
@@ -205,6 +205,10 @@
   "dismissable_banner.dismiss": "डिसमिस",
   "dismissable_banner.explore_links": "इन समाचारों के बारे में लोगों द्वारा इस पर और डेसेंट्रलीसेड नेटवर्क के अन्य सर्वरों पर अभी बात की जा रही है।",
   "dismissable_banner.explore_tags": "ये हैशटैग अभी इस पर और डेसेंट्रलीसेड नेटवर्क के अन्य सर्वरों पर लोगों के बीच कर्षण प्राप्त कर रहे हैं।",
+  "domain_block_modal.block": "सर्वर ब्लॉक करें",
+  "domain_block_modal.title": "डोमेन ब्लॉक करें",
+  "domain_pill.server": "सर्वर",
+  "domain_pill.username": "यूज़रनेम",
   "embed.instructions": "अपने वेबसाइट पर, निचे दिए कोड को कॉपी करके, इस स्टेटस को एम्बेड करें",
   "embed.preview": "यह ऐसा दिखेगा :",
   "emoji_button.activity": "गतिविधि",
@@ -274,6 +278,7 @@
   "follow_request.authorize": "अधिकार दें",
   "follow_request.reject": "अस्वीकार करें",
   "follow_requests.unlocked_explanation": "हालाँकि आपका खाता लॉक नहीं है, फिर भी {domain} डोमेन स्टाफ ने सोचा कि आप इन खातों के मैन्युअल अनुरोधों की समीक्षा करना चाहते हैं।",
+  "follow_suggestions.dismiss": "दोबारा न दिखाएं",
   "followed_tags": "फॉलो किए गए हैशटैग्स",
   "footer.about": "अबाउट",
   "footer.directory": "प्रोफाइल्स डायरेक्टरी",
diff --git a/app/javascript/mastodon/locales/ie.json b/app/javascript/mastodon/locales/ie.json
index 8d491412c0155a..7bd91ca0f9032e 100644
--- a/app/javascript/mastodon/locales/ie.json
+++ b/app/javascript/mastodon/locales/ie.json
@@ -212,13 +212,20 @@
   "domain_block_modal.block_account_instead": "Altrimen, bloccar @{name}",
   "domain_block_modal.they_can_interact_with_old_posts": "Persones de ti servitor posse interacter con tui old postas.",
   "domain_block_modal.they_cant_follow": "Nequi de ti-ci servitor posse sequer te.",
+  "domain_block_modal.they_wont_know": "Ne va esser conscient pri li bloccada.",
+  "domain_block_modal.title": "Bloccar dominia?",
+  "domain_block_modal.you_will_lose_followers": "Omni tui sequitores de ti-ci servitor va esser efaciat.",
+  "domain_block_modal.you_wont_see_posts": "Tu ne va vider postas ni notificationes de usatores sur ti-ci servitor.",
+  "domain_pill.activitypub_lets_connect": "It possibilisa tui conexiones e interactiones con persones ne solmen sur Mastodon, ma anc tra diferent social aplis.",
   "domain_pill.activitypub_like_language": "ActivityPub es li lingue usat de Mastodon por parlar con altri social retages.",
   "domain_pill.server": "Servitor",
   "domain_pill.their_handle": "Identificator:",
   "domain_pill.their_server": "Su digital hem e omni su postas.",
+  "domain_pill.their_username": "Su unic identificator sur su servitor. It es possibil que altri servitores va haver usatores con li sam nómine.",
   "domain_pill.username": "Usator-nómine",
   "domain_pill.whats_in_a_handle": "Ex quo consiste un identificator?",
   "domain_pill.your_handle": "Tui identificator:",
+  "domain_pill.your_username": "Tui unic identificator sur ti-ci servitor. It es possibil que altri servitores va haver usatores con li sam nómine.",
   "embed.instructions": "Inbedar ti-ci posta per copiar li code in infra.",
   "embed.preview": "Vi qualmen it va aspecter:",
   "emoji_button.activity": "Activitá",
@@ -286,6 +293,7 @@
   "filter_modal.select_filter.subtitle": "Usar un existent categorie o crear nov",
   "filter_modal.select_filter.title": "Filtrar ti-ci posta",
   "filter_modal.title.status": "Filtrar un posta",
+  "filtered_notifications_banner.mentions": "{count, plural, one {mention} other {mentiones}}",
   "filtered_notifications_banner.pending_requests": "Notificationes de {count, plural, =0 {nequi} one {un person} other {# persones}} quel tu possibilmen conosse",
   "filtered_notifications_banner.title": "Filtrat notificationes",
   "firehose.all": "Omno",
@@ -296,6 +304,8 @@
   "follow_requests.unlocked_explanation": "Benque tu conto ne es cludet, li administratores de {domain} pensat que tu fórsan vell voler tractar seque-petitiones de tis-ci contos manualmen.",
   "follow_suggestions.curated_suggestion": "Selection del employates",
   "follow_suggestions.dismiss": "Ne monstrar plu",
+  "follow_suggestions.featured_longer": "Selectet manualmen del equip de {domain}",
+  "follow_suggestions.friends_of_friends_longer": "Populari ínter li persones queles tu seque",
   "follow_suggestions.hints.featured": "Ti-ci profil ha esset selectet directmen del equip de {domain}.",
   "follow_suggestions.hints.friends_of_friends": "Ti-ci profil es populari ínter tis qui tu seque.",
   "follow_suggestions.hints.most_followed": "Ti-ci profil es un del max sequet sur {domain}.",
@@ -303,6 +313,8 @@
   "follow_suggestions.hints.similar_to_recently_followed": "Ti-ci profil es simil al profiles queles tu ha recentmen sequet.",
   "follow_suggestions.personalized_suggestion": "Personalisat suggestion",
   "follow_suggestions.popular_suggestion": "Populari suggestion",
+  "follow_suggestions.popular_suggestion_longer": "Populari sur {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Simil a profiles queles tu sequet recentmen",
   "follow_suggestions.view_all": "Vider omnicos",
   "follow_suggestions.who_to_follow": "Persones a sequer",
   "followed_tags": "Sequet hashtags",
@@ -423,6 +435,8 @@
   "mute_modal.they_can_mention_and_follow": "Posse mentionar e sequer te, ma va esser ínvisibil a te.",
   "mute_modal.they_wont_know": "Ne va esser conscient pri li silentation.",
   "mute_modal.title": "Silentiar usator?",
+  "mute_modal.you_wont_see_mentions": "Tu ne va vider postas mentionant li usator.",
+  "mute_modal.you_wont_see_posts": "Ne posse vider tui postas e inversi.",
   "navigation_bar.about": "Information",
   "navigation_bar.advanced_interface": "Aperter in li web-interfacie avansat",
   "navigation_bar.blocks": "Bloccat usatores",
@@ -455,10 +469,23 @@
   "notification.follow": "{name} sequet te",
   "notification.follow_request": "{name} ha petit sequer te",
   "notification.mention": "{name} mentionat te",
+  "notification.moderation-warning.learn_more": "Aprender plu",
+  "notification.moderation_warning": "Tu ha recivet un moderatori advertiment",
+  "notification.moderation_warning.action_delete_statuses": "Alcun de tui postas ha esset efaciat.",
+  "notification.moderation_warning.action_disable": "Tui conto ha esset desactivisat.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Alcun de tui postas ha esset marcat quam sensitiv.",
+  "notification.moderation_warning.action_none": "Tui conto ha recivet un moderatori advertiment.",
+  "notification.moderation_warning.action_sensitive": "Desde nu tui postas va esser marcat quam sensitiv.",
+  "notification.moderation_warning.action_silence": "Tui conto ha esset limitat.",
+  "notification.moderation_warning.action_suspend": "Tui conto ha esset suspendet.",
   "notification.own_poll": "Tui balotation ha finit",
   "notification.poll": "Un balotation in quel tu votat ha finit",
   "notification.reblog": "{name} boostat tui posta",
+  "notification.relationships_severance_event": "Perdit conexiones con {name}",
+  "notification.relationships_severance_event.account_suspension": "Un admin de {from} ha suspendet {target}, dunc con ti person tu ne plu posse reciver actualisationes ni far interactiones.",
+  "notification.relationships_severance_event.domain_block": "Un admin de {from} ha bloccat {target}, includente {followersCount} de tui sequitores e {followingCount, plural, one {# conto} other {# contos}} sequet de te.",
   "notification.relationships_severance_event.learn_more": "Aprender plu",
+  "notification.relationships_severance_event.user_domain_block": "Tu ha bloccat {target}, efaciante {followersCount} de tui sequitores e {followingCount, plural, one {# conto} other {# contos}} sequet de te.",
   "notification.status": "{name} just postat",
   "notification.update": "{name} modificat un posta",
   "notification_requests.accept": "Acceptar",
@@ -472,6 +499,7 @@
   "notifications.column_settings.alert": "Notificationes sur li computator",
   "notifications.column_settings.favourite": "Favorites:",
   "notifications.column_settings.filter_bar.advanced": "Monstrar omni categories",
+  "notifications.column_settings.filter_bar.category": "Rapid filtre-barre",
   "notifications.column_settings.follow": "Nov sequitores:",
   "notifications.column_settings.follow_request": "Nov petitiones de sequer:",
   "notifications.column_settings.mention": "Mentiones:",
@@ -707,6 +735,7 @@
   "status.reblog": "Boostar",
   "status.reblog_private": "Boostar con li original visibilitá",
   "status.reblogged_by": "{name} boostat",
+  "status.reblogs": "{count, plural, one {boost} other {boosts}}",
   "status.reblogs.empty": "Ancor nequi ha boostat ti-ci posta. Quande alqui fa it, ilu va aparir ci.",
   "status.redraft": "Deleter & redacter",
   "status.remove_bookmark": "Remover marcator",
diff --git a/app/javascript/mastodon/locales/lt.json b/app/javascript/mastodon/locales/lt.json
index 083a922012b46f..798b24569f135a 100644
--- a/app/javascript/mastodon/locales/lt.json
+++ b/app/javascript/mastodon/locales/lt.json
@@ -1,7 +1,7 @@
 {
   "about.blocks": "Prižiūrimi serveriai",
   "about.contact": "Kontaktai:",
-  "about.disclaimer": "Mastodon – nemokama atvirojo kodo programa ir Mastodon gGmbH prekės ženklas.",
+  "about.disclaimer": "Mastodon – tai nemokama atvirojo kodo programinė įranga ir Mastodon gGmbH prekės ženklas.",
   "about.domain_blocks.no_reason_available": "Priežastis nepateikta",
   "about.domain_blocks.preamble": "Mastodon paprastai leidžia peržiūrėti turinį ir bendrauti su naudotojais iš bet kurio kito fediverse esančio serverio. Šios yra išimtys, kurios buvo padarytos šiame konkrečiame serveryje.",
   "about.domain_blocks.silenced.explanation": "Paprastai nematysi profilių ir turinio iš šio serverio, nebent jį aiškiai ieškosi arba pasirinksi jį sekdamas (-a).",
@@ -30,7 +30,7 @@
   "account.endorse": "Rodyti profilyje",
   "account.featured_tags.last_status_at": "Paskutinis įrašas {date}",
   "account.featured_tags.last_status_never": "Nėra įrašų",
-  "account.featured_tags.title": "{name} rekomenduojami saitažodžiai",
+  "account.featured_tags.title": "{name} rodomi saitažodžiai",
   "account.follow": "Sekti",
   "account.follow_back": "Sekti atgal",
   "account.followers": "Sekėjai",
@@ -38,13 +38,13 @@
   "account.followers_counter": "{count, plural, one {{counter} sekėjas} few {{counter} sekėjai} many {{counter} sekėjo} other {{counter} sekėjų}}",
   "account.following": "Sekama",
   "account.following_counter": "{count, plural, one {{counter} sekimas} few {{counter} sekimai} many {{counter} sekimo} other {{counter} sekimų}}",
-  "account.follows.empty": "Šis (-i) naudotojas (-a) dar nieko neseka.",
+  "account.follows.empty": "Šis naudotojas dar nieko neseka.",
   "account.go_to_profile": "Eiti į profilį",
   "account.hide_reblogs": "Slėpti pakėlimus iš @{name}",
   "account.in_memoriam": "Atminimui.",
   "account.joined_short": "Prisijungė",
   "account.languages": "Keisti prenumeruojamas kalbas",
-  "account.link_verified_on": "Šios nuorodos nuosavybė buvo patikrinta {date}.",
+  "account.link_verified_on": "Šios nuorodos nuosavybė buvo patikrinta {date}",
   "account.locked_info": "Šios paskyros privatumo būsena nustatyta kaip užrakinta. Savininkas (-ė) rankiniu būdu peržiūri, kas gali sekti.",
   "account.media": "Medija",
   "account.mention": "Paminėti @{name}",
@@ -59,7 +59,7 @@
   "account.posts": "Įrašai",
   "account.posts_with_replies": "Įrašai ir atsakymai",
   "account.report": "Pranešti apie @{name}",
-  "account.requested": "Laukiama patvirtinimo. Spustelėk, jei nori atšaukti sekimo prašymą.",
+  "account.requested": "Laukiama patvirtinimo. Spustelėk, jei nori atšaukti sekimo prašymą",
   "account.requested_follow": "{name} paprašė tave sekti",
   "account.share": "Bendrinti @{name} profilį",
   "account.show_reblogs": "Rodyti pakėlimus iš @{name}",
@@ -82,7 +82,7 @@
   "admin.impact_report.instance_followers": "Sekėjai, kuriuos prarastų mūsų naudotojai",
   "admin.impact_report.instance_follows": "Sekėjai, kuriuos prarastų jų naudotojai",
   "admin.impact_report.title": "Poveikio apibendrinimas",
-  "alert.rate_limited.message": "Pabandyk vėliau po {retry_time, time, medium}.",
+  "alert.rate_limited.message": "Bandyk vėliau po {retry_time, time, medium}.",
   "alert.rate_limited.title": "Sparta ribota.",
   "alert.unexpected.message": "Įvyko netikėta klaida.",
   "alert.unexpected.title": "Ups!",
@@ -92,7 +92,12 @@
   "block_modal.remote_users_caveat": "Paprašysime serverio {domain} gerbti tavo sprendimą. Tačiau atitiktis negarantuojama, nes kai kurie serveriai gali skirtingai tvarkyti blokavimus. Vieši įrašai vis tiek gali būti matomi neprisijungusiems naudotojams.",
   "block_modal.show_less": "Rodyti mažiau",
   "block_modal.show_more": "Rodyti daugiau",
-  "boost_modal.combo": "Galima paspausti {combo}, kad praleisti kitą kartą.",
+  "block_modal.they_cant_mention": "Jie negali tave paminėti ar sekti.",
+  "block_modal.they_cant_see_posts": "Jie negali matyti tavo įrašus, o tu nematysi jų.",
+  "block_modal.they_will_know": "Jie mato, kad yra užblokuoti.",
+  "block_modal.title": "Blokuoti naudotoją?",
+  "block_modal.you_wont_see_mentions": "Nematysi įrašus, kuriuose jie paminimi.",
+  "boost_modal.combo": "Galima paspausti {combo}, kad praleisti tai kitą kartą",
   "bundle_column_error.copy_stacktrace": "Kopijuoti klaidos ataskaitą",
   "bundle_column_error.error.body": "Paprašytos puslapio nepavyko atvaizduoti. Tai gali būti dėl mūsų kodo klaidos arba naršyklės suderinamumo problemos.",
   "bundle_column_error.error.title": "O, ne!",
@@ -117,7 +122,7 @@
   "column.direct": "Privatūs paminėjimai",
   "column.directory": "Naršyti profilius",
   "column.domain_blocks": "Užblokuoti domenai",
-  "column.favourites": "Mėgstamiausi",
+  "column.favourites": "Mėgstami",
   "column.firehose": "Tiesioginiai srautai",
   "column.follow_requests": "Sekimo prašymai",
   "column.home": "Pagrindinis",
@@ -144,7 +149,7 @@
   "compose.saved.body": "Įrašas išsaugotas.",
   "compose_form.direct_message_warning_learn_more": "Sužinoti daugiau",
   "compose_form.encryption_warning": "Mastodon įrašai nėra visapusiškai šifruojami. Per Mastodon nesidalyk jokia slapta informacija.",
-  "compose_form.hashtag_warning": "Šis įrašas nebus įtraukta į jokį saitažodį, nes ji nėra vieša. Tik viešų įrašų galima ieškoti pagal saitažodį.",
+  "compose_form.hashtag_warning": "Šis įrašas nebus įtrauktas į jokį saitažodį, nes ji nėra vieša. Tik viešų įrašų galima ieškoti pagal saitažodį.",
   "compose_form.lock_disclaimer": "Tavo paskyra nėra {locked}. Bet kas gali sekti tave ir peržiūrėti tik sekėjams skirtus įrašus.",
   "compose_form.lock_disclaimer.lock": "užrakinta",
   "compose_form.placeholder": "Kas tavo mintyse?",
@@ -152,7 +157,7 @@
   "compose_form.poll.multiple": "Keli pasirinkimai",
   "compose_form.poll.option_placeholder": "{number} parinktis",
   "compose_form.poll.single": "Pasirinkti vieną",
-  "compose_form.poll.switch_to_multiple": "Keisti apklausą, kad būtų galima pasirinkti kelis pasirinkimus.",
+  "compose_form.poll.switch_to_multiple": "Keisti apklausą, kad būtų galima pasirinkti kelis pasirinkimus",
   "compose_form.poll.switch_to_single": "Keisti apklausą, kad būtų galima pasirinkti vieną pasirinkimą",
   "compose_form.poll.type": "Stilius",
   "compose_form.publish": "Skelbti",
@@ -172,16 +177,17 @@
   "confirmations.delete_list.message": "Ar tikrai nori visam laikui ištrinti šį sąrašą?",
   "confirmations.discard_edit_media.confirm": "Atmesti",
   "confirmations.discard_edit_media.message": "Turi neišsaugotų medijos aprašymo ar peržiūros pakeitimų, vis tiek juos atmesti?",
+  "confirmations.domain_block.confirm": "Blokuoti serverį",
   "confirmations.domain_block.message": "Ar tikrai, tikrai nori užblokuoti visą {domain}? Daugeliu atvejų užtenka kelių tikslinių blokavimų arba nutildymų. Šio domeno turinio nematysi jokiose viešose laiko skalėse ar pranešimuose. Tavo sekėjai iš to domeno bus pašalinti.",
   "confirmations.edit.confirm": "Redaguoti",
   "confirmations.edit.message": "Redaguojant dabar, bus perrašyta šiuo metu kuriama žinutė. Ar tikrai nori tęsti?",
   "confirmations.logout.confirm": "Atsijungti",
   "confirmations.logout.message": "Ar tikrai nori atsijungti?",
   "confirmations.mute.confirm": "Nutildyti",
-  "confirmations.redraft.confirm": "Ištrinti ir parengti iš naujo",
-  "confirmations.redraft.message": "Ar tikrai nori ištrinti šį įrašą ir parengti jį iš naujo kaip juodraštį? Bus prarastos mėgstamiausios ir pakėlimai, o atsakymai į originalinį įrašą taps liekamojais.",
+  "confirmations.redraft.confirm": "Ištrinti ir perrašyti",
+  "confirmations.redraft.message": "Ar tikrai nori ištrinti šį įrašą ir parašyti jį iš naujo? Bus prarastos mėgstamai ir pakėlimai, o atsakymai į originalinį įrašą taps liekamojais.",
   "confirmations.reply.confirm": "Atsakyti",
-  "confirmations.reply.message": "Atsakant dabar, bus perrašyta metu kuriama žinutė. Ar tikrai nori tęsti?",
+  "confirmations.reply.message": "Atsakant dabar, bus perrašyta šiuo metu kuriama žinutė. Ar tikrai nori tęsti?",
   "confirmations.unfollow.confirm": "Nebesekti",
   "confirmations.unfollow.message": "Ar tikrai nori nebesekti {name}?",
   "conversation.delete": "Ištrinti pokalbį",
@@ -196,34 +202,42 @@
   "directory.new_arrivals": "Nauji atvykėliai",
   "directory.recently_active": "Neseniai aktyvus (-i)",
   "disabled_account_banner.account_settings": "Paskyros nustatymai",
-  "disabled_account_banner.text": "Tavo paskyra {disabledAccount} šiuo metu išjungta.",
-  "dismissable_banner.community_timeline": "Tai – naujausi vieši įrašai, kuriuos paskelbė žmonės, kurių paskyros talpinamos {domain}.",
+  "disabled_account_banner.text": "Tavo paskyra {disabledAccount} šiuo metu yra išjungta.",
+  "dismissable_banner.community_timeline": "Tai – naujausi vieši įrašai iš žmonių, kurių paskyros talpinamos {domain}.",
   "dismissable_banner.dismiss": "Atmesti",
   "dismissable_banner.explore_links": "Tai – naujienos, kuriomis šiandien daugiausiai bendrinamasi socialiniame žiniatinklyje. Naujesnės naujienų istorijos, kurias paskelbė daugiau skirtingų žmonių, vertinamos aukščiau.",
   "dismissable_banner.explore_statuses": "Tai – įrašai iš viso socialinio žiniatinklio, kurie šiandien sulaukia daug dėmesio. Naujesni įrašai, turintys daugiau pakėlimų ir mėgstamų, vertinami aukščiau.",
   "dismissable_banner.explore_tags": "Tai – saitažodžiai, kurie šiandien sulaukia daug dėmesio socialiniame žiniatinklyje. Saitažodžiai, kuriuos naudoja daugiau skirtingų žmonių, vertinami aukščiau.",
-  "dismissable_banner.public_timeline": "Tai – naujausi vieši įrašai, kuriuos socialiniame žiniatinklyje paskelbė žmonės, sekantys {domain}.",
-  "domain_pill.activitypub_lets_connect": "Tai leidžia tau bendrauti su žmonėmis ne tik Mastodon, bet ir įvairiose socialinėse programėlėse.",
-  "domain_pill.activitypub_like_language": "ActivityPub – tarsi kalba, kuria Mastodon kalba su kitais socialiniais tinklais.",
+  "dismissable_banner.public_timeline": "Tai – naujausi vieši įrašai iš žmonių socialiniame žiniatinklyje, kuriuos seka {domain} žmonės.",
+  "domain_block_modal.block": "Blokuoti serverį",
+  "domain_block_modal.block_account_instead": "Blokuoti {name} vietoj to",
+  "domain_block_modal.they_can_interact_with_old_posts": "Žmonės iš šio serverio gali sąveikauti su tavo senomis įrašomis.",
+  "domain_block_modal.they_cant_follow": "Niekas iš šio serverio negali tavęs sekti.",
+  "domain_block_modal.they_wont_know": "Jie nežinos, kad buvo užblokuoti.",
+  "domain_block_modal.title": "Blokuoti domeną?",
+  "domain_block_modal.you_will_lose_followers": "Visi tavo sekėjai iš šio serverio bus pašalinti.",
+  "domain_block_modal.you_wont_see_posts": "Nematysi naudotojų įrašų ar pranešimų šiame serveryje.",
+  "domain_pill.activitypub_lets_connect": "Tai leidžia tau sąveikauti su žmonėmis ne tik Mastodon, bet ir įvairiose socialinėse programėlėse.",
+  "domain_pill.activitypub_like_language": "ActivityPub – tai tarsi kalba, kuria Mastodon kalba su kitais socialiniais tinklais.",
   "domain_pill.server": "Serveris",
   "domain_pill.their_handle": "Jų socialinis medijos vardas:",
   "domain_pill.their_server": "Jų skaitmeniniai namai, kuriuose saugomi visi jų įrašai.",
   "domain_pill.their_username": "Jų unikalus identifikatorius jų serveryje. Skirtinguose serveriuose galima rasti naudotojų, turinčių tą patį naudotojo vardą.",
   "domain_pill.username": "Naudotojo vardas",
   "domain_pill.whats_in_a_handle": "Kas yra socialiniame medijos varde?",
-  "domain_pill.who_they_are": "Kadangi socialines medijos vardai nurodo, kas ir kur jie yra, galima bendrauti su žmonėmis visame socialiniame tinkle, kuriame yra <button> ActivityPub valdomos platformos</button>.",
-  "domain_pill.who_you_are": "Kadangi tavo socialinis medijos vardas nurodo, kas esi ir kur esi, žmonės gali bendrauti su tavimi visame socialiniame tinkle, kurį sudaro <button> ActivityPub valdomos platformos</button>.",
+  "domain_pill.who_they_are": "Kadangi socialines medijos vardai nurodo, kas žmogus yra ir kur jie yra, gali sąveikauti su žmonėmis visame socialiniame žiniatinklyje, kurį sudaro <button>ActivityPub veikiančios platformos</button>.",
+  "domain_pill.who_you_are": "Kadangi tavo socialinis medijos vardas nurodo, kas esi ir kur esi, žmonės gali sąveikauti su tavimi visame socialiniame tinkle, kurį sudaro <button>ActivityPub veikiančios platformos</button>.",
   "domain_pill.your_handle": "Tavo socialinis medijos vardas:",
   "domain_pill.your_server": "Tavo skaitmeniniai namai, kuriuose saugomi visi tavo įrašai. Nepatinka šis? Bet kada perkelk serverius ir atsivesk ir savo sekėjus.",
-  "domain_pill.your_username": "Tavo unikalus identifikatorius šiame serveryje. Skirtinguose serveriuose galima rasti naudotojų, turinčių tą patį naudotojo vardą.",
+  "domain_pill.your_username": "Tavo unikalus identifikatorius šiame serveryje. Skirtinguose serveriuose galima rasti naudotojų su tuo pačiu naudotojo vardu.",
   "embed.instructions": "Įterpk šį įrašą į savo svetainę nukopijavus (-usi) toliau pateiktą kodą.",
-  "embed.preview": "Štai, kaip tai atrodys:",
+  "embed.preview": "Štai kaip tai atrodys:",
   "emoji_button.activity": "Veikla",
   "emoji_button.clear": "Išvalyti",
   "emoji_button.custom": "Pasirinktinis",
   "emoji_button.flags": "Vėliavos",
   "emoji_button.food": "Maistas ir gėrimai",
-  "emoji_button.label": "Įterpti veidelius",
+  "emoji_button.label": "Įterpti jaustuką",
   "emoji_button.nature": "Gamta",
   "emoji_button.not_found": "Nerasta jokių tinkamų jaustukų.",
   "emoji_button.objects": "Objektai",
@@ -234,12 +248,12 @@
   "emoji_button.symbols": "Simboliai",
   "emoji_button.travel": "Kelionės ir vietos",
   "empty_column.account_hides_collections": "Šis (-i) naudotojas (-a) pasirinko nepadaryti šią informaciją prieinamą.",
-  "empty_column.account_suspended": "Paskyra sustabdyta.",
-  "empty_column.account_timeline": "Nėra įrašų čia.",
+  "empty_column.account_suspended": "Paskyra pristabdyta.",
+  "empty_column.account_timeline": "Nėra čia įrašų.",
   "empty_column.account_unavailable": "Profilis neprieinamas.",
   "empty_column.blocks": "Dar neužblokavai nė vieno naudotojo.",
-  "empty_column.bookmarked_statuses": "Dar neturi nė vienos įrašo žymės. Kai vieną iš jų pridėsi į žymes, jis bus rodomas čia.",
-  "empty_column.community": "Vietinė laiko skalė tuščia. Parašyk ką nors viešai, kad pradėtum bendrauti!",
+  "empty_column.bookmarked_statuses": "Dar neturi nė vienos įrašo pridėtos žymės. Kai vieną iš jų pridėsi į žymes, jis bus rodomas čia.",
+  "empty_column.community": "Vietinė laiko skalė yra tuščia. Parašyk ką nors viešai, kad pradėtum sąveikauti.",
   "empty_column.direct": "Dar neturi jokių privačių paminėjimų. Kai išsiųsi arba gausi vieną iš jų, jis bus rodomas čia.",
   "empty_column.domain_blocks": "Dar nėra užblokuotų domenų.",
   "empty_column.explore_statuses": "Šiuo metu niekas nėra tendencinga. Patikrink vėliau.",
@@ -248,12 +262,13 @@
   "empty_column.follow_requests": "Dar neturi jokių sekimo prašymų. Kai gausi tokį prašymą, jis bus rodomas čia.",
   "empty_column.followed_tags": "Dar neseki jokių saitažodžių. Kai tai padarysi, jie bus rodomi čia.",
   "empty_column.hashtag": "Nėra nieko šiame saitažodyje kol kas.",
-  "empty_column.home": "Tavo pagrindinio laiko skalė tuščia! Sek daugiau žmonių, kad ją užpildytum.",
+  "empty_column.home": "Tavo pagrindinio laiko skalė tuščia. Sek daugiau žmonių, kad ją užpildytum.",
   "empty_column.list": "Nėra nieko šiame sąraše kol kas. Kai šio sąrašo nariai paskelbs naujų įrašų, jie bus rodomi čia.",
   "empty_column.lists": "Dar neturi jokių sąrašų. Kai jį sukursi, jis bus rodomas čia.",
   "empty_column.mutes": "Dar nesi nutildęs (-usi) nė vieno naudotojo.",
-  "empty_column.notifications": "Dar neturi jokių pranešimų. Kai kiti žmonės su tavimi bendraus, matysi tai čia.",
-  "empty_column.public": "Čia nieko nėra! Parašyk ką nors viešai arba rankiniu būdu sek naudotojus iš kitų serverių, kad jį užpildytum.",
+  "empty_column.notification_requests": "Viskas švaru! Čia nieko nėra. Kai gausi naujų pranešimų, jie bus rodomi čia pagal tavo nustatymus.",
+  "empty_column.notifications": "Dar neturi jokių pranešimų. Kai kiti žmonės su tavimi sąveikaus, matysi tai čia.",
+  "empty_column.public": "Čia nieko nėra. Parašyk ką nors viešai arba rankiniu būdu sek naudotojus iš kitų serverių, kad jį užpildytum.",
   "error.unexpected_crash.explanation": "Dėl mūsų kodo riktos arba naršyklės suderinamumo problemos šis puslapis negalėjo būti rodomas teisingai.",
   "error.unexpected_crash.explanation_addons": "Šį puslapį nepavyko parodyti teisingai. Šią klaidą greičiausiai sukėlė naršyklės priedas arba automatinio vertimo įrankiai.",
   "error.unexpected_crash.next_steps": "Pabandyk atnaujinti puslapį. Jei tai nepadeda, galbūt vis dar galėsi naudotis Mastodon per kitą naršyklę arba savąją programėlę.",
@@ -270,9 +285,9 @@
   "filter_modal.added.context_mismatch_title": "Konteksto neatitikimas.",
   "filter_modal.added.expired_explanation": "Ši filtro kategorija nustojo galioti. Kad ji būtų taikoma, turėsi pakeisti galiojimo datą.",
   "filter_modal.added.expired_title": "Baigėsi filtro galiojimas.",
-  "filter_modal.added.review_and_configure": "Norint peržiūrėti ir toliau konfigūruoti šią filtro kategoriją, eik į nuorodą {settings_link}.",
+  "filter_modal.added.review_and_configure": "Norint peržiūrėti ir toliau konfigūruoti šią filtro kategoriją, eik į {settings_link}.",
   "filter_modal.added.review_and_configure_title": "Filtro nustatymai",
-  "filter_modal.added.settings_link": "nustatymų puslapis",
+  "filter_modal.added.settings_link": "nustatymų puslapį",
   "filter_modal.added.short_explanation": "Šis įrašas buvo pridėtas į šią filtro kategoriją: {title}.",
   "filter_modal.added.title": "Pridėtas filtras.",
   "filter_modal.select_filter.context_mismatch": "netaikoma šiame kontekste.",
@@ -283,6 +298,8 @@
   "filter_modal.select_filter.title": "Filtruoti šį įrašą",
   "filter_modal.title.status": "Filtruoti įrašą",
   "filtered_notifications_banner.mentions": "{count, plural, one {paminėjimas} few {paminėjimai} many {paminėjimo} other {paminėjimų}}",
+  "filtered_notifications_banner.pending_requests": "Pranešimai iš {count, plural, =0 {nė vieno} one {vienos žmogaus} few {# žmonių} many {# žmonių} other {# žmonių}}, kuriuos galbūt pažįsti",
+  "filtered_notifications_banner.title": "Filtruojami pranešimai",
   "firehose.all": "Visi",
   "firehose.local": "Šis serveris",
   "firehose.remote": "Kiti serveriai",
@@ -295,8 +312,8 @@
   "follow_suggestions.friends_of_friends_longer": "Populiarus tarp žmonių, kurių seki",
   "follow_suggestions.hints.featured": "Šį profilį atrinko {domain} komanda.",
   "follow_suggestions.hints.friends_of_friends": "Šis profilis yra populiarus tarp žmonių, kuriuos seki.",
-  "follow_suggestions.hints.most_followed": "Šis profilis yra vienas iš labiausiai sekamų {domain}.",
-  "follow_suggestions.hints.most_interactions": "Pastaruoju metu šis profilis sulaukia daug dėmesio šiame {domain}.",
+  "follow_suggestions.hints.most_followed": "Šis profilis yra vienas iš labiausiai sekamų domene {domain}.",
+  "follow_suggestions.hints.most_interactions": "Pastaruoju metu šis profilis sulaukia daug dėmesio domane {domain}.",
   "follow_suggestions.hints.similar_to_recently_followed": "Šis profilis panašus į profilius, kuriuos neseniai sekei.",
   "follow_suggestions.personalized_suggestion": "Suasmenintas pasiūlymas",
   "follow_suggestions.popular_suggestion": "Populiarus pasiūlymas",
@@ -312,8 +329,8 @@
   "footer.keyboard_shortcuts": "Spartieji klavišai",
   "footer.privacy_policy": "Privatumo politika",
   "footer.source_code": "Peržiūrėti šaltinio kodą",
-  "footer.status": "Būsena",
-  "generic.saved": "Išsaugoti",
+  "footer.status": "Statusas",
+  "generic.saved": "Išsaugota",
   "getting_started.heading": "Kaip pradėti",
   "hashtag.column_header.tag_mode.all": "ir {additional}",
   "hashtag.column_header.tag_mode.any": "ar {additional}",
@@ -333,7 +350,7 @@
   "home.column_settings.show_reblogs": "Rodyti pakėlimus",
   "home.column_settings.show_replies": "Rodyti atsakymus",
   "home.hide_announcements": "Slėpti skelbimus",
-  "home.pending_critical_update.body": "Kuo greičiau atnaujink savo Mastodon serverį!",
+  "home.pending_critical_update.body": "Kuo greičiau atnaujink savo Mastodon serverį.",
   "home.pending_critical_update.link": "Žiūrėti naujinimus",
   "home.pending_critical_update.title": "Galimas kritinis saugumo naujinimas.",
   "home.show_announcements": "Rodyti skelbimus",
@@ -480,7 +497,7 @@
   "notifications.column_settings.follow_request": "Nauji sekimo prašymai:",
   "notifications.column_settings.mention": "Paminėjimai:",
   "notifications.column_settings.poll": "Balsavimo rezultatai:",
-  "notifications.column_settings.push": "Stumdomieji pranešimai",
+  "notifications.column_settings.push": "Tiesioginiai pranešimai",
   "notifications.column_settings.reblog": "Pakėlimai:",
   "notifications.column_settings.show": "Rodyti stulpelyje",
   "notifications.column_settings.sound": "Paleisti garsą",
diff --git a/app/javascript/mastodon/locales/lv.json b/app/javascript/mastodon/locales/lv.json
index 55ceb564b637d4..32ea6e47c45a7c 100644
--- a/app/javascript/mastodon/locales/lv.json
+++ b/app/javascript/mastodon/locales/lv.json
@@ -8,7 +8,7 @@
   "about.domain_blocks.silenced.title": "Ierobežotie",
   "about.domain_blocks.suspended.explanation": "Nekādi dati no šī servera netiks apstrādāti, uzglabāti vai apmainīti, padarot neiespējamu mijiedarbību vai saziņu ar lietotājiem no šī servera.",
   "about.domain_blocks.suspended.title": "Apturētie",
-  "about.not_available": "Šī informācija šajā serverī nav bijusi pieejama.",
+  "about.not_available": "Šī informācija nav padarīta pieejama šajā serverī.",
   "about.powered_by": "Decentralizētu sociālo tīklu nodrošina {mastodon}",
   "about.rules": "Servera noteikumi",
   "account.account_note_header": "Piezīme",
@@ -89,6 +89,9 @@
   "announcement.announcement": "Paziņojums",
   "attachments_list.unprocessed": "(neapstrādāti)",
   "audio.hide": "Slēpt audio",
+  "block_modal.remote_users_caveat": "Mēs vaicāsim serverim {domain} ņemt vērā Tavu lēmumu. Tomēr atbilstība nav nodrošināta, jo atsevišķi serveri var apstrādāt bloķēšanu citādi. Publiski ieraksti joprojām var būt redzami lietotājiem, kuri nav pieteikušies.",
+  "block_modal.show_less": "Parādīt vairāk",
+  "block_modal.show_more": "Parādīt mazāk",
   "boost_modal.combo": "Nospied {combo}, lai nākamreiz šo izlaistu",
   "bundle_column_error.copy_stacktrace": "Kopēt kļūdu ziņojumu",
   "bundle_column_error.error.body": "Pieprasīto lapu nevarēja atveidot. Tas varētu būt saistīts ar kļūdu mūsu kodā, vai tā ir pārlūkprogrammas saderības problēma.",
@@ -190,7 +193,7 @@
   "directory.federated": "No pazīstamas federācijas",
   "directory.local": "Tikai no {domain}",
   "directory.new_arrivals": "Jaunpienācēji",
-  "directory.recently_active": "Nesen aktīvie",
+  "directory.recently_active": "Nesen aktīvi",
   "disabled_account_banner.account_settings": "Konta iestatījumi",
   "disabled_account_banner.text": "Tavs konts {disabledAccount} pašlaik ir atspējots.",
   "dismissable_banner.community_timeline": "Šie ir jaunākie publiskie ieraksti no cilvēkiem, kuru konti ir mitināti {domain}.",
@@ -199,6 +202,9 @@
   "dismissable_banner.explore_statuses": "Šie ir ieraksti, kas šodien gūst arvien lielāku ievērību visā sociālajā tīklā. Augstāk tiek kārtoti jaunāki ieraksti, kuri tiek vairāk pastiprināti un ievietoti izlasēs.",
   "dismissable_banner.explore_tags": "Šie tēmturi šobrīd kļūst arvien populārāki cilvēku vidū šajā un citos decentralizētā tīkla serveros.",
   "dismissable_banner.public_timeline": "Šie ir jaunākie publiskie ieraksti no lietotājiem sociālajā tīmeklī, kuriem {domain} seko cilvēki.",
+  "domain_block_modal.they_cant_follow": "Neviens šajā serverī nevar Tev sekot.",
+  "domain_pill.server": "Serveris",
+  "domain_pill.username": "Lietotājvārds",
   "embed.instructions": "Iestrādā šo ziņu savā mājaslapā, kopējot zemāk redzamo kodu.",
   "embed.preview": "Tas izskatīsies šādi:",
   "emoji_button.activity": "Aktivitāte",
@@ -275,6 +281,7 @@
   "follow_suggestions.curated_suggestion": "Darbinieku izvēle",
   "follow_suggestions.dismiss": "Vairs nerādīt",
   "follow_suggestions.personalized_suggestion": "Pielāgots ieteikums",
+  "follow_suggestions.similar_to_recently_followed_longer": "Līdzīgi profieliem, kuriem nesen sāki sekot",
   "follow_suggestions.view_all": "Skatīt visu",
   "follow_suggestions.who_to_follow": "Kam sekot",
   "followed_tags": "Sekojamie tēmturi",
@@ -388,6 +395,10 @@
   "loading_indicator.label": "Ielādē…",
   "media_gallery.toggle_visible": "{number, plural, one {Slēpt attēlu} other {Slēpt attēlus}}",
   "moved_to_account_banner.text": "Tavs konts {disabledAccount} pašlaik ir atspējots, jo Tu pārcēlies uz kontu {movedToAccount}.",
+  "mute_modal.hide_from_notifications": "Paslēpt paziņojumos",
+  "mute_modal.hide_options": "Paslēpt iespējas",
+  "mute_modal.show_options": "Parādīt iespējas",
+  "mute_modal.title": "Apklusināt lietotāju?",
   "navigation_bar.about": "Par",
   "navigation_bar.advanced_interface": "Atvērt paplašinātā tīmekļa saskarnē",
   "navigation_bar.blocks": "Bloķētie lietotāji",
@@ -420,11 +431,23 @@
   "notification.follow": "{name} uzsāka Tev sekot",
   "notification.follow_request": "{name} nosūtīja Tev sekošanas pieprasījumu",
   "notification.mention": "{name} pieminēja Tevi",
+  "notification.moderation-warning.learn_more": "Uzzināt vairāk",
+  "notification.moderation_warning.action_delete_statuses": "Daži no Taviem ierakstiem tika noņemti.",
+  "notification.moderation_warning.action_disable": "Tavs konts tika atspējots.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Daži no Taviem ierakstiem tika atzīmēti kā jutīgi.",
+  "notification.moderation_warning.action_sensitive": "Tavi ieraksti turpmāk tiks atzīmēti kā jutīgi.",
+  "notification.moderation_warning.action_silence": "Tavs konts tika ierobežots.",
+  "notification.moderation_warning.action_suspend": "Tava konta darbība tika apturēta.",
   "notification.own_poll": "Tava aptauja ir noslēgusies",
   "notification.poll": "Aptauja, kurā tu piedalījies, ir noslēgusies",
   "notification.reblog": "{name} pastiprināja Tavu ierakstu",
+  "notification.relationships_severance_event": "Zaudēti savienojumi ar {name}",
+  "notification.relationships_severance_event.learn_more": "Uzzināt vairāk",
   "notification.status": "{name} tikko publicēja",
   "notification.update": "{name} rediģēja ierakstu",
+  "notification_requests.accept": "Pieņemt",
+  "notification_requests.dismiss": "Noraidīt",
+  "notification_requests.notifications_from": "Paziņojumi no {name}",
   "notifications.clear": "Notīrīt paziņojumus",
   "notifications.clear_confirmation": "Vai tiešām vēlies neatgriezeniski notīrīt visus savus paziņojumus?",
   "notifications.column_settings.admin.report": "Jauni ziņojumi:",
@@ -456,6 +479,9 @@
   "notifications.permission_denied": "Darbvirsmas paziņojumi nav pieejami, jo iepriekš tika noraidīts pārlūka atļauju pieprasījums",
   "notifications.permission_denied_alert": "Darbvirsmas paziņojumus nevar iespējot, jo pārlūkprogrammai atļauja tika iepriekš atteikta",
   "notifications.permission_required": "Darbvirsmas paziņojumi nav pieejami, jo nav piešķirta nepieciešamā atļauja.",
+  "notifications.policy.filter_new_accounts_title": "Jauni konti",
+  "notifications.policy.filter_not_followers_title": "Cilvēki, kuri Tev neseko",
+  "notifications.policy.filter_not_following_title": "Cilvēki, kuriem Tu neseko",
   "notifications_permission_banner.enable": "Iespējot darbvirsmas paziņojumus",
   "notifications_permission_banner.how_to_control": "Lai saņemtu paziņojumus, kad Mastodon nav atvērts, iespējo darbvirsmas paziņojumus. Vari precīzi kontrolēt, kāda veida mijiedarbības rada darbvirsmas paziņojumus, izmantojot augstāk redzamo pogu {icon}, kad tie būs iespējoti.",
   "notifications_permission_banner.title": "Nekad nepalaid neko garām",
@@ -485,7 +511,7 @@
   "onboarding.start.title": "Tev tas izdevās!",
   "onboarding.steps.follow_people.body": "Tu pats veido savu plūsmu. Piepildīsim to ar interesantiem cilvēkiem.",
   "onboarding.steps.follow_people.title": "Pielāgo savu mājas barotni",
-  "onboarding.steps.publish_status.body": "Sveicini pasauli ar tekstu, fotoattēliem, video, vai aptaujām {emoji}",
+  "onboarding.steps.publish_status.body": "Pasveicini pasauli ar tekstu, attēliem, video vai aptaujām {emoji}",
   "onboarding.steps.publish_status.title": "Izveido savu pirmo ziņu",
   "onboarding.steps.setup_profile.body": "Palielini mijiedarbību ar aptverošu profilu!",
   "onboarding.steps.setup_profile.title": "Pielāgo savu profilu",
@@ -603,7 +629,7 @@
   "search_results.statuses": "Ieraksti",
   "search_results.title": "Meklēt {q}",
   "server_banner.about_active_users": "Cilvēki, kas izmantojuši šo serveri pēdējo 30 dienu laikā (aktīvie lietotāji mēnesī)",
-  "server_banner.active_users": "aktīvie lietotāji",
+  "server_banner.active_users": "aktīvi lietotāji",
   "server_banner.administered_by": "Administrē:",
   "server_banner.introduction": "{domain} ir daļa no decentralizētā sociālā tīkla, ko nodrošina {mastodon}.",
   "server_banner.learn_more": "Uzzināt vairāk",
@@ -625,6 +651,7 @@
   "status.direct": "Pieminēt @{name} privāti",
   "status.direct_indicator": "Pieminēts privāti",
   "status.edit": "Labot",
+  "status.edited": "Pēdējoreiz labots {date}",
   "status.edited_x_times": "Labots {count, plural, one {{count} reizi} other {{count} reizes}}",
   "status.embed": "Iegult",
   "status.favourite": "Izlasē",
diff --git a/config/locales/devise.ia.yml b/config/locales/devise.ia.yml
index b365668210fb0c..d83c708647718a 100644
--- a/config/locales/devise.ia.yml
+++ b/config/locales/devise.ia.yml
@@ -21,28 +21,47 @@ ia:
       confirmation_instructions:
         action: Verificar adresse de e-mail
         action_with_app: Confirmar e retornar a %{app}
+        explanation: Tu ha create un conto sur %{host} con iste adresse de e-mail. Tu es a un sol clic de activar lo. Si isto non esseva tu, per favor ignora iste e-mail.
+        explanation_when_pending: Tu ha sollicitate un invitation a %{host} con iste adresse de e-mail. Post que tu confirma tu adresse de e-mail, nos va revider tu demanda. Tu pote aperir session pro cambiar tu detalios o eliminar tu conto, ma tu non pote acceder al majoritate del functiones usque tu conto es approbate. Si tu demanda es rejectate, tu datos essera removite e nulle action ulterior essera requirite de te. Si isto non esseva tu, per favor ignora iste message de e-mail.
+        extra_html: Per favor consulta tamben <a href="%{terms_path}">le regulas del servitor</a> e <a href="%{policy_path}">nostre conditiones de servicio</a>.
         subject: 'Mastodon: Instructiones de confirmation pro %{instance}'
         title: Verificar adresse de e-mail
       email_changed:
         explanation: 'Le adresse de e-mail pro tu conto essera cambiate a:'
+        extra: Si tu non ha cambiate de adresse de e-mail, es probabile que alcuno ha ganiate le accesso a tu conto. Per favor cambia immediatemente tu contrasigno o contacta le administrator del servitor si tu non pote acceder a tu conto.
         subject: 'Mastodon: E-mail cambiate'
         title: Nove adresse de e-mail
       password_change:
         explanation: Le contrasigno de tu conto ha essite cambiate.
+        extra: Si tu non ha cambiate tu contrasigno, es probabile que alcuno ha ganiate le accesso a tu conto. Per favor cambia immediatemente tu contrasigno o contacta le administrator del servitor si tu non pote acceder a tu conto.
         subject: 'Mastodon: Contrasigno cambiate'
         title: Contrasigno cambiate
       reconfirmation_instructions:
         explanation: Confirma le nove adresse pro cambiar tu email.
+        extra: Si non es tu qui ha initiate iste cambiamento, per favor ignora iste e-mail. Le adresse de e-mail pro le conto de Mastodon non cambiara usque tu accede al ligamine hic supra.
         subject: 'Mastodon: Confirmar e-mail pro %{instance}'
         title: Verificar adresse de e-mail
       reset_password_instructions:
         action: Cambiar contrasigno
+        explanation: Tu ha requestate un nove contrasigno pro tu conto.
+        extra: Si tu non ha requestate isto, per favor ignora iste e-mail. Tu contrasigno non cambiara usque tu accede al ligamine hic supra e crea un nove.
         subject: 'Mastodon: Instructiones pro reinitialisar le contrasigno'
         title: Reinitialisar contrasigno
       two_factor_disabled:
+        explanation: Ora es possibile aperir session con solmente le adresse de e-mail e contrasigno.
+        subject: 'Mastodon: Authentication bifactorial disactivate'
+        subtitle: Le authentication bifactorial ha essite disactivate pro tu conto.
         title: 2FA disactivate
       two_factor_enabled:
+        explanation: Pro le apertura de session essera necessari un token generate per le application TOTP accopulate.
+        subject: 'Mastodon: Authentication bifactorial activate'
+        subtitle: Le authentication bifactorial ha essite activate pro tu conto.
         title: 2FA activate
+      two_factor_recovery_codes_changed:
+        explanation: Le ancian codices de recuperation ha essite invalidate e nove codices ha essite generate.
+        subject: 'Mastodon: Codices de recuperation regenerate'
+        subtitle: Le ancian codices de recuperation ha essite invalidate e nove codices ha essite generate.
+        title: Codices de recuperation cambiate
       unlock_instructions:
         subject: 'Mastodon: Instructiones pro disblocar'
       webauthn_credential:
@@ -53,9 +72,15 @@ ia:
         deleted:
           explanation: Le sequente clave de securitate esseva delite de tu conto
           subject: 'Mastodon: Clave de securitate delite'
+          title: Un de tu claves de securitate ha essite delite
       webauthn_disabled:
+        explanation: Le authentication con claves de securitate ha essite disactivate pro tu conto.
+        extra: Ora es possibile aperir session usante solmente le token generate per le application TOTP accopulate.
+        subject: 'Mastodon: Le authentication con claves de securitate es disactivate'
         title: Claves de securitate disactivate
       webauthn_enabled:
+        explanation: Le authentication con claves de securitate ha essite activate pro tu conto.
+        extra: Tu clave de securitate pote ora esser usate pro aperir session.
         title: Claves de securitate activate
     registrations:
       destroyed: A revider! Tu conto esseva cancellate con successo. Nos spera vider te novemente tosto.
diff --git a/config/locales/doorkeeper.ia.yml b/config/locales/doorkeeper.ia.yml
index 86bd1ad9853ca2..b5bd6cc5369fbb 100644
--- a/config/locales/doorkeeper.ia.yml
+++ b/config/locales/doorkeeper.ia.yml
@@ -34,10 +34,12 @@ ia:
         title: Nove application
       show:
         actions: Actiones
+        scopes: Ambitos
         title: 'Application: %{name}'
     authorizations:
       buttons:
         authorize: Autorisar
+        deny: Negar
       error:
         title: Ocurreva un error
     authorized_applications:
@@ -66,7 +68,9 @@ ia:
         conversations: Conversationes
         favourites: Favoritos
         filters: Filtros
+        follows: Sequites
         lists: Listas
+        media: Annexos multimedial
         mutes: Silentiates
         notifications: Notificationes
         push: Notificationes push
diff --git a/config/locales/doorkeeper.ie.yml b/config/locales/doorkeeper.ie.yml
index 0119f3573f13b3..fc8132c926d8b7 100644
--- a/config/locales/doorkeeper.ie.yml
+++ b/config/locales/doorkeeper.ie.yml
@@ -174,6 +174,7 @@ ie:
       read:filters: vider tui filtres
       read:follows: vider tui sequitores
       read:lists: vider tui listes
+      read:me: leer solmen li basic information de tui conto
       read:mutes: vider tui silentias
       read:notifications: vider tui notificationes
       read:reports: vider tui raportes
diff --git a/config/locales/doorkeeper.lt.yml b/config/locales/doorkeeper.lt.yml
index 5be291bf89e604..82695d8ba69fec 100644
--- a/config/locales/doorkeeper.lt.yml
+++ b/config/locales/doorkeeper.lt.yml
@@ -31,8 +31,8 @@ lt:
       form:
         error: Ups! Patikrink, ar formoje nėra galimų klaidų.
       help:
-        native_redirect_uri: Naudoti %{native_redirect_uri} vietiniams bandymams
-        redirect_uri: Naudoti po vieną eilutę kiekvienam URI
+        native_redirect_uri: Naudok %{native_redirect_uri} vietiniams bandymams.
+        redirect_uri: Naudok po vieną eilutę kiekvienam URI.
         scopes: Atskirk aprėptis tarpais. Palik tuščią, jei nori naudoti numatytąsias aprėtis.
       index:
         application: Programėlė
@@ -90,7 +90,7 @@ lt:
           request_not_authorized: Užklausą reikia įgalioti. Reikalingo parametro užklausai įgalioti trūksta arba jis netinkamas.
           unknown: Užklausoje trūksta privalomo parametro, turi nepalaikomą parametro reikšmę arba yra kitaip netinkamai suformuota.
         invalid_resource_owner: Pateikti išteklių savininko įgaliojimai yra netinkami arba išteklių savininko negalima surasti.
-        invalid_scope: Užklausos aprėptis yra netinkama, nežinoma arba netinkamai suformuota.
+        invalid_scope: Užklausos aprėptis yra netinkama, nežinoma arba netaisyklingas.
         invalid_token:
           expired: Baigėsi prieigos rakto galiojimas.
           revoked: Prieigos raktas buvo panaikintas.
@@ -133,9 +133,9 @@ lt:
         follows: Sekimai
         lists: Sąrašai
         media: Medijos priedai
-        mutes: Užtildymai
+        mutes: Nutildymai
         notifications: Pranešimai
-        push: Stumdomieji pranešimai
+        push: Tiesioginiai pranešimai
         reports: Ataskaitos
         search: Paieška
         statuses: Įrašai
@@ -147,30 +147,30 @@ lt:
       application:
         title: Reikalingas OAuth leidimas
     scopes:
-      admin:read: skaityti visus serveryje esančius duomenis
-      admin:read:accounts: skaityti neskelbtiną visų paskyrų informaciją
-      admin:read:canonical_email_blocks: skaityti neskelbtiną visų kanoninių el. laiško blokavimų informaciją
-      admin:read:domain_allows: skaityti neskelbtiną visų domeno leidimus informaciją
-      admin:read:domain_blocks: skaityti neskelbtiną visų domeno blokavimų informaciją
-      admin:read:email_domain_blocks: skaityti neskelbtiną visų el. laiško domeno blokavimų informaciją
-      admin:read:ip_blocks: skaityti neskelbtiną visų IP blokavimų informaciją
-      admin:read:reports: skaityti neskelbtiną visų ataskaitų ir praneštų paskyrų informaciją
-      admin:write: modifikuoti visus serveryje esančius duomenis
+      admin:read: skaityti visus duomenis serveryje
+      admin:read:accounts: skaityti slaptą visų paskyrų informaciją
+      admin:read:canonical_email_blocks: skaityti slaptą visų kanoninių el. laiško blokavimų informaciją
+      admin:read:domain_allows: skaityti slaptą visų domeno leidimus informaciją
+      admin:read:domain_blocks: skaityti slaptą visų domeno blokavimų informaciją
+      admin:read:email_domain_blocks: skaityti slaptą visų el. laiško domeno blokavimų informaciją
+      admin:read:ip_blocks: skaityti slaptą visų IP blokavimų informaciją
+      admin:read:reports: skaityti slaptą visų ataskaitų ir praneštų paskyrų informaciją
+      admin:write: modifikuoti visus duomenis serveryje
       admin:write:accounts: atlikti paskyrų prižiūrėjimo veiksmus
       admin:write:canonical_email_blocks: atlikti kanoninių el. laiško blokavimų prižiūrėjimo veiksmus
-      admin:write:domain_allows: atlikti prižiūrėjimo veiksmus su domeno leidimais
-      admin:write:domain_blocks: atlikti prižiūrėjimo veiksmus su domenų blokavimais
-      admin:write:email_domain_blocks: atlikti prižiūrėjimo veiksmus su el. laiško domenų blokavimais
-      admin:write:ip_blocks: atlikti prižiūrėjimo veiksmus su IP blokavimais
-      admin:write:reports: atlikti paskyrų prižiūrėjimo veiksmus atsakaitams
+      admin:write:domain_allows: atlikti domeno leidimų prižiūrėjimo veiksmus
+      admin:write:domain_blocks: atlikti domeno blokavimų prižiūrėjimo veiksmus
+      admin:write:email_domain_blocks: atlikti el. laiško domenų blokavimų prižiūrėjimo veiksmus
+      admin:write:ip_blocks: atlikti IP blokavimų prižiūrėjimo veiksmus
+      admin:write:reports: atlikti ataskaitų prižiūrėjimo veiksmus
       crypto: naudoti visapusį šifravimą
       follow: modifikuoti paskyros sąryšius
-      push: gauti tavo stumiamuosius pranešimus
-      read: skaityti tavo visus paskyros duomenis
+      push: gauti tiesioginius pranešimus
+      read: skaityti visus paskyros duomenis
       read:accounts: matyti paskyrų informaciją
       read:blocks: matyti tavo blokavimus
       read:bookmarks: matyti tavo žymes
-      read:favourites: matyti tavo mėgstamiausius
+      read:favourites: matyti tavo mėgstamus
       read:filters: matyti tavo filtrus
       read:follows: matyti tavo sekimus
       read:lists: matyti tavo sąrašus
@@ -183,14 +183,14 @@ lt:
       write: modifikuoti visus tavo paskyros duomenis
       write:accounts: modifikuoti tavo profilį
       write:blocks: blokuoti paskyras ir domenus
-      write:bookmarks: įrašyti įrašus
+      write:bookmarks: pridėti į žymes įrašus
       write:conversations: nutildyti ir ištrinti pokalbius
-      write:favourites: mėgti įrašai
+      write:favourites: pamėgti įrašus
       write:filters: sukurti filtrus
       write:follows: sekti žmones
       write:lists: sukurti sąrašus
       write:media: įkelti medijos failus
       write:mutes: nutildyti žmones ir pokalbius
       write:notifications: išvalyti tavo pranešimus
-      write:reports: pranešti kitus asmenus
+      write:reports: pranešti apie kitus žmones
       write:statuses: skelbti įrašus
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index bdf6e5a75f2958..57af7c82c030db 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -5,7 +5,7 @@ gl:
     contact_missing: Non establecido
     contact_unavailable: Non dispoñíbel
     hosted_on: Mastodon aloxado en %{domain}
-    title: Acerca de
+    title: Sobre
   accounts:
     follow: Seguir
     followers:
@@ -503,7 +503,7 @@ gl:
         instance_follows_measure: as súas seguidoras aquí
         instance_languages_dimension: Top de idiomas
         instance_media_attachments_measure: anexos multimedia gardados
-        instance_reports_measure: denuncias acerca deles
+        instance_reports_measure: denuncias sobre eles
         instance_statuses_measure: publicacións gardadas
       delivery:
         all: Todo
@@ -615,7 +615,7 @@ gl:
       created_at: Denunciado
       delete_and_resolve: Eliminar publicacións
       forwarded: Reenviado
-      forwarded_replies_explanation: Esta denuncia procede dunha usuaria remota e acerca de contido remoto. Enviouseche unha copia porque o contido denunciado é unha resposta a unha das túas usuarias.
+      forwarded_replies_explanation: Esta denuncia procede dunha usuaria remota e sobre contido remoto. Enviouseche unha copia porque o contido denunciado é unha resposta a unha das túas usuarias.
       forwarded_to: Reenviado a %{domain}
       mark_as_resolved: Marcar como resolto
       mark_as_sensitive: Marcar como sensible
@@ -740,7 +740,7 @@ gl:
         manage_rules: Xestionar regras do servidor
         preamble: Proporciona información detallada acerca do xeito en que se xestiona, modera e financia o servidor.
         rules_hint: Hai un espazo dedicado para as normas que é de agardar as usuarias acaten.
-        title: Acerca de
+        title: Sobre
       appearance:
         preamble: Personalizar a interface web de Mastodon.
         title: Aparencia
@@ -1870,7 +1870,7 @@ gl:
       feature_action: Saber máis
       feature_audience: Mastodon dache a oportunidade de xestionar sen intermediarios as túas relacións. Incluso se usas o teu propio servidor Mastodon poderás seguir e ser seguida desde calquera outro servidor Mastodon conectado á rede e estará baixo o teu control exclusivo.
       feature_audience_title: Crea a túa audiencia con tranquilidade
-      feature_control: Sabes mellor ca ninguén o que queres ver na cronoloxía. Non hai algoritmos nin publicidade facéndoche perder o tempo. Segue cunha soa conta a outras persoas en servidores Mastodon diferentes ao teu, recibirás as publicacións en orde cronolóxica, e farás deste curruchiño de internet un lugar para ti.
+      feature_control: Sabes mellor ca ninguén o que queres ver na cronoloxía. Non hai algoritmos nin publicidade facéndoche perder o tempo. Sigue cunha soa conta a outras persoas en servidores Mastodon diferentes ao teu, recibirás as publicacións en orde cronolóxica, e farás deste curruchiño de internet un lugar para ti.
       feature_control_title: Tes o control da túa cronoloxía
       feature_creativity: Mastodon ten soporte para audio, vídeo e imaxes nas publicacións, descricións para mellorar a accesibilidade, enquisas, avisos sobre o contido, avatares animados, emojis personalizados, control sobre o recorte de miniaturas, e moito máis, para axudarche a expresarte en internet. Tanto se publicas o teu arte, música ou podcast, Mastodon está aquí para ti.
       feature_creativity_title: Creatividade incomparable
diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index 193f2b0d5972b2..712328deb83144 100644
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -886,6 +886,7 @@ ia:
           one: Compartite per un persona le septimana passate
           other: Compartite per %{count} personas le septimana passate
         title: Ligamines de tendentia
+        usage_comparison: Compartite %{today} vices hodie, comparate al %{yesterday} de heri
       not_allowed_to_trend: Non permittite haber tendentia
       only_allowed: Solo permittite
       pending_review: Attende revision
@@ -915,6 +916,7 @@ ia:
           tag_servers_dimension: Servitores principal
           tag_servers_measure: servitores differente
           tag_uses_measure: usos total
+        description_html: Istos es hashtags que actualmente appare in tante messages que tu servitor vide. Illo pote adjutar tu usatores a discoperir re que le personas parla plus al momento. Nulle hashtags es monstrate publicamente usque tu los approba.
         listable: Pote esser suggerite
         no_tag_selected: Nulle placas era cambiate perque nulle era seligite
         not_listable: Non sera suggerite
@@ -940,21 +942,47 @@ ia:
     webhooks:
       add_new: Adder terminal
       delete: Deler
+      description_html: Un <strong>croc web</strong> habilita Mastodon a transmitter <strong>notificationes in tempore real</strong> re eventos seligite pro tu pro activar application, assi tu application pote <strong>automaticamente discatenar reactiones</strong>.
       disable: Disactivar
       disabled: Disactivate
       edit: Rediger terminal
+      empty: Tu ancora non ha configurate alcun punctos final de web croc.
       enable: Activar
       enabled: Active
       enabled_events:
         one: 1 evento activate
         other: "%{count} eventos activate"
       events: Eventos
+      new: Nove croc web
+      rotate_secret: Rotar secrete
+      secret: Firmante secrete
       status: Stato
+      title: Crocs web
+      webhook: Crocs web
   admin_mailer:
+    auto_close_registrations:
+      subject: Le registrationes pro %{instance} ha essite automaticamente mutate a besoniante de approbation
+    new_appeal:
+      actions:
+        delete_statuses: pro deler lor messages
+        disable: pro gelar lor conto
+        mark_statuses_as_sensitive: pro marcar lor messages como sensibile
+        none: pro advertir
+        sensitive: a marcar lor conto como sensibile
+        silence: pro limitar lor conto
+        suspend: pro suspender lor conto
+      body: "%{target} appella un decision de moderation per %{action_taken_by} ab le %{date}, que era %{type}. Ille scribeva:"
     new_critical_software_updates:
       subject: Actualisationes critic de Mastodon es disponibile pro %{instance}!
     new_software_updates:
       subject: Nove versiones de Mastodon es disponibile pro %{instance}!
+    new_trends:
+      new_trending_links:
+        title: Ligamines de tendentia
+      new_trending_statuses:
+        title: Messages de tendentia
+      new_trending_tags:
+        title: Hashtags de tendentia
   aliases:
     add_new: Crear alias
   appearance:
@@ -962,6 +990,7 @@ ia:
     confirmation_dialogs: Dialogos de confirmation
     discovery: Discoperta
     localization:
+      body: Mastodon es traducite per voluntarios.
       guide_link: https://crowdin.com/project/mastodon
       guide_link_text: Totes pote contribuer.
     sensitive_content: Contento sensibile
@@ -1026,8 +1055,16 @@ ia:
       account_status: Stato del conto
       view_strikes: Examinar le admonitiones passate contra tu conto
   challenge:
+    confirm: Continuar
     invalid_password: Contrasigno non valide
     prompt: Confirma le contrasigno pro continuar
+  datetime:
+    distance_in_words:
+      half_a_minute: Justo ora
+      less_than_x_seconds: Justo ora
+      over_x_years: "%{count}a"
+      x_days: "%{count}d"
+      x_minutes: "%{count} m"
   deletes:
     confirm_password: Insere tu contrasigno actual pro verificar tu identitate
     proceed: Deler le conto
@@ -1206,6 +1243,10 @@ ia:
     activity: Activitate del conto
     most_recent: Plus recente
     status: Stato del conto
+  rss:
+    content_warning: 'Advertimento de contento:'
+    descriptions:
+      account: Messages public de @%{acct}
   sessions:
     activity: Ultime activitate
     browser: Navigator
@@ -1253,6 +1294,7 @@ ia:
     delete: Deletion de conto
     development: Disveloppamento
     edit_profile: Modificar profilo
+    featured_tags: Hashtags eminente
     import: Importar
     migrate: Migration de conto
     notifications: Notificationes de e-mail
@@ -1261,7 +1303,9 @@ ia:
     relationships: Sequites e sequitores
     strikes: Admonitiones de moderation
   severed_relationships:
+    download: Discargar (%{count})
     event_type:
+      account_suspension: Suspension del conto (%{target_name})
       domain_block: Suspension del servitor (%{target_name})
       user_domain_block: Tu ha blocate %{target_name}
     preamble: Tu pote perder sequites e sequitores quando tu bloca un dominio o quando tu moderatores decide suspender un servitor remote. Quando isto occurre, tu potera discargar listas de relationes rumpite, a inspectar e eventualmente importar in un altere servitor.
diff --git a/config/locales/ie.yml b/config/locales/ie.yml
index 46e55b9e19feb2..2b819c53de616e 100644
--- a/config/locales/ie.yml
+++ b/config/locales/ie.yml
@@ -1667,8 +1667,10 @@ ie:
     download: Descargar (%{count})
     event_type:
       account_suspension: Suspension del conto (%{target_name})
+      domain_block: Suspension del servitor (%{target_name})
       user_domain_block: Tu bloccat %{target_name}
     lost_followers: Perdit sequitores
+    lost_follows: Perdit sequetes
     preamble: Tu posse perdir tis queles tu seque e tui sequitores quande tu blocca un domonia o quande tui moderatores decide suspender un lontan servitor. Tande, tu va posser descargar listes de dejuntet relationes, a inspecter e possibilmen importar sur un altri servitor.
     type: Eveniment
   statuses:
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 0e90cc723e9546..f3f3e3a8fba7c9 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -739,6 +739,7 @@ ko:
         desc_html: 이것은 hCaptcha의 외부 스크립트에 의존합니다, 이것은 개인정보 보호에 위협을 가할 수도 있습니다. 추가적으로, <strong>이것은 몇몇 사람들(특히나 장애인들)에게 가입 절차의 접근성을 심각하게 떨어트릴 수 있습니다</strong>. 이러한 이유로, 대체제로 승인 전용이나 초대제를 통한 가입을 고려해보세요.
         title: 새로운 사용자가 계정 확인을 위해서는 CAPTCHA를 풀어야 하도록 합니다
       content_retention:
+        danger_zone: 위험한 영역
         preamble: 마스토돈에 저장된 사용자 콘텐츠를 어떻게 다룰지 제어합니다.
         title: 콘텐츠 보존기한
       default_noindex:
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 35111ad39643ee..b815cada5c7f74 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -535,12 +535,16 @@ lt:
       elasticsearch_preset_single_node:
         message_html: Tavo Elasticsearch klasteris turi tik vieną mazgą, <code>ES_PRESET</code> turėtų būti nustatyta į <code>single_node_cluster</code>.
     title: Administracija
+    trends:
+      preview_card_providers:
+        title: Leidėjai
     warning_presets:
       add_new: Pridėti naują
       delete: Ištrinti
       edit_preset: Keisti įspėjimo nustatymus
       title: Valdyti įspėjimo nustatymus
     webhooks:
+      description_html: "<strong>Webhook</strong> leidžia Mastodon siųsti <strong>realaus laiko pranešimus</strong> apie pasirinktus įvykius į tavo programą, kad programa galėtų <strong>automatiškai paleisti reakcijas</strong>."
       events: Įvykiai
   admin_mailer:
     auto_close_registrations:
@@ -665,6 +669,7 @@ lt:
       invalid_context: Jokio arba netinkamas pateiktas kontekstas
     index:
       delete: Ištrinti
+      empty: Neturi jokių filtrų.
       title: Filtrai
     new:
       title: Pridėti naują filtrą
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index ee839540075d6a..f4f0aa9db27742 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -761,6 +761,7 @@ lv:
         desc_html: Tas balstās uz ārējiem skriptiem no hCaptcha, kas var radīt bažas par drošību un privātumu. Turklāt <strong>tas var padarīt reģistrācijas procesu ievērojami mazāk pieejamu dažiem cilvēkiem (īpaši invalīdiem)</strong>. Šo iemeslu dēļ, lūdzu, apsver alternatīvus pasākumus, piemēram, reģistrāciju, kas balstīta uz apstiprinājumu vai uzaicinājumu.
         title: Pieprasīt jaunajiem lietotājiem atrisināt CAPTCHA, lai apstiprinātu savu kontu
       content_retention:
+        danger_zone: Bīstama sadaļa
         preamble: Kontrolē, kā Mastodon tiek glabāts lietotāju ģenerēts saturs.
         title: Satura saglabāšana
       default_noindex:
@@ -1631,6 +1632,7 @@ lv:
       unknown_browser: Nezināms Pārlūks
       weibo: Weibo
     current_session: Pašreizējā sesija
+    date: Datums
     description: "%{browser} uz %{platform}"
     explanation: Šie ir tīmekļa pārlūki, kuros šobrīd esi pieteicies savā Mastodon kontā.
     ip: IP
@@ -1667,6 +1669,7 @@ lv:
     import: Imports
     import_and_export: Imports un eksports
     migrate: Konta migrācija
+    notifications: E-pasta paziņojumi
     preferences: Iestatījumi
     profile: Profils
     relationships: Sekojamie un sekotāji
@@ -1674,6 +1677,9 @@ lv:
     strikes: Moderācijas aizrādījumi
     two_factor_authentication: Divpakāpju autentifikācija
     webauthn_authentication: Drošības atslēgas
+  severed_relationships:
+    download: Lejupielādēt (%{count})
+    type: Notikums
   statuses:
     attached:
       audio:
@@ -1800,6 +1806,7 @@ lv:
     webauthn: Drošības atslēgas
   user_mailer:
     appeal_approved:
+      action: Konta iestatījumi
       explanation: Apelācija par brīdinājumu jūsu kontam %{strike_date}, ko iesniedzāt %{appeal_date}, ir apstiprināta. Jūsu konts atkal ir labā stāvoklī.
       subject: Jūsu %{date} apelācija ir apstiprināta
       title: Apelācija apstiprināta
@@ -1849,15 +1856,28 @@ lv:
         silence: Konts ierobežots
         suspend: Konts apturēts
     welcome:
+      apps_android_action: Iegūt to Google Play
+      apps_title: Mastodon lietotnes
       edit_profile_action: Pielāgot
       edit_profile_title: Pielāgo savu profilu
       explanation: Šeit ir daži padomi, kā sākt darbu
+      feature_action: Uzzināt vairāk
       feature_creativity: Mastodon nodrošina skaņas, video un attēlu ierakstus, pieejamības aprakstus, aptaujas, satura brīdinājumus, animētus profila attēlus, pielāgotas emocijzīmes, sīktēlu apgriešanas vadīklas un vēl, lai palīdzētu Tev sevi izpaust tiešsaistē. Vai Tu izplati savu mākslu, mūziku vai aplādes, Mastodon ir šeit ar Tevi.
+      follow_action: Sekot
       follow_title: Pielāgo savu mājas barotni
+      follows_title: Kam sekot
+      follows_view_more: Rādīt vairāk cilvēku, kuriem sekot
       hashtags_recent_count:
         one: "%{people} cilvēks pēdējās 2 dienās"
         other: "%{people} cilvēki pēdējās 2 dienās"
         zero: "%{people} cilvēku pēdējās divās dienās"
+      post_action: Rakstīt
+      post_step: Pasveicini pasauli ar tekstu, fotoattēliem, video vai aptaujām!
+      post_title: Izveido savu pirmo ierakstu
+      share_action: Kopīgot
+      share_step: Dari saviem draugiem zināmu, kā Tevi atrast Mastodon!
+      share_title: Kopīgo savu Mastodon profilu
+      sign_in_action: Pieteikties
       subject: Laipni lūgts Mastodon
       title: Laipni lūgts uz borta, %{name}!
   users:
@@ -1865,6 +1885,7 @@ lv:
     go_to_sso_account_settings: Dodies uz sava identitātes nodrošinātāja konta iestatījumiem
     invalid_otp_token: Nederīgs divfaktora kods
     otp_lost_help_html: Ja esi zaudējis piekļuvi abiem, tu vari sazināties ar %{email}
+    rate_limited: Pārāk daudz autentifikācijas mēģinājumu, vēlāk jāmēģina vēlreiz.
     seamless_external_login: Tu esi pieteicies, izmantojot ārēju pakalpojumu, tāpēc paroles un e-pasta iestatījumi nav pieejami.
     signed_in_as: 'Pieteicies kā:'
   verification:
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 9cb9cadee975a4..60730d53e977a7 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -751,6 +751,7 @@ pt-BR:
         desc_html: Isso é baseado em scripts externos de hCaptcha, o que pode ser uma preocupação de segurança e privacidade. Além disso, <strong>isso pode tornar o processo de registro significativamente menos acessível para algumas pessoas (especialmente deficientes)</strong>. Por estas razões, favor considerar medidas alternativas como o registro baseado em aprovação ou em convite.
         title: Exigir que novos usuários resolvam um CAPTCHA para confirmar sua conta
       content_retention:
+        danger_zone: Zona de perigo
         preamble: Controlar como o conteúdo gerado pelo usuário é armazenado no Mastodon.
         title: Retenção de conteúdo
       default_noindex:
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index 1099e3d0d7e3c6..cd54d51051d838 100644
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -566,6 +566,7 @@ ro:
       blocking: Lista de blocare
       domain_blocking: Listă de blocare domenii
       following: Lista de urmărire
+      lists: Liste
       muting: Lista de ignorare
     upload: Încarcă
   invites:
@@ -622,6 +623,14 @@ ro:
       body: 'Postarea ta a fost impulsionată de %{name}:'
       subject: "%{name} ți-a impulsionat postarea"
       title: Impuls nou
+  number:
+    human:
+      decimal_units:
+        units:
+          billion: B
+          million: M
+          quadrillion: Q
+          thousand: K
   polls:
     errors:
       expired: Sondajul s-a încheiat deja
diff --git a/config/locales/simple_form.ar.yml b/config/locales/simple_form.ar.yml
index a1406b1ad9d2f9..370667d48ea5f8 100644
--- a/config/locales/simple_form.ar.yml
+++ b/config/locales/simple_form.ar.yml
@@ -77,10 +77,15 @@ ar:
           warn: إخفاء المحتوى الذي تم تصفيته خلف تحذير يذكر عنوان الفلتر
       form_admin_settings:
         activity_api_enabled: عدد المنشورات المحلية و المستخدمين الناشطين و التسجيلات الأسبوعية الجديدة
+        app_icon: WEBP أو PNG أو GIF أو JPG. يتجاوز أيقونة التطبيق الافتراضية على الجوالات مع أيقونة مخصصة.
+        backups_retention_period: للمستخدمين القدرة على إنشاء أرشيفات لمنشوراتهم لتحميلها في وقت لاحق. عند التعيين إلى قيمة موجبة، سيتم حذف هذه الأرشيف تلقائياً من وحدة تخزينك بعد عدد الأيام المحدد.
         bootstrap_timeline_accounts: سيتم تثبيت هذه الحسابات على قمة التوصيات للمستخدمين الجدد.
         closed_registrations_message: ما سيعرض عند إغلاق التسجيلات
+        content_cache_retention_period: سيتم حذف جميع المنشورات من الخوادم الأخرى (بما في ذلك التعزيزات والردود) بعد عدد الأيام المحدد، دون أي تفاعل محلي للمستخدم مع هذه المنشورات. وهذا يشمل المنشورات التي قام المستخدم المحلي بوضع علامة عليها كإشارات مرجعية أو المفضلة. وسوف تختفي أيضا الإشارات الخاصة بين المستخدمين من المثيلات المختلفة ويستحيل استعادتها. والغرض من استخدام هذا الإعداد هو مثيلات الغرض الخاص ويفسد الكثير من توقعات المستخدمين عند تنفيذها للاستخدام لأغراض عامة.
         custom_css: يمكنك تطبيق أساليب مخصصة على نسخة الويب من ماستدون.
+        favicon: WEBP أو PNG أو GIF أو JPG. يتجاوز أيقونة التطبيق المفضلة الافتراضية مع أيقونة مخصصة.
         mascot: تجاوز الرسوم التوضيحية في واجهة الويب المتقدمة.
+        media_cache_retention_period: ملفات الوسائط من المنشورات التي يقوم بها المستخدمون البعيدون يتم تخزينها في خادمك. عند التعيين إلى قيمة موجبة، سيتم حذف الوسائط بعد عدد الأيام المحدد. إذا كانت بيانات الوسائط مطلوبة بعد حذفها، فسيتم إعادة تحميلها إذا كان محتوى المصدر لا يزال متاحًا. بسبب القيود المفروضة على عدد المرات التي يتم فيها ربط بطاقات المعاينة لمواقع الطرف الثالث، يوصى بتعيين هذه القيمة إلى 14 يوماً على الأقل، أو لن يتم تحديث بطاقات معاينة الرابط عند الطلب قبل ذلك الوقت.
         peers_api_enabled: قائمة بأسماء النطاقات التي صادفها هذا الخادم في الفدرالية. لا توجد بيانات هنا حول ما إذا كنت تتحد مع خادم معين، فقط أن خادمك يعرف عنها. ويستخدم هذا الخدمات التي تجمع الإحصاءات المتعلقة بالاتحاد بشكل عام.
         profile_directory: دليل الملف الشخصي يسرد جميع المستخدمين الذين اختاروا الدخول ليكونوا قابلين للاكتشاف.
         require_invite_text: عندما تتطلب التسجيلات الموافقة اليدوية، اجعل إدخال النص "لماذا تريد الانضمام ؟" إلزاميا بدلا من اختياري
diff --git a/config/locales/simple_form.bg.yml b/config/locales/simple_form.bg.yml
index a4a2027137c4c3..f14a21b0c70036 100644
--- a/config/locales/simple_form.bg.yml
+++ b/config/locales/simple_form.bg.yml
@@ -77,11 +77,13 @@ bg:
           warn: Скриване на филтрираното съдържание зад предупреждение, споменавайки заглавието на филтъра
       form_admin_settings:
         activity_api_enabled: Броят на местните публикувани публикации, дейни потребители и нови регистрации в седмични кофи
+        app_icon: WEBP, PNG, GIF или JPG. Заменя подразбиращата се икона на приложението в мобилни устройства с произволна икона.
         backups_retention_period: Потребителите имат способността да пораждат архиви от публикациите си за по-късно изтегляне. Задавайки положителна стойност, тези архиви самодейно ще се изтрият от хранилището ви след определения брой дни.
         bootstrap_timeline_accounts: Тези акаунти ще се закачат в горния край на препоръките за следване на нови потребители.
         closed_registrations_message: Показва се, когато е затворено за регистрации
         content_cache_retention_period: Всички публикации от други сървъри, включително подсилвания и отговори, ще се изтрият след посочения брой дни, без да се взема предвид каквото и да е взаимодействие на местния потребител с тези публикации. Това включва публикации, които местния потребител е означил като отметки или любими. Личните споменавания между потребители от различни инстанции също ще се загубят и невъзможно да се възстановят. Употребата на тази настройка е предназначена за случаи със специално предназначение и разбива очакванията на много потребители, когато се изпълнява за употреба с общо предназначение.
         custom_css: Може да прилагате собствени стилове в уебверсията на Mastodon.
+        favicon: WEBP, PNG, GIF или JPG. Заменя стандартната сайтоикона на Mastodon с произволна икона.
         mascot: Замества илюстрацията в разширения уеб интерфейс.
         media_cache_retention_period: Мултимедийни файлове от публикации, направени от отдалечени потребители, се сринаха в сървъра ви. Задавайки положителна стойност, мултимедията ще се изтрие след посочения брой дни. Ако се искат мултимедийни данни след изтриването, то ще се изтегли пак, ако още е наличен източникът на съдържание. Поради ограниченията за това колко често картите за предварващ преглед на връзките анкетират сайтове на трети страни, се препоръчва да зададете тази стойност на поне 14 дни или картите за предварващ преглед на връзките няма да се обновяват при поискване преди този момент.
         peers_api_enabled: Списък от имена на домейни, с които сървърът се е свързал във федивселената. Тук не се включват данни за това дали федерирате с даден сървър, а само за това дали сървърът ви знае за него. Това се ползва от услуги, събиращи статистика за федерацията в общия смисъл.
diff --git a/config/locales/simple_form.de.yml b/config/locales/simple_form.de.yml
index c1056260bbf975..7d397866977712 100644
--- a/config/locales/simple_form.de.yml
+++ b/config/locales/simple_form.de.yml
@@ -77,13 +77,13 @@ de:
           warn: Den gefilterten Beitrag hinter einer Warnung, die den Filtertitel beinhaltet, ausblenden
       form_admin_settings:
         activity_api_enabled: Anzahl der wöchentlichen Beiträge, aktiven Profile und Registrierungen auf diesem Server
-        app_icon: WEBP, PNG, GIF oder JPG Überschreibt das Standard-App-Symbol auf mobilen Geräten mit einem benutzerdefinierten Symbol.
+        app_icon: WEBP, PNG, GIF oder JPG. Überschreibt das Standard-App-Symbol auf mobilen Geräten mit einem eigenen Symbol.
         backups_retention_period: Nutzer*innen haben die Möglichkeit, Archive ihrer Beiträge zu erstellen, die sie später herunterladen können. Wenn ein positiver Wert gesetzt ist, werden diese Archive nach der festgelegten Anzahl von Tagen automatisch aus deinem Speicher gelöscht.
         bootstrap_timeline_accounts: Diese Konten werden bei den Follower-Empfehlungen für neu registrierte Nutzer*innen oben angeheftet.
         closed_registrations_message: Wird angezeigt, wenn Registrierungen deaktiviert sind
         content_cache_retention_period: Sämtliche Beiträge von anderen Servern (einschließlich geteilte Beiträge und Antworten) werden, unabhängig von der Interaktion der lokalen Nutzer*innen mit diesen Beiträgen, nach der festgelegten Anzahl von Tagen gelöscht. Das betrifft auch Beiträge, die von lokalen Nutzer*innen favorisiert oder als Lesezeichen gespeichert wurden. Private Erwähnungen zwischen Nutzer*innen von verschiedenen Servern werden ebenfalls verloren gehen und können nicht wiederhergestellt werden. Das Verwenden dieser Option richtet sich ausschließlich an Server für spezielle Zwecke und wird die allgemeine Nutzungserfahrung beeinträchtigen, wenn sie für den allgemeinen Gebrauch aktiviert ist.
         custom_css: Du kannst benutzerdefinierte Stile auf die Web-Version von Mastodon anwenden.
-        favicon: WEBP, PNG, GIF oder JPG überschreibt das Standard-Mastodon favicon mit einem benutzerdefinierten Icon.
+        favicon: WEBP, PNG, GIF oder JPG. Überschreibt das Standard-Mastodon-Favicon mit einem eigenen Symbol.
         mascot: Überschreibt die Abbildung in der erweiterten Weboberfläche.
         media_cache_retention_period: Mediendateien aus Beiträgen von externen Nutzer*innen werden auf deinem Server zwischengespeichert. Wenn ein positiver Wert gesetzt ist, werden die Medien nach der festgelegten Anzahl von Tagen gelöscht. Sollten die Medien nach dem Löschvorgang wieder angefragt werden, werden sie erneut heruntergeladen, sofern der ursprüngliche Inhalt noch vorhanden ist. Es wird empfohlen, diesen Wert auf mindestens 14 Tage festzulegen, da die Häufigkeit der Abfrage von Linkvorschaukarten für Websites von Dritten begrenzt ist und die Linkvorschaukarten sonst nicht vor Ablauf dieser Zeit aktualisiert werden.
         peers_api_enabled: Eine Liste von Domains, die diesem Server im Fediverse begegnet sind. Hierbei werden keine Angaben darüber gemacht, ob du mit einem bestimmten Server föderierst, sondern nur, dass dein Server davon weiß. Dies wird von Diensten verwendet, die allgemein Statistiken übers Ferdiverse sammeln.
diff --git a/config/locales/simple_form.hu.yml b/config/locales/simple_form.hu.yml
index 8fee5b414d4c8a..6ccca2bc847928 100644
--- a/config/locales/simple_form.hu.yml
+++ b/config/locales/simple_form.hu.yml
@@ -83,7 +83,7 @@ hu:
         closed_registrations_message: Akkor jelenik meg, amikor a regisztráció le van zárva
         content_cache_retention_period: Minden más kiszolgálóról származó bejegyzés (megtolásokkal és válaszokkal együtt) törölve lesz a megadott számú nap elteltével, függetlenül a helyi felhasználók ezekkel a bejegyzésekkel történő interakcióitól. Ebben azok a bejegyzések is benne vannak, melyeket a helyi felhasználó könyvjelzőzött vagy kedvencnek jelölt. A különböző kiszolgálók felhasználói közötti privát üzenetek is el fognak veszni visszaállíthatatlanul. Ennek a beállításnak a használata különleges felhasználási esetekre javasolt, mert számos felhasználói elvárás fog eltörni, ha általános céllal használják.
         custom_css: A Mastodon webes verziójában használhatsz egyéni stílusokat.
-        favicon: WEBP, PNG, GIF vagy JPG. Az alapértelmezett Mastodon favicon felülírása egy egyéni ikonnal.
+        favicon: WEBP, PNG, GIF vagy JPG. Az alapértelmezett Mastodon favicont felülírja egy egyéni ikonnal.
         mascot: Felülbírálja a speciális webes felületen található illusztrációt.
         media_cache_retention_period: A távoli felhasználók bejegyzéseinek médiatartalmait a kiszolgálód gyorsítótárazza. Ha pozitív értékre állítják, ezek a médiatartalmak a megadott számú nap után törölve lesznek. Ha a médiát újra lekérik, miután törlődött, újra le fogjuk tölteni, ha az eredeti még elérhető. A hivatkozások előnézeti kártyáinak harmadik fél weboldalai felé történő hivatkozásaira alkalmazott megkötései miatt javasolt, hogy ezt az értéket legalább 14 napra állítsuk, ellenkező esetben a hivatkozások előnézeti kártyái szükség esetén nem fognak tudni frissülni ezen idő előtt.
         peers_api_enabled: Azon domainek listája, melyekkel ez a kiszolgáló találkozott a fediverzumban. Nem csatolunk adatot arról, hogy föderált kapcsolatban vagy-e az adott kiszolgálóval, csak arról, hogy a kiszolgálód tud a másikról. Ezt olyan szolgáltatások használják, melyek általában a föderációról készítenek statisztikákat.
diff --git a/config/locales/simple_form.ia.yml b/config/locales/simple_form.ia.yml
index c796cb5fac51e3..51329edd88e650 100644
--- a/config/locales/simple_form.ia.yml
+++ b/config/locales/simple_form.ia.yml
@@ -77,11 +77,13 @@ ia:
           warn: Celar le contento filtrate detra un aviso citante le titulo del filtro
       form_admin_settings:
         activity_api_enabled: Numeros de messages localmente publicate, usatores active, e nove registrationes in gruppos septimanal
+        app_icon: WEBP, PNG, GIF o JPG. Supplanta le icone predefinite sur apparatos mobile con un icone personalisate.
         backups_retention_period: Le usatores pote generar archivos de lor messages pro discargar los plus tarde. Quando predefinite a un valor positive, iste archivos sera automaticamente delite de tu immagazinage post le specificate numero de dies.
         bootstrap_timeline_accounts: Iste contos sera appunctate al summitate del recommendationes a sequer del nove usatores.
         closed_registrations_message: Monstrate quando le inscriptiones es claudite
         content_cache_retention_period: Tote messages de altere servitores (includite stimulos e responsas) sera delite post le specificate numero de dies, sin considerar alcun interaction de usator local con ille messages. Isto include messages ubi un usator local los ha marcate como marcapaginas o favoritos. Mentiones private inter usatores de differente instantias sera alsi perdite e impossibile a restaurar. Le uso de iste parametros es intendite pro specific instantias e infringe multe expectationes de usator quando implementate pro uso general.
         custom_css: Tu pote applicar stilos personalisate sur le version de web de Mastodon.
+        favicon: WEBP, PNG, GIF o JPG. Supplanta le favicone predefinite de Mastodon con un icone personalisate.
         mascot: Illo substitue le illustration in le interfacie web avantiate.
         media_cache_retention_period: Le files multimedial de messages producite per usatores remote es in cache sur tu servitor. Quando predefinite a un valor positive, le medios sera delite post le numero de dies specificate. Le datos multimedial requirite post que illo es delite, sera re-discargate, si le contento original sera ancora disponibile. Per limitationes sur le frequentia con que le schedas de pre-visualisation de ligamine scruta le sitos de tertie partes, il es recommendate de predefinir iste valor a al minus 14 dies, o le schedas de pre-visualisation de ligamine non sera actualisate sur demanda ante ille tempore.
         peers_api_enabled: Un lista de nomines de dominio que iste servitor ha incontrate in le fediverso. Nulle datos es includite ci re tu federation con un date servitor, justo que tu servitor lo cognosce. Isto es usate per servicios que collige statistica re le federation in senso general.
diff --git a/config/locales/simple_form.it.yml b/config/locales/simple_form.it.yml
index 5c0e6aa4e829f6..f5624344b9a3e7 100644
--- a/config/locales/simple_form.it.yml
+++ b/config/locales/simple_form.it.yml
@@ -77,11 +77,13 @@ it:
           warn: Nascondi il contenuto filtrato e mostra invece un avviso, citando il titolo del filtro
       form_admin_settings:
         activity_api_enabled: Conteggi di post pubblicati localmente, utenti attivi e nuove registrazioni in gruppi settimanali
+        app_icon: WEBP, PNG, GIF o JPG. Sostituisce l'icona dell'app predefinita sui dispositivi mobili con un'icona personalizzata.
         backups_retention_period: Gli utenti hanno la possibilità di generare archivi dei propri post da scaricare successivamente. Se impostati su un valore positivo, questi archivi verranno automaticamente eliminati dallo spazio di archiviazione dopo il numero di giorni specificato.
         bootstrap_timeline_accounts: Questi account verranno aggiunti in cima ai consigli da seguire dei nuovi utenti.
         closed_registrations_message: Visualizzato alla chiusura delle iscrizioni
         content_cache_retention_period: Tutti i post da altri server (inclusi booster e risposte) verranno eliminati dopo il numero specificato di giorni, senza tener conto di eventuali interazioni con gli utenti locali con tali post. Questo include i post in cui un utente locale ha contrassegnato come segnalibri o preferiti. Anche le menzioni private tra utenti di diverse istanze andranno perse e impossibile da ripristinare. L'uso di questa impostazione è inteso per casi di scopo speciale e rompe molte aspettative dell'utente quando implementato per uso generale.
         custom_css: È possibile applicare stili personalizzati sulla versione web di Mastodon.
+        favicon: WEBP, PNG, GIF o JPG. Sostituisce la favicon predefinita di Mastodon con un'icona personalizzata.
         mascot: Sostituisce l'illustrazione nell'interfaccia web avanzata.
         media_cache_retention_period: I file multimediali da post fatti da utenti remoti sono memorizzati nella cache sul tuo server. Quando impostato a un valore positivo, i media verranno eliminati dopo il numero specificato di giorni. Se i dati multimediali sono richiesti dopo che sono stati eliminati, saranno nuovamente scaricati, se il contenuto sorgente è ancora disponibile. A causa di restrizioni su quanto spesso link anteprima carte sondaggio siti di terze parti, si consiglia di impostare questo valore ad almeno 14 giorni, o le schede di anteprima link non saranno aggiornate su richiesta prima di quel tempo.
         peers_api_enabled: Un elenco di nomi di dominio che questo server ha incontrato nel fediverse. Qui non sono inclusi dati sul fatto se si federano con un dato server, solo che il server ne è a conoscenza. Questo viene utilizzato dai servizi che raccolgono statistiche sulla federazione in senso generale.
diff --git a/config/locales/simple_form.ko.yml b/config/locales/simple_form.ko.yml
index 6ab4e03222dd1d..df4755c4fbc15d 100644
--- a/config/locales/simple_form.ko.yml
+++ b/config/locales/simple_form.ko.yml
@@ -77,9 +77,11 @@ ko:
           warn: 필터 제목을 언급하는 경고 뒤에 걸러진 내용을 숨기기
       form_admin_settings:
         activity_api_enabled: 주별 로컬에 게시된 글, 활성 사용자 및 새로운 가입자 수
+        app_icon: WEBP, PNG, GIF 또는 JPG. 모바일 기기에 쓰이는 기본 아이콘을 대체합니다.
         bootstrap_timeline_accounts: 이 계정들은 팔로우 추천 목록 상단에 고정됩니다.
         closed_registrations_message: 새 가입을 차단했을 때 표시됩니다
         custom_css: 사용자 지정 스타일을 웹 버전의 마스토돈에 지정할 수 있습니다.
+        favicon: WEBP, PNG, GIF 또는 JPG. 기본 파비콘을 대체합니다.
         mascot: 고급 웹 인터페이스의 그림을 대체합니다.
         peers_api_enabled: 이 서버가 연합우주에서 만났던 서버들에 대한 도메인 네임의 목록입니다. 해당 서버와 어떤 연합을 했는지에 대한 정보는 전혀 포함되지 않고, 단순히 그 서버를 알고 있는지에 대한 것입니다. 이것은 일반적으로 연합에 대한 통계를 수집할 때 사용됩니다.
         profile_directory: 프로필 책자는 발견되기를 희망하는 모든 사람들의 목록을 나열합니다.
@@ -240,6 +242,7 @@ ko:
         backups_retention_period: 사용자 아카이브 유지 기한
         bootstrap_timeline_accounts: 새로운 사용자들에게 추천할 계정들
         closed_registrations_message: 가입이 불가능 할 때의 사용자 지정 메시지
+        content_cache_retention_period: 리모트 콘텐츠 보유 기간
         custom_css: 사용자 정의 CSS
         mascot: 사용자 정의 마스코트 (legacy)
         media_cache_retention_period: 미디어 캐시 유지 기한
diff --git a/config/locales/simple_form.lt.yml b/config/locales/simple_form.lt.yml
index 1be95a9f1b471a..6631b59b19e7f0 100644
--- a/config/locales/simple_form.lt.yml
+++ b/config/locales/simple_form.lt.yml
@@ -49,7 +49,7 @@ lt:
         header: WEBP, PNG, GIF arba JPG. Ne daugiau kaip %{size}. Bus sumažintas iki %{dimensions} tšk.
         inbox_url: Nukopijuok URL adresą iš pradinio puslapio perdavėjo, kurį nori naudoti
         irreversible: Filtruoti įrašai išnyks negrįžtamai, net jei vėliau filtras bus pašalintas
-        locale: Naudotojo sąsajos kalba, el. laiškai ir stumiamieji pranešimai
+        locale: Naudotojo sąsajos kalba, el. laiškai ir tiesioginiai pranešimai
         password: Naudok bent 8 simbolius
         phrase: Bus suderinta, neatsižvelgiant į teksto lygį arba įrašo turinio įspėjimą
         scopes: Prie kurių API programai bus leidžiama pasiekti. Pasirinkus aukščiausio lygio sritį, atskirų sričių pasirinkti nereikia.
diff --git a/config/locales/simple_form.nn.yml b/config/locales/simple_form.nn.yml
index bdd3db040d1b38..a93a803221e1b9 100644
--- a/config/locales/simple_form.nn.yml
+++ b/config/locales/simple_form.nn.yml
@@ -77,12 +77,13 @@ nn:
           warn: Skjul det filtrerte innhaldet bak ei åtvaring som nemner tittelen på filteret
       form_admin_settings:
         activity_api_enabled: Tal på lokale innlegg, aktive brukarar og nyregistreringar kvar veke
-        app_icon: WEBP, PNG, GIF eller JPG. Overstyrer standard-ikonet på mobile einingar med eit tilpassa ikon.
+        app_icon: WEBP, PNG, GIF eller JPG. Overstyrer standard-app-ikonet på mobile einingar med eit eigendefinert ikon.
         backups_retention_period: Brukarar har moglegheit til å generere arkiv av sine innlegg for å laste ned seinare. Når sett til ein positiv verdi, blir desse arkiva automatisk sletta frå lagringa etter eit gitt antal dagar.
         bootstrap_timeline_accounts: Desse kontoane vil bli festa øverst på fylgjaranbefalingane til nye brukarar.
         closed_registrations_message: Vist når det er stengt for registrering
         content_cache_retention_period: Alle innlegg frå andre serverar (inkludert boostar og svar) vil bli sletta etter dei gitte antal dagar, uten hensyn til lokale brukarinteraksjonar med desse innlegga. Dette inkluderer innlegg der ein lokal brukar har merka det som bokmerker eller som favorittar. Òg private nemningar mellom brukarar frå ulike førekomstar vil gå tapt og vere umogleg å gjenskape. Bruk av denne innstillinga er rekna på spesielle førekomstar og bryt mange brukarforventingar når dette blir tatt i generell bruk.
         custom_css: Du kan bruka eigendefinerte stilar på nettversjonen av Mastodon.
+        favicon: WEBP, PNG, GIF eller JPG. Overstyrer det standarde Mastodon-favikonet med eit eigendefinert ikon.
         mascot: Overstyrer illustrasjonen i det avanserte webgrensesnittet.
         media_cache_retention_period: Mediafiler frå innlegg laga av eksterne brukarar blir bufra på serveren din. Når sett til ein positiv verdi, slettast media etter eit gitt antal dagar. Viss mediedata blir førespurt etter det er sletta, vil dei bli lasta ned på nytt viss kjelda sitt innhald framleis er tilgjengeleg. På grunn av restriksjonar på kor ofte lenkeførehandsvisningskort lastar tredjepart-nettstadar, rådast det til å setje denne verdien til minst 14 dagar, eller at førehandsvisningskort ikkje blir oppdatert på førespurnad før det tidspunktet.
         peers_api_enabled: Ei liste over domenenamn denne tenaren har møtt på i allheimen. Det står ingenting om tenaren din samhandlar med ein annan tenar, berre om tenaren din veit om den andre. Dette blir brukt av tenester som samlar statistikk om føderering i det heile.
diff --git a/config/locales/simple_form.pt-BR.yml b/config/locales/simple_form.pt-BR.yml
index 9044546f2b12fc..77a0d8cd6f576b 100644
--- a/config/locales/simple_form.pt-BR.yml
+++ b/config/locales/simple_form.pt-BR.yml
@@ -77,10 +77,15 @@ pt-BR:
           warn: Ocultar o conteúdo filtrado por trás de um aviso mencionando o título do filtro
       form_admin_settings:
         activity_api_enabled: Contagem de publicações locais, usuários ativos e novos usuários semanais
+        app_icon: WEBP, PNG, GIF ou JPG. Sobrescrever o ícone padrão do aplicativo em dispositivos móveis com um ícone personalizado.
+        backups_retention_period: Os usuários têm a capacidade de gerar arquivos de suas postagens para baixar mais tarde. Quando definido como um valor positivo, esses arquivos serão automaticamente excluídos do seu armazenamento após o número especificado de dias.
         bootstrap_timeline_accounts: Estas contas serão fixadas no topo das recomendações de novos usuários para seguir.
         closed_registrations_message: Exibido quando as inscrições estiverem fechadas
+        content_cache_retention_period: Todas as postagens de outros servidores (incluindo boosts e respostas) serão excluídas após o número especificado de dias, sem levar a qualquer interação do usuário local com esses posts. Isto inclui postagens onde um usuário local o marcou como favorito ou favoritos. Menções privadas entre usuários de diferentes instâncias também serão perdidas e impossíveis de restaurar. O uso desta configuração destina-se a instâncias especiais de propósitos e quebra muitas expectativas dos usuários quando implementadas para uso de propósito geral.
         custom_css: Você pode aplicar estilos personalizados na versão da web do Mastodon.
+        favicon: WEBP, PNG, GIF ou JPG. Sobrescreve o favicon padrão do Mastodon com um ícone personalizado.
         mascot: Substitui a ilustração na interface web avançada.
+        media_cache_retention_period: Arquivos de mídia de mensagens de usuários remotos são armazenados em cache no seu servidor. Quando definido como valor positivo, a mídia será excluída após o número especificado de dias. Se os dados da mídia forem solicitados depois de excluídos, eles serão baixados novamente, se o conteúdo fonte ainda estiver disponível. Devido a restrições de quantas vezes os cartões de visualização de links sondam sites de terceiros, é recomendado definir este valor em pelo menos 14 dias, ou pré-visualização de links não serão atualizados a pedido antes desse tempo.
         peers_api_enabled: Uma lista de nomes de domínio que este servidor encontrou no "fediverse". Nenhum dado é incluído aqui sobre se você concorda com os padroes operacionais de um determinado servidor, apenas que o seu servidor sabe disso. Esta ferramenta é utilizado por serviços que recolhem estatísticas sob as normas da federação (grupo de empresas que concordam sob paramentros operacionais específicos), em termos gerais.
         profile_directory: O diretório de perfis lista todos os usuários que optaram por permitir que suas contas sejam descobertas.
         require_invite_text: 'Quando o cadastro de novas contas exigir aprovação manual, tornar obrigatório, ao invés de opcional, o texto de solicitação de convite: "Por que você deseja ingressar nessa comunidade?"'
diff --git a/config/locales/simple_form.ro.yml b/config/locales/simple_form.ro.yml
index 559302270805f3..dfb44c77453e56 100644
--- a/config/locales/simple_form.ro.yml
+++ b/config/locales/simple_form.ro.yml
@@ -163,5 +163,6 @@ ro:
     'no': Nu
     recommended: Recomandat
     required:
+      mark: "*"
       text: obligatoriu
     'yes': Da
diff --git a/config/locales/simple_form.sq.yml b/config/locales/simple_form.sq.yml
index d545f2cd341cba..c3c3920962d635 100644
--- a/config/locales/simple_form.sq.yml
+++ b/config/locales/simple_form.sq.yml
@@ -77,11 +77,13 @@ sq:
           warn: Fshihe lëndën e filtruar pas një sinjalizimi që përmend titullin e filtrit
       form_admin_settings:
         activity_api_enabled: Numër postimesh të botuar lokalisht, përdoruesish aktiv dhe regjistrimesh të reja sipas matjesh javore
+        app_icon: WEBP, PNG, GIF, ose JPG. Anashkalon ikonë parazgjedhje aplikacioni në pajisje celulare me një ikonë vetjake.
         backups_retention_period: Përdorues kanë aftësinë të prodhojnë arkiva të postimeve të tyre për t’i shkarkuar më vonë. Kur i jepet një vlerë pozitive, këto arkiva do të fshihen automatikisht prej depozitës tuaj pas numrit të dhënë të ditëve.
         bootstrap_timeline_accounts: Këto llogari do të fiksohen në krye të rekomandimeve për ndjekje nga përdorues të rinj.
         closed_registrations_message: Shfaqur kur mbyllen dritare regjistrimesh
         content_cache_retention_period: Krejt postimet prej shërbyesve të tjerë (përfshi përforcime dhe përgjigje) do të fshihen pas numrit të caktuar të ditëve, pa marrë parasysh çfarëdo ndërveprimi përdoruesi me këto postime. Kjo përfshin postime kur një përdorues vendor u ka vënë shenjë si faqerojtës, ose të parapëlqyer. Do të humbin gjithashtu dhe përmendje private mes përdoruesish nga instanca të ndryshme dhe s’do të jetë e mundshme të rikthehen. Përdorimi i këtij rregullimi është menduar për instanca me qëllim të caktuar dhe ndërhyn në çka presin mjaft përdorues, kur sendërtohet për përdorim të përgjithshëm.
         custom_css: Stile vetjakë mund të aplikoni në versionin web të Mastodon-it.
+        favicon: WEBP, PNG, GIF, ose JPG. Anashkalon favikonën parazgjedhje Mastodon me një ikonë vetjake.
         mascot: Anashkalon ilustrimin te ndërfaqja web e thelluar.
         media_cache_retention_period: Kartela media nga postime të bëra nga përdorues të largët ruhen në një fshehtinë në shërbyesin tuaj. Kur i jepet një vlerë pozitive, media do të fshihet pas numrit të dhënë të ditëve. Nëse të dhënat e medias duhen pas fshirjes, do të rishkarkohen, nëse lënda burim mund të kihet ende. Për shkak kufizimesh mbi sa shpesh skeda paraparjesh lidhjesh ndërveprojnë me sajte palësh të treta, rekomandohet të vihet kjo vlerë të paktën 14 ditë, ose skedat e paraparjes së lidhje s’do të përditësohen duke e kërkuar para asaj kohe.
         peers_api_enabled: Një listë emrash përkatësish që ky shërbyes ka hasur në fedivers. Këtu s’jepen të dhëna nëse jeni i federuar me shërbyesin e dhënë, thjesht tregohet se shërbyesi juaj e njeh. Kjo përdoret nga shërbime që mbledhin statistika mbi federimin në kuptimin e përgjithshëm.
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 5d0ebe2de04883..71e84a1d54daf3 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -671,7 +671,7 @@ uk:
           delete_html: 'Ви збираєтеся <strong>вилучити</strong> деякі з дописів <strong>@%{acct}</strong>. Це буде:'
           mark_as_sensitive_html: 'Ви збираєтеся <strong>позначити</strong> деякі з дописів <strong>@%{acct}</strong> <strong>делікатними</strong>. Це буде:'
           silence_html: 'Ви збираєтеся <strong>обмежити</strong> обліковий запис <strong>@%{acct}</strong>. Це буде:'
-          suspend_html: 'Ви збираєтесь <strong>призупинити</strong> обліковий запис <strong>@%%{acct}</strong>. Це буде:'
+          suspend_html: 'Ви збираєтесь <strong>призупинити</strong> обліковий запис <strong>@%{acct}</strong>. Це буде:'
         actions:
           delete_html: Вилучити образливі дописи
           mark_as_sensitive_html: Позначити медіа образливих дописів делікатними

From 040aaf3a48022edab19ac42980a6c5a991156ec9 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 10 May 2024 05:42:01 -0400
Subject: [PATCH 0976/2191] Use `default: ...` assignment for Devise config,
 fixes `Style/ClassVars` cop (#30214)

---
 .rubocop_todo.yml             |  4 ---
 config/initializers/devise.rb | 55 ++++++++++++-----------------------
 2 files changed, 19 insertions(+), 40 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 25b573017b89bc..4d20330e0e2d71 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -54,10 +54,6 @@ Style/ClassEqualityComparison:
     - 'app/helpers/jsonld_helper.rb'
     - 'app/serializers/activitypub/outbox_serializer.rb'
 
-Style/ClassVars:
-  Exclude:
-    - 'config/initializers/devise.rb'
-
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowedVars.
 Style/FetchEnvVar:
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index f935090efc2b9b..a95c7437fa073b 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -38,42 +38,25 @@
 end
 
 module Devise
-  mattr_accessor :pam_authentication
-  @@pam_authentication = false
-  mattr_accessor :pam_controlled_service
-  @@pam_controlled_service = nil
-
-  mattr_accessor :check_at_sign
-  @@check_at_sign = false
-
-  mattr_accessor :ldap_authentication
-  @@ldap_authentication = false
-  mattr_accessor :ldap_host
-  @@ldap_host = nil
-  mattr_accessor :ldap_port
-  @@ldap_port = nil
-  mattr_accessor :ldap_method
-  @@ldap_method = nil
-  mattr_accessor :ldap_base
-  @@ldap_base = nil
-  mattr_accessor :ldap_uid
-  @@ldap_uid = nil
-  mattr_accessor :ldap_mail
-  @@ldap_mail = nil
-  mattr_accessor :ldap_bind_dn
-  @@ldap_bind_dn = nil
-  mattr_accessor :ldap_password
-  @@ldap_password = nil
-  mattr_accessor :ldap_tls_no_verify
-  @@ldap_tls_no_verify = false
-  mattr_accessor :ldap_search_filter
-  @@ldap_search_filter = nil
-  mattr_accessor :ldap_uid_conversion_enabled
-  @@ldap_uid_conversion_enabled = false
-  mattr_accessor :ldap_uid_conversion_search
-  @@ldap_uid_conversion_search = nil
-  mattr_accessor :ldap_uid_conversion_replace
-  @@ldap_uid_conversion_replace = nil
+  mattr_accessor :pam_authentication, default: false
+  mattr_accessor :pam_controlled_service, default: nil
+
+  mattr_accessor :check_at_sign, default: false
+
+  mattr_accessor :ldap_authentication, default: false
+  mattr_accessor :ldap_host, default: nil
+  mattr_accessor :ldap_port, default: nil
+  mattr_accessor :ldap_method, default: nil
+  mattr_accessor :ldap_base, default: nil
+  mattr_accessor :ldap_uid, default: nil
+  mattr_accessor :ldap_mail, default: nil
+  mattr_accessor :ldap_bind_dn, default: nil
+  mattr_accessor :ldap_password, default: nil
+  mattr_accessor :ldap_tls_no_verify, default: false
+  mattr_accessor :ldap_search_filter, default: nil
+  mattr_accessor :ldap_uid_conversion_enabled, default: false
+  mattr_accessor :ldap_uid_conversion_search, default: nil
+  mattr_accessor :ldap_uid_conversion_replace, default: nil
 
   module Strategies
     class PamAuthenticatable

From fa43a6c8355ae53c0609999e1891023626ab4217 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 10 May 2024 05:43:59 -0400
Subject: [PATCH 0977/2191] Use more accurate `redirect_uri` in oauth spec
 (#30212)

---
 spec/system/oauth_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/system/oauth_spec.rb b/spec/system/oauth_spec.rb
index 060978217f2721..3b98ad352b663b 100644
--- a/spec/system/oauth_spec.rb
+++ b/spec/system/oauth_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 
 describe 'Using OAuth from an external app' do
-  let(:client_app) { Doorkeeper::Application.create!(name: 'test', redirect_uri: 'http://localhost/health', scopes: 'read') }
+  let(:client_app) { Doorkeeper::Application.create!(name: 'test', redirect_uri: about_url(host: Rails.application.config.x.local_domain), scopes: 'read') }
 
   context 'when the user is already logged in' do
     let!(:user) { Fabricate(:user) }

From f3f63107f263db86021565dad79be497db9e5257 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 10 May 2024 11:59:15 +0200
Subject: [PATCH 0978/2191] Update dependency @reduxjs/toolkit to v2.2.4
 (#30223)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 28cf500466b1cf..9aa8125d58b10d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3047,13 +3047,13 @@ __metadata:
   linkType: hard
 
 "@reduxjs/toolkit@npm:^2.0.1":
-  version: 2.2.3
-  resolution: "@reduxjs/toolkit@npm:2.2.3"
+  version: 2.2.4
+  resolution: "@reduxjs/toolkit@npm:2.2.4"
   dependencies:
     immer: "npm:^10.0.3"
     redux: "npm:^5.0.1"
     redux-thunk: "npm:^3.1.0"
-    reselect: "npm:^5.0.1"
+    reselect: "npm:^5.1.0"
   peerDependencies:
     react: ^16.9.0 || ^17.0.0 || ^18
     react-redux: ^7.2.1 || ^8.1.3 || ^9.0.0
@@ -3062,7 +3062,7 @@ __metadata:
       optional: true
     react-redux:
       optional: true
-  checksum: 10c0/f10f2c8f4b6c5c7a65d8d60246bdfde86b6cd2f542210ebdda8002223c7f4e99ed32964825e63f37345d9d12532671150fcec2809a40690931ae44afe8aba7f8
+  checksum: 10c0/fdbf510210a5aa4864432397e1a9469367e297cd1d9c09a82e68638df7555672c2f8511fe76f933b00efbbb233c534831591772a44e8c41233e34f3cd0f54569
   languageName: node
   linkType: hard
 
@@ -14987,10 +14987,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"reselect@npm:^5.0.1":
-  version: 5.0.1
-  resolution: "reselect@npm:5.0.1"
-  checksum: 10c0/0724b4555cd6411849de334a75177780f127af849eb71c4b709966d07ade8090d125c0c926dc6cf936866d23ebadda6aad1da93cd8340525323b889f25d56d51
+"reselect@npm:^5.1.0":
+  version: 5.1.0
+  resolution: "reselect@npm:5.1.0"
+  checksum: 10c0/b0ed789f4f6f10dfbd23741823726793384932969aa7ce8f584c882ad87620a02b09b5d1146cd2ea6eaa0953b3fd9f7df22f113893af73f35f28432a8a4294de
   languageName: node
   linkType: hard
 

From e20f2e7300d326bd637bec691607ad4c0e70dc8f Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 10 May 2024 08:34:20 -0400
Subject: [PATCH 0979/2191] Update i18n to version 1.14.5 (#30198)

---
 Gemfile      |  2 +-
 Gemfile.lock | 19 +++++--------------
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/Gemfile b/Gemfile
index eb507e9d1859ff..c7e07f9642a49b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -57,7 +57,7 @@ gem 'htmlentities', '~> 4.3'
 gem 'http', '~> 5.2.0'
 gem 'http_accept_language', '~> 2.1'
 gem 'httplog', '~> 1.6.2'
-gem 'i18n', '1.14.1' # TODO: Remove version when resolved: https://github.com/glebm/i18n-tasks/issues/552 / https://github.com/ruby-i18n/i18n/pull/688
+gem 'i18n'
 gem 'idn-ruby', require: 'idn'
 gem 'inline_svg'
 gem 'kaminari', '~> 1.2'
diff --git a/Gemfile.lock b/Gemfile.lock
index 9df960e61809b5..b4db2b9a073c34 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -130,14 +130,7 @@ GEM
       erubi (>= 1.0.0)
       rack (>= 0.9.0)
       rouge (>= 1.0.0)
-    better_html (2.1.1)
-      actionview (>= 6.0)
-      activesupport (>= 6.0)
-      ast (~> 2.0)
-      erubi (~> 1.4)
-      parser (>= 2.4)
-      smart_properties
-    bigdecimal (3.1.7)
+    bigdecimal (3.1.8)
     bindata (2.5.0)
     binding_of_caller (1.0.1)
       debug_inspector (>= 1.2.0)
@@ -328,12 +321,11 @@ GEM
     httplog (1.6.3)
       rack (>= 2.0)
       rainbow (>= 2.0.0)
-    i18n (1.14.1)
+    i18n (1.14.5)
       concurrent-ruby (~> 1.0)
-    i18n-tasks (1.0.13)
+    i18n-tasks (1.0.14)
       activesupport (>= 4.0.2)
       ast (>= 2.1.0)
-      better_html (>= 1.0, < 3.0)
       erubi
       highline (>= 2.0.0)
       i18n
@@ -601,7 +593,7 @@ GEM
     redlock (1.3.2)
       redis (>= 3.0.0, < 6.0)
     regexp_parser (2.9.0)
-    reline (0.5.5)
+    reline (0.5.6)
       io-console (~> 0.5)
     request_store (1.6.0)
       rack (>= 1.4)
@@ -723,7 +715,6 @@ GEM
     simplecov-html (0.12.3)
     simplecov-lcov (0.8.0)
     simplecov_json_formatter (0.1.4)
-    smart_properties (1.17.0)
     stackprof (0.2.26)
     statsd-ruby (1.5.0)
     stoplight (4.1.0)
@@ -860,7 +851,7 @@ DEPENDENCIES
   http (~> 5.2.0)
   http_accept_language (~> 2.1)
   httplog (~> 1.6.2)
-  i18n (= 1.14.1)
+  i18n
   i18n-tasks (~> 1.0)
   idn-ruby
   inline_svg

From 164b09bfcc7d2b8c3619411ee06f530256d9fe4b Mon Sep 17 00:00:00 2001
From: Joshua Young <djry1999@gmail.com>
Date: Fri, 10 May 2024 22:34:32 +1000
Subject: [PATCH 0980/2191] Update README.md setup steps (#30063)

---
 README.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 1d0e75dabad762..0353a4c675455f 100644
--- a/README.md
+++ b/README.md
@@ -70,7 +70,7 @@ Mastodon acts as an OAuth2 provider, so 3rd party apps can use the REST and Stre
 - **PostgreSQL** 12+
 - **Redis** 4+
 - **Ruby** 3.1+
-- **Node.js** 16+
+- **Node.js** 18+
 
 The repository includes deployment configurations for **Docker and docker-compose** as well as specific platforms like **Heroku**, **Scalingo**, and **Nanobox**. For Helm charts, reference the [mastodon/chart repository](https://github.com/mastodon/chart). The [**standalone** installation guide](https://docs.joinmastodon.org/admin/install/) is available in the documentation.
 
@@ -91,10 +91,12 @@ A **Vagrant** configuration is included for development purposes. To use it, com
 To set up **MacOS** for native development, complete the following steps:
 
 - Use a Ruby version manager to install the specified version from `.ruby-version`
+- Run `bundle` to install required gems
 - Run `brew install postgresql@14 redis imagemagick libidn` to install required dependencies
 - Navigate to Mastodon's root directory and run `brew install nvm` then `nvm use` to use the version from `.nvmrc`
+- Run `yarn` to install required packages
 - Run `corepack enable && corepack prepare`
-- Run `bundle exec rails db:setup` (optionally prepend `RAILS_ENV=development` to target the dev environment)
+- Run `RAILS_ENV=development bundle exec rails db:setup`
 - Finally, run `bin/dev` which will launch the local services via `overmind` (if installed) or `foreman`
 
 ### Docker

From 0d397db5dd803fab2b7ddda9ae0dd5c26f4880a6 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 10 May 2024 08:36:09 -0400
Subject: [PATCH 0981/2191] Consolidate system specs into single directory, use
 rspec tags for configuration (#30206)

---
 .github/workflows/test-ruby.yml               |  4 ++-
 .rubocop_todo.yml                             |  2 +-
 lib/tasks/spec.rake                           | 13 -------
 spec/rails_helper.rb                          | 36 ++++++++-----------
 spec/requests/content_security_policy_spec.rb |  2 +-
 spec/support/capybara.rb                      |  4 +++
 spec/support/javascript_errors.rb             |  2 +-
 spec/support/streaming_server_manager.rb      |  4 +--
 .../admin/accounts_spec.rb                    |  0
 .../admin/custom_emojis_spec.rb               |  0
 .../admin/domain_blocks_spec.rb               |  0
 .../admin/email_domain_blocks_spec.rb         |  0
 .../admin/ip_blocks_spec.rb                   |  0
 .../admin/software_updates_spec.rb            |  0
 .../admin/statuses_spec.rb                    |  0
 .../links/preview_card_providers_spec.rb      |  0
 .../admin/trends/links_spec.rb                |  0
 .../admin/trends/statuses_spec.rb             |  0
 .../admin/trends/tags_spec.rb                 |  0
 spec/{features => system}/captcha_spec.rb     |  0
 spec/{features => system}/log_in_spec.rb      |  0
 spec/system/new_statuses_spec.rb              |  2 +-
 spec/system/oauth_spec.rb                     |  2 +-
 spec/system/ocr_spec.rb                       |  2 +-
 spec/{features => system}/profile_spec.rb     |  0
 .../{features => system}/redirections_spec.rb |  0
 spec/system/report_interface_spec.rb          |  2 +-
 .../severed_relationships_spec.rb             |  0
 spec/system/share_entrypoint_spec.rb          |  2 +-
 spec/system/unlogged_spec.rb                  |  2 +-
 30 files changed, 32 insertions(+), 47 deletions(-)
 delete mode 100644 lib/tasks/spec.rake
 rename spec/{features => system}/admin/accounts_spec.rb (100%)
 rename spec/{features => system}/admin/custom_emojis_spec.rb (100%)
 rename spec/{features => system}/admin/domain_blocks_spec.rb (100%)
 rename spec/{features => system}/admin/email_domain_blocks_spec.rb (100%)
 rename spec/{features => system}/admin/ip_blocks_spec.rb (100%)
 rename spec/{features => system}/admin/software_updates_spec.rb (100%)
 rename spec/{features => system}/admin/statuses_spec.rb (100%)
 rename spec/{features => system}/admin/trends/links/preview_card_providers_spec.rb (100%)
 rename spec/{features => system}/admin/trends/links_spec.rb (100%)
 rename spec/{features => system}/admin/trends/statuses_spec.rb (100%)
 rename spec/{features => system}/admin/trends/tags_spec.rb (100%)
 rename spec/{features => system}/captcha_spec.rb (100%)
 rename spec/{features => system}/log_in_spec.rb (100%)
 rename spec/{features => system}/profile_spec.rb (100%)
 rename spec/{features => system}/redirections_spec.rb (100%)
 rename spec/{features => system}/severed_relationships_spec.rb (100%)

diff --git a/.github/workflows/test-ruby.yml b/.github/workflows/test-ruby.yml
index 84b907570837f2..45dc8a0deb816e 100644
--- a/.github/workflows/test-ruby.yml
+++ b/.github/workflows/test-ruby.yml
@@ -186,6 +186,8 @@ jobs:
       DISABLE_SIMPLECOV: true
       RAILS_ENV: test
       BUNDLE_WITH: test
+      LOCAL_DOMAIN: localhost:3000
+      LOCAL_HTTPS: false
 
     strategy:
       fail-fast: false
@@ -215,7 +217,7 @@ jobs:
       - name: Load database schema
         run: './bin/rails db:create db:schema:load db:seed'
 
-      - run: bundle exec rake spec:system
+      - run: bin/rspec spec/system --tag streaming --tag js
 
       - name: Archive logs
         uses: actions/upload-artifact@v4
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 4d20330e0e2d71..91e666d7f47446 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -70,7 +70,7 @@ Style/FetchEnvVar:
     - 'config/initializers/vapid.rb'
     - 'lib/mastodon/redis_config.rb'
     - 'lib/tasks/repo.rake'
-    - 'spec/features/profile_spec.rb'
+    - 'spec/system/profile_spec.rb'
 
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle, MaxUnannotatedPlaceholdersAllowed, AllowedMethods, AllowedPatterns.
diff --git a/lib/tasks/spec.rake b/lib/tasks/spec.rake
deleted file mode 100644
index d505a471953096..00000000000000
--- a/lib/tasks/spec.rake
+++ /dev/null
@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-if Rake::Task.task_defined?('spec:system')
-  namespace :spec do
-    task :enable_system_specs do # rubocop:disable Rails/RakeEnvironment
-      ENV['LOCAL_DOMAIN'] = 'localhost:3000'
-      ENV['LOCAL_HTTPS'] = 'false'
-      ENV['RUN_SYSTEM_SPECS'] = 'true'
-    end
-  end
-
-  Rake::Task['spec:system'].enhance ['spec:enable_system_specs']
-end
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 89fc25bcbdfb09..d8eb561d42446d 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -3,12 +3,8 @@
 ENV['RAILS_ENV'] ||= 'test'
 
 # This needs to be defined before Rails is initialized
-RUN_SYSTEM_SPECS = ENV.fetch('RUN_SYSTEM_SPECS', false)
-
-if RUN_SYSTEM_SPECS
-  STREAMING_PORT = ENV.fetch('TEST_STREAMING_PORT', '4020')
-  ENV['STREAMING_API_BASE_URL'] = "http://localhost:#{STREAMING_PORT}"
-end
+STREAMING_PORT = ENV.fetch('TEST_STREAMING_PORT', '4020')
+ENV['STREAMING_API_BASE_URL'] = "http://localhost:#{STREAMING_PORT}"
 
 require File.expand_path('../config/environment', __dir__)
 
@@ -26,10 +22,12 @@
 Dir[Rails.root.join('spec', 'support', '**', '*.rb')].each { |f| require f }
 
 ActiveRecord::Migration.maintain_test_schema!
-WebMock.disable_net_connect!(allow: Chewy.settings[:host], allow_localhost: RUN_SYSTEM_SPECS)
+WebMock.disable_net_connect!(
+  allow_localhost: true,
+  allow: Chewy.settings[:host]
+)
 Sidekiq.logger = nil
 
-# System tests config
 DatabaseCleaner.strategy = [:deletion]
 
 Devise::Test::ControllerHelpers.module_eval do
@@ -49,16 +47,14 @@ def sign_in(resource, _deprecated = nil, scope: nil)
 end
 
 RSpec.configure do |config|
-  # This is set before running spec:system, see lib/tasks/tests.rake
-  config.filter_run_excluding type: lambda { |type|
-    case type
-    when :system
-      !RUN_SYSTEM_SPECS
-    end
-  }
+  # By default, skip specs that need full JS browser
+  config.filter_run_excluding :js
 
-  # By default, skip the elastic search integration specs
-  config.filter_run_excluding search: true
+  # By default, skip specs that need elastic search server
+  config.filter_run_excluding :search
+
+  # By default, skip specs that need the streaming server
+  config.filter_run_excluding :streaming
 
   config.fixture_paths = [
     Rails.root.join('spec', 'fixtures'),
@@ -81,7 +77,7 @@ def sign_in(resource, _deprecated = nil, scope: nil)
   config.include Devise::Test::ControllerHelpers, type: :controller
   config.include Devise::Test::ControllerHelpers, type: :helper
   config.include Devise::Test::ControllerHelpers, type: :view
-  config.include Devise::Test::IntegrationHelpers, type: :feature
+  config.include Devise::Test::IntegrationHelpers, type: :system
   config.include Devise::Test::IntegrationHelpers, type: :request
   config.include ActionMailer::TestHelper
   config.include Paperclip::Shoulda::Matchers
@@ -111,10 +107,6 @@ def sign_in(resource, _deprecated = nil, scope: nil)
     stub_reset_connection_pools
   end
 
-  config.before :each, type: :feature do
-    Capybara.current_driver = :rack_test
-  end
-
   config.before do |example|
     allow(Resolv::DNS).to receive(:open).and_raise('Real DNS queries are disabled, stub Resolv::DNS as needed') unless example.metadata[:type] == :system
   end
diff --git a/spec/requests/content_security_policy_spec.rb b/spec/requests/content_security_policy_spec.rb
index d4447dca4befc5..ba6fe47741665b 100644
--- a/spec/requests/content_security_policy_spec.rb
+++ b/spec/requests/content_security_policy_spec.rb
@@ -23,7 +23,7 @@ def expected_csp_headers
     <<~CSP.split("\n").map(&:strip)
       base-uri 'none'
       child-src 'self' blob: https://cb6e6126.ngrok.io
-      connect-src 'self' data: blob: https://cb6e6126.ngrok.io ws://cb6e6126.ngrok.io:4000
+      connect-src 'self' data: blob: https://cb6e6126.ngrok.io #{Rails.configuration.x.streaming_api_base_url}
       default-src 'none'
       font-src 'self' https://cb6e6126.ngrok.io
       form-action 'self'
diff --git a/spec/support/capybara.rb b/spec/support/capybara.rb
index d4f27e209e11a6..be1378ffac73b2 100644
--- a/spec/support/capybara.rb
+++ b/spec/support/capybara.rb
@@ -26,6 +26,10 @@
 
 RSpec.configure do |config|
   config.before(:each, type: :system) do
+    driven_by :rack_test
+  end
+
+  config.before(:each, :js, type: :system) do
     driven_by Capybara.javascript_driver
   end
 end
diff --git a/spec/support/javascript_errors.rb b/spec/support/javascript_errors.rb
index a36bf6017e3233..28a43b3b8a59aa 100644
--- a/spec/support/javascript_errors.rb
+++ b/spec/support/javascript_errors.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 RSpec.configure do |config|
-  config.after(:each, type: :system) do
+  config.after(:each, :js, type: :system) do
     errors = page.driver.browser.logs.get(:browser)
     if errors.present?
       aggregate_failures 'javascript errrors' do
diff --git a/spec/support/streaming_server_manager.rb b/spec/support/streaming_server_manager.rb
index b702fc77cef597..3facf16b8ebab2 100644
--- a/spec/support/streaming_server_manager.rb
+++ b/spec/support/streaming_server_manager.rb
@@ -95,7 +95,7 @@ def stop
     end
   end
 
-  config.around :each, type: :system do |example|
+  config.around :each, :streaming, type: :system do |example|
     # Streaming server needs DB access but `use_transactional_tests` rolls back
     # every transaction. Disable this feature for streaming tests, and use
     # DatabaseCleaner to clean the database tables between each test.
@@ -125,6 +125,6 @@ def streaming_server_manager
   end
 
   def streaming_examples_present?
-    RUN_SYSTEM_SPECS
+    RSpec.world.filtered_examples.values.flatten.any? { |example| example.metadata[:streaming] == true }
   end
 end
diff --git a/spec/features/admin/accounts_spec.rb b/spec/system/admin/accounts_spec.rb
similarity index 100%
rename from spec/features/admin/accounts_spec.rb
rename to spec/system/admin/accounts_spec.rb
diff --git a/spec/features/admin/custom_emojis_spec.rb b/spec/system/admin/custom_emojis_spec.rb
similarity index 100%
rename from spec/features/admin/custom_emojis_spec.rb
rename to spec/system/admin/custom_emojis_spec.rb
diff --git a/spec/features/admin/domain_blocks_spec.rb b/spec/system/admin/domain_blocks_spec.rb
similarity index 100%
rename from spec/features/admin/domain_blocks_spec.rb
rename to spec/system/admin/domain_blocks_spec.rb
diff --git a/spec/features/admin/email_domain_blocks_spec.rb b/spec/system/admin/email_domain_blocks_spec.rb
similarity index 100%
rename from spec/features/admin/email_domain_blocks_spec.rb
rename to spec/system/admin/email_domain_blocks_spec.rb
diff --git a/spec/features/admin/ip_blocks_spec.rb b/spec/system/admin/ip_blocks_spec.rb
similarity index 100%
rename from spec/features/admin/ip_blocks_spec.rb
rename to spec/system/admin/ip_blocks_spec.rb
diff --git a/spec/features/admin/software_updates_spec.rb b/spec/system/admin/software_updates_spec.rb
similarity index 100%
rename from spec/features/admin/software_updates_spec.rb
rename to spec/system/admin/software_updates_spec.rb
diff --git a/spec/features/admin/statuses_spec.rb b/spec/system/admin/statuses_spec.rb
similarity index 100%
rename from spec/features/admin/statuses_spec.rb
rename to spec/system/admin/statuses_spec.rb
diff --git a/spec/features/admin/trends/links/preview_card_providers_spec.rb b/spec/system/admin/trends/links/preview_card_providers_spec.rb
similarity index 100%
rename from spec/features/admin/trends/links/preview_card_providers_spec.rb
rename to spec/system/admin/trends/links/preview_card_providers_spec.rb
diff --git a/spec/features/admin/trends/links_spec.rb b/spec/system/admin/trends/links_spec.rb
similarity index 100%
rename from spec/features/admin/trends/links_spec.rb
rename to spec/system/admin/trends/links_spec.rb
diff --git a/spec/features/admin/trends/statuses_spec.rb b/spec/system/admin/trends/statuses_spec.rb
similarity index 100%
rename from spec/features/admin/trends/statuses_spec.rb
rename to spec/system/admin/trends/statuses_spec.rb
diff --git a/spec/features/admin/trends/tags_spec.rb b/spec/system/admin/trends/tags_spec.rb
similarity index 100%
rename from spec/features/admin/trends/tags_spec.rb
rename to spec/system/admin/trends/tags_spec.rb
diff --git a/spec/features/captcha_spec.rb b/spec/system/captcha_spec.rb
similarity index 100%
rename from spec/features/captcha_spec.rb
rename to spec/system/captcha_spec.rb
diff --git a/spec/features/log_in_spec.rb b/spec/system/log_in_spec.rb
similarity index 100%
rename from spec/features/log_in_spec.rb
rename to spec/system/log_in_spec.rb
diff --git a/spec/system/new_statuses_spec.rb b/spec/system/new_statuses_spec.rb
index 5a3f1b406bef29..725ea8fe5209d4 100644
--- a/spec/system/new_statuses_spec.rb
+++ b/spec/system/new_statuses_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'NewStatuses', :sidekiq_inline do
+describe 'NewStatuses', :js, :sidekiq_inline, :streaming do
   include ProfileStories
 
   subject { page }
diff --git a/spec/system/oauth_spec.rb b/spec/system/oauth_spec.rb
index 3b98ad352b663b..1c9aca3114113c 100644
--- a/spec/system/oauth_spec.rb
+++ b/spec/system/oauth_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Using OAuth from an external app' do
+describe 'Using OAuth from an external app', :js, :streaming do
   let(:client_app) { Doorkeeper::Application.create!(name: 'test', redirect_uri: about_url(host: Rails.application.config.x.local_domain), scopes: 'read') }
 
   context 'when the user is already logged in' do
diff --git a/spec/system/ocr_spec.rb b/spec/system/ocr_spec.rb
index 254efa71370aff..4f4941adca581c 100644
--- a/spec/system/ocr_spec.rb
+++ b/spec/system/ocr_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'OCR', :paperclip_processing, :sidekiq_inline do
+describe 'OCR', :js, :paperclip_processing, :sidekiq_inline, :streaming do
   include ProfileStories
 
   let(:email)               { 'test@example.com' }
diff --git a/spec/features/profile_spec.rb b/spec/system/profile_spec.rb
similarity index 100%
rename from spec/features/profile_spec.rb
rename to spec/system/profile_spec.rb
diff --git a/spec/features/redirections_spec.rb b/spec/system/redirections_spec.rb
similarity index 100%
rename from spec/features/redirections_spec.rb
rename to spec/system/redirections_spec.rb
diff --git a/spec/system/report_interface_spec.rb b/spec/system/report_interface_spec.rb
index 6eba5525594f39..f82604aae89643 100644
--- a/spec/system/report_interface_spec.rb
+++ b/spec/system/report_interface_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'report interface', :paperclip_processing do
+describe 'report interface', :js, :paperclip_processing, :streaming do
   include ProfileStories
 
   let(:email)               { 'admin@example.com' }
diff --git a/spec/features/severed_relationships_spec.rb b/spec/system/severed_relationships_spec.rb
similarity index 100%
rename from spec/features/severed_relationships_spec.rb
rename to spec/system/severed_relationships_spec.rb
diff --git a/spec/system/share_entrypoint_spec.rb b/spec/system/share_entrypoint_spec.rb
index 126a816bcc3cef..5fdbeacefa407a 100644
--- a/spec/system/share_entrypoint_spec.rb
+++ b/spec/system/share_entrypoint_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'ShareEntrypoint' do
+describe 'ShareEntrypoint', :js, :streaming do
   include ProfileStories
 
   subject { page }
diff --git a/spec/system/unlogged_spec.rb b/spec/system/unlogged_spec.rb
index c3ebf51d7fb098..417ccdaeb65668 100644
--- a/spec/system/unlogged_spec.rb
+++ b/spec/system/unlogged_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'UnloggedBrowsing' do
+describe 'UnloggedBrowsing', :js, :streaming do
   subject { page }
 
   before do

From 68b9fe824d6cc8154efe46829fa0fcd26a5b9a5d Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Fri, 10 May 2024 14:40:20 +0200
Subject: [PATCH 0982/2191] Add OpenTelemetry instrumentation (#30130)

Co-authored-by: Juliano Costa <juliano.costa@datadoghq.com>
Co-authored-by: Robb Kidd <robbkidd@honeycomb.io>
---
 Gemfile                              |  18 +++++
 Gemfile.lock                         | 108 +++++++++++++++++++++++++++
 config/initializers/opentelemetry.rb |  63 ++++++++++++++++
 3 files changed, 189 insertions(+)
 create mode 100644 config/initializers/opentelemetry.rb

diff --git a/Gemfile b/Gemfile
index c7e07f9642a49b..247865aacfd5f5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -103,6 +103,24 @@ gem 'rdf-normalize', '~> 0.5'
 
 gem 'private_address_check', '~> 0.5'
 
+group :opentelemetry do
+  gem 'opentelemetry-exporter-otlp', '~> 0.26.3', require: false
+  gem 'opentelemetry-instrumentation-active_job', '~> 0.7.1', require: false
+  gem 'opentelemetry-instrumentation-active_model_serializers', '~> 0.20.1', require: false
+  gem 'opentelemetry-instrumentation-concurrent_ruby', '~> 0.21.2', require: false
+  gem 'opentelemetry-instrumentation-excon', '~> 0.22.0', require: false
+  gem 'opentelemetry-instrumentation-faraday', '~> 0.24.1', require: false
+  gem 'opentelemetry-instrumentation-http', '~> 0.23.2', require: false
+  gem 'opentelemetry-instrumentation-http_client', '~> 0.22.3', require: false
+  gem 'opentelemetry-instrumentation-net_http', '~> 0.22.4', require: false
+  gem 'opentelemetry-instrumentation-pg', '~> 0.27.1', require: false
+  gem 'opentelemetry-instrumentation-rack', '~> 0.24.1', require: false
+  gem 'opentelemetry-instrumentation-rails', '~> 0.30.0', require: false
+  gem 'opentelemetry-instrumentation-redis', '~> 0.25.3', require: false
+  gem 'opentelemetry-instrumentation-sidekiq', '~> 0.25.2', require: false
+  gem 'opentelemetry-sdk', '~> 1.4', require: false
+end
+
 group :test do
   # Adds RSpec Error/Warning annotations to GitHub PRs on the Files tab
   gem 'rspec-github', '~> 2.4', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index b4db2b9a073c34..b96afef2cc341d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -284,6 +284,9 @@ GEM
       ruby-progressbar (~> 1.4)
     globalid (1.2.1)
       activesupport (>= 6.1)
+    google-protobuf (3.25.3)
+    googleapis-common-protos-types (1.14.0)
+      google-protobuf (~> 3.18)
     haml (6.3.0)
       temple (>= 0.8.2)
       thor
@@ -483,6 +486,96 @@ GEM
     openssl (3.2.0)
     openssl-signature_algorithm (1.3.0)
       openssl (> 2.0)
+    opentelemetry-api (1.2.5)
+    opentelemetry-common (0.20.1)
+      opentelemetry-api (~> 1.0)
+    opentelemetry-exporter-otlp (0.26.3)
+      google-protobuf (~> 3.14)
+      googleapis-common-protos-types (~> 1.3)
+      opentelemetry-api (~> 1.1)
+      opentelemetry-common (~> 0.20)
+      opentelemetry-sdk (~> 1.2)
+      opentelemetry-semantic_conventions
+    opentelemetry-helpers-sql-obfuscation (0.1.0)
+      opentelemetry-common (~> 0.20)
+    opentelemetry-instrumentation-action_pack (0.9.0)
+      opentelemetry-api (~> 1.0)
+      opentelemetry-instrumentation-base (~> 0.22.1)
+      opentelemetry-instrumentation-rack (~> 0.21)
+    opentelemetry-instrumentation-action_view (0.7.0)
+      opentelemetry-api (~> 1.0)
+      opentelemetry-instrumentation-active_support (~> 0.1)
+      opentelemetry-instrumentation-base (~> 0.22.1)
+    opentelemetry-instrumentation-active_job (0.7.1)
+      opentelemetry-api (~> 1.0)
+      opentelemetry-instrumentation-base (~> 0.22.1)
+    opentelemetry-instrumentation-active_model_serializers (0.20.1)
+      opentelemetry-api (~> 1.0)
+      opentelemetry-instrumentation-base (~> 0.22.1)
+    opentelemetry-instrumentation-active_record (0.7.1)
+      opentelemetry-api (~> 1.0)
+      opentelemetry-instrumentation-base (~> 0.22.1)
+    opentelemetry-instrumentation-active_support (0.5.1)
+      opentelemetry-api (~> 1.0)
+      opentelemetry-instrumentation-base (~> 0.22.1)
+    opentelemetry-instrumentation-base (0.22.3)
+      opentelemetry-api (~> 1.0)
+      opentelemetry-registry (~> 0.1)
+    opentelemetry-instrumentation-concurrent_ruby (0.21.2)
+      opentelemetry-api (~> 1.0)
+      opentelemetry-instrumentation-base (~> 0.22.1)
+    opentelemetry-instrumentation-excon (0.22.0)
+      opentelemetry-api (~> 1.0)
+      opentelemetry-common (~> 0.20.0)
+      opentelemetry-instrumentation-base (~> 0.22.1)
+    opentelemetry-instrumentation-faraday (0.24.1)
+      opentelemetry-api (~> 1.0)
+      opentelemetry-common (~> 0.20.0)
+      opentelemetry-instrumentation-base (~> 0.22.1)
+    opentelemetry-instrumentation-http (0.23.2)
+      opentelemetry-api (~> 1.0)
+      opentelemetry-instrumentation-base (~> 0.22.1)
+    opentelemetry-instrumentation-http_client (0.22.3)
+      opentelemetry-api (~> 1.0)
+      opentelemetry-common (~> 0.20.0)
+      opentelemetry-instrumentation-base (~> 0.22.1)
+    opentelemetry-instrumentation-net_http (0.22.4)
+      opentelemetry-api (~> 1.0)
+      opentelemetry-common (~> 0.20.0)
+      opentelemetry-instrumentation-base (~> 0.22.1)
+    opentelemetry-instrumentation-pg (0.27.1)
+      opentelemetry-api (~> 1.0)
+      opentelemetry-helpers-sql-obfuscation
+      opentelemetry-instrumentation-base (~> 0.22.1)
+    opentelemetry-instrumentation-rack (0.24.1)
+      opentelemetry-api (~> 1.0)
+      opentelemetry-common (~> 0.20.0)
+      opentelemetry-instrumentation-base (~> 0.22.1)
+    opentelemetry-instrumentation-rails (0.30.0)
+      opentelemetry-api (~> 1.0)
+      opentelemetry-instrumentation-action_pack (~> 0.9.0)
+      opentelemetry-instrumentation-action_view (~> 0.7.0)
+      opentelemetry-instrumentation-active_job (~> 0.7.0)
+      opentelemetry-instrumentation-active_record (~> 0.7.0)
+      opentelemetry-instrumentation-active_support (~> 0.5.0)
+      opentelemetry-instrumentation-base (~> 0.22.1)
+    opentelemetry-instrumentation-redis (0.25.3)
+      opentelemetry-api (~> 1.0)
+      opentelemetry-common (~> 0.20.0)
+      opentelemetry-instrumentation-base (~> 0.22.1)
+    opentelemetry-instrumentation-sidekiq (0.25.2)
+      opentelemetry-api (~> 1.0)
+      opentelemetry-common (~> 0.20.0)
+      opentelemetry-instrumentation-base (~> 0.22.1)
+    opentelemetry-registry (0.3.1)
+      opentelemetry-api (~> 1.1)
+    opentelemetry-sdk (1.4.1)
+      opentelemetry-api (~> 1.1)
+      opentelemetry-common (~> 0.20)
+      opentelemetry-registry (~> 0.2)
+      opentelemetry-semantic_conventions
+    opentelemetry-semantic_conventions (1.10.0)
+      opentelemetry-api (~> 1.0)
     orm_adapter (0.5.0)
     ox (2.14.18)
     parallel (1.24.0)
@@ -880,6 +973,21 @@ DEPENDENCIES
   omniauth-rails_csrf_protection (~> 1.0)
   omniauth-saml (~> 2.0)
   omniauth_openid_connect (~> 0.6.1)
+  opentelemetry-exporter-otlp (~> 0.26.3)
+  opentelemetry-instrumentation-active_job (~> 0.7.1)
+  opentelemetry-instrumentation-active_model_serializers (~> 0.20.1)
+  opentelemetry-instrumentation-concurrent_ruby (~> 0.21.2)
+  opentelemetry-instrumentation-excon (~> 0.22.0)
+  opentelemetry-instrumentation-faraday (~> 0.24.1)
+  opentelemetry-instrumentation-http (~> 0.23.2)
+  opentelemetry-instrumentation-http_client (~> 0.22.3)
+  opentelemetry-instrumentation-net_http (~> 0.22.4)
+  opentelemetry-instrumentation-pg (~> 0.27.1)
+  opentelemetry-instrumentation-rack (~> 0.24.1)
+  opentelemetry-instrumentation-rails (~> 0.30.0)
+  opentelemetry-instrumentation-redis (~> 0.25.3)
+  opentelemetry-instrumentation-sidekiq (~> 0.25.2)
+  opentelemetry-sdk (~> 1.4)
   ox (~> 2.14)
   parslet
   pg (~> 1.5)
diff --git a/config/initializers/opentelemetry.rb b/config/initializers/opentelemetry.rb
new file mode 100644
index 00000000000000..e50132d4617385
--- /dev/null
+++ b/config/initializers/opentelemetry.rb
@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+# Set OTEL_* environment variables according to OTel docs:
+# https://opentelemetry.io/docs/concepts/sdk-configuration/
+
+if ENV.keys.any? { |name| name.match?(/OTEL_.*_ENDPOINT/) }
+  require 'opentelemetry/sdk'
+  require 'opentelemetry/exporter/otlp'
+
+  require 'opentelemetry/instrumentation/active_job'
+  require 'opentelemetry/instrumentation/active_model_serializers'
+  require 'opentelemetry/instrumentation/concurrent_ruby'
+  require 'opentelemetry/instrumentation/excon'
+  require 'opentelemetry/instrumentation/faraday'
+  require 'opentelemetry/instrumentation/http'
+  require 'opentelemetry/instrumentation/http_client'
+  require 'opentelemetry/instrumentation/net/http'
+  require 'opentelemetry/instrumentation/pg'
+  require 'opentelemetry/instrumentation/rack'
+  require 'opentelemetry/instrumentation/rails'
+  require 'opentelemetry/instrumentation/redis'
+  require 'opentelemetry/instrumentation/sidekiq'
+
+  OpenTelemetry::SDK.configure do |c|
+    # use_all() attempts to load ALL the auto-instrumentations
+    # currently loaded by Ruby requires.
+    #
+    # Load attempts will emit an INFO or WARN to the console
+    # about the success/failure to wire up an auto-instrumentation.
+    # "WARN -- : Instrumentation: <X> failed to install" is most
+    # likely caused by <X> not being a Ruby library loaded by
+    # the application or the instrumentation has been explicitly
+    # disabled.
+    #
+    # To disable an instrumentation, set an environment variable
+    # along this pattern:
+    #
+    # OTEL_RUBY_INSTRUMENTATION_<X>_ENABLED=false
+    #
+    # For example, PostgreSQL and Redis produce a lot of child spans
+    # in the course of this application doing its business. To turn
+    # them off, set the env vars below, but recognize that you will
+    # be missing details about what particular calls to the
+    # datastores are slow.
+    #
+    # OTEL_RUBY_INSTRUMENTATION_PG_ENABLED=false
+    # OTEL_RUBY_INSTRUMENTATION_REDIS_ENABLED=false
+
+    c.use_all({
+      'OpenTelemetry::Instrumentation::Rack' => {
+        use_rack_events: false, # instead of events, use middleware; allows for untraced_endpoints to ignore child spans
+        untraced_endpoints: ['/health'],
+      },
+    })
+
+    c.service_name =  case $PROGRAM_NAME
+                      when /puma/ then 'mastodon/web'
+                      else
+                        "mastodon/#{$PROGRAM_NAME.split('/').last}"
+                      end
+    c.service_version = Mastodon::Version.to_s
+  end
+end

From ded11eca4fe2d89d986663d6f6a8dd5284e4604a Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 10 May 2024 15:15:54 +0200
Subject: [PATCH 0983/2191] Update dependency pundit to v2.3.2 (#30222)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index b96afef2cc341d..114abcb7b387df 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -607,7 +607,7 @@ GEM
     public_suffix (5.0.5)
     puma (6.4.2)
       nio4r (~> 2.0)
-    pundit (2.3.1)
+    pundit (2.3.2)
       activesupport (>= 3.0.0)
     raabro (1.4.0)
     racc (1.7.3)

From d933e6b6aeda9fad6af712e084cdb5c25bdc2cbe Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 10 May 2024 15:16:02 +0200
Subject: [PATCH 0984/2191] Update dependency
 opentelemetry-instrumentation-concurrent_ruby to v0.21.3 (#30235)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 114abcb7b387df..3e2af23fec42a9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -521,7 +521,7 @@ GEM
     opentelemetry-instrumentation-base (0.22.3)
       opentelemetry-api (~> 1.0)
       opentelemetry-registry (~> 0.1)
-    opentelemetry-instrumentation-concurrent_ruby (0.21.2)
+    opentelemetry-instrumentation-concurrent_ruby (0.21.3)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
     opentelemetry-instrumentation-excon (0.22.0)

From af71f236a2e4565619871bfb72d64ca39411d365 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 10 May 2024 15:16:05 +0200
Subject: [PATCH 0985/2191] Update dependency
 opentelemetry-instrumentation-excon to v0.22.2 (#30236)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 3e2af23fec42a9..fda00ca467e509 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -524,7 +524,7 @@ GEM
     opentelemetry-instrumentation-concurrent_ruby (0.21.3)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-excon (0.22.0)
+    opentelemetry-instrumentation-excon (0.22.1)
       opentelemetry-api (~> 1.0)
       opentelemetry-common (~> 0.20.0)
       opentelemetry-instrumentation-base (~> 0.22.1)

From 482d1087c57553f551cf495f62d9b7fccf649271 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 10 May 2024 16:19:41 +0200
Subject: [PATCH 0986/2191] Update dependency
 opentelemetry-instrumentation-faraday to v0.24.3 (#30237)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index fda00ca467e509..5669cf96a76ebd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -528,7 +528,7 @@ GEM
       opentelemetry-api (~> 1.0)
       opentelemetry-common (~> 0.20.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-faraday (0.24.1)
+    opentelemetry-instrumentation-faraday (0.24.2)
       opentelemetry-api (~> 1.0)
       opentelemetry-common (~> 0.20.0)
       opentelemetry-instrumentation-base (~> 0.22.1)

From d09b02efb653e59488cac530db8ae2757ad0cd02 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Fri, 10 May 2024 18:33:10 +0200
Subject: [PATCH 0987/2191] Group Ruby OTEL packages in Renovate PRs (#30242)

---
 .github/renovate.json5 | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.github/renovate.json5 b/.github/renovate.json5
index e92608a43711ed..378d4fc83ca86c 100644
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -141,6 +141,13 @@
       matchUpdateTypes: ['patch', 'minor'],
       groupName: 'RSpec (non-major)',
     },
+    {
+      // Group all opentelemetry-ruby packages in the same PR
+      matchManagers: ['bundler'],
+      matchPackagePrefixes: ['opentelemetry-'],
+      matchUpdateTypes: ['patch', 'minor'],
+      groupName: 'opentelemetry-ruby (non-major)',
+    },
     // Add labels depending on package manager
     { matchManagers: ['npm', 'nvm'], addLabels: ['javascript'] },
     { matchManagers: ['bundler', 'ruby-version'], addLabels: ['ruby'] },

From 9920f41c0fd8ad0030d2818c8271aa3cf24b4391 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 10 May 2024 21:18:53 +0200
Subject: [PATCH 0988/2191] Update opentelemetry-ruby (non-major) (#30249)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 5669cf96a76ebd..3f4b1088ada8fc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -512,7 +512,7 @@ GEM
     opentelemetry-instrumentation-active_model_serializers (0.20.1)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-active_record (0.7.1)
+    opentelemetry-instrumentation-active_record (0.7.2)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
     opentelemetry-instrumentation-active_support (0.5.1)
@@ -532,10 +532,10 @@ GEM
       opentelemetry-api (~> 1.0)
       opentelemetry-common (~> 0.20.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-http (0.23.2)
+    opentelemetry-instrumentation-http (0.23.3)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-http_client (0.22.3)
+    opentelemetry-instrumentation-http_client (0.22.4)
       opentelemetry-api (~> 1.0)
       opentelemetry-common (~> 0.20.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
@@ -543,15 +543,15 @@ GEM
       opentelemetry-api (~> 1.0)
       opentelemetry-common (~> 0.20.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-pg (0.27.1)
+    opentelemetry-instrumentation-pg (0.27.2)
       opentelemetry-api (~> 1.0)
       opentelemetry-helpers-sql-obfuscation
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-rack (0.24.1)
+    opentelemetry-instrumentation-rack (0.24.3)
       opentelemetry-api (~> 1.0)
       opentelemetry-common (~> 0.20.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-rails (0.30.0)
+    opentelemetry-instrumentation-rails (0.30.1)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-action_pack (~> 0.9.0)
       opentelemetry-instrumentation-action_view (~> 0.7.0)
@@ -559,11 +559,11 @@ GEM
       opentelemetry-instrumentation-active_record (~> 0.7.0)
       opentelemetry-instrumentation-active_support (~> 0.5.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-redis (0.25.3)
+    opentelemetry-instrumentation-redis (0.25.4)
       opentelemetry-api (~> 1.0)
       opentelemetry-common (~> 0.20.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-sidekiq (0.25.2)
+    opentelemetry-instrumentation-sidekiq (0.25.3)
       opentelemetry-api (~> 1.0)
       opentelemetry-common (~> 0.20.0)
       opentelemetry-instrumentation-base (~> 0.22.1)

From 346530732cce54c3e690486aca256bc0aae26d17 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 10 May 2024 21:19:47 +0200
Subject: [PATCH 0989/2191] Update dependency utf-8-validate to v6.0.4 (#30248)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 9aa8125d58b10d..4f99844d64c3bd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -17397,12 +17397,12 @@ __metadata:
   linkType: hard
 
 "utf-8-validate@npm:^6.0.3":
-  version: 6.0.3
-  resolution: "utf-8-validate@npm:6.0.3"
+  version: 6.0.4
+  resolution: "utf-8-validate@npm:6.0.4"
   dependencies:
     node-gyp: "npm:latest"
     node-gyp-build: "npm:^4.3.0"
-  checksum: 10c0/2ca08b07f4070540b33ff15f3f0632fa30baaee8a766fff993be47b4829b4fb30fd36fdf1270336324d03f65e0936c4608ee719d862230d75311751dcfe27a83
+  checksum: 10c0/f7042d94aec6ca02461b64e725bdc7262266610dbb787331e5bbd49374ef6f75fe9900600df3fc63d97906c23614a965c8989b4bf95d70bf35dc617da99215e7
   languageName: node
   linkType: hard
 

From 1959365c2f410aa82874c5c05ab92c4eca4c4055 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 10 May 2024 22:00:25 +0200
Subject: [PATCH 0990/2191] Add missing `on_delete: :cascade` on
 `notification_policies` (#30251)

---
 ...3_fix_notification_policies_foreign_key.rb | 28 +++++++++++++++++++
 db/schema.rb                                  |  4 +--
 2 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 db/migrate/20240510192043_fix_notification_policies_foreign_key.rb

diff --git a/db/migrate/20240510192043_fix_notification_policies_foreign_key.rb b/db/migrate/20240510192043_fix_notification_policies_foreign_key.rb
new file mode 100644
index 00000000000000..7bb134ecffd600
--- /dev/null
+++ b/db/migrate/20240510192043_fix_notification_policies_foreign_key.rb
@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+class FixNotificationPoliciesForeignKey < ActiveRecord::Migration[7.1]
+  def up
+    safety_assured do
+      execute <<~SQL.squish
+        ALTER TABLE notification_policies
+          DROP CONSTRAINT fk_rails_506d62f0da,
+          ADD CONSTRAINT fk_rails_506d62f0da
+            FOREIGN KEY (account_id)
+            REFERENCES accounts(id)
+            ON DELETE CASCADE
+      SQL
+    end
+  end
+
+  def down
+    safety_assured do
+      execute <<~SQL.squish
+        ALTER TABLE notification_policies
+          DROP CONSTRAINT fk_rails_506d62f0da,
+          ADD CONSTRAINT fk_rails_506d62f0da
+            FOREIGN KEY (account_id)
+            REFERENCES accounts(id)
+      SQL
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 11f1a202f79e95..ad58604928d38e 100644
--- 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_03_22_161611) do
+ActiveRecord::Schema[7.1].define(version: 2024_05_10_192043) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -1335,7 +1335,7 @@
   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_policies", "accounts"
+  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
   add_foreign_key "notification_requests", "statuses", column: "last_status_id", on_delete: :nullify

From f65a6d50f1f9f48e50ea693c8b36dcb8dbb9f232 Mon Sep 17 00:00:00 2001
From: Chee Aun <cheeaun@gmail.com>
Date: Fri, 10 May 2024 17:19:27 +0800
Subject: [PATCH 0991/2191] [Glitch] Fix typo

Port c36a8786c10c36e5181c9c53d848fa8e7b24b692 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../glitch/features/notifications/components/notification.jsx   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/flavours/glitch/features/notifications/components/notification.jsx b/app/javascript/flavours/glitch/features/notifications/components/notification.jsx
index d03674bd573ebb..29593c06d8982d 100644
--- a/app/javascript/flavours/glitch/features/notifications/components/notification.jsx
+++ b/app/javascript/flavours/glitch/features/notifications/components/notification.jsx
@@ -31,7 +31,7 @@ const messages = defineMessages({
   adminSignUp: { id: 'notification.admin.sign_up', defaultMessage: '{name} signed up' },
   adminReport: { id: 'notification.admin.report', defaultMessage: '{name} reported {target}' },
   relationshipsSevered: { id: 'notification.relationships_severance_event', defaultMessage: 'Lost connections with {name}' },
-  moderationWarning: { id: 'notification.moderation_warning', defaultMessage: 'Your have received a moderation warning' },
+  moderationWarning: { id: 'notification.moderation_warning', defaultMessage: 'You have received a moderation warning' },
 });
 
 const notificationForScreenReader = (intl, message, timestamp) => {

From 360fa7177869d240ddfe695756fe5000d6e78c9b Mon Sep 17 00:00:00 2001
From: Jeremy Kescher <jeremy@kescher.at>
Date: Sat, 11 May 2024 23:36:59 +0200
Subject: [PATCH 0992/2191] v4.3.0-alpha.3+glitch+cat+1.2.0

---
 CHANGELOG.md            | 5 +++++
 lib/mastodon/version.rb | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b2561ab0aed0a4..7f6bc1638c1812 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 All changes to Catstodon that aren't Mastodon or glitch-soc Mastodon changes will be documented here.
 
+## [v4.3.0-alpha.3+glitch+cat+1.2.0] - 2024-05-11
+
+- Glitch-soc changes since and including 62bc36416f2d2defc77a501226afd0679b6ca252
+- Ruby version 3.3.1. Update your rbenv!
+
 ## [v4.3.0-alpha.3+glitch+cat+1.1.3] - 2024-04-26
 
 - Glitch-soc changes, most notably fixing the display of follow request notifications.
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index 012b0070c138f8..e0edef176f500b 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -25,7 +25,7 @@ def prerelease
     end
 
     def catstodon_revision
-      '1.1.3'
+      '1.2.0'
     end
 
     def build_metadata

From 480be5e60c3559da23251d5c222883e0c1098acf Mon Sep 17 00:00:00 2001
From: Jeremy Kescher <jeremy@kescher.at>
Date: Sat, 11 May 2024 23:53:25 +0200
Subject: [PATCH 0993/2191] Add changelog info for
 v4.3.0-alpha.3+glitch+cat+1.2.0

---
 .env.production.catcatnya                       | 3 +++
 CHANGELOG.md                                    | 7 +++++++
 config/initializers/active_record_encryption.rb | 2 +-
 redact-env.bash                                 | 3 +++
 4 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/.env.production.catcatnya b/.env.production.catcatnya
index c354989ba2c7b0..7b2d378775ab6c 100644
--- a/.env.production.catcatnya
+++ b/.env.production.catcatnya
@@ -5,6 +5,9 @@ SECRET_KEY_BASE=[REDACTED]
 OTP_SECRET=[REDACTED]
 VAPID_PRIVATE_KEY=[REDACTED]
 VAPID_PUBLIC_KEY=[REDACTED]
+ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=[REDACTED]
+ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=[REDACTED]
+ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY=[REDACTED]
 DB_HOST=[REDACTED]
 DB_PORT=[REDACTED]
 DB_NAME=[REDACTED]
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7f6bc1638c1812..a12a730a46bc94 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,13 @@ All changes to Catstodon that aren't Mastodon or glitch-soc Mastodon changes wil
 
 - Glitch-soc changes since and including 62bc36416f2d2defc77a501226afd0679b6ca252
 - Ruby version 3.3.1. Update your rbenv!
+- Mastodon/Catstodon now requires that these variables are set:
+
+  - ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY
+  - ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT
+  - ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY
+
+  After `bundle install`, run `bin/rails db:encryption:init` to generate values and then assign the environment variable, for example in your `.env.production`.
 
 ## [v4.3.0-alpha.3+glitch+cat+1.1.3] - 2024-04-26
 
diff --git a/config/initializers/active_record_encryption.rb b/config/initializers/active_record_encryption.rb
index 7cda8c621c2b69..f280c1acb4781b 100644
--- a/config/initializers/active_record_encryption.rb
+++ b/config/initializers/active_record_encryption.rb
@@ -8,7 +8,7 @@
   ENV.fetch(key) do
     abort <<~MESSAGE
 
-      Mastodon now requires that these variables are set:
+      Catstodon now requires that these variables are set:
 
         - ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY
         - ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT
diff --git a/redact-env.bash b/redact-env.bash
index 0249f3fb0621e2..bf3f82097f70ab 100755
--- a/redact-env.bash
+++ b/redact-env.bash
@@ -23,5 +23,8 @@ if [[ -f "$1" ]]; then
       -e 's/^ES_HOST=.*/ES_HOST=[REDACTED]/gi' \
       -e 's/^ES_PORT=.*/ES_PORT=[REDACTED]/gi' \
       -e 's/^ES_PREFIX=.*/ES_PREFIX=[REDACTED]/gi' \
+      -e 's/^ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=.*/ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=[REDACTED]/gi' \
+      -e 's/^ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=.*/ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=[REDACTED]/gi' \
+      -e 's/^ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY=.*/ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY=[REDACTED]/gi' \
       "$1"
 fi

From 807cf354fcf2706bd24890acb875fa85b097164a Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 13 May 2024 11:09:39 +0200
Subject: [PATCH 0994/2191] Update dependency eslint-plugin-jsdoc to v48.2.4
 (#30274)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 4f99844d64c3bd..f6166cccf9a068 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2132,14 +2132,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@es-joy/jsdoccomment@npm:~0.42.0":
-  version: 0.42.0
-  resolution: "@es-joy/jsdoccomment@npm:0.42.0"
+"@es-joy/jsdoccomment@npm:~0.43.0":
+  version: 0.43.0
+  resolution: "@es-joy/jsdoccomment@npm:0.43.0"
   dependencies:
+    "@types/eslint": "npm:^8.56.5"
+    "@types/estree": "npm:^1.0.5"
+    "@typescript-eslint/types": "npm:^7.2.0"
     comment-parser: "npm:1.4.1"
     esquery: "npm:^1.5.0"
     jsdoc-type-pratt-parser: "npm:~4.0.0"
-  checksum: 10c0/a8122762d2df3c6501a9c459e2822315a23c0078c4aeb0b40fb3c84b99e21a78e85e67f962d6b5dde5eb751792a1c67c6a170b619573db7151098a19950abe35
+  checksum: 10c0/862294ed89772a231f309edd68405ece00f6aaf43103210f28410da894a6b697bc1f281c59e813dd37d5b7294f633ee7b874e07a0aa3d72f49504089fc9cb2c4
   languageName: node
   linkType: hard
 
@@ -3520,17 +3523,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/eslint@npm:7 || 8":
-  version: 8.44.6
-  resolution: "@types/eslint@npm:8.44.6"
+"@types/eslint@npm:7 || 8, @types/eslint@npm:^8.56.5":
+  version: 8.56.10
+  resolution: "@types/eslint@npm:8.56.10"
   dependencies:
     "@types/estree": "npm:*"
     "@types/json-schema": "npm:*"
-  checksum: 10c0/fc449107eb186bdc5d30149bbcb4e673af8530afdeacca3b89f14deefcbfc67463157d6a81b42cd9df92ddeafda5351853d13310ff7ac6ab0d9769ac7cc0cc3a
+  checksum: 10c0/674349d6c342c3864d70f4d5a9965f96fb253801532752c8c500ad6a1c2e8b219e01ccff5dc8791dcb58b5483012c495708bb9f3ff929f5c9322b3da126c15d3
   languageName: node
   linkType: hard
 
-"@types/estree@npm:*, @types/estree@npm:^1.0.0":
+"@types/estree@npm:*, @types/estree@npm:^1.0.0, @types/estree@npm:^1.0.5":
   version: 1.0.5
   resolution: "@types/estree@npm:1.0.5"
   checksum: 10c0/b3b0e334288ddb407c7b3357ca67dbee75ee22db242ca7c56fe27db4e1a31989cb8af48a84dd401deb787fe10cc6b2ab1ee82dc4783be87ededbe3d53c79c70d
@@ -4193,7 +4196,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/types@npm:7.8.0":
+"@typescript-eslint/types@npm:7.8.0, @typescript-eslint/types@npm:^7.2.0":
   version: 7.8.0
   resolution: "@typescript-eslint/types@npm:7.8.0"
   checksum: 10c0/b2fdbfc21957bfa46f7d8809b607ad8c8b67c51821d899064d09392edc12f28b2318a044f0cd5d523d782e84e8f0558778877944964cf38e139f88790cf9d466
@@ -7820,10 +7823,10 @@ __metadata:
   linkType: hard
 
 "eslint-plugin-jsdoc@npm:^48.0.0":
-  version: 48.2.3
-  resolution: "eslint-plugin-jsdoc@npm:48.2.3"
+  version: 48.2.4
+  resolution: "eslint-plugin-jsdoc@npm:48.2.4"
   dependencies:
-    "@es-joy/jsdoccomment": "npm:~0.42.0"
+    "@es-joy/jsdoccomment": "npm:~0.43.0"
     are-docs-informative: "npm:^0.0.2"
     comment-parser: "npm:1.4.1"
     debug: "npm:^4.3.4"
@@ -7834,7 +7837,7 @@ __metadata:
     spdx-expression-parse: "npm:^4.0.0"
   peerDependencies:
     eslint: ^7.0.0 || ^8.0.0 || ^9.0.0
-  checksum: 10c0/e755923d96118890c6fd28b1c2298e1fe67ccbce08060ffc091b29ced59d0058ad8820323c56eef6f85c2954c783fc4076e78c0e5bc64838ae099b4e62ea702e
+  checksum: 10c0/601c9d6ee41de56102c7813106ceb0b8b8342223670f7add010a8f89753c250cde4cc93e353e3911b7b29677f2634f3f4be45f27abb7a95c6fdbd058adfa3343
   languageName: node
   linkType: hard
 

From ab4efa3bf89358a110f91af87055e1fc5d610d94 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 13 May 2024 11:10:09 +0200
Subject: [PATCH 0995/2191] Update dependency @testing-library/react to v15.0.7
 (#30273)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index f6166cccf9a068..a7f8c0a61b2b72 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3391,8 +3391,8 @@ __metadata:
   linkType: hard
 
 "@testing-library/react@npm:^15.0.0":
-  version: 15.0.6
-  resolution: "@testing-library/react@npm:15.0.6"
+  version: 15.0.7
+  resolution: "@testing-library/react@npm:15.0.7"
   dependencies:
     "@babel/runtime": "npm:^7.12.5"
     "@testing-library/dom": "npm:^10.0.0"
@@ -3404,7 +3404,7 @@ __metadata:
   peerDependenciesMeta:
     "@types/react":
       optional: true
-  checksum: 10c0/3705a2272f929f2f848f5d7e6ac9829bf7ecc1725a35733ffae7e7a261d4bdab470b080558e8544edb1f9ba25db9fbc4232527df9b4ec6ab6ae4462a902a7f95
+  checksum: 10c0/ac8ee8968e81949ecb35f7ee34741c2c043f73dd7fee2247d56f6de6a30de4742af94f25264356863974e54387485b46c9448ecf3f6ca41cf4339011c369f2d4
   languageName: node
   linkType: hard
 

From 471728d6ddb2bbc3579adde36942cbee622a3930 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 13 May 2024 11:10:26 +0200
Subject: [PATCH 0996/2191] Update DefinitelyTyped types (non-major) (#30272)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index a7f8c0a61b2b72..269ea79e88ed97 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3926,12 +3926,12 @@ __metadata:
   linkType: hard
 
 "@types/react@npm:*, @types/react@npm:16 || 17 || 18, @types/react@npm:>=16.9.11, @types/react@npm:^18.2.7":
-  version: 18.3.1
-  resolution: "@types/react@npm:18.3.1"
+  version: 18.3.2
+  resolution: "@types/react@npm:18.3.2"
   dependencies:
     "@types/prop-types": "npm:*"
     csstype: "npm:^3.0.2"
-  checksum: 10c0/18d856c12a4ec93f3cda2d58ef3d77a9480818afd3af895f812896fb82cfca1f35a692ab1add4ce826a4eb58a071624c7d1c8c6c4ccfb81c100d2916dc607614
+  checksum: 10c0/9fb2f1fcf7e889ee4ea7c3c5978df595c66e770e5fd3a245dbdd2589b9b911524c11dab25a6275d8af4e336e4cb5fa850d447884b84c335a187a338c89df99ba
   languageName: node
   linkType: hard
 
@@ -4053,9 +4053,9 @@ __metadata:
   linkType: hard
 
 "@types/webpack-env@npm:^1.18.4":
-  version: 1.18.4
-  resolution: "@types/webpack-env@npm:1.18.4"
-  checksum: 10c0/3fa77dbff0ed71685404576b0a1cf74587567fe2ee1cfd11d56d6eefcab7a61e4c9ead0eced264e289d2cf0fc74296dbd55ed6c95774fe0fd6264d156c5a59f0
+  version: 1.18.5
+  resolution: "@types/webpack-env@npm:1.18.5"
+  checksum: 10c0/b9e4876e8c7cae419896249f9ed795db283c008fe1d38efa679cbbf05194fc2eea2a5bfb4ff4393d109e3a9895416dadf5f3ddd5c22931b678062230f860454e
   languageName: node
   linkType: hard
 

From 5e7d88a85d400423bb21986a6a6dbef0d89135c5 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 13 May 2024 09:10:53 +0000
Subject: [PATCH 0997/2191] Update dependency glob to v10.3.15 (#30263)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 269ea79e88ed97..2ddd1a6426134c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8885,8 +8885,8 @@ __metadata:
   linkType: hard
 
 "glob@npm:^10.2.2, glob@npm:^10.2.6, glob@npm:^10.3.10, glob@npm:^10.3.7":
-  version: 10.3.14
-  resolution: "glob@npm:10.3.14"
+  version: 10.3.15
+  resolution: "glob@npm:10.3.15"
   dependencies:
     foreground-child: "npm:^3.1.0"
     jackspeak: "npm:^2.3.6"
@@ -8895,7 +8895,7 @@ __metadata:
     path-scurry: "npm:^1.11.0"
   bin:
     glob: dist/esm/bin.mjs
-  checksum: 10c0/19126e53b99c94dea9b3509500e22b325e24d2674523fc95b9fe710f1549ad7e091fbb0704c325c53d3a172fc21a8251acce5395c4f3efd872a2e65a376c82a1
+  checksum: 10c0/cda748ddc181b31b3df9548c0991800406d5cc3b3f8110e37a8751ec1e39f37cdae7d7782d5422d7df92775121cdf00599992dff22f7ff1260344843af227c2b
   languageName: node
   linkType: hard
 

From 123108b1ccf3e516be80f92f816def1ede77ee11 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 13 May 2024 11:11:39 +0200
Subject: [PATCH 0998/2191] Update dependency postcss-preset-env to v9.5.12
 (#30256)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 62 +++++++++++++++++++++++++++----------------------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 2ddd1a6426134c..ed5c4fb33ef32d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1617,15 +1617,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-cascade-layers@npm:^4.0.4":
-  version: 4.0.4
-  resolution: "@csstools/postcss-cascade-layers@npm:4.0.4"
+"@csstools/postcss-cascade-layers@npm:^4.0.5":
+  version: 4.0.5
+  resolution: "@csstools/postcss-cascade-layers@npm:4.0.5"
   dependencies:
-    "@csstools/selector-specificity": "npm:^3.0.3"
+    "@csstools/selector-specificity": "npm:^3.1.0"
     postcss-selector-parser: "npm:^6.0.13"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/87fdd1e3d846e45c2e415f24f66076e04c3c4539e8b802f1114b2a0fef9421d562d9eb61464ba3599d73805555ad8e95c51a8827cb3ddacfda01ec0df4afbfe0
+  checksum: 10c0/2b6dd33b51df349dd89b12ebe3240d65accb0ba03e40288a72e26cf2307a7bdd742c42d9ff7a3f886cab19b2f8813978075f6ee61a985b0b7ceac7e2cbb29e04
   languageName: node
   linkType: hard
 
@@ -1749,15 +1749,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-is-pseudo-class@npm:^4.0.6":
-  version: 4.0.6
-  resolution: "@csstools/postcss-is-pseudo-class@npm:4.0.6"
+"@csstools/postcss-is-pseudo-class@npm:^4.0.7":
+  version: 4.0.7
+  resolution: "@csstools/postcss-is-pseudo-class@npm:4.0.7"
   dependencies:
-    "@csstools/selector-specificity": "npm:^3.0.3"
+    "@csstools/selector-specificity": "npm:^3.1.0"
     postcss-selector-parser: "npm:^6.0.13"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/aa071954e08dc9368fbeddbec6a8da2dea3a771b33bad53f67f3bc5a6b2f0a270909948f3e7b29ec885f4cceee245f16388809aeb0620284a1d66ad1f2026f28
+  checksum: 10c0/43668987df4608f822dbc323d3ac567fa7c192235b55933fd5d1855977ead80184512eb64a3f45a020fdd93711952ba8e9f9a280f4e981625b68a9ff074f9a01
   languageName: node
   linkType: hard
 
@@ -1983,12 +1983,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/selector-specificity@npm:^3.0.3":
-  version: 3.0.3
-  resolution: "@csstools/selector-specificity@npm:3.0.3"
+"@csstools/selector-specificity@npm:^3.0.3, @csstools/selector-specificity@npm:^3.1.0":
+  version: 3.1.0
+  resolution: "@csstools/selector-specificity@npm:3.1.0"
   peerDependencies:
     postcss-selector-parser: ^6.0.13
-  checksum: 10c0/e4f0355165882ddde8bd4a2f0252868150e67b9fae927fd2d94a91cee31e438e7041059f20b9c755a93b0bd8e527a9f78b01168fe67b3539be32091240aa63bf
+  checksum: 10c0/7f77f8377b637dcca7f7a9d6ace3329cf60f02cbd75f14241de30b1f5d00c961ec167572bc93517cdb2f106405a91119f026389a0f96dabae8dd67d1c7710e60
   languageName: node
   linkType: hard
 
@@ -6577,16 +6577,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"css-has-pseudo@npm:^6.0.3":
-  version: 6.0.3
-  resolution: "css-has-pseudo@npm:6.0.3"
+"css-has-pseudo@npm:^6.0.4":
+  version: 6.0.4
+  resolution: "css-has-pseudo@npm:6.0.4"
   dependencies:
-    "@csstools/selector-specificity": "npm:^3.0.3"
+    "@csstools/selector-specificity": "npm:^3.1.0"
     postcss-selector-parser: "npm:^6.0.13"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/bbe663eff5256233c7bcce256cd8de7d93d82f2d4f2ca104af8e39e2159170d67746d3a2954385d03ec4ea7ef2728fe9a7d8cb62c52c0a6df1ad3d3bb1e3439d
+  checksum: 10c0/e9d440de483e15092ebaadb483502243f43e0457d4214c8012ebdba7a959e74d40714254bf97247780e65735512f248a55feda0b3975d9a5eaea9c746f7518f0
   languageName: node
   linkType: hard
 
@@ -13548,16 +13548,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-nesting@npm:^12.1.2":
-  version: 12.1.2
-  resolution: "postcss-nesting@npm:12.1.2"
+"postcss-nesting@npm:^12.1.3":
+  version: 12.1.3
+  resolution: "postcss-nesting@npm:12.1.3"
   dependencies:
     "@csstools/selector-resolve-nested": "npm:^1.1.0"
-    "@csstools/selector-specificity": "npm:^3.0.3"
+    "@csstools/selector-specificity": "npm:^3.1.0"
     postcss-selector-parser: "npm:^6.0.13"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/39d1d100f61863f904393b17169be83cdf82bd50d530efb3e3ae0c7b0f838b254e10e5d12e25119cf31dce9e351a2b770a03f9b2029ff33bef0ec924c0d2f642
+  checksum: 10c0/6b2d3a4823e85592965c6c11f749c5357703256e7334388147d6a3bb72a3abbe47789afaa8535bdd7a9bd6d0099eb12ffec6c154050d8e8b8286b1adbed5b397
   languageName: node
   linkType: hard
 
@@ -13712,10 +13712,10 @@ __metadata:
   linkType: hard
 
 "postcss-preset-env@npm:^9.5.2":
-  version: 9.5.11
-  resolution: "postcss-preset-env@npm:9.5.11"
+  version: 9.5.12
+  resolution: "postcss-preset-env@npm:9.5.12"
   dependencies:
-    "@csstools/postcss-cascade-layers": "npm:^4.0.4"
+    "@csstools/postcss-cascade-layers": "npm:^4.0.5"
     "@csstools/postcss-color-function": "npm:^3.0.16"
     "@csstools/postcss-color-mix-function": "npm:^2.0.16"
     "@csstools/postcss-exponential-functions": "npm:^1.0.7"
@@ -13725,7 +13725,7 @@ __metadata:
     "@csstools/postcss-hwb-function": "npm:^3.0.15"
     "@csstools/postcss-ic-unit": "npm:^3.0.6"
     "@csstools/postcss-initial": "npm:^1.0.1"
-    "@csstools/postcss-is-pseudo-class": "npm:^4.0.6"
+    "@csstools/postcss-is-pseudo-class": "npm:^4.0.7"
     "@csstools/postcss-light-dark-function": "npm:^1.0.5"
     "@csstools/postcss-logical-float-and-clear": "npm:^2.0.1"
     "@csstools/postcss-logical-overflow": "npm:^1.0.1"
@@ -13747,7 +13747,7 @@ __metadata:
     autoprefixer: "npm:^10.4.19"
     browserslist: "npm:^4.22.3"
     css-blank-pseudo: "npm:^6.0.2"
-    css-has-pseudo: "npm:^6.0.3"
+    css-has-pseudo: "npm:^6.0.4"
     css-prefers-color-scheme: "npm:^9.0.1"
     cssdb: "npm:^8.0.0"
     postcss-attribute-case-insensitive: "npm:^6.0.3"
@@ -13767,7 +13767,7 @@ __metadata:
     postcss-image-set-function: "npm:^6.0.3"
     postcss-lab-function: "npm:^6.0.16"
     postcss-logical: "npm:^7.0.1"
-    postcss-nesting: "npm:^12.1.2"
+    postcss-nesting: "npm:^12.1.3"
     postcss-opacity-percentage: "npm:^2.0.0"
     postcss-overflow-shorthand: "npm:^5.0.1"
     postcss-page-break: "npm:^3.0.4"
@@ -13777,7 +13777,7 @@ __metadata:
     postcss-selector-not: "npm:^7.0.2"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/9460f4ce18cf1af7582d0a1f366151f59b6e9b0c7cbb62e59081dc91da14760a749f59fa52bc190e5e2c8fd531952c647719d19c4740aa1a0ebcb93f075ad931
+  checksum: 10c0/3e0276b2061baa396547f9c0090fcb0c6149d3735c7aefa99a8e520701aae0b7265578b59d5e4efa9f5e61659c161e39590a5d63bac49469b99da1c549b63231
   languageName: node
   linkType: hard
 

From f66c9faca02018a3aa6140506a15d685b89dfed2 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 13 May 2024 11:11:55 +0200
Subject: [PATCH 0999/2191] Update dependency sass to v1.77.1 (#30252)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index ed5c4fb33ef32d..f2d29065370b2a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -15323,15 +15323,15 @@ __metadata:
   linkType: hard
 
 "sass@npm:^1.62.1":
-  version: 1.77.0
-  resolution: "sass@npm:1.77.0"
+  version: 1.77.1
+  resolution: "sass@npm:1.77.1"
   dependencies:
     chokidar: "npm:>=3.0.0 <4.0.0"
     immutable: "npm:^4.0.0"
     source-map-js: "npm:>=0.6.2 <2.0.0"
   bin:
     sass: sass.js
-  checksum: 10c0/bce0e5f5b535491e4e775045a79f19cbe10d800ef53b5f7698958d2992505d7b124c968169b05a0190842d8e0a24c2aa6d75dfbdd7c213820d9d59e227009c19
+  checksum: 10c0/edcfc7d038234b1198c3ddcac5963fcd1e17a9c1ee0f9bd09784ab5353b60ff50b189b4c9154b34f5da9ca0eaab8b189fd3e83a4b43a494151ad4735f8e5f364
   languageName: node
   linkType: hard
 

From cb93c1edf08865b1ac528a9a4cb747dab3d57e8d Mon Sep 17 00:00:00 2001
From: David Lapshin <ddaudix@gmail.com>
Date: Mon, 13 May 2024 12:19:42 +0300
Subject: [PATCH 1000/2191] Add active animation to header settings button
 (#30221)

---
 app/javascript/styles/mastodon/components.scss | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 12c987a02f39d0..927c57d990b63b 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -4365,12 +4365,20 @@ a.status-card {
     outline: $ui-button-focus-outline;
   }
 
+  .no-reduce-motion .icon {
+    transition: transform 0.15s ease-in-out;
+  }
+
   &.active {
     color: $primary-text-color;
 
     &:hover {
       color: $primary-text-color;
     }
+
+    .icon {
+      transform: rotate(60deg);
+    }
   }
 
   &:disabled {

From c66fdb3dff7f9313ff610a6b6e97ee22e3b3c7e1 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 13 May 2024 11:39:06 +0200
Subject: [PATCH 1001/2191] Update dependency immutable to v4.3.6 (#30276)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index f2d29065370b2a..f6dc8f161a813b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9495,9 +9495,9 @@ __metadata:
   linkType: hard
 
 "immutable@npm:^4.0.0, immutable@npm:^4.0.0-rc.1, immutable@npm:^4.3.0":
-  version: 4.3.5
-  resolution: "immutable@npm:4.3.5"
-  checksum: 10c0/63d2d7908241a955d18c7822fd2215b6e89ff5a1a33cc72cd475b013cbbdef7a705aa5170a51ce9f84a57f62fdddfaa34e7b5a14b33d8a43c65cc6a881d6e894
+  version: 4.3.6
+  resolution: "immutable@npm:4.3.6"
+  checksum: 10c0/7d0952a768b4fadcee47230ed86dc9505a4517095eceaf5a47e65288571c42400c6e4a2ae21eca4eda957cb7bc50720213135b62cf6a181639111f8acae128c3
   languageName: node
   linkType: hard
 

From b429c9b8a7848097a1c86edda465629a11267696 Mon Sep 17 00:00:00 2001
From: Jeen Broekstra <jeen@fastmail.com>
Date: Mon, 13 May 2024 21:40:14 +1200
Subject: [PATCH 1002/2191] fix(bin/dev): makes conditional for launching
 overmind POSIX-compliant (#30271)

---
 bin/dev | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/dev b/bin/dev
index 9b1d3ac6fcc164..0911bae55813d2 100755
--- a/bin/dev
+++ b/bin/dev
@@ -6,7 +6,7 @@ export PORT="${PORT:-3000}"
 # Get around our boot.rb ENV check
 export RAILS_ENV="${RAILS_ENV:-development}"
 
-if command -v overmind &> /dev/null
+if command -v overmind 1> /dev/null 2>&1
 then
   overmind start -f Procfile.dev "$@"
   exit $?

From 6e1b8b33f55de9fdfcd4ce3a8fcc965c1b5c6601 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 13 May 2024 11:42:08 +0200
Subject: [PATCH 1003/2191] Update opentelemetry-ruby (non-major) (#30262)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 3f4b1088ada8fc..efc99eb23d0c47 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -543,7 +543,7 @@ GEM
       opentelemetry-api (~> 1.0)
       opentelemetry-common (~> 0.20.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-pg (0.27.2)
+    opentelemetry-instrumentation-pg (0.27.3)
       opentelemetry-api (~> 1.0)
       opentelemetry-helpers-sql-obfuscation
       opentelemetry-instrumentation-base (~> 0.22.1)

From 9ec7c1f89256cf3c658a67c3cf8b956fd4dab265 Mon Sep 17 00:00:00 2001
From: Nick Schonning <nschonni@gmail.com>
Date: Mon, 13 May 2024 05:42:47 -0400
Subject: [PATCH 1004/2191] Fix i18n:extract flags (#30261)

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d8848833311297..79544229df956c 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
     "fix": "yarn fix:js && yarn fix:css",
     "format": "prettier --write --log-level warn .",
     "format:check": "prettier --check --ignore-unknown .",
-    "i18n:extract": "formatjs extract 'app/javascript/**/*.{js,jsx,ts,tsx}' '--ignore=**/*.d.ts' --out-file app/javascript/mastodon/locales/en.json --format config/formatjs-formatter.js",
+    "i18n:extract": "formatjs extract 'app/javascript/**/*.{js,jsx,ts,tsx}' --ignore '**/*.d.ts' --out-file app/javascript/mastodon/locales/en.json --format config/formatjs-formatter.js",
     "jest": "cross-env NODE_ENV=test jest",
     "lint:js": "eslint . --ext=.js,.jsx,.ts,.tsx --cache --report-unused-disable-directives",
     "lint:css": "stylelint \"**/*.{css,scss}\"",

From 13fb54920b1c1e8dd59798dd9fc3466c5a446898 Mon Sep 17 00:00:00 2001
From: Nick Schonning <nschonni@gmail.com>
Date: Mon, 13 May 2024 05:54:15 -0400
Subject: [PATCH 1005/2191] Enable Style/IfUnlessModifier RuboCop (#30260)

---
 .rubocop_todo.yml                 | 9 +--------
 config/environments/production.rb | 4 +---
 config/initializers/devise.rb     | 4 +---
 3 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 91e666d7f47446..b47d682f3e683c 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config --auto-gen-only-exclude --no-exclude-limit --no-offense-counts --no-auto-gen-timestamp`
-# using RuboCop version 1.62.1.
+# using RuboCop version 1.63.5.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -122,13 +122,6 @@ Style/HashTransformValues:
     - 'app/serializers/rest/web_push_subscription_serializer.rb'
     - 'app/services/import_service.rb'
 
-# This cop supports safe autocorrection (--autocorrect).
-Style/IfUnlessModifier:
-  Exclude:
-    - 'config/environments/production.rb'
-    - 'config/initializers/devise.rb'
-    - 'config/initializers/ffmpeg.rb'
-
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Style/MapToHash:
   Exclude:
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 6b1101ea1ba9f9..a39843e9562d1f 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -86,9 +86,7 @@
   config.lograge.enabled = true
 
   config.lograge.custom_payload do |controller|
-    if controller.respond_to?(:signed_request?) && controller.signed_request?
-      { key: controller.signature_key_id }
-    end
+    { key: controller.signature_key_id } if controller.respond_to?(:signed_request?) && controller.signed_request?
   end
 
   # Use a different logger for distributed setups.
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index a95c7437fa073b..5c88c4cd5f6222 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -79,9 +79,7 @@ def authenticate!
           return pass
         end
 
-        if validate(resource)
-          success!(resource)
-        end
+        success!(resource) if validate(resource)
       end
 
       private

From 3a7aec2807089a004db90851c66db0a007a18a48 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 13 May 2024 13:30:41 +0200
Subject: [PATCH 1006/2191] New Crowdin Translations (automated) (#30254)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/cy.json    |   1 -
 app/javascript/mastodon/locales/es-MX.json |   6 +-
 app/javascript/mastodon/locales/es.json    |   6 +-
 app/javascript/mastodon/locales/fo.json    |   4 +-
 app/javascript/mastodon/locales/gl.json    |   1 -
 app/javascript/mastodon/locales/ia.json    |   2 +-
 app/javascript/mastodon/locales/ie.json    |   4 +
 app/javascript/mastodon/locales/ja.json    |   2 +-
 app/javascript/mastodon/locales/lt.json    |   5 +-
 app/javascript/mastodon/locales/pt-BR.json |   1 -
 app/javascript/mastodon/locales/sl.json    |   1 -
 app/javascript/mastodon/locales/sq.json    |   2 +-
 app/javascript/mastodon/locales/sv.json    |   2 +-
 app/javascript/mastodon/locales/vi.json    |   2 +-
 app/javascript/mastodon/locales/zh-HK.json |   1 -
 config/locales/doorkeeper.vi.yml           |   4 +-
 config/locales/fo.yml                      |   4 +-
 config/locales/ia.yml                      | 106 +++++++++++++++++++++
 config/locales/ie.yml                      |   3 +
 config/locales/lt.yml                      |  53 ++++++++++-
 config/locales/simple_form.cs.yml          |   2 +
 config/locales/simple_form.es-MX.yml       |   2 +
 config/locales/simple_form.es.yml          |   2 +
 config/locales/simple_form.ie.yml          |   6 ++
 config/locales/simple_form.ja.yml          |   2 +
 config/locales/simple_form.ko.yml          |   3 +
 config/locales/simple_form.lt.yml          |   5 +
 config/locales/th.yml                      |   3 +
 28 files changed, 208 insertions(+), 27 deletions(-)

diff --git a/app/javascript/mastodon/locales/cy.json b/app/javascript/mastodon/locales/cy.json
index fd8fc74be88788..925b7710e008d2 100644
--- a/app/javascript/mastodon/locales/cy.json
+++ b/app/javascript/mastodon/locales/cy.json
@@ -474,7 +474,6 @@
   "notification.follow_request": "Mae {name} wedi gwneud cais i'ch dilyn",
   "notification.mention": "Crybwyllodd {name} amdanoch chi",
   "notification.moderation-warning.learn_more": "Dysgu mwy",
-  "notification.moderation_warning": "Rydych wedi derbyn rhybudd cymedroli",
   "notification.moderation_warning.action_delete_statuses": "Mae rhai o'ch postiadau wedi'u dileu.",
   "notification.moderation_warning.action_disable": "Mae eich cyfrif wedi'i analluogi.",
   "notification.moderation_warning.action_mark_statuses_as_sensitive": "Mae rhai o'ch postiadau wedi'u marcio'n sensitif.",
diff --git a/app/javascript/mastodon/locales/es-MX.json b/app/javascript/mastodon/locales/es-MX.json
index b529f48ebe17dc..1a99d1d4b45e0a 100644
--- a/app/javascript/mastodon/locales/es-MX.json
+++ b/app/javascript/mastodon/locales/es-MX.json
@@ -476,12 +476,12 @@
   "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.",
-  "notification.moderation_warning.action_disable": "Se ha desactivado su cuenta.",
+  "notification.moderation_warning.action_disable": "Tu cuenta ha sido desactivada.",
   "notification.moderation_warning.action_mark_statuses_as_sensitive": "Se han marcado como sensibles algunas de tus publicaciones.",
   "notification.moderation_warning.action_none": "Tu cuenta ha recibido un aviso de moderación.",
   "notification.moderation_warning.action_sensitive": "De ahora en adelante, todas tus publicaciones se marcarán como sensibles.",
-  "notification.moderation_warning.action_silence": "Se ha limitado tu cuenta.",
-  "notification.moderation_warning.action_suspend": "Se ha suspendido tu cuenta.",
+  "notification.moderation_warning.action_silence": "Tu cuenta ha sido limitada.",
+  "notification.moderation_warning.action_suspend": "Tu cuenta ha sido suspendida.",
   "notification.own_poll": "Tu encuesta ha terminado",
   "notification.poll": "Una encuesta en la que has votado ha terminado",
   "notification.reblog": "{name} ha retooteado tu estado",
diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json
index ed01a333750151..1782a3a1fee792 100644
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@@ -476,12 +476,12 @@
   "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.",
-  "notification.moderation_warning.action_disable": "Se ha desactivado su cuenta.",
+  "notification.moderation_warning.action_disable": "Tu cuenta ha sido desactivada.",
   "notification.moderation_warning.action_mark_statuses_as_sensitive": "Se han marcado como sensibles algunas de tus publicaciones.",
   "notification.moderation_warning.action_none": "Tu cuenta ha recibido un aviso de moderación.",
   "notification.moderation_warning.action_sensitive": "De ahora en adelante, todas tus publicaciones se marcarán como sensibles.",
-  "notification.moderation_warning.action_silence": "Se ha limitado tu cuenta.",
-  "notification.moderation_warning.action_suspend": "Se ha suspendido tu cuenta.",
+  "notification.moderation_warning.action_silence": "Tu cuenta ha sido limitada.",
+  "notification.moderation_warning.action_suspend": "Tu cuenta ha sido suspendida.",
   "notification.own_poll": "Tu encuesta ha terminado",
   "notification.poll": "Una encuesta en la que has votado ha terminado",
   "notification.reblog": "{name} ha impulsado tu publicación",
diff --git a/app/javascript/mastodon/locales/fo.json b/app/javascript/mastodon/locales/fo.json
index 77257413fdf54e..f22a829c0cf5d9 100644
--- a/app/javascript/mastodon/locales/fo.json
+++ b/app/javascript/mastodon/locales/fo.json
@@ -474,11 +474,11 @@
   "notification.follow_request": "{name} biður um at fylgja tær",
   "notification.mention": "{name} nevndi teg",
   "notification.moderation-warning.learn_more": "Lær meira",
-  "notification.moderation_warning": "Tú hevur móttikið eina umsjónarávarðing",
+  "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.",
   "notification.moderation_warning.action_disable": "Konta tín er gjørd óvirkin.",
   "notification.moderation_warning.action_mark_statuses_as_sensitive": "Nakrir av postum tínum eru merktir sum viðkvæmir.",
-  "notification.moderation_warning.action_none": "Konta tín hevur móttikið eina umsjónarávarðing.",
+  "notification.moderation_warning.action_none": "Konta tín hevur móttikið eina umsjónarávaring.",
   "notification.moderation_warning.action_sensitive": "Postar tínir verða merktir sum viðkvæmir frá nú av.",
   "notification.moderation_warning.action_silence": "Konta tín er avmarkað.",
   "notification.moderation_warning.action_suspend": "Konta tín er ógildað.",
diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json
index 88d4f5f60e059a..b2a50ebb811976 100644
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@@ -474,7 +474,6 @@
   "notification.follow_request": "{name} solicitou seguirte",
   "notification.mention": "{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.",
   "notification.moderation_warning.action_disable": "A túa conta foi desactivada.",
   "notification.moderation_warning.action_mark_statuses_as_sensitive": "Algunha das túas publicacións foron marcadas como sensibles.",
diff --git a/app/javascript/mastodon/locales/ia.json b/app/javascript/mastodon/locales/ia.json
index d30038d9ccef6a..313563bdfe3294 100644
--- a/app/javascript/mastodon/locales/ia.json
+++ b/app/javascript/mastodon/locales/ia.json
@@ -474,7 +474,7 @@
   "notification.follow_request": "{name} ha requestate de sequer te",
   "notification.mention": "{name} te ha mentionate",
   "notification.moderation-warning.learn_more": "Apprender plus",
-  "notification.moderation_warning": "Tu ha recipite un advertimento de moderation",
+  "notification.moderation_warning": "Tu ha recepite un aviso de moderation",
   "notification.moderation_warning.action_delete_statuses": "Alcunes de tu messages ha essite removite.",
   "notification.moderation_warning.action_disable": "Tu conto ha essite disactivate.",
   "notification.moderation_warning.action_mark_statuses_as_sensitive": "Alcunes de tu messages ha essite marcate como sensibile.",
diff --git a/app/javascript/mastodon/locales/ie.json b/app/javascript/mastodon/locales/ie.json
index 7bd91ca0f9032e..1921509478c105 100644
--- a/app/javascript/mastodon/locales/ie.json
+++ b/app/javascript/mastodon/locales/ie.json
@@ -89,6 +89,7 @@
   "announcement.announcement": "Proclamation",
   "attachments_list.unprocessed": "(íntractat)",
   "audio.hide": "Celar audio",
+  "block_modal.remote_users_caveat": "Noi va petir que li servitor {domain} mey respecter tui decision. Támen, obedientie ne es garantit pro que chascun servitor gere bloccas diferentmen. Possibilmen public postas va restar visibil a usatores de inloggat.",
   "block_modal.show_less": "Monstrar minu",
   "block_modal.show_more": "Monstrar plu",
   "block_modal.they_cant_mention": "Ne posse mentionar ni sequer te.",
@@ -224,7 +225,10 @@
   "domain_pill.their_username": "Su unic identificator sur su servitor. It es possibil que altri servitores va haver usatores con li sam nómine.",
   "domain_pill.username": "Usator-nómine",
   "domain_pill.whats_in_a_handle": "Ex quo consiste un identificator?",
+  "domain_pill.who_they_are": "Pro que identificatores informa qui e u un person is, tu posse interacter con persones tra li rete social de <button>ActivityPub-usant platformes</button>.",
+  "domain_pill.who_you_are": "Pro que tui identificator informa qui e u tu es, persones posse interacter con te tra li rete social de <button>ActivityPub-usant platformes</button>.",
   "domain_pill.your_handle": "Tui identificator:",
+  "domain_pill.your_server": "Tui digital hem, u trova se omni tui postas. Si it ne plese te, tu posse transferer ad un altri servitor quandecunc e tui sequitores con te.",
   "domain_pill.your_username": "Tui unic identificator sur ti-ci servitor. It es possibil que altri servitores va haver usatores con li sam nómine.",
   "embed.instructions": "Inbedar ti-ci posta per copiar li code in infra.",
   "embed.preview": "Vi qualmen it va aspecter:",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index 6e590678fb3cb3..eea06fff590708 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -474,7 +474,7 @@
   "notification.follow_request": "{name}さんがあなたにフォローリクエストしました",
   "notification.mention": "{name}さんがあなたに返信しました",
   "notification.moderation-warning.learn_more": "さらに詳しく",
-  "notification.moderation_warning": "あなたは管理者からの警告を受けています。",
+  "notification.moderation_warning": "管理者から警告が来ています",
   "notification.moderation_warning.action_delete_statuses": "あなたによるいくつかの投稿が削除されました。",
   "notification.moderation_warning.action_disable": "あなたのアカウントは無効になりました。",
   "notification.moderation_warning.action_mark_statuses_as_sensitive": "あなたの投稿のいくつかは閲覧注意として判定されています。",
diff --git a/app/javascript/mastodon/locales/lt.json b/app/javascript/mastodon/locales/lt.json
index 798b24569f135a..0f42e97fcff7fc 100644
--- a/app/javascript/mastodon/locales/lt.json
+++ b/app/javascript/mastodon/locales/lt.json
@@ -256,7 +256,7 @@
   "empty_column.community": "Vietinė laiko skalė yra tuščia. Parašyk ką nors viešai, kad pradėtum sąveikauti.",
   "empty_column.direct": "Dar neturi jokių privačių paminėjimų. Kai išsiųsi arba gausi vieną iš jų, jis bus rodomas čia.",
   "empty_column.domain_blocks": "Dar nėra užblokuotų domenų.",
-  "empty_column.explore_statuses": "Šiuo metu niekas nėra tendencinga. Patikrink vėliau.",
+  "empty_column.explore_statuses": "Šiuo metu niekas nėra tendencinga. Patikrink vėliau!",
   "empty_column.favourited_statuses": "Dar neturi mėgstamų įrašų. Kai vieną iš jų pamėgsi, jis bus rodomas čia.",
   "empty_column.favourites": "Šio įrašo dar niekas nepamėgo. Kai kas nors tai padarys, jie bus rodomi čia.",
   "empty_column.follow_requests": "Dar neturi jokių sekimo prašymų. Kai gausi tokį prašymą, jis bus rodomas čia.",
@@ -466,7 +466,6 @@
   "notification.follow_request": "{name} paprašė tave sekti",
   "notification.mention": "{name} paminėjo tave",
   "notification.moderation-warning.learn_more": "Sužinoti daugiau",
-  "notification.moderation_warning": "Gavai prižiūrėjimo įspėjimą",
   "notification.moderation_warning.action_delete_statuses": "Kai kurie tavo įrašai buvo pašalintos.",
   "notification.moderation_warning.action_disable": "Tavo paskyra buvo išjungta.",
   "notification.moderation_warning.action_mark_statuses_as_sensitive": "Kai kurie tavo įrašai buvo pažymėtos kaip jautrios.",
@@ -536,7 +535,7 @@
   "onboarding.follows.lead": "Tavo pagrindinis srautas – pagrindinis būdas patirti Mastodon. Kuo daugiau žmonių seksi, tuo jis bus aktyvesnis ir įdomesnis. Norint pradėti, pateikiame keletą pasiūlymų:",
   "onboarding.follows.title": "Suasmenink savo pagrindinį srautą",
   "onboarding.profile.discoverable": "Padaryti mano profilį atrandamą",
-  "onboarding.profile.discoverable_hint": "Kai pasirenki Mastodon atrandamumą, tavo įrašai gali būti rodomi paieškos rezultatuose ir tendencijose, o profilis gali būti siūlomas panašių pomėgių turintiems žmonėms.",
+  "onboarding.profile.discoverable_hint": "Kai sutinki su Mastodon atrandamumu, tavo įrašai gali būti rodomi paieškos rezultatuose ir tendencijose, o profilis gali būti siūlomas panašių pomėgių turintiems žmonėms.",
   "onboarding.profile.display_name": "Rodomas vardas",
   "onboarding.profile.display_name_hint": "Tavo pilnas vardas arba linksmas vardas…",
   "onboarding.profile.lead": "Gali visada tai užbaigti vėliau nustatymuose, kur yra dar daugiau pritaikymo parinkčių.",
diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json
index b11daeaaa7e7b5..1a6de083593bc2 100644
--- a/app/javascript/mastodon/locales/pt-BR.json
+++ b/app/javascript/mastodon/locales/pt-BR.json
@@ -474,7 +474,6 @@
   "notification.follow_request": "{name} quer te seguir",
   "notification.mention": "{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.",
   "notification.moderation_warning.action_disable": "Sua conta foi desativada.",
   "notification.moderation_warning.action_mark_statuses_as_sensitive": "Algumas de suas publicações foram marcadas por ter conteúdo sensível.",
diff --git a/app/javascript/mastodon/locales/sl.json b/app/javascript/mastodon/locales/sl.json
index 7806abc6b55fbb..459d05ce3ecfe8 100644
--- a/app/javascript/mastodon/locales/sl.json
+++ b/app/javascript/mastodon/locales/sl.json
@@ -474,7 +474,6 @@
   "notification.follow_request": "{name} vam želi slediti",
   "notification.mention": "{name} vas je omenil/a",
   "notification.moderation-warning.learn_more": "Več o tem",
-  "notification.moderation_warning": "Prejeli ste opozorilo moderatorjev",
   "notification.moderation_warning.action_delete_statuses": "Nekatere vaše objave so odstranjene.",
   "notification.moderation_warning.action_disable": "Vaš račun je bil onemogočen.",
   "notification.moderation_warning.action_mark_statuses_as_sensitive": "Nekatere vaše objave so bile označene kot občutljive.",
diff --git a/app/javascript/mastodon/locales/sq.json b/app/javascript/mastodon/locales/sq.json
index a25eab9cbfe66e..b496f8e20385a5 100644
--- a/app/javascript/mastodon/locales/sq.json
+++ b/app/javascript/mastodon/locales/sq.json
@@ -474,7 +474,7 @@
   "notification.follow_request": "{name} ka kërkuar t’ju ndjekë",
   "notification.mention": "{name} ju ka përmendur",
   "notification.moderation-warning.learn_more": "Mësoni më tepër",
-  "notification.moderation_warning": "Keni marrë një sinjalizim moderimi",
+  "notification.moderation_warning": "Ju është dhënë një sinjalizim moderimi",
   "notification.moderation_warning.action_delete_statuses": "Disa nga postimet tuaja janë hequr.",
   "notification.moderation_warning.action_disable": "Llogaria juaj është çaktivizuar.",
   "notification.moderation_warning.action_mark_statuses_as_sensitive": "Disa prej postimeve tuaja u është vënë shenjë si me spec.",
diff --git a/app/javascript/mastodon/locales/sv.json b/app/javascript/mastodon/locales/sv.json
index 5ac4b4648ff410..ba3a6b2f51ebda 100644
--- a/app/javascript/mastodon/locales/sv.json
+++ b/app/javascript/mastodon/locales/sv.json
@@ -474,7 +474,7 @@
   "notification.follow_request": "{name} har begärt att följa dig",
   "notification.mention": "{name} nämnde dig",
   "notification.moderation-warning.learn_more": "Läs mer",
-  "notification.moderation_warning": "Du har mottagit en modereringsvarning",
+  "notification.moderation_warning": "Du har fått en moderationsvarning",
   "notification.moderation_warning.action_delete_statuses": "Några av dina inlägg har tagits bort.",
   "notification.moderation_warning.action_disable": "Ditt konto har inaktiverats.",
   "notification.moderation_warning.action_mark_statuses_as_sensitive": "Några av dina inlägg har markerats som känsliga.",
diff --git a/app/javascript/mastodon/locales/vi.json b/app/javascript/mastodon/locales/vi.json
index b188488f0b135b..102f1c3b4b329a 100644
--- a/app/javascript/mastodon/locales/vi.json
+++ b/app/javascript/mastodon/locales/vi.json
@@ -474,7 +474,7 @@
   "notification.follow_request": "{name} yêu cầu theo dõi bạn",
   "notification.mention": "{name} nhắc đến bạn",
   "notification.moderation-warning.learn_more": "Tìm hiểu",
-  "notification.moderation_warning": "Bạn đã nhận một cảnh báo kiểm duyệt",
+  "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ỡ.",
   "notification.moderation_warning.action_disable": "Tài khoản của bạn đã bị vô hiệu hóa.",
   "notification.moderation_warning.action_mark_statuses_as_sensitive": "Vài tút bạn bị đánh dấu nhạy cảm.",
diff --git a/app/javascript/mastodon/locales/zh-HK.json b/app/javascript/mastodon/locales/zh-HK.json
index 6b08e40284b177..eaa5dabe93134b 100644
--- a/app/javascript/mastodon/locales/zh-HK.json
+++ b/app/javascript/mastodon/locales/zh-HK.json
@@ -474,7 +474,6 @@
   "notification.follow_request": "{name} 要求追蹤你",
   "notification.mention": "{name} 提及你",
   "notification.moderation-warning.learn_more": "了解更多",
-  "notification.moderation_warning": "你收到一則審核警告",
   "notification.moderation_warning.action_delete_statuses": "你的部份帖文已被刪除。",
   "notification.moderation_warning.action_disable": "你的帳號已被停用。",
   "notification.moderation_warning.action_mark_statuses_as_sensitive": "你某些帖文已被標記為敏感內容。",
diff --git a/config/locales/doorkeeper.vi.yml b/config/locales/doorkeeper.vi.yml
index 84684d24ca7e59..624db9aff7eb4f 100644
--- a/config/locales/doorkeeper.vi.yml
+++ b/config/locales/doorkeeper.vi.yml
@@ -61,7 +61,7 @@ vi:
         title: Một lỗi đã xảy ra
       new:
         prompt_html: "%{client_name} yêu cầu truy cập tài khoản của bạn. Đây là ứng dụng của bên thứ ba. <strong>Nếu không tin tưởng, đừng cho phép nó.</strong>"
-        review_permissions: Xem lại quyền cho phép
+        review_permissions: Quyền truy cập
         title: Yêu cầu truy cập
       show:
         title: Sao chép mã này và dán nó vào ứng dụng.
@@ -122,7 +122,7 @@ vi:
         admin/accounts: Quản trị tài khoản
         admin/all: Mọi chức năng quản trị
         admin/reports: Quản trị báo cáo
-        all: Toàn quyền truy cập vào tài khoản Mastodon của bạn
+        all: Toàn quyền truy cập tài khoản Mastodon
         blocks: Chặn
         bookmarks: Tút đã lưu
         conversations: Thảo luận
diff --git a/config/locales/fo.yml b/config/locales/fo.yml
index 15c9c7dc043e65..f7303c512ac686 100644
--- a/config/locales/fo.yml
+++ b/config/locales/fo.yml
@@ -235,7 +235,7 @@ fo:
         change_email_user_html: "%{name} broytti teldupost addressuna hjá %{target}"
         change_role_user_html: "%{name} broytti leiklutin hjá %{target}"
         confirm_user_html: "%{name} góðtók teldupost addressuna hjá %{target}"
-        create_account_warning_html: "%{name} sendi eina ávarðing til %{target}"
+        create_account_warning_html: "%{name} sendi eina ávaring til %{target}"
         create_announcement_html: "%{name} stovnaði eina fráboðan %{target}"
         create_canonical_email_block_html: "%{name} forðaði telduposti við hash'inum %{target}"
         create_custom_emoji_html: "%{name} legði upp nýtt kenslutekn %{target}"
@@ -1835,7 +1835,7 @@ fo:
         delete_statuses: Summir av postum tínum eru staðfestir at vera í stríði við eina ella fleiri av leiðreglunum og eru tí strikaðir av umsjónarfólkunum á %{instance}.
         disable: Tú kanst ikki longur brúka tína kontu, men vangi tín og aðrar dátur eru óskalað. Tú kanst biðja um trygdaravrit av tínum dátum, broyta kontustillingar ella strika tína kontu.
         mark_statuses_as_sensitive: Summir av postum tínum eru merktir sum viðkvæmir av umsjónarfólkunum á %{instance}. Hetta merkir, at fólk mugu trýsta á miðilin í postinum, áðrenn ein undanvísing verður víst. Tú kanst sjálv/ur merkja miðlar viðkvæmar, tá tú postar í framtíðini.
-        sensitive: Frá nú av, so verða allar miðlafílur, sum tú leggur upp, merktar sum viðkvæmar og fjaldar aftan fyri eina ávarðing.
+        sensitive: Frá nú av, so verða allar miðlafílur, sum tú leggur upp, merktar sum viðkvæmar og fjaldar aftan fyri eina ávaring.
         silence: Tú kanst framvegis brúka kontu tína, men einans fólk, sum longu fylgja tær, fara at síggja tínar postar á hesum ambætaranum, og tú kanst vera hildin uttanfyri ymiskar leitihentleikar. Tó so, onnur kunnu framvegis fylgja tær beinleiðis.
         suspend: Tú kanst ikki longur brúka kontu tína og vangin og aðrar dátur eru ikki longur atkomulig. Tú kanst enn rita inn fyri at biðja um eitt trygdaravrit av tínum dátum, inntil dáturnar eru heilt burturbeindar um umleið 30 dagar, men vit varðveita nakrar grundleggjandi dátur fyri at forða tær í at støkka undan ógildingini.
       reason: 'Grund:'
diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index 712328deb83144..46cdcd3c68348f 100644
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -350,6 +350,18 @@ ia:
       media_storage: Immagazinage de medios
       new_users: nove usatores
       opened_reports: reportos aperte
+      pending_appeals_html:
+        one: "<strong>%{count}</strong> appello pendente"
+        other: "<strong>%{count}</strong> appellos pendente"
+      pending_reports_html:
+        one: "<strong>%{count}</strong> reporto pendente"
+        other: "<strong>%{count}</strong> reportos pendente"
+      pending_tags_html:
+        one: "<strong>%{count}</strong> hashtag pendente"
+        other: "<strong>%{count}</strong> hashtags pendente"
+      pending_users_html:
+        one: "<strong>%{count}</strong> usator pendente"
+        other: "<strong>%{count}</strong> usatores pendente"
       resolved_reports: reportos resolvite
       software: Software
       sources: Fontes de inscription
@@ -972,21 +984,40 @@ ia:
         silence: pro limitar lor conto
         suspend: pro suspender lor conto
       body: "%{target} appella un decision de moderation per %{action_taken_by} ab le %{date}, que era %{type}. Ille scribeva:"
+      next_steps: Tu pote approbar le appello a disfacer le decision de moderation, o ignorar lo.
+      subject: "%{username} appella un decision de moderation sur %{instance}"
     new_critical_software_updates:
+      body: Nove versiones critic de Mastodon ha essite publicate, tu poterea voler actualisar al plus tosto possibile!
       subject: Actualisationes critic de Mastodon es disponibile pro %{instance}!
+    new_pending_account:
+      body: Le detalios del nove conto es infra.
+      subject: Nove conto preste a revider sur %{instance} (%{username})
+    new_report:
+      body: "%{reporter} ha reportate %{target}"
+      body_remote: Alcuno de %{domain} ha reportate %{target}
+      subject: Nove reporto pro %{instance} (#%{id})
     new_software_updates:
       subject: Nove versiones de Mastodon es disponibile pro %{instance}!
     new_trends:
+      body: 'Le sequente elementos besoniar de un recension ante que illos pote esser monstrate publicamente:'
       new_trending_links:
         title: Ligamines de tendentia
       new_trending_statuses:
         title: Messages de tendentia
       new_trending_tags:
         title: Hashtags de tendentia
+      subject: Nove tendentias pro recenser sur %{instance}
   aliases:
     add_new: Crear alias
+    created_msg: Create con successo un nove alias. Ora tu pote initiar le motion ab le vetere conto.
+    deleted_msg: Removite con successo le alias. Mover de ille conto a isto non sera plus possibile.
+    empty: Tu non ha aliases.
+    hint_html: Si tu desira mover ab un altere conto a isto, ci tu pote crear un alias, que es requirite ante que tu pote continuar con mover sequaces ab le vetere conto a isto. Iste action per se mesme es <strong>innocue e reversibile</strong>. <strong>Le migration de conto es initiate ab le vetere conto</strong>.
+    remove: Disligar alias
   appearance:
     advanced_web_interface: Interfacie web avantiate
+    advanced_web_interface_hint: 'Si tu desira facer uso de tu integre largessa de schermo, le interfacie web avantiate te permitte de configurar plure columnas differente pro vider al mesme tempore tante informationes como tu vole: pagina principal, notificationes, chronogramma federate, ulle numero de listas e hashtags.'
+    animations_and_accessibility: Animationes e accessibilitate
     confirmation_dialogs: Dialogos de confirmation
     discovery: Discoperta
     localization:
@@ -1013,6 +1044,7 @@ ia:
   auth:
     apply_for_account: Peter un conto
     captcha_confirmation:
+      help_html: Si tu ha problemas a solver le CAPTCHA, tu pote contactar nos per %{email} e nos pote assister te.
       hint_html: Justo un altere cosa! Nos debe confirmar que tu es un human (isto es assi proque nos pote mantener foras le spam!). Solve le CAPTCHA infra e clicca "Continuar".
       title: Controlo de securitate
     confirmations:
@@ -1054,6 +1086,7 @@ ia:
     status:
       account_status: Stato del conto
       view_strikes: Examinar le admonitiones passate contra tu conto
+    use_security_key: Usar clave de securitate
   challenge:
     confirm: Continuar
     invalid_password: Contrasigno non valide
@@ -1066,13 +1099,22 @@ ia:
       x_days: "%{count}d"
       x_minutes: "%{count} m"
   deletes:
+    challenge_not_passed: Le informationes que tu ha inserite non era correcte
     confirm_password: Insere tu contrasigno actual pro verificar tu identitate
+    confirm_username: Insere tu actual contrasigno pro verificar tu identitate
     proceed: Deler le conto
     success_msg: Tu conto esseva delite con successo
     warning:
+      before: 'Insere tu nomine de usator pro confirmar le procedura:'
+      caches: Contente que ha essite in cache per altere servitores pote persister
       data_removal: Tu messages e altere datos essera removite permanentemente
       email_change_html: Tu pote <a href="%{path}">cambiar tu adresse de e-mail</a> sin deler tu conto
+      email_contact_html: Si illo ancora non arriva, tu pote inviar email a <a href="mailto:%{email}">%{email}</a> pro peter adjuta
+      email_reconfirmation_html: Si tu non recipe le email de confirmation, tu pote <a href="%{path}>requirer lo ancora</a>
+      irreversible: Tu non potera restaurar o reactivar tu conto
+      more_details_html: Pro altere detalios, vide le <a href="%{terms_path}">politica de confidentialitate</a>.
       username_available: Tu nomine de usator essera disponibile novemente
+      username_unavailable: Tu nomine de usator remanera indisponibile
   disputes:
     strikes:
       action_taken: Action prendite
@@ -1103,24 +1145,41 @@ ia:
       your_appeal_approved: Tu appello ha essite approbate
       your_appeal_pending: Tu ha submittite un appello
       your_appeal_rejected: Tu appello ha essite rejectate
+  domain_validator:
+    invalid_domain: non es un nomine de dominio valide
   edit_profile:
     basic_information: Information basic
     other: Alteres
   errors:
+    '400': Le requesta que tu inviava era non valide o mal formate.
+    '403': Tu non ha le permisso pro acceder a iste pagina.
+    '404': Le pagina que tu cerca non es ci.
+    '406': Iste pagina non es disponibile in le formato requirite.
+    '410': Le pagina que tu cercava non plus existe ci.
     '422':
       content: Le verification de securitate ha fallite. Bloca tu le cookies?
       title: Falleva le verification de securitate
+    '429': Troppe requestas
+    '500':
+      content: Nos lo regretta, ma alco errate eveniva sur nostre extremo.
+      title: Iste pagina non es correcte
+    '503': Le pagina non poteva esser servite per un panna de servitor temporari.
+    noscript_html: A usar le application web Mastodon, activa JavaScript. In alternativa, tenta un del <a href="%{apps_path}">apps native</a> de Mastodon pro tu platteforma.
   existing_username_validator:
+    not_found: impossibile trovar un usator local con ille nomine de usator
     not_found_multiple: non poteva trovar %{usernames}
   exports:
     archive_takeout:
       date: Data
       download: Discargar tu archivo
+      hint_html: Tu pote requirer un archivo de tu <strong>messages e medios cargate</strong>. Le datos exportate sera in le formato ActivityPub, legibile per ulle software conforme.
+      in_progress: Compilante tu archivo...
       size: Dimension
     blocks: Tu ha blocate
     bookmarks: Marcapaginas
     csv: CSV
     domain_blocks: Blocadas de dominio
+    lists: Listas
     mutes: Tu ha silentiate
     storage: Immagazinage de medios
   featured_tags:
@@ -1146,6 +1205,9 @@ ia:
     new:
       save: Salveguardar nove filtro
       title: Adder nove filtro
+    statuses:
+      index:
+        title: Messages filtrate
   generic:
     all: Toto
     cancel: Cancellar
@@ -1153,6 +1215,7 @@ ia:
     confirm: Confirmar
     copy: Copiar
     delete: Deler
+    none: Nemo
     order_by: Ordinar per
     save_changes: Salvar le cambios
     today: hodie
@@ -1162,6 +1225,8 @@ ia:
       invalid_csv_file: 'File CSV non valide. Error: %{error}'
       too_large: Le file es troppo longe
     failures: Fallimentos
+    modes:
+      overwrite_long: Reimplaciar registros actual con le noves
     overwrite_preambles:
       blocking_html: Tu es sur le puncto de <strong>reimplaciar tu lista de blocadas</strong> per usque a <strong>%{total_items} contos</strong> proveniente de <strong>%{filename}</strong>.
       domain_blocking_html: Tu es sur le puncto de <strong>reimplaciar tu lista de blocadas de dominio</strong> per usque a <strong>%{total_items} dominios</strong> proveniente de <strong>%{filename}</strong>.
@@ -1170,7 +1235,14 @@ ia:
       domain_blocking_html: Tu es sur le puncto de <strong>blocar</strong> usque a <strong>%{total_items} dominios</strong> a partir de <strong>%{filename}</strong>.
     preface: Tu pote importar datos que tu ha exportate de un altere servitor, como un lista de personas que tu seque o bloca.
     recent_imports: Importationes recente
+    states:
+      finished: Terminate
+      in_progress: In curso
+      scheduled: Planificate
+      unconfirmed: Non confirmate
     status: Stato
+    success: Tu datos era cargate con successo e sera processate in tempore debite
+    time_started: Initiate le
     titles:
       blocking: Importation de contos blocate
       bookmarks: Importation de marcapaginas
@@ -1186,7 +1258,9 @@ ia:
       blocking: Lista de blocadas
       bookmarks: Marcapaginas
       domain_blocking: Lista de dominios blocate
+      following: Sequente lista
       lists: Listas
+      muting: Lista del silentiates
     upload: Incargar
   invites:
     delete: Disactivar
@@ -1199,10 +1273,16 @@ ia:
       '604800': 1 septimana
       '86400': 1 die
     expires_in_prompt: Nunquam
+    generate: Generar ligamine de invitation
+    invalid: Iste invitation non es valide
+    max_uses:
+      one: un uso
+      other: "%{count} usos"
     title: Invitar personas
   login_activities:
     authentication_methods:
       password: contrasigno
+      webauthn: claves de securitate
   mail_subscriptions:
     unsubscribe:
       action: Si, desubscriber
@@ -1220,10 +1300,16 @@ ia:
       title: Desubcriber
   migrations:
     errors:
+      move_to_self: non pote esser le conto actual
       not_found: non poterea esser trovate
+  moderation:
+    title: Moderation
   move_handler:
     carry_blocks_over_text: Iste usator ha cambiate de conto desde %{acct}, que tu habeva blocate.
   notification_mailer:
+    admin:
+      sign_up:
+        subject: "%{name} se ha inscribite"
     follow:
       title: Nove sequitor
     follow_request:
@@ -1232,16 +1318,25 @@ ia:
       action: Responder
     poll:
       subject: Un inquesta de %{name} ha finite
+  otp_authentication:
+    enable: Activar
   pagination:
     next: Sequente
   preferences:
     other: Altere
     public_timelines: Chronologias public
+  privacy:
+    privacy: Confidentialitate
+    search: Cercar
   privacy_policy:
     title: Politica de confidentialitate
   relationships:
     activity: Activitate del conto
+    invited: Invitate
     most_recent: Plus recente
+    moved: Movite
+    mutual: Mutue
+    primary: Primari
     status: Stato del conto
   rss:
     content_warning: 'Advertimento de contento:'
@@ -1273,6 +1368,7 @@ ia:
     current_session: Session actual
     date: Data
     description: "%{browser} sur %{platform}"
+    ip: IP
     platforms:
       adobe_air: Adobe Air
       android: Android
@@ -1287,6 +1383,7 @@ ia:
       windows: Windows
       windows_mobile: Windows Mobile
       windows_phone: Windows Phone
+    title: Sessiones
   settings:
     account: Conto
     account_settings: Parametros de conto
@@ -1316,6 +1413,7 @@ ia:
       vote: Votar
     show_more: Monstrar plus
     visibilities:
+      direct: Directe
       private_long: Solmente monstrar a sequitores
       public: Public
   statuses_cleanup:
@@ -1342,6 +1440,7 @@ ia:
     add: Adder
     disable: Disactivar 2FA
     edit: Modificar
+    generate_recovery_codes: Generar codices de recuperation
   user_mailer:
     appeal_approved:
       action: Parametros de conto
@@ -1350,8 +1449,11 @@ ia:
       explanation: Le appello contra le admonition contra tu conto del %{strike_date}, que tu ha submittite le %{appeal_date}, ha essite rejectate.
     warning:
       appeal: Submitter un appello
+      categories:
+        spam: Spam
       subject:
         disable: Tu conto %{acct} ha essite gelate
+        mark_statuses_as_sensitive: Tu messages sur %{acct} ha essite marcate como sensibile
         none: Advertimento pro %{acct}
         sensitive: Tu messages sur %{acct} essera marcate como sensibile a partir de ora
         silence: Tu conto %{acct} ha essite limitate
@@ -1370,8 +1472,12 @@ ia:
       apps_step: Discarga nostre applicationes official.
       apps_title: Applicationes de Mastodon
       edit_profile_action: Personalisar
+      edit_profile_step: Impulsa tu interactiones con un profilo comprehensive.
       edit_profile_title: Personalisar tu profilo
+      explanation: Ecce alcun consilios pro initiar
       feature_action: Apprender plus
+      feature_audience_title: Crea tu auditorio in fiducia
+      feature_moderation_title: Moderation como deberea esser
       follow_action: Sequer
       post_title: Face tu prime message
       share_action: Compartir
diff --git a/config/locales/ie.yml b/config/locales/ie.yml
index 2b819c53de616e..473d7b750f6741 100644
--- a/config/locales/ie.yml
+++ b/config/locales/ie.yml
@@ -751,6 +751,7 @@ ie:
         desc_html: To ci usa extern scrites de hCaptcha, quel posse esser ínquietant pro rasones de securitá e privatie. In plu, <strong>it posse far li processu de registration mult plu desfacil (particularimen por tis con deshabilitás)</strong>. Pro ti rasones, ples considerar alternativ mesuras, tales quam registration per aprobation o invitation.
         title: Exige que nov usatores solue un CAPTCHA por confirmar lor conto
       content_retention:
+        danger_zone: Zone de dangere
         preamble: Decider qualmen usator-generat contenete es inmagasinat in Mastodon.
         title: Retention de contenete
       default_noindex:
@@ -1659,6 +1660,7 @@ ie:
     preferences: Preferenties
     profile: Public profil
     relationships: Sequetes e sequitores
+    severed_relationships: Detranchat relationes
     statuses_cleanup: Automatisat deletion de postas
     strikes: Admonimentes moderatori
     two_factor_authentication: 2-factor autentication
@@ -1672,6 +1674,7 @@ ie:
     lost_followers: Perdit sequitores
     lost_follows: Perdit sequetes
     preamble: Tu posse perdir tis queles tu seque e tui sequitores quande tu blocca un domonia o quande tui moderatores decide suspender un lontan servitor. Tande, tu va posser descargar listes de dejuntet relationes, a inspecter e possibilmen importar sur un altri servitor.
+    purged: Information pri ti-ci servitor ha esset purgat per li administratores de tui servitor.
     type: Eveniment
   statuses:
     attached:
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index b815cada5c7f74..552afa83014561 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -507,6 +507,8 @@ lt:
     roles:
       everyone: Numatytieji leidimai
       everyone_full_description_html: Tai – <strong>bazinis vaidmuo</strong>, turintis įtakos <strong>visiems naudotojams</strong>, net ir tiems, kurie neturi priskirto vaidmens. Visi kiti vaidmenys iš jo paveldi teises.
+      privileges:
+        manage_taxonomies_description: Leidžia naudotojams peržiūrėti tendencingą turinį ir atnaujinti saitažodžių nustatymus
     settings:
       captcha_enabled:
         desc_html: Tai priklauso nuo hCaptcha išorinių skriptų, kurie gali kelti susirūpinimą dėl saugumo ir privatumo. Be to, <strong>dėl to registracijos procesas kai kuriems žmonėms (ypač neįgaliesiems) gali būti gerokai sunkiau prieinami</strong>. Dėl šių priežasčių apsvarstyk alternatyvias priemones, pavyzdžiui, patvirtinimu arba kvietimu grindžiamą registraciją.
@@ -514,6 +516,7 @@ lt:
         danger_zone: Pavojinga zona
       discovery:
         public_timelines: Viešieji laiko skalės
+        trends: Tendencijos
       domain_blocks:
         all: Visiems
       registrations:
@@ -526,6 +529,7 @@ lt:
         title: Medija
       no_status_selected: Jokie statusai nebuvo pakeisti, nes niekas nepasirinkta
       title: Paskyros statusai
+      trending: Tendencinga
       with_media: Su medija
     system_checks:
       elasticsearch_health_yellow:
@@ -536,8 +540,45 @@ lt:
         message_html: Tavo Elasticsearch klasteris turi tik vieną mazgą, <code>ES_PRESET</code> turėtų būti nustatyta į <code>single_node_cluster</code>.
     title: Administracija
     trends:
+      allow: Leisti
+      approved: Patvirtinta
+      disallow: Neleisti
+      links:
+        allow: Leisti nuorodą
+        allow_provider: Leisti leidėją
+        description_html: Tai – nuorodos, kuriomis šiuo metu daug bendrinasi paskyros, iš kurių tavo serveris mato įrašus. Tai gali padėti naudotojams sužinoti, kas vyksta pasaulyje. Jokios nuorodos nerodomos viešai, kol nepatvirtinai leidėjo. Taip pat gali leisti arba atmesti atskiras nuorodas.
+        disallow: Neleisti nuorodą
+        disallow_provider: Neleisti leidėją
+        no_link_selected: Jokios nuorodos nebuvo pakeistos, nes nebuvo pasirinkta nė viena
+        publishers:
+          no_publisher_selected: Jokie leidėjai nebuvo pakeisti, nes nė vienas nebuvo pasirinktas
+        title: Tendencingos nuorodos
+        usage_comparison: Bendrinta %{today} kartų šiandien, palyginti su %{yesterday} vakar
+      not_allowed_to_trend: Neleidžiama tendencinguoti
+      only_allowed: Leidžiama tik
+      pending_review: Laukiama peržiūros
       preview_card_providers:
+        allowed: Nuorodos iš šio leidėjo gali tendencinguoti
+        description_html: Tai – domenai, iš kurių dažnai bendrinamos nuorodos tavo serveryje. Nuorodos netendencinguos, nebent nuorodos domenas yra patvirtintas. Tavo patvirtinimas (arba atmetimas) apima ir subdomenus.
+        rejected: Nuorodos iš šio leidėjo netendencinguos
         title: Leidėjai
+      rejected: Atmesta
+      statuses:
+        allow: Leisti įrašą
+        allow_account: Leisti autorių (-ę)
+        description_html: Tai – įrašai, apie kuriuos žino tavo serveris ir kuriais šiuo metu daug bendrinamasi ir kurie yra mėgstami. Tai gali padėti naujiems ir grįžtantiems naudotojams rasti daugiau žmonių, kuriuos galima sekti. Jokie įrašai nerodomi viešai, kol nepatvirtinai autoriaus (-ės), o autorius (-ė) leidžia savo paskyrą siūlyti kitiems. Taip pat gali leisti arba atmesti atskirus įrašus.
+        disallow: Neleisti įrašą
+        disallow_account: Neleisti autorių (-ę)
+        no_status_selected: Jokie tendencingi įrašai nebuvo pakeisti, nes nė vienas iš jų nebuvo pasirinktas
+        not_discoverable: Autorius (-ė) nesutiko, kad būtų galima juos atrasti
+        title: Tendencingi įrašai
+      tags:
+        not_trendable: Nepasirodys tendencijose
+        title: Tendencingos saitažodžiai
+        trendable: Gali pasirodyti tendencijose
+        trending_rank: 'Tendencinga #%{rank}'
+      title: Tendencijos
+      trending: Tendencinga
     warning_presets:
       add_new: Pridėti naują
       delete: Ištrinti
@@ -554,6 +595,14 @@ lt:
       body: "%{reporter} parašė skundą apie %{target}"
       body_remote: Kažkas iš %{domain} parašė skundą apie %{target}
       subject: Naujas skundas %{instance} (#%{id})
+    new_trends:
+      new_trending_links:
+        title: Tendencingos nuorodos
+      new_trending_statuses:
+        title: Tendencingi įrašai
+      new_trending_tags:
+        title: Tendencingos saitažodžiai
+      subject: Naujos tendencijos peržiūrimos %{instance}
   appearance:
     advanced_web_interface: Išplėstinė žiniatinklio sąsaja
     advanced_web_interface_hint: 'Jei nori išnaudoti visą ekrano plotį, išplėstinė žiniatinklio sąsaja leidžia sukonfigūruoti daug skirtingų stulpelių, kad vienu metu matytum tiek informacijos, kiek tik nori: Pagrindinis, pranešimai, federacinė laiko skalė, bet kokie sąrašai ir saitažodžiai.'
@@ -925,8 +974,8 @@ lt:
       follows_subtitle: Sek gerai žinomas paskyras.
       follows_title: Ką sekti
       follows_view_more: Peržiūrėti daugiau sekamų žmonių
-      hashtags_subtitle: Naršyk, kas tendencinga per pastarąsias 2 dienas.
-      hashtags_title: Trendingiausi saitažodžiai
+      hashtags_subtitle: Naršyk, kas tendencinga per pastarąsias 2 dienas
+      hashtags_title: Tendencingos saitažodžiai
       hashtags_view_more: Peržiūrėti daugiau tendencingų saitažodžių
       post_action: Sukurti
       post_step: Sakyk labas pasauliui tekstu, nuotraukomis, vaizdo įrašais arba apklausomis.
diff --git a/config/locales/simple_form.cs.yml b/config/locales/simple_form.cs.yml
index 54edc4149df4a6..0b1a34e1b99dec 100644
--- a/config/locales/simple_form.cs.yml
+++ b/config/locales/simple_form.cs.yml
@@ -77,11 +77,13 @@ cs:
           warn: Schovat filtrovaný obsah za varováním zmiňujicím název filtru
       form_admin_settings:
         activity_api_enabled: Počty lokálně zveřejnělých příspěvků, aktivních uživatelů a nových registrací v týdenních intervalech
+        app_icon: WEBP, PNG, GIF nebo JPG. Nahradí výchozí ikonu aplikace v mobilních zařízeních vlastní ikonou.
         backups_retention_period: Uživatelé mají možnost vytvářet archivy svých příspěvků, které si mohou stáhnout později. Pokud je nastaveno na kladnou hodnotu, budou tyto archivy po zadaném počtu dní automaticky odstraněny z úložiště.
         bootstrap_timeline_accounts: Tyto účty budou připnuty na vrchol nových uživatelů podle doporučení.
         closed_registrations_message: Zobrazeno při zavření registrace
         content_cache_retention_period: Všechny příspěvky z jiných serverů (včetně boostů a odpovědí) budou po uplynutí stanoveného počtu dní smazány bez ohledu na interakci místního uživatele s těmito příspěvky. To se týká i příspěvků, které místní uživatel přidal do záložek nebo oblíbených. Soukromé zmínky mezi uživateli z různých instancí budou rovněž ztraceny a nebude možné je obnovit. Použití tohoto nastavení je určeno pro instance pro speciální účely a při implementaci pro obecné použití porušuje mnohá očekávání uživatelů.
         custom_css: Můžete použít vlastní styly ve verzi Mastodonu.
+        favicon: WEBP, PNG, GIF nebo JPG. Nahradí výchozí favicon Mastodonu vlastní ikonou.
         mascot: Přepíše ilustraci v pokročilém webovém rozhraní.
         media_cache_retention_period: Mediální soubory z příspěvků vzdálených uživatelů se ukládají do mezipaměti na vašem serveru. Pokud je nastaveno na kladnou hodnotu, budou média po zadaném počtu dní odstraněna. Pokud jsou mediální data vyžádána po jejich odstranění, budou znovu stažena, pokud je zdrojový obsah stále k dispozici. Vzhledem k omezením týkajícím se četnosti dotazů karet náhledů odkazů na weby třetích stran se doporučuje nastavit tuto hodnotu alespoň na 14 dní, jinak nebudou karty náhledů odkazů na vyžádání aktualizovány dříve.
         peers_api_enabled: Seznam názvů domén se kterými se tento server setkal ve fediversu. Neobsahuje žádná data o tom, zda jste federovali s daným serverem, pouze že o něm váš server ví. Toto je využíváno službami, které sbírají o federování statistiku v obecném smyslu.
diff --git a/config/locales/simple_form.es-MX.yml b/config/locales/simple_form.es-MX.yml
index 90e223dec3edfc..b3c8a857e83411 100644
--- a/config/locales/simple_form.es-MX.yml
+++ b/config/locales/simple_form.es-MX.yml
@@ -77,11 +77,13 @@ es-MX:
           warn: Ocultar el contenido filtrado detrás de una advertencia mencionando el título del filtro
       form_admin_settings:
         activity_api_enabled: Conteo de publicaciones publicadas localmente, usuarios activos, y nuevos registros en periodos semanales
+        app_icon: WEBP, PNG, GIF o JPG. Reemplaza el icono de aplicación predeterminado en dispositivos móviles con un icono personalizado.
         backups_retention_period: Los usuarios tienen la capacidad de generar archivos de sus mensajes para descargar más adelante. Cuando se establece un valor positivo, estos archivos se eliminarán automáticamente del almacenamiento después del número de días especificado.
         bootstrap_timeline_accounts: Estas cuentas aparecerán en la parte superior de las recomendaciones de los nuevos usuarios.
         closed_registrations_message: Mostrado cuando los registros están cerrados
         content_cache_retention_period: Todas las publicaciones de otros servidores (incluso impulsos y respuestas) se eliminarán después del número de días especificado, sin tener en cuenta la interacción del usuario local con esos mensajes. Esto incluye mensajes donde un usuario local los ha marcado como marcadores o favoritos. Las menciones privadas entre usuarios de diferentes instancias también se perderán sin posibilidad de recuperación. El uso de esta configuración está destinado a instancias de propósito especial, y rompe muchas expectativas de los usuarios cuando se implementa para un uso de propósito general.
         custom_css: Puedes aplicar estilos personalizados a la versión web de Mastodon.
+        favicon: WEBP, PNG, GIF o JPG. Reemplaza el favicon predeterminado de Mastodon con un icono personalizado.
         mascot: Reemplaza la ilustración en la interfaz web avanzada.
         media_cache_retention_period: Los archivos multimedia de las publicaciones creadas por usuarios remotos se almacenan en caché en tu servidor. Cuando se establece un valor positivo, estos archivos se eliminarán después del número especificado de días. Si los datos multimedia se solicitan después de eliminarse, se volverán a descargar, si el contenido fuente todavía está disponible. Debido a restricciones en la frecuencia con la que las tarjetas de previsualización de enlaces realizan peticiones a sitios de terceros, se recomienda establecer este valor a al menos 14 días, o las tarjetas de previsualización de enlaces no se actualizarán bajo demanda antes de ese momento.
         peers_api_enabled: Una lista de nombres de dominio que este servidor ha encontrado en el fediverso. Aquí no se incluye ningún dato sobre si usted federa con un servidor determinado, sólo que su servidor lo sabe. Esto es utilizado por los servicios que recopilan estadísticas sobre la federación en un sentido general.
diff --git a/config/locales/simple_form.es.yml b/config/locales/simple_form.es.yml
index 1d75bc4234ea0c..2fb5cab987f793 100644
--- a/config/locales/simple_form.es.yml
+++ b/config/locales/simple_form.es.yml
@@ -77,11 +77,13 @@ es:
           warn: Ocultar el contenido filtrado detrás de una advertencia mencionando el título del filtro
       form_admin_settings:
         activity_api_enabled: Conteo de publicaciones publicadas localmente, usuarios activos y registros nuevos cada semana
+        app_icon: WEBP, PNG, GIF o JPG. Reemplaza el icono de aplicación predeterminado en dispositivos móviles con un icono personalizado.
         backups_retention_period: Los usuarios tienen la capacidad de generar archivos de sus mensajes para descargar más adelante. Cuando se establece un valor positivo, estos archivos se eliminarán automáticamente del almacenamiento después del número de días especificado.
         bootstrap_timeline_accounts: Estas cuentas aparecerán en la parte superior de las recomendaciones de los nuevos usuarios.
         closed_registrations_message: Mostrado cuando los registros están cerrados
         content_cache_retention_period: Todas las publicaciones de otros servidores (incluso impulsos y respuestas) se eliminarán después del número de días especificado, sin tener en cuenta la interacción del usuario local con esos mensajes. Esto incluye mensajes donde un usuario local los ha marcado como marcadores o favoritos. Las menciones privadas entre usuarios de diferentes instancias también se perderán sin posibilidad de recuperación. El uso de esta configuración está destinado a instancias de propósito especial, y rompe muchas expectativas de los usuarios cuando se implementa para un uso de propósito general.
         custom_css: Puedes aplicar estilos personalizados a la versión web de Mastodon.
+        favicon: WEBP, PNG, GIF o JPG. Reemplaza el favicon predeterminado de Mastodon con un icono personalizado.
         mascot: Reemplaza la ilustración en la interfaz web avanzada.
         media_cache_retention_period: Los archivos multimedia de las publicaciones creadas por usuarios remotos se almacenan en caché en tu servidor. Cuando se establece un valor positivo, estos archivos se eliminarán después del número especificado de días. Si los datos multimedia se solicitan después de eliminarse, se volverán a descargar, si el contenido fuente todavía está disponible. Debido a restricciones en la frecuencia con la que las tarjetas de previsualización de enlaces realizan peticiones a sitios de terceros, se recomienda establecer este valor a al menos 14 días, o las tarjetas de previsualización de enlaces no se actualizarán bajo demanda antes de ese momento.
         peers_api_enabled: Una lista de nombres de dominio que este servidor ha encontrado en el Fediverso. Aquí no se incluye ningún dato sobre si federas con un servidor determinado, solo que tu servidor lo conoce. Esto es utilizado por los servicios que recopilan estadísticas sobre la federación en un sentido general.
diff --git a/config/locales/simple_form.ie.yml b/config/locales/simple_form.ie.yml
index e482bd828c899b..2b995e7efa5e8a 100644
--- a/config/locales/simple_form.ie.yml
+++ b/config/locales/simple_form.ie.yml
@@ -77,10 +77,15 @@ ie:
           warn: Celar li contenete filtrat detra un avise mentionant li titul del filtre
       form_admin_settings:
         activity_api_enabled: Númeres de postas publicat localmen, activ usatores, e nov adhesiones in periodes semanal
+        app_icon: WEBP, PNG, GIF o JPG. Remplazza li predenifit favicon Mastodon sur mobiles con un icon customisat.
+        backups_retention_period: Usatores posse generar archives de lor postas por adcargar plu tard. Si on specifica un valore positiv, li archives va esser automaticmen deletet de tui magazinage pos li specificat quantitá de dies.
         bootstrap_timeline_accounts: Ti-ci contos va esser pinglat al parte superiori del recomandationes por nov usatores.
         closed_registrations_message: Monstrat quande adhesiones es cludet
+        content_cache_retention_period: Omni postas de altri servitores (includente boosts e responses) va esser deletet pos li specificat quantitá de dies, sin egard a local usator-interactiones con les. To vale anc por postas queles un local usator ha marcat o favoritat it. Anc privat mentiones ínter usatores de diferent instanties va esser perdit e ínrestorabil. Talmen, ti-ci parametre es intentet por scopes special pro que it posse ruptes li expectationes de usatores.
         custom_css: On posse aplicar customisat stiles al web-version de Mastodon.
+        favicon: WEBP, PNG, GIF oo JPG. Remplazza li predenifit favicon Mastodon con in icon customisat.
         mascot: Substitue li ilustration in li avansat interfacie web.
+        media_cache_retention_period: Files de medie de postas creat de lontan usatores es cachat sur tui servitor. Si on specifica un valore positiv, ili va esser automaticmen deletet pos li specificat quantitá de dies. Si on peti li data del medie pos deletion, it va esser re-descargat si li original fonte es disponibil. Restrictiones pri li frequentie de ligament-previsiones posse exister sur altri situs, e pro to it es recomandat que on usa un valore de adminim 14 dies; altrimen, li ligament-previsiones ne va esser actualisat secun demande ante ti témpor.
         peers_api_enabled: Un liste de nómines de dominia queles ti-ci servitor ha incontrat in li fediverse. Ci null data es includet pri ca tu confedera con un cert servitor o ne; it indica solmen que tui servitor conosse it. Usat per servicies colectent general statisticas pri federation.
         profile_directory: Li profilarium monstra omni usatores volent esser decovribil.
         require_invite_text: Quande registrationes besona manual aprobation, fa que li textu "Pro quo tu vole registrar te?" es obligatori vice facultativ
@@ -240,6 +245,7 @@ ie:
         backups_retention_period: Periode de retener archives de usator
         bootstrap_timeline_accounts: Sempre recomandar ti-ci contos a nov usatores
         closed_registrations_message: Customisat missage quande registration ne disponibil
+        content_cache_retention_period: Periode de retention por contenete lontan
         custom_css: Custom CSS
         mascot: Customisat mascot (hereditat)
         media_cache_retention_period: Periode de retention por cachat medie
diff --git a/config/locales/simple_form.ja.yml b/config/locales/simple_form.ja.yml
index caf4c5429965b2..c0698c3f7a755c 100644
--- a/config/locales/simple_form.ja.yml
+++ b/config/locales/simple_form.ja.yml
@@ -77,11 +77,13 @@ ja:
           warn: フィルタに一致した投稿を非表示にし、フィルタのタイトルを含む警告を表示します
       form_admin_settings:
         activity_api_enabled: 週単位でローカルで公開された投稿数、アクティブユーザー数、新規登録者数を表示します
+        app_icon: モバイル端末で表示されるデフォルトのアプリアイコンを独自のアイコンで上書きします。WEBP、PNG、GIF、JPGが利用可能です。
         backups_retention_period: ユーザーには、後でダウンロードするために投稿のアーカイブを生成する機能があります。正の値に設定すると、これらのアーカイブは指定された日数後に自動的にストレージから削除されます。
         bootstrap_timeline_accounts: これらのアカウントは、新しいユーザー向けのおすすめユーザーの一番上にピン留めされます。
         closed_registrations_message: アカウント作成を停止している時に表示されます
         content_cache_retention_period: 他のサーバーからのすべての投稿（ブーストや返信を含む）は、指定された日数が経過すると、ローカルユーザーとのやりとりに関係なく削除されます。これには、ローカルユーザーがブックマークやお気に入りとして登録した投稿も含まれます。異なるサーバーのユーザー間の非公開な変身も失われ、復元することは不可能です。この設定の使用は特別な目的のインスタンスのためのものであり、一般的な目的のサーバーで使用するした場合、多くのユーザーの期待を裏切ることになります。
         custom_css: ウェブ版のMastodonでカスタムスタイルを適用できます。
+        favicon: デフォルトのMastodonのブックマークアイコンを独自のアイコンで上書きします。WEBP、PNG、GIF、JPGが利用可能です。
         mascot: 上級者向けWebインターフェースのイラストを上書きします。
         media_cache_retention_period: リモートユーザーが投稿したメディアファイルは、あなたのサーバーにキャッシュされます。正の値を設定すると、メディアは指定した日数後に削除されます。削除後にメディアデータが要求された場合、ソースコンテンツがまだ利用可能であれば、再ダウンロードされます。リンクプレビューカードがサードパーティのサイトを更新する頻度に制限があるため、この値を少なくとも14日に設定することをお勧めします。
         peers_api_enabled: このサーバーが Fediverse で遭遇したドメイン名のリストです。このサーバーが知っているだけで、特定のサーバーと連合しているかのデータは含まれません。これは一般的に Fediverse に関する統計情報を収集するサービスによって使用されます。
diff --git a/config/locales/simple_form.ko.yml b/config/locales/simple_form.ko.yml
index df4755c4fbc15d..54d36eafe0393f 100644
--- a/config/locales/simple_form.ko.yml
+++ b/config/locales/simple_form.ko.yml
@@ -78,11 +78,14 @@ ko:
       form_admin_settings:
         activity_api_enabled: 주별 로컬에 게시된 글, 활성 사용자 및 새로운 가입자 수
         app_icon: WEBP, PNG, GIF 또는 JPG. 모바일 기기에 쓰이는 기본 아이콘을 대체합니다.
+        backups_retention_period: 사용자들은 나중에 다운로드하기 위해 게시물 아카이브를 생성할 수 있습니다. 양수로 설정된 경우 이 아카이브들은 지정된 일수가 지난 후에 저장소에서 자동으로 삭제될 것입니다.
         bootstrap_timeline_accounts: 이 계정들은 팔로우 추천 목록 상단에 고정됩니다.
         closed_registrations_message: 새 가입을 차단했을 때 표시됩니다
+        content_cache_retention_period: 다른 서버의 모든 게시물(부스트 및 답글 포함)은 해당 게시물에 대한 로컬 사용자의 상호 작용과 관계없이 지정된 일수가 지나면 삭제됩니다. 여기에는 로컬 사용자가 북마크 또는 즐겨찾기로 표시한 게시물도 포함됩니다. 다른 인스턴스 사용자와 주고 받은 비공개 멘션도 손실되며 복원할 수 없습니다. 이 설정은 특수 목적의 인스턴스를 위한 것이며 일반적인 용도의 많은 사용자의 예상이 빗나가게 됩니다.
         custom_css: 사용자 지정 스타일을 웹 버전의 마스토돈에 지정할 수 있습니다.
         favicon: WEBP, PNG, GIF 또는 JPG. 기본 파비콘을 대체합니다.
         mascot: 고급 웹 인터페이스의 그림을 대체합니다.
+        media_cache_retention_period: 원격 사용자가 작성한 글의 미디어 파일은 이 서버에 캐시됩니다. 양수로 설정하면 지정된 일수 후에 미디어가 삭제됩니다. 삭제된 후에 미디어 데이터를 요청하면 원본 콘텐츠를 사용할 수 있는 경우 다시 다운로드됩니다. 링크 미리 보기 카드가 타사 사이트를 폴링하는 빈도에 제한이 있으므로 이 값을 최소 14일로 설정하는 것이 좋으며, 그렇지 않으면 그 이전에는 링크 미리 보기 카드가 제때 업데이트되지 않을 것입니다.
         peers_api_enabled: 이 서버가 연합우주에서 만났던 서버들에 대한 도메인 네임의 목록입니다. 해당 서버와 어떤 연합을 했는지에 대한 정보는 전혀 포함되지 않고, 단순히 그 서버를 알고 있는지에 대한 것입니다. 이것은 일반적으로 연합에 대한 통계를 수집할 때 사용됩니다.
         profile_directory: 프로필 책자는 발견되기를 희망하는 모든 사람들의 목록을 나열합니다.
         require_invite_text: 가입이 수동 승인을 필요로 할 때, "왜 가입하려고 하나요?" 항목을 선택사항으로 두는 것보다는 필수로 두는 것이 낫습니다
diff --git a/config/locales/simple_form.lt.yml b/config/locales/simple_form.lt.yml
index 6631b59b19e7f0..1c73ce0a842a56 100644
--- a/config/locales/simple_form.lt.yml
+++ b/config/locales/simple_form.lt.yml
@@ -85,6 +85,7 @@ lt:
         thumbnail: Maždaug 2:1 dydžio vaizdas, rodomas šalia tavo serverio informacijos.
         timeline_preview: Atsijungę lankytojai galės naršyti naujausius viešus įrašus, esančius serveryje.
         trends: Trendai rodo, kurios įrašai, saitažodžiai ir naujienų istorijos tavo serveryje sulaukia didžiausio susidomėjimo.
+        trends_as_landing_page: Rodyti tendencingą turinį atsijungusiems naudotojams ir lankytojams vietoj šio serverio aprašymo. Reikia, kad tendencijos būtų įjungtos.
       rule:
         hint: Pasirinktinai. Pateik daugiau informacijos apie taisyklę.
       sessions:
@@ -169,6 +170,9 @@ lt:
         site_title: Serverio pavadinimas
         theme: Numatytoji tema
         thumbnail: Serverio miniatūra
+        trendable_by_default: Leisti tendencijas be išankstinės peržiūros
+        trends: Įjungti tendencijas
+        trends_as_landing_page: Naudoti tendencijas kaip nukreipimo puslapį
       invite_request:
         text: Kodėl nori prisijungti?
       notification_emails:
@@ -181,6 +185,7 @@ lt:
         software_updates:
           label: Yra nauja Mastodon versija
           patch: Pranešti apie klaidų ištaisymo atnaujinimus
+        trending_tag: Reikia peržiūros naujam tendencijai
       rule:
         hint: Papildoma informacija
         text: Taisyklė
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 8a001d875581c5..56b7bea69a8ad8 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -1838,6 +1838,9 @@ th:
       feature_action: เรียนรู้เพิ่มเติม
       feature_audience: Mastodon มีความพิเศษที่ให้คุณจัดการผู้รับสารของคุณได้โดยไม่มีตัวกลาง นอกจากนี้ การติดตั้ง Mastodon บนโครงสร้างพื้นฐานของคุณจะทำให้คุณสามารถติดตาม (และติดตามโดย) เซิร์ฟเวอร์ Mastodon แห่งไหนก็ได้ที่ทำงานอยู่ โดยไม่มีใครสามารถควบคุมได้นอกจากคุณ
       feature_audience_title: สร้างผู้ชมของคุณด้วยความมั่นใจ
+      feature_control_title: การควบคุมเส้นเวลาของคุณเอง
+      feature_creativity_title: ความคิดสร้างสรรค์ที่ไม่มีใครเทียบได้
+      feature_moderation_title: การกลั่นกรองในแบบที่ควรจะเป็น
       follow_action: ติดตาม
       follow_step: การติดตามผู้คนที่น่าสนใจคือสิ่งที่ Mastodon ให้ความสำคัญ
       follow_title: ปรับแต่งฟีดหน้าแรกของคุณ

From 40bfe6a99cd05725b953b19b6c41880a0b66b21f Mon Sep 17 00:00:00 2001
From: Jeremy Kescher <jeremy@kescher.at>
Date: Tue, 14 May 2024 18:56:46 +0200
Subject: [PATCH 1007/2191] Bump version to v4.3.0-alpha.3+glitch+cat+1.2.1

---
 CHANGELOG.md            | 4 ++++
 lib/mastodon/version.rb | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a12a730a46bc94..0c8416164844d3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All changes to Catstodon that aren't Mastodon or glitch-soc Mastodon changes will be documented here.
 
+## [v4.3.0-alpha.3+glitch+cat+1.2.1] - 2024-05-14
+
+- Glitch-soc changes :3
+
 ## [v4.3.0-alpha.3+glitch+cat+1.2.0] - 2024-05-11
 
 - Glitch-soc changes since and including 62bc36416f2d2defc77a501226afd0679b6ca252
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index e0edef176f500b..8b4c0872b2222d 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -25,7 +25,7 @@ def prerelease
     end
 
     def catstodon_revision
-      '1.2.0'
+      '1.2.1'
     end
 
     def build_metadata

From b5b84fad65f927a1bf55538be4a4763199724a6e Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 14 May 2024 19:54:28 +0200
Subject: [PATCH 1008/2191] Fix OpenSearch compatibility issue (#30278)

---
 .github/workflows/test-ruby.yml        | 20 ++++++++++++++++++--
 config/application.rb                  |  1 +
 lib/elasticsearch/client_extensions.rb | 11 +++++++++++
 3 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 lib/elasticsearch/client_extensions.rb

diff --git a/.github/workflows/test-ruby.yml b/.github/workflows/test-ruby.yml
index 45dc8a0deb816e..2bfa59e6b12177 100644
--- a/.github/workflows/test-ruby.yml
+++ b/.github/workflows/test-ruby.yml
@@ -264,8 +264,8 @@ jobs:
         ports:
           - 6379:6379
 
-      search:
-        image: ${{ matrix.search-image }}
+      elasticsearch:
+        image: ${{ contains(matrix.search-image, 'elasticsearch') && matrix.search-image || '' }}
         env:
           discovery.type: single-node
           xpack.security.enabled: false
@@ -277,6 +277,20 @@ jobs:
         ports:
           - 9200:9200
 
+      opensearch:
+        image: ${{ contains(matrix.search-image, 'opensearch') && matrix.search-image || '' }}
+        env:
+          discovery.type: single-node
+          DISABLE_INSTALL_DEMO_CONFIG: true
+          DISABLE_SECURITY_PLUGIN: true
+        options: >-
+          --health-cmd "curl http://localhost:9200/_cluster/health"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 10
+        ports:
+          - 9200:9200
+
     env:
       DB_HOST: localhost
       DB_USER: postgres
@@ -300,6 +314,8 @@ jobs:
         include:
           - ruby-version: '.ruby-version'
             search-image: docker.elastic.co/elasticsearch/elasticsearch:8.10.2
+          - ruby-version: '.ruby-version'
+            search-image: opensearchproject/opensearch:2
 
     steps:
       - uses: actions/checkout@v4
diff --git a/config/application.rb b/config/application.rb
index 402c7f0614de22..07b50ca036ba99 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -40,6 +40,7 @@
 require_relative '../lib/public_file_server_middleware'
 require_relative '../lib/devise/strategies/two_factor_ldap_authenticatable'
 require_relative '../lib/devise/strategies/two_factor_pam_authenticatable'
+require_relative '../lib/elasticsearch/client_extensions'
 require_relative '../lib/chewy/settings_extensions'
 require_relative '../lib/chewy/index_extensions'
 require_relative '../lib/chewy/strategy/mastodon'
diff --git a/lib/elasticsearch/client_extensions.rb b/lib/elasticsearch/client_extensions.rb
new file mode 100644
index 00000000000000..700bfa4a1c6bca
--- /dev/null
+++ b/lib/elasticsearch/client_extensions.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Elasticsearch
+  module ClientExtensions
+    def verify_elasticsearch
+      @verified = true
+    end
+  end
+end
+
+Elasticsearch::Client.prepend(Elasticsearch::ClientExtensions)

From 1bf661cddbc614d4076e9d9e855575fc29e976c0 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Tue, 14 May 2024 20:15:42 +0200
Subject: [PATCH 1009/2191] Fix missing prop warning for `<Account>` (#30291)

---
 app/javascript/mastodon/components/account.jsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/javascript/mastodon/components/account.jsx b/app/javascript/mastodon/components/account.jsx
index 3282696d341b17..18a31cba244867 100644
--- a/app/javascript/mastodon/components/account.jsx
+++ b/app/javascript/mastodon/components/account.jsx
@@ -172,7 +172,6 @@ Account.propTypes = {
   onBlock: PropTypes.func,
   onMute: PropTypes.func,
   onMuteNotifications: PropTypes.func,
-  intl: PropTypes.object.isRequired,
   hidden: PropTypes.bool,
   minimal: PropTypes.bool,
   defaultAction: PropTypes.string,

From 160823716ab0fe57c629f470d7218218a78a37d4 Mon Sep 17 00:00:00 2001
From: David Lapshin <ddaudix@gmail.com>
Date: Mon, 13 May 2024 12:19:42 +0300
Subject: [PATCH 1010/2191] [Glitch] Add active animation to header settings
 button

Port cb93c1edf08865b1ac528a9a4cb747dab3d57e8d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/styles/components.scss | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index f5518907ce18cd..6e06898d84fe30 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -4602,12 +4602,20 @@ a.status-card {
     outline: $ui-button-focus-outline;
   }
 
+  .no-reduce-motion .icon {
+    transition: transform 0.15s ease-in-out;
+  }
+
   &.active {
     color: $primary-text-color;
 
     &:hover {
       color: $primary-text-color;
     }
+
+    .icon {
+      transform: rotate(60deg);
+    }
   }
 
   &:disabled {

From 47ce5f4ca9cec9f77e05c7b341275689674175ae Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Tue, 14 May 2024 20:15:42 +0200
Subject: [PATCH 1011/2191] [Glitch] Fix missing prop warning for `<Account>`

Port 1bf661cddbc614d4076e9d9e855575fc29e976c0 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/components/account.jsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/javascript/flavours/glitch/components/account.jsx b/app/javascript/flavours/glitch/components/account.jsx
index 326d4fcb696c58..038009cfa86e5a 100644
--- a/app/javascript/flavours/glitch/components/account.jsx
+++ b/app/javascript/flavours/glitch/components/account.jsx
@@ -174,7 +174,6 @@ Account.propTypes = {
   onBlock: PropTypes.func,
   onMute: PropTypes.func,
   onMuteNotifications: PropTypes.func,
-  intl: PropTypes.object.isRequired,
   hidden: PropTypes.bool,
   minimal: PropTypes.bool,
   defaultAction: PropTypes.string,

From 38a330f96328091fe39dd212ec053d5df3e2e36e Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 15 May 2024 10:25:34 +0200
Subject: [PATCH 1012/2191] fix(deps): update dependency core-js to v3.37.1
 (#30293)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index f6dc8f161a813b..90a7791e26a314 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6381,9 +6381,9 @@ __metadata:
   linkType: hard
 
 "core-js@npm:^3.30.2":
-  version: 3.37.0
-  resolution: "core-js@npm:3.37.0"
-  checksum: 10c0/7e00331f346318ca3f595c08ce9e74ddae744715aef137486c1399163afd79792fb94c3161280863adfdc3e30f8026912d56bd3036f93cacfc689d33e185f2ee
+  version: 3.37.1
+  resolution: "core-js@npm:3.37.1"
+  checksum: 10c0/440eb51a7a39128a320225fe349f870a3641b96c9ecd26470227db730ef8c161ea298eaea621db66ec0ff622a85299efb4e23afebf889c0a1748616102307675
   languageName: node
   linkType: hard
 

From 508e93eb649fb490ea98904e2f64b372ec2ff610 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 15 May 2024 10:25:50 +0200
Subject: [PATCH 1013/2191] chore(deps): update dependency fog-openstack to
 v1.1.1 (#30295)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index efc99eb23d0c47..37910be8d3810f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -272,7 +272,7 @@ GEM
     fog-json (1.2.0)
       fog-core
       multi_json (~> 1.10)
-    fog-openstack (1.1.0)
+    fog-openstack (1.1.1)
       fog-core (~> 2.1)
       fog-json (>= 1.0)
     formatador (1.1.0)
@@ -422,7 +422,7 @@ GEM
     memory_profiler (1.0.1)
     mime-types (3.5.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2024.0305)
+    mime-types-data (3.2024.0507)
     mini_mime (1.1.5)
     mini_portile2 (2.8.6)
     minitest (5.22.3)

From 44e855db7830ab803820a9534f543702b9e9dca9 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 15 May 2024 08:26:22 +0000
Subject: [PATCH 1014/2191] chore(deps): update dependency nokogiri to v1.16.5
 [security] (#30289)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 37910be8d3810f..95ab6f08f53015 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -445,7 +445,7 @@ GEM
     net-smtp (0.5.0)
       net-protocol
     nio4r (2.7.1)
-    nokogiri (1.16.4)
+    nokogiri (1.16.5)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     nsa (0.3.0)

From 40639510f88442f9e21f9400931038cce7a0518c Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Wed, 15 May 2024 10:27:34 +0200
Subject: [PATCH 1015/2191] Retain unconfirmed users longer (1 week) (#30285)

---
 app/workers/scheduler/user_cleanup_scheduler.rb       | 7 +++++--
 spec/workers/scheduler/user_cleanup_scheduler_spec.rb | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/workers/scheduler/user_cleanup_scheduler.rb b/app/workers/scheduler/user_cleanup_scheduler.rb
index 2d2efc731a3908..63ea876e5078dc 100644
--- a/app/workers/scheduler/user_cleanup_scheduler.rb
+++ b/app/workers/scheduler/user_cleanup_scheduler.rb
@@ -3,6 +3,9 @@
 class Scheduler::UserCleanupScheduler
   include Sidekiq::Worker
 
+  UNCONFIRMED_ACCOUNTS_MAX_AGE_DAYS = 7
+  DISCARDED_STATUSES_MAX_AGE_DAYS = 30
+
   sidekiq_options retry: 0, lock: :until_executed, lock_ttl: 1.day.to_i
 
   def perform
@@ -13,7 +16,7 @@ def perform
   private
 
   def clean_unconfirmed_accounts!
-    User.where('confirmed_at is NULL AND confirmation_sent_at <= ?', 2.days.ago).reorder(nil).find_in_batches do |batch|
+    User.where('confirmed_at is NULL AND confirmation_sent_at <= ?', UNCONFIRMED_ACCOUNTS_MAX_AGE_DAYS.days.ago).reorder(nil).find_in_batches do |batch|
       # We have to do it separately because of missing database constraints
       AccountModerationNote.where(target_account_id: batch.map(&:account_id)).delete_all
       Account.where(id: batch.map(&:account_id)).delete_all
@@ -22,7 +25,7 @@ def clean_unconfirmed_accounts!
   end
 
   def clean_discarded_statuses!
-    Status.unscoped.discarded.where('deleted_at <= ?', 30.days.ago).find_in_batches do |statuses|
+    Status.unscoped.discarded.where('deleted_at <= ?', DISCARDED_STATUSES_MAX_AGE_DAYS.days.ago).find_in_batches do |statuses|
       RemovalWorker.push_bulk(statuses) do |status|
         [status.id, { 'immediate' => true, 'skip_streaming' => true }]
       end
diff --git a/spec/workers/scheduler/user_cleanup_scheduler_spec.rb b/spec/workers/scheduler/user_cleanup_scheduler_spec.rb
index 8fda246ba81b8c..c3940901d4e2c8 100644
--- a/spec/workers/scheduler/user_cleanup_scheduler_spec.rb
+++ b/spec/workers/scheduler/user_cleanup_scheduler_spec.rb
@@ -14,7 +14,7 @@
     before do
       # Need to update the already-existing users because their initialization overrides confirmation_sent_at
       new_unconfirmed_user.update!(confirmed_at: nil, confirmation_sent_at: Time.now.utc)
-      old_unconfirmed_user.update!(confirmed_at: nil, confirmation_sent_at: 1.week.ago)
+      old_unconfirmed_user.update!(confirmed_at: nil, confirmation_sent_at: 10.days.ago)
       confirmed_user.update!(confirmed_at: 1.day.ago)
     end
 

From 7f7eba875376a44e01d4446902888e6afdd88908 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 15 May 2024 10:34:50 +0200
Subject: [PATCH 1016/2191] chore(deps): update dependency letter_opener_web to
 v3 (#30296)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile      |  2 +-
 Gemfile.lock | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Gemfile b/Gemfile
index 247865aacfd5f5..b9baef7036cddc 100644
--- a/Gemfile
+++ b/Gemfile
@@ -178,7 +178,7 @@ group :development do
 
   # Preview mail in the browser
   gem 'letter_opener', '~> 1.8'
-  gem 'letter_opener_web', '~> 2.0'
+  gem 'letter_opener_web', '~> 3.0'
 
   # Security analysis CLI tools
   gem 'brakeman', '~> 6.0', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 95ab6f08f53015..2854528b737c44 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -389,10 +389,10 @@ GEM
       addressable (~> 2.8)
     letter_opener (1.10.0)
       launchy (>= 2.2, < 4)
-    letter_opener_web (2.0.0)
-      actionmailer (>= 5.2)
-      letter_opener (~> 1.7)
-      railties (>= 5.2)
+    letter_opener_web (3.0.0)
+      actionmailer (>= 6.1)
+      letter_opener (~> 1.9)
+      railties (>= 6.1)
       rexml
     link_header (0.0.8)
     llhttp-ffi (0.5.0)
@@ -434,7 +434,7 @@ GEM
       uri
     net-http-persistent (4.0.2)
       connection_pool (~> 2.2)
-    net-imap (0.4.10)
+    net-imap (0.4.11)
       date
       net-protocol
     net-ldap (0.19.0)
@@ -686,7 +686,7 @@ GEM
     redlock (1.3.2)
       redis (>= 3.0.0, < 6.0)
     regexp_parser (2.9.0)
-    reline (0.5.6)
+    reline (0.5.7)
       io-console (~> 0.5)
     request_store (1.6.0)
       rack (>= 1.4)
@@ -893,7 +893,7 @@ GEM
     xorcist (1.1.3)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.13)
+    zeitwerk (2.6.14)
 
 PLATFORMS
   ruby
@@ -955,7 +955,7 @@ DEPENDENCIES
   kaminari (~> 1.2)
   kt-paperclip (~> 7.2)
   letter_opener (~> 1.8)
-  letter_opener_web (~> 2.0)
+  letter_opener_web (~> 3.0)
   link_header (~> 0.0)
   lograge (~> 0.12)
   mail (~> 2.8)

From 78a8263f73ed8b07a1528e716f28858e0d817603 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 15 May 2024 10:34:58 +0200
Subject: [PATCH 1017/2191] fix(deps): update dependency postcss-preset-env to
 v9.5.13 (#30286)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 62 +++++++++++++++++++++++++++----------------------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 90a7791e26a314..3741a541958f4b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1617,15 +1617,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-cascade-layers@npm:^4.0.5":
-  version: 4.0.5
-  resolution: "@csstools/postcss-cascade-layers@npm:4.0.5"
+"@csstools/postcss-cascade-layers@npm:^4.0.6":
+  version: 4.0.6
+  resolution: "@csstools/postcss-cascade-layers@npm:4.0.6"
   dependencies:
-    "@csstools/selector-specificity": "npm:^3.1.0"
+    "@csstools/selector-specificity": "npm:^3.1.1"
     postcss-selector-parser: "npm:^6.0.13"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/2b6dd33b51df349dd89b12ebe3240d65accb0ba03e40288a72e26cf2307a7bdd742c42d9ff7a3f886cab19b2f8813978075f6ee61a985b0b7ceac7e2cbb29e04
+  checksum: 10c0/134019e9b3f71de39034658e2a284f549883745a309f774d8d272871f9e65680e0981c893766537a8a56ed7f41dba2d0f9fc3cb4fa4057c227bc193976a2ec79
   languageName: node
   linkType: hard
 
@@ -1749,15 +1749,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-is-pseudo-class@npm:^4.0.7":
-  version: 4.0.7
-  resolution: "@csstools/postcss-is-pseudo-class@npm:4.0.7"
+"@csstools/postcss-is-pseudo-class@npm:^4.0.8":
+  version: 4.0.8
+  resolution: "@csstools/postcss-is-pseudo-class@npm:4.0.8"
   dependencies:
-    "@csstools/selector-specificity": "npm:^3.1.0"
+    "@csstools/selector-specificity": "npm:^3.1.1"
     postcss-selector-parser: "npm:^6.0.13"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/43668987df4608f822dbc323d3ac567fa7c192235b55933fd5d1855977ead80184512eb64a3f45a020fdd93711952ba8e9f9a280f4e981625b68a9ff074f9a01
+  checksum: 10c0/82f191571c3e0973354a54ef15feeb17f9408b4abbefad19fc0f087683b1212fc854cdf09a47324267dd47be4c5cb47d63b8d083695a67c3f8f3e53df3d561f6
   languageName: node
   linkType: hard
 
@@ -1983,12 +1983,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/selector-specificity@npm:^3.0.3, @csstools/selector-specificity@npm:^3.1.0":
-  version: 3.1.0
-  resolution: "@csstools/selector-specificity@npm:3.1.0"
+"@csstools/selector-specificity@npm:^3.0.3, @csstools/selector-specificity@npm:^3.1.1":
+  version: 3.1.1
+  resolution: "@csstools/selector-specificity@npm:3.1.1"
   peerDependencies:
     postcss-selector-parser: ^6.0.13
-  checksum: 10c0/7f77f8377b637dcca7f7a9d6ace3329cf60f02cbd75f14241de30b1f5d00c961ec167572bc93517cdb2f106405a91119f026389a0f96dabae8dd67d1c7710e60
+  checksum: 10c0/1d4a3f8015904d6aeb3203afe0e1f6db09b191d9c1557520e3e960c9204ad852df9db4cbde848643f78a26f6ea09101b4e528dbb9193052db28258dbcc8a6e1d
   languageName: node
   linkType: hard
 
@@ -6577,16 +6577,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"css-has-pseudo@npm:^6.0.4":
-  version: 6.0.4
-  resolution: "css-has-pseudo@npm:6.0.4"
+"css-has-pseudo@npm:^6.0.5":
+  version: 6.0.5
+  resolution: "css-has-pseudo@npm:6.0.5"
   dependencies:
-    "@csstools/selector-specificity": "npm:^3.1.0"
+    "@csstools/selector-specificity": "npm:^3.1.1"
     postcss-selector-parser: "npm:^6.0.13"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/e9d440de483e15092ebaadb483502243f43e0457d4214c8012ebdba7a959e74d40714254bf97247780e65735512f248a55feda0b3975d9a5eaea9c746f7518f0
+  checksum: 10c0/946930b7e699d6dbcb8426ebcd593228ee0e2143a148fb2399111ea4c9ed8d6eb3447e944251f1be44ae987d5ab16e450b0b006ca197f318c2a3760ba431fbb9
   languageName: node
   linkType: hard
 
@@ -13548,16 +13548,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-nesting@npm:^12.1.3":
-  version: 12.1.3
-  resolution: "postcss-nesting@npm:12.1.3"
+"postcss-nesting@npm:^12.1.4":
+  version: 12.1.4
+  resolution: "postcss-nesting@npm:12.1.4"
   dependencies:
     "@csstools/selector-resolve-nested": "npm:^1.1.0"
-    "@csstools/selector-specificity": "npm:^3.1.0"
+    "@csstools/selector-specificity": "npm:^3.1.1"
     postcss-selector-parser: "npm:^6.0.13"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/6b2d3a4823e85592965c6c11f749c5357703256e7334388147d6a3bb72a3abbe47789afaa8535bdd7a9bd6d0099eb12ffec6c154050d8e8b8286b1adbed5b397
+  checksum: 10c0/b3408de4c04b58a88a56fa81aeff59b12615c78d4f5a57e09c1ee47e74cff51f8c9cad1684da0059067303cf65b4b688f85f0c5ca8d54af8c4ab998f727ab9fd
   languageName: node
   linkType: hard
 
@@ -13712,10 +13712,10 @@ __metadata:
   linkType: hard
 
 "postcss-preset-env@npm:^9.5.2":
-  version: 9.5.12
-  resolution: "postcss-preset-env@npm:9.5.12"
+  version: 9.5.13
+  resolution: "postcss-preset-env@npm:9.5.13"
   dependencies:
-    "@csstools/postcss-cascade-layers": "npm:^4.0.5"
+    "@csstools/postcss-cascade-layers": "npm:^4.0.6"
     "@csstools/postcss-color-function": "npm:^3.0.16"
     "@csstools/postcss-color-mix-function": "npm:^2.0.16"
     "@csstools/postcss-exponential-functions": "npm:^1.0.7"
@@ -13725,7 +13725,7 @@ __metadata:
     "@csstools/postcss-hwb-function": "npm:^3.0.15"
     "@csstools/postcss-ic-unit": "npm:^3.0.6"
     "@csstools/postcss-initial": "npm:^1.0.1"
-    "@csstools/postcss-is-pseudo-class": "npm:^4.0.7"
+    "@csstools/postcss-is-pseudo-class": "npm:^4.0.8"
     "@csstools/postcss-light-dark-function": "npm:^1.0.5"
     "@csstools/postcss-logical-float-and-clear": "npm:^2.0.1"
     "@csstools/postcss-logical-overflow": "npm:^1.0.1"
@@ -13747,7 +13747,7 @@ __metadata:
     autoprefixer: "npm:^10.4.19"
     browserslist: "npm:^4.22.3"
     css-blank-pseudo: "npm:^6.0.2"
-    css-has-pseudo: "npm:^6.0.4"
+    css-has-pseudo: "npm:^6.0.5"
     css-prefers-color-scheme: "npm:^9.0.1"
     cssdb: "npm:^8.0.0"
     postcss-attribute-case-insensitive: "npm:^6.0.3"
@@ -13767,7 +13767,7 @@ __metadata:
     postcss-image-set-function: "npm:^6.0.3"
     postcss-lab-function: "npm:^6.0.16"
     postcss-logical: "npm:^7.0.1"
-    postcss-nesting: "npm:^12.1.3"
+    postcss-nesting: "npm:^12.1.4"
     postcss-opacity-percentage: "npm:^2.0.0"
     postcss-overflow-shorthand: "npm:^5.0.1"
     postcss-page-break: "npm:^3.0.4"
@@ -13777,7 +13777,7 @@ __metadata:
     postcss-selector-not: "npm:^7.0.2"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/3e0276b2061baa396547f9c0090fcb0c6149d3735c7aefa99a8e520701aae0b7265578b59d5e4efa9f5e61659c161e39590a5d63bac49469b99da1c549b63231
+  checksum: 10c0/5bbb6e87b1b3acc816ef445836f85df5f50ac96bdc3d571952a83794c80863c652d27ab14c66f6b88f86f5664119d49b357e4184162022cc3436676f3fbe833b
   languageName: node
   linkType: hard
 

From aad5e841b59691f001132a9cf96487db8389c77e Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 15 May 2024 10:53:57 +0200
Subject: [PATCH 1018/2191] New Crowdin Translations (automated) (#30290)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/cy.json    |   1 +
 app/javascript/mastodon/locales/en-GB.json |  13 ++
 app/javascript/mastodon/locales/gl.json    |   1 +
 app/javascript/mastodon/locales/sk.json    |   4 +
 config/locales/devise.ia.yml               |   4 +
 config/locales/doorkeeper.en-GB.yml        |   1 +
 config/locales/doorkeeper.ia.yml           |  21 +++
 config/locales/en-GB.yml                   |   1 +
 config/locales/ia.yml                      | 141 +++++++++++++++++++++
 config/locales/simple_form.cy.yml          |   2 +
 config/locales/simple_form.en-GB.yml       |   6 +
 11 files changed, 195 insertions(+)

diff --git a/app/javascript/mastodon/locales/cy.json b/app/javascript/mastodon/locales/cy.json
index 925b7710e008d2..2c597699591674 100644
--- a/app/javascript/mastodon/locales/cy.json
+++ b/app/javascript/mastodon/locales/cy.json
@@ -474,6 +474,7 @@
   "notification.follow_request": "Mae {name} wedi gwneud cais i'ch dilyn",
   "notification.mention": "Crybwyllodd {name} amdanoch chi",
   "notification.moderation-warning.learn_more": "Dysgu mwy",
+  "notification.moderation_warning": "Rydych wedi derbyn rhybudd gan gymedrolwr",
   "notification.moderation_warning.action_delete_statuses": "Mae rhai o'ch postiadau wedi'u dileu.",
   "notification.moderation_warning.action_disable": "Mae eich cyfrif wedi'i analluogi.",
   "notification.moderation_warning.action_mark_statuses_as_sensitive": "Mae rhai o'ch postiadau wedi'u marcio'n sensitif.",
diff --git a/app/javascript/mastodon/locales/en-GB.json b/app/javascript/mastodon/locales/en-GB.json
index 6c24d5a2615c7e..e70348e0b2beff 100644
--- a/app/javascript/mastodon/locales/en-GB.json
+++ b/app/javascript/mastodon/locales/en-GB.json
@@ -308,6 +308,8 @@
   "follow_requests.unlocked_explanation": "Even though your account is not locked, the {domain} staff thought you might want to review follow requests from these accounts manually.",
   "follow_suggestions.curated_suggestion": "Staff pick",
   "follow_suggestions.dismiss": "Don't show again",
+  "follow_suggestions.featured_longer": "Hand-picked by the {domain} team",
+  "follow_suggestions.friends_of_friends_longer": "Popular among people you follow",
   "follow_suggestions.hints.featured": "This profile has been hand-picked by the {domain} team.",
   "follow_suggestions.hints.friends_of_friends": "This profile is popular among the people you follow.",
   "follow_suggestions.hints.most_followed": "This profile is one of the most followed on {domain}.",
@@ -315,6 +317,8 @@
   "follow_suggestions.hints.similar_to_recently_followed": "This profile is similar to the profiles you have most recently followed.",
   "follow_suggestions.personalized_suggestion": "Personalised suggestion",
   "follow_suggestions.popular_suggestion": "Popular suggestion",
+  "follow_suggestions.popular_suggestion_longer": "Popular on {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Similar to profiles you recently followed",
   "follow_suggestions.view_all": "View all",
   "follow_suggestions.who_to_follow": "Who to follow",
   "followed_tags": "Followed hashtags",
@@ -469,6 +473,15 @@
   "notification.follow": "{name} followed you",
   "notification.follow_request": "{name} has requested to follow you",
   "notification.mention": "{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.",
+  "notification.moderation_warning.action_disable": "Your account has been disabled.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Some of your posts have been marked as sensitive.",
+  "notification.moderation_warning.action_none": "Your account has received a moderation warning.",
+  "notification.moderation_warning.action_sensitive": "Your posts will be marked as sensitive from now on.",
+  "notification.moderation_warning.action_silence": "Your account has been limited.",
+  "notification.moderation_warning.action_suspend": "Your account has been suspended.",
   "notification.own_poll": "Your poll has ended",
   "notification.poll": "A poll you have voted in has ended",
   "notification.reblog": "{name} boosted your status",
diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json
index b2a50ebb811976..88d4f5f60e059a 100644
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@@ -474,6 +474,7 @@
   "notification.follow_request": "{name} solicitou seguirte",
   "notification.mention": "{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.",
   "notification.moderation_warning.action_disable": "A túa conta foi desactivada.",
   "notification.moderation_warning.action_mark_statuses_as_sensitive": "Algunha das túas publicacións foron marcadas como sensibles.",
diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json
index 2863442415cf1d..0c76467419f292 100644
--- a/app/javascript/mastodon/locales/sk.json
+++ b/app/javascript/mastodon/locales/sk.json
@@ -295,6 +295,7 @@
   "follow_suggestions.personalized_suggestion": "Prispôsobený návrh",
   "follow_suggestions.popular_suggestion": "Obľúbený návrh",
   "follow_suggestions.popular_suggestion_longer": "Populárne na {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Podobné profilom ktoré si nedávno nasledoval/a",
   "follow_suggestions.view_all": "Zobraziť všetky",
   "follow_suggestions.who_to_follow": "Koho sledovať",
   "followed_tags": "Sledované hashtagy",
@@ -445,10 +446,13 @@
   "notification.follow_request": "{name} vás žiada sledovať",
   "notification.mention": "{name} vás spomína",
   "notification.moderation-warning.learn_more": "Zisti viac",
+  "notification.moderation_warning.action_silence": "Tvoj účet bol obmedzený.",
+  "notification.moderation_warning.action_suspend": "Tvoj účet bol pozastavený.",
   "notification.own_poll": "Vaša anketa sa skončila",
   "notification.poll": "Anketa, v ktorej ste hlasovali, sa skončila",
   "notification.reblog": "{name} zdieľa váš príspevok",
   "notification.relationships_severance_event": "Stratené prepojenia s {name}",
+  "notification.relationships_severance_event.account_suspension": "Správca z {from} pozastavil/a {target}, čo znamená, že od nich viac nemôžeš dostávať aktualizácie, alebo s nimi interaktovať.",
   "notification.relationships_severance_event.learn_more": "Zisti viac",
   "notification.status": "{name} uverejňuje niečo nové",
   "notification.update": "{name} upravuje príspevok",
diff --git a/config/locales/devise.ia.yml b/config/locales/devise.ia.yml
index d83c708647718a..c68efddd07880f 100644
--- a/config/locales/devise.ia.yml
+++ b/config/locales/devise.ia.yml
@@ -86,9 +86,13 @@ ia:
       destroyed: A revider! Tu conto esseva cancellate con successo. Nos spera vider te novemente tosto.
       signed_up_but_pending: Un message con un ligamine de confirmation esseva inviate a tu conto de email. Post que tu clicca le ligamine, nos revidera tu application. Tu essera notificate si illo es approbate.
       updated: Tu conto ha essite actualisate con successo.
+    sessions:
+      signed_in: Connexe con successo.
+      signed_out: Disconnexe con successo.
     unlocks:
       unlocked: Tu conto ha essite disblocate con successo. Initia session a continuar.
   errors:
     messages:
       already_confirmed: jam esseva confirmate, tenta initiar session
       not_found: non trovate
+      not_locked: non era blocate
diff --git a/config/locales/doorkeeper.en-GB.yml b/config/locales/doorkeeper.en-GB.yml
index b3ceffb13f7544..2e537c5301937e 100644
--- a/config/locales/doorkeeper.en-GB.yml
+++ b/config/locales/doorkeeper.en-GB.yml
@@ -174,6 +174,7 @@ en-GB:
       read:filters: see your filters
       read:follows: see your follows
       read:lists: see your lists
+      read:me: read only your account's basic information
       read:mutes: see your mutes
       read:notifications: see your notifications
       read:reports: see your reports
diff --git a/config/locales/doorkeeper.ia.yml b/config/locales/doorkeeper.ia.yml
index b5bd6cc5369fbb..dc965996810817 100644
--- a/config/locales/doorkeeper.ia.yml
+++ b/config/locales/doorkeeper.ia.yml
@@ -4,6 +4,7 @@ ia:
     attributes:
       doorkeeper/application:
         name: Nomine de application
+        scopes: Ambitos
         website: Sito web de application
     errors:
       models:
@@ -28,12 +29,14 @@ ia:
         empty: Tu non ha applicationes.
         name: Nomine
         new: Nove application
+        scopes: Ambitos
         show: Monstrar
         title: Tu applicationes
       new:
         title: Nove application
       show:
         actions: Actiones
+        application_id: Clave del cliente
         scopes: Ambitos
         title: 'Application: %{name}'
     authorizations:
@@ -42,13 +45,20 @@ ia:
         deny: Negar
       error:
         title: Ocurreva un error
+      new:
+        review_permissions: Revisionar le permissos
+        title: Autorisation necessari
     authorized_applications:
+      buttons:
+        revoke: Revocar
       confirmations:
         revoke: Es tu secur?
       index:
+        authorized_at: Autorisate le %{date}
         last_used_at: Ultime uso in %{date}
         never_used: Nunquam usate
         scopes: Permissiones
+        superapp: Interne
         title: Tu applicationes autorisate
     flash:
       applications:
@@ -58,12 +68,21 @@ ia:
           notice: Application delite.
         update:
           notice: Application actualisate.
+      authorized_applications:
+        destroy:
+          notice: Application revocate.
     grouped_scopes:
+      access:
+        read: Accesso de sol lectura
+        read/write: Accesso de lectura e scriptura
+        write: Accesso de sol scriptura
       title:
         accounts: Contos
         admin/accounts: Gestion de contos
+        admin/all: Tote le functiones administrative
         admin/reports: Gestion de reportos
         all: Accesso plen a tu conto de Mastodon
+        blocks: Blocadas
         bookmarks: Marcapaginas
         conversations: Conversationes
         favourites: Favoritos
@@ -84,7 +103,9 @@ ia:
           oauth2_provider: Fornitor OAuth2
     scopes:
       admin:read: leger tote le datos in le servitor
+      admin:read:accounts: leger information sensibile de tote le contos
       admin:write: modificar tote le datos in le servitor
+      follow: modificar relationes del contos
       read: leger tote le datos de tu conto
       read:accounts: vider informationes de conto
       read:bookmarks: vider tu marcapaginas
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index df956902a6e904..7e31080dfa2c10 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -751,6 +751,7 @@ en-GB:
         desc_html: This relies on external scripts from hCaptcha, which may be a security and privacy concern. In addition, <strong>this can make the registration process significantly less accessible to some (especially disabled) people</strong>. For these reasons, please consider alternative measures such as approval-based or invite-based registration.
         title: Require new users to solve a CAPTCHA to confirm their account
       content_retention:
+        danger_zone: Danger zone
         preamble: Control how user-generated content is stored in Mastodon.
         title: Content retention
       default_noindex:
diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index 46cdcd3c68348f..68676a09f73957 100644
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -997,6 +997,7 @@ ia:
       body_remote: Alcuno de %{domain} ha reportate %{target}
       subject: Nove reporto pro %{instance} (#%{id})
     new_software_updates:
+      body: Nove versiones de Mastodon ha essite publicate, tu poterea voler actualisar!
       subject: Nove versiones de Mastodon es disponibile pro %{instance}!
     new_trends:
       body: 'Le sequente elementos besoniar de un recension ante que illos pote esser monstrate publicamente:'
@@ -1048,6 +1049,7 @@ ia:
       hint_html: Justo un altere cosa! Nos debe confirmar que tu es un human (isto es assi proque nos pote mantener foras le spam!). Solve le CAPTCHA infra e clicca "Continuar".
       title: Controlo de securitate
     confirmations:
+      awaiting_review: Tu adresse email es confirmate! Le personal de %{domain} ora revide tu registration. Tu recipera un email si illes approba tu conto!
       awaiting_review_title: Tu registration es revidite
       clicking_this_link: cliccante iste ligamine
       login_link: acceder
@@ -1066,6 +1068,7 @@ ia:
     logout: Clauder le session
     migrate_account: Move a un conto differente
     or_log_in_with: O accede con
+    privacy_policy_agreement_html: Io ha legite e acceptar le <a href="<a href="%{privacy_policy_path}" target="_blank">politica de confidentialitate</a>
     progress:
       confirm: Confirma le email
       details: Tu detalios
@@ -1075,29 +1078,69 @@ ia:
       cas: CAS
       saml: SAML
     register: Inscribe te
+    registration_closed: "%{instance} non accepta nove membros"
     resend_confirmation: Reinviar ligamine de confirmation
     reset_password: Remontar le contrasigno
     rules:
       accept: Acceptar
       back: Retro
+      invited_by: 'Tu pote junger te a %{domain} gratias al invitation que tu ha recipite de:'
+      preamble: Illos es predefinite e fortiarte per le moderatores de %{domain}.
+      preamble_invited: Ante que tu continua, considera le regulas base definite per le moderatores de %{domain}.
       title: Alcun regulas base.
+      title_invited: Tu ha essite invitate.
     security: Securitate
     set_new_password: Definir un nove contrasigno
+    setup:
+      email_below_hint_html: Verifica tu plica de spam, o pete un altero. Tu pote corriger tu adresse email si illo es errate.
+      email_settings_hint_html: Clicca le ligamine que nos te inviava pro verificar %{email}.
+      link_not_received: Non obteneva tu un ligamine?
+      new_confirmation_instructions_sent: Tu recipera un nove email con le ligamine de confirmation in alcun minutas!
+      title: Verifica tu cassa de ingresso
+    sign_in:
+      preamble_html: Accede con tu <strong>%{domain}</strong> credentiales. Si tu conto es hospite sur un differente servitor, tu non potera authenticar te ci.
+      title: Acceder a %{domain}
+    sign_up:
+      manual_review: Le inscriptiones sur %{domain} passa per revision manual de nostre moderatores. Pro adjutar nos a processar tu registration, scribe un poco re te mesme e perque tu vole un conto sur %{domain}.
+      preamble: Con un conto sur iste servitor de Mastodon, tu potera sequer ulle altere persona in rete, sin reguardo de ubi lor conto es hospite.
+      title: Lassa que nos te configura sur %{domain}.
     status:
       account_status: Stato del conto
+      confirming: Attendente esser completate email de confirmation.
+      functional: Tu conto es plenmente operative.
+      pending: Tu application es pendente de revision per nostre personal. Isto pote prender alcun tempore. Tu recipera un email si tu application es approbate.
+      redirecting_to: Tu conto es inactive perque illo es actualmente re-adressa a %{acct}.
+      self_destruct: Dum %{domain} va clauder, tu solo habera accesso limitate a tu conto.
       view_strikes: Examinar le admonitiones passate contra tu conto
+    too_fast: Formulario inviate troppo velocemente, retenta.
     use_security_key: Usar clave de securitate
   challenge:
     confirm: Continuar
+    hint_html: "<strong>Consilio:</strong> Nos non te demandara tu contrasigno ancora pro le proxime hora."
     invalid_password: Contrasigno non valide
     prompt: Confirma le contrasigno pro continuar
+  crypto:
+    errors:
+      invalid_key: non es un clave Ed25519 o Curve25519 valide
+      invalid_signature: non es un valide firma Ed25519
+  date:
+    formats:
+      default: "%b %d, %Y"
+      with_month_name: "%B %d, %Y"
   datetime:
     distance_in_words:
+      about_x_hours: "%{count}h"
+      about_x_months: "%{count}me"
+      about_x_years: "%{count}a"
+      almost_x_years: "%{count}a"
       half_a_minute: Justo ora
+      less_than_x_minutes: "%{count} m"
       less_than_x_seconds: Justo ora
       over_x_years: "%{count}a"
       x_days: "%{count}d"
       x_minutes: "%{count} m"
+      x_months: "%{count}me"
+      x_seconds: "%{count}s"
   deletes:
     challenge_not_passed: Le informationes que tu ha inserite non era correcte
     confirm_password: Insere tu contrasigno actual pro verificar tu identitate
@@ -1174,6 +1217,7 @@ ia:
       download: Discargar tu archivo
       hint_html: Tu pote requirer un archivo de tu <strong>messages e medios cargate</strong>. Le datos exportate sera in le formato ActivityPub, legibile per ulle software conforme.
       in_progress: Compilante tu archivo...
+      request: Pete tu archivo
       size: Dimension
     blocks: Tu ha blocate
     bookmarks: Marcapaginas
@@ -1184,6 +1228,8 @@ ia:
     storage: Immagazinage de medios
   featured_tags:
     add_new: Adder nove
+    errors:
+      limit: Tu ha jam consiliate le maxime numero de hashtags
   filters:
     contexts:
       account: Profilos
@@ -1196,17 +1242,33 @@ ia:
       keywords: Parolas clave
       statuses: Messages individual
       title: Modificar filtro
+    errors:
+      invalid_context: Nulle o non valide contexto supplite
     index:
+      contexts: Filtros in %{contexts}
       delete: Deler
+      empty: Tu non ha filtros.
+      expires_in: Expira in %{distance}
+      expires_on: Expira le %{date}
+      keywords:
+        one: "%{count} parola clave"
+        other: "%{count} parolas clave"
       statuses:
         one: "%{count} message"
         other: "%{count} messages"
+      statuses_long:
+        one: "%{count} singule message celate"
+        other: "%{count} singule messages celate"
       title: Filtros
     new:
       save: Salveguardar nove filtro
       title: Adder nove filtro
     statuses:
+      back_to_filter: Retro al filtro
+      batch:
+        remove: Remover ab filtro
       index:
+        hint: Iste filtro se applica pro seliger messages singule sin reguardo de altere criterios. Tu pote adder altere messages a iste filtro ab le interfacie web.
         title: Messages filtrate
   generic:
     all: Toto
@@ -1215,16 +1277,27 @@ ia:
     confirm: Confirmar
     copy: Copiar
     delete: Deler
+    deselect: Deseliger toto
     none: Nemo
     order_by: Ordinar per
     save_changes: Salvar le cambios
+    select_all_matching_items:
+      one: Selige %{count} elemento concordante tu recerca.
+      other: Selige %{count} elementos concordante tu recerca.
     today: hodie
+    validation_errors:
+      one: Alco non es multo bon ancora! Controla le error infra
+      other: Alco non es multo bon ancora! Controla %{count} errores infra
   imports:
     errors:
       empty: File CSV vacue
+      incompatible_type: Incompatibile con le typo de importation seligite
       invalid_csv_file: 'File CSV non valide. Error: %{error}'
+      over_rows_processing_limit: contine plus que %{count} rangos
       too_large: Le file es troppo longe
     failures: Fallimentos
+    imported: Importate
+    mismatched_types_warning: Il appare que tu pote haber seligite le typo errate pro iste importation, controla duo vices.
     modes:
       overwrite_long: Reimplaciar registros actual con le noves
     overwrite_preambles:
@@ -1278,6 +1351,8 @@ ia:
     max_uses:
       one: un uso
       other: "%{count} usos"
+    table:
+      expires_at: Expira
     title: Invitar personas
   login_activities:
     authentication_methods:
@@ -1316,32 +1391,84 @@ ia:
       title: Nove requesta de sequimento
     mention:
       action: Responder
+      title: Nove mention
     poll:
       subject: Un inquesta de %{name} ha finite
   otp_authentication:
     enable: Activar
+    setup: Configurar
   pagination:
     next: Sequente
+    prev: Previe
+    truncate: "&hellip;"
+  polls:
+    errors:
+      already_voted: Tu jam ha votate in iste sondage
+      duplicate_options: contine elementos duplicate
+      duration_too_long: il es troppo lontan in le futuro
+      duration_too_short: il es troppo tosto
+      expired: Le sondage ha jam finite
+      invalid_choice: Le option de voto eligite non existe
+      over_character_limit: non pote esser plus longe que %{max} characteres cata un
+      self_vote: Tu non pote vota in tu proprie sondages
+      too_few_options: debe haber plus que un elemento
+      too_many_options: non pote continer plus que %{max} elementos
   preferences:
     other: Altere
+    posting_defaults: Publicationes predefinite
     public_timelines: Chronologias public
   privacy:
     privacy: Confidentialitate
+    reach: Portata
     search: Cercar
+    title: Confidentialitate e portata
   privacy_policy:
     title: Politica de confidentialitate
+  reactions:
+    errors:
+      limit_reached: Limite de reactiones differente attingite
+      unrecognized_emoji: non es un emoticone recognoscite
+  redirects:
+    prompt: Si tu te fide de iste ligamine, clicca lo pro continuar.
+    title: Tu va lassar %{instance}.
   relationships:
     activity: Activitate del conto
+    confirm_follow_selected_followers: Desira tu vermente remover le sequaces seligite?
+    confirm_remove_selected_followers: Desira tu vermente remover le sequaces seligite?
+    confirm_remove_selected_follows: Desira tu vermente remover le sequaces seligite?
+    dormant: Dormiente
+    follow_failure: Impossibile sequer alcun del contos seligite.
+    follow_selected_followers: Sequer le sequaces seligite
+    followers: Sequaces
+    following: Sequente
     invited: Invitate
+    last_active: Ultimo active
     most_recent: Plus recente
     moved: Movite
     mutual: Mutue
     primary: Primari
+    relationship: Relation
+    remove_selected_domains: Remover tote le sequaces ab le dominios seligite
+    remove_selected_followers: Remover le sequaces seligite
+    remove_selected_follows: Non plus sequer le usatores seligite
     status: Stato del conto
+  remote_follow:
+    missing_resource: Impossibile trovar le requirite re-adresse URL pro tu conto
+  reports:
+    errors:
+      invalid_rules: non referentia regulas valide
   rss:
     content_warning: 'Advertimento de contento:'
     descriptions:
       account: Messages public de @%{acct}
+      tag: 'Messages public plachettate #%{hashtag}'
+  scheduled_statuses:
+    over_daily_limit: Tu ha excedite le limite de %{limit} messages programmate pro hodie
+    over_total_limit: Tu ha excedite le limite de %{limit} messages programmate
+    too_soon: Le data programmate debe esser in le futuro
+  self_destruct:
+    lead_html: Infortunatemente, <strong>%{domain}</strong> va clauder permanentemente. Si tu habeva un conto illac, tu non potera continuar a usar lo, ma tu pote ancora peter un salveguarda de tu datos.
+    title: Iste servitor va clauder
   sessions:
     activity: Ultime activitate
     browser: Navigator
@@ -1368,6 +1495,7 @@ ia:
     current_session: Session actual
     date: Data
     description: "%{browser} sur %{platform}"
+    explanation: Il ha navigatores del web actualmente connexe a tu conto Mastodon.
     ip: IP
     platforms:
       adobe_air: Adobe Air
@@ -1383,11 +1511,16 @@ ia:
       windows: Windows
       windows_mobile: Windows Mobile
       windows_phone: Windows Phone
+    revoke: Revocar
+    revoke_success: Session revocate con successo
     title: Sessiones
+    view_authentication_history: Vider chronologia de authentication de tu conto
   settings:
     account: Conto
     account_settings: Parametros de conto
+    aliases: Aliases de conto
     appearance: Apparentia
+    authorized_apps: Apps autorisate
     delete: Deletion de conto
     development: Disveloppamento
     edit_profile: Modificar profilo
@@ -1417,6 +1550,13 @@ ia:
       private_long: Solmente monstrar a sequitores
       public: Public
   statuses_cleanup:
+    keep_pinned_hint: Non dele alcuno de tu messages appunctate
+    keep_polls: Mantener sondages
+    keep_polls_hint: Non dele ulle de tu sondages
+    keep_self_bookmark: Mantener messages que tu marcava con marcapaginas
+    keep_self_bookmark_hint: Non dele tu proprie messages si tu los ha marcate con marcapaginas
+    keep_self_fav: Mantene messages que tu favoriva
+    keep_self_fav_hint: Non dele tu proprie messages si tu los ha favorite
     min_age:
       '1209600': 2 septimanas
       '15778476': 6 menses
@@ -1426,6 +1566,7 @@ ia:
       '604800': 1 septimana
       '63113904': 2 annos
       '7889238': 3 menses
+    min_age_label: Limine de etate
   stream_entries:
     sensitive_content: Contento sensibile
   strikes:
diff --git a/config/locales/simple_form.cy.yml b/config/locales/simple_form.cy.yml
index 51a3aac273c07c..5e8fd85293f75a 100644
--- a/config/locales/simple_form.cy.yml
+++ b/config/locales/simple_form.cy.yml
@@ -77,11 +77,13 @@ cy:
           warn: Cuddiwch y cynnwys wedi'i hidlo y tu ôl i rybudd sy'n sôn am deitl yr hidlydd
       form_admin_settings:
         activity_api_enabled: Cyfrif o bostiadau a gyhoeddir yn lleol, defnyddwyr gweithredol, a chofrestriadau newydd mewn bwcedi wythnosol
+        app_icon: WEBP, PNG, GIF neu JPG. Yn diystyru'r eicon ap rhagosodedig ar ddyfeisiau symudol gydag eicon cyfaddas.
         backups_retention_period: Mae gan ddefnyddwyr y gallu i gynhyrchu archifau o'u postiadau i'w llwytho i lawr yn ddiweddarach. Pan gânt eu gosod i werth positif, bydd yr archifau hyn yn cael eu dileu'n awtomatig o'ch storfa ar ôl y nifer penodedig o ddyddiau.
         bootstrap_timeline_accounts: Bydd y cyfrifon hyn yn cael eu pinio i frig argymhellion dilynol defnyddwyr newydd.
         closed_registrations_message: Yn cael eu dangos pan fydd cofrestriadau wedi cau
         content_cache_retention_period: Bydd yr holl bostiadau gan weinyddion eraill (gan gynnwys hwb ac atebion) yn cael eu dileu ar ôl y nifer penodedig o ddyddiau, heb ystyried unrhyw ryngweithio defnyddiwr lleol â'r postiadau hynny. Mae hyn yn cynnwys postiadau lle mae defnyddiwr lleol wedi ei farcio fel nodau tudalen neu ffefrynnau. Bydd cyfeiriadau preifat rhwng defnyddwyr o wahanol achosion hefyd yn cael eu colli ac yn amhosibl eu hadfer. Mae'r defnydd o'r gosodiad hwn wedi'i fwriadu ar gyfer achosion pwrpas arbennig ac mae'n torri llawer o ddisgwyliadau defnyddwyr pan gaiff ei weithredu at ddibenion cyffredinol.
         custom_css: Gallwch gymhwyso arddulliau cyfaddas ar fersiwn gwe Mastodon.
+        favicon: WEBP, PNG, GIF neu JPG. Yn diystyru'r favicon Mastodon rhagosodedig gydag eicon cyfaddas.
         mascot: Yn diystyru'r darlun yn y rhyngwyneb gwe uwch.
         media_cache_retention_period: Mae ffeiliau cyfryngau o bostiadau a wneir gan ddefnyddwyr o bell yn cael eu storio ar eich gweinydd. Pan gaiff ei osod i werth positif, bydd y cyfryngau yn cael eu dileu ar ôl y nifer penodedig o ddyddiau. Os gofynnir am y data cyfryngau ar ôl iddo gael ei ddileu, caiff ei ail-lwytho i lawr, os yw'r cynnwys ffynhonnell yn dal i fod ar gael. Oherwydd cyfyngiadau ar ba mor aml y mae cardiau rhagolwg cyswllt yn pleidleisio i wefannau trydydd parti, argymhellir gosod y gwerth hwn i o leiaf 14 diwrnod, neu ni fydd cardiau rhagolwg cyswllt yn cael eu diweddaru ar alw cyn yr amser hwnnw.
         peers_api_enabled: Rhestr o enwau parth y mae'r gweinydd hwn wedi dod ar eu traws yn y ffediws. Nid oes unrhyw ddata wedi'i gynnwys yma ynghylch a ydych chi'n ffedereiddio â gweinydd penodol, dim ond bod eich gweinydd yn gwybod amdano. Defnyddir hwn gan wasanaethau sy'n casglu ystadegau ar ffedereiddio mewn ystyr cyffredinol.
diff --git a/config/locales/simple_form.en-GB.yml b/config/locales/simple_form.en-GB.yml
index f4668ccada1c38..eaf0501a27ba9e 100644
--- a/config/locales/simple_form.en-GB.yml
+++ b/config/locales/simple_form.en-GB.yml
@@ -77,10 +77,15 @@ en-GB:
           warn: Hide the filtered content behind a warning mentioning the filter's title
       form_admin_settings:
         activity_api_enabled: Counts of locally published posts, active users, and new registrations in weekly buckets
+        app_icon: WEBP, PNG, GIF or JPG. Overrides the default app icon on mobile devices with a custom icon.
+        backups_retention_period: Users have the ability to generate archives of their posts to download later. When set to a positive value, these archives will be automatically deleted from your storage after the specified number of days.
         bootstrap_timeline_accounts: These accounts will be pinned to the top of new users' follow recommendations.
         closed_registrations_message: Displayed when sign-ups are closed
+        content_cache_retention_period: All posts from other servers (including boosts and replies) will be deleted after the specified number of days, without regard to any local user interaction with those posts. This includes posts where a local user has marked it as bookmarks or favorites. Private mentions between users from different instances will also be lost and impossible to restore. Use of this setting is intended for special purpose instances and breaks many user expectations when implemented for general purpose use.
         custom_css: You can apply custom styles on the web version of Mastodon.
+        favicon: WEBP, PNG, GIF or JPG. Overrides the default Mastodon favicon with a custom icon.
         mascot: Overrides the illustration in the advanced web interface.
+        media_cache_retention_period: Media files from posts made by remote users are cached on your server. When set to a positive value, media will be deleted after the specified number of days. If the media data is requested after it is deleted, it will be re-downloaded, if the source content is still available. Due to restrictions on how often link preview cards poll third-party sites, it is recommended to set this value to at least 14 days, or link preview cards will not be updated on demand before that time.
         peers_api_enabled: A list of domain names this server has encountered in the fediverse. No data is included here about whether you federate with a given server, just that your server knows about it. This is used by services that collect statistics on federation in a general sense.
         profile_directory: The profile directory lists all users who have opted-in to be discoverable.
         require_invite_text: When sign-ups require manual approval, make the “Why do you want to join?” text input mandatory rather than optional
@@ -240,6 +245,7 @@ en-GB:
         backups_retention_period: User archive retention period
         bootstrap_timeline_accounts: Always recommend these accounts to new users
         closed_registrations_message: Custom message when sign-ups are not available
+        content_cache_retention_period: Remote content retention period
         custom_css: Custom CSS
         mascot: Custom mascot (legacy)
         media_cache_retention_period: Media cache retention period

From 6beead38678d6a25adc94ee82ed07974e3e20147 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 15 May 2024 05:33:36 -0400
Subject: [PATCH 1019/2191] Move `simplecov` config into `rails_helper`
 (#30302)

---
 .simplecov                                    | 22 ----------------
 config/initializers/simple_cov_source_file.rb | 19 ++++++++++++++
 spec/rails_helper.rb                          | 25 +++++++++++++++++++
 spec/spec_helper.rb                           |  4 ---
 4 files changed, 44 insertions(+), 26 deletions(-)
 delete mode 100644 .simplecov
 create mode 100644 config/initializers/simple_cov_source_file.rb

diff --git a/.simplecov b/.simplecov
deleted file mode 100644
index fbd0207bec51ce..00000000000000
--- a/.simplecov
+++ /dev/null
@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-if ENV['CI']
-  require 'simplecov-lcov'
-  SimpleCov::Formatter::LcovFormatter.config.report_with_single_file = true
-  SimpleCov.formatter = SimpleCov::Formatter::LcovFormatter
-else
-  SimpleCov.formatter = SimpleCov::Formatter::HTMLFormatter
-end
-
-SimpleCov.start 'rails' do
-  enable_coverage :branch
-
-  add_filter 'lib/linter'
-
-  add_group 'Libraries', 'lib'
-  add_group 'Policies', 'app/policies'
-  add_group 'Presenters', 'app/presenters'
-  add_group 'Serializers', 'app/serializers'
-  add_group 'Services', 'app/services'
-  add_group 'Validators', 'app/validators'
-end
diff --git a/config/initializers/simple_cov_source_file.rb b/config/initializers/simple_cov_source_file.rb
new file mode 100644
index 00000000000000..c6b3586c82583f
--- /dev/null
+++ b/config/initializers/simple_cov_source_file.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+# TODO: https://github.com/simplecov-ruby/simplecov/pull/1084
+# Patches this missing condition, monitor for upstream fix
+
+module SimpleCov
+  module SourceFileExtensions
+    def build_branches
+      coverage_branch_data = coverage_data.fetch('branches', {}) || {} # Add the final empty hash in case where 'branches' is present, but returns nil
+      branches = coverage_branch_data.flat_map do |condition, coverage_branches|
+        build_branches_from(condition, coverage_branches)
+      end
+
+      process_skipped_branches(branches)
+    end
+  end
+end
+
+SimpleCov::SourceFile.prepend(SimpleCov::SourceFileExtensions) if defined?(SimpleCov::SourceFile)
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index d8eb561d42446d..38aa711089e325 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -2,6 +2,31 @@
 
 ENV['RAILS_ENV'] ||= 'test'
 
+unless ENV['DISABLE_SIMPLECOV'] == 'true'
+  require 'simplecov'
+
+  SimpleCov.start 'rails' do
+    if ENV['CI']
+      require 'simplecov-lcov'
+      formatter SimpleCov::Formatter::LcovFormatter
+      formatter.config.report_with_single_file = true
+    else
+      formatter SimpleCov::Formatter::HTMLFormatter
+    end
+
+    enable_coverage :branch
+
+    add_filter 'lib/linter'
+
+    add_group 'Libraries', 'lib'
+    add_group 'Policies', 'app/policies'
+    add_group 'Presenters', 'app/presenters'
+    add_group 'Serializers', 'app/serializers'
+    add_group 'Services', 'app/services'
+    add_group 'Validators', 'app/validators'
+  end
+end
+
 # This needs to be defined before Rails is initialized
 STREAMING_PORT = ENV.fetch('TEST_STREAMING_PORT', '4020')
 ENV['STREAMING_API_BASE_URL'] = "http://localhost:#{STREAMING_PORT}"
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 8a01792a19910b..1f9cc40f12afd4 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,9 +1,5 @@
 # frozen_string_literal: true
 
-unless ENV['DISABLE_SIMPLECOV'] == 'true'
-  require 'simplecov' # Configuration details loaded from .simplecov
-end
-
 RSpec.configure do |config|
   config.example_status_persistence_file_path = 'tmp/rspec/examples.txt'
   config.expect_with :rspec do |expectations|

From 85c625d31974e411666812468ddfd7760ab67d4a Mon Sep 17 00:00:00 2001
From: Jason Punyon <jason.punyon@gmail.com>
Date: Wed, 15 May 2024 05:38:16 -0400
Subject: [PATCH 1020/2191] Fix repetitive database queries from #30040
 (#30259)

---
 app/helpers/application_helper.rb       | 13 +++++++++----
 app/presenters/instance_presenter.rb    | 12 ++++++++++++
 app/serializers/manifest_serializer.rb  |  2 +-
 app/views/layouts/application.html.haml |  6 +++---
 spec/helpers/application_helper_spec.rb | 15 ++++++++++-----
 5 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index ff351429e0a238..eb03f1e4ba2ced 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -240,11 +240,16 @@ def prerender_custom_emojis(html, custom_emojis, other_options = {})
     EmojiFormatter.new(html, custom_emojis, other_options.merge(animate: prefers_autoplay?)).to_s
   end
 
-  def site_icon_path(type, size = '48')
-    icon = SiteUpload.find_by(var: type)
-    return nil unless icon
+  def instance_presenter
+    @instance_presenter ||= InstancePresenter.new
+  end
+
+  def favicon_path(size = '48')
+    instance_presenter.favicon&.file&.url(size)
+  end
 
-    icon.file.url(size)
+  def app_icon_path(size = '48')
+    instance_presenter.app_icon&.file&.url(size)
   end
 
   private
diff --git a/app/presenters/instance_presenter.rb b/app/presenters/instance_presenter.rb
index 25df4d85aa45af..92415a69030af9 100644
--- a/app/presenters/instance_presenter.rb
+++ b/app/presenters/instance_presenter.rb
@@ -81,4 +81,16 @@ def thumbnail
   def mascot
     @mascot ||= Rails.cache.fetch('site_uploads/mascot') { SiteUpload.find_by(var: 'mascot') }
   end
+
+  def favicon
+    return @favicon if defined?(@favicon)
+
+    @favicon ||= Rails.cache.fetch('site_uploads/favicon') { SiteUpload.find_by(var: 'favicon') }
+  end
+
+  def app_icon
+    return @app_icon if defined?(@app_icon)
+
+    @app_icon ||= Rails.cache.fetch('site_uploads/app_icon') { SiteUpload.find_by(var: 'app_icon') }
+  end
 end
diff --git a/app/serializers/manifest_serializer.rb b/app/serializers/manifest_serializer.rb
index 759490228c04bf..a39fb5ef540765 100644
--- a/app/serializers/manifest_serializer.rb
+++ b/app/serializers/manifest_serializer.rb
@@ -27,7 +27,7 @@ def short_name
 
   def icons
     SiteUpload::ANDROID_ICON_SIZES.map do |size|
-      src = site_icon_path('app_icon', size.to_i)
+      src = app_icon_path(size.to_i)
       src = URI.join(root_url, src).to_s if src.present?
 
       {
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index e3d05226eefad0..5957d1dbf59813 100755
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -11,13 +11,13 @@
     - if storage_host?
       %link{ rel: 'dns-prefetch', href: storage_host }/
 
-    %link{ rel: 'icon', href: site_icon_path('favicon', 'ico') || '/favicon.ico', type: 'image/x-icon' }/
+    %link{ rel: 'icon', href: favicon_path('ico') || '/favicon.ico', type: 'image/x-icon' }/
 
     - SiteUpload::FAVICON_SIZES.each do |size|
-      %link{ rel: 'icon', sizes: "#{size}x#{size}", href: site_icon_path('favicon', size.to_i) || frontend_asset_path("icons/favicon-#{size}x#{size}.png"), type: 'image/png' }/
+      %link{ rel: 'icon', sizes: "#{size}x#{size}", href: favicon_path(size.to_i) || frontend_asset_path("icons/favicon-#{size}x#{size}.png"), type: 'image/png' }/
 
     - SiteUpload::APPLE_ICON_SIZES.each do |size|
-      %link{ rel: 'apple-touch-icon', sizes: "#{size}x#{size}", href: site_icon_path('app_icon', size.to_i) || frontend_asset_path("icons/apple-touch-icon-#{size}x#{size}.png") }/
+      %link{ rel: 'apple-touch-icon', sizes: "#{size}x#{size}", href: app_icon_path(size.to_i) || frontend_asset_path("icons/apple-touch-icon-#{size}x#{size}.png") }/
 
     %link{ rel: 'mask-icon', href: frontend_asset_path('images/logo-symbol-icon.svg'), color: '#6364FF' }/
     %link{ rel: 'manifest', href: manifest_path(format: :json) }/
diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
index 56501034b2ddd8..56974513bef162 100644
--- a/spec/helpers/application_helper_spec.rb
+++ b/spec/helpers/application_helper_spec.rb
@@ -286,26 +286,31 @@ def current_theme = 'default'
     end
   end
 
-  describe '#site_icon_path' do
+  describe 'favicon' do
     context 'when an icon exists' do
       let!(:favicon) { Fabricate(:site_upload, var: 'favicon') }
+      let!(:app_icon) { Fabricate(:site_upload, var: 'app_icon') }
 
       it 'returns the URL of the icon' do
-        expect(helper.site_icon_path('favicon')).to eq(favicon.file.url('48'))
+        expect(helper.favicon_path).to eq(favicon.file.url('48'))
+        expect(helper.app_icon_path).to eq(app_icon.file.url('48'))
       end
 
       it 'returns the URL of the icon with size parameter' do
-        expect(helper.site_icon_path('favicon', 16)).to eq(favicon.file.url('16'))
+        expect(helper.favicon_path(16)).to eq(favicon.file.url('16'))
+        expect(helper.app_icon_path(16)).to eq(app_icon.file.url('16'))
       end
     end
 
     context 'when an icon does not exist' do
       it 'returns nil' do
-        expect(helper.site_icon_path('favicon')).to be_nil
+        expect(helper.favicon_path).to be_nil
+        expect(helper.app_icon_path).to be_nil
       end
 
       it 'returns nil with size parameter' do
-        expect(helper.site_icon_path('favicon', 16)).to be_nil
+        expect(helper.favicon_path(16)).to be_nil
+        expect(helper.app_icon_path(16)).to be_nil
       end
     end
   end

From 4e085dff52f88a4bb81f4f6cbe4c7a37ebfb2390 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 15 May 2024 15:05:05 +0200
Subject: [PATCH 1021/2191] chore(deps): update dependency aws-sdk-s3 to
 v1.151.0 (#30287)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 2854528b737c44..d34d634f58284a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -100,16 +100,16 @@ GEM
     attr_required (1.0.2)
     awrence (1.2.1)
     aws-eventstream (1.3.0)
-    aws-partitions (1.922.0)
-    aws-sdk-core (3.194.1)
+    aws-partitions (1.929.0)
+    aws-sdk-core (3.196.1)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.8)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.80.0)
+    aws-sdk-kms (1.81.0)
       aws-sdk-core (~> 3, >= 3.193.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.149.1)
+    aws-sdk-s3 (1.151.0)
       aws-sdk-core (~> 3, >= 3.194.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.8)

From c2ca3d152f1dda0f4f5d2455ae9c550779a2c10e Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 15 May 2024 15:11:13 +0200
Subject: [PATCH 1022/2191] Fix off-by-one in `tootctl media` commands (#30306)

---
 lib/mastodon/cli/media.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/mastodon/cli/media.rb b/lib/mastodon/cli/media.rb
index e26b4f24afa272..509d11a8198948 100644
--- a/lib/mastodon/cli/media.rb
+++ b/lib/mastodon/cli/media.rb
@@ -128,7 +128,7 @@ def remove_orphans
 
             model_name      = path_segments.first.classify
             attachment_name = path_segments[1].singularize
-            record_id       = path_segments[2..-2].join.to_i
+            record_id       = path_segments[2...-2].join.to_i
             file_name       = path_segments.last
             record          = record_map.dig(model_name, record_id)
             attachment      = record&.public_send(attachment_name)
@@ -172,7 +172,7 @@ def remove_orphans
           end
 
           model_name      = path_segments.first.classify
-          record_id       = path_segments[2..-2].join.to_i
+          record_id       = path_segments[2...-2].join.to_i
           attachment_name = path_segments[1].singularize
           file_name       = path_segments.last
 
@@ -297,7 +297,7 @@ def lookup(url)
       fail_with_message 'Not a media URL' unless VALID_PATH_SEGMENTS_SIZE.include?(path_segments.size)
 
       model_name = path_segments.first.classify
-      record_id  = path_segments[2..-2].join.to_i
+      record_id  = path_segments[2...-2].join.to_i
 
       fail_with_message "Cannot find corresponding model: #{model_name}" unless PRELOAD_MODEL_WHITELIST.include?(model_name)
 
@@ -353,7 +353,7 @@ def preload_records_from_mixed_objects(objects)
         next unless VALID_PATH_SEGMENTS_SIZE.include?(segments.size)
 
         model_name = segments.first.classify
-        record_id  = segments[2..-2].join.to_i
+        record_id  = segments[2...-2].join.to_i
 
         next unless PRELOAD_MODEL_WHITELIST.include?(model_name)
 

From 5fd56512de244263b4b0df998b8a83c303c3d1c5 Mon Sep 17 00:00:00 2001
From: Emelia Smith <ThisIsMissEm@users.noreply.github.com>
Date: Wed, 15 May 2024 15:38:36 +0200
Subject: [PATCH 1023/2191] Improve Report Notes and Account Moderation Notes
 (#30288)

---
 app/models/account_moderation_note.rb         |  2 +-
 app/models/report_note.rb                     |  2 +-
 app/views/admin/accounts/show.html.haml       | 10 ++++----
 app/views/admin/reports/show.html.haml        | 14 ++++++-----
 config/navigation.rb                          |  4 ++--
 ...ccount_moderation_notes_controller_spec.rb | 13 ++++++++--
 .../admin/report_notes_controller_spec.rb     | 24 ++++++++++++++-----
 7 files changed, 47 insertions(+), 22 deletions(-)

diff --git a/app/models/account_moderation_note.rb b/app/models/account_moderation_note.rb
index ad49b24229f2de..79b8b4d25ee033 100644
--- a/app/models/account_moderation_note.rb
+++ b/app/models/account_moderation_note.rb
@@ -13,7 +13,7 @@
 #
 
 class AccountModerationNote < ApplicationRecord
-  CONTENT_SIZE_LIMIT = 500
+  CONTENT_SIZE_LIMIT = 2_000
 
   belongs_to :account
   belongs_to :target_account, class_name: 'Account'
diff --git a/app/models/report_note.rb b/app/models/report_note.rb
index b5c40a18b1487e..7361c97e670a5e 100644
--- a/app/models/report_note.rb
+++ b/app/models/report_note.rb
@@ -13,7 +13,7 @@
 #
 
 class ReportNote < ApplicationRecord
-  CONTENT_SIZE_LIMIT = 500
+  CONTENT_SIZE_LIMIT = 2_000
 
   belongs_to :account
   belongs_to :report, inverse_of: :notes, touch: true
diff --git a/app/views/admin/accounts/show.html.haml b/app/views/admin/accounts/show.html.haml
index 41fcafa29d5af8..bcf7c073141543 100644
--- a/app/views/admin/accounts/show.html.haml
+++ b/app/views/admin/accounts/show.html.haml
@@ -62,14 +62,16 @@
   .report-notes
     = render partial: 'admin/report_notes/report_note', collection: @moderation_notes
 
-  = simple_form_for @account_moderation_note, url: admin_account_moderation_notes_path do |f|
-    = f.hidden_field :target_account_id
+  = simple_form_for @account_moderation_note, url: admin_account_moderation_notes_path do |form|
+    = form.hidden_field :target_account_id
+
+    = render 'shared/error_messages', object: @account_moderation_note
 
     .field-group
-      = f.input :content, placeholder: t('admin.reports.notes.placeholder'), rows: 6
+      = form.input :content, input_html: { placeholder: t('admin.reports.notes.placeholder'), maxlength: AccountModerationNote::CONTENT_SIZE_LIMIT, rows: 6, autofocus: @account_moderation_note.errors.any? }
 
     .actions
-      = f.button :button, t('admin.account_moderation_notes.create'), type: :submit
+      = form.button :button, t('admin.account_moderation_notes.create'), type: :submit
 
   %hr.spacer/
 
diff --git a/app/views/admin/reports/show.html.haml b/app/views/admin/reports/show.html.haml
index c880021cffbcaf..842aa51597023e 100644
--- a/app/views/admin/reports/show.html.haml
+++ b/app/views/admin/reports/show.html.haml
@@ -83,15 +83,17 @@
 .report-notes
   = render @report_notes
 
-= simple_form_for @report_note, url: admin_report_notes_path do |f|
-  = f.input :report_id, as: :hidden
+= simple_form_for @report_note, url: admin_report_notes_path do |form|
+  = form.input :report_id, as: :hidden
+
+  = render 'shared/error_messages', object: @report_note
 
   .field-group
-    = f.input :content, placeholder: t('admin.reports.notes.placeholder'), rows: 6
+    = form.input :content, input_html: { placeholder: t('admin.reports.notes.placeholder'), maxlength: ReportNote::CONTENT_SIZE_LIMIT, rows: 6, autofocus: @report_note.errors.any? }
 
   .actions
     - if @report.unresolved?
-      = f.button :button, t('admin.reports.notes.create_and_resolve'), name: :create_and_resolve, type: :submit
+      = form.button :button, t('admin.reports.notes.create_and_resolve'), name: :create_and_resolve, type: :submit
     - else
-      = f.button :button, t('admin.reports.notes.create_and_unresolve'), name: :create_and_unresolve, type: :submit
-    = f.button :button, t('admin.reports.notes.create'), type: :submit
+      = form.button :button, t('admin.reports.notes.create_and_unresolve'), name: :create_and_unresolve, type: :submit
+    = form.button :button, t('admin.reports.notes.create'), type: :submit
diff --git a/config/navigation.rb b/config/navigation.rb
index 791025d526a68f..b6e3f495056f49 100644
--- a/config/navigation.rb
+++ b/config/navigation.rb
@@ -45,8 +45,8 @@
     end
 
     n.item :moderation, safe_join([fa_icon('gavel fw'), t('moderation.title')]), nil, if: -> { current_user.can?(:manage_reports, :view_audit_log, :manage_users, :manage_invites, :manage_taxonomies, :manage_federation, :manage_blocks) && !self_destruct } do |s|
-      s.item :reports, safe_join([fa_icon('flag fw'), t('admin.reports.title')]), admin_reports_path, highlights_on: %r{/admin/reports}, if: -> { current_user.can?(:manage_reports) }
-      s.item :accounts, safe_join([fa_icon('users fw'), t('admin.accounts.title')]), admin_accounts_path(origin: 'local'), highlights_on: %r{/admin/accounts|/admin/pending_accounts|/admin/disputes|/admin/users}, if: -> { current_user.can?(:manage_users) }
+      s.item :reports, safe_join([fa_icon('flag fw'), t('admin.reports.title')]), admin_reports_path, highlights_on: %r{/admin/reports|admin/report_notes}, if: -> { current_user.can?(:manage_reports) }
+      s.item :accounts, safe_join([fa_icon('users fw'), t('admin.accounts.title')]), admin_accounts_path(origin: 'local'), highlights_on: %r{/admin/accounts|admin/account_moderation_notes|/admin/pending_accounts|/admin/disputes|/admin/users}, if: -> { current_user.can?(:manage_users) }
       s.item :invites, safe_join([fa_icon('user-plus fw'), t('admin.invites.title')]), admin_invites_path, if: -> { current_user.can?(:manage_invites) }
       s.item :follow_recommendations, safe_join([fa_icon('user-plus fw'), t('admin.follow_recommendations.title')]), admin_follow_recommendations_path, highlights_on: %r{/admin/follow_recommendations}, if: -> { current_user.can?(:manage_taxonomies) }
       s.item :instances, safe_join([fa_icon('cloud fw'), t('admin.instances.title')]), admin_instances_path(limited: limited_federation_mode? ? nil : '1'), highlights_on: %r{/admin/instances|/admin/domain_blocks|/admin/domain_allows}, if: -> { current_user.can?(:manage_federation) }
diff --git a/spec/controllers/admin/account_moderation_notes_controller_spec.rb b/spec/controllers/admin/account_moderation_notes_controller_spec.rb
index 8d24a7af37383b..5ea546f4180c08 100644
--- a/spec/controllers/admin/account_moderation_notes_controller_spec.rb
+++ b/spec/controllers/admin/account_moderation_notes_controller_spec.rb
@@ -24,10 +24,19 @@
       end
     end
 
-    context 'when parameters are invalid' do
+    context 'when the content is too short' do
       let(:params) { { account_moderation_note: { target_account_id: target_account.id, content: '' } } }
 
-      it 'falls to create a note' do
+      it 'fails to create a note' do
+        expect { subject }.to_not change(AccountModerationNote, :count)
+        expect(response).to render_template 'admin/accounts/show'
+      end
+    end
+
+    context 'when the content is too long' do
+      let(:params) { { account_moderation_note: { target_account_id: target_account.id, content: 'test' * AccountModerationNote::CONTENT_SIZE_LIMIT } } }
+
+      it 'fails to create a note' do
         expect { subject }.to_not change(AccountModerationNote, :count)
         expect(response).to render_template 'admin/accounts/show'
       end
diff --git a/spec/controllers/admin/report_notes_controller_spec.rb b/spec/controllers/admin/report_notes_controller_spec.rb
index 4ddf4a4e2476cc..8d5b5c7aecf871 100644
--- a/spec/controllers/admin/report_notes_controller_spec.rb
+++ b/spec/controllers/admin/report_notes_controller_spec.rb
@@ -22,7 +22,7 @@
         let(:account_id) { nil }
 
         context 'when create_and_resolve flag is on' do
-          let(:params) { { report_note: { content: 'test content', report_id: report.id }, create_and_resolve: nil } }
+          let(:params) { { report_note: { report_id: report.id, content: 'test content' }, create_and_resolve: nil } }
 
           it 'creates a report note and resolves report' do
             expect { subject }.to change(ReportNote, :count).by(1)
@@ -32,7 +32,7 @@
         end
 
         context 'when create_and_resolve flag is false' do
-          let(:params) { { report_note: { content: 'test content', report_id: report.id } } }
+          let(:params) { { report_note: { report_id: report.id, content: 'test content' } } }
 
           it 'creates a report note and does not resolve report' do
             expect { subject }.to change(ReportNote, :count).by(1)
@@ -47,7 +47,7 @@
         let(:account_id) { user.account.id }
 
         context 'when create_and_unresolve flag is on' do
-          let(:params) { { report_note: { content: 'test content', report_id: report.id }, create_and_unresolve: nil } }
+          let(:params) { { report_note: { report_id: report.id, content: 'test content' }, create_and_unresolve: nil } }
 
           it 'creates a report note and unresolves report' do
             expect { subject }.to change(ReportNote, :count).by(1)
@@ -57,7 +57,7 @@
         end
 
         context 'when create_and_unresolve flag is false' do
-          let(:params) { { report_note: { content: 'test content', report_id: report.id } } }
+          let(:params) { { report_note: { report_id: report.id, content: 'test content' } } }
 
           it 'creates a report note and does not unresolve report' do
             expect { subject }.to change(ReportNote, :count).by(1)
@@ -68,12 +68,24 @@
       end
     end
 
-    context 'when parameter is invalid' do
-      let(:params) { { report_note: { content: '', report_id: report.id } } }
+    context 'when content is too short' do
+      let(:params) { { report_note: { report_id: report.id, content: '' } } }
       let(:action_taken) { nil }
       let(:account_id) { nil }
 
       it 'renders admin/reports/show' do
+        expect { subject }.to_not change(ReportNote, :count)
+        expect(subject).to render_template 'admin/reports/show'
+      end
+    end
+
+    context 'when content is too long' do
+      let(:params) { { report_note: { report_id: report.id, content: 'test' * ReportNote::CONTENT_SIZE_LIMIT } } }
+      let(:action_taken) { nil }
+      let(:account_id) { nil }
+
+      it 'renders admin/reports/show' do
+        expect { subject }.to_not change(ReportNote, :count)
         expect(subject).to render_template 'admin/reports/show'
       end
     end

From d5d3a0fc57ff712061a3bd18736d68851f04f86c Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 15 May 2024 15:38:51 +0200
Subject: [PATCH 1024/2191] fix(deps): update dependency pino to v9.1.0
 (#30283)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 38 ++++++++++++++++++++------------------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 3741a541958f4b..3d85014d4996f2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -13042,13 +13042,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pino-std-serializers@npm:^6.0.0":
-  version: 6.2.2
-  resolution: "pino-std-serializers@npm:6.2.2"
-  checksum: 10c0/8f1c7f0f0d8f91e6c6b5b2a6bfb48f06441abeb85f1c2288319f736f9c6d814fbeebe928d2314efc2ba6018fa7db9357a105eca9fc99fc1f28945a8a8b28d3d5
-  languageName: node
-  linkType: hard
-
 "pino-std-serializers@npm:^7.0.0":
   version: 7.0.0
   resolution: "pino-std-serializers@npm:7.0.0"
@@ -13057,23 +13050,23 @@ __metadata:
   linkType: hard
 
 "pino@npm:^9.0.0":
-  version: 9.0.0
-  resolution: "pino@npm:9.0.0"
+  version: 9.1.0
+  resolution: "pino@npm:9.1.0"
   dependencies:
     atomic-sleep: "npm:^1.0.0"
     fast-redact: "npm:^3.1.1"
     on-exit-leak-free: "npm:^2.1.0"
     pino-abstract-transport: "npm:^1.2.0"
-    pino-std-serializers: "npm:^6.0.0"
+    pino-std-serializers: "npm:^7.0.0"
     process-warning: "npm:^3.0.0"
     quick-format-unescaped: "npm:^4.0.3"
     real-require: "npm:^0.2.0"
     safe-stable-stringify: "npm:^2.3.1"
-    sonic-boom: "npm:^3.7.0"
-    thread-stream: "npm:^2.6.0"
+    sonic-boom: "npm:^4.0.1"
+    thread-stream: "npm:^3.0.0"
   bin:
     pino: bin.js
-  checksum: 10c0/10ef10aee0cf80af8ed83468cff2e29d642b6794b53cf641e1abcaf9e9958d8bcbc6e09d62757054aef3b4415c45d66a5018da11d43b81a23ba299ef5dc4e8b1
+  checksum: 10c0/d060530ae2e4e8f21d04bb0f44f009f94d207d7f4337f508f618416514214ddaf1b29f8c5c265153a19ce3b6480b451461f40020f916ace9d53a5aa07624b79c
   languageName: node
   linkType: hard
 
@@ -15822,7 +15815,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"sonic-boom@npm:^3.0.0, sonic-boom@npm:^3.7.0":
+"sonic-boom@npm:^3.0.0":
   version: 3.7.0
   resolution: "sonic-boom@npm:3.7.0"
   dependencies:
@@ -15831,6 +15824,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"sonic-boom@npm:^4.0.1":
+  version: 4.0.1
+  resolution: "sonic-boom@npm:4.0.1"
+  dependencies:
+    atomic-sleep: "npm:^1.0.0"
+  checksum: 10c0/7b467f2bc8af7ff60bf210382f21c59728cc4b769af9b62c31dd88723f5cc472752d2320736cc366acc7c765ddd5bec3072c033b0faf249923f576a7453ba9d3
+  languageName: node
+  linkType: hard
+
 "source-list-map@npm:^2.0.0":
   version: 2.0.1
   resolution: "source-list-map@npm:2.0.1"
@@ -16776,12 +16778,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"thread-stream@npm:^2.6.0":
-  version: 2.6.0
-  resolution: "thread-stream@npm:2.6.0"
+"thread-stream@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "thread-stream@npm:3.0.0"
   dependencies:
     real-require: "npm:^0.2.0"
-  checksum: 10c0/276e2545b33273232eb2c22c53fc11844951c1322f8a78c522477af716ebcfe0d106ccf1fbc455f6e48d928e93231fed6377ce91fdcb3885086e8ffa1f011c88
+  checksum: 10c0/1f4da5a8c93b170cdc7c1ad774af49bb2af43f73cfd9a7f8fb02b766255b483eb6d0b734502c880397baa95c0ce3490088b9a487cff32d4e481aab6fe76560f5
   languageName: node
   linkType: hard
 

From ca560c10958d3ad96736c974c778380c2adacef2 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 15 May 2024 09:57:13 -0400
Subject: [PATCH 1025/2191] Disable `Style/RedundantFetchBlock` cop (#30207)

---
 .rubocop.yml      |  5 +++++
 .rubocop_todo.yml | 10 ----------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 542e90b5e337c1..cbc0afd2815c53 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -211,6 +211,11 @@ Style/PercentLiteralDelimiters:
 Style/RedundantBegin:
   Enabled: false
 
+# Reason: Prevailing style choice
+# https://docs.rubocop.org/rubocop/cops_style.html#styleredundantfetchblock
+Style/RedundantFetchBlock:
+  Enabled: false
+
 # Reason: Overridden to reduce implicit StandardError rescues
 # https://docs.rubocop.org/rubocop/cops_style.html#stylerescuestandarderror
 Style/RescueStandardError:
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index b47d682f3e683c..064f622085af6f 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -169,16 +169,6 @@ Style/RedundantConstantBase:
     - 'config/environments/production.rb'
     - 'config/initializers/sidekiq.rb'
 
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: SafeForConstants.
-Style/RedundantFetchBlock:
-  Exclude:
-    - 'config/initializers/1_hosts.rb'
-    - 'config/initializers/chewy.rb'
-    - 'config/initializers/devise.rb'
-    - 'config/initializers/paperclip.rb'
-    - 'config/puma.rb'
-
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: ConvertCodeThatCanStartToReturnNil, AllowedMethods, MaxChainLength.
 # AllowedMethods: present?, blank?, presence, try, try!

From 94493cff925ee9b9cb4ebc7cc20081ab20521b85 Mon Sep 17 00:00:00 2001
From: David Lapshin <ddaudix@gmail.com>
Date: Thu, 16 May 2024 10:33:29 +0300
Subject: [PATCH 1026/2191] Fix incorrect element selector from #30221 (#30307)

---
 app/javascript/styles/mastodon/components.scss | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 927c57d990b63b..f377eed95cba3d 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -4365,10 +4365,6 @@ a.status-card {
     outline: $ui-button-focus-outline;
   }
 
-  .no-reduce-motion .icon {
-    transition: transform 0.15s ease-in-out;
-  }
-
   &.active {
     color: $primary-text-color;
 
@@ -4387,6 +4383,10 @@ a.status-card {
   }
 }
 
+.no-reduce-motion .column-header__button .icon {
+  transition: transform 150ms ease-in-out;
+}
+
 .column-header__collapsible {
   max-height: 70vh;
   overflow: hidden;

From 60b423b3f72feea31e0d22b02b948848819ad601 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 16 May 2024 09:43:31 +0200
Subject: [PATCH 1027/2191] chore(deps): update dependency rspec-sidekiq to v5
 (#30314)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile      | 2 +-
 Gemfile.lock | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index b9baef7036cddc..240dcce95ac6a8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -132,7 +132,7 @@ group :test do
   gem 'email_spec'
 
   # Extra RSpec extension methods and helpers for sidekiq
-  gem 'rspec-sidekiq', '~> 4.0'
+  gem 'rspec-sidekiq', '~> 5.0'
 
   # Browser integration testing
   gem 'capybara', '~> 3.39'
diff --git a/Gemfile.lock b/Gemfile.lock
index d34d634f58284a..a20ac79aea6b6b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -708,7 +708,7 @@ GEM
       rspec-support (~> 3.13.0)
     rspec-github (2.4.0)
       rspec-core (~> 3.0)
-    rspec-mocks (3.13.0)
+    rspec-mocks (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-rails (6.1.2)
@@ -719,7 +719,7 @@ GEM
       rspec-expectations (~> 3.13)
       rspec-mocks (~> 3.13)
       rspec-support (~> 3.13)
-    rspec-sidekiq (4.2.0)
+    rspec-sidekiq (5.0.0)
       rspec-core (~> 3.0)
       rspec-expectations (~> 3.0)
       rspec-mocks (~> 3.0)
@@ -1012,7 +1012,7 @@ DEPENDENCIES
   rqrcode (~> 2.2)
   rspec-github (~> 2.4)
   rspec-rails (~> 6.0)
-  rspec-sidekiq (~> 4.0)
+  rspec-sidekiq (~> 5.0)
   rubocop
   rubocop-capybara
   rubocop-performance

From c9ee1437c0a12bea5fbafb7efbb8e87e4eb6fe0e Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 16 May 2024 03:43:35 -0400
Subject: [PATCH 1028/2191] Use ruby language constants to build version string
 in software version dimension (#30309)

---
 .../admin/metrics/dimension/software_versions_dimension.rb | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/app/lib/admin/metrics/dimension/software_versions_dimension.rb b/app/lib/admin/metrics/dimension/software_versions_dimension.rb
index ccf556eae0864a..97cdaf589e8c5e 100644
--- a/app/lib/admin/metrics/dimension/software_versions_dimension.rb
+++ b/app/lib/admin/metrics/dimension/software_versions_dimension.rb
@@ -25,14 +25,11 @@ def mastodon_version
   end
 
   def ruby_version
-    yjit = defined?(RubyVM::YJIT) && RubyVM::YJIT.enabled?
-    value = "#{RUBY_VERSION}p#{RUBY_PATCHLEVEL}#{yjit ? ' +YJIT' : ''}"
-
     {
       key: 'ruby',
       human_key: 'Ruby',
-      value: value,
-      human_value: value,
+      value: "#{RUBY_VERSION}p#{RUBY_PATCHLEVEL}",
+      human_value: RUBY_DESCRIPTION,
     }
   end
 

From cdb042ae860c79d47920f30a3ba8b7625e7de56d Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 16 May 2024 09:50:19 +0200
Subject: [PATCH 1029/2191] New Crowdin Translations (automated) (#30319)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/gl.json |  2 +-
 app/javascript/mastodon/locales/sk.json |  3 ++-
 app/javascript/mastodon/locales/tr.json |  2 +-
 config/locales/sk.yml                   | 15 +++++++++++++++
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json
index 88d4f5f60e059a..98cc3139485ac0 100644
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@@ -92,7 +92,7 @@
   "block_modal.remote_users_caveat": "Ímoslle pedir ao servidor {domain} que respecte a túa decisión. Emporiso, non hai garantía de que atenda a petición xa que os servidores xestionan os bloqueos de formas diferentes. As publicacións públicas poderían aínda ser visibles para usuarias que non iniciaron sesión.",
   "block_modal.show_less": "Mostrar menos",
   "block_modal.show_more": "Mostrar máis",
-  "block_modal.they_cant_mention": "Non te pode seguir nin mencionar.",
+  "block_modal.they_cant_mention": "Non te poden seguir nin mencionar.",
   "block_modal.they_cant_see_posts": "Non pode ver as túas publicacións nin ti as de ela.",
   "block_modal.they_will_know": "Pode ver que a bloqueaches.",
   "block_modal.title": "Bloquear usuaria?",
diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json
index 0c76467419f292..c583b58220ead8 100644
--- a/app/javascript/mastodon/locales/sk.json
+++ b/app/javascript/mastodon/locales/sk.json
@@ -295,7 +295,7 @@
   "follow_suggestions.personalized_suggestion": "Prispôsobený návrh",
   "follow_suggestions.popular_suggestion": "Obľúbený návrh",
   "follow_suggestions.popular_suggestion_longer": "Populárne na {domain}",
-  "follow_suggestions.similar_to_recently_followed_longer": "Podobné profilom ktoré si nedávno nasledoval/a",
+  "follow_suggestions.similar_to_recently_followed_longer": "Podobné profilom, ktoré si nedávno nasledoval/a",
   "follow_suggestions.view_all": "Zobraziť všetky",
   "follow_suggestions.who_to_follow": "Koho sledovať",
   "followed_tags": "Sledované hashtagy",
@@ -446,6 +446,7 @@
   "notification.follow_request": "{name} vás žiada sledovať",
   "notification.mention": "{name} vás spomína",
   "notification.moderation-warning.learn_more": "Zisti viac",
+  "notification.moderation_warning.action_disable": "Tvoj účet bol vypnutý.",
   "notification.moderation_warning.action_silence": "Tvoj účet bol obmedzený.",
   "notification.moderation_warning.action_suspend": "Tvoj účet bol pozastavený.",
   "notification.own_poll": "Vaša anketa sa skončila",
diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json
index c46080cfb226a1..6c011065932473 100644
--- a/app/javascript/mastodon/locales/tr.json
+++ b/app/javascript/mastodon/locales/tr.json
@@ -474,7 +474,7 @@
   "notification.follow_request": "{name} size takip isteği gönderdi",
   "notification.mention": "{name} senden bahsetti",
   "notification.moderation-warning.learn_more": "Daha fazlası",
-  "notification.moderation_warning": "Bir denetim uyarısı aldınız",
+  "notification.moderation_warning": "Hesabınız bir denetim uyarısı aldı",
   "notification.moderation_warning.action_delete_statuses": "Bazı gönderileriniz kaldırıldı.",
   "notification.moderation_warning.action_disable": "Hesabınız devre dışı bırakıldı.",
   "notification.moderation_warning.action_mark_statuses_as_sensitive": "Bazı gönderileriniz hassas olarak işaretlendi.",
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 78e7bdb25eafc1..f05887dc33cc0c 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -254,9 +254,12 @@ sk:
         destroy_status_html: "%{name} zmazal/a príspevok od %{target}"
         destroy_unavailable_domain_html: "%{name} znova spustil/a doručovanie pre doménu %{target}"
         destroy_user_role_html: "%{name} vymazal/a rolu pre %{target}"
+        enable_custom_emoji_html: "%{name} povolil/a emotikonu %{target}"
         enable_user_html: "%{name} povolil/a prihlásenie pre používateľa %{target}"
         memorialize_account_html: "%{name} zmenil/a účet %{target} na pamätnú stránku"
+        promote_user_html: "%{name} povýšil/a užívateľa %{target}"
         reject_appeal_html: "%{name} zamietol/la námietku moderovacieho rozhodnutia od %{target}"
+        reject_user_html: "%{name} odmietol/la registráciu od %{target}"
         remove_avatar_user_html: "%{name} vymazal/a %{target}/ov/in avatar"
         reopen_report_html: "%{name} znovu otvoril/a nahlásenie %{target}"
         resend_user_html: "%{name} znovu odoslal/a potvrdzovací email pre %{target}"
@@ -266,7 +269,9 @@ sk:
         silence_account_html: "%{name} obmedzil/a účet %{target}"
         suspend_account_html: "%{name} zablokoval/a účet používateľa %{target}"
         unassigned_report_html: "%{name} odobral/a report od %{target}"
+        unblock_email_account_html: "%{name} odblokoval/a %{target}ovu/inu emailovú adresu"
         unsensitive_account_html: "%{name} odznačil/a médium od %{target} ako chúlostivé"
+        unsilence_account_html: "%{name} zrušil/a obmedzenie %{target}ovho/inho účtu"
         unsuspend_account_html: "%{name} spojazdnil/a účet %{target}"
         update_announcement_html: "%{name} aktualizoval/a oboznámenie %{target}"
         update_custom_emoji_html: "%{name} aktualizoval/a emotikonu %{target}"
@@ -529,6 +534,9 @@ sk:
       actions:
         suspend_description_html: Tento účet a všetok jeho obsah bude nedostupný a nakoniec zmazaný, interaktovať s ním bude nemožné. Zvrátiteľné v rámci 30 dní. Uzatvára všetky hlásenia voči tomuto účtu.
       add_to_report: Pridaj viac do hlásenia
+      already_suspended_badges:
+        local: Na tomto serveri už vylúčený/á
+        remote: Už vylúčený/á na ich serveri
       are_you_sure: Si si istý/á?
       assign_to_self: Priraď sebe
       assigned: Priradený moderátor
@@ -538,6 +546,7 @@ sk:
       comment:
         none: Žiadne
       confirm: Potvrď
+      confirm_action: Potvrď moderovací úkon proti @%{acct}
       created_at: Nahlásené
       delete_and_resolve: Vymaž príspevky
       forwarded: Preposlané
@@ -592,8 +601,14 @@ sk:
       delete: Vymaž
       edit: Uprav postavenie %{name}
       everyone: Východzie oprávnenia
+      permissions_count:
+        few: "%{count} povolení"
+        many: "%{count} povolení"
+        one: "%{count} povolenie"
+        other: "%{count} povolenia"
       privileges:
         administrator: Správca
+        administrator_description: Užívatelia s týmto povolením, obídu všetky povolenia
         delete_user_data: Vymaž užívateľské dáta
         invite_users: Pozvi užívateľov
         manage_announcements: Spravuj oboznámenia

From 356bbbaa7f903b7849af1bb78a7954c250c00d46 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 16 May 2024 09:57:19 +0200
Subject: [PATCH 1030/2191] fix(deps): update dependency @reduxjs/toolkit to
 v2.2.5 (#30320)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 3d85014d4996f2..07c89a5298081f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3050,8 +3050,8 @@ __metadata:
   linkType: hard
 
 "@reduxjs/toolkit@npm:^2.0.1":
-  version: 2.2.4
-  resolution: "@reduxjs/toolkit@npm:2.2.4"
+  version: 2.2.5
+  resolution: "@reduxjs/toolkit@npm:2.2.5"
   dependencies:
     immer: "npm:^10.0.3"
     redux: "npm:^5.0.1"
@@ -3065,7 +3065,7 @@ __metadata:
       optional: true
     react-redux:
       optional: true
-  checksum: 10c0/fdbf510210a5aa4864432397e1a9469367e297cd1d9c09a82e68638df7555672c2f8511fe76f933b00efbbb233c534831591772a44e8c41233e34f3cd0f54569
+  checksum: 10c0/be0593bf26852482fb8716b9248531466c6e8782a3114b823ae680fce90267d8c5512a3231cfecc30b17eff81a4604112772b49ad7ca6a3366ddd4f2a838e53c
   languageName: node
   linkType: hard
 

From f0d6dc4519cc0311583f139834fbbbcd64e82d7a Mon Sep 17 00:00:00 2001
From: Emelia Smith <ThisIsMissEm@users.noreply.github.com>
Date: Thu, 16 May 2024 09:59:46 +0200
Subject: [PATCH 1031/2191] Fix: Mark redirect uris field in Development >
 Application form as required (#30311)

---
 app/controllers/settings/applications_controller.rb | 2 +-
 app/views/settings/applications/_fields.html.haml   | 1 +
 config/navigation.rb                                | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/controllers/settings/applications_controller.rb b/app/controllers/settings/applications_controller.rb
index d4b72056817372..6849979b115233 100644
--- a/app/controllers/settings/applications_controller.rb
+++ b/app/controllers/settings/applications_controller.rb
@@ -13,7 +13,7 @@ def show; end
   def new
     @application = Doorkeeper::Application.new(
       redirect_uri: Doorkeeper.configuration.native_redirect_uri,
-      scopes: 'read write follow'
+      scopes: 'read:me'
     )
   end
 
diff --git a/app/views/settings/applications/_fields.html.haml b/app/views/settings/applications/_fields.html.haml
index ed97e880fc8de0..d5398489526b01 100644
--- a/app/views/settings/applications/_fields.html.haml
+++ b/app/views/settings/applications/_fields.html.haml
@@ -11,6 +11,7 @@
 .fields-group
   = f.input :redirect_uri,
             label: t('activerecord.attributes.doorkeeper/application.redirect_uri'), hint: t('doorkeeper.applications.help.redirect_uri'),
+            required: true,
             wrapper: :with_block_label
 
   %p.hint= t('doorkeeper.applications.help.native_redirect_uri', native_redirect_uri: content_tag(:code, Doorkeeper.configuration.native_redirect_uri)).html_safe
diff --git a/config/navigation.rb b/config/navigation.rb
index b6e3f495056f49..efac96d46e6a1a 100644
--- a/config/navigation.rb
+++ b/config/navigation.rb
@@ -36,7 +36,7 @@
     end
 
     n.item :invites, safe_join([fa_icon('user-plus fw'), t('invites.title')]), invites_path, if: -> { current_user.can?(:invite_users) && current_user.functional? && !self_destruct }
-    n.item :development, safe_join([fa_icon('code fw'), t('settings.development')]), settings_applications_path, if: -> { current_user.functional? && !self_destruct }
+    n.item :development, safe_join([fa_icon('code fw'), t('settings.development')]), settings_applications_path, highlights_on: %r{/settings/applications}, if: -> { current_user.functional? && !self_destruct }
 
     n.item :trends, safe_join([fa_icon('fire fw'), t('admin.trends.title')]), admin_trends_statuses_path, if: -> { current_user.can?(:manage_taxonomies) && !self_destruct } do |s|
       s.item :statuses, safe_join([fa_icon('comments-o fw'), t('admin.trends.statuses.title')]), admin_trends_statuses_path, highlights_on: %r{/admin/trends/statuses}

From 65e82211cdaffa3132832dc42756913d668985c3 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 16 May 2024 04:03:46 -0400
Subject: [PATCH 1032/2191] Rename `cache_*` methods to `preload_*` in
 controller concern (#30209)

---
 app/controllers/accounts_controller.rb          |  2 +-
 .../activitypub/collections_controller.rb       |  2 +-
 .../activitypub/outboxes_controller.rb          |  2 +-
 .../api/v1/accounts/statuses_controller.rb      |  6 +++---
 app/controllers/api/v1/bookmarks_controller.rb  |  6 +++---
 app/controllers/api/v1/favourites_controller.rb |  6 +++---
 .../api/v1/notifications/requests_controller.rb |  2 +-
 .../api/v1/notifications_controller.rb          |  2 +-
 app/controllers/api/v1/statuses_controller.rb   |  8 ++++----
 .../api/v1/timelines/home_controller.rb         |  6 +++---
 .../api/v1/timelines/list_controller.rb         |  6 +++---
 .../api/v1/timelines/public_controller.rb       |  6 +++---
 .../api/v1/timelines/tag_controller.rb          |  6 +++---
 .../api/v1/trends/statuses_controller.rb        |  2 +-
 app/controllers/application_controller.rb       |  1 +
 app/controllers/concerns/cache_concern.rb       | 16 ----------------
 app/controllers/concerns/preloading_concern.rb  | 17 +++++++++++++++++
 app/controllers/tags_controller.rb              |  2 +-
 ...ncern_spec.rb => preloading_concern_spec.rb} | 12 ++++++------
 19 files changed, 56 insertions(+), 54 deletions(-)
 create mode 100644 app/controllers/concerns/preloading_concern.rb
 rename spec/controllers/concerns/{cache_concern_spec.rb => preloading_concern_spec.rb} (79%)

diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb
index 32549e15169e5f..c3131edce939fd 100644
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@@ -25,7 +25,7 @@ def show
 
         limit     = params[:limit].present? ? [params[:limit].to_i, PAGE_SIZE_MAX].min : PAGE_SIZE
         @statuses = filtered_statuses.without_reblogs.limit(limit)
-        @statuses = cache_collection(@statuses, Status)
+        @statuses = preload_collection(@statuses, Status)
       end
 
       format.json do
diff --git a/app/controllers/activitypub/collections_controller.rb b/app/controllers/activitypub/collections_controller.rb
index d5632902fe974b..c25362c9bc056f 100644
--- a/app/controllers/activitypub/collections_controller.rb
+++ b/app/controllers/activitypub/collections_controller.rb
@@ -18,7 +18,7 @@ def show
   def set_items
     case params[:id]
     when 'featured'
-      @items = for_signed_account { cache_collection(@account.pinned_statuses, Status) }
+      @items = for_signed_account { preload_collection(@account.pinned_statuses, Status) }
       @items = @items.map { |item| item.distributable? ? item : ActivityPub::TagManager.instance.uri_for(item) }
     when 'tags'
       @items = for_signed_account { @account.featured_tags }
diff --git a/app/controllers/activitypub/outboxes_controller.rb b/app/controllers/activitypub/outboxes_controller.rb
index 8079e011dd0084..b8baf64e1a59a8 100644
--- a/app/controllers/activitypub/outboxes_controller.rb
+++ b/app/controllers/activitypub/outboxes_controller.rb
@@ -60,7 +60,7 @@ def prev_page
   def set_statuses
     return unless page_requested?
 
-    @statuses = cache_collection_paginated_by_id(
+    @statuses = preload_collection_paginated_by_id(
       AccountStatusesFilter.new(@account, signed_request_account).results,
       Status,
       LIMIT,
diff --git a/app/controllers/api/v1/accounts/statuses_controller.rb b/app/controllers/api/v1/accounts/statuses_controller.rb
index 35ea9c8ec12d5d..c42f27776ca807 100644
--- a/app/controllers/api/v1/accounts/statuses_controller.rb
+++ b/app/controllers/api/v1/accounts/statuses_controller.rb
@@ -19,11 +19,11 @@ def set_account
   end
 
   def load_statuses
-    @account.unavailable? ? [] : cached_account_statuses
+    @account.unavailable? ? [] : preloaded_account_statuses
   end
 
-  def cached_account_statuses
-    cache_collection_paginated_by_id(
+  def preloaded_account_statuses
+    preload_collection_paginated_by_id(
       AccountStatusesFilter.new(@account, current_account, params).results,
       Status,
       limit_param(DEFAULT_STATUSES_LIMIT),
diff --git a/app/controllers/api/v1/bookmarks_controller.rb b/app/controllers/api/v1/bookmarks_controller.rb
index b6bb987b6bccc6..f7671a9032c066 100644
--- a/app/controllers/api/v1/bookmarks_controller.rb
+++ b/app/controllers/api/v1/bookmarks_controller.rb
@@ -13,11 +13,11 @@ def index
   private
 
   def load_statuses
-    cached_bookmarks
+    preloaded_bookmarks
   end
 
-  def cached_bookmarks
-    cache_collection(results.map(&:status), Status)
+  def preloaded_bookmarks
+    preload_collection(results.map(&:status), Status)
   end
 
   def results
diff --git a/app/controllers/api/v1/favourites_controller.rb b/app/controllers/api/v1/favourites_controller.rb
index 73da538f5c80ad..18ca9ab8661a0c 100644
--- a/app/controllers/api/v1/favourites_controller.rb
+++ b/app/controllers/api/v1/favourites_controller.rb
@@ -13,11 +13,11 @@ def index
   private
 
   def load_statuses
-    cached_favourites
+    preloaded_favourites
   end
 
-  def cached_favourites
-    cache_collection(results.map(&:status), Status)
+  def preloaded_favourites
+    preload_collection(results.map(&:status), Status)
   end
 
   def results
diff --git a/app/controllers/api/v1/notifications/requests_controller.rb b/app/controllers/api/v1/notifications/requests_controller.rb
index 6a26cc0e8abf07..0e58379a382e85 100644
--- a/app/controllers/api/v1/notifications/requests_controller.rb
+++ b/app/controllers/api/v1/notifications/requests_controller.rb
@@ -41,7 +41,7 @@ def load_requests
     )
 
     NotificationRequest.preload_cache_collection(requests) do |statuses|
-      cache_collection(statuses, Status)
+      preload_collection(statuses, Status)
     end
   end
 
diff --git a/app/controllers/api/v1/notifications_controller.rb b/app/controllers/api/v1/notifications_controller.rb
index c41a0bb05d11f8..1d0aa10d2e70cd 100644
--- a/app/controllers/api/v1/notifications_controller.rb
+++ b/app/controllers/api/v1/notifications_controller.rb
@@ -41,7 +41,7 @@ def load_notifications
     )
 
     Notification.preload_cache_collection_target_statuses(notifications) do |target_statuses|
-      cache_collection(target_statuses, Status)
+      preload_collection(target_statuses, Status)
     end
   end
 
diff --git a/app/controllers/api/v1/statuses_controller.rb b/app/controllers/api/v1/statuses_controller.rb
index 36a9ec6325b11e..5f7e66617d2b7e 100644
--- a/app/controllers/api/v1/statuses_controller.rb
+++ b/app/controllers/api/v1/statuses_controller.rb
@@ -26,13 +26,13 @@ class Api::V1::StatusesController < Api::BaseController
   DESCENDANTS_DEPTH_LIMIT = 20
 
   def index
-    @statuses = cache_collection(@statuses, Status)
+    @statuses = preload_collection(@statuses, Status)
     render json: @statuses, each_serializer: REST::StatusSerializer
   end
 
   def show
     cache_if_unauthenticated!
-    @status = cache_collection([@status], Status).first
+    @status = preload_collection([@status], Status).first
     render json: @status, serializer: REST::StatusSerializer
   end
 
@@ -51,8 +51,8 @@ def context
 
     ancestors_results   = @status.in_reply_to_id.nil? ? [] : @status.ancestors(ancestors_limit, current_account)
     descendants_results = @status.descendants(descendants_limit, current_account, descendants_depth_limit)
-    loaded_ancestors    = cache_collection(ancestors_results, Status)
-    loaded_descendants  = cache_collection(descendants_results, Status)
+    loaded_ancestors    = preload_collection(ancestors_results, Status)
+    loaded_descendants  = preload_collection(descendants_results, Status)
 
     @context = Context.new(ancestors: loaded_ancestors, descendants: loaded_descendants)
     statuses = [@status] + @context.ancestors + @context.descendants
diff --git a/app/controllers/api/v1/timelines/home_controller.rb b/app/controllers/api/v1/timelines/home_controller.rb
index 36fdbea6471200..d5d18286665268 100644
--- a/app/controllers/api/v1/timelines/home_controller.rb
+++ b/app/controllers/api/v1/timelines/home_controller.rb
@@ -21,11 +21,11 @@ def show
   private
 
   def load_statuses
-    cached_home_statuses
+    preloaded_home_statuses
   end
 
-  def cached_home_statuses
-    cache_collection home_statuses, Status
+  def preloaded_home_statuses
+    preload_collection home_statuses, Status
   end
 
   def home_statuses
diff --git a/app/controllers/api/v1/timelines/list_controller.rb b/app/controllers/api/v1/timelines/list_controller.rb
index 14b884ecd95bf1..d8cdbdb74cf194 100644
--- a/app/controllers/api/v1/timelines/list_controller.rb
+++ b/app/controllers/api/v1/timelines/list_controller.rb
@@ -21,11 +21,11 @@ def set_list
   end
 
   def set_statuses
-    @statuses = cached_list_statuses
+    @statuses = preloaded_list_statuses
   end
 
-  def cached_list_statuses
-    cache_collection list_statuses, Status
+  def preloaded_list_statuses
+    preload_collection list_statuses, Status
   end
 
   def list_statuses
diff --git a/app/controllers/api/v1/timelines/public_controller.rb b/app/controllers/api/v1/timelines/public_controller.rb
index 35af8dc4b50192..d164854d6a3753 100644
--- a/app/controllers/api/v1/timelines/public_controller.rb
+++ b/app/controllers/api/v1/timelines/public_controller.rb
@@ -18,11 +18,11 @@ def require_auth?
   end
 
   def load_statuses
-    cached_public_statuses_page
+    preloaded_public_statuses_page
   end
 
-  def cached_public_statuses_page
-    cache_collection(public_statuses, Status)
+  def preloaded_public_statuses_page
+    preload_collection(public_statuses, Status)
   end
 
   def public_statuses
diff --git a/app/controllers/api/v1/timelines/tag_controller.rb b/app/controllers/api/v1/timelines/tag_controller.rb
index 4ba439dbb202ce..3bf8f374e196f3 100644
--- a/app/controllers/api/v1/timelines/tag_controller.rb
+++ b/app/controllers/api/v1/timelines/tag_controller.rb
@@ -23,11 +23,11 @@ def load_tag
   end
 
   def load_statuses
-    cached_tagged_statuses
+    preloaded_tagged_statuses
   end
 
-  def cached_tagged_statuses
-    @tag.nil? ? [] : cache_collection(tag_timeline_statuses, Status)
+  def preloaded_tagged_statuses
+    @tag.nil? ? [] : preload_collection(tag_timeline_statuses, Status)
   end
 
   def tag_timeline_statuses
diff --git a/app/controllers/api/v1/trends/statuses_controller.rb b/app/controllers/api/v1/trends/statuses_controller.rb
index 48bfe119918b20..c6fbbce16778f8 100644
--- a/app/controllers/api/v1/trends/statuses_controller.rb
+++ b/app/controllers/api/v1/trends/statuses_controller.rb
@@ -20,7 +20,7 @@ def enabled?
 
   def set_statuses
     @statuses = if enabled?
-                  cache_collection(statuses_from_trends.offset(offset_param).limit(limit_param(DEFAULT_STATUSES_LIMIT)), Status)
+                  preload_collection(statuses_from_trends.offset(offset_param).limit(limit_param(DEFAULT_STATUSES_LIMIT)), Status)
                 else
                   []
                 end
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 8ba10d64c006f4..66e0f7e3051d56 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -9,6 +9,7 @@ class ApplicationController < ActionController::Base
   include UserTrackingConcern
   include SessionTrackingConcern
   include CacheConcern
+  include PreloadingConcern
   include DomainControlHelper
   include DatabaseHelper
   include AuthorizedFetchHelper
diff --git a/app/controllers/concerns/cache_concern.rb b/app/controllers/concerns/cache_concern.rb
index 4656539f85ee23..1823b5b8edacf9 100644
--- a/app/controllers/concerns/cache_concern.rb
+++ b/app/controllers/concerns/cache_concern.rb
@@ -45,20 +45,4 @@ def render_with_cache(**options)
       Rails.cache.write(key, response.body, expires_in: expires_in, raw: true)
     end
   end
-
-  # TODO: Rename this method, as it does not perform any caching anymore.
-  def cache_collection(raw, klass)
-    return raw unless klass.respond_to?(:preload_cacheable_associations)
-
-    records = raw.to_a
-
-    klass.preload_cacheable_associations(records)
-
-    records
-  end
-
-  # TODO: Rename this method, as it does not perform any caching anymore.
-  def cache_collection_paginated_by_id(raw, klass, limit, options)
-    cache_collection raw.to_a_paginated_by_id(limit, options), klass
-  end
 end
diff --git a/app/controllers/concerns/preloading_concern.rb b/app/controllers/concerns/preloading_concern.rb
new file mode 100644
index 00000000000000..61e22136498048
--- /dev/null
+++ b/app/controllers/concerns/preloading_concern.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module PreloadingConcern
+  extend ActiveSupport::Concern
+
+  def preload_collection(scope, klass)
+    return scope unless klass.respond_to?(:preload_cacheable_associations)
+
+    scope.to_a.tap do |records|
+      klass.preload_cacheable_associations(records)
+    end
+  end
+
+  def preload_collection_paginated_by_id(scope, klass, limit, options)
+    preload_collection scope.to_a_paginated_by_id(limit, options), klass
+  end
+end
diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
index b0bdbde95662b8..d6c0d872c8bfcd 100644
--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@@ -45,7 +45,7 @@ def set_local
   end
 
   def set_statuses
-    @statuses = cache_collection(TagFeed.new(@tag, nil, local: @local).get(limit_param), Status)
+    @statuses = preload_collection(TagFeed.new(@tag, nil, local: @local).get(limit_param), Status)
   end
 
   def limit_param
diff --git a/spec/controllers/concerns/cache_concern_spec.rb b/spec/controllers/concerns/preloading_concern_spec.rb
similarity index 79%
rename from spec/controllers/concerns/cache_concern_spec.rb
rename to spec/controllers/concerns/preloading_concern_spec.rb
index fffd2b266e1fa9..795afbc45e2e4f 100644
--- a/spec/controllers/concerns/cache_concern_spec.rb
+++ b/spec/controllers/concerns/preloading_concern_spec.rb
@@ -2,20 +2,20 @@
 
 require 'rails_helper'
 
-RSpec.describe CacheConcern do
+RSpec.describe PreloadingConcern do
   controller(ApplicationController) do
-    include CacheConcern
+    include PreloadingConcern
 
     def empty_array
-      render plain: cache_collection([], Status).size
+      render plain: preload_collection([], Status).size
     end
 
     def empty_relation
-      render plain: cache_collection(Status.none, Status).size
+      render plain: preload_collection(Status.none, Status).size
     end
 
     def account_statuses_favourites
-      render plain: cache_collection(Status.where(account_id: params[:id]), Status).map(&:favourites_count)
+      render plain: preload_collection(Status.where(account_id: params[:id]), Status).map(&:favourites_count)
     end
   end
 
@@ -27,7 +27,7 @@ def account_statuses_favourites
     end
   end
 
-  describe '#cache_collection' do
+  describe '#preload_collection' do
     context 'when given an empty array' do
       it 'returns an empty array' do
         get :empty_array

From 283a891e9290fc9fdbfd082f3bde48863f1c6f45 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Thu, 16 May 2024 11:28:10 +0200
Subject: [PATCH 1033/2191] Allow to customise the OTEL service name prefix
 (#30322)

---
 config/initializers/opentelemetry.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/config/initializers/opentelemetry.rb b/config/initializers/opentelemetry.rb
index e50132d4617385..9af0ab89c8698a 100644
--- a/config/initializers/opentelemetry.rb
+++ b/config/initializers/opentelemetry.rb
@@ -53,10 +53,12 @@
       },
     })
 
+    prefix = ENV.fetch('OTEL_SERVICE_NAME_PREFIX', 'mastodon')
+
     c.service_name =  case $PROGRAM_NAME
-                      when /puma/ then 'mastodon/web'
+                      when /puma/ then "#{prefix}/web"
                       else
-                        "mastodon/#{$PROGRAM_NAME.split('/').last}"
+                        "#{prefix}/#{$PROGRAM_NAME.split('/').last}"
                       end
     c.service_version = Mastodon::Version.to_s
   end

From 1b6eb2c7f0425a20f9bd823419138bf8adfa18f4 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 16 May 2024 05:56:48 -0400
Subject: [PATCH 1034/2191] Enable YJIT when available (#30310)

---
 config/initializers/enable_yjit.rb | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 config/initializers/enable_yjit.rb

diff --git a/config/initializers/enable_yjit.rb b/config/initializers/enable_yjit.rb
new file mode 100644
index 00000000000000..7b1053ec114b7d
--- /dev/null
+++ b/config/initializers/enable_yjit.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+# Automatically enable YJIT as of Ruby 3.3, as it brings very
+# sizeable performance improvements.
+
+# If you are deploying to a memory constrained environment
+# you may want to delete this file, but otherwise it's free
+# performance.
+if defined?(RubyVM::YJIT.enable)
+  Rails.application.config.after_initialize do
+    RubyVM::YJIT.enable
+  end
+end

From 66906a1bc1fb3934dc101e1d8d7ec4a9ce54a12e Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 16 May 2024 15:01:01 +0200
Subject: [PATCH 1035/2191] Fix Web UI trying to save user settings when logged
 out (#30324)

---
 app/javascript/mastodon/actions/settings.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/actions/settings.js b/app/javascript/mastodon/actions/settings.js
index 3685b0684e0b83..fbd89f9d4b0b52 100644
--- a/app/javascript/mastodon/actions/settings.js
+++ b/app/javascript/mastodon/actions/settings.js
@@ -20,7 +20,7 @@ export function changeSetting(path, value) {
 }
 
 const debouncedSave = debounce((dispatch, getState) => {
-  if (getState().getIn(['settings', 'saved'])) {
+  if (getState().getIn(['settings', 'saved']) || !getState().getIn(['meta', 'me'])) {
     return;
   }
 

From b2388be71eb0031ef9e47c492b1c038231cd8bc0 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 16 May 2024 15:45:17 +0200
Subject: [PATCH 1036/2191] chore(deps): update dependency selenium-webdriver
 to v4.21.0 (#30325)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index a20ac79aea6b6b..6001c73db498e0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -693,7 +693,8 @@ GEM
     responders (3.1.1)
       actionpack (>= 5.2)
       railties (>= 5.2)
-    rexml (3.2.6)
+    rexml (3.2.8)
+      strscan (>= 3.0.9)
     rotp (6.3.0)
     rouge (4.2.1)
     rpam2 (4.0.2)
@@ -774,7 +775,7 @@ GEM
     scenic (1.8.0)
       activerecord (>= 4.0.0)
       railties (>= 4.0.0)
-    selenium-webdriver (4.20.1)
+    selenium-webdriver (4.21.0)
       base64 (~> 0.2)
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 3.0)
@@ -815,6 +816,7 @@ GEM
     stringio (3.1.0)
     strong_migrations (1.8.0)
       activerecord (>= 5.2)
+    strscan (3.1.0)
     swd (1.3.0)
       activesupport (>= 3)
       attr_required (>= 0.0.5)

From 061464a563eb05538adaa992a02a8d17d99af099 Mon Sep 17 00:00:00 2001
From: David Lapshin <ddaudix@gmail.com>
Date: Thu, 16 May 2024 10:33:29 +0300
Subject: [PATCH 1037/2191] [Glitch] Fix incorrect element selector from #30221

Port 94493cff925ee9b9cb4ebc7cc20081ab20521b85 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/styles/components.scss | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index 6e06898d84fe30..9f102b847efbb7 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -4602,10 +4602,6 @@ a.status-card {
     outline: $ui-button-focus-outline;
   }
 
-  .no-reduce-motion .icon {
-    transition: transform 0.15s ease-in-out;
-  }
-
   &.active {
     color: $primary-text-color;
 
@@ -4663,6 +4659,10 @@ a.status-card {
   padding: 0;
 }
 
+.no-reduce-motion .column-header__button .icon {
+  transition: transform 150ms ease-in-out;
+}
+
 .column-header__collapsible {
   max-height: 70vh;
   overflow: hidden;

From 7b078b46a2951f9c8548c26528a46abc4e5e6f3c Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 16 May 2024 15:01:01 +0200
Subject: [PATCH 1038/2191] [Glitch] Fix Web UI trying to save user settings
 when logged out

Port 66906a1bc1fb3934dc101e1d8d7ec4a9ce54a12e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/actions/settings.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/flavours/glitch/actions/settings.js b/app/javascript/flavours/glitch/actions/settings.js
index 3685b0684e0b83..fbd89f9d4b0b52 100644
--- a/app/javascript/flavours/glitch/actions/settings.js
+++ b/app/javascript/flavours/glitch/actions/settings.js
@@ -20,7 +20,7 @@ export function changeSetting(path, value) {
 }
 
 const debouncedSave = debounce((dispatch, getState) => {
-  if (getState().getIn(['settings', 'saved'])) {
+  if (getState().getIn(['settings', 'saved']) || !getState().getIn(['meta', 'me'])) {
     return;
   }
 

From 226d7a7badf0d03f2c2a57fd4da72889a3563d28 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 17 May 2024 10:27:03 +0200
Subject: [PATCH 1039/2191] fix(deps): update dependency sass to v1.77.2
 (#30338)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 07c89a5298081f..db706f04a7bab6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -15316,15 +15316,15 @@ __metadata:
   linkType: hard
 
 "sass@npm:^1.62.1":
-  version: 1.77.1
-  resolution: "sass@npm:1.77.1"
+  version: 1.77.2
+  resolution: "sass@npm:1.77.2"
   dependencies:
     chokidar: "npm:>=3.0.0 <4.0.0"
     immutable: "npm:^4.0.0"
     source-map-js: "npm:>=0.6.2 <2.0.0"
   bin:
     sass: sass.js
-  checksum: 10c0/edcfc7d038234b1198c3ddcac5963fcd1e17a9c1ee0f9bd09784ab5353b60ff50b189b4c9154b34f5da9ca0eaab8b189fd3e83a4b43a494151ad4735f8e5f364
+  checksum: 10c0/0d292339064de3c902e209d41de9c4eb2038cff326476aeebbb5be3eee1d23400d975face2b8e124ae617b10af3e93bec01580f61912f34e4c517fe137a118b6
   languageName: node
   linkType: hard
 

From f7f5b9dadd9e2cee98bf8a7d41193844a37c662b Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 17 May 2024 08:27:45 +0000
Subject: [PATCH 1040/2191] fix(deps): update dependency @rails/ujs to v7.1.3-3
 (#30337)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 package.json |  2 +-
 yarn.lock    | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 79544229df956c..773f19c50d8b9b 100644
--- a/package.json
+++ b/package.json
@@ -45,7 +45,7 @@
     "@formatjs/intl-pluralrules": "^5.2.2",
     "@gamestdio/websocket": "^0.3.2",
     "@github/webauthn-json": "^2.1.1",
-    "@rails/ujs": "7.1.3-2",
+    "@rails/ujs": "7.1.3-3",
     "@reduxjs/toolkit": "^2.0.1",
     "@svgr/webpack": "^5.5.0",
     "arrow-key-navigation": "^1.2.0",
diff --git a/yarn.lock b/yarn.lock
index db706f04a7bab6..efe8cc02648ab7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2758,7 +2758,7 @@ __metadata:
     "@formatjs/intl-pluralrules": "npm:^5.2.2"
     "@gamestdio/websocket": "npm:^0.3.2"
     "@github/webauthn-json": "npm:^2.1.1"
-    "@rails/ujs": "npm:7.1.3-2"
+    "@rails/ujs": "npm:7.1.3-3"
     "@reduxjs/toolkit": "npm:^2.0.1"
     "@svgr/webpack": "npm:^5.5.0"
     "@testing-library/jest-dom": "npm:^6.0.0"
@@ -3042,10 +3042,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rails/ujs@npm:7.1.3-2":
-  version: 7.1.3-2
-  resolution: "@rails/ujs@npm:7.1.3-2"
-  checksum: 10c0/8bd5b3a409c62f53790ed7e914f1f48235f461a472da7b4ce1d9ad57356fcdeaa7891c946298f7f620ff0ff7c6d5b995bf44057929c4fce796867a8cf4f27c99
+"@rails/ujs@npm:7.1.3-3":
+  version: 7.1.3-3
+  resolution: "@rails/ujs@npm:7.1.3-3"
+  checksum: 10c0/9eee95372b72d8f704b67f14a3bf9f2681ab5b11c7b79919bfde3341f2970771876af5b40de5b3e4fca6a97c76a41046eff71d96490617c1fc80ef3ad8bbac47
   languageName: node
   linkType: hard
 

From 3286ad5226ca220a40f12353df2237c4f822af1d Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 17 May 2024 10:28:01 +0200
Subject: [PATCH 1041/2191] chore(deps): update dependency selenium-webdriver
 to v4.21.1 (#30335)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 6001c73db498e0..2f466555490848 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -775,7 +775,7 @@ GEM
     scenic (1.8.0)
       activerecord (>= 4.0.0)
       railties (>= 4.0.0)
-    selenium-webdriver (4.21.0)
+    selenium-webdriver (4.21.1)
       base64 (~> 0.2)
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 3.0)

From fc166d07f0b5472866e1e13a0c12d78a0c7bbcfb Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 17 May 2024 10:28:22 +0200
Subject: [PATCH 1042/2191] chore(deps): update dependency rails to v7.1.3.3
 (#30334)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 108 +++++++++++++++++++++++++--------------------------
 1 file changed, 54 insertions(+), 54 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 2f466555490848..eade99acfdffb8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -10,35 +10,35 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.1.3.2)
-      actionpack (= 7.1.3.2)
-      activesupport (= 7.1.3.2)
+    actioncable (7.1.3.3)
+      actionpack (= 7.1.3.3)
+      activesupport (= 7.1.3.3)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    actionmailbox (7.1.3.2)
-      actionpack (= 7.1.3.2)
-      activejob (= 7.1.3.2)
-      activerecord (= 7.1.3.2)
-      activestorage (= 7.1.3.2)
-      activesupport (= 7.1.3.2)
+    actionmailbox (7.1.3.3)
+      actionpack (= 7.1.3.3)
+      activejob (= 7.1.3.3)
+      activerecord (= 7.1.3.3)
+      activestorage (= 7.1.3.3)
+      activesupport (= 7.1.3.3)
       mail (>= 2.7.1)
       net-imap
       net-pop
       net-smtp
-    actionmailer (7.1.3.2)
-      actionpack (= 7.1.3.2)
-      actionview (= 7.1.3.2)
-      activejob (= 7.1.3.2)
-      activesupport (= 7.1.3.2)
+    actionmailer (7.1.3.3)
+      actionpack (= 7.1.3.3)
+      actionview (= 7.1.3.3)
+      activejob (= 7.1.3.3)
+      activesupport (= 7.1.3.3)
       mail (~> 2.5, >= 2.5.4)
       net-imap
       net-pop
       net-smtp
       rails-dom-testing (~> 2.2)
-    actionpack (7.1.3.2)
-      actionview (= 7.1.3.2)
-      activesupport (= 7.1.3.2)
+    actionpack (7.1.3.3)
+      actionview (= 7.1.3.3)
+      activesupport (= 7.1.3.3)
       nokogiri (>= 1.8.5)
       racc
       rack (>= 2.2.4)
@@ -46,15 +46,15 @@ GEM
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    actiontext (7.1.3.2)
-      actionpack (= 7.1.3.2)
-      activerecord (= 7.1.3.2)
-      activestorage (= 7.1.3.2)
-      activesupport (= 7.1.3.2)
+    actiontext (7.1.3.3)
+      actionpack (= 7.1.3.3)
+      activerecord (= 7.1.3.3)
+      activestorage (= 7.1.3.3)
+      activesupport (= 7.1.3.3)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.1.3.2)
-      activesupport (= 7.1.3.2)
+    actionview (7.1.3.3)
+      activesupport (= 7.1.3.3)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
@@ -64,22 +64,22 @@ GEM
       activemodel (>= 4.1)
       case_transform (>= 0.2)
       jsonapi-renderer (>= 0.1.1.beta1, < 0.3)
-    activejob (7.1.3.2)
-      activesupport (= 7.1.3.2)
+    activejob (7.1.3.3)
+      activesupport (= 7.1.3.3)
       globalid (>= 0.3.6)
-    activemodel (7.1.3.2)
-      activesupport (= 7.1.3.2)
-    activerecord (7.1.3.2)
-      activemodel (= 7.1.3.2)
-      activesupport (= 7.1.3.2)
+    activemodel (7.1.3.3)
+      activesupport (= 7.1.3.3)
+    activerecord (7.1.3.3)
+      activemodel (= 7.1.3.3)
+      activesupport (= 7.1.3.3)
       timeout (>= 0.4.0)
-    activestorage (7.1.3.2)
-      actionpack (= 7.1.3.2)
-      activejob (= 7.1.3.2)
-      activerecord (= 7.1.3.2)
-      activesupport (= 7.1.3.2)
+    activestorage (7.1.3.3)
+      actionpack (= 7.1.3.3)
+      activejob (= 7.1.3.3)
+      activerecord (= 7.1.3.3)
+      activesupport (= 7.1.3.3)
       marcel (~> 1.0)
-    activesupport (7.1.3.2)
+    activesupport (7.1.3.3)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -444,7 +444,7 @@ GEM
       timeout
     net-smtp (0.5.0)
       net-protocol
-    nio4r (2.7.1)
+    nio4r (2.7.3)
     nokogiri (1.16.5)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
@@ -634,20 +634,20 @@ GEM
     rackup (1.0.0)
       rack (< 3)
       webrick
-    rails (7.1.3.2)
-      actioncable (= 7.1.3.2)
-      actionmailbox (= 7.1.3.2)
-      actionmailer (= 7.1.3.2)
-      actionpack (= 7.1.3.2)
-      actiontext (= 7.1.3.2)
-      actionview (= 7.1.3.2)
-      activejob (= 7.1.3.2)
-      activemodel (= 7.1.3.2)
-      activerecord (= 7.1.3.2)
-      activestorage (= 7.1.3.2)
-      activesupport (= 7.1.3.2)
+    rails (7.1.3.3)
+      actioncable (= 7.1.3.3)
+      actionmailbox (= 7.1.3.3)
+      actionmailer (= 7.1.3.3)
+      actionpack (= 7.1.3.3)
+      actiontext (= 7.1.3.3)
+      actionview (= 7.1.3.3)
+      activejob (= 7.1.3.3)
+      activemodel (= 7.1.3.3)
+      activerecord (= 7.1.3.3)
+      activestorage (= 7.1.3.3)
+      activesupport (= 7.1.3.3)
       bundler (>= 1.15.0)
-      railties (= 7.1.3.2)
+      railties (= 7.1.3.3)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
       actionview (>= 5.0.1.rc1)
@@ -662,9 +662,9 @@ GEM
     rails-i18n (7.0.9)
       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 8)
-    railties (7.1.3.2)
-      actionpack (= 7.1.3.2)
-      activesupport (= 7.1.3.2)
+    railties (7.1.3.3)
+      actionpack (= 7.1.3.3)
+      activesupport (= 7.1.3.3)
       irb
       rackup (>= 1.0.0)
       rake (>= 12.2)

From a6d12299f22e0318f0bea8b4a0192e6c07398b70 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 17 May 2024 04:29:13 -0400
Subject: [PATCH 1043/2191] Remove duplicate method def
 `ApplicationHelper#instance_presenter` (#30331)

---
 app/helpers/application_helper.rb |  4 ++++
 app/helpers/mascot_helper.rb      | 11 -----------
 app/mailers/user_mailer.rb        |  1 -
 3 files changed, 4 insertions(+), 12 deletions(-)
 delete mode 100644 app/helpers/mascot_helper.rb

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index eb03f1e4ba2ced..7563ae6105f894 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -240,6 +240,10 @@ def prerender_custom_emojis(html, custom_emojis, other_options = {})
     EmojiFormatter.new(html, custom_emojis, other_options.merge(animate: prefers_autoplay?)).to_s
   end
 
+  def mascot_url
+    full_asset_url(instance_presenter.mascot&.file&.url || frontend_asset_path('images/elephant_ui_plane.svg'))
+  end
+
   def instance_presenter
     @instance_presenter ||= InstancePresenter.new
   end
diff --git a/app/helpers/mascot_helper.rb b/app/helpers/mascot_helper.rb
deleted file mode 100644
index 34b656411ebce3..00000000000000
--- a/app/helpers/mascot_helper.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-module MascotHelper
-  def mascot_url
-    full_asset_url(instance_presenter.mascot&.file&.url || frontend_asset_path('images/elephant_ui_plane.svg'))
-  end
-
-  def instance_presenter
-    @instance_presenter ||= InstancePresenter.new
-  end
-end
diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb
index f8c1c9a8d0048b..81a2c0c6d04bbc 100644
--- a/app/mailers/user_mailer.rb
+++ b/app/mailers/user_mailer.rb
@@ -5,7 +5,6 @@ class UserMailer < Devise::Mailer
 
   helper :accounts
   helper :application
-  helper :mascot
   helper :formatting
   helper :instance
   helper :routing

From bff7769f5f9a4f3995038ad759c1b48a636d303b Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 17 May 2024 10:41:35 +0200
Subject: [PATCH 1044/2191] New Crowdin Translations (automated) (#30336)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 config/locales/simple_form.fi.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/config/locales/simple_form.fi.yml b/config/locales/simple_form.fi.yml
index 4971e250222077..2f7010bacf172e 100644
--- a/config/locales/simple_form.fi.yml
+++ b/config/locales/simple_form.fi.yml
@@ -81,9 +81,11 @@ fi:
         backups_retention_period: Käyttäjillä on mahdollisuus arkistoida julkaisujaan myöhemmin ladattaviksi. Kun tämä on asetettu positiiviseksi arvoksi, nämä arkistot poistetaan automaattisesti asetetun päivien määrän jälkeen.
         bootstrap_timeline_accounts: Nämä tilit kiinnitetään uusien käyttäjien seuraamissuosituslistojen alkuun.
         closed_registrations_message: Näkyy, kun rekisteröityminen on suljettu
+        content_cache_retention_period: Kaikki muiden palvelimien viestit (mukaan lukien tehostukset ja vastaukset) poistetaan määritetyn päivien lukumäärän jälkeen, ottamatta huomioon paikallisen käyttäjän vuorovaikutusta kyseisten viestien kanssa. Sisältää viestit, jossa paikallinen käyttäjä on merkinnyt kirjanmerkiksi tai suosikeiksi. Myös yksityiset maininnat eri käyttäjien välillä menetetään, eikä niitä voi palauttaa. Tämän asetuksen käyttö on tarkoitettu erityisiin tapauksiin ja se rikkoo monia käyttäjien odotuksia, kun se toteutetaan yleistarkoituksiin.
         custom_css: Voit käyttää mukautettuja tyylejä Mastodonin verkkoversiossa.
         favicon: WEBP, PNG, GIF tai JPG. Korvaa oletusarvoisen Mastodonin suosikkikuvakkeen omalla kuvakkeella.
         mascot: Ohittaa kuvituksen edistyneessä selainkäyttöliittymässä.
+        media_cache_retention_period: Mediatiedostot käyttäjien tekemistä viesteistä ovat välimuistissa palvelimellasi. Kun arvo on positiivinen, media poistetaan määritetyn ajan jälkeen. Jos mediaa pyydetään sen poistamisen jälkeen, ne ladataan uudelleen, jos lähdesisältö on vielä saatavilla. Koska linkkien katselun kyselyitä kolmansien osapuolien sivustoille on rajoitettu, on suositeltavaa asettaa tämä arvo vähintään 14 päivään tai linkkien kortteja ei päivitetä pyynnöstä ennen tätä aikaa.
         peers_api_enabled: Luettelo verkkotunnuksista, jotka tämä palvelin on kohdannut fediversumissa. Se ei kerro, oletko liitossa tietyn palvelimen kanssa, vaan että palvelimesi on ylipäätään tietoinen siitä. Tätä tietoa käytetään palveluissa, jotka keräävät tilastoja federoinnista yleisellä tasolla.
         profile_directory: Profiilihakemisto lueteloi kaikki käyttäjät, jotka ovat ilmoittaneet olevansa löydettävissä.
         require_invite_text: Kun rekisteröityminen vaatii manuaalisen hyväksynnän, tee ”Miksi haluat liittyä?” -tekstikentästä pakollinen vapaaehtoisen sijaan

From a627219b25f1787cbee0174e37e36e440489eb66 Mon Sep 17 00:00:00 2001
From: Jeong Arm <kjwonmail@gmail.com>
Date: Fri, 17 May 2024 18:18:54 +0900
Subject: [PATCH 1045/2191] Fix moderation action logs (#30342)

---
 app/models/admin/action_log_filter.rb | 1 +
 config/locales/en.yml                 | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/models/admin/action_log_filter.rb b/app/models/admin/action_log_filter.rb
index f581af74e8bf8c..fc984b2445bcdc 100644
--- a/app/models/admin/action_log_filter.rb
+++ b/app/models/admin/action_log_filter.rb
@@ -59,6 +59,7 @@ class Admin::ActionLogFilter
     unsuspend_account: { target_type: 'Account', action: 'unsuspend' }.freeze,
     update_announcement: { target_type: 'Announcement', action: 'update' }.freeze,
     update_custom_emoji: { target_type: 'CustomEmoji', action: 'update' }.freeze,
+    update_report: { target_type: 'Report', action: 'update' }.freeze,
     update_status: { target_type: 'Status', action: 'update' }.freeze,
     update_user_role: { target_type: 'UserRole', action: 'update' }.freeze,
     update_ip_block: { target_type: 'IpBlock', action: 'update' }.freeze,
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 446d06f0d1f1d5..d3704bbbcf54cb 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -285,6 +285,7 @@ en:
         update_custom_emoji_html: "%{name} updated emoji %{target}"
         update_domain_block_html: "%{name} updated domain block for %{target}"
         update_ip_block_html: "%{name} changed rule for IP %{target}"
+        update_report_html: "%{name} updated report %{target}"
         update_status_html: "%{name} updated post by %{target}"
         update_user_role_html: "%{name} changed %{target} role"
       deleted_account: deleted account

From 12472e7f407c42bcff6ee204b9f1887b5824734f Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 17 May 2024 11:28:40 +0200
Subject: [PATCH 1046/2191] Add emphasis on ActiveRecord Encryption
 configuration values being secret (#30340)

---
 .env.test                                       |  9 +++++----
 config/initializers/active_record_encryption.rb | 13 +++++++++++--
 lib/tasks/db.rake                               |  2 +-
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/.env.test b/.env.test
index 9e6abea5c9a058..d2763e582ae926 100644
--- a/.env.test
+++ b/.env.test
@@ -4,7 +4,8 @@ NODE_ENV=production
 LOCAL_DOMAIN=cb6e6126.ngrok.io
 LOCAL_HTTPS=true
 
-# Required by ActiveRecord encryption feature
-ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=fkSxKD2bF396kdQbrP1EJ7WbU7ZgNokR
-ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=r0hvVmzBVsjxC7AMlwhOzmtc36ZCOS1E
-ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY=PhdFyyfy5xJ7WVd2lWBpcPScRQHzRTNr
+# Secret values required by ActiveRecord encryption feature
+# Use `bin/rails db:encryption:init` to generate fresh secrets
+ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=test_determinist_key_DO_NOT_USE_IN_PRODUCTION
+ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=test_salt_DO_NOT_USE_IN_PRODUCTION
+ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY=test_primary_key_DO_NOT_USE_IN_PRODUCTION
diff --git a/config/initializers/active_record_encryption.rb b/config/initializers/active_record_encryption.rb
index 7cda8c621c2b69..777bafc2730d05 100644
--- a/config/initializers/active_record_encryption.rb
+++ b/config/initializers/active_record_encryption.rb
@@ -5,7 +5,7 @@
   ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT
   ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY
 ).each do |key|
-  ENV.fetch(key) do
+  value = ENV.fetch(key) do
     abort <<~MESSAGE
 
       Mastodon now requires that these variables are set:
@@ -14,9 +14,18 @@
         - ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT
         - ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY
 
-      Run `bin/rails db:encryption:init` to generate values and then assign the environment variables.
+      Run `bin/rails db:encryption:init` to generate new secrets and then assign the environment variables.
     MESSAGE
   end
+
+  next unless Rails.env.production? && value.end_with?('DO_NOT_USE_IN_PRODUCTION')
+
+  abort <<~MESSAGE
+
+    It looks like you are trying to run Mastodon in production with a #{key} value from the test environment.
+
+    Please generate fresh secrets using `bin/rails db:encryption:init` and use them instead.
+  MESSAGE
 end
 
 Rails.application.configure do
diff --git a/lib/tasks/db.rake b/lib/tasks/db.rake
index d6377c9c82c347..d8bc927bc495ba 100644
--- a/lib/tasks/db.rake
+++ b/lib/tasks/db.rake
@@ -8,7 +8,7 @@ namespace :db do
     desc 'Generate a set of keys for configuring Active Record encryption in a given environment'
     task :init do # rubocop:disable Rails/RakeEnvironment
       puts <<~MSG
-        Add these environment variables to your Mastodon environment:#{' '}
+        Add these secret environment variables to your Mastodon environment (e.g. .env.production):#{' '}
 
         ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=#{SecureRandom.alphanumeric(32)}
         ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=#{SecureRandom.alphanumeric(32)}

From 16a89487fddbd147154cd222e8eeb6e740ed4e2d Mon Sep 17 00:00:00 2001
From: Jeremy Kescher <jeremy@kescher.at>
Date: Fri, 17 May 2024 15:35:29 +0200
Subject: [PATCH 1047/2191] Bump version to v4.3.0-alpha.3+glitch+cat+1.2.2

---
 CHANGELOG.md            | 4 ++++
 lib/mastodon/version.rb | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0c8416164844d3..fa2c9b074ce704 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All changes to Catstodon that aren't Mastodon or glitch-soc Mastodon changes will be documented here.
 
+## [v4.3.0-alpha.3+glitch+cat+1.2.2] - 2024-05-17
+
+- Glitch-soc changes :3
+
 ## [v4.3.0-alpha.3+glitch+cat+1.2.1] - 2024-05-14
 
 - Glitch-soc changes :3
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index 8b4c0872b2222d..f9c1c66f19fa78 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -25,7 +25,7 @@ def prerelease
     end
 
     def catstodon_revision
-      '1.2.1'
+      '1.2.2'
     end
 
     def build_metadata

From b708c968dcce3e094a59887ddd0b58ea700eb3f4 Mon Sep 17 00:00:00 2001
From: Jeremy Kescher <jeremy@kescher.at>
Date: Fri, 17 May 2024 15:41:34 +0200
Subject: [PATCH 1048/2191] Clarify that YJIT is now a thing

---
 CHANGELOG.md | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fa2c9b074ce704..7f839874d4d70a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,9 @@ All changes to Catstodon that aren't Mastodon or glitch-soc Mastodon changes wil
 
 ## [v4.3.0-alpha.3+glitch+cat+1.2.2] - 2024-05-17
 
-- Glitch-soc changes :3
+- Upstream changes :3
+  - Most notably, YJIT is now enabled by default (simply remove `config/initializers/enable_yjit.rb` if you want a lower
+    memory footprint in exchange for worse performance)
 
 ## [v4.3.0-alpha.3+glitch+cat+1.2.1] - 2024-05-14
 
@@ -20,7 +22,8 @@ All changes to Catstodon that aren't Mastodon or glitch-soc Mastodon changes wil
   - ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT
   - ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY
 
-  After `bundle install`, run `bin/rails db:encryption:init` to generate values and then assign the environment variable, for example in your `.env.production`.
+  After `bundle install`, run `bin/rails db:encryption:init` to generate values and then assign the environment
+  variable, for example in your `.env.production`.
 
 ## [v4.3.0-alpha.3+glitch+cat+1.1.3] - 2024-04-26
 

From 2da2a1dae984f4083d1cc2f55642811c696955e6 Mon Sep 17 00:00:00 2001
From: Emelia Smith <ThisIsMissEm@users.noreply.github.com>
Date: Fri, 17 May 2024 15:46:12 +0200
Subject: [PATCH 1049/2191] Support multiple redirect_uris when creating OAuth
 2.0 Applications (#29192)

---
 .../api/v1/apps/credentials_controller.rb     |   2 +-
 app/controllers/api/v1/apps_controller.rb     |   4 +-
 app/lib/application_extension.rb              |   6 +
 .../rest/application_serializer.rb            |  14 +-
 .../rest/credential_application_serializer.rb |  13 ++
 spec/requests/api/v1/apps/credentials_spec.rb |  23 ++-
 spec/requests/api/v1/apps_spec.rb             | 164 +++++++++++++++++-
 7 files changed, 201 insertions(+), 25 deletions(-)
 create mode 100644 app/serializers/rest/credential_application_serializer.rb

diff --git a/app/controllers/api/v1/apps/credentials_controller.rb b/app/controllers/api/v1/apps/credentials_controller.rb
index 6256bed64cf831..29ab9203835840 100644
--- a/app/controllers/api/v1/apps/credentials_controller.rb
+++ b/app/controllers/api/v1/apps/credentials_controller.rb
@@ -4,6 +4,6 @@ class Api::V1::Apps::CredentialsController < Api::BaseController
   def show
     return doorkeeper_render_error unless valid_doorkeeper_token?
 
-    render json: doorkeeper_token.application, serializer: REST::ApplicationSerializer, fields: %i(name website vapid_key client_id scopes)
+    render json: doorkeeper_token.application, serializer: REST::ApplicationSerializer
   end
 end
diff --git a/app/controllers/api/v1/apps_controller.rb b/app/controllers/api/v1/apps_controller.rb
index 97177547a2b9ae..50feaf185470fa 100644
--- a/app/controllers/api/v1/apps_controller.rb
+++ b/app/controllers/api/v1/apps_controller.rb
@@ -5,7 +5,7 @@ class Api::V1::AppsController < Api::BaseController
 
   def create
     @app = Doorkeeper::Application.create!(application_options)
-    render json: @app, serializer: REST::ApplicationSerializer
+    render json: @app, serializer: REST::CredentialApplicationSerializer
   end
 
   private
@@ -24,6 +24,6 @@ def app_scopes_or_default
   end
 
   def app_params
-    params.permit(:client_name, :redirect_uris, :scopes, :website)
+    params.permit(:client_name, :scopes, :website, :redirect_uris, redirect_uris: [])
   end
 end
diff --git a/app/lib/application_extension.rb b/app/lib/application_extension.rb
index 400c51a023d09b..2fea1057cb6db3 100644
--- a/app/lib/application_extension.rb
+++ b/app/lib/application_extension.rb
@@ -23,6 +23,12 @@ def confirmation_redirect_uri
     redirect_uri.lines.first.strip
   end
 
+  def redirect_uris
+    # Doorkeeper stores the redirect_uri value as a newline delimeted list in
+    # the database:
+    redirect_uri.split
+  end
+
   def push_to_streaming_api
     # TODO: #28793 Combine into a single topic
     payload = Oj.dump(event: :kill)
diff --git a/app/serializers/rest/application_serializer.rb b/app/serializers/rest/application_serializer.rb
index 635508a17cbe64..1a7b9265f192f2 100644
--- a/app/serializers/rest/application_serializer.rb
+++ b/app/serializers/rest/application_serializer.rb
@@ -1,24 +1,18 @@
 # frozen_string_literal: true
 
 class REST::ApplicationSerializer < ActiveModel::Serializer
-  attributes :id, :name, :website, :scopes, :redirect_uri,
-             :client_id, :client_secret
+  attributes :id, :name, :website, :scopes, :redirect_uris
 
   # NOTE: Deprecated in 4.3.0, needs to be removed in 5.0.0
   attribute :vapid_key
 
+  # We should consider this property deprecated for 4.3.0
+  attribute :redirect_uri
+
   def id
     object.id.to_s
   end
 
-  def client_id
-    object.uid
-  end
-
-  def client_secret
-    object.secret
-  end
-
   def website
     object.website.presence
   end
diff --git a/app/serializers/rest/credential_application_serializer.rb b/app/serializers/rest/credential_application_serializer.rb
new file mode 100644
index 00000000000000..bfec7d03e80afa
--- /dev/null
+++ b/app/serializers/rest/credential_application_serializer.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class REST::CredentialApplicationSerializer < REST::ApplicationSerializer
+  attributes :client_id, :client_secret
+
+  def client_id
+    object.uid
+  end
+
+  def client_secret
+    object.secret
+  end
+end
diff --git a/spec/requests/api/v1/apps/credentials_spec.rb b/spec/requests/api/v1/apps/credentials_spec.rb
index e1455fe799a068..6e6970ce53f03d 100644
--- a/spec/requests/api/v1/apps/credentials_spec.rb
+++ b/spec/requests/api/v1/apps/credentials_spec.rb
@@ -20,14 +20,26 @@
 
         expect(body_as_json).to match(
           a_hash_including(
+            id: token.application.id.to_s,
             name: token.application.name,
             website: token.application.website,
-            vapid_key: Rails.configuration.x.vapid_public_key,
             scopes: token.application.scopes.map(&:to_s),
-            client_id: token.application.uid
+            redirect_uris: token.application.redirect_uris,
+            # Deprecated properties as of 4.3:
+            redirect_uri: token.application.redirect_uri.split.first,
+            vapid_key: Rails.configuration.x.vapid_public_key
           )
         )
       end
+
+      it 'does not expose the client_id or client_secret' do
+        subject
+
+        expect(response).to have_http_status(200)
+
+        expect(body_as_json[:client_id]).to_not be_present
+        expect(body_as_json[:client_secret]).to_not be_present
+      end
     end
 
     context 'with a non-read scoped oauth token' do
@@ -46,11 +58,14 @@
 
         expect(body_as_json).to match(
           a_hash_including(
+            id: token.application.id.to_s,
             name: token.application.name,
             website: token.application.website,
-            vapid_key: Rails.configuration.x.vapid_public_key,
             scopes: token.application.scopes.map(&:to_s),
-            client_id: token.application.uid
+            redirect_uris: token.application.redirect_uris,
+            # Deprecated properties as of 4.3:
+            redirect_uri: token.application.redirect_uri.split.first,
+            vapid_key: Rails.configuration.x.vapid_public_key
           )
         )
       end
diff --git a/spec/requests/api/v1/apps_spec.rb b/spec/requests/api/v1/apps_spec.rb
index acabbc93f0bbd3..1f01bddf3caed2 100644
--- a/spec/requests/api/v1/apps_spec.rb
+++ b/spec/requests/api/v1/apps_spec.rb
@@ -9,8 +9,9 @@
     end
 
     let(:client_name)   { 'Test app' }
-    let(:scopes)        { nil }
-    let(:redirect_uris) { 'urn:ietf:wg:oauth:2.0:oob' }
+    let(:scopes)        { 'read write' }
+    let(:redirect_uri)  { 'urn:ietf:wg:oauth:2.0:oob' }
+    let(:redirect_uris) { [redirect_uri] }
     let(:website)       { nil }
 
     let(:params) do
@@ -26,13 +27,63 @@
       it 'creates an OAuth app', :aggregate_failures do
         subject
 
+        expect(response).to have_http_status(200)
+
+        app = Doorkeeper::Application.find_by(name: client_name)
+
+        expect(app).to be_present
+        expect(app.scopes.to_s).to eq scopes
+        expect(app.redirect_uris).to eq redirect_uris
+
+        expect(body_as_json).to match(
+          a_hash_including(
+            id: app.id.to_s,
+            client_id: app.uid,
+            client_secret: app.secret,
+            name: client_name,
+            website: website,
+            scopes: ['read', 'write'],
+            redirect_uris: redirect_uris,
+            # Deprecated properties as of 4.3:
+            redirect_uri: redirect_uri,
+            vapid_key: Rails.configuration.x.vapid_public_key
+          )
+        )
+      end
+    end
+
+    context 'without scopes being supplied' do
+      let(:scopes) { nil }
+
+      it 'creates an OAuth App with the default scope' do
+        subject
+
         expect(response).to have_http_status(200)
         expect(Doorkeeper::Application.find_by(name: client_name)).to be_present
 
         body = body_as_json
 
-        expect(body[:client_id]).to be_present
-        expect(body[:client_secret]).to be_present
+        expect(body[:scopes]).to eq Doorkeeper.config.default_scopes.to_a
+      end
+    end
+
+    # FIXME: This is a bug: https://github.com/mastodon/mastodon/issues/30152
+    context 'with scopes as an array' do
+      let(:scopes) { %w(read write follow) }
+
+      it 'creates an OAuth App with the default scope' do
+        subject
+
+        expect(response).to have_http_status(200)
+
+        app = Doorkeeper::Application.find_by(name: client_name)
+
+        expect(app).to be_present
+        expect(app.scopes.to_s).to eq 'read'
+
+        body = body_as_json
+
+        expect(body[:scopes]).to eq ['read']
       end
     end
 
@@ -77,8 +128,8 @@
       end
     end
 
-    context 'with a too-long redirect_uris' do
-      let(:redirect_uris) { "https://foo.bar/#{'hoge' * 2_000}" }
+    context 'with a too-long redirect_uri' do
+      let(:redirect_uris) { "https://app.example/#{'hoge' * 2_000}" }
 
       it 'returns http unprocessable entity' do
         subject
@@ -87,8 +138,80 @@
       end
     end
 
-    context 'without required params' do
-      let(:client_name)   { '' }
+    # NOTE: This spec currently tests the same as the "with a too-long redirect_uri test case"
+    context 'with too many redirect_uris' do
+      let(:redirect_uris) { (0...500).map { |i| "https://app.example/#{i}/callback" } }
+
+      it 'returns http unprocessable entity' do
+        subject
+
+        expect(response).to have_http_status(422)
+      end
+    end
+
+    context 'with multiple redirect_uris as a string' do
+      let(:redirect_uris) { "https://redirect1.example/\napp://redirect2.example/" }
+
+      it 'creates an OAuth application with multiple redirect URIs' do
+        subject
+
+        expect(response).to have_http_status(200)
+
+        app = Doorkeeper::Application.find_by(name: client_name)
+
+        expect(app).to be_present
+        expect(app.redirect_uri).to eq redirect_uris
+        expect(app.redirect_uris).to eq redirect_uris.split
+
+        body = body_as_json
+
+        expect(body[:redirect_uri]).to eq redirect_uris
+        expect(body[:redirect_uris]).to eq redirect_uris.split
+      end
+    end
+
+    context 'with multiple redirect_uris as an array' do
+      let(:redirect_uris) { ['https://redirect1.example/', 'app://redirect2.example/'] }
+
+      it 'creates an OAuth application with multiple redirect URIs' do
+        subject
+
+        expect(response).to have_http_status(200)
+
+        app = Doorkeeper::Application.find_by(name: client_name)
+
+        expect(app).to be_present
+        expect(app.redirect_uri).to eq redirect_uris.join "\n"
+        expect(app.redirect_uris).to eq redirect_uris
+
+        body = body_as_json
+
+        expect(body[:redirect_uri]).to eq redirect_uris.join "\n"
+        expect(body[:redirect_uris]).to eq redirect_uris
+      end
+    end
+
+    context 'with an empty redirect_uris array' do
+      let(:redirect_uris) { [] }
+
+      it 'returns http unprocessable entity' do
+        subject
+
+        expect(response).to have_http_status(422)
+      end
+    end
+
+    context 'with just a newline as the redirect_uris string' do
+      let(:redirect_uris) { "\n" }
+
+      it 'returns http unprocessable entity' do
+        subject
+
+        expect(response).to have_http_status(422)
+      end
+    end
+
+    context 'with an empty redirect_uris string' do
       let(:redirect_uris) { '' }
 
       it 'returns http unprocessable entity' do
@@ -97,5 +220,30 @@
         expect(response).to have_http_status(422)
       end
     end
+
+    context 'without a required param' do
+      let(:client_name) { '' }
+
+      it 'returns http unprocessable entity' do
+        subject
+
+        expect(response).to have_http_status(422)
+      end
+    end
+
+    context 'with a website' do
+      let(:website) { 'https://app.example/' }
+
+      it 'creates an OAuth application with the website specified' do
+        subject
+
+        expect(response).to have_http_status(200)
+
+        app = Doorkeeper::Application.find_by(name: client_name)
+
+        expect(app).to be_present
+        expect(app.website).to eq website
+      end
+    end
   end
 end

From 6282b6da7753b0feaafd9d15e12bbc8dd6958c8f Mon Sep 17 00:00:00 2001
From: Joshua Byrd <phocks@gmail.com>
Date: Mon, 20 May 2024 02:30:05 +1000
Subject: [PATCH 1050/2191] Fix og:image requests when html in a web page is
 over 1.megabyte (#30362)

---
 app/services/fetch_link_card_service.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/services/fetch_link_card_service.rb b/app/services/fetch_link_card_service.rb
index c6b600dd7cd6bf..36e866b6ce9b8a 100644
--- a/app/services/fetch_link_card_service.rb
+++ b/app/services/fetch_link_card_service.rb
@@ -56,7 +56,7 @@ def html
 
       @html_charset = res.charset
 
-      res.body_with_limit
+      res.truncated_body
     end
   end
 

From a178ba7cd5fa10b018ecaf3c8e3dd5f298a08818 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Sun, 19 May 2024 19:07:32 +0200
Subject: [PATCH 1051/2191] Use a modern React context for identity in the app
 (#30098)

---
 .../mastodon/components/column_header.jsx     | 12 ++-
 app/javascript/mastodon/components/poll.jsx   | 11 +--
 .../mastodon/components/status_action_bar.jsx | 17 ++---
 .../mastodon/components/status_content.jsx    | 12 ++-
 .../mastodon/containers/mastodon.jsx          | 54 ++++----------
 .../features/account/components/header.jsx    | 10 +--
 .../features/community_timeline/index.jsx     | 13 ++--
 .../features/compose/components/search.jsx    | 13 ++--
 .../mastodon/features/explore/index.jsx       | 11 +--
 .../mastodon/features/firehose/index.jsx      | 12 +--
 .../features/getting_started/index.jsx        | 13 ++--
 .../features/hashtag_timeline/index.jsx       | 15 ++--
 .../mastodon/features/home_timeline/index.jsx | 11 +--
 .../components/column_settings.jsx            | 15 ++--
 .../mastodon/features/notifications/index.jsx | 11 +--
 .../picture_in_picture/components/footer.jsx  | 15 ++--
 .../features/public_timeline/index.jsx        | 13 ++--
 .../features/status/components/action_bar.jsx | 11 +--
 .../mastodon/features/status/index.jsx        | 15 ++--
 .../features/ui/components/compose_panel.jsx  | 11 +--
 .../features/ui/components/header.jsx         | 11 +--
 .../features/ui/components/link_footer.jsx    | 11 +--
 .../ui/components/navigation_panel.jsx        | 11 +--
 app/javascript/mastodon/features/ui/index.jsx | 25 +++----
 app/javascript/mastodon/identity_context.tsx  | 74 +++++++++++++++++++
 app/javascript/mastodon/initial_state.js      | 10 +++
 26 files changed, 213 insertions(+), 224 deletions(-)
 create mode 100644 app/javascript/mastodon/identity_context.tsx

diff --git a/app/javascript/mastodon/components/column_header.jsx b/app/javascript/mastodon/components/column_header.jsx
index a7d07ffdb07108..42183f336dbd5b 100644
--- a/app/javascript/mastodon/components/column_header.jsx
+++ b/app/javascript/mastodon/components/column_header.jsx
@@ -14,8 +14,10 @@ import CloseIcon from '@/material-icons/400-24px/close.svg?react';
 import SettingsIcon from '@/material-icons/400-24px/settings.svg?react';
 import { Icon }  from 'mastodon/components/icon';
 import { ButtonInTabsBar } from 'mastodon/features/ui/util/columns_context';
+import { identityContextPropShape, withIdentity } from 'mastodon/identity_context';
 import { WithRouterPropTypes } from 'mastodon/utils/react_router';
 
+
 import { useAppHistory } from './router';
 
 const messages = defineMessages({
@@ -51,12 +53,8 @@ BackButton.propTypes = {
 };
 
 class ColumnHeader extends PureComponent {
-
-  static contextTypes = {
-    identity: PropTypes.object,
-  };
-
   static propTypes = {
+    identity: identityContextPropShape,
     intl: PropTypes.object.isRequired,
     title: PropTypes.node,
     icon: PropTypes.string,
@@ -171,7 +169,7 @@ class ColumnHeader extends PureComponent {
       );
     }
 
-    if (this.context.identity.signedIn && (children || (multiColumn && this.props.onPin))) {
+    if (this.props.identity.signedIn && (children || (multiColumn && this.props.onPin))) {
       collapseButton = (
         <button
           className={collapsibleButtonClassName}
@@ -232,4 +230,4 @@ class ColumnHeader extends PureComponent {
 
 }
 
-export default injectIntl(withRouter(ColumnHeader));
+export default injectIntl(withIdentity(withRouter(ColumnHeader)));
diff --git a/app/javascript/mastodon/components/poll.jsx b/app/javascript/mastodon/components/poll.jsx
index c7036d111b28bd..7b836f00b1abab 100644
--- a/app/javascript/mastodon/components/poll.jsx
+++ b/app/javascript/mastodon/components/poll.jsx
@@ -14,6 +14,7 @@ import CheckIcon from '@/material-icons/400-24px/check.svg?react';
 import { Icon }  from 'mastodon/components/icon';
 import emojify from 'mastodon/features/emoji/emoji';
 import Motion from 'mastodon/features/ui/util/optional_motion';
+import { identityContextPropShape, withIdentity } from 'mastodon/identity_context';
 
 import { RelativeTimestamp } from './relative_timestamp';
 
@@ -38,12 +39,8 @@ const makeEmojiMap = record => record.get('emojis').reduce((obj, emoji) => {
 }, {});
 
 class Poll extends ImmutablePureComponent {
-
-  static contextTypes = {
-    identity: PropTypes.object,
-  };
-
   static propTypes = {
+    identity: identityContextPropShape,
     poll: ImmutablePropTypes.map,
     lang: PropTypes.string,
     intl: PropTypes.object.isRequired,
@@ -235,7 +232,7 @@ class Poll extends ImmutablePureComponent {
         </ul>
 
         <div className='poll__footer'>
-          {!showResults && <button className='button button-secondary' disabled={disabled || !this.context.identity.signedIn} onClick={this.handleVote}><FormattedMessage id='poll.vote' defaultMessage='Vote' /></button>}
+          {!showResults && <button className='button button-secondary' disabled={disabled || !this.props.identity.signedIn} onClick={this.handleVote}><FormattedMessage id='poll.vote' defaultMessage='Vote' /></button>}
           {!showResults && <><button className='poll__link' onClick={this.handleReveal}><FormattedMessage id='poll.reveal' defaultMessage='See results' /></button> · </>}
           {showResults && !this.props.disabled && <><button className='poll__link' onClick={this.handleRefresh}><FormattedMessage id='poll.refresh' defaultMessage='Refresh' /></button> · </>}
           {votesCount}
@@ -247,4 +244,4 @@ class Poll extends ImmutablePureComponent {
 
 }
 
-export default injectIntl(Poll);
+export default injectIntl(withIdentity(Poll));
diff --git a/app/javascript/mastodon/components/status_action_bar.jsx b/app/javascript/mastodon/components/status_action_bar.jsx
index 6def49fdbba90c..c79eae8460c661 100644
--- a/app/javascript/mastodon/components/status_action_bar.jsx
+++ b/app/javascript/mastodon/components/status_action_bar.jsx
@@ -22,6 +22,7 @@ import RepeatActiveIcon from '@/svg-icons/repeat_active.svg?react';
 import RepeatDisabledIcon from '@/svg-icons/repeat_disabled.svg?react';
 import RepeatPrivateIcon from '@/svg-icons/repeat_private.svg?react';
 import RepeatPrivateActiveIcon from '@/svg-icons/repeat_private_active.svg?react';
+import { identityContextPropShape, withIdentity } from 'mastodon/identity_context';
 import { PERMISSION_MANAGE_USERS, PERMISSION_MANAGE_FEDERATION } from 'mastodon/permissions';
 import { WithRouterPropTypes } from 'mastodon/utils/react_router';
 
@@ -74,12 +75,8 @@ const mapStateToProps = (state, { status }) => ({
 });
 
 class StatusActionBar extends ImmutablePureComponent {
-
-  static contextTypes = {
-    identity: PropTypes.object,
-  };
-
   static propTypes = {
+    identity: identityContextPropShape,
     status: ImmutablePropTypes.map.isRequired,
     relationship: ImmutablePropTypes.record,
     onReply: PropTypes.func,
@@ -118,7 +115,7 @@ class StatusActionBar extends ImmutablePureComponent {
   ];
 
   handleReplyClick = () => {
-    const { signedIn } = this.context.identity;
+    const { signedIn } = this.props.identity;
 
     if (signedIn) {
       this.props.onReply(this.props.status, this.props.history);
@@ -136,7 +133,7 @@ class StatusActionBar extends ImmutablePureComponent {
   };
 
   handleFavouriteClick = () => {
-    const { signedIn } = this.context.identity;
+    const { signedIn } = this.props.identity;
 
     if (signedIn) {
       this.props.onFavourite(this.props.status);
@@ -146,7 +143,7 @@ class StatusActionBar extends ImmutablePureComponent {
   };
 
   handleReblogClick = e => {
-    const { signedIn } = this.context.identity;
+    const { signedIn } = this.props.identity;
 
     if (signedIn) {
       this.props.onReblog(this.props.status, e);
@@ -250,7 +247,7 @@ class StatusActionBar extends ImmutablePureComponent {
 
   render () {
     const { status, relationship, intl, withDismiss, withCounters, scrollKey } = this.props;
-    const { signedIn, permissions } = this.context.identity;
+    const { signedIn, permissions } = this.props.identity;
 
     const publicStatus       = ['public', 'unlisted'].includes(status.get('visibility'));
     const pinnableStatus     = ['public', 'unlisted', 'private'].includes(status.get('visibility'));
@@ -410,4 +407,4 @@ class StatusActionBar extends ImmutablePureComponent {
 
 }
 
-export default withRouter(connect(mapStateToProps)(injectIntl(StatusActionBar)));
+export default withRouter(withIdentity(connect(mapStateToProps)(injectIntl(StatusActionBar))));
diff --git a/app/javascript/mastodon/components/status_content.jsx b/app/javascript/mastodon/components/status_content.jsx
index 4a7ba941eb6297..24483cf512819e 100644
--- a/app/javascript/mastodon/components/status_content.jsx
+++ b/app/javascript/mastodon/components/status_content.jsx
@@ -12,8 +12,10 @@ import { connect } from 'react-redux';
 import ChevronRightIcon from '@/material-icons/400-24px/chevron_right.svg?react';
 import { Icon }  from 'mastodon/components/icon';
 import PollContainer from 'mastodon/containers/poll_container';
+import { identityContextPropShape, withIdentity } from 'mastodon/identity_context';
 import { autoPlayGif, languages as preloadedLanguages } from 'mastodon/initial_state';
 
+
 const MAX_HEIGHT = 706; // 22px * 32 (+ 2px padding at the top)
 
 /**
@@ -67,12 +69,8 @@ const mapStateToProps = state => ({
 });
 
 class StatusContent extends PureComponent {
-
-  static contextTypes = {
-    identity: PropTypes.object,
-  };
-
   static propTypes = {
+    identity: identityContextPropShape,
     status: ImmutablePropTypes.map.isRequired,
     statusContent: PropTypes.string,
     expanded: PropTypes.bool,
@@ -245,7 +243,7 @@ class StatusContent extends PureComponent {
     const renderReadMore = this.props.onClick && status.get('collapsed');
     const contentLocale = intl.locale.replace(/[_-].*/, '');
     const targetLanguages = this.props.languages?.get(status.get('language') || 'und');
-    const renderTranslate = this.props.onTranslate && this.context.identity.signedIn && ['public', 'unlisted'].includes(status.get('visibility')) && status.get('search_index').trim().length > 0 && targetLanguages?.includes(contentLocale);
+    const renderTranslate = this.props.onTranslate && this.props.identity.signedIn && ['public', 'unlisted'].includes(status.get('visibility')) && status.get('search_index').trim().length > 0 && targetLanguages?.includes(contentLocale);
 
     const content = { __html: statusContent ?? getStatusContent(status) };
     const spoilerContent = { __html: status.getIn(['translation', 'spoilerHtml']) || status.get('spoilerHtml') };
@@ -328,4 +326,4 @@ class StatusContent extends PureComponent {
 
 }
 
-export default withRouter(connect(mapStateToProps)(injectIntl(StatusContent)));
+export default withRouter(withIdentity(connect(mapStateToProps)(injectIntl(StatusContent))));
diff --git a/app/javascript/mastodon/containers/mastodon.jsx b/app/javascript/mastodon/containers/mastodon.jsx
index 87708da191bb56..0b1255c3364c4b 100644
--- a/app/javascript/mastodon/containers/mastodon.jsx
+++ b/app/javascript/mastodon/containers/mastodon.jsx
@@ -1,4 +1,3 @@
-import PropTypes from 'prop-types';
 import { PureComponent } from 'react';
 
 import { Helmet } from 'react-helmet';
@@ -14,6 +13,7 @@ import { connectUserStream } from 'mastodon/actions/streaming';
 import ErrorBoundary from 'mastodon/components/error_boundary';
 import { Router } from 'mastodon/components/router';
 import UI from 'mastodon/features/ui';
+import { IdentityContext, createIdentityContext } from 'mastodon/identity_context';
 import initialState, { title as siteTitle } from 'mastodon/initial_state';
 import { IntlProvider } from 'mastodon/locales';
 import { store } from 'mastodon/store';
@@ -28,33 +28,9 @@ if (initialState.meta.me) {
   store.dispatch(fetchCustomEmojis());
 }
 
-const createIdentityContext = state => ({
-  signedIn: !!state.meta.me,
-  accountId: state.meta.me,
-  disabledAccountId: state.meta.disabled_account_id,
-  accessToken: state.meta.access_token,
-  permissions: state.role ? state.role.permissions : 0,
-});
-
 export default class Mastodon extends PureComponent {
-
-  static childContextTypes = {
-    identity: PropTypes.shape({
-      signedIn: PropTypes.bool.isRequired,
-      accountId: PropTypes.string,
-      disabledAccountId: PropTypes.string,
-      accessToken: PropTypes.string,
-    }).isRequired,
-  };
-
   identity = createIdentityContext(initialState);
 
-  getChildContext() {
-    return {
-      identity: this.identity,
-    };
-  }
-
   componentDidMount() {
     if (this.identity.signedIn) {
       this.disconnect = store.dispatch(connectUserStream());
@@ -74,19 +50,21 @@ export default class Mastodon extends PureComponent {
 
   render () {
     return (
-      <IntlProvider>
-        <ReduxProvider store={store}>
-          <ErrorBoundary>
-            <Router>
-              <ScrollContext shouldUpdateScroll={this.shouldUpdateScroll}>
-                <Route path='/' component={UI} />
-              </ScrollContext>
-            </Router>
-
-            <Helmet defaultTitle={title} titleTemplate={`%s - ${title}`} />
-          </ErrorBoundary>
-        </ReduxProvider>
-      </IntlProvider>
+      <IdentityContext.Provider value={this.identity}>
+        <IntlProvider>
+          <ReduxProvider store={store}>
+            <ErrorBoundary>
+              <Router>
+                <ScrollContext shouldUpdateScroll={this.shouldUpdateScroll}>
+                  <Route path='/' component={UI} />
+                </ScrollContext>
+              </Router>
+
+              <Helmet defaultTitle={title} titleTemplate={`%s - ${title}`} />
+            </ErrorBoundary>
+          </ReduxProvider>
+        </IntlProvider>
+      </IdentityContext.Provider>
     );
   }
 
diff --git a/app/javascript/mastodon/features/account/components/header.jsx b/app/javascript/mastodon/features/account/components/header.jsx
index e9d6071a21f80b..b10ef6ef760e03 100644
--- a/app/javascript/mastodon/features/account/components/header.jsx
+++ b/app/javascript/mastodon/features/account/components/header.jsx
@@ -25,6 +25,7 @@ import { IconButton } from 'mastodon/components/icon_button';
 import { LoadingIndicator } from 'mastodon/components/loading_indicator';
 import { ShortNumber } from 'mastodon/components/short_number';
 import DropdownMenuContainer from 'mastodon/containers/dropdown_menu_container';
+import { identityContextPropShape, withIdentity } from 'mastodon/identity_context';
 import { autoPlayGif, me, domain as localDomain } from 'mastodon/initial_state';
 import { PERMISSION_MANAGE_USERS, PERMISSION_MANAGE_FEDERATION } from 'mastodon/permissions';
 import { WithRouterPropTypes } from 'mastodon/utils/react_router';
@@ -111,6 +112,7 @@ const dateFormatOptions = {
 class Header extends ImmutablePureComponent {
 
   static propTypes = {
+    identity: identityContextPropShape,
     account: ImmutablePropTypes.record,
     identity_props: ImmutablePropTypes.list,
     onFollow: PropTypes.func.isRequired,
@@ -136,10 +138,6 @@ class Header extends ImmutablePureComponent {
     ...WithRouterPropTypes,
   };
 
-  static contextTypes = {
-    identity: PropTypes.object,
-  };
-
   setRef = c => {
     this.node = c;
   };
@@ -255,7 +253,7 @@ class Header extends ImmutablePureComponent {
 
   render () {
     const { account, hidden, intl } = this.props;
-    const { signedIn, permissions } = this.context.identity;
+    const { signedIn, permissions } = this.props.identity;
 
     if (!account) {
       return null;
@@ -516,4 +514,4 @@ class Header extends ImmutablePureComponent {
 
 }
 
-export default withRouter(injectIntl(Header));
+export default withRouter(withIdentity(injectIntl(Header)));
diff --git a/app/javascript/mastodon/features/community_timeline/index.jsx b/app/javascript/mastodon/features/community_timeline/index.jsx
index 0aa1f9aa23a22a..5652ea5327980c 100644
--- a/app/javascript/mastodon/features/community_timeline/index.jsx
+++ b/app/javascript/mastodon/features/community_timeline/index.jsx
@@ -9,6 +9,7 @@ import { connect } from 'react-redux';
 
 import PeopleIcon from '@/material-icons/400-24px/group.svg?react';
 import { DismissableBanner } from 'mastodon/components/dismissable_banner';
+import { identityContextPropShape, withIdentity } from 'mastodon/identity_context';
 import { domain } from 'mastodon/initial_state';
 
 import { addColumn, removeColumn, moveColumn } from '../../actions/columns';
@@ -38,16 +39,12 @@ const mapStateToProps = (state, { columnId }) => {
 };
 
 class CommunityTimeline extends PureComponent {
-
-  static contextTypes = {
-    identity: PropTypes.object,
-  };
-
   static defaultProps = {
     onlyMedia: false,
   };
 
   static propTypes = {
+    identity: identityContextPropShape,
     dispatch: PropTypes.func.isRequired,
     columnId: PropTypes.string,
     intl: PropTypes.object.isRequired,
@@ -77,7 +74,7 @@ class CommunityTimeline extends PureComponent {
 
   componentDidMount () {
     const { dispatch, onlyMedia } = this.props;
-    const { signedIn } = this.context.identity;
+    const { signedIn } = this.props.identity;
 
     dispatch(expandCommunityTimeline({ onlyMedia }));
 
@@ -87,7 +84,7 @@ class CommunityTimeline extends PureComponent {
   }
 
   componentDidUpdate (prevProps) {
-    const { signedIn } = this.context.identity;
+    const { signedIn } = this.props.identity;
 
     if (prevProps.onlyMedia !== this.props.onlyMedia) {
       const { dispatch, onlyMedia } = this.props;
@@ -161,4 +158,4 @@ class CommunityTimeline extends PureComponent {
 
 }
 
-export default connect(mapStateToProps)(injectIntl(CommunityTimeline));
+export default withIdentity(connect(mapStateToProps)(injectIntl(CommunityTimeline)));
diff --git a/app/javascript/mastodon/features/compose/components/search.jsx b/app/javascript/mastodon/features/compose/components/search.jsx
index ca02c23fc4ec43..7fa7ad248bbf74 100644
--- a/app/javascript/mastodon/features/compose/components/search.jsx
+++ b/app/javascript/mastodon/features/compose/components/search.jsx
@@ -12,6 +12,7 @@ import CancelIcon from '@/material-icons/400-24px/cancel-fill.svg?react';
 import CloseIcon from '@/material-icons/400-24px/close.svg?react';
 import SearchIcon from '@/material-icons/400-24px/search.svg?react';
 import { Icon }  from 'mastodon/components/icon';
+import { identityContextPropShape, withIdentity } from 'mastodon/identity_context';
 import { domain, searchEnabled } from 'mastodon/initial_state';
 import { HASHTAG_REGEX } from 'mastodon/utils/hashtags';
 import { WithRouterPropTypes } from 'mastodon/utils/react_router';
@@ -33,12 +34,8 @@ const labelForRecentSearch = search => {
 };
 
 class Search extends PureComponent {
-
-  static contextTypes = {
-    identity: PropTypes.object.isRequired,
-  };
-
   static propTypes = {
+    identity: identityContextPropShape,
     value: PropTypes.string.isRequired,
     recent: ImmutablePropTypes.orderedSet,
     submitted: PropTypes.bool,
@@ -276,7 +273,7 @@ class Search extends PureComponent {
   }
 
   _calculateOptions (value) {
-    const { signedIn } = this.context.identity;
+    const { signedIn } = this.props.identity;
     const trimmedValue = value.trim();
     const options = [];
 
@@ -318,7 +315,7 @@ class Search extends PureComponent {
   render () {
     const { intl, value, submitted, recent } = this.props;
     const { expanded, options, selectedOption } = this.state;
-    const { signedIn } = this.context.identity;
+    const { signedIn } = this.props.identity;
 
     const hasValue = value.length > 0 || submitted;
 
@@ -402,4 +399,4 @@ class Search extends PureComponent {
 
 }
 
-export default withRouter(injectIntl(Search));
+export default withRouter(withIdentity(injectIntl(Search)));
diff --git a/app/javascript/mastodon/features/explore/index.jsx b/app/javascript/mastodon/features/explore/index.jsx
index d77aec7013e5e9..83e5df22f85ede 100644
--- a/app/javascript/mastodon/features/explore/index.jsx
+++ b/app/javascript/mastodon/features/explore/index.jsx
@@ -13,6 +13,7 @@ import SearchIcon from '@/material-icons/400-24px/search.svg?react';
 import Column from 'mastodon/components/column';
 import ColumnHeader from 'mastodon/components/column_header';
 import Search from 'mastodon/features/compose/containers/search_container';
+import { identityContextPropShape, withIdentity } from 'mastodon/identity_context';
 import { trendsEnabled } from 'mastodon/initial_state';
 
 import Links from './links';
@@ -32,12 +33,8 @@ const mapStateToProps = state => ({
 });
 
 class Explore extends PureComponent {
-
-  static contextTypes = {
-    identity: PropTypes.object,
-  };
-
   static propTypes = {
+    identity: identityContextPropShape,
     intl: PropTypes.object.isRequired,
     multiColumn: PropTypes.bool,
     isSearching: PropTypes.bool,
@@ -53,7 +50,7 @@ class Explore extends PureComponent {
 
   render() {
     const { intl, multiColumn, isSearching } = this.props;
-    const { signedIn } = this.context.identity;
+    const { signedIn } = this.props.identity;
 
     return (
       <Column bindToDocument={!multiColumn} ref={this.setRef} label={intl.formatMessage(messages.title)}>
@@ -114,4 +111,4 @@ class Explore extends PureComponent {
 
 }
 
-export default connect(mapStateToProps)(injectIntl(Explore));
+export default withIdentity(connect(mapStateToProps)(injectIntl(Explore)));
diff --git a/app/javascript/mastodon/features/firehose/index.jsx b/app/javascript/mastodon/features/firehose/index.jsx
index c65fe48eace9f9..f65bee45eca1e0 100644
--- a/app/javascript/mastodon/features/firehose/index.jsx
+++ b/app/javascript/mastodon/features/firehose/index.jsx
@@ -6,13 +6,14 @@ import { useIntl, defineMessages, FormattedMessage } from 'react-intl';
 import { Helmet } from 'react-helmet';
 import { NavLink } from 'react-router-dom';
 
+import { useIdentity } from '@/mastodon/identity_context';
 import PublicIcon from '@/material-icons/400-24px/public.svg?react';
 import { addColumn } from 'mastodon/actions/columns';
 import { changeSetting } from 'mastodon/actions/settings';
 import { connectPublicStream, connectCommunityStream } from 'mastodon/actions/streaming';
 import { expandPublicTimeline, expandCommunityTimeline } from 'mastodon/actions/timelines';
 import { DismissableBanner } from 'mastodon/components/dismissable_banner';
-import initialState, { domain } from 'mastodon/initial_state';
+import { domain } from 'mastodon/initial_state';
 import { useAppDispatch, useAppSelector } from 'mastodon/store';
 
 import Column from '../../components/column';
@@ -24,15 +25,6 @@ const messages = defineMessages({
   title: { id: 'column.firehose', defaultMessage: 'Live feeds' },
 });
 
-// TODO: use a proper React context later on
-const useIdentity = () => ({
-  signedIn: !!initialState.meta.me,
-  accountId: initialState.meta.me,
-  disabledAccountId: initialState.meta.disabled_account_id,
-  accessToken: initialState.meta.access_token,
-  permissions: initialState.role ? initialState.role.permissions : 0,
-});
-
 const ColumnSettings = () => {
   const dispatch = useAppDispatch();
   const settings = useAppSelector((state) => state.getIn(['settings', 'firehose']));
diff --git a/app/javascript/mastodon/features/getting_started/index.jsx b/app/javascript/mastodon/features/getting_started/index.jsx
index db6e0f6ecd4e40..628bbe62bbf1aa 100644
--- a/app/javascript/mastodon/features/getting_started/index.jsx
+++ b/app/javascript/mastodon/features/getting_started/index.jsx
@@ -24,6 +24,7 @@ import { fetchFollowRequests } from 'mastodon/actions/accounts';
 import Column from 'mastodon/components/column';
 import ColumnHeader from 'mastodon/components/column_header';
 import LinkFooter from 'mastodon/features/ui/components/link_footer';
+import { identityContextPropShape, withIdentity } from 'mastodon/identity_context';
 
 import { me, showTrends } from '../../initial_state';
 import { NavigationBar } from '../compose/components/navigation_bar';
@@ -75,12 +76,8 @@ const badgeDisplay = (number, limit) => {
 };
 
 class GettingStarted extends ImmutablePureComponent {
-
-  static contextTypes = {
-    identity: PropTypes.object,
-  };
-
   static propTypes = {
+    identity: identityContextPropShape,
     intl: PropTypes.object.isRequired,
     myAccount: ImmutablePropTypes.record,
     multiColumn: PropTypes.bool,
@@ -91,7 +88,7 @@ class GettingStarted extends ImmutablePureComponent {
 
   componentDidMount () {
     const { fetchFollowRequests } = this.props;
-    const { signedIn } = this.context.identity;
+    const { signedIn } = this.props.identity;
 
     if (!signedIn) {
       return;
@@ -102,7 +99,7 @@ class GettingStarted extends ImmutablePureComponent {
 
   render () {
     const { intl, myAccount, multiColumn, unreadFollowRequests } = this.props;
-    const { signedIn } = this.context.identity;
+    const { signedIn } = this.props.identity;
 
     const navItems = [];
 
@@ -167,4 +164,4 @@ class GettingStarted extends ImmutablePureComponent {
 
 }
 
-export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(GettingStarted));
+export default withIdentity(connect(mapStateToProps, mapDispatchToProps)(injectIntl(GettingStarted)));
diff --git a/app/javascript/mastodon/features/hashtag_timeline/index.jsx b/app/javascript/mastodon/features/hashtag_timeline/index.jsx
index f431a7e9b72130..42a668859e0f3c 100644
--- a/app/javascript/mastodon/features/hashtag_timeline/index.jsx
+++ b/app/javascript/mastodon/features/hashtag_timeline/index.jsx
@@ -17,6 +17,7 @@ import { fetchHashtag, followHashtag, unfollowHashtag } from 'mastodon/actions/t
 import { expandHashtagTimeline, clearTimeline } from 'mastodon/actions/timelines';
 import Column from 'mastodon/components/column';
 import ColumnHeader from 'mastodon/components/column_header';
+import { identityContextPropShape, withIdentity } from 'mastodon/identity_context';
 
 import StatusListContainer from '../ui/containers/status_list_container';
 
@@ -29,14 +30,10 @@ const mapStateToProps = (state, props) => ({
 });
 
 class HashtagTimeline extends PureComponent {
-
   disconnects = [];
 
-  static contextTypes = {
-    identity: PropTypes.object,
-  };
-
   static propTypes = {
+    identity: identityContextPropShape,
     params: PropTypes.object.isRequired,
     columnId: PropTypes.string,
     dispatch: PropTypes.func.isRequired,
@@ -94,7 +91,7 @@ class HashtagTimeline extends PureComponent {
   };
 
   _subscribe (dispatch, id, tags = {}, local) {
-    const { signedIn } = this.context.identity;
+    const { signedIn } = this.props.identity;
 
     if (!signedIn) {
       return;
@@ -168,7 +165,7 @@ class HashtagTimeline extends PureComponent {
   handleFollow = () => {
     const { dispatch, params, tag } = this.props;
     const { id } = params;
-    const { signedIn } = this.context.identity;
+    const { signedIn } = this.props.identity;
 
     if (!signedIn) {
       return;
@@ -185,7 +182,7 @@ class HashtagTimeline extends PureComponent {
     const { hasUnread, columnId, multiColumn, tag } = this.props;
     const { id, local } = this.props.params;
     const pinned = !!columnId;
-    const { signedIn } = this.context.identity;
+    const { signedIn } = this.props.identity;
 
     return (
       <Column bindToDocument={!multiColumn} ref={this.setRef} label={`#${id}`}>
@@ -225,4 +222,4 @@ class HashtagTimeline extends PureComponent {
 
 }
 
-export default connect(mapStateToProps)(HashtagTimeline);
+export default connect(mapStateToProps)(withIdentity(HashtagTimeline));
diff --git a/app/javascript/mastodon/features/home_timeline/index.jsx b/app/javascript/mastodon/features/home_timeline/index.jsx
index 6e7dc2b6c8c8a7..00b5835a161e92 100644
--- a/app/javascript/mastodon/features/home_timeline/index.jsx
+++ b/app/javascript/mastodon/features/home_timeline/index.jsx
@@ -14,6 +14,7 @@ import { fetchAnnouncements, toggleShowAnnouncements } from 'mastodon/actions/an
 import { IconWithBadge } from 'mastodon/components/icon_with_badge';
 import { NotSignedInIndicator } from 'mastodon/components/not_signed_in_indicator';
 import AnnouncementsContainer from 'mastodon/features/getting_started/containers/announcements_container';
+import { identityContextPropShape, withIdentity } from 'mastodon/identity_context';
 import { criticalUpdatesPending } from 'mastodon/initial_state';
 
 import { addColumn, removeColumn, moveColumn } from '../../actions/columns';
@@ -40,12 +41,8 @@ const mapStateToProps = state => ({
 });
 
 class HomeTimeline extends PureComponent {
-
-  static contextTypes = {
-    identity: PropTypes.object,
-  };
-
   static propTypes = {
+    identity: identityContextPropShape,
     dispatch: PropTypes.func.isRequired,
     intl: PropTypes.object.isRequired,
     hasUnread: PropTypes.bool,
@@ -126,7 +123,7 @@ class HomeTimeline extends PureComponent {
   render () {
     const { intl, hasUnread, columnId, multiColumn, hasAnnouncements, unreadAnnouncements, showAnnouncements } = this.props;
     const pinned = !!columnId;
-    const { signedIn } = this.context.identity;
+    const { signedIn } = this.props.identity;
     const banners = [];
 
     let announcementsButton;
@@ -190,4 +187,4 @@ class HomeTimeline extends PureComponent {
 
 }
 
-export default connect(mapStateToProps)(injectIntl(HomeTimeline));
+export default connect(mapStateToProps)(withIdentity(injectIntl(HomeTimeline)));
diff --git a/app/javascript/mastodon/features/notifications/components/column_settings.jsx b/app/javascript/mastodon/features/notifications/components/column_settings.jsx
index fc737c0fe20556..e375b856c92e70 100644
--- a/app/javascript/mastodon/features/notifications/components/column_settings.jsx
+++ b/app/javascript/mastodon/features/notifications/components/column_settings.jsx
@@ -5,6 +5,7 @@ import { FormattedMessage } from 'react-intl';
 
 import ImmutablePropTypes from 'react-immutable-proptypes';
 
+import { identityContextPropShape, withIdentity } from 'mastodon/identity_context';
 import { PERMISSION_MANAGE_USERS, PERMISSION_MANAGE_REPORTS } from 'mastodon/permissions';
 
 import { CheckboxWithLabel } from './checkbox_with_label';
@@ -12,13 +13,9 @@ import ClearColumnButton from './clear_column_button';
 import GrantPermissionButton from './grant_permission_button';
 import SettingToggle from './setting_toggle';
 
-export default class ColumnSettings extends PureComponent {
-
-  static contextTypes = {
-    identity: PropTypes.object,
-  };
-
+class ColumnSettings extends PureComponent {
   static propTypes = {
+    identity: identityContextPropShape,
     settings: ImmutablePropTypes.map.isRequired,
     pushSettings: ImmutablePropTypes.map.isRequired,
     onChange: PropTypes.func.isRequired,
@@ -215,7 +212,7 @@ export default class ColumnSettings extends PureComponent {
           </div>
         </section>
 
-        {((this.context.identity.permissions & PERMISSION_MANAGE_USERS) === PERMISSION_MANAGE_USERS) && (
+        {((this.props.identity.permissions & PERMISSION_MANAGE_USERS) === PERMISSION_MANAGE_USERS) && (
           <section role='group' aria-labelledby='notifications-admin-sign-up'>
             <h3 id='notifications-status'><FormattedMessage id='notifications.column_settings.admin.sign_up' defaultMessage='New sign-ups:' /></h3>
 
@@ -228,7 +225,7 @@ export default class ColumnSettings extends PureComponent {
           </section>
         )}
 
-        {((this.context.identity.permissions & PERMISSION_MANAGE_REPORTS) === PERMISSION_MANAGE_REPORTS) && (
+        {((this.props.identity.permissions & PERMISSION_MANAGE_REPORTS) === PERMISSION_MANAGE_REPORTS) && (
           <section role='group' aria-labelledby='notifications-admin-report'>
             <h3 id='notifications-status'><FormattedMessage id='notifications.column_settings.admin.report' defaultMessage='New reports:' /></h3>
 
@@ -245,3 +242,5 @@ export default class ColumnSettings extends PureComponent {
   }
 
 }
+
+export default withIdentity(ColumnSettings);
diff --git a/app/javascript/mastodon/features/notifications/index.jsx b/app/javascript/mastodon/features/notifications/index.jsx
index e062957ff89a19..d45f517152ea16 100644
--- a/app/javascript/mastodon/features/notifications/index.jsx
+++ b/app/javascript/mastodon/features/notifications/index.jsx
@@ -17,6 +17,7 @@ import NotificationsIcon from '@/material-icons/400-24px/notifications-fill.svg?
 import { compareId } from 'mastodon/compare_id';
 import { Icon }  from 'mastodon/components/icon';
 import { NotSignedInIndicator } from 'mastodon/components/not_signed_in_indicator';
+import { identityContextPropShape, withIdentity } from 'mastodon/identity_context';
 
 import { addColumn, removeColumn, moveColumn } from '../../actions/columns';
 import { submitMarkers } from '../../actions/markers';
@@ -77,12 +78,8 @@ const mapStateToProps = state => ({
 });
 
 class Notifications extends PureComponent {
-
-  static contextTypes = {
-    identity: PropTypes.object,
-  };
-
   static propTypes = {
+    identity: identityContextPropShape,
     columnId: PropTypes.string,
     notifications: ImmutablePropTypes.list.isRequired,
     dispatch: PropTypes.func.isRequired,
@@ -190,7 +187,7 @@ class Notifications extends PureComponent {
     const { intl, notifications, isLoading, isUnread, columnId, multiColumn, hasMore, numPending, lastReadId, canMarkAsRead, needsNotificationPermission } = this.props;
     const pinned = !!columnId;
     const emptyMessage = <FormattedMessage id='empty_column.notifications' defaultMessage="You don't have any notifications yet. When other people interact with you, you will see it here." />;
-    const { signedIn } = this.context.identity;
+    const { signedIn } = this.props.identity;
 
     let scrollableContent = null;
 
@@ -299,4 +296,4 @@ class Notifications extends PureComponent {
 
 }
 
-export default connect(mapStateToProps)(injectIntl(Notifications));
+export default connect(mapStateToProps)(withIdentity(injectIntl(Notifications)));
diff --git a/app/javascript/mastodon/features/picture_in_picture/components/footer.jsx b/app/javascript/mastodon/features/picture_in_picture/components/footer.jsx
index 7a163a88258c6b..d6b1b5fa81ac90 100644
--- a/app/javascript/mastodon/features/picture_in_picture/components/footer.jsx
+++ b/app/javascript/mastodon/features/picture_in_picture/components/footer.jsx
@@ -18,6 +18,7 @@ import { replyCompose } from 'mastodon/actions/compose';
 import { reblog, favourite, unreblog, unfavourite } from 'mastodon/actions/interactions';
 import { openModal } from 'mastodon/actions/modal';
 import { IconButton } from 'mastodon/components/icon_button';
+import { identityContextPropShape, withIdentity } from 'mastodon/identity_context';
 import { me, boostModal } from 'mastodon/initial_state';
 import { makeGetStatus } from 'mastodon/selectors';
 import { WithRouterPropTypes } from 'mastodon/utils/react_router';
@@ -47,12 +48,8 @@ const makeMapStateToProps = () => {
 };
 
 class Footer extends ImmutablePureComponent {
-
-  static contextTypes = {
-    identity: PropTypes.object,
-  };
-
   static propTypes = {
+    identity: identityContextPropShape,
     statusId: PropTypes.string.isRequired,
     status: ImmutablePropTypes.map.isRequired,
     intl: PropTypes.object.isRequired,
@@ -75,7 +72,7 @@ class Footer extends ImmutablePureComponent {
 
   handleReplyClick = () => {
     const { dispatch, askReplyConfirmation, status, intl } = this.props;
-    const { signedIn } = this.context.identity;
+    const { signedIn } = this.props.identity;
 
     if (signedIn) {
       if (askReplyConfirmation) {
@@ -104,7 +101,7 @@ class Footer extends ImmutablePureComponent {
 
   handleFavouriteClick = () => {
     const { dispatch, status } = this.props;
-    const { signedIn } = this.context.identity;
+    const { signedIn } = this.props.identity;
 
     if (signedIn) {
       if (status.get('favourited')) {
@@ -131,7 +128,7 @@ class Footer extends ImmutablePureComponent {
 
   handleReblogClick = e => {
     const { dispatch, status } = this.props;
-    const { signedIn } = this.context.identity;
+    const { signedIn } = this.props.identity;
 
     if (signedIn) {
       if (status.get('reblogged')) {
@@ -209,4 +206,4 @@ class Footer extends ImmutablePureComponent {
 
 }
 
-export default  connect(makeMapStateToProps)(withRouter(injectIntl(Footer)));
+export default  connect(makeMapStateToProps)(withIdentity(withRouter(injectIntl(Footer))));
diff --git a/app/javascript/mastodon/features/public_timeline/index.jsx b/app/javascript/mastodon/features/public_timeline/index.jsx
index 3601dfeae80a12..91351901f532a1 100644
--- a/app/javascript/mastodon/features/public_timeline/index.jsx
+++ b/app/javascript/mastodon/features/public_timeline/index.jsx
@@ -9,6 +9,7 @@ import { connect } from 'react-redux';
 
 import PublicIcon from '@/material-icons/400-24px/public.svg?react';
 import { DismissableBanner } from 'mastodon/components/dismissable_banner';
+import { identityContextPropShape, withIdentity } from 'mastodon/identity_context';
 import { domain } from 'mastodon/initial_state';
 
 import { addColumn, removeColumn, moveColumn } from '../../actions/columns';
@@ -40,16 +41,12 @@ const mapStateToProps = (state, { columnId }) => {
 };
 
 class PublicTimeline extends PureComponent {
-
-  static contextTypes = {
-    identity: PropTypes.object,
-  };
-
   static defaultProps = {
     onlyMedia: false,
   };
 
   static propTypes = {
+    identity: identityContextPropShape,
     dispatch: PropTypes.func.isRequired,
     intl: PropTypes.object.isRequired,
     columnId: PropTypes.string,
@@ -80,7 +77,7 @@ class PublicTimeline extends PureComponent {
 
   componentDidMount () {
     const { dispatch, onlyMedia, onlyRemote } = this.props;
-    const { signedIn } = this.context.identity;
+    const { signedIn } = this.props.identity;
 
     dispatch(expandPublicTimeline({ onlyMedia, onlyRemote }));
 
@@ -90,7 +87,7 @@ class PublicTimeline extends PureComponent {
   }
 
   componentDidUpdate (prevProps) {
-    const { signedIn } = this.context.identity;
+    const { signedIn } = this.props.identity;
 
     if (prevProps.onlyMedia !== this.props.onlyMedia || prevProps.onlyRemote !== this.props.onlyRemote) {
       const { dispatch, onlyMedia, onlyRemote } = this.props;
@@ -164,4 +161,4 @@ class PublicTimeline extends PureComponent {
 
 }
 
-export default connect(mapStateToProps)(injectIntl(PublicTimeline));
+export default connect(mapStateToProps)(withIdentity(injectIntl(PublicTimeline)));
diff --git a/app/javascript/mastodon/features/status/components/action_bar.jsx b/app/javascript/mastodon/features/status/components/action_bar.jsx
index 69209e8bd00820..d6105399873cf1 100644
--- a/app/javascript/mastodon/features/status/components/action_bar.jsx
+++ b/app/javascript/mastodon/features/status/components/action_bar.jsx
@@ -21,6 +21,7 @@ import RepeatActiveIcon from '@/svg-icons/repeat_active.svg?react';
 import RepeatDisabledIcon from '@/svg-icons/repeat_disabled.svg?react';
 import RepeatPrivateIcon from '@/svg-icons/repeat_private.svg?react';
 import RepeatPrivateActiveIcon from '@/svg-icons/repeat_private_active.svg?react';
+import { identityContextPropShape, withIdentity } from 'mastodon/identity_context';
 import { PERMISSION_MANAGE_USERS, PERMISSION_MANAGE_FEDERATION } from 'mastodon/permissions';
 import { WithRouterPropTypes } from 'mastodon/utils/react_router';
 
@@ -67,12 +68,8 @@ const mapStateToProps = (state, { status }) => ({
 });
 
 class ActionBar extends PureComponent {
-
-  static contextTypes = {
-    identity: PropTypes.object,
-  };
-
   static propTypes = {
+    identity: identityContextPropShape,
     status: ImmutablePropTypes.map.isRequired,
     relationship: ImmutablePropTypes.record,
     onReply: PropTypes.func.isRequired,
@@ -198,7 +195,7 @@ class ActionBar extends PureComponent {
 
   render () {
     const { status, relationship, intl } = this.props;
-    const { signedIn, permissions } = this.context.identity;
+    const { signedIn, permissions } = this.props.identity;
 
     const publicStatus       = ['public', 'unlisted'].includes(status.get('visibility'));
     const pinnableStatus     = ['public', 'unlisted', 'private'].includes(status.get('visibility'));
@@ -326,4 +323,4 @@ class ActionBar extends PureComponent {
 
 }
 
-export default withRouter(connect(mapStateToProps)(injectIntl(ActionBar)));
+export default withRouter(connect(mapStateToProps)(withIdentity(injectIntl(ActionBar))));
diff --git a/app/javascript/mastodon/features/status/index.jsx b/app/javascript/mastodon/features/status/index.jsx
index 39147597255128..3a9bf524f8c62d 100644
--- a/app/javascript/mastodon/features/status/index.jsx
+++ b/app/javascript/mastodon/features/status/index.jsx
@@ -20,6 +20,7 @@ import { Icon }  from 'mastodon/components/icon';
 import { LoadingIndicator } from 'mastodon/components/loading_indicator';
 import ScrollContainer from 'mastodon/containers/scroll_container';
 import BundleColumnError from 'mastodon/features/ui/components/bundle_column_error';
+import { identityContextPropShape, withIdentity } from 'mastodon/identity_context';
 import { WithRouterPropTypes } from 'mastodon/utils/react_router';
 
 import {
@@ -189,12 +190,8 @@ const titleFromStatus = (intl, status) => {
 };
 
 class Status extends ImmutablePureComponent {
-
-  static contextTypes = {
-    identity: PropTypes.object,
-  };
-
   static propTypes = {
+    identity: identityContextPropShape,
     params: PropTypes.object.isRequired,
     dispatch: PropTypes.func.isRequired,
     status: ImmutablePropTypes.map,
@@ -244,7 +241,7 @@ class Status extends ImmutablePureComponent {
 
   handleFavouriteClick = (status) => {
     const { dispatch } = this.props;
-    const { signedIn } = this.context.identity;
+    const { signedIn } = this.props.identity;
 
     if (signedIn) {
       if (status.get('favourited')) {
@@ -274,7 +271,7 @@ class Status extends ImmutablePureComponent {
 
   handleReplyClick = (status) => {
     const { askReplyConfirmation, dispatch, intl } = this.props;
-    const { signedIn } = this.context.identity;
+    const { signedIn } = this.props.identity;
 
     if (signedIn) {
       if (askReplyConfirmation) {
@@ -307,7 +304,7 @@ class Status extends ImmutablePureComponent {
 
   handleReblogClick = (status, e) => {
     const { dispatch } = this.props;
-    const { signedIn } = this.context.identity;
+    const { signedIn } = this.props.identity;
 
     if (signedIn) {
       if (status.get('reblogged')) {
@@ -745,4 +742,4 @@ class Status extends ImmutablePureComponent {
 
 }
 
-export default withRouter(injectIntl(connect(makeMapStateToProps)(Status)));
+export default withRouter(injectIntl(connect(makeMapStateToProps)(withIdentity(Status))));
diff --git a/app/javascript/mastodon/features/ui/components/compose_panel.jsx b/app/javascript/mastodon/features/ui/components/compose_panel.jsx
index e6ac79bdd93c7c..18321cbe63eaf4 100644
--- a/app/javascript/mastodon/features/ui/components/compose_panel.jsx
+++ b/app/javascript/mastodon/features/ui/components/compose_panel.jsx
@@ -7,16 +7,13 @@ import { changeComposing, mountCompose, unmountCompose } from 'mastodon/actions/
 import ServerBanner from 'mastodon/components/server_banner';
 import ComposeFormContainer from 'mastodon/features/compose/containers/compose_form_container';
 import SearchContainer from 'mastodon/features/compose/containers/search_container';
+import { identityContextPropShape, withIdentity } from 'mastodon/identity_context';
 
 import LinkFooter from './link_footer';
 
 class ComposePanel extends PureComponent {
-
-  static contextTypes = {
-    identity: PropTypes.object.isRequired,
-  };
-
   static propTypes = {
+    identity: identityContextPropShape,
     dispatch: PropTypes.func.isRequired,
   };
 
@@ -41,7 +38,7 @@ class ComposePanel extends PureComponent {
   }
 
   render() {
-    const { signedIn } = this.context.identity;
+    const { signedIn } = this.props.identity;
 
     return (
       <div className='compose-panel' onFocus={this.onFocus}>
@@ -65,4 +62,4 @@ class ComposePanel extends PureComponent {
 
 }
 
-export default connect()(ComposePanel);
+export default connect()(withIdentity(ComposePanel));
diff --git a/app/javascript/mastodon/features/ui/components/header.jsx b/app/javascript/mastodon/features/ui/components/header.jsx
index 2f8636b12a0e99..19c76c722b1238 100644
--- a/app/javascript/mastodon/features/ui/components/header.jsx
+++ b/app/javascript/mastodon/features/ui/components/header.jsx
@@ -13,6 +13,7 @@ import { fetchServer } from 'mastodon/actions/server';
 import { Avatar } from 'mastodon/components/avatar';
 import { Icon } from 'mastodon/components/icon';
 import { WordmarkLogo, SymbolLogo } from 'mastodon/components/logo';
+import { identityContextPropShape, withIdentity } from 'mastodon/identity_context';
 import { registrationsOpen, me, sso_redirect } from 'mastodon/initial_state';
 
 const Account = connect(state => ({
@@ -41,12 +42,8 @@ const mapDispatchToProps = (dispatch) => ({
 });
 
 class Header extends PureComponent {
-
-  static contextTypes = {
-    identity: PropTypes.object,
-  };
-
   static propTypes = {
+    identity: identityContextPropShape,
     openClosedRegistrationsModal: PropTypes.func,
     location: PropTypes.object,
     signupUrl: PropTypes.string.isRequired,
@@ -60,7 +57,7 @@ class Header extends PureComponent {
   }
 
   render () {
-    const { signedIn } = this.context.identity;
+    const { signedIn } = this.props.identity;
     const { location, openClosedRegistrationsModal, signupUrl, intl } = this.props;
 
     let content;
@@ -121,4 +118,4 @@ class Header extends PureComponent {
 
 }
 
-export default injectIntl(withRouter(connect(mapStateToProps, mapDispatchToProps)(Header)));
+export default injectIntl(withRouter(withIdentity(connect(mapStateToProps, mapDispatchToProps)(Header))));
diff --git a/app/javascript/mastodon/features/ui/components/link_footer.jsx b/app/javascript/mastodon/features/ui/components/link_footer.jsx
index 6b1555243b7668..08af6fa4442658 100644
--- a/app/javascript/mastodon/features/ui/components/link_footer.jsx
+++ b/app/javascript/mastodon/features/ui/components/link_footer.jsx
@@ -8,6 +8,7 @@ import { Link } from 'react-router-dom';
 import { connect } from 'react-redux';
 
 import { openModal } from 'mastodon/actions/modal';
+import { identityContextPropShape, withIdentity } from 'mastodon/identity_context';
 import { domain, version, source_url, statusPageUrl, profile_directory as profileDirectory } from 'mastodon/initial_state';
 import { PERMISSION_INVITE_USERS } from 'mastodon/permissions';
 import { logOut } from 'mastodon/utils/log_out';
@@ -32,12 +33,8 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
 });
 
 class LinkFooter extends PureComponent {
-
-  static contextTypes = {
-    identity: PropTypes.object,
-  };
-
   static propTypes = {
+    identity: identityContextPropShape,
     multiColumn: PropTypes.bool,
     onLogout: PropTypes.func.isRequired,
     intl: PropTypes.object.isRequired,
@@ -53,7 +50,7 @@ class LinkFooter extends PureComponent {
   };
 
   render () {
-    const { signedIn, permissions } = this.context.identity;
+    const { signedIn, permissions } = this.props.identity;
     const { multiColumn } = this.props;
 
     const canInvite = signedIn && ((permissions & PERMISSION_INVITE_USERS) === PERMISSION_INVITE_USERS);
@@ -108,4 +105,4 @@ class LinkFooter extends PureComponent {
 
 }
 
-export default injectIntl(connect(null, mapDispatchToProps)(LinkFooter));
+export default injectIntl(withIdentity(connect(null, mapDispatchToProps)(LinkFooter)));
diff --git a/app/javascript/mastodon/features/ui/components/navigation_panel.jsx b/app/javascript/mastodon/features/ui/components/navigation_panel.jsx
index 14a1933436a181..ff90eef359fb6d 100644
--- a/app/javascript/mastodon/features/ui/components/navigation_panel.jsx
+++ b/app/javascript/mastodon/features/ui/components/navigation_panel.jsx
@@ -31,6 +31,7 @@ import { fetchFollowRequests } from 'mastodon/actions/accounts';
 import { IconWithBadge } from 'mastodon/components/icon_with_badge';
 import { WordmarkLogo } from 'mastodon/components/logo';
 import { NavigationPortal } from 'mastodon/components/navigation_portal';
+import { identityContextPropShape, withIdentity } from 'mastodon/identity_context';
 import { timelinePreview, trendsEnabled } from 'mastodon/initial_state';
 import { transientSingleColumn } from 'mastodon/is_mobile';
 
@@ -97,12 +98,8 @@ const FollowRequestsLink = () => {
 };
 
 class NavigationPanel extends Component {
-
-  static contextTypes = {
-    identity: PropTypes.object.isRequired,
-  };
-
   static propTypes = {
+    identity: identityContextPropShape,
     intl: PropTypes.object.isRequired,
   };
 
@@ -112,7 +109,7 @@ class NavigationPanel extends Component {
 
   render () {
     const { intl } = this.props;
-    const { signedIn, disabledAccountId } = this.context.identity;
+    const { signedIn, disabledAccountId } = this.props.identity;
 
     let banner = undefined;
 
@@ -189,4 +186,4 @@ class NavigationPanel extends Component {
 
 }
 
-export default injectIntl(NavigationPanel);
+export default injectIntl(withIdentity(NavigationPanel));
diff --git a/app/javascript/mastodon/features/ui/index.jsx b/app/javascript/mastodon/features/ui/index.jsx
index c84a2c51a46e3e..7742f64860de2e 100644
--- a/app/javascript/mastodon/features/ui/index.jsx
+++ b/app/javascript/mastodon/features/ui/index.jsx
@@ -15,6 +15,7 @@ import { focusApp, unfocusApp, changeLayout } from 'mastodon/actions/app';
 import { synchronouslySubmitMarkers, submitMarkers, fetchMarkers } from 'mastodon/actions/markers';
 import { INTRODUCTION_VERSION } from 'mastodon/actions/onboarding';
 import { PictureInPicture } from 'mastodon/features/picture_in_picture';
+import { identityContextPropShape, withIdentity } from 'mastodon/identity_context';
 import { layoutFromWindow } from 'mastodon/is_mobile';
 import { WithRouterPropTypes } from 'mastodon/utils/react_router';
 
@@ -120,12 +121,8 @@ const keyMap = {
 };
 
 class SwitchingColumnsArea extends PureComponent {
-
-  static contextTypes = {
-    identity: PropTypes.object,
-  };
-
   static propTypes = {
+    identity: identityContextPropShape,
     children: PropTypes.node,
     location: PropTypes.object,
     singleColumn: PropTypes.bool,
@@ -160,7 +157,7 @@ class SwitchingColumnsArea extends PureComponent {
 
   render () {
     const { children, singleColumn } = this.props;
-    const { signedIn } = this.context.identity;
+    const { signedIn } = this.props.identity;
     const pathName = this.props.location.pathname;
 
     let redirect;
@@ -252,12 +249,8 @@ class SwitchingColumnsArea extends PureComponent {
 }
 
 class UI extends PureComponent {
-
-  static contextTypes = {
-    identity: PropTypes.object.isRequired,
-  };
-
   static propTypes = {
+    identity: identityContextPropShape,
     dispatch: PropTypes.func.isRequired,
     children: PropTypes.node,
     isComposing: PropTypes.bool,
@@ -309,7 +302,7 @@ class UI extends PureComponent {
       this.dragTargets.push(e.target);
     }
 
-    if (e.dataTransfer && Array.from(e.dataTransfer.types).includes('Files') && this.props.canUploadMore && this.context.identity.signedIn) {
+    if (e.dataTransfer && Array.from(e.dataTransfer.types).includes('Files') && this.props.canUploadMore && this.props.identity.signedIn) {
       this.setState({ draggingOver: true });
     }
   };
@@ -337,7 +330,7 @@ class UI extends PureComponent {
     this.setState({ draggingOver: false });
     this.dragTargets = [];
 
-    if (e.dataTransfer && e.dataTransfer.files.length >= 1 && this.props.canUploadMore && this.context.identity.signedIn) {
+    if (e.dataTransfer && e.dataTransfer.files.length >= 1 && this.props.canUploadMore && this.props.identity.signedIn) {
       this.props.dispatch(uploadCompose(e.dataTransfer.files));
     }
   };
@@ -389,7 +382,7 @@ class UI extends PureComponent {
   };
 
   componentDidMount () {
-    const { signedIn } = this.context.identity;
+    const { signedIn } = this.props.identity;
 
     window.addEventListener('focus', this.handleWindowFocus, false);
     window.addEventListener('blur', this.handleWindowBlur, false);
@@ -586,7 +579,7 @@ class UI extends PureComponent {
         <div className={classNames('ui', { 'is-composing': isComposing })} ref={this.setRef}>
           <Header />
 
-          <SwitchingColumnsArea location={location} singleColumn={layout === 'mobile' || layout === 'single-column'}>
+          <SwitchingColumnsArea identity={this.props.identity} location={location} singleColumn={layout === 'mobile' || layout === 'single-column'}>
             {children}
           </SwitchingColumnsArea>
 
@@ -602,4 +595,4 @@ class UI extends PureComponent {
 
 }
 
-export default connect(mapStateToProps)(injectIntl(withRouter(UI)));
+export default connect(mapStateToProps)(injectIntl(withRouter(withIdentity(UI))));
diff --git a/app/javascript/mastodon/identity_context.tsx b/app/javascript/mastodon/identity_context.tsx
new file mode 100644
index 00000000000000..564b7895c9b4c1
--- /dev/null
+++ b/app/javascript/mastodon/identity_context.tsx
@@ -0,0 +1,74 @@
+import PropTypes from 'prop-types';
+import { createContext, useContext } from 'react';
+
+import hoistStatics from 'hoist-non-react-statics';
+
+import type { InitialState } from 'mastodon/initial_state';
+
+export interface IdentityContextType {
+  signedIn: boolean;
+  accountId: string | undefined;
+  disabledAccountId: string | undefined;
+  accessToken: string | undefined;
+  permissions: number;
+}
+
+export const identityContextPropShape = PropTypes.shape({
+  signedIn: PropTypes.bool.isRequired,
+  accountId: PropTypes.string,
+  disabledAccountId: PropTypes.string,
+  accessToken: PropTypes.string,
+}).isRequired;
+
+export const createIdentityContext = (state: InitialState) => ({
+  signedIn: !!state.meta.me,
+  accountId: state.meta.me,
+  disabledAccountId: state.meta.disabled_account_id,
+  accessToken: state.meta.access_token,
+  permissions: state.role?.permissions ?? 0,
+});
+
+export const IdentityContext = createContext<IdentityContextType>({
+  signedIn: false,
+  permissions: 0,
+  accountId: undefined,
+  disabledAccountId: undefined,
+  accessToken: undefined,
+});
+
+export const useIdentity = () => useContext(IdentityContext);
+
+export interface IdentityProps {
+  ref?: unknown;
+  wrappedComponentRef?: unknown;
+}
+
+/* Injects an `identity` props into the wrapped component to be able to use the new context in class components */
+export function withIdentity<
+  ComponentType extends React.ComponentType<IdentityProps>,
+>(Component: ComponentType) {
+  const displayName = `withIdentity(${Component.displayName ?? Component.name})`;
+  const C = (props: React.ComponentProps<ComponentType>) => {
+    const { wrappedComponentRef, ...remainingProps } = props;
+
+    return (
+      <IdentityContext.Consumer>
+        {(context) => {
+          return (
+            // @ts-expect-error - Dynamic covariant generic components are tough to type.
+            <Component
+              {...remainingProps}
+              identity={context}
+              ref={wrappedComponentRef}
+            />
+          );
+        }}
+      </IdentityContext.Consumer>
+    );
+  };
+
+  C.displayName = displayName;
+  C.WrappedComponent = Component;
+
+  return hoistStatics(C, Component);
+}
diff --git a/app/javascript/mastodon/initial_state.js b/app/javascript/mastodon/initial_state.js
index d8c57a2a0c146f..5d60565e17a6bf 100644
--- a/app/javascript/mastodon/initial_state.js
+++ b/app/javascript/mastodon/initial_state.js
@@ -44,12 +44,22 @@
  * @property {string} sso_redirect
  */
 
+/**
+ * @typedef Role
+ * @property {string} id
+ * @property {string} name
+ * @property {string} permissions
+ * @property {string} color
+ * @property {boolean} highlighted
+ */
+
 /**
  * @typedef InitialState
  * @property {Record<string, import("./api_types/accounts").ApiAccountJSON>} accounts
  * @property {InitialStateLanguage[]} languages
  * @property {boolean=} critical_updates_pending
  * @property {InitialStateMeta} meta
+ * @property {Role?} role
  */
 
 const element = document.getElementById('initial-state');

From 0a343b9a91bc11fd61090fea027431d1e6b94479 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 19 May 2024 19:15:06 +0200
Subject: [PATCH 1052/2191] fix(deps): update react monorepo to v18.3.1
 (#30074)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index efe8cc02648ab7..0fd8ead3a76c00 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -14269,14 +14269,14 @@ __metadata:
   linkType: hard
 
 "react-dom@npm:^18.2.0":
-  version: 18.2.0
-  resolution: "react-dom@npm:18.2.0"
+  version: 18.3.1
+  resolution: "react-dom@npm:18.3.1"
   dependencies:
     loose-envify: "npm:^1.1.0"
-    scheduler: "npm:^0.23.0"
+    scheduler: "npm:^0.23.2"
   peerDependencies:
-    react: ^18.2.0
-  checksum: 10c0/66dfc5f93e13d0674e78ef41f92ed21dfb80f9c4ac4ac25a4b51046d41d4d2186abc915b897f69d3d0ebbffe6184e7c5876f2af26bfa956f179225d921be713a
+    react: ^18.3.1
+  checksum: 10c0/a752496c1941f958f2e8ac56239172296fcddce1365ce45222d04a1947e0cc5547df3e8447f855a81d6d39f008d7c32eab43db3712077f09e3f67c4874973e85
   languageName: node
   linkType: hard
 
@@ -14679,11 +14679,11 @@ __metadata:
   linkType: hard
 
 "react@npm:^18.2.0":
-  version: 18.2.0
-  resolution: "react@npm:18.2.0"
+  version: 18.3.1
+  resolution: "react@npm:18.3.1"
   dependencies:
     loose-envify: "npm:^1.1.0"
-  checksum: 10c0/b562d9b569b0cb315e44b48099f7712283d93df36b19a39a67c254c6686479d3980b7f013dc931f4a5a3ae7645eae6386b4aa5eea933baa54ecd0f9acb0902b8
+  checksum: 10c0/283e8c5efcf37802c9d1ce767f302dd569dd97a70d9bb8c7be79a789b9902451e0d16334b05d73299b20f048cbc3c7d288bbbde10b701fa194e2089c237dbea3
   languageName: node
   linkType: hard
 

From 0f07e1cd4cf04049eda34d4dfd98c12fafc5e344 Mon Sep 17 00:00:00 2001
From: Nick Schonning <nschonni@gmail.com>
Date: Sun, 19 May 2024 15:37:49 -0400
Subject: [PATCH 1053/2191] Fix yarn.lock diff (#30366)

---
 yarn.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yarn.lock b/yarn.lock
index 0fd8ead3a76c00..4d6fe4d1faf638 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -15344,7 +15344,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"scheduler@npm:^0.23.0, scheduler@npm:^0.23.2":
+"scheduler@npm:^0.23.2":
   version: 0.23.2
   resolution: "scheduler@npm:0.23.2"
   dependencies:

From 990a0c19a9205fdd8b3e6c0082cc8b80725de144 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Mon, 20 May 2024 09:29:27 +0200
Subject: [PATCH 1054/2191] Fix a warning when running JS Tests because of
 FakeIdentityContext using deprecated context API (#30368)

---
 app/javascript/mastodon/test_helpers.tsx | 43 ++++++------------------
 1 file changed, 11 insertions(+), 32 deletions(-)

diff --git a/app/javascript/mastodon/test_helpers.tsx b/app/javascript/mastodon/test_helpers.tsx
index 69d57b95a0437b..bfea3f6bf4dfe4 100644
--- a/app/javascript/mastodon/test_helpers.tsx
+++ b/app/javascript/mastodon/test_helpers.tsx
@@ -1,7 +1,3 @@
-import PropTypes from 'prop-types';
-import type { PropsWithChildren } from 'react';
-import { Component } from 'react';
-
 import { IntlProvider } from 'react-intl';
 
 import { MemoryRouter } from 'react-router';
@@ -9,44 +5,27 @@ import { MemoryRouter } from 'react-router';
 // eslint-disable-next-line import/no-extraneous-dependencies
 import { render as rtlRender } from '@testing-library/react';
 
-class FakeIdentityWrapper extends Component<
-  PropsWithChildren<{ signedIn: boolean }>
-> {
-  static childContextTypes = {
-    identity: PropTypes.shape({
-      signedIn: PropTypes.bool.isRequired,
-      accountId: PropTypes.string,
-      disabledAccountId: PropTypes.string,
-      accessToken: PropTypes.string,
-    }).isRequired,
-  };
-
-  getChildContext() {
-    return {
-      identity: {
-        signedIn: this.props.signedIn,
-        accountId: '123',
-        accessToken: 'test-access-token',
-      },
-    };
-  }
-
-  render() {
-    return this.props.children;
-  }
-}
+import { IdentityContext } from './identity_context';
 
 function render(
   ui: React.ReactElement,
   { locale = 'en', signedIn = true, ...renderOptions } = {},
 ) {
+  const fakeIdentity = {
+    signedIn: signedIn,
+    accountId: '123',
+    accessToken: 'test-access-token',
+    disabledAccountId: undefined,
+    permissions: 0,
+  };
+
   const Wrapper = (props: { children: React.ReactNode }) => {
     return (
       <MemoryRouter>
         <IntlProvider locale={locale}>
-          <FakeIdentityWrapper signedIn={signedIn}>
+          <IdentityContext.Provider value={fakeIdentity}>
             {props.children}
-          </FakeIdentityWrapper>
+          </IdentityContext.Provider>
         </IntlProvider>
       </MemoryRouter>
     );

From 778bd96a52a6c608f78b07f80764046a2eac61b3 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 20 May 2024 09:40:20 +0200
Subject: [PATCH 1055/2191] chore(deps): update dependency @types/lodash to
 v4.17.4 (#30371)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 4d6fe4d1faf638..98b2da31129fef 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3705,9 +3705,9 @@ __metadata:
   linkType: hard
 
 "@types/lodash@npm:^4.14.195":
-  version: 4.17.1
-  resolution: "@types/lodash@npm:4.17.1"
-  checksum: 10c0/af2ad8a3c8d7deb170a7ec6e18afc5ae8980576e5f7fe798d8a95a1df7222c15bdf967a25a35879f575a3b64743de00145710ee461a0051e055e94e4fe253f45
+  version: 4.17.4
+  resolution: "@types/lodash@npm:4.17.4"
+  checksum: 10c0/0124c64cb9fe7a0f78b6777955abd05ef0d97844d49118652eae45f8fa57bfb7f5a7a9bccc0b5a84c0a6dc09631042e4590cb665acb9d58dfd5e6543c75341ec
   languageName: node
   linkType: hard
 

From 814d00cf4b8942b87db17b2bc2877f25d7e83f96 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 20 May 2024 09:40:37 +0200
Subject: [PATCH 1056/2191] chore(deps): update dependency @formatjs/cli to
 v6.2.12 (#30370)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 98b2da31129fef..6b1dd8d22dbe2d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2215,13 +2215,13 @@ __metadata:
   linkType: hard
 
 "@formatjs/cli@npm:^6.1.1":
-  version: 6.2.10
-  resolution: "@formatjs/cli@npm:6.2.10"
+  version: 6.2.12
+  resolution: "@formatjs/cli@npm:6.2.12"
   peerDependencies:
     "@glimmer/env": ^0.1.7
-    "@glimmer/reference": ^0.91.1
-    "@glimmer/syntax": ^0.91.1
-    "@glimmer/validator": ^0.91.1
+    "@glimmer/reference": ^0.91.1 || ^0.92.0
+    "@glimmer/syntax": ^0.92.0
+    "@glimmer/validator": ^0.92.0
     "@vue/compiler-core": ^3.4.0
     content-tag: ^2.0.1
     ember-template-recast: ^6.1.4
@@ -2245,7 +2245,7 @@ __metadata:
       optional: true
   bin:
     formatjs: bin/formatjs
-  checksum: 10c0/34b1b0b3be25d945111c1f57913f50da7308ecd05501a27eaca210a774eb50c616b5706ba796d37ffa223ac4c5cddd5f36fe0ca8d31ad8c8ade79cdd497ccfb9
+  checksum: 10c0/3bd05a9fad6c837e22988e6638f426c128efa46ab80ff88cf2ad81fb3bc10cf4f228907577fc01e24c2d7d505cfabfaa69f0496d2ec8f0ab2d6b5eaccb5e475c
   languageName: node
   linkType: hard
 

From 8b75d18371edb1830de72b83737f94d9024b32b4 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 20 May 2024 09:41:38 +0200
Subject: [PATCH 1057/2191] New Crowdin Translations (automated) (#30358)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/ia.json |  30 +--
 app/javascript/mastodon/locales/ru.json |   1 +
 app/javascript/mastodon/locales/sl.json |   1 +
 app/javascript/mastodon/locales/th.json |   2 +-
 config/locales/bg.yml                   |   1 +
 config/locales/ca.yml                   |   1 +
 config/locales/da.yml                   |   1 +
 config/locales/de.yml                   |   1 +
 config/locales/devise.ia.yml            |  53 +++--
 config/locales/doorkeeper.ia.yml        |  77 +++++-
 config/locales/es-AR.yml                |   1 +
 config/locales/es-MX.yml                |   1 +
 config/locales/es.yml                   |   1 +
 config/locales/fi.yml                   |   1 +
 config/locales/fo.yml                   |   1 +
 config/locales/gl.yml                   |   1 +
 config/locales/he.yml                   |   1 +
 config/locales/hu.yml                   |   1 +
 config/locales/ia.yml                   | 301 ++++++++++++++++++++++++
 config/locales/it.yml                   |   1 +
 config/locales/ko.yml                   |   1 +
 config/locales/lad.yml                  |   1 +
 config/locales/nl.yml                   |   1 +
 config/locales/pl.yml                   |   1 +
 config/locales/pt-PT.yml                |   1 +
 config/locales/simple_form.fi.yml       |   6 +-
 config/locales/simple_form.sl.yml       |   6 +
 config/locales/sl.yml                   |   1 +
 config/locales/sr-Latn.yml              |   1 +
 config/locales/sr.yml                   |   1 +
 config/locales/sv.yml                   |   1 +
 config/locales/th.yml                   |   2 +
 config/locales/tr.yml                   |   1 +
 config/locales/vi.yml                   |   1 +
 config/locales/zh-CN.yml                |   1 +
 config/locales/zh-TW.yml                |   1 +
 36 files changed, 464 insertions(+), 41 deletions(-)

diff --git a/app/javascript/mastodon/locales/ia.json b/app/javascript/mastodon/locales/ia.json
index 313563bdfe3294..47c64e3f0dde88 100644
--- a/app/javascript/mastodon/locales/ia.json
+++ b/app/javascript/mastodon/locales/ia.json
@@ -19,7 +19,7 @@
   "account.block_domain": "Blocar dominio {domain}",
   "account.block_short": "Blocar",
   "account.blocked": "Blocate",
-  "account.browse_more_on_origin_server": "Navigar plus sur le profilo original",
+  "account.browse_more_on_origin_server": "Percurrer plus sur le profilo original",
   "account.cancel_follow_request": "Cancellar sequimento",
   "account.copy": "Copiar ligamine a profilo",
   "account.direct": "Mentionar privatemente @{name}",
@@ -122,7 +122,7 @@
   "column.direct": "Mentiones private",
   "column.directory": "Navigar profilos",
   "column.domain_blocks": "Dominios blocate",
-  "column.favourites": "Favoritos",
+  "column.favourites": "Favorites",
   "column.firehose": "Fluxos in directo",
   "column.follow_requests": "Requestas de sequimento",
   "column.home": "Initio",
@@ -204,7 +204,7 @@
   "disabled_account_banner.account_settings": "Parametros de conto",
   "disabled_account_banner.text": "Tu conto {disabledAccount} es actualmente disactivate.",
   "dismissable_banner.community_timeline": "Ecce le messages public le plus recente del personas con contos sur {domain}.",
-  "dismissable_banner.dismiss": "Dimitter",
+  "dismissable_banner.dismiss": "Clauder",
   "dismissable_banner.explore_links": "Istes es le articulos de novas que se condivide le plus sur le rete social hodie. Le articulos de novas le plus recente, publicate per plus personas differente, se classifica plus in alto.",
   "dismissable_banner.explore_statuses": "Ecce le messages de tote le rete social que gania popularitate hodie. Le messages plus nove con plus impulsos e favorites se classifica plus in alto.",
   "dismissable_banner.explore_tags": "Ecce le hashtags que gania popularitate sur le rete social hodie. Le hashtags usate per plus personas differente se classifica plus in alto.",
@@ -212,8 +212,8 @@
   "domain_block_modal.block": "Blocar le servitor",
   "domain_block_modal.block_account_instead": "Blocar @{name} in su loco",
   "domain_block_modal.they_can_interact_with_old_posts": "Le personas de iste servitor pote interager con tu messages ancian.",
-  "domain_block_modal.they_cant_follow": "Nulle persona ab iste servitor pote sequer te.",
-  "domain_block_modal.they_wont_know": "Illes non sapera que illes ha essite blocate.",
+  "domain_block_modal.they_cant_follow": "Necuno de iste servitor pote sequer te.",
+  "domain_block_modal.they_wont_know": "Ille non sapera que ille ha essite blocate.",
   "domain_block_modal.title": "Blocar dominio?",
   "domain_block_modal.you_will_lose_followers": "Omne sequitores ab iste servitor essera removite.",
   "domain_block_modal.you_wont_see_posts": "Tu non videra messages e notificationes ab usatores sur iste servitor.",
@@ -307,7 +307,7 @@
   "follow_request.reject": "Rejectar",
   "follow_requests.unlocked_explanation": "Benque tu conto non es serrate, le personal de {domain} pensa que es un bon idea que tu revide manualmente le sequente requestas de iste contos.",
   "follow_suggestions.curated_suggestion": "Selection del equipa",
-  "follow_suggestions.dismiss": "Non monstrar novemente",
+  "follow_suggestions.dismiss": "Non monstrar de novo",
   "follow_suggestions.featured_longer": "Seligite con cura per le equipa de {domain}",
   "follow_suggestions.friends_of_friends_longer": "Popular inter le gente que tu seque",
   "follow_suggestions.hints.featured": "Iste profilo ha essite seligite manualmente per le equipa de {domain}.",
@@ -412,7 +412,7 @@
   "lightbox.next": "Sequente",
   "lightbox.previous": "Precedente",
   "limited_account_hint.action": "Monstrar profilo in omne caso",
-  "limited_account_hint.title": "Iste profilo esseva celate per le moderatores de {domain}.",
+  "limited_account_hint.title": "Iste profilo ha essite celate per le moderatores de {domain}.",
   "link_preview.author": "Per {name}",
   "lists.account.add": "Adder al lista",
   "lists.account.remove": "Remover del lista",
@@ -432,12 +432,12 @@
   "loading_indicator.label": "Cargante…",
   "media_gallery.toggle_visible": "{number, plural, one {Celar imagine} other {Celar imagines}}",
   "moved_to_account_banner.text": "Tu conto {disabledAccount} es actualmente disactivate perque tu ha cambiate de conto a {movedToAccount}.",
-  "mute_modal.hide_from_notifications": "Celar ab notificationes",
+  "mute_modal.hide_from_notifications": "Celar in notificationes",
   "mute_modal.hide_options": "Celar optiones",
   "mute_modal.indefinite": "Usque io dissilentia iste persona",
   "mute_modal.show_options": "Monstrar optiones",
-  "mute_modal.they_can_mention_and_follow": "Illes pote mentionar te e sequer te, ma tu non potera vider los.",
-  "mute_modal.they_wont_know": "Illes non sapera que illes ha essite silentiate.",
+  "mute_modal.they_can_mention_and_follow": "Ille pote mentionar te e sequer te, ma tu non potera vider le.",
+  "mute_modal.they_wont_know": "Ille non sapera que ille ha essite silentiate.",
   "mute_modal.title": "Silentiar le usator?",
   "mute_modal.you_wont_see_mentions": "Tu non videra le messages que mentiona iste persona.",
   "mute_modal.you_wont_see_posts": "Iste persona pote totevia vider tu messages, ma tu non videra le sues.",
@@ -451,13 +451,13 @@
   "navigation_bar.discover": "Discoperir",
   "navigation_bar.domain_blocks": "Dominios blocate",
   "navigation_bar.explore": "Explorar",
-  "navigation_bar.favourites": "Favoritos",
+  "navigation_bar.favourites": "Favorites",
   "navigation_bar.filters": "Parolas silentiate",
   "navigation_bar.follow_requests": "Requestas de sequimento",
   "navigation_bar.followed_tags": "Hashtags sequite",
   "navigation_bar.follows_and_followers": "Sequites e sequitores",
   "navigation_bar.lists": "Listas",
-  "navigation_bar.logout": "Clauder le session",
+  "navigation_bar.logout": "Clauder session",
   "navigation_bar.mutes": "Usatores silentiate",
   "navigation_bar.opened_in_classic_interface": "Messages, contos e altere paginas specific es aperite per predefinition in le interfacie web classic.",
   "navigation_bar.personal": "Personal",
@@ -501,7 +501,7 @@
   "notifications.column_settings.admin.report": "Nove signalationes:",
   "notifications.column_settings.admin.sign_up": "Nove inscriptiones:",
   "notifications.column_settings.alert": "Notificationes de scriptorio",
-  "notifications.column_settings.favourite": "Favoritos:",
+  "notifications.column_settings.favourite": "Favorites:",
   "notifications.column_settings.filter_bar.advanced": "Monstrar tote le categorias",
   "notifications.column_settings.filter_bar.category": "Barra de filtro rapide",
   "notifications.column_settings.follow": "Nove sequitores:",
@@ -518,7 +518,7 @@
   "notifications.column_settings.update": "Modificationes:",
   "notifications.filter.all": "Toto",
   "notifications.filter.boosts": "Impulsos",
-  "notifications.filter.favourites": "Favoritos",
+  "notifications.filter.favourites": "Favorites",
   "notifications.filter.follows": "Sequites",
   "notifications.filter.mentions": "Mentiones",
   "notifications.filter.polls": "Resultatos del sondage",
@@ -717,7 +717,7 @@
   "status.edited": "Ultime modification le {date}",
   "status.edited_x_times": "Modificate {count, plural, one {{count} vice} other {{count} vices}}",
   "status.embed": "Incastrar",
-  "status.favourite": "Adder al favoritos",
+  "status.favourite": "Adder al favorites",
   "status.favourites": "{count, plural, one {favorite} other {favorites}}",
   "status.filter": "Filtrar iste message",
   "status.filtered": "Filtrate",
diff --git a/app/javascript/mastodon/locales/ru.json b/app/javascript/mastodon/locales/ru.json
index cd09a505b3e93c..07a41385a2bf26 100644
--- a/app/javascript/mastodon/locales/ru.json
+++ b/app/javascript/mastodon/locales/ru.json
@@ -468,6 +468,7 @@
   "notification.follow": "{name} подписался (-лась) на вас",
   "notification.follow_request": "{name} отправил запрос на подписку",
   "notification.mention": "{name} упомянул(а) вас",
+  "notification.moderation_warning.action_delete_statuses": "Некоторые из ваших публикаций были удалены.",
   "notification.own_poll": "Ваш опрос закончился",
   "notification.poll": "Опрос, в котором вы приняли участие, завершился",
   "notification.reblog": "{name} продвинул(а) ваш пост",
diff --git a/app/javascript/mastodon/locales/sl.json b/app/javascript/mastodon/locales/sl.json
index 459d05ce3ecfe8..7806abc6b55fbb 100644
--- a/app/javascript/mastodon/locales/sl.json
+++ b/app/javascript/mastodon/locales/sl.json
@@ -474,6 +474,7 @@
   "notification.follow_request": "{name} vam želi slediti",
   "notification.mention": "{name} vas je omenil/a",
   "notification.moderation-warning.learn_more": "Več o tem",
+  "notification.moderation_warning": "Prejeli ste opozorilo moderatorjev",
   "notification.moderation_warning.action_delete_statuses": "Nekatere vaše objave so odstranjene.",
   "notification.moderation_warning.action_disable": "Vaš račun je bil onemogočen.",
   "notification.moderation_warning.action_mark_statuses_as_sensitive": "Nekatere vaše objave so bile označene kot občutljive.",
diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json
index 7c6b2ade4e3629..b1b9407ba11d9a 100644
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@@ -158,7 +158,7 @@
   "compose_form.poll.option_placeholder": "ตัวเลือก {number}",
   "compose_form.poll.single": "เลือกอย่างใดอย่างหนึ่ง",
   "compose_form.poll.switch_to_multiple": "เปลี่ยนการสำรวจความคิดเห็นเป็นอนุญาตหลายตัวเลือก",
-  "compose_form.poll.switch_to_single": "เปลี่ยนการสำรวจความคิดเห็นเป็นอนุญาตตัวเลือกเดี่ยว",
+  "compose_form.poll.switch_to_single": "เปลี่ยนการสำรวจความคิดเห็นเป็นอนุญาตตัวเลือกเดียว",
   "compose_form.poll.type": "ลักษณะ",
   "compose_form.publish": "โพสต์",
   "compose_form.publish_form": "โพสต์ใหม่",
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index f242039ed8dbf8..51180bc66f2724 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -285,6 +285,7 @@ bg:
         update_custom_emoji_html: "%{name} обнови емоджито %{target}"
         update_domain_block_html: "%{name} обнови блокирането на домейна за %{target}"
         update_ip_block_html: "%{name} промени правило за IP на %{target}"
+        update_report_html: "%{name} осъвремени доклад %{target}"
         update_status_html: "%{name} обнови публикация от %{target}"
         update_user_role_html: "%{name} промени ролята %{target}"
       deleted_account: изтрит акаунт
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 08fef736420556..34fd9008516ac0 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -285,6 +285,7 @@ ca:
         update_custom_emoji_html: "%{name} ha actualitzat l'emoji %{target}"
         update_domain_block_html: "%{name} ha actualitzat el bloqueig de domini per a %{target}"
         update_ip_block_html: "%{name} ha canviat la norma per la IP %{target}"
+        update_report_html: "%{name} ha actualitzat l'informe %{target}"
         update_status_html: "%{name} ha actualitzat l'estat de %{target}"
         update_user_role_html: "%{name} ha canviat el rol %{target}"
       deleted_account: compte eliminat
diff --git a/config/locales/da.yml b/config/locales/da.yml
index 252d0e2b580158..17d3037a75a505 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -285,6 +285,7 @@ da:
         update_custom_emoji_html: "%{name} opdaterede emoji %{target}"
         update_domain_block_html: "%{name} opdaterede domæneblokeringen for %{target}"
         update_ip_block_html: "%{name} ændrede reglen for IP'en %{target}"
+        update_report_html: "%{name} opdaterede rapporten %{target}"
         update_status_html: "%{name} opdaterede indlægget fra %{target}"
         update_user_role_html: "%{name} ændrede %{target}-rolle"
       deleted_account: slettet konto
diff --git a/config/locales/de.yml b/config/locales/de.yml
index b19315e3942d95..dd2129584fbe7a 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -285,6 +285,7 @@ de:
         update_custom_emoji_html: "%{name} bearbeitete das Emoji %{target}"
         update_domain_block_html: "%{name} aktualisierte die Domain-Sperre für %{target}"
         update_ip_block_html: "%{name} änderte die Regel für die IP-Adresse %{target}"
+        update_report_html: "%{name} überarbeitete die Meldung %{target}"
         update_status_html: "%{name} überarbeitete einen Beitrag von %{target}"
         update_user_role_html: "%{name} änderte die Rolle von %{target}"
       deleted_account: gelöschtes Konto
diff --git a/config/locales/devise.ia.yml b/config/locales/devise.ia.yml
index c68efddd07880f..e6ae6d4afbbff4 100644
--- a/config/locales/devise.ia.yml
+++ b/config/locales/devise.ia.yml
@@ -6,11 +6,11 @@ ia:
       send_instructions: Tu recipera un e-mail con instructiones pro confirmar tu adresse de e-mail in poc minutas. Per favor verifica tu dossier de spam si tu non lo recipe.
       send_paranoid_instructions: Si tu adresse de e-mail existe in nostre base de datos, tu recipera un e-mail con instructiones pro confirmar tu adresse de e-mail in poc minutas. Per favor verifica tu dossier de spam si tu non lo recipe.
     failure:
-      already_authenticated: Tu jam initiava le session.
-      inactive: Tu conto ancora non es activate.
+      already_authenticated: Tu ha jam aperite session.
+      inactive: Tu conto non es ancora activate.
       invalid: "%{authentication_keys} o contrasigno non valide."
       last_attempt: Tu ha solmente un altere tentativa ante que tu conto es serrate.
-      locked: Tu conto es blocate.
+      locked: Tu conto es serrate.
       not_found_in_database: "%{authentication_keys} o contrasigno non valide."
       omniauth_user_creation_failure: Error creante un conto pro iste identitate.
       pending: Tu conto es ancora sub revision.
@@ -51,12 +51,12 @@ ia:
         explanation: Ora es possibile aperir session con solmente le adresse de e-mail e contrasigno.
         subject: 'Mastodon: Authentication bifactorial disactivate'
         subtitle: Le authentication bifactorial ha essite disactivate pro tu conto.
-        title: 2FA disactivate
+        title: A2F disactivate
       two_factor_enabled:
         explanation: Pro le apertura de session essera necessari un token generate per le application TOTP accopulate.
         subject: 'Mastodon: Authentication bifactorial activate'
         subtitle: Le authentication bifactorial ha essite activate pro tu conto.
-        title: 2FA activate
+        title: A2F activate
       two_factor_recovery_codes_changed:
         explanation: Le ancian codices de recuperation ha essite invalidate e nove codices ha essite generate.
         subject: 'Mastodon: Codices de recuperation regenerate'
@@ -66,11 +66,11 @@ ia:
         subject: 'Mastodon: Instructiones pro disblocar'
       webauthn_credential:
         added:
-          explanation: Le sequente clave de securitate esseva addite a tu conto
+          explanation: Le sequente clave de securitate ha essite addite a tu conto
           subject: 'Mastodon: Nove clave de securitate'
-          title: Un nove clave de securitate esseva addite
+          title: Un nove clave de securitate ha essite addite
         deleted:
-          explanation: Le sequente clave de securitate esseva delite de tu conto
+          explanation: Le sequente clave de securitate ha essite delite de tu conto
           subject: 'Mastodon: Clave de securitate delite'
           title: Un de tu claves de securitate ha essite delite
       webauthn_disabled:
@@ -81,18 +81,41 @@ ia:
       webauthn_enabled:
         explanation: Le authentication con claves de securitate ha essite activate pro tu conto.
         extra: Tu clave de securitate pote ora esser usate pro aperir session.
+        subject: 'Mastodon: authentication de clave de securitate activate'
         title: Claves de securitate activate
+    omniauth_callbacks:
+      failure: Impossibile authenticar te ab %{kind} perque “%{reason}”.
+      success: Authenticate con successo ab conto %{kind}.
+    passwords:
+      no_token: Tu non pote acceder iste pagina sin venir ab un email de redefinition de contrasigno. Si tu veni ab un email de redefinition de contrasigno, verifica que tu usava le integre URL fornite.
+      send_instructions: Si tu adresse de e-mail existe in nostre base de datos, tu recipera un ligamine de recuperation de contrasigno in tu adresse de e-mail in poc minutas. Per favor verifica tu dossier de spam si tu non lo recipe.
+      send_paranoid_instructions: Si tu adresse de e-mail existe in nostre base de datos, tu recipera un ligamine de recuperation de contrasigno in tu adresse de e-mail in poc minutas. Per favor verifica tu dossier de spam si tu non lo recipe.
+      updated: Tu contrasigno ha essite cambiate. Tu ha ora aperite session.
+      updated_not_active: Tu contrasigno ha essite cambiate.
     registrations:
-      destroyed: A revider! Tu conto esseva cancellate con successo. Nos spera vider te novemente tosto.
-      signed_up_but_pending: Un message con un ligamine de confirmation esseva inviate a tu conto de email. Post que tu clicca le ligamine, nos revidera tu application. Tu essera notificate si illo es approbate.
+      destroyed: A revider! Tu conto ha essite cancellate. Nos spera vider te de novo tosto.
+      signed_up: Benvenite! Tu te ha inscribite con successo.
+      signed_up_but_inactive: Tu te ha inscribite con successo. Nonobstante, nos non poteva aperir tu session perque tu conto non es ancora activate.
+      signed_up_but_locked: Tu te ha inscribite con successo. Nonobstante, nos non poteva aperir tu session perque tu conto es serrate.
+      signed_up_but_pending: Un message con un ligamine de confirmation ha essite inviate a tu adresse de email. Post que tu clicca sur le ligamine, nos revidera tu demanda. Tu essera notificate si illo es approbate.
+      signed_up_but_unconfirmed: Un message con un ligamine de confirmation ha essite inviate a tu adresse de e-mail. Per favor seque le ligamine pro activar tu conto. Verifica tu dossier de spam si tu non recipe iste e-mail.
+      update_needs_confirmation: Tu ha actualisate tu conto con successo, ma nos debe verificar tu nove adresse de e-mail. Accede a tu e-mail e seque le ligamine de confirmation pro confirmar tu nove adresse de e-mail. Verifica tu dossier de spam si tu non recipe iste e-mail.
       updated: Tu conto ha essite actualisate con successo.
     sessions:
-      signed_in: Connexe con successo.
-      signed_out: Disconnexe con successo.
+      already_signed_out: Session claudite con successo.
+      signed_in: Session aperite con successo.
+      signed_out: Session claudite con successo.
     unlocks:
-      unlocked: Tu conto ha essite disblocate con successo. Initia session a continuar.
+      send_instructions: Tu recipera un e-mail con instructiones explicante como disserrar tu conto in alcun minutas. Verifica tu dossier de spam si tu non recipe iste e-mail.
+      send_paranoid_instructions: Si tu conto existe, tu recipera un email con instructiones explicante como disserrar lo in alcun minutas. Verifica tu dossier de spam si tu non recipe iste e-mail.
+      unlocked: Tu conto ha essite disserrate con successo. Aperi session pro continuar.
   errors:
     messages:
-      already_confirmed: jam esseva confirmate, tenta initiar session
+      already_confirmed: jam esseva confirmate, tenta aperir session
+      confirmation_period_expired: debe esser confirmate in %{period}, per favor requesta un nove
+      expired: ha expirate, per favor requesta un nove
       not_found: non trovate
-      not_locked: non era blocate
+      not_locked: non esseva serrate
+      not_saved:
+        one: '1 error ha impedite a iste %{resource} de esser salvate:'
+        other: "%{count} errores ha impedite a iste %{resource} de esser salvate:"
diff --git a/config/locales/doorkeeper.ia.yml b/config/locales/doorkeeper.ia.yml
index dc965996810817..9c493e3d7f6e16 100644
--- a/config/locales/doorkeeper.ia.yml
+++ b/config/locales/doorkeeper.ia.yml
@@ -3,28 +3,40 @@ ia:
   activerecord:
     attributes:
       doorkeeper/application:
-        name: Nomine de application
+        name: Nomine del application
+        redirect_uri: URI de redirection
         scopes: Ambitos
-        website: Sito web de application
+        website: Sito web del application
     errors:
       models:
         doorkeeper/application:
           attributes:
             redirect_uri:
+              fragment_present: non pote continer un fragmento.
               invalid_uri: debe esser un URI valide.
+              relative_uri: debe esser un URI absolute.
+              secured_uri: debe esser un URI HTTPS/SSL.
   doorkeeper:
     applications:
       buttons:
         authorize: Autorisar
         cancel: Cancellar
+        destroy: Destruer
         edit: Modificar
         submit: Submitter
       confirmations:
         destroy: Es tu secur?
       edit:
         title: Modificar application
+      form:
+        error: Oops! Verifica tu formulario pro possibile errores
+      help:
+        native_redirect_uri: Usar %{native_redirect_uri} pro tests local
+        redirect_uri: Usar un linea per URI
+        scopes: Separa ambitos con spatios. Lassa vacue pro usar le ambitos predefinite.
       index:
         application: Application
+        callback_url: URL de retorno
         delete: Deler
         empty: Tu non ha applicationes.
         name: Nomine
@@ -37,17 +49,22 @@ ia:
       show:
         actions: Actiones
         application_id: Clave del cliente
+        callback_urls: URLs de retorno
         scopes: Ambitos
+        secret: Secreto del application
         title: 'Application: %{name}'
     authorizations:
       buttons:
         authorize: Autorisar
         deny: Negar
       error:
-        title: Ocurreva un error
+        title: Un error ha occurrite
       new:
+        prompt_html: "%{client_name} vole haber le permission de acceder a tu conto. Illo es un application tertie. <strong>Si tu non confide in illo, alora tu non deberea autorisar lo.</strong>"
         review_permissions: Revisionar le permissos
         title: Autorisation necessari
+      show:
+        title: Copia iste codice de autorisation e colla lo in le application.
     authorized_applications:
       buttons:
         revoke: Revocar
@@ -55,11 +72,35 @@ ia:
         revoke: Es tu secur?
       index:
         authorized_at: Autorisate le %{date}
+        description_html: Ecce applicationes que pote acceder tu conto per le API. Si il ha applicationes que tu non recognosce ci, o un application que se comporta mal, tu pote revocar su accesso.
         last_used_at: Ultime uso in %{date}
         never_used: Nunquam usate
         scopes: Permissiones
         superapp: Interne
         title: Tu applicationes autorisate
+    errors:
+      messages:
+        access_denied: Le proprietario del ressource o servitor de autorisation ha refusate le requesta.
+        credential_flow_not_configured: Le processo de credentiales de contrasigno del proprietario del ressource ha fallite perque Doorkeeper.configure.resource_owner_from_credentials non es configurate.
+        invalid_client: Le authentication del cliente ha fallite perque le cliente es incognite, necun authentication de cliente es includite, o le methodo de authentication non es supportate.
+        invalid_grant: Le concession de autorisation fornite es invalide, expirate, revocate, non corresponde al URI de redirection usate in le requesta de autorisation, o ha essite emittite a un altere cliente.
+        invalid_redirect_uri: Le URI de redirection includite non es valide.
+        invalid_request:
+          missing_param: 'Parametro requirite mancante: %{value}.'
+          request_not_authorized: Le requesta debe esser autorisate. Un parametro requirite pro autorisar le requesta manca o non es valide.
+          unknown: Le requesta non include un parametro requirite, include un valor de parametro non supportate, o es alteremente mal formate.
+        invalid_resource_owner: Le credentiales del proprietario del ressource fornite non es valide, o le proprietario del ressource non pote esser trovate
+        invalid_scope: Le ambito requirite es invalide, incognite, o mal formate.
+        invalid_token:
+          expired: Le token de accesso ha expirate
+          revoked: Le token de accesso ha essite revocate
+          unknown: Le token de accesso non es valide
+        resource_owner_authenticator_not_configured: Impossibile trovar le proprietario del ressource perque Doorkeeper.configure.resource_owner_authenticator non es configurate.
+        server_error: Le servitor de autorisation ha incontrate un condition impreviste que lo ha impedite de complir le requesta.
+        temporarily_unavailable: Le servitor de autorisation actualmente non pote gerer le requesta a causa de un supercarga temporari o de mantenentia del servitor.
+        unauthorized_client: Le application non es autorisate a exequer iste requesta usante iste methodo.
+        unsupported_grant_type: Le typo de concession de autorisation non es supportate per le servitor de autorisation.
+        unsupported_response_type: Le servitor de autorisation non supporta iste typo de responsa.
     flash:
       applications:
         create:
@@ -73,20 +114,22 @@ ia:
           notice: Application revocate.
     grouped_scopes:
       access:
-        read: Accesso de sol lectura
+        read: Accesso de lectura sol
         read/write: Accesso de lectura e scriptura
-        write: Accesso de sol scriptura
+        write: Accesso de scriptura sol
       title:
         accounts: Contos
         admin/accounts: Gestion de contos
         admin/all: Tote le functiones administrative
         admin/reports: Gestion de reportos
-        all: Accesso plen a tu conto de Mastodon
+        all: Accesso complete a tu conto de Mastodon
         blocks: Blocadas
         bookmarks: Marcapaginas
         conversations: Conversationes
-        favourites: Favoritos
+        crypto: Cryptation de puncta a puncta
+        favourites: Favorites
         filters: Filtros
+        follow: Sequites, silentiates e blocates
         follows: Sequites
         lists: Listas
         media: Annexos multimedial
@@ -101,21 +144,41 @@ ia:
         nav:
           applications: Applicationes
           oauth2_provider: Fornitor OAuth2
+      application:
+        title: Autorisation OAuth necessari
     scopes:
       admin:read: leger tote le datos in le servitor
       admin:read:accounts: leger information sensibile de tote le contos
+      admin:read:canonical_email_blocks: leger datos sensibile de tote le blocadas de email canonic
+      admin:read:domain_allows: leger informationes sensibile de tote le dominios permittite
+      admin:read:domain_blocks: leger informationes sensibile de tote le blocadas de dominio
+      admin:read:email_domain_blocks: leger informationes sensibile de tote le blocadas de dominio email
+      admin:read:ip_blocks: leger informationes sensibile de tote le blocadas de IP
+      admin:read:reports: leger information sensibile de tote le reportos e contos signalate
       admin:write: modificar tote le datos in le servitor
+      admin:write:accounts: exequer action de moderation sur contos
+      admin:write:canonical_email_blocks: exequer actiones de moderation sur blocadas de email canonic
+      admin:write:domain_allows: exequer actiones de moderation sur dominios permittite
+      admin:write:domain_blocks: exequer actiones de moderation sur blocadas de dominio
+      admin:write:email_domain_blocks: exequer actiones de moderation sur blocadas de dominio email
+      admin:write:ip_blocks: exequer actiones de moderation sur blocadas de IP
+      admin:write:reports: exequer action de moderation sur reportos
+      crypto: usar cryptation de extremo-a-extremo
       follow: modificar relationes del contos
+      push: reciper tu notificationes push
       read: leger tote le datos de tu conto
       read:accounts: vider informationes de conto
+      read:blocks: vider tu blocadas
       read:bookmarks: vider tu marcapaginas
       read:favourites: vider tu favoritos
       read:filters: vider tu filtros
       read:follows: vider tu sequites
       read:lists: vider tu listas
       read:me: leger solmente le information basic de tu conto
+      read:mutes: vider tu silentiates
       read:notifications: vider tu notificationes
       read:reports: vider tu reportos
+      read:search: cercar in tu nomine
       read:statuses: vider tote le messages
       write: modificar tote le datos de tu conto
       write:accounts: modificar tu profilo
diff --git a/config/locales/es-AR.yml b/config/locales/es-AR.yml
index aa3668d92adbeb..302be44112eec1 100644
--- a/config/locales/es-AR.yml
+++ b/config/locales/es-AR.yml
@@ -285,6 +285,7 @@ es-AR:
         update_custom_emoji_html: "%{name} actualizó el emoji %{target}"
         update_domain_block_html: "%{name} actualizó el bloqueo de dominio para %{target}"
         update_ip_block_html: "%{name} cambió la regla para la dirección IP %{target}"
+        update_report_html: "%{name} actualizó la denuncia %{target}"
         update_status_html: "%{name} actualizó el mensaje de %{target}"
         update_user_role_html: "%{name} cambió el rol %{target}"
       deleted_account: cuenta eliminada
diff --git a/config/locales/es-MX.yml b/config/locales/es-MX.yml
index 6a306b07b061f5..10806c6b6cb312 100644
--- a/config/locales/es-MX.yml
+++ b/config/locales/es-MX.yml
@@ -285,6 +285,7 @@ es-MX:
         update_custom_emoji_html: "%{name} actualizó el emoji %{target}"
         update_domain_block_html: "%{name} actualizó el bloqueo de dominio para %{target}"
         update_ip_block_html: "%{name} cambió la regla para la IP %{target}"
+        update_report_html: "%{name} actualizó el informe %{target}"
         update_status_html: "%{name} actualizó el estado de %{target}"
         update_user_role_html: "%{name} cambió el rol %{target}"
       deleted_account: cuenta eliminada
diff --git a/config/locales/es.yml b/config/locales/es.yml
index e7db7c8b04d439..840bc2ce9b0818 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -285,6 +285,7 @@ es:
         update_custom_emoji_html: "%{name} actualizó el emoji %{target}"
         update_domain_block_html: "%{name} actualizó el bloqueo de dominio para %{target}"
         update_ip_block_html: "%{name} cambió la regla para la IP %{target}"
+        update_report_html: "%{name} actualizó el informe %{target}"
         update_status_html: "%{name} actualizó la publicación de %{target}"
         update_user_role_html: "%{name} cambió el rol %{target}"
       deleted_account: cuenta eliminada
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 5f96f611b403c2..53db0232aa5d2b 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -285,6 +285,7 @@ fi:
         update_custom_emoji_html: "%{name} päivitti emojin %{target}"
         update_domain_block_html: "%{name} päivitti verkkotunnuksen %{target} eston"
         update_ip_block_html: "%{name} muutti sääntöä IP-osoitteelle %{target}"
+        update_report_html: "%{name} päivitti raportin %{target}"
         update_status_html: "%{name} päivitti käyttäjän %{target} julkaisun"
         update_user_role_html: "%{name} muutti roolia %{target}"
       deleted_account: poisti tilin
diff --git a/config/locales/fo.yml b/config/locales/fo.yml
index f7303c512ac686..57caff4d716945 100644
--- a/config/locales/fo.yml
+++ b/config/locales/fo.yml
@@ -285,6 +285,7 @@ fo:
         update_custom_emoji_html: "%{name} dagførdi kensluteknið %{target}"
         update_domain_block_html: "%{name} dagførdi navnaøkisblokeringina hjá %{target}"
         update_ip_block_html: "%{name} broytti IP-reglurnar %{target}"
+        update_report_html: "%{name} dagførdi meldingina %{target}"
         update_status_html: "%{name} dagførdi postin hjá %{target}"
         update_user_role_html: "%{name} broyttir %{target} leiklutir"
       deleted_account: strikað konta
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 57af7c82c030db..2c85dc89ae7502 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -285,6 +285,7 @@ gl:
         update_custom_emoji_html: "%{name} actualizou o emoji %{target}"
         update_domain_block_html: "%{name} actualizou o bloqueo do dominio para %{target}"
         update_ip_block_html: "%{name} cambiou a regra para IP %{target}"
+        update_report_html: "%{name} actualizou a denuncia %{target}"
         update_status_html: "%{name} actualizou a publicación de %{target}"
         update_user_role_html: "%{name} cambiou o rol %{target}"
       deleted_account: conta eliminada
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 14da27ec75e281..3613a9f0b3b394 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -291,6 +291,7 @@ he:
         update_custom_emoji_html: "%{name} עדכן/ה אמוג'י %{target}"
         update_domain_block_html: "%{name} עדכן/ה חסימת דומיין עבור %{target}"
         update_ip_block_html: "%{name} שינה כלל עבור IP %{target}"
+        update_report_html: '%{name} עדכן/ה דו"ח %{target}'
         update_status_html: "%{name} עדכן/ה הודעה של %{target}"
         update_user_role_html: "%{name} שינה את התפקיד של %{target}"
       deleted_account: חשבון מחוק
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index c48d527cafa74f..dd578305151f60 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -285,6 +285,7 @@ hu:
         update_custom_emoji_html: "%{name} frissítette az emodzsit: %{target}"
         update_domain_block_html: "%{name} frissítette a %{target} domain tiltását"
         update_ip_block_html: "%{name} módosította a(z) %{target} IP-címre vonatkozó szabályt"
+        update_report_html: "%{name} frissítette a %{target} bejelentést"
         update_status_html: "%{name} frissítette %{target} felhasználó bejegyzését"
         update_user_role_html: "%{name} módosította a(z) %{target} szerepkört"
       deleted_account: törölt fiók
diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index 68676a09f73957..8af676454fadee 100644
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -285,6 +285,7 @@ ia:
         update_custom_emoji_html: "%{name} actualisava le emoticone %{target}"
         update_domain_block_html: "%{name} actualisava le blocada de dominio pro %{target}"
         update_ip_block_html: "%{name} cambiava le regula pro IP %{target}"
+        update_report_html: "%{name} actualisava le reporto %{target}"
         update_status_html: "%{name} actualisava le message per %{target}"
         update_user_role_html: "%{name} cambiava le rolo de %{target}"
       deleted_account: conto delite
@@ -973,6 +974,7 @@ ia:
       webhook: Crocs web
   admin_mailer:
     auto_close_registrations:
+      body: Per un carentia recente de activate de moderator, le registrationes sur %{instance} ha essite automaticamente mutate a besoniante revision manual, pro impedir %{instance} de esser usate como un platteforma pro potential mal actores. Tu pote mutar lo retro pro sempre aperir le registrationes.
       subject: Le registrationes pro %{instance} ha essite automaticamente mutate a besoniante de approbation
     new_appeal:
       actions:
@@ -1054,19 +1056,27 @@ ia:
       clicking_this_link: cliccante iste ligamine
       login_link: acceder
       proceed_to_login_html: Ora tu pote continuar a %{login_link}.
+      redirect_to_app_html: Tu deberea haber essite re-dirigite al app <strong>%{app_name}</strong>. Si isto non eveni, tenta %{clicking_this_link} o manualmente retorna al app.
+      registration_complete: Tu registration sur %{domain} es ora complete!
       welcome_title: Benvenite, %{name}!
+      wrong_email_hint: Si ille adresse email non es correcte, tu pote cambiar lo in parametros de conto.
     delete_account: Deler le conto
+    delete_account_html: Si tu vole a dele tu conto, tu pote <a href="%{path}">continuar ci</a>. Te sera demandate confirmation.
     description:
+      prefix_invited_by_user: "@%{name} te invita a junger te a iste servitor de Mastodon!"
       prefix_sign_up: Inscribe te sur Mastodon hodie!
+      suffix: Con un conto, tu potera sequer personas, messages de actualisation e excambios de messages con usatores de ulle servitor de Mastodon e plus!
     didnt_get_confirmation: Non recipeva tu un ligamine de confirmation?
     dont_have_your_security_key: Non ha tu le clave de securitate?
     forgot_password: Contrasigno oblidate?
     invalid_reset_password_token: Pete un nove.
+    link_to_otp: Insere un codice a duo factores o un codice de recuperation ab tu telephono
     link_to_webauth: Usa tu apparato clave de securitate
     log_in_with: Accede con
     login: Accede
     logout: Clauder le session
     migrate_account: Move a un conto differente
+    migrate_account_html: Si tu vole re-adressar iste conto a un altere, tu pote <a href="%{path}">configurar lo ci</a>.
     or_log_in_with: O accede con
     privacy_policy_agreement_html: Io ha legite e acceptar le <a href="<a href="%{privacy_policy_path}" target="_blank">politica de confidentialitate</a>
     progress:
@@ -1192,6 +1202,7 @@ ia:
     invalid_domain: non es un nomine de dominio valide
   edit_profile:
     basic_information: Information basic
+    hint_html: "<strong>Personalisa lo que le personas vide sur tu profilo public e presso tu messages.</strong> Il es plus probabile que altere personas te seque e interage con te quando tu ha un profilo compilate e un photo de profilo."
     other: Alteres
   errors:
     '400': Le requesta que tu inviava era non valide o mal formate.
@@ -1230,6 +1241,7 @@ ia:
     add_new: Adder nove
     errors:
       limit: Tu ha jam consiliate le maxime numero de hashtags
+    hint_html: "<strong>Consilia tu plus importante hashtags sur tu profilo.</strong> Un grande instrumento pro tener tracia de tu labores creative e projectos de longe-tempore, le hashtags consiliate es monstrate prominentemente sur tu profilo e permitte accesso rapide a tu proprie messages."
   filters:
     contexts:
       account: Profilos
@@ -1241,8 +1253,10 @@ ia:
       add_keyword: Adder parola clave
       keywords: Parolas clave
       statuses: Messages individual
+      statuses_hint_html: Iste filtro se applica a seliger messages singule sin reguardo si illes concorda le parolas clave infra. <a href="%{path}">Revide o remove le messages ab le filtro</a>.
       title: Modificar filtro
     errors:
+      deprecated_api_multiple_keywords: Iste parametros non pote esser cambiate ab iste application perque illos se applica a plus que un sol parola clave del filtro. Usa un application plus recente o le interfacie web.
       invalid_context: Nulle o non valide contexto supplite
     index:
       contexts: Filtros in %{contexts}
@@ -1272,6 +1286,12 @@ ia:
         title: Messages filtrate
   generic:
     all: Toto
+    all_items_on_page_selected_html:
+      one: "<strong>%{count}</strong> elemento sur iste pagina es seligite."
+      other: Tote le <strong>%{count}</strong> elementos sur iste pagina es seligite.
+    all_matching_items_selected_html:
+      one: "<strong>%{count}</strong> elemento concordante que tu cerca es seligite."
+      other: Tote le <strong>%{count}</strong> elementos concordante que tu cerca es seligite.
     cancel: Cancellar
     changes_saved_msg: Cambios salveguardate con successo!
     confirm: Confirmar
@@ -1299,13 +1319,24 @@ ia:
     imported: Importate
     mismatched_types_warning: Il appare que tu pote haber seligite le typo errate pro iste importation, controla duo vices.
     modes:
+      merge: Funder
+      merge_long: Mantene le registrationes existente e adde illos nove
+      overwrite: Superscriber
       overwrite_long: Reimplaciar registros actual con le noves
     overwrite_preambles:
       blocking_html: Tu es sur le puncto de <strong>reimplaciar tu lista de blocadas</strong> per usque a <strong>%{total_items} contos</strong> proveniente de <strong>%{filename}</strong>.
+      bookmarks_html: Tu va <strong>reimplaciar tu lista de blocadas</strong> per usque a <strong>%{total_items} contos</strong> proveniente de <strong>%{filename}</strong>.
       domain_blocking_html: Tu es sur le puncto de <strong>reimplaciar tu lista de blocadas de dominio</strong> per usque a <strong>%{total_items} dominios</strong> proveniente de <strong>%{filename}</strong>.
+      following_html: Tu va <strong>sequer</strong> usque <strong>%{total_items} contos</strong> de <strong>%{filename}</strong> e <strong>cessar de sequer ulle altere</strong>.
+      lists_html: Tu va <strong>reimplaciar tu lista</strong> con contentos de <strong>%{filename}</strong>. Usque <strong>%{total_items} contos</strong> sera addite a nove listas.
+      muting_html: Tu va <strong>reimplaciar tu lista de contos silentiate</strong> con usque <strong>%{total_items} contos</strong> ab <strong>%{filename}</strong>.
     preambles:
       blocking_html: Tu es sur le puncto de <strong>blocar</strong> usque a <strong>%{total_items} contos</strong> a partir de <strong>%{filename}</strong>.
+      bookmarks_html: Tu va adder usque <strong>%{total_items} messages</strong> de <strong>%{filename}</strong> a tu <strong>marcapaginas</strong>.
       domain_blocking_html: Tu es sur le puncto de <strong>blocar</strong> usque a <strong>%{total_items} dominios</strong> a partir de <strong>%{filename}</strong>.
+      following_html: Tu va <strong>blocar</strong> usque a <strong>%{total_items} dominios</strong> ab <strong>%{filename}</strong>.
+      lists_html: Tu va adder usque <strong>%{total_items} contos</strong> ab <strong>%{filename}</strong> a tu <strong>lista</strong>. Nove listas sera create si il non ha lista a adder.
+      muting_html: Tu va <strong>silentiar</strong> usque <strong>%{total_items} contos</strong> ab <strong>%{filename}</strong>.
     preface: Tu pote importar datos que tu ha exportate de un altere servitor, como un lista de personas que tu seque o bloca.
     recent_imports: Importationes recente
     states:
@@ -1348,16 +1379,30 @@ ia:
     expires_in_prompt: Nunquam
     generate: Generar ligamine de invitation
     invalid: Iste invitation non es valide
+    invited_by: 'Tu ha essite invitate per:'
     max_uses:
       one: un uso
       other: "%{count} usos"
+    max_uses_prompt: Nulle limite
+    prompt: Genera e comparti ligamines con alteres pro conceder accesso a iste servitor
     table:
       expires_at: Expira
+      uses: Usos
     title: Invitar personas
+  lists:
+    errors:
+      limit: Tu ha attingite le maxime numero de listas
   login_activities:
     authentication_methods:
+      otp: app pro authentication a duo factores
       password: contrasigno
+      sign_in_token: codice de securitate de e-mail
       webauthn: claves de securitate
+    description_html: Si tu vide activitate que tu non recognosce, considera de cambiar tu contrasigno e activar le authentication a duo factores.
+    empty: Nulle chronologia de authentication disponibile
+    failed_sign_in_html: Tentativa de authentication fallite con %{method} ab %{ip} (%{browser})
+    successful_sign_in_html: Apertura de session con successo con %{method} ab %{ip} (%{browser})
+    title: Chronologia de authentication
   mail_subscriptions:
     unsubscribe:
       action: Si, desubscriber
@@ -1373,32 +1418,110 @@ ia:
       resubscribe_html: Si tu ha cancellate le subscription in error, tu pote resubscriber te a partir del <a href="%{settings_path}">parametros de notification in e-mail</a>.
       success_html: Tu non recipera plus %{type} pro Mastodon sur %{domain} a tu adresse de e-mail %{email}.
       title: Desubcriber
+  media_attachments:
+    validations:
+      images_and_video: Impossibile annexar un video a un message que jam contine imagines
+      not_ready: Impossibile annexar un video a un message que jam contine imagines. Retenta post un momento!
+      too_many: Impossibile annexar plus que 4 files
   migrations:
+    acct: Movite a
+    cancel: Cancellar redirection
+    cancel_explanation: Cancellar le redirection reactivara tu conto actual, ma non reportara sequaces que ha essite movite in ille conto.
+    cancelled_msg: Redirection cancellate con successo.
     errors:
+      already_moved: is the same account you have already moved to
+      missing_also_known_as: non es un alias de iste conto
       move_to_self: non pote esser le conto actual
       not_found: non poterea esser trovate
+      on_cooldown: Tu es in pausa
+    followers_count: Sequaces a tempore de mover
+    incoming_migrations: Movente ab un conto differente
+    incoming_migrations_html: Pro mover ab un altere conto a isto, primo tu debe <a href="%{path}">crear un alias de conto</a>.
+    moved_msg: Tu conto ora es redirigite a %{acct} e tu sequaces es movite super.
+    not_redirecting: Tu conto actualmente non es redirigite a ulle altere conto.
+    on_cooldown: Tu recentemente ha migrate tu conto. Iste function de novo sera disponibile in %{count} dies.
+    past_migrations: Migrationes passate
+    proceed_with_move: Mover sequaces
+    redirected_msg: Tu conto es ora redirigite a %{acct}.
+    redirecting_to: Tu conto es redirigite a %{acct}.
+    set_redirect: Predefinir redirection
+    warning:
+      backreference_required: Le nove conto debe primo esser configurate pro referer se a isto
+      before: 'Ante de continuar, lege iste notas accuratemente:'
+      cooldown: Post le movimento il ha un periodo de pausa durante le qual tu non potera mover te ancora
+      disabled_account: Tu conto actual non sera plenmente usabile postea. Comocunque, tu habera accesso a exportation de datos e re-activation.
+      followers: Iste action movera tote le sequaces ab le conto actual al nove conto
+      only_redirect_html: In alternativa, tu pote <a href="%{path}">solo superponer un redirection sur tu profilo</a>.
+      other_data: Nulle altere datos sera movite automaticamente
+      redirect: Le profilo de tu conto actual sera actualisate con un aviso de redirection e sera excludite de recercas
   moderation:
     title: Moderation
   move_handler:
     carry_blocks_over_text: Iste usator ha cambiate de conto desde %{acct}, que tu habeva blocate.
+    carry_mutes_over_text: Iste usator moveva ab %{acct}, que tu habeva silentiate.
+    copy_account_note_text: 'Iste usator moveva ab %{acct}, ci era tu previe notas re ille:'
+  navigation:
+    toggle_menu: Mutar menu
   notification_mailer:
     admin:
+      report:
+        subject: "%{name} inviava un reporto"
       sign_up:
         subject: "%{name} se ha inscribite"
+    favourite:
+      body: 'Tu message era favorite per %{name}:'
+      subject: "%{name} favoriva tu message"
+      title: Nove preferito
     follow:
+      body: "%{name} ora te seque!"
+      subject: "%{name} ora te seque"
       title: Nove sequitor
     follow_request:
+      action: Gere requestas de sequer
+      body: "%{name} ha demandate de sequer te"
+      subject: 'Sequace pendente: %{name}'
       title: Nove requesta de sequimento
     mention:
       action: Responder
+      body: 'Tu era mentionate per %{name} in:'
+      subject: Tu ha essite mentionate per %{name}
       title: Nove mention
     poll:
       subject: Un inquesta de %{name} ha finite
+    reblog:
+      body: 'Tu message ha essite impulsate per %{name}:'
+      subject: "%{name} ha impulsate tu message"
+      title: Nove impulso
+    status:
+      subject: "%{name} justo ha publicate"
+    update:
+      subject: "%{name} ha modificate un message"
+  notifications:
+    administration_emails: Avisos de email per administrator
+    email_events: Eventos pro avisos de email
+    email_events_hint: 'Selige eventos pro que tu vole reciper avisos:'
+  number:
+    human:
+      decimal_units:
+        format: "%n%u"
+        units:
+          billion: B
+          million: M
+          quadrillion: Q
+          thousand: K
+          trillion: T
   otp_authentication:
+    code_hint: Insere le codice generate per tu app de authentication pro confirmar
+    description_html: Si tu activa <strong>le authentication a duo factores</strong> per un app de authentication, le authentication requirera que tu es in possession de tu telephono, que generara testimonios pro facer te entrar.
     enable: Activar
+    instructions_html: "<strong>Scande iste codice QR in Google Authenticator o un simile app TOTP sur tu telephono</strong>. Desde ora in avante, ille app generara testimonios que tu debera inserer quando tu te authenticara."
+    manual_instructions: 'Si tu non pote scander le codice QR e besonia de inserer lo manualmente, ecce le texto-simple secrete:'
     setup: Configurar
+    wrong_code: Le codice inserite non era valide! Es tempore de servitor e tempore de apparato correcte?
   pagination:
+    newer: Plus recente
     next: Sequente
+    older: Plus vetere
     prev: Previe
     truncate: "&hellip;"
   polls:
@@ -1418,9 +1541,13 @@ ia:
     posting_defaults: Publicationes predefinite
     public_timelines: Chronologias public
   privacy:
+    hint_html: "<strong>Personalisa como tu vole que tu profilo e tu messages a es trovate.</strong> Un varietate de functiones in Mastodon pote adjutar te attinger un plus large auditorio si activate. Prende un momento pro revider iste parametros pro assecurar te que illos se adapta a tu caso de uso."
     privacy: Confidentialitate
+    privacy_hint_html: Controla quanto tu vole divulgar pro le beneficio de alteres. Le gente discoperi profilos e applicationes interessante percurrente le profilos sequite per altere personas e vidente a partir de qual applicationes illos publica lor messages, ma tu pote preferer de mantener tal information private.
     reach: Portata
+    reach_hint_html: Controla si tu vole esser discoperite e sequite per nove personas. Vole tu que tu messages appare sur le schermo Explorar? Vole tu que altere personas te vide in lor recommendationes de sequimento? Vole tu acceptar automaticamente tote le nove sequitores o prefere tu haber le controlo granular super cata un?
     search: Cercar
+    search_hint_html: Controla como tu vole esser trovate. Vole tu que le gente te trova per medio del contento de tu messages public? Vole tu que personas foras de Mastodon trova tu profilo quando illes cerca in le web? Nota ben que non es possibile garantir le exclusion total de tu information public del motores de recerca.
     title: Confidentialitate e portata
   privacy_policy:
     title: Politica de confidentialitate
@@ -1521,35 +1648,96 @@ ia:
     aliases: Aliases de conto
     appearance: Apparentia
     authorized_apps: Apps autorisate
+    back: Tornar a Mastodon
     delete: Deletion de conto
     development: Disveloppamento
     edit_profile: Modificar profilo
+    export: Exportation de datos
     featured_tags: Hashtags eminente
     import: Importar
+    import_and_export: Importar e exportar
     migrate: Migration de conto
     notifications: Notificationes de e-mail
     preferences: Preferentias
     profile: Profilo public
     relationships: Sequites e sequitores
+    severed_relationships: Relationes rupte
+    statuses_cleanup: Deletion de message automatic
     strikes: Admonitiones de moderation
+    two_factor_authentication: Authentication a duo factores
+    webauthn_authentication: Claves de securitate
   severed_relationships:
     download: Discargar (%{count})
     event_type:
       account_suspension: Suspension del conto (%{target_name})
       domain_block: Suspension del servitor (%{target_name})
       user_domain_block: Tu ha blocate %{target_name}
+    lost_followers: Sequitores perdite
+    lost_follows: Sequites perdite
     preamble: Tu pote perder sequites e sequitores quando tu bloca un dominio o quando tu moderatores decide suspender un servitor remote. Quando isto occurre, tu potera discargar listas de relationes rumpite, a inspectar e eventualmente importar in un altere servitor.
+    purged: Le information re iste servitor ha essite purgate per le administratores de tu servitor.
     type: Evento
   statuses:
+    attached:
+      audio:
+        one: "%{count} audio"
+        other: "%{count} audio"
+      description: 'Attachate: %{attached}'
+      image:
+        one: "%{count} imagine"
+        other: "%{count} imagines"
+      video:
+        one: "%{count} video"
+        other: "%{count} videos"
+    boosted_from_html: Impulsate desde %{acct_link}
+    content_warning: 'Advertimento de contento: %{warning}'
+    default_language: Mesme como lingua de interfacie
+    disallowed_hashtags:
+      one: 'contineva un hashtag non autorisate: %{tags}'
+      other: 'contineva le hashtags non autorisate: %{tags}'
+    edited_at_html: Modificate le %{date}
+    errors:
+      in_reply_not_found: Le message a que tu tenta responder non pare exister.
     open_in_web: Aperir in le web
+    over_character_limit: limite de characteres de %{max} excedite
+    pin_errors:
+      direct: Messages que es solo visibile a usatores mentionate non pote esser appunctate
+      limit: Tu ha jam appunctate le maxime numero de messages
+      ownership: Le message de alcuno altere non pote esser appunctate
+      reblog: Un impulso non pote esser affixate
     poll:
+      total_people:
+        one: "%{count} persona"
+        other: "%{count} personas"
+      total_votes:
+        one: "%{count} voto"
+        other: "%{count} votos"
       vote: Votar
     show_more: Monstrar plus
+    show_thread: Monstrar argumento
+    title: '%{name}: "%{quote}"'
     visibilities:
       direct: Directe
+      private: Solo-sequaces
       private_long: Solmente monstrar a sequitores
       public: Public
+      public_long: Omnes pote vider
+      unlisted: Non listate
+      unlisted_long: Omnes pote vider, ma non es listate in le chronologias public
   statuses_cleanup:
+    enabled: Deler automaticamente le messages ancian
+    enabled_hint: Dele automaticamente tu messages un vice que illos attinge un limine de etate specificate, salvo que illes concorda un del exceptiones infra
+    exceptions: Exceptiones
+    explanation: Pois que deler messages es un operation costose, isto es facite lentemente in le tempore quando le servitor non es alteremente occupate. Pro iste ration, tu messages pote esser delite un poco post que illos attinge le limine de etate.
+    ignore_favs: Ignorar favoritos
+    ignore_reblogs: Ignorar impulsos
+    interaction_exceptions: Exceptiones basate super interactiones
+    interaction_exceptions_explanation: Nota que il non ha garantia que le messages essera delite si illos va sub le limine de favorites o impulsos post haber lo superate un vice.
+    keep_direct: Mantener le messages directe
+    keep_direct_hint: Non dele alcuno de tu messages directe
+    keep_media: Mantener messages con annexos de medios
+    keep_media_hint: Non dele alcuno de tu messages que ha annexos de medios
+    keep_pinned: Mantener messages appunctate
     keep_pinned_hint: Non dele alcuno de tu messages appunctate
     keep_polls: Mantener sondages
     keep_polls_hint: Non dele ulle de tu sondages
@@ -1567,32 +1755,94 @@ ia:
       '63113904': 2 annos
       '7889238': 3 menses
     min_age_label: Limine de etate
+    min_favs: Mantener messages favorite al minus
+    min_favs_hint: Non deler alcuno de tu messages que ha recipite al minus iste numero de favoritos. Lassar blanc pro deler messages sin reguardo de lor numero de favoritos
+    min_reblogs: Mantener messages impulsate al minus
+    min_reblogs_hint: Non dele alcun de tu messages que ha essite impulsate al minus iste numero de vices. Lassar vacue pro deler messages independentemente de lor numero de impulsos
   stream_entries:
     sensitive_content: Contento sensibile
   strikes:
     errors:
       too_late: Es troppo tarde pro facer appello contra iste admonition
+  tags:
+    does_not_match_previous_name: non concorda le nomine previe
   themes:
     contrast: Mastodon (Alte contrasto)
     default: Mastodon (Obscur)
     mastodon-light: Mastodon (Clar)
     system: Automatic (usar thema del systema)
+  time:
+    formats:
+      default: "%d %b %Y, %H:%M"
+      month: "%b %Y"
+      time: "%H:%M"
+      with_time_zone: "%b %d, %Y, %H:%M %Z"
+  translation:
+    errors:
+      quota_exceeded: Le quota de utilisation del servitor pro le servicio de traduction ha essite excedite.
+      too_many_requests: Il ha habite troppe requestas al servicio de traduction recentemente.
   two_factor_authentication:
     add: Adder
     disable: Disactivar 2FA
+    disabled_success: Authentication a duo factores disactivate con successo
     edit: Modificar
+    enabled: Le authentication a duo factores es activate
+    enabled_success: Authentication a duo factores activate con successo
     generate_recovery_codes: Generar codices de recuperation
+    lost_recovery_codes: Le codices de recuperation te permitte de reganiar accesso a tu conto si tu perde tu telephono. Si tu ha perdite tu codices de recuperation, tu pote regenerar los ci. Tu vetere codices de recuperation sera invalidate.
+    methods: Methodos a duo factores
+    otp: App de authenticator
+    recovery_codes: Salveguardar codices de recuperation
+    recovery_codes_regenerated: Codices de recuperation regenerate con successo
+    recovery_instructions_html: Si tu perde le accesso a tu telephono, tu pote usar un del codices de recuperation hic infra pro reganiar le accesso a tu conto. <strong>Mantene le codices de recuperation secur.</strong> Per exemplo, tu pote imprimer los e guardar los con altere documentos importante.
+    webauthn: Claves de securitate
   user_mailer:
     appeal_approved:
       action: Parametros de conto
       explanation: Le appello contra le admonition contra tu conto del %{strike_date}, que tu ha submittite le %{appeal_date}, ha essite approbate. Tu conto ha de novo un bon reputation.
+      subject: Tu appello ab %{date} ha essite approbate
+      subtitle: Tu conto es ancora un vice in regula.
+      title: Appello approbate
     appeal_rejected:
       explanation: Le appello contra le admonition contra tu conto del %{strike_date}, que tu ha submittite le %{appeal_date}, ha essite rejectate.
+      subject: Tu appello ab %{date} ha essite rejectate
+      subtitle: Tu appello ha essite rejectate.
+      title: Appello rejectate
+    backup_ready:
+      explanation: Tu ha requestate un copia de securitate complete de tu conto de Mastodon.
+      extra: Isto es preste pro discargar!
+      subject: Tu archivo es preste pro discargar
+      title: Discargar archivo
+    failed_2fa:
+      details: 'Hic es le detalios del tentativa de initio de session:'
+      explanation: Alcuno ha tentate aperir session a tu conto ma ha fornite un secunde factor de authentication non valide.
+      further_actions_html: Si non se tractava de te, nos recommenda %{action} immediatemente perque illo pote esser compromittite.
+      subject: Fallimento del authentication de duo factores
+      title: Falleva le authentication de duo factores
+    suspicious_sign_in:
+      change_password: cambiar tu contrasigno
+      details: 'Hic es le detalios del initio de session:'
+      explanation: Nos ha detegite un initio de session a tu conto ab un nove adresse IP.
+      further_actions_html: Si non se tractava de te, nos recommenda %{action} immediatemente e activar le authentication bifactorial pro mantener tu conto secur.
+      subject: Alcuno ha accedite a tu conto desde un nove adresse IP
+      title: Un nove initio de session
     warning:
       appeal: Submitter un appello
+      appeal_description: Si tu crede que se tracta de un error, tu pote presentar un appello al personal de %{instance}.
       categories:
         spam: Spam
+        violation: Le contento viola le sequente regulas del communitate
+      explanation:
+        delete_statuses: Alcunes de tu messages ha essite judicate contrari a un o plus directivas communitari e ha dunque essite removite per le moderatores de %{instance}.
+        disable: Tu non pote plus usar tu conto, ma tu profilo e altere datos remane intacte. Tu pote requestar un copia de reserva de tu datos, cambiar le parametros del conto o deler le conto.
+        mark_statuses_as_sensitive: Alcunes de tu messages ha essite marcate como sensibile per le moderatores de %{instance}. Isto vole dicer que le gente debe toccar le objectos multimedial in le messages ante que un previsualisation appare. Tu pote marcar objectos multimedial como sensibile tu mesme quando tu publica messages in futuro.
+        sensitive: A partir de iste momento, tote le files multimedial que tu incarga essera marcate como sensibile e le gente debera cliccar sur un advertimento ante de poter vider los.
+        silence: Tu pote ancora usar tu conto ma solmente le personas qui ja te seque videra tu messages sur iste servitor, e tu pote esser excludite de varie functiones de discoperta. Nonobstante, altere personas pote ancora sequer te manualmente.
+        suspend: Tu non pote plus usar tu conto, e tu profilo e altere datos non es plus accessibile. Tu pote ancora aperir session pro requestar un copia de reserva de tu datos usque lor elimination in circa 30 dies. Nos retenera certe datos de base pro impedir que tu evade le suspension.
+      reason: 'Ration:'
+      statuses: 'Message citate:'
       subject:
+        delete_statuses: Tu messages sur %{acct} esseva removite
         disable: Tu conto %{acct} ha essite gelate
         mark_statuses_as_sensitive: Tu messages sur %{acct} ha essite marcate como sensibile
         none: Advertimento pro %{acct}
@@ -1612,20 +1862,71 @@ ia:
       apps_ios_action: Discargar sur le App Store
       apps_step: Discarga nostre applicationes official.
       apps_title: Applicationes de Mastodon
+      checklist_subtitle: 'Comencia tu aventura sur le web social:'
+      checklist_title: Prime passos
       edit_profile_action: Personalisar
       edit_profile_step: Impulsa tu interactiones con un profilo comprehensive.
       edit_profile_title: Personalisar tu profilo
       explanation: Ecce alcun consilios pro initiar
       feature_action: Apprender plus
+      feature_audience: Mastodon te presenta le possibilitate unic de gerer tu audientia sin intermediarios. Mastodon, installate sur tu proprie infrastructura, te permitte sequer, e esser sequite per, personas sur qualcunque altere servitor Mastodon in linea, e necuno lo controla salvo tu.
       feature_audience_title: Crea tu auditorio in fiducia
+      feature_control: Tu sape melio lo que tu vole vider sur tu fluxo de initio. Nulle algorithmos o annuncios dissipa tu tempore. Seque quicinque sur qualcunque servitor Mastodon desde un sol conto, recipe lor messages in ordine chronologic, e face te un angulo del internet ubi tu te senti a casa.
+      feature_control_title: Mantene le controlo de tu proprie chronologia
+      feature_creativity: Mastodon supporta messages con audio, video e imagines, descriptiones de accessibilitate, sondages, advertimentos de contento, avatares con animation, emojis personalisate, controlo de retalio de miniaturas, e plus, pro adjutar te a exprimer te in linea. Que tu publica tu arte, tu musica o tu podcast, Mastodon existe pro te.
+      feature_creativity_title: Creativitate sin parallel
+      feature_moderation: Mastodon remitte le controlo in tu manos. Cata servitor crea su proprie regulas e directivas, applicate localmente e non de maniera vertical como le medios social corporative, rendente lo flexibile in responder al necessitates de differente gruppos de personas. Adhere a un servitor con regulas que te place, o alberga le tue.
       feature_moderation_title: Moderation como deberea esser
       follow_action: Sequer
+      follow_step: Sequer personas interessante es le ration de esser de Mastodon.
+      follow_title: Personalisa tu fluxo de initio
+      follows_subtitle: Seque contos popular
+      follows_title: Qui sequer
+      follows_view_more: Vider plus de personas a sequer
+      hashtags_recent_count:
+        one: "%{people} persona in le passate duo dies"
+        other: "%{people} personas in le passate duo diea"
+      hashtags_subtitle: Explora le tendentias del passate 2 dies
+      hashtags_title: Hashtags in tendentia
+      hashtags_view_more: Vider plus de hashtags in tendentia
+      post_action: Scriber
+      post_step: Saluta le mundo con texto, photos, videos o sondages.
       post_title: Face tu prime message
       share_action: Compartir
+      share_step: Face saper a tu amicos como trovar te sur Mastodon.
       share_title: Compartir tu profilo de Mastodon
+      sign_in_action: Initiar session
       subject: Benvenite in Mastodon
+      title: Benvenite a bordo, %{name}!
+  users:
+    follow_limit_reached: Tu non pote sequer plus de %{limit} personas
+    go_to_sso_account_settings: Vader al parametros de conto de tu fornitor de identitate
+    invalid_otp_token: Codice de duo factores non valide
+    otp_lost_help_html: Si tu ha perdite le accesso a ambes, tu pote contactar %{email}
+    rate_limited: Troppo de tentativas de authentication. Per favor reessaya plus tarde.
+    seamless_external_login: Tu ha aperite session per medio de un servicio externe. Le parametros de contrasigno e de e-mail es dunque indisponibile.
+    signed_in_as: 'Session aperite como:'
   verification:
+    extra_instructions_html: <strong>Consilio:</strong> Le ligamine sur tu sito web pote esser invisibile. Le parte importante es <code>rel="me"</code> que impedi le usurpation de identitate sur sitos web con contento generate per usatores. Tu pote mesmo usar un etiquetta <code>link</code> in le capite del pagina in vice de <code>a</code>, ma le codice HTML debe esser accessibile sin executar JavaScript.
+    here_is_how: Ecce como
+    hint_html: "<strong>Omnes pote verificar lor identitate sur Mastodon.</strong> Isto es basate sur standards web aperte e es gratuite, ora e pro sempre. Tote lo que es necessari es un sito web personal que le gente recognosce como le tue. Quando tu liga a iste sito web desde tu profilo, le systema verificara que le sito web liga retro a tu profilo e monstrara un indicator visual de iste facto."
+    instructions_html: Copia e colla le codice hic infra in le HTML de tu sito web. Alora adde le adresse de tu sito web in un del campos supplementari sur tu profilo desde le scheda “Modificar profilo” e salva le cambiamentos.
+    verification: Verification
     verified_links: Tu ligamines verificate
   webauthn_credentials:
     add: Adder un nove clave de securitate
+    create:
+      error: Il habeva un problema in adder tu clave de securitate. Tenta novemente.
+      success: Tu clave de securitate ha essite addite con successo.
     delete: Deler
+    delete_confirmation: Es tu secur que tu vole deler iste clave de securitate?
+    description_html: Si tu activa le <strong>authentication per clave de securitate</strong>, le apertura de session requirera que tu usa un de tu claves de securitate.
+    destroy:
+      error: Il habeva un problema in deler tu clave de securitate. Tenta novemente.
+      success: Tu clave de securitate ha essite delite con successo.
+    invalid_credential: Clave de securitate non valide
+    nickname_hint: Insere le pseudonymo de tu nove clave de securitate
+    not_enabled: Tu ancora non ha activate WebAuthn
+    not_supported: Iste navigator non supporta claves de securitate
+    otp_required: Pro usar le claves de securitate activa prime le authentication de duo factores.
+    registered_on: Registrate le %{date}
diff --git a/config/locales/it.yml b/config/locales/it.yml
index bda681ac084583..5b75e7af7dd142 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -285,6 +285,7 @@ it:
         update_custom_emoji_html: "%{name} ha aggiornato emoji %{target}"
         update_domain_block_html: "%{name} ha aggiornato il blocco dominio per %{target}"
         update_ip_block_html: "%{name} ha cambiato la regola per l'IP %{target}"
+        update_report_html: "%{name} ha aggiornato la segnalazione %{target}"
         update_status_html: "%{name} ha aggiornato lo status di %{target}"
         update_user_role_html: "%{name} ha modificato il ruolo %{target}"
       deleted_account: account eliminato
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index f3f3e3a8fba7c9..b104e31fc0e71c 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -282,6 +282,7 @@ ko:
         update_custom_emoji_html: "%{name} 님이 에모지 %{target}를 업데이트 했습니다"
         update_domain_block_html: "%{name} 님이 %{target}에 대한 도메인 차단을 갱신했습니다"
         update_ip_block_html: "%{name} 님이 IP 규칙 %{target}을 수정했습니다"
+        update_report_html: "%{name} 님이 신고 %{target}를 업데이트 했습니다"
         update_status_html: "%{name} 님이 %{target}의 게시물을 업데이트했습니다"
         update_user_role_html: "%{name} 님이 %{target} 역할을 수정했습니다"
       deleted_account: 계정을 삭제했습니다
diff --git a/config/locales/lad.yml b/config/locales/lad.yml
index e9f18d4bede648..9c165472cd71b1 100644
--- a/config/locales/lad.yml
+++ b/config/locales/lad.yml
@@ -285,6 +285,7 @@ lad:
         update_custom_emoji_html: "%{name} aktualizo el emoji %{target}"
         update_domain_block_html: "%{name} aktualizo el bloko de domeno para %{target}"
         update_ip_block_html: "\"%{name} troko la regla de IP %{target}"
+        update_report_html: "%{name} aktualizo el raporto %{target}"
         update_status_html: "%{name} aktualizo la publikasyon de %{target}"
         update_user_role_html: "%{name} troko el rolo %{target}"
       deleted_account: kuento supremido
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 74dea29b0e3558..3452f8099432d9 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -285,6 +285,7 @@ nl:
         update_custom_emoji_html: Emoji %{target} is door %{name} bijgewerkt
         update_domain_block_html: "%{name} heeft de domeinblokkade bijgewerkt voor %{target}"
         update_ip_block_html: "%{name} wijzigde de IP-regel voor %{target}"
+        update_report_html: Rapportage %{target} is door %{name} bijgewerkt
         update_status_html: "%{name} heeft de berichten van %{target} bijgewerkt"
         update_user_role_html: "%{name} wijzigde de rol %{target}"
       deleted_account: verwijderd account
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 7c037d7d002bf3..1c3fda8d032b90 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -291,6 +291,7 @@ pl:
         update_custom_emoji_html: Zaktualizowane emoji %{target} przez %{name}
         update_domain_block_html: Zaktualizowano blokadę domeny dla %{target} przez %{name}
         update_ip_block_html: "%{name} stworzył(a) regułę dla IP %{target}"
+        update_report_html: "%{target} zaktualizowany przez %{name}"
         update_status_html: "%{name} zaktualizował(a) wpis użytkownika %{target}"
         update_user_role_html: "%{name} zmienił rolę %{target}"
       deleted_account: usunięte konto
diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index 0c2e6cfd6d782d..b4669e24d810da 100644
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -285,6 +285,7 @@ pt-PT:
         update_custom_emoji_html: "%{name} atualizou o emoji %{target}"
         update_domain_block_html: "%{name} atualizou o bloqueio de domínio para %{target}"
         update_ip_block_html: "%{name} alterou regra para IP %{target}"
+        update_report_html: "%{name} atualizou a denúncia %{target}"
         update_status_html: "%{name} atualizou o estado de %{target}"
         update_user_role_html: "%{name} alterou a função %{target}"
       deleted_account: conta apagada
diff --git a/config/locales/simple_form.fi.yml b/config/locales/simple_form.fi.yml
index 2f7010bacf172e..9ac36447de307e 100644
--- a/config/locales/simple_form.fi.yml
+++ b/config/locales/simple_form.fi.yml
@@ -78,14 +78,14 @@ fi:
       form_admin_settings:
         activity_api_enabled: Paikallisesti julkaistujen julkaisujen, aktiivisten käyttäjien ja rekisteröitymisten viikoittainen määrä
         app_icon: WEBP, PNG, GIF tai JPG. Korvaa oletusarvoisen mobiililaitteiden sovelluskuvakkeen omalla kuvakkeella.
-        backups_retention_period: Käyttäjillä on mahdollisuus arkistoida julkaisujaan myöhemmin ladattaviksi. Kun tämä on asetettu positiiviseksi arvoksi, nämä arkistot poistetaan automaattisesti asetetun päivien määrän jälkeen.
+        backups_retention_period: Käyttäjillä on mahdollisuus arkistoida julkaisujaan myöhemmin ladattaviksi. Kun arvo on positiivinen, nämä arkistot poistuvat automaattisesti, kun määritetty määrä päiviä on kulunut.
         bootstrap_timeline_accounts: Nämä tilit kiinnitetään uusien käyttäjien seuraamissuosituslistojen alkuun.
         closed_registrations_message: Näkyy, kun rekisteröityminen on suljettu
-        content_cache_retention_period: Kaikki muiden palvelimien viestit (mukaan lukien tehostukset ja vastaukset) poistetaan määritetyn päivien lukumäärän jälkeen, ottamatta huomioon paikallisen käyttäjän vuorovaikutusta kyseisten viestien kanssa. Sisältää viestit, jossa paikallinen käyttäjä on merkinnyt kirjanmerkiksi tai suosikeiksi. Myös yksityiset maininnat eri käyttäjien välillä menetetään, eikä niitä voi palauttaa. Tämän asetuksen käyttö on tarkoitettu erityisiin tapauksiin ja se rikkoo monia käyttäjien odotuksia, kun se toteutetaan yleistarkoituksiin.
+        content_cache_retention_period: Kaikki muiden palvelinten julkaisut (mukaan lukien tehostukset ja vastaukset) poistuvat, kun määritetty määrä päiviä on kulunut, ottamatta huomioon paikallisen käyttäjän vuorovaikutusta näiden julkaisujen kanssa. Sisältää julkaisut, jotka paikallinen käyttäjä on merkinnyt kirjanmerkiksi tai suosikiksi. Myös yksityiset maininnat eri palvelinten käyttäjien välillä menetetään, eikä niitä voi palauttaa. Tämä asetus on tarkoitettu käytettäväksi erityistapauksissa ja rikkoo monia käyttäjien odotuksia, kun sitä käytetään yleistarkoituksiin.
         custom_css: Voit käyttää mukautettuja tyylejä Mastodonin verkkoversiossa.
         favicon: WEBP, PNG, GIF tai JPG. Korvaa oletusarvoisen Mastodonin suosikkikuvakkeen omalla kuvakkeella.
         mascot: Ohittaa kuvituksen edistyneessä selainkäyttöliittymässä.
-        media_cache_retention_period: Mediatiedostot käyttäjien tekemistä viesteistä ovat välimuistissa palvelimellasi. Kun arvo on positiivinen, media poistetaan määritetyn ajan jälkeen. Jos mediaa pyydetään sen poistamisen jälkeen, ne ladataan uudelleen, jos lähdesisältö on vielä saatavilla. Koska linkkien katselun kyselyitä kolmansien osapuolien sivustoille on rajoitettu, on suositeltavaa asettaa tämä arvo vähintään 14 päivään tai linkkien kortteja ei päivitetä pyynnöstä ennen tätä aikaa.
+        media_cache_retention_period: Käyttäjien tekemien julkaisujen mediatiedostot ovat välimuistissa palvelimellasi. Kun arvo on positiivinen, media poistuu, kun määritetty määrä päiviä on kulunut. Jos mediaa pyydetään sen poistamisen jälkeen, se ladataan uudelleen, jos lähdesisältö on vielä saatavilla. Koska linkkien esikatselun kyselyitä kolmansien osapuolien sivustoille on rajoitettu, on suositeltavaa asettaa tämä arvo vähintään 14 päivään, tai linkkien kortteja ei päivitetä pyynnöstä ennen tätä ajankohtaa.
         peers_api_enabled: Luettelo verkkotunnuksista, jotka tämä palvelin on kohdannut fediversumissa. Se ei kerro, oletko liitossa tietyn palvelimen kanssa, vaan että palvelimesi on ylipäätään tietoinen siitä. Tätä tietoa käytetään palveluissa, jotka keräävät tilastoja federoinnista yleisellä tasolla.
         profile_directory: Profiilihakemisto lueteloi kaikki käyttäjät, jotka ovat ilmoittaneet olevansa löydettävissä.
         require_invite_text: Kun rekisteröityminen vaatii manuaalisen hyväksynnän, tee ”Miksi haluat liittyä?” -tekstikentästä pakollinen vapaaehtoisen sijaan
diff --git a/config/locales/simple_form.sl.yml b/config/locales/simple_form.sl.yml
index a4abb737c0ecc5..96b36307a5795d 100644
--- a/config/locales/simple_form.sl.yml
+++ b/config/locales/simple_form.sl.yml
@@ -77,10 +77,15 @@ sl:
           warn: Skrij filtrirano vsebino za opozorilom, ki pomenja naslov filtra
       form_admin_settings:
         activity_api_enabled: Številke krajevno objavljenih objav, dejavnih uporabnikov in novih registracij na tedenskih seznamih
+        app_icon: WEBP, PNG, GIF ali JPG. Zamenja privzeto ikono programa na mobilnih napravah z ikono po meri.
+        backups_retention_period: Uporabniki lahko ustvarijo arhive svojih objav za kasnejši prenos k sebi. Ko je nastavljeno na pozitivno vrednost, bodo ti arhivi po nastavljenem številu dni samodejno izbrisani.
         bootstrap_timeline_accounts: Ti računi bodo pripeti na vrh priporočenih sledenj za nove uporabnike.
         closed_registrations_message: Prikazano, ko so registracije zaprte
+        content_cache_retention_period: Vse objave z drugih strežnikov (vključno z izpostavitvami in odgovori) bodo izbrisani po nastavljenem številu dni, ne glede na krajevne interakcije s temi objavami. To vključuje objave, ki jih je krajevni uporabnik dodal med zaznamke ali priljubljene. Zasebne omembe med uporabniki na različnih strežnikih bodo prav tako izgubljene in jih ne bo moč obnoviti. Uporaba te nastavitve je namenjena strežnikom s posebnim namenom in nasprotuje mnogim pričakovanjem uporabnikov na strežnikih za splošni namen.
         custom_css: Spletni različici Mastodona lahko uveljavite sloge po meri.
+        favicon: WEBP, PNG, GIF ali JPG. Zamenja privzeto ikono spletne strani Mastodon z ikono po meri.
         mascot: Preglasi ilustracijo v naprednem spletnem vmesniku.
+        media_cache_retention_period: Predstavnostne datoteke iz objav uporabnikov na ostalih strežnikih se začasno hranijo na tem strežniku. Ko je nastavljeno na pozitivno vrednost, bodo predstavnostne datoteke izbrisane po nastavljenem številu dni. Če bo predstavnostna datoteka zahtevana po izbrisu, bo ponovno prenešena, če bo vir še vedno na voljo. Zaradi omejitev pogostosti prejemanja predogledov povezav z drugih strani je priporočljivo to vrednost nastaviti na vsaj 14 dni. V nasprotnem predogledi povezav pred tem časom ne bodo osveženi na zahtevo.
         peers_api_enabled: Seznam imen domen, na katere je ta strežnik naletel v fediverzumu. Sem niso vključeni podatki o tem, ali ste v federaciji z danim strežnikom, zgolj to, ali vaš strežnik ve zanj. To uporabljajo storitve, ki zbirajo statistične podatke o federaciji v splošnem smislu.
         profile_directory: Imenik profilov izpiše vse uporabnike, ki so dovolili, da so v njem navedeni.
         require_invite_text: Če registracije zahtevajo ročno potrditev, nastavite vnos besedila pod »Zakaj se želite pridružiti?« za obveznega.
@@ -240,6 +245,7 @@ sl:
         backups_retention_period: Obdobje hrambe arhivov uporabnikov
         bootstrap_timeline_accounts: Vedno priporočaj te račune novim uporabnikom
         closed_registrations_message: Sporočilo po meri, ko registracije niso na voljo
+        content_cache_retention_period: Obdobje hranjenja vsebine z ostalih strežnikov
         custom_css: CSS po meri
         mascot: Maskota po meri (opuščeno)
         media_cache_retention_period: Obdobje hrambe predpomnilnika predstavnosti
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 6c26511ad6968a..329ce5a29b5701 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -291,6 +291,7 @@ sl:
         update_custom_emoji_html: "%{name} je posodobil/a emotikone %{target}"
         update_domain_block_html: "%{name} je posodobil/a domenski blok za %{target}"
         update_ip_block_html: "%{name} je spremenil/a pravilo za IP %{target}"
+        update_report_html: "%{name} je posodobil poročilo %{target}"
         update_status_html: "%{name} je posodobil/a objavo uporabnika %{target}"
         update_user_role_html: "%{name} je spremenil/a vlogo %{target}"
       deleted_account: izbrisan račun
diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml
index b4976f8985da90..808a10e7290c6a 100644
--- a/config/locales/sr-Latn.yml
+++ b/config/locales/sr-Latn.yml
@@ -288,6 +288,7 @@ sr-Latn:
         update_custom_emoji_html: "%{name} je ažurirao/-la emodži %{target}"
         update_domain_block_html: "%{name} je ažurirao/-la blok domena %{target}"
         update_ip_block_html: "%{name} je promenio/-la IP uslov za %{target}"
+        update_report_html: "%{name} je ažurirao izveštaj %{target}"
         update_status_html: "%{name} je ažurirao/-la objavu korisnika %{target}"
         update_user_role_html: "%{name} je promenio/-la poziciju %{target}"
       deleted_account: obrisan nalog
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index aec6d399d58639..f03c6e878a2a09 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -288,6 +288,7 @@ sr:
         update_custom_emoji_html: "%{name} је ажурирао/-ла емоџи %{target}"
         update_domain_block_html: "%{name} је ажурирао/-ла блок домена %{target}"
         update_ip_block_html: "%{name} је променио/-ла IP услов за %{target}"
+        update_report_html: "%{name} је ажурирао извештај %{target}"
         update_status_html: "%{name} је ажурирао/-ла објаву корисника %{target}"
         update_user_role_html: "%{name} је променио/-ла позицију %{target}"
       deleted_account: обрисан налог
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 11e1fce3fe6739..9f0de4a723a781 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -285,6 +285,7 @@ sv:
         update_custom_emoji_html: "%{name} uppdaterade emoji %{target}"
         update_domain_block_html: "%{name} uppdaterade domän-block för %{target}"
         update_ip_block_html: "%{name} ändrade regel för IP %{target}"
+        update_report_html: "%{name} uppdaterade rapporten %{target}"
         update_status_html: "%{name} uppdaterade inlägget av %{target}"
         update_user_role_html: "%{name} ändrade rollen %{target}"
       deleted_account: raderat konto
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 56b7bea69a8ad8..5711f68ff89061 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -282,6 +282,7 @@ th:
         update_custom_emoji_html: "%{name} ได้อัปเดตอีโมจิ %{target}"
         update_domain_block_html: "%{name} ได้อัปเดตการปิดกั้นโดเมนสำหรับ %{target}"
         update_ip_block_html: "%{name} ได้เปลี่ยนกฎสำหรับ IP %{target}"
+        update_report_html: "%{name} ได้อัปเดตรายงาน %{target}"
         update_status_html: "%{name} ได้อัปเดตโพสต์โดย %{target}"
         update_user_role_html: "%{name} ได้เปลี่ยนบทบาท %{target}"
       deleted_account: บัญชีที่ลบแล้ว
@@ -1838,6 +1839,7 @@ th:
       feature_action: เรียนรู้เพิ่มเติม
       feature_audience: Mastodon มีความพิเศษที่ให้คุณจัดการผู้รับสารของคุณได้โดยไม่มีตัวกลาง นอกจากนี้ การติดตั้ง Mastodon บนโครงสร้างพื้นฐานของคุณจะทำให้คุณสามารถติดตาม (และติดตามโดย) เซิร์ฟเวอร์ Mastodon แห่งไหนก็ได้ที่ทำงานอยู่ โดยไม่มีใครสามารถควบคุมได้นอกจากคุณ
       feature_audience_title: สร้างผู้ชมของคุณด้วยความมั่นใจ
+      feature_control: คุณทราบดีที่สุดถึงสิ่งที่คุณต้องการเห็นในฟีดหน้าแรกของคุณ ไม่มีอัลกอริทึมหรือโฆษณาให้เสียเวลาของคุณ ติดตามใครก็ตามทั่วทั้งเซิร์ฟเวอร์ Mastodon ใด ๆ จากบัญชีเดียวและรับโพสต์ของเขาตามลำดับเวลา และทำให้มุมอินเทอร์เน็ตของคุณเป็นเหมือนคุณมากขึ้นอีกนิด
       feature_control_title: การควบคุมเส้นเวลาของคุณเอง
       feature_creativity_title: ความคิดสร้างสรรค์ที่ไม่มีใครเทียบได้
       feature_moderation_title: การกลั่นกรองในแบบที่ควรจะเป็น
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 7b9cf50aaf86ea..469f2c5ad8f07e 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -285,6 +285,7 @@ tr:
         update_custom_emoji_html: "%{name}, %{target} emojisini güncelledi"
         update_domain_block_html: "%{name}, %{target} alan adının engelini güncelledi"
         update_ip_block_html: "%{name}, %{target} IP adresi için kuralı güncelledi"
+        update_report_html: "%{name}, %{target} raporunu güncelledi"
         update_status_html: "%{name}, %{target} kullanıcısının gönderisini güncelledi"
         update_user_role_html: "%{name}, %{target} rolünü değiştirdi"
       deleted_account: hesap silindi
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 5d9e881ea43a2d..05f3157ec96452 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -282,6 +282,7 @@ vi:
         update_custom_emoji_html: "%{name} đã cập nhật emoji %{target}"
         update_domain_block_html: "%{name} cập nhật chặn máy chủ %{target}"
         update_ip_block_html: "%{name} cập nhật chặn IP %{target}"
+        update_report_html: "%{name} cập nhật báo cáo %{target}"
         update_status_html: "%{name} cập nhật tút của %{target}"
         update_user_role_html: "%{name} đã thay đổi vai trò %{target}"
       deleted_account: tài khoản đã xóa
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 3140ebdd309aee..12b6197938efd7 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -282,6 +282,7 @@ zh-CN:
         update_custom_emoji_html: "%{name} 更新了自定义表情 %{target}"
         update_domain_block_html: "%{name} 更新了对 %{target} 的域名屏蔽"
         update_ip_block_html: "%{name} 修改了对 IP %{target} 的规则"
+        update_report_html: "%{name} 更新了举报 %{target}"
         update_status_html: "%{name} 刷新了 %{target} 的嘟文"
         update_user_role_html: "%{name} 更改了 %{target} 角色"
       deleted_account: 账号已注销
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index cdedd759eae866..ac633a201d8fc7 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -282,6 +282,7 @@ zh-TW:
         update_custom_emoji_html: "%{name} 已更新自訂 emoji 表情符號 %{target}"
         update_domain_block_html: "%{name} 已更新 %{target} 之網域封鎖"
         update_ip_block_html: "%{name} 已變更 IP %{target} 之規則"
+        update_report_html: "%{name} 已更新 %{target} 的檢舉"
         update_status_html: "%{name} 已更新 %{target} 的嘟文"
         update_user_role_html: "%{name} 已變更 %{target} 角色"
       deleted_account: 已刪除帳號

From 0ce22859a5f989593b04cc7701521655a2f85480 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 20 May 2024 09:56:28 +0200
Subject: [PATCH 1058/2191] fix(deps): update dependency @rails/ujs to v7.1.3
 (#30356)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 package.json |  2 +-
 yarn.lock    | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 773f19c50d8b9b..f38076d4c6cca8 100644
--- a/package.json
+++ b/package.json
@@ -45,7 +45,7 @@
     "@formatjs/intl-pluralrules": "^5.2.2",
     "@gamestdio/websocket": "^0.3.2",
     "@github/webauthn-json": "^2.1.1",
-    "@rails/ujs": "7.1.3-3",
+    "@rails/ujs": "7.1.3",
     "@reduxjs/toolkit": "^2.0.1",
     "@svgr/webpack": "^5.5.0",
     "arrow-key-navigation": "^1.2.0",
diff --git a/yarn.lock b/yarn.lock
index 6b1dd8d22dbe2d..698824cab4854b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2758,7 +2758,7 @@ __metadata:
     "@formatjs/intl-pluralrules": "npm:^5.2.2"
     "@gamestdio/websocket": "npm:^0.3.2"
     "@github/webauthn-json": "npm:^2.1.1"
-    "@rails/ujs": "npm:7.1.3-3"
+    "@rails/ujs": "npm:7.1.3"
     "@reduxjs/toolkit": "npm:^2.0.1"
     "@svgr/webpack": "npm:^5.5.0"
     "@testing-library/jest-dom": "npm:^6.0.0"
@@ -3042,10 +3042,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rails/ujs@npm:7.1.3-3":
-  version: 7.1.3-3
-  resolution: "@rails/ujs@npm:7.1.3-3"
-  checksum: 10c0/9eee95372b72d8f704b67f14a3bf9f2681ab5b11c7b79919bfde3341f2970771876af5b40de5b3e4fca6a97c76a41046eff71d96490617c1fc80ef3ad8bbac47
+"@rails/ujs@npm:7.1.3":
+  version: 7.1.3
+  resolution: "@rails/ujs@npm:7.1.3"
+  checksum: 10c0/68112d9add9dbc59b40c2ec1bc095a67445c57d20d0ab7d817ce3de0cd90374e2690af8ad54ce6ecc2d1c748b34c0c44d0fbd2f515ce2c443d7c5d23d00b9ce5
   languageName: node
   linkType: hard
 

From 9658d3e5804ab1e2180a70b6b19386592731fd78 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Mon, 20 May 2024 10:01:04 +0200
Subject: [PATCH 1059/2191] Use the job class as span name for Sidekiq root
 spans (#30353)

---
 config/initializers/opentelemetry.rb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/config/initializers/opentelemetry.rb b/config/initializers/opentelemetry.rb
index 9af0ab89c8698a..cf9f0b96f3bead 100644
--- a/config/initializers/opentelemetry.rb
+++ b/config/initializers/opentelemetry.rb
@@ -51,6 +51,9 @@
         use_rack_events: false, # instead of events, use middleware; allows for untraced_endpoints to ignore child spans
         untraced_endpoints: ['/health'],
       },
+      'OpenTelemetry::Instrumentation::Sidekiq' => {
+        span_naming: :job_class, # Use the job class as the span name, otherwise this is the queue name and not very helpful
+      },
     })
 
     prefix = ENV.fetch('OTEL_SERVICE_NAME_PREFIX', 'mastodon')

From 70608f824e4bdd197d179c70efc82effcefc0c6b Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 20 May 2024 04:03:39 -0400
Subject: [PATCH 1060/2191] Add coverage for
 `AdminMailer#auto_close_registrations` (#30349)

---
 spec/mailers/admin_mailer_spec.rb             | 18 ++++++++++++++++++
 spec/mailers/previews/admin_mailer_preview.rb |  5 +++++
 2 files changed, 23 insertions(+)

diff --git a/spec/mailers/admin_mailer_spec.rb b/spec/mailers/admin_mailer_spec.rb
index 88ad7aa02b0408..cd1ab3311c7ffa 100644
--- a/spec/mailers/admin_mailer_spec.rb
+++ b/spec/mailers/admin_mailer_spec.rb
@@ -125,4 +125,22 @@
         .and(have_header('X-Priority', '1'))
     end
   end
+
+  describe '.auto_close_registrations' do
+    let(:recipient) { Fabricate(:account, username: 'Bob') }
+    let(:mail) { described_class.with(recipient: recipient).auto_close_registrations }
+
+    before do
+      recipient.user.update(locale: :en)
+    end
+
+    it 'renders the email' do
+      expect(mail)
+        .to be_present
+        .and(deliver_to(recipient.user_email))
+        .and(deliver_from('notifications@localhost'))
+        .and(have_subject('Registrations for cb6e6126.ngrok.io have been automatically switched to requiring approval'))
+        .and(have_body_text('have been automatically switched'))
+    end
+  end
 end
diff --git a/spec/mailers/previews/admin_mailer_preview.rb b/spec/mailers/previews/admin_mailer_preview.rb
index 942d40d56878aa..b8fb387acdec8a 100644
--- a/spec/mailers/previews/admin_mailer_preview.rb
+++ b/spec/mailers/previews/admin_mailer_preview.rb
@@ -32,4 +32,9 @@ def new_software_updates
   def new_critical_software_updates
     AdminMailer.with(recipient: Account.first).new_critical_software_updates
   end
+
+  # Preview this email at http://localhost:3000/rails/mailers/admin_mailer/auto_close_registrations
+  def auto_close_registrations
+    AdminMailer.with(recipient: Account.first).auto_close_registrations
+  end
 end

From def6b686ff3ea8e4e77075a812bd463a3bf325c3 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 20 May 2024 05:37:36 -0400
Subject: [PATCH 1061/2191] Fix `Rails/WhereRange` cop (#30343)

---
 app/lib/vacuum/imports_vacuum.rb                       |  4 ++--
 app/lib/vacuum/statuses_vacuum.rb                      |  2 +-
 app/models/concerns/expireable.rb                      |  2 +-
 app/models/invite.rb                                   |  2 +-
 app/policies/backup_policy.rb                          |  2 +-
 app/workers/scheduler/ip_cleanup_scheduler.rb          | 10 +++++-----
 app/workers/scheduler/scheduled_statuses_scheduler.rb  |  2 +-
 app/workers/scheduler/user_cleanup_scheduler.rb        |  2 +-
 lib/mastodon/cli/preview_cards.rb                      |  2 +-
 .../accounts_statuses_cleanup_scheduler_spec.rb        |  2 +-
 10 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/app/lib/vacuum/imports_vacuum.rb b/app/lib/vacuum/imports_vacuum.rb
index 8c8bb783acb84f..700bd81847f4ac 100644
--- a/app/lib/vacuum/imports_vacuum.rb
+++ b/app/lib/vacuum/imports_vacuum.rb
@@ -9,10 +9,10 @@ def perform
   private
 
   def clean_unconfirmed_imports!
-    BulkImport.state_unconfirmed.where('created_at <= ?', 10.minutes.ago).reorder(nil).in_batches.delete_all
+    BulkImport.state_unconfirmed.where(created_at: ..10.minutes.ago).reorder(nil).in_batches.delete_all
   end
 
   def clean_old_imports!
-    BulkImport.where('created_at <= ?', 1.week.ago).reorder(nil).in_batches.delete_all
+    BulkImport.where(created_at: ..1.week.ago).reorder(nil).in_batches.delete_all
   end
 end
diff --git a/app/lib/vacuum/statuses_vacuum.rb b/app/lib/vacuum/statuses_vacuum.rb
index ad1de07380ceb9..92d3ccf4f40877 100644
--- a/app/lib/vacuum/statuses_vacuum.rb
+++ b/app/lib/vacuum/statuses_vacuum.rb
@@ -34,7 +34,7 @@ def vacuum_statuses!
   def statuses_scope
     Status.unscoped.kept
           .joins(:account).merge(Account.remote)
-          .where('statuses.id < ?', retention_period_as_id)
+          .where(statuses: { id: ...retention_period_as_id })
   end
 
   def retention_period_as_id
diff --git a/app/models/concerns/expireable.rb b/app/models/concerns/expireable.rb
index c64fc7d807d006..26740e8213759d 100644
--- a/app/models/concerns/expireable.rb
+++ b/app/models/concerns/expireable.rb
@@ -4,7 +4,7 @@ module Expireable
   extend ActiveSupport::Concern
 
   included do
-    scope :expired, -> { where.not(expires_at: nil).where('expires_at < ?', Time.now.utc) }
+    scope :expired, -> { where.not(expires_at: nil).where(expires_at: ...Time.now.utc) }
 
     def expires_in
       return @expires_in if defined?(@expires_in)
diff --git a/app/models/invite.rb b/app/models/invite.rb
index 2fe9f22fbe1339..ea095a3ac17747 100644
--- a/app/models/invite.rb
+++ b/app/models/invite.rb
@@ -24,7 +24,7 @@ class Invite < ApplicationRecord
   belongs_to :user, inverse_of: :invites
   has_many :users, inverse_of: :invite, dependent: nil
 
-  scope :available, -> { where(expires_at: nil).or(where('expires_at >= ?', Time.now.utc)) }
+  scope :available, -> { where(expires_at: nil).or(where(expires_at: Time.now.utc..)) }
 
   validates :comment, length: { maximum: COMMENT_SIZE_LIMIT }
 
diff --git a/app/policies/backup_policy.rb b/app/policies/backup_policy.rb
index 86b8efbe96fa7d..7a4c5b4347497d 100644
--- a/app/policies/backup_policy.rb
+++ b/app/policies/backup_policy.rb
@@ -4,6 +4,6 @@ class BackupPolicy < ApplicationPolicy
   MIN_AGE = 6.days
 
   def create?
-    user_signed_in? && current_user.backups.where('created_at >= ?', MIN_AGE.ago).count.zero?
+    user_signed_in? && current_user.backups.where(created_at: MIN_AGE.ago..).count.zero?
   end
 end
diff --git a/app/workers/scheduler/ip_cleanup_scheduler.rb b/app/workers/scheduler/ip_cleanup_scheduler.rb
index f78c0584d7f892..04fb0aaa3306cd 100644
--- a/app/workers/scheduler/ip_cleanup_scheduler.rb
+++ b/app/workers/scheduler/ip_cleanup_scheduler.rb
@@ -16,11 +16,11 @@ def perform
   private
 
   def clean_ip_columns!
-    SessionActivation.where('updated_at < ?', SESSION_RETENTION_PERIOD.ago).in_batches.destroy_all
-    SessionActivation.where('updated_at < ?', IP_RETENTION_PERIOD.ago).in_batches.update_all(ip: nil)
-    User.where('current_sign_in_at < ?', IP_RETENTION_PERIOD.ago).in_batches.update_all(sign_up_ip: nil)
-    LoginActivity.where('created_at < ?', IP_RETENTION_PERIOD.ago).in_batches.destroy_all
-    Doorkeeper::AccessToken.where('last_used_at < ?', IP_RETENTION_PERIOD.ago).in_batches.update_all(last_used_ip: nil)
+    SessionActivation.where(updated_at: ...SESSION_RETENTION_PERIOD.ago).in_batches.destroy_all
+    SessionActivation.where(updated_at: ...IP_RETENTION_PERIOD.ago).in_batches.update_all(ip: nil)
+    User.where(current_sign_in_at: ...IP_RETENTION_PERIOD.ago).in_batches.update_all(sign_up_ip: nil)
+    LoginActivity.where(created_at: ...IP_RETENTION_PERIOD.ago).in_batches.destroy_all
+    Doorkeeper::AccessToken.where(last_used_at: ...IP_RETENTION_PERIOD.ago).in_batches.update_all(last_used_ip: nil)
   end
 
   def clean_expired_ip_blocks!
diff --git a/app/workers/scheduler/scheduled_statuses_scheduler.rb b/app/workers/scheduler/scheduled_statuses_scheduler.rb
index fe60d5524eaf20..4e251780de5f1a 100644
--- a/app/workers/scheduler/scheduled_statuses_scheduler.rb
+++ b/app/workers/scheduler/scheduled_statuses_scheduler.rb
@@ -20,7 +20,7 @@ def publish_scheduled_statuses!
   end
 
   def due_statuses
-    ScheduledStatus.where('scheduled_at <= ?', Time.now.utc + PostStatusService::MIN_SCHEDULE_OFFSET)
+    ScheduledStatus.where(scheduled_at: ..Time.now.utc + PostStatusService::MIN_SCHEDULE_OFFSET)
   end
 
   def publish_scheduled_announcements!
diff --git a/app/workers/scheduler/user_cleanup_scheduler.rb b/app/workers/scheduler/user_cleanup_scheduler.rb
index 63ea876e5078dc..74abc2370189af 100644
--- a/app/workers/scheduler/user_cleanup_scheduler.rb
+++ b/app/workers/scheduler/user_cleanup_scheduler.rb
@@ -25,7 +25,7 @@ def clean_unconfirmed_accounts!
   end
 
   def clean_discarded_statuses!
-    Status.unscoped.discarded.where('deleted_at <= ?', DISCARDED_STATUSES_MAX_AGE_DAYS.days.ago).find_in_batches do |statuses|
+    Status.unscoped.discarded.where(deleted_at: ..DISCARDED_STATUSES_MAX_AGE_DAYS.days.ago).find_in_batches do |statuses|
       RemovalWorker.push_bulk(statuses) do |status|
         [status.id, { 'immediate' => true, 'skip_streaming' => true }]
       end
diff --git a/lib/mastodon/cli/preview_cards.rb b/lib/mastodon/cli/preview_cards.rb
index 9b20a0cbb8662d..c0e207ad5969b0 100644
--- a/lib/mastodon/cli/preview_cards.rb
+++ b/lib/mastodon/cli/preview_cards.rb
@@ -29,7 +29,7 @@ def remove
       link     = options[:link] ? 'link-type ' : ''
       scope    = PreviewCard.cached
       scope    = scope.where(type: :link) if options[:link]
-      scope    = scope.where('updated_at < ?', time_ago)
+      scope    = scope.where(updated_at: ...time_ago)
 
       processed, aggregate = parallelize_with_progress(scope) do |preview_card|
         next if preview_card.image.blank?
diff --git a/spec/workers/scheduler/accounts_statuses_cleanup_scheduler_spec.rb b/spec/workers/scheduler/accounts_statuses_cleanup_scheduler_spec.rb
index 4d9185093a2d3b..08ebf82785f6d9 100644
--- a/spec/workers/scheduler/accounts_statuses_cleanup_scheduler_spec.rb
+++ b/spec/workers/scheduler/accounts_statuses_cleanup_scheduler_spec.rb
@@ -163,7 +163,7 @@
       def cleanable_statuses_count
         Status
           .where(account_id: [account_alice, account_chris, account_erin]) # Accounts with enabled policies
-          .where('created_at < ?', 2.weeks.ago) # Policy defaults is 2.weeks
+          .where(created_at: ...2.weeks.ago) # Policy defaults is 2.weeks
           .count
       end
     end

From de4815afda0809bf999519aabda1cd14c67278da Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 20 May 2024 12:06:51 +0200
Subject: [PATCH 1062/2191] Add more tests for self-destruct mode (#30374)

---
 spec/helpers/self_destruct_helper_spec.rb | 70 +++++++++++++++++
 spec/requests/self_destruct_spec.rb       | 92 +++++++++++++++++++++++
 2 files changed, 162 insertions(+)
 create mode 100644 spec/helpers/self_destruct_helper_spec.rb
 create mode 100644 spec/requests/self_destruct_spec.rb

diff --git a/spec/helpers/self_destruct_helper_spec.rb b/spec/helpers/self_destruct_helper_spec.rb
new file mode 100644
index 00000000000000..09d7347eee7ab7
--- /dev/null
+++ b/spec/helpers/self_destruct_helper_spec.rb
@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe SelfDestructHelper do
+  describe 'self_destruct?' do
+    context 'when SELF_DESTRUCT is unset' do
+      it 'returns false' do
+        expect(helper.self_destruct?).to be false
+      end
+    end
+
+    context 'when SELF_DESTRUCT is set to an invalid value' do
+      around do |example|
+        ClimateControl.modify SELF_DESTRUCT: 'true' do
+          example.run
+        end
+      end
+
+      it 'returns false' do
+        expect(helper.self_destruct?).to be false
+      end
+    end
+
+    context 'when SELF_DESTRUCT is set to value signed for the wrong purpose' do
+      around do |example|
+        ClimateControl.modify(
+          SELF_DESTRUCT: Rails.application.message_verifier('foo').generate('example.com'),
+          LOCAL_DOMAIN: 'example.com'
+        ) do
+          example.run
+        end
+      end
+
+      it 'returns false' do
+        expect(helper.self_destruct?).to be false
+      end
+    end
+
+    context 'when SELF_DESTRUCT is set to value signed for the wrong domain' do
+      around do |example|
+        ClimateControl.modify(
+          SELF_DESTRUCT: Rails.application.message_verifier('self-destruct').generate('foo.com'),
+          LOCAL_DOMAIN: 'example.com'
+        ) do
+          example.run
+        end
+      end
+
+      it 'returns false' do
+        expect(helper.self_destruct?).to be false
+      end
+    end
+
+    context 'when SELF_DESTRUCT is set to a correctly-signed value' do
+      around do |example|
+        ClimateControl.modify(
+          SELF_DESTRUCT: Rails.application.message_verifier('self-destruct').generate('example.com'),
+          LOCAL_DOMAIN: 'example.com'
+        ) do
+          example.run
+        end
+      end
+
+      it 'returns true' do
+        expect(helper.self_destruct?).to be true
+      end
+    end
+  end
+end
diff --git a/spec/requests/self_destruct_spec.rb b/spec/requests/self_destruct_spec.rb
new file mode 100644
index 00000000000000..f71a2325e2a897
--- /dev/null
+++ b/spec/requests/self_destruct_spec.rb
@@ -0,0 +1,92 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'Self-destruct mode' do
+  before do
+    allow(SelfDestructHelper).to receive(:self_destruct?).and_return(true)
+  end
+
+  shared_examples 'generic logged out request' do |path|
+    it 'returns 410 gone and mentions self-destruct' do
+      get path, headers: { 'Accept' => 'text/html' }
+
+      expect(response).to have_http_status(410)
+      expect(response.body).to include(I18n.t('self_destruct.title'))
+    end
+  end
+
+  shared_examples 'accessible logged-in endpoint' do |path|
+    it 'returns 200 ok' do
+      get path
+
+      expect(response).to have_http_status(200)
+    end
+  end
+
+  shared_examples 'ActivityPub request' do |path|
+    context 'without signature' do
+      it 'returns 410 gone' do
+        get path, headers: {
+          'Accept' => 'application/activity+json, application/ld+json; profile="https://www.w3.org/ns/activitystreams"',
+        }
+
+        expect(response).to have_http_status(410)
+      end
+    end
+
+    context 'with invalid signature' do
+      it 'returns 410 gone' do
+        get path, headers: {
+          'Accept' => 'application/activity+json, application/ld+json; profile="https://www.w3.org/ns/activitystreams"',
+          'Signature' => 'keyId="https://remote.domain/users/bob#main-key",algorithm="rsa-sha256",headers="date host (request-target)",signature="bar"',
+        }
+
+        expect(response).to have_http_status(410)
+      end
+    end
+  end
+
+  context 'when requesting various unavailable endpoints' do
+    it_behaves_like 'generic logged out request', '/'
+    it_behaves_like 'generic logged out request', '/about'
+    it_behaves_like 'generic logged out request', '/public'
+  end
+
+  context 'when requesting a suspended account' do
+    let(:suspended) { Fabricate(:account, username: 'suspended') }
+
+    before do
+      suspended.suspend!
+    end
+
+    it_behaves_like 'generic logged out request', '/@suspended'
+    it_behaves_like 'ActivityPub request', '/users/suspended'
+    it_behaves_like 'ActivityPub request', '/users/suspended/followers'
+    it_behaves_like 'ActivityPub request', '/users/suspended/outbox'
+  end
+
+  context 'when requesting a non-suspended account' do
+    before do
+      Fabricate(:account, username: 'bob')
+    end
+
+    it_behaves_like 'generic logged out request', '/@bob'
+    it_behaves_like 'ActivityPub request', '/users/bob'
+    it_behaves_like 'ActivityPub request', '/users/bob/followers'
+    it_behaves_like 'ActivityPub request', '/users/bob/outbox'
+  end
+
+  context 'when accessing still-enabled endpoints when logged in' do
+    let(:user) { Fabricate(:user) }
+
+    before do
+      sign_in(user)
+    end
+
+    it_behaves_like 'accessible logged-in endpoint', '/auth/edit'
+    it_behaves_like 'accessible logged-in endpoint', '/settings/export'
+    it_behaves_like 'accessible logged-in endpoint', '/settings/login_activities'
+    it_behaves_like 'accessible logged-in endpoint', '/settings/exports/follows.csv'
+  end
+end

From ca5955ed76ebec90fa87983017904a7b2b0c56a3 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Sun, 19 May 2024 19:07:32 +0200
Subject: [PATCH 1063/2191] [Glitch] Use a modern React context for identity in
 the app

Port a178ba7cd5fa10b018ecaf3c8e3dd5f298a08818 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../glitch/components/column_header.jsx       | 12 ++-
 .../flavours/glitch/components/poll.jsx       | 11 +--
 .../glitch/components/status_action_bar.jsx   | 17 ++---
 .../glitch/components/status_content.jsx      | 11 +--
 .../flavours/glitch/containers/mastodon.jsx   | 54 ++++----------
 .../features/account/components/header.jsx    | 10 +--
 .../features/community_timeline/index.jsx     | 13 ++--
 .../features/compose/components/search.jsx    | 13 ++--
 .../glitch/features/explore/index.jsx         | 11 +--
 .../glitch/features/firehose/index.jsx        | 12 +--
 .../glitch/features/getting_started/index.jsx | 13 ++--
 .../features/getting_started_misc/index.jsx   | 11 +--
 .../features/hashtag_timeline/index.jsx       | 15 ++--
 .../glitch/features/home_timeline/index.jsx   | 11 +--
 .../components/column_settings.jsx            | 15 ++--
 .../glitch/features/notifications/index.jsx   | 11 +--
 .../picture_in_picture/components/footer.jsx  | 15 ++--
 .../glitch/features/public_timeline/index.jsx | 13 ++--
 .../features/status/components/action_bar.jsx | 11 +--
 .../flavours/glitch/features/status/index.jsx | 15 ++--
 .../features/ui/components/compose_panel.jsx  | 11 +--
 .../glitch/features/ui/components/header.jsx  | 11 +--
 .../features/ui/components/link_footer.jsx    | 11 +--
 .../ui/components/navigation_panel.jsx        | 11 +--
 .../flavours/glitch/features/ui/index.jsx     | 25 +++----
 .../flavours/glitch/identity_context.tsx      | 74 +++++++++++++++++++
 .../flavours/glitch/initial_state.js          | 10 +++
 27 files changed, 216 insertions(+), 231 deletions(-)
 create mode 100644 app/javascript/flavours/glitch/identity_context.tsx

diff --git a/app/javascript/flavours/glitch/components/column_header.jsx b/app/javascript/flavours/glitch/components/column_header.jsx
index 01778124802096..210ec396fae371 100644
--- a/app/javascript/flavours/glitch/components/column_header.jsx
+++ b/app/javascript/flavours/glitch/components/column_header.jsx
@@ -14,8 +14,10 @@ import CloseIcon from '@/material-icons/400-24px/close.svg?react';
 import SettingsIcon from '@/material-icons/400-24px/settings.svg?react';
 import { Icon }  from 'flavours/glitch/components/icon';
 import { ButtonInTabsBar } from 'flavours/glitch/features/ui/util/columns_context';
+import { identityContextPropShape, withIdentity } from 'flavours/glitch/identity_context';
 import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router';
 
+
 import { useAppHistory } from './router';
 
 const messages = defineMessages({
@@ -51,12 +53,8 @@ BackButton.propTypes = {
 };
 
 class ColumnHeader extends PureComponent {
-
-  static contextTypes = {
-    identity: PropTypes.object,
-  };
-
   static propTypes = {
+    identity: identityContextPropShape,
     intl: PropTypes.object.isRequired,
     title: PropTypes.node,
     icon: PropTypes.string,
@@ -171,7 +169,7 @@ class ColumnHeader extends PureComponent {
       );
     }
 
-    if (this.context.identity.signedIn && (children || (multiColumn && this.props.onPin))) {
+    if (this.props.identity.signedIn && (children || (multiColumn && this.props.onPin))) {
       collapseButton = (
         <button
           className={collapsibleButtonClassName}
@@ -232,4 +230,4 @@ class ColumnHeader extends PureComponent {
 
 }
 
-export default injectIntl(withRouter(ColumnHeader));
+export default injectIntl(withIdentity(withRouter(ColumnHeader)));
diff --git a/app/javascript/flavours/glitch/components/poll.jsx b/app/javascript/flavours/glitch/components/poll.jsx
index f9e008bd72f977..a4fb4b62d1c5b3 100644
--- a/app/javascript/flavours/glitch/components/poll.jsx
+++ b/app/javascript/flavours/glitch/components/poll.jsx
@@ -14,6 +14,7 @@ import CheckIcon from '@/material-icons/400-24px/check.svg?react';
 import { Icon }  from 'flavours/glitch/components/icon';
 import emojify from 'flavours/glitch/features/emoji/emoji';
 import Motion from 'flavours/glitch/features/ui/util/optional_motion';
+import { identityContextPropShape, withIdentity } from 'flavours/glitch/identity_context';
 
 import { RelativeTimestamp } from './relative_timestamp';
 
@@ -38,12 +39,8 @@ const makeEmojiMap = record => record.get('emojis').reduce((obj, emoji) => {
 }, {});
 
 class Poll extends ImmutablePureComponent {
-
-  static contextTypes = {
-    identity: PropTypes.object,
-  };
-
   static propTypes = {
+    identity: identityContextPropShape,
     poll: ImmutablePropTypes.map,
     lang: PropTypes.string,
     intl: PropTypes.object.isRequired,
@@ -235,7 +232,7 @@ class Poll extends ImmutablePureComponent {
         </ul>
 
         <div className='poll__footer'>
-          {!showResults && <button className='button button-secondary' disabled={disabled || !this.context.identity.signedIn} onClick={this.handleVote}><FormattedMessage id='poll.vote' defaultMessage='Vote' /></button>}
+          {!showResults && <button className='button button-secondary' disabled={disabled || !this.props.identity.signedIn} onClick={this.handleVote}><FormattedMessage id='poll.vote' defaultMessage='Vote' /></button>}
           {!showResults && <><button className='poll__link' onClick={this.handleReveal}><FormattedMessage id='poll.reveal' defaultMessage='See results' /></button> · </>}
           {showResults && !this.props.disabled && <><button className='poll__link' onClick={this.handleRefresh}><FormattedMessage id='poll.refresh' defaultMessage='Refresh' /></button> · </>}
           {votesCount}
@@ -247,4 +244,4 @@ class Poll extends ImmutablePureComponent {
 
 }
 
-export default injectIntl(Poll);
+export default injectIntl(withIdentity(Poll));
diff --git a/app/javascript/flavours/glitch/components/status_action_bar.jsx b/app/javascript/flavours/glitch/components/status_action_bar.jsx
index f27719a6b9f43c..3dfe4039872ac8 100644
--- a/app/javascript/flavours/glitch/components/status_action_bar.jsx
+++ b/app/javascript/flavours/glitch/components/status_action_bar.jsx
@@ -21,6 +21,7 @@ import RepeatActiveIcon from '@/svg-icons/repeat_active.svg?react';
 import RepeatDisabledIcon from '@/svg-icons/repeat_disabled.svg';
 import RepeatPrivateIcon from '@/svg-icons/repeat_private.svg';
 import RepeatPrivateActiveIcon from '@/svg-icons/repeat_private_active.svg?react';
+import { identityContextPropShape, withIdentity } from 'flavours/glitch/identity_context';
 import { PERMISSION_MANAGE_USERS, PERMISSION_MANAGE_FEDERATION } from 'flavours/glitch/permissions';
 import { accountAdminLink, statusAdminLink } from 'flavours/glitch/utils/backend_links';
 import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router';
@@ -67,12 +68,8 @@ const messages = defineMessages({
 });
 
 class StatusActionBar extends ImmutablePureComponent {
-
-  static contextTypes = {
-    identity: PropTypes.object,
-  };
-
   static propTypes = {
+    identity: identityContextPropShape,
     status: ImmutablePropTypes.map.isRequired,
     onReply: PropTypes.func,
     onFavourite: PropTypes.func,
@@ -108,7 +105,7 @@ class StatusActionBar extends ImmutablePureComponent {
   ];
 
   handleReplyClick = () => {
-    const { signedIn } = this.context.identity;
+    const { signedIn } = this.props.identity;
 
     if (signedIn) {
       this.props.onReply(this.props.status, this.props.history);
@@ -124,7 +121,7 @@ class StatusActionBar extends ImmutablePureComponent {
   };
 
   handleFavouriteClick = (e) => {
-    const { signedIn } = this.context.identity;
+    const { signedIn } = this.props.identity;
 
     if (signedIn) {
       this.props.onFavourite(this.props.status, e);
@@ -134,7 +131,7 @@ class StatusActionBar extends ImmutablePureComponent {
   };
 
   handleReblogClick = e => {
-    const { signedIn } = this.context.identity;
+    const { signedIn } = this.props.identity;
 
     if (signedIn) {
       this.props.onReblog(this.props.status, e);
@@ -210,7 +207,7 @@ class StatusActionBar extends ImmutablePureComponent {
 
   render () {
     const { status, intl, withDismiss, withCounters, showReplyCount, scrollKey } = this.props;
-    const { permissions, signedIn } = this.context.identity;
+    const { permissions, signedIn } = this.props.identity;
 
     const mutingConversation = status.get('muted');
     const publicStatus       = ['public', 'unlisted'].includes(status.get('visibility'));
@@ -359,4 +356,4 @@ class StatusActionBar extends ImmutablePureComponent {
 
 }
 
-export default withRouter(injectIntl(StatusActionBar));
+export default withRouter(withIdentity(injectIntl(StatusActionBar)));
diff --git a/app/javascript/flavours/glitch/components/status_content.jsx b/app/javascript/flavours/glitch/components/status_content.jsx
index f5d5ccc70af187..24da69cdf2abdf 100644
--- a/app/javascript/flavours/glitch/components/status_content.jsx
+++ b/app/javascript/flavours/glitch/components/status_content.jsx
@@ -15,6 +15,7 @@ import LinkIcon from '@/material-icons/400-24px/link.svg?react';
 import MovieIcon from '@/material-icons/400-24px/movie.svg?react';
 import MusicNoteIcon from '@/material-icons/400-24px/music_note.svg?react';
 import { Icon } from 'flavours/glitch/components/icon';
+import { identityContextPropShape, withIdentity } from 'flavours/glitch/identity_context';
 import { autoPlayGif, languages as preloadedLanguages } from 'flavours/glitch/initial_state';
 import { decode as decodeIDNA } from 'flavours/glitch/utils/idna';
 
@@ -126,12 +127,8 @@ const mapStateToProps = state => ({
 });
 
 class StatusContent extends PureComponent {
-
-  static contextTypes = {
-    identity: PropTypes.object,
-  };
-
   static propTypes = {
+    identity: identityContextPropShape,
     status: ImmutablePropTypes.map.isRequired,
     statusContent: PropTypes.string,
     expanded: PropTypes.bool,
@@ -349,7 +346,7 @@ class StatusContent extends PureComponent {
     const hidden = this.props.onExpandedToggle ? !this.props.expanded : this.state.hidden;
     const contentLocale = intl.locale.replace(/[_-].*/, '');
     const targetLanguages = this.props.languages?.get(status.get('language') || 'und');
-    const renderTranslate = this.props.onTranslate && this.context.identity.signedIn && ['public', 'unlisted'].includes(status.get('visibility')) && status.get('search_index').trim().length > 0 && targetLanguages?.includes(contentLocale);
+    const renderTranslate = this.props.onTranslate && this.props.identity.signedIn && ['public', 'unlisted'].includes(status.get('visibility')) && status.get('search_index').trim().length > 0 && targetLanguages?.includes(contentLocale);
 
     const content = { __html: statusContent ?? getStatusContent(status) };
     const spoilerContent = { __html: status.getIn(['translation', 'spoilerHtml']) || status.get('spoilerHtml') };
@@ -503,4 +500,4 @@ class StatusContent extends PureComponent {
 
 }
 
-export default withRouter(connect(mapStateToProps)(injectIntl(StatusContent)));
+export default withRouter(withIdentity(connect(mapStateToProps)(injectIntl(StatusContent))));
diff --git a/app/javascript/flavours/glitch/containers/mastodon.jsx b/app/javascript/flavours/glitch/containers/mastodon.jsx
index 1704336f2c16c8..c0f63b95b47bb1 100644
--- a/app/javascript/flavours/glitch/containers/mastodon.jsx
+++ b/app/javascript/flavours/glitch/containers/mastodon.jsx
@@ -1,4 +1,3 @@
-import PropTypes from 'prop-types';
 import { PureComponent } from 'react';
 
 import { Helmet } from 'react-helmet';
@@ -15,6 +14,7 @@ import { connectUserStream } from 'flavours/glitch/actions/streaming';
 import ErrorBoundary from 'flavours/glitch/components/error_boundary';
 import { Router } from 'flavours/glitch/components/router';
 import UI from 'flavours/glitch/features/ui';
+import { IdentityContext, createIdentityContext } from 'flavours/glitch/identity_context';
 import initialState, { title as siteTitle } from 'flavours/glitch/initial_state';
 import { IntlProvider } from 'flavours/glitch/locales';
 import { store } from 'flavours/glitch/store';
@@ -33,33 +33,9 @@ if (initialState.meta.me) {
   store.dispatch(fetchCustomEmojis());
 }
 
-const createIdentityContext = state => ({
-  signedIn: !!state.meta.me,
-  accountId: state.meta.me,
-  disabledAccountId: state.meta.disabled_account_id,
-  accessToken: state.meta.access_token,
-  permissions: state.role ? state.role.permissions : 0,
-});
-
 export default class Mastodon extends PureComponent {
-
-  static childContextTypes = {
-    identity: PropTypes.shape({
-      signedIn: PropTypes.bool.isRequired,
-      accountId: PropTypes.string,
-      disabledAccountId: PropTypes.string,
-      accessToken: PropTypes.string,
-    }).isRequired,
-  };
-
   identity = createIdentityContext(initialState);
 
-  getChildContext() {
-    return {
-      identity: this.identity,
-    };
-  }
-
   componentDidMount() {
     if (this.identity.signedIn) {
       this.disconnect = store.dispatch(connectUserStream());
@@ -79,19 +55,21 @@ export default class Mastodon extends PureComponent {
 
   render () {
     return (
-      <IntlProvider>
-        <ReduxProvider store={store}>
-          <ErrorBoundary>
-            <Router>
-              <ScrollContext shouldUpdateScroll={this.shouldUpdateScroll}>
-                <Route path='/' component={UI} />
-              </ScrollContext>
-            </Router>
-
-            <Helmet defaultTitle={title} titleTemplate={`%s - ${title}`} />
-          </ErrorBoundary>
-        </ReduxProvider>
-      </IntlProvider>
+      <IdentityContext.Provider value={this.identity}>
+        <IntlProvider>
+          <ReduxProvider store={store}>
+            <ErrorBoundary>
+              <Router>
+                <ScrollContext shouldUpdateScroll={this.shouldUpdateScroll}>
+                  <Route path='/' component={UI} />
+                </ScrollContext>
+              </Router>
+
+              <Helmet defaultTitle={title} titleTemplate={`%s - ${title}`} />
+            </ErrorBoundary>
+          </ReduxProvider>
+        </IntlProvider>
+      </IdentityContext.Provider>
     );
   }
 
diff --git a/app/javascript/flavours/glitch/features/account/components/header.jsx b/app/javascript/flavours/glitch/features/account/components/header.jsx
index e311936af95978..62c8c84c66eafa 100644
--- a/app/javascript/flavours/glitch/features/account/components/header.jsx
+++ b/app/javascript/flavours/glitch/features/account/components/header.jsx
@@ -23,6 +23,7 @@ import { Icon }  from 'flavours/glitch/components/icon';
 import { IconButton } from 'flavours/glitch/components/icon_button';
 import { LoadingIndicator } from 'flavours/glitch/components/loading_indicator';
 import DropdownMenuContainer from 'flavours/glitch/containers/dropdown_menu_container';
+import { identityContextPropShape, withIdentity } from 'flavours/glitch/identity_context';
 import { autoPlayGif, me, domain as localDomain } from 'flavours/glitch/initial_state';
 import { PERMISSION_MANAGE_USERS, PERMISSION_MANAGE_FEDERATION } from 'flavours/glitch/permissions';
 import { preferencesLink, profileLink, accountAdminLink } from 'flavours/glitch/utils/backend_links';
@@ -94,6 +95,7 @@ const dateFormatOptions = {
 class Header extends ImmutablePureComponent {
 
   static propTypes = {
+    identity: identityContextPropShape,
     account: ImmutablePropTypes.record,
     identity_props: ImmutablePropTypes.list,
     onFollow: PropTypes.func.isRequired,
@@ -117,10 +119,6 @@ class Header extends ImmutablePureComponent {
     ...WithRouterPropTypes,
   };
 
-  static contextTypes = {
-    identity: PropTypes.object,
-  };
-
   openEditProfile = () => {
     window.open(profileLink, '_blank');
   };
@@ -170,7 +168,7 @@ class Header extends ImmutablePureComponent {
 
   render () {
     const { account, hidden, intl } = this.props;
-    const { signedIn, permissions } = this.context.identity;
+    const { signedIn, permissions } = this.props.identity;
 
     if (!account) {
       return null;
@@ -414,4 +412,4 @@ class Header extends ImmutablePureComponent {
 
 }
 
-export default withRouter(injectIntl(Header));
+export default withRouter(withIdentity(injectIntl(Header)));
diff --git a/app/javascript/flavours/glitch/features/community_timeline/index.jsx b/app/javascript/flavours/glitch/features/community_timeline/index.jsx
index 7be2196511a592..9f306923e33f30 100644
--- a/app/javascript/flavours/glitch/features/community_timeline/index.jsx
+++ b/app/javascript/flavours/glitch/features/community_timeline/index.jsx
@@ -9,6 +9,7 @@ import { connect } from 'react-redux';
 
 import PeopleIcon from '@/material-icons/400-24px/group.svg?react';
 import { DismissableBanner } from 'flavours/glitch/components/dismissable_banner';
+import { identityContextPropShape, withIdentity } from 'flavours/glitch/identity_context';
 import { domain } from 'flavours/glitch/initial_state';
 
 import { addColumn, removeColumn, moveColumn } from '../../actions/columns';
@@ -40,16 +41,12 @@ const mapStateToProps = (state, { columnId }) => {
 };
 
 class CommunityTimeline extends PureComponent {
-
-  static contextTypes = {
-    identity: PropTypes.object,
-  };
-
   static defaultProps = {
     onlyMedia: false,
   };
 
   static propTypes = {
+    identity: identityContextPropShape,
     dispatch: PropTypes.func.isRequired,
     columnId: PropTypes.string,
     intl: PropTypes.object.isRequired,
@@ -80,7 +77,7 @@ class CommunityTimeline extends PureComponent {
 
   componentDidMount () {
     const { dispatch, onlyMedia } = this.props;
-    const { signedIn } = this.context.identity;
+    const { signedIn } = this.props.identity;
 
     dispatch(expandCommunityTimeline({ onlyMedia }));
 
@@ -90,7 +87,7 @@ class CommunityTimeline extends PureComponent {
   }
 
   componentDidUpdate (prevProps) {
-    const { signedIn } = this.context.identity;
+    const { signedIn } = this.props.identity;
 
     if (prevProps.onlyMedia !== this.props.onlyMedia) {
       const { dispatch, onlyMedia } = this.props;
@@ -165,4 +162,4 @@ class CommunityTimeline extends PureComponent {
 
 }
 
-export default connect(mapStateToProps)(injectIntl(CommunityTimeline));
+export default withIdentity(connect(mapStateToProps)(injectIntl(CommunityTimeline)));
diff --git a/app/javascript/flavours/glitch/features/compose/components/search.jsx b/app/javascript/flavours/glitch/features/compose/components/search.jsx
index 4b64038f570941..f5a51334af8795 100644
--- a/app/javascript/flavours/glitch/features/compose/components/search.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/search.jsx
@@ -12,6 +12,7 @@ import CancelIcon from '@/material-icons/400-24px/cancel-fill.svg?react';
 import CloseIcon from '@/material-icons/400-24px/close.svg?react';
 import SearchIcon from '@/material-icons/400-24px/search.svg?react';
 import { Icon }  from 'flavours/glitch/components/icon';
+import { identityContextPropShape, withIdentity } from 'flavours/glitch/identity_context';
 import { domain, searchEnabled } from 'flavours/glitch/initial_state';
 import { HASHTAG_REGEX } from 'flavours/glitch/utils/hashtags';
 import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router';
@@ -33,12 +34,8 @@ const labelForRecentSearch = search => {
 };
 
 class Search extends PureComponent {
-
-  static contextTypes = {
-    identity: PropTypes.object.isRequired,
-  };
-
   static propTypes = {
+    identity: identityContextPropShape,
     value: PropTypes.string.isRequired,
     recent: ImmutablePropTypes.orderedSet,
     submitted: PropTypes.bool,
@@ -276,7 +273,7 @@ class Search extends PureComponent {
   }
 
   _calculateOptions (value) {
-    const { signedIn } = this.context.identity;
+    const { signedIn } = this.props.identity;
     const trimmedValue = value.trim();
     const options = [];
 
@@ -318,7 +315,7 @@ class Search extends PureComponent {
   render () {
     const { intl, value, submitted, recent } = this.props;
     const { expanded, options, selectedOption } = this.state;
-    const { signedIn } = this.context.identity;
+    const { signedIn } = this.props.identity;
 
     const hasValue = value.length > 0 || submitted;
 
@@ -402,4 +399,4 @@ class Search extends PureComponent {
 
 }
 
-export default withRouter(injectIntl(Search));
+export default withRouter(withIdentity(injectIntl(Search)));
diff --git a/app/javascript/flavours/glitch/features/explore/index.jsx b/app/javascript/flavours/glitch/features/explore/index.jsx
index cca9cada47978e..8137e75ea4265a 100644
--- a/app/javascript/flavours/glitch/features/explore/index.jsx
+++ b/app/javascript/flavours/glitch/features/explore/index.jsx
@@ -13,6 +13,7 @@ import SearchIcon from '@/material-icons/400-24px/search.svg?react';
 import Column from 'flavours/glitch/components/column';
 import ColumnHeader from 'flavours/glitch/components/column_header';
 import Search from 'flavours/glitch/features/compose/containers/search_container';
+import { identityContextPropShape, withIdentity } from 'flavours/glitch/identity_context';
 import { trendsEnabled } from 'flavours/glitch/initial_state';
 
 import Links from './links';
@@ -32,12 +33,8 @@ const mapStateToProps = state => ({
 });
 
 class Explore extends PureComponent {
-
-  static contextTypes = {
-    identity: PropTypes.object,
-  };
-
   static propTypes = {
+    identity: identityContextPropShape,
     intl: PropTypes.object.isRequired,
     multiColumn: PropTypes.bool,
     isSearching: PropTypes.bool,
@@ -53,7 +50,7 @@ class Explore extends PureComponent {
 
   render() {
     const { intl, multiColumn, isSearching } = this.props;
-    const { signedIn } = this.context.identity;
+    const { signedIn } = this.props.identity;
 
     return (
       <Column bindToDocument={!multiColumn} ref={this.setRef} label={intl.formatMessage(messages.title)}>
@@ -114,4 +111,4 @@ class Explore extends PureComponent {
 
 }
 
-export default connect(mapStateToProps)(injectIntl(Explore));
+export default withIdentity(connect(mapStateToProps)(injectIntl(Explore)));
diff --git a/app/javascript/flavours/glitch/features/firehose/index.jsx b/app/javascript/flavours/glitch/features/firehose/index.jsx
index dc6a38ae2e75c4..2a6d790d52aeeb 100644
--- a/app/javascript/flavours/glitch/features/firehose/index.jsx
+++ b/app/javascript/flavours/glitch/features/firehose/index.jsx
@@ -6,6 +6,7 @@ import { useIntl, defineMessages, FormattedMessage } from 'react-intl';
 import { Helmet } from 'react-helmet';
 import { NavLink } from 'react-router-dom';
 
+import { useIdentity } from '@/flavours/glitch/identity_context';
 import PublicIcon from '@/material-icons/400-24px/public.svg?react';
 import { addColumn } from 'flavours/glitch/actions/columns';
 import { changeSetting } from 'flavours/glitch/actions/settings';
@@ -13,7 +14,7 @@ import { connectPublicStream, connectCommunityStream } from 'flavours/glitch/act
 import { expandPublicTimeline, expandCommunityTimeline } from 'flavours/glitch/actions/timelines';
 import { DismissableBanner } from 'flavours/glitch/components/dismissable_banner';
 import SettingText from 'flavours/glitch/components/setting_text';
-import initialState, { domain } from 'flavours/glitch/initial_state';
+import { domain } from 'flavours/glitch/initial_state';
 import { useAppDispatch, useAppSelector } from 'flavours/glitch/store';
 
 import Column from '../../components/column';
@@ -26,15 +27,6 @@ const messages = defineMessages({
   filter_regex: { id: 'home.column_settings.filter_regex', defaultMessage: 'Filter out by regular expressions' },
 });
 
-// TODO: use a proper React context later on
-const useIdentity = () => ({
-  signedIn: !!initialState.meta.me,
-  accountId: initialState.meta.me,
-  disabledAccountId: initialState.meta.disabled_account_id,
-  accessToken: initialState.meta.access_token,
-  permissions: initialState.role ? initialState.role.permissions : 0,
-});
-
 const ColumnSettings = () => {
   const intl = useIntl();
   const dispatch = useAppDispatch();
diff --git a/app/javascript/flavours/glitch/features/getting_started/index.jsx b/app/javascript/flavours/glitch/features/getting_started/index.jsx
index 145cb09a303db9..2d13d3d58493c0 100644
--- a/app/javascript/flavours/glitch/features/getting_started/index.jsx
+++ b/app/javascript/flavours/glitch/features/getting_started/index.jsx
@@ -28,6 +28,7 @@ import { fetchLists } from 'flavours/glitch/actions/lists';
 import { openModal } from 'flavours/glitch/actions/modal';
 import Column from 'flavours/glitch/features/ui/components/column';
 import LinkFooter from 'flavours/glitch/features/ui/components/link_footer';
+import { identityContextPropShape, withIdentity } from 'flavours/glitch/identity_context';
 import { preferencesLink } from 'flavours/glitch/utils/backend_links';
 
 
@@ -99,12 +100,8 @@ const badgeDisplay = (number, limit) => {
 };
 
 class GettingStarted extends ImmutablePureComponent {
-
-  static contextTypes = {
-    identity: PropTypes.object,
-  };
-
   static propTypes = {
+    identity: identityContextPropShape,
     intl: PropTypes.object.isRequired,
     myAccount: ImmutablePropTypes.record,
     columns: ImmutablePropTypes.list,
@@ -123,7 +120,7 @@ class GettingStarted extends ImmutablePureComponent {
 
   componentDidMount () {
     const { fetchFollowRequests } = this.props;
-    const { signedIn } = this.context.identity;
+    const { signedIn } = this.props.identity;
 
     if (!signedIn) {
       return;
@@ -134,7 +131,7 @@ class GettingStarted extends ImmutablePureComponent {
 
   render () {
     const { intl, myAccount, columns, multiColumn, unreadFollowRequests, unreadNotifications, lists, openSettings } = this.props;
-    const { signedIn } = this.context.identity;
+    const { signedIn } = this.props.identity;
 
     const navItems = [];
     let listItems = [];
@@ -219,4 +216,4 @@ class GettingStarted extends ImmutablePureComponent {
 
 }
 
-export default connect(makeMapStateToProps, mapDispatchToProps)(injectIntl(GettingStarted));
+export default withIdentity(connect(makeMapStateToProps, mapDispatchToProps)(injectIntl(GettingStarted)));
diff --git a/app/javascript/flavours/glitch/features/getting_started_misc/index.jsx b/app/javascript/flavours/glitch/features/getting_started_misc/index.jsx
index 7c4979bd6310e8..4a0dbb4a1c9934 100644
--- a/app/javascript/flavours/glitch/features/getting_started_misc/index.jsx
+++ b/app/javascript/flavours/glitch/features/getting_started_misc/index.jsx
@@ -16,7 +16,7 @@ import { openModal } from 'flavours/glitch/actions/modal';
 import Column from 'flavours/glitch/features/ui/components/column';
 import ColumnLink from 'flavours/glitch/features/ui/components/column_link';
 import ColumnSubheading from 'flavours/glitch/features/ui/components/column_subheading';
-
+import { identityContextPropShape, withIdentity } from 'flavours/glitch/identity_context';
 
 const messages = defineMessages({
   heading: { id: 'column.heading', defaultMessage: 'Misc' },
@@ -32,11 +32,8 @@ const messages = defineMessages({
 
 class GettingStartedMisc extends ImmutablePureComponent {
 
-  static contextTypes = {
-    identity: PropTypes.object,
-  };
-
   static propTypes = {
+    identity: identityContextPropShape,
     intl: PropTypes.object.isRequired,
     dispatch: PropTypes.func.isRequired,
   };
@@ -49,7 +46,7 @@ class GettingStartedMisc extends ImmutablePureComponent {
 
   render () {
     const { intl } = this.props;
-    const { signedIn } = this.context.identity;
+    const { signedIn } = this.props.identity;
 
     return (
       <Column icon='ellipsis-h' iconComponent={MoreHorizIcon} heading={intl.formatMessage(messages.heading)} alwaysShowBackButton>
@@ -69,4 +66,4 @@ class GettingStartedMisc extends ImmutablePureComponent {
 
 }
 
-export default connect()(injectIntl(GettingStartedMisc));
+export default connect()(withIdentity(injectIntl(GettingStartedMisc)));
diff --git a/app/javascript/flavours/glitch/features/hashtag_timeline/index.jsx b/app/javascript/flavours/glitch/features/hashtag_timeline/index.jsx
index c2a757430716d2..c33c458c278e24 100644
--- a/app/javascript/flavours/glitch/features/hashtag_timeline/index.jsx
+++ b/app/javascript/flavours/glitch/features/hashtag_timeline/index.jsx
@@ -17,6 +17,7 @@ import { fetchHashtag, followHashtag, unfollowHashtag } from 'flavours/glitch/ac
 import { expandHashtagTimeline, clearTimeline } from 'flavours/glitch/actions/timelines';
 import Column from 'flavours/glitch/components/column';
 import ColumnHeader from 'flavours/glitch/components/column_header';
+import { identityContextPropShape, withIdentity } from 'flavours/glitch/identity_context';
 
 import StatusListContainer from '../ui/containers/status_list_container';
 
@@ -29,14 +30,10 @@ const mapStateToProps = (state, props) => ({
 });
 
 class HashtagTimeline extends PureComponent {
-
   disconnects = [];
 
-  static contextTypes = {
-    identity: PropTypes.object,
-  };
-
   static propTypes = {
+    identity: identityContextPropShape,
     params: PropTypes.object.isRequired,
     columnId: PropTypes.string,
     dispatch: PropTypes.func.isRequired,
@@ -94,7 +91,7 @@ class HashtagTimeline extends PureComponent {
   };
 
   _subscribe (dispatch, id, tags = {}, local) {
-    const { signedIn } = this.context.identity;
+    const { signedIn } = this.props.identity;
 
     if (!signedIn) {
       return;
@@ -168,7 +165,7 @@ class HashtagTimeline extends PureComponent {
   handleFollow = () => {
     const { dispatch, params, tag } = this.props;
     const { id } = params;
-    const { signedIn } = this.context.identity;
+    const { signedIn } = this.props.identity;
 
     if (!signedIn) {
       return;
@@ -185,7 +182,7 @@ class HashtagTimeline extends PureComponent {
     const { hasUnread, columnId, multiColumn, tag } = this.props;
     const { id, local } = this.props.params;
     const pinned = !!columnId;
-    const { signedIn } = this.context.identity;
+    const { signedIn } = this.props.identity;
 
     return (
       <Column bindToDocument={!multiColumn} ref={this.setRef} label={`#${id}`}>
@@ -225,4 +222,4 @@ class HashtagTimeline extends PureComponent {
 
 }
 
-export default connect(mapStateToProps)(HashtagTimeline);
+export default connect(mapStateToProps)(withIdentity(HashtagTimeline));
diff --git a/app/javascript/flavours/glitch/features/home_timeline/index.jsx b/app/javascript/flavours/glitch/features/home_timeline/index.jsx
index a2683f587f557f..3220f777e13d05 100644
--- a/app/javascript/flavours/glitch/features/home_timeline/index.jsx
+++ b/app/javascript/flavours/glitch/features/home_timeline/index.jsx
@@ -14,6 +14,7 @@ import { fetchAnnouncements, toggleShowAnnouncements } from 'flavours/glitch/act
 import { IconWithBadge } from 'flavours/glitch/components/icon_with_badge';
 import { NotSignedInIndicator } from 'flavours/glitch/components/not_signed_in_indicator';
 import AnnouncementsContainer from 'flavours/glitch/features/getting_started/containers/announcements_container';
+import { identityContextPropShape, withIdentity } from 'flavours/glitch/identity_context';
 import { criticalUpdatesPending } from 'flavours/glitch/initial_state';
 
 import { addColumn, removeColumn, moveColumn } from '../../actions/columns';
@@ -41,12 +42,8 @@ const mapStateToProps = state => ({
 });
 
 class HomeTimeline extends PureComponent {
-
-  static contextTypes = {
-    identity: PropTypes.object,
-  };
-
   static propTypes = {
+    identity: identityContextPropShape,
     dispatch: PropTypes.func.isRequired,
     intl: PropTypes.object.isRequired,
     hasUnread: PropTypes.bool,
@@ -128,7 +125,7 @@ class HomeTimeline extends PureComponent {
   render () {
     const { intl, hasUnread, columnId, multiColumn, hasAnnouncements, unreadAnnouncements, showAnnouncements } = this.props;
     const pinned = !!columnId;
-    const { signedIn } = this.context.identity;
+    const { signedIn } = this.props.identity;
     const banners = [];
 
     let announcementsButton;
@@ -192,4 +189,4 @@ class HomeTimeline extends PureComponent {
 
 }
 
-export default connect(mapStateToProps)(injectIntl(HomeTimeline));
+export default connect(mapStateToProps)(withIdentity(injectIntl(HomeTimeline)));
diff --git a/app/javascript/flavours/glitch/features/notifications/components/column_settings.jsx b/app/javascript/flavours/glitch/features/notifications/components/column_settings.jsx
index 3f02df18818086..ee78466b909379 100644
--- a/app/javascript/flavours/glitch/features/notifications/components/column_settings.jsx
+++ b/app/javascript/flavours/glitch/features/notifications/components/column_settings.jsx
@@ -5,6 +5,7 @@ import { FormattedMessage } from 'react-intl';
 
 import ImmutablePropTypes from 'react-immutable-proptypes';
 
+import { identityContextPropShape, withIdentity } from 'flavours/glitch/identity_context';
 import { PERMISSION_MANAGE_USERS, PERMISSION_MANAGE_REPORTS } from 'flavours/glitch/permissions';
 
 import { CheckboxWithLabel } from './checkbox_with_label';
@@ -13,13 +14,9 @@ import GrantPermissionButton from './grant_permission_button';
 import PillBarButton from './pill_bar_button';
 import SettingToggle from './setting_toggle';
 
-export default class ColumnSettings extends PureComponent {
-
-  static contextTypes = {
-    identity: PropTypes.object,
-  };
-
+class ColumnSettings extends PureComponent {
   static propTypes = {
+    identity: identityContextPropShape,
     settings: ImmutablePropTypes.map.isRequired,
     pushSettings: ImmutablePropTypes.map.isRequired,
     onChange: PropTypes.func.isRequired,
@@ -216,7 +213,7 @@ export default class ColumnSettings extends PureComponent {
           </div>
         </section>
 
-        {((this.context.identity.permissions & PERMISSION_MANAGE_USERS) === PERMISSION_MANAGE_USERS) && (
+        {((this.props.identity.permissions & PERMISSION_MANAGE_USERS) === PERMISSION_MANAGE_USERS) && (
           <section role='group' aria-labelledby='notifications-admin-sign-up'>
             <h3 id='notifications-status'><FormattedMessage id='notifications.column_settings.admin.sign_up' defaultMessage='New sign-ups:' /></h3>
 
@@ -229,7 +226,7 @@ export default class ColumnSettings extends PureComponent {
           </section>
         )}
 
-        {((this.context.identity.permissions & PERMISSION_MANAGE_REPORTS) === PERMISSION_MANAGE_REPORTS) && (
+        {((this.props.identity.permissions & PERMISSION_MANAGE_REPORTS) === PERMISSION_MANAGE_REPORTS) && (
           <section role='group' aria-labelledby='notifications-admin-report'>
             <h3 id='notifications-status'><FormattedMessage id='notifications.column_settings.admin.report' defaultMessage='New reports:' /></h3>
 
@@ -246,3 +243,5 @@ export default class ColumnSettings extends PureComponent {
   }
 
 }
+
+export default withIdentity(ColumnSettings);
diff --git a/app/javascript/flavours/glitch/features/notifications/index.jsx b/app/javascript/flavours/glitch/features/notifications/index.jsx
index e84ef70b05cd15..b4f1bf5dfef7b5 100644
--- a/app/javascript/flavours/glitch/features/notifications/index.jsx
+++ b/app/javascript/flavours/glitch/features/notifications/index.jsx
@@ -19,6 +19,7 @@ import NotificationsIcon from '@/material-icons/400-24px/notifications-fill.svg?
 import { compareId } from 'flavours/glitch/compare_id';
 import { Icon }  from 'flavours/glitch/components/icon';
 import { NotSignedInIndicator } from 'flavours/glitch/components/not_signed_in_indicator';
+import { identityContextPropShape, withIdentity } from 'flavours/glitch/identity_context';
 
 import { addColumn, removeColumn, moveColumn } from '../../actions/columns';
 import { submitMarkers } from '../../actions/markers';
@@ -93,12 +94,8 @@ const mapDispatchToProps = dispatch => ({
 });
 
 class Notifications extends PureComponent {
-
-  static contextTypes = {
-    identity: PropTypes.object,
-  };
-
   static propTypes = {
+    identity: identityContextPropShape,
     columnId: PropTypes.string,
     notifications: ImmutablePropTypes.list.isRequired,
     showFilterBar: PropTypes.bool.isRequired,
@@ -225,7 +222,7 @@ class Notifications extends PureComponent {
     const { animatingNCD } = this.state;
     const pinned = !!columnId;
     const emptyMessage = <FormattedMessage id='empty_column.notifications' defaultMessage="You don't have any notifications yet. When other people interact with you, you will see it here." />;
-    const { signedIn } = this.context.identity;
+    const { signedIn } = this.props.identity;
 
     let scrollableContent = null;
 
@@ -373,4 +370,4 @@ class Notifications extends PureComponent {
 
 }
 
-export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(Notifications));
+export default connect(mapStateToProps, mapDispatchToProps)(withIdentity(injectIntl(Notifications)));
diff --git a/app/javascript/flavours/glitch/features/picture_in_picture/components/footer.jsx b/app/javascript/flavours/glitch/features/picture_in_picture/components/footer.jsx
index e21ee2d3d3e07d..0b6b91fe91ab73 100644
--- a/app/javascript/flavours/glitch/features/picture_in_picture/components/footer.jsx
+++ b/app/javascript/flavours/glitch/features/picture_in_picture/components/footer.jsx
@@ -18,6 +18,7 @@ import { replyCompose } from 'flavours/glitch/actions/compose';
 import { reblog, favourite, unreblog, unfavourite } from 'flavours/glitch/actions/interactions';
 import { openModal } from 'flavours/glitch/actions/modal';
 import { IconButton } from 'flavours/glitch/components/icon_button';
+import { identityContextPropShape, withIdentity } from 'flavours/glitch/identity_context';
 import { me, boostModal } from 'flavours/glitch/initial_state';
 import { makeGetStatus } from 'flavours/glitch/selectors';
 import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router';
@@ -48,12 +49,8 @@ const makeMapStateToProps = () => {
 };
 
 class Footer extends ImmutablePureComponent {
-
-  static contextTypes = {
-    identity: PropTypes.object,
-  };
-
   static propTypes = {
+    identity: identityContextPropShape,
     statusId: PropTypes.string.isRequired,
     status: ImmutablePropTypes.map.isRequired,
     intl: PropTypes.object.isRequired,
@@ -77,7 +74,7 @@ class Footer extends ImmutablePureComponent {
 
   handleReplyClick = () => {
     const { dispatch, askReplyConfirmation, status, intl } = this.props;
-    const { signedIn } = this.context.identity;
+    const { signedIn } = this.props.identity;
 
     if (signedIn) {
       if (askReplyConfirmation) {
@@ -106,7 +103,7 @@ class Footer extends ImmutablePureComponent {
 
   handleFavouriteClick = () => {
     const { dispatch, status } = this.props;
-    const { signedIn } = this.context.identity;
+    const { signedIn } = this.props.identity;
 
     if (signedIn) {
       if (status.get('favourited')) {
@@ -133,7 +130,7 @@ class Footer extends ImmutablePureComponent {
 
   handleReblogClick = e => {
     const { dispatch, status } = this.props;
-    const { signedIn } = this.context.identity;
+    const { signedIn } = this.props.identity;
 
     if (signedIn) {
       if (status.get('reblogged')) {
@@ -236,4 +233,4 @@ class Footer extends ImmutablePureComponent {
 
 }
 
-export default  connect(makeMapStateToProps)(withRouter(injectIntl(Footer)));
+export default  connect(makeMapStateToProps)(withIdentity(withRouter(injectIntl(Footer))));
diff --git a/app/javascript/flavours/glitch/features/public_timeline/index.jsx b/app/javascript/flavours/glitch/features/public_timeline/index.jsx
index 8b9503928bb298..1f255a468d74c4 100644
--- a/app/javascript/flavours/glitch/features/public_timeline/index.jsx
+++ b/app/javascript/flavours/glitch/features/public_timeline/index.jsx
@@ -9,6 +9,7 @@ import { connect } from 'react-redux';
 
 import PublicIcon from '@/material-icons/400-24px/public.svg?react';
 import { DismissableBanner } from 'flavours/glitch/components/dismissable_banner';
+import { identityContextPropShape, withIdentity } from 'flavours/glitch/identity_context';
 import { domain } from 'flavours/glitch/initial_state';
 
 import { addColumn, removeColumn, moveColumn } from '../../actions/columns';
@@ -44,16 +45,12 @@ const mapStateToProps = (state, { columnId }) => {
 };
 
 class PublicTimeline extends PureComponent {
-
-  static contextTypes = {
-    identity: PropTypes.object,
-  };
-
   static defaultProps = {
     onlyMedia: false,
   };
 
   static propTypes = {
+    identity: identityContextPropShape,
     dispatch: PropTypes.func.isRequired,
     intl: PropTypes.object.isRequired,
     columnId: PropTypes.string,
@@ -86,7 +83,7 @@ class PublicTimeline extends PureComponent {
 
   componentDidMount () {
     const { dispatch, onlyMedia, onlyRemote, allowLocalOnly } = this.props;
-    const { signedIn } = this.context.identity;
+    const { signedIn } = this.props.identity;
 
     dispatch(expandPublicTimeline({ onlyMedia, onlyRemote, allowLocalOnly }));
     if (signedIn) {
@@ -95,7 +92,7 @@ class PublicTimeline extends PureComponent {
   }
 
   componentDidUpdate (prevProps) {
-    const { signedIn } = this.context.identity;
+    const { signedIn } = this.props.identity;
 
     if (prevProps.onlyMedia !== this.props.onlyMedia || prevProps.onlyRemote !== this.props.onlyRemote || prevProps.allowLocalOnly !== this.props.allowLocalOnly) {
       const { dispatch, onlyMedia, onlyRemote, allowLocalOnly } = this.props;
@@ -170,4 +167,4 @@ class PublicTimeline extends PureComponent {
 
 }
 
-export default connect(mapStateToProps)(injectIntl(PublicTimeline));
+export default connect(mapStateToProps)(withIdentity(injectIntl(PublicTimeline)));
diff --git a/app/javascript/flavours/glitch/features/status/components/action_bar.jsx b/app/javascript/flavours/glitch/features/status/components/action_bar.jsx
index ab0009120080f2..808712b02189d9 100644
--- a/app/javascript/flavours/glitch/features/status/components/action_bar.jsx
+++ b/app/javascript/flavours/glitch/features/status/components/action_bar.jsx
@@ -20,6 +20,7 @@ import RepeatActiveIcon from '@/svg-icons/repeat_active.svg?react';
 import RepeatDisabledIcon from '@/svg-icons/repeat_disabled.svg?react';
 import RepeatPrivateIcon from '@/svg-icons/repeat_private.svg?react';
 import RepeatPrivateActiveIcon from '@/svg-icons/repeat_private_active.svg?react';
+import { identityContextPropShape, withIdentity } from 'flavours/glitch/identity_context';
 import { PERMISSION_MANAGE_USERS, PERMISSION_MANAGE_FEDERATION } from 'flavours/glitch/permissions';
 import { accountAdminLink, statusAdminLink } from 'flavours/glitch/utils/backend_links';
 import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router';
@@ -59,12 +60,8 @@ const messages = defineMessages({
 });
 
 class ActionBar extends PureComponent {
-
-  static contextTypes = {
-    identity: PropTypes.object,
-  };
-
   static propTypes = {
+    identity: identityContextPropShape,
     status: ImmutablePropTypes.map.isRequired,
     onReply: PropTypes.func.isRequired,
     onReblog: PropTypes.func.isRequired,
@@ -157,7 +154,7 @@ class ActionBar extends PureComponent {
 
   render () {
     const { status, intl } = this.props;
-    const { signedIn, permissions } = this.context.identity;
+    const { signedIn, permissions } = this.props.identity;
 
     const publicStatus       = ['public', 'unlisted'].includes(status.get('visibility'));
     const pinnableStatus     = ['public', 'unlisted', 'private'].includes(status.get('visibility'));
@@ -265,4 +262,4 @@ class ActionBar extends PureComponent {
 
 }
 
-export default withRouter(injectIntl(ActionBar));
+export default withRouter(withIdentity(injectIntl(ActionBar)));
diff --git a/app/javascript/flavours/glitch/features/status/index.jsx b/app/javascript/flavours/glitch/features/status/index.jsx
index 6274bf672c0322..2656f8afdd2f7f 100644
--- a/app/javascript/flavours/glitch/features/status/index.jsx
+++ b/app/javascript/flavours/glitch/features/status/index.jsx
@@ -21,6 +21,7 @@ import { Icon }  from 'flavours/glitch/components/icon';
 import { LoadingIndicator } from 'flavours/glitch/components/loading_indicator';
 import ScrollContainer from 'flavours/glitch/containers/scroll_container';
 import BundleColumnError from 'flavours/glitch/features/ui/components/bundle_column_error';
+import { identityContextPropShape, withIdentity } from 'flavours/glitch/identity_context';
 import { autoUnfoldCW } from 'flavours/glitch/utils/content_warning';
 import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router';
 
@@ -185,12 +186,8 @@ const titleFromStatus = (intl, status) => {
 };
 
 class Status extends ImmutablePureComponent {
-
-  static contextTypes = {
-    identity: PropTypes.object,
-  };
-
   static propTypes = {
+    identity: identityContextPropShape,
     params: PropTypes.object.isRequired,
     dispatch: PropTypes.func.isRequired,
     status: ImmutablePropTypes.map,
@@ -277,7 +274,7 @@ class Status extends ImmutablePureComponent {
 
   handleFavouriteClick = (status, e) => {
     const { dispatch } = this.props;
-    const { signedIn } = this.context.identity;
+    const { signedIn } = this.props.identity;
 
     if (signedIn) {
       if (status.get('favourited')) {
@@ -317,7 +314,7 @@ class Status extends ImmutablePureComponent {
 
   handleReplyClick = (status) => {
     const { askReplyConfirmation, dispatch, intl } = this.props;
-    const { signedIn } = this.context.identity;
+    const { signedIn } = this.props.identity;
 
     if (signedIn) {
       if (askReplyConfirmation) {
@@ -357,7 +354,7 @@ class Status extends ImmutablePureComponent {
 
   handleReblogClick = (status, e) => {
     const { settings, dispatch } = this.props;
-    const { signedIn } = this.context.identity;
+    const { signedIn } = this.props.identity;
 
     if (signedIn) {
       if (settings.get('confirm_boost_missing_media_description') && status.get('media_attachments').some(item => !item.get('description')) && !status.get('reblogged')) {
@@ -792,4 +789,4 @@ class Status extends ImmutablePureComponent {
 
 }
 
-export default withRouter(injectIntl(connect(makeMapStateToProps)(Status)));
+export default withRouter(injectIntl(connect(makeMapStateToProps)(withIdentity(Status))));
diff --git a/app/javascript/flavours/glitch/features/ui/components/compose_panel.jsx b/app/javascript/flavours/glitch/features/ui/components/compose_panel.jsx
index a99d76c1a47707..e530b87d2603c8 100644
--- a/app/javascript/flavours/glitch/features/ui/components/compose_panel.jsx
+++ b/app/javascript/flavours/glitch/features/ui/components/compose_panel.jsx
@@ -7,16 +7,13 @@ import { mountCompose, unmountCompose } from 'flavours/glitch/actions/compose';
 import ServerBanner from 'flavours/glitch/components/server_banner';
 import ComposeFormContainer from 'flavours/glitch/features/compose/containers/compose_form_container';
 import SearchContainer from 'flavours/glitch/features/compose/containers/search_container';
+import { identityContextPropShape, withIdentity } from 'flavours/glitch/identity_context';
 
 import LinkFooter from './link_footer';
 
 class ComposePanel extends PureComponent {
-
-  static contextTypes = {
-    identity: PropTypes.object.isRequired,
-  };
-
   static propTypes = {
+    identity: identityContextPropShape,
     dispatch: PropTypes.func.isRequired,
   };
 
@@ -31,7 +28,7 @@ class ComposePanel extends PureComponent {
   }
 
   render() {
-    const { signedIn } = this.context.identity;
+    const { signedIn } = this.props.identity;
 
     return (
       <div className='compose-panel'>
@@ -55,4 +52,4 @@ class ComposePanel extends PureComponent {
 
 }
 
-export default connect()(ComposePanel);
+export default connect()(withIdentity(ComposePanel));
diff --git a/app/javascript/flavours/glitch/features/ui/components/header.jsx b/app/javascript/flavours/glitch/features/ui/components/header.jsx
index 618a6b63d4c1da..f102912faab2cb 100644
--- a/app/javascript/flavours/glitch/features/ui/components/header.jsx
+++ b/app/javascript/flavours/glitch/features/ui/components/header.jsx
@@ -14,6 +14,7 @@ import { Avatar } from 'flavours/glitch/components/avatar';
 import { Icon } from 'flavours/glitch/components/icon';
 import { WordmarkLogo, SymbolLogo } from 'flavours/glitch/components/logo';
 import { Permalink } from 'flavours/glitch/components/permalink';
+import { identityContextPropShape, withIdentity } from 'flavours/glitch/identity_context';
 import { registrationsOpen, me, sso_redirect } from 'flavours/glitch/initial_state';
 
 const Account = connect(state => ({
@@ -42,12 +43,8 @@ const mapDispatchToProps = (dispatch) => ({
 });
 
 class Header extends PureComponent {
-
-  static contextTypes = {
-    identity: PropTypes.object,
-  };
-
   static propTypes = {
+    identity: identityContextPropShape,
     openClosedRegistrationsModal: PropTypes.func,
     location: PropTypes.object,
     signupUrl: PropTypes.string.isRequired,
@@ -61,7 +58,7 @@ class Header extends PureComponent {
   }
 
   render () {
-    const { signedIn } = this.context.identity;
+    const { signedIn } = this.props.identity;
     const { location, openClosedRegistrationsModal, signupUrl, intl } = this.props;
 
     let content;
@@ -122,4 +119,4 @@ class Header extends PureComponent {
 
 }
 
-export default injectIntl(withRouter(connect(mapStateToProps, mapDispatchToProps)(Header)));
+export default injectIntl(withRouter(withIdentity(connect(mapStateToProps, mapDispatchToProps)(Header))));
diff --git a/app/javascript/flavours/glitch/features/ui/components/link_footer.jsx b/app/javascript/flavours/glitch/features/ui/components/link_footer.jsx
index 6741552731f8aa..7c0ece465f0d71 100644
--- a/app/javascript/flavours/glitch/features/ui/components/link_footer.jsx
+++ b/app/javascript/flavours/glitch/features/ui/components/link_footer.jsx
@@ -8,6 +8,7 @@ import { Link } from 'react-router-dom';
 import { connect } from 'react-redux';
 
 import { openModal } from 'flavours/glitch/actions/modal';
+import { identityContextPropShape, withIdentity } from 'flavours/glitch/identity_context';
 import { domain, version, source_url, statusPageUrl, profile_directory as profileDirectory } from 'flavours/glitch/initial_state';
 import { PERMISSION_INVITE_USERS } from 'flavours/glitch/permissions';
 import { logOut } from 'flavours/glitch/utils/log_out';
@@ -32,12 +33,8 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
 });
 
 class LinkFooter extends PureComponent {
-
-  static contextTypes = {
-    identity: PropTypes.object,
-  };
-
   static propTypes = {
+    identity: identityContextPropShape,
     multiColumn: PropTypes.bool,
     onLogout: PropTypes.func.isRequired,
     intl: PropTypes.object.isRequired,
@@ -53,7 +50,7 @@ class LinkFooter extends PureComponent {
   };
 
   render () {
-    const { signedIn, permissions } = this.context.identity;
+    const { signedIn, permissions } = this.props.identity;
     const { multiColumn } = this.props;
 
     const canInvite = signedIn && ((permissions & PERMISSION_INVITE_USERS) === PERMISSION_INVITE_USERS);
@@ -108,4 +105,4 @@ class LinkFooter extends PureComponent {
 
 }
 
-export default injectIntl(connect(null, mapDispatchToProps)(LinkFooter));
+export default injectIntl(withIdentity(connect(null, mapDispatchToProps)(LinkFooter)));
diff --git a/app/javascript/flavours/glitch/features/ui/components/navigation_panel.jsx b/app/javascript/flavours/glitch/features/ui/components/navigation_panel.jsx
index fa1df612fa3830..98d82342cf3b6e 100644
--- a/app/javascript/flavours/glitch/features/ui/components/navigation_panel.jsx
+++ b/app/javascript/flavours/glitch/features/ui/components/navigation_panel.jsx
@@ -30,6 +30,7 @@ import StarIcon from '@/material-icons/400-24px/star.svg?react';
 import { fetchFollowRequests } from 'flavours/glitch/actions/accounts';
 import { IconWithBadge } from 'flavours/glitch/components/icon_with_badge';
 import { NavigationPortal } from 'flavours/glitch/components/navigation_portal';
+import { identityContextPropShape, withIdentity } from 'flavours/glitch/identity_context';
 import { timelinePreview, trendsEnabled } from 'flavours/glitch/initial_state';
 import { transientSingleColumn } from 'flavours/glitch/is_mobile';
 import { preferencesLink } from 'flavours/glitch/utils/backend_links';
@@ -98,12 +99,8 @@ const FollowRequestsLink = () => {
 };
 
 class NavigationPanel extends Component {
-
-  static contextTypes = {
-    identity: PropTypes.object.isRequired,
-  };
-
   static propTypes = {
+    identity: identityContextPropShape,
     intl: PropTypes.object.isRequired,
     onOpenSettings: PropTypes.func,
   };
@@ -114,7 +111,7 @@ class NavigationPanel extends Component {
 
   render () {
     const { intl, onOpenSettings } = this.props;
-    const { signedIn, disabledAccountId } = this.context.identity;
+    const { signedIn, disabledAccountId } = this.props.identity;
 
     let banner = undefined;
 
@@ -188,4 +185,4 @@ class NavigationPanel extends Component {
 
 }
 
-export default injectIntl(NavigationPanel);
+export default injectIntl(withIdentity(NavigationPanel));
diff --git a/app/javascript/flavours/glitch/features/ui/index.jsx b/app/javascript/flavours/glitch/features/ui/index.jsx
index c257b8cdf57b0a..4a7b9ebfde828e 100644
--- a/app/javascript/flavours/glitch/features/ui/index.jsx
+++ b/app/javascript/flavours/glitch/features/ui/index.jsx
@@ -17,6 +17,7 @@ import { synchronouslySubmitMarkers, submitMarkers, fetchMarkers } from 'flavour
 import { INTRODUCTION_VERSION } from 'flavours/glitch/actions/onboarding';
 import { Permalink } from 'flavours/glitch/components/permalink';
 import { PictureInPicture } from 'flavours/glitch/features/picture_in_picture';
+import { identityContextPropShape, withIdentity } from 'flavours/glitch/identity_context';
 import { layoutFromWindow } from 'flavours/glitch/is_mobile';
 import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router';
 
@@ -129,12 +130,8 @@ const keyMap = {
 };
 
 class SwitchingColumnsArea extends PureComponent {
-
-  static contextTypes = {
-    identity: PropTypes.object,
-  };
-
   static propTypes = {
+    identity: identityContextPropShape,
     children: PropTypes.node,
     location: PropTypes.object,
     singleColumn: PropTypes.bool,
@@ -169,7 +166,7 @@ class SwitchingColumnsArea extends PureComponent {
 
   render () {
     const { children, singleColumn } = this.props;
-    const { signedIn } = this.context.identity;
+    const { signedIn } = this.props.identity;
     const pathName = this.props.location.pathname;
 
     let redirect;
@@ -262,12 +259,8 @@ class SwitchingColumnsArea extends PureComponent {
 }
 
 class UI extends PureComponent {
-
-  static contextTypes = {
-    identity: PropTypes.object.isRequired,
-  };
-
   static propTypes = {
+    identity: identityContextPropShape,
     dispatch: PropTypes.func.isRequired,
     children: PropTypes.node,
     isWide: PropTypes.bool,
@@ -323,7 +316,7 @@ class UI extends PureComponent {
       this.dragTargets.push(e.target);
     }
 
-    if (e.dataTransfer && Array.from(e.dataTransfer.types).includes('Files') && this.props.canUploadMore && this.context.identity.signedIn) {
+    if (e.dataTransfer && Array.from(e.dataTransfer.types).includes('Files') && this.props.canUploadMore && this.props.identity.signedIn) {
       this.setState({ draggingOver: true });
     }
   };
@@ -351,7 +344,7 @@ class UI extends PureComponent {
     this.setState({ draggingOver: false });
     this.dragTargets = [];
 
-    if (e.dataTransfer && e.dataTransfer.files.length >= 1 && this.props.canUploadMore && this.context.identity.signedIn) {
+    if (e.dataTransfer && e.dataTransfer.files.length >= 1 && this.props.canUploadMore && this.props.identity.signedIn) {
       this.props.dispatch(uploadCompose(e.dataTransfer.files));
     }
   };
@@ -403,7 +396,7 @@ class UI extends PureComponent {
   };
 
   componentDidMount () {
-    const { signedIn } = this.context.identity;
+    const { signedIn } = this.props.identity;
 
     window.addEventListener('beforeunload', this.handleBeforeUnload, false);
     window.addEventListener('resize', this.handleResize, { passive: true });
@@ -649,7 +642,7 @@ class UI extends PureComponent {
 
           <Header />
 
-          <SwitchingColumnsArea location={location} singleColumn={layout === 'mobile' || layout === 'single-column'}>
+          <SwitchingColumnsArea identity={this.props.identity} location={location} singleColumn={layout === 'mobile' || layout === 'single-column'}>
             {children}
           </SwitchingColumnsArea>
 
@@ -665,4 +658,4 @@ class UI extends PureComponent {
 
 }
 
-export default connect(mapStateToProps)(injectIntl(withRouter(UI)));
+export default connect(mapStateToProps)(injectIntl(withRouter(withIdentity(UI))));
diff --git a/app/javascript/flavours/glitch/identity_context.tsx b/app/javascript/flavours/glitch/identity_context.tsx
new file mode 100644
index 00000000000000..28dcb1f14bfdd9
--- /dev/null
+++ b/app/javascript/flavours/glitch/identity_context.tsx
@@ -0,0 +1,74 @@
+import PropTypes from 'prop-types';
+import { createContext, useContext } from 'react';
+
+import hoistStatics from 'hoist-non-react-statics';
+
+import type { InitialState } from 'flavours/glitch/initial_state';
+
+export interface IdentityContextType {
+  signedIn: boolean;
+  accountId: string | undefined;
+  disabledAccountId: string | undefined;
+  accessToken: string | undefined;
+  permissions: number;
+}
+
+export const identityContextPropShape = PropTypes.shape({
+  signedIn: PropTypes.bool.isRequired,
+  accountId: PropTypes.string,
+  disabledAccountId: PropTypes.string,
+  accessToken: PropTypes.string,
+}).isRequired;
+
+export const createIdentityContext = (state: InitialState) => ({
+  signedIn: !!state.meta.me,
+  accountId: state.meta.me,
+  disabledAccountId: state.meta.disabled_account_id,
+  accessToken: state.meta.access_token,
+  permissions: state.role?.permissions ?? 0,
+});
+
+export const IdentityContext = createContext<IdentityContextType>({
+  signedIn: false,
+  permissions: 0,
+  accountId: undefined,
+  disabledAccountId: undefined,
+  accessToken: undefined,
+});
+
+export const useIdentity = () => useContext(IdentityContext);
+
+export interface IdentityProps {
+  ref?: unknown;
+  wrappedComponentRef?: unknown;
+}
+
+/* Injects an `identity` props into the wrapped component to be able to use the new context in class components */
+export function withIdentity<
+  ComponentType extends React.ComponentType<IdentityProps>,
+>(Component: ComponentType) {
+  const displayName = `withIdentity(${Component.displayName ?? Component.name})`;
+  const C = (props: React.ComponentProps<ComponentType>) => {
+    const { wrappedComponentRef, ...remainingProps } = props;
+
+    return (
+      <IdentityContext.Consumer>
+        {(context) => {
+          return (
+            // @ts-expect-error - Dynamic covariant generic components are tough to type.
+            <Component
+              {...remainingProps}
+              identity={context}
+              ref={wrappedComponentRef}
+            />
+          );
+        }}
+      </IdentityContext.Consumer>
+    );
+  };
+
+  C.displayName = displayName;
+  C.WrappedComponent = Component;
+
+  return hoistStatics(C, Component);
+}
diff --git a/app/javascript/flavours/glitch/initial_state.js b/app/javascript/flavours/glitch/initial_state.js
index 3e84966cb42708..1a408104186b4f 100644
--- a/app/javascript/flavours/glitch/initial_state.js
+++ b/app/javascript/flavours/glitch/initial_state.js
@@ -50,12 +50,22 @@
  * @property {string} default_content_type
  */
 
+/**
+ * @typedef Role
+ * @property {string} id
+ * @property {string} name
+ * @property {string} permissions
+ * @property {string} color
+ * @property {boolean} highlighted
+ */
+
 /**
  * @typedef InitialState
  * @property {Record<string, import("./api_types/accounts").ApiAccountJSON>} accounts
  * @property {InitialStateLanguage[]} languages
  * @property {boolean=} critical_updates_pending
  * @property {InitialStateMeta} meta
+ * @property {Role?} role
  * @property {object} local_settings
  * @property {number} max_feed_hashtags
  * @property {number} poll_limits

From 2bcbeed95143448625eccbbf3a3245a1eec26dce Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 20 May 2024 16:59:23 +0200
Subject: [PATCH 1064/2191] Add some error handling to OTP secret migration
 (#30344)

---
 ...80905_migrate_devise_two_factor_secrets.rb | 26 ++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/db/post_migrate/20240307180905_migrate_devise_two_factor_secrets.rb b/db/post_migrate/20240307180905_migrate_devise_two_factor_secrets.rb
index 360e4806da21f7..6194cf9ee342bf 100644
--- a/db/post_migrate/20240307180905_migrate_devise_two_factor_secrets.rb
+++ b/db/post_migrate/20240307180905_migrate_devise_two_factor_secrets.rb
@@ -18,7 +18,13 @@ def up
     users_with_otp_enabled.find_each do |user|
       # Gets the new value on already-updated users
       # Falls back to legacy value on not-yet-migrated users
-      otp_secret = user.otp_secret
+      otp_secret = begin
+        user.otp_secret
+      rescue OpenSSL::OpenSSLError
+        next if ENV['MIGRATION_IGNORE_INVALID_OTP_SECRET'] == 'true'
+
+        abort_with_decryption_error(user)
+      end
 
       Rails.logger.debug { "Processing #{user.email}" }
 
@@ -36,4 +42,22 @@ def down
   def users_with_otp_enabled
     MigrationUser.where(otp_required_for_login: true, otp_secret: nil)
   end
+
+  def abort_with_decryption_error(user)
+    abort <<~MESSAGE
+
+      ERROR: Unable to decrypt OTP secret for user #{user.id}.
+
+      This is most likely because you have changed the value of `OTP_SECRET` at some point in
+      time after the user configured 2FA.
+
+      In this case, their OTP secret had already been lost with the change to `OTP_SECRET`, and
+      proceeding with this migration will not make the situation worse.
+
+      Please double-check that you have not accidentally changed `OTP_SECRET` just for this
+      migration, and re-run the migration with `MIGRATION_IGNORE_INVALID_OTP_SECRET=true`.
+
+      Migration aborted.
+    MESSAGE
+  end
 end

From 00cf8d37480b053b179e1caa12c5e9fc04813a4b Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 20 May 2024 16:59:27 +0200
Subject: [PATCH 1065/2191] Change older Paperclip database migrations for
 consistency (#30204)

---
 .../20160227230233_add_attachment_avatar_to_accounts.rb   | 6 +++++-
 .../20160312193225_add_attachment_header_to_accounts.rb   | 6 +++++-
 db/migrate/20160905150353_create_media_attachments.rb     | 8 +++++++-
 .../20170330164118_add_attachment_data_to_imports.rb      | 6 +++++-
 db/migrate/20170901141119_truncate_preview_cards.rb       | 8 +++++++-
 db/migrate/20170913000752_create_site_uploads.rb          | 8 +++++++-
 db/migrate/20170917153509_create_custom_emojis.rb         | 7 ++++++-
 ...27125810_add_thumbnail_columns_to_media_attachments.rb | 7 ++++++-
 8 files changed, 48 insertions(+), 8 deletions(-)

diff --git a/db/migrate/20160227230233_add_attachment_avatar_to_accounts.rb b/db/migrate/20160227230233_add_attachment_avatar_to_accounts.rb
index 3666abf1cc2ae9..534df25eed1a20 100644
--- a/db/migrate/20160227230233_add_attachment_avatar_to_accounts.rb
+++ b/db/migrate/20160227230233_add_attachment_avatar_to_accounts.rb
@@ -3,7 +3,11 @@
 class AddAttachmentAvatarToAccounts < ActiveRecord::Migration[4.2]
   def self.up
     change_table :accounts do |t|
-      t.attachment :avatar
+      # The following corresponds to `t.attachment :avatar` in an older version of Paperclip
+      t.string :avatar_file_name
+      t.string :avatar_content_type
+      t.integer :avatar_file_size
+      t.datetime :avatar_updated_at
     end
   end
 
diff --git a/db/migrate/20160312193225_add_attachment_header_to_accounts.rb b/db/migrate/20160312193225_add_attachment_header_to_accounts.rb
index 37108fc1894d22..b481fc52906ea9 100644
--- a/db/migrate/20160312193225_add_attachment_header_to_accounts.rb
+++ b/db/migrate/20160312193225_add_attachment_header_to_accounts.rb
@@ -3,7 +3,11 @@
 class AddAttachmentHeaderToAccounts < ActiveRecord::Migration[4.2]
   def self.up
     change_table :accounts do |t|
-      t.attachment :header
+      # The following corresponds to `t.attachment :header` in an older version of Paperclip
+      t.string :header_file_name
+      t.string :header_content_type
+      t.integer :header_file_size
+      t.datetime :header_updated_at
     end
   end
 
diff --git a/db/migrate/20160905150353_create_media_attachments.rb b/db/migrate/20160905150353_create_media_attachments.rb
index 3903a7b9a145f9..92680db9f3d552 100644
--- a/db/migrate/20160905150353_create_media_attachments.rb
+++ b/db/migrate/20160905150353_create_media_attachments.rb
@@ -4,7 +4,13 @@ class CreateMediaAttachments < ActiveRecord::Migration[5.0]
   def change
     create_table :media_attachments do |t|
       t.integer :status_id, null: true, default: nil
-      t.attachment :file
+
+      # The following corresponds to `t.attachment :file` in an older version of Paperclip
+      t.string :file_file_name
+      t.string :file_content_type
+      t.integer :file_file_size
+      t.datetime :file_updated_at
+
       t.string :remote_url, null: false, default: ''
       t.integer :account_id
 
diff --git a/db/migrate/20170330164118_add_attachment_data_to_imports.rb b/db/migrate/20170330164118_add_attachment_data_to_imports.rb
index 908d4da96a0d9f..0daaa9d02e72e6 100644
--- a/db/migrate/20170330164118_add_attachment_data_to_imports.rb
+++ b/db/migrate/20170330164118_add_attachment_data_to_imports.rb
@@ -3,7 +3,11 @@
 class AddAttachmentDataToImports < ActiveRecord::Migration[4.2]
   def self.up
     change_table :imports do |t|
-      t.attachment :data
+      # The following corresponds to `t.attachment :data` in an older version of Paperclip
+      t.string :data_file_name
+      t.string :data_content_type
+      t.integer :data_file_size
+      t.datetime :data_updated_at
     end
   end
 
diff --git a/db/migrate/20170901141119_truncate_preview_cards.rb b/db/migrate/20170901141119_truncate_preview_cards.rb
index b4ba8c45ea633d..f251841f2e6d59 100644
--- a/db/migrate/20170901141119_truncate_preview_cards.rb
+++ b/db/migrate/20170901141119_truncate_preview_cards.rb
@@ -8,7 +8,13 @@ def up
       t.string     :url, default: '', null: false, index: { unique: true }
       t.string     :title, default: '', null: false
       t.string     :description, default: '', null: false
-      t.attachment :image
+
+      # The following corresponds to `t.attachment :image` in an older version of Paperclip
+      t.string :image_file_name
+      t.string :image_content_type
+      t.integer :image_file_size
+      t.datetime :image_updated_at
+
       t.integer    :type, default: 0, null: false
       t.text       :html, default: '', null: false
       t.string     :author_name, default: '', null: false
diff --git a/db/migrate/20170913000752_create_site_uploads.rb b/db/migrate/20170913000752_create_site_uploads.rb
index 43a793806f3348..16a95ea0134fad 100644
--- a/db/migrate/20170913000752_create_site_uploads.rb
+++ b/db/migrate/20170913000752_create_site_uploads.rb
@@ -4,7 +4,13 @@ class CreateSiteUploads < ActiveRecord::Migration[5.1]
   def change
     create_table :site_uploads do |t|
       t.string :var, default: '', null: false, index: { unique: true }
-      t.attachment :file
+
+      # The following corresponds to `t.attachment :file` in an older version of Paperclip
+      t.string :file_file_name
+      t.string :file_content_type
+      t.integer :file_file_size
+      t.datetime :file_updated_at
+
       t.json :meta
       t.timestamps
     end
diff --git a/db/migrate/20170917153509_create_custom_emojis.rb b/db/migrate/20170917153509_create_custom_emojis.rb
index 984fcd2181b63b..dedc8cde80bf56 100644
--- a/db/migrate/20170917153509_create_custom_emojis.rb
+++ b/db/migrate/20170917153509_create_custom_emojis.rb
@@ -5,7 +5,12 @@ def change
     create_table :custom_emojis do |t|
       t.string :shortcode, null: false, default: ''
       t.string :domain
-      t.attachment :image
+
+      # The following corresponds to `t.attachment :image` in an older version of Paperclip
+      t.string :image_file_name
+      t.string :image_content_type
+      t.integer :image_file_size
+      t.datetime :image_updated_at
 
       t.timestamps
     end
diff --git a/db/migrate/20200627125810_add_thumbnail_columns_to_media_attachments.rb b/db/migrate/20200627125810_add_thumbnail_columns_to_media_attachments.rb
index a3c6b55fd22f0e..c11a24e8b53cd5 100644
--- a/db/migrate/20200627125810_add_thumbnail_columns_to_media_attachments.rb
+++ b/db/migrate/20200627125810_add_thumbnail_columns_to_media_attachments.rb
@@ -2,7 +2,12 @@
 
 class AddThumbnailColumnsToMediaAttachments < ActiveRecord::Migration[5.2]
   def up
-    add_attachment :media_attachments, :thumbnail
+    # The following corresponds to `add_attachment :media_attachments, :thumbnail` in an older version of Paperclip
+    add_column :media_attachments, :thumbnail_file_name, :string
+    add_column :media_attachments, :thumbnail_content_type, :string
+    add_column :media_attachments, :thumbnail_file_size, :integer
+    add_column :media_attachments, :thumbnail_updated_at, :datetime
+
     add_column :media_attachments, :thumbnail_remote_url, :string
   end
 

From 0a2110b9af52005798251dc9d245a66dd5dd20fa Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 20 May 2024 11:00:09 -0400
Subject: [PATCH 1066/2191] Add coverage for custom filters (#30347)

---
 spec/system/filters_spec.rb | 72 +++++++++++++++++++++++++++++++++++++
 1 file changed, 72 insertions(+)
 create mode 100644 spec/system/filters_spec.rb

diff --git a/spec/system/filters_spec.rb b/spec/system/filters_spec.rb
new file mode 100644
index 00000000000000..9d18e904608698
--- /dev/null
+++ b/spec/system/filters_spec.rb
@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'Filters' do
+  let(:user) { Fabricate(:user) }
+  let(:filter_title) { 'Filter of fun and games' }
+
+  before { sign_in(user) }
+
+  describe 'Creating a filter' do
+    it 'Populates a new filter from form' do
+      navigate_to_filters
+
+      click_on I18n.t('filters.new.title')
+      fill_in_filter_form
+      expect(page).to have_content(filter_title)
+    end
+  end
+
+  describe 'Editing an existing filter' do
+    let(:new_title) { 'Change title value' }
+
+    before { Fabricate :custom_filter, account: user.account, title: filter_title }
+
+    it 'Updates the saved filter' do
+      navigate_to_filters
+
+      click_on filter_title
+
+      fill_in filter_title_field, with: new_title
+      click_on I18n.t('generic.save_changes')
+
+      expect(page).to have_content(new_title)
+    end
+  end
+
+  describe 'Destroying an existing filter' do
+    before { Fabricate :custom_filter, account: user.account, title: filter_title }
+
+    it 'Deletes the filter' do
+      navigate_to_filters
+
+      expect(page).to have_content filter_title
+      expect do
+        click_on I18n.t('filters.index.delete')
+      end.to change(CustomFilter, :count).by(-1)
+
+      expect(page).to_not have_content(filter_title)
+    end
+  end
+
+  def navigate_to_filters
+    visit settings_path
+
+    click_on I18n.t('filters.index.title')
+    expect(page).to have_content I18n.t('filters.index.title')
+  end
+
+  def fill_in_filter_form
+    fill_in filter_title_field, with: filter_title
+    check I18n.t('filters.contexts.home')
+    within('.custom_filter_keywords_keyword') do
+      fill_in with: 'Keyword'
+    end
+    click_on I18n.t('filters.new.save')
+  end
+
+  def filter_title_field
+    I18n.t('simple_form.labels.defaults.title')
+  end
+end

From 8c925dec793476b0f516aab901c7802d8e04f844 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 20 May 2024 19:04:21 +0200
Subject: [PATCH 1067/2191] chore(deps): update dependency rubocop-rails to
 v2.25.0 (#30341)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index eade99acfdffb8..f1a1d2a938da1d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -425,7 +425,7 @@ GEM
     mime-types-data (3.2024.0507)
     mini_mime (1.1.5)
     mini_portile2 (2.8.6)
-    minitest (5.22.3)
+    minitest (5.23.0)
     msgpack (1.7.2)
     multi_json (1.15.0)
     multipart-post (2.4.0)
@@ -610,7 +610,7 @@ GEM
     pundit (2.3.2)
       activesupport (>= 3.0.0)
     raabro (1.4.0)
-    racc (1.7.3)
+    racc (1.8.0)
     rack (2.2.9)
     rack-attack (6.7.0)
       rack (>= 1.0, < 4)
@@ -685,7 +685,7 @@ GEM
       redis (>= 4)
     redlock (1.3.2)
       redis (>= 3.0.0, < 6.0)
-    regexp_parser (2.9.0)
+    regexp_parser (2.9.2)
     reline (0.5.7)
       io-console (~> 0.5)
     request_store (1.6.0)
@@ -746,7 +746,7 @@ GEM
     rubocop-performance (1.21.0)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rails (2.24.1)
+    rubocop-rails (2.25.0)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)

From 0663c7d78d7de406ed199f61fd0cdb55b14b8f1f Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 20 May 2024 19:14:10 +0200
Subject: [PATCH 1068/2191] fix(deps): update formatjs monorepo (#30359)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 139 +++++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 95 insertions(+), 44 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 698824cab4854b..2d27d1302a42c9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2259,6 +2259,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@formatjs/ecma402-abstract@npm:2.0.0":
+  version: 2.0.0
+  resolution: "@formatjs/ecma402-abstract@npm:2.0.0"
+  dependencies:
+    "@formatjs/intl-localematcher": "npm:0.5.4"
+    tslib: "npm:^2.4.0"
+  checksum: 10c0/94cba291aeadffa3ca416087c2c2352c8a741bb4dcb7f47f15c247b1f043ffcef1af5b20a1b7578fbba9e704fc5f1c079923f3537a273d50162be62f8037625c
+  languageName: node
+  linkType: hard
+
 "@formatjs/fast-memoize@npm:2.2.0":
   version: 2.2.0
   resolution: "@formatjs/fast-memoize@npm:2.2.0"
@@ -2279,6 +2289,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@formatjs/icu-messageformat-parser@npm:2.7.8":
+  version: 2.7.8
+  resolution: "@formatjs/icu-messageformat-parser@npm:2.7.8"
+  dependencies:
+    "@formatjs/ecma402-abstract": "npm:2.0.0"
+    "@formatjs/icu-skeleton-parser": "npm:1.8.2"
+    tslib: "npm:^2.4.0"
+  checksum: 10c0/a3b759a825fb22ffd7b906f6a07b1a079bbc34f72c745de2c2514e439c4bb75bc1a9442eba1bac7ff3ea3010e12076374cd755ad12116b1d066cc90da5fbcbc9
+  languageName: node
+  linkType: hard
+
 "@formatjs/icu-skeleton-parser@npm:1.8.0":
   version: 1.8.0
   resolution: "@formatjs/icu-skeleton-parser@npm:1.8.0"
@@ -2289,25 +2310,35 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@formatjs/intl-displaynames@npm:6.6.6":
-  version: 6.6.6
-  resolution: "@formatjs/intl-displaynames@npm:6.6.6"
+"@formatjs/icu-skeleton-parser@npm:1.8.2":
+  version: 1.8.2
+  resolution: "@formatjs/icu-skeleton-parser@npm:1.8.2"
   dependencies:
-    "@formatjs/ecma402-abstract": "npm:1.18.2"
+    "@formatjs/ecma402-abstract": "npm:2.0.0"
+    tslib: "npm:^2.4.0"
+  checksum: 10c0/9b15013acc47b8d560b52942e3dab2abaaa9c5a4410bbd1d490a4b22bf5ca36fdd88b71f241d05479bddf856d0d1d57b7ecc9e79738497ac518616aa6d4d0015
+  languageName: node
+  linkType: hard
+
+"@formatjs/intl-displaynames@npm:6.6.8":
+  version: 6.6.8
+  resolution: "@formatjs/intl-displaynames@npm:6.6.8"
+  dependencies:
+    "@formatjs/ecma402-abstract": "npm:2.0.0"
     "@formatjs/intl-localematcher": "npm:0.5.4"
     tslib: "npm:^2.4.0"
-  checksum: 10c0/4ba40057cfafaabf04485137bc96705d5ed7ac48f17ed7dfe8dbd7f71119667b6c0b7fa75469e32b70c9bada2c5d03af37a5261d655a37b81c63ba907edbb2e8
+  checksum: 10c0/1a03e7644022741c1bcf10fcd07da88c434416a13603ace693a038114010463307b4130d3a3f53ad5665bd27fca9a6b19ac8e5bf58e17598b1ea84db173fdfbb
   languageName: node
   linkType: hard
 
-"@formatjs/intl-listformat@npm:7.5.5":
-  version: 7.5.5
-  resolution: "@formatjs/intl-listformat@npm:7.5.5"
+"@formatjs/intl-listformat@npm:7.5.7":
+  version: 7.5.7
+  resolution: "@formatjs/intl-listformat@npm:7.5.7"
   dependencies:
-    "@formatjs/ecma402-abstract": "npm:1.18.2"
+    "@formatjs/ecma402-abstract": "npm:2.0.0"
     "@formatjs/intl-localematcher": "npm:0.5.4"
     tslib: "npm:^2.4.0"
-  checksum: 10c0/bc9d8cbe42bd9513db0b2b221c0b1a752892005a90fa629b4cf7df1cbd3b96997cddbf420e562ebdfdc691a28d9b759ccae9633d5987aa0bceed5aef77a07ca4
+  checksum: 10c0/5d0478752d669d87c82aa80880df464d64a1c8974fcb6136bc854567f570a1696e5468005ffa266cfcb623adb7c7299b839c06ea33897f55d35dab6a7575cc84
   languageName: node
   linkType: hard
 
@@ -2321,33 +2352,33 @@ __metadata:
   linkType: hard
 
 "@formatjs/intl-pluralrules@npm:^5.2.2":
-  version: 5.2.12
-  resolution: "@formatjs/intl-pluralrules@npm:5.2.12"
+  version: 5.2.14
+  resolution: "@formatjs/intl-pluralrules@npm:5.2.14"
   dependencies:
-    "@formatjs/ecma402-abstract": "npm:1.18.2"
+    "@formatjs/ecma402-abstract": "npm:2.0.0"
     "@formatjs/intl-localematcher": "npm:0.5.4"
     tslib: "npm:^2.4.0"
-  checksum: 10c0/0f4d9f4f272dd962b2f742519045ad43a1b6358755787d3394efcc5884b02184cc8d76fb13d98b1f30c41a813b81f82dd2342e1fb0fbd7b7efa69f5d0d59c4d0
+  checksum: 10c0/3c00109c8d4c8b221c2b9af38a38d31cd6293a0a412a1f2cdae2b8ef81bd71626c9ff4a647389682cb27ae5c223bd6f64ef54d03e3f6f19c372e0c6194b76b38
   languageName: node
   linkType: hard
 
-"@formatjs/intl@npm:2.10.2":
-  version: 2.10.2
-  resolution: "@formatjs/intl@npm:2.10.2"
+"@formatjs/intl@npm:2.10.4":
+  version: 2.10.4
+  resolution: "@formatjs/intl@npm:2.10.4"
   dependencies:
-    "@formatjs/ecma402-abstract": "npm:1.18.2"
+    "@formatjs/ecma402-abstract": "npm:2.0.0"
     "@formatjs/fast-memoize": "npm:2.2.0"
-    "@formatjs/icu-messageformat-parser": "npm:2.7.6"
-    "@formatjs/intl-displaynames": "npm:6.6.6"
-    "@formatjs/intl-listformat": "npm:7.5.5"
-    intl-messageformat: "npm:10.5.12"
+    "@formatjs/icu-messageformat-parser": "npm:2.7.8"
+    "@formatjs/intl-displaynames": "npm:6.6.8"
+    "@formatjs/intl-listformat": "npm:7.5.7"
+    intl-messageformat: "npm:10.5.14"
     tslib: "npm:^2.4.0"
   peerDependencies:
     typescript: ^4.7 || 5
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 10c0/20df407e141055e8c7b2605c06e952b643be7ea01d992862e13fc623ca2db034069744eae2be16655bf7888b3add1bfc2653fd0a08bcfdb67fb9b72a306f7718
+  checksum: 10c0/ca7877e962f73f1fe0e358f12d73bdc3ec4006c14ee801e06d9f7aef06bcdcc12355a8f53f32b0e890f829949ded35e825c914ca5f4709eb1e08c2a18c1368c2
   languageName: node
   linkType: hard
 
@@ -2371,6 +2402,26 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@formatjs/ts-transformer@npm:3.13.14":
+  version: 3.13.14
+  resolution: "@formatjs/ts-transformer@npm:3.13.14"
+  dependencies:
+    "@formatjs/icu-messageformat-parser": "npm:2.7.8"
+    "@types/json-stable-stringify": "npm:^1.0.32"
+    "@types/node": "npm:14 || 16 || 17"
+    chalk: "npm:^4.0.0"
+    json-stable-stringify: "npm:^1.0.1"
+    tslib: "npm:^2.4.0"
+    typescript: "npm:5"
+  peerDependencies:
+    ts-jest: ">=27"
+  peerDependenciesMeta:
+    ts-jest:
+      optional: true
+  checksum: 10c0/38450cfce3ec5132f3548c1e9ab098909ca8d2db2b8b6b4b5bb87aa59a4ca1a19bbf6d339ace39bcc931fa80d9946b4c7cf039c9574069b317ae015cd6963bd3
+  languageName: node
+  linkType: hard
+
 "@gamestdio/websocket@npm:^0.3.2":
   version: 0.3.2
   resolution: "@gamestdio/websocket@npm:0.3.2"
@@ -5197,21 +5248,21 @@ __metadata:
   linkType: hard
 
 "babel-plugin-formatjs@npm:^10.5.1":
-  version: 10.5.14
-  resolution: "babel-plugin-formatjs@npm:10.5.14"
+  version: 10.5.16
+  resolution: "babel-plugin-formatjs@npm:10.5.16"
   dependencies:
     "@babel/core": "npm:^7.10.4"
     "@babel/helper-plugin-utils": "npm:^7.10.4"
     "@babel/plugin-syntax-jsx": "npm:7"
     "@babel/traverse": "npm:7"
     "@babel/types": "npm:^7.12.11"
-    "@formatjs/icu-messageformat-parser": "npm:2.7.6"
-    "@formatjs/ts-transformer": "npm:3.13.12"
+    "@formatjs/icu-messageformat-parser": "npm:2.7.8"
+    "@formatjs/ts-transformer": "npm:3.13.14"
     "@types/babel__core": "npm:^7.1.7"
     "@types/babel__helper-plugin-utils": "npm:^7.10.0"
     "@types/babel__traverse": "npm:^7.1.7"
     tslib: "npm:^2.4.0"
-  checksum: 10c0/78d33f0304c7b6e36334b2f32bacd144cbbe08cb22318ff994e7adc7705b7f8208354c9af9f87b4390d11aee1ea81cfee9f224a57fe5265173b92ee7de921359
+  checksum: 10c0/03d9d2b0b9cdc05c011bfb417a43e5c0f557868ed84d83acbc3cb9072b7fa98f5219473d0bd61f02741c151d6f2162da363bd337522c80af14721ae37f6da86b
   languageName: node
   linkType: hard
 
@@ -9643,15 +9694,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"intl-messageformat@npm:10.5.12, intl-messageformat@npm:^10.3.5":
-  version: 10.5.12
-  resolution: "intl-messageformat@npm:10.5.12"
+"intl-messageformat@npm:10.5.14, intl-messageformat@npm:^10.3.5":
+  version: 10.5.14
+  resolution: "intl-messageformat@npm:10.5.14"
   dependencies:
-    "@formatjs/ecma402-abstract": "npm:1.18.2"
+    "@formatjs/ecma402-abstract": "npm:2.0.0"
     "@formatjs/fast-memoize": "npm:2.2.0"
-    "@formatjs/icu-messageformat-parser": "npm:2.7.6"
+    "@formatjs/icu-messageformat-parser": "npm:2.7.8"
     tslib: "npm:^2.4.0"
-  checksum: 10c0/f95734e98a05ef7f51de0c27904d3a994528e3a174963bd1b3a6db9416b5fd84bbd8f7d26d84fc547d51af69ccf46dd3f73a3f4f20a2ccef5c9cd90e946ad82c
+  checksum: 10c0/8ec0a60539f67039356e211bcc8d81cf1bd9d62190a72ab0e94504da92f0242fe2f94ffb512b97cc6f63782b7891874d4038536ce04631e59d762c3441c60b4b
   languageName: node
   linkType: hard
 
@@ -14353,18 +14404,18 @@ __metadata:
   linkType: hard
 
 "react-intl@npm:^6.4.2":
-  version: 6.6.6
-  resolution: "react-intl@npm:6.6.6"
-  dependencies:
-    "@formatjs/ecma402-abstract": "npm:1.18.2"
-    "@formatjs/icu-messageformat-parser": "npm:2.7.6"
-    "@formatjs/intl": "npm:2.10.2"
-    "@formatjs/intl-displaynames": "npm:6.6.6"
-    "@formatjs/intl-listformat": "npm:7.5.5"
+  version: 6.6.8
+  resolution: "react-intl@npm:6.6.8"
+  dependencies:
+    "@formatjs/ecma402-abstract": "npm:2.0.0"
+    "@formatjs/icu-messageformat-parser": "npm:2.7.8"
+    "@formatjs/intl": "npm:2.10.4"
+    "@formatjs/intl-displaynames": "npm:6.6.8"
+    "@formatjs/intl-listformat": "npm:7.5.7"
     "@types/hoist-non-react-statics": "npm:^3.3.1"
     "@types/react": "npm:16 || 17 || 18"
     hoist-non-react-statics: "npm:^3.3.2"
-    intl-messageformat: "npm:10.5.12"
+    intl-messageformat: "npm:10.5.14"
     tslib: "npm:^2.4.0"
   peerDependencies:
     react: ^16.6.0 || 17 || 18
@@ -14372,7 +14423,7 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 10c0/04c1d1ca783f2a5e605544290c93e57629500be6811d7c2c3342903bf9f9a720d2e4c9cf3924133bf84e510ee879bf3d870a3ff269f5b197f894a49047bd089d
+  checksum: 10c0/7673507eb73ad4edd1593da7173cec68f316cf77037e0959900babd32d5984a39ba7fa10aaa0a23bcddb7b98daf7dd007cb73ddfc39127ede87c18ec780a519c
   languageName: node
   linkType: hard
 

From e42e5885fa602d62e17d52b6aecf618509a9d272 Mon Sep 17 00:00:00 2001
From: Jeremy Kescher <jeremy@kescher.at>
Date: Mon, 20 May 2024 23:55:40 +0200
Subject: [PATCH 1069/2191] Increase display name characters on CatCatNya~ from
 50 to 100

---
 .env.production.catcatnya | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.env.production.catcatnya b/.env.production.catcatnya
index 7b2d378775ab6c..8ac33d4bcea5a7 100644
--- a/.env.production.catcatnya
+++ b/.env.production.catcatnya
@@ -40,7 +40,7 @@ MAX_DESCRIPTION_CHARS=69420
 MAX_BIO_CHARS=69420
 MAX_PROFILE_FIELDS=10
 MAX_PINNED_TOOTS=10
-MAX_DISPLAY_NAME_CHARS=50
+MAX_DISPLAY_NAME_CHARS=100
 MIN_POLL_OPTIONS=1
 MAX_POLL_OPTIONS=20
 MAX_REACTIONS=3

From ec9b8d058a5ba9610a6223be1135cf75c8ed5e84 Mon Sep 17 00:00:00 2001
From: Jeremy Kescher <jeremy@kescher.at>
Date: Tue, 21 May 2024 00:05:46 +0200
Subject: [PATCH 1070/2191] Bump version to v4.3.0-alpha.3+glitch+cat+1.2.3

---
 CHANGELOG.md            | 6 ++++++
 lib/mastodon/version.rb | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7f839874d4d70a..4c0cf90b560bde 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All changes to Catstodon that aren't Mastodon or glitch-soc Mastodon changes will be documented here.
 
+## [v4.3.0-alpha.3+glitch+cat+1.2.3] - 2024-05-21
+
+- Upstream changes, once again (including, but not limited to:)
+  - Only uses a maximum of 1 megabyte of response body for link previews
+  - Allow multiple `redirect_uri`s for OAuth 2.0 Applications
+
 ## [v4.3.0-alpha.3+glitch+cat+1.2.2] - 2024-05-17
 
 - Upstream changes :3
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index f9c1c66f19fa78..343986efa48e69 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -25,7 +25,7 @@ def prerelease
     end
 
     def catstodon_revision
-      '1.2.2'
+      '1.2.3'
     end
 
     def build_metadata

From 47884616f7fd3f7c7cfa95885fb9132e689da354 Mon Sep 17 00:00:00 2001
From: Jeremy Kescher <jeremy@kescher.at>
Date: Tue, 21 May 2024 00:46:17 +0200
Subject: [PATCH 1071/2191] [Glitch+Emoji reactions] Use modern React context
 for for identity for emoji reaction code

---
 CHANGELOG.md                                  |  1 +
 .../flavours/glitch/components/status.jsx     | 28 +++++++++----------
 .../status/components/detailed_status.jsx     | 11 +++-----
 .../flavours/glitch/features/status/index.jsx |  4 +--
 .../features/ui/util/identity_consumer.jsx    | 16 -----------
 5 files changed, 21 insertions(+), 39 deletions(-)
 delete mode 100644 app/javascript/flavours/glitch/features/ui/util/identity_consumer.jsx

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4c0cf90b560bde..090525bc0b8888 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ All changes to Catstodon that aren't Mastodon or glitch-soc Mastodon changes wil
 - Upstream changes, once again (including, but not limited to:)
   - Only uses a maximum of 1 megabyte of response body for link previews
   - Allow multiple `redirect_uri`s for OAuth 2.0 Applications
+- Adjust emoji reactions patch to use modern React context for identity instead of an identity consumer
 
 ## [v4.3.0-alpha.3+glitch+cat+1.2.2] - 2024-05-17
 
diff --git a/app/javascript/flavours/glitch/components/status.jsx b/app/javascript/flavours/glitch/components/status.jsx
index 0faa6d1dbd1005..eb8f55338a010d 100644
--- a/app/javascript/flavours/glitch/components/status.jsx
+++ b/app/javascript/flavours/glitch/components/status.jsx
@@ -3,15 +3,18 @@ import PropTypes from 'prop-types';
 import { injectIntl, FormattedMessage } from 'react-intl';
 
 import classNames from 'classnames';
+import { withRouter } from 'react-router-dom';
 
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
+import { connect } from 'react-redux';
 
 import { HotKeys } from 'react-hotkeys';
 
 import PictureInPicturePlaceholder from 'flavours/glitch/components/picture_in_picture_placeholder';
 import PollContainer from 'flavours/glitch/containers/poll_container';
 import NotificationOverlayContainer from 'flavours/glitch/features/notifications/containers/overlay_container';
+import { identityContextPropShape, withIdentity } from 'flavours/glitch/identity_context';
 import { autoUnfoldCW } from 'flavours/glitch/utils/content_warning';
 import { withOptionalRouter, WithOptionalRouterPropTypes } from 'flavours/glitch/utils/react_router';
 
@@ -20,7 +23,6 @@ import Card from '../features/status/components/card';
 // to use the progress bar to show download progress
 import Bundle from '../features/ui/components/bundle';
 import { MediaGallery, Video, Audio } from '../features/ui/util/async-components';
-import { IdentityConsumer } from '../features/ui/util/identity_consumer';
 import { SensitiveMediaContext } from '../features/ui/util/sensitive_media_context';
 import { displayMedia, visibleReactions } from '../initial_state';
 
@@ -78,6 +80,7 @@ class Status extends ImmutablePureComponent {
   static contextType = SensitiveMediaContext;
 
   static propTypes = {
+    identity: identityContextPropShape,
     containerId: PropTypes.string,
     id: PropTypes.string,
     status: ImmutablePropTypes.map,
@@ -545,6 +548,7 @@ class Status extends ImmutablePureComponent {
       nextInReplyToId,
       rootId,
       history,
+      identity,
       ...other
     } = this.props;
     const { isCollapsed } = this.state;
@@ -846,18 +850,14 @@ class Status extends ImmutablePureComponent {
               {...statusContentProps}
             />
 
-            <IdentityConsumer>
-              {identity => (
-                <StatusReactions
-                  statusId={status.get('id')}
-                  reactions={status.get('reactions')}
-                  numVisible={visibleReactions}
-                  addReaction={this.props.onReactionAdd}
-                  removeReaction={this.props.onReactionRemove}
-                  canReact={identity.signedIn}
-                />
-              )}
-            </IdentityConsumer>
+            <StatusReactions
+              statusId={status.get('id')}
+              reactions={status.get('reactions')}
+              numVisible={visibleReactions}
+              addReaction={this.props.onReactionAdd}
+              removeReaction={this.props.onReactionRemove}
+              canReact={this.props.identity.signedIn}
+            />
 
             {(!isCollapsed || !(muted || !settings.getIn(['collapsed', 'show_action_bar']))) && (
               <StatusActionBar
@@ -881,4 +881,4 @@ class Status extends ImmutablePureComponent {
 
 }
 
-export default withOptionalRouter(injectIntl(Status));
+export default withOptionalRouter(injectIntl((withIdentity(Status))));
diff --git a/app/javascript/flavours/glitch/features/status/components/detailed_status.jsx b/app/javascript/flavours/glitch/features/status/components/detailed_status.jsx
index 01a47639e6528d..c9dd0faa4ba1d3 100644
--- a/app/javascript/flavours/glitch/features/status/components/detailed_status.jsx
+++ b/app/javascript/flavours/glitch/features/status/components/detailed_status.jsx
@@ -15,6 +15,7 @@ import { getHashtagBarForStatus } from 'flavours/glitch/components/hashtag_bar';
 import PictureInPicturePlaceholder from 'flavours/glitch/components/picture_in_picture_placeholder';
 import { VisibilityIcon } from 'flavours/glitch/components/visibility_icon';
 import PollContainer from 'flavours/glitch/containers/poll_container';
+import { identityContextPropShape, withIdentity } from 'flavours/glitch/identity_context';
 import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router';
 
 import { Avatar } from '../../../components/avatar';
@@ -29,12 +30,8 @@ import Video from '../../video';
 import Card from './card';
 
 class DetailedStatus extends ImmutablePureComponent {
-
-  static contextTypes = {
-    identity: PropTypes.object,
-  };
-
   static propTypes = {
+    identity: identityContextPropShape,
     status: ImmutablePropTypes.map,
     settings: ImmutablePropTypes.map.isRequired,
     onOpenMedia: PropTypes.func.isRequired,
@@ -319,7 +316,7 @@ class DetailedStatus extends ImmutablePureComponent {
             reactions={status.get('reactions')}
             addReaction={this.props.onReactionAdd}
             removeReaction={this.props.onReactionRemove}
-            canReact={this.context.identity.signedIn}
+            canReact={this.props.identity.signedIn}
           />
 
           <div className='detailed-status__meta'>
@@ -348,4 +345,4 @@ class DetailedStatus extends ImmutablePureComponent {
 
 }
 
-export default withRouter(DetailedStatus);
+export default withRouter(withIdentity(DetailedStatus));
diff --git a/app/javascript/flavours/glitch/features/status/index.jsx b/app/javascript/flavours/glitch/features/status/index.jsx
index 95d33f2afbd61b..57852b3b2c6aaf 100644
--- a/app/javascript/flavours/glitch/features/status/index.jsx
+++ b/app/javascript/flavours/glitch/features/status/index.jsx
@@ -307,8 +307,8 @@ class Status extends ImmutablePureComponent {
   };
 
   handleReactionAdd = (statusId, name, url) => {
-    const { dispatch } = this.props;
-    const { signedIn } = this.context.identity;
+    const { dispatch, identity } = this.props;
+    const { signedIn } = identity.signedIn;
 
     if (signedIn) {
       dispatch(addReaction(statusId, name, url));
diff --git a/app/javascript/flavours/glitch/features/ui/util/identity_consumer.jsx b/app/javascript/flavours/glitch/features/ui/util/identity_consumer.jsx
deleted file mode 100644
index bf7c7e70f93105..00000000000000
--- a/app/javascript/flavours/glitch/features/ui/util/identity_consumer.jsx
+++ /dev/null
@@ -1,16 +0,0 @@
-import PropTypes from 'prop-types';
-import { PureComponent } from 'react';
-
-export class IdentityConsumer extends PureComponent {
-  static contextTypes = {
-    identity: PropTypes.object
-  };
-
-  static propTypes = {
-    children: PropTypes.func.isRequired
-  };
-
-  render() {
-    return this.props.children(this.context.identity);
-  }
-}

From c9fb54fd4ce43c41dade752653e2bf1238614b0f Mon Sep 17 00:00:00 2001
From: Jeremy Kescher <jeremy@kescher.at>
Date: Tue, 21 May 2024 03:37:40 +0200
Subject: [PATCH 1072/2191] Emergency fix for charlock_holmes after ICU 75

---
 CHANGELOG.md            |  5 +++++
 Gemfile                 |  2 +-
 Gemfile.lock            | 10 ++++++++--
 lib/mastodon/version.rb |  2 +-
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 090525bc0b8888..b8e2ca9eaebf75 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 All changes to Catstodon that aren't Mastodon or glitch-soc Mastodon changes will be documented here.
 
+## [v4.3.0-alpha.3+glitch+cat+1.2.4] - 2024-05-21
+
+- Emergency release to fix production after ICU version 75 broke a dependency of Mastodon, `charlock_holmes`, in places
+  that are not used in Mastodon.
+
 ## [v4.3.0-alpha.3+glitch+cat+1.2.3] - 2024-05-21
 
 - Upstream changes, once again (including, but not limited to:)
diff --git a/Gemfile b/Gemfile
index 240dcce95ac6a8..068372afe7afde 100644
--- a/Gemfile
+++ b/Gemfile
@@ -28,7 +28,7 @@ gem 'active_model_serializers', '~> 0.10'
 gem 'addressable', '~> 2.8'
 gem 'bootsnap', '~> 1.18.0', require: false
 gem 'browser'
-gem 'charlock_holmes', '~> 0.7.7'
+gem 'charlock_holmes', github: 'kescher-temp-forks/charlock_holmes', ref: '0a6a8eb2f759477e618e58b81e85365b2b67d306'
 gem 'chewy', '~> 7.3'
 gem 'devise', '~> 4.9'
 gem 'devise-two-factor'
diff --git a/Gemfile.lock b/Gemfile.lock
index eade99acfdffb8..df3b097379a6f0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -7,6 +7,13 @@ GIT
       hkdf (~> 0.2)
       jwt (~> 2.0)
 
+GIT
+  remote: https://github.com/kescher-temp-forks/charlock_holmes.git
+  revision: 0a6a8eb2f759477e618e58b81e85365b2b67d306
+  ref: 0a6a8eb2f759477e618e58b81e85365b2b67d306
+  specs:
+    charlock_holmes (0.7.7)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -159,7 +166,6 @@ GEM
     case_transform (0.2)
       activesupport
     cbor (0.5.9.8)
-    charlock_holmes (0.7.7)
     chewy (7.6.0)
       activesupport (>= 5.2)
       elasticsearch (>= 7.14.0, < 8)
@@ -913,7 +919,7 @@ DEPENDENCIES
   browser
   bundler-audit (~> 0.9)
   capybara (~> 3.39)
-  charlock_holmes (~> 0.7.7)
+  charlock_holmes!
   chewy (~> 7.3)
   climate_control
   cocoon (~> 1.2)
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index 343986efa48e69..1bcc1dfb0f14df 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -25,7 +25,7 @@ def prerelease
     end
 
     def catstodon_revision
-      '1.2.3'
+      '1.2.4'
     end
 
     def build_metadata

From 16ce10a2bd803551ed429f57ae847081a2dd8508 Mon Sep 17 00:00:00 2001
From: Jeremy Kescher <jeremy@kescher.at>
Date: Tue, 21 May 2024 05:47:06 +0200
Subject: [PATCH 1073/2191] Apply changes from emoji reactions branch

---
 app/javascript/flavours/glitch/features/status/index.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/flavours/glitch/features/status/index.jsx b/app/javascript/flavours/glitch/features/status/index.jsx
index 57852b3b2c6aaf..4719689a8b1885 100644
--- a/app/javascript/flavours/glitch/features/status/index.jsx
+++ b/app/javascript/flavours/glitch/features/status/index.jsx
@@ -308,7 +308,7 @@ class Status extends ImmutablePureComponent {
 
   handleReactionAdd = (statusId, name, url) => {
     const { dispatch, identity } = this.props;
-    const { signedIn } = identity.signedIn;
+    const { signedIn } = identity;
 
     if (signedIn) {
       dispatch(addReaction(statusId, name, url));

From 6703af29e3eda1d170c03095ecd5b30a203d742b Mon Sep 17 00:00:00 2001
From: Jeremy Kescher <jeremy@kescher.at>
Date: Tue, 21 May 2024 05:52:53 +0200
Subject: [PATCH 1074/2191] Bump version to v4.3.0-alpha.3+glitch+cat+1.2.5

---
 CHANGELOG.md            | 5 +++++
 lib/mastodon/version.rb | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b8e2ca9eaebf75..b0c9517736347b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 All changes to Catstodon that aren't Mastodon or glitch-soc Mastodon changes will be documented here.
 
+## [v4.3.0-alpha.3+glitch+cat+1.2.5] - 2024-05-21
+
+- Apply a fix from the emoji reactions patch branch for an issue introduced in the 1.2.3 release for this Mastodon version.
+  - Thanks, Essem!
+
 ## [v4.3.0-alpha.3+glitch+cat+1.2.4] - 2024-05-21
 
 - Emergency release to fix production after ICU version 75 broke a dependency of Mastodon, `charlock_holmes`, in places
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index 1bcc1dfb0f14df..e6cc91f64874db 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -25,7 +25,7 @@ def prerelease
     end
 
     def catstodon_revision
-      '1.2.4'
+      '1.2.5'
     end
 
     def build_metadata

From eda2bdfc7abeb3f67d982ac009856489089ed7d7 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 21 May 2024 10:48:36 +0200
Subject: [PATCH 1075/2191] New Crowdin Translations (automated) (#30383)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/fil.json | 14 ++++++++++++++
 config/locales/is.yml                    |  1 +
 config/locales/lt.yml                    |  6 +++---
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/app/javascript/mastodon/locales/fil.json b/app/javascript/mastodon/locales/fil.json
index 894d73c8cc42ba..38772760490634 100644
--- a/app/javascript/mastodon/locales/fil.json
+++ b/app/javascript/mastodon/locales/fil.json
@@ -50,6 +50,8 @@
   "admin.dashboard.retention.cohort_size": "Mga bagong tagagamit",
   "alert.rate_limited.message": "Mangyaring subukan muli pagkatapos ng {retry_time, time, medium}.",
   "audio.hide": "Itago ang tunog",
+  "block_modal.show_less": "Magpakita ng mas kaunti",
+  "block_modal.show_more": "Magpakita ng higit pa",
   "block_modal.title": "Harangan ang tagagamit?",
   "bundle_column_error.error.title": "Naku!",
   "bundle_column_error.network.body": "Nagkaroon ng kamalian habang sinusubukang i-karga ang pahinang ito. Maaaring dahil ito sa pansamantalang problema ng iyong koneksyon sa internet o ang server na ito.",
@@ -102,6 +104,7 @@
   "compose_form.encryption_warning": "Ang mga post sa Mastodon ay hindi naka-encrypt nang dulo-dulo. Huwag magbahagi ng anumang sensitibong impormasyon sa Mastodon.",
   "compose_form.hashtag_warning": "Hindi maililista ang post na ito sa anumang hashtag dahil hindi ito nakapubliko. Mga nakapublikong post lamang ang mahahanap ayon sa hashtag.",
   "compose_form.placeholder": "Anong nangyari?",
+  "compose_form.poll.duration": "Tagal ng botohan",
   "compose_form.poll.multiple": "Maraming pagpipilian",
   "compose_form.poll.single": "Piliin ang isa",
   "compose_form.reply": "Tumugon",
@@ -173,6 +176,7 @@
   "empty_column.list": "Wala pang laman ang listahang ito. Kapag naglathala ng mga bagong post ang mga miyembro ng listahang ito, makikita iyon dito.",
   "empty_column.lists": "Wala ka pang mga listahan. Kapag gumawa ka ng isa, makikita yun dito.",
   "explore.search_results": "Mga resulta ng paghahanap",
+  "explore.suggested_follows": "Mga tao",
   "explore.title": "Tuklasin",
   "explore.trending_links": "Mga balita",
   "filter_modal.select_filter.search": "Hanapin o gumawa",
@@ -186,9 +190,13 @@
   "follow_suggestions.who_to_follow": "Sinong maaaring sundan",
   "footer.about": "Tungkol dito",
   "footer.get_app": "Kunin ang app",
+  "footer.status": "Katayuan",
   "generic.saved": "Nakaimbak",
   "hashtag.column_header.tag_mode.all": "at {additional}",
   "hashtag.column_header.tag_mode.any": "o {additional}",
+  "hashtag.column_settings.tag_mode.all": "Lahat ng nandito",
+  "hashtag.column_settings.tag_mode.any": "Ilan sa nandito",
+  "hashtag.column_settings.tag_mode.none": "Wala dito",
   "home.column_settings.show_replies": "Ipakita ang mga tugon",
   "home.pending_critical_update.body": "Mangyaring i-update ang iyong serbiro ng Mastodon sa lalong madaling panahon!",
   "interaction_modal.login.action": "Iuwi mo ako",
@@ -199,6 +207,7 @@
   "intervals.full.days": "{number, plural, one {# araw} other {# na araw}}",
   "intervals.full.hours": "{number, plural, one {# oras} other {# na oras}}",
   "intervals.full.minutes": "{number, plural, one {# minuto} other {# na minuto}}",
+  "keyboard_shortcuts.blocked": "Buksan ang talaan ng mga nakaharang na mga tagagamit",
   "keyboard_shortcuts.description": "Paglalarawan",
   "keyboard_shortcuts.down": "Ilipat pababa sa talaan",
   "keyboard_shortcuts.mention": "Banggitin ang may-akda",
@@ -218,7 +227,10 @@
   "navigation_bar.about": "Tungkol dito",
   "navigation_bar.blocks": "Nakaharang na mga tagagamit",
   "navigation_bar.direct": "Mga palihim na banggit",
+  "navigation_bar.discover": "Tuklasin",
+  "navigation_bar.explore": "Tuklasin",
   "navigation_bar.favourites": "Mga paborito",
+  "navigation_bar.follow_requests": "Mga hiling sa pagsunod",
   "navigation_bar.follows_and_followers": "Mga sinusundan at tagasunod",
   "navigation_bar.lists": "Mga listahan",
   "navigation_bar.search": "Maghanap",
@@ -226,6 +238,7 @@
   "notification.follow": "Sinundan ka ni {name}",
   "notification.follow_request": "Hinihiling ni {name} na sundan ka",
   "notification.mention": "Binanggit ka ni {name}",
+  "notification.moderation_warning": "Mayroong kang natanggap na babala sa pagtitimpi",
   "notification.relationships_severance_event.learn_more": "Matuto nang higit pa",
   "notification_requests.accept": "Tanggapin",
   "notification_requests.notifications_from": "Mga abiso mula kay/sa {name}",
@@ -246,6 +259,7 @@
   "onboarding.profile.note_hint": "Maaari mong @bangitin ang ibang mga tao o mga #hashtag…",
   "onboarding.profile.save_and_continue": "Iimbak at magpatuloy",
   "onboarding.share.next_steps": "Mga posibleng susunod na hakbang:",
+  "picture_in_picture.restore": "Ilagay ito pabalik",
   "poll.closed": "Sarado",
   "poll.reveal": "Ipakita ang mga resulta",
   "poll.voted": "Binoto mo para sa sagot na ito",
diff --git a/config/locales/is.yml b/config/locales/is.yml
index 2eeba976bcc30a..99777529696d9b 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -285,6 +285,7 @@ is:
         update_custom_emoji_html: "%{name} uppfærði tjáningartáknið %{target}"
         update_domain_block_html: "%{name} uppfærði útilokun lénsins %{target}"
         update_ip_block_html: "%{name} breytti reglu fyrir IP-vistfangið %{target}"
+        update_report_html: "%{name} uppfærði kæru %{target}"
         update_status_html: "%{name} uppfærði færslu frá %{target}"
         update_user_role_html: "%{name} breytti hlutverki %{target}"
       deleted_account: eyddur notandaaðgangur
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 552afa83014561..3e514a547b9166 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -618,7 +618,7 @@ lt:
     settings: 'Keisti el. pašto nuostatas: %{link}'
     view: 'Peržiūra:'
     view_profile: Peržiurėti profilį
-    view_status: Peržiūrėti statusą
+    view_status: Peržiūrėti įrašą
   applications:
     created: Aplikacija sėkmingai sukurta
     destroyed: Aplikacija sėkmingai ištrinta
@@ -777,8 +777,8 @@ lt:
     title: Moderacija
   notification_mailer:
     favourite:
-      body: 'Jūsų statusą pamėgo %{name}:'
-      subject: "%{name} pamėgo Jūsų statusą"
+      body: 'Tavo įrašą pamėgo %{name}:'
+      subject: "%{name} pamėgo tavo įrašą"
       title: Naujas mėgstamas
     follow:
       body: "%{name} pradėjo jus sekti!"

From 89f89d738f5840c80ff938f8bf6734cdafe0fa83 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 21 May 2024 10:56:08 +0200
Subject: [PATCH 1076/2191] Revert "Allow unblocking email addresses from any
 matching account (#29305)" (#30385)

---
 app/controllers/admin/accounts_controller.rb         | 2 +-
 app/models/canonical_email_block.rb                  | 1 -
 app/views/admin/accounts/show.html.haml              | 2 +-
 spec/fabricators/canonical_email_block_fabricator.rb | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/controllers/admin/accounts_controller.rb b/app/controllers/admin/accounts_controller.rb
index d3be7817ff4b81..9beb8fde6b2fda 100644
--- a/app/controllers/admin/accounts_controller.rb
+++ b/app/controllers/admin/accounts_controller.rb
@@ -128,7 +128,7 @@ def remove_header
     def unblock_email
       authorize @account, :unblock_email?
 
-      CanonicalEmailBlock.matching_account(@account).delete_all
+      CanonicalEmailBlock.where(reference_account: @account).delete_all
 
       log_action :unblock_email, @account
 
diff --git a/app/models/canonical_email_block.rb b/app/models/canonical_email_block.rb
index c05eb9801dc48c..d09df6f5e2a531 100644
--- a/app/models/canonical_email_block.rb
+++ b/app/models/canonical_email_block.rb
@@ -20,7 +20,6 @@ class CanonicalEmailBlock < ApplicationRecord
   validates :canonical_email_hash, presence: true, uniqueness: true
 
   scope :matching_email, ->(email) { where(canonical_email_hash: email_to_canonical_email_hash(email)) }
-  scope :matching_account, ->(account) { matching_email(account&.user_email).or(where(reference_account: account)) }
 
   def to_log_human_identifier
     canonical_email_hash
diff --git a/app/views/admin/accounts/show.html.haml b/app/views/admin/accounts/show.html.haml
index bcf7c073141543..f148b9a0822193 100644
--- a/app/views/admin/accounts/show.html.haml
+++ b/app/views/admin/accounts/show.html.haml
@@ -30,7 +30,7 @@
 = render 'admin/accounts/counters', account: @account
 
 - if @account.local? && @account.user.nil?
-  = link_to t('admin.accounts.unblock_email'), unblock_email_admin_account_path(@account.id), method: :post, class: 'button' if can?(:unblock_email, @account) && CanonicalEmailBlock.matching_account(@account).exists?
+  = link_to t('admin.accounts.unblock_email'), unblock_email_admin_account_path(@account.id), method: :post, class: 'button' if can?(:unblock_email, @account) && CanonicalEmailBlock.exists?(reference_account_id: @account.id)
 - else
   .table-wrapper
     %table.table.inline-table
diff --git a/spec/fabricators/canonical_email_block_fabricator.rb b/spec/fabricators/canonical_email_block_fabricator.rb
index 2f979df794ef21..1ef53ff4a47d8f 100644
--- a/spec/fabricators/canonical_email_block_fabricator.rb
+++ b/spec/fabricators/canonical_email_block_fabricator.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 Fabricator(:canonical_email_block) do
-  email { |attrs| attrs[:reference_account] ? attrs[:reference_account].user_email : sequence(:email) { |i| "#{i}#{Faker::Internet.email}" } }
+  email { sequence(:email) { |i| "#{i}#{Faker::Internet.email}" } }
   reference_account { Fabricate.build(:account) }
 end

From edf6ca56e369ebc7997f4f67a411afacf5e33911 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 21 May 2024 13:00:07 +0200
Subject: [PATCH 1077/2191] Fix rubocop error and cleanup
 `Status.as_direct_timeline` a little

---
 app/models/status.rb | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/models/status.rb b/app/models/status.rb
index ac90b2d03bf944..585a9fcb23c382 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -344,23 +344,23 @@ def as_direct_timeline(account, limit = 20, max_id = nil, since_id = nil)
 
       # _from_me part does not require any timeline filters
       query_from_me = where(account_id: account.id)
-                      .where(Status.arel_table[:visibility].eq(3))
+                      .direct_visibility
                       .limit(limit)
-                      .order('statuses.id DESC')
+                      .order(id: :desc)
 
       # _to_me part requires mute and block filter.
       # FIXME: may we check mutes.hide_notifications?
       query_to_me = Status
+                    .direct_visibility
                     .joins(:mentions)
-                    .merge(Mention.where(account_id: account.id))
-                    .where(Status.arel_table[:visibility].eq(3))
+                    .where(mentions: { account_id: account.id })
                     .limit(limit)
                     .order('mentions.status_id DESC')
                     .not_excluded_by_account(account)
 
       if max_id.present?
-        query_from_me = query_from_me.where('statuses.id < ?', max_id)
-        query_to_me = query_to_me.where('mentions.status_id < ?', max_id)
+        query_from_me = query_from_me.where(id: ...max_id)
+        query_to_me = query_to_me.where(mentions: { status_id: ...max_id })
       end
 
       if since_id.present?
@@ -368,9 +368,9 @@ def as_direct_timeline(account, limit = 20, max_id = nil, since_id = nil)
         query_to_me = query_to_me.where('mentions.status_id > ?', since_id)
       end
 
-      # returns ActiveRecord.Relation
-      items = (query_from_me.select(:id).to_a + query_to_me.select(:id).to_a).uniq(&:id).sort_by(&:id).reverse.take(limit)
-      Status.where(id: items.map(&:id))
+      # TODO: use a single query?
+      ids = (query_from_me.pluck(:id) + query_to_me.pluck(:id)).sort.uniq.reverse.take(limit)
+      Status.where(id: ids)
     end
 
     def favourites_map(status_ids, account_id)

From 32223863a51472d929c57d22dbffc5d9c9fafa79 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 21 May 2024 15:17:34 +0200
Subject: [PATCH 1078/2191] Add coverage to `/admin/accounts/:id` (#30386)

---
 .../admin/accounts_controller_spec.rb         | 29 ++++++++++++++++---
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/spec/controllers/admin/accounts_controller_spec.rb b/spec/controllers/admin/accounts_controller_spec.rb
index b90bb414b06a84..f241d261b1b18d 100644
--- a/spec/controllers/admin/accounts_controller_spec.rb
+++ b/spec/controllers/admin/accounts_controller_spec.rb
@@ -53,11 +53,32 @@
 
   describe 'GET #show' do
     let(:current_user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
-    let(:account) { Fabricate(:account) }
 
-    it 'returns http success' do
-      get :show, params: { id: account.id }
-      expect(response).to have_http_status(200)
+    context 'with a remote account' do
+      let(:account) { Fabricate(:account, domain: 'example.com') }
+
+      it 'returns http success' do
+        get :show, params: { id: account.id }
+        expect(response).to have_http_status(200)
+      end
+    end
+
+    context 'with a local account' do
+      let(:account) { Fabricate(:account, domain: nil) }
+
+      it 'returns http success' do
+        get :show, params: { id: account.id }
+        expect(response).to have_http_status(200)
+      end
+    end
+
+    context 'with a local deleted account' do
+      let(:account) { Fabricate(:account, domain: nil, user: nil) }
+
+      it 'returns http success' do
+        get :show, params: { id: account.id }
+        expect(response).to have_http_status(200)
+      end
     end
   end
 

From cd0c5479362260082dbe1cbc42e364017853bbfc Mon Sep 17 00:00:00 2001
From: David Lapshin <ddaudix@gmail.com>
Date: Tue, 21 May 2024 18:24:51 +0300
Subject: [PATCH 1079/2191] Fix announcements icon rotating like settings one
 (#30388)

---
 app/javascript/styles/mastodon/components.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index f377eed95cba3d..859c6e32675c8f 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -4372,7 +4372,7 @@ a.status-card {
       color: $primary-text-color;
     }
 
-    .icon {
+    .icon-sliders {
       transform: rotate(60deg);
     }
   }
@@ -4383,7 +4383,7 @@ a.status-card {
   }
 }
 
-.no-reduce-motion .column-header__button .icon {
+.no-reduce-motion .column-header__button .icon-sliders {
   transition: transform 150ms ease-in-out;
 }
 

From dc35563f65e3c843b847c6d58797937200e27233 Mon Sep 17 00:00:00 2001
From: David Lapshin <ddaudix@gmail.com>
Date: Tue, 21 May 2024 18:24:51 +0300
Subject: [PATCH 1080/2191] [Glitch] Fix announcements icon rotating like
 settings one

Port cd0c5479362260082dbe1cbc42e364017853bbfc to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/styles/components.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index 9f102b847efbb7..07b18b2936a295 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -4609,7 +4609,7 @@ a.status-card {
       color: $primary-text-color;
     }
 
-    .icon {
+    .icon-sliders {
       transform: rotate(60deg);
     }
   }
@@ -4659,7 +4659,7 @@ a.status-card {
   padding: 0;
 }
 
-.no-reduce-motion .column-header__button .icon {
+.no-reduce-motion .column-header__button .icon-sliders {
   transition: transform 150ms ease-in-out;
 }
 

From 6e67ca73f3b32bbac226b77f78acce52c525307b Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 22 May 2024 09:35:27 +0200
Subject: [PATCH 1081/2191] fix(deps): update dependency axios to v1.7.2
 (#30372)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 2d27d1302a42c9..9d97b2f15704a8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5196,13 +5196,13 @@ __metadata:
   linkType: hard
 
 "axios@npm:^1.4.0":
-  version: 1.6.8
-  resolution: "axios@npm:1.6.8"
+  version: 1.7.2
+  resolution: "axios@npm:1.7.2"
   dependencies:
     follow-redirects: "npm:^1.15.6"
     form-data: "npm:^4.0.0"
     proxy-from-env: "npm:^1.1.0"
-  checksum: 10c0/0f22da6f490335479a89878bc7d5a1419484fbb437b564a80c34888fc36759ae4f56ea28d55a191695e5ed327f0bad56e7ff60fb6770c14d1be6501505d47ab9
+  checksum: 10c0/cbd47ce380fe045313364e740bb03b936420b8b5558c7ea36a4563db1258c658f05e40feb5ddd41f6633fdd96d37ac2a76f884dad599c5b0224b4c451b3fa7ae
   languageName: node
   linkType: hard
 

From d9d4ba1b6f2756e819344b384d731c7722a931b5 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 22 May 2024 09:47:49 +0200
Subject: [PATCH 1082/2191] fix(deps): update dependency glob to v10.3.16
 (#30392)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 9d97b2f15704a8..9f953bb781548b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8936,17 +8936,17 @@ __metadata:
   linkType: hard
 
 "glob@npm:^10.2.2, glob@npm:^10.2.6, glob@npm:^10.3.10, glob@npm:^10.3.7":
-  version: 10.3.15
-  resolution: "glob@npm:10.3.15"
+  version: 10.3.16
+  resolution: "glob@npm:10.3.16"
   dependencies:
     foreground-child: "npm:^3.1.0"
-    jackspeak: "npm:^2.3.6"
+    jackspeak: "npm:^3.1.2"
     minimatch: "npm:^9.0.1"
     minipass: "npm:^7.0.4"
     path-scurry: "npm:^1.11.0"
   bin:
     glob: dist/esm/bin.mjs
-  checksum: 10c0/cda748ddc181b31b3df9548c0991800406d5cc3b3f8110e37a8751ec1e39f37cdae7d7782d5422d7df92775121cdf00599992dff22f7ff1260344843af227c2b
+  checksum: 10c0/f7eb4c3e66f221f0be3967c02527047167967549bdf8ed1bd5f6277d43a35191af4e2bb8c89f07a79664958bae088fd06659e69a0f1de462972f1eab52a715e8
   languageName: node
   linkType: hard
 
@@ -10407,16 +10407,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jackspeak@npm:^2.3.6":
-  version: 2.3.6
-  resolution: "jackspeak@npm:2.3.6"
+"jackspeak@npm:^3.1.2":
+  version: 3.1.2
+  resolution: "jackspeak@npm:3.1.2"
   dependencies:
     "@isaacs/cliui": "npm:^8.0.2"
     "@pkgjs/parseargs": "npm:^0.11.0"
   dependenciesMeta:
     "@pkgjs/parseargs":
       optional: true
-  checksum: 10c0/f01d8f972d894cd7638bc338e9ef5ddb86f7b208ce177a36d718eac96ec86638a6efa17d0221b10073e64b45edc2ce15340db9380b1f5d5c5d000cbc517dc111
+  checksum: 10c0/5f1922a1ca0f19869e23f0dc4374c60d36e922f7926c76fecf8080cc6f7f798d6a9caac1b9428327d14c67731fd551bb3454cb270a5e13a0718f3b3660ec3d5d
   languageName: node
   linkType: hard
 

From a2b4c29c8fc8b7db163afffe1987fc4a41b574cb Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 22 May 2024 09:57:51 +0200
Subject: [PATCH 1083/2191] New Crowdin Translations (automated) (#30394)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/fil.json | 10 +++++++++-
 app/javascript/mastodon/locales/lv.json  |  4 ++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/app/javascript/mastodon/locales/fil.json b/app/javascript/mastodon/locales/fil.json
index 38772760490634..1f9b0496b9d427 100644
--- a/app/javascript/mastodon/locales/fil.json
+++ b/app/javascript/mastodon/locales/fil.json
@@ -195,8 +195,9 @@
   "hashtag.column_header.tag_mode.all": "at {additional}",
   "hashtag.column_header.tag_mode.any": "o {additional}",
   "hashtag.column_settings.tag_mode.all": "Lahat ng nandito",
-  "hashtag.column_settings.tag_mode.any": "Ilan sa nandito",
+  "hashtag.column_settings.tag_mode.any": "Ilan dito",
   "hashtag.column_settings.tag_mode.none": "Wala dito",
+  "hashtags.and_other": "…at {count, plural, one {# iba pa} other {# na iba pa}}",
   "home.column_settings.show_replies": "Ipakita ang mga tugon",
   "home.pending_critical_update.body": "Mangyaring i-update ang iyong serbiro ng Mastodon sa lalong madaling panahon!",
   "interaction_modal.login.action": "Iuwi mo ako",
@@ -224,6 +225,7 @@
   "lists.replies_policy.title": "Ipakita ang mga tugon sa:",
   "lists.subheading": "Iyong mga talaan",
   "loading_indicator.label": "Kumakarga…",
+  "mute_modal.hide_from_notifications": "Itago mula sa mga abiso",
   "navigation_bar.about": "Tungkol dito",
   "navigation_bar.blocks": "Nakaharang na mga tagagamit",
   "navigation_bar.direct": "Mga palihim na banggit",
@@ -233,6 +235,7 @@
   "navigation_bar.follow_requests": "Mga hiling sa pagsunod",
   "navigation_bar.follows_and_followers": "Mga sinusundan at tagasunod",
   "navigation_bar.lists": "Mga listahan",
+  "navigation_bar.public_timeline": "Pinagsamang timeline",
   "navigation_bar.search": "Maghanap",
   "notification.admin.report": "Iniulat ni {name} si {target}",
   "notification.follow": "Sinundan ka ni {name}",
@@ -247,10 +250,12 @@
   "notifications.column_settings.alert": "Mga abiso sa Desktop",
   "notifications.column_settings.favourite": "Mga paborito:",
   "notifications.column_settings.follow": "Mga bagong tagasunod:",
+  "notifications.column_settings.poll": "Resulta ng botohan:",
   "notifications.column_settings.unread_notifications.category": "Hindi Nabasang mga Abiso",
   "notifications.column_settings.update": "Mga pagbago:",
   "notifications.filter.all": "Lahat",
   "notifications.filter.favourites": "Mga paborito",
+  "notifications.filter.polls": "Resulta ng botohan",
   "notifications.mark_as_read": "Markahan lahat ng abiso bilang nabasa na",
   "notifications.policy.filter_not_followers_title": "Mga taong hindi ka susundan",
   "notifications.policy.filter_not_following_title": "Mga taong hindi mo sinusundan",
@@ -294,10 +299,13 @@
   "report.thanks.title": "Ayaw mo bang makita ito?",
   "report.thanks.title_actionable": "Salamat sa pag-uulat, titingnan namin ito.",
   "report_notification.categories.other": "Iba pa",
+  "report_notification.categories.violation": "Paglabag sa patakaran",
+  "report_notification.open": "Buksan ang ulat",
   "search.quick_action.open_url": "Buksan ang URL sa Mastodon",
   "search.search_or_paste": "Maghanap o ilagay ang URL",
   "search_popout.full_text_search_disabled_message": "Hindi magagamit sa {domain}.",
   "search_popout.full_text_search_logged_out_message": "Magagamit lamang kapag naka-log in.",
+  "search_popout.recent": "Kamakailang mga paghahanap",
   "search_results.all": "Lahat",
   "search_results.see_all": "Ipakita lahat",
   "server_banner.learn_more": "Matuto nang higit pa",
diff --git a/app/javascript/mastodon/locales/lv.json b/app/javascript/mastodon/locales/lv.json
index 32ea6e47c45a7c..e7ab114909aa42 100644
--- a/app/javascript/mastodon/locales/lv.json
+++ b/app/javascript/mastodon/locales/lv.json
@@ -90,7 +90,7 @@
   "attachments_list.unprocessed": "(neapstrādāti)",
   "audio.hide": "Slēpt audio",
   "block_modal.remote_users_caveat": "Mēs vaicāsim serverim {domain} ņemt vērā Tavu lēmumu. Tomēr atbilstība nav nodrošināta, jo atsevišķi serveri var apstrādāt bloķēšanu citādi. Publiski ieraksti joprojām var būt redzami lietotājiem, kuri nav pieteikušies.",
-  "block_modal.show_less": "Parādīt vairāk",
+  "block_modal.show_less": "Rādīt mazāk",
   "block_modal.show_more": "Parādīt mazāk",
   "boost_modal.combo": "Nospied {combo}, lai nākamreiz šo izlaistu",
   "bundle_column_error.copy_stacktrace": "Kopēt kļūdu ziņojumu",
@@ -309,7 +309,7 @@
   "hashtag.counter_by_uses_today": "{count, plural, zero {{counter} ierakstu} one {{counter} ieraksts} other {{counter} ieraksti}} šodien",
   "hashtag.follow": "Sekot tēmturim",
   "hashtag.unfollow": "Pārstāt sekot tēmturim",
-  "hashtags.and_other": "..un {count, plural, other {# vairāk}}",
+  "hashtags.and_other": "… un {count, plural, other {vēl #}}",
   "home.column_settings.show_reblogs": "Rādīt pastiprinātos ierakstus",
   "home.column_settings.show_replies": "Rādīt atbildes",
   "home.hide_announcements": "Slēpt paziņojumus",

From 2c75cf85991bd0c22eaabe4ccd3bfb658ec59d32 Mon Sep 17 00:00:00 2001
From: Michael Stanclift <mx@vmstan.com>
Date: Wed, 22 May 2024 04:05:33 -0500
Subject: [PATCH 1084/2191] Add "Warning preset" link to admin navigation
 (#26199)

---
 config/locales/en-GB.yml | 2 +-
 config/locales/en.yml    | 2 +-
 config/navigation.rb     | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 7e31080dfa2c10..7cd888b3732837 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -950,7 +950,7 @@ en-GB:
       delete: Delete
       edit_preset: Edit warning preset
       empty: You haven't defined any warning presets yet.
-      title: Manage warning presets
+      title: Warning presets
     webhooks:
       add_new: Add endpoint
       delete: Delete
diff --git a/config/locales/en.yml b/config/locales/en.yml
index d3704bbbcf54cb..43aa8481c64be8 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -951,7 +951,7 @@ en:
       delete: Delete
       edit_preset: Edit warning preset
       empty: You haven't defined any warning presets yet.
-      title: Manage warning presets
+      title: Warning presets
     webhooks:
       add_new: Add endpoint
       delete: Delete
diff --git a/config/navigation.rb b/config/navigation.rb
index efac96d46e6a1a..c1dd81501cf90d 100644
--- a/config/navigation.rb
+++ b/config/navigation.rb
@@ -59,6 +59,7 @@
       s.item :dashboard, safe_join([fa_icon('tachometer fw'), t('admin.dashboard.title')]), admin_dashboard_path, if: -> { current_user.can?(:view_dashboard) }
       s.item :settings, safe_join([fa_icon('cogs fw'), t('admin.settings.title')]), admin_settings_path, if: -> { current_user.can?(:manage_settings) }, highlights_on: %r{/admin/settings}
       s.item :rules, safe_join([fa_icon('gavel fw'), t('admin.rules.title')]), admin_rules_path, highlights_on: %r{/admin/rules}, if: -> { current_user.can?(:manage_rules) }
+      s.item :warning_presets, safe_join([fa_icon('warning fw'), t('admin.warning_presets.title')]), admin_warning_presets_path, highlights_on: %r{/admin/warning_presets}, if: -> { current_user.can?(:manage_settings) }
       s.item :roles, safe_join([fa_icon('vcard fw'), t('admin.roles.title')]), admin_roles_path, highlights_on: %r{/admin/roles}, if: -> { current_user.can?(:manage_roles) }
       s.item :announcements, safe_join([fa_icon('bullhorn fw'), t('admin.announcements.title')]), admin_announcements_path, highlights_on: %r{/admin/announcements}, if: -> { current_user.can?(:manage_announcements) }
       s.item :custom_emojis, safe_join([fa_icon('smile-o fw'), t('admin.custom_emojis.title')]), admin_custom_emojis_path, highlights_on: %r{/admin/custom_emojis}, if: -> { current_user.can?(:manage_custom_emojis) }

From 2c5ab8f647841ea8075ece50ccc9e12c21af8720 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Wed, 22 May 2024 16:45:18 +0200
Subject: [PATCH 1085/2191] Remove the access token from Redux & context
 (#30275)

---
 .../mastodon/actions/account_notes.ts         |  4 +-
 app/javascript/mastodon/actions/accounts.js   | 64 +++++++++----------
 .../mastodon/actions/announcements.js         | 14 ++--
 app/javascript/mastodon/actions/blocks.js     |  6 +-
 app/javascript/mastodon/actions/bookmarks.js  |  4 +-
 app/javascript/mastodon/actions/compose.js    | 16 ++---
 .../mastodon/actions/conversations.js         | 10 +--
 .../mastodon/actions/custom_emojis.js         |  4 +-
 app/javascript/mastodon/actions/directory.js  |  6 +-
 .../mastodon/actions/domain_blocks.js         | 10 +--
 app/javascript/mastodon/actions/favourites.js |  4 +-
 .../mastodon/actions/featured_tags.js         |  2 +-
 app/javascript/mastodon/actions/filters.js    | 12 ++--
 app/javascript/mastodon/actions/history.js    |  2 +-
 .../mastodon/actions/interactions.js          | 44 ++++++-------
 app/javascript/mastodon/actions/lists.js      | 39 ++++++-----
 app/javascript/mastodon/actions/markers.ts    | 34 +++++-----
 app/javascript/mastodon/actions/mutes.js      |  6 +-
 .../mastodon/actions/notifications.js         | 32 +++++-----
 .../mastodon/actions/pin_statuses.js          |  4 +-
 app/javascript/mastodon/actions/polls.js      |  8 +--
 app/javascript/mastodon/actions/reports.js    |  4 +-
 app/javascript/mastodon/actions/search.js     |  6 +-
 app/javascript/mastodon/actions/server.js     | 10 +--
 app/javascript/mastodon/actions/statuses.js   | 22 +++----
 .../mastodon/actions/suggestions.js           |  8 +--
 app/javascript/mastodon/actions/tags.js       | 18 +++---
 app/javascript/mastodon/actions/timelines.js  |  2 +-
 app/javascript/mastodon/actions/trends.js     | 12 ++--
 app/javascript/mastodon/api.ts                | 22 ++-----
 app/javascript/mastodon/identity_context.tsx  |  4 --
 app/javascript/mastodon/initial_state.js      |  7 ++
 app/javascript/mastodon/reducers/meta.js      |  4 +-
 app/javascript/mastodon/stream.js             |  6 +-
 app/javascript/mastodon/test_helpers.tsx      |  1 -
 35 files changed, 225 insertions(+), 226 deletions(-)

diff --git a/app/javascript/mastodon/actions/account_notes.ts b/app/javascript/mastodon/actions/account_notes.ts
index e524e5235bfe5a..acd9ecf4104ba3 100644
--- a/app/javascript/mastodon/actions/account_notes.ts
+++ b/app/javascript/mastodon/actions/account_notes.ts
@@ -5,8 +5,8 @@ import api from '../api';
 
 export const submitAccountNote = createAppAsyncThunk(
   'account_note/submit',
-  async (args: { id: string; value: string }, { getState }) => {
-    const response = await api(getState).post<ApiRelationshipJSON>(
+  async (args: { id: string; value: string }) => {
+    const response = await api().post<ApiRelationshipJSON>(
       `/api/v1/accounts/${args.id}/note`,
       {
         comment: args.value,
diff --git a/app/javascript/mastodon/actions/accounts.js b/app/javascript/mastodon/actions/accounts.js
index 9f3bbba03313f6..cea915e5f17fd0 100644
--- a/app/javascript/mastodon/actions/accounts.js
+++ b/app/javascript/mastodon/actions/accounts.js
@@ -76,11 +76,11 @@ export const ACCOUNT_REVEAL = 'ACCOUNT_REVEAL';
 export * from './accounts_typed';
 
 export function fetchAccount(id) {
-  return (dispatch, getState) => {
+  return (dispatch) => {
     dispatch(fetchRelationships([id]));
     dispatch(fetchAccountRequest(id));
 
-    api(getState).get(`/api/v1/accounts/${id}`).then(response => {
+    api().get(`/api/v1/accounts/${id}`).then(response => {
       dispatch(importFetchedAccount(response.data));
       dispatch(fetchAccountSuccess());
     }).catch(error => {
@@ -89,10 +89,10 @@ export function fetchAccount(id) {
   };
 }
 
-export const lookupAccount = acct => (dispatch, getState) => {
+export const lookupAccount = acct => (dispatch) => {
   dispatch(lookupAccountRequest(acct));
 
-  api(getState).get('/api/v1/accounts/lookup', { params: { acct } }).then(response => {
+  api().get('/api/v1/accounts/lookup', { params: { acct } }).then(response => {
     dispatch(fetchRelationships([response.data.id]));
     dispatch(importFetchedAccount(response.data));
     dispatch(lookupAccountSuccess());
@@ -146,7 +146,7 @@ export function followAccount(id, options = { reblogs: true }) {
 
     dispatch(followAccountRequest({ id, locked }));
 
-    api(getState).post(`/api/v1/accounts/${id}/follow`, options).then(response => {
+    api().post(`/api/v1/accounts/${id}/follow`, options).then(response => {
       dispatch(followAccountSuccess({relationship: response.data, alreadyFollowing}));
     }).catch(error => {
       dispatch(followAccountFail({ id, error, locked }));
@@ -158,7 +158,7 @@ export function unfollowAccount(id) {
   return (dispatch, getState) => {
     dispatch(unfollowAccountRequest(id));
 
-    api(getState).post(`/api/v1/accounts/${id}/unfollow`).then(response => {
+    api().post(`/api/v1/accounts/${id}/unfollow`).then(response => {
       dispatch(unfollowAccountSuccess({relationship: response.data, statuses: getState().get('statuses')}));
     }).catch(error => {
       dispatch(unfollowAccountFail({ id, error }));
@@ -170,7 +170,7 @@ export function blockAccount(id) {
   return (dispatch, getState) => {
     dispatch(blockAccountRequest(id));
 
-    api(getState).post(`/api/v1/accounts/${id}/block`).then(response => {
+    api().post(`/api/v1/accounts/${id}/block`).then(response => {
       // Pass in entire statuses map so we can use it to filter stuff in different parts of the reducers
       dispatch(blockAccountSuccess({ relationship: response.data, statuses: getState().get('statuses') }));
     }).catch(error => {
@@ -180,10 +180,10 @@ export function blockAccount(id) {
 }
 
 export function unblockAccount(id) {
-  return (dispatch, getState) => {
+  return (dispatch) => {
     dispatch(unblockAccountRequest(id));
 
-    api(getState).post(`/api/v1/accounts/${id}/unblock`).then(response => {
+    api().post(`/api/v1/accounts/${id}/unblock`).then(response => {
       dispatch(unblockAccountSuccess({ relationship: response.data }));
     }).catch(error => {
       dispatch(unblockAccountFail({ id, error }));
@@ -223,7 +223,7 @@ export function muteAccount(id, notifications, duration=0) {
   return (dispatch, getState) => {
     dispatch(muteAccountRequest(id));
 
-    api(getState).post(`/api/v1/accounts/${id}/mute`, { notifications, duration }).then(response => {
+    api().post(`/api/v1/accounts/${id}/mute`, { notifications, duration }).then(response => {
       // Pass in entire statuses map so we can use it to filter stuff in different parts of the reducers
       dispatch(muteAccountSuccess({ relationship: response.data, statuses: getState().get('statuses') }));
     }).catch(error => {
@@ -233,10 +233,10 @@ export function muteAccount(id, notifications, duration=0) {
 }
 
 export function unmuteAccount(id) {
-  return (dispatch, getState) => {
+  return (dispatch) => {
     dispatch(unmuteAccountRequest(id));
 
-    api(getState).post(`/api/v1/accounts/${id}/unmute`).then(response => {
+    api().post(`/api/v1/accounts/${id}/unmute`).then(response => {
       dispatch(unmuteAccountSuccess({ relationship: response.data }));
     }).catch(error => {
       dispatch(unmuteAccountFail({ id, error }));
@@ -274,10 +274,10 @@ export function unmuteAccountFail(error) {
 
 
 export function fetchFollowers(id) {
-  return (dispatch, getState) => {
+  return (dispatch) => {
     dispatch(fetchFollowersRequest(id));
 
-    api(getState).get(`/api/v1/accounts/${id}/followers`).then(response => {
+    api().get(`/api/v1/accounts/${id}/followers`).then(response => {
       const next = getLinks(response).refs.find(link => link.rel === 'next');
 
       dispatch(importFetchedAccounts(response.data));
@@ -324,7 +324,7 @@ export function expandFollowers(id) {
 
     dispatch(expandFollowersRequest(id));
 
-    api(getState).get(url).then(response => {
+    api().get(url).then(response => {
       const next = getLinks(response).refs.find(link => link.rel === 'next');
 
       dispatch(importFetchedAccounts(response.data));
@@ -361,10 +361,10 @@ export function expandFollowersFail(id, error) {
 }
 
 export function fetchFollowing(id) {
-  return (dispatch, getState) => {
+  return (dispatch) => {
     dispatch(fetchFollowingRequest(id));
 
-    api(getState).get(`/api/v1/accounts/${id}/following`).then(response => {
+    api().get(`/api/v1/accounts/${id}/following`).then(response => {
       const next = getLinks(response).refs.find(link => link.rel === 'next');
 
       dispatch(importFetchedAccounts(response.data));
@@ -411,7 +411,7 @@ export function expandFollowing(id) {
 
     dispatch(expandFollowingRequest(id));
 
-    api(getState).get(url).then(response => {
+    api().get(url).then(response => {
       const next = getLinks(response).refs.find(link => link.rel === 'next');
 
       dispatch(importFetchedAccounts(response.data));
@@ -460,7 +460,7 @@ export function fetchRelationships(accountIds) {
 
     dispatch(fetchRelationshipsRequest(newAccountIds));
 
-    api(getState).get(`/api/v1/accounts/relationships?with_suspended=true&${newAccountIds.map(id => `id[]=${id}`).join('&')}`).then(response => {
+    api().get(`/api/v1/accounts/relationships?with_suspended=true&${newAccountIds.map(id => `id[]=${id}`).join('&')}`).then(response => {
       dispatch(fetchRelationshipsSuccess({ relationships: response.data }));
     }).catch(error => {
       dispatch(fetchRelationshipsFail(error));
@@ -486,10 +486,10 @@ export function fetchRelationshipsFail(error) {
 }
 
 export function fetchFollowRequests() {
-  return (dispatch, getState) => {
+  return (dispatch) => {
     dispatch(fetchFollowRequestsRequest());
 
-    api(getState).get('/api/v1/follow_requests').then(response => {
+    api().get('/api/v1/follow_requests').then(response => {
       const next = getLinks(response).refs.find(link => link.rel === 'next');
       dispatch(importFetchedAccounts(response.data));
       dispatch(fetchFollowRequestsSuccess(response.data, next ? next.uri : null));
@@ -528,7 +528,7 @@ export function expandFollowRequests() {
 
     dispatch(expandFollowRequestsRequest());
 
-    api(getState).get(url).then(response => {
+    api().get(url).then(response => {
       const next = getLinks(response).refs.find(link => link.rel === 'next');
       dispatch(importFetchedAccounts(response.data));
       dispatch(expandFollowRequestsSuccess(response.data, next ? next.uri : null));
@@ -558,10 +558,10 @@ export function expandFollowRequestsFail(error) {
 }
 
 export function authorizeFollowRequest(id) {
-  return (dispatch, getState) => {
+  return (dispatch) => {
     dispatch(authorizeFollowRequestRequest(id));
 
-    api(getState)
+    api()
       .post(`/api/v1/follow_requests/${id}/authorize`)
       .then(() => dispatch(authorizeFollowRequestSuccess({ id })))
       .catch(error => dispatch(authorizeFollowRequestFail(id, error)));
@@ -585,10 +585,10 @@ export function authorizeFollowRequestFail(id, error) {
 
 
 export function rejectFollowRequest(id) {
-  return (dispatch, getState) => {
+  return (dispatch) => {
     dispatch(rejectFollowRequestRequest(id));
 
-    api(getState)
+    api()
       .post(`/api/v1/follow_requests/${id}/reject`)
       .then(() => dispatch(rejectFollowRequestSuccess({ id })))
       .catch(error => dispatch(rejectFollowRequestFail(id, error)));
@@ -611,10 +611,10 @@ export function rejectFollowRequestFail(id, error) {
 }
 
 export function pinAccount(id) {
-  return (dispatch, getState) => {
+  return (dispatch) => {
     dispatch(pinAccountRequest(id));
 
-    api(getState).post(`/api/v1/accounts/${id}/pin`).then(response => {
+    api().post(`/api/v1/accounts/${id}/pin`).then(response => {
       dispatch(pinAccountSuccess({ relationship: response.data }));
     }).catch(error => {
       dispatch(pinAccountFail(error));
@@ -623,10 +623,10 @@ export function pinAccount(id) {
 }
 
 export function unpinAccount(id) {
-  return (dispatch, getState) => {
+  return (dispatch) => {
     dispatch(unpinAccountRequest(id));
 
-    api(getState).post(`/api/v1/accounts/${id}/unpin`).then(response => {
+    api().post(`/api/v1/accounts/${id}/unpin`).then(response => {
       dispatch(unpinAccountSuccess({ relationship: response.data }));
     }).catch(error => {
       dispatch(unpinAccountFail(error));
@@ -662,7 +662,7 @@ export function unpinAccountFail(error) {
   };
 }
 
-export const updateAccount = ({ displayName, note, avatar, header, discoverable, indexable }) => (dispatch, getState) => {
+export const updateAccount = ({ displayName, note, avatar, header, discoverable, indexable }) => (dispatch) => {
   const data = new FormData();
 
   data.append('display_name', displayName);
@@ -672,7 +672,7 @@ export const updateAccount = ({ displayName, note, avatar, header, discoverable,
   data.append('discoverable', discoverable);
   data.append('indexable', indexable);
 
-  return api(getState).patch('/api/v1/accounts/update_credentials', data).then(response => {
+  return api().patch('/api/v1/accounts/update_credentials', data).then(response => {
     dispatch(importFetchedAccount(response.data));
   });
 };
diff --git a/app/javascript/mastodon/actions/announcements.js b/app/javascript/mastodon/actions/announcements.js
index 339c5f3adc5a8e..7657b05dc42364 100644
--- a/app/javascript/mastodon/actions/announcements.js
+++ b/app/javascript/mastodon/actions/announcements.js
@@ -26,10 +26,10 @@ export const ANNOUNCEMENTS_TOGGLE_SHOW = 'ANNOUNCEMENTS_TOGGLE_SHOW';
 
 const noOp = () => {};
 
-export const fetchAnnouncements = (done = noOp) => (dispatch, getState) => {
+export const fetchAnnouncements = (done = noOp) => (dispatch) => {
   dispatch(fetchAnnouncementsRequest());
 
-  api(getState).get('/api/v1/announcements').then(response => {
+  api().get('/api/v1/announcements').then(response => {
     dispatch(fetchAnnouncementsSuccess(response.data.map(x => normalizeAnnouncement(x))));
   }).catch(error => {
     dispatch(fetchAnnouncementsFail(error));
@@ -61,10 +61,10 @@ export const updateAnnouncements = announcement => ({
   announcement: normalizeAnnouncement(announcement),
 });
 
-export const dismissAnnouncement = announcementId => (dispatch, getState) => {
+export const dismissAnnouncement = announcementId => (dispatch) => {
   dispatch(dismissAnnouncementRequest(announcementId));
 
-  api(getState).post(`/api/v1/announcements/${announcementId}/dismiss`).then(() => {
+  api().post(`/api/v1/announcements/${announcementId}/dismiss`).then(() => {
     dispatch(dismissAnnouncementSuccess(announcementId));
   }).catch(error => {
     dispatch(dismissAnnouncementFail(announcementId, error));
@@ -103,7 +103,7 @@ export const addReaction = (announcementId, name) => (dispatch, getState) => {
     dispatch(addReactionRequest(announcementId, name, alreadyAdded));
   }
 
-  api(getState).put(`/api/v1/announcements/${announcementId}/reactions/${encodeURIComponent(name)}`).then(() => {
+  api().put(`/api/v1/announcements/${announcementId}/reactions/${encodeURIComponent(name)}`).then(() => {
     dispatch(addReactionSuccess(announcementId, name, alreadyAdded));
   }).catch(err => {
     if (!alreadyAdded) {
@@ -134,10 +134,10 @@ export const addReactionFail = (announcementId, name, error) => ({
   skipLoading: true,
 });
 
-export const removeReaction = (announcementId, name) => (dispatch, getState) => {
+export const removeReaction = (announcementId, name) => (dispatch) => {
   dispatch(removeReactionRequest(announcementId, name));
 
-  api(getState).delete(`/api/v1/announcements/${announcementId}/reactions/${encodeURIComponent(name)}`).then(() => {
+  api().delete(`/api/v1/announcements/${announcementId}/reactions/${encodeURIComponent(name)}`).then(() => {
     dispatch(removeReactionSuccess(announcementId, name));
   }).catch(err => {
     dispatch(removeReactionFail(announcementId, name, err));
diff --git a/app/javascript/mastodon/actions/blocks.js b/app/javascript/mastodon/actions/blocks.js
index 54296d0905c9a9..5c66e27bec2d0b 100644
--- a/app/javascript/mastodon/actions/blocks.js
+++ b/app/javascript/mastodon/actions/blocks.js
@@ -13,10 +13,10 @@ export const BLOCKS_EXPAND_SUCCESS = 'BLOCKS_EXPAND_SUCCESS';
 export const BLOCKS_EXPAND_FAIL    = 'BLOCKS_EXPAND_FAIL';
 
 export function fetchBlocks() {
-  return (dispatch, getState) => {
+  return (dispatch) => {
     dispatch(fetchBlocksRequest());
 
-    api(getState).get('/api/v1/blocks').then(response => {
+    api().get('/api/v1/blocks').then(response => {
       const next = getLinks(response).refs.find(link => link.rel === 'next');
       dispatch(importFetchedAccounts(response.data));
       dispatch(fetchBlocksSuccess(response.data, next ? next.uri : null));
@@ -56,7 +56,7 @@ export function expandBlocks() {
 
     dispatch(expandBlocksRequest());
 
-    api(getState).get(url).then(response => {
+    api().get(url).then(response => {
       const next = getLinks(response).refs.find(link => link.rel === 'next');
       dispatch(importFetchedAccounts(response.data));
       dispatch(expandBlocksSuccess(response.data, next ? next.uri : null));
diff --git a/app/javascript/mastodon/actions/bookmarks.js b/app/javascript/mastodon/actions/bookmarks.js
index 0b16f61e63635a..89716b224c598e 100644
--- a/app/javascript/mastodon/actions/bookmarks.js
+++ b/app/javascript/mastodon/actions/bookmarks.js
@@ -18,7 +18,7 @@ export function fetchBookmarkedStatuses() {
 
     dispatch(fetchBookmarkedStatusesRequest());
 
-    api(getState).get('/api/v1/bookmarks').then(response => {
+    api().get('/api/v1/bookmarks').then(response => {
       const next = getLinks(response).refs.find(link => link.rel === 'next');
       dispatch(importFetchedStatuses(response.data));
       dispatch(fetchBookmarkedStatusesSuccess(response.data, next ? next.uri : null));
@@ -59,7 +59,7 @@ export function expandBookmarkedStatuses() {
 
     dispatch(expandBookmarkedStatusesRequest());
 
-    api(getState).get(url).then(response => {
+    api().get(url).then(response => {
       const next = getLinks(response).refs.find(link => link.rel === 'next');
       dispatch(importFetchedStatuses(response.data));
       dispatch(expandBookmarkedStatusesSuccess(response.data, next ? next.uri : null));
diff --git a/app/javascript/mastodon/actions/compose.js b/app/javascript/mastodon/actions/compose.js
index 7477e45e5eb4bf..b07dff182a8bb4 100644
--- a/app/javascript/mastodon/actions/compose.js
+++ b/app/javascript/mastodon/actions/compose.js
@@ -196,7 +196,7 @@ export function submitCompose(routerHistory) {
       });
     }
 
-    api(getState).request({
+    api().request({
       url: statusId === null ? '/api/v1/statuses' : `/api/v1/statuses/${statusId}`,
       method: statusId === null ? 'post' : 'put',
       data: {
@@ -304,7 +304,7 @@ export function uploadCompose(files) {
       const data = new FormData();
       data.append('file', file);
 
-      api(getState).post('/api/v2/media', data, {
+      api().post('/api/v2/media', data, {
         onUploadProgress: function({ loaded }){
           progress[i] = loaded;
           dispatch(uploadComposeProgress(progress.reduce((a, v) => a + v, 0), total));
@@ -321,7 +321,7 @@ export function uploadCompose(files) {
           let tryCount = 1;
 
           const poll = () => {
-            api(getState).get(`/api/v1/media/${data.id}`).then(response => {
+            api().get(`/api/v1/media/${data.id}`).then(response => {
               if (response.status === 200) {
                 dispatch(uploadComposeSuccess(response.data, file));
               } else if (response.status === 206) {
@@ -343,7 +343,7 @@ export const uploadComposeProcessing = () => ({
   type: COMPOSE_UPLOAD_PROCESSING,
 });
 
-export const uploadThumbnail = (id, file) => (dispatch, getState) => {
+export const uploadThumbnail = (id, file) => (dispatch) => {
   dispatch(uploadThumbnailRequest());
 
   const total = file.size;
@@ -351,7 +351,7 @@ export const uploadThumbnail = (id, file) => (dispatch, getState) => {
 
   data.append('thumbnail', file);
 
-  api(getState).put(`/api/v1/media/${id}`, data, {
+  api().put(`/api/v1/media/${id}`, data, {
     onUploadProgress: ({ loaded }) => {
       dispatch(uploadThumbnailProgress(loaded, total));
     },
@@ -434,7 +434,7 @@ export function changeUploadCompose(id, params) {
 
       dispatch(changeUploadComposeSuccess(data, true));
     } else {
-      api(getState).put(`/api/v1/media/${id}`, params).then(response => {
+      api().put(`/api/v1/media/${id}`, params).then(response => {
         dispatch(changeUploadComposeSuccess(response.data, false));
       }).catch(error => {
         dispatch(changeUploadComposeFail(id, error));
@@ -522,7 +522,7 @@ const fetchComposeSuggestionsAccounts = throttle((dispatch, getState, token) =>
 
   fetchComposeSuggestionsAccountsController = new AbortController();
 
-  api(getState).get('/api/v1/accounts/search', {
+  api().get('/api/v1/accounts/search', {
     signal: fetchComposeSuggestionsAccountsController.signal,
 
     params: {
@@ -556,7 +556,7 @@ const fetchComposeSuggestionsTags = throttle((dispatch, getState, token) => {
 
   fetchComposeSuggestionsTagsController = new AbortController();
 
-  api(getState).get('/api/v2/search', {
+  api().get('/api/v2/search', {
     signal: fetchComposeSuggestionsTagsController.signal,
 
     params: {
diff --git a/app/javascript/mastodon/actions/conversations.js b/app/javascript/mastodon/actions/conversations.js
index 8c4c4529fb7e8b..03174c485dd4c0 100644
--- a/app/javascript/mastodon/actions/conversations.js
+++ b/app/javascript/mastodon/actions/conversations.js
@@ -28,13 +28,13 @@ export const unmountConversations = () => ({
   type: CONVERSATIONS_UNMOUNT,
 });
 
-export const markConversationRead = conversationId => (dispatch, getState) => {
+export const markConversationRead = conversationId => (dispatch) => {
   dispatch({
     type: CONVERSATIONS_READ,
     id: conversationId,
   });
 
-  api(getState).post(`/api/v1/conversations/${conversationId}/read`);
+  api().post(`/api/v1/conversations/${conversationId}/read`);
 };
 
 export const expandConversations = ({ maxId } = {}) => (dispatch, getState) => {
@@ -48,7 +48,7 @@ export const expandConversations = ({ maxId } = {}) => (dispatch, getState) => {
 
   const isLoadingRecent = !!params.since_id;
 
-  api(getState).get('/api/v1/conversations', { params })
+  api().get('/api/v1/conversations', { params })
     .then(response => {
       const next = getLinks(response).refs.find(link => link.rel === 'next');
 
@@ -88,10 +88,10 @@ export const updateConversations = conversation => dispatch => {
   });
 };
 
-export const deleteConversation = conversationId => (dispatch, getState) => {
+export const deleteConversation = conversationId => (dispatch) => {
   dispatch(deleteConversationRequest(conversationId));
 
-  api(getState).delete(`/api/v1/conversations/${conversationId}`)
+  api().delete(`/api/v1/conversations/${conversationId}`)
     .then(() => dispatch(deleteConversationSuccess(conversationId)))
     .catch(error => dispatch(deleteConversationFail(conversationId, error)));
 };
diff --git a/app/javascript/mastodon/actions/custom_emojis.js b/app/javascript/mastodon/actions/custom_emojis.js
index 9ec8156b170a21..fb65f072dc8db7 100644
--- a/app/javascript/mastodon/actions/custom_emojis.js
+++ b/app/javascript/mastodon/actions/custom_emojis.js
@@ -5,10 +5,10 @@ export const CUSTOM_EMOJIS_FETCH_SUCCESS = 'CUSTOM_EMOJIS_FETCH_SUCCESS';
 export const CUSTOM_EMOJIS_FETCH_FAIL = 'CUSTOM_EMOJIS_FETCH_FAIL';
 
 export function fetchCustomEmojis() {
-  return (dispatch, getState) => {
+  return (dispatch) => {
     dispatch(fetchCustomEmojisRequest());
 
-    api(getState).get('/api/v1/custom_emojis').then(response => {
+    api().get('/api/v1/custom_emojis').then(response => {
       dispatch(fetchCustomEmojisSuccess(response.data));
     }).catch(error => {
       dispatch(fetchCustomEmojisFail(error));
diff --git a/app/javascript/mastodon/actions/directory.js b/app/javascript/mastodon/actions/directory.js
index cda63f2b5a43eb..7a0748029d97c1 100644
--- a/app/javascript/mastodon/actions/directory.js
+++ b/app/javascript/mastodon/actions/directory.js
@@ -11,10 +11,10 @@ export const DIRECTORY_EXPAND_REQUEST = 'DIRECTORY_EXPAND_REQUEST';
 export const DIRECTORY_EXPAND_SUCCESS = 'DIRECTORY_EXPAND_SUCCESS';
 export const DIRECTORY_EXPAND_FAIL    = 'DIRECTORY_EXPAND_FAIL';
 
-export const fetchDirectory = params => (dispatch, getState) => {
+export const fetchDirectory = params => (dispatch) => {
   dispatch(fetchDirectoryRequest());
 
-  api(getState).get('/api/v1/directory', { params: { ...params, limit: 20 } }).then(({ data }) => {
+  api().get('/api/v1/directory', { params: { ...params, limit: 20 } }).then(({ data }) => {
     dispatch(importFetchedAccounts(data));
     dispatch(fetchDirectorySuccess(data));
     dispatch(fetchRelationships(data.map(x => x.id)));
@@ -40,7 +40,7 @@ export const expandDirectory = params => (dispatch, getState) => {
 
   const loadedItems = getState().getIn(['user_lists', 'directory', 'items']).size;
 
-  api(getState).get('/api/v1/directory', { params: { ...params, offset: loadedItems, limit: 20 } }).then(({ data }) => {
+  api().get('/api/v1/directory', { params: { ...params, offset: loadedItems, limit: 20 } }).then(({ data }) => {
     dispatch(importFetchedAccounts(data));
     dispatch(expandDirectorySuccess(data));
     dispatch(fetchRelationships(data.map(x => x.id)));
diff --git a/app/javascript/mastodon/actions/domain_blocks.js b/app/javascript/mastodon/actions/domain_blocks.js
index 55c0a6ce9d0ab7..727f800af3b528 100644
--- a/app/javascript/mastodon/actions/domain_blocks.js
+++ b/app/javascript/mastodon/actions/domain_blocks.js
@@ -24,7 +24,7 @@ export function blockDomain(domain) {
   return (dispatch, getState) => {
     dispatch(blockDomainRequest(domain));
 
-    api(getState).post('/api/v1/domain_blocks', { domain }).then(() => {
+    api().post('/api/v1/domain_blocks', { domain }).then(() => {
       const at_domain = '@' + domain;
       const accounts = getState().get('accounts').filter(item => item.get('acct').endsWith(at_domain)).valueSeq().map(item => item.get('id'));
 
@@ -54,7 +54,7 @@ export function unblockDomain(domain) {
   return (dispatch, getState) => {
     dispatch(unblockDomainRequest(domain));
 
-    api(getState).delete('/api/v1/domain_blocks', { params: { domain } }).then(() => {
+    api().delete('/api/v1/domain_blocks', { params: { domain } }).then(() => {
       const at_domain = '@' + domain;
       const accounts = getState().get('accounts').filter(item => item.get('acct').endsWith(at_domain)).valueSeq().map(item => item.get('id'));
       dispatch(unblockDomainSuccess({ domain, accounts }));
@@ -80,10 +80,10 @@ export function unblockDomainFail(domain, error) {
 }
 
 export function fetchDomainBlocks() {
-  return (dispatch, getState) => {
+  return (dispatch) => {
     dispatch(fetchDomainBlocksRequest());
 
-    api(getState).get('/api/v1/domain_blocks').then(response => {
+    api().get('/api/v1/domain_blocks').then(response => {
       const next = getLinks(response).refs.find(link => link.rel === 'next');
       dispatch(fetchDomainBlocksSuccess(response.data, next ? next.uri : null));
     }).catch(err => {
@@ -123,7 +123,7 @@ export function expandDomainBlocks() {
 
     dispatch(expandDomainBlocksRequest());
 
-    api(getState).get(url).then(response => {
+    api().get(url).then(response => {
       const next = getLinks(response).refs.find(link => link.rel === 'next');
       dispatch(expandDomainBlocksSuccess(response.data, next ? next.uri : null));
     }).catch(err => {
diff --git a/app/javascript/mastodon/actions/favourites.js b/app/javascript/mastodon/actions/favourites.js
index 2d4d4e6206e845..ff475c82bec806 100644
--- a/app/javascript/mastodon/actions/favourites.js
+++ b/app/javascript/mastodon/actions/favourites.js
@@ -18,7 +18,7 @@ export function fetchFavouritedStatuses() {
 
     dispatch(fetchFavouritedStatusesRequest());
 
-    api(getState).get('/api/v1/favourites').then(response => {
+    api().get('/api/v1/favourites').then(response => {
       const next = getLinks(response).refs.find(link => link.rel === 'next');
       dispatch(importFetchedStatuses(response.data));
       dispatch(fetchFavouritedStatusesSuccess(response.data, next ? next.uri : null));
@@ -62,7 +62,7 @@ export function expandFavouritedStatuses() {
 
     dispatch(expandFavouritedStatusesRequest());
 
-    api(getState).get(url).then(response => {
+    api().get(url).then(response => {
       const next = getLinks(response).refs.find(link => link.rel === 'next');
       dispatch(importFetchedStatuses(response.data));
       dispatch(expandFavouritedStatusesSuccess(response.data, next ? next.uri : null));
diff --git a/app/javascript/mastodon/actions/featured_tags.js b/app/javascript/mastodon/actions/featured_tags.js
index 18bb615394571c..6ee4dee2bcd34a 100644
--- a/app/javascript/mastodon/actions/featured_tags.js
+++ b/app/javascript/mastodon/actions/featured_tags.js
@@ -11,7 +11,7 @@ export const fetchFeaturedTags = (id) => (dispatch, getState) => {
 
   dispatch(fetchFeaturedTagsRequest(id));
 
-  api(getState).get(`/api/v1/accounts/${id}/featured_tags`)
+  api().get(`/api/v1/accounts/${id}/featured_tags`)
     .then(({ data }) => dispatch(fetchFeaturedTagsSuccess(id, data)))
     .catch(err => dispatch(fetchFeaturedTagsFail(id, err)));
 };
diff --git a/app/javascript/mastodon/actions/filters.js b/app/javascript/mastodon/actions/filters.js
index a11956ac564c6a..588e390f0a95f8 100644
--- a/app/javascript/mastodon/actions/filters.js
+++ b/app/javascript/mastodon/actions/filters.js
@@ -23,13 +23,13 @@ export const initAddFilter = (status, { contextType }) => dispatch =>
     },
   }));
 
-export const fetchFilters = () => (dispatch, getState) => {
+export const fetchFilters = () => (dispatch) => {
   dispatch({
     type: FILTERS_FETCH_REQUEST,
     skipLoading: true,
   });
 
-  api(getState)
+  api()
     .get('/api/v2/filters')
     .then(({ data }) => dispatch({
       type: FILTERS_FETCH_SUCCESS,
@@ -44,10 +44,10 @@ export const fetchFilters = () => (dispatch, getState) => {
     }));
 };
 
-export const createFilterStatus = (params, onSuccess, onFail) => (dispatch, getState) => {
+export const createFilterStatus = (params, onSuccess, onFail) => (dispatch) => {
   dispatch(createFilterStatusRequest());
 
-  api(getState).post(`/api/v2/filters/${params.filter_id}/statuses`, params).then(response => {
+  api().post(`/api/v2/filters/${params.filter_id}/statuses`, params).then(response => {
     dispatch(createFilterStatusSuccess(response.data));
     if (onSuccess) onSuccess();
   }).catch(error => {
@@ -70,10 +70,10 @@ export const createFilterStatusFail = error => ({
   error,
 });
 
-export const createFilter = (params, onSuccess, onFail) => (dispatch, getState) => {
+export const createFilter = (params, onSuccess, onFail) => (dispatch) => {
   dispatch(createFilterRequest());
 
-  api(getState).post('/api/v2/filters', params).then(response => {
+  api().post('/api/v2/filters', params).then(response => {
     dispatch(createFilterSuccess(response.data));
     if (onSuccess) onSuccess(response.data);
   }).catch(error => {
diff --git a/app/javascript/mastodon/actions/history.js b/app/javascript/mastodon/actions/history.js
index 52401b7dce3f95..07732ea187459d 100644
--- a/app/javascript/mastodon/actions/history.js
+++ b/app/javascript/mastodon/actions/history.js
@@ -15,7 +15,7 @@ export const fetchHistory = statusId => (dispatch, getState) => {
 
   dispatch(fetchHistoryRequest(statusId));
 
-  api(getState).get(`/api/v1/statuses/${statusId}/history`).then(({ data }) => {
+  api().get(`/api/v1/statuses/${statusId}/history`).then(({ data }) => {
     dispatch(importFetchedAccounts(data.map(x => x.account)));
     dispatch(fetchHistorySuccess(statusId, data));
   }).catch(error => dispatch(fetchHistoryFail(error)));
diff --git a/app/javascript/mastodon/actions/interactions.js b/app/javascript/mastodon/actions/interactions.js
index 7d0144438aa29c..fe7c911b61e2a5 100644
--- a/app/javascript/mastodon/actions/interactions.js
+++ b/app/javascript/mastodon/actions/interactions.js
@@ -52,10 +52,10 @@ export const UNBOOKMARK_SUCCESS = 'UNBOOKMARKED_SUCCESS';
 export const UNBOOKMARK_FAIL    = 'UNBOOKMARKED_FAIL';
 
 export function reblog(status, visibility) {
-  return function (dispatch, getState) {
+  return function (dispatch) {
     dispatch(reblogRequest(status));
 
-    api(getState).post(`/api/v1/statuses/${status.get('id')}/reblog`, { visibility }).then(function (response) {
+    api().post(`/api/v1/statuses/${status.get('id')}/reblog`, { visibility }).then(function (response) {
       // The reblog API method returns a new status wrapped around the original. In this case we are only
       // interested in how the original is modified, hence passing it skipping the wrapper
       dispatch(importFetchedStatus(response.data.reblog));
@@ -67,10 +67,10 @@ export function reblog(status, visibility) {
 }
 
 export function unreblog(status) {
-  return (dispatch, getState) => {
+  return (dispatch) => {
     dispatch(unreblogRequest(status));
 
-    api(getState).post(`/api/v1/statuses/${status.get('id')}/unreblog`).then(response => {
+    api().post(`/api/v1/statuses/${status.get('id')}/unreblog`).then(response => {
       dispatch(importFetchedStatus(response.data));
       dispatch(unreblogSuccess(status));
     }).catch(error => {
@@ -130,10 +130,10 @@ export function unreblogFail(status, error) {
 }
 
 export function favourite(status) {
-  return function (dispatch, getState) {
+  return function (dispatch) {
     dispatch(favouriteRequest(status));
 
-    api(getState).post(`/api/v1/statuses/${status.get('id')}/favourite`).then(function (response) {
+    api().post(`/api/v1/statuses/${status.get('id')}/favourite`).then(function (response) {
       dispatch(importFetchedStatus(response.data));
       dispatch(favouriteSuccess(status));
     }).catch(function (error) {
@@ -143,10 +143,10 @@ export function favourite(status) {
 }
 
 export function unfavourite(status) {
-  return (dispatch, getState) => {
+  return (dispatch) => {
     dispatch(unfavouriteRequest(status));
 
-    api(getState).post(`/api/v1/statuses/${status.get('id')}/unfavourite`).then(response => {
+    api().post(`/api/v1/statuses/${status.get('id')}/unfavourite`).then(response => {
       dispatch(importFetchedStatus(response.data));
       dispatch(unfavouriteSuccess(status));
     }).catch(error => {
@@ -206,10 +206,10 @@ export function unfavouriteFail(status, error) {
 }
 
 export function bookmark(status) {
-  return function (dispatch, getState) {
+  return function (dispatch) {
     dispatch(bookmarkRequest(status));
 
-    api(getState).post(`/api/v1/statuses/${status.get('id')}/bookmark`).then(function (response) {
+    api().post(`/api/v1/statuses/${status.get('id')}/bookmark`).then(function (response) {
       dispatch(importFetchedStatus(response.data));
       dispatch(bookmarkSuccess(status, response.data));
     }).catch(function (error) {
@@ -219,10 +219,10 @@ export function bookmark(status) {
 }
 
 export function unbookmark(status) {
-  return (dispatch, getState) => {
+  return (dispatch) => {
     dispatch(unbookmarkRequest(status));
 
-    api(getState).post(`/api/v1/statuses/${status.get('id')}/unbookmark`).then(response => {
+    api().post(`/api/v1/statuses/${status.get('id')}/unbookmark`).then(response => {
       dispatch(importFetchedStatus(response.data));
       dispatch(unbookmarkSuccess(status, response.data));
     }).catch(error => {
@@ -278,10 +278,10 @@ export function unbookmarkFail(status, error) {
 }
 
 export function fetchReblogs(id) {
-  return (dispatch, getState) => {
+  return (dispatch) => {
     dispatch(fetchReblogsRequest(id));
 
-    api(getState).get(`/api/v1/statuses/${id}/reblogged_by`).then(response => {
+    api().get(`/api/v1/statuses/${id}/reblogged_by`).then(response => {
       const next = getLinks(response).refs.find(link => link.rel === 'next');
       dispatch(importFetchedAccounts(response.data));
       dispatch(fetchReblogsSuccess(id, response.data, next ? next.uri : null));
@@ -325,7 +325,7 @@ export function expandReblogs(id) {
 
     dispatch(expandReblogsRequest(id));
 
-    api(getState).get(url).then(response => {
+    api().get(url).then(response => {
       const next = getLinks(response).refs.find(link => link.rel === 'next');
 
       dispatch(importFetchedAccounts(response.data));
@@ -360,10 +360,10 @@ export function expandReblogsFail(id, error) {
 }
 
 export function fetchFavourites(id) {
-  return (dispatch, getState) => {
+  return (dispatch) => {
     dispatch(fetchFavouritesRequest(id));
 
-    api(getState).get(`/api/v1/statuses/${id}/favourited_by`).then(response => {
+    api().get(`/api/v1/statuses/${id}/favourited_by`).then(response => {
       const next = getLinks(response).refs.find(link => link.rel === 'next');
       dispatch(importFetchedAccounts(response.data));
       dispatch(fetchFavouritesSuccess(id, response.data, next ? next.uri : null));
@@ -407,7 +407,7 @@ export function expandFavourites(id) {
 
     dispatch(expandFavouritesRequest(id));
 
-    api(getState).get(url).then(response => {
+    api().get(url).then(response => {
       const next = getLinks(response).refs.find(link => link.rel === 'next');
 
       dispatch(importFetchedAccounts(response.data));
@@ -442,10 +442,10 @@ export function expandFavouritesFail(id, error) {
 }
 
 export function pin(status) {
-  return (dispatch, getState) => {
+  return (dispatch) => {
     dispatch(pinRequest(status));
 
-    api(getState).post(`/api/v1/statuses/${status.get('id')}/pin`).then(response => {
+    api().post(`/api/v1/statuses/${status.get('id')}/pin`).then(response => {
       dispatch(importFetchedStatus(response.data));
       dispatch(pinSuccess(status));
     }).catch(error => {
@@ -480,10 +480,10 @@ export function pinFail(status, error) {
 }
 
 export function unpin (status) {
-  return (dispatch, getState) => {
+  return (dispatch) => {
     dispatch(unpinRequest(status));
 
-    api(getState).post(`/api/v1/statuses/${status.get('id')}/unpin`).then(response => {
+    api().post(`/api/v1/statuses/${status.get('id')}/unpin`).then(response => {
       dispatch(importFetchedStatus(response.data));
       dispatch(unpinSuccess(status));
     }).catch(error => {
diff --git a/app/javascript/mastodon/actions/lists.js b/app/javascript/mastodon/actions/lists.js
index b0789cd426450a..9956059387efc2 100644
--- a/app/javascript/mastodon/actions/lists.js
+++ b/app/javascript/mastodon/actions/lists.js
@@ -57,7 +57,7 @@ export const fetchList = id => (dispatch, getState) => {
 
   dispatch(fetchListRequest(id));
 
-  api(getState).get(`/api/v1/lists/${id}`)
+  api().get(`/api/v1/lists/${id}`)
     .then(({ data }) => dispatch(fetchListSuccess(data)))
     .catch(err => dispatch(fetchListFail(id, err)));
 };
@@ -78,10 +78,10 @@ export const fetchListFail = (id, error) => ({
   error,
 });
 
-export const fetchLists = () => (dispatch, getState) => {
+export const fetchLists = () => (dispatch) => {
   dispatch(fetchListsRequest());
 
-  api(getState).get('/api/v1/lists')
+  api().get('/api/v1/lists')
     .then(({ data }) => dispatch(fetchListsSuccess(data)))
     .catch(err => dispatch(fetchListsFail(err)));
 };
@@ -125,10 +125,10 @@ export const changeListEditorTitle = value => ({
   value,
 });
 
-export const createList = (title, shouldReset) => (dispatch, getState) => {
+export const createList = (title, shouldReset) => (dispatch) => {
   dispatch(createListRequest());
 
-  api(getState).post('/api/v1/lists', { title }).then(({ data }) => {
+  api().post('/api/v1/lists', { title }).then(({ data }) => {
     dispatch(createListSuccess(data));
 
     if (shouldReset) {
@@ -151,10 +151,10 @@ export const createListFail = error => ({
   error,
 });
 
-export const updateList = (id, title, shouldReset, isExclusive, replies_policy) => (dispatch, getState) => {
+export const updateList = (id, title, shouldReset, isExclusive, replies_policy) => (dispatch) => {
   dispatch(updateListRequest(id));
 
-  api(getState).put(`/api/v1/lists/${id}`, { title, replies_policy, exclusive: typeof isExclusive === 'undefined' ? undefined : !!isExclusive }).then(({ data }) => {
+  api().put(`/api/v1/lists/${id}`, { title, replies_policy, exclusive: typeof isExclusive === 'undefined' ? undefined : !!isExclusive }).then(({ data }) => {
     dispatch(updateListSuccess(data));
 
     if (shouldReset) {
@@ -183,10 +183,10 @@ export const resetListEditor = () => ({
   type: LIST_EDITOR_RESET,
 });
 
-export const deleteList = id => (dispatch, getState) => {
+export const deleteList = id => (dispatch) => {
   dispatch(deleteListRequest(id));
 
-  api(getState).delete(`/api/v1/lists/${id}`)
+  api().delete(`/api/v1/lists/${id}`)
     .then(() => dispatch(deleteListSuccess(id)))
     .catch(err => dispatch(deleteListFail(id, err)));
 };
@@ -207,10 +207,10 @@ export const deleteListFail = (id, error) => ({
   error,
 });
 
-export const fetchListAccounts = listId => (dispatch, getState) => {
+export const fetchListAccounts = listId => (dispatch) => {
   dispatch(fetchListAccountsRequest(listId));
 
-  api(getState).get(`/api/v1/lists/${listId}/accounts`, { params: { limit: 0 } }).then(({ data }) => {
+  api().get(`/api/v1/lists/${listId}/accounts`, { params: { limit: 0 } }).then(({ data }) => {
     dispatch(importFetchedAccounts(data));
     dispatch(fetchListAccountsSuccess(listId, data));
   }).catch(err => dispatch(fetchListAccountsFail(listId, err)));
@@ -234,7 +234,7 @@ export const fetchListAccountsFail = (id, error) => ({
   error,
 });
 
-export const fetchListSuggestions = q => (dispatch, getState) => {
+export const fetchListSuggestions = q => (dispatch) => {
   const params = {
     q,
     resolve: false,
@@ -242,7 +242,7 @@ export const fetchListSuggestions = q => (dispatch, getState) => {
     following: true,
   };
 
-  api(getState).get('/api/v1/accounts/search', { params }).then(({ data }) => {
+  api().get('/api/v1/accounts/search', { params }).then(({ data }) => {
     dispatch(importFetchedAccounts(data));
     dispatch(fetchListSuggestionsReady(q, data));
   }).catch(error => dispatch(showAlertForError(error)));
@@ -267,10 +267,10 @@ export const addToListEditor = accountId => (dispatch, getState) => {
   dispatch(addToList(getState().getIn(['listEditor', 'listId']), accountId));
 };
 
-export const addToList = (listId, accountId) => (dispatch, getState) => {
+export const addToList = (listId, accountId) => (dispatch) => {
   dispatch(addToListRequest(listId, accountId));
 
-  api(getState).post(`/api/v1/lists/${listId}/accounts`, { account_ids: [accountId] })
+  api().post(`/api/v1/lists/${listId}/accounts`, { account_ids: [accountId] })
     .then(() => dispatch(addToListSuccess(listId, accountId)))
     .catch(err => dispatch(addToListFail(listId, accountId, err)));
 };
@@ -298,10 +298,10 @@ export const removeFromListEditor = accountId => (dispatch, getState) => {
   dispatch(removeFromList(getState().getIn(['listEditor', 'listId']), accountId));
 };
 
-export const removeFromList = (listId, accountId) => (dispatch, getState) => {
+export const removeFromList = (listId, accountId) => (dispatch) => {
   dispatch(removeFromListRequest(listId, accountId));
 
-  api(getState).delete(`/api/v1/lists/${listId}/accounts`, { params: { account_ids: [accountId] } })
+  api().delete(`/api/v1/lists/${listId}/accounts`, { params: { account_ids: [accountId] } })
     .then(() => dispatch(removeFromListSuccess(listId, accountId)))
     .catch(err => dispatch(removeFromListFail(listId, accountId, err)));
 };
@@ -338,10 +338,10 @@ export const setupListAdder = accountId => (dispatch, getState) => {
   dispatch(fetchAccountLists(accountId));
 };
 
-export const fetchAccountLists = accountId => (dispatch, getState) => {
+export const fetchAccountLists = accountId => (dispatch) => {
   dispatch(fetchAccountListsRequest(accountId));
 
-  api(getState).get(`/api/v1/accounts/${accountId}/lists`)
+  api().get(`/api/v1/accounts/${accountId}/lists`)
     .then(({ data }) => dispatch(fetchAccountListsSuccess(accountId, data)))
     .catch(err => dispatch(fetchAccountListsFail(accountId, err)));
 };
@@ -370,4 +370,3 @@ export const addToListAdder = listId => (dispatch, getState) => {
 export const removeFromListAdder = listId => (dispatch, getState) => {
   dispatch(removeFromList(listId, getState().getIn(['listAdder', 'accountId'])));
 };
-
diff --git a/app/javascript/mastodon/actions/markers.ts b/app/javascript/mastodon/actions/markers.ts
index 91f78ee2867c2c..03f577c540fc5d 100644
--- a/app/javascript/mastodon/actions/markers.ts
+++ b/app/javascript/mastodon/actions/markers.ts
@@ -1,19 +1,24 @@
 import { debounce } from 'lodash';
 
 import type { MarkerJSON } from 'mastodon/api_types/markers';
+import { getAccessToken } from 'mastodon/initial_state';
 import type { AppDispatch, RootState } from 'mastodon/store';
 import { createAppAsyncThunk } from 'mastodon/store/typed_functions';
 
-import api, { authorizationTokenFromState } from '../api';
+import api from '../api';
 import { compareId } from '../compare_id';
 
 export const synchronouslySubmitMarkers = createAppAsyncThunk(
   'markers/submit',
   async (_args, { getState }) => {
-    const accessToken = authorizationTokenFromState(getState);
+    const accessToken = getAccessToken();
     const params = buildPostMarkersParams(getState());
 
-    if (Object.keys(params).length === 0 || !accessToken) {
+    if (
+      Object.keys(params).length === 0 ||
+      !accessToken ||
+      accessToken === ''
+    ) {
       return;
     }
 
@@ -96,14 +101,14 @@ export const submitMarkersAction = createAppAsyncThunk<{
   home: string | undefined;
   notifications: string | undefined;
 }>('markers/submitAction', async (_args, { getState }) => {
-  const accessToken = authorizationTokenFromState(getState);
+  const accessToken = getAccessToken();
   const params = buildPostMarkersParams(getState());
 
-  if (Object.keys(params).length === 0 || accessToken === '') {
+  if (Object.keys(params).length === 0 || !accessToken || accessToken === '') {
     return { home: undefined, notifications: undefined };
   }
 
-  await api(getState).post<MarkerJSON>('/api/v1/markers', params);
+  await api().post<MarkerJSON>('/api/v1/markers', params);
 
   return {
     home: params.home?.last_read_id,
@@ -133,14 +138,11 @@ export const submitMarkers = createAppAsyncThunk(
   },
 );
 
-export const fetchMarkers = createAppAsyncThunk(
-  'markers/fetch',
-  async (_args, { getState }) => {
-    const response = await api(getState).get<Record<string, MarkerJSON>>(
-      `/api/v1/markers`,
-      { params: { timeline: ['notifications'] } },
-    );
+export const fetchMarkers = createAppAsyncThunk('markers/fetch', async () => {
+  const response = await api().get<Record<string, MarkerJSON>>(
+    `/api/v1/markers`,
+    { params: { timeline: ['notifications'] } },
+  );
 
-    return { markers: response.data };
-  },
-);
+  return { markers: response.data };
+});
diff --git a/app/javascript/mastodon/actions/mutes.js b/app/javascript/mastodon/actions/mutes.js
index 99c113f4147302..3676748cf3fe77 100644
--- a/app/javascript/mastodon/actions/mutes.js
+++ b/app/javascript/mastodon/actions/mutes.js
@@ -13,10 +13,10 @@ export const MUTES_EXPAND_SUCCESS = 'MUTES_EXPAND_SUCCESS';
 export const MUTES_EXPAND_FAIL    = 'MUTES_EXPAND_FAIL';
 
 export function fetchMutes() {
-  return (dispatch, getState) => {
+  return (dispatch) => {
     dispatch(fetchMutesRequest());
 
-    api(getState).get('/api/v1/mutes').then(response => {
+    api().get('/api/v1/mutes').then(response => {
       const next = getLinks(response).refs.find(link => link.rel === 'next');
       dispatch(importFetchedAccounts(response.data));
       dispatch(fetchMutesSuccess(response.data, next ? next.uri : null));
@@ -56,7 +56,7 @@ export function expandMutes() {
 
     dispatch(expandMutesRequest());
 
-    api(getState).get(url).then(response => {
+    api().get(url).then(response => {
       const next = getLinks(response).refs.find(link => link.rel === 'next');
       dispatch(importFetchedAccounts(response.data));
       dispatch(expandMutesSuccess(response.data, next ? next.uri : null));
diff --git a/app/javascript/mastodon/actions/notifications.js b/app/javascript/mastodon/actions/notifications.js
index b54cbe27b99ff2..fe728aa26ee7fc 100644
--- a/app/javascript/mastodon/actions/notifications.js
+++ b/app/javascript/mastodon/actions/notifications.js
@@ -216,7 +216,7 @@ export function expandNotifications({ maxId, forceLoad } = {}, done = noOp) {
 
     dispatch(expandNotificationsRequest(isLoadingMore));
 
-    api(getState).get('/api/v1/notifications', { params, signal: expandNotificationsController.signal }).then(response => {
+    api().get('/api/v1/notifications', { params, signal: expandNotificationsController.signal }).then(response => {
       const next = getLinks(response).refs.find(link => link.rel === 'next');
 
       dispatch(importFetchedAccounts(response.data.map(item => item.account)));
@@ -262,12 +262,12 @@ export function expandNotificationsFail(error, isLoadingMore) {
 }
 
 export function clearNotifications() {
-  return (dispatch, getState) => {
+  return (dispatch) => {
     dispatch({
       type: NOTIFICATIONS_CLEAR,
     });
 
-    api(getState).post('/api/v1/notifications/clear');
+    api().post('/api/v1/notifications/clear');
   };
 }
 
@@ -346,10 +346,10 @@ export function setBrowserPermission (value) {
   };
 }
 
-export const fetchNotificationPolicy = () => (dispatch, getState) => {
+export const fetchNotificationPolicy = () => (dispatch) => {
   dispatch(fetchNotificationPolicyRequest());
 
-  api(getState).get('/api/v1/notifications/policy').then(({ data }) => {
+  api().get('/api/v1/notifications/policy').then(({ data }) => {
     dispatch(fetchNotificationPolicySuccess(data));
   }).catch(err => {
     dispatch(fetchNotificationPolicyFail(err));
@@ -370,10 +370,10 @@ export const fetchNotificationPolicyFail = error => ({
   error,
 });
 
-export const updateNotificationsPolicy = params => (dispatch, getState) => {
+export const updateNotificationsPolicy = params => (dispatch) => {
   dispatch(fetchNotificationPolicyRequest());
 
-  api(getState).put('/api/v1/notifications/policy', params).then(({ data }) => {
+  api().put('/api/v1/notifications/policy', params).then(({ data }) => {
     dispatch(fetchNotificationPolicySuccess(data));
   }).catch(err => {
     dispatch(fetchNotificationPolicyFail(err));
@@ -393,7 +393,7 @@ export const fetchNotificationRequests = () => (dispatch, getState) => {
 
   dispatch(fetchNotificationRequestsRequest());
 
-  api(getState).get('/api/v1/notifications/requests', { params }).then(response => {
+  api().get('/api/v1/notifications/requests', { params }).then(response => {
     const next = getLinks(response).refs.find(link => link.rel === 'next');
     dispatch(importFetchedAccounts(response.data.map(x => x.account)));
     dispatch(fetchNotificationRequestsSuccess(response.data, next ? next.uri : null));
@@ -426,7 +426,7 @@ export const expandNotificationRequests = () => (dispatch, getState) => {
 
   dispatch(expandNotificationRequestsRequest());
 
-  api(getState).get(url).then(response => {
+  api().get(url).then(response => {
     const next = getLinks(response).refs.find(link => link.rel === 'next');
     dispatch(importFetchedAccounts(response.data.map(x => x.account)));
     dispatch(expandNotificationRequestsSuccess(response.data, next?.uri));
@@ -459,7 +459,7 @@ export const fetchNotificationRequest = id => (dispatch, getState) => {
 
   dispatch(fetchNotificationRequestRequest(id));
 
-  api(getState).get(`/api/v1/notifications/requests/${id}`).then(({ data }) => {
+  api().get(`/api/v1/notifications/requests/${id}`).then(({ data }) => {
     dispatch(fetchNotificationRequestSuccess(data));
   }).catch(err => {
     dispatch(fetchNotificationRequestFail(id, err));
@@ -482,10 +482,10 @@ export const fetchNotificationRequestFail = (id, error) => ({
   error,
 });
 
-export const acceptNotificationRequest = id => (dispatch, getState) => {
+export const acceptNotificationRequest = id => (dispatch) => {
   dispatch(acceptNotificationRequestRequest(id));
 
-  api(getState).post(`/api/v1/notifications/requests/${id}/accept`).then(() => {
+  api().post(`/api/v1/notifications/requests/${id}/accept`).then(() => {
     dispatch(acceptNotificationRequestSuccess(id));
   }).catch(err => {
     dispatch(acceptNotificationRequestFail(id, err));
@@ -508,10 +508,10 @@ export const acceptNotificationRequestFail = (id, error) => ({
   error,
 });
 
-export const dismissNotificationRequest = id => (dispatch, getState) => {
+export const dismissNotificationRequest = id => (dispatch) => {
   dispatch(dismissNotificationRequestRequest(id));
 
-  api(getState).post(`/api/v1/notifications/requests/${id}/dismiss`).then(() =>{
+  api().post(`/api/v1/notifications/requests/${id}/dismiss`).then(() =>{
     dispatch(dismissNotificationRequestSuccess(id));
   }).catch(err => {
     dispatch(dismissNotificationRequestFail(id, err));
@@ -550,7 +550,7 @@ export const fetchNotificationsForRequest = accountId => (dispatch, getState) =>
 
   dispatch(fetchNotificationsForRequestRequest());
 
-  api(getState).get('/api/v1/notifications', { params }).then(response => {
+  api().get('/api/v1/notifications', { params }).then(response => {
     const next = getLinks(response).refs.find(link => link.rel === 'next');
     dispatch(importFetchedAccounts(response.data.map(item => item.account)));
     dispatch(importFetchedStatuses(response.data.map(item => item.status).filter(status => !!status)));
@@ -586,7 +586,7 @@ export const expandNotificationsForRequest = () => (dispatch, getState) => {
 
   dispatch(expandNotificationsForRequestRequest());
 
-  api(getState).get(url).then(response => {
+  api().get(url).then(response => {
     const next = getLinks(response).refs.find(link => link.rel === 'next');
     dispatch(importFetchedAccounts(response.data.map(item => item.account)));
     dispatch(importFetchedStatuses(response.data.map(item => item.status).filter(status => !!status)));
diff --git a/app/javascript/mastodon/actions/pin_statuses.js b/app/javascript/mastodon/actions/pin_statuses.js
index baa10d15627d66..d583eab5735a9e 100644
--- a/app/javascript/mastodon/actions/pin_statuses.js
+++ b/app/javascript/mastodon/actions/pin_statuses.js
@@ -8,10 +8,10 @@ export const PINNED_STATUSES_FETCH_SUCCESS = 'PINNED_STATUSES_FETCH_SUCCESS';
 export const PINNED_STATUSES_FETCH_FAIL = 'PINNED_STATUSES_FETCH_FAIL';
 
 export function fetchPinnedStatuses() {
-  return (dispatch, getState) => {
+  return (dispatch) => {
     dispatch(fetchPinnedStatusesRequest());
 
-    api(getState).get(`/api/v1/accounts/${me}/statuses`, { params: { pinned: true } }).then(response => {
+    api().get(`/api/v1/accounts/${me}/statuses`, { params: { pinned: true } }).then(response => {
       dispatch(importFetchedStatuses(response.data));
       dispatch(fetchPinnedStatusesSuccess(response.data, null));
     }).catch(error => {
diff --git a/app/javascript/mastodon/actions/polls.js b/app/javascript/mastodon/actions/polls.js
index a37410dc90fa4d..aa49341444c7bc 100644
--- a/app/javascript/mastodon/actions/polls.js
+++ b/app/javascript/mastodon/actions/polls.js
@@ -10,10 +10,10 @@ export const POLL_FETCH_REQUEST = 'POLL_FETCH_REQUEST';
 export const POLL_FETCH_SUCCESS = 'POLL_FETCH_SUCCESS';
 export const POLL_FETCH_FAIL    = 'POLL_FETCH_FAIL';
 
-export const vote = (pollId, choices) => (dispatch, getState) => {
+export const vote = (pollId, choices) => (dispatch) => {
   dispatch(voteRequest());
 
-  api(getState).post(`/api/v1/polls/${pollId}/votes`, { choices })
+  api().post(`/api/v1/polls/${pollId}/votes`, { choices })
     .then(({ data }) => {
       dispatch(importFetchedPoll(data));
       dispatch(voteSuccess(data));
@@ -21,10 +21,10 @@ export const vote = (pollId, choices) => (dispatch, getState) => {
     .catch(err => dispatch(voteFail(err)));
 };
 
-export const fetchPoll = pollId => (dispatch, getState) => {
+export const fetchPoll = pollId => (dispatch) => {
   dispatch(fetchPollRequest());
 
-  api(getState).get(`/api/v1/polls/${pollId}`)
+  api().get(`/api/v1/polls/${pollId}`)
     .then(({ data }) => {
       dispatch(importFetchedPoll(data));
       dispatch(fetchPollSuccess(data));
diff --git a/app/javascript/mastodon/actions/reports.js b/app/javascript/mastodon/actions/reports.js
index 756b8cd05e1648..49b89b0d131bf2 100644
--- a/app/javascript/mastodon/actions/reports.js
+++ b/app/javascript/mastodon/actions/reports.js
@@ -15,10 +15,10 @@ export const initReport = (account, status) => dispatch =>
     },
   }));
 
-export const submitReport = (params, onSuccess, onFail) => (dispatch, getState) => {
+export const submitReport = (params, onSuccess, onFail) => (dispatch) => {
   dispatch(submitReportRequest());
 
-  api(getState).post('/api/v1/reports', params).then(response => {
+  api().post('/api/v1/reports', params).then(response => {
     dispatch(submitReportSuccess(response.data));
     if (onSuccess) onSuccess();
   }).catch(error => {
diff --git a/app/javascript/mastodon/actions/search.js b/app/javascript/mastodon/actions/search.js
index a34a490e760d6e..bde17ae0db17a2 100644
--- a/app/javascript/mastodon/actions/search.js
+++ b/app/javascript/mastodon/actions/search.js
@@ -46,7 +46,7 @@ export function submitSearch(type) {
 
     dispatch(fetchSearchRequest(type));
 
-    api(getState).get('/api/v2/search', {
+    api().get('/api/v2/search', {
       params: {
         q: value,
         resolve: signedIn,
@@ -99,7 +99,7 @@ export const expandSearch = type => (dispatch, getState) => {
 
   dispatch(expandSearchRequest(type));
 
-  api(getState).get('/api/v2/search', {
+  api().get('/api/v2/search', {
     params: {
       q: value,
       type,
@@ -156,7 +156,7 @@ export const openURL = (value, history, onFailure) => (dispatch, getState) => {
 
   dispatch(fetchSearchRequest());
 
-  api(getState).get('/api/v2/search', { params: { q: value, resolve: true } }).then(response => {
+  api().get('/api/v2/search', { params: { q: value, resolve: true } }).then(response => {
     if (response.data.accounts?.length > 0) {
       dispatch(importFetchedAccounts(response.data.accounts));
       history.push(`/@${response.data.accounts[0].acct}`);
diff --git a/app/javascript/mastodon/actions/server.js b/app/javascript/mastodon/actions/server.js
index 65f3efc3a72a3d..32ee093afa8423 100644
--- a/app/javascript/mastodon/actions/server.js
+++ b/app/javascript/mastodon/actions/server.js
@@ -25,7 +25,7 @@ export const fetchServer = () => (dispatch, getState) => {
 
   dispatch(fetchServerRequest());
 
-  api(getState)
+  api()
     .get('/api/v2/instance').then(({ data }) => {
       if (data.contact.account) dispatch(importFetchedAccount(data.contact.account));
       dispatch(fetchServerSuccess(data));
@@ -46,10 +46,10 @@ const fetchServerFail = error => ({
   error,
 });
 
-export const fetchServerTranslationLanguages = () => (dispatch, getState) => {
+export const fetchServerTranslationLanguages = () => (dispatch) => {
   dispatch(fetchServerTranslationLanguagesRequest());
 
-  api(getState)
+  api()
     .get('/api/v1/instance/translation_languages').then(({ data }) => {
       dispatch(fetchServerTranslationLanguagesSuccess(data));
     }).catch(err => dispatch(fetchServerTranslationLanguagesFail(err)));
@@ -76,7 +76,7 @@ export const fetchExtendedDescription = () => (dispatch, getState) => {
 
   dispatch(fetchExtendedDescriptionRequest());
 
-  api(getState)
+  api()
     .get('/api/v1/instance/extended_description')
     .then(({ data }) => dispatch(fetchExtendedDescriptionSuccess(data)))
     .catch(err => dispatch(fetchExtendedDescriptionFail(err)));
@@ -103,7 +103,7 @@ export const fetchDomainBlocks = () => (dispatch, getState) => {
 
   dispatch(fetchDomainBlocksRequest());
 
-  api(getState)
+  api()
     .get('/api/v1/instance/domain_blocks')
     .then(({ data }) => dispatch(fetchDomainBlocksSuccess(true, data)))
     .catch(err => {
diff --git a/app/javascript/mastodon/actions/statuses.js b/app/javascript/mastodon/actions/statuses.js
index 3aed8073588a28..a60b80dc2c07ba 100644
--- a/app/javascript/mastodon/actions/statuses.js
+++ b/app/javascript/mastodon/actions/statuses.js
@@ -59,7 +59,7 @@ export function fetchStatus(id, forceFetch = false) {
 
     dispatch(fetchStatusRequest(id, skipLoading));
 
-    api(getState).get(`/api/v1/statuses/${id}`).then(response => {
+    api().get(`/api/v1/statuses/${id}`).then(response => {
       dispatch(importFetchedStatus(response.data));
       dispatch(fetchStatusSuccess(skipLoading));
     }).catch(error => {
@@ -102,7 +102,7 @@ export const editStatus = (id, routerHistory) => (dispatch, getState) => {
 
   dispatch(fetchStatusSourceRequest());
 
-  api(getState).get(`/api/v1/statuses/${id}/source`).then(response => {
+  api().get(`/api/v1/statuses/${id}/source`).then(response => {
     dispatch(fetchStatusSourceSuccess());
     ensureComposeIsVisible(getState, routerHistory);
     dispatch(setComposeToStatus(status, response.data.text, response.data.spoiler_text));
@@ -134,7 +134,7 @@ export function deleteStatus(id, routerHistory, withRedraft = false) {
 
     dispatch(deleteStatusRequest(id));
 
-    api(getState).delete(`/api/v1/statuses/${id}`).then(response => {
+    api().delete(`/api/v1/statuses/${id}`).then(response => {
       dispatch(deleteStatusSuccess(id));
       dispatch(deleteFromTimelines(id));
       dispatch(importFetchedAccount(response.data.account));
@@ -175,10 +175,10 @@ export const updateStatus = status => dispatch =>
   dispatch(importFetchedStatus(status));
 
 export function fetchContext(id) {
-  return (dispatch, getState) => {
+  return (dispatch) => {
     dispatch(fetchContextRequest(id));
 
-    api(getState).get(`/api/v1/statuses/${id}/context`).then(response => {
+    api().get(`/api/v1/statuses/${id}/context`).then(response => {
       dispatch(importFetchedStatuses(response.data.ancestors.concat(response.data.descendants)));
       dispatch(fetchContextSuccess(id, response.data.ancestors, response.data.descendants));
 
@@ -219,10 +219,10 @@ export function fetchContextFail(id, error) {
 }
 
 export function muteStatus(id) {
-  return (dispatch, getState) => {
+  return (dispatch) => {
     dispatch(muteStatusRequest(id));
 
-    api(getState).post(`/api/v1/statuses/${id}/mute`).then(() => {
+    api().post(`/api/v1/statuses/${id}/mute`).then(() => {
       dispatch(muteStatusSuccess(id));
     }).catch(error => {
       dispatch(muteStatusFail(id, error));
@@ -253,10 +253,10 @@ export function muteStatusFail(id, error) {
 }
 
 export function unmuteStatus(id) {
-  return (dispatch, getState) => {
+  return (dispatch) => {
     dispatch(unmuteStatusRequest(id));
 
-    api(getState).post(`/api/v1/statuses/${id}/unmute`).then(() => {
+    api().post(`/api/v1/statuses/${id}/unmute`).then(() => {
       dispatch(unmuteStatusSuccess(id));
     }).catch(error => {
       dispatch(unmuteStatusFail(id, error));
@@ -316,10 +316,10 @@ export function toggleStatusCollapse(id, isCollapsed) {
   };
 }
 
-export const translateStatus = id => (dispatch, getState) => {
+export const translateStatus = id => (dispatch) => {
   dispatch(translateStatusRequest(id));
 
-  api(getState).post(`/api/v1/statuses/${id}/translate`).then(response => {
+  api().post(`/api/v1/statuses/${id}/translate`).then(response => {
     dispatch(translateStatusSuccess(id, response.data));
   }).catch(error => {
     dispatch(translateStatusFail(id, error));
diff --git a/app/javascript/mastodon/actions/suggestions.js b/app/javascript/mastodon/actions/suggestions.js
index 8eafe38b21ae0e..258ffa901de5d1 100644
--- a/app/javascript/mastodon/actions/suggestions.js
+++ b/app/javascript/mastodon/actions/suggestions.js
@@ -10,10 +10,10 @@ export const SUGGESTIONS_FETCH_FAIL    = 'SUGGESTIONS_FETCH_FAIL';
 export const SUGGESTIONS_DISMISS = 'SUGGESTIONS_DISMISS';
 
 export function fetchSuggestions(withRelationships = false) {
-  return (dispatch, getState) => {
+  return (dispatch) => {
     dispatch(fetchSuggestionsRequest());
 
-    api(getState).get('/api/v2/suggestions', { params: { limit: 20 } }).then(response => {
+    api().get('/api/v2/suggestions', { params: { limit: 20 } }).then(response => {
       dispatch(importFetchedAccounts(response.data.map(x => x.account)));
       dispatch(fetchSuggestionsSuccess(response.data));
 
@@ -48,11 +48,11 @@ export function fetchSuggestionsFail(error) {
   };
 }
 
-export const dismissSuggestion = accountId => (dispatch, getState) => {
+export const dismissSuggestion = accountId => (dispatch) => {
   dispatch({
     type: SUGGESTIONS_DISMISS,
     id: accountId,
   });
 
-  api(getState).delete(`/api/v1/suggestions/${accountId}`).catch(() => {});
+  api().delete(`/api/v1/suggestions/${accountId}`).catch(() => {});
 };
diff --git a/app/javascript/mastodon/actions/tags.js b/app/javascript/mastodon/actions/tags.js
index dda8c924bb59a4..d18d7e514fc8f2 100644
--- a/app/javascript/mastodon/actions/tags.js
+++ b/app/javascript/mastodon/actions/tags.js
@@ -20,10 +20,10 @@ export const HASHTAG_UNFOLLOW_REQUEST = 'HASHTAG_UNFOLLOW_REQUEST';
 export const HASHTAG_UNFOLLOW_SUCCESS = 'HASHTAG_UNFOLLOW_SUCCESS';
 export const HASHTAG_UNFOLLOW_FAIL    = 'HASHTAG_UNFOLLOW_FAIL';
 
-export const fetchHashtag = name => (dispatch, getState) => {
+export const fetchHashtag = name => (dispatch) => {
   dispatch(fetchHashtagRequest());
 
-  api(getState).get(`/api/v1/tags/${name}`).then(({ data }) => {
+  api().get(`/api/v1/tags/${name}`).then(({ data }) => {
     dispatch(fetchHashtagSuccess(name, data));
   }).catch(err => {
     dispatch(fetchHashtagFail(err));
@@ -45,10 +45,10 @@ export const fetchHashtagFail = error => ({
   error,
 });
 
-export const fetchFollowedHashtags = () => (dispatch, getState) => {
+export const fetchFollowedHashtags = () => (dispatch) => {
   dispatch(fetchFollowedHashtagsRequest());
 
-  api(getState).get('/api/v1/followed_tags').then(response => {
+  api().get('/api/v1/followed_tags').then(response => {
     const next = getLinks(response).refs.find(link => link.rel === 'next');
     dispatch(fetchFollowedHashtagsSuccess(response.data, next ? next.uri : null));
   }).catch(err => {
@@ -87,7 +87,7 @@ export function expandFollowedHashtags() {
 
     dispatch(expandFollowedHashtagsRequest());
 
-    api(getState).get(url).then(response => {
+    api().get(url).then(response => {
       const next = getLinks(response).refs.find(link => link.rel === 'next');
       dispatch(expandFollowedHashtagsSuccess(response.data, next ? next.uri : null));
     }).catch(error => {
@@ -117,10 +117,10 @@ export function expandFollowedHashtagsFail(error) {
   };
 }
 
-export const followHashtag = name => (dispatch, getState) => {
+export const followHashtag = name => (dispatch) => {
   dispatch(followHashtagRequest(name));
 
-  api(getState).post(`/api/v1/tags/${name}/follow`).then(({ data }) => {
+  api().post(`/api/v1/tags/${name}/follow`).then(({ data }) => {
     dispatch(followHashtagSuccess(name, data));
   }).catch(err => {
     dispatch(followHashtagFail(name, err));
@@ -144,10 +144,10 @@ export const followHashtagFail = (name, error) => ({
   error,
 });
 
-export const unfollowHashtag = name => (dispatch, getState) => {
+export const unfollowHashtag = name => (dispatch) => {
   dispatch(unfollowHashtagRequest(name));
 
-  api(getState).post(`/api/v1/tags/${name}/unfollow`).then(({ data }) => {
+  api().post(`/api/v1/tags/${name}/unfollow`).then(({ data }) => {
     dispatch(unfollowHashtagSuccess(name, data));
   }).catch(err => {
     dispatch(unfollowHashtagFail(name, err));
diff --git a/app/javascript/mastodon/actions/timelines.js b/app/javascript/mastodon/actions/timelines.js
index 4ce7c3cf8414a3..dc37cdf1f1f471 100644
--- a/app/javascript/mastodon/actions/timelines.js
+++ b/app/javascript/mastodon/actions/timelines.js
@@ -114,7 +114,7 @@ export function expandTimeline(timelineId, path, params = {}, done = noOp) {
 
     dispatch(expandTimelineRequest(timelineId, isLoadingMore));
 
-    api(getState).get(path, { params }).then(response => {
+    api().get(path, { params }).then(response => {
       const next = getLinks(response).refs.find(link => link.rel === 'next');
 
       dispatch(importFetchedStatuses(response.data));
diff --git a/app/javascript/mastodon/actions/trends.js b/app/javascript/mastodon/actions/trends.js
index d314423884efe1..0b840b41ce6085 100644
--- a/app/javascript/mastodon/actions/trends.js
+++ b/app/javascript/mastodon/actions/trends.js
@@ -18,10 +18,10 @@ export const TRENDS_STATUSES_EXPAND_REQUEST = 'TRENDS_STATUSES_EXPAND_REQUEST';
 export const TRENDS_STATUSES_EXPAND_SUCCESS = 'TRENDS_STATUSES_EXPAND_SUCCESS';
 export const TRENDS_STATUSES_EXPAND_FAIL    = 'TRENDS_STATUSES_EXPAND_FAIL';
 
-export const fetchTrendingHashtags = () => (dispatch, getState) => {
+export const fetchTrendingHashtags = () => (dispatch) => {
   dispatch(fetchTrendingHashtagsRequest());
 
-  api(getState)
+  api()
     .get('/api/v1/trends/tags')
     .then(({ data }) => dispatch(fetchTrendingHashtagsSuccess(data)))
     .catch(err => dispatch(fetchTrendingHashtagsFail(err)));
@@ -45,10 +45,10 @@ export const fetchTrendingHashtagsFail = error => ({
   skipAlert: true,
 });
 
-export const fetchTrendingLinks = () => (dispatch, getState) => {
+export const fetchTrendingLinks = () => (dispatch) => {
   dispatch(fetchTrendingLinksRequest());
 
-  api(getState)
+  api()
     .get('/api/v1/trends/links')
     .then(({ data }) => dispatch(fetchTrendingLinksSuccess(data)))
     .catch(err => dispatch(fetchTrendingLinksFail(err)));
@@ -79,7 +79,7 @@ export const fetchTrendingStatuses = () => (dispatch, getState) => {
 
   dispatch(fetchTrendingStatusesRequest());
 
-  api(getState).get('/api/v1/trends/statuses').then(response => {
+  api().get('/api/v1/trends/statuses').then(response => {
     const next = getLinks(response).refs.find(link => link.rel === 'next');
     dispatch(importFetchedStatuses(response.data));
     dispatch(fetchTrendingStatusesSuccess(response.data, next ? next.uri : null));
@@ -115,7 +115,7 @@ export const expandTrendingStatuses = () => (dispatch, getState) => {
 
   dispatch(expandTrendingStatusesRequest());
 
-  api(getState).get(url).then(response => {
+  api().get(url).then(response => {
     const next = getLinks(response).refs.find(link => link.rel === 'next');
     dispatch(importFetchedStatuses(response.data));
     dispatch(expandTrendingStatusesSuccess(response.data, next ? next.uri : null));
diff --git a/app/javascript/mastodon/api.ts b/app/javascript/mastodon/api.ts
index de597a3e3b62f5..ccff68c373e5d6 100644
--- a/app/javascript/mastodon/api.ts
+++ b/app/javascript/mastodon/api.ts
@@ -2,8 +2,8 @@ import type { AxiosResponse, RawAxiosRequestHeaders } from 'axios';
 import axios from 'axios';
 import LinkHeader from 'http-link-header';
 
+import { getAccessToken } from './initial_state';
 import ready from './ready';
-import type { GetState } from './store';
 
 export const getLinks = (response: AxiosResponse) => {
   const value = response.headers.link as string | undefined;
@@ -29,30 +29,22 @@ const setCSRFHeader = () => {
 
 void ready(setCSRFHeader);
 
-export const authorizationTokenFromState = (getState?: GetState) => {
-  return (
-    getState && (getState().meta.get('access_token', '') as string | false)
-  );
-};
+const authorizationTokenFromInitialState = (): RawAxiosRequestHeaders => {
+  const accessToken = getAccessToken();
 
-const authorizationHeaderFromState = (getState?: GetState) => {
-  const accessToken = authorizationTokenFromState(getState);
-
-  if (!accessToken) {
-    return {};
-  }
+  if (!accessToken) return {};
 
   return {
     Authorization: `Bearer ${accessToken}`,
-  } as RawAxiosRequestHeaders;
+  };
 };
 
 // eslint-disable-next-line import/no-default-export
-export default function api(getState: GetState) {
+export default function api() {
   return axios.create({
     headers: {
       ...csrfHeader,
-      ...authorizationHeaderFromState(getState),
+      ...authorizationTokenFromInitialState(),
     },
 
     transformResponse: [
diff --git a/app/javascript/mastodon/identity_context.tsx b/app/javascript/mastodon/identity_context.tsx
index 564b7895c9b4c1..7f28ab77a34a7d 100644
--- a/app/javascript/mastodon/identity_context.tsx
+++ b/app/javascript/mastodon/identity_context.tsx
@@ -9,7 +9,6 @@ export interface IdentityContextType {
   signedIn: boolean;
   accountId: string | undefined;
   disabledAccountId: string | undefined;
-  accessToken: string | undefined;
   permissions: number;
 }
 
@@ -17,14 +16,12 @@ export const identityContextPropShape = PropTypes.shape({
   signedIn: PropTypes.bool.isRequired,
   accountId: PropTypes.string,
   disabledAccountId: PropTypes.string,
-  accessToken: PropTypes.string,
 }).isRequired;
 
 export const createIdentityContext = (state: InitialState) => ({
   signedIn: !!state.meta.me,
   accountId: state.meta.me,
   disabledAccountId: state.meta.disabled_account_id,
-  accessToken: state.meta.access_token,
   permissions: state.role?.permissions ?? 0,
 });
 
@@ -33,7 +30,6 @@ export const IdentityContext = createContext<IdentityContextType>({
   permissions: 0,
   accountId: undefined,
   disabledAccountId: undefined,
-  accessToken: undefined,
 });
 
 export const useIdentity = () => useContext(IdentityContext);
diff --git a/app/javascript/mastodon/initial_state.js b/app/javascript/mastodon/initial_state.js
index 5d60565e17a6bf..9ec3df0df87814 100644
--- a/app/javascript/mastodon/initial_state.js
+++ b/app/javascript/mastodon/initial_state.js
@@ -117,4 +117,11 @@ export const criticalUpdatesPending = initialState?.critical_updates_pending;
 export const statusPageUrl = getMeta('status_page_url');
 export const sso_redirect = getMeta('sso_redirect');
 
+/**
+ * @returns {string | undefined}
+ */
+export function getAccessToken() {
+  return getMeta('access_token');
+}
+
 export default initialState;
diff --git a/app/javascript/mastodon/reducers/meta.js b/app/javascript/mastodon/reducers/meta.js
index 96baf2f1152cbb..ddb78845929464 100644
--- a/app/javascript/mastodon/reducers/meta.js
+++ b/app/javascript/mastodon/reducers/meta.js
@@ -6,7 +6,6 @@ import { layoutFromWindow } from 'mastodon/is_mobile';
 
 const initialState = ImmutableMap({
   streaming_api_base_url: null,
-  access_token: null,
   layout: layoutFromWindow(),
   permissions: '0',
 });
@@ -14,7 +13,8 @@ const initialState = ImmutableMap({
 export default function meta(state = initialState, action) {
   switch(action.type) {
   case STORE_HYDRATE:
-    return state.merge(action.state.get('meta')).set('permissions', action.state.getIn(['role', 'permissions']));
+    // we do not want `access_token` to be stored in the state
+    return state.merge(action.state.get('meta')).delete('access_token').set('permissions', action.state.getIn(['role', 'permissions']));
   case changeLayout.type:
     return state.set('layout', action.payload.layout);
   default:
diff --git a/app/javascript/mastodon/stream.js b/app/javascript/mastodon/stream.js
index ff3af5fd885c96..40d69136a84808 100644
--- a/app/javascript/mastodon/stream.js
+++ b/app/javascript/mastodon/stream.js
@@ -2,6 +2,8 @@
 
 import WebSocketClient from '@gamestdio/websocket';
 
+import { getAccessToken } from './initial_state';
+
 /**
  * @type {WebSocketClient | undefined}
  */
@@ -145,9 +147,11 @@ const channelNameWithInlineParams = (channelName, params) => {
 // @ts-expect-error
 export const connectStream = (channelName, params, callbacks) => (dispatch, getState) => {
   const streamingAPIBaseURL = getState().getIn(['meta', 'streaming_api_base_url']);
-  const accessToken = getState().getIn(['meta', 'access_token']);
+  const accessToken = getAccessToken();
   const { onConnect, onReceive, onDisconnect } = callbacks(dispatch, getState);
 
+  if(!accessToken) throw new Error("Trying to connect to the streaming server but no access token is available.");
+
   // If we cannot use a websockets connection, we must fall back
   // to using individual connections for each channel
   if (!streamingAPIBaseURL.startsWith('ws')) {
diff --git a/app/javascript/mastodon/test_helpers.tsx b/app/javascript/mastodon/test_helpers.tsx
index bfea3f6bf4dfe4..93b5a8453accf1 100644
--- a/app/javascript/mastodon/test_helpers.tsx
+++ b/app/javascript/mastodon/test_helpers.tsx
@@ -14,7 +14,6 @@ function render(
   const fakeIdentity = {
     signedIn: signedIn,
     accountId: '123',
-    accessToken: 'test-access-token',
     disabledAccountId: undefined,
     permissions: 0,
   };

From 3e9298370dafb0e7c7a1bc34e524266e96fd50b5 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Wed, 22 May 2024 16:45:18 +0200
Subject: [PATCH 1086/2191] [Glitch] Remove the access token from Redux &
 context

Port 2c5ab8f647841ea8075ece50ccc9e12c21af8720 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/actions/account_notes.ts  |  4 +-
 .../flavours/glitch/actions/accounts.js       | 72 +++++++++----------
 .../flavours/glitch/actions/announcements.js  | 14 ++--
 .../flavours/glitch/actions/blocks.js         |  6 +-
 .../flavours/glitch/actions/bookmarks.js      |  4 +-
 .../flavours/glitch/actions/compose.js        | 16 ++---
 .../flavours/glitch/actions/conversations.js  | 10 +--
 .../flavours/glitch/actions/custom_emojis.js  |  4 +-
 .../flavours/glitch/actions/directory.js      |  6 +-
 .../flavours/glitch/actions/domain_blocks.js  | 10 +--
 .../flavours/glitch/actions/favourites.js     |  4 +-
 .../flavours/glitch/actions/featured_tags.js  |  2 +-
 .../flavours/glitch/actions/filters.js        | 12 ++--
 .../flavours/glitch/actions/history.js        |  2 +-
 .../flavours/glitch/actions/interactions.js   | 44 ++++++------
 .../flavours/glitch/actions/lists.js          | 39 +++++-----
 .../flavours/glitch/actions/markers.ts        | 34 ++++-----
 .../flavours/glitch/actions/mutes.js          |  6 +-
 .../flavours/glitch/actions/notifications.js  | 34 ++++-----
 .../flavours/glitch/actions/pin_statuses.js   |  4 +-
 .../flavours/glitch/actions/polls.js          |  8 +--
 .../flavours/glitch/actions/reports.js        |  4 +-
 .../flavours/glitch/actions/search.js         |  6 +-
 .../flavours/glitch/actions/server.js         | 10 +--
 .../flavours/glitch/actions/statuses.js       | 22 +++---
 .../flavours/glitch/actions/suggestions.js    |  8 +--
 .../flavours/glitch/actions/tags.js           | 18 ++---
 .../flavours/glitch/actions/timelines.js      |  2 +-
 .../flavours/glitch/actions/trends.js         | 12 ++--
 app/javascript/flavours/glitch/api.ts         | 22 ++----
 .../flavours/glitch/identity_context.tsx      |  4 --
 .../flavours/glitch/initial_state.js          |  7 ++
 .../flavours/glitch/reducers/meta.js          |  4 +-
 app/javascript/flavours/glitch/stream.js      |  6 +-
 .../flavours/glitch/test_helpers.tsx          |  2 -
 35 files changed, 230 insertions(+), 232 deletions(-)

diff --git a/app/javascript/flavours/glitch/actions/account_notes.ts b/app/javascript/flavours/glitch/actions/account_notes.ts
index 1fb683e0d33d9c..b3e79a92c6dc26 100644
--- a/app/javascript/flavours/glitch/actions/account_notes.ts
+++ b/app/javascript/flavours/glitch/actions/account_notes.ts
@@ -5,8 +5,8 @@ import api from '../api';
 
 export const submitAccountNote = createAppAsyncThunk(
   'account_note/submit',
-  async (args: { id: string; value: string }, { getState }) => {
-    const response = await api(getState).post<ApiRelationshipJSON>(
+  async (args: { id: string; value: string }) => {
+    const response = await api().post<ApiRelationshipJSON>(
       `/api/v1/accounts/${args.id}/note`,
       {
         comment: args.value,
diff --git a/app/javascript/flavours/glitch/actions/accounts.js b/app/javascript/flavours/glitch/actions/accounts.js
index bb26035e976a8e..7c31c16998d0a3 100644
--- a/app/javascript/flavours/glitch/actions/accounts.js
+++ b/app/javascript/flavours/glitch/actions/accounts.js
@@ -89,11 +89,11 @@ export const ACCOUNT_REVEAL = 'ACCOUNT_REVEAL';
 export * from './accounts_typed';
 
 export function fetchAccount(id) {
-  return (dispatch, getState) => {
+  return (dispatch) => {
     dispatch(fetchRelationships([id]));
     dispatch(fetchAccountRequest(id));
 
-    api(getState).get(`/api/v1/accounts/${id}`).then(response => {
+    api().get(`/api/v1/accounts/${id}`).then(response => {
       dispatch(importFetchedAccount(response.data));
       dispatch(fetchAccountSuccess());
     }).catch(error => {
@@ -102,10 +102,10 @@ export function fetchAccount(id) {
   };
 }
 
-export const lookupAccount = acct => (dispatch, getState) => {
+export const lookupAccount = acct => (dispatch) => {
   dispatch(lookupAccountRequest(acct));
 
-  api(getState).get('/api/v1/accounts/lookup', { params: { acct } }).then(response => {
+  api().get('/api/v1/accounts/lookup', { params: { acct } }).then(response => {
     dispatch(fetchRelationships([response.data.id]));
     dispatch(importFetchedAccount(response.data));
     dispatch(lookupAccountSuccess());
@@ -159,7 +159,7 @@ export function followAccount(id, options = { reblogs: true }) {
 
     dispatch(followAccountRequest({ id, locked }));
 
-    api(getState).post(`/api/v1/accounts/${id}/follow`, options).then(response => {
+    api().post(`/api/v1/accounts/${id}/follow`, options).then(response => {
       dispatch(followAccountSuccess({relationship: response.data, alreadyFollowing}));
     }).catch(error => {
       dispatch(followAccountFail({ id, error, locked }));
@@ -171,7 +171,7 @@ export function unfollowAccount(id) {
   return (dispatch, getState) => {
     dispatch(unfollowAccountRequest(id));
 
-    api(getState).post(`/api/v1/accounts/${id}/unfollow`).then(response => {
+    api().post(`/api/v1/accounts/${id}/unfollow`).then(response => {
       dispatch(unfollowAccountSuccess({relationship: response.data, statuses: getState().get('statuses')}));
     }).catch(error => {
       dispatch(unfollowAccountFail({ id, error }));
@@ -183,7 +183,7 @@ export function blockAccount(id) {
   return (dispatch, getState) => {
     dispatch(blockAccountRequest(id));
 
-    api(getState).post(`/api/v1/accounts/${id}/block`).then(response => {
+    api().post(`/api/v1/accounts/${id}/block`).then(response => {
       // Pass in entire statuses map so we can use it to filter stuff in different parts of the reducers
       dispatch(blockAccountSuccess({ relationship: response.data, statuses: getState().get('statuses') }));
     }).catch(error => {
@@ -193,10 +193,10 @@ export function blockAccount(id) {
 }
 
 export function unblockAccount(id) {
-  return (dispatch, getState) => {
+  return (dispatch) => {
     dispatch(unblockAccountRequest(id));
 
-    api(getState).post(`/api/v1/accounts/${id}/unblock`).then(response => {
+    api().post(`/api/v1/accounts/${id}/unblock`).then(response => {
       dispatch(unblockAccountSuccess({ relationship: response.data }));
     }).catch(error => {
       dispatch(unblockAccountFail({ id, error }));
@@ -236,7 +236,7 @@ export function muteAccount(id, notifications, duration=0) {
   return (dispatch, getState) => {
     dispatch(muteAccountRequest(id));
 
-    api(getState).post(`/api/v1/accounts/${id}/mute`, { notifications, duration }).then(response => {
+    api().post(`/api/v1/accounts/${id}/mute`, { notifications, duration }).then(response => {
       // Pass in entire statuses map so we can use it to filter stuff in different parts of the reducers
       dispatch(muteAccountSuccess({ relationship: response.data, statuses: getState().get('statuses') }));
     }).catch(error => {
@@ -246,10 +246,10 @@ export function muteAccount(id, notifications, duration=0) {
 }
 
 export function unmuteAccount(id) {
-  return (dispatch, getState) => {
+  return (dispatch) => {
     dispatch(unmuteAccountRequest(id));
 
-    api(getState).post(`/api/v1/accounts/${id}/unmute`).then(response => {
+    api().post(`/api/v1/accounts/${id}/unmute`).then(response => {
       dispatch(unmuteAccountSuccess({ relationship: response.data }));
     }).catch(error => {
       dispatch(unmuteAccountFail({ id, error }));
@@ -287,10 +287,10 @@ export function unmuteAccountFail(error) {
 
 
 export function fetchFollowers(id) {
-  return (dispatch, getState) => {
+  return (dispatch) => {
     dispatch(fetchFollowersRequest(id));
 
-    api(getState).get(`/api/v1/accounts/${id}/followers`).then(response => {
+    api().get(`/api/v1/accounts/${id}/followers`).then(response => {
       const next = getLinks(response).refs.find(link => link.rel === 'next');
 
       dispatch(importFetchedAccounts(response.data));
@@ -337,7 +337,7 @@ export function expandFollowers(id) {
 
     dispatch(expandFollowersRequest(id));
 
-    api(getState).get(url).then(response => {
+    api().get(url).then(response => {
       const next = getLinks(response).refs.find(link => link.rel === 'next');
 
       dispatch(importFetchedAccounts(response.data));
@@ -374,10 +374,10 @@ export function expandFollowersFail(id, error) {
 }
 
 export function fetchFollowing(id) {
-  return (dispatch, getState) => {
+  return (dispatch) => {
     dispatch(fetchFollowingRequest(id));
 
-    api(getState).get(`/api/v1/accounts/${id}/following`).then(response => {
+    api().get(`/api/v1/accounts/${id}/following`).then(response => {
       const next = getLinks(response).refs.find(link => link.rel === 'next');
 
       dispatch(importFetchedAccounts(response.data));
@@ -424,7 +424,7 @@ export function expandFollowing(id) {
 
     dispatch(expandFollowingRequest(id));
 
-    api(getState).get(url).then(response => {
+    api().get(url).then(response => {
       const next = getLinks(response).refs.find(link => link.rel === 'next');
 
       dispatch(importFetchedAccounts(response.data));
@@ -473,7 +473,7 @@ export function fetchRelationships(accountIds) {
 
     dispatch(fetchRelationshipsRequest(newAccountIds));
 
-    api(getState).get(`/api/v1/accounts/relationships?with_suspended=true&${newAccountIds.map(id => `id[]=${id}`).join('&')}`).then(response => {
+    api().get(`/api/v1/accounts/relationships?with_suspended=true&${newAccountIds.map(id => `id[]=${id}`).join('&')}`).then(response => {
       dispatch(fetchRelationshipsSuccess({ relationships: response.data }));
     }).catch(error => {
       dispatch(fetchRelationshipsFail(error));
@@ -499,10 +499,10 @@ export function fetchRelationshipsFail(error) {
 }
 
 export function fetchFollowRequests() {
-  return (dispatch, getState) => {
+  return (dispatch) => {
     dispatch(fetchFollowRequestsRequest());
 
-    api(getState).get('/api/v1/follow_requests').then(response => {
+    api().get('/api/v1/follow_requests').then(response => {
       const next = getLinks(response).refs.find(link => link.rel === 'next');
       dispatch(importFetchedAccounts(response.data));
       dispatch(fetchFollowRequestsSuccess(response.data, next ? next.uri : null));
@@ -541,7 +541,7 @@ export function expandFollowRequests() {
 
     dispatch(expandFollowRequestsRequest());
 
-    api(getState).get(url).then(response => {
+    api().get(url).then(response => {
       const next = getLinks(response).refs.find(link => link.rel === 'next');
       dispatch(importFetchedAccounts(response.data));
       dispatch(expandFollowRequestsSuccess(response.data, next ? next.uri : null));
@@ -571,10 +571,10 @@ export function expandFollowRequestsFail(error) {
 }
 
 export function authorizeFollowRequest(id) {
-  return (dispatch, getState) => {
+  return (dispatch) => {
     dispatch(authorizeFollowRequestRequest(id));
 
-    api(getState)
+    api()
       .post(`/api/v1/follow_requests/${id}/authorize`)
       .then(() => dispatch(authorizeFollowRequestSuccess({ id })))
       .catch(error => dispatch(authorizeFollowRequestFail(id, error)));
@@ -598,10 +598,10 @@ export function authorizeFollowRequestFail(id, error) {
 
 
 export function rejectFollowRequest(id) {
-  return (dispatch, getState) => {
+  return (dispatch) => {
     dispatch(rejectFollowRequestRequest(id));
 
-    api(getState)
+    api()
       .post(`/api/v1/follow_requests/${id}/reject`)
       .then(() => dispatch(rejectFollowRequestSuccess({ id })))
       .catch(error => dispatch(rejectFollowRequestFail(id, error)));
@@ -624,10 +624,10 @@ export function rejectFollowRequestFail(id, error) {
 }
 
 export function pinAccount(id) {
-  return (dispatch, getState) => {
+  return (dispatch) => {
     dispatch(pinAccountRequest(id));
 
-    api(getState).post(`/api/v1/accounts/${id}/pin`).then(response => {
+    api().post(`/api/v1/accounts/${id}/pin`).then(response => {
       dispatch(pinAccountSuccess({ relationship: response.data }));
     }).catch(error => {
       dispatch(pinAccountFail(error));
@@ -636,10 +636,10 @@ export function pinAccount(id) {
 }
 
 export function unpinAccount(id) {
-  return (dispatch, getState) => {
+  return (dispatch) => {
     dispatch(unpinAccountRequest(id));
 
-    api(getState).post(`/api/v1/accounts/${id}/unpin`).then(response => {
+    api().post(`/api/v1/accounts/${id}/unpin`).then(response => {
       dispatch(unpinAccountSuccess({ relationship: response.data }));
     }).catch(error => {
       dispatch(unpinAccountFail(error));
@@ -676,10 +676,10 @@ export function unpinAccountFail(error) {
 }
 
 export function fetchPinnedAccounts() {
-  return (dispatch, getState) => {
+  return (dispatch) => {
     dispatch(fetchPinnedAccountsRequest());
 
-    api(getState).get('/api/v1/endorsements', { params: { limit: 0 } }).then(response => {
+    api().get('/api/v1/endorsements', { params: { limit: 0 } }).then(response => {
       dispatch(importFetchedAccounts(response.data));
       dispatch(fetchPinnedAccountsSuccess(response.data));
     }).catch(err => dispatch(fetchPinnedAccountsFail(err)));
@@ -707,7 +707,7 @@ export function fetchPinnedAccountsFail(error) {
   };
 }
 
-export const updateAccount = ({ displayName, note, avatar, header, discoverable, indexable }) => (dispatch, getState) => {
+export const updateAccount = ({ displayName, note, avatar, header, discoverable, indexable }) => (dispatch) => {
   const data = new FormData();
 
   data.append('display_name', displayName);
@@ -717,13 +717,13 @@ export const updateAccount = ({ displayName, note, avatar, header, discoverable,
   data.append('discoverable', discoverable);
   data.append('indexable', indexable);
 
-  return api(getState).patch('/api/v1/accounts/update_credentials', data).then(response => {
+  return api().patch('/api/v1/accounts/update_credentials', data).then(response => {
     dispatch(importFetchedAccount(response.data));
   });
 };
 
 export function fetchPinnedAccountsSuggestions(q) {
-  return (dispatch, getState) => {
+  return (dispatch) => {
     dispatch(fetchPinnedAccountsSuggestionsRequest());
 
     const params = {
@@ -733,7 +733,7 @@ export function fetchPinnedAccountsSuggestions(q) {
       following: true,
     };
 
-    api(getState).get('/api/v1/accounts/search', { params }).then(response => {
+    api().get('/api/v1/accounts/search', { params }).then(response => {
       dispatch(importFetchedAccounts(response.data));
       dispatch(fetchPinnedAccountsSuggestionsSuccess(q, response.data));
     }).catch(err => dispatch(fetchPinnedAccountsSuggestionsFail(err)));
diff --git a/app/javascript/flavours/glitch/actions/announcements.js b/app/javascript/flavours/glitch/actions/announcements.js
index 339c5f3adc5a8e..7657b05dc42364 100644
--- a/app/javascript/flavours/glitch/actions/announcements.js
+++ b/app/javascript/flavours/glitch/actions/announcements.js
@@ -26,10 +26,10 @@ export const ANNOUNCEMENTS_TOGGLE_SHOW = 'ANNOUNCEMENTS_TOGGLE_SHOW';
 
 const noOp = () => {};
 
-export const fetchAnnouncements = (done = noOp) => (dispatch, getState) => {
+export const fetchAnnouncements = (done = noOp) => (dispatch) => {
   dispatch(fetchAnnouncementsRequest());
 
-  api(getState).get('/api/v1/announcements').then(response => {
+  api().get('/api/v1/announcements').then(response => {
     dispatch(fetchAnnouncementsSuccess(response.data.map(x => normalizeAnnouncement(x))));
   }).catch(error => {
     dispatch(fetchAnnouncementsFail(error));
@@ -61,10 +61,10 @@ export const updateAnnouncements = announcement => ({
   announcement: normalizeAnnouncement(announcement),
 });
 
-export const dismissAnnouncement = announcementId => (dispatch, getState) => {
+export const dismissAnnouncement = announcementId => (dispatch) => {
   dispatch(dismissAnnouncementRequest(announcementId));
 
-  api(getState).post(`/api/v1/announcements/${announcementId}/dismiss`).then(() => {
+  api().post(`/api/v1/announcements/${announcementId}/dismiss`).then(() => {
     dispatch(dismissAnnouncementSuccess(announcementId));
   }).catch(error => {
     dispatch(dismissAnnouncementFail(announcementId, error));
@@ -103,7 +103,7 @@ export const addReaction = (announcementId, name) => (dispatch, getState) => {
     dispatch(addReactionRequest(announcementId, name, alreadyAdded));
   }
 
-  api(getState).put(`/api/v1/announcements/${announcementId}/reactions/${encodeURIComponent(name)}`).then(() => {
+  api().put(`/api/v1/announcements/${announcementId}/reactions/${encodeURIComponent(name)}`).then(() => {
     dispatch(addReactionSuccess(announcementId, name, alreadyAdded));
   }).catch(err => {
     if (!alreadyAdded) {
@@ -134,10 +134,10 @@ export const addReactionFail = (announcementId, name, error) => ({
   skipLoading: true,
 });
 
-export const removeReaction = (announcementId, name) => (dispatch, getState) => {
+export const removeReaction = (announcementId, name) => (dispatch) => {
   dispatch(removeReactionRequest(announcementId, name));
 
-  api(getState).delete(`/api/v1/announcements/${announcementId}/reactions/${encodeURIComponent(name)}`).then(() => {
+  api().delete(`/api/v1/announcements/${announcementId}/reactions/${encodeURIComponent(name)}`).then(() => {
     dispatch(removeReactionSuccess(announcementId, name));
   }).catch(err => {
     dispatch(removeReactionFail(announcementId, name, err));
diff --git a/app/javascript/flavours/glitch/actions/blocks.js b/app/javascript/flavours/glitch/actions/blocks.js
index 54296d0905c9a9..5c66e27bec2d0b 100644
--- a/app/javascript/flavours/glitch/actions/blocks.js
+++ b/app/javascript/flavours/glitch/actions/blocks.js
@@ -13,10 +13,10 @@ export const BLOCKS_EXPAND_SUCCESS = 'BLOCKS_EXPAND_SUCCESS';
 export const BLOCKS_EXPAND_FAIL    = 'BLOCKS_EXPAND_FAIL';
 
 export function fetchBlocks() {
-  return (dispatch, getState) => {
+  return (dispatch) => {
     dispatch(fetchBlocksRequest());
 
-    api(getState).get('/api/v1/blocks').then(response => {
+    api().get('/api/v1/blocks').then(response => {
       const next = getLinks(response).refs.find(link => link.rel === 'next');
       dispatch(importFetchedAccounts(response.data));
       dispatch(fetchBlocksSuccess(response.data, next ? next.uri : null));
@@ -56,7 +56,7 @@ export function expandBlocks() {
 
     dispatch(expandBlocksRequest());
 
-    api(getState).get(url).then(response => {
+    api().get(url).then(response => {
       const next = getLinks(response).refs.find(link => link.rel === 'next');
       dispatch(importFetchedAccounts(response.data));
       dispatch(expandBlocksSuccess(response.data, next ? next.uri : null));
diff --git a/app/javascript/flavours/glitch/actions/bookmarks.js b/app/javascript/flavours/glitch/actions/bookmarks.js
index 0b16f61e63635a..89716b224c598e 100644
--- a/app/javascript/flavours/glitch/actions/bookmarks.js
+++ b/app/javascript/flavours/glitch/actions/bookmarks.js
@@ -18,7 +18,7 @@ export function fetchBookmarkedStatuses() {
 
     dispatch(fetchBookmarkedStatusesRequest());
 
-    api(getState).get('/api/v1/bookmarks').then(response => {
+    api().get('/api/v1/bookmarks').then(response => {
       const next = getLinks(response).refs.find(link => link.rel === 'next');
       dispatch(importFetchedStatuses(response.data));
       dispatch(fetchBookmarkedStatusesSuccess(response.data, next ? next.uri : null));
@@ -59,7 +59,7 @@ export function expandBookmarkedStatuses() {
 
     dispatch(expandBookmarkedStatusesRequest());
 
-    api(getState).get(url).then(response => {
+    api().get(url).then(response => {
       const next = getLinks(response).refs.find(link => link.rel === 'next');
       dispatch(importFetchedStatuses(response.data));
       dispatch(expandBookmarkedStatusesSuccess(response.data, next ? next.uri : null));
diff --git a/app/javascript/flavours/glitch/actions/compose.js b/app/javascript/flavours/glitch/actions/compose.js
index 1dca94ae680574..61245acdba9873 100644
--- a/app/javascript/flavours/glitch/actions/compose.js
+++ b/app/javascript/flavours/glitch/actions/compose.js
@@ -211,7 +211,7 @@ export function submitCompose(routerHistory, overridePrivacy = null) {
       });
     }
 
-    api(getState).request({
+    api().request({
       url: statusId === null ? '/api/v1/statuses' : `/api/v1/statuses/${statusId}`,
       method: statusId === null ? 'post' : 'put',
       data: {
@@ -338,7 +338,7 @@ export function uploadCompose(files) {
         // Account for disparity in size of original image and resized data
         total += file.size - f.size;
 
-        return api(getState).post('/api/v2/media', data, {
+        return api().post('/api/v2/media', data, {
           onUploadProgress: function({ loaded }){
             progress[i] = loaded;
             dispatch(uploadComposeProgress(progress.reduce((a, v) => a + v, 0), total));
@@ -355,7 +355,7 @@ export function uploadCompose(files) {
             let tryCount = 1;
 
             const poll = () => {
-              api(getState).get(`/api/v1/media/${data.id}`).then(response => {
+              api().get(`/api/v1/media/${data.id}`).then(response => {
                 if (response.status === 200) {
                   dispatch(uploadComposeSuccess(response.data, f));
                 } else if (response.status === 206) {
@@ -378,7 +378,7 @@ export const uploadComposeProcessing = () => ({
   type: COMPOSE_UPLOAD_PROCESSING,
 });
 
-export const uploadThumbnail = (id, file) => (dispatch, getState) => {
+export const uploadThumbnail = (id, file) => (dispatch) => {
   dispatch(uploadThumbnailRequest());
 
   const total = file.size;
@@ -386,7 +386,7 @@ export const uploadThumbnail = (id, file) => (dispatch, getState) => {
 
   data.append('thumbnail', file);
 
-  api(getState).put(`/api/v1/media/${id}`, data, {
+  api().put(`/api/v1/media/${id}`, data, {
     onUploadProgress: ({ loaded }) => {
       dispatch(uploadThumbnailProgress(loaded, total));
     },
@@ -469,7 +469,7 @@ export function changeUploadCompose(id, params) {
 
       dispatch(changeUploadComposeSuccess(data, true));
     } else {
-      api(getState).put(`/api/v1/media/${id}`, params).then(response => {
+      api().put(`/api/v1/media/${id}`, params).then(response => {
         dispatch(changeUploadComposeSuccess(response.data, false));
       }).catch(error => {
         dispatch(changeUploadComposeFail(id, error));
@@ -557,7 +557,7 @@ const fetchComposeSuggestionsAccounts = throttle((dispatch, getState, token) =>
 
   fetchComposeSuggestionsAccountsController = new AbortController();
 
-  api(getState).get('/api/v1/accounts/search', {
+  api().get('/api/v1/accounts/search', {
     signal: fetchComposeSuggestionsAccountsController.signal,
 
     params: {
@@ -591,7 +591,7 @@ const fetchComposeSuggestionsTags = throttle((dispatch, getState, token) => {
 
   fetchComposeSuggestionsTagsController = new AbortController();
 
-  api(getState).get('/api/v2/search', {
+  api().get('/api/v2/search', {
     signal: fetchComposeSuggestionsTagsController.signal,
 
     params: {
diff --git a/app/javascript/flavours/glitch/actions/conversations.js b/app/javascript/flavours/glitch/actions/conversations.js
index 8c4c4529fb7e8b..03174c485dd4c0 100644
--- a/app/javascript/flavours/glitch/actions/conversations.js
+++ b/app/javascript/flavours/glitch/actions/conversations.js
@@ -28,13 +28,13 @@ export const unmountConversations = () => ({
   type: CONVERSATIONS_UNMOUNT,
 });
 
-export const markConversationRead = conversationId => (dispatch, getState) => {
+export const markConversationRead = conversationId => (dispatch) => {
   dispatch({
     type: CONVERSATIONS_READ,
     id: conversationId,
   });
 
-  api(getState).post(`/api/v1/conversations/${conversationId}/read`);
+  api().post(`/api/v1/conversations/${conversationId}/read`);
 };
 
 export const expandConversations = ({ maxId } = {}) => (dispatch, getState) => {
@@ -48,7 +48,7 @@ export const expandConversations = ({ maxId } = {}) => (dispatch, getState) => {
 
   const isLoadingRecent = !!params.since_id;
 
-  api(getState).get('/api/v1/conversations', { params })
+  api().get('/api/v1/conversations', { params })
     .then(response => {
       const next = getLinks(response).refs.find(link => link.rel === 'next');
 
@@ -88,10 +88,10 @@ export const updateConversations = conversation => dispatch => {
   });
 };
 
-export const deleteConversation = conversationId => (dispatch, getState) => {
+export const deleteConversation = conversationId => (dispatch) => {
   dispatch(deleteConversationRequest(conversationId));
 
-  api(getState).delete(`/api/v1/conversations/${conversationId}`)
+  api().delete(`/api/v1/conversations/${conversationId}`)
     .then(() => dispatch(deleteConversationSuccess(conversationId)))
     .catch(error => dispatch(deleteConversationFail(conversationId, error)));
 };
diff --git a/app/javascript/flavours/glitch/actions/custom_emojis.js b/app/javascript/flavours/glitch/actions/custom_emojis.js
index 9ec8156b170a21..fb65f072dc8db7 100644
--- a/app/javascript/flavours/glitch/actions/custom_emojis.js
+++ b/app/javascript/flavours/glitch/actions/custom_emojis.js
@@ -5,10 +5,10 @@ export const CUSTOM_EMOJIS_FETCH_SUCCESS = 'CUSTOM_EMOJIS_FETCH_SUCCESS';
 export const CUSTOM_EMOJIS_FETCH_FAIL = 'CUSTOM_EMOJIS_FETCH_FAIL';
 
 export function fetchCustomEmojis() {
-  return (dispatch, getState) => {
+  return (dispatch) => {
     dispatch(fetchCustomEmojisRequest());
 
-    api(getState).get('/api/v1/custom_emojis').then(response => {
+    api().get('/api/v1/custom_emojis').then(response => {
       dispatch(fetchCustomEmojisSuccess(response.data));
     }).catch(error => {
       dispatch(fetchCustomEmojisFail(error));
diff --git a/app/javascript/flavours/glitch/actions/directory.js b/app/javascript/flavours/glitch/actions/directory.js
index cda63f2b5a43eb..7a0748029d97c1 100644
--- a/app/javascript/flavours/glitch/actions/directory.js
+++ b/app/javascript/flavours/glitch/actions/directory.js
@@ -11,10 +11,10 @@ export const DIRECTORY_EXPAND_REQUEST = 'DIRECTORY_EXPAND_REQUEST';
 export const DIRECTORY_EXPAND_SUCCESS = 'DIRECTORY_EXPAND_SUCCESS';
 export const DIRECTORY_EXPAND_FAIL    = 'DIRECTORY_EXPAND_FAIL';
 
-export const fetchDirectory = params => (dispatch, getState) => {
+export const fetchDirectory = params => (dispatch) => {
   dispatch(fetchDirectoryRequest());
 
-  api(getState).get('/api/v1/directory', { params: { ...params, limit: 20 } }).then(({ data }) => {
+  api().get('/api/v1/directory', { params: { ...params, limit: 20 } }).then(({ data }) => {
     dispatch(importFetchedAccounts(data));
     dispatch(fetchDirectorySuccess(data));
     dispatch(fetchRelationships(data.map(x => x.id)));
@@ -40,7 +40,7 @@ export const expandDirectory = params => (dispatch, getState) => {
 
   const loadedItems = getState().getIn(['user_lists', 'directory', 'items']).size;
 
-  api(getState).get('/api/v1/directory', { params: { ...params, offset: loadedItems, limit: 20 } }).then(({ data }) => {
+  api().get('/api/v1/directory', { params: { ...params, offset: loadedItems, limit: 20 } }).then(({ data }) => {
     dispatch(importFetchedAccounts(data));
     dispatch(expandDirectorySuccess(data));
     dispatch(fetchRelationships(data.map(x => x.id)));
diff --git a/app/javascript/flavours/glitch/actions/domain_blocks.js b/app/javascript/flavours/glitch/actions/domain_blocks.js
index 55c0a6ce9d0ab7..727f800af3b528 100644
--- a/app/javascript/flavours/glitch/actions/domain_blocks.js
+++ b/app/javascript/flavours/glitch/actions/domain_blocks.js
@@ -24,7 +24,7 @@ export function blockDomain(domain) {
   return (dispatch, getState) => {
     dispatch(blockDomainRequest(domain));
 
-    api(getState).post('/api/v1/domain_blocks', { domain }).then(() => {
+    api().post('/api/v1/domain_blocks', { domain }).then(() => {
       const at_domain = '@' + domain;
       const accounts = getState().get('accounts').filter(item => item.get('acct').endsWith(at_domain)).valueSeq().map(item => item.get('id'));
 
@@ -54,7 +54,7 @@ export function unblockDomain(domain) {
   return (dispatch, getState) => {
     dispatch(unblockDomainRequest(domain));
 
-    api(getState).delete('/api/v1/domain_blocks', { params: { domain } }).then(() => {
+    api().delete('/api/v1/domain_blocks', { params: { domain } }).then(() => {
       const at_domain = '@' + domain;
       const accounts = getState().get('accounts').filter(item => item.get('acct').endsWith(at_domain)).valueSeq().map(item => item.get('id'));
       dispatch(unblockDomainSuccess({ domain, accounts }));
@@ -80,10 +80,10 @@ export function unblockDomainFail(domain, error) {
 }
 
 export function fetchDomainBlocks() {
-  return (dispatch, getState) => {
+  return (dispatch) => {
     dispatch(fetchDomainBlocksRequest());
 
-    api(getState).get('/api/v1/domain_blocks').then(response => {
+    api().get('/api/v1/domain_blocks').then(response => {
       const next = getLinks(response).refs.find(link => link.rel === 'next');
       dispatch(fetchDomainBlocksSuccess(response.data, next ? next.uri : null));
     }).catch(err => {
@@ -123,7 +123,7 @@ export function expandDomainBlocks() {
 
     dispatch(expandDomainBlocksRequest());
 
-    api(getState).get(url).then(response => {
+    api().get(url).then(response => {
       const next = getLinks(response).refs.find(link => link.rel === 'next');
       dispatch(expandDomainBlocksSuccess(response.data, next ? next.uri : null));
     }).catch(err => {
diff --git a/app/javascript/flavours/glitch/actions/favourites.js b/app/javascript/flavours/glitch/actions/favourites.js
index 2d4d4e6206e845..ff475c82bec806 100644
--- a/app/javascript/flavours/glitch/actions/favourites.js
+++ b/app/javascript/flavours/glitch/actions/favourites.js
@@ -18,7 +18,7 @@ export function fetchFavouritedStatuses() {
 
     dispatch(fetchFavouritedStatusesRequest());
 
-    api(getState).get('/api/v1/favourites').then(response => {
+    api().get('/api/v1/favourites').then(response => {
       const next = getLinks(response).refs.find(link => link.rel === 'next');
       dispatch(importFetchedStatuses(response.data));
       dispatch(fetchFavouritedStatusesSuccess(response.data, next ? next.uri : null));
@@ -62,7 +62,7 @@ export function expandFavouritedStatuses() {
 
     dispatch(expandFavouritedStatusesRequest());
 
-    api(getState).get(url).then(response => {
+    api().get(url).then(response => {
       const next = getLinks(response).refs.find(link => link.rel === 'next');
       dispatch(importFetchedStatuses(response.data));
       dispatch(expandFavouritedStatusesSuccess(response.data, next ? next.uri : null));
diff --git a/app/javascript/flavours/glitch/actions/featured_tags.js b/app/javascript/flavours/glitch/actions/featured_tags.js
index 18bb615394571c..6ee4dee2bcd34a 100644
--- a/app/javascript/flavours/glitch/actions/featured_tags.js
+++ b/app/javascript/flavours/glitch/actions/featured_tags.js
@@ -11,7 +11,7 @@ export const fetchFeaturedTags = (id) => (dispatch, getState) => {
 
   dispatch(fetchFeaturedTagsRequest(id));
 
-  api(getState).get(`/api/v1/accounts/${id}/featured_tags`)
+  api().get(`/api/v1/accounts/${id}/featured_tags`)
     .then(({ data }) => dispatch(fetchFeaturedTagsSuccess(id, data)))
     .catch(err => dispatch(fetchFeaturedTagsFail(id, err)));
 };
diff --git a/app/javascript/flavours/glitch/actions/filters.js b/app/javascript/flavours/glitch/actions/filters.js
index a11956ac564c6a..588e390f0a95f8 100644
--- a/app/javascript/flavours/glitch/actions/filters.js
+++ b/app/javascript/flavours/glitch/actions/filters.js
@@ -23,13 +23,13 @@ export const initAddFilter = (status, { contextType }) => dispatch =>
     },
   }));
 
-export const fetchFilters = () => (dispatch, getState) => {
+export const fetchFilters = () => (dispatch) => {
   dispatch({
     type: FILTERS_FETCH_REQUEST,
     skipLoading: true,
   });
 
-  api(getState)
+  api()
     .get('/api/v2/filters')
     .then(({ data }) => dispatch({
       type: FILTERS_FETCH_SUCCESS,
@@ -44,10 +44,10 @@ export const fetchFilters = () => (dispatch, getState) => {
     }));
 };
 
-export const createFilterStatus = (params, onSuccess, onFail) => (dispatch, getState) => {
+export const createFilterStatus = (params, onSuccess, onFail) => (dispatch) => {
   dispatch(createFilterStatusRequest());
 
-  api(getState).post(`/api/v2/filters/${params.filter_id}/statuses`, params).then(response => {
+  api().post(`/api/v2/filters/${params.filter_id}/statuses`, params).then(response => {
     dispatch(createFilterStatusSuccess(response.data));
     if (onSuccess) onSuccess();
   }).catch(error => {
@@ -70,10 +70,10 @@ export const createFilterStatusFail = error => ({
   error,
 });
 
-export const createFilter = (params, onSuccess, onFail) => (dispatch, getState) => {
+export const createFilter = (params, onSuccess, onFail) => (dispatch) => {
   dispatch(createFilterRequest());
 
-  api(getState).post('/api/v2/filters', params).then(response => {
+  api().post('/api/v2/filters', params).then(response => {
     dispatch(createFilterSuccess(response.data));
     if (onSuccess) onSuccess(response.data);
   }).catch(error => {
diff --git a/app/javascript/flavours/glitch/actions/history.js b/app/javascript/flavours/glitch/actions/history.js
index 52401b7dce3f95..07732ea187459d 100644
--- a/app/javascript/flavours/glitch/actions/history.js
+++ b/app/javascript/flavours/glitch/actions/history.js
@@ -15,7 +15,7 @@ export const fetchHistory = statusId => (dispatch, getState) => {
 
   dispatch(fetchHistoryRequest(statusId));
 
-  api(getState).get(`/api/v1/statuses/${statusId}/history`).then(({ data }) => {
+  api().get(`/api/v1/statuses/${statusId}/history`).then(({ data }) => {
     dispatch(importFetchedAccounts(data.map(x => x.account)));
     dispatch(fetchHistorySuccess(statusId, data));
   }).catch(error => dispatch(fetchHistoryFail(error)));
diff --git a/app/javascript/flavours/glitch/actions/interactions.js b/app/javascript/flavours/glitch/actions/interactions.js
index 7d0144438aa29c..fe7c911b61e2a5 100644
--- a/app/javascript/flavours/glitch/actions/interactions.js
+++ b/app/javascript/flavours/glitch/actions/interactions.js
@@ -52,10 +52,10 @@ export const UNBOOKMARK_SUCCESS = 'UNBOOKMARKED_SUCCESS';
 export const UNBOOKMARK_FAIL    = 'UNBOOKMARKED_FAIL';
 
 export function reblog(status, visibility) {
-  return function (dispatch, getState) {
+  return function (dispatch) {
     dispatch(reblogRequest(status));
 
-    api(getState).post(`/api/v1/statuses/${status.get('id')}/reblog`, { visibility }).then(function (response) {
+    api().post(`/api/v1/statuses/${status.get('id')}/reblog`, { visibility }).then(function (response) {
       // The reblog API method returns a new status wrapped around the original. In this case we are only
       // interested in how the original is modified, hence passing it skipping the wrapper
       dispatch(importFetchedStatus(response.data.reblog));
@@ -67,10 +67,10 @@ export function reblog(status, visibility) {
 }
 
 export function unreblog(status) {
-  return (dispatch, getState) => {
+  return (dispatch) => {
     dispatch(unreblogRequest(status));
 
-    api(getState).post(`/api/v1/statuses/${status.get('id')}/unreblog`).then(response => {
+    api().post(`/api/v1/statuses/${status.get('id')}/unreblog`).then(response => {
       dispatch(importFetchedStatus(response.data));
       dispatch(unreblogSuccess(status));
     }).catch(error => {
@@ -130,10 +130,10 @@ export function unreblogFail(status, error) {
 }
 
 export function favourite(status) {
-  return function (dispatch, getState) {
+  return function (dispatch) {
     dispatch(favouriteRequest(status));
 
-    api(getState).post(`/api/v1/statuses/${status.get('id')}/favourite`).then(function (response) {
+    api().post(`/api/v1/statuses/${status.get('id')}/favourite`).then(function (response) {
       dispatch(importFetchedStatus(response.data));
       dispatch(favouriteSuccess(status));
     }).catch(function (error) {
@@ -143,10 +143,10 @@ export function favourite(status) {
 }
 
 export function unfavourite(status) {
-  return (dispatch, getState) => {
+  return (dispatch) => {
     dispatch(unfavouriteRequest(status));
 
-    api(getState).post(`/api/v1/statuses/${status.get('id')}/unfavourite`).then(response => {
+    api().post(`/api/v1/statuses/${status.get('id')}/unfavourite`).then(response => {
       dispatch(importFetchedStatus(response.data));
       dispatch(unfavouriteSuccess(status));
     }).catch(error => {
@@ -206,10 +206,10 @@ export function unfavouriteFail(status, error) {
 }
 
 export function bookmark(status) {
-  return function (dispatch, getState) {
+  return function (dispatch) {
     dispatch(bookmarkRequest(status));
 
-    api(getState).post(`/api/v1/statuses/${status.get('id')}/bookmark`).then(function (response) {
+    api().post(`/api/v1/statuses/${status.get('id')}/bookmark`).then(function (response) {
       dispatch(importFetchedStatus(response.data));
       dispatch(bookmarkSuccess(status, response.data));
     }).catch(function (error) {
@@ -219,10 +219,10 @@ export function bookmark(status) {
 }
 
 export function unbookmark(status) {
-  return (dispatch, getState) => {
+  return (dispatch) => {
     dispatch(unbookmarkRequest(status));
 
-    api(getState).post(`/api/v1/statuses/${status.get('id')}/unbookmark`).then(response => {
+    api().post(`/api/v1/statuses/${status.get('id')}/unbookmark`).then(response => {
       dispatch(importFetchedStatus(response.data));
       dispatch(unbookmarkSuccess(status, response.data));
     }).catch(error => {
@@ -278,10 +278,10 @@ export function unbookmarkFail(status, error) {
 }
 
 export function fetchReblogs(id) {
-  return (dispatch, getState) => {
+  return (dispatch) => {
     dispatch(fetchReblogsRequest(id));
 
-    api(getState).get(`/api/v1/statuses/${id}/reblogged_by`).then(response => {
+    api().get(`/api/v1/statuses/${id}/reblogged_by`).then(response => {
       const next = getLinks(response).refs.find(link => link.rel === 'next');
       dispatch(importFetchedAccounts(response.data));
       dispatch(fetchReblogsSuccess(id, response.data, next ? next.uri : null));
@@ -325,7 +325,7 @@ export function expandReblogs(id) {
 
     dispatch(expandReblogsRequest(id));
 
-    api(getState).get(url).then(response => {
+    api().get(url).then(response => {
       const next = getLinks(response).refs.find(link => link.rel === 'next');
 
       dispatch(importFetchedAccounts(response.data));
@@ -360,10 +360,10 @@ export function expandReblogsFail(id, error) {
 }
 
 export function fetchFavourites(id) {
-  return (dispatch, getState) => {
+  return (dispatch) => {
     dispatch(fetchFavouritesRequest(id));
 
-    api(getState).get(`/api/v1/statuses/${id}/favourited_by`).then(response => {
+    api().get(`/api/v1/statuses/${id}/favourited_by`).then(response => {
       const next = getLinks(response).refs.find(link => link.rel === 'next');
       dispatch(importFetchedAccounts(response.data));
       dispatch(fetchFavouritesSuccess(id, response.data, next ? next.uri : null));
@@ -407,7 +407,7 @@ export function expandFavourites(id) {
 
     dispatch(expandFavouritesRequest(id));
 
-    api(getState).get(url).then(response => {
+    api().get(url).then(response => {
       const next = getLinks(response).refs.find(link => link.rel === 'next');
 
       dispatch(importFetchedAccounts(response.data));
@@ -442,10 +442,10 @@ export function expandFavouritesFail(id, error) {
 }
 
 export function pin(status) {
-  return (dispatch, getState) => {
+  return (dispatch) => {
     dispatch(pinRequest(status));
 
-    api(getState).post(`/api/v1/statuses/${status.get('id')}/pin`).then(response => {
+    api().post(`/api/v1/statuses/${status.get('id')}/pin`).then(response => {
       dispatch(importFetchedStatus(response.data));
       dispatch(pinSuccess(status));
     }).catch(error => {
@@ -480,10 +480,10 @@ export function pinFail(status, error) {
 }
 
 export function unpin (status) {
-  return (dispatch, getState) => {
+  return (dispatch) => {
     dispatch(unpinRequest(status));
 
-    api(getState).post(`/api/v1/statuses/${status.get('id')}/unpin`).then(response => {
+    api().post(`/api/v1/statuses/${status.get('id')}/unpin`).then(response => {
       dispatch(importFetchedStatus(response.data));
       dispatch(unpinSuccess(status));
     }).catch(error => {
diff --git a/app/javascript/flavours/glitch/actions/lists.js b/app/javascript/flavours/glitch/actions/lists.js
index b0789cd426450a..9956059387efc2 100644
--- a/app/javascript/flavours/glitch/actions/lists.js
+++ b/app/javascript/flavours/glitch/actions/lists.js
@@ -57,7 +57,7 @@ export const fetchList = id => (dispatch, getState) => {
 
   dispatch(fetchListRequest(id));
 
-  api(getState).get(`/api/v1/lists/${id}`)
+  api().get(`/api/v1/lists/${id}`)
     .then(({ data }) => dispatch(fetchListSuccess(data)))
     .catch(err => dispatch(fetchListFail(id, err)));
 };
@@ -78,10 +78,10 @@ export const fetchListFail = (id, error) => ({
   error,
 });
 
-export const fetchLists = () => (dispatch, getState) => {
+export const fetchLists = () => (dispatch) => {
   dispatch(fetchListsRequest());
 
-  api(getState).get('/api/v1/lists')
+  api().get('/api/v1/lists')
     .then(({ data }) => dispatch(fetchListsSuccess(data)))
     .catch(err => dispatch(fetchListsFail(err)));
 };
@@ -125,10 +125,10 @@ export const changeListEditorTitle = value => ({
   value,
 });
 
-export const createList = (title, shouldReset) => (dispatch, getState) => {
+export const createList = (title, shouldReset) => (dispatch) => {
   dispatch(createListRequest());
 
-  api(getState).post('/api/v1/lists', { title }).then(({ data }) => {
+  api().post('/api/v1/lists', { title }).then(({ data }) => {
     dispatch(createListSuccess(data));
 
     if (shouldReset) {
@@ -151,10 +151,10 @@ export const createListFail = error => ({
   error,
 });
 
-export const updateList = (id, title, shouldReset, isExclusive, replies_policy) => (dispatch, getState) => {
+export const updateList = (id, title, shouldReset, isExclusive, replies_policy) => (dispatch) => {
   dispatch(updateListRequest(id));
 
-  api(getState).put(`/api/v1/lists/${id}`, { title, replies_policy, exclusive: typeof isExclusive === 'undefined' ? undefined : !!isExclusive }).then(({ data }) => {
+  api().put(`/api/v1/lists/${id}`, { title, replies_policy, exclusive: typeof isExclusive === 'undefined' ? undefined : !!isExclusive }).then(({ data }) => {
     dispatch(updateListSuccess(data));
 
     if (shouldReset) {
@@ -183,10 +183,10 @@ export const resetListEditor = () => ({
   type: LIST_EDITOR_RESET,
 });
 
-export const deleteList = id => (dispatch, getState) => {
+export const deleteList = id => (dispatch) => {
   dispatch(deleteListRequest(id));
 
-  api(getState).delete(`/api/v1/lists/${id}`)
+  api().delete(`/api/v1/lists/${id}`)
     .then(() => dispatch(deleteListSuccess(id)))
     .catch(err => dispatch(deleteListFail(id, err)));
 };
@@ -207,10 +207,10 @@ export const deleteListFail = (id, error) => ({
   error,
 });
 
-export const fetchListAccounts = listId => (dispatch, getState) => {
+export const fetchListAccounts = listId => (dispatch) => {
   dispatch(fetchListAccountsRequest(listId));
 
-  api(getState).get(`/api/v1/lists/${listId}/accounts`, { params: { limit: 0 } }).then(({ data }) => {
+  api().get(`/api/v1/lists/${listId}/accounts`, { params: { limit: 0 } }).then(({ data }) => {
     dispatch(importFetchedAccounts(data));
     dispatch(fetchListAccountsSuccess(listId, data));
   }).catch(err => dispatch(fetchListAccountsFail(listId, err)));
@@ -234,7 +234,7 @@ export const fetchListAccountsFail = (id, error) => ({
   error,
 });
 
-export const fetchListSuggestions = q => (dispatch, getState) => {
+export const fetchListSuggestions = q => (dispatch) => {
   const params = {
     q,
     resolve: false,
@@ -242,7 +242,7 @@ export const fetchListSuggestions = q => (dispatch, getState) => {
     following: true,
   };
 
-  api(getState).get('/api/v1/accounts/search', { params }).then(({ data }) => {
+  api().get('/api/v1/accounts/search', { params }).then(({ data }) => {
     dispatch(importFetchedAccounts(data));
     dispatch(fetchListSuggestionsReady(q, data));
   }).catch(error => dispatch(showAlertForError(error)));
@@ -267,10 +267,10 @@ export const addToListEditor = accountId => (dispatch, getState) => {
   dispatch(addToList(getState().getIn(['listEditor', 'listId']), accountId));
 };
 
-export const addToList = (listId, accountId) => (dispatch, getState) => {
+export const addToList = (listId, accountId) => (dispatch) => {
   dispatch(addToListRequest(listId, accountId));
 
-  api(getState).post(`/api/v1/lists/${listId}/accounts`, { account_ids: [accountId] })
+  api().post(`/api/v1/lists/${listId}/accounts`, { account_ids: [accountId] })
     .then(() => dispatch(addToListSuccess(listId, accountId)))
     .catch(err => dispatch(addToListFail(listId, accountId, err)));
 };
@@ -298,10 +298,10 @@ export const removeFromListEditor = accountId => (dispatch, getState) => {
   dispatch(removeFromList(getState().getIn(['listEditor', 'listId']), accountId));
 };
 
-export const removeFromList = (listId, accountId) => (dispatch, getState) => {
+export const removeFromList = (listId, accountId) => (dispatch) => {
   dispatch(removeFromListRequest(listId, accountId));
 
-  api(getState).delete(`/api/v1/lists/${listId}/accounts`, { params: { account_ids: [accountId] } })
+  api().delete(`/api/v1/lists/${listId}/accounts`, { params: { account_ids: [accountId] } })
     .then(() => dispatch(removeFromListSuccess(listId, accountId)))
     .catch(err => dispatch(removeFromListFail(listId, accountId, err)));
 };
@@ -338,10 +338,10 @@ export const setupListAdder = accountId => (dispatch, getState) => {
   dispatch(fetchAccountLists(accountId));
 };
 
-export const fetchAccountLists = accountId => (dispatch, getState) => {
+export const fetchAccountLists = accountId => (dispatch) => {
   dispatch(fetchAccountListsRequest(accountId));
 
-  api(getState).get(`/api/v1/accounts/${accountId}/lists`)
+  api().get(`/api/v1/accounts/${accountId}/lists`)
     .then(({ data }) => dispatch(fetchAccountListsSuccess(accountId, data)))
     .catch(err => dispatch(fetchAccountListsFail(accountId, err)));
 };
@@ -370,4 +370,3 @@ export const addToListAdder = listId => (dispatch, getState) => {
 export const removeFromListAdder = listId => (dispatch, getState) => {
   dispatch(removeFromList(listId, getState().getIn(['listAdder', 'accountId'])));
 };
-
diff --git a/app/javascript/flavours/glitch/actions/markers.ts b/app/javascript/flavours/glitch/actions/markers.ts
index 3f810cf99ae523..a85af1c4beec48 100644
--- a/app/javascript/flavours/glitch/actions/markers.ts
+++ b/app/javascript/flavours/glitch/actions/markers.ts
@@ -1,19 +1,24 @@
 import { debounce } from 'lodash';
 
 import type { MarkerJSON } from 'flavours/glitch/api_types/markers';
+import { getAccessToken } from 'flavours/glitch/initial_state';
 import type { AppDispatch, RootState } from 'flavours/glitch/store';
 import { createAppAsyncThunk } from 'flavours/glitch/store/typed_functions';
 
-import api, { authorizationTokenFromState } from '../api';
+import api from '../api';
 import { compareId } from '../compare_id';
 
 export const synchronouslySubmitMarkers = createAppAsyncThunk(
   'markers/submit',
   async (_args, { getState }) => {
-    const accessToken = authorizationTokenFromState(getState);
+    const accessToken = getAccessToken();
     const params = buildPostMarkersParams(getState());
 
-    if (Object.keys(params).length === 0 || !accessToken) {
+    if (
+      Object.keys(params).length === 0 ||
+      !accessToken ||
+      accessToken === ''
+    ) {
       return;
     }
 
@@ -97,14 +102,14 @@ export const submitMarkersAction = createAppAsyncThunk<{
   home: string | undefined;
   notifications: string | undefined;
 }>('markers/submitAction', async (_args, { getState }) => {
-  const accessToken = authorizationTokenFromState(getState);
+  const accessToken = getAccessToken();
   const params = buildPostMarkersParams(getState());
 
-  if (Object.keys(params).length === 0 || accessToken === '') {
+  if (Object.keys(params).length === 0 || !accessToken || accessToken === '') {
     return { home: undefined, notifications: undefined };
   }
 
-  await api(getState).post<MarkerJSON>('/api/v1/markers', params);
+  await api().post<MarkerJSON>('/api/v1/markers', params);
 
   return {
     home: params.home?.last_read_id,
@@ -134,14 +139,11 @@ export const submitMarkers = createAppAsyncThunk(
   },
 );
 
-export const fetchMarkers = createAppAsyncThunk(
-  'markers/fetch',
-  async (_args, { getState }) => {
-    const response = await api(getState).get<Record<string, MarkerJSON>>(
-      `/api/v1/markers`,
-      { params: { timeline: ['notifications'] } },
-    );
+export const fetchMarkers = createAppAsyncThunk('markers/fetch', async () => {
+  const response = await api().get<Record<string, MarkerJSON>>(
+    `/api/v1/markers`,
+    { params: { timeline: ['notifications'] } },
+  );
 
-    return { markers: response.data };
-  },
-);
+  return { markers: response.data };
+});
diff --git a/app/javascript/flavours/glitch/actions/mutes.js b/app/javascript/flavours/glitch/actions/mutes.js
index 99c113f4147302..3676748cf3fe77 100644
--- a/app/javascript/flavours/glitch/actions/mutes.js
+++ b/app/javascript/flavours/glitch/actions/mutes.js
@@ -13,10 +13,10 @@ export const MUTES_EXPAND_SUCCESS = 'MUTES_EXPAND_SUCCESS';
 export const MUTES_EXPAND_FAIL    = 'MUTES_EXPAND_FAIL';
 
 export function fetchMutes() {
-  return (dispatch, getState) => {
+  return (dispatch) => {
     dispatch(fetchMutesRequest());
 
-    api(getState).get('/api/v1/mutes').then(response => {
+    api().get('/api/v1/mutes').then(response => {
       const next = getLinks(response).refs.find(link => link.rel === 'next');
       dispatch(importFetchedAccounts(response.data));
       dispatch(fetchMutesSuccess(response.data, next ? next.uri : null));
@@ -56,7 +56,7 @@ export function expandMutes() {
 
     dispatch(expandMutesRequest());
 
-    api(getState).get(url).then(response => {
+    api().get(url).then(response => {
       const next = getLinks(response).refs.find(link => link.rel === 'next');
       dispatch(importFetchedAccounts(response.data));
       dispatch(expandMutesSuccess(response.data, next ? next.uri : null));
diff --git a/app/javascript/flavours/glitch/actions/notifications.js b/app/javascript/flavours/glitch/actions/notifications.js
index 5b274ff94c2e75..a2be31ffeb17d9 100644
--- a/app/javascript/flavours/glitch/actions/notifications.js
+++ b/app/javascript/flavours/glitch/actions/notifications.js
@@ -228,7 +228,7 @@ export function expandNotifications({ maxId, forceLoad } = {}, done = noOp) {
 
     dispatch(expandNotificationsRequest(isLoadingMore));
 
-    api(getState).get('/api/v1/notifications', { params, signal: expandNotificationsController.signal }).then(response => {
+    api().get('/api/v1/notifications', { params, signal: expandNotificationsController.signal }).then(response => {
       const next = getLinks(response).refs.find(link => link.rel === 'next');
 
       dispatch(importFetchedAccounts(response.data.map(item => item.account)));
@@ -274,12 +274,12 @@ export function expandNotificationsFail(error, isLoadingMore) {
 }
 
 export function clearNotifications() {
-  return (dispatch, getState) => {
+  return (dispatch) => {
     dispatch({
       type: NOTIFICATIONS_CLEAR,
     });
 
-    api(getState).post('/api/v1/notifications/clear');
+    api().post('/api/v1/notifications/clear');
   };
 }
 
@@ -305,7 +305,7 @@ export function deleteMarkedNotifications() {
       return;
     }
 
-    api(getState).delete(`/api/v1/notifications/destroy_multiple?ids[]=${ids.join('&ids[]=')}`).then(() => {
+    api().delete(`/api/v1/notifications/destroy_multiple?ids[]=${ids.join('&ids[]=')}`).then(() => {
       dispatch(deleteMarkedNotificationsSuccess());
     }).catch(error => {
       console.error(error);
@@ -434,10 +434,10 @@ export function setBrowserPermission (value) {
   };
 }
 
-export const fetchNotificationPolicy = () => (dispatch, getState) => {
+export const fetchNotificationPolicy = () => (dispatch) => {
   dispatch(fetchNotificationPolicyRequest());
 
-  api(getState).get('/api/v1/notifications/policy').then(({ data }) => {
+  api().get('/api/v1/notifications/policy').then(({ data }) => {
     dispatch(fetchNotificationPolicySuccess(data));
   }).catch(err => {
     dispatch(fetchNotificationPolicyFail(err));
@@ -458,10 +458,10 @@ export const fetchNotificationPolicyFail = error => ({
   error,
 });
 
-export const updateNotificationsPolicy = params => (dispatch, getState) => {
+export const updateNotificationsPolicy = params => (dispatch) => {
   dispatch(fetchNotificationPolicyRequest());
 
-  api(getState).put('/api/v1/notifications/policy', params).then(({ data }) => {
+  api().put('/api/v1/notifications/policy', params).then(({ data }) => {
     dispatch(fetchNotificationPolicySuccess(data));
   }).catch(err => {
     dispatch(fetchNotificationPolicyFail(err));
@@ -481,7 +481,7 @@ export const fetchNotificationRequests = () => (dispatch, getState) => {
 
   dispatch(fetchNotificationRequestsRequest());
 
-  api(getState).get('/api/v1/notifications/requests', { params }).then(response => {
+  api().get('/api/v1/notifications/requests', { params }).then(response => {
     const next = getLinks(response).refs.find(link => link.rel === 'next');
     dispatch(importFetchedAccounts(response.data.map(x => x.account)));
     dispatch(fetchNotificationRequestsSuccess(response.data, next ? next.uri : null));
@@ -514,7 +514,7 @@ export const expandNotificationRequests = () => (dispatch, getState) => {
 
   dispatch(expandNotificationRequestsRequest());
 
-  api(getState).get(url).then(response => {
+  api().get(url).then(response => {
     const next = getLinks(response).refs.find(link => link.rel === 'next');
     dispatch(importFetchedAccounts(response.data.map(x => x.account)));
     dispatch(expandNotificationRequestsSuccess(response.data, next?.uri));
@@ -547,7 +547,7 @@ export const fetchNotificationRequest = id => (dispatch, getState) => {
 
   dispatch(fetchNotificationRequestRequest(id));
 
-  api(getState).get(`/api/v1/notifications/requests/${id}`).then(({ data }) => {
+  api().get(`/api/v1/notifications/requests/${id}`).then(({ data }) => {
     dispatch(fetchNotificationRequestSuccess(data));
   }).catch(err => {
     dispatch(fetchNotificationRequestFail(id, err));
@@ -570,10 +570,10 @@ export const fetchNotificationRequestFail = (id, error) => ({
   error,
 });
 
-export const acceptNotificationRequest = id => (dispatch, getState) => {
+export const acceptNotificationRequest = id => (dispatch) => {
   dispatch(acceptNotificationRequestRequest(id));
 
-  api(getState).post(`/api/v1/notifications/requests/${id}/accept`).then(() => {
+  api().post(`/api/v1/notifications/requests/${id}/accept`).then(() => {
     dispatch(acceptNotificationRequestSuccess(id));
   }).catch(err => {
     dispatch(acceptNotificationRequestFail(id, err));
@@ -596,10 +596,10 @@ export const acceptNotificationRequestFail = (id, error) => ({
   error,
 });
 
-export const dismissNotificationRequest = id => (dispatch, getState) => {
+export const dismissNotificationRequest = id => (dispatch) => {
   dispatch(dismissNotificationRequestRequest(id));
 
-  api(getState).post(`/api/v1/notifications/requests/${id}/dismiss`).then(() =>{
+  api().post(`/api/v1/notifications/requests/${id}/dismiss`).then(() =>{
     dispatch(dismissNotificationRequestSuccess(id));
   }).catch(err => {
     dispatch(dismissNotificationRequestFail(id, err));
@@ -638,7 +638,7 @@ export const fetchNotificationsForRequest = accountId => (dispatch, getState) =>
 
   dispatch(fetchNotificationsForRequestRequest());
 
-  api(getState).get('/api/v1/notifications', { params }).then(response => {
+  api().get('/api/v1/notifications', { params }).then(response => {
     const next = getLinks(response).refs.find(link => link.rel === 'next');
     dispatch(importFetchedAccounts(response.data.map(item => item.account)));
     dispatch(importFetchedStatuses(response.data.map(item => item.status).filter(status => !!status)));
@@ -674,7 +674,7 @@ export const expandNotificationsForRequest = () => (dispatch, getState) => {
 
   dispatch(expandNotificationsForRequestRequest());
 
-  api(getState).get(url).then(response => {
+  api().get(url).then(response => {
     const next = getLinks(response).refs.find(link => link.rel === 'next');
     dispatch(importFetchedAccounts(response.data.map(item => item.account)));
     dispatch(importFetchedStatuses(response.data.map(item => item.status).filter(status => !!status)));
diff --git a/app/javascript/flavours/glitch/actions/pin_statuses.js b/app/javascript/flavours/glitch/actions/pin_statuses.js
index baa10d15627d66..d583eab5735a9e 100644
--- a/app/javascript/flavours/glitch/actions/pin_statuses.js
+++ b/app/javascript/flavours/glitch/actions/pin_statuses.js
@@ -8,10 +8,10 @@ export const PINNED_STATUSES_FETCH_SUCCESS = 'PINNED_STATUSES_FETCH_SUCCESS';
 export const PINNED_STATUSES_FETCH_FAIL = 'PINNED_STATUSES_FETCH_FAIL';
 
 export function fetchPinnedStatuses() {
-  return (dispatch, getState) => {
+  return (dispatch) => {
     dispatch(fetchPinnedStatusesRequest());
 
-    api(getState).get(`/api/v1/accounts/${me}/statuses`, { params: { pinned: true } }).then(response => {
+    api().get(`/api/v1/accounts/${me}/statuses`, { params: { pinned: true } }).then(response => {
       dispatch(importFetchedStatuses(response.data));
       dispatch(fetchPinnedStatusesSuccess(response.data, null));
     }).catch(error => {
diff --git a/app/javascript/flavours/glitch/actions/polls.js b/app/javascript/flavours/glitch/actions/polls.js
index a37410dc90fa4d..aa49341444c7bc 100644
--- a/app/javascript/flavours/glitch/actions/polls.js
+++ b/app/javascript/flavours/glitch/actions/polls.js
@@ -10,10 +10,10 @@ export const POLL_FETCH_REQUEST = 'POLL_FETCH_REQUEST';
 export const POLL_FETCH_SUCCESS = 'POLL_FETCH_SUCCESS';
 export const POLL_FETCH_FAIL    = 'POLL_FETCH_FAIL';
 
-export const vote = (pollId, choices) => (dispatch, getState) => {
+export const vote = (pollId, choices) => (dispatch) => {
   dispatch(voteRequest());
 
-  api(getState).post(`/api/v1/polls/${pollId}/votes`, { choices })
+  api().post(`/api/v1/polls/${pollId}/votes`, { choices })
     .then(({ data }) => {
       dispatch(importFetchedPoll(data));
       dispatch(voteSuccess(data));
@@ -21,10 +21,10 @@ export const vote = (pollId, choices) => (dispatch, getState) => {
     .catch(err => dispatch(voteFail(err)));
 };
 
-export const fetchPoll = pollId => (dispatch, getState) => {
+export const fetchPoll = pollId => (dispatch) => {
   dispatch(fetchPollRequest());
 
-  api(getState).get(`/api/v1/polls/${pollId}`)
+  api().get(`/api/v1/polls/${pollId}`)
     .then(({ data }) => {
       dispatch(importFetchedPoll(data));
       dispatch(fetchPollSuccess(data));
diff --git a/app/javascript/flavours/glitch/actions/reports.js b/app/javascript/flavours/glitch/actions/reports.js
index 756b8cd05e1648..49b89b0d131bf2 100644
--- a/app/javascript/flavours/glitch/actions/reports.js
+++ b/app/javascript/flavours/glitch/actions/reports.js
@@ -15,10 +15,10 @@ export const initReport = (account, status) => dispatch =>
     },
   }));
 
-export const submitReport = (params, onSuccess, onFail) => (dispatch, getState) => {
+export const submitReport = (params, onSuccess, onFail) => (dispatch) => {
   dispatch(submitReportRequest());
 
-  api(getState).post('/api/v1/reports', params).then(response => {
+  api().post('/api/v1/reports', params).then(response => {
     dispatch(submitReportSuccess(response.data));
     if (onSuccess) onSuccess();
   }).catch(error => {
diff --git a/app/javascript/flavours/glitch/actions/search.js b/app/javascript/flavours/glitch/actions/search.js
index 44344e2fb5b0d9..849fc6d33cf2dc 100644
--- a/app/javascript/flavours/glitch/actions/search.js
+++ b/app/javascript/flavours/glitch/actions/search.js
@@ -46,7 +46,7 @@ export function submitSearch(type) {
 
     dispatch(fetchSearchRequest(type));
 
-    api(getState).get('/api/v2/search', {
+    api().get('/api/v2/search', {
       params: {
         q: value,
         resolve: signedIn,
@@ -99,7 +99,7 @@ export const expandSearch = type => (dispatch, getState) => {
 
   dispatch(expandSearchRequest(type));
 
-  api(getState).get('/api/v2/search', {
+  api().get('/api/v2/search', {
     params: {
       q: value,
       type,
@@ -156,7 +156,7 @@ export const openURL = (value, history, onFailure) => (dispatch, getState) => {
 
   dispatch(fetchSearchRequest());
 
-  api(getState).get('/api/v2/search', { params: { q: value, resolve: true } }).then(response => {
+  api().get('/api/v2/search', { params: { q: value, resolve: true } }).then(response => {
     if (response.data.accounts?.length > 0) {
       dispatch(importFetchedAccounts(response.data.accounts));
       history.push(`/@${response.data.accounts[0].acct}`);
diff --git a/app/javascript/flavours/glitch/actions/server.js b/app/javascript/flavours/glitch/actions/server.js
index 65f3efc3a72a3d..32ee093afa8423 100644
--- a/app/javascript/flavours/glitch/actions/server.js
+++ b/app/javascript/flavours/glitch/actions/server.js
@@ -25,7 +25,7 @@ export const fetchServer = () => (dispatch, getState) => {
 
   dispatch(fetchServerRequest());
 
-  api(getState)
+  api()
     .get('/api/v2/instance').then(({ data }) => {
       if (data.contact.account) dispatch(importFetchedAccount(data.contact.account));
       dispatch(fetchServerSuccess(data));
@@ -46,10 +46,10 @@ const fetchServerFail = error => ({
   error,
 });
 
-export const fetchServerTranslationLanguages = () => (dispatch, getState) => {
+export const fetchServerTranslationLanguages = () => (dispatch) => {
   dispatch(fetchServerTranslationLanguagesRequest());
 
-  api(getState)
+  api()
     .get('/api/v1/instance/translation_languages').then(({ data }) => {
       dispatch(fetchServerTranslationLanguagesSuccess(data));
     }).catch(err => dispatch(fetchServerTranslationLanguagesFail(err)));
@@ -76,7 +76,7 @@ export const fetchExtendedDescription = () => (dispatch, getState) => {
 
   dispatch(fetchExtendedDescriptionRequest());
 
-  api(getState)
+  api()
     .get('/api/v1/instance/extended_description')
     .then(({ data }) => dispatch(fetchExtendedDescriptionSuccess(data)))
     .catch(err => dispatch(fetchExtendedDescriptionFail(err)));
@@ -103,7 +103,7 @@ export const fetchDomainBlocks = () => (dispatch, getState) => {
 
   dispatch(fetchDomainBlocksRequest());
 
-  api(getState)
+  api()
     .get('/api/v1/instance/domain_blocks')
     .then(({ data }) => dispatch(fetchDomainBlocksSuccess(true, data)))
     .catch(err => {
diff --git a/app/javascript/flavours/glitch/actions/statuses.js b/app/javascript/flavours/glitch/actions/statuses.js
index 332057ee67e3e6..c4d292567d4d0c 100644
--- a/app/javascript/flavours/glitch/actions/statuses.js
+++ b/app/javascript/flavours/glitch/actions/statuses.js
@@ -59,7 +59,7 @@ export function fetchStatus(id, forceFetch = false) {
 
     dispatch(fetchStatusRequest(id, skipLoading));
 
-    api(getState).get(`/api/v1/statuses/${id}`).then(response => {
+    api().get(`/api/v1/statuses/${id}`).then(response => {
       dispatch(importFetchedStatus(response.data));
       dispatch(fetchStatusSuccess(skipLoading));
     }).catch(error => {
@@ -103,7 +103,7 @@ export const editStatus = (id, routerHistory) => (dispatch, getState) => {
 
   dispatch(fetchStatusSourceRequest());
 
-  api(getState).get(`/api/v1/statuses/${id}/source`).then(response => {
+  api().get(`/api/v1/statuses/${id}/source`).then(response => {
     dispatch(fetchStatusSourceSuccess());
     ensureComposeIsVisible(getState, routerHistory);
     dispatch(setComposeToStatus(status, response.data.text, response.data.spoiler_text, response.data.content_type));
@@ -135,7 +135,7 @@ export function deleteStatus(id, routerHistory, withRedraft = false) {
 
     dispatch(deleteStatusRequest(id));
 
-    api(getState).delete(`/api/v1/statuses/${id}`).then(response => {
+    api().delete(`/api/v1/statuses/${id}`).then(response => {
       dispatch(deleteStatusSuccess(id));
       dispatch(deleteFromTimelines(id));
       dispatch(importFetchedAccount(response.data.account));
@@ -176,10 +176,10 @@ export const updateStatus = status => dispatch =>
   dispatch(importFetchedStatus(status));
 
 export function fetchContext(id) {
-  return (dispatch, getState) => {
+  return (dispatch) => {
     dispatch(fetchContextRequest(id));
 
-    api(getState).get(`/api/v1/statuses/${id}/context`).then(response => {
+    api().get(`/api/v1/statuses/${id}/context`).then(response => {
       dispatch(importFetchedStatuses(response.data.ancestors.concat(response.data.descendants)));
       dispatch(fetchContextSuccess(id, response.data.ancestors, response.data.descendants));
 
@@ -220,10 +220,10 @@ export function fetchContextFail(id, error) {
 }
 
 export function muteStatus(id) {
-  return (dispatch, getState) => {
+  return (dispatch) => {
     dispatch(muteStatusRequest(id));
 
-    api(getState).post(`/api/v1/statuses/${id}/mute`).then(() => {
+    api().post(`/api/v1/statuses/${id}/mute`).then(() => {
       dispatch(muteStatusSuccess(id));
     }).catch(error => {
       dispatch(muteStatusFail(id, error));
@@ -254,10 +254,10 @@ export function muteStatusFail(id, error) {
 }
 
 export function unmuteStatus(id) {
-  return (dispatch, getState) => {
+  return (dispatch) => {
     dispatch(unmuteStatusRequest(id));
 
-    api(getState).post(`/api/v1/statuses/${id}/unmute`).then(() => {
+    api().post(`/api/v1/statuses/${id}/unmute`).then(() => {
       dispatch(unmuteStatusSuccess(id));
     }).catch(error => {
       dispatch(unmuteStatusFail(id, error));
@@ -317,10 +317,10 @@ export function toggleStatusCollapse(id, isCollapsed) {
   };
 }
 
-export const translateStatus = id => (dispatch, getState) => {
+export const translateStatus = id => (dispatch) => {
   dispatch(translateStatusRequest(id));
 
-  api(getState).post(`/api/v1/statuses/${id}/translate`).then(response => {
+  api().post(`/api/v1/statuses/${id}/translate`).then(response => {
     dispatch(translateStatusSuccess(id, response.data));
   }).catch(error => {
     dispatch(translateStatusFail(id, error));
diff --git a/app/javascript/flavours/glitch/actions/suggestions.js b/app/javascript/flavours/glitch/actions/suggestions.js
index 8eafe38b21ae0e..258ffa901de5d1 100644
--- a/app/javascript/flavours/glitch/actions/suggestions.js
+++ b/app/javascript/flavours/glitch/actions/suggestions.js
@@ -10,10 +10,10 @@ export const SUGGESTIONS_FETCH_FAIL    = 'SUGGESTIONS_FETCH_FAIL';
 export const SUGGESTIONS_DISMISS = 'SUGGESTIONS_DISMISS';
 
 export function fetchSuggestions(withRelationships = false) {
-  return (dispatch, getState) => {
+  return (dispatch) => {
     dispatch(fetchSuggestionsRequest());
 
-    api(getState).get('/api/v2/suggestions', { params: { limit: 20 } }).then(response => {
+    api().get('/api/v2/suggestions', { params: { limit: 20 } }).then(response => {
       dispatch(importFetchedAccounts(response.data.map(x => x.account)));
       dispatch(fetchSuggestionsSuccess(response.data));
 
@@ -48,11 +48,11 @@ export function fetchSuggestionsFail(error) {
   };
 }
 
-export const dismissSuggestion = accountId => (dispatch, getState) => {
+export const dismissSuggestion = accountId => (dispatch) => {
   dispatch({
     type: SUGGESTIONS_DISMISS,
     id: accountId,
   });
 
-  api(getState).delete(`/api/v1/suggestions/${accountId}`).catch(() => {});
+  api().delete(`/api/v1/suggestions/${accountId}`).catch(() => {});
 };
diff --git a/app/javascript/flavours/glitch/actions/tags.js b/app/javascript/flavours/glitch/actions/tags.js
index dda8c924bb59a4..d18d7e514fc8f2 100644
--- a/app/javascript/flavours/glitch/actions/tags.js
+++ b/app/javascript/flavours/glitch/actions/tags.js
@@ -20,10 +20,10 @@ export const HASHTAG_UNFOLLOW_REQUEST = 'HASHTAG_UNFOLLOW_REQUEST';
 export const HASHTAG_UNFOLLOW_SUCCESS = 'HASHTAG_UNFOLLOW_SUCCESS';
 export const HASHTAG_UNFOLLOW_FAIL    = 'HASHTAG_UNFOLLOW_FAIL';
 
-export const fetchHashtag = name => (dispatch, getState) => {
+export const fetchHashtag = name => (dispatch) => {
   dispatch(fetchHashtagRequest());
 
-  api(getState).get(`/api/v1/tags/${name}`).then(({ data }) => {
+  api().get(`/api/v1/tags/${name}`).then(({ data }) => {
     dispatch(fetchHashtagSuccess(name, data));
   }).catch(err => {
     dispatch(fetchHashtagFail(err));
@@ -45,10 +45,10 @@ export const fetchHashtagFail = error => ({
   error,
 });
 
-export const fetchFollowedHashtags = () => (dispatch, getState) => {
+export const fetchFollowedHashtags = () => (dispatch) => {
   dispatch(fetchFollowedHashtagsRequest());
 
-  api(getState).get('/api/v1/followed_tags').then(response => {
+  api().get('/api/v1/followed_tags').then(response => {
     const next = getLinks(response).refs.find(link => link.rel === 'next');
     dispatch(fetchFollowedHashtagsSuccess(response.data, next ? next.uri : null));
   }).catch(err => {
@@ -87,7 +87,7 @@ export function expandFollowedHashtags() {
 
     dispatch(expandFollowedHashtagsRequest());
 
-    api(getState).get(url).then(response => {
+    api().get(url).then(response => {
       const next = getLinks(response).refs.find(link => link.rel === 'next');
       dispatch(expandFollowedHashtagsSuccess(response.data, next ? next.uri : null));
     }).catch(error => {
@@ -117,10 +117,10 @@ export function expandFollowedHashtagsFail(error) {
   };
 }
 
-export const followHashtag = name => (dispatch, getState) => {
+export const followHashtag = name => (dispatch) => {
   dispatch(followHashtagRequest(name));
 
-  api(getState).post(`/api/v1/tags/${name}/follow`).then(({ data }) => {
+  api().post(`/api/v1/tags/${name}/follow`).then(({ data }) => {
     dispatch(followHashtagSuccess(name, data));
   }).catch(err => {
     dispatch(followHashtagFail(name, err));
@@ -144,10 +144,10 @@ export const followHashtagFail = (name, error) => ({
   error,
 });
 
-export const unfollowHashtag = name => (dispatch, getState) => {
+export const unfollowHashtag = name => (dispatch) => {
   dispatch(unfollowHashtagRequest(name));
 
-  api(getState).post(`/api/v1/tags/${name}/unfollow`).then(({ data }) => {
+  api().post(`/api/v1/tags/${name}/unfollow`).then(({ data }) => {
     dispatch(unfollowHashtagSuccess(name, data));
   }).catch(err => {
     dispatch(unfollowHashtagFail(name, err));
diff --git a/app/javascript/flavours/glitch/actions/timelines.js b/app/javascript/flavours/glitch/actions/timelines.js
index 980b4af66dfd60..1fa2c3cde41e4a 100644
--- a/app/javascript/flavours/glitch/actions/timelines.js
+++ b/app/javascript/flavours/glitch/actions/timelines.js
@@ -125,7 +125,7 @@ export function expandTimeline(timelineId, path, params = {}, done = noOp) {
 
     dispatch(expandTimelineRequest(timelineId, isLoadingMore));
 
-    api(getState).get(path, { params }).then(response => {
+    api().get(path, { params }).then(response => {
       const next = getLinks(response).refs.find(link => link.rel === 'next');
 
       dispatch(importFetchedStatuses(response.data));
diff --git a/app/javascript/flavours/glitch/actions/trends.js b/app/javascript/flavours/glitch/actions/trends.js
index d314423884efe1..0b840b41ce6085 100644
--- a/app/javascript/flavours/glitch/actions/trends.js
+++ b/app/javascript/flavours/glitch/actions/trends.js
@@ -18,10 +18,10 @@ export const TRENDS_STATUSES_EXPAND_REQUEST = 'TRENDS_STATUSES_EXPAND_REQUEST';
 export const TRENDS_STATUSES_EXPAND_SUCCESS = 'TRENDS_STATUSES_EXPAND_SUCCESS';
 export const TRENDS_STATUSES_EXPAND_FAIL    = 'TRENDS_STATUSES_EXPAND_FAIL';
 
-export const fetchTrendingHashtags = () => (dispatch, getState) => {
+export const fetchTrendingHashtags = () => (dispatch) => {
   dispatch(fetchTrendingHashtagsRequest());
 
-  api(getState)
+  api()
     .get('/api/v1/trends/tags')
     .then(({ data }) => dispatch(fetchTrendingHashtagsSuccess(data)))
     .catch(err => dispatch(fetchTrendingHashtagsFail(err)));
@@ -45,10 +45,10 @@ export const fetchTrendingHashtagsFail = error => ({
   skipAlert: true,
 });
 
-export const fetchTrendingLinks = () => (dispatch, getState) => {
+export const fetchTrendingLinks = () => (dispatch) => {
   dispatch(fetchTrendingLinksRequest());
 
-  api(getState)
+  api()
     .get('/api/v1/trends/links')
     .then(({ data }) => dispatch(fetchTrendingLinksSuccess(data)))
     .catch(err => dispatch(fetchTrendingLinksFail(err)));
@@ -79,7 +79,7 @@ export const fetchTrendingStatuses = () => (dispatch, getState) => {
 
   dispatch(fetchTrendingStatusesRequest());
 
-  api(getState).get('/api/v1/trends/statuses').then(response => {
+  api().get('/api/v1/trends/statuses').then(response => {
     const next = getLinks(response).refs.find(link => link.rel === 'next');
     dispatch(importFetchedStatuses(response.data));
     dispatch(fetchTrendingStatusesSuccess(response.data, next ? next.uri : null));
@@ -115,7 +115,7 @@ export const expandTrendingStatuses = () => (dispatch, getState) => {
 
   dispatch(expandTrendingStatusesRequest());
 
-  api(getState).get(url).then(response => {
+  api().get(url).then(response => {
     const next = getLinks(response).refs.find(link => link.rel === 'next');
     dispatch(importFetchedStatuses(response.data));
     dispatch(expandTrendingStatusesSuccess(response.data, next ? next.uri : null));
diff --git a/app/javascript/flavours/glitch/api.ts b/app/javascript/flavours/glitch/api.ts
index de597a3e3b62f5..ccff68c373e5d6 100644
--- a/app/javascript/flavours/glitch/api.ts
+++ b/app/javascript/flavours/glitch/api.ts
@@ -2,8 +2,8 @@ import type { AxiosResponse, RawAxiosRequestHeaders } from 'axios';
 import axios from 'axios';
 import LinkHeader from 'http-link-header';
 
+import { getAccessToken } from './initial_state';
 import ready from './ready';
-import type { GetState } from './store';
 
 export const getLinks = (response: AxiosResponse) => {
   const value = response.headers.link as string | undefined;
@@ -29,30 +29,22 @@ const setCSRFHeader = () => {
 
 void ready(setCSRFHeader);
 
-export const authorizationTokenFromState = (getState?: GetState) => {
-  return (
-    getState && (getState().meta.get('access_token', '') as string | false)
-  );
-};
+const authorizationTokenFromInitialState = (): RawAxiosRequestHeaders => {
+  const accessToken = getAccessToken();
 
-const authorizationHeaderFromState = (getState?: GetState) => {
-  const accessToken = authorizationTokenFromState(getState);
-
-  if (!accessToken) {
-    return {};
-  }
+  if (!accessToken) return {};
 
   return {
     Authorization: `Bearer ${accessToken}`,
-  } as RawAxiosRequestHeaders;
+  };
 };
 
 // eslint-disable-next-line import/no-default-export
-export default function api(getState: GetState) {
+export default function api() {
   return axios.create({
     headers: {
       ...csrfHeader,
-      ...authorizationHeaderFromState(getState),
+      ...authorizationTokenFromInitialState(),
     },
 
     transformResponse: [
diff --git a/app/javascript/flavours/glitch/identity_context.tsx b/app/javascript/flavours/glitch/identity_context.tsx
index 28dcb1f14bfdd9..42d1b6c4751923 100644
--- a/app/javascript/flavours/glitch/identity_context.tsx
+++ b/app/javascript/flavours/glitch/identity_context.tsx
@@ -9,7 +9,6 @@ export interface IdentityContextType {
   signedIn: boolean;
   accountId: string | undefined;
   disabledAccountId: string | undefined;
-  accessToken: string | undefined;
   permissions: number;
 }
 
@@ -17,14 +16,12 @@ export const identityContextPropShape = PropTypes.shape({
   signedIn: PropTypes.bool.isRequired,
   accountId: PropTypes.string,
   disabledAccountId: PropTypes.string,
-  accessToken: PropTypes.string,
 }).isRequired;
 
 export const createIdentityContext = (state: InitialState) => ({
   signedIn: !!state.meta.me,
   accountId: state.meta.me,
   disabledAccountId: state.meta.disabled_account_id,
-  accessToken: state.meta.access_token,
   permissions: state.role?.permissions ?? 0,
 });
 
@@ -33,7 +30,6 @@ export const IdentityContext = createContext<IdentityContextType>({
   permissions: 0,
   accountId: undefined,
   disabledAccountId: undefined,
-  accessToken: undefined,
 });
 
 export const useIdentity = () => useContext(IdentityContext);
diff --git a/app/javascript/flavours/glitch/initial_state.js b/app/javascript/flavours/glitch/initial_state.js
index 1a408104186b4f..4492813fd3a6ce 100644
--- a/app/javascript/flavours/glitch/initial_state.js
+++ b/app/javascript/flavours/glitch/initial_state.js
@@ -143,4 +143,11 @@ export const pollLimits = (initialState && initialState.poll_limits);
 export const defaultContentType = getMeta('default_content_type');
 export const useSystemEmojiFont = getMeta('system_emoji_font');
 
+/**
+ * @returns {string | undefined}
+ */
+export function getAccessToken() {
+  return getMeta('access_token');
+}
+
 export default initialState;
diff --git a/app/javascript/flavours/glitch/reducers/meta.js b/app/javascript/flavours/glitch/reducers/meta.js
index 1fc669375c19bc..d729924099ac29 100644
--- a/app/javascript/flavours/glitch/reducers/meta.js
+++ b/app/javascript/flavours/glitch/reducers/meta.js
@@ -6,7 +6,6 @@ import { layoutFromWindow } from 'flavours/glitch/is_mobile';
 
 const initialState = ImmutableMap({
   streaming_api_base_url: null,
-  access_token: null,
   layout: layoutFromWindow(),
   permissions: '0',
 });
@@ -14,7 +13,8 @@ const initialState = ImmutableMap({
 export default function meta(state = initialState, action) {
   switch(action.type) {
   case STORE_HYDRATE:
-    return state.merge(action.state.get('meta')).set('permissions', action.state.getIn(['role', 'permissions']));
+    // we do not want `access_token` to be stored in the state
+    return state.merge(action.state.get('meta')).delete('access_token').set('permissions', action.state.getIn(['role', 'permissions']));
   case changeLayout.type:
     return state.set('layout', action.payload.layout);
   default:
diff --git a/app/javascript/flavours/glitch/stream.js b/app/javascript/flavours/glitch/stream.js
index ff3af5fd885c96..40d69136a84808 100644
--- a/app/javascript/flavours/glitch/stream.js
+++ b/app/javascript/flavours/glitch/stream.js
@@ -2,6 +2,8 @@
 
 import WebSocketClient from '@gamestdio/websocket';
 
+import { getAccessToken } from './initial_state';
+
 /**
  * @type {WebSocketClient | undefined}
  */
@@ -145,9 +147,11 @@ const channelNameWithInlineParams = (channelName, params) => {
 // @ts-expect-error
 export const connectStream = (channelName, params, callbacks) => (dispatch, getState) => {
   const streamingAPIBaseURL = getState().getIn(['meta', 'streaming_api_base_url']);
-  const accessToken = getState().getIn(['meta', 'access_token']);
+  const accessToken = getAccessToken();
   const { onConnect, onReceive, onDisconnect } = callbacks(dispatch, getState);
 
+  if(!accessToken) throw new Error("Trying to connect to the streaming server but no access token is available.");
+
   // If we cannot use a websockets connection, we must fall back
   // to using individual connections for each channel
   if (!streamingAPIBaseURL.startsWith('ws')) {
diff --git a/app/javascript/flavours/glitch/test_helpers.tsx b/app/javascript/flavours/glitch/test_helpers.tsx
index 69d57b95a0437b..09efda1e734ff2 100644
--- a/app/javascript/flavours/glitch/test_helpers.tsx
+++ b/app/javascript/flavours/glitch/test_helpers.tsx
@@ -17,7 +17,6 @@ class FakeIdentityWrapper extends Component<
       signedIn: PropTypes.bool.isRequired,
       accountId: PropTypes.string,
       disabledAccountId: PropTypes.string,
-      accessToken: PropTypes.string,
     }).isRequired,
   };
 
@@ -26,7 +25,6 @@ class FakeIdentityWrapper extends Component<
       identity: {
         signedIn: this.props.signedIn,
         accountId: '123',
-        accessToken: 'test-access-token',
       },
     };
   }

From c1054880a34be1455a9e726ba66dc0b4757ae9ca Mon Sep 17 00:00:00 2001
From: Jeremy Kescher <jeremy@kescher.at>
Date: Wed, 22 May 2024 23:58:09 +0200
Subject: [PATCH 1087/2191] Bump version to v4.3.0-alpha.3+glitch+cat+1.2.6

---
 CHANGELOG.md            | 3 +++
 lib/mastodon/version.rb | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b0c9517736347b..d137b1f4701bfd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 All changes to Catstodon that aren't Mastodon or glitch-soc Mastodon changes will be documented here.
 
+## [v4.3.0-alpha.3+glitch+cat+1.2.6] - 2024-05-23
+- Upstream changes
+
 ## [v4.3.0-alpha.3+glitch+cat+1.2.5] - 2024-05-21
 
 - Apply a fix from the emoji reactions patch branch for an issue introduced in the 1.2.3 release for this Mastodon version.
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index e6cc91f64874db..764f170dc6058c 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -25,7 +25,7 @@ def prerelease
     end
 
     def catstodon_revision
-      '1.2.5'
+      '1.2.6'
     end
 
     def build_metadata

From 21a08042108bf4d0f8b2a4526c647fb290d6c57d Mon Sep 17 00:00:00 2001
From: Jeremy Kescher <jeremy@kescher.at>
Date: Thu, 23 May 2024 01:16:21 +0200
Subject: [PATCH 1088/2191] Add ability to disable the suspicious sign in
 detector

The CatCatNya~ production config has an IP retention period of one day. That will cause suspicious login emails to be sent out simply because we don't have any known IP data.

Therefore, add an option disabling it.
---
 .env.production.catcatnya              |  1 +
 .env.production.sample                 |  8 +++++-
 README.md                              | 38 ++++++++++++++++++--------
 app/lib/suspicious_sign_in_detector.rb |  3 +-
 4 files changed, 37 insertions(+), 13 deletions(-)

diff --git a/.env.production.catcatnya b/.env.production.catcatnya
index 8ac33d4bcea5a7..1fd974704d1880 100644
--- a/.env.production.catcatnya
+++ b/.env.production.catcatnya
@@ -47,3 +47,4 @@ MAX_REACTIONS=3
 MAX_SEARCH_RESULTS=1000
 MAX_REMOTE_EMOJI_SIZE=1048576
 IP_RETENTION_PERIOD=86400
+ENABLE_SUSPICIOUS_SIGN_IN=false
diff --git a/.env.production.sample b/.env.production.sample
index 850c533d8476bd..726c5ada1c13e2 100644
--- a/.env.production.sample
+++ b/.env.production.sample
@@ -307,8 +307,14 @@ MAX_REACTIONS=1
 
 # IP and session retention
 # -----------------------
-# Make sure to modify the scheduling of ip_cleanup_scheduler in config/sidekiq.yml
+# Make sure to modify the scheduling of ip_cleanup_scheduler in config/sidekiq.yml (already applied for Catstodon)
 # to be less than daily if you lower IP_RETENTION_PERIOD below two days (172800).
 # -----------------------
 IP_RETENTION_PERIOD=31556952
 SESSION_RETENTION_PERIOD=31556952
+
+# In case you've shortened IP retention a lot, you may want to disable the suspicious sign in detector entirely,
+# in order to avoid spurious "suspicious login detected" emails being sent to users.
+# The default is true, because for the default retention period of one year, there is good data for such emails.
+# For instances having a retention period of merely a day, that may not be enough, so you may set it to false.
+#ENABLE_SUSPICIOUS_SIGN_IN=false
diff --git a/README.md b/README.md
index 2221831248c309..aa2fb512656e03 100644
--- a/README.md
+++ b/README.md
@@ -2,10 +2,13 @@
 
 ## Introduction
 
-This Mastodon fork is based on the [glitch-soc Fork of Mastodon](https://github.com/glitch-soc/mastodon), with changes made to suit [CatCatNya~](https://catcatnya.com).
-I intend to contribute some useful differences back to [glitch-soc](https://github.com/glitch-soc/mastodon) and [vanilla Mastodon](https://github.com/mastodon/mastodon).
+This Mastodon fork is based on the [glitch-soc Fork of Mastodon](https://github.com/glitch-soc/mastodon), with changes
+made to suit [CatCatNya~](https://catcatnya.com).
+I intend to contribute some useful differences back to [glitch-soc](https://github.com/glitch-soc/mastodon)
+and [vanilla Mastodon](https://github.com/mastodon/mastodon).
 
-To install, take a look at [glitch-soc.github.io/docs/](https://glitch-soc.github.io/docs/). The instructions and features are the same, except for the differences outlined below.
+To install, take a look at [glitch-soc.github.io/docs/](https://glitch-soc.github.io/docs/). The instructions and
+features are the same, except for the differences outlined below.
 
 Contributing guidelines are available [here](CONTRIBUTING.md).
 
@@ -20,22 +23,35 @@ instead, use merge (fast-forward, if possible, with merge commit otherwise).
 - Some files are adjusted specifically for the CatCatNya~ instance. Specifically, these:
   - sounds/boop.mp3
   - sounds/boop.ogg
-    <br>You might want to revert these to the upstream files (or your own versions!) if you decide to use this fork for your own instance.
+    <br>You might want to revert these to the upstream files (or your own versions!) if you decide to use this fork for
+    your own instance.
 - The rate limits for authenticated users have been relaxed a bit.
-- The API endpoint `/api/v1/custom_emojis` is no longer affected by AUTHORIZED_FETCH, allowing anyone to copy custom emojis.
+- The API endpoint `/api/v1/custom_emojis` is no longer affected by AUTHORIZED_FETCH, allowing anyone to copy custom
+  emojis.
 - Allow higher resolution images. (4096x4096 instead of the previous limit of 3840x2160)
 - Allow posting polls with only one poll option (if `MIN_POLL_OPTIONS` is set to 1 on your instance).
-- Added oatstodon flavour (taken from [types.pl fork](https://github.com/ralsei/types.pl), by [@oat@hellsite.site](https://hellsite.site/@oat)), with slight adjustments since.
-- Emoji reactions on statuses (with both Unicode and custom emojis, same as for announcements), a feature originally developed for [Nyastodon](https://git.bsd.gay/fef/nyastodon).
-  Ended up as a Catstodon-maintained patch after its initial two Pull Requests to glitch-soc, but was handed over to [Essem's fork, Chuckya](https://github.com/TheEssem/mastodon) and is now pending [its fourth attempt of merging into glitch-soc](https://github.com/glitch-soc/mastodon/pull/2462).
+- Added oatstodon flavour (taken from [types.pl fork](https://github.com/ralsei/types.pl),
+  by [@oat@hellsite.site](https://hellsite.site/@oat)), with slight adjustments since.
+- Emoji reactions on statuses (with both Unicode and custom emojis, same as for announcements), a feature originally
+  developed for [Nyastodon](https://git.bsd.gay/fef/nyastodon).
+  Ended up as a Catstodon-maintained patch after its initial two Pull Requests to glitch-soc, but was handed over
+  to [Essem's fork, Chuckya](https://github.com/TheEssem/mastodon) and is now
+  pending [its fourth attempt of merging into glitch-soc](https://github.com/glitch-soc/mastodon/pull/2462).
 - Lifts the "only federate local favourites" restriction on favourites/likes and emoji reactions.
-- Cherry-picks the [activity filter branch](https://github.com/chikorita157/mastodon-sakura/tree/newmain-tmp3-noellabo-filtering) from [Sakurajima Mastodon](https://github.com/chikorita157/mastodon-sakura).
+- Cherry-picks the
+  [activity filter branch](https://github.com/chikorita157/mastodon-sakura/tree/newmain-tmp3-noellabo-filtering)
+  from [Sakurajima Mastodon](https://github.com/chikorita157/mastodon-sakura).
+- Adds the ability to disable the suspicious sign in detection entirely.
+  - Useful for situations where the instance may not have up-to-date IP information, such as when the period of IP
+    address retention is set to a low value (see *Previous differences now merged into vanilla Mastodon*)
 
 ## Previous differences now merged into glitch-soc
 
-- Fixed incorrect upload size limit display when adding new a new custom emoji. ([Pull request](https://github.com/glitch-soc/mastodon/pull/1763))
+- Fixed incorrect upload size limit display when adding new a new custom
+  emoji. ([Pull request](https://github.com/glitch-soc/mastodon/pull/1763))
 - Everything merged into vanilla Mastodon
 
 ## Previous differences now merged into vanilla Mastodon
 
-- The period of retention of IP addresses and sessions was made configurable. ([Pull request](https://github.com/mastodon/mastodon/pull/18757))
+- The period of retention of IP addresses and sessions was made
+  configurable. ([Pull request](https://github.com/mastodon/mastodon/pull/18757))
diff --git a/app/lib/suspicious_sign_in_detector.rb b/app/lib/suspicious_sign_in_detector.rb
index 74f49aa5587e7d..de5b6026a8f4b2 100644
--- a/app/lib/suspicious_sign_in_detector.rb
+++ b/app/lib/suspicious_sign_in_detector.rb
@@ -3,13 +3,14 @@
 class SuspiciousSignInDetector
   IPV6_TOLERANCE_MASK = 64
   IPV4_TOLERANCE_MASK = 16
+  ENABLE_SUSPICIOUS_SIGN_IN = ENV['ENABLE_SUSPICIOUS_SIGN_IN'] != 'false'
 
   def initialize(user)
     @user = user
   end
 
   def suspicious?(request)
-    !sufficient_security_measures? && !freshly_signed_up? && !previously_seen_ip?(request)
+    !sufficient_security_measures? && !freshly_signed_up? && !previously_seen_ip?(request) if DISABLE_SUSPICIOUS_SIGN_IN
   end
 
   private

From 15d307075479cf93ea199be0f25820003ddbe27c Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Thu, 23 May 2024 09:30:48 +0200
Subject: [PATCH 1089/2191] Fix some API calls that should not use an API token
 (#30401)

---
 app/javascript/mastodon/api.ts                                | 4 ++--
 app/javascript/mastodon/components/admin/Counter.jsx          | 2 +-
 app/javascript/mastodon/components/admin/Dimension.jsx        | 2 +-
 app/javascript/mastodon/components/admin/ImpactReport.jsx     | 2 +-
 .../mastodon/components/admin/ReportReasonSelector.jsx        | 4 ++--
 app/javascript/mastodon/components/admin/Retention.jsx        | 2 +-
 app/javascript/mastodon/components/admin/Trends.jsx           | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/javascript/mastodon/api.ts b/app/javascript/mastodon/api.ts
index ccff68c373e5d6..2ccf178f00ea92 100644
--- a/app/javascript/mastodon/api.ts
+++ b/app/javascript/mastodon/api.ts
@@ -40,11 +40,11 @@ const authorizationTokenFromInitialState = (): RawAxiosRequestHeaders => {
 };
 
 // eslint-disable-next-line import/no-default-export
-export default function api() {
+export default function api(withAuthorization = true) {
   return axios.create({
     headers: {
       ...csrfHeader,
-      ...authorizationTokenFromInitialState(),
+      ...(withAuthorization ? authorizationTokenFromInitialState() : {}),
     },
 
     transformResponse: [
diff --git a/app/javascript/mastodon/components/admin/Counter.jsx b/app/javascript/mastodon/components/admin/Counter.jsx
index 6ce23c9f05e2cb..e4d21da6271ef5 100644
--- a/app/javascript/mastodon/components/admin/Counter.jsx
+++ b/app/javascript/mastodon/components/admin/Counter.jsx
@@ -48,7 +48,7 @@ export default class Counter extends PureComponent {
   componentDidMount () {
     const { measure, start_at, end_at, params } = this.props;
 
-    api().post('/api/v1/admin/measures', { keys: [measure], start_at, end_at, [measure]: params }).then(res => {
+    api(false).post('/api/v1/admin/measures', { keys: [measure], start_at, end_at, [measure]: params }).then(res => {
       this.setState({
         loading: false,
         data: res.data,
diff --git a/app/javascript/mastodon/components/admin/Dimension.jsx b/app/javascript/mastodon/components/admin/Dimension.jsx
index bfda6c93d7fb55..56557ad8e85453 100644
--- a/app/javascript/mastodon/components/admin/Dimension.jsx
+++ b/app/javascript/mastodon/components/admin/Dimension.jsx
@@ -26,7 +26,7 @@ export default class Dimension extends PureComponent {
   componentDidMount () {
     const { start_at, end_at, dimension, limit, params } = this.props;
 
-    api().post('/api/v1/admin/dimensions', { keys: [dimension], start_at, end_at, limit, [dimension]: params }).then(res => {
+    api(false).post('/api/v1/admin/dimensions', { keys: [dimension], start_at, end_at, limit, [dimension]: params }).then(res => {
       this.setState({
         loading: false,
         data: res.data,
diff --git a/app/javascript/mastodon/components/admin/ImpactReport.jsx b/app/javascript/mastodon/components/admin/ImpactReport.jsx
index c27ee0ab08102f..add54134b6fe92 100644
--- a/app/javascript/mastodon/components/admin/ImpactReport.jsx
+++ b/app/javascript/mastodon/components/admin/ImpactReport.jsx
@@ -27,7 +27,7 @@ export default class ImpactReport extends PureComponent {
       include_subdomains: true,
     };
 
-    api().post('/api/v1/admin/measures', {
+    api(false).post('/api/v1/admin/measures', {
       keys: ['instance_accounts', 'instance_follows', 'instance_followers'],
       start_at: null,
       end_at: null,
diff --git a/app/javascript/mastodon/components/admin/ReportReasonSelector.jsx b/app/javascript/mastodon/components/admin/ReportReasonSelector.jsx
index 90f4334a6e1ad2..cc05e5c163c320 100644
--- a/app/javascript/mastodon/components/admin/ReportReasonSelector.jsx
+++ b/app/javascript/mastodon/components/admin/ReportReasonSelector.jsx
@@ -105,7 +105,7 @@ class ReportReasonSelector extends PureComponent {
   };
 
   componentDidMount() {
-    api().get('/api/v1/instance').then(res => {
+    api(false).get('/api/v1/instance').then(res => {
       this.setState({
         rules: res.data.rules,
       });
@@ -122,7 +122,7 @@ class ReportReasonSelector extends PureComponent {
       return;
     }
 
-    api().put(`/api/v1/admin/reports/${id}`, {
+    api(false).put(`/api/v1/admin/reports/${id}`, {
       category,
       rule_ids: category === 'violation' ? rule_ids : [],
     }).catch(err => {
diff --git a/app/javascript/mastodon/components/admin/Retention.jsx b/app/javascript/mastodon/components/admin/Retention.jsx
index 1e8ef48b7abde3..87746e9f497bf6 100644
--- a/app/javascript/mastodon/components/admin/Retention.jsx
+++ b/app/javascript/mastodon/components/admin/Retention.jsx
@@ -34,7 +34,7 @@ export default class Retention extends PureComponent {
   componentDidMount () {
     const { start_at, end_at, frequency } = this.props;
 
-    api().post('/api/v1/admin/retention', { start_at, end_at, frequency }).then(res => {
+    api(false).post('/api/v1/admin/retention', { start_at, end_at, frequency }).then(res => {
       this.setState({
         loading: false,
         data: res.data,
diff --git a/app/javascript/mastodon/components/admin/Trends.jsx b/app/javascript/mastodon/components/admin/Trends.jsx
index c69b4a8cbaf414..fd6db106d54183 100644
--- a/app/javascript/mastodon/components/admin/Trends.jsx
+++ b/app/javascript/mastodon/components/admin/Trends.jsx
@@ -22,7 +22,7 @@ export default class Trends extends PureComponent {
   componentDidMount () {
     const { limit } = this.props;
 
-    api().get('/api/v1/admin/trends/tags', { params: { limit } }).then(res => {
+    api(false).get('/api/v1/admin/trends/tags', { params: { limit } }).then(res => {
       this.setState({
         loading: false,
         data: res.data,

From 5b5a35cf96de51b5ef44f69dcde1e3dc2acb9dd6 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 23 May 2024 10:26:29 +0200
Subject: [PATCH 1090/2191] New Crowdin Translations (automated) (#30402)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/be.json |   1 +
 app/javascript/mastodon/locales/lv.json |   2 +-
 config/locales/an.yml                   |   1 -
 config/locales/ar.yml                   |   1 -
 config/locales/ast.yml                  |   2 -
 config/locales/be.yml                   |   1 -
 config/locales/bg.yml                   |   2 +-
 config/locales/ca.yml                   |   2 +-
 config/locales/ckb.yml                  |   1 -
 config/locales/co.yml                   |   1 -
 config/locales/cs.yml                   |   1 -
 config/locales/cy.yml                   |   3 +-
 config/locales/da.yml                   |   2 +-
 config/locales/de.yml                   |   2 +-
 config/locales/devise.lt.yml            |   2 +-
 config/locales/el.yml                   |   1 -
 config/locales/en-GB.yml                |   1 -
 config/locales/eo.yml                   |   1 -
 config/locales/es-AR.yml                |   2 +-
 config/locales/es-MX.yml                |   2 +-
 config/locales/es.yml                   |   2 +-
 config/locales/et.yml                   |   1 -
 config/locales/eu.yml                   |   1 -
 config/locales/fa.yml                   |   1 -
 config/locales/fi.yml                   |   1 -
 config/locales/fo.yml                   |   2 +-
 config/locales/fr-CA.yml                |   1 -
 config/locales/fr.yml                   |   1 -
 config/locales/fy.yml                   |   1 -
 config/locales/gd.yml                   |   1 -
 config/locales/gl.yml                   |   2 +-
 config/locales/he.yml                   |   2 +-
 config/locales/hu.yml                   |   2 +-
 config/locales/ia.yml                   |   2 +-
 config/locales/id.yml                   |   1 -
 config/locales/ie.yml                   |   1 -
 config/locales/io.yml                   |   1 -
 config/locales/is.yml                   |   2 +-
 config/locales/it.yml                   |   2 +-
 config/locales/ja.yml                   |   1 -
 config/locales/kk.yml                   |   1 -
 config/locales/ko.yml                   |   2 +-
 config/locales/ku.yml                   |   1 -
 config/locales/lad.yml                  |   1 -
 config/locales/lt.yml                   | 148 ++++++++++++++++++++----
 config/locales/lv.yml                   |   1 -
 config/locales/ms.yml                   |   1 -
 config/locales/my.yml                   |   1 -
 config/locales/nl.yml                   |   2 +-
 config/locales/nn.yml                   |   1 -
 config/locales/no.yml                   |   1 -
 config/locales/oc.yml                   |   1 -
 config/locales/pl.yml                   |   2 +-
 config/locales/pt-BR.yml                |   1 -
 config/locales/pt-PT.yml                |   2 +-
 config/locales/ru.yml                   |   1 -
 config/locales/sc.yml                   |   1 -
 config/locales/sco.yml                  |   1 -
 config/locales/si.yml                   |   1 -
 config/locales/simple_form.lt.yml       |   7 ++
 config/locales/simple_form.nl.yml       |   4 +-
 config/locales/simple_form.sr-Latn.yml  |  10 +-
 config/locales/simple_form.sr.yml       |  12 +-
 config/locales/sk.yml                   |   1 -
 config/locales/sl.yml                   |   2 +-
 config/locales/sq.yml                   |   3 +-
 config/locales/sr-Latn.yml              |   8 +-
 config/locales/sr.yml                   |   8 +-
 config/locales/sv.yml                   |   1 -
 config/locales/th.yml                   |   1 -
 config/locales/tr.yml                   |   2 +-
 config/locales/uk.yml                   |   1 -
 config/locales/vi.yml                   |   1 -
 config/locales/zh-CN.yml                |   2 +-
 config/locales/zh-HK.yml                |   1 -
 config/locales/zh-TW.yml                |   2 +-
 76 files changed, 182 insertions(+), 113 deletions(-)

diff --git a/app/javascript/mastodon/locales/be.json b/app/javascript/mastodon/locales/be.json
index 2b7673312fbe57..61e96e4b585b91 100644
--- a/app/javascript/mastodon/locales/be.json
+++ b/app/javascript/mastodon/locales/be.json
@@ -469,6 +469,7 @@
   "notification.follow": "{name} падпісаўся на вас",
   "notification.follow_request": "{name} адправіў запыт на падпіску",
   "notification.mention": "{name} згадаў вас",
+  "notification.moderation-warning.learn_more": "Даведацца больш",
   "notification.own_poll": "Ваша апытанне скончылася",
   "notification.poll": "Апытанне, дзе вы прынялі ўдзел, скончылася",
   "notification.reblog": "{name} пашырыў ваш допіс",
diff --git a/app/javascript/mastodon/locales/lv.json b/app/javascript/mastodon/locales/lv.json
index e7ab114909aa42..b61a2c0c360c5d 100644
--- a/app/javascript/mastodon/locales/lv.json
+++ b/app/javascript/mastodon/locales/lv.json
@@ -491,7 +491,7 @@
   "onboarding.actions.go_to_home": "Dodieties uz manu mājas plūsmu",
   "onboarding.compose.template": "Sveiki, #Mastodon!",
   "onboarding.follows.empty": "Diemžēl pašlaik nevar parādīt rezultātus. Vari mēģināt izmantot meklēšanu vai pārlūkot izpētes lapu, lai atrastu cilvēkus, kuriem sekot, vai vēlāk mēģināt vēlreiz.",
-  "onboarding.follows.lead": "Tava mājas plūsma ir galvenais veids, kā izbaudīt Mastodon. Jo vairāk cilvēku sekosi, jo aktīvāk un interesantāk tas būs. Lai sāktu, šeit ir daži ieteikumi:",
+  "onboarding.follows.lead": "Tava mājas plūsma ir galvenais veids, kā pieredzēt Mastodon. Jo vairāk cilvēkiem sekosi, jo dzīvīgāka un aizraujošāka tā būs. Lai sāktu, šeit ir daži ieteikumi:",
   "onboarding.follows.title": "Pielāgo savu mājas barotni",
   "onboarding.profile.discoverable": "Padarīt manu profilu atklājamu",
   "onboarding.profile.display_name": "Attēlojamais vārds",
diff --git a/config/locales/an.yml b/config/locales/an.yml
index 068a20187d6963..637aa8c8b37cdc 100644
--- a/config/locales/an.yml
+++ b/config/locales/an.yml
@@ -852,7 +852,6 @@ an:
       delete: Borrar
       edit_preset: Editar aviso predeterminau
       empty: Encara no has definiu garra preajuste d'alvertencia.
-      title: Editar configuración predeterminada d'avisos
     webhooks:
       add_new: Anyadir endpoint
       delete: Eliminar
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 02ba56d0b23213..2ca7538c324d00 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -1013,7 +1013,6 @@ ar:
       delete: حذف
       edit_preset: تعديل نموذج التحذير
       empty: لم تحدد أي إعدادات تحذير مسبقة بعد.
-      title: إدارة نماذج التحذير
     webhooks:
       add_new: إضافة نقطة نهاية
       delete: حذف
diff --git a/config/locales/ast.yml b/config/locales/ast.yml
index 816858d4a09277..9e6ec6d2330cb9 100644
--- a/config/locales/ast.yml
+++ b/config/locales/ast.yml
@@ -400,8 +400,6 @@ ast:
         usable: Pue usase
       title: Tendencies
       trending: En tendencia
-    warning_presets:
-      title: Xestión d'alvertencies preconfiguraes
     webhooks:
       add_new: Amestar un estremu
       delete: Desaniciar
diff --git a/config/locales/be.yml b/config/locales/be.yml
index 13daa9897e7534..6f1f189523e61e 100644
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -983,7 +983,6 @@ be:
       delete: Выдаліць
       edit_preset: Рэдагаваць шаблон папярэджання
       empty: Вы яшчэ не вызначылі ніякіх шаблонаў папярэджанняў.
-      title: Кіраванне шаблонамі папярэджанняў
     webhooks:
       add_new: Дадаць канцавую кропку
       delete: Выдаліць
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 51180bc66f2724..5aca8ad0fd3918 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -951,7 +951,7 @@ bg:
       delete: Изтриване
       edit_preset: Редакция на предварителните настройки
       empty: Все още няма предварителни настройки за предупрежденията.
-      title: Управление на предварителните настройки
+      title: Предупредителни образци
     webhooks:
       add_new: Добавяне на крайна точка
       delete: Изтриване
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 34fd9008516ac0..ec32f771e929c8 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -951,7 +951,7 @@ ca:
       delete: Elimina
       edit_preset: Edita l'avís predeterminat
       empty: Encara no has definit cap preavís.
-      title: Gestiona les configuracions predefinides dels avisos
+      title: Predefinicions d'avís
     webhooks:
       add_new: Afegir extrem
       delete: Elimina
diff --git a/config/locales/ckb.yml b/config/locales/ckb.yml
index dfa035eca81cb7..93eea8273f514b 100644
--- a/config/locales/ckb.yml
+++ b/config/locales/ckb.yml
@@ -548,7 +548,6 @@ ckb:
       add_new: زیادکردنی نوێ
       delete: سڕینەوە
       edit_preset: دەستکاریکردنی ئاگاداری پێشگریمان
-      title: بەڕێوەبردنی ئاگادارکردنەوە پێش‌سازدان
   admin_mailer:
     new_pending_account:
       body: وردەکاریهەژمارە نوێیەکە لە خوارەوەیە. دەتوانیت ئەم نەرمەکالا پەسەند بکەیت یان ڕەت بکەیتەوە.
diff --git a/config/locales/co.yml b/config/locales/co.yml
index 7d8abcd112e6b8..6edbbc95ffb31f 100644
--- a/config/locales/co.yml
+++ b/config/locales/co.yml
@@ -510,7 +510,6 @@ co:
       add_new: Aghjunghje
       delete: Sguassà
       edit_preset: Cambià a preselezzione d'avertimentu
-      title: Amministrà e preselezzione d'avertimentu
   admin_mailer:
     new_pending_account:
       body: I ditagli di u novu contu sò quì sottu. Pudete appruvà o righjittà a dumanda.
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 56930773193a40..17c743f1de5b5e 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -984,7 +984,6 @@ cs:
       delete: Smazat
       edit_preset: Upravit předlohu pro varování
       empty: Zatím jste nedefinovali žádné předlohy varování.
-      title: Spravovat předlohy pro varování
     webhooks:
       add_new: Přidat koncový bod
       delete: Smazat
diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index f96068f212b083..35ed5ade8aa913 100644
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@@ -297,6 +297,7 @@ cy:
         update_custom_emoji_html: Mae %{name} wedi diweddaru emoji %{target}
         update_domain_block_html: Mae %{name} wedi diweddaru bloc parth %{target}
         update_ip_block_html: Mae %{name} wedi newid rheol IP %{target}
+        update_report_html: Mae %{name} wedi diweddaru adroddiad %{target}
         update_status_html: Mae %{name} wedi diweddaru postiad gan %{target}
         update_user_role_html: Mae %{name} wedi newid rôl %{target}
       deleted_account: cyfrif wedi'i ddileu
@@ -1018,7 +1019,7 @@ cy:
       delete: Dileu
       edit_preset: Golygu rhagosodiad rhybudd
       empty: Nid ydych wedi diffinio unrhyw ragosodiadau rhybudd eto.
-      title: Rheoli rhagosodiadau rhybudd
+      title: Rhagosodiadau rhybuddion
     webhooks:
       add_new: Ychwanegu diweddbwynt
       delete: Dileu
diff --git a/config/locales/da.yml b/config/locales/da.yml
index 17d3037a75a505..f37086264fd2d9 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -951,7 +951,7 @@ da:
       delete: Slet
       edit_preset: Redigér advarselsforvalg
       empty: Ingen advarselsforvalg defineret endnu.
-      title: Håndtérr advarselsforvalg
+      title: Præindstillinger for advarsel
     webhooks:
       add_new: Tilføj endepunkt
       delete: Slet
diff --git a/config/locales/de.yml b/config/locales/de.yml
index dd2129584fbe7a..11460c3b401763 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -951,7 +951,7 @@ de:
       delete: Löschen
       edit_preset: Warnvorlage bearbeiten
       empty: Du hast noch keine Warnvorlagen hinzugefügt.
-      title: Warnvorlagen verwalten
+      title: Warnvorlagen
     webhooks:
       add_new: Endpunkt hinzufügen
       delete: Löschen
diff --git a/config/locales/devise.lt.yml b/config/locales/devise.lt.yml
index ec5b852727c87a..e36e60a7588485 100644
--- a/config/locales/devise.lt.yml
+++ b/config/locales/devise.lt.yml
@@ -22,7 +22,7 @@ lt:
         action: Patvirtinti el. pašto adresą
         action_with_app: Patvirtinti ir grįžti į %{app}
         explanation: Šiuo el. pašto adresu sukūrei paskyrą %{host}. Iki jos aktyvavimo liko vienas paspaudimas. Jei tai buvo ne tu, ignoruok šį el. laišką.
-        explanation_when_pending: Šiuo el. pašto adresu pateikei paraišką pakvietimui į %{host}. Kai patvirtinsi savo el. pašto adresą, mes peržiūrėsime tavo paraišką. Gali prisijungti ir pakeisti savo duomenis arba ištrinti paskyrą, tačiau negalėsi naudotis daugeliu funkcijų, kol tavo paskyra nebus patvirtinta. Jei tavo paraiška bus atmesta, duomenys bus pašalinti, todėl jokių papildomų veiksmų iš tavęs nereikės. Jei tai buvo ne tu, ignoruok šį el. laišką.
+        explanation_when_pending: Šiuo el. pašto adresu pateikei paraišką pakvietimui į %{host}. Kai patvirtinsi savo el. pašto adresą, mes peržiūrėsime tavo paraišką. Gali prisijungti ir pakeisti savo duomenis arba ištrinti paskyrą, bet negalėsi naudotis daugeliu funkcijų, kol tavo paskyra nebus patvirtinta. Jei tavo paraiška bus atmesta, duomenys bus pašalinti, todėl jokių papildomų veiksmų iš tavęs nereikės. Jei tai buvo ne tu, ignoruok šį el. laišką.
         extra_html: Taip pat peržiūrėk <a href="%{terms_path}">serverio taisykles</a> ir <a href="%{policy_path}">mūsų paslaugų teikimo sąlygas</a>.
         subject: 'Mastodon: patvirtinimo instrukcijos %{instance}'
         title: Patvirtinti el. pašto adresą
diff --git a/config/locales/el.yml b/config/locales/el.yml
index 2e7ac87463679d..47b2250f0e04e3 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -903,7 +903,6 @@ el:
       delete: Διαγραφή
       edit_preset: Ενημέρωση προκαθορισμένης προειδοποίησης
       empty: Δεν έχετε ακόμη ορίσει κάποια προκαθορισμένη προειδοποίηση.
-      title: Διαχείριση προκαθορισμένων προειδοποιήσεων
     webhooks:
       add_new: Προσθήκη σημείου τερματισμού
       delete: Διαγραφή
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 7cd888b3732837..07eb84ebbef0a8 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -950,7 +950,6 @@ en-GB:
       delete: Delete
       edit_preset: Edit warning preset
       empty: You haven't defined any warning presets yet.
-      title: Warning presets
     webhooks:
       add_new: Add endpoint
       delete: Delete
diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index 749f80687df6de..95e3dd5a8d9e03 100644
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -919,7 +919,6 @@ eo:
       delete: Forigi
       edit_preset: Redakti avertan antaŭagordon
       empty: Vi ankoraŭ ne difinis iun ajn antaŭagordon de averto.
-      title: Administri avertajn antaŭagordojn
     webhooks:
       add_new: Aldoni finpunkton
       delete: Forigi
diff --git a/config/locales/es-AR.yml b/config/locales/es-AR.yml
index 302be44112eec1..d6bfb60a19649f 100644
--- a/config/locales/es-AR.yml
+++ b/config/locales/es-AR.yml
@@ -951,7 +951,7 @@ es-AR:
       delete: Eliminar
       edit_preset: Editar preajuste de advertencia
       empty: Aún no ha definido ningún preajuste de advertencia.
-      title: Administrar preajustes de advertencia
+      title: Preajustes de advertencia
     webhooks:
       add_new: Agregar punto final
       delete: Eliminar
diff --git a/config/locales/es-MX.yml b/config/locales/es-MX.yml
index 10806c6b6cb312..8f4aa183d833a4 100644
--- a/config/locales/es-MX.yml
+++ b/config/locales/es-MX.yml
@@ -951,7 +951,7 @@ es-MX:
       delete: Borrar
       edit_preset: Editar aviso predeterminado
       empty: Aún no has definido ningún preajuste de advertencia.
-      title: Editar configuración predeterminada de avisos
+      title: Preajustes de advertencia
     webhooks:
       add_new: Añadir endpoint
       delete: Eliminar
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 840bc2ce9b0818..343f6f5a6363fb 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -951,7 +951,7 @@ es:
       delete: Borrar
       edit_preset: Editar aviso predeterminado
       empty: Aún no has definido ningún preajuste de advertencia.
-      title: Editar configuración predeterminada de avisos
+      title: Preajustes de advertencia
     webhooks:
       add_new: Añadir endpoint
       delete: Eliminar
diff --git a/config/locales/et.yml b/config/locales/et.yml
index a544d8063dbb32..172aad25b93ea6 100644
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -949,7 +949,6 @@ et:
       delete: Kustuta
       edit_preset: Hoiatuse eelseadistuse muutmine
       empty: Hoiatuste eelseadeid pole defineeritud.
-      title: Halda hoiatuste eelseadistusi
     webhooks:
       add_new: Lisa lõpp-punkt
       delete: Kustuta
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index 22ca8135d51262..67da357e1de98d 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -952,7 +952,6 @@ eu:
       delete: Ezabatu
       edit_preset: Editatu abisu aurre-ezarpena
       empty: Ez duzu abisu aurrezarpenik definitu oraindik.
-      title: Kudeatu abisu aurre-ezarpenak
     webhooks:
       add_new: Gehitu amaiera-puntua
       delete: Ezabatu
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index d93d2e7d5f1096..509d69fcba71c8 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -808,7 +808,6 @@ fa:
       delete: زدودن
       edit_preset: ویرایش هشدار پیش‌فرض
       empty: هنز هیچ پیش‌تنظیم هشداری را تعریف نکرده‌اید.
-      title: مدیریت هشدارهای پیش‌فرض
     webhooks:
       add_new: افزودن نقطهٔ پایانی
       delete: حذف
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 53db0232aa5d2b..3a75066d5bd39a 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -951,7 +951,6 @@ fi:
       delete: Poista
       edit_preset: Muokkaa varoituksen esiasetusta
       empty: Et ole vielä määrittänyt yhtäkään varoitusten esiasetusta.
-      title: Hallitse varoitusten esiasetuksia
     webhooks:
       add_new: Lisää päätepiste
       delete: Poista
diff --git a/config/locales/fo.yml b/config/locales/fo.yml
index 57caff4d716945..0372d3dca3e875 100644
--- a/config/locales/fo.yml
+++ b/config/locales/fo.yml
@@ -951,7 +951,7 @@ fo:
       delete: Strika
       edit_preset: Rætta ávaringar-undanstilling
       empty: Tú hevur ikki ásett nakrar ávaringar-undanstillingar enn.
-      title: Stýr ávaringar-undanstillingar
+      title: Undanstillingar fyri ávaring
     webhooks:
       add_new: Legg endapunkt afturat
       delete: Strika
diff --git a/config/locales/fr-CA.yml b/config/locales/fr-CA.yml
index 05d6b8864d8d4a..f297e8bfdea780 100644
--- a/config/locales/fr-CA.yml
+++ b/config/locales/fr-CA.yml
@@ -949,7 +949,6 @@ fr-CA:
       delete: Supprimer
       edit_preset: Éditer les avertissements prédéfinis
       empty: Vous n'avez pas encore créé de paramètres prédéfinis pour les avertissements.
-      title: Gérer les avertissements prédéfinis
     webhooks:
       add_new: Ajouter un point de terminaison
       delete: Supprimer
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 6ab42088014fcb..33cdcd44cc5477 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -949,7 +949,6 @@ fr:
       delete: Supprimer
       edit_preset: Éditer les avertissements prédéfinis
       empty: Vous n'avez pas encore créé de paramètres prédéfinis pour les avertissements.
-      title: Gérer les avertissements prédéfinis
     webhooks:
       add_new: Ajouter un point de terminaison
       delete: Supprimer
diff --git a/config/locales/fy.yml b/config/locales/fy.yml
index 1f1a27fec4b41c..c8e287732a7c54 100644
--- a/config/locales/fy.yml
+++ b/config/locales/fy.yml
@@ -949,7 +949,6 @@ fy:
       delete: Fuortsmite
       edit_preset: Foarynstelling foar warskôging bewurkje
       empty: Jo hawwe noch gjin foarynstellingen foar warskôgingen tafoege.
-      title: Foarynstellingen foar warskôgingen beheare
     webhooks:
       add_new: Einpunt tafoegje
       delete: Fuortsmite
diff --git a/config/locales/gd.yml b/config/locales/gd.yml
index 70bace05cf43a2..52b25e28543dd8 100644
--- a/config/locales/gd.yml
+++ b/config/locales/gd.yml
@@ -983,7 +983,6 @@ gd:
       delete: Sguab às
       edit_preset: Deasaich rabhadh ro-shuidhichte
       empty: Cha do mhìnich thu ro-sheataichean rabhaidhean fhathast.
-      title: Stiùirich na rabhaidhean ro-shuidhichte
     webhooks:
       add_new: Cuir puing-dheiridh ris
       delete: Sguab às
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 2c85dc89ae7502..a8489e425fe39c 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -951,7 +951,7 @@ gl:
       delete: Eliminar
       edit_preset: Editar aviso preestablecido
       empty: Non definiches os avisos prestablecidos.
-      title: Xestionar avisos preestablecidos
+      title: Preestablecidos de advertencia
     webhooks:
       add_new: Engadir punto de extremo
       delete: Eliminar
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 3613a9f0b3b394..9088f48218c273 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -985,7 +985,7 @@ he:
       delete: למחוק
       edit_preset: ערוך/י טקסט מוכן מראש לאזהרה
       empty: לא הגדרת עדיין שום טקסט מוכן מראש לאזהרה.
-      title: ניהול טקסטים מוכנים מראש לאזהרות
+      title: תצורת אזהרות
     webhooks:
       add_new: הוספת נקודת קצה
       delete: מחיקה
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index dd578305151f60..d79bca7ff75793 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -951,7 +951,7 @@ hu:
       delete: Törlés
       edit_preset: Figyelmeztetés szerkesztése
       empty: Nem definiáltál még egyetlen figyelmeztetést sem.
-      title: Figyelmeztetések
+      title: Figyelmeztető szövegek
     webhooks:
       add_new: Végpont hozzáadása
       delete: Törlés
diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index 8af676454fadee..f8834136b9ca27 100644
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -951,7 +951,7 @@ ia:
       delete: Deler
       edit_preset: Rediger aviso predefinite
       empty: Tu non ha ancora definite alcun avisos predefinite.
-      title: Gerer avisos predefinite
+      title: Predefinitiones de avisos
     webhooks:
       add_new: Adder terminal
       delete: Deler
diff --git a/config/locales/id.yml b/config/locales/id.yml
index bee282fa833259..aae790f4814164 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -831,7 +831,6 @@ id:
       delete: Hapus
       edit_preset: Sunting preset peringatan
       empty: Anda belum mendefinisikan peringatan apapun.
-      title: Kelola preset peringatan
     webhooks:
       add_new: Tambah titik akhir
       delete: Hapus
diff --git a/config/locales/ie.yml b/config/locales/ie.yml
index 473d7b750f6741..432e7d031b0331 100644
--- a/config/locales/ie.yml
+++ b/config/locales/ie.yml
@@ -950,7 +950,6 @@ ie:
       delete: Deleter
       edit_preset: Modificar prefiguration de avise
       empty: Vu ancor ha definit null prefigurationes de avise.
-      title: Modificar prefigurationes de avise
     webhooks:
       add_new: Adjunter punctu terminal
       delete: Deleter
diff --git a/config/locales/io.yml b/config/locales/io.yml
index ed0d0d6345e040..bccdcb3cc5c33b 100644
--- a/config/locales/io.yml
+++ b/config/locales/io.yml
@@ -928,7 +928,6 @@ io:
       delete: Efacez
       edit_preset: Modifikez avertfixito
       empty: Vu ne fixis irga avertfixito til nun.
-      title: Jerez avertfixiti
     webhooks:
       add_new: Insertez finpunto
       delete: Efacez
diff --git a/config/locales/is.yml b/config/locales/is.yml
index 99777529696d9b..75950e572dccbc 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -953,7 +953,7 @@ is:
       delete: Eyða
       edit_preset: Breyta forstilltri aðvörun
       empty: Þú hefur ekki enn skilgreint neinar aðvaranaforstillingar.
-      title: Sýsla með forstilltar aðvaranir
+      title: Forstilltar aðvaranir
     webhooks:
       add_new: Bæta við endapunkti
       delete: Eyða
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 5b75e7af7dd142..c3389f59c6bf6c 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -951,7 +951,7 @@ it:
       delete: Cancella
       edit_preset: Modifica avviso predefinito
       empty: Non hai ancora definito alcun avviso preimpostato.
-      title: Gestisci avvisi predefiniti
+      title: Preimpostazioni di avviso
     webhooks:
       add_new: Aggiungi endpoint
       delete: Elimina
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 0712ba380ad947..6c0fba259c35c7 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -933,7 +933,6 @@ ja:
       delete: 削除
       edit_preset: プリセット警告文を編集
       empty: まだプリセット警告文が作成されていません。
-      title: プリセット警告文を管理
     webhooks:
       add_new: エンドポイントを追加
       delete: 削除
diff --git a/config/locales/kk.yml b/config/locales/kk.yml
index f08d8ead1aa8b0..2695127f0a782f 100644
--- a/config/locales/kk.yml
+++ b/config/locales/kk.yml
@@ -299,7 +299,6 @@ kk:
       add_new: Add nеw
       delete: Deletе
       edit_preset: Edit warning prеset
-      title: Manage warning presеts
   admin_mailer:
     new_pending_account:
       body: Жаңа есептік жазба туралы мәліметтер төменде берілген. Бұл қолданбаны мақұлдауыңызға немесе қабылдамауыңызға болады.
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index b104e31fc0e71c..9de2f6ca53cd41 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -936,7 +936,7 @@ ko:
       delete: 삭제
       edit_preset: 경고 프리셋 편집
       empty: 아직 어떤 경고 틀도 정의되지 않았습니다.
-      title: 경고 틀 관리
+      title: 경고 프리셋
     webhooks:
       add_new: 엔드포인트 추가
       delete: 삭제
diff --git a/config/locales/ku.yml b/config/locales/ku.yml
index 74dcd6f8f38a01..c24337dd7c05ef 100644
--- a/config/locales/ku.yml
+++ b/config/locales/ku.yml
@@ -849,7 +849,6 @@ ku:
       delete: Jê bibe
       edit_preset: Hişyariyên pêşsazkirî serrast bike
       empty: Te hin tu hişyariyên pêşsazkirî destnîşan nekirine.
-      title: Hişyariyên pêşsazkirî bi rêve bibe
     webhooks:
       add_new: Xala dawîbûnê tevlî bike
       delete: Jê bibe
diff --git a/config/locales/lad.yml b/config/locales/lad.yml
index 9c165472cd71b1..d0657e73f99efd 100644
--- a/config/locales/lad.yml
+++ b/config/locales/lad.yml
@@ -950,7 +950,6 @@ lad:
       delete: Efasa
       edit_preset: Edita avizo predeterminado
       empty: Ainda no tienes definido ningun avizo predeterminado.
-      title: Edita konfigurasyon predeterminada de avizos
     webhooks:
       add_new: Adjusta endpoint
       delete: Efasa
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 3e514a547b9166..8e32ed07bde719 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -451,7 +451,7 @@ lt:
       filter:
         all: Visi
         available: Pasiekiamas
-        expired: Pasibaigęs
+        expired: Nebegaliojantis
         title: Filtras
       title: Kvietimai
     relays:
@@ -505,9 +505,15 @@ lt:
       unresolved: Neišspręsti
       updated_at: Atnaujinti
     roles:
+      categories:
+        invites: Kvietimai
       everyone: Numatytieji leidimai
       everyone_full_description_html: Tai – <strong>bazinis vaidmuo</strong>, turintis įtakos <strong>visiems naudotojams</strong>, net ir tiems, kurie neturi priskirto vaidmens. Visi kiti vaidmenys iš jo paveldi teises.
       privileges:
+        invite_users: Kviesti naudotojus
+        invite_users_description: Leidžia naudotojams pakviesti naujus žmones į serverį.
+        manage_invites: Tvarkyti kvietimus
+        manage_invites_description: Leidžia naudotojams naršyti ir deaktyvuoti kvietimų nuorodas.
         manage_taxonomies_description: Leidžia naudotojams peržiūrėti tendencingą turinį ir atnaujinti saitažodžių nustatymus
     settings:
       captcha_enabled:
@@ -522,12 +528,34 @@ lt:
       registrations:
         moderation_recommandation: Prieš atidarant registraciją visiems, įsitikink, kad turi tinkamą ir reaguojančią prižiūrėjimo komandą!
     software_updates:
-      description: Rekomenduojama nuolat atnaujinti Mastodon diegyklę, kad galėtum naudotis naujausiais pataisymais ir funkcijomis. Be to, kartais labai svarbu laiku naujinti Mastodon, kad būtų išvengta saugumo problemų. Dėl šių priežasčių Mastodon kas 30 minučių tikrina, ar yra atnaujinimų, ir praneša tau apie tai pagal tavo el. pašto pranešimų parinktis.
+      description: Rekomenduojama nuolat atnaujinti Mastodon diegyklę, kad galėtum naudotis naujausiais pataisymais ir funkcijomis. Be to, kartais labai svarbu laiku atnaujinti Mastodon, kad būtų išvengta saugumo problemų. Dėl šių priežasčių Mastodon kas 30 minučių tikrina, ar yra naujinimų, ir praneša tau apie tai pagal tavo el. pašto pranešimų parinktis.
+      documentation_link: Sužinoti daugiau
+      release_notes: Leidimo informacija
+      title: Galimi naujinimai
+      type: Tipas
+      types:
+        major: Pagrindinis leidimas
+        minor: Nedidelis leidimas
+        patch: Pataiso leidimas – riktų taisymai ir lengvai pritaikomi pakeitimai
+      version: Versija
     statuses:
+      account: Autorius (-ė)
+      application: Programa
       back_to_account: Grįžti į paskyros puslapį
+      back_to_report: Grįžti į ataskaitos puslapį
+      batch:
+        remove_from_report: Pašalinti iš ataskaitos
+      deleted: Ištrinta
+      favourites: Mėgstami
+      history: Versijų istorija
+      in_reply_to: Atsakydant į
+      language: Kalba
       media:
         title: Medija
-      no_status_selected: Jokie statusai nebuvo pakeisti, nes niekas nepasirinkta
+      metadata: Metaduomenys
+      no_status_selected: Jokie įrašai nebuvo pakeisti, nes nė vienas buvo pasirinktas
+      open: Atidaryti įrašą
+      original_status: Originalus įrašas
       title: Paskyros statusai
       trending: Tendencinga
       with_media: Su medija
@@ -537,6 +565,7 @@ lt:
       elasticsearch_preset:
         message_html: Tavo Elasticsearch klasteris turi daugiau nei vieną mazgą, bet Mastodon nėra sukonfigūruotas juos naudoti.
       elasticsearch_preset_single_node:
+        action: Žiūrėti dokumentaciją
         message_html: Tavo Elasticsearch klasteris turi tik vieną mazgą, <code>ES_PRESET</code> turėtų būti nustatyta į <code>single_node_cluster</code>.
     title: Administracija
     trends:
@@ -571,8 +600,20 @@ lt:
         disallow_account: Neleisti autorių (-ę)
         no_status_selected: Jokie tendencingi įrašai nebuvo pakeisti, nes nė vienas iš jų nebuvo pasirinktas
         not_discoverable: Autorius (-ė) nesutiko, kad būtų galima juos atrasti
+        shared_by:
+          few: Bendrinta arba pamėgta %{friendly_count} kartus
+          many: Bendrinta arba pamėgta %{friendly_count} karto
+          one: Bendrinta arba pamėgta vieną kartą
+          other: Bendrinta arba pamėgta %{friendly_count} kartų
         title: Tendencingi įrašai
       tags:
+        dashboard:
+          tag_accounts_measure: unikalūs naudojimai
+          tag_languages_dimension: Populiariausios kalbos
+          tag_servers_dimension: Populiariausi serveriai
+          tag_servers_measure: skirtingi serveriai
+          tag_uses_measure: bendri naudojimai
+        listable: Gali būti siūloma
         not_trendable: Nepasirodys tendencijose
         title: Tendencingos saitažodžiai
         trendable: Gali pasirodyti tendencijose
@@ -583,7 +624,6 @@ lt:
       add_new: Pridėti naują
       delete: Ištrinti
       edit_preset: Keisti įspėjimo nustatymus
-      title: Valdyti įspėjimo nustatymus
     webhooks:
       description_html: "<strong>Webhook</strong> leidžia Mastodon siųsti <strong>realaus laiko pranešimus</strong> apie pasirinktus įvykius į tavo programą, kad programa galėtų <strong>automatiškai paleisti reakcijas</strong>."
       events: Įvykiai
@@ -627,21 +667,32 @@ lt:
     warning: Būkite atsargūs su šia informacija. Niekada jos nesidalinkite!
     your_token: Tavo prieigos raktas
   auth:
+    confirmations:
+      welcome_title: Sveiki, %{name}!
     delete_account: Ištrinti paskyrą
     delete_account_html: Jeigu norite ištrinti savo paskyrą, galite eiti <a href="%{path}">čia</a>. Jūsų prašys patvirtinti pasirinkimą.
+    description:
+      prefix_invited_by_user: "@%{name} kviečia prisijungti prie šio Mastodon serverio!"
+      prefix_sign_up: Užsiregistruok Mastodon šiandien!
+    didnt_get_confirmation: Negavai patvirtinimo nuorodos?
     dont_have_your_security_key: Neturi saugumo rakto?
-    forgot_password: Pamiršote slaptažodį?
-    invalid_reset_password_token: Slaptažodžio atkūrimo žetonas netinkamas arba jo galiojimo laikas pasibaigęs. Prašykite naujo žetono.
+    forgot_password: Pamiršai slaptažodį?
+    invalid_reset_password_token: Slaptažodžio atkūrimo raktas yra netinkamas arba nebegaliojantis. Paprašyk naujo.
+    log_in_with: Prisijungti su
     login: Prisijungti
     logout: Atsijungti
     migrate_account: Prisijungti prie kitos paskyros
     migrate_account_html: Jeigu norite nukreipti šią paskyrą į kita, galite tai <a href="%{path}">konfiguruoti čia</a>.
     or_log_in_with: Arba prisijungti su
+    providers:
+      cas: CAS
+      saml: SAML
     register: Užsiregistruoti
     reset_password: Atstatyti slaptažodį
     rules:
       invited_by: 'Gali prisijungti prie %{domain} pagal kvietimą, kurį gavai iš:'
       preamble_invited: Prieš tęsiant, atsižvelk į pagrindines taisykles, kurias nustatė %{domain} prižiūrėtojai.
+      title_invited: Esi pakviestas.
     security: Apsauga
     set_new_password: Nustatyti naują slaptažodį
     status:
@@ -673,6 +724,9 @@ lt:
     success_msg: Tavo paskyra buvo sėkmingai ištrinta
   disputes:
     strikes:
+      created_at: Data
+      title_actions:
+        none: Įspėjimas
       your_appeal_approved: Tavo apeliacija buvo patvirtinta
       your_appeal_pending: Pateikei apeliaciją
       your_appeal_rejected: Tavo apeliacija buvo atmesta
@@ -699,6 +753,8 @@ lt:
       request: Prašyti savo archyvo
       size: Dydis
     blocks: Jūs blokuojate
+    bookmarks: Žymės
+    csv: CSV
     domain_blocks: Domeno blokai
     lists: Sąrašai
     mutes: Jūs tildote
@@ -708,11 +764,14 @@ lt:
     hint_html: "<strong>Savo profilyje parodyk svarbiausius saitažodžius.</strong> Tai puikus įrankis kūrybiniams darbams ir ilgalaikiams projektams sekti, todėl svarbiausios saitažodžiai rodomi matomoje vietoje profilyje ir leidžia greitai pasiekti tavo paties įrašus."
   filters:
     contexts:
-      home: Namų laiko juosta
-      notifications: Priminimai
+      account: Profiliai
+      home: Pagrindinis ir sąrašai
+      notifications: Pranešimai
       public: Viešieji laiko skalės
       thread: Pokalbiai
     edit:
+      add_keyword: Pridėti raktažodį
+      keywords: Raktažodžiai
       title: Keisti filtrą
     errors:
       invalid_context: Jokio arba netinkamas pateiktas kontekstas
@@ -726,9 +785,14 @@ lt:
     all: Visi
     changes_saved_msg: Pakeitimai sėkmingai išsaugoti!
     copy: Kopijuoti
+    delete: Ištrinti
+    deselect: Panaikinti visus žymėjimus
     order_by: Tvarkyti pagal
     save_changes: Išsaugoti pakeitimus
+    today: šiandien
   imports:
+    errors:
+      too_large: Failas per didelis.
     modes:
       merge: Sulieti
       merge_long: Išsaugoti esančius įrašus ir pridėti naujus
@@ -744,7 +808,7 @@ lt:
     upload: Įkelti
   invites:
     delete: Deaktyvuoti
-    expired: Pasibaigė
+    expired: Nebegaliojantis
     expires_in:
       '1800': 30 minučių
       '21600': 6 valandų
@@ -753,28 +817,29 @@ lt:
       '604800': 1 savaitės
       '86400': 1 dienos
     expires_in_prompt: Niekada
-    generate: Generuoti
+    generate: Generuoti kvietimo nuorodą
     invalid: Šis kvietimas negalioja.
-    invited_by: 'Jus pakvietė:'
+    invited_by: 'Tave pakvietė:'
     max_uses:
       few: "%{count} naudojimai"
       many: "%{count} naudojimo"
       one: 1 naudojimas
       other: "%{count} naudojimų"
-    max_uses_prompt: Nėra limito
+    max_uses_prompt: Nėra ribojimo
     prompt: Generuok ir bendrink nuorodas su kitais, kad suteiktum prieigą prie šio serverio
     table:
       expires_at: Baigsis
       uses: Naudojimai
-    title: Pakviesti žmones
+    title: Kviesti žmones
   media_attachments:
     validations:
       images_and_video: Negalima pridėti video prie statuso, kuris jau turi nuotrauką
       too_many: Negalima pridėti daugiau nei 4 failų
   migrations:
-    acct: slapyvardis@domenas naujam vartotojui
+    acct: Perkelta į
+    cancel: Atšaukti nukreipimą
   moderation:
-    title: Moderacija
+    title: Prižiūrėjimas
   notification_mailer:
     favourite:
       body: 'Tavo įrašą pamėgo %{name}:'
@@ -801,11 +866,19 @@ lt:
   notifications:
     email_events: Įvykiai, skirti el. laiško pranešimams
     email_events_hint: 'Pasirink įvykius, apie kuriuos nori gauti pranešimus:'
+  number:
+    human:
+      decimal_units:
+        units:
+          billion: mlrd.
+          million: mln.
+          thousand: tūkst.
   pagination:
     newer: Naujesnis
     next: Kitas
     older: Senesnis
     prev: Ankstesnis
+    truncate: "&hellip;"
   preferences:
     other: Kita
     posting_defaults: Skelbimo numatytosios nuostatos
@@ -829,6 +902,7 @@ lt:
     dormant: Neaktyvus
     followers: Sekėjai
     following: Sekama
+    invited: Pakviestas
     last_active: Paskutinį kartą aktyvus
     most_recent: Naujausias
     moved: Perkelta
@@ -851,24 +925,35 @@ lt:
     date: Data
     description: "%{browser} ant %{platform}"
     explanation: Čia rodomos web naršyklės prijungtos prie Jūsų Mastodon paskyros.
+    ip: IP
     platforms:
+      adobe_air: Adobe Air
       android: Android
+      blackberry: BlackBerry
+      chrome_os: ChromeOS
+      firefox_os: Firefox OS
       ios: iOS
       kai_os: KaiOS
+      linux: Linux
       mac: macOS
+      unknown_platform: Nežinoma platforma
       windows: Windows
       windows_mobile: Windows Mobile
       windows_phone: Windows Phone
-    revoke: Atšaukti
+    revoke: Naikinti
     revoke_success: Seansas sėkmingai panaikintas.
     title: Seansai
   settings:
-    authorized_apps: Autorizuotos aplikacijos
+    account: Paskyra
+    account_settings: Paskyros nustatymai
+    aliases: Paskyros pseudonimai
+    appearance: Išvaizda
+    authorized_apps: Leidžiamos programėlės
     back: Grįžti į Mastodon
     delete: Paskyros trynimas
-    development: Plėtojimas
-    edit_profile: Keisti profilį
-    export: Informacijos eksportas
+    development: Kūrimas
+    edit_profile: Redaguoti profilį
+    export: Duomenų eksportas
     featured_tags: Rodomi saitažodžiai
     import: Importuoti
     migrate: Paskyros migracija
@@ -879,10 +964,22 @@ lt:
     severed_relationships: Nutrūkę sąryšiai
     two_factor_authentication: Dviejų veiksnių autentikacija
   severed_relationships:
+    download: Atsisiųsti (%{count})
     preamble: Užblokavus domeną arba prižiūrėtojams nusprendus pristabdyti nuotolinio serverio veiklą, gali prarasti sekimus ir sekėjus. Kai taip atsitiks, galėsi atsisiųsti nutrauktų sąryšių sąrašus, kad juos patikrinti ir galbūt importuoti į kitą serverį.
+    type: Įvykis
   statuses:
     attached:
+      audio:
+        few: "%{count} garso įrašai"
+        many: "%{count} garso įrašo"
+        one: "%{count} garso įrašas"
+        other: "%{count} garso įrašų"
       description: 'Pridėta: %{attached}'
+      image:
+        few: "%{count} vaizdai"
+        many: "%{count} vaizdo"
+        one: "%{count} vaizdas"
+        other: "%{count} vaizdų"
     boosted_from_html: Pakelta iš %{acct_link}
     content_warning: 'Turinio įspėjimas: %{warning}'
     open_in_web: Atidaryti naudojan Web
@@ -891,11 +988,14 @@ lt:
       limit: Jūs jau prisegėte maksimalų toot'ų skaičų
       ownership: Kitų vartotojų toot'ai negali būti prisegti
       reblog: Pakeltos žinutės negali būti prisegtos
-    show_more: Daugiau
+    poll:
+      vote: Balsuoti
+    show_more: Rodyti daugiau
+    show_thread: Rodyti giją
     visibilities:
       private: Tik sekėjams
       private_long: rodyti tik sekėjams
-      public: Viešas
+      public: Vieša
       public_long: visi gali matyti
       unlisted: Neįtrauktas į sąrašus
       unlisted_long: matyti gali visi, bet nėra išvardyti į viešąsias laiko skales
@@ -904,6 +1004,7 @@ lt:
     keep_polls_hint: Neištrina jokių tavo apklausų
     keep_self_bookmark: Laikyti įrašus, kuriuos pažymėjai
     keep_self_bookmark_hint: Neištrina tavo pačių įrašų, jei esi juos pažymėjęs (-usi)
+    keep_self_fav_hint: Neištrina tavo pačių įrašų, jei esi juos pamėgęs (-usi)
   stream_entries:
     sensitive_content: Jautrus turinys
   themes:
@@ -912,7 +1013,8 @@ lt:
     mastodon-light: Mastodon (šviesi)
     system: Automatinis (naudoti sistemos temą)
   two_factor_authentication:
-    disable: Išjungti
+    add: Pridėti
+    disable: Išjungti 2FA
     enabled: Dviejų veiksnių autentikacija įjungta
     enabled_success: Dviejų veiksnių autentikacija sėkmingai įjungta
     generate_recovery_codes: Sugeneruoti atkūrimo kodus
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index f4f0aa9db27742..5a071eba863e84 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -961,7 +961,6 @@ lv:
       delete: Dzēst
       edit_preset: Labot iepriekš iestatītus brīdinājumus
       empty: Tu vēl neesi definējis iepriekš iestatītos brīdinājumus.
-      title: Pārvaldīt brīdinājuma iestatījumus
     webhooks:
       add_new: Pievienot galapunktu
       delete: Dzēst
diff --git a/config/locales/ms.yml b/config/locales/ms.yml
index f39c26a5c10baa..a778d0c28f1491 100644
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@@ -924,7 +924,6 @@ ms:
       delete: Padam
       edit_preset: Edit pratetap amaran
       empty: Anda belum menentukan sebarang pratetap amaran lagi.
-      title: Urus pratetap amaran
     webhooks:
       add_new: Tambah titik akhir
       delete: Padam
diff --git a/config/locales/my.yml b/config/locales/my.yml
index 4ac9ecdd45ba9d..f28458360b5b3b 100644
--- a/config/locales/my.yml
+++ b/config/locales/my.yml
@@ -909,7 +909,6 @@ my:
       delete: ဖျက်ပါ
       edit_preset: ကြိုသတိပေးချက်ကို ပြင်ဆင်ပါ
       empty: ကြိုသတိပေးချက်များကို မသတ်မှတ်ရသေးပါ။
-      title: ကြိုသတိပေးချက်များကို စီမံပါ
     webhooks:
       add_new: ဆုံးမှတ် ထည့်ပါ
       delete: ဖျက်ပါ
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 3452f8099432d9..a527fdb5a7009a 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -951,7 +951,7 @@ nl:
       delete: Verwijderen
       edit_preset: Preset voor waarschuwing bewerken
       empty: Je hebt nog geen presets voor waarschuwingen toegevoegd.
-      title: Presets voor waarschuwingen beheren
+      title: Presets voor waarschuwingen
     webhooks:
       add_new: Eindpunt toevoegen
       delete: Verwijderen
diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index 013674ca514133..9291ba2c2c9477 100644
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -950,7 +950,6 @@ nn:
       delete: Slett
       edit_preset: Endr åtvaringsoppsett
       empty: Du har ikke definert noen forhåndsinnstillinger for advarsler enda.
-      title: Handsam åtvaringsoppsett
     webhooks:
       add_new: Legg til endepunkt
       delete: Slett
diff --git a/config/locales/no.yml b/config/locales/no.yml
index c71dffc6361e99..537552ea98662d 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -944,7 +944,6 @@
       delete: Slett
       edit_preset: Rediger advarsel forhåndsinnstilling
       empty: Du har ikke definert noen forhåndsinnstillinger for varsler enda.
-      title: Endre forhåndsinnstillinger for advarsler
     webhooks:
       add_new: Legg til endepunkt
       delete: Slett
diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index 0a653ea46c2732..d2bea55bd37c7b 100644
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -430,7 +430,6 @@ oc:
       add_new: N’ajustar un nòu
       delete: Escafar
       edit_preset: Modificar lo tèxt predefinit d’avertiment
-      title: Gerir los tèxtes predefinits
     webhooks:
       delete: Suprimir
       disable: Desactivar
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 1c3fda8d032b90..4c7af82b94f63a 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -985,7 +985,7 @@ pl:
       delete: Usuń
       edit_preset: Edytuj szablon ostrzeżenia
       empty: Nie zdefiniowano jeszcze żadnych szablonów ostrzegawczych.
-      title: Zarządzaj szablonami ostrzeżeń
+      title: Zapisane ostrzeżenia
     webhooks:
       add_new: Dodaj punkt końcowy
       delete: Usuń
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 60730d53e977a7..6b80edb24e60f3 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -950,7 +950,6 @@ pt-BR:
       delete: Excluir
       edit_preset: Editar o aviso pré-definido
       empty: Você ainda não definiu nenhuma predefinição de alerta.
-      title: Gerenciar os avisos pré-definidos
     webhooks:
       add_new: Adicionar endpoint
       delete: Excluir
diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index b4669e24d810da..49522b7414306d 100644
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -951,7 +951,7 @@ pt-PT:
       delete: Eliminar
       edit_preset: Editar o aviso predefinido
       empty: Ainda não definiu nenhum aviso predefinido.
-      title: Gerir os avisos predefinidos
+      title: Predefinições de aviso
     webhooks:
       add_new: Adicionar endpoint
       delete: Eliminar
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 85d8a7a54046c3..d6b8726ba4fc32 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -978,7 +978,6 @@ ru:
       delete: Удалить
       edit_preset: Удалить шаблон предупреждения
       empty: Вы еще не определили пресеты предупреждений.
-      title: Управление шаблонами предупреждений
     webhooks:
       add_new: Добавить конечную точку
       delete: Удалить
diff --git a/config/locales/sc.yml b/config/locales/sc.yml
index 01c355794d3a75..449d8d9c7f3296 100644
--- a/config/locales/sc.yml
+++ b/config/locales/sc.yml
@@ -535,7 +535,6 @@ sc:
       delete: Cantzella
       edit_preset: Modìfica s'avisu predefinidu
       empty: No as cunfiguradu ancora perunu avisu predefinidu.
-      title: Gesti is cunfiguratziones predefinidas de is avisos
     webhooks:
       delete: Cantzella
       disable: Disativa
diff --git a/config/locales/sco.yml b/config/locales/sco.yml
index 2a7b1e3e701aed..7c733b71b50d89 100644
--- a/config/locales/sco.yml
+++ b/config/locales/sco.yml
@@ -842,7 +842,6 @@ sco:
       delete: Delete
       edit_preset: Edit warnin preset
       empty: Ye huvnae definit onie warnin presets yit.
-      title: Manage warnin presets
     webhooks:
       add_new: Add enpynt
       delete: Delete
diff --git a/config/locales/si.yml b/config/locales/si.yml
index f5e65fda8d8107..0f714ee146bbfe 100644
--- a/config/locales/si.yml
+++ b/config/locales/si.yml
@@ -726,7 +726,6 @@ si:
       delete: මකන්න
       edit_preset: අනතුරු ඇඟවීමේ පෙර සැකසුම සංස්කරණය කරන්න
       empty: ඔබ තවම කිසිදු අනතුරු ඇඟවීමේ පෙරසිටුවක් නිර්වචනය කර නැත.
-      title: අනතුරු ඇඟවීමේ පෙරසිටුවීම් කළමනාකරණය කරන්න
     webhooks:
       add_new: අන්ත ලක්ෂ්‍යය එක් කරන්න
       delete: මකන්න
diff --git a/config/locales/simple_form.lt.yml b/config/locales/simple_form.lt.yml
index 1c73ce0a842a56..789121be42e769 100644
--- a/config/locales/simple_form.lt.yml
+++ b/config/locales/simple_form.lt.yml
@@ -79,6 +79,7 @@ lt:
         mascot: Pakeičia išplėstinės žiniatinklio sąsajos iliustraciją.
         media_cache_retention_period: Nuotolinių naudotojų įrašytų įrašų medijos failai talpinami tavo serveryje. Nustačius teigiamą reikšmę, medijos bus ištrinamos po nurodyto dienų skaičiaus. Jei medijos duomenų bus paprašyta po to, kai jie bus ištrinti, jie bus atsiųsti iš naujo, jei šaltinio turinys vis dar prieinamas. Dėl apribojimų, susijusių su nuorodų peržiūros kortelių apklausos dažnumu trečiųjų šalių svetainėse, rekomenduojama nustatyti šią reikšmę ne trumpesnę kaip 14 dienų, kitaip nuorodų peržiūros kortelės nebus atnaujinamos pagal pareikalavimą iki to laiko.
         peers_api_enabled: Domenų pavadinimų sąrašas, su kuriais šis serveris susidūrė fediverse. Čia nėra duomenų apie tai, ar tu bendrauji su tam tikru serveriu, tik apie tai, kad tavo serveris apie jį žino. Tai naudojama tarnybose, kurios renka federacijos statistiką bendrąja prasme.
+        require_invite_text: Kai registraciją reikia patvirtinti rankiniu būdu, teksto įvesties laukelį „Kodėl nori prisijungti?“ padaryk privalomą, o ne pasirenkamą
         site_contact_email: Kaip žmonės gali su tavimi susisiekti teisiniais ar pagalbos užklausimais.
         site_contact_username: Kaip žmonės gali tave pasiekti Mastodon.
         site_extended_description: Bet kokia papildoma informacija, kuri gali būti naudinga lankytojams ir naudotojams. Gali būti struktūrizuota naudojant Markdown sintaksę.
@@ -86,6 +87,8 @@ lt:
         timeline_preview: Atsijungę lankytojai galės naršyti naujausius viešus įrašus, esančius serveryje.
         trends: Trendai rodo, kurios įrašai, saitažodžiai ir naujienų istorijos tavo serveryje sulaukia didžiausio susidomėjimo.
         trends_as_landing_page: Rodyti tendencingą turinį atsijungusiems naudotojams ir lankytojams vietoj šio serverio aprašymo. Reikia, kad tendencijos būtų įjungtos.
+      invite_request:
+        text: Tai padės mums peržiūrėti tavo paraišką
       rule:
         hint: Pasirinktinai. Pateik daugiau informacijos apie taisyklę.
       sessions:
@@ -108,6 +111,7 @@ lt:
       admin_account_action:
         include_statuses: Įtraukti praneštus įrašus į el. laišką
       defaults:
+        autofollow: Kviesti sekti tavo paskyrą
         avatar: Profilio nuotrauka
         bot: Tai automatinė paskyra
         chosen_languages: Filtruoti kalbas
@@ -163,6 +167,7 @@ lt:
         custom_css: Pasirinktinis CSS
         mascot: Pasirinktinis talismanas (pasenęs)
         registrations_mode: Kas gali užsiregistruoti
+        require_invite_text: Reikalauti priežasties prisijungti
         show_domain_blocks_rationale: Rodyti, kodėl domenai buvo užblokuoti
         site_extended_description: Išplėstas aprašymas
         site_short_description: Serverio aprašymas
@@ -173,6 +178,8 @@ lt:
         trendable_by_default: Leisti tendencijas be išankstinės peržiūros
         trends: Įjungti tendencijas
         trends_as_landing_page: Naudoti tendencijas kaip nukreipimo puslapį
+      invite:
+        comment: Komentuoti
       invite_request:
         text: Kodėl nori prisijungti?
       notification_emails:
diff --git a/config/locales/simple_form.nl.yml b/config/locales/simple_form.nl.yml
index 8bc717fe1fa172..2271d7037efa45 100644
--- a/config/locales/simple_form.nl.yml
+++ b/config/locales/simple_form.nl.yml
@@ -28,7 +28,7 @@ nl:
           sensitive: Forceer dat alle mediabijlagen van deze gebruiker als gevoelig worden gemarkeerd.
           silence: Voorkom dat de gebruiker berichten kan plaatsen met openbare zichtbaarheid, verberg diens berichten en meldingen van mensen die de gebruiker niet volgen. Sluit alle rapportages tegen dit account af.
           suspend: Voorkom interactie van of naar dit account en verwijder de inhoud. Dit is omkeerbaar binnen 30 dagen. Dit sluit alle rapporten tegen dit account af.
-        warning_preset_id: Optioneel. Je kunt nog steeds handmatig tekst toevoegen aan het eind van de voorinstelling
+        warning_preset_id: Optioneel. Je kunt nog steeds handmatig tekst toevoegen aan het eind van de preset
       announcement:
         all_day: Wanneer dit is aangevinkt worden alleen de datums binnen het tijdvak getoond
         ends_at: Optioneel. De publicatie van de mededeling wordt op dit tijdstip automatisch beëindigd
@@ -168,7 +168,7 @@ nl:
           sensitive: Gevoelig
           silence: Beperken
           suspend: Opschorten en onomkeerbaar accountgegevens verwijderen
-        warning_preset_id: Gebruik een voorinstelling van een waarschuwing
+        warning_preset_id: Een preset voor een waarschuwing gebruiken
       announcement:
         all_day: Gedurende de hele dag
         ends_at: Eindigt
diff --git a/config/locales/simple_form.sr-Latn.yml b/config/locales/simple_form.sr-Latn.yml
index 8dd19865636755..710f81e84fd1bd 100644
--- a/config/locales/simple_form.sr-Latn.yml
+++ b/config/locales/simple_form.sr-Latn.yml
@@ -20,7 +20,7 @@ sr-Latn:
       admin_account_action:
         include_statuses: Korisnik će videti koje su objave prouzrokovale moderacijsku radnju ili upozorenje
         send_email_notification: Korisnik će dobiti objašnjenje toga šta mu se desilo sa nalogom
-        text_html: Opcionalno. Možete koristiti sintaksu objava. Možete <a href="%{path}">dodati unapred određene postavke upozorenja</a> za uštedu vremena
+        text_html: Opciono. Možete koristiti sintaksu objava. Možete <a href="%{path}">dodati predefinisana upozorenja</a> za uštedu vremena
         type_html: Izaberite šta da radite sa <strong>%{acct}</strong>
         types:
           disable: Sprečava korisnika da koristi svoj nalog, ali ne briše niti sakriva njegove sadržaje.
@@ -28,7 +28,7 @@ sr-Latn:
           sensitive: Učini da svi medijski prilozi ovog korisnika prisilno budu označeni kao osetljivi.
           silence: Sprečava korisnika da pravi javne objave, sakriva njegove objave i obaveštenja od ljudi koji ga ne prate. Zatvara sve prijave podnete protiv ovog naloga.
           suspend: Sprečava svu interakciju od ovog naloga i ka ovom nalogu i briše njegov sadržaj. Opozivo u roku od 30 dana. Zatvara sve prijave podnete protiv ovog naloga.
-        warning_preset_id: Opcionalno. Možete i dalje dodati prilagođeni tekst na kraj preseta
+        warning_preset_id: Opciono. Možete i dalje dodati prilagođeni tekst na kraj predefinisane vrednosti
       announcement:
         all_day: Kada je ova opcija označena, samo datumi iz vremenskog opsega će biti prikazani
         ends_at: Opciono. Objava će biti automatski opozvana u ovom trenutku
@@ -118,7 +118,7 @@ sr-Latn:
           sign_up_requires_approval: Nove registracije će zahtevati Vaše odobrenje
         severity: Izaberite šta će se desiti sa zahtevima sa ove IP adrese
       rule:
-        hint: Opcionalno. Pružite više detalja o pravilu
+        hint: Opciono. Pružite više detalja o pravilu
         text: Opišite pravilo ili uslov za korisnike na ovom serveru. Potrudite se da opis bude kratak i jednostavan
       sessions:
         otp: 'Unesite dvofaktorski kod sa Vašeg telefona ili koristite jedan od kodova za oporavak:'
@@ -155,7 +155,7 @@ sr-Latn:
       account_migration:
         acct: Ručica (@) novog naloga
       account_warning_preset:
-        text: Tekst preseta
+        text: Tekst predefinisane vrednosti
         title: Naslov
       admin_account_action:
         include_statuses: Uključi prijavljene objave u e-poštu
@@ -168,7 +168,7 @@ sr-Latn:
           sensitive: Osetljivo
           silence: Utišaj
           suspend: Obustavite i nepovratno izbrišite podatke o nalogu
-        warning_preset_id: Koristi upozoravajući preset
+        warning_preset_id: Koristi predefinisano upozorenje
       announcement:
         all_day: Celodnevni događaj
         ends_at: Kraj događaja
diff --git a/config/locales/simple_form.sr.yml b/config/locales/simple_form.sr.yml
index e88a99df13af7d..c5fbc9185a517e 100644
--- a/config/locales/simple_form.sr.yml
+++ b/config/locales/simple_form.sr.yml
@@ -20,7 +20,7 @@ sr:
       admin_account_action:
         include_statuses: Корисник ће видети које су објаве проузроковале модерацијску радњу или упозорење
         send_email_notification: Корисник ће добити објашњење тога шта му се десило са налогом
-        text_html: Опционално. Можете користити синтаксу објава. Можете <a href="%{path}">додати унапред одређене поставке упозорења</a> за уштеду времена
+        text_html: Опционо. Можете користити синтаксу објава. Можете <a href="%{path}">додати предефинисана упозорења</a> за уштеду времена
         type_html: Изаберите шта да радите са <strong>%{acct}</strong>
         types:
           disable: Спречава корисника да користи свој налог, али не брише нити сакрива његове садржаје.
@@ -28,7 +28,7 @@ sr:
           sensitive: Учини да сви медијски прилози овог корисника присилно буду означени као осетљиви.
           silence: Спречава корисника да прави јавне објаве, сакрива његове објаве и обавештења од људи који га не прате. Затвара све пријаве поднете против овог налога.
           suspend: Спречава сву интеракцију од овог налога и ка овом налогу и брише његов садржај. Опозиво у року од 30 дана. Затвара све пријаве поднете против овог налога.
-        warning_preset_id: Опционално. Можете и даље додати прилагођени текст на крај пресета
+        warning_preset_id: Опционо. Можете и даље додати прилагођени текст на крај предефинисане вредности
       announcement:
         all_day: Када је ова опција означена, само датуми из временског опсега ће бити приказани
         ends_at: Опционо. Објава ће бити аутоматски опозвана у овом тренутку
@@ -88,7 +88,7 @@ sr:
         media_cache_retention_period: Медијске датотеке из објава удаљених корисника се кеширају на вашем серверу. Када се подеси на позитивну вредност, медији ће бити избрисани након наведеног броја дана. Ако се медијски подаци захтевају након брисања, биће поново преузети, ако је изворни садржај и даље доступан. Због ограничења колико често картице за преглед веза анкетирају сајтове трећих страна, препоручује се да ову вредност поставите на најмање 14 дана, иначе картице за преглед веза неће бити ажуриране на захтев пре тог времена.
         peers_api_enabled: Листа домена са којима се овај сервер сусрео у федиверзуму. Овде нису садржани подаци о томе да ли се Ваш сервер федерише са другим серверима, већ само да Ваш сервер зна за њих. Ове информације користе сервиси који прикупљају податке и воде статистику о федерацији у ширем смислу.
         profile_directory: Директоријум профила наводи све кориснике који су се определили да буду видљиви.
-        require_invite_text: Када регистрације захтевају ручно одобрење, поставите да одговор на „Зашто желите да се придружите?“ буде обавезан, а не опционалан
+        require_invite_text: Када регистрације захтевају ручно одобрење, постави да унос текста „Зашто желиш да се придружиш?“ буде обавезан, а не опциони
         site_contact_email: Како корисници могу да контактирају са Вама за правна питања или питања у вези подршке.
         site_contact_username: Како корисници могу да контактирају са вама на Mastodon-у.
         site_extended_description: Било какве додатне информације које могу бити корисне посетиоцима и Вашим корисницима. Могу се структурирати помоћу Markdown синтаксе.
@@ -118,7 +118,7 @@ sr:
           sign_up_requires_approval: Нове регистрације ће захтевати Ваше одобрење
         severity: Изаберите шта ће се десити са захтевима са ове IP адресе
       rule:
-        hint: Опционално. Пружите више детаља о правилу
+        hint: Опционо. Пружите више детаља о правилу
         text: Опишите правило или услов за кориснике на овом серверу. Потрудите се да опис буде кратак и једноставан
       sessions:
         otp: 'Унесите двофакторски код са Вашег телефона или користите један од кодова за опоравак:'
@@ -155,7 +155,7 @@ sr:
       account_migration:
         acct: Ручица (@) новог налога
       account_warning_preset:
-        text: Текст пресета
+        text: Текст предефинисане вредности
         title: Наслов
       admin_account_action:
         include_statuses: Укључи пријављене објаве у е-пошту
@@ -168,7 +168,7 @@ sr:
           sensitive: Осетљиво
           silence: Утишај
           suspend: Обуставите и неповратно избришите податке о налогу
-        warning_preset_id: Користи упозоравајући пресет
+        warning_preset_id: Користи предефинисано упозорење
       announcement:
         all_day: Целодневни догађај
         ends_at: Крај догађаја
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index f05887dc33cc0c..f10815129dd286 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -763,7 +763,6 @@ sk:
       add_new: Pridaj nové
       delete: Vymaž
       edit_preset: Uprav varovnú predlohu
-      title: Spravuj varovné predlohy
     webhooks:
       delete: Vymaž
       disable: Vypni
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 329ce5a29b5701..1e4e254cf18eaa 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -985,7 +985,7 @@ sl:
       delete: Izbriši
       edit_preset: Uredi prednastavitev opozoril
       empty: Zaenkrat še niste določili nobenih opozorilnih prednastavitev.
-      title: Upravljaj prednastavitev opozoril
+      title: Pred-nastavitve opozoril
     webhooks:
       add_new: Dodaj končno točko
       delete: Izbriši
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index 8319cfcaecac48..5439f08a04a8b2 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -285,6 +285,7 @@ sq:
         update_custom_emoji_html: "%{name} përditësoi emoxhin %{target}"
         update_domain_block_html: "%{name} përditësoi bllokim përkatësish për %{target}"
         update_ip_block_html: "%{name} ndryshoi rregull për IP-në %{target}"
+        update_report_html: "%{name} përditësoi raportimin %{target}"
         update_status_html: "%{name} përditësoi gjendjen me %{target}"
         update_user_role_html: "%{name} ndryshoi rolin për %{target}"
       deleted_account: fshiu llogarinë
@@ -946,7 +947,7 @@ sq:
       delete: Fshije
       edit_preset: Përpunoni sinjalizim të paracaktuar
       empty: S’keni përcaktuar ende sinjalizime të gatshme.
-      title: Administroni sinjalizime të paracaktuara
+      title: Paracaktime sinjalizimesh
     webhooks:
       add_new: Shtoni pikëmbarim
       delete: Fshije
diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml
index 808a10e7290c6a..718d1c0f84f336 100644
--- a/config/locales/sr-Latn.yml
+++ b/config/locales/sr-Latn.yml
@@ -869,7 +869,7 @@ sr-Latn:
         action: Pogledaj dokumentaciju
         message_html: Vaš Elasticsearch klaster ima samo jedan čvor, <code>ES_PRESET</code>treba postaviti na<code>single_node_cluster</code>.
       elasticsearch_reset_chewy:
-        message_html: Vaš Elasticsearch klaster ima samo jedan čvor, <code>ES_PRESET</code>treba postaviti na<code>single_node_cluster</code>.
+        message_html: Indeks Elasticsearch sistema je zastareo zbog promene podešavanja. Pokrenite <code>tootctl search deploy --reset-chewy</code>da biste ga ažurirali.
       elasticsearch_running_check:
         message_html: Povezivanje na Elasticsearch nije bilo moguće. Molimo Vas proverite da li je pokrenut, ili onemogućite pretragu celog teksta
       elasticsearch_version_check:
@@ -966,9 +966,9 @@ sr-Latn:
     warning_presets:
       add_new: Dodaj novi
       delete: Izbriši
-      edit_preset: Uredi preset upozorenja
-      empty: Još uvek niste definisali nijedan šablon upozorenja.
-      title: Upravljaj presetima upozorenja
+      edit_preset: Uredi predefinisana upozorenja
+      empty: Još uvek niste definisali nijedno upozorenje.
+      title: Predefinisana upozorenja
     webhooks:
       add_new: Dodaj krajnju tačku
       delete: Izbriši
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index f03c6e878a2a09..c9a67b1936656a 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -869,7 +869,7 @@ sr:
         action: Погледај документацију
         message_html: Ваш Elasticsearch кластер има само један чвор, <code>ES_PRESET</code>треба поставити на<code>single_node_cluster</code>.
       elasticsearch_reset_chewy:
-        message_html: Ваш Elasticsearch кластер има само један чвор, <code>ES_PRESET</code>треба поставити на<code>single_node_cluster</code>.
+        message_html: Индекс Elasticsearch система је застарео због промене подешавања. Покрените <code>tootctl search deploy --reset-chewy</code>да бисте га ажурирали.
       elasticsearch_running_check:
         message_html: Повезивање на Elasticsearch није било могуће. Молимо Вас проверите да ли је покренут, или онемогућите претрагу целог текста
       elasticsearch_version_check:
@@ -966,9 +966,9 @@ sr:
     warning_presets:
       add_new: Додај нови
       delete: Избриши
-      edit_preset: Уреди пресет упозорења
-      empty: Још увек нисте дефинисали ниједан шаблон упозорења.
-      title: Управљај пресетима упозорења
+      edit_preset: Уреди предефинисана упозорења
+      empty: Још увек нисте дефинисали ниједно упозорење.
+      title: Предефинисна упозорења
     webhooks:
       add_new: Додај крајњу тачку
       delete: Избриши
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 9f0de4a723a781..cf68cdd5637509 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -951,7 +951,6 @@ sv:
       delete: Radera
       edit_preset: Redigera varningsförval
       empty: Du har inte definierat några varningsförval ännu.
-      title: Hantera varningsförval
     webhooks:
       add_new: Lägg till slutpunkt
       delete: Ta bort
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 5711f68ff89061..3ca4f097338e55 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -934,7 +934,6 @@ th:
       delete: ลบ
       edit_preset: แก้ไขคำเตือนที่ตั้งไว้ล่วงหน้า
       empty: คุณยังไม่ได้กำหนดคำเตือนที่ตั้งไว้ล่วงหน้าใด ๆ
-      title: จัดการคำเตือนที่ตั้งไว้ล่วงหน้า
     webhooks:
       add_new: เพิ่มปลายทาง
       delete: ลบ
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 469f2c5ad8f07e..3ce12fec87c678 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -951,7 +951,7 @@ tr:
       delete: Sil
       edit_preset: Uyarı ön-ayarını düzenle
       empty: Henüz önceden ayarlanmış bir uyarı tanımlanmadı.
-      title: Uyarı ön-ayarlarını yönet
+      title: Uyarı Önayarları
     webhooks:
       add_new: Uç nokta ekle
       delete: Sil
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 71e84a1d54daf3..5baaa93870317d 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -984,7 +984,6 @@ uk:
       delete: Видалити
       edit_preset: Редагувати шаблон попередження
       empty: Ви ще не визначили жодних попереджень.
-      title: Керування шаблонами попереджень
     webhooks:
       add_new: Додати кінцеву точку
       delete: Видалити
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 05f3157ec96452..4265c1a33a153f 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -934,7 +934,6 @@ vi:
       delete: Xóa bỏ
       edit_preset: Sửa mẫu có sẵn
       empty: Bạn chưa thêm mẫu cảnh cáo nào cả.
-      title: Quản lý mẫu cảnh cáo
     webhooks:
       add_new: Thêm endpoint
       delete: Xóa bỏ
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 12b6197938efd7..b668c23d29be89 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -934,7 +934,7 @@ zh-CN:
       delete: 删除
       edit_preset: 编辑预置警告
       empty: 你尚未定义任何警告预设。
-      title: 管理预设警告
+      title: 预设警告
     webhooks:
       add_new: 新增对端
       delete: 删除
diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml
index 1bfbe38bb52e72..ddc6571e6da9a5 100644
--- a/config/locales/zh-HK.yml
+++ b/config/locales/zh-HK.yml
@@ -933,7 +933,6 @@ zh-HK:
       delete: 刪除
       edit_preset: 設定警告預設
       empty: 您尚未定義任何預設警告
-      title: 管理警告預設
     webhooks:
       add_new: 新增端點
       delete: 刪除
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index ac633a201d8fc7..14f54f9a12219c 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -936,7 +936,7 @@ zh-TW:
       delete: 刪除
       edit_preset: 編輯預設警告
       empty: 您尚未定義任何預設警告。
-      title: 管理預設警告
+      title: 預設警告內容
     webhooks:
       add_new: 新增端點
       delete: 刪除

From 3a862439dfc989c6c5741e007c2f4e0335fffe33 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 23 May 2024 04:26:58 -0400
Subject: [PATCH 1091/2191] Remove unused account record in
 api/v2/admin/accounts spec (#30397)

---
 spec/requests/api/v2/admin/accounts_spec.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/spec/requests/api/v2/admin/accounts_spec.rb b/spec/requests/api/v2/admin/accounts_spec.rb
index fb04850bb7d2cb..f5db93233c2012 100644
--- a/spec/requests/api/v2/admin/accounts_spec.rb
+++ b/spec/requests/api/v2/admin/accounts_spec.rb
@@ -8,7 +8,6 @@
   let(:scopes) { 'admin:read admin:write' }
   let(:token)  { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
   let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
-  let(:account) { Fabricate(:account) }
 
   describe 'GET #index' do
     let!(:remote_account)       { Fabricate(:account, domain: 'example.org') }

From 10ec421dd4e0da987e69a3dd7f4f696f9c5878e0 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Thu, 23 May 2024 11:50:13 +0200
Subject: [PATCH 1092/2191] Proposal: a modern & typed way of writing Redux
 actions doing API requests (#30270)

---
 .../mastodon/actions/account_notes.ts         |  21 +-
 .../mastodon/actions/interactions.js          |  86 +-------
 .../mastodon/actions/interactions_typed.ts    |  30 +++
 app/javascript/mastodon/api.ts                |  16 +-
 app/javascript/mastodon/api/accounts.ts       |   7 +
 app/javascript/mastodon/api/interactions.ts   |  10 +
 .../mastodon/containers/status_container.jsx  |   4 +-
 .../containers/account_note_container.js      |   2 +-
 .../containers/notification_container.js      |   4 +-
 .../picture_in_picture/components/footer.jsx  |   4 +-
 .../containers/detailed_status_container.js   |   4 +-
 .../mastodon/features/status/index.jsx        |   4 +-
 app/javascript/mastodon/reducers/statuses.js  |  28 +--
 .../mastodon/store/typed_functions.ts         | 186 ++++++++++++++++++
 14 files changed, 281 insertions(+), 125 deletions(-)
 create mode 100644 app/javascript/mastodon/actions/interactions_typed.ts
 create mode 100644 app/javascript/mastodon/api/accounts.ts
 create mode 100644 app/javascript/mastodon/api/interactions.ts

diff --git a/app/javascript/mastodon/actions/account_notes.ts b/app/javascript/mastodon/actions/account_notes.ts
index acd9ecf4104ba3..bf4f93dca9e5c9 100644
--- a/app/javascript/mastodon/actions/account_notes.ts
+++ b/app/javascript/mastodon/actions/account_notes.ts
@@ -1,18 +1,9 @@
-import type { ApiRelationshipJSON } from 'mastodon/api_types/relationships';
-import { createAppAsyncThunk } from 'mastodon/store/typed_functions';
+import { apiSubmitAccountNote } from 'mastodon/api/accounts';
+import { createDataLoadingThunk } from 'mastodon/store/typed_functions';
 
-import api from '../api';
-
-export const submitAccountNote = createAppAsyncThunk(
+export const submitAccountNote = createDataLoadingThunk(
   'account_note/submit',
-  async (args: { id: string; value: string }) => {
-    const response = await api().post<ApiRelationshipJSON>(
-      `/api/v1/accounts/${args.id}/note`,
-      {
-        comment: args.value,
-      },
-    );
-
-    return { relationship: response.data };
-  },
+  (accountId: string, note: string) => apiSubmitAccountNote(accountId, note),
+  (relationship) => ({ relationship }),
+  { skipLoading: true },
 );
diff --git a/app/javascript/mastodon/actions/interactions.js b/app/javascript/mastodon/actions/interactions.js
index fe7c911b61e2a5..57f2459c016fa4 100644
--- a/app/javascript/mastodon/actions/interactions.js
+++ b/app/javascript/mastodon/actions/interactions.js
@@ -3,10 +3,6 @@ import api, { getLinks } from '../api';
 import { fetchRelationships } from './accounts';
 import { importFetchedAccounts, importFetchedStatus } from './importer';
 
-export const REBLOG_REQUEST = 'REBLOG_REQUEST';
-export const REBLOG_SUCCESS = 'REBLOG_SUCCESS';
-export const REBLOG_FAIL    = 'REBLOG_FAIL';
-
 export const REBLOGS_EXPAND_REQUEST = 'REBLOGS_EXPAND_REQUEST';
 export const REBLOGS_EXPAND_SUCCESS = 'REBLOGS_EXPAND_SUCCESS';
 export const REBLOGS_EXPAND_FAIL = 'REBLOGS_EXPAND_FAIL';
@@ -15,10 +11,6 @@ export const FAVOURITE_REQUEST = 'FAVOURITE_REQUEST';
 export const FAVOURITE_SUCCESS = 'FAVOURITE_SUCCESS';
 export const FAVOURITE_FAIL    = 'FAVOURITE_FAIL';
 
-export const UNREBLOG_REQUEST = 'UNREBLOG_REQUEST';
-export const UNREBLOG_SUCCESS = 'UNREBLOG_SUCCESS';
-export const UNREBLOG_FAIL    = 'UNREBLOG_FAIL';
-
 export const UNFAVOURITE_REQUEST = 'UNFAVOURITE_REQUEST';
 export const UNFAVOURITE_SUCCESS = 'UNFAVOURITE_SUCCESS';
 export const UNFAVOURITE_FAIL    = 'UNFAVOURITE_FAIL';
@@ -51,83 +43,7 @@ export const UNBOOKMARK_REQUEST = 'UNBOOKMARKED_REQUEST';
 export const UNBOOKMARK_SUCCESS = 'UNBOOKMARKED_SUCCESS';
 export const UNBOOKMARK_FAIL    = 'UNBOOKMARKED_FAIL';
 
-export function reblog(status, visibility) {
-  return function (dispatch) {
-    dispatch(reblogRequest(status));
-
-    api().post(`/api/v1/statuses/${status.get('id')}/reblog`, { visibility }).then(function (response) {
-      // The reblog API method returns a new status wrapped around the original. In this case we are only
-      // interested in how the original is modified, hence passing it skipping the wrapper
-      dispatch(importFetchedStatus(response.data.reblog));
-      dispatch(reblogSuccess(status));
-    }).catch(function (error) {
-      dispatch(reblogFail(status, error));
-    });
-  };
-}
-
-export function unreblog(status) {
-  return (dispatch) => {
-    dispatch(unreblogRequest(status));
-
-    api().post(`/api/v1/statuses/${status.get('id')}/unreblog`).then(response => {
-      dispatch(importFetchedStatus(response.data));
-      dispatch(unreblogSuccess(status));
-    }).catch(error => {
-      dispatch(unreblogFail(status, error));
-    });
-  };
-}
-
-export function reblogRequest(status) {
-  return {
-    type: REBLOG_REQUEST,
-    status: status,
-    skipLoading: true,
-  };
-}
-
-export function reblogSuccess(status) {
-  return {
-    type: REBLOG_SUCCESS,
-    status: status,
-    skipLoading: true,
-  };
-}
-
-export function reblogFail(status, error) {
-  return {
-    type: REBLOG_FAIL,
-    status: status,
-    error: error,
-    skipLoading: true,
-  };
-}
-
-export function unreblogRequest(status) {
-  return {
-    type: UNREBLOG_REQUEST,
-    status: status,
-    skipLoading: true,
-  };
-}
-
-export function unreblogSuccess(status) {
-  return {
-    type: UNREBLOG_SUCCESS,
-    status: status,
-    skipLoading: true,
-  };
-}
-
-export function unreblogFail(status, error) {
-  return {
-    type: UNREBLOG_FAIL,
-    status: status,
-    error: error,
-    skipLoading: true,
-  };
-}
+export * from "./interactions_typed";
 
 export function favourite(status) {
   return function (dispatch) {
diff --git a/app/javascript/mastodon/actions/interactions_typed.ts b/app/javascript/mastodon/actions/interactions_typed.ts
new file mode 100644
index 00000000000000..51808060872cb0
--- /dev/null
+++ b/app/javascript/mastodon/actions/interactions_typed.ts
@@ -0,0 +1,30 @@
+import { apiReblog, apiUnreblog } from 'mastodon/api/interactions';
+import type { StatusVisibility } from 'mastodon/models/status';
+import { createDataLoadingThunk } from 'mastodon/store/typed_functions';
+
+import { importFetchedStatus } from './importer';
+
+export const reblog = createDataLoadingThunk(
+  'status/reblog',
+  (statusId: string, visibility: StatusVisibility) =>
+    apiReblog(statusId, visibility),
+  (data, { dispatch, discardLoadData }) => {
+    // The reblog API method returns a new status wrapped around the original. In this case we are only
+    // interested in how the original is modified, hence passing it skipping the wrapper
+    dispatch(importFetchedStatus(data.reblog));
+
+    // The payload is not used in any actions
+    return discardLoadData;
+  },
+);
+
+export const unreblog = createDataLoadingThunk(
+  'status/unreblog',
+  (statusId: string) => apiUnreblog(statusId),
+  (data, { dispatch, discardLoadData }) => {
+    dispatch(importFetchedStatus(data));
+
+    // The payload is not used in any actions
+    return discardLoadData;
+  },
+);
diff --git a/app/javascript/mastodon/api.ts b/app/javascript/mastodon/api.ts
index 2ccf178f00ea92..4e5ccef08cb56a 100644
--- a/app/javascript/mastodon/api.ts
+++ b/app/javascript/mastodon/api.ts
@@ -1,4 +1,4 @@
-import type { AxiosResponse, RawAxiosRequestHeaders } from 'axios';
+import type { AxiosResponse, Method, RawAxiosRequestHeaders } from 'axios';
 import axios from 'axios';
 import LinkHeader from 'http-link-header';
 
@@ -58,3 +58,17 @@ export default function api(withAuthorization = true) {
     ],
   });
 }
+
+export async function apiRequest<ApiResponse = unknown>(
+  method: Method,
+  url: string,
+  params?: unknown,
+) {
+  const { data } = await api().request<ApiResponse>({
+    method,
+    url,
+    params,
+  });
+
+  return data;
+}
diff --git a/app/javascript/mastodon/api/accounts.ts b/app/javascript/mastodon/api/accounts.ts
new file mode 100644
index 00000000000000..51b1f4f8de8dd4
--- /dev/null
+++ b/app/javascript/mastodon/api/accounts.ts
@@ -0,0 +1,7 @@
+import { apiRequest } from 'mastodon/api';
+import type { ApiRelationshipJSON } from 'mastodon/api_types/relationships';
+
+export const apiSubmitAccountNote = (id: string, value: string) =>
+  apiRequest<ApiRelationshipJSON>('post', `/api/v1/accounts/${id}/note`, {
+    comment: value,
+  });
diff --git a/app/javascript/mastodon/api/interactions.ts b/app/javascript/mastodon/api/interactions.ts
new file mode 100644
index 00000000000000..4c466a1b46d90b
--- /dev/null
+++ b/app/javascript/mastodon/api/interactions.ts
@@ -0,0 +1,10 @@
+import { apiRequest } from 'mastodon/api';
+import type { Status, StatusVisibility } from 'mastodon/models/status';
+
+export const apiReblog = (statusId: string, visibility: StatusVisibility) =>
+  apiRequest<{ reblog: Status }>('post', `v1/statuses/${statusId}/reblog`, {
+    visibility,
+  });
+
+export const apiUnreblog = (statusId: string) =>
+  apiRequest<Status>('post', `v1/statuses/${statusId}/unreblog`);
diff --git a/app/javascript/mastodon/containers/status_container.jsx b/app/javascript/mastodon/containers/status_container.jsx
index c6842e8df86f1a..0174e5a02c5006 100644
--- a/app/javascript/mastodon/containers/status_container.jsx
+++ b/app/javascript/mastodon/containers/status_container.jsx
@@ -96,9 +96,9 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
 
   onModalReblog (status, privacy) {
     if (status.get('reblogged')) {
-      dispatch(unreblog(status));
+      dispatch(unreblog(status.id));
     } else {
-      dispatch(reblog(status, privacy));
+      dispatch(reblog(status.id, privacy));
     }
   },
 
diff --git a/app/javascript/mastodon/features/account/containers/account_note_container.js b/app/javascript/mastodon/features/account/containers/account_note_container.js
index 20304a4524346c..9fbe0671c06d02 100644
--- a/app/javascript/mastodon/features/account/containers/account_note_container.js
+++ b/app/javascript/mastodon/features/account/containers/account_note_container.js
@@ -11,7 +11,7 @@ const mapStateToProps = (state, { account }) => ({
 const mapDispatchToProps = (dispatch, { account }) => ({
 
   onSave (value) {
-    dispatch(submitAccountNote({ id: account.get('id'), value}));
+    dispatch(submitAccountNote(account.get('id'), value));
   },
 
 });
diff --git a/app/javascript/mastodon/features/notifications/containers/notification_container.js b/app/javascript/mastodon/features/notifications/containers/notification_container.js
index de450cd1abe17d..d829cb833ea8af 100644
--- a/app/javascript/mastodon/features/notifications/containers/notification_container.js
+++ b/app/javascript/mastodon/features/notifications/containers/notification_container.js
@@ -39,12 +39,12 @@ const mapDispatchToProps = dispatch => ({
   },
 
   onModalReblog (status, privacy) {
-    dispatch(reblog(status, privacy));
+    dispatch(reblog(status.id, privacy));
   },
 
   onReblog (status, e) {
     if (status.get('reblogged')) {
-      dispatch(unreblog(status));
+      dispatch(unreblog(status.id));
     } else {
       if (e.shiftKey || !boostModal) {
         this.onModalReblog(status);
diff --git a/app/javascript/mastodon/features/picture_in_picture/components/footer.jsx b/app/javascript/mastodon/features/picture_in_picture/components/footer.jsx
index d6b1b5fa81ac90..1c142f3c104c3d 100644
--- a/app/javascript/mastodon/features/picture_in_picture/components/footer.jsx
+++ b/app/javascript/mastodon/features/picture_in_picture/components/footer.jsx
@@ -123,7 +123,7 @@ class Footer extends ImmutablePureComponent {
 
   _performReblog = (status, privacy) => {
     const { dispatch } = this.props;
-    dispatch(reblog(status, privacy));
+    dispatch(reblog(status.id, privacy));
   };
 
   handleReblogClick = e => {
@@ -132,7 +132,7 @@ class Footer extends ImmutablePureComponent {
 
     if (signedIn) {
       if (status.get('reblogged')) {
-        dispatch(unreblog(status));
+        dispatch(unreblog(status.id));
       } else if ((e && e.shiftKey) || !boostModal) {
         this._performReblog(status);
       } else {
diff --git a/app/javascript/mastodon/features/status/containers/detailed_status_container.js b/app/javascript/mastodon/features/status/containers/detailed_status_container.js
index 1c650f544f577b..91bc700e980d29 100644
--- a/app/javascript/mastodon/features/status/containers/detailed_status_container.js
+++ b/app/javascript/mastodon/features/status/containers/detailed_status_container.js
@@ -74,12 +74,12 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
   },
 
   onModalReblog (status, privacy) {
-    dispatch(reblog(status, privacy));
+    dispatch(reblog(status.id, privacy));
   },
 
   onReblog (status, e) {
     if (status.get('reblogged')) {
-      dispatch(unreblog(status));
+      dispatch(unreblog(status.id));
     } else {
       if (e.shiftKey || !boostModal) {
         this.onModalReblog(status);
diff --git a/app/javascript/mastodon/features/status/index.jsx b/app/javascript/mastodon/features/status/index.jsx
index 3a9bf524f8c62d..48f045a4afff1b 100644
--- a/app/javascript/mastodon/features/status/index.jsx
+++ b/app/javascript/mastodon/features/status/index.jsx
@@ -299,7 +299,7 @@ class Status extends ImmutablePureComponent {
   };
 
   handleModalReblog = (status, privacy) => {
-    this.props.dispatch(reblog(status, privacy));
+    this.props.dispatch(reblog(status.id, privacy));
   };
 
   handleReblogClick = (status, e) => {
@@ -308,7 +308,7 @@ class Status extends ImmutablePureComponent {
 
     if (signedIn) {
       if (status.get('reblogged')) {
-        dispatch(unreblog(status));
+        dispatch(unreblog(status.id));
       } else {
         if ((e && e.shiftKey) || !boostModal) {
           this.handleModalReblog(status);
diff --git a/app/javascript/mastodon/reducers/statuses.js b/app/javascript/mastodon/reducers/statuses.js
index 683fe848f776cd..1da1c9cf2fa4d1 100644
--- a/app/javascript/mastodon/reducers/statuses.js
+++ b/app/javascript/mastodon/reducers/statuses.js
@@ -3,10 +3,6 @@ import { Map as ImmutableMap, fromJS } from 'immutable';
 import { STATUS_IMPORT, STATUSES_IMPORT } from '../actions/importer';
 import { normalizeStatusTranslation } from '../actions/importer/normalizer';
 import {
-  REBLOG_REQUEST,
-  REBLOG_FAIL,
-  UNREBLOG_REQUEST,
-  UNREBLOG_FAIL,
   FAVOURITE_REQUEST,
   FAVOURITE_FAIL,
   UNFAVOURITE_REQUEST,
@@ -16,6 +12,10 @@ import {
   UNBOOKMARK_REQUEST,
   UNBOOKMARK_FAIL,
 } from '../actions/interactions';
+import {
+  reblog,
+  unreblog,
+} from '../actions/interactions_typed';
 import {
   STATUS_MUTE_SUCCESS,
   STATUS_UNMUTE_SUCCESS,
@@ -65,6 +65,7 @@ const statusTranslateUndo = (state, id) => {
 
 const initialState = ImmutableMap();
 
+/** @type {import('@reduxjs/toolkit').Reducer<typeof initialState>} */
 export default function statuses(state = initialState, action) {
   switch(action.type) {
   case STATUS_FETCH_REQUEST:
@@ -91,14 +92,6 @@ export default function statuses(state = initialState, action) {
     return state.get(action.status.get('id')) === undefined ? state : state.setIn([action.status.get('id'), 'bookmarked'], false);
   case UNBOOKMARK_FAIL:
     return state.get(action.status.get('id')) === undefined ? state : state.setIn([action.status.get('id'), 'bookmarked'], true);
-  case REBLOG_REQUEST:
-    return state.setIn([action.status.get('id'), 'reblogged'], true);
-  case REBLOG_FAIL:
-    return state.get(action.status.get('id')) === undefined ? state : state.setIn([action.status.get('id'), 'reblogged'], false);
-  case UNREBLOG_REQUEST:
-    return state.setIn([action.status.get('id'), 'reblogged'], false);
-  case UNREBLOG_FAIL:
-    return state.get(action.status.get('id')) === undefined ? state : state.setIn([action.status.get('id'), 'reblogged'], true);
   case STATUS_MUTE_SUCCESS:
     return state.setIn([action.id, 'muted'], true);
   case STATUS_UNMUTE_SUCCESS:
@@ -128,6 +121,15 @@ export default function statuses(state = initialState, action) {
   case STATUS_TRANSLATE_UNDO:
     return statusTranslateUndo(state, action.id);
   default:
-    return state;
+    if(reblog.pending.match(action))
+      return state.setIn([action.meta.params.statusId, 'reblogged'], true);
+    else if(reblog.rejected.match(action))
+      return state.get(action.meta.params.statusId) === undefined ? state : state.setIn([action.meta.params.statusId, 'reblogged'], false);
+    else if(unreblog.pending.match(action))
+      return state.setIn([action.meta.params.statusId, 'reblogged'], false);
+    else if(unreblog.rejected.match(action))
+      return state.get(action.meta.params.statusId) === undefined ? state : state.setIn([action.meta.params.statusId, 'reblogged'], true);
+    else
+      return state;
   }
 }
diff --git a/app/javascript/mastodon/store/typed_functions.ts b/app/javascript/mastodon/store/typed_functions.ts
index b66d7545c5dd4c..4b07a556107af9 100644
--- a/app/javascript/mastodon/store/typed_functions.ts
+++ b/app/javascript/mastodon/store/typed_functions.ts
@@ -2,6 +2,8 @@ import { createAsyncThunk } from '@reduxjs/toolkit';
 // eslint-disable-next-line @typescript-eslint/no-restricted-imports
 import { useDispatch, useSelector } from 'react-redux';
 
+import type { BaseThunkAPI } from '@reduxjs/toolkit/dist/createAsyncThunk';
+
 import type { AppDispatch, RootState } from './store';
 
 export const useAppDispatch = useDispatch.withTypes<AppDispatch>();
@@ -13,8 +15,192 @@ export interface AsyncThunkRejectValue {
   error?: unknown;
 }
 
+interface AppMeta {
+  skipLoading?: boolean;
+}
+
 export const createAppAsyncThunk = createAsyncThunk.withTypes<{
   state: RootState;
   dispatch: AppDispatch;
   rejectValue: AsyncThunkRejectValue;
 }>();
+
+type AppThunkApi = Pick<
+  BaseThunkAPI<
+    RootState,
+    unknown,
+    AppDispatch,
+    AsyncThunkRejectValue,
+    AppMeta,
+    AppMeta
+  >,
+  'getState' | 'dispatch'
+>;
+
+interface AppThunkOptions {
+  skipLoading?: boolean;
+}
+
+const createBaseAsyncThunk = createAsyncThunk.withTypes<{
+  state: RootState;
+  dispatch: AppDispatch;
+  rejectValue: AsyncThunkRejectValue;
+  fulfilledMeta: AppMeta;
+  rejectedMeta: AppMeta;
+}>();
+
+export function createThunk<Arg = void, Returned = void>(
+  name: string,
+  creator: (arg: Arg, api: AppThunkApi) => Returned | Promise<Returned>,
+  options: AppThunkOptions = {},
+) {
+  return createBaseAsyncThunk(
+    name,
+    async (
+      arg: Arg,
+      { getState, dispatch, fulfillWithValue, rejectWithValue },
+    ) => {
+      try {
+        const result = await creator(arg, { dispatch, getState });
+
+        return fulfillWithValue(result, {
+          skipLoading: options.skipLoading,
+        });
+      } catch (error) {
+        return rejectWithValue({ error }, { skipLoading: true });
+      }
+    },
+    {
+      getPendingMeta() {
+        if (options.skipLoading) return { skipLoading: true };
+        return {};
+      },
+    },
+  );
+}
+
+const discardLoadDataInPayload = Symbol('discardLoadDataInPayload');
+type DiscardLoadData = typeof discardLoadDataInPayload;
+
+type OnData<LoadDataResult, ReturnedData> = (
+  data: LoadDataResult,
+  api: AppThunkApi & {
+    discardLoadData: DiscardLoadData;
+  },
+) => ReturnedData | DiscardLoadData | Promise<ReturnedData | DiscardLoadData>;
+
+// Overload when there is no `onData` method, the payload is the `onData` result
+export function createDataLoadingThunk<
+  LoadDataResult,
+  Args extends readonly unknown[],
+>(
+  name: string,
+  loadData: (...args: Args) => Promise<LoadDataResult>,
+  thunkOptions?: AppThunkOptions,
+): ReturnType<typeof createThunk<Args, LoadDataResult>>;
+
+// Overload when the `onData` method returns discardLoadDataInPayload, then the payload is empty
+export function createDataLoadingThunk<
+  LoadDataResult,
+  Args extends readonly unknown[],
+>(
+  name: string,
+  loadData: (...args: Args) => Promise<LoadDataResult>,
+  onDataOrThunkOptions?:
+    | AppThunkOptions
+    | OnData<LoadDataResult, DiscardLoadData>,
+  thunkOptions?: AppThunkOptions,
+): ReturnType<typeof createThunk<Args, void>>;
+
+// Overload when the `onData` method returns nothing, then the mayload is the `onData` result
+export function createDataLoadingThunk<
+  LoadDataResult,
+  Args extends readonly unknown[],
+>(
+  name: string,
+  loadData: (...args: Args) => Promise<LoadDataResult>,
+  onDataOrThunkOptions?: AppThunkOptions | OnData<LoadDataResult, void>,
+  thunkOptions?: AppThunkOptions,
+): ReturnType<typeof createThunk<Args, LoadDataResult>>;
+
+// Overload when there is an `onData` method returning something
+export function createDataLoadingThunk<
+  LoadDataResult,
+  Args extends readonly unknown[],
+  Returned,
+>(
+  name: string,
+  loadData: (...args: Args) => Promise<LoadDataResult>,
+  onDataOrThunkOptions?: AppThunkOptions | OnData<LoadDataResult, Returned>,
+  thunkOptions?: AppThunkOptions,
+): ReturnType<typeof createThunk<Args, Returned>>;
+
+/**
+ * This function creates a Redux Thunk that handles loading data asynchronously (usually from the API), dispatching `pending`, `fullfilled` and `rejected` actions.
+ *
+ * You can run a callback on the `onData` results to either dispatch side effects or modify the payload.
+ *
+ * It is a wrapper around RTK's [`createAsyncThunk`](https://redux-toolkit.js.org/api/createAsyncThunk)
+ * @param name Prefix for the actions types
+ * @param loadData Function that loads the data. It's arguments will become the thunk's arguments
+ * @param onDataOrThunkOptions
+ *   Callback called on the results from `loadData`.
+ *
+ *   First argument will be the return from `loadData`.
+ *
+ *   Second argument is an object with: `dispatch`, `getState` and `discardLoadData`.
+ *   It can return:
+ *   - `undefined` (or no explicit return), meaning that the `onData` results will be the payload
+ *   - `discardLoadData` to discard the `onData` results and return an empty payload
+ *   - anything else, which will be the payload
+ *
+ *   You can also omit this parameter and pass `thunkOptions` directly
+ * @param maybeThunkOptions
+ *   Additional Mastodon specific options for the thunk. Currently supports:
+ *   - `skipLoading` to avoid showing the loading bar when the request is in progress
+ * @returns The created thunk
+ */
+export function createDataLoadingThunk<
+  LoadDataResult,
+  Args extends readonly unknown[],
+  Returned,
+>(
+  name: string,
+  loadData: (...args: Args) => Promise<LoadDataResult>,
+  onDataOrThunkOptions?: AppThunkOptions | OnData<LoadDataResult, Returned>,
+  maybeThunkOptions?: AppThunkOptions,
+) {
+  let onData: OnData<LoadDataResult, Returned> | undefined;
+  let thunkOptions: AppThunkOptions | undefined;
+
+  if (typeof onDataOrThunkOptions === 'function') onData = onDataOrThunkOptions;
+  else if (typeof onDataOrThunkOptions === 'object')
+    thunkOptions = onDataOrThunkOptions;
+
+  if (maybeThunkOptions) {
+    thunkOptions = maybeThunkOptions;
+  }
+
+  return createThunk<Args, Returned>(
+    name,
+    async (arg, { getState, dispatch }) => {
+      const data = await loadData(...arg);
+
+      if (!onData) return data as Returned;
+
+      const result = await onData(data, {
+        dispatch,
+        getState,
+        discardLoadData: discardLoadDataInPayload,
+      });
+
+      // if there is no return in `onData`, we return the `onData` result
+      if (typeof result === 'undefined') return data as Returned;
+      // the user explicitely asked to discard the payload
+      else if (result === discardLoadDataInPayload)
+        return undefined as Returned;
+      else return result;
+    },
+    thunkOptions,
+  );
+}

From 133d98fb25e623745326945b3800173c27519d57 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 23 May 2024 19:28:18 +0200
Subject: [PATCH 1093/2191] Normalize language code of incoming posts (#30403)

---
 app/lib/activitypub/parser/status_parser.rb   | 11 +++-
 .../activitypub/parser/status_parser_spec.rb  | 50 +++++++++++++++++++
 2 files changed, 59 insertions(+), 2 deletions(-)
 create mode 100644 spec/lib/activitypub/parser/status_parser_spec.rb

diff --git a/app/lib/activitypub/parser/status_parser.rb b/app/lib/activitypub/parser/status_parser.rb
index cfc2b8788b1319..2940aea44b7b95 100644
--- a/app/lib/activitypub/parser/status_parser.rb
+++ b/app/lib/activitypub/parser/status_parser.rb
@@ -3,6 +3,8 @@
 class ActivityPub::Parser::StatusParser
   include JsonLdHelper
 
+  NORMALIZED_LOCALE_NAMES = LanguagesHelper::SUPPORTED_LOCALES.keys.index_by(&:downcase).freeze
+
   # @param [Hash] json
   # @param [Hash] options
   # @option options [String] :followers_collection
@@ -87,6 +89,13 @@ def visibility
   end
 
   def language
+    lang = raw_language_code
+    lang.presence && NORMALIZED_LOCALE_NAMES.fetch(lang.downcase.to_sym, lang)
+  end
+
+  private
+
+  def raw_language_code
     if content_language_map?
       @object['contentMap'].keys.first
     elsif name_language_map?
@@ -96,8 +105,6 @@ def language
     end
   end
 
-  private
-
   def audience_to
     as_array(@object['to'] || @json['to']).map { |x| value_or_id(x) }
   end
diff --git a/spec/lib/activitypub/parser/status_parser_spec.rb b/spec/lib/activitypub/parser/status_parser_spec.rb
new file mode 100644
index 00000000000000..5d9f008db158d5
--- /dev/null
+++ b/spec/lib/activitypub/parser/status_parser_spec.rb
@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe ActivityPub::Parser::StatusParser do
+  subject { described_class.new(json) }
+
+  let(:sender) { Fabricate(:account, followers_url: 'http://example.com/followers', domain: 'example.com', uri: 'https://example.com/actor') }
+  let(:follower) { Fabricate(:account, username: 'bob') }
+
+  let(:json) do
+    {
+      '@context': 'https://www.w3.org/ns/activitystreams',
+      id: [ActivityPub::TagManager.instance.uri_for(sender), '#foo'].join,
+      type: 'Create',
+      actor: ActivityPub::TagManager.instance.uri_for(sender),
+      object: object_json,
+    }.with_indifferent_access
+  end
+
+  let(:object_json) do
+    {
+      id: [ActivityPub::TagManager.instance.uri_for(sender), 'post1'].join('/'),
+      type: 'Note',
+      to: [
+        'https://www.w3.org/ns/activitystreams#Public',
+        ActivityPub::TagManager.instance.uri_for(follower),
+      ],
+      content: '@bob lorem ipsum',
+      contentMap: {
+        EN: '@bob lorem ipsum',
+      },
+      published: 1.hour.ago.utc.iso8601,
+      updated: 1.hour.ago.utc.iso8601,
+      tag: {
+        type: 'Mention',
+        href: ActivityPub::TagManager.instance.uri_for(follower),
+      },
+    }
+  end
+
+  it 'correctly parses status' do
+    expect(subject).to have_attributes(
+      text: '@bob lorem ipsum',
+      uri: [ActivityPub::TagManager.instance.uri_for(sender), 'post1'].join('/'),
+      reply: false,
+      language: :en
+    )
+  end
+end

From c465ef75602d1b9c92d640de9971a2798355585f Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Thu, 23 May 2024 09:30:48 +0200
Subject: [PATCH 1094/2191] [Glitch] Fix some API calls that should not use an
 API token

Port 15d307075479cf93ea199be0f25820003ddbe27c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/api.ts                         | 4 ++--
 app/javascript/flavours/glitch/components/admin/Counter.jsx   | 2 +-
 app/javascript/flavours/glitch/components/admin/Dimension.jsx | 2 +-
 .../flavours/glitch/components/admin/ImpactReport.jsx         | 2 +-
 .../flavours/glitch/components/admin/ReportReasonSelector.jsx | 4 ++--
 app/javascript/flavours/glitch/components/admin/Retention.jsx | 2 +-
 app/javascript/flavours/glitch/components/admin/Trends.jsx    | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/javascript/flavours/glitch/api.ts b/app/javascript/flavours/glitch/api.ts
index ccff68c373e5d6..2ccf178f00ea92 100644
--- a/app/javascript/flavours/glitch/api.ts
+++ b/app/javascript/flavours/glitch/api.ts
@@ -40,11 +40,11 @@ const authorizationTokenFromInitialState = (): RawAxiosRequestHeaders => {
 };
 
 // eslint-disable-next-line import/no-default-export
-export default function api() {
+export default function api(withAuthorization = true) {
   return axios.create({
     headers: {
       ...csrfHeader,
-      ...authorizationTokenFromInitialState(),
+      ...(withAuthorization ? authorizationTokenFromInitialState() : {}),
     },
 
     transformResponse: [
diff --git a/app/javascript/flavours/glitch/components/admin/Counter.jsx b/app/javascript/flavours/glitch/components/admin/Counter.jsx
index 9bb792fc9dd87b..ce62c93570863a 100644
--- a/app/javascript/flavours/glitch/components/admin/Counter.jsx
+++ b/app/javascript/flavours/glitch/components/admin/Counter.jsx
@@ -48,7 +48,7 @@ export default class Counter extends PureComponent {
   componentDidMount () {
     const { measure, start_at, end_at, params } = this.props;
 
-    api().post('/api/v1/admin/measures', { keys: [measure], start_at, end_at, [measure]: params }).then(res => {
+    api(false).post('/api/v1/admin/measures', { keys: [measure], start_at, end_at, [measure]: params }).then(res => {
       this.setState({
         loading: false,
         data: res.data,
diff --git a/app/javascript/flavours/glitch/components/admin/Dimension.jsx b/app/javascript/flavours/glitch/components/admin/Dimension.jsx
index 793fe2dd76d09f..de24a4bf3c017f 100644
--- a/app/javascript/flavours/glitch/components/admin/Dimension.jsx
+++ b/app/javascript/flavours/glitch/components/admin/Dimension.jsx
@@ -26,7 +26,7 @@ export default class Dimension extends PureComponent {
   componentDidMount () {
     const { start_at, end_at, dimension, limit, params } = this.props;
 
-    api().post('/api/v1/admin/dimensions', { keys: [dimension], start_at, end_at, limit, [dimension]: params }).then(res => {
+    api(false).post('/api/v1/admin/dimensions', { keys: [dimension], start_at, end_at, limit, [dimension]: params }).then(res => {
       this.setState({
         loading: false,
         data: res.data,
diff --git a/app/javascript/flavours/glitch/components/admin/ImpactReport.jsx b/app/javascript/flavours/glitch/components/admin/ImpactReport.jsx
index 9ec1460fcf2416..06d1a6a343e54b 100644
--- a/app/javascript/flavours/glitch/components/admin/ImpactReport.jsx
+++ b/app/javascript/flavours/glitch/components/admin/ImpactReport.jsx
@@ -27,7 +27,7 @@ export default class ImpactReport extends PureComponent {
       include_subdomains: true,
     };
 
-    api().post('/api/v1/admin/measures', {
+    api(false).post('/api/v1/admin/measures', {
       keys: ['instance_accounts', 'instance_follows', 'instance_followers'],
       start_at: null,
       end_at: null,
diff --git a/app/javascript/flavours/glitch/components/admin/ReportReasonSelector.jsx b/app/javascript/flavours/glitch/components/admin/ReportReasonSelector.jsx
index 9ff1d308991beb..323e0b0d394347 100644
--- a/app/javascript/flavours/glitch/components/admin/ReportReasonSelector.jsx
+++ b/app/javascript/flavours/glitch/components/admin/ReportReasonSelector.jsx
@@ -105,7 +105,7 @@ class ReportReasonSelector extends PureComponent {
   };
 
   componentDidMount() {
-    api().get('/api/v1/instance').then(res => {
+    api(false).get('/api/v1/instance').then(res => {
       this.setState({
         rules: res.data.rules,
       });
@@ -122,7 +122,7 @@ class ReportReasonSelector extends PureComponent {
       return;
     }
 
-    api().put(`/api/v1/admin/reports/${id}`, {
+    api(false).put(`/api/v1/admin/reports/${id}`, {
       category,
       rule_ids: category === 'violation' ? rule_ids : [],
     }).catch(err => {
diff --git a/app/javascript/flavours/glitch/components/admin/Retention.jsx b/app/javascript/flavours/glitch/components/admin/Retention.jsx
index e9f0ea2e0f813a..e2a19d58447088 100644
--- a/app/javascript/flavours/glitch/components/admin/Retention.jsx
+++ b/app/javascript/flavours/glitch/components/admin/Retention.jsx
@@ -34,7 +34,7 @@ export default class Retention extends PureComponent {
   componentDidMount () {
     const { start_at, end_at, frequency } = this.props;
 
-    api().post('/api/v1/admin/retention', { start_at, end_at, frequency }).then(res => {
+    api(false).post('/api/v1/admin/retention', { start_at, end_at, frequency }).then(res => {
       this.setState({
         loading: false,
         data: res.data,
diff --git a/app/javascript/flavours/glitch/components/admin/Trends.jsx b/app/javascript/flavours/glitch/components/admin/Trends.jsx
index d7755fcdbb1e64..b64f3f90abe955 100644
--- a/app/javascript/flavours/glitch/components/admin/Trends.jsx
+++ b/app/javascript/flavours/glitch/components/admin/Trends.jsx
@@ -22,7 +22,7 @@ export default class Trends extends PureComponent {
   componentDidMount () {
     const { limit } = this.props;
 
-    api().get('/api/v1/admin/trends/tags', { params: { limit } }).then(res => {
+    api(false).get('/api/v1/admin/trends/tags', { params: { limit } }).then(res => {
       this.setState({
         loading: false,
         data: res.data,

From b6fd14f0e2842eca269ef8962e3c5bd560a76357 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Thu, 23 May 2024 20:22:42 +0200
Subject: [PATCH 1095/2191] Fix `createDataLoadingThunk` and related actions
 (#30408)

---
 .../mastodon/actions/account_notes.ts         |  3 ++-
 .../mastodon/actions/interactions_typed.ts    | 11 ++++++---
 app/javascript/mastodon/api.ts                |  6 ++---
 app/javascript/mastodon/api/accounts.ts       |  2 +-
 .../mastodon/containers/status_container.jsx  |  4 ++--
 .../containers/account_note_container.js      |  2 +-
 .../containers/notification_container.js      |  4 ++--
 .../picture_in_picture/components/footer.jsx  |  4 ++--
 .../containers/detailed_status_container.js   |  4 ++--
 .../mastodon/features/status/index.jsx        |  4 ++--
 app/javascript/mastodon/reducers/statuses.js  |  8 +++----
 .../mastodon/store/typed_functions.ts         | 24 +++++++++----------
 12 files changed, 41 insertions(+), 35 deletions(-)

diff --git a/app/javascript/mastodon/actions/account_notes.ts b/app/javascript/mastodon/actions/account_notes.ts
index bf4f93dca9e5c9..c2ebaf54a43055 100644
--- a/app/javascript/mastodon/actions/account_notes.ts
+++ b/app/javascript/mastodon/actions/account_notes.ts
@@ -3,7 +3,8 @@ import { createDataLoadingThunk } from 'mastodon/store/typed_functions';
 
 export const submitAccountNote = createDataLoadingThunk(
   'account_note/submit',
-  (accountId: string, note: string) => apiSubmitAccountNote(accountId, note),
+  ({ accountId, note }: { accountId: string; note: string }) =>
+    apiSubmitAccountNote(accountId, note),
   (relationship) => ({ relationship }),
   { skipLoading: true },
 );
diff --git a/app/javascript/mastodon/actions/interactions_typed.ts b/app/javascript/mastodon/actions/interactions_typed.ts
index 51808060872cb0..f58faffa86d468 100644
--- a/app/javascript/mastodon/actions/interactions_typed.ts
+++ b/app/javascript/mastodon/actions/interactions_typed.ts
@@ -6,8 +6,13 @@ import { importFetchedStatus } from './importer';
 
 export const reblog = createDataLoadingThunk(
   'status/reblog',
-  (statusId: string, visibility: StatusVisibility) =>
-    apiReblog(statusId, visibility),
+  ({
+    statusId,
+    visibility,
+  }: {
+    statusId: string;
+    visibility: StatusVisibility;
+  }) => apiReblog(statusId, visibility),
   (data, { dispatch, discardLoadData }) => {
     // The reblog API method returns a new status wrapped around the original. In this case we are only
     // interested in how the original is modified, hence passing it skipping the wrapper
@@ -20,7 +25,7 @@ export const reblog = createDataLoadingThunk(
 
 export const unreblog = createDataLoadingThunk(
   'status/unreblog',
-  (statusId: string) => apiUnreblog(statusId),
+  ({ statusId }: { statusId: string }) => apiUnreblog(statusId),
   (data, { dispatch, discardLoadData }) => {
     dispatch(importFetchedStatus(data));
 
diff --git a/app/javascript/mastodon/api.ts b/app/javascript/mastodon/api.ts
index 4e5ccef08cb56a..e133125a29cf33 100644
--- a/app/javascript/mastodon/api.ts
+++ b/app/javascript/mastodon/api.ts
@@ -62,12 +62,12 @@ export default function api(withAuthorization = true) {
 export async function apiRequest<ApiResponse = unknown>(
   method: Method,
   url: string,
-  params?: unknown,
+  params?: Record<string, unknown>,
 ) {
   const { data } = await api().request<ApiResponse>({
     method,
-    url,
-    params,
+    url: '/api/' + url,
+    data: params,
   });
 
   return data;
diff --git a/app/javascript/mastodon/api/accounts.ts b/app/javascript/mastodon/api/accounts.ts
index 51b1f4f8de8dd4..3d89e44b2673d3 100644
--- a/app/javascript/mastodon/api/accounts.ts
+++ b/app/javascript/mastodon/api/accounts.ts
@@ -2,6 +2,6 @@ import { apiRequest } from 'mastodon/api';
 import type { ApiRelationshipJSON } from 'mastodon/api_types/relationships';
 
 export const apiSubmitAccountNote = (id: string, value: string) =>
-  apiRequest<ApiRelationshipJSON>('post', `/api/v1/accounts/${id}/note`, {
+  apiRequest<ApiRelationshipJSON>('post', `v1/accounts/${id}/note`, {
     comment: value,
   });
diff --git a/app/javascript/mastodon/containers/status_container.jsx b/app/javascript/mastodon/containers/status_container.jsx
index 0174e5a02c5006..4a9b5257778b35 100644
--- a/app/javascript/mastodon/containers/status_container.jsx
+++ b/app/javascript/mastodon/containers/status_container.jsx
@@ -96,9 +96,9 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
 
   onModalReblog (status, privacy) {
     if (status.get('reblogged')) {
-      dispatch(unreblog(status.id));
+      dispatch(unreblog({ statusId: status.get('id') }));
     } else {
-      dispatch(reblog(status.id, privacy));
+      dispatch(reblog({ statusId: status.get('id'), visibility: privacy }));
     }
   },
 
diff --git a/app/javascript/mastodon/features/account/containers/account_note_container.js b/app/javascript/mastodon/features/account/containers/account_note_container.js
index 9fbe0671c06d02..1530242d694992 100644
--- a/app/javascript/mastodon/features/account/containers/account_note_container.js
+++ b/app/javascript/mastodon/features/account/containers/account_note_container.js
@@ -11,7 +11,7 @@ const mapStateToProps = (state, { account }) => ({
 const mapDispatchToProps = (dispatch, { account }) => ({
 
   onSave (value) {
-    dispatch(submitAccountNote(account.get('id'), value));
+    dispatch(submitAccountNote({ accountId: account.get('id'), note: value }));
   },
 
 });
diff --git a/app/javascript/mastodon/features/notifications/containers/notification_container.js b/app/javascript/mastodon/features/notifications/containers/notification_container.js
index d829cb833ea8af..650acf4ccd4aa9 100644
--- a/app/javascript/mastodon/features/notifications/containers/notification_container.js
+++ b/app/javascript/mastodon/features/notifications/containers/notification_container.js
@@ -39,12 +39,12 @@ const mapDispatchToProps = dispatch => ({
   },
 
   onModalReblog (status, privacy) {
-    dispatch(reblog(status.id, privacy));
+    dispatch(reblog({ statusId: status.get('id'), visibility: privacy }));
   },
 
   onReblog (status, e) {
     if (status.get('reblogged')) {
-      dispatch(unreblog(status.id));
+      dispatch(unreblog({ statusId: status.get('id') }));
     } else {
       if (e.shiftKey || !boostModal) {
         this.onModalReblog(status);
diff --git a/app/javascript/mastodon/features/picture_in_picture/components/footer.jsx b/app/javascript/mastodon/features/picture_in_picture/components/footer.jsx
index 1c142f3c104c3d..ba0642da288d55 100644
--- a/app/javascript/mastodon/features/picture_in_picture/components/footer.jsx
+++ b/app/javascript/mastodon/features/picture_in_picture/components/footer.jsx
@@ -123,7 +123,7 @@ class Footer extends ImmutablePureComponent {
 
   _performReblog = (status, privacy) => {
     const { dispatch } = this.props;
-    dispatch(reblog(status.id, privacy));
+    dispatch(reblog({ statusId: status.get('id'), visibility: privacy }));
   };
 
   handleReblogClick = e => {
@@ -132,7 +132,7 @@ class Footer extends ImmutablePureComponent {
 
     if (signedIn) {
       if (status.get('reblogged')) {
-        dispatch(unreblog(status.id));
+        dispatch(unreblog({ statusId: status.get('id') }));
       } else if ((e && e.shiftKey) || !boostModal) {
         this._performReblog(status);
       } else {
diff --git a/app/javascript/mastodon/features/status/containers/detailed_status_container.js b/app/javascript/mastodon/features/status/containers/detailed_status_container.js
index 91bc700e980d29..c3d4fec4dba47f 100644
--- a/app/javascript/mastodon/features/status/containers/detailed_status_container.js
+++ b/app/javascript/mastodon/features/status/containers/detailed_status_container.js
@@ -74,12 +74,12 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
   },
 
   onModalReblog (status, privacy) {
-    dispatch(reblog(status.id, privacy));
+    dispatch(reblog({ statusId: status.get('id'), visibility: privacy }));
   },
 
   onReblog (status, e) {
     if (status.get('reblogged')) {
-      dispatch(unreblog(status.id));
+      dispatch(unreblog({ statusId: status.get('id') }));
     } else {
       if (e.shiftKey || !boostModal) {
         this.onModalReblog(status);
diff --git a/app/javascript/mastodon/features/status/index.jsx b/app/javascript/mastodon/features/status/index.jsx
index 48f045a4afff1b..7f37cb50d2e51c 100644
--- a/app/javascript/mastodon/features/status/index.jsx
+++ b/app/javascript/mastodon/features/status/index.jsx
@@ -299,7 +299,7 @@ class Status extends ImmutablePureComponent {
   };
 
   handleModalReblog = (status, privacy) => {
-    this.props.dispatch(reblog(status.id, privacy));
+    this.props.dispatch(reblog({ statusId: status.get('id'), visibility: privacy }));
   };
 
   handleReblogClick = (status, e) => {
@@ -308,7 +308,7 @@ class Status extends ImmutablePureComponent {
 
     if (signedIn) {
       if (status.get('reblogged')) {
-        dispatch(unreblog(status.id));
+        dispatch(unreblog({ statusId: status.get('id') }));
       } else {
         if ((e && e.shiftKey) || !boostModal) {
           this.handleModalReblog(status);
diff --git a/app/javascript/mastodon/reducers/statuses.js b/app/javascript/mastodon/reducers/statuses.js
index 1da1c9cf2fa4d1..ca766f73a36e5d 100644
--- a/app/javascript/mastodon/reducers/statuses.js
+++ b/app/javascript/mastodon/reducers/statuses.js
@@ -122,13 +122,13 @@ export default function statuses(state = initialState, action) {
     return statusTranslateUndo(state, action.id);
   default:
     if(reblog.pending.match(action))
-      return state.setIn([action.meta.params.statusId, 'reblogged'], true);
+      return state.setIn([action.meta.arg.statusId, 'reblogged'], true);
     else if(reblog.rejected.match(action))
-      return state.get(action.meta.params.statusId) === undefined ? state : state.setIn([action.meta.params.statusId, 'reblogged'], false);
+      return state.get(action.meta.arg.statusId) === undefined ? state : state.setIn([action.meta.arg.statusId, 'reblogged'], false);
     else if(unreblog.pending.match(action))
-      return state.setIn([action.meta.params.statusId, 'reblogged'], false);
+      return state.setIn([action.meta.arg.statusId, 'reblogged'], false);
     else if(unreblog.rejected.match(action))
-      return state.get(action.meta.params.statusId) === undefined ? state : state.setIn([action.meta.params.statusId, 'reblogged'], true);
+      return state.get(action.meta.arg.statusId) === undefined ? state : state.setIn([action.meta.arg.statusId, 'reblogged'], true);
     else
       return state;
   }
diff --git a/app/javascript/mastodon/store/typed_functions.ts b/app/javascript/mastodon/store/typed_functions.ts
index 4b07a556107af9..0392f373c0c6bb 100644
--- a/app/javascript/mastodon/store/typed_functions.ts
+++ b/app/javascript/mastodon/store/typed_functions.ts
@@ -92,20 +92,20 @@ type OnData<LoadDataResult, ReturnedData> = (
 // Overload when there is no `onData` method, the payload is the `onData` result
 export function createDataLoadingThunk<
   LoadDataResult,
-  Args extends readonly unknown[],
+  Args extends Record<string, unknown>,
 >(
   name: string,
-  loadData: (...args: Args) => Promise<LoadDataResult>,
+  loadData: (args: Args) => Promise<LoadDataResult>,
   thunkOptions?: AppThunkOptions,
 ): ReturnType<typeof createThunk<Args, LoadDataResult>>;
 
 // Overload when the `onData` method returns discardLoadDataInPayload, then the payload is empty
 export function createDataLoadingThunk<
   LoadDataResult,
-  Args extends readonly unknown[],
+  Args extends Record<string, unknown>,
 >(
   name: string,
-  loadData: (...args: Args) => Promise<LoadDataResult>,
+  loadData: (args: Args) => Promise<LoadDataResult>,
   onDataOrThunkOptions?:
     | AppThunkOptions
     | OnData<LoadDataResult, DiscardLoadData>,
@@ -115,10 +115,10 @@ export function createDataLoadingThunk<
 // Overload when the `onData` method returns nothing, then the mayload is the `onData` result
 export function createDataLoadingThunk<
   LoadDataResult,
-  Args extends readonly unknown[],
+  Args extends Record<string, unknown>,
 >(
   name: string,
-  loadData: (...args: Args) => Promise<LoadDataResult>,
+  loadData: (args: Args) => Promise<LoadDataResult>,
   onDataOrThunkOptions?: AppThunkOptions | OnData<LoadDataResult, void>,
   thunkOptions?: AppThunkOptions,
 ): ReturnType<typeof createThunk<Args, LoadDataResult>>;
@@ -126,11 +126,11 @@ export function createDataLoadingThunk<
 // Overload when there is an `onData` method returning something
 export function createDataLoadingThunk<
   LoadDataResult,
-  Args extends readonly unknown[],
+  Args extends Record<string, unknown>,
   Returned,
 >(
   name: string,
-  loadData: (...args: Args) => Promise<LoadDataResult>,
+  loadData: (args: Args) => Promise<LoadDataResult>,
   onDataOrThunkOptions?: AppThunkOptions | OnData<LoadDataResult, Returned>,
   thunkOptions?: AppThunkOptions,
 ): ReturnType<typeof createThunk<Args, Returned>>;
@@ -142,7 +142,7 @@ export function createDataLoadingThunk<
  *
  * It is a wrapper around RTK's [`createAsyncThunk`](https://redux-toolkit.js.org/api/createAsyncThunk)
  * @param name Prefix for the actions types
- * @param loadData Function that loads the data. It's arguments will become the thunk's arguments
+ * @param loadData Function that loads the data. It's (object) argument will become the thunk's argument
  * @param onDataOrThunkOptions
  *   Callback called on the results from `loadData`.
  *
@@ -162,11 +162,11 @@ export function createDataLoadingThunk<
  */
 export function createDataLoadingThunk<
   LoadDataResult,
-  Args extends readonly unknown[],
+  Args extends Record<string, unknown>,
   Returned,
 >(
   name: string,
-  loadData: (...args: Args) => Promise<LoadDataResult>,
+  loadData: (args: Args) => Promise<LoadDataResult>,
   onDataOrThunkOptions?: AppThunkOptions | OnData<LoadDataResult, Returned>,
   maybeThunkOptions?: AppThunkOptions,
 ) {
@@ -184,7 +184,7 @@ export function createDataLoadingThunk<
   return createThunk<Args, Returned>(
     name,
     async (arg, { getState, dispatch }) => {
-      const data = await loadData(...arg);
+      const data = await loadData(arg);
 
       if (!onData) return data as Returned;
 

From 8d6058b40a8953e16338b57f5ba0e17fc07a1bd2 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Thu, 23 May 2024 11:50:13 +0200
Subject: [PATCH 1096/2191] [Glitch] Proposal: a modern & typed way of writing
 Redux actions doing API requests

Port 10ec421dd4e0da987e69a3dd7f4f696f9c5878e0 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/actions/account_notes.ts  |  21 +-
 .../flavours/glitch/actions/interactions.js   |  86 +-------
 .../glitch/actions/interactions_typed.ts      |  30 +++
 app/javascript/flavours/glitch/api.ts         |  16 +-
 .../flavours/glitch/api/accounts.ts           |   7 +
 .../flavours/glitch/api/interactions.ts       |  10 +
 .../glitch/containers/status_container.js     |   4 +-
 .../containers/account_note_container.js      |   2 +-
 .../containers/notification_container.js      |   4 +-
 .../picture_in_picture/components/footer.jsx  |   4 +-
 .../containers/detailed_status_container.js   |   4 +-
 .../flavours/glitch/features/status/index.jsx |   4 +-
 .../flavours/glitch/reducers/statuses.js      |  28 +--
 .../flavours/glitch/store/typed_functions.ts  | 186 ++++++++++++++++++
 14 files changed, 281 insertions(+), 125 deletions(-)
 create mode 100644 app/javascript/flavours/glitch/actions/interactions_typed.ts
 create mode 100644 app/javascript/flavours/glitch/api/accounts.ts
 create mode 100644 app/javascript/flavours/glitch/api/interactions.ts

diff --git a/app/javascript/flavours/glitch/actions/account_notes.ts b/app/javascript/flavours/glitch/actions/account_notes.ts
index b3e79a92c6dc26..9b05ae06c2826e 100644
--- a/app/javascript/flavours/glitch/actions/account_notes.ts
+++ b/app/javascript/flavours/glitch/actions/account_notes.ts
@@ -1,18 +1,9 @@
-import type { ApiRelationshipJSON } from 'flavours/glitch/api_types/relationships';
-import { createAppAsyncThunk } from 'flavours/glitch/store/typed_functions';
+import { apiSubmitAccountNote } from 'flavours/glitch/api/accounts';
+import { createDataLoadingThunk } from 'flavours/glitch/store/typed_functions';
 
-import api from '../api';
-
-export const submitAccountNote = createAppAsyncThunk(
+export const submitAccountNote = createDataLoadingThunk(
   'account_note/submit',
-  async (args: { id: string; value: string }) => {
-    const response = await api().post<ApiRelationshipJSON>(
-      `/api/v1/accounts/${args.id}/note`,
-      {
-        comment: args.value,
-      },
-    );
-
-    return { relationship: response.data };
-  },
+  (accountId: string, note: string) => apiSubmitAccountNote(accountId, note),
+  (relationship) => ({ relationship }),
+  { skipLoading: true },
 );
diff --git a/app/javascript/flavours/glitch/actions/interactions.js b/app/javascript/flavours/glitch/actions/interactions.js
index fe7c911b61e2a5..57f2459c016fa4 100644
--- a/app/javascript/flavours/glitch/actions/interactions.js
+++ b/app/javascript/flavours/glitch/actions/interactions.js
@@ -3,10 +3,6 @@ import api, { getLinks } from '../api';
 import { fetchRelationships } from './accounts';
 import { importFetchedAccounts, importFetchedStatus } from './importer';
 
-export const REBLOG_REQUEST = 'REBLOG_REQUEST';
-export const REBLOG_SUCCESS = 'REBLOG_SUCCESS';
-export const REBLOG_FAIL    = 'REBLOG_FAIL';
-
 export const REBLOGS_EXPAND_REQUEST = 'REBLOGS_EXPAND_REQUEST';
 export const REBLOGS_EXPAND_SUCCESS = 'REBLOGS_EXPAND_SUCCESS';
 export const REBLOGS_EXPAND_FAIL = 'REBLOGS_EXPAND_FAIL';
@@ -15,10 +11,6 @@ export const FAVOURITE_REQUEST = 'FAVOURITE_REQUEST';
 export const FAVOURITE_SUCCESS = 'FAVOURITE_SUCCESS';
 export const FAVOURITE_FAIL    = 'FAVOURITE_FAIL';
 
-export const UNREBLOG_REQUEST = 'UNREBLOG_REQUEST';
-export const UNREBLOG_SUCCESS = 'UNREBLOG_SUCCESS';
-export const UNREBLOG_FAIL    = 'UNREBLOG_FAIL';
-
 export const UNFAVOURITE_REQUEST = 'UNFAVOURITE_REQUEST';
 export const UNFAVOURITE_SUCCESS = 'UNFAVOURITE_SUCCESS';
 export const UNFAVOURITE_FAIL    = 'UNFAVOURITE_FAIL';
@@ -51,83 +43,7 @@ export const UNBOOKMARK_REQUEST = 'UNBOOKMARKED_REQUEST';
 export const UNBOOKMARK_SUCCESS = 'UNBOOKMARKED_SUCCESS';
 export const UNBOOKMARK_FAIL    = 'UNBOOKMARKED_FAIL';
 
-export function reblog(status, visibility) {
-  return function (dispatch) {
-    dispatch(reblogRequest(status));
-
-    api().post(`/api/v1/statuses/${status.get('id')}/reblog`, { visibility }).then(function (response) {
-      // The reblog API method returns a new status wrapped around the original. In this case we are only
-      // interested in how the original is modified, hence passing it skipping the wrapper
-      dispatch(importFetchedStatus(response.data.reblog));
-      dispatch(reblogSuccess(status));
-    }).catch(function (error) {
-      dispatch(reblogFail(status, error));
-    });
-  };
-}
-
-export function unreblog(status) {
-  return (dispatch) => {
-    dispatch(unreblogRequest(status));
-
-    api().post(`/api/v1/statuses/${status.get('id')}/unreblog`).then(response => {
-      dispatch(importFetchedStatus(response.data));
-      dispatch(unreblogSuccess(status));
-    }).catch(error => {
-      dispatch(unreblogFail(status, error));
-    });
-  };
-}
-
-export function reblogRequest(status) {
-  return {
-    type: REBLOG_REQUEST,
-    status: status,
-    skipLoading: true,
-  };
-}
-
-export function reblogSuccess(status) {
-  return {
-    type: REBLOG_SUCCESS,
-    status: status,
-    skipLoading: true,
-  };
-}
-
-export function reblogFail(status, error) {
-  return {
-    type: REBLOG_FAIL,
-    status: status,
-    error: error,
-    skipLoading: true,
-  };
-}
-
-export function unreblogRequest(status) {
-  return {
-    type: UNREBLOG_REQUEST,
-    status: status,
-    skipLoading: true,
-  };
-}
-
-export function unreblogSuccess(status) {
-  return {
-    type: UNREBLOG_SUCCESS,
-    status: status,
-    skipLoading: true,
-  };
-}
-
-export function unreblogFail(status, error) {
-  return {
-    type: UNREBLOG_FAIL,
-    status: status,
-    error: error,
-    skipLoading: true,
-  };
-}
+export * from "./interactions_typed";
 
 export function favourite(status) {
   return function (dispatch) {
diff --git a/app/javascript/flavours/glitch/actions/interactions_typed.ts b/app/javascript/flavours/glitch/actions/interactions_typed.ts
new file mode 100644
index 00000000000000..30ae270ea1c92f
--- /dev/null
+++ b/app/javascript/flavours/glitch/actions/interactions_typed.ts
@@ -0,0 +1,30 @@
+import { apiReblog, apiUnreblog } from 'flavours/glitch/api/interactions';
+import type { StatusVisibility } from 'flavours/glitch/models/status';
+import { createDataLoadingThunk } from 'flavours/glitch/store/typed_functions';
+
+import { importFetchedStatus } from './importer';
+
+export const reblog = createDataLoadingThunk(
+  'status/reblog',
+  (statusId: string, visibility: StatusVisibility) =>
+    apiReblog(statusId, visibility),
+  (data, { dispatch, discardLoadData }) => {
+    // The reblog API method returns a new status wrapped around the original. In this case we are only
+    // interested in how the original is modified, hence passing it skipping the wrapper
+    dispatch(importFetchedStatus(data.reblog));
+
+    // The payload is not used in any actions
+    return discardLoadData;
+  },
+);
+
+export const unreblog = createDataLoadingThunk(
+  'status/unreblog',
+  (statusId: string) => apiUnreblog(statusId),
+  (data, { dispatch, discardLoadData }) => {
+    dispatch(importFetchedStatus(data));
+
+    // The payload is not used in any actions
+    return discardLoadData;
+  },
+);
diff --git a/app/javascript/flavours/glitch/api.ts b/app/javascript/flavours/glitch/api.ts
index 2ccf178f00ea92..4e5ccef08cb56a 100644
--- a/app/javascript/flavours/glitch/api.ts
+++ b/app/javascript/flavours/glitch/api.ts
@@ -1,4 +1,4 @@
-import type { AxiosResponse, RawAxiosRequestHeaders } from 'axios';
+import type { AxiosResponse, Method, RawAxiosRequestHeaders } from 'axios';
 import axios from 'axios';
 import LinkHeader from 'http-link-header';
 
@@ -58,3 +58,17 @@ export default function api(withAuthorization = true) {
     ],
   });
 }
+
+export async function apiRequest<ApiResponse = unknown>(
+  method: Method,
+  url: string,
+  params?: unknown,
+) {
+  const { data } = await api().request<ApiResponse>({
+    method,
+    url,
+    params,
+  });
+
+  return data;
+}
diff --git a/app/javascript/flavours/glitch/api/accounts.ts b/app/javascript/flavours/glitch/api/accounts.ts
new file mode 100644
index 00000000000000..19abc849b71590
--- /dev/null
+++ b/app/javascript/flavours/glitch/api/accounts.ts
@@ -0,0 +1,7 @@
+import { apiRequest } from 'flavours/glitch/api';
+import type { ApiRelationshipJSON } from 'flavours/glitch/api_types/relationships';
+
+export const apiSubmitAccountNote = (id: string, value: string) =>
+  apiRequest<ApiRelationshipJSON>('post', `/api/v1/accounts/${id}/note`, {
+    comment: value,
+  });
diff --git a/app/javascript/flavours/glitch/api/interactions.ts b/app/javascript/flavours/glitch/api/interactions.ts
new file mode 100644
index 00000000000000..eaa83b2136a4c6
--- /dev/null
+++ b/app/javascript/flavours/glitch/api/interactions.ts
@@ -0,0 +1,10 @@
+import { apiRequest } from 'flavours/glitch/api';
+import type { Status, StatusVisibility } from 'flavours/glitch/models/status';
+
+export const apiReblog = (statusId: string, visibility: StatusVisibility) =>
+  apiRequest<{ reblog: Status }>('post', `v1/statuses/${statusId}/reblog`, {
+    visibility,
+  });
+
+export const apiUnreblog = (statusId: string) =>
+  apiRequest<Status>('post', `v1/statuses/${statusId}/unreblog`);
diff --git a/app/javascript/flavours/glitch/containers/status_container.js b/app/javascript/flavours/glitch/containers/status_container.js
index d304af5ec72429..6ae800c037c639 100644
--- a/app/javascript/flavours/glitch/containers/status_container.js
+++ b/app/javascript/flavours/glitch/containers/status_container.js
@@ -115,9 +115,9 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
 
   onModalReblog (status, privacy) {
     if (status.get('reblogged')) {
-      dispatch(unreblog(status));
+      dispatch(unreblog(status.id));
     } else {
-      dispatch(reblog(status, privacy));
+      dispatch(reblog(status.id, privacy));
     }
   },
 
diff --git a/app/javascript/flavours/glitch/features/account/containers/account_note_container.js b/app/javascript/flavours/glitch/features/account/containers/account_note_container.js
index d98a3996d0907c..2fd7d56735a80b 100644
--- a/app/javascript/flavours/glitch/features/account/containers/account_note_container.js
+++ b/app/javascript/flavours/glitch/features/account/containers/account_note_container.js
@@ -11,7 +11,7 @@ const mapStateToProps = (state, { account }) => ({
 const mapDispatchToProps = (dispatch, { account }) => ({
 
   onSave (value) {
-    dispatch(submitAccountNote({ id: account.get('id'), value}));
+    dispatch(submitAccountNote(account.get('id'), value));
   },
 
 });
diff --git a/app/javascript/flavours/glitch/features/notifications/containers/notification_container.js b/app/javascript/flavours/glitch/features/notifications/containers/notification_container.js
index de5cb2b11ee2fc..570f468157dccd 100644
--- a/app/javascript/flavours/glitch/features/notifications/containers/notification_container.js
+++ b/app/javascript/flavours/glitch/features/notifications/containers/notification_container.js
@@ -36,12 +36,12 @@ const mapDispatchToProps = dispatch => ({
   },
 
   onModalReblog (status, privacy) {
-    dispatch(reblog(status, privacy));
+    dispatch(reblog(status.id, privacy));
   },
 
   onReblog (status, e) {
     if (status.get('reblogged')) {
-      dispatch(unreblog(status));
+      dispatch(unreblog(status.id));
     } else {
       if (e.shiftKey || !boostModal) {
         this.onModalReblog(status);
diff --git a/app/javascript/flavours/glitch/features/picture_in_picture/components/footer.jsx b/app/javascript/flavours/glitch/features/picture_in_picture/components/footer.jsx
index 0b6b91fe91ab73..bbcb6d46ba8af1 100644
--- a/app/javascript/flavours/glitch/features/picture_in_picture/components/footer.jsx
+++ b/app/javascript/flavours/glitch/features/picture_in_picture/components/footer.jsx
@@ -125,7 +125,7 @@ class Footer extends ImmutablePureComponent {
 
   _performReblog = (status, privacy) => {
     const { dispatch } = this.props;
-    dispatch(reblog(status, privacy));
+    dispatch(reblog(status.id, privacy));
   };
 
   handleReblogClick = e => {
@@ -134,7 +134,7 @@ class Footer extends ImmutablePureComponent {
 
     if (signedIn) {
       if (status.get('reblogged')) {
-        dispatch(unreblog(status));
+        dispatch(unreblog(status.id));
       } else if ((e && e.shiftKey) || !boostModal) {
         this._performReblog(status);
       } else {
diff --git a/app/javascript/flavours/glitch/features/status/containers/detailed_status_container.js b/app/javascript/flavours/glitch/features/status/containers/detailed_status_container.js
index 7e8fe49b237d10..8fe0fc42e21a64 100644
--- a/app/javascript/flavours/glitch/features/status/containers/detailed_status_container.js
+++ b/app/javascript/flavours/glitch/features/status/containers/detailed_status_container.js
@@ -71,12 +71,12 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
   },
 
   onModalReblog (status, privacy) {
-    dispatch(reblog(status, privacy));
+    dispatch(reblog(status.id, privacy));
   },
 
   onReblog (status, e) {
     if (status.get('reblogged')) {
-      dispatch(unreblog(status));
+      dispatch(unreblog(status.id));
     } else {
       if (e.shiftKey || !boostModal) {
         this.onModalReblog(status);
diff --git a/app/javascript/flavours/glitch/features/status/index.jsx b/app/javascript/flavours/glitch/features/status/index.jsx
index 2656f8afdd2f7f..943b48020a5661 100644
--- a/app/javascript/flavours/glitch/features/status/index.jsx
+++ b/app/javascript/flavours/glitch/features/status/index.jsx
@@ -346,9 +346,9 @@ class Status extends ImmutablePureComponent {
     const { dispatch } = this.props;
 
     if (status.get('reblogged')) {
-      dispatch(unreblog(status));
+      dispatch(unreblog(status.id));
     } else {
-      dispatch(reblog(status, privacy));
+      dispatch(reblog(status.id, privacy));
     }
   };
 
diff --git a/app/javascript/flavours/glitch/reducers/statuses.js b/app/javascript/flavours/glitch/reducers/statuses.js
index 683fe848f776cd..1da1c9cf2fa4d1 100644
--- a/app/javascript/flavours/glitch/reducers/statuses.js
+++ b/app/javascript/flavours/glitch/reducers/statuses.js
@@ -3,10 +3,6 @@ import { Map as ImmutableMap, fromJS } from 'immutable';
 import { STATUS_IMPORT, STATUSES_IMPORT } from '../actions/importer';
 import { normalizeStatusTranslation } from '../actions/importer/normalizer';
 import {
-  REBLOG_REQUEST,
-  REBLOG_FAIL,
-  UNREBLOG_REQUEST,
-  UNREBLOG_FAIL,
   FAVOURITE_REQUEST,
   FAVOURITE_FAIL,
   UNFAVOURITE_REQUEST,
@@ -16,6 +12,10 @@ import {
   UNBOOKMARK_REQUEST,
   UNBOOKMARK_FAIL,
 } from '../actions/interactions';
+import {
+  reblog,
+  unreblog,
+} from '../actions/interactions_typed';
 import {
   STATUS_MUTE_SUCCESS,
   STATUS_UNMUTE_SUCCESS,
@@ -65,6 +65,7 @@ const statusTranslateUndo = (state, id) => {
 
 const initialState = ImmutableMap();
 
+/** @type {import('@reduxjs/toolkit').Reducer<typeof initialState>} */
 export default function statuses(state = initialState, action) {
   switch(action.type) {
   case STATUS_FETCH_REQUEST:
@@ -91,14 +92,6 @@ export default function statuses(state = initialState, action) {
     return state.get(action.status.get('id')) === undefined ? state : state.setIn([action.status.get('id'), 'bookmarked'], false);
   case UNBOOKMARK_FAIL:
     return state.get(action.status.get('id')) === undefined ? state : state.setIn([action.status.get('id'), 'bookmarked'], true);
-  case REBLOG_REQUEST:
-    return state.setIn([action.status.get('id'), 'reblogged'], true);
-  case REBLOG_FAIL:
-    return state.get(action.status.get('id')) === undefined ? state : state.setIn([action.status.get('id'), 'reblogged'], false);
-  case UNREBLOG_REQUEST:
-    return state.setIn([action.status.get('id'), 'reblogged'], false);
-  case UNREBLOG_FAIL:
-    return state.get(action.status.get('id')) === undefined ? state : state.setIn([action.status.get('id'), 'reblogged'], true);
   case STATUS_MUTE_SUCCESS:
     return state.setIn([action.id, 'muted'], true);
   case STATUS_UNMUTE_SUCCESS:
@@ -128,6 +121,15 @@ export default function statuses(state = initialState, action) {
   case STATUS_TRANSLATE_UNDO:
     return statusTranslateUndo(state, action.id);
   default:
-    return state;
+    if(reblog.pending.match(action))
+      return state.setIn([action.meta.params.statusId, 'reblogged'], true);
+    else if(reblog.rejected.match(action))
+      return state.get(action.meta.params.statusId) === undefined ? state : state.setIn([action.meta.params.statusId, 'reblogged'], false);
+    else if(unreblog.pending.match(action))
+      return state.setIn([action.meta.params.statusId, 'reblogged'], false);
+    else if(unreblog.rejected.match(action))
+      return state.get(action.meta.params.statusId) === undefined ? state : state.setIn([action.meta.params.statusId, 'reblogged'], true);
+    else
+      return state;
   }
 }
diff --git a/app/javascript/flavours/glitch/store/typed_functions.ts b/app/javascript/flavours/glitch/store/typed_functions.ts
index b66d7545c5dd4c..4b07a556107af9 100644
--- a/app/javascript/flavours/glitch/store/typed_functions.ts
+++ b/app/javascript/flavours/glitch/store/typed_functions.ts
@@ -2,6 +2,8 @@ import { createAsyncThunk } from '@reduxjs/toolkit';
 // eslint-disable-next-line @typescript-eslint/no-restricted-imports
 import { useDispatch, useSelector } from 'react-redux';
 
+import type { BaseThunkAPI } from '@reduxjs/toolkit/dist/createAsyncThunk';
+
 import type { AppDispatch, RootState } from './store';
 
 export const useAppDispatch = useDispatch.withTypes<AppDispatch>();
@@ -13,8 +15,192 @@ export interface AsyncThunkRejectValue {
   error?: unknown;
 }
 
+interface AppMeta {
+  skipLoading?: boolean;
+}
+
 export const createAppAsyncThunk = createAsyncThunk.withTypes<{
   state: RootState;
   dispatch: AppDispatch;
   rejectValue: AsyncThunkRejectValue;
 }>();
+
+type AppThunkApi = Pick<
+  BaseThunkAPI<
+    RootState,
+    unknown,
+    AppDispatch,
+    AsyncThunkRejectValue,
+    AppMeta,
+    AppMeta
+  >,
+  'getState' | 'dispatch'
+>;
+
+interface AppThunkOptions {
+  skipLoading?: boolean;
+}
+
+const createBaseAsyncThunk = createAsyncThunk.withTypes<{
+  state: RootState;
+  dispatch: AppDispatch;
+  rejectValue: AsyncThunkRejectValue;
+  fulfilledMeta: AppMeta;
+  rejectedMeta: AppMeta;
+}>();
+
+export function createThunk<Arg = void, Returned = void>(
+  name: string,
+  creator: (arg: Arg, api: AppThunkApi) => Returned | Promise<Returned>,
+  options: AppThunkOptions = {},
+) {
+  return createBaseAsyncThunk(
+    name,
+    async (
+      arg: Arg,
+      { getState, dispatch, fulfillWithValue, rejectWithValue },
+    ) => {
+      try {
+        const result = await creator(arg, { dispatch, getState });
+
+        return fulfillWithValue(result, {
+          skipLoading: options.skipLoading,
+        });
+      } catch (error) {
+        return rejectWithValue({ error }, { skipLoading: true });
+      }
+    },
+    {
+      getPendingMeta() {
+        if (options.skipLoading) return { skipLoading: true };
+        return {};
+      },
+    },
+  );
+}
+
+const discardLoadDataInPayload = Symbol('discardLoadDataInPayload');
+type DiscardLoadData = typeof discardLoadDataInPayload;
+
+type OnData<LoadDataResult, ReturnedData> = (
+  data: LoadDataResult,
+  api: AppThunkApi & {
+    discardLoadData: DiscardLoadData;
+  },
+) => ReturnedData | DiscardLoadData | Promise<ReturnedData | DiscardLoadData>;
+
+// Overload when there is no `onData` method, the payload is the `onData` result
+export function createDataLoadingThunk<
+  LoadDataResult,
+  Args extends readonly unknown[],
+>(
+  name: string,
+  loadData: (...args: Args) => Promise<LoadDataResult>,
+  thunkOptions?: AppThunkOptions,
+): ReturnType<typeof createThunk<Args, LoadDataResult>>;
+
+// Overload when the `onData` method returns discardLoadDataInPayload, then the payload is empty
+export function createDataLoadingThunk<
+  LoadDataResult,
+  Args extends readonly unknown[],
+>(
+  name: string,
+  loadData: (...args: Args) => Promise<LoadDataResult>,
+  onDataOrThunkOptions?:
+    | AppThunkOptions
+    | OnData<LoadDataResult, DiscardLoadData>,
+  thunkOptions?: AppThunkOptions,
+): ReturnType<typeof createThunk<Args, void>>;
+
+// Overload when the `onData` method returns nothing, then the mayload is the `onData` result
+export function createDataLoadingThunk<
+  LoadDataResult,
+  Args extends readonly unknown[],
+>(
+  name: string,
+  loadData: (...args: Args) => Promise<LoadDataResult>,
+  onDataOrThunkOptions?: AppThunkOptions | OnData<LoadDataResult, void>,
+  thunkOptions?: AppThunkOptions,
+): ReturnType<typeof createThunk<Args, LoadDataResult>>;
+
+// Overload when there is an `onData` method returning something
+export function createDataLoadingThunk<
+  LoadDataResult,
+  Args extends readonly unknown[],
+  Returned,
+>(
+  name: string,
+  loadData: (...args: Args) => Promise<LoadDataResult>,
+  onDataOrThunkOptions?: AppThunkOptions | OnData<LoadDataResult, Returned>,
+  thunkOptions?: AppThunkOptions,
+): ReturnType<typeof createThunk<Args, Returned>>;
+
+/**
+ * This function creates a Redux Thunk that handles loading data asynchronously (usually from the API), dispatching `pending`, `fullfilled` and `rejected` actions.
+ *
+ * You can run a callback on the `onData` results to either dispatch side effects or modify the payload.
+ *
+ * It is a wrapper around RTK's [`createAsyncThunk`](https://redux-toolkit.js.org/api/createAsyncThunk)
+ * @param name Prefix for the actions types
+ * @param loadData Function that loads the data. It's arguments will become the thunk's arguments
+ * @param onDataOrThunkOptions
+ *   Callback called on the results from `loadData`.
+ *
+ *   First argument will be the return from `loadData`.
+ *
+ *   Second argument is an object with: `dispatch`, `getState` and `discardLoadData`.
+ *   It can return:
+ *   - `undefined` (or no explicit return), meaning that the `onData` results will be the payload
+ *   - `discardLoadData` to discard the `onData` results and return an empty payload
+ *   - anything else, which will be the payload
+ *
+ *   You can also omit this parameter and pass `thunkOptions` directly
+ * @param maybeThunkOptions
+ *   Additional Mastodon specific options for the thunk. Currently supports:
+ *   - `skipLoading` to avoid showing the loading bar when the request is in progress
+ * @returns The created thunk
+ */
+export function createDataLoadingThunk<
+  LoadDataResult,
+  Args extends readonly unknown[],
+  Returned,
+>(
+  name: string,
+  loadData: (...args: Args) => Promise<LoadDataResult>,
+  onDataOrThunkOptions?: AppThunkOptions | OnData<LoadDataResult, Returned>,
+  maybeThunkOptions?: AppThunkOptions,
+) {
+  let onData: OnData<LoadDataResult, Returned> | undefined;
+  let thunkOptions: AppThunkOptions | undefined;
+
+  if (typeof onDataOrThunkOptions === 'function') onData = onDataOrThunkOptions;
+  else if (typeof onDataOrThunkOptions === 'object')
+    thunkOptions = onDataOrThunkOptions;
+
+  if (maybeThunkOptions) {
+    thunkOptions = maybeThunkOptions;
+  }
+
+  return createThunk<Args, Returned>(
+    name,
+    async (arg, { getState, dispatch }) => {
+      const data = await loadData(...arg);
+
+      if (!onData) return data as Returned;
+
+      const result = await onData(data, {
+        dispatch,
+        getState,
+        discardLoadData: discardLoadDataInPayload,
+      });
+
+      // if there is no return in `onData`, we return the `onData` result
+      if (typeof result === 'undefined') return data as Returned;
+      // the user explicitely asked to discard the payload
+      else if (result === discardLoadDataInPayload)
+        return undefined as Returned;
+      else return result;
+    },
+    thunkOptions,
+  );
+}

From e32bfad88a76a1acd42e56c0ad2f83cdfe535aff Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Thu, 23 May 2024 20:22:42 +0200
Subject: [PATCH 1097/2191] [Glitch] Fix `createDataLoadingThunk` and related
 actions

Port b6fd14f0e2842eca269ef8962e3c5bd560a76357 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/actions/account_notes.ts  |  3 ++-
 .../glitch/actions/interactions_typed.ts      | 11 ++++++---
 app/javascript/flavours/glitch/api.ts         |  6 ++---
 .../flavours/glitch/api/accounts.ts           |  2 +-
 .../glitch/containers/status_container.js     |  4 ++--
 .../containers/account_note_container.js      |  2 +-
 .../containers/notification_container.js      |  4 ++--
 .../picture_in_picture/components/footer.jsx  |  4 ++--
 .../containers/detailed_status_container.js   |  4 ++--
 .../flavours/glitch/features/status/index.jsx |  4 ++--
 .../flavours/glitch/reducers/statuses.js      |  8 +++----
 .../flavours/glitch/store/typed_functions.ts  | 24 +++++++++----------
 12 files changed, 41 insertions(+), 35 deletions(-)

diff --git a/app/javascript/flavours/glitch/actions/account_notes.ts b/app/javascript/flavours/glitch/actions/account_notes.ts
index 9b05ae06c2826e..a71b342b060638 100644
--- a/app/javascript/flavours/glitch/actions/account_notes.ts
+++ b/app/javascript/flavours/glitch/actions/account_notes.ts
@@ -3,7 +3,8 @@ import { createDataLoadingThunk } from 'flavours/glitch/store/typed_functions';
 
 export const submitAccountNote = createDataLoadingThunk(
   'account_note/submit',
-  (accountId: string, note: string) => apiSubmitAccountNote(accountId, note),
+  ({ accountId, note }: { accountId: string; note: string }) =>
+    apiSubmitAccountNote(accountId, note),
   (relationship) => ({ relationship }),
   { skipLoading: true },
 );
diff --git a/app/javascript/flavours/glitch/actions/interactions_typed.ts b/app/javascript/flavours/glitch/actions/interactions_typed.ts
index 30ae270ea1c92f..075fc242e4e640 100644
--- a/app/javascript/flavours/glitch/actions/interactions_typed.ts
+++ b/app/javascript/flavours/glitch/actions/interactions_typed.ts
@@ -6,8 +6,13 @@ import { importFetchedStatus } from './importer';
 
 export const reblog = createDataLoadingThunk(
   'status/reblog',
-  (statusId: string, visibility: StatusVisibility) =>
-    apiReblog(statusId, visibility),
+  ({
+    statusId,
+    visibility,
+  }: {
+    statusId: string;
+    visibility: StatusVisibility;
+  }) => apiReblog(statusId, visibility),
   (data, { dispatch, discardLoadData }) => {
     // The reblog API method returns a new status wrapped around the original. In this case we are only
     // interested in how the original is modified, hence passing it skipping the wrapper
@@ -20,7 +25,7 @@ export const reblog = createDataLoadingThunk(
 
 export const unreblog = createDataLoadingThunk(
   'status/unreblog',
-  (statusId: string) => apiUnreblog(statusId),
+  ({ statusId }: { statusId: string }) => apiUnreblog(statusId),
   (data, { dispatch, discardLoadData }) => {
     dispatch(importFetchedStatus(data));
 
diff --git a/app/javascript/flavours/glitch/api.ts b/app/javascript/flavours/glitch/api.ts
index 4e5ccef08cb56a..e133125a29cf33 100644
--- a/app/javascript/flavours/glitch/api.ts
+++ b/app/javascript/flavours/glitch/api.ts
@@ -62,12 +62,12 @@ export default function api(withAuthorization = true) {
 export async function apiRequest<ApiResponse = unknown>(
   method: Method,
   url: string,
-  params?: unknown,
+  params?: Record<string, unknown>,
 ) {
   const { data } = await api().request<ApiResponse>({
     method,
-    url,
-    params,
+    url: '/api/' + url,
+    data: params,
   });
 
   return data;
diff --git a/app/javascript/flavours/glitch/api/accounts.ts b/app/javascript/flavours/glitch/api/accounts.ts
index 19abc849b71590..346b3bc38c9b29 100644
--- a/app/javascript/flavours/glitch/api/accounts.ts
+++ b/app/javascript/flavours/glitch/api/accounts.ts
@@ -2,6 +2,6 @@ import { apiRequest } from 'flavours/glitch/api';
 import type { ApiRelationshipJSON } from 'flavours/glitch/api_types/relationships';
 
 export const apiSubmitAccountNote = (id: string, value: string) =>
-  apiRequest<ApiRelationshipJSON>('post', `/api/v1/accounts/${id}/note`, {
+  apiRequest<ApiRelationshipJSON>('post', `v1/accounts/${id}/note`, {
     comment: value,
   });
diff --git a/app/javascript/flavours/glitch/containers/status_container.js b/app/javascript/flavours/glitch/containers/status_container.js
index 6ae800c037c639..1430a0c8456789 100644
--- a/app/javascript/flavours/glitch/containers/status_container.js
+++ b/app/javascript/flavours/glitch/containers/status_container.js
@@ -115,9 +115,9 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
 
   onModalReblog (status, privacy) {
     if (status.get('reblogged')) {
-      dispatch(unreblog(status.id));
+      dispatch(unreblog({ statusId: status.get('id') }));
     } else {
-      dispatch(reblog(status.id, privacy));
+      dispatch(reblog({ statusId: status.get('id'), visibility: privacy }));
     }
   },
 
diff --git a/app/javascript/flavours/glitch/features/account/containers/account_note_container.js b/app/javascript/flavours/glitch/features/account/containers/account_note_container.js
index 2fd7d56735a80b..135e772f3e76ad 100644
--- a/app/javascript/flavours/glitch/features/account/containers/account_note_container.js
+++ b/app/javascript/flavours/glitch/features/account/containers/account_note_container.js
@@ -11,7 +11,7 @@ const mapStateToProps = (state, { account }) => ({
 const mapDispatchToProps = (dispatch, { account }) => ({
 
   onSave (value) {
-    dispatch(submitAccountNote(account.get('id'), value));
+    dispatch(submitAccountNote({ accountId: account.get('id'), note: value }));
   },
 
 });
diff --git a/app/javascript/flavours/glitch/features/notifications/containers/notification_container.js b/app/javascript/flavours/glitch/features/notifications/containers/notification_container.js
index 570f468157dccd..338d27d8d6b4ed 100644
--- a/app/javascript/flavours/glitch/features/notifications/containers/notification_container.js
+++ b/app/javascript/flavours/glitch/features/notifications/containers/notification_container.js
@@ -36,12 +36,12 @@ const mapDispatchToProps = dispatch => ({
   },
 
   onModalReblog (status, privacy) {
-    dispatch(reblog(status.id, privacy));
+    dispatch(reblog({ statusId: status.get('id'), visibility: privacy }));
   },
 
   onReblog (status, e) {
     if (status.get('reblogged')) {
-      dispatch(unreblog(status.id));
+      dispatch(unreblog({ statusId: status.get('id') }));
     } else {
       if (e.shiftKey || !boostModal) {
         this.onModalReblog(status);
diff --git a/app/javascript/flavours/glitch/features/picture_in_picture/components/footer.jsx b/app/javascript/flavours/glitch/features/picture_in_picture/components/footer.jsx
index bbcb6d46ba8af1..13ad86f8012137 100644
--- a/app/javascript/flavours/glitch/features/picture_in_picture/components/footer.jsx
+++ b/app/javascript/flavours/glitch/features/picture_in_picture/components/footer.jsx
@@ -125,7 +125,7 @@ class Footer extends ImmutablePureComponent {
 
   _performReblog = (status, privacy) => {
     const { dispatch } = this.props;
-    dispatch(reblog(status.id, privacy));
+    dispatch(reblog({ statusId: status.get('id'), visibility: privacy }));
   };
 
   handleReblogClick = e => {
@@ -134,7 +134,7 @@ class Footer extends ImmutablePureComponent {
 
     if (signedIn) {
       if (status.get('reblogged')) {
-        dispatch(unreblog(status.id));
+        dispatch(unreblog({ statusId: status.get('id') }));
       } else if ((e && e.shiftKey) || !boostModal) {
         this._performReblog(status);
       } else {
diff --git a/app/javascript/flavours/glitch/features/status/containers/detailed_status_container.js b/app/javascript/flavours/glitch/features/status/containers/detailed_status_container.js
index 8fe0fc42e21a64..7cb9735cfe8260 100644
--- a/app/javascript/flavours/glitch/features/status/containers/detailed_status_container.js
+++ b/app/javascript/flavours/glitch/features/status/containers/detailed_status_container.js
@@ -71,12 +71,12 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
   },
 
   onModalReblog (status, privacy) {
-    dispatch(reblog(status.id, privacy));
+    dispatch(reblog({ statusId: status.get('id'), visibility: privacy }));
   },
 
   onReblog (status, e) {
     if (status.get('reblogged')) {
-      dispatch(unreblog(status.id));
+      dispatch(unreblog({ statusId: status.get('id') }));
     } else {
       if (e.shiftKey || !boostModal) {
         this.onModalReblog(status);
diff --git a/app/javascript/flavours/glitch/features/status/index.jsx b/app/javascript/flavours/glitch/features/status/index.jsx
index 943b48020a5661..00639a667e62ea 100644
--- a/app/javascript/flavours/glitch/features/status/index.jsx
+++ b/app/javascript/flavours/glitch/features/status/index.jsx
@@ -346,9 +346,9 @@ class Status extends ImmutablePureComponent {
     const { dispatch } = this.props;
 
     if (status.get('reblogged')) {
-      dispatch(unreblog(status.id));
+      dispatch(unreblog({ statusId: status.get('id') }));
     } else {
-      dispatch(reblog(status.id, privacy));
+      dispatch(reblog({ statusId: status.get('id'), visibility: privacy }));
     }
   };
 
diff --git a/app/javascript/flavours/glitch/reducers/statuses.js b/app/javascript/flavours/glitch/reducers/statuses.js
index 1da1c9cf2fa4d1..ca766f73a36e5d 100644
--- a/app/javascript/flavours/glitch/reducers/statuses.js
+++ b/app/javascript/flavours/glitch/reducers/statuses.js
@@ -122,13 +122,13 @@ export default function statuses(state = initialState, action) {
     return statusTranslateUndo(state, action.id);
   default:
     if(reblog.pending.match(action))
-      return state.setIn([action.meta.params.statusId, 'reblogged'], true);
+      return state.setIn([action.meta.arg.statusId, 'reblogged'], true);
     else if(reblog.rejected.match(action))
-      return state.get(action.meta.params.statusId) === undefined ? state : state.setIn([action.meta.params.statusId, 'reblogged'], false);
+      return state.get(action.meta.arg.statusId) === undefined ? state : state.setIn([action.meta.arg.statusId, 'reblogged'], false);
     else if(unreblog.pending.match(action))
-      return state.setIn([action.meta.params.statusId, 'reblogged'], false);
+      return state.setIn([action.meta.arg.statusId, 'reblogged'], false);
     else if(unreblog.rejected.match(action))
-      return state.get(action.meta.params.statusId) === undefined ? state : state.setIn([action.meta.params.statusId, 'reblogged'], true);
+      return state.get(action.meta.arg.statusId) === undefined ? state : state.setIn([action.meta.arg.statusId, 'reblogged'], true);
     else
       return state;
   }
diff --git a/app/javascript/flavours/glitch/store/typed_functions.ts b/app/javascript/flavours/glitch/store/typed_functions.ts
index 4b07a556107af9..0392f373c0c6bb 100644
--- a/app/javascript/flavours/glitch/store/typed_functions.ts
+++ b/app/javascript/flavours/glitch/store/typed_functions.ts
@@ -92,20 +92,20 @@ type OnData<LoadDataResult, ReturnedData> = (
 // Overload when there is no `onData` method, the payload is the `onData` result
 export function createDataLoadingThunk<
   LoadDataResult,
-  Args extends readonly unknown[],
+  Args extends Record<string, unknown>,
 >(
   name: string,
-  loadData: (...args: Args) => Promise<LoadDataResult>,
+  loadData: (args: Args) => Promise<LoadDataResult>,
   thunkOptions?: AppThunkOptions,
 ): ReturnType<typeof createThunk<Args, LoadDataResult>>;
 
 // Overload when the `onData` method returns discardLoadDataInPayload, then the payload is empty
 export function createDataLoadingThunk<
   LoadDataResult,
-  Args extends readonly unknown[],
+  Args extends Record<string, unknown>,
 >(
   name: string,
-  loadData: (...args: Args) => Promise<LoadDataResult>,
+  loadData: (args: Args) => Promise<LoadDataResult>,
   onDataOrThunkOptions?:
     | AppThunkOptions
     | OnData<LoadDataResult, DiscardLoadData>,
@@ -115,10 +115,10 @@ export function createDataLoadingThunk<
 // Overload when the `onData` method returns nothing, then the mayload is the `onData` result
 export function createDataLoadingThunk<
   LoadDataResult,
-  Args extends readonly unknown[],
+  Args extends Record<string, unknown>,
 >(
   name: string,
-  loadData: (...args: Args) => Promise<LoadDataResult>,
+  loadData: (args: Args) => Promise<LoadDataResult>,
   onDataOrThunkOptions?: AppThunkOptions | OnData<LoadDataResult, void>,
   thunkOptions?: AppThunkOptions,
 ): ReturnType<typeof createThunk<Args, LoadDataResult>>;
@@ -126,11 +126,11 @@ export function createDataLoadingThunk<
 // Overload when there is an `onData` method returning something
 export function createDataLoadingThunk<
   LoadDataResult,
-  Args extends readonly unknown[],
+  Args extends Record<string, unknown>,
   Returned,
 >(
   name: string,
-  loadData: (...args: Args) => Promise<LoadDataResult>,
+  loadData: (args: Args) => Promise<LoadDataResult>,
   onDataOrThunkOptions?: AppThunkOptions | OnData<LoadDataResult, Returned>,
   thunkOptions?: AppThunkOptions,
 ): ReturnType<typeof createThunk<Args, Returned>>;
@@ -142,7 +142,7 @@ export function createDataLoadingThunk<
  *
  * It is a wrapper around RTK's [`createAsyncThunk`](https://redux-toolkit.js.org/api/createAsyncThunk)
  * @param name Prefix for the actions types
- * @param loadData Function that loads the data. It's arguments will become the thunk's arguments
+ * @param loadData Function that loads the data. It's (object) argument will become the thunk's argument
  * @param onDataOrThunkOptions
  *   Callback called on the results from `loadData`.
  *
@@ -162,11 +162,11 @@ export function createDataLoadingThunk<
  */
 export function createDataLoadingThunk<
   LoadDataResult,
-  Args extends readonly unknown[],
+  Args extends Record<string, unknown>,
   Returned,
 >(
   name: string,
-  loadData: (...args: Args) => Promise<LoadDataResult>,
+  loadData: (args: Args) => Promise<LoadDataResult>,
   onDataOrThunkOptions?: AppThunkOptions | OnData<LoadDataResult, Returned>,
   maybeThunkOptions?: AppThunkOptions,
 ) {
@@ -184,7 +184,7 @@ export function createDataLoadingThunk<
   return createThunk<Args, Returned>(
     name,
     async (arg, { getState, dispatch }) => {
-      const data = await loadData(...arg);
+      const data = await loadData(arg);
 
       if (!onData) return data as Returned;
 

From 8ea2726376ed9507072a8e2ec07fdfc219264dad Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Fri, 24 May 2024 10:25:42 +0200
Subject: [PATCH 1098/2191] Fix a leftover argument to `api()` (#30405)

---
 .../hashtag_timeline/containers/column_settings_container.js    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/features/hashtag_timeline/containers/column_settings_container.js b/app/javascript/mastodon/features/hashtag_timeline/containers/column_settings_container.js
index be95004cc7bfaf..680b44519b5c58 100644
--- a/app/javascript/mastodon/features/hashtag_timeline/containers/column_settings_container.js
+++ b/app/javascript/mastodon/features/hashtag_timeline/containers/column_settings_container.js
@@ -15,7 +15,7 @@ const mapStateToProps = (state, { columnId }) => {
   return {
     settings: columns.get(index).get('params'),
     onLoad (value) {
-      return api(() => state).get('/api/v2/search', { params: { q: value, type: 'hashtags' } }).then(response => {
+      return api().get('/api/v2/search', { params: { q: value, type: 'hashtags' } }).then(response => {
         return (response.data.hashtags || []).map((tag) => {
           return { value: tag.name, label: `#${tag.name}` };
         });

From 52a7d053ffc82572d460974b6dde3c6ed776e592 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 24 May 2024 10:26:07 +0200
Subject: [PATCH 1099/2191] fix(deps): update dependency postcss-preset-env to
 v9.5.14 (#30409)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 9f953bb781548b..df8ba62d826927 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -13592,16 +13592,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-nesting@npm:^12.1.4":
-  version: 12.1.4
-  resolution: "postcss-nesting@npm:12.1.4"
+"postcss-nesting@npm:^12.1.5":
+  version: 12.1.5
+  resolution: "postcss-nesting@npm:12.1.5"
   dependencies:
     "@csstools/selector-resolve-nested": "npm:^1.1.0"
     "@csstools/selector-specificity": "npm:^3.1.1"
-    postcss-selector-parser: "npm:^6.0.13"
+    postcss-selector-parser: "npm:^6.1.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/b3408de4c04b58a88a56fa81aeff59b12615c78d4f5a57e09c1ee47e74cff51f8c9cad1684da0059067303cf65b4b688f85f0c5ca8d54af8c4ab998f727ab9fd
+  checksum: 10c0/8f049fe24dccb186707e065ffb697f9f0633a03b0e1139e9c24656f3d2158a738a51c7b1f405b48fdb8b4f19515ad4ad9d3cd4ec9d9fe1dd4e5f18729bf8e589
   languageName: node
   linkType: hard
 
@@ -13756,8 +13756,8 @@ __metadata:
   linkType: hard
 
 "postcss-preset-env@npm:^9.5.2":
-  version: 9.5.13
-  resolution: "postcss-preset-env@npm:9.5.13"
+  version: 9.5.14
+  resolution: "postcss-preset-env@npm:9.5.14"
   dependencies:
     "@csstools/postcss-cascade-layers": "npm:^4.0.6"
     "@csstools/postcss-color-function": "npm:^3.0.16"
@@ -13811,7 +13811,7 @@ __metadata:
     postcss-image-set-function: "npm:^6.0.3"
     postcss-lab-function: "npm:^6.0.16"
     postcss-logical: "npm:^7.0.1"
-    postcss-nesting: "npm:^12.1.4"
+    postcss-nesting: "npm:^12.1.5"
     postcss-opacity-percentage: "npm:^2.0.0"
     postcss-overflow-shorthand: "npm:^5.0.1"
     postcss-page-break: "npm:^3.0.4"
@@ -13821,7 +13821,7 @@ __metadata:
     postcss-selector-not: "npm:^7.0.2"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/5bbb6e87b1b3acc816ef445836f85df5f50ac96bdc3d571952a83794c80863c652d27ab14c66f6b88f86f5664119d49b357e4184162022cc3436676f3fbe833b
+  checksum: 10c0/8e0c8f5c2e7b8385a770c13185986dc50d7a73b10b98c65c2f86bb4cd2860de722caef8172b1676962dafbbc044d6be1955f2a092e951976a30d4ee33b0d7571
   languageName: node
   linkType: hard
 
@@ -13904,13 +13904,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-selector-parser@npm:^6.0.13, postcss-selector-parser@npm:^6.0.16, postcss-selector-parser@npm:^6.0.2, postcss-selector-parser@npm:^6.0.4":
-  version: 6.0.16
-  resolution: "postcss-selector-parser@npm:6.0.16"
+"postcss-selector-parser@npm:^6.0.13, postcss-selector-parser@npm:^6.0.16, postcss-selector-parser@npm:^6.0.2, postcss-selector-parser@npm:^6.0.4, postcss-selector-parser@npm:^6.1.0":
+  version: 6.1.0
+  resolution: "postcss-selector-parser@npm:6.1.0"
   dependencies:
     cssesc: "npm:^3.0.0"
     util-deprecate: "npm:^1.0.2"
-  checksum: 10c0/0e11657cb3181aaf9ff67c2e59427c4df496b4a1b6a17063fae579813f80af79d444bf38f82eeb8b15b4679653fd3089e66ef0283f9aab01874d885e6cf1d2cf
+  checksum: 10c0/91e9c6434772506bc7f318699dd9d19d32178b52dfa05bed24cb0babbdab54f8fb765d9920f01ac548be0a642aab56bce493811406ceb00ae182bbb53754c473
   languageName: node
   linkType: hard
 

From 54351d01f209447448c57782a034e07968b56a59 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 24 May 2024 08:26:38 +0000
Subject: [PATCH 1100/2191] New Crowdin Translations (automated) (#30410)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/ko.json | 2 +-
 app/javascript/mastodon/locales/nn.json | 5 +++++
 config/locales/fi.yml                   | 1 +
 config/locales/nn.yml                   | 2 ++
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index 52ce9455a94533..b340261479fc56 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -234,7 +234,7 @@
   "embed.preview": "이렇게 표시됩니다:",
   "emoji_button.activity": "활동",
   "emoji_button.clear": "지우기",
-  "emoji_button.custom": "사용자 지정",
+  "emoji_button.custom": "커스텀",
   "emoji_button.flags": "깃발",
   "emoji_button.food": "음식과 마실것",
   "emoji_button.label": "에모지 추가",
diff --git a/app/javascript/mastodon/locales/nn.json b/app/javascript/mastodon/locales/nn.json
index 14b355233b640e..3316e7af811550 100644
--- a/app/javascript/mastodon/locales/nn.json
+++ b/app/javascript/mastodon/locales/nn.json
@@ -297,6 +297,7 @@
   "filter_modal.select_filter.subtitle": "Bruk ein eksisterande kategori eller opprett ein ny",
   "filter_modal.select_filter.title": "Filtrer dette innlegget",
   "filter_modal.title.status": "Filtrer eit innlegg",
+  "filtered_notifications_banner.mentions": "{count, plural, one {omtale} other {omtaler}}",
   "filtered_notifications_banner.pending_requests": "Varsel frå {count, plural, =0 {ingen} one {ein person} other {# folk}} du kanskje kjenner",
   "filtered_notifications_banner.title": "Filtrerte varslingar",
   "firehose.all": "Alle",
@@ -307,6 +308,8 @@
   "follow_requests.unlocked_explanation": "Sjølv om kontoen din ikkje er låst tenkte dei som driv {domain} at du kanskje ville gå gjennom førespurnadar frå desse kontoane manuelt.",
   "follow_suggestions.curated_suggestion": "Utvalt av staben",
   "follow_suggestions.dismiss": "Ikkje vis igjen",
+  "follow_suggestions.featured_longer": "Hanplukka av gjengen på {domain}",
+  "follow_suggestions.friends_of_friends_longer": "Populært hjå dei du fylgjer",
   "follow_suggestions.hints.featured": "Denne profilen er handplukka av folka på {domain}.",
   "follow_suggestions.hints.friends_of_friends": "Denne profilen er populær hjå dei du fylgjer.",
   "follow_suggestions.hints.most_followed": "Mange på {domain} fylgjer denne profilen.",
@@ -314,6 +317,8 @@
   "follow_suggestions.hints.similar_to_recently_followed": "Denne profilen liknar på dei andre profilane du har fylgt i det siste.",
   "follow_suggestions.personalized_suggestion": "Personleg forslag",
   "follow_suggestions.popular_suggestion": "Populært forslag",
+  "follow_suggestions.popular_suggestion_longer": "Populært på {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Liknar på profilar du har fylgt i det siste",
   "follow_suggestions.view_all": "Vis alle",
   "follow_suggestions.who_to_follow": "Kven du kan fylgja",
   "followed_tags": "Fylgde emneknaggar",
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 3a75066d5bd39a..d1fa2446722e28 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -951,6 +951,7 @@ fi:
       delete: Poista
       edit_preset: Muokkaa varoituksen esiasetusta
       empty: Et ole vielä määrittänyt yhtäkään varoitusten esiasetusta.
+      title: Varoituksen esiasetukset
     webhooks:
       add_new: Lisää päätepiste
       delete: Poista
diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index 9291ba2c2c9477..94efdcb15a5f3c 100644
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -285,6 +285,7 @@ nn:
         update_custom_emoji_html: "%{name} oppdaterte emojien %{target}"
         update_domain_block_html: "%{name} oppdaterte domeneblokkeringa for %{target}"
         update_ip_block_html: "%{name} endret regel for IP %{target}"
+        update_report_html: "%{name} oppdaterte rapporten %{target}"
         update_status_html: "%{name} oppdaterte innlegg av %{target}"
         update_user_role_html: "%{name} endret %{target} -rolle"
       deleted_account: sletta konto
@@ -950,6 +951,7 @@ nn:
       delete: Slett
       edit_preset: Endr åtvaringsoppsett
       empty: Du har ikke definert noen forhåndsinnstillinger for advarsler enda.
+      title: Førehandsinnstillingar for varsel
     webhooks:
       add_new: Legg til endepunkt
       delete: Slett

From 9305caf1fd5aaeba5c4d980a282c5ca415a7de5c Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 24 May 2024 08:27:11 +0000
Subject: [PATCH 1101/2191] fix(deps): update dependency glob to v10.4.1
 (#30411)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index df8ba62d826927..b4e94dbb34575a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8936,17 +8936,17 @@ __metadata:
   linkType: hard
 
 "glob@npm:^10.2.2, glob@npm:^10.2.6, glob@npm:^10.3.10, glob@npm:^10.3.7":
-  version: 10.3.16
-  resolution: "glob@npm:10.3.16"
+  version: 10.4.1
+  resolution: "glob@npm:10.4.1"
   dependencies:
     foreground-child: "npm:^3.1.0"
     jackspeak: "npm:^3.1.2"
-    minimatch: "npm:^9.0.1"
-    minipass: "npm:^7.0.4"
-    path-scurry: "npm:^1.11.0"
+    minimatch: "npm:^9.0.4"
+    minipass: "npm:^7.1.2"
+    path-scurry: "npm:^1.11.1"
   bin:
     glob: dist/esm/bin.mjs
-  checksum: 10c0/f7eb4c3e66f221f0be3967c02527047167967549bdf8ed1bd5f6277d43a35191af4e2bb8c89f07a79664958bae088fd06659e69a0f1de462972f1eab52a715e8
+  checksum: 10c0/77f2900ed98b9cc2a0e1901ee5e476d664dae3cd0f1b662b8bfd4ccf00d0edc31a11595807706a274ca10e1e251411bbf2e8e976c82bed0d879a9b89343ed379
   languageName: node
   linkType: hard
 
@@ -11915,7 +11915,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"minimatch@npm:^9.0.1, minimatch@npm:^9.0.4":
+"minimatch@npm:^9.0.4":
   version: 9.0.4
   resolution: "minimatch@npm:9.0.4"
   dependencies:
@@ -11998,10 +11998,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"minipass@npm:^5.0.0 || ^6.0.2 || ^7.0.0, minipass@npm:^7.0.2, minipass@npm:^7.0.3, minipass@npm:^7.0.4":
-  version: 7.0.4
-  resolution: "minipass@npm:7.0.4"
-  checksum: 10c0/6c7370a6dfd257bf18222da581ba89a5eaedca10e158781232a8b5542a90547540b4b9b7e7f490e4cda43acfbd12e086f0453728ecf8c19e0ef6921bc5958ac5
+"minipass@npm:^5.0.0 || ^6.0.2 || ^7.0.0, minipass@npm:^7.0.2, minipass@npm:^7.0.3, minipass@npm:^7.1.2":
+  version: 7.1.2
+  resolution: "minipass@npm:7.1.2"
+  checksum: 10c0/b0fd20bb9fb56e5fa9a8bfac539e8915ae07430a619e4b86ff71f5fc757ef3924b23b2c4230393af1eda647ed3d75739e4e0acb250a6b1eb277cf7f8fe449557
   languageName: node
   linkType: hard
 
@@ -12824,13 +12824,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"path-scurry@npm:^1.11.0":
-  version: 1.11.0
-  resolution: "path-scurry@npm:1.11.0"
+"path-scurry@npm:^1.11.1":
+  version: 1.11.1
+  resolution: "path-scurry@npm:1.11.1"
   dependencies:
     lru-cache: "npm:^10.2.0"
     minipass: "npm:^5.0.0 || ^6.0.2 || ^7.0.0"
-  checksum: 10c0/a5cd5dfbc6d5bb01d06bc2eb16ccdf303d617865438a21fe15431b8ad334f23351f73259abeb7e4be56f9c68d237b26b4dba51c78b508586035dfc2b55085493
+  checksum: 10c0/32a13711a2a505616ae1cc1b5076801e453e7aae6ac40ab55b388bb91b9d0547a52f5aaceff710ea400205f18691120d4431e520afbe4266b836fadede15872d
   languageName: node
   linkType: hard
 

From 9b5055d34dfd079a76493467236d5b4c1496a9a7 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 24 May 2024 04:36:21 -0400
Subject: [PATCH 1102/2191] Fix `Style/SuperArguments` cop (#30406)

---
 app/controllers/auth/registrations_controller.rb  | 2 +-
 app/lib/activitypub/serializer.rb                 | 2 +-
 app/lib/connection_pool/shared_connection_pool.rb | 2 +-
 app/lib/rss/channel.rb                            | 2 +-
 app/lib/rss/item.rb                               | 2 +-
 app/models/concerns/attachmentable.rb             | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/controllers/auth/registrations_controller.rb b/app/controllers/auth/registrations_controller.rb
index acfc0af0d9c0b6..f858c0ad93249b 100644
--- a/app/controllers/auth/registrations_controller.rb
+++ b/app/controllers/auth/registrations_controller.rb
@@ -44,7 +44,7 @@ def update_resource(resource, params)
   end
 
   def build_resource(hash = nil)
-    super(hash)
+    super
 
     resource.locale                 = I18n.locale
     resource.invite_code            = @invite&.code if resource.invite_code.blank?
diff --git a/app/lib/activitypub/serializer.rb b/app/lib/activitypub/serializer.rb
index 1fdc7931041bcf..b17ec3fdfba2b9 100644
--- a/app/lib/activitypub/serializer.rb
+++ b/app/lib/activitypub/serializer.rb
@@ -33,6 +33,6 @@ def serializable_hash(adapter_options = nil, options = {}, adapter_instance = se
       adapter_options[:named_contexts].merge!(_named_contexts)
       adapter_options[:context_extensions].merge!(_context_extensions)
     end
-    super(adapter_options, options, adapter_instance)
+    super
   end
 end
diff --git a/app/lib/connection_pool/shared_connection_pool.rb b/app/lib/connection_pool/shared_connection_pool.rb
index 3ca22d0eff345d..1cfcc5823b2df0 100644
--- a/app/lib/connection_pool/shared_connection_pool.rb
+++ b/app/lib/connection_pool/shared_connection_pool.rb
@@ -5,7 +5,7 @@
 
 class ConnectionPool::SharedConnectionPool < ConnectionPool
   def initialize(options = {}, &block)
-    super(options, &block)
+    super
 
     @available = ConnectionPool::SharedTimedStack.new(@size, &block)
   end
diff --git a/app/lib/rss/channel.rb b/app/lib/rss/channel.rb
index 9013ed066a1395..518ea714052e30 100644
--- a/app/lib/rss/channel.rb
+++ b/app/lib/rss/channel.rb
@@ -2,7 +2,7 @@
 
 class RSS::Channel < RSS::Element
   def initialize
-    super()
+    super
 
     @root = create_element('channel')
   end
diff --git a/app/lib/rss/item.rb b/app/lib/rss/item.rb
index 6739a2c184d555..8be8d4bf35f22c 100644
--- a/app/lib/rss/item.rb
+++ b/app/lib/rss/item.rb
@@ -2,7 +2,7 @@
 
 class RSS::Item < RSS::Element
   def initialize
-    super()
+    super
 
     @root = create_element('item')
   end
diff --git a/app/models/concerns/attachmentable.rb b/app/models/concerns/attachmentable.rb
index 3b7db1fcef3b7c..f457f5822b0b1b 100644
--- a/app/models/concerns/attachmentable.rb
+++ b/app/models/concerns/attachmentable.rb
@@ -23,7 +23,7 @@ module Attachmentable
 
   included do
     def self.has_attached_file(name, options = {}) # rubocop:disable Naming/PredicateName
-      super(name, options)
+      super
 
       send(:"before_#{name}_validate", prepend: true) do
         attachment = send(name)

From 8394a150d787bb9334993ef2ba1e79c9d213be78 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 24 May 2024 11:01:42 +0200
Subject: [PATCH 1103/2191] chore(deps): update dependency rubocop to v1.64.0
 (#30404)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index f1a1d2a938da1d..78023bd7f92212 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -726,7 +726,7 @@ GEM
       rspec-mocks (~> 3.0)
       sidekiq (>= 5, < 8)
     rspec-support (3.13.1)
-    rubocop (1.63.5)
+    rubocop (1.64.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)

From acc77c3836974473e7c6a423cbd1138479ae197a Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Fri, 24 May 2024 15:13:23 +0200
Subject: [PATCH 1104/2191] Add instrumentation to the search services (#30350)

---
 Gemfile                                 |  2 ++
 Gemfile.lock                            |  1 +
 app/services/account_search_service.rb  | 22 +++++++++++++++------
 app/services/statuses_search_service.rb | 26 +++++++++++++++++--------
 app/services/tag_search_service.rb      | 24 ++++++++++++++++-------
 config/initializers/opentelemetry.rb    |  2 ++
 6 files changed, 56 insertions(+), 21 deletions(-)

diff --git a/Gemfile b/Gemfile
index 240dcce95ac6a8..d9de331827dc90 100644
--- a/Gemfile
+++ b/Gemfile
@@ -103,6 +103,8 @@ gem 'rdf-normalize', '~> 0.5'
 
 gem 'private_address_check', '~> 0.5'
 
+gem 'opentelemetry-api', '~> 1.2.5'
+
 group :opentelemetry do
   gem 'opentelemetry-exporter-otlp', '~> 0.26.3', require: false
   gem 'opentelemetry-instrumentation-active_job', '~> 0.7.1', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 78023bd7f92212..ad60eb8be86433 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -975,6 +975,7 @@ DEPENDENCIES
   omniauth-rails_csrf_protection (~> 1.0)
   omniauth-saml (~> 2.0)
   omniauth_openid_connect (~> 0.6.1)
+  opentelemetry-api (~> 1.2.5)
   opentelemetry-exporter-otlp (~> 0.26.3)
   opentelemetry-instrumentation-active_job (~> 0.7.1)
   opentelemetry-instrumentation-active_model_serializers (~> 0.20.1)
diff --git a/app/services/account_search_service.rb b/app/services/account_search_service.rb
index 571a0fa57d6852..b86c9b9e7ed1c4 100644
--- a/app/services/account_search_service.rb
+++ b/app/services/account_search_service.rb
@@ -151,13 +151,23 @@ def core_query
   end
 
   def call(query, account = nil, options = {})
-    @query   = query&.strip&.gsub(/\A@/, '')
-    @limit   = options[:limit].to_i
-    @offset  = options[:offset].to_i
-    @options = options
-    @account = account
+    MastodonOTELTracer.in_span('AccountSearchService#call') do |span|
+      @query   = query&.strip&.gsub(/\A@/, '')
+      @limit   = options[:limit].to_i
+      @offset  = options[:offset].to_i
+      @options = options
+      @account = account
+
+      span.add_attributes(
+        'search.offset' => @offset,
+        'search.limit' => @limit,
+        'search.backend' => Chewy.enabled? ? 'elasticsearch' : 'database'
+      )
 
-    search_service_results.compact.uniq
+      search_service_results.compact.uniq.tap do |results|
+        span.set_attribute('search.results.count', results.size)
+      end
+    end
   end
 
   private
diff --git a/app/services/statuses_search_service.rb b/app/services/statuses_search_service.rb
index 7d5b0203a0429c..ab8e28f61c6dad 100644
--- a/app/services/statuses_search_service.rb
+++ b/app/services/statuses_search_service.rb
@@ -2,14 +2,24 @@
 
 class StatusesSearchService < BaseService
   def call(query, account = nil, options = {})
-    @query   = query&.strip
-    @account = account
-    @options = options
-    @limit   = options[:limit].to_i
-    @offset  = options[:offset].to_i
-
-    convert_deprecated_options!
-    status_search_results
+    MastodonOTELTracer.in_span('StatusesSearchService#call') do |span|
+      @query   = query&.strip
+      @account = account
+      @options = options
+      @limit   = options[:limit].to_i
+      @offset  = options[:offset].to_i
+      convert_deprecated_options!
+
+      span.add_attributes(
+        'search.offset' => @offset,
+        'search.limit' => @limit,
+        'search.backend' => Chewy.enabled? ? 'elasticsearch' : 'database'
+      )
+
+      status_search_results.tap do |results|
+        span.set_attribute('search.results.count', results.size)
+      end
+    end
   end
 
   private
diff --git a/app/services/tag_search_service.rb b/app/services/tag_search_service.rb
index 929cfd884f7c83..57400b76ad140e 100644
--- a/app/services/tag_search_service.rb
+++ b/app/services/tag_search_service.rb
@@ -2,15 +2,25 @@
 
 class TagSearchService < BaseService
   def call(query, options = {})
-    @query   = query.strip.delete_prefix('#')
-    @offset  = options.delete(:offset).to_i
-    @limit   = options.delete(:limit).to_i
-    @options = options
+    MastodonOTELTracer.in_span('TagSearchService#call') do |span|
+      @query   = query.strip.delete_prefix('#')
+      @offset  = options.delete(:offset).to_i
+      @limit   = options.delete(:limit).to_i
+      @options = options
 
-    results   = from_elasticsearch if Chewy.enabled?
-    results ||= from_database
+      span.add_attributes(
+        'search.offset' => @offset,
+        'search.limit' => @limit,
+        'search.backend' => Chewy.enabled? ? 'elasticsearch' : 'database'
+      )
 
-    results
+      results   = from_elasticsearch if Chewy.enabled?
+      results ||= from_database
+
+      span.set_attribute('search.results.count', results.size)
+
+      results
+    end
   end
 
   private
diff --git a/config/initializers/opentelemetry.rb b/config/initializers/opentelemetry.rb
index cf9f0b96f3bead..d121a95a366370 100644
--- a/config/initializers/opentelemetry.rb
+++ b/config/initializers/opentelemetry.rb
@@ -66,3 +66,5 @@
     c.service_version = Mastodon::Version.to_s
   end
 end
+
+MastodonOTELTracer = OpenTelemetry.tracer_provider.tracer('mastodon')

From 33350cde96187c7356eadfe19a0d602045b0dcbb Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 24 May 2024 16:44:00 +0200
Subject: [PATCH 1105/2191] chore(deps): update dependency webmock to v3.23.1
 (#30414)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index ad60eb8be86433..5feab4d09562e8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -877,7 +877,7 @@ GEM
     webfinger (1.2.0)
       activesupport
       httpclient (>= 2.4)
-    webmock (3.23.0)
+    webmock (3.23.1)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)

From ccb6aeddacbab950d7d7f1b0d2b64212d7aa99eb Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 24 May 2024 16:44:03 +0200
Subject: [PATCH 1106/2191] fix(deps): update babel monorepo to v7.24.6
 (#30415)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 1285 ++++++++++++++++++++++++++---------------------------
 1 file changed, 642 insertions(+), 643 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index b4e94dbb34575a..03157cce55c90d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -42,128 +42,128 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.10.4, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.23.5, @babel/code-frame@npm:^7.24.2":
-  version: 7.24.2
-  resolution: "@babel/code-frame@npm:7.24.2"
+"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.10.4, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/code-frame@npm:7.24.6"
   dependencies:
-    "@babel/highlight": "npm:^7.24.2"
+    "@babel/highlight": "npm:^7.24.6"
     picocolors: "npm:^1.0.0"
-  checksum: 10c0/d1d4cba89475ab6aab7a88242e1fd73b15ecb9f30c109b69752956434d10a26a52cbd37727c4eca104b6d45227bd1dfce39a6a6f4a14c9b2f07f871e968cf406
+  checksum: 10c0/c93c6d1763530f415218c31d07359364397f19b70026abdff766164c21ed352a931cf07f3102c5fb9e04792de319e332d68bcb1f7debef601a02197f90f9ba24
   languageName: node
   linkType: hard
 
-"@babel/compat-data@npm:^7.22.6, @babel/compat-data@npm:^7.23.5, @babel/compat-data@npm:^7.24.4":
-  version: 7.24.4
-  resolution: "@babel/compat-data@npm:7.24.4"
-  checksum: 10c0/9cd8a9cd28a5ca6db5d0e27417d609f95a8762b655e8c9c97fd2de08997043ae99f0139007083c5e607601c6122e8432c85fe391731b19bf26ad458fa0c60dd3
+"@babel/compat-data@npm:^7.22.6, @babel/compat-data@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/compat-data@npm:7.24.6"
+  checksum: 10c0/f50abbd4008eb2a5d12139c578809cebbeaeb8e660fb12d546eb2e7c2108ae1836ab8339184a5f5ce0e95bf81bb91e18edce86b387c59db937b01693ec0bc774
   languageName: node
   linkType: hard
 
 "@babel/core@npm:^7.10.4, @babel/core@npm:^7.11.6, @babel/core@npm:^7.12.3, @babel/core@npm:^7.22.1, @babel/core@npm:^7.24.4":
-  version: 7.24.5
-  resolution: "@babel/core@npm:7.24.5"
+  version: 7.24.6
+  resolution: "@babel/core@npm:7.24.6"
   dependencies:
     "@ampproject/remapping": "npm:^2.2.0"
-    "@babel/code-frame": "npm:^7.24.2"
-    "@babel/generator": "npm:^7.24.5"
-    "@babel/helper-compilation-targets": "npm:^7.23.6"
-    "@babel/helper-module-transforms": "npm:^7.24.5"
-    "@babel/helpers": "npm:^7.24.5"
-    "@babel/parser": "npm:^7.24.5"
-    "@babel/template": "npm:^7.24.0"
-    "@babel/traverse": "npm:^7.24.5"
-    "@babel/types": "npm:^7.24.5"
+    "@babel/code-frame": "npm:^7.24.6"
+    "@babel/generator": "npm:^7.24.6"
+    "@babel/helper-compilation-targets": "npm:^7.24.6"
+    "@babel/helper-module-transforms": "npm:^7.24.6"
+    "@babel/helpers": "npm:^7.24.6"
+    "@babel/parser": "npm:^7.24.6"
+    "@babel/template": "npm:^7.24.6"
+    "@babel/traverse": "npm:^7.24.6"
+    "@babel/types": "npm:^7.24.6"
     convert-source-map: "npm:^2.0.0"
     debug: "npm:^4.1.0"
     gensync: "npm:^1.0.0-beta.2"
     json5: "npm:^2.2.3"
     semver: "npm:^6.3.1"
-  checksum: 10c0/e26ba810a77bc8e21579a12fc36c79a0a60554404dc9447f2d64eb1f26d181c48d3b97d39d9f158e9911ec7162a8280acfaf2b4b210e975f0dd4bd4dbb1ee159
+  checksum: 10c0/e0762a8daef7f417494d555929418cfacd6848c7fc3310ec00e6dd8cecac20b7f590e760bfc9365d2af07874a3f5599832f9c9ff7f1a9d126a168f77ba67945a
   languageName: node
   linkType: hard
 
-"@babel/generator@npm:^7.24.5, @babel/generator@npm:^7.7.2":
-  version: 7.24.5
-  resolution: "@babel/generator@npm:7.24.5"
+"@babel/generator@npm:^7.24.6, @babel/generator@npm:^7.7.2":
+  version: 7.24.6
+  resolution: "@babel/generator@npm:7.24.6"
   dependencies:
-    "@babel/types": "npm:^7.24.5"
+    "@babel/types": "npm:^7.24.6"
     "@jridgewell/gen-mapping": "npm:^0.3.5"
     "@jridgewell/trace-mapping": "npm:^0.3.25"
     jsesc: "npm:^2.5.1"
-  checksum: 10c0/0d64f880150e7dfb92ceff2b4ac865f36aa1e295120920246492ffd0146562dabf79ba8699af1c8833f8a7954818d4d146b7b02f808df4d6024fb99f98b2f78d
+  checksum: 10c0/8d71a17b386536582354afba53cc784396458a88cc9f05f0c6de0ec99475f6f539943b3566b2e733820c4928236952473831765e483c25d68cc007a6e604d782
   languageName: node
   linkType: hard
 
-"@babel/helper-annotate-as-pure@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/helper-annotate-as-pure@npm:7.22.5"
+"@babel/helper-annotate-as-pure@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/helper-annotate-as-pure@npm:7.24.6"
   dependencies:
-    "@babel/types": "npm:^7.22.5"
-  checksum: 10c0/5a80dc364ddda26b334bbbc0f6426cab647381555ef7d0cd32eb284e35b867c012ce6ce7d52a64672ed71383099c99d32765b3d260626527bb0e3470b0f58e45
+    "@babel/types": "npm:^7.24.6"
+  checksum: 10c0/3fe446e3bd37e5e32152279c84ace4e83815e5b88b9e09a82a83974a0bb22e941d89db26b23aaab4c9eb0f9713772c2f6163feffc1bcb055c4cdb6b67e5dc82f
   languageName: node
   linkType: hard
 
-"@babel/helper-builder-binary-assignment-operator-visitor@npm:^7.22.15":
-  version: 7.22.15
-  resolution: "@babel/helper-builder-binary-assignment-operator-visitor@npm:7.22.15"
+"@babel/helper-builder-binary-assignment-operator-visitor@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/helper-builder-binary-assignment-operator-visitor@npm:7.24.6"
   dependencies:
-    "@babel/types": "npm:^7.22.15"
-  checksum: 10c0/2535e3824ca6337f65786bbac98e562f71699f25532cecd196f027d7698b4967a96953d64e36567956658ad1a05ccbdc62d1ba79ee751c79f4f1d2d3ecc2e01c
+    "@babel/types": "npm:^7.24.6"
+  checksum: 10c0/d468ba492163bdcf5b6c53248edcf0aaed6194c0f7bdebef4f29ef626e5b03e9fcc7ed737445eb80a961ec6e687c330e1c5242d8a724efb0af002141f3b3e66c
   languageName: node
   linkType: hard
 
-"@babel/helper-builder-react-jsx@npm:^7.22.10":
-  version: 7.22.10
-  resolution: "@babel/helper-builder-react-jsx@npm:7.22.10"
+"@babel/helper-builder-react-jsx@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/helper-builder-react-jsx@npm:7.24.6"
   dependencies:
-    "@babel/helper-annotate-as-pure": "npm:^7.22.5"
-    "@babel/types": "npm:^7.22.10"
-  checksum: 10c0/8e2ad2e17dd779ddccec29f6b1de61df1f199694673bdbbae0474878211139f2e574810726110e4d46c1e9a0221af1f2d38bd0398dd20490eb03a24f790602be
+    "@babel/helper-annotate-as-pure": "npm:^7.24.6"
+    "@babel/types": "npm:^7.24.6"
+  checksum: 10c0/93b0500d00f214bc2f7f142ebfa0a634872cadd446bd767f7d58b26ae1b46e1f262b0fe80a9151691463611a3148a69ad28f930295d976bf8ced32c79449a3ce
   languageName: node
   linkType: hard
 
-"@babel/helper-compilation-targets@npm:^7.22.6, @babel/helper-compilation-targets@npm:^7.23.6":
-  version: 7.23.6
-  resolution: "@babel/helper-compilation-targets@npm:7.23.6"
+"@babel/helper-compilation-targets@npm:^7.22.6, @babel/helper-compilation-targets@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/helper-compilation-targets@npm:7.24.6"
   dependencies:
-    "@babel/compat-data": "npm:^7.23.5"
-    "@babel/helper-validator-option": "npm:^7.23.5"
+    "@babel/compat-data": "npm:^7.24.6"
+    "@babel/helper-validator-option": "npm:^7.24.6"
     browserslist: "npm:^4.22.2"
     lru-cache: "npm:^5.1.1"
     semver: "npm:^6.3.1"
-  checksum: 10c0/ba38506d11185f48b79abf439462ece271d3eead1673dd8814519c8c903c708523428806f05f2ec5efd0c56e4e278698fac967e5a4b5ee842c32415da54bc6fa
+  checksum: 10c0/4d41150086959f5f4d72d27bae29204192e943537ecb71df1711d1f5d8791358a44f3a5882ed3c8238ba0c874b0b55213af43767e14771765f13b8d15b262432
   languageName: node
   linkType: hard
 
-"@babel/helper-create-class-features-plugin@npm:^7.24.1, @babel/helper-create-class-features-plugin@npm:^7.24.4, @babel/helper-create-class-features-plugin@npm:^7.24.5":
-  version: 7.24.5
-  resolution: "@babel/helper-create-class-features-plugin@npm:7.24.5"
+"@babel/helper-create-class-features-plugin@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/helper-create-class-features-plugin@npm:7.24.6"
   dependencies:
-    "@babel/helper-annotate-as-pure": "npm:^7.22.5"
-    "@babel/helper-environment-visitor": "npm:^7.22.20"
-    "@babel/helper-function-name": "npm:^7.23.0"
-    "@babel/helper-member-expression-to-functions": "npm:^7.24.5"
-    "@babel/helper-optimise-call-expression": "npm:^7.22.5"
-    "@babel/helper-replace-supers": "npm:^7.24.1"
-    "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.22.5"
-    "@babel/helper-split-export-declaration": "npm:^7.24.5"
+    "@babel/helper-annotate-as-pure": "npm:^7.24.6"
+    "@babel/helper-environment-visitor": "npm:^7.24.6"
+    "@babel/helper-function-name": "npm:^7.24.6"
+    "@babel/helper-member-expression-to-functions": "npm:^7.24.6"
+    "@babel/helper-optimise-call-expression": "npm:^7.24.6"
+    "@babel/helper-replace-supers": "npm:^7.24.6"
+    "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.24.6"
+    "@babel/helper-split-export-declaration": "npm:^7.24.6"
     semver: "npm:^6.3.1"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10c0/afc72e8075a249663f8024ef1760de4c0b9252bdde16419ac955fa7e15b8d4096ca1e01f796df4fa8cfdb056708886f60b631ad492242a8e47307974fc305920
+  checksum: 10c0/e6734671bc6a5f3cca4ec46e4cc70238e5a2fa063e51225c2be572f157119002af419b33ea0f846dbb1307370fe9f3aa92d199449abbea5e88e0262513c8a821
   languageName: node
   linkType: hard
 
-"@babel/helper-create-regexp-features-plugin@npm:^7.18.6, @babel/helper-create-regexp-features-plugin@npm:^7.22.15, @babel/helper-create-regexp-features-plugin@npm:^7.22.5":
-  version: 7.22.15
-  resolution: "@babel/helper-create-regexp-features-plugin@npm:7.22.15"
+"@babel/helper-create-regexp-features-plugin@npm:^7.18.6, @babel/helper-create-regexp-features-plugin@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/helper-create-regexp-features-plugin@npm:7.24.6"
   dependencies:
-    "@babel/helper-annotate-as-pure": "npm:^7.22.5"
+    "@babel/helper-annotate-as-pure": "npm:^7.24.6"
     regexpu-core: "npm:^5.3.1"
     semver: "npm:^6.3.1"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10c0/8eba4c1b7b94a83e7a82df5c3e504584ff0ba6ab8710a67ecc2c434a7fb841a29c2f5c94d2de51f25446119a1df538fa90b37bd570db22ddd5e7147fe98277c6
+  checksum: 10c0/c6e1b07c94b3b93a3f534039da88bc67ec3156080f1959aa07d5d534e9a640de3533e7ded0516dfcbccde955e91687044e6a950852b1d3f402ac5d5001be56cf
   languageName: node
   linkType: hard
 
@@ -182,243 +182,242 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-environment-visitor@npm:^7.22.20":
-  version: 7.22.20
-  resolution: "@babel/helper-environment-visitor@npm:7.22.20"
-  checksum: 10c0/e762c2d8f5d423af89bd7ae9abe35bd4836d2eb401af868a63bbb63220c513c783e25ef001019418560b3fdc6d9a6fb67e6c0b650bcdeb3a2ac44b5c3d2bdd94
+"@babel/helper-environment-visitor@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/helper-environment-visitor@npm:7.24.6"
+  checksum: 10c0/fdcd18ac505ed71f40c05cc992b648a4495b0aa5310a774492a0f74d8dcf3579691102f516561a651d3de6c3a44fe64bfb3049d11c14c5857634ef1823ea409a
   languageName: node
   linkType: hard
 
-"@babel/helper-function-name@npm:^7.22.5, @babel/helper-function-name@npm:^7.23.0":
-  version: 7.23.0
-  resolution: "@babel/helper-function-name@npm:7.23.0"
+"@babel/helper-function-name@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/helper-function-name@npm:7.24.6"
   dependencies:
-    "@babel/template": "npm:^7.22.15"
-    "@babel/types": "npm:^7.23.0"
-  checksum: 10c0/d771dd1f3222b120518176733c52b7cadac1c256ff49b1889dbbe5e3fed81db855b8cc4e40d949c9d3eae0e795e8229c1c8c24c0e83f27cfa6ee3766696c6428
+    "@babel/template": "npm:^7.24.6"
+    "@babel/types": "npm:^7.24.6"
+  checksum: 10c0/5ba2f8db789b3f5a2b2239300a217aa212e303cd7bfad9c8b90563807f49215e8c679e8f8f177b6aaca2038038e29bc702b83839e1f7b4896d79c44a75cac97a
   languageName: node
   linkType: hard
 
-"@babel/helper-hoist-variables@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/helper-hoist-variables@npm:7.22.5"
+"@babel/helper-hoist-variables@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/helper-hoist-variables@npm:7.24.6"
   dependencies:
-    "@babel/types": "npm:^7.22.5"
-  checksum: 10c0/60a3077f756a1cd9f14eb89f0037f487d81ede2b7cfe652ea6869cd4ec4c782b0fb1de01b8494b9a2d2050e3d154d7d5ad3be24806790acfb8cbe2073bf1e208
+    "@babel/types": "npm:^7.24.6"
+  checksum: 10c0/e10ec6b864aaa419ec4934f5fcb5d0cfcc9d0657584a1b6c3c42ada949d44ca6bffcdab433a90ada4396c747e551cca31ba0e565ea005ab3f50964e3817bf6cf
   languageName: node
   linkType: hard
 
-"@babel/helper-member-expression-to-functions@npm:^7.23.0, @babel/helper-member-expression-to-functions@npm:^7.24.5":
-  version: 7.24.5
-  resolution: "@babel/helper-member-expression-to-functions@npm:7.24.5"
+"@babel/helper-member-expression-to-functions@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/helper-member-expression-to-functions@npm:7.24.6"
   dependencies:
-    "@babel/types": "npm:^7.24.5"
-  checksum: 10c0/a3c0276a1ede8648a0e6fd86ad846cd57421d05eddfa29446b8b5a013db650462022b9ec1e65ea32c747d0542d729c80866830697f94fb12d603e87c51f080a5
+    "@babel/types": "npm:^7.24.6"
+  checksum: 10c0/7595f62978f55921b24de6ed5252fcedbffacfb8271f71e092f38724179ba554cb3a24a4764a1a3890b8a53504c2bee9c99eab81f1f365582739f566c8e28eaa
   languageName: node
   linkType: hard
 
-"@babel/helper-module-imports@npm:^7.0.0-beta.49, @babel/helper-module-imports@npm:^7.10.4, @babel/helper-module-imports@npm:^7.16.7, @babel/helper-module-imports@npm:^7.22.15, @babel/helper-module-imports@npm:^7.24.1, @babel/helper-module-imports@npm:^7.24.3":
-  version: 7.24.3
-  resolution: "@babel/helper-module-imports@npm:7.24.3"
+"@babel/helper-module-imports@npm:^7.0.0-beta.49, @babel/helper-module-imports@npm:^7.10.4, @babel/helper-module-imports@npm:^7.16.7, @babel/helper-module-imports@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/helper-module-imports@npm:7.24.6"
   dependencies:
-    "@babel/types": "npm:^7.24.0"
-  checksum: 10c0/052c188adcd100f5e8b6ff0c9643ddaabc58b6700d3bbbc26804141ad68375a9f97d9d173658d373d31853019e65f62610239e3295cdd58e573bdcb2fded188d
+    "@babel/types": "npm:^7.24.6"
+  checksum: 10c0/e0db3fbfcd963d138f0792ff626f940a576fcf212d02b8fe6478dccf3421bd1c2a76f8e69c7450c049985e7b63b30be309a24eeeb6ad7c2137a31b676a095a84
   languageName: node
   linkType: hard
 
-"@babel/helper-module-transforms@npm:^7.23.3, @babel/helper-module-transforms@npm:^7.24.5":
-  version: 7.24.5
-  resolution: "@babel/helper-module-transforms@npm:7.24.5"
+"@babel/helper-module-transforms@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/helper-module-transforms@npm:7.24.6"
   dependencies:
-    "@babel/helper-environment-visitor": "npm:^7.22.20"
-    "@babel/helper-module-imports": "npm:^7.24.3"
-    "@babel/helper-simple-access": "npm:^7.24.5"
-    "@babel/helper-split-export-declaration": "npm:^7.24.5"
-    "@babel/helper-validator-identifier": "npm:^7.24.5"
+    "@babel/helper-environment-visitor": "npm:^7.24.6"
+    "@babel/helper-module-imports": "npm:^7.24.6"
+    "@babel/helper-simple-access": "npm:^7.24.6"
+    "@babel/helper-split-export-declaration": "npm:^7.24.6"
+    "@babel/helper-validator-identifier": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10c0/6e77d72f62b7e87abaea800ea0bccd4d54cde26485750969f5f493c032eb63251eb50c3522cace557781565d51c1d0c4bcc866407d24becfb109c18fb92c978d
+  checksum: 10c0/9e2e3d0ddb397b36b9e8c7d94e175a36be8cb888ef370cefef2cdfd53ae1f87d567b268bd90ed9a6c706485a8de3da19cac577657613e9cd17210b91cbdfb00b
   languageName: node
   linkType: hard
 
-"@babel/helper-optimise-call-expression@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/helper-optimise-call-expression@npm:7.22.5"
+"@babel/helper-optimise-call-expression@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/helper-optimise-call-expression@npm:7.24.6"
   dependencies:
-    "@babel/types": "npm:^7.22.5"
-  checksum: 10c0/31b41a764fc3c585196cf5b776b70cf4705c132e4ce9723f39871f215f2ddbfb2e28a62f9917610f67c8216c1080482b9b05f65dd195dae2a52cef461f2ac7b8
+    "@babel/types": "npm:^7.24.6"
+  checksum: 10c0/7fce2c4ce22c4ba3c2178d1ce85f34fc9bbe286af5ec153b4b6ea9bf2212390359c4a1e8a54551c4daa4688022d619668bdb8c8060cb185c0c9ad02c5247efc9
   languageName: node
   linkType: hard
 
-"@babel/helper-plugin-utils@npm:^7.0.0, @babel/helper-plugin-utils@npm:^7.10.4, @babel/helper-plugin-utils@npm:^7.12.13, @babel/helper-plugin-utils@npm:^7.14.5, @babel/helper-plugin-utils@npm:^7.18.6, @babel/helper-plugin-utils@npm:^7.22.5, @babel/helper-plugin-utils@npm:^7.24.0, @babel/helper-plugin-utils@npm:^7.24.5, @babel/helper-plugin-utils@npm:^7.8.0, @babel/helper-plugin-utils@npm:^7.8.3":
-  version: 7.24.5
-  resolution: "@babel/helper-plugin-utils@npm:7.24.5"
-  checksum: 10c0/4ae40094e6a2f183281213344f4df60c66b16b19a2bc38d2bb11810a6dc0a0e7ec638957d0e433ff8b615775b8f3cd1b7edbf59440d1b50e73c389fc22913377
+"@babel/helper-plugin-utils@npm:^7.0.0, @babel/helper-plugin-utils@npm:^7.10.4, @babel/helper-plugin-utils@npm:^7.12.13, @babel/helper-plugin-utils@npm:^7.14.5, @babel/helper-plugin-utils@npm:^7.18.6, @babel/helper-plugin-utils@npm:^7.22.5, @babel/helper-plugin-utils@npm:^7.24.6, @babel/helper-plugin-utils@npm:^7.8.0, @babel/helper-plugin-utils@npm:^7.8.3":
+  version: 7.24.6
+  resolution: "@babel/helper-plugin-utils@npm:7.24.6"
+  checksum: 10c0/636d3ce8cabc0621c1f78187e1d95f1087209921fa452f76aad06224ef5dffb3d934946f5183109920f32a4b94dd75ac91c63bc52813fee639d10cd54d49ba1f
   languageName: node
   linkType: hard
 
-"@babel/helper-remap-async-to-generator@npm:^7.22.20":
-  version: 7.22.20
-  resolution: "@babel/helper-remap-async-to-generator@npm:7.22.20"
+"@babel/helper-remap-async-to-generator@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/helper-remap-async-to-generator@npm:7.24.6"
   dependencies:
-    "@babel/helper-annotate-as-pure": "npm:^7.22.5"
-    "@babel/helper-environment-visitor": "npm:^7.22.20"
-    "@babel/helper-wrap-function": "npm:^7.22.20"
+    "@babel/helper-annotate-as-pure": "npm:^7.24.6"
+    "@babel/helper-environment-visitor": "npm:^7.24.6"
+    "@babel/helper-wrap-function": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10c0/aa93aa74250b636d477e8d863fbe59d4071f8c2654841b7ac608909e480c1cf3ff7d7af5a4038568829ad09d810bb681668cbe497d9c89ba5c352793dc9edf1e
+  checksum: 10c0/b379b844eba352ac9487d31867e7bb2b8a264057f1739d9161b614145ea6e60969a7a82e75e5e83089e50cf1b6559f53aa085a787942bf40706fee15a2faa33c
   languageName: node
   linkType: hard
 
-"@babel/helper-replace-supers@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/helper-replace-supers@npm:7.24.1"
+"@babel/helper-replace-supers@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/helper-replace-supers@npm:7.24.6"
   dependencies:
-    "@babel/helper-environment-visitor": "npm:^7.22.20"
-    "@babel/helper-member-expression-to-functions": "npm:^7.23.0"
-    "@babel/helper-optimise-call-expression": "npm:^7.22.5"
+    "@babel/helper-environment-visitor": "npm:^7.24.6"
+    "@babel/helper-member-expression-to-functions": "npm:^7.24.6"
+    "@babel/helper-optimise-call-expression": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10c0/d39a3df7892b7c3c0e307fb229646168a9bd35e26a72080c2530729322600e8cff5f738f44a14860a2358faffa741b6a6a0d6749f113387b03ddbfa0ec10e1a0
+  checksum: 10c0/aaf2dfaf25360da1525ecea5979d5afed201b96f0feeed2e15f90883a97776132a720b25039e67fee10a5c537363aea5cc2a46c0f1d13fdb86d0e920244f2da7
   languageName: node
   linkType: hard
 
-"@babel/helper-simple-access@npm:^7.22.5, @babel/helper-simple-access@npm:^7.24.5":
-  version: 7.24.5
-  resolution: "@babel/helper-simple-access@npm:7.24.5"
+"@babel/helper-simple-access@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/helper-simple-access@npm:7.24.6"
   dependencies:
-    "@babel/types": "npm:^7.24.5"
-  checksum: 10c0/d96a0ab790a400f6c2dcbd9457b9ca74b9ba6d0f67ff9cd5bcc73792c8fbbd0847322a0dddbd8987dd98610ee1637c680938c7d83d3ffce7d06d7519d823d996
+    "@babel/types": "npm:^7.24.6"
+  checksum: 10c0/b17e404dd6c9787fc7d558aea5222471a77e29596705f0d10b4c2a58b9d71ff7eae915094204848cc1af99b771553caa69337a768b9abdd82b54a0050ba83eb9
   languageName: node
   linkType: hard
 
-"@babel/helper-skip-transparent-expression-wrappers@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/helper-skip-transparent-expression-wrappers@npm:7.22.5"
+"@babel/helper-skip-transparent-expression-wrappers@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/helper-skip-transparent-expression-wrappers@npm:7.24.6"
   dependencies:
-    "@babel/types": "npm:^7.22.5"
-  checksum: 10c0/ab7fa2aa709ab49bb8cd86515a1e715a3108c4bb9a616965ba76b43dc346dee66d1004ccf4d222b596b6224e43e04cbc5c3a34459501b388451f8c589fbc3691
+    "@babel/types": "npm:^7.24.6"
+  checksum: 10c0/6928f698362d6082a67ee2bc73991ef6b0cc6b5f2854177389bc8f3c09296580f0ee20134dd1a29dfcb1906ad9e346fa0f7c6fcd7589ab3ff176d4f09504577f
   languageName: node
   linkType: hard
 
-"@babel/helper-split-export-declaration@npm:^7.24.5":
-  version: 7.24.5
-  resolution: "@babel/helper-split-export-declaration@npm:7.24.5"
+"@babel/helper-split-export-declaration@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/helper-split-export-declaration@npm:7.24.6"
   dependencies:
-    "@babel/types": "npm:^7.24.5"
-  checksum: 10c0/d7a812d67d031a348f3fb0e6263ce2dbe6038f81536ba7fb16db385383bcd6542b71833194303bf6d3d0e4f7b6b584c9c8fae8772122e2ce68fc9bdf07f4135d
+    "@babel/types": "npm:^7.24.6"
+  checksum: 10c0/53a5dd8691fdffc89cc7fcf5aed0ad1d8bc39796a5782a3d170dcbf249eb5c15cc8a290e8d09615711d18798ad04a7d0694ab5195d35fa651abbc1b9c885d6a8
   languageName: node
   linkType: hard
 
-"@babel/helper-string-parser@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/helper-string-parser@npm:7.24.1"
-  checksum: 10c0/2f9bfcf8d2f9f083785df0501dbab92770111ece2f90d120352fda6dd2a7d47db11b807d111e6f32aa1ba6d763fe2dc6603d153068d672a5d0ad33ca802632b2
+"@babel/helper-string-parser@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/helper-string-parser@npm:7.24.6"
+  checksum: 10c0/95115bf676e92c4e99166395649108d97447e6cabef1fabaec8cdbc53a43f27b5df2268ff6534439d405bc1bd06685b163eb3b470455bd49f69159dada414145
   languageName: node
   linkType: hard
 
-"@babel/helper-validator-identifier@npm:^7.22.20, @babel/helper-validator-identifier@npm:^7.24.5":
-  version: 7.24.5
-  resolution: "@babel/helper-validator-identifier@npm:7.24.5"
-  checksum: 10c0/05f957229d89ce95a137d04e27f7d0680d84ae48b6ad830e399db0779341f7d30290f863a93351b4b3bde2166737f73a286ea42856bb07c8ddaa95600d38645c
+"@babel/helper-validator-identifier@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/helper-validator-identifier@npm:7.24.6"
+  checksum: 10c0/d29d2e3fca66c31867a009014169b93f7bc21c8fc1dd7d0b9d85d7a4000670526ff2222d966febb75a6e12f9859a31d1e75b558984e28ecb69651314dd0a6fd1
   languageName: node
   linkType: hard
 
-"@babel/helper-validator-option@npm:^7.23.5":
-  version: 7.23.5
-  resolution: "@babel/helper-validator-option@npm:7.23.5"
-  checksum: 10c0/af45d5c0defb292ba6fd38979e8f13d7da63f9623d8ab9ededc394f67eb45857d2601278d151ae9affb6e03d5d608485806cd45af08b4468a0515cf506510e94
+"@babel/helper-validator-option@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/helper-validator-option@npm:7.24.6"
+  checksum: 10c0/787268dff5cf77f3b704454b96ab7b58aa4f43b2808247e51859a103a1c28a9c252100f830433f4b37a73f4a61ba745bbeef4cdccbab48c1e9adf037f4ca3491
   languageName: node
   linkType: hard
 
-"@babel/helper-wrap-function@npm:^7.22.20":
-  version: 7.22.20
-  resolution: "@babel/helper-wrap-function@npm:7.22.20"
+"@babel/helper-wrap-function@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/helper-wrap-function@npm:7.24.6"
   dependencies:
-    "@babel/helper-function-name": "npm:^7.22.5"
-    "@babel/template": "npm:^7.22.15"
-    "@babel/types": "npm:^7.22.19"
-  checksum: 10c0/97b5f42ff4d305318ff2f99a5f59d3e97feff478333b2d893c4f85456d3c66372070f71d7bf9141f598c8cf2741c49a15918193633c427a88d170d98eb8c46eb
+    "@babel/helper-function-name": "npm:^7.24.6"
+    "@babel/template": "npm:^7.24.6"
+    "@babel/types": "npm:^7.24.6"
+  checksum: 10c0/d32844275a544a8e7c71c13e9832d34d80656aafce659dc6c23b02e14d1c1179d8045125ded5096da1a99de83299ffb48211183d0403da2c8584ed55dc0ab646
   languageName: node
   linkType: hard
 
-"@babel/helpers@npm:^7.24.5":
-  version: 7.24.5
-  resolution: "@babel/helpers@npm:7.24.5"
+"@babel/helpers@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/helpers@npm:7.24.6"
   dependencies:
-    "@babel/template": "npm:^7.24.0"
-    "@babel/traverse": "npm:^7.24.5"
-    "@babel/types": "npm:^7.24.5"
-  checksum: 10c0/0630b0223c3a9a34027ddc05b3bac54d68d5957f84e92d2d4814b00448a76e12f9188f9c85cfce2011696d82a8ffcbd8189da097c0af0181d32eb27eca34185e
+    "@babel/template": "npm:^7.24.6"
+    "@babel/types": "npm:^7.24.6"
+  checksum: 10c0/e5b5c0919fd6fa56ae11c15a72962d8de0ac19db524849554af28cf08ac32f9ae5aee49a43146eb150f54418cefb8e890fa2b2f33d029434dc7777dbcdfd5bac
   languageName: node
   linkType: hard
 
-"@babel/highlight@npm:^7.24.2":
-  version: 7.24.2
-  resolution: "@babel/highlight@npm:7.24.2"
+"@babel/highlight@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/highlight@npm:7.24.6"
   dependencies:
-    "@babel/helper-validator-identifier": "npm:^7.22.20"
+    "@babel/helper-validator-identifier": "npm:^7.24.6"
     chalk: "npm:^2.4.2"
     js-tokens: "npm:^4.0.0"
     picocolors: "npm:^1.0.0"
-  checksum: 10c0/98ce00321daedeed33a4ed9362dc089a70375ff1b3b91228b9f05e6591d387a81a8cba68886e207861b8871efa0bc997ceabdd9c90f6cce3ee1b2f7f941b42db
+  checksum: 10c0/5bbc31695e5d44e97feb267f7aaf4c52908560d184ffeb2e2e57aae058d40125592931883889413e19def3326895ddb41ff45e090fa90b459d8c294b4ffc238c
   languageName: node
   linkType: hard
 
-"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.24.0, @babel/parser@npm:^7.24.5":
-  version: 7.24.5
-  resolution: "@babel/parser@npm:7.24.5"
+"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/parser@npm:7.24.6"
   bin:
     parser: ./bin/babel-parser.js
-  checksum: 10c0/8333a6ad5328bad34fa0e12bcee147c3345ea9a438c0909e7c68c6cfbea43c464834ffd7eabd1cbc1c62df0a558e22ffade9f5b29440833ba7b33d96a71f88c0
+  checksum: 10c0/cbef70923078a20fe163b03f4a6482be65ed99d409a57f3091a23ce3a575ee75716c30e7ea9f40b692ac5660f34055f4cbeb66a354fad15a6cf1fca35c3496c5
   languageName: node
   linkType: hard
 
-"@babel/plugin-bugfix-firefox-class-in-computed-class-key@npm:^7.24.5":
-  version: 7.24.5
-  resolution: "@babel/plugin-bugfix-firefox-class-in-computed-class-key@npm:7.24.5"
+"@babel/plugin-bugfix-firefox-class-in-computed-class-key@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-bugfix-firefox-class-in-computed-class-key@npm:7.24.6"
   dependencies:
-    "@babel/helper-environment-visitor": "npm:^7.22.20"
-    "@babel/helper-plugin-utils": "npm:^7.24.5"
+    "@babel/helper-environment-visitor": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10c0/b471972dcc4a3ba32821329a57725e2b563421e975d7ffec7fcabd70af0fced6a50bcc9ed2a8cbd4a9ac7c09cfbf43c7116e82f3b9064b33a22309500b632108
+  checksum: 10c0/0dbf12de5a7e5d092271124f0d9bff1ceb94871d5563041940512671cd40ab2a93d613715ee37076cd8263cf49579afb805faa3189996c11639bb10d3e9837f1
   languageName: node
   linkType: hard
 
-"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:7.24.1"
+"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:7.24.6"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10c0/d4e592e6fc4878654243d2e7b51ea86471b868a8cb09de29e73b65d2b64159990c6c198fd7c9c2af2e38b1cddf70206243792853c47384a84f829dada152f605
+  checksum: 10c0/b0a03d4f587e1fa92312c912864a0af3f68bfc87367b7c93770e94f171767d563d7adfca7ad571d20cd755e89e1373e7414973ce30e694e7b6eb8f57d2b1b889
   languageName: node
   linkType: hard
 
-"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:7.24.1"
+"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:7.24.6"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
-    "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.22.5"
-    "@babel/plugin-transform-optional-chaining": "npm:^7.24.1"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.24.6"
+    "@babel/plugin-transform-optional-chaining": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.13.0
-  checksum: 10c0/351c36e45795a7890d610ab9041a52f4078a59429f6e74c281984aa44149a10d43e82b3a8172c703c0d5679471e165d1c02b6d2e45a677958ee301b89403f202
+  checksum: 10c0/fdd40fdf7e87f3dbc5396c9a8f92005798865f6f20d2c24c33246ac43aab8df93742b63dfcfcda67c0a5cf1f7b8a987fdbccaceb9ccbb9a67bef10012b522390
   languageName: node
   linkType: hard
 
-"@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@npm:7.24.1"
+"@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@npm:7.24.6"
   dependencies:
-    "@babel/helper-environment-visitor": "npm:^7.22.20"
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-environment-visitor": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10c0/d7dd5a59a54635a3152895dcaa68f3370bb09d1f9906c1e72232ff759159e6be48de4a598a993c986997280a2dc29922a48aaa98020f16439f3f57ad72788354
+  checksum: 10c0/cc1e8ee138c71e78ec262a5198d2cf75c305f2fb4ea9771ebd4ded47f51bc1bacbf917db3cb28c681e7499a07f9803ab0bbe5ad50b9576cbe03902189e3871ed
   languageName: node
   linkType: hard
 
@@ -497,25 +496,25 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-syntax-import-assertions@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-syntax-import-assertions@npm:7.24.1"
+"@babel/plugin-syntax-import-assertions@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-syntax-import-assertions@npm:7.24.6"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/72f0340d73e037f0702c61670054e0af66ece7282c5c2f4ba8de059390fee502de282defdf15959cd9f71aa18dc5c5e4e7a0fde317799a0600c6c4e0a656d82b
+  checksum: 10c0/8e81c7cd3d5812a3dda32f06f84492a1b5640f42c594619ed57bf4017529889f87bfb4e8e95c50ba1527d89501dae71a0c73770502676545c2cd9ce58ce3258d
   languageName: node
   linkType: hard
 
-"@babel/plugin-syntax-import-attributes@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-syntax-import-attributes@npm:7.24.1"
+"@babel/plugin-syntax-import-attributes@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-syntax-import-attributes@npm:7.24.6"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/309634e3335777aee902552b2cf244c4a8050213cc878b3fb9d70ad8cbbff325dc46ac5e5791836ff477ea373b27832238205f6ceaff81f7ea7c4c7e8fbb13bb
+  checksum: 10c0/c4d8554b89c0daa6d3c430582b98c10a3af2de8eab484082e97cb73f2712780ab6dd8d11d783c4b266efef76f4479abf4944ef8f416a4459b05eecaf438f8774
   languageName: node
   linkType: hard
 
@@ -541,14 +540,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-syntax-jsx@npm:7, @babel/plugin-syntax-jsx@npm:^7.23.3, @babel/plugin-syntax-jsx@npm:^7.24.1, @babel/plugin-syntax-jsx@npm:^7.7.2":
-  version: 7.24.1
-  resolution: "@babel/plugin-syntax-jsx@npm:7.24.1"
+"@babel/plugin-syntax-jsx@npm:7, @babel/plugin-syntax-jsx@npm:^7.24.6, @babel/plugin-syntax-jsx@npm:^7.7.2":
+  version: 7.24.6
+  resolution: "@babel/plugin-syntax-jsx@npm:7.24.6"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/6cec76fbfe6ca81c9345c2904d8d9a8a0df222f9269f0962ed6eb2eb8f3f10c2f15e993d1ef09dbaf97726bf1792b5851cf5bd9a769f966a19448df6be95d19a
+  checksum: 10c0/f00d783a9e2d52f0a8797823a3cbdbe2d0dc09c7235fe8c88e6dce3a02f234f52fb5e976a001cc30b0e2b330590b5680f54436e56d67f9ab05d1e4bdeb3992cd
   languageName: node
   linkType: hard
 
@@ -640,14 +639,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-syntax-typescript@npm:^7.24.1, @babel/plugin-syntax-typescript@npm:^7.7.2":
-  version: 7.24.1
-  resolution: "@babel/plugin-syntax-typescript@npm:7.24.1"
+"@babel/plugin-syntax-typescript@npm:^7.24.6, @babel/plugin-syntax-typescript@npm:^7.7.2":
+  version: 7.24.6
+  resolution: "@babel/plugin-syntax-typescript@npm:7.24.6"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/7a81e277dcfe3138847e8e5944e02a42ff3c2e864aea6f33fd9b70d1556d12b0e70f0d56cc1985d353c91bcbf8fe163e6cc17418da21129b7f7f1d8b9ac00c93
+  checksum: 10c0/b1eeabf8bebfa78cea559c0a0d55e480fe2ebd799472d1f6bd5afbd2759d02b362d29ad30009c81d5b112797beb987e58a3000d2331adaa4bf03862e1ed18cef
   languageName: node
   linkType: hard
 
@@ -663,456 +662,456 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-arrow-functions@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-arrow-functions@npm:7.24.1"
+"@babel/plugin-transform-arrow-functions@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-arrow-functions@npm:7.24.6"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/f44bfacf087dc21b422bab99f4e9344ee7b695b05c947dacae66de05c723ab9d91800be7edc1fa016185e8c819f3aca2b4a5f66d8a4d1e47d9bad80b8fa55b8e
+  checksum: 10c0/46250eb3f535327825db323740a301b76b882b70979f1fb5f89cbb1a820378ab68ee880b912981dd5276dd116deaaee0f4a2a95f1c9cf537a67749fd4209a2d3
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-async-generator-functions@npm:^7.24.3":
-  version: 7.24.3
-  resolution: "@babel/plugin-transform-async-generator-functions@npm:7.24.3"
+"@babel/plugin-transform-async-generator-functions@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-async-generator-functions@npm:7.24.6"
   dependencies:
-    "@babel/helper-environment-visitor": "npm:^7.22.20"
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
-    "@babel/helper-remap-async-to-generator": "npm:^7.22.20"
+    "@babel/helper-environment-visitor": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-remap-async-to-generator": "npm:^7.24.6"
     "@babel/plugin-syntax-async-generators": "npm:^7.8.4"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/55ceed059f819dcccbfe69600bfa1c055ada466bd54eda117cfdd2cf773dd85799e2f6556e4a559b076e93b9704abcca2aef9d72aad7dc8a5d3d17886052f1d3
+  checksum: 10c0/8876431855220ccfbf1ae510a4a7c4e0377b21189d3f73ea6dde5ffd31eee57f03ea2b2d1da59b6a36b6e107e41b38d0c1d1bb015e0d1c2c2fb627962260edb7
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-async-to-generator@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-async-to-generator@npm:7.24.1"
+"@babel/plugin-transform-async-to-generator@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-async-to-generator@npm:7.24.6"
   dependencies:
-    "@babel/helper-module-imports": "npm:^7.24.1"
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
-    "@babel/helper-remap-async-to-generator": "npm:^7.22.20"
+    "@babel/helper-module-imports": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-remap-async-to-generator": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/3731ba8e83cbea1ab22905031f25b3aeb0b97c6467360a2cc685352f16e7c786417d8883bc747f5a0beff32266bdb12a05b6292e7b8b75967087200a7bc012c4
+  checksum: 10c0/52c137668e7a35356c3b1caf25ab3bf90ff61199885bfd9f0232bfe168a53a5cf0ca4c1e283c27e44ad76cc366b73e4ff7042241469d1944c7042fb78c57bfd8
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-block-scoped-functions@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-block-scoped-functions@npm:7.24.1"
+"@babel/plugin-transform-block-scoped-functions@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-block-scoped-functions@npm:7.24.6"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/6fbaa85f5204f34845dfc0bebf62fdd3ac5a286241c85651e59d426001e7a1785ac501f154e093e0b8ee49e1f51e3f8b06575a5ae8d4a9406d43e4816bf18c37
+  checksum: 10c0/0c761b5e3a2959b63edf47d67f6752e01f24777ad1accd82457a2dca059877f8a8297fbc7a062db6b48836309932f2ac645c507070ef6ad4e765b3600822c048
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-block-scoping@npm:^7.24.5":
-  version: 7.24.5
-  resolution: "@babel/plugin-transform-block-scoping@npm:7.24.5"
+"@babel/plugin-transform-block-scoping@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-block-scoping@npm:7.24.6"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/85997fc8179b7d26e8af30865aeb91789f3bc1f0cd5643ed25f25891ff9c071460ec1220599b19070b424a3b902422f682e9b02e515872540173eae2e25f760c
+  checksum: 10c0/95c25e501c4553515f92d4e86032a8859a8855cea8aafb6df30f956979caa70af1e126e6dfaf9e51328d1306232ff1e081bda7d84a9aaf23f418d9da120c7018
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-class-properties@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-class-properties@npm:7.24.1"
+"@babel/plugin-transform-class-properties@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-class-properties@npm:7.24.6"
   dependencies:
-    "@babel/helper-create-class-features-plugin": "npm:^7.24.1"
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-create-class-features-plugin": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/00dff042ac9df4ae67b5ef98b1137cc72e0a24e6d911dc200540a8cb1f00b4cff367a922aeb22da17da662079f0abcd46ee1c5f4cdf37ceebf6ff1639bb9af27
+  checksum: 10c0/ae01e00dd528112d542a77f0f1cf6b43726553d2011bbdec9e4fac441dfa161d44bf14449dc4121b45cc971686a8c652652032594e83c5d6cab8e9fd794eecb2
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-class-static-block@npm:^7.24.4":
-  version: 7.24.4
-  resolution: "@babel/plugin-transform-class-static-block@npm:7.24.4"
+"@babel/plugin-transform-class-static-block@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-class-static-block@npm:7.24.6"
   dependencies:
-    "@babel/helper-create-class-features-plugin": "npm:^7.24.4"
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-create-class-features-plugin": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
     "@babel/plugin-syntax-class-static-block": "npm:^7.14.5"
   peerDependencies:
     "@babel/core": ^7.12.0
-  checksum: 10c0/19dfeaf4a2ac03695034f7211a8b5ad89103b224608ac3e91791055107c5fe4d7ebe5d9fbb31b4a91265694af78762260642eb270f4b239c175984ee4b253f80
+  checksum: 10c0/425f237faf62b531d973f23ac3eefe3f29c4f6c988c33c2dd660b6dfb61d4ed1e865a5088574742d87ed02437d26aa6ec6b107468b7df35ca9d3082bad742d8f
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-classes@npm:^7.24.5":
-  version: 7.24.5
-  resolution: "@babel/plugin-transform-classes@npm:7.24.5"
+"@babel/plugin-transform-classes@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-classes@npm:7.24.6"
   dependencies:
-    "@babel/helper-annotate-as-pure": "npm:^7.22.5"
-    "@babel/helper-compilation-targets": "npm:^7.23.6"
-    "@babel/helper-environment-visitor": "npm:^7.22.20"
-    "@babel/helper-function-name": "npm:^7.23.0"
-    "@babel/helper-plugin-utils": "npm:^7.24.5"
-    "@babel/helper-replace-supers": "npm:^7.24.1"
-    "@babel/helper-split-export-declaration": "npm:^7.24.5"
+    "@babel/helper-annotate-as-pure": "npm:^7.24.6"
+    "@babel/helper-compilation-targets": "npm:^7.24.6"
+    "@babel/helper-environment-visitor": "npm:^7.24.6"
+    "@babel/helper-function-name": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-replace-supers": "npm:^7.24.6"
+    "@babel/helper-split-export-declaration": "npm:^7.24.6"
     globals: "npm:^11.1.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/4affcbb7cb01fa4764c7a4b534c30fd24a4b68e680a2d6e242dd7ca8726490f0f1426c44797deff84a38a162e0629718900c68d28daffe2b12adf5b4194156a7
+  checksum: 10c0/d29c26feea9ad5a64d790aeab1833b7a50d6af2be24140dad7e06510b754b8fe0ffb292d43d96fedaf7765fcb90c0034ac7c42635f814d9235697431076a1cf0
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-computed-properties@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-computed-properties@npm:7.24.1"
+"@babel/plugin-transform-computed-properties@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-computed-properties@npm:7.24.6"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
-    "@babel/template": "npm:^7.24.0"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/template": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/8292c508b656b7722e2c2ca0f6f31339852e3ed2b9b80f6e068a4010e961b431ca109ecd467fc906283f4b1574c1e7b1cb68d35a4dea12079d386c15ff7e0eac
+  checksum: 10c0/c464144c2eda8d526d70c8d8e3bf30820f591424991452f816617347ef3ccc5d04133c6e903b90c1d832d95d9c8550e5693ea40ea14856ede54fb8e1cd36c5de
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-destructuring@npm:^7.24.5":
-  version: 7.24.5
-  resolution: "@babel/plugin-transform-destructuring@npm:7.24.5"
+"@babel/plugin-transform-destructuring@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-destructuring@npm:7.24.6"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/6a37953a95f04b335bf3e2118fb93f50dd9593c658d1b2f8918a380a2ee30f1b420139eccf7ec3873c86a8208527895fcf6b7e21c0e734a6ad6e5d5042eace4d
+  checksum: 10c0/1fcc064e2b0c45a4340418bd70d2cf2b3644d1215eb975ec14f83e4f7615fdc3948e355db5091f81602f6c3d933f9308caa66232091aad4edd6c16b00240fcc7
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-dotall-regex@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-dotall-regex@npm:7.24.1"
+"@babel/plugin-transform-dotall-regex@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-dotall-regex@npm:7.24.6"
   dependencies:
-    "@babel/helper-create-regexp-features-plugin": "npm:^7.22.15"
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-create-regexp-features-plugin": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/758def705ec5a87ef910280dc2df5d2fda59dc5d4771c1725c7aed0988ae5b79e29aeb48109120301a3e1c6c03dfac84700469de06f38ca92c96834e09eadf5d
+  checksum: 10c0/4a2c98f1c22a18754c6ada1486563865690008df2536066d8a146fa58eed8515b607e162c7efb0b8fa062d755e77afea145495046cffdb4ea56194d38f489254
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-duplicate-keys@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-duplicate-keys@npm:7.24.1"
+"@babel/plugin-transform-duplicate-keys@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-duplicate-keys@npm:7.24.6"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/41072f57f83a6c2b15f3ee0b6779cdca105ff3d98061efe92ac02d6c7b90fdb6e7e293b8a4d5b9c690d9ae5d3ae73e6bde4596dc4d8c66526a0e5e1abc73c88c
+  checksum: 10c0/44ddba252f0b9f1f0b1ff8d903bbcf8871246670fb2883f65d09d371d403ce9c3e2e582b94b36506c1d042110b464eb3492e53cd1e87c1d479b145bcc01c04fd
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-dynamic-import@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-dynamic-import@npm:7.24.1"
+"@babel/plugin-transform-dynamic-import@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-dynamic-import@npm:7.24.6"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
     "@babel/plugin-syntax-dynamic-import": "npm:^7.8.3"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/7e2834780e9b5251ef341854043a89c91473b83c335358620ca721554877e64e416aeb3288a35f03e825c4958e07d5d00ead08c4490fadc276a21fe151d812f1
+  checksum: 10c0/b4411f21112127a02aef15103765e207e4c03e7321d7f4de3522fc181cb377c5abc8484cf0169e6c30f2e51e6c602c09894fa6b15643d24f66273833ef34e4a6
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-exponentiation-operator@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-exponentiation-operator@npm:7.24.1"
+"@babel/plugin-transform-exponentiation-operator@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-exponentiation-operator@npm:7.24.6"
   dependencies:
-    "@babel/helper-builder-binary-assignment-operator-visitor": "npm:^7.22.15"
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-builder-binary-assignment-operator-visitor": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/f0fc4c5a9add25fd6bf23dabe6752e9b7c0a2b2554933dddfd16601245a2ba332b647951079c782bf3b94c6330e3638b9b4e0227f469a7c1c707446ba0eba6c7
+  checksum: 10c0/c4f15518a5d1614dfac0dbadfb99b0f36a98c1c1ff1c39794a105c3c87cfce00689e0943fcb13368b43b00b2eebaa01136ea12fb8600a574720853b5a8a11de7
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-export-namespace-from@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-export-namespace-from@npm:7.24.1"
+"@babel/plugin-transform-export-namespace-from@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-export-namespace-from@npm:7.24.6"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
     "@babel/plugin-syntax-export-namespace-from": "npm:^7.8.3"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/510bb23b2423d5fbffef69b356e4050929c21a7627e8194b1506dd935c7d9cbbd696c9ae9d7c3bcd7e6e7b69561b0b290c2d72d446327b40fc20ce40bbca6712
+  checksum: 10c0/bff16d1800d7e5b38d3a3c8d404cc14442a37383dff7769dcc599a0723b2507647cafe9ba7d9b52d2e2f02a78bb78d149676d8d8ddf7357b160f4096b89ae9c5
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-for-of@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-for-of@npm:7.24.1"
+"@babel/plugin-transform-for-of@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-for-of@npm:7.24.6"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
-    "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/e4bc92b1f334246e62d4bde079938df940794db564742034f6597f2e38bd426e11ae8c5670448e15dd6e45c462f2a9ab3fa87259bddf7c08553ffd9457fc2b2c
+  checksum: 10c0/c8def2a160783c5c4a1c136c721fc88aca9cd3757a60f1c885a804b5320edb5f143d3f989f698bdd9aae359fdabab0830dba3d35138cea42988a77d2c72c8443
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-function-name@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-function-name@npm:7.24.1"
+"@babel/plugin-transform-function-name@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-function-name@npm:7.24.6"
   dependencies:
-    "@babel/helper-compilation-targets": "npm:^7.23.6"
-    "@babel/helper-function-name": "npm:^7.23.0"
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-compilation-targets": "npm:^7.24.6"
+    "@babel/helper-function-name": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/65c1735ec3b5e43db9b5aebf3c16171c04b3050c92396b9e22dda0d2aaf51f43fdcf147f70a40678fd9a4ee2272a5acec4826e9c21bcf968762f4c184897ad75
+  checksum: 10c0/efa6527438ad94df0b7a4c92c33110ec40b086a0aceda567176b150ed291f8eb44b2ce697d8e3e1d4841496c10693add1e88f296418e72a171ead5c76b890a47
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-json-strings@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-json-strings@npm:7.24.1"
+"@babel/plugin-transform-json-strings@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-json-strings@npm:7.24.6"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
     "@babel/plugin-syntax-json-strings": "npm:^7.8.3"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/13d9b6a3c31ab4be853b3d49d8d1171f9bd8198562fd75da8f31e7de31398e1cfa6eb1d073bed93c9746e4f9c47a53b20f8f4c255ece3f88c90852ad3181dc2d
+  checksum: 10c0/46af52dcc16f494c6c11dc22c944f2533623b9d9dfce5097bc0bdb99535ad4c4cfe5bca0d8ce8c39a94202e69d99ee60f546ce0be0ad782b681c7b5b4c9ddd6f
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-literals@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-literals@npm:7.24.1"
+"@babel/plugin-transform-literals@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-literals@npm:7.24.6"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/a27cc7d565ee57b5a2bf136fa889c5c2f5988545ae7b3b2c83a7afe5dd37dfac80dca88b1c633c65851ce6af7d2095c04c01228657ce0198f918e64b5ccd01fa
+  checksum: 10c0/961b64df79a673706d74cf473d1f4646f250b4f8813f9d7ef5d897e30acdacd1ca104584de2e88546289fce055d71bd7559cdb8ad4a2d5e7eea17f3c829faa97
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-logical-assignment-operators@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-logical-assignment-operators@npm:7.24.1"
+"@babel/plugin-transform-logical-assignment-operators@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-logical-assignment-operators@npm:7.24.6"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
     "@babel/plugin-syntax-logical-assignment-operators": "npm:^7.10.4"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/98a2e0843ddfe51443c1bfcf08ba40ad8856fd4f8e397b392a5390a54f257c8c1b9a99d8ffc0fc7e8c55cce45e2cd9c2795a4450303f48f501bcbd662de44554
+  checksum: 10c0/0ae7f4098c63f442fd038de6034155bcf20214e7e490e92189decb2980932247b97cb069b11ac8bc471b53f71d6859e607969440d63ff400b8932ee3e05b4958
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-member-expression-literals@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-member-expression-literals@npm:7.24.1"
+"@babel/plugin-transform-member-expression-literals@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-member-expression-literals@npm:7.24.6"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/2af731d02aa4c757ef80c46df42264128cbe45bfd15e1812d1a595265b690a44ad036041c406a73411733540e1c4256d8174705ae6b8cfaf757fc175613993fd
+  checksum: 10c0/ec8908a409bd39d20f0428e35425c9e4c540bad252a0e33e08b84e3bea5088c785531197bdcf049afbdba841325962a93030b7be6da3586cb13d0ca0ebab89c9
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-modules-amd@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-modules-amd@npm:7.24.1"
+"@babel/plugin-transform-modules-amd@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-modules-amd@npm:7.24.6"
   dependencies:
-    "@babel/helper-module-transforms": "npm:^7.23.3"
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-module-transforms": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/71fd04e5e7026e6e52701214b1e9f7508ba371b757e5075fbb938a79235ed66a54ce65f89bb92b59159e9f03f01b392e6c4de6d255b948bec975a90cfd6809ef
+  checksum: 10c0/074d26c79f517b27a07fef00319aff9705df1e6b41a805db855fe719e0f246b9815d6525cf1c5f0890c7f830dd0b9776e9b2493bbc929a3c23c0dee15f10a514
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-modules-commonjs@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-modules-commonjs@npm:7.24.1"
+"@babel/plugin-transform-modules-commonjs@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-modules-commonjs@npm:7.24.6"
   dependencies:
-    "@babel/helper-module-transforms": "npm:^7.23.3"
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
-    "@babel/helper-simple-access": "npm:^7.22.5"
+    "@babel/helper-module-transforms": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-simple-access": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/efb3ea2047604a7eb44a9289311ebb29842fe6510ff8b66a77a60440448c65e1312a60dc48191ed98246bdbd163b5b6f3348a0669bcc0e3809e69c7c776b20fa
+  checksum: 10c0/4fc790136d066105fa773ffc7e249d88c6f0d0126984ede36fedd51ac2b622b46c08565bcdd1ab62ac10195eeedeaba0d26e7e4c676ed50906cbed16540a4e22
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-modules-systemjs@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-modules-systemjs@npm:7.24.1"
+"@babel/plugin-transform-modules-systemjs@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-modules-systemjs@npm:7.24.6"
   dependencies:
-    "@babel/helper-hoist-variables": "npm:^7.22.5"
-    "@babel/helper-module-transforms": "npm:^7.23.3"
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
-    "@babel/helper-validator-identifier": "npm:^7.22.20"
+    "@babel/helper-hoist-variables": "npm:^7.24.6"
+    "@babel/helper-module-transforms": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-validator-identifier": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/38145f8abe8a4ce2b41adabe5d65eb7bd54a139dc58e2885fec975eb5cf247bd938c1dd9f09145c46dbe57d25dd0ef7f00a020e5eb0cbe8195b2065d51e2d93d
+  checksum: 10c0/500962e3ac1bb1a9890e94f1967ec9e3aa3d41e22d4a9d1c739918707e4a8936710fd8d0ed4f3a8aad87260f7566b54566bead77977eb21e90124835cb6bcdca
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-modules-umd@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-modules-umd@npm:7.24.1"
+"@babel/plugin-transform-modules-umd@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-modules-umd@npm:7.24.6"
   dependencies:
-    "@babel/helper-module-transforms": "npm:^7.23.3"
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-module-transforms": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/14c90c58562b54e17fe4a8ded3f627f9a993648f8378ef00cb2f6c34532032b83290d2ad54c7fff4f0c2cd49091bda780f8cc28926ec4b77a6c2141105a2e699
+  checksum: 10c0/73c6cecb4f45ca3f665e2c57b6d04d65358518522dfaffb9b6913c026aeb704281d015324d02bf07f2cb026de6bac9308c62e82979364bd39f3687f752652b0d
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-named-capturing-groups-regex@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-named-capturing-groups-regex@npm:7.22.5"
+"@babel/plugin-transform-named-capturing-groups-regex@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-named-capturing-groups-regex@npm:7.24.6"
   dependencies:
-    "@babel/helper-create-regexp-features-plugin": "npm:^7.22.5"
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-create-regexp-features-plugin": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10c0/b0b072bef303670b5a98307bc37d1ac326cb7ad40ea162b89a03c2ffc465451be7ef05be95cb81ed28bfeb29670dc98fe911f793a67bceab18b4cb4c81ef48f3
+  checksum: 10c0/92547309d81938488753f87b05a679a7557a1cec253756966044367c268b27311e51efad91724aa3e433cf61626e10bf1008e112998350c2013a87824c4cfe0b
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-new-target@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-new-target@npm:7.24.1"
+"@babel/plugin-transform-new-target@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-new-target@npm:7.24.6"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/c4cabe628163855f175a8799eb73d692b6f1dc347aae5022af0c253f80c92edb962e48ddccc98b691eff3d5d8e53c9a8f10894c33ba4cebc2e2f8f8fe554fb7a
+  checksum: 10c0/5e9b9edfbe46489f64013d2bbd422f29acdb8057ccc85e7c759f7cf1415fde6a82ac13a13f0f246defaba6e2f7f4d424178ba78fc02237bdbf7df6692fc1dca8
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-nullish-coalescing-operator@npm:^7.22.3, @babel/plugin-transform-nullish-coalescing-operator@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-nullish-coalescing-operator@npm:7.24.1"
+"@babel/plugin-transform-nullish-coalescing-operator@npm:^7.22.3, @babel/plugin-transform-nullish-coalescing-operator@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-nullish-coalescing-operator@npm:7.24.6"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
     "@babel/plugin-syntax-nullish-coalescing-operator": "npm:^7.8.3"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/c8532951506fb031287280cebeef10aa714f8a7cea2b62a13c805f0e0af945ba77a7c87e4bbbe4c37fe973e0e5d5e649cfac7f0374f57efc54cdf9656362a392
+  checksum: 10c0/53ab5b16bbcf47e842a48f1f0774d238dae0222c3e1f31653307808048e249ed140cba12dfc280cbc9a577cb3bb5b2f50ca0e3e4ffe5260fcf8c3ca0b83fb21e
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-numeric-separator@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-numeric-separator@npm:7.24.1"
+"@babel/plugin-transform-numeric-separator@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-numeric-separator@npm:7.24.6"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
     "@babel/plugin-syntax-numeric-separator": "npm:^7.10.4"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/15e2b83292e586fb4f5b4b4021d4821a806ca6de2b77d5ad6c4e07aa7afa23704e31b4d683dac041afc69ac51b2461b96e8c98e46311cc1faba54c73f235044f
+  checksum: 10c0/14863e735fc407e065e1574914864a956b8250a84cfb4704592656763c9455d67034c7745e53066725195d9ed042121f424c4aaee00027791640e2639386b701
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-object-rest-spread@npm:^7.24.5":
-  version: 7.24.5
-  resolution: "@babel/plugin-transform-object-rest-spread@npm:7.24.5"
+"@babel/plugin-transform-object-rest-spread@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-object-rest-spread@npm:7.24.6"
   dependencies:
-    "@babel/helper-compilation-targets": "npm:^7.23.6"
-    "@babel/helper-plugin-utils": "npm:^7.24.5"
+    "@babel/helper-compilation-targets": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
     "@babel/plugin-syntax-object-rest-spread": "npm:^7.8.3"
-    "@babel/plugin-transform-parameters": "npm:^7.24.5"
+    "@babel/plugin-transform-parameters": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/91d7303af9b5744b8f569c1b8e45c9c9322ded05e7ee94e71b9ff2327f0d2c7b5aa87e040697a6baacc2dcb5c5e5e00913087c36f24c006bdaa4f958fd5bfd2d
+  checksum: 10c0/1a192b9756ebfa0bc69ad5e285d7d0284963b4b95738ca7721354297329d5c1ab4eb05ff5b198cbfffa3ec00e97a15a712aa7a5011d9407478796966aab54527
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-object-super@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-object-super@npm:7.24.1"
+"@babel/plugin-transform-object-super@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-object-super@npm:7.24.6"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
-    "@babel/helper-replace-supers": "npm:^7.24.1"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-replace-supers": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/d30e6b9e59a707efd7ed524fc0a8deeea046011a6990250f2e9280516683138e2d13d9c52daf41d78407bdab0378aef7478326f2a15305b773d851cb6e106157
+  checksum: 10c0/2e48b9e0a1f3b04b439ede2d0c83bcc5324a81c8bab73c70f0c466cf48061a4ff469f283e2feb17b4cc2e20372c1362253604477ecd77e622192d5d7906aa062
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-optional-catch-binding@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-optional-catch-binding@npm:7.24.1"
+"@babel/plugin-transform-optional-catch-binding@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-optional-catch-binding@npm:7.24.6"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
     "@babel/plugin-syntax-optional-catch-binding": "npm:^7.8.3"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/68408b9ef772d9aa5dccf166c86dc4d2505990ce93e03dcfc65c73fb95c2511248e009ba9ccf5b96405fb85de1c16ad8291016b1cc5689ee4becb1e3050e0ae7
+  checksum: 10c0/411db3177b1bffd2f9e5b33a6b62e70158380e67d91ff4725755312e8a0a2f2c3fd340c60005295a672115fb593222ab2d7076266aebced6ef087a5505b6f371
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-optional-chaining@npm:^7.24.1, @babel/plugin-transform-optional-chaining@npm:^7.24.5":
-  version: 7.24.5
-  resolution: "@babel/plugin-transform-optional-chaining@npm:7.24.5"
+"@babel/plugin-transform-optional-chaining@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-optional-chaining@npm:7.24.6"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.5"
-    "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.24.6"
     "@babel/plugin-syntax-optional-chaining": "npm:^7.8.3"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/f4e9446ec69f58f40b7843ce7603cfc50332976e6e794d4ddbe6b24670cd50ebc7766c4e3cbaecf0fbb744e98cbfbb54146f4e966314b1d58511b8bbf3d2722b
+  checksum: 10c0/8ee5a500a2309444d4fb27979857598e9c91d804fe23217c51cc208b1bc6b9cd0650b355b1ebd625f180c5f1dc4cb89b5f313c982f7c89d90281a69b24a88ccb
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-parameters@npm:^7.24.5":
-  version: 7.24.5
-  resolution: "@babel/plugin-transform-parameters@npm:7.24.5"
+"@babel/plugin-transform-parameters@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-parameters@npm:7.24.6"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/e08b8c46a24b1b21dde7783cb0aeb56ffe9ef6d6f1795649ce76273657158d3bfa5370c6594200ed7d371983b599c8e194b76108dffed9ab5746fe630ef2e8f5
+  checksum: 10c0/d9648924b9c0d35a243c0742c22838932a024205c61f4cc419857e5195edd893a33e6be4f2c8fbd89e925051c7cbe8968029ec2d3e7f2f098bfa682f4e2b9731
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-private-methods@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-private-methods@npm:7.24.1"
+"@babel/plugin-transform-private-methods@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-private-methods@npm:7.24.6"
   dependencies:
-    "@babel/helper-create-class-features-plugin": "npm:^7.24.1"
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-create-class-features-plugin": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/d8e18587d2a8b71a795da5e8841b0e64f1525a99ad73ea8b9caa331bc271d69646e2e1e749fd634321f3df9d126070208ddac22a27ccf070566b2efb74fecd99
+  checksum: 10c0/55f93959b2e8aeda818db7cdc7dfdcd5076f5bdc8a819566818004a68969fb7297d617f9d108bf76ac232d6056d9f9d20f73ce10380baa43ff1755c5591aa803
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-private-property-in-object@npm:^7.24.5":
-  version: 7.24.5
-  resolution: "@babel/plugin-transform-private-property-in-object@npm:7.24.5"
+"@babel/plugin-transform-private-property-in-object@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-private-property-in-object@npm:7.24.6"
   dependencies:
-    "@babel/helper-annotate-as-pure": "npm:^7.22.5"
-    "@babel/helper-create-class-features-plugin": "npm:^7.24.5"
-    "@babel/helper-plugin-utils": "npm:^7.24.5"
+    "@babel/helper-annotate-as-pure": "npm:^7.24.6"
+    "@babel/helper-create-class-features-plugin": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
     "@babel/plugin-syntax-private-property-in-object": "npm:^7.14.5"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/de7182bfde298e56c08a5d7ee1156f83c9af8c856bbe2248438848846a4ce544e050666bd0482e16a6006195e8be4923abd14650bef51fa0edd7f82014c2efcd
+  checksum: 10c0/c9eb9597362b598a91536375a49ba80cdf13461e849680e040898b103f7998c4d33a7832da5afba9fa51e3473f79cf8605f9ace07a887e386b7801797021631b
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-property-literals@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-property-literals@npm:7.24.1"
+"@babel/plugin-transform-property-literals@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-property-literals@npm:7.24.6"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/3bf3e01f7bb8215a8b6d0081b6f86fea23e3a4543b619e059a264ede028bc58cdfb0acb2c43271271915a74917effa547bc280ac636a9901fa9f2fb45623f87e
+  checksum: 10c0/d1195d93406b6c400cdbc9ac57a2b8b58c72cc6480cc03656abfc243be0e2a48133cbb96559c2db95b1c78803daeb538277821540fe19e2a9105905e727ef618
   languageName: node
   linkType: hard
 
@@ -1127,243 +1126,243 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-react-display-name@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-react-display-name@npm:7.24.1"
+"@babel/plugin-transform-react-display-name@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-react-display-name@npm:7.24.6"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/adf1a3cb0df8134533a558a9072a67e34127fd489dfe431c3348a86dd41f3e74861d5d5134bbb68f61a9cdb3f7e79b2acea1346be94ce4d3328a64e5a9e09be1
+  checksum: 10c0/e929d054035fa3b7432bd2b3e5cf280ffd8cf60d1ce80c863c5e0b03ad01bf6ae2546575d2da31cca2ab83d9399ac01a351f20e21af5075d9c0d4c893e4a36bd
   languageName: node
   linkType: hard
 
 "@babel/plugin-transform-react-inline-elements@npm:^7.21.0":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-react-inline-elements@npm:7.24.1"
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-react-inline-elements@npm:7.24.6"
   dependencies:
-    "@babel/helper-builder-react-jsx": "npm:^7.22.10"
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-builder-react-jsx": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/83fc6afaebbe82a5b14936f00b6d1ffce1a3d908ac749d5daa43f724d32c98b50807ffc3ce2492c1aa49870189507b751993a4a079b9c3226c9b8aab783d08b6
+  checksum: 10c0/b29f32a0c345db24f32569cf7a5626e37dd31c21bb764148757e91f609d41e2d09031ff1ad86e5672d578cf16f513b197ef3ebc8f0650d8314890a34ca68f02c
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-react-jsx-development@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-react-jsx-development@npm:7.22.5"
+"@babel/plugin-transform-react-jsx-development@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-react-jsx-development@npm:7.24.6"
   dependencies:
-    "@babel/plugin-transform-react-jsx": "npm:^7.22.5"
+    "@babel/plugin-transform-react-jsx": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/4d2e9e68383238feb873f6111df972df4a2ebf6256d6f787a8772241867efa975b3980f7d75ab7d750e7eaad4bd454e8cc6e106301fd7572dd389e553f5f69d2
+  checksum: 10c0/f899ffa65c7f459a682246a346af0e4132929ffe928cb0d02ae08aac1cf3fb01b2f6e944ef1eaca78f14e94eff935e2bf96aad878030c25ff6de2070a8b72448
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-react-jsx@npm:^7.22.5, @babel/plugin-transform-react-jsx@npm:^7.23.4":
-  version: 7.23.4
-  resolution: "@babel/plugin-transform-react-jsx@npm:7.23.4"
+"@babel/plugin-transform-react-jsx@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-react-jsx@npm:7.24.6"
   dependencies:
-    "@babel/helper-annotate-as-pure": "npm:^7.22.5"
-    "@babel/helper-module-imports": "npm:^7.22.15"
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
-    "@babel/plugin-syntax-jsx": "npm:^7.23.3"
-    "@babel/types": "npm:^7.23.4"
+    "@babel/helper-annotate-as-pure": "npm:^7.24.6"
+    "@babel/helper-module-imports": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/plugin-syntax-jsx": "npm:^7.24.6"
+    "@babel/types": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/8851b3adc515cd91bdb06ff3a23a0f81f0069cfef79dfb3fa744da4b7a82e3555ccb6324c4fa71ecf22508db13b9ff6a0ed96675f95fc87903b9fc6afb699580
+  checksum: 10c0/6144f56a76529a82077475583a17be8f0b0b461c83673e650f3894e09dbe2bcdfdbfff089eca2e5e239e119f72cd9562749a9af7eb3f2e3266a730da31cd19f2
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-react-pure-annotations@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-react-pure-annotations@npm:7.24.1"
+"@babel/plugin-transform-react-pure-annotations@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-react-pure-annotations@npm:7.24.6"
   dependencies:
-    "@babel/helper-annotate-as-pure": "npm:^7.22.5"
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-annotate-as-pure": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/9eb3056fcaadd63d404fd5652b2a3f693bc4758ba753fee5b5c580c7a64346eeeb94e5a4f77a99c76f3cf06d1f1ad6c227647cd0b1219efe3d00cafa5a6e7b2a
+  checksum: 10c0/7f83c5a3a275dbb9a291dee4642a3a0f2249265346d8d3cc9324fc9ee063c3e35c3853b52752ece603f0ac92b405deb38c4b5307a99a74d3e1c9c32a2cefa465
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-regenerator@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-regenerator@npm:7.24.1"
+"@babel/plugin-transform-regenerator@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-regenerator@npm:7.24.6"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
     regenerator-transform: "npm:^0.15.2"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/0a333585d7c0b38d31cc549d0f3cf7c396d1d50b6588a307dc58325505ddd4f5446188bc536c4779431b396251801b3f32d6d8e87db8274bc84e8c41950737f7
+  checksum: 10c0/d17eaa97514d583866182420024b8c22da2c6ca822bdbf16fe7564121564c1844935592dc3315c73d1f78f7c908a4338b1d783618811e694c9bb6d5f9233e58d
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-reserved-words@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-reserved-words@npm:7.24.1"
+"@babel/plugin-transform-reserved-words@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-reserved-words@npm:7.24.6"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/936d6e73cafb2cbb495f6817c6f8463288dbc9ab3c44684b931ebc1ece24f0d55dfabc1a75ba1de5b48843d0fef448dcfdbecb8485e4014f8f41d0d1440c536f
+  checksum: 10c0/5d2d4c579bd90c60fc6468a1285b3384e7b650b47d41a937a1590d4aecfc28bd945e82704c6e71cc91aa016b7e78c5594290c1c386edf11ec98e09e36235c5ae
   languageName: node
   linkType: hard
 
 "@babel/plugin-transform-runtime@npm:^7.22.4":
-  version: 7.24.3
-  resolution: "@babel/plugin-transform-runtime@npm:7.24.3"
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-runtime@npm:7.24.6"
   dependencies:
-    "@babel/helper-module-imports": "npm:^7.24.3"
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-module-imports": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
     babel-plugin-polyfill-corejs2: "npm:^0.4.10"
     babel-plugin-polyfill-corejs3: "npm:^0.10.1"
     babel-plugin-polyfill-regenerator: "npm:^0.6.1"
     semver: "npm:^6.3.1"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/ee01967bf405d84bd95ca4089166a18fb23fe9851a6da53dcf712a7f8ba003319996f21f320d568ec76126e18adfaee978206ccda86eef7652d47cc9a052e75e
+  checksum: 10c0/89c43c1236506ecbfc547b12936283ca41e611430c2d2e6d12bf1cbdb0d80760cdae481951f486946733e1c9ae064cb05f4bc779c65b3288d40963b0c4a20c5c
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-shorthand-properties@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-shorthand-properties@npm:7.24.1"
+"@babel/plugin-transform-shorthand-properties@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-shorthand-properties@npm:7.24.6"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/8273347621183aada3cf1f3019d8d5f29467ba13a75b72cb405bc7f23b7e05fd85f4edb1e4d9f0103153dddb61826a42dc24d466480d707f8932c1923a4c25fa
+  checksum: 10c0/4141b5da1d0d20d66ca0affaef8dfc45ed5e954bfa9003eb8aa779842599de443b37c2b265da27693f304c35ab68a682b44098e9eea0d39f8f94072ab616657f
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-spread@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-spread@npm:7.24.1"
+"@babel/plugin-transform-spread@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-spread@npm:7.24.6"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
-    "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/50a0302e344546d57e5c9f4dea575f88e084352eeac4e9a3e238c41739eef2df1daf4a7ebbb3ccb7acd3447f6a5ce9938405f98bf5f5583deceb8257f5a673c9
+  checksum: 10c0/6d12da05311690c4a73d775688ba6931b441e96e512377a166a60184292edeac0b17f5154a49e2f1d262a3f80b96e064bc9c88c63b2a6125f0a2132eff9ed585
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-sticky-regex@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-sticky-regex@npm:7.24.1"
+"@babel/plugin-transform-sticky-regex@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-sticky-regex@npm:7.24.6"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/786fe2ae11ef9046b9fa95677935abe495031eebf1274ad03f2054a20adea7b9dbd00336ac0b143f7924bc562e5e09793f6e8613607674b97e067d4838ccc4a0
+  checksum: 10c0/2a65f57554f51d3b9cd035513a610f47e46b26dba112b3b9fb42d1c1f2ae153fce8f76294b4721d099817814f57895c656f5b7dccd5df683277da6522c817ee9
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-template-literals@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-template-literals@npm:7.24.1"
+"@babel/plugin-transform-template-literals@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-template-literals@npm:7.24.6"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/f73bcda5488eb81c6e7a876498d9e6b72be32fca5a4d9db9053491a2d1300cd27b889b463fd2558f3cd5826a85ed00f61d81b234aa55cb5a0abf1b6fa1bd5026
+  checksum: 10c0/fcde48e9c3ecd7f5f37ceb6908f1edd537d3115fc2f27d187d58fd83b2a13637a1bb3d24589d841529ed081405b951bf1c5d194ea81eff6ad2d88204d153010d
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-typeof-symbol@npm:^7.24.5":
-  version: 7.24.5
-  resolution: "@babel/plugin-transform-typeof-symbol@npm:7.24.5"
+"@babel/plugin-transform-typeof-symbol@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-typeof-symbol@npm:7.24.6"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/5f0b5e33a86b84d89673829ffa2b5f175e102d3d0f45917cda121bc2b3650e1e5bb7a653f8cc1059c5b3a7b2e91e1aafd6623028b96ae752715cc5c2171c96e5
+  checksum: 10c0/a24b3a3c7b87c6496ee13d2438effd4645868f054397357ec3cbe92a2f0df4152ac7fd7228cb956576c1b772c0675b065d6ad5f5053c382e97dd022015e9a028
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-typescript@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-typescript@npm:7.24.1"
+"@babel/plugin-transform-typescript@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-typescript@npm:7.24.6"
   dependencies:
-    "@babel/helper-annotate-as-pure": "npm:^7.22.5"
-    "@babel/helper-create-class-features-plugin": "npm:^7.24.1"
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
-    "@babel/plugin-syntax-typescript": "npm:^7.24.1"
+    "@babel/helper-annotate-as-pure": "npm:^7.24.6"
+    "@babel/helper-create-class-features-plugin": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/plugin-syntax-typescript": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/9abce423ed2d3cb9398b09e3ed9efea661e92bd32e919f5c7942ac4bad4c5fd23a1d575bb7444d8c92261b68fb626552e0d9eea960372b6b6f54c2c9699a2649
+  checksum: 10c0/46b054e4d4253187403e392ef30f4dd624d8486a1992703f5ff1b415d4e8d00f474e35fb77bc7a3a16a17330873cadcd5af4a8493c61b16da2dde212b2788ccd
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-unicode-escapes@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-unicode-escapes@npm:7.24.1"
+"@babel/plugin-transform-unicode-escapes@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-unicode-escapes@npm:7.24.6"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/67a72a1ed99639de6a93aead35b1993cb3f0eb178a8991fcef48732c38c9f0279c85bbe1e2e2477b85afea873e738ff0955a35057635ce67bc149038e2d8a28e
+  checksum: 10c0/0e4038c589b7a63a2469466a25b78aad4ecb7267732e3c953c3055f9a77c7bee859a71983a08b025179f1b094964f2ebbfca1b6c33de4ead90a0b5ef06ddb47e
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-unicode-property-regex@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-unicode-property-regex@npm:7.24.1"
+"@babel/plugin-transform-unicode-property-regex@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-unicode-property-regex@npm:7.24.6"
   dependencies:
-    "@babel/helper-create-regexp-features-plugin": "npm:^7.22.15"
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-create-regexp-features-plugin": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/d9d9752df7d51bf9357c0bf3762fe16b8c841fca9ecf4409a16f15ccc34be06e8e71abfaee1251b7d451227e70e6b873b36f86b090efdb20f6f7de5fdb6c7a05
+  checksum: 10c0/bca99e00de91d0460dfcb25f285f3606248acc905193c05587e2862c54ddb790c5d8cb45e80927290390cffbcba7620f8af3e74c5301ff0c1c59ce7d47c5629f
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-unicode-regex@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-unicode-regex@npm:7.24.1"
+"@babel/plugin-transform-unicode-regex@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-unicode-regex@npm:7.24.6"
   dependencies:
-    "@babel/helper-create-regexp-features-plugin": "npm:^7.22.15"
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-create-regexp-features-plugin": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/6046ab38e5d14ed97dbb921bd79ac1d7ad9d3286da44a48930e980b16896db2df21e093563ec3c916a630dc346639bf47c5924a33902a06fe3bbb5cdc7ef5f2f
+  checksum: 10c0/ab6e253cfc38c7e8a2844d7ad46f85fdcbe33610b7f92f71045cf0b040438a08f1f1717ab4b84c480537f54e5478db8b404a4ccc2ff846b4e3ed33d373e3b47a
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-unicode-sets-regex@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-unicode-sets-regex@npm:7.24.1"
+"@babel/plugin-transform-unicode-sets-regex@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-unicode-sets-regex@npm:7.24.6"
   dependencies:
-    "@babel/helper-create-regexp-features-plugin": "npm:^7.22.15"
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-create-regexp-features-plugin": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10c0/b6c1f6b90afeeddf97e5713f72575787fcb7179be7b4c961869bfbc66915f66540dc49da93e4369da15596bd44b896d1eb8a50f5e1fd907abd7a1a625901006b
+  checksum: 10c0/a52e84f85519fed330e88f7a17611064d2b5f1d0fe2823f8113ed312828e69787888bd023f404e8d35d0bb96461e42e19cdc4f0a44d35959bc86c219a3062237
   languageName: node
   linkType: hard
 
 "@babel/preset-env@npm:^7.11.0, @babel/preset-env@npm:^7.12.1, @babel/preset-env@npm:^7.22.4":
-  version: 7.24.5
-  resolution: "@babel/preset-env@npm:7.24.5"
-  dependencies:
-    "@babel/compat-data": "npm:^7.24.4"
-    "@babel/helper-compilation-targets": "npm:^7.23.6"
-    "@babel/helper-plugin-utils": "npm:^7.24.5"
-    "@babel/helper-validator-option": "npm:^7.23.5"
-    "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "npm:^7.24.5"
-    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "npm:^7.24.1"
-    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "npm:^7.24.1"
-    "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "npm:^7.24.1"
+  version: 7.24.6
+  resolution: "@babel/preset-env@npm:7.24.6"
+  dependencies:
+    "@babel/compat-data": "npm:^7.24.6"
+    "@babel/helper-compilation-targets": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-validator-option": "npm:^7.24.6"
+    "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "npm:^7.24.6"
+    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "npm:^7.24.6"
+    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "npm:^7.24.6"
+    "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "npm:^7.24.6"
     "@babel/plugin-proposal-private-property-in-object": "npm:7.21.0-placeholder-for-preset-env.2"
     "@babel/plugin-syntax-async-generators": "npm:^7.8.4"
     "@babel/plugin-syntax-class-properties": "npm:^7.12.13"
     "@babel/plugin-syntax-class-static-block": "npm:^7.14.5"
     "@babel/plugin-syntax-dynamic-import": "npm:^7.8.3"
     "@babel/plugin-syntax-export-namespace-from": "npm:^7.8.3"
-    "@babel/plugin-syntax-import-assertions": "npm:^7.24.1"
-    "@babel/plugin-syntax-import-attributes": "npm:^7.24.1"
+    "@babel/plugin-syntax-import-assertions": "npm:^7.24.6"
+    "@babel/plugin-syntax-import-attributes": "npm:^7.24.6"
     "@babel/plugin-syntax-import-meta": "npm:^7.10.4"
     "@babel/plugin-syntax-json-strings": "npm:^7.8.3"
     "@babel/plugin-syntax-logical-assignment-operators": "npm:^7.10.4"
@@ -1375,54 +1374,54 @@ __metadata:
     "@babel/plugin-syntax-private-property-in-object": "npm:^7.14.5"
     "@babel/plugin-syntax-top-level-await": "npm:^7.14.5"
     "@babel/plugin-syntax-unicode-sets-regex": "npm:^7.18.6"
-    "@babel/plugin-transform-arrow-functions": "npm:^7.24.1"
-    "@babel/plugin-transform-async-generator-functions": "npm:^7.24.3"
-    "@babel/plugin-transform-async-to-generator": "npm:^7.24.1"
-    "@babel/plugin-transform-block-scoped-functions": "npm:^7.24.1"
-    "@babel/plugin-transform-block-scoping": "npm:^7.24.5"
-    "@babel/plugin-transform-class-properties": "npm:^7.24.1"
-    "@babel/plugin-transform-class-static-block": "npm:^7.24.4"
-    "@babel/plugin-transform-classes": "npm:^7.24.5"
-    "@babel/plugin-transform-computed-properties": "npm:^7.24.1"
-    "@babel/plugin-transform-destructuring": "npm:^7.24.5"
-    "@babel/plugin-transform-dotall-regex": "npm:^7.24.1"
-    "@babel/plugin-transform-duplicate-keys": "npm:^7.24.1"
-    "@babel/plugin-transform-dynamic-import": "npm:^7.24.1"
-    "@babel/plugin-transform-exponentiation-operator": "npm:^7.24.1"
-    "@babel/plugin-transform-export-namespace-from": "npm:^7.24.1"
-    "@babel/plugin-transform-for-of": "npm:^7.24.1"
-    "@babel/plugin-transform-function-name": "npm:^7.24.1"
-    "@babel/plugin-transform-json-strings": "npm:^7.24.1"
-    "@babel/plugin-transform-literals": "npm:^7.24.1"
-    "@babel/plugin-transform-logical-assignment-operators": "npm:^7.24.1"
-    "@babel/plugin-transform-member-expression-literals": "npm:^7.24.1"
-    "@babel/plugin-transform-modules-amd": "npm:^7.24.1"
-    "@babel/plugin-transform-modules-commonjs": "npm:^7.24.1"
-    "@babel/plugin-transform-modules-systemjs": "npm:^7.24.1"
-    "@babel/plugin-transform-modules-umd": "npm:^7.24.1"
-    "@babel/plugin-transform-named-capturing-groups-regex": "npm:^7.22.5"
-    "@babel/plugin-transform-new-target": "npm:^7.24.1"
-    "@babel/plugin-transform-nullish-coalescing-operator": "npm:^7.24.1"
-    "@babel/plugin-transform-numeric-separator": "npm:^7.24.1"
-    "@babel/plugin-transform-object-rest-spread": "npm:^7.24.5"
-    "@babel/plugin-transform-object-super": "npm:^7.24.1"
-    "@babel/plugin-transform-optional-catch-binding": "npm:^7.24.1"
-    "@babel/plugin-transform-optional-chaining": "npm:^7.24.5"
-    "@babel/plugin-transform-parameters": "npm:^7.24.5"
-    "@babel/plugin-transform-private-methods": "npm:^7.24.1"
-    "@babel/plugin-transform-private-property-in-object": "npm:^7.24.5"
-    "@babel/plugin-transform-property-literals": "npm:^7.24.1"
-    "@babel/plugin-transform-regenerator": "npm:^7.24.1"
-    "@babel/plugin-transform-reserved-words": "npm:^7.24.1"
-    "@babel/plugin-transform-shorthand-properties": "npm:^7.24.1"
-    "@babel/plugin-transform-spread": "npm:^7.24.1"
-    "@babel/plugin-transform-sticky-regex": "npm:^7.24.1"
-    "@babel/plugin-transform-template-literals": "npm:^7.24.1"
-    "@babel/plugin-transform-typeof-symbol": "npm:^7.24.5"
-    "@babel/plugin-transform-unicode-escapes": "npm:^7.24.1"
-    "@babel/plugin-transform-unicode-property-regex": "npm:^7.24.1"
-    "@babel/plugin-transform-unicode-regex": "npm:^7.24.1"
-    "@babel/plugin-transform-unicode-sets-regex": "npm:^7.24.1"
+    "@babel/plugin-transform-arrow-functions": "npm:^7.24.6"
+    "@babel/plugin-transform-async-generator-functions": "npm:^7.24.6"
+    "@babel/plugin-transform-async-to-generator": "npm:^7.24.6"
+    "@babel/plugin-transform-block-scoped-functions": "npm:^7.24.6"
+    "@babel/plugin-transform-block-scoping": "npm:^7.24.6"
+    "@babel/plugin-transform-class-properties": "npm:^7.24.6"
+    "@babel/plugin-transform-class-static-block": "npm:^7.24.6"
+    "@babel/plugin-transform-classes": "npm:^7.24.6"
+    "@babel/plugin-transform-computed-properties": "npm:^7.24.6"
+    "@babel/plugin-transform-destructuring": "npm:^7.24.6"
+    "@babel/plugin-transform-dotall-regex": "npm:^7.24.6"
+    "@babel/plugin-transform-duplicate-keys": "npm:^7.24.6"
+    "@babel/plugin-transform-dynamic-import": "npm:^7.24.6"
+    "@babel/plugin-transform-exponentiation-operator": "npm:^7.24.6"
+    "@babel/plugin-transform-export-namespace-from": "npm:^7.24.6"
+    "@babel/plugin-transform-for-of": "npm:^7.24.6"
+    "@babel/plugin-transform-function-name": "npm:^7.24.6"
+    "@babel/plugin-transform-json-strings": "npm:^7.24.6"
+    "@babel/plugin-transform-literals": "npm:^7.24.6"
+    "@babel/plugin-transform-logical-assignment-operators": "npm:^7.24.6"
+    "@babel/plugin-transform-member-expression-literals": "npm:^7.24.6"
+    "@babel/plugin-transform-modules-amd": "npm:^7.24.6"
+    "@babel/plugin-transform-modules-commonjs": "npm:^7.24.6"
+    "@babel/plugin-transform-modules-systemjs": "npm:^7.24.6"
+    "@babel/plugin-transform-modules-umd": "npm:^7.24.6"
+    "@babel/plugin-transform-named-capturing-groups-regex": "npm:^7.24.6"
+    "@babel/plugin-transform-new-target": "npm:^7.24.6"
+    "@babel/plugin-transform-nullish-coalescing-operator": "npm:^7.24.6"
+    "@babel/plugin-transform-numeric-separator": "npm:^7.24.6"
+    "@babel/plugin-transform-object-rest-spread": "npm:^7.24.6"
+    "@babel/plugin-transform-object-super": "npm:^7.24.6"
+    "@babel/plugin-transform-optional-catch-binding": "npm:^7.24.6"
+    "@babel/plugin-transform-optional-chaining": "npm:^7.24.6"
+    "@babel/plugin-transform-parameters": "npm:^7.24.6"
+    "@babel/plugin-transform-private-methods": "npm:^7.24.6"
+    "@babel/plugin-transform-private-property-in-object": "npm:^7.24.6"
+    "@babel/plugin-transform-property-literals": "npm:^7.24.6"
+    "@babel/plugin-transform-regenerator": "npm:^7.24.6"
+    "@babel/plugin-transform-reserved-words": "npm:^7.24.6"
+    "@babel/plugin-transform-shorthand-properties": "npm:^7.24.6"
+    "@babel/plugin-transform-spread": "npm:^7.24.6"
+    "@babel/plugin-transform-sticky-regex": "npm:^7.24.6"
+    "@babel/plugin-transform-template-literals": "npm:^7.24.6"
+    "@babel/plugin-transform-typeof-symbol": "npm:^7.24.6"
+    "@babel/plugin-transform-unicode-escapes": "npm:^7.24.6"
+    "@babel/plugin-transform-unicode-property-regex": "npm:^7.24.6"
+    "@babel/plugin-transform-unicode-regex": "npm:^7.24.6"
+    "@babel/plugin-transform-unicode-sets-regex": "npm:^7.24.6"
     "@babel/preset-modules": "npm:0.1.6-no-external-plugins"
     babel-plugin-polyfill-corejs2: "npm:^0.4.10"
     babel-plugin-polyfill-corejs3: "npm:^0.10.4"
@@ -1431,7 +1430,7 @@ __metadata:
     semver: "npm:^6.3.1"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/2cc0edae09205d6409a75d02e53aaa1c590e89adbb7b389019c7b75e4c47b6b63eeb1a816df5c42b672ce410747e7ddc23b6747e8e41a6c95d6fa00c665509e2
+  checksum: 10c0/d837d294197803d550e48d9458a356853a54a0528e7cdc51c2b8a5d8dfe41c6fbc597b4fc67464615a7385198a3db2e839da15cca7b9502fedf27170fc6ef673
   languageName: node
   linkType: hard
 
@@ -1449,33 +1448,33 @@ __metadata:
   linkType: hard
 
 "@babel/preset-react@npm:^7.12.5, @babel/preset-react@npm:^7.22.3":
-  version: 7.24.1
-  resolution: "@babel/preset-react@npm:7.24.1"
+  version: 7.24.6
+  resolution: "@babel/preset-react@npm:7.24.6"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
-    "@babel/helper-validator-option": "npm:^7.23.5"
-    "@babel/plugin-transform-react-display-name": "npm:^7.24.1"
-    "@babel/plugin-transform-react-jsx": "npm:^7.23.4"
-    "@babel/plugin-transform-react-jsx-development": "npm:^7.22.5"
-    "@babel/plugin-transform-react-pure-annotations": "npm:^7.24.1"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-validator-option": "npm:^7.24.6"
+    "@babel/plugin-transform-react-display-name": "npm:^7.24.6"
+    "@babel/plugin-transform-react-jsx": "npm:^7.24.6"
+    "@babel/plugin-transform-react-jsx-development": "npm:^7.24.6"
+    "@babel/plugin-transform-react-pure-annotations": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/a842abc5a024ed68a0ce4c1244607d40165cb6f8cf1817ebda282e470f20302d81c6a61cb41c1a31aa6c4e99ce93df4dd9e998a8ded1417c25d7480f0e14103a
+  checksum: 10c0/edc470b86dfcfdedf53feca3f2266bd7f836a300806938a422f4120d39bbdea6a780b9b0a9ac0333e0bb1b8e554699a74cafd135b2a75b02b77ef1b21f7c7f62
   languageName: node
   linkType: hard
 
 "@babel/preset-typescript@npm:^7.21.5":
-  version: 7.24.1
-  resolution: "@babel/preset-typescript@npm:7.24.1"
+  version: 7.24.6
+  resolution: "@babel/preset-typescript@npm:7.24.6"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
-    "@babel/helper-validator-option": "npm:^7.23.5"
-    "@babel/plugin-syntax-jsx": "npm:^7.24.1"
-    "@babel/plugin-transform-modules-commonjs": "npm:^7.24.1"
-    "@babel/plugin-transform-typescript": "npm:^7.24.1"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-validator-option": "npm:^7.24.6"
+    "@babel/plugin-syntax-jsx": "npm:^7.24.6"
+    "@babel/plugin-transform-modules-commonjs": "npm:^7.24.6"
+    "@babel/plugin-transform-typescript": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/0033dc6fbc898ed0d8017c83a2dd5e095c82909e2f83e48cf9f305e3e9287148758c179ad90f27912cf98ca68bfec3643c57c70c0ca34d3a6c50dc8243aef406
+  checksum: 10c0/bfcef91ed80d67301301e17a799814457b57bfd0d85d9897dce6df6ed0b0af155c0f5b2af7a1a122a3f36faaaa1de87ccf9954ce06d2f440898ffdfaf18aab86
   languageName: node
   linkType: hard
 
@@ -1496,51 +1495,51 @@ __metadata:
   linkType: hard
 
 "@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.0, @babel/runtime@npm:^7.12.13, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.13.8, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.2.0, @babel/runtime@npm:^7.20.13, @babel/runtime@npm:^7.22.3, @babel/runtime@npm:^7.23.2, @babel/runtime@npm:^7.3.1, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.6.3, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.8.7, @babel/runtime@npm:^7.9.2":
-  version: 7.24.5
-  resolution: "@babel/runtime@npm:7.24.5"
+  version: 7.24.6
+  resolution: "@babel/runtime@npm:7.24.6"
   dependencies:
     regenerator-runtime: "npm:^0.14.0"
-  checksum: 10c0/05730e43e8ba6550eae9fd4fb5e7d9d3cb91140379425abcb2a1ff9cebad518a280d82c4c4b0f57ada26a863106ac54a748d90c775790c0e2cd0ddd85ccdf346
+  checksum: 10c0/224ad205de33ea28979baaec89eea4c4d4e9482000dd87d15b97859365511cdd4d06517712504024f5d33a5fb9412f9b91c96f1d923974adf9359e1575cde049
   languageName: node
   linkType: hard
 
-"@babel/template@npm:^7.22.15, @babel/template@npm:^7.24.0, @babel/template@npm:^7.3.3":
-  version: 7.24.0
-  resolution: "@babel/template@npm:7.24.0"
+"@babel/template@npm:^7.24.6, @babel/template@npm:^7.3.3":
+  version: 7.24.6
+  resolution: "@babel/template@npm:7.24.6"
   dependencies:
-    "@babel/code-frame": "npm:^7.23.5"
-    "@babel/parser": "npm:^7.24.0"
-    "@babel/types": "npm:^7.24.0"
-  checksum: 10c0/9d3dd8d22fe1c36bc3bdef6118af1f4b030aaf6d7d2619f5da203efa818a2185d717523486c111de8d99a8649ddf4bbf6b2a7a64962d8411cf6a8fa89f010e54
+    "@babel/code-frame": "npm:^7.24.6"
+    "@babel/parser": "npm:^7.24.6"
+    "@babel/types": "npm:^7.24.6"
+  checksum: 10c0/a4d5805770de908b445f7cdcebfcb6eaa07b1ec9c7b78fd3f375a911b1522c249bddae6b96bc4aac24247cc603e3e6cffcf2fe50b4c929dfeb22de289b517525
   languageName: node
   linkType: hard
 
-"@babel/traverse@npm:7, @babel/traverse@npm:^7.24.5":
-  version: 7.24.5
-  resolution: "@babel/traverse@npm:7.24.5"
+"@babel/traverse@npm:7, @babel/traverse@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/traverse@npm:7.24.6"
   dependencies:
-    "@babel/code-frame": "npm:^7.24.2"
-    "@babel/generator": "npm:^7.24.5"
-    "@babel/helper-environment-visitor": "npm:^7.22.20"
-    "@babel/helper-function-name": "npm:^7.23.0"
-    "@babel/helper-hoist-variables": "npm:^7.22.5"
-    "@babel/helper-split-export-declaration": "npm:^7.24.5"
-    "@babel/parser": "npm:^7.24.5"
-    "@babel/types": "npm:^7.24.5"
+    "@babel/code-frame": "npm:^7.24.6"
+    "@babel/generator": "npm:^7.24.6"
+    "@babel/helper-environment-visitor": "npm:^7.24.6"
+    "@babel/helper-function-name": "npm:^7.24.6"
+    "@babel/helper-hoist-variables": "npm:^7.24.6"
+    "@babel/helper-split-export-declaration": "npm:^7.24.6"
+    "@babel/parser": "npm:^7.24.6"
+    "@babel/types": "npm:^7.24.6"
     debug: "npm:^4.3.1"
     globals: "npm:^11.1.0"
-  checksum: 10c0/3f22534bc2b2ed9208e55ef48af3b32939032b23cb9dc4037447cb108640df70bbb0b9fea86e9c58648949fdc2cb14e89aa79ffa3c62a5dd43459a52fe8c01d1
+  checksum: 10c0/39027d5fc7a241c6b71bb5872c2bdcec53743cd7ef3c151bbe6fd7cf874d15f4bc09e5d7e19e2f534b0eb2c115f5368553885fa4253aa1bc9441c6e5bf9efdaf
   languageName: node
   linkType: hard
 
-"@babel/types@npm:^7.0.0, @babel/types@npm:^7.0.0-beta.49, @babel/types@npm:^7.12.11, @babel/types@npm:^7.12.6, @babel/types@npm:^7.20.7, @babel/types@npm:^7.22.10, @babel/types@npm:^7.22.15, @babel/types@npm:^7.22.19, @babel/types@npm:^7.22.5, @babel/types@npm:^7.23.0, @babel/types@npm:^7.23.4, @babel/types@npm:^7.24.0, @babel/types@npm:^7.24.5, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3":
-  version: 7.24.5
-  resolution: "@babel/types@npm:7.24.5"
+"@babel/types@npm:^7.0.0, @babel/types@npm:^7.0.0-beta.49, @babel/types@npm:^7.12.11, @babel/types@npm:^7.12.6, @babel/types@npm:^7.20.7, @babel/types@npm:^7.24.6, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3":
+  version: 7.24.6
+  resolution: "@babel/types@npm:7.24.6"
   dependencies:
-    "@babel/helper-string-parser": "npm:^7.24.1"
-    "@babel/helper-validator-identifier": "npm:^7.24.5"
+    "@babel/helper-string-parser": "npm:^7.24.6"
+    "@babel/helper-validator-identifier": "npm:^7.24.6"
     to-fast-properties: "npm:^2.0.0"
-  checksum: 10c0/e1284eb046c5e0451b80220d1200e2327e0a8544a2fe45bb62c952e5fdef7099c603d2336b17b6eac3cc046b7a69bfbce67fe56e1c0ea48cd37c65cb88638f2a
+  checksum: 10c0/1d94d92d97ef49030ad7f9e14cfccfeb70b1706dabcaa69037e659ec9d2c3178fb005d2088cce40d88dfc1306153d9157fe038a79ea2be92e5e6b99a59ef80cc
   languageName: node
   linkType: hard
 

From e947f1f2ed005ec764a1ddbc53965cece533a62f Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Fri, 24 May 2024 10:25:42 +0200
Subject: [PATCH 1107/2191] [Glitch] Fix a leftover argument to `api()`

Port 8ea2726376ed9507072a8e2ec07fdfc219264dad to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../hashtag_timeline/containers/column_settings_container.js    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/flavours/glitch/features/hashtag_timeline/containers/column_settings_container.js b/app/javascript/flavours/glitch/features/hashtag_timeline/containers/column_settings_container.js
index be95004cc7bfaf..680b44519b5c58 100644
--- a/app/javascript/flavours/glitch/features/hashtag_timeline/containers/column_settings_container.js
+++ b/app/javascript/flavours/glitch/features/hashtag_timeline/containers/column_settings_container.js
@@ -15,7 +15,7 @@ const mapStateToProps = (state, { columnId }) => {
   return {
     settings: columns.get(index).get('params'),
     onLoad (value) {
-      return api(() => state).get('/api/v2/search', { params: { q: value, type: 'hashtags' } }).then(response => {
+      return api().get('/api/v2/search', { params: { q: value, type: 'hashtags' } }).then(response => {
         return (response.data.hashtags || []).map((tag) => {
           return { value: tag.name, label: `#${tag.name}` };
         });

From 1a2a28eb4af996b6277de11da7b217de903ab508 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 24 May 2024 17:13:34 +0200
Subject: [PATCH 1108/2191] Fix rubocop warnings

---
 app/lib/advanced_text_formatter.rb            | 2 +-
 config/initializers/0_duplicate_migrations.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/lib/advanced_text_formatter.rb b/app/lib/advanced_text_formatter.rb
index cdf1e2d9cd9394..3ba4c92be37585 100644
--- a/app/lib/advanced_text_formatter.rb
+++ b/app/lib/advanced_text_formatter.rb
@@ -31,7 +31,7 @@ def autolink(link, link_type)
   # @option options [String] :content_type
   def initialize(text, options = {})
     @content_type = options.delete(:content_type)
-    super(text, options)
+    super
 
     @text = format_markdown(text) if content_type == 'text/markdown'
   end
diff --git a/config/initializers/0_duplicate_migrations.rb b/config/initializers/0_duplicate_migrations.rb
index ab50e5e9006518..f99357187702d6 100644
--- a/config/initializers/0_duplicate_migrations.rb
+++ b/config/initializers/0_duplicate_migrations.rb
@@ -38,7 +38,7 @@ def self.new(direction, migrations, schema_migration, internal_metadata, target_
         end
       end
 
-      super(direction, migrations, schema_migration, internal_metadata, target_version)
+      super
     end
   end
 

From a5c808e9b033eeb605dcf6b36dc14ddb1127db7b Mon Sep 17 00:00:00 2001
From: Julius Rajala <juliusrajala@gmail.com>
Date: Fri, 24 May 2024 19:39:03 +0300
Subject: [PATCH 1109/2191] Fix issue with post-create scripts failing on local
 docker (#28402)

---
 .devcontainer/docker-compose.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
index 97331f74ea7a01..5d9917b399b9a5 100644
--- a/.devcontainer/docker-compose.yml
+++ b/.devcontainer/docker-compose.yml
@@ -2,6 +2,7 @@ version: '3'
 
 services:
   app:
+    working_dir: /workspaces/mastodon/
     build:
       context: .
       dockerfile: Dockerfile

From 6a75e1c8c82a1625867ea69be3d0c55697448f4e Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Mon, 27 May 2024 11:00:40 +0200
Subject: [PATCH 1110/2191] Fix `createDataLoadingThunk` to allow actions
 without arguments (#30439)

---
 .../mastodon/store/typed_functions.ts         | 21 +++++++------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/app/javascript/mastodon/store/typed_functions.ts b/app/javascript/mastodon/store/typed_functions.ts
index 0392f373c0c6bb..dae37e62255269 100644
--- a/app/javascript/mastodon/store/typed_functions.ts
+++ b/app/javascript/mastodon/store/typed_functions.ts
@@ -89,21 +89,17 @@ type OnData<LoadDataResult, ReturnedData> = (
   },
 ) => ReturnedData | DiscardLoadData | Promise<ReturnedData | DiscardLoadData>;
 
+type ArgsType = Record<string, unknown> | undefined;
+
 // Overload when there is no `onData` method, the payload is the `onData` result
-export function createDataLoadingThunk<
-  LoadDataResult,
-  Args extends Record<string, unknown>,
->(
+export function createDataLoadingThunk<LoadDataResult, Args extends ArgsType>(
   name: string,
   loadData: (args: Args) => Promise<LoadDataResult>,
   thunkOptions?: AppThunkOptions,
 ): ReturnType<typeof createThunk<Args, LoadDataResult>>;
 
 // Overload when the `onData` method returns discardLoadDataInPayload, then the payload is empty
-export function createDataLoadingThunk<
-  LoadDataResult,
-  Args extends Record<string, unknown>,
->(
+export function createDataLoadingThunk<LoadDataResult, Args extends ArgsType>(
   name: string,
   loadData: (args: Args) => Promise<LoadDataResult>,
   onDataOrThunkOptions?:
@@ -113,10 +109,7 @@ export function createDataLoadingThunk<
 ): ReturnType<typeof createThunk<Args, void>>;
 
 // Overload when the `onData` method returns nothing, then the mayload is the `onData` result
-export function createDataLoadingThunk<
-  LoadDataResult,
-  Args extends Record<string, unknown>,
->(
+export function createDataLoadingThunk<LoadDataResult, Args extends ArgsType>(
   name: string,
   loadData: (args: Args) => Promise<LoadDataResult>,
   onDataOrThunkOptions?: AppThunkOptions | OnData<LoadDataResult, void>,
@@ -126,7 +119,7 @@ export function createDataLoadingThunk<
 // Overload when there is an `onData` method returning something
 export function createDataLoadingThunk<
   LoadDataResult,
-  Args extends Record<string, unknown>,
+  Args extends ArgsType,
   Returned,
 >(
   name: string,
@@ -162,7 +155,7 @@ export function createDataLoadingThunk<
  */
 export function createDataLoadingThunk<
   LoadDataResult,
-  Args extends Record<string, unknown>,
+  Args extends ArgsType,
   Returned,
 >(
   name: string,

From 404e203d41bc47e78a2265368b6caaad084dbb16 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 27 May 2024 11:19:44 +0200
Subject: [PATCH 1111/2191] chore(deps): update dependency simple_form to
 v5.3.1 (#30416)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 5feab4d09562e8..934d41334d7d56 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -425,7 +425,7 @@ GEM
     mime-types-data (3.2024.0507)
     mini_mime (1.1.5)
     mini_portile2 (2.8.6)
-    minitest (5.23.0)
+    minitest (5.23.1)
     msgpack (1.7.2)
     multi_json (1.15.0)
     multipart-post (2.4.0)
@@ -799,7 +799,7 @@ GEM
       thor (>= 0.20, < 3.0)
     simple-navigation (4.4.0)
       activesupport (>= 2.3.2)
-    simple_form (5.3.0)
+    simple_form (5.3.1)
       actionpack (>= 5.2)
       activemodel (>= 5.2)
     simplecov (0.22.0)

From 564ebfefcf1deb79b38422dfadbc9d5023eca4b6 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 27 May 2024 05:20:28 -0400
Subject: [PATCH 1112/2191] Remove hard reference from status pin validator
 spec (#30432)

---
 spec/validators/status_pin_validator_spec.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/validators/status_pin_validator_spec.rb b/spec/validators/status_pin_validator_spec.rb
index d5109f990fb243..e50a952db802d6 100644
--- a/spec/validators/status_pin_validator_spec.rb
+++ b/spec/validators/status_pin_validator_spec.rb
@@ -45,8 +45,8 @@
       end
     end
 
-    context 'when pin.account.status_pins.count > 4 && pin.account.local?' do
-      let(:count) { 5 }
+    context 'when pin account is local and has too many pins' do
+      let(:count) { described_class::PIN_LIMIT + 1 }
       let(:local) { true }
 
       it 'calls errors.add' do

From 3750e8050cb4a5707e76dfb8f49687cc0984f67f Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Mon, 27 May 2024 11:24:59 +0200
Subject: [PATCH 1113/2191] Enable stricter Typescript options (#30435)

---
 app/javascript/entrypoints/public.tsx                | 12 ++++++------
 .../entrypoints/remote_interaction_helper.ts         |  9 ++++++++-
 .../mastodon/components/animated_number.tsx          |  5 +++--
 app/javascript/mastodon/components/hashtag_bar.tsx   |  7 +++++--
 app/javascript/mastodon/components/short_number.tsx  |  2 +-
 .../mastodon/features/emoji/emoji_mart_data_light.ts |  5 ++++-
 .../features/emoji/emoji_unicode_mapping_light.ts    |  5 ++++-
 app/javascript/mastodon/store/middlewares/sounds.ts  |  5 +++--
 tsconfig.json                                        |  2 ++
 9 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/app/javascript/entrypoints/public.tsx b/app/javascript/entrypoints/public.tsx
index d45927226c282f..40a9b7c0ca6470 100644
--- a/app/javascript/entrypoints/public.tsx
+++ b/app/javascript/entrypoints/public.tsx
@@ -65,7 +65,7 @@ window.addEventListener('message', (e) => {
       {
         type: 'setHeight',
         id: data.id,
-        height: document.getElementsByTagName('html')[0].scrollHeight,
+        height: document.getElementsByTagName('html')[0]?.scrollHeight,
       },
       '*',
     );
@@ -135,7 +135,7 @@ function loaded() {
     );
   };
   const todayFormat = new IntlMessageFormat(
-    localeData['relative_format.today'] || 'Today at {time}',
+    localeData['relative_format.today'] ?? 'Today at {time}',
     locale,
   );
 
@@ -288,13 +288,13 @@ function loaded() {
       if (statusEl.dataset.spoiler === 'expanded') {
         statusEl.dataset.spoiler = 'folded';
         this.textContent = new IntlMessageFormat(
-          localeData['status.show_more'] || 'Show more',
+          localeData['status.show_more'] ?? 'Show more',
           locale,
         ).format() as string;
       } else {
         statusEl.dataset.spoiler = 'expanded';
         this.textContent = new IntlMessageFormat(
-          localeData['status.show_less'] || 'Show less',
+          localeData['status.show_less'] ?? 'Show less',
           locale,
         ).format() as string;
       }
@@ -316,8 +316,8 @@ function loaded() {
 
       const message =
         statusEl.dataset.spoiler === 'expanded'
-          ? localeData['status.show_less'] || 'Show less'
-          : localeData['status.show_more'] || 'Show more';
+          ? localeData['status.show_less'] ?? 'Show less'
+          : localeData['status.show_more'] ?? 'Show more';
       spoilerLink.textContent = new IntlMessageFormat(
         message,
         locale,
diff --git a/app/javascript/entrypoints/remote_interaction_helper.ts b/app/javascript/entrypoints/remote_interaction_helper.ts
index d5834c6c3d2ee9..419571c8964168 100644
--- a/app/javascript/entrypoints/remote_interaction_helper.ts
+++ b/app/javascript/entrypoints/remote_interaction_helper.ts
@@ -67,7 +67,9 @@ const fetchInteractionURLFailure = () => {
   );
 };
 
-const isValidDomain = (value: string) => {
+const isValidDomain = (value: unknown) => {
+  if (typeof value !== 'string') return false;
+
   const url = new URL('https:///path');
   url.hostname = value;
   return url.hostname === value;
@@ -124,6 +126,11 @@ const fromAcct = (acct: string) => {
   const domain = segments[1];
   const fallbackTemplate = `https://${domain}/authorize_interaction?uri={uri}`;
 
+  if (!domain) {
+    fetchInteractionURLFailure();
+    return;
+  }
+
   axios
     .get(`https://${domain}/.well-known/webfinger`, {
       params: { resource: `acct:${acct}` },
diff --git a/app/javascript/mastodon/components/animated_number.tsx b/app/javascript/mastodon/components/animated_number.tsx
index e98e30b242284b..6c1e0aaec14d64 100644
--- a/app/javascript/mastodon/components/animated_number.tsx
+++ b/app/javascript/mastodon/components/animated_number.tsx
@@ -48,8 +48,9 @@ export const AnimatedNumber: React.FC<Props> = ({ value }) => {
             <span
               key={key}
               style={{
-                position: direction * style.y > 0 ? 'absolute' : 'static',
-                transform: `translateY(${style.y * 100}%)`,
+                position:
+                  direction * (style.y ?? 0) > 0 ? 'absolute' : 'static',
+                transform: `translateY(${(style.y ?? 0) * 100}%)`,
               }}
             >
               <ShortNumber value={data as number} />
diff --git a/app/javascript/mastodon/components/hashtag_bar.tsx b/app/javascript/mastodon/components/hashtag_bar.tsx
index ed5de7d3a5dff0..1642ba65042867 100644
--- a/app/javascript/mastodon/components/hashtag_bar.tsx
+++ b/app/javascript/mastodon/components/hashtag_bar.tsx
@@ -52,7 +52,10 @@ function uniqueHashtagsWithCaseHandling(hashtags: string[]) {
   );
 
   return Object.values(groups).map((tags) => {
-    if (tags.length === 1) return tags[0];
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- we know that the array has at least one element
+    const firstTag = tags[0]!;
+
+    if (tags.length === 1) return firstTag;
 
     // The best match is the one where we have the less difference between upper and lower case letter count
     const best = minBy(tags, (tag) => {
@@ -66,7 +69,7 @@ function uniqueHashtagsWithCaseHandling(hashtags: string[]) {
       return Math.abs(lowerCase - upperCase);
     });
 
-    return best ?? tags[0];
+    return best ?? firstTag;
   });
 }
 
diff --git a/app/javascript/mastodon/components/short_number.tsx b/app/javascript/mastodon/components/short_number.tsx
index 74c3c5d75e71cf..a0b523aaadc920 100644
--- a/app/javascript/mastodon/components/short_number.tsx
+++ b/app/javascript/mastodon/components/short_number.tsx
@@ -48,7 +48,7 @@ const ShortNumberCounter: React.FC<ShortNumberCounterProps> = ({ value }) => {
 
   const count = (
     <FormattedNumber
-      value={rawNumber}
+      value={rawNumber ?? 0}
       maximumFractionDigits={maxFractionDigits}
     />
   );
diff --git a/app/javascript/mastodon/features/emoji/emoji_mart_data_light.ts b/app/javascript/mastodon/features/emoji/emoji_mart_data_light.ts
index ffca1f8b0630a3..806a3f8927466b 100644
--- a/app/javascript/mastodon/features/emoji/emoji_mart_data_light.ts
+++ b/app/javascript/mastodon/features/emoji/emoji_mart_data_light.ts
@@ -29,7 +29,10 @@ const emojis: Emojis = {};
 
 // decompress
 Object.keys(shortCodesToEmojiData).forEach((shortCode) => {
-  const [_filenameData, searchData] = shortCodesToEmojiData[shortCode];
+  const emojiData = shortCodesToEmojiData[shortCode];
+  if (!emojiData) return;
+
+  const [_filenameData, searchData] = emojiData;
   const [native, short_names, search, unified] = searchData;
 
   emojis[shortCode] = {
diff --git a/app/javascript/mastodon/features/emoji/emoji_unicode_mapping_light.ts b/app/javascript/mastodon/features/emoji/emoji_unicode_mapping_light.ts
index 191419496fb2a9..d116c6c62c87d0 100644
--- a/app/javascript/mastodon/features/emoji/emoji_unicode_mapping_light.ts
+++ b/app/javascript/mastodon/features/emoji/emoji_unicode_mapping_light.ts
@@ -46,7 +46,10 @@ function processEmojiMapData(
 Object.keys(shortCodesToEmojiData).forEach(
   (shortCode: ShortCodesToEmojiDataKey) => {
     if (shortCode === undefined) return;
-    const [filenameData, _searchData] = shortCodesToEmojiData[shortCode];
+
+    const emojiData = shortCodesToEmojiData[shortCode];
+    if (!emojiData) return;
+    const [filenameData, _searchData] = emojiData;
     filenameData.forEach((emojiMapData) => {
       processEmojiMapData(emojiMapData, shortCode);
     });
diff --git a/app/javascript/mastodon/store/middlewares/sounds.ts b/app/javascript/mastodon/store/middlewares/sounds.ts
index 720ee163e9d9ab..91407b1ec0a1dd 100644
--- a/app/javascript/mastodon/store/middlewares/sounds.ts
+++ b/app/javascript/mastodon/store/middlewares/sounds.ts
@@ -74,8 +74,9 @@ export const soundsMiddleware = (): Middleware<
     if (isActionWithMetaSound(action)) {
       const sound = action.meta.sound;
 
-      if (sound && Object.hasOwn(soundCache, sound)) {
-        play(soundCache[sound]);
+      if (sound) {
+        const s = soundCache[sound];
+        if (s) play(s);
       }
     }
 
diff --git a/tsconfig.json b/tsconfig.json
index 7010dda1fce20a..cc1f18a9925a85 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -7,6 +7,8 @@
     "allowJs": true,
     "noEmit": true,
     "strict": true,
+    "noImplicitReturns": true,
+    "noUncheckedIndexedAccess": true,
     "esModuleInterop": true,
     "skipLibCheck": true,
     "baseUrl": "./",

From 1034f13f57ec98f316e2b356957d01992371b59d Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 27 May 2024 11:25:55 +0200
Subject: [PATCH 1114/2191] chore(deps): update devdependencies (non-major)
 (#30442)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 260 ++++++++++++++++++++++++++----------------------------
 1 file changed, 123 insertions(+), 137 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 03157cce55c90d..ad07e4e426b986 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1590,7 +1590,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/css-parser-algorithms@npm:^2.6.1, @csstools/css-parser-algorithms@npm:^2.6.3":
+"@csstools/css-parser-algorithms@npm:^2.6.3":
   version: 2.6.3
   resolution: "@csstools/css-parser-algorithms@npm:2.6.3"
   peerDependencies:
@@ -1599,14 +1599,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/css-tokenizer@npm:^2.2.4, @csstools/css-tokenizer@npm:^2.3.1":
+"@csstools/css-tokenizer@npm:^2.3.1":
   version: 2.3.1
   resolution: "@csstools/css-tokenizer@npm:2.3.1"
   checksum: 10c0/fed6619fb5108e109d4dd10b0e967035a92793bae8fb84544e1342058b6df4e306d9d075623e2201fe88831b1ada797aea3546a8d12229d2d81cd7a5dfee4444
   languageName: node
   linkType: hard
 
-"@csstools/media-query-list-parser@npm:^2.1.11, @csstools/media-query-list-parser@npm:^2.1.9":
+"@csstools/media-query-list-parser@npm:^2.1.11":
   version: 2.1.11
   resolution: "@csstools/media-query-list-parser@npm:2.1.11"
   peerDependencies:
@@ -1982,7 +1982,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/selector-specificity@npm:^3.0.3, @csstools/selector-specificity@npm:^3.1.1":
+"@csstools/selector-specificity@npm:^3.1.1":
   version: 3.1.1
   resolution: "@csstools/selector-specificity@npm:3.1.1"
   peerDependencies:
@@ -2007,10 +2007,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@dual-bundle/import-meta-resolve@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "@dual-bundle/import-meta-resolve@npm:4.0.0"
-  checksum: 10c0/868b8314fc753b7767887108535afe3288de941d92bc8453164dbcb1abe886b171e338f6f7d02ff556256dee69c90e4ac6360e0c6a856a5ad7190274ab52de2e
+"@dual-bundle/import-meta-resolve@npm:^4.1.0":
+  version: 4.1.0
+  resolution: "@dual-bundle/import-meta-resolve@npm:4.1.0"
+  checksum: 10c0/55069e550ee2710e738dd8bbd34aba796cede456287454b50c3be46fbef8695d00625677f3f41f5ffbec1174c0f57f314da9a908388bc9f8ad41a8438db884d9
   languageName: node
   linkType: hard
 
@@ -5609,12 +5609,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"braces@npm:^3.0.2, braces@npm:~3.0.2":
-  version: 3.0.2
-  resolution: "braces@npm:3.0.2"
+"braces@npm:^3.0.3, braces@npm:~3.0.2":
+  version: 3.0.3
+  resolution: "braces@npm:3.0.3"
   dependencies:
-    fill-range: "npm:^7.0.1"
-  checksum: 10c0/321b4d675791479293264019156ca322163f02dc06e3c4cab33bb15cd43d80b51efef69b0930cfde3acd63d126ebca24cd0544fa6f261e093a0fb41ab9dda381
+    fill-range: "npm:^7.1.1"
+  checksum: 10c0/7c6dfd30c338d2997ba77500539227b9d1f85e388a5f43220865201e407e076783d0881f2d297b9f80951b4c957fcf0b51c1d2d24227631643c3f7c284b0aa04
   languageName: node
   linkType: hard
 
@@ -5917,13 +5917,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"chalk@npm:5.3.0":
-  version: 5.3.0
-  resolution: "chalk@npm:5.3.0"
-  checksum: 10c0/8297d436b2c0f95801103ff2ef67268d362021b8210daf8ddbe349695333eb3610a71122172ff3b0272f1ef2cf7cc2c41fdaa4715f52e49ffe04c56340feed09
-  languageName: node
-  linkType: hard
-
 "chalk@npm:^2.4.1, chalk@npm:^2.4.2":
   version: 2.4.2
   resolution: "chalk@npm:2.4.2"
@@ -5955,6 +5948,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"chalk@npm:~5.3.0":
+  version: 5.3.0
+  resolution: "chalk@npm:5.3.0"
+  checksum: 10c0/8297d436b2c0f95801103ff2ef67268d362021b8210daf8ddbe349695333eb3610a71122172ff3b0272f1ef2cf7cc2c41fdaa4715f52e49ffe04c56340feed09
+  languageName: node
+  linkType: hard
+
 "char-regex@npm:^1.0.2":
   version: 1.0.2
   resolution: "char-regex@npm:1.0.2"
@@ -6247,13 +6247,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"commander@npm:11.1.0":
-  version: 11.1.0
-  resolution: "commander@npm:11.1.0"
-  checksum: 10c0/13cc6ac875e48780250f723fb81c1c1178d35c5decb1abb1b628b3177af08a8554e76b2c0f29de72d69eef7c864d12613272a71fabef8047922bc622ab75a179
-  languageName: node
-  linkType: hard
-
 "commander@npm:^2.20.0":
   version: 2.20.3
   resolution: "commander@npm:2.20.3"
@@ -6268,6 +6261,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"commander@npm:~12.1.0":
+  version: 12.1.0
+  resolution: "commander@npm:12.1.0"
+  checksum: 10c0/6e1996680c083b3b897bfc1cfe1c58dfbcd9842fd43e1aaf8a795fbc237f65efcc860a3ef457b318e73f29a4f4a28f6403c3d653d021d960e4632dd45bde54a9
+  languageName: node
+  linkType: hard
+
 "comment-parser@npm:1.4.1":
   version: 1.4.1
   resolution: "comment-parser@npm:1.4.1"
@@ -6947,7 +6947,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"debug@npm:4, debug@npm:4.3.4, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.4":
+"debug@npm:4, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.4, debug@npm:~4.3.4":
   version: 4.3.4
   resolution: "debug@npm:4.3.4"
   dependencies:
@@ -8165,23 +8165,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"execa@npm:8.0.1":
-  version: 8.0.1
-  resolution: "execa@npm:8.0.1"
-  dependencies:
-    cross-spawn: "npm:^7.0.3"
-    get-stream: "npm:^8.0.1"
-    human-signals: "npm:^5.0.0"
-    is-stream: "npm:^3.0.0"
-    merge-stream: "npm:^2.0.0"
-    npm-run-path: "npm:^5.1.0"
-    onetime: "npm:^6.0.0"
-    signal-exit: "npm:^4.1.0"
-    strip-final-newline: "npm:^3.0.0"
-  checksum: 10c0/2c52d8775f5bf103ce8eec9c7ab3059909ba350a5164744e9947ed14a53f51687c040a250bda833f906d1283aa8803975b84e6c8f7a7c42f99dc8ef80250d1af
-  languageName: node
-  linkType: hard
-
 "execa@npm:^1.0.0":
   version: 1.0.0
   resolution: "execa@npm:1.0.0"
@@ -8214,6 +8197,23 @@ __metadata:
   languageName: node
   linkType: hard
 
+"execa@npm:~8.0.1":
+  version: 8.0.1
+  resolution: "execa@npm:8.0.1"
+  dependencies:
+    cross-spawn: "npm:^7.0.3"
+    get-stream: "npm:^8.0.1"
+    human-signals: "npm:^5.0.0"
+    is-stream: "npm:^3.0.0"
+    merge-stream: "npm:^2.0.0"
+    npm-run-path: "npm:^5.1.0"
+    onetime: "npm:^6.0.0"
+    signal-exit: "npm:^4.1.0"
+    strip-final-newline: "npm:^3.0.0"
+  checksum: 10c0/2c52d8775f5bf103ce8eec9c7ab3059909ba350a5164744e9947ed14a53f51687c040a250bda833f906d1283aa8803975b84e6c8f7a7c42f99dc8ef80250d1af
+  languageName: node
+  linkType: hard
+
 "exit@npm:^0.1.2":
   version: 0.1.2
   resolution: "exit@npm:0.1.2"
@@ -8339,10 +8339,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fast-copy@npm:^3.0.0":
-  version: 3.0.1
-  resolution: "fast-copy@npm:3.0.1"
-  checksum: 10c0/a8310dbcc4c94ed001dc3e0bbc3c3f0491bb04e6c17163abe441a54997ba06cdf1eb532c2f05e54777c6f072c84548c23ef0ecd54665cd611be1d42f37eca258
+"fast-copy@npm:^3.0.2":
+  version: 3.0.2
+  resolution: "fast-copy@npm:3.0.2"
+  checksum: 10c0/02e8b9fd03c8c024d2987760ce126456a0e17470850b51e11a1c3254eed6832e4733ded2d93316c82bc0b36aeb991ad1ff48d1ba95effe7add7c3ab8d8eb554a
   languageName: node
   linkType: hard
 
@@ -8493,12 +8493,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fill-range@npm:^7.0.1":
-  version: 7.0.1
-  resolution: "fill-range@npm:7.0.1"
+"fill-range@npm:^7.1.1":
+  version: 7.1.1
+  resolution: "fill-range@npm:7.1.1"
   dependencies:
     to-regex-range: "npm:^5.0.1"
-  checksum: 10c0/7cdad7d426ffbaadf45aeb5d15ec675bbd77f7597ad5399e3d2766987ed20bda24d5fac64b3ee79d93276f5865608bb22344a26b9b1ae6c4d00bd94bf611623f
+  checksum: 10c0/b75b691bbe065472f38824f694c2f7449d7f5004aa950426a2c28f0306c60db9b880c0b0e4ed819997ffb882d1da02cfcfc819bddc94d71627f5269682edf018
   languageName: node
   linkType: hard
 
@@ -11229,10 +11229,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"known-css-properties@npm:^0.30.0":
-  version: 0.30.0
-  resolution: "known-css-properties@npm:0.30.0"
-  checksum: 10c0/8b487a6b33487affcec41eb392ceb77acf4d093558dde5c88b5ea06b9a3c81781876d7cb09872e0518b9602f27c8f4112c9ac333e02c90a91c8fbd12e202ed48
+"known-css-properties@npm:^0.31.0":
+  version: 0.31.0
+  resolution: "known-css-properties@npm:0.31.0"
+  checksum: 10c0/8e643cbed32d7733278ba215c43dfc38fc7e77d391f66b81f07228af97d69ce2cebba03a9bc1ac859479e162aea812e258b30f4c93cb7b7adfd0622a141d36da
   languageName: node
   linkType: hard
 
@@ -11269,14 +11269,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lilconfig@npm:3.0.0":
-  version: 3.0.0
-  resolution: "lilconfig@npm:3.0.0"
-  checksum: 10c0/7f5ee7a658dc016cacf146815e8d88b06f06f4402823b8b0934e305a57a197f55ccc9c5cd4fb5ea1b2b821c8ccaf2d54abd59602a4931af06eabda332388d3e6
-  languageName: node
-  linkType: hard
-
-"lilconfig@npm:^3.1.1":
+"lilconfig@npm:^3.1.1, lilconfig@npm:~3.1.1":
   version: 3.1.1
   resolution: "lilconfig@npm:3.1.1"
   checksum: 10c0/311b559794546894e3fe176663427326026c1c644145be9e8041c58e268aa9328799b8dfe7e4dd8c6a4ae305feae95a1c9e007db3569f35b42b6e1bc8274754c
@@ -11291,36 +11284,36 @@ __metadata:
   linkType: hard
 
 "lint-staged@npm:^15.0.0":
-  version: 15.2.2
-  resolution: "lint-staged@npm:15.2.2"
-  dependencies:
-    chalk: "npm:5.3.0"
-    commander: "npm:11.1.0"
-    debug: "npm:4.3.4"
-    execa: "npm:8.0.1"
-    lilconfig: "npm:3.0.0"
-    listr2: "npm:8.0.1"
-    micromatch: "npm:4.0.5"
-    pidtree: "npm:0.6.0"
-    string-argv: "npm:0.3.2"
-    yaml: "npm:2.3.4"
+  version: 15.2.5
+  resolution: "lint-staged@npm:15.2.5"
+  dependencies:
+    chalk: "npm:~5.3.0"
+    commander: "npm:~12.1.0"
+    debug: "npm:~4.3.4"
+    execa: "npm:~8.0.1"
+    lilconfig: "npm:~3.1.1"
+    listr2: "npm:~8.2.1"
+    micromatch: "npm:~4.0.7"
+    pidtree: "npm:~0.6.0"
+    string-argv: "npm:~0.3.2"
+    yaml: "npm:~2.4.2"
   bin:
     lint-staged: bin/lint-staged.js
-  checksum: 10c0/a1ba6c7ee53e30a0f6ea9a351d95d3d0d2be916a41b561e22907e9ea513eb18cb3dbe65bff3ec13fad15777999efe56b2e2a95427e31d12a9b7e7948c3630ee2
+  checksum: 10c0/89c54489783510f86df15756659facade82e849c0cbfb564fe047b82be91c5d2b1b5608a4bfc5237bd7b9fd0e1206e66aa3e4f8cad3ac51e37a098b8492c2fa6
   languageName: node
   linkType: hard
 
-"listr2@npm:8.0.1":
-  version: 8.0.1
-  resolution: "listr2@npm:8.0.1"
+"listr2@npm:~8.2.1":
+  version: 8.2.1
+  resolution: "listr2@npm:8.2.1"
   dependencies:
     cli-truncate: "npm:^4.0.0"
     colorette: "npm:^2.0.20"
     eventemitter3: "npm:^5.0.1"
     log-update: "npm:^6.0.0"
-    rfdc: "npm:^1.3.0"
+    rfdc: "npm:^1.3.1"
     wrap-ansi: "npm:^9.0.0"
-  checksum: 10c0/b565d6ceb3a4c2dbe0c1735c0fd907afd0d6f89de21aced8e05187b2d88ca2f8f9ebc5d743885396a00f05f13146f6be744d098a56ce0402cf1cd131485a7ff1
+  checksum: 10c0/ac32cba8e5c79bcf0dbbb43c2fcc73e47902320c1fa1891074fefb3aa3dfaeef9c76348da22909f65334ba9bee1140bfc903e2f0c64427dd08ef4ba8f6b1dbd0
   languageName: node
   linkType: hard
 
@@ -11762,16 +11755,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"micromatch@npm:4.0.5, micromatch@npm:^4.0.4, micromatch@npm:^4.0.5":
-  version: 4.0.5
-  resolution: "micromatch@npm:4.0.5"
-  dependencies:
-    braces: "npm:^3.0.2"
-    picomatch: "npm:^2.3.1"
-  checksum: 10c0/3d6505b20f9fa804af5d8c596cb1c5e475b9b0cd05f652c5b56141cf941bd72adaeb7a436fda344235cef93a7f29b7472efc779fcdb83b478eab0867b95cdeff
-  languageName: node
-  linkType: hard
-
 "micromatch@npm:^3.0.4, micromatch@npm:^3.1.10, micromatch@npm:^3.1.4":
   version: 3.1.10
   resolution: "micromatch@npm:3.1.10"
@@ -11793,6 +11776,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"micromatch@npm:^4.0.4, micromatch@npm:^4.0.5, micromatch@npm:~4.0.7":
+  version: 4.0.7
+  resolution: "micromatch@npm:4.0.7"
+  dependencies:
+    braces: "npm:^3.0.3"
+    picomatch: "npm:^2.3.1"
+  checksum: 10c0/58fa99bc5265edec206e9163a1d2cec5fabc46a5b473c45f4a700adce88c2520456ae35f2b301e4410fb3afb27e9521fb2813f6fc96be0a48a89430e0916a772
+  languageName: node
+  linkType: hard
+
 "miller-rabin@npm:^4.0.0":
   version: 4.0.1
   resolution: "miller-rabin@npm:4.0.1"
@@ -12986,10 +12979,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"picocolors@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "picocolors@npm:1.0.0"
-  checksum: 10c0/20a5b249e331c14479d94ec6817a182fd7a5680debae82705747b2db7ec50009a5f6648d0621c561b0572703f84dbef0858abcbd5856d3c5511426afcb1961f7
+"picocolors@npm:^1.0.0, picocolors@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "picocolors@npm:1.0.1"
+  checksum: 10c0/c63cdad2bf812ef0d66c8db29583802355d4ca67b9285d846f390cc15c2f6ccb94e8cb7eb6a6e97fc5990a6d3ad4ae42d86c84d3146e667c739a4234ed50d400
   languageName: node
   linkType: hard
 
@@ -13000,7 +12993,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pidtree@npm:0.6.0":
+"pidtree@npm:~0.6.0":
   version: 0.6.0
   resolution: "pidtree@npm:0.6.0"
   bin:
@@ -13069,12 +13062,12 @@ __metadata:
   linkType: hard
 
 "pino-pretty@npm:^11.0.0":
-  version: 11.0.0
-  resolution: "pino-pretty@npm:11.0.0"
+  version: 11.1.0
+  resolution: "pino-pretty@npm:11.1.0"
   dependencies:
     colorette: "npm:^2.0.7"
     dateformat: "npm:^4.6.3"
-    fast-copy: "npm:^3.0.0"
+    fast-copy: "npm:^3.0.2"
     fast-safe-stringify: "npm:^2.1.1"
     help-me: "npm:^5.0.0"
     joycon: "npm:^3.1.1"
@@ -13084,11 +13077,11 @@ __metadata:
     pump: "npm:^3.0.0"
     readable-stream: "npm:^4.0.0"
     secure-json-parse: "npm:^2.4.0"
-    sonic-boom: "npm:^3.0.0"
+    sonic-boom: "npm:^4.0.1"
     strip-json-comments: "npm:^3.1.1"
   bin:
     pino-pretty: bin.js
-  checksum: 10c0/d42213f3fdf19d92152b0a14683b2bb8443423739c81ab7c1181a5dac0e0ca7621d232c8264ece81edc01106ca2a8e165783daca0a902f0fde480027075d5540
+  checksum: 10c0/418be6f854b0d62c83c65e75b0969d5311792bfadeefbfe77d8a7f8c5ba26b8bea40f549222b5f500439f440eb4d6c2fa99d712bdd02881ebae7be3a0193b581
   languageName: node
   linkType: hard
 
@@ -15200,10 +15193,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rfdc@npm:^1.3.0":
-  version: 1.3.0
-  resolution: "rfdc@npm:1.3.0"
-  checksum: 10c0/a17fd7b81f42c7ae4cb932abd7b2f677b04cc462a03619fb46945ae1ccae17c3bc87c020ffdde1751cbfa8549860a2883486fdcabc9b9de3f3108af32b69a667
+"rfdc@npm:^1.3.1":
+  version: 1.3.1
+  resolution: "rfdc@npm:1.3.1"
+  checksum: 10c0/69f65e3ed30970f8055fac9fbbef9ce578800ca19554eab1dcbffe73a4b8aef536bc4248313889cf25e3b4e38b212c721eabe30856575bf2b2bc3d90f8ba93ef
   languageName: node
   linkType: hard
 
@@ -15865,15 +15858,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"sonic-boom@npm:^3.0.0":
-  version: 3.7.0
-  resolution: "sonic-boom@npm:3.7.0"
-  dependencies:
-    atomic-sleep: "npm:^1.0.0"
-  checksum: 10c0/57a3d560efb77f4576db111168ee2649c99e7869fda6ce0ec2a4e5458832d290ba58d74b073ddb5827d9a30f96d23cff79157993d919e1a6d5f28d8b6391c7f0
-  languageName: node
-  linkType: hard
-
 "sonic-boom@npm:^4.0.1":
   version: 4.0.1
   resolution: "sonic-boom@npm:4.0.1"
@@ -16180,7 +16164,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"string-argv@npm:0.3.2":
+"string-argv@npm:~0.3.2":
   version: 0.3.2
   resolution: "string-argv@npm:0.3.2"
   checksum: 10c0/75c02a83759ad1722e040b86823909d9a2fc75d15dd71ec4b537c3560746e33b5f5a07f7332d1e3f88319909f82190843aa2f0a0d8c8d591ec08e93d5b8dec82
@@ -16504,14 +16488,14 @@ __metadata:
   linkType: hard
 
 "stylelint@npm:^16.0.2":
-  version: 16.5.0
-  resolution: "stylelint@npm:16.5.0"
-  dependencies:
-    "@csstools/css-parser-algorithms": "npm:^2.6.1"
-    "@csstools/css-tokenizer": "npm:^2.2.4"
-    "@csstools/media-query-list-parser": "npm:^2.1.9"
-    "@csstools/selector-specificity": "npm:^3.0.3"
-    "@dual-bundle/import-meta-resolve": "npm:^4.0.0"
+  version: 16.6.0
+  resolution: "stylelint@npm:16.6.0"
+  dependencies:
+    "@csstools/css-parser-algorithms": "npm:^2.6.3"
+    "@csstools/css-tokenizer": "npm:^2.3.1"
+    "@csstools/media-query-list-parser": "npm:^2.1.11"
+    "@csstools/selector-specificity": "npm:^3.1.1"
+    "@dual-bundle/import-meta-resolve": "npm:^4.1.0"
     balanced-match: "npm:^2.0.0"
     colord: "npm:^2.9.3"
     cosmiconfig: "npm:^9.0.0"
@@ -16528,16 +16512,16 @@ __metadata:
     ignore: "npm:^5.3.1"
     imurmurhash: "npm:^0.1.4"
     is-plain-object: "npm:^5.0.0"
-    known-css-properties: "npm:^0.30.0"
+    known-css-properties: "npm:^0.31.0"
     mathml-tag-names: "npm:^2.1.3"
     meow: "npm:^13.2.0"
     micromatch: "npm:^4.0.5"
     normalize-path: "npm:^3.0.0"
-    picocolors: "npm:^1.0.0"
+    picocolors: "npm:^1.0.1"
     postcss: "npm:^8.4.38"
     postcss-resolve-nested-selector: "npm:^0.1.1"
     postcss-safe-parser: "npm:^7.0.0"
-    postcss-selector-parser: "npm:^6.0.16"
+    postcss-selector-parser: "npm:^6.1.0"
     postcss-value-parser: "npm:^4.2.0"
     resolve-from: "npm:^5.0.0"
     string-width: "npm:^4.2.3"
@@ -16548,7 +16532,7 @@ __metadata:
     write-file-atomic: "npm:^5.0.1"
   bin:
     stylelint: bin/stylelint.mjs
-  checksum: 10c0/9281693ff6c1918e07fdcf7a950531f79678a28261a0d5bd36ca2fcf524e53d7305158d20ba890f5dd01c0ff90c09a13453dce2fe6887f4c157d8c2c0acf3666
+  checksum: 10c0/acfb7983a0b71677d066b2aa570eefdac0a7be2e21351bac8884b8156deaeec19e53ad128ae7ae7933c79f6045f1de8d759ba06cfbc373b2711015860805a3e7
   languageName: node
   linkType: hard
 
@@ -18442,13 +18426,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"yaml@npm:2.3.4":
-  version: 2.3.4
-  resolution: "yaml@npm:2.3.4"
-  checksum: 10c0/cf03b68f8fef5e8516b0f0b54edaf2459f1648317fc6210391cf606d247e678b449382f4bd01f77392538429e306c7cba8ff46ff6b37cac4de9a76aff33bd9e1
-  languageName: node
-  linkType: hard
-
 "yaml@npm:^1.10.0":
   version: 1.10.2
   resolution: "yaml@npm:1.10.2"
@@ -18456,6 +18433,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"yaml@npm:~2.4.2":
+  version: 2.4.2
+  resolution: "yaml@npm:2.4.2"
+  bin:
+    yaml: bin.mjs
+  checksum: 10c0/280ddb2e43ffa7d91a95738e80c8f33e860749cdc25aa6d9e4d350a28e174fd7e494e4aa023108aaee41388e451e3dc1292261d8f022aabcf90df9c63d647549
+  languageName: node
+  linkType: hard
+
 "yargs-parser@npm:^13.1.2":
   version: 13.1.2
   resolution: "yargs-parser@npm:13.1.2"

From e5c3dc33a29d9f104b7101fb872da52114a38112 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 27 May 2024 11:35:45 +0200
Subject: [PATCH 1115/2191] New Crowdin Translations (automated) (#30421)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/lt.json    |  1 +
 app/javascript/mastodon/locales/nn.json    |  2 +-
 app/javascript/mastodon/locales/pt-BR.json |  1 +
 app/javascript/mastodon/locales/si.json    |  7 +++++++
 config/locales/ja.yml                      |  2 ++
 config/locales/lt.yml                      |  2 ++
 config/locales/nn.yml                      | 12 ++++++------
 config/locales/pt-BR.yml                   |  2 ++
 config/locales/si.yml                      | 12 ++++++------
 config/locales/simple_form.lt.yml          |  2 ++
 config/locales/simple_form.nn.yml          |  6 +++---
 config/locales/simple_form.si.yml          |  2 +-
 config/locales/simple_form.uk.yml          |  5 +++++
 config/locales/th.yml                      |  1 +
 config/locales/uk.yml                      |  2 ++
 15 files changed, 42 insertions(+), 17 deletions(-)

diff --git a/app/javascript/mastodon/locales/lt.json b/app/javascript/mastodon/locales/lt.json
index 0f42e97fcff7fc..5fc7d32869a676 100644
--- a/app/javascript/mastodon/locales/lt.json
+++ b/app/javascript/mastodon/locales/lt.json
@@ -466,6 +466,7 @@
   "notification.follow_request": "{name} paprašė tave sekti",
   "notification.mention": "{name} paminėjo tave",
   "notification.moderation-warning.learn_more": "Sužinoti daugiau",
+  "notification.moderation_warning": "Gavai prižiūrėjimo įspėjimą",
   "notification.moderation_warning.action_delete_statuses": "Kai kurie tavo įrašai buvo pašalintos.",
   "notification.moderation_warning.action_disable": "Tavo paskyra buvo išjungta.",
   "notification.moderation_warning.action_mark_statuses_as_sensitive": "Kai kurie tavo įrašai buvo pažymėtos kaip jautrios.",
diff --git a/app/javascript/mastodon/locales/nn.json b/app/javascript/mastodon/locales/nn.json
index 3316e7af811550..3711cc0ae33267 100644
--- a/app/javascript/mastodon/locales/nn.json
+++ b/app/javascript/mastodon/locales/nn.json
@@ -673,7 +673,7 @@
   "search.quick_action.account_search": "Profiler som samsvarer med {x}",
   "search.quick_action.go_to_account": "Gå til profil {x}",
   "search.quick_action.go_to_hashtag": "Gå til emneknagg {x}",
-  "search.quick_action.open_url": "Åpne URL i Mastodon",
+  "search.quick_action.open_url": "Opne adressa i Mastodon",
   "search.quick_action.status_search": "Innlegg som samsvarer med {x}",
   "search.search_or_paste": "Søk eller lim inn URL",
   "search_popout.full_text_search_disabled_message": "Ikkje tilgjengeleg på {domain}.",
diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json
index 1a6de083593bc2..b11daeaaa7e7b5 100644
--- a/app/javascript/mastodon/locales/pt-BR.json
+++ b/app/javascript/mastodon/locales/pt-BR.json
@@ -474,6 +474,7 @@
   "notification.follow_request": "{name} quer te seguir",
   "notification.mention": "{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.",
   "notification.moderation_warning.action_disable": "Sua conta foi desativada.",
   "notification.moderation_warning.action_mark_statuses_as_sensitive": "Algumas de suas publicações foram marcadas por ter conteúdo sensível.",
diff --git a/app/javascript/mastodon/locales/si.json b/app/javascript/mastodon/locales/si.json
index 4cb81a760c74ae..ccbface05ae031 100644
--- a/app/javascript/mastodon/locales/si.json
+++ b/app/javascript/mastodon/locales/si.json
@@ -18,6 +18,7 @@
   "account.edit_profile": "පැතිකඩ සංස්කරණය",
   "account.enable_notifications": "@{name} පළ කරන විට මට දැනුම් දෙන්න",
   "account.endorse": "පැතිකඩෙහි විශේෂාංගය",
+  "account.featured_tags.last_status_at": "අවසාන ලිපිය: {date}",
   "account.featured_tags.last_status_never": "ලිපි නැත",
   "account.follow": "අනුගමනය",
   "account.followers": "අනුගාමිකයින්",
@@ -104,6 +105,7 @@
   "compose_form.poll.duration": "මත විමසීමේ කාලය",
   "compose_form.poll.switch_to_multiple": "තේරීම් කිහිපයකට මත විමසුම වෙනස් කරන්න",
   "compose_form.poll.switch_to_single": "තනි තේරීමකට මත විමසුම වෙනස් කරන්න",
+  "compose_form.publish": "ප්‍රකාශනය",
   "compose_form.publish_form": "නව ලිපිය",
   "compose_form.spoiler.marked": "අන්තර්ගත අවවාදය ඉවත් කරන්න",
   "compose_form.spoiler.unmarked": "අන්තර්ගත අවවාදයක් එක් කරන්න",
@@ -154,6 +156,7 @@
   "empty_column.bookmarked_statuses": "ඔබ සතුව පොත්යොමු තබන ලද ලිපි කිසිවක් නැත. ඔබ පොත්යොමුවක් තබන විට, එය මෙහි දිස්වනු ඇත.",
   "empty_column.domain_blocks": "අවහිර කරන ලද වසම් නැත.",
   "empty_column.explore_statuses": "දැන් කිසිවක් නැඹුරු නොවේ. පසුව නැවත පරීක්ෂා කරන්න!",
+  "empty_column.favourited_statuses": "ඔබ සතුව ප්‍රියතම ලිපි කිසිවක් නැත. ඔබ යමකට ප්‍රිය කළ විට එය මෙහි පෙන්වනු ඇත.",
   "empty_column.follow_requests": "ඔබට තවමත් අනුගමන ඉල්ලීම් ලැබී නැත. ඉල්ලීමක් ලැබුණු විට, එය මෙහි පෙන්වනු ඇත.",
   "empty_column.home": "මුල් පිටුව හිස් ය! මෙය පිරවීමට බොහෝ පුද්ගලයින් අනුගමනය කරන්න.",
   "empty_column.lists": "ඔබට තවමත් ලැයිස්තු කිසිවක් නැත. ඔබ එකක් සාදන විට, එය මෙහි පෙන්වනු ඇත.",
@@ -205,6 +208,7 @@
   "interaction_modal.on_this_server": "මෙම සේවාදායකයෙහි",
   "interaction_modal.title.favourite": "{name}ගේ ලිපිය ප්‍රිය කරන්න",
   "interaction_modal.title.follow": "{name} අනුගමනය",
+  "interaction_modal.title.reply": "{name}ගේ ලිපියට පිළිතුරු",
   "intervals.full.days": "{number, plural, one {දවස් #} other {දවස් #}}",
   "intervals.full.hours": "{number, plural, one {පැය #} other {පැය #}}",
   "intervals.full.minutes": "{number, plural, one {විනාඩි #} other {විනාඩි #}}",
@@ -239,6 +243,7 @@
   "lists.delete": "ලැයිස්තුව මකන්න",
   "lists.edit": "ලැයිස්තුව සංස්කරණය",
   "lists.edit.submit": "සිරැසිය සංශෝධනය",
+  "lists.new.create": "එකතු",
   "lists.new.title_placeholder": "නව ලැයිස්තුවේ සිරැසිය",
   "lists.replies_policy.list": "ලැයිස්තුවේ සාමාජිකයින්",
   "lists.replies_policy.none": "කිසිවෙක් නැත",
@@ -266,6 +271,7 @@
   "navigation_bar.search": "සොයන්න",
   "navigation_bar.security": "ආරක්ෂාව",
   "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
+  "notification.favourite": "{name} ඔබගේ ලිපියට ප්‍රිය කළා",
   "notification.follow": "{name} ඔබව අනුගමනය කළා",
   "notification.mention": "{name} ඔබව සඳහන් කර ඇත",
   "notification.own_poll": "ඔබගේ මත විමසුම නිමයි",
@@ -395,6 +401,7 @@
   "status.admin_status": "මෙම ලිපිය මැදිහත්කරණ අතුරුමුහුණතෙහි අරින්න",
   "status.block": "@{name} අවහිර",
   "status.bookmark": "පොත්යොමුවක්",
+  "status.copy": "ලිපියට සබැඳියේ පිටපතක්",
   "status.delete": "මකන්න",
   "status.detailed_status": "විස්තරාත්මක සංවාද දැක්ම",
   "status.edit": "සංස්කරණය",
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 6c0fba259c35c7..ec6963517abdcb 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -282,6 +282,7 @@ ja:
         update_custom_emoji_html: "%{name}さんがカスタム絵文字 %{target}を更新しました"
         update_domain_block_html: "%{name}さんが%{target}のドメインブロックを更新しました"
         update_ip_block_html: "%{name} さんがIP %{target} のルールを更新しました"
+        update_report_html: "%{name}さんが通報 %{target} を更新しました"
         update_status_html: "%{name}さんが%{target}さんの投稿を更新しました"
         update_user_role_html: "%{name}さんがロール『%{target}』を変更しました"
       deleted_account: 削除されたアカウント
@@ -933,6 +934,7 @@ ja:
       delete: 削除
       edit_preset: プリセット警告文を編集
       empty: まだプリセット警告文が作成されていません。
+      title: プリセット警告文
     webhooks:
       add_new: エンドポイントを追加
       delete: 削除
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 8e32ed07bde719..f3d71bf6ebe2c9 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -291,6 +291,7 @@ lt:
         update_custom_emoji_html: "%{name} atnaujino jaustuką %{target}"
         update_domain_block_html: "%{name} atnaujino domeno bloką %{target}"
         update_ip_block_html: "%{name} pakeitė taisyklę IP %{target}"
+        update_report_html: "%{name} atnaujino ataskaitą %{target}"
         update_status_html: "%{name} atnaujino įrašą %{target}"
         update_user_role_html: "%{name} pakeitė %{target} vaidmenį"
       deleted_account: ištrinta paskyra
@@ -624,6 +625,7 @@ lt:
       add_new: Pridėti naują
       delete: Ištrinti
       edit_preset: Keisti įspėjimo nustatymus
+      title: Įspėjamieji numatytieji
     webhooks:
       description_html: "<strong>Webhook</strong> leidžia Mastodon siųsti <strong>realaus laiko pranešimus</strong> apie pasirinktus įvykius į tavo programą, kad programa galėtų <strong>automatiškai paleisti reakcijas</strong>."
       events: Įvykiai
diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index 94efdcb15a5f3c..d82c92c262a436 100644
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -461,13 +461,13 @@ nn:
         title: Importer domeneblokkeringar
       no_file: Inga fil vald
     follow_recommendations:
-      description_html: "<strong>Følgjeforslag hjelper nye brukarar å raskt finna interessant innhald</strong>. Om ein brukar ikkje har interagera nok med andre til å danne personlege følgjeforslag, vert disse kontiane føreslått i staden. Dei vert gjenkalkulert på dagleg basis ut frå ei blanding av dei konti med flest nylege engasjement og flest lokale følgjarar for eit gitt språk."
+      description_html: "<strong>Fylgjeforslag hjelper nye brukarar å finna interessant innhald raskt</strong>. Om ein brukar ikkje har samhandla nok med andre til å få tilpassa fylgjeforslag, blir desse kontoane føreslått i staden. Dei blir rekna ut på nytt kvar dag ut frå ei blanding av kva kontoar som har mykje nyleg aktivitet og høgast tal på fylgjarar på eit bestemt språk."
       language: For språk
       status: Status
       suppress: Demp følgjeforslag
       suppressed: Dempa
-      title: Følgjeforslag
-      unsuppress: Tilbakestill følgjeforslag
+      title: Fylgjeforslag
+      unsuppress: Nullstill fylgjeforslag
     instances:
       availability:
         description_html:
@@ -746,7 +746,7 @@ nn:
         preamble: Tilpasse web-grensesnittet.
         title: Utsjånad
       branding:
-        preamble: Profileringa av tenaren din skil den frå andre tenarar i nettverket. Informasjonen kan bli vist ulike stadar, til dømes i Mastodon sitt web-grensesnitt, i eigne applikasjonar, i førehandsvisningar på andre nettsider, i meldingsappar og så bortetter. På grunn av dette er det best å halde informasjonen enkel, kort og treffande.
+        preamble: Profileringa av tenaren din skil den frå andre tenarar i nettverket. Informasjonen kan bli vist ulike stader, til dømes i Mastodon sitt web-grensesnitt, i eigne applikasjonar, i førehandsvisningar på andre nettsider, i meldingsappar og så bortetter. På grunn av dette er det best at denne informasjonen er enkel, kort og treffande.
         title: Profilering
       captcha_enabled:
         desc_html: Dette baserer seg på eksterne skript frå hCaptcha, noko som kan vera eit tryggleiks- og personvernsproblem. <strong>I tillegg kan dette gjera registreringsprosessen monaleg mindre tilgjengeleg (særleg for folk med nedsett funksjonsevne)</strong>. Dette gjer at du bør du vurdera alternative tiltak, som til dømes godkjennings- eller invitasjonsbasert registrering.
@@ -759,7 +759,7 @@ nn:
         desc_html: Påverkar alle brukarar som ikkje har justert denne innstillinga sjølve
         title: Ikkje la brukarar indekserast av søkjemotorar som standard
       discovery:
-        follow_recommendations: Følgjeforslag
+        follow_recommendations: Fylgjeforslag
         preamble: Å framheva interessant innhald er vitalt i mottakinga av nye brukarar som ikkje nødvendigvis kjenner nokon på Mastodon. Kontroller korleis oppdagingsfunksjonane på tenaren din fungerar.
         profile_directory: Profilkatalog
         public_timelines: Offentlege tidsliner
@@ -1562,7 +1562,7 @@ nn:
     activity: Kontoaktivitet
     confirm_follow_selected_followers: Er du sikker på at du ynskjer å fylgja dei valde fylgjarane?
     confirm_remove_selected_followers: Er du sikker på at du ynskjer å fjerna dei valde fylgjarane?
-    confirm_remove_selected_follows: Er du sikker på at du ynskjer å fjerna det valde følgjet?
+    confirm_remove_selected_follows: Er du sikker på at du ikkje vil fylgja desse?
     dormant: I dvale
     follow_failure: Greidde ikkje fylgja alle kontoane du valde.
     follow_selected_followers: Følg valgte tilhengere
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 6b80edb24e60f3..8d3b53f777d630 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -285,6 +285,7 @@ pt-BR:
         update_custom_emoji_html: "%{name} atualizou o emoji %{target}"
         update_domain_block_html: "%{name} atualizou o bloqueio de domínio de %{target}"
         update_ip_block_html: "%{name} alterou a regra para o IP %{target}"
+        update_report_html: "%{name} atualizou o relatório %{target}"
         update_status_html: "%{name} atualizou a publicação de %{target}"
         update_user_role_html: "%{name} alterou o cargo %{target}"
       deleted_account: conta excluída
@@ -950,6 +951,7 @@ pt-BR:
       delete: Excluir
       edit_preset: Editar o aviso pré-definido
       empty: Você ainda não definiu nenhuma predefinição de alerta.
+      title: Predefinições de aviso
     webhooks:
       add_new: Adicionar endpoint
       delete: Excluir
diff --git a/config/locales/si.yml b/config/locales/si.yml
index 0f714ee146bbfe..85e242b630fe6c 100644
--- a/config/locales/si.yml
+++ b/config/locales/si.yml
@@ -66,7 +66,7 @@ si:
       inbox_url: එන ලිපි URL
       invite_request_text: එක්වීමට හේතුව
       invited_by: විසින් ආරාධනා කරන ලදී
-      ip: අ.ජා. කෙ. (IP)
+      ip: අ.ජා.කෙ. (IP)
       joined: එක් වූ දිනය
       location:
         all: සියල්ල
@@ -87,7 +87,7 @@ si:
         title: මැදිහත්කරණය
       moderation_notes: මැදිහත්කරණ සටහන්
       most_recent_activity: වඩාත්ම මෑත ක්රියාකාරිත්වය
-      most_recent_ip: මෑත අ.ජා.කෙ. (IP)
+      most_recent_ip: මෑත අ.ජා.කෙ.
       no_account_selected: කිසිවක් තෝරා නොගත් බැවින් ගිණුම් කිසිවක් වෙනස් කර නැත
       no_limits_imposed: සීමාවන් පනවා නැත
       not_subscribed: දායක වී නැත
@@ -160,7 +160,7 @@ si:
         create_custom_emoji: අභිරුචි ඉමොජි සාදන්න
         create_domain_allow: වසමකට ඉඩදීම සාදන්න
         create_email_domain_block: ඊමේල් ඩොමේන් බ්ලොක් එකක් සාදන්න
-        create_ip_block: අ.ජා. කෙ. (IP) නීතියක් සාදන්න
+        create_ip_block: අ.ජා.කෙ. නීතියක් සාදන්න
         create_unavailable_domain: ලබා ගත නොහැකි වසම සාදන්න
         create_user_role: භූමිකාව සාදන්න
         demote_user: පරිශීලකයා පහත් කරන්න
@@ -473,7 +473,7 @@ si:
       new:
         title: නව අ.ජා.කෙ. නීතියක් සාදන්න
       no_ip_block_selected: IP රීති කිසිවක් තෝරා නොගත් බැවින් වෙනස් කර නැත
-      title: අ.ජා. කෙ. (IP) නීති
+      title: අ.ජා.කෙ. (IP) නීති
     relationships:
       title: "%{acct}හි සබඳතා"
     relays:
@@ -1239,7 +1239,7 @@ si:
     current_session: වත්මන් වාරය
     description: "%{platform} හි %{browser}"
     explanation: ඔබගේ මාස්ටඩන් ගිණුමට පිවිසීම සඳහා භාවිතා කර තිබෙන අතිරික්සු.
-    ip: අ.ජා. කෙ. (IP)
+    ip: අ.ජා.කෙ.
     platforms:
       adobe_air: ඇඩෝබි එයාර්
       android: ඇන්ඩ්‍රොයිඩ්
@@ -1399,7 +1399,7 @@ si:
       details: 'ප්‍රවේශයට අදාළ විස්තර:'
       explanation: ඔබගේ ගිණුමට නව අ.ජා.කෙ. (IP) ලිපිනයකින් ප්‍රවේශයක් අනාවරණය වී ඇත.
       further_actions_html: මේ ඔබ නොවේ නම්, වහාම %{action}. ඔබගේ ගිණුම සුරක්‍ෂිතව තබා ගැනීමට ද්වි-සාධකය සබල කරන්න.
-      subject: ඔබගේ ගිණුමට නව අ.ජා.කෙ. (IP) ලිපිනයකින් ප්‍රවේශ වී ඇත
+      subject: ඔබගේ ගිණුමට නව අ.ජා.කෙ. ලිපිනයකින් ප්‍රවේශ වී ඇත
       title: නව ප්‍රවේශයක්
     warning:
       appeal: අභියාචනයක් ඉදිරිපත් කරන්න
diff --git a/config/locales/simple_form.lt.yml b/config/locales/simple_form.lt.yml
index 789121be42e769..feec37ae003676 100644
--- a/config/locales/simple_form.lt.yml
+++ b/config/locales/simple_form.lt.yml
@@ -74,8 +74,10 @@ lt:
           warn: Slėpti filtruojamą turinį po įspėjimu, paminint filtro pavadinimą
       form_admin_settings:
         activity_api_enabled: Vietinių paskelbtų įrašų, aktyvių naudotojų ir naujų registracijų skaičiai kas savaitę
+        app_icon: WEBP, PNG, GIF arba JPG. Pakeičia numatytąją programos piktogramą mobiliuosiuose įrenginiuose pasirinktine piktograma.
         backups_retention_period: Naudotojai gali generuoti savo įrašų archyvus, kuriuos vėliau galės atsisiųsti. Nustačius teigiamą reikšmę, šie archyvai po nurodyto dienų skaičiaus bus automatiškai ištrinti iš saugyklos.
         content_cache_retention_period: Visi įrašai iš kitų serverių (įskaitant pakėlimus ir atsakymus) bus ištrinti po nurodyto dienų skaičiaus, neatsižvelgiant į bet kokią vietinio naudotojo sąveiką su tais įrašais. Tai taikoma ir tiems įrašams, kuriuos vietinis naudotojas yra pažymėjęs kaip žymes ar mėgstamus. Privačios paminėjimai tarp naudotojų iš skirtingų instancijų taip pat bus prarastos ir jų bus neįmanoma atkurti. Šis nustatymas skirtas naudoti ypatingos paskirties instancijose, o įgyvendinus jį bendram naudojimui, pažeidžiami daugelio naudotojų lūkesčiai.
+        favicon: WEBP, PNG, GIF arba JPG. Pakeičia numatytąją Mastodon svetaines piktogramą pasirinktine piktograma.
         mascot: Pakeičia išplėstinės žiniatinklio sąsajos iliustraciją.
         media_cache_retention_period: Nuotolinių naudotojų įrašytų įrašų medijos failai talpinami tavo serveryje. Nustačius teigiamą reikšmę, medijos bus ištrinamos po nurodyto dienų skaičiaus. Jei medijos duomenų bus paprašyta po to, kai jie bus ištrinti, jie bus atsiųsti iš naujo, jei šaltinio turinys vis dar prieinamas. Dėl apribojimų, susijusių su nuorodų peržiūros kortelių apklausos dažnumu trečiųjų šalių svetainėse, rekomenduojama nustatyti šią reikšmę ne trumpesnę kaip 14 dienų, kitaip nuorodų peržiūros kortelės nebus atnaujinamos pagal pareikalavimą iki to laiko.
         peers_api_enabled: Domenų pavadinimų sąrašas, su kuriais šis serveris susidūrė fediverse. Čia nėra duomenų apie tai, ar tu bendrauji su tam tikru serveriu, tik apie tai, kad tavo serveris apie jį žino. Tai naudojama tarnybose, kurios renka federacijos statistiką bendrąja prasme.
diff --git a/config/locales/simple_form.nn.yml b/config/locales/simple_form.nn.yml
index a93a803221e1b9..a200e1206e38e1 100644
--- a/config/locales/simple_form.nn.yml
+++ b/config/locales/simple_form.nn.yml
@@ -8,8 +8,8 @@ nn:
         fields: Heimesida di, pronomen, alder, eller kva du måtte ynskje.
         indexable: Dei offentlege innlegga dine kan dukka opp i søkjeresultat på Mastodon. Folk som har reagert på oinnlegga dine kan uansett søkja gjennom dei.
         note: 'Du kan @nemne folk eller #emneknaggar.'
-        show_collections: Andre kan sjå kven du følgjer og kven som følgjer deg. Dei du følgjer kan alltid sjå at du følgjer dei.
-        unlocked: Alle kan følgje deg utan å måtte spørje om det. Vel bort om du vil gå gjennom førespurnadar om å følgje deg og seie ja eller nei.
+        show_collections: Andre kan sjå kven du fylgjer og kven som fylgjer deg. Dei du fylgjer kan alltid sjå at du fylgjer dei.
+        unlocked: Alle kan fylgja deg utan å måtta be om det. Vel bort dersom du vil gå gjennom førespurnader om å fylgja deg og seia ja eller nei til kvar av dei.
       account_alias:
         acct: Angi brukarnamn@domene til brukaren du ynskjer å flytta frå
       account_migration:
@@ -148,7 +148,7 @@ nn:
           name: Merkelapp
           value: Innhald
         indexable: Ta med offentlege innlegg i søkjeresultat
-        show_collections: Vis følgjer og følgjare på profilen
+        show_collections: Vis dei du fylgjer og dei som fylgjer deg på profilen din
         unlocked: Godta nye følgjare automatisk
       account_alias:
         acct: Brukarnamnet på den gamle kontoen
diff --git a/config/locales/simple_form.si.yml b/config/locales/simple_form.si.yml
index eb41d263bc52be..a81ba27bb913f2 100644
--- a/config/locales/simple_form.si.yml
+++ b/config/locales/simple_form.si.yml
@@ -190,7 +190,7 @@ si:
         text: ඔබට එක් වීමට අවශ්‍ය ඇයි?
       ip_block:
         comment: අදහස
-        ip: අ.ජා. කෙ. (IP)
+        ip: අ.ජා.කෙ. (IP)
         severities:
           no_access: ප්‍රවේශය අවහිර කරන්න
           sign_up_requires_approval: ලියාපදිංචි වීම සීමා කරන්න
diff --git a/config/locales/simple_form.uk.yml b/config/locales/simple_form.uk.yml
index 1d69f5c57994ca..11337f2f61f689 100644
--- a/config/locales/simple_form.uk.yml
+++ b/config/locales/simple_form.uk.yml
@@ -77,10 +77,15 @@ uk:
           warn: Сховати відфільтрований вміст за попередженням, у якому вказано заголовок фільтра
       form_admin_settings:
         activity_api_enabled: Кількість локальних опублікованих дописів, активних і нових користувачів у тижневих розрізах
+        app_icon: WEBP, PNG, GIF або JPG. Замінює іконку програми за замовчуванням на мобільних пристроях на власну іконку.
+        backups_retention_period: Користувачі мають можливість створювати архіви своїх дописів, щоб завантажити їх пізніше. Якщо встановлено додатне значення, ці архіви будуть автоматично видалені з вашого сховища через вказану кількість днів.
         bootstrap_timeline_accounts: Ці облікові записи будуть закріплені в топі пропозицій для нових користувачів.
         closed_registrations_message: Показується, коли реєстрація закрита
+        content_cache_retention_period: Усі дописи з інших серверів (включно з коментарями та відповідями) будуть видалені через певну кількість днів, незважаючи на будь-яку локальну взаємодію користувачів з цими дописами. Сюди входять дописи, які локальний користувач позначив як закладки або вибране. Приватні згадки між користувачами з різних інстанцій також будуть втрачені і не підлягатимуть відновленню. Використання цього параметра призначено для екземплярів спеціального призначення і порушує багато очікувань користувачів, якщо його застосовано для загального використання.
         custom_css: Ви можете застосувати користувацькі стилі у вебверсії Mastodon.
+        favicon: WEBP, PNG, GIF або JPG. Замінює стандартну піктограму Mastodon на власну піктограму.
         mascot: Змінює ілюстрацію в розширеному вебінтерфейсі.
+        media_cache_retention_period: Медіафайли з дописів віддалених користувачів кешуються на вашому сервері. Якщо встановлено додатне значення, медіа буде видалено через вказану кількість днів. Якщо медіа-дані будуть запитані після видалення, вони будуть завантажені повторно, якщо вихідний вміст все ще доступний. Через обмеження на частоту опитування карток попереднього перегляду посилань на сторонніх сайтах, рекомендується встановити це значення не менше 14 днів, інакше картки попереднього перегляду посилань не будуть оновлюватися на вимогу раніше цього часу.
         peers_api_enabled: Список доменів імен цього сервера з'явився у федівсесвіті. Сюди не входять дані чи ви пов'язані федерацією з цим сервером, а лише відомості, що вашому серверу відомо про нього. Його використовують служби, які збирають загальну статистику про федерації.
         profile_directory: У каталозі профілів перераховані всі користувачі, які погодились бути видимими.
         require_invite_text: Якщо реєстрація вимагає власноручного затвердження, зробіть текстове поле «Чому ви хочете приєднатися?» обов'язковим, а не додатковим
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 3ca4f097338e55..bafcd30dee6608 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -934,6 +934,7 @@ th:
       delete: ลบ
       edit_preset: แก้ไขคำเตือนที่ตั้งไว้ล่วงหน้า
       empty: คุณยังไม่ได้กำหนดคำเตือนที่ตั้งไว้ล่วงหน้าใด ๆ
+      title: คำเตือนที่ตั้งไว้ล่วงหน้า
     webhooks:
       add_new: เพิ่มปลายทาง
       delete: ลบ
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 5baaa93870317d..c4f4a263801086 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -291,6 +291,7 @@ uk:
         update_custom_emoji_html: "%{name} оновлює емодзі %{target}"
         update_domain_block_html: "%{name} оновлює блокування домену для %{target}"
         update_ip_block_html: "%{name} змінює правило для IP %{target}"
+        update_report_html: "%{name} оновлений звіт %{target}"
         update_status_html: "%{name} оновлює допис %{target}"
         update_user_role_html: "%{name} змінює роль %{target}"
       deleted_account: видалений обліковий запис
@@ -984,6 +985,7 @@ uk:
       delete: Видалити
       edit_preset: Редагувати шаблон попередження
       empty: Ви ще не визначили жодних попереджень.
+      title: Попереджувальні пресети
     webhooks:
       add_new: Додати кінцеву точку
       delete: Видалити

From 15480643e11b32536d9da736ad5cf357ccfb8405 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 27 May 2024 11:36:59 +0200
Subject: [PATCH 1116/2191] chore(deps): update dependency @types/react to
 v18.3.3 (#30441)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index ad07e4e426b986..54cd764e683773 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3976,12 +3976,12 @@ __metadata:
   linkType: hard
 
 "@types/react@npm:*, @types/react@npm:16 || 17 || 18, @types/react@npm:>=16.9.11, @types/react@npm:^18.2.7":
-  version: 18.3.2
-  resolution: "@types/react@npm:18.3.2"
+  version: 18.3.3
+  resolution: "@types/react@npm:18.3.3"
   dependencies:
     "@types/prop-types": "npm:*"
     csstype: "npm:^3.0.2"
-  checksum: 10c0/9fb2f1fcf7e889ee4ea7c3c5978df595c66e770e5fd3a245dbdd2589b9b911524c11dab25a6275d8af4e336e4cb5fa850d447884b84c335a187a338c89df99ba
+  checksum: 10c0/fe455f805c5da13b89964c3d68060cebd43e73ec15001a68b34634604a78140e6fc202f3f61679b9d809dde6d7a7c2cb3ed51e0fd1462557911db09879b55114
   languageName: node
   linkType: hard
 

From 0ef5dc2b2047361c79fde8a3ee3c4683d7541034 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 27 May 2024 11:40:37 +0200
Subject: [PATCH 1117/2191] fix(deps): update dependency jsdom to v24.1.0
 (#30431)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 59 +++++++++++++++++++++++++++++++------------------------
 1 file changed, 33 insertions(+), 26 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 54cd764e683773..aa0b26c02855da 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9392,13 +9392,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"http-proxy-agent@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "http-proxy-agent@npm:7.0.0"
+"http-proxy-agent@npm:^7.0.0, http-proxy-agent@npm:^7.0.2":
+  version: 7.0.2
+  resolution: "http-proxy-agent@npm:7.0.2"
   dependencies:
     agent-base: "npm:^7.1.0"
     debug: "npm:^4.3.4"
-  checksum: 10c0/a11574ff39436cee3c7bc67f259444097b09474605846ddd8edf0bf4ad8644be8533db1aa463426e376865047d05dc22755e638632819317c0c2f1b2196657c8
+  checksum: 10c0/4207b06a4580fb85dd6dff521f0abf6db517489e70863dca1a0291daa7f2d3d2d6015a57bd702af068ea5cf9f1f6ff72314f5f5b4228d299c0904135d2aef921
   languageName: node
   linkType: hard
 
@@ -9442,13 +9442,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"https-proxy-agent@npm:^7.0.1, https-proxy-agent@npm:^7.0.2":
-  version: 7.0.2
-  resolution: "https-proxy-agent@npm:7.0.2"
+"https-proxy-agent@npm:^7.0.1, https-proxy-agent@npm:^7.0.4":
+  version: 7.0.4
+  resolution: "https-proxy-agent@npm:7.0.4"
   dependencies:
     agent-base: "npm:^7.0.2"
     debug: "npm:4"
-  checksum: 10c0/7735eb90073db087e7e79312e3d97c8c04baf7ea7ca7b013382b6a45abbaa61b281041a98f4e13c8c80d88f843785bcc84ba189165b4b4087b1e3496ba656d77
+  checksum: 10c0/bc4f7c38da32a5fc622450b6cb49a24ff596f9bd48dcedb52d2da3fa1c1a80e100fb506bd59b326c012f21c863c69b275c23de1a01d0b84db396822fdf25e52b
   languageName: node
   linkType: hard
 
@@ -11010,36 +11010,36 @@ __metadata:
   linkType: hard
 
 "jsdom@npm:^24.0.0":
-  version: 24.0.0
-  resolution: "jsdom@npm:24.0.0"
+  version: 24.1.0
+  resolution: "jsdom@npm:24.1.0"
   dependencies:
     cssstyle: "npm:^4.0.1"
     data-urls: "npm:^5.0.0"
     decimal.js: "npm:^10.4.3"
     form-data: "npm:^4.0.0"
     html-encoding-sniffer: "npm:^4.0.0"
-    http-proxy-agent: "npm:^7.0.0"
-    https-proxy-agent: "npm:^7.0.2"
+    http-proxy-agent: "npm:^7.0.2"
+    https-proxy-agent: "npm:^7.0.4"
     is-potential-custom-element-name: "npm:^1.0.1"
-    nwsapi: "npm:^2.2.7"
+    nwsapi: "npm:^2.2.10"
     parse5: "npm:^7.1.2"
-    rrweb-cssom: "npm:^0.6.0"
+    rrweb-cssom: "npm:^0.7.0"
     saxes: "npm:^6.0.0"
     symbol-tree: "npm:^3.2.4"
-    tough-cookie: "npm:^4.1.3"
+    tough-cookie: "npm:^4.1.4"
     w3c-xmlserializer: "npm:^5.0.0"
     webidl-conversions: "npm:^7.0.0"
     whatwg-encoding: "npm:^3.1.1"
     whatwg-mimetype: "npm:^4.0.0"
     whatwg-url: "npm:^14.0.0"
-    ws: "npm:^8.16.0"
+    ws: "npm:^8.17.0"
     xml-name-validator: "npm:^5.0.0"
   peerDependencies:
     canvas: ^2.11.2
   peerDependenciesMeta:
     canvas:
       optional: true
-  checksum: 10c0/7b35043d7af39ad6dcaef0fa5679d8c8a94c6c9b6cc4a79222b7c9987d57ab7150c50856684ae56b473ab28c7d82aec0fb7ca19dcbd4c3f46683c807d717a3af
+  checksum: 10c0/34eadd8a7ae20c1505abe7a0f3988b2f0881cce7e27d75c4f5224f440f81f8ac08f4f449695b0f4178f048ed1c1709f3594e9d3f2fe0406c28e8da6eddd44f5a
   languageName: node
   linkType: hard
 
@@ -12332,10 +12332,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"nwsapi@npm:^2.2.2, nwsapi@npm:^2.2.7":
-  version: 2.2.7
-  resolution: "nwsapi@npm:2.2.7"
-  checksum: 10c0/44be198adae99208487a1c886c0a3712264f7bbafa44368ad96c003512fed2753d4e22890ca1e6edb2690c3456a169f2a3c33bfacde1905cf3bf01c7722464db
+"nwsapi@npm:^2.2.10, nwsapi@npm:^2.2.2":
+  version: 2.2.10
+  resolution: "nwsapi@npm:2.2.10"
+  checksum: 10c0/43dfa150387bd2a578e37556d0ae3330d5617f99e5a7b64e3400d4c2785620762aa6169caf8f5fbce17b7ef29c372060b602594320c374fba0a39da4163d77ed
   languageName: node
   linkType: hard
 
@@ -15264,6 +15264,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"rrweb-cssom@npm:^0.7.0":
+  version: 0.7.0
+  resolution: "rrweb-cssom@npm:0.7.0"
+  checksum: 10c0/278350b1f383f76db20e37394361b709740bd4f5f27f924e1c3c3fdd7112b2ae37ed9bc7cee63776f7df395b9b0f644d1f8be104990e3028d276a3288cd7e564
+  languageName: node
+  linkType: hard
+
 "run-parallel@npm:^1.1.9":
   version: 1.2.0
   resolution: "run-parallel@npm:1.2.0"
@@ -16933,15 +16940,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tough-cookie@npm:^4.1.2, tough-cookie@npm:^4.1.3":
-  version: 4.1.3
-  resolution: "tough-cookie@npm:4.1.3"
+"tough-cookie@npm:^4.1.2, tough-cookie@npm:^4.1.4":
+  version: 4.1.4
+  resolution: "tough-cookie@npm:4.1.4"
   dependencies:
     psl: "npm:^1.1.33"
     punycode: "npm:^2.1.1"
     universalify: "npm:^0.2.0"
     url-parse: "npm:^1.5.3"
-  checksum: 10c0/4fc0433a0cba370d57c4b240f30440c848906dee3180bb6e85033143c2726d322e7e4614abb51d42d111ebec119c4876ed8d7247d4113563033eebbc1739c831
+  checksum: 10c0/aca7ff96054f367d53d1e813e62ceb7dd2eda25d7752058a74d64b7266fd07be75908f3753a32ccf866a2f997604b414cfb1916d6e7f69bc64d9d9939b0d6c45
   languageName: node
   linkType: hard
 
@@ -18355,7 +18362,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ws@npm:^8.11.0, ws@npm:^8.12.1, ws@npm:^8.16.0":
+"ws@npm:^8.11.0, ws@npm:^8.12.1, ws@npm:^8.17.0":
   version: 8.17.0
   resolution: "ws@npm:8.17.0"
   peerDependencies:

From 87156f57b5b7b71be8a40e9cc568a87583b55144 Mon Sep 17 00:00:00 2001
From: Nick Schonning <nschonni@gmail.com>
Date: Mon, 27 May 2024 05:41:45 -0400
Subject: [PATCH 1118/2191] Enable Style/StringConcatenation (#30428)

---
 .rubocop_todo.yml                | 6 ------
 config/initializers/paperclip.rb | 4 ++--
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 064f622085af6f..a70caad8c51e2c 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -176,12 +176,6 @@ Style/SafeNavigation:
   Exclude:
     - 'app/models/concerns/account/finder_concern.rb'
 
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: Mode.
-Style/StringConcatenation:
-  Exclude:
-    - 'config/initializers/paperclip.rb'
-
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: WordRegex.
 # SupportedStyles: percent, brackets
diff --git a/config/initializers/paperclip.rb b/config/initializers/paperclip.rb
index b54fc6cf0c1764..5b9365a5305be7 100644
--- a/config/initializers/paperclip.rb
+++ b/config/initializers/paperclip.rb
@@ -13,7 +13,7 @@
 
 Paperclip.interpolates :prefix_path do |attachment, _style|
   if attachment.storage_schema_version >= 1 && attachment.instance.respond_to?(:local?) && !attachment.instance.local?
-    'cache' + File::SEPARATOR
+    "cache#{File::SEPARATOR}"
   else
     ''
   end
@@ -159,7 +159,7 @@ def copy_to_local_file(style, local_dest_path)
   Paperclip::Attachment.default_options.merge!(
     storage: :filesystem,
     path: File.join(ENV.fetch('PAPERCLIP_ROOT_PATH', File.join(':rails_root', 'public', 'system')), ':prefix_path:class', ':attachment', ':id_partition', ':style', ':filename'),
-    url: ENV.fetch('PAPERCLIP_ROOT_URL', '/system') + '/:prefix_url:class/:attachment/:id_partition/:style/:filename'
+    url: "#{ENV.fetch('PAPERCLIP_ROOT_URL', '/system')}/:prefix_url:class/:attachment/:id_partition/:style/:filename"
   )
 end
 

From c61e356475cf5df85f067a951abf404b93795f19 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 27 May 2024 05:49:44 -0400
Subject: [PATCH 1119/2191] Add `Status::MEDIA_ATTACHMENTS_LIMIT` configuration
 constant (#30433)

---
 app/lib/activitypub/activity/create.rb                    | 4 ++--
 app/models/status.rb                                      | 2 ++
 app/serializers/rest/instance_serializer.rb               | 2 +-
 app/serializers/rest/v1/instance_serializer.rb            | 2 +-
 app/services/activitypub/process_status_update_service.rb | 2 +-
 app/services/post_status_service.rb                       | 4 ++--
 app/services/update_status_service.rb                     | 4 ++--
 spec/requests/api/v2/instance_spec.rb                     | 2 +-
 spec/services/post_status_service_spec.rb                 | 5 +++--
 9 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb
index 85195f4c395e44..7ec7e84bd16200 100644
--- a/app/lib/activitypub/activity/create.rb
+++ b/app/lib/activitypub/activity/create.rb
@@ -110,7 +110,7 @@ def find_existing_status
   def process_status_params
     @status_parser = ActivityPub::Parser::StatusParser.new(@json, followers_collection: @account.followers_url, object: @object)
 
-    attachment_ids = process_attachments.take(4).map(&:id)
+    attachment_ids = process_attachments.take(Status::MEDIA_ATTACHMENTS_LIMIT).map(&:id)
 
     @params = {
       uri: @status_parser.uri,
@@ -260,7 +260,7 @@ def process_attachments
     as_array(@object['attachment']).each do |attachment|
       media_attachment_parser = ActivityPub::Parser::MediaAttachmentParser.new(attachment)
 
-      next if media_attachment_parser.remote_url.blank? || media_attachments.size >= 4
+      next if media_attachment_parser.remote_url.blank? || media_attachments.size >= Status::MEDIA_ATTACHMENTS_LIMIT
 
       begin
         media_attachment = MediaAttachment.create(
diff --git a/app/models/status.rb b/app/models/status.rb
index 72a8d6c40e7c5d..9d09fa5fee10c5 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -39,6 +39,8 @@ class Status < ApplicationRecord
   include Status::SnapshotConcern
   include Status::ThreadingConcern
 
+  MEDIA_ATTACHMENTS_LIMIT = 4
+
   rate_limit by: :account, family: :statuses
 
   self.discard_column = :deleted_at
diff --git a/app/serializers/rest/instance_serializer.rb b/app/serializers/rest/instance_serializer.rb
index 42b73f4387cf11..8df79db6c774fd 100644
--- a/app/serializers/rest/instance_serializer.rb
+++ b/app/serializers/rest/instance_serializer.rb
@@ -59,7 +59,7 @@ def configuration
 
       statuses: {
         max_characters: StatusLengthValidator::MAX_CHARS,
-        max_media_attachments: 4,
+        max_media_attachments: Status::MEDIA_ATTACHMENTS_LIMIT,
         characters_reserved_per_url: StatusLengthValidator::URL_PLACEHOLDER_CHARS,
       },
 
diff --git a/app/serializers/rest/v1/instance_serializer.rb b/app/serializers/rest/v1/instance_serializer.rb
index fdf939cfc34998..636925b973f23d 100644
--- a/app/serializers/rest/v1/instance_serializer.rb
+++ b/app/serializers/rest/v1/instance_serializer.rb
@@ -64,7 +64,7 @@ def configuration
 
       statuses: {
         max_characters: StatusLengthValidator::MAX_CHARS,
-        max_media_attachments: 4,
+        max_media_attachments: Status::MEDIA_ATTACHMENTS_LIMIT,
         characters_reserved_per_url: StatusLengthValidator::URL_PLACEHOLDER_CHARS,
       },
 
diff --git a/app/services/activitypub/process_status_update_service.rb b/app/services/activitypub/process_status_update_service.rb
index fb2b33114ed47f..1dbed27f28db3e 100644
--- a/app/services/activitypub/process_status_update_service.rb
+++ b/app/services/activitypub/process_status_update_service.rb
@@ -73,7 +73,7 @@ def update_media_attachments!
     as_array(@json['attachment']).each do |attachment|
       media_attachment_parser = ActivityPub::Parser::MediaAttachmentParser.new(attachment)
 
-      next if media_attachment_parser.remote_url.blank? || @next_media_attachments.size > 4
+      next if media_attachment_parser.remote_url.blank? || @next_media_attachments.size > Status::MEDIA_ATTACHMENTS_LIMIT
 
       begin
         media_attachment   = previous_media_attachments.find { |previous_media_attachment| previous_media_attachment.remote_url == media_attachment_parser.remote_url }
diff --git a/app/services/post_status_service.rb b/app/services/post_status_service.rb
index 22a6a24afd2e23..83a93181709b6c 100644
--- a/app/services/post_status_service.rb
+++ b/app/services/post_status_service.rb
@@ -130,9 +130,9 @@ def validate_media!
       return
     end
 
-    raise Mastodon::ValidationError, I18n.t('media_attachments.validations.too_many') if @options[:media_ids].size > 4 || @options[:poll].present?
+    raise Mastodon::ValidationError, I18n.t('media_attachments.validations.too_many') if @options[:media_ids].size > Status::MEDIA_ATTACHMENTS_LIMIT || @options[:poll].present?
 
-    @media = @account.media_attachments.where(status_id: nil).where(id: @options[:media_ids].take(4).map(&:to_i))
+    @media = @account.media_attachments.where(status_id: nil).where(id: @options[:media_ids].take(Status::MEDIA_ATTACHMENTS_LIMIT).map(&:to_i))
 
     raise Mastodon::ValidationError, I18n.t('media_attachments.validations.images_and_video') if @media.size > 1 && @media.find(&:audio_or_video?)
     raise Mastodon::ValidationError, I18n.t('media_attachments.validations.not_ready') if @media.any?(&:not_processed?)
diff --git a/app/services/update_status_service.rb b/app/services/update_status_service.rb
index cdfe283659ca0f..dc7d177e2d1ef2 100644
--- a/app/services/update_status_service.rb
+++ b/app/services/update_status_service.rb
@@ -69,9 +69,9 @@ def update_media_attachments!
   def validate_media!
     return [] if @options[:media_ids].blank? || !@options[:media_ids].is_a?(Enumerable)
 
-    raise Mastodon::ValidationError, I18n.t('media_attachments.validations.too_many') if @options[:media_ids].size > 4 || @options[:poll].present?
+    raise Mastodon::ValidationError, I18n.t('media_attachments.validations.too_many') if @options[:media_ids].size > Status::MEDIA_ATTACHMENTS_LIMIT || @options[:poll].present?
 
-    media_attachments = @status.account.media_attachments.where(status_id: [nil, @status.id]).where(scheduled_status_id: nil).where(id: @options[:media_ids].take(4).map(&:to_i)).to_a
+    media_attachments = @status.account.media_attachments.where(status_id: [nil, @status.id]).where(scheduled_status_id: nil).where(id: @options[:media_ids].take(Status::MEDIA_ATTACHMENTS_LIMIT).map(&:to_i)).to_a
 
     raise Mastodon::ValidationError, I18n.t('media_attachments.validations.images_and_video') if media_attachments.size > 1 && media_attachments.find(&:audio_or_video?)
     raise Mastodon::ValidationError, I18n.t('media_attachments.validations.not_ready') if media_attachments.any?(&:not_processed?)
diff --git a/spec/requests/api/v2/instance_spec.rb b/spec/requests/api/v2/instance_spec.rb
index c5c6a26f49e26b..5c464f09a7d06e 100644
--- a/spec/requests/api/v2/instance_spec.rb
+++ b/spec/requests/api/v2/instance_spec.rb
@@ -45,7 +45,7 @@ def include_configuration_limits
           ),
           statuses: include(
             max_characters: StatusLengthValidator::MAX_CHARS,
-            max_media_attachments: 4 # TODO, move to constant somewhere
+            max_media_attachments: Status::MEDIA_ATTACHMENTS_LIMIT
           ),
           polls: include(
             max_options: PollValidator::MAX_OPTIONS
diff --git a/spec/services/post_status_service_spec.rb b/spec/services/post_status_service_spec.rb
index 18891bf118646a..11bf4c30ea3adf 100644
--- a/spec/services/post_status_service_spec.rb
+++ b/spec/services/post_status_service_spec.rb
@@ -228,14 +228,15 @@
     expect(media.reload.status).to be_nil
   end
 
-  it 'does not allow attaching more than 4 files' do
+  it 'does not allow attaching more files than configured limit' do
+    stub_const('Status::MEDIA_ATTACHMENTS_LIMIT', 1)
     account = Fabricate(:account)
 
     expect do
       subject.call(
         account,
         text: 'test status update',
-        media_ids: Array.new(5) { Fabricate(:media_attachment, account: account) }.map(&:id)
+        media_ids: Array.new(2) { Fabricate(:media_attachment, account: account) }.map(&:id)
       )
     end.to raise_error(
       Mastodon::ValidationError,

From ed99923138311fa07d4185a9132c72e618fd21fd Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 27 May 2024 11:57:19 +0200
Subject: [PATCH 1120/2191] chore(deps): update eslint (non-major) (#30444)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 package.json |   2 +-
 yarn.lock    | 197 ++++++++++++++++++---------------------------------
 2 files changed, 70 insertions(+), 129 deletions(-)

diff --git a/package.json b/package.json
index f38076d4c6cca8..f84d45c32ec3c4 100644
--- a/package.json
+++ b/package.json
@@ -178,7 +178,7 @@
     "eslint-plugin-import": "~2.29.0",
     "eslint-plugin-jsdoc": "^48.0.0",
     "eslint-plugin-jsx-a11y": "~6.8.0",
-    "eslint-plugin-promise": "~6.1.1",
+    "eslint-plugin-promise": "~6.2.0",
     "eslint-plugin-react": "^7.33.2",
     "eslint-plugin-react-hooks": "^4.6.0",
     "husky": "^9.0.11",
diff --git a/yarn.lock b/yarn.lock
index aa0b26c02855da..da5bf1dca25293 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2248,16 +2248,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@formatjs/ecma402-abstract@npm:1.18.2":
-  version: 1.18.2
-  resolution: "@formatjs/ecma402-abstract@npm:1.18.2"
-  dependencies:
-    "@formatjs/intl-localematcher": "npm:0.5.4"
-    tslib: "npm:^2.4.0"
-  checksum: 10c0/87afb37dd937555e712ca85d5142a9083d617c491d1dddf8d660fdfb6186272d2bc75b78809b076388d26f016200c8bddbce73281fd707eb899da2bf3bc9b7ca
-  languageName: node
-  linkType: hard
-
 "@formatjs/ecma402-abstract@npm:2.0.0":
   version: 2.0.0
   resolution: "@formatjs/ecma402-abstract@npm:2.0.0"
@@ -2277,17 +2267,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@formatjs/icu-messageformat-parser@npm:2.7.6":
-  version: 2.7.6
-  resolution: "@formatjs/icu-messageformat-parser@npm:2.7.6"
-  dependencies:
-    "@formatjs/ecma402-abstract": "npm:1.18.2"
-    "@formatjs/icu-skeleton-parser": "npm:1.8.0"
-    tslib: "npm:^2.4.0"
-  checksum: 10c0/9fc72c2075333a969601e2be4260638940b1abefd1a5fc15b93b0b10d2319c9df5778aa51fc2a173ce66ca5e8a47b4b64caca85a32d0eb6095e16e8d65cb4b00
-  languageName: node
-  linkType: hard
-
 "@formatjs/icu-messageformat-parser@npm:2.7.8":
   version: 2.7.8
   resolution: "@formatjs/icu-messageformat-parser@npm:2.7.8"
@@ -2299,16 +2278,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@formatjs/icu-skeleton-parser@npm:1.8.0":
-  version: 1.8.0
-  resolution: "@formatjs/icu-skeleton-parser@npm:1.8.0"
-  dependencies:
-    "@formatjs/ecma402-abstract": "npm:1.18.2"
-    tslib: "npm:^2.4.0"
-  checksum: 10c0/10956732d70cc67049d216410b5dc3ef048935d1ea2ae76f5755bb9d0243af37ddeabd5d140ddbf5f6c7047068c3d02a05f93c68a89cedfaf7488d5062885ea4
-  languageName: node
-  linkType: hard
-
 "@formatjs/icu-skeleton-parser@npm:1.8.2":
   version: 1.8.2
   resolution: "@formatjs/icu-skeleton-parser@npm:1.8.2"
@@ -2381,26 +2350,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@formatjs/ts-transformer@npm:3.13.12":
-  version: 3.13.12
-  resolution: "@formatjs/ts-transformer@npm:3.13.12"
-  dependencies:
-    "@formatjs/icu-messageformat-parser": "npm:2.7.6"
-    "@types/json-stable-stringify": "npm:^1.0.32"
-    "@types/node": "npm:14 || 16 || 17"
-    chalk: "npm:^4.0.0"
-    json-stable-stringify: "npm:^1.0.1"
-    tslib: "npm:^2.4.0"
-    typescript: "npm:5"
-  peerDependencies:
-    ts-jest: ">=27"
-  peerDependenciesMeta:
-    ts-jest:
-      optional: true
-  checksum: 10c0/68f72ee6379b87b7ef6340e118a5370cb2fa18cbbae08f5f3d10893803a52f0533e644002e0b5e9ffeded5b2f0aa9daad6adf8b487b10f5d2b61f9fb3fed0dbd
-  languageName: node
-  linkType: hard
-
 "@formatjs/ts-transformer@npm:3.13.14":
   version: 3.13.14
   resolution: "@formatjs/ts-transformer@npm:3.13.14"
@@ -2873,7 +2822,7 @@ __metadata:
     eslint-plugin-import: "npm:~2.29.0"
     eslint-plugin-jsdoc: "npm:^48.0.0"
     eslint-plugin-jsx-a11y: "npm:~6.8.0"
-    eslint-plugin-promise: "npm:~6.1.1"
+    eslint-plugin-promise: "npm:~6.2.0"
     eslint-plugin-react: "npm:^7.33.2"
     eslint-plugin-react-hooks: "npm:^4.6.0"
     file-loader: "npm:^6.2.0"
@@ -3733,7 +3682,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/json-schema@npm:*, @types/json-schema@npm:^7.0.12, @types/json-schema@npm:^7.0.15, @types/json-schema@npm:^7.0.5, @types/json-schema@npm:^7.0.8":
+"@types/json-schema@npm:*, @types/json-schema@npm:^7.0.12, @types/json-schema@npm:^7.0.5, @types/json-schema@npm:^7.0.8":
   version: 7.0.15
   resolution: "@types/json-schema@npm:7.0.15"
   checksum: 10c0/a996a745e6c5d60292f36731dd41341339d4eeed8180bb09226e5c8d23759067692b1d88e5d91d72ee83dfc00d3aca8e7bd43ea120516c17922cbcb7c3e252db
@@ -4009,7 +3958,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/semver@npm:^7.5.0, @types/semver@npm:^7.5.8":
+"@types/semver@npm:^7.5.0":
   version: 7.5.8
   resolution: "@types/semver@npm:7.5.8"
   checksum: 10c0/8663ff927234d1c5fcc04b33062cb2b9fcfbe0f5f351ed26c4d1e1581657deebd506b41ff7fdf89e787e3d33ce05854bc01686379b89e9c49b564c4cfa988efa
@@ -4160,19 +4109,17 @@ __metadata:
   linkType: hard
 
 "@typescript-eslint/eslint-plugin@npm:^7.0.0":
-  version: 7.8.0
-  resolution: "@typescript-eslint/eslint-plugin@npm:7.8.0"
+  version: 7.10.0
+  resolution: "@typescript-eslint/eslint-plugin@npm:7.10.0"
   dependencies:
     "@eslint-community/regexpp": "npm:^4.10.0"
-    "@typescript-eslint/scope-manager": "npm:7.8.0"
-    "@typescript-eslint/type-utils": "npm:7.8.0"
-    "@typescript-eslint/utils": "npm:7.8.0"
-    "@typescript-eslint/visitor-keys": "npm:7.8.0"
-    debug: "npm:^4.3.4"
+    "@typescript-eslint/scope-manager": "npm:7.10.0"
+    "@typescript-eslint/type-utils": "npm:7.10.0"
+    "@typescript-eslint/utils": "npm:7.10.0"
+    "@typescript-eslint/visitor-keys": "npm:7.10.0"
     graphemer: "npm:^1.4.0"
     ignore: "npm:^5.3.1"
     natural-compare: "npm:^1.4.0"
-    semver: "npm:^7.6.0"
     ts-api-utils: "npm:^1.3.0"
   peerDependencies:
     "@typescript-eslint/parser": ^7.0.0
@@ -4180,25 +4127,25 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 10c0/37ca22620d1834ff0baa28fa4b8fd92039a3903cb95748353de32d56bae2a81ce50d1bbaed27487eebc884e0a0f9387fcb0f1647593e4e6df5111ef674afa9f0
+  checksum: 10c0/bf3f0118ea5961c3eb01894678246458a329d82dda9ac7c2f5bfe77896410d05a08a4655e533bcb1ed2a3132ba6421981ec8c2ed0a3545779d9603ea231947ae
   languageName: node
   linkType: hard
 
 "@typescript-eslint/parser@npm:^7.0.0":
-  version: 7.8.0
-  resolution: "@typescript-eslint/parser@npm:7.8.0"
+  version: 7.10.0
+  resolution: "@typescript-eslint/parser@npm:7.10.0"
   dependencies:
-    "@typescript-eslint/scope-manager": "npm:7.8.0"
-    "@typescript-eslint/types": "npm:7.8.0"
-    "@typescript-eslint/typescript-estree": "npm:7.8.0"
-    "@typescript-eslint/visitor-keys": "npm:7.8.0"
+    "@typescript-eslint/scope-manager": "npm:7.10.0"
+    "@typescript-eslint/types": "npm:7.10.0"
+    "@typescript-eslint/typescript-estree": "npm:7.10.0"
+    "@typescript-eslint/visitor-keys": "npm:7.10.0"
     debug: "npm:^4.3.4"
   peerDependencies:
     eslint: ^8.56.0
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 10c0/0dd994c1b31b810c25e1b755b8d352debb7bf21a31f9a91acaec34acf4e471320bcceaa67cf64c110c0b8f5fac10a037dbabac6ec423e17adf037e59a7bce9c1
+  checksum: 10c0/4c4fbf43b5b05d75b766acb803d3dd078c6e080641a77f9e48ba005713466738ea4a71f0564fa3ce520988d65158d14c8c952ba01ccbc431ab4a05935db5ce6d
   languageName: node
   linkType: hard
 
@@ -4212,22 +4159,22 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/scope-manager@npm:7.8.0":
-  version: 7.8.0
-  resolution: "@typescript-eslint/scope-manager@npm:7.8.0"
+"@typescript-eslint/scope-manager@npm:7.10.0":
+  version: 7.10.0
+  resolution: "@typescript-eslint/scope-manager@npm:7.10.0"
   dependencies:
-    "@typescript-eslint/types": "npm:7.8.0"
-    "@typescript-eslint/visitor-keys": "npm:7.8.0"
-  checksum: 10c0/c253b98e96d4bf0375f473ca2c4d081726f1fd926cdfa65ee14c9ee99cca8eddb763b2d238ac365daa7246bef21b0af38180d04e56e9df7443c0e6f8474d097c
+    "@typescript-eslint/types": "npm:7.10.0"
+    "@typescript-eslint/visitor-keys": "npm:7.10.0"
+  checksum: 10c0/1d4f7ee137b95bd423b5a1b0d03251202dfc19bd8b6adfa5ff5df25fd5aa30e2d8ca50ab0d8d2e92441670ecbc2a82b3c2dbe39a4f268ec1ee1c1e267f7fd1d1
   languageName: node
   linkType: hard
 
-"@typescript-eslint/type-utils@npm:7.8.0":
-  version: 7.8.0
-  resolution: "@typescript-eslint/type-utils@npm:7.8.0"
+"@typescript-eslint/type-utils@npm:7.10.0":
+  version: 7.10.0
+  resolution: "@typescript-eslint/type-utils@npm:7.10.0"
   dependencies:
-    "@typescript-eslint/typescript-estree": "npm:7.8.0"
-    "@typescript-eslint/utils": "npm:7.8.0"
+    "@typescript-eslint/typescript-estree": "npm:7.10.0"
+    "@typescript-eslint/utils": "npm:7.10.0"
     debug: "npm:^4.3.4"
     ts-api-utils: "npm:^1.3.0"
   peerDependencies:
@@ -4235,7 +4182,7 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 10c0/00f6315626b64f7dbc1f7fba6f365321bb8d34141ed77545b2a07970e59a81dbdf768c1e024225ea00953750d74409ddd8a16782fc4a39261e507c04192dacab
+  checksum: 10c0/55e9a6690f9cedb79d30abb1990b161affaa2684dac246b743223353812c9c1e3fd2d923c67b193c6a3624a07e1c82c900ce7bf5b6b9891c846f04cb480ebd9f
   languageName: node
   linkType: hard
 
@@ -4246,10 +4193,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/types@npm:7.8.0, @typescript-eslint/types@npm:^7.2.0":
-  version: 7.8.0
-  resolution: "@typescript-eslint/types@npm:7.8.0"
-  checksum: 10c0/b2fdbfc21957bfa46f7d8809b607ad8c8b67c51821d899064d09392edc12f28b2318a044f0cd5d523d782e84e8f0558778877944964cf38e139f88790cf9d466
+"@typescript-eslint/types@npm:7.10.0, @typescript-eslint/types@npm:^7.2.0":
+  version: 7.10.0
+  resolution: "@typescript-eslint/types@npm:7.10.0"
+  checksum: 10c0/f01d9330b93cc362ba7967ab5037396f64742076450e1f93139fa69cbe93a6ece3ed55d68ab780c9b7d07ef4a7c645da410305216a2cfc5dec7eba49ee65ab23
   languageName: node
   linkType: hard
 
@@ -4272,12 +4219,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/typescript-estree@npm:7.8.0":
-  version: 7.8.0
-  resolution: "@typescript-eslint/typescript-estree@npm:7.8.0"
+"@typescript-eslint/typescript-estree@npm:7.10.0":
+  version: 7.10.0
+  resolution: "@typescript-eslint/typescript-estree@npm:7.10.0"
   dependencies:
-    "@typescript-eslint/types": "npm:7.8.0"
-    "@typescript-eslint/visitor-keys": "npm:7.8.0"
+    "@typescript-eslint/types": "npm:7.10.0"
+    "@typescript-eslint/visitor-keys": "npm:7.10.0"
     debug: "npm:^4.3.4"
     globby: "npm:^11.1.0"
     is-glob: "npm:^4.0.3"
@@ -4287,24 +4234,21 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 10c0/1690b62679685073dcb0f62499f0b52b445b37ae6e12d02aa4acbafe3fb023cf999b01f714b6282e88f84fd934fe3e2eefb21a64455d19c348d22bbc68ca8e47
+  checksum: 10c0/6200695834c566e52e2fa7331f1a05019f7815969d8c1e1e237b85a99664d36f41ccc16384eff3f8582a0ecb75f1cc315b56ee9283b818da37f24fa4d42f1d7a
   languageName: node
   linkType: hard
 
-"@typescript-eslint/utils@npm:7.8.0":
-  version: 7.8.0
-  resolution: "@typescript-eslint/utils@npm:7.8.0"
+"@typescript-eslint/utils@npm:7.10.0":
+  version: 7.10.0
+  resolution: "@typescript-eslint/utils@npm:7.10.0"
   dependencies:
     "@eslint-community/eslint-utils": "npm:^4.4.0"
-    "@types/json-schema": "npm:^7.0.15"
-    "@types/semver": "npm:^7.5.8"
-    "@typescript-eslint/scope-manager": "npm:7.8.0"
-    "@typescript-eslint/types": "npm:7.8.0"
-    "@typescript-eslint/typescript-estree": "npm:7.8.0"
-    semver: "npm:^7.6.0"
+    "@typescript-eslint/scope-manager": "npm:7.10.0"
+    "@typescript-eslint/types": "npm:7.10.0"
+    "@typescript-eslint/typescript-estree": "npm:7.10.0"
   peerDependencies:
     eslint: ^8.56.0
-  checksum: 10c0/31fb58388d15b082eb7bd5bce889cc11617aa1131dfc6950471541b3df64c82d1c052e2cccc230ca4ae80456d4f63a3e5dccb79899a8f3211ce36c089b7d7640
+  checksum: 10c0/6724471f94f2788f59748f7efa2a3a53ea910099993bee2fa5746ab5acacecdc9fcb110c568b18099ddc946ea44919ed394bff2bd055ba81fc69f5e6297b73bf
   languageName: node
   linkType: hard
 
@@ -4335,13 +4279,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/visitor-keys@npm:7.8.0":
-  version: 7.8.0
-  resolution: "@typescript-eslint/visitor-keys@npm:7.8.0"
+"@typescript-eslint/visitor-keys@npm:7.10.0":
+  version: 7.10.0
+  resolution: "@typescript-eslint/visitor-keys@npm:7.10.0"
   dependencies:
-    "@typescript-eslint/types": "npm:7.8.0"
+    "@typescript-eslint/types": "npm:7.10.0"
     eslint-visitor-keys: "npm:^3.4.3"
-  checksum: 10c0/5892fb5d9c58efaf89adb225f7dbbb77f9363961f2ff420b6b130bdd102dddd7aa8a16c46a5a71c19889d27b781e966119a89270555ea2cb5653a04d8994123d
+  checksum: 10c0/049e812bcd28869059d04c7bf3543bb55f5205f468b777439c4f120417fb856fb6024cb1d25291aa12556bd08e84f043a96d754ffb2cde37abb604d6f3c51634
   languageName: node
   linkType: hard
 
@@ -7825,11 +7769,11 @@ __metadata:
   linkType: hard
 
 "eslint-plugin-formatjs@npm:^4.10.1":
-  version: 4.13.1
-  resolution: "eslint-plugin-formatjs@npm:4.13.1"
+  version: 4.13.3
+  resolution: "eslint-plugin-formatjs@npm:4.13.3"
   dependencies:
-    "@formatjs/icu-messageformat-parser": "npm:2.7.6"
-    "@formatjs/ts-transformer": "npm:3.13.12"
+    "@formatjs/icu-messageformat-parser": "npm:2.7.8"
+    "@formatjs/ts-transformer": "npm:3.13.14"
     "@types/eslint": "npm:7 || 8"
     "@types/picomatch": "npm:^2.3.0"
     "@typescript-eslint/utils": "npm:^6.18.1"
@@ -7841,7 +7785,7 @@ __metadata:
     unicode-emoji-utils: "npm:^1.2.0"
   peerDependencies:
     eslint: 7 || 8
-  checksum: 10c0/ce18141dff84e8fe026127085c1a63279acb3a1bc0b70dc1ddce2fc65bb37d68ccf6d097231428745eda2caea42080e1c80a01a1895803155c15123a01bfeee3
+  checksum: 10c0/5e98f487a097189e3bdc64b678d19f4c83502c32d7c89a8959eda4ed9cb664bf16f13ad8871be89ca192cb39c1007d6a158c39bbf5b23c56962d949dbe9abfab
   languageName: node
   linkType: hard
 
@@ -7873,8 +7817,8 @@ __metadata:
   linkType: hard
 
 "eslint-plugin-jsdoc@npm:^48.0.0":
-  version: 48.2.4
-  resolution: "eslint-plugin-jsdoc@npm:48.2.4"
+  version: 48.2.6
+  resolution: "eslint-plugin-jsdoc@npm:48.2.6"
   dependencies:
     "@es-joy/jsdoccomment": "npm:~0.43.0"
     are-docs-informative: "npm:^0.0.2"
@@ -7882,12 +7826,11 @@ __metadata:
     debug: "npm:^4.3.4"
     escape-string-regexp: "npm:^4.0.0"
     esquery: "npm:^1.5.0"
-    is-builtin-module: "npm:^3.2.1"
-    semver: "npm:^7.6.0"
+    semver: "npm:^7.6.1"
     spdx-expression-parse: "npm:^4.0.0"
   peerDependencies:
     eslint: ^7.0.0 || ^8.0.0 || ^9.0.0
-  checksum: 10c0/601c9d6ee41de56102c7813106ceb0b8b8342223670f7add010a8f89753c250cde4cc93e353e3911b7b29677f2634f3f4be45f27abb7a95c6fdbd058adfa3343
+  checksum: 10c0/9f01b3000aa31f17767786c62caf62f1e8c4b88bfef04b207d3b1de785be287cc2da3ad16ed32afacd5f6e6a9b76ebf3369069be416ce2228c44cd6d084fcd8f
   languageName: node
   linkType: hard
 
@@ -7917,12 +7860,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint-plugin-promise@npm:~6.1.1":
-  version: 6.1.1
-  resolution: "eslint-plugin-promise@npm:6.1.1"
+"eslint-plugin-promise@npm:~6.2.0":
+  version: 6.2.0
+  resolution: "eslint-plugin-promise@npm:6.2.0"
   peerDependencies:
-    eslint: ^7.0.0 || ^8.0.0
-  checksum: 10c0/ec705741c110cd1cb4d702776e1c7f7fe60b671b71f706c88054ab443cf2767aae5a663928fb426373ba1095eaeda312a740a4f880546631f0e0727f298b3393
+    eslint: ^7.0.0 || ^8.0.0 || ^9.0.0
+  checksum: 10c0/5f42ee774023c089453ecb792076c64c6d0739ea6e9d6cdc9d6a63da5ba928c776e349d01cc110548f2c67045ec55343136aa7eb8b486e4ab145ac016c06a492
   languageName: node
   linkType: hard
 
@@ -15487,14 +15430,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.5.3, semver@npm:^7.5.4, semver@npm:^7.6.0":
-  version: 7.6.0
-  resolution: "semver@npm:7.6.0"
-  dependencies:
-    lru-cache: "npm:^6.0.0"
+"semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.5.3, semver@npm:^7.5.4, semver@npm:^7.6.0, semver@npm:^7.6.1":
+  version: 7.6.2
+  resolution: "semver@npm:7.6.2"
   bin:
     semver: bin/semver.js
-  checksum: 10c0/fbfe717094ace0aa8d6332d7ef5ce727259815bd8d8815700853f4faf23aacbd7192522f0dc5af6df52ef4fa85a355ebd2f5d39f554bd028200d6cf481ab9b53
+  checksum: 10c0/97d3441e97ace8be4b1976433d1c32658f6afaff09f143e52c593bae7eef33de19e3e369c88bd985ce1042c6f441c80c6803078d1de2a9988080b66684cbb30c
   languageName: node
   linkType: hard
 

From 32c30bf0fdc8c0d57f4e272a7827daa39faa6313 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 28 May 2024 10:05:37 +0200
Subject: [PATCH 1121/2191] New Crowdin Translations (automated) (#30452)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 config/locales/lt.yml | 18 ++++++++++++++++++
 config/locales/vi.yml |  1 +
 2 files changed, 19 insertions(+)

diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index f3d71bf6ebe2c9..77fcf42866abe1 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -345,6 +345,8 @@ lt:
       shortcode: Trumpas kodas
       shortcode_hint: Bent du ženklai, tik raidiniai skaitmeniniai ženklai bei akcentai(_)
       title: Asmeniniai jaustukai
+      uncategorized: Be kategorijos
+      unlist: Išbraukti iš sąrašo
       unlisted: Neįtrauktas į sąrašą
       update_failed_msg: Jaustukas negalėjo būti pakeistas
       updated_msg: Jaustukas sėkmingai pakeistas!
@@ -392,8 +394,16 @@ lt:
       created_msg: Domenas buvo sėkmingai leistas federacijai.
       destroyed_msg: Domenas buvo neleistas federacijai.
       export: Eksportuoti
+      import: Importuoti
+      undo: Neleisti federavimo su domenu
     domain_blocks:
       add_new: Pridėti naują domeno bloką
+      confirm_suspension:
+        cancel: Atšaukti
+        confirm: Pristabdyti
+        permanent_action: Atšaukus pristabdymą jokie duomenys ar sąryšiai nebus atkurti.
+        preamble_html: Jūs pristabdysite <strong>%{domain}</strong> ir jo subdomenus.
+        remove_all_data: Taip iš serverio bus pašalintas visas šio domeno paskyrų turinys, medija ir profilio duomenys.
       created_msg: Domeno užblokavimas nagrinėjamas
       destroyed_msg: Domeno blokas pašalintas
       domain: Domenas
@@ -411,6 +421,7 @@ lt:
           silence: Riboti
           suspend: Pristabdyti
         title: Naujos domeno blokas
+      private_comment: Privatus komentaras
       public_comment: Viešas komentaras
       public_comment_hint: Komentaras apie šį domeno apribojimą plačiajai visuomenei, jei įjungtas domenų apribojimų sąrašo reklamavimas.
       reject_media: Atmesti medijos failus
@@ -418,6 +429,7 @@ lt:
       reject_reports: Atmesti ataskaitas
       reject_reports_hint: Ignoruoti visus skundus, kurie siunčiami iš šio domeno. Neliečia užblokavimu
       undo: Atkurti domeno bloką
+      view: Peržiūrėti domeno bloką
     email_domain_blocks:
       add_new: Pridėti naują
       allow_registrations_with_approval: Leisti registracijas su patvirtinimu
@@ -429,10 +441,16 @@ lt:
         title: Naujas el pašto juodojo sąrašo įtraukimas
       title: El pašto juodasis sąrašas
     instances:
+      availability:
+        title: Prieinamumas
       back_to_all: Visi
+      back_to_limited: Apribotas
+      back_to_warning: Įspėjimas
       by_domain: Domenas
       content_policies:
+        policy: Politika
         reason: Viešoji priežastis
+        title: Turinio politika
       delivery:
         all: Visi
       delivery_available: Pristatymas galimas
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 4265c1a33a153f..459d1bb0d9985c 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -934,6 +934,7 @@ vi:
       delete: Xóa bỏ
       edit_preset: Sửa mẫu có sẵn
       empty: Bạn chưa thêm mẫu cảnh cáo nào cả.
+      title: Cảnh báo cài sẵn
     webhooks:
       add_new: Thêm endpoint
       delete: Xóa bỏ

From 4a77e477ee50f69160cecec25a68ee88b53dfcf8 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 28 May 2024 10:11:31 -0400
Subject: [PATCH 1122/2191] Consolidate account scopes for `LOWER` (index
 using) username/domain queries (#30451)

---
 app/models/account.rb                         |  2 +
 .../account_suggestions/setting_source.rb     | 10 ++---
 app/models/concerns/account/finder_concern.rb | 41 +++----------------
 .../concerns/user/ldap_authenticable.rb       |  2 +-
 app/services/report_service.rb                |  2 +-
 app/validators/unique_username_validator.rb   |  5 +--
 6 files changed, 14 insertions(+), 48 deletions(-)

diff --git a/app/models/account.rb b/app/models/account.rb
index 3c533822fdce9f..8a990bb831d612 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -142,6 +142,8 @@ class Account < ApplicationRecord
   scope :not_excluded_by_account, ->(account) { where.not(id: account.excluded_from_timeline_account_ids) }
   scope :not_domain_blocked_by_account, ->(account) { where(arel_table[:domain].eq(nil).or(arel_table[:domain].not_in(account.excluded_from_timeline_domains))) }
   scope :dormant, -> { joins(:account_stat).merge(AccountStat.without_recent_activity) }
+  scope :with_username, ->(value) { where arel_table[:username].lower.eq(value.to_s.downcase) }
+  scope :with_domain, ->(value) { where arel_table[:domain].lower.eq(value&.to_s&.downcase) }
 
   after_update_commit :trigger_update_webhooks
 
diff --git a/app/models/account_suggestions/setting_source.rb b/app/models/account_suggestions/setting_source.rb
index 9f3cd7bd3dcbe9..6143481723f9e8 100644
--- a/app/models/account_suggestions/setting_source.rb
+++ b/app/models/account_suggestions/setting_source.rb
@@ -3,7 +3,7 @@
 class AccountSuggestions::SettingSource < AccountSuggestions::Source
   def get(account, limit: DEFAULT_LIMIT)
     if setting_enabled?
-      base_account_scope(account).where(setting_to_where_condition).limit(limit).pluck(:id).zip([key].cycle)
+      base_account_scope(account).merge(setting_to_where_condition).limit(limit).pluck(:id).zip([key].cycle)
     else
       []
     end
@@ -25,11 +25,9 @@ def setting_enabled?
 
   def setting_to_where_condition
     usernames_and_domains.map do |(username, domain)|
-      Arel::Nodes::Grouping.new(
-        Account.arel_table[:username].lower.eq(username.downcase).and(
-          Account.arel_table[:domain].lower.eq(domain&.downcase)
-        )
-      )
+      Account
+        .with_username(username)
+        .with_domain(domain)
     end.reduce(:or)
   end
 
diff --git a/app/models/concerns/account/finder_concern.rb b/app/models/concerns/account/finder_concern.rb
index a7acff1cbbf968..249a7b5fd17e47 100644
--- a/app/models/concerns/account/finder_concern.rb
+++ b/app/models/concerns/account/finder_concern.rb
@@ -25,42 +25,11 @@ def find_local(username)
     end
 
     def find_remote(username, domain)
-      AccountFinder.new(username, domain).account
-    end
-  end
-
-  class AccountFinder
-    attr_reader :username, :domain
-
-    def initialize(username, domain)
-      @username = username
-      @domain = domain
-    end
-
-    def account
-      scoped_accounts.order(id: :asc).take
-    end
-
-    private
-
-    def scoped_accounts
-      Account.unscoped.tap do |scope|
-        scope.merge! with_usernames
-        scope.merge! matching_username
-        scope.merge! matching_domain
-      end
-    end
-
-    def with_usernames
-      Account.where.not(Account.arel_table[:username].lower.eq '')
-    end
-
-    def matching_username
-      Account.where(Account.arel_table[:username].lower.eq username.to_s.downcase)
-    end
-
-    def matching_domain
-      Account.where(Account.arel_table[:domain].lower.eq(domain.nil? ? nil : domain.to_s.downcase))
+      Account
+        .with_username(username)
+        .with_domain(domain)
+        .order(id: :asc)
+        .take
     end
   end
 end
diff --git a/app/models/concerns/user/ldap_authenticable.rb b/app/models/concerns/user/ldap_authenticable.rb
index c8e9fa93484917..fc1ee78d099376 100644
--- a/app/models/concerns/user/ldap_authenticable.rb
+++ b/app/models/concerns/user/ldap_authenticable.rb
@@ -22,7 +22,7 @@ def ldap_get_user(attributes = {})
         safe_username = safe_username.gsub(keys, replacement)
       end
 
-      resource = joins(:account).merge(Account.where(Account.arel_table[:username].lower.eq safe_username.downcase)).take
+      resource = joins(:account).merge(Account.with_username(safe_username)).take
 
       if resource.blank?
         resource = new(
diff --git a/app/services/report_service.rb b/app/services/report_service.rb
index fe546c383e62c0..dea6df7b0a1b1b 100644
--- a/app/services/report_service.rb
+++ b/app/services/report_service.rb
@@ -81,7 +81,7 @@ def reported_status_ids
 
     # If the account making reports is remote, it is likely anonymized so we have to relax the requirements for attaching statuses.
     domain = @source_account.domain.to_s.downcase
-    has_followers = @target_account.followers.where(Account.arel_table[:domain].lower.eq(domain)).exists?
+    has_followers = @target_account.followers.with_domain(domain).exists?
     visibility = has_followers ? %i(public unlisted private) : %i(public unlisted)
     scope = @target_account.statuses.with_discarded
     scope.merge!(scope.where(visibility: visibility).or(scope.where('EXISTS (SELECT 1 FROM mentions m JOIN accounts a ON m.account_id = a.id WHERE lower(a.domain) = ?)', domain)))
diff --git a/app/validators/unique_username_validator.rb b/app/validators/unique_username_validator.rb
index 09c8fadb55e073..c417e2f6962f00 100644
--- a/app/validators/unique_username_validator.rb
+++ b/app/validators/unique_username_validator.rb
@@ -6,10 +6,7 @@ class UniqueUsernameValidator < ActiveModel::Validator
   def validate(account)
     return if account.username.blank?
 
-    normalized_username = account.username.downcase
-    normalized_domain = account.domain&.downcase
-
-    scope = Account.where(Account.arel_table[:username].lower.eq normalized_username).where(Account.arel_table[:domain].lower.eq normalized_domain)
+    scope = Account.with_username(account.username).with_domain(account.domain)
     scope = scope.where.not(id: account.id) if account.persisted?
 
     account.errors.add(:username, :taken) if scope.exists?

From 128987ededcbcdf73529d98a4f11c747b2bbe892 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 29 May 2024 01:34:33 +0200
Subject: [PATCH 1123/2191] Add support for `fediverse:creator` OpenGraph tag
 (#30398)

---
 .../api/v1/conversations_controller.rb        |  8 ++--
 .../features/status/components/card.jsx       | 32 +++++++++++---
 app/javascript/mastodon/locales/en.json       |  1 +
 .../styles/mastodon/components.scss           | 43 +++++++++++++++++++
 app/lib/link_details_extractor.rb             |  4 ++
 app/models/preview_card.rb                    |  2 +
 app/models/status.rb                          | 10 ++---
 .../rest/preview_card_serializer.rb           |  2 +
 app/services/fetch_link_card_service.rb       |  3 ++
 ..._add_author_account_id_to_preview_cards.rb | 10 +++++
 db/schema.rb                                  |  5 ++-
 11 files changed, 105 insertions(+), 15 deletions(-)
 create mode 100644 db/migrate/20240522041528_add_author_account_id_to_preview_cards.rb

diff --git a/app/controllers/api/v1/conversations_controller.rb b/app/controllers/api/v1/conversations_controller.rb
index a95c816e1c72af..a29b90855560c2 100644
--- a/app/controllers/api/v1/conversations_controller.rb
+++ b/app/controllers/api/v1/conversations_controller.rb
@@ -38,15 +38,15 @@ def set_conversation
   def paginated_conversations
     AccountConversation.where(account: current_account)
                        .includes(
-                         account: :account_stat,
+                         account: [:account_stat, user: :role],
                          last_status: [
                            :media_attachments,
                            :status_stat,
                            :tags,
                            {
-                             preview_cards_status: :preview_card,
-                             active_mentions: [account: :account_stat],
-                             account: :account_stat,
+                             preview_cards_status: { preview_card: { author_account: [:account_stat, user: :role] } },
+                             active_mentions: :account,
+                             account: [:account_stat, user: :role],
                            },
                          ]
                        )
diff --git a/app/javascript/mastodon/features/status/components/card.jsx b/app/javascript/mastodon/features/status/components/card.jsx
index f47861f663ba77..c2f5703b3c4469 100644
--- a/app/javascript/mastodon/features/status/components/card.jsx
+++ b/app/javascript/mastodon/features/status/components/card.jsx
@@ -6,6 +6,8 @@ import { PureComponent } from 'react';
 import { FormattedMessage } from 'react-intl';
 
 import classNames from 'classnames';
+import { Link } from 'react-router-dom';
+
 
 import Immutable from 'immutable';
 import ImmutablePropTypes from 'react-immutable-proptypes';
@@ -13,6 +15,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import DescriptionIcon from '@/material-icons/400-24px/description-fill.svg?react';
 import OpenInNewIcon from '@/material-icons/400-24px/open_in_new.svg?react';
 import PlayArrowIcon from '@/material-icons/400-24px/play_arrow-fill.svg?react';
+import { Avatar } from 'mastodon/components/avatar';
 import { Blurhash } from 'mastodon/components/blurhash';
 import { Icon }  from 'mastodon/components/icon';
 import { RelativeTimestamp } from 'mastodon/components/relative_timestamp';
@@ -56,6 +59,20 @@ const addAutoPlay = html => {
   return html;
 };
 
+const MoreFromAuthor = ({ author }) => (
+  <div className='more-from-author'>
+    <svg viewBox='0 0 79 79' className='logo logo--icon' role='img'>
+      <use xlinkHref='#logo-symbol-icon' />
+    </svg>
+
+    <FormattedMessage id='link_preview.more_from_author' defaultMessage='More from {name}' values={{ name: <Link to={`/@${author.get('acct')}`}><Avatar account={author} size={16} /> {author.get('display_name')}</Link> }} />
+  </div>
+);
+
+MoreFromAuthor.propTypes = {
+  author: ImmutablePropTypes.map,
+};
+
 export default class Card extends PureComponent {
 
   static propTypes = {
@@ -136,6 +153,7 @@ export default class Card extends PureComponent {
     const interactive = card.get('type') === 'video';
     const language    = card.get('language') || '';
     const largeImage  = (card.get('image')?.length > 0 && card.get('width') > card.get('height')) || interactive;
+    const showAuthor  = !!card.get('author_account');
 
     const description = (
       <div className='status-card__content'>
@@ -146,7 +164,7 @@ export default class Card extends PureComponent {
 
         <strong className='status-card__title' title={card.get('title')} lang={language}>{card.get('title')}</strong>
 
-        {card.get('author_name').length > 0 ? <span className='status-card__author'><FormattedMessage id='link_preview.author' defaultMessage='By {name}' values={{ name: <strong>{card.get('author_name')}</strong> }} /></span> : <span className='status-card__description' lang={language}>{card.get('description')}</span>}
+        {!showAuthor && (card.get('author_name').length > 0 ? <span className='status-card__author'><FormattedMessage id='link_preview.author' defaultMessage='By {name}' values={{ name: <strong>{card.get('author_name')}</strong> }} /></span> : <span className='status-card__description' lang={language}>{card.get('description')}</span>)}
       </div>
     );
 
@@ -235,10 +253,14 @@ export default class Card extends PureComponent {
     }
 
     return (
-      <a href={card.get('url')} className={classNames('status-card', { expanded: largeImage })} target='_blank' rel='noopener noreferrer' ref={this.setRef}>
-        {embed}
-        {description}
-      </a>
+      <>
+        <a href={card.get('url')} className={classNames('status-card', { expanded: largeImage, bottomless: showAuthor })} target='_blank' rel='noopener noreferrer' ref={this.setRef}>
+          {embed}
+          {description}
+        </a>
+
+        {showAuthor && <MoreFromAuthor author={card.get('author_account')} />}
+      </>
     );
   }
 
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index 56e4612c1ce2bf..63298d59e3aa5e 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -414,6 +414,7 @@
   "limited_account_hint.action": "Show profile anyway",
   "limited_account_hint.title": "This profile has been hidden by the moderators of {domain}.",
   "link_preview.author": "By {name}",
+  "link_preview.more_from_author": "More from {name}",
   "lists.account.add": "Add to list",
   "lists.account.remove": "Remove from list",
   "lists.delete": "Delete list",
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 859c6e32675c8f..4f36d85aa986f3 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -3896,6 +3896,10 @@ $ui-header-logo-wordmark-width: 99px;
   border: 1px solid var(--background-border-color);
   border-radius: 8px;
 
+  &.bottomless {
+    border-radius: 8px 8px 0 0;
+  }
+
   &__actions {
     bottom: 0;
     inset-inline-start: 0;
@@ -10223,3 +10227,42 @@ noscript {
     }
   }
 }
+
+.more-from-author {
+  font-size: 14px;
+  color: $darker-text-color;
+  background: var(--surface-background-color);
+  border: 1px solid var(--background-border-color);
+  border-top: 0;
+  border-radius: 0 0 8px 8px;
+  padding: 15px;
+  display: flex;
+  align-items: center;
+  gap: 8px;
+
+  .logo {
+    height: 16px;
+    color: $darker-text-color;
+  }
+
+  & > span {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+  }
+
+  a {
+    display: inline-flex;
+    align-items: center;
+    gap: 4px;
+    font-weight: 500;
+    color: $primary-text-color;
+    text-decoration: none;
+
+    &:hover,
+    &:focus,
+    &:active {
+      color: $highlight-text-color;
+    }
+  }
+}
diff --git a/app/lib/link_details_extractor.rb b/app/lib/link_details_extractor.rb
index 07776c36991b56..2e49d3fb4f514f 100644
--- a/app/lib/link_details_extractor.rb
+++ b/app/lib/link_details_extractor.rb
@@ -195,6 +195,10 @@ def author_url
     structured_data&.author_url
   end
 
+  def author_account
+    opengraph_tag('fediverse:creator')
+  end
+
   def embed_url
     valid_url_or_nil(opengraph_tag('twitter:player:stream'))
   end
diff --git a/app/models/preview_card.rb b/app/models/preview_card.rb
index 9fe02bd1681014..11fdd9d88ac346 100644
--- a/app/models/preview_card.rb
+++ b/app/models/preview_card.rb
@@ -32,6 +32,7 @@
 #  link_type                    :integer
 #  published_at                 :datetime
 #  image_description            :string           default(""), not null
+#  author_account_id            :bigint(8)
 #
 
 class PreviewCard < ApplicationRecord
@@ -54,6 +55,7 @@ class PreviewCard < ApplicationRecord
   has_many :statuses, through: :preview_cards_statuses
 
   has_one :trend, class_name: 'PreviewCardTrend', inverse_of: :preview_card, dependent: :destroy
+  belongs_to :author_account, class_name: 'Account', optional: true
 
   has_attached_file :image, processors: [:thumbnail, :blurhash_transcoder], styles: ->(f) { image_styles(f) }, convert_options: { all: '-quality 90 +profile "!icc,*" +set date:modify +set date:create +set date:timestamp' }, validate_media_type: false
 
diff --git a/app/models/status.rb b/app/models/status.rb
index 9d09fa5fee10c5..baa6578005532e 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -157,9 +157,9 @@ class Status < ApplicationRecord
                    :status_stat,
                    :tags,
                    :preloadable_poll,
-                   preview_cards_status: [:preview_card],
+                   preview_cards_status: { preview_card: { author_account: [:account_stat, user: :role] } },
                    account: [:account_stat, user: :role],
-                   active_mentions: { account: :account_stat },
+                   active_mentions: :account,
                    reblog: [
                      :application,
                      :tags,
@@ -167,11 +167,11 @@ class Status < ApplicationRecord
                      :conversation,
                      :status_stat,
                      :preloadable_poll,
-                     preview_cards_status: [:preview_card],
+                     preview_cards_status: { preview_card: { author_account: [:account_stat, user: :role] } },
                      account: [:account_stat, user: :role],
-                     active_mentions: { account: :account_stat },
+                     active_mentions: :account,
                    ],
-                   thread: { account: :account_stat }
+                   thread: :account
 
   delegate :domain, to: :account, prefix: true
 
diff --git a/app/serializers/rest/preview_card_serializer.rb b/app/serializers/rest/preview_card_serializer.rb
index 039262cd5f91be..7d4c99c2d1f9ac 100644
--- a/app/serializers/rest/preview_card_serializer.rb
+++ b/app/serializers/rest/preview_card_serializer.rb
@@ -8,6 +8,8 @@ class REST::PreviewCardSerializer < ActiveModel::Serializer
              :provider_url, :html, :width, :height,
              :image, :image_description, :embed_url, :blurhash, :published_at
 
+  has_one :author_account, serializer: REST::AccountSerializer, if: -> { object.author_account.present? }
+
   def url
     object.original_url.presence || object.url
   end
diff --git a/app/services/fetch_link_card_service.rb b/app/services/fetch_link_card_service.rb
index 36e866b6ce9b8a..900cb9863dd395 100644
--- a/app/services/fetch_link_card_service.rb
+++ b/app/services/fetch_link_card_service.rb
@@ -147,9 +147,12 @@ def attempt_opengraph
     return if html.nil?
 
     link_details_extractor = LinkDetailsExtractor.new(@url, @html, @html_charset)
+    provider = PreviewCardProvider.matching_domain(Addressable::URI.parse(link_details_extractor.canonical_url).normalized_host)
+    linked_account = ResolveAccountService.new.call(link_details_extractor.author_account, suppress_errors: true) if link_details_extractor.author_account.present? && provider&.trendable?
 
     @card = PreviewCard.find_or_initialize_by(url: link_details_extractor.canonical_url) if link_details_extractor.canonical_url != @card.url
     @card.assign_attributes(link_details_extractor.to_preview_card_attributes)
+    @card.author_account = linked_account
     @card.save_with_optional_image! unless @card.title.blank? && @card.html.blank?
   end
 end
diff --git a/db/migrate/20240522041528_add_author_account_id_to_preview_cards.rb b/db/migrate/20240522041528_add_author_account_id_to_preview_cards.rb
new file mode 100644
index 00000000000000..a6e7a883da96ce
--- /dev/null
+++ b/db/migrate/20240522041528_add_author_account_id_to_preview_cards.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class AddAuthorAccountIdToPreviewCards < ActiveRecord::Migration[7.1]
+  disable_ddl_transaction!
+
+  def change
+    safety_assured { add_reference :preview_cards, :author_account, null: true, foreign_key: { to_table: 'accounts', on_delete: :nullify }, index: false }
+    add_index :preview_cards, :author_account_id, algorithm: :concurrently, where: 'author_account_id IS NOT NULL'
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index ad58604928d38e..3a47522d26759a 100644
--- 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_05_10_192043) do
+ActiveRecord::Schema[7.1].define(version: 2024_05_22_041528) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -877,6 +877,8 @@
     t.integer "link_type"
     t.datetime "published_at"
     t.string "image_description", default: "", null: false
+    t.bigint "author_account_id"
+    t.index ["author_account_id"], name: "index_preview_cards_on_author_account_id", where: "(author_account_id IS NOT NULL)"
     t.index ["url"], name: "index_preview_cards_on_url", unique: true
   end
 
@@ -1352,6 +1354,7 @@
   add_foreign_key "polls", "accounts", on_delete: :cascade
   add_foreign_key "polls", "statuses", on_delete: :cascade
   add_foreign_key "preview_card_trends", "preview_cards", on_delete: :cascade
+  add_foreign_key "preview_cards", "accounts", column: "author_account_id", on_delete: :nullify
   add_foreign_key "report_notes", "accounts", on_delete: :cascade
   add_foreign_key "report_notes", "reports", on_delete: :cascade
   add_foreign_key "reports", "accounts", column: "action_taken_by_account_id", name: "fk_bca45b75fd", on_delete: :nullify

From 5d7d23999ca0fffc3012d84b89fc9d3e66099115 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 29 May 2024 10:15:06 +0200
Subject: [PATCH 1124/2191] Fix leaking Elasticsearch connections in Sidekiq
 processes (#30450)

---
 lib/mastodon/sidekiq_middleware.rb | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/lib/mastodon/sidekiq_middleware.rb b/lib/mastodon/sidekiq_middleware.rb
index 3a747afb63c260..c5f4d8da356247 100644
--- a/lib/mastodon/sidekiq_middleware.rb
+++ b/lib/mastodon/sidekiq_middleware.rb
@@ -8,6 +8,7 @@ def call(*, &block)
   rescue Mastodon::HostValidationError
     # Do not retry
   rescue => e
+    clean_up_elasticsearch_connections!
     limit_backtrace_and_raise(e)
   ensure
     clean_up_sockets!
@@ -25,6 +26,32 @@ def clean_up_sockets!
     clean_up_statsd_socket!
   end
 
+  # This is a hack to immediately free up unused Elasticsearch connections.
+  #
+  # Indeed, Chewy creates one `Elasticsearch::Client` instance per thread,
+  # and each such client manages its long-lasting connection to
+  # Elasticsearch.
+  #
+  # As far as I know, neither `chewy`,  `elasticsearch-transport` or even
+  # `faraday` provide a reliable way to immediately close a connection, and
+  # rely on the underlying object to be garbage-collected instead.
+  #
+  # Furthermore, `sidekiq` creates a new thread each time a job throws an
+  # exception, meaning that each failure will create a new connection, and
+  # the old one will only be closed on full garbage collection.
+  def clean_up_elasticsearch_connections!
+    return unless Chewy.enabled? && Chewy.current[:chewy_client].present?
+
+    Chewy.client.transport.transport.connections.each do |connection|
+      # NOTE: This bit of code is tailored for the HTTPClient Faraday adapter
+      connection.connection.app.instance_variable_get(:@client)&.reset_all
+    end
+
+    Chewy.current.delete(:chewy_client)
+  rescue
+    nil
+  end
+
   def clean_up_redis_socket!
     RedisConfiguration.pool.checkin if Thread.current[:redis]
     Thread.current[:redis] = nil

From 36fe8f85667717e78740a9fed3c2bf116a96da1e Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 29 May 2024 11:19:17 +0200
Subject: [PATCH 1125/2191] Change `ids` param to `id` in `/api/v1/statuses`
 and `/api/v1/accounts` for consistency (#30465)

---
 app/controllers/api/v1/accounts_controller.rb | 4 ++--
 app/controllers/api/v1/statuses_controller.rb | 4 ++--
 spec/requests/api/v1/accounts_spec.rb         | 4 ++--
 spec/requests/api/v1/statuses_spec.rb         | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/controllers/api/v1/accounts_controller.rb b/app/controllers/api/v1/accounts_controller.rb
index be7b302d3be7c3..84b604b305e7a7 100644
--- a/app/controllers/api/v1/accounts_controller.rb
+++ b/app/controllers/api/v1/accounts_controller.rb
@@ -106,11 +106,11 @@ def relationships(**options)
   end
 
   def account_ids
-    Array(accounts_params[:ids]).uniq.map(&:to_i)
+    Array(accounts_params[:id]).uniq.map(&:to_i)
   end
 
   def accounts_params
-    params.permit(ids: [])
+    params.permit(id: [])
   end
 
   def account_params
diff --git a/app/controllers/api/v1/statuses_controller.rb b/app/controllers/api/v1/statuses_controller.rb
index 5f7e66617d2b7e..cca3865f62cced 100644
--- a/app/controllers/api/v1/statuses_controller.rb
+++ b/app/controllers/api/v1/statuses_controller.rb
@@ -141,11 +141,11 @@ def check_statuses_limit
   end
 
   def status_ids
-    Array(statuses_params[:ids]).uniq.map(&:to_i)
+    Array(statuses_params[:id]).uniq.map(&:to_i)
   end
 
   def statuses_params
-    params.permit(ids: [])
+    params.permit(id: [])
   end
 
   def status_params
diff --git a/spec/requests/api/v1/accounts_spec.rb b/spec/requests/api/v1/accounts_spec.rb
index 55f8e1c6fa71b8..3d9eb650194a2d 100644
--- a/spec/requests/api/v1/accounts_spec.rb
+++ b/spec/requests/api/v1/accounts_spec.rb
@@ -8,13 +8,13 @@
   let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
   let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
 
-  describe 'GET /api/v1/accounts?ids[]=:id' do
+  describe 'GET /api/v1/accounts?id[]=:id' do
     let(:account) { Fabricate(:account) }
     let(:other_account) { Fabricate(:account) }
     let(:scopes) { 'read:accounts' }
 
     it 'returns expected response' do
-      get '/api/v1/accounts', headers: headers, params: { ids: [account.id, other_account.id, 123_123] }
+      get '/api/v1/accounts', headers: headers, params: { id: [account.id, other_account.id, 123_123] }
 
       expect(response).to have_http_status(200)
       expect(body_as_json).to contain_exactly(
diff --git a/spec/requests/api/v1/statuses_spec.rb b/spec/requests/api/v1/statuses_spec.rb
index 0b2d1f90cfaa59..694861fb1c3f8e 100644
--- a/spec/requests/api/v1/statuses_spec.rb
+++ b/spec/requests/api/v1/statuses_spec.rb
@@ -9,13 +9,13 @@
     let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, application: client_app, scopes: scopes) }
     let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
 
-    describe 'GET /api/v1/statuses?ids[]=:id' do
+    describe 'GET /api/v1/statuses?id[]=:id' do
       let(:status) { Fabricate(:status) }
       let(:other_status) { Fabricate(:status) }
       let(:scopes) { 'read:statuses' }
 
       it 'returns expected response' do
-        get '/api/v1/statuses', headers: headers, params: { ids: [status.id, other_status.id, 123_123] }
+        get '/api/v1/statuses', headers: headers, params: { id: [status.id, other_status.id, 123_123] }
 
         expect(response).to have_http_status(200)
         expect(body_as_json).to contain_exactly(

From 41729313e23bc4305cf0e7536d49af2490477c32 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 29 May 2024 11:34:36 +0200
Subject: [PATCH 1126/2191] chore(deps): update dependency faker to v3.4.1
 (#30463)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 934d41334d7d56..5c480c525cd314 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -231,7 +231,7 @@ GEM
       tzinfo
     excon (0.110.0)
     fabrication (2.31.0)
-    faker (3.3.1)
+    faker (3.4.1)
       i18n (>= 1.8.11, < 2)
     faraday (1.10.3)
       faraday-em_http (~> 1.0)

From 6eea83211c049e416d24f394039a74bc60450cd7 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 29 May 2024 13:12:23 +0200
Subject: [PATCH 1127/2191] New Crowdin Translations (automated) (#30464)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/ca.json    | 1 +
 app/javascript/mastodon/locales/es-AR.json | 1 +
 app/javascript/mastodon/locales/fi.json    | 1 +
 app/javascript/mastodon/locales/gl.json    | 1 +
 app/javascript/mastodon/locales/it.json    | 1 +
 app/javascript/mastodon/locales/ko.json    | 1 +
 app/javascript/mastodon/locales/pl.json    | 1 +
 app/javascript/mastodon/locales/pt-BR.json | 1 +
 app/javascript/mastodon/locales/pt-PT.json | 1 +
 app/javascript/mastodon/locales/sl.json    | 1 +
 app/javascript/mastodon/locales/vi.json    | 1 +
 app/javascript/mastodon/locales/zh-CN.json | 1 +
 app/javascript/mastodon/locales/zh-TW.json | 1 +
 13 files changed, 13 insertions(+)

diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index ea67d217dad94e..68429b093ce280 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -414,6 +414,7 @@
   "limited_account_hint.action": "Mostra el perfil de totes maneres",
   "limited_account_hint.title": "Aquest perfil l'han amagat els moderadors de {domain}.",
   "link_preview.author": "Per {name}",
+  "link_preview.more_from_author": "Més de {name}",
   "lists.account.add": "Afegeix a la llista",
   "lists.account.remove": "Elimina de la llista",
   "lists.delete": "Elimina la llista",
diff --git a/app/javascript/mastodon/locales/es-AR.json b/app/javascript/mastodon/locales/es-AR.json
index 2d42b3e9498205..4c30bfa25f1e7e 100644
--- a/app/javascript/mastodon/locales/es-AR.json
+++ b/app/javascript/mastodon/locales/es-AR.json
@@ -414,6 +414,7 @@
   "limited_account_hint.action": "Mostrar perfil de todos modos",
   "limited_account_hint.title": "Este perfil fue ocultado por los moderadores de {domain}.",
   "link_preview.author": "Por {name}",
+  "link_preview.more_from_author": "Más de {name}",
   "lists.account.add": "Agregar a lista",
   "lists.account.remove": "Quitar de lista",
   "lists.delete": "Eliminar lista",
diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index bae714b1d2fe5c..6c2162e52c37ca 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -414,6 +414,7 @@
   "limited_account_hint.action": "Näytä profiili joka tapauksessa",
   "limited_account_hint.title": "Palvelimen {domain} valvojat ovat piilottaneet tämän käyttäjätilin.",
   "link_preview.author": "Julkaissut {name}",
+  "link_preview.more_from_author": "Lisää käyttäjältä {name}",
   "lists.account.add": "Lisää listalle",
   "lists.account.remove": "Poista listalta",
   "lists.delete": "Poista lista",
diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json
index 98cc3139485ac0..0847b8bf0dd3ac 100644
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@@ -414,6 +414,7 @@
   "limited_account_hint.action": "Mostrar perfil igualmente",
   "limited_account_hint.title": "Este perfil foi agochado pola moderación de {domain}.",
   "link_preview.author": "Por {name}",
+  "link_preview.more_from_author": "Máis de {name}",
   "lists.account.add": "Engadir á listaxe",
   "lists.account.remove": "Eliminar da listaxe",
   "lists.delete": "Eliminar listaxe",
diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json
index 8ab5db1b171678..f66497e0a759c6 100644
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@@ -414,6 +414,7 @@
   "limited_account_hint.action": "Mostra comunque il profilo",
   "limited_account_hint.title": "Questo profilo è stato nascosto dai moderatori di {domain}.",
   "link_preview.author": "Di {name}",
+  "link_preview.more_from_author": "Altro da {name}",
   "lists.account.add": "Aggiungi all'elenco",
   "lists.account.remove": "Rimuovi dall'elenco",
   "lists.delete": "Elimina elenco",
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index b340261479fc56..7cd74fa5017e5c 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -414,6 +414,7 @@
   "limited_account_hint.action": "그래도 프로필 보기",
   "limited_account_hint.title": "이 프로필은 {domain}의 중재자에 의해 숨겨진 상태입니다.",
   "link_preview.author": "{name}",
+  "link_preview.more_from_author": "{name} 더 둘러보기",
   "lists.account.add": "리스트에 추가",
   "lists.account.remove": "리스트에서 제거",
   "lists.delete": "리스트 삭제",
diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json
index b763f740a2ef91..6f67e8f74f08c1 100644
--- a/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@@ -414,6 +414,7 @@
   "limited_account_hint.action": "Pokaż profil mimo to",
   "limited_account_hint.title": "Ten profil został ukryty przez moderatorów {domain}.",
   "link_preview.author": "{name}",
+  "link_preview.more_from_author": "Więcej od {name}",
   "lists.account.add": "Dodaj do listy",
   "lists.account.remove": "Usunąć z listy",
   "lists.delete": "Usuń listę",
diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json
index b11daeaaa7e7b5..3c8f3cf416885d 100644
--- a/app/javascript/mastodon/locales/pt-BR.json
+++ b/app/javascript/mastodon/locales/pt-BR.json
@@ -414,6 +414,7 @@
   "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}",
+  "link_preview.more_from_author": "Mais de {name}",
   "lists.account.add": "Adicionar à lista",
   "lists.account.remove": "Remover da lista",
   "lists.delete": "Excluir lista",
diff --git a/app/javascript/mastodon/locales/pt-PT.json b/app/javascript/mastodon/locales/pt-PT.json
index 70903065da1aae..c389d4f4fcf6e4 100644
--- a/app/javascript/mastodon/locales/pt-PT.json
+++ b/app/javascript/mastodon/locales/pt-PT.json
@@ -414,6 +414,7 @@
   "limited_account_hint.action": "Exibir perfil mesmo assim",
   "limited_account_hint.title": "Este perfil foi ocultado pelos moderadores de {domain}.",
   "link_preview.author": "Por {name}",
+  "link_preview.more_from_author": "Mais de {name}",
   "lists.account.add": "Adicionar à lista",
   "lists.account.remove": "Remover da lista",
   "lists.delete": "Eliminar lista",
diff --git a/app/javascript/mastodon/locales/sl.json b/app/javascript/mastodon/locales/sl.json
index 7806abc6b55fbb..a8cce3202cf45e 100644
--- a/app/javascript/mastodon/locales/sl.json
+++ b/app/javascript/mastodon/locales/sl.json
@@ -414,6 +414,7 @@
   "limited_account_hint.action": "Vseeno pokaži profil",
   "limited_account_hint.title": "Profil so moderatorji strežnika {domain} skrili.",
   "link_preview.author": "Avtor_ica {name}",
+  "link_preview.more_from_author": "Več od {name}",
   "lists.account.add": "Dodaj na seznam",
   "lists.account.remove": "Odstrani s seznama",
   "lists.delete": "Izbriši seznam",
diff --git a/app/javascript/mastodon/locales/vi.json b/app/javascript/mastodon/locales/vi.json
index 102f1c3b4b329a..56b2f7e52cc196 100644
--- a/app/javascript/mastodon/locales/vi.json
+++ b/app/javascript/mastodon/locales/vi.json
@@ -414,6 +414,7 @@
   "limited_account_hint.action": "Vẫn cứ xem",
   "limited_account_hint.title": "Người này đã bị ẩn bởi quản trị viên của {domain}.",
   "link_preview.author": "Bởi {name}",
+  "link_preview.more_from_author": "Thêm từ {name}",
   "lists.account.add": "Thêm vào danh sách",
   "lists.account.remove": "Xóa khỏi danh sách",
   "lists.delete": "Xóa danh sách",
diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json
index ab6fe0bd70f77a..0f8bcae6f8be85 100644
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@@ -414,6 +414,7 @@
   "limited_account_hint.action": "仍要显示个人资料",
   "limited_account_hint.title": "此账号资料已被 {domain} 管理员隐藏。",
   "link_preview.author": "由 {name}",
+  "link_preview.more_from_author": "查看 {name} 的更多内容",
   "lists.account.add": "添加到列表",
   "lists.account.remove": "从列表中移除",
   "lists.delete": "删除列表",
diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json
index f00d62c0762483..1d20034db88425 100644
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@@ -414,6 +414,7 @@
   "limited_account_hint.action": "一律顯示個人檔案",
   "limited_account_hint.title": "此個人檔案已被 {domain} 的管理員隱藏。",
   "link_preview.author": "來自 {name}",
+  "link_preview.more_from_author": "來自 {name} 之更多內容",
   "lists.account.add": "新增至列表",
   "lists.account.remove": "自列表中移除",
   "lists.delete": "刪除列表",

From 3aa76c738320d166f881c555e713fbb471c98c53 Mon Sep 17 00:00:00 2001
From: Jeremy Kescher <jeremy@kescher.at>
Date: Wed, 29 May 2024 14:25:32 +0200
Subject: [PATCH 1128/2191] Bump version to v4.3.0-alpha.3+glitch+cat+1.2.7

---
 CHANGELOG.md            | 11 ++++++++++-
 lib/mastodon/version.rb |  2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d137b1f4701bfd..bf94a0d9bb3ecb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,12 +2,21 @@
 
 All changes to Catstodon that aren't Mastodon or glitch-soc Mastodon changes will be documented here.
 
+## [v4.3.0-alpha.3+glitch+cat+1.2.7] - 2024-05-29
+
+- Upstream changes
+- Add ability to disable the suspicious sign-in detector
+  - The CatCatNya~ production config has an IP retention period of one day. That will cause suspicious login emails to
+    be sent out simply because we don't have any known IP data. Therefore, this fix is being applied.
+
 ## [v4.3.0-alpha.3+glitch+cat+1.2.6] - 2024-05-23
+
 - Upstream changes
 
 ## [v4.3.0-alpha.3+glitch+cat+1.2.5] - 2024-05-21
 
-- Apply a fix from the emoji reactions patch branch for an issue introduced in the 1.2.3 release for this Mastodon version.
+- Apply a fix from the emoji reactions patch branch for an issue introduced in the 1.2.3 release for this Mastodon
+  version.
   - Thanks, Essem!
 
 ## [v4.3.0-alpha.3+glitch+cat+1.2.4] - 2024-05-21
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index 764f170dc6058c..fd091451ae9a44 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -25,7 +25,7 @@ def prerelease
     end
 
     def catstodon_revision
-      '1.2.6'
+      '1.2.7'
     end
 
     def build_metadata

From d20a5c3ec9ed40a991245fe32d0acb6187dd48c4 Mon Sep 17 00:00:00 2001
From: Emelia Smith <ThisIsMissEm@users.noreply.github.com>
Date: Wed, 29 May 2024 16:00:05 +0200
Subject: [PATCH 1129/2191] Fix: remove broken OAuth Application vacuuming &
 throttle OAuth Application registrations (#30316)

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
---
 app/lib/vacuum/applications_vacuum.rb        | 10 ----
 app/workers/scheduler/vacuum_scheduler.rb    |  5 --
 config/initializers/rack_attack.rb           |  4 ++
 spec/config/initializers/rack/attack_spec.rb | 18 ++++++++
 spec/lib/vacuum/applications_vacuum_spec.rb  | 48 --------------------
 5 files changed, 22 insertions(+), 63 deletions(-)
 delete mode 100644 app/lib/vacuum/applications_vacuum.rb
 delete mode 100644 spec/lib/vacuum/applications_vacuum_spec.rb

diff --git a/app/lib/vacuum/applications_vacuum.rb b/app/lib/vacuum/applications_vacuum.rb
deleted file mode 100644
index ba88655f167c25..00000000000000
--- a/app/lib/vacuum/applications_vacuum.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-class Vacuum::ApplicationsVacuum
-  def perform
-    Doorkeeper::Application.where(owner_id: nil)
-                           .where.missing(:created_users, :access_tokens, :access_grants)
-                           .where(created_at: ...1.day.ago)
-                           .in_batches.delete_all
-  end
-end
diff --git a/app/workers/scheduler/vacuum_scheduler.rb b/app/workers/scheduler/vacuum_scheduler.rb
index 1c9a2aabe3be57..c22d6f5f80fc98 100644
--- a/app/workers/scheduler/vacuum_scheduler.rb
+++ b/app/workers/scheduler/vacuum_scheduler.rb
@@ -22,7 +22,6 @@ def vacuum_operations
       preview_cards_vacuum,
       backups_vacuum,
       access_tokens_vacuum,
-      applications_vacuum,
       feeds_vacuum,
       imports_vacuum,
     ]
@@ -56,10 +55,6 @@ def imports_vacuum
     Vacuum::ImportsVacuum.new
   end
 
-  def applications_vacuum
-    Vacuum::ApplicationsVacuum.new
-  end
-
   def content_retention_policy
     ContentRetentionPolicy.current
   end
diff --git a/config/initializers/rack_attack.rb b/config/initializers/rack_attack.rb
index fa1bdca5448401..1757ce5df1e487 100644
--- a/config/initializers/rack_attack.rb
+++ b/config/initializers/rack_attack.rb
@@ -105,6 +105,10 @@ def paging_request?
     req.authenticated_user_id if (req.post? && req.path.match?(API_DELETE_REBLOG_REGEX)) || (req.delete? && req.path.match?(API_DELETE_STATUS_REGEX))
   end
 
+  throttle('throttle_oauth_application_registrations/ip', limit: 5, period: 10.minutes) do |req|
+    req.throttleable_remote_ip if req.post? && req.path == '/api/v1/apps'
+  end
+
   throttle('throttle_sign_up_attempts/ip', limit: 25, period: 5.minutes) do |req|
     req.throttleable_remote_ip if req.post? && req.path_matches?('/auth')
   end
diff --git a/spec/config/initializers/rack/attack_spec.rb b/spec/config/initializers/rack/attack_spec.rb
index e25b7dfde9422e..0a388c2f411d7b 100644
--- a/spec/config/initializers/rack/attack_spec.rb
+++ b/spec/config/initializers/rack/attack_spec.rb
@@ -131,4 +131,22 @@ def increment_counter
       it_behaves_like 'throttled endpoint'
     end
   end
+
+  describe 'throttle excessive oauth application registration requests by IP address' do
+    let(:throttle) { 'throttle_oauth_application_registrations/ip' }
+    let(:limit)  { 5 }
+    let(:period) { 10.minutes }
+    let(:path)   { '/api/v1/apps' }
+    let(:params) do
+      {
+        client_name: 'Throttle Test',
+        redirect_uris: 'urn:ietf:wg:oauth:2.0:oob',
+        scopes: 'read',
+      }
+    end
+
+    let(:request) { -> { post path, params: params, headers: { 'REMOTE_ADDR' => remote_ip } } }
+
+    it_behaves_like 'throttled endpoint'
+  end
 end
diff --git a/spec/lib/vacuum/applications_vacuum_spec.rb b/spec/lib/vacuum/applications_vacuum_spec.rb
deleted file mode 100644
index df5c86060275d4..00000000000000
--- a/spec/lib/vacuum/applications_vacuum_spec.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-RSpec.describe Vacuum::ApplicationsVacuum do
-  subject { described_class.new }
-
-  describe '#perform' do
-    let!(:app_with_token)  { Fabricate(:application, created_at: 1.month.ago) }
-    let!(:app_with_grant)  { Fabricate(:application, created_at: 1.month.ago) }
-    let!(:app_with_signup) { Fabricate(:application, created_at: 1.month.ago) }
-    let!(:app_with_owner)  { Fabricate(:application, created_at: 1.month.ago, owner: Fabricate(:user)) }
-    let!(:unused_app)      { Fabricate(:application, created_at: 1.month.ago) }
-    let!(:recent_app)      { Fabricate(:application, created_at: 1.hour.ago) }
-
-    before do
-      Fabricate(:access_token, application: app_with_token)
-      Fabricate(:access_grant, application: app_with_grant)
-      Fabricate(:user, created_by_application: app_with_signup)
-
-      subject.perform
-    end
-
-    it 'does not delete applications with valid access tokens' do
-      expect { app_with_token.reload }.to_not raise_error
-    end
-
-    it 'does not delete applications with valid access grants' do
-      expect { app_with_grant.reload }.to_not raise_error
-    end
-
-    it 'does not delete applications that were used to create users' do
-      expect { app_with_signup.reload }.to_not raise_error
-    end
-
-    it 'does not delete owned applications' do
-      expect { app_with_owner.reload }.to_not raise_error
-    end
-
-    it 'does not delete applications registered less than a day ago' do
-      expect { recent_app.reload }.to_not raise_error
-    end
-
-    it 'deletes unused applications' do
-      expect { unused_app.reload }.to raise_error ActiveRecord::RecordNotFound
-    end
-  end
-end

From 6b4c182806b141d432f4e25a194e15aacb421128 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Mon, 27 May 2024 11:00:40 +0200
Subject: [PATCH 1130/2191] [Glitch] Fix `createDataLoadingThunk` to allow
 actions without arguments

Port 6a75e1c8c82a1625867ea69be3d0c55697448f4e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/store/typed_functions.ts  | 21 +++++++------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/app/javascript/flavours/glitch/store/typed_functions.ts b/app/javascript/flavours/glitch/store/typed_functions.ts
index 0392f373c0c6bb..dae37e62255269 100644
--- a/app/javascript/flavours/glitch/store/typed_functions.ts
+++ b/app/javascript/flavours/glitch/store/typed_functions.ts
@@ -89,21 +89,17 @@ type OnData<LoadDataResult, ReturnedData> = (
   },
 ) => ReturnedData | DiscardLoadData | Promise<ReturnedData | DiscardLoadData>;
 
+type ArgsType = Record<string, unknown> | undefined;
+
 // Overload when there is no `onData` method, the payload is the `onData` result
-export function createDataLoadingThunk<
-  LoadDataResult,
-  Args extends Record<string, unknown>,
->(
+export function createDataLoadingThunk<LoadDataResult, Args extends ArgsType>(
   name: string,
   loadData: (args: Args) => Promise<LoadDataResult>,
   thunkOptions?: AppThunkOptions,
 ): ReturnType<typeof createThunk<Args, LoadDataResult>>;
 
 // Overload when the `onData` method returns discardLoadDataInPayload, then the payload is empty
-export function createDataLoadingThunk<
-  LoadDataResult,
-  Args extends Record<string, unknown>,
->(
+export function createDataLoadingThunk<LoadDataResult, Args extends ArgsType>(
   name: string,
   loadData: (args: Args) => Promise<LoadDataResult>,
   onDataOrThunkOptions?:
@@ -113,10 +109,7 @@ export function createDataLoadingThunk<
 ): ReturnType<typeof createThunk<Args, void>>;
 
 // Overload when the `onData` method returns nothing, then the mayload is the `onData` result
-export function createDataLoadingThunk<
-  LoadDataResult,
-  Args extends Record<string, unknown>,
->(
+export function createDataLoadingThunk<LoadDataResult, Args extends ArgsType>(
   name: string,
   loadData: (args: Args) => Promise<LoadDataResult>,
   onDataOrThunkOptions?: AppThunkOptions | OnData<LoadDataResult, void>,
@@ -126,7 +119,7 @@ export function createDataLoadingThunk<
 // Overload when there is an `onData` method returning something
 export function createDataLoadingThunk<
   LoadDataResult,
-  Args extends Record<string, unknown>,
+  Args extends ArgsType,
   Returned,
 >(
   name: string,
@@ -162,7 +155,7 @@ export function createDataLoadingThunk<
  */
 export function createDataLoadingThunk<
   LoadDataResult,
-  Args extends Record<string, unknown>,
+  Args extends ArgsType,
   Returned,
 >(
   name: string,

From 2e3d6e451faeb8ee248a309c294f797586551bc6 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Mon, 27 May 2024 11:24:59 +0200
Subject: [PATCH 1131/2191] [Glitch] Enable stricter Typescript options

Port 3750e8050cb4a5707e76dfb8f49687cc0984f67f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/components/animated_number.tsx   |  5 +++--
 .../flavours/glitch/components/hashtag_bar.tsx       |  7 +++++--
 .../flavours/glitch/components/short_number.tsx      |  2 +-
 .../flavours/glitch/entrypoints/public.tsx           | 12 ++++++------
 .../glitch/entrypoints/remote_interaction_helper.ts  |  9 ++++++++-
 .../glitch/features/emoji/emoji_mart_data_light.ts   |  5 ++++-
 .../features/emoji/emoji_unicode_mapping_light.ts    |  5 ++++-
 .../flavours/glitch/store/middlewares/sounds.ts      |  5 +++--
 8 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/app/javascript/flavours/glitch/components/animated_number.tsx b/app/javascript/flavours/glitch/components/animated_number.tsx
index 05a7e01898411e..e784d445d4cfb2 100644
--- a/app/javascript/flavours/glitch/components/animated_number.tsx
+++ b/app/javascript/flavours/glitch/components/animated_number.tsx
@@ -63,8 +63,9 @@ export const AnimatedNumber: React.FC<Props> = ({ value, obfuscate }) => {
             <span
               key={key}
               style={{
-                position: direction * style.y > 0 ? 'absolute' : 'static',
-                transform: `translateY(${style.y * 100}%)`,
+                position:
+                  direction * (style.y ?? 0) > 0 ? 'absolute' : 'static',
+                transform: `translateY(${(style.y ?? 0) * 100}%)`,
               }}
             >
               {obfuscate ? (
diff --git a/app/javascript/flavours/glitch/components/hashtag_bar.tsx b/app/javascript/flavours/glitch/components/hashtag_bar.tsx
index ed5de7d3a5dff0..1642ba65042867 100644
--- a/app/javascript/flavours/glitch/components/hashtag_bar.tsx
+++ b/app/javascript/flavours/glitch/components/hashtag_bar.tsx
@@ -52,7 +52,10 @@ function uniqueHashtagsWithCaseHandling(hashtags: string[]) {
   );
 
   return Object.values(groups).map((tags) => {
-    if (tags.length === 1) return tags[0];
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- we know that the array has at least one element
+    const firstTag = tags[0]!;
+
+    if (tags.length === 1) return firstTag;
 
     // The best match is the one where we have the less difference between upper and lower case letter count
     const best = minBy(tags, (tag) => {
@@ -66,7 +69,7 @@ function uniqueHashtagsWithCaseHandling(hashtags: string[]) {
       return Math.abs(lowerCase - upperCase);
     });
 
-    return best ?? tags[0];
+    return best ?? firstTag;
   });
 }
 
diff --git a/app/javascript/flavours/glitch/components/short_number.tsx b/app/javascript/flavours/glitch/components/short_number.tsx
index 74c3c5d75e71cf..a0b523aaadc920 100644
--- a/app/javascript/flavours/glitch/components/short_number.tsx
+++ b/app/javascript/flavours/glitch/components/short_number.tsx
@@ -48,7 +48,7 @@ const ShortNumberCounter: React.FC<ShortNumberCounterProps> = ({ value }) => {
 
   const count = (
     <FormattedNumber
-      value={rawNumber}
+      value={rawNumber ?? 0}
       maximumFractionDigits={maxFractionDigits}
     />
   );
diff --git a/app/javascript/flavours/glitch/entrypoints/public.tsx b/app/javascript/flavours/glitch/entrypoints/public.tsx
index ab453ef119f962..5a8d5e08cb76b0 100644
--- a/app/javascript/flavours/glitch/entrypoints/public.tsx
+++ b/app/javascript/flavours/glitch/entrypoints/public.tsx
@@ -65,7 +65,7 @@ window.addEventListener('message', (e) => {
       {
         type: 'setHeight',
         id: data.id,
-        height: document.getElementsByTagName('html')[0].scrollHeight,
+        height: document.getElementsByTagName('html')[0]?.scrollHeight,
       },
       '*',
     );
@@ -135,7 +135,7 @@ function loaded() {
     );
   };
   const todayFormat = new IntlMessageFormat(
-    localeData['relative_format.today'] || 'Today at {time}',
+    localeData['relative_format.today'] ?? 'Today at {time}',
     locale,
   );
 
@@ -288,13 +288,13 @@ function loaded() {
       if (statusEl.dataset.spoiler === 'expanded') {
         statusEl.dataset.spoiler = 'folded';
         this.textContent = new IntlMessageFormat(
-          localeData['status.show_more'] || 'Show more',
+          localeData['status.show_more'] ?? 'Show more',
           locale,
         ).format() as string;
       } else {
         statusEl.dataset.spoiler = 'expanded';
         this.textContent = new IntlMessageFormat(
-          localeData['status.show_less'] || 'Show less',
+          localeData['status.show_less'] ?? 'Show less',
           locale,
         ).format() as string;
       }
@@ -316,8 +316,8 @@ function loaded() {
 
       const message =
         statusEl.dataset.spoiler === 'expanded'
-          ? localeData['status.show_less'] || 'Show less'
-          : localeData['status.show_more'] || 'Show more';
+          ? localeData['status.show_less'] ?? 'Show less'
+          : localeData['status.show_more'] ?? 'Show more';
       spoilerLink.textContent = new IntlMessageFormat(
         message,
         locale,
diff --git a/app/javascript/flavours/glitch/entrypoints/remote_interaction_helper.ts b/app/javascript/flavours/glitch/entrypoints/remote_interaction_helper.ts
index 8cb476f4837909..3bfc1fc1396928 100644
--- a/app/javascript/flavours/glitch/entrypoints/remote_interaction_helper.ts
+++ b/app/javascript/flavours/glitch/entrypoints/remote_interaction_helper.ts
@@ -67,7 +67,9 @@ const fetchInteractionURLFailure = () => {
   );
 };
 
-const isValidDomain = (value: string) => {
+const isValidDomain = (value: unknown) => {
+  if (typeof value !== 'string') return false;
+
   const url = new URL('https:///path');
   url.hostname = value;
   return url.hostname === value;
@@ -124,6 +126,11 @@ const fromAcct = (acct: string) => {
   const domain = segments[1];
   const fallbackTemplate = `https://${domain}/authorize_interaction?uri={uri}`;
 
+  if (!domain) {
+    fetchInteractionURLFailure();
+    return;
+  }
+
   axios
     .get(`https://${domain}/.well-known/webfinger`, {
       params: { resource: `acct:${acct}` },
diff --git a/app/javascript/flavours/glitch/features/emoji/emoji_mart_data_light.ts b/app/javascript/flavours/glitch/features/emoji/emoji_mart_data_light.ts
index ffca1f8b0630a3..806a3f8927466b 100644
--- a/app/javascript/flavours/glitch/features/emoji/emoji_mart_data_light.ts
+++ b/app/javascript/flavours/glitch/features/emoji/emoji_mart_data_light.ts
@@ -29,7 +29,10 @@ const emojis: Emojis = {};
 
 // decompress
 Object.keys(shortCodesToEmojiData).forEach((shortCode) => {
-  const [_filenameData, searchData] = shortCodesToEmojiData[shortCode];
+  const emojiData = shortCodesToEmojiData[shortCode];
+  if (!emojiData) return;
+
+  const [_filenameData, searchData] = emojiData;
   const [native, short_names, search, unified] = searchData;
 
   emojis[shortCode] = {
diff --git a/app/javascript/flavours/glitch/features/emoji/emoji_unicode_mapping_light.ts b/app/javascript/flavours/glitch/features/emoji/emoji_unicode_mapping_light.ts
index 191419496fb2a9..d116c6c62c87d0 100644
--- a/app/javascript/flavours/glitch/features/emoji/emoji_unicode_mapping_light.ts
+++ b/app/javascript/flavours/glitch/features/emoji/emoji_unicode_mapping_light.ts
@@ -46,7 +46,10 @@ function processEmojiMapData(
 Object.keys(shortCodesToEmojiData).forEach(
   (shortCode: ShortCodesToEmojiDataKey) => {
     if (shortCode === undefined) return;
-    const [filenameData, _searchData] = shortCodesToEmojiData[shortCode];
+
+    const emojiData = shortCodesToEmojiData[shortCode];
+    if (!emojiData) return;
+    const [filenameData, _searchData] = emojiData;
     filenameData.forEach((emojiMapData) => {
       processEmojiMapData(emojiMapData, shortCode);
     });
diff --git a/app/javascript/flavours/glitch/store/middlewares/sounds.ts b/app/javascript/flavours/glitch/store/middlewares/sounds.ts
index ab04f6c94b38be..ced4d910bfd689 100644
--- a/app/javascript/flavours/glitch/store/middlewares/sounds.ts
+++ b/app/javascript/flavours/glitch/store/middlewares/sounds.ts
@@ -74,8 +74,9 @@ export const soundsMiddleware = (): Middleware<
     if (isActionWithMetaSound(action)) {
       const sound = action.meta.sound;
 
-      if (sound && Object.hasOwn(soundCache, sound)) {
-        play(soundCache[sound]);
+      if (sound) {
+        const s = soundCache[sound];
+        if (s) play(s);
       }
     }
 

From 4069fae10d548ddfb7d030890224b868982f57fd Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 29 May 2024 01:34:33 +0200
Subject: [PATCH 1132/2191] [Glitch] Add support for `fediverse:creator`
 OpenGraph tag

Port 128987ededcbcdf73529d98a4f11c747b2bbe892 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../features/status/components/card.jsx       | 31 ++++++++++---
 .../flavours/glitch/styles/components.scss    | 43 +++++++++++++++++++
 2 files changed, 69 insertions(+), 5 deletions(-)

diff --git a/app/javascript/flavours/glitch/features/status/components/card.jsx b/app/javascript/flavours/glitch/features/status/components/card.jsx
index 4c535b0a46297c..c6094d0beb338f 100644
--- a/app/javascript/flavours/glitch/features/status/components/card.jsx
+++ b/app/javascript/flavours/glitch/features/status/components/card.jsx
@@ -11,8 +11,10 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import DescriptionIcon from '@/material-icons/400-24px/description-fill.svg?react';
 import OpenInNewIcon from '@/material-icons/400-24px/open_in_new.svg?react';
 import PlayArrowIcon from '@/material-icons/400-24px/play_arrow-fill.svg?react';
+import { Avatar } from 'flavours/glitch/components/avatar';
 import { Blurhash } from 'flavours/glitch/components/blurhash';
 import { Icon }  from 'flavours/glitch/components/icon';
+import { Permalink } from 'flavours/glitch/components/permalink';
 import { RelativeTimestamp } from 'flavours/glitch/components/relative_timestamp';
 import { useBlurhash } from 'flavours/glitch/initial_state';
 import { decode as decodeIDNA } from 'flavours/glitch/utils/idna';
@@ -46,6 +48,20 @@ const addAutoPlay = html => {
   return html;
 };
 
+const MoreFromAuthor = ({ author }) => (
+  <div className='more-from-author'>
+    <svg viewBox='0 0 79 79' className='logo logo--icon' role='img'>
+      <use xlinkHref='#logo-symbol-icon' />
+    </svg>
+
+    <FormattedMessage id='link_preview.more_from_author' defaultMessage='More from {name}' values={{ name: <Permalink href={author.get('url')} to={`/@${author.get('acct')}`}><Avatar account={author} size={16} /> {author.get('display_name')}</Permalink> }} />
+  </div>
+);
+
+MoreFromAuthor.propTypes = {
+  author: ImmutablePropTypes.map,
+};
+
 export default class Card extends PureComponent {
 
   static propTypes = {
@@ -126,6 +142,7 @@ export default class Card extends PureComponent {
     const interactive = card.get('type') === 'video';
     const language    = card.get('language') || '';
     const largeImage  = (card.get('image')?.length > 0 && card.get('width') > card.get('height')) || interactive;
+    const showAuthor  = !!card.get('author_account');
 
     const description = (
       <div className='status-card__content'>
@@ -136,7 +153,7 @@ export default class Card extends PureComponent {
 
         <strong className='status-card__title' title={card.get('title')} lang={language}>{card.get('title')}</strong>
 
-        {card.get('author_name').length > 0 ? <span className='status-card__author'><FormattedMessage id='link_preview.author' defaultMessage='By {name}' values={{ name: <strong>{card.get('author_name')}</strong> }} /></span> : <span className='status-card__description' lang={language}>{card.get('description')}</span>}
+        {!showAuthor && (card.get('author_name').length > 0 ? <span className='status-card__author'><FormattedMessage id='link_preview.author' defaultMessage='By {name}' values={{ name: <strong>{card.get('author_name')}</strong> }} /></span> : <span className='status-card__description' lang={language}>{card.get('description')}</span>)}
       </div>
     );
 
@@ -225,10 +242,14 @@ export default class Card extends PureComponent {
     }
 
     return (
-      <a href={card.get('url')} className={classNames('status-card', { expanded: largeImage })} target='_blank' rel='noopener noreferrer' ref={this.setRef}>
-        {embed}
-        {description}
-      </a>
+      <>
+        <a href={card.get('url')} className={classNames('status-card', { expanded: largeImage, bottomless: showAuthor })} target='_blank' rel='noopener noreferrer' ref={this.setRef}>
+          {embed}
+          {description}
+        </a>
+
+        {showAuthor && <MoreFromAuthor author={card.get('author_account')} />}
+      </>
     );
   }
 
diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index 07b18b2936a295..424b65a3f1d945 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -4133,6 +4133,10 @@ input.glitch-setting-text {
   border: 1px solid var(--background-border-color);
   border-radius: 8px;
 
+  &.bottomless {
+    border-radius: 8px 8px 0 0;
+  }
+
   &__actions {
     bottom: 0;
     inset-inline-start: 0;
@@ -10811,3 +10815,42 @@ noscript {
     }
   }
 }
+
+.more-from-author {
+  font-size: 14px;
+  color: $darker-text-color;
+  background: var(--surface-background-color);
+  border: 1px solid var(--background-border-color);
+  border-top: 0;
+  border-radius: 0 0 8px 8px;
+  padding: 15px;
+  display: flex;
+  align-items: center;
+  gap: 8px;
+
+  .logo {
+    height: 16px;
+    color: $darker-text-color;
+  }
+
+  & > span {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+  }
+
+  a {
+    display: inline-flex;
+    align-items: center;
+    gap: 4px;
+    font-weight: 500;
+    color: $primary-text-color;
+    text-decoration: none;
+
+    &:hover,
+    &:focus,
+    &:active {
+      color: $highlight-text-color;
+    }
+  }
+}

From 3ea4275ae3b7dc2b75e7a2db09b13576b49cec7a Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 30 May 2024 14:03:13 +0200
Subject: [PATCH 1133/2191] Merge pull request from GHSA-5fq7-3p3j-9vrf

---
 app/services/notify_service.rb       | 20 ++++++++++++--------
 spec/services/notify_service_spec.rb | 13 +++++++++++++
 2 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/app/services/notify_service.rb b/app/services/notify_service.rb
index e56562c0a59c58..1f01c2d48e0425 100644
--- a/app/services/notify_service.rb
+++ b/app/services/notify_service.rb
@@ -147,6 +147,9 @@ def response_to_recipient?
     end
 
     def statuses_that_mention_sender
+      # This queries private mentions from the recipient to the sender up in the thread.
+      # This allows up to 100 messages that do not match in the thread, allowing conversations
+      # involving multiple people.
       Status.count_by_sql([<<-SQL.squish, id: @notification.target_status.in_reply_to_id, recipient_id: @recipient.id, sender_id: @sender.id, depth_limit: 100])
         WITH RECURSIVE ancestors(id, in_reply_to_id, mention_id, path, depth) AS (
             SELECT s.id, s.in_reply_to_id, m.id, ARRAY[s.id], 0
@@ -154,16 +157,17 @@ def statuses_that_mention_sender
             LEFT JOIN mentions m ON m.silent = FALSE AND m.account_id = :sender_id AND m.status_id = s.id
             WHERE s.id = :id
           UNION ALL
-            SELECT s.id, s.in_reply_to_id, m.id, st.path || s.id, st.depth + 1
-            FROM ancestors st
-            JOIN statuses s ON s.id = st.in_reply_to_id
-            LEFT JOIN mentions m ON m.silent = FALSE AND m.account_id = :sender_id AND m.status_id = s.id
-            WHERE st.mention_id IS NULL AND NOT s.id = ANY(path) AND st.depth < :depth_limit
+            SELECT s.id, s.in_reply_to_id, m.id, ancestors.path || s.id, ancestors.depth + 1
+            FROM ancestors
+            JOIN statuses s ON s.id = ancestors.in_reply_to_id
+            /* early exit if we already have a mention matching our requirements */
+            LEFT JOIN mentions m ON m.silent = FALSE AND m.account_id = :sender_id AND m.status_id = s.id AND s.account_id = :recipient_id
+            WHERE ancestors.mention_id IS NULL AND NOT s.id = ANY(path) AND ancestors.depth < :depth_limit
         )
         SELECT COUNT(*)
-        FROM ancestors st
-        JOIN statuses s ON s.id = st.id
-        WHERE st.mention_id IS NOT NULL AND s.visibility = 3
+        FROM ancestors
+        JOIN statuses s ON s.id = ancestors.id
+        WHERE ancestors.mention_id IS NOT NULL AND s.account_id = :recipient_id AND s.visibility = 3
       SQL
     end
   end
diff --git a/spec/services/notify_service_spec.rb b/spec/services/notify_service_spec.rb
index 514f634d7fde5d..6064d2b050f4a3 100644
--- a/spec/services/notify_service_spec.rb
+++ b/spec/services/notify_service_spec.rb
@@ -309,6 +309,19 @@
               expect(subject.filter?).to be false
             end
           end
+
+          context 'when the sender is mentioned in an unrelated message chain' do
+            before do
+              original_status = Fabricate(:status, visibility: :direct)
+              intermediary_status = Fabricate(:status, visibility: :direct, thread: original_status)
+              notification.target_status.update(thread: intermediary_status)
+              Fabricate(:mention, status: original_status, account: notification.from_account)
+            end
+
+            it 'returns true' do
+              expect(subject.filter?).to be true
+            end
+          end
         end
       end
     end

From 16249946aea0db8a74748909d65c94742482dcb7 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 30 May 2024 14:14:04 +0200
Subject: [PATCH 1134/2191] Merge pull request from GHSA-q3rg-xx5v-4mxh

---
 config/initializers/rack_attack.rb           | 10 ++++++-
 spec/config/initializers/rack/attack_spec.rb | 31 ++++++++++++++++++--
 2 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/config/initializers/rack_attack.rb b/config/initializers/rack_attack.rb
index 1757ce5df1e487..034fb7444dc10a 100644
--- a/config/initializers/rack_attack.rb
+++ b/config/initializers/rack_attack.rb
@@ -30,13 +30,17 @@ def throttleable_remote_ip
     end
 
     def authenticated_user_id
-      authenticated_token&.resource_owner_id
+      authenticated_token&.resource_owner_id || warden_user_id
     end
 
     def authenticated_token_id
       authenticated_token&.id
     end
 
+    def warden_user_id
+      @env['warden']&.user&.id
+    end
+
     def unauthenticated?
       !authenticated_user_id
     end
@@ -141,6 +145,10 @@ def paging_request?
     req.session[:attempt_user_id] || req.params.dig('user', 'email').presence if req.post? && req.path_matches?('/auth/sign_in')
   end
 
+  throttle('throttle_password_change/account', limit: 10, period: 10.minutes) do |req|
+    req.authenticated_user_id if req.put? || (req.patch? && req.path_matches?('/auth'))
+  end
+
   self.throttled_responder = lambda do |request|
     now        = Time.now.utc
     match_data = request.env['rack.attack.match_data']
diff --git a/spec/config/initializers/rack/attack_spec.rb b/spec/config/initializers/rack/attack_spec.rb
index 0a388c2f411d7b..19de4808983bc9 100644
--- a/spec/config/initializers/rack/attack_spec.rb
+++ b/spec/config/initializers/rack/attack_spec.rb
@@ -56,7 +56,7 @@ def above_limit
     end
 
     def throttle_count
-      described_class.cache.read("#{counter_prefix}:#{throttle}:#{remote_ip}") || 0
+      described_class.cache.read("#{counter_prefix}:#{throttle}:#{discriminator}") || 0
     end
 
     def counter_prefix
@@ -64,11 +64,12 @@ def counter_prefix
     end
 
     def increment_counter
-      described_class.cache.count("#{throttle}:#{remote_ip}", period)
+      described_class.cache.count("#{throttle}:#{discriminator}", period)
     end
   end
 
   let(:remote_ip) { '1.2.3.5' }
+  let(:discriminator) { remote_ip }
 
   describe 'throttle excessive sign-up requests by IP address' do
     context 'when accessed through the website' do
@@ -149,4 +150,30 @@ def increment_counter
 
     it_behaves_like 'throttled endpoint'
   end
+
+  describe 'throttle excessive password change requests by account' do
+    let(:user) { Fabricate(:user, email: 'user@host.example') }
+    let(:throttle) { 'throttle_password_change/account' }
+    let(:limit) { 10 }
+    let(:period) { 10.minutes }
+    let(:request) { -> { put path, headers: { 'REMOTE_ADDR' => remote_ip } } }
+    let(:path) { '/auth' }
+    let(:discriminator) { user.id }
+
+    before do
+      sign_in user, scope: :user
+
+      # Unfortunately, devise's `sign_in` helper causes the `session` to be
+      # loaded in the next request regardless of whether it's actually accessed
+      # by the client code.
+      #
+      # So, we make an extra query to clear issue a session cookie instead.
+      #
+      # A less resource-intensive way to deal with that would be to generate the
+      # session cookie manually, but this seems pretty involved.
+      get '/'
+    end
+
+    it_behaves_like 'throttled endpoint'
+  end
 end

From 3fa0dd0b88bae1aeb505195044951eb9eebe90f1 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 30 May 2024 14:24:29 +0200
Subject: [PATCH 1135/2191] Merge pull request from GHSA-c2r5-cfqr-c553

* Add hardening monkey-patch to prevent IP spoofing on misconfigured installations

* Remove rack-attack safelist
---
 config/application.rb                       |  1 +
 config/initializers/rack_attack.rb          |  4 --
 lib/action_dispatch/remote_ip_extensions.rb | 72 +++++++++++++++++++++
 3 files changed, 73 insertions(+), 4 deletions(-)
 create mode 100644 lib/action_dispatch/remote_ip_extensions.rb

diff --git a/config/application.rb b/config/application.rb
index 07b50ca036ba99..6d6e91a5cc7dfe 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -48,6 +48,7 @@
 require_relative '../lib/webpacker/manifest_extensions'
 require_relative '../lib/webpacker/helper_extensions'
 require_relative '../lib/rails/engine_extensions'
+require_relative '../lib/action_dispatch/remote_ip_extensions'
 require_relative '../lib/active_record/database_tasks_extensions'
 require_relative '../lib/active_record/batches'
 require_relative '../lib/simple_navigation/item_extensions'
diff --git a/config/initializers/rack_attack.rb b/config/initializers/rack_attack.rb
index 034fb7444dc10a..b3739429e8285c 100644
--- a/config/initializers/rack_attack.rb
+++ b/config/initializers/rack_attack.rb
@@ -62,10 +62,6 @@ def paging_request?
     end
   end
 
-  Rack::Attack.safelist('allow from localhost') do |req|
-    req.remote_ip == '127.0.0.1' || req.remote_ip == '::1'
-  end
-
   Rack::Attack.blocklist('deny from blocklist') do |req|
     IpBlock.blocked?(req.remote_ip)
   end
diff --git a/lib/action_dispatch/remote_ip_extensions.rb b/lib/action_dispatch/remote_ip_extensions.rb
new file mode 100644
index 00000000000000..e5c48bf3c5b0ee
--- /dev/null
+++ b/lib/action_dispatch/remote_ip_extensions.rb
@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+# Mastodon is not made to be directly accessed without a reverse proxy.
+# This monkey-patch prevents remote IP address spoofing when being accessed
+# directly.
+#
+# See PR: https://github.com/rails/rails/pull/51610
+
+# In addition to the PR above, it also raises an error if a request with
+# `X-Forwarded-For` or `Client-Ip` comes directly from a client without
+# going through a trusted proxy.
+
+# rubocop:disable all -- This is a mostly vendored file
+
+module ActionDispatch
+  class RemoteIp
+    module GetIpExtensions
+      def calculate_ip
+        # Set by the Rack web server, this is a single value.
+        remote_addr = ips_from(@req.remote_addr).last
+
+        # Could be a CSV list and/or repeated headers that were concatenated.
+        client_ips    = ips_from(@req.client_ip).reverse!
+        forwarded_ips = ips_from(@req.x_forwarded_for).reverse!
+
+        # `Client-Ip` and `X-Forwarded-For` should not, generally, both be set. If they
+        # are both set, it means that either:
+        #
+        # 1) This request passed through two proxies with incompatible IP header
+        #     conventions.
+        #
+        # 2) The client passed one of `Client-Ip` or `X-Forwarded-For`
+        #     (whichever the proxy servers weren't using) themselves.
+        #
+        # Either way, there is no way for us to determine which header is the right one
+        # after the fact. Since we have no idea, if we are concerned about IP spoofing
+        # we need to give up and explode. (If you're not concerned about IP spoofing you
+        # can turn the `ip_spoofing_check` option off.)
+        should_check_ip = @check_ip && client_ips.last && forwarded_ips.last
+        if should_check_ip && !forwarded_ips.include?(client_ips.last)
+          # We don't know which came from the proxy, and which from the user
+          raise IpSpoofAttackError, "IP spoofing attack?! " \
+            "HTTP_CLIENT_IP=#{@req.client_ip.inspect} " \
+            "HTTP_X_FORWARDED_FOR=#{@req.x_forwarded_for.inspect}"
+        end
+
+        # NOTE: Mastodon addition to make sure we don't get requests from a non-trusted client
+        if @check_ip && (forwarded_ips.last || client_ips.last) && !@proxies.any? { |proxy| proxy === remote_addr }
+          raise IpSpoofAttackError, "IP spoofing attack?! client #{remote_addr} is not a trusted proxy " \
+            "HTTP_CLIENT_IP=#{@req.client_ip.inspect} " \
+            "HTTP_X_FORWARDED_FOR=#{@req.x_forwarded_for.inspect}"
+        end
+
+        # We assume these things about the IP headers:
+        #
+        #     - X-Forwarded-For will be a list of IPs, one per proxy, or blank
+        #     - Client-Ip is propagated from the outermost proxy, or is blank
+        #     - REMOTE_ADDR will be the IP that made the request to Rack
+        ips = forwarded_ips + client_ips
+        ips.compact!
+
+        # If every single IP option is in the trusted list, return the IP that's
+        # furthest away
+        filter_proxies([remote_addr] + ips).first || ips.last || remote_addr
+      end
+    end
+  end
+end
+
+ActionDispatch::RemoteIp::GetIp.prepend(ActionDispatch::RemoteIp::GetIpExtensions)
+
+# rubocop:enable all

From 73a78cc19d0bff68425678c6b4c0ee0fc0a0f528 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 30 May 2024 14:56:18 +0200
Subject: [PATCH 1136/2191] Fix rate-limiting incorrectly triggering a session
 cookie on most endpoints (#30483)

---
 config/initializers/rack_attack.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/initializers/rack_attack.rb b/config/initializers/rack_attack.rb
index b3739429e8285c..14fab7ecda170e 100644
--- a/config/initializers/rack_attack.rb
+++ b/config/initializers/rack_attack.rb
@@ -30,7 +30,7 @@ def throttleable_remote_ip
     end
 
     def authenticated_user_id
-      authenticated_token&.resource_owner_id || warden_user_id
+      authenticated_token&.resource_owner_id
     end
 
     def authenticated_token_id
@@ -142,7 +142,7 @@ def paging_request?
   end
 
   throttle('throttle_password_change/account', limit: 10, period: 10.minutes) do |req|
-    req.authenticated_user_id if req.put? || (req.patch? && req.path_matches?('/auth'))
+    req.warden_user_id if req.put? || (req.patch? && req.path_matches?('/auth'))
   end
 
   self.throttled_responder = lambda do |request|

From 7f808ff6e9148f1cfe1e16d000e2405b6e31f243 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 30 May 2024 15:34:46 +0200
Subject: [PATCH 1137/2191] Bump version to v4.3.0-alpha.4 (#30482)

---
 CHANGELOG.md            | 55 +++++++++++++++++++++++++++++++++++++++++
 docker-compose.yml      |  6 ++---
 lib/mastodon/version.rb |  2 +-
 3 files changed, 59 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a53790afafb8d1..c9b24d6f159e31 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,61 @@
 
 All notable changes to this project will be documented in this file.
 
+## [4.2.9] - 2024-05-30
+
+### Security
+
+- Update dependencies
+- Fix private mention filtering ([GHSA-5fq7-3p3j-9vrf](https://github.com/mastodon/mastodon/security/advisories/GHSA-5fq7-3p3j-9vrf))
+- Fix password change endpoint not being rate-limited ([GHSA-q3rg-xx5v-4mxh](https://github.com/mastodon/mastodon/security/advisories/GHSA-q3rg-xx5v-4mxh))
+- Add hardening around rate-limit bypass ([GHSA-c2r5-cfqr-c553](https://github.com/mastodon/mastodon/security/advisories/GHSA-c2r5-cfqr-c553))
+
+### Added
+
+- Add rate-limit on OAuth application registration ([ThisIsMissEm](https://github.com/mastodon/mastodon/pull/30316))
+- Add fallback redirection when getting a webfinger query `WEB_DOMAIN@WEB_DOMAIN` ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/28592))
+- Add `digest` attribute to `Admin::DomainBlock` entity in REST API ([ThisIsMissEm](https://github.com/mastodon/mastodon/pull/29092))
+
+### Removed
+
+- Remove superfluous application-level caching in some controllers ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/29862))
+- Remove aggressive OAuth application vacuuming ([ThisIsMissEm](https://github.com/mastodon/mastodon/pull/30316))
+
+### Fixed
+
+- Fix leaking Elasticsearch connections in Sidekiq processes ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/30450))
+- Fix language of remote posts not being recognized when using unusual casing ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/30403))
+- Fix off-by-one in `tootctl media` commands ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/30306))
+- Fix removal of allowed domains (in `LIMITED_FEDERATION_MODE`) not being recorded in the audit log ([ThisIsMissEm](https://github.com/mastodon/mastodon/pull/30125))
+- Fix not being able to block a subdomain of an already-blocked domain through the API ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/30119))
+- Fix `Idempotency-Key` being ignored when scheduling a post ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/30084))
+- Fix crash when supplying the `FFMPEG_BINARY` environment variable ([timothyjrogers](https://github.com/mastodon/mastodon/pull/30022))
+- Fix improper email address validation ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/29838))
+- Fix results/query in `api/v1/featured_tags/suggestions` ([mjankowski](https://github.com/mastodon/mastodon/pull/29597))
+- Fix unblocking internationalized domain names under certain conditions ([tribela](https://github.com/mastodon/mastodon/pull/29530))
+- Fix admin account created by `mastodon:setup` not being auto-approved ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/29379))
+- Fix reference to non-existent var in CLI maintenance command ([mjankowski](https://github.com/mastodon/mastodon/pull/28363))
+
+## [4.2.8] - 2024-02-23
+
+### Added
+
+- Add hourly task to automatically require approval for new registrations in the absence of moderators ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/29318), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/29355))
+  In order to prevent future abandoned Mastodon servers from being used for spam, harassment and other malicious activity, Mastodon will now automatically switch new user registrations to require moderator approval whenever they are left open and no activity (including non-moderation actions from apps) from any logged-in user with permission to access moderation reports has been detected in a full week.
+  When this happens, users with the permission to change server settings will receive an email notification.
+  This feature is disabled when `EMAIL_DOMAIN_ALLOWLIST` is used, and can also be disabled with `DISABLE_AUTOMATIC_SWITCHING_TO_APPROVED_REGISTRATIONS=true`.
+
+### Changed
+
+- Change registrations to be closed by default on new installations ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/29280))
+  If you are running a server and never changed your registrations mode from the default, updating will automatically close your registrations.
+  Simply re-enable them through the administration interface or using `tootctl settings registrations open` if you want to enable them again.
+
+### Fixed
+
+- Fix processing of remote ActivityPub actors making use of `Link` objects as `Image` `url` ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/29335))
+- Fix link verifications when page size exceeds 1MB ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/29358))
+
 ## [4.2.7] - 2024-02-16
 
 ### Fixed
diff --git a/docker-compose.yml b/docker-compose.yml
index 3f2336f1d96241..e7ae95ea7aa71a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -55,7 +55,7 @@ services:
 
   web:
     build: .
-    image: ghcr.io/mastodon/mastodon:v4.2.7
+    image: ghcr.io/mastodon/mastodon:v4.2.9
     restart: always
     env_file: .env.production
     command: bundle exec puma -C config/puma.rb
@@ -76,7 +76,7 @@ services:
 
   streaming:
     build: .
-    image: ghcr.io/mastodon/mastodon:v4.2.7
+    image: ghcr.io/mastodon/mastodon:v4.2.9
     restart: always
     env_file: .env.production
     command: node ./streaming
@@ -94,7 +94,7 @@ services:
 
   sidekiq:
     build: .
-    image: ghcr.io/mastodon/mastodon:v4.2.7
+    image: ghcr.io/mastodon/mastodon:v4.2.9
     restart: always
     env_file: .env.production
     command: bundle exec sidekiq
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index 1135ba0a174ebb..03972ba938de0b 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -17,7 +17,7 @@ def patch
     end
 
     def default_prerelease
-      'alpha.3'
+      'alpha.4'
     end
 
     def prerelease

From ad3e200bf7aa34ac7618d37532ced6a939a3e3bf Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 30 May 2024 16:41:29 +0200
Subject: [PATCH 1138/2191] fix(deps): update dependency sass to v1.77.3
 (#30476)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index da5bf1dca25293..a3490f076023f9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -15309,15 +15309,15 @@ __metadata:
   linkType: hard
 
 "sass@npm:^1.62.1":
-  version: 1.77.2
-  resolution: "sass@npm:1.77.2"
+  version: 1.77.3
+  resolution: "sass@npm:1.77.3"
   dependencies:
     chokidar: "npm:>=3.0.0 <4.0.0"
     immutable: "npm:^4.0.0"
     source-map-js: "npm:>=0.6.2 <2.0.0"
   bin:
     sass: sass.js
-  checksum: 10c0/0d292339064de3c902e209d41de9c4eb2038cff326476aeebbb5be3eee1d23400d975face2b8e124ae617b10af3e93bec01580f61912f34e4c517fe137a118b6
+  checksum: 10c0/131469168a4c41f9c3eeaac8a91b3ada0ff4746c8588ce1bc4b819c9245281075a895d5fc74f6edeeb32142a572af8a0799bd0ae698614a1fcfcfbd97b0b1256
   languageName: node
   linkType: hard
 

From a1430b710507d676716a62d042babdb3f6159c4a Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 30 May 2024 14:42:13 +0000
Subject: [PATCH 1139/2191] chore(deps): update dependency concurrent-ruby to
 v1.3.1 (#30473)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 5c480c525cd314..db3e878544d66b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -168,7 +168,7 @@ GEM
     climate_control (1.2.0)
     cocoon (1.2.15)
     color_diff (0.1)
-    concurrent-ruby (1.2.3)
+    concurrent-ruby (1.3.1)
     connection_pool (2.4.1)
     cose (1.3.0)
       cbor (~> 0.5.9)

From 00f4d9ddea4cb417a26ab547813b586a24c91e55 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 30 May 2024 16:43:35 +0200
Subject: [PATCH 1140/2191] chore(deps): update dependency node to 20.14
 (#30459)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .nvmrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.nvmrc b/.nvmrc
index 973f49d55ca1e3..c61a3d77e78f32 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-20.13
+20.14

From a0b525e50b0e53a0def7d5f4abea68737ff327f1 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 30 May 2024 16:54:51 +0200
Subject: [PATCH 1141/2191] New Crowdin Translations (automated) (#30477)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/da.json      | 3 +++
 app/javascript/mastodon/locales/de.json      | 1 +
 app/javascript/mastodon/locales/es-MX.json   | 1 +
 app/javascript/mastodon/locales/es.json      | 1 +
 app/javascript/mastodon/locales/fo.json      | 1 +
 app/javascript/mastodon/locales/fy.json      | 7 +++++++
 app/javascript/mastodon/locales/he.json      | 1 +
 app/javascript/mastodon/locales/hu.json      | 1 +
 app/javascript/mastodon/locales/ia.json      | 9 +++++----
 app/javascript/mastodon/locales/is.json      | 1 +
 app/javascript/mastodon/locales/nl.json      | 1 +
 app/javascript/mastodon/locales/sr-Latn.json | 1 +
 app/javascript/mastodon/locales/sr.json      | 1 +
 app/javascript/mastodon/locales/sv.json      | 1 +
 app/javascript/mastodon/locales/tr.json      | 1 +
 config/locales/da.yml                        | 1 +
 16 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/app/javascript/mastodon/locales/da.json b/app/javascript/mastodon/locales/da.json
index a23d537331651a..ae2968087b266d 100644
--- a/app/javascript/mastodon/locales/da.json
+++ b/app/javascript/mastodon/locales/da.json
@@ -221,6 +221,8 @@
   "domain_pill.activitypub_like_language": "ActivityPub er \"sproget\", Mastodon taler med andre sociale netværk.",
   "domain_pill.server": "Server",
   "domain_pill.their_handle": "Vedkommendes handle:",
+  "domain_pill.their_server": "Det digitale hjem, hvor alle indlæggene findes.",
+  "domain_pill.their_username": "Entydig identifikator på denne server. Det er muligt at finde brugere med samme brugernavn på forskellige servere.",
   "domain_pill.username": "Brugernavn",
   "domain_pill.whats_in_a_handle": "Hvad er der i et handle (@brugernavn)?",
   "domain_pill.who_they_are": "Da et handle fortæller, hvem nogen er, og hvor de er, kan man interagere med folk på tværs af det sociale net af <button>ActivityPub-drevne platforme</button>.",
@@ -412,6 +414,7 @@
   "limited_account_hint.action": "Vis profil alligevel",
   "limited_account_hint.title": "Denne profil er blevet skjult af {domain}-moderatorerne.",
   "link_preview.author": "Af {name}",
+  "link_preview.more_from_author": "Mere fra {name}",
   "lists.account.add": "Føj til liste",
   "lists.account.remove": "Fjern fra liste",
   "lists.delete": "Slet liste",
diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json
index 577664107946a5..ef08e9b6d3e4af 100644
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@@ -414,6 +414,7 @@
   "limited_account_hint.action": "Profil trotzdem anzeigen",
   "limited_account_hint.title": "Dieses Profil wurde von den Moderator*innen von {domain} ausgeblendet.",
   "link_preview.author": "Von {name}",
+  "link_preview.more_from_author": "Mehr von {name}",
   "lists.account.add": "Zur Liste hinzufügen",
   "lists.account.remove": "Von der Liste entfernen",
   "lists.delete": "Liste löschen",
diff --git a/app/javascript/mastodon/locales/es-MX.json b/app/javascript/mastodon/locales/es-MX.json
index 1a99d1d4b45e0a..564d7ec57fc329 100644
--- a/app/javascript/mastodon/locales/es-MX.json
+++ b/app/javascript/mastodon/locales/es-MX.json
@@ -414,6 +414,7 @@
   "limited_account_hint.action": "Mostrar perfil de todos modos",
   "limited_account_hint.title": "Este perfil ha sido ocultado por los moderadores de {domain}.",
   "link_preview.author": "Por {name}",
+  "link_preview.more_from_author": "Más de {name}",
   "lists.account.add": "Añadir a lista",
   "lists.account.remove": "Quitar de lista",
   "lists.delete": "Borrar lista",
diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json
index 1782a3a1fee792..14d3bf0dda9528 100644
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@@ -414,6 +414,7 @@
   "limited_account_hint.action": "Mostrar perfil de todos modos",
   "limited_account_hint.title": "Este perfil ha sido ocultado por los moderadores de {domain}.",
   "link_preview.author": "Por {name}",
+  "link_preview.more_from_author": "Más de {name}",
   "lists.account.add": "Añadir a lista",
   "lists.account.remove": "Quitar de lista",
   "lists.delete": "Borrar lista",
diff --git a/app/javascript/mastodon/locales/fo.json b/app/javascript/mastodon/locales/fo.json
index f22a829c0cf5d9..b77f609a2f17a8 100644
--- a/app/javascript/mastodon/locales/fo.json
+++ b/app/javascript/mastodon/locales/fo.json
@@ -414,6 +414,7 @@
   "limited_account_hint.action": "Vís vangamynd kortini",
   "limited_account_hint.title": "Hesin vangin er fjaldur av kjakleiðarunum á {domain}.",
   "link_preview.author": "Av {name}",
+  "link_preview.more_from_author": "Meira frá {name}",
   "lists.account.add": "Legg afturat lista",
   "lists.account.remove": "Tak av lista",
   "lists.delete": "Strika lista",
diff --git a/app/javascript/mastodon/locales/fy.json b/app/javascript/mastodon/locales/fy.json
index a22f4767a65ae8..8048045c5ca2f4 100644
--- a/app/javascript/mastodon/locales/fy.json
+++ b/app/javascript/mastodon/locales/fy.json
@@ -89,9 +89,12 @@
   "announcement.announcement": "Oankundiging",
   "attachments_list.unprocessed": "(net ferwurke)",
   "audio.hide": "Audio ferstopje",
+  "block_modal.remote_users_caveat": "Wy freegje de server {domain} om jo beslút te respektearjen. It neilibben hjirfan is echter net garandearre, omdat guon servers blokkaden oars ynterpretearje kinne. Iepenbiere berjochten binne mooglik noch hieltyd sichtber foar net-oanmelde brûkers.",
   "block_modal.show_less": "Minder toane",
   "block_modal.show_more": "Mear toane",
   "block_modal.they_cant_mention": "Sy kinne jo net fermelde of folgje.",
+  "block_modal.they_cant_see_posts": "De persoan kin jo berjochten net sjen en jo ek net harren berjochten.",
+  "block_modal.they_will_know": "De persoan kin sjen dat dy blokkearre wurdt.",
   "block_modal.title": "Brûker blokkearje?",
   "block_modal.you_wont_see_mentions": "Jo sjogge gjin berjochten mear dy’t dizze account fermelde.",
   "boost_modal.combo": "Jo kinne op {combo} drukke om dit de folgjende kear oer te slaan",
@@ -214,11 +217,15 @@
   "domain_block_modal.title": "Domein blokkearje?",
   "domain_block_modal.you_will_lose_followers": "Al jo folgers fan dizze server wurde ûntfolge.",
   "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.",
   "domain_pill.server": "Server",
   "domain_pill.their_handle": "Harren fediverse-adres:",
   "domain_pill.their_server": "Harren digitale thús, wer’t al harren berjochten binne.",
+  "domain_pill.their_username": "Harren unike identifikaasje-adres op harren server. It is mooglik dat der brûkers mei deselde brûkersnamme op ferskate servers te finen binne.",
   "domain_pill.username": "Brûkersnamme",
   "domain_pill.whats_in_a_handle": "Wat is in fediverse-adres?",
+  "domain_pill.who_they_are": "Omdat jo oan in fediverse-adres sjen kinne hoe’t ien hjit en op hokker server dy sit, kinne jo mei minsken op it troch <button>ActivityPub oandreaune</button> sosjale web (fediverse) kommunisearje.",
   "domain_pill.your_handle": "Jo fediverse-adres:",
   "embed.instructions": "Embed this status on your website by copying the code below.",
   "embed.preview": "Sa komt it der út te sjen:",
diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json
index 600de395979b44..dddc3184734d46 100644
--- a/app/javascript/mastodon/locales/he.json
+++ b/app/javascript/mastodon/locales/he.json
@@ -414,6 +414,7 @@
   "limited_account_hint.action": "הצג חשבון בכל זאת",
   "limited_account_hint.title": "פרופיל המשתמש הזה הוסתר על ידי המנחים של {domain}.",
   "link_preview.author": "מאת {name}",
+  "link_preview.more_from_author": "עוד מאת {name}",
   "lists.account.add": "הוסף לרשימה",
   "lists.account.remove": "הסר מרשימה",
   "lists.delete": "מחיקת רשימה",
diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json
index ba7fd6ddc2d802..dfb4b539d8a54e 100644
--- a/app/javascript/mastodon/locales/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@@ -414,6 +414,7 @@
   "limited_account_hint.action": "Profil megjelenítése mindenképpen",
   "limited_account_hint.title": "Ezt a profilt {domain} moderátorai elrejtették.",
   "link_preview.author": "{name} szerint",
+  "link_preview.more_from_author": "Több tőle: {name}",
   "lists.account.add": "Hozzáadás a listához",
   "lists.account.remove": "Eltávolítás a listából",
   "lists.delete": "Lista törlése",
diff --git a/app/javascript/mastodon/locales/ia.json b/app/javascript/mastodon/locales/ia.json
index 47c64e3f0dde88..4ca2d77b3bd1f3 100644
--- a/app/javascript/mastodon/locales/ia.json
+++ b/app/javascript/mastodon/locales/ia.json
@@ -215,8 +215,8 @@
   "domain_block_modal.they_cant_follow": "Necuno de iste servitor pote sequer te.",
   "domain_block_modal.they_wont_know": "Ille non sapera que ille ha essite blocate.",
   "domain_block_modal.title": "Blocar dominio?",
-  "domain_block_modal.you_will_lose_followers": "Omne sequitores ab iste servitor essera removite.",
-  "domain_block_modal.you_wont_see_posts": "Tu non videra messages e notificationes ab usatores sur iste servitor.",
+  "domain_block_modal.you_will_lose_followers": "Tote tu sequitores de iste servitor essera removite.",
+  "domain_block_modal.you_wont_see_posts": "Tu non videra messages e notificationes de usatores sur iste servitor.",
   "domain_pill.activitypub_lets_connect": "Illo te permitte connecter e interager con personas non solmente sur Mastodon, ma tamben sur altere applicationes social.",
   "domain_pill.activitypub_like_language": "ActivityPub es como le linguage commun que Mastodon parla con altere retes social.",
   "domain_pill.server": "Servitor",
@@ -389,7 +389,7 @@
   "keyboard_shortcuts.hotkey": "Clave accelerator",
   "keyboard_shortcuts.legend": "Monstrar iste legenda",
   "keyboard_shortcuts.local": "Aperir le chronologia local",
-  "keyboard_shortcuts.mention": "Mentionar le author",
+  "keyboard_shortcuts.mention": "Mentionar le autor",
   "keyboard_shortcuts.muted": "Aperir lista de usatores silentiate",
   "keyboard_shortcuts.my_profile": "Aperir tu profilo",
   "keyboard_shortcuts.notifications": "Aperir columna de notificationes",
@@ -414,6 +414,7 @@
   "limited_account_hint.action": "Monstrar profilo in omne caso",
   "limited_account_hint.title": "Iste profilo ha essite celate per le moderatores de {domain}.",
   "link_preview.author": "Per {name}",
+  "link_preview.more_from_author": "Plus de {name}",
   "lists.account.add": "Adder al lista",
   "lists.account.remove": "Remover del lista",
   "lists.delete": "Deler lista",
@@ -474,7 +475,7 @@
   "notification.follow_request": "{name} ha requestate de sequer te",
   "notification.mention": "{name} te ha mentionate",
   "notification.moderation-warning.learn_more": "Apprender plus",
-  "notification.moderation_warning": "Tu ha recepite un aviso de moderation",
+  "notification.moderation_warning": "Tu ha recipite un advertimento de moderation",
   "notification.moderation_warning.action_delete_statuses": "Alcunes de tu messages ha essite removite.",
   "notification.moderation_warning.action_disable": "Tu conto ha essite disactivate.",
   "notification.moderation_warning.action_mark_statuses_as_sensitive": "Alcunes de tu messages ha essite marcate como sensibile.",
diff --git a/app/javascript/mastodon/locales/is.json b/app/javascript/mastodon/locales/is.json
index f5bf7c328165d5..6ce72b43fc3afe 100644
--- a/app/javascript/mastodon/locales/is.json
+++ b/app/javascript/mastodon/locales/is.json
@@ -414,6 +414,7 @@
   "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": "Eftir {name}",
+  "link_preview.more_from_author": "Meira frá {name}",
   "lists.account.add": "Bæta á lista",
   "lists.account.remove": "Fjarlægja af lista",
   "lists.delete": "Eyða lista",
diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json
index 1958e4a6a09410..bf081ad588c1a8 100644
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@@ -414,6 +414,7 @@
   "limited_account_hint.action": "Alsnog het profiel tonen",
   "limited_account_hint.title": "Dit profiel is door de moderatoren van {domain} verborgen.",
   "link_preview.author": "Door {name}",
+  "link_preview.more_from_author": "Meer van {name}",
   "lists.account.add": "Aan lijst toevoegen",
   "lists.account.remove": "Uit lijst verwijderen",
   "lists.delete": "Lijst verwijderen",
diff --git a/app/javascript/mastodon/locales/sr-Latn.json b/app/javascript/mastodon/locales/sr-Latn.json
index 67b706fa130b9b..a78b9ff5b49402 100644
--- a/app/javascript/mastodon/locales/sr-Latn.json
+++ b/app/javascript/mastodon/locales/sr-Latn.json
@@ -414,6 +414,7 @@
   "limited_account_hint.action": "Ipak prikaži profil",
   "limited_account_hint.title": "Ovaj profil su sakrili moderatori {domain}.",
   "link_preview.author": "Po {name}",
+  "link_preview.more_from_author": "Više od {name}",
   "lists.account.add": "Dodaj na listu",
   "lists.account.remove": "Ukloni sa liste",
   "lists.delete": "Izbriši listu",
diff --git a/app/javascript/mastodon/locales/sr.json b/app/javascript/mastodon/locales/sr.json
index 9898a10a3e2f12..5c14faea856aa2 100644
--- a/app/javascript/mastodon/locales/sr.json
+++ b/app/javascript/mastodon/locales/sr.json
@@ -414,6 +414,7 @@
   "limited_account_hint.action": "Ипак прикажи профил",
   "limited_account_hint.title": "Овај профил су сакрили модератори {domain}.",
   "link_preview.author": "По {name}",
+  "link_preview.more_from_author": "Више од {name}",
   "lists.account.add": "Додај на листу",
   "lists.account.remove": "Уклони са листе",
   "lists.delete": "Избриши листу",
diff --git a/app/javascript/mastodon/locales/sv.json b/app/javascript/mastodon/locales/sv.json
index ba3a6b2f51ebda..a1d478b7ad642d 100644
--- a/app/javascript/mastodon/locales/sv.json
+++ b/app/javascript/mastodon/locales/sv.json
@@ -414,6 +414,7 @@
   "limited_account_hint.action": "Visa profil ändå",
   "limited_account_hint.title": "Denna profil har dolts av {domain}s moderatorer.",
   "link_preview.author": "Av {name}",
+  "link_preview.more_from_author": "Mer från {name}",
   "lists.account.add": "Lägg till i lista",
   "lists.account.remove": "Ta bort från lista",
   "lists.delete": "Radera lista",
diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json
index 6c011065932473..c0f8d083ad2947 100644
--- a/app/javascript/mastodon/locales/tr.json
+++ b/app/javascript/mastodon/locales/tr.json
@@ -414,6 +414,7 @@
   "limited_account_hint.action": "Yine de profili göster",
   "limited_account_hint.title": "Bu profil {domain} moderatörleri tarafından gizlendi.",
   "link_preview.author": "Yazar: {name}",
+  "link_preview.more_from_author": "{name} kişisinden daha fazlası",
   "lists.account.add": "Listeye ekle",
   "lists.account.remove": "Listeden kaldır",
   "lists.delete": "Listeyi sil",
diff --git a/config/locales/da.yml b/config/locales/da.yml
index f37086264fd2d9..cd9260dec45acf 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -1673,6 +1673,7 @@ da:
       domain_block: Serversuspendering (%{target_name})
       user_domain_block: "%{target_name} blev blokeret"
     lost_followers: Tabte følgere
+    lost_follows: Mistet følger
     preamble: Der kan mistes fulgte objekter og følgere, når et domæne blokeres eller moderatorerne beslutter at suspendere en ekstern server. Når det sker, kan der downloades lister over afbrudte relationer til inspektion og mulig import på anden server.
     purged: Oplysninger om denne server er blevet renset af serveradministratoreren.
     type: Begivenhed

From 85d9053b36674ebf1b4fdefa0028d5784b1845c7 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 30 May 2024 10:56:48 -0400
Subject: [PATCH 1142/2191] Move `pagination_params` into `API::BaseController`
 (#28845)

---
 .../api/v1/accounts/follower_accounts_controller.rb      | 4 ----
 .../api/v1/accounts/following_accounts_controller.rb     | 4 ----
 .../api/v1/admin/canonical_email_blocks_controller.rb    | 6 ------
 app/controllers/api/v1/admin/domain_allows_controller.rb | 6 ------
 app/controllers/api/v1/admin/domain_blocks_controller.rb | 6 ------
 .../api/v1/admin/email_domain_blocks_controller.rb       | 8 --------
 app/controllers/api/v1/admin/ip_blocks_controller.rb     | 8 --------
 app/controllers/api/v1/admin/tags_controller.rb          | 5 -----
 .../trends/links/preview_card_providers_controller.rb    | 6 ------
 app/controllers/api/v1/blocks_controller.rb              | 4 ----
 app/controllers/api/v1/bookmarks_controller.rb           | 4 ----
 app/controllers/api/v1/conversations_controller.rb       | 4 ----
 .../api/v1/crypto/encrypted_messages_controller.rb       | 4 ----
 app/controllers/api/v1/domain_blocks_controller.rb       | 4 ----
 app/controllers/api/v1/endorsements_controller.rb        | 4 ----
 app/controllers/api/v1/favourites_controller.rb          | 4 ----
 app/controllers/api/v1/follow_requests_controller.rb     | 4 ----
 app/controllers/api/v1/followed_tags_controller.rb       | 4 ----
 app/controllers/api/v1/lists/accounts_controller.rb      | 4 ----
 app/controllers/api/v1/mutes_controller.rb               | 4 ----
 app/controllers/api/v1/scheduled_statuses_controller.rb  | 4 ----
 .../api/v1/statuses/favourited_by_accounts_controller.rb | 4 ----
 .../api/v1/statuses/reblogged_by_accounts_controller.rb  | 4 ----
 app/controllers/api/v1/statuses_controller.rb            | 4 ----
 app/controllers/api/v1/trends/links_controller.rb        | 4 ----
 app/controllers/api/v1/trends/statuses_controller.rb     | 4 ----
 app/controllers/api/v1/trends/tags_controller.rb         | 4 ----
 app/controllers/concerns/api/pagination.rb               | 9 +++++++++
 28 files changed, 9 insertions(+), 125 deletions(-)

diff --git a/app/controllers/api/v1/accounts/follower_accounts_controller.rb b/app/controllers/api/v1/accounts/follower_accounts_controller.rb
index 449866fa556972..3f2ecb892dcb63 100644
--- a/app/controllers/api/v1/accounts/follower_accounts_controller.rb
+++ b/app/controllers/api/v1/accounts/follower_accounts_controller.rb
@@ -60,8 +60,4 @@ def pagination_since_id
   def records_continue?
     @accounts.size == limit_param(DEFAULT_ACCOUNTS_LIMIT)
   end
-
-  def pagination_params(core_params)
-    params.slice(:limit).permit(:limit).merge(core_params)
-  end
 end
diff --git a/app/controllers/api/v1/accounts/following_accounts_controller.rb b/app/controllers/api/v1/accounts/following_accounts_controller.rb
index c4f4313f8fce9d..7c16a3487e439a 100644
--- a/app/controllers/api/v1/accounts/following_accounts_controller.rb
+++ b/app/controllers/api/v1/accounts/following_accounts_controller.rb
@@ -60,8 +60,4 @@ def pagination_since_id
   def records_continue?
     @accounts.size == limit_param(DEFAULT_ACCOUNTS_LIMIT)
   end
-
-  def pagination_params(core_params)
-    params.slice(:limit).permit(:limit).merge(core_params)
-  end
 end
diff --git a/app/controllers/api/v1/admin/canonical_email_blocks_controller.rb b/app/controllers/api/v1/admin/canonical_email_blocks_controller.rb
index 701f668de620f2..c144a9e0f9302f 100644
--- a/app/controllers/api/v1/admin/canonical_email_blocks_controller.rb
+++ b/app/controllers/api/v1/admin/canonical_email_blocks_controller.rb
@@ -16,8 +16,6 @@ class Api::V1::Admin::CanonicalEmailBlocksController < Api::BaseController
   after_action :verify_authorized
   after_action :insert_pagination_headers, only: :index
 
-  PAGINATION_PARAMS = %i(limit).freeze
-
   def index
     authorize :canonical_email_block, :index?
     render json: @canonical_email_blocks, each_serializer: REST::Admin::CanonicalEmailBlockSerializer
@@ -80,8 +78,4 @@ def pagination_collection
   def records_continue?
     @canonical_email_blocks.size == limit_param(LIMIT)
   end
-
-  def pagination_params(core_params)
-    params.slice(*PAGINATION_PARAMS).permit(*PAGINATION_PARAMS).merge(core_params)
-  end
 end
diff --git a/app/controllers/api/v1/admin/domain_allows_controller.rb b/app/controllers/api/v1/admin/domain_allows_controller.rb
index a7ae84e30691b8..9801d832b8ba84 100644
--- a/app/controllers/api/v1/admin/domain_allows_controller.rb
+++ b/app/controllers/api/v1/admin/domain_allows_controller.rb
@@ -14,8 +14,6 @@ class Api::V1::Admin::DomainAllowsController < Api::BaseController
   after_action :verify_authorized
   after_action :insert_pagination_headers, only: :index
 
-  PAGINATION_PARAMS = %i(limit).freeze
-
   def index
     authorize :domain_allow, :index?
     render json: @domain_allows, each_serializer: REST::Admin::DomainAllowSerializer
@@ -77,10 +75,6 @@ def records_continue?
     @domain_allows.size == limit_param(LIMIT)
   end
 
-  def pagination_params(core_params)
-    params.slice(*PAGINATION_PARAMS).permit(*PAGINATION_PARAMS).merge(core_params)
-  end
-
   def resource_params
     params.permit(:domain)
   end
diff --git a/app/controllers/api/v1/admin/domain_blocks_controller.rb b/app/controllers/api/v1/admin/domain_blocks_controller.rb
index ae94ac59cd96cc..a20a4a9c7f8fbe 100644
--- a/app/controllers/api/v1/admin/domain_blocks_controller.rb
+++ b/app/controllers/api/v1/admin/domain_blocks_controller.rb
@@ -14,8 +14,6 @@ class Api::V1::Admin::DomainBlocksController < Api::BaseController
   after_action :verify_authorized
   after_action :insert_pagination_headers, only: :index
 
-  PAGINATION_PARAMS = %i(limit).freeze
-
   def index
     authorize :domain_block, :index?
     render json: @domain_blocks, each_serializer: REST::Admin::DomainBlockSerializer
@@ -93,10 +91,6 @@ def records_continue?
     @domain_blocks.size == limit_param(LIMIT)
   end
 
-  def pagination_params(core_params)
-    params.slice(*PAGINATION_PARAMS).permit(*PAGINATION_PARAMS).merge(core_params)
-  end
-
   def resource_params
     params.permit(:domain, :severity, :reject_media, :reject_reports, :private_comment, :public_comment, :obfuscate)
   end
diff --git a/app/controllers/api/v1/admin/email_domain_blocks_controller.rb b/app/controllers/api/v1/admin/email_domain_blocks_controller.rb
index bdedb9d0405f7f..e7bd804e366f27 100644
--- a/app/controllers/api/v1/admin/email_domain_blocks_controller.rb
+++ b/app/controllers/api/v1/admin/email_domain_blocks_controller.rb
@@ -14,10 +14,6 @@ class Api::V1::Admin::EmailDomainBlocksController < Api::BaseController
   after_action :verify_authorized
   after_action :insert_pagination_headers, only: :index
 
-  PAGINATION_PARAMS = %i(
-    limit
-  ).freeze
-
   def index
     authorize :email_domain_block, :index?
     render json: @email_domain_blocks, each_serializer: REST::Admin::EmailDomainBlockSerializer
@@ -73,8 +69,4 @@ def pagination_collection
   def records_continue?
     @email_domain_blocks.size == limit_param(LIMIT)
   end
-
-  def pagination_params(core_params)
-    params.slice(*PAGINATION_PARAMS).permit(*PAGINATION_PARAMS).merge(core_params)
-  end
 end
diff --git a/app/controllers/api/v1/admin/ip_blocks_controller.rb b/app/controllers/api/v1/admin/ip_blocks_controller.rb
index 36257811490f5c..e132a3a87d640a 100644
--- a/app/controllers/api/v1/admin/ip_blocks_controller.rb
+++ b/app/controllers/api/v1/admin/ip_blocks_controller.rb
@@ -14,10 +14,6 @@ class Api::V1::Admin::IpBlocksController < Api::BaseController
   after_action :verify_authorized
   after_action :insert_pagination_headers, only: :index
 
-  PAGINATION_PARAMS = %i(
-    limit
-  ).freeze
-
   def index
     authorize :ip_block, :index?
     render json: @ip_blocks, each_serializer: REST::Admin::IpBlockSerializer
@@ -78,8 +74,4 @@ def pagination_collection
   def records_continue?
     @ip_blocks.size == limit_param(LIMIT)
   end
-
-  def pagination_params(core_params)
-    params.slice(*PAGINATION_PARAMS).permit(*PAGINATION_PARAMS).merge(core_params)
-  end
 end
diff --git a/app/controllers/api/v1/admin/tags_controller.rb b/app/controllers/api/v1/admin/tags_controller.rb
index c75498072051e7..67d987d0e3d8a1 100644
--- a/app/controllers/api/v1/admin/tags_controller.rb
+++ b/app/controllers/api/v1/admin/tags_controller.rb
@@ -12,7 +12,6 @@ class Api::V1::Admin::TagsController < Api::BaseController
   after_action :verify_authorized
 
   LIMIT = 100
-  PAGINATION_PARAMS = %i(limit).freeze
 
   def index
     authorize :tag, :index?
@@ -59,8 +58,4 @@ def pagination_collection
   def records_continue?
     @tags.size == limit_param(LIMIT)
   end
-
-  def pagination_params(core_params)
-    params.slice(*PAGINATION_PARAMS).permit(*PAGINATION_PARAMS).merge(core_params)
-  end
 end
diff --git a/app/controllers/api/v1/admin/trends/links/preview_card_providers_controller.rb b/app/controllers/api/v1/admin/trends/links/preview_card_providers_controller.rb
index 8bb5e22716be7c..2b0f39b98f9500 100644
--- a/app/controllers/api/v1/admin/trends/links/preview_card_providers_controller.rb
+++ b/app/controllers/api/v1/admin/trends/links/preview_card_providers_controller.rb
@@ -12,8 +12,6 @@ class Api::V1::Admin::Trends::Links::PreviewCardProvidersController < Api::BaseC
   after_action :verify_authorized
   after_action :insert_pagination_headers, only: :index
 
-  PAGINATION_PARAMS = %i(limit).freeze
-
   def index
     authorize :preview_card_provider, :index?
 
@@ -57,8 +55,4 @@ def pagination_collection
   def records_continue?
     @providers.size == limit_param(LIMIT)
   end
-
-  def pagination_params(core_params)
-    params.slice(*PAGINATION_PARAMS).permit(*PAGINATION_PARAMS).merge(core_params)
-  end
 end
diff --git a/app/controllers/api/v1/blocks_controller.rb b/app/controllers/api/v1/blocks_controller.rb
index 234ab2e82cfff0..d7516c927bc714 100644
--- a/app/controllers/api/v1/blocks_controller.rb
+++ b/app/controllers/api/v1/blocks_controller.rb
@@ -43,8 +43,4 @@ def pagination_collection
   def records_continue?
     paginated_blocks.size == limit_param(DEFAULT_ACCOUNTS_LIMIT)
   end
-
-  def pagination_params(core_params)
-    params.slice(:limit).permit(:limit).merge(core_params)
-  end
 end
diff --git a/app/controllers/api/v1/bookmarks_controller.rb b/app/controllers/api/v1/bookmarks_controller.rb
index f7671a9032c066..29f08e81d2bb2d 100644
--- a/app/controllers/api/v1/bookmarks_controller.rb
+++ b/app/controllers/api/v1/bookmarks_controller.rb
@@ -46,8 +46,4 @@ def pagination_collection
   def records_continue?
     results.size == limit_param(DEFAULT_STATUSES_LIMIT)
   end
-
-  def pagination_params(core_params)
-    params.slice(:limit).permit(:limit).merge(core_params)
-  end
 end
diff --git a/app/controllers/api/v1/conversations_controller.rb b/app/controllers/api/v1/conversations_controller.rb
index a29b90855560c2..60db082a8e71a1 100644
--- a/app/controllers/api/v1/conversations_controller.rb
+++ b/app/controllers/api/v1/conversations_controller.rb
@@ -72,8 +72,4 @@ def pagination_since_id
   def records_continue?
     @conversations.size == limit_param(LIMIT)
   end
-
-  def pagination_params(core_params)
-    params.slice(:limit).permit(:limit).merge(core_params)
-  end
 end
diff --git a/app/controllers/api/v1/crypto/encrypted_messages_controller.rb b/app/controllers/api/v1/crypto/encrypted_messages_controller.rb
index d3de220393f023..93ae0e777139c3 100644
--- a/app/controllers/api/v1/crypto/encrypted_messages_controller.rb
+++ b/app/controllers/api/v1/crypto/encrypted_messages_controller.rb
@@ -44,8 +44,4 @@ def pagination_collection
   def records_continue?
     @encrypted_messages.size == limit_param(LIMIT)
   end
-
-  def pagination_params(core_params)
-    params.slice(:limit).permit(:limit).merge(core_params)
-  end
 end
diff --git a/app/controllers/api/v1/domain_blocks_controller.rb b/app/controllers/api/v1/domain_blocks_controller.rb
index 3dee2d176cccda..780ecbf1895e55 100644
--- a/app/controllers/api/v1/domain_blocks_controller.rb
+++ b/app/controllers/api/v1/domain_blocks_controller.rb
@@ -54,10 +54,6 @@ def records_continue?
     @blocks.size == limit_param(BLOCK_LIMIT)
   end
 
-  def pagination_params(core_params)
-    params.slice(:limit).permit(:limit).merge(core_params)
-  end
-
   def domain_block_params
     params.permit(:domain)
   end
diff --git a/app/controllers/api/v1/endorsements_controller.rb b/app/controllers/api/v1/endorsements_controller.rb
index 9a723d89e4f233..09bafe02312b5d 100644
--- a/app/controllers/api/v1/endorsements_controller.rb
+++ b/app/controllers/api/v1/endorsements_controller.rb
@@ -48,10 +48,6 @@ def records_continue?
     @accounts.size == limit_param(DEFAULT_ACCOUNTS_LIMIT)
   end
 
-  def pagination_params(core_params)
-    params.slice(:limit).permit(:limit).merge(core_params)
-  end
-
   def unlimited?
     params[:limit] == '0'
   end
diff --git a/app/controllers/api/v1/favourites_controller.rb b/app/controllers/api/v1/favourites_controller.rb
index 18ca9ab8661a0c..a4454e4deddf56 100644
--- a/app/controllers/api/v1/favourites_controller.rb
+++ b/app/controllers/api/v1/favourites_controller.rb
@@ -46,8 +46,4 @@ def pagination_collection
   def records_continue?
     results.size == limit_param(DEFAULT_STATUSES_LIMIT)
   end
-
-  def pagination_params(core_params)
-    params.slice(:limit).permit(:limit).merge(core_params)
-  end
 end
diff --git a/app/controllers/api/v1/follow_requests_controller.rb b/app/controllers/api/v1/follow_requests_controller.rb
index 7ffd7614bbda06..29a09fceefe82e 100644
--- a/app/controllers/api/v1/follow_requests_controller.rb
+++ b/app/controllers/api/v1/follow_requests_controller.rb
@@ -67,8 +67,4 @@ def pagination_since_id
   def records_continue?
     @accounts.size == limit_param(DEFAULT_ACCOUNTS_LIMIT)
   end
-
-  def pagination_params(core_params)
-    params.slice(:limit).permit(:limit).merge(core_params)
-  end
 end
diff --git a/app/controllers/api/v1/followed_tags_controller.rb b/app/controllers/api/v1/followed_tags_controller.rb
index 8888612b16284d..7d8f0eda1e2fd2 100644
--- a/app/controllers/api/v1/followed_tags_controller.rb
+++ b/app/controllers/api/v1/followed_tags_controller.rb
@@ -37,8 +37,4 @@ def pagination_collection
   def records_continue?
     @results.size == limit_param(TAGS_LIMIT)
   end
-
-  def pagination_params(core_params)
-    params.slice(:limit).permit(:limit).merge(core_params)
-  end
 end
diff --git a/app/controllers/api/v1/lists/accounts_controller.rb b/app/controllers/api/v1/lists/accounts_controller.rb
index aecf3910493d7d..b1c0e609d04baf 100644
--- a/app/controllers/api/v1/lists/accounts_controller.rb
+++ b/app/controllers/api/v1/lists/accounts_controller.rb
@@ -75,10 +75,6 @@ def records_continue?
     @accounts.size == limit_param(DEFAULT_ACCOUNTS_LIMIT)
   end
 
-  def pagination_params(core_params)
-    params.slice(:limit).permit(:limit).merge(core_params)
-  end
-
   def unlimited?
     params[:limit] == '0'
   end
diff --git a/app/controllers/api/v1/mutes_controller.rb b/app/controllers/api/v1/mutes_controller.rb
index dbfd7e103a2f58..d2b50e333662a3 100644
--- a/app/controllers/api/v1/mutes_controller.rb
+++ b/app/controllers/api/v1/mutes_controller.rb
@@ -43,8 +43,4 @@ def pagination_collection
   def records_continue?
     paginated_mutes.size == limit_param(DEFAULT_ACCOUNTS_LIMIT)
   end
-
-  def pagination_params(core_params)
-    params.slice(:limit).permit(:limit).merge(core_params)
-  end
 end
diff --git a/app/controllers/api/v1/scheduled_statuses_controller.rb b/app/controllers/api/v1/scheduled_statuses_controller.rb
index 1217ed014e981f..45ee58651888da 100644
--- a/app/controllers/api/v1/scheduled_statuses_controller.rb
+++ b/app/controllers/api/v1/scheduled_statuses_controller.rb
@@ -43,10 +43,6 @@ def scheduled_status_params
     params.permit(:scheduled_at)
   end
 
-  def pagination_params(core_params)
-    params.slice(:limit).permit(:limit).merge(core_params)
-  end
-
   def next_path
     api_v1_scheduled_statuses_url pagination_params(max_id: pagination_max_id) if records_continue?
   end
diff --git a/app/controllers/api/v1/statuses/favourited_by_accounts_controller.rb b/app/controllers/api/v1/statuses/favourited_by_accounts_controller.rb
index bbc8082e0cf374..5a5c2fdc976749 100644
--- a/app/controllers/api/v1/statuses/favourited_by_accounts_controller.rb
+++ b/app/controllers/api/v1/statuses/favourited_by_accounts_controller.rb
@@ -53,8 +53,4 @@ def pagination_since_id
   def records_continue?
     @accounts.size == limit_param(DEFAULT_ACCOUNTS_LIMIT)
   end
-
-  def pagination_params(core_params)
-    params.slice(:limit).permit(:limit).merge(core_params)
-  end
 end
diff --git a/app/controllers/api/v1/statuses/reblogged_by_accounts_controller.rb b/app/controllers/api/v1/statuses/reblogged_by_accounts_controller.rb
index bac96b032bef4b..0eba4fae32371f 100644
--- a/app/controllers/api/v1/statuses/reblogged_by_accounts_controller.rb
+++ b/app/controllers/api/v1/statuses/reblogged_by_accounts_controller.rb
@@ -49,8 +49,4 @@ def pagination_since_id
   def records_continue?
     @accounts.size == limit_param(DEFAULT_ACCOUNTS_LIMIT)
   end
-
-  def pagination_params(core_params)
-    params.slice(:limit).permit(:limit).merge(core_params)
-  end
 end
diff --git a/app/controllers/api/v1/statuses_controller.rb b/app/controllers/api/v1/statuses_controller.rb
index cca3865f62cced..19cc71ae58174a 100644
--- a/app/controllers/api/v1/statuses_controller.rb
+++ b/app/controllers/api/v1/statuses_controller.rb
@@ -188,8 +188,4 @@ def unexpected_accounts_error_json(error)
   def serialized_accounts(accounts)
     ActiveModel::Serializer::CollectionSerializer.new(accounts, serializer: REST::AccountSerializer)
   end
-
-  def pagination_params(core_params)
-    params.slice(:limit).permit(:limit).merge(core_params)
-  end
 end
diff --git a/app/controllers/api/v1/trends/links_controller.rb b/app/controllers/api/v1/trends/links_controller.rb
index 8edf5bbcef77eb..3c5aecff438f70 100644
--- a/app/controllers/api/v1/trends/links_controller.rb
+++ b/app/controllers/api/v1/trends/links_controller.rb
@@ -34,10 +34,6 @@ def links_from_trends
     scope
   end
 
-  def pagination_params(core_params)
-    params.slice(:limit).permit(:limit).merge(core_params)
-  end
-
   def next_path
     api_v1_trends_links_url pagination_params(offset: offset_param + limit_param(DEFAULT_LINKS_LIMIT)) if records_continue?
   end
diff --git a/app/controllers/api/v1/trends/statuses_controller.rb b/app/controllers/api/v1/trends/statuses_controller.rb
index c6fbbce16778f8..cdbfce068574f3 100644
--- a/app/controllers/api/v1/trends/statuses_controller.rb
+++ b/app/controllers/api/v1/trends/statuses_controller.rb
@@ -32,10 +32,6 @@ def statuses_from_trends
     scope
   end
 
-  def pagination_params(core_params)
-    params.slice(:limit).permit(:limit).merge(core_params)
-  end
-
   def next_path
     api_v1_trends_statuses_url pagination_params(offset: offset_param + limit_param(DEFAULT_STATUSES_LIMIT)) if records_continue?
   end
diff --git a/app/controllers/api/v1/trends/tags_controller.rb b/app/controllers/api/v1/trends/tags_controller.rb
index 6d3855a90a8a6d..b15dd50131dc96 100644
--- a/app/controllers/api/v1/trends/tags_controller.rb
+++ b/app/controllers/api/v1/trends/tags_controller.rb
@@ -30,10 +30,6 @@ def tags_from_trends
     Trends.tags.query.allowed
   end
 
-  def pagination_params(core_params)
-    params.slice(:limit).permit(:limit).merge(core_params)
-  end
-
   def next_path
     api_v1_trends_tags_url pagination_params(offset: offset_param + limit_param(DEFAULT_TAGS_LIMIT)) if records_continue?
   end
diff --git a/app/controllers/concerns/api/pagination.rb b/app/controllers/concerns/api/pagination.rb
index d84a1d99f76efe..7f06dc0202345f 100644
--- a/app/controllers/concerns/api/pagination.rb
+++ b/app/controllers/concerns/api/pagination.rb
@@ -3,6 +3,8 @@
 module Api::Pagination
   extend ActiveSupport::Concern
 
+  PAGINATION_PARAMS = %i(limit).freeze
+
   protected
 
   def pagination_max_id
@@ -24,6 +26,13 @@ def require_valid_pagination_options!
     render json: { error: 'Pagination values for `offset` and `limit` must be positive' }, status: 400 if pagination_options_invalid?
   end
 
+  def pagination_params(core_params)
+    params
+      .slice(*PAGINATION_PARAMS)
+      .permit(*PAGINATION_PARAMS)
+      .merge(core_params)
+  end
+
   private
 
   def insert_pagination_headers

From b0b425c9f98f1a4f5a3601d6e73ecb8ece143454 Mon Sep 17 00:00:00 2001
From: Jeremy Kescher <jeremy@kescher.at>
Date: Thu, 30 May 2024 18:53:31 +0200
Subject: [PATCH 1143/2191] Changelog: Fix version string, clarify where to
 find upstream changes relevant to this release

---
 CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c4c4a8234a2c5e..38b4505d237124 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,10 +2,10 @@
 
 All changes to Catstodon that aren't Mastodon or glitch-soc Mastodon changes will be documented here.
 
-## [v4.3.0-alpha.3+glitch+cat+1.2.7] - 2024-05-29
+## [v4.3.0-alpha.4+glitch+cat+1.0.0] - 2024-05-29
 
 - Upstream changes
-  - Includes security fixes announced in version 4.2.9!
+  - Includes security fixes announced in vanilla version 4.2.9! See [CHANGELOG_glitch.md](CHANGELOG_glitch.md)
 - Add ability to disable the suspicious sign-in detector
   - The CatCatNya~ production config has an IP retention period of one day. That will cause suspicious login emails to
     be sent out simply because we don't have any known IP data. Therefore, this fix is being applied.

From ced700743670372677affb7b7da811d04abbdf77 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 31 May 2024 11:08:31 +0200
Subject: [PATCH 1144/2191] chore(deps): update dependency rubocop to v1.64.1
 (#30500)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index db3e878544d66b..33053948c5797a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -579,7 +579,7 @@ GEM
     orm_adapter (0.5.0)
     ox (2.14.18)
     parallel (1.24.0)
-    parser (3.3.1.0)
+    parser (3.3.2.0)
       ast (~> 2.4.1)
       racc
     parslet (2.0.0)
@@ -726,7 +726,7 @@ GEM
       rspec-mocks (~> 3.0)
       sidekiq (>= 5, < 8)
     rspec-support (3.13.1)
-    rubocop (1.64.0)
+    rubocop (1.64.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)

From 9533a8632b5059f7e089f020c0e2fe00c798f640 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 31 May 2024 11:26:31 +0200
Subject: [PATCH 1145/2191] chore(deps): update dependency ruby to v3.3.2
 (#30480)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .ruby-version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.ruby-version b/.ruby-version
index bea438e9ade770..4772543317946f 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-3.3.1
+3.3.2

From 543fa2691626174b1dbed3af13e2e3c0e9e2294a Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 31 May 2024 11:26:40 +0200
Subject: [PATCH 1146/2191] fix(deps): update dependency sass to v1.77.4
 (#30496)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index a3490f076023f9..f77dedd4b493bc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -15309,15 +15309,15 @@ __metadata:
   linkType: hard
 
 "sass@npm:^1.62.1":
-  version: 1.77.3
-  resolution: "sass@npm:1.77.3"
+  version: 1.77.4
+  resolution: "sass@npm:1.77.4"
   dependencies:
     chokidar: "npm:>=3.0.0 <4.0.0"
     immutable: "npm:^4.0.0"
     source-map-js: "npm:>=0.6.2 <2.0.0"
   bin:
     sass: sass.js
-  checksum: 10c0/131469168a4c41f9c3eeaac8a91b3ada0ff4746c8588ce1bc4b819c9245281075a895d5fc74f6edeeb32142a572af8a0799bd0ae698614a1fcfcfbd97b0b1256
+  checksum: 10c0/b9cb4882bded282aabe38d011adfce375e1f282184fcf93dc3da5d5be834c6aa53c474c15634c351ef7bd85146cfd1cc81343654cc3bcf000d78e856da4225ef
   languageName: node
   linkType: hard
 

From dac4eba46b918e7be1153c7acf6b6f62ca644f59 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 31 May 2024 11:26:52 +0200
Subject: [PATCH 1147/2191] New Crowdin Translations (automated) (#30499)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/bg.json  |  1 +
 app/javascript/mastodon/locales/ia.json  | 10 +--
 app/javascript/mastodon/locales/lad.json |  1 +
 app/javascript/mastodon/locales/lt.json  |  5 +-
 app/javascript/mastodon/locales/lv.json  | 15 +++-
 app/javascript/mastodon/locales/sq.json  |  1 +
 app/javascript/mastodon/locales/th.json  |  1 +
 app/javascript/mastodon/locales/uk.json  |  1 +
 config/locales/devise.lt.yml             |  8 +-
 config/locales/lt.yml                    | 95 ++++++++++++++++++++----
 config/locales/simple_form.ia.yml        | 14 ++--
 11 files changed, 120 insertions(+), 32 deletions(-)

diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json
index 95d60b71ebfae7..b17172058ba752 100644
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@@ -414,6 +414,7 @@
   "limited_account_hint.action": "Показване на профила въпреки това",
   "limited_account_hint.title": "Този профил е бил скрит от модераторите на {domain}.",
   "link_preview.author": "От {name}",
+  "link_preview.more_from_author": "Още от {name}",
   "lists.account.add": "Добавяне към списък",
   "lists.account.remove": "Премахване от списъка",
   "lists.delete": "Изтриване на списъка",
diff --git a/app/javascript/mastodon/locales/ia.json b/app/javascript/mastodon/locales/ia.json
index 4ca2d77b3bd1f3..4bcf4c88b5765c 100644
--- a/app/javascript/mastodon/locales/ia.json
+++ b/app/javascript/mastodon/locales/ia.json
@@ -494,7 +494,7 @@
   "notification.status": "{name} ha justo ora publicate",
   "notification.update": "{name} ha modificate un message",
   "notification_requests.accept": "Acceptar",
-  "notification_requests.dismiss": "Dimitter",
+  "notification_requests.dismiss": "Clauder",
   "notification_requests.notifications_from": "Notificationes de {name}",
   "notification_requests.title": "Notificationes filtrate",
   "notifications.clear": "Rader notificationes",
@@ -622,7 +622,7 @@
   "relative_time.today": "hodie",
   "reply_indicator.attachments": "{count, plural, one {# annexo} other {# annexos}}",
   "reply_indicator.cancel": "Cancellar",
-  "reply_indicator.poll": "Inquesta",
+  "reply_indicator.poll": "Sondage",
   "report.block": "Blocar",
   "report.block_explanation": "Tu non videra le messages de iste persona. Ille non potera vider tu messages o sequer te. Ille potera saper de esser blocate.",
   "report.categories.legal": "Juridic",
@@ -678,7 +678,7 @@
   "search.quick_action.status_search": "Messages correspondente a {x}",
   "search.search_or_paste": "Cerca o colla un URL",
   "search_popout.full_text_search_disabled_message": "Non disponibile sur {domain}.",
-  "search_popout.full_text_search_logged_out_message": "Solmente disponibile al initiar le session.",
+  "search_popout.full_text_search_logged_out_message": "Solmente disponibile post aperir session.",
   "search_popout.language_code": "Codice de lingua ISO",
   "search_popout.options": "Optiones de recerca",
   "search_popout.quick_actions": "Actiones rapide",
@@ -758,7 +758,7 @@
   "status.show_original": "Monstrar original",
   "status.title.with_attachments": "{user} ha publicate {attachmentCount, plural, one {un annexo} other {{attachmentCount} annexos}}",
   "status.translate": "Traducer",
-  "status.translated_from_with": "Traducite ab {lang} usante {provider}",
+  "status.translated_from_with": "Traducite de {lang} usante {provider}",
   "status.uncached_media_warning": "Previsualisation non disponibile",
   "status.unmute_conversation": "Non plus silentiar conversation",
   "status.unpin": "Disfixar del profilo",
@@ -797,7 +797,7 @@
   "upload_modal.choose_image": "Seliger un imagine",
   "upload_modal.description_placeholder": "Cinque expertos del zoo jam bibeva whisky frigide",
   "upload_modal.detect_text": "Deteger texto de un imagine",
-  "upload_modal.edit_media": "Modificar le medio",
+  "upload_modal.edit_media": "Modificar multimedia",
   "upload_modal.hint": "Clicca o trahe le circulo sur le previsualisation pro eliger le puncto focal que essera sempre visibile sur tote le miniaturas.",
   "upload_modal.preparing_ocr": "Preparation del OCR…",
   "upload_modal.preview_label": "Previsualisation ({ratio})",
diff --git a/app/javascript/mastodon/locales/lad.json b/app/javascript/mastodon/locales/lad.json
index 533f074004caf6..72299bb861b091 100644
--- a/app/javascript/mastodon/locales/lad.json
+++ b/app/javascript/mastodon/locales/lad.json
@@ -398,6 +398,7 @@
   "limited_account_hint.action": "Amostra el profil entanto",
   "limited_account_hint.title": "Este profil fue eskondido por los moderadores de {domain}.",
   "link_preview.author": "Publikasyon de {name}",
+  "link_preview.more_from_author": "Mas de {name}",
   "lists.account.add": "Adjusta a lista",
   "lists.account.remove": "Kita de lista",
   "lists.delete": "Efasa lista",
diff --git a/app/javascript/mastodon/locales/lt.json b/app/javascript/mastodon/locales/lt.json
index 5fc7d32869a676..40541b37571e29 100644
--- a/app/javascript/mastodon/locales/lt.json
+++ b/app/javascript/mastodon/locales/lt.json
@@ -414,6 +414,7 @@
   "limited_account_hint.action": "Vis tiek rodyti profilį",
   "limited_account_hint.title": "Šį profilį paslėpė {domain} prižiūrėtojai.",
   "link_preview.author": "Sukūrė {name}",
+  "link_preview.more_from_author": "Daugiau iš {name}",
   "lists.account.add": "Pridėti į sąrašą",
   "lists.account.remove": "Pašalinti iš sąrašo",
   "lists.delete": "Ištrinti sąrašą",
@@ -561,7 +562,7 @@
   "onboarding.steps.setup_profile.title": "Suasmenink savo profilį",
   "onboarding.steps.share_profile.body": "Leisk draugams sužinoti, kaip tave rasti Mastodon.",
   "onboarding.steps.share_profile.title": "Bendrink savo Mastodon profilį",
-  "onboarding.tips.2fa": "<strong>Ar žinojai?</strong> Savo paskyrą gali apsaugoti nustatęs (-usi) dviejų veiksnių tapatybės nustatymą paskyros nustatymuose. Jis veikia su bet kuria pasirinkta TOTP programėle, telefono numeris nebūtinas.",
+  "onboarding.tips.2fa": "<strong>Ar žinojai?</strong> Savo paskyrą gali apsaugoti nustatant dviejų veiksnių tapatybės nustatymą paskyros nustatymuose. Jis veikia su bet kuria pasirinkta TOTP programėle, telefono numeris nebūtinas.",
   "onboarding.tips.accounts_from_other_servers": "<strong>Ar žinojai?</strong> Kadangi Mastodon decentralizuotas, kai kurie profiliai, su kuriais susidursi, bus talpinami ne tavo, o kituose serveriuose. Ir vis tiek galėsi su jais sklandžiai bendrauti! Jų serveris yra antroje naudotojo vardo pusėje.",
   "onboarding.tips.migration": "<strong>Ar žinojai?</strong> Jei manai, kad {domain} serveris ateityje tau netiks, gali persikelti į kitą Mastodon serverį neprarandant savo sekėjų. Gali net talpinti savo paties serverį.",
   "onboarding.tips.verification": "<strong>Ar žinojai?</strong> Savo paskyrą gali patvirtinti pateikęs (-usi) nuorodą į Mastodon profilį savo interneto svetainėje ir pridėjęs (-usi) svetainę prie savo profilio. Nereikia jokių mokesčių ar dokumentų.",
@@ -632,7 +633,7 @@
   "report.reasons.legal_description": "Manai, kad tai pažeidžia tavo arba serverio šalies įstatymus",
   "report.reasons.other": "Tai kažkas kita",
   "report.reasons.other_description": "Problema netinka kitoms kategorijoms",
-  "report.reasons.spam": "Tai šlamštas",
+  "report.reasons.spam": "Tai – šlamštas",
   "report.reasons.spam_description": "Kenkėjiškos nuorodos, netikras įsitraukimas arba pasikartojantys atsakymai",
   "report.reasons.violation": "Tai pažeidžia serverio taisykles",
   "report.reasons.violation_description": "Žinai, kad tai pažeidžia konkrečias taisykles",
diff --git a/app/javascript/mastodon/locales/lv.json b/app/javascript/mastodon/locales/lv.json
index b61a2c0c360c5d..7a1d583d9a30e5 100644
--- a/app/javascript/mastodon/locales/lv.json
+++ b/app/javascript/mastodon/locales/lv.json
@@ -92,6 +92,8 @@
   "block_modal.remote_users_caveat": "Mēs vaicāsim serverim {domain} ņemt vērā Tavu lēmumu. Tomēr atbilstība nav nodrošināta, jo atsevišķi serveri var apstrādāt bloķēšanu citādi. Publiski ieraksti joprojām var būt redzami lietotājiem, kuri nav pieteikušies.",
   "block_modal.show_less": "Rādīt mazāk",
   "block_modal.show_more": "Parādīt mazāk",
+  "block_modal.they_cant_mention": "Nevar Tevi pieminēt vai sekot Tev.",
+  "block_modal.they_cant_see_posts": "Nevar redzēt Tavus ierakstus, un Tu neredzēsi lietotāja.",
   "boost_modal.combo": "Nospied {combo}, lai nākamreiz šo izlaistu",
   "bundle_column_error.copy_stacktrace": "Kopēt kļūdu ziņojumu",
   "bundle_column_error.error.body": "Pieprasīto lapu nevarēja atveidot. Tas varētu būt saistīts ar kļūdu mūsu kodā, vai tā ir pārlūkprogrammas saderības problēma.",
@@ -377,6 +379,7 @@
   "limited_account_hint.action": "Tik un tā rādīt profilu",
   "limited_account_hint.title": "{domain} moderatori ir paslēpuši šo profilu.",
   "link_preview.author": "Pēc {name}",
+  "link_preview.more_from_author": "Vairāk no {name}",
   "lists.account.add": "Pievienot sarakstam",
   "lists.account.remove": "Noņemt no saraksta",
   "lists.delete": "Izdzēst sarakstu",
@@ -448,12 +451,15 @@
   "notification_requests.accept": "Pieņemt",
   "notification_requests.dismiss": "Noraidīt",
   "notification_requests.notifications_from": "Paziņojumi no {name}",
+  "notification_requests.title": "Atlasītie paziņojumi",
   "notifications.clear": "Notīrīt paziņojumus",
   "notifications.clear_confirmation": "Vai tiešām vēlies neatgriezeniski notīrīt visus savus paziņojumus?",
   "notifications.column_settings.admin.report": "Jauni ziņojumi:",
   "notifications.column_settings.admin.sign_up": "Jaunas pierakstīšanās:",
   "notifications.column_settings.alert": "Darbvirsmas paziņojumi",
   "notifications.column_settings.favourite": "Izlase:",
+  "notifications.column_settings.filter_bar.advanced": "Attēlot visas kategorijas",
+  "notifications.column_settings.filter_bar.category": "Atrās atlasīšanas josla",
   "notifications.column_settings.follow": "Jauni sekotāji:",
   "notifications.column_settings.follow_request": "Jauni sekošanas pieprasījumi:",
   "notifications.column_settings.mention": "Pieminēšanas:",
@@ -481,7 +487,9 @@
   "notifications.permission_required": "Darbvirsmas paziņojumi nav pieejami, jo nav piešķirta nepieciešamā atļauja.",
   "notifications.policy.filter_new_accounts_title": "Jauni konti",
   "notifications.policy.filter_not_followers_title": "Cilvēki, kuri Tev neseko",
+  "notifications.policy.filter_not_following_hint": "Līdz tos pašrocīgi apstiprināsi",
   "notifications.policy.filter_not_following_title": "Cilvēki, kuriem Tu neseko",
+  "notifications.policy.title": "Atlasīt paziņojumus no…",
   "notifications_permission_banner.enable": "Iespējot darbvirsmas paziņojumus",
   "notifications_permission_banner.how_to_control": "Lai saņemtu paziņojumus, kad Mastodon nav atvērts, iespējo darbvirsmas paziņojumus. Vari precīzi kontrolēt, kāda veida mijiedarbības rada darbvirsmas paziņojumus, izmantojot augstāk redzamo pogu {icon}, kad tie būs iespējoti.",
   "notifications_permission_banner.title": "Nekad nepalaid neko garām",
@@ -539,7 +547,9 @@
   "privacy.direct.short": "Noteikti cilvēki",
   "privacy.private.long": "Tikai Tavi sekotāji",
   "privacy.private.short": "Sekotāji",
+  "privacy.public.long": "Jebkurš Mastodon un ārpus tā",
   "privacy.public.short": "Publiska",
+  "privacy.unlisted.long": "Mazāk algoritmisku fanfaru",
   "privacy_policy.last_updated": "Pēdējo reizi atjaunināta {date}",
   "privacy_policy.title": "Privātuma politika",
   "recommended": "Ieteicams",
@@ -557,6 +567,7 @@
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "šodien",
+  "reply_indicator.attachments": "{count, plural, zero{# pielikumu} one {# pielikums} other {# pielikumi}}",
   "reply_indicator.cancel": "Atcelt",
   "reply_indicator.poll": "Aptauja",
   "report.block": "Bloķēt",
@@ -630,7 +641,7 @@
   "search_results.title": "Meklēt {q}",
   "server_banner.about_active_users": "Cilvēki, kas izmantojuši šo serveri pēdējo 30 dienu laikā (aktīvie lietotāji mēnesī)",
   "server_banner.active_users": "aktīvi lietotāji",
-  "server_banner.administered_by": "Administrē:",
+  "server_banner.administered_by": "Pārvalda:",
   "server_banner.introduction": "{domain} ir daļa no decentralizētā sociālā tīkla, ko nodrošina {mastodon}.",
   "server_banner.learn_more": "Uzzināt vairāk",
   "server_banner.server_stats": "Servera statistika:",
@@ -655,6 +666,7 @@
   "status.edited_x_times": "Labots {count, plural, one {{count} reizi} other {{count} reizes}}",
   "status.embed": "Iegult",
   "status.favourite": "Izlasē",
+  "status.favourites": "{count, plural, zero {izlasēs} one {izlasē} other {izlasēs}}",
   "status.filter": "Filtrē šo ziņu",
   "status.filtered": "Filtrēts",
   "status.hide": "Slēpt ierakstu",
@@ -675,6 +687,7 @@
   "status.reblog": "Pastiprināt",
   "status.reblog_private": "Pastiprināt, nemainot redzamību",
   "status.reblogged_by": "{name} pastiprināja",
+  "status.reblogs": "{count, plural, zero {pastiprinājumu} one {pastiprinājums} other {pastiprinājumi}}",
   "status.reblogs.empty": "Neviens šo ierakstu vēl nav pastiprinājis. Kad būs, tie parādīsies šeit.",
   "status.redraft": "Dzēst un pārrakstīt",
   "status.remove_bookmark": "Noņemt grāmatzīmi",
diff --git a/app/javascript/mastodon/locales/sq.json b/app/javascript/mastodon/locales/sq.json
index b496f8e20385a5..6b3c5fbd905fc3 100644
--- a/app/javascript/mastodon/locales/sq.json
+++ b/app/javascript/mastodon/locales/sq.json
@@ -414,6 +414,7 @@
   "limited_account_hint.action": "Shfaqe profilin sido qoftë",
   "limited_account_hint.title": "Ky profil është fshehur nga moderatorët e {domain}.",
   "link_preview.author": "Nga {name}",
+  "link_preview.more_from_author": "Më tepër nga {name}",
   "lists.account.add": "Shto në listë",
   "lists.account.remove": "Hiqe nga lista",
   "lists.delete": "Fshije listën",
diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json
index b1b9407ba11d9a..e16e3935751159 100644
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@@ -414,6 +414,7 @@
   "limited_account_hint.action": "แสดงโปรไฟล์ต่อไป",
   "limited_account_hint.title": "มีการซ่อนโปรไฟล์นี้โดยผู้กลั่นกรองของ {domain}",
   "link_preview.author": "โดย {name}",
+  "link_preview.more_from_author": "เพิ่มเติมจาก {name}",
   "lists.account.add": "เพิ่มไปยังรายการ",
   "lists.account.remove": "เอาออกจากรายการ",
   "lists.delete": "ลบรายการ",
diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json
index 3a7f63206d37e7..f750fce0407fe3 100644
--- a/app/javascript/mastodon/locales/uk.json
+++ b/app/javascript/mastodon/locales/uk.json
@@ -414,6 +414,7 @@
   "limited_account_hint.action": "Усе одно показати профіль",
   "limited_account_hint.title": "Цей профіль сховали модератори {domain}.",
   "link_preview.author": "Від {name}",
+  "link_preview.more_from_author": "Більше від {name}",
   "lists.account.add": "Додати до списку",
   "lists.account.remove": "Вилучити зі списку",
   "lists.delete": "Видалити список",
diff --git a/config/locales/devise.lt.yml b/config/locales/devise.lt.yml
index e36e60a7588485..f27b68b7089dd0 100644
--- a/config/locales/devise.lt.yml
+++ b/config/locales/devise.lt.yml
@@ -76,7 +76,7 @@ lt:
       webauthn_disabled:
         explanation: Tavo paskyrai išjungtas tapatybės nustatymas naudojant saugumo raktus.
         extra: Prisijungimas dabar galimas naudojant tik susietos TOTP programėlės sugeneruotą prieigos raktą.
-        subject: 'Mastodon: tapatybės nustatymas naudojant saugumo raktai išjungta'
+        subject: 'Mastodon: tapatybės nustatymas su saugumo raktai išjungta'
         title: Saugumo raktai išjungti
       webauthn_enabled:
         explanation: Tavo paskyrai įjungtas saugumo rakto tapatybės nustatymas.
@@ -98,8 +98,8 @@ lt:
       signed_up_but_inactive: Sėkmingai užsiregistravai. Tačiau negalėjome tavęs prijungti, nes tavo paskyra dar nėra aktyvuota.
       signed_up_but_locked: Sėkmingai užsiregistravai. Tačiau negalėjome tavęs prijungti, nes tavo paskyra dar užrakinta.
       signed_up_but_pending: Į tavo el. pašto adresą buvo išsiųstas laiškas su patvirtinimo nuoroda. Paspaudęs (-usi) nuorodą, peržiūrėsime tavo paraišką. Tau bus pranešta, jei ji patvirtinta.
-      signed_up_but_unconfirmed: Į tavo el. pašto adresą buvo išsiųstas laiškas su patvirtinimo nuoroda. Paspausk nuorodą, kad aktyvuotum savo paskyrą. Jei negavai šio el. laiško, patikrink šlamšto aplanką.
-      update_needs_confirmation: Sėkmingai atnaujinai savo paskyrą, bet mums reikia patvirtinti naująjį el. pašto adresą. Patikrink savo el. paštą ir paspausk patvirtinimo nuorodą, kad patvirtintum savo naują el. pašto adresą. Jei negavai šio el. laiško, patikrink šlamšto aplanką.
+      signed_up_but_unconfirmed: Į tavo el. pašto adresą buvo išsiųstas laiškas su patvirtinimo nuoroda. Sek nuorodą, kad aktyvuotum savo paskyrą. Jei negavai šio el. laiško, patikrink šlamšto aplanką.
+      update_needs_confirmation: Sėkmingai atnaujinai savo paskyrą, bet mums reikia patvirtinti naująjį el. pašto adresą. Patikrink savo el. paštą ir sek patvirtinimo nuorodą, kad patvirtintum savo naują el. pašto adresą. Jei negavai šio el. laiško, patikrink šlamšto aplanką.
       updated: Tavo paskyra buvo sėkmingai atnaujinta.
     sessions:
       already_signed_out: Atsijungta sėkmingai.
@@ -107,7 +107,7 @@ lt:
       signed_out: Atjungta sėkmingai.
     unlocks:
       send_instructions: Po kelių minučių gausi el. laišką su instrukcijomis, kaip atrakinti paskyrą. Jei negavai šio el. laiško, patikrink šlamšto aplanką.
-      send_paranoid_instructions: Jei paskyra egzistuoja, po kelių minučių gausi el. laišką su instrukcijomis, kaip ją atrakinti. Jei negavai šio el. laiško, patikrink šlamšto aplanką.
+      send_paranoid_instructions: Jei tavo paskyra egzistuoja, po kelių minučių gausi el. laišką su instrukcijomis, kaip ją atrakinti. Jei negavai šio el. laiško, patikrink šlamšto aplanką.
       unlocked: Tavo paskyra sėkmingai atrakinta. Norėdamas (-a) tęsti, prisijunk.
   errors:
     messages:
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 77fcf42866abe1..c29218c1fe756f 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -265,10 +265,10 @@ lt:
         destroy_user_role_html: "%{name} ištrynė %{target} vaidmenį"
         disable_2fa_user_html: "%{name} išjungė dviejų veiksnių reikalavimą naudotojui %{target}"
         disable_custom_emoji_html: "%{name} išjungė jaustuką %{target}"
-        disable_sign_in_token_auth_user_html: "%{name} išjungė el. pašto prieigos tapatybės nustatymą %{target}"
+        disable_sign_in_token_auth_user_html: "%{name} išjungė el. pašto prieigos tapatybės nustatymą naudotojui %{target}"
         disable_user_html: "%{name} išjungė prisijungimą naudotojui %{target}"
         enable_custom_emoji_html: "%{name} įjungė jaustuką %{target}"
-        enable_sign_in_token_auth_user_html: "%{name} įjungė el. pašto prieigos tapatybės nustatymą %{target}"
+        enable_sign_in_token_auth_user_html: "%{name} įjungė el. pašto prieigos tapatybės nustatymą naudotojui %{target}"
         enable_user_html: "%{name} įjungė prisijungimą naudotojui %{target}"
         memorialize_account_html: "%{name} pavertė %{target} paskyrą į atminimo puslapį"
         promote_user_html: "%{name} paaukštino naudotoją %{target}"
@@ -440,6 +440,9 @@ lt:
         create: Pridėto domeną
         title: Naujas el pašto juodojo sąrašo įtraukimas
       title: El pašto juodasis sąrašas
+    export_domain_blocks:
+      import:
+        description_html: Netrukus importuosi domenų blokavimų sąrašą. Labai atidžiai peržiūrėk šį sąrašą, ypač jei ne tu jį sudarei.
     instances:
       availability:
         title: Prieinamumas
@@ -493,6 +496,7 @@ lt:
       destroyed_msg: Skundo žinutė sekmingai ištrinta!
     reports:
       action_taken_by: Veiksmo ėmėsi
+      actions_description_html: Nuspręsk, kokių veiksmų imtis, kad išspręstum šią ataskaitą. Jei imsis baudžiamųjų veiksmų prieš paskyrą, apie kurią pranešta, jiems bus išsiųstas el. laiško pranešimas, išskyrus atvejus, kai pasirinkta kategorija <strong>Šlamštas</strong>.
       already_suspended_badges:
         local: Jau sustabdytas šiame serveryje
         remote: Jau sustabdytas jų serveryje
@@ -534,6 +538,7 @@ lt:
         manage_invites: Tvarkyti kvietimus
         manage_invites_description: Leidžia naudotojams naršyti ir deaktyvuoti kvietimų nuorodas.
         manage_taxonomies_description: Leidžia naudotojams peržiūrėti tendencingą turinį ir atnaujinti saitažodžių nustatymus
+        manage_user_access_description: Leidžia naudotojams išjungti kitų naudotojų dvigubo tapatybės nustatymą, pakeisti el. pašto adresą ir iš naujo nustatyti slaptažodį.
     settings:
       captcha_enabled:
         desc_html: Tai priklauso nuo hCaptcha išorinių skriptų, kurie gali kelti susirūpinimą dėl saugumo ir privatumo. Be to, <strong>dėl to registracijos procesas kai kuriems žmonėms (ypač neįgaliesiems) gali būti gerokai sunkiau prieinami</strong>. Dėl šių priežasčių apsvarstyk alternatyvias priemones, pavyzdžiui, patvirtinimu arba kvietimu grindžiamą registraciją.
@@ -546,6 +551,15 @@ lt:
         all: Visiems
       registrations:
         moderation_recommandation: Prieš atidarant registraciją visiems, įsitikink, kad turi tinkamą ir reaguojančią prižiūrėjimo komandą!
+      registrations_mode:
+        modes:
+          approved: Registracijai privalomas patvirtinimas
+        warning_hint: Rekomenduojame naudoti „Registracijai privalomas patvirtinimas“, nebent esi tikras (-a), kad tavo prižiūrėjimo komanda gali laiku apdoroti šlamštus ir kenkėjiškas registracijas.
+      security:
+        authorized_fetch: Reikalauti tapatybės nustatymo iš federacinių serverių
+        authorized_fetch_hint: Reikalauti tapatybės nustatymo iš federacinių serverių leidžia griežčiau užtikrinti tiek naudotojo, tiek serverio lygio blokų vykdymą. Tačiau dėl to nukenčia našumas, sumažėja atsakymų pasiekiamumas ir gali kilti suderinamumo su kai kuriomis federacinėmis paslaugomis problemų. Be to, tai nesutrukdys skirtiems dalyviams gauti tavo viešų įrašų ir paskyrų.
+        authorized_fetch_overridden_hint: Šiuo metu negali pakeisti šio nustatymo, nes jį pakeičia aplinkos kintamasis.
+        federation_authentication: Federacijos tapatybės nustatymo vykdymas
     software_updates:
       description: Rekomenduojama nuolat atnaujinti Mastodon diegyklę, kad galėtum naudotis naujausiais pataisymais ir funkcijomis. Be to, kartais labai svarbu laiku atnaujinti Mastodon, kad būtų išvengta saugumo problemų. Dėl šių priežasčių Mastodon kas 30 minučių tikrina, ar yra naujinimų, ir praneša tau apie tai pagal tavo el. pašto pranešimų parinktis.
       documentation_link: Sužinoti daugiau
@@ -687,34 +701,71 @@ lt:
     warning: Būkite atsargūs su šia informacija. Niekada jos nesidalinkite!
     your_token: Tavo prieigos raktas
   auth:
+    apply_for_account: Prašyti paskyros
+    captcha_confirmation:
+      help_html: Jei turi problemų išsprendžiant CAPTCHA, gali susisiekti su mumis per %{email} ir mes tau padėsime.
+      hint_html: Dar vienas dalykas! Turime patvirtinti, kad esi žmogus (kad galėtume išvengti šlamšto). Išspręsk toliau pateiktą CAPTCHA ir spausk Tęsti.
+      title: Saugumo patikrinimas
     confirmations:
+      awaiting_review: Tavo el. pašto adresas yra patvirtintas! Domeno %{domain} personalas dabar tikrina tavo registraciją. Jei jie patvirtins tavo paskyrą, gausi el. laišką.
+      awaiting_review_title: Peržiūrima tavo registracija
+      clicking_this_link: paspausti šį nuorodą
+      login_link: prisijungti
+      proceed_to_login_html: Dabar gali pereiti prie %{login_link}.
+      redirect_to_app_html: Turėjei būti nukreiptas (-a) į <strong>%{app_name}</strong> programėlę. Jei taip neatsitiko, pabandyk %{clicking_this_link} arba rankiniu būdu grįžk į programėlę.
+      registration_complete: Tavo registracija domene %{domain} baigta!
       welcome_title: Sveiki, %{name}!
+      wrong_email_hint: Jei šis el. pašto adresas neteisingas, gali jį pakeisti paskyros nustatymuose.
     delete_account: Ištrinti paskyrą
-    delete_account_html: Jeigu norite ištrinti savo paskyrą, galite eiti <a href="%{path}">čia</a>. Jūsų prašys patvirtinti pasirinkimą.
+    delete_account_html: Jei nori ištrinti savo paskyrą, gali <a href="%{path}">tęsti čia</a>. Tavęs bus paprašyta patvirtinimo.
     description:
       prefix_invited_by_user: "@%{name} kviečia prisijungti prie šio Mastodon serverio!"
-      prefix_sign_up: Užsiregistruok Mastodon šiandien!
+      prefix_sign_up: Užsiregistruok sistemoje Mastodon šiandien!
+      suffix: Su paskyra galėsi sekti žmones, skelbti naujienas ir keistis žinutėmis su bet kurio Mastodon serverio naudotojais ir dar daugiau!
     didnt_get_confirmation: Negavai patvirtinimo nuorodos?
     dont_have_your_security_key: Neturi saugumo rakto?
     forgot_password: Pamiršai slaptažodį?
     invalid_reset_password_token: Slaptažodžio atkūrimo raktas yra netinkamas arba nebegaliojantis. Paprašyk naujo.
+    link_to_otp: Įvesk dvigubą kodą iš telefono arba atkūrimo kodą
+    link_to_webauth: Naudoti saugumo rakto įrenginį
     log_in_with: Prisijungti su
     login: Prisijungti
     logout: Atsijungti
-    migrate_account: Prisijungti prie kitos paskyros
-    migrate_account_html: Jeigu norite nukreipti šią paskyrą į kita, galite tai <a href="%{path}">konfiguruoti čia</a>.
+    migrate_account: Persikelti prie kitos paskyros
+    migrate_account_html: Jei nori šią paskyrą nukreipti į kitą, gali <a href="%{path}">sukonfigūruoti ją čia</a>.
     or_log_in_with: Arba prisijungti su
+    privacy_policy_agreement_html: Perskaičiau ir sutinku su <a href="%{privacy_policy_path}" target="_blank">privatumo politika</a>
+    progress:
+      confirm: Patvirtinti el. paštą
+      details: Tavo duomenys
+      review: Mūsų peržiūra
+      rules: Priimti taisykles
     providers:
       cas: CAS
       saml: SAML
     register: Užsiregistruoti
-    reset_password: Atstatyti slaptažodį
+    registration_closed: "%{instance} nepriima naujų narių"
+    resend_confirmation: Iš naujo siųsti patvirtinimo nuorodą
+    reset_password: Nustatyti iš naujo slaptažodį
     rules:
+      accept: Priimti
+      back: Grįžti
       invited_by: 'Gali prisijungti prie %{domain} pagal kvietimą, kurį gavai iš:'
+      preamble: Tai nustatė ir taiko %{domain} prižiūrėtojai.
       preamble_invited: Prieš tęsiant, atsižvelk į pagrindines taisykles, kurias nustatė %{domain} prižiūrėtojai.
+      title: Kelios pagrindinės taisyklės.
       title_invited: Esi pakviestas.
     security: Apsauga
     set_new_password: Nustatyti naują slaptažodį
+    setup:
+      email_below_hint_html: Patikrink šlamšto aplanką arba paprašyk kito. Gali ištaisyti savo el. pašto adresą, jei jis neteisingas.
+      email_settings_hint_html: Spustelėk mūsų atsiųstą nuorodą, kad patikrintum %{email}. Mes lauksime čia.
+      link_not_received: Negavai nuorodos?
+      new_confirmation_instructions_sent: Po kelių minučių gausi naują el. laišką su patvirtinimo nuoroda!
+      title: Patikrinti pašto dėžutę
+    sign_in:
+      preamble_html: Prisijunk su savo <strong>%{domain}</strong> kredencialais. Jei tavo yra kitame serveryje, čia prisijungti negalėsi.
+      title: Prisijungti prie %{domain}
     status:
       account_status: Paskyros būsena
       redirecting_to: Tavo paskyra yra neaktyvi, nes šiuo metu ji nukreipiama į %{acct}.
@@ -851,6 +902,12 @@ lt:
       expires_at: Baigsis
       uses: Naudojimai
     title: Kviesti žmones
+  login_activities:
+    authentication_methods:
+      otp: dvigubas tapatybės nustatymo programėlė
+    description_html: Jei pastebėjei neatpažįstamą veiklą, apsvarstyk galimybę pakeisti slaptažodį ir įjungti dvigubą tapatybės nustatymą.
+    empty: Tapatybės nustatymas istorijos nėra
+    title: Tapatybės nustatymo istorija
   media_attachments:
     validations:
       images_and_video: Negalima pridėti video prie statuso, kuris jau turi nuotrauką
@@ -893,6 +950,10 @@ lt:
           billion: mlrd.
           million: mln.
           thousand: tūkst.
+  otp_authentication:
+    code_hint: Įvesk autentifikatoriaus programėlės sugeneruotą kodą, kad patvirtintum
+    description_html: Jei įjungsi <strong>dvigubo tapatybės nustatymą</strong> naudojant autentifikatoriaus programėlę, prisijungiant reikės turėti telefoną, kuris generuos prieigos raktos, kuriuos turėsi įvesti.
+    instructions_html: "<strong>Nuskenuok šį QR kodą į Google Authenticator arba panašią TOTP programėlę savo telefone</strong>. Nuo šiol ši programėlė generuos prieigos raktus, kuriuos turėsi įvesti prisijungiant."
   pagination:
     newer: Naujesnis
     next: Kitas
@@ -963,6 +1024,7 @@ lt:
     revoke: Naikinti
     revoke_success: Seansas sėkmingai panaikintas.
     title: Seansai
+    view_authentication_history: Peržiūrėti paskyros tapatybės nustatymo istoriją
   settings:
     account: Paskyra
     account_settings: Paskyros nustatymai
@@ -982,7 +1044,7 @@ lt:
     profile: Viešas profilis
     relationships: Sekimai ir sekėjai
     severed_relationships: Nutrūkę sąryšiai
-    two_factor_authentication: Dviejų veiksnių autentikacija
+    two_factor_authentication: Dvigubas tapatybės nustatymas
   severed_relationships:
     download: Atsisiųsti (%{count})
     preamble: Užblokavus domeną arba prižiūrėtojams nusprendus pristabdyti nuotolinio serverio veiklą, gali prarasti sekimus ir sekėjus. Kai taip atsitiks, galėsi atsisiųsti nutrauktų sąryšių sąrašus, kad juos patikrinti ir galbūt importuoti į kitą serverį.
@@ -1035,10 +1097,12 @@ lt:
   two_factor_authentication:
     add: Pridėti
     disable: Išjungti 2FA
-    enabled: Dviejų veiksnių autentikacija įjungta
-    enabled_success: Dviejų veiksnių autentikacija sėkmingai įjungta
+    disabled_success: Dvigubas tapatybės nustatymas sėkmingai išjungtas
+    enabled: Dvigubas tapatybės nustatymas įjungtas
+    enabled_success: Dvigubas tapatybės nustatymas sėkmingai įjungtas
     generate_recovery_codes: Sugeneruoti atkūrimo kodus
     lost_recovery_codes: Atkūrimo kodai jums leidžia atgauti prisijungimą prie Jūsų paskyros, jeigu prarandate telefoną. Jeigu praradote atkūrimo kodus, juos galite sugeneruoti čia. Jūsų senieji atkūrimo kodai nebeveiks.
+    otp: Autentifikatoriaus programėlė
     recovery_codes: Atsarginio atkūrimo kodai
     recovery_codes_regenerated: Atkūrimo kodai sėkmingai sugeneruoti
     recovery_instructions_html: Jeigu prarandate prieiga prie telefono, jūs galite naudoti atkūrimo kodus esančius žemiau, kad atgautumėte priega prie savo paskyros.<strong>Laikykite atkūrimo kodus saugiai</strong> Pavyzdžiui, galite norėti juos išspausdinti, ir laikyti kartu su kitais svarbiais dokumentais.
@@ -1055,11 +1119,15 @@ lt:
       title: Archyvas išimtas
     failed_2fa:
       details: 'Štai išsami informacija apie bandymą prisijungti:'
-      explanation: Kažkas bandė prisijungti prie tavo paskyros, bet nurodė netinkamą antrąjį tapatybės nustatymo veiksnį.
+      explanation: Kažkas bandė prisijungti prie tavo paskyros, bet nurodė netinkamą dvigubą tapatybės nustatymą.
       further_actions_html: Jei tai buvo ne tu, rekomenduojame nedelsiant imtis %{action}, nes jis gali būti pažeistas.
-      subject: Antrojo veiksnio tapatybės nustatymas nesėkmingai
-      title: Nepavyko atlikti antrojo veiksnio tapatybės nustatymo
+      subject: Dvigubas tapatybės nustatymas nesėkmingai
+      title: Nepavyko atlikti dvigubo tapatybės nustatymo
+    suspicious_sign_in:
+      further_actions_html: Jei tai buvai ne tu, rekomenduojame nedelsiant %{action} ir įjungti dvigubą tapatybės nustatymą, kad tavo paskyra būtų saugi.
     warning:
+      categories:
+        spam: Šlamštas
       subject:
         disable: Jūsų paskyra %{acct} buvo užšaldyta
         none: Įspėjmas vartotojui %{acct}
@@ -1134,3 +1202,4 @@ lt:
       success: Tavo saugumo raktas buvo sėkmingai ištrintas.
     nickname_hint: Įvesk naujojo saugumo rakto slapyvardį
     not_enabled: Dar neįjungei WebAuthn
+    otp_required: Norint naudoti saugumo raktus, pirmiausia įjunk dvigubą tapatybės nustatymą.
diff --git a/config/locales/simple_form.ia.yml b/config/locales/simple_form.ia.yml
index 51329edd88e650..d3237762ea9e97 100644
--- a/config/locales/simple_form.ia.yml
+++ b/config/locales/simple_form.ia.yml
@@ -53,7 +53,7 @@ ia:
         password: Usa al minus 8 characteres
         phrase: Sera concordate ignorante majuscule/minuscule in le texto o avisos de contento de un message
         scopes: A que APIs sera permittite acceder al application. Si tu selige un ambito de maxime nivello, tu non besonia de seliger los singulemente.
-        setting_aggregate_reblogs: Non monstra nove stimulos pro messages que ha essite recentemente stimulate (stimulos solo affice los novemente recipite)
+        setting_aggregate_reblogs: Non monstrar nove impulsos pro messages que ha essite recentemente impulsate (affecta solmente le impulsos novemente recipite)
         setting_always_send_emails: Normalmente le avisos de email non sera inviate quando tu activemente usa Mastodon
         setting_default_sensitive: Le medios sensibile es celate de ordinario e pote esser revelate con un clic
         setting_display_media_default: Celar le medios marcate como sensibile
@@ -81,7 +81,7 @@ ia:
         backups_retention_period: Le usatores pote generar archivos de lor messages pro discargar los plus tarde. Quando predefinite a un valor positive, iste archivos sera automaticamente delite de tu immagazinage post le specificate numero de dies.
         bootstrap_timeline_accounts: Iste contos sera appunctate al summitate del recommendationes a sequer del nove usatores.
         closed_registrations_message: Monstrate quando le inscriptiones es claudite
-        content_cache_retention_period: Tote messages de altere servitores (includite stimulos e responsas) sera delite post le specificate numero de dies, sin considerar alcun interaction de usator local con ille messages. Isto include messages ubi un usator local los ha marcate como marcapaginas o favoritos. Mentiones private inter usatores de differente instantias sera alsi perdite e impossibile a restaurar. Le uso de iste parametros es intendite pro specific instantias e infringe multe expectationes de usator quando implementate pro uso general.
+        content_cache_retention_period: Tote le messages de altere servitores (includite impulsos e responsas) essera delite post le numero de dies specificate, independentemente de tote interaction de usatores local con ille messages. Isto include le messages addite al marcapaginas o marcate como favorite per un usator local. Le mentiones private inter usatores de differente instantias tamben essera irrecuperabilemente perdite. Le uso de iste parametro es intendite pro instantias con scopos specific e viola multe expectationes de usatores si es implementate pro uso general.
         custom_css: Tu pote applicar stilos personalisate sur le version de web de Mastodon.
         favicon: WEBP, PNG, GIF o JPG. Supplanta le favicone predefinite de Mastodon con un icone personalisate.
         mascot: Illo substitue le illustration in le interfacie web avantiate.
@@ -125,9 +125,9 @@ ia:
         webauthn: Si illo es un clave USB cura de inserer lo e, si necessari, tocca lo.
       settings:
         indexable: Tu pagina del profilo pote apparer in resultatos del recerca sur Google, Bing, e alteros.
-        show_application: Tu sempre sera capace totevia de vider que app publicava tu message.
+        show_application: In omne caso, tu potera sempre vider qual app ha publicate tu message.
       tag:
-        name: Tu pote solo cambiar le inveloppe del litteras, per exemplo, pro render lo plus legibile
+        name: Tu pote solmente cambiar le litteras inter majusculas e minusculas, per exemplo, pro render lo plus legibile
       user:
         chosen_languages: Si marcate, solo le messages in le linguas seligite sera monstrate in chronologias public
         role: Le rolo controla que permissos ha le usator
@@ -203,10 +203,10 @@ ia:
         password: Contrasigno
         phrase: Parola o phrase clave
         setting_advanced_layout: Activar le interfacie web avantiate
-        setting_aggregate_reblogs: Gruppa promotiones in classificationes temporal
+        setting_aggregate_reblogs: Gruppar impulsos in chronologias
         setting_always_send_emails: Sempre inviar notificationes per e-mail
         setting_auto_play_gif: Auto-reproduce GIFs animate
-        setting_boost_modal: Monstrar dialogo de confirmation ante promover
+        setting_boost_modal: Monstrar dialogo de confirmation ante de impulsar
         setting_default_language: Lingua de publication
         setting_default_privacy: Confidentialitate del messages
         setting_default_sensitive: Sempre marcar le medios cmo sensbile
@@ -292,7 +292,7 @@ ia:
         follow_request: Alcuno requireva de sequer te
         mention: Alcuno te mentionava
         pending_account: Nove conto besonia de revision
-        reblog: Alcuno promoveva tu message
+        reblog: Alcuno ha impulsate tu message
         report: Un nove reporto es inviate
         software_updates:
           all: Notificar sur tote le actualisationes

From a22865a352cca312a50556fd38ce2d5764ecc4dc Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 31 May 2024 05:35:56 -0400
Subject: [PATCH 1148/2191] Add `:email` to filter parameter logging config
 (#30492)

---
 config/initializers/filter_parameter_logging.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb
index a119afa1244622..e88b020ff38bf2 100644
--- a/config/initializers/filter_parameter_logging.rb
+++ b/config/initializers/filter_parameter_logging.rb
@@ -6,5 +6,5 @@
 # Use this to limit dissemination of sensitive information.
 # See the ActiveSupport::ParameterFilter documentation for supported notations and behaviors.
 Rails.application.config.filter_parameters += [
-  :passw, :secret, :token, :_key, :crypt, :salt, :certificate, :otp, :ssn
+  :passw, :email, :secret, :token, :_key, :crypt, :salt, :certificate, :otp, :ssn
 ]

From 4d047b95aed493bc29e36b6958bfe362607507c6 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 31 May 2024 05:54:11 -0400
Subject: [PATCH 1149/2191] Use more direct attribute handling in `User`
 fabricator (#30495)

---
 spec/fabricators/user_fabricator.rb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/spec/fabricators/user_fabricator.rb b/spec/fabricators/user_fabricator.rb
index 9031d5cd042a10..0df7caea60c866 100644
--- a/spec/fabricators/user_fabricator.rb
+++ b/spec/fabricators/user_fabricator.rb
@@ -1,7 +1,12 @@
 # frozen_string_literal: true
 
 Fabricator(:user) do
-  account      { Fabricate.build(:account, user: nil) }
+  account do |attrs|
+    Fabricate.build(
+      :account,
+      attrs.fetch(:account_attributes, {}).merge(user: nil)
+    )
+  end
   email        { sequence(:email) { |i| "#{i}#{Faker::Internet.email}" } }
   password     '123456789'
   confirmed_at { Time.zone.now }

From 64d69eb95b7f149d10c03059f8c79b24499f461d Mon Sep 17 00:00:00 2001
From: Shlee <github@shl.ee>
Date: Fri, 31 May 2024 23:26:43 +1000
Subject: [PATCH 1150/2191] Change default ruby version to 3.3.2 (#30478)

---
 Dockerfile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 4278242bc9fcc7..6a5d400686a977 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,22 +7,22 @@
 ARG TARGETPLATFORM=${TARGETPLATFORM}
 ARG BUILDPLATFORM=${BUILDPLATFORM}
 
-# Ruby image to use for base image, change with [--build-arg RUBY_VERSION="3.3.1"]
-ARG RUBY_VERSION="3.3.1"
+# Ruby image to use for base image, change with [--build-arg RUBY_VERSION="3.3.x"]
+ARG RUBY_VERSION="3.3.2"
 # # Node version to use in base image, change with [--build-arg NODE_MAJOR_VERSION="20"]
 ARG NODE_MAJOR_VERSION="20"
 # Debian image to use for base image, change with [--build-arg DEBIAN_VERSION="bookworm"]
 ARG DEBIAN_VERSION="bookworm"
 # Node image to use for base image based on combined variables (ex: 20-bookworm-slim)
 FROM docker.io/node:${NODE_MAJOR_VERSION}-${DEBIAN_VERSION}-slim as node
-# Ruby image to use for base image based on combined variables (ex: 3.3.1-slim-bookworm)
+# Ruby image to use for base image based on combined variables (ex: 3.3.x-slim-bookworm)
 FROM docker.io/ruby:${RUBY_VERSION}-slim-${DEBIAN_VERSION} as ruby
 
 # Resulting version string is vX.X.X-MASTODON_VERSION_PRERELEASE+MASTODON_VERSION_METADATA
 # Example: v4.2.0-nightly.2023.11.09+something
 # Overwrite existence of 'alpha.0' in version.rb [--build-arg MASTODON_VERSION_PRERELEASE="nightly.2023.11.09"]
 ARG MASTODON_VERSION_PRERELEASE=""
-# Append build metadata or fork information to version.rb [--build-arg MASTODON_VERSION_METADATA="something"]
+# Append build metadata or fork information to version.rb [--build-arg MASTODON_VERSION_METADATA="PR-12345"]
 ARG MASTODON_VERSION_METADATA=""
 
 # Allow Ruby on Rails to serve static files

From e20a57909e4d39401f410ca1811adf2357092687 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 31 May 2024 13:29:37 +0000
Subject: [PATCH 1151/2191] chore(deps): update dependency propshaft to v0.9.0
 (#30382)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 33053948c5797a..c62c57dcc21c41 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -597,7 +597,7 @@ GEM
       net-smtp
       premailer (~> 1.7, >= 1.7.9)
     private_address_check (0.5.0)
-    propshaft (0.8.0)
+    propshaft (0.9.0)
       actionpack (>= 7.0.0)
       activesupport (>= 7.0.0)
       rack

From d326ad0ed9a2e874213c9313f25b973638e4b94d Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Fri, 31 May 2024 17:18:51 +0200
Subject: [PATCH 1152/2191] Revert "Change default ruby version to 3.3.2
 (#30478)" (#30506)

---
 Dockerfile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 6a5d400686a977..4278242bc9fcc7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,22 +7,22 @@
 ARG TARGETPLATFORM=${TARGETPLATFORM}
 ARG BUILDPLATFORM=${BUILDPLATFORM}
 
-# Ruby image to use for base image, change with [--build-arg RUBY_VERSION="3.3.x"]
-ARG RUBY_VERSION="3.3.2"
+# Ruby image to use for base image, change with [--build-arg RUBY_VERSION="3.3.1"]
+ARG RUBY_VERSION="3.3.1"
 # # Node version to use in base image, change with [--build-arg NODE_MAJOR_VERSION="20"]
 ARG NODE_MAJOR_VERSION="20"
 # Debian image to use for base image, change with [--build-arg DEBIAN_VERSION="bookworm"]
 ARG DEBIAN_VERSION="bookworm"
 # Node image to use for base image based on combined variables (ex: 20-bookworm-slim)
 FROM docker.io/node:${NODE_MAJOR_VERSION}-${DEBIAN_VERSION}-slim as node
-# Ruby image to use for base image based on combined variables (ex: 3.3.x-slim-bookworm)
+# Ruby image to use for base image based on combined variables (ex: 3.3.1-slim-bookworm)
 FROM docker.io/ruby:${RUBY_VERSION}-slim-${DEBIAN_VERSION} as ruby
 
 # Resulting version string is vX.X.X-MASTODON_VERSION_PRERELEASE+MASTODON_VERSION_METADATA
 # Example: v4.2.0-nightly.2023.11.09+something
 # Overwrite existence of 'alpha.0' in version.rb [--build-arg MASTODON_VERSION_PRERELEASE="nightly.2023.11.09"]
 ARG MASTODON_VERSION_PRERELEASE=""
-# Append build metadata or fork information to version.rb [--build-arg MASTODON_VERSION_METADATA="PR-12345"]
+# Append build metadata or fork information to version.rb [--build-arg MASTODON_VERSION_METADATA="something"]
 ARG MASTODON_VERSION_METADATA=""
 
 # Allow Ruby on Rails to serve static files

From 3d3d958abab8a7b0d43b3008a75ea0564e479eeb Mon Sep 17 00:00:00 2001
From: Jeremy Kescher <jeremy@kescher.at>
Date: Fri, 31 May 2024 22:22:11 +0200
Subject: [PATCH 1153/2191] Removed Oatstodon skin

Originally taken from the types.pl fork, the theme was made by @oat@hellsite.site originally. The Mastodon frontend has changed far too much by now for us to keep up the changes in this theme.
---
 README.md                                     |   4 +-
 .../flavours/glitch/styles/oatstodon.scss     | 627 ------------------
 .../skins/glitch/oatstodon/common.scss        |   1 -
 .../skins/glitch/oatstodon/names.yml          |   8 -
 4 files changed, 1 insertion(+), 639 deletions(-)
 delete mode 100644 app/javascript/flavours/glitch/styles/oatstodon.scss
 delete mode 100644 app/javascript/skins/glitch/oatstodon/common.scss
 delete mode 100644 app/javascript/skins/glitch/oatstodon/names.yml

diff --git a/README.md b/README.md
index aa2fb512656e03..8c704d24f8ad9e 100644
--- a/README.md
+++ b/README.md
@@ -30,8 +30,6 @@ instead, use merge (fast-forward, if possible, with merge commit otherwise).
   emojis.
 - Allow higher resolution images. (4096x4096 instead of the previous limit of 3840x2160)
 - Allow posting polls with only one poll option (if `MIN_POLL_OPTIONS` is set to 1 on your instance).
-- Added oatstodon flavour (taken from [types.pl fork](https://github.com/ralsei/types.pl),
-  by [@oat@hellsite.site](https://hellsite.site/@oat)), with slight adjustments since.
 - Emoji reactions on statuses (with both Unicode and custom emojis, same as for announcements), a feature originally
   developed for [Nyastodon](https://git.bsd.gay/fef/nyastodon).
   Ended up as a Catstodon-maintained patch after its initial two Pull Requests to glitch-soc, but was handed over
@@ -43,7 +41,7 @@ instead, use merge (fast-forward, if possible, with merge commit otherwise).
   from [Sakurajima Mastodon](https://github.com/chikorita157/mastodon-sakura).
 - Adds the ability to disable the suspicious sign in detection entirely.
   - Useful for situations where the instance may not have up-to-date IP information, such as when the period of IP
-    address retention is set to a low value (see *Previous differences now merged into vanilla Mastodon*)
+    address retention is set to a low value (see _Previous differences now merged into vanilla Mastodon_)
 
 ## Previous differences now merged into glitch-soc
 
diff --git a/app/javascript/flavours/glitch/styles/oatstodon.scss b/app/javascript/flavours/glitch/styles/oatstodon.scss
deleted file mode 100644
index 866e1daeb7b19b..00000000000000
--- a/app/javascript/flavours/glitch/styles/oatstodon.scss
+++ /dev/null
@@ -1,627 +0,0 @@
-@import 'index';
-
-/* customize ya stuff */
-:root {
-  --border-radius: 5px;
-
-  /* rgb for transparency to work */
-  --text-color: 217, 225, 232;
-  --text-color-secondary: 96, 105, 132; /* less bright, for unimportant bits */
-  --background-color: 18, 18, 37;
-  --background-color-brighter: 22, 22, 47;
-  --app-background-color: 8, 8, 17; /* used only for the VERY background in the back */
-  --accent-color: 39, 183, 145;
-  --accent-color-secondary: 62, 91, 84; /* less saturated ver of --accent-color */
-  --accent-color-bright: 92, 193, 162;
-}
-
-.account__avatar-overlay-base,
-.account__avatar-overlay-overlay,
-.account__avatar {
-  border-radius: var(--border-radius);
-}
-
-/* roundening shenanigans */
-
-.drawer > div,
-nav,
-.search,
-.drawer__header a,
-.drawer--header a,
-.search__input {
-  border-radius: var(--border-radius) !important;
-}
-
-.column-header,
-.column-back-button,
-.navigation-panel .column-link:nth-child(1),
-.navigation-panel .column-link:nth-child(10),
-.navigation-bar {
-  border-radius: var(--border-radius) var(--border-radius) 0 0;
-}
-
-.column > .scrollable,
-.getting-started,
-.navigation-panel .column-link:nth-child(8),
-.navigation-panel .column-link:nth-child(11) {
-  border-radius: 0 0 var(--border-radius) var(--border-radius);
-}
-
-/* standard fg/bg color changes */
-
-.drawer__inner,
-.drawer__inner__mastodon,
-.drawer__header,
-.drawer--header,
-.actions-modal,
-.block-modal,
-.boost-modal,
-.confirmation-modal,
-.mute-modal,
-.report-modal,
-article,
-.getting-started,
-.column-subheading,
-.column-link,
-.column-subheading,
-.column-link,
-.emoji-mart-scroll,
-.emoji-mart-search,
-.emoji-mart-category-label > span,
-.emoji-picker-dropdown__menu,
-.scrollable,
-.empty-column-indicator,
-.column-inline-form,
-.dropdown-menu,
-.dropdown-menu__item a,
-.account__header__fields,
-.search-popout,
-.confirmation-modal__action-bar,
-.reactions-bar__item,
-.emoji-picker-dropdown__modifiers__menu,
-.content-wrapper,
-.sidebar-wrapper--empty,
-.regeneration-indicator,
-.tabs-bar,
-.navigation-bar,
-.trends__header,
-.modal-layout {
-  background-color: rgb(var(--background-color)) !important;
-  color: rgb(var(--text-color)) !important;
-}
-
-.glitch.local-settings__navigation,
-.glitch.local-settings__navigation__item,
-.glitch.local-settings__page,
-.glitch.local-settings {
-  background-color: rgb(var(--background-color));
-  color: rgb(var(--text-color));
-}
-
-.modal-layout,
-.modal-layout__mastodon > * {
-  background-image: none;
-}
-
-.account__section-headline a.active::after,
-.account__section-headline button.active::after,
-.notification__filter-bar a.active::after,
-.notification__filter-bar button.active::after,
-.account__section-headline a.active::after,
-.account__section-headline a.active::before,
-.account__section-headline button.active::after,
-.account__section-headline button.active::before,
-.notification__filter-bar a.active::after,
-.notification__filter-bar a.active::before,
-.notification__filter-bar button.active::after,
-.notification__filter-bar button.active::before {
-  border-color: transparent transparent rgb(var(--background-color));
-}
-
-.dropdown-menu__arrow {
-  border-bottom-color: rgb(var(--background-color)) !important;
-}
-
-.dropdown-menu__arrow.top {
-  border-top-color: rgb(var(--background-color)) !important;
-}
-
-.reply-indicator__content,
-.status__content,
-.reply-indicator__display-name,
-.privacy-dropdown__option__icon,
-.composer--options--dropdown--content--item .icon,
-.composer--reply > .content {
-  color: rgb(var(--text-color)) !important;
-}
-
-html {
-  scrollbar-color: rgb(var(--background-color-brighter)) rgba(0, 0, 0, 10%);
-}
-
-.tabs-bar__wrapper {
-  background: rgb(var(--app-background-color));
-}
-
-.column-header,
-.column-header__button,
-.account__section-headline,
-.notification__filter-bar > button,
-.emoji-mart-bar,
-.column-back-button,
-.column-header__back-button,
-.announcements,
-.column-header__collapsible-inner,
-.status.status-direct:not(.read),
-.notification__filter-bar,
-.glitch.local-settings__page {
-  background-color: rgb(var(--background-color-brighter)) !important;
-  border-bottom: none;
-}
-
-.reply-indicator,
-.emoji-picker-dropdown__modifiers__menu button:hover,
-.compose-form .compose-form__buttons-wrapper,
-.composer--options-wrapper,
-.compose-form__poll-wrapper select,
-.flash-message,
-.card__bar,
-.card > a:hover .card__bar,
-.glitch.local-settings__navigation__item:hover {
-  background-color: rgb(var(--background-color-brighter));
-}
-
-.columns-area,
-.app-body,
-.getting-started__wrapper {
-  background-color: rgb(var(--app-background-color));
-}
-
-.privacy-dropdown__option__content strong,
-.composer--options--dropdown--content strong,
-.character-counter,
-.report-modal__comment .setting-text-label,
-.compose-form__poll-wrapper select {
-  color: rgb(var(--text-color)) !important;
-}
-
-input,
-textarea,
-.compose-form__modifiers,
-.privacy-dropdown__dropdown,
-.composer--options--dropdown--content,
-.privacy-dropdown__value {
-  background-color: rgb(var(--background-color-brighter)) !important;
-  color: rgb(var(--text-color)) !important;
-}
-
-.compose-form__buttons-wrapper,
-.admin-wrapper .sidebar-wrapper__inner,
-.admin-wrapper .sidebar ul a:hover,
-.admin-wrapper .sidebar ul a,
-.admin-wrapper .sidebar ul a.selected,
-.account__disclaimer,
-.account__action-bar-links {
-  background-color: rgb(var(--background-color-brighter));
-}
-
-.detailed-status,
-.detailed-status__action-bar,
-.account__header__bar,
-.focusable:focus {
-  background-color: rgb(var(--background-color-brighter)) !important;
-  border-bottom: none;
-  border-top: none;
-}
-
-.status.collapsed .status__content::after {
-  background: linear-gradient(
-    rgba(var(--background-color), 0),
-    rgba(var(--background-color), 0)
-  ) !important;
-}
-
-/* accent color changes */
-
-.button,
-.react-toggle--checked .react-toggle-track,
-.react-toggle--checked:hover .react-toggle-track,
-.react-toggle--checked:hover:not(.react-toggle--disabled) .react-toggle-track,
-.button.logo-button,
-.emoji-mart-anchor-bar,
-.loading-bar,
-.icon-with-badge__badge,
-.video-player__volume__current,
-.video-player__volume__handle,
-.upload-progress__tracker,
-.video-player__seek__buffer,
-.video-player__seek__progress,
-.floating-action-button {
-  background-color: rgb(var(--accent-color));
-}
-
-.react-toggle--checked .react-toggle-thumb,
-.compose-form__sensitive-button .checkbox,
-.filters .filter-subset a.selected,
-.account__action-bar__tab.active,
-.tabs-bar__link.active,
-.notification.unread::before,
-.status.unread::before {
-  border-color: rgb(var(--accent-color));
-}
-
-.text-icon-button,
-.icon-button.inverted,
-button.inverted:hover,
-.icon-button,
-.icon-button:hover,
-.status__action-bar__counter__label,
-.text-icon-button:active,
-.text-icon-button:focus,
-.text-icon-button:hover,
-.icon-button.disabled,
-.composer--options--dropdown.open > .value {
-  color: rgb(var(--accent-color-secondary));
-}
-
-.status__info__icons i {
-  color: rgb(var(--accent-color-secondary)) !important;
-}
-
-.status__content__spoiler-link {
-  background-color: rgb(var(--accent-color-secondary)) !important;
-}
-
-.column-header__wrapper.active::before {
-  background: radial-gradient(
-    ellipse,
-    rgba(var(--accent-color), 0.23) 0%,
-    rgba(var(--accent-color), 0) 60%
-  );
-}
-
-.column-header__wrapper.active {
-  box-shadow: 0 1px 0 rgba(var(--accent-color), 0.3);
-}
-
-.compose-form__sensitive-button .checkbox.active,
-.poll__chart.leading {
-  border-color: rgb(var(--accent-color));
-  background-color: rgb(var(--accent-color));
-}
-
-.poll__chart {
-  background-color: rgb(var(--accent-color-secondary));
-}
-
-.column-header.active .column-header__icon {
-  text-shadow: 0 0 10px rgba(var(--accent-color), 0.4);
-}
-
-.text-icon-button:active,
-.text-icon-button:focus,
-.text-icon-button:hover,
-.drawer__header a:hover,
-.drawer--header a:hover,
-.drawer--header a:focus,
-.icon-button:hover,
-.reactions-bar__item:hover {
-  background-color: rgba(var(--accent-color-secondary), 0.1);
-}
-
-.icon-button.inverted:active,
-.icon-button.inverted:focus,
-.icon-button.inverted:hover,
-.reactions-bar__item.active {
-  background-color: rgba(var(--accent-color-secondary), 0.25);
-  color: rgb(var(--accent-color-secondary));
-}
-
-.button:active,
-.button:focus,
-.button:hover,
-.admin-wrapper .sidebar ul .simple-navigation-active-leaf a:hover,
-.simple_form .block-button:hover,
-.simple_form .button:hover,
-.simple_form button:hover,
-.button.logo-button:active,
-.button.logo-button:focus,
-.button.logo-button:hover,
-.floating-action-button:hover,
-.glitch.local-settings__navigation__item.active:hover {
-  background-color: rgb(var(--accent-color-bright));
-}
-
-.privacy-dropdown__option.active,
-.composer--options--dropdown--content--item.active,
-.privacy-dropdown__option:hover,
-.composer--options--dropdown--content--item:hover,
-.privacy-dropdown__option.active:hover,
-.composer--options--dropdown--content.active:hover,
-.admin-wrapper .sidebar ul .simple-navigation-active-leaf a,
-.simple_form .block-button,
-.simple_form .button,
-.simple_form button,
-.simple_form .block-button:active,
-.simple_form .block-button:focus,
-.simple_form .button:active,
-.simple_form .button:focus,
-.simple_form button:active,
-.simple_form button:focus,
-.composer--options--dropdown.open > .value,
-.glitch.local-settings__navigation__item.active {
-  background-color: rgb(var(--accent-color));
-}
-
-.status__info__icons .icon-button.active i,
-.tabs-bar__link.active,
-.status__content a {
-  color: rgb(var(--accent-color)) !important;
-}
-
-.trends__item__sparkline path:last-child {
-  stroke: rgb(var(--accent-color)) !important;
-}
-
-.trends__item__sparkline path:first-child {
-  fill: rgb(var(--accent-color-secondary)) !important;
-}
-
-a.u-url,
-.status-link,
-.column-header__back-button,
-.status__content__read-more-button,
-.column-header.active .column-header__icon,
-.column-link.active,
-.account__section-headline a.active,
-.account__section-headline button.active,
-.notification__filter-bar a.active,
-.notification__filter-bar button.active,
-.account__header__content a,
-.account__header__bio .account__header__fields a,
-.reactions-bar__item.active .reactions-bar__item__count,
-.emoji-mart-anchor-selected,
-.reply-indicator__content a,
-.compose-form .compose-form__warning a,
-.text-icon-button.active,
-.icon-button.inverted.active,
-.drawer__tab:hover,
-.icon-button.active,
-.column-back-button,
-.filters .filter-subset a.selected,
-.admin-wrapper .content .muted-hint a,
-body .muted-hint a,
-.table a,
-.notification__message .fa,
-.drawer--header a:hover,
-.drawer--header a:focus {
-  color: rgb(var(--accent-color)) !important;
-}
-
-/* fixes */
-
-/* boost hack, v2 */
-
-/* https://codepen.io/sosuke/pen/Pjoqqp */
-button.icon-button i.fa-retweet {
-  filter: brightness(0) saturate(100%) invert(31%) sepia(28%) saturate(388%)
-    hue-rotate(115deg) brightness(94%) contrast(90%); /* accent-color-secondary */
-
-  color: transparent !important;
-}
-
-button.icon-button.active i.fa-retweet {
-  filter: brightness(0) saturate(100%) invert(57%) sepia(61%) saturate(481%)
-    hue-rotate(114deg) brightness(93%) contrast(91%); /* accent-color */
-}
-
-button.icon-button.disabled i.fa-retweet,
-button.icon-button.disabled i.fa-lock {
-  filter: brightness(0) saturate(100%) invert(31%) sepia(28%) saturate(388%)
-    hue-rotate(115deg) brightness(60%) contrast(90%); /* accent-color-secondary with brightness set to 50% */
-}
-
-.load-more:hover,
-.mbstobon-2 .drawer__inner__mastodon,
-.mbstobon-1 .drawer__inner__mastodon,
-.mbstobon-0 .drawer__inner__mastodon {
-  background: inherit;
-}
-
-.account__action-bar__tab,
-.account__action-bar {
-  border: none;
-}
-
-.notification__filter-bar,
-.account__header__bar,
-.admin-wrapper .content-heading,
-.admin-wrapper .content h4,
-.tabs-bar__link:not(.active) {
-  border-bottom: none;
-}
-
-.dropdown-menu__separator,
-hr {
-  opacity: 0;
-}
-
-.compose-form .autosuggest-textarea__textarea,
-.compose-form .spoiler-input__input,
-.compose-panel .compose-form__autosuggest-wrapper,
-.mbstobon-3 .drawer__inner__mastodon {
-  background: transparent;
-}
-
-.status,
-.account,
-.account__header__fields dl,
-.account__header__fields,
-.account__header__bio .account__header__fields,
-.glitch.local-settings__navigation__item {
-  border-top: none;
-  border-bottom: none;
-}
-
-.report-modal__container,
-.report-modal__comment,
-.report-modal__comment .setting-text__wrapper {
-  border-color: rgba(0, 0, 0, 0%) !important;
-}
-
-.drawer__inner__mastodon {
-  background: inherit;
-}
-
-/* misc */
-.column-link:hover,
-.dropdown-menu__item a:active,
-.dropdown-menu__item a:focus,
-.dropdown-menu__item a:hover,
-header strong.display-name__html {
-  color: #fff !important;
-}
-
-.notification__filter-bar button.active,
-.account__section-headline .active {
-  border-bottom: 3px solid rgb(var(--accent-color));
-}
-
-.notification__filter-bar button:not(.active):hover {
-  top: -3px;
-}
-
-.account__section-headline a.active::after,
-.account__section-headline a.active::before {
-  display: none;
-}
-
-.account__header__extra__links a:hover {
-  text-decoration: underline;
-}
-
-.account__section-headline a:hover,
-.confirmation-modal__cancel-button span {
-  color: #fff;
-}
-
-.notification__filter-bar button.active::after {
-  opacity: 0;
-}
-
-.notification__filter-bar button.active::before {
-  opacity: 0;
-}
-
-.column-link__badge,
-.column-subheading {
-  background-color: rgb(var(--accent-color));
-  animation-name: flash;
-  animation-duration: 1s;
-  animation-iteration-count: infinite;
-  animation-direction: alternate-reverse;
-}
-
-@keyframes flash {
-  from {
-    background-color: rgb(var(--accent-color));
-  }
-
-  to {
-    background-color: rgb(var(--accent-color-secondary));
-  }
-}
-
-.reply-indicator {
-  max-height: 38px;
-  overflow-y: hidden;
-  transition: max-height 1s;
-}
-
-.reply-indicator:hover {
-  max-height: 100%;
-}
-
-.reply-indicator::before {
-  content: 'Replying to:';
-  font-size: 12px;
-  color: rgb(var(--text-color-secondary));
-}
-
-.getting-started__footer p::after {
-  content: ' Oat was here';
-}
-
-/* public/static css */
-
-/* for pages like /@username */
-
-.public-layout .public-account-header__tabs__tabs .counter.active::after {
-  border-bottom-color: rgb(var(--accent-color));
-}
-
-.public-layout .public-account-bio .account__header__fields a {
-  color: rgb(var(--accent-color));
-}
-
-.public-layout .header .nav-button {
-  color: #fff;
-  background-color: rgb(var(--accent-color));
-}
-
-.public-layout .header .nav-button:active,
-.public-layout .header .nav-button:focus,
-.public-layout .header .nav-button:hover {
-  background-color: rgb(var(--accent-color-bright));
-}
-
-.public-layout .activity-stream .entry,
-.hero-widget__text,
-.table-of-contents {
-  background-color: rgb(var(--background-color));
-}
-
-body {
-  background-color: rgb(var(--app-background-color));
-}
-
-.public-layout .public-account-header__tabs__tabs .counter {
-  border-right: none;
-}
-
-.public-layout .public-account-bio,
-.public-layout .public-account-header__bar::before,
-.public-layout .header,
-.directory__tag > a,
-.directory__tag > div,
-.directory__tag > a:active,
-.directory__tag > a:focus,
-.directory__tag > a:hover,
-.public-layout .header .brand:hover,
-.landing-page__call-to-action,
-.box-widget {
-  background-color: rgb(var(--background-color-brighter));
-}
-
-.public-layout .display-name,
-.status__relative-time time,
-.status__relative-time {
-  color: rgb(var(--text-color-secondary));
-}
-
-.rich-formatting,
-.rich-formatting p {
-  color: rgb(var(--text-color));
-}
-
-.rich-formatting table tbody tr,
-.rich-formatting table thead tr,
-.notification-follow,
-.notification-follow-request {
-  border-bottom: none;
-}
-
-// https://types.pl/@haskal/106569437674907815
-.search-popout em {
-  color: rgb(var(--accent-color)) !important;
-}
diff --git a/app/javascript/skins/glitch/oatstodon/common.scss b/app/javascript/skins/glitch/oatstodon/common.scss
deleted file mode 100644
index 4c6f4af97840ee..00000000000000
--- a/app/javascript/skins/glitch/oatstodon/common.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import 'flavours/glitch/styles/oatstodon';
diff --git a/app/javascript/skins/glitch/oatstodon/names.yml b/app/javascript/skins/glitch/oatstodon/names.yml
deleted file mode 100644
index dfc72b37f6e929..00000000000000
--- a/app/javascript/skins/glitch/oatstodon/names.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-en:
-  skins:
-    glitch:
-      oatstodon: oatstodon (by @oat@hellsite.site)
-es:
-  skins:
-    glitch:
-      oatstodon: oatstodon (por @oat@hellsite.site)

From f322057609574f11b4120a70aef9321ca329913e Mon Sep 17 00:00:00 2001
From: Jeremy Kescher <jeremy@kescher.at>
Date: Fri, 31 May 2024 22:29:00 +0200
Subject: [PATCH 1154/2191] Suspicious sign in detector: Use correct constant
 name.

Bruh.
---
 app/lib/suspicious_sign_in_detector.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/lib/suspicious_sign_in_detector.rb b/app/lib/suspicious_sign_in_detector.rb
index de5b6026a8f4b2..4405488c18146c 100644
--- a/app/lib/suspicious_sign_in_detector.rb
+++ b/app/lib/suspicious_sign_in_detector.rb
@@ -10,7 +10,7 @@ def initialize(user)
   end
 
   def suspicious?(request)
-    !sufficient_security_measures? && !freshly_signed_up? && !previously_seen_ip?(request) if DISABLE_SUSPICIOUS_SIGN_IN
+    !sufficient_security_measures? && !freshly_signed_up? && !previously_seen_ip?(request) if ENABLE_SUSPICIOUS_SIGN_IN
   end
 
   private

From 3157f2d48a6b8dcb3a1bd077ae495bd998d5cf6b Mon Sep 17 00:00:00 2001
From: Jeremy Kescher <jeremy@kescher.at>
Date: Fri, 31 May 2024 22:30:42 +0200
Subject: [PATCH 1155/2191] Fix sign-in issues, bump version

---
 CHANGELOG.md            | 5 +++++
 lib/mastodon/version.rb | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 38b4505d237124..1f8879b9a094f5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 All changes to Catstodon that aren't Mastodon or glitch-soc Mastodon changes will be documented here.
 
+## [v4.3.0-alpha.4+glitch+cat+1.0.1] - 2024-05-31
+
+- Remove Oatstodon.
+- Fix sign-in issues when the suspicious sign-in detector would trigger.
+
 ## [v4.3.0-alpha.4+glitch+cat+1.0.0] - 2024-05-29
 
 - Upstream changes
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index 4c23afc252d00d..6f2ab1a7664a2e 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -25,7 +25,7 @@ def prerelease
     end
 
     def catstodon_revision
-      '1.0.0'
+      '1.0.1'
     end
 
     def build_metadata

From 4d3748ac447c7e43fcfcc36ffcd4f97afeeead46 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 3 Jun 2024 03:16:01 -0400
Subject: [PATCH 1156/2191] Fix rack attack `match_type` value typo in logging
 config (#30514)

---
 config/initializers/rack_attack_logging.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/initializers/rack_attack_logging.rb b/config/initializers/rack_attack_logging.rb
index 458bc799f912f8..65b89e60291295 100644
--- a/config/initializers/rack_attack_logging.rb
+++ b/config/initializers/rack_attack_logging.rb
@@ -3,7 +3,7 @@
 ActiveSupport::Notifications.subscribe(/rack_attack/) do |_name, _start, _finish, _request_id, payload|
   req = payload[:request]
 
-  next unless [:throttle, :blacklist].include? req.env['rack.attack.match_type']
+  next unless [:throttle, :blocklist].include? req.env['rack.attack.match_type']
 
   Rails.logger.info("Rate limit hit (#{req.env['rack.attack.match_type']}): #{req.ip} #{req.request_method} #{req.fullpath}")
 end

From 469de923aa568dd96a6358445fc98870f7f08755 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 3 Jun 2024 03:16:29 -0400
Subject: [PATCH 1157/2191] Update `current_user` override mode description in
 controllers (#30515)

---
 .../api/v1/instances/extended_descriptions_controller.rb        | 2 +-
 app/controllers/api/v1/instances/peers_controller.rb            | 2 +-
 app/controllers/api/v1/instances/rules_controller.rb            | 2 +-
 app/controllers/api/v1/instances_controller.rb                  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/controllers/api/v1/instances/extended_descriptions_controller.rb b/app/controllers/api/v1/instances/extended_descriptions_controller.rb
index 73d2248117d901..db3d082f61b8c1 100644
--- a/app/controllers/api/v1/instances/extended_descriptions_controller.rb
+++ b/app/controllers/api/v1/instances/extended_descriptions_controller.rb
@@ -5,7 +5,7 @@ class Api::V1::Instances::ExtendedDescriptionsController < Api::V1::Instances::B
 
   before_action :set_extended_description
 
-  # Override `current_user` to avoid reading session cookies unless in whitelist mode
+  # Override `current_user` to avoid reading session cookies unless in limited federation mode
   def current_user
     super if limited_federation_mode?
   end
diff --git a/app/controllers/api/v1/instances/peers_controller.rb b/app/controllers/api/v1/instances/peers_controller.rb
index 83116472bb196e..fac763b4057c1c 100644
--- a/app/controllers/api/v1/instances/peers_controller.rb
+++ b/app/controllers/api/v1/instances/peers_controller.rb
@@ -5,7 +5,7 @@ class Api::V1::Instances::PeersController < Api::V1::Instances::BaseController
 
   skip_around_action :set_locale
 
-  # Override `current_user` to avoid reading session cookies unless in whitelist mode
+  # Override `current_user` to avoid reading session cookies unless in limited federation mode
   def current_user
     super if limited_federation_mode?
   end
diff --git a/app/controllers/api/v1/instances/rules_controller.rb b/app/controllers/api/v1/instances/rules_controller.rb
index d240d72464dee7..3930eec0dde748 100644
--- a/app/controllers/api/v1/instances/rules_controller.rb
+++ b/app/controllers/api/v1/instances/rules_controller.rb
@@ -5,7 +5,7 @@ class Api::V1::Instances::RulesController < Api::V1::Instances::BaseController
 
   before_action :set_rules
 
-  # Override `current_user` to avoid reading session cookies unless in whitelist mode
+  # Override `current_user` to avoid reading session cookies unless in limited federation mode
   def current_user
     super if limited_federation_mode?
   end
diff --git a/app/controllers/api/v1/instances_controller.rb b/app/controllers/api/v1/instances_controller.rb
index df4a14af156dc7..49da75ed285b1a 100644
--- a/app/controllers/api/v1/instances_controller.rb
+++ b/app/controllers/api/v1/instances_controller.rb
@@ -6,7 +6,7 @@ class Api::V1::InstancesController < Api::BaseController
 
   vary_by ''
 
-  # Override `current_user` to avoid reading session cookies unless in whitelist mode
+  # Override `current_user` to avoid reading session cookies unless in limited federation mode
   def current_user
     super if limited_federation_mode?
   end

From aa9b80f57d1fb1f1b75abb28db3f915829f6b9f9 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 3 Jun 2024 09:34:33 +0200
Subject: [PATCH 1158/2191] New Crowdin Translations (automated) (#30517)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/lv.json |  6 ++---
 app/javascript/mastodon/locales/mr.json |  5 ++++
 config/locales/doorkeeper.lv.yml        |  1 +
 config/locales/ia.yml                   | 32 ++++++++++++-------------
 config/locales/simple_form.lv.yml       |  5 ++++
 5 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/app/javascript/mastodon/locales/lv.json b/app/javascript/mastodon/locales/lv.json
index 7a1d583d9a30e5..efc45c9c089f85 100644
--- a/app/javascript/mastodon/locales/lv.json
+++ b/app/javascript/mastodon/locales/lv.json
@@ -175,7 +175,7 @@
   "confirmations.discard_edit_media.message": "Ir nesaglabātas izmaiņas informācijas nesēja aprakstā vai priekšskatījumā. Vēlies tās atmest tik un tā?",
   "confirmations.domain_block.message": "Vai tu tiešām vēlies bloķēt visu domēnu {domain}? Parasti pietiek, ja nobloķē vai apklusini kādu. Tu neredzēsi saturu vai paziņojumus no šī domēna nevienā laika līnijā. Tavi sekotāji no šī domēna tiks noņemti.",
   "confirmations.edit.confirm": "Labot",
-  "confirmations.edit.message": "Rediģējot, tiks pārrakstīts ziņojums, kuru tu šobrīd raksti. Vai tiešām vēlies turpināt?",
+  "confirmations.edit.message": "Labošana pārrakstīs ziņojumu, kas šobrīd tiek sastādīts. Vai tiešām turpināt?",
   "confirmations.logout.confirm": "Iziet",
   "confirmations.logout.message": "Vai tiešām vēlies izrakstīties?",
   "confirmations.mute.confirm": "Apklusināt",
@@ -447,7 +447,7 @@
   "notification.relationships_severance_event": "Zaudēti savienojumi ar {name}",
   "notification.relationships_severance_event.learn_more": "Uzzināt vairāk",
   "notification.status": "{name} tikko publicēja",
-  "notification.update": "{name} rediģēja ierakstu",
+  "notification.update": "{name} laboja ierakstu",
   "notification_requests.accept": "Pieņemt",
   "notification_requests.dismiss": "Noraidīt",
   "notification_requests.notifications_from": "Paziņojumi no {name}",
@@ -663,7 +663,7 @@
   "status.direct_indicator": "Pieminēts privāti",
   "status.edit": "Labot",
   "status.edited": "Pēdējoreiz labots {date}",
-  "status.edited_x_times": "Labots {count, plural, one {{count} reizi} other {{count} reizes}}",
+  "status.edited_x_times": "Labots {count, plural, zero {{count} reižu} one {{count} reizi} other {{count} reizes}}",
   "status.embed": "Iegult",
   "status.favourite": "Izlasē",
   "status.favourites": "{count, plural, zero {izlasēs} one {izlasē} other {izlasēs}}",
diff --git a/app/javascript/mastodon/locales/mr.json b/app/javascript/mastodon/locales/mr.json
index a00b39e838a0e0..c07294d90a7d50 100644
--- a/app/javascript/mastodon/locales/mr.json
+++ b/app/javascript/mastodon/locales/mr.json
@@ -17,9 +17,12 @@
   "account.badges.group": "गट",
   "account.block": "@{name} यांना ब्लॉक करा",
   "account.block_domain": "{domain} पासून सर्व लपवा",
+  "account.block_short": "अवरोध",
   "account.blocked": "ब्लॉक केले आहे",
   "account.browse_more_on_origin_server": "मूळ प्रोफाइलवर अधिक ब्राउझ करा",
   "account.cancel_follow_request": "फॉलो विनंती मागे घ्या",
+  "account.copy": "दुवा कॉपी करा",
+  "account.direct": "खाजगीरित्या उल्लेखीत @{name}",
   "account.disable_notifications": "जेव्हा @{name} पोस्ट करतात तेव्हा मला सूचित करणे थांबवा",
   "account.domain_blocked": "Domain hidden",
   "account.edit_profile": "प्रोफाइल एडिट करा",
@@ -29,6 +32,7 @@
   "account.featured_tags.last_status_never": "पोस्ट नाहीत",
   "account.featured_tags.title": "{name} चे वैशिष्ट्यीकृत हॅशटॅग",
   "account.follow": "अनुयायी व्हा",
+  "account.follow_back": "आपणही अनुसरण करा",
   "account.followers": "अनुयायी",
   "account.followers.empty": "ह्या वापरकर्त्याचा आतापर्यंत कोणी अनुयायी नाही.",
   "account.followers_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
@@ -45,6 +49,7 @@
   "account.mention": "@{name} चा उल्लेख करा",
   "account.moved_to": "{name} ने सूचित केले आहे की त्यांचे नवीन खाते आता आहे:",
   "account.mute": "@{name} ला मूक कारा",
+  "account.mute_short": "नि:शब्द",
   "account.muted": "मौन",
   "account.open_original_page": "मूळ पृष्ठ उघडा",
   "account.posts": "Toots",
diff --git a/config/locales/doorkeeper.lv.yml b/config/locales/doorkeeper.lv.yml
index 5aa5daef3f6d16..2005ce3c79db84 100644
--- a/config/locales/doorkeeper.lv.yml
+++ b/config/locales/doorkeeper.lv.yml
@@ -174,6 +174,7 @@ lv:
       read:filters: apskatīt savus filtrus
       read:follows: apskatīt savus sekotājus
       read:lists: apskatīt savus sarakstus
+      read:me: lasīt tikai Tava konta pamatinformāciju
       read:mutes: apskatīt savus apklusinātos
       read:notifications: apskatīt savus paziņojumus
       read:reports: apskatīt savus pārskatus
diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index f8834136b9ca27..ab1f674fd8b952 100644
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -38,7 +38,7 @@ ia:
       avatar: Avatar
       by_domain: Dominio
       change_email:
-        changed_msg: Email cambiate con successo!
+        changed_msg: E-mail cambiate con successo!
         current_email: E-mail actual
         label: Cambiar e-mail
         new_email: Nove e-mail
@@ -56,12 +56,12 @@ ia:
       delete: Deler datos
       deleted: Delite
       demote: Degradar
-      destroyed_msg: Le datos de %{username} ora es in cauda pro su imminente deletion
+      destroyed_msg: Le datos de %{username} es ora in cauda pro lor imminente deletion
       disable: Gelar
       disable_sign_in_token_auth: Disactivar le authentication per token in e-mail
-      disable_two_factor_authentication: Disactivar 2FA
+      disable_two_factor_authentication: Disactivar authentication bifactorial
       disabled: Gelate
-      display_name: Nomine visibile
+      display_name: Nomine a monstrar
       domain: Dominio
       edit: Modificar
       email: E-mail
@@ -82,7 +82,7 @@ ia:
         all: Toto
         local: Local
         remote: Remote
-        title: Location
+        title: Position
       login_status: Stato de session
       media_attachments: Annexos multimedial
       memorialize: Render commemorative
@@ -137,7 +137,7 @@ ia:
       security: Securitate
       security_measures:
         only_password: Solmente contrasigno
-        password_and_2fa: Contrasigno e 2FA
+        password_and_2fa: Contrasigno e A2F
       sensitive: Fortiar sensibile
       sensitized: Marcate como sensibile
       shared_inbox_url: URL del cassa de entrata condividite
@@ -195,17 +195,17 @@ ia:
         destroy_email_domain_block: Crear blocada de dominio email
         destroy_instance: Purgar dominio
         destroy_ip_block: Deler le regula IP
-        destroy_status: Deler le message
-        destroy_unavailable_domain: Deler le dominio non disponibile
+        destroy_status: Deler message
+        destroy_unavailable_domain: Deler dominio indisponibile
         destroy_user_role: Destruer rolo
-        disable_2fa_user: Disactivar 2FA
+        disable_2fa_user: Disactivar A2F
         disable_custom_emoji: Disactivar emoji personalisate
-        disable_sign_in_token_auth_user: Disactivar le authentication per testimonio via email pro usator
+        disable_sign_in_token_auth_user: Disactivar le authentication per token de e-mail pro le usator
         disable_user: Disactivar le usator
         enable_custom_emoji: Activar emoji personalisate
-        enable_sign_in_token_auth_user: Activar le authentication per testimonio via email pro usator
+        enable_sign_in_token_auth_user: Activar le authentication per token de e-mail pro le usator
         enable_user: Activar le usator
-        memorialize_account: Commemorar conto
+        memorialize_account: Converter conto in memorial
         promote_user: Promover usator
         reject_appeal: Rejectar appello
         reject_user: Rejectar usator
@@ -214,14 +214,14 @@ ia:
         resend_user: Reinviar message de confirmation
         reset_password_user: Reinitialisar contrasigno
         resolve_report: Resolver reporto
-        sensitive_account: Marcar como sensibile le medios del conto
+        sensitive_account: Fortiar de marcar le conto como sensibile
         silence_account: Limitar conto
         suspend_account: Suspender conto
         unassigned_report: Disassignar reporto
         unblock_email_account: Disblocar adresse de e-mail
-        unsensitive_account: Dismarcar como sensibile le medios del conto
-        unsilence_account: Disfacer le limite de conto
-        unsuspend_account: Annullar suspension de conto
+        unsensitive_account: Non plus fortiar de marcar le conto como sensibile
+        unsilence_account: Non plus limitar conto
+        unsuspend_account: Non plus suspender conto
         update_announcement: Actualisar annuncio
         update_custom_emoji: Actualisar emoji personalisate
         update_domain_block: Actualisar blocada de dominio
diff --git a/config/locales/simple_form.lv.yml b/config/locales/simple_form.lv.yml
index 711484b642d70f..888e08b650170e 100644
--- a/config/locales/simple_form.lv.yml
+++ b/config/locales/simple_form.lv.yml
@@ -77,9 +77,11 @@ lv:
           warn: Paslēp filtrēto saturu aiz brīdinājuma, kurā minēts filtra nosaukums
       form_admin_settings:
         activity_api_enabled: Vietēji publicēto ziņu, aktīvo lietotāju un jauno reģistrāciju skaits nedēļas kopās
+        app_icon: WEBP, PNG, GIF vai JPG. Mobilajās ierīcēs aizstāj noklusējuma lietotnes ikonu ar pielāgotu.
         bootstrap_timeline_accounts: Šie konti tiks piesprausti jauno lietotāju ieteikumu augšdaļā.
         closed_registrations_message: Tiek rādīts, kad reģistrēšanās ir slēgta
         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ē.
         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.
@@ -113,6 +115,7 @@ lv:
           sign_up_requires_approval: Jaunām reģistrācijām būs nepieciešams tavs apstiprinājums
         severity: Izvēlies, kas notiks ar pieprasījumiem no šīs IP adreses
       rule:
+        hint: Izvēles. Sniedz vairāk informācijas par nosacījumu
         text: Apraksti nosacījumus vai prasības šī servera lietotājiem. Centies, lai tas būtu īss un vienkāršs
       sessions:
         otp: 'Ievadi divfaktoru kodu, ko ģenerējusi tava tālruņa lietotne, vai izmanto kādu no atkopšanas kodiem:'
@@ -239,6 +242,7 @@ lv:
         backups_retention_period: Lietotāja arhīva glabāšanas periods
         bootstrap_timeline_accounts: Vienmēr iesaki šos kontus jaunajiem lietotājiem
         closed_registrations_message: Pielāgots ziņojums, ja reģistrēšanās nav pieejama
+        content_cache_retention_period: Attālā satura paturēšanas laika posms
         custom_css: Pielāgots CSS
         mascot: Pielāgots talismans (mantots)
         media_cache_retention_period: Multivides kešatmiņas saglabāšanas periods
@@ -295,6 +299,7 @@ lv:
           patch: Paziņot par novērsto kļūdu atjauninājumiem
         trending_tag: Jaunā tendence ir jāpārskata
       rule:
+        hint: Papildu informācija
         text: Noteikumi
       settings:
         indexable: Ietvert profila lapu meklēšanas dzinējos

From 6e92a9b73e9093a85679841081d60a143261050d Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 3 Jun 2024 09:35:06 +0200
Subject: [PATCH 1159/2191] chore(deps): update devdependencies (non-major)
 (#30526)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 60 ++++++++++++++++++++++---------------------------------
 1 file changed, 24 insertions(+), 36 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index f77dedd4b493bc..46a55e3f486e37 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8380,12 +8380,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"file-entry-cache@npm:^8.0.0":
-  version: 8.0.0
-  resolution: "file-entry-cache@npm:8.0.0"
+"file-entry-cache@npm:^9.0.0":
+  version: 9.0.0
+  resolution: "file-entry-cache@npm:9.0.0"
   dependencies:
-    flat-cache: "npm:^4.0.0"
-  checksum: 10c0/9e2b5938b1cd9b6d7e3612bdc533afd4ac17b2fc646569e9a8abbf2eb48e5eb8e316bc38815a3ef6a1b456f4107f0d0f055a614ca613e75db6bf9ff4d72c1638
+    flat-cache: "npm:^5.0.0"
+  checksum: 10c0/07b0a4f062dc0aa258f3e1b06ac083ea25313f5e289943e146fafdaf3315dcc031635545eea7fe98fe5598b91d6c7f48dba7a251dd7ac20108a6ebf7d00b0b1c
   languageName: node
   linkType: hard
 
@@ -8530,14 +8530,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"flat-cache@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "flat-cache@npm:4.0.0"
+"flat-cache@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "flat-cache@npm:5.0.0"
   dependencies:
-    flatted: "npm:^3.2.9"
+    flatted: "npm:^3.3.1"
     keyv: "npm:^4.5.4"
-    rimraf: "npm:^5.0.5"
-  checksum: 10c0/8f99e27bb3de94e91e7b4ca5120488cdc2b7f8cd952a538f1a566101963057eb42ca318e9fac0d36987dcca34316ff04b61c1dc3dcc8084f6f5e801a52a8e547
+  checksum: 10c0/847f25eefec5d6614fdce76dc6097ee98f63fd4dfbcb908718905ac56610f939f4c28b1f908d6e8857d49286fe73235095d2e7ac9df096c35a3e8a15204c361b
   languageName: node
   linkType: hard
 
@@ -8550,10 +8549,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"flatted@npm:^3.2.9":
-  version: 3.2.9
-  resolution: "flatted@npm:3.2.9"
-  checksum: 10c0/5c91c5a0a21bbc0b07b272231e5b4efe6b822bcb4ad317caf6bb06984be4042a9e9045026307da0fdb4583f1f545e317a67ef1231a59e71f7fced3cc429cfc53
+"flatted@npm:^3.2.9, flatted@npm:^3.3.1":
+  version: 3.3.1
+  resolution: "flatted@npm:3.3.1"
+  checksum: 10c0/324166b125ee07d4ca9bcf3a5f98d915d5db4f39d711fba640a3178b959919aae1f7cfd8aabcfef5826ed8aa8a2aa14cc85b2d7d18ff638ddf4ae3df39573eaf
   languageName: node
   linkType: hard
 
@@ -8877,7 +8876,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"glob@npm:^10.2.2, glob@npm:^10.2.6, glob@npm:^10.3.10, glob@npm:^10.3.7":
+"glob@npm:^10.2.2, glob@npm:^10.2.6, glob@npm:^10.3.10":
   version: 10.4.1
   resolution: "glob@npm:10.4.1"
   dependencies:
@@ -11719,7 +11718,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"micromatch@npm:^4.0.4, micromatch@npm:^4.0.5, micromatch@npm:~4.0.7":
+"micromatch@npm:^4.0.4, micromatch@npm:^4.0.7, micromatch@npm:~4.0.7":
   version: 4.0.7
   resolution: "micromatch@npm:4.0.7"
   dependencies:
@@ -13965,11 +13964,11 @@ __metadata:
   linkType: hard
 
 "prettier@npm:^3.0.0":
-  version: 3.2.5
-  resolution: "prettier@npm:3.2.5"
+  version: 3.3.0
+  resolution: "prettier@npm:3.3.0"
   bin:
     prettier: bin/prettier.cjs
-  checksum: 10c0/ea327f37a7d46f2324a34ad35292af2ad4c4c3c3355da07313339d7e554320f66f65f91e856add8530157a733c6c4a897dc41b577056be5c24c40f739f5ee8c6
+  checksum: 10c0/d033c356320aa2e468bf29c931b094ac730d2f4defd5eb2989d8589313dec901d2fc866e3788f3d161e420b142ea4ec3dda535dbe0169ef4d0026397a68ba9cf
   languageName: node
   linkType: hard
 
@@ -15165,17 +15164,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rimraf@npm:^5.0.5":
-  version: 5.0.5
-  resolution: "rimraf@npm:5.0.5"
-  dependencies:
-    glob: "npm:^10.3.7"
-  bin:
-    rimraf: dist/esm/bin.mjs
-  checksum: 10c0/d50dbe724f33835decd88395b25ed35995077c60a50ae78ded06e0185418914e555817aad1b4243edbff2254548c2f6ad6f70cc850040bebb4da9e8cc016f586
-  languageName: node
-  linkType: hard
-
 "ripemd160@npm:^2.0.0, ripemd160@npm:^2.0.1":
   version: 2.0.2
   resolution: "ripemd160@npm:2.0.2"
@@ -16436,8 +16424,8 @@ __metadata:
   linkType: hard
 
 "stylelint@npm:^16.0.2":
-  version: 16.6.0
-  resolution: "stylelint@npm:16.6.0"
+  version: 16.6.1
+  resolution: "stylelint@npm:16.6.1"
   dependencies:
     "@csstools/css-parser-algorithms": "npm:^2.6.3"
     "@csstools/css-tokenizer": "npm:^2.3.1"
@@ -16452,7 +16440,7 @@ __metadata:
     debug: "npm:^4.3.4"
     fast-glob: "npm:^3.3.2"
     fastest-levenshtein: "npm:^1.0.16"
-    file-entry-cache: "npm:^8.0.0"
+    file-entry-cache: "npm:^9.0.0"
     global-modules: "npm:^2.0.0"
     globby: "npm:^11.1.0"
     globjoin: "npm:^0.1.4"
@@ -16463,7 +16451,7 @@ __metadata:
     known-css-properties: "npm:^0.31.0"
     mathml-tag-names: "npm:^2.1.3"
     meow: "npm:^13.2.0"
-    micromatch: "npm:^4.0.5"
+    micromatch: "npm:^4.0.7"
     normalize-path: "npm:^3.0.0"
     picocolors: "npm:^1.0.1"
     postcss: "npm:^8.4.38"
@@ -16480,7 +16468,7 @@ __metadata:
     write-file-atomic: "npm:^5.0.1"
   bin:
     stylelint: bin/stylelint.mjs
-  checksum: 10c0/acfb7983a0b71677d066b2aa570eefdac0a7be2e21351bac8884b8156deaeec19e53ad128ae7ae7933c79f6045f1de8d759ba06cfbc373b2711015860805a3e7
+  checksum: 10c0/8dc9b0024d6fb109380a142171ab8a134c3863aa8b8736f0083310a0d05f173dcda5680f29267697dfa0aaeb2f08aef4ef113e4bb4f8582fcfdd97f35be51d71
   languageName: node
   linkType: hard
 

From db49b0e5e92e1bb54a579b407b1bf9bcee6d4e4e Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 3 Jun 2024 09:35:11 +0200
Subject: [PATCH 1160/2191] chore(deps): update eslint (non-major) (#30527)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 486 ++++++++++++++++++++++++++++++------------------------
 1 file changed, 271 insertions(+), 215 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 46a55e3f486e37..162f0cb359e4ce 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2131,9 +2131,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@es-joy/jsdoccomment@npm:~0.43.0":
-  version: 0.43.0
-  resolution: "@es-joy/jsdoccomment@npm:0.43.0"
+"@es-joy/jsdoccomment@npm:~0.43.1":
+  version: 0.43.1
+  resolution: "@es-joy/jsdoccomment@npm:0.43.1"
   dependencies:
     "@types/eslint": "npm:^8.56.5"
     "@types/estree": "npm:^1.0.5"
@@ -2141,7 +2141,7 @@ __metadata:
     comment-parser: "npm:1.4.1"
     esquery: "npm:^1.5.0"
     jsdoc-type-pratt-parser: "npm:~4.0.0"
-  checksum: 10c0/862294ed89772a231f309edd68405ece00f6aaf43103210f28410da894a6b697bc1f281c59e813dd37d5b7294f633ee7b874e07a0aa3d72f49504089fc9cb2c4
+  checksum: 10c0/2a4842b0e37eb937d55e3028ab2cd7ece7097e1f8c878bb9e28c3309371844688c2869d25bb949e2664c9ba63e388ea09b769c9f42f77515d328ec40e6fcfed1
   languageName: node
   linkType: hard
 
@@ -4109,14 +4109,14 @@ __metadata:
   linkType: hard
 
 "@typescript-eslint/eslint-plugin@npm:^7.0.0":
-  version: 7.10.0
-  resolution: "@typescript-eslint/eslint-plugin@npm:7.10.0"
+  version: 7.11.0
+  resolution: "@typescript-eslint/eslint-plugin@npm:7.11.0"
   dependencies:
     "@eslint-community/regexpp": "npm:^4.10.0"
-    "@typescript-eslint/scope-manager": "npm:7.10.0"
-    "@typescript-eslint/type-utils": "npm:7.10.0"
-    "@typescript-eslint/utils": "npm:7.10.0"
-    "@typescript-eslint/visitor-keys": "npm:7.10.0"
+    "@typescript-eslint/scope-manager": "npm:7.11.0"
+    "@typescript-eslint/type-utils": "npm:7.11.0"
+    "@typescript-eslint/utils": "npm:7.11.0"
+    "@typescript-eslint/visitor-keys": "npm:7.11.0"
     graphemer: "npm:^1.4.0"
     ignore: "npm:^5.3.1"
     natural-compare: "npm:^1.4.0"
@@ -4127,25 +4127,25 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 10c0/bf3f0118ea5961c3eb01894678246458a329d82dda9ac7c2f5bfe77896410d05a08a4655e533bcb1ed2a3132ba6421981ec8c2ed0a3545779d9603ea231947ae
+  checksum: 10c0/50fedf832e4de9546569106eab1d10716204ceebc5cc7d62299112c881212270d0f7857e3d6452c07db031d40b58cf27c4d1b1a36043e8e700fc3496e377b54a
   languageName: node
   linkType: hard
 
 "@typescript-eslint/parser@npm:^7.0.0":
-  version: 7.10.0
-  resolution: "@typescript-eslint/parser@npm:7.10.0"
+  version: 7.11.0
+  resolution: "@typescript-eslint/parser@npm:7.11.0"
   dependencies:
-    "@typescript-eslint/scope-manager": "npm:7.10.0"
-    "@typescript-eslint/types": "npm:7.10.0"
-    "@typescript-eslint/typescript-estree": "npm:7.10.0"
-    "@typescript-eslint/visitor-keys": "npm:7.10.0"
+    "@typescript-eslint/scope-manager": "npm:7.11.0"
+    "@typescript-eslint/types": "npm:7.11.0"
+    "@typescript-eslint/typescript-estree": "npm:7.11.0"
+    "@typescript-eslint/visitor-keys": "npm:7.11.0"
     debug: "npm:^4.3.4"
   peerDependencies:
     eslint: ^8.56.0
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 10c0/4c4fbf43b5b05d75b766acb803d3dd078c6e080641a77f9e48ba005713466738ea4a71f0564fa3ce520988d65158d14c8c952ba01ccbc431ab4a05935db5ce6d
+  checksum: 10c0/f5d1343fae90ccd91aea8adf194e22ed3eb4b2ea79d03d8a9ca6e7b669a6db306e93138ec64f7020c5b3128619d50304dea1f06043eaff6b015071822cad4972
   languageName: node
   linkType: hard
 
@@ -4159,22 +4159,22 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/scope-manager@npm:7.10.0":
-  version: 7.10.0
-  resolution: "@typescript-eslint/scope-manager@npm:7.10.0"
+"@typescript-eslint/scope-manager@npm:7.11.0":
+  version: 7.11.0
+  resolution: "@typescript-eslint/scope-manager@npm:7.11.0"
   dependencies:
-    "@typescript-eslint/types": "npm:7.10.0"
-    "@typescript-eslint/visitor-keys": "npm:7.10.0"
-  checksum: 10c0/1d4f7ee137b95bd423b5a1b0d03251202dfc19bd8b6adfa5ff5df25fd5aa30e2d8ca50ab0d8d2e92441670ecbc2a82b3c2dbe39a4f268ec1ee1c1e267f7fd1d1
+    "@typescript-eslint/types": "npm:7.11.0"
+    "@typescript-eslint/visitor-keys": "npm:7.11.0"
+  checksum: 10c0/35f9d88f38f2366017b15c9ee752f2605afa8009fa1eaf81c8b2b71fc22ddd2a33fff794a02015c8991a5fa99f315c3d6d76a5957d3fad1ccbb4cd46735c98b5
   languageName: node
   linkType: hard
 
-"@typescript-eslint/type-utils@npm:7.10.0":
-  version: 7.10.0
-  resolution: "@typescript-eslint/type-utils@npm:7.10.0"
+"@typescript-eslint/type-utils@npm:7.11.0":
+  version: 7.11.0
+  resolution: "@typescript-eslint/type-utils@npm:7.11.0"
   dependencies:
-    "@typescript-eslint/typescript-estree": "npm:7.10.0"
-    "@typescript-eslint/utils": "npm:7.10.0"
+    "@typescript-eslint/typescript-estree": "npm:7.11.0"
+    "@typescript-eslint/utils": "npm:7.11.0"
     debug: "npm:^4.3.4"
     ts-api-utils: "npm:^1.3.0"
   peerDependencies:
@@ -4182,7 +4182,7 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 10c0/55e9a6690f9cedb79d30abb1990b161affaa2684dac246b743223353812c9c1e3fd2d923c67b193c6a3624a07e1c82c900ce7bf5b6b9891c846f04cb480ebd9f
+  checksum: 10c0/637395cb0f4c424c610e751906a31dcfedcdbd8c479012da6e81f9be6b930f32317bfe170ccb758d93a411b2bd9c4e7e5d18892094466099c6f9c3dceda81a72
   languageName: node
   linkType: hard
 
@@ -4193,10 +4193,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/types@npm:7.10.0, @typescript-eslint/types@npm:^7.2.0":
-  version: 7.10.0
-  resolution: "@typescript-eslint/types@npm:7.10.0"
-  checksum: 10c0/f01d9330b93cc362ba7967ab5037396f64742076450e1f93139fa69cbe93a6ece3ed55d68ab780c9b7d07ef4a7c645da410305216a2cfc5dec7eba49ee65ab23
+"@typescript-eslint/types@npm:7.11.0, @typescript-eslint/types@npm:^7.2.0":
+  version: 7.11.0
+  resolution: "@typescript-eslint/types@npm:7.11.0"
+  checksum: 10c0/c5d6c517124017eb44aa180c8ea1fad26ec8e47502f92fd12245ba3141560e69d7f7e35b8aa160ddd5df63a2952af407e2f62cc58b663c86e1f778ffb5b01789
   languageName: node
   linkType: hard
 
@@ -4219,12 +4219,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/typescript-estree@npm:7.10.0":
-  version: 7.10.0
-  resolution: "@typescript-eslint/typescript-estree@npm:7.10.0"
+"@typescript-eslint/typescript-estree@npm:7.11.0":
+  version: 7.11.0
+  resolution: "@typescript-eslint/typescript-estree@npm:7.11.0"
   dependencies:
-    "@typescript-eslint/types": "npm:7.10.0"
-    "@typescript-eslint/visitor-keys": "npm:7.10.0"
+    "@typescript-eslint/types": "npm:7.11.0"
+    "@typescript-eslint/visitor-keys": "npm:7.11.0"
     debug: "npm:^4.3.4"
     globby: "npm:^11.1.0"
     is-glob: "npm:^4.0.3"
@@ -4234,21 +4234,21 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 10c0/6200695834c566e52e2fa7331f1a05019f7815969d8c1e1e237b85a99664d36f41ccc16384eff3f8582a0ecb75f1cc315b56ee9283b818da37f24fa4d42f1d7a
+  checksum: 10c0/a4eda43f352d20edebae0c1c221c4fd9de0673a94988cf1ae3f5e4917ef9cdb9ead8d3673ea8dd6e80d9cf3523a47c295be1326a3fae017b277233f4c4b4026b
   languageName: node
   linkType: hard
 
-"@typescript-eslint/utils@npm:7.10.0":
-  version: 7.10.0
-  resolution: "@typescript-eslint/utils@npm:7.10.0"
+"@typescript-eslint/utils@npm:7.11.0":
+  version: 7.11.0
+  resolution: "@typescript-eslint/utils@npm:7.11.0"
   dependencies:
     "@eslint-community/eslint-utils": "npm:^4.4.0"
-    "@typescript-eslint/scope-manager": "npm:7.10.0"
-    "@typescript-eslint/types": "npm:7.10.0"
-    "@typescript-eslint/typescript-estree": "npm:7.10.0"
+    "@typescript-eslint/scope-manager": "npm:7.11.0"
+    "@typescript-eslint/types": "npm:7.11.0"
+    "@typescript-eslint/typescript-estree": "npm:7.11.0"
   peerDependencies:
     eslint: ^8.56.0
-  checksum: 10c0/6724471f94f2788f59748f7efa2a3a53ea910099993bee2fa5746ab5acacecdc9fcb110c568b18099ddc946ea44919ed394bff2bd055ba81fc69f5e6297b73bf
+  checksum: 10c0/539a7ff8b825ad810fc59a80269094748df1a397a42cdbb212c493fc2486711c7d8fd6d75d4cd8a067822b8e6a11f42c50441977d51c183eec47992506d1cdf8
   languageName: node
   linkType: hard
 
@@ -4279,13 +4279,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/visitor-keys@npm:7.10.0":
-  version: 7.10.0
-  resolution: "@typescript-eslint/visitor-keys@npm:7.10.0"
+"@typescript-eslint/visitor-keys@npm:7.11.0":
+  version: 7.11.0
+  resolution: "@typescript-eslint/visitor-keys@npm:7.11.0"
   dependencies:
-    "@typescript-eslint/types": "npm:7.10.0"
+    "@typescript-eslint/types": "npm:7.11.0"
     eslint-visitor-keys: "npm:^3.4.3"
-  checksum: 10c0/049e812bcd28869059d04c7bf3543bb55f5205f468b777439c4f120417fb856fb6024cb1d25291aa12556bd08e84f043a96d754ffb2cde37abb604d6f3c51634
+  checksum: 10c0/664e558d9645896484b7ffc9381837f0d52443bf8d121a5586d02d42ca4d17dc35faf526768c4b1beb52c57c43fae555898eb087651eb1c7a3d60f1085effea1
   languageName: node
   linkType: hard
 
@@ -4829,16 +4829,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"array-includes@npm:^3.1.6, array-includes@npm:^3.1.7":
-  version: 3.1.7
-  resolution: "array-includes@npm:3.1.7"
+"array-includes@npm:^3.1.6, array-includes@npm:^3.1.7, array-includes@npm:^3.1.8":
+  version: 3.1.8
+  resolution: "array-includes@npm:3.1.8"
   dependencies:
-    call-bind: "npm:^1.0.2"
-    define-properties: "npm:^1.2.0"
-    es-abstract: "npm:^1.22.1"
-    get-intrinsic: "npm:^1.2.1"
+    call-bind: "npm:^1.0.7"
+    define-properties: "npm:^1.2.1"
+    es-abstract: "npm:^1.23.2"
+    es-object-atoms: "npm:^1.0.0"
+    get-intrinsic: "npm:^1.2.4"
     is-string: "npm:^1.0.7"
-  checksum: 10c0/692907bd7f19d06dc58ccb761f34b58f5dc0b437d2b47a8fe42a1501849a5cf5c27aed3d521a9702667827c2c85a7e75df00a402c438094d87fc43f39ebf9b2b
+  checksum: 10c0/5b1004d203e85873b96ddc493f090c9672fd6c80d7a60b798da8a14bff8a670ff95db5aafc9abc14a211943f05220dacf8ea17638ae0af1a6a47b8c0b48ce370
   languageName: node
   linkType: hard
 
@@ -4872,16 +4873,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"array.prototype.findlast@npm:^1.2.4":
-  version: 1.2.4
-  resolution: "array.prototype.findlast@npm:1.2.4"
+"array.prototype.findlast@npm:^1.2.5":
+  version: 1.2.5
+  resolution: "array.prototype.findlast@npm:1.2.5"
   dependencies:
-    call-bind: "npm:^1.0.5"
+    call-bind: "npm:^1.0.7"
     define-properties: "npm:^1.2.1"
-    es-abstract: "npm:^1.22.3"
+    es-abstract: "npm:^1.23.2"
     es-errors: "npm:^1.3.0"
+    es-object-atoms: "npm:^1.0.0"
     es-shim-unscopables: "npm:^1.0.2"
-  checksum: 10c0/4b5145a68ebaa00ef3d61de07c6694cad73d60763079f1e7662b948e5a167b5121b0c1e6feae8df1e42ead07c21699e25242b95cd5c48e094fd530b192aa4150
+  checksum: 10c0/ddc952b829145ab45411b9d6adcb51a8c17c76bf89c9dd64b52d5dffa65d033da8c076ed2e17091779e83bc892b9848188d7b4b33453c5565e65a92863cb2775
   languageName: node
   linkType: hard
 
@@ -5065,15 +5067,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"asynciterator.prototype@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "asynciterator.prototype@npm:1.0.0"
-  dependencies:
-    has-symbols: "npm:^1.0.3"
-  checksum: 10c0/fb76850e57d931ff59fd16b6cddb79b0d34fe45f400b2c3480d38892e72cd089787401687dbdb7cdb14ece402c275d3e02a648760d1489cd493527129c4c6204
-  languageName: node
-  linkType: hard
-
 "asynckit@npm:^0.4.0":
   version: 0.4.0
   resolution: "asynckit@npm:0.4.0"
@@ -5122,7 +5115,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"available-typed-arrays@npm:^1.0.6, available-typed-arrays@npm:^1.0.7":
+"available-typed-arrays@npm:^1.0.7":
   version: 1.0.7
   resolution: "available-typed-arrays@npm:1.0.7"
   dependencies:
@@ -5808,7 +5801,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"call-bind@npm:^1.0.0, call-bind@npm:^1.0.2, call-bind@npm:^1.0.5, call-bind@npm:^1.0.6, call-bind@npm:^1.0.7":
+"call-bind@npm:^1.0.2, call-bind@npm:^1.0.5, call-bind@npm:^1.0.6, call-bind@npm:^1.0.7":
   version: 1.0.7
   resolution: "call-bind@npm:1.0.7"
   dependencies:
@@ -6868,6 +6861,39 @@ __metadata:
   languageName: node
   linkType: hard
 
+"data-view-buffer@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "data-view-buffer@npm:1.0.1"
+  dependencies:
+    call-bind: "npm:^1.0.6"
+    es-errors: "npm:^1.3.0"
+    is-data-view: "npm:^1.0.1"
+  checksum: 10c0/8984119e59dbed906a11fcfb417d7d861936f16697a0e7216fe2c6c810f6b5e8f4a5281e73f2c28e8e9259027190ac4a33e2a65fdd7fa86ac06b76e838918583
+  languageName: node
+  linkType: hard
+
+"data-view-byte-length@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "data-view-byte-length@npm:1.0.1"
+  dependencies:
+    call-bind: "npm:^1.0.7"
+    es-errors: "npm:^1.3.0"
+    is-data-view: "npm:^1.0.1"
+  checksum: 10c0/b7d9e48a0cf5aefed9ab7d123559917b2d7e0d65531f43b2fd95b9d3a6b46042dd3fca597c42bba384e66b70d7ad66ff23932f8367b241f53d93af42cfe04ec2
+  languageName: node
+  linkType: hard
+
+"data-view-byte-offset@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "data-view-byte-offset@npm:1.0.0"
+  dependencies:
+    call-bind: "npm:^1.0.6"
+    es-errors: "npm:^1.3.0"
+    is-data-view: "npm:^1.0.1"
+  checksum: 10c0/21b0d2e53fd6e20cc4257c873bf6d36d77bd6185624b84076c0a1ddaa757b49aaf076254006341d35568e89f52eecd1ccb1a502cfb620f2beca04f48a6a62a8f
+  languageName: node
+  linkType: hard
+
 "dateformat@npm:^4.6.3":
   version: 4.6.3
   resolution: "dateformat@npm:4.6.3"
@@ -6983,7 +7009,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"define-data-property@npm:^1.0.1, define-data-property@npm:^1.1.2":
+"define-data-property@npm:^1.0.1, define-data-property@npm:^1.1.2, define-data-property@npm:^1.1.4":
   version: 1.1.4
   resolution: "define-data-property@npm:1.1.4"
   dependencies:
@@ -7541,16 +7567,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"es-abstract@npm:^1.17.2, es-abstract@npm:^1.20.4, es-abstract@npm:^1.21.2, es-abstract@npm:^1.22.1, es-abstract@npm:^1.22.3, es-abstract@npm:^1.22.4":
-  version: 1.22.5
-  resolution: "es-abstract@npm:1.22.5"
+"es-abstract@npm:^1.17.2, es-abstract@npm:^1.20.4, es-abstract@npm:^1.21.2, es-abstract@npm:^1.22.1, es-abstract@npm:^1.22.3, es-abstract@npm:^1.23.0, es-abstract@npm:^1.23.2, es-abstract@npm:^1.23.3":
+  version: 1.23.3
+  resolution: "es-abstract@npm:1.23.3"
   dependencies:
     array-buffer-byte-length: "npm:^1.0.1"
     arraybuffer.prototype.slice: "npm:^1.0.3"
     available-typed-arrays: "npm:^1.0.7"
     call-bind: "npm:^1.0.7"
+    data-view-buffer: "npm:^1.0.1"
+    data-view-byte-length: "npm:^1.0.1"
+    data-view-byte-offset: "npm:^1.0.0"
     es-define-property: "npm:^1.0.0"
     es-errors: "npm:^1.3.0"
+    es-object-atoms: "npm:^1.0.0"
     es-set-tostringtag: "npm:^2.0.3"
     es-to-primitive: "npm:^1.2.1"
     function.prototype.name: "npm:^1.1.6"
@@ -7561,10 +7591,11 @@ __metadata:
     has-property-descriptors: "npm:^1.0.2"
     has-proto: "npm:^1.0.3"
     has-symbols: "npm:^1.0.3"
-    hasown: "npm:^2.0.1"
+    hasown: "npm:^2.0.2"
     internal-slot: "npm:^1.0.7"
     is-array-buffer: "npm:^3.0.4"
     is-callable: "npm:^1.2.7"
+    is-data-view: "npm:^1.0.1"
     is-negative-zero: "npm:^2.0.3"
     is-regex: "npm:^1.1.4"
     is-shared-array-buffer: "npm:^1.0.3"
@@ -7575,18 +7606,18 @@ __metadata:
     object-keys: "npm:^1.1.1"
     object.assign: "npm:^4.1.5"
     regexp.prototype.flags: "npm:^1.5.2"
-    safe-array-concat: "npm:^1.1.0"
+    safe-array-concat: "npm:^1.1.2"
     safe-regex-test: "npm:^1.0.3"
-    string.prototype.trim: "npm:^1.2.8"
-    string.prototype.trimend: "npm:^1.0.7"
-    string.prototype.trimstart: "npm:^1.0.7"
+    string.prototype.trim: "npm:^1.2.9"
+    string.prototype.trimend: "npm:^1.0.8"
+    string.prototype.trimstart: "npm:^1.0.8"
     typed-array-buffer: "npm:^1.0.2"
     typed-array-byte-length: "npm:^1.0.1"
     typed-array-byte-offset: "npm:^1.0.2"
-    typed-array-length: "npm:^1.0.5"
+    typed-array-length: "npm:^1.0.6"
     unbox-primitive: "npm:^1.0.2"
-    which-typed-array: "npm:^1.1.14"
-  checksum: 10c0/4bca5a60f0dff6c0a5690d8e51374cfcb8760d5dbbb1069174b4d41461cf4e0c3e0c1993bccbc5aa0799ff078199f1bcde2122b8709e0d17c2beffafff01010a
+    which-typed-array: "npm:^1.1.15"
+  checksum: 10c0/d27e9afafb225c6924bee9971a7f25f20c314f2d6cb93a63cada4ac11dcf42040896a6c22e5fb8f2a10767055ed4ddf400be3b1eb12297d281726de470b75666
   languageName: node
   linkType: hard
 
@@ -7613,30 +7644,38 @@ __metadata:
   languageName: node
   linkType: hard
 
-"es-iterator-helpers@npm:^1.0.15, es-iterator-helpers@npm:^1.0.17":
-  version: 1.0.17
-  resolution: "es-iterator-helpers@npm:1.0.17"
+"es-iterator-helpers@npm:^1.0.15, es-iterator-helpers@npm:^1.0.19":
+  version: 1.0.19
+  resolution: "es-iterator-helpers@npm:1.0.19"
   dependencies:
-    asynciterator.prototype: "npm:^1.0.0"
     call-bind: "npm:^1.0.7"
     define-properties: "npm:^1.2.1"
-    es-abstract: "npm:^1.22.4"
+    es-abstract: "npm:^1.23.3"
     es-errors: "npm:^1.3.0"
-    es-set-tostringtag: "npm:^2.0.2"
+    es-set-tostringtag: "npm:^2.0.3"
     function-bind: "npm:^1.1.2"
     get-intrinsic: "npm:^1.2.4"
     globalthis: "npm:^1.0.3"
     has-property-descriptors: "npm:^1.0.2"
-    has-proto: "npm:^1.0.1"
+    has-proto: "npm:^1.0.3"
     has-symbols: "npm:^1.0.3"
     internal-slot: "npm:^1.0.7"
     iterator.prototype: "npm:^1.1.2"
-    safe-array-concat: "npm:^1.1.0"
-  checksum: 10c0/d0f281257e7165f068fd4fc3beb63d07ae4f18fbef02a2bbe4a39272b764164c1ce3311ae7c5429ac30003aef290fcdf569050e4a9ba3560e044440f68e9a47c
+    safe-array-concat: "npm:^1.1.2"
+  checksum: 10c0/ae8f0241e383b3d197383b9842c48def7fce0255fb6ed049311b686ce295595d9e389b466f6a1b7d4e7bb92d82f5e716d6fae55e20c1040249bf976743b038c5
+  languageName: node
+  linkType: hard
+
+"es-object-atoms@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "es-object-atoms@npm:1.0.0"
+  dependencies:
+    es-errors: "npm:^1.3.0"
+  checksum: 10c0/1fed3d102eb27ab8d983337bb7c8b159dd2a1e63ff833ec54eea1311c96d5b08223b433060ba240541ca8adba9eee6b0a60cdbf2f80634b784febc9cc8b687b4
   languageName: node
   linkType: hard
 
-"es-set-tostringtag@npm:^2.0.2, es-set-tostringtag@npm:^2.0.3":
+"es-set-tostringtag@npm:^2.0.3":
   version: 2.0.3
   resolution: "es-set-tostringtag@npm:2.0.3"
   dependencies:
@@ -7817,20 +7856,20 @@ __metadata:
   linkType: hard
 
 "eslint-plugin-jsdoc@npm:^48.0.0":
-  version: 48.2.6
-  resolution: "eslint-plugin-jsdoc@npm:48.2.6"
+  version: 48.2.7
+  resolution: "eslint-plugin-jsdoc@npm:48.2.7"
   dependencies:
-    "@es-joy/jsdoccomment": "npm:~0.43.0"
+    "@es-joy/jsdoccomment": "npm:~0.43.1"
     are-docs-informative: "npm:^0.0.2"
     comment-parser: "npm:1.4.1"
     debug: "npm:^4.3.4"
     escape-string-regexp: "npm:^4.0.0"
     esquery: "npm:^1.5.0"
-    semver: "npm:^7.6.1"
+    semver: "npm:^7.6.2"
     spdx-expression-parse: "npm:^4.0.0"
   peerDependencies:
     eslint: ^7.0.0 || ^8.0.0 || ^9.0.0
-  checksum: 10c0/9f01b3000aa31f17767786c62caf62f1e8c4b88bfef04b207d3b1de785be287cc2da3ad16ed32afacd5f6e6a9b76ebf3369069be416ce2228c44cd6d084fcd8f
+  checksum: 10c0/74d0f95b3d880dd4221dbc0b9341266a6cce3b8ca8d3e30032223af3552364643d6b82ad733d9bc06a20f0d640f21e4d8f5a4b00901d1771572625178b8c40c3
   languageName: node
   linkType: hard
 
@@ -7879,30 +7918,30 @@ __metadata:
   linkType: hard
 
 "eslint-plugin-react@npm:^7.33.2":
-  version: 7.34.1
-  resolution: "eslint-plugin-react@npm:7.34.1"
+  version: 7.34.2
+  resolution: "eslint-plugin-react@npm:7.34.2"
   dependencies:
-    array-includes: "npm:^3.1.7"
-    array.prototype.findlast: "npm:^1.2.4"
+    array-includes: "npm:^3.1.8"
+    array.prototype.findlast: "npm:^1.2.5"
     array.prototype.flatmap: "npm:^1.3.2"
     array.prototype.toreversed: "npm:^1.1.2"
     array.prototype.tosorted: "npm:^1.1.3"
     doctrine: "npm:^2.1.0"
-    es-iterator-helpers: "npm:^1.0.17"
+    es-iterator-helpers: "npm:^1.0.19"
     estraverse: "npm:^5.3.0"
     jsx-ast-utils: "npm:^2.4.1 || ^3.0.0"
     minimatch: "npm:^3.1.2"
-    object.entries: "npm:^1.1.7"
-    object.fromentries: "npm:^2.0.7"
-    object.hasown: "npm:^1.1.3"
-    object.values: "npm:^1.1.7"
+    object.entries: "npm:^1.1.8"
+    object.fromentries: "npm:^2.0.8"
+    object.hasown: "npm:^1.1.4"
+    object.values: "npm:^1.2.0"
     prop-types: "npm:^15.8.1"
     resolve: "npm:^2.0.0-next.5"
     semver: "npm:^6.3.1"
-    string.prototype.matchall: "npm:^4.0.10"
+    string.prototype.matchall: "npm:^4.0.11"
   peerDependencies:
     eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8
-  checksum: 10c0/7c61b1314d37a4ac2f2474f9571f801f1a1a5d81dcd4abbb5d07145406518722fb792367267757ee116bde254be9753242d6b93c9619110398b3fe1746e4848c
+  checksum: 10c0/37dc04424da8626f20a071466e7238d53ed111c53e5e5398d813ac2cf76a2078f00d91f7833fe5b2f0fc98f2688a75b36e78e9ada9f1068705d23c7031094316
   languageName: node
   linkType: hard
 
@@ -8771,7 +8810,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"get-intrinsic@npm:^1.0.2, get-intrinsic@npm:^1.1.1, get-intrinsic@npm:^1.1.3, get-intrinsic@npm:^1.2.1, get-intrinsic@npm:^1.2.2, get-intrinsic@npm:^1.2.3, get-intrinsic@npm:^1.2.4":
+"get-intrinsic@npm:^1.1.1, get-intrinsic@npm:^1.1.3, get-intrinsic@npm:^1.2.1, get-intrinsic@npm:^1.2.3, get-intrinsic@npm:^1.2.4":
   version: 1.2.4
   resolution: "get-intrinsic@npm:1.2.4"
   dependencies:
@@ -9091,7 +9130,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"has-tostringtag@npm:^1.0.0, has-tostringtag@npm:^1.0.1, has-tostringtag@npm:^1.0.2":
+"has-tostringtag@npm:^1.0.0, has-tostringtag@npm:^1.0.2":
   version: 1.0.2
   resolution: "has-tostringtag@npm:1.0.2"
   dependencies:
@@ -9160,12 +9199,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"hasown@npm:^2.0.0, hasown@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "hasown@npm:2.0.1"
+"hasown@npm:^2.0.0, hasown@npm:^2.0.1, hasown@npm:^2.0.2":
+  version: 2.0.2
+  resolution: "hasown@npm:2.0.2"
   dependencies:
     function-bind: "npm:^1.1.2"
-  checksum: 10c0/9e27e70e8e4204f4124c8f99950d1ba2b1f5174864fd39ff26da190f9ea6488c1b3927dcc64981c26d1f637a971783c9489d62c829d393ea509e6f1ba20370bb
+  checksum: 10c0/3769d434703b8ac66b209a4cca0737519925bbdb61dd887f93a16372b14694c63ff4e797686d87c90f08168e81082248b9b028bad60d4da9e0d1148766f56eb9
   languageName: node
   linkType: hard
 
@@ -9610,7 +9649,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"internal-slot@npm:^1.0.5, internal-slot@npm:^1.0.7":
+"internal-slot@npm:^1.0.7":
   version: 1.0.7
   resolution: "internal-slot@npm:1.0.7"
   dependencies:
@@ -9842,6 +9881,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-data-view@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "is-data-view@npm:1.0.1"
+  dependencies:
+    is-typed-array: "npm:^1.1.13"
+  checksum: 10c0/a3e6ec84efe303da859107aed9b970e018e2bee7ffcb48e2f8096921a493608134240e672a2072577e5f23a729846241d9634806e8a0e51d9129c56d5f65442d
+  languageName: node
+  linkType: hard
+
 "is-date-object@npm:^1.0.1, is-date-object@npm:^1.0.5":
   version: 1.0.5
   resolution: "is-date-object@npm:1.0.5"
@@ -12299,7 +12347,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"object-inspect@npm:^1.13.1, object-inspect@npm:^1.9.0":
+"object-inspect@npm:^1.13.1":
   version: 1.13.1
   resolution: "object-inspect@npm:1.13.1"
   checksum: 10c0/fad603f408e345c82e946abdf4bfd774260a5ed3e5997a0b057c44153ac32c7271ff19e3a5ae39c858da683ba045ccac2f65245c12763ce4e8594f818f4a648d
@@ -12344,25 +12392,26 @@ __metadata:
   languageName: node
   linkType: hard
 
-"object.entries@npm:^1.1.7":
-  version: 1.1.7
-  resolution: "object.entries@npm:1.1.7"
+"object.entries@npm:^1.1.7, object.entries@npm:^1.1.8":
+  version: 1.1.8
+  resolution: "object.entries@npm:1.1.8"
   dependencies:
-    call-bind: "npm:^1.0.2"
-    define-properties: "npm:^1.2.0"
-    es-abstract: "npm:^1.22.1"
-  checksum: 10c0/3ad1899cc7bf14546bf28f4a9b363ae8690b90948fcfbcac4c808395435d760f26193d9cae95337ce0e3c1e5c1f4fa45f7b46b31b68d389e9e117fce38775d86
+    call-bind: "npm:^1.0.7"
+    define-properties: "npm:^1.2.1"
+    es-object-atoms: "npm:^1.0.0"
+  checksum: 10c0/db9ea979d2956a3bc26c262da4a4d212d36f374652cc4c13efdd069c1a519c16571c137e2893d1c46e1cb0e15c88fd6419eaf410c945f329f09835487d7e65d3
   languageName: node
   linkType: hard
 
-"object.fromentries@npm:^2.0.7":
-  version: 2.0.7
-  resolution: "object.fromentries@npm:2.0.7"
+"object.fromentries@npm:^2.0.7, object.fromentries@npm:^2.0.8":
+  version: 2.0.8
+  resolution: "object.fromentries@npm:2.0.8"
   dependencies:
-    call-bind: "npm:^1.0.2"
-    define-properties: "npm:^1.2.0"
-    es-abstract: "npm:^1.22.1"
-  checksum: 10c0/071745c21f6fc9e6c914691f2532c1fb60ad967e5ddc52801d09958b5de926566299d07ae14466452a7efd29015f9145d6c09c573d93a0dc6f1683ee0ec2b93b
+    call-bind: "npm:^1.0.7"
+    define-properties: "npm:^1.2.1"
+    es-abstract: "npm:^1.23.2"
+    es-object-atoms: "npm:^1.0.0"
+  checksum: 10c0/cd4327e6c3369cfa805deb4cbbe919bfb7d3aeebf0bcaba291bb568ea7169f8f8cdbcabe2f00b40db0c20cd20f08e11b5f3a5a36fb7dd3fe04850c50db3bf83b
   languageName: node
   linkType: hard
 
@@ -12391,13 +12440,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"object.hasown@npm:^1.1.3":
-  version: 1.1.3
-  resolution: "object.hasown@npm:1.1.3"
+"object.hasown@npm:^1.1.4":
+  version: 1.1.4
+  resolution: "object.hasown@npm:1.1.4"
   dependencies:
-    define-properties: "npm:^1.2.0"
-    es-abstract: "npm:^1.22.1"
-  checksum: 10c0/8a41ba4fb1208a85c2275e9b5098071beacc24345b9a71ab98ef0a1c61b34dc74c6b460ff1e1884c33843d8f2553df64a10eec2b74b3ed009e3b2710c826bd2c
+    define-properties: "npm:^1.2.1"
+    es-abstract: "npm:^1.23.2"
+    es-object-atoms: "npm:^1.0.0"
+  checksum: 10c0/f23187b08d874ef1aea060118c8259eb7f99f93c15a50771d710569534119062b90e087b92952b2d0fb1bb8914d61fb0b43c57fb06f622aaad538fe6868ab987
   languageName: node
   linkType: hard
 
@@ -12410,14 +12460,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"object.values@npm:^1.1.0, object.values@npm:^1.1.6, object.values@npm:^1.1.7":
-  version: 1.1.7
-  resolution: "object.values@npm:1.1.7"
+"object.values@npm:^1.1.0, object.values@npm:^1.1.6, object.values@npm:^1.1.7, object.values@npm:^1.2.0":
+  version: 1.2.0
+  resolution: "object.values@npm:1.2.0"
   dependencies:
-    call-bind: "npm:^1.0.2"
-    define-properties: "npm:^1.2.0"
-    es-abstract: "npm:^1.22.1"
-  checksum: 10c0/e869d6a37fb7afdd0054dea49036d6ccebb84854a8848a093bbd1bc516f53e690bba88f0bc3e83fdfa74c601469ee6989c9b13359cda9604144c6e732fad3b6b
+    call-bind: "npm:^1.0.7"
+    define-properties: "npm:^1.2.1"
+    es-object-atoms: "npm:^1.0.0"
+  checksum: 10c0/15809dc40fd6c5529501324fec5ff08570b7d70fb5ebbe8e2b3901afec35cf2b3dc484d1210c6c642cd3e7e0a5e18dd1d6850115337fef46bdae14ab0cb18ac3
   languageName: node
   linkType: hard
 
@@ -14868,7 +14918,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"regexp.prototype.flags@npm:^1.2.0, regexp.prototype.flags@npm:^1.5.0, regexp.prototype.flags@npm:^1.5.2":
+"regexp.prototype.flags@npm:^1.2.0, regexp.prototype.flags@npm:^1.5.2":
   version: 1.5.2
   resolution: "regexp.prototype.flags@npm:1.5.2"
   dependencies:
@@ -15211,15 +15261,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"safe-array-concat@npm:^1.0.0, safe-array-concat@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "safe-array-concat@npm:1.1.0"
+"safe-array-concat@npm:^1.0.0, safe-array-concat@npm:^1.1.2":
+  version: 1.1.2
+  resolution: "safe-array-concat@npm:1.1.2"
   dependencies:
-    call-bind: "npm:^1.0.5"
-    get-intrinsic: "npm:^1.2.2"
+    call-bind: "npm:^1.0.7"
+    get-intrinsic: "npm:^1.2.4"
     has-symbols: "npm:^1.0.3"
     isarray: "npm:^2.0.5"
-  checksum: 10c0/833d3d950fc7507a60075f9bfaf41ec6dac7c50c7a9d62b1e6b071ecc162185881f92e594ff95c1a18301c881352dd6fd236d56999d5819559db7b92da9c28af
+  checksum: 10c0/12f9fdb01c8585e199a347eacc3bae7b5164ae805cdc8c6707199dbad5b9e30001a50a43c4ee24dc9ea32dbb7279397850e9208a7e217f4d8b1cf5d90129dec9
   languageName: node
   linkType: hard
 
@@ -15418,7 +15468,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.5.3, semver@npm:^7.5.4, semver@npm:^7.6.0, semver@npm:^7.6.1":
+"semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.5.3, semver@npm:^7.5.4, semver@npm:^7.6.0, semver@npm:^7.6.2":
   version: 7.6.2
   resolution: "semver@npm:7.6.2"
   bin:
@@ -15514,14 +15564,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"set-function-name@npm:^2.0.0, set-function-name@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "set-function-name@npm:2.0.1"
+"set-function-name@npm:^2.0.1, set-function-name@npm:^2.0.2":
+  version: 2.0.2
+  resolution: "set-function-name@npm:2.0.2"
   dependencies:
-    define-data-property: "npm:^1.0.1"
+    define-data-property: "npm:^1.1.4"
+    es-errors: "npm:^1.3.0"
     functions-have-names: "npm:^1.2.3"
-    has-property-descriptors: "npm:^1.0.0"
-  checksum: 10c0/6be7d3e15be47f4db8a5a563a35c60b5e7c4af91cc900e8972ffad33d3aaa227900faa55f60121cdb04b85866a734bb7fe4cd91f654c632861cc86121a48312a
+    has-property-descriptors: "npm:^1.0.2"
+  checksum: 10c0/fce59f90696c450a8523e754abb305e2b8c73586452619c2bad5f7bf38c7b6b4651895c9db895679c5bef9554339cf3ef1c329b66ece3eda7255785fbe299316
   languageName: node
   linkType: hard
 
@@ -15618,14 +15669,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"side-channel@npm:^1.0.4":
-  version: 1.0.4
-  resolution: "side-channel@npm:1.0.4"
+"side-channel@npm:^1.0.4, side-channel@npm:^1.0.6":
+  version: 1.0.6
+  resolution: "side-channel@npm:1.0.6"
   dependencies:
-    call-bind: "npm:^1.0.0"
-    get-intrinsic: "npm:^1.0.2"
-    object-inspect: "npm:^1.9.0"
-  checksum: 10c0/054a5d23ee35054b2c4609b9fd2a0587760737782b5d765a9c7852264710cc39c6dcb56a9bbd6c12cd84071648aea3edb2359d2f6e560677eedadce511ac1da5
+    call-bind: "npm:^1.0.7"
+    es-errors: "npm:^1.3.0"
+    get-intrinsic: "npm:^1.2.4"
+    object-inspect: "npm:^1.13.1"
+  checksum: 10c0/d2afd163dc733cc0a39aa6f7e39bf0c436293510dbccbff446733daeaf295857dbccf94297092ec8c53e2503acac30f0b78830876f0485991d62a90e9cad305f
   languageName: node
   linkType: hard
 
@@ -16161,53 +16213,57 @@ __metadata:
   languageName: node
   linkType: hard
 
-"string.prototype.matchall@npm:^4.0.10, string.prototype.matchall@npm:^4.0.6":
-  version: 4.0.10
-  resolution: "string.prototype.matchall@npm:4.0.10"
+"string.prototype.matchall@npm:^4.0.11, string.prototype.matchall@npm:^4.0.6":
+  version: 4.0.11
+  resolution: "string.prototype.matchall@npm:4.0.11"
   dependencies:
-    call-bind: "npm:^1.0.2"
-    define-properties: "npm:^1.2.0"
-    es-abstract: "npm:^1.22.1"
-    get-intrinsic: "npm:^1.2.1"
+    call-bind: "npm:^1.0.7"
+    define-properties: "npm:^1.2.1"
+    es-abstract: "npm:^1.23.2"
+    es-errors: "npm:^1.3.0"
+    es-object-atoms: "npm:^1.0.0"
+    get-intrinsic: "npm:^1.2.4"
+    gopd: "npm:^1.0.1"
     has-symbols: "npm:^1.0.3"
-    internal-slot: "npm:^1.0.5"
-    regexp.prototype.flags: "npm:^1.5.0"
-    set-function-name: "npm:^2.0.0"
-    side-channel: "npm:^1.0.4"
-  checksum: 10c0/cd7495fb0de16d43efeee3887b98701941f3817bd5f09351ad1825b023d307720c86394d56d56380563d97767ab25bf5448db239fcecbb85c28e2180f23e324a
+    internal-slot: "npm:^1.0.7"
+    regexp.prototype.flags: "npm:^1.5.2"
+    set-function-name: "npm:^2.0.2"
+    side-channel: "npm:^1.0.6"
+  checksum: 10c0/915a2562ac9ab5e01b7be6fd8baa0b2b233a0a9aa975fcb2ec13cc26f08fb9a3e85d5abdaa533c99c6fc4c5b65b914eba3d80c4aff9792a4c9fed403f28f7d9d
   languageName: node
   linkType: hard
 
-"string.prototype.trim@npm:^1.2.8":
-  version: 1.2.8
-  resolution: "string.prototype.trim@npm:1.2.8"
+"string.prototype.trim@npm:^1.2.9":
+  version: 1.2.9
+  resolution: "string.prototype.trim@npm:1.2.9"
   dependencies:
-    call-bind: "npm:^1.0.2"
-    define-properties: "npm:^1.2.0"
-    es-abstract: "npm:^1.22.1"
-  checksum: 10c0/4f76c583908bcde9a71208ddff38f67f24c9ec8093631601666a0df8b52fad44dad2368c78895ce83eb2ae8e7068294cc96a02fc971ab234e4d5c9bb61ea4e34
+    call-bind: "npm:^1.0.7"
+    define-properties: "npm:^1.2.1"
+    es-abstract: "npm:^1.23.0"
+    es-object-atoms: "npm:^1.0.0"
+  checksum: 10c0/dcef1a0fb61d255778155006b372dff8cc6c4394bc39869117e4241f41a2c52899c0d263ffc7738a1f9e61488c490b05c0427faa15151efad721e1a9fb2663c2
   languageName: node
   linkType: hard
 
-"string.prototype.trimend@npm:^1.0.7":
-  version: 1.0.7
-  resolution: "string.prototype.trimend@npm:1.0.7"
+"string.prototype.trimend@npm:^1.0.8":
+  version: 1.0.8
+  resolution: "string.prototype.trimend@npm:1.0.8"
   dependencies:
-    call-bind: "npm:^1.0.2"
-    define-properties: "npm:^1.2.0"
-    es-abstract: "npm:^1.22.1"
-  checksum: 10c0/53c24911c7c4d8d65f5ef5322de23a3d5b6b4db73273e05871d5ab4571ae5638f38f7f19d71d09116578fb060e5a145cc6a208af2d248c8baf7a34f44d32ce57
+    call-bind: "npm:^1.0.7"
+    define-properties: "npm:^1.2.1"
+    es-object-atoms: "npm:^1.0.0"
+  checksum: 10c0/0a0b54c17c070551b38e756ae271865ac6cc5f60dabf2e7e343cceae7d9b02e1a1120a824e090e79da1b041a74464e8477e2da43e2775c85392be30a6f60963c
   languageName: node
   linkType: hard
 
-"string.prototype.trimstart@npm:^1.0.7":
-  version: 1.0.7
-  resolution: "string.prototype.trimstart@npm:1.0.7"
+"string.prototype.trimstart@npm:^1.0.8":
+  version: 1.0.8
+  resolution: "string.prototype.trimstart@npm:1.0.8"
   dependencies:
-    call-bind: "npm:^1.0.2"
-    define-properties: "npm:^1.2.0"
-    es-abstract: "npm:^1.22.1"
-  checksum: 10c0/0bcf391b41ea16d4fda9c9953d0a7075171fe090d33b4cf64849af94944c50862995672ac03e0c5dba2940a213ad7f53515a668dac859ce22a0276289ae5cf4f
+    call-bind: "npm:^1.0.7"
+    define-properties: "npm:^1.2.1"
+    es-object-atoms: "npm:^1.0.0"
+  checksum: 10c0/d53af1899959e53c83b64a5fd120be93e067da740e7e75acb433849aa640782fb6c7d4cd5b84c954c84413745a3764df135a8afeb22908b86a835290788d8366
   languageName: node
   linkType: hard
 
@@ -17061,9 +17117,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"typed-array-length@npm:^1.0.5":
-  version: 1.0.5
-  resolution: "typed-array-length@npm:1.0.5"
+"typed-array-length@npm:^1.0.6":
+  version: 1.0.6
+  resolution: "typed-array-length@npm:1.0.6"
   dependencies:
     call-bind: "npm:^1.0.7"
     for-each: "npm:^0.3.3"
@@ -17071,7 +17127,7 @@ __metadata:
     has-proto: "npm:^1.0.3"
     is-typed-array: "npm:^1.1.13"
     possible-typed-array-names: "npm:^1.0.0"
-  checksum: 10c0/5cc0f79196e70a92f8f40846cfa62b3de6be51e83f73655e137116cf65e3c29a288502b18cc8faf33c943c2470a4569009e1d6da338441649a2db2f135761ad5
+  checksum: 10c0/74253d7dc488eb28b6b2711cf31f5a9dcefc9c41b0681fd1c178ed0a1681b4468581a3626d39cd4df7aee3d3927ab62be06aa9ca74e5baf81827f61641445b77
   languageName: node
   linkType: hard
 
@@ -17931,16 +17987,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"which-typed-array@npm:^1.1.14, which-typed-array@npm:^1.1.9":
-  version: 1.1.14
-  resolution: "which-typed-array@npm:1.1.14"
+"which-typed-array@npm:^1.1.14, which-typed-array@npm:^1.1.15, which-typed-array@npm:^1.1.9":
+  version: 1.1.15
+  resolution: "which-typed-array@npm:1.1.15"
   dependencies:
-    available-typed-arrays: "npm:^1.0.6"
-    call-bind: "npm:^1.0.5"
+    available-typed-arrays: "npm:^1.0.7"
+    call-bind: "npm:^1.0.7"
     for-each: "npm:^0.3.3"
     gopd: "npm:^1.0.1"
-    has-tostringtag: "npm:^1.0.1"
-  checksum: 10c0/0960f1e77807058819451b98c51d4cd72031593e8de990b24bd3fc22e176f5eee22921d68d852297c786aec117689f0423ed20aa4fde7ce2704d680677891f56
+    has-tostringtag: "npm:^1.0.2"
+  checksum: 10c0/4465d5348c044032032251be54d8988270e69c6b7154f8fcb2a47ff706fe36f7624b3a24246b8d9089435a8f4ec48c1c1025c5d6b499456b9e5eff4f48212983
   languageName: node
   linkType: hard
 

From 974335e4144eab90a8c5eb91da55d2f8385c68c6 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 3 Jun 2024 10:35:59 +0200
Subject: [PATCH 1161/2191] Add experimental server-side notification grouping
 (#29889)

---
 .../api/v2_alpha/notifications_controller.rb  |  91 ++++++++++
 app/models/notification.rb                    |  62 +++++++
 app/models/notification_group.rb              |  29 ++++
 .../rest/notification_group_serializer.rb     |  45 +++++
 app/services/notify_service.rb                |  22 +++
 config/application.rb                         |   2 +
 config/routes/api.rb                          |  12 ++
 ...13095755_add_group_key_to_notifications.rb |   7 +
 ...tifications_on_account_id_and_group_key.rb |   9 +
 db/schema.rb                                  |   2 +
 lib/active_record/with_recursive.rb           |  65 +++++++
 lib/arel/union_parenthesizing.rb              |  51 ++++++
 spec/models/notification_spec.rb              |  60 +++++++
 .../api/v2_alpha/notifications_spec.rb        | 161 ++++++++++++++++++
 14 files changed, 618 insertions(+)
 create mode 100644 app/controllers/api/v2_alpha/notifications_controller.rb
 create mode 100644 app/models/notification_group.rb
 create mode 100644 app/serializers/rest/notification_group_serializer.rb
 create mode 100644 db/migrate/20240513095755_add_group_key_to_notifications.rb
 create mode 100644 db/migrate/20240513123807_add_index_notifications_on_account_id_and_group_key.rb
 create mode 100644 lib/active_record/with_recursive.rb
 create mode 100644 lib/arel/union_parenthesizing.rb
 create mode 100644 spec/requests/api/v2_alpha/notifications_spec.rb

diff --git a/app/controllers/api/v2_alpha/notifications_controller.rb b/app/controllers/api/v2_alpha/notifications_controller.rb
new file mode 100644
index 00000000000000..19d3ac9018f014
--- /dev/null
+++ b/app/controllers/api/v2_alpha/notifications_controller.rb
@@ -0,0 +1,91 @@
+# frozen_string_literal: true
+
+class Api::V2Alpha::NotificationsController < Api::BaseController
+  before_action -> { doorkeeper_authorize! :read, :'read:notifications' }, except: [:clear, :dismiss]
+  before_action -> { doorkeeper_authorize! :write, :'write:notifications' }, only: [:clear, :dismiss]
+  before_action :require_user!
+  after_action :insert_pagination_headers, only: :index
+
+  DEFAULT_NOTIFICATIONS_LIMIT = 40
+
+  def index
+    with_read_replica do
+      @notifications = load_notifications
+      @group_metadata = load_group_metadata
+      @relationships = StatusRelationshipsPresenter.new(target_statuses_from_notifications, current_user&.account_id)
+    end
+
+    render json: @notifications.map { |notification| NotificationGroup.from_notification(notification) }, each_serializer: REST::NotificationGroupSerializer, relationships: @relationships, group_metadata: @group_metadata
+  end
+
+  def show
+    @notification = current_account.notifications.without_suspended.find_by!(group_key: params[:id])
+    render json: NotificationGroup.from_notification(@notification), serializer: REST::NotificationGroupSerializer
+  end
+
+  def clear
+    current_account.notifications.delete_all
+    render_empty
+  end
+
+  def dismiss
+    current_account.notifications.where(group_key: params[:id]).destroy_all
+    render_empty
+  end
+
+  private
+
+  def load_notifications
+    notifications = browserable_account_notifications.includes(from_account: [:account_stat, :user]).to_a_grouped_paginated_by_id(
+      limit_param(DEFAULT_NOTIFICATIONS_LIMIT),
+      params_slice(:max_id, :since_id, :min_id)
+    )
+
+    Notification.preload_cache_collection_target_statuses(notifications) do |target_statuses|
+      preload_collection(target_statuses, Status)
+    end
+  end
+
+  def load_group_metadata
+    return {} if @notifications.empty?
+
+    browserable_account_notifications
+      .where(group_key: @notifications.filter_map(&:group_key))
+      .where(id: (@notifications.last.id)..(@notifications.first.id))
+      .group(:group_key)
+      .pluck(:group_key, 'min(notifications.id) as min_id', 'max(notifications.id) as max_id', 'max(notifications.created_at) as latest_notification_at')
+      .to_h { |group_key, min_id, max_id, latest_notification_at| [group_key, { min_id: min_id, max_id: max_id, latest_notification_at: latest_notification_at }] }
+  end
+
+  def browserable_account_notifications
+    current_account.notifications.without_suspended.browserable(
+      types: Array(browserable_params[:types]),
+      exclude_types: Array(browserable_params[:exclude_types]),
+      include_filtered: truthy_param?(:include_filtered)
+    )
+  end
+
+  def target_statuses_from_notifications
+    @notifications.filter_map(&:target_status)
+  end
+
+  def next_path
+    api_v2_alpha_notifications_url pagination_params(max_id: pagination_max_id) unless @notifications.empty?
+  end
+
+  def prev_path
+    api_v2_alpha_notifications_url pagination_params(min_id: pagination_since_id) unless @notifications.empty?
+  end
+
+  def pagination_collection
+    @notifications
+  end
+
+  def browserable_params
+    params.permit(:include_filtered, types: [], exclude_types: [])
+  end
+
+  def pagination_params(core_params)
+    params.slice(:limit, :types, :exclude_types, :include_filtered).permit(:limit, :include_filtered, types: [], exclude_types: []).merge(core_params)
+  end
+end
diff --git a/app/models/notification.rb b/app/models/notification.rb
index 7cbab4dc8c3510..e3deaa5348b7c3 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -13,6 +13,7 @@
 #  from_account_id :bigint(8)        not null
 #  type            :string
 #  filtered        :boolean          default(FALSE), not null
+#  group_key       :string
 #
 
 class Notification < ApplicationRecord
@@ -136,6 +137,67 @@ def browserable(types: [], exclude_types: [], from_account_id: nil, include_filt
       end
     end
 
+    # This returns notifications from the request page, but with at most one notification per group.
+    # Notifications that have no `group_key` each count as a separate group.
+    def paginate_groups_by_max_id(limit, max_id: nil, since_id: nil)
+      query = reorder(id: :desc)
+      query = query.where(id: ...max_id) if max_id.present?
+      query = query.where(id: (since_id + 1)...) if since_id.present?
+
+      unscoped
+        .with_recursive(
+          grouped_notifications: [
+            query
+              .select('notifications.*', "ARRAY[COALESCE(notifications.group_key, 'ungrouped-' || notifications.id)] groups")
+              .limit(1),
+            query
+              .joins('CROSS JOIN grouped_notifications')
+              .where('notifications.id < grouped_notifications.id')
+              .where.not("COALESCE(notifications.group_key, 'ungrouped-' || notifications.id) = ANY(grouped_notifications.groups)")
+              .select('notifications.*', "array_append(grouped_notifications.groups, COALESCE(notifications.group_key, 'ungrouped-' || notifications.id))")
+              .limit(1),
+          ]
+        )
+        .from('grouped_notifications AS notifications')
+        .order(id: :desc)
+        .limit(limit)
+    end
+
+    # Differs from :paginate_groups_by_max_id in that it gives the results immediately following min_id,
+    # whereas since_id gives the items with largest id, but with since_id as a cutoff.
+    # Results will be in ascending order by id.
+    def paginate_groups_by_min_id(limit, max_id: nil, min_id: nil)
+      query = reorder(id: :asc)
+      query = query.where(id: (min_id + 1)...) if min_id.present?
+      query = query.where(id: ...max_id) if max_id.present?
+
+      unscoped
+        .with_recursive(
+          grouped_notifications: [
+            query
+              .select('notifications.*', "ARRAY[COALESCE(notifications.group_key, 'ungrouped-' || notifications.id)] groups")
+              .limit(1),
+            query
+              .joins('CROSS JOIN grouped_notifications')
+              .where('notifications.id > grouped_notifications.id')
+              .where.not("COALESCE(notifications.group_key, 'ungrouped-' || notifications.id) = ANY(grouped_notifications.groups)")
+              .select('notifications.*', "array_append(grouped_notifications.groups, COALESCE(notifications.group_key, 'ungrouped-' || notifications.id))")
+              .limit(1),
+          ]
+        )
+        .from('grouped_notifications AS notifications')
+        .order(id: :asc)
+        .limit(limit)
+    end
+
+    def to_a_grouped_paginated_by_id(limit, options = {})
+      if options[:min_id].present?
+        paginate_groups_by_min_id(limit, min_id: options[:min_id], max_id: options[:max_id]).reverse
+      else
+        paginate_groups_by_max_id(limit, max_id: options[:max_id], since_id: options[:since_id]).to_a
+      end
+    end
+
     def preload_cache_collection_target_statuses(notifications, &_block)
       notifications.group_by(&:type).each do |type, grouped_notifications|
         associations = TARGET_STATUS_INCLUDES_BY_TYPE[type]
diff --git a/app/models/notification_group.rb b/app/models/notification_group.rb
new file mode 100644
index 00000000000000..07967f9dcbc91e
--- /dev/null
+++ b/app/models/notification_group.rb
@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+class NotificationGroup < ActiveModelSerializers::Model
+  attributes :group_key, :sample_accounts, :notifications_count, :notification
+
+  def self.from_notification(notification)
+    if notification.group_key.present?
+      # TODO: caching and preloading
+      sample_accounts = notification.account.notifications.where(group_key: notification.group_key).order(id: :desc).limit(3).map(&:from_account)
+      notifications_count = notification.account.notifications.where(group_key: notification.group_key).count
+    else
+      sample_accounts = [notification.from_account]
+      notifications_count = 1
+    end
+
+    NotificationGroup.new(
+      notification: notification,
+      group_key: notification.group_key || "ungrouped-#{notification.id}",
+      sample_accounts: sample_accounts,
+      notifications_count: notifications_count
+    )
+  end
+
+  delegate :type,
+           :target_status,
+           :report,
+           :account_relationship_severance_event,
+           to: :notification, prefix: false
+end
diff --git a/app/serializers/rest/notification_group_serializer.rb b/app/serializers/rest/notification_group_serializer.rb
new file mode 100644
index 00000000000000..6c1d2465d25cb8
--- /dev/null
+++ b/app/serializers/rest/notification_group_serializer.rb
@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+class REST::NotificationGroupSerializer < ActiveModel::Serializer
+  attributes :group_key, :notifications_count, :type
+
+  attribute :page_min_id, if: :paginated?
+  attribute :page_max_id, if: :paginated?
+  attribute :latest_page_notification_at, if: :paginated?
+
+  has_many :sample_accounts, serializer: REST::AccountSerializer
+  belongs_to :target_status, key: :status, if: :status_type?, serializer: REST::StatusSerializer
+  belongs_to :report, if: :report_type?, serializer: REST::ReportSerializer
+  belongs_to :account_relationship_severance_event, key: :event, if: :relationship_severance_event?, serializer: REST::AccountRelationshipSeveranceEventSerializer
+
+  def status_type?
+    [:favourite, :reblog, :status, :mention, :poll, :update].include?(object.type)
+  end
+
+  def report_type?
+    object.type == :'admin.report'
+  end
+
+  def relationship_severance_event?
+    object.type == :severed_relationships
+  end
+
+  def page_min_id
+    range = instance_options[:group_metadata][object.group_key]
+    range.present? ? range[:min_id].to_s : object.notification.id.to_s
+  end
+
+  def page_max_id
+    range = instance_options[:group_metadata][object.group_key]
+    range.present? ? range[:max_id].to_s : object.notification.id.to_s
+  end
+
+  def latest_page_notification_at
+    range = instance_options[:group_metadata][object.group_key]
+    range.present? ? range[:latest_notification_at] : object.notification.created_at
+  end
+
+  def paginated?
+    instance_options[:group_metadata].present?
+  end
+end
diff --git a/app/services/notify_service.rb b/app/services/notify_service.rb
index 1f01c2d48e0425..d69b5af141214f 100644
--- a/app/services/notify_service.rb
+++ b/app/services/notify_service.rb
@@ -3,6 +3,9 @@
 class NotifyService < BaseService
   include Redisable
 
+  MAXIMUM_GROUP_SPAN_HOURS = 12
+  MAXIMUM_GROUP_GAP_TIME = 4.hours.to_i
+
   NON_EMAIL_TYPES = %i(
     admin.report
     admin.sign_up
@@ -183,6 +186,7 @@ def call(recipient, type, activity)
     return if dismiss?
 
     @notification.filtered = filter?
+    @notification.group_key = notification_group_key
     @notification.save!
 
     # It's possible the underlying activity has been deleted
@@ -202,6 +206,24 @@ def call(recipient, type, activity)
 
   private
 
+  def notification_group_key
+    return nil if @notification.filtered || %i(favourite reblog).exclude?(@notification.type)
+
+    type_prefix = "#{@notification.type}-#{@notification.target_status.id}"
+    redis_key   = "notif-group/#{@recipient.id}/#{type_prefix}"
+    hour_bucket = @notification.activity.created_at.utc.to_i / 1.hour.to_i
+
+    # Reuse previous group if it does not span too large an amount of time
+    previous_bucket = redis.get(redis_key).to_i
+    hour_bucket = previous_bucket if hour_bucket < previous_bucket + MAXIMUM_GROUP_SPAN_HOURS
+
+    # Do not track groups past a given inactivity time
+    # We do not concern ourselves with race conditions since we use hour buckets
+    redis.set(redis_key, hour_bucket, ex: MAXIMUM_GROUP_GAP_TIME)
+
+    "#{type_prefix}-#{hour_bucket}"
+  end
+
   def dismiss?
     DismissCondition.new(@notification).dismiss?
   end
diff --git a/config/application.rb b/config/application.rb
index 6d6e91a5cc7dfe..a8e313069d93b7 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -51,6 +51,8 @@
 require_relative '../lib/action_dispatch/remote_ip_extensions'
 require_relative '../lib/active_record/database_tasks_extensions'
 require_relative '../lib/active_record/batches'
+require_relative '../lib/active_record/with_recursive'
+require_relative '../lib/arel/union_parenthesizing'
 require_relative '../lib/simple_navigation/item_extensions'
 
 Bundler.require(:pam_authentication) if ENV['PAM_ENABLED'] == 'true'
diff --git a/config/routes/api.rb b/config/routes/api.rb
index bf3cee0c10e447..135a19a0a7bf54 100644
--- a/config/routes/api.rb
+++ b/config/routes/api.rb
@@ -327,6 +327,18 @@
     end
   end
 
+  namespace :v2_alpha do
+    resources :notifications, only: [:index, :show] do
+      collection do
+        post :clear
+      end
+
+      member do
+        post :dismiss
+      end
+    end
+  end
+
   namespace :web do
     resource :settings, only: [:update]
     resources :embeds, only: [:show]
diff --git a/db/migrate/20240513095755_add_group_key_to_notifications.rb b/db/migrate/20240513095755_add_group_key_to_notifications.rb
new file mode 100644
index 00000000000000..2e2a302fffde83
--- /dev/null
+++ b/db/migrate/20240513095755_add_group_key_to_notifications.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddGroupKeyToNotifications < ActiveRecord::Migration[7.1]
+  def change
+    add_column :notifications, :group_key, :string
+  end
+end
diff --git a/db/migrate/20240513123807_add_index_notifications_on_account_id_and_group_key.rb b/db/migrate/20240513123807_add_index_notifications_on_account_id_and_group_key.rb
new file mode 100644
index 00000000000000..66874418b2f8bc
--- /dev/null
+++ b/db/migrate/20240513123807_add_index_notifications_on_account_id_and_group_key.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddIndexNotificationsOnAccountIdAndGroupKey < ActiveRecord::Migration[7.1]
+  disable_ddl_transaction!
+
+  def change
+    add_index :notifications, [:account_id, :group_key], algorithm: :concurrently, where: 'group_key IS NOT NULL'
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 3a47522d26759a..73f6b464e47c44 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -724,6 +724,8 @@
     t.bigint "from_account_id", null: false
     t.string "type"
     t.boolean "filtered", default: false, null: false
+    t.string "group_key"
+    t.index ["account_id", "group_key"], name: "index_notifications_on_account_id_and_group_key", where: "(group_key IS NOT NULL)"
     t.index ["account_id", "id", "type"], name: "index_notifications_on_account_id_and_id_and_type", order: { id: :desc }
     t.index ["account_id", "id", "type"], name: "index_notifications_on_filtered", order: { id: :desc }, where: "(filtered = false)"
     t.index ["activity_id", "activity_type"], name: "index_notifications_on_activity_id_and_activity_type"
diff --git a/lib/active_record/with_recursive.rb b/lib/active_record/with_recursive.rb
new file mode 100644
index 00000000000000..4bd3e81eedc1c9
--- /dev/null
+++ b/lib/active_record/with_recursive.rb
@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+# Add support for writing recursive CTEs in ActiveRecord
+
+# Initially from Lorin Thwaits (https://github.com/lorint) as per comment:
+# https://github.com/vlado/activerecord-cte/issues/16#issuecomment-1433043310
+
+# Modified from the above code to change the signature to
+# `with_recursive(hash)` and extending CTE hash values to also includes arrays
+# of values that get turned into UNION ALL expressions.
+
+# This implementation has been merged in Rails: https://github.com/rails/rails/pull/51601
+
+module ActiveRecord
+  module QueryMethodsExtensions
+    def with_recursive(*args)
+      @with_is_recursive = true
+      check_if_method_has_arguments!(__callee__, args)
+      spawn.with_recursive!(*args)
+    end
+
+    # Like #with_recursive but modifies the relation in place.
+    def with_recursive!(*args) # :nodoc:
+      self.with_values += args
+      @with_is_recursive = true
+      self
+    end
+
+    private
+
+    def build_with(arel)
+      return if with_values.empty?
+
+      with_statements = with_values.map do |with_value|
+        raise ArgumentError, "Unsupported argument type: #{with_value} #{with_value.class}" unless with_value.is_a?(Hash)
+
+        build_with_value_from_hash(with_value)
+      end
+
+      # Was:  arel.with(with_statements)
+      @with_is_recursive ? arel.with(:recursive, with_statements) : arel.with(with_statements)
+    end
+
+    def build_with_value_from_hash(hash)
+      hash.map do |name, value|
+        Arel::Nodes::TableAlias.new(build_with_expression_from_value(value), name)
+      end
+    end
+
+    def build_with_expression_from_value(value)
+      case value
+      when Arel::Nodes::SqlLiteral then Arel::Nodes::Grouping.new(value)
+      when ActiveRecord::Relation then value.arel
+      when Arel::SelectManager then value
+      when Array then value.map { |e| build_with_expression_from_value(e) }.reduce { |result, value| Arel::Nodes::UnionAll.new(result, value) }
+      else
+        raise ArgumentError, "Unsupported argument type: `#{value}` #{value.class}"
+      end
+    end
+  end
+end
+
+ActiveSupport.on_load(:active_record) do
+  ActiveRecord::QueryMethods.prepend(ActiveRecord::QueryMethodsExtensions)
+end
diff --git a/lib/arel/union_parenthesizing.rb b/lib/arel/union_parenthesizing.rb
new file mode 100644
index 00000000000000..852d8e92d8a4f3
--- /dev/null
+++ b/lib/arel/union_parenthesizing.rb
@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+# Fix an issue with `LIMIT` ocurring on the left side of a `UNION` causing syntax errors.
+# See https://github.com/rails/rails/issues/40181
+
+# The fix has been merged in ActiveRecord: https://github.com/rails/rails/pull/51549
+# TODO: drop this when available in ActiveRecord
+
+# rubocop:disable all -- This is a mostly vendored file
+
+module Arel
+  module Visitors
+    class ToSql
+      private
+
+        def infix_value_with_paren(o, collector, value, suppress_parens = false)
+          collector << "( " unless suppress_parens
+          collector = if o.left.class == o.class
+            infix_value_with_paren(o.left, collector, value, true)
+          else
+            select_parentheses o.left, collector, false # Changed from `visit o.left, collector`
+          end
+          collector << value
+          collector = if o.right.class == o.class
+            infix_value_with_paren(o.right, collector, value, true)
+          else
+            select_parentheses o.right, collector, false # Changed from `visit o.right, collector`
+          end
+          collector << " )" unless suppress_parens
+          collector
+        end
+
+        def select_parentheses(o, collector, always_wrap_selects = true)
+          if o.is_a?(Nodes::SelectStatement) && (always_wrap_selects || require_parentheses?(o))
+            collector << "("
+            visit o, collector
+            collector << ")"
+            collector
+          else
+            visit o, collector
+          end
+        end
+
+        def require_parentheses?(o)
+          !o.orders.empty? || o.limit || o.offset
+        end
+    end
+  end
+end
+
+# rubocop:enable all
diff --git a/spec/models/notification_spec.rb b/spec/models/notification_spec.rb
index 3c7d51ae1a3217..d498ee02a556ec 100644
--- a/spec/models/notification_spec.rb
+++ b/spec/models/notification_spec.rb
@@ -151,6 +151,66 @@
     end
   end
 
+  describe '.paginate_groups_by_max_id' do
+    let(:account) { Fabricate(:account) }
+
+    let!(:notifications) do
+      ['group-1', 'group-1', nil, 'group-2', nil, 'group-1', 'group-2', 'group-1']
+        .map { |group_key| Fabricate(:notification, account: account, group_key: group_key) }
+    end
+
+    context 'without since_id or max_id' do
+      it 'returns the most recent notifications, only keeping one notification per group' do
+        expect(described_class.without_suspended.paginate_groups_by_max_id(4).pluck(:id))
+          .to eq [notifications[7], notifications[6], notifications[4], notifications[2]].pluck(:id)
+      end
+    end
+
+    context 'with since_id' do
+      it 'returns the most recent notifications, only keeping one notification per group' do
+        expect(described_class.without_suspended.paginate_groups_by_max_id(4, since_id: notifications[4].id).pluck(:id))
+          .to eq [notifications[7], notifications[6]].pluck(:id)
+      end
+    end
+
+    context 'with max_id' do
+      it 'returns the most recent notifications after max_id, only keeping one notification per group' do
+        expect(described_class.without_suspended.paginate_groups_by_max_id(4, max_id: notifications[7].id).pluck(:id))
+          .to eq [notifications[6], notifications[5], notifications[4], notifications[2]].pluck(:id)
+      end
+    end
+  end
+
+  describe '.paginate_groups_by_min_id' do
+    let(:account) { Fabricate(:account) }
+
+    let!(:notifications) do
+      ['group-1', 'group-1', nil, 'group-2', nil, 'group-1', 'group-2', 'group-1']
+        .map { |group_key| Fabricate(:notification, account: account, group_key: group_key) }
+    end
+
+    context 'without min_id or max_id' do
+      it 'returns the oldest notifications, only keeping one notification per group' do
+        expect(described_class.without_suspended.paginate_groups_by_min_id(4).pluck(:id))
+          .to eq [notifications[0], notifications[2], notifications[3], notifications[4]].pluck(:id)
+      end
+    end
+
+    context 'with max_id' do
+      it 'returns the oldest notifications, stopping at max_id, only keeping one notification per group' do
+        expect(described_class.without_suspended.paginate_groups_by_min_id(4, max_id: notifications[4].id).pluck(:id))
+          .to eq [notifications[0], notifications[2], notifications[3]].pluck(:id)
+      end
+    end
+
+    context 'with min_id' do
+      it 'returns the most oldest notifications after min_id, only keeping one notification per group' do
+        expect(described_class.without_suspended.paginate_groups_by_min_id(4, min_id: notifications[0].id).pluck(:id))
+          .to eq [notifications[1], notifications[2], notifications[3], notifications[4]].pluck(:id)
+      end
+    end
+  end
+
   describe '.preload_cache_collection_target_statuses' do
     subject do
       described_class.preload_cache_collection_target_statuses(notifications) do |target_statuses|
diff --git a/spec/requests/api/v2_alpha/notifications_spec.rb b/spec/requests/api/v2_alpha/notifications_spec.rb
new file mode 100644
index 00000000000000..9bd1a32e9bf7e1
--- /dev/null
+++ b/spec/requests/api/v2_alpha/notifications_spec.rb
@@ -0,0 +1,161 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Notifications' do
+  let(:user)    { Fabricate(:user, account_attributes: { username: 'alice' }) }
+  let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+  let(:scopes)  { 'read:notifications write:notifications' }
+  let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
+
+  describe 'GET /api/v2_alpha/notifications', :sidekiq_inline do
+    subject do
+      get '/api/v2_alpha/notifications', headers: headers, params: params
+    end
+
+    let(:bob)    { Fabricate(:user) }
+    let(:tom)    { Fabricate(:user) }
+    let(:params) { {} }
+
+    before do
+      first_status = PostStatusService.new.call(user.account, text: 'Test')
+      ReblogService.new.call(bob.account, first_status)
+      mentioning_status = PostStatusService.new.call(bob.account, text: 'Hello @alice')
+      mentioning_status.mentions.first
+      FavouriteService.new.call(bob.account, first_status)
+      FavouriteService.new.call(tom.account, first_status)
+      FollowService.new.call(bob.account, user.account)
+    end
+
+    it_behaves_like 'forbidden for wrong scope', 'write write:notifications'
+
+    context 'with no options' do
+      it 'returns expected notification types', :aggregate_failures do
+        subject
+
+        expect(response).to have_http_status(200)
+        expect(body_json_types).to include('reblog', 'mention', 'favourite', 'follow')
+      end
+    end
+
+    context 'with exclude_types param' do
+      let(:params) { { exclude_types: %w(mention) } }
+
+      it 'returns everything but excluded type', :aggregate_failures do
+        subject
+
+        expect(response).to have_http_status(200)
+        expect(body_as_json.size).to_not eq 0
+        expect(body_json_types.uniq).to_not include 'mention'
+      end
+    end
+
+    context 'with types param' do
+      let(:params) { { types: %w(mention) } }
+
+      it 'returns only requested type', :aggregate_failures do
+        subject
+
+        expect(response).to have_http_status(200)
+        expect(body_json_types.uniq).to eq ['mention']
+      end
+    end
+
+    context 'with limit param' do
+      let(:params) { { limit: 3 } }
+
+      it 'returns the requested number of notifications paginated', :aggregate_failures do
+        subject
+
+        notifications = user.account.notifications
+
+        expect(body_as_json.size)
+          .to eq(params[:limit])
+
+        expect(response)
+          .to include_pagination_headers(
+            prev: api_v2_alpha_notifications_url(limit: params[:limit], min_id: notifications.last.id),
+            # TODO: one downside of the current approach is that we return the first ID matching the group,
+            # not the last that has been skipped, so pagination is very likely to give overlap
+            next: api_v2_alpha_notifications_url(limit: params[:limit], max_id: notifications[1].id)
+          )
+      end
+    end
+
+    def body_json_types
+      body_as_json.pluck(:type)
+    end
+  end
+
+  describe 'GET /api/v2_alpha/notifications/:id' do
+    subject do
+      get "/api/v2_alpha/notifications/#{notification.group_key}", headers: headers
+    end
+
+    let(:notification) { Fabricate(:notification, account: user.account, group_key: 'foobar') }
+
+    it_behaves_like 'forbidden for wrong scope', 'write write:notifications'
+
+    it 'returns http success' do
+      subject
+
+      expect(response).to have_http_status(200)
+    end
+
+    context 'when notification belongs to someone else' do
+      let(:notification) { Fabricate(:notification, group_key: 'foobar') }
+
+      it 'returns http not found' do
+        subject
+
+        expect(response).to have_http_status(404)
+      end
+    end
+  end
+
+  describe 'POST /api/v2_alpha/notifications/:id/dismiss' do
+    subject do
+      post "/api/v2_alpha/notifications/#{notification.group_key}/dismiss", headers: headers
+    end
+
+    let!(:notification) { Fabricate(:notification, account: user.account, group_key: 'foobar') }
+
+    it_behaves_like 'forbidden for wrong scope', 'read read:notifications'
+
+    it 'destroys the notification' do
+      subject
+
+      expect(response).to have_http_status(200)
+      expect { notification.reload }.to raise_error(ActiveRecord::RecordNotFound)
+    end
+
+    context 'when notification belongs to someone else' do
+      let(:notification) { Fabricate(:notification) }
+
+      it 'returns http not found' do
+        subject
+
+        expect(response).to have_http_status(404)
+      end
+    end
+  end
+
+  describe 'POST /api/v2_alpha/notifications/clear' do
+    subject do
+      post '/api/v2_alpha/notifications/clear', headers: headers
+    end
+
+    before do
+      Fabricate(:notification, account: user.account)
+    end
+
+    it_behaves_like 'forbidden for wrong scope', 'read read:notifications'
+
+    it 'clears notifications for the account' do
+      subject
+
+      expect(user.account.reload.notifications).to be_empty
+      expect(response).to have_http_status(200)
+    end
+  end
+end

From 249cbc449c301aef2a21117138d140efb17b0d96 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 3 Jun 2024 05:15:58 -0400
Subject: [PATCH 1162/2191] Use existing config access to `local_domain` value
 (#30509)

---
 app/views/auth/registrations/edit.html.haml     | 2 +-
 app/views/errors/self_destruct.html.haml        | 2 +-
 spec/requests/well_known/oauth_metadata_spec.rb | 2 +-
 spec/support/signed_request_helpers.rb          | 2 +-
 spec/system/profile_spec.rb                     | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/views/auth/registrations/edit.html.haml b/app/views/auth/registrations/edit.html.haml
index 48350f478e8aa8..07d6c1af51d3c0 100644
--- a/app/views/auth/registrations/edit.html.haml
+++ b/app/views/auth/registrations/edit.html.haml
@@ -3,7 +3,7 @@
 
 - if self_destruct?
   .flash-message.warning
-    = t('auth.status.self_destruct', domain: ENV.fetch('LOCAL_DOMAIN'))
+    = t('auth.status.self_destruct', domain: Rails.configuration.x.local_domain)
 - else
   = render partial: 'status', locals: { user: @user, strikes: @strikes }
 
diff --git a/app/views/errors/self_destruct.html.haml b/app/views/errors/self_destruct.html.haml
index 09b17a5a9439b2..b9ff48f6845a1c 100644
--- a/app/views/errors/self_destruct.html.haml
+++ b/app/views/errors/self_destruct.html.haml
@@ -3,7 +3,7 @@
 
 .simple_form
   %h1.title= t('self_destruct.title')
-  %p.lead= t('self_destruct.lead_html', domain: ENV.fetch('LOCAL_DOMAIN'))
+  %p.lead= t('self_destruct.lead_html', domain: Rails.configuration.x.local_domain)
 
 .form-footer
   %ul.no-list
diff --git a/spec/requests/well_known/oauth_metadata_spec.rb b/spec/requests/well_known/oauth_metadata_spec.rb
index deef189ac909f3..3350d593156d92 100644
--- a/spec/requests/well_known/oauth_metadata_spec.rb
+++ b/spec/requests/well_known/oauth_metadata_spec.rb
@@ -6,7 +6,7 @@
   let(:protocol) { ENV.fetch('LOCAL_HTTPS', true) ? :https : :http }
 
   before do
-    host! ENV.fetch('LOCAL_DOMAIN')
+    host! Rails.configuration.x.local_domain
   end
 
   it 'returns http success with valid JSON response' do
diff --git a/spec/support/signed_request_helpers.rb b/spec/support/signed_request_helpers.rb
index eba4095e43870e..8a52179caee58a 100644
--- a/spec/support/signed_request_helpers.rb
+++ b/spec/support/signed_request_helpers.rb
@@ -6,7 +6,7 @@ def get(path, headers: nil, sign_with: nil, **args)
 
     headers ||= {}
     headers['Date'] = Time.now.utc.httpdate
-    headers['Host'] = ENV.fetch('LOCAL_DOMAIN')
+    headers['Host'] = Rails.configuration.x.local_domain
     signed_headers = headers.merge('(request-target)' => "get #{path}").slice('(request-target)', 'Host', 'Date')
 
     key_id = ActivityPub::TagManager.instance.key_uri_for(sign_with)
diff --git a/spec/system/profile_spec.rb b/spec/system/profile_spec.rb
index 421b68a169f5c4..2517e823b50c5f 100644
--- a/spec/system/profile_spec.rb
+++ b/spec/system/profile_spec.rb
@@ -7,7 +7,7 @@
 
   subject { page }
 
-  let(:local_domain) { ENV['LOCAL_DOMAIN'] }
+  let(:local_domain) { Rails.configuration.x.local_domain }
 
   before do
     as_a_logged_in_user

From 91b6502d827e1eea28e18d30930c2b31be89cdd7 Mon Sep 17 00:00:00 2001
From: Shlee <github@shl.ee>
Date: Mon, 3 Jun 2024 19:16:11 +1000
Subject: [PATCH 1163/2191] Revert "Revert "Change default ruby version to
 3.3.2 (#30478)"" (#30516)

---
 Dockerfile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 4278242bc9fcc7..c90d5dc9806341 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,22 +7,22 @@
 ARG TARGETPLATFORM=${TARGETPLATFORM}
 ARG BUILDPLATFORM=${BUILDPLATFORM}
 
-# Ruby image to use for base image, change with [--build-arg RUBY_VERSION="3.3.1"]
-ARG RUBY_VERSION="3.3.1"
+# Ruby image to use for base image, change with [--build-arg RUBY_VERSION="3.3.x"]
+ARG RUBY_VERSION="3.3.2"
 # # Node version to use in base image, change with [--build-arg NODE_MAJOR_VERSION="20"]
 ARG NODE_MAJOR_VERSION="20"
 # Debian image to use for base image, change with [--build-arg DEBIAN_VERSION="bookworm"]
 ARG DEBIAN_VERSION="bookworm"
 # Node image to use for base image based on combined variables (ex: 20-bookworm-slim)
 FROM docker.io/node:${NODE_MAJOR_VERSION}-${DEBIAN_VERSION}-slim as node
-# Ruby image to use for base image based on combined variables (ex: 3.3.1-slim-bookworm)
+# Ruby image to use for base image based on combined variables (ex: 3.3.x-slim-bookworm)
 FROM docker.io/ruby:${RUBY_VERSION}-slim-${DEBIAN_VERSION} as ruby
 
 # Resulting version string is vX.X.X-MASTODON_VERSION_PRERELEASE+MASTODON_VERSION_METADATA
 # Example: v4.2.0-nightly.2023.11.09+something
 # Overwrite existence of 'alpha.0' in version.rb [--build-arg MASTODON_VERSION_PRERELEASE="nightly.2023.11.09"]
 ARG MASTODON_VERSION_PRERELEASE=""
-# Append build metadata or fork information to version.rb [--build-arg MASTODON_VERSION_METADATA="something"]
+# Append build metadata or fork information to version.rb [--build-arg MASTODON_VERSION_METADATA="pr-12345"]
 ARG MASTODON_VERSION_METADATA=""
 
 # Allow Ruby on Rails to serve static files

From d4e094987e530fb0e0fe35e57b8dd00bb919a770 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 3 Jun 2024 11:16:46 -0400
Subject: [PATCH 1164/2191] Use bundler version 2.5.11 (#30508)

---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index c62c57dcc21c41..8bf6f68adde717 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1050,7 +1050,7 @@ DEPENDENCIES
   xorcist (~> 1.1)
 
 RUBY VERSION
-   ruby 3.3.1p55
+   ruby 3.3.2p78
 
 BUNDLED WITH
-   2.5.9
+   2.5.11

From 9ab7e66caeb68df565b47f024ad69a7d29a49e8c Mon Sep 17 00:00:00 2001
From: Nick Schonning <nschonni@gmail.com>
Date: Tue, 4 Jun 2024 13:29:08 -0400
Subject: [PATCH 1165/2191] Cleanup leftover Nanobox references (#30550)

---
 .nanoignore | 19 -------------------
 README.md   |  2 +-
 2 files changed, 1 insertion(+), 20 deletions(-)
 delete mode 100644 .nanoignore

diff --git a/.nanoignore b/.nanoignore
deleted file mode 100644
index 80e93970355ce3..00000000000000
--- a/.nanoignore
+++ /dev/null
@@ -1,19 +0,0 @@
-.DS_Store
-.git/
-.gitignore
-
-.bundle/
-.cache/
-config/deploy/*
-coverage
-docs/
-.env
-log/*.log
-neo4j/
-node_modules/
-public/assets/
-public/system/
-spec/
-tmp/
-.vagrant/
-vendor/bundle/
diff --git a/README.md b/README.md
index 0353a4c675455f..b8ee3f5dbb1649 100644
--- a/README.md
+++ b/README.md
@@ -72,7 +72,7 @@ Mastodon acts as an OAuth2 provider, so 3rd party apps can use the REST and Stre
 - **Ruby** 3.1+
 - **Node.js** 18+
 
-The repository includes deployment configurations for **Docker and docker-compose** as well as specific platforms like **Heroku**, **Scalingo**, and **Nanobox**. For Helm charts, reference the [mastodon/chart repository](https://github.com/mastodon/chart). The [**standalone** installation guide](https://docs.joinmastodon.org/admin/install/) is available in the documentation.
+The repository includes deployment configurations for **Docker and docker-compose** as well as specific platforms like **Heroku**, and **Scalingo**. For Helm charts, reference the [mastodon/chart repository](https://github.com/mastodon/chart). The [**standalone** installation guide](https://docs.joinmastodon.org/admin/install/) is available in the documentation.
 
 ## Development
 

From 7d9a8c959692fb7121d154412312a7f8e3005186 Mon Sep 17 00:00:00 2001
From: Michael Stanclift <mx@vmstan.com>
Date: Tue, 4 Jun 2024 12:30:22 -0500
Subject: [PATCH 1166/2191] Set Devcontainer to Ruby 3.3 Bookworm (#30548)

---
 .devcontainer/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index b5e72a0973baf2..994a41d050ffcf 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,5 +1,5 @@
 # For details, see https://github.com/devcontainers/images/tree/main/src/ruby
-FROM mcr.microsoft.com/devcontainers/ruby:1-3.2-bullseye
+FROM mcr.microsoft.com/devcontainers/ruby:1-3.3-bookworm
 
 # Install Rails
 # RUN gem install rails webdrivers

From e5984c95ebdae71b8323dd0c984cb7096d7f3d75 Mon Sep 17 00:00:00 2001
From: Filippo Giunchedi <filippog@users.noreply.github.com>
Date: Tue, 4 Jun 2024 22:28:05 +0200
Subject: [PATCH 1167/2191] Add libvirt provider parameters to Vagrant (#28102)

Co-authored-by: Filippo Giunchedi <filippo@debian.org>
---
 Vagrantfile | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Vagrantfile b/Vagrantfile
index 8a95e91f360038..89f5536edcdfc6 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -151,6 +151,12 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     vb.customize ["modifyvm", :id, "--nictype2", "virtio"]
   end
 
+  config.vm.provider :libvirt do |libvirt|
+    libvirt.cpus = 3
+    libvirt.memory = 8192
+  end
+
+
   # This uses the vagrant-hostsupdater plugin, and lets you
   # access the development site at http://mastodon.local.
   # If you change it, also change it in .env.vagrant before provisioning

From f40f3cb82e2bf18670e25a1d1675a6f8a202257d Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 5 Jun 2024 09:22:02 +0200
Subject: [PATCH 1168/2191] chore(deps): update dependency rails to v7.1.3.4
 (#30551)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 114 +++++++++++++++++++++++++--------------------------
 1 file changed, 57 insertions(+), 57 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 8bf6f68adde717..fadc2bc8296ec3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -10,35 +10,35 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.1.3.3)
-      actionpack (= 7.1.3.3)
-      activesupport (= 7.1.3.3)
+    actioncable (7.1.3.4)
+      actionpack (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    actionmailbox (7.1.3.3)
-      actionpack (= 7.1.3.3)
-      activejob (= 7.1.3.3)
-      activerecord (= 7.1.3.3)
-      activestorage (= 7.1.3.3)
-      activesupport (= 7.1.3.3)
+    actionmailbox (7.1.3.4)
+      actionpack (= 7.1.3.4)
+      activejob (= 7.1.3.4)
+      activerecord (= 7.1.3.4)
+      activestorage (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
       mail (>= 2.7.1)
       net-imap
       net-pop
       net-smtp
-    actionmailer (7.1.3.3)
-      actionpack (= 7.1.3.3)
-      actionview (= 7.1.3.3)
-      activejob (= 7.1.3.3)
-      activesupport (= 7.1.3.3)
+    actionmailer (7.1.3.4)
+      actionpack (= 7.1.3.4)
+      actionview (= 7.1.3.4)
+      activejob (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
       mail (~> 2.5, >= 2.5.4)
       net-imap
       net-pop
       net-smtp
       rails-dom-testing (~> 2.2)
-    actionpack (7.1.3.3)
-      actionview (= 7.1.3.3)
-      activesupport (= 7.1.3.3)
+    actionpack (7.1.3.4)
+      actionview (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
       nokogiri (>= 1.8.5)
       racc
       rack (>= 2.2.4)
@@ -46,15 +46,15 @@ GEM
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    actiontext (7.1.3.3)
-      actionpack (= 7.1.3.3)
-      activerecord (= 7.1.3.3)
-      activestorage (= 7.1.3.3)
-      activesupport (= 7.1.3.3)
+    actiontext (7.1.3.4)
+      actionpack (= 7.1.3.4)
+      activerecord (= 7.1.3.4)
+      activestorage (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.1.3.3)
-      activesupport (= 7.1.3.3)
+    actionview (7.1.3.4)
+      activesupport (= 7.1.3.4)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
@@ -64,22 +64,22 @@ GEM
       activemodel (>= 4.1)
       case_transform (>= 0.2)
       jsonapi-renderer (>= 0.1.1.beta1, < 0.3)
-    activejob (7.1.3.3)
-      activesupport (= 7.1.3.3)
+    activejob (7.1.3.4)
+      activesupport (= 7.1.3.4)
       globalid (>= 0.3.6)
-    activemodel (7.1.3.3)
-      activesupport (= 7.1.3.3)
-    activerecord (7.1.3.3)
-      activemodel (= 7.1.3.3)
-      activesupport (= 7.1.3.3)
+    activemodel (7.1.3.4)
+      activesupport (= 7.1.3.4)
+    activerecord (7.1.3.4)
+      activemodel (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
       timeout (>= 0.4.0)
-    activestorage (7.1.3.3)
-      actionpack (= 7.1.3.3)
-      activejob (= 7.1.3.3)
-      activerecord (= 7.1.3.3)
-      activesupport (= 7.1.3.3)
+    activestorage (7.1.3.4)
+      actionpack (= 7.1.3.4)
+      activejob (= 7.1.3.4)
+      activerecord (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
       marcel (~> 1.0)
-    activesupport (7.1.3.3)
+    activesupport (7.1.3.4)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -424,7 +424,7 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2024.0507)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.6)
+    mini_portile2 (2.8.7)
     minitest (5.23.1)
     msgpack (1.7.2)
     multi_json (1.15.0)
@@ -434,7 +434,7 @@ GEM
       uri
     net-http-persistent (4.0.2)
       connection_pool (~> 2.2)
-    net-imap (0.4.11)
+    net-imap (0.4.12)
       date
       net-protocol
     net-ldap (0.19.0)
@@ -634,20 +634,20 @@ GEM
     rackup (1.0.0)
       rack (< 3)
       webrick
-    rails (7.1.3.3)
-      actioncable (= 7.1.3.3)
-      actionmailbox (= 7.1.3.3)
-      actionmailer (= 7.1.3.3)
-      actionpack (= 7.1.3.3)
-      actiontext (= 7.1.3.3)
-      actionview (= 7.1.3.3)
-      activejob (= 7.1.3.3)
-      activemodel (= 7.1.3.3)
-      activerecord (= 7.1.3.3)
-      activestorage (= 7.1.3.3)
-      activesupport (= 7.1.3.3)
+    rails (7.1.3.4)
+      actioncable (= 7.1.3.4)
+      actionmailbox (= 7.1.3.4)
+      actionmailer (= 7.1.3.4)
+      actionpack (= 7.1.3.4)
+      actiontext (= 7.1.3.4)
+      actionview (= 7.1.3.4)
+      activejob (= 7.1.3.4)
+      activemodel (= 7.1.3.4)
+      activerecord (= 7.1.3.4)
+      activestorage (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
       bundler (>= 1.15.0)
-      railties (= 7.1.3.3)
+      railties (= 7.1.3.4)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
       actionview (>= 5.0.1.rc1)
@@ -662,9 +662,9 @@ GEM
     rails-i18n (7.0.9)
       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 8)
-    railties (7.1.3.3)
-      actionpack (= 7.1.3.3)
-      activesupport (= 7.1.3.3)
+    railties (7.1.3.4)
+      actionpack (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
       irb
       rackup (>= 1.0.0)
       rake (>= 12.2)
@@ -686,7 +686,7 @@ GEM
     redlock (1.3.2)
       redis (>= 3.0.0, < 6.0)
     regexp_parser (2.9.2)
-    reline (0.5.7)
+    reline (0.5.8)
       io-console (~> 0.5)
     request_store (1.6.0)
       rack (>= 1.4)
@@ -895,7 +895,7 @@ GEM
     xorcist (1.1.3)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.14)
+    zeitwerk (2.6.15)
 
 PLATFORMS
   ruby

From 1d3b75d124ddcf7bf1148a2a0cacc0b8f82d6340 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 5 Jun 2024 07:22:58 +0000
Subject: [PATCH 1169/2191] fix(deps): update dependency pg to v8.12.0 (#30549)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 162f0cb359e4ce..bad4fa01e749c1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -12941,8 +12941,8 @@ __metadata:
   linkType: hard
 
 "pg@npm:^8.5.0":
-  version: 8.11.5
-  resolution: "pg@npm:8.11.5"
+  version: 8.12.0
+  resolution: "pg@npm:8.12.0"
   dependencies:
     pg-cloudflare: "npm:^1.1.1"
     pg-connection-string: "npm:^2.6.4"
@@ -12958,7 +12958,7 @@ __metadata:
   peerDependenciesMeta:
     pg-native:
       optional: true
-  checksum: 10c0/20f29a41a99bad5931faf4d4a01e7be7fb27e5b5338fdfb06d2368e295c3d3d4ef49958ad57d2b17bad108e5c84574db6244ed8221e6b77a767f64ef12564119
+  checksum: 10c0/973e49b5e7327c42fc62806efa8c824159ab7a0b676cefe6eeb51a59b6e226587911ec27697f36c18d69e58a7f4f0b76d0829364087194d13ed431ab7c9c417a
   languageName: node
   linkType: hard
 

From f3893ae65de540fac9a6aed5bd6bc50affaf5d26 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 5 Jun 2024 07:23:19 +0000
Subject: [PATCH 1170/2191] chore(deps): update dependency rubocop-rspec to
 v2.30.0 (#30529)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index fadc2bc8296ec3..597005b6b05112 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -751,7 +751,7 @@ GEM
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rspec (2.29.2)
+    rubocop-rspec (2.30.0)
       rubocop (~> 1.40)
       rubocop-capybara (~> 2.17)
       rubocop-factory_bot (~> 2.22)

From e4e3875452c13dd76d9aee5e33e7d1e59629a1ff Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 5 Jun 2024 09:52:25 +0200
Subject: [PATCH 1171/2191] New Crowdin Translations (automated) (#30543)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/ia.json |  16 +-
 app/javascript/mastodon/locales/ko.json |   2 +-
 app/javascript/mastodon/locales/lt.json |  11 +-
 config/locales/ca.yml                   |   2 +-
 config/locales/doorkeeper.ia.yml        |   4 +-
 config/locales/ia.yml                   | 876 ++++++++++++------------
 config/locales/lt.yml                   |   5 +-
 config/locales/simple_form.ia.yml       |  52 +-
 config/locales/simple_form.lv.yml       |   1 +
 9 files changed, 491 insertions(+), 478 deletions(-)

diff --git a/app/javascript/mastodon/locales/ia.json b/app/javascript/mastodon/locales/ia.json
index 4bcf4c88b5765c..ce4e89e99a2c02 100644
--- a/app/javascript/mastodon/locales/ia.json
+++ b/app/javascript/mastodon/locales/ia.json
@@ -58,7 +58,7 @@
   "account.open_original_page": "Aperir le pagina original",
   "account.posts": "Messages",
   "account.posts_with_replies": "Messages e responsas",
-  "account.report": "Signalar @{name}",
+  "account.report": "Reportar @{name}",
   "account.requested": "Attendente le approbation. Clicca pro cancellar le requesta de sequer",
   "account.requested_follow": "{name} ha requestate de sequer te",
   "account.share": "Compartir profilo de @{name}",
@@ -274,7 +274,7 @@
   "error.unexpected_crash.next_steps": "Tenta refrescar le pagina. Si isto non remedia le problema, es possibile que tu pote totevia usar Mastodon per medio de un altere navigator o application native.",
   "error.unexpected_crash.next_steps_addons": "Tenta disactivar istes e refrescar le pagina. Si isto non remedia le problema, es possibile que tu pote totevia usar Mastodon per medio de un altere navigator o application native.",
   "errors.unexpected_crash.copy_stacktrace": "Copiar le traciamento del pila al area de transferentia",
-  "errors.unexpected_crash.report_issue": "Signalar un defecto",
+  "errors.unexpected_crash.report_issue": "Reportar problema",
   "explore.search_results": "Resultatos de recerca",
   "explore.suggested_follows": "Personas",
   "explore.title": "Explorar",
@@ -468,7 +468,7 @@
   "navigation_bar.search": "Cercar",
   "navigation_bar.security": "Securitate",
   "not_signed_in_indicator.not_signed_in": "Es necessari aperir session pro acceder a iste ressource.",
-  "notification.admin.report": "{name} ha signalate {target}",
+  "notification.admin.report": "{name} ha reportate {target}",
   "notification.admin.sign_up": "{name} se ha inscribite",
   "notification.favourite": "{name} ha marcate tu message como favorite",
   "notification.follow": "{name} te ha sequite",
@@ -499,7 +499,7 @@
   "notification_requests.title": "Notificationes filtrate",
   "notifications.clear": "Rader notificationes",
   "notifications.clear_confirmation": "Es tu secur que tu vole rader permanentemente tote tu notificationes?",
-  "notifications.column_settings.admin.report": "Nove signalationes:",
+  "notifications.column_settings.admin.report": "Nove reportos:",
   "notifications.column_settings.admin.sign_up": "Nove inscriptiones:",
   "notifications.column_settings.alert": "Notificationes de scriptorio",
   "notifications.column_settings.favourite": "Favorites:",
@@ -636,7 +636,7 @@
   "report.close": "Facite",
   "report.comment.title": "Ha il altere cosas que nos deberea saper?",
   "report.forward": "Reinviar a {target}",
-  "report.forward_hint": "Le conto es de un altere servitor. Inviar un copia anonymisate del signalation a illo tamben?",
+  "report.forward_hint": "Le conto es de un altere servitor. Inviar un copia anonymisate del reporto a illo tamben?",
   "report.mute": "Silentiar",
   "report.mute_explanation": "Tu non videra le messages de iste persona. Ille pote totevia sequer te e vider tu messages e non sapera de esser silentiate.",
   "report.next": "Sequente",
@@ -656,11 +656,11 @@
   "report.statuses.subtitle": "Selige tote le responsas appropriate",
   "report.statuses.title": "Existe alcun messages que appoia iste reporto?",
   "report.submit": "Submitter",
-  "report.target": "Signalamento de {target}",
+  "report.target": "Reportage de {target}",
   "report.thanks.take_action": "Ecce tu optiones pro controlar lo que tu vide sur Mastodon:",
   "report.thanks.take_action_actionable": "Durante que nos revide isto, tu pote prender mesuras contra @{name}:",
   "report.thanks.title": "Non vole vider isto?",
-  "report.thanks.title_actionable": "Gratias pro signalar, nos investigara isto.",
+  "report.thanks.title_actionable": "Gratias pro reportar, nos investigara isto.",
   "report.unfollow": "Cessar de sequer @{name}",
   "report.unfollow_explanation": "Tu seque iste conto. Pro non plus vider su messages in tu fluxo de initio, cessa de sequer lo.",
   "report_notification.attached_statuses": "{count, plural, one {{count} message} other {{count} messages}} annexate",
@@ -747,7 +747,7 @@
   "status.replied_to": "Respondite a {name}",
   "status.reply": "Responder",
   "status.replyAll": "Responder al discussion",
-  "status.report": "Signalar @{name}",
+  "status.report": "Reportar @{name}",
   "status.sensitive_warning": "Contento sensibile",
   "status.share": "Compartir",
   "status.show_filter_reason": "Monstrar in omne caso",
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index 7cd74fa5017e5c..277a87fe3ed118 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -414,7 +414,7 @@
   "limited_account_hint.action": "그래도 프로필 보기",
   "limited_account_hint.title": "이 프로필은 {domain}의 중재자에 의해 숨겨진 상태입니다.",
   "link_preview.author": "{name}",
-  "link_preview.more_from_author": "{name} 더 둘러보기",
+  "link_preview.more_from_author": "{name} 프로필 보기",
   "lists.account.add": "리스트에 추가",
   "lists.account.remove": "리스트에서 제거",
   "lists.delete": "리스트 삭제",
diff --git a/app/javascript/mastodon/locales/lt.json b/app/javascript/mastodon/locales/lt.json
index 40541b37571e29..307230036cf4ce 100644
--- a/app/javascript/mastodon/locales/lt.json
+++ b/app/javascript/mastodon/locales/lt.json
@@ -217,7 +217,7 @@
   "domain_block_modal.title": "Blokuoti domeną?",
   "domain_block_modal.you_will_lose_followers": "Visi tavo sekėjai iš šio serverio bus pašalinti.",
   "domain_block_modal.you_wont_see_posts": "Nematysi naudotojų įrašų ar pranešimų šiame serveryje.",
-  "domain_pill.activitypub_lets_connect": "Tai leidžia tau sąveikauti su žmonėmis ne tik Mastodon, bet ir įvairiose socialinėse programėlėse.",
+  "domain_pill.activitypub_lets_connect": "Tai leidžia tau prisijungti ir bendrauti su žmonėmis ne tik Mastodon, bet ir įvairiose socialinėse programėlėse.",
   "domain_pill.activitypub_like_language": "ActivityPub – tai tarsi kalba, kuria Mastodon kalba su kitais socialiniais tinklais.",
   "domain_pill.server": "Serveris",
   "domain_pill.their_handle": "Jų socialinis medijos vardas:",
@@ -433,7 +433,15 @@
   "loading_indicator.label": "Kraunama…",
   "media_gallery.toggle_visible": "{number, plural, one {Slėpti vaizdą} few {Slėpti vaizdus} many {Slėpti vaizdo} other {Slėpti vaizdų}}",
   "moved_to_account_banner.text": "Tavo paskyra {disabledAccount} šiuo metu išjungta, nes persikėlei į {movedToAccount}.",
+  "mute_modal.hide_from_notifications": "Slėpti nuo pranešimų",
+  "mute_modal.hide_options": "Slėpti parinktis",
+  "mute_modal.indefinite": "Kol atšauksiu jų nutildymą",
   "mute_modal.show_options": "Rodyti parinktis",
+  "mute_modal.they_can_mention_and_follow": "Jie gali tave paminėti ir sekti, bet tu jų nematysi.",
+  "mute_modal.they_wont_know": "Jie nežinos, kad buvo nutildyti.",
+  "mute_modal.title": "Nutildyti naudotoją?",
+  "mute_modal.you_wont_see_mentions": "Nematysi įrašus, kuriuose jie paminimi.",
+  "mute_modal.you_wont_see_posts": "Jie vis tiek gali matyti tavo įrašus, bet tu nematysi jų.",
   "navigation_bar.about": "Apie",
   "navigation_bar.advanced_interface": "Atidaryti išplėstinę žiniatinklio sąsają",
   "navigation_bar.blocks": "Užblokuoti naudotojai",
@@ -478,6 +486,7 @@
   "notification.own_poll": "Tavo apklausa baigėsi",
   "notification.poll": "Apklausa, kurioje balsavai, pasibaigė",
   "notification.reblog": "{name} pakėlė tavo įrašą",
+  "notification.relationships_severance_event": "Prarasti sąryšiai su {name}",
   "notification.relationships_severance_event.learn_more": "Sužinoti daugiau",
   "notification.relationships_severance_event.user_domain_block": "Tu užblokavai {target}. Pašalinama {followersCount} savo sekėjų ir {followingCount, plural, one {# paskyrą} few {# paskyrai} many {# paskyros} other {# paskyrų}}, kurios seki.",
   "notification.status": "{name} ką tik paskelbė",
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index ec32f771e929c8..c91ae64a7ae0de 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -466,7 +466,7 @@ ca:
       status: Estat
       suppress: Suprimeix les recomanacions de seguiment
       suppressed: Suprimit
-      title: Seguir les recomanacions
+      title: Recomanacions de comptes a seguir
       unsuppress: Restaurar les recomanacions de seguiment
     instances:
       availability:
diff --git a/config/locales/doorkeeper.ia.yml b/config/locales/doorkeeper.ia.yml
index 9c493e3d7f6e16..82a1b4b140fe4f 100644
--- a/config/locales/doorkeeper.ia.yml
+++ b/config/locales/doorkeeper.ia.yml
@@ -154,7 +154,7 @@ ia:
       admin:read:domain_blocks: leger informationes sensibile de tote le blocadas de dominio
       admin:read:email_domain_blocks: leger informationes sensibile de tote le blocadas de dominio email
       admin:read:ip_blocks: leger informationes sensibile de tote le blocadas de IP
-      admin:read:reports: leger information sensibile de tote le reportos e contos signalate
+      admin:read:reports: leger information sensibile de tote le reportos e contos reportate
       admin:write: modificar tote le datos in le servitor
       admin:write:accounts: exequer action de moderation sur contos
       admin:write:canonical_email_blocks: exequer actiones de moderation sur blocadas de email canonic
@@ -192,5 +192,5 @@ ia:
       write:media: incargar files de medios
       write:mutes: silentiar personas e conversationes
       write:notifications: rader tu notificationes
-      write:reports: signalar altere personas
+      write:reports: reportar altere personas
       write:statuses: publicar messages
diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index ab1f674fd8b952..cadc465c5549d9 100644
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -59,7 +59,7 @@ ia:
       destroyed_msg: Le datos de %{username} es ora in cauda pro lor imminente deletion
       disable: Gelar
       disable_sign_in_token_auth: Disactivar le authentication per token in e-mail
-      disable_two_factor_authentication: Disactivar authentication bifactorial
+      disable_two_factor_authentication: Disactivar A2F
       disabled: Gelate
       display_name: Nomine a monstrar
       domain: Dominio
@@ -105,10 +105,10 @@ ia:
       not_subscribed: Non subscribite
       pending: Attende revision
       perform_full_suspension: Suspender
-      previous_strikes: Previe admonitiones
+      previous_strikes: Sanctiones precedente
       previous_strikes_description_html:
-        one: Iste conto ha <strong>un</strong> admonition.
-        other: Iste conto ha <strong>%{count}</strong> admonitiones.
+        one: Iste conto ha <strong>un</strong> sanction.
+        other: Iste conto ha <strong>%{count}</strong> sanctiones.
       promote: Promover
       protocol: Protocollo
       public: Public
@@ -143,11 +143,11 @@ ia:
       shared_inbox_url: URL del cassa de entrata condividite
       show:
         created_reports: Reportos facite
-        targeted_reports: Signalate per alteres
+        targeted_reports: Reportate per alteres
       silence: Limitar
       silenced: Limitate
       statuses: Messages
-      strikes: Previe admonitiones
+      strikes: Sanctiones precedente
       subscribe: Subscriber
       suspend: Suspender
       suspended: Suspendite
@@ -178,21 +178,21 @@ ia:
         confirm_user: Confirmar le usator
         create_account_warning: Crear un advertimento
         create_announcement: Crear annuncio
-        create_canonical_email_block: Crear blocada de email
-        create_custom_emoji: Crear emoticone personalisate
+        create_canonical_email_block: Crear blocada de e-mail
+        create_custom_emoji: Crear emoji personalisate
         create_domain_allow: Crear permisso de dominio
         create_domain_block: Crear blocada de dominio
-        create_email_domain_block: Crear blocada de dominio email
+        create_email_domain_block: Crear blocada de dominio de e-mail
         create_ip_block: Crear un regula IP
         create_unavailable_domain: Crear dominio indisponibile
         create_user_role: Crear un rolo
         demote_user: Degradar usator
         destroy_announcement: Deler annuncio
-        destroy_canonical_email_block: Deler blocada de email
-        destroy_custom_emoji: Deler emoticone personalisate
+        destroy_canonical_email_block: Deler blocada de e-mail
+        destroy_custom_emoji: Deler emoji personalisate
         destroy_domain_allow: Deler permisso de dominio
         destroy_domain_block: Deler blocada de dominio
-        destroy_email_domain_block: Crear blocada de dominio email
+        destroy_email_domain_block: Crear blocada de dominio de e-mail
         destroy_instance: Purgar dominio
         destroy_ip_block: Deler le regula IP
         destroy_status: Deler message
@@ -234,62 +234,62 @@ ia:
         assigned_to_self_report_html: "%{name} assignava reporto %{target} a se mesme"
         change_email_user_html: "%{name} cambiava le adresse de e-mail address del usator %{target}"
         change_role_user_html: "%{name} cambiava rolo de %{target}"
-        confirm_user_html: "%{name} confirmava le adresse email del usator %{target}"
+        confirm_user_html: "%{name} confirmava le adresse de e-mail del usator %{target}"
         create_account_warning_html: "%{name} inviava un advertimento a %{target}"
         create_announcement_html: "%{name} creava un nove annuncio %{target}"
-        create_canonical_email_block_html: "%{name} blocava email con le hash %{target}"
-        create_custom_emoji_html: "%{name} cargava nove emoticone %{target}"
+        create_canonical_email_block_html: "%{name} blocava e-mail con le hash %{target}"
+        create_custom_emoji_html: "%{name} incargava le nove emoji %{target}"
         create_domain_allow_html: "%{name} permitteva federation con dominio %{target}"
         create_domain_block_html: "%{name} blocava dominio %{target}"
-        create_email_domain_block_html: "%{name} blocava dominio email %{target}"
+        create_email_domain_block_html: "%{name} blocava dominio de e-mail %{target}"
         create_ip_block_html: "%{name} creava regula pro IP %{target}"
-        create_unavailable_domain_html: "%{name} stoppava consignation a dominio %{target}"
+        create_unavailable_domain_html: "%{name} stoppava livration al dominio %{target}"
         create_user_role_html: "%{name} creava rolo de %{target}"
         demote_user_html: "%{name} degradava usator %{target}"
         destroy_announcement_html: "%{name} deleva annuncio %{target}"
-        destroy_canonical_email_block_html: "%{name} disblocava email con le hash %{target}"
+        destroy_canonical_email_block_html: "%{name} disblocava e-mail con le hash %{target}"
         destroy_custom_emoji_html: "%{name} deleva emoji %{target}"
         destroy_domain_allow_html: "%{name} impediva le federation con dominio %{target}"
         destroy_domain_block_html: "%{name} disblocava dominio %{target}"
-        destroy_email_domain_block_html: "%{name} disblocava le dominio email %{target}"
+        destroy_email_domain_block_html: "%{name} disblocava dominio de e-mail %{target}"
         destroy_instance_html: "%{name} purgava le dominio %{target}"
         destroy_ip_block_html: "%{name} deleva le regula pro IP %{target}"
-        destroy_status_html: "%{name} removeva le message de %{target}"
-        destroy_unavailable_domain_html: "%{name} resumeva le consignation al dominio %{target}"
-        destroy_user_role_html: "%{name} deleva le rolo de %{target}"
+        destroy_status_html: "%{name} removeva un message de %{target}"
+        destroy_unavailable_domain_html: "%{name} reprendeva le livration al dominio %{target}"
+        destroy_user_role_html: "%{name} deleva le rolo %{target}"
         disable_2fa_user_html: "%{name} disactivava le authentication a duo factores pro le usator %{target}"
-        disable_custom_emoji_html: "%{name} disactivava le emoticone %{target}"
-        disable_sign_in_token_auth_user_html: "%{name} disactivava authentication per testimonio via email pro %{target}"
-        disable_user_html: "%{name} disactivava le accesso pro le usator %{target}"
-        enable_custom_emoji_html: "%{name} activava le emoticone %{target}"
-        enable_sign_in_token_auth_user_html: "%{name} activava le authentication per testimonio via email pro %{target}"
-        enable_user_html: "%{name} activava le accesso pro le usator %{target}"
-        memorialize_account_html: "%{name} mutava le conto de %{target} in un pagina commemorative"
+        disable_custom_emoji_html: "%{name} disactivava le emoji %{target}"
+        disable_sign_in_token_auth_user_html: "%{name} disactivava le authentication per token de e-mail pro %{target}"
+        disable_user_html: "%{name} disactivava le apertura de session pro le usator %{target}"
+        enable_custom_emoji_html: "%{name} activava le emoji %{target}"
+        enable_sign_in_token_auth_user_html: "%{name} activava le authentication per token de e-mail pro %{target}"
+        enable_user_html: "%{name} activava le apertura de session pro le usator %{target}"
+        memorialize_account_html: "%{name} converteva le conto de %{target} in un pagina commemorative"
         promote_user_html: "%{name} promoveva le usator %{target}"
         reject_appeal_html: "%{name} refusava le appello del decision de moderation de %{target}"
         reject_user_html: "%{name} refusava le inscription de %{target}"
         remove_avatar_user_html: "%{name} removeva le avatar de %{target}"
         reopen_report_html: "%{name} reaperiva le reporto %{target}"
-        resend_user_html: "%{name} reinviava le email de confirmation pro %{target}"
+        resend_user_html: "%{name} reinviava le e-mail de confirmation pro %{target}"
         reset_password_user_html: "%{name} reinitialisava le contrasigno del usator %{target}"
         resolve_report_html: "%{name} resolveva le reporto %{target}"
-        sensitive_account_html: "%{name} marcava como sensibile le medios de %{target}"
+        sensitive_account_html: "%{name} marcava le multimedia de %{target} como sensibile"
         silence_account_html: "%{name} limitava le conto de %{target}"
         suspend_account_html: "%{name} suspendeva le conto de %{target}"
-        unassigned_report_html: "%{name} de-assignava le reporto %{target}"
-        unblock_email_account_html: "%{name} disblocava le adresse email de %{target}"
-        unsensitive_account_html: "%{name} dismarcava como sensibile le medios de %{target}"
+        unassigned_report_html: "%{name} disassignava le reporto %{target}"
+        unblock_email_account_html: "%{name} disblocava le adresse de e-mail de %{target}"
+        unsensitive_account_html: "%{name} dismarcava le multimedia de %{target} como sensibile"
         unsilence_account_html: "%{name} removeva le limite del conto de %{target}"
         unsuspend_account_html: "%{name} removeva le suspension del conto de %{target}"
         update_announcement_html: "%{name} actualisava le annuncio %{target}"
-        update_custom_emoji_html: "%{name} actualisava le emoticone %{target}"
+        update_custom_emoji_html: "%{name} actualisava le emoji %{target}"
         update_domain_block_html: "%{name} actualisava le blocada de dominio pro %{target}"
-        update_ip_block_html: "%{name} cambiava le regula pro IP %{target}"
-        update_report_html: "%{name} actualisava le reporto %{target}"
-        update_status_html: "%{name} actualisava le message per %{target}"
-        update_user_role_html: "%{name} cambiava le rolo de %{target}"
+        update_ip_block_html: "%{name} cambiava regula pro IP %{target}"
+        update_report_html: "%{name} actualisava reporto %{target}"
+        update_status_html: "%{name} actualisava message de %{target}"
+        update_user_role_html: "%{name} cambiava rolo de %{target}"
       deleted_account: conto delite
-      empty: Nulle registrationes trovate.
+      empty: Nulle registros trovate.
       filter_by_action: Filtrar per action
       filter_by_user: Filtrar per usator
       title: Registro de inspection
@@ -298,7 +298,7 @@ ia:
       edit:
         title: Modificar annuncio
       empty: Necun annuncios trovate.
-      live: Al vivo
+      live: In directo
       new:
         create: Crear annuncio
         title: Nove annuncio
@@ -316,15 +316,15 @@ ia:
       by_domain: Dominio
       copied_msg: Copia local del emoji create con successo
       copy: Copiar
-      copy_failed_msg: Impossibile crear un copia local de ille emoticone
+      copy_failed_msg: Non poteva crear un copia local de ille emoji
       create_new_category: Crear nove categoria
       created_msg: Emoji create con successo!
       delete: Deler
-      destroyed_msg: Emoticone destruite con successo destroyed!
+      destroyed_msg: Emoji destruite con successo!
       disable: Disactivar
       disabled: Disactivate
       disabled_msg: Emoji disactivate con successo
-      emoji: Emoticone
+      emoji: Emoji
       enable: Activar
       enabled: Activate
       enabled_msg: Emoji activate con successo
@@ -333,24 +333,24 @@ ia:
       listed: Listate
       new:
         title: Adder nove emoji personalisate
-      no_emoji_selected: Nulle emoticones ha essite cambiate perque nulle ha essite seligite
+      no_emoji_selected: Necun emoji ha essite cambiate perque necun ha essite seligite
       not_permitted: Tu non es autorisate a exequer iste action
       overwrite: Superscriber
-      shortcode: Via breve
+      shortcode: Codice curte
       shortcode_hint: Al minus 2 characteres, solo characteres alphanumeric e lineettas basse
       title: Emojis personalisate
       uncategorized: Sin categoria
       unlist: Non listar
       unlisted: Non listate
-      update_failed_msg: Impossibile actualisar ille emoticone
-      updated_msg: Emoticone actualisate con successo!
+      update_failed_msg: Non poteva actualisar le emoji
+      updated_msg: Emoji actualisate con successo!
       upload: Incargar
     dashboard:
       active_users: usatores active
       interactions: interactiones
-      media_storage: Immagazinage de medios
+      media_storage: Immagazinage multimedial
       new_users: nove usatores
-      opened_reports: reportos aperte
+      opened_reports: reportos aperite
       pending_appeals_html:
         one: "<strong>%{count}</strong> appello pendente"
         other: "<strong>%{count}</strong> appellos pendente"
@@ -377,7 +377,7 @@ ia:
         title: Appellos
     domain_allows:
       add_new: Permitter federation con dominio
-      created_msg: Le dominio ha essite permittite con successo pro federation
+      created_msg: Le dominio ha essite correctemente autorisate pro federation
       destroyed_msg: Le dominio ha essite prohibite pro federation
       export: Exportar
       import: Importar
@@ -390,7 +390,7 @@ ia:
         permanent_action: Disfacer le suspension non restaurara alcun datos o relation.
         preamble_html: Tu es sur le puncto de suspender <strong>%{domain}</strong> e su subdominios.
         remove_all_data: Isto removera de tu servitor tote le contento, multimedia e datos de profilo del contos de iste dominio.
-        stop_communication: Tu servitor stoppara le communication con iste servitores.
+        stop_communication: Tu servitor cessara de communicar con iste servitores.
         title: Confirmar le blocada del dominio %{domain}
         undo_relationships: Isto disfacera omne relation de sequimento inter le contos de iste servitores e illos del tue.
       created_msg: Le blocada del dominio es ora in tractamento
@@ -406,7 +406,7 @@ ia:
         hint: Le blocada del dominio non impedira le creation de entratas de conto in le base de datos, ma applicara retroactive- e automaticamente le methodos specific de moderation a iste contos.
         severity:
           desc_html: "<strong>Limitar</strong> rendera le messages del contos de iste dominio invisibile pro tote persona que non los seque. <strong>Suspender</strong> removera de tu servitor tote le contento, multimedia e datos de profilo del contos de iste dominio. Usa <strong>Necun</strong> si tu solmente vole rejectar le files multimedial."
-          noop: Nemo
+          noop: Necun
           silence: Limitar
           suspend: Suspender
         title: Nove blocada de dominio
@@ -462,11 +462,11 @@ ia:
       no_file: Necun file seligite
     follow_recommendations:
       description_html: "<strong>Le recommendationes de sequimento adjuta le nove usatores a trovar rapidemente contento interessante.</strong> Quando un usator non ha un historia sufficiente de interactiones con alteres pro formar recommendationes personalisate de sequimento, iste contos es recommendate. Illos se recalcula cata die a partir de un mixtura de contos con le plus grande numero de ingagiamentos recente e le numero de sequitores local le plus alte pro un lingua date."
-      language: Per lingua
+      language: Pro le lingua
       status: Stato
       suppress: Supprimer recommendation de sequimento
       suppressed: Supprimite
-      title: Sequer le recommendationes
+      title: Recommendationes de contos a sequer
       unsuppress: Restaurar recommendation de sequimento
     instances:
       availability:
@@ -504,7 +504,7 @@ ia:
         instance_follows_measure: lor sequitores hic
         instance_languages_dimension: Linguas principal
         instance_media_attachments_measure: annexos multimedial immagazinate
-        instance_reports_measure: signalationes sur illos
+        instance_reports_measure: reportos sur illes
         instance_statuses_measure: messages immagazinate
       delivery:
         all: Totes
@@ -517,7 +517,7 @@ ia:
       delivery_error_days: Dies de errores de livration
       delivery_error_hint: Si le livration non es possibile durante %{count} dies, illo essera automaticamente marcate como non livrabile.
       destroyed_msg: Le datos de %{domain} es ora in cauda pro deletion imminente.
-      empty: Necun dominios trovate.
+      empty: Necun dominio trovate.
       known_accounts:
         one: "%{count} conto cognoscite"
         other: "%{count} contos cognoscite"
@@ -533,7 +533,7 @@ ia:
       total_blocked_by_us: Blocate per nos
       total_followed_by_them: Sequite per illes
       total_followed_by_us: Sequite per nos
-      total_reported: Signalationes sur illes
+      total_reported: Reportos sur illes
       total_storage: Annexos multimedial
       totals_time_period_hint_html: Le totales monstrate hic infra include le datos de tote le tempore.
       unknown_instance: Iste dominio non es actualmente cognoscite sur iste servitor.
@@ -579,24 +579,24 @@ ia:
       status: Stato
       title: Repetitores
     report_notes:
-      created_msg: Nota de signalation create con successo!
-      destroyed_msg: Nota de signalation delite con successo!
+      created_msg: Nota de reporto create con successo!
+      destroyed_msg: Nota de reporto delite con successo!
     reports:
       account:
         notes:
           one: "%{count} nota"
           other: "%{count} notas"
       action_log: Registro de inspection
-      action_taken_by: Action prendite per
+      action_taken_by: Mesura prendite per
       actions:
-        delete_description_html: Le messages signalate essera delite e un admonition essera registrate pro adjutar te a prender mesuras in caso de futur infractiones proveniente del mesme conto.
-        mark_as_sensitive_description_html: Le files multimedial in le messages reportate essera marcate como sensibile e un admonition essera registrate pro adjutar te a prender mesuras in caso de futur infractiones proveniente del mesme conto.
+        delete_description_html: Le messages reportate essera delite e un sanction essera registrate pro adjutar te a prender mesuras adequate in caso de futur infractiones committite desde le mesme conto.
+        mark_as_sensitive_description_html: Le files multimedial in le messages reportate essera marcate como sensibile e un sanction essera registrate pro adjutar te a prender mesuras adequate in caso de futur infractiones committite desde le mesme conto.
         other_description_html: Vider plus optiones pro controlar le comportamento del conto e personalisar le communication al conto signalate.
-        resolve_description_html: Necun action essera prendite contra le conto signalate, necun admonition registrate, e le signalation essera claudite.
-        silence_description_html: Iste conto essera visibile solmente a qui ja lo seque o manualmente lo cerca, limitante gravemente su portata. Pote sempre esser revertite. Claude tote le signalationes contra iste conto.
-        suspend_description_html: Le conto e tote su contento essera inaccessible e finalmente delite, e interager con illo essera impossibile. Reversibile intra 30 dies. Claude tote le signalationes contra iste conto.
-      actions_description_html: Decide qual action prender pro resolver iste signalation. Si tu prende un action punitive contra le conto signalate, le persona recipera un notification in e-mail, excepte si le categoria <strong>Spam</strong> es seligite.
-      actions_description_remote_html: Decide qual action prender pro resolver iste signalation. Isto affectara solmente le maniera in que <strong>tu</strong> servitor communica con iste conto remote e gere su contento.
+        resolve_description_html: Necun mesura essera prendite contra le conto denunciate, necun sanction registrate, e le reporto essera claudite.
+        silence_description_html: Iste conto essera visibile solmente a qui ja lo seque o manualmente lo cerca, limitante gravemente su portata. Pote sempre esser revertite. Claude tote le reportos contra iste conto.
+        suspend_description_html: Le conto e tote su contento essera inaccessibile e finalmente delite, e interager con illo essera impossibile. Reversibile intra 30 dies. Claude tote le reportos contra iste conto.
+      actions_description_html: Decide qual mesura prender pro resolver iste reporto. Si tu prende un mesura punitive contra le conto reportate, le persona recipera un notification in e-mail, excepte si le categoria <strong>Spam</strong> es seligite.
+      actions_description_remote_html: Decide qual mesura prender pro resolver iste reporto. Isto affectara solmente le maniera in que <strong>tu</strong> servitor communica con iste conto remote e gere su contento.
       add_to_report: Adder plus al reporto
       already_suspended_badges:
         local: Ja suspendite sur iste servitor
@@ -604,19 +604,19 @@ ia:
       are_you_sure: Es tu secur?
       assign_to_self: Assignar a me
       assigned: Moderator assignate
-      by_target_domain: Dominio del conto signalate
+      by_target_domain: Dominio del conto reportate
       cancel: Cancellar
       category: Categoria
-      category_description_html: Le motivo pro le qual iste conto e/o contento ha essite signalate essera citate in le communication con le conto signalate
+      category_description_html: Le motivo pro le qual iste conto e/o contento ha essite reportate essera citate in le communication con le conto reportate
       comment:
         none: Necun
       comment_description_html: 'Pro fornir plus information, %{name} ha scribite:'
       confirm: Confirmar
-      confirm_action: Confirmar le action de moderation contra %{acct}
-      created_at: Signalate
+      confirm_action: Confirmar le mesura de moderation contra %{acct}
+      created_at: Reportate
       delete_and_resolve: Deler le messages
       forwarded: Reexpedite
-      forwarded_replies_explanation: Iste signalation proveni de un usator remote e concerne contento remote. Illo te ha essite reexpedite perque le contento signalate es in responsa a un usator tue.
+      forwarded_replies_explanation: Iste reporto proveni de un usator remote e concerne contento remote. Illo te ha essite reexpedite perque le contento reportate es in responsa a un usator tue.
       forwarded_to: Reexpedite a %{domain}
       mark_as_resolved: Marcar como resolvite
       mark_as_sensitive: Marcar como sensibile
@@ -627,41 +627,41 @@ ia:
         create_and_resolve: Resolver con nota
         create_and_unresolve: Reaperir con nota
         delete: Deler
-        placeholder: Describe le actiones prendite, o insere altere information pertinente...
+        placeholder: Describe le mesuras prendite, o insere altere information pertinente...
         title: Notas
-      notes_description_html: Vider e lassar notas pro altere moderatores e pro tu proprie futuro
+      notes_description_html: Vider e lassar notas a altere moderatores e a tu ego futur
       processed_msg: 'Reporto #%{id} elaborate con successo'
       quick_actions_description_html: 'Face un rapide action o rola a basso pro vider le contento reportate:'
       remote_user_placeholder: le usator remote ab %{instance}
       reopen: Reaperir reporto
       report: 'Reporto #%{id}'
-      reported_account: Conto signalate
-      reported_by: Signalate per
+      reported_account: Conto reportate
+      reported_by: Reportate per
       resolved: Resolvite
       resolved_msg: Reporto resolvite con successo!
       skip_to_actions: Saltar al actiones
       status: Stato
-      statuses: Contento signalate
-      statuses_description_html: Le contento offensive sera citate in communication con le conto reportate
+      statuses: Contento reportate
+      statuses_description_html: Le contento offensive essera citate in communication con le conto reportate
       summary:
         action_preambles:
-          delete_html: 'Tu va <strong>remover</strong> parte de messages de <strong>@%{acct}</strong>. Isto ira:'
-          mark_as_sensitive_html: 'Tu va <strong>marcar</strong> parte de messages de <strong>@%{acct}</strong> como <strong>sensibile</strong>. Isto ira:'
-          silence_html: 'Tu va <strong>limitar</strong> le conto de <strong>@%{acct}</strong>. Isto ira:'
-          suspend_html: 'Tu va <strong>limitar</strong> le conto de <strong>@%{acct}</strong>. Isto ira:'
+          delete_html: 'Tu es sur le puncto de <strong>remover</strong> alcunes del messages de <strong>@%{acct}</strong>. Isto va:'
+          mark_as_sensitive_html: 'Tu es sur le puncto de <strong>marcar</strong> alcunes del messages de <strong>@%{acct}</strong> como <strong>sensibile</strong>. Isto va:'
+          silence_html: 'Tu es sur le puncto de <strong>limitar</strong> le conto de <strong>@%{acct}</strong>. Isto va:'
+          suspend_html: 'Tu es sur le puncto de <strong>suspender</strong> le conto de <strong>@%{acct}</strong>. Isto va:'
         actions:
           delete_html: Remover le messages offensive
-          mark_as_sensitive_html: Marcar le medios de messages offensive como sensibile
+          mark_as_sensitive_html: Marcar le multimedia de messages offensive como sensibile
           silence_html: Limitar gravemente le portata de <strong>@%{acct}</strong> rendente le profilo e contento visibile solmente a qui ja lo seque o lo cerca manualmente
           suspend_html: Suspender <strong>@%{acct}</strong>, rendente le profilo e contento inaccessibile e le interaction con illo impossibile
-        close_report: Marcar le signalation №%{id} como resolvite
-        close_reports_html: Marcar <strong>tote</strong> le signalationes contra <strong>@%{acct}</strong> como resolvite
+        close_report: 'Marcar le reporto #%{id} como resolvite'
+        close_reports_html: Marcar <strong>tote</strong> le reportos contra <strong>@%{acct}</strong> como resolvite
         delete_data_html: Deler le profilo e contento de <strong>@%{acct}</strong> in 30 dies excepte si le suspension es disfacite intertanto
         preview_preamble_html: "<strong>@%{acct}</strong> recipera un advertimento con le sequente contento:"
-        record_strike_html: Registrar un admonition contra <strong>@%{acct}</strong> pro adjutar te a imponer sanctiones in caso de futur violationes de iste conto
+        record_strike_html: Registra un sanction contra <strong>@%{acct}</strong> pro adjutar te a prender mesuras adequate in caso de futur violationes committite desde iste conto
         send_email_html: Inviar un e-mail de advertimento a <strong>@%{acct}</strong>
         warning_placeholder: Motivation supplementari facultative pro le action de moderation.
-      target_origin: Origine del conto signalate
+      target_origin: Origine del conto reportate
       title: Reportos
       unassign: Disassignar
       unknown_action_msg: 'Action incognite: %{action}'
@@ -707,7 +707,7 @@ ia:
         manage_invites: Gerer le invitationes
         manage_invites_description: Permitte que usatores examina e deactiva ligamines de invitation
         manage_reports: Gerer le reportos
-        manage_reports_description: Permitte que usatores revide signalationes e exeque actiones de moderation a base de illos
+        manage_reports_description: Permitte que usatores revide reportos e prende mesuras de moderation a base de illos
         manage_roles: Gerer le rolos
         manage_roles_description: Permitte que usatores gere e assigna rolos inferior a lor privilegios actual
         manage_rules: Gerer le regulas
@@ -716,7 +716,7 @@ ia:
         manage_settings_description: Permitte que usatores cambia le parametros del sito
         manage_taxonomies: Gerer taxonomias
         manage_taxonomies_description: Permitte que usatores revide contento in tendentias e actualisa le parametros de hashtag
-        manage_user_access: Gerer le accessos de usator
+        manage_user_access: Gerer le accesso de usatores
         manage_user_access_description: Permitte que usatores disactiva le authentication bifactorial de altere usatores, cambia lor adresses de e-mail, e reinitialisa lor contrasigno
         manage_users: Gerer usatores
         manage_users_description: Permitte que usatores vide le detalios de altere usatores e exeque actiones de moderation contra illes
@@ -741,7 +741,7 @@ ia:
         manage_rules: Gerer le regulas del servitor
         preamble: Fornir information detaliate sur le functionamento, moderation e financiamento del servitor.
         rules_hint: Il ha un area dedicate al regulas que tu usatores debe acceptar.
-        title: A proposito de
+        title: A proposito
       appearance:
         preamble: Personalisar le interfacie web de Mastodon.
         title: Apparentia
@@ -756,43 +756,43 @@ ia:
         preamble: Controlar como contento generate per le usator es immagazinate in Mastodon.
         title: Retention de contento
       default_noindex:
-        desc_html: Affice tote le usatores qui non ha cambiate iste parametro per se mesme
-        title: Refusar de ordinario le indexation del usatores per le motores de recerca
+        desc_html: Affecta tote le usatores qui non ha personalmente cambiate iste parametro
+        title: Excluder le usatores del indexation del motores de recerca per predefinition
       discovery:
-        follow_recommendations: Sequer le recommendationes
-        preamble: Presentar contento interessante es instrumental in introducer nove usatores qui pote non cognoscer alcuno de Mastodon.
+        follow_recommendations: Recommendationes de contos a sequer
+        preamble: Presentar contento interessante es essential pro attraher e retener nove usatores qui pote non cognoscer alcun persona sur Mastodon. Controla como varie optiones de discoperta functiona sur tu servitor.
         profile_directory: Directorio de profilos
         public_timelines: Chronologias public
         publish_discovered_servers: Publicar servitores discoperite
-        publish_statistics: Publicar statistica
-        title: Discoperi
+        publish_statistics: Publicar statisticas
+        title: Discoperta
         trends: Tendentias
       domain_blocks:
         all: A omnes
         disabled: A necuno
         users: A usators local in session
       registrations:
-        moderation_recommandation: Per favor verifica que tu ha un adequate e reactive equipa de moderation ante que tu aperi registrationes a quicunque!
+        moderation_recommandation: Per favor assecura te de haber un equipa de moderation adequate e reactive ante de aperir le inscription a omnes!
         preamble: Controla qui pote crear un conto sur tu servitor.
-        title: Registrationes
+        title: Inscriptiones
       registrations_mode:
         modes:
           approved: Approbation necessari pro le inscription
           none: Nemo pote inscriber se
           open: Quicunque pote inscriber se
-        warning_hint: Nos consilia usar “Approbation necessari pro le inscription” si tu non crede que tu equipa de moderation pote tractar spam e registrationes maligne in un modo opportun.
+        warning_hint: Nos recommenda usar “Approbation necessari pro le inscription” si tu non es secur que tu equipa de moderation pote tractar spam e inscriptiones malevolente in tempore utile.
       security:
         authorized_fetch: Require authentication ab servitores federate
         authorized_fetch_hint: Requirer authentication de servitores federate permitte un application plus stricte de blocadas a nivello de usator e de servitor. Nonobstante, isto diminue le prestationes del servitor, reduce le portata de tu responsas e pote introducer problemas de compatibilitate con certe servicios federate. In plus, isto non impedira le actores dedicate a recuperar tu messages public e tu contos.
-        authorized_fetch_overridden_hint: Tu actualmente non pote cambiar iste parametros perque il es superate per un variabile de ambiente.
+        authorized_fetch_overridden_hint: Tu actualmente non pote cambiar iste parametro perque illo es supplantate per un variabile de ambiente.
         federation_authentication: Application del authentication de federation
       title: Parametros de servitor
     site_uploads:
       delete: Deler file incargate
-      destroyed_msg: Incarga de sito delite con successo!
+      destroyed_msg: Le file incargate al sito ha essite delite!
     software_updates:
-      critical_update: Critic! Actualisa tosto
-      description: Il es recommendate de mantener actualisate tu installation de Mastodon pro beneficiar del ultime reparationes e functiones. In ultra, il es aliquando critic actualisar Mastodon in maniera opportun pro evitar problemas de securitate. Pro iste rationes, Mastodon controla pro actualisationes cata 30 minutas, e te notificara secundo tu preferentias de notificationes per email.
+      critical_update: Critic – per favor, actualisa rapidemente
+      description: Il es recommendate mantener tu installation de Mastodon actualisate pro beneficiar del ultime reparationes e functiones. In ultra, de tempore a tempore, il es de importantia critic actualisar Mastodon in tempore utile pro evitar problemas de securitate. Pro iste rationes, Mastodon verifica le presentia de actualisationes cata 30 minutas, e te notificara secundo tu preferentias de notification in e-mail.
       documentation_link: Pro saper plus
       release_notes: Notas de version
       title: Actualisationes disponibile
@@ -800,33 +800,33 @@ ia:
       types:
         major: Version major
         minor: Version minor
-        patch: 'Version de pecias: remedios de bugs e cambiamentos facile a applicar'
+        patch: 'Version corrective: remedios de bugs e cambiamentos facile a applicar'
       version: Version
     statuses:
       account: Autor
       application: Application
-      back_to_account: Retro al pagina de conto
+      back_to_account: Retornar al pagina del conto
       back_to_report: Retro al pagina de reporto
       batch:
-        remove_from_report: Remover ab reporto
+        remove_from_report: Remover del reporto
         report: Reporto
       deleted: Delite
-      favourites: Favoritos
-      history: Chronologia del versiones
-      in_reply_to: Replicante a
+      favourites: Favorites
+      history: Historia de versiones
+      in_reply_to: In responsa a
       language: Lingua
       media:
-        title: Medios
+        title: Multimedia
       metadata: Metadatos
-      no_status_selected: Nulle messages era cambiate perque necun era seligite
+      no_status_selected: Necun message ha essite cambiate perque necun ha essite seligite
       open: Aperir message
       original_status: Message original
-      reblogs: Promotiones
-      status_changed: Messages cambiate
+      reblogs: Republicationes
+      status_changed: Message cambiate
       title: Messages del conto
       trending: Tendentias
       visibility: Visibilitate
-      with_media: Con medios
+      with_media: Con multimedia
     strikes:
       actions:
         delete_statuses: "%{name} ha delite le messages de %{target}"
@@ -853,31 +853,31 @@ ia:
         message_html: Tu aggregation Elasticsearch ha plus que un nodo, ma Mastodon non es configurate a usar los.
       elasticsearch_preset_single_node:
         action: Vide documentation
-        message_html: Tu aggregation Elasticsearch ha un sol nodo, <code>ES_PRESET</code> deberea esser predefinite a <code>single_node_cluster</code>.
+        message_html: Tu aggregation Elasticsearch ha un sol nodo, <code>ES_PRESET</code> deberea esser mittite a <code>single_node_cluster</code>.
       elasticsearch_reset_chewy:
-        message_html: Le indexation de tu systema Elasticsearch es obsolete per un cambio de configuration. Per cfavor exeque <code>tootctl search deploy --reset-chewy</code> pro actualisar lo.
+        message_html: Le indexation de tu systema Elasticsearch es obsolete a causa de un cambio de parametro. Per favor exeque <code>tootctl search deploy --reset-chewy</code> pro actualisar lo.
       elasticsearch_running_check:
-        message_html: Impossibile connecter se a Elasticsearch. Verifica que illo flue, o disactiva le recerca a plen texto
+        message_html: Impossibile connecter se a Elasticsearch. Verifica que illo es active, o disactiva le recerca a plen texto
       elasticsearch_version_check:
         message_html: 'Version de Elasticsearch incompatibile: %{value}'
-        version_comparison: Elasticsearch %{running_version} es currente dum %{required_version} es necesse
+        version_comparison: Elasticsearch %{running_version} es active, ma %{required_version} es requirite
       rules_check:
         action: Gerer le regulas del servitor
-        message_html: Tu non ha definite ulle regulas de servitor.
+        message_html: Tu non ha definite alcun regula de servitor.
       sidekiq_process_check:
-        message_html: Nulle processo Sidekiq currente pro le %{value} cauda(s). Controla tu configuration de Sidekiq
+        message_html: Necun processo Sidekiq es active pro le cauda(s) %{value}. Per favor verifica tu configuration de Sidekiq
       software_version_critical_check:
         action: Vider le actualisationes disponibile
-        message_html: Un actualisation critic de Mastodon es disponibile, actualisa lo le plus rapide possibile.
+        message_html: Un actualisation critic de Mastodon es disponibile. Per favor actualisa lo le plus tosto possibile.
       software_version_patch_check:
         action: Vider le actualisationes disponibile
         message_html: Un actualisation de remedio de bug pro Mastodon es disponibile.
       upload_check_privacy_error:
-        action: Verifica hic pro plus de information
-        message_html: "<strong>Tu servitor de web es mal-configurate. Le confidentialitate de tu usatores es a risco.</strong>"
+        action: Consulta hic pro plus information
+        message_html: "<strong>Tu servitor web es mal configurate. Le confidentialitate de tu usatores es in risco.</strong>"
       upload_check_privacy_error_object_storage:
-        action: Verifica hic pro plus de information
-        message_html: "<strong>Tu immagazinage de objectos es mal-configurate. Le confidentialitate de tu usatores es a risco.</strong>"
+        action: Consulta hic pro plus information
+        message_html: "<strong>Tu immagazinage de objectos es mal configurate. Le confidentialitate de tu usatores es in risco.</strong>"
     tags:
       review: Revide le stato
       updated_msg: Parametros de hashtag actualisate con successo
@@ -885,67 +885,67 @@ ia:
     trends:
       allow: Permitter
       approved: Approbate
-      disallow: Impedir
+      disallow: Refusar
       links:
         allow: Permitter ligamine
-        allow_provider: Permitter editor
-        description_html: Istos es ligamines que es actualmente multo compartite per contos de que tu servitor vide messages. Illo pote adjutar tu usatores a discoperir lo que eveni in le mundo. Nulle ligamines es monstrate publicamente usque tu non approba le editor. Tu alsi pote permitter o rejectar ligamines singule.
-        disallow: Impedir ligamine
-        disallow_provider: Impedir editor
-        no_link_selected: Nulle ligamine era cambiate perque nulle era seligite
+        allow_provider: Autorisar le publicator
+        description_html: Istes es ligamines que es actualmente compartite multo per contos del quales tu servitor recipe messages. Illos pote adjutar tu usatores a discoperir lo que eveni in le mundo. Necun ligamine es monstrate publicamente usque tu autorisa le publicator. Tu pote tamben permitter o rejectar ligamines singule.
+        disallow: Prohibir le ligamine
+        disallow_provider: Prohibir le publicator
+        no_link_selected: Necun ligamine ha essite cambiate perque necun ha essite seligite
         publishers:
-          no_publisher_selected: Nulle editores era cambiate perque nemo era seligite
+          no_publisher_selected: Necun publicator ha essite cambiate perque necun ha essite seligite
         shared_by_over_week:
           one: Compartite per un persona le septimana passate
           other: Compartite per %{count} personas le septimana passate
-        title: Ligamines de tendentia
-        usage_comparison: Compartite %{today} vices hodie, comparate al %{yesterday} de heri
-      not_allowed_to_trend: Non permittite haber tendentia
-      only_allowed: Solo permittite
+        title: Ligamines in tendentia
+        usage_comparison: Compartite %{today} vices hodie, in comparation con le %{yesterday} de heri
+      not_allowed_to_trend: Non autorisate a apparer in tendentias
+      only_allowed: Solo permittites
       pending_review: Attende revision
       preview_card_providers:
-        allowed: Ligamines ab iste editor pote haber tendentia
-        description_html: Il ha dominios ab que ligamines es sovente compartite sur tu servitor. Ligamines non habera publicamente tendentia salvo que le dominio del ligamine es approbate. Tu approbation (o rejection) se extende al sub-dominios.
-        rejected: Ligamines ab iste editor non habera tendentia
-        title: Editores
+        allowed: Ligamines de iste publicator pote apparer in tendentias
+        description_html: Istes es le dominios del quales le ligamines es frequentemente compartite sur tu servitor. Le ligamines solmente apparera in le tendentias public si le dominio del ligamine es approbate. Tu approbation (o rejection) se extende al subdominios.
+        rejected: Ligamines de iste publicator non apparera in tendentias
+        title: Publicatores
       rejected: Rejectate
       statuses:
         allow: Permitter message
         allow_account: Permitter autor
-        description_html: Istos es messages que tu servitor cognosce perque illos es al momento multo compartite e favorite. Isto pote adjutar tu nove e renovate usatores a trovar altere personas a sequer. Nulle messages es monstrate publicamente usque tu approba le autor, e le autor permitte que su conto es suggerite a alteres. Tu alsi pote permitter o rejectar messages singule.
-        disallow: Impedir message
-        disallow_account: Impedir autor
-        no_status_selected: Nulle messages era cambiate perque nulle era seligite
-        not_discoverable: Le autor non ha optate pro esser detectabile
+        description_html: Istes es le messages cognoscite sur tu servitor que al momento es multo compartite e marcate como favorite. Illos pote adjutar tu usatores nove e reveniente a trovar plus personas a sequer. Necun message es monstrate publicamente usque tu approba le autor, a condition que le autor permitte que su conto es suggerite a alteres. Tu pote tamben permitter o rejectar messages singule.
+        disallow: Non permitter message
+        disallow_account: Non permitter autor
+        no_status_selected: Necun message in tendentia ha essite cambiate perque necun ha essite seligite
+        not_discoverable: Le autor non ha optate pro esser discoperibile
         shared_by:
-          one: Compartite e favorite un tempore
-          other: Compartite e favorite %{friendly_count} tempores
-        title: Messages de tendentia
+          one: Compartite o marcate como favorite un vice
+          other: Compartite o marcate como favorite %{friendly_count} vices
+        title: Messages in tendentia
       tags:
-        current_score: Punctuage actual %{score}
+        current_score: Score actual %{score}
         dashboard:
           tag_accounts_measure: usos unic
           tag_languages_dimension: Linguas principal
           tag_servers_dimension: Servitores principal
           tag_servers_measure: servitores differente
           tag_uses_measure: usos total
-        description_html: Istos es hashtags que actualmente appare in tante messages que tu servitor vide. Illo pote adjutar tu usatores a discoperir re que le personas parla plus al momento. Nulle hashtags es monstrate publicamente usque tu los approba.
+        description_html: Istes es hashtags que actualmente appare in multe messages que tu servitor vide. Illos pote adjutar tu usatores a discoperir le cosas sur le quales le gente parla le plus al momento. Nulle hashtags es monstrate publicamente usque tu los approba.
         listable: Pote esser suggerite
-        no_tag_selected: Nulle placas era cambiate perque nulle era seligite
-        not_listable: Non sera suggerite
+        no_tag_selected: Necun etiquetta ha essite cambiate perque necun ha essite seligite
+        not_listable: Non essera suggerite
         not_trendable: Non apparera sub tendentias
         not_usable: Non pote esser usate
-        peaked_on_and_decaying: Habeva un picco %{date}, ora decade
-        title: Hashtags de tendentia
+        peaked_on_and_decaying: Ha attingite su maximo le %{date}, ora in declino
+        title: Hashtags in tendentia
         trendable: Pote apparer sub tendentias
-        trending_rank: 'De tendentia #%{rank}'
+        trending_rank: 'Tendentia #%{rank}'
         usable: Pote esser usate
-        usage_comparison: Usate %{today} vices hodie, al contrario del %{yesterday} de heri
+        usage_comparison: Usate %{today} vices hodie, in comparation con le %{yesterday} de heri
         used_by_over_week:
-          one: Usate per un persona le ultime septimana
-          other: Usate per %{count} personas le ultime septimana
+          one: Usate per un persona in le ultime septimana
+          other: Usate per %{count} personas in le ultime septimana
       title: Tendentias
-      trending: Tendentias
+      trending: In tendentia
     warning_presets:
       add_new: Adder nove
       delete: Deler
@@ -953,46 +953,46 @@ ia:
       empty: Tu non ha ancora definite alcun avisos predefinite.
       title: Predefinitiones de avisos
     webhooks:
-      add_new: Adder terminal
+      add_new: Adder puncto final
       delete: Deler
-      description_html: Un <strong>croc web</strong> habilita Mastodon a transmitter <strong>notificationes in tempore real</strong> re eventos seligite pro tu pro activar application, assi tu application pote <strong>automaticamente discatenar reactiones</strong>.
+      description_html: Un <strong>webhook</strong> o puncto de ancorage web permitte a Mastodon transmitter <strong>notificationes in tempore real</strong> sur eventos seligite a tu proprie application, de maniera que tu application pote <strong>automaticamente activar reactiones</strong>.
       disable: Disactivar
       disabled: Disactivate
-      edit: Rediger terminal
-      empty: Tu ancora non ha configurate alcun punctos final de web croc.
+      edit: Rediger puncto final
+      empty: Tu ancora non ha configurate alcun punctos final de webhook.
       enable: Activar
       enabled: Active
       enabled_events:
         one: 1 evento activate
         other: "%{count} eventos activate"
       events: Eventos
-      new: Nove croc web
-      rotate_secret: Rotar secrete
-      secret: Firmante secrete
+      new: Nove webhook
+      rotate_secret: Rotar le secreto
+      secret: Secreto de signatura
       status: Stato
-      title: Crocs web
-      webhook: Crocs web
+      title: Webhooks
+      webhook: Webhook
   admin_mailer:
     auto_close_registrations:
-      body: Per un carentia recente de activate de moderator, le registrationes sur %{instance} ha essite automaticamente mutate a besoniante revision manual, pro impedir %{instance} de esser usate como un platteforma pro potential mal actores. Tu pote mutar lo retro pro sempre aperir le registrationes.
-      subject: Le registrationes pro %{instance} ha essite automaticamente mutate a besoniante de approbation
+      body: A causa de un manco de activate recente de moderatores, le parametros de inscription sur %{instance} ha essite automaticamente cambiate pro exiger un verification manual, a fin de impedir le possibile uso de %{instance} per actores malevolente. Tu pote reaperir le inscription a omne momento.
+      subject: Le inscriptiones a %{instance} ha essite automaticamente cambiate pro exiger approbation
     new_appeal:
       actions:
-        delete_statuses: pro deler lor messages
-        disable: pro gelar lor conto
-        mark_statuses_as_sensitive: pro marcar lor messages como sensibile
-        none: pro advertir
-        sensitive: a marcar lor conto como sensibile
-        silence: pro limitar lor conto
-        suspend: pro suspender lor conto
-      body: "%{target} appella un decision de moderation per %{action_taken_by} ab le %{date}, que era %{type}. Ille scribeva:"
-      next_steps: Tu pote approbar le appello a disfacer le decision de moderation, o ignorar lo.
-      subject: "%{username} appella un decision de moderation sur %{instance}"
+        delete_statuses: deler su messages
+        disable: gelar su conto
+        mark_statuses_as_sensitive: marcar su messages como sensibile
+        none: emitter un advertimento
+        sensitive: marcar su conto como sensibile
+        silence: limitar su conto
+        suspend: suspender su conto
+      body: "%{target} appella contra un decision de moderation, prendite per %{action_taken_by} le %{date}, de %{type}. Le appellante ha scribite:"
+      next_steps: Tu pote approbar le appello pro disfacer le decision de moderation, o ignorar lo.
+      subject: "%{username} appella contra un decision de moderation sur %{instance}"
     new_critical_software_updates:
-      body: Nove versiones critic de Mastodon ha essite publicate, tu poterea voler actualisar al plus tosto possibile!
+      body: Nove versiones critic de Mastodon ha essite publicate, per favor considera actualisar le plus tosto possibile!
       subject: Actualisationes critic de Mastodon es disponibile pro %{instance}!
     new_pending_account:
-      body: Le detalios del nove conto es infra.
+      body: Le detalios del nove conto es infra. Tu pote approbar o refusar iste demanda.
       subject: Nove conto preste a revider sur %{instance} (%{username})
     new_report:
       body: "%{reporter} ha reportate %{target}"
@@ -1002,30 +1002,30 @@ ia:
       body: Nove versiones de Mastodon ha essite publicate, tu poterea voler actualisar!
       subject: Nove versiones de Mastodon es disponibile pro %{instance}!
     new_trends:
-      body: 'Le sequente elementos besoniar de un recension ante que illos pote esser monstrate publicamente:'
+      body: 'Le sequente entratas require un revision ante que illos pote esser monstrate publicamente:'
       new_trending_links:
-        title: Ligamines de tendentia
+        title: Ligamines in tendentia
       new_trending_statuses:
-        title: Messages de tendentia
+        title: Messages in tendentia
       new_trending_tags:
-        title: Hashtags de tendentia
-      subject: Nove tendentias pro recenser sur %{instance}
+        title: Hashtags in tendentia
+      subject: Nove tendentias a revider sur %{instance}
   aliases:
     add_new: Crear alias
-    created_msg: Create con successo un nove alias. Ora tu pote initiar le motion ab le vetere conto.
-    deleted_msg: Removite con successo le alias. Mover de ille conto a isto non sera plus possibile.
+    created_msg: Le nove alias ha essite create. Ora tu pote initiar le migration desde le conto ancian.
+    deleted_msg: Le alias ha essite removite. Non essera plus possibile migrar de ille conto a iste.
     empty: Tu non ha aliases.
-    hint_html: Si tu desira mover ab un altere conto a isto, ci tu pote crear un alias, que es requirite ante que tu pote continuar con mover sequaces ab le vetere conto a isto. Iste action per se mesme es <strong>innocue e reversibile</strong>. <strong>Le migration de conto es initiate ab le vetere conto</strong>.
+    hint_html: Si tu vole migrar de un altere conto a iste, tu pote crear un alias ci, que es necessari pro poter transferer le sequitores del conto ancian a iste. Iste action per se es <strong>innocue e reversibile</strong>. <strong>Le migration del conto es initiate desde le conto ancian</strong>.
     remove: Disligar alias
   appearance:
     advanced_web_interface: Interfacie web avantiate
-    advanced_web_interface_hint: 'Si tu desira facer uso de tu integre largessa de schermo, le interfacie web avantiate te permitte de configurar plure columnas differente pro vider al mesme tempore tante informationes como tu vole: pagina principal, notificationes, chronogramma federate, ulle numero de listas e hashtags.'
+    advanced_web_interface_hint: 'Si tu vole utilisar tote le largessa de tu schermo, le interfacie web avantiate te permitte configurar multe columnas differente pro vider al mesme tempore tante informationes como tu vole: pagina principal, notificationes, chronologia federate, un numero illimitate de listas e hashtags.'
     animations_and_accessibility: Animationes e accessibilitate
     confirmation_dialogs: Dialogos de confirmation
     discovery: Discoperta
     localization:
       body: Mastodon es traducite per voluntarios.
-      guide_link: https://crowdin.com/project/mastodon
+      guide_link: https://crowdin.com/project/mastodon/ia
       guide_link_text: Totes pote contribuer.
     sensitive_content: Contento sensibile
   application_mailer:
@@ -1033,110 +1033,110 @@ ia:
     salutation: "%{name},"
     settings: 'Cambiar preferentias de e-mail: %{link}'
     unsubscribe: Desubscriber
-    view: 'Vider:'
+    view: 'Visita:'
     view_profile: Vider profilo
     view_status: Vider message
   applications:
     created: Application create con successo
     destroyed: Application delite con successo
-    logout: Clauder le session
-    regenerate_token: Regenerar testimonio de accesso
-    token_regenerated: Testimonio de accesso regenerate con successo
-    warning: Sia multo attente con iste datos. Jammais compartir los con quicunque!
-    your_token: Tu testimonio de accesso
+    logout: Clauder session
+    regenerate_token: Regenerar token de accesso
+    token_regenerated: Le token de accesso ha essite regenerate
+    warning: Sia multo prudente con iste datos. Non comparti los jammais con alcuno!
+    your_token: Tu token de accesso
   auth:
-    apply_for_account: Peter un conto
+    apply_for_account: Requestar un conto
     captcha_confirmation:
       help_html: Si tu ha problemas a solver le CAPTCHA, tu pote contactar nos per %{email} e nos pote assister te.
-      hint_html: Justo un altere cosa! Nos debe confirmar que tu es un human (isto es assi proque nos pote mantener foras le spam!). Solve le CAPTCHA infra e clicca "Continuar".
+      hint_html: Solo un altere cosa! Nos debe confirmar que tu es un humano (de sorta que nos pote mantener le spam foras!). Solve le CAPTCHA infra e clicca sur "Continuar".
       title: Controlo de securitate
     confirmations:
-      awaiting_review: Tu adresse email es confirmate! Le personal de %{domain} ora revide tu registration. Tu recipera un email si illes approba tu conto!
-      awaiting_review_title: Tu registration es revidite
-      clicking_this_link: cliccante iste ligamine
-      login_link: acceder
-      proceed_to_login_html: Ora tu pote continuar a %{login_link}.
-      redirect_to_app_html: Tu deberea haber essite re-dirigite al app <strong>%{app_name}</strong>. Si isto non eveni, tenta %{clicking_this_link} o manualmente retorna al app.
-      registration_complete: Tu registration sur %{domain} es ora complete!
+      awaiting_review: Tu adresse de e-mail es confirmate! Le personal de %{domain} ora revide tu registration. Tu recipera un e-mail si illes approba tu conto!
+      awaiting_review_title: Tu inscription es in curso de revision
+      clicking_this_link: cliccar sur iste ligamine
+      login_link: aperir session
+      proceed_to_login_html: Ora tu pote %{login_link}.
+      redirect_to_app_html: Tu deberea haber essite redirigite al app <strong>%{app_name}</strong>. Si isto non ha evenite, tenta %{clicking_this_link} o retornar manualmente al app.
+      registration_complete: Tu inscription sur %{domain} es ora concludite!
       welcome_title: Benvenite, %{name}!
-      wrong_email_hint: Si ille adresse email non es correcte, tu pote cambiar lo in parametros de conto.
+      wrong_email_hint: Si ille adresse de e-mail non es correcte, tu pote cambiar lo in le parametros del conto.
     delete_account: Deler le conto
-    delete_account_html: Si tu vole a dele tu conto, tu pote <a href="%{path}">continuar ci</a>. Te sera demandate confirmation.
+    delete_account_html: Si tu vole deler tu conto, tu pote <a href="%{path}">facer lo hic</a>. Te essera demandate un confirmation.
     description:
       prefix_invited_by_user: "@%{name} te invita a junger te a iste servitor de Mastodon!"
       prefix_sign_up: Inscribe te sur Mastodon hodie!
-      suffix: Con un conto, tu potera sequer personas, messages de actualisation e excambios de messages con usatores de ulle servitor de Mastodon e plus!
+      suffix: Con un conto, tu potera sequer personas, publicar tu pensatas e excambiar messages con usatores de qualcunque servitor de Mastodon e multo plus!
     didnt_get_confirmation: Non recipeva tu un ligamine de confirmation?
     dont_have_your_security_key: Non ha tu le clave de securitate?
     forgot_password: Contrasigno oblidate?
-    invalid_reset_password_token: Pete un nove.
-    link_to_otp: Insere un codice a duo factores o un codice de recuperation ab tu telephono
+    invalid_reset_password_token: Le token pro reinitialisar le contrasigno non es valide o ha expirate. Per favor requesta un nove.
+    link_to_otp: Insere un codice a duo factores de tu telephono o un codice de recuperation
     link_to_webauth: Usa tu apparato clave de securitate
-    log_in_with: Accede con
-    login: Accede
-    logout: Clauder le session
-    migrate_account: Move a un conto differente
-    migrate_account_html: Si tu vole re-adressar iste conto a un altere, tu pote <a href="%{path}">configurar lo ci</a>.
-    or_log_in_with: O accede con
-    privacy_policy_agreement_html: Io ha legite e acceptar le <a href="<a href="%{privacy_policy_path}" target="_blank">politica de confidentialitate</a>
+    log_in_with: Aperir session con
+    login: Aperir session
+    logout: Clauder session
+    migrate_account: Migrar a un altere conto
+    migrate_account_html: Si tu vole rediriger iste conto a un altere, tu pote <a href="%{path}">configurar lo hic</a>.
+    or_log_in_with: O aperi session con
+    privacy_policy_agreement_html: Io ha legite e accepta le <a href="<a href="%{privacy_policy_path}" target="_blank">politica de confidentialitate</a>
     progress:
-      confirm: Confirma le email
+      confirm: Confirmar e-mail
       details: Tu detalios
       review: Nostre revision
       rules: Accepta le regulas
     providers:
       cas: CAS
       saml: SAML
-    register: Inscribe te
+    register: Inscriber se
     registration_closed: "%{instance} non accepta nove membros"
     resend_confirmation: Reinviar ligamine de confirmation
-    reset_password: Remontar le contrasigno
+    reset_password: Reinitialisar contrasigno
     rules:
       accept: Acceptar
       back: Retro
       invited_by: 'Tu pote junger te a %{domain} gratias al invitation que tu ha recipite de:'
-      preamble: Illos es predefinite e fortiarte per le moderatores de %{domain}.
-      preamble_invited: Ante que tu continua, considera le regulas base definite per le moderatores de %{domain}.
-      title: Alcun regulas base.
+      preamble: Istes es definite e applicate per le moderatores de %{domain}.
+      preamble_invited: Ante que tu continua, considera le regulas de base definite per le moderatores de %{domain}.
+      title: Alcun regulas de base.
       title_invited: Tu ha essite invitate.
     security: Securitate
     set_new_password: Definir un nove contrasigno
     setup:
-      email_below_hint_html: Verifica tu plica de spam, o pete un altero. Tu pote corriger tu adresse email si illo es errate.
-      email_settings_hint_html: Clicca le ligamine que nos te inviava pro verificar %{email}.
-      link_not_received: Non obteneva tu un ligamine?
-      new_confirmation_instructions_sent: Tu recipera un nove email con le ligamine de confirmation in alcun minutas!
-      title: Verifica tu cassa de ingresso
+      email_below_hint_html: Consulta tu dossier de spam, o requesta un altere. Tu pote corriger tu adresse de e-mail si illo es errate.
+      email_settings_hint_html: Clicca sur le ligamine que nos te ha inviate pro verificar %{email}. Nos te attendera hic.
+      link_not_received: Necun ligamine recipite?
+      new_confirmation_instructions_sent: Tu recipera un nove e-mail con le ligamine de confirmation in poc minutas!
+      title: Consulta tu cassa de entrata
     sign_in:
-      preamble_html: Accede con tu <strong>%{domain}</strong> credentiales. Si tu conto es hospite sur un differente servitor, tu non potera authenticar te ci.
-      title: Acceder a %{domain}
+      preamble_html: Aperi session con tu credentiales de <strong>%{domain}</strong>. Si tu conto es albergate sur un altere servitor, tu non potera aperir session hic.
+      title: Aperir session sur %{domain}
     sign_up:
-      manual_review: Le inscriptiones sur %{domain} passa per revision manual de nostre moderatores. Pro adjutar nos a processar tu registration, scribe un poco re te mesme e perque tu vole un conto sur %{domain}.
-      preamble: Con un conto sur iste servitor de Mastodon, tu potera sequer ulle altere persona in rete, sin reguardo de ubi lor conto es hospite.
-      title: Lassa que nos te configura sur %{domain}.
+      manual_review: Le inscriptiones sur %{domain} passa per un revision manual de nostre moderatores. Pro adjutar nos a processar tu inscription, per favor scribe un poco sur te e explica proque tu vole un conto sur %{domain}.
+      preamble: Con un conto sur iste servitor de Mastodon, tu potera sequer qualcunque altere persona sur le rete, independentemente de ubi su conto es albergate.
+      title: Lassa nos installar tu conto sur %{domain}.
     status:
       account_status: Stato del conto
-      confirming: Attendente esser completate email de confirmation.
-      functional: Tu conto es plenmente operative.
-      pending: Tu application es pendente de revision per nostre personal. Isto pote prender alcun tempore. Tu recipera un email si tu application es approbate.
-      redirecting_to: Tu conto es inactive perque illo es actualmente re-adressa a %{acct}.
-      self_destruct: Dum %{domain} va clauder, tu solo habera accesso limitate a tu conto.
-      view_strikes: Examinar le admonitiones passate contra tu conto
-    too_fast: Formulario inviate troppo velocemente, retenta.
+      confirming: Attendente le termination del confirmation del adresse de e-mail.
+      functional: Tu conto es completemente operative.
+      pending: Tu demanda attende le revision per nostre personal. Isto pote prender alcun tempore. Tu recipera un e-mail si tu demanda es approbate.
+      redirecting_to: Tu conto es inactive perque illo actualmente redirige a %{acct}.
+      self_destruct: Perque %{domain} va clauder, tu solo habera accesso limitate a tu conto.
+      view_strikes: Examinar le sanctiones passate contra tu conto
+    too_fast: Formulario inviate troppo rapidemente. Tenta lo de novo.
     use_security_key: Usar clave de securitate
   challenge:
     confirm: Continuar
-    hint_html: "<strong>Consilio:</strong> Nos non te demandara tu contrasigno ancora pro le proxime hora."
+    hint_html: "<strong>Consilio:</strong> Nos non te demandara tu contrasigno de novo in le proxime hora."
     invalid_password: Contrasigno non valide
     prompt: Confirma le contrasigno pro continuar
   crypto:
     errors:
       invalid_key: non es un clave Ed25519 o Curve25519 valide
-      invalid_signature: non es un valide firma Ed25519
+      invalid_signature: non es un signatura Ed25519 valide
   date:
     formats:
-      default: "%b %d, %Y"
-      with_month_name: "%B %d, %Y"
+      default: "%d %b %Y"
+      with_month_name: "%d de %B %Y"
   datetime:
     distance_in_words:
       about_x_hours: "%{count}h"
@@ -1144,44 +1144,44 @@ ia:
       about_x_years: "%{count}a"
       almost_x_years: "%{count}a"
       half_a_minute: Justo ora
-      less_than_x_minutes: "%{count} m"
+      less_than_x_minutes: "%{count}m"
       less_than_x_seconds: Justo ora
       over_x_years: "%{count}a"
       x_days: "%{count}d"
-      x_minutes: "%{count} m"
+      x_minutes: "%{count}m"
       x_months: "%{count}me"
       x_seconds: "%{count}s"
   deletes:
-    challenge_not_passed: Le informationes que tu ha inserite non era correcte
+    challenge_not_passed: Le informationes que tu ha inserite non es correcte
     confirm_password: Insere tu contrasigno actual pro verificar tu identitate
-    confirm_username: Insere tu actual contrasigno pro verificar tu identitate
+    confirm_username: Insere tu nomine de usator pro confirmar le procedura
     proceed: Deler le conto
-    success_msg: Tu conto esseva delite con successo
+    success_msg: Tu conto ha essite delite
     warning:
-      before: 'Insere tu nomine de usator pro confirmar le procedura:'
-      caches: Contente que ha essite in cache per altere servitores pote persister
+      before: 'Ante de continuar, per favor lege attentemente iste notas:'
+      caches: Le contento que altere servitores ha immagazinate in cache pote persister
       data_removal: Tu messages e altere datos essera removite permanentemente
       email_change_html: Tu pote <a href="%{path}">cambiar tu adresse de e-mail</a> sin deler tu conto
-      email_contact_html: Si illo ancora non arriva, tu pote inviar email a <a href="mailto:%{email}">%{email}</a> pro peter adjuta
-      email_reconfirmation_html: Si tu non recipe le email de confirmation, tu pote <a href="%{path}>requirer lo ancora</a>
+      email_contact_html: Si illo ancora non arriva, tu pote inviar e-mail a <a href="mailto:%{email}">%{email}</a> pro peter adjuta
+      email_reconfirmation_html: Si tu non recipe le e-mail de confirmation, tu pote <a href="%{path}>requestar lo de novo</a>
       irreversible: Tu non potera restaurar o reactivar tu conto
-      more_details_html: Pro altere detalios, vide le <a href="%{terms_path}">politica de confidentialitate</a>.
+      more_details_html: Pro plus detalios, vide le <a href="%{terms_path}">politica de confidentialitate</a>.
       username_available: Tu nomine de usator essera disponibile novemente
       username_unavailable: Tu nomine de usator remanera indisponibile
   disputes:
     strikes:
-      action_taken: Action prendite
-      appeal: Facer appello
-      appeal_approved: Iste admonition ha essite annullate in appello e non es plus valide
+      action_taken: Mesura prendite
+      appeal: Appellar
+      appeal_approved: Iste sanction ha essite annullate in appello e non es plus valide
       appeal_rejected: Le appello ha essite rejectate
       appeal_submitted_at: Appello submittite
       appealed_msg: Tu appello ha essite submittite. Si es approbate, tu recipera notification.
       appeals:
         submit: Submitter appello
       approve_appeal: Approbar apello
-      associated_report: Signalation associate
+      associated_report: Le reporto associate
       created_at: Del data
-      description_html: Istes es le actiones prendite contra tu conto e le advertimentos que te ha essite inviate per le personal de %{instance}.
+      description_html: Istes es le mesuras prendite contra tu conto e le advertimentos que te ha essite inviate per le personal de %{instance}.
       recipient: Adressate a
       reject_appeal: Rejectar appello
       status: Message №%{id}
@@ -1202,23 +1202,23 @@ ia:
     invalid_domain: non es un nomine de dominio valide
   edit_profile:
     basic_information: Information basic
-    hint_html: "<strong>Personalisa lo que le personas vide sur tu profilo public e presso tu messages.</strong> Il es plus probabile que altere personas te seque e interage con te quando tu ha un profilo compilate e un photo de profilo."
+    hint_html: "<strong>Personalisa lo que le personas vide sur tu profilo public e presso tu messages.</strong> Il es plus probabile que altere personas te seque e interage con te quando tu ha un profilo complete e un photo."
     other: Alteres
   errors:
-    '400': Le requesta que tu inviava era non valide o mal formate.
-    '403': Tu non ha le permisso pro acceder a iste pagina.
+    '400': Le requesta que tu ha inviate non es valide o es mal formate.
+    '403': Tu non ha le permission de acceder a iste pagina.
     '404': Le pagina que tu cerca non es ci.
-    '406': Iste pagina non es disponibile in le formato requirite.
+    '406': Iste pagina non es disponibile in le formato demandate.
     '410': Le pagina que tu cercava non plus existe ci.
     '422':
       content: Le verification de securitate ha fallite. Bloca tu le cookies?
       title: Falleva le verification de securitate
-    '429': Troppe requestas
+    '429': Troppo de requestas
     '500':
-      content: Nos lo regretta, ma alco errate eveniva sur nostre extremo.
+      content: Nos lo regretta, ma qualcosa non ha functionate de nostre latere.
       title: Iste pagina non es correcte
-    '503': Le pagina non poteva esser servite per un panna de servitor temporari.
-    noscript_html: A usar le application web Mastodon, activa JavaScript. In alternativa, tenta un del <a href="%{apps_path}">apps native</a> de Mastodon pro tu platteforma.
+    '503': Le pagina non poteva esser servite a causa de un panna temporari del servitor.
+    noscript_html: Pro usar le application web Mastodon, es necessari activar JavaScript. Tu pote tamben probar un del <a href="%{apps_path}">apps native</a> de Mastodon pro tu platteforma.
   existing_username_validator:
     not_found: impossibile trovar un usator local con ille nomine de usator
     not_found_multiple: non poteva trovar %{usernames}
@@ -1226,9 +1226,9 @@ ia:
     archive_takeout:
       date: Data
       download: Discargar tu archivo
-      hint_html: Tu pote requirer un archivo de tu <strong>messages e medios cargate</strong>. Le datos exportate sera in le formato ActivityPub, legibile per ulle software conforme.
+      hint_html: Tu pote requestar un archivo de tu <strong>messages e files multimedial incargate</strong>. Le datos exportate essera in le formato ActivityPub, legibile per qualcunque software conforme. Tu pote requestar un archivo cata 7 dies.
       in_progress: Compilante tu archivo...
-      request: Pete tu archivo
+      request: Requestar tu archivo
       size: Dimension
     blocks: Tu ha blocate
     bookmarks: Marcapaginas
@@ -1236,16 +1236,16 @@ ia:
     domain_blocks: Blocadas de dominio
     lists: Listas
     mutes: Tu ha silentiate
-    storage: Immagazinage de medios
+    storage: Immagazinage multimedial
   featured_tags:
     add_new: Adder nove
     errors:
-      limit: Tu ha jam consiliate le maxime numero de hashtags
-    hint_html: "<strong>Consilia tu plus importante hashtags sur tu profilo.</strong> Un grande instrumento pro tener tracia de tu labores creative e projectos de longe-tempore, le hashtags consiliate es monstrate prominentemente sur tu profilo e permitte accesso rapide a tu proprie messages."
+      limit: Tu ha jam mittite in evidentia le maxime numero de hashtags
+    hint_html: "<strong>Monstra tu plus importante hashtags sur tu profilo.</strong> Un excellente instrumento pro tener tracia de tu labores creative e projectos de longe termino, le hashtags que tu mitte in evidentia appare prominentemente sur tu profilo e permitte le accesso rapide a tu proprie messages."
   filters:
     contexts:
       account: Profilos
-      home: Pagina de initio e listas
+      home: Initio e listas
       notifications: Notificationes
       public: Chronologias public
       thread: Conversationes
@@ -1253,11 +1253,11 @@ ia:
       add_keyword: Adder parola clave
       keywords: Parolas clave
       statuses: Messages individual
-      statuses_hint_html: Iste filtro se applica a seliger messages singule sin reguardo si illes concorda le parolas clave infra. <a href="%{path}">Revide o remove le messages ab le filtro</a>.
+      statuses_hint_html: Iste filtro se applica a un selection de messages individual, independentemente de si illos corresponde al parolas clave infra. <a href="%{path}">Revide o remove messages del filtro</a>.
       title: Modificar filtro
     errors:
-      deprecated_api_multiple_keywords: Iste parametros non pote esser cambiate ab iste application perque illos se applica a plus que un sol parola clave del filtro. Usa un application plus recente o le interfacie web.
-      invalid_context: Nulle o non valide contexto supplite
+      deprecated_api_multiple_keywords: Iste parametros non pote esser cambiate desde iste application perque illos se applica a plus de un parola clave del filtro. Usa un application plus recente o le interfacie web.
+      invalid_context: Contexto mancante o non valide
     index:
       contexts: Filtros in %{contexts}
       delete: Deler
@@ -1271,8 +1271,8 @@ ia:
         one: "%{count} message"
         other: "%{count} messages"
       statuses_long:
-        one: "%{count} singule message celate"
-        other: "%{count} singule messages celate"
+        one: "%{count} message individual celate"
+        other: "%{count} messages individual celate"
       title: Filtros
     new:
       save: Salveguardar nove filtro
@@ -1280,9 +1280,9 @@ ia:
     statuses:
       back_to_filter: Retro al filtro
       batch:
-        remove: Remover ab filtro
+        remove: Remover del filtro
       index:
-        hint: Iste filtro se applica pro seliger messages singule sin reguardo de altere criterios. Tu pote adder altere messages a iste filtro ab le interfacie web.
+        hint: Iste filtro se applica a un selection de messages individual, independentemente de altere criterios. Tu pote adder plus messages a iste filtro desde le interfacie web.
         title: Messages filtrate
   generic:
     all: Toto
@@ -1290,53 +1290,53 @@ ia:
       one: "<strong>%{count}</strong> elemento sur iste pagina es seligite."
       other: Tote le <strong>%{count}</strong> elementos sur iste pagina es seligite.
     all_matching_items_selected_html:
-      one: "<strong>%{count}</strong> elemento concordante que tu cerca es seligite."
-      other: Tote le <strong>%{count}</strong> elementos concordante que tu cerca es seligite.
+      one: "<strong>%{count}</strong> elemento correspondente al recerca es seligite."
+      other: Tote le <strong>%{count}</strong> elementos correspondente al recerca es seligite.
     cancel: Cancellar
     changes_saved_msg: Cambios salveguardate con successo!
     confirm: Confirmar
     copy: Copiar
     delete: Deler
     deselect: Deseliger toto
-    none: Nemo
+    none: Necun
     order_by: Ordinar per
     save_changes: Salvar le cambios
     select_all_matching_items:
-      one: Selige %{count} elemento concordante tu recerca.
-      other: Selige %{count} elementos concordante tu recerca.
+      one: Selige %{count} elemento correspondente a tu recerca.
+      other: Selige %{count} elementos correspondente a tu recerca.
     today: hodie
     validation_errors:
-      one: Alco non es multo bon ancora! Controla le error infra
-      other: Alco non es multo bon ancora! Controla %{count} errores infra
+      one: Qualcosa ancora non es multo bon! Per favor controla le error infra
+      other: Qualcosa ancora non es multo bon! Per favor controla le %{count} errores infra
   imports:
     errors:
       empty: File CSV vacue
       incompatible_type: Incompatibile con le typo de importation seligite
       invalid_csv_file: 'File CSV non valide. Error: %{error}'
-      over_rows_processing_limit: contine plus que %{count} rangos
-      too_large: Le file es troppo longe
+      over_rows_processing_limit: contine plus de %{count} lineas
+      too_large: Le file es troppo grande
     failures: Fallimentos
     imported: Importate
-    mismatched_types_warning: Il appare que tu pote haber seligite le typo errate pro iste importation, controla duo vices.
+    mismatched_types_warning: Il pare que tu pote haber seligite le typo errate pro iste importation. Per favor reverifica lo.
     modes:
-      merge: Funder
-      merge_long: Mantene le registrationes existente e adde illos nove
+      merge: Fusionar
+      merge_long: Conservar le registros existente e adder noves
       overwrite: Superscriber
       overwrite_long: Reimplaciar registros actual con le noves
     overwrite_preambles:
       blocking_html: Tu es sur le puncto de <strong>reimplaciar tu lista de blocadas</strong> per usque a <strong>%{total_items} contos</strong> proveniente de <strong>%{filename}</strong>.
-      bookmarks_html: Tu va <strong>reimplaciar tu lista de blocadas</strong> per usque a <strong>%{total_items} contos</strong> proveniente de <strong>%{filename}</strong>.
+      bookmarks_html: Tu es sur le puncto de <strong>reimplaciar tu marcapaginas</strong> per usque a <strong>%{total_items} messages</strong> desde <strong>%{filename}</strong>.
       domain_blocking_html: Tu es sur le puncto de <strong>reimplaciar tu lista de blocadas de dominio</strong> per usque a <strong>%{total_items} dominios</strong> proveniente de <strong>%{filename}</strong>.
-      following_html: Tu va <strong>sequer</strong> usque <strong>%{total_items} contos</strong> de <strong>%{filename}</strong> e <strong>cessar de sequer ulle altere</strong>.
-      lists_html: Tu va <strong>reimplaciar tu lista</strong> con contentos de <strong>%{filename}</strong>. Usque <strong>%{total_items} contos</strong> sera addite a nove listas.
-      muting_html: Tu va <strong>reimplaciar tu lista de contos silentiate</strong> con usque <strong>%{total_items} contos</strong> ab <strong>%{filename}</strong>.
+      following_html: Tu es sur le puncto de <strong>sequer</strong> usque a <strong>%{total_items} contos</strong> de <strong>%{filename}</strong> e <strong>cessar de sequer tote le alteres</strong>.
+      lists_html: Tu es sur le puncto de <strong>reimplaciar tu listas</strong> per le contento de <strong>%{filename}</strong>. Usque a <strong>%{total_items} contos</strong> essera addite a nove listas.
+      muting_html: Tu es sur le puncto de <strong>reimplaciar tu lista de contos silentiate</strong> con usque a <strong>%{total_items} contos</strong> desde <strong>%{filename}</strong>.
     preambles:
       blocking_html: Tu es sur le puncto de <strong>blocar</strong> usque a <strong>%{total_items} contos</strong> a partir de <strong>%{filename}</strong>.
-      bookmarks_html: Tu va adder usque <strong>%{total_items} messages</strong> de <strong>%{filename}</strong> a tu <strong>marcapaginas</strong>.
+      bookmarks_html: Tu es sur le puncto de adder usque a <strong>%{total_items} messages</strong> desde <strong>%{filename}</strong> a tu <strong>marcapaginas</strong>.
       domain_blocking_html: Tu es sur le puncto de <strong>blocar</strong> usque a <strong>%{total_items} dominios</strong> a partir de <strong>%{filename}</strong>.
-      following_html: Tu va <strong>blocar</strong> usque a <strong>%{total_items} dominios</strong> ab <strong>%{filename}</strong>.
-      lists_html: Tu va adder usque <strong>%{total_items} contos</strong> ab <strong>%{filename}</strong> a tu <strong>lista</strong>. Nove listas sera create si il non ha lista a adder.
-      muting_html: Tu va <strong>silentiar</strong> usque <strong>%{total_items} contos</strong> ab <strong>%{filename}</strong>.
+      following_html: Tu es sur le puncto de <strong>sequer</strong> usque a <strong>%{total_items} contos</strong> desde <strong>%{filename}</strong>.
+      lists_html: Tu es sur le puncto de adder usque <strong>%{total_items} contos</strong> desde <strong>%{filename}</strong> a tu <strong>listas</strong>. Nove listas essera create si il non ha un lista al qual adder los.
+      muting_html: Tu es sur le puncto de <strong>silentiar</strong> usque a <strong>%{total_items} contos</strong> desde <strong>%{filename}</strong>.
     preface: Tu pote importar datos que tu ha exportate de un altere servitor, como un lista de personas que tu seque o bloca.
     recent_imports: Importationes recente
     states:
@@ -1345,7 +1345,7 @@ ia:
       scheduled: Planificate
       unconfirmed: Non confirmate
     status: Stato
-    success: Tu datos era cargate con successo e sera processate in tempore debite
+    success: Tu datos ha essite correctemente incargate e essera tractate in tempore debite
     time_started: Initiate le
     titles:
       blocking: Importation de contos blocate
@@ -1362,9 +1362,9 @@ ia:
       blocking: Lista de blocadas
       bookmarks: Marcapaginas
       domain_blocking: Lista de dominios blocate
-      following: Sequente lista
+      following: Lista de contos sequite
       lists: Listas
-      muting: Lista del silentiates
+      muting: Lista de contos silentiate
     upload: Incargar
   invites:
     delete: Disactivar
@@ -1399,10 +1399,10 @@ ia:
       sign_in_token: codice de securitate de e-mail
       webauthn: claves de securitate
     description_html: Si tu vide activitate que tu non recognosce, considera de cambiar tu contrasigno e activar le authentication a duo factores.
-    empty: Nulle chronologia de authentication disponibile
+    empty: Nulle historia de authentication disponibile
     failed_sign_in_html: Tentativa de authentication fallite con %{method} ab %{ip} (%{browser})
-    successful_sign_in_html: Apertura de session con successo con %{method} ab %{ip} (%{browser})
-    title: Chronologia de authentication
+    successful_sign_in_html: Apertura de session succedite con %{method} desde %{ip} (%{browser})
+    title: Historia de authentication
   mail_subscriptions:
     unsubscribe:
       action: Si, desubscriber
@@ -1421,127 +1421,127 @@ ia:
   media_attachments:
     validations:
       images_and_video: Impossibile annexar un video a un message que jam contine imagines
-      not_ready: Impossibile annexar un video a un message que jam contine imagines. Retenta post un momento!
-      too_many: Impossibile annexar plus que 4 files
+      not_ready: Impossibile annexar files que non ha ancora essite processate. Retenta post un momento!
+      too_many: Impossibile annexar plus de 4 files
   migrations:
-    acct: Movite a
+    acct: Ha migrate a
     cancel: Cancellar redirection
-    cancel_explanation: Cancellar le redirection reactivara tu conto actual, ma non reportara sequaces que ha essite movite in ille conto.
+    cancel_explanation: Cancellar le redirection reactivara tu conto actual, ma non te retornara le sequitores que ha essite transferite al altere conto.
     cancelled_msg: Redirection cancellate con successo.
     errors:
-      already_moved: is the same account you have already moved to
+      already_moved: es le mesme conto al qual tu ha ja migrate
       missing_also_known_as: non es un alias de iste conto
       move_to_self: non pote esser le conto actual
-      not_found: non poterea esser trovate
+      not_found: non poteva esser trovate
       on_cooldown: Tu es in pausa
-    followers_count: Sequaces a tempore de mover
-    incoming_migrations: Movente ab un conto differente
-    incoming_migrations_html: Pro mover ab un altere conto a isto, primo tu debe <a href="%{path}">crear un alias de conto</a>.
-    moved_msg: Tu conto ora es redirigite a %{acct} e tu sequaces es movite super.
-    not_redirecting: Tu conto actualmente non es redirigite a ulle altere conto.
-    on_cooldown: Tu recentemente ha migrate tu conto. Iste function de novo sera disponibile in %{count} dies.
+    followers_count: Sequitores al momento de migration
+    incoming_migrations: Migrar de un altere conto
+    incoming_migrations_html: Pro migrar de un altere conto a iste, primo tu debe <a href="%{path}">crear un alias de conto</a>.
+    moved_msg: Tu conto es ora redirigite a %{acct} e le transferentia de tu sequitores es in curso.
+    not_redirecting: Tu conto actualmente non es redirigite a un altere conto.
+    on_cooldown: Tu ha recentemente migrate tu conto. Iste function essera disponibile de novo in %{count} dies.
     past_migrations: Migrationes passate
-    proceed_with_move: Mover sequaces
+    proceed_with_move: Transferer sequitores
     redirected_msg: Tu conto es ora redirigite a %{acct}.
     redirecting_to: Tu conto es redirigite a %{acct}.
-    set_redirect: Predefinir redirection
+    set_redirect: Definir redirection
     warning:
-      backreference_required: Le nove conto debe primo esser configurate pro referer se a isto
-      before: 'Ante de continuar, lege iste notas accuratemente:'
-      cooldown: Post le movimento il ha un periodo de pausa durante le qual tu non potera mover te ancora
-      disabled_account: Tu conto actual non sera plenmente usabile postea. Comocunque, tu habera accesso a exportation de datos e re-activation.
-      followers: Iste action movera tote le sequaces ab le conto actual al nove conto
-      only_redirect_html: In alternativa, tu pote <a href="%{path}">solo superponer un redirection sur tu profilo</a>.
-      other_data: Nulle altere datos sera movite automaticamente
-      redirect: Le profilo de tu conto actual sera actualisate con un aviso de redirection e sera excludite de recercas
+      backreference_required: Le nove conto debe primo esser configurate pro referer se a iste
+      before: 'Ante de continuar, lege attentemente iste notas:'
+      cooldown: Post le migration il ha un periodo de pausa durante le qual tu non potera migrar de novo
+      disabled_account: Tu conto actual non essera plenmente usabile postea. Nonobstante, tu habera accesso al exportation de datos e al reactivation.
+      followers: Iste action transferera tote le sequitores del conto actual al conto nove
+      only_redirect_html: Como alternativa, tu pote <a href="%{path}">poner solmente un redirection sur tu profilo</a>.
+      other_data: Nulle altere datos essera migrate automaticamente
+      redirect: Le profilo de tu conto actual essera actualisate con un aviso de redirection e excludite de recercas
   moderation:
     title: Moderation
   move_handler:
     carry_blocks_over_text: Iste usator ha cambiate de conto desde %{acct}, que tu habeva blocate.
-    carry_mutes_over_text: Iste usator moveva ab %{acct}, que tu habeva silentiate.
-    copy_account_note_text: 'Iste usator moveva ab %{acct}, ci era tu previe notas re ille:'
+    carry_mutes_over_text: Iste usator ha migrate de %{acct}, que tu habeva silentiate.
+    copy_account_note_text: 'Iste usator ha migrate de %{acct}, ecce tu previe notas sur iste persona:'
   navigation:
-    toggle_menu: Mutar menu
+    toggle_menu: Commutar menu
   notification_mailer:
     admin:
       report:
-        subject: "%{name} inviava un reporto"
+        subject: "%{name} ha inviate un reporto"
       sign_up:
         subject: "%{name} se ha inscribite"
     favourite:
-      body: 'Tu message era favorite per %{name}:'
-      subject: "%{name} favoriva tu message"
-      title: Nove preferito
+      body: 'Tu message ha essite marcate como favorite per %{name}:'
+      subject: "%{name} ha marcate tu message como favorite"
+      title: Nove favorite
     follow:
       body: "%{name} ora te seque!"
       subject: "%{name} ora te seque"
       title: Nove sequitor
     follow_request:
-      action: Gere requestas de sequer
+      action: Gerer requestas de sequimento
       body: "%{name} ha demandate de sequer te"
-      subject: 'Sequace pendente: %{name}'
+      subject: 'Sequitor pendente: %{name}'
       title: Nove requesta de sequimento
     mention:
       action: Responder
-      body: 'Tu era mentionate per %{name} in:'
-      subject: Tu ha essite mentionate per %{name}
+      body: "%{name} te ha mentionate in:"
+      subject: "%{name} te ha mentionate"
       title: Nove mention
     poll:
-      subject: Un inquesta de %{name} ha finite
+      subject: Un sondage de %{name} ha finite
     reblog:
-      body: 'Tu message ha essite impulsate per %{name}:'
+      body: "%{name} ha impulsate tu message:"
       subject: "%{name} ha impulsate tu message"
       title: Nove impulso
     status:
-      subject: "%{name} justo ha publicate"
+      subject: "%{name} ha publicate un message"
     update:
       subject: "%{name} ha modificate un message"
   notifications:
-    administration_emails: Avisos de email per administrator
-    email_events: Eventos pro avisos de email
-    email_events_hint: 'Selige eventos pro que tu vole reciper avisos:'
+    administration_emails: Notificationes per e-mail pro administratores
+    email_events: Eventos pro notificationes per e-mail
+    email_events_hint: 'Selige eventos pro le quales tu vole reciper notificationes:'
   number:
     human:
       decimal_units:
-        format: "%n%u"
+        format: "%n %u"
         units:
-          billion: B
-          million: M
-          quadrillion: Q
-          thousand: K
-          trillion: T
+          billion: mld
+          million: mln
+          quadrillion: bld
+          thousand: mil
+          trillion: bln
   otp_authentication:
     code_hint: Insere le codice generate per tu app de authentication pro confirmar
-    description_html: Si tu activa <strong>le authentication a duo factores</strong> per un app de authentication, le authentication requirera que tu es in possession de tu telephono, que generara testimonios pro facer te entrar.
+    description_html: Si tu activa <strong>le authentication a duo factores</strong> usante un app de authentication, le authentication requirera que tu es in possession de tu telephono, que generara tokens que tu debera inserer.
     enable: Activar
-    instructions_html: "<strong>Scande iste codice QR in Google Authenticator o un simile app TOTP sur tu telephono</strong>. Desde ora in avante, ille app generara testimonios que tu debera inserer quando tu te authenticara."
-    manual_instructions: 'Si tu non pote scander le codice QR e besonia de inserer lo manualmente, ecce le texto-simple secrete:'
+    instructions_html: "<strong>Scanna iste codice QR in Google Authenticator o un app TOTP simile sur tu telephono</strong>. Desde ora in avante, ille app generara tokens que tu debera inserer quando tu aperi session."
+    manual_instructions: 'Si tu non pote scannar le codice QR e debe inserer lo manualmente, ecce le secreto in texto simple:'
     setup: Configurar
-    wrong_code: Le codice inserite non era valide! Es tempore de servitor e tempore de apparato correcte?
+    wrong_code: Le codice inserite non es valide! Es le hora del servitor e del apparato correcte?
   pagination:
-    newer: Plus recente
+    newer: Plus nove
     next: Sequente
-    older: Plus vetere
+    older: Plus ancian
     prev: Previe
     truncate: "&hellip;"
   polls:
     errors:
       already_voted: Tu jam ha votate in iste sondage
       duplicate_options: contine elementos duplicate
-      duration_too_long: il es troppo lontan in le futuro
-      duration_too_short: il es troppo tosto
+      duration_too_long: es troppo lontan in le futuro
+      duration_too_short: es troppo tosto
       expired: Le sondage ha jam finite
       invalid_choice: Le option de voto eligite non existe
       over_character_limit: non pote esser plus longe que %{max} characteres cata un
-      self_vote: Tu non pote vota in tu proprie sondages
-      too_few_options: debe haber plus que un elemento
-      too_many_options: non pote continer plus que %{max} elementos
+      self_vote: Tu non pote votar in tu proprie sondages
+      too_few_options: debe haber plus de un elemento
+      too_many_options: non pote continer plus de %{max} elementos
   preferences:
-    other: Altere
-    posting_defaults: Publicationes predefinite
+    other: Alteres
+    posting_defaults: Parametros de publication predefinite
     public_timelines: Chronologias public
   privacy:
-    hint_html: "<strong>Personalisa como tu vole que tu profilo e tu messages a es trovate.</strong> Un varietate de functiones in Mastodon pote adjutar te attinger un plus large auditorio si activate. Prende un momento pro revider iste parametros pro assecurar te que illos se adapta a tu caso de uso."
+    hint_html: "<strong>Personalisa como tu vole que tu profilo e tu messages es trovate.</strong> Un varietate de functiones in Mastodon pote adjutar te a attinger un plus grande publico quando activate. Prende un momento pro revider iste parametros pro assecurar te que illos se adapta a tu besonios."
     privacy: Confidentialitate
     privacy_hint_html: Controla quanto tu vole divulgar pro le beneficio de alteres. Le gente discoperi profilos e applicationes interessante percurrente le profilos sequite per altere personas e vidente a partir de qual applicationes illos publica lor messages, ma tu pote preferer de mantener tal information private.
     reach: Portata
@@ -1554,47 +1554,47 @@ ia:
   reactions:
     errors:
       limit_reached: Limite de reactiones differente attingite
-      unrecognized_emoji: non es un emoticone recognoscite
+      unrecognized_emoji: non es un emoji recognoscite
   redirects:
-    prompt: Si tu te fide de iste ligamine, clicca lo pro continuar.
+    prompt: Si tu te fide a iste ligamine, clicca sur illo pro continuar.
     title: Tu va lassar %{instance}.
   relationships:
     activity: Activitate del conto
-    confirm_follow_selected_followers: Desira tu vermente remover le sequaces seligite?
-    confirm_remove_selected_followers: Desira tu vermente remover le sequaces seligite?
-    confirm_remove_selected_follows: Desira tu vermente remover le sequaces seligite?
+    confirm_follow_selected_followers: Es tu secur que tu vole sequer le sequitores seligite?
+    confirm_remove_selected_followers: Es tu secur que tu vole remover le sequitores seligite?
+    confirm_remove_selected_follows: Es tu secur que tu vole cessar de sequer le contos seligite?
     dormant: Dormiente
-    follow_failure: Impossibile sequer alcun del contos seligite.
-    follow_selected_followers: Sequer le sequaces seligite
-    followers: Sequaces
+    follow_failure: Impossibile sequer alcunes del contos seligite.
+    follow_selected_followers: Sequer le sequitores seligite
+    followers: Sequitores
     following: Sequente
     invited: Invitate
-    last_active: Ultimo active
+    last_active: Ultime activitate
     most_recent: Plus recente
-    moved: Movite
+    moved: Migrate
     mutual: Mutue
     primary: Primari
     relationship: Relation
-    remove_selected_domains: Remover tote le sequaces ab le dominios seligite
-    remove_selected_followers: Remover le sequaces seligite
+    remove_selected_domains: Remover tote le sequitores del dominios seligite
+    remove_selected_followers: Remover le sequitores seligite
     remove_selected_follows: Non plus sequer le usatores seligite
     status: Stato del conto
   remote_follow:
-    missing_resource: Impossibile trovar le requirite re-adresse URL pro tu conto
+    missing_resource: Impossibile trovar le URL de redirection requirite pro tu conto
   reports:
     errors:
-      invalid_rules: non referentia regulas valide
+      invalid_rules: non face referentia a regulas valide
   rss:
     content_warning: 'Advertimento de contento:'
     descriptions:
       account: Messages public de @%{acct}
-      tag: 'Messages public plachettate #%{hashtag}'
+      tag: 'Messages public con hashtag #%{hashtag}'
   scheduled_statuses:
     over_daily_limit: Tu ha excedite le limite de %{limit} messages programmate pro hodie
     over_total_limit: Tu ha excedite le limite de %{limit} messages programmate
     too_soon: Le data programmate debe esser in le futuro
   self_destruct:
-    lead_html: Infortunatemente, <strong>%{domain}</strong> va clauder permanentemente. Si tu habeva un conto illac, tu non potera continuar a usar lo, ma tu pote ancora peter un salveguarda de tu datos.
+    lead_html: Infortunatemente, <strong>%{domain}</strong> tosto claudera permanentemente. Si tu habeva un conto illac, tu non potera continuar a usar lo, ma tu pote ancora requestar un copia de tu datos.
     title: Iste servitor va clauder
   sessions:
     activity: Ultime activitate
@@ -1617,12 +1617,12 @@ ia:
       qq: QQ Browser
       safari: Safari
       uc_browser: UC Browser
-      unknown_browser: Navigator Incognite
+      unknown_browser: Navigator incognite
       weibo: Weibo
     current_session: Session actual
     date: Data
     description: "%{browser} sur %{platform}"
-    explanation: Il ha navigatores del web actualmente connexe a tu conto Mastodon.
+    explanation: Istes es le navigatores web actualmente in session sur tu conto Mastodon.
     ip: IP
     platforms:
       adobe_air: Adobe Air
@@ -1641,29 +1641,29 @@ ia:
     revoke: Revocar
     revoke_success: Session revocate con successo
     title: Sessiones
-    view_authentication_history: Vider chronologia de authentication de tu conto
+    view_authentication_history: Vider le historia de authentication de tu conto
   settings:
     account: Conto
     account_settings: Parametros de conto
     aliases: Aliases de conto
     appearance: Apparentia
     authorized_apps: Apps autorisate
-    back: Tornar a Mastodon
+    back: Retornar a Mastodon
     delete: Deletion de conto
     development: Disveloppamento
     edit_profile: Modificar profilo
     export: Exportation de datos
-    featured_tags: Hashtags eminente
+    featured_tags: Hashtags in evidentia
     import: Importar
     import_and_export: Importar e exportar
     migrate: Migration de conto
-    notifications: Notificationes de e-mail
+    notifications: Notificationes per e-mail
     preferences: Preferentias
     profile: Profilo public
     relationships: Sequites e sequitores
     severed_relationships: Relationes rupte
     statuses_cleanup: Deletion de message automatic
-    strikes: Admonitiones de moderation
+    strikes: Sanctiones de moderation
     two_factor_authentication: Authentication a duo factores
     webauthn_authentication: Claves de securitate
   severed_relationships:
@@ -1675,7 +1675,7 @@ ia:
     lost_followers: Sequitores perdite
     lost_follows: Sequites perdite
     preamble: Tu pote perder sequites e sequitores quando tu bloca un dominio o quando tu moderatores decide suspender un servitor remote. Quando isto occurre, tu potera discargar listas de relationes rumpite, a inspectar e eventualmente importar in un altere servitor.
-    purged: Le information re iste servitor ha essite purgate per le administratores de tu servitor.
+    purged: Le information sur iste servitor ha essite purgate per le administratores de tu servitor.
     type: Evento
   statuses:
     attached:
@@ -1698,7 +1698,7 @@ ia:
     edited_at_html: Modificate le %{date}
     errors:
       in_reply_not_found: Le message a que tu tenta responder non pare exister.
-    open_in_web: Aperir in le web
+    open_in_web: Aperir sur le web
     over_character_limit: limite de characteres de %{max} excedite
     pin_errors:
       direct: Messages que es solo visibile a usatores mentionate non pote esser appunctate
@@ -1714,11 +1714,11 @@ ia:
         other: "%{count} votos"
       vote: Votar
     show_more: Monstrar plus
-    show_thread: Monstrar argumento
-    title: '%{name}: "%{quote}"'
+    show_thread: Monstrar discussion
+    title: "%{name}: “%{quote}”"
     visibilities:
       direct: Directe
-      private: Solo-sequaces
+      private: Solmente sequitores
       private_long: Solmente monstrar a sequitores
       public: Public
       public_long: Omnes pote vider
@@ -1729,22 +1729,22 @@ ia:
     enabled_hint: Dele automaticamente tu messages un vice que illos attinge un limine de etate specificate, salvo que illes concorda un del exceptiones infra
     exceptions: Exceptiones
     explanation: Pois que deler messages es un operation costose, isto es facite lentemente in le tempore quando le servitor non es alteremente occupate. Pro iste ration, tu messages pote esser delite un poco post que illos attinge le limine de etate.
-    ignore_favs: Ignorar favoritos
+    ignore_favs: Ignorar favorites
     ignore_reblogs: Ignorar impulsos
-    interaction_exceptions: Exceptiones basate super interactiones
+    interaction_exceptions: Exceptiones basate sur interactiones
     interaction_exceptions_explanation: Nota que il non ha garantia que le messages essera delite si illos va sub le limine de favorites o impulsos post haber lo superate un vice.
     keep_direct: Mantener le messages directe
-    keep_direct_hint: Non dele alcuno de tu messages directe
-    keep_media: Mantener messages con annexos de medios
-    keep_media_hint: Non dele alcuno de tu messages que ha annexos de medios
-    keep_pinned: Mantener messages appunctate
-    keep_pinned_hint: Non dele alcuno de tu messages appunctate
+    keep_direct_hint: Non dele alcun de tu messages directe
+    keep_media: Conservar messages con annexos multimedial
+    keep_media_hint: Non dele alcun de tu messages que ha annexos multimedial
+    keep_pinned: Conservar le messages fixate
+    keep_pinned_hint: Non dele alcun de tu messages fixate
     keep_polls: Mantener sondages
-    keep_polls_hint: Non dele ulle de tu sondages
-    keep_self_bookmark: Mantener messages que tu marcava con marcapaginas
-    keep_self_bookmark_hint: Non dele tu proprie messages si tu los ha marcate con marcapaginas
-    keep_self_fav: Mantene messages que tu favoriva
-    keep_self_fav_hint: Non dele tu proprie messages si tu los ha favorite
+    keep_polls_hint: Non dele alcun de tu sondages
+    keep_self_bookmark: Conservar le messages que tu ha in marcapaginas
+    keep_self_bookmark_hint: Non dele tu proprie messages si tu los ha addite al marcapaginas
+    keep_self_fav: Conservar tu messages favorite
+    keep_self_fav_hint: Non dele tu proprie messages si tu los ha marcate como favorite
     min_age:
       '1209600': 2 septimanas
       '15778476': 6 menses
@@ -1755,17 +1755,17 @@ ia:
       '63113904': 2 annos
       '7889238': 3 menses
     min_age_label: Limine de etate
-    min_favs: Mantener messages favorite al minus
-    min_favs_hint: Non deler alcuno de tu messages que ha recipite al minus iste numero de favoritos. Lassar blanc pro deler messages sin reguardo de lor numero de favoritos
-    min_reblogs: Mantener messages impulsate al minus
+    min_favs: Conservar messages marcate como favorite al minus
+    min_favs_hint: Non dele alcun de tu messages que ha essite marcate como favorite al minus iste numero de vices. Lassa vacue pro deler messages independentemente de lor numero de marcas como favorite
+    min_reblogs: Conservar messages impulsate al minus
     min_reblogs_hint: Non dele alcun de tu messages que ha essite impulsate al minus iste numero de vices. Lassar vacue pro deler messages independentemente de lor numero de impulsos
   stream_entries:
     sensitive_content: Contento sensibile
   strikes:
     errors:
-      too_late: Es troppo tarde pro facer appello contra iste admonition
+      too_late: Es troppo tarde pro appellar contra iste sanction
   tags:
-    does_not_match_previous_name: non concorda le nomine previe
+    does_not_match_previous_name: non corresponde al nomine precedente
   themes:
     contrast: Mastodon (Alte contrasto)
     default: Mastodon (Obscur)
@@ -1776,22 +1776,22 @@ ia:
       default: "%d %b %Y, %H:%M"
       month: "%b %Y"
       time: "%H:%M"
-      with_time_zone: "%b %d, %Y, %H:%M %Z"
+      with_time_zone: "%d %b %Y, %H:%M %Z"
   translation:
     errors:
       quota_exceeded: Le quota de utilisation del servitor pro le servicio de traduction ha essite excedite.
-      too_many_requests: Il ha habite troppe requestas al servicio de traduction recentemente.
+      too_many_requests: Il ha habite troppo de requestas al servicio de traduction recentemente.
   two_factor_authentication:
     add: Adder
-    disable: Disactivar 2FA
+    disable: Disactivar A2F
     disabled_success: Authentication a duo factores disactivate con successo
     edit: Modificar
     enabled: Le authentication a duo factores es activate
     enabled_success: Authentication a duo factores activate con successo
     generate_recovery_codes: Generar codices de recuperation
-    lost_recovery_codes: Le codices de recuperation te permitte de reganiar accesso a tu conto si tu perde tu telephono. Si tu ha perdite tu codices de recuperation, tu pote regenerar los ci. Tu vetere codices de recuperation sera invalidate.
+    lost_recovery_codes: Le codices de recuperation te permitte reganiar le accesso a tu conto si tu perde tu telephono. Si tu ha perdite tu codices de recuperation, tu pote regenerar los hic. Tu ancian codices de recuperation essera invalidate.
     methods: Methodos a duo factores
-    otp: App de authenticator
+    otp: App authenticator
     recovery_codes: Salveguardar codices de recuperation
     recovery_codes_regenerated: Codices de recuperation regenerate con successo
     recovery_instructions_html: Si tu perde le accesso a tu telephono, tu pote usar un del codices de recuperation hic infra pro reganiar le accesso a tu conto. <strong>Mantene le codices de recuperation secur.</strong> Per exemplo, tu pote imprimer los e guardar los con altere documentos importante.
@@ -1799,33 +1799,33 @@ ia:
   user_mailer:
     appeal_approved:
       action: Parametros de conto
-      explanation: Le appello contra le admonition contra tu conto del %{strike_date}, que tu ha submittite le %{appeal_date}, ha essite approbate. Tu conto ha de novo un bon reputation.
-      subject: Tu appello ab %{date} ha essite approbate
-      subtitle: Tu conto es ancora un vice in regula.
+      explanation: Le appello contra le sanction del %{strike_date} contra tu conto, que tu ha submittite le %{appeal_date}, ha essite approbate. Tu conto es de bon reputation de novo.
+      subject: Tu appello del %{date} ha essite approbate
+      subtitle: Tu conto es de bon reputation de novo.
       title: Appello approbate
     appeal_rejected:
-      explanation: Le appello contra le admonition contra tu conto del %{strike_date}, que tu ha submittite le %{appeal_date}, ha essite rejectate.
-      subject: Tu appello ab %{date} ha essite rejectate
+      explanation: Le appello contra le sanction del %{strike_date} contra tu conto, que tu ha submittite le %{appeal_date}, ha essite rejectate.
+      subject: Tu appello del %{date} ha essite rejectate
       subtitle: Tu appello ha essite rejectate.
       title: Appello rejectate
     backup_ready:
       explanation: Tu ha requestate un copia de securitate complete de tu conto de Mastodon.
-      extra: Isto es preste pro discargar!
+      extra: Illo es ora preste pro discargar!
       subject: Tu archivo es preste pro discargar
       title: Discargar archivo
     failed_2fa:
-      details: 'Hic es le detalios del tentativa de initio de session:'
+      details: 'Ecce le detalios del tentativa de apertura de session:'
       explanation: Alcuno ha tentate aperir session a tu conto ma ha fornite un secunde factor de authentication non valide.
       further_actions_html: Si non se tractava de te, nos recommenda %{action} immediatemente perque illo pote esser compromittite.
-      subject: Fallimento del authentication de duo factores
-      title: Falleva le authentication de duo factores
+      subject: Fallimento de authentication del secunde factor
+      title: Ha fallite le authentication del secunde factor
     suspicious_sign_in:
       change_password: cambiar tu contrasigno
-      details: 'Hic es le detalios del initio de session:'
-      explanation: Nos ha detegite un initio de session a tu conto ab un nove adresse IP.
+      details: 'Ecce le detalios del apertura de session:'
+      explanation: Nos ha detegite un apertura de session sur tu conto desde un nove adresse IP.
       further_actions_html: Si non se tractava de te, nos recommenda %{action} immediatemente e activar le authentication bifactorial pro mantener tu conto secur.
       subject: Alcuno ha accedite a tu conto desde un nove adresse IP
-      title: Un nove initio de session
+      title: Un nove apertura de session
     warning:
       appeal: Submitter un appello
       appeal_description: Si tu crede que se tracta de un error, tu pote presentar un appello al personal de %{instance}.
@@ -1840,9 +1840,9 @@ ia:
         silence: Tu pote ancora usar tu conto ma solmente le personas qui ja te seque videra tu messages sur iste servitor, e tu pote esser excludite de varie functiones de discoperta. Nonobstante, altere personas pote ancora sequer te manualmente.
         suspend: Tu non pote plus usar tu conto, e tu profilo e altere datos non es plus accessibile. Tu pote ancora aperir session pro requestar un copia de reserva de tu datos usque lor elimination in circa 30 dies. Nos retenera certe datos de base pro impedir que tu evade le suspension.
       reason: 'Ration:'
-      statuses: 'Message citate:'
+      statuses: 'Messages citate:'
       subject:
-        delete_statuses: Tu messages sur %{acct} esseva removite
+        delete_statuses: Tu messages sur %{acct} ha essite removite
         disable: Tu conto %{acct} ha essite gelate
         mark_statuses_as_sensitive: Tu messages sur %{acct} ha essite marcate como sensibile
         none: Advertimento pro %{acct}
@@ -1858,7 +1858,7 @@ ia:
         silence: Conto limitate
         suspend: Conto suspendite
     welcome:
-      apps_android_action: Obtene lo sur Google Play
+      apps_android_action: Obtener lo sur Google Play
       apps_ios_action: Discargar sur le App Store
       apps_step: Discarga nostre applicationes official.
       apps_title: Applicationes de Mastodon
@@ -1870,7 +1870,7 @@ ia:
       explanation: Ecce alcun consilios pro initiar
       feature_action: Apprender plus
       feature_audience: Mastodon te presenta le possibilitate unic de gerer tu audientia sin intermediarios. Mastodon, installate sur tu proprie infrastructura, te permitte sequer, e esser sequite per, personas sur qualcunque altere servitor Mastodon in linea, e necuno lo controla salvo tu.
-      feature_audience_title: Crea tu auditorio in fiducia
+      feature_audience_title: Crea tu audientia in confidentia
       feature_control: Tu sape melio lo que tu vole vider sur tu fluxo de initio. Nulle algorithmos o annuncios dissipa tu tempore. Seque quicinque sur qualcunque servitor Mastodon desde un sol conto, recipe lor messages in ordine chronologic, e face te un angulo del internet ubi tu te senti a casa.
       feature_control_title: Mantene le controlo de tu proprie chronologia
       feature_creativity: Mastodon supporta messages con audio, video e imagines, descriptiones de accessibilitate, sondages, advertimentos de contento, avatares con animation, emojis personalisate, controlo de retalio de miniaturas, e plus, pro adjutar te a exprimer te in linea. Que tu publica tu arte, tu musica o tu podcast, Mastodon existe pro te.
@@ -1879,13 +1879,13 @@ ia:
       feature_moderation_title: Moderation como deberea esser
       follow_action: Sequer
       follow_step: Sequer personas interessante es le ration de esser de Mastodon.
-      follow_title: Personalisa tu fluxo de initio
+      follow_title: Personalisa tu fluxo principal
       follows_subtitle: Seque contos popular
       follows_title: Qui sequer
-      follows_view_more: Vider plus de personas a sequer
+      follows_view_more: Vider plus personas a sequer
       hashtags_recent_count:
         one: "%{people} persona in le passate duo dies"
-        other: "%{people} personas in le passate duo diea"
+        other: "%{people} personas in le passate duo dies"
       hashtags_subtitle: Explora le tendentias del passate 2 dies
       hashtags_title: Hashtags in tendentia
       hashtags_view_more: Vider plus de hashtags in tendentia
@@ -1929,4 +1929,4 @@ ia:
     not_enabled: Tu ancora non ha activate WebAuthn
     not_supported: Iste navigator non supporta claves de securitate
     otp_required: Pro usar le claves de securitate activa prime le authentication de duo factores.
-    registered_on: Registrate le %{date}
+    registered_on: Inscribite le %{date}
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index c29218c1fe756f..9e60ddfe529954 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -446,6 +446,7 @@ lt:
     instances:
       availability:
         title: Prieinamumas
+        warning: Paskutinis bandymas prisijungti prie šio serverio buvo nesėkmingas
       back_to_all: Visi
       back_to_limited: Apribotas
       back_to_warning: Įspėjimas
@@ -488,7 +489,7 @@ lt:
       inbox_url: Perdavimo URL
       pending: Laukiama perdavimo patvirtinimo
       save_and_enable: Išsaugoti ir įjungti
-      setup: Sukurti perdavimo ryšį
+      setup: Nustatyti perdavimo ryšį
       status: Statusas
       title: Perdavimai
     report_notes:
@@ -600,6 +601,8 @@ lt:
       elasticsearch_preset_single_node:
         action: Žiūrėti dokumentaciją
         message_html: Tavo Elasticsearch klasteris turi tik vieną mazgą, <code>ES_PRESET</code> turėtų būti nustatyta į <code>single_node_cluster</code>.
+      elasticsearch_running_check:
+        message_html: Nepavyko prijungti prie Elasticsearch. Patikrink, ar ji veikia, arba išjunk viso teksto paiešką.
     title: Administracija
     trends:
       allow: Leisti
diff --git a/config/locales/simple_form.ia.yml b/config/locales/simple_form.ia.yml
index d3237762ea9e97..7e364889dd4a6d 100644
--- a/config/locales/simple_form.ia.yml
+++ b/config/locales/simple_form.ia.yml
@@ -3,40 +3,40 @@ ia:
   simple_form:
     hints:
       account:
-        discoverable: Tu messages public e tu profilo pote esser consiliate o recommendate in varie areas de Mastodon e tu profilo pote esser suggerite a altere usatores.
+        discoverable: Tu messages public e tu profilo pote esser mittite in evidentia o recommendate in varie areas de Mastodon e tu profilo pote esser suggerite a altere usatores.
         display_name: Tu prenomine e nomine de familia o tu pseudonymo.
-        fields: Tu pagina principal, pronomines, etate, toto lo que tu vole.
-        indexable: Tu messages public pote apparer in resultatos del recerca sur Mastodon. Illes qui ha interagite con tu messages totevia pote cercar les.
+        fields: Tu pagina principal, pronomines, etate, tote lo que tu vole.
+        indexable: Tu messages public pote apparer in le resultatos de recerca sur Mastodon. Le personas qui ha interagite con tu messages pote cercar los in omne caso.
         note: 'Tu pote @mentionar altere personas o #hashtags.'
-        show_collections: Le personas potera navigar per tu sequites e sequaces. Le personas potera navigar per tu sequites e sequaces.
-        unlocked: Le personas potera sequer te sin requestar approbation. Dismarca si tu desira revider le requestas de sequer e selige si acceptar o rejectar nove sequaces.
+        show_collections: Le personas potera percurrer tu sequites e sequitores. Le personas que tu seque videra que tu les seque in omne caso.
+        unlocked: Le personas potera sequer te sin requestar approbation. Dismarca si tu vole revider le requestas de sequimento e seliger si acceptar o rejectar nove sequitores.
       account_alias:
-        acct: Specifica le nomine_de_usator@dominio del conto ab que tu vole mover
+        acct: Specifica le nomine_de_usator@dominio del conto desde le qual tu vole migrar
       account_migration:
-        acct: Specifica le nomine_de_usator@dominio del conto a que tu vole mover
+        acct: Specifica le nomine_de_usator@dominio del conto al qual tu vole migrar
       account_warning_preset:
-        text: Tu pote usar le syntaxe de message, tal como URLs, hashtags e mentiones
+        text: Tu pote usar le syntaxe de messages, como URLs, hashtags e mentiones
         title: Optional. Non visibile al destinatario
       admin_account_action:
-        include_statuses: Le usator videra que messages ha causate le action o aviso de moderation
-        send_email_notification: Le usator recipera un explication de cosa eveniva con lor conto
-        text_html: Optional. Tu pote usar le syntaxe de message. Tu pote <a href="%{path}">adder avisos preconfigurate</a> pro sparniar tempore
-        type_html: Selige lo que tu vole facer con <strong>%{acct}</strong>
+        include_statuses: Le usator videra qual messages ha causate le action o advertimento de moderation
+        send_email_notification: Le usator recipera un explication de lo que ha evenite con su conto
+        text_html: Optional. Tu pote usar le syntaxe de messages. Tu pote <a href="%{path}">adder advertimentos preconfigurate</a> pro sparniar tempore
+        type_html: Selige lo que facer con <strong>%{acct}</strong>
         types:
-          disable: Impedir al usator de usar lor conto, sin deler o celar lor contentos.
-          none: Usar lo pro inviar un aviso al usator, sin discatenar ulle altere action.
-          sensitive: Fortiar tote le annexos multimedial de iste usator a esser signalate como sensibile.
-          silence: Impedir al usator de poter publicar messages con public visibilitate, celar lor messages e notificationes ab gente non sequente illes. Clauder tote le reportos contra iste conto.
-          suspend: Impedir ulle interaction de o a iste conto e deler su contentos. Reversibile intra 30 dies. Clauder tote le reportos contra iste conto.
-        warning_preset_id: Optional. Tu pote ancora adder personal texto a fin del preconfigurate
+          disable: Impedir al usator de usar su conto, sin deler o celar su contento.
+          none: Usa isto pro inviar un advertimento al usator, sin prender alcun altere mesura.
+          sensitive: Fortiar tote le annexos multimedial de iste usator a esser marcate como sensibile.
+          silence: Impedir al usator de publicar messages con visibilitate public, celante su messages e notificationes a qui non le seque. Claude tote le reportos contra iste conto.
+          suspend: Impedir tote interaction desde o verso iste conto e deler su contento. Reversibile intra 30 dies. Claude tote le reportos contra iste conto.
+        warning_preset_id: Optional. Tu pote ancora adder texto personalisate al fin del preconfigurate
       announcement:
-        all_day: Si marcate, solo le datas del campo tempore sera monstrate
-        ends_at: Le annuncio sera automaticamente obscurate a iste tempore
-        scheduled_at: Lassar blanc pro publicar le annuncio immediatemente
-        starts_at: Optional. In caso tu annuncio es ligate con un specific campo tempore
-        text: Tu pote usar le syntaxe de message. Presta attention al spatio que le annuncio occupara sur le schermo de usator
+        all_day: Si marcate, solmente le datas del intervallo de tempore essera monstrate
+        ends_at: Optional. Le annuncio essera automaticamente retirate del publication a iste tempore
+        scheduled_at: Lassa vacue pro publicar le annuncio immediatemente
+        starts_at: Optional. In caso que tu annuncio es ligate a un intervallo specific de tempore
+        text: Tu pote usar le syntaxe de messages. Presta attention al spatio que le annuncio occupara sur le schermo del usator
       appeal:
-        text: Tu pote solo appellar te un vice
+        text: Tu pote solo appellar contra un sanction un vice
       defaults:
         autofollow: Illes qui se inscribe per le invitation automaticamente devenira tu sequaces
         avatar: WEBP, PNG, GIF or JPG. Al maximo %{size}. Sera diminuite a %{dimensions}px
@@ -64,7 +64,7 @@ ia:
         username: Tu pote usar litteras, numeros e tractos de sublineamento
         whole_word: Quando le parola o expression clave es solo alphanumeric, illo sera solo applicate si illo concorda con tote le parola
       domain_allow:
-        domain: Iste dominio potera reportar datos ab iste servitor e le datos in ingresso ab illo sera processate e immagazinate
+        domain: Iste dominio potera extraher datos de iste servitor e le datos entrante de illo essera processate e immagazinate
       email_domain_block:
         domain: Isto pote esser le nomine de dominio que apparera in le adresse email o le registration MX que illo usa. Illos sera verificate durante le inscription.
         with_dns_records: Un tentativa sera facite pro resolver le registrationes de DNS del dominio date e le resultatos sera alsi blocate
@@ -158,7 +158,7 @@ ia:
         text: Texto predefinite
         title: Titulo
       admin_account_action:
-        include_statuses: Includer messages reportate in le email
+        include_statuses: Includer le messages reportate in le e-mail
         send_email_notification: Notificar le usator per e-mail
         text: Advertimento personalisate
         type: Action
diff --git a/config/locales/simple_form.lv.yml b/config/locales/simple_form.lv.yml
index 888e08b650170e..017acd0a53ccb0 100644
--- a/config/locales/simple_form.lv.yml
+++ b/config/locales/simple_form.lv.yml
@@ -78,6 +78,7 @@ lv:
       form_admin_settings:
         activity_api_enabled: Vietēji publicēto ziņu, aktīvo lietotāju un jauno reģistrāciju skaits nedēļas kopās
         app_icon: WEBP, PNG, GIF vai JPG. Mobilajās ierīcēs aizstāj noklusējuma lietotnes ikonu ar pielāgotu.
+        backups_retention_period: Lietotājiem ir iespēja izveidot savu ierakstu arhīvu lejupielādēšanai vēlāk. Kad iestatīta pozitīva vērtība, šie arhīvi tiks automātiski izdzēsti no krātuves pēc norādītā dienu skaita.
         bootstrap_timeline_accounts: Šie konti tiks piesprausti jauno lietotāju ieteikumu augšdaļā.
         closed_registrations_message: Tiek rādīts, kad reģistrēšanās ir slēgta
         custom_css: Vari lietot pielāgotus stilus Mastodon tīmekļa versijā.

From 048f9b9d45b1d313de1d427956a2d354273a5d85 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 5 Jun 2024 09:56:52 +0200
Subject: [PATCH 1172/2191] chore(deps): update dependency pghero to v3.5.0
 (#30393)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 597005b6b05112..b5192c925ad138 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -586,7 +586,7 @@ GEM
     pastel (0.8.0)
       tty-color (~> 0.5)
     pg (1.5.6)
-    pghero (3.4.1)
+    pghero (3.5.0)
       activerecord (>= 6)
     premailer (1.23.0)
       addressable

From eef2cc054faaa808cb014d644317fbc398f6c75f Mon Sep 17 00:00:00 2001
From: Emelia Smith <ThisIsMissEm@users.noreply.github.com>
Date: Wed, 5 Jun 2024 10:06:06 +0200
Subject: [PATCH 1173/2191] Add url validation to Web::PushSubscription
 endpoints (#30540)

---
 app/models/web/push_subscription.rb             |  2 +-
 spec/requests/api/v1/push/subscriptions_spec.rb | 15 ++++++++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/app/models/web/push_subscription.rb b/app/models/web/push_subscription.rb
index a3a2ec3f03eeb7..1860f0aa3ea4c6 100644
--- a/app/models/web/push_subscription.rb
+++ b/app/models/web/push_subscription.rb
@@ -21,7 +21,7 @@ class Web::PushSubscription < ApplicationRecord
 
   has_one :session_activation, foreign_key: 'web_push_subscription_id', inverse_of: :web_push_subscription, dependent: nil
 
-  validates :endpoint, presence: true
+  validates :endpoint, presence: true, url: true
   validates :key_p256dh, presence: true
   validates :key_auth, presence: true
 
diff --git a/spec/requests/api/v1/push/subscriptions_spec.rb b/spec/requests/api/v1/push/subscriptions_spec.rb
index 700250ee2ac0b9..82ea308cd69abc 100644
--- a/spec/requests/api/v1/push/subscriptions_spec.rb
+++ b/spec/requests/api/v1/push/subscriptions_spec.rb
@@ -4,10 +4,11 @@
 
 describe 'API V1 Push Subscriptions' do
   let(:user) { Fabricate(:user) }
+  let(:endpoint) { 'https://fcm.googleapis.com/fcm/send/fiuH06a27qE:APA91bHnSiGcLwdaxdyqVXNDR9w1NlztsHb6lyt5WDKOC_Z_Q8BlFxQoR8tWFSXUIDdkyw0EdvxTu63iqamSaqVSevW5LfoFwojws8XYDXv_NRRLH6vo2CdgiN4jgHv5VLt2A8ah6lUX' }
   let(:create_payload) do
     {
       subscription: {
-        endpoint: 'https://fcm.googleapis.com/fcm/send/fiuH06a27qE:APA91bHnSiGcLwdaxdyqVXNDR9w1NlztsHb6lyt5WDKOC_Z_Q8BlFxQoR8tWFSXUIDdkyw0EdvxTu63iqamSaqVSevW5LfoFwojws8XYDXv_NRRLH6vo2CdgiN4jgHv5VLt2A8ah6lUX',
+        endpoint: endpoint,
         keys: {
           p256dh: 'BEm_a0bdPDhf0SOsrnB2-ategf1hHoCnpXgQsFj5JCkcoMrMt2WHoPfEYOYPzOIs9mZE8ZUaD7VA5vouy0kEkr8=',
           auth: 'eH_C8rq2raXqlcBVDa1gLg==',
@@ -63,6 +64,18 @@
       expect(endpoint_push_subscriptions.count)
         .to eq(1)
     end
+
+    context 'with invalid endpoint URL' do
+      let(:endpoint) { 'app://example.foo' }
+
+      it 'returns a validation error' do
+        subject
+
+        expect(response).to have_http_status(422)
+        expect(endpoint_push_subscriptions.count).to eq(0)
+        expect(endpoint_push_subscription).to be_nil
+      end
+    end
   end
 
   describe 'PUT /api/v1/push/subscription' do

From 20e490ba7e996033c549e6d1de7826b86ac2988d Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 5 Jun 2024 15:06:03 +0200
Subject: [PATCH 1174/2191] fix(deps): update dependency cssnano to v7.0.2
 (#30560)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 94 +++++++++++++++++++++++++++----------------------------
 1 file changed, 47 insertions(+), 47 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index bad4fa01e749c1..7c36984cdebde6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6715,9 +6715,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cssnano-preset-default@npm:^7.0.1":
-  version: 7.0.1
-  resolution: "cssnano-preset-default@npm:7.0.1"
+"cssnano-preset-default@npm:^7.0.2":
+  version: 7.0.2
+  resolution: "cssnano-preset-default@npm:7.0.2"
   dependencies:
     browserslist: "npm:^4.23.0"
     css-declaration-sorter: "npm:^7.2.0"
@@ -6729,12 +6729,12 @@ __metadata:
     postcss-discard-duplicates: "npm:^7.0.0"
     postcss-discard-empty: "npm:^7.0.0"
     postcss-discard-overridden: "npm:^7.0.0"
-    postcss-merge-longhand: "npm:^7.0.0"
-    postcss-merge-rules: "npm:^7.0.0"
+    postcss-merge-longhand: "npm:^7.0.1"
+    postcss-merge-rules: "npm:^7.0.1"
     postcss-minify-font-values: "npm:^7.0.0"
     postcss-minify-gradients: "npm:^7.0.0"
     postcss-minify-params: "npm:^7.0.0"
-    postcss-minify-selectors: "npm:^7.0.0"
+    postcss-minify-selectors: "npm:^7.0.1"
     postcss-normalize-charset: "npm:^7.0.0"
     postcss-normalize-display-values: "npm:^7.0.0"
     postcss-normalize-positions: "npm:^7.0.0"
@@ -6747,11 +6747,11 @@ __metadata:
     postcss-ordered-values: "npm:^7.0.0"
     postcss-reduce-initial: "npm:^7.0.0"
     postcss-reduce-transforms: "npm:^7.0.0"
-    postcss-svgo: "npm:^7.0.0"
-    postcss-unique-selectors: "npm:^7.0.0"
+    postcss-svgo: "npm:^7.0.1"
+    postcss-unique-selectors: "npm:^7.0.1"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/bee65239d25de2ba87e85b4091cbc1cac9ba1b57c9f803dff5a71ea8a55a885045805840dd732be284c28cca6343dece37fc76d7096aba37cfa02eff2ee7714c
+  checksum: 10c0/7c66240594c1d7a0cc761e755236228b17251455aa57abc45be0631f7de0fde070c23b0e41ffa200d39cd8351718514217d8c7a8cc4f06b54289dc1d555dfeb2
   languageName: node
   linkType: hard
 
@@ -6765,14 +6765,14 @@ __metadata:
   linkType: hard
 
 "cssnano@npm:^7.0.0":
-  version: 7.0.1
-  resolution: "cssnano@npm:7.0.1"
+  version: 7.0.2
+  resolution: "cssnano@npm:7.0.2"
   dependencies:
-    cssnano-preset-default: "npm:^7.0.1"
+    cssnano-preset-default: "npm:^7.0.2"
     lilconfig: "npm:^3.1.1"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/8b17d13efe98ec2db2fbde9ca24e91842b9afe2f80becc5e4271ee1170d77cf73eed3cdc2f35ed51bacdeac763ff85db45ae8e9627a8862bf01d457a819a640e
+  checksum: 10c0/ad43d8c2e96fa1022fc5103064e4f08da3fdc5501a946d455edf0b81981b58cd06ad2d3f0c68d666e2b687c10c02ffbb383252aa34da0ddc3bd4d075f4a922c7
   languageName: node
   linkType: hard
 
@@ -13458,29 +13458,29 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-merge-longhand@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "postcss-merge-longhand@npm:7.0.0"
+"postcss-merge-longhand@npm:^7.0.1":
+  version: 7.0.1
+  resolution: "postcss-merge-longhand@npm:7.0.1"
   dependencies:
     postcss-value-parser: "npm:^4.2.0"
-    stylehacks: "npm:^7.0.0"
+    stylehacks: "npm:^7.0.1"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/5f814f396a5107dcb5e74c2d4e55ebcd03b9bc2b3619ed7aea63a441854023ce349bc371d30aec1ac33a375139afac02709e7721e055b5e624701ac6576e8a10
+  checksum: 10c0/e3d20502e65c82c9c4ba2e400bd093ee6b9c1b0019618ccd50eb40ef0e496206dd518c7e655a6986d780d5a52576e32e8f310d00484b15f67c77664a148df6eb
   languageName: node
   linkType: hard
 
-"postcss-merge-rules@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "postcss-merge-rules@npm:7.0.0"
+"postcss-merge-rules@npm:^7.0.1":
+  version: 7.0.1
+  resolution: "postcss-merge-rules@npm:7.0.1"
   dependencies:
     browserslist: "npm:^4.23.0"
     caniuse-api: "npm:^3.0.0"
     cssnano-utils: "npm:^5.0.0"
-    postcss-selector-parser: "npm:^6.0.16"
+    postcss-selector-parser: "npm:^6.1.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/d9cb3a4e55db57aa7ba0bb1caefb82db93c8493d2b3db66091dae9d5794ca04729e660115765ff254d0eb960e4db037f6c5b92562b396b05216888d12acc08e0
+  checksum: 10c0/d380c162327e7aad59efb55cfddc5ec4e3bf51d18b07b832fdd876505279bac3cb44511ada8e1e1992428dcec4f64c7ec457b6ff9109063c5a61abf4b59b7176
   languageName: node
   linkType: hard
 
@@ -13521,14 +13521,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-minify-selectors@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "postcss-minify-selectors@npm:7.0.0"
+"postcss-minify-selectors@npm:^7.0.1":
+  version: 7.0.1
+  resolution: "postcss-minify-selectors@npm:7.0.1"
   dependencies:
-    postcss-selector-parser: "npm:^6.0.16"
+    postcss-selector-parser: "npm:^6.1.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/6baf0ea71b8dfd01bdb5b516d01aa00244c55cad8d9c674358d735cef2a6aca6586dd480d419cc8d3f470e6d2d7d19354592044f19766993caf9800d3d7e0d36
+  checksum: 10c0/a8ff69657fb1808d8f0f105b13a416426902d6f498a4b7ebb3b96b4b9149e97ee2e2ad6cd98108e2f0b8f781701724e6c51e120e215cee3e40c2d7a2afac755a
   languageName: node
   linkType: hard
 
@@ -13898,26 +13898,26 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-svgo@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "postcss-svgo@npm:7.0.0"
+"postcss-svgo@npm:^7.0.1":
+  version: 7.0.1
+  resolution: "postcss-svgo@npm:7.0.1"
   dependencies:
     postcss-value-parser: "npm:^4.2.0"
-    svgo: "npm:^3.2.0"
+    svgo: "npm:^3.3.2"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/0e724069b5de83aa2b8f8a4746cb60cb663e0a8bbab0e4ba995649cb0562205af57d1f54b89fb90d8ae04a4b7ac3ac6e3751afffc3cff697cb19f7a36b71b195
+  checksum: 10c0/7c7b177e6f4e2a3e9ada76d53afa02e08d900c8ac15600ba9daa80480269d538405e544bd8091bc5eb7529173a476896fad885a72a247258265424b29a9195ed
   languageName: node
   linkType: hard
 
-"postcss-unique-selectors@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "postcss-unique-selectors@npm:7.0.0"
+"postcss-unique-selectors@npm:^7.0.1":
+  version: 7.0.1
+  resolution: "postcss-unique-selectors@npm:7.0.1"
   dependencies:
-    postcss-selector-parser: "npm:^6.0.16"
+    postcss-selector-parser: "npm:^6.1.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/33b532ad0e9271c5a379859e18adfdc72986bb538672cc0fbc06295d824f82dba3f7b57264e18a3214901bc5244ff5408d28b530374d24a088507287c7f520ce
+  checksum: 10c0/6352d71ce2f65265f545831c2ce3686bd71961d08a2247c545d717d93d23b1eb08bb986efc11194d31970eea4cb42207b9aa9a3f4666d75492a6cbf1493cf466
   languageName: node
   linkType: hard
 
@@ -16399,15 +16399,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"stylehacks@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "stylehacks@npm:7.0.0"
+"stylehacks@npm:^7.0.1":
+  version: 7.0.1
+  resolution: "stylehacks@npm:7.0.1"
   dependencies:
     browserslist: "npm:^4.23.0"
-    postcss-selector-parser: "npm:^6.0.16"
+    postcss-selector-parser: "npm:^6.1.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/c1c0231974ab7922af3a535a9cb78bfe84997767da7defe111cc76d7f10c9e139fe8cb0f9d5bea87b0c0cc0166c82a6ec98a3d6242d7e29ef90adceecfd330ae
+  checksum: 10c0/538d5d9c6d84906efad3706f0873b85b67fa224f17759b122bad3d60f2928c31204fd658dd16ec952bf54858a3aeaef4643e040c04030459285ce1b13c4cae91
   languageName: node
   linkType: hard
 
@@ -16632,9 +16632,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"svgo@npm:^3.2.0":
-  version: 3.2.0
-  resolution: "svgo@npm:3.2.0"
+"svgo@npm:^3.3.2":
+  version: 3.3.2
+  resolution: "svgo@npm:3.3.2"
   dependencies:
     "@trysound/sax": "npm:0.2.0"
     commander: "npm:^7.2.0"
@@ -16645,7 +16645,7 @@ __metadata:
     picocolors: "npm:^1.0.0"
   bin:
     svgo: ./bin/svgo
-  checksum: 10c0/28fa9061ccbcf2e3616d48d1feb613aaa05f8f290a329beb0e585914f1864385152934a7d4d683a4609fafbae3d51666633437c359c5c5ef74fb58ad09092a7c
+  checksum: 10c0/a6badbd3d1d6dbb177f872787699ab34320b990d12e20798ecae915f0008796a0f3c69164f1485c9def399e0ce0a5683eb4a8045e51a5e1c364bb13a0d9f79e1
   languageName: node
   linkType: hard
 

From 5f15a892fa4f01ef9bcf223ec6798b8a9d9945ed Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 5 Jun 2024 21:15:39 +0200
Subject: [PATCH 1175/2191] Add support for libvips in addition to ImageMagick
 (#30090)

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
---
 .devcontainer/Dockerfile                      |   2 +-
 .github/actions/setup-ruby/action.yml         |   2 +-
 .github/workflows/test-ruby.yml               |  93 +++++++++++-
 Dockerfile                                    |   4 +-
 Gemfile                                       |   1 +
 Gemfile.lock                                  |   3 +
 .../dimension/software_versions_dimension.rb  |  13 +-
 app/models/concerns/attachmentable.rb         |   2 +-
 app/models/preview_card.rb                    |   6 +-
 config/application.rb                         |  10 +-
 config/initializers/vips.rb                   |  27 ++++
 lib/paperclip/blurhash_transcoder.rb          |  20 ++-
 lib/paperclip/color_extractor.rb              |  81 ++++++++--
 lib/paperclip/vips_lazy_thumbnail.rb          | 141 ++++++++++++++++++
 spec/fixtures/files/monochrome.png            | Bin 0 -> 9216 bytes
 spec/models/media_attachment_spec.rb          |  10 +-
 16 files changed, 392 insertions(+), 23 deletions(-)
 create mode 100644 config/initializers/vips.rb
 create mode 100644 lib/paperclip/vips_lazy_thumbnail.rb
 create mode 100644 spec/fixtures/files/monochrome.png

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 994a41d050ffcf..9d8fa2702d55bc 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -9,7 +9,7 @@ RUN su vscode -c "source /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSI
 
 # [Optional] Uncomment this section to install additional OS packages.
 RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
-    && apt-get -y install --no-install-recommends libicu-dev libidn11-dev ffmpeg imagemagick libpam-dev
+    && apt-get -y install --no-install-recommends libicu-dev libidn11-dev ffmpeg imagemagick libvips42 libpam-dev
 
 # [Optional] Uncomment this line to install additional gems.
 RUN gem install foreman
diff --git a/.github/actions/setup-ruby/action.yml b/.github/actions/setup-ruby/action.yml
index 3a6fba940201a7..3e232f134c9422 100644
--- a/.github/actions/setup-ruby/action.yml
+++ b/.github/actions/setup-ruby/action.yml
@@ -14,7 +14,7 @@ runs:
       shell: bash
       run: |
         sudo apt-get update
-        sudo apt-get install -y libicu-dev libidn11-dev ${{ inputs.additional-system-dependencies }}
+        sudo apt-get install -y libicu-dev libidn11-dev libvips42 ${{ inputs.additional-system-dependencies }}
 
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
diff --git a/.github/workflows/test-ruby.yml b/.github/workflows/test-ruby.yml
index 2bfa59e6b12177..5f2297381a7328 100644
--- a/.github/workflows/test-ruby.yml
+++ b/.github/workflows/test-ruby.yml
@@ -133,7 +133,7 @@ jobs:
         uses: ./.github/actions/setup-ruby
         with:
           ruby-version: ${{ matrix.ruby-version}}
-          additional-system-dependencies: ffmpeg imagemagick libpam-dev
+          additional-system-dependencies: ffmpeg libpam-dev
 
       - name: Load database schema
         run: './bin/rails db:create db:schema:load db:seed'
@@ -148,6 +148,93 @@ jobs:
         env:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 
+  test-libvips:
+    name: Libvips tests
+    runs-on: ubuntu-24.04
+
+    needs:
+      - build
+
+    services:
+      postgres:
+        image: postgres:14-alpine
+        env:
+          POSTGRES_PASSWORD: postgres
+          POSTGRES_USER: postgres
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          - 5432:5432
+
+      redis:
+        image: redis:7-alpine
+        options: >-
+          --health-cmd "redis-cli ping"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          - 6379:6379
+
+    env:
+      DB_HOST: localhost
+      DB_USER: postgres
+      DB_PASS: postgres
+      DISABLE_SIMPLECOV: ${{ matrix.ruby-version != '.ruby-version' }}
+      RAILS_ENV: test
+      ALLOW_NOPAM: true
+      PAM_ENABLED: true
+      PAM_DEFAULT_SERVICE: pam_test
+      PAM_CONTROLLED_SERVICE: pam_test_controlled
+      OIDC_ENABLED: true
+      OIDC_SCOPE: read
+      SAML_ENABLED: true
+      CAS_ENABLED: true
+      BUNDLE_WITH: 'pam_authentication test'
+      GITHUB_RSPEC: ${{ matrix.ruby-version == '.ruby-version' && github.event.pull_request && 'true' }}
+      MASTODON_USE_LIBVIPS: true
+
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby-version:
+          - '3.1'
+          - '3.2'
+          - '.ruby-version'
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/download-artifact@v4
+        with:
+          path: './'
+          name: ${{ github.sha }}
+
+      - name: Expand archived asset artifacts
+        run: |
+          tar xvzf artifacts.tar.gz
+
+      - name: Set up Ruby environment
+        uses: ./.github/actions/setup-ruby
+        with:
+          ruby-version: ${{ matrix.ruby-version}}
+          additional-system-dependencies: ffmpeg libpam-dev libyaml-dev
+
+      - name: Load database schema
+        run: './bin/rails db:create db:schema:load db:seed'
+
+      - run: bin/rspec --tag paperclip_processing
+
+      - name: Upload coverage reports to Codecov
+        if: matrix.ruby-version == '.ruby-version'
+        uses: codecov/codecov-action@v4
+        with:
+          files: coverage/lcov/mastodon.lcov
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+
   test-e2e:
     name: End to End testing
     runs-on: ubuntu-latest
@@ -209,7 +296,7 @@ jobs:
         uses: ./.github/actions/setup-ruby
         with:
           ruby-version: ${{ matrix.ruby-version}}
-          additional-system-dependencies: ffmpeg imagemagick
+          additional-system-dependencies: ffmpeg
 
       - name: Set up Javascript environment
         uses: ./.github/actions/setup-javascript
@@ -329,7 +416,7 @@ jobs:
         uses: ./.github/actions/setup-ruby
         with:
           ruby-version: ${{ matrix.ruby-version}}
-          additional-system-dependencies: ffmpeg imagemagick
+          additional-system-dependencies: ffmpeg
 
       - name: Set up Javascript environment
         uses: ./.github/actions/setup-javascript
diff --git a/Dockerfile b/Dockerfile
index c90d5dc9806341..6d342db43721b3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -43,6 +43,8 @@ ENV \
 # Apply Mastodon version information
   MASTODON_VERSION_PRERELEASE="${MASTODON_VERSION_PRERELEASE}" \
   MASTODON_VERSION_METADATA="${MASTODON_VERSION_METADATA}" \
+# Enable libvips
+  MASTODON_USE_LIBVIPS=true \
 # Apply Mastodon static files and YJIT options
   RAILS_SERVE_STATIC_FILES=${RAILS_SERVE_STATIC_FILES} \
   RUBY_YJIT_ENABLE=${RUBY_YJIT_ENABLE} \
@@ -97,7 +99,7 @@ RUN \
     curl \
     ffmpeg \
     file \
-    imagemagick \
+    libvips42 \
     libjemalloc2 \
     patchelf \
     procps \
diff --git a/Gemfile b/Gemfile
index d9de331827dc90..ca32d0cca1837e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -23,6 +23,7 @@ gem 'fog-core', '<= 2.4.0'
 gem 'fog-openstack', '~> 1.0', require: false
 gem 'kt-paperclip', '~> 7.2'
 gem 'md-paperclip-azure', '~> 2.2', require: false
+gem 'ruby-vips', '~> 2.2', require: false
 
 gem 'active_model_serializers', '~> 0.10'
 gem 'addressable', '~> 2.8'
diff --git a/Gemfile.lock b/Gemfile.lock
index b5192c925ad138..bf5340a5b03f7f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -763,6 +763,8 @@ GEM
     ruby-saml (1.16.0)
       nokogiri (>= 1.13.10)
       rexml
+    ruby-vips (2.2.1)
+      ffi (~> 1.12)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
     rufus-scheduler (3.9.1)
@@ -1023,6 +1025,7 @@ DEPENDENCIES
   rubocop-rspec
   ruby-prof
   ruby-progressbar (~> 1.13)
+  ruby-vips (~> 2.2)
   rubyzip (~> 2.3)
   sanitize (~> 6.0)
   scenic (~> 1.7)
diff --git a/app/lib/admin/metrics/dimension/software_versions_dimension.rb b/app/lib/admin/metrics/dimension/software_versions_dimension.rb
index 97cdaf589e8c5e..9dd0d393f90bf1 100644
--- a/app/lib/admin/metrics/dimension/software_versions_dimension.rb
+++ b/app/lib/admin/metrics/dimension/software_versions_dimension.rb
@@ -10,7 +10,7 @@ def key
   protected
 
   def perform_query
-    [mastodon_version, ruby_version, postgresql_version, redis_version, elasticsearch_version].compact
+    [mastodon_version, ruby_version, postgresql_version, redis_version, elasticsearch_version, libvips_version].compact
   end
 
   def mastodon_version
@@ -71,6 +71,17 @@ def elasticsearch_version
     nil
   end
 
+  def libvips_version
+    return unless Rails.configuration.x.use_vips
+
+    {
+      key: 'libvips',
+      human_key: 'libvips',
+      value: Vips.version_string,
+      human_value: Vips.version_string,
+    }
+  end
+
   def redis_info
     @redis_info ||= if redis.is_a?(Redis::Namespace)
                       redis.redis.info
diff --git a/app/models/concerns/attachmentable.rb b/app/models/concerns/attachmentable.rb
index f457f5822b0b1b..a83e178fc4f2c9 100644
--- a/app/models/concerns/attachmentable.rb
+++ b/app/models/concerns/attachmentable.rb
@@ -69,7 +69,7 @@ def appropriate_extension(attachment)
     original_extension       = Paperclip::Interpolations.extension(attachment, :original)
     proper_extension         = extensions_for_mime_type.first.to_s
     extension                = extensions_for_mime_type.include?(original_extension) ? original_extension : proper_extension
-    extension                = 'jpeg' if extension == 'jpe'
+    extension                = 'jpeg' if ['jpe', 'jfif'].include?(extension)
 
     extension
   end
diff --git a/app/models/preview_card.rb b/app/models/preview_card.rb
index 11fdd9d88ac346..cbfc39378652fb 100644
--- a/app/models/preview_card.rb
+++ b/app/models/preview_card.rb
@@ -57,7 +57,11 @@ class PreviewCard < ApplicationRecord
   has_one :trend, class_name: 'PreviewCardTrend', inverse_of: :preview_card, dependent: :destroy
   belongs_to :author_account, class_name: 'Account', optional: true
 
-  has_attached_file :image, processors: [:thumbnail, :blurhash_transcoder], styles: ->(f) { image_styles(f) }, convert_options: { all: '-quality 90 +profile "!icc,*" +set date:modify +set date:create +set date:timestamp' }, validate_media_type: false
+  has_attached_file :image,
+                    processors: [Rails.configuration.x.use_vips ? :lazy_thumbnail : :thumbnail, :blurhash_transcoder],
+                    styles: ->(f) { image_styles(f) },
+                    convert_options: { all: '-quality 90 +profile "!icc,*" +set date:modify +set date:create +set date:timestamp' },
+                    validate_media_type: false
 
   validates :url, presence: true, uniqueness: true, url: true
   validates_attachment_content_type :image, content_type: IMAGE_MIME_TYPES
diff --git a/config/application.rb b/config/application.rb
index a8e313069d93b7..069eb3774063cf 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -27,7 +27,7 @@
 require_relative '../lib/redis/namespace_extensions'
 require_relative '../lib/paperclip/url_generator_extensions'
 require_relative '../lib/paperclip/attachment_extensions'
-require_relative '../lib/paperclip/lazy_thumbnail'
+
 require_relative '../lib/paperclip/gif_transcoder'
 require_relative '../lib/paperclip/media_type_spoof_detector_extensions'
 require_relative '../lib/paperclip/transcoder'
@@ -100,6 +100,14 @@ class Application < Rails::Application
 
     config.before_configuration do
       require 'mastodon/redis_config'
+
+      config.x.use_vips = ENV['MASTODON_USE_LIBVIPS'] == 'true'
+
+      if config.x.use_vips
+        require_relative '../lib/paperclip/vips_lazy_thumbnail'
+      else
+        require_relative '../lib/paperclip/lazy_thumbnail'
+      end
     end
 
     config.to_prepare do
diff --git a/config/initializers/vips.rb b/config/initializers/vips.rb
new file mode 100644
index 00000000000000..25a17b2a171fca
--- /dev/null
+++ b/config/initializers/vips.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+if Rails.configuration.x.use_vips
+  ENV['VIPS_BLOCK_UNTRUSTED'] = 'true'
+
+  require 'vips'
+
+  abort('Incompatible libvips version, please install libvips >= 8.13') unless Vips.at_least_libvips?(8, 13)
+
+  Vips.block('VipsForeign', true)
+
+  %w(
+    VipsForeignLoadNsgif
+    VipsForeignLoadJpeg
+    VipsForeignLoadPng
+    VipsForeignLoadWebp
+    VipsForeignLoadHeif
+    VipsForeignSavePng
+    VipsForeignSaveSpng
+    VipsForeignSaveJpeg
+    VipsForeignSaveWebp
+  ).each do |operation|
+    Vips.block(operation, false)
+  end
+
+  Vips.block_untrusted(true)
+end
diff --git a/lib/paperclip/blurhash_transcoder.rb b/lib/paperclip/blurhash_transcoder.rb
index c22c20c57ad19c..e9cecef50c88d7 100644
--- a/lib/paperclip/blurhash_transcoder.rb
+++ b/lib/paperclip/blurhash_transcoder.rb
@@ -5,12 +5,26 @@ class BlurhashTranscoder < Paperclip::Processor
     def make
       return @file unless options[:style] == :small || options[:blurhash]
 
-      pixels   = convert(':source -depth 8 RGB:-', source: File.expand_path(@file.path)).unpack('C*')
-      geometry = options.fetch(:file_geometry_parser).from_file(@file)
+      width, height, data = blurhash_params
+      # Guard against segfaults if data has unexpected size
+      raise RangeError("Invalid image data size (expected #{width * height * 3}, got #{data.size})") if data.size != width * height * 3 # TODO: should probably be another exception type
 
-      attachment.instance.blurhash = Blurhash.encode(geometry.width, geometry.height, pixels, **(options[:blurhash] || {}))
+      attachment.instance.blurhash = Blurhash.encode(width, height, data, **(options[:blurhash] || {}))
 
       @file
     end
+
+    private
+
+    def blurhash_params
+      if Rails.configuration.x.use_vips
+        image = Vips::Image.thumbnail(@file.path, 100)
+        [image.width, image.height, image.colourspace(:srgb).extract_band(0, n: 3).to_a.flatten]
+      else
+        pixels   = convert(':source -depth 8 RGB:-', source: File.expand_path(@file.path)).unpack('C*')
+        geometry = options.fetch(:file_geometry_parser).from_file(@file)
+        [geometry.width, geometry.height, pixels]
+      end
+    end
   end
 end
diff --git a/lib/paperclip/color_extractor.rb b/lib/paperclip/color_extractor.rb
index d2f7e7c6025bc8..b5992f90bcbcfc 100644
--- a/lib/paperclip/color_extractor.rb
+++ b/lib/paperclip/color_extractor.rb
@@ -7,15 +7,10 @@ class ColorExtractor < Paperclip::Processor
     MIN_CONTRAST        = 3.0
     ACCENT_MIN_CONTRAST = 2.0
     FREQUENCY_THRESHOLD = 0.01
+    BINS = 10
 
     def make
-      depth = 8
-
-      # Determine background palette by getting colors close to the image's edge only
-      background_palette = palette_from_histogram(convert(':source -alpha set -gravity Center -region 75%x75% -fill None -colorize 100% -alpha transparent +region -format %c -colors :quantity -depth :depth histogram:info:', source: File.expand_path(@file.path), quantity: 10, depth: depth), 10)
-
-      # Determine foreground palette from the whole image
-      foreground_palette = palette_from_histogram(convert(':source -format %c -colors :quantity -depth :depth histogram:info:', source: File.expand_path(@file.path), quantity: 10, depth: depth), 10)
+      background_palette, foreground_palette = Rails.configuration.x.use_vips ? palettes_from_libvips : palettes_from_imagemagick
 
       background_color   = background_palette.first || foreground_palette.first
       foreground_colors  = []
@@ -78,6 +73,75 @@ def make
 
     private
 
+    def palettes_from_libvips
+      image = downscaled_image
+      block_edge_dim = (image.height * 0.25).floor
+      line_edge_dim = (image.width * 0.25).floor
+
+      edge_image = begin
+        top = image.crop(0, 0, image.width, block_edge_dim)
+        bottom = image.crop(0, image.height - block_edge_dim, image.width, block_edge_dim)
+        left = image.crop(0, block_edge_dim, line_edge_dim, image.height - (block_edge_dim * 2))
+        right = image.crop(image.width - line_edge_dim, block_edge_dim, line_edge_dim, image.height - (block_edge_dim * 2))
+        top.join(bottom, :vertical).join(left, :horizontal).join(right, :horizontal)
+      end
+
+      background_palette = palette_from_image(edge_image)
+      foreground_palette = palette_from_image(image)
+      [background_palette, foreground_palette]
+    end
+
+    def palettes_from_imagemagick
+      depth = 8
+
+      # Determine background palette by getting colors close to the image's edge only
+      background_palette = palette_from_im_histogram(convert(':source -alpha set -gravity Center -region 75%x75% -fill None -colorize 100% -alpha transparent +region -format %c -colors :quantity -depth :depth histogram:info:', source: File.expand_path(@file.path), quantity: 10, depth: depth), 10)
+
+      # Determine foreground palette from the whole image
+      foreground_palette = palette_from_im_histogram(convert(':source -format %c -colors :quantity -depth :depth histogram:info:', source: File.expand_path(@file.path), quantity: 10, depth: depth), 10)
+      [background_palette, foreground_palette]
+    end
+
+    def downscaled_image
+      image = Vips::Image.new_from_file(@file.path, access: :random).thumbnail_image(100)
+
+      image.colourspace(:srgb).extract_band(0, n: 3)
+    end
+
+    def palette_from_image(image)
+      # `hist_find_ndim` will create a BINS×BINS×BINS 3D histogram of the image
+      # represented as an image of size BINS×BINS with `BINS` bands.
+      # The number of occurrences of a color (r, g, b) is thus encoded in band `b` at pixel position `(r, g)`
+      histogram = image.hist_find_ndim(bins: BINS)
+
+      # `histogram.max` returns an array of maxima with their pixel positions, but we don't know in which
+      # band they are
+      _, colors = histogram.max(size: 10, out_array: true, x_array: true, y_array: true)
+
+      colors['out_array'].zip(colors['x_array'], colors['y_array']).map do |v, x, y|
+        rgb_from_xyv(histogram, x, y, v)
+      end.reverse
+    end
+
+    # rubocop:disable Naming/MethodParameterName
+    def rgb_from_xyv(image, x, y, v)
+      pixel = image.getpoint(x, y)
+
+      # Unfortunately, we only have the first 2 dimensions, so try to
+      # guess the third one by looking up the value
+
+      # NOTE: this means that if multiple bins with the same `r` and `g`
+      # components have the same number of occurrences, we will always return
+      # the one with the lowest `b` value. This means that in case of a tie,
+      # we will return the same color twice and skip the ones it tied with.
+      z = pixel.find_index(v)
+
+      r = (x + 0.5) * 256 / BINS
+      g = (y + 0.5) * 256 / BINS
+      b = (z + 0.5) * 256 / BINS
+      ColorDiff::Color::RGB.new(r, g, b)
+    end
+
     def w3c_contrast(color1, color2)
       luminance1 = (color1.to_xyz.y * 0.01) + 0.05
       luminance2 = (color2.to_xyz.y * 0.01) + 0.05
@@ -89,7 +153,6 @@ def w3c_contrast(color1, color2)
       end
     end
 
-    # rubocop:disable Naming/MethodParameterName
     def rgb_to_hsl(r, g, b)
       r /= 255.0
       g /= 255.0
@@ -170,7 +233,7 @@ def lighten_or_darken(color, by)
       ColorDiff::Color::RGB.new(*hsl_to_rgb(hue, saturation, light))
     end
 
-    def palette_from_histogram(result, quantity)
+    def palette_from_im_histogram(result, quantity)
       frequencies       = result.scan(/([0-9]+):/).flatten.map(&:to_f)
       hex_values        = result.scan(/\#([0-9A-Fa-f]{6,8})/).flatten
       total_frequencies = frequencies.sum.to_f
diff --git a/lib/paperclip/vips_lazy_thumbnail.rb b/lib/paperclip/vips_lazy_thumbnail.rb
new file mode 100644
index 00000000000000..06d99bf79d073f
--- /dev/null
+++ b/lib/paperclip/vips_lazy_thumbnail.rb
@@ -0,0 +1,141 @@
+# frozen_string_literal: true
+
+module Paperclip
+  class LazyThumbnail < Paperclip::Processor
+    GIF_MAX_FPS = 60
+    GIF_MAX_FRAMES = 3000
+    GIF_PALETTE_COLORS = 32
+
+    ALLOWED_FIELDS = %w(
+      icc-profile-data
+    ).freeze
+
+    class PixelGeometryParser
+      def self.parse(current_geometry, pixels)
+        width  = Math.sqrt(pixels * (current_geometry.width.to_f / current_geometry.height)).round.to_i
+        height = Math.sqrt(pixels * (current_geometry.height.to_f / current_geometry.width)).round.to_i
+
+        Paperclip::Geometry.new(width, height)
+      end
+    end
+
+    def initialize(file, options = {}, attachment = nil)
+      super
+
+      @crop = options[:geometry].to_s[-1, 1] == '#'
+      @current_geometry = options.fetch(:file_geometry_parser, Geometry).from_file(@file)
+      @target_geometry = options[:pixels] ? PixelGeometryParser.parse(@current_geometry, options[:pixels]) : options.fetch(:string_geometry_parser, Geometry).parse(options[:geometry].to_s)
+      @format = options[:format]
+      @current_format = File.extname(@file.path)
+      @basename = File.basename(@file.path, @current_format)
+
+      correct_current_format!
+    end
+
+    def make
+      return File.open(@file.path) unless needs_convert?
+
+      dst = TempfileFactory.new.generate([@basename, @format ? ".#{@format}" : @current_format].join)
+
+      if preserve_animation?
+        if @target_geometry.nil? || (@current_geometry.width <= @target_geometry.width && @current_geometry.height <= @target_geometry.height)
+          target_width = 'iw'
+          target_height = 'ih'
+        else
+          scale = [@target_geometry.width.to_f / @current_geometry.width, @target_geometry.height.to_f / @current_geometry.height].min
+          target_width = (@current_geometry.width * scale).round
+          target_height = (@current_geometry.height * scale).round
+        end
+
+        # The only situation where we use crop on GIFs is cropping them to a square
+        # aspect ratio, such as for avatars, so this is the only special case we
+        # implement. If cropping ever becomes necessary for other situations, this will
+        # need to be expanded.
+        crop_width = crop_height = [target_width, target_height].min if @target_geometry&.square?
+
+        filter = begin
+          if @crop
+            "scale=#{target_width}:#{target_height}:force_original_aspect_ratio=increase,crop=#{crop_width}:#{crop_height}"
+          else
+            "scale=#{target_width}:#{target_height}:force_original_aspect_ratio=decrease"
+          end
+        end
+
+        command = Terrapin::CommandLine.new(Rails.configuration.x.ffmpeg_binary, '-nostdin -i :source -map_metadata -1 -fpsmax :max_fps -frames:v :max_frames -filter_complex :filter -y :destination', logger: Paperclip.logger)
+        command.run({ source: @file.path, filter: "#{filter},split[a][b];[a]palettegen=max_colors=#{GIF_PALETTE_COLORS}[p];[b][p]paletteuse=dither=bayer", max_fps: GIF_MAX_FPS, max_frames: GIF_MAX_FRAMES, destination: dst.path })
+      else
+        transformed_image.write_to_file(dst.path, **save_options)
+      end
+
+      dst
+    rescue Terrapin::ExitStatusError => e
+      raise Paperclip::Error, "Error while optimizing #{@basename}: #{e}"
+    rescue Terrapin::CommandNotFoundError
+      raise Paperclip::Errors::CommandNotFoundError, 'Could not run the `ffmpeg` command. Please install ffmpeg.'
+    end
+
+    private
+
+    def correct_current_format!
+      # If the attachment was uploaded through a base64 payload, the tempfile
+      # will not have a file extension. It could also have the wrong file extension,
+      # depending on what the uploaded file was named. We correct for this in the final
+      # file name, which is however not yet physically in place on the temp file, so we
+      # need to use it here. Mind that this only reliably works if this processor is
+      # the first in line and we're working with the original, unmodified file.
+      @current_format = File.extname(attachment.instance_read(:file_name))
+    end
+
+    def transformed_image
+      # libvips has some optimizations for resizing an image on load. If we don't need to
+      # resize the image, we have to load it a different way.
+      if @target_geometry.nil?
+        Vips::Image.new_from_file(preserve_animation? ? "#{@file.path}[n=-1]" : @file.path, access: :sequential).copy.mutate do |mutable|
+          (mutable.get_fields - ALLOWED_FIELDS).each do |field|
+            mutable.remove!(field)
+          end
+        end
+      else
+        Vips::Image.thumbnail(@file.path, @target_geometry.width, height: @target_geometry.height, **thumbnail_options).mutate do |mutable|
+          (mutable.get_fields - ALLOWED_FIELDS).each do |field|
+            mutable.remove!(field)
+          end
+        end
+      end
+    end
+
+    def thumbnail_options
+      @crop ? { crop: :centre } : { size: :down }
+    end
+
+    def save_options
+      case @format
+      when 'jpg'
+        { Q: 90, interlace: true }
+      else
+        {}
+      end
+    end
+
+    def preserve_animation?
+      @format == 'gif' || (@format.blank? && @current_format == '.gif')
+    end
+
+    def needs_convert?
+      needs_different_geometry? || needs_different_format? || needs_metadata_stripping?
+    end
+
+    def needs_different_geometry?
+      (options[:geometry] && @current_geometry.width != @target_geometry.width && @current_geometry.height != @target_geometry.height) ||
+        (options[:pixels] && @current_geometry.width * @current_geometry.height > options[:pixels])
+    end
+
+    def needs_different_format?
+      @format.present? && @current_format != ".#{@format}"
+    end
+
+    def needs_metadata_stripping?
+      @attachment.instance.respond_to?(:local?) && @attachment.instance.local?
+    end
+  end
+end
diff --git a/spec/fixtures/files/monochrome.png b/spec/fixtures/files/monochrome.png
new file mode 100644
index 0000000000000000000000000000000000000000..fa36101cad383620a94c627add680bff8d38c3c2
GIT binary patch
literal 9216
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
Rr%5lkm>5{<*TdW*{s*~%YhM5W

literal 0
HcmV?d00001

diff --git a/spec/models/media_attachment_spec.rb b/spec/models/media_attachment_spec.rb
index 1b9a13c38c2d62..221645ac5ae356 100644
--- a/spec/models/media_attachment_spec.rb
+++ b/spec/models/media_attachment_spec.rb
@@ -139,6 +139,12 @@
     it_behaves_like 'static 600x400 image', 'image/png', '.png'
   end
 
+  describe 'monochrome jpg' do
+    let(:media) { Fabricate(:media_attachment, file: attachment_fixture('monochrome.png')) }
+
+    it_behaves_like 'static 600x400 image', 'image/png', '.png'
+  end
+
   describe 'webp' do
     let(:media) { Fabricate(:media_attachment, file: attachment_fixture('600x400.webp')) }
 
@@ -203,7 +209,9 @@
       expect(media.type).to eq 'audio'
       expect(media.file.meta['original']['duration']).to be_within(0.05).of(0.235102)
       expect(media.thumbnail.present?).to be true
-      expect(media.file.meta['colors']['background']).to eq '#3088d4'
+
+      # NOTE: Our libvips and ImageMagick implementations currently have different results
+      expect(media.file.meta['colors']['background']).to eq(ENV['MASTODON_USE_LIBVIPS'] ? '#268cd9' : '#3088d4')
       expect(media.file_file_name).to_not eq 'boop.ogg'
     end
   end

From 4655be0da6c0f9a58f4d09a32189cbe5619c42d1 Mon Sep 17 00:00:00 2001
From: Emelia Smith <ThisIsMissEm@users.noreply.github.com>
Date: Wed, 5 Jun 2024 21:16:47 +0200
Subject: [PATCH 1176/2191] Fix add validation to webpush subscription keys
 (#30542)

---
 app/models/web/push_subscription.rb           |  2 +
 app/validators/web_push_key_validator.rb      | 11 +++++
 .../web_push_subscription_fabricator.rb       |  8 +++-
 .../api/v1/push/subscriptions_spec.rb         | 47 +++++++++++++++----
 4 files changed, 57 insertions(+), 11 deletions(-)
 create mode 100644 app/validators/web_push_key_validator.rb

diff --git a/app/models/web/push_subscription.rb b/app/models/web/push_subscription.rb
index 1860f0aa3ea4c6..b482ad3afe25c7 100644
--- a/app/models/web/push_subscription.rb
+++ b/app/models/web/push_subscription.rb
@@ -25,6 +25,8 @@ class Web::PushSubscription < ApplicationRecord
   validates :key_p256dh, presence: true
   validates :key_auth, presence: true
 
+  validates_with WebPushKeyValidator
+
   delegate :locale, to: :associated_user
 
   def encrypt(payload)
diff --git a/app/validators/web_push_key_validator.rb b/app/validators/web_push_key_validator.rb
new file mode 100644
index 00000000000000..a8ad5c9c6bbaea
--- /dev/null
+++ b/app/validators/web_push_key_validator.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class WebPushKeyValidator < ActiveModel::Validator
+  def validate(subscription)
+    begin
+      Webpush::Encryption.encrypt('validation_test', subscription.key_p256dh, subscription.key_auth)
+    rescue ArgumentError, OpenSSL::PKey::EC::Point::Error
+      subscription.errors.add(:base, I18n.t('crypto.errors.invalid_key'))
+    end
+  end
+end
diff --git a/spec/fabricators/web_push_subscription_fabricator.rb b/spec/fabricators/web_push_subscription_fabricator.rb
index baffdbf83ea902..6b4028342c0e8b 100644
--- a/spec/fabricators/web_push_subscription_fabricator.rb
+++ b/spec/fabricators/web_push_subscription_fabricator.rb
@@ -2,6 +2,10 @@
 
 Fabricator(:web_push_subscription, from: Web::PushSubscription) do
   endpoint   Faker::Internet.url
-  key_p256dh Faker::Internet.password
-  key_auth   Faker::Internet.password
+  key_p256dh do
+    curve = OpenSSL::PKey::EC.generate('prime256v1')
+    ecdh_key = curve.public_key.to_bn.to_s(2)
+    Base64.urlsafe_encode64(ecdh_key)
+  end
+  key_auth { Base64.urlsafe_encode64(Random.new.bytes(16)) }
 end
diff --git a/spec/requests/api/v1/push/subscriptions_spec.rb b/spec/requests/api/v1/push/subscriptions_spec.rb
index 82ea308cd69abc..54ef5a13ade6b8 100644
--- a/spec/requests/api/v1/push/subscriptions_spec.rb
+++ b/spec/requests/api/v1/push/subscriptions_spec.rb
@@ -5,14 +5,17 @@
 describe 'API V1 Push Subscriptions' do
   let(:user) { Fabricate(:user) }
   let(:endpoint) { 'https://fcm.googleapis.com/fcm/send/fiuH06a27qE:APA91bHnSiGcLwdaxdyqVXNDR9w1NlztsHb6lyt5WDKOC_Z_Q8BlFxQoR8tWFSXUIDdkyw0EdvxTu63iqamSaqVSevW5LfoFwojws8XYDXv_NRRLH6vo2CdgiN4jgHv5VLt2A8ah6lUX' }
+  let(:keys) do
+    {
+      p256dh: 'BEm_a0bdPDhf0SOsrnB2-ategf1hHoCnpXgQsFj5JCkcoMrMt2WHoPfEYOYPzOIs9mZE8ZUaD7VA5vouy0kEkr8=',
+      auth: 'eH_C8rq2raXqlcBVDa1gLg==',
+    }
+  end
   let(:create_payload) do
     {
       subscription: {
         endpoint: endpoint,
-        keys: {
-          p256dh: 'BEm_a0bdPDhf0SOsrnB2-ategf1hHoCnpXgQsFj5JCkcoMrMt2WHoPfEYOYPzOIs9mZE8ZUaD7VA5vouy0kEkr8=',
-          auth: 'eH_C8rq2raXqlcBVDa1gLg==',
-        },
+        keys: keys,
       },
     }.with_indifferent_access
   end
@@ -37,6 +40,16 @@
   let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
   let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
 
+  shared_examples 'validation error' do
+    it 'returns a validation error' do
+      subject
+
+      expect(response).to have_http_status(422)
+      expect(endpoint_push_subscriptions.count).to eq(0)
+      expect(endpoint_push_subscription).to be_nil
+    end
+  end
+
   describe 'POST /api/v1/push/subscription' do
     subject { post '/api/v1/push/subscription', params: create_payload, headers: headers }
 
@@ -68,13 +81,29 @@
     context 'with invalid endpoint URL' do
       let(:endpoint) { 'app://example.foo' }
 
-      it 'returns a validation error' do
-        subject
+      it_behaves_like 'validation error'
+    end
+
+    context 'with invalid p256dh key' do
+      let(:keys) do
+        {
+          p256dh: 'BEm_invalidf0SOsrnB2-ategf1hHoCnpXgQsFj5JCkcoMrMt2WHoPfEYOYPzOIs9mZE8ZUaD7VA5vouy0kEkr8=',
+          auth: 'eH_C8rq2raXqlcBVDa1gLg==',
+        }
+      end
 
-        expect(response).to have_http_status(422)
-        expect(endpoint_push_subscriptions.count).to eq(0)
-        expect(endpoint_push_subscription).to be_nil
+      it_behaves_like 'validation error'
+    end
+
+    context 'with invalid base64 p256dh key' do
+      let(:keys) do
+        {
+          p256dh: 'not base64',
+          auth: 'eH_C8rq2raXqlcBVDa1gLg==',
+        }
       end
+
+      it_behaves_like 'validation error'
     end
   end
 

From 3c435f9ba0d3a1a0a07722718eee26cf10ff55b6 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 6 Jun 2024 01:52:46 +0200
Subject: [PATCH 1177/2191] Change counters to be displayed on profile
 timelines in web UI (#30525)

---
 app/javascript/mastodon/features/account_timeline/index.jsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/javascript/mastodon/features/account_timeline/index.jsx b/app/javascript/mastodon/features/account_timeline/index.jsx
index 5ec029593d5344..0478f7a1a16b6f 100644
--- a/app/javascript/mastodon/features/account_timeline/index.jsx
+++ b/app/javascript/mastodon/features/account_timeline/index.jsx
@@ -199,6 +199,7 @@ class AccountTimeline extends ImmutablePureComponent {
           emptyMessage={emptyMessage}
           bindToDocument={!multiColumn}
           timelineId='account'
+          withCounters
         />
       </Column>
     );

From 569b7d2f25da120473937ab5719eba5ab0e314e1 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 5 Jun 2024 19:54:59 -0400
Subject: [PATCH 1178/2191] Clarify the purpose of separate Docker resources
 (#30568)

---
 Dockerfile         | 3 +++
 README.md          | 4 +++-
 docker-compose.yml | 3 +++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 6d342db43721b3..09aa8f2ddbc190 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,8 @@
 # syntax=docker/dockerfile:1.7
 
+# This file is designed for production server deployment, not local development work
+# For a containerized local dev environment, see: https://github.com/mastodon/mastodon/blob/main/README.md#docker
+
 # Please see https://docs.docker.com/engine/reference/builder for information about
 # the extended buildx capabilities used in this file.
 # Make sure multiarch TARGETPLATFORM is available for interpolation
diff --git a/README.md b/README.md
index b8ee3f5dbb1649..45291d63780f75 100644
--- a/README.md
+++ b/README.md
@@ -101,7 +101,9 @@ To set up **MacOS** for native development, complete the following steps:
 
 ### Docker
 
-For development with **Docker**, complete the following steps:
+For production hosting and deployment with **Docker**, use the `Dockerfile` and
+`docker-compose.yml` in the project root directory. To create a local
+development environment with **Docker**, complete the following steps:
 
 - Install Docker Desktop
 - Run `docker compose -f .devcontainer/docker-compose.yml up -d`
diff --git a/docker-compose.yml b/docker-compose.yml
index e7ae95ea7aa71a..7089b0d14f3a05 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,3 +1,6 @@
+# This file is designed for production server deployment, not local development work
+# For a containerized local dev environment, see: https://github.com/mastodon/mastodon/blob/main/README.md#docker
+
 services:
   db:
     restart: always

From e02d23b5499318432981b16d8968e109ebeca18c Mon Sep 17 00:00:00 2001
From: Emelia Smith <ThisIsMissEm@users.noreply.github.com>
Date: Thu, 6 Jun 2024 09:30:10 +0200
Subject: [PATCH 1179/2191] Change `read:me` scope to `profile` scope (#30357)

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
---
 .../api/v1/accounts/credentials_controller.rb |  2 +-
 .../settings/applications_controller.rb       |  2 +-
 app/lib/scope_transformer.rb                  |  3 ++
 config/initializers/doorkeeper.rb             |  4 +--
 config/locales/doorkeeper.en.yml              |  3 +-
 ...3195202_change_read_me_scope_to_profile.rb | 23 +++++++++++++++
 db/schema.rb                                  |  2 +-
 lib/tasks/tests.rake                          | 28 ++++++++++++++++++-
 spec/lib/scope_transformer_spec.rb            |  6 ++++
 .../api/v1/accounts/credentials_spec.rb       |  4 +--
 10 files changed, 68 insertions(+), 9 deletions(-)
 create mode 100644 db/post_migrate/20240603195202_change_read_me_scope_to_profile.rb

diff --git a/app/controllers/api/v1/accounts/credentials_controller.rb b/app/controllers/api/v1/accounts/credentials_controller.rb
index e8f712457eee78..a378425183b49d 100644
--- a/app/controllers/api/v1/accounts/credentials_controller.rb
+++ b/app/controllers/api/v1/accounts/credentials_controller.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Api::V1::Accounts::CredentialsController < Api::BaseController
-  before_action -> { doorkeeper_authorize! :read, :'read:accounts', :'read:me' }, except: [:update]
+  before_action -> { doorkeeper_authorize! :profile, :read, :'read:accounts' }, except: [:update]
   before_action -> { doorkeeper_authorize! :write, :'write:accounts' }, only: [:update]
   before_action :require_user!
 
diff --git a/app/controllers/settings/applications_controller.rb b/app/controllers/settings/applications_controller.rb
index 6849979b115233..d6573f9b4949bf 100644
--- a/app/controllers/settings/applications_controller.rb
+++ b/app/controllers/settings/applications_controller.rb
@@ -13,7 +13,7 @@ def show; end
   def new
     @application = Doorkeeper::Application.new(
       redirect_uri: Doorkeeper.configuration.native_redirect_uri,
-      scopes: 'read:me'
+      scopes: 'profile'
     )
   end
 
diff --git a/app/lib/scope_transformer.rb b/app/lib/scope_transformer.rb
index adcb711f8ad2d1..7dda709229d031 100644
--- a/app/lib/scope_transformer.rb
+++ b/app/lib/scope_transformer.rb
@@ -11,6 +11,9 @@ def initialize(scope)
       @namespace = scope[:namespace]&.to_s
       @access    = scope[:access] ? [scope[:access].to_s] : DEFAULT_ACCESS.dup
       @term      = scope[:term]&.to_s || DEFAULT_TERM
+
+      # # override for profile scope which is read only
+      @access = %w(read) if @term == 'profile'
     end
 
     def key
diff --git a/config/initializers/doorkeeper.rb b/config/initializers/doorkeeper.rb
index 1e8f9ad50617b9..83100b1cf5f78e 100644
--- a/config/initializers/doorkeeper.rb
+++ b/config/initializers/doorkeeper.rb
@@ -74,7 +74,8 @@
   # For more information go to
   # https://github.com/doorkeeper-gem/doorkeeper/wiki/Using-Scopes
   default_scopes  :read
-  optional_scopes :write,
+  optional_scopes :profile,
+                  :write,
                   :'write:accounts',
                   :'write:blocks',
                   :'write:bookmarks',
@@ -89,7 +90,6 @@
                   :'write:reports',
                   :'write:statuses',
                   :read,
-                  :'read:me',
                   :'read:accounts',
                   :'read:blocks',
                   :'read:bookmarks',
diff --git a/config/locales/doorkeeper.en.yml b/config/locales/doorkeeper.en.yml
index 98776f2193fba6..b623cc713506fe 100644
--- a/config/locales/doorkeeper.en.yml
+++ b/config/locales/doorkeeper.en.yml
@@ -135,6 +135,7 @@ en:
         media: Media attachments
         mutes: Mutes
         notifications: Notifications
+        profile: Your Mastodon profile
         push: Push notifications
         reports: Reports
         search: Search
@@ -165,6 +166,7 @@ en:
       admin:write:reports: perform moderation actions on reports
       crypto: use end-to-end encryption
       follow: modify account relationships
+      profile: read only your account's profile information
       push: receive your push notifications
       read: read all your account's data
       read:accounts: see accounts information
@@ -174,7 +176,6 @@ en:
       read:filters: see your filters
       read:follows: see your follows
       read:lists: see your lists
-      read:me: read only your account's basic information
       read:mutes: see your mutes
       read:notifications: see your notifications
       read:reports: see your reports
diff --git a/db/post_migrate/20240603195202_change_read_me_scope_to_profile.rb b/db/post_migrate/20240603195202_change_read_me_scope_to_profile.rb
new file mode 100644
index 00000000000000..05e5984c480bbb
--- /dev/null
+++ b/db/post_migrate/20240603195202_change_read_me_scope_to_profile.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+class ChangeReadMeScopeToProfile < ActiveRecord::Migration[7.1]
+  def up
+    replace_scopes('read:me', 'profile')
+  end
+
+  def down
+    replace_scopes('profile', 'read:me')
+  end
+
+  private
+
+  def replace_scopes(old_scope, new_scope)
+    Doorkeeper::Application.where("scopes LIKE '%#{old_scope}%'").in_batches do |applications|
+      applications.update_all("scopes = replace(scopes, '#{old_scope}', '#{new_scope}')")
+    end
+
+    Doorkeeper::AccessToken.where("scopes LIKE '%#{old_scope}%'").in_batches do |access_tokens|
+      access_tokens.update_all("scopes = replace(scopes, '#{old_scope}', '#{new_scope}')")
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 73f6b464e47c44..ce2951608b0882 100644
--- 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_05_22_041528) do
+ActiveRecord::Schema[7.1].define(version: 2024_06_03_195202) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
diff --git a/lib/tasks/tests.rake b/lib/tasks/tests.rake
index c8e0312bbd8ef1..c8e4dc31cd7f13 100644
--- a/lib/tasks/tests.rake
+++ b/lib/tasks/tests.rake
@@ -130,11 +130,20 @@ namespace :tests do
       # This is checking the attribute rather than the method, to avoid the legacy fallback
       # and ensure the data has been migrated
       unless Account.find_local('qcuser').user[:otp_secret] == 'anotpsecretthatshouldbeencrypted'
-        puts "DEBUG: #{Account.find_local('qcuser').user.inspect}"
         puts 'OTP secret for user not preserved as expected'
         exit(1)
       end
 
+      unless Doorkeeper::Application.find(2)[:scopes] == 'write:accounts profile'
+        puts 'Application OAuth scopes not rewritten as expected'
+        exit(1)
+      end
+
+      unless Doorkeeper::Application.find(2).access_tokens.first[:scopes] == 'write:accounts profile'
+        puts 'OAuth access token scopes not rewritten as expected'
+        exit(1)
+      end
+
       puts 'No errors found. Database state is consistent with a successful migration process.'
     end
 
@@ -152,6 +161,23 @@ namespace :tests do
         VALUES
           (1, 'https://example.com/users/foobar', 'foobar@example.com', now(), now()),
           (1, 'https://example.com/users/foobar', 'foobar@example.com', now(), now());
+
+        /* Doorkeeper records
+           While the `read:me` scope was technically not valid in 3.3.0,
+           it is still useful for the purposes of testing the `ChangeReadMeScopeToProfile`
+           migration.
+        */
+
+        INSERT INTO "oauth_applications"
+          (id, name, uid, secret, redirect_uri, scopes, created_at, updated_at)
+        VALUES
+          (2, 'foo', 'foo', 'foo', 'https://example.com/#foo', 'write:accounts read:me', now(), now()),
+          (3, 'bar', 'bar', 'bar', 'https://example.com/#bar', 'read:me', now(), now());
+
+        INSERT INTO "oauth_access_tokens"
+          (token, application_id, scopes, resource_owner_id, created_at)
+        VALUES
+          ('secret', 2, 'write:accounts read:me', 4, now());
       SQL
     end
 
diff --git a/spec/lib/scope_transformer_spec.rb b/spec/lib/scope_transformer_spec.rb
index 8a9c7cf967217f..7bc226e94f7a0e 100644
--- a/spec/lib/scope_transformer_spec.rb
+++ b/spec/lib/scope_transformer_spec.rb
@@ -20,6 +20,12 @@
       end
     end
 
+    context 'with scope "profile"' do
+      let(:input) { 'profile' }
+
+      it_behaves_like 'a scope', nil, 'profile', 'read'
+    end
+
     context 'with scope "read"' do
       let(:input) { 'read' }
 
diff --git a/spec/requests/api/v1/accounts/credentials_spec.rb b/spec/requests/api/v1/accounts/credentials_spec.rb
index 8ae9c78a0e50b3..a3f552cada1e15 100644
--- a/spec/requests/api/v1/accounts/credentials_spec.rb
+++ b/spec/requests/api/v1/accounts/credentials_spec.rb
@@ -29,8 +29,8 @@
       })
     end
 
-    describe 'allows the read:me scope' do
-      let(:scopes) { 'read:me' }
+    describe 'allows the profile scope' do
+      let(:scopes) { 'profile' }
 
       it 'returns the response successfully' do
         subject

From 2fdd782f21a0d07b5c658c0e0f467c5b5622988a Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 6 Jun 2024 03:50:15 -0400
Subject: [PATCH 1180/2191] Fix empty `aria-hidden` attribute value in logo
 resources area (#30570)

---
 app/views/layouts/application.html.haml | 2 +-
 app/views/layouts/embedded.html.haml    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 5957d1dbf59813..ec6caa33ada799 100755
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -43,6 +43,6 @@
   %body{ class: body_classes }
     = content_for?(:content) ? yield(:content) : yield
 
-    .logo-resources{ 'tabindex' => '-1', 'inert' => true, 'aria-hidden' => true }
+    .logo-resources{ 'tabindex' => '-1', 'inert' => true, 'aria-hidden' => 'true' }
       = inline_svg_tag 'logo-symbol-icon.svg'
       = inline_svg_tag 'logo-symbol-wordmark.svg'
diff --git a/app/views/layouts/embedded.html.haml b/app/views/layouts/embedded.html.haml
index c633fa9e087caa..f912b3fafdcf52 100644
--- a/app/views/layouts/embedded.html.haml
+++ b/app/views/layouts/embedded.html.haml
@@ -20,5 +20,5 @@
   %body.embed
     = yield
 
-    .logo-resources{ 'tabindex' => '-1', 'inert' => true, 'aria-hidden' => true }
+    .logo-resources{ 'tabindex' => '-1', 'inert' => true, 'aria-hidden' => 'true' }
       = inline_svg_tag 'logo-symbol-icon.svg'

From d72714e5ce5a7146665ad833f760dba82ad7a0cd Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 6 Jun 2024 03:50:31 -0400
Subject: [PATCH 1181/2191] Remove deprecated version value from
 `.devcontainer/docker-compose.yml` (#30567)

---
 .devcontainer/docker-compose.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
index 5d9917b399b9a5..85f9eb22cc387d 100644
--- a/.devcontainer/docker-compose.yml
+++ b/.devcontainer/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '3'
-
 services:
   app:
     working_dir: /workspaces/mastodon/

From a2505e861150abda0e692ffe86178393d701bc93 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 6 Jun 2024 10:43:04 +0200
Subject: [PATCH 1182/2191] Add timeline of public posts about a trending link
 to REST API (#30381)

---
 .../api/v1/timelines/link_controller.rb       |  52 +++++++
 app/models/link_feed.rb                       |  35 +++++
 config/routes/api.rb                          |   1 +
 spec/requests/api/v1/timelines/link_spec.rb   | 131 ++++++++++++++++++
 4 files changed, 219 insertions(+)
 create mode 100644 app/controllers/api/v1/timelines/link_controller.rb
 create mode 100644 app/models/link_feed.rb
 create mode 100644 spec/requests/api/v1/timelines/link_spec.rb

diff --git a/app/controllers/api/v1/timelines/link_controller.rb b/app/controllers/api/v1/timelines/link_controller.rb
new file mode 100644
index 00000000000000..af962c430ffd07
--- /dev/null
+++ b/app/controllers/api/v1/timelines/link_controller.rb
@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+class Api::V1::Timelines::LinkController < Api::V1::Timelines::BaseController
+  before_action -> { doorkeeper_authorize! :read, :'read:statuses' }, only: :show, if: :require_auth?
+  before_action :set_preview_card
+  before_action :set_statuses
+
+  PERMITTED_PARAMS = %i(
+    url
+    limit
+  ).freeze
+
+  def show
+    cache_if_unauthenticated!
+    render json: @statuses, each_serializer: REST::StatusSerializer, relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id)
+  end
+
+  private
+
+  def require_auth?
+    !Setting.timeline_preview
+  end
+
+  def set_preview_card
+    @preview_card = PreviewCard.joins(:trend).merge(PreviewCardTrend.allowed).find_by!(url: params[:url])
+  end
+
+  def set_statuses
+    @statuses = @preview_card.nil? ? [] : preload_collection(link_timeline_statuses, Status)
+  end
+
+  def link_timeline_statuses
+    link_feed.get(
+      limit_param(DEFAULT_STATUSES_LIMIT),
+      params[:max_id],
+      params[:since_id],
+      params[:min_id]
+    )
+  end
+
+  def link_feed
+    LinkFeed.new(@preview_card, current_account)
+  end
+
+  def next_path
+    api_v1_timelines_link_url next_path_params
+  end
+
+  def prev_path
+    api_v1_timelines_link_url prev_path_params
+  end
+end
diff --git a/app/models/link_feed.rb b/app/models/link_feed.rb
new file mode 100644
index 00000000000000..32efb331b62656
--- /dev/null
+++ b/app/models/link_feed.rb
@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+class LinkFeed < PublicFeed
+  # @param [PreviewCard] preview_card
+  # @param [Account] account
+  # @param [Hash] options
+  def initialize(preview_card, account, options = {})
+    @preview_card = preview_card
+    super(account, options)
+  end
+
+  # @param [Integer] limit
+  # @param [Integer] max_id
+  # @param [Integer] since_id
+  # @param [Integer] min_id
+  # @return [Array<Status>]
+  def get(limit, max_id = nil, since_id = nil, min_id = nil)
+    scope = public_scope
+
+    scope.merge!(discoverable)
+    scope.merge!(attached_to_preview_card)
+
+    scope.to_a_paginated_by_id(limit, max_id: max_id, since_id: since_id, min_id: min_id)
+  end
+
+  private
+
+  def attached_to_preview_card
+    Status.joins(:preview_cards_status).where(preview_cards_status: { preview_card_id: @preview_card.id })
+  end
+
+  def discoverable
+    Account.discoverable
+  end
+end
diff --git a/config/routes/api.rb b/config/routes/api.rb
index 135a19a0a7bf54..3eb4bb4b4d58c4 100644
--- a/config/routes/api.rb
+++ b/config/routes/api.rb
@@ -39,6 +39,7 @@
     namespace :timelines do
       resource :home, only: :show, controller: :home
       resource :public, only: :show, controller: :public
+      resource :link, only: :show, controller: :link
       resources :tag, only: :show
       resources :list, only: :show
     end
diff --git a/spec/requests/api/v1/timelines/link_spec.rb b/spec/requests/api/v1/timelines/link_spec.rb
new file mode 100644
index 00000000000000..a219c9bcddec02
--- /dev/null
+++ b/spec/requests/api/v1/timelines/link_spec.rb
@@ -0,0 +1,131 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'Link' do
+  let(:user)    { Fabricate(:user) }
+  let(:scopes)  { 'read:statuses' }
+  let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+  let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
+
+  shared_examples 'a successful request to the link timeline' do
+    it 'returns the expected statuses successfully', :aggregate_failures do
+      subject
+
+      expect(response).to have_http_status(200)
+      expect(body_as_json.pluck(:id)).to match_array(expected_statuses.map { |status| status.id.to_s })
+    end
+  end
+
+  describe 'GET /api/v1/timelines/link' do
+    subject do
+      get '/api/v1/timelines/link', headers: headers, params: params
+    end
+
+    let(:url) { 'https://example.com/' }
+    let(:private_status) { Fabricate(:status, visibility: :private) }
+    let(:undiscoverable_status) { Fabricate(:status, account: Fabricate.build(:account, domain: nil, discoverable: false)) }
+    let(:local_status) { Fabricate(:status, account: Fabricate.build(:account, domain: nil, discoverable: true)) }
+    let(:remote_status) { Fabricate(:status, account: Fabricate.build(:account, domain: 'example.com', discoverable: true)) }
+    let(:params) { { url: url } }
+    let(:expected_statuses) { [local_status, remote_status] }
+    let(:preview_card) { Fabricate(:preview_card, url: url) }
+
+    before do
+      if preview_card.present?
+        preview_card.create_trend!(allowed: true)
+
+        [private_status, undiscoverable_status, remote_status, local_status].each do |status|
+          PreviewCardsStatus.create(status: status, preview_card: preview_card, url: url)
+        end
+      end
+    end
+
+    context 'when there is no preview card' do
+      let(:preview_card) { nil }
+
+      it 'returns http not found' do
+        subject
+
+        expect(response).to have_http_status(404)
+      end
+    end
+
+    context 'when preview card is not trending' do
+      before do
+        preview_card.trend.destroy!
+      end
+
+      it 'returns http not found' do
+        subject
+
+        expect(response).to have_http_status(404)
+      end
+    end
+
+    context 'when preview card is trending but not approved' do
+      before do
+        preview_card.trend.update(allowed: false)
+      end
+
+      it 'returns http not found' do
+        subject
+
+        expect(response).to have_http_status(404)
+      end
+    end
+
+    context 'when the instance does not allow public preview' do
+      before do
+        Form::AdminSettings.new(timeline_preview: false).save
+      end
+
+      context 'when the user is not authenticated' do
+        let(:headers) { {} }
+
+        it 'returns http unauthorized' do
+          subject
+
+          expect(response).to have_http_status(401)
+        end
+      end
+
+      context 'when the user is authenticated' do
+        it_behaves_like 'a successful request to the link timeline'
+      end
+    end
+
+    context 'when the instance allows public preview' do
+      context 'with an authorized user' do
+        it_behaves_like 'a successful request to the link timeline'
+      end
+
+      context 'with an anonymous user' do
+        let(:headers) { {} }
+
+        it_behaves_like 'a successful request to the link timeline'
+      end
+
+      context 'with limit param' do
+        let(:params) { { limit: 1, url: url } }
+
+        it 'returns only the requested number of statuses', :aggregate_failures do
+          subject
+
+          expect(response).to have_http_status(200)
+          expect(body_as_json.size).to eq(params[:limit])
+        end
+
+        it 'sets the correct pagination headers', :aggregate_failures do
+          subject
+
+          expect(response)
+            .to include_pagination_headers(
+              prev: api_v1_timelines_link_url(limit: params[:limit], url: url, min_id: local_status.id),
+              next: api_v1_timelines_link_url(limit: params[:limit], url: url, max_id: local_status.id)
+            )
+        end
+      end
+    end
+  end
+end

From 2f0a34ac00f2d3cc561cd4fe3edbcf2bd62c35a8 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 6 Jun 2024 04:49:31 -0400
Subject: [PATCH 1183/2191] Run as root in devcontainer from vscode (#30574)

---
 .devcontainer/devcontainer.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index fa8d6542c18aec..2c53be9c77c2e0 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -23,6 +23,8 @@
     }
   },
 
+  "remoteUser": "root",
+
   "otherPortsAttributes": {
     "onAutoForward": "silent"
   },

From a729104a4159106f959bcc9b3ab438d2876ce9a5 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 6 Jun 2024 10:53:28 +0200
Subject: [PATCH 1184/2191] New Crowdin Translations (automated) (#30575)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/sk.json |  2 ++
 config/locales/activerecord.ia.yml      |  2 +-
 config/locales/devise.ia.yml            | 38 ++++++++++++-------------
 config/locales/devise.sv.yml            |  6 ++--
 config/locales/doorkeeper.ia.yml        | 36 +++++++++++------------
 config/locales/ia.yml                   |  2 +-
 config/locales/simple_form.ia.yml       |  6 ++--
 7 files changed, 47 insertions(+), 45 deletions(-)

diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json
index c583b58220ead8..9b5be21f9d8bb6 100644
--- a/app/javascript/mastodon/locales/sk.json
+++ b/app/javascript/mastodon/locales/sk.json
@@ -391,6 +391,7 @@
   "limited_account_hint.action": "Aj tak zobraziť profil",
   "limited_account_hint.title": "Tento profil bol skrytý správcami servera {domain}.",
   "link_preview.author": "Autor: {name}",
+  "link_preview.more_from_author": "Viac od {name}",
   "lists.account.add": "Pridať do zoznamu",
   "lists.account.remove": "Odstrániť zo zoznamu",
   "lists.delete": "Vymazať zoznam",
@@ -411,6 +412,7 @@
   "moved_to_account_banner.text": "Váš účet {disabledAccount} je momentálne deaktivovaný, pretože ste sa presunuli na {movedToAccount}.",
   "mute_modal.hide_from_notifications": "Ukryť z upozornení",
   "mute_modal.hide_options": "Skryť možnosti",
+  "mute_modal.indefinite": "Pokiaľ ich neodtíšim",
   "mute_modal.show_options": "Zobraziť možnosti",
   "mute_modal.title": "Stíšiť užívateľa?",
   "navigation_bar.about": "O tomto serveri",
diff --git a/config/locales/activerecord.ia.yml b/config/locales/activerecord.ia.yml
index b1dd90bc368b9c..bf1fbc67eff547 100644
--- a/config/locales/activerecord.ia.yml
+++ b/config/locales/activerecord.ia.yml
@@ -19,7 +19,7 @@ ia:
         account:
           attributes:
             username:
-              invalid: debe continer solmente litteras, numeros e tractos de sublineamento
+              invalid: debe continer solmente litteras, numeros e lineettas basse
               reserved: es reservate
         admin/webhook:
           attributes:
diff --git a/config/locales/devise.ia.yml b/config/locales/devise.ia.yml
index e6ae6d4afbbff4..8e073c9efbc0b8 100644
--- a/config/locales/devise.ia.yml
+++ b/config/locales/devise.ia.yml
@@ -3,8 +3,8 @@ ia:
   devise:
     confirmations:
       confirmed: Tu conto de e-mail ha essite confirmate con successo.
-      send_instructions: Tu recipera un e-mail con instructiones pro confirmar tu adresse de e-mail in poc minutas. Per favor verifica tu dossier de spam si tu non lo recipe.
-      send_paranoid_instructions: Si tu adresse de e-mail existe in nostre base de datos, tu recipera un e-mail con instructiones pro confirmar tu adresse de e-mail in poc minutas. Per favor verifica tu dossier de spam si tu non lo recipe.
+      send_instructions: Tu recipera un e-mail con instructiones pro confirmar tu adresse de e-mail in poc minutas. Per favor consulta tu dossier de spam si tu non lo recipe.
+      send_paranoid_instructions: Si tu adresse de e-mail existe in nostre base de datos, tu recipera un e-mail con instructiones pro confirmar tu adresse de e-mail in poc minutas. Per favor consulta tu dossier de spam si tu non lo recipe.
     failure:
       already_authenticated: Tu ha jam aperite session.
       inactive: Tu conto non es ancora activate.
@@ -27,7 +27,7 @@ ia:
         subject: 'Mastodon: Instructiones de confirmation pro %{instance}'
         title: Verificar adresse de e-mail
       email_changed:
-        explanation: 'Le adresse de e-mail pro tu conto essera cambiate a:'
+        explanation: 'Le adresse de e-mail pro tu conto se cambia in:'
         extra: Si tu non ha cambiate de adresse de e-mail, es probabile que alcuno ha ganiate le accesso a tu conto. Per favor cambia immediatemente tu contrasigno o contacta le administrator del servitor si tu non pote acceder a tu conto.
         subject: 'Mastodon: E-mail cambiate'
         title: Nove adresse de e-mail
@@ -37,8 +37,8 @@ ia:
         subject: 'Mastodon: Contrasigno cambiate'
         title: Contrasigno cambiate
       reconfirmation_instructions:
-        explanation: Confirma le nove adresse pro cambiar tu email.
-        extra: Si non es tu qui ha initiate iste cambiamento, per favor ignora iste e-mail. Le adresse de e-mail pro le conto de Mastodon non cambiara usque tu accede al ligamine hic supra.
+        explanation: Confirma le nove adresse pro cambiar tu adresse de e-mail.
+        extra: Si non es tu qui ha initiate iste cambiamento, per favor ignora iste e-mail. Le adresse de e-mail pro le conto de Mastodon non cambiara usque tu accede al ligamine supra.
         subject: 'Mastodon: Confirmar e-mail pro %{instance}'
         title: Verificar adresse de e-mail
       reset_password_instructions:
@@ -49,19 +49,19 @@ ia:
         title: Reinitialisar contrasigno
       two_factor_disabled:
         explanation: Ora es possibile aperir session con solmente le adresse de e-mail e contrasigno.
-        subject: 'Mastodon: Authentication bifactorial disactivate'
-        subtitle: Le authentication bifactorial ha essite disactivate pro tu conto.
+        subject: 'Mastodon: Authentication a duo factores disactivate'
+        subtitle: Le authentication a duo factores ha essite disactivate pro tu conto.
         title: A2F disactivate
       two_factor_enabled:
         explanation: Pro le apertura de session essera necessari un token generate per le application TOTP accopulate.
-        subject: 'Mastodon: Authentication bifactorial activate'
-        subtitle: Le authentication bifactorial ha essite activate pro tu conto.
+        subject: 'Mastodon: Authentication a duo factores activate'
+        subtitle: Le authentication a duo factores ha essite activate pro tu conto.
         title: A2F activate
       two_factor_recovery_codes_changed:
         explanation: Le ancian codices de recuperation ha essite invalidate e nove codices ha essite generate.
-        subject: 'Mastodon: Codices de recuperation regenerate'
+        subject: 'Mastodon: Codices de recuperation A2F regenerate'
         subtitle: Le ancian codices de recuperation ha essite invalidate e nove codices ha essite generate.
-        title: Codices de recuperation cambiate
+        title: Codices de recuperation A2F cambiate
       unlock_instructions:
         subject: 'Mastodon: Instructiones pro disblocar'
       webauthn_credential:
@@ -84,11 +84,11 @@ ia:
         subject: 'Mastodon: authentication de clave de securitate activate'
         title: Claves de securitate activate
     omniauth_callbacks:
-      failure: Impossibile authenticar te ab %{kind} perque “%{reason}”.
-      success: Authenticate con successo ab conto %{kind}.
+      failure: Non poteva authenticar te desde %{kind} perque “%{reason}”.
+      success: Authenticate correctemente desde le conto %{kind}.
     passwords:
-      no_token: Tu non pote acceder iste pagina sin venir ab un email de redefinition de contrasigno. Si tu veni ab un email de redefinition de contrasigno, verifica que tu usava le integre URL fornite.
-      send_instructions: Si tu adresse de e-mail existe in nostre base de datos, tu recipera un ligamine de recuperation de contrasigno in tu adresse de e-mail in poc minutas. Per favor verifica tu dossier de spam si tu non lo recipe.
+      no_token: Non es possibile acceder a iste pagina sin venir de un e-mail de redefinition de contrasigno. Si tu veni de un e-mail de redefinition de contrasigno, per favor assecura te de haber usate le URL complete fornite.
+      send_instructions: Si tu adresse de e-mail existe in nostre base de datos, tu recipera un ligamine de recuperation de contrasigno a tu adresse de e-mail in poc minutas. Per favor consulta tu dossier de spam si tu non lo recipe.
       send_paranoid_instructions: Si tu adresse de e-mail existe in nostre base de datos, tu recipera un ligamine de recuperation de contrasigno in tu adresse de e-mail in poc minutas. Per favor verifica tu dossier de spam si tu non lo recipe.
       updated: Tu contrasigno ha essite cambiate. Tu ha ora aperite session.
       updated_not_active: Tu contrasigno ha essite cambiate.
@@ -98,17 +98,17 @@ ia:
       signed_up_but_inactive: Tu te ha inscribite con successo. Nonobstante, nos non poteva aperir tu session perque tu conto non es ancora activate.
       signed_up_but_locked: Tu te ha inscribite con successo. Nonobstante, nos non poteva aperir tu session perque tu conto es serrate.
       signed_up_but_pending: Un message con un ligamine de confirmation ha essite inviate a tu adresse de email. Post que tu clicca sur le ligamine, nos revidera tu demanda. Tu essera notificate si illo es approbate.
-      signed_up_but_unconfirmed: Un message con un ligamine de confirmation ha essite inviate a tu adresse de e-mail. Per favor seque le ligamine pro activar tu conto. Verifica tu dossier de spam si tu non recipe iste e-mail.
-      update_needs_confirmation: Tu ha actualisate tu conto con successo, ma nos debe verificar tu nove adresse de e-mail. Accede a tu e-mail e seque le ligamine de confirmation pro confirmar tu nove adresse de e-mail. Verifica tu dossier de spam si tu non recipe iste e-mail.
+      signed_up_but_unconfirmed: Un message con un ligamine de confirmation ha essite inviate a tu adresse de e-mail. Per favor seque le ligamine pro activar tu conto. Consulta tu dossier de spam si tu non recipe iste e-mail.
+      update_needs_confirmation: Tu ha actualisate tu conto con successo, ma nos debe verificar tu nove adresse de e-mail. Accede a tu e-mail e seque le ligamine de confirmation pro confirmar tu nove adresse de e-mail. Consulta tu dossier de spam si tu non recipe iste e-mail.
       updated: Tu conto ha essite actualisate con successo.
     sessions:
       already_signed_out: Session claudite con successo.
       signed_in: Session aperite con successo.
       signed_out: Session claudite con successo.
     unlocks:
-      send_instructions: Tu recipera un e-mail con instructiones explicante como disserrar tu conto in alcun minutas. Verifica tu dossier de spam si tu non recipe iste e-mail.
+      send_instructions: Tu recipera un e-mail con instructiones explicante como disserrar tu conto in alcun minutas. Consulta tu dossier de spam si tu non recipe iste e-mail.
       send_paranoid_instructions: Si tu conto existe, tu recipera un email con instructiones explicante como disserrar lo in alcun minutas. Verifica tu dossier de spam si tu non recipe iste e-mail.
-      unlocked: Tu conto ha essite disserrate con successo. Aperi session pro continuar.
+      unlocked: Tu conto ha essite disserrate con successo. Per favor aperi session pro continuar.
   errors:
     messages:
       already_confirmed: jam esseva confirmate, tenta aperir session
diff --git a/config/locales/devise.sv.yml b/config/locales/devise.sv.yml
index 27d424f6189463..1e14a7de528314 100644
--- a/config/locales/devise.sv.yml
+++ b/config/locales/devise.sv.yml
@@ -30,14 +30,14 @@ sv:
         explanation: 'E-postadressen för ditt konto ändras till:'
         extra: Om du inte ändrade din e-post är det troligt att någon har fått tillgång till ditt konto. Vänligen ändra ditt lösenord omedelbart eller kontakta serveradministratören om du är utelåst från ditt konto.
         subject: 'Mastodon: e-post ändrad'
-        title: Ny e-post adress
+        title: Ny e-postadress
       password_change:
         explanation: Lösenordet för ditt konto har ändrats.
         extra: Om du inte ändrade ditt lösenord är det troligt att någon har fått tillgång till ditt konto. Vänligen ändra ditt lösenord omedelbart eller kontakta serveradministratören om du är utelåst från ditt konto.
         subject: 'Mastodon: Lösenordet har ändrats'
         title: Lösenordet har ändrats
       reconfirmation_instructions:
-        explanation: Bekräfta den nya adressen för att ändra din e-post adress.
+        explanation: Bekräfta den nya adressen för att ändra din e-postadress.
         extra: Om den här ändringen inte initierades av dig kan du ignorera det här e-postmeddelandet. E-postadressen för Mastodon-kontot ändras inte förrän du klickar på länken ovan.
         subject: 'Mastodon: Bekräfta e-post för %{instance}'
         title: Verifiera e-postadress
@@ -63,7 +63,7 @@ sv:
         subtitle: De tidigare återhämtningskoderna har ogiltigförklarats och nya har skapats.
         title: 2FA-återställningskoder ändrades
       unlock_instructions:
-        subject: 'Mastodon: Lås upp instruktioner'
+        subject: 'Mastodon: Instruktioner för upplåsning'
       webauthn_credential:
         added:
           explanation: Följande säkerhetsnyckel har lagts till i ditt konto
diff --git a/config/locales/doorkeeper.ia.yml b/config/locales/doorkeeper.ia.yml
index 82a1b4b140fe4f..40109a311ce061 100644
--- a/config/locales/doorkeeper.ia.yml
+++ b/config/locales/doorkeeper.ia.yml
@@ -61,7 +61,7 @@ ia:
         title: Un error ha occurrite
       new:
         prompt_html: "%{client_name} vole haber le permission de acceder a tu conto. Illo es un application tertie. <strong>Si tu non confide in illo, alora tu non deberea autorisar lo.</strong>"
-        review_permissions: Revisionar le permissos
+        review_permissions: Revider permissiones
         title: Autorisation necessari
       show:
         title: Copia iste codice de autorisation e colla lo in le application.
@@ -148,34 +148,34 @@ ia:
         title: Autorisation OAuth necessari
     scopes:
       admin:read: leger tote le datos in le servitor
-      admin:read:accounts: leger information sensibile de tote le contos
-      admin:read:canonical_email_blocks: leger datos sensibile de tote le blocadas de email canonic
+      admin:read:accounts: leger informationes sensibile de tote le contos
+      admin:read:canonical_email_blocks: leger informationes sensibile de tote le blocadas de e-mail canonic
       admin:read:domain_allows: leger informationes sensibile de tote le dominios permittite
       admin:read:domain_blocks: leger informationes sensibile de tote le blocadas de dominio
-      admin:read:email_domain_blocks: leger informationes sensibile de tote le blocadas de dominio email
-      admin:read:ip_blocks: leger informationes sensibile de tote le blocadas de IP
-      admin:read:reports: leger information sensibile de tote le reportos e contos reportate
+      admin:read:email_domain_blocks: leger informationes sensibile de tote le blocadas de dominio de e-mail
+      admin:read:ip_blocks: leger informationes sensibile de tote le blocadas de adresses IP
+      admin:read:reports: leger informationes sensibile de tote le reportos e contos reportate
       admin:write: modificar tote le datos in le servitor
-      admin:write:accounts: exequer action de moderation sur contos
-      admin:write:canonical_email_blocks: exequer actiones de moderation sur blocadas de email canonic
+      admin:write:accounts: exequer actiones de moderation sur contos
+      admin:write:canonical_email_blocks: exequer actiones de moderation sur blocadas de e-mail canonic
       admin:write:domain_allows: exequer actiones de moderation sur dominios permittite
       admin:write:domain_blocks: exequer actiones de moderation sur blocadas de dominio
-      admin:write:email_domain_blocks: exequer actiones de moderation sur blocadas de dominio email
-      admin:write:ip_blocks: exequer actiones de moderation sur blocadas de IP
-      admin:write:reports: exequer action de moderation sur reportos
-      crypto: usar cryptation de extremo-a-extremo
-      follow: modificar relationes del contos
+      admin:write:email_domain_blocks: exequer actiones de moderation sur blocadas de dominio de e-mail
+      admin:write:ip_blocks: exequer actiones de moderation sur blocadas de adresses IP
+      admin:write:reports: exequer actiones de moderation sur reportos
+      crypto: usar cryptation de puncta a puncta
+      follow: modificar relationes inter contos
       push: reciper tu notificationes push
       read: leger tote le datos de tu conto
-      read:accounts: vider informationes de conto
+      read:accounts: vider informationes de contos
       read:blocks: vider tu blocadas
       read:bookmarks: vider tu marcapaginas
-      read:favourites: vider tu favoritos
+      read:favourites: vider tu favorites
       read:filters: vider tu filtros
-      read:follows: vider tu sequites
+      read:follows: vider qui tu seque
       read:lists: vider tu listas
       read:me: leger solmente le information basic de tu conto
-      read:mutes: vider tu silentiates
+      read:mutes: vider qui tu silentia
       read:notifications: vider tu notificationes
       read:reports: vider tu reportos
       read:search: cercar in tu nomine
@@ -189,7 +189,7 @@ ia:
       write:filters: crear filtros
       write:follows: sequer personas
       write:lists: crear listas
-      write:media: incargar files de medios
+      write:media: incargar files multimedial
       write:mutes: silentiar personas e conversationes
       write:notifications: rader tu notificationes
       write:reports: reportar altere personas
diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index cadc465c5549d9..b7f4ecf85d291f 100644
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -1102,7 +1102,7 @@ ia:
     security: Securitate
     set_new_password: Definir un nove contrasigno
     setup:
-      email_below_hint_html: Consulta tu dossier de spam, o requesta un altere. Tu pote corriger tu adresse de e-mail si illo es errate.
+      email_below_hint_html: Consulta tu dossier de spam, o requesta un altere ligamine de confirmation. Tu pote corriger tu adresse de e-mail si illo es errate.
       email_settings_hint_html: Clicca sur le ligamine que nos te ha inviate pro verificar %{email}. Nos te attendera hic.
       link_not_received: Necun ligamine recipite?
       new_confirmation_instructions_sent: Tu recipera un nove e-mail con le ligamine de confirmation in poc minutas!
diff --git a/config/locales/simple_form.ia.yml b/config/locales/simple_form.ia.yml
index 7e364889dd4a6d..2d0af3001ef69f 100644
--- a/config/locales/simple_form.ia.yml
+++ b/config/locales/simple_form.ia.yml
@@ -8,7 +8,7 @@ ia:
         fields: Tu pagina principal, pronomines, etate, tote lo que tu vole.
         indexable: Tu messages public pote apparer in le resultatos de recerca sur Mastodon. Le personas qui ha interagite con tu messages pote cercar los in omne caso.
         note: 'Tu pote @mentionar altere personas o #hashtags.'
-        show_collections: Le personas potera percurrer tu sequites e sequitores. Le personas que tu seque videra que tu les seque in omne caso.
+        show_collections: Le gente potera percurrer le listas de personas que tu seque e qui te seque. Le personas que tu seque videra que tu les seque in omne caso.
         unlocked: Le personas potera sequer te sin requestar approbation. Dismarca si tu vole revider le requestas de sequimento e seliger si acceptar o rejectar nove sequitores.
       account_alias:
         acct: Specifica le nomine_de_usator@dominio del conto desde le qual tu vole migrar
@@ -38,7 +38,7 @@ ia:
       appeal:
         text: Tu pote solo appellar contra un sanction un vice
       defaults:
-        autofollow: Illes qui se inscribe per le invitation automaticamente devenira tu sequaces
+        autofollow: Le personas qui se inscribe per medio del invitation te sequera automaticamente
         avatar: WEBP, PNG, GIF or JPG. Al maximo %{size}. Sera diminuite a %{dimensions}px
         bot: Signala a alteres que le conto principalmente exeque actiones automatisate e poterea non esser surveliate
         context: Un o plure contextos ubi le filtro deberea applicar se
@@ -269,7 +269,7 @@ ia:
         trends: Activar tendentias
         trends_as_landing_page: Usar tendentias como pagina de destination
       interactions:
-        must_be_follower: Blocar notificationes de non-sequaces
+        must_be_follower: Blocar notificationes de personas qui non te seque
         must_be_following: Blocar notificationes de gente que tu non sequer
         must_be_following_dm: Blocar messages directe de gente que tu non seque
       invite:

From cd4b00810d49bb95b6421c84d48a6e075a18486c Mon Sep 17 00:00:00 2001
From: Fabio Leandro Janiszevski <fabiosammy@gmail.com>
Date: Thu, 6 Jun 2024 06:00:09 -0300
Subject: [PATCH 1185/2191] Clear the docker setup - Deprecate post-create.sh
 and use bin/setup (#30502)

---
 .devcontainer/codespaces/devcontainer.json |  2 +-
 .devcontainer/devcontainer.json            |  2 +-
 .devcontainer/post-create.sh               | 27 ----------------------
 README.md                                  |  2 +-
 4 files changed, 3 insertions(+), 30 deletions(-)
 delete mode 100755 .devcontainer/post-create.sh

diff --git a/.devcontainer/codespaces/devcontainer.json b/.devcontainer/codespaces/devcontainer.json
index ca9156fdaa4bf1..6736734e6069e4 100644
--- a/.devcontainer/codespaces/devcontainer.json
+++ b/.devcontainer/codespaces/devcontainer.json
@@ -37,7 +37,7 @@
   },
 
   "onCreateCommand": "git config --global --add safe.directory ${containerWorkspaceFolder}",
-  "postCreateCommand": ".devcontainer/post-create.sh",
+  "postCreateCommand": "bin/setup",
   "waitFor": "postCreateCommand",
 
   "customizations": {
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 2c53be9c77c2e0..4a9cf11cc2b059 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -30,7 +30,7 @@
   },
 
   "onCreateCommand": "git config --global --add safe.directory ${containerWorkspaceFolder}",
-  "postCreateCommand": ".devcontainer/post-create.sh",
+  "postCreateCommand": "bin/setup",
   "waitFor": "postCreateCommand",
 
   "customizations": {
diff --git a/.devcontainer/post-create.sh b/.devcontainer/post-create.sh
deleted file mode 100755
index 82a2ccbb6ce3a0..00000000000000
--- a/.devcontainer/post-create.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-
-set -e # Fail the whole script on first error
-
-# Fetch Ruby gem dependencies
-bundle config path 'vendor/bundle'
-bundle config with 'development test'
-bundle install
-
-# Make Gemfile.lock pristine again
-git checkout -- Gemfile.lock
-
-# Fetch Javascript dependencies
-corepack prepare
-yarn install --immutable
-
-# [re]create, migrate, and seed the test database
-RAILS_ENV=test ./bin/rails db:setup
-
-# [re]create, migrate, and seed the development database
-RAILS_ENV=development ./bin/rails db:setup
-
-# Precompile assets for development
-RAILS_ENV=development ./bin/rails assets:precompile
-
-# Precompile assets for test
-RAILS_ENV=test ./bin/rails assets:precompile
diff --git a/README.md b/README.md
index 45291d63780f75..3773b647fea1fd 100644
--- a/README.md
+++ b/README.md
@@ -107,7 +107,7 @@ development environment with **Docker**, complete the following steps:
 
 - Install Docker Desktop
 - Run `docker compose -f .devcontainer/docker-compose.yml up -d`
-- Run `docker compose -f .devcontainer/docker-compose.yml exec app .devcontainer/post-create.sh`
+- Run `docker compose -f .devcontainer/docker-compose.yml exec app bin/setup`
 - Finally, run `docker compose -f .devcontainer/docker-compose.yml exec app bin/dev`
 
 If you are using an IDE with [support for the Development Container specification](https://containers.dev/supporting), it will run the above `docker compose` commands automatically. For **Visual Studio Code** this requires the [Dev Container extension](https://containers.dev/supporting#dev-containers).

From 5652ca613582df03e5b838626078981414f3b897 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 6 Jun 2024 11:27:54 +0200
Subject: [PATCH 1186/2191] fix(deps): update babel monorepo to v7.24.7
 (#30561)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 1292 +++++++++++++++++++++++++++--------------------------
 1 file changed, 650 insertions(+), 642 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 7c36984cdebde6..dcc17d65990acc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -42,128 +42,129 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.10.4, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/code-frame@npm:7.24.6"
+"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.10.4, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/code-frame@npm:7.24.7"
   dependencies:
-    "@babel/highlight": "npm:^7.24.6"
+    "@babel/highlight": "npm:^7.24.7"
     picocolors: "npm:^1.0.0"
-  checksum: 10c0/c93c6d1763530f415218c31d07359364397f19b70026abdff766164c21ed352a931cf07f3102c5fb9e04792de319e332d68bcb1f7debef601a02197f90f9ba24
+  checksum: 10c0/ab0af539473a9f5aeaac7047e377cb4f4edd255a81d84a76058595f8540784cc3fbe8acf73f1e073981104562490aabfb23008cd66dc677a456a4ed5390fdde6
   languageName: node
   linkType: hard
 
-"@babel/compat-data@npm:^7.22.6, @babel/compat-data@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/compat-data@npm:7.24.6"
-  checksum: 10c0/f50abbd4008eb2a5d12139c578809cebbeaeb8e660fb12d546eb2e7c2108ae1836ab8339184a5f5ce0e95bf81bb91e18edce86b387c59db937b01693ec0bc774
+"@babel/compat-data@npm:^7.22.6, @babel/compat-data@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/compat-data@npm:7.24.7"
+  checksum: 10c0/dcd93a5632b04536498fbe2be5af1057f635fd7f7090483d8e797878559037e5130b26862ceb359acbae93ed27e076d395ddb4663db6b28a665756ffd02d324f
   languageName: node
   linkType: hard
 
 "@babel/core@npm:^7.10.4, @babel/core@npm:^7.11.6, @babel/core@npm:^7.12.3, @babel/core@npm:^7.22.1, @babel/core@npm:^7.24.4":
-  version: 7.24.6
-  resolution: "@babel/core@npm:7.24.6"
+  version: 7.24.7
+  resolution: "@babel/core@npm:7.24.7"
   dependencies:
     "@ampproject/remapping": "npm:^2.2.0"
-    "@babel/code-frame": "npm:^7.24.6"
-    "@babel/generator": "npm:^7.24.6"
-    "@babel/helper-compilation-targets": "npm:^7.24.6"
-    "@babel/helper-module-transforms": "npm:^7.24.6"
-    "@babel/helpers": "npm:^7.24.6"
-    "@babel/parser": "npm:^7.24.6"
-    "@babel/template": "npm:^7.24.6"
-    "@babel/traverse": "npm:^7.24.6"
-    "@babel/types": "npm:^7.24.6"
+    "@babel/code-frame": "npm:^7.24.7"
+    "@babel/generator": "npm:^7.24.7"
+    "@babel/helper-compilation-targets": "npm:^7.24.7"
+    "@babel/helper-module-transforms": "npm:^7.24.7"
+    "@babel/helpers": "npm:^7.24.7"
+    "@babel/parser": "npm:^7.24.7"
+    "@babel/template": "npm:^7.24.7"
+    "@babel/traverse": "npm:^7.24.7"
+    "@babel/types": "npm:^7.24.7"
     convert-source-map: "npm:^2.0.0"
     debug: "npm:^4.1.0"
     gensync: "npm:^1.0.0-beta.2"
     json5: "npm:^2.2.3"
     semver: "npm:^6.3.1"
-  checksum: 10c0/e0762a8daef7f417494d555929418cfacd6848c7fc3310ec00e6dd8cecac20b7f590e760bfc9365d2af07874a3f5599832f9c9ff7f1a9d126a168f77ba67945a
+  checksum: 10c0/4004ba454d3c20a46ea66264e06c15b82e9f6bdc35f88819907d24620da70dbf896abac1cb4cc4b6bb8642969e45f4d808497c9054a1388a386cf8c12e9b9e0d
   languageName: node
   linkType: hard
 
-"@babel/generator@npm:^7.24.6, @babel/generator@npm:^7.7.2":
-  version: 7.24.6
-  resolution: "@babel/generator@npm:7.24.6"
+"@babel/generator@npm:^7.24.7, @babel/generator@npm:^7.7.2":
+  version: 7.24.7
+  resolution: "@babel/generator@npm:7.24.7"
   dependencies:
-    "@babel/types": "npm:^7.24.6"
+    "@babel/types": "npm:^7.24.7"
     "@jridgewell/gen-mapping": "npm:^0.3.5"
     "@jridgewell/trace-mapping": "npm:^0.3.25"
     jsesc: "npm:^2.5.1"
-  checksum: 10c0/8d71a17b386536582354afba53cc784396458a88cc9f05f0c6de0ec99475f6f539943b3566b2e733820c4928236952473831765e483c25d68cc007a6e604d782
+  checksum: 10c0/06b1f3350baf527a3309e50ffd7065f7aee04dd06e1e7db794ddfde7fe9d81f28df64edd587173f8f9295496a7ddb74b9a185d4bf4de7bb619e6d4ec45c8fd35
   languageName: node
   linkType: hard
 
-"@babel/helper-annotate-as-pure@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/helper-annotate-as-pure@npm:7.24.6"
+"@babel/helper-annotate-as-pure@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/helper-annotate-as-pure@npm:7.24.7"
   dependencies:
-    "@babel/types": "npm:^7.24.6"
-  checksum: 10c0/3fe446e3bd37e5e32152279c84ace4e83815e5b88b9e09a82a83974a0bb22e941d89db26b23aaab4c9eb0f9713772c2f6163feffc1bcb055c4cdb6b67e5dc82f
+    "@babel/types": "npm:^7.24.7"
+  checksum: 10c0/4679f7df4dffd5b3e26083ae65228116c3da34c3fff2c11ae11b259a61baec440f51e30fd236f7a0435b9d471acd93d0bc5a95df8213cbf02b1e083503d81b9a
   languageName: node
   linkType: hard
 
-"@babel/helper-builder-binary-assignment-operator-visitor@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/helper-builder-binary-assignment-operator-visitor@npm:7.24.6"
+"@babel/helper-builder-binary-assignment-operator-visitor@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/helper-builder-binary-assignment-operator-visitor@npm:7.24.7"
   dependencies:
-    "@babel/types": "npm:^7.24.6"
-  checksum: 10c0/d468ba492163bdcf5b6c53248edcf0aaed6194c0f7bdebef4f29ef626e5b03e9fcc7ed737445eb80a961ec6e687c330e1c5242d8a724efb0af002141f3b3e66c
+    "@babel/traverse": "npm:^7.24.7"
+    "@babel/types": "npm:^7.24.7"
+  checksum: 10c0/0ed84abf848c79fb1cd4c1ddac12c771d32c1904d87fc3087f33cfdeb0c2e0db4e7892b74b407d9d8d0c000044f3645a7391a781f788da8410c290bb123a1f13
   languageName: node
   linkType: hard
 
-"@babel/helper-builder-react-jsx@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/helper-builder-react-jsx@npm:7.24.6"
+"@babel/helper-builder-react-jsx@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/helper-builder-react-jsx@npm:7.24.7"
   dependencies:
-    "@babel/helper-annotate-as-pure": "npm:^7.24.6"
-    "@babel/types": "npm:^7.24.6"
-  checksum: 10c0/93b0500d00f214bc2f7f142ebfa0a634872cadd446bd767f7d58b26ae1b46e1f262b0fe80a9151691463611a3148a69ad28f930295d976bf8ced32c79449a3ce
+    "@babel/helper-annotate-as-pure": "npm:^7.24.7"
+    "@babel/types": "npm:^7.24.7"
+  checksum: 10c0/c95c8856c67c57060461f39b669707b2dca3501149bcc54b7c3e49c95069afce52179fc7c2bd809981acfbfdf0860ef1035dd7512cdba46c83bdb1ad6f6dc53f
   languageName: node
   linkType: hard
 
-"@babel/helper-compilation-targets@npm:^7.22.6, @babel/helper-compilation-targets@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/helper-compilation-targets@npm:7.24.6"
+"@babel/helper-compilation-targets@npm:^7.22.6, @babel/helper-compilation-targets@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/helper-compilation-targets@npm:7.24.7"
   dependencies:
-    "@babel/compat-data": "npm:^7.24.6"
-    "@babel/helper-validator-option": "npm:^7.24.6"
+    "@babel/compat-data": "npm:^7.24.7"
+    "@babel/helper-validator-option": "npm:^7.24.7"
     browserslist: "npm:^4.22.2"
     lru-cache: "npm:^5.1.1"
     semver: "npm:^6.3.1"
-  checksum: 10c0/4d41150086959f5f4d72d27bae29204192e943537ecb71df1711d1f5d8791358a44f3a5882ed3c8238ba0c874b0b55213af43767e14771765f13b8d15b262432
+  checksum: 10c0/1d580a9bcacefe65e6bf02ba1dafd7ab278269fef45b5e281d8354d95c53031e019890464e7f9351898c01502dd2e633184eb0bcda49ed2ecd538675ce310f51
   languageName: node
   linkType: hard
 
-"@babel/helper-create-class-features-plugin@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/helper-create-class-features-plugin@npm:7.24.6"
+"@babel/helper-create-class-features-plugin@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/helper-create-class-features-plugin@npm:7.24.7"
   dependencies:
-    "@babel/helper-annotate-as-pure": "npm:^7.24.6"
-    "@babel/helper-environment-visitor": "npm:^7.24.6"
-    "@babel/helper-function-name": "npm:^7.24.6"
-    "@babel/helper-member-expression-to-functions": "npm:^7.24.6"
-    "@babel/helper-optimise-call-expression": "npm:^7.24.6"
-    "@babel/helper-replace-supers": "npm:^7.24.6"
-    "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.24.6"
-    "@babel/helper-split-export-declaration": "npm:^7.24.6"
+    "@babel/helper-annotate-as-pure": "npm:^7.24.7"
+    "@babel/helper-environment-visitor": "npm:^7.24.7"
+    "@babel/helper-function-name": "npm:^7.24.7"
+    "@babel/helper-member-expression-to-functions": "npm:^7.24.7"
+    "@babel/helper-optimise-call-expression": "npm:^7.24.7"
+    "@babel/helper-replace-supers": "npm:^7.24.7"
+    "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.24.7"
+    "@babel/helper-split-export-declaration": "npm:^7.24.7"
     semver: "npm:^6.3.1"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10c0/e6734671bc6a5f3cca4ec46e4cc70238e5a2fa063e51225c2be572f157119002af419b33ea0f846dbb1307370fe9f3aa92d199449abbea5e88e0262513c8a821
+  checksum: 10c0/6b7b47d70b41c00f39f86790cff67acf2bce0289d52a7c182b28e797f4e0e6d69027e3d06eccf1d54dddc2e5dde1df663bb1932437e5f447aeb8635d8d64a6ab
   languageName: node
   linkType: hard
 
-"@babel/helper-create-regexp-features-plugin@npm:^7.18.6, @babel/helper-create-regexp-features-plugin@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/helper-create-regexp-features-plugin@npm:7.24.6"
+"@babel/helper-create-regexp-features-plugin@npm:^7.18.6, @babel/helper-create-regexp-features-plugin@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/helper-create-regexp-features-plugin@npm:7.24.7"
   dependencies:
-    "@babel/helper-annotate-as-pure": "npm:^7.24.6"
+    "@babel/helper-annotate-as-pure": "npm:^7.24.7"
     regexpu-core: "npm:^5.3.1"
     semver: "npm:^6.3.1"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10c0/c6e1b07c94b3b93a3f534039da88bc67ec3156080f1959aa07d5d534e9a640de3533e7ded0516dfcbccde955e91687044e6a950852b1d3f402ac5d5001be56cf
+  checksum: 10c0/ed611a7eb0c71843f9cdc471eeb38767972229f9225f7aaa90d124d7ee0062cf6908fd53ee9c34f731394c429594f06049a7738a71d342e0191d4047b2fc0ac2
   languageName: node
   linkType: hard
 
@@ -182,242 +183,249 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-environment-visitor@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/helper-environment-visitor@npm:7.24.6"
-  checksum: 10c0/fdcd18ac505ed71f40c05cc992b648a4495b0aa5310a774492a0f74d8dcf3579691102f516561a651d3de6c3a44fe64bfb3049d11c14c5857634ef1823ea409a
+"@babel/helper-environment-visitor@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/helper-environment-visitor@npm:7.24.7"
+  dependencies:
+    "@babel/types": "npm:^7.24.7"
+  checksum: 10c0/36ece78882b5960e2d26abf13cf15ff5689bf7c325b10a2895a74a499e712de0d305f8d78bb382dd3c05cfba7e47ec98fe28aab5674243e0625cd38438dd0b2d
   languageName: node
   linkType: hard
 
-"@babel/helper-function-name@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/helper-function-name@npm:7.24.6"
+"@babel/helper-function-name@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/helper-function-name@npm:7.24.7"
   dependencies:
-    "@babel/template": "npm:^7.24.6"
-    "@babel/types": "npm:^7.24.6"
-  checksum: 10c0/5ba2f8db789b3f5a2b2239300a217aa212e303cd7bfad9c8b90563807f49215e8c679e8f8f177b6aaca2038038e29bc702b83839e1f7b4896d79c44a75cac97a
+    "@babel/template": "npm:^7.24.7"
+    "@babel/types": "npm:^7.24.7"
+  checksum: 10c0/e5e41e6cf86bd0f8bf272cbb6e7c5ee0f3e9660414174435a46653efba4f2479ce03ce04abff2aa2ef9359cf057c79c06cb7b134a565ad9c0e8a50dcdc3b43c4
   languageName: node
   linkType: hard
 
-"@babel/helper-hoist-variables@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/helper-hoist-variables@npm:7.24.6"
+"@babel/helper-hoist-variables@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/helper-hoist-variables@npm:7.24.7"
   dependencies:
-    "@babel/types": "npm:^7.24.6"
-  checksum: 10c0/e10ec6b864aaa419ec4934f5fcb5d0cfcc9d0657584a1b6c3c42ada949d44ca6bffcdab433a90ada4396c747e551cca31ba0e565ea005ab3f50964e3817bf6cf
+    "@babel/types": "npm:^7.24.7"
+  checksum: 10c0/19ee37563bbd1219f9d98991ad0e9abef77803ee5945fd85aa7aa62a67c69efca9a801696a1b58dda27f211e878b3327789e6fd2a6f6c725ccefe36774b5ce95
   languageName: node
   linkType: hard
 
-"@babel/helper-member-expression-to-functions@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/helper-member-expression-to-functions@npm:7.24.6"
+"@babel/helper-member-expression-to-functions@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/helper-member-expression-to-functions@npm:7.24.7"
   dependencies:
-    "@babel/types": "npm:^7.24.6"
-  checksum: 10c0/7595f62978f55921b24de6ed5252fcedbffacfb8271f71e092f38724179ba554cb3a24a4764a1a3890b8a53504c2bee9c99eab81f1f365582739f566c8e28eaa
+    "@babel/traverse": "npm:^7.24.7"
+    "@babel/types": "npm:^7.24.7"
+  checksum: 10c0/9638c1d33cf6aba028461ccd3db6061c76ff863ca0d5013dd9a088bf841f2f77c46956493f9da18355c16759449d23b74cc1de4da357ade5c5c34c858f840f0a
   languageName: node
   linkType: hard
 
-"@babel/helper-module-imports@npm:^7.0.0-beta.49, @babel/helper-module-imports@npm:^7.10.4, @babel/helper-module-imports@npm:^7.16.7, @babel/helper-module-imports@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/helper-module-imports@npm:7.24.6"
+"@babel/helper-module-imports@npm:^7.0.0-beta.49, @babel/helper-module-imports@npm:^7.10.4, @babel/helper-module-imports@npm:^7.16.7, @babel/helper-module-imports@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/helper-module-imports@npm:7.24.7"
   dependencies:
-    "@babel/types": "npm:^7.24.6"
-  checksum: 10c0/e0db3fbfcd963d138f0792ff626f940a576fcf212d02b8fe6478dccf3421bd1c2a76f8e69c7450c049985e7b63b30be309a24eeeb6ad7c2137a31b676a095a84
+    "@babel/traverse": "npm:^7.24.7"
+    "@babel/types": "npm:^7.24.7"
+  checksum: 10c0/97c57db6c3eeaea31564286e328a9fb52b0313c5cfcc7eee4bc226aebcf0418ea5b6fe78673c0e4a774512ec6c86e309d0f326e99d2b37bfc16a25a032498af0
   languageName: node
   linkType: hard
 
-"@babel/helper-module-transforms@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/helper-module-transforms@npm:7.24.6"
+"@babel/helper-module-transforms@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/helper-module-transforms@npm:7.24.7"
   dependencies:
-    "@babel/helper-environment-visitor": "npm:^7.24.6"
-    "@babel/helper-module-imports": "npm:^7.24.6"
-    "@babel/helper-simple-access": "npm:^7.24.6"
-    "@babel/helper-split-export-declaration": "npm:^7.24.6"
-    "@babel/helper-validator-identifier": "npm:^7.24.6"
+    "@babel/helper-environment-visitor": "npm:^7.24.7"
+    "@babel/helper-module-imports": "npm:^7.24.7"
+    "@babel/helper-simple-access": "npm:^7.24.7"
+    "@babel/helper-split-export-declaration": "npm:^7.24.7"
+    "@babel/helper-validator-identifier": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10c0/9e2e3d0ddb397b36b9e8c7d94e175a36be8cb888ef370cefef2cdfd53ae1f87d567b268bd90ed9a6c706485a8de3da19cac577657613e9cd17210b91cbdfb00b
+  checksum: 10c0/4f311755fcc3b4cbdb689386309cdb349cf0575a938f0b9ab5d678e1a81bbb265aa34ad93174838245f2ac7ff6d5ddbd0104638a75e4e961958ed514355687b6
   languageName: node
   linkType: hard
 
-"@babel/helper-optimise-call-expression@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/helper-optimise-call-expression@npm:7.24.6"
+"@babel/helper-optimise-call-expression@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/helper-optimise-call-expression@npm:7.24.7"
   dependencies:
-    "@babel/types": "npm:^7.24.6"
-  checksum: 10c0/7fce2c4ce22c4ba3c2178d1ce85f34fc9bbe286af5ec153b4b6ea9bf2212390359c4a1e8a54551c4daa4688022d619668bdb8c8060cb185c0c9ad02c5247efc9
+    "@babel/types": "npm:^7.24.7"
+  checksum: 10c0/ca6a9884705dea5c95a8b3ce132d1e3f2ae951ff74987d400d1d9c215dae9c0f9e29924d8f8e131e116533d182675bc261927be72f6a9a2968eaeeaa51eb1d0f
   languageName: node
   linkType: hard
 
-"@babel/helper-plugin-utils@npm:^7.0.0, @babel/helper-plugin-utils@npm:^7.10.4, @babel/helper-plugin-utils@npm:^7.12.13, @babel/helper-plugin-utils@npm:^7.14.5, @babel/helper-plugin-utils@npm:^7.18.6, @babel/helper-plugin-utils@npm:^7.22.5, @babel/helper-plugin-utils@npm:^7.24.6, @babel/helper-plugin-utils@npm:^7.8.0, @babel/helper-plugin-utils@npm:^7.8.3":
-  version: 7.24.6
-  resolution: "@babel/helper-plugin-utils@npm:7.24.6"
-  checksum: 10c0/636d3ce8cabc0621c1f78187e1d95f1087209921fa452f76aad06224ef5dffb3d934946f5183109920f32a4b94dd75ac91c63bc52813fee639d10cd54d49ba1f
+"@babel/helper-plugin-utils@npm:^7.0.0, @babel/helper-plugin-utils@npm:^7.10.4, @babel/helper-plugin-utils@npm:^7.12.13, @babel/helper-plugin-utils@npm:^7.14.5, @babel/helper-plugin-utils@npm:^7.18.6, @babel/helper-plugin-utils@npm:^7.22.5, @babel/helper-plugin-utils@npm:^7.24.7, @babel/helper-plugin-utils@npm:^7.8.0, @babel/helper-plugin-utils@npm:^7.8.3":
+  version: 7.24.7
+  resolution: "@babel/helper-plugin-utils@npm:7.24.7"
+  checksum: 10c0/c3d38cd9b3520757bb4a279255cc3f956fc0ac1c193964bd0816ebd5c86e30710be8e35252227e0c9d9e0f4f56d9b5f916537f2bc588084b0988b4787a967d31
   languageName: node
   linkType: hard
 
-"@babel/helper-remap-async-to-generator@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/helper-remap-async-to-generator@npm:7.24.6"
+"@babel/helper-remap-async-to-generator@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/helper-remap-async-to-generator@npm:7.24.7"
   dependencies:
-    "@babel/helper-annotate-as-pure": "npm:^7.24.6"
-    "@babel/helper-environment-visitor": "npm:^7.24.6"
-    "@babel/helper-wrap-function": "npm:^7.24.6"
+    "@babel/helper-annotate-as-pure": "npm:^7.24.7"
+    "@babel/helper-environment-visitor": "npm:^7.24.7"
+    "@babel/helper-wrap-function": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10c0/b379b844eba352ac9487d31867e7bb2b8a264057f1739d9161b614145ea6e60969a7a82e75e5e83089e50cf1b6559f53aa085a787942bf40706fee15a2faa33c
+  checksum: 10c0/4e7fa2cdcbc488e41c27066c16e562857ef3c5c2bfe70d2f1e32e9ee7546b17c3fc1c20d05bf2a7f1c291bd9e7a0a219f6a9fa387209013294be79a26fcfe64d
   languageName: node
   linkType: hard
 
-"@babel/helper-replace-supers@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/helper-replace-supers@npm:7.24.6"
+"@babel/helper-replace-supers@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/helper-replace-supers@npm:7.24.7"
   dependencies:
-    "@babel/helper-environment-visitor": "npm:^7.24.6"
-    "@babel/helper-member-expression-to-functions": "npm:^7.24.6"
-    "@babel/helper-optimise-call-expression": "npm:^7.24.6"
+    "@babel/helper-environment-visitor": "npm:^7.24.7"
+    "@babel/helper-member-expression-to-functions": "npm:^7.24.7"
+    "@babel/helper-optimise-call-expression": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10c0/aaf2dfaf25360da1525ecea5979d5afed201b96f0feeed2e15f90883a97776132a720b25039e67fee10a5c537363aea5cc2a46c0f1d13fdb86d0e920244f2da7
+  checksum: 10c0/0e133bb03371dee78e519c334a09c08e1493103a239d9628db0132dfaac3fc16380479ca3c590d278a9b71b624030a338c18ebbfe6d430ebb2e4653775c4b3e3
   languageName: node
   linkType: hard
 
-"@babel/helper-simple-access@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/helper-simple-access@npm:7.24.6"
+"@babel/helper-simple-access@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/helper-simple-access@npm:7.24.7"
   dependencies:
-    "@babel/types": "npm:^7.24.6"
-  checksum: 10c0/b17e404dd6c9787fc7d558aea5222471a77e29596705f0d10b4c2a58b9d71ff7eae915094204848cc1af99b771553caa69337a768b9abdd82b54a0050ba83eb9
+    "@babel/traverse": "npm:^7.24.7"
+    "@babel/types": "npm:^7.24.7"
+  checksum: 10c0/7230e419d59a85f93153415100a5faff23c133d7442c19e0cd070da1784d13cd29096ee6c5a5761065c44e8164f9f80e3a518c41a0256df39e38f7ad6744fed7
   languageName: node
   linkType: hard
 
-"@babel/helper-skip-transparent-expression-wrappers@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/helper-skip-transparent-expression-wrappers@npm:7.24.6"
+"@babel/helper-skip-transparent-expression-wrappers@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/helper-skip-transparent-expression-wrappers@npm:7.24.7"
   dependencies:
-    "@babel/types": "npm:^7.24.6"
-  checksum: 10c0/6928f698362d6082a67ee2bc73991ef6b0cc6b5f2854177389bc8f3c09296580f0ee20134dd1a29dfcb1906ad9e346fa0f7c6fcd7589ab3ff176d4f09504577f
+    "@babel/traverse": "npm:^7.24.7"
+    "@babel/types": "npm:^7.24.7"
+  checksum: 10c0/e3a9b8ac9c262ac976a1bcb5fe59694db5e6f0b4f9e7bdba5c7693b8b5e28113c23bdaa60fe8d3ec32a337091b67720b2053bcb3d5655f5406536c3d0584242b
   languageName: node
   linkType: hard
 
-"@babel/helper-split-export-declaration@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/helper-split-export-declaration@npm:7.24.6"
+"@babel/helper-split-export-declaration@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/helper-split-export-declaration@npm:7.24.7"
   dependencies:
-    "@babel/types": "npm:^7.24.6"
-  checksum: 10c0/53a5dd8691fdffc89cc7fcf5aed0ad1d8bc39796a5782a3d170dcbf249eb5c15cc8a290e8d09615711d18798ad04a7d0694ab5195d35fa651abbc1b9c885d6a8
+    "@babel/types": "npm:^7.24.7"
+  checksum: 10c0/0254577d7086bf09b01bbde98f731d4fcf4b7c3fa9634fdb87929801307c1f6202a1352e3faa5492450fa8da4420542d44de604daf540704ff349594a78184f6
   languageName: node
   linkType: hard
 
-"@babel/helper-string-parser@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/helper-string-parser@npm:7.24.6"
-  checksum: 10c0/95115bf676e92c4e99166395649108d97447e6cabef1fabaec8cdbc53a43f27b5df2268ff6534439d405bc1bd06685b163eb3b470455bd49f69159dada414145
+"@babel/helper-string-parser@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/helper-string-parser@npm:7.24.7"
+  checksum: 10c0/47840c7004e735f3dc93939c77b099bb41a64bf3dda0cae62f60e6f74a5ff80b63e9b7cf77b5ec25a324516381fc994e1f62f922533236a8e3a6af57decb5e1e
   languageName: node
   linkType: hard
 
-"@babel/helper-validator-identifier@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/helper-validator-identifier@npm:7.24.6"
-  checksum: 10c0/d29d2e3fca66c31867a009014169b93f7bc21c8fc1dd7d0b9d85d7a4000670526ff2222d966febb75a6e12f9859a31d1e75b558984e28ecb69651314dd0a6fd1
+"@babel/helper-validator-identifier@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/helper-validator-identifier@npm:7.24.7"
+  checksum: 10c0/87ad608694c9477814093ed5b5c080c2e06d44cb1924ae8320474a74415241223cc2a725eea2640dd783ff1e3390e5f95eede978bc540e870053152e58f1d651
   languageName: node
   linkType: hard
 
-"@babel/helper-validator-option@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/helper-validator-option@npm:7.24.6"
-  checksum: 10c0/787268dff5cf77f3b704454b96ab7b58aa4f43b2808247e51859a103a1c28a9c252100f830433f4b37a73f4a61ba745bbeef4cdccbab48c1e9adf037f4ca3491
+"@babel/helper-validator-option@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/helper-validator-option@npm:7.24.7"
+  checksum: 10c0/21aea2b7bc5cc8ddfb828741d5c8116a84cbc35b4a3184ec53124f08e09746f1f67a6f9217850188995ca86059a7942e36d8965a6730784901def777b7e8a436
   languageName: node
   linkType: hard
 
-"@babel/helper-wrap-function@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/helper-wrap-function@npm:7.24.6"
+"@babel/helper-wrap-function@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/helper-wrap-function@npm:7.24.7"
   dependencies:
-    "@babel/helper-function-name": "npm:^7.24.6"
-    "@babel/template": "npm:^7.24.6"
-    "@babel/types": "npm:^7.24.6"
-  checksum: 10c0/d32844275a544a8e7c71c13e9832d34d80656aafce659dc6c23b02e14d1c1179d8045125ded5096da1a99de83299ffb48211183d0403da2c8584ed55dc0ab646
+    "@babel/helper-function-name": "npm:^7.24.7"
+    "@babel/template": "npm:^7.24.7"
+    "@babel/traverse": "npm:^7.24.7"
+    "@babel/types": "npm:^7.24.7"
+  checksum: 10c0/d5689f031bf0eb38c0d7fad6b7e320ddef4bfbdf08d12d7d76ef41b7ca365a32721e74cb5ed5a9a9ec634bc20f9b7a27314fa6fb08f1576b8f6d8330fcea6f47
   languageName: node
   linkType: hard
 
-"@babel/helpers@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/helpers@npm:7.24.6"
+"@babel/helpers@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/helpers@npm:7.24.7"
   dependencies:
-    "@babel/template": "npm:^7.24.6"
-    "@babel/types": "npm:^7.24.6"
-  checksum: 10c0/e5b5c0919fd6fa56ae11c15a72962d8de0ac19db524849554af28cf08ac32f9ae5aee49a43146eb150f54418cefb8e890fa2b2f33d029434dc7777dbcdfd5bac
+    "@babel/template": "npm:^7.24.7"
+    "@babel/types": "npm:^7.24.7"
+  checksum: 10c0/aa8e230f6668773e17e141dbcab63e935c514b4b0bf1fed04d2eaefda17df68e16b61a56573f7f1d4d1e605ce6cc162b5f7e9fdf159fde1fd9b77c920ae47d27
   languageName: node
   linkType: hard
 
-"@babel/highlight@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/highlight@npm:7.24.6"
+"@babel/highlight@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/highlight@npm:7.24.7"
   dependencies:
-    "@babel/helper-validator-identifier": "npm:^7.24.6"
+    "@babel/helper-validator-identifier": "npm:^7.24.7"
     chalk: "npm:^2.4.2"
     js-tokens: "npm:^4.0.0"
     picocolors: "npm:^1.0.0"
-  checksum: 10c0/5bbc31695e5d44e97feb267f7aaf4c52908560d184ffeb2e2e57aae058d40125592931883889413e19def3326895ddb41ff45e090fa90b459d8c294b4ffc238c
+  checksum: 10c0/674334c571d2bb9d1c89bdd87566383f59231e16bcdcf5bb7835babdf03c9ae585ca0887a7b25bdf78f303984af028df52831c7989fecebb5101cc132da9393a
   languageName: node
   linkType: hard
 
-"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/parser@npm:7.24.6"
+"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/parser@npm:7.24.7"
   bin:
     parser: ./bin/babel-parser.js
-  checksum: 10c0/cbef70923078a20fe163b03f4a6482be65ed99d409a57f3091a23ce3a575ee75716c30e7ea9f40b692ac5660f34055f4cbeb66a354fad15a6cf1fca35c3496c5
+  checksum: 10c0/8b244756872185a1c6f14b979b3535e682ff08cb5a2a5fd97cc36c017c7ef431ba76439e95e419d43000c5b07720495b00cf29a7f0d9a483643d08802b58819b
   languageName: node
   linkType: hard
 
-"@babel/plugin-bugfix-firefox-class-in-computed-class-key@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-bugfix-firefox-class-in-computed-class-key@npm:7.24.6"
+"@babel/plugin-bugfix-firefox-class-in-computed-class-key@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-bugfix-firefox-class-in-computed-class-key@npm:7.24.7"
   dependencies:
-    "@babel/helper-environment-visitor": "npm:^7.24.6"
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-environment-visitor": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10c0/0dbf12de5a7e5d092271124f0d9bff1ceb94871d5563041940512671cd40ab2a93d613715ee37076cd8263cf49579afb805faa3189996c11639bb10d3e9837f1
+  checksum: 10c0/394c30e2b708ad385fa1219528e039066a1f1cb40f47986f283878848fd354c745e6397f588b4e5a046ee8d64bfdf4c208e4c3dfbdcfb2fd34315ec67c64e7af
   languageName: node
   linkType: hard
 
-"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:7.24.6"
+"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10c0/b0a03d4f587e1fa92312c912864a0af3f68bfc87367b7c93770e94f171767d563d7adfca7ad571d20cd755e89e1373e7414973ce30e694e7b6eb8f57d2b1b889
+  checksum: 10c0/a36307428ecc1a01b00cf90812335eed1575d13f211ab24fe4d0c55c28a2fcbd4135f142efabc3b277b2a8e09ee05df594a1272353f061b63829495b5dcfdb96
   languageName: node
   linkType: hard
 
-"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:7.24.6"
+"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
-    "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.24.6"
-    "@babel/plugin-transform-optional-chaining": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
+    "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.24.7"
+    "@babel/plugin-transform-optional-chaining": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.13.0
-  checksum: 10c0/fdd40fdf7e87f3dbc5396c9a8f92005798865f6f20d2c24c33246ac43aab8df93742b63dfcfcda67c0a5cf1f7b8a987fdbccaceb9ccbb9a67bef10012b522390
+  checksum: 10c0/aeb6e7aa363a47f815cf956ea1053c5dd8b786a17799f065c9688ba4b0051fe7565d258bbe9400bfcbfb3114cb9fda66983e10afe4d750bc70ff75403e15dd36
   languageName: node
   linkType: hard
 
-"@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@npm:7.24.6"
+"@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@npm:7.24.7"
   dependencies:
-    "@babel/helper-environment-visitor": "npm:^7.24.6"
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-environment-visitor": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10c0/cc1e8ee138c71e78ec262a5198d2cf75c305f2fb4ea9771ebd4ded47f51bc1bacbf917db3cb28c681e7499a07f9803ab0bbe5ad50b9576cbe03902189e3871ed
+  checksum: 10c0/2b52a73e444f6adc73f927b623e53a4cf64397170dd1071268536df1b3db1e02131418c8dc91351af48837a6298212118f4a72d5407f8005cf9a732370a315b0
   languageName: node
   linkType: hard
 
@@ -496,25 +504,25 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-syntax-import-assertions@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-syntax-import-assertions@npm:7.24.6"
+"@babel/plugin-syntax-import-assertions@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-syntax-import-assertions@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/8e81c7cd3d5812a3dda32f06f84492a1b5640f42c594619ed57bf4017529889f87bfb4e8e95c50ba1527d89501dae71a0c73770502676545c2cd9ce58ce3258d
+  checksum: 10c0/b82c53e095274ee71c248551352d73441cf65b3b3fc0107258ba4e9aef7090772a425442b3ed1c396fa207d0efafde8929c87a17d3c885b3ca2021316e87e246
   languageName: node
   linkType: hard
 
-"@babel/plugin-syntax-import-attributes@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-syntax-import-attributes@npm:7.24.6"
+"@babel/plugin-syntax-import-attributes@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-syntax-import-attributes@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/c4d8554b89c0daa6d3c430582b98c10a3af2de8eab484082e97cb73f2712780ab6dd8d11d783c4b266efef76f4479abf4944ef8f416a4459b05eecaf438f8774
+  checksum: 10c0/eccc54d0f03c96d0eec7a6e2fa124dadbc7298345b62ffc4238f173308c4325b5598f139695ff05a95cf78412ef6903599e4b814496612bf39aad4715a16375b
   languageName: node
   linkType: hard
 
@@ -540,14 +548,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-syntax-jsx@npm:7, @babel/plugin-syntax-jsx@npm:^7.24.6, @babel/plugin-syntax-jsx@npm:^7.7.2":
-  version: 7.24.6
-  resolution: "@babel/plugin-syntax-jsx@npm:7.24.6"
+"@babel/plugin-syntax-jsx@npm:7, @babel/plugin-syntax-jsx@npm:^7.24.7, @babel/plugin-syntax-jsx@npm:^7.7.2":
+  version: 7.24.7
+  resolution: "@babel/plugin-syntax-jsx@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/f00d783a9e2d52f0a8797823a3cbdbe2d0dc09c7235fe8c88e6dce3a02f234f52fb5e976a001cc30b0e2b330590b5680f54436e56d67f9ab05d1e4bdeb3992cd
+  checksum: 10c0/f44d927a9ae8d5ef016ff5b450e1671e56629ddc12e56b938e41fd46e141170d9dfc9a53d6cb2b9a20a7dd266a938885e6a3981c60c052a2e1daed602ac80e51
   languageName: node
   linkType: hard
 
@@ -639,14 +647,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-syntax-typescript@npm:^7.24.6, @babel/plugin-syntax-typescript@npm:^7.7.2":
-  version: 7.24.6
-  resolution: "@babel/plugin-syntax-typescript@npm:7.24.6"
+"@babel/plugin-syntax-typescript@npm:^7.24.7, @babel/plugin-syntax-typescript@npm:^7.7.2":
+  version: 7.24.7
+  resolution: "@babel/plugin-syntax-typescript@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/b1eeabf8bebfa78cea559c0a0d55e480fe2ebd799472d1f6bd5afbd2759d02b362d29ad30009c81d5b112797beb987e58a3000d2331adaa4bf03862e1ed18cef
+  checksum: 10c0/cdabd2e8010fb0ad15b49c2c270efc97c4bfe109ead36c7bbcf22da7a74bc3e49702fc4f22f12d2d6049e8e22a5769258df1fd05f0420ae45e11bdd5bc07805a
   languageName: node
   linkType: hard
 
@@ -662,456 +670,456 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-arrow-functions@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-arrow-functions@npm:7.24.6"
+"@babel/plugin-transform-arrow-functions@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-arrow-functions@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/46250eb3f535327825db323740a301b76b882b70979f1fb5f89cbb1a820378ab68ee880b912981dd5276dd116deaaee0f4a2a95f1c9cf537a67749fd4209a2d3
+  checksum: 10c0/6ac05a54e5582f34ac6d5dc26499e227227ec1c7fa6fc8de1f3d40c275f140d3907f79bbbd49304da2d7008a5ecafb219d0b71d78ee3290ca22020d878041245
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-async-generator-functions@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-async-generator-functions@npm:7.24.6"
+"@babel/plugin-transform-async-generator-functions@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-async-generator-functions@npm:7.24.7"
   dependencies:
-    "@babel/helper-environment-visitor": "npm:^7.24.6"
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
-    "@babel/helper-remap-async-to-generator": "npm:^7.24.6"
+    "@babel/helper-environment-visitor": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
+    "@babel/helper-remap-async-to-generator": "npm:^7.24.7"
     "@babel/plugin-syntax-async-generators": "npm:^7.8.4"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/8876431855220ccfbf1ae510a4a7c4e0377b21189d3f73ea6dde5ffd31eee57f03ea2b2d1da59b6a36b6e107e41b38d0c1d1bb015e0d1c2c2fb627962260edb7
+  checksum: 10c0/6b5e33ae66dce0afce9b06d8dace6fa052528e60f7622aa6cfd3e71bd372ca5079d426e78336ca564bc0d5f37acbcda1b21f4fe656fcb642f1a93a697ab39742
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-async-to-generator@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-async-to-generator@npm:7.24.6"
+"@babel/plugin-transform-async-to-generator@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-async-to-generator@npm:7.24.7"
   dependencies:
-    "@babel/helper-module-imports": "npm:^7.24.6"
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
-    "@babel/helper-remap-async-to-generator": "npm:^7.24.6"
+    "@babel/helper-module-imports": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
+    "@babel/helper-remap-async-to-generator": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/52c137668e7a35356c3b1caf25ab3bf90ff61199885bfd9f0232bfe168a53a5cf0ca4c1e283c27e44ad76cc366b73e4ff7042241469d1944c7042fb78c57bfd8
+  checksum: 10c0/83c82e243898875af8457972a26ab29baf8a2078768ee9f35141eb3edff0f84b165582a2ff73e90a9e08f5922bf813dbf15a85c1213654385198f4591c0dc45d
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-block-scoped-functions@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-block-scoped-functions@npm:7.24.6"
+"@babel/plugin-transform-block-scoped-functions@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-block-scoped-functions@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/0c761b5e3a2959b63edf47d67f6752e01f24777ad1accd82457a2dca059877f8a8297fbc7a062db6b48836309932f2ac645c507070ef6ad4e765b3600822c048
+  checksum: 10c0/113e86de4612ae91773ff5cb6b980f01e1da7e26ae6f6012127415d7ae144e74987bc23feb97f63ba4bc699331490ddea36eac004d76a20d5369e4cc6a7f61cd
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-block-scoping@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-block-scoping@npm:7.24.6"
+"@babel/plugin-transform-block-scoping@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-block-scoping@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/95c25e501c4553515f92d4e86032a8859a8855cea8aafb6df30f956979caa70af1e126e6dfaf9e51328d1306232ff1e081bda7d84a9aaf23f418d9da120c7018
+  checksum: 10c0/dcbc5e385c0ca5fb5736b1c720c90755cffe9f91d8c854f82e61e59217dd3f6c91b3633eeee4b55a89d3f59e5275d0f5b0b1b1363d4fa70c49c468b55aa87700
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-class-properties@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-class-properties@npm:7.24.6"
+"@babel/plugin-transform-class-properties@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-class-properties@npm:7.24.7"
   dependencies:
-    "@babel/helper-create-class-features-plugin": "npm:^7.24.6"
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-create-class-features-plugin": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/ae01e00dd528112d542a77f0f1cf6b43726553d2011bbdec9e4fac441dfa161d44bf14449dc4121b45cc971686a8c652652032594e83c5d6cab8e9fd794eecb2
+  checksum: 10c0/75018a466c7ede3d2397e158891c224ba7fca72864506ce067ddbc02fc65191d44da4d6379c996d0c7f09019e26b5c3f5f1d3a639cd98366519723886f0689d0
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-class-static-block@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-class-static-block@npm:7.24.6"
+"@babel/plugin-transform-class-static-block@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-class-static-block@npm:7.24.7"
   dependencies:
-    "@babel/helper-create-class-features-plugin": "npm:^7.24.6"
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-create-class-features-plugin": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
     "@babel/plugin-syntax-class-static-block": "npm:^7.14.5"
   peerDependencies:
     "@babel/core": ^7.12.0
-  checksum: 10c0/425f237faf62b531d973f23ac3eefe3f29c4f6c988c33c2dd660b6dfb61d4ed1e865a5088574742d87ed02437d26aa6ec6b107468b7df35ca9d3082bad742d8f
+  checksum: 10c0/b0ade39a3d09dce886f79dbd5907c3d99b48167eddb6b9bbde24a0598129654d7017e611c20494cdbea48b07ac14397cd97ea34e3754bbb2abae4e698128eccb
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-classes@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-classes@npm:7.24.6"
+"@babel/plugin-transform-classes@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-classes@npm:7.24.7"
   dependencies:
-    "@babel/helper-annotate-as-pure": "npm:^7.24.6"
-    "@babel/helper-compilation-targets": "npm:^7.24.6"
-    "@babel/helper-environment-visitor": "npm:^7.24.6"
-    "@babel/helper-function-name": "npm:^7.24.6"
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
-    "@babel/helper-replace-supers": "npm:^7.24.6"
-    "@babel/helper-split-export-declaration": "npm:^7.24.6"
+    "@babel/helper-annotate-as-pure": "npm:^7.24.7"
+    "@babel/helper-compilation-targets": "npm:^7.24.7"
+    "@babel/helper-environment-visitor": "npm:^7.24.7"
+    "@babel/helper-function-name": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
+    "@babel/helper-replace-supers": "npm:^7.24.7"
+    "@babel/helper-split-export-declaration": "npm:^7.24.7"
     globals: "npm:^11.1.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/d29c26feea9ad5a64d790aeab1833b7a50d6af2be24140dad7e06510b754b8fe0ffb292d43d96fedaf7765fcb90c0034ac7c42635f814d9235697431076a1cf0
+  checksum: 10c0/e51dba7ce8b770d1eee929e098d5a3be3efc3e8b941e22dda7d0097dc4e7be5feabd2da7b707ac06fcac5661b31223c541941dec08ce76c1faa55544d87d06ec
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-computed-properties@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-computed-properties@npm:7.24.6"
+"@babel/plugin-transform-computed-properties@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-computed-properties@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
-    "@babel/template": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
+    "@babel/template": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/c464144c2eda8d526d70c8d8e3bf30820f591424991452f816617347ef3ccc5d04133c6e903b90c1d832d95d9c8550e5693ea40ea14856ede54fb8e1cd36c5de
+  checksum: 10c0/25636dbc1f605c0b8bc60aa58628a916b689473d11551c9864a855142e36742fe62d4a70400ba3b74902338e77fb3d940376c0a0ba154b6b7ec5367175233b49
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-destructuring@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-destructuring@npm:7.24.6"
+"@babel/plugin-transform-destructuring@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-destructuring@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/1fcc064e2b0c45a4340418bd70d2cf2b3644d1215eb975ec14f83e4f7615fdc3948e355db5091f81602f6c3d933f9308caa66232091aad4edd6c16b00240fcc7
+  checksum: 10c0/929f07a807fb62230bfbf881cfcedf187ac5daf2f1b01da94a75c7a0f6f72400268cf4bcfee534479e43260af8193e42c31ee03c8b0278ba77d0036ed6709c27
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-dotall-regex@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-dotall-regex@npm:7.24.6"
+"@babel/plugin-transform-dotall-regex@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-dotall-regex@npm:7.24.7"
   dependencies:
-    "@babel/helper-create-regexp-features-plugin": "npm:^7.24.6"
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-create-regexp-features-plugin": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/4a2c98f1c22a18754c6ada1486563865690008df2536066d8a146fa58eed8515b607e162c7efb0b8fa062d755e77afea145495046cffdb4ea56194d38f489254
+  checksum: 10c0/793f14c9494972d294b7e7b97b747f47874b6d57d7804d3443c701becf5db192c9311be6a1835c07664486df1f5c60d33196c36fb7e11a53015e476b4c145b33
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-duplicate-keys@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-duplicate-keys@npm:7.24.6"
+"@babel/plugin-transform-duplicate-keys@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-duplicate-keys@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/44ddba252f0b9f1f0b1ff8d903bbcf8871246670fb2883f65d09d371d403ce9c3e2e582b94b36506c1d042110b464eb3492e53cd1e87c1d479b145bcc01c04fd
+  checksum: 10c0/75ff7ec1117ac500e77bf20a144411d39c0fdd038f108eec061724123ce6d1bb8d5bd27968e466573ee70014f8be0043361cdb0ef388f8a182d1d97ad67e51b9
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-dynamic-import@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-dynamic-import@npm:7.24.6"
+"@babel/plugin-transform-dynamic-import@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-dynamic-import@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
     "@babel/plugin-syntax-dynamic-import": "npm:^7.8.3"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/b4411f21112127a02aef15103765e207e4c03e7321d7f4de3522fc181cb377c5abc8484cf0169e6c30f2e51e6c602c09894fa6b15643d24f66273833ef34e4a6
+  checksum: 10c0/eeda48372efd0a5103cb22dadb13563c975bce18ae85daafbb47d57bb9665d187da9d4fe8d07ac0a6e1288afcfcb73e4e5618bf75ff63fddf9736bfbf225203b
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-exponentiation-operator@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-exponentiation-operator@npm:7.24.6"
+"@babel/plugin-transform-exponentiation-operator@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-exponentiation-operator@npm:7.24.7"
   dependencies:
-    "@babel/helper-builder-binary-assignment-operator-visitor": "npm:^7.24.6"
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-builder-binary-assignment-operator-visitor": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/c4f15518a5d1614dfac0dbadfb99b0f36a98c1c1ff1c39794a105c3c87cfce00689e0943fcb13368b43b00b2eebaa01136ea12fb8600a574720853b5a8a11de7
+  checksum: 10c0/ace3e11c94041b88848552ba8feb39ae4d6cad3696d439ff51445bd2882d8b8775d85a26c2c0edb9b5e38c9e6013cc11b0dea89ec8f93c7d9d7ee95e3645078c
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-export-namespace-from@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-export-namespace-from@npm:7.24.6"
+"@babel/plugin-transform-export-namespace-from@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-export-namespace-from@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
     "@babel/plugin-syntax-export-namespace-from": "npm:^7.8.3"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/bff16d1800d7e5b38d3a3c8d404cc14442a37383dff7769dcc599a0723b2507647cafe9ba7d9b52d2e2f02a78bb78d149676d8d8ddf7357b160f4096b89ae9c5
+  checksum: 10c0/4e144d7f1c57bc63b4899dbbbdfed0880f2daa75ea9c7251c7997f106e4b390dc362175ab7830f11358cb21f6b972ca10a43a2e56cd789065f7606b082674c0c
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-for-of@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-for-of@npm:7.24.6"
+"@babel/plugin-transform-for-of@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-for-of@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
-    "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
+    "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/c8def2a160783c5c4a1c136c721fc88aca9cd3757a60f1c885a804b5320edb5f143d3f989f698bdd9aae359fdabab0830dba3d35138cea42988a77d2c72c8443
+  checksum: 10c0/77629b1173e55d07416f05ba7353caa09d2c2149da2ca26721ab812209b63689d1be45116b68eadc011c49ced59daf5320835b15245eb7ae93ae0c5e8277cfc0
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-function-name@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-function-name@npm:7.24.6"
+"@babel/plugin-transform-function-name@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-function-name@npm:7.24.7"
   dependencies:
-    "@babel/helper-compilation-targets": "npm:^7.24.6"
-    "@babel/helper-function-name": "npm:^7.24.6"
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-compilation-targets": "npm:^7.24.7"
+    "@babel/helper-function-name": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/efa6527438ad94df0b7a4c92c33110ec40b086a0aceda567176b150ed291f8eb44b2ce697d8e3e1d4841496c10693add1e88f296418e72a171ead5c76b890a47
+  checksum: 10c0/3e9642428d6952851850d89ea9307d55946528d18973784d0e2f04a651b23bd9924dd8a2641c824b483bd4ab1223bab1d2f6a1106a939998f7ced512cb60ac5b
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-json-strings@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-json-strings@npm:7.24.6"
+"@babel/plugin-transform-json-strings@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-json-strings@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
     "@babel/plugin-syntax-json-strings": "npm:^7.8.3"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/46af52dcc16f494c6c11dc22c944f2533623b9d9dfce5097bc0bdb99535ad4c4cfe5bca0d8ce8c39a94202e69d99ee60f546ce0be0ad782b681c7b5b4c9ddd6f
+  checksum: 10c0/17c72cd5bf3e90e722aabd333559275f3309e3fa0b9cea8c2944ab83ae01502c71a2be05da5101edc02b3fc8df15a8dbb9b861cbfcc8a52bf5e797cf01d3a40a
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-literals@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-literals@npm:7.24.6"
+"@babel/plugin-transform-literals@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-literals@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/961b64df79a673706d74cf473d1f4646f250b4f8813f9d7ef5d897e30acdacd1ca104584de2e88546289fce055d71bd7559cdb8ad4a2d5e7eea17f3c829faa97
+  checksum: 10c0/9f3f6f3831929cd2a977748c07addf9944d5cccb50bd3a24a58beb54f91f00d6cacd3d7831d13ffe1ad6f8aba0aefd7bca5aec65d63b77f39c62ad1f2d484a3e
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-logical-assignment-operators@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-logical-assignment-operators@npm:7.24.6"
+"@babel/plugin-transform-logical-assignment-operators@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-logical-assignment-operators@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
     "@babel/plugin-syntax-logical-assignment-operators": "npm:^7.10.4"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/0ae7f4098c63f442fd038de6034155bcf20214e7e490e92189decb2980932247b97cb069b11ac8bc471b53f71d6859e607969440d63ff400b8932ee3e05b4958
+  checksum: 10c0/dbe882eb9053931f2ab332c50fc7c2a10ef507d6421bd9831adbb4cb7c9f8e1e5fbac4fbd2e007f6a1bf1df1843547559434012f118084dc0bf42cda3b106272
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-member-expression-literals@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-member-expression-literals@npm:7.24.6"
+"@babel/plugin-transform-member-expression-literals@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-member-expression-literals@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/ec8908a409bd39d20f0428e35425c9e4c540bad252a0e33e08b84e3bea5088c785531197bdcf049afbdba841325962a93030b7be6da3586cb13d0ca0ebab89c9
+  checksum: 10c0/e789ae359bdf2d20e90bedef18dfdbd965c9ebae1cee398474a0c349590fda7c8b874e1a2ceee62e47e5e6ec1730e76b0f24e502164357571854271fc12cc684
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-modules-amd@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-modules-amd@npm:7.24.6"
+"@babel/plugin-transform-modules-amd@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-modules-amd@npm:7.24.7"
   dependencies:
-    "@babel/helper-module-transforms": "npm:^7.24.6"
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-module-transforms": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/074d26c79f517b27a07fef00319aff9705df1e6b41a805db855fe719e0f246b9815d6525cf1c5f0890c7f830dd0b9776e9b2493bbc929a3c23c0dee15f10a514
+  checksum: 10c0/6df7de7fce34117ca4b2fa07949b12274c03668cbfe21481c4037b6300796d50ae40f4f170527b61b70a67f26db906747797e30dbd0d9809a441b6e220b5728f
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-modules-commonjs@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-modules-commonjs@npm:7.24.6"
+"@babel/plugin-transform-modules-commonjs@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-modules-commonjs@npm:7.24.7"
   dependencies:
-    "@babel/helper-module-transforms": "npm:^7.24.6"
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
-    "@babel/helper-simple-access": "npm:^7.24.6"
+    "@babel/helper-module-transforms": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
+    "@babel/helper-simple-access": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/4fc790136d066105fa773ffc7e249d88c6f0d0126984ede36fedd51ac2b622b46c08565bcdd1ab62ac10195eeedeaba0d26e7e4c676ed50906cbed16540a4e22
+  checksum: 10c0/9442292b3daf6a5076cdc3c4c32bf423bda824ccaeb0dd0dc8b3effaa1fecfcb0130ae6e647fef12a5d5ff25bcc99a0d6bfc6d24a7525345e1bcf46fcdf81752
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-modules-systemjs@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-modules-systemjs@npm:7.24.6"
+"@babel/plugin-transform-modules-systemjs@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-modules-systemjs@npm:7.24.7"
   dependencies:
-    "@babel/helper-hoist-variables": "npm:^7.24.6"
-    "@babel/helper-module-transforms": "npm:^7.24.6"
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
-    "@babel/helper-validator-identifier": "npm:^7.24.6"
+    "@babel/helper-hoist-variables": "npm:^7.24.7"
+    "@babel/helper-module-transforms": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
+    "@babel/helper-validator-identifier": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/500962e3ac1bb1a9890e94f1967ec9e3aa3d41e22d4a9d1c739918707e4a8936710fd8d0ed4f3a8aad87260f7566b54566bead77977eb21e90124835cb6bcdca
+  checksum: 10c0/e2a795e0a6baafe26f4a74010622212ddd873170742d673f450e0097f8d984f6e6a95eb8ce41b05071ee9790c4be088b33801aaab3f78ee202c567634e52a331
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-modules-umd@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-modules-umd@npm:7.24.6"
+"@babel/plugin-transform-modules-umd@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-modules-umd@npm:7.24.7"
   dependencies:
-    "@babel/helper-module-transforms": "npm:^7.24.6"
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-module-transforms": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/73c6cecb4f45ca3f665e2c57b6d04d65358518522dfaffb9b6913c026aeb704281d015324d02bf07f2cb026de6bac9308c62e82979364bd39f3687f752652b0d
+  checksum: 10c0/7791d290121db210e4338b94b4a069a1a79e4c7a8d7638d8159a97b281851bbed3048dac87a4ae718ad963005e6c14a5d28e6db2eeb2b04e031cee92fb312f85
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-named-capturing-groups-regex@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-named-capturing-groups-regex@npm:7.24.6"
+"@babel/plugin-transform-named-capturing-groups-regex@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-named-capturing-groups-regex@npm:7.24.7"
   dependencies:
-    "@babel/helper-create-regexp-features-plugin": "npm:^7.24.6"
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-create-regexp-features-plugin": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10c0/92547309d81938488753f87b05a679a7557a1cec253756966044367c268b27311e51efad91724aa3e433cf61626e10bf1008e112998350c2013a87824c4cfe0b
+  checksum: 10c0/41a0b0f2d0886318237440aa3b489f6d0305361d8671121777d9ff89f9f6de9d0c02ce93625049061426c8994064ef64deae8b819d1b14c00374a6a2336fb5d9
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-new-target@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-new-target@npm:7.24.6"
+"@babel/plugin-transform-new-target@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-new-target@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/5e9b9edfbe46489f64013d2bbd422f29acdb8057ccc85e7c759f7cf1415fde6a82ac13a13f0f246defaba6e2f7f4d424178ba78fc02237bdbf7df6692fc1dca8
+  checksum: 10c0/2540808a35e1a978e537334c43dab439cf24c93e7beb213a2e71902f6710e60e0184316643790c0a6644e7a8021e52f7ab8165e6b3e2d6651be07bdf517b67df
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-nullish-coalescing-operator@npm:^7.22.3, @babel/plugin-transform-nullish-coalescing-operator@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-nullish-coalescing-operator@npm:7.24.6"
+"@babel/plugin-transform-nullish-coalescing-operator@npm:^7.22.3, @babel/plugin-transform-nullish-coalescing-operator@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-nullish-coalescing-operator@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
     "@babel/plugin-syntax-nullish-coalescing-operator": "npm:^7.8.3"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/53ab5b16bbcf47e842a48f1f0774d238dae0222c3e1f31653307808048e249ed140cba12dfc280cbc9a577cb3bb5b2f50ca0e3e4ffe5260fcf8c3ca0b83fb21e
+  checksum: 10c0/7243c8ff734ed5ef759dd8768773c4b443c12e792727e759a1aec2c7fa2bfdd24f1ecb42e292a7b3d8bd3d7f7b861cf256a8eb4ba144fc9cc463892c303083d9
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-numeric-separator@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-numeric-separator@npm:7.24.6"
+"@babel/plugin-transform-numeric-separator@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-numeric-separator@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
     "@babel/plugin-syntax-numeric-separator": "npm:^7.10.4"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/14863e735fc407e065e1574914864a956b8250a84cfb4704592656763c9455d67034c7745e53066725195d9ed042121f424c4aaee00027791640e2639386b701
+  checksum: 10c0/e18e09ca5a6342645d00ede477731aa6e8714ff357efc9d7cda5934f1703b3b6fb7d3298dce3ce3ba53e9ff1158eab8f1aadc68874cc21a6099d33a1ca457789
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-object-rest-spread@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-object-rest-spread@npm:7.24.6"
+"@babel/plugin-transform-object-rest-spread@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-object-rest-spread@npm:7.24.7"
   dependencies:
-    "@babel/helper-compilation-targets": "npm:^7.24.6"
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-compilation-targets": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
     "@babel/plugin-syntax-object-rest-spread": "npm:^7.8.3"
-    "@babel/plugin-transform-parameters": "npm:^7.24.6"
+    "@babel/plugin-transform-parameters": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/1a192b9756ebfa0bc69ad5e285d7d0284963b4b95738ca7721354297329d5c1ab4eb05ff5b198cbfffa3ec00e97a15a712aa7a5011d9407478796966aab54527
+  checksum: 10c0/9ad64bc003f583030f9da50614b485852f8edac93f8faf5d1cd855201a4852f37c5255ae4daf70dd4375bdd4874e16e39b91f680d4668ec219ba05441ce286eb
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-object-super@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-object-super@npm:7.24.6"
+"@babel/plugin-transform-object-super@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-object-super@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
-    "@babel/helper-replace-supers": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
+    "@babel/helper-replace-supers": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/2e48b9e0a1f3b04b439ede2d0c83bcc5324a81c8bab73c70f0c466cf48061a4ff469f283e2feb17b4cc2e20372c1362253604477ecd77e622192d5d7906aa062
+  checksum: 10c0/770cebb4b4e1872c216b17069db9a13b87dfee747d359dc56d9fcdd66e7544f92dc6ab1861a4e7e0528196aaff2444e4f17dc84efd8eaf162d542b4ba0943869
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-optional-catch-binding@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-optional-catch-binding@npm:7.24.6"
+"@babel/plugin-transform-optional-catch-binding@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-optional-catch-binding@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
     "@babel/plugin-syntax-optional-catch-binding": "npm:^7.8.3"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/411db3177b1bffd2f9e5b33a6b62e70158380e67d91ff4725755312e8a0a2f2c3fd340c60005295a672115fb593222ab2d7076266aebced6ef087a5505b6f371
+  checksum: 10c0/1e2f10a018f7d03b3bde6c0b70d063df8d5dd5209861d4467726cf834f5e3d354e2276079dc226aa8e6ece35f5c9b264d64b8229a8bb232829c01e561bcfb07a
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-optional-chaining@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-optional-chaining@npm:7.24.6"
+"@babel/plugin-transform-optional-chaining@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-optional-chaining@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
-    "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
+    "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.24.7"
     "@babel/plugin-syntax-optional-chaining": "npm:^7.8.3"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/8ee5a500a2309444d4fb27979857598e9c91d804fe23217c51cc208b1bc6b9cd0650b355b1ebd625f180c5f1dc4cb89b5f313c982f7c89d90281a69b24a88ccb
+  checksum: 10c0/b9e3649b299e103b0d1767bbdba56574d065ff776e5350403b7bfd4e3982743c0cdb373d33bdbf94fa3c322d155e45d0aad946acf0aa741b870aed22dfec8b8e
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-parameters@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-parameters@npm:7.24.6"
+"@babel/plugin-transform-parameters@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-parameters@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/d9648924b9c0d35a243c0742c22838932a024205c61f4cc419857e5195edd893a33e6be4f2c8fbd89e925051c7cbe8968029ec2d3e7f2f098bfa682f4e2b9731
+  checksum: 10c0/53bf190d6926771545d5184f1f5f3f5144d0f04f170799ad46a43f683a01fab8d5fe4d2196cf246774530990c31fe1f2b9f0def39f0a5ddbb2340b924f5edf01
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-private-methods@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-private-methods@npm:7.24.6"
+"@babel/plugin-transform-private-methods@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-private-methods@npm:7.24.7"
   dependencies:
-    "@babel/helper-create-class-features-plugin": "npm:^7.24.6"
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-create-class-features-plugin": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/55f93959b2e8aeda818db7cdc7dfdcd5076f5bdc8a819566818004a68969fb7297d617f9d108bf76ac232d6056d9f9d20f73ce10380baa43ff1755c5591aa803
+  checksum: 10c0/5b7bf923b738fbe3ad6c33b260e0a7451be288edfe4ef516303fa787a1870cd87533bfbf61abb779c22ed003c2fc484dec2436fe75a48756f686c0241173d364
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-private-property-in-object@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-private-property-in-object@npm:7.24.6"
+"@babel/plugin-transform-private-property-in-object@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-private-property-in-object@npm:7.24.7"
   dependencies:
-    "@babel/helper-annotate-as-pure": "npm:^7.24.6"
-    "@babel/helper-create-class-features-plugin": "npm:^7.24.6"
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-annotate-as-pure": "npm:^7.24.7"
+    "@babel/helper-create-class-features-plugin": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
     "@babel/plugin-syntax-private-property-in-object": "npm:^7.14.5"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/c9eb9597362b598a91536375a49ba80cdf13461e849680e040898b103f7998c4d33a7832da5afba9fa51e3473f79cf8605f9ace07a887e386b7801797021631b
+  checksum: 10c0/c6fa7defb90b1b0ed46f24ff94ff2e77f44c1f478d1090e81712f33cf992dda5ba347016f030082a2f770138bac6f4a9c2c1565e9f767a125901c77dd9c239ba
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-property-literals@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-property-literals@npm:7.24.6"
+"@babel/plugin-transform-property-literals@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-property-literals@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/d1195d93406b6c400cdbc9ac57a2b8b58c72cc6480cc03656abfc243be0e2a48133cbb96559c2db95b1c78803daeb538277821540fe19e2a9105905e727ef618
+  checksum: 10c0/52564b58f3d111dc02d241d5892a4b01512e98dfdf6ef11b0ed62f8b11b0acacccef0fc229b44114fe8d1a57a8b70780b11bdd18b807d3754a781a07d8f57433
   languageName: node
   linkType: hard
 
@@ -1126,243 +1134,243 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-react-display-name@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-react-display-name@npm:7.24.6"
+"@babel/plugin-transform-react-display-name@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-react-display-name@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/e929d054035fa3b7432bd2b3e5cf280ffd8cf60d1ce80c863c5e0b03ad01bf6ae2546575d2da31cca2ab83d9399ac01a351f20e21af5075d9c0d4c893e4a36bd
+  checksum: 10c0/c14a07a9e75723c96f1a0a306b8a8e899ff1c6a0cc3d62bcda79bb1b54e4319127b258651c513a1a47da152cdc22e16525525a30ae5933a2980c7036fd0b4d24
   languageName: node
   linkType: hard
 
 "@babel/plugin-transform-react-inline-elements@npm:^7.21.0":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-react-inline-elements@npm:7.24.6"
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-react-inline-elements@npm:7.24.7"
   dependencies:
-    "@babel/helper-builder-react-jsx": "npm:^7.24.6"
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-builder-react-jsx": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/b29f32a0c345db24f32569cf7a5626e37dd31c21bb764148757e91f609d41e2d09031ff1ad86e5672d578cf16f513b197ef3ebc8f0650d8314890a34ca68f02c
+  checksum: 10c0/affe44efc641e5dc4de077db74c80e3dee896a5dfea04491cbd8167ac40dcbb6eaa1ad0ba599e4a85071acdaa08732e7f5d9cf3236a2aa635406c232c8f08236
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-react-jsx-development@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-react-jsx-development@npm:7.24.6"
+"@babel/plugin-transform-react-jsx-development@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-react-jsx-development@npm:7.24.7"
   dependencies:
-    "@babel/plugin-transform-react-jsx": "npm:^7.24.6"
+    "@babel/plugin-transform-react-jsx": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/f899ffa65c7f459a682246a346af0e4132929ffe928cb0d02ae08aac1cf3fb01b2f6e944ef1eaca78f14e94eff935e2bf96aad878030c25ff6de2070a8b72448
+  checksum: 10c0/fce647db50f90a5291681f0f97865d9dc76981262dff71d6d0332e724b85343de5860c26f9e9a79e448d61e1d70916b07ce91e8c7f2b80dceb4b16aee41794d8
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-react-jsx@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-react-jsx@npm:7.24.6"
+"@babel/plugin-transform-react-jsx@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-react-jsx@npm:7.24.7"
   dependencies:
-    "@babel/helper-annotate-as-pure": "npm:^7.24.6"
-    "@babel/helper-module-imports": "npm:^7.24.6"
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
-    "@babel/plugin-syntax-jsx": "npm:^7.24.6"
-    "@babel/types": "npm:^7.24.6"
+    "@babel/helper-annotate-as-pure": "npm:^7.24.7"
+    "@babel/helper-module-imports": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
+    "@babel/plugin-syntax-jsx": "npm:^7.24.7"
+    "@babel/types": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/6144f56a76529a82077475583a17be8f0b0b461c83673e650f3894e09dbe2bcdfdbfff089eca2e5e239e119f72cd9562749a9af7eb3f2e3266a730da31cd19f2
+  checksum: 10c0/5c46d2c1c06a30e6bde084839df9cc689bf9c9cb0292105d61c225ca731f64247990724caee7dfc7f817dc964c062e8319e7f05394209590c476b65d75373435
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-react-pure-annotations@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-react-pure-annotations@npm:7.24.6"
+"@babel/plugin-transform-react-pure-annotations@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-react-pure-annotations@npm:7.24.7"
   dependencies:
-    "@babel/helper-annotate-as-pure": "npm:^7.24.6"
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-annotate-as-pure": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/7f83c5a3a275dbb9a291dee4642a3a0f2249265346d8d3cc9324fc9ee063c3e35c3853b52752ece603f0ac92b405deb38c4b5307a99a74d3e1c9c32a2cefa465
+  checksum: 10c0/fae517d293d9c93b7b920458c3e4b91cb0400513889af41ba184a5f3acc8bfef27242cc262741bb8f87870df376f1733a0d0f52b966d342e2aaaf5607af8f73d
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-regenerator@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-regenerator@npm:7.24.6"
+"@babel/plugin-transform-regenerator@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-regenerator@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
     regenerator-transform: "npm:^0.15.2"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/d17eaa97514d583866182420024b8c22da2c6ca822bdbf16fe7564121564c1844935592dc3315c73d1f78f7c908a4338b1d783618811e694c9bb6d5f9233e58d
+  checksum: 10c0/d2dc2c788fdae9d97217e70d46ba8ca9db0035c398dc3e161552b0c437113719a75c04f201f9c91ddc8d28a1da60d0b0853f616dead98a396abb9c845c44892b
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-reserved-words@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-reserved-words@npm:7.24.6"
+"@babel/plugin-transform-reserved-words@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-reserved-words@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/5d2d4c579bd90c60fc6468a1285b3384e7b650b47d41a937a1590d4aecfc28bd945e82704c6e71cc91aa016b7e78c5594290c1c386edf11ec98e09e36235c5ae
+  checksum: 10c0/2229de2768615e7f5dc0bbc55bc121b5678fd6d2febd46c74a58e42bb894d74cd5955c805880f4e02d0e1cf94f6886270eda7fafc1be9305a1ec3b9fd1d063f5
   languageName: node
   linkType: hard
 
 "@babel/plugin-transform-runtime@npm:^7.22.4":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-runtime@npm:7.24.6"
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-runtime@npm:7.24.7"
   dependencies:
-    "@babel/helper-module-imports": "npm:^7.24.6"
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-module-imports": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
     babel-plugin-polyfill-corejs2: "npm:^0.4.10"
     babel-plugin-polyfill-corejs3: "npm:^0.10.1"
     babel-plugin-polyfill-regenerator: "npm:^0.6.1"
     semver: "npm:^6.3.1"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/89c43c1236506ecbfc547b12936283ca41e611430c2d2e6d12bf1cbdb0d80760cdae481951f486946733e1c9ae064cb05f4bc779c65b3288d40963b0c4a20c5c
+  checksum: 10c0/a33f5095872bbba00b8ee553dfe6941477e69a017a2e65e9dd86e80dab5c627635093b796eb1eb22aaaf2f874704f63ad1d99b952b83b59ef6b368ae04e5bb41
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-shorthand-properties@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-shorthand-properties@npm:7.24.6"
+"@babel/plugin-transform-shorthand-properties@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-shorthand-properties@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/4141b5da1d0d20d66ca0affaef8dfc45ed5e954bfa9003eb8aa779842599de443b37c2b265da27693f304c35ab68a682b44098e9eea0d39f8f94072ab616657f
+  checksum: 10c0/41b155bdbb3be66618358488bf7731b3b2e8fff2de3dbfd541847720a9debfcec14db06a117abedd03c9cd786db20a79e2a86509a4f19513f6e1b610520905cf
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-spread@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-spread@npm:7.24.6"
+"@babel/plugin-transform-spread@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-spread@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
-    "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
+    "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/6d12da05311690c4a73d775688ba6931b441e96e512377a166a60184292edeac0b17f5154a49e2f1d262a3f80b96e064bc9c88c63b2a6125f0a2132eff9ed585
+  checksum: 10c0/facba1553035f76b0d2930d4ada89a8cd0f45b79579afd35baefbfaf12e3b86096995f4b0c402cf9ee23b3f2ea0a4460c3b1ec0c192d340962c948bb223d4e66
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-sticky-regex@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-sticky-regex@npm:7.24.6"
+"@babel/plugin-transform-sticky-regex@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-sticky-regex@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/2a65f57554f51d3b9cd035513a610f47e46b26dba112b3b9fb42d1c1f2ae153fce8f76294b4721d099817814f57895c656f5b7dccd5df683277da6522c817ee9
+  checksum: 10c0/5a74ed2ed0a3ab51c3d15fcaf09d9e2fe915823535c7a4d7b019813177d559b69677090e189ec3d5d08b619483eb5ad371fbcfbbff5ace2a76ba33ee566a1109
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-template-literals@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-template-literals@npm:7.24.6"
+"@babel/plugin-transform-template-literals@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-template-literals@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/fcde48e9c3ecd7f5f37ceb6908f1edd537d3115fc2f27d187d58fd83b2a13637a1bb3d24589d841529ed081405b951bf1c5d194ea81eff6ad2d88204d153010d
+  checksum: 10c0/3630f966257bcace122f04d3157416a09d40768c44c3a800855da81146b009187daa21859d1c3b7d13f4e19e8888e60613964b175b2275d451200fb6d8d6cfe6
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-typeof-symbol@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-typeof-symbol@npm:7.24.6"
+"@babel/plugin-transform-typeof-symbol@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-typeof-symbol@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/a24b3a3c7b87c6496ee13d2438effd4645868f054397357ec3cbe92a2f0df4152ac7fd7228cb956576c1b772c0675b065d6ad5f5053c382e97dd022015e9a028
+  checksum: 10c0/5649e7260a138681e68b296ab5931e2b1f132f287d6b4131d49b24f9dc20d62902b7e9d63c4d2decd5683b41df35ef4b9b03f58c7f9f65e4c25a6d8bbf04e9e9
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-typescript@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-typescript@npm:7.24.6"
+"@babel/plugin-transform-typescript@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-typescript@npm:7.24.7"
   dependencies:
-    "@babel/helper-annotate-as-pure": "npm:^7.24.6"
-    "@babel/helper-create-class-features-plugin": "npm:^7.24.6"
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
-    "@babel/plugin-syntax-typescript": "npm:^7.24.6"
+    "@babel/helper-annotate-as-pure": "npm:^7.24.7"
+    "@babel/helper-create-class-features-plugin": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
+    "@babel/plugin-syntax-typescript": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/46b054e4d4253187403e392ef30f4dd624d8486a1992703f5ff1b415d4e8d00f474e35fb77bc7a3a16a17330873cadcd5af4a8493c61b16da2dde212b2788ccd
+  checksum: 10c0/e8dacdc153a4c4599014b66eb01b94e3dc933d58d4f0cc3039c1a8f432e77b9df14f34a61964e014b975bf466f3fefd8c4768b3e887d3da1be9dc942799bdfdf
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-unicode-escapes@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-unicode-escapes@npm:7.24.6"
+"@babel/plugin-transform-unicode-escapes@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-unicode-escapes@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/0e4038c589b7a63a2469466a25b78aad4ecb7267732e3c953c3055f9a77c7bee859a71983a08b025179f1b094964f2ebbfca1b6c33de4ead90a0b5ef06ddb47e
+  checksum: 10c0/8b18e2e66af33471a6971289492beff5c240e56727331db1d34c4338a6a368a82a7ed6d57ec911001b6d65643aed76531e1e7cac93265fb3fb2717f54d845e69
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-unicode-property-regex@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-unicode-property-regex@npm:7.24.6"
+"@babel/plugin-transform-unicode-property-regex@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-unicode-property-regex@npm:7.24.7"
   dependencies:
-    "@babel/helper-create-regexp-features-plugin": "npm:^7.24.6"
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-create-regexp-features-plugin": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/bca99e00de91d0460dfcb25f285f3606248acc905193c05587e2862c54ddb790c5d8cb45e80927290390cffbcba7620f8af3e74c5301ff0c1c59ce7d47c5629f
+  checksum: 10c0/bc57656eb94584d1b74a385d378818ac2b3fca642e3f649fead8da5fb3f9de22f8461185936915dfb33d5a9104e62e7a47828331248b09d28bb2d59e9276de3e
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-unicode-regex@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-unicode-regex@npm:7.24.6"
+"@babel/plugin-transform-unicode-regex@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-unicode-regex@npm:7.24.7"
   dependencies:
-    "@babel/helper-create-regexp-features-plugin": "npm:^7.24.6"
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-create-regexp-features-plugin": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/ab6e253cfc38c7e8a2844d7ad46f85fdcbe33610b7f92f71045cf0b040438a08f1f1717ab4b84c480537f54e5478db8b404a4ccc2ff846b4e3ed33d373e3b47a
+  checksum: 10c0/83f72a345b751566b601dc4d07e9f2c8f1bc0e0c6f7abb56ceb3095b3c9d304de73f85f2f477a09f8cc7edd5e65afd0ff9e376cdbcbea33bc0c28f3705b38fd9
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-unicode-sets-regex@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-unicode-sets-regex@npm:7.24.6"
+"@babel/plugin-transform-unicode-sets-regex@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-unicode-sets-regex@npm:7.24.7"
   dependencies:
-    "@babel/helper-create-regexp-features-plugin": "npm:^7.24.6"
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-create-regexp-features-plugin": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10c0/a52e84f85519fed330e88f7a17611064d2b5f1d0fe2823f8113ed312828e69787888bd023f404e8d35d0bb96461e42e19cdc4f0a44d35959bc86c219a3062237
+  checksum: 10c0/7457c0ee8e80a80cb6fdc1fe54ab115b52815627616ce9151be8ef292fc99d04a910ec24f11382b4f124b89374264396892b086886bd2a9c2317904d87c9b21b
   languageName: node
   linkType: hard
 
 "@babel/preset-env@npm:^7.11.0, @babel/preset-env@npm:^7.12.1, @babel/preset-env@npm:^7.22.4":
-  version: 7.24.6
-  resolution: "@babel/preset-env@npm:7.24.6"
-  dependencies:
-    "@babel/compat-data": "npm:^7.24.6"
-    "@babel/helper-compilation-targets": "npm:^7.24.6"
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
-    "@babel/helper-validator-option": "npm:^7.24.6"
-    "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "npm:^7.24.6"
-    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "npm:^7.24.6"
-    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "npm:^7.24.6"
-    "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "npm:^7.24.6"
+  version: 7.24.7
+  resolution: "@babel/preset-env@npm:7.24.7"
+  dependencies:
+    "@babel/compat-data": "npm:^7.24.7"
+    "@babel/helper-compilation-targets": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
+    "@babel/helper-validator-option": "npm:^7.24.7"
+    "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "npm:^7.24.7"
+    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "npm:^7.24.7"
+    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "npm:^7.24.7"
+    "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "npm:^7.24.7"
     "@babel/plugin-proposal-private-property-in-object": "npm:7.21.0-placeholder-for-preset-env.2"
     "@babel/plugin-syntax-async-generators": "npm:^7.8.4"
     "@babel/plugin-syntax-class-properties": "npm:^7.12.13"
     "@babel/plugin-syntax-class-static-block": "npm:^7.14.5"
     "@babel/plugin-syntax-dynamic-import": "npm:^7.8.3"
     "@babel/plugin-syntax-export-namespace-from": "npm:^7.8.3"
-    "@babel/plugin-syntax-import-assertions": "npm:^7.24.6"
-    "@babel/plugin-syntax-import-attributes": "npm:^7.24.6"
+    "@babel/plugin-syntax-import-assertions": "npm:^7.24.7"
+    "@babel/plugin-syntax-import-attributes": "npm:^7.24.7"
     "@babel/plugin-syntax-import-meta": "npm:^7.10.4"
     "@babel/plugin-syntax-json-strings": "npm:^7.8.3"
     "@babel/plugin-syntax-logical-assignment-operators": "npm:^7.10.4"
@@ -1374,54 +1382,54 @@ __metadata:
     "@babel/plugin-syntax-private-property-in-object": "npm:^7.14.5"
     "@babel/plugin-syntax-top-level-await": "npm:^7.14.5"
     "@babel/plugin-syntax-unicode-sets-regex": "npm:^7.18.6"
-    "@babel/plugin-transform-arrow-functions": "npm:^7.24.6"
-    "@babel/plugin-transform-async-generator-functions": "npm:^7.24.6"
-    "@babel/plugin-transform-async-to-generator": "npm:^7.24.6"
-    "@babel/plugin-transform-block-scoped-functions": "npm:^7.24.6"
-    "@babel/plugin-transform-block-scoping": "npm:^7.24.6"
-    "@babel/plugin-transform-class-properties": "npm:^7.24.6"
-    "@babel/plugin-transform-class-static-block": "npm:^7.24.6"
-    "@babel/plugin-transform-classes": "npm:^7.24.6"
-    "@babel/plugin-transform-computed-properties": "npm:^7.24.6"
-    "@babel/plugin-transform-destructuring": "npm:^7.24.6"
-    "@babel/plugin-transform-dotall-regex": "npm:^7.24.6"
-    "@babel/plugin-transform-duplicate-keys": "npm:^7.24.6"
-    "@babel/plugin-transform-dynamic-import": "npm:^7.24.6"
-    "@babel/plugin-transform-exponentiation-operator": "npm:^7.24.6"
-    "@babel/plugin-transform-export-namespace-from": "npm:^7.24.6"
-    "@babel/plugin-transform-for-of": "npm:^7.24.6"
-    "@babel/plugin-transform-function-name": "npm:^7.24.6"
-    "@babel/plugin-transform-json-strings": "npm:^7.24.6"
-    "@babel/plugin-transform-literals": "npm:^7.24.6"
-    "@babel/plugin-transform-logical-assignment-operators": "npm:^7.24.6"
-    "@babel/plugin-transform-member-expression-literals": "npm:^7.24.6"
-    "@babel/plugin-transform-modules-amd": "npm:^7.24.6"
-    "@babel/plugin-transform-modules-commonjs": "npm:^7.24.6"
-    "@babel/plugin-transform-modules-systemjs": "npm:^7.24.6"
-    "@babel/plugin-transform-modules-umd": "npm:^7.24.6"
-    "@babel/plugin-transform-named-capturing-groups-regex": "npm:^7.24.6"
-    "@babel/plugin-transform-new-target": "npm:^7.24.6"
-    "@babel/plugin-transform-nullish-coalescing-operator": "npm:^7.24.6"
-    "@babel/plugin-transform-numeric-separator": "npm:^7.24.6"
-    "@babel/plugin-transform-object-rest-spread": "npm:^7.24.6"
-    "@babel/plugin-transform-object-super": "npm:^7.24.6"
-    "@babel/plugin-transform-optional-catch-binding": "npm:^7.24.6"
-    "@babel/plugin-transform-optional-chaining": "npm:^7.24.6"
-    "@babel/plugin-transform-parameters": "npm:^7.24.6"
-    "@babel/plugin-transform-private-methods": "npm:^7.24.6"
-    "@babel/plugin-transform-private-property-in-object": "npm:^7.24.6"
-    "@babel/plugin-transform-property-literals": "npm:^7.24.6"
-    "@babel/plugin-transform-regenerator": "npm:^7.24.6"
-    "@babel/plugin-transform-reserved-words": "npm:^7.24.6"
-    "@babel/plugin-transform-shorthand-properties": "npm:^7.24.6"
-    "@babel/plugin-transform-spread": "npm:^7.24.6"
-    "@babel/plugin-transform-sticky-regex": "npm:^7.24.6"
-    "@babel/plugin-transform-template-literals": "npm:^7.24.6"
-    "@babel/plugin-transform-typeof-symbol": "npm:^7.24.6"
-    "@babel/plugin-transform-unicode-escapes": "npm:^7.24.6"
-    "@babel/plugin-transform-unicode-property-regex": "npm:^7.24.6"
-    "@babel/plugin-transform-unicode-regex": "npm:^7.24.6"
-    "@babel/plugin-transform-unicode-sets-regex": "npm:^7.24.6"
+    "@babel/plugin-transform-arrow-functions": "npm:^7.24.7"
+    "@babel/plugin-transform-async-generator-functions": "npm:^7.24.7"
+    "@babel/plugin-transform-async-to-generator": "npm:^7.24.7"
+    "@babel/plugin-transform-block-scoped-functions": "npm:^7.24.7"
+    "@babel/plugin-transform-block-scoping": "npm:^7.24.7"
+    "@babel/plugin-transform-class-properties": "npm:^7.24.7"
+    "@babel/plugin-transform-class-static-block": "npm:^7.24.7"
+    "@babel/plugin-transform-classes": "npm:^7.24.7"
+    "@babel/plugin-transform-computed-properties": "npm:^7.24.7"
+    "@babel/plugin-transform-destructuring": "npm:^7.24.7"
+    "@babel/plugin-transform-dotall-regex": "npm:^7.24.7"
+    "@babel/plugin-transform-duplicate-keys": "npm:^7.24.7"
+    "@babel/plugin-transform-dynamic-import": "npm:^7.24.7"
+    "@babel/plugin-transform-exponentiation-operator": "npm:^7.24.7"
+    "@babel/plugin-transform-export-namespace-from": "npm:^7.24.7"
+    "@babel/plugin-transform-for-of": "npm:^7.24.7"
+    "@babel/plugin-transform-function-name": "npm:^7.24.7"
+    "@babel/plugin-transform-json-strings": "npm:^7.24.7"
+    "@babel/plugin-transform-literals": "npm:^7.24.7"
+    "@babel/plugin-transform-logical-assignment-operators": "npm:^7.24.7"
+    "@babel/plugin-transform-member-expression-literals": "npm:^7.24.7"
+    "@babel/plugin-transform-modules-amd": "npm:^7.24.7"
+    "@babel/plugin-transform-modules-commonjs": "npm:^7.24.7"
+    "@babel/plugin-transform-modules-systemjs": "npm:^7.24.7"
+    "@babel/plugin-transform-modules-umd": "npm:^7.24.7"
+    "@babel/plugin-transform-named-capturing-groups-regex": "npm:^7.24.7"
+    "@babel/plugin-transform-new-target": "npm:^7.24.7"
+    "@babel/plugin-transform-nullish-coalescing-operator": "npm:^7.24.7"
+    "@babel/plugin-transform-numeric-separator": "npm:^7.24.7"
+    "@babel/plugin-transform-object-rest-spread": "npm:^7.24.7"
+    "@babel/plugin-transform-object-super": "npm:^7.24.7"
+    "@babel/plugin-transform-optional-catch-binding": "npm:^7.24.7"
+    "@babel/plugin-transform-optional-chaining": "npm:^7.24.7"
+    "@babel/plugin-transform-parameters": "npm:^7.24.7"
+    "@babel/plugin-transform-private-methods": "npm:^7.24.7"
+    "@babel/plugin-transform-private-property-in-object": "npm:^7.24.7"
+    "@babel/plugin-transform-property-literals": "npm:^7.24.7"
+    "@babel/plugin-transform-regenerator": "npm:^7.24.7"
+    "@babel/plugin-transform-reserved-words": "npm:^7.24.7"
+    "@babel/plugin-transform-shorthand-properties": "npm:^7.24.7"
+    "@babel/plugin-transform-spread": "npm:^7.24.7"
+    "@babel/plugin-transform-sticky-regex": "npm:^7.24.7"
+    "@babel/plugin-transform-template-literals": "npm:^7.24.7"
+    "@babel/plugin-transform-typeof-symbol": "npm:^7.24.7"
+    "@babel/plugin-transform-unicode-escapes": "npm:^7.24.7"
+    "@babel/plugin-transform-unicode-property-regex": "npm:^7.24.7"
+    "@babel/plugin-transform-unicode-regex": "npm:^7.24.7"
+    "@babel/plugin-transform-unicode-sets-regex": "npm:^7.24.7"
     "@babel/preset-modules": "npm:0.1.6-no-external-plugins"
     babel-plugin-polyfill-corejs2: "npm:^0.4.10"
     babel-plugin-polyfill-corejs3: "npm:^0.10.4"
@@ -1430,7 +1438,7 @@ __metadata:
     semver: "npm:^6.3.1"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/d837d294197803d550e48d9458a356853a54a0528e7cdc51c2b8a5d8dfe41c6fbc597b4fc67464615a7385198a3db2e839da15cca7b9502fedf27170fc6ef673
+  checksum: 10c0/c6714346f3ccc1271eaa90051c75b8bb57b20ef57408ab68740e2f3552693ae0ee5a4bcce3a00211d40e4947af1f7b8ab422066b953f0095461937fb72d11274
   languageName: node
   linkType: hard
 
@@ -1448,33 +1456,33 @@ __metadata:
   linkType: hard
 
 "@babel/preset-react@npm:^7.12.5, @babel/preset-react@npm:^7.22.3":
-  version: 7.24.6
-  resolution: "@babel/preset-react@npm:7.24.6"
+  version: 7.24.7
+  resolution: "@babel/preset-react@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
-    "@babel/helper-validator-option": "npm:^7.24.6"
-    "@babel/plugin-transform-react-display-name": "npm:^7.24.6"
-    "@babel/plugin-transform-react-jsx": "npm:^7.24.6"
-    "@babel/plugin-transform-react-jsx-development": "npm:^7.24.6"
-    "@babel/plugin-transform-react-pure-annotations": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
+    "@babel/helper-validator-option": "npm:^7.24.7"
+    "@babel/plugin-transform-react-display-name": "npm:^7.24.7"
+    "@babel/plugin-transform-react-jsx": "npm:^7.24.7"
+    "@babel/plugin-transform-react-jsx-development": "npm:^7.24.7"
+    "@babel/plugin-transform-react-pure-annotations": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/edc470b86dfcfdedf53feca3f2266bd7f836a300806938a422f4120d39bbdea6a780b9b0a9ac0333e0bb1b8e554699a74cafd135b2a75b02b77ef1b21f7c7f62
+  checksum: 10c0/9658b685b25cedaadd0b65c4e663fbc7f57394b5036ddb4c99b1a75b0711fb83292c1c625d605c05b73413fc7a6dc20e532627f6a39b6dc8d4e00415479b054c
   languageName: node
   linkType: hard
 
 "@babel/preset-typescript@npm:^7.21.5":
-  version: 7.24.6
-  resolution: "@babel/preset-typescript@npm:7.24.6"
+  version: 7.24.7
+  resolution: "@babel/preset-typescript@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
-    "@babel/helper-validator-option": "npm:^7.24.6"
-    "@babel/plugin-syntax-jsx": "npm:^7.24.6"
-    "@babel/plugin-transform-modules-commonjs": "npm:^7.24.6"
-    "@babel/plugin-transform-typescript": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
+    "@babel/helper-validator-option": "npm:^7.24.7"
+    "@babel/plugin-syntax-jsx": "npm:^7.24.7"
+    "@babel/plugin-transform-modules-commonjs": "npm:^7.24.7"
+    "@babel/plugin-transform-typescript": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/bfcef91ed80d67301301e17a799814457b57bfd0d85d9897dce6df6ed0b0af155c0f5b2af7a1a122a3f36faaaa1de87ccf9954ce06d2f440898ffdfaf18aab86
+  checksum: 10c0/986bc0978eedb4da33aba8e1e13a3426dd1829515313b7e8f4ba5d8c18aff1663b468939d471814e7acf4045d326ae6cff37239878d169ac3fe53a8fde71f8ee
   languageName: node
   linkType: hard
 
@@ -1495,51 +1503,51 @@ __metadata:
   linkType: hard
 
 "@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.0, @babel/runtime@npm:^7.12.13, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.13.8, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.2.0, @babel/runtime@npm:^7.20.13, @babel/runtime@npm:^7.22.3, @babel/runtime@npm:^7.23.2, @babel/runtime@npm:^7.3.1, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.6.3, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.8.7, @babel/runtime@npm:^7.9.2":
-  version: 7.24.6
-  resolution: "@babel/runtime@npm:7.24.6"
+  version: 7.24.7
+  resolution: "@babel/runtime@npm:7.24.7"
   dependencies:
     regenerator-runtime: "npm:^0.14.0"
-  checksum: 10c0/224ad205de33ea28979baaec89eea4c4d4e9482000dd87d15b97859365511cdd4d06517712504024f5d33a5fb9412f9b91c96f1d923974adf9359e1575cde049
+  checksum: 10c0/b6fa3ec61a53402f3c1d75f4d808f48b35e0dfae0ec8e2bb5c6fc79fb95935da75766e0ca534d0f1c84871f6ae0d2ebdd950727cfadb745a2cdbef13faef5513
   languageName: node
   linkType: hard
 
-"@babel/template@npm:^7.24.6, @babel/template@npm:^7.3.3":
-  version: 7.24.6
-  resolution: "@babel/template@npm:7.24.6"
+"@babel/template@npm:^7.24.7, @babel/template@npm:^7.3.3":
+  version: 7.24.7
+  resolution: "@babel/template@npm:7.24.7"
   dependencies:
-    "@babel/code-frame": "npm:^7.24.6"
-    "@babel/parser": "npm:^7.24.6"
-    "@babel/types": "npm:^7.24.6"
-  checksum: 10c0/a4d5805770de908b445f7cdcebfcb6eaa07b1ec9c7b78fd3f375a911b1522c249bddae6b96bc4aac24247cc603e3e6cffcf2fe50b4c929dfeb22de289b517525
+    "@babel/code-frame": "npm:^7.24.7"
+    "@babel/parser": "npm:^7.24.7"
+    "@babel/types": "npm:^7.24.7"
+  checksum: 10c0/95b0b3ee80fcef685b7f4426f5713a855ea2cd5ac4da829b213f8fb5afe48a2a14683c2ea04d446dbc7f711c33c5cd4a965ef34dcbe5bc387c9e966b67877ae3
   languageName: node
   linkType: hard
 
-"@babel/traverse@npm:7, @babel/traverse@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/traverse@npm:7.24.6"
+"@babel/traverse@npm:7, @babel/traverse@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/traverse@npm:7.24.7"
   dependencies:
-    "@babel/code-frame": "npm:^7.24.6"
-    "@babel/generator": "npm:^7.24.6"
-    "@babel/helper-environment-visitor": "npm:^7.24.6"
-    "@babel/helper-function-name": "npm:^7.24.6"
-    "@babel/helper-hoist-variables": "npm:^7.24.6"
-    "@babel/helper-split-export-declaration": "npm:^7.24.6"
-    "@babel/parser": "npm:^7.24.6"
-    "@babel/types": "npm:^7.24.6"
+    "@babel/code-frame": "npm:^7.24.7"
+    "@babel/generator": "npm:^7.24.7"
+    "@babel/helper-environment-visitor": "npm:^7.24.7"
+    "@babel/helper-function-name": "npm:^7.24.7"
+    "@babel/helper-hoist-variables": "npm:^7.24.7"
+    "@babel/helper-split-export-declaration": "npm:^7.24.7"
+    "@babel/parser": "npm:^7.24.7"
+    "@babel/types": "npm:^7.24.7"
     debug: "npm:^4.3.1"
     globals: "npm:^11.1.0"
-  checksum: 10c0/39027d5fc7a241c6b71bb5872c2bdcec53743cd7ef3c151bbe6fd7cf874d15f4bc09e5d7e19e2f534b0eb2c115f5368553885fa4253aa1bc9441c6e5bf9efdaf
+  checksum: 10c0/a5135e589c3f1972b8877805f50a084a04865ccb1d68e5e1f3b94a8841b3485da4142e33413d8fd76bc0e6444531d3adf1f59f359c11ffac452b743d835068ab
   languageName: node
   linkType: hard
 
-"@babel/types@npm:^7.0.0, @babel/types@npm:^7.0.0-beta.49, @babel/types@npm:^7.12.11, @babel/types@npm:^7.12.6, @babel/types@npm:^7.20.7, @babel/types@npm:^7.24.6, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3":
-  version: 7.24.6
-  resolution: "@babel/types@npm:7.24.6"
+"@babel/types@npm:^7.0.0, @babel/types@npm:^7.0.0-beta.49, @babel/types@npm:^7.12.11, @babel/types@npm:^7.12.6, @babel/types@npm:^7.20.7, @babel/types@npm:^7.24.7, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3":
+  version: 7.24.7
+  resolution: "@babel/types@npm:7.24.7"
   dependencies:
-    "@babel/helper-string-parser": "npm:^7.24.6"
-    "@babel/helper-validator-identifier": "npm:^7.24.6"
+    "@babel/helper-string-parser": "npm:^7.24.7"
+    "@babel/helper-validator-identifier": "npm:^7.24.7"
     to-fast-properties: "npm:^2.0.0"
-  checksum: 10c0/1d94d92d97ef49030ad7f9e14cfccfeb70b1706dabcaa69037e659ec9d2c3178fb005d2088cce40d88dfc1306153d9157fe038a79ea2be92e5e6b99a59ef80cc
+  checksum: 10c0/d9ecbfc3eb2b05fb1e6eeea546836ac30d990f395ef3fe3f75ced777a222c3cfc4489492f72e0ce3d9a5a28860a1ce5f81e66b88cf5088909068b3ff4fab72c1
   languageName: node
   linkType: hard
 

From 578b0eae7d411a7b717adaf2ec280c4b1c33c265 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 6 Jun 2024 12:51:39 +0200
Subject: [PATCH 1187/2191] Fix /api/v1/timelines/link specs for glitch-soc
 default settings

---
 spec/requests/api/v1/timelines/link_spec.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/spec/requests/api/v1/timelines/link_spec.rb b/spec/requests/api/v1/timelines/link_spec.rb
index a219c9bcddec02..e964ee3da37e88 100644
--- a/spec/requests/api/v1/timelines/link_spec.rb
+++ b/spec/requests/api/v1/timelines/link_spec.rb
@@ -96,6 +96,10 @@
     end
 
     context 'when the instance allows public preview' do
+      before do
+        Setting.timeline_preview = true
+      end
+
       context 'with an authorized user' do
         it_behaves_like 'a successful request to the link timeline'
       end

From 1ffc293b86fa373beada17fbe789b0e729781e07 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 6 Jun 2024 16:12:06 +0200
Subject: [PATCH 1188/2191] Add missing `moderation_warning` notification
 support to grouped notifications API (#30576)

---
 app/serializers/rest/notification_group_serializer.rb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/serializers/rest/notification_group_serializer.rb b/app/serializers/rest/notification_group_serializer.rb
index 6c1d2465d25cb8..05b51b07a5f66f 100644
--- a/app/serializers/rest/notification_group_serializer.rb
+++ b/app/serializers/rest/notification_group_serializer.rb
@@ -11,6 +11,7 @@ class REST::NotificationGroupSerializer < ActiveModel::Serializer
   belongs_to :target_status, key: :status, if: :status_type?, serializer: REST::StatusSerializer
   belongs_to :report, if: :report_type?, serializer: REST::ReportSerializer
   belongs_to :account_relationship_severance_event, key: :event, if: :relationship_severance_event?, serializer: REST::AccountRelationshipSeveranceEventSerializer
+  belongs_to :account_warning, key: :moderation_warning, if: :moderation_warning_event?, serializer: REST::AccountWarningSerializer
 
   def status_type?
     [:favourite, :reblog, :status, :mention, :poll, :update].include?(object.type)
@@ -24,6 +25,10 @@ def relationship_severance_event?
     object.type == :severed_relationships
   end
 
+  def moderation_warning_event?
+    object.type == :moderation_warning
+  end
+
   def page_min_id
     range = instance_options[:group_metadata][object.group_key]
     range.present? ? range[:min_id].to_s : object.notification.id.to_s

From a662c6d1d82fbc0bb27a2d0a55c1a1c028c16dea Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 6 Jun 2024 10:12:58 -0400
Subject: [PATCH 1189/2191] Use `sidekiq_inline` in admin/account_action model
 spec (#30565)

---
 spec/models/admin/account_action_spec.rb | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/spec/models/admin/account_action_spec.rb b/spec/models/admin/account_action_spec.rb
index a9dcf352dcdaea..e55db2f814a19e 100644
--- a/spec/models/admin/account_action_spec.rb
+++ b/spec/models/admin/account_action_spec.rb
@@ -69,20 +69,22 @@
       end
     end
 
-    it 'sends notification, log the action, and closes other reports', :aggregate_failures do
-      other_report = Fabricate(:report, target_account: target_account)
-
-      emails = []
-      expect do
-        emails = capture_emails { subject }
-      end.to (change(Admin::ActionLog.where(action: type), :count).by 1)
-         .and(change { other_report.reload.action_taken? }.from(false).to(true))
+    it 'sends email to target account user', :sidekiq_inline do
+      emails = capture_emails { subject }
 
       expect(emails).to contain_exactly(
         have_attributes(
           to: contain_exactly(target_account.user.email)
         )
       )
+    end
+
+    it 'sends notification, log the action, and closes other reports', :aggregate_failures do
+      other_report = Fabricate(:report, target_account: target_account)
+
+      expect { subject }
+        .to (change(Admin::ActionLog.where(action: type), :count).by 1)
+        .and(change { other_report.reload.action_taken? }.from(false).to(true))
 
       expect(LocalNotificationWorker).to have_enqueued_sidekiq_job(target_account.id, anything, 'AccountWarning', 'moderation_warning')
     end

From 9b9b0e25b6839d162d96a19407611e9fc8192c81 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 6 Jun 2024 10:14:33 -0400
Subject: [PATCH 1190/2191] Use `sidekiq_inline` in requests/api/v1/reports
 spec (#30564)

---
 spec/requests/api/v1/reports_spec.rb | 40 +++++++++++++---------------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/spec/requests/api/v1/reports_spec.rb b/spec/requests/api/v1/reports_spec.rb
index 94baf8cb989895..9e8954a4c65dd8 100644
--- a/spec/requests/api/v1/reports_spec.rb
+++ b/spec/requests/api/v1/reports_spec.rb
@@ -33,30 +33,28 @@
 
     it_behaves_like 'forbidden for wrong scope', 'read read:reports'
 
-    it 'creates a report', :aggregate_failures do
-      perform_enqueued_jobs do
-        emails = capture_emails { subject }
-
-        expect(response).to have_http_status(200)
-        expect(body_as_json).to match(
-          a_hash_including(
-            status_ids: [status.id.to_s],
-            category: category,
-            comment: 'reasons'
-          )
+    it 'creates a report', :aggregate_failures, :sidekiq_inline do
+      emails = capture_emails { subject }
+
+      expect(response).to have_http_status(200)
+      expect(body_as_json).to match(
+        a_hash_including(
+          status_ids: [status.id.to_s],
+          category: category,
+          comment: 'reasons'
         )
+      )
 
-        expect(target_account.targeted_reports).to_not be_empty
-        expect(target_account.targeted_reports.first.comment).to eq 'reasons'
+      expect(target_account.targeted_reports).to_not be_empty
+      expect(target_account.targeted_reports.first.comment).to eq 'reasons'
 
-        expect(emails.size)
-          .to eq(1)
-        expect(emails.first)
-          .to have_attributes(
-            to: contain_exactly(admin.email),
-            subject: eq(I18n.t('admin_mailer.new_report.subject', instance: Rails.configuration.x.local_domain, id: target_account.targeted_reports.first.id))
-          )
-      end
+      expect(emails.size)
+        .to eq(1)
+      expect(emails.first)
+        .to have_attributes(
+          to: contain_exactly(admin.email),
+          subject: eq(I18n.t('admin_mailer.new_report.subject', instance: Rails.configuration.x.local_domain, id: target_account.targeted_reports.first.id))
+        )
     end
 
     context 'when a status does not belong to the reported account' do

From 07cc94e05fa89794714fb0434529657dfa992bca Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 6 Jun 2024 10:19:22 -0400
Subject: [PATCH 1191/2191] Use `sidekiq_inline` in
 requests/api/v1/admin/account_actions spec (#30563)

---
 spec/requests/api/v1/admin/account_actions_spec.rb | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/spec/requests/api/v1/admin/account_actions_spec.rb b/spec/requests/api/v1/admin/account_actions_spec.rb
index 4167911a13a32f..778658508ec100 100644
--- a/spec/requests/api/v1/admin/account_actions_spec.rb
+++ b/spec/requests/api/v1/admin/account_actions_spec.rb
@@ -10,10 +10,16 @@
   let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
 
   shared_examples 'a successful notification delivery' do
-    it 'notifies the user about the action taken' do
-      expect { subject }
-        .to have_enqueued_job(ActionMailer::MailDeliveryJob)
-        .with('UserMailer', 'warning', 'deliver_now!', args: [User, AccountWarning])
+    it 'notifies the user about the action taken', :sidekiq_inline do
+      emails = capture_emails { subject }
+
+      expect(emails.size)
+        .to eq(1)
+
+      expect(emails.first)
+        .to have_attributes(
+          to: contain_exactly(target_account.user.email)
+        )
     end
   end
 

From 04ebbe3077e7f39025428bfa596ada2d21be6dfb Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 6 Jun 2024 10:19:37 -0400
Subject: [PATCH 1192/2191] Add `sidekiq_inline` to appeal service spec
 (#30562)

---
 spec/services/appeal_service_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/services/appeal_service_spec.rb b/spec/services/appeal_service_spec.rb
index 10c0f148dc0345..3fad74db9d8951 100644
--- a/spec/services/appeal_service_spec.rb
+++ b/spec/services/appeal_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe AppealService do
+RSpec.describe AppealService, :sidekiq_inline do
   describe '#call' do
     let!(:admin) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
 

From 12823908bbc101dc3106ae0fd1b804ef164390ac Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 6 Jun 2024 10:19:55 -0400
Subject: [PATCH 1193/2191] Adjust devcontainers welcome message to be less
 codespaces-specific (#30566)

---
 .devcontainer/welcome-message.txt | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/.devcontainer/welcome-message.txt b/.devcontainer/welcome-message.txt
index 488cf92857ac6b..dbc19c910cdf67 100644
--- a/.devcontainer/welcome-message.txt
+++ b/.devcontainer/welcome-message.txt
@@ -1,8 +1,7 @@
-👋 Welcome to "Mastodon" in GitHub Codespaces!
+👋 Welcome to your Mastodon Dev Container!
 
-🛠️  Your environment is fully setup with all the required software.
+🛠️ Your environment is fully setup with all the required software.
 
-🔍 To explore VS Code to its fullest, search using the Command Palette (Cmd/Ctrl + Shift + P or F1).
-
-📝 Edit away, run your app as usual, and we'll automatically make it available for you to access.
+💥 Run `bin/dev` to start the application processes.
 
+🥼 Run `RAILS_ENV=test bin/rails assets:precompile && RAILS_ENV=test bin/rspec` to run the test suite.

From 94d8d1094f32fcdd2372533efde9ad0e129020fc Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 6 Jun 2024 16:29:16 -0400
Subject: [PATCH 1194/2191] Provide richer failure information in `bin/setup`
 (#30581)

---
 bin/setup | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/setup b/bin/setup
index 90700ac4f9a38d..5d9622151d9db8 100755
--- a/bin/setup
+++ b/bin/setup
@@ -5,7 +5,7 @@ require "fileutils"
 APP_ROOT = File.expand_path('..', __dir__)
 
 def system!(*args)
-  system(*args) || abort("\n== Command #{args} failed ==")
+  system(*args, exception: true)
 end
 
 FileUtils.chdir APP_ROOT do

From 3495f0d9ba37ec10189ce1df60921f15554224d5 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 6 Jun 2024 16:33:28 -0400
Subject: [PATCH 1195/2191] Use corepack yarn in `bin/setup` (#30573)

---
 bin/setup | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/bin/setup b/bin/setup
index 5d9622151d9db8..93c6981d0b59cb 100755
--- a/bin/setup
+++ b/bin/setup
@@ -13,17 +13,13 @@ FileUtils.chdir APP_ROOT do
   # This script is idempotent, so that you can run it at any time and get an expectable outcome.
   # Add necessary setup steps to this file.
 
-  puts '== Installing dependencies =='
+  puts "\n== Installing Ruby dependencies =="
   system! 'gem install bundler --conservative'
   system('bundle check') || system!('bundle install')
 
-  # Install JavaScript dependencies
-  system! 'bin/yarn'
-
-  # puts "\n== Copying sample files =="
-  # unless File.exist?('config/database.yml')
-  #   FileUtils.cp 'config/database.yml.sample', 'config/database.yml'
-  # end
+  puts "\n== Installing JS dependencies =="
+  system! 'corepack prepare'
+  system! 'bin/yarn install --immutable'
 
   puts "\n== Preparing database =="
   system! 'bin/rails db:prepare'

From ac3d761c7811d39534a829825c073e033b250867 Mon Sep 17 00:00:00 2001
From: Maya Friedrichs <_@maya.sh>
Date: Fri, 7 Jun 2024 00:23:18 +0200
Subject: [PATCH 1196/2191] Remove gradient for collapsed toots

This gradient is already set in `components.scss` with the new background
---
 .../flavours/glitch/styles/mastodon-light/diff.scss        | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss b/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss
index 119b0fc2a48f32..4040ee0fe0c598 100644
--- a/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss
+++ b/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss
@@ -513,13 +513,6 @@ html {
   }
 }
 
-.status.collapsed .status__content::after {
-  background: linear-gradient(
-    rgba(darken($ui-base-color, 13%), 0),
-    rgba(darken($ui-base-color, 13%), 1)
-  );
-}
-
 .drawer__inner__mastodon {
   background: $white
     url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 234.80078 31.757813" width="234.80078" height="31.757812"><path d="M19.599609 0c-1.05 0-2.10039.375-2.90039 1.125L0 16.925781v14.832031h234.80078V17.025391l-16.5-15.900391c-1.6-1.5-4.20078-1.5-5.80078 0l-13.80078 13.099609c-1.6 1.5-4.19883 1.5-5.79883 0L179.09961 1.125c-1.6-1.5-4.19883-1.5-5.79883 0L159.5 14.224609c-1.6 1.5-4.20078 1.5-5.80078 0L139.90039 1.125c-1.6-1.5-4.20078-1.5-5.80078 0l-13.79883 13.099609c-1.6 1.5-4.20078 1.5-5.80078 0L100.69922 1.125c-1.600001-1.5-4.198829-1.5-5.798829 0l-13.59961 13.099609c-1.6 1.5-4.200781 1.5-5.800781 0L61.699219 1.125c-1.6-1.5-4.198828-1.5-5.798828 0L42.099609 14.224609c-1.6 1.5-4.198828 1.5-5.798828 0L22.5 1.125C21.7.375 20.649609 0 19.599609 0z" fill="#{hex-color($ui-base-color)}"/></svg>')

From 8041fa174b7c90c1c130342aede2d556e8f56e82 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 7 Jun 2024 09:39:01 +0200
Subject: [PATCH 1197/2191] chore(deps): update opentelemetry-ruby (non-major)
 (#30555)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index ca32d0cca1837e..136d074d3318d7 100644
--- a/Gemfile
+++ b/Gemfile
@@ -107,7 +107,7 @@ gem 'private_address_check', '~> 0.5'
 gem 'opentelemetry-api', '~> 1.2.5'
 
 group :opentelemetry do
-  gem 'opentelemetry-exporter-otlp', '~> 0.26.3', require: false
+  gem 'opentelemetry-exporter-otlp', '~> 0.27.0', require: false
   gem 'opentelemetry-instrumentation-active_job', '~> 0.7.1', require: false
   gem 'opentelemetry-instrumentation-active_model_serializers', '~> 0.20.1', require: false
   gem 'opentelemetry-instrumentation-concurrent_ruby', '~> 0.21.2', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index bf5340a5b03f7f..9ad9deacfbf07f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -489,7 +489,7 @@ GEM
     opentelemetry-api (1.2.5)
     opentelemetry-common (0.20.1)
       opentelemetry-api (~> 1.0)
-    opentelemetry-exporter-otlp (0.26.3)
+    opentelemetry-exporter-otlp (0.27.0)
       google-protobuf (~> 3.14)
       googleapis-common-protos-types (~> 1.3)
       opentelemetry-api (~> 1.1)
@@ -978,7 +978,7 @@ DEPENDENCIES
   omniauth-saml (~> 2.0)
   omniauth_openid_connect (~> 0.6.1)
   opentelemetry-api (~> 1.2.5)
-  opentelemetry-exporter-otlp (~> 0.26.3)
+  opentelemetry-exporter-otlp (~> 0.27.0)
   opentelemetry-instrumentation-active_job (~> 0.7.1)
   opentelemetry-instrumentation-active_model_serializers (~> 0.20.1)
   opentelemetry-instrumentation-concurrent_ruby (~> 0.21.2)

From 1408733386219e1588c14d2fbf9f3c926513a5a3 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 7 Jun 2024 11:27:59 +0200
Subject: [PATCH 1198/2191] Fix Mastodon relying on ImageMagick even with
 `MASTODON_USE_LIBVIPS` (#30590)

---
 app/models/custom_emoji.rb       | 2 +-
 spec/models/custom_emoji_spec.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/custom_emoji.rb b/app/models/custom_emoji.rb
index 1c9b443959aabb..31ba91ad02854d 100644
--- a/app/models/custom_emoji.rb
+++ b/app/models/custom_emoji.rb
@@ -39,7 +39,7 @@ class CustomEmoji < ApplicationRecord
 
   has_one :local_counterpart, -> { where(domain: nil) }, class_name: 'CustomEmoji', primary_key: :shortcode, foreign_key: :shortcode, inverse_of: false, dependent: nil
 
-  has_attached_file :image, styles: { static: { format: 'png', convert_options: '-coalesce +profile "!icc,*" +set date:modify +set date:create +set date:timestamp' } }, validate_media_type: false
+  has_attached_file :image, styles: { static: { format: 'png', convert_options: '-coalesce +profile "!icc,*" +set date:modify +set date:create +set date:timestamp', file_geometry_parser: FastGeometryParser } }, validate_media_type: false, processors: [:lazy_thumbnail]
 
   normalizes :domain, with: ->(domain) { domain.downcase }
 
diff --git a/spec/models/custom_emoji_spec.rb b/spec/models/custom_emoji_spec.rb
index a0903e5978c90c..038d1d0c6cda8f 100644
--- a/spec/models/custom_emoji_spec.rb
+++ b/spec/models/custom_emoji_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe CustomEmoji do
+RSpec.describe CustomEmoji, :paperclip_processing do
   describe '#search' do
     subject { described_class.search(search_term) }
 

From ce07394ed5e9e5728db7da59910fbd83bc4a38ea Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 7 Jun 2024 11:53:59 +0200
Subject: [PATCH 1199/2191] chore(deps): update dependency aws-sdk-s3 to
 v1.152.0 (#30572)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 9ad9deacfbf07f..1003e14426fcb9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -100,17 +100,17 @@ GEM
     attr_required (1.0.2)
     awrence (1.2.1)
     aws-eventstream (1.3.0)
-    aws-partitions (1.929.0)
-    aws-sdk-core (3.196.1)
+    aws-partitions (1.940.0)
+    aws-sdk-core (3.197.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.8)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.81.0)
-      aws-sdk-core (~> 3, >= 3.193.0)
+    aws-sdk-kms (1.83.0)
+      aws-sdk-core (~> 3, >= 3.197.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.151.0)
-      aws-sdk-core (~> 3, >= 3.194.0)
+    aws-sdk-s3 (1.152.0)
+      aws-sdk-core (~> 3, >= 3.197.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.8)
     aws-sigv4 (1.8.0)

From c1b0c1a5e40c277b4b1f036fa882d90f0882cd67 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 7 Jun 2024 11:59:30 +0200
Subject: [PATCH 1200/2191] New Crowdin Translations (automated) (#30586)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/la.json | 4 ++++
 config/locales/doorkeeper.be.yml        | 1 -
 config/locales/doorkeeper.bg.yml        | 3 ++-
 config/locales/doorkeeper.br.yml        | 1 +
 config/locales/doorkeeper.ca.yml        | 3 ++-
 config/locales/doorkeeper.cs.yml        | 1 -
 config/locales/doorkeeper.cy.yml        | 1 -
 config/locales/doorkeeper.da.yml        | 3 ++-
 config/locales/doorkeeper.de.yml        | 3 ++-
 config/locales/doorkeeper.en-GB.yml     | 1 -
 config/locales/doorkeeper.es-AR.yml     | 3 ++-
 config/locales/doorkeeper.es-MX.yml     | 3 ++-
 config/locales/doorkeeper.es.yml        | 3 ++-
 config/locales/doorkeeper.eu.yml        | 1 -
 config/locales/doorkeeper.fi.yml        | 3 ++-
 config/locales/doorkeeper.fo.yml        | 3 ++-
 config/locales/doorkeeper.fy.yml        | 1 -
 config/locales/doorkeeper.gl.yml        | 3 ++-
 config/locales/doorkeeper.he.yml        | 3 ++-
 config/locales/doorkeeper.hu.yml        | 3 ++-
 config/locales/doorkeeper.ia.yml        | 1 -
 config/locales/doorkeeper.ie.yml        | 1 -
 config/locales/doorkeeper.is.yml        | 3 ++-
 config/locales/doorkeeper.it.yml        | 3 ++-
 config/locales/doorkeeper.ja.yml        | 1 -
 config/locales/doorkeeper.ko.yml        | 3 ++-
 config/locales/doorkeeper.lt.yml        | 1 -
 config/locales/doorkeeper.lv.yml        | 1 -
 config/locales/doorkeeper.nl.yml        | 3 ++-
 config/locales/doorkeeper.nn.yml        | 1 -
 config/locales/doorkeeper.pl.yml        | 3 ++-
 config/locales/doorkeeper.pt-BR.yml     | 1 -
 config/locales/doorkeeper.pt-PT.yml     | 3 ++-
 config/locales/doorkeeper.sl.yml        | 1 -
 config/locales/doorkeeper.sq.yml        | 3 ++-
 config/locales/doorkeeper.sr-Latn.yml   | 3 ++-
 config/locales/doorkeeper.sr.yml        | 3 ++-
 config/locales/doorkeeper.sv.yml        | 1 -
 config/locales/doorkeeper.th.yml        | 1 -
 config/locales/doorkeeper.tr.yml        | 3 ++-
 config/locales/doorkeeper.uk.yml        | 3 ++-
 config/locales/doorkeeper.vi.yml        | 1 -
 config/locales/doorkeeper.zh-CN.yml     | 3 ++-
 config/locales/doorkeeper.zh-HK.yml     | 1 -
 config/locales/doorkeeper.zh-TW.yml     | 3 ++-
 45 files changed, 55 insertions(+), 43 deletions(-)

diff --git a/app/javascript/mastodon/locales/la.json b/app/javascript/mastodon/locales/la.json
index 48b23340088bdc..a49ec94d726b24 100644
--- a/app/javascript/mastodon/locales/la.json
+++ b/app/javascript/mastodon/locales/la.json
@@ -32,6 +32,7 @@
   "compose_form.direct_message_warning_learn_more": "Discere plura",
   "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
   "compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.",
+  "compose_form.lock_disclaimer": "Tua ratio non est {clausa}. Quisquis te sequi potest ut visum accipiat nuntios tuos tantum pro sectatoribus.",
   "compose_form.lock_disclaimer.lock": "clausum",
   "compose_form.placeholder": "What is on your mind?",
   "compose_form.publish_form": "Barrire",
@@ -91,6 +92,7 @@
   "lightbox.next": "Secundum",
   "navigation_bar.domain_blocks": "Hidden domains",
   "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
+  "notification.moderation_warning.action_none": "Tua ratiō monitum moderātiōnis accēpit.",
   "notification.reblog": "{name} boosted your status",
   "notifications.filter.all": "Omnia",
   "notifications.filter.polls": "Eventus electionis",
@@ -107,6 +109,8 @@
   "onboarding.steps.setup_profile.title": "Customize your profile",
   "onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
   "onboarding.steps.share_profile.title": "Share your profile",
+  "onboarding.tips.accounts_from_other_servers": "<strong>Scisne?</strong> Quoniam Mastodon dēcentālis est, nōnnulla profīlia quae invenīs in servīs aliīs quam tuōrum erunt hospitāta. Tamen cum eīs sine impedīmentō interāgere potes! Servus eōrum in alterā parte nōminis eōrum est!",
+  "onboarding.tips.migration": "<strong>Scisne?</strong> Sī sentīs {domain} tibi in futūrō nōn esse optimam servī ēlēctiōnem, ad alium servum Mastodon sine amittendō sectātōribus tuīs migrāre potes. Etiam tuum servum hospitārī potes!",
   "poll.closed": "Clausum",
   "poll.vote": "Eligere",
   "poll.voted": "Elegisti hoc responsum",
diff --git a/config/locales/doorkeeper.be.yml b/config/locales/doorkeeper.be.yml
index 5f0536c8da0730..748cbeafa122e5 100644
--- a/config/locales/doorkeeper.be.yml
+++ b/config/locales/doorkeeper.be.yml
@@ -174,7 +174,6 @@ be:
       read:filters: бачыць свае фільтры
       read:follows: бачыць свае падпіскі
       read:lists: бачыць свае спісы
-      read:me: чытайце толькі базавую інфармацыю аб сваім уліковым запісе
       read:mutes: бачыць свае ігнараванні
       read:notifications: бачыць свае абвесткі
       read:reports: бачыць свае скаргі
diff --git a/config/locales/doorkeeper.bg.yml b/config/locales/doorkeeper.bg.yml
index 7633156d789b8d..dd536618276155 100644
--- a/config/locales/doorkeeper.bg.yml
+++ b/config/locales/doorkeeper.bg.yml
@@ -135,6 +135,7 @@ bg:
         media: Прикачена мултимедия
         mutes: Заглушения
         notifications: Известия
+        profile: Вашият профил в Mastodon
         push: Изскачащи известия
         reports: Доклади
         search: Търсене
@@ -165,6 +166,7 @@ bg:
       admin:write:reports: извършване на действия за модериране на докладвания
       crypto: употреба на цялостно шифроване
       follow: промяна на взаимоотношенията на акаунта
+      profile: само за четене на сведенията ви за профила на акаунта
       push: получаване на вашите изскачащи известия
       read: четене на всички данни от акаунта ви
       read:accounts: преглед на информация за акаунти
@@ -174,7 +176,6 @@ bg:
       read:filters: преглед на вашите филтри
       read:follows: преглед на вашите последвания
       read:lists: преглед на вашите списъци
-      read:me: четене само на основните сведения за акаунта ви
       read:mutes: преглед на вашите заглушавания
       read:notifications: преглед на вашите известия
       read:reports: преглед на вашите докладвания
diff --git a/config/locales/doorkeeper.br.yml b/config/locales/doorkeeper.br.yml
index 7b7f4155bd46d9..119d8681f0a00f 100644
--- a/config/locales/doorkeeper.br.yml
+++ b/config/locales/doorkeeper.br.yml
@@ -104,6 +104,7 @@ br:
         lists: Listennoù
         media: Restroù media stag
         mutes: Kuzhet
+        profile: Ho profil Mastodon
         search: Klask
         statuses: Toudoù
     layouts:
diff --git a/config/locales/doorkeeper.ca.yml b/config/locales/doorkeeper.ca.yml
index 80827a87da20bb..0323656dabfadd 100644
--- a/config/locales/doorkeeper.ca.yml
+++ b/config/locales/doorkeeper.ca.yml
@@ -135,6 +135,7 @@ ca:
         media: Adjunts multimèdia
         mutes: Silenciats
         notifications: Notificacions
+        profile: El vostre perfil de Mastodon
         push: Notificacions push
         reports: Informes
         search: Cerca
@@ -165,6 +166,7 @@ ca:
       admin:write:reports: fer l'acció de moderació en els informes
       crypto: usa xifrat d'extrem a extrem
       follow: modifica les relacions del compte
+      profile: només llegir la informació del perfil del vostre compte
       push: rebre notificacions push del teu compte
       read: llegir les dades del teu compte
       read:accounts: mira informació dels comptes
@@ -174,7 +176,6 @@ ca:
       read:filters: mira els teus filtres
       read:follows: mira els teus seguiments
       read:lists: mira les teves llistes
-      read:me: llegir només la informació bàsica del vostre compte
       read:mutes: mira els teus silenciats
       read:notifications: mira les teves notificacions
       read:reports: mira els teus informes
diff --git a/config/locales/doorkeeper.cs.yml b/config/locales/doorkeeper.cs.yml
index 9719a9a246ae3e..be2a4d971a5039 100644
--- a/config/locales/doorkeeper.cs.yml
+++ b/config/locales/doorkeeper.cs.yml
@@ -174,7 +174,6 @@ cs:
       read:filters: vidět vaše filtry
       read:follows: vidět vaše sledování
       read:lists: vidět vaše seznamy
-      read:me: číst pouze základní informace vašeho účtu
       read:mutes: vidět vaše skrytí
       read:notifications: vidět vaše oznámení
       read:reports: vidět vaše hlášení
diff --git a/config/locales/doorkeeper.cy.yml b/config/locales/doorkeeper.cy.yml
index 88cd2b9d53cb77..e79aa0359f67b8 100644
--- a/config/locales/doorkeeper.cy.yml
+++ b/config/locales/doorkeeper.cy.yml
@@ -174,7 +174,6 @@ cy:
       read:filters: gweld eich hidlwyr
       read:follows: gweld eich dilynwyr
       read:lists: gweld eich rhestrau
-      read:me: darllen dim ond manylion elfennol eich cyfrif
       read:mutes: gweld eich anwybyddiadau
       read:notifications: gweld eich hysbysiadau
       read:reports: gweld eich adroddiadau
diff --git a/config/locales/doorkeeper.da.yml b/config/locales/doorkeeper.da.yml
index ed10e14e249d7a..d462f43d3bc051 100644
--- a/config/locales/doorkeeper.da.yml
+++ b/config/locales/doorkeeper.da.yml
@@ -135,6 +135,7 @@ da:
         media: Medievedhæftninger
         mutes: Tavsgørelser
         notifications: Notifikationer
+        profile: Din Mastodon-profil
         push: Push-notifikationer
         reports: Anmeldelser
         search: Søgning
@@ -165,6 +166,7 @@ da:
       admin:write:reports: udfør modereringshandlinger på anmeldelser
       crypto: benyt ende-til-ende kryptering
       follow: ændre kontorelationer
+      profile: læs kun kontoprofiloplysningerne
       push: modtag dine push-notifikationer
       read: læs alle dine kontodata
       read:accounts: se kontooplysninger
@@ -174,7 +176,6 @@ da:
       read:filters: se dine filtre
       read:follows: se dine følger
       read:lists: se dine lister
-      read:me: læs kun kontoens basisoplysninger
       read:mutes: se dine tavsgørelser
       read:notifications: se dine notifikationer
       read:reports: se dine anmeldelser
diff --git a/config/locales/doorkeeper.de.yml b/config/locales/doorkeeper.de.yml
index 80d612255b9cc3..f303aa23a26a01 100644
--- a/config/locales/doorkeeper.de.yml
+++ b/config/locales/doorkeeper.de.yml
@@ -135,6 +135,7 @@ de:
         media: Medienanhänge
         mutes: Stummschaltungen
         notifications: Benachrichtigungen
+        profile: Dein Mastodon-Profil
         push: Push-Benachrichtigungen
         reports: Meldungen
         search: Suche
@@ -165,6 +166,7 @@ de:
       admin:write:reports: Moderationsaktionen auf Meldungen ausführen
       crypto: Ende-zu-Ende-Verschlüsselung verwenden
       follow: Kontenbeziehungen verändern
+      profile: nur die Profilinformationen deines Kontos lesen
       push: deine Push-Benachrichtigungen erhalten
       read: all deine Daten lesen
       read:accounts: deine Kontoinformationen einsehen
@@ -174,7 +176,6 @@ de:
       read:filters: deine Filter einsehen
       read:follows: sehen, wem du folgst
       read:lists: deine Listen sehen
-      read:me: nur deine grundlegenden Kontoinformationen lesen
       read:mutes: deine Stummschaltungen einsehen
       read:notifications: deine Benachrichtigungen sehen
       read:reports: deine Meldungen sehen
diff --git a/config/locales/doorkeeper.en-GB.yml b/config/locales/doorkeeper.en-GB.yml
index 2e537c5301937e..b3ceffb13f7544 100644
--- a/config/locales/doorkeeper.en-GB.yml
+++ b/config/locales/doorkeeper.en-GB.yml
@@ -174,7 +174,6 @@ en-GB:
       read:filters: see your filters
       read:follows: see your follows
       read:lists: see your lists
-      read:me: read only your account's basic information
       read:mutes: see your mutes
       read:notifications: see your notifications
       read:reports: see your reports
diff --git a/config/locales/doorkeeper.es-AR.yml b/config/locales/doorkeeper.es-AR.yml
index 47cfc451aa2668..0b04696b6a14bb 100644
--- a/config/locales/doorkeeper.es-AR.yml
+++ b/config/locales/doorkeeper.es-AR.yml
@@ -135,6 +135,7 @@ es-AR:
         media: Adjuntos de medios
         mutes: Silenciados
         notifications: Notificaciones
+        profile: Tu perfil de Mastodon
         push: Notificaciones push
         reports: Denuncias
         search: Buscar
@@ -165,6 +166,7 @@ es-AR:
       admin:write:reports: ejecutar acciones de moderación en denuncias
       crypto: usar cifrado de extremo a extremo
       follow: modificar relaciones de cuenta
+      profile: leer solo la información del perfil de tu cuenta
       push: recibir tus notificaciones push
       read: leer todos los datos de tu cuenta
       read:accounts: ver información de cuentas
@@ -174,7 +176,6 @@ es-AR:
       read:filters: ver tus filtros
       read:follows: ver qué cuentas seguís
       read:lists: ver tus listas
-      read:me: leer solo la información básica de tu cuenta
       read:mutes: ver qué cuentas silenciaste
       read:notifications: ver tus notificaciones
       read:reports: ver tus denuncias
diff --git a/config/locales/doorkeeper.es-MX.yml b/config/locales/doorkeeper.es-MX.yml
index e56e0df3ba9bfa..54386c4c3326de 100644
--- a/config/locales/doorkeeper.es-MX.yml
+++ b/config/locales/doorkeeper.es-MX.yml
@@ -135,6 +135,7 @@ es-MX:
         media: Archivos adjuntos
         mutes: Silenciados
         notifications: Notificaciones
+        profile: Tu perfil de Mastodon
         push: Notificaciones push
         reports: Reportes
         search: Busqueda
@@ -165,6 +166,7 @@ es-MX:
       admin:write:reports: realizar acciones de moderación en informes
       crypto: usar cifrado de extremo a extremo
       follow: seguir, bloquear, desbloquear y dejar de seguir cuentas
+      profile: leer sólo la información del perfil de tu cuenta
       push: recibir tus notificaciones push
       read: leer los datos de tu cuenta
       read:accounts: ver información de cuentas
@@ -174,7 +176,6 @@ es-MX:
       read:filters: ver tus filtros
       read:follows: ver a quién sigues
       read:lists: ver tus listas
-      read:me: leer solo la información básica de tu cuenta
       read:mutes: ver a quién has silenciado
       read:notifications: ver tus notificaciones
       read:reports: ver tus informes
diff --git a/config/locales/doorkeeper.es.yml b/config/locales/doorkeeper.es.yml
index 44e165a2156ccb..9be036a1d46ce6 100644
--- a/config/locales/doorkeeper.es.yml
+++ b/config/locales/doorkeeper.es.yml
@@ -135,6 +135,7 @@ es:
         media: Adjuntos multimedia
         mutes: Silenciados
         notifications: Notificaciones
+        profile: Tu perfil de Mastodon
         push: Notificaciones push
         reports: Informes
         search: Buscar
@@ -165,6 +166,7 @@ es:
       admin:write:reports: realizar acciones de moderación en informes
       crypto: usar cifrado de extremo a extremo
       follow: seguir, bloquear, desbloquear y dejar de seguir cuentas
+      profile: leer sólo la información del perfil de tu cuenta
       push: recibir tus notificaciones push
       read: leer los datos de tu cuenta
       read:accounts: ver información de cuentas
@@ -174,7 +176,6 @@ es:
       read:filters: ver tus filtros
       read:follows: ver a quién sigues
       read:lists: ver tus listas
-      read:me: leer solo la información básica de tu cuenta
       read:mutes: ver a quién has silenciado
       read:notifications: ver tus notificaciones
       read:reports: ver tus informes
diff --git a/config/locales/doorkeeper.eu.yml b/config/locales/doorkeeper.eu.yml
index 88a63f698bbd80..e7963672fae5d3 100644
--- a/config/locales/doorkeeper.eu.yml
+++ b/config/locales/doorkeeper.eu.yml
@@ -174,7 +174,6 @@ eu:
       read:filters: ikusi zure iragazkiak
       read:follows: ikusi zuk jarraitutakoak
       read:lists: ikusi zure zerrendak
-      read:me: irakurri soilik zure kontuaren oinarrizko informazioa
       read:mutes: ikusi zuk mutututakoak
       read:notifications: ikusi zure jakinarazpenak
       read:reports: ikusi zure salaketak
diff --git a/config/locales/doorkeeper.fi.yml b/config/locales/doorkeeper.fi.yml
index ae8963c76fcf09..b028c10a826270 100644
--- a/config/locales/doorkeeper.fi.yml
+++ b/config/locales/doorkeeper.fi.yml
@@ -135,6 +135,7 @@ fi:
         media: Medialiitteet
         mutes: Mykistykset
         notifications: Ilmoitukset
+        profile: Mastodon-profiilisi
         push: Puskuilmoitukset
         reports: Raportit
         search: Hae
@@ -165,6 +166,7 @@ fi:
       admin:write:reports: suorita valvontatoimia raporteille
       crypto: käytä päästä päähän -salausta
       follow: muokkaa tilin suhteita
+      profile: lue vain tilisi profiilitietoja
       push: vastaanota puskuilmoituksiasi
       read: lue kaikkia tilin tietoja
       read:accounts: katso tilien tietoja
@@ -174,7 +176,6 @@ fi:
       read:filters: katso suodattimiasi
       read:follows: katso seurattujasi
       read:lists: katso listojasi
-      read:me: lue tilisi perustietoja
       read:mutes: katso mykistyksiäsi
       read:notifications: katso ilmoituksiasi
       read:reports: katso raporttejasi
diff --git a/config/locales/doorkeeper.fo.yml b/config/locales/doorkeeper.fo.yml
index 4f5cc5a645ba12..bd9457b620b83f 100644
--- a/config/locales/doorkeeper.fo.yml
+++ b/config/locales/doorkeeper.fo.yml
@@ -135,6 +135,7 @@ fo:
         media: Viðfestir miðlar
         mutes: Doyvir
         notifications: Fráboðanir
+        profile: Tín Mastodon vangi
         push: Skumpifráboðanir
         reports: Meldingar
         search: Leita
@@ -165,6 +166,7 @@ fo:
       admin:write:reports: útinna kjakleiðsluatgerðir á meldingum
       crypto: brúka enda-til-enda bronglan
       follow: broyta viðurskifti millum kontur
+      profile: les bara vangaupplýsingar av tíni kontu
       push: móttaka tínar skumpifráboðanir
       read: lesa allar dátur í tíni kontu
       read:accounts: vís kontuupplýsingar
@@ -174,7 +176,6 @@ fo:
       read:filters: síggja tíni filtur
       read:follows: síggja hvørji tú fylgir
       read:lists: síggja tínar listar
-      read:me: les bara grundleggjandi upplýsingar av tínari kontu
       read:mutes: síggja tínar doyvingar
       read:notifications: síggja tínar fráboðanir
       read:reports: síggja tínar meldingar
diff --git a/config/locales/doorkeeper.fy.yml b/config/locales/doorkeeper.fy.yml
index 51f0055ff6076a..a43defc427ef67 100644
--- a/config/locales/doorkeeper.fy.yml
+++ b/config/locales/doorkeeper.fy.yml
@@ -174,7 +174,6 @@ fy:
       read:filters: jo filters besjen
       read:follows: de accounts dy’tsto folgest besjen
       read:lists: jo listen besjen
-      read:me: allinnich de basisgegevens fan jo account lêze
       read:mutes: jo negearre brûkers besjen
       read:notifications: jo meldingen besjen
       read:reports: jo rapportearre berjochten besjen
diff --git a/config/locales/doorkeeper.gl.yml b/config/locales/doorkeeper.gl.yml
index d34c58decc4077..e86babd64c0eb3 100644
--- a/config/locales/doorkeeper.gl.yml
+++ b/config/locales/doorkeeper.gl.yml
@@ -135,6 +135,7 @@ gl:
         media: Anexos multimedia
         mutes: Acaladas
         notifications: Notificacións
+        profile: O teu perfil en Mastodon
         push: Notificacións Push
         reports: Denuncias
         search: Busca
@@ -165,6 +166,7 @@ gl:
       admin:write:reports: executar accións de moderación nas denuncias
       crypto: usar cifrado de extremo-a-extremo
       follow: modificar as relacións da conta
+      profile: ler só a información de perfil da túa conta
       push: recibir notificacións push
       read: ler todos os datos da tua conta
       read:accounts: ver información das contas
@@ -174,7 +176,6 @@ gl:
       read:filters: ver os filtros
       read:follows: ver a quen segues
       read:lists: ver as tuas listaxes
-      read:me: ler só a información básica da túa conta
       read:mutes: ver a quen tes acalado
       read:notifications: ver as notificacións
       read:reports: ver as túas denuncias
diff --git a/config/locales/doorkeeper.he.yml b/config/locales/doorkeeper.he.yml
index a6376fa4c1d27a..7a664c486e2b49 100644
--- a/config/locales/doorkeeper.he.yml
+++ b/config/locales/doorkeeper.he.yml
@@ -135,6 +135,7 @@ he:
         media: קבצי מדיה מצורפים
         mutes: השתקות
         notifications: התראות
+        profile: פרופיל המסטודון שלך
         push: התראות בדחיפה
         reports: דיווחים
         search: חיפוש
@@ -165,6 +166,7 @@ he:
       admin:write:reports: ביצוע פעולות הנהלה על חשבונות
       crypto: שימוש בהצפנה מקצה לקצה
       follow: לעקוב, לחסום, להסיר חסימה ולהפסיק לעקוב אחרי חשבונות
+      profile: קריאה של פרטי הפרופיל שלך בלבד
       push: קבלת התראות בדחיפה
       read: לקרוא את המידע שבחשבונך
       read:accounts: צפיה במידע על חשבונות
@@ -174,7 +176,6 @@ he:
       read:filters: צפייה במסננים
       read:follows: צפייה בנעקבים
       read:lists: צפיה ברשימותיך
-      read:me: לקריאה בלבד של פרטי חשבונך הבסיסיים
       read:mutes: צפיה במושתקיך
       read:notifications: צפיה בהתראותיך
       read:reports: צפיה בדוחותיך
diff --git a/config/locales/doorkeeper.hu.yml b/config/locales/doorkeeper.hu.yml
index 28ce283ffaf850..b2e51a47c1f215 100644
--- a/config/locales/doorkeeper.hu.yml
+++ b/config/locales/doorkeeper.hu.yml
@@ -135,6 +135,7 @@ hu:
         media: Médiamellékletek
         mutes: Némítások
         notifications: Értesítések
+        profile: Saját Mastodon-profil
         push: Push értesítések
         reports: Bejelentések
         search: Keresés
@@ -165,6 +166,7 @@ hu:
       admin:write:reports: moderációs műveletek végzése bejelentéseken
       crypto: végpontok közti titkosítás használata
       follow: fiókkapcsolatok módosítása
+      profile: csak a saját profil alapvető adatainak olvasása
       push: push értesítések fogadása
       read: saját fiók adatainak olvasása
       read:accounts: fiók adatainak megtekintése
@@ -174,7 +176,6 @@ hu:
       read:filters: szűrök megtekintése
       read:follows: követések megtekintése
       read:lists: listák megtekintése
-      read:me: csak a fiókod alapvető adatainak elolvasása
       read:mutes: némítások megtekintése
       read:notifications: értesítések megtekintése
       read:reports: bejelentések megtekintése
diff --git a/config/locales/doorkeeper.ia.yml b/config/locales/doorkeeper.ia.yml
index 40109a311ce061..5b99abb7b42be0 100644
--- a/config/locales/doorkeeper.ia.yml
+++ b/config/locales/doorkeeper.ia.yml
@@ -174,7 +174,6 @@ ia:
       read:filters: vider tu filtros
       read:follows: vider qui tu seque
       read:lists: vider tu listas
-      read:me: leger solmente le information basic de tu conto
       read:mutes: vider qui tu silentia
       read:notifications: vider tu notificationes
       read:reports: vider tu reportos
diff --git a/config/locales/doorkeeper.ie.yml b/config/locales/doorkeeper.ie.yml
index fc8132c926d8b7..0119f3573f13b3 100644
--- a/config/locales/doorkeeper.ie.yml
+++ b/config/locales/doorkeeper.ie.yml
@@ -174,7 +174,6 @@ ie:
       read:filters: vider tui filtres
       read:follows: vider tui sequitores
       read:lists: vider tui listes
-      read:me: leer solmen li basic information de tui conto
       read:mutes: vider tui silentias
       read:notifications: vider tui notificationes
       read:reports: vider tui raportes
diff --git a/config/locales/doorkeeper.is.yml b/config/locales/doorkeeper.is.yml
index 995d507f5bd3d0..84a4d389547f04 100644
--- a/config/locales/doorkeeper.is.yml
+++ b/config/locales/doorkeeper.is.yml
@@ -135,6 +135,7 @@ is:
         media: Myndefnisviðhengi
         mutes: Þagganir
         notifications: Tilkynningar
+        profile: Mastodon notandasniðið þitt
         push: Ýti-tilkynningar
         reports: Kærur
         search: Leita
@@ -165,6 +166,7 @@ is:
       admin:write:reports: framkvæma umsjónaraðgerðir á kærur
       crypto: nota enda-í-enda dulritun
       follow: breyta venslum aðgangs
+      profile: lesa einungis upplýsingar úr notandasniðinu þínu
       push: taka á móti ýti-tilkynningum til þín
       read: lesa öll gögn á notandaaðgangnum þínum
       read:accounts: sjá upplýsingar í notendaaðgöngum
@@ -174,7 +176,6 @@ is:
       read:filters: skoða síurnar þínar
       read:follows: sjá hverjum þú fylgist með
       read:lists: skoða listana þína
-      read:me: lesa einungis grunnupplýsingar aðgangsins þíns
       read:mutes: skoða hverja þú þaggar
       read:notifications: sjá tilkynningarnar þínar
       read:reports: skoða skýrslurnar þína
diff --git a/config/locales/doorkeeper.it.yml b/config/locales/doorkeeper.it.yml
index f39f78466540f1..f5df14deac3373 100644
--- a/config/locales/doorkeeper.it.yml
+++ b/config/locales/doorkeeper.it.yml
@@ -135,6 +135,7 @@ it:
         media: Allegati multimediali
         mutes: Silenziati
         notifications: Notifiche
+        profile: Il tuo profilo Mastodon
         push: Notifiche push
         reports: Segnalazioni
         search: Cerca
@@ -165,6 +166,7 @@ it:
       admin:write:reports: eseguire azioni di moderazione sulle segnalazioni
       crypto: utilizzare la crittografia end-to-end
       follow: modifica le relazioni tra profili
+      profile: leggi solo le informazioni sul profilo del tuo account
       push: ricevere le tue notifiche push
       read: leggere tutti i dati del tuo profilo
       read:accounts: visualizzare le informazioni sui profili
@@ -174,7 +176,6 @@ it:
       read:filters: visualizzare i tuoi filtri
       read:follows: visualizzare i tuoi seguiti
       read:lists: visualizzare i tuoi elenchi
-      read:me: leggi solo le informazioni di base del tuo account
       read:mutes: visualizzare i tuoi silenziamenti
       read:notifications: visualizzare le tue notifiche
       read:reports: visualizzare le tue segnalazioni
diff --git a/config/locales/doorkeeper.ja.yml b/config/locales/doorkeeper.ja.yml
index af61dbdcb788d3..62f2a3eb0ae415 100644
--- a/config/locales/doorkeeper.ja.yml
+++ b/config/locales/doorkeeper.ja.yml
@@ -174,7 +174,6 @@ ja:
       read:filters: フィルターの読み取り
       read:follows: フォローの読み取り
       read:lists: リストの読み取り
-      read:me: 自分のアカウントの基本的な情報の読み取りのみ
       read:mutes: ミュートの読み取り
       read:notifications: 通知の読み取り
       read:reports: 通報の読み取り
diff --git a/config/locales/doorkeeper.ko.yml b/config/locales/doorkeeper.ko.yml
index 12674cc125e20e..3ab0698d51c4ef 100644
--- a/config/locales/doorkeeper.ko.yml
+++ b/config/locales/doorkeeper.ko.yml
@@ -135,6 +135,7 @@ ko:
         media: 첨부된 미디어
         mutes: 뮤트
         notifications: 알림
+        profile: 내 마스토돈 프로필
         push: 푸시 알림
         reports: 신고
         search: 검색
@@ -165,6 +166,7 @@ ko:
       admin:write:reports: 신고에 모더레이션 조치 취하기
       crypto: 종단간 암호화 사용
       follow: 계정 관계 수정
+      profile: 내 계정의 프로필 정보만을 읽습니다
       push: 푸시 알림 받기
       read: 계정의 모든 데이터 읽기
       read:accounts: 계정 정보 보기
@@ -174,7 +176,6 @@ ko:
       read:filters: 필터 보기
       read:follows: 팔로우 보기
       read:lists: 리스트 보기
-      read:me: 내 계정의 기본 정보만을 읽습니다
       read:mutes: 뮤트 보기
       read:notifications: 알림 보기
       read:reports: 신고 보기
diff --git a/config/locales/doorkeeper.lt.yml b/config/locales/doorkeeper.lt.yml
index 82695d8ba69fec..5c2e4fd4e0efb3 100644
--- a/config/locales/doorkeeper.lt.yml
+++ b/config/locales/doorkeeper.lt.yml
@@ -174,7 +174,6 @@ lt:
       read:filters: matyti tavo filtrus
       read:follows: matyti tavo sekimus
       read:lists: matyti tavo sąrašus
-      read:me: skaityti tik pagrindinę paskyros informaciją
       read:mutes: matyti tavo nutildymus
       read:notifications: matyti tavo pranešimus
       read:reports: matyti tavo ataskaitas
diff --git a/config/locales/doorkeeper.lv.yml b/config/locales/doorkeeper.lv.yml
index 2005ce3c79db84..5aa5daef3f6d16 100644
--- a/config/locales/doorkeeper.lv.yml
+++ b/config/locales/doorkeeper.lv.yml
@@ -174,7 +174,6 @@ lv:
       read:filters: apskatīt savus filtrus
       read:follows: apskatīt savus sekotājus
       read:lists: apskatīt savus sarakstus
-      read:me: lasīt tikai Tava konta pamatinformāciju
       read:mutes: apskatīt savus apklusinātos
       read:notifications: apskatīt savus paziņojumus
       read:reports: apskatīt savus pārskatus
diff --git a/config/locales/doorkeeper.nl.yml b/config/locales/doorkeeper.nl.yml
index 9554c0ee6f5d19..4115e0a17eb341 100644
--- a/config/locales/doorkeeper.nl.yml
+++ b/config/locales/doorkeeper.nl.yml
@@ -135,6 +135,7 @@ nl:
         media: Mediabijlagen
         mutes: Negeren
         notifications: Meldingen
+        profile: Jouw Mastodonprofiel
         push: Pushmeldingen
         reports: Rapportages
         search: Zoeken
@@ -165,6 +166,7 @@ nl:
       admin:write:reports: moderatieacties op rapportages uitvoeren
       crypto: end-to-end-encryptie gebruiken
       follow: volgrelaties tussen accounts bewerken
+      profile: alleen de profielgegevens van jouw account lezen
       push: jouw pushmeldingen ontvangen
       read: alle gegevens van jouw account lezen
       read:accounts: informatie accounts bekijken
@@ -174,7 +176,6 @@ nl:
       read:filters: jouw filters bekijken
       read:follows: de accounts die jij volgt bekijken
       read:lists: jouw lijsten bekijken
-      read:me: alleen de basisgegevens van jouw account lezen
       read:mutes: jouw genegeerde gebruikers bekijken
       read:notifications: jouw meldingen bekijken
       read:reports: jouw gerapporteerde berichten bekijken
diff --git a/config/locales/doorkeeper.nn.yml b/config/locales/doorkeeper.nn.yml
index ab0380c6fa789d..0e5d1ca455ae4d 100644
--- a/config/locales/doorkeeper.nn.yml
+++ b/config/locales/doorkeeper.nn.yml
@@ -174,7 +174,6 @@ nn:
       read:filters: sjå filtera dine
       read:follows: sjå fylgjarane dine
       read:lists: sjå listene dine
-      read:me: les berre kontoen din sin grunnleggjande informasjon
       read:mutes: sjå kven du har målbunde
       read:notifications: sjå varsla dine
       read:reports: sjå rapportane dine
diff --git a/config/locales/doorkeeper.pl.yml b/config/locales/doorkeeper.pl.yml
index eefca2de658fb4..a18a86e97900ae 100644
--- a/config/locales/doorkeeper.pl.yml
+++ b/config/locales/doorkeeper.pl.yml
@@ -135,6 +135,7 @@ pl:
         media: Załączniki multimedialne
         mutes: Wyciszenia
         notifications: Powiadomienia
+        profile: Twój profil
         push: Powiadomienia push
         reports: Zgłoszenia
         search: Szukaj
@@ -165,6 +166,7 @@ pl:
       admin:write:reports: wykonaj działania moderacyjne na zgłoszeniach
       crypto: użyj szyfrowania end-to-end
       follow: możliwość zarządzania relacjami kont
+      profile: odczytaj tylko informacje o profilu
       push: otrzymywanie powiadomień push dla Twojego konta
       read: możliwość odczytu wszystkich danych konta
       read:accounts: dostęp do informacji o koncie
@@ -174,7 +176,6 @@ pl:
       read:filters: dostęp do filtrów
       read:follows: dostęp do listy obserwowanych
       read:lists: dostęp do Twoich list
-      read:me: odczytaj tylko podstawowe informacje o koncie
       read:mutes: dostęp do listy wyciszonych
       read:notifications: możliwość odczytu powiadomień
       read:reports: dostęp do Twoich zgłoszeń
diff --git a/config/locales/doorkeeper.pt-BR.yml b/config/locales/doorkeeper.pt-BR.yml
index 150b4339e46e15..d7e9353b59be3e 100644
--- a/config/locales/doorkeeper.pt-BR.yml
+++ b/config/locales/doorkeeper.pt-BR.yml
@@ -174,7 +174,6 @@ pt-BR:
       read:filters: ver seus filtros
       read:follows: ver quem você segue
       read:lists: ver suas listas
-      read:me: ler só as informações básicas da sua conta
       read:mutes: ver seus silenciados
       read:notifications: ver suas notificações
       read:reports: ver suas denúncias
diff --git a/config/locales/doorkeeper.pt-PT.yml b/config/locales/doorkeeper.pt-PT.yml
index 0457190cda149c..f03cee6b3a61ea 100644
--- a/config/locales/doorkeeper.pt-PT.yml
+++ b/config/locales/doorkeeper.pt-PT.yml
@@ -135,6 +135,7 @@ pt-PT:
         media: Anexos de media
         mutes: Silenciados
         notifications: Notificações
+        profile: O seu perfil Mastodon
         push: Notificações push
         reports: Denúncias
         search: Pesquisa
@@ -165,6 +166,7 @@ pt-PT:
       admin:write:reports: executar ações de moderação em denúncias
       crypto: usa encriptação ponta-a-ponta
       follow: siga, bloqueie, desbloqueie, e deixa de seguir contas
+      profile: apenas ler as informações do perfil da sua conta
       push: receber as suas notificações push
       read: tenha acesso aos dados da tua conta
       read:accounts: ver as informações da conta
@@ -174,7 +176,6 @@ pt-PT:
       read:filters: ver os seus filtros
       read:follows: ver quem você segue
       read:lists: ver as suas listas
-      read:me: ler apenas as informações básicas da sua conta
       read:mutes: ver os utilizadores que silenciou
       read:notifications: ver as suas notificações
       read:reports: ver as suas denúncias
diff --git a/config/locales/doorkeeper.sl.yml b/config/locales/doorkeeper.sl.yml
index 55e00ff96d6a06..a613308b28afbf 100644
--- a/config/locales/doorkeeper.sl.yml
+++ b/config/locales/doorkeeper.sl.yml
@@ -174,7 +174,6 @@ sl:
       read:filters: oglejte si svoje filtre
       read:follows: oglejte si svoje sledilce
       read:lists: oglejte si svoje sezname
-      read:me: preberi le osnovne podatke računa
       read:mutes: oglejte si svoje utišane
       read:notifications: oglejte si svoja obvestila
       read:reports: oglejte si svoje prijave
diff --git a/config/locales/doorkeeper.sq.yml b/config/locales/doorkeeper.sq.yml
index 793819c597419e..de3415406715fc 100644
--- a/config/locales/doorkeeper.sq.yml
+++ b/config/locales/doorkeeper.sq.yml
@@ -135,6 +135,7 @@ sq:
         media: Bashkëngjitje media
         mutes: Heshtime
         notifications: Njoftime
+        profile: Profili juaj Mastodon
         push: Njoftime Push
         reports: Raportime
         search: Kërkim
@@ -165,6 +166,7 @@ sq:
       admin:write:reports: të kryejë veprime moderimi në raportime
       crypto: përdor fshehtëzim skaj-më-skaj
       follow: të ndryshojë marrëdhënie llogarish
+      profile: të lexojë vetëm hollësi profili llogarie tuaj
       push: të marrë njoftime push për ju
       read: të lexojë krejt të dhënat e llogarisë tuaj
       read:accounts: të shohë hollësi llogarish
@@ -174,7 +176,6 @@ sq:
       read:filters: të shohë filtrat tuaj
       read:follows: të shohë ndjekësit tuaj
       read:lists: të shohë listat tuaja
-      read:me: të shohë vetëm hollësi elementare të llogarisë tuaj
       read:mutes: të shohë ç’keni heshtuar
       read:notifications: të shohë njoftimet tuaja
       read:reports: të shohë raportimet tuaja
diff --git a/config/locales/doorkeeper.sr-Latn.yml b/config/locales/doorkeeper.sr-Latn.yml
index 58ed5e8b68d8f9..6445353c1ae4e1 100644
--- a/config/locales/doorkeeper.sr-Latn.yml
+++ b/config/locales/doorkeeper.sr-Latn.yml
@@ -135,6 +135,7 @@ sr-Latn:
         media: Multimedijalni prilozi
         mutes: Ignorisani
         notifications: Obaveštenja
+        profile: Vaš Mastodon profil
         push: Prosleđena obaveštenja
         reports: Prijave
         search: Pretraga
@@ -165,6 +166,7 @@ sr-Latn:
       admin:write:reports: vršenje moderatorskih aktivnosti nad izveštajima
       crypto: korišćenje end-to-end enkripcije
       follow: menja odnose naloga
+      profile: čita samo informacije o profilu vašeg naloga
       push: primanje prosleđenih obaveštenja
       read: čita podatke Vašeg naloga
       read:accounts: pogledaj informacije o nalozima
@@ -174,7 +176,6 @@ sr-Latn:
       read:filters: pogledaj svoje filtere
       read:follows: pogledaj koga pratiš
       read:lists: pogledaj svoje liste
-      read:me: čita samo osnovne informacije o vašem nalogu
       read:mutes: pogledaj ignorisanja
       read:notifications: pogledaj svoja obaveštenja
       read:reports: pogledaj svoje prijave
diff --git a/config/locales/doorkeeper.sr.yml b/config/locales/doorkeeper.sr.yml
index f40a05e90d5dea..feb0fec3e5e6c6 100644
--- a/config/locales/doorkeeper.sr.yml
+++ b/config/locales/doorkeeper.sr.yml
@@ -135,6 +135,7 @@ sr:
         media: Мултимедијални прилози
         mutes: Игнорисани
         notifications: Обавештења
+        profile: Ваш Mastodon профил
         push: Прослеђена обавештења
         reports: Пријаве
         search: Претрага
@@ -165,6 +166,7 @@ sr:
       admin:write:reports: вршење модераторских активности над извештајима
       crypto: коришћење end-to-end енкрипције
       follow: мења односе налога
+      profile: чита само информације о профилу вашег налога
       push: примање прослеђених обавештења
       read: чита податке Вашег налога
       read:accounts: погледај информације о налозима
@@ -174,7 +176,6 @@ sr:
       read:filters: погледај своје филтере
       read:follows: погледај кога пратиш
       read:lists: погледај своје листе
-      read:me: чита само основне информације о вашем налогу
       read:mutes: погледај игнорисања
       read:notifications: погледај своја обавештења
       read:reports: погледај своје пријаве
diff --git a/config/locales/doorkeeper.sv.yml b/config/locales/doorkeeper.sv.yml
index d336f08c560a3c..f2c8bd34b8c6c2 100644
--- a/config/locales/doorkeeper.sv.yml
+++ b/config/locales/doorkeeper.sv.yml
@@ -174,7 +174,6 @@ sv:
       read:filters: se dina filter
       read:follows: se vem du följer
       read:lists: se dina listor
-      read:me: läs endast den grundläggande informationen för ditt konto
       read:mutes: se dina tystningar
       read:notifications: se dina notiser
       read:reports: se dina rapporter
diff --git a/config/locales/doorkeeper.th.yml b/config/locales/doorkeeper.th.yml
index 8a28566a0d5bca..067e0655884691 100644
--- a/config/locales/doorkeeper.th.yml
+++ b/config/locales/doorkeeper.th.yml
@@ -174,7 +174,6 @@ th:
       read:filters: ดูตัวกรองของคุณ
       read:follows: ดูการติดตามของคุณ
       read:lists: ดูรายการของคุณ
-      read:me: อ่านเฉพาะข้อมูลพื้นฐานของบัญชีของคุณเท่านั้น
       read:mutes: ดูการซ่อนของคุณ
       read:notifications: ดูการแจ้งเตือนของคุณ
       read:reports: ดูรายงานของคุณ
diff --git a/config/locales/doorkeeper.tr.yml b/config/locales/doorkeeper.tr.yml
index f5ebbc5fd84383..330449b1b5f5e2 100644
--- a/config/locales/doorkeeper.tr.yml
+++ b/config/locales/doorkeeper.tr.yml
@@ -135,6 +135,7 @@ tr:
         media: Medya ekleri
         mutes: Sessize alınanlar
         notifications: Bildirimler
+        profile: Mastodon profiliniz
         push: Anlık bildirimler
         reports: Şikayetler
         search: Arama
@@ -165,6 +166,7 @@ tr:
       admin:write:reports: raporlarda denetleme eylemleri gerçekleştirin
       crypto: uçtan uca şifreleme kullan
       follow: hesap ilişkilerini değiştirin
+      profile: hesabınızın sadece profil bilgilerini okuma
       push: anlık bildirimlerizi alın
       read: hesabınızın tüm verilerini okuyun
       read:accounts: hesap bilgilerini görün
@@ -174,7 +176,6 @@ tr:
       read:filters: süzgeçlerinizi görün
       read:follows: takip ettiklerinizi görün
       read:lists: listelerinizi görün
-      read:me: hesabınızın sadece temel bilgilerini okuma
       read:mutes: sessize aldıklarınızı görün
       read:notifications: bildirimlerinizi görün
       read:reports: raporlarınızı görün
diff --git a/config/locales/doorkeeper.uk.yml b/config/locales/doorkeeper.uk.yml
index ac7fbbe15d7dfc..ca54fcb65a83be 100644
--- a/config/locales/doorkeeper.uk.yml
+++ b/config/locales/doorkeeper.uk.yml
@@ -135,6 +135,7 @@ uk:
         media: Мультимедійні вкладення
         mutes: Нехтувані
         notifications: Сповіщення
+        profile: Ваш профіль Mastodon
         push: Push-сповіщення
         reports: Скарги
         search: Пошук
@@ -171,6 +172,7 @@ uk:
       admin:write:reports: модерувати скарги
       crypto: використовувати наскрізне шифрування
       follow: змінювати стосунки облікового запису
+      profile: читати лише інформацію профілю вашого облікового запису
       push: отримувати Ваші Push-повідомлення
       read: читати усі дані вашого облікового запису
       read:accounts: бачити інформацію про облікові записи
@@ -180,7 +182,6 @@ uk:
       read:filters: бачити Ваші фільтри
       read:follows: бачити Ваші підписки
       read:lists: бачити Ваші списки
-      read:me: читайте лише основну інформацію вашого облікового запису
       read:mutes: бачити ваші нехтування
       read:notifications: бачити Ваші сповіщення
       read:reports: бачити Ваші скарги
diff --git a/config/locales/doorkeeper.vi.yml b/config/locales/doorkeeper.vi.yml
index 624db9aff7eb4f..7f1c5430edc1ea 100644
--- a/config/locales/doorkeeper.vi.yml
+++ b/config/locales/doorkeeper.vi.yml
@@ -174,7 +174,6 @@ vi:
       read:filters: xem bộ lọc
       read:follows: xem những người theo dõi
       read:lists: xem danh sách
-      read:me: chỉ đọc thông tin cơ bản tài khoản
       read:mutes: xem những người đã ẩn
       read:notifications: xem thông báo
       read:reports: xem báo cáo của bạn
diff --git a/config/locales/doorkeeper.zh-CN.yml b/config/locales/doorkeeper.zh-CN.yml
index 73f1f9725ce6ad..18477bc84581df 100644
--- a/config/locales/doorkeeper.zh-CN.yml
+++ b/config/locales/doorkeeper.zh-CN.yml
@@ -135,6 +135,7 @@ zh-CN:
         media: 媒体文件
         mutes: 已被隐藏的
         notifications: 通知
+        profile: 你的 Mastodon 个人资料
         push: 推送通知
         reports: 举报
         search: 搜索
@@ -165,6 +166,7 @@ zh-CN:
       admin:write:reports: 对举报执行管理操作
       crypto: 使用端到端加密
       follow: 关注或屏蔽用户
+      profile: 仅读取你账户中的个人资料信息
       push: 接收你的账户的推送通知
       read: 读取你的账户数据
       read:accounts: 查看账号信息
@@ -174,7 +176,6 @@ zh-CN:
       read:filters: 查看你的过滤器
       read:follows: 查看你的关注
       read:lists: 查看你的列表
-      read:me: 只读取你账户的基本信息
       read:mutes: 查看你的隐藏列表
       read:notifications: 查看你的通知
       read:reports: 查看你的举报
diff --git a/config/locales/doorkeeper.zh-HK.yml b/config/locales/doorkeeper.zh-HK.yml
index 76d13a74a5b7c6..79629b12febf39 100644
--- a/config/locales/doorkeeper.zh-HK.yml
+++ b/config/locales/doorkeeper.zh-HK.yml
@@ -174,7 +174,6 @@ zh-HK:
       read:filters: 檢視你的過濾條件
       read:follows: 檢視你關注的人
       read:lists: 檢視你的清單
-      read:me: 僅讀取帳號的基本資訊
       read:mutes: 檢視被你靜音的人
       read:notifications: 檢視你的通知
       read:reports: 檢視你的檢舉
diff --git a/config/locales/doorkeeper.zh-TW.yml b/config/locales/doorkeeper.zh-TW.yml
index 86827a7122435d..d12651a6486e2d 100644
--- a/config/locales/doorkeeper.zh-TW.yml
+++ b/config/locales/doorkeeper.zh-TW.yml
@@ -135,6 +135,7 @@ zh-TW:
         media: 多媒體附加檔案
         mutes: 靜音
         notifications: 通知
+        profile: 您 Mastodon 個人檔案
         push: 推播通知
         reports: 檢舉報告
         search: 搜尋
@@ -165,6 +166,7 @@ zh-TW:
       admin:write:reports: 對報告進行管理動作
       crypto: 使用端到端加密
       follow: 修改帳號關係
+      profile: 僅讀取您的帳號個人檔案資訊
       push: 接收帳號的推播通知
       read: 讀取您所有的帳號資料
       read:accounts: 檢視帳號資訊
@@ -174,7 +176,6 @@ zh-TW:
       read:filters: 檢視您的過濾條件
       read:follows: 檢視您跟隨之使用者
       read:lists: 檢視您的列表
-      read:me: 僅讀取您的帳號基本資訊
       read:mutes: 檢視您靜音的人
       read:notifications: 檢視您的通知
       read:reports: 檢視您的檢舉

From 3dfc7267e20aab8e5e72adffbf1ef4773811c068 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 7 Jun 2024 06:00:27 -0400
Subject: [PATCH 1201/2191] Rename deprecated config option to
 `enable_reloading` in dev env (#30577)

---
 config/environments/development.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/environments/development.rb b/config/environments/development.rb
index a3254125c039be..cc601bde3f82d3 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -8,7 +8,7 @@
   # In the development environment your application's code is reloaded any time
   # it changes. This slows down response time but is perfect for development
   # since you don't have to restart the web server when you make code changes.
-  config.cache_classes = false
+  config.enable_reloading = true
 
   # Do not eager load code on boot.
   config.eager_load = false

From a5e3b814a207365edfcf1f625c1594774f936ab4 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 7 Jun 2024 06:00:51 -0400
Subject: [PATCH 1202/2191] Remove Status/ivar/shapes regression check from
 test env (#30580)

---
 config/environments/test.rb | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/config/environments/test.rb b/config/environments/test.rb
index 49b0c1f3031b8d..716bf8d31f194e 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -61,12 +61,6 @@
   config.i18n.default_locale = :en
   config.i18n.fallbacks = true
 
-  config.to_prepare do
-    # Force Status to always be SHAPE_TOO_COMPLEX
-    # Ref: https://github.com/mastodon/mastodon/issues/23644
-    10.times { |i| Status.allocate.instance_variable_set(:"@ivar_#{i}", nil) }
-  end
-
   # Tell Active Support which deprecation messages to disallow.
   config.active_support.disallowed_deprecation_warnings = []
 

From 3d058f898a8e029b8e0d007f4528b2ae878b8fc4 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 7 Jun 2024 12:37:50 +0200
Subject: [PATCH 1203/2191] chore(deps): update dependency rubocop-rspec to
 v2.31.0 (#30588)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 1003e14426fcb9..8ff990260b6309 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -751,7 +751,7 @@ GEM
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rspec (2.30.0)
+    rubocop-rspec (2.31.0)
       rubocop (~> 1.40)
       rubocop-capybara (~> 2.17)
       rubocop-factory_bot (~> 2.22)

From bc01b328a10cdf93e098fd016feb26b01cc58bdb Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 7 Jun 2024 08:21:38 -0400
Subject: [PATCH 1204/2191] Dont include peer dirs in devcontainer compose
 config (#30592)

---
 .devcontainer/docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
index 85f9eb22cc387d..4d6eb3c4879aae 100644
--- a/.devcontainer/docker-compose.yml
+++ b/.devcontainer/docker-compose.yml
@@ -5,7 +5,7 @@ services:
       context: .
       dockerfile: Dockerfile
     volumes:
-      - ../..:/workspaces:cached
+      - ..:/workspaces/mastodon:cached
     environment:
       RAILS_ENV: development
       NODE_ENV: development

From 299ae9bf922401751dc2a4dd50739a0391e0863a Mon Sep 17 00:00:00 2001
From: Victor Dyotte <vdyotte@gmail.com>
Date: Fri, 7 Jun 2024 08:29:30 -0400
Subject: [PATCH 1205/2191] Add `S3_KEY_PREFIX` environment variable (#30181)

---
 config/initializers/paperclip.rb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/config/initializers/paperclip.rb b/config/initializers/paperclip.rb
index 5b9365a5305be7..0be78b99f9f6ce 100644
--- a/config/initializers/paperclip.rb
+++ b/config/initializers/paperclip.rb
@@ -3,6 +3,8 @@
 Paperclip::DataUriAdapter.register
 Paperclip::ResponseWithLimitAdapter.register
 
+PATH = ':prefix_url:class/:attachment/:id_partition/:style/:filename'
+
 Paperclip.interpolates :filename do |attachment, style|
   if style == :original
     attachment.original_filename
@@ -29,7 +31,7 @@
 
 Paperclip::Attachment.default_options.merge!(
   use_timestamp: false,
-  path: ':prefix_url:class/:attachment/:id_partition/:style/:filename',
+  path: PATH,
   storage: :fog
 )
 
@@ -40,6 +42,8 @@
   s3_protocol = ENV.fetch('S3_PROTOCOL') { 'https' }
   s3_hostname = ENV.fetch('S3_HOSTNAME') { "s3-#{s3_region}.amazonaws.com" }
 
+  Paperclip::Attachment.default_options[:path] = ENV.fetch('S3_KEY_PREFIX') + "/#{PATH}" if ENV.has_key?('S3_KEY_PREFIX')
+
   Paperclip::Attachment.default_options.merge!(
     storage: :s3,
     s3_protocol: s3_protocol,
@@ -159,7 +163,7 @@ def copy_to_local_file(style, local_dest_path)
   Paperclip::Attachment.default_options.merge!(
     storage: :filesystem,
     path: File.join(ENV.fetch('PAPERCLIP_ROOT_PATH', File.join(':rails_root', 'public', 'system')), ':prefix_path:class', ':attachment', ':id_partition', ':style', ':filename'),
-    url: "#{ENV.fetch('PAPERCLIP_ROOT_URL', '/system')}/:prefix_url:class/:attachment/:id_partition/:style/:filename"
+    url: ENV.fetch('PAPERCLIP_ROOT_URL', '/system') + "/#{PATH}"
   )
 end
 

From 37e4d96b70b46fb0994af23eefd6a77498895ba3 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 7 Jun 2024 08:39:53 -0400
Subject: [PATCH 1206/2191] Restore `verbose` option to media remove cli
 (#30536)

---
 lib/mastodon/cli/media.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/mastodon/cli/media.rb b/lib/mastodon/cli/media.rb
index 509d11a8198948..123973d1954f98 100644
--- a/lib/mastodon/cli/media.rb
+++ b/lib/mastodon/cli/media.rb
@@ -13,6 +13,7 @@ class Media < Base
     option :remove_headers, type: :boolean, default: false
     option :include_follows, type: :boolean, default: false
     option :concurrency, type: :numeric, default: 5, aliases: [:c]
+    option :verbose, type: :boolean, default: false, aliases: [:v]
     option :dry_run, type: :boolean, default: false
     desc 'remove', 'Remove remote media files, headers or avatars'
     long_desc <<-DESC

From 9e9613b2864062ce4174ae02db3f94629ebdca0e Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 7 Jun 2024 15:45:11 +0200
Subject: [PATCH 1207/2191] Fix `mentions.account_id` and `mentions.status_id`
 not having `NOT NULL` database constraints (#30591)

---
 app/models/mention.rb                              |  4 ++--
 ...093446_change_mention_status_id_non_nullable.rb |  7 +++++++
 ...lidate_change_mention_status_id_non_nullable.rb | 14 ++++++++++++++
 ...94603_change_mention_account_id_non_nullable.rb |  7 +++++++
 ...idate_change_mention_account_id_non_nullable.rb | 14 ++++++++++++++
 db/schema.rb                                       |  6 +++---
 6 files changed, 47 insertions(+), 5 deletions(-)
 create mode 100644 db/migrate/20240607093446_change_mention_status_id_non_nullable.rb
 create mode 100644 db/migrate/20240607093954_validate_change_mention_status_id_non_nullable.rb
 create mode 100644 db/migrate/20240607094603_change_mention_account_id_non_nullable.rb
 create mode 100644 db/migrate/20240607094856_validate_change_mention_account_id_non_nullable.rb

diff --git a/app/models/mention.rb b/app/models/mention.rb
index 2348b2905c0e06..af9bb7378bcf8f 100644
--- a/app/models/mention.rb
+++ b/app/models/mention.rb
@@ -5,10 +5,10 @@
 # Table name: mentions
 #
 #  id         :bigint(8)        not null, primary key
-#  status_id  :bigint(8)
+#  status_id  :bigint(8)        not null
 #  created_at :datetime         not null
 #  updated_at :datetime         not null
-#  account_id :bigint(8)
+#  account_id :bigint(8)        not null
 #  silent     :boolean          default(FALSE), not null
 #
 
diff --git a/db/migrate/20240607093446_change_mention_status_id_non_nullable.rb b/db/migrate/20240607093446_change_mention_status_id_non_nullable.rb
new file mode 100644
index 00000000000000..b6ee4d318f14a5
--- /dev/null
+++ b/db/migrate/20240607093446_change_mention_status_id_non_nullable.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class ChangeMentionStatusIdNonNullable < ActiveRecord::Migration[7.1]
+  def change
+    add_check_constraint :mentions, 'status_id IS NOT NULL', name: 'mentions_status_id_null', validate: false
+  end
+end
diff --git a/db/migrate/20240607093954_validate_change_mention_status_id_non_nullable.rb b/db/migrate/20240607093954_validate_change_mention_status_id_non_nullable.rb
new file mode 100644
index 00000000000000..bd3d9a33a69181
--- /dev/null
+++ b/db/migrate/20240607093954_validate_change_mention_status_id_non_nullable.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class ValidateChangeMentionStatusIdNonNullable < ActiveRecord::Migration[7.1]
+  def up
+    validate_check_constraint :mentions, name: 'mentions_status_id_null'
+    change_column_null :mentions, :status_id, false
+    remove_check_constraint :mentions, name: 'mentions_status_id_null'
+  end
+
+  def down
+    add_check_constraint :mentions, 'status_id IS NOT NULL', name: 'mentions_status_id_null', validate: false
+    change_column_null :mentions, :status_id, true
+  end
+end
diff --git a/db/migrate/20240607094603_change_mention_account_id_non_nullable.rb b/db/migrate/20240607094603_change_mention_account_id_non_nullable.rb
new file mode 100644
index 00000000000000..72d7bf24477ebf
--- /dev/null
+++ b/db/migrate/20240607094603_change_mention_account_id_non_nullable.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class ChangeMentionAccountIdNonNullable < ActiveRecord::Migration[7.1]
+  def change
+    add_check_constraint :mentions, 'account_id IS NOT NULL', name: 'mentions_account_id_null', validate: false
+  end
+end
diff --git a/db/migrate/20240607094856_validate_change_mention_account_id_non_nullable.rb b/db/migrate/20240607094856_validate_change_mention_account_id_non_nullable.rb
new file mode 100644
index 00000000000000..1125dffb39283b
--- /dev/null
+++ b/db/migrate/20240607094856_validate_change_mention_account_id_non_nullable.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class ValidateChangeMentionAccountIdNonNullable < ActiveRecord::Migration[7.1]
+  def up
+    validate_check_constraint :mentions, name: 'mentions_account_id_null'
+    change_column_null :mentions, :account_id, false
+    remove_check_constraint :mentions, name: 'mentions_account_id_null'
+  end
+
+  def down
+    add_check_constraint :mentions, 'account_id IS NOT NULL', name: 'mentions_account_id_null', validate: false
+    change_column_null :mentions, :account_id, true
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index ce2951608b0882..5f8c7e693f466d 100644
--- 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_06_03_195202) do
+ActiveRecord::Schema[7.1].define(version: 2024_06_07_094856) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -661,10 +661,10 @@
   end
 
   create_table "mentions", force: :cascade do |t|
-    t.bigint "status_id"
+    t.bigint "status_id", null: false
     t.datetime "created_at", precision: nil, null: false
     t.datetime "updated_at", precision: nil, null: false
-    t.bigint "account_id"
+    t.bigint "account_id", null: false
     t.boolean "silent", default: false, null: false
     t.index ["account_id", "status_id"], name: "index_mentions_on_account_id_and_status_id", unique: true
     t.index ["status_id"], name: "index_mentions_on_status_id"

From 773283ffb9d227d7768d3c32a1a4bf556f0fb0a3 Mon Sep 17 00:00:00 2001
From: Isa S <smiba@users.noreply.github.com>
Date: Fri, 7 Jun 2024 15:54:55 +0200
Subject: [PATCH 1208/2191] Make S3's retry limit a ENV variable (#23215)

---
 config/initializers/paperclip.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/initializers/paperclip.rb b/config/initializers/paperclip.rb
index 0be78b99f9f6ce..e9e3c78cfa17a4 100644
--- a/config/initializers/paperclip.rb
+++ b/config/initializers/paperclip.rb
@@ -68,7 +68,7 @@
       http_open_timeout: ENV.fetch('S3_OPEN_TIMEOUT') { '5' }.to_i,
       http_read_timeout: ENV.fetch('S3_READ_TIMEOUT') { '5' }.to_i,
       http_idle_timeout: 5,
-      retry_limit: 0,
+      retry_limit: ENV.fetch('S3_RETRY_LIMIT'){ '0' }.to_i,
     }
   )
 

From 4f6cc547d0a7828d036d22f320b9c078e492a9c4 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 7 Jun 2024 09:55:55 -0400
Subject: [PATCH 1209/2191] Align root/vscode user dynamic for codespaces with
 non-codespaces config (#30593)

---
 .devcontainer/Dockerfile                   | 4 ++--
 .devcontainer/codespaces/devcontainer.json | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 9d8fa2702d55bc..a0dc24ee84e73e 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -5,7 +5,7 @@ FROM mcr.microsoft.com/devcontainers/ruby:1-3.3-bookworm
 # RUN gem install rails webdrivers
 
 ARG NODE_VERSION="20"
-RUN su vscode -c "source /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1"
+RUN . /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1
 
 # [Optional] Uncomment this section to install additional OS packages.
 RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
@@ -15,6 +15,6 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
 RUN gem install foreman
 
 # [Optional] Uncomment this line to install global node packages.
-RUN su vscode -c "source /usr/local/share/nvm/nvm.sh && corepack enable" 2>&1
+RUN . /usr/local/share/nvm/nvm.sh && corepack enable 2>&1
 
 COPY welcome-message.txt /usr/local/etc/vscode-dev-containers/first-run-notice.txt
diff --git a/.devcontainer/codespaces/devcontainer.json b/.devcontainer/codespaces/devcontainer.json
index 6736734e6069e4..c14d2c529ad860 100644
--- a/.devcontainer/codespaces/devcontainer.json
+++ b/.devcontainer/codespaces/devcontainer.json
@@ -23,6 +23,8 @@
     }
   },
 
+  "remoteUser": "root",
+
   "otherPortsAttributes": {
     "onAutoForward": "silent"
   },

From 80cd001e0aa876b690c6862e2f9cbb945074f2ff Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 7 Jun 2024 16:32:29 +0200
Subject: [PATCH 1210/2191] Fix linting issue (#30595)

---
 config/initializers/paperclip.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/initializers/paperclip.rb b/config/initializers/paperclip.rb
index e9e3c78cfa17a4..070d250bf30aea 100644
--- a/config/initializers/paperclip.rb
+++ b/config/initializers/paperclip.rb
@@ -68,7 +68,7 @@
       http_open_timeout: ENV.fetch('S3_OPEN_TIMEOUT') { '5' }.to_i,
       http_read_timeout: ENV.fetch('S3_READ_TIMEOUT') { '5' }.to_i,
       http_idle_timeout: 5,
-      retry_limit: ENV.fetch('S3_RETRY_LIMIT'){ '0' }.to_i,
+      retry_limit: ENV.fetch('S3_RETRY_LIMIT') { '0' }.to_i,
     }
   )
 

From 82be5d033f9a5e9335d4efee6008439c7770f102 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 7 Jun 2024 17:39:41 +0200
Subject: [PATCH 1211/2191] Improve handling of libvips failures (#30597)

---
 lib/paperclip/blurhash_transcoder.rb | 2 ++
 lib/paperclip/color_extractor.rb     | 2 ++
 lib/paperclip/vips_lazy_thumbnail.rb | 2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/paperclip/blurhash_transcoder.rb b/lib/paperclip/blurhash_transcoder.rb
index e9cecef50c88d7..150275bc9e078f 100644
--- a/lib/paperclip/blurhash_transcoder.rb
+++ b/lib/paperclip/blurhash_transcoder.rb
@@ -12,6 +12,8 @@ def make
       attachment.instance.blurhash = Blurhash.encode(width, height, data, **(options[:blurhash] || {}))
 
       @file
+    rescue Vips::Error => e
+      raise Paperclip::Error, "Error while generating blurhash for #{@basename}: #{e}"
     end
 
     private
diff --git a/lib/paperclip/color_extractor.rb b/lib/paperclip/color_extractor.rb
index b5992f90bcbcfc..0f168d233b2c14 100644
--- a/lib/paperclip/color_extractor.rb
+++ b/lib/paperclip/color_extractor.rb
@@ -69,6 +69,8 @@ def make
       attachment.instance.file.instance_write(:meta, (attachment.instance.file.instance_read(:meta) || {}).merge(meta))
 
       @file
+    rescue Vips::Error => e
+      raise Paperclip::Error, "Error while extracting colors for #{@basename}: #{e}"
     end
 
     private
diff --git a/lib/paperclip/vips_lazy_thumbnail.rb b/lib/paperclip/vips_lazy_thumbnail.rb
index 06d99bf79d073f..4764b04af8ecb6 100644
--- a/lib/paperclip/vips_lazy_thumbnail.rb
+++ b/lib/paperclip/vips_lazy_thumbnail.rb
@@ -68,7 +68,7 @@ def make
       end
 
       dst
-    rescue Terrapin::ExitStatusError => e
+    rescue Vips::Error, Terrapin::ExitStatusError => e
       raise Paperclip::Error, "Error while optimizing #{@basename}: #{e}"
     rescue Terrapin::CommandNotFoundError
       raise Paperclip::Errors::CommandNotFoundError, 'Could not run the `ffmpeg` command. Please install ffmpeg.'

From 496c10542bd39ca86a85d4de81778c134ea4383c Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 7 Jun 2024 19:42:43 +0200
Subject: [PATCH 1212/2191] Fix division by zero on some video/GIF files
 (#30600)

---
 app/lib/video_metadata_extractor.rb | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/lib/video_metadata_extractor.rb b/app/lib/video_metadata_extractor.rb
index df5409375f16ef..2155766251e35d 100644
--- a/app/lib/video_metadata_extractor.rb
+++ b/app/lib/video_metadata_extractor.rb
@@ -41,8 +41,8 @@ def parse_metadata
         @colorspace  = video_stream[:pix_fmt]
         @width       = video_stream[:width]
         @height      = video_stream[:height]
-        @frame_rate  = video_stream[:avg_frame_rate] == '0/0' ? nil : Rational(video_stream[:avg_frame_rate])
-        @r_frame_rate = video_stream[:r_frame_rate] == '0/0' ? nil : Rational(video_stream[:r_frame_rate])
+        @frame_rate  = parse_framerate(video_stream[:avg_frame_rate])
+        @r_frame_rate = parse_framerate(video_stream[:r_frame_rate])
         # For some video streams the frame_rate reported by `ffprobe` will be 0/0, but for these streams we
         # should use `r_frame_rate` instead. Video screencast generated by Gnome Screencast have this issue.
         @frame_rate ||= @r_frame_rate
@@ -55,4 +55,10 @@ def parse_metadata
 
     @invalid = true if @metadata.key?(:error)
   end
+
+  def parse_framerate(raw)
+    Rational(raw)
+  rescue ZeroDivisionError
+    nil
+  end
 end

From 521b43393350be16fbd1aa003607480c2442f3eb Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 7 Jun 2024 16:18:02 -0400
Subject: [PATCH 1213/2191] Doc updates for Docker/devcontainers/codespace
 (#30582)

---
 .devcontainer/Dockerfile                      | 17 +++-----
 .devcontainer/codespaces/devcontainer.json    |  2 +-
 .../{docker-compose.yml => compose.yaml}      |  0
 .devcontainer/devcontainer.json               |  2 +-
 README.md                                     | 43 +++++++++++++------
 5 files changed, 38 insertions(+), 26 deletions(-)
 rename .devcontainer/{docker-compose.yml => compose.yaml} (100%)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index a0dc24ee84e73e..113dd71880db5a 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,20 +1,17 @@
 # For details, see https://github.com/devcontainers/images/tree/main/src/ruby
 FROM mcr.microsoft.com/devcontainers/ruby:1-3.3-bookworm
 
-# Install Rails
-# RUN gem install rails webdrivers
-
+# Update existing node version, keep in sync with .nvmrc
 ARG NODE_VERSION="20"
 RUN . /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1
 
-# [Optional] Uncomment this section to install additional OS packages.
-RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
-    && apt-get -y install --no-install-recommends libicu-dev libidn11-dev ffmpeg imagemagick libvips42 libpam-dev
-
-# [Optional] Uncomment this line to install additional gems.
-RUN gem install foreman
+# Install additional OS packages
+RUN apt-get update && \
+    export DEBIAN_FRONTEND=noninteractive && \
+    apt-get -y install --no-install-recommends libicu-dev libidn11-dev ffmpeg imagemagick libvips42 libpam-dev
 
-# [Optional] Uncomment this line to install global node packages.
+# Install global node packages
 RUN . /usr/local/share/nvm/nvm.sh && corepack enable 2>&1
 
+# Move welcome message to where VS Code expects it
 COPY welcome-message.txt /usr/local/etc/vscode-dev-containers/first-run-notice.txt
diff --git a/.devcontainer/codespaces/devcontainer.json b/.devcontainer/codespaces/devcontainer.json
index c14d2c529ad860..d2358657f6d664 100644
--- a/.devcontainer/codespaces/devcontainer.json
+++ b/.devcontainer/codespaces/devcontainer.json
@@ -1,6 +1,6 @@
 {
   "name": "Mastodon on GitHub Codespaces",
-  "dockerComposeFile": "../docker-compose.yml",
+  "dockerComposeFile": "../compose.yaml",
   "service": "app",
   "workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
 
diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/compose.yaml
similarity index 100%
rename from .devcontainer/docker-compose.yml
rename to .devcontainer/compose.yaml
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 4a9cf11cc2b059..fb88f7801fa35f 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,6 +1,6 @@
 {
   "name": "Mastodon on local machine",
-  "dockerComposeFile": "docker-compose.yml",
+  "dockerComposeFile": "compose.yaml",
   "service": "app",
   "workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
 
diff --git a/README.md b/README.md
index 3773b647fea1fd..f807120c1eddf3 100644
--- a/README.md
+++ b/README.md
@@ -102,26 +102,35 @@ To set up **MacOS** for native development, complete the following steps:
 ### Docker
 
 For production hosting and deployment with **Docker**, use the `Dockerfile` and
-`docker-compose.yml` in the project root directory. To create a local
-development environment with **Docker**, complete the following steps:
+`docker-compose.yml` in the project root directory.
 
-- Install Docker Desktop
-- Run `docker compose -f .devcontainer/docker-compose.yml up -d`
-- Run `docker compose -f .devcontainer/docker-compose.yml exec app bin/setup`
-- Finally, run `docker compose -f .devcontainer/docker-compose.yml exec app bin/dev`
+For local development, install and launch [Docker], and run:
 
-If you are using an IDE with [support for the Development Container specification](https://containers.dev/supporting), it will run the above `docker compose` commands automatically. For **Visual Studio Code** this requires the [Dev Container extension](https://containers.dev/supporting#dev-containers).
+```shell
+docker compose -f .devcontainer/compose.yaml up -d
+docker compose -f .devcontainer/compose.yaml exec app bin/setup
+docker compose -f .devcontainer/compose.yaml exec app bin/dev
+```
+
+### Dev Containers
+
+Within IDEs that support the [Development Containers] specification, start the
+"Mastodon on local machine" container from the editor. The necessary `docker
+compose` commands to build and setup the container should run automatically. For
+**Visual Studio Code** this requires installing the [Dev Container extension].
 
 ### GitHub Codespaces
 
-To get you coding in just a few minutes, GitHub Codespaces provides a web-based version of Visual Studio Code and a cloud-hosted development environment fully configured with the software needed for this project..
+[GitHub Codespaces] provides a web-based version of VS Code and a cloud hosted
+development environment configured with the software needed for this project.
 
-- Click this button to create a new codespace:<br>
-  [![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://github.com/codespaces/new?hide_repo_select=true&ref=main&repo=52281283&devcontainer_path=.devcontainer%2Fcodespaces%2Fdevcontainer.json)
-- Wait for the environment to build. This will take a few minutes.
-- When the editor is ready, run `bin/dev` in the terminal.
-- After a few seconds, a popup will appear with a button labeled _Open in Browser_. This will open Mastodon.
-- On the _Ports_ tab, right click on the “stream” row and select _Port visibility_ → _Public_.
+[![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)][codespace]
+
+- Click the button to create a new codespace, and confirm the options
+- Wait for the environment to build (takes a few minutes)
+- When the editor is ready, run `bin/dev` in the terminal
+- Wait for an _Open in Browser_ prompt. This will open Mastodon
+- On the _Ports_ tab "stream" setting change _Port visibility_ → _Public_
 
 ## Contributing
 
@@ -140,3 +149,9 @@ This program is free software: you can redistribute it and/or modify it under th
 This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details.
 
 You should have received a copy of the GNU Affero General Public License along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+[codespace]: https://codespaces.new/mastodon/mastodon?quickstart=1&devcontainer_path=.devcontainer%2Fcodespaces%2Fdevcontainer.json
+[Dev Container extension]: https://containers.dev/supporting#dev-containers
+[Development Containers]: https://containers.dev/supporting
+[Docker]: https://docs.docker.com
+[GitHub Codespaces]: https://docs.github.com/en/codespaces

From aab5b10c385168a6e47b985675f9e72ff020e8d1 Mon Sep 17 00:00:00 2001
From: GitHub Actions <noreply@github.com>
Date: Sat, 8 Jun 2024 04:29:18 +0000
Subject: [PATCH 1214/2191] New Crowdin translations

---
 .../flavours/glitch/locales/fr-CA.json          | 11 +++++++++++
 app/javascript/flavours/glitch/locales/fr.json  | 17 ++++++++++++++---
 config/locales-glitch/fr.yml                    |  2 +-
 config/locales-glitch/no.yml                    |  2 +-
 config/locales-glitch/simple_form.fr.yml        |  2 +-
 config/locales-glitch/simple_form.no.yml        |  2 +-
 6 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/app/javascript/flavours/glitch/locales/fr-CA.json b/app/javascript/flavours/glitch/locales/fr-CA.json
index 30ca374d205718..991d206a997328 100644
--- a/app/javascript/flavours/glitch/locales/fr-CA.json
+++ b/app/javascript/flavours/glitch/locales/fr-CA.json
@@ -14,9 +14,15 @@
   "column_subheading.lists": "Listes",
   "column_subheading.navigation": "Navigation",
   "community.column_settings.allow_local_only": "Afficher seulement les posts locaux",
+  "compose.attach.doodle": "Dessinez quelque chose",
+  "compose.change_federation": "Changer les paramètres de fédération",
+  "compose.content-type.change": "Changer les options de mise en forme avancée",
   "compose.content-type.html": "HTML",
+  "compose.content-type.html_meta": "Formatez vos messages en HTML",
   "compose.content-type.markdown": "Markdown",
+  "compose.content-type.markdown_meta": "Formatez vos messages en Markdown",
   "compose.content-type.plain": "Text brut",
+  "compose.content-type.plain_meta": "Écrire sans formatage avancé",
   "compose.disable_threaded_mode": "Désactiver le mode thread",
   "compose.enable_threaded_mode": "Activer le mode thread",
   "confirmation_modal.do_not_ask_again": "Ne plus demander confirmation",
@@ -32,6 +38,10 @@
   "direct.group_by_conversations": "Grouper par conversation",
   "endorsed_accounts_editor.endorsed_accounts": "Comptes mis en avant",
   "favourite_modal.combo": "Vous pouvez appuyer sur {combo} pour passer ceci la prochaine fois",
+  "federation.federated.long": "Permettre à ce post d’atteindre d'autres serveurs",
+  "federation.federated.short": "Fédéré",
+  "federation.local_only.long": "Empêcher ce post d’atteindre d'autres serveurs",
+  "federation.local_only.short": "Local uniquement",
   "firehose.column_settings.allow_local_only": "Afficher les messages locaux dans \"Tous\"",
   "home.column_settings.advanced": "Avancé",
   "home.column_settings.filter_regex": "Filtrer par expression régulière",
@@ -114,6 +124,7 @@
   "settings.shared_settings_link": "préférences de l'utilisateur",
   "settings.show_action_bar": "Afficher les boutons d'action dans les posts repliés",
   "settings.show_content_type_choice": "Afficher le choix du type de contenu lors de la création des posts",
+  "settings.show_published_toast": "Afficher une notification quand un post est envoyé/sauvegardé",
   "settings.show_reply_counter": "Afficher une estimation du nombre de réponses",
   "settings.side_arm": "Bouton secondaire de publication :",
   "settings.side_arm.none": "Aucun",
diff --git a/app/javascript/flavours/glitch/locales/fr.json b/app/javascript/flavours/glitch/locales/fr.json
index 30ca374d205718..03baa0fb670ca9 100644
--- a/app/javascript/flavours/glitch/locales/fr.json
+++ b/app/javascript/flavours/glitch/locales/fr.json
@@ -14,9 +14,15 @@
   "column_subheading.lists": "Listes",
   "column_subheading.navigation": "Navigation",
   "community.column_settings.allow_local_only": "Afficher seulement les posts locaux",
+  "compose.attach.doodle": "Dessinez quelque chose",
+  "compose.change_federation": "Changer les paramètres de fédération",
+  "compose.content-type.change": "Changer les options de mise en forme avancée",
   "compose.content-type.html": "HTML",
+  "compose.content-type.html_meta": "Formatez vos messages en HTML",
   "compose.content-type.markdown": "Markdown",
+  "compose.content-type.markdown_meta": "Formatez vos messages en Markdown",
   "compose.content-type.plain": "Text brut",
+  "compose.content-type.plain_meta": "Écrire sans formatage avancé",
   "compose.disable_threaded_mode": "Désactiver le mode thread",
   "compose.enable_threaded_mode": "Activer le mode thread",
   "confirmation_modal.do_not_ask_again": "Ne plus demander confirmation",
@@ -32,6 +38,10 @@
   "direct.group_by_conversations": "Grouper par conversation",
   "endorsed_accounts_editor.endorsed_accounts": "Comptes mis en avant",
   "favourite_modal.combo": "Vous pouvez appuyer sur {combo} pour passer ceci la prochaine fois",
+  "federation.federated.long": "Permettre à ce post d’atteindre d'autres serveurs",
+  "federation.federated.short": "Fédéré",
+  "federation.local_only.long": "Empêcher ce post d’atteindre d'autres serveurs",
+  "federation.local_only.short": "Local uniquement",
   "firehose.column_settings.allow_local_only": "Afficher les messages locaux dans \"Tous\"",
   "home.column_settings.advanced": "Avancé",
   "home.column_settings.filter_regex": "Filtrer par expression régulière",
@@ -65,9 +75,9 @@
   "settings.close": "Fermer",
   "settings.collapsed_statuses": "Posts repliés",
   "settings.compose_box_opts": "Zone de rédaction",
-  "settings.confirm_before_clearing_draft": "Afficher une fenêtre de confirmation avant d'écraser le message en cours de rédaction",
-  "settings.confirm_boost_missing_media_description": "Afficher une fenêtre de confirmation avant de partager des posts manquant de description des médias",
-  "settings.confirm_missing_media_description": "Afficher une fenêtre de confirmation avant de publier des posts manquant de description de média",
+  "settings.confirm_before_clearing_draft": "Demander confirmation avant d’effacer le message en cours de rédaction",
+  "settings.confirm_boost_missing_media_description": "Demander confirmation avant de partager des posts sans description des médias",
+  "settings.confirm_missing_media_description": "Demander confirmation avant de publier des posts sans description des médias",
   "settings.content_warnings": "Content warnings",
   "settings.content_warnings.regexp": "Expression rationnelle",
   "settings.content_warnings_filter": "Avertissement de contenu à ne pas automatiquement déplier :",
@@ -114,6 +124,7 @@
   "settings.shared_settings_link": "préférences de l'utilisateur",
   "settings.show_action_bar": "Afficher les boutons d'action dans les posts repliés",
   "settings.show_content_type_choice": "Afficher le choix du type de contenu lors de la création des posts",
+  "settings.show_published_toast": "Afficher une notification quand un post est envoyé/sauvegardé",
   "settings.show_reply_counter": "Afficher une estimation du nombre de réponses",
   "settings.side_arm": "Bouton secondaire de publication :",
   "settings.side_arm.none": "Aucun",
diff --git a/config/locales-glitch/fr.yml b/config/locales-glitch/fr.yml
index 15c3f8ce52b051..7324c3db9193d4 100644
--- a/config/locales-glitch/fr.yml
+++ b/config/locales-glitch/fr.yml
@@ -34,7 +34,7 @@ fr:
       glitch_guide_link_text: Et c'est pareil avec glitch-soc !
   auth:
     captcha_confirmation:
-      hint_html: Plus qu'une étape ! Pour vérifier votre compte sur ce serveur, vous devez résoudre un CAPTCHA. Vous pouvez <a href="/about/more">contacter l'administrateur·ice du serveur</a> si vous avez des questions ou besoin d'assistance dans la vérification de votre compte.
+      hint_html: Plus qu'une étape ! Pour vérifier votre compte sur ce serveur, vous devez résoudre un CAPTCHA. Vous pouvez <a href="/about/more">contacter l'administrateur·ice du serveur</a> si vous avez des questions ou besoin d'assistance pour vérifier votre compte.
       title: Vérification de l'utilisateur
   generic:
     use_this: Utiliser ceci
diff --git a/config/locales-glitch/no.yml b/config/locales-glitch/no.yml
index d36c60a4ac0a92..d2a4697e5dc65e 100644
--- a/config/locales-glitch/no.yml
+++ b/config/locales-glitch/no.yml
@@ -1 +1 @@
-'no':
+no:
diff --git a/config/locales-glitch/simple_form.fr.yml b/config/locales-glitch/simple_form.fr.yml
index a01d9a5f0f6907..f80b15372387da 100644
--- a/config/locales-glitch/simple_form.fr.yml
+++ b/config/locales-glitch/simple_form.fr.yml
@@ -16,7 +16,7 @@ fr:
         setting_default_content_type_html: HTML
         setting_default_content_type_markdown: Markdown
         setting_default_content_type_plain: Texte brut
-        setting_favourite_modal: Afficher une fenêtre de confirmation avant de mettre en favori un post (s'applique uniquement au mode Glitch)
+        setting_favourite_modal: Demander confirmation avant de mettre un post en favori (s'applique uniquement au mode Glitch)
         setting_show_followers_count: Cacher votre nombre d'abonné·e·s
         setting_skin: Thème
         setting_system_emoji_font: Utiliser la police par défaut du système pour les émojis (s'applique uniquement au mode Glitch)
diff --git a/config/locales-glitch/simple_form.no.yml b/config/locales-glitch/simple_form.no.yml
index d36c60a4ac0a92..d2a4697e5dc65e 100644
--- a/config/locales-glitch/simple_form.no.yml
+++ b/config/locales-glitch/simple_form.no.yml
@@ -1 +1 @@
-'no':
+no:

From c1a84f1b5b85e98c78847ddf03d1490300bcdc9d Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Sat, 8 Jun 2024 06:32:39 -0400
Subject: [PATCH 1215/2191] Case correction `Github` -> `GitHub` (#30446)

Co-authored-by: Igor <igordsmelo@gmail.com>
---
 .github/codecov.yml                         | 4 ++--
 .github/renovate.json5                      | 2 +-
 .github/workflows/build-container-image.yml | 2 +-
 .github/workflows/crowdin-download.yml      | 4 ++--
 SECURITY.md                                 | 2 +-
 crowdin.yml                                 | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/codecov.yml b/.github/codecov.yml
index 9d6413a10617e2..701ba3af8f72d5 100644
--- a/.github/codecov.yml
+++ b/.github/codecov.yml
@@ -3,9 +3,9 @@ coverage:
   status:
     project:
       default:
-        # Github status check is not blocking
+        # GitHub status check is not blocking
         informational: true
     patch:
       default:
-        # Github status check is not blocking
+        # GitHub status check is not blocking
         informational: true
diff --git a/.github/renovate.json5 b/.github/renovate.json5
index 378d4fc83ca86c..52f7c63e5b82f1 100644
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -59,7 +59,7 @@
       dependencyDashboardApproval: true,
     },
     {
-      // Update Github Actions and Docker images weekly
+      // Update GitHub Actions and Docker images weekly
       matchManagers: ['github-actions', 'dockerfile', 'docker-compose'],
       extends: ['schedule:weekly'],
     },
diff --git a/.github/workflows/build-container-image.yml b/.github/workflows/build-container-image.yml
index e100e158214689..dbb32af9bf5487 100644
--- a/.github/workflows/build-container-image.yml
+++ b/.github/workflows/build-container-image.yml
@@ -68,7 +68,7 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      - name: Log in to the Github Container registry
+      - name: Log in to the GitHub Container registry
         if: contains(inputs.push_to_images, 'ghcr.io')
         uses: docker/login-action@v3
         with:
diff --git a/.github/workflows/crowdin-download.yml b/.github/workflows/crowdin-download.yml
index 1df7672d6c0833..e9da7cb26f94cc 100644
--- a/.github/workflows/crowdin-download.yml
+++ b/.github/workflows/crowdin-download.yml
@@ -58,13 +58,13 @@ jobs:
           title: 'New Crowdin Translations (automated)'
           author: 'GitHub Actions <noreply@github.com>'
           body: |
-            New Crowdin translations, automated with Github Actions
+            New Crowdin translations, automated with GitHub Actions
 
             See `.github/workflows/crowdin-download.yml`
 
             This PR will be updated every day with new translations.
 
-            Due to a limitation in Github Actions, checks are not running on this PR without manual action.
+            Due to a limitation in GitHub Actions, checks are not running on this PR without manual action.
             If you want to run the checks, then close and re-open it.
           branch: i18n/crowdin/translations
           base: main
diff --git a/SECURITY.md b/SECURITY.md
index 81472b01b4306f..156954ce02352e 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -2,7 +2,7 @@
 
 If you believe you've identified a security vulnerability in Mastodon (a bug that allows something to happen that shouldn't be possible), you can either:
 
-- open a [Github security issue on the Mastodon project](https://github.com/mastodon/mastodon/security/advisories/new)
+- open a [GitHub security issue on the Mastodon project](https://github.com/mastodon/mastodon/security/advisories/new)
 - reach us at <security@joinmastodon.org>
 
 You should _not_ report such issues on public GitHub issues or in other public spaces to give us time to publish a fix for the issue without exposing Mastodon's users to increased risk.
diff --git a/crowdin.yml b/crowdin.yml
index d05b0e69f526a1..991c5b82520201 100644
--- a/crowdin.yml
+++ b/crowdin.yml
@@ -1,4 +1,4 @@
-# This is needed for the Github Action
+# This is needed for the GitHub Action
 project_id_env: CROWDIN_PROJECT_ID
 api_token_env: CROWDIN_PERSONAL_TOKEN
 

From 6952af137d17f65e65963e4d9ba129060fad9d3d Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Sat, 8 Jun 2024 06:33:28 -0400
Subject: [PATCH 1216/2191] Install from nvmrc during devcontainer Dockerfile
 build (#30603)

---
 .devcontainer/Dockerfile   | 12 +++++-------
 .devcontainer/compose.yaml |  4 ++--
 bin/setup                  |  2 +-
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 113dd71880db5a..c6dcc4d46a37d6 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,17 +1,15 @@
 # For details, see https://github.com/devcontainers/images/tree/main/src/ruby
 FROM mcr.microsoft.com/devcontainers/ruby:1-3.3-bookworm
 
-# Update existing node version, keep in sync with .nvmrc
-ARG NODE_VERSION="20"
-RUN . /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1
+# Install node version from .nvmrc
+WORKDIR /app
+COPY .nvmrc .
+RUN /bin/bash --login -i -c "nvm install"
 
 # Install additional OS packages
 RUN apt-get update && \
     export DEBIAN_FRONTEND=noninteractive && \
     apt-get -y install --no-install-recommends libicu-dev libidn11-dev ffmpeg imagemagick libvips42 libpam-dev
 
-# Install global node packages
-RUN . /usr/local/share/nvm/nvm.sh && corepack enable 2>&1
-
 # Move welcome message to where VS Code expects it
-COPY welcome-message.txt /usr/local/etc/vscode-dev-containers/first-run-notice.txt
+COPY .devcontainer/welcome-message.txt /usr/local/etc/vscode-dev-containers/first-run-notice.txt
diff --git a/.devcontainer/compose.yaml b/.devcontainer/compose.yaml
index 4d6eb3c4879aae..1e2e1ba7de2274 100644
--- a/.devcontainer/compose.yaml
+++ b/.devcontainer/compose.yaml
@@ -2,8 +2,8 @@ services:
   app:
     working_dir: /workspaces/mastodon/
     build:
-      context: .
-      dockerfile: Dockerfile
+      context: ..
+      dockerfile: .devcontainer/Dockerfile
     volumes:
       - ..:/workspaces/mastodon:cached
     environment:
diff --git a/bin/setup b/bin/setup
index 93c6981d0b59cb..4ccf4594b4e4d7 100755
--- a/bin/setup
+++ b/bin/setup
@@ -18,7 +18,7 @@ FileUtils.chdir APP_ROOT do
   system('bundle check') || system!('bundle install')
 
   puts "\n== Installing JS dependencies =="
-  system! 'corepack prepare'
+  system! 'corepack enable'
   system! 'bin/yarn install --immutable'
 
   puts "\n== Preparing database =="

From 01a9b37c209439b674fda283bc65d94466f20fb6 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Sat, 8 Jun 2024 13:28:41 +0200
Subject: [PATCH 1217/2191] Fix bogus translations

---
 config/locales-glitch/no.yml             | 2 +-
 config/locales-glitch/simple_form.no.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/locales-glitch/no.yml b/config/locales-glitch/no.yml
index d2a4697e5dc65e..d36c60a4ac0a92 100644
--- a/config/locales-glitch/no.yml
+++ b/config/locales-glitch/no.yml
@@ -1 +1 @@
-no:
+'no':
diff --git a/config/locales-glitch/simple_form.no.yml b/config/locales-glitch/simple_form.no.yml
index d2a4697e5dc65e..d36c60a4ac0a92 100644
--- a/config/locales-glitch/simple_form.no.yml
+++ b/config/locales-glitch/simple_form.no.yml
@@ -1 +1 @@
-no:
+'no':

From 82fcb55680a31797a8e9a4f8c51c97b4ba78dbe9 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Sat, 8 Jun 2024 13:49:02 +0200
Subject: [PATCH 1218/2191] Fix crowdin upload workflow not triggering on
 glitch-soc source string changes

---
 .github/workflows/crowdin-upload.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/crowdin-upload.yml b/.github/workflows/crowdin-upload.yml
index 75d66c2a6bc0cf..32c09802b42a0c 100644
--- a/.github/workflows/crowdin-upload.yml
+++ b/.github/workflows/crowdin-upload.yml
@@ -5,13 +5,13 @@ on:
     branches:
       - main
     paths:
-      - crowdin.yml
-      - app/javascript/mastodon/locales/en.json
-      - config/locales/en.yml
-      - config/locales/simple_form.en.yml
-      - config/locales/activerecord.en.yml
-      - config/locales/devise.en.yml
-      - config/locales/doorkeeper.en.yml
+      - crowdin-glitch.yml
+      - app/javascript/flavours/glitch/locales/en.json
+      - config/locales-glitch/en.yml
+      - config/locales-glitch/simple_form.en.yml
+      - config/locales-glitch/activerecord.en.yml
+      - config/locales-glitch/devise.en.yml
+      - config/locales-glitch/doorkeeper.en.yml
       - .github/workflows/crowdin-upload.yml
 
 jobs:

From 827e36ff9ee22ec58c64322c0a9d78eaa2dd4875 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Sat, 8 Jun 2024 13:10:06 -0400
Subject: [PATCH 1219/2191] Fix `Capybara/NegationMatcher` cop in spec/system
 (#30616)

---
 spec/system/filters_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/system/filters_spec.rb b/spec/system/filters_spec.rb
index 9d18e904608698..a0cb965a61b100 100644
--- a/spec/system/filters_spec.rb
+++ b/spec/system/filters_spec.rb
@@ -46,7 +46,7 @@
         click_on I18n.t('filters.index.delete')
       end.to change(CustomFilter, :count).by(-1)
 
-      expect(page).to_not have_content(filter_title)
+      expect(page).to have_no_content(filter_title)
     end
   end
 

From 33b3330dc767f1765d777cb62a7d96830b3385c3 Mon Sep 17 00:00:00 2001
From: GitHub Actions <noreply@github.com>
Date: Sun, 9 Jun 2024 04:29:04 +0000
Subject: [PATCH 1220/2191] New Crowdin translations

---
 .../flavours/glitch/locales/pt-PT.json        | 28 ++++++++++++++++++-
 config/locales-glitch/no.yml                  |  2 +-
 config/locales-glitch/simple_form.no.yml      |  2 +-
 3 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/app/javascript/flavours/glitch/locales/pt-PT.json b/app/javascript/flavours/glitch/locales/pt-PT.json
index fd0b010159e7fc..634f3db12a1024 100644
--- a/app/javascript/flavours/glitch/locales/pt-PT.json
+++ b/app/javascript/flavours/glitch/locales/pt-PT.json
@@ -7,6 +7,32 @@
   "boost_modal.missing_description": "Este post contém alguns media sem descrição",
   "column.favourited_by": "Adicionado aos favoritos de",
   "column.heading": "Diversos",
+  "moved_to_warning": "Esta conta mudou-se para {moved_to_link} e, portanto, pode não aceitar novos seguidores.",
+  "navigation_bar.featured_users": "Utilizadores em destaque",
+  "notification.markForDeletion": "Marcada para eliminação",
+  "notification_purge.btn_all": "Seleccionar tudo",
+  "notification_purge.btn_apply": "Limpar Selecionadas",
+  "notification_purge.btn_none": "Desselecionar tudo",
+  "notification_purge.start": "Entrar em modo de limpeza de notificações",
+  "notifications.column_settings.filter_bar.show_bar": "Mostrar barra de filtros",
+  "notifications.marked_clear": "Limpar as notificações selecionadas",
+  "notifications.marked_clear_confirmation": "Tem a certeza que deseja limpar todas as notificações selecionadas permanentemente?",
+  "settings.always_show_spoilers_field": "Mostrar sempre o campo Aviso de Conteúdo",
+  "settings.auto_collapse": "Colapso automático",
+  "settings.auto_collapse_height": "Altura (em pixels) a partir do qual um toot é considerado longo",
+  "settings.auto_collapse_media": "Toots com conteúdo multimédia",
   "settings.content_warnings": "Content warnings",
-  "settings.preferences": "Preferences"
+  "settings.layout_opts": "Disposição do conteúdo",
+  "settings.media": "Conteúdo multimédia",
+  "settings.media_fullwidth": "Pré-visualização a todo o comprimento",
+  "settings.media_reveal_behind_cw": "Mostrar sempre conteúdos com aviso",
+  "settings.notifications.favicon_badge": "Mostrar número de notificações no distintivo da página",
+  "settings.notifications.tab_badge": "Mostrar número de notificações não lidas",
+  "settings.notifications.tab_badge.hint": "Mostra um distintivo com o número de notificações não lidas quando a coluna de notificações não está aberta",
+  "settings.notifications_opts": "Opções de notificação",
+  "settings.pop_in_left": "Esquerda",
+  "settings.pop_in_right": "Direita",
+  "settings.preferences": "Preferences",
+  "settings.prepend_cw_re": "Iniciar respostas a toots com aviso de conteúdo com \"re:\"",
+  "settings.preselect_on_reply": "Pré-seleccionar nomes de utilizador nas respostas"
 }
diff --git a/config/locales-glitch/no.yml b/config/locales-glitch/no.yml
index d36c60a4ac0a92..d2a4697e5dc65e 100644
--- a/config/locales-glitch/no.yml
+++ b/config/locales-glitch/no.yml
@@ -1 +1 @@
-'no':
+no:
diff --git a/config/locales-glitch/simple_form.no.yml b/config/locales-glitch/simple_form.no.yml
index d36c60a4ac0a92..d2a4697e5dc65e 100644
--- a/config/locales-glitch/simple_form.no.yml
+++ b/config/locales-glitch/simple_form.no.yml
@@ -1 +1 @@
-'no':
+no:

From 57959642e3fb278b55f8321156fb54e8bdba6a29 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Sun, 9 Jun 2024 18:33:41 +0200
Subject: [PATCH 1221/2191] Fix bogus translations

---
 config/locales-glitch/no.yml             | 2 +-
 config/locales-glitch/simple_form.no.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/locales-glitch/no.yml b/config/locales-glitch/no.yml
index d2a4697e5dc65e..d36c60a4ac0a92 100644
--- a/config/locales-glitch/no.yml
+++ b/config/locales-glitch/no.yml
@@ -1 +1 @@
-no:
+'no':
diff --git a/config/locales-glitch/simple_form.no.yml b/config/locales-glitch/simple_form.no.yml
index d2a4697e5dc65e..d36c60a4ac0a92 100644
--- a/config/locales-glitch/simple_form.no.yml
+++ b/config/locales-glitch/simple_form.no.yml
@@ -1 +1 @@
-no:
+'no':

From 0cf91213c93e87ce775453ae20a3d9a7f9b4e8d0 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 10 Jun 2024 02:32:20 -0400
Subject: [PATCH 1222/2191] Opt in to remaining Rails 7.1 defaults (#30332)

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
---
 config/application.rb                         |   5 +-
 .../initializers/active_record_encryption.rb  |   5 +
 .../new_framework_defaults_7_1.rb             | 214 ------------------
 3 files changed, 8 insertions(+), 216 deletions(-)
 delete mode 100644 config/initializers/new_framework_defaults_7_1.rb

diff --git a/config/application.rb b/config/application.rb
index 069eb3774063cf..b3a9b99ff5b266 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -60,9 +60,10 @@
 module Mastodon
   class Application < Rails::Application
     # Initialize configuration defaults for originally generated Rails version.
-    config.load_defaults 7.0
+    config.load_defaults 7.1
 
-    config.active_record.marshalling_format_version = 7.1
+    # Explicitly set the cache format version to align with Rails version
+    config.active_support.cache_format_version = 7.1
 
     # Please, add to the `ignore` list any other `lib` subdirectories that do
     # not contain `.rb` files, or that should not be reloaded or eager loaded.
diff --git a/config/initializers/active_record_encryption.rb b/config/initializers/active_record_encryption.rb
index 777bafc2730d05..900f3c68f0d527 100644
--- a/config/initializers/active_record_encryption.rb
+++ b/config/initializers/active_record_encryption.rb
@@ -32,4 +32,9 @@
   config.active_record.encryption.deterministic_key = ENV.fetch('ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY')
   config.active_record.encryption.key_derivation_salt = ENV.fetch('ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT')
   config.active_record.encryption.primary_key = ENV.fetch('ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY')
+  config.active_record.encryption.support_sha1_for_non_deterministic_encryption = true
+
+  # TODO: https://github.com/rails/rails/issues/50604#issuecomment-1880990392
+  # Remove after updating to Rails 7.1.4
+  ActiveRecord::Encryption.configure(**config.active_record.encryption)
 end
diff --git a/config/initializers/new_framework_defaults_7_1.rb b/config/initializers/new_framework_defaults_7_1.rb
deleted file mode 100644
index bcc300c89f6f9c..00000000000000
--- a/config/initializers/new_framework_defaults_7_1.rb
+++ /dev/null
@@ -1,214 +0,0 @@
-# frozen_string_literal: true
-
-# Be sure to restart your server when you modify this file.
-#
-# This file eases your Rails 7.1 framework defaults upgrade.
-#
-# Uncomment each configuration one by one to switch to the new default.
-# Once your application is ready to run with all new defaults, you can remove
-# this file and set the `config.load_defaults` to `7.1`.
-#
-# Read the Guide for Upgrading Ruby on Rails for more info on each option.
-# https://guides.rubyonrails.org/upgrading_ruby_on_rails.html
-
-# No longer add autoloaded paths into `$LOAD_PATH`. This means that you won't be able
-# to manually require files that are managed by the autoloader, which you shouldn't do anyway.
-# This will reduce the size of the load path, making `require` faster if you don't use bootsnap, or reduce the size
-# of the bootsnap cache if you use it.
-Rails.application.config.add_autoload_paths_to_load_path = false
-
-# Remove the default X-Download-Options headers since it is used only by Internet Explorer.
-# If you need to support Internet Explorer, add back `"X-Download-Options" => "noopen"`.
-# Rails.application.config.action_dispatch.default_headers = {
-#   "X-Frame-Options" => "SAMEORIGIN",
-#   "X-XSS-Protection" => "0",
-#   "X-Content-Type-Options" => "nosniff",
-#   "X-Permitted-Cross-Domain-Policies" => "none",
-#   "Referrer-Policy" => "strict-origin-when-cross-origin"
-# }
-
-# Do not treat an `ActionController::Parameters` instance
-# as equal to an equivalent `Hash` by default.
-Rails.application.config.action_controller.allow_deprecated_parameters_hash_equality = false
-
-# Active Record Encryption now uses SHA-256 as its hash digest algorithm. Important: If you have
-# data encrypted with previous Rails versions, there are two scenarios to consider:
-#
-# 1. If you have +config.active_support.key_generator_hash_digest_class+ configured as SHA1 (the default
-# before Rails 7.0), you need to configure SHA-1 for Active Record Encryption too:
-# Rails.application.config.active_record.encryption.hash_digest_class = OpenSSL::Digest::SHA1
-# 2. If you have +config.active_support.key_generator_hash_digest_class+ configured as SHA256 (the new default
-# in 7.0), then you need to configure SHA-256 for Active Record Encryption:
-# Rails.application.config.active_record.encryption.hash_digest_class = OpenSSL::Digest::SHA256
-#
-# If you don't currently have data encrypted with Active Record encryption, you can disable this setting to
-# configure the default behavior starting 7.1+:
-# Rails.application.config.active_record.encryption.support_sha1_for_non_deterministic_encryption = false
-
-# No longer run after_commit callbacks on the first of multiple Active Record
-# instances to save changes to the same database row within a transaction.
-# Instead, run these callbacks on the instance most likely to have internal
-# state which matches what was committed to the database, typically the last
-# instance to save.
-Rails.application.config.active_record.run_commit_callbacks_on_first_saved_instances_in_transaction = false
-
-# Configures SQLite with a strict strings mode, which disables double-quoted string literals.
-#
-# SQLite has some quirks around double-quoted string literals.
-# It first tries to consider double-quoted strings as identifier names, but if they don't exist
-# it then considers them as string literals. Because of this, typos can silently go unnoticed.
-# For example, it is possible to create an index for a non existing column.
-# See https://www.sqlite.org/quirks.html#double_quoted_string_literals_are_accepted for more details.
-Rails.application.config.active_record.sqlite3_adapter_strict_strings_by_default = true
-
-# Disable deprecated singular associations names
-Rails.application.config.active_record.allow_deprecated_singular_associations_name = false
-
-# Enable the Active Job `BigDecimal` argument serializer, which guarantees
-# roundtripping. Without this serializer, some queue adapters may serialize
-# `BigDecimal` arguments as simple (non-roundtrippable) strings.
-#
-# When deploying an application with multiple replicas, old (pre-Rails 7.1)
-# replicas will not be able to deserialize `BigDecimal` arguments from this
-# serializer. Therefore, this setting should only be enabled after all replicas
-# have been successfully upgraded to Rails 7.1.
-# Rails.application.config.active_job.use_big_decimal_serializer = true
-
-# Specify if an `ArgumentError` should be raised if `Rails.cache` `fetch` or
-# `write` are given an invalid `expires_at` or `expires_in` time.
-# Options are `true`, and `false`. If `false`, the exception will be reported
-# as `handled` and logged instead.
-Rails.application.config.active_support.raise_on_invalid_cache_expiration_time = true
-
-# Specify whether Query Logs will format tags using the SQLCommenter format
-# (https://open-telemetry.github.io/opentelemetry-sqlcommenter/), or using the legacy format.
-# Options are `:legacy` and `:sqlcommenter`.
-Rails.application.config.active_record.query_log_tags_format = :sqlcommenter
-
-# Specify the default serializer used by `MessageEncryptor` and `MessageVerifier`
-# instances.
-#
-# The legacy default is `:marshal`, which is a potential vector for
-# deserialization attacks in cases where a message signing secret has been
-# leaked.
-#
-# In Rails 7.1, the new default is `:json_allow_marshal` which serializes and
-# deserializes with `ActiveSupport::JSON`, but can fall back to deserializing
-# with `Marshal` so that legacy messages can still be read.
-#
-# In Rails 7.2, the default will become `:json` which serializes and
-# deserializes with `ActiveSupport::JSON` only.
-#
-# Alternatively, you can choose `:message_pack` or `:message_pack_allow_marshal`,
-# which serialize with `ActiveSupport::MessagePack`. `ActiveSupport::MessagePack`
-# can roundtrip some Ruby types that are not supported by JSON, and may provide
-# improved performance, but it requires the `msgpack` gem.
-#
-# For more information, see
-# https://guides.rubyonrails.org/v7.1/configuring.html#config-active-support-message-serializer
-#
-# If you are performing a rolling deploy of a Rails 7.1 upgrade, wherein servers
-# that have not yet been upgraded must be able to read messages from upgraded
-# servers, first deploy without changing the serializer, then set the serializer
-# in a subsequent deploy.
-# Rails.application.config.active_support.message_serializer = :json_allow_marshal
-
-# Enable a performance optimization that serializes message data and metadata
-# together. This changes the message format, so messages serialized this way
-# cannot be read by older versions of Rails. However, messages that use the old
-# format can still be read, regardless of whether this optimization is enabled.
-#
-# To perform a rolling deploy of a Rails 7.1 upgrade, wherein servers that have
-# not yet been upgraded must be able to read messages from upgraded servers,
-# leave this optimization off on the first deploy, then enable it on a
-# subsequent deploy.
-# Rails.application.config.active_support.use_message_serializer_for_metadata = true
-
-# Set the maximum size for Rails log files.
-#
-# `config.load_defaults 7.1` does not set this value for environments other than
-# development and test.
-#
-Rails.application.config.log_file_size = 100 * 1024 * 1024 if Rails.env.local?
-
-# Enable raising on assignment to attr_readonly attributes. The previous
-# behavior would allow assignment but silently not persist changes to the
-# database.
-Rails.application.config.active_record.raise_on_assign_to_attr_readonly = true
-
-# Enable validating only parent-related columns for presence when the parent is mandatory.
-# The previous behavior was to validate the presence of the parent record, which performed an extra query
-# to get the parent every time the child record was updated, even when parent has not changed.
-Rails.application.config.active_record.belongs_to_required_validates_foreign_key = false
-
-# Enable precompilation of `config.filter_parameters`. Precompilation can
-# improve filtering performance, depending on the quantity and types of filters.
-Rails.application.config.precompile_filter_parameters = true
-
-# Enable before_committed! callbacks on all enrolled records in a transaction.
-# The previous behavior was to only run the callbacks on the first copy of a record
-# if there were multiple copies of the same record enrolled in the transaction.
-Rails.application.config.active_record.before_committed_on_all_records = true
-
-# Disable automatic column serialization into YAML.
-# To keep the historic behavior, you can set it to `YAML`, however it is
-# recommended to explicitly define the serialization method for each column
-# rather than to rely on a global default.
-Rails.application.config.active_record.default_column_serializer = nil
-
-# Run `after_commit` and `after_*_commit` callbacks in the order they are defined in a model.
-# This matches the behaviour of all other callbacks.
-# In previous versions of Rails, they ran in the inverse order.
-Rails.application.config.active_record.run_after_transaction_callbacks_in_order_defined = true
-
-# Whether a `transaction` block is committed or rolled back when exited via `return`, `break` or `throw`.
-#
-# Rails.application.config.active_record.commit_transaction_on_non_local_return = true
-
-# Controls when to generate a value for <tt>has_secure_token</tt> declarations.
-#
-Rails.application.config.active_record.generate_secure_token_on = :initialize
-
-# ** Please read carefully, this must be configured in config/application.rb **
-# Change the format of the cache entry.
-# Changing this default means that all new cache entries added to the cache
-# will have a different format that is not supported by Rails 7.0
-# applications.
-# Only change this value after your application is fully deployed to Rails 7.1
-# and you have no plans to rollback.
-# When you're ready to change format, add this to `config/application.rb` (NOT
-# this file):
-#   config.active_support.cache_format_version = 7.1
-
-# Configure Action View to use HTML5 standards-compliant sanitizers when they are supported on your
-# platform.
-#
-# `Rails::HTML::Sanitizer.best_supported_vendor` will cause Action View to use HTML5-compliant
-# sanitizers if they are supported, else fall back to HTML4 sanitizers.
-#
-# In previous versions of Rails, Action View always used `Rails::HTML4::Sanitizer` as its vendor.
-#
-Rails.application.config.action_view.sanitizer_vendor = Rails::HTML::Sanitizer.best_supported_vendor
-
-# Configure Action Text to use an HTML5 standards-compliant sanitizer when it is supported on your
-# platform.
-#
-# `Rails::HTML::Sanitizer.best_supported_vendor` will cause Action Text to use HTML5-compliant
-# sanitizers if they are supported, else fall back to HTML4 sanitizers.
-#
-# In previous versions of Rails, Action Text always used `Rails::HTML4::Sanitizer` as its vendor.
-#
-# Rails.application.config.action_text.sanitizer_vendor = Rails::HTML::Sanitizer.best_supported_vendor
-
-# Configure the log level used by the DebugExceptions middleware when logging
-# uncaught exceptions during requests
-# Rails.application.config.action_dispatch.debug_exception_log_level = :error
-
-# Configure the test helpers in Action View, Action Dispatch, and rails-dom-testing to use HTML5
-# parsers.
-#
-# Nokogiri::HTML5 isn't supported on JRuby, so JRuby applications must set this to :html4.
-#
-# In previous versions of Rails, these test helpers always used an HTML4 parser.
-#
-Rails.application.config.dom_testing_default_html_version = :html5

From 77c2216e47c8ffba4dde91c1a300cf924a8e5c05 Mon Sep 17 00:00:00 2001
From: Daniel M Brasil <danielmbrasil@protonmail.com>
Date: Mon, 10 Jun 2024 10:33:48 -0300
Subject: [PATCH 1223/2191] fix: Return HTTP 422 when scheduled status time is
 less than 5 minutes (#30584)

---
 app/services/post_status_service.rb       |  2 +-
 spec/requests/api/v1/statuses_spec.rb     | 26 +++++++++++++++++++++++
 spec/services/post_status_service_spec.rb | 10 +++++++++
 3 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/app/services/post_status_service.rb b/app/services/post_status_service.rb
index 83a93181709b6c..8b18ce038d8d47 100644
--- a/app/services/post_status_service.rb
+++ b/app/services/post_status_service.rb
@@ -171,7 +171,7 @@ def idempotency_duplicate?
   end
 
   def scheduled_in_the_past?
-    @scheduled_at.present? && @scheduled_at <= Time.now.utc + MIN_SCHEDULE_OFFSET
+    @scheduled_at.present? && @scheduled_at <= Time.now.utc
   end
 
   def bump_potential_friendship!
diff --git a/spec/requests/api/v1/statuses_spec.rb b/spec/requests/api/v1/statuses_spec.rb
index 694861fb1c3f8e..2f99b35e74fa0d 100644
--- a/spec/requests/api/v1/statuses_spec.rb
+++ b/spec/requests/api/v1/statuses_spec.rb
@@ -193,6 +193,32 @@
           expect(response).to have_http_status(404)
         end
       end
+
+      context 'when scheduling a status' do
+        let(:params) { { status: 'Hello world', scheduled_at: 10.minutes.from_now } }
+        let(:account) { user.account }
+
+        it 'returns HTTP 200' do
+          subject
+
+          expect(response).to have_http_status(200)
+        end
+
+        it 'creates a scheduled status' do
+          expect { subject }.to change { account.scheduled_statuses.count }.from(0).to(1)
+        end
+
+        context 'when the scheduling time is less than 5 minutes' do
+          let(:params) { { status: 'Hello world', scheduled_at: 4.minutes.from_now } }
+
+          it 'does not create a scheduled status', :aggregate_failures do
+            subject
+
+            expect(response).to have_http_status(422)
+            expect(account.scheduled_statuses).to be_empty
+          end
+        end
+      end
     end
 
     describe 'DELETE /api/v1/statuses/:id' do
diff --git a/spec/services/post_status_service_spec.rb b/spec/services/post_status_service_spec.rb
index 11bf4c30ea3adf..f21548b5f2c1d5 100644
--- a/spec/services/post_status_service_spec.rb
+++ b/spec/services/post_status_service_spec.rb
@@ -61,6 +61,16 @@
       status2 = subject.call(account, text: 'test', idempotency: 'meepmeep', scheduled_at: future)
       expect(status2.id).to eq status1.id
     end
+
+    context 'when scheduled_at is less than min offset' do
+      let(:invalid_scheduled_time) { 4.minutes.from_now }
+
+      it 'raises invalid record error' do
+        expect do
+          subject.call(account, text: 'Hi future!', scheduled_at: invalid_scheduled_time)
+        end.to raise_error(ActiveRecord::RecordInvalid)
+      end
+    end
   end
 
   it 'creates response to the original status of boost' do

From 801f9feec3d23be013751a3c468356a1c3c6ddf7 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 10 Jun 2024 15:52:57 +0200
Subject: [PATCH 1224/2191] chore(deps): update dependency concurrent-ruby to
 v1.3.3 (#30605)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 8ff990260b6309..93877e15d86177 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -168,7 +168,7 @@ GEM
     climate_control (1.2.0)
     cocoon (1.2.15)
     color_diff (0.1)
-    concurrent-ruby (1.3.1)
+    concurrent-ruby (1.3.3)
     connection_pool (2.4.1)
     cose (1.3.0)
       cbor (~> 0.5.9)

From bfd674d819327b4af3053ec35aea96f0c9e36428 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 10 Jun 2024 16:04:44 +0200
Subject: [PATCH 1225/2191] chore(deps): update dependency httplog to '~>
 1.7.0' (#30613)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 136d074d3318d7..be02a656263944 100644
--- a/Gemfile
+++ b/Gemfile
@@ -57,7 +57,7 @@ gem 'hiredis', '~> 0.6'
 gem 'htmlentities', '~> 4.3'
 gem 'http', '~> 5.2.0'
 gem 'http_accept_language', '~> 2.1'
-gem 'httplog', '~> 1.6.2'
+gem 'httplog', '~> 1.7.0'
 gem 'i18n'
 gem 'idn-ruby', require: 'idn'
 gem 'inline_svg'
diff --git a/Gemfile.lock b/Gemfile.lock
index 93877e15d86177..812e23a852bef2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -321,7 +321,7 @@ GEM
     http-form_data (2.3.0)
     http_accept_language (2.1.1)
     httpclient (2.8.3)
-    httplog (1.6.3)
+    httplog (1.7.0)
       rack (>= 2.0)
       rainbow (>= 2.0.0)
     i18n (1.14.5)
@@ -947,7 +947,7 @@ DEPENDENCIES
   htmlentities (~> 4.3)
   http (~> 5.2.0)
   http_accept_language (~> 2.1)
-  httplog (~> 1.6.2)
+  httplog (~> 1.7.0)
   i18n
   i18n-tasks (~> 1.0)
   idn-ruby

From 2dca6ec77ad8be8674cde103578c416095a3522b Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 10 Jun 2024 16:05:57 +0200
Subject: [PATCH 1226/2191] chore(deps): update dependency oj to v3.16.4
 (#30620)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 812e23a852bef2..095433981aaa21 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -453,7 +453,7 @@ GEM
       concurrent-ruby (~> 1.0, >= 1.0.2)
       sidekiq (>= 3.5)
       statsd-ruby (~> 1.4, >= 1.4.0)
-    oj (3.16.3)
+    oj (3.16.4)
       bigdecimal (>= 3.0)
     omniauth (2.1.2)
       hashie (>= 3.4.6)

From 452872412dd5a3af0ca9186726bf5a5fb8038856 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 10 Jun 2024 16:07:35 +0200
Subject: [PATCH 1227/2191] chore(deps): update dependency @types/lodash to
 v4.17.5 (#30627)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index dcc17d65990acc..e3d3bebeb15afa 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3712,9 +3712,9 @@ __metadata:
   linkType: hard
 
 "@types/lodash@npm:^4.14.195":
-  version: 4.17.4
-  resolution: "@types/lodash@npm:4.17.4"
-  checksum: 10c0/0124c64cb9fe7a0f78b6777955abd05ef0d97844d49118652eae45f8fa57bfb7f5a7a9bccc0b5a84c0a6dc09631042e4590cb665acb9d58dfd5e6543c75341ec
+  version: 4.17.5
+  resolution: "@types/lodash@npm:4.17.5"
+  checksum: 10c0/55924803ed853e72261512bd3eaf2c5b16558c3817feb0a3125ef757afe46e54b86f33d1960e40b7606c0ddab91a96f47966bf5e6006b7abfd8994c13b04b19b
   languageName: node
   linkType: hard
 

From dd4a976122ac1da57ac011f84d71e168ad911cfe Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 10 Jun 2024 16:08:02 +0200
Subject: [PATCH 1228/2191] chore(deps): update devdependencies (non-major)
 (#30628)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index e3d3bebeb15afa..8a1f96b69a6f54 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -13062,8 +13062,8 @@ __metadata:
   linkType: hard
 
 "pino-pretty@npm:^11.0.0":
-  version: 11.1.0
-  resolution: "pino-pretty@npm:11.1.0"
+  version: 11.2.0
+  resolution: "pino-pretty@npm:11.2.0"
   dependencies:
     colorette: "npm:^2.0.7"
     dateformat: "npm:^4.6.3"
@@ -13081,7 +13081,7 @@ __metadata:
     strip-json-comments: "npm:^3.1.1"
   bin:
     pino-pretty: bin.js
-  checksum: 10c0/418be6f854b0d62c83c65e75b0969d5311792bfadeefbfe77d8a7f8c5ba26b8bea40f549222b5f500439f440eb4d6c2fa99d712bdd02881ebae7be3a0193b581
+  checksum: 10c0/59421522c0e07877614ed8b51eb45fe79aad9865244b95dfaf5e28c83f9e95631941b5b9e37a277d1751ed90903d7593915e8a8857cc856b4af7e6bf20a5f97d
   languageName: node
   linkType: hard
 
@@ -14022,11 +14022,11 @@ __metadata:
   linkType: hard
 
 "prettier@npm:^3.0.0":
-  version: 3.3.0
-  resolution: "prettier@npm:3.3.0"
+  version: 3.3.1
+  resolution: "prettier@npm:3.3.1"
   bin:
     prettier: bin/prettier.cjs
-  checksum: 10c0/d033c356320aa2e468bf29c931b094ac730d2f4defd5eb2989d8589313dec901d2fc866e3788f3d161e420b142ea4ec3dda535dbe0169ef4d0026397a68ba9cf
+  checksum: 10c0/c25a709c9f0be670dc6bcb190b622347e1dbeb6c3e7df8b0711724cb64d8647c60b839937a4df4df18e9cfb556c2b08ca9d24d9645eb5488a7fc032a2c4d5cb3
   languageName: node
   linkType: hard
 

From a6e0e167a71025b27719666906cfb5511734134e Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 10 Jun 2024 16:29:11 +0200
Subject: [PATCH 1229/2191] fix(deps): update dependency uuid to v10 (#30624)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 streaming/package.json |  2 +-
 yarn.lock              | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/streaming/package.json b/streaming/package.json
index cf1fe4ba69b7a0..2e515167c7de57 100644
--- a/streaming/package.json
+++ b/streaming/package.json
@@ -27,7 +27,7 @@
     "pino": "^9.0.0",
     "pino-http": "^10.0.0",
     "prom-client": "^15.0.0",
-    "uuid": "^9.0.0",
+    "uuid": "^10.0.0",
     "ws": "^8.12.1"
   },
   "devDependencies": {
diff --git a/yarn.lock b/yarn.lock
index 8a1f96b69a6f54..33cd7b481d414d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2942,7 +2942,7 @@ __metadata:
     prom-client: "npm:^15.0.0"
     typescript: "npm:^5.0.4"
     utf-8-validate: "npm:^6.0.3"
-    uuid: "npm:^9.0.0"
+    uuid: "npm:^10.0.0"
     ws: "npm:^8.12.1"
   dependenciesMeta:
     bufferutil:
@@ -17489,6 +17489,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"uuid@npm:^10.0.0":
+  version: 10.0.0
+  resolution: "uuid@npm:10.0.0"
+  bin:
+    uuid: dist/bin/uuid
+  checksum: 10c0/eab18c27fe4ab9fb9709a5d5f40119b45f2ec8314f8d4cf12ce27e4c6f4ffa4a6321dc7db6c515068fa373c075b49691ba969f0010bf37f44c37ca40cd6bf7fe
+  languageName: node
+  linkType: hard
+
 "uuid@npm:^3.3.2":
   version: 3.4.0
   resolution: "uuid@npm:3.4.0"
@@ -17507,15 +17516,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"uuid@npm:^9.0.0":
-  version: 9.0.1
-  resolution: "uuid@npm:9.0.1"
-  bin:
-    uuid: dist/bin/uuid
-  checksum: 10c0/1607dd32ac7fc22f2d8f77051e6a64845c9bce5cd3dd8aa0070c074ec73e666a1f63c7b4e0f4bf2bc8b9d59dc85a15e17807446d9d2b17c8485fbc2147b27f9b
-  languageName: node
-  linkType: hard
-
 "v8-compile-cache@npm:^2.1.1":
   version: 2.3.0
   resolution: "v8-compile-cache@npm:2.3.0"

From 589365ba52b5e982f31c7acbb0a264bc378e061b Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 10 Jun 2024 16:29:26 +0200
Subject: [PATCH 1230/2191] chore(deps): update dependency rubocop-capybara to
 v2.21.0 (#30611)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 095433981aaa21..4d16fea47cb973 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -578,7 +578,7 @@ GEM
       opentelemetry-api (~> 1.0)
     orm_adapter (0.5.0)
     ox (2.14.18)
-    parallel (1.24.0)
+    parallel (1.25.1)
     parser (3.3.2.0)
       ast (~> 2.4.1)
       racc
@@ -739,7 +739,7 @@ GEM
       unicode-display_width (>= 2.4.0, < 3.0)
     rubocop-ast (1.31.3)
       parser (>= 3.3.1.0)
-    rubocop-capybara (2.20.0)
+    rubocop-capybara (2.21.0)
       rubocop (~> 1.41)
     rubocop-factory_bot (2.25.1)
       rubocop (~> 1.41)

From bb27321781778d4d849dd0a4c2f16747f85f1a3d Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 10 Jun 2024 16:29:30 +0200
Subject: [PATCH 1231/2191] New Crowdin Translations (automated) (#30608)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/eo.json    |   7 ++
 app/javascript/mastodon/locales/fr-CA.json |   6 +-
 app/javascript/mastodon/locales/fr.json    |   6 +-
 app/javascript/mastodon/locales/ia.json    |   4 +-
 app/javascript/mastodon/locales/id.json    |  10 ++
 app/javascript/mastodon/locales/la.json    | 125 +++++++++++++++++++--
 config/locales/devise.la.yml               |   7 ++
 config/locales/doorkeeper.ja.yml           |   2 +
 config/locales/doorkeeper.lad.yml          |   2 +
 config/locales/doorkeeper.lt.yml           |   2 +
 config/locales/doorkeeper.sv.yml           |   1 +
 config/locales/doorkeeper.th.yml           |   2 +
 config/locales/doorkeeper.vi.yml           |   2 +
 config/locales/id.yml                      |   6 +
 config/locales/la.yml                      |  33 ++++++
 config/locales/nl.yml                      |   4 +-
 config/locales/simple_form.id.yml          |   3 +
 config/locales/th.yml                      |   4 +-
 18 files changed, 204 insertions(+), 22 deletions(-)

diff --git a/app/javascript/mastodon/locales/eo.json b/app/javascript/mastodon/locales/eo.json
index 6e7885f485bc90..2dbbf787730920 100644
--- a/app/javascript/mastodon/locales/eo.json
+++ b/app/javascript/mastodon/locales/eo.json
@@ -498,7 +498,14 @@
   "poll_button.add_poll": "Aldoni balotenketon",
   "poll_button.remove_poll": "Forigi balotenketon",
   "privacy.change": "Agordi mesaĝan privatecon",
+  "privacy.direct.long": "Ĉiuj menciitaj en la afiŝo",
+  "privacy.direct.short": "Specifaj homoj",
+  "privacy.private.long": "Nur viaj sekvantoj",
+  "privacy.private.short": "Sekvantoj",
+  "privacy.public.long": "Ĉiujn ajn ĉe kaj ekster Mastodon",
   "privacy.public.short": "Publika",
+  "privacy.unlisted.long": "Malpli algoritmaj fanfaroj",
+  "privacy.unlisted.short": "Diskrete publika",
   "privacy_policy.last_updated": "Laste ĝisdatigita en {date}",
   "privacy_policy.title": "Politiko de privateco",
   "recommended": "Rekomendita",
diff --git a/app/javascript/mastodon/locales/fr-CA.json b/app/javascript/mastodon/locales/fr-CA.json
index 9e29852904107c..9c14d05d5c88a9 100644
--- a/app/javascript/mastodon/locales/fr-CA.json
+++ b/app/javascript/mastodon/locales/fr-CA.json
@@ -156,7 +156,7 @@
   "compose_form.poll.duration": "Durée du sondage",
   "compose_form.poll.multiple": "Choix multiple",
   "compose_form.poll.option_placeholder": "Option {number}",
-  "compose_form.poll.single": "Choisissez-en un",
+  "compose_form.poll.single": "Choix unique",
   "compose_form.poll.switch_to_multiple": "Changer le sondage pour autoriser plusieurs choix",
   "compose_form.poll.switch_to_single": "Changer le sondage pour n'autoriser qu'un seul choix",
   "compose_form.poll.type": "Style",
@@ -585,9 +585,9 @@
   "privacy.private.short": "Abonnés",
   "privacy.public.long": "Tout le monde sur et en dehors de Mastodon",
   "privacy.public.short": "Public",
-  "privacy.unlisted.additional": "Cette option se comporte exactement comme l'option publique, sauf que le message n'apparaîtra pas dans les flux en direct, les hashtags, l'exploration ou la recherche Mastodon, même si vous avez opté pour l'option publique pour l'ensemble de votre compte.",
+  "privacy.unlisted.additional": "Se comporte exactement comme « public », sauf que le message n'apparaîtra pas dans les flux en direct, les hashtags, explorer ou la recherche Mastodon, même si vous les avez activé au niveau de votre compte.",
   "privacy.unlisted.long": "Moins de fanfares algorithmiques",
-  "privacy.unlisted.short": "Public calme",
+  "privacy.unlisted.short": "Public discret",
   "privacy_policy.last_updated": "Dernière mise à jour {date}",
   "privacy_policy.title": "Politique de confidentialité",
   "recommended": "Recommandé",
diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json
index 1a5803623f0037..36ec673a475b28 100644
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@@ -156,7 +156,7 @@
   "compose_form.poll.duration": "Durée du sondage",
   "compose_form.poll.multiple": "Choix multiple",
   "compose_form.poll.option_placeholder": "Option {number}",
-  "compose_form.poll.single": "Choisissez-en un",
+  "compose_form.poll.single": "Choix unique",
   "compose_form.poll.switch_to_multiple": "Changer le sondage pour autoriser plusieurs choix",
   "compose_form.poll.switch_to_single": "Modifier le sondage pour autoriser qu'un seul choix",
   "compose_form.poll.type": "Style",
@@ -585,9 +585,9 @@
   "privacy.private.short": "Abonnés",
   "privacy.public.long": "Tout le monde sur et en dehors de Mastodon",
   "privacy.public.short": "Public",
-  "privacy.unlisted.additional": "Cette option se comporte exactement comme l'option publique, sauf que le message n'apparaîtra pas dans les flux en direct, les hashtags, l'exploration ou la recherche Mastodon, même si vous avez opté pour l'option publique pour l'ensemble de votre compte.",
+  "privacy.unlisted.additional": "Se comporte exactement comme « public », sauf que le message n'apparaîtra pas dans les flux en direct, les hashtags, explorer ou la recherche Mastodon, même si vous les avez activé au niveau de votre compte.",
   "privacy.unlisted.long": "Moins de fanfares algorithmiques",
-  "privacy.unlisted.short": "Public calme",
+  "privacy.unlisted.short": "Public discret",
   "privacy_policy.last_updated": "Dernière mise à jour {date}",
   "privacy_policy.title": "Politique de confidentialité",
   "recommended": "Recommandé",
diff --git a/app/javascript/mastodon/locales/ia.json b/app/javascript/mastodon/locales/ia.json
index ce4e89e99a2c02..ed33a45d45047d 100644
--- a/app/javascript/mastodon/locales/ia.json
+++ b/app/javascript/mastodon/locales/ia.json
@@ -19,7 +19,7 @@
   "account.block_domain": "Blocar dominio {domain}",
   "account.block_short": "Blocar",
   "account.blocked": "Blocate",
-  "account.browse_more_on_origin_server": "Percurrer plus sur le profilo original",
+  "account.browse_more_on_origin_server": "Explorar plus sur le profilo original",
   "account.cancel_follow_request": "Cancellar sequimento",
   "account.copy": "Copiar ligamine a profilo",
   "account.direct": "Mentionar privatemente @{name}",
@@ -111,7 +111,7 @@
   "bundle_modal_error.message": "Un error ha occurrite durante le cargamento de iste componente.",
   "bundle_modal_error.retry": "Tentar novemente",
   "closed_registrations.other_server_instructions": "Perque Mastodon es decentralisate, tu pote crear un conto sur un altere servitor e totevia interager con iste servitor.",
-  "closed_registrations_modal.description": "Crear un conto in {domain} actualmente non es possibile, ma considera que non es necessari haber un conto specificamente sur {domain} pro usar Mastodon.",
+  "closed_registrations_modal.description": "Crear un conto sur {domain} non es actualmente possibile, ma considera que non es necessari haber un conto specificamente sur {domain} pro usar Mastodon.",
   "closed_registrations_modal.find_another_server": "Cercar un altere servitor",
   "closed_registrations_modal.preamble": "Mastodon es decentralisate, dunque, non importa ubi tu crea tu conto, tu pote sequer e communicar con omne persona sur iste servitor. Tu pote mesmo hospitar tu proprie servitor!",
   "closed_registrations_modal.title": "Crear un conto sur Mastodon",
diff --git a/app/javascript/mastodon/locales/id.json b/app/javascript/mastodon/locales/id.json
index 33161f888251d9..79224c57df1f7d 100644
--- a/app/javascript/mastodon/locales/id.json
+++ b/app/javascript/mastodon/locales/id.json
@@ -299,6 +299,11 @@
   "follow_suggestions.dismiss": "Jangan tampilkan lagi",
   "follow_suggestions.hints.featured": "Profil ini telah dipilih sendiri oleh tim {domain}.",
   "follow_suggestions.hints.friends_of_friends": "Profil ini populer di kalangan orang yang anda ikuti.",
+  "follow_suggestions.personalized_suggestion": "Saran yang dipersonalisasi",
+  "follow_suggestions.popular_suggestion": "Saran populer",
+  "follow_suggestions.popular_suggestion_longer": "Populer di {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Serupa dengan profil yang baru Anda ikuti",
+  "follow_suggestions.view_all": "Lihat semua",
   "followed_tags": "Tagar yang diikuti",
   "footer.about": "Tentang",
   "footer.directory": "Direktori profil",
@@ -324,6 +329,7 @@
   "home.column_settings.show_reblogs": "Tampilkan boost",
   "home.column_settings.show_replies": "Tampilkan balasan",
   "home.hide_announcements": "Sembunyikan pengumuman",
+  "home.pending_critical_update.link": "Lihat pembaruan",
   "home.show_announcements": "Tampilkan pengumuman",
   "interaction_modal.description.follow": "Dengan sebuah akun di Mastodon, Anda bisa mengikuti {name} untuk menerima kirimannya di beranda Anda.",
   "interaction_modal.description.reblog": "Dengan sebuah akun di Mastodon, Anda bisa mem-boost kiriman ini untuk membagikannya ke pengikut Anda sendiri.",
@@ -375,6 +381,7 @@
   "lightbox.previous": "Sebelumnya",
   "limited_account_hint.action": "Tetap tampilkan profil",
   "limited_account_hint.title": "Profil ini telah disembunyikan oleh moderator {domain}.",
+  "link_preview.author": "Oleh {name}",
   "lists.account.add": "Tambah ke daftar",
   "lists.account.remove": "Hapus dari daftar",
   "lists.delete": "Hapus daftar",
@@ -389,8 +396,11 @@
   "lists.search": "Cari di antara orang yang Anda ikuti",
   "lists.subheading": "Daftar Anda",
   "load_pending": "{count, plural, other {# item baru}}",
+  "loading_indicator.label": "Memuat…",
   "media_gallery.toggle_visible": "Tampil/Sembunyikan",
   "moved_to_account_banner.text": "Akun {disabledAccount} Anda kini dinonaktifkan karena Anda pindah ke {movedToAccount}.",
+  "mute_modal.hide_options": "Sembunyikan opsi",
+  "mute_modal.title": "Bisukan pengguna?",
   "navigation_bar.about": "Tentang",
   "navigation_bar.blocks": "Pengguna diblokir",
   "navigation_bar.bookmarks": "Markah",
diff --git a/app/javascript/mastodon/locales/la.json b/app/javascript/mastodon/locales/la.json
index a49ec94d726b24..4bee0efed47c98 100644
--- a/app/javascript/mastodon/locales/la.json
+++ b/app/javascript/mastodon/locales/la.json
@@ -1,7 +1,9 @@
 {
   "about.contact": "Ratio:",
   "about.domain_blocks.no_reason_available": "Ratio abdere est",
+  "about.domain_blocks.silenced.explanation": "Tua profilia atque tuum contentum ab hac serve praecipue non videbis, nisi explōrēs expresse aut subsequeris et optēs.",
   "account.account_note_header": "Annotatio",
+  "account.add_or_remove_from_list": "Adde aut ēripe ex tabellīs",
   "account.badges.bot": "Robotum",
   "account.badges.group": "Congregatio",
   "account.block": "Impedire @{name}",
@@ -11,11 +13,21 @@
   "account.domain_blocked": "Dominium impeditum",
   "account.edit_profile": "Recolere notionem",
   "account.featured_tags.last_status_never": "Nulla contributa",
+  "account.featured_tags.title": "Hashtag notātī {name}",
+  "account.followers_counter": "{count, plural, one {{counter} Sectator} other {{counter} Sectatores}}",
+  "account.following_counter": "{count, plural, one {{counter} Sequens} other {{counter} Sequentes}}",
+  "account.moved_to": "{name} significavit eum suam rationem novam nunc esse:",
   "account.muted": "Confutatus",
+  "account.requested_follow": "{name} postulavit ut te sequeretur",
+  "account.statuses_counter": "{count, plural, one {{counter} Nuntius} other {{counter} Nuntii}}",
   "account.unblock_short": "Solvere impedimentum",
   "account_note.placeholder": "Click to add a note",
   "admin.dashboard.retention.average": "Mediocritas",
+  "admin.impact_report.instance_accounts": "Rationes perfiles hoc deleret",
+  "alert.unexpected.message": "Error inopinatus occurrit.",
   "announcement.announcement": "Proclamatio",
+  "attachments_list.unprocessed": "(immūtātus)",
+  "block_modal.you_wont_see_mentions": "Nuntios quibus eos commemorant non videbis.",
   "bundle_column_error.error.title": "Eheu!",
   "bundle_column_error.retry": "Retemptare",
   "bundle_column_error.routing.title": "CCCCIIII",
@@ -37,26 +49,55 @@
   "compose_form.placeholder": "What is on your mind?",
   "compose_form.publish_form": "Barrire",
   "compose_form.spoiler.marked": "Text is hidden behind warning",
-  "compose_form.spoiler.unmarked": "Text is not hidden",
+  "compose_form.spoiler.unmarked": "Adde praeconium contentūs",
   "confirmations.block.confirm": "Impedire",
   "confirmations.delete.confirm": "Oblitterare",
   "confirmations.delete.message": "Are you sure you want to delete this status?",
   "confirmations.delete_list.confirm": "Oblitterare",
+  "confirmations.discard_edit_media.message": "Habēs mutationēs in descriptionem vel prōspectum medii quae nōn sunt servātae; eas dēmittam?",
   "confirmations.mute.confirm": "Confutare",
   "confirmations.reply.confirm": "Respondere",
+  "disabled_account_banner.account_settings": "Praeferentiae ratiōnis",
+  "disabled_account_banner.text": "Ratio tua {disabledAccount} debilitata est.",
   "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
   "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.",
+  "domain_block_modal.you_will_lose_followers": "Omnes sectatores tuī ex hoc servō removēbuntur.",
+  "domain_block_modal.you_wont_see_posts": "Nuntios aut notificātiōnēs ab usoribus in hōc servō nōn vidēbis.",
+  "domain_pill.activitypub_like_language": "ActivityPub est velut lingua quam Mastodon cum aliīs sociālibus rētibus loquitur.",
+  "domain_pill.your_handle": "Tuus nominulus:",
+  "domain_pill.your_server": "Tua domus digitalis, ubi omnia tua nuntia habitant. Hanc non amas? Servēs trānsferāre potes quōcumque tempore et sectātōrēs tuōs simul addūcere.",
+  "domain_pill.your_username": "Tuō singulāre id indicium in hōc servō est. Est possibile invenīre usōrēs cum eōdem nōmine in servīs aliīs.",
   "embed.instructions": "Embed this status on your website by copying the code below.",
+  "emoji_button.activity": "Actiō",
   "emoji_button.food": "Cibus et potus",
   "emoji_button.people": "Homines",
   "emoji_button.search": "Quaerere...",
+  "empty_column.account_suspended": "Rātiō suspēnsa",
   "empty_column.account_timeline": "Hic nulla contributa!",
   "empty_column.account_unavailable": "Notio non impetrabilis",
-  "empty_column.home": "Your home timeline is empty! Follow more people to fill it up. {suggestions}",
+  "empty_column.blocks": "Nondum quemquam usorem obsēcāvisti.",
+  "empty_column.direct": "Nōn habēs adhūc ullo mentionēs prīvātās. Cum ūnam mīseris aut accipis, hīc apparēbit.",
+  "empty_column.followed_tags": "Nōn adhūc aliquem hastāginem secūtus es. Cum id fēceris, hic ostendētur.",
+  "empty_column.home": "Tua linea temporum domesticus vacua est! Sequere plures personas ut eam compleas.",
   "empty_column.list": "There is nothing in this list yet. When members of this list post new statuses, they will appear here.",
+  "empty_column.lists": "Nōn adhūc habēs ullo tabellās. Cum creās, hīc apparēbunt.",
+  "empty_column.mutes": "Nondum quemquam usorem tacuisti.",
+  "empty_column.notification_requests": "Omnia clara sunt! Nihil hic est. Cum novās notificātiōnēs accipīs, hic secundum tua praecepta apparebunt.",
+  "empty_column.notifications": "Nōn adhūc habēs ullo notificātiōnēs. Cum aliī tē interagunt, hīc videbis.",
   "explore.trending_statuses": "Contributa",
+  "filtered_notifications_banner.mentions": "{count, plural, one {mentiō} other {mentiōnēs}}",
+  "firehose.all": "Omnis",
+  "footer.about": "De",
   "generic.saved": "Servavit",
+  "hashtag.column_settings.tag_mode.all": "Haec omnia",
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+  "hashtag.counter_by_accounts": "{count, plural, one {{counter} particeps} other {{counter} participēs}}",
+  "hashtag.counter_by_uses": "{count, plural, one {{counter} nuntius} other {{counter} nuntii}}",
+  "hashtag.counter_by_uses_today": "{count, plural, one {{counter} nuntius} other {{counter} nuntii}} hodie",
+  "hashtags.and_other": "…et {count, plural, other {# plus}}",
+  "intervals.full.days": "{number, plural, one {# die} other {# dies}}",
+  "intervals.full.hours": "{number, plural, one {# hora} other {# horae}}",
+  "intervals.full.minutes": "{number, plural, one {# minutum} other {# minuta}}",
   "keyboard_shortcuts.back": "Re navigare",
   "keyboard_shortcuts.blocked": "Aperire listam usorum obstructorum",
   "keyboard_shortcuts.boost": "Inlustrare publicatio",
@@ -90,18 +131,47 @@
   "keyboard_shortcuts.up": "to move up in the list",
   "lightbox.close": "Claudere",
   "lightbox.next": "Secundum",
+  "lists.account.add": "Adde ad tabellās",
+  "lists.new.create": "Addere tabella",
+  "load_pending": "{count, plural, one {# novum item} other {# nova itema}}",
+  "media_gallery.toggle_visible": "{number, plural, one {Cēla imaginem} other {Cēla imagines}}",
+  "moved_to_account_banner.text": "Tua ratione {disabledAccount} interdum reposita est, quod ad {movedToAccount} migrāvisti.",
+  "mute_modal.you_wont_see_mentions": "Non videbis nuntios quī eōs commemorant.",
+  "navigation_bar.about": "De",
   "navigation_bar.domain_blocks": "Hidden domains",
-  "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
+  "not_signed_in_indicator.not_signed_in": "Ad hunc locum pervenire oportet ut inīre facias.",
+  "notification.admin.report": "{name} nuntiavit {target}",
+  "notification.admin.sign_up": "{name} subscripsit",
+  "notification.favourite": "{name} nuntium tuum favit",
+  "notification.follow": "{name} te secutus est",
+  "notification.follow_request": "{name} postulavit ut te sequeretur",
+  "notification.mention": "{name} memoravi",
+  "notification.moderation_warning": "Accepistī monitionem moderationis.",
+  "notification.moderation_warning.action_disable": "Ratio tua debilitata est.",
   "notification.moderation_warning.action_none": "Tua ratiō monitum moderātiōnis accēpit.",
-  "notification.reblog": "{name} boosted your status",
+  "notification.moderation_warning.action_sensitive": "Tua nuntia hinc sensibiliter notabuntur.",
+  "notification.moderation_warning.action_silence": "Ratio tua est limitata.",
+  "notification.moderation_warning.action_suspend": "Ratio tua suspensus est.",
+  "notification.own_poll": "Suffragium tuum terminatum est.",
+  "notification.poll": "Electione in quam suffragium dedisti finita est.",
+  "notification.reblog": "{name} tuum nuntium amplificavit.",
+  "notification.relationships_severance_event.account_suspension": "Admin ab {from} {target} suspendit, quod significat nōn iam posse tē novitātēs ab eīs accipere aut cum eīs interagere.",
+  "notification.relationships_severance_event.domain_block": "Admin ab {from} {target} obsēcāvit, includēns {followersCount} ex tuīs sectātōribus et {followingCount, plural, one {# ratione} other {# rationibus}} quās sequeris.",
+  "notification.relationships_severance_event.user_domain_block": "Bloqueāstī {target}, removēns {followersCount} ex sectātōribus tuīs et {followingCount, plural, one {# rationem} other {# rationēs}} quōs sequeris.",
+  "notification.status": "{name} nuper publicavit",
+  "notification.update": "{name} nuntium correxit",
+  "notification_requests.accept": "Accipe",
   "notifications.filter.all": "Omnia",
   "notifications.filter.polls": "Eventus electionis",
+  "notifications.group": "Notificātiōnēs",
   "onboarding.actions.go_to_explore": "See what's trending",
   "onboarding.actions.go_to_home": "Go to your home feed",
-  "onboarding.follows.lead": "You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!",
+  "onboarding.follows.lead": "Tua domus feed est principalis via Mastodon experīrī. Quō plūrēs persōnas sequeris, eō actīvior et interessantior erit. Ad tē incipiendum, ecce quaedam suāsiones:",
   "onboarding.follows.title": "Popular on Mastodon",
-  "onboarding.start.lead": "Your new Mastodon account is ready to go. Here's how you can make the most of it:",
+  "onboarding.profile.display_name_hint": "Tuum nomen completum aut tuum nomen ludens...",
+  "onboarding.start.lead": "Nunc pars es Mastodonis, singularis, socialis medii platformae decentralis ubi—non algorismus—tuam ipsius experientiam curas. Incipiāmus in nova hac socialis regione:",
   "onboarding.start.skip": "Want to skip right ahead?",
+  "onboarding.start.title": "Perfecisti eam!",
   "onboarding.steps.follow_people.body": "You curate your own feed. Lets fill it with interesting people.",
   "onboarding.steps.follow_people.title": "Follow {count, plural, one {one person} other {# people}}",
   "onboarding.steps.publish_status.body": "Say hello to the world.",
@@ -109,31 +179,48 @@
   "onboarding.steps.setup_profile.title": "Customize your profile",
   "onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
   "onboarding.steps.share_profile.title": "Share your profile",
-  "onboarding.tips.accounts_from_other_servers": "<strong>Scisne?</strong> Quoniam Mastodon dēcentālis est, nōnnulla profīlia quae invenīs in servīs aliīs quam tuōrum erunt hospitāta. Tamen cum eīs sine impedīmentō interāgere potes! Servus eōrum in alterā parte nōminis eōrum est!",
+  "onboarding.tips.2fa": "<strong>Scisne?</strong>  Tūam ratiōnem sēcūrāre potes duōrum elementōrum authentīcātiōnem in ratiōnis tuī praeferentiīs statuendō. Cum ūllā app TOTP ex tuā ēlēctiōne operātur, numerus tēlephōnicus necessārius nōn est!",
+  "onboarding.tips.accounts_from_other_servers": "<strong>Scisne?</strong> Quoniam Mastodon dēcentrālis est, nōnnulla profīlia quae invenīs in servīs aliīs quam tuōrum erunt hospitāta. Tamen cum eīs sine impedīmentō interāgere potes! Servus eōrum in alterā parte nōminis eōrum est!",
   "onboarding.tips.migration": "<strong>Scisne?</strong> Sī sentīs {domain} tibi in futūrō nōn esse optimam servī ēlēctiōnem, ad alium servum Mastodon sine amittendō sectātōribus tuīs migrāre potes. Etiam tuum servum hospitārī potes!",
+  "onboarding.tips.verification": "<strong>Scisne?</strong>  Tūam ratiōnem verificāre potes iungendō nexum ad prōfīlium Mastodon tuum in propriā pāginā interrētiā et addendō pāginam ad prōfīlium tuum. Nullae pecūniae aut documenta necessāria sunt!",
   "poll.closed": "Clausum",
+  "poll.total_people": "{count, plural, one {# persona} other {# personae}}",
+  "poll.total_votes": "{count, plural, one {# suffragium} other {# suffragia}}",
   "poll.vote": "Eligere",
   "poll.voted": "Elegisti hoc responsum",
+  "poll.votes": "{votes, plural, one {# sufragium} other {# sufragia}}",
   "poll_button.add_poll": "Addere electionem",
   "poll_button.remove_poll": "Auferre electionem",
   "privacy.change": "Adjust status privacy",
   "privacy.public.short": "Coram publico",
+  "regeneration_indicator.sublabel": "Tua domus feed praeparātur!",
+  "relative_time.full.days": "{number, plural, one {# ante die} other {# ante dies}}",
+  "relative_time.full.hours": "{number, plural, one {# ante horam} other {# ante horas}}",
   "relative_time.full.just_now": "nunc",
+  "relative_time.full.minutes": "{number, plural, one {# ante minutum} other {# ante minuta}}",
+  "relative_time.full.seconds": "{number, plural, one {# ante secundum} other {# ante secunda}}",
   "relative_time.just_now": "nunc",
   "relative_time.today": "hodie",
+  "reply_indicator.attachments": "{count, plural, one {# annexus} other {# annexūs}}",
   "report.block": "Impedimentum",
+  "report.block_explanation": "Non videbis eorum nuntios. Non poterunt vidēre tuōs nuntios aut tē sequī. Intelligere poterunt sē obstrūctōs esse.",
   "report.categories.other": "Altera",
   "report.category.title_account": "notio",
   "report.category.title_status": "contributum",
   "report.close": "Confectum",
   "report.mute": "Confutare",
+  "report.mute_explanation": "Non videbis eōrum nuntiōs. Possunt adhuc tē sequī et tuōs nuntiōs vidēre, nec sciēbunt sē tacitōs esse.",
   "report.next": "Secundum",
-  "report.placeholder": "Type or paste additional comments",
+  "report.placeholder": "Commentāriī adiūnctī",
   "report.submit": "Mittere",
   "report.target": "Report {target}",
-  "report_notification.attached_statuses": "{count, plural, one {# post} other {# posts}} attached",
+  "report_notification.attached_statuses": "{count, plural, one {{count} nuntius} other {{count} nuntii}} attachiatus",
   "report_notification.categories.other": "Altera",
   "search.placeholder": "Quaerere",
+  "search_results.all": "Omnis",
+  "server_banner.active_users": "Usūrāriī āctīvī",
+  "server_banner.administered_by": "Administratur:",
+  "server_banner.introduction": "{domain} pars est de rete sociali decentralizato a {mastodon} propulsato.",
   "server_banner.learn_more": "Discere plura",
   "sign_in_banner.sign_in": "Sign in",
   "status.admin_status": "Open this status in the moderation interface",
@@ -143,13 +230,29 @@
   "status.delete": "Oblitterare",
   "status.edit": "Recolere",
   "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
+  "status.favourites": "{count, plural, one {favoritum} other {favorita}}",
+  "status.history.created": "{name} creatum {date}",
+  "status.history.edited": "{name} correxit {date}",
   "status.open": "Expand this status",
-  "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
+  "status.reblogged_by": "{name} adiuvavit",
+  "status.reblogs": "{count, plural, one {auctus} other {auctūs}}",
+  "status.title.with_attachments": "{user} publicavit {attachmentCount, plural, one {unum annexum} other {{attachmentCount} annexa}}",
   "tabs_bar.home": "Domi",
+  "time_remaining.days": "{number, plural, one {# die} other {# dies}} restant",
+  "time_remaining.hours": "{number, plural, one {# hora} other {# horae}} restant",
+  "time_remaining.minutes": "{number, plural, one {# minutum} other {# minuta}} restant",
+  "time_remaining.seconds": "{number, plural, one {# secundum} other {# secunda}} restant",
+  "timeline_hint.remote_resource_not_displayed": "{resource} ab aliīs servīs nōn ostenduntur.",
   "timeline_hint.resources.statuses": "Contributa pristina",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {# days}}",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} persōna} other {{counter} persōnae}} in {days, plural, one {diē prīdiē} other {diēbus praeteritīs {days}}}",
+  "ui.beforeunload": "Si Mastodon discesseris, tua epitome peribit.",
+  "units.short.billion": "{count} millia milionum",
+  "units.short.million": "{count} milionum",
+  "units.short.thousand": "{count} millia",
+  "upload_button.label": "Imaginēs, vīdeō aut fīle audītūs adde",
   "upload_form.audio_description": "Describe for people who are hard of hearing",
   "upload_form.edit": "Recolere",
+  "upload_modal.description_placeholder": "A velox brunneis vulpes salit super piger canis",
   "upload_progress.label": "Uploading…",
   "video.mute": "Confutare soni"
 }
diff --git a/config/locales/devise.la.yml b/config/locales/devise.la.yml
index 3a7ba0d44589e5..a6fe5e1e4baeaa 100644
--- a/config/locales/devise.la.yml
+++ b/config/locales/devise.la.yml
@@ -1 +1,8 @@
+---
 la:
+  devise:
+    passwords:
+      send_instructions: Sī adresa tua epistularis in nostra basi datōrum exstat, vinculum ad recuperandam clavem adresa tua epistulari adferētur pauca momenta post. Sī autem hanc epistulam nōn recēpistī, rogāmus ut scrūtināriōnem spurcāriī tuī faciās.
+    registrations:
+      destroyed: Vale! Ratio tua succēssu cancellāta est. Spērāmus tē mox iterum vidēre.
+      signed_up_but_inactive: Te cōnscrīpsistī succēdāneē. At nōn potuimus tē introīre quod ratio* tua nōn adhūc est activāta.*
diff --git a/config/locales/doorkeeper.ja.yml b/config/locales/doorkeeper.ja.yml
index 62f2a3eb0ae415..26f7ff5635d996 100644
--- a/config/locales/doorkeeper.ja.yml
+++ b/config/locales/doorkeeper.ja.yml
@@ -135,6 +135,7 @@ ja:
         media: メディアの添付
         mutes: ミュート
         notifications: 通知
+        profile: Mastodonのプロフィール
         push: プッシュ通知
         reports: 通報
         search: 検索
@@ -165,6 +166,7 @@ ja:
       admin:write:reports: 通報に対するアクションの実行
       crypto: エンドツーエンド暗号化の使用
       follow: アカウントのつながりを変更
+      profile: アカウントのプロフィール情報の読み取りのみ
       push: プッシュ通知の受信
       read: アカウントのすべてのデータの読み取り
       read:accounts: アカウント情報の読み取り
diff --git a/config/locales/doorkeeper.lad.yml b/config/locales/doorkeeper.lad.yml
index b2c140b9c23c54..c335d67fd6ee09 100644
--- a/config/locales/doorkeeper.lad.yml
+++ b/config/locales/doorkeeper.lad.yml
@@ -135,6 +135,7 @@ lad:
         media: Aneksos de multimedia
         mutes: Silensiasyones
         notifications: Avizos
+        profile: Tu profil de Mastodon
         push: Avizos arrepushados
         reports: Raportos
         search: Bushkeda
@@ -165,6 +166,7 @@ lad:
       admin:write:reports: fazer aksyones de moderasyon en raportos
       crypto: kulanear shifrasyon de lado a lado
       follow: modifikar relasyones de kuentos
+      profile: melda solo la informasyon del profil
       push: risivir tus avizos arrepushados
       read: meldar todos tus datos de kuento
       read:accounts: ver enformasyon de kuentos
diff --git a/config/locales/doorkeeper.lt.yml b/config/locales/doorkeeper.lt.yml
index 5c2e4fd4e0efb3..38bb17ad139918 100644
--- a/config/locales/doorkeeper.lt.yml
+++ b/config/locales/doorkeeper.lt.yml
@@ -135,6 +135,7 @@ lt:
         media: Medijos priedai
         mutes: Nutildymai
         notifications: Pranešimai
+        profile: Tavo Mastodon profilis
         push: Tiesioginiai pranešimai
         reports: Ataskaitos
         search: Paieška
@@ -165,6 +166,7 @@ lt:
       admin:write:reports: atlikti ataskaitų prižiūrėjimo veiksmus
       crypto: naudoti visapusį šifravimą
       follow: modifikuoti paskyros sąryšius
+      profile: skaityti tik tavo paskyros profilio informaciją
       push: gauti tiesioginius pranešimus
       read: skaityti visus paskyros duomenis
       read:accounts: matyti paskyrų informaciją
diff --git a/config/locales/doorkeeper.sv.yml b/config/locales/doorkeeper.sv.yml
index f2c8bd34b8c6c2..bc4ba6f53ed575 100644
--- a/config/locales/doorkeeper.sv.yml
+++ b/config/locales/doorkeeper.sv.yml
@@ -135,6 +135,7 @@ sv:
         media: Mediabilagor
         mutes: Tystade användare
         notifications: Aviseringar
+        profile: Din Mastodon-profil
         push: Push-aviseringar
         reports: Rapporter
         search: Sök
diff --git a/config/locales/doorkeeper.th.yml b/config/locales/doorkeeper.th.yml
index 067e0655884691..b0d0549d1df2c1 100644
--- a/config/locales/doorkeeper.th.yml
+++ b/config/locales/doorkeeper.th.yml
@@ -135,6 +135,7 @@ th:
         media: ไฟล์แนบสื่อ
         mutes: การซ่อน
         notifications: การแจ้งเตือน
+        profile: โปรไฟล์ Mastodon ของคุณ
         push: การแจ้งเตือนแบบผลัก
         reports: การรายงาน
         search: ค้นหา
@@ -165,6 +166,7 @@ th:
       admin:write:reports: ทำการกระทำการกลั่นกรองต่อรายงาน
       crypto: ใช้การเข้ารหัสแบบต้นทางถึงปลายทาง
       follow: ปรับเปลี่ยนความสัมพันธ์ของบัญชี
+      profile: อ่านเฉพาะข้อมูลโปรไฟล์ของบัญชีของคุณเท่านั้น
       push: รับการแจ้งเตือนแบบผลักของคุณ
       read: อ่านข้อมูลบัญชีทั้งหมดของคุณ
       read:accounts: ดูข้อมูลบัญชี
diff --git a/config/locales/doorkeeper.vi.yml b/config/locales/doorkeeper.vi.yml
index 7f1c5430edc1ea..d0bdd2cc7b1606 100644
--- a/config/locales/doorkeeper.vi.yml
+++ b/config/locales/doorkeeper.vi.yml
@@ -135,6 +135,7 @@ vi:
         media: Tập tin đính kèm
         mutes: Đã ẩn
         notifications: Thông báo
+        profile: Hồ sơ Mastodon của bạn
         push: Thông báo đẩy
         reports: Báo cáo
         search: Tìm kiếm
@@ -165,6 +166,7 @@ vi:
       admin:write:reports: áp đặt kiểm duyệt với các báo cáo
       crypto: dùng mã hóa đầu cuối
       follow: sửa đổi các mối quan hệ tài khoản
+      profile: chỉ đọc thông tin tài khoản cơ bản
       push: nhận thông báo đẩy
       read: đọc mọi dữ liệu tài khoản
       read:accounts: xem thông tin tài khoản
diff --git a/config/locales/id.yml b/config/locales/id.yml
index aae790f4814164..ac42afdb4f7892 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -89,6 +89,7 @@ id:
       moderation:
         active: Aktif
         all: Semua
+        disabled: Nonaktif
         pending: Tertunda
         silenced: Terbatas
         suspended: Disuspen
@@ -121,6 +122,8 @@ id:
       removed_header_msg: Berhasil menghapus gambar header %{username}
       resend_confirmation:
         already_confirmed: Pengguna ini sudah dikonfirmasi
+        send: Kirim ulang email konfirmasi
+        success: Email konfirmasi berhasil dikirim!
       reset: Atur ulang
       reset_password: Reset kata sandi
       resubscribe: Langganan ulang
@@ -128,6 +131,7 @@ id:
       search: Cari
       search_same_email_domain: Pengguna lain dengan domain email yang sama
       search_same_ip: Pengguna lain dengan IP yang sama
+      security: Keamanan
       security_measures:
         only_password: Hanya kata sandi
         password_and_2fa: Kata sandi dan 2FA
@@ -278,6 +282,7 @@ id:
         update_custom_emoji_html: "%{name} memperbarui emoji %{target}"
         update_domain_block_html: "%{name} memperbarui blokir domain untuk %{target}"
         update_ip_block_html: "%{name} mengubah peraturan untuk IP %{target}"
+        update_report_html: "%{name} memperbarui laporan %{target}"
         update_status_html: "%{name} memperbarui status %{target}"
         update_user_role_html: "%{name} mengubah peran %{target}"
       deleted_account: akun yang dihapus
@@ -302,6 +307,7 @@ id:
       unpublish: Batal terbitkan
       unpublished_msg: Pengumuman berhasil ditarik!
       updated_msg: Pengumuman berhasil diperbarui!
+    critical_update_pending: Pembaruan penting tertunda
     custom_emojis:
       assign_category: Beri kategori
       by_domain: Domain
diff --git a/config/locales/la.yml b/config/locales/la.yml
index 3a7ba0d44589e5..d3733df934d083 100644
--- a/config/locales/la.yml
+++ b/config/locales/la.yml
@@ -1 +1,34 @@
+---
 la:
+  about:
+    about_mastodon_html: '"Rete sociale futuri: Nullae praebendae, nulla observatio corporativa, ethica designatio, et decentralizatio! Tua data cum Mastodonte posside!"'
+    contact_missing: Non definitum
+    contact_unavailable: Nōn Applicābilis
+    hosted_on: Mastodon in %{domain} hospitātum
+    title: De
+  accounts:
+    follow: Sequere
+    followers:
+      one: Sectātor
+      other: Sectātōrēs
+    following: Sequendī
+    instance_actor_flash: Hic ratio est actōr virtuālis ad repraesentandam ipsum servatorem et non ullam individuam usorem. Ad scopōs foederātiōnis ūtor nec suspendendus est.
+    last_active: Ultimum Actum
+    link_verified_on: Dominium huius nexūs est comprobatum die %{date}.
+    nothing_here: Nihil est hic!
+    pin_errors:
+      following: Iam debes sequi personam quam vis probare.
+    posts:
+      one: Nuntius
+      other: Nuntii
+    posts_tab_heading: Nuntii
+  admin:
+    account_actions:
+      action: Agere actionem
+      title: Actionem moderationis in %{acct} gerere
+    account_moderation_notes:
+      create: Relinque nota
+      created_msg: Nota moderationis feliciter creata est!
+      destroyed_msg: Nota moderationis feliciter deleta est!
+    accounts:
+      are_you_sure: Esne certus?
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index a527fdb5a7009a..328467f483d2bf 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -1814,14 +1814,14 @@ nl:
       subject: Jouw archief staat klaar om te worden gedownload
       title: Archief ophalen
     failed_2fa:
-      details: 'Hier zijn details van de inlogpoging:'
+      details: 'Hier zijn de details van de inlogpoging:'
       explanation: Iemand heeft geprobeerd om in te loggen op jouw account maar heeft een ongeldige tweede verificatiefactor opgegeven.
       further_actions_html: Als jij dit niet was, raden we je aan om onmiddellijk %{action} aangezien het in gevaar kan zijn.
       subject: Tweestapsverificatiefout
       title: Tweestapsverificatie mislukt
     suspicious_sign_in:
       change_password: je wachtwoord te wijzigen
-      details: 'Hier zijn de details van inlogpoging:'
+      details: 'Hier zijn de details van het inloggen:'
       explanation: We hebben vastgesteld dat iemand vanaf een nieuw IP-adres op jouw account is ingelogd.
       further_actions_html: Wanneer jij dit niet was, adviseren wij om onmiddellijk %{action} en om tweestapsverificatie in te schakelen, om zo je account veilig te houden.
       subject: Jouw account is vanaf een nieuw IP-adres benaderd
diff --git a/config/locales/simple_form.id.yml b/config/locales/simple_form.id.yml
index 856f312eda4765..1f493435e873c4 100644
--- a/config/locales/simple_form.id.yml
+++ b/config/locales/simple_form.id.yml
@@ -2,6 +2,9 @@
 id:
   simple_form:
     hints:
+      account:
+        discoverable: Postingan dan profil publik Anda mungkin ditampilkan atau direkomendasikan di berbagai area Mastodon dan profil Anda mungkin disarankan ke pengguna lain.
+        display_name: Nama lengkap Anda atau nama lucu Anda.
       account_alias:
         acct: Tentukan namapengguna@domain akun yang ingin Anda pindah
       account_migration:
diff --git a/config/locales/th.yml b/config/locales/th.yml
index bafcd30dee6608..d1359e01768d96 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -1837,11 +1837,13 @@ th:
       edit_profile_title: ปรับแต่งโปรไฟล์ของคุณ
       explanation: นี่คือเคล็ดลับบางส่วนที่จะช่วยให้คุณเริ่มต้นใช้งาน
       feature_action: เรียนรู้เพิ่มเติม
-      feature_audience: Mastodon มีความพิเศษที่ให้คุณจัดการผู้รับสารของคุณได้โดยไม่มีตัวกลาง นอกจากนี้ การติดตั้ง Mastodon บนโครงสร้างพื้นฐานของคุณจะทำให้คุณสามารถติดตาม (และติดตามโดย) เซิร์ฟเวอร์ Mastodon แห่งไหนก็ได้ที่ทำงานอยู่ โดยไม่มีใครสามารถควบคุมได้นอกจากคุณ
+      feature_audience: Mastodon ให้ความเป็นไปได้ที่เป็นเอกลักษณ์แก่คุณในการจัดการผู้ชมของคุณโดยไม่มีตัวกลาง Mastodon ที่ปรับใช้ในโครงสร้างพื้นฐานของคุณเองอนุญาตให้คุณติดตามและได้รับการติดตามจากเซิร์ฟเวอร์ Mastodon อื่นใดทางออนไลน์และไม่อยู่ภายใต้การควบคุมของใครนอกจากคุณ
       feature_audience_title: สร้างผู้ชมของคุณด้วยความมั่นใจ
       feature_control: คุณทราบดีที่สุดถึงสิ่งที่คุณต้องการเห็นในฟีดหน้าแรกของคุณ ไม่มีอัลกอริทึมหรือโฆษณาให้เสียเวลาของคุณ ติดตามใครก็ตามทั่วทั้งเซิร์ฟเวอร์ Mastodon ใด ๆ จากบัญชีเดียวและรับโพสต์ของเขาตามลำดับเวลา และทำให้มุมอินเทอร์เน็ตของคุณเป็นเหมือนคุณมากขึ้นอีกนิด
       feature_control_title: การควบคุมเส้นเวลาของคุณเอง
+      feature_creativity: Mastodon รองรับโพสต์เสียง วิดีโอ และรูปภาพ, คำอธิบายการช่วยการเข้าถึง, การสำรวจความคิดเห็น, คำเตือนเนื้อหา, ภาพประจำตัวแบบเคลื่อนไหว, อีโมจิที่กำหนดเอง, การควบคุมการครอบตัดภาพขนาดย่อ และอื่น ๆ เพื่อช่วยให้คุณแสดงออกตัวคุณเองทางออนไลน์ ไม่ว่าคุณกำลังจะเผยแพร่ศิลปะของคุณ, เพลงของคุณ หรือพอดแคสต์ของคุณ Mastodon อยู่ที่นั่นเพื่อคุณ
       feature_creativity_title: ความคิดสร้างสรรค์ที่ไม่มีใครเทียบได้
+      feature_moderation: Mastodon นำการตัดสินใจกลับมาอยู่ในมือของคุณ แต่ละเซิร์ฟเวอร์สร้างกฎและระเบียบข้อบังคับของตนเอง ซึ่งบังคับใช้ในเซิร์ฟเวอร์และไม่ใช่จากบนลงล่างเหมือนสื่อสังคมขององค์กร ทำให้สื่อสังคมยืดหยุ่นมากที่สุดในการตอบสนองต่อความต้องการของกลุ่มคนที่แตกต่างกัน เข้าร่วมเซิร์ฟเวอร์ที่มีกฎที่คุณเห็นด้วย หรือโฮสต์ของคุณเอง
       feature_moderation_title: การกลั่นกรองในแบบที่ควรจะเป็น
       follow_action: ติดตาม
       follow_step: การติดตามผู้คนที่น่าสนใจคือสิ่งที่ Mastodon ให้ความสำคัญ

From f0f144e96da62718e849a8dd5cd55ddbc03763ab Mon Sep 17 00:00:00 2001
From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Mon, 10 Jun 2024 23:47:59 +0900
Subject: [PATCH 1232/2191] Add `customManagers:dockerfileVersions` to
 renovate.json5 (#30607)

---
 .github/renovate.json5 | 1 +
 Dockerfile             | 2 ++
 streaming/Dockerfile   | 1 +
 3 files changed, 4 insertions(+)

diff --git a/.github/renovate.json5 b/.github/renovate.json5
index 52f7c63e5b82f1..2cf7bec8eebd21 100644
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -2,6 +2,7 @@
   $schema: 'https://docs.renovatebot.com/renovate-schema.json',
   extends: [
     'config:recommended',
+    'customManagers:dockerfileVersions',
     ':labels(dependencies)',
     ':prConcurrentLimitNone', // Remove limit for open PRs at any time.
     ':prHourlyLimit2', // Rate limit PR creation to a maximum of two per hour.
diff --git a/Dockerfile b/Dockerfile
index 09aa8f2ddbc190..cb5b8720592df4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,8 +11,10 @@ ARG TARGETPLATFORM=${TARGETPLATFORM}
 ARG BUILDPLATFORM=${BUILDPLATFORM}
 
 # Ruby image to use for base image, change with [--build-arg RUBY_VERSION="3.3.x"]
+# renovate: datasource=docker depName=docker.io/ruby
 ARG RUBY_VERSION="3.3.2"
 # # Node version to use in base image, change with [--build-arg NODE_MAJOR_VERSION="20"]
+# renovate: datasource=node-version depName=node
 ARG NODE_MAJOR_VERSION="20"
 # Debian image to use for base image, change with [--build-arg DEBIAN_VERSION="bookworm"]
 ARG DEBIAN_VERSION="bookworm"
diff --git a/streaming/Dockerfile b/streaming/Dockerfile
index 7f373e9cd5aa61..564e717a402d4e 100644
--- a/streaming/Dockerfile
+++ b/streaming/Dockerfile
@@ -8,6 +8,7 @@ ARG TARGETPLATFORM=${TARGETPLATFORM}
 ARG BUILDPLATFORM=${BUILDPLATFORM}
 
 # Node version to use in base image, change with [--build-arg NODE_MAJOR_VERSION="20"]
+# renovate: datasource=node-version depName=node
 ARG NODE_MAJOR_VERSION="20"
 # Debian image to use for base image, change with [--build-arg DEBIAN_VERSION="bookworm"]
 ARG DEBIAN_VERSION="bookworm"

From 28f9a8f2ecabb0c087e27522217b78da732611c2 Mon Sep 17 00:00:00 2001
From: Daniel M Brasil <danielmbrasil@protonmail.com>
Date: Mon, 10 Jun 2024 11:52:33 -0300
Subject: [PATCH 1233/2191] Add Specs for Scheduled Status Model Validations 
 (#30585)

---
 spec/models/scheduled_status_spec.rb | 50 ++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 spec/models/scheduled_status_spec.rb

diff --git a/spec/models/scheduled_status_spec.rb b/spec/models/scheduled_status_spec.rb
new file mode 100644
index 00000000000000..15031a589520f6
--- /dev/null
+++ b/spec/models/scheduled_status_spec.rb
@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe ScheduledStatus do
+  let(:account) { Fabricate(:account) }
+
+  describe 'validations' do
+    context 'when scheduled_at is less than minimum offset' do
+      subject { Fabricate.build(:scheduled_status, scheduled_at: 4.minutes.from_now, account: account) }
+
+      it 'is not valid', :aggregate_failures do
+        expect(subject).to_not be_valid
+        expect(subject.errors[:scheduled_at]).to include(I18n.t('scheduled_statuses.too_soon'))
+      end
+    end
+
+    context 'when account has reached total limit' do
+      subject { Fabricate.build(:scheduled_status, account: account) }
+
+      before do
+        allow(account.scheduled_statuses).to receive(:count).and_return(described_class::TOTAL_LIMIT)
+      end
+
+      it 'is not valid', :aggregate_failures do
+        expect(subject).to_not be_valid
+        expect(subject.errors[:base]).to include(I18n.t('scheduled_statuses.over_total_limit', limit: ScheduledStatus::TOTAL_LIMIT))
+      end
+    end
+
+    context 'when account has reached daily limit' do
+      subject { Fabricate.build(:scheduled_status, account: account, scheduled_at: base_time + 10.minutes) }
+
+      let(:base_time) { Time.current.change(hour: 12) }
+
+      before do
+        stub_const('ScheduledStatus::DAILY_LIMIT', 3)
+
+        travel_to base_time do
+          Fabricate.times(ScheduledStatus::DAILY_LIMIT, :scheduled_status, account: account, scheduled_at: base_time + 1.hour)
+        end
+      end
+
+      it 'is not valid', :aggregate_failures do
+        expect(subject).to_not be_valid
+        expect(subject.errors[:base]).to include(I18n.t('scheduled_statuses.over_daily_limit', limit: ScheduledStatus::DAILY_LIMIT))
+      end
+    end
+  end
+end

From 92b3004bf31d91c94efae4957234a36aef10da59 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 10 Jun 2024 11:03:41 -0400
Subject: [PATCH 1234/2191] Reference constants from account validation specs
 (#30634)

---
 spec/models/account_spec.rb | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb
index 2c5df198d97f88..225929ae39f9a6 100644
--- a/spec/models/account_spec.rb
+++ b/spec/models/account_spec.rb
@@ -768,20 +768,20 @@
         expect(account).to model_have_error_on_field(:username)
       end
 
-      it 'is invalid if the username is longer than 30 characters' do
-        account = Fabricate.build(:account, username: Faker::Lorem.characters(number: 31))
+      it 'is invalid if the username is longer than the character limit' do
+        account = Fabricate.build(:account, username: username_over_limit)
         account.valid?
         expect(account).to model_have_error_on_field(:username)
       end
 
-      it 'is invalid if the display name is longer than 30 characters' do
-        account = Fabricate.build(:account, display_name: Faker::Lorem.characters(number: 31))
+      it 'is invalid if the display name is longer than the character limit' do
+        account = Fabricate.build(:account, display_name: username_over_limit)
         account.valid?
         expect(account).to model_have_error_on_field(:display_name)
       end
 
-      it 'is invalid if the note is longer than 500 characters' do
-        account = Fabricate.build(:account, note: Faker::Lorem.characters(number: 501))
+      it 'is invalid if the note is longer than the character limit' do
+        account = Fabricate.build(:account, note: account_note_over_limit)
         account.valid?
         expect(account).to model_have_error_on_field(:note)
       end
@@ -814,24 +814,32 @@
         expect(account).to model_have_error_on_field(:username)
       end
 
-      it 'is valid even if the username is longer than 30 characters' do
-        account = Fabricate.build(:account, domain: 'domain', username: Faker::Lorem.characters(number: 31))
+      it 'is valid even if the username is longer than the character limit' do
+        account = Fabricate.build(:account, domain: 'domain', username: username_over_limit)
         account.valid?
         expect(account).to_not model_have_error_on_field(:username)
       end
 
-      it 'is valid even if the display name is longer than 30 characters' do
-        account = Fabricate.build(:account, domain: 'domain', display_name: Faker::Lorem.characters(number: 31))
+      it 'is valid even if the display name is longer than the character limit' do
+        account = Fabricate.build(:account, domain: 'domain', display_name: username_over_limit)
         account.valid?
         expect(account).to_not model_have_error_on_field(:display_name)
       end
 
-      it 'is valid even if the note is longer than 500 characters' do
-        account = Fabricate.build(:account, domain: 'domain', note: Faker::Lorem.characters(number: 501))
+      it 'is valid even if the note is longer than the character limit' do
+        account = Fabricate.build(:account, domain: 'domain', note: account_note_over_limit)
         account.valid?
         expect(account).to_not model_have_error_on_field(:note)
       end
     end
+
+    def username_over_limit
+      'a' * described_class::USERNAME_LENGTH_LIMIT * 2
+    end
+
+    def account_note_over_limit
+      'a' * described_class::NOTE_LENGTH_LIMIT * 2
+    end
   end
 
   describe 'scopes' do

From 3e3f3d75805ec4209e0b12984626a5be0a9ba2e5 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 10 Jun 2024 11:04:01 -0400
Subject: [PATCH 1235/2191] Match report validation spec to extracted constant
 (#30633)

---
 spec/models/report_spec.rb | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/spec/models/report_spec.rb b/spec/models/report_spec.rb
index 0168268bcb7723..d01d37bd8bba0e 100644
--- a/spec/models/report_spec.rb
+++ b/spec/models/report_spec.rb
@@ -123,14 +123,14 @@
   describe 'validations' do
     let(:remote_account) { Fabricate(:account, domain: 'example.com', protocol: :activitypub, inbox_url: 'http://example.com/inbox') }
 
-    it 'is invalid if comment is longer than 1000 characters only if reporter is local' do
-      report = Fabricate.build(:report, comment: Faker::Lorem.characters(number: 1001))
+    it 'is invalid if comment is longer than character limit and reporter is local' do
+      report = Fabricate.build(:report, comment: comment_over_limit)
       expect(report.valid?).to be false
       expect(report).to model_have_error_on_field(:comment)
     end
 
-    it 'is valid if comment is longer than 1000 characters and reporter is not local' do
-      report = Fabricate.build(:report, account: remote_account, comment: Faker::Lorem.characters(number: 1001))
+    it 'is valid if comment is longer than character limit and reporter is not local' do
+      report = Fabricate.build(:report, account: remote_account, comment: comment_over_limit)
       expect(report.valid?).to be true
     end
 
@@ -146,5 +146,9 @@
       expect(report.valid?).to be false
       expect(report).to model_have_error_on_field(:rule_ids)
     end
+
+    def comment_over_limit
+      'a' * described_class::COMMENT_SIZE_LIMIT * 2
+    end
   end
 end

From 28921a12fe0033c7231f42e95a2be80628844bb4 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 10 Jun 2024 11:22:26 -0400
Subject: [PATCH 1236/2191] Update macOS local dev setup instructions (#30641)

---
 README.md | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index f807120c1eddf3..4aca37673b8ef7 100644
--- a/README.md
+++ b/README.md
@@ -86,18 +86,18 @@ A **Vagrant** configuration is included for development purposes. To use it, com
 - Run `vagrant ssh -c "cd /vagrant && bin/dev"`
 - Open `http://mastodon.local` in your browser
 
-### MacOS
+### macOS
 
-To set up **MacOS** for native development, complete the following steps:
+To set up **macOS** for native development, complete the following steps:
 
-- Use a Ruby version manager to install the specified version from `.ruby-version`
-- Run `bundle` to install required gems
-- Run `brew install postgresql@14 redis imagemagick libidn` to install required dependencies
-- Navigate to Mastodon's root directory and run `brew install nvm` then `nvm use` to use the version from `.nvmrc`
-- Run `yarn` to install required packages
-- Run `corepack enable && corepack prepare`
-- Run `RAILS_ENV=development bundle exec rails db:setup`
-- Finally, run `bin/dev` which will launch the local services via `overmind` (if installed) or `foreman`
+- Install [Homebrew] and run `brew install postgresql@14 redis imagemagick
+libidn nvm` to install the required project dependencies
+- Use a Ruby version manager to activate the ruby in `.ruby-version` and run
+  `nvm use` to activate the node version from `.nvmrc`
+- Run the `bin/setup` script, which will install the required ruby gems and node
+  packages and prepare the database for local development
+- Finally, run the `bin/dev` script which will launch services via `overmind`
+  (if installed) or `foreman`
 
 ### Docker
 
@@ -155,3 +155,4 @@ You should have received a copy of the GNU Affero General Public License along w
 [Development Containers]: https://containers.dev/supporting
 [Docker]: https://docs.docker.com
 [GitHub Codespaces]: https://docs.github.com/en/codespaces
+[Homebrew]: https://brew.sh

From 9bf2e2eda0ffea6382e161f7ebb43d73aaf658ca Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 10 Jun 2024 11:23:17 -0400
Subject: [PATCH 1237/2191] Extract `TEXT_LENGTH_LIMIT` constant in `Appeal`
 class (#30638)

---
 app/models/appeal.rb       |  4 +++-
 spec/models/appeal_spec.rb | 13 +++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/app/models/appeal.rb b/app/models/appeal.rb
index 395056b76f5347..fafa75e69d8830 100644
--- a/app/models/appeal.rb
+++ b/app/models/appeal.rb
@@ -18,6 +18,8 @@
 class Appeal < ApplicationRecord
   MAX_STRIKE_AGE = 20.days
 
+  TEXT_LENGTH_LIMIT = 2_000
+
   belongs_to :account
   belongs_to :strike, class_name: 'AccountWarning', foreign_key: 'account_warning_id', inverse_of: :appeal
 
@@ -26,7 +28,7 @@ class Appeal < ApplicationRecord
     belongs_to :rejected_by_account
   end
 
-  validates :text, presence: true, length: { maximum: 2_000 }
+  validates :text, presence: true, length: { maximum: TEXT_LENGTH_LIMIT }
   validates :account_warning_id, uniqueness: true
 
   validate :validate_time_frame, on: :create
diff --git a/spec/models/appeal_spec.rb b/spec/models/appeal_spec.rb
index 12373a9494e75a..13ca3a2d901ae5 100644
--- a/spec/models/appeal_spec.rb
+++ b/spec/models/appeal_spec.rb
@@ -3,6 +3,19 @@
 require 'rails_helper'
 
 describe Appeal do
+  describe 'Validations' do
+    it 'validates text length is under limit' do
+      appeal = Fabricate.build(
+        :appeal,
+        strike: Fabricate(:account_warning),
+        text: 'a' * described_class::TEXT_LENGTH_LIMIT * 2
+      )
+
+      expect(appeal).to_not be_valid
+      expect(appeal).to model_have_error_on_field(:text)
+    end
+  end
+
   describe 'scopes' do
     describe 'approved' do
       let(:approved_appeal) { Fabricate(:appeal, approved_at: 10.days.ago) }

From 9cc4040308a758d4b77961f4da79cf63a044fffe Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 10 Jun 2024 11:23:55 -0400
Subject: [PATCH 1238/2191] Extract `COMMENT_SIZE_LIMIT` constant in
 `AP::Activity::Flag` class (#30637)

---
 app/lib/activitypub/activity/flag.rb       |  4 +++-
 spec/lib/activitypub/activity/flag_spec.rb | 12 +++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/app/lib/activitypub/activity/flag.rb b/app/lib/activitypub/activity/flag.rb
index 68ee43d0ebf7c1..b7a412485c07e7 100644
--- a/app/lib/activitypub/activity/flag.rb
+++ b/app/lib/activitypub/activity/flag.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class ActivityPub::Activity::Flag < ActivityPub::Activity
+  COMMENT_SIZE_LIMIT = 5000
+
   def perform
     return if skip_reports?
 
@@ -38,6 +40,6 @@ def report_uri
   end
 
   def report_comment
-    (@json['content'] || '')[0...5000]
+    (@json['content'] || '')[0...COMMENT_SIZE_LIMIT]
   end
 end
diff --git a/spec/lib/activitypub/activity/flag_spec.rb b/spec/lib/activitypub/activity/flag_spec.rb
index 8593d567f42616..426cd97df9acf3 100644
--- a/spec/lib/activitypub/activity/flag_spec.rb
+++ b/spec/lib/activitypub/activity/flag_spec.rb
@@ -54,7 +54,7 @@
         }.with_indifferent_access, sender)
       end
 
-      let(:long_comment) { Faker::Lorem.characters(number: 6000) }
+      let(:long_comment) { 'a' * described_class::COMMENT_SIZE_LIMIT * 2 }
 
       before do
         subject.perform
@@ -63,10 +63,12 @@
       it 'creates a report but with a truncated comment' do
         report = Report.find_by(account: sender, target_account: flagged)
 
-        expect(report).to_not be_nil
-        expect(report.comment.length).to eq 5000
-        expect(report.comment).to eq long_comment[0...5000]
-        expect(report.status_ids).to eq [status.id]
+        expect(report)
+          .to be_present
+          .and have_attributes(status_ids: [status.id])
+        expect(report.comment)
+          .to have_attributes(length: described_class::COMMENT_SIZE_LIMIT)
+          .and eq(long_comment[0...described_class::COMMENT_SIZE_LIMIT])
       end
     end
 

From 0e1110c947caf31ae650c73ef35adedebc16b28a Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 10 Jun 2024 16:08:04 -0400
Subject: [PATCH 1239/2191] Use `SECRET_KEY_BASE_DUMMY` feature as placeholder
 during asset compilation (#30505)

---
 .github/workflows/test-ruby.yml                 | 6 +-----
 Dockerfile                                      | 6 +-----
 config/environments/production.rb               | 6 +++++-
 config/initializers/active_record_encryption.rb | 5 +++++
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/test-ruby.yml b/.github/workflows/test-ruby.yml
index 5f2297381a7328..8f05dcab3ec59f 100644
--- a/.github/workflows/test-ruby.yml
+++ b/.github/workflows/test-ruby.yml
@@ -28,11 +28,7 @@ jobs:
     env:
       RAILS_ENV: ${{ matrix.mode }}
       BUNDLE_WITH: ${{ matrix.mode }}
-      ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY: precompile_placeholder
-      ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT: precompile_placeholder
-      ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY: precompile_placeholder
-      OTP_SECRET: precompile_placeholder
-      SECRET_KEY_BASE: precompile_placeholder
+      SECRET_KEY_BASE_DUMMY: 1
 
     steps:
       - uses: actions/checkout@v4
diff --git a/Dockerfile b/Dockerfile
index cb5b8720592df4..2dc7602b2d23d2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -212,11 +212,7 @@ ARG TARGETPLATFORM
 
 RUN \
 # Use Ruby on Rails to create Mastodon assets
-  ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=precompile_placeholder \
-  ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=precompile_placeholder \
-  ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY=precompile_placeholder \
-  OTP_SECRET=precompile_placeholder \
-  SECRET_KEY_BASE=precompile_placeholder \
+  SECRET_KEY_BASE_DUMMY=1 \
   bundle exec rails assets:precompile; \
 # Cleanup temporary files
   rm -fr /opt/mastodon/tmp;
diff --git a/config/environments/production.rb b/config/environments/production.rb
index a39843e9562d1f..6686a23d60da91 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -156,7 +156,11 @@
   }
 
   # TODO: Remove once devise-two-factor data migration complete
-  config.x.otp_secret = ENV.fetch('OTP_SECRET')
+  config.x.otp_secret = if ENV['SECRET_KEY_BASE_DUMMY']
+                          SecureRandom.hex(64)
+                        else
+                          ENV.fetch('OTP_SECRET')
+                        end
 
   # Enable DNS rebinding protection and other `Host` header attacks.
   # config.hosts = [
diff --git a/config/initializers/active_record_encryption.rb b/config/initializers/active_record_encryption.rb
index 900f3c68f0d527..a83ca807657711 100644
--- a/config/initializers/active_record_encryption.rb
+++ b/config/initializers/active_record_encryption.rb
@@ -5,6 +5,11 @@
   ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT
   ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY
 ).each do |key|
+  if ENV['SECRET_KEY_BASE_DUMMY']
+    # Use placeholder value during production env asset compilation
+    ENV[key] = SecureRandom.hex(64)
+  end
+
   value = ENV.fetch(key) do
     abort <<~MESSAGE
 

From ef23abcf617813901e34c5dd9587ef7c88fd754d Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 11 Jun 2024 08:55:30 +0200
Subject: [PATCH 1240/2191] chore(deps): update dependency aws-sdk-s3 to
 v1.152.1 (#30643)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 4d16fea47cb973..984bc32d49b7ed 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -109,7 +109,7 @@ GEM
     aws-sdk-kms (1.83.0)
       aws-sdk-core (~> 3, >= 3.197.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.152.0)
+    aws-sdk-s3 (1.152.1)
       aws-sdk-core (~> 3, >= 3.197.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.8)

From cfd4823b65cc91e758ac9d6d97e367b19ca35691 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 11 Jun 2024 02:57:09 -0400
Subject: [PATCH 1241/2191] Use fabricator in follow_spec (#30642)

---
 spec/models/follow_spec.rb | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/spec/models/follow_spec.rb b/spec/models/follow_spec.rb
index c7743183cc612b..9aa172b2f21cfc 100644
--- a/spec/models/follow_spec.rb
+++ b/spec/models/follow_spec.rb
@@ -36,16 +36,15 @@
     end
   end
 
-  describe 'recent' do
-    it 'sorts so that more recent follows comes earlier' do
-      follow0 = described_class.create!(account: alice, target_account: bob)
-      follow1 = described_class.create!(account: bob, target_account: alice)
+  describe '.recent' do
+    let!(:follow_earlier) { Fabricate(:follow) }
+    let!(:follow_later) { Fabricate(:follow) }
 
-      a = described_class.recent.to_a
+    it 'sorts with most recent follows first' do
+      results = described_class.recent
 
-      expect(a.size).to eq 2
-      expect(a[0]).to eq follow1
-      expect(a[1]).to eq follow0
+      expect(results.size).to eq 2
+      expect(results).to eq [follow_later, follow_earlier]
     end
   end
 

From 0dabda9beec11706fbef8cbf8a141266cc69590c Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 11 Jun 2024 09:14:52 +0200
Subject: [PATCH 1242/2191] New Crowdin Translations (automated) (#30646)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/ar.json | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/app/javascript/mastodon/locales/ar.json b/app/javascript/mastodon/locales/ar.json
index 68e32dd2aab6e7..6d67d354b63e32 100644
--- a/app/javascript/mastodon/locales/ar.json
+++ b/app/javascript/mastodon/locales/ar.json
@@ -225,7 +225,11 @@
   "domain_pill.their_username": "مُعرّفُهم الفريد على الخادم. من الممكن العثور على مستخدمين بنفس اسم المستخدم على خوادم مختلفة.",
   "domain_pill.username": "اسم المستخدم",
   "domain_pill.whats_in_a_handle": "ما المقصود بالمُعرِّف؟",
+  "domain_pill.who_they_are": "بما أن المعالجات تقول من هو الشخص ومكان وجوده، يمكنك التفاعل مع الناس عبر الشبكة الاجتماعية لـ <button>ActivityPub-Power منصات</button>.",
+  "domain_pill.who_you_are": "لأن معالجتك تقول من أنت ومكان وجودك، يمكن الناس التفاعل معك عبر الشبكة الاجتماعية لـ <button>ActivityPub-Power منصات</button>.",
   "domain_pill.your_handle": "عنوانك الكامل:",
+  "domain_pill.your_server": "منزلك الرقمي، حيث تعيش جميع مشاركاتك. لا تحب هذا؟ إنقل الخوادم في أي وقت واخضر متابعينك أيضًا.",
+  "domain_pill.your_username": "معرفك الفريد على هذا الخادم. من الممكن العثور على مستخدمين بنفس إسم المستخدم على خوادم مختلفة.",
   "embed.instructions": "يمكنكم إدماج هذا المنشور على موقعكم الإلكتروني عن طريق نسخ الشفرة أدناه.",
   "embed.preview": "إليك ما سيبدو عليه:",
   "emoji_button.activity": "الأنشطة",
@@ -262,6 +266,7 @@
   "empty_column.list": "هذه القائمة فارغة مؤقتا و لكن سوف تمتلئ تدريجيا عندما يبدأ الأعضاء المُنتَمين إليها بنشر منشورات.",
   "empty_column.lists": "ليس عندك أية قائمة بعد. سوف تظهر قوائمك هنا إن قمت بإنشاء واحدة.",
   "empty_column.mutes": "لم تقم بكتم أي مستخدم بعد.",
+  "empty_column.notification_requests": "لا يوجد شيء هنا. عندما تتلقى إشعارات جديدة، سوف تظهر هنا وفقًا لإعداداتك.",
   "empty_column.notifications": "لم تتلق أي إشعار بعدُ. تفاعل مع المستخدمين الآخرين لإنشاء محادثة.",
   "empty_column.public": "لا يوجد أي شيء هنا! قم بنشر شيء ما للعامة، أو اتبع المستخدمين الآخرين المتواجدين على الخوادم الأخرى لملء خيط المحادثات",
   "error.unexpected_crash.explanation": "نظرا لوجود خطأ في التعليمات البرمجية أو مشكلة توافق مع المتصفّح، تعذر عرض هذه الصفحة بشكل صحيح.",
@@ -292,6 +297,8 @@
   "filter_modal.select_filter.subtitle": "استخدم فئة موجودة أو قم بإنشاء فئة جديدة",
   "filter_modal.select_filter.title": "تصفية هذا المنشور",
   "filter_modal.title.status": "تصفية منشور",
+  "filtered_notifications_banner.mentions": "{count, plural, one {إشارة} two {إشارتين} few {# إشارات} other {# إشارة}}",
+  "filtered_notifications_banner.pending_requests": "إشعارات من {count, plural, zero {}=0 {لا أحد} one {شخص واحد قد تعرفه} two {شخصين قد تعرفهما} few {# أشخاص قد تعرفهم} many {# شخص قد تعرفهم} other {# شخص قد تعرفهم}}",
   "filtered_notifications_banner.title": "الإشعارات المصفاة",
   "firehose.all": "الكل",
   "firehose.local": "هذا الخادم",
@@ -301,6 +308,8 @@
   "follow_requests.unlocked_explanation": "حتى وإن كان حسابك غير مقفل، يعتقد فريق {domain} أنك قد ترغب في مراجعة طلبات المتابعة من هذه الحسابات يدوياً.",
   "follow_suggestions.curated_suggestion": "اختيار الموظفين",
   "follow_suggestions.dismiss": "لا تُظهرها مجدّدًا",
+  "follow_suggestions.featured_longer": "مختار يدوياً من قِبل فريق {domain}",
+  "follow_suggestions.friends_of_friends_longer": "مشهور بين الأشخاص الذين تتابعهم",
   "follow_suggestions.hints.featured": "تم اختيار هذا الملف الشخصي يدوياً من قبل فريق {domain}.",
   "follow_suggestions.hints.friends_of_friends": "هذا الملف الشخصي مشهور بين الأشخاص الذين تتابعهم.",
   "follow_suggestions.hints.most_followed": "هذا الملف الشخصي هو واحد من الأكثر متابعة على {domain}.",
@@ -405,6 +414,7 @@
   "limited_account_hint.action": "إظهار الملف التعريفي على أي حال",
   "limited_account_hint.title": "تم إخفاء هذا الملف الشخصي من قبل مشرفي {domain}.",
   "link_preview.author": "مِن {name}",
+  "link_preview.more_from_author": "المزيد من {name}",
   "lists.account.add": "أضف إلى القائمة",
   "lists.account.remove": "احذف من القائمة",
   "lists.delete": "احذف القائمة",
@@ -465,10 +475,13 @@
   "notification.follow_request": "لقد طلب {name} متابعتك",
   "notification.mention": "{name} ذكرك",
   "notification.moderation-warning.learn_more": "اعرف المزيد",
+  "notification.moderation_warning": "لقد تلقيت تحذيرًا بالإشراف",
+  "notification.moderation_warning.action_delete_statuses": "تم إزالة بعض مشاركاتك.",
   "notification.moderation_warning.action_disable": "تم تعطيل حسابك.",
   "notification.moderation_warning.action_mark_statuses_as_sensitive": "بعض من منشوراتك تم تصنيفها على أنها حساسة.",
   "notification.moderation_warning.action_none": "لقد تلقى حسابك تحذيرا بالإشراف.",
   "notification.moderation_warning.action_sensitive": "سيتم وضع علامة على منشوراتك على أنها حساسة من الآن فصاعدا.",
+  "notification.moderation_warning.action_silence": "لقد تم تقييد حسابك.",
   "notification.moderation_warning.action_suspend": "لقد تم تعليق حسابك.",
   "notification.own_poll": "انتهى استطلاعك للرأي",
   "notification.poll": "لقد انتهى استطلاع رأي شاركتَ فيه",

From b2496177e00af2b9ce73b378233b2ef3de14cbe4 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 11 Jun 2024 03:35:30 -0400
Subject: [PATCH 1243/2191] Use correct params in `v1/admin/domain_allows` spec
 (#30378)

---
 spec/requests/api/v1/admin/domain_allows_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/requests/api/v1/admin/domain_allows_spec.rb b/spec/requests/api/v1/admin/domain_allows_spec.rb
index 662a8f9a8d629b..b8f0b0055c84fc 100644
--- a/spec/requests/api/v1/admin/domain_allows_spec.rb
+++ b/spec/requests/api/v1/admin/domain_allows_spec.rb
@@ -113,7 +113,7 @@
     end
 
     context 'with invalid domain name' do
-      let(:params) { 'foo bar' }
+      let(:params) { { domain: 'foo bar' } }
 
       it 'returns http unprocessable entity' do
         subject

From edf6d64eebdf4c1651f09c0e314d46b7436b46df Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 11 Jun 2024 03:36:46 -0400
Subject: [PATCH 1244/2191] Use correct params in
 `settings/preferences/appearance` spec (#30379)

---
 .../settings/preferences/appearance_controller_spec.rb       | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/spec/controllers/settings/preferences/appearance_controller_spec.rb b/spec/controllers/settings/preferences/appearance_controller_spec.rb
index 261c426acbdb15..84b82772502fec 100644
--- a/spec/controllers/settings/preferences/appearance_controller_spec.rb
+++ b/spec/controllers/settings/preferences/appearance_controller_spec.rb
@@ -23,8 +23,11 @@
   end
 
   describe 'PUT #update' do
+    subject { put :update, params: { user: { settings_attributes: { theme: 'contrast' } } } }
+
     it 'redirects correctly' do
-      put :update, params: { user: { setting_theme: 'contrast' } }
+      expect { subject }
+        .to change { user.reload.settings.theme }.to('contrast')
 
       expect(response).to redirect_to(settings_preferences_appearance_path)
     end

From 88cfc4056de1f7ab86011eb80b904cd9cd6dc754 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 11 Jun 2024 03:42:15 -0400
Subject: [PATCH 1245/2191] Extract method to generate series of days in
 measure sql classes (#29928)

---
 .../admin/metrics/measure/instance_accounts_measure.rb    | 2 +-
 .../admin/metrics/measure/instance_followers_measure.rb   | 2 +-
 app/lib/admin/metrics/measure/instance_follows_measure.rb | 2 +-
 .../metrics/measure/instance_media_attachments_measure.rb | 2 +-
 app/lib/admin/metrics/measure/instance_reports_measure.rb | 2 +-
 .../admin/metrics/measure/instance_statuses_measure.rb    | 2 +-
 app/lib/admin/metrics/measure/new_users_measure.rb        | 2 +-
 app/lib/admin/metrics/measure/opened_reports_measure.rb   | 2 +-
 app/lib/admin/metrics/measure/query_helper.rb             | 8 ++++++++
 app/lib/admin/metrics/measure/resolved_reports_measure.rb | 2 +-
 app/lib/admin/metrics/measure/tag_servers_measure.rb      | 2 +-
 11 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/app/lib/admin/metrics/measure/instance_accounts_measure.rb b/app/lib/admin/metrics/measure/instance_accounts_measure.rb
index 3d081fdd909fc2..746780ee7719e3 100644
--- a/app/lib/admin/metrics/measure/instance_accounts_measure.rb
+++ b/app/lib/admin/metrics/measure/instance_accounts_measure.rb
@@ -43,7 +43,7 @@ def sql_query_string
         SELECT count(*) FROM new_accounts
       ) AS value
       FROM (
-        SELECT generate_series(date_trunc('day', :start_at::timestamp)::date, date_trunc('day', :end_at::timestamp)::date, interval '1 day') AS period
+        #{generated_series_days}
       ) AS axis
     SQL
   end
diff --git a/app/lib/admin/metrics/measure/instance_followers_measure.rb b/app/lib/admin/metrics/measure/instance_followers_measure.rb
index 378c6754d9230d..0693d5a64a91d2 100644
--- a/app/lib/admin/metrics/measure/instance_followers_measure.rb
+++ b/app/lib/admin/metrics/measure/instance_followers_measure.rb
@@ -44,7 +44,7 @@ def sql_query_string
         SELECT count(*) FROM new_followers
       ) AS value
       FROM (
-        SELECT generate_series(date_trunc('day', :start_at::timestamp)::date, date_trunc('day', :end_at::timestamp)::date, interval '1 day') AS period
+        #{generated_series_days}
       ) AS axis
     SQL
   end
diff --git a/app/lib/admin/metrics/measure/instance_follows_measure.rb b/app/lib/admin/metrics/measure/instance_follows_measure.rb
index e213348fbc7195..90d38193585c8d 100644
--- a/app/lib/admin/metrics/measure/instance_follows_measure.rb
+++ b/app/lib/admin/metrics/measure/instance_follows_measure.rb
@@ -44,7 +44,7 @@ def sql_query_string
         SELECT count(*) FROM new_follows
       ) AS value
       FROM (
-        SELECT generate_series(date_trunc('day', :start_at::timestamp)::date, date_trunc('day', :end_at::timestamp)::date, interval '1 day') AS period
+        #{generated_series_days}
       ) AS axis
     SQL
   end
diff --git a/app/lib/admin/metrics/measure/instance_media_attachments_measure.rb b/app/lib/admin/metrics/measure/instance_media_attachments_measure.rb
index 1d2dbbe4146a86..89f8b414973b83 100644
--- a/app/lib/admin/metrics/measure/instance_media_attachments_measure.rb
+++ b/app/lib/admin/metrics/measure/instance_media_attachments_measure.rb
@@ -53,7 +53,7 @@ def sql_query_string
         SELECT COALESCE(SUM(size), 0) FROM new_media_attachments
       ) AS value
       FROM (
-        SELECT generate_series(date_trunc('day', :start_at::timestamp)::date, date_trunc('day', :end_at::timestamp)::date, interval '1 day') AS period
+        #{generated_series_days}
       ) AS axis
     SQL
   end
diff --git a/app/lib/admin/metrics/measure/instance_reports_measure.rb b/app/lib/admin/metrics/measure/instance_reports_measure.rb
index 9da3d53e348a3d..5f58387a640ae0 100644
--- a/app/lib/admin/metrics/measure/instance_reports_measure.rb
+++ b/app/lib/admin/metrics/measure/instance_reports_measure.rb
@@ -44,7 +44,7 @@ def sql_query_string
         SELECT count(*) FROM new_reports
       ) AS value
       FROM (
-        SELECT generate_series(date_trunc('day', :start_at::timestamp)::date, date_trunc('day', :end_at::timestamp)::date, interval '1 day') AS period
+        #{generated_series_days}
       ) AS axis
     SQL
   end
diff --git a/app/lib/admin/metrics/measure/instance_statuses_measure.rb b/app/lib/admin/metrics/measure/instance_statuses_measure.rb
index b918a30a57cc09..5873c6e71fcee3 100644
--- a/app/lib/admin/metrics/measure/instance_statuses_measure.rb
+++ b/app/lib/admin/metrics/measure/instance_statuses_measure.rb
@@ -45,7 +45,7 @@ def sql_query_string
         SELECT count(*) FROM new_statuses
       ) AS value
       FROM (
-        SELECT generate_series(date_trunc('day', :start_at::timestamp)::date, date_trunc('day', :end_at::timestamp)::date, interval '1 day') AS period
+        #{generated_series_days}
       ) AS axis
     SQL
   end
diff --git a/app/lib/admin/metrics/measure/new_users_measure.rb b/app/lib/admin/metrics/measure/new_users_measure.rb
index 6837c14c82cf62..32057154d6b5f7 100644
--- a/app/lib/admin/metrics/measure/new_users_measure.rb
+++ b/app/lib/admin/metrics/measure/new_users_measure.rb
@@ -32,7 +32,7 @@ def sql_query_string
         SELECT count(*) FROM new_users
       ) AS value
       FROM (
-        SELECT generate_series(date_trunc('day', :start_at::timestamp)::date, date_trunc('day', :end_at::timestamp)::date, interval '1 day') AS period
+        #{generated_series_days}
       ) AS axis
     SQL
   end
diff --git a/app/lib/admin/metrics/measure/opened_reports_measure.rb b/app/lib/admin/metrics/measure/opened_reports_measure.rb
index c395c4634118f4..47de38bbe648b6 100644
--- a/app/lib/admin/metrics/measure/opened_reports_measure.rb
+++ b/app/lib/admin/metrics/measure/opened_reports_measure.rb
@@ -32,7 +32,7 @@ def sql_query_string
         SELECT count(*) FROM new_reports
       ) AS value
       FROM (
-        SELECT generate_series(date_trunc('day', :start_at::timestamp)::date, date_trunc('day', :end_at::timestamp)::date, interval '1 day') AS period
+        #{generated_series_days}
       ) AS axis
     SQL
   end
diff --git a/app/lib/admin/metrics/measure/query_helper.rb b/app/lib/admin/metrics/measure/query_helper.rb
index 969065f73f15a6..5969a96ba9f17e 100644
--- a/app/lib/admin/metrics/measure/query_helper.rb
+++ b/app/lib/admin/metrics/measure/query_helper.rb
@@ -15,6 +15,14 @@ def sanitized_sql_string
     ActiveRecord::Base.sanitize_sql_array(sql_array)
   end
 
+  def generated_series_days
+    Arel.sql(
+      <<~SQL.squish
+        SELECT generate_series(timestamp :start_at, :end_at, '1 day')::date AS period
+      SQL
+    )
+  end
+
   def account_domain_sql(include_subdomains)
     if include_subdomains
       "accounts.domain IN (SELECT domain FROM instances WHERE reverse('.' || domain) LIKE reverse('.' || :domain::text))"
diff --git a/app/lib/admin/metrics/measure/resolved_reports_measure.rb b/app/lib/admin/metrics/measure/resolved_reports_measure.rb
index 780db75a10d4d9..ecfd779c86a9df 100644
--- a/app/lib/admin/metrics/measure/resolved_reports_measure.rb
+++ b/app/lib/admin/metrics/measure/resolved_reports_measure.rb
@@ -32,7 +32,7 @@ def sql_query_string
         SELECT count(*) FROM resolved_reports
       ) AS value
       FROM (
-        SELECT generate_series(date_trunc('day', :start_at::timestamp)::date, date_trunc('day', :end_at::timestamp)::date, interval '1 day') AS period
+        #{generated_series_days}
       ) AS axis
     SQL
   end
diff --git a/app/lib/admin/metrics/measure/tag_servers_measure.rb b/app/lib/admin/metrics/measure/tag_servers_measure.rb
index f273d739d04aaa..5db1076062b735 100644
--- a/app/lib/admin/metrics/measure/tag_servers_measure.rb
+++ b/app/lib/admin/metrics/measure/tag_servers_measure.rb
@@ -40,7 +40,7 @@ def sql_query_string
         SELECT COUNT(*) FROM tag_servers
       ) AS value
       FROM (
-        SELECT generate_series(date_trunc('day', :start_at::timestamp)::date, date_trunc('day', :end_at::timestamp)::date, interval '1 day') AS period
+        #{generated_series_days}
       ) as axis
     SQL
   end

From 1622f7aeb9e911d43296caef45e17181652c9c0e Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 11 Jun 2024 03:48:42 -0400
Subject: [PATCH 1246/2191] Remove duplicate fabricator validity checks
 (#29667)

---
 spec/models/import_spec.rb | 5 -----
 spec/models/poll_spec.rb   | 8 --------
 2 files changed, 13 deletions(-)

diff --git a/spec/models/import_spec.rb b/spec/models/import_spec.rb
index 3605f0b9bf8d21..10df5f8c0b2a31 100644
--- a/spec/models/import_spec.rb
+++ b/spec/models/import_spec.rb
@@ -8,11 +8,6 @@
   let(:data) { attachment_fixture('imports.txt') }
 
   describe 'validations' do
-    it 'has a valid parameters' do
-      import = described_class.create(account: account, type: type, data: data)
-      expect(import).to be_valid
-    end
-
     it 'is invalid without an type' do
       import = described_class.create(account: account, data: data)
       expect(import).to model_have_error_on_field(:type)
diff --git a/spec/models/poll_spec.rb b/spec/models/poll_spec.rb
index 5aa5548cc83a1f..ebcc459078b88c 100644
--- a/spec/models/poll_spec.rb
+++ b/spec/models/poll_spec.rb
@@ -31,14 +31,6 @@
   end
 
   describe 'validations' do
-    context 'when valid' do
-      let(:poll) { Fabricate.build(:poll) }
-
-      it 'is valid with valid attributes' do
-        expect(poll).to be_valid
-      end
-    end
-
     context 'when not valid' do
       let(:poll) { Fabricate.build(:poll, expires_at: nil) }
 

From 665f6f09a07fa9d1d813e8343f1687b369e7f3dc Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 11 Jun 2024 04:50:51 -0400
Subject: [PATCH 1247/2191] Add expired/revoked scopes for doorkeeper models
 via extension modules (#29936)

---
 app/lib/access_grant_extension.rb      | 10 ++++++++++
 app/lib/access_token_extension.rb      |  4 ++++
 app/lib/vacuum/access_tokens_vacuum.rb |  8 ++++----
 app/models/web/push_subscription.rb    |  2 +-
 config/application.rb                  |  1 +
 5 files changed, 20 insertions(+), 5 deletions(-)
 create mode 100644 app/lib/access_grant_extension.rb

diff --git a/app/lib/access_grant_extension.rb b/app/lib/access_grant_extension.rb
new file mode 100644
index 00000000000000..bf8f5ae25ae949
--- /dev/null
+++ b/app/lib/access_grant_extension.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module AccessGrantExtension
+  extend ActiveSupport::Concern
+
+  included do
+    scope :expired, -> { where.not(expires_in: nil).where('created_at + MAKE_INTERVAL(secs => expires_in) < NOW()') }
+    scope :revoked, -> { where.not(revoked_at: nil).where(revoked_at: ...Time.now.utc) }
+  end
+end
diff --git a/app/lib/access_token_extension.rb b/app/lib/access_token_extension.rb
index 4e9585dd1e6583..6e06f988a5e3db 100644
--- a/app/lib/access_token_extension.rb
+++ b/app/lib/access_token_extension.rb
@@ -9,6 +9,10 @@ module AccessTokenExtension
     has_many :web_push_subscriptions, class_name: 'Web::PushSubscription', inverse_of: :access_token
 
     after_commit :push_to_streaming_api
+
+    scope :expired, -> { where.not(expires_in: nil).where('created_at + MAKE_INTERVAL(secs => expires_in) < NOW()') }
+    scope :not_revoked, -> { where(revoked_at: nil) }
+    scope :revoked, -> { where.not(revoked_at: nil).where(revoked_at: ...Time.now.utc) }
   end
 
   def revoke(clock = Time)
diff --git a/app/lib/vacuum/access_tokens_vacuum.rb b/app/lib/vacuum/access_tokens_vacuum.rb
index a224f6d6380e58..281ae22bf04c30 100644
--- a/app/lib/vacuum/access_tokens_vacuum.rb
+++ b/app/lib/vacuum/access_tokens_vacuum.rb
@@ -9,12 +9,12 @@ def perform
   private
 
   def vacuum_revoked_access_tokens!
-    Doorkeeper::AccessToken.where.not(expires_in: nil).where('created_at + make_interval(secs => expires_in) < NOW()').in_batches.delete_all
-    Doorkeeper::AccessToken.where.not(revoked_at: nil).where('revoked_at < NOW()').in_batches.delete_all
+    Doorkeeper::AccessToken.expired.in_batches.delete_all
+    Doorkeeper::AccessToken.revoked.in_batches.delete_all
   end
 
   def vacuum_revoked_access_grants!
-    Doorkeeper::AccessGrant.where.not(expires_in: nil).where('created_at + make_interval(secs => expires_in) < NOW()').in_batches.delete_all
-    Doorkeeper::AccessGrant.where.not(revoked_at: nil).where('revoked_at < NOW()').in_batches.delete_all
+    Doorkeeper::AccessGrant.expired.in_batches.delete_all
+    Doorkeeper::AccessGrant.revoked.in_batches.delete_all
   end
 end
diff --git a/app/models/web/push_subscription.rb b/app/models/web/push_subscription.rb
index b482ad3afe25c7..ddfd08146e76ae 100644
--- a/app/models/web/push_subscription.rb
+++ b/app/models/web/push_subscription.rb
@@ -75,7 +75,7 @@ def associated_access_token
 
   class << self
     def unsubscribe_for(application_id, resource_owner)
-      access_token_ids = Doorkeeper::AccessToken.where(application_id: application_id, resource_owner_id: resource_owner.id, revoked_at: nil).pluck(:id)
+      access_token_ids = Doorkeeper::AccessToken.where(application_id: application_id, resource_owner_id: resource_owner.id).not_revoked.pluck(:id)
       where(access_token_id: access_token_ids).delete_all
     end
   end
diff --git a/config/application.rb b/config/application.rb
index b3a9b99ff5b266..65407da05c91a6 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -115,6 +115,7 @@ class Application < Rails::Application
       Doorkeeper::AuthorizationsController.layout 'modal'
       Doorkeeper::AuthorizedApplicationsController.layout 'admin'
       Doorkeeper::Application.include ApplicationExtension
+      Doorkeeper::AccessGrant.include AccessGrantExtension
       Doorkeeper::AccessToken.include AccessTokenExtension
       Devise::FailureApp.include AbstractController::Callbacks
       Devise::FailureApp.include Localized

From 410370eecdcc6ad7aeac30c48957d3b044e7cabe Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 11 Jun 2024 05:40:47 -0400
Subject: [PATCH 1248/2191] Extract `PERMITTED_PARAMS` constant from
 `admin/domain_blocks` controller (#30380)

---
 .../admin/domain_blocks_controller.rb         | 22 +++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/app/controllers/admin/domain_blocks_controller.rb b/app/controllers/admin/domain_blocks_controller.rb
index 325b33df80be66..16a8cb9eeae715 100644
--- a/app/controllers/admin/domain_blocks_controller.rb
+++ b/app/controllers/admin/domain_blocks_controller.rb
@@ -4,6 +4,18 @@ module Admin
   class DomainBlocksController < BaseController
     before_action :set_domain_block, only: [:destroy, :edit, :update]
 
+    PERMITTED_PARAMS = %i(
+      domain
+      obfuscate
+      private_comment
+      public_comment
+      reject_media
+      reject_reports
+      severity
+    ).freeze
+
+    PERMITTED_UPDATE_PARAMS = PERMITTED_PARAMS.without(:domain).freeze
+
     def batch
       authorize :domain_block, :create?
       @form = Form::DomainBlockBatch.new(form_domain_block_batch_params.merge(current_account: current_account, action: action_from_button))
@@ -88,11 +100,17 @@ def set_domain_block
     end
 
     def update_params
-      params.require(:domain_block).permit(:severity, :reject_media, :reject_reports, :private_comment, :public_comment, :obfuscate)
+      params
+        .require(:domain_block)
+        .slice(*PERMITTED_UPDATE_PARAMS)
+        .permit(*PERMITTED_UPDATE_PARAMS)
     end
 
     def resource_params
-      params.require(:domain_block).permit(:domain, :severity, :reject_media, :reject_reports, :private_comment, :public_comment, :obfuscate)
+      params
+        .require(:domain_block)
+        .slice(*PERMITTED_PARAMS)
+        .permit(*PERMITTED_PARAMS)
     end
 
     def form_domain_block_batch_params

From f48f39a7679667da51171a77a0e1bcbc7512cd36 Mon Sep 17 00:00:00 2001
From: David Roetzel <david@roetzel.de>
Date: Tue, 11 Jun 2024 14:54:37 +0200
Subject: [PATCH 1249/2191] Fix cutoff of instance name (#30598)

---
 app/javascript/styles/mastodon/forms.scss | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/javascript/styles/mastodon/forms.scss b/app/javascript/styles/mastodon/forms.scss
index f6ec44fb5380fa..26bb2bee1450ad 100644
--- a/app/javascript/styles/mastodon/forms.scss
+++ b/app/javascript/styles/mastodon/forms.scss
@@ -613,9 +613,10 @@ code {
       font-family: inherit;
       pointer-events: none;
       cursor: default;
-      max-width: 140px;
+      max-width: 50%;
       white-space: nowrap;
       overflow: hidden;
+      text-overflow: ellipsis;
 
       &::after {
         content: '';

From 328d3a87f5749b5b9ea2c17289fc7a53dbaa6d7b Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 11 Jun 2024 15:58:10 +0200
Subject: [PATCH 1250/2191] Fix libvips color extraction when multiple maxima
 differ only on blue component (#30632)

---
 lib/paperclip/color_extractor.rb | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/lib/paperclip/color_extractor.rb b/lib/paperclip/color_extractor.rb
index 0f168d233b2c14..378af0961de0d3 100644
--- a/lib/paperclip/color_extractor.rb
+++ b/lib/paperclip/color_extractor.rb
@@ -122,26 +122,28 @@ def palette_from_image(image)
 
       colors['out_array'].zip(colors['x_array'], colors['y_array']).map do |v, x, y|
         rgb_from_xyv(histogram, x, y, v)
-      end.reverse
+      end.flatten.reverse.uniq
     end
 
     # rubocop:disable Naming/MethodParameterName
     def rgb_from_xyv(image, x, y, v)
       pixel = image.getpoint(x, y)
 
-      # Unfortunately, we only have the first 2 dimensions, so try to
-      # guess the third one by looking up the value
+      # As we only have the first 2 dimensions for this maximum, we
+      # can't distinguish with different maxima with the same `r` and `g`
+      # values but different `b` values.
+      #
+      # Therefore, we return an array of maxima, which is always non-empty,
+      # but may contain multiple colors with the same values.
 
-      # NOTE: this means that if multiple bins with the same `r` and `g`
-      # components have the same number of occurrences, we will always return
-      # the one with the lowest `b` value. This means that in case of a tie,
-      # we will return the same color twice and skip the ones it tied with.
-      z = pixel.find_index(v)
+      pixel.filter_map.with_index do |pv, z|
+        next if pv != v
 
-      r = (x + 0.5) * 256 / BINS
-      g = (y + 0.5) * 256 / BINS
-      b = (z + 0.5) * 256 / BINS
-      ColorDiff::Color::RGB.new(r, g, b)
+        r = (x + 0.5) * 256 / BINS
+        g = (y + 0.5) * 256 / BINS
+        b = (z + 0.5) * 256 / BINS
+        ColorDiff::Color::RGB.new(r, g, b)
+      end
     end
 
     def w3c_contrast(color1, color2)

From b124dff1748797e54256e1c8161d18513b921458 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 11 Jun 2024 15:58:40 +0200
Subject: [PATCH 1251/2191] chore(deps): update opentelemetry-ruby (non-major)
 (#30648)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 984bc32d49b7ed..c2253fe19cf28b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -498,6 +498,10 @@ GEM
       opentelemetry-semantic_conventions
     opentelemetry-helpers-sql-obfuscation (0.1.0)
       opentelemetry-common (~> 0.20)
+    opentelemetry-instrumentation-action_mailer (0.1.0)
+      opentelemetry-api (~> 1.0)
+      opentelemetry-instrumentation-active_support (~> 0.1)
+      opentelemetry-instrumentation-base (~> 0.22.1)
     opentelemetry-instrumentation-action_pack (0.9.0)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
@@ -551,8 +555,9 @@ GEM
       opentelemetry-api (~> 1.0)
       opentelemetry-common (~> 0.20.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-rails (0.30.1)
+    opentelemetry-instrumentation-rails (0.30.2)
       opentelemetry-api (~> 1.0)
+      opentelemetry-instrumentation-action_mailer (~> 0.1.0)
       opentelemetry-instrumentation-action_pack (~> 0.9.0)
       opentelemetry-instrumentation-action_view (~> 0.7.0)
       opentelemetry-instrumentation-active_job (~> 0.7.0)

From 62d070c438a2cccb6af486a02d8c6839d642c827 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 11 Jun 2024 09:59:56 -0400
Subject: [PATCH 1252/2191] Check both before/after state in
 `AccountDomainBlock` spec (#30640)

---
 spec/models/account_domain_block_spec.rb | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/spec/models/account_domain_block_spec.rb b/spec/models/account_domain_block_spec.rb
index 10bd579363c486..d994403b8e8cfb 100644
--- a/spec/models/account_domain_block_spec.rb
+++ b/spec/models/account_domain_block_spec.rb
@@ -3,22 +3,30 @@
 require 'rails_helper'
 
 RSpec.describe AccountDomainBlock do
+  let(:account) { Fabricate(:account) }
+
   it 'removes blocking cache after creation' do
-    account = Fabricate(:account)
     Rails.cache.write("exclude_domains_for:#{account.id}", 'a.domain.already.blocked')
 
-    described_class.create!(account: account, domain: 'a.domain.blocked.later')
-
-    expect(Rails.cache.exist?("exclude_domains_for:#{account.id}")).to be false
+    expect { block_domain_for_account('a.domain.blocked.later') }
+      .to change { account_has_exclude_domains_cache? }.to(false)
   end
 
   it 'removes blocking cache after destruction' do
-    account = Fabricate(:account)
-    block = described_class.create!(account: account, domain: 'domain')
+    block = block_domain_for_account('domain')
     Rails.cache.write("exclude_domains_for:#{account.id}", 'domain')
 
-    block.destroy!
+    expect { block.destroy! }
+      .to change { account_has_exclude_domains_cache? }.to(false)
+  end
+
+  private
+
+  def block_domain_for_account(domain)
+    Fabricate(:account_domain_block, account: account, domain: domain)
+  end
 
-    expect(Rails.cache.exist?("exclude_domains_for:#{account.id}")).to be false
+  def account_has_exclude_domains_cache?
+    Rails.cache.exist?("exclude_domains_for:#{account.id}")
   end
 end

From 978601a0ae556c4e214df8f6d73181c2a6359531 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 11 Jun 2024 11:29:41 -0400
Subject: [PATCH 1253/2191] Extract permitted params constant in v1/admin/tags
 (#30652)

---
 app/controllers/api/v1/admin/tags_controller.rb | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/controllers/api/v1/admin/tags_controller.rb b/app/controllers/api/v1/admin/tags_controller.rb
index 67d987d0e3d8a1..283383acb4ac46 100644
--- a/app/controllers/api/v1/admin/tags_controller.rb
+++ b/app/controllers/api/v1/admin/tags_controller.rb
@@ -13,6 +13,13 @@ class Api::V1::Admin::TagsController < Api::BaseController
 
   LIMIT = 100
 
+  PERMITTED_PARAMS = %i(
+    display_name
+    listable
+    trendable
+    usable
+  ).freeze
+
   def index
     authorize :tag, :index?
     render json: @tags, each_serializer: REST::Admin::TagSerializer
@@ -40,7 +47,9 @@ def set_tags
   end
 
   def tag_params
-    params.permit(:display_name, :trendable, :usable, :listable)
+    params
+      .slice(*PERMITTED_PARAMS)
+      .permit(*PERMITTED_PARAMS)
   end
 
   def next_path

From 921b0db5440cc6e0bc990d6f0186c43aaa887fe9 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 11 Jun 2024 17:29:45 +0200
Subject: [PATCH 1254/2191] Add `noindex` meta tag and `rel=canonical` link to
 redirect interstitials (#30651)

---
 app/views/redirects/show.html.haml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/views/redirects/show.html.haml b/app/views/redirects/show.html.haml
index 0d09387a9c7fef..64436e05d14c43 100644
--- a/app/views/redirects/show.html.haml
+++ b/app/views/redirects/show.html.haml
@@ -1,3 +1,7 @@
+- content_for :header_tags do
+  %meta{ name: 'robots', content: 'noindex, noarchive' }/
+  %link{ rel: 'canonical', href: @redirect_path }
+
 .redirect
   .redirect__logo
     = link_to render_logo, root_path

From d818ddd6870094e89e58ef61f37da4cb73935856 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 11 Jun 2024 11:36:21 -0400
Subject: [PATCH 1255/2191] Extract `SIGN_COUNT_LIMIT` constant in
 `WebauthnCredential` class (#30636)

---
 app/models/webauthn_credential.rb                             | 4 +++-
 ...bauthn_credentials_spec.rb => webauthn_credential_spec.rb} | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)
 rename spec/models/{webauthn_credentials_spec.rb => webauthn_credential_spec.rb} (95%)

diff --git a/app/models/webauthn_credential.rb b/app/models/webauthn_credential.rb
index 4fa31ece520bc8..d7ed1b9d401d8e 100644
--- a/app/models/webauthn_credential.rb
+++ b/app/models/webauthn_credential.rb
@@ -15,9 +15,11 @@
 #
 
 class WebauthnCredential < ApplicationRecord
+  SIGN_COUNT_LIMIT = (2**63)
+
   validates :external_id, :public_key, :nickname, :sign_count, presence: true
   validates :external_id, uniqueness: true
   validates :nickname, uniqueness: { scope: :user_id }
   validates :sign_count,
-            numericality: { only_integer: true, greater_than_or_equal_to: 0, less_than_or_equal_to: (2**63) - 1 }
+            numericality: { only_integer: true, greater_than_or_equal_to: 0, less_than_or_equal_to: SIGN_COUNT_LIMIT - 1 }
 end
diff --git a/spec/models/webauthn_credentials_spec.rb b/spec/models/webauthn_credential_spec.rb
similarity index 95%
rename from spec/models/webauthn_credentials_spec.rb
rename to spec/models/webauthn_credential_spec.rb
index 9631245e11bbc7..23f0229a67ab39 100644
--- a/spec/models/webauthn_credentials_spec.rb
+++ b/spec/models/webauthn_credential_spec.rb
@@ -71,8 +71,8 @@
       expect(webauthn_credential).to model_have_error_on_field(:sign_count)
     end
 
-    it 'is invalid if sign_count is greater 2**63 - 1' do
-      webauthn_credential = Fabricate.build(:webauthn_credential, sign_count: 2**63)
+    it 'is invalid if sign_count is greater than the limit' do
+      webauthn_credential = Fabricate.build(:webauthn_credential, sign_count: (described_class::SIGN_COUNT_LIMIT * 2))
 
       webauthn_credential.valid?
 

From f214813919309b0b8bda628835029e204d56dd31 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 11 Jun 2024 19:54:27 +0200
Subject: [PATCH 1256/2191] Adapt settings spec to glitch-soc

---
 .../settings/preferences/appearance_controller_spec.rb        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/controllers/settings/preferences/appearance_controller_spec.rb b/spec/controllers/settings/preferences/appearance_controller_spec.rb
index 84b82772502fec..c59d3151041fc7 100644
--- a/spec/controllers/settings/preferences/appearance_controller_spec.rb
+++ b/spec/controllers/settings/preferences/appearance_controller_spec.rb
@@ -23,11 +23,11 @@
   end
 
   describe 'PUT #update' do
-    subject { put :update, params: { user: { settings_attributes: { theme: 'contrast' } } } }
+    subject { put :update, params: { user: { settings_attributes: { skin: 'contrast' } } } }
 
     it 'redirects correctly' do
       expect { subject }
-        .to change { user.reload.settings.theme }.to('contrast')
+        .to change { user.reload.settings.skin }.to('contrast')
 
       expect(response).to redirect_to(settings_preferences_appearance_path)
     end

From cec8e34b250c368ec6c4a5acb75eed311aa901bf Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 11 Jun 2024 16:29:00 -0400
Subject: [PATCH 1257/2191] Remove unused CI env vars (#30660)

---
 .github/workflows/test-migrations-one-step.yml | 1 -
 .github/workflows/test-migrations-two-step.yml | 1 -
 2 files changed, 2 deletions(-)

diff --git a/.github/workflows/test-migrations-one-step.yml b/.github/workflows/test-migrations-one-step.yml
index 1ff5cc06b9f096..104e1b067c7b40 100644
--- a/.github/workflows/test-migrations-one-step.yml
+++ b/.github/workflows/test-migrations-one-step.yml
@@ -57,7 +57,6 @@ jobs:
           - 6379:6379
 
     env:
-      CONTINUOUS_INTEGRATION: true
       DB_HOST: localhost
       DB_USER: postgres
       DB_PASS: postgres
diff --git a/.github/workflows/test-migrations-two-step.yml b/.github/workflows/test-migrations-two-step.yml
index 66988473152655..c4209d6329d78e 100644
--- a/.github/workflows/test-migrations-two-step.yml
+++ b/.github/workflows/test-migrations-two-step.yml
@@ -57,7 +57,6 @@ jobs:
           - 6379:6379
 
     env:
-      CONTINUOUS_INTEGRATION: true
       DB_HOST: localhost
       DB_USER: postgres
       DB_PASS: postgres

From 1dfd51628416598d2386621b6229a4f169cd360e Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 12 Jun 2024 09:28:28 +0200
Subject: [PATCH 1258/2191] Fix duplicate `@context` attribute in user export
 (#30653)

---
 app/services/backup_service.rb       |  4 ++--
 spec/services/backup_service_spec.rb | 10 ++++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/app/services/backup_service.rb b/app/services/backup_service.rb
index 886bab1ebfe54d..1e9018437685f0 100644
--- a/app/services/backup_service.rb
+++ b/app/services/backup_service.rb
@@ -19,8 +19,8 @@ def call(backup)
 
   def build_outbox_json!(file)
     skeleton = serialize(collection_presenter, ActivityPub::CollectionSerializer)
-    skeleton[:@context] = full_context
-    skeleton[:orderedItems] = ['!PLACEHOLDER!']
+    skeleton['@context'] = full_context
+    skeleton['orderedItems'] = ['!PLACEHOLDER!']
     skeleton = Oj.dump(skeleton)
     prepend, append = skeleton.split('"!PLACEHOLDER!"')
     add_comma = false
diff --git a/spec/services/backup_service_spec.rb b/spec/services/backup_service_spec.rb
index b4cb60083b7ff1..145b06e3722ca9 100644
--- a/spec/services/backup_service_spec.rb
+++ b/spec/services/backup_service_spec.rb
@@ -55,9 +55,11 @@ def process_backup
   end
 
   def expect_outbox_export
-    json = export_json(:outbox)
+    body = export_json_raw(:outbox)
+    json = Oj.load(body)
 
     aggregate_failures do
+      expect(body.scan('@context').count).to eq 1
       expect(json['@context']).to_not be_nil
       expect(json['type']).to eq 'OrderedCollection'
       expect(json['totalItems']).to eq 2
@@ -85,8 +87,12 @@ def expect_bookmarks_export
     end
   end
 
+  def export_json_raw(type)
+    read_zip_file(backup, "#{type}.json")
+  end
+
   def export_json(type)
-    Oj.load(read_zip_file(backup, "#{type}.json"))
+    Oj.load(export_json_raw(type))
   end
 
   def include_create_item(status)

From ced463360e39b92689144e366b6f3a9ceabf1bf7 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 12 Jun 2024 12:48:31 +0200
Subject: [PATCH 1259/2191] New Crowdin Translations (automated) (#30666)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/be.json | 19 ++++++++++++++++++-
 app/javascript/mastodon/locales/ur.json |  5 +++++
 config/locales/be.yml                   |  3 +++
 config/locales/doorkeeper.be.yml        |  2 ++
 config/locales/doorkeeper.fy.yml        |  2 ++
 config/locales/fy.yml                   |  1 +
 config/locales/simple_form.be.yml       |  6 ++++++
 config/locales/simple_form.fy.yml       |  2 ++
 8 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/locales/be.json b/app/javascript/mastodon/locales/be.json
index 61e96e4b585b91..041d90775b5795 100644
--- a/app/javascript/mastodon/locales/be.json
+++ b/app/javascript/mastodon/locales/be.json
@@ -308,6 +308,8 @@
   "follow_requests.unlocked_explanation": "Ваш акаўнт не схаваны, аднак прадстаўнікі {domain} палічылі, што вы можаце захацець праглядзець запыты на падпіску з гэтых профіляў уручную.",
   "follow_suggestions.curated_suggestion": "Выбар адміністрацыі",
   "follow_suggestions.dismiss": "Не паказваць зноў",
+  "follow_suggestions.featured_longer": "Адабраныя камандай {domain} уручную",
+  "follow_suggestions.friends_of_friends_longer": "Папулярнае сярод людзей, на якіх Вы падпісаны",
   "follow_suggestions.hints.featured": "Гэты профіль быў выбраны ўручную камандай {domain}.",
   "follow_suggestions.hints.friends_of_friends": "Гэты профіль папулярны сярод людзей, на якіх вы падпісаліся.",
   "follow_suggestions.hints.most_followed": "Гэты профіль - адзін з профіляў з самай вялікай колькасцю падпісак на {domain}.",
@@ -315,6 +317,8 @@
   "follow_suggestions.hints.similar_to_recently_followed": "Гэты профіль падобны на профілі, на якія вы нядаўна падпісаліся.",
   "follow_suggestions.personalized_suggestion": "Персаналізаваная прапанова",
   "follow_suggestions.popular_suggestion": "Папулярная прапанова",
+  "follow_suggestions.popular_suggestion_longer": "Папулярнае на {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Падобныя профілі, за якімі вы нядаўна сачылі",
   "follow_suggestions.view_all": "Праглядзець усё",
   "follow_suggestions.who_to_follow": "На каго падпісацца",
   "followed_tags": "Падпіскі",
@@ -410,6 +414,7 @@
   "limited_account_hint.action": "Усе роўна паказваць профіль",
   "limited_account_hint.title": "Гэты профіль быў схаваны мадэратарамі",
   "link_preview.author": "Ад {name}",
+  "link_preview.more_from_author": "Больш ад {name}",
   "lists.account.add": "Дадаць да спісу",
   "lists.account.remove": "Выдаліць са спісу",
   "lists.delete": "Выдаліць спіс",
@@ -458,7 +463,7 @@
   "navigation_bar.opened_in_classic_interface": "Допісы, уліковыя запісы і іншыя спецыфічныя старонкі па змоўчанні адчыняюцца ў класічным вэб-інтэрфейсе.",
   "navigation_bar.personal": "Асабістае",
   "navigation_bar.pins": "Замацаваныя допісы",
-  "navigation_bar.preferences": "Параметры",
+  "navigation_bar.preferences": "Налады",
   "navigation_bar.public_timeline": "Глабальная стужка",
   "navigation_bar.search": "Пошук",
   "navigation_bar.security": "Бяспека",
@@ -470,10 +475,22 @@
   "notification.follow_request": "{name} адправіў запыт на падпіску",
   "notification.mention": "{name} згадаў вас",
   "notification.moderation-warning.learn_more": "Даведацца больш",
+  "notification.moderation_warning": "Вы атрымалі папярэджанне аб мадэрацыі",
+  "notification.moderation_warning.action_delete_statuses": "Некаторыя вашыя допісы былі выдаленыя.",
+  "notification.moderation_warning.action_disable": "Ваш уліковы запіс быў адключаны.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Некаторыя з вашых допісаў былі пазначаныя як далікатныя.",
+  "notification.moderation_warning.action_none": "Ваш уліковы запіс атрымаў папярэджанне ад мадэратараў.",
+  "notification.moderation_warning.action_sensitive": "З гэтага моманту вашыя допісы будуць пазначаныя як далікатныя.",
+  "notification.moderation_warning.action_silence": "Ваш уліковы запіс быў абмежаваны.",
+  "notification.moderation_warning.action_suspend": "Ваш уліковы запіс быў прыпынены.",
   "notification.own_poll": "Ваша апытанне скончылася",
   "notification.poll": "Апытанне, дзе вы прынялі ўдзел, скончылася",
   "notification.reblog": "{name} пашырыў ваш допіс",
+  "notification.relationships_severance_event": "Страціў сувязь з {name}",
+  "notification.relationships_severance_event.account_suspension": "Адміністратар з {from} прыпыніў працу {target}, што азначае, што вы больш не можаце атрымліваць ад іх абнаўлення ці ўзаемадзейнічаць з імі.",
+  "notification.relationships_severance_event.domain_block": "Адміністратар з {from} заблакіраваў {target}, у тым ліку {followersCount} вашых падпісчыка(-аў) і {followingCount, plural, one {# уліковы запіс} few {# уліковыя запісы} many {# уліковых запісаў} other {# уліковых запісаў}}.",
   "notification.relationships_severance_event.learn_more": "Даведацца больш",
+  "notification.relationships_severance_event.user_domain_block": "Вы заблакіравалі {target} выдаліўшы {followersCount} сваіх падпісчыкаў і {followingCount, plural, one {# уліковы запіс} few {# уліковыя запісы} many {# уліковых запісаў} other {# уліковых запісаў}}, за якімі вы сочыце.",
   "notification.status": "Новы допіс ад {name}",
   "notification.update": "Допіс {name} адрэдагаваны",
   "notification_requests.accept": "Прыняць",
diff --git a/app/javascript/mastodon/locales/ur.json b/app/javascript/mastodon/locales/ur.json
index 37f156c28fc9f6..6f3debae2eaacb 100644
--- a/app/javascript/mastodon/locales/ur.json
+++ b/app/javascript/mastodon/locales/ur.json
@@ -26,6 +26,7 @@
   "account.featured_tags.last_status_never": "کوئی مراسلہ نہیں",
   "account.featured_tags.title": "{name} کے نمایاں ہیش ٹیگز",
   "account.follow": "پیروی کریں",
+  "account.follow_back": "اکاؤنٹ کو فالو بیک ",
   "account.followers": "پیروکار",
   "account.followers.empty": "\"ہنوز اس صارف کی کوئی پیروی نہیں کرتا\".",
   "account.followers_counter": "{count, plural,one {{counter} پیروکار} other {{counter} پیروکار}}",
@@ -46,6 +47,7 @@
   "account.mute_notifications_short": "نوٹیفیکیشنز کو خاموش کریں",
   "account.mute_short": "خاموش",
   "account.muted": "خاموش کردہ",
+  "account.mutual": "میوچول اکاؤنٹ",
   "account.no_bio": "کوئی تفصیل نہیں دی گئی۔",
   "account.open_original_page": "اصل صفحہ کھولیں",
   "account.posts": "ٹوٹ",
@@ -65,7 +67,10 @@
   "account.unmute_notifications_short": "نوٹیفیکیشنز کو خاموش نہ کریں",
   "account.unmute_short": "کو خاموش نہ کریں",
   "account_note.placeholder": "Click to add a note",
+  "admin.dashboard.daily_retention": "ایڈمن ڈیش بورڈ کو ڈیلی چیک ان کریں",
+  "admin.dashboard.monthly_retention": "ایڈمن کیش بورڈ کو منتھلی چیک ان کریں",
   "admin.dashboard.retention.average": "اوسط",
+  "admin.dashboard.retention.cohort": "Sign-up month",
   "admin.dashboard.retention.cohort_size": "نئے یسرز",
   "alert.rate_limited.message": "\"{retry_time, time, medium} کے بعد کوشش کریں\".",
   "alert.rate_limited.title": "محدود شرح",
diff --git a/config/locales/be.yml b/config/locales/be.yml
index 6f1f189523e61e..a14ba3d2243e9d 100644
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -291,6 +291,7 @@ be:
         update_custom_emoji_html: "%{name} абнавіў эмодзі %{target}"
         update_domain_block_html: "%{name} абнавіў блакіроўку дамена для %{target}"
         update_ip_block_html: "%{name} змяніў правіла для IP %{target}"
+        update_report_html: "%{name} абнавіў скаргу %{target}"
         update_status_html: "%{name} абнавіў допіс %{target}"
         update_user_role_html: "%{name} змяніў ролю %{target}"
       deleted_account: выдалены ўліковы запіс
@@ -779,6 +780,7 @@ be:
         desc_html: Гэта функцыянальнасць залежыць ад знешніх скрыптоў hCaptcha, што можа быць праблемай бяспекі і прыватнасці. Акрамя таго, <strong>гэта можа зрабіць працэс рэгістрацыі значна менш даступным для некаторых людзей, асабліва інвалідаў</strong>. Па гэтых прычынах, калі ласка, разгледзьце альтэрнатыўныя меры, такія як рэгістрацыя на аснове зацвярджэння або запрашэння.
         title: Патрабаваць ад новых карыстальнікаў рашэння CAPTCHA для пацверджання іх уліковага запісу
       content_retention:
+        danger_zone: Небяспечная зона
         preamble: Кантралюйце, як створаны карыстальнікамі кантэнт захоўваецца ў Mastodon.
         title: Утрыманне кантэнту
       default_noindex:
@@ -983,6 +985,7 @@ be:
       delete: Выдаліць
       edit_preset: Рэдагаваць шаблон папярэджання
       empty: Вы яшчэ не вызначылі ніякіх шаблонаў папярэджанняў.
+      title: Папярэджальныя прадусталёўкі
     webhooks:
       add_new: Дадаць канцавую кропку
       delete: Выдаліць
diff --git a/config/locales/doorkeeper.be.yml b/config/locales/doorkeeper.be.yml
index 748cbeafa122e5..f4faed1f09e1cf 100644
--- a/config/locales/doorkeeper.be.yml
+++ b/config/locales/doorkeeper.be.yml
@@ -135,6 +135,7 @@ be:
         media: Мультымедыйныя далучэнні
         mutes: Ігнараваныя
         notifications: Апавяшчэнні
+        profile: Ваш профіль Mastodon
         push: Push-апавяшчэнні
         reports: Скаргі
         search: Пошук
@@ -165,6 +166,7 @@ be:
       admin:write:reports: мадэраваць скаргі
       crypto: выкарыстоўваць скразное шыфраванне (end-to-end)
       follow: змяняць зносіны ўліковага запісу
+      profile: чытаць толькі інфармацыю профілю вашага ўліковага запісу
       push: атрымліваць push-апавяшчэнні
       read: чытаць усе даныя вашага ўліковага запісу
       read:accounts: бачыць інфармацыю аб уліковых запісах
diff --git a/config/locales/doorkeeper.fy.yml b/config/locales/doorkeeper.fy.yml
index a43defc427ef67..1cf2d32212a8f1 100644
--- a/config/locales/doorkeeper.fy.yml
+++ b/config/locales/doorkeeper.fy.yml
@@ -135,6 +135,7 @@ fy:
         media: Mediabylagen
         mutes: Negearre
         notifications: Meldingen
+        profile: Jo Mastodon-profyl
         push: Pushmeldingen
         reports: Rapportaazjes
         search: Sykje
@@ -165,6 +166,7 @@ fy:
       admin:write:reports: moderaasjemaatregelen nimme yn rapportaazjes
       crypto: ein-ta-ein-fersifering brûke
       follow: relaasjes tusken accounts bewurkje
+      profile: allinnich de profylgegevens fan jo account lêze
       push: jo pushmeldingen ûntfange
       read: alle gegevens fan jo account lêze
       read:accounts: accountynformaasje besjen
diff --git a/config/locales/fy.yml b/config/locales/fy.yml
index c8e287732a7c54..54e28608efa779 100644
--- a/config/locales/fy.yml
+++ b/config/locales/fy.yml
@@ -285,6 +285,7 @@ fy:
         update_custom_emoji_html: Emoji %{target} is troch %{name} bywurke
         update_domain_block_html: "%{name} hat de domeinblokkade bywurke foar %{target}"
         update_ip_block_html: "%{name} hat de rigel foar IP %{target} wizige"
+        update_report_html: Rapportaazje %{target} is troch %{name} bywurke
         update_status_html: "%{name} hat de berjochten %{target} bywurke"
         update_user_role_html: "%{name} hat de rol %{target} wizige"
       deleted_account: fuortsmiten account
diff --git a/config/locales/simple_form.be.yml b/config/locales/simple_form.be.yml
index f8000a1c81ca64..101d40f117364c 100644
--- a/config/locales/simple_form.be.yml
+++ b/config/locales/simple_form.be.yml
@@ -77,10 +77,15 @@ be:
           warn: Схаваць адфільтраваны кантэнт за папярэджаннем з назвай фільтру
       form_admin_settings:
         activity_api_enabled: Падлік лакальна апублікаваных пастоў, актыўных карыстальнікаў і новых рэгістрацый у тыдзень
+        app_icon: WEBP, PNG, GIF ці JPG. Заменіце прадвызначаны значок праграмы на мабільных прыладах карыстальніцкім значком.
+        backups_retention_period: Карыстальнікі могуць ствараць архівы сваіх допісаў для наступнай запампоўкі. Пры станоўчай колькасці дзён гэтыя архівы будуць аўтаматычна выдаляцца са сховішча пасля заканчэння названай колькасці дзён.
         bootstrap_timeline_accounts: Гэтыя ўліковыя запісы будуць замацаваны ў топе рэкамендацый для новых карыстальнікаў.
         closed_registrations_message: Паказваецца, калі рэгістрацыя закрытая
+        content_cache_retention_period: Усе допісы з іншых сервераў (уключаючы пашырэнні і адказы) будуць выдаленыя праз паказаную колькасць дзён, незалежна ад таго, як лакальны карыстальнік узаемадзейнічаў з гэтымі допісамі. Гэта датычыцца і тых допісаў, якія лакальны карыстальнік пазначыў у закладкі або ўпадабанае. Прыватныя згадкі паміж карыстальнікамі з розных інстанс таксама будуць страчаныя і не змогуць быць адноўлены. Выкарыстанне гэтай налады прызначана для асобнікаў спецыяльнага прызначэння і парушае многія чаканні карыстальнікаў пры выкарыстанні ў агульных мэтах.
         custom_css: Вы можаце прымяняць карыстальніцкія стылі ў вэб-версіі Mastodon.
+        favicon: WEBP, PNG, GIF ці JPG. Замяняе прадвызначаны favicon Mastodon на ўласны значок.
         mascot: Замяняе ілюстрацыю ў пашыраным вэб-інтэрфейсе.
+        media_cache_retention_period: Медыяфайлы з допісаў, зробленых выдаленымі карыстальнікамі, кэшыруюцца на вашым серверы. Пры станоўчым значэнні медыяфайлы будуць выдалены праз пазначаную колькасць дзён. Калі медыядадзеныя будуць запытаны пасля выдалення, яны будуць загружаны паўторна, калі зыходны кантэнт усё яшчэ даступны. У сувязі з абмежаваннямі на частату абнаўлення відарысаў іншых сайтаў, рэкамендуецца ўсталяваць значэнне не менш за 14 дзён, інакш відарысы не будуць загружацца па запыце раней за гэты тэрмін.
         peers_api_enabled: Спіс даменных імён, з якімі сутыкнуўся гэты сервер у федэсвеце. Дадзеныя аб тым, ці знаходзіцеся вы з пэўным серверам у федэрацыі, не ўключаныя, ёсць толькі тое, што ваш сервер ведае пра гэта. Гэта выкарыстоўваецца сэрвісамі, якія збіраюць статыстыку па федэрацыі ў агульным сэнсе.
         profile_directory: Дырэкторыя профіляў змяшчае спіс усіх карыстальнікаў, якія вырашылі быць бачнымі.
         require_invite_text: Калі рэгістрацыя патрабуе ручнога пацвержання, зрабіце поле "Чаму вы хочаце далучыцца?" абавязковым
@@ -240,6 +245,7 @@ be:
         backups_retention_period: Працягласць захавання архіву карыстальніка
         bootstrap_timeline_accounts: Заўсёды раіць гэтыя ўліковыя запісы новым карыстальнікам
         closed_registrations_message: Уласнае паведамленне, калі рэгістрацыя немагчымая
+        content_cache_retention_period: Перыяд захоўвання выдаленага змесціва
         custom_css: CSS карыстальніка
         mascot: Уласны маскот(спадчына)
         media_cache_retention_period: Працягласць захавання кэшу для медыя
diff --git a/config/locales/simple_form.fy.yml b/config/locales/simple_form.fy.yml
index 8d599324b33be8..9e0f67b70725ac 100644
--- a/config/locales/simple_form.fy.yml
+++ b/config/locales/simple_form.fy.yml
@@ -77,11 +77,13 @@ fy:
           warn: Ferstopje de filtere ynhâld efter in warskôging, mei de titel fan it filter as warskôgingstekst
       form_admin_settings:
         activity_api_enabled: Tal lokaal publisearre artikelen, aktive brûkers en nije registraasjes yn wyklikse werjefte
+        app_icon: WEBP, PNG, GIF of JPG. Ferfangt op mobile apparaten it standert app-pictogram mei in oanpast piktogram.
         backups_retention_period: Brûkers hawwe de mooglikheid om argiven fan harren berjochten te generearjen om letter te downloaden. Wannear ynsteld op in positive wearde, wurde dizze argiven automatysk fuortsmiten út jo ûnthâld nei it opjûne oantal dagen.
         bootstrap_timeline_accounts: Dizze accounts wurde boppe oan de oanrekommandaasjes oan nije brûkers toand. Meardere brûkersnammen troch komma’s skiede.
         closed_registrations_message: Werjûn wannear’t registraasje fan nije accounts útskeakele is
         content_cache_retention_period: Alle berjochten fan oare servers (ynklusyf boosts en reaksjes) wurde fuortsmiten nei it opjûne oantal dagen, nettsjinsteande iennige lokale brûkersynteraksje mei dy berjochten. Dit oanbelanget ek berjochten dy’t in lokale brûker oan harren blêdwizers tafoege hat of as favoryt markearre hat. Priveeberjochten tusken brûkers fan ferskate servers gean ek ferlern en binne ûnmooglik te werstellen. It gebrûk fan dizze ynstelling is bedoeld foar servers dy’t in spesjaal doel tsjinje en oertrêdet in protte brûkersferwachtingen wannear’t dizze foar algemien gebrûk ymplemintearre wurdt.
         custom_css: Jo kinne oanpaste CSS tapasse op de webferzje fan dizze Mastodon-server.
+        favicon: WEBP, PNG, GIF of JPG. Ferfangt de standert Mastodon-favicon mei in oanpast piktogram.
         mascot: Oerskriuwt de yllustraasje yn de avansearre webomjouwing.
         media_cache_retention_period: Mediabestannen fan berjochten fan eksterne brûkers wurde op jo server yn de buffer bewarre. Wannear ynsteld op in positive wearde, wurde media fuortsmiten nei it opjûne oantal dagen. As de mediagegevens opfrege wurde neidat se fuortsmiten binne, wurde se opnij download wannear de orizjinele ynhâld noch hieltyd beskikber is. Fanwegen beheiningen op hoe faak keppelingsfoarbylden websites fan tredden rieplachtsje, wurdt oanrekommandearre om dizze wearde yn te stellen op op syn minste 14 dagen. Oars wurde keppelingsfoarbylden net op oanfraach bywurke.
         peers_api_enabled: In list mei domeinnammen, dêr’t dizze server yn fediverse kontakt hân mei hat. Hjir wurdt gjin data dield, oft jo mei in bepaalde server federearrest, mar alinnich, dat jo server dat wit. Dit wurdt foar tsjinsten brûkt, dy’t statistiken oer federaasje yn algemiene sin sammelet.

From dff48ff705b8193702cdef149f8cd8748365d48f Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 12 Jun 2024 13:04:54 +0200
Subject: [PATCH 1260/2191] fix(deps): update dependency sass to v1.77.5
 (#30665)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 33cd7b481d414d..b88cfaab14a6ab 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -15355,15 +15355,15 @@ __metadata:
   linkType: hard
 
 "sass@npm:^1.62.1":
-  version: 1.77.4
-  resolution: "sass@npm:1.77.4"
+  version: 1.77.5
+  resolution: "sass@npm:1.77.5"
   dependencies:
     chokidar: "npm:>=3.0.0 <4.0.0"
     immutable: "npm:^4.0.0"
     source-map-js: "npm:>=0.6.2 <2.0.0"
   bin:
     sass: sass.js
-  checksum: 10c0/b9cb4882bded282aabe38d011adfce375e1f282184fcf93dc3da5d5be834c6aa53c474c15634c351ef7bd85146cfd1cc81343654cc3bcf000d78e856da4225ef
+  checksum: 10c0/9da049b0a3fadab419084d6becdf471e107cf6e3c8ac87cabea2feb845afac75e86c99e06ee721a5aa4f6a2d833ec5380137c4e540ab2f760edf1e4eb6139e69
   languageName: node
   linkType: hard
 

From 9321a454de78dc57d4382f6f366f282a111d2b31 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 12 Jun 2024 07:38:20 -0400
Subject: [PATCH 1261/2191] Combine CI migration tests (#30661)

---
 .../workflows/test-migrations-two-step.yml    | 94 -------------------
 ...tions-one-step.yml => test-migrations.yml} | 32 ++++---
 2 files changed, 19 insertions(+), 107 deletions(-)
 delete mode 100644 .github/workflows/test-migrations-two-step.yml
 rename .github/workflows/{test-migrations-one-step.yml => test-migrations.yml} (66%)

diff --git a/.github/workflows/test-migrations-two-step.yml b/.github/workflows/test-migrations-two-step.yml
deleted file mode 100644
index c4209d6329d78e..00000000000000
--- a/.github/workflows/test-migrations-two-step.yml
+++ /dev/null
@@ -1,94 +0,0 @@
-name: Test two step migrations
-on:
-  push:
-    branches-ignore:
-      - 'dependabot/**'
-      - 'renovate/**'
-  pull_request:
-
-jobs:
-  pre_job:
-    runs-on: ubuntu-latest
-
-    outputs:
-      should_skip: ${{ steps.skip_check.outputs.should_skip }}
-
-    steps:
-      - id: skip_check
-        uses: fkirc/skip-duplicate-actions@v5
-        with:
-          paths: '["Gemfile*", ".ruby-version", "**/*.rb", ".github/workflows/test-migrations-two-step.yml", "lib/tasks/tests.rake"]'
-
-  test:
-    runs-on: ubuntu-latest
-    needs: pre_job
-    if: needs.pre_job.outputs.should_skip != 'true'
-
-    strategy:
-      fail-fast: false
-
-      matrix:
-        postgres:
-          - 14-alpine
-          - 15-alpine
-
-    services:
-      postgres:
-        image: postgres:${{ matrix.postgres}}
-        env:
-          POSTGRES_PASSWORD: postgres
-          POSTGRES_USER: postgres
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-        ports:
-          - 5432:5432
-
-      redis:
-        image: redis:7-alpine
-        options: >-
-          --health-cmd "redis-cli ping"
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-        ports:
-          - 6379:6379
-
-    env:
-      DB_HOST: localhost
-      DB_USER: postgres
-      DB_PASS: postgres
-      DISABLE_SIMPLECOV: true
-      RAILS_ENV: test
-      BUNDLE_CLEAN: true
-      BUNDLE_FROZEN: true
-      BUNDLE_WITHOUT: 'development production'
-      BUNDLE_JOBS: 3
-      BUNDLE_RETRY: 3
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Set up Ruby environment
-        uses: ./.github/actions/setup-ruby
-
-      - name: Create database
-        run: './bin/rails db:create'
-
-      - name: Run historical migrations with data population
-        run: './bin/rails tests:migrations:prepare_database'
-        env:
-          SKIP_POST_DEPLOYMENT_MIGRATIONS: true
-
-      - name: Run all remaining pre-deployment migrations
-        run: './bin/rails db:migrate'
-        env:
-          SKIP_POST_DEPLOYMENT_MIGRATIONS: true
-
-      - name: Run all post-deployment migrations
-        run: './bin/rails db:migrate'
-
-      - name: Check migration result
-        run: './bin/rails tests:migrations:check_database'
diff --git a/.github/workflows/test-migrations-one-step.yml b/.github/workflows/test-migrations.yml
similarity index 66%
rename from .github/workflows/test-migrations-one-step.yml
rename to .github/workflows/test-migrations.yml
index 104e1b067c7b40..f057efc11a44ee 100644
--- a/.github/workflows/test-migrations-one-step.yml
+++ b/.github/workflows/test-migrations.yml
@@ -1,4 +1,5 @@
-name: Test one step migrations
+name: Historical data migration test
+
 on:
   push:
     branches-ignore:
@@ -17,7 +18,7 @@ jobs:
       - id: skip_check
         uses: fkirc/skip-duplicate-actions@v5
         with:
-          paths: '["Gemfile*", ".ruby-version", "**/*.rb", ".github/workflows/test-migrations-one-step.yml", "lib/tasks/tests.rake"]'
+          paths: '["Gemfile*", ".ruby-version", "**/*.rb", ".github/workflows/test-migrations.yml", "lib/tasks/tests.rake"]'
 
   test:
     runs-on: ubuntu-latest
@@ -64,7 +65,7 @@ jobs:
       RAILS_ENV: test
       BUNDLE_CLEAN: true
       BUNDLE_FROZEN: true
-      BUNDLE_WITHOUT: 'development production'
+      BUNDLE_WITHOUT: 'development:production'
       BUNDLE_JOBS: 3
       BUNDLE_RETRY: 3
 
@@ -74,14 +75,19 @@ jobs:
       - name: Set up Ruby environment
         uses: ./.github/actions/setup-ruby
 
-      - name: Create database
-        run: './bin/rails db:create'
-
-      - name: Run historical migrations with data population
-        run: './bin/rails tests:migrations:prepare_database'
-
-      - name: Run all remaining migrations
-        run: './bin/rails db:migrate'
+      - name: Test "one step migration" flow
+        run: |
+          bin/rails db:drop
+          bin/rails db:create
+          bin/rails tests:migrations:prepare_database
+          bin/rails db:migrate
+          bin/rails tests:migrations:check_database
 
-      - name: Check migration result
-        run: './bin/rails tests:migrations:check_database'
+      - name: Test "two step migration" flow
+        run: |
+          bin/rails db:drop
+          bin/rails db:create
+          SKIP_POST_DEPLOYMENT_MIGRATIONS=true bin/rails tests:migrations:prepare_database
+          SKIP_POST_DEPLOYMENT_MIGRATIONS=true bin/rails db:migrate
+          bin/rails db:migrate
+          bin/rails tests:migrations:check_database

From 47f97e113a1047c067948f385b5179fa0489180f Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 12 Jun 2024 07:39:16 -0400
Subject: [PATCH 1262/2191] Update the bundler-audit vulnerability DB when
 running (#30658)

---
 .github/workflows/bundler-audit.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/bundler-audit.yml b/.github/workflows/bundler-audit.yml
index bbc31598c75a91..923abcd91c6000 100644
--- a/.github/workflows/bundler-audit.yml
+++ b/.github/workflows/bundler-audit.yml
@@ -31,4 +31,4 @@ jobs:
         uses: ./.github/actions/setup-ruby
 
       - name: Run bundler-audit
-        run: bundle exec bundler-audit
+        run: bundle exec bundler-audit check --update

From 0a7249c7c687775c7ab6ef495b259cedff5f25ca Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 12 Jun 2024 14:41:14 +0200
Subject: [PATCH 1263/2191] fix(deps): update dependency pino to v9.2.0
 (#30659)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index b88cfaab14a6ab..b34f45aac0838f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -13093,8 +13093,8 @@ __metadata:
   linkType: hard
 
 "pino@npm:^9.0.0":
-  version: 9.1.0
-  resolution: "pino@npm:9.1.0"
+  version: 9.2.0
+  resolution: "pino@npm:9.2.0"
   dependencies:
     atomic-sleep: "npm:^1.0.0"
     fast-redact: "npm:^3.1.1"
@@ -13109,7 +13109,7 @@ __metadata:
     thread-stream: "npm:^3.0.0"
   bin:
     pino: bin.js
-  checksum: 10c0/d060530ae2e4e8f21d04bb0f44f009f94d207d7f4337f508f618416514214ddaf1b29f8c5c265153a19ce3b6480b451461f40020f916ace9d53a5aa07624b79c
+  checksum: 10c0/5fbd226ff7dab0961232b5aa5eca0530cdc5bb29f6bf17d929e42239293b1a587a26cc311db6abc1090c9dd57e8f7b031eae341b41d00d4a642b4f1736474c80
   languageName: node
   linkType: hard
 

From 54ab70dfcf39e13c055b99a4fc4aea721781af32 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 12 Jun 2024 14:42:04 +0200
Subject: [PATCH 1264/2191] chore(deps): update yarn to v4.3.0 (#30644)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 package.json           | 2 +-
 streaming/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index f84d45c32ec3c4..d52f0ea1cc296f 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@mastodon/mastodon",
   "license": "AGPL-3.0-or-later",
-  "packageManager": "yarn@4.2.2",
+  "packageManager": "yarn@4.3.0",
   "engines": {
     "node": ">=18"
   },
diff --git a/streaming/package.json b/streaming/package.json
index 2e515167c7de57..ba024fe7af4b3c 100644
--- a/streaming/package.json
+++ b/streaming/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@mastodon/streaming",
   "license": "AGPL-3.0-or-later",
-  "packageManager": "yarn@4.2.2",
+  "packageManager": "yarn@4.3.0",
   "engines": {
     "node": ">=18"
   },

From 19f1c081e161bf8ca3325f48f7fe0194827de56a Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 12 Jun 2024 08:59:32 -0400
Subject: [PATCH 1265/2191] Update `rubocop-rspec` to version 3.0.1 (#30655)

---
 .rubocop.yml |  5 -----
 Gemfile      |  1 +
 Gemfile.lock | 19 ++++++++-----------
 3 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index cbc0afd2815c53..090b89b2556b2f 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -133,11 +133,6 @@ Rails/NegateInclude:
 RSpec/ExampleLength:
   CountAsOne: ['array', 'heredoc', 'method_call']
 
-# Reason: Deprecated cop, will be removed in 3.0, replaced by SpecFilePathFormat
-# https://docs.rubocop.org/rubocop-rspec/cops_rspec.html#rspecfilepath
-RSpec/FilePath:
-  Enabled: false
-
 # Reason:
 # https://docs.rubocop.org/rubocop-rspec/cops_rspec.html#rspecnamedsubject
 RSpec/NamedSubject:
diff --git a/Gemfile b/Gemfile
index be02a656263944..b00eaecbcf9f02 100644
--- a/Gemfile
+++ b/Gemfile
@@ -171,6 +171,7 @@ group :development do
   gem 'rubocop-performance', require: false
   gem 'rubocop-rails', require: false
   gem 'rubocop-rspec', require: false
+  gem 'rubocop-rspec_rails', require: false
 
   # Annotates modules with schema
   gem 'annotate', '~> 3.2'
diff --git a/Gemfile.lock b/Gemfile.lock
index c2253fe19cf28b..902ddd5f59fe43 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -698,8 +698,8 @@ GEM
     responders (3.1.1)
       actionpack (>= 5.2)
       railties (>= 5.2)
-    rexml (3.2.8)
-      strscan (>= 3.0.9)
+    rexml (3.3.0)
+      strscan
     rotp (6.3.0)
     rouge (4.2.1)
     rpam2 (4.0.2)
@@ -746,8 +746,6 @@ GEM
       parser (>= 3.3.1.0)
     rubocop-capybara (2.21.0)
       rubocop (~> 1.41)
-    rubocop-factory_bot (2.25.1)
-      rubocop (~> 1.41)
     rubocop-performance (1.21.0)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
@@ -756,13 +754,11 @@ GEM
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rspec (2.31.0)
-      rubocop (~> 1.40)
-      rubocop-capybara (~> 2.17)
-      rubocop-factory_bot (~> 2.22)
-      rubocop-rspec_rails (~> 2.28)
-    rubocop-rspec_rails (2.28.3)
-      rubocop (~> 1.40)
+    rubocop-rspec (3.0.1)
+      rubocop (~> 1.61)
+    rubocop-rspec_rails (2.30.0)
+      rubocop (~> 1.61)
+      rubocop-rspec (~> 3, >= 3.0.1)
     ruby-prof (1.7.0)
     ruby-progressbar (1.13.0)
     ruby-saml (1.16.0)
@@ -1028,6 +1024,7 @@ DEPENDENCIES
   rubocop-performance
   rubocop-rails
   rubocop-rspec
+  rubocop-rspec_rails
   ruby-prof
   ruby-progressbar (~> 1.13)
   ruby-vips (~> 2.2)

From 99842434677ef3a01f5c7700d3b67ba5e72cd1a1 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 12 Jun 2024 15:10:51 +0200
Subject: [PATCH 1266/2191] Fix a few visual glitches with link previews in web
 UI (#30670)

---
 app/javascript/styles/mastodon/components.scss | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 4f36d85aa986f3..2400f319dbf006 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -1411,10 +1411,15 @@ body > [data-popper-placement] {
     .audio-player,
     .attachment-list,
     .picture-in-picture-placeholder,
+    .more-from-author,
     .status-card,
     .hashtag-bar {
       margin-inline-start: $thread-margin;
-      width: calc(100% - ($thread-margin));
+      width: calc(100% - $thread-margin);
+    }
+
+    .more-from-author {
+      width: calc(100% - $thread-margin + 2px);
     }
 
     .status__content__read-more-button {
@@ -4129,6 +4134,13 @@ a.status-card {
   border-end-start-radius: 0;
 }
 
+.status-card.bottomless .status-card__image,
+.status-card.bottomless .status-card__image-image,
+.status-card.bottomless .status-card__image-preview {
+  border-end-end-radius: 0;
+  border-end-start-radius: 0;
+}
+
 .status-card.expanded > a {
   width: 100%;
 }
@@ -10229,6 +10241,7 @@ noscript {
 }
 
 .more-from-author {
+  box-sizing: border-box;
   font-size: 14px;
   color: $darker-text-color;
   background: var(--surface-background-color);

From a5a15846756dd62e01bf7eb64fdf3b8fafc3ba69 Mon Sep 17 00:00:00 2001
From: Sujay <sujay.mukherjeedev@gmail.com>
Date: Wed, 12 Jun 2024 19:18:30 +0530
Subject: [PATCH 1267/2191] Update README.md (#30626)

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 4aca37673b8ef7..9c0b0d20ed5d02 100644
--- a/README.md
+++ b/README.md
@@ -62,7 +62,7 @@ Mastodon acts as an OAuth2 provider, so 3rd party apps can use the REST and Stre
 ### Tech stack
 
 - **Ruby on Rails** powers the REST API and other web pages
-- **React.js** and Redux are used for the dynamic parts of the interface
+- **React.js** and **Redux** are used for the dynamic parts of the interface
 - **Node.js** powers the streaming API
 
 ### Requirements

From bf56e982a9c211396efea16f2ee596102b36db3f Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 12 Jun 2024 15:50:38 +0200
Subject: [PATCH 1268/2191] Fix notifications from limited users being outright
 dropped (#30559)

---
 app/lib/feed_manager.rb              |  5 +----
 spec/lib/feed_manager_spec.rb        |  6 +++---
 spec/services/notify_service_spec.rb | 29 ++++++++++++++++++++++++++++
 3 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/app/lib/feed_manager.rb b/app/lib/feed_manager.rb
index 95a687fa41d335..1fb224a1337c50 100644
--- a/app/lib/feed_manager.rb
+++ b/app/lib/feed_manager.rb
@@ -420,10 +420,7 @@ def filter_from_mentions?(status, receiver_id)
     check_for_blocks = status.active_mentions.pluck(:account_id)
     check_for_blocks.push(status.in_reply_to_account) if status.reply? && !status.in_reply_to_account_id.nil?
 
-    should_filter   = blocks_or_mutes?(receiver_id, check_for_blocks, :mentions) # Filter if it's from someone I blocked, in reply to someone I blocked, or mentioning someone I blocked (or muted)
-    should_filter ||= status.account.silenced? && !Follow.exists?(account_id: receiver_id, target_account_id: status.account_id) # Filter if the account is silenced and I'm not following them
-
-    should_filter
+    blocks_or_mutes?(receiver_id, check_for_blocks, :mentions) # Filter if it's from someone I blocked, in reply to someone I blocked, or mentioning someone I blocked (or muted)
   end
 
   # Check if status should not be added to the list feed
diff --git a/spec/lib/feed_manager_spec.rb b/spec/lib/feed_manager_spec.rb
index 613bcb3045da32..679309bd11c746 100644
--- a/spec/lib/feed_manager_spec.rb
+++ b/spec/lib/feed_manager_spec.rb
@@ -206,13 +206,13 @@
         expect(described_class.instance.filter?(:mentions, reply, bob)).to be true
       end
 
-      it 'returns true for status by silenced account who recipient is not following' do
+      it 'returns false for status by limited account who recipient is not following' do
         status = Fabricate(:status, text: 'Hello world', account: alice)
         alice.silence!
-        expect(described_class.instance.filter?(:mentions, status, bob)).to be true
+        expect(described_class.instance.filter?(:mentions, status, bob)).to be false
       end
 
-      it 'returns false for status by followed silenced account' do
+      it 'returns false for status by followed limited account' do
         status = Fabricate(:status, text: 'Hello world', account: alice)
         alice.silence!
         bob.follow!(alice)
diff --git a/spec/services/notify_service_spec.rb b/spec/services/notify_service_spec.rb
index 6064d2b050f4a3..8c810f1c32b521 100644
--- a/spec/services/notify_service_spec.rb
+++ b/spec/services/notify_service_spec.rb
@@ -129,6 +129,35 @@
     end
   end
 
+  describe NotifyService::DismissCondition do
+    subject { described_class.new(notification) }
+
+    let(:activity) { Fabricate(:mention, status: Fabricate(:status)) }
+    let(:notification) { Fabricate(:notification, type: :mention, activity: activity, from_account: activity.status.account, account: activity.account) }
+
+    describe '#dismiss?' do
+      context 'when sender is silenced' do
+        before do
+          notification.from_account.silence!
+        end
+
+        it 'returns false' do
+          expect(subject.dismiss?).to be false
+        end
+      end
+
+      context 'when recipient has blocked sender' do
+        before do
+          notification.account.block!(notification.from_account)
+        end
+
+        it 'returns true' do
+          expect(subject.dismiss?).to be true
+        end
+      end
+    end
+  end
+
   describe NotifyService::FilterCondition do
     subject { described_class.new(notification) }
 

From 7ad5a3a2b728229704e29819b3b87bc0ccdc473f Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Thu, 13 Jun 2024 10:21:50 +0200
Subject: [PATCH 1269/2191] Disable `consistent-return` eslint rule for
 Typescript files (#30675)

---
 .eslintrc.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.eslintrc.js b/.eslintrc.js
index 759003b55ec3cd..e3afb1c9f23030 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -349,6 +349,9 @@ module.exports = defineConfig({
         // Disable formatting rules that have been enabled in the base config
         'indent': 'off',
 
+        // This is not needed as we use noImplicitReturns, which handles this in addition to understanding types
+        'consistent-return': 'off',
+
         'import/consistent-type-specifier-style': ['error', 'prefer-top-level'],
 
         '@typescript-eslint/consistent-type-definitions': ['warn', 'interface'],

From fc2f49cfbcbe996abeb267592bcf39d60d2995ae Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 13 Jun 2024 10:26:00 +0200
Subject: [PATCH 1270/2191] chore(deps): update docker.io/ruby docker tag to
 v3.3.3 (#30679)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 2dc7602b2d23d2..e29377829c55c8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,7 +12,7 @@ ARG BUILDPLATFORM=${BUILDPLATFORM}
 
 # Ruby image to use for base image, change with [--build-arg RUBY_VERSION="3.3.x"]
 # renovate: datasource=docker depName=docker.io/ruby
-ARG RUBY_VERSION="3.3.2"
+ARG RUBY_VERSION="3.3.3"
 # # Node version to use in base image, change with [--build-arg NODE_MAJOR_VERSION="20"]
 # renovate: datasource=node-version depName=node
 ARG NODE_MAJOR_VERSION="20"

From b379dc156e9a2292f2e21f80543c0b80d4087688 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 13 Jun 2024 04:26:09 -0400
Subject: [PATCH 1271/2191] Update parser to version 3.3.3.0 (#30676)

---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 902ddd5f59fe43..222aaff50471ec 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -584,7 +584,7 @@ GEM
     orm_adapter (0.5.0)
     ox (2.14.18)
     parallel (1.25.1)
-    parser (3.3.2.0)
+    parser (3.3.3.0)
       ast (~> 2.4.1)
       racc
     parslet (2.0.0)

From fe740455767a361798df3a21791f9db8e2056f7e Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 13 Jun 2024 10:26:17 +0200
Subject: [PATCH 1272/2191] chore(deps): update dependency ruby to v3.3.3
 (#30667)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .ruby-version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.ruby-version b/.ruby-version
index 4772543317946f..619b537668489e 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-3.3.2
+3.3.3

From 37f53542fe1c36c6126932cbb3840f6d4659104e Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 13 Jun 2024 14:42:40 +0200
Subject: [PATCH 1273/2191] Fix limit handling in grouped notifications CTE
 (#30685)

---
 app/models/notification.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/models/notification.rb b/app/models/notification.rb
index e3deaa5348b7c3..01abe74f5e7eb3 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -152,6 +152,7 @@ def paginate_groups_by_max_id(limit, max_id: nil, since_id: nil)
               .limit(1),
             query
               .joins('CROSS JOIN grouped_notifications')
+              .where('array_length(grouped_notifications.groups, 1) < :limit', limit: limit)
               .where('notifications.id < grouped_notifications.id')
               .where.not("COALESCE(notifications.group_key, 'ungrouped-' || notifications.id) = ANY(grouped_notifications.groups)")
               .select('notifications.*', "array_append(grouped_notifications.groups, COALESCE(notifications.group_key, 'ungrouped-' || notifications.id))")
@@ -179,6 +180,7 @@ def paginate_groups_by_min_id(limit, max_id: nil, min_id: nil)
               .limit(1),
             query
               .joins('CROSS JOIN grouped_notifications')
+              .where('array_length(grouped_notifications.groups, 1) < :limit', limit: limit)
               .where('notifications.id > grouped_notifications.id')
               .where.not("COALESCE(notifications.group_key, 'ungrouped-' || notifications.id) = ANY(grouped_notifications.groups)")
               .select('notifications.*', "array_append(grouped_notifications.groups, COALESCE(notifications.group_key, 'ungrouped-' || notifications.id))")

From ed6d24330ba2f80b99428cb8ee19e5d8400ebd16 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 13 Jun 2024 15:04:16 +0200
Subject: [PATCH 1274/2191] Add author links on the explore page in web UI
 (#30521)

---
 .../mastodon/actions/importer/index.js        |   8 +-
 .../mastodon/actions/importer/normalizer.js   |   4 +
 app/javascript/mastodon/actions/trends.js     |   9 +-
 .../mastodon/components/more_from_author.jsx  |  19 +++
 .../explore/components/author_link.jsx        |  21 ++++
 .../features/explore/components/story.jsx     | 118 +++++++++++-------
 .../mastodon/features/explore/links.jsx       |   3 +-
 .../features/status/components/card.jsx       |  19 +--
 app/javascript/mastodon/locales/en.json       |   1 +
 .../styles/mastodon/components.scss           |  69 +++++++---
 app/javascript/styles/mastodon/variables.scss |   2 +
 11 files changed, 189 insertions(+), 84 deletions(-)
 create mode 100644 app/javascript/mastodon/components/more_from_author.jsx
 create mode 100644 app/javascript/mastodon/features/explore/components/author_link.jsx

diff --git a/app/javascript/mastodon/actions/importer/index.js b/app/javascript/mastodon/actions/importer/index.js
index 16f191b5846f63..d906bdfb14c4ec 100644
--- a/app/javascript/mastodon/actions/importer/index.js
+++ b/app/javascript/mastodon/actions/importer/index.js
@@ -68,13 +68,17 @@ export function importFetchedStatuses(statuses) {
         status.filtered.forEach(result => pushUnique(filters, result.filter));
       }
 
-      if (status.reblog && status.reblog.id) {
+      if (status.reblog?.id) {
         processStatus(status.reblog);
       }
 
-      if (status.poll && status.poll.id) {
+      if (status.poll?.id) {
         pushUnique(polls, normalizePoll(status.poll, getState().getIn(['polls', status.poll.id])));
       }
+
+      if (status.card?.author_account) {
+        pushUnique(accounts, status.card.author_account);
+      }
     }
 
     statuses.forEach(processStatus);
diff --git a/app/javascript/mastodon/actions/importer/normalizer.js b/app/javascript/mastodon/actions/importer/normalizer.js
index b5a30343e488c4..be76b0f391692d 100644
--- a/app/javascript/mastodon/actions/importer/normalizer.js
+++ b/app/javascript/mastodon/actions/importer/normalizer.js
@@ -36,6 +36,10 @@ export function normalizeStatus(status, normalOldStatus) {
     normalStatus.poll = status.poll.id;
   }
 
+  if (status.card?.author_account) {
+    normalStatus.card = { ...status.card, author_account: status.card.author_account.id };
+  }
+
   if (status.filtered) {
     normalStatus.filtered = status.filtered.map(normalizeFilterResult);
   }
diff --git a/app/javascript/mastodon/actions/trends.js b/app/javascript/mastodon/actions/trends.js
index 0b840b41ce6085..01089fccbb764d 100644
--- a/app/javascript/mastodon/actions/trends.js
+++ b/app/javascript/mastodon/actions/trends.js
@@ -1,6 +1,6 @@
 import api, { getLinks } from '../api';
 
-import { importFetchedStatuses } from './importer';
+import { importFetchedStatuses, importFetchedAccounts } from './importer';
 
 export const TRENDS_TAGS_FETCH_REQUEST = 'TRENDS_TAGS_FETCH_REQUEST';
 export const TRENDS_TAGS_FETCH_SUCCESS = 'TRENDS_TAGS_FETCH_SUCCESS';
@@ -49,8 +49,11 @@ export const fetchTrendingLinks = () => (dispatch) => {
   dispatch(fetchTrendingLinksRequest());
 
   api()
-    .get('/api/v1/trends/links')
-    .then(({ data }) => dispatch(fetchTrendingLinksSuccess(data)))
+    .get('/api/v1/trends/links', { params: { limit: 20 } })
+    .then(({ data }) => {
+      dispatch(importFetchedAccounts(data.map(link => link.author_account).filter(account => !!account)));
+      dispatch(fetchTrendingLinksSuccess(data));
+    })
     .catch(err => dispatch(fetchTrendingLinksFail(err)));
 };
 
diff --git a/app/javascript/mastodon/components/more_from_author.jsx b/app/javascript/mastodon/components/more_from_author.jsx
new file mode 100644
index 00000000000000..c20e76ac459f9a
--- /dev/null
+++ b/app/javascript/mastodon/components/more_from_author.jsx
@@ -0,0 +1,19 @@
+import PropTypes from 'prop-types';
+
+import { FormattedMessage } from 'react-intl';
+
+import { AuthorLink } from 'mastodon/features/explore/components/author_link';
+
+export const MoreFromAuthor = ({ accountId }) => (
+  <div className='more-from-author'>
+    <svg viewBox='0 0 79 79' className='logo logo--icon' role='img'>
+      <use xlinkHref='#logo-symbol-icon' />
+    </svg>
+
+    <FormattedMessage id='link_preview.more_from_author' defaultMessage='More from {name}' values={{ name: <AuthorLink accountId={accountId} /> }} />
+  </div>
+);
+
+MoreFromAuthor.propTypes = {
+  accountId: PropTypes.string.isRequired,
+};
diff --git a/app/javascript/mastodon/features/explore/components/author_link.jsx b/app/javascript/mastodon/features/explore/components/author_link.jsx
new file mode 100644
index 00000000000000..b9dec3367e8b46
--- /dev/null
+++ b/app/javascript/mastodon/features/explore/components/author_link.jsx
@@ -0,0 +1,21 @@
+import PropTypes from 'prop-types';
+
+import { Link } from 'react-router-dom';
+
+import { Avatar } from 'mastodon/components/avatar';
+import { useAppSelector } from 'mastodon/store';
+
+export const AuthorLink = ({ accountId }) => {
+  const account = useAppSelector(state => state.getIn(['accounts', accountId]));
+
+  return (
+    <Link to={`/@${account.get('acct')}`} className='story__details__shared__author-link'>
+      <Avatar account={account} size={16} />
+      <bdi dangerouslySetInnerHTML={{ __html: account.get('display_name_html') }} />
+    </Link>
+  );
+};
+
+AuthorLink.propTypes = {
+  accountId: PropTypes.string.isRequired,
+};
diff --git a/app/javascript/mastodon/features/explore/components/story.jsx b/app/javascript/mastodon/features/explore/components/story.jsx
index 80dd5200fc7339..a2cae942d4b630 100644
--- a/app/javascript/mastodon/features/explore/components/story.jsx
+++ b/app/javascript/mastodon/features/explore/components/story.jsx
@@ -1,61 +1,89 @@
 import PropTypes from 'prop-types';
-import { PureComponent } from 'react';
+import { useState, useCallback } from 'react';
 
 import { FormattedMessage } from 'react-intl';
 
 import classNames from 'classnames';
 
+
 import { Blurhash } from 'mastodon/components/blurhash';
-import { accountsCountRenderer } from 'mastodon/components/hashtag';
 import { RelativeTimestamp } from 'mastodon/components/relative_timestamp';
 import { ShortNumber } from 'mastodon/components/short_number';
 import { Skeleton } from 'mastodon/components/skeleton';
 
-export default class Story extends PureComponent {
-
-  static propTypes = {
-    url: PropTypes.string,
-    title: PropTypes.string,
-    lang: PropTypes.string,
-    publisher: PropTypes.string,
-    publishedAt: PropTypes.string,
-    author: PropTypes.string,
-    sharedTimes: PropTypes.number,
-    thumbnail: PropTypes.string,
-    thumbnailDescription: PropTypes.string,
-    blurhash: PropTypes.string,
-    expanded: PropTypes.bool,
-  };
-
-  state = {
-    thumbnailLoaded: false,
-  };
-
-  handleImageLoad = () => this.setState({ thumbnailLoaded: true });
-
-  render () {
-    const { expanded, url, title, lang, publisher, author, publishedAt, sharedTimes, thumbnail, thumbnailDescription, blurhash } = this.props;
-
-    const { thumbnailLoaded } = this.state;
-
-    return (
-      <a className={classNames('story', { expanded })} href={url} target='blank' rel='noopener'>
-        <div className='story__details'>
-          <div className='story__details__publisher'>{publisher ? <span lang={lang}>{publisher}</span> : <Skeleton width={50} />}{publishedAt && <> · <RelativeTimestamp timestamp={publishedAt} /></>}</div>
-          <div className='story__details__title' lang={lang}>{title ? title : <Skeleton />}</div>
-          <div className='story__details__shared'>{author && <><FormattedMessage id='link_preview.author' defaultMessage='By {name}' values={{ name: <strong>{author}</strong> }} /> · </>}{typeof sharedTimes === 'number' ? <ShortNumber value={sharedTimes} renderer={accountsCountRenderer} /> : <Skeleton width={100} />}</div>
+import { AuthorLink } from './author_link';
+
+const sharesCountRenderer = (displayNumber, pluralReady) => (
+  <FormattedMessage
+    id='link_preview.shares'
+    defaultMessage='{count, plural, one {{counter} post} other {{counter} posts}}'
+    values={{
+      count: pluralReady,
+      counter: <strong>{displayNumber}</strong>,
+    }}
+  />
+);
+
+export const Story = ({
+  url,
+  title,
+  lang,
+  publisher,
+  publishedAt,
+  author,
+  authorAccount,
+  sharedTimes,
+  thumbnail,
+  thumbnailDescription,
+  blurhash,
+  expanded
+}) => {
+  const [thumbnailLoaded, setThumbnailLoaded] = useState(false);
+
+  const handleImageLoad = useCallback(() => {
+    setThumbnailLoaded(true);
+  }, [setThumbnailLoaded]);
+
+  return (
+    <div className={classNames('story', { expanded })}>
+      <div className='story__details'>
+        <div className='story__details__publisher'>
+          {publisher ? <span lang={lang}>{publisher}</span> : <Skeleton width={50} />}{publishedAt && <> · <RelativeTimestamp timestamp={publishedAt} /></>}
         </div>
 
-        <div className='story__thumbnail'>
-          {thumbnail ? (
-            <>
-              <div className={classNames('story__thumbnail__preview', { 'story__thumbnail__preview--hidden': thumbnailLoaded })}><Blurhash hash={blurhash} /></div>
-              <img src={thumbnail} onLoad={this.handleImageLoad} alt={thumbnailDescription} title={thumbnailDescription} lang={lang} />
-            </>
-          ) : <Skeleton />}
+        <a className='story__details__title' lang={lang} href={url} target='blank' rel='noopener'>
+          {title ? title : <Skeleton />}
+        </a>
+
+        <div className='story__details__shared'>
+          {author ? <FormattedMessage id='link_preview.author' className='story__details__shared__author' defaultMessage='By {name}' values={{ name: authorAccount ? <AuthorLink accountId={authorAccount} /> : <strong>{author}</strong> }} /> : <span />}
+          {typeof sharedTimes === 'number' ? <span className='story__details__shared__pill'><ShortNumber value={sharedTimes} renderer={sharesCountRenderer} /></span> : <Skeleton width='10ch' />}
         </div>
+      </div>
+
+      <a className='story__thumbnail' href={url} target='blank' rel='noopener'>
+        {thumbnail ? (
+          <>
+            <div className={classNames('story__thumbnail__preview', { 'story__thumbnail__preview--hidden': thumbnailLoaded })}><Blurhash hash={blurhash} /></div>
+            <img src={thumbnail} onLoad={handleImageLoad} alt={thumbnailDescription} title={thumbnailDescription} lang={lang} />
+          </>
+        ) : <Skeleton />}
       </a>
-    );
-  }
+    </div>
+  );
+};
 
-}
+Story.propTypes = {
+  url: PropTypes.string,
+  title: PropTypes.string,
+  lang: PropTypes.string,
+  publisher: PropTypes.string,
+  publishedAt: PropTypes.string,
+  author: PropTypes.string,
+  authorAccount: PropTypes.string,
+  sharedTimes: PropTypes.number,
+  thumbnail: PropTypes.string,
+  thumbnailDescription: PropTypes.string,
+  blurhash: PropTypes.string,
+  expanded: PropTypes.bool,
+};
diff --git a/app/javascript/mastodon/features/explore/links.jsx b/app/javascript/mastodon/features/explore/links.jsx
index 9e143b4505083a..93fd1fb6ddebc7 100644
--- a/app/javascript/mastodon/features/explore/links.jsx
+++ b/app/javascript/mastodon/features/explore/links.jsx
@@ -13,7 +13,7 @@ import { DismissableBanner } from 'mastodon/components/dismissable_banner';
 import { LoadingIndicator } from 'mastodon/components/loading_indicator';
 import { WithRouterPropTypes } from 'mastodon/utils/react_router';
 
-import Story from './components/story';
+import { Story } from './components/story';
 
 const mapStateToProps = state => ({
   links: state.getIn(['trends', 'links', 'items']),
@@ -75,6 +75,7 @@ class Links extends PureComponent {
             publisher={link.get('provider_name')}
             publishedAt={link.get('published_at')}
             author={link.get('author_name')}
+            authorAccount={link.getIn(['author_account', 'id'])}
             sharedTimes={link.getIn(['history', 0, 'accounts']) * 1 + link.getIn(['history', 1, 'accounts']) * 1}
             thumbnail={link.get('image')}
             thumbnailDescription={link.get('image_description')}
diff --git a/app/javascript/mastodon/features/status/components/card.jsx b/app/javascript/mastodon/features/status/components/card.jsx
index c2f5703b3c4469..f562e53f0ba334 100644
--- a/app/javascript/mastodon/features/status/components/card.jsx
+++ b/app/javascript/mastodon/features/status/components/card.jsx
@@ -6,7 +6,6 @@ import { PureComponent } from 'react';
 import { FormattedMessage } from 'react-intl';
 
 import classNames from 'classnames';
-import { Link } from 'react-router-dom';
 
 
 import Immutable from 'immutable';
@@ -15,9 +14,9 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import DescriptionIcon from '@/material-icons/400-24px/description-fill.svg?react';
 import OpenInNewIcon from '@/material-icons/400-24px/open_in_new.svg?react';
 import PlayArrowIcon from '@/material-icons/400-24px/play_arrow-fill.svg?react';
-import { Avatar } from 'mastodon/components/avatar';
 import { Blurhash } from 'mastodon/components/blurhash';
 import { Icon }  from 'mastodon/components/icon';
+import { MoreFromAuthor } from 'mastodon/components/more_from_author';
 import { RelativeTimestamp } from 'mastodon/components/relative_timestamp';
 import { useBlurhash } from 'mastodon/initial_state';
 
@@ -59,20 +58,6 @@ const addAutoPlay = html => {
   return html;
 };
 
-const MoreFromAuthor = ({ author }) => (
-  <div className='more-from-author'>
-    <svg viewBox='0 0 79 79' className='logo logo--icon' role='img'>
-      <use xlinkHref='#logo-symbol-icon' />
-    </svg>
-
-    <FormattedMessage id='link_preview.more_from_author' defaultMessage='More from {name}' values={{ name: <Link to={`/@${author.get('acct')}`}><Avatar account={author} size={16} /> {author.get('display_name')}</Link> }} />
-  </div>
-);
-
-MoreFromAuthor.propTypes = {
-  author: ImmutablePropTypes.map,
-};
-
 export default class Card extends PureComponent {
 
   static propTypes = {
@@ -259,7 +244,7 @@ export default class Card extends PureComponent {
           {description}
         </a>
 
-        {showAuthor && <MoreFromAuthor author={card.get('author_account')} />}
+        {showAuthor && <MoreFromAuthor accountId={card.get('author_account')} />}
       </>
     );
   }
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index 63298d59e3aa5e..4f5caeb6acaa58 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -415,6 +415,7 @@
   "limited_account_hint.title": "This profile has been hidden by the moderators of {domain}.",
   "link_preview.author": "By {name}",
   "link_preview.more_from_author": "More from {name}",
+  "link_preview.shares": "{count, plural, one {{counter} post} other {{counter} posts}}",
   "lists.account.add": "Add to list",
   "lists.account.remove": "Remove from list",
   "lists.delete": "Delete list",
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 2400f319dbf006..d5c3d2605c91c0 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -8796,43 +8796,80 @@ noscript {
   display: flex;
   align-items: center;
   color: $primary-text-color;
-  text-decoration: none;
-  padding: 15px;
+  padding: 16px;
   border-bottom: 1px solid var(--background-border-color);
-  gap: 15px;
+  gap: 16px;
 
   &:last-child {
     border-bottom: 0;
   }
 
-  &:hover,
-  &:active,
-  &:focus {
-    color: $highlight-text-color;
-
-    .story__details__publisher,
-    .story__details__shared {
-      color: $highlight-text-color;
-    }
-  }
-
   &__details {
     flex: 1 1 auto;
 
     &__publisher {
       color: $darker-text-color;
       margin-bottom: 8px;
+      font-size: 14px;
+      line-height: 20px;
     }
 
     &__title {
+      display: block;
       font-size: 19px;
       line-height: 24px;
       font-weight: 500;
       margin-bottom: 8px;
+      text-decoration: none;
+      color: $primary-text-color;
+
+      &:hover,
+      &:active,
+      &:focus {
+        color: $highlight-text-color;
+      }
     }
 
     &__shared {
+      display: flex;
+      align-items: center;
       color: $darker-text-color;
+      gap: 8px;
+      justify-content: space-between;
+      font-size: 14px;
+      line-height: 20px;
+
+      & > span {
+        display: flex;
+        align-items: center;
+        gap: 4px;
+      }
+
+      &__pill {
+        background: var(--surface-variant-background-color);
+        border-radius: 4px;
+        color: inherit;
+        text-decoration: none;
+        padding: 4px 12px;
+        font-size: 12px;
+        font-weight: 500;
+        line-height: 16px;
+      }
+
+      &__author-link {
+        display: inline-flex;
+        align-items: center;
+        gap: 4px;
+        color: $primary-text-color;
+        font-weight: 500;
+        text-decoration: none;
+
+        &:hover,
+        &:active,
+        &:focus {
+          color: $highlight-text-color;
+        }
+      }
     }
 
     strong {
@@ -9903,14 +9940,14 @@ noscript {
     color: inherit;
     text-decoration: none;
     padding: 4px 12px;
-    background: $ui-base-color;
+    background: var(--surface-variant-background-color);
     border-radius: 4px;
     font-weight: 500;
 
     &:hover,
     &:focus,
     &:active {
-      background: lighten($ui-base-color, 4%);
+      background: var(--surface-variant-active-background-color);
     }
   }
 
diff --git a/app/javascript/styles/mastodon/variables.scss b/app/javascript/styles/mastodon/variables.scss
index 58b9dd9b61b101..2848a42b3fec7e 100644
--- a/app/javascript/styles/mastodon/variables.scss
+++ b/app/javascript/styles/mastodon/variables.scss
@@ -106,4 +106,6 @@ $font-monospace: 'mastodon-font-monospace' !default;
   --background-color: #{darken($ui-base-color, 8%)};
   --background-color-tint: #{rgba(darken($ui-base-color, 8%), 0.9)};
   --surface-background-color: #{darken($ui-base-color, 4%)};
+  --surface-variant-background-color: #{$ui-base-color};
+  --surface-variant-active-background-color: #{lighten($ui-base-color, 4%)};
 }

From 64fc17352bec11684cf617b10ebc5a11eb7ec924 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 13 Jun 2024 15:13:06 +0200
Subject: [PATCH 1275/2191] chore(deps): update dependency sanitize to v6.1.1
 (#30683)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 222aaff50471ec..89425363db8e77 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -772,7 +772,7 @@ GEM
       fugit (~> 1.1, >= 1.1.6)
     safety_net_attestation (0.4.0)
       jwt (~> 2.0)
-    sanitize (6.1.0)
+    sanitize (6.1.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     scenic (1.8.0)

From 474dda70272b9e406fb4a22b1f66caf797c2f8b2 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 13 Jun 2024 15:15:01 +0200
Subject: [PATCH 1276/2191] chore(deps): update dependency aws-sdk-s3 to
 v1.152.2 (#30680)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 89425363db8e77..172b7cbdd46048 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -109,7 +109,7 @@ GEM
     aws-sdk-kms (1.83.0)
       aws-sdk-core (~> 3, >= 3.197.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.152.1)
+    aws-sdk-s3 (1.152.2)
       aws-sdk-core (~> 3, >= 3.197.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.8)

From 3b7c50abca213353f6e210837fda0f21baf1be20 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 13 Jun 2024 09:15:32 -0400
Subject: [PATCH 1277/2191] Remove bundler-audit ignore config (#30672)

---
 .bundler-audit.yml                  | 6 ------
 .github/workflows/bundler-audit.yml | 2 --
 2 files changed, 8 deletions(-)
 delete mode 100644 .bundler-audit.yml

diff --git a/.bundler-audit.yml b/.bundler-audit.yml
deleted file mode 100644
index 0671df390fed81..00000000000000
--- a/.bundler-audit.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-ignore:
-  # devise-two-factor advisory about brute-forcing TOTP
-  # We have rate-limits on authentication endpoints in place (including second
-  # factor verification) since Mastodon v3.2.0
-  - CVE-2024-0227
diff --git a/.github/workflows/bundler-audit.yml b/.github/workflows/bundler-audit.yml
index 923abcd91c6000..48f9d82933ce7c 100644
--- a/.github/workflows/bundler-audit.yml
+++ b/.github/workflows/bundler-audit.yml
@@ -6,14 +6,12 @@ on:
     paths:
       - 'Gemfile*'
       - '.ruby-version'
-      - '.bundler-audit.yml'
       - '.github/workflows/bundler-audit.yml'
 
   pull_request:
     paths:
       - 'Gemfile*'
       - '.ruby-version'
-      - '.bundler-audit.yml'
       - '.github/workflows/bundler-audit.yml'
 
   schedule:

From 8889816a51df17e2e78cdcaa17bda0780393bd0d Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 13 Jun 2024 09:23:32 -0400
Subject: [PATCH 1278/2191] Use stock ruby environment on CI lint tasks
 (#30657)

---
 .github/workflows/bundler-audit.yml |  9 +++++++--
 .github/workflows/lint-haml.yml     | 10 ++++++++--
 .github/workflows/lint-ruby.yml     |  9 +++++++--
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/bundler-audit.yml b/.github/workflows/bundler-audit.yml
index 48f9d82933ce7c..e3e2da0c787a54 100644
--- a/.github/workflows/bundler-audit.yml
+++ b/.github/workflows/bundler-audit.yml
@@ -21,12 +21,17 @@ jobs:
   security:
     runs-on: ubuntu-latest
 
+    env:
+      BUNDLE_ONLY: development
+
     steps:
       - name: Clone repository
         uses: actions/checkout@v4
 
-      - name: Set up Ruby environment
-        uses: ./.github/actions/setup-ruby
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
 
       - name: Run bundler-audit
         run: bundle exec bundler-audit check --update
diff --git a/.github/workflows/lint-haml.yml b/.github/workflows/lint-haml.yml
index 25615b720d45ad..ca4b0c80bfdc3e 100644
--- a/.github/workflows/lint-haml.yml
+++ b/.github/workflows/lint-haml.yml
@@ -26,12 +26,18 @@ on:
 jobs:
   lint:
     runs-on: ubuntu-latest
+
+    env:
+      BUNDLE_ONLY: development
+
     steps:
       - name: Clone repository
         uses: actions/checkout@v4
 
-      - name: Set up Ruby environment
-        uses: ./.github/actions/setup-ruby
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
 
       - name: Run haml-lint
         run: |
diff --git a/.github/workflows/lint-ruby.yml b/.github/workflows/lint-ruby.yml
index 411b323486a0a4..2e4de55725bb14 100644
--- a/.github/workflows/lint-ruby.yml
+++ b/.github/workflows/lint-ruby.yml
@@ -27,12 +27,17 @@ jobs:
   lint:
     runs-on: ubuntu-latest
 
+    env:
+      BUNDLE_ONLY: development
+
     steps:
       - name: Clone repository
         uses: actions/checkout@v4
 
-      - name: Set up Ruby environment
-        uses: ./.github/actions/setup-ruby
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
 
       - name: Set-up RuboCop Problem Matcher
         uses: r7kamura/rubocop-problem-matchers-action@v1

From dd587d29b68ee8548cd91697ba85b1ee274845d5 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 13 Jun 2024 15:30:07 +0200
Subject: [PATCH 1279/2191] New Crowdin Translations (automated) (#30684)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/ur.json |  4 +---
 config/locales/activerecord.ur.yml      | 26 +++++++++++++++++++++++++
 config/locales/doorkeeper.cs.yml        |  1 +
 config/locales/doorkeeper.ia.yml        |  2 ++
 config/locales/doorkeeper.sl.yml        |  2 ++
 config/locales/doorkeeper.sv.yml        |  1 +
 config/locales/simple_form.sv.yml       |  2 ++
 config/locales/sv.yml                   |  1 +
 8 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/app/javascript/mastodon/locales/ur.json b/app/javascript/mastodon/locales/ur.json
index 6f3debae2eaacb..1b9f8d9691d03f 100644
--- a/app/javascript/mastodon/locales/ur.json
+++ b/app/javascript/mastodon/locales/ur.json
@@ -28,7 +28,7 @@
   "account.follow": "پیروی کریں",
   "account.follow_back": "اکاؤنٹ کو فالو بیک ",
   "account.followers": "پیروکار",
-  "account.followers.empty": "\"ہنوز اس صارف کی کوئی پیروی نہیں کرتا\".",
+  "account.followers.empty": "ہنوز اس صارف کی کوئی پیروی نہیں کرتا.",
   "account.followers_counter": "{count, plural,one {{counter} پیروکار} other {{counter} پیروکار}}",
   "account.following": "فالو کر رہے ہیں",
   "account.following_counter": "{count, plural, one {{counter} پیروی کر رہے ہیں} other {{counter} پیروی کر رہے ہیں}}",
@@ -66,11 +66,9 @@
   "account.unmute": "@{name} کو با آواز کریں",
   "account.unmute_notifications_short": "نوٹیفیکیشنز کو خاموش نہ کریں",
   "account.unmute_short": "کو خاموش نہ کریں",
-  "account_note.placeholder": "Click to add a note",
   "admin.dashboard.daily_retention": "ایڈمن ڈیش بورڈ کو ڈیلی چیک ان کریں",
   "admin.dashboard.monthly_retention": "ایڈمن کیش بورڈ کو منتھلی چیک ان کریں",
   "admin.dashboard.retention.average": "اوسط",
-  "admin.dashboard.retention.cohort": "Sign-up month",
   "admin.dashboard.retention.cohort_size": "نئے یسرز",
   "alert.rate_limited.message": "\"{retry_time, time, medium} کے بعد کوشش کریں\".",
   "alert.rate_limited.title": "محدود شرح",
diff --git a/config/locales/activerecord.ur.yml b/config/locales/activerecord.ur.yml
index 2cace5883d3750..e8fbef9afcceba 100644
--- a/config/locales/activerecord.ur.yml
+++ b/config/locales/activerecord.ur.yml
@@ -1 +1,27 @@
+---
 ur:
+  activerecord:
+    attributes:
+      poll:
+        expires_at: ڈیڈ لائن
+        options: اپنی مرضی
+      user:
+        agreement: سروس کا معاہدہ
+        email: ای میل ایڈریسز
+        locale: لوکل
+        password: پاس ورڈ
+      user/account:
+        username: یوزر نیم
+      user/invite_request:
+        text: وجہ
+    errors:
+      models:
+        account:
+          attributes:
+            username:
+              invalid: صرف حروف، نمبر اور انڈر سکور پر مشتمل ہونا چاہیے۔
+              reserved: محفوظ ہے
+        admin/webhook:
+          attributes:
+            url:
+              invalid: ایک درست URL نہیں ہے۔
diff --git a/config/locales/doorkeeper.cs.yml b/config/locales/doorkeeper.cs.yml
index be2a4d971a5039..3323834685a165 100644
--- a/config/locales/doorkeeper.cs.yml
+++ b/config/locales/doorkeeper.cs.yml
@@ -135,6 +135,7 @@ cs:
         media: Mediální přílohy
         mutes: Skrytí
         notifications: Oznámení
+        profile: Váš Mastodon profil
         push: Push oznámení
         reports: Hlášení
         search: Hledání
diff --git a/config/locales/doorkeeper.ia.yml b/config/locales/doorkeeper.ia.yml
index 5b99abb7b42be0..985d073ab80ae6 100644
--- a/config/locales/doorkeeper.ia.yml
+++ b/config/locales/doorkeeper.ia.yml
@@ -135,6 +135,7 @@ ia:
         media: Annexos multimedial
         mutes: Silentiates
         notifications: Notificationes
+        profile: Tu profilo de Mastodon
         push: Notificationes push
         reports: Reportos
         search: Cercar
@@ -165,6 +166,7 @@ ia:
       admin:write:reports: exequer actiones de moderation sur reportos
       crypto: usar cryptation de puncta a puncta
       follow: modificar relationes inter contos
+      profile: leger solmente le information de profilo de tu conto
       push: reciper tu notificationes push
       read: leger tote le datos de tu conto
       read:accounts: vider informationes de contos
diff --git a/config/locales/doorkeeper.sl.yml b/config/locales/doorkeeper.sl.yml
index a613308b28afbf..f6f64fc87fa0f2 100644
--- a/config/locales/doorkeeper.sl.yml
+++ b/config/locales/doorkeeper.sl.yml
@@ -135,6 +135,7 @@ sl:
         media: Predstavnostne priloge
         mutes: Utišani
         notifications: Obvestila
+        profile: Vaš profil Mastodon
         push: Potisna obvestila
         reports: Prijave
         search: Iskanje
@@ -165,6 +166,7 @@ sl:
       admin:write:reports: izvedi moderirana dejanja na prijavah
       crypto: Uporabi šifriranje od konca do konca
       follow: spremeni razmerja med računi
+      profile: preberi le podatke profila računa
       push: prejmi potisna obvestila
       read: preberi vse podatke svojega računa
       read:accounts: oglejte si podrobnosti računov
diff --git a/config/locales/doorkeeper.sv.yml b/config/locales/doorkeeper.sv.yml
index bc4ba6f53ed575..b46c16d4de0f55 100644
--- a/config/locales/doorkeeper.sv.yml
+++ b/config/locales/doorkeeper.sv.yml
@@ -166,6 +166,7 @@ sv:
       admin:write:reports: utföra modereringsåtgärder på rapporter
       crypto: använd obruten kryptering
       follow: modifiera kontorelationer
+      profile: läs endast ditt kontos profilinformation
       push: ta emot dina push-notiser
       read: läsa dina kontodata
       read:accounts: se kontoinformation
diff --git a/config/locales/simple_form.sv.yml b/config/locales/simple_form.sv.yml
index 5e5c6f95491507..11d142a2bd6d73 100644
--- a/config/locales/simple_form.sv.yml
+++ b/config/locales/simple_form.sv.yml
@@ -77,11 +77,13 @@ sv:
           warn: Dölj det filtrerade innehållet bakom en varning som visar filtrets rubrik
       form_admin_settings:
         activity_api_enabled: Antalet lokalt publicerade inlägg, aktiva användare och nya registrerade konton per vecka
+        app_icon: WEBP, PNG, GIF eller JPG. Använd istället för appens egna ikon på mobila enheter.
         backups_retention_period: Användare har möjlighet att generera arkiv av sina inlägg för att ladda ned senare. När det sätts till ett positivt värde raderas dessa arkiv automatiskt från din lagring efter det angivna antalet dagar.
         bootstrap_timeline_accounts: Dessa konton kommer fästas högst upp i nya användares följrekommendationer.
         closed_registrations_message: Visas när nyregistreringar är avstängda
         content_cache_retention_period: Alla inlägg från andra servrar (inklusive booster och svar) kommer att raderas efter det angivna antalet dagar, utan hänsyn till någon lokal användarinteraktion med dessa inlägg. Detta inkluderar inlägg där en lokal användare har markerat det som bokmärke eller favoriter. Privata omnämnanden mellan användare från olika instanser kommer också att gå förlorade och blir omöjliga att återställa. Användningen av denna inställning är avsedd för specialfall och bryter många användarförväntningar när de implementeras för allmänt bruk.
         custom_css: Du kan använda anpassade stilar på webbversionen av Mastodon.
+        favicon: WEBP, PNG, GIF eller JPG. Används på mobila enheter istället för appens egen ikon.
         mascot: Åsidosätter illustrationen i det avancerade webbgränssnittet.
         media_cache_retention_period: Mediafiler från inlägg som gjorts av fjärranvändare cachas på din server. När inställd på ett positivt värde kommer media att raderas efter det angivna antalet dagar. Om mediadatat begärs efter att det har raderats, kommer det att laddas ned igen om källinnehållet fortfarande är tillgängligt. På grund av begränsningar för hur ofta förhandsgranskningskort för länkar hämtas från tredjepartswebbplatser, rekommenderas det att ange detta värde till minst 14 dagar, annars kommer förhandsgranskningskorten inte att uppdateras på begäran före den tiden.
         peers_api_enabled: En lista över domänen den här servern har stött på i fediversum. Ingen data inkluderas om du har federerat med servern, bara att din server känner till den. Detta används av tjänster som samlar statistik om federering i allmänhet.
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index cf68cdd5637509..a3d31547cec6fc 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -951,6 +951,7 @@ sv:
       delete: Radera
       edit_preset: Redigera varningsförval
       empty: Du har inte definierat några varningsförval ännu.
+      title: Varning förinställningar
     webhooks:
       add_new: Lägg till slutpunkt
       delete: Ta bort

From 45abddb302a44adafdcc0479cc93dea4d8fb4b64 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 13 Jun 2024 16:10:34 +0200
Subject: [PATCH 1280/2191] Fix pagination attributes not being returned in
 ungroupable-only pages (#30688)

---
 app/serializers/rest/notification_group_serializer.rb | 2 +-
 spec/requests/api/v2_alpha/notifications_spec.rb      | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/serializers/rest/notification_group_serializer.rb b/app/serializers/rest/notification_group_serializer.rb
index 05b51b07a5f66f..ce1950c5a45260 100644
--- a/app/serializers/rest/notification_group_serializer.rb
+++ b/app/serializers/rest/notification_group_serializer.rb
@@ -45,6 +45,6 @@ def latest_page_notification_at
   end
 
   def paginated?
-    instance_options[:group_metadata].present?
+    !instance_options[:group_metadata].nil?
   end
 end
diff --git a/spec/requests/api/v2_alpha/notifications_spec.rb b/spec/requests/api/v2_alpha/notifications_spec.rb
index 9bd1a32e9bf7e1..ac44605ac5d212 100644
--- a/spec/requests/api/v2_alpha/notifications_spec.rb
+++ b/spec/requests/api/v2_alpha/notifications_spec.rb
@@ -58,6 +58,7 @@
 
         expect(response).to have_http_status(200)
         expect(body_json_types.uniq).to eq ['mention']
+        expect(body_as_json[0][:page_min_id]).to_not be_nil
       end
     end
 

From 3a191b3797dde1daf79cd748a14b87240532d543 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 13 Jun 2024 10:27:17 -0400
Subject: [PATCH 1281/2191] Add `rubocop` binstub, simplify configuration
 (#30407)

---
 .github/workflows/lint-ruby.yml |   2 +-
 .rubocop.yml                    | 254 ++++----------------------------
 .rubocop/custom.yml             |   6 +
 .rubocop/layout.yml             |   6 +
 .rubocop/metrics.yml            |  23 +++
 .rubocop/naming.yml             |   3 +
 .rubocop/rails.yml              |  27 ++++
 .rubocop/rspec.yml              |  17 +++
 .rubocop/rspec_rails.yml        |   3 +
 .rubocop/strict.yml             |  19 +++
 .rubocop/style.yml              |  47 ++++++
 bin/rubocop                     |  27 ++++
 lint-staged.config.js           |   3 +-
 13 files changed, 210 insertions(+), 227 deletions(-)
 create mode 100644 .rubocop/custom.yml
 create mode 100644 .rubocop/layout.yml
 create mode 100644 .rubocop/metrics.yml
 create mode 100644 .rubocop/naming.yml
 create mode 100644 .rubocop/rails.yml
 create mode 100644 .rubocop/rspec.yml
 create mode 100644 .rubocop/rspec_rails.yml
 create mode 100644 .rubocop/strict.yml
 create mode 100644 .rubocop/style.yml
 create mode 100755 bin/rubocop

diff --git a/.github/workflows/lint-ruby.yml b/.github/workflows/lint-ruby.yml
index 2e4de55725bb14..f4e81d508bf698 100644
--- a/.github/workflows/lint-ruby.yml
+++ b/.github/workflows/lint-ruby.yml
@@ -43,7 +43,7 @@ jobs:
         uses: r7kamura/rubocop-problem-matchers-action@v1
 
       - name: Run rubocop
-        run: bundle exec rubocop
+        run: bin/rubocop
 
       - name: Run brakeman
         if: always() # Run both checks, even if the first failed
diff --git a/.rubocop.yml b/.rubocop.yml
index 090b89b2556b2f..cf4ee565e00eb0 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,7 +1,34 @@
-# Can be removed once all rules are addressed or moved to this file as documented overrides
-inherit_from: .rubocop_todo.yml
+---
+AllCops:
+  CacheRootDirectory: tmp
+  DisplayCopNames: true
+  DisplayStyleGuide: true
+  Exclude:
+    - db/schema.rb
+    - bin/*
+    - node_modules/**/*
+    - Vagrantfile
+    - vendor/**/*
+    - config/initializers/json_ld*
+    - lib/mastodon/migration_helpers.rb
+    - lib/templates/**/*
+  ExtraDetails: true
+  NewCops: enable
+  TargetRubyVersion: 3.1 # Oldest supported ruby version
+  UseCache: true
+
+inherit_from:
+  - .rubocop/layout.yml
+  - .rubocop/metrics.yml
+  - .rubocop/naming.yml
+  - .rubocop/rails.yml
+  - .rubocop/rspec_rails.yml
+  - .rubocop/rspec.yml
+  - .rubocop/style.yml
+  - .rubocop/custom.yml
+  - .rubocop_todo.yml
+  - .rubocop/strict.yml
 
-# Used for merging with exclude lists with .rubocop_todo.yml
 inherit_mode:
   merge:
     - Exclude
@@ -12,224 +39,3 @@ require:
   - rubocop-rspec_rails
   - rubocop-performance
   - rubocop-capybara
-  - ./lib/linter/rubocop_middle_dot
-
-AllCops:
-  TargetRubyVersion: 3.1 # Set to minimum supported version of CI
-  DisplayCopNames: true
-  DisplayStyleGuide: true
-  ExtraDetails: true
-  UseCache: true
-  CacheRootDirectory: tmp
-  NewCops: enable # Opt-in to newly added rules
-  Exclude:
-    - db/schema.rb
-    - 'bin/*'
-    - 'node_modules/**/*'
-    - 'Vagrantfile'
-    - 'vendor/**/*'
-    - 'config/initializers/json_ld*' # Generated files
-    - 'lib/mastodon/migration_helpers.rb' # Vendored from GitLab
-    - 'lib/templates/**/*'
-
-# Reason: Prefer Hashes without extreme indentation
-# https://docs.rubocop.org/rubocop/cops_layout.html#layoutfirsthashelementindentation
-Layout/FirstHashElementIndentation:
-  EnforcedStyle: consistent
-
-# Reason: Currently disabled in .rubocop_todo.yml
-# https://docs.rubocop.org/rubocop/cops_layout.html#layoutlinelength
-Layout/LineLength:
-  Max: 300 # Default of 120 causes a duplicate entry in generated todo file
-
-## Disable most Metrics/*Length cops
-# Reason: those are often triggered and force significant refactors when this happend
-#         but the team feel they are not really improving the code quality.
-
-# https://docs.rubocop.org/rubocop/cops_metrics.html#metricsblocklength
-Metrics/BlockLength:
-  Enabled: false
-
-# https://docs.rubocop.org/rubocop/cops_metrics.html#metricsclasslength
-Metrics/ClassLength:
-  Enabled: false
-
-# https://docs.rubocop.org/rubocop/cops_metrics.html#metricsmethodlength
-Metrics/MethodLength:
-  Enabled: false
-
-# https://docs.rubocop.org/rubocop/cops_metrics.html#metricsmodulelength
-Metrics/ModuleLength:
-  Enabled: false
-
-## End Disable Metrics/*Length cops
-
-# Reason: Currently disabled in .rubocop_todo.yml
-# https://docs.rubocop.org/rubocop/cops_metrics.html#metricsabcsize
-Metrics/AbcSize:
-  Exclude:
-    - 'lib/mastodon/cli/*.rb'
-
-# Reason: Currently disabled in .rubocop_todo.yml
-# https://docs.rubocop.org/rubocop/cops_metrics.html#metricscyclomaticcomplexity
-Metrics/CyclomaticComplexity:
-  Exclude:
-    - lib/mastodon/cli/*.rb
-
-# Reason:
-# https://docs.rubocop.org/rubocop/cops_metrics.html#metricsparameterlists
-Metrics/ParameterLists:
-  CountKeywordArgs: false
-
-# Reason: Prefer seeing a variable name
-# https://docs.rubocop.org/rubocop/cops_naming.html#namingblockforwarding
-Naming/BlockForwarding:
-  EnforcedStyle: explicit
-
-# Reason: Prevailing style is argument file paths
-# https://docs.rubocop.org/rubocop-rails/cops_rails.html#railsfilepath
-Rails/FilePath:
-  EnforcedStyle: arguments
-
-# Reason: Prevailing style uses numeric status codes, matches RSpec/Rails/HttpStatus
-# https://docs.rubocop.org/rubocop-rails/cops_rails.html#railshttpstatus
-Rails/HttpStatus:
-  EnforcedStyle: numeric
-
-# Reason: Conflicts with `Lint/UselessMethodDefinition` for inherited controller actions
-# https://docs.rubocop.org/rubocop-rails/cops_rails.html#railslexicallyscopedactionfilter
-Rails/LexicallyScopedActionFilter:
-  Exclude:
-    - 'app/controllers/auth/*'
-
-# Reason: These tasks are doing local work which do not need full env loaded
-# https://docs.rubocop.org/rubocop-rails/cops_rails.html#railsrakeenvironment
-Rails/RakeEnvironment:
-  Exclude:
-    - 'lib/tasks/auto_annotate_models.rake'
-    - 'lib/tasks/emojis.rake'
-    - 'lib/tasks/mastodon.rake'
-    - 'lib/tasks/repo.rake'
-    - 'lib/tasks/statistics.rake'
-
-# Reason: There are appropriate times to use these features
-# https://docs.rubocop.org/rubocop-rails/cops_rails.html#railsskipsmodelvalidations
-Rails/SkipsModelValidations:
-  Enabled: false
-
-# Reason: We want to preserve the ability to migrate from arbitrary old versions,
-# and cannot guarantee that every installation has run every migration as they upgrade.
-# https://docs.rubocop.org/rubocop-rails/cops_rails.html#railsunusedignoredcolumns
-Rails/UnusedIgnoredColumns:
-  Enabled: false
-
-# Reason: Prevailing style choice
-# https://docs.rubocop.org/rubocop-rails/cops_rails.html#railsnegateinclude
-Rails/NegateInclude:
-  Enabled: false
-
-# Reason: Enforce default limit, but allow some elements to span lines
-# https://docs.rubocop.org/rubocop-rspec/cops_rspec.html#rspecexamplelength
-RSpec/ExampleLength:
-  CountAsOne: ['array', 'heredoc', 'method_call']
-
-# Reason:
-# https://docs.rubocop.org/rubocop-rspec/cops_rspec.html#rspecnamedsubject
-RSpec/NamedSubject:
-  EnforcedStyle: named_only
-
-# Reason: Prevailing style choice
-# https://docs.rubocop.org/rubocop-rspec/cops_rspec.html#rspecnottonot
-RSpec/NotToNot:
-  EnforcedStyle: to_not
-
-# Reason: Match overrides from Rspec/FilePath rule above
-# https://docs.rubocop.org/rubocop-rspec/cops_rspec.html#rspecspecfilepathformat
-RSpec/SpecFilePathFormat:
-  CustomTransform:
-    ActivityPub: activitypub
-    DeepL: deepl
-    FetchOEmbedService: fetch_oembed_service
-    OEmbedController: oembed_controller
-    OStatus: ostatus
-
-# Reason: Prevailing style uses numeric status codes, matches Rails/HttpStatus
-# https://docs.rubocop.org/rubocop-rspec/cops_rspec_rails.html#rspecrailshttpstatus
-RSpecRails/HttpStatus:
-  EnforcedStyle: numeric
-
-# Reason:
-# https://docs.rubocop.org/rubocop/cops_style.html#styleclassandmodulechildren
-Style/ClassAndModuleChildren:
-  Enabled: false
-
-# Reason: Classes mostly self-document with their names
-# https://docs.rubocop.org/rubocop/cops_style.html#styledocumentation
-Style/Documentation:
-  Enabled: false
-
-# Reason: Route redirects are not token-formatted and must be skipped
-# https://docs.rubocop.org/rubocop/cops_style.html#styleformatstringtoken
-Style/FormatStringToken:
-  inherit_mode:
-    merge:
-      - AllowedMethods # The rubocop-rails config adds `redirect`
-  AllowedMethods:
-    - redirect_with_vary
-
-# Reason: Prevailing style choice
-# https://docs.rubocop.org/rubocop/cops_style.html#stylehashaslastarrayitem
-Style/HashAsLastArrayItem:
-  Enabled: false
-
-# Reason: Enforce modern Ruby style
-# https://docs.rubocop.org/rubocop/cops_style.html#stylehashsyntax
-Style/HashSyntax:
-  EnforcedStyle: ruby19_no_mixed_keys
-  EnforcedShorthandSyntax: either
-
-# Reason:
-# https://docs.rubocop.org/rubocop/cops_style.html#stylenumericliterals
-Style/NumericLiterals:
-  AllowedPatterns:
-    - \d{4}_\d{2}_\d{2}_\d{6} # For DB migration date version number readability
-
-# Reason:
-# https://docs.rubocop.org/rubocop/cops_style.html#stylepercentliteraldelimiters
-Style/PercentLiteralDelimiters:
-  PreferredDelimiters:
-    '%i': '()'
-    '%w': '()'
-
-# Reason: Prefer less indentation in conditional assignments
-# https://docs.rubocop.org/rubocop/cops_style.html#styleredundantbegin
-Style/RedundantBegin:
-  Enabled: false
-
-# Reason: Prevailing style choice
-# https://docs.rubocop.org/rubocop/cops_style.html#styleredundantfetchblock
-Style/RedundantFetchBlock:
-  Enabled: false
-
-# Reason: Overridden to reduce implicit StandardError rescues
-# https://docs.rubocop.org/rubocop/cops_style.html#stylerescuestandarderror
-Style/RescueStandardError:
-  EnforcedStyle: implicit
-
-# Reason: Originally disabled for CodeClimate, and no config consensus has been found
-# https://docs.rubocop.org/rubocop/cops_style.html#stylesymbolarray
-Style/SymbolArray:
-  Enabled: false
-
-# Reason:
-# https://docs.rubocop.org/rubocop/cops_style.html#styletrailingcommainarrayliteral
-Style/TrailingCommaInArrayLiteral:
-  EnforcedStyleForMultiline: 'comma'
-
-# Reason:
-# https://docs.rubocop.org/rubocop/cops_style.html#styletrailingcommainhashliteral
-Style/TrailingCommaInHashLiteral:
-  EnforcedStyleForMultiline: 'comma'
-
-Style/MiddleDot:
-  Enabled: true
diff --git a/.rubocop/custom.yml b/.rubocop/custom.yml
new file mode 100644
index 00000000000000..63035837f86119
--- /dev/null
+++ b/.rubocop/custom.yml
@@ -0,0 +1,6 @@
+---
+require:
+  - ../lib/linter/rubocop_middle_dot
+
+Style/MiddleDot:
+  Enabled: true
diff --git a/.rubocop/layout.yml b/.rubocop/layout.yml
new file mode 100644
index 00000000000000..487879ca2c1134
--- /dev/null
+++ b/.rubocop/layout.yml
@@ -0,0 +1,6 @@
+---
+Layout/FirstHashElementIndentation:
+  EnforcedStyle: consistent
+
+Layout/LineLength:
+  Max: 300 # Default of 120 causes a duplicate entry in generated todo file
diff --git a/.rubocop/metrics.yml b/.rubocop/metrics.yml
new file mode 100644
index 00000000000000..89532af42abb15
--- /dev/null
+++ b/.rubocop/metrics.yml
@@ -0,0 +1,23 @@
+---
+Metrics/AbcSize:
+  Exclude:
+    - lib/mastodon/cli/*.rb
+
+Metrics/BlockLength:
+  Enabled: false
+
+Metrics/ClassLength:
+  Enabled: false
+
+Metrics/CyclomaticComplexity:
+  Exclude:
+    - lib/mastodon/cli/*.rb
+
+Metrics/MethodLength:
+  Enabled: false
+
+Metrics/ModuleLength:
+  Enabled: false
+
+Metrics/ParameterLists:
+  CountKeywordArgs: false
diff --git a/.rubocop/naming.yml b/.rubocop/naming.yml
new file mode 100644
index 00000000000000..da6ad4ac579a63
--- /dev/null
+++ b/.rubocop/naming.yml
@@ -0,0 +1,3 @@
+---
+Naming/BlockForwarding:
+  EnforcedStyle: explicit
diff --git a/.rubocop/rails.yml b/.rubocop/rails.yml
new file mode 100644
index 00000000000000..b83928dee6b3ef
--- /dev/null
+++ b/.rubocop/rails.yml
@@ -0,0 +1,27 @@
+---
+Rails/FilePath:
+  EnforcedStyle: arguments
+
+Rails/HttpStatus:
+  EnforcedStyle: numeric
+
+Rails/LexicallyScopedActionFilter:
+  Exclude:
+    - app/controllers/auth/* # Conflicts with `Lint/UselessMethodDefinition` for inherited controller actions
+
+Rails/NegateInclude:
+  Enabled: false
+
+Rails/RakeEnvironment:
+  Exclude: # Tasks are doing local work which do not need full env loaded
+    - lib/tasks/auto_annotate_models.rake
+    - lib/tasks/emojis.rake
+    - lib/tasks/mastodon.rake
+    - lib/tasks/repo.rake
+    - lib/tasks/statistics.rake
+
+Rails/SkipsModelValidations:
+  Enabled: false
+
+Rails/UnusedIgnoredColumns:
+  Enabled: false # Preserve ability to migrate from arbitrary old versions
diff --git a/.rubocop/rspec.yml b/.rubocop/rspec.yml
new file mode 100644
index 00000000000000..a6f8a7aee0f88b
--- /dev/null
+++ b/.rubocop/rspec.yml
@@ -0,0 +1,17 @@
+---
+RSpec/ExampleLength:
+  CountAsOne: ['array', 'heredoc', 'method_call']
+
+RSpec/NamedSubject:
+  EnforcedStyle: named_only
+
+RSpec/NotToNot:
+  EnforcedStyle: to_not
+
+RSpec/SpecFilePathFormat:
+  CustomTransform:
+    ActivityPub: activitypub
+    DeepL: deepl
+    FetchOEmbedService: fetch_oembed_service
+    OEmbedController: oembed_controller
+    OStatus: ostatus
diff --git a/.rubocop/rspec_rails.yml b/.rubocop/rspec_rails.yml
new file mode 100644
index 00000000000000..993a5689ad091e
--- /dev/null
+++ b/.rubocop/rspec_rails.yml
@@ -0,0 +1,3 @@
+---
+RSpecRails/HttpStatus:
+  EnforcedStyle: numeric
diff --git a/.rubocop/strict.yml b/.rubocop/strict.yml
new file mode 100644
index 00000000000000..2222c6d8b93402
--- /dev/null
+++ b/.rubocop/strict.yml
@@ -0,0 +1,19 @@
+Lint/Debugger: # Remove any `binding.pry`
+  Enabled: true
+  Exclude: []
+
+RSpec/Focus: # Require full spec run on CI
+  Enabled: true
+  Exclude: []
+
+Rails/Output: # Remove any `puts` debugging
+  Enabled: true
+  Exclude: []
+
+Rails/FindEach: # Using `each` could impact performance, use `find_each`
+  Enabled: true
+  Exclude: []
+
+Rails/UniqBeforePluck: # Require `uniq.pluck` and not `pluck.uniq`
+  Enabled: true
+  Exclude: []
diff --git a/.rubocop/style.yml b/.rubocop/style.yml
new file mode 100644
index 00000000000000..03e35a70ac43cd
--- /dev/null
+++ b/.rubocop/style.yml
@@ -0,0 +1,47 @@
+---
+Style/ClassAndModuleChildren:
+  Enabled: false
+
+Style/Documentation:
+  Enabled: false
+
+Style/FormatStringToken:
+  AllowedMethods:
+    - redirect_with_vary # Route redirects are not token-formatted
+  inherit_mode:
+    merge:
+      - AllowedMethods
+
+Style/HashAsLastArrayItem:
+  Enabled: false
+
+Style/HashSyntax:
+  EnforcedShorthandSyntax: either
+  EnforcedStyle: ruby19_no_mixed_keys
+
+Style/NumericLiterals:
+  AllowedPatterns:
+    - \d{4}_\d{2}_\d{2}_\d{6}
+
+Style/PercentLiteralDelimiters:
+  PreferredDelimiters:
+    '%i': ()
+    '%w': ()
+
+Style/RedundantBegin:
+  Enabled: false
+
+Style/RedundantFetchBlock:
+  Enabled: false
+
+Style/RescueStandardError:
+  EnforcedStyle: implicit
+
+Style/SymbolArray:
+  Enabled: false
+
+Style/TrailingCommaInArrayLiteral:
+  EnforcedStyleForMultiline: comma
+
+Style/TrailingCommaInHashLiteral:
+  EnforcedStyleForMultiline: comma
diff --git a/bin/rubocop b/bin/rubocop
new file mode 100755
index 00000000000000..369a05bedb5684
--- /dev/null
+++ b/bin/rubocop
@@ -0,0 +1,27 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'rubocop' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
+
+bundle_binstub = File.expand_path("bundle", __dir__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300).include?("This file was generated by Bundler")
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rubocop", "rubocop")
diff --git a/lint-staged.config.js b/lint-staged.config.js
index 06fe66d11e95b2..6740def512a98c 100644
--- a/lint-staged.config.js
+++ b/lint-staged.config.js
@@ -1,7 +1,6 @@
 const config = {
   '*': 'prettier --ignore-unknown --write',
-  'Capfile|Gemfile|*.{rb,ruby,ru,rake}':
-    'bundle exec rubocop --force-exclusion -a',
+  'Capfile|Gemfile|*.{rb,ruby,ru,rake}': 'bin/rubocop --force-exclusion -a',
   '*.{js,jsx,ts,tsx}': 'eslint --fix',
   '*.{css,scss}': 'stylelint --fix',
   '*.haml': 'bundle exec haml-lint -a',

From f0ca874b09e29feda0db3eb50aece86e95192575 Mon Sep 17 00:00:00 2001
From: Louis Brauer <louis@openbooking.ch>
Date: Thu, 13 Jun 2024 16:37:43 +0200
Subject: [PATCH 1282/2191] Include crossorigin in inert css (#30687)

---
 app/views/layouts/application.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index ec6caa33ada799..a73287959ede01 100755
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -29,7 +29,7 @@
     = stylesheet_pack_tag 'common', media: 'all', crossorigin: 'anonymous'
     = theme_style_tags current_theme
     -# Needed for the wicg-inert polyfill. It needs to be on it's own <style> tag, with this `id`
-    = stylesheet_pack_tag 'inert', media: 'all', id: 'inert-style'
+    = stylesheet_pack_tag 'inert', media: 'all', crossorigin: 'anonymous', id: 'inert-style'
 
     = javascript_pack_tag 'common', crossorigin: 'anonymous'
     = preload_pack_asset "locale/#{I18n.locale}-json.js"

From 271a8e99e2666dfb90a8a57c8ef6563279bc406d Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 13 Jun 2024 10:37:49 -0400
Subject: [PATCH 1283/2191] Update merge conflict rebase action version
 (silences node version warning) (#30690)

---
 .github/workflows/rebase-needed.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/rebase-needed.yml b/.github/workflows/rebase-needed.yml
index 06d835c090e15c..8784397a8fb03d 100644
--- a/.github/workflows/rebase-needed.yml
+++ b/.github/workflows/rebase-needed.yml
@@ -17,7 +17,7 @@ jobs:
 
     steps:
       - name: Check for merge conflicts
-        uses: eps1lon/actions-label-merge-conflict@releases/2.x
+        uses: eps1lon/actions-label-merge-conflict@v3
         with:
           dirtyLabel: 'rebase needed :construction:'
           repoToken: '${{ secrets.GITHUB_TOKEN }}'

From f8ce61d6705699fc509a6677e8df847af77ebac1 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 13 Jun 2024 16:37:54 +0200
Subject: [PATCH 1284/2191] chore(deps): update dependency nokogiri to v1.16.6
 (#30689)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 172b7cbdd46048..75fcf2417589c2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -445,7 +445,7 @@ GEM
     net-smtp (0.5.0)
       net-protocol
     nio4r (2.7.3)
-    nokogiri (1.16.5)
+    nokogiri (1.16.6)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     nsa (0.3.0)

From a66f6e10056333a3ca3466895ef5f8967b1f4a27 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 13 Jun 2024 11:07:02 -0400
Subject: [PATCH 1285/2191] Add binstub for `brakeman` (#30493)

---
 .github/workflows/lint-ruby.yml |  2 +-
 bin/brakeman                    | 27 +++++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100755 bin/brakeman

diff --git a/.github/workflows/lint-ruby.yml b/.github/workflows/lint-ruby.yml
index f4e81d508bf698..b3a89c3caf1cbd 100644
--- a/.github/workflows/lint-ruby.yml
+++ b/.github/workflows/lint-ruby.yml
@@ -47,4 +47,4 @@ jobs:
 
       - name: Run brakeman
         if: always() # Run both checks, even if the first failed
-        run: bundle exec brakeman
+        run: bin/brakeman
diff --git a/bin/brakeman b/bin/brakeman
new file mode 100755
index 00000000000000..b4fe8de26635d3
--- /dev/null
+++ b/bin/brakeman
@@ -0,0 +1,27 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'brakeman' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
+
+bundle_binstub = File.expand_path("bundle", __dir__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300).include?("This file was generated by Bundler")
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("brakeman", "brakeman")

From 179f7b11bac81479a518504873c980b04d6ca6e5 Mon Sep 17 00:00:00 2001
From: Michael Stanclift <mx@vmstan.com>
Date: Thu, 13 Jun 2024 10:58:34 -0500
Subject: [PATCH 1286/2191] Build libvips from source in Dockerfile (#30571)

---
 Dockerfile | 81 ++++++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 70 insertions(+), 11 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index e29377829c55c8..0d7516b10883b2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -48,8 +48,6 @@ ENV \
 # Apply Mastodon version information
   MASTODON_VERSION_PRERELEASE="${MASTODON_VERSION_PRERELEASE}" \
   MASTODON_VERSION_METADATA="${MASTODON_VERSION_METADATA}" \
-# Enable libvips
-  MASTODON_USE_LIBVIPS=true \
 # Apply Mastodon static files and YJIT options
   RAILS_SERVE_STATIC_FILES=${RAILS_SERVE_STATIC_FILES} \
   RUBY_YJIT_ENABLE=${RUBY_YJIT_ENABLE} \
@@ -67,7 +65,9 @@ ENV \
   DEBIAN_FRONTEND="noninteractive" \
   PATH="${PATH}:/opt/ruby/bin:/opt/mastodon/bin" \
 # Optimize jemalloc 5.x performance
-  MALLOC_CONF="narenas:2,background_thread:true,thp:never,dirty_decay_ms:1000,muzzy_decay_ms:0"
+  MALLOC_CONF="narenas:2,background_thread:true,thp:never,dirty_decay_ms:1000,muzzy_decay_ms:0" \
+# Enable libvips, should not be changed
+  MASTODON_USE_LIBVIPS=true
 
 # Set default shell used for running commands
 SHELL ["/bin/bash", "-o", "pipefail", "-o", "errexit", "-c"]
@@ -104,7 +104,6 @@ RUN \
     curl \
     ffmpeg \
     file \
-    libvips42 \
     libjemalloc2 \
     patchelf \
     procps \
@@ -138,18 +137,31 @@ RUN \
 --mount=type=cache,id=apt-lib-${TARGETPLATFORM},target=/var/lib/apt,sharing=locked \
 # Install build tools and bundler dependencies from APT
   apt-get install -y --no-install-recommends \
-    g++ \
-    gcc \
+    build-essential \
     git \
     libgdbm-dev \
+    libglib2.0-dev \
     libgmp-dev \
     libicu-dev \
     libidn-dev \
     libpq-dev \
     libssl-dev \
-    make \
+    meson \
+    pkg-config \
     shared-mime-info \
-    zlib1g-dev \
+	# libvips components
+    libcgif-dev \
+    libexif-dev \
+    libexpat1-dev \
+    libgirepository1.0-dev \
+    libheif-dev \
+    libimagequant-dev \
+    libjpeg62-turbo-dev \
+    liblcms2-dev \
+    liborc-dev \
+    libspng-dev \
+    libtiff-dev \
+    libwebp-dev \
   ;
 
 RUN \
@@ -158,6 +170,26 @@ RUN \
   corepack enable; \
   corepack prepare --activate;
 
+# Create temporary libvips specific build layer from build layer
+FROM build as libvips
+
+# libvips version to compile, change with [--build-arg VIPS_VERSION="8.15.2"]
+# renovate: datasource=github-releases depName=libvips packageName=libvips/libvips
+ARG VIPS_VERSION=8.15.2
+# libvips download URL, change with [--build-arg VIPS_URL="https://github.com/libvips/libvips/releases/download"]
+ARG VIPS_URL=https://github.com/libvips/libvips/releases/download
+
+WORKDIR /usr/local/libvips/src
+
+RUN \
+  curl -sSL -o vips-${VIPS_VERSION}.tar.xz ${VIPS_URL}/v${VIPS_VERSION}/vips-${VIPS_VERSION}.tar.xz; \
+  tar xf vips-${VIPS_VERSION}.tar.xz; \
+  cd vips-${VIPS_VERSION}; \
+  meson setup build --prefix /usr/local/libvips --libdir=lib -Ddeprecated=false -Dintrospection=disabled -Dmodules=disabled -Dexamples=false; \
+  cd build; \
+  ninja; \
+  ninja install;
+
 # Create temporary bundler specific build layer from build layer
 FROM build as bundler
 
@@ -207,10 +239,14 @@ COPY . /opt/mastodon/
 COPY --from=yarn /opt/mastodon /opt/mastodon/
 COPY --from=bundler /opt/mastodon /opt/mastodon/
 COPY --from=bundler /usr/local/bundle/ /usr/local/bundle/
+# Copy libvips components to layer for precompiler
+COPY --from=libvips /usr/local/libvips/bin /usr/local/bin
+COPY --from=libvips /usr/local/libvips/lib /usr/local/lib
 
 ARG TARGETPLATFORM
 
 RUN \
+  ldconfig; \
 # Use Ruby on Rails to create Mastodon assets
   SECRET_KEY_BASE_DUMMY=1 \
   bundle exec rails assets:precompile; \
@@ -232,12 +268,27 @@ RUN \
 --mount=type=cache,id=yarn-cache-${TARGETPLATFORM},target=/usr/local/share/.cache/yarn,sharing=locked \
 # Apt update install non-dev versions of necessary components
   apt-get install -y --no-install-recommends \
-    libssl3 \
-    libpq5 \
+    libexpat1 \
+    libglib2.0-0 \
     libicu72 \
     libidn12 \
+    libpq5 \
     libreadline8 \
+    libssl3 \
     libyaml-0-2 \
+  # libvips components
+    libcgif0 \
+    libexif12 \
+    libheif1 \
+    libimagequant0 \
+    libjpeg62-turbo \
+    liblcms2-2 \
+    liborc-0.4-0 \
+    libspng0 \
+    libtiff6 \
+    libwebp7 \
+    libwebpdemux2 \
+    libwebpmux3 \
   ;
 
 # Copy Mastodon sources into final layer
@@ -248,9 +299,17 @@ COPY --from=precompiler /opt/mastodon/public/packs /opt/mastodon/public/packs
 COPY --from=precompiler /opt/mastodon/public/assets /opt/mastodon/public/assets
 # Copy bundler components to layer
 COPY --from=bundler /usr/local/bundle/ /usr/local/bundle/
+# Copy libvips components to layer
+COPY --from=libvips /usr/local/libvips/bin /usr/local/bin
+COPY --from=libvips /usr/local/libvips/lib /usr/local/lib
+
+RUN \
+  ldconfig; \
+# Smoketest media processors
+  vips -v;
 
 RUN \
-# Precompile bootsnap code for faster Rails startup
+  # Precompile bootsnap code for faster Rails startup
   bundle exec bootsnap precompile --gemfile app/ lib/;
 
 RUN \

From a243963e934123e17519711ce0378eaa7b5f8204 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcin=20Miko=C5=82ajczak?= <git@mkljczk.pl>
Date: Thu, 13 Jun 2024 21:46:45 +0200
Subject: [PATCH 1287/2191] LanguageDropdown: remove unused function (#30346)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
---
 .../compose/components/language_dropdown.jsx         | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/app/javascript/mastodon/features/compose/components/language_dropdown.jsx b/app/javascript/mastodon/features/compose/components/language_dropdown.jsx
index c3bd908a4ebe06..47e81cf134be16 100644
--- a/app/javascript/mastodon/features/compose/components/language_dropdown.jsx
+++ b/app/javascript/mastodon/features/compose/components/language_dropdown.jsx
@@ -110,18 +110,6 @@ class LanguageDropdownMenu extends PureComponent {
     }).map(result => result.obj);
   }
 
-  frequentlyUsed () {
-    const { languages, value } = this.props;
-    const current = languages.find(lang => lang[0] === value);
-    const results = [];
-
-    if (current) {
-      results.push(current);
-    }
-
-    return results;
-  }
-
   handleClick = e => {
     const value = e.currentTarget.getAttribute('data-index');
 

From 3d9f00ae167a40835a571a97ea5afcc85ec6e396 Mon Sep 17 00:00:00 2001
From: Emelia Smith <ThisIsMissEm@users.noreply.github.com>
Date: Fri, 14 Jun 2024 09:54:09 +0200
Subject: [PATCH 1288/2191] Fix unsafe URLs in audit log resulting from domain
 blocks (#27139)

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
---
 app/helpers/admin/action_logs_helper.rb | 6 +++---
 config/locales/en.yml                   | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/helpers/admin/action_logs_helper.rb b/app/helpers/admin/action_logs_helper.rb
index 4018ef6b1c554d..e8d56341262cc5 100644
--- a/app/helpers/admin/action_logs_helper.rb
+++ b/app/helpers/admin/action_logs_helper.rb
@@ -15,15 +15,15 @@ def log_target(log)
       link_to log.human_identifier, admin_roles_path(log.target_id)
     when 'Report'
       link_to "##{log.human_identifier.presence || log.target_id}", admin_report_path(log.target_id)
-    when 'DomainBlock', 'DomainAllow', 'EmailDomainBlock', 'UnavailableDomain'
-      link_to log.human_identifier, "https://#{log.human_identifier.presence}"
+    when 'Instance', 'DomainBlock', 'DomainAllow', 'UnavailableDomain'
+      log.human_identifier.present? ? link_to(log.human_identifier, admin_instance_path(log.human_identifier)) : I18n.t('admin.action_logs.unavailable_instance')
     when 'Status'
       link_to log.human_identifier, log.permalink
     when 'AccountWarning'
       link_to log.human_identifier, disputes_strike_path(log.target_id)
     when 'Announcement'
       link_to truncate(log.human_identifier), edit_admin_announcement_path(log.target_id)
-    when 'IpBlock', 'Instance', 'CustomEmoji'
+    when 'IpBlock', 'EmailDomainBlock', 'CustomEmoji'
       log.human_identifier
     when 'CanonicalEmailBlock'
       content_tag(:samp, (log.human_identifier.presence || '')[0...7], title: log.human_identifier)
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 43aa8481c64be8..20df80c272fb12 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -293,6 +293,7 @@ en:
       filter_by_action: Filter by action
       filter_by_user: Filter by user
       title: Audit log
+      unavailable_instance: "(domain name unavailable)"
     announcements:
       destroyed_msg: Announcement successfully deleted!
       edit:

From e1f8cd5b0fe2509e507d4f03de05e0ef6ddd28cc Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 14 Jun 2024 10:14:00 +0200
Subject: [PATCH 1289/2191] chore(deps): update dependency aws-sdk-s3 to
 v1.152.3 (#30701)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 75fcf2417589c2..de7e88d4d4a8f2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -109,7 +109,7 @@ GEM
     aws-sdk-kms (1.83.0)
       aws-sdk-core (~> 3, >= 3.197.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.152.2)
+    aws-sdk-s3 (1.152.3)
       aws-sdk-core (~> 3, >= 3.197.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.8)

From a7264a2b42631bd876d114b96f689492e2908a8d Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 14 Jun 2024 11:08:17 +0200
Subject: [PATCH 1290/2191] New Crowdin Translations (automated) (#30704)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/ca.json    | 1 +
 app/javascript/mastodon/locales/da.json    | 1 +
 app/javascript/mastodon/locales/de.json    | 1 +
 app/javascript/mastodon/locales/es-AR.json | 1 +
 app/javascript/mastodon/locales/es-MX.json | 1 +
 app/javascript/mastodon/locales/es.json    | 1 +
 app/javascript/mastodon/locales/fi.json    | 1 +
 app/javascript/mastodon/locales/fo.json    | 1 +
 app/javascript/mastodon/locales/gl.json    | 1 +
 app/javascript/mastodon/locales/is.json    | 1 +
 app/javascript/mastodon/locales/it.json    | 1 +
 app/javascript/mastodon/locales/nl.json    | 1 +
 app/javascript/mastodon/locales/nn.json    | 2 ++
 app/javascript/mastodon/locales/pl.json    | 1 +
 app/javascript/mastodon/locales/pt-PT.json | 1 +
 app/javascript/mastodon/locales/sl.json    | 1 +
 app/javascript/mastodon/locales/sv.json    | 1 +
 app/javascript/mastodon/locales/zh-CN.json | 1 +
 app/javascript/mastodon/locales/zh-TW.json | 1 +
 config/locales/doorkeeper.fr-CA.yml        | 2 ++
 config/locales/doorkeeper.fr.yml           | 2 ++
 config/locales/doorkeeper.nn.yml           | 2 ++
 22 files changed, 26 insertions(+)

diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index 68429b093ce280..e178c4736caeba 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -415,6 +415,7 @@
   "limited_account_hint.title": "Aquest perfil l'han amagat els moderadors de {domain}.",
   "link_preview.author": "Per {name}",
   "link_preview.more_from_author": "Més de {name}",
+  "link_preview.shares": "{count, plural, one {{counter} publicació} other {{counter} publicacions}}",
   "lists.account.add": "Afegeix a la llista",
   "lists.account.remove": "Elimina de la llista",
   "lists.delete": "Elimina la llista",
diff --git a/app/javascript/mastodon/locales/da.json b/app/javascript/mastodon/locales/da.json
index ae2968087b266d..1b6bd36426b3dc 100644
--- a/app/javascript/mastodon/locales/da.json
+++ b/app/javascript/mastodon/locales/da.json
@@ -415,6 +415,7 @@
   "limited_account_hint.title": "Denne profil er blevet skjult af {domain}-moderatorerne.",
   "link_preview.author": "Af {name}",
   "link_preview.more_from_author": "Mere fra {name}",
+  "link_preview.shares": "{count, plural, one {{counter} indlæg} other {{counter} indlæg}}",
   "lists.account.add": "Føj til liste",
   "lists.account.remove": "Fjern fra liste",
   "lists.delete": "Slet liste",
diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json
index ef08e9b6d3e4af..5a6e15b0951bac 100644
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@@ -415,6 +415,7 @@
   "limited_account_hint.title": "Dieses Profil wurde von den Moderator*innen von {domain} ausgeblendet.",
   "link_preview.author": "Von {name}",
   "link_preview.more_from_author": "Mehr von {name}",
+  "link_preview.shares": "{count, plural, one {{counter} Beitrag} other {{counter} Beiträge}}",
   "lists.account.add": "Zur Liste hinzufügen",
   "lists.account.remove": "Von der Liste entfernen",
   "lists.delete": "Liste löschen",
diff --git a/app/javascript/mastodon/locales/es-AR.json b/app/javascript/mastodon/locales/es-AR.json
index 4c30bfa25f1e7e..1cbd7b18ebd570 100644
--- a/app/javascript/mastodon/locales/es-AR.json
+++ b/app/javascript/mastodon/locales/es-AR.json
@@ -415,6 +415,7 @@
   "limited_account_hint.title": "Este perfil fue ocultado por los moderadores de {domain}.",
   "link_preview.author": "Por {name}",
   "link_preview.more_from_author": "Más de {name}",
+  "link_preview.shares": "{count, plural, one {{counter} mensaje} other {{counter} mensajes}}",
   "lists.account.add": "Agregar a lista",
   "lists.account.remove": "Quitar de lista",
   "lists.delete": "Eliminar lista",
diff --git a/app/javascript/mastodon/locales/es-MX.json b/app/javascript/mastodon/locales/es-MX.json
index 564d7ec57fc329..dd7dd2bea7eec4 100644
--- a/app/javascript/mastodon/locales/es-MX.json
+++ b/app/javascript/mastodon/locales/es-MX.json
@@ -415,6 +415,7 @@
   "limited_account_hint.title": "Este perfil ha sido ocultado por los moderadores de {domain}.",
   "link_preview.author": "Por {name}",
   "link_preview.more_from_author": "Más de {name}",
+  "link_preview.shares": "{count, plural, one {{counter} publicación} other {{counter} publicaciones}}",
   "lists.account.add": "Añadir a lista",
   "lists.account.remove": "Quitar de lista",
   "lists.delete": "Borrar lista",
diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json
index 14d3bf0dda9528..e1ba41347ae2f3 100644
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@@ -415,6 +415,7 @@
   "limited_account_hint.title": "Este perfil ha sido ocultado por los moderadores de {domain}.",
   "link_preview.author": "Por {name}",
   "link_preview.more_from_author": "Más de {name}",
+  "link_preview.shares": "{count, plural, one {{counter} publicación} other {{counter} publicaciones}}",
   "lists.account.add": "Añadir a lista",
   "lists.account.remove": "Quitar de lista",
   "lists.delete": "Borrar lista",
diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index 6c2162e52c37ca..68ea3925b95232 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -415,6 +415,7 @@
   "limited_account_hint.title": "Palvelimen {domain} valvojat ovat piilottaneet tämän käyttäjätilin.",
   "link_preview.author": "Julkaissut {name}",
   "link_preview.more_from_author": "Lisää käyttäjältä {name}",
+  "link_preview.shares": "{count, plural, one {{counter} julkaisu} other {{counter} julkaisua}}",
   "lists.account.add": "Lisää listalle",
   "lists.account.remove": "Poista listalta",
   "lists.delete": "Poista lista",
diff --git a/app/javascript/mastodon/locales/fo.json b/app/javascript/mastodon/locales/fo.json
index b77f609a2f17a8..f4ae229d4933bb 100644
--- a/app/javascript/mastodon/locales/fo.json
+++ b/app/javascript/mastodon/locales/fo.json
@@ -415,6 +415,7 @@
   "limited_account_hint.title": "Hesin vangin er fjaldur av kjakleiðarunum á {domain}.",
   "link_preview.author": "Av {name}",
   "link_preview.more_from_author": "Meira frá {name}",
+  "link_preview.shares": "{count, plural, one {{counter} postur} other {{counter} postar}}",
   "lists.account.add": "Legg afturat lista",
   "lists.account.remove": "Tak av lista",
   "lists.delete": "Strika lista",
diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json
index 0847b8bf0dd3ac..925e4dd6f9f587 100644
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@@ -415,6 +415,7 @@
   "limited_account_hint.title": "Este perfil foi agochado pola moderación de {domain}.",
   "link_preview.author": "Por {name}",
   "link_preview.more_from_author": "Máis de {name}",
+  "link_preview.shares": "{count, plural, one {{counter} publicación} other {{counter} publicacións}}",
   "lists.account.add": "Engadir á listaxe",
   "lists.account.remove": "Eliminar da listaxe",
   "lists.delete": "Eliminar listaxe",
diff --git a/app/javascript/mastodon/locales/is.json b/app/javascript/mastodon/locales/is.json
index 6ce72b43fc3afe..2a33c160adaf09 100644
--- a/app/javascript/mastodon/locales/is.json
+++ b/app/javascript/mastodon/locales/is.json
@@ -415,6 +415,7 @@
   "limited_account_hint.title": "Þetta notandasnið hefur verið falið af umsjónarmönnum {domain}.",
   "link_preview.author": "Eftir {name}",
   "link_preview.more_from_author": "Meira frá {name}",
+  "link_preview.shares": "{count, plural, one {{counter} færsla} other {{counter} færslur}}",
   "lists.account.add": "Bæta á lista",
   "lists.account.remove": "Fjarlægja af lista",
   "lists.delete": "Eyða lista",
diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json
index f66497e0a759c6..4c183e32ceed2a 100644
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@@ -415,6 +415,7 @@
   "limited_account_hint.title": "Questo profilo è stato nascosto dai moderatori di {domain}.",
   "link_preview.author": "Di {name}",
   "link_preview.more_from_author": "Altro da {name}",
+  "link_preview.shares": "{count, plural,one {{counter} post}other {{counter} post}}",
   "lists.account.add": "Aggiungi all'elenco",
   "lists.account.remove": "Rimuovi dall'elenco",
   "lists.delete": "Elimina elenco",
diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json
index bf081ad588c1a8..01610b56528b76 100644
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@@ -415,6 +415,7 @@
   "limited_account_hint.title": "Dit profiel is door de moderatoren van {domain} verborgen.",
   "link_preview.author": "Door {name}",
   "link_preview.more_from_author": "Meer van {name}",
+  "link_preview.shares": "{count, plural, one {{counter} bericht} other {{counter} berichten}}",
   "lists.account.add": "Aan lijst toevoegen",
   "lists.account.remove": "Uit lijst verwijderen",
   "lists.delete": "Lijst verwijderen",
diff --git a/app/javascript/mastodon/locales/nn.json b/app/javascript/mastodon/locales/nn.json
index 3711cc0ae33267..2f214bc99e32a4 100644
--- a/app/javascript/mastodon/locales/nn.json
+++ b/app/javascript/mastodon/locales/nn.json
@@ -414,6 +414,8 @@
   "limited_account_hint.action": "Vis profilen likevel",
   "limited_account_hint.title": "Denne profilen er skjult av moderatorane på {domain}.",
   "link_preview.author": "Av {name}",
+  "link_preview.more_from_author": "Meir frå {name}",
+  "link_preview.shares": "{count, plural,one {{counter} innlegg} other {{counter} innlegg}}",
   "lists.account.add": "Legg til i liste",
   "lists.account.remove": "Fjern frå liste",
   "lists.delete": "Slett liste",
diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json
index 6f67e8f74f08c1..26dbbf51a0d283 100644
--- a/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@@ -415,6 +415,7 @@
   "limited_account_hint.title": "Ten profil został ukryty przez moderatorów {domain}.",
   "link_preview.author": "{name}",
   "link_preview.more_from_author": "Więcej od {name}",
+  "link_preview.shares": "{count, plural, one {{counter} wpis} few {{counter} wpisy} many {{counter} wpisów} other {{counter} wpisów}}",
   "lists.account.add": "Dodaj do listy",
   "lists.account.remove": "Usunąć z listy",
   "lists.delete": "Usuń listę",
diff --git a/app/javascript/mastodon/locales/pt-PT.json b/app/javascript/mastodon/locales/pt-PT.json
index c389d4f4fcf6e4..a06e4c6d16525a 100644
--- a/app/javascript/mastodon/locales/pt-PT.json
+++ b/app/javascript/mastodon/locales/pt-PT.json
@@ -415,6 +415,7 @@
   "limited_account_hint.title": "Este perfil foi ocultado pelos moderadores de {domain}.",
   "link_preview.author": "Por {name}",
   "link_preview.more_from_author": "Mais de {name}",
+  "link_preview.shares": "{count, plural, one {{counter} publicação} other {{counter} publicações}}",
   "lists.account.add": "Adicionar à lista",
   "lists.account.remove": "Remover da lista",
   "lists.delete": "Eliminar lista",
diff --git a/app/javascript/mastodon/locales/sl.json b/app/javascript/mastodon/locales/sl.json
index a8cce3202cf45e..46e6b384a16a7b 100644
--- a/app/javascript/mastodon/locales/sl.json
+++ b/app/javascript/mastodon/locales/sl.json
@@ -415,6 +415,7 @@
   "limited_account_hint.title": "Profil so moderatorji strežnika {domain} skrili.",
   "link_preview.author": "Avtor_ica {name}",
   "link_preview.more_from_author": "Več od {name}",
+  "link_preview.shares": "{count, plural, one {{counter} objava} two {{counter} objavi} few {{counter} objave} other {{counter} objav}}",
   "lists.account.add": "Dodaj na seznam",
   "lists.account.remove": "Odstrani s seznama",
   "lists.delete": "Izbriši seznam",
diff --git a/app/javascript/mastodon/locales/sv.json b/app/javascript/mastodon/locales/sv.json
index a1d478b7ad642d..4e80c51034e7f5 100644
--- a/app/javascript/mastodon/locales/sv.json
+++ b/app/javascript/mastodon/locales/sv.json
@@ -415,6 +415,7 @@
   "limited_account_hint.title": "Denna profil har dolts av {domain}s moderatorer.",
   "link_preview.author": "Av {name}",
   "link_preview.more_from_author": "Mer från {name}",
+  "link_preview.shares": "{count, plural, one {{counter} inlägg} other {{counter} inlägg}}",
   "lists.account.add": "Lägg till i lista",
   "lists.account.remove": "Ta bort från lista",
   "lists.delete": "Radera lista",
diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json
index 0f8bcae6f8be85..def95004402860 100644
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@@ -415,6 +415,7 @@
   "limited_account_hint.title": "此账号资料已被 {domain} 管理员隐藏。",
   "link_preview.author": "由 {name}",
   "link_preview.more_from_author": "查看 {name} 的更多内容",
+  "link_preview.shares": "{count, plural, other {{counter} 条嘟文}}",
   "lists.account.add": "添加到列表",
   "lists.account.remove": "从列表中移除",
   "lists.delete": "删除列表",
diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json
index 1d20034db88425..70b8d51dfc32be 100644
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@@ -415,6 +415,7 @@
   "limited_account_hint.title": "此個人檔案已被 {domain} 的管理員隱藏。",
   "link_preview.author": "來自 {name}",
   "link_preview.more_from_author": "來自 {name} 之更多內容",
+  "link_preview.shares": "{count, plural, other {{count} 則嘟文}}",
   "lists.account.add": "新增至列表",
   "lists.account.remove": "自列表中移除",
   "lists.delete": "刪除列表",
diff --git a/config/locales/doorkeeper.fr-CA.yml b/config/locales/doorkeeper.fr-CA.yml
index 9d671569f52cb8..00df58be7929b2 100644
--- a/config/locales/doorkeeper.fr-CA.yml
+++ b/config/locales/doorkeeper.fr-CA.yml
@@ -135,6 +135,7 @@ fr-CA:
         media: Fichiers médias
         mutes: Masqués
         notifications: Notifications
+        profile: Votre profil Mastodon
         push: Notifications push
         reports: Signalements
         search: Recherche
@@ -165,6 +166,7 @@ fr-CA:
       admin:write:reports: effectuer des actions de modération sur les signalements
       crypto: utiliser le chiffrement de bout-en-bout
       follow: modifier les relations du compte
+      profile: lire uniquement les informations de votre compte
       push: recevoir vos notifications poussées
       read: lire toutes les données de votre compte
       read:accounts: voir les informations des comptes
diff --git a/config/locales/doorkeeper.fr.yml b/config/locales/doorkeeper.fr.yml
index 2c37b651a7d9b3..a5d70030a59c24 100644
--- a/config/locales/doorkeeper.fr.yml
+++ b/config/locales/doorkeeper.fr.yml
@@ -135,6 +135,7 @@ fr:
         media: Fichiers médias
         mutes: Masqués
         notifications: Notifications
+        profile: Votre profil Mastodon
         push: Notifications push
         reports: Signalements
         search: Recherche
@@ -165,6 +166,7 @@ fr:
       admin:write:reports: effectuer des actions de modération sur les signalements
       crypto: utiliser le chiffrement de bout-en-bout
       follow: modifier les relations du compte
+      profile: lire uniquement les informations de votre compte
       push: recevoir vos notifications poussées
       read: lire toutes les données de votre compte
       read:accounts: voir les informations des comptes
diff --git a/config/locales/doorkeeper.nn.yml b/config/locales/doorkeeper.nn.yml
index 0e5d1ca455ae4d..0779a0a1355804 100644
--- a/config/locales/doorkeeper.nn.yml
+++ b/config/locales/doorkeeper.nn.yml
@@ -135,6 +135,7 @@ nn:
         media: Mediavedlegg
         mutes: Dempingar
         notifications: Varsel
+        profile: Mastodon-profilen din
         push: Pushvarsel
         reports: Rapportar
         search: Søk
@@ -165,6 +166,7 @@ nn:
       admin:write:reports: utføre moderatorhandlingar på rapportar
       crypto: bruk ende-til-ende-kryptering
       follow: fylg, blokkér, avblokkér, avfylg brukarar
+      profile: les berre den grunnlejggande informasjonen til brukarkontoen din
       push: motta pushvarsla dine
       read: lese alle dine kontodata
       read:accounts: sjå informasjon om kontoar

From 8d5ed19c6deded7b82a0023d078681e8203951a5 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 14 Jun 2024 05:49:10 -0400
Subject: [PATCH 1291/2191] Migrate `form_tag` to `form_with` in admin and auth
 views (#30692)

---
 app/views/admin/accounts/index.html.haml      | 29 +++++++------
 app/views/admin/action_logs/index.html.haml   | 10 +++--
 app/views/admin/custom_emojis/index.html.haml |  9 ++--
 .../follow_recommendations/show.html.haml     |  8 ++--
 app/views/admin/instances/index.html.haml     |  9 ++--
 app/views/admin/reports/_actions.html.haml    | 22 +++++++---
 .../admin/reports/actions/preview.html.haml   | 13 ++++--
 app/views/admin/reports/index.html.haml       |  9 ++--
 app/views/admin/trends/links/index.html.haml  | 10 ++---
 .../admin/trends/statuses/index.html.haml     |  8 ++--
 .../auth/confirmations/captcha.html.haml      | 12 ++++--
 app/views/mail_subscriptions/show.html.haml   | 11 +++--
 app/views/oauth/authorizations/new.html.haml  | 41 ++++++++++++-------
 13 files changed, 122 insertions(+), 69 deletions(-)

diff --git a/app/views/admin/accounts/index.html.haml b/app/views/admin/accounts/index.html.haml
index 01b072938d1d14..f32a4ac813defb 100644
--- a/app/views/admin/accounts/index.html.haml
+++ b/app/views/admin/accounts/index.html.haml
@@ -1,38 +1,41 @@
 - content_for :page_title do
   = t('admin.accounts.title')
 
-= form_tag admin_accounts_url, method: 'GET', class: 'simple_form' do
+= form_with url: admin_accounts_url, method: :get, class: :simple_form do |form|
   .filters
     .filter-subset.filter-subset--with-select
       %strong= t('admin.accounts.location.title')
       .input.select.optional
-        = select_tag :origin,
-                     options_for_select([[t('admin.accounts.location.local'), 'local'], [t('admin.accounts.location.remote'), 'remote']], params[:origin]),
-                     prompt: I18n.t('generic.all')
+        = form.select :origin,
+                      options_for_select([[t('admin.accounts.location.local'), 'local'], [t('admin.accounts.location.remote'), 'remote']], params[:origin]),
+                      prompt: I18n.t('generic.all')
     .filter-subset.filter-subset--with-select
       %strong= t('admin.accounts.moderation.title')
       .input.select.optional
-        = select_tag :status,
-                     options_for_select(admin_accounts_moderation_options, params[:status]),
-                     prompt: I18n.t('generic.all')
+        = form.select :status,
+                      options_for_select(admin_accounts_moderation_options, params[:status]),
+                      prompt: I18n.t('generic.all')
     .filter-subset.filter-subset--with-select
       %strong= t('admin.accounts.role')
       .input.select.optional
-        = select_tag :role_ids,
-                     options_from_collection_for_select(UserRole.assignable, :id, :name, params[:role_ids]),
-                     prompt: I18n.t('admin.accounts.moderation.all')
+        = form.select :role_ids,
+                      options_from_collection_for_select(UserRole.assignable, :id, :name, params[:role_ids]),
+                      prompt: I18n.t('admin.accounts.moderation.all')
     .filter-subset.filter-subset--with-select
       %strong= t 'generic.order_by'
       .input.select
-        = select_tag :order,
-                     options_for_select([[t('relationships.most_recent'), 'recent'], [t('relationships.last_active'), 'active']], params[:order])
+        = form.select :order,
+                      options_for_select([[t('relationships.most_recent'), 'recent'], [t('relationships.last_active'), 'active']], params[:order])
 
   .fields-group
     - %i(username by_domain display_name email ip).each do |key|
       - next if key == :by_domain && params[:origin] != 'remote'
 
       .input.string.optional
-        = text_field_tag key, params[key], class: 'string optional', placeholder: I18n.t("admin.accounts.#{key}")
+        = form.text_field key,
+                          value: params[key],
+                          class: 'string optional',
+                          placeholder: I18n.t("admin.accounts.#{key}")
 
   .actions
     %button.button= t('admin.accounts.search')
diff --git a/app/views/admin/action_logs/index.html.haml b/app/views/admin/action_logs/index.html.haml
index c4929cc422d79b..c02c8f0ad41fae 100644
--- a/app/views/admin/action_logs/index.html.haml
+++ b/app/views/admin/action_logs/index.html.haml
@@ -1,19 +1,23 @@
 - content_for :page_title do
   = t('admin.action_logs.title')
 
-= form_tag admin_action_logs_url, method: 'GET', class: 'simple_form' do
+= form_with url: admin_action_logs_url, method: :get, class: :simple_form do |form|
   = hidden_field_tag :target_account_id, params[:target_account_id] if params[:target_account_id].present?
 
   .filters
     .filter-subset.filter-subset--with-select
       %strong= t('admin.action_logs.filter_by_user')
       .input.select.optional
-        = select_tag :account_id, options_from_collection_for_select(@auditable_accounts, :id, :username, params[:account_id]), prompt: I18n.t('admin.accounts.moderation.all')
+        = form.select :account_id,
+                      options_from_collection_for_select(@auditable_accounts, :id, :username, params[:account_id]),
+                      prompt: I18n.t('admin.accounts.moderation.all')
 
     .filter-subset.filter-subset--with-select
       %strong= t('admin.action_logs.filter_by_action')
       .input.select.optional
-        = select_tag :action_type, options_for_select(Admin::ActionLogFilter::ACTION_TYPE_MAP.keys.map { |key| [I18n.t("admin.action_logs.action_types.#{key}"), key] }, params[:action_type]), prompt: I18n.t('admin.accounts.moderation.all')
+        = form.select :action_type,
+                      options_for_select(Admin::ActionLogFilter::ACTION_TYPE_MAP.keys.map { |key| [I18n.t("admin.action_logs.action_types.#{key}"), key] }, params[:action_type]),
+                      prompt: I18n.t('admin.accounts.moderation.all')
 
 - if @action_logs.empty?
   .muted-hint.center-text
diff --git a/app/views/admin/custom_emojis/index.html.haml b/app/views/admin/custom_emojis/index.html.haml
index e87dd4128297c2..d76726a7356ddd 100644
--- a/app/views/admin/custom_emojis/index.html.haml
+++ b/app/views/admin/custom_emojis/index.html.haml
@@ -21,14 +21,17 @@
         - else
           = filter_link_to t('admin.accounts.location.remote'), remote: '1', local: nil
 
-= form_tag admin_custom_emojis_url, method: 'GET', class: 'simple_form' do
+= form_with url: admin_custom_emojis_url, method: :get, class: :simple_form do |form|
   .fields-group
     - CustomEmojiFilter::KEYS.each do |key|
-      = hidden_field_tag key, params[key] if params[key].present?
+      = form.hidden_field key, value: params[key] if params[key].present?
 
     - %i(shortcode by_domain).each do |key|
       .input.string.optional
-        = text_field_tag key, params[key], class: 'string optional', placeholder: I18n.t("admin.custom_emojis.#{key}")
+        = form.text_field key,
+                          value: params[key],
+                          class: 'string optional',
+                          placeholder: I18n.t("admin.custom_emojis.#{key}")
 
     .actions
       %button.button= t('admin.accounts.search')
diff --git a/app/views/admin/follow_recommendations/show.html.haml b/app/views/admin/follow_recommendations/show.html.haml
index c8ad653a88a95f..7d787152b39731 100644
--- a/app/views/admin/follow_recommendations/show.html.haml
+++ b/app/views/admin/follow_recommendations/show.html.haml
@@ -5,16 +5,16 @@
 
 %hr.spacer/
 
-= form_tag admin_follow_recommendations_path, method: 'GET', class: 'simple_form' do
+= form_with url: admin_follow_recommendations_path, method: :get, class: :simple_form do |form|
   - RelationshipFilter::KEYS.each do |key|
-    = hidden_field_tag key, params[key] if params[key].present?
+    = form.hidden_field key, value: params[key] if params[key].present?
 
   .filters
     .filter-subset.filter-subset--with-select
       %strong= t('admin.follow_recommendations.language')
       .input.select.optional
-        = select_tag :language,
-                     options_for_select(Trends.available_locales.map { |key| [standard_locale_name(key), key] }, @language)
+        = form.select :language,
+                      options_for_select(Trends.available_locales.map { |key| [standard_locale_name(key), key] }, @language)
     .filter-subset
       %strong= t('admin.follow_recommendations.status')
       %ul
diff --git a/app/views/admin/instances/index.html.haml b/app/views/admin/instances/index.html.haml
index 7e43b4c5386429..b5f084f8809442 100644
--- a/app/views/admin/instances/index.html.haml
+++ b/app/views/admin/instances/index.html.haml
@@ -28,14 +28,17 @@
       %li= filter_link_to t('admin.instances.delivery.unavailable'), availability: 'unavailable'
 
 - unless limited_federation_mode?
-  = form_tag admin_instances_url, method: 'GET', class: 'simple_form' do
+  = form_with url: admin_instances_url, method: :get, class: :simple_form do |form|
     .fields-group
       - InstanceFilter::KEYS.each do |key|
-        = hidden_field_tag key, params[key] if params[key].present?
+        = form.hidden_field key, value: params[key] if params[key].present?
 
       - %i(by_domain).each do |key|
         .input.string.optional
-          = text_field_tag key, params[key], class: 'string optional', placeholder: I18n.t("admin.instances.#{key}")
+          = form.text_field key,
+                            value: params[key],
+                            class: 'string optional',
+                            placeholder: I18n.t("admin.instances.#{key}")
 
       .actions
         %button.button= t('admin.accounts.search')
diff --git a/app/views/admin/reports/_actions.html.haml b/app/views/admin/reports/_actions.html.haml
index da9ac8931572b8..5fb540931b1f81 100644
--- a/app/views/admin/reports/_actions.html.haml
+++ b/app/views/admin/reports/_actions.html.haml
@@ -1,4 +1,4 @@
-= form_tag preview_admin_report_actions_path(report), method: :post do
+= form_with url: preview_admin_report_actions_path(report) do |form|
   .report-actions
     .report-actions__item
       .report-actions__item__button
@@ -8,26 +8,36 @@
     - if statuses.any? { |status| (status.with_media? || status.with_preview_card?) && !status.discarded? }
       .report-actions__item
         .report-actions__item__button
-          = button_tag t('admin.reports.mark_as_sensitive'), name: :mark_as_sensitive, class: 'button'
+          = form.button t('admin.reports.mark_as_sensitive'),
+                        name: :mark_as_sensitive,
+                        class: 'button'
         .report-actions__item__description
           = t('admin.reports.actions.mark_as_sensitive_description_html')
     .report-actions__item
       .report-actions__item__button
-        = button_tag t('admin.reports.delete_and_resolve'), name: :delete, class: 'button button--destructive'
+        = form.button t('admin.reports.delete_and_resolve'),
+                      name: :delete,
+                      class: 'button button--destructive'
       .report-actions__item__description
         = t('admin.reports.actions.delete_description_html')
     .report-actions__item
       .report-actions__item__button
-        = button_tag t('admin.accounts.silence'), name: :silence, class: 'button button--destructive'
+        = form.button t('admin.accounts.silence'),
+                      name: :silence,
+                      class: 'button button--destructive'
       .report-actions__item__description
         = t('admin.reports.actions.silence_description_html')
     .report-actions__item
       .report-actions__item__button
-        = button_tag t('admin.accounts.suspend'), name: :suspend, class: 'button button--destructive'
+        = form.button t('admin.accounts.suspend'),
+                      name: :suspend,
+                      class: 'button button--destructive'
       .report-actions__item__description
         = t('admin.reports.actions.suspend_description_html')
     .report-actions__item
       .report-actions__item__button
-        = link_to t('admin.accounts.custom'), new_admin_account_action_path(report.target_account_id, report_id: report.id), class: 'button'
+        = link_to t('admin.accounts.custom'),
+                  new_admin_account_action_path(report.target_account_id, report_id: report.id),
+                  class: 'button'
       .report-actions__item__description
         = t('admin.reports.actions.other_description_html')
diff --git a/app/views/admin/reports/actions/preview.html.haml b/app/views/admin/reports/actions/preview.html.haml
index 7a737d4f727f29..79c444453fb002 100644
--- a/app/views/admin/reports/actions/preview.html.haml
+++ b/app/views/admin/reports/actions/preview.html.haml
@@ -4,8 +4,8 @@
 - content_for :page_title do
   = t('admin.reports.confirm_action', acct: target_acct)
 
-= form_tag admin_report_actions_path(@report), class: 'simple_form', method: :post do
-  = hidden_field_tag :moderation_action, @moderation_action
+= form_with url: admin_report_actions_path(@report), class: :simple_form do |form|
+  = form.hidden_field :moderation_action, value: @moderation_action
 
   %p.hint= t("admin.reports.summary.action_preambles.#{@moderation_action}_html", acct: target_acct)
   %ul.hint
@@ -30,7 +30,9 @@
         %p= t "user_mailer.warning.explanation.#{warning_action}", instance: Rails.configuration.x.local_domain
 
       .fields-group
-        = text_area_tag :text, nil, placeholder: t('admin.reports.summary.warning_placeholder')
+        = form.text_area :text,
+                         value: nil,
+                         placeholder: t('admin.reports.summary.warning_placeholder')
 
       - unless @report.other?
         %p
@@ -75,4 +77,7 @@
 
   .actions
     = link_to t('admin.reports.cancel'), admin_report_path(@report), class: 'button button-tertiary'
-    = button_tag t('admin.reports.confirm'), name: :confirm, class: 'button', type: :submit
+    = form.button t('admin.reports.confirm'),
+                  name: :confirm,
+                  class: 'button',
+                  type: :submit
diff --git a/app/views/admin/reports/index.html.haml b/app/views/admin/reports/index.html.haml
index e2a9868aa54e1b..dae2c1aa5bb7e3 100644
--- a/app/views/admin/reports/index.html.haml
+++ b/app/views/admin/reports/index.html.haml
@@ -14,14 +14,17 @@
       %li= filter_link_to t('admin.accounts.location.local'), target_origin: 'local'
       %li= filter_link_to t('admin.accounts.location.remote'), target_origin: 'remote'
 
-= form_tag admin_reports_url, method: 'GET', class: 'simple_form' do
+= form_with url: admin_reports_url, method: :get, class: :simple_form do |form|
   .fields-group
     - ReportFilter::KEYS.each do |key|
-      = hidden_field_tag key, params[key] if params[key].present?
+      = form.hidden_field key, value: params[key] if params[key].present?
 
     - %i(by_target_domain).each do |key|
       .input.string.optional
-        = text_field_tag key, params[key], class: 'string optional', placeholder: I18n.t("admin.reports.#{key}")
+        = form.text_field key,
+                          value: params[key],
+                          class: 'string optional',
+                          placeholder: I18n.t("admin.reports.#{key}")
 
     .actions
       %button.button= t('admin.accounts.search')
diff --git a/app/views/admin/trends/links/index.html.haml b/app/views/admin/trends/links/index.html.haml
index c503b2d39675ab..20d8ecf8516293 100644
--- a/app/views/admin/trends/links/index.html.haml
+++ b/app/views/admin/trends/links/index.html.haml
@@ -5,17 +5,17 @@
 
 %hr.spacer/
 
-= form_tag admin_trends_links_path, method: 'GET', class: 'simple_form' do
+= form_with url: admin_trends_links_path, method: :get, class: :simple_form do |form|
   - Trends::PreviewCardFilter::KEYS.each do |key|
-    = hidden_field_tag key, params[key] if params[key].present?
+    = form.hidden_field key, value: params[key] if params[key].present?
 
   .filters
     .filter-subset.filter-subset--with-select
       %strong= t('admin.follow_recommendations.language')
       .input.select.optional
-        = select_tag :locale,
-                     options_for_select(@locales.map { |key| [standard_locale_name(key), key] }, params[:locale]),
-                     include_blank: true
+        = form.select :locale,
+                      options_for_select(@locales.map { |key| [standard_locale_name(key), key] }, params[:locale]),
+                      include_blank: true
     .filter-subset
       %strong= t('admin.trends.trending')
       %ul
diff --git a/app/views/admin/trends/statuses/index.html.haml b/app/views/admin/trends/statuses/index.html.haml
index 66151ad31e0695..8fbc0ba5b542bd 100644
--- a/app/views/admin/trends/statuses/index.html.haml
+++ b/app/views/admin/trends/statuses/index.html.haml
@@ -5,15 +5,17 @@
 
 %hr.spacer/
 
-= form_tag admin_trends_statuses_path, method: 'GET', class: 'simple_form' do
+= form_with url: admin_trends_statuses_path, method: :get, class: :simple_form do |form|
   - Trends::StatusFilter::KEYS.each do |key|
-    = hidden_field_tag key, params[key] if params[key].present?
+    = form.hidden_field key, value: params[key] if params[key].present?
 
   .filters
     .filter-subset.filter-subset--with-select
       %strong= t('admin.follow_recommendations.language')
       .input.select.optional
-        = select_tag :locale, options_for_select(@locales.map { |key| [standard_locale_name(key), key] }, params[:locale]), include_blank: true
+        = form.select :locale,
+                      options_for_select(@locales.map { |key| [standard_locale_name(key), key] }, params[:locale]),
+                      include_blank: true
     .filter-subset
       %strong= t('admin.trends.trending')
       %ul
diff --git a/app/views/auth/confirmations/captcha.html.haml b/app/views/auth/confirmations/captcha.html.haml
index 964d0e63e7d81e..035ac3a86a8ec2 100644
--- a/app/views/auth/confirmations/captcha.html.haml
+++ b/app/views/auth/confirmations/captcha.html.haml
@@ -1,11 +1,13 @@
 - content_for :page_title do
   = t('auth.captcha_confirmation.title')
 
-= form_tag auth_captcha_confirmation_url, method: 'POST', class: 'simple_form' do
+= form_with url: auth_captcha_confirmation_url, class: :simple_form do |form|
   = render 'auth/shared/progress', stage: 'confirm'
 
-  = hidden_field_tag :confirmation_token, params[:confirmation_token]
-  = hidden_field_tag :redirect_to_app, params[:redirect_to_app]
+  = form.hidden_field :confirmation_token,
+                      value: params[:confirmation_token]
+  = form.hidden_field :redirect_to_app,
+                      value: params[:redirect_to_app]
 
   %h1.title= t('auth.captcha_confirmation.title')
   %p.lead= t('auth.captcha_confirmation.hint_html')
@@ -15,4 +17,6 @@
   %p.lead= t('auth.captcha_confirmation.help_html', email: mail_to(Setting.site_contact_email, nil))
 
   .actions
-    = button_tag t('challenge.confirm'), class: 'button', type: :submit
+    = form.button t('challenge.confirm'),
+                  class: 'button',
+                  type: :submit
diff --git a/app/views/mail_subscriptions/show.html.haml b/app/views/mail_subscriptions/show.html.haml
index 776d561d70994d..a09dacc4d3e581 100644
--- a/app/views/mail_subscriptions/show.html.haml
+++ b/app/views/mail_subscriptions/show.html.haml
@@ -10,7 +10,10 @@
         email: content_tag(:strong, @user.email),
         settings_path: settings_preferences_notifications_path
 
-  = form_tag unsubscribe_path, method: :post do
-    = hidden_field_tag :token, params[:token]
-    = hidden_field_tag :type, params[:type]
-    = button_tag t('mail_subscriptions.unsubscribe.action'), type: :submit
+  = form_with url: unsubscribe_path do |form|
+    = form.hidden_field :token,
+                        value: params[:token]
+    = form.hidden_field :type,
+                        value: params[:type]
+    = form.button t('mail_subscriptions.unsubscribe.action'),
+                  type: :submit
diff --git a/app/views/oauth/authorizations/new.html.haml b/app/views/oauth/authorizations/new.html.haml
index 50f671b26f7fd1..c50c224cce6193 100644
--- a/app/views/oauth/authorizations/new.html.haml
+++ b/app/views/oauth/authorizations/new.html.haml
@@ -21,18 +21,31 @@
               = t(scope.access, scope: [:doorkeeper, :grouped_scopes, :access])
 
     .actions
-      = form_tag oauth_authorization_path, method: :post do
-        = hidden_field_tag :client_id, @pre_auth.client.uid
-        = hidden_field_tag :redirect_uri, @pre_auth.redirect_uri
-        = hidden_field_tag :state, @pre_auth.state
-        = hidden_field_tag :response_type, @pre_auth.response_type
-        = hidden_field_tag :scope, @pre_auth.scope
-        = button_tag t('doorkeeper.authorizations.buttons.authorize'), type: :submit
+      = form_with url: oauth_authorization_path do |form|
+        = form.hidden_field :client_id,
+                            value: @pre_auth.client.uid
+        = form.hidden_field :redirect_uri,
+                            value: @pre_auth.redirect_uri
+        = form.hidden_field :state,
+                            value: @pre_auth.state
+        = form.hidden_field :response_type,
+                            value: @pre_auth.response_type
+        = form.hidden_field :scope,
+                            value: @pre_auth.scope
+        = form.button t('doorkeeper.authorizations.buttons.authorize'),
+                      type: :submit
 
-      = form_tag oauth_authorization_path, method: :delete do
-        = hidden_field_tag :client_id, @pre_auth.client.uid
-        = hidden_field_tag :redirect_uri, @pre_auth.redirect_uri
-        = hidden_field_tag :state, @pre_auth.state
-        = hidden_field_tag :response_type, @pre_auth.response_type
-        = hidden_field_tag :scope, @pre_auth.scope
-        = button_tag t('doorkeeper.authorizations.buttons.deny'), type: :submit, class: 'negative'
+      = form_with url: oauth_authorization_path, method: :delete do |form|
+        = form.hidden_field :client_id,
+                            value: @pre_auth.client.uid
+        = form.hidden_field :redirect_uri,
+                            value: @pre_auth.redirect_uri
+        = form.hidden_field :state,
+                            value: @pre_auth.state
+        = form.hidden_field :response_type,
+                            value: @pre_auth.response_type
+        = form.hidden_field :scope,
+                            value: @pre_auth.scope
+        = form.button t('doorkeeper.authorizations.buttons.deny'),
+                      type: :submit,
+                      class: 'negative'

From ab8474fd7fb321d235f3a3ebe277baed6da9cd62 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 14 Jun 2024 05:49:49 -0400
Subject: [PATCH 1292/2191] Fix (relax) remaining `RSpec/*` cops (#30693)

---
 .rubocop/rspec.yml | 10 ++++++++++
 .rubocop_todo.yml  | 15 ---------------
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/.rubocop/rspec.yml b/.rubocop/rspec.yml
index a6f8a7aee0f88b..d2d2f8325d83b0 100644
--- a/.rubocop/rspec.yml
+++ b/.rubocop/rspec.yml
@@ -1,10 +1,20 @@
 ---
 RSpec/ExampleLength:
   CountAsOne: ['array', 'heredoc', 'method_call']
+  Max: 20 # Override default of 5
+
+RSpec/MultipleExpectations:
+  Max: 10 # Overrides default of 1
+
+RSpec/MultipleMemoizedHelpers:
+  Max: 20 # Overrides default of 5
 
 RSpec/NamedSubject:
   EnforcedStyle: named_only
 
+RSpec/NestedGroups:
+  Max: 10 # Overrides default of 3
+
 RSpec/NotToNot:
   EnforcedStyle: to_not
 
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index a70caad8c51e2c..8a4e5980308023 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -27,21 +27,6 @@ Metrics/CyclomaticComplexity:
 Metrics/PerceivedComplexity:
   Max: 27
 
-# Configuration parameters: CountAsOne.
-RSpec/ExampleLength:
-  Max: 18
-
-RSpec/MultipleExpectations:
-  Max: 7
-
-# Configuration parameters: AllowSubject.
-RSpec/MultipleMemoizedHelpers:
-  Max: 17
-
-# Configuration parameters: AllowedGroups.
-RSpec/NestedGroups:
-  Max: 6
-
 Rails/OutputSafety:
   Exclude:
     - 'config/initializers/simple_form.rb'

From 222ab80557cfe3dac1b520bfc3a49f3b1bb88c55 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 14 Jun 2024 05:50:33 -0400
Subject: [PATCH 1293/2191] Fix `Style/GlobalStdStream` cop in environments/*
 files (#30694)

---
 config/environments/development.rb | 2 +-
 config/environments/production.rb  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/environments/development.rb b/config/environments/development.rb
index cc601bde3f82d3..e4da60ac8e89bd 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -37,7 +37,7 @@
 
   config.action_controller.forgery_protection_origin_check = ENV['DISABLE_FORGERY_REQUEST_PROTECTION'].nil?
 
-  ActiveSupport::Logger.new(STDOUT).tap do |logger|
+  ActiveSupport::Logger.new($stdout).tap do |logger|
     logger.formatter = config.log_formatter
     config.logger = ActiveSupport::TaggedLogging.new(logger)
   end
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 6686a23d60da91..b42f78b14eafca 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -94,7 +94,7 @@
   # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new "app-name")
 
   # Log to STDOUT by default
-  config.logger = ActiveSupport::Logger.new(STDOUT)
+  config.logger = ActiveSupport::Logger.new($stdout)
                                        .tap  { |logger| logger.formatter = ::Logger::Formatter.new }
                                        .then { |logger| ActiveSupport::TaggedLogging.new(logger) }
 

From 980034e2e14a8a27156009b88ef7d7d58aef5d14 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 14 Jun 2024 05:50:50 -0400
Subject: [PATCH 1294/2191] Fix `Style/NilLambda` cop in paperclip initializer
 (#30695)

---
 config/initializers/paperclip.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/initializers/paperclip.rb b/config/initializers/paperclip.rb
index 070d250bf30aea..6b14985ae3050e 100644
--- a/config/initializers/paperclip.rb
+++ b/config/initializers/paperclip.rb
@@ -72,7 +72,7 @@
     }
   )
 
-  Paperclip::Attachment.default_options[:s3_permissions] = ->(*) { nil } if ENV['S3_PERMISSION'] == ''
+  Paperclip::Attachment.default_options[:s3_permissions] = ->(*) {} if ENV['S3_PERMISSION'] == ''
 
   if ENV.has_key?('S3_ENDPOINT')
     Paperclip::Attachment.default_options[:s3_options].merge!(

From b5d1d4826656db3103711a200a04cb1f2fa7da83 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 14 Jun 2024 05:54:22 -0400
Subject: [PATCH 1295/2191] Convert `form_for` -> `form_with` in views (#30700)

---
 app/views/admin/accounts/index.html.haml                        | 2 +-
 app/views/admin/custom_emojis/index.html.haml                   | 2 +-
 app/views/admin/email_domain_blocks/index.html.haml             | 2 +-
 app/views/admin/export_domain_blocks/import.html.haml           | 2 +-
 app/views/admin/follow_recommendations/show.html.haml           | 2 +-
 app/views/admin/ip_blocks/index.html.haml                       | 2 +-
 app/views/admin/relationships/index.html.haml                   | 2 +-
 app/views/admin/reports/show.html.haml                          | 2 +-
 app/views/admin/statuses/index.html.haml                        | 2 +-
 app/views/admin/trends/links/index.html.haml                    | 2 +-
 .../admin/trends/links/preview_card_providers/index.html.haml   | 2 +-
 app/views/admin/trends/statuses/index.html.haml                 | 2 +-
 app/views/admin/trends/tags/index.html.haml                     | 2 +-
 app/views/filters/statuses/index.html.haml                      | 2 +-
 app/views/relationships/show.html.haml                          | 2 +-
 15 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/app/views/admin/accounts/index.html.haml b/app/views/admin/accounts/index.html.haml
index f32a4ac813defb..9dd4f0e4e47ffb 100644
--- a/app/views/admin/accounts/index.html.haml
+++ b/app/views/admin/accounts/index.html.haml
@@ -43,7 +43,7 @@
 
 %hr.spacer/
 
-= form_for(@form, url: batch_admin_accounts_path) do |f|
+= form_with model: @form, url: batch_admin_accounts_path do |f|
   = hidden_field_tag :page, params[:page] || 1
   = hidden_field_tag :select_all_matching, '0'
 
diff --git a/app/views/admin/custom_emojis/index.html.haml b/app/views/admin/custom_emojis/index.html.haml
index d76726a7356ddd..82fec554b03345 100644
--- a/app/views/admin/custom_emojis/index.html.haml
+++ b/app/views/admin/custom_emojis/index.html.haml
@@ -37,7 +37,7 @@
       %button.button= t('admin.accounts.search')
       = link_to t('admin.accounts.reset'), admin_custom_emojis_path, class: 'button negative'
 
-= form_for(@form, url: batch_admin_custom_emojis_path) do |f|
+= form_with model: @form, url: batch_admin_custom_emojis_path do |f|
   = hidden_field_tag :page, params[:page] || 1
 
   - CustomEmojiFilter::KEYS.each do |key|
diff --git a/app/views/admin/email_domain_blocks/index.html.haml b/app/views/admin/email_domain_blocks/index.html.haml
index 684735c2070e5d..4fae6557a5a397 100644
--- a/app/views/admin/email_domain_blocks/index.html.haml
+++ b/app/views/admin/email_domain_blocks/index.html.haml
@@ -4,7 +4,7 @@
 - content_for :heading_actions do
   = link_to t('admin.email_domain_blocks.add_new'), new_admin_email_domain_block_path, class: 'button'
 
-= form_for(@form, url: batch_admin_email_domain_blocks_path) do |f|
+= form_with model: @form, url: batch_admin_email_domain_blocks_path do |f|
   = hidden_field_tag :page, params[:page] || 1
 
   .batch-table
diff --git a/app/views/admin/export_domain_blocks/import.html.haml b/app/views/admin/export_domain_blocks/import.html.haml
index 52ffc3d465ce01..2b0d2c5eb33e99 100644
--- a/app/views/admin/export_domain_blocks/import.html.haml
+++ b/app/views/admin/export_domain_blocks/import.html.haml
@@ -6,7 +6,7 @@
 - if defined?(@global_private_comment) && @global_private_comment.present?
   %p= t('admin.export_domain_blocks.import.private_comment_description_html', comment: @global_private_comment)
 
-= form_for(@form, url: batch_admin_domain_blocks_path) do |f|
+= form_with model: @form, url: batch_admin_domain_blocks_path do |f|
   .batch-table
     .batch-table__toolbar
       %label.batch-table__toolbar__select.batch-checkbox-all
diff --git a/app/views/admin/follow_recommendations/show.html.haml b/app/views/admin/follow_recommendations/show.html.haml
index 7d787152b39731..62cd3157252a68 100644
--- a/app/views/admin/follow_recommendations/show.html.haml
+++ b/app/views/admin/follow_recommendations/show.html.haml
@@ -21,7 +21,7 @@
         %li= filter_link_to t('admin.accounts.moderation.active'), status: nil
         %li= filter_link_to t('admin.follow_recommendations.suppressed'), status: 'suppressed'
 
-= form_for(@form, url: admin_follow_recommendations_path, method: :patch) do |f|
+= form_with model: @form, url: admin_follow_recommendations_path, method: :patch do |f|
   - RelationshipFilter::KEYS.each do |key|
     = hidden_field_tag key, params[key] if params[key].present?
 
diff --git a/app/views/admin/ip_blocks/index.html.haml b/app/views/admin/ip_blocks/index.html.haml
index 9eba6c68ffbd62..207d23aeeb9b17 100644
--- a/app/views/admin/ip_blocks/index.html.haml
+++ b/app/views/admin/ip_blocks/index.html.haml
@@ -5,7 +5,7 @@
   - content_for :heading_actions do
     = link_to t('admin.ip_blocks.add_new'), new_admin_ip_block_path, class: 'button'
 
-= form_for(@form, url: batch_admin_ip_blocks_path) do |f|
+= form_with model: @form, url: batch_admin_ip_blocks_path do |f|
   = hidden_field_tag :page, params[:page] || 1
 
   .batch-table
diff --git a/app/views/admin/relationships/index.html.haml b/app/views/admin/relationships/index.html.haml
index c2daefb4242962..83ffd139de1f90 100644
--- a/app/views/admin/relationships/index.html.haml
+++ b/app/views/admin/relationships/index.html.haml
@@ -24,7 +24,7 @@
 
 %hr.spacer/
 
-= form_for(@form, url: batch_admin_accounts_path) do |f|
+= form_with model: @form, url: batch_admin_accounts_path do |f|
   .batch-table
     .batch-table__toolbar
       %label.batch-table__toolbar__select.batch-checkbox-all
diff --git a/app/views/admin/reports/show.html.haml b/app/views/admin/reports/show.html.haml
index 842aa51597023e..ca1edea0fe3148 100644
--- a/app/views/admin/reports/show.html.haml
+++ b/app/views/admin/reports/show.html.haml
@@ -45,7 +45,7 @@
             admin_account_statuses_path(@report.target_account_id, report_id: @report.id),
             class: 'table-action-link'
 
-= form_for(@form, url: batch_admin_account_statuses_path(@report.target_account_id, report_id: @report.id)) do |f|
+= form_with model: @form, url: batch_admin_account_statuses_path(@report.target_account_id, report_id: @report.id) do |f|
   .batch-table
     .batch-table__toolbar
       %label.batch-table__toolbar__select.batch-checkbox-all
diff --git a/app/views/admin/statuses/index.html.haml b/app/views/admin/statuses/index.html.haml
index a41a6332dd1af0..770d972d934b47 100644
--- a/app/views/admin/statuses/index.html.haml
+++ b/app/views/admin/statuses/index.html.haml
@@ -21,7 +21,7 @@
 
 %hr.spacer/
 
-= form_for(@status_batch_action, url: batch_admin_account_statuses_path(@account.id)) do |f|
+= form_with model: @status_batch_action, url: batch_admin_account_statuses_path(@account.id) do |f|
   = hidden_field_tag :page, params[:page] || 1
 
   - Admin::StatusFilter::KEYS.each do |key|
diff --git a/app/views/admin/trends/links/index.html.haml b/app/views/admin/trends/links/index.html.haml
index 20d8ecf8516293..647c24b1e9e1c4 100644
--- a/app/views/admin/trends/links/index.html.haml
+++ b/app/views/admin/trends/links/index.html.haml
@@ -26,7 +26,7 @@
         = t('admin.trends.preview_card_providers.title')
         = material_symbol 'chevron_right'
 
-= form_for(@form, url: batch_admin_trends_links_path) do |f|
+= form_with model: @form, url: batch_admin_trends_links_path do |f|
   = hidden_field_tag :page, params[:page] || 1
 
   - Trends::PreviewCardFilter::KEYS.each do |key|
diff --git a/app/views/admin/trends/links/preview_card_providers/index.html.haml b/app/views/admin/trends/links/preview_card_providers/index.html.haml
index 706c6070100727..b43b8dfff9f4e4 100644
--- a/app/views/admin/trends/links/preview_card_providers/index.html.haml
+++ b/app/views/admin/trends/links/preview_card_providers/index.html.haml
@@ -20,7 +20,7 @@
 
 %hr.spacer/
 
-= form_for(@form, url: batch_admin_trends_links_preview_card_providers_path) do |f|
+= form_with model: @form, url: batch_admin_trends_links_preview_card_providers_path do |f|
   = hidden_field_tag :page, params[:page] || 1
 
   - Trends::PreviewCardProviderFilter::KEYS.each do |key|
diff --git a/app/views/admin/trends/statuses/index.html.haml b/app/views/admin/trends/statuses/index.html.haml
index 8fbc0ba5b542bd..4713f8c2ae8d9d 100644
--- a/app/views/admin/trends/statuses/index.html.haml
+++ b/app/views/admin/trends/statuses/index.html.haml
@@ -22,7 +22,7 @@
         %li= filter_link_to t('generic.all'), trending: nil
         %li= filter_link_to t('admin.trends.only_allowed'), trending: 'allowed'
 
-= form_for(@form, url: batch_admin_trends_statuses_path) do |f|
+= form_with model: @form, url: batch_admin_trends_statuses_path do |f|
   = hidden_field_tag :page, params[:page] || 1
 
   - Trends::StatusFilter::KEYS.each do |key|
diff --git a/app/views/admin/trends/tags/index.html.haml b/app/views/admin/trends/tags/index.html.haml
index 655955f7f63bfe..3a44cf3a70ef3a 100644
--- a/app/views/admin/trends/tags/index.html.haml
+++ b/app/views/admin/trends/tags/index.html.haml
@@ -14,7 +14,7 @@
       %li= filter_link_to t('admin.trends.rejected'), status: 'rejected'
       %li= filter_link_to safe_join([t('admin.accounts.moderation.pending'), "(#{Tag.pending_review.count})"], ' '), status: 'pending_review'
 
-= form_for(@form, url: batch_admin_trends_tags_path) do |f|
+= form_with model: @form, url: batch_admin_trends_tags_path do |f|
   = hidden_field_tag :page, params[:page] || 1
 
   - Trends::TagFilter::KEYS.each do |key|
diff --git a/app/views/filters/statuses/index.html.haml b/app/views/filters/statuses/index.html.haml
index eaa39e170ff51d..915ec59cafdef3 100644
--- a/app/views/filters/statuses/index.html.haml
+++ b/app/views/filters/statuses/index.html.haml
@@ -13,7 +13,7 @@
 
 %hr.spacer/
 
-= form_for(@status_filter_batch_action, url: batch_filter_statuses_path(@filter.id)) do |f|
+= form_with model: @status_filter_batch_action, url: batch_filter_statuses_path(@filter.id) do |f|
   = hidden_field_tag :page, params[:page] || 1
 
   - Admin::StatusFilter::KEYS.each do |key|
diff --git a/app/views/relationships/show.html.haml b/app/views/relationships/show.html.haml
index 97ba49eb5221c7..6a866b13f86d74 100644
--- a/app/views/relationships/show.html.haml
+++ b/app/views/relationships/show.html.haml
@@ -31,7 +31,7 @@
       %li= filter_link_to t('relationships.most_recent'), order: nil
       %li= filter_link_to t('relationships.last_active'), order: 'active'
 
-= form_for(@form, url: relationships_path, method: :patch) do |f|
+= form_with model: @form, url: relationships_path, method: :patch do |f|
   = hidden_field_tag :page, params[:page] || 1
 
   - RelationshipFilter::KEYS.each do |key|

From 8eb27c60e117f9fbfe33a0b9bde6dd4c1015ef4f Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 14 Jun 2024 12:33:06 +0200
Subject: [PATCH 1296/2191] Add `most_recent_notification_id` to
 `NotificationGroup` (#30707)

---
 app/models/notification_group.rb                      | 10 +++++++---
 app/serializers/rest/notification_group_serializer.rb |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/models/notification_group.rb b/app/models/notification_group.rb
index 07967f9dcbc91e..43612d49bbdc13 100644
--- a/app/models/notification_group.rb
+++ b/app/models/notification_group.rb
@@ -1,14 +1,17 @@
 # frozen_string_literal: true
 
 class NotificationGroup < ActiveModelSerializers::Model
-  attributes :group_key, :sample_accounts, :notifications_count, :notification
+  attributes :group_key, :sample_accounts, :notifications_count, :notification, :most_recent_notification_id
 
   def self.from_notification(notification)
     if notification.group_key.present?
       # TODO: caching and preloading
-      sample_accounts = notification.account.notifications.where(group_key: notification.group_key).order(id: :desc).limit(3).map(&:from_account)
+      most_recent_notifications = notification.account.notifications.where(group_key: notification.group_key).order(id: :desc).take(3)
+      most_recent_id = most_recent_notifications.first.id
+      sample_accounts = most_recent_notifications.map(&:from_account)
       notifications_count = notification.account.notifications.where(group_key: notification.group_key).count
     else
+      most_recent_id = notification.id
       sample_accounts = [notification.from_account]
       notifications_count = 1
     end
@@ -17,7 +20,8 @@ def self.from_notification(notification)
       notification: notification,
       group_key: notification.group_key || "ungrouped-#{notification.id}",
       sample_accounts: sample_accounts,
-      notifications_count: notifications_count
+      notifications_count: notifications_count,
+      most_recent_notification_id: most_recent_id
     )
   end
 
diff --git a/app/serializers/rest/notification_group_serializer.rb b/app/serializers/rest/notification_group_serializer.rb
index ce1950c5a45260..9aa5663f4e040c 100644
--- a/app/serializers/rest/notification_group_serializer.rb
+++ b/app/serializers/rest/notification_group_serializer.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class REST::NotificationGroupSerializer < ActiveModel::Serializer
-  attributes :group_key, :notifications_count, :type
+  attributes :group_key, :notifications_count, :type, :most_recent_notification_id
 
   attribute :page_min_id, if: :paginated?
   attribute :page_max_id, if: :paginated?

From b9fd7571aedbfda524ab48ba15c03bd3936b8b2c Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 14 Jun 2024 15:04:20 +0200
Subject: [PATCH 1297/2191] Change sidebar text in web UI (#30696)

---
 .../mastodon/components/server_banner.jsx         | 10 ++++------
 .../features/ui/components/sign_in_banner.jsx     |  6 ++++--
 app/javascript/mastodon/locales/en.json           |  6 +++---
 app/javascript/styles/mastodon/components.scss    | 15 ++++++++++++---
 4 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/app/javascript/mastodon/components/server_banner.jsx b/app/javascript/mastodon/components/server_banner.jsx
index 63eec53492ea1d..baa220af5e6b16 100644
--- a/app/javascript/mastodon/components/server_banner.jsx
+++ b/app/javascript/mastodon/components/server_banner.jsx
@@ -42,10 +42,12 @@ class ServerBanner extends PureComponent {
     return (
       <div className='server-banner'>
         <div className='server-banner__introduction'>
-          <FormattedMessage id='server_banner.introduction' defaultMessage='{domain} is part of the decentralized social network powered by {mastodon}.' values={{ domain: <strong>{domain}</strong>, mastodon: <a href='https://joinmastodon.org' target='_blank'>Mastodon</a> }} />
+          <FormattedMessage id='server_banner.is_one_of_many' defaultMessage='{domain} is one of the many independent Mastodon servers you can use to participate in the fediverse.' values={{ domain: <strong>{domain}</strong>, mastodon: <a href='https://joinmastodon.org' target='_blank'>Mastodon</a> }} />
         </div>
 
-        <ServerHeroImage blurhash={server.getIn(['thumbnail', 'blurhash'])} src={server.getIn(['thumbnail', 'url'])} className='server-banner__hero' />
+        <Link to='/about'>
+          <ServerHeroImage blurhash={server.getIn(['thumbnail', 'blurhash'])} src={server.getIn(['thumbnail', 'url'])} className='server-banner__hero' />
+        </Link>
 
         <div className='server-banner__description'>
           {isLoading ? (
@@ -84,10 +86,6 @@ class ServerBanner extends PureComponent {
             )}
           </div>
         </div>
-
-        <hr className='spacer' />
-
-        <Link className='button button--block button-secondary' to='/about'><FormattedMessage id='server_banner.learn_more' defaultMessage='Learn more' /></Link>
       </div>
     );
   }
diff --git a/app/javascript/mastodon/features/ui/components/sign_in_banner.jsx b/app/javascript/mastodon/features/ui/components/sign_in_banner.jsx
index 4216f3da3827bc..74a8fdb8410250 100644
--- a/app/javascript/mastodon/features/ui/components/sign_in_banner.jsx
+++ b/app/javascript/mastodon/features/ui/components/sign_in_banner.jsx
@@ -22,7 +22,8 @@ const SignInBanner = () => {
   if (sso_redirect) {
     return (
       <div className='sign-in-banner'>
-        <p><FormattedMessage id='sign_in_banner.text' defaultMessage='Login to follow profiles or hashtags, favorite, share and reply to posts. You can also interact from your account on a different server.' /></p>
+        <p><strong><FormattedMessage id='sign_in_banner.mastodon_is' defaultMessage="Mastodon is the best way to keep up with what's happening." /></strong></p>
+        <p><FormattedMessage id='sign_in_banner.follow_anyone' defaultMessage='Follow anyone across the fediverse and see it all in chronological order. No algorithms, ads, or clickbait in sight.' /></p>
         <a href={sso_redirect} data-method='post' className='button button--block button-tertiary'><FormattedMessage id='sign_in_banner.sso_redirect' defaultMessage='Login or Register' /></a>
       </div>
     );
@@ -44,7 +45,8 @@ const SignInBanner = () => {
 
   return (
     <div className='sign-in-banner'>
-      <p><FormattedMessage id='sign_in_banner.text' defaultMessage='Login to follow profiles or hashtags, favorite, share and reply to posts. You can also interact from your account on a different server.' /></p>
+      <p><strong><FormattedMessage id='sign_in_banner.mastodon_is' defaultMessage="Mastodon is the best way to keep up with what's happening." /></strong></p>
+      <p><FormattedMessage id='sign_in_banner.follow_anyone' defaultMessage='Follow anyone across the fediverse and see it all in chronological order. No algorithms, ads, or clickbait in sight.' /></p>
       {signupButton}
       <a href='/auth/sign_in' className='button button--block button-tertiary'><FormattedMessage id='sign_in_banner.sign_in' defaultMessage='Login' /></a>
     </div>
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index 4f5caeb6acaa58..f0c27ad7068c4c 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -696,13 +696,13 @@
   "server_banner.about_active_users": "People using this server during the last 30 days (Monthly Active Users)",
   "server_banner.active_users": "active users",
   "server_banner.administered_by": "Administered by:",
-  "server_banner.introduction": "{domain} is part of the decentralized social network powered by {mastodon}.",
-  "server_banner.learn_more": "Learn more",
+  "server_banner.is_one_of_many": "{domain} is one of the many independent Mastodon servers you can use to participate in the fediverse.",
   "server_banner.server_stats": "Server stats:",
   "sign_in_banner.create_account": "Create account",
+  "sign_in_banner.follow_anyone": "Follow anyone across the fediverse and see it all in chronological order. No algorithms, ads, or clickbait in sight.",
+  "sign_in_banner.mastodon_is": "Mastodon is the best way to keep up with what's happening.",
   "sign_in_banner.sign_in": "Login",
   "sign_in_banner.sso_redirect": "Login or Register",
-  "sign_in_banner.text": "Login to follow profiles or hashtags, favorite, share and reply to posts. You can also interact from your account on a different server.",
   "status.admin_account": "Open moderation interface for @{name}",
   "status.admin_domain": "Open moderation interface for {domain}",
   "status.admin_status": "Open this post in the moderation interface",
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index d5c3d2605c91c0..73d0e6220f48aa 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -903,9 +903,15 @@ body > [data-popper-placement] {
   padding: 10px;
 
   p {
+    font-size: 15px;
+    line-height: 22px;
     color: $darker-text-color;
     margin-bottom: 20px;
 
+    strong {
+      font-weight: 700;
+    }
+
     a {
       color: $secondary-text-color;
       text-decoration: none;
@@ -8934,14 +8940,14 @@ noscript {
 }
 
 .server-banner {
-  padding: 20px 0;
-
   &__introduction {
+    font-size: 15px;
+    line-height: 22px;
     color: $darker-text-color;
     margin-bottom: 20px;
 
     strong {
-      font-weight: 600;
+      font-weight: 700;
     }
 
     a {
@@ -8969,6 +8975,9 @@ noscript {
   }
 
   &__description {
+    font-size: 15px;
+    line-height: 22px;
+    color: $darker-text-color;
     margin-bottom: 20px;
   }
 

From 09dca8ba3d47b07be8230185ff5068bdcd492ad1 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 14 Jun 2024 15:24:26 +0200
Subject: [PATCH 1298/2191] chore(deps): update dependency fog-openstack to
 v1.1.3 (#30671)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index de7e88d4d4a8f2..21c43a828368ef 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -272,7 +272,7 @@ GEM
     fog-json (1.2.0)
       fog-core
       multi_json (~> 1.10)
-    fog-openstack (1.1.1)
+    fog-openstack (1.1.3)
       fog-core (~> 2.1)
       fog-json (>= 1.0)
     formatador (1.1.0)
@@ -422,7 +422,7 @@ GEM
     memory_profiler (1.0.1)
     mime-types (3.5.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2024.0507)
+    mime-types-data (3.2024.0604)
     mini_mime (1.1.5)
     mini_portile2 (2.8.7)
     minitest (5.23.1)

From 4a5442edaa5d598eea969ac023dc394761f38d7b Mon Sep 17 00:00:00 2001
From: Michael Stanclift <mx@vmstan.com>
Date: Fri, 14 Jun 2024 10:36:57 -0500
Subject: [PATCH 1299/2191] Add ffmpeg and ImageMagick versions to admin
 dashboard (#30710)

---
 .../dimension/software_versions_dimension.rb  | 30 ++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/app/lib/admin/metrics/dimension/software_versions_dimension.rb b/app/lib/admin/metrics/dimension/software_versions_dimension.rb
index 9dd0d393f90bf1..8a9183db3c2e57 100644
--- a/app/lib/admin/metrics/dimension/software_versions_dimension.rb
+++ b/app/lib/admin/metrics/dimension/software_versions_dimension.rb
@@ -10,7 +10,7 @@ def key
   protected
 
   def perform_query
-    [mastodon_version, ruby_version, postgresql_version, redis_version, elasticsearch_version, libvips_version].compact
+    [mastodon_version, ruby_version, postgresql_version, redis_version, elasticsearch_version, libvips_version, imagemagick_version, ffmpeg_version].compact
   end
 
   def mastodon_version
@@ -82,6 +82,34 @@ def libvips_version
     }
   end
 
+  def imagemagick_version
+    return if Rails.configuration.x.use_vips
+
+    version = `convert -version`.match(/Version: ImageMagick ([\d\.]+)/)[1]
+
+    {
+      key: 'imagemagick',
+      human_key: 'ImageMagick',
+      value: version,
+      human_value: version,
+    }
+  rescue Errno::ENOENT
+    nil
+  end
+
+  def ffmpeg_version
+    version = `ffmpeg -version`.match(/ffmpeg version ([\d\.]+)/)[1]
+
+    {
+      key: 'ffmpeg',
+      human_key: 'FFmpeg',
+      value: version,
+      human_value: version,
+    }
+  rescue Errno::ENOENT
+    nil
+  end
+
   def redis_info
     @redis_info ||= if redis.is_a?(Redis::Namespace)
                       redis.redis.info

From 2b10b0e027cbab1ab66c3ad2c11b189ba4e7c041 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 14 Jun 2024 11:49:08 -0400
Subject: [PATCH 1300/2191] Reduce docker service container health check wait
 times (#30703)

---
 .github/workflows/test-migrations.yml | 12 +++---
 .github/workflows/test-ruby.yml       | 60 +++++++++++++--------------
 2 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/.github/workflows/test-migrations.yml b/.github/workflows/test-migrations.yml
index f057efc11a44ee..3eaf2c2d7402b8 100644
--- a/.github/workflows/test-migrations.yml
+++ b/.github/workflows/test-migrations.yml
@@ -41,9 +41,9 @@ jobs:
           POSTGRES_USER: postgres
         options: >-
           --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
+          --health-interval 10ms
+          --health-timeout 3s
+          --health-retries 50
         ports:
           - 5432:5432
 
@@ -51,9 +51,9 @@ jobs:
         image: redis:7-alpine
         options: >-
           --health-cmd "redis-cli ping"
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
+          --health-interval 10ms
+          --health-timeout 3s
+          --health-retries 50
         ports:
           - 6379:6379
 
diff --git a/.github/workflows/test-ruby.yml b/.github/workflows/test-ruby.yml
index 8f05dcab3ec59f..513de2072a8eb9 100644
--- a/.github/workflows/test-ruby.yml
+++ b/.github/workflows/test-ruby.yml
@@ -73,9 +73,9 @@ jobs:
           POSTGRES_USER: postgres
         options: >-
           --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
+          --health-interval 10ms
+          --health-timeout 3s
+          --health-retries 50
         ports:
           - 5432:5432
 
@@ -83,9 +83,9 @@ jobs:
         image: redis:7-alpine
         options: >-
           --health-cmd "redis-cli ping"
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
+          --health-interval 10ms
+          --health-timeout 3s
+          --health-retries 50
         ports:
           - 6379:6379
 
@@ -159,9 +159,9 @@ jobs:
           POSTGRES_USER: postgres
         options: >-
           --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
+          --health-interval 10ms
+          --health-timeout 3s
+          --health-retries 50
         ports:
           - 5432:5432
 
@@ -169,9 +169,9 @@ jobs:
         image: redis:7-alpine
         options: >-
           --health-cmd "redis-cli ping"
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
+          --health-interval 10ms
+          --health-timeout 3s
+          --health-retries 50
         ports:
           - 6379:6379
 
@@ -246,9 +246,9 @@ jobs:
           POSTGRES_USER: postgres
         options: >-
           --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
+          --health-interval 10ms
+          --health-timeout 3s
+          --health-retries 50
         ports:
           - 5432:5432
 
@@ -256,9 +256,9 @@ jobs:
         image: redis:7-alpine
         options: >-
           --health-cmd "redis-cli ping"
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
+          --health-interval 10ms
+          --health-timeout 3s
+          --health-retries 50
         ports:
           - 6379:6379
 
@@ -331,9 +331,9 @@ jobs:
           POSTGRES_USER: postgres
         options: >-
           --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
+          --health-interval 10ms
+          --health-timeout 3s
+          --health-retries 50
         ports:
           - 5432:5432
 
@@ -341,9 +341,9 @@ jobs:
         image: redis:7-alpine
         options: >-
           --health-cmd "redis-cli ping"
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
+          --health-interval 10ms
+          --health-timeout 3s
+          --health-retries 50
         ports:
           - 6379:6379
 
@@ -354,9 +354,9 @@ jobs:
           xpack.security.enabled: false
         options: >-
           --health-cmd "curl http://localhost:9200/_cluster/health"
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 10
+          --health-interval 2s
+          --health-timeout 3s
+          --health-retries 50
         ports:
           - 9200:9200
 
@@ -368,9 +368,9 @@ jobs:
           DISABLE_SECURITY_PLUGIN: true
         options: >-
           --health-cmd "curl http://localhost:9200/_cluster/health"
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 10
+          --health-interval 2s
+          --health-timeout 3s
+          --health-retries 50
         ports:
           - 9200:9200
 

From a777f7e3cc3cc936c7876c1d006e1954158d1e27 Mon Sep 17 00:00:00 2001
From: Michael Stanclift <mx@vmstan.com>
Date: Fri, 14 Jun 2024 11:10:16 -0500
Subject: [PATCH 1301/2191] Restore short Ruby version on admin dashboard
 (#30711)

---
 .../admin/metrics/dimension/software_versions_dimension.rb    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/lib/admin/metrics/dimension/software_versions_dimension.rb b/app/lib/admin/metrics/dimension/software_versions_dimension.rb
index 8a9183db3c2e57..a260a66e2af960 100644
--- a/app/lib/admin/metrics/dimension/software_versions_dimension.rb
+++ b/app/lib/admin/metrics/dimension/software_versions_dimension.rb
@@ -28,8 +28,8 @@ def ruby_version
     {
       key: 'ruby',
       human_key: 'Ruby',
-      value: "#{RUBY_VERSION}p#{RUBY_PATCHLEVEL}",
-      human_value: RUBY_DESCRIPTION,
+      value: RUBY_DESCRIPTION,
+      human_value: "#{RUBY_VERSION}p#{RUBY_PATCHLEVEL}",
     }
   end
 

From b8c60aa8101179a5293fc5a402a9a66e4c4cc696 Mon Sep 17 00:00:00 2001
From: Jeremy Kescher <jeremy@kescher.at>
Date: Sun, 16 Jun 2024 05:41:35 +0200
Subject: [PATCH 1302/2191] Bump catstodon rev to 1.0.2

---
 CHANGELOG.md            | 4 ++++
 lib/mastodon/version.rb | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1f8879b9a094f5..635ce16d0d36fe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All changes to Catstodon that aren't Mastodon or glitch-soc Mastodon changes will be documented here.
 
+## [v4.3.0-alpha.4+glitch+cat+1.0.2] - 2024-06-16
+
+- Upstream changes.
+
 ## [v4.3.0-alpha.4+glitch+cat+1.0.1] - 2024-05-31
 
 - Remove Oatstodon.
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index 6f2ab1a7664a2e..ef4e56efd7fe13 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -25,7 +25,7 @@ def prerelease
     end
 
     def catstodon_revision
-      '1.0.1'
+      '1.0.2'
     end
 
     def build_metadata

From 47c27810584005a79bc27b7bbb8492b912cffb6b Mon Sep 17 00:00:00 2001
From: Jeremy Kescher <jeremy@kescher.at>
Date: Sun, 16 Jun 2024 06:16:46 +0200
Subject: [PATCH 1303/2191] Add detail about ruby version change to changelog

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 635ce16d0d36fe..a7cbd969335b00 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,8 @@ All changes to Catstodon that aren't Mastodon or glitch-soc Mastodon changes wil
 
 ## [v4.3.0-alpha.4+glitch+cat+1.0.2] - 2024-06-16
 
-- Upstream changes.
+- Upstream changes
+  - Ruby version is now 3.3.2, and must be installed before upgrading to this version.
 
 ## [v4.3.0-alpha.4+glitch+cat+1.0.1] - 2024-05-31
 

From e80710fae6fecf4ef98373c6e49ede361a605852 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 17 Jun 2024 08:44:58 +0000
Subject: [PATCH 1304/2191] chore(deps): update dependency rubocop-performance
 to v1.21.1 (#30731)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 21c43a828368ef..a454fe85a041fe 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -746,7 +746,7 @@ GEM
       parser (>= 3.3.1.0)
     rubocop-capybara (2.21.0)
       rubocop (~> 1.41)
-    rubocop-performance (1.21.0)
+    rubocop-performance (1.21.1)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
     rubocop-rails (2.25.0)

From dd5fc5329e9e926ecc819a1e7c75390e220c9bb6 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 17 Jun 2024 10:56:33 +0200
Subject: [PATCH 1305/2191] chore(deps): update dependency memory_profiler to
 v1.0.2 (#30737)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index a454fe85a041fe..6bba10614a3cd8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -419,7 +419,7 @@ GEM
       addressable (~> 2.5)
       azure-storage-blob (~> 2.0.1)
       hashie (~> 5.0)
-    memory_profiler (1.0.1)
+    memory_profiler (1.0.2)
     mime-types (3.5.2)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2024.0604)

From 5addffb604bde2bad17903f5404234d194f4856d Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 17 Jun 2024 08:57:49 +0000
Subject: [PATCH 1306/2191] chore(deps): update dependency public_suffix to
 v5.1.1 (#30725)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 6bba10614a3cd8..5f25219c41bb0c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -609,7 +609,7 @@ GEM
       railties (>= 7.0.0)
     psych (5.1.2)
       stringio
-    public_suffix (5.0.5)
+    public_suffix (5.1.1)
     puma (6.4.2)
       nio4r (~> 2.0)
     pundit (2.3.2)

From 43bbdea421853fa251d6d73da244d26eef07ecdc Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Mon, 17 Jun 2024 11:00:26 +0200
Subject: [PATCH 1307/2191] Fix invalid `mask-icon` when a custom instance icon
 is configured (#30734)

---
 app/helpers/application_helper.rb       | 4 ++++
 app/views/layouts/application.html.haml | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 7563ae6105f894..7e9cfee3f68eb0 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -256,6 +256,10 @@ def app_icon_path(size = '48')
     instance_presenter.app_icon&.file&.url(size)
   end
 
+  def use_mask_icon?
+    instance_presenter.app_icon.blank?
+  end
+
   private
 
   def storage_host_var
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index a73287959ede01..e7f1a595e53ca6 100755
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -19,7 +19,8 @@
     - SiteUpload::APPLE_ICON_SIZES.each do |size|
       %link{ rel: 'apple-touch-icon', sizes: "#{size}x#{size}", href: app_icon_path(size.to_i) || frontend_asset_path("icons/apple-touch-icon-#{size}x#{size}.png") }/
 
-    %link{ rel: 'mask-icon', href: frontend_asset_path('images/logo-symbol-icon.svg'), color: '#6364FF' }/
+    - if use_mask_icon?
+      %link{ rel: 'mask-icon', href: frontend_asset_path('images/logo-symbol-icon.svg'), color: '#6364FF' }/
     %link{ rel: 'manifest', href: manifest_path(format: :json) }/
     = theme_color_tags current_theme
     %meta{ name: 'apple-mobile-web-app-capable', content: 'yes' }/

From 04d6cde39316f88df6f9877adedf4693a319881a Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 17 Jun 2024 11:13:07 +0200
Subject: [PATCH 1308/2191] chore(deps): update devdependencies (non-major)
 (#30735)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index b34f45aac0838f..3f254e61ac4355 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -12,10 +12,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@adobe/css-tools@npm:^4.3.2":
-  version: 4.3.2
-  resolution: "@adobe/css-tools@npm:4.3.2"
-  checksum: 10c0/296a03dd29f227c60500d2da8c7f64991fecf1d8b456ce2b4adb8cec7363d9c08b5b03f1463673fc8cbfe54b538745588e7a13c736d2dd14a80c01a20f127f39
+"@adobe/css-tools@npm:^4.4.0":
+  version: 4.4.0
+  resolution: "@adobe/css-tools@npm:4.4.0"
+  checksum: 10c0/d65ddc719389bf469097df80fb16a8af48a973dea4b57565789d70ac8e7ab4987e6dc0095da3ed5dc16c1b6f8960214a7590312eeda8abd543d91fd0f59e6c94
   languageName: node
   linkType: hard
 
@@ -3365,10 +3365,10 @@ __metadata:
   linkType: hard
 
 "@testing-library/jest-dom@npm:^6.0.0":
-  version: 6.4.5
-  resolution: "@testing-library/jest-dom@npm:6.4.5"
+  version: 6.4.6
+  resolution: "@testing-library/jest-dom@npm:6.4.6"
   dependencies:
-    "@adobe/css-tools": "npm:^4.3.2"
+    "@adobe/css-tools": "npm:^4.4.0"
     "@babel/runtime": "npm:^7.9.2"
     aria-query: "npm:^5.0.0"
     chalk: "npm:^3.0.0"
@@ -3393,7 +3393,7 @@ __metadata:
       optional: true
     vitest:
       optional: true
-  checksum: 10c0/4cfdd44e2abab2b9d399c47cbfe686729bb65160d7df0f9e2329aaaea7702f6e852a9eefb29b468f00c1e5a5274b684f8cac76959d33299dfa909ba007ea191d
+  checksum: 10c0/8f369c1d27f8128b3794c6b9af5f5b794a47af4670819756e9f4e7cf69e277b30e8b89c548277a279918f648c85c6c7874f1a867e52edd4edb0629a2cf377daa
   languageName: node
   linkType: hard
 
@@ -11282,8 +11282,8 @@ __metadata:
   linkType: hard
 
 "lint-staged@npm:^15.0.0":
-  version: 15.2.5
-  resolution: "lint-staged@npm:15.2.5"
+  version: 15.2.7
+  resolution: "lint-staged@npm:15.2.7"
   dependencies:
     chalk: "npm:~5.3.0"
     commander: "npm:~12.1.0"
@@ -11297,7 +11297,7 @@ __metadata:
     yaml: "npm:~2.4.2"
   bin:
     lint-staged: bin/lint-staged.js
-  checksum: 10c0/89c54489783510f86df15756659facade82e849c0cbfb564fe047b82be91c5d2b1b5608a4bfc5237bd7b9fd0e1206e66aa3e4f8cad3ac51e37a098b8492c2fa6
+  checksum: 10c0/c14399f9782ae222a1748144254f24b5b9afc816dc8840bd02d50f523c6582796ff18410767eb1a73cf1a83bc6e492dea7b1c4f0912bf3e434c068221f13c878
   languageName: node
   linkType: hard
 
@@ -13062,8 +13062,8 @@ __metadata:
   linkType: hard
 
 "pino-pretty@npm:^11.0.0":
-  version: 11.2.0
-  resolution: "pino-pretty@npm:11.2.0"
+  version: 11.2.1
+  resolution: "pino-pretty@npm:11.2.1"
   dependencies:
     colorette: "npm:^2.0.7"
     dateformat: "npm:^4.6.3"
@@ -13081,7 +13081,7 @@ __metadata:
     strip-json-comments: "npm:^3.1.1"
   bin:
     pino-pretty: bin.js
-  checksum: 10c0/59421522c0e07877614ed8b51eb45fe79aad9865244b95dfaf5e28c83f9e95631941b5b9e37a277d1751ed90903d7593915e8a8857cc856b4af7e6bf20a5f97d
+  checksum: 10c0/6c7f15b5bf8a007c8b7157eae445675b13cd95097ffa512d5ebd661f9e7abd328fa27592b25708756a09f098f87cb03ca81837518cd725c16e3f801129b941d4
   languageName: node
   linkType: hard
 
@@ -14022,11 +14022,11 @@ __metadata:
   linkType: hard
 
 "prettier@npm:^3.0.0":
-  version: 3.3.1
-  resolution: "prettier@npm:3.3.1"
+  version: 3.3.2
+  resolution: "prettier@npm:3.3.2"
   bin:
     prettier: bin/prettier.cjs
-  checksum: 10c0/c25a709c9f0be670dc6bcb190b622347e1dbeb6c3e7df8b0711724cb64d8647c60b839937a4df4df18e9cfb556c2b08ca9d24d9645eb5488a7fc032a2c4d5cb3
+  checksum: 10c0/39ed27d17f0238da6dd6571d63026566bd790d3d0edac57c285fbab525982060c8f1e01955fe38134ab10f0951a6076da37f015db8173c02f14bc7f0803a384c
   languageName: node
   linkType: hard
 

From c739b7f85173b62b93ab4f5be1b47f543c92bcd5 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 17 Jun 2024 09:13:07 +0000
Subject: [PATCH 1309/2191] fix(deps): update dependency ws to v8.17.1 (#30733)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 3f254e61ac4355..01b45d15690cd2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -18332,17 +18332,17 @@ __metadata:
   linkType: hard
 
 "ws@npm:^6.2.1":
-  version: 6.2.2
-  resolution: "ws@npm:6.2.2"
+  version: 6.2.3
+  resolution: "ws@npm:6.2.3"
   dependencies:
     async-limiter: "npm:~1.0.0"
-  checksum: 10c0/d628a1e95668a296644b4f51ce5debb43d9f1d89ebb2e32fef205a685b9439378eb824d60ce3a40bbc3bad0e887d84a56b343f2076f48d74f17c4c0800c42967
+  checksum: 10c0/56a35b9799993cea7ce2260197e7879f21bbbb194a967f31acbbda6f7f46ecda4365951966fb062044c95197e19fb2f053be6f65c172435455186835f494de41
   languageName: node
   linkType: hard
 
 "ws@npm:^7.3.1":
-  version: 7.5.9
-  resolution: "ws@npm:7.5.9"
+  version: 7.5.10
+  resolution: "ws@npm:7.5.10"
   peerDependencies:
     bufferutil: ^4.0.1
     utf-8-validate: ^5.0.2
@@ -18351,13 +18351,13 @@ __metadata:
       optional: true
     utf-8-validate:
       optional: true
-  checksum: 10c0/aec4ef4eb65821a7dde7b44790f8699cfafb7978c9b080f6d7a98a7f8fc0ce674c027073a78574c94786ba7112cc90fa2cc94fc224ceba4d4b1030cff9662494
+  checksum: 10c0/bd7d5f4aaf04fae7960c23dcb6c6375d525e00f795dd20b9385902bd008c40a94d3db3ce97d878acc7573df852056ca546328b27b39f47609f80fb22a0a9b61d
   languageName: node
   linkType: hard
 
 "ws@npm:^8.11.0, ws@npm:^8.12.1, ws@npm:^8.17.0":
-  version: 8.17.0
-  resolution: "ws@npm:8.17.0"
+  version: 8.17.1
+  resolution: "ws@npm:8.17.1"
   peerDependencies:
     bufferutil: ^4.0.1
     utf-8-validate: ">=5.0.2"
@@ -18366,7 +18366,7 @@ __metadata:
       optional: true
     utf-8-validate:
       optional: true
-  checksum: 10c0/55241ec93a66fdfc4bf4f8bc66c8eb038fda2c7a4ee8f6f157f2ca7dc7aa76aea0c0da0bf3adb2af390074a70a0e45456a2eaf80e581e630b75df10a64b0a990
+  checksum: 10c0/f4a49064afae4500be772abdc2211c8518f39e1c959640457dcee15d4488628620625c783902a52af2dd02f68558da2868fd06e6fd0e67ebcd09e6881b1b5bfe
   languageName: node
   linkType: hard
 

From f287462f760bbc2402772e120148687565a39cc5 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 17 Jun 2024 06:21:29 -0400
Subject: [PATCH 1310/2191] Fix repeated Delete/Undo assertion in remove status
 service spec (#30715)

---
 spec/services/remove_status_service_spec.rb | 93 ++++++++++-----------
 1 file changed, 46 insertions(+), 47 deletions(-)

diff --git a/spec/services/remove_status_service_spec.rb b/spec/services/remove_status_service_spec.rb
index b385cfa55be775..917b66c6df467b 100644
--- a/spec/services/remove_status_service_spec.rb
+++ b/spec/services/remove_status_service_spec.rb
@@ -48,30 +48,16 @@
 
     it 'sends Delete activity to followers' do
       subject.call(status)
-      expect(a_request(:post, hank.inbox_url).with(
-               body: hash_including({
-                 'type' => 'Delete',
-                 'object' => {
-                   'type' => 'Tombstone',
-                   'id' => ActivityPub::TagManager.instance.uri_for(status),
-                   'atomUri' => OStatus::TagManager.instance.uri_for(status),
-                 },
-               })
-             )).to have_been_made.once
+
+      expect(delete_delivery(hank, status))
+        .to have_been_made.once
     end
 
     it 'sends Delete activity to rebloggers' do
       subject.call(status)
-      expect(a_request(:post, bill.inbox_url).with(
-               body: hash_including({
-                 'type' => 'Delete',
-                 'object' => {
-                   'type' => 'Tombstone',
-                   'id' => ActivityPub::TagManager.instance.uri_for(status),
-                   'atomUri' => OStatus::TagManager.instance.uri_for(status),
-                 },
-               })
-             )).to have_been_made.once
+
+      expect(delete_delivery(bill, status))
+        .to have_been_made.once
     end
 
     it 'remove status from notifications' do
@@ -79,6 +65,22 @@
         Notification.where(activity_type: 'Favourite', from_account: jeff, account: alice).count
       }.from(1).to(0)
     end
+
+    def delete_delivery(target, status)
+      a_request(:post, target.inbox_url)
+        .with(body: delete_activity_for(status))
+    end
+
+    def delete_activity_for(status)
+      hash_including(
+        'type' => 'Delete',
+        'object' => {
+          'type' => 'Tombstone',
+          'id' => ActivityPub::TagManager.instance.uri_for(status),
+          'atomUri' => OStatus::TagManager.instance.uri_for(status),
+        }
+      )
+    end
   end
 
   context 'when removed status is a private self-reblog' do
@@ -87,15 +89,9 @@
 
     it 'sends Undo activity to followers' do
       subject.call(status)
-      expect(a_request(:post, hank.inbox_url).with(
-               body: hash_including({
-                 'type' => 'Undo',
-                 'object' => hash_including({
-                   'type' => 'Announce',
-                   'object' => ActivityPub::TagManager.instance.uri_for(original_status),
-                 }),
-               })
-             )).to have_been_made.once
+
+      expect(undo_delivery(hank, original_status))
+        .to have_been_made.once
     end
   end
 
@@ -105,15 +101,9 @@
 
     it 'sends Undo activity to followers' do
       subject.call(status)
-      expect(a_request(:post, hank.inbox_url).with(
-               body: hash_including({
-                 'type' => 'Undo',
-                 'object' => hash_including({
-                   'type' => 'Announce',
-                   'object' => ActivityPub::TagManager.instance.uri_for(original_status),
-                 }),
-               })
-             )).to have_been_made.once
+
+      expect(undo_delivery(hank, original_status))
+        .to have_been_made.once
     end
   end
 
@@ -123,15 +113,24 @@
 
     it 'sends Undo activity to followers' do
       subject.call(status)
-      expect(a_request(:post, bill.inbox_url).with(
-               body: hash_including({
-                 'type' => 'Undo',
-                 'object' => hash_including({
-                   'type' => 'Announce',
-                   'object' => ActivityPub::TagManager.instance.uri_for(original_status),
-                 }),
-               })
-             )).to have_been_made.once
+
+      expect(undo_delivery(bill, original_status))
+        .to have_been_made.once
     end
   end
+
+  def undo_delivery(target, status)
+    a_request(:post, target.inbox_url)
+      .with(body: undo_activity_for(status))
+  end
+
+  def undo_activity_for(status)
+    hash_including(
+      'type' => 'Undo',
+      'object' => hash_including(
+        'type' => 'Announce',
+        'object' => ActivityPub::TagManager.instance.uri_for(status)
+      )
+    )
+  end
 end

From f195c466350754a1e34810947faafeb9e6ae6a26 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 17 Jun 2024 10:22:05 +0000
Subject: [PATCH 1311/2191] chore(deps): update dependency irb to v1.13.2
 (#30727)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 5f25219c41bb0c..3a76cc50c4cdc7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -341,7 +341,7 @@ GEM
       activesupport (>= 3.0)
       nokogiri (>= 1.6)
     io-console (0.7.2)
-    irb (1.13.1)
+    irb (1.13.2)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     jmespath (1.6.2)
@@ -691,7 +691,7 @@ GEM
     redlock (1.3.2)
       redis (>= 3.0.0, < 6.0)
     regexp_parser (2.9.2)
-    reline (0.5.8)
+    reline (0.5.9)
       io-console (~> 0.5)
     request_store (1.6.0)
       rack (>= 1.4)
@@ -816,7 +816,7 @@ GEM
     statsd-ruby (1.5.0)
     stoplight (4.1.0)
       redlock (~> 1.0)
-    stringio (3.1.0)
+    stringio (3.1.1)
     strong_migrations (1.8.0)
       activerecord (>= 5.2)
     strscan (3.1.0)

From 454dc407f4d912bb4124ff2954f1faa8516b1b77 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 12 Jun 2024 15:10:51 +0200
Subject: [PATCH 1312/2191] [Glitch] Fix a few visual glitches with link
 previews in web UI

Port 99842434677ef3a01f5c7700d3b67ba5e72cd1a1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/styles/components.scss | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index 424b65a3f1d945..e82d7aadc7718e 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -1471,7 +1471,7 @@ body > [data-popper-placement] {
     .status__content,
     .status__action-bar {
       margin-inline-start: $thread-margin;
-      width: calc(100% - ($thread-margin));
+      width: calc(100% - $thread-margin);
     }
 
     .status__content__read-more-button {
@@ -4366,6 +4366,13 @@ a.status-card {
   border-end-start-radius: 0;
 }
 
+.status-card.bottomless .status-card__image,
+.status-card.bottomless .status-card__image-image,
+.status-card.bottomless .status-card__image-preview {
+  border-end-end-radius: 0;
+  border-end-start-radius: 0;
+}
+
 .status-card.expanded > a {
   width: 100%;
 }
@@ -10817,6 +10824,7 @@ noscript {
 }
 
 .more-from-author {
+  box-sizing: border-box;
   font-size: 14px;
   color: $darker-text-color;
   background: var(--surface-background-color);

From fd3697723ccec26198c92f170767481d239ac4f2 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 13 Jun 2024 15:04:16 +0200
Subject: [PATCH 1313/2191] [Glitch] Add author links on the explore page in
 web UI

Port ed6d24330ba2f80b99428cb8ee19e5d8400ebd16 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/actions/importer/index.js |   8 +-
 .../glitch/actions/importer/normalizer.js     |   4 +
 .../flavours/glitch/actions/trends.js         |   9 +-
 .../glitch/components/more_from_author.jsx    |  19 +++
 .../explore/components/author_link.jsx        |  20 +++
 .../features/explore/components/story.jsx     | 118 +++++++++++-------
 .../glitch/features/explore/links.jsx         |   3 +-
 .../features/status/components/card.jsx       |  19 +--
 .../flavours/glitch/styles/components.scss    |  69 +++++++---
 .../flavours/glitch/styles/variables.scss     |   2 +
 10 files changed, 187 insertions(+), 84 deletions(-)
 create mode 100644 app/javascript/flavours/glitch/components/more_from_author.jsx
 create mode 100644 app/javascript/flavours/glitch/features/explore/components/author_link.jsx

diff --git a/app/javascript/flavours/glitch/actions/importer/index.js b/app/javascript/flavours/glitch/actions/importer/index.js
index 5fbc9bb5bbb64a..63a28eb0edf9b0 100644
--- a/app/javascript/flavours/glitch/actions/importer/index.js
+++ b/app/javascript/flavours/glitch/actions/importer/index.js
@@ -68,13 +68,17 @@ export function importFetchedStatuses(statuses) {
         status.filtered.forEach(result => pushUnique(filters, result.filter));
       }
 
-      if (status.reblog && status.reblog.id) {
+      if (status.reblog?.id) {
         processStatus(status.reblog);
       }
 
-      if (status.poll && status.poll.id) {
+      if (status.poll?.id) {
         pushUnique(polls, normalizePoll(status.poll, getState().getIn(['polls', status.poll.id])));
       }
+
+      if (status.card?.author_account) {
+        pushUnique(accounts, status.card.author_account);
+      }
     }
 
     statuses.forEach(processStatus);
diff --git a/app/javascript/flavours/glitch/actions/importer/normalizer.js b/app/javascript/flavours/glitch/actions/importer/normalizer.js
index c2ad0f9908a126..8f5bda89b5601a 100644
--- a/app/javascript/flavours/glitch/actions/importer/normalizer.js
+++ b/app/javascript/flavours/glitch/actions/importer/normalizer.js
@@ -36,6 +36,10 @@ export function normalizeStatus(status, normalOldStatus, settings) {
     normalStatus.poll = status.poll.id;
   }
 
+  if (status.card?.author_account) {
+    normalStatus.card = { ...status.card, author_account: status.card.author_account.id };
+  }
+
   if (status.filtered) {
     normalStatus.filtered = status.filtered.map(normalizeFilterResult);
   }
diff --git a/app/javascript/flavours/glitch/actions/trends.js b/app/javascript/flavours/glitch/actions/trends.js
index 0b840b41ce6085..01089fccbb764d 100644
--- a/app/javascript/flavours/glitch/actions/trends.js
+++ b/app/javascript/flavours/glitch/actions/trends.js
@@ -1,6 +1,6 @@
 import api, { getLinks } from '../api';
 
-import { importFetchedStatuses } from './importer';
+import { importFetchedStatuses, importFetchedAccounts } from './importer';
 
 export const TRENDS_TAGS_FETCH_REQUEST = 'TRENDS_TAGS_FETCH_REQUEST';
 export const TRENDS_TAGS_FETCH_SUCCESS = 'TRENDS_TAGS_FETCH_SUCCESS';
@@ -49,8 +49,11 @@ export const fetchTrendingLinks = () => (dispatch) => {
   dispatch(fetchTrendingLinksRequest());
 
   api()
-    .get('/api/v1/trends/links')
-    .then(({ data }) => dispatch(fetchTrendingLinksSuccess(data)))
+    .get('/api/v1/trends/links', { params: { limit: 20 } })
+    .then(({ data }) => {
+      dispatch(importFetchedAccounts(data.map(link => link.author_account).filter(account => !!account)));
+      dispatch(fetchTrendingLinksSuccess(data));
+    })
     .catch(err => dispatch(fetchTrendingLinksFail(err)));
 };
 
diff --git a/app/javascript/flavours/glitch/components/more_from_author.jsx b/app/javascript/flavours/glitch/components/more_from_author.jsx
new file mode 100644
index 00000000000000..4f20ae76bf230d
--- /dev/null
+++ b/app/javascript/flavours/glitch/components/more_from_author.jsx
@@ -0,0 +1,19 @@
+import PropTypes from 'prop-types';
+
+import { FormattedMessage } from 'react-intl';
+
+import { AuthorLink } from 'flavours/glitch/features/explore/components/author_link';
+
+export const MoreFromAuthor = ({ accountId }) => (
+  <div className='more-from-author'>
+    <svg viewBox='0 0 79 79' className='logo logo--icon' role='img'>
+      <use xlinkHref='#logo-symbol-icon' />
+    </svg>
+
+    <FormattedMessage id='link_preview.more_from_author' defaultMessage='More from {name}' values={{ name: <AuthorLink accountId={accountId} /> }} />
+  </div>
+);
+
+MoreFromAuthor.propTypes = {
+  accountId: PropTypes.string.isRequired,
+};
diff --git a/app/javascript/flavours/glitch/features/explore/components/author_link.jsx b/app/javascript/flavours/glitch/features/explore/components/author_link.jsx
new file mode 100644
index 00000000000000..94061c009209e7
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/explore/components/author_link.jsx
@@ -0,0 +1,20 @@
+import PropTypes from 'prop-types';
+
+import { Avatar } from 'flavours/glitch/components/avatar';
+import { Permalink } from 'flavours/glitch/components/permalink';
+import { useAppSelector } from 'flavours/glitch/store';
+
+export const AuthorLink = ({ accountId }) => {
+  const account = useAppSelector(state => state.getIn(['accounts', accountId]));
+
+  return (
+    <Permalink href={account.get('url')} to={`/@${account.get('acct')}`} className='story__details__shared__author-link'>
+      <Avatar account={account} size={16} />
+      <bdi dangerouslySetInnerHTML={{ __html: account.get('display_name_html') }} />
+    </Permalink>
+  );
+};
+
+AuthorLink.propTypes = {
+  accountId: PropTypes.string.isRequired,
+};
diff --git a/app/javascript/flavours/glitch/features/explore/components/story.jsx b/app/javascript/flavours/glitch/features/explore/components/story.jsx
index 0e5ab9212201bf..28a1d69f8a806a 100644
--- a/app/javascript/flavours/glitch/features/explore/components/story.jsx
+++ b/app/javascript/flavours/glitch/features/explore/components/story.jsx
@@ -1,61 +1,89 @@
 import PropTypes from 'prop-types';
-import { PureComponent } from 'react';
+import { useState, useCallback } from 'react';
 
 import { FormattedMessage } from 'react-intl';
 
 import classNames from 'classnames';
 
+
 import { Blurhash } from 'flavours/glitch/components/blurhash';
-import { accountsCountRenderer } from 'flavours/glitch/components/hashtag';
 import { RelativeTimestamp } from 'flavours/glitch/components/relative_timestamp';
 import { ShortNumber } from 'flavours/glitch/components/short_number';
 import { Skeleton } from 'flavours/glitch/components/skeleton';
 
-export default class Story extends PureComponent {
-
-  static propTypes = {
-    url: PropTypes.string,
-    title: PropTypes.string,
-    lang: PropTypes.string,
-    publisher: PropTypes.string,
-    publishedAt: PropTypes.string,
-    author: PropTypes.string,
-    sharedTimes: PropTypes.number,
-    thumbnail: PropTypes.string,
-    thumbnailDescription: PropTypes.string,
-    blurhash: PropTypes.string,
-    expanded: PropTypes.bool,
-  };
-
-  state = {
-    thumbnailLoaded: false,
-  };
-
-  handleImageLoad = () => this.setState({ thumbnailLoaded: true });
-
-  render () {
-    const { expanded, url, title, lang, publisher, author, publishedAt, sharedTimes, thumbnail, thumbnailDescription, blurhash } = this.props;
-
-    const { thumbnailLoaded } = this.state;
-
-    return (
-      <a className={classNames('story', { expanded })} href={url} target='blank' rel='noopener'>
-        <div className='story__details'>
-          <div className='story__details__publisher'>{publisher ? <span lang={lang}>{publisher}</span> : <Skeleton width={50} />}{publishedAt && <> · <RelativeTimestamp timestamp={publishedAt} /></>}</div>
-          <div className='story__details__title' lang={lang}>{title ? title : <Skeleton />}</div>
-          <div className='story__details__shared'>{author && <><FormattedMessage id='link_preview.author' defaultMessage='By {name}' values={{ name: <strong>{author}</strong> }} /> · </>}{typeof sharedTimes === 'number' ? <ShortNumber value={sharedTimes} renderer={accountsCountRenderer} /> : <Skeleton width={100} />}</div>
+import { AuthorLink } from './author_link';
+
+const sharesCountRenderer = (displayNumber, pluralReady) => (
+  <FormattedMessage
+    id='link_preview.shares'
+    defaultMessage='{count, plural, one {{counter} post} other {{counter} posts}}'
+    values={{
+      count: pluralReady,
+      counter: <strong>{displayNumber}</strong>,
+    }}
+  />
+);
+
+export const Story = ({
+  url,
+  title,
+  lang,
+  publisher,
+  publishedAt,
+  author,
+  authorAccount,
+  sharedTimes,
+  thumbnail,
+  thumbnailDescription,
+  blurhash,
+  expanded
+}) => {
+  const [thumbnailLoaded, setThumbnailLoaded] = useState(false);
+
+  const handleImageLoad = useCallback(() => {
+    setThumbnailLoaded(true);
+  }, [setThumbnailLoaded]);
+
+  return (
+    <div className={classNames('story', { expanded })}>
+      <div className='story__details'>
+        <div className='story__details__publisher'>
+          {publisher ? <span lang={lang}>{publisher}</span> : <Skeleton width={50} />}{publishedAt && <> · <RelativeTimestamp timestamp={publishedAt} /></>}
         </div>
 
-        <div className='story__thumbnail'>
-          {thumbnail ? (
-            <>
-              <div className={classNames('story__thumbnail__preview', { 'story__thumbnail__preview--hidden': thumbnailLoaded })}><Blurhash hash={blurhash} /></div>
-              <img src={thumbnail} onLoad={this.handleImageLoad} alt={thumbnailDescription} title={thumbnailDescription} lang={lang} />
-            </>
-          ) : <Skeleton />}
+        <a className='story__details__title' lang={lang} href={url} target='blank' rel='noopener'>
+          {title ? title : <Skeleton />}
+        </a>
+
+        <div className='story__details__shared'>
+          {author ? <FormattedMessage id='link_preview.author' className='story__details__shared__author' defaultMessage='By {name}' values={{ name: authorAccount ? <AuthorLink accountId={authorAccount} /> : <strong>{author}</strong> }} /> : <span />}
+          {typeof sharedTimes === 'number' ? <span className='story__details__shared__pill'><ShortNumber value={sharedTimes} renderer={sharesCountRenderer} /></span> : <Skeleton width='10ch' />}
         </div>
+      </div>
+
+      <a className='story__thumbnail' href={url} target='blank' rel='noopener'>
+        {thumbnail ? (
+          <>
+            <div className={classNames('story__thumbnail__preview', { 'story__thumbnail__preview--hidden': thumbnailLoaded })}><Blurhash hash={blurhash} /></div>
+            <img src={thumbnail} onLoad={handleImageLoad} alt={thumbnailDescription} title={thumbnailDescription} lang={lang} />
+          </>
+        ) : <Skeleton />}
       </a>
-    );
-  }
+    </div>
+  );
+};
 
-}
+Story.propTypes = {
+  url: PropTypes.string,
+  title: PropTypes.string,
+  lang: PropTypes.string,
+  publisher: PropTypes.string,
+  publishedAt: PropTypes.string,
+  author: PropTypes.string,
+  authorAccount: PropTypes.string,
+  sharedTimes: PropTypes.number,
+  thumbnail: PropTypes.string,
+  thumbnailDescription: PropTypes.string,
+  blurhash: PropTypes.string,
+  expanded: PropTypes.bool,
+};
diff --git a/app/javascript/flavours/glitch/features/explore/links.jsx b/app/javascript/flavours/glitch/features/explore/links.jsx
index 5dee66d18302de..dc15030f725a88 100644
--- a/app/javascript/flavours/glitch/features/explore/links.jsx
+++ b/app/javascript/flavours/glitch/features/explore/links.jsx
@@ -13,7 +13,7 @@ import { DismissableBanner } from 'flavours/glitch/components/dismissable_banner
 import { LoadingIndicator } from 'flavours/glitch/components/loading_indicator';
 import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router';
 
-import Story from './components/story';
+import { Story } from './components/story';
 
 const mapStateToProps = state => ({
   links: state.getIn(['trends', 'links', 'items']),
@@ -75,6 +75,7 @@ class Links extends PureComponent {
             publisher={link.get('provider_name')}
             publishedAt={link.get('published_at')}
             author={link.get('author_name')}
+            authorAccount={link.getIn(['author_account', 'id'])}
             sharedTimes={link.getIn(['history', 0, 'accounts']) * 1 + link.getIn(['history', 1, 'accounts']) * 1}
             thumbnail={link.get('image')}
             thumbnailDescription={link.get('image_description')}
diff --git a/app/javascript/flavours/glitch/features/status/components/card.jsx b/app/javascript/flavours/glitch/features/status/components/card.jsx
index c6094d0beb338f..c9b0f7ebaf9cb8 100644
--- a/app/javascript/flavours/glitch/features/status/components/card.jsx
+++ b/app/javascript/flavours/glitch/features/status/components/card.jsx
@@ -11,10 +11,9 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import DescriptionIcon from '@/material-icons/400-24px/description-fill.svg?react';
 import OpenInNewIcon from '@/material-icons/400-24px/open_in_new.svg?react';
 import PlayArrowIcon from '@/material-icons/400-24px/play_arrow-fill.svg?react';
-import { Avatar } from 'flavours/glitch/components/avatar';
 import { Blurhash } from 'flavours/glitch/components/blurhash';
 import { Icon }  from 'flavours/glitch/components/icon';
-import { Permalink } from 'flavours/glitch/components/permalink';
+import { MoreFromAuthor } from 'flavours/glitch/components/more_from_author';
 import { RelativeTimestamp } from 'flavours/glitch/components/relative_timestamp';
 import { useBlurhash } from 'flavours/glitch/initial_state';
 import { decode as decodeIDNA } from 'flavours/glitch/utils/idna';
@@ -48,20 +47,6 @@ const addAutoPlay = html => {
   return html;
 };
 
-const MoreFromAuthor = ({ author }) => (
-  <div className='more-from-author'>
-    <svg viewBox='0 0 79 79' className='logo logo--icon' role='img'>
-      <use xlinkHref='#logo-symbol-icon' />
-    </svg>
-
-    <FormattedMessage id='link_preview.more_from_author' defaultMessage='More from {name}' values={{ name: <Permalink href={author.get('url')} to={`/@${author.get('acct')}`}><Avatar account={author} size={16} /> {author.get('display_name')}</Permalink> }} />
-  </div>
-);
-
-MoreFromAuthor.propTypes = {
-  author: ImmutablePropTypes.map,
-};
-
 export default class Card extends PureComponent {
 
   static propTypes = {
@@ -248,7 +233,7 @@ export default class Card extends PureComponent {
           {description}
         </a>
 
-        {showAuthor && <MoreFromAuthor author={card.get('author_account')} />}
+        {showAuthor && <MoreFromAuthor accountId={card.get('author_account')} />}
       </>
     );
   }
diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index e82d7aadc7718e..32cca1a8017627 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -9379,43 +9379,80 @@ noscript {
   display: flex;
   align-items: center;
   color: $primary-text-color;
-  text-decoration: none;
-  padding: 15px;
+  padding: 16px;
   border-bottom: 1px solid var(--background-border-color);
-  gap: 15px;
+  gap: 16px;
 
   &:last-child {
     border-bottom: 0;
   }
 
-  &:hover,
-  &:active,
-  &:focus {
-    color: $highlight-text-color;
-
-    .story__details__publisher,
-    .story__details__shared {
-      color: $highlight-text-color;
-    }
-  }
-
   &__details {
     flex: 1 1 auto;
 
     &__publisher {
       color: $darker-text-color;
       margin-bottom: 8px;
+      font-size: 14px;
+      line-height: 20px;
     }
 
     &__title {
+      display: block;
       font-size: 19px;
       line-height: 24px;
       font-weight: 500;
       margin-bottom: 8px;
+      text-decoration: none;
+      color: $primary-text-color;
+
+      &:hover,
+      &:active,
+      &:focus {
+        color: $highlight-text-color;
+      }
     }
 
     &__shared {
+      display: flex;
+      align-items: center;
       color: $darker-text-color;
+      gap: 8px;
+      justify-content: space-between;
+      font-size: 14px;
+      line-height: 20px;
+
+      & > span {
+        display: flex;
+        align-items: center;
+        gap: 4px;
+      }
+
+      &__pill {
+        background: var(--surface-variant-background-color);
+        border-radius: 4px;
+        color: inherit;
+        text-decoration: none;
+        padding: 4px 12px;
+        font-size: 12px;
+        font-weight: 500;
+        line-height: 16px;
+      }
+
+      &__author-link {
+        display: inline-flex;
+        align-items: center;
+        gap: 4px;
+        color: $primary-text-color;
+        font-weight: 500;
+        text-decoration: none;
+
+        &:hover,
+        &:active,
+        &:focus {
+          color: $highlight-text-color;
+        }
+      }
     }
 
     strong {
@@ -10486,14 +10523,14 @@ noscript {
     color: inherit;
     text-decoration: none;
     padding: 4px 12px;
-    background: $ui-base-color;
+    background: var(--surface-variant-background-color);
     border-radius: 4px;
     font-weight: 500;
 
     &:hover,
     &:focus,
     &:active {
-      background: lighten($ui-base-color, 4%);
+      background: var(--surface-variant-active-background-color);
     }
   }
 
diff --git a/app/javascript/flavours/glitch/styles/variables.scss b/app/javascript/flavours/glitch/styles/variables.scss
index 54dc54ac0283ca..3a1280948351df 100644
--- a/app/javascript/flavours/glitch/styles/variables.scss
+++ b/app/javascript/flavours/glitch/styles/variables.scss
@@ -112,4 +112,6 @@ $dismiss-overlay-width: 4rem;
   --background-color: #{darken($ui-base-color, 8%)};
   --background-color-tint: #{rgba(darken($ui-base-color, 8%), 0.9)};
   --surface-background-color: #{darken($ui-base-color, 4%)};
+  --surface-variant-background-color: #{$ui-base-color};
+  --surface-variant-active-background-color: #{lighten($ui-base-color, 4%)};
 }

From 35d52d7914a3ebd176ba73121728812154f57ec9 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 17 Jun 2024 14:13:23 +0200
Subject: [PATCH 1314/2191] New Crowdin Translations (automated) (#30723)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/an.json      |  2 --
 app/javascript/mastodon/locales/ar.json      |  3 --
 app/javascript/mastodon/locales/ast.json     |  2 --
 app/javascript/mastodon/locales/be.json      |  5 +---
 app/javascript/mastodon/locales/bg.json      |  9 +++---
 app/javascript/mastodon/locales/bn.json      |  1 -
 app/javascript/mastodon/locales/br.json      |  1 -
 app/javascript/mastodon/locales/ca.json      |  6 ++--
 app/javascript/mastodon/locales/ckb.json     |  2 --
 app/javascript/mastodon/locales/cs.json      |  3 --
 app/javascript/mastodon/locales/cy.json      |  3 --
 app/javascript/mastodon/locales/da.json      |  3 --
 app/javascript/mastodon/locales/de.json      |  6 ++--
 app/javascript/mastodon/locales/el.json      |  3 --
 app/javascript/mastodon/locales/en-GB.json   |  3 --
 app/javascript/mastodon/locales/eo.json      |  3 --
 app/javascript/mastodon/locales/es-AR.json   |  6 ++--
 app/javascript/mastodon/locales/es-MX.json   |  6 ++--
 app/javascript/mastodon/locales/es.json      |  6 ++--
 app/javascript/mastodon/locales/et.json      |  3 --
 app/javascript/mastodon/locales/eu.json      |  3 --
 app/javascript/mastodon/locales/fa.json      |  3 --
 app/javascript/mastodon/locales/fi.json      | 30 ++++++++++----------
 app/javascript/mastodon/locales/fil.json     |  1 -
 app/javascript/mastodon/locales/fo.json      |  6 ++--
 app/javascript/mastodon/locales/fr-CA.json   |  3 --
 app/javascript/mastodon/locales/fr.json      |  3 --
 app/javascript/mastodon/locales/fy.json      |  3 --
 app/javascript/mastodon/locales/ga.json      |  1 -
 app/javascript/mastodon/locales/gd.json      |  3 --
 app/javascript/mastodon/locales/gl.json      |  6 ++--
 app/javascript/mastodon/locales/he.json      |  4 +--
 app/javascript/mastodon/locales/hr.json      |  2 --
 app/javascript/mastodon/locales/hu.json      |  7 +++--
 app/javascript/mastodon/locales/hy.json      |  2 --
 app/javascript/mastodon/locales/ia.json      |  4 +--
 app/javascript/mastodon/locales/id.json      |  2 --
 app/javascript/mastodon/locales/ie.json      |  3 --
 app/javascript/mastodon/locales/ig.json      |  1 -
 app/javascript/mastodon/locales/io.json      |  3 --
 app/javascript/mastodon/locales/is.json      |  6 ++--
 app/javascript/mastodon/locales/it.json      |  8 +++---
 app/javascript/mastodon/locales/ja.json      |  3 --
 app/javascript/mastodon/locales/kab.json     |  1 -
 app/javascript/mastodon/locales/ko.json      |  7 +++--
 app/javascript/mastodon/locales/ku.json      |  2 --
 app/javascript/mastodon/locales/la.json      |  2 --
 app/javascript/mastodon/locales/lad.json     |  3 --
 app/javascript/mastodon/locales/lt.json      |  7 +++--
 app/javascript/mastodon/locales/lv.json      |  3 --
 app/javascript/mastodon/locales/ms.json      |  3 --
 app/javascript/mastodon/locales/my.json      |  3 --
 app/javascript/mastodon/locales/nl.json      |  6 ++--
 app/javascript/mastodon/locales/nn.json      |  3 --
 app/javascript/mastodon/locales/no.json      |  3 --
 app/javascript/mastodon/locales/oc.json      |  2 --
 app/javascript/mastodon/locales/pa.json      |  1 -
 app/javascript/mastodon/locales/pl.json      |  6 ++--
 app/javascript/mastodon/locales/pt-BR.json   |  3 --
 app/javascript/mastodon/locales/pt-PT.json   |  6 ++--
 app/javascript/mastodon/locales/ro.json      |  2 --
 app/javascript/mastodon/locales/ru.json      | 28 ++++++++++++++++--
 app/javascript/mastodon/locales/sa.json      |  2 --
 app/javascript/mastodon/locales/sc.json      |  1 -
 app/javascript/mastodon/locales/sco.json     |  2 --
 app/javascript/mastodon/locales/si.json      |  1 -
 app/javascript/mastodon/locales/sk.json      |  3 --
 app/javascript/mastodon/locales/sl.json      |  6 ++--
 app/javascript/mastodon/locales/sq.json      |  7 +++--
 app/javascript/mastodon/locales/sr-Latn.json |  4 +--
 app/javascript/mastodon/locales/sr.json      |  4 +--
 app/javascript/mastodon/locales/sv.json      |  3 --
 app/javascript/mastodon/locales/th.json      |  7 +++--
 app/javascript/mastodon/locales/tr.json      |  7 +++--
 app/javascript/mastodon/locales/tt.json      |  1 -
 app/javascript/mastodon/locales/uk.json      |  5 ++--
 app/javascript/mastodon/locales/vi.json      |  7 +++--
 app/javascript/mastodon/locales/zh-CN.json   |  5 ++--
 app/javascript/mastodon/locales/zh-HK.json   |  3 --
 app/javascript/mastodon/locales/zh-TW.json   |  6 ++--
 config/locales/bg.yml                        |  1 +
 config/locales/ca.yml                        |  1 +
 config/locales/da.yml                        |  1 +
 config/locales/de.yml                        |  1 +
 config/locales/es-AR.yml                     |  1 +
 config/locales/es-MX.yml                     |  1 +
 config/locales/es.yml                        |  1 +
 config/locales/fi.yml                        | 19 +++++++------
 config/locales/fo.yml                        |  1 +
 config/locales/gl.yml                        |  1 +
 config/locales/he.yml                        |  1 +
 config/locales/hu.yml                        |  1 +
 config/locales/ia.yml                        |  1 +
 config/locales/is.yml                        |  1 +
 config/locales/it.yml                        |  1 +
 config/locales/ko.yml                        |  1 +
 config/locales/lt.yml                        |  1 +
 config/locales/nl.yml                        |  1 +
 config/locales/pl.yml                        |  1 +
 config/locales/pt-PT.yml                     |  1 +
 config/locales/ru.yml                        |  1 +
 config/locales/simple_form.fi.yml            |  2 +-
 config/locales/simple_form.th.yml            |  4 +--
 config/locales/sl.yml                        |  1 +
 config/locales/sr-Latn.yml                   |  1 +
 config/locales/sr.yml                        |  1 +
 config/locales/th.yml                        |  7 +++--
 config/locales/tr.yml                        |  1 +
 config/locales/uk.yml                        |  1 +
 config/locales/vi.yml                        |  1 +
 config/locales/zh-CN.yml                     |  1 +
 config/locales/zh-TW.yml                     |  1 +
 112 files changed, 170 insertions(+), 238 deletions(-)

diff --git a/app/javascript/mastodon/locales/an.json b/app/javascript/mastodon/locales/an.json
index 3f1fd376ff46ec..af5f8426d07fba 100644
--- a/app/javascript/mastodon/locales/an.json
+++ b/app/javascript/mastodon/locales/an.json
@@ -476,8 +476,6 @@
   "server_banner.about_active_users": "Usuarios activos en o servidor entre los zaguers 30 días (Usuarios Activos Mensuals)",
   "server_banner.active_users": "usuarios activos",
   "server_banner.administered_by": "Administrau per:",
-  "server_banner.introduction": "{domain} ye parte d'o ret social descentralizau liderada per {mastodon}.",
-  "server_banner.learn_more": "Saber mas",
   "server_banner.server_stats": "Estatisticas d'o servidor:",
   "sign_in_banner.create_account": "Creyar cuenta",
   "sign_in_banner.sign_in": "Iniciar sesión",
diff --git a/app/javascript/mastodon/locales/ar.json b/app/javascript/mastodon/locales/ar.json
index 6d67d354b63e32..b5ce0ae861f6d1 100644
--- a/app/javascript/mastodon/locales/ar.json
+++ b/app/javascript/mastodon/locales/ar.json
@@ -695,13 +695,10 @@
   "server_banner.about_active_users": "الأشخاص الذين يستخدمون هذا الخادم خلال الأيام الثلاثين الأخيرة (المستخدمون النشطون شهريًا)",
   "server_banner.active_users": "مستخدم نشط",
   "server_banner.administered_by": "يُديره:",
-  "server_banner.introduction": "{domain} هو جزء من الشبكة الاجتماعية اللامركزية التي تعمل بواسطة {mastodon}.",
-  "server_banner.learn_more": "تعلم المزيد",
   "server_banner.server_stats": "إحصائيات الخادم:",
   "sign_in_banner.create_account": "أنشئ حسابًا",
   "sign_in_banner.sign_in": "تسجيل الدخول",
   "sign_in_banner.sso_redirect": "تسجيل الدخول أو إنشاء حساب",
-  "sign_in_banner.text": "قم بالولوج بحسابك لمتابعة الصفحات الشخصية أو الوسوم، أو لإضافة المنشورات إلى المفضلة ومشاركتها والرد عليها أو التفاعل بواسطة حسابك المتواجد على خادم مختلف.",
   "status.admin_account": "افتح الواجهة الإدارية لـ @{name}",
   "status.admin_domain": "فتح واجهة الإشراف لـ {domain}",
   "status.admin_status": "افتح هذا المنشور على واجهة الإشراف",
diff --git a/app/javascript/mastodon/locales/ast.json b/app/javascript/mastodon/locales/ast.json
index b5015c75d893c1..80e0aa6cbf9734 100644
--- a/app/javascript/mastodon/locales/ast.json
+++ b/app/javascript/mastodon/locales/ast.json
@@ -409,8 +409,6 @@
   "search_results.see_all": "Ver too",
   "search_results.statuses": "Artículos",
   "search_results.title": "Busca de: {q}",
-  "server_banner.introduction": "{domain} ye parte de la rede social descentralizada que tien la teunoloxía de {mastodon}.",
-  "server_banner.learn_more": "Saber más",
   "server_banner.server_stats": "Estadístiques del sirvidor:",
   "sign_in_banner.create_account": "Crear una cuenta",
   "sign_in_banner.sso_redirect": "Aniciar la sesión o rexistrase",
diff --git a/app/javascript/mastodon/locales/be.json b/app/javascript/mastodon/locales/be.json
index 041d90775b5795..03164c4290f550 100644
--- a/app/javascript/mastodon/locales/be.json
+++ b/app/javascript/mastodon/locales/be.json
@@ -444,7 +444,7 @@
   "mute_modal.you_wont_see_posts": "Карыстальнік па-ранейшаму будзе бачыць вашыя паведамленні, але вы не будзеце паведамленні карыстальніка.",
   "navigation_bar.about": "Пра нас",
   "navigation_bar.advanced_interface": "Адкрыць у пашыраным вэб-інтэрфейсе",
-  "navigation_bar.blocks": "Заблакаваныя карыстальнікі",
+  "navigation_bar.blocks": "Заблакіраваныя карыстальнікі",
   "navigation_bar.bookmarks": "Закладкі",
   "navigation_bar.community_timeline": "Лакальная стужка",
   "navigation_bar.compose": "Стварыць новы допіс",
@@ -695,13 +695,10 @@
   "server_banner.about_active_users": "Людзі, якія карыстаюцца гэтым сервера на працягу апошніх 30 дзён (Штомесячна Актыўныя Карыстальнікі)",
   "server_banner.active_users": "актыўныя карыстальнікі",
   "server_banner.administered_by": "Адміністратар:",
-  "server_banner.introduction": "{domain} ёсць часткай дэцэнтралізаванай сацыяльнай сеткі ад {mastodon}.",
-  "server_banner.learn_more": "Даведацца больш",
   "server_banner.server_stats": "Статыстыка сервера:",
   "sign_in_banner.create_account": "Стварыць уліковы запіс",
   "sign_in_banner.sign_in": "Увайсці",
   "sign_in_banner.sso_redirect": "Уваход ці рэгістрацыя",
-  "sign_in_banner.text": "Увайдзіце, каб падпісацца на людзей і тэгі, каб адказваць на допісы, дзяліцца імі і падабаць іх, альбо кантактаваць з вашага ўліковага запісу на іншым серверы.",
   "status.admin_account": "Адкрыць інтэрфейс мадэратара для @{name}",
   "status.admin_domain": "Адкрыць інтэрфейс мадэратара для {domain}",
   "status.admin_status": "Адкрыць гэты допіс у інтэрфейсе мадэрацыі",
diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json
index b17172058ba752..98e84c45d75351 100644
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@@ -415,6 +415,7 @@
   "limited_account_hint.title": "Този профил е бил скрит от модераторите на {domain}.",
   "link_preview.author": "От {name}",
   "link_preview.more_from_author": "Още от {name}",
+  "link_preview.shares": "{count, plural, one {{counter} публикация} other {{counter} публикации}}",
   "lists.account.add": "Добавяне към списък",
   "lists.account.remove": "Премахване от списъка",
   "lists.delete": "Изтриване на списъка",
@@ -695,13 +696,13 @@
   "server_banner.about_active_users": "Ползващите сървъра през последните 30 дни (дейните месечно потребители)",
   "server_banner.active_users": "дейни потребители",
   "server_banner.administered_by": "Администрира се от:",
-  "server_banner.introduction": "{domain} е част от децентрализираната социална мрежа, поддържана от {mastodon}.",
-  "server_banner.learn_more": "Научете повече",
+  "server_banner.is_one_of_many": "{domain} е един от многото независими сървъри на Mastodon, които може да употребявате, за да участвате във федивселената.",
   "server_banner.server_stats": "Статистика на сървъра:",
   "sign_in_banner.create_account": "Създаване на акаунт",
+  "sign_in_banner.follow_anyone": "Последвайте някого през федивселената и вижте всичко в хронологичен ред. Без алгоритми, реклами, или примамващи връзки в полезрението.",
+  "sign_in_banner.mastodon_is": "Mastodon е най-добрия начин да бъдете в крак със случващото се.",
   "sign_in_banner.sign_in": "Вход",
   "sign_in_banner.sso_redirect": "Влизане или регистриране",
-  "sign_in_banner.text": "Влезте, за да последвате профили или хаштагове, отбелязвате като любими, споделяте и отговаряте на публикации. Може също така да взаимодействате от акаунта си на друг сървър.",
   "status.admin_account": "Отваряне на интерфейс за модериране за @{name}",
   "status.admin_domain": "Отваряне на модериращия интерфейс за {domain}",
   "status.admin_status": "Отваряне на публикацията в модериращия интерфейс",
@@ -742,7 +743,7 @@
   "status.reblogged_by": "{name} подсили",
   "status.reblogs": "{count, plural, one {подсилване} other {подсилвания}}",
   "status.reblogs.empty": "Още никого не е подсилвал публикацията. Подсилващият ще се покаже тук.",
-  "status.redraft": "Изтриване и преначертаване",
+  "status.redraft": "Изтриване и преработване",
   "status.remove_bookmark": "Премахване на отметката",
   "status.replied_to": "В отговор до {name}",
   "status.reply": "Отговор",
diff --git a/app/javascript/mastodon/locales/bn.json b/app/javascript/mastodon/locales/bn.json
index 797b93e24359f7..4c4138bcf125e5 100644
--- a/app/javascript/mastodon/locales/bn.json
+++ b/app/javascript/mastodon/locales/bn.json
@@ -407,7 +407,6 @@
   "search_results.all": "সব",
   "search_results.hashtags": "হ্যাশট্যাগগুলি",
   "search_results.statuses": "টুট",
-  "server_banner.learn_more": "আরো জানো",
   "sign_in_banner.sign_in": "Sign in",
   "status.admin_account": "@{name} র জন্য পরিচালনার ইন্টারফেসে ঢুকুন",
   "status.admin_status": "যায় লেখাটি পরিচালনার ইন্টারফেসে খুলুন",
diff --git a/app/javascript/mastodon/locales/br.json b/app/javascript/mastodon/locales/br.json
index 9ec26c8c123877..7cd49ba59d8cdd 100644
--- a/app/javascript/mastodon/locales/br.json
+++ b/app/javascript/mastodon/locales/br.json
@@ -566,7 +566,6 @@
   "search_results.title": "Klask {q}",
   "server_banner.active_users": "implijerien·ezed oberiant",
   "server_banner.administered_by": "Meret gant :",
-  "server_banner.learn_more": "Gouzout hiroc'h",
   "server_banner.server_stats": "Stadegoù ar servijer :",
   "sign_in_banner.create_account": "Krouiñ ur gont",
   "sign_in_banner.sign_in": "Kevreañ",
diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index e178c4736caeba..88dd34aff04006 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -696,13 +696,13 @@
   "server_banner.about_active_users": "Gent que ha fet servir aquest servidor en els darrers 30 dies (Usuaris Actius Mensuals)",
   "server_banner.active_users": "usuaris actius",
   "server_banner.administered_by": "Administrat per:",
-  "server_banner.introduction": "{domain} és part de la xarxa social descentralitzada impulsada per {mastodon}.",
-  "server_banner.learn_more": "Més informació",
+  "server_banner.is_one_of_many": "{domain} és un dels molts servidors de Mastodon que pots fer servir per a participar en el fedivers.",
   "server_banner.server_stats": "Estadístiques del servidor:",
   "sign_in_banner.create_account": "Crea un compte",
+  "sign_in_banner.follow_anyone": "Segueix qui sigui al fedivers i ho veuràs tot en ordre cronològic. Sense algorismes, anuncis o pescaclics.",
+  "sign_in_banner.mastodon_is": "Mastodon és la millor manera de seguir al moment què passa.",
   "sign_in_banner.sign_in": "Inici de sessió",
   "sign_in_banner.sso_redirect": "Inici de sessió o Registre",
-  "sign_in_banner.text": "Inicia la sessió per a seguir perfils o etiquetes, afavorir, compartir i respondre tuts. També pots interactuar des del teu compte a un servidor diferent.",
   "status.admin_account": "Obre la interfície de moderació per a @{name}",
   "status.admin_domain": "Obre la interfície de moderació per a @{domain}",
   "status.admin_status": "Obre aquest tut a la interfície de moderació",
diff --git a/app/javascript/mastodon/locales/ckb.json b/app/javascript/mastodon/locales/ckb.json
index c3c365b3a11c6f..c212b53a8b2ad2 100644
--- a/app/javascript/mastodon/locales/ckb.json
+++ b/app/javascript/mastodon/locales/ckb.json
@@ -533,8 +533,6 @@
   "server_banner.about_active_users": "ئەو کەسانەی لە ماوەی ٣٠ ڕۆژی ڕابردوودا ئەم سێرڤەرە بەکاردەهێنن (بەکارهێنەرانی چالاک مانگانە)",
   "server_banner.active_users": "بەکارهێنەرانی چالاک",
   "server_banner.administered_by": "بەڕێوەبردن لەلایەن:",
-  "server_banner.introduction": "{domain} بەشێکە لەو تۆڕە کۆمەڵایەتییە لامەرکەزییەی کە لەلایەن {mastodon}ەوە بەهێز دەکرێت.",
-  "server_banner.learn_more": "زیاتر فێربه",
   "server_banner.server_stats": "دۆخی ڕاژەکار:",
   "sign_in_banner.create_account": "هەژمار دروستبکە",
   "sign_in_banner.sign_in": "بچۆ ژوورەوە",
diff --git a/app/javascript/mastodon/locales/cs.json b/app/javascript/mastodon/locales/cs.json
index f2a1f023a3191b..d8d83ae5fad7bf 100644
--- a/app/javascript/mastodon/locales/cs.json
+++ b/app/javascript/mastodon/locales/cs.json
@@ -694,13 +694,10 @@
   "server_banner.about_active_users": "Lidé používající tento server během posledních 30 dní (měsíční aktivní uživatelé)",
   "server_banner.active_users": "aktivní uživatelé",
   "server_banner.administered_by": "Spravováno:",
-  "server_banner.introduction": "{domain} je součástí decentralizované sociální sítě běžící na {mastodon}.",
-  "server_banner.learn_more": "Zjistit více",
   "server_banner.server_stats": "Statistiky serveru:",
   "sign_in_banner.create_account": "Vytvořit účet",
   "sign_in_banner.sign_in": "Přihlásit se",
   "sign_in_banner.sso_redirect": "Přihlášení nebo Registrace",
-  "sign_in_banner.text": "Přihlaste se pro sledování profilů nebo hashtagů, oblíbení, sdílení a odpovídání na příspěvky. Svůj účet můžete také používat k interagování i na jiném serveru.",
   "status.admin_account": "Otevřít moderátorské rozhraní pro @{name}",
   "status.admin_domain": "Otevřít moderátorské rozhraní pro {domain}",
   "status.admin_status": "Otevřít tento příspěvek v moderátorském rozhraní",
diff --git a/app/javascript/mastodon/locales/cy.json b/app/javascript/mastodon/locales/cy.json
index 2c597699591674..96476b14331eb5 100644
--- a/app/javascript/mastodon/locales/cy.json
+++ b/app/javascript/mastodon/locales/cy.json
@@ -694,13 +694,10 @@
   "server_banner.about_active_users": "Pobl sy'n defnyddio'r gweinydd hwn yn ystod y 30 diwrnod diwethaf (Defnyddwyr Gweithredol Misol)",
   "server_banner.active_users": "defnyddwyr gweithredol",
   "server_banner.administered_by": "Gweinyddir gan:",
-  "server_banner.introduction": "Mae {domain} yn rhan o'r rhwydwaith cymdeithasol datganoledig sy'n cael ei bweru gan {mastodon}.",
-  "server_banner.learn_more": "Dysgu mwy",
   "server_banner.server_stats": "Ystadegau'r gweinydd:",
   "sign_in_banner.create_account": "Creu cyfrif",
   "sign_in_banner.sign_in": "Mewngofnodi",
   "sign_in_banner.sso_redirect": "Mewngofnodi neu Gofrestru",
-  "sign_in_banner.text": "Mewngofnodwch i ddilyn proffiliau neu hashnodau, ffefrynnau, rhannu ac ymateb i bostiadau. Gallwch hefyd ryngweithio o'ch cyfrif ar weinyddion gwahanol.",
   "status.admin_account": "Agor rhyngwyneb cymedroli ar gyfer @{name}",
   "status.admin_domain": "Agor rhyngwyneb cymedroli {domain}",
   "status.admin_status": "Agor y postiad hwn yn y rhyngwyneb cymedroli",
diff --git a/app/javascript/mastodon/locales/da.json b/app/javascript/mastodon/locales/da.json
index 1b6bd36426b3dc..5ac7128a375eac 100644
--- a/app/javascript/mastodon/locales/da.json
+++ b/app/javascript/mastodon/locales/da.json
@@ -696,13 +696,10 @@
   "server_banner.about_active_users": "Folk, som brugte denne server de seneste 30 dage (månedlige aktive brugere)",
   "server_banner.active_users": "aktive brugere",
   "server_banner.administered_by": "Håndteres af:",
-  "server_banner.introduction": "{domain} er en del af det decentraliserede, sociale netværk drevet af {mastodon}.",
-  "server_banner.learn_more": "Læs mere",
   "server_banner.server_stats": "Serverstatstik:",
   "sign_in_banner.create_account": "Opret konto",
   "sign_in_banner.sign_in": "Log ind",
   "sign_in_banner.sso_redirect": "Log ind eller Tilmeld",
-  "sign_in_banner.text": "Log ind for at følge profiler eller hashtags, markere som favorit, dele og besvare indlæg eller interagere fra din konto på en anden server.",
   "status.admin_account": "Åbn modereringsbrugerflade for @{name}",
   "status.admin_domain": "Åbn modereringsbrugerflade for {domain}",
   "status.admin_status": "Åbn dette indlæg i modereringsbrugerfladen",
diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json
index 5a6e15b0951bac..86438757a30755 100644
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@@ -696,13 +696,13 @@
   "server_banner.about_active_users": "Personen, die diesen Server in den vergangenen 30 Tagen verwendet haben (monatlich aktive Nutzer*innen)",
   "server_banner.active_users": "aktive Profile",
   "server_banner.administered_by": "Verwaltet von:",
-  "server_banner.introduction": "{domain} ist Teil eines dezentralisierten sozialen Netzwerks, angetrieben von {mastodon}.",
-  "server_banner.learn_more": "Mehr erfahren",
+  "server_banner.is_one_of_many": "{domain} ist einer von vielen unabhängigen Mastodon-Servern, mit dem du dich im Fediverse beteiligen kannst.",
   "server_banner.server_stats": "Serverstatistik:",
   "sign_in_banner.create_account": "Konto erstellen",
+  "sign_in_banner.follow_anyone": "Du kannst jedem im Fediverse folgen und alles in chronologischer Reihenfolge sehen. Keine Algorithmen, Werbung oder Clickbaits vorhanden.",
+  "sign_in_banner.mastodon_is": "Mastodon ist der beste Zugang, um auf dem Laufenden zu bleiben.",
   "sign_in_banner.sign_in": "Anmelden",
   "sign_in_banner.sso_redirect": "Anmelden oder registrieren",
-  "sign_in_banner.text": "Melde dich an, um Profilen oder Hashtags zu folgen, Beiträge zu favorisieren, zu teilen und auf sie zu antworten. Du kannst auch von deinem Konto aus auf einem anderen Server interagieren.",
   "status.admin_account": "@{name} moderieren",
   "status.admin_domain": "{domain} moderieren",
   "status.admin_status": "Beitrag moderieren",
diff --git a/app/javascript/mastodon/locales/el.json b/app/javascript/mastodon/locales/el.json
index 937bb5d027c3e5..47a8df62001c61 100644
--- a/app/javascript/mastodon/locales/el.json
+++ b/app/javascript/mastodon/locales/el.json
@@ -558,13 +558,10 @@
   "server_banner.about_active_users": "Άτομα που χρησιμοποιούν αυτόν τον διακομιστή κατά τις τελευταίες 30 ημέρες (Μηνιαία Ενεργοί Χρήστες)",
   "server_banner.active_users": "ενεργοί χρήστες",
   "server_banner.administered_by": "Διαχειριστής:",
-  "server_banner.introduction": "Ο {domain} είναι μέρος του αποκεντρωμένου κοινωνικού δικτύου που παρέχεται από {mastodon}.",
-  "server_banner.learn_more": "Μάθε περισσότερα",
   "server_banner.server_stats": "Στατιστικά διακομιστή:",
   "sign_in_banner.create_account": "Δημιουργία λογαριασμού",
   "sign_in_banner.sign_in": "Σύνδεση",
   "sign_in_banner.sso_redirect": "Συνδεθείτε ή Εγγραφείτε",
-  "sign_in_banner.text": "Συνδεθείτε για να ακολουθήσετε προφίλ ή ετικέτες, αγαπήστε, μοιραστείτε και απαντήστε σε δημοσιεύσεις. Μπορείτε επίσης να αλληλεπιδράσετε από τον λογαριασμό σας σε διαφορετικό διακομιστή.",
   "status.admin_account": "Άνοιγμα διεπαφής συντονισμού για τον/την @{name}",
   "status.admin_domain": "Άνοιγμα λειτουργίας διαμεσολάβησης για {domain}",
   "status.admin_status": "Άνοιγμα αυτής της ανάρτησης σε διεπαφή συντονισμού",
diff --git a/app/javascript/mastodon/locales/en-GB.json b/app/javascript/mastodon/locales/en-GB.json
index e70348e0b2beff..108880cc97f961 100644
--- a/app/javascript/mastodon/locales/en-GB.json
+++ b/app/javascript/mastodon/locales/en-GB.json
@@ -694,13 +694,10 @@
   "server_banner.about_active_users": "People using this server during the last 30 days (Monthly Active Users)",
   "server_banner.active_users": "active users",
   "server_banner.administered_by": "Administered by:",
-  "server_banner.introduction": "{domain} is part of the decentralised social network powered by {mastodon}.",
-  "server_banner.learn_more": "Learn more",
   "server_banner.server_stats": "Server stats:",
   "sign_in_banner.create_account": "Create account",
   "sign_in_banner.sign_in": "Sign in",
   "sign_in_banner.sso_redirect": "Login or Register",
-  "sign_in_banner.text": "Login to follow profiles or hashtags, favourite, share and reply to posts. You can also interact from your account on a different server.",
   "status.admin_account": "Open moderation interface for @{name}",
   "status.admin_domain": "Open moderation interface for {domain}",
   "status.admin_status": "Open this post in the moderation interface",
diff --git a/app/javascript/mastodon/locales/eo.json b/app/javascript/mastodon/locales/eo.json
index 2dbbf787730920..bab277b483221f 100644
--- a/app/javascript/mastodon/locales/eo.json
+++ b/app/javascript/mastodon/locales/eo.json
@@ -596,13 +596,10 @@
   "server_banner.about_active_users": "Personoj uzantaj ĉi tiun servilon dum la lastaj 30 tagoj (Aktivaj Uzantoj Monate)",
   "server_banner.active_users": "aktivaj uzantoj",
   "server_banner.administered_by": "Administrata de:",
-  "server_banner.introduction": "{domain} apartenas al la malcentra socia retejo povigita de {mastodon}.",
-  "server_banner.learn_more": "Lernu pli",
   "server_banner.server_stats": "Statistikoj de la servilo:",
   "sign_in_banner.create_account": "Krei konton",
   "sign_in_banner.sign_in": "Saluti",
   "sign_in_banner.sso_redirect": "Ensalutu aŭ Registriĝi",
-  "sign_in_banner.text": "Ensalutu por sekvi profilojn aŭ haŝetikedojn, ŝatatajn, dividi kaj respondi afiŝojn. Vi ankaŭ povas interagi de via konto sur alia servilo.",
   "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",
diff --git a/app/javascript/mastodon/locales/es-AR.json b/app/javascript/mastodon/locales/es-AR.json
index 1cbd7b18ebd570..7da39b88ccf151 100644
--- a/app/javascript/mastodon/locales/es-AR.json
+++ b/app/javascript/mastodon/locales/es-AR.json
@@ -696,13 +696,13 @@
   "server_banner.about_active_users": "Personas usando este servidor durante los últimos 30 días (Usuarios Activos Mensuales)",
   "server_banner.active_users": "usuarios activos",
   "server_banner.administered_by": "Administrado por:",
-  "server_banner.introduction": "{domain} es parte de la red social descentralizada con la tecnología de {mastodon}.",
-  "server_banner.learn_more": "Aprendé más",
+  "server_banner.is_one_of_many": "{domain} es uno de los muchos servidores de Mastodon independientes que podés usar para participar en el Fediverso.",
   "server_banner.server_stats": "Estadísticas del servidor:",
   "sign_in_banner.create_account": "Crear cuenta",
+  "sign_in_banner.follow_anyone": "Seguí a cualquiera cuenta a través del Fediverso y leé todo en orden cronológico. Nada de algoritmos, publicidad o titulares engañosos.",
+  "sign_in_banner.mastodon_is": "Mastodon es la mejor manera de mantenerse al día sobre lo que está sucediendo.",
   "sign_in_banner.sign_in": "Iniciar sesión",
   "sign_in_banner.sso_redirect": "Iniciá sesión o registrate",
-  "sign_in_banner.text": "Iniciá sesión para seguir cuentas o etiquetas, marcar mensajes como favoritos, compartirlos y responderlos. También podés interactuar desde tu cuenta en un servidor diferente.",
   "status.admin_account": "Abrir interface de moderación para @{name}",
   "status.admin_domain": "Abrir interface de moderación para {domain}",
   "status.admin_status": "Abrir este mensaje en la interface de moderación",
diff --git a/app/javascript/mastodon/locales/es-MX.json b/app/javascript/mastodon/locales/es-MX.json
index dd7dd2bea7eec4..d3e02cd6e11af4 100644
--- a/app/javascript/mastodon/locales/es-MX.json
+++ b/app/javascript/mastodon/locales/es-MX.json
@@ -696,13 +696,13 @@
   "server_banner.about_active_users": "Personas utilizando este servidor durante los últimos 30 días (Usuarios Activos Mensuales)",
   "server_banner.active_users": "usuarios activos",
   "server_banner.administered_by": "Administrado por:",
-  "server_banner.introduction": "{domain} es parte de la red social descentralizada gestionada por {mastodon}.",
-  "server_banner.learn_more": "Saber más",
+  "server_banner.is_one_of_many": "{domain} es uno de los varios servidores independientes de Mastodon que puedes usar para participar en el fediverso.",
   "server_banner.server_stats": "Estadísticas del servidor:",
   "sign_in_banner.create_account": "Crear cuenta",
+  "sign_in_banner.follow_anyone": "Sigue a cualquier persona en el fediverso y velo todo en orden cronológico. Sin algoritmos, sin anuncios o titulares engañosos.",
+  "sign_in_banner.mastodon_is": "Mastodon es el mejor modo de mantenerse al día sobre qué está ocurriendo.",
   "sign_in_banner.sign_in": "Iniciar sesión",
   "sign_in_banner.sso_redirect": "Iniciar sesión o Registrarse",
-  "sign_in_banner.text": "Inicia sesión para seguir perfiles o etiquetas, así como marcar como favoritas, compartir y responder a publicaciones. También puedes interactuar desde tu cuenta en un servidor diferente.",
   "status.admin_account": "Abrir interfaz de moderación para @{name}",
   "status.admin_domain": "Abrir interfaz de moderación para {domain}",
   "status.admin_status": "Abrir este estado en la interfaz de moderación",
diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json
index e1ba41347ae2f3..849e0fa27f175c 100644
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@@ -696,13 +696,13 @@
   "server_banner.about_active_users": "Usuarios activos en el servidor durante los últimos 30 días (Usuarios Activos Mensuales)",
   "server_banner.active_users": "usuarios activos",
   "server_banner.administered_by": "Administrado por:",
-  "server_banner.introduction": "{domain} es parte de la red social descentralizada liderada por {mastodon}.",
-  "server_banner.learn_more": "Saber más",
+  "server_banner.is_one_of_many": "{domain} es uno de los varios servidores independientes de Mastodon que puedes usar para participar en el fediverso.",
   "server_banner.server_stats": "Estadísticas del servidor:",
   "sign_in_banner.create_account": "Crear cuenta",
+  "sign_in_banner.follow_anyone": "Sigue a cualquier persona en el fediverso y velo todo en orden cronológico. Sin algoritmos, sin anuncios o titulares engañosos.",
+  "sign_in_banner.mastodon_is": "Mastodon es el mejor modo de mantenerse al día sobre qué está ocurriendo.",
   "sign_in_banner.sign_in": "Iniciar sesión",
   "sign_in_banner.sso_redirect": "Iniciar sesión o Registrarse",
-  "sign_in_banner.text": "Inicia sesión para seguir perfiles o etiquetas, así como marcar como favoritas, compartir y responder a publicaciones. También puedes interactuar desde tu cuenta en un servidor diferente.",
   "status.admin_account": "Abrir interfaz de moderación para @{name}",
   "status.admin_domain": "Abrir interfaz de moderación para {domain}",
   "status.admin_status": "Abrir esta publicación en la interfaz de moderación",
diff --git a/app/javascript/mastodon/locales/et.json b/app/javascript/mastodon/locales/et.json
index b2759d66c64861..46e28b999bb229 100644
--- a/app/javascript/mastodon/locales/et.json
+++ b/app/javascript/mastodon/locales/et.json
@@ -680,13 +680,10 @@
   "server_banner.about_active_users": "Inimesed, kes kasutavad seda serverit viimase 30 päeva jooksul (kuu aktiivsed kasutajad)",
   "server_banner.active_users": "aktiivsed kasutajad",
   "server_banner.administered_by": "Administraator:",
-  "server_banner.introduction": "{domain} on osa detsentraliseeritud sotsiaalvõrgustikust, mida võimaldab {mastodon}.",
-  "server_banner.learn_more": "Vaata täpsemalt",
   "server_banner.server_stats": "Serveri statistika:",
   "sign_in_banner.create_account": "Loo konto",
   "sign_in_banner.sign_in": "Logi sisse",
   "sign_in_banner.sso_redirect": "Sisene või registreeru",
-  "sign_in_banner.text": "Logi sisse, et jälgida profiile või silte, märkida lemmikuks, jagada ja vastata postitustele. Võid suhelda ka mõne teise serveri konto kaudu.",
   "status.admin_account": "Ava @{name} moderaatorivaates",
   "status.admin_domain": "Ava {domain} modeereerimisliides",
   "status.admin_status": "Ava postitus moderaatorivaates",
diff --git a/app/javascript/mastodon/locales/eu.json b/app/javascript/mastodon/locales/eu.json
index 9fae0748780aad..5fbac270cf8cdb 100644
--- a/app/javascript/mastodon/locales/eu.json
+++ b/app/javascript/mastodon/locales/eu.json
@@ -692,13 +692,10 @@
   "server_banner.about_active_users": "Azken 30 egunetan zerbitzari hau erabili duen jendea (hilabeteko erabiltzaile aktiboak)",
   "server_banner.active_users": "erabiltzaile aktibo",
   "server_banner.administered_by": "Administratzailea(k):",
-  "server_banner.introduction": "{domain} zerbitzaria {mastodon} erabiltzen duen sare sozial deszentralizatuko parte da.",
-  "server_banner.learn_more": "Ikasi gehiago",
   "server_banner.server_stats": "Zerbitzariaren estatistikak:",
   "sign_in_banner.create_account": "Sortu kontua",
   "sign_in_banner.sign_in": "Hasi saioa",
   "sign_in_banner.sso_redirect": "Hasi saioa edo izena eman",
-  "sign_in_banner.text": "Hasi saioa profilak edo traolak jarraitzeko, bidalketak gogokoetara gehitzeko, partekatzeko edo erantzuteko. Zure kontutik ere komunika zaitezke beste zerbitzari ezberdin batean.",
   "status.admin_account": "Ireki @{name} erabiltzailearen moderazio interfazea",
   "status.admin_domain": "{domain}-(r)en moderazio-interfazea ireki",
   "status.admin_status": "Ireki bidalketa hau moderazio interfazean",
diff --git a/app/javascript/mastodon/locales/fa.json b/app/javascript/mastodon/locales/fa.json
index 6d6b7d612caea0..072a67421ae0e6 100644
--- a/app/javascript/mastodon/locales/fa.json
+++ b/app/javascript/mastodon/locales/fa.json
@@ -620,13 +620,10 @@
   "server_banner.about_active_users": "افرادی که در ۳۰ روز گذشته از این کارساز استفاده کرده‌اند (کاربران فعّال ماهانه)",
   "server_banner.active_users": "کاربر فعّال",
   "server_banner.administered_by": "به مدیریت:",
-  "server_banner.introduction": "{domain} بخشی از شبکهٔ اجتماعی نامتمرکزیست که از {mastodon} نیرو گرفته.",
-  "server_banner.learn_more": "بیش‌تر بیاموزید",
   "server_banner.server_stats": "آمار کارساز:",
   "sign_in_banner.create_account": "ایجاد حساب",
   "sign_in_banner.sign_in": "ورود",
   "sign_in_banner.sso_redirect": "ورود یا ثبت نام",
-  "sign_in_banner.text": "برای پی‌گیری نمایه‌ها یا برچسب‌ها، پسندیدن، هم‌رسانی و یا پاسخ به فرسته‌ها وارد شوید. همچنین می‌توانید این کارها را با حسابتان در کارسازی دیگر انجام دهید.",
   "status.admin_account": "گشودن واسط مدیریت برای ‎@{name}",
   "status.admin_domain": "گشودن واسط مدیریت برای ‎{domain}",
   "status.admin_status": "گشودن این فرسته در واسط مدیریت",
diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index 68ea3925b95232..67e2b72b869fb5 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -96,7 +96,7 @@
   "block_modal.they_cant_see_posts": "Hän ei voi enää nähdä julkaisujasi, etkä sinä voi nähdä hänen.",
   "block_modal.they_will_know": "Hän voi nähdä, että hänet on estetty.",
   "block_modal.title": "Estetäänkö käyttäjä?",
-  "block_modal.you_wont_see_mentions": "Et enää näe hänen julkaisujaan etkä voi seurata häntä.",
+  "block_modal.you_wont_see_mentions": "Et tule enää näkemään julkaisuja, joissa hänet mainitaan.",
   "boost_modal.combo": "Ensi kerralla voit ohittaa tämän painamalla {combo}",
   "bundle_column_error.copy_stacktrace": "Kopioi virheraportti",
   "bundle_column_error.error.body": "Pyydettyä sivua ei voitu hahmontaa. Se voi johtua virheestä koodissamme tai selaimen yhteensopivuudessa.",
@@ -213,7 +213,7 @@
   "domain_block_modal.block_account_instead": "Estä sen sijaan @{name}",
   "domain_block_modal.they_can_interact_with_old_posts": "Ihmiset tältä palvelimelta eivät voi olla vuorovaikutuksessa vanhojen julkaisujesi kanssa.",
   "domain_block_modal.they_cant_follow": "Kukaan tältä palvelimelta ei voi seurata sinua.",
-  "domain_block_modal.they_wont_know": "Hän ei saa tietää, että hänet on estetty.",
+  "domain_block_modal.they_wont_know": "Hän ei saa ilmoitusta tulleensa estetyksi.",
   "domain_block_modal.title": "Estetäänkö verkkotunnus?",
   "domain_block_modal.you_will_lose_followers": "Kaikki seuraajasi tältä palvelimelta poistetaan.",
   "domain_block_modal.you_wont_see_posts": "Et enää näe julkaisuja etkä ilmoituksia tämän palvelimen käyttäjiltä.",
@@ -266,7 +266,7 @@
   "empty_column.list": "Tällä listalla ei ole vielä mitään. Kun tämän listan jäsenet lähettävät uusia julkaisuja, ne näkyvät tässä.",
   "empty_column.lists": "Sinulla ei ole vielä yhtään listaa. Kun luot sellaisen, näkyy se tässä.",
   "empty_column.mutes": "Et ole mykistänyt vielä yhtään käyttäjää.",
-  "empty_column.notification_requests": "Kaikki kunnossa! Täällä ei ole mitään. Kun saat uusia ilmoituksia, ne näkyvät täällä asetustesi mukaisesti.",
+  "empty_column.notification_requests": "Olet ajan tasalla! Täällä ei ole mitään uutta kerrottavaa. Kun saat uusia ilmoituksia, ne näkyvät täällä asetustesi mukaisesti.",
   "empty_column.notifications": "Sinulla ei ole vielä ilmoituksia. Kun keskustelet muille, näet sen täällä.",
   "empty_column.public": "Täällä ei ole mitään! Kirjoita jotain julkisesti. Voit myös seurata muiden palvelimien käyttäjiä",
   "error.unexpected_crash.explanation": "Sivua ei voida näyttää oikein ohjelmointivirheen tai selaimen yhteensopivuusvajeen vuoksi.",
@@ -308,7 +308,7 @@
   "follow_requests.unlocked_explanation": "Vaikkei tiliäsi ole lukittu, palvelimen {domain} ylläpito on arvioinut, että saatat olla halukas tarkistamaan nämä seuraamispyynnöt erikseen.",
   "follow_suggestions.curated_suggestion": "Ehdotus ylläpidolta",
   "follow_suggestions.dismiss": "Älä näytä uudelleen",
-  "follow_suggestions.featured_longer": "Valinnut käsin palvelimen {domain} tiimi",
+  "follow_suggestions.featured_longer": "Palvelimen {domain} tiimin poimintoja",
   "follow_suggestions.friends_of_friends_longer": "Suosittu seuraamiesi ihmisten keskuudessa",
   "follow_suggestions.hints.featured": "Tämän profiilin on valinnut palvelimen {domain} tiimi.",
   "follow_suggestions.hints.friends_of_friends": "Seuraamasi käyttäjät suosivat tätä profiilia.",
@@ -435,13 +435,13 @@
   "media_gallery.toggle_visible": "{number, plural, one {Piilota kuva} other {Piilota kuvat}}",
   "moved_to_account_banner.text": "Tilisi {disabledAccount} on tällä hetkellä poissa käytöstä, koska teit siirron tiliin {movedToAccount}.",
   "mute_modal.hide_from_notifications": "Piilota ilmoituksista",
-  "mute_modal.hide_options": "Piilota valinnat",
-  "mute_modal.indefinite": "Kunnes poistan mykistyksen häneltä",
-  "mute_modal.show_options": "Näytä valinnat",
+  "mute_modal.hide_options": "Piilota vaihtoehdot",
+  "mute_modal.indefinite": "Kunnes perun häntä koskevan mykistyksen",
+  "mute_modal.show_options": "Näytä vaihtoehdot",
   "mute_modal.they_can_mention_and_follow": "Hän voi mainita sinut ja seurata sinua, mutta sinä et näe häntä.",
-  "mute_modal.they_wont_know": "Hän ei saa tietää, että hänet on mykistetty.",
+  "mute_modal.they_wont_know": "Hän ei saa ilmoitusta tulleensa mykistetyksi.",
   "mute_modal.title": "Mykistetäänkö käyttäjä?",
-  "mute_modal.you_wont_see_mentions": "Et enää näe julkaisuja, joissa hänet mainitaan.",
+  "mute_modal.you_wont_see_mentions": "Et tule enää näkemään julkaisuja, joissa hänet mainitaan.",
   "mute_modal.you_wont_see_posts": "Hän voi yhä nähdä julkaisusi, mutta sinä et näe hänen.",
   "navigation_bar.about": "Tietoja",
   "navigation_bar.advanced_interface": "Avaa edistyneessä selainkäyttöliittymässä",
@@ -531,11 +531,11 @@
   "notifications.permission_denied": "Työpöytäilmoitukset eivät ole käytettävissä, koska selaimen käyttöoikeuspyyntö on aiemmin evätty",
   "notifications.permission_denied_alert": "Työpöytäilmoituksia ei voi ottaa käyttöön, koska selaimen käyttöoikeus on aiemmin estetty",
   "notifications.permission_required": "Työpöytäilmoitukset eivät ole käytettävissä, koska siihen tarvittavaa lupaa ei ole myönnetty.",
-  "notifications.policy.filter_new_accounts.hint": "Luotu {days, plural, one {viime päivänä} other {viimeisenä # päivänä}}",
+  "notifications.policy.filter_new_accounts.hint": "Luotu {days, plural, one {viimeisimmän päivän aikana} other {# viime päivän aikana}}",
   "notifications.policy.filter_new_accounts_title": "Uudet tilit",
-  "notifications.policy.filter_not_followers_hint": "Mukaan lukien ne, jotka ovat seuranneet sinua vähemmän kuin {days, plural, one {päivän} other {# päivää}}",
+  "notifications.policy.filter_not_followers_hint": "Mukaan lukien alle {days, plural, one {päivän} other {# päivän}} verran sinua seuranneet",
   "notifications.policy.filter_not_followers_title": "Henkilöt, jotka eivät seuraa sinua",
-  "notifications.policy.filter_not_following_hint": "Kunnes hyväksyt ne manuaalisesti",
+  "notifications.policy.filter_not_following_hint": "Kunnes hyväksyt ne omin käsin",
   "notifications.policy.filter_not_following_title": "Henkilöt, joita et seuraa",
   "notifications.policy.filter_private_mentions_hint": "Suodatetaan, ellei se vastaa omaan mainintaasi tai ellet seuraa lähettäjää",
   "notifications.policy.filter_private_mentions_title": "Ei-toivotut yksityismaininnat",
@@ -696,13 +696,13 @@
   "server_banner.about_active_users": "Palvelimen käyttäjät viimeisten 30 päivän ajalta (kuukauden aktiiviset käyttäjät)",
   "server_banner.active_users": "aktiivista käyttäjää",
   "server_banner.administered_by": "Ylläpitäjä:",
-  "server_banner.introduction": "{domain} kuuluu hajautettuun sosiaaliseen verkostoon, jonka voimanlähde on {mastodon}.",
-  "server_banner.learn_more": "Lue lisää",
+  "server_banner.is_one_of_many": "{domain} on yksi monista itsenäisistä Mastodon-palvelimista, joiden välityksellä voit toimia fediversumissa.",
   "server_banner.server_stats": "Palvelimen tilastot:",
   "sign_in_banner.create_account": "Luo tili",
+  "sign_in_banner.follow_anyone": "Seuraa kenen tahansa julkaisuja fediversumissa ja näe ne kaikki aikajärjestyksessä. Ei algoritmejä, mainoksia tai klikkikalastelua.",
+  "sign_in_banner.mastodon_is": "Mastodon on paras tapa pysyä ajan tasalla siitä, mitä ympärillä tapahtuu.",
   "sign_in_banner.sign_in": "Kirjaudu",
   "sign_in_banner.sso_redirect": "Kirjaudu tai rekisteröidy",
-  "sign_in_banner.text": "Kirjaudu sisään, niin voit seurata profiileja tai aihetunnisteita, lisätä julkaisuja suosikkeihin, jakaa julkaisuja ja vastata niihin. Voit olla vuorovaikutuksessa myös eri palvelimella olevalta tililtäsi.",
   "status.admin_account": "Avaa tilin @{name} valvontanäkymä",
   "status.admin_domain": "Avaa palvelimen {domain} valvontanäkymä",
   "status.admin_status": "Avaa julkaisu valvontanäkymässä",
diff --git a/app/javascript/mastodon/locales/fil.json b/app/javascript/mastodon/locales/fil.json
index 1f9b0496b9d427..9e459f76719abc 100644
--- a/app/javascript/mastodon/locales/fil.json
+++ b/app/javascript/mastodon/locales/fil.json
@@ -308,7 +308,6 @@
   "search_popout.recent": "Kamakailang mga paghahanap",
   "search_results.all": "Lahat",
   "search_results.see_all": "Ipakita lahat",
-  "server_banner.learn_more": "Matuto nang higit pa",
   "server_banner.server_stats": "Katayuan ng serbiro:",
   "status.block": "Harangan si @{name}",
   "status.delete": "Tanggalin",
diff --git a/app/javascript/mastodon/locales/fo.json b/app/javascript/mastodon/locales/fo.json
index f4ae229d4933bb..7a317820bbf4a2 100644
--- a/app/javascript/mastodon/locales/fo.json
+++ b/app/javascript/mastodon/locales/fo.json
@@ -696,13 +696,13 @@
   "server_banner.about_active_users": "Fólk, sum hava brúkt hendan ambætaran seinastu 30 dagarnar (mánaðarligir virknir brúkarar)",
   "server_banner.active_users": "virknir brúkarar",
   "server_banner.administered_by": "Umsitari:",
-  "server_banner.introduction": "{domain} er partur av desentrala sosiala netverkinum, sum er drivið av {mastodon}.",
-  "server_banner.learn_more": "Lær meira",
+  "server_banner.is_one_of_many": "{domain} er ein av nógvum óheftum Mastodon ambætarum, sum tú kanst brúka at luttaka í fediversinum.",
   "server_banner.server_stats": "Ambætarahagtøl:",
   "sign_in_banner.create_account": "Stovna kontu",
+  "sign_in_banner.follow_anyone": "Fylg ein og hvønn í fediversinum og síggj alt í tíðarrøð. Ongar algoritmur, ongar lýsingar og einki klikkbeit í eygsjón.",
+  "sign_in_banner.mastodon_is": "Mastodon er best mátin at fylgja við í tí, sum hendir.",
   "sign_in_banner.sign_in": "Rita inn",
   "sign_in_banner.sso_redirect": "Rita inn ella Skráset teg",
-  "sign_in_banner.text": "Innrita fyri at fylgja vangum og frámerkjum, dáma, deila og svara postum. Tú kanst eisini brúka kontuna til at samvirka á einum øðrum ambætara.",
   "status.admin_account": "Lat kjakleiðaramarkamót upp fyri @{name}",
   "status.admin_domain": "Lat umsjónarmarkamót upp fyri {domain}",
   "status.admin_status": "Lat hendan postin upp í kjakleiðaramarkamótinum",
diff --git a/app/javascript/mastodon/locales/fr-CA.json b/app/javascript/mastodon/locales/fr-CA.json
index 9c14d05d5c88a9..50b7dcf90dc8a8 100644
--- a/app/javascript/mastodon/locales/fr-CA.json
+++ b/app/javascript/mastodon/locales/fr-CA.json
@@ -680,13 +680,10 @@
   "server_banner.about_active_users": "Personnes utilisant ce serveur au cours des 30 derniers jours (Comptes actifs mensuellement)",
   "server_banner.active_users": "comptes actifs",
   "server_banner.administered_by": "Administré par:",
-  "server_banner.introduction": "{domain} fait partie du réseau social décentralisé propulsé par {mastodon}.",
-  "server_banner.learn_more": "En savoir plus",
   "server_banner.server_stats": "Statistiques du serveur:",
   "sign_in_banner.create_account": "Créer un compte",
   "sign_in_banner.sign_in": "Se connecter",
   "sign_in_banner.sso_redirect": "Se connecter ou s’inscrire",
-  "sign_in_banner.text": "Identifiez-vous pour suivre des profils ou des hashtags, ajouter des favoris, partager et répondre à des publications. Vous pouvez également interagir depuis votre compte sur un autre serveur.",
   "status.admin_account": "Ouvrir l’interface de modération pour @{name}",
   "status.admin_domain": "Ouvrir l’interface de modération pour {domain}",
   "status.admin_status": "Ouvrir ce message dans l’interface de modération",
diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json
index 36ec673a475b28..2e565c200f5205 100644
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@@ -680,13 +680,10 @@
   "server_banner.about_active_users": "Personnes utilisant ce serveur au cours des 30 derniers jours (Comptes actifs mensuellement)",
   "server_banner.active_users": "comptes actifs",
   "server_banner.administered_by": "Administré par :",
-  "server_banner.introduction": "{domain} fait partie du réseau social décentralisé propulsé par {mastodon}.",
-  "server_banner.learn_more": "En savoir plus",
   "server_banner.server_stats": "Statistiques du serveur :",
   "sign_in_banner.create_account": "Créer un compte",
   "sign_in_banner.sign_in": "Se connecter",
   "sign_in_banner.sso_redirect": "Se connecter ou s’inscrire",
-  "sign_in_banner.text": "Identifiez-vous pour suivre des profils ou des hashtags, ajouter des favoris, partager et répondre à des messages. Vous pouvez également interagir depuis votre compte sur un autre serveur.",
   "status.admin_account": "Ouvrir l’interface de modération pour @{name}",
   "status.admin_domain": "Ouvrir l’interface de modération pour {domain}",
   "status.admin_status": "Ouvrir ce message dans l’interface de modération",
diff --git a/app/javascript/mastodon/locales/fy.json b/app/javascript/mastodon/locales/fy.json
index 8048045c5ca2f4..11b11ff819fb6d 100644
--- a/app/javascript/mastodon/locales/fy.json
+++ b/app/javascript/mastodon/locales/fy.json
@@ -655,13 +655,10 @@
   "server_banner.about_active_users": "Oantal brûkers yn de ôfrûne 30 dagen (MAU)",
   "server_banner.active_users": "warbere brûkers",
   "server_banner.administered_by": "Beheard troch:",
-  "server_banner.introduction": "{domain} is ûnderdiel fan it desintralisearre sosjale netwurk {mastodon}.",
-  "server_banner.learn_more": "Mear ynfo",
   "server_banner.server_stats": "Serverstatistiken:",
   "sign_in_banner.create_account": "Account registrearje",
   "sign_in_banner.sign_in": "Oanmelde",
   "sign_in_banner.sso_redirect": "Oanmelde of Registrearje",
-  "sign_in_banner.text": "Meld jo oan, om profilen of hashtags te folgjen, berjochten favoryt te meitsjen, te dielen en te beäntwurdzjen of om fan jo account út op in oare server mei oaren ynteraksje te hawwen.",
   "status.admin_account": "Moderaasje-omjouwing fan @{name} iepenje",
   "status.admin_domain": "Moderaasje-omjouwing fan {domain} iepenje",
   "status.admin_status": "Open this status in the moderation interface",
diff --git a/app/javascript/mastodon/locales/ga.json b/app/javascript/mastodon/locales/ga.json
index c71effe06df49d..97dcc752b8c18b 100644
--- a/app/javascript/mastodon/locales/ga.json
+++ b/app/javascript/mastodon/locales/ga.json
@@ -438,7 +438,6 @@
   "search_results.statuses": "Postálacha",
   "search_results.title": "Cuardaigh ar thóir {q}",
   "server_banner.active_users": "úsáideoirí gníomhacha",
-  "server_banner.learn_more": "Tuilleadh eolais",
   "server_banner.server_stats": "Staitisticí freastalaí:",
   "sign_in_banner.create_account": "Cruthaigh cuntas",
   "sign_in_banner.sign_in": "Sinigh isteach",
diff --git a/app/javascript/mastodon/locales/gd.json b/app/javascript/mastodon/locales/gd.json
index 9e79793de1080a..714fa6e364bf9a 100644
--- a/app/javascript/mastodon/locales/gd.json
+++ b/app/javascript/mastodon/locales/gd.json
@@ -684,13 +684,10 @@
   "server_banner.about_active_users": "Daoine a chleachd am frithealaiche seo rè an 30 latha mu dheireadh (Cleachdaichean gnìomhach gach mìos)",
   "server_banner.active_users": "cleachdaichean gnìomhach",
   "server_banner.administered_by": "Rianachd le:",
-  "server_banner.introduction": "Tha {domain} am measg an lìonraidh shòisealta sgaoilte le cumhachd {mastodon}.",
-  "server_banner.learn_more": "Barrachd fiosrachaidh",
   "server_banner.server_stats": "Stadastaireachd an fhrithealaiche:",
   "sign_in_banner.create_account": "Cruthaich cunntas",
   "sign_in_banner.sign_in": "Clàraich a-steach",
   "sign_in_banner.sso_redirect": "Clàraich a-steach no clàraich leinn",
-  "sign_in_banner.text": "Clàraich a-steach a leantainn phròifilean no thagaichean hais, a’ cur postaichean ris na h-annsachdan ’s ’gan co-roinneadh is freagairt dhaibh. ’S urrainn dhut gnìomh a ghabhail le cunntas o fhrithealaiche eile cuideachd.",
   "status.admin_account": "Fosgail eadar-aghaidh na maorsainneachd dha @{name}",
   "status.admin_domain": "Fosgail eadar-aghaidh na maorsainneachd dha {domain}",
   "status.admin_status": "Fosgail am post seo ann an eadar-aghaidh na maorsainneachd",
diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json
index 925e4dd6f9f587..7b77f980349421 100644
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@@ -696,13 +696,13 @@
   "server_banner.about_active_users": "Persoas que usaron este servidor nos últimos 30 días (Usuarias Activas Mensuais)",
   "server_banner.active_users": "usuarias activas",
   "server_banner.administered_by": "Administrada por:",
-  "server_banner.introduction": "{domain} é parte da rede social descentralizada que funciona grazas a {mastodon}.",
-  "server_banner.learn_more": "Saber máis",
+  "server_banner.is_one_of_many": "{domain} é un dos moitos servidores Mastodon independentes que podes usar para participar do Fediverso.",
   "server_banner.server_stats": "Estatísticas do servidor:",
   "sign_in_banner.create_account": "Crear conta",
+  "sign_in_banner.follow_anyone": "Sigue a quen queiras no Fediverso e le as publicacións en orde cronolóxica. Sen algoritmos, publicidade nin titulares engañosos.",
+  "sign_in_banner.mastodon_is": "Mastodon é o mellor xeito de estar ao día do que acontece.",
   "sign_in_banner.sign_in": "Iniciar sesión",
   "sign_in_banner.sso_redirect": "Acceder ou Crear conta",
-  "sign_in_banner.text": "Inicia sesión para seguir perfís ou cancelos, marcar como favorita e responder a publicacións. Tamén podes interactuar coa túa conta noutro servidor.",
   "status.admin_account": "Abrir interface de moderación para @{name}",
   "status.admin_domain": "Abrir interface de moderación para {domain}",
   "status.admin_status": "Abrir esta publicación na interface de moderación",
diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json
index dddc3184734d46..1c50ba8e1f30ad 100644
--- a/app/javascript/mastodon/locales/he.json
+++ b/app/javascript/mastodon/locales/he.json
@@ -415,6 +415,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} הודעות}}",
   "lists.account.add": "הוסף לרשימה",
   "lists.account.remove": "הסר מרשימה",
   "lists.delete": "מחיקת רשימה",
@@ -695,13 +696,10 @@
   "server_banner.about_active_users": "משתמשים פעילים בשרת ב־30 הימים האחרונים (משתמשים פעילים חודשיים)",
   "server_banner.active_users": "משתמשים פעילים",
   "server_banner.administered_by": "מנוהל ע\"י:",
-  "server_banner.introduction": "{domain} הוא שרת ברשת המבוזרת {mastodon}.",
-  "server_banner.learn_more": "מידע נוסף",
   "server_banner.server_stats": "סטטיסטיקות שרת:",
   "sign_in_banner.create_account": "יצירת חשבון",
   "sign_in_banner.sign_in": "התחברות",
   "sign_in_banner.sso_redirect": "התחברות/הרשמה",
-  "sign_in_banner.text": "יש להתחבר כדי לעקוב אחרי משתמשים או תגיות, לחבב, לשתף ולענות להודעות. ניתן גם לתקשר מהחשבון שלך עם שרת אחר.",
   "status.admin_account": "פתח/י ממשק ניהול עבור @{name}",
   "status.admin_domain": "פתיחת ממשק ניהול עבור {domain}",
   "status.admin_status": "Open this status in the moderation interface",
diff --git a/app/javascript/mastodon/locales/hr.json b/app/javascript/mastodon/locales/hr.json
index ec8d62dbba5c2c..d952945c4641ec 100644
--- a/app/javascript/mastodon/locales/hr.json
+++ b/app/javascript/mastodon/locales/hr.json
@@ -455,8 +455,6 @@
   "server_banner.about_active_users": "Popis aktivnih korisnika prošli mjesec",
   "server_banner.active_users": "aktivni korisnici",
   "server_banner.administered_by": "Administrator je:",
-  "server_banner.introduction": "{domain} je dio decentralizirane socijalne mreže koju pokreće {mastodon}.",
-  "server_banner.learn_more": "Saznaj više",
   "server_banner.server_stats": "Statistike poslužitelja:",
   "sign_in_banner.create_account": "Stvori račun",
   "sign_in_banner.sign_in": "Prijavi se",
diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json
index dfb4b539d8a54e..6164335da82f69 100644
--- a/app/javascript/mastodon/locales/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@@ -415,6 +415,7 @@
   "limited_account_hint.title": "Ezt a profilt {domain} moderátorai elrejtették.",
   "link_preview.author": "{name} szerint",
   "link_preview.more_from_author": "Több tőle: {name}",
+  "link_preview.shares": "{count, plural, one {{counter} bejegyzés} other {{counter} bejegyzés}}",
   "lists.account.add": "Hozzáadás a listához",
   "lists.account.remove": "Eltávolítás a listából",
   "lists.delete": "Lista törlése",
@@ -695,13 +696,13 @@
   "server_banner.about_active_users": "Az elmúlt 30 napban ezt a kiszolgálót használók száma (Havi aktív felhasználók)",
   "server_banner.active_users": "aktív felhasználó",
   "server_banner.administered_by": "Adminisztrátor:",
-  "server_banner.introduction": "{domain} része egy decentralizált közösségi hálónak, melyet a {mastodon} hajt meg.",
-  "server_banner.learn_more": "Tudj meg többet",
+  "server_banner.is_one_of_many": "{domain} egy a jelentős, független Mastodon kiszolgálók közül, melyet a fediverzumban való részvételre használhatsz.",
   "server_banner.server_stats": "Kiszolgálóstatisztika:",
   "sign_in_banner.create_account": "Fiók létrehozása",
+  "sign_in_banner.follow_anyone": "Kövess bárkit a fediverzumon keresztül, és láss mindent időrendi sorrendben. Algoritmusok, hirdetések, kattintásvadászat nélkül.",
+  "sign_in_banner.mastodon_is": "A Mastodon a legjobb módja annak, hogy a történésekkel kapcsolatban naprakész maradj.",
   "sign_in_banner.sign_in": "Bejelentkezés",
   "sign_in_banner.sso_redirect": "Bejelentkezés vagy regisztráció",
-  "sign_in_banner.text": "Jelentkezz be profilok vagy hashtagek követéséhez, kedvencnek jelöléséhez, bejegyzések megosztásához, megválaszolásához. A fiókodból más kiszolgálókon is kommunikálhatsz.",
   "status.admin_account": "Moderációs felület megnyitása @{name} fiókhoz",
   "status.admin_domain": "Moderációs felület megnyitása {domain} esetében",
   "status.admin_status": "Bejegyzés megnyitása a moderációs felületen",
diff --git a/app/javascript/mastodon/locales/hy.json b/app/javascript/mastodon/locales/hy.json
index 7310104bf932f4..cd29f441df7c51 100644
--- a/app/javascript/mastodon/locales/hy.json
+++ b/app/javascript/mastodon/locales/hy.json
@@ -441,8 +441,6 @@
   "search_results.title": "Որոնել {q}-ն",
   "server_banner.active_users": "ակտիւ մարդիկ",
   "server_banner.administered_by": "Կառաւարող",
-  "server_banner.introduction": "{domain}-ը հանդիասնում է ապակենտրոն սոց. ցանցի մաս, ստեղծուած {mastodon}-ով։\n",
-  "server_banner.learn_more": "Իմանալ աւելին",
   "server_banner.server_stats": "Սերուերի վիճակը",
   "sign_in_banner.create_account": "Ստեղծել հաշիւ",
   "sign_in_banner.sign_in": "Մուտք",
diff --git a/app/javascript/mastodon/locales/ia.json b/app/javascript/mastodon/locales/ia.json
index ed33a45d45047d..72bbe606fa679f 100644
--- a/app/javascript/mastodon/locales/ia.json
+++ b/app/javascript/mastodon/locales/ia.json
@@ -415,6 +415,7 @@
   "limited_account_hint.title": "Iste profilo ha essite celate per le moderatores de {domain}.",
   "link_preview.author": "Per {name}",
   "link_preview.more_from_author": "Plus de {name}",
+  "link_preview.shares": "{count, plural, one {{counter} message} other {{counter} messages}}",
   "lists.account.add": "Adder al lista",
   "lists.account.remove": "Remover del lista",
   "lists.delete": "Deler lista",
@@ -695,13 +696,10 @@
   "server_banner.about_active_users": "Personas que ha usate iste servitor in le ultime 30 dies (usatores active per mense)",
   "server_banner.active_users": "usatores active",
   "server_banner.administered_by": "Administrate per:",
-  "server_banner.introduction": "{domain} face parte del rete social decentralisate actionate per {mastodon}.",
-  "server_banner.learn_more": "Apprender plus",
   "server_banner.server_stats": "Statos del servitor:",
   "sign_in_banner.create_account": "Crear un conto",
   "sign_in_banner.sign_in": "Aperir session",
   "sign_in_banner.sso_redirect": "Aperir session o crear conto",
-  "sign_in_banner.text": "Aperi session pro sequer profilos o hashtags, marcar messages como favorite, e condivider e responder a messages. Tu pote etiam interager desde tu conto sur un altere servitor.",
   "status.admin_account": "Aperir le interfacie de moderation pro @{name}",
   "status.admin_domain": "Aperir le interfacie de moderation pro {domain}",
   "status.admin_status": "Aperir iste message in le interfacie de moderation",
diff --git a/app/javascript/mastodon/locales/id.json b/app/javascript/mastodon/locales/id.json
index 79224c57df1f7d..d86b5854f4ddfe 100644
--- a/app/javascript/mastodon/locales/id.json
+++ b/app/javascript/mastodon/locales/id.json
@@ -565,8 +565,6 @@
   "server_banner.about_active_users": "Orang menggunakan server ini selama 30 hari terakhir (Pengguna Aktif Bulanan)",
   "server_banner.active_users": "pengguna aktif",
   "server_banner.administered_by": "Dikelola oleh:",
-  "server_banner.introduction": "{domain} adalah bagian dari jaringan sosial terdesentralisasi yang diberdayakan oleh {mastodon}.",
-  "server_banner.learn_more": "Pelajari lebih lanjut",
   "server_banner.server_stats": "Statistik server:",
   "sign_in_banner.create_account": "Buat akun",
   "sign_in_banner.sign_in": "Masuk",
diff --git a/app/javascript/mastodon/locales/ie.json b/app/javascript/mastodon/locales/ie.json
index 1921509478c105..f15b982889260b 100644
--- a/app/javascript/mastodon/locales/ie.json
+++ b/app/javascript/mastodon/locales/ie.json
@@ -694,13 +694,10 @@
   "server_banner.about_active_users": "Gente usant ti-ci servitor durant li ultim 30 dies (Mensual Activ Usatores)",
   "server_banner.active_users": "activ usatores",
   "server_banner.administered_by": "Administrat de:",
-  "server_banner.introduction": "{domain} es un part del decentralisat social retage constructet sur {mastodon}.",
-  "server_banner.learn_more": "Aprender plu",
   "server_banner.server_stats": "Statisticas pri li servitor:",
   "sign_in_banner.create_account": "Crear un conto",
   "sign_in_banner.sign_in": "Intrar",
   "sign_in_banner.sso_redirect": "Intrar o registrar se",
-  "sign_in_banner.text": "Intrar por sequer profiles o hashtags, favoritisar, partir e responder a postas. Tu posse anc interacter per tui conto che un diferent servitor.",
   "status.admin_account": "Aperter interfacie de moderation por @{name}",
   "status.admin_domain": "Aperter interfacie de moderation por {domain}",
   "status.admin_status": "Aperter ti-ci posta in li interfacie de moderation",
diff --git a/app/javascript/mastodon/locales/ig.json b/app/javascript/mastodon/locales/ig.json
index 90253743fca0fb..4e3e3997da145c 100644
--- a/app/javascript/mastodon/locales/ig.json
+++ b/app/javascript/mastodon/locales/ig.json
@@ -132,7 +132,6 @@
   "report_notification.categories.other": "Ọzọ",
   "search.placeholder": "Chọọ",
   "server_banner.active_users": "ojiarụ dị ìrè",
-  "server_banner.learn_more": "Mụtakwuo",
   "sign_in_banner.sign_in": "Sign in",
   "status.admin_status": "Open this status in the moderation interface",
   "status.bookmark": "Kee ebenrụtụakā",
diff --git a/app/javascript/mastodon/locales/io.json b/app/javascript/mastodon/locales/io.json
index 3382fa1aecca7b..016a111c46c66c 100644
--- a/app/javascript/mastodon/locales/io.json
+++ b/app/javascript/mastodon/locales/io.json
@@ -582,13 +582,10 @@
   "server_banner.about_active_users": "Personi quo uzas ca servilo dum antea 30 dii (monate aktiva uzanti)",
   "server_banner.active_users": "aktiva uzanti",
   "server_banner.administered_by": "Administresis da:",
-  "server_banner.introduction": "{domain} esas parto di necentraligita sociala ret quo povizesas da {mastodon}.",
-  "server_banner.learn_more": "Lernez plue",
   "server_banner.server_stats": "Servilstatistiko:",
   "sign_in_banner.create_account": "Kreez konto",
   "sign_in_banner.sign_in": "Enirez",
   "sign_in_banner.sso_redirect": "Enirar o krear konto",
-  "sign_in_banner.text": "Enirez por sequar profili o hashtagi, favorizar, partigar e respondizar posti. On povas anke interagar de vua konto kun diferanta servilo.",
   "status.admin_account": "Apertez jerintervizajo por @{name}",
   "status.admin_domain": "Apertez jerintervizajo por {domain}",
   "status.admin_status": "Open this status in the moderation interface",
diff --git a/app/javascript/mastodon/locales/is.json b/app/javascript/mastodon/locales/is.json
index 2a33c160adaf09..08605f5238ded3 100644
--- a/app/javascript/mastodon/locales/is.json
+++ b/app/javascript/mastodon/locales/is.json
@@ -696,13 +696,13 @@
   "server_banner.about_active_users": "Folk sem hefur notað þennan netþjón síðustu 30 daga (virkir notendur í mánuðinum)",
   "server_banner.active_users": "virkir notendur",
   "server_banner.administered_by": "Stýrt af:",
-  "server_banner.introduction": "{domain} er hluti af dreifhýsta samfélagsnetinu sem keyrt er af {mastodon}.",
-  "server_banner.learn_more": "Kanna nánar",
+  "server_banner.is_one_of_many": "{domain} er einn af fjölmörgum óháðum Mastodon-þjónum sem þú getur notað til að taka þátt í fediverse-samfélaginu.",
   "server_banner.server_stats": "Tölfræði þjóns:",
   "sign_in_banner.create_account": "Búa til notandaaðgang",
+  "sign_in_banner.follow_anyone": "Fylgstu með hverjum sem er í þessum samtvinnaða heimi og skoðaðu allt í tímaröð. Engin reiknirit, auglýsingar eða smellbeitur.",
+  "sign_in_banner.mastodon_is": "Mastodon er besta leiðin til að fylgjast með hvað sé í gangi.",
   "sign_in_banner.sign_in": "Skrá inn",
   "sign_in_banner.sso_redirect": "Skrá inn eða nýskrá",
-  "sign_in_banner.text": "Skráðu þig inn til að fylgjast með notendum eða myllumerkjum, svara færslum, deila þeim eða setja í eftirlæti. Þú getur einnig átt í samskiptum á aðgangnum þínum á öðrum netþjónum.",
   "status.admin_account": "Opna umsjónarviðmót fyrir @{name}",
   "status.admin_domain": "Opna umsjónarviðmót fyrir @{domain}",
   "status.admin_status": "Opna þessa færslu í umsjónarviðmótinu",
diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json
index 4c183e32ceed2a..3672b5fd7a1042 100644
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@@ -415,7 +415,7 @@
   "limited_account_hint.title": "Questo profilo è stato nascosto dai moderatori di {domain}.",
   "link_preview.author": "Di {name}",
   "link_preview.more_from_author": "Altro da {name}",
-  "link_preview.shares": "{count, plural,one {{counter} post}other {{counter} post}}",
+  "link_preview.shares": "{count, plural, one {{counter} post} other {{counter} post}}",
   "lists.account.add": "Aggiungi all'elenco",
   "lists.account.remove": "Rimuovi dall'elenco",
   "lists.delete": "Elimina elenco",
@@ -696,13 +696,13 @@
   "server_banner.about_active_users": "Persone che hanno utilizzato questo server negli ultimi 30 giorni (Utenti Attivi Mensilmente)",
   "server_banner.active_users": "utenti attivi",
   "server_banner.administered_by": "Amministrato da:",
-  "server_banner.introduction": "{domain} è parte del social network decentralizzato, sviluppato da {mastodon}.",
-  "server_banner.learn_more": "Scopri di più",
+  "server_banner.is_one_of_many": "{domain} è uno dei tanti server Mastodon indipendenti che puoi usare per partecipare al fediverso.",
   "server_banner.server_stats": "Statistiche del server:",
   "sign_in_banner.create_account": "Crea un profilo",
+  "sign_in_banner.follow_anyone": "Segui chiunque nel fediverso e vedi tutto in ordine cronologico. Nessun algoritmo, annunci o clickbait in vista.",
+  "sign_in_banner.mastodon_is": "Mastodon è il modo migliore per tenere il passo con quello che sta accadendo.",
   "sign_in_banner.sign_in": "Accedi",
   "sign_in_banner.sso_redirect": "Accedi o Registrati",
-  "sign_in_banner.text": "Accedi per seguire profili o hashtag, condividere, rispondere e aggiungere post ai preferiti. Puoi anche interagire dal tuo account su un server diverso.",
   "status.admin_account": "Apri interfaccia di moderazione per @{name}",
   "status.admin_domain": "Apri l'interfaccia di moderazione per {domain}",
   "status.admin_status": "Apri questo post nell'interfaccia di moderazione",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index eea06fff590708..90a46edd5b9e6a 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -694,13 +694,10 @@
   "server_banner.about_active_users": "過去30日間にこのサーバーを使用している人 (月間アクティブユーザー)",
   "server_banner.active_users": "人のアクティブユーザー",
   "server_banner.administered_by": "管理者",
-  "server_banner.introduction": "{domain}は{mastodon}を使った分散型ソーシャルネットワークの一部です。",
-  "server_banner.learn_more": "もっと詳しく",
   "server_banner.server_stats": "サーバーの情報",
   "sign_in_banner.create_account": "アカウント作成",
   "sign_in_banner.sign_in": "ログイン",
   "sign_in_banner.sso_redirect": "ログインまたは登録",
-  "sign_in_banner.text": "アカウントがあればユーザーやハッシュタグをフォローしたり、投稿のお気に入り登録やブースト、投稿への返信ができます。別のサーバーのユーザーとの交流も可能です。",
   "status.admin_account": "@{name}さんのモデレーション画面を開く",
   "status.admin_domain": "{domain}のモデレーション画面を開く",
   "status.admin_status": "この投稿をモデレーション画面で開く",
diff --git a/app/javascript/mastodon/locales/kab.json b/app/javascript/mastodon/locales/kab.json
index 9fdf602992022e..5aa46bafde4ca8 100644
--- a/app/javascript/mastodon/locales/kab.json
+++ b/app/javascript/mastodon/locales/kab.json
@@ -509,7 +509,6 @@
   "search_results.statuses": "Tisuffaɣ",
   "search_results.title": "Anadi ɣef {q}",
   "server_banner.administered_by": "Yettwadbel sɣur :",
-  "server_banner.learn_more": "Issin ugar",
   "sign_in_banner.create_account": "Snulfu-d amiḍan",
   "sign_in_banner.sign_in": "Qqen",
   "sign_in_banner.sso_redirect": "Qqen neɣ jerred",
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index 277a87fe3ed118..aa05887d65567e 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -415,6 +415,7 @@
   "limited_account_hint.title": "이 프로필은 {domain}의 중재자에 의해 숨겨진 상태입니다.",
   "link_preview.author": "{name}",
   "link_preview.more_from_author": "{name} 프로필 보기",
+  "link_preview.shares": "{count, plural, other {{counter} 개의 게시물}}",
   "lists.account.add": "리스트에 추가",
   "lists.account.remove": "리스트에서 제거",
   "lists.delete": "리스트 삭제",
@@ -695,13 +696,13 @@
   "server_banner.about_active_users": "30일 동안 이 서버를 사용한 사람들 (월간 활성 이용자)",
   "server_banner.active_users": "활성 사용자",
   "server_banner.administered_by": "관리자:",
-  "server_banner.introduction": "{domain}은 마스토돈으로 운영되는 탈중앙화 된 소셜 네트워크의 일부입니다.",
-  "server_banner.learn_more": "더 알아보기",
+  "server_banner.is_one_of_many": "{domain}은 페디버스를 통해 참여할 수 있는 많은 마스토돈 서버들 중 하나입니다",
   "server_banner.server_stats": "서버 통계:",
   "sign_in_banner.create_account": "계정 생성",
+  "sign_in_banner.follow_anyone": "페디버스를 통해 누구든지 팔로우하고 시간순으로 게시물을 받아보세요. 알고리즘도, 광고도, 클릭을 유도하는 것들도 없습니다.",
+  "sign_in_banner.mastodon_is": "마스토돈은 무엇이 일어나는지 받아보는 가장 좋은 수단입니다.",
   "sign_in_banner.sign_in": "로그인",
   "sign_in_banner.sso_redirect": "로그인 또는 가입하기",
-  "sign_in_banner.text": "로그인을 통해 프로필이나 해시태그를 팔로우하거나 마음에 들어하거나 공유하고 답글을 달 수 있습니다. 다른 서버에 있는 본인의 계정을 통해 참여할 수도 있습니다.",
   "status.admin_account": "@{name}에 대한 중재 화면 열기",
   "status.admin_domain": "{domain}에 대한 중재 화면 열기",
   "status.admin_status": "중재 화면에서 이 게시물 열기",
diff --git a/app/javascript/mastodon/locales/ku.json b/app/javascript/mastodon/locales/ku.json
index c78861b60c9953..83fcef26fb2a53 100644
--- a/app/javascript/mastodon/locales/ku.json
+++ b/app/javascript/mastodon/locales/ku.json
@@ -492,8 +492,6 @@
   "server_banner.about_active_users": "Kesên ku di van 30 rojên dawî de vê rajekarê bi kar tînin (Bikarhênerên Çalak ên Mehane)",
   "server_banner.active_users": "bikarhênerên çalak",
   "server_banner.administered_by": "Tê bi rêvebirin ji aliyê:",
-  "server_banner.introduction": "{domain} beşek ji tora civakî ya nenavendî ye bi hêzdariya {mastodon}.",
-  "server_banner.learn_more": "Bêtir fêr bibe",
   "server_banner.server_stats": "Amarên rajekar:",
   "sign_in_banner.create_account": "Ajimêr biafirîne",
   "sign_in_banner.sign_in": "Têkeve",
diff --git a/app/javascript/mastodon/locales/la.json b/app/javascript/mastodon/locales/la.json
index 4bee0efed47c98..d867034f01f6b9 100644
--- a/app/javascript/mastodon/locales/la.json
+++ b/app/javascript/mastodon/locales/la.json
@@ -220,8 +220,6 @@
   "search_results.all": "Omnis",
   "server_banner.active_users": "Usūrāriī āctīvī",
   "server_banner.administered_by": "Administratur:",
-  "server_banner.introduction": "{domain} pars est de rete sociali decentralizato a {mastodon} propulsato.",
-  "server_banner.learn_more": "Discere plura",
   "sign_in_banner.sign_in": "Sign in",
   "status.admin_status": "Open this status in the moderation interface",
   "status.block": "Impedire @{name}",
diff --git a/app/javascript/mastodon/locales/lad.json b/app/javascript/mastodon/locales/lad.json
index 72299bb861b091..bf676a6020f5d4 100644
--- a/app/javascript/mastodon/locales/lad.json
+++ b/app/javascript/mastodon/locales/lad.json
@@ -666,13 +666,10 @@
   "server_banner.about_active_users": "Utilizadores aktivos en este sirvidor durante los ultimos 30 diyas (utilizadores aktivos mensuales)",
   "server_banner.active_users": "utilizadores aktivos",
   "server_banner.administered_by": "Administrado por:",
-  "server_banner.introduction": "{domain} es parte de la red sosyala desentralizada liderada por {mastodon}.",
-  "server_banner.learn_more": "Ambezate mas",
   "server_banner.server_stats": "Estatistikas del sirvidor:",
   "sign_in_banner.create_account": "Kriya kuento",
   "sign_in_banner.sign_in": "Konektate",
   "sign_in_banner.sso_redirect": "Konektate o enrejistrate",
-  "sign_in_banner.text": "Konektate para segir prefiles o etiketas, partajar publikasyones, arispondir a eyas i markar ke te plazen. Puedes tambyen enteraktuar dizde tu kuento en un sirvidor desferente.",
   "status.admin_account": "Avre la enterfaz de moderasyon para @{name}",
   "status.admin_domain": "Avre la enterfaz de moderasyon para @{domain}",
   "status.admin_status": "Avre esto en la enterfaz de moderasyon",
diff --git a/app/javascript/mastodon/locales/lt.json b/app/javascript/mastodon/locales/lt.json
index 307230036cf4ce..b365d6458966d5 100644
--- a/app/javascript/mastodon/locales/lt.json
+++ b/app/javascript/mastodon/locales/lt.json
@@ -415,6 +415,7 @@
   "limited_account_hint.title": "Šį profilį paslėpė {domain} prižiūrėtojai.",
   "link_preview.author": "Sukūrė {name}",
   "link_preview.more_from_author": "Daugiau iš {name}",
+  "link_preview.shares": "{count, plural, one {{counter} įrašas} few {{counter} įrašai} many {{counter} įrašo} other {{counter} įrašų}}",
   "lists.account.add": "Pridėti į sąrašą",
   "lists.account.remove": "Pašalinti iš sąrašo",
   "lists.delete": "Ištrinti sąrašą",
@@ -690,13 +691,13 @@
   "server_banner.about_active_users": "Žmonės, kurie naudojosi šiuo serveriu per pastarąsias 30 dienų (mėnesio aktyvūs naudotojai)",
   "server_banner.active_users": "aktyvūs naudotojai",
   "server_banner.administered_by": "Administruoja:",
-  "server_banner.introduction": "{domain} – decentralizuoto socialinio tinklo dalis, kurį palaiko {mastodon}.",
-  "server_banner.learn_more": "Sužinoti daugiau",
+  "server_banner.is_one_of_many": "{domain} – tai vienas iš daugelio nepriklausomų „Mastodon“ serverių, kuriuos gali naudoti fediverse.",
   "server_banner.server_stats": "Serverio statistika:",
   "sign_in_banner.create_account": "Sukurti paskyrą",
+  "sign_in_banner.follow_anyone": "Sek bet kurį asmenį visoje fediverse ir žiūrėk viską chronologine tvarka. Jokių algoritmų, reklamų ar paspaudimų.",
+  "sign_in_banner.mastodon_is": "„Mastodon“ – tai geriausias būdas sekti, kas vyksta.",
   "sign_in_banner.sign_in": "Prisijungimas",
   "sign_in_banner.sso_redirect": "Prisijungti arba užsiregistruoti",
-  "sign_in_banner.text": "Prisijunk, kad galėtum sekti profilius arba saitažodžius, mėgsti, bendrinti ir atsakyti į įrašus. Taip pat gali bendrauti iš savo paskyros kitame serveryje.",
   "status.admin_account": "Atidaryti prižiūrėjimo sąsają @{name}",
   "status.admin_domain": "Atidaryti prižiūrėjimo sąsają {domain}",
   "status.admin_status": "Atidaryti šį įrašą prižiūrėjimo sąsajoje",
diff --git a/app/javascript/mastodon/locales/lv.json b/app/javascript/mastodon/locales/lv.json
index efc45c9c089f85..13ceec21c82a9f 100644
--- a/app/javascript/mastodon/locales/lv.json
+++ b/app/javascript/mastodon/locales/lv.json
@@ -642,13 +642,10 @@
   "server_banner.about_active_users": "Cilvēki, kas izmantojuši šo serveri pēdējo 30 dienu laikā (aktīvie lietotāji mēnesī)",
   "server_banner.active_users": "aktīvi lietotāji",
   "server_banner.administered_by": "Pārvalda:",
-  "server_banner.introduction": "{domain} ir daļa no decentralizētā sociālā tīkla, ko nodrošina {mastodon}.",
-  "server_banner.learn_more": "Uzzināt vairāk",
   "server_banner.server_stats": "Servera statistika:",
   "sign_in_banner.create_account": "Izveidot kontu",
   "sign_in_banner.sign_in": "Pieteikties",
   "sign_in_banner.sso_redirect": "Piesakies vai Reģistrējies",
-  "sign_in_banner.text": "Jāpiesakās, lai sekotu profiliem vai tēmturiem, pievienotu izlasei, kopīgotu ierakstus un atbildētu uz tiem. Vari arī mijiedarboties ar savu kontu citā serverī.",
   "status.admin_account": "Atvērt @{name} moderēšanas saskarni",
   "status.admin_domain": "Atvērt {domain} moderēšanas saskarni",
   "status.admin_status": "Atvērt šo ziņu moderācijas saskarnē",
diff --git a/app/javascript/mastodon/locales/ms.json b/app/javascript/mastodon/locales/ms.json
index 8fe043c5dcec02..3d7992faf7dc75 100644
--- a/app/javascript/mastodon/locales/ms.json
+++ b/app/javascript/mastodon/locales/ms.json
@@ -604,13 +604,10 @@
   "server_banner.about_active_users": "Pengguna pelayan ini sepanjang 30 hari yang lalu (Pengguna Aktif Bulanan)",
   "server_banner.active_users": "pengguna aktif",
   "server_banner.administered_by": "Ditadbir oleh:",
-  "server_banner.introduction": "{domain} ialah sebahagian daripada rangkaian sosial terpencar dikuasakan oleh {mastodon}.",
-  "server_banner.learn_more": "Maklumat lanjut",
   "server_banner.server_stats": "Statistik pelayan:",
   "sign_in_banner.create_account": "Cipta akaun",
   "sign_in_banner.sign_in": "Daftar masuk",
   "sign_in_banner.sso_redirect": "Log masuk atau mendaftar",
-  "sign_in_banner.text": "Log masuk untuk mengikuti profil atau hashtag, kegemaran, kongsi dan balas pos. Anda juga boleh berinteraksi daripada akaun anda pada server lain.",
   "status.admin_account": "Buka antara muka penyederhanaan untuk @{name}",
   "status.admin_domain": "antara muka penyederhanaan",
   "status.admin_status": "Buka hantaran ini dalam antara muka penyederhanaan",
diff --git a/app/javascript/mastodon/locales/my.json b/app/javascript/mastodon/locales/my.json
index 23eaa8564b5470..e3287f3f327356 100644
--- a/app/javascript/mastodon/locales/my.json
+++ b/app/javascript/mastodon/locales/my.json
@@ -582,13 +582,10 @@
   "server_banner.about_active_users": "ပြီးခဲ့သည့် ရက်ပေါင်း ၃၀ အတွင်း ဤဆာဗာကို အသုံးပြုသူများ (လအလိုက် လက်ရှိအသုံးပြုသူများ)",
   "server_banner.active_users": "လက်ရှိအသုံးပြုသူများ",
   "server_banner.administered_by": "မှ စီမံခန့်ခွဲသည် -",
-  "server_banner.introduction": "{domain} သည် {mastodon} မှ ပံ့ပိုးပေးထားသော ဗဟိုချုပ်ကိုင်မှုမရှိသည့် လူမှုကွန်ရက်တစ်ခုဖြစ်သည်။",
-  "server_banner.learn_more": "ပိုမိုသိရှိရန်",
   "server_banner.server_stats": "ဆာဗာအား လက်ရှိအသုံးပြုသူများ -",
   "sign_in_banner.create_account": "အကောင့်ဖန်တီးမည်",
   "sign_in_banner.sign_in": "အကောင့်ဝင်မည်",
   "sign_in_banner.sso_redirect": "အကောင့်ဝင်ပါ သို့မဟုတ် မှတ်ပုံတင်ပါ",
-  "sign_in_banner.text": "ပရိုဖိုင်များ သို့မဟုတ် hashtag များ၊ favorite၊ ပို့စ်မျှဝေမှုများနှင့် ပြန်ကြားစာများအသုံးပြုရန်အတွက် အကောင့်ဝင်ပါ။ အခြားဆာဗာပေါ်ရှိ သင့်အကောင့်မှလည်း အပြန်အလှန်ဖလှယ်နိုင်ပါသည်။",
   "status.admin_account": "@{name} အတွက် စိစစ်ခြင်းကြားခံနယ်ကို ဖွင့်ပါ",
   "status.admin_domain": "{domain} အတွက် စိစစ်ခြင်းကြားခံနယ်ကို ဖွင့်ပါ",
   "status.admin_status": "Open this status in the moderation interface",
diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json
index 01610b56528b76..8246d8dfd2d0fe 100644
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@@ -696,13 +696,13 @@
   "server_banner.about_active_users": "Aantal gebruikers tijdens de afgelopen 30 dagen (MAU)",
   "server_banner.active_users": "actieve gebruikers",
   "server_banner.administered_by": "Beheerd door:",
-  "server_banner.introduction": "{domain} is onderdeel van het decentrale sociale netwerk {mastodon}.",
-  "server_banner.learn_more": "Meer leren",
+  "server_banner.is_one_of_many": "{domain} is een van de vele onafhankelijke Mastodon-servers die je kunt gebruiken om deel te nemen aan de fediverse.",
   "server_banner.server_stats": "Serverstats:",
   "sign_in_banner.create_account": "Registreren",
+  "sign_in_banner.follow_anyone": "Volg iedereen in de fediverse en zie het allemaal in chronologische volgorde. Geen algoritmes, advertenties of clickbaits.",
+  "sign_in_banner.mastodon_is": "Mastodon is de beste manier om wat er gebeurt bij te houden.",
   "sign_in_banner.sign_in": "Inloggen",
   "sign_in_banner.sso_redirect": "Inloggen of Registreren",
-  "sign_in_banner.text": "Wanneer je een account op deze server hebt, kun je inloggen om mensen of hashtags te volgen, op berichten te reageren of om deze te delen. Wanneer je een account op een andere server hebt, kun je daar inloggen en daar ook interactie met mensen op deze server hebben.",
   "status.admin_account": "Moderatie-omgeving van @{name} openen",
   "status.admin_domain": "Moderatie-omgeving van {domain} openen",
   "status.admin_status": "Dit bericht in de moderatie-omgeving tonen",
diff --git a/app/javascript/mastodon/locales/nn.json b/app/javascript/mastodon/locales/nn.json
index 2f214bc99e32a4..93b44f29a13565 100644
--- a/app/javascript/mastodon/locales/nn.json
+++ b/app/javascript/mastodon/locales/nn.json
@@ -696,13 +696,10 @@
   "server_banner.about_active_users": "Personar som har brukt denne tenaren dei siste 30 dagane (Månadlege Aktive Brukarar)",
   "server_banner.active_users": "aktive brukarar",
   "server_banner.administered_by": "Administrert av:",
-  "server_banner.introduction": "{domain} er del av det desentraliserte sosiale nettverket drive av {mastodon}.",
-  "server_banner.learn_more": "Lær meir",
   "server_banner.server_stats": "Tenarstatistikk:",
   "sign_in_banner.create_account": "Opprett konto",
   "sign_in_banner.sign_in": "Logg inn",
   "sign_in_banner.sso_redirect": "Logg inn eller registrer deg",
-  "sign_in_banner.text": "Logg inn for å fylgja profilar eller emneknaggar, og for å lika, dela og svara på innlegg. Du kan òg samhandla med aktivitet på denne tenaren frå kontoar på andre tenarar.",
   "status.admin_account": "Opne moderasjonsgrensesnitt for @{name}",
   "status.admin_domain": "Opna moderatorgrensesnittet for {domain}",
   "status.admin_status": "Opne denne statusen i moderasjonsgrensesnittet",
diff --git a/app/javascript/mastodon/locales/no.json b/app/javascript/mastodon/locales/no.json
index 7f93ff04650262..213ba8af12b537 100644
--- a/app/javascript/mastodon/locales/no.json
+++ b/app/javascript/mastodon/locales/no.json
@@ -606,13 +606,10 @@
   "server_banner.about_active_users": "Personer som har brukt denne serveren i løpet av de siste 30 dagene (aktive brukere månedlig)",
   "server_banner.active_users": "aktive brukere",
   "server_banner.administered_by": "Administrert av:",
-  "server_banner.introduction": "{domain} er en del av det desentraliserte sosiale nettverket drevet av {mastodon}.",
-  "server_banner.learn_more": "Finn ut mer",
   "server_banner.server_stats": "Serverstatistikk:",
   "sign_in_banner.create_account": "Opprett konto",
   "sign_in_banner.sign_in": "Logg inn",
   "sign_in_banner.sso_redirect": "Logg inn eller registrer deg",
-  "sign_in_banner.text": "Logg inn for å følge profiler eller emneknagger, favorittmarkere, dele og svare på innlegg. Du kan også samhandle fra din konto på en annen server.",
   "status.admin_account": "Åpne moderatorgrensesnittet for @{name}",
   "status.admin_domain": "Åpne moderatorgrensesnittet for {domain}",
   "status.admin_status": "Åpne denne statusen i moderatorgrensesnittet",
diff --git a/app/javascript/mastodon/locales/oc.json b/app/javascript/mastodon/locales/oc.json
index 3c32fed0efc2fa..d8e11415880edf 100644
--- a/app/javascript/mastodon/locales/oc.json
+++ b/app/javascript/mastodon/locales/oc.json
@@ -499,8 +499,6 @@
   "search_results.title": "Recèrca : {q}",
   "server_banner.active_users": "utilizaires actius",
   "server_banner.administered_by": "Administrat per :",
-  "server_banner.introduction": "{domain} fa part del malhum social descentralizat propulsat per {mastodon}.",
-  "server_banner.learn_more": "Ne saber mai",
   "server_banner.server_stats": "Estatisticas del servidor :",
   "sign_in_banner.create_account": "Crear un compte",
   "sign_in_banner.sign_in": "Se connectar",
diff --git a/app/javascript/mastodon/locales/pa.json b/app/javascript/mastodon/locales/pa.json
index c693c24721c6e9..46924d737de318 100644
--- a/app/javascript/mastodon/locales/pa.json
+++ b/app/javascript/mastodon/locales/pa.json
@@ -311,7 +311,6 @@
   "search_results.see_all": "ਸਭ ਵੇਖੋ",
   "search_results.statuses": "ਪੋਸਟਾਂ",
   "search_results.title": "{q} ਲਈ ਖੋਜ",
-  "server_banner.learn_more": "ਹੋਰ ਜਾਣੋ",
   "sign_in_banner.create_account": "ਖਾਤਾ ਬਣਾਓ",
   "sign_in_banner.sign_in": "ਲਾਗਇਨ",
   "sign_in_banner.sso_redirect": "ਲਾਗਇਨ ਜਾਂ ਰਜਿਸਟਰ ਕਰੋ",
diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json
index 26dbbf51a0d283..ddfe1d4fbcd804 100644
--- a/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@@ -695,13 +695,13 @@
   "server_banner.about_active_users": "Osoby korzystające z tego serwera w ciągu ostatnich 30 dni (Miesięcznie aktywni użytkownicy)",
   "server_banner.active_users": "aktywni użytkownicy",
   "server_banner.administered_by": "Zarządzana przez:",
-  "server_banner.introduction": "{domain} jest częścią zdecentralizowanej sieci społecznościowej wspieranej przez {mastodon}.",
-  "server_banner.learn_more": "Dowiedz się więcej",
+  "server_banner.is_one_of_many": "{domain} jest jedną z wielu niezależnych serwerów Mastodon, których możesz użyć by uczestniczyć w fediwersum.",
   "server_banner.server_stats": "Statystyki serwera:",
   "sign_in_banner.create_account": "Załóż konto",
+  "sign_in_banner.follow_anyone": "Obserwuj kogokolwiek z fediwersum w kolejności chronologicznej. Bez algorytmów ani reklam.",
+  "sign_in_banner.mastodon_is": "Mastodon to najlepszy sposób nadążania za bieżącymi zdarzeniami.",
   "sign_in_banner.sign_in": "Zaloguj się",
   "sign_in_banner.sso_redirect": "Zaloguj/zarejestruj się",
-  "sign_in_banner.text": "Zaloguj się, aby obserwować profile lub hashtagi, polubić, udostępnić oraz odpowiedzieć na posty. Możesz również wejść w interakcję z konta na innym serwerze.",
   "status.admin_account": "Otwórz interfejs moderacyjny dla @{name}",
   "status.admin_domain": "Otwórz interfejs moderacyjny dla {domain}",
   "status.admin_status": "Otwórz ten wpis w interfejsie moderacyjnym",
diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json
index 3c8f3cf416885d..afe54905476d3b 100644
--- a/app/javascript/mastodon/locales/pt-BR.json
+++ b/app/javascript/mastodon/locales/pt-BR.json
@@ -695,13 +695,10 @@
   "server_banner.about_active_users": "Pessoas usando este servidor durante os últimos 30 dias (Usuários ativos mensalmente)",
   "server_banner.active_users": "usuários ativos",
   "server_banner.administered_by": "Administrado por:",
-  "server_banner.introduction": "{domain} faz parte da rede social descentralizada desenvolvida por {mastodon}.",
-  "server_banner.learn_more": "Saiba mais",
   "server_banner.server_stats": "Estatísticas do servidor:",
   "sign_in_banner.create_account": "Criar conta",
   "sign_in_banner.sign_in": "Entrar",
   "sign_in_banner.sso_redirect": "Entrar ou Registrar-se",
-  "sign_in_banner.text": "Identifique-se para seguir perfis ou 'hashtags', favoritar, compartilhar e responder publicações. Você também pode interagir a partir da sua conta em um servidor diferente.",
   "status.admin_account": "Abrir interface de moderação para @{name}",
   "status.admin_domain": "Abrir interface de moderação para {domain}",
   "status.admin_status": "Abrir este toot na interface de moderação",
diff --git a/app/javascript/mastodon/locales/pt-PT.json b/app/javascript/mastodon/locales/pt-PT.json
index a06e4c6d16525a..9446d5ee251b99 100644
--- a/app/javascript/mastodon/locales/pt-PT.json
+++ b/app/javascript/mastodon/locales/pt-PT.json
@@ -696,13 +696,13 @@
   "server_banner.about_active_users": "Pessoas que utilizaram este servidor nos últimos 30 dias (Utilizadores Ativos Mensais)",
   "server_banner.active_users": "utilizadores ativos",
   "server_banner.administered_by": "Administrado por:",
-  "server_banner.introduction": "{domain} faz parte da rede social descentralizada baseada no {mastodon}.",
-  "server_banner.learn_more": "Saber mais",
+  "server_banner.is_one_of_many": "{domain} é um dos muitos servidores Mastodon independentes que pode utilizar para participar no fediverso.",
   "server_banner.server_stats": "Estatísticas do servidor:",
   "sign_in_banner.create_account": "Criar conta",
+  "sign_in_banner.follow_anyone": "Siga alguém no fediverso e veja tudo em ordem cronológica. Sem algoritmos, anúncios ou clickbait à vista.",
+  "sign_in_banner.mastodon_is": "O Mastodon é a melhor maneira de acompanhar o que está a acontecer.",
   "sign_in_banner.sign_in": "Iniciar Sessão",
   "sign_in_banner.sso_redirect": "Inicie Sessão ou Registe-se",
-  "sign_in_banner.text": "Inicie sessão para seguir perfis ou etiquetas, assinale como favorito, partilhe ou responda a publicações. Pode ainda interagir através da sua conta noutro servidor.",
   "status.admin_account": "Abrir a interface de moderação para @{name}",
   "status.admin_domain": "Abrir interface de moderação para {domain}",
   "status.admin_status": "Abrir esta publicação na interface de moderação",
diff --git a/app/javascript/mastodon/locales/ro.json b/app/javascript/mastodon/locales/ro.json
index 0aef0ebd9617ee..3a2fab905649df 100644
--- a/app/javascript/mastodon/locales/ro.json
+++ b/app/javascript/mastodon/locales/ro.json
@@ -550,8 +550,6 @@
   "server_banner.about_active_users": "Persoane care au folosit acest server în ultimele 30 de zile (Utilizatori Lunari Activi)",
   "server_banner.active_users": "utilizatori activi",
   "server_banner.administered_by": "Administrat de:",
-  "server_banner.introduction": "{domain} face parte din rețeaua socială descentralizată alimentată de {mastodon}.",
-  "server_banner.learn_more": "Află mai multe",
   "server_banner.server_stats": "Statisticile serverului:",
   "sign_in_banner.create_account": "Creează-ți un cont",
   "sign_in_banner.sign_in": "Conectează-te",
diff --git a/app/javascript/mastodon/locales/ru.json b/app/javascript/mastodon/locales/ru.json
index 07a41385a2bf26..40ca8481476f23 100644
--- a/app/javascript/mastodon/locales/ru.json
+++ b/app/javascript/mastodon/locales/ru.json
@@ -297,6 +297,7 @@
   "filter_modal.select_filter.subtitle": "Используйте существующую категорию или создайте новую",
   "filter_modal.select_filter.title": "Фильтровать этот пост",
   "filter_modal.title.status": "Фильтровать пост",
+  "filtered_notifications_banner.mentions": "{count, plural, one {упоминание} other {упоминания}}",
   "filtered_notifications_banner.pending_requests": "Уведомления от {count, plural, =0 {никого} one {# человека} other {# других людей, с кем вы можете быть знакомы}}",
   "filtered_notifications_banner.title": "Отфильтрованные уведомления",
   "firehose.all": "Все",
@@ -307,6 +308,8 @@
   "follow_requests.unlocked_explanation": "Хотя ваша учетная запись не закрыта, команда {domain} подумала, что вы захотите просмотреть запросы от этих учетных записей вручную.",
   "follow_suggestions.curated_suggestion": "Выбор администрации",
   "follow_suggestions.dismiss": "Больше не показывать",
+  "follow_suggestions.featured_longer": "Отобранные командой {domain} вручную",
+  "follow_suggestions.friends_of_friends_longer": "Популярно среди людей, на которых вы подписаны",
   "follow_suggestions.hints.featured": "Этот профиль был вручную выбран командой {domain}.",
   "follow_suggestions.hints.friends_of_friends": "Этот профиль популярен среди людей, на которых вы подписаны.",
   "follow_suggestions.hints.most_followed": "Этот профиль один из самых отслеживаемых на {domain}.",
@@ -314,6 +317,8 @@
   "follow_suggestions.hints.similar_to_recently_followed": "Этот профиль похож на другие профили, на которые вы подписывались в последнее время.",
   "follow_suggestions.personalized_suggestion": "Персонализированное предложение",
   "follow_suggestions.popular_suggestion": "Популярное предложение",
+  "follow_suggestions.popular_suggestion_longer": "Популярное на {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Похоже на профили, на которые вы недавно подписались",
   "follow_suggestions.view_all": "Посмотреть все",
   "follow_suggestions.who_to_follow": "На кого подписаться",
   "followed_tags": "Отслеживаемые хэштеги",
@@ -409,6 +414,8 @@
   "limited_account_hint.action": "Все равно показать профиль",
   "limited_account_hint.title": "Этот профиль был скрыт модераторами {domain}.",
   "link_preview.author": "Автор: {name}",
+  "link_preview.more_from_author": "Больше от {name}",
+  "link_preview.shares": "{count, plural, one {{counter} пост} other {{counter} посты}}",
   "lists.account.add": "Добавить в список",
   "lists.account.remove": "Убрать из списка",
   "lists.delete": "Удалить список",
@@ -468,7 +475,15 @@
   "notification.follow": "{name} подписался (-лась) на вас",
   "notification.follow_request": "{name} отправил запрос на подписку",
   "notification.mention": "{name} упомянул(а) вас",
+  "notification.moderation-warning.learn_more": "Узнать больше",
+  "notification.moderation_warning": "Вы получили предупреждение от модерации",
   "notification.moderation_warning.action_delete_statuses": "Некоторые из ваших публикаций были удалены.",
+  "notification.moderation_warning.action_disable": "Ваша учётная запись была отключена.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Некоторые из ваших сообщений были отмечены как деликатные.",
+  "notification.moderation_warning.action_none": "Ваша учётная запись получила предупреждение от модерации.",
+  "notification.moderation_warning.action_sensitive": "С этого момента ваши сообщения будут помечены как деликатные.",
+  "notification.moderation_warning.action_silence": "Ваша учётная запись была ограничена.",
+  "notification.moderation_warning.action_suspend": "Действие вашей учётной записи приостановлено.",
   "notification.own_poll": "Ваш опрос закончился",
   "notification.poll": "Опрос, в котором вы приняли участие, завершился",
   "notification.reblog": "{name} продвинул(а) ваш пост",
@@ -489,6 +504,8 @@
   "notifications.column_settings.admin.sign_up": "Новые регистрации:",
   "notifications.column_settings.alert": "Уведомления на рабочем столе",
   "notifications.column_settings.favourite": "Избранные:",
+  "notifications.column_settings.filter_bar.advanced": "Отображать все категории",
+  "notifications.column_settings.filter_bar.category": "Панель сортировки",
   "notifications.column_settings.follow": "У вас новый подписчик:",
   "notifications.column_settings.follow_request": "Новые запросы на подписку:",
   "notifications.column_settings.mention": "Вас упомянули в посте:",
@@ -514,7 +531,14 @@
   "notifications.permission_denied": "Уведомления на рабочем столе недоступны, так как вы запретили их отправку в браузере. Проверьте настройки для сайта, чтобы включить их обратно.",
   "notifications.permission_denied_alert": "Уведомления на рабочем столе недоступны, так как вы ранее отклонили запрос на их отправку.",
   "notifications.permission_required": "Чтобы включить уведомления на рабочем столе, необходимо разрешить их в браузере.",
+  "notifications.policy.filter_new_accounts.hint": "Создано в течение последних {days, plural, one {один день} few {# дней} many {# дней} other {# дня}}",
   "notifications.policy.filter_new_accounts_title": "Новые учётные записи",
+  "notifications.policy.filter_not_followers_title": "Люди, не подписанные на вас",
+  "notifications.policy.filter_not_following_hint": "Пока вы не одобрите их вручную",
+  "notifications.policy.filter_not_following_title": "Люди, на которых вы не подписаны",
+  "notifications.policy.filter_private_mentions_hint": "Фильтруется, если только это не ответ на ваше собственное упоминание или если вы подписаны на отправителя",
+  "notifications.policy.filter_private_mentions_title": "Нежелательные личные упоминания",
+  "notifications.policy.title": "Фильтровать уведомления от…",
   "notifications_permission_banner.enable": "Включить уведомления",
   "notifications_permission_banner.how_to_control": "Получайте уведомления даже когда Mastodon закрыт, включив уведомления на рабочем столе. А чтобы лишний шум не отвлекал, вы можете настроить какие уведомления вы хотите получать, нажав на кнопку {icon} выше.",
   "notifications_permission_banner.title": "Будьте в курсе происходящего",
@@ -671,13 +695,10 @@
   "server_banner.about_active_users": "Люди, заходившие на этот сервер за последние 30 дней (ежемесячные активные пользователи)",
   "server_banner.active_users": "активные пользователи",
   "server_banner.administered_by": "Управляется:",
-  "server_banner.introduction": "{domain} является частью децентрализованной социальной сети, основанной на {mastodon}.",
-  "server_banner.learn_more": "Узнать больше",
   "server_banner.server_stats": "Статистика сервера:",
   "sign_in_banner.create_account": "Создать учётную запись",
   "sign_in_banner.sign_in": "Войти",
   "sign_in_banner.sso_redirect": "Войдите или Зарегистрируйтесь",
-  "sign_in_banner.text": "Войдите, чтобы отслеживать профили, хэштеги или избранное, делиться сообщениями и отвечать на них. Вы также можете взаимодействовать с вашей учётной записью на другом сервере.",
   "status.admin_account": "Открыть интерфейс модератора для @{name}",
   "status.admin_domain": "Открыть интерфейс модерации {domain}",
   "status.admin_status": "Открыть этот пост в интерфейсе модератора",
@@ -691,6 +712,7 @@
   "status.direct": "Лично упоминать @{name}",
   "status.direct_indicator": "Личные упоминания",
   "status.edit": "Изменить",
+  "status.edited": "Дата последнего изменения: {date}",
   "status.edited_x_times": "{count, plural, one {{count} изменение} many {{count} изменений} other {{count} изменения}}",
   "status.embed": "Встроить на свой сайт",
   "status.favourite": "Избранное",
diff --git a/app/javascript/mastodon/locales/sa.json b/app/javascript/mastodon/locales/sa.json
index 99aa46bc89f7ab..58654deb0395ca 100644
--- a/app/javascript/mastodon/locales/sa.json
+++ b/app/javascript/mastodon/locales/sa.json
@@ -499,8 +499,6 @@
   "server_banner.about_active_users": "विगतेषु ३० दिनेषु सर्वरमिममुपयुज्यमाणा जनाः (मासिकसक्रियोपभोक्तारः)",
   "server_banner.active_users": "सक्रियोपभोक्तारः",
   "server_banner.administered_by": "इत्यनेन अधिकृतः : ",
-  "server_banner.introduction": "{domain} {mastodon} इत्यनेन सामर्थितो विकेन्द्रीयसामाजिकजालकर्मणोंऽशोऽस्ति।",
-  "server_banner.learn_more": "अधिकं ज्ञायताम्",
   "server_banner.server_stats": "सर्वरः स्थितिविषयकानि :",
   "sign_in_banner.create_account": "समयं संसृज",
   "sign_in_banner.sign_in": "सम्प्रवेशं कुरु",
diff --git a/app/javascript/mastodon/locales/sc.json b/app/javascript/mastodon/locales/sc.json
index 1a5f2ef0f396be..a0b5b327117f98 100644
--- a/app/javascript/mastodon/locales/sc.json
+++ b/app/javascript/mastodon/locales/sc.json
@@ -375,7 +375,6 @@
   "search_results.hashtags": "Etichetas",
   "search_results.statuses": "Publicatziones",
   "server_banner.administered_by": "Amministradu dae:",
-  "server_banner.learn_more": "Àteras informatziones",
   "server_banner.server_stats": "Istatìsticas de su serbidore:",
   "sign_in_banner.sign_in": "Sign in",
   "status.admin_account": "Aberi s'interfache de moderatzione pro @{name}",
diff --git a/app/javascript/mastodon/locales/sco.json b/app/javascript/mastodon/locales/sco.json
index ba62c11f71a715..53501a5937071e 100644
--- a/app/javascript/mastodon/locales/sco.json
+++ b/app/javascript/mastodon/locales/sco.json
@@ -471,8 +471,6 @@
   "server_banner.about_active_users": "Fowk uisin this server in the last 30 days (Monthly Active Uisers)",
   "server_banner.active_users": "active uisers",
   "server_banner.administered_by": "Administert bi:",
-  "server_banner.introduction": "{domain} is pairt o the decentralized social network pooery bi {mastodon}.",
-  "server_banner.learn_more": "Lairn mair",
   "server_banner.server_stats": "Server stats:",
   "sign_in_banner.create_account": "Mak accoont",
   "sign_in_banner.sign_in": "Sign in",
diff --git a/app/javascript/mastodon/locales/si.json b/app/javascript/mastodon/locales/si.json
index ccbface05ae031..22320daefc14a0 100644
--- a/app/javascript/mastodon/locales/si.json
+++ b/app/javascript/mastodon/locales/si.json
@@ -395,7 +395,6 @@
   "search_results.statuses": "ලිපි",
   "search_results.title": "{q} සොයන්න",
   "server_banner.active_users": "සක්‍රිය පරිශ්‍රීලකයින්",
-  "server_banner.learn_more": "තව දැනගන්න",
   "sign_in_banner.create_account": "ගිණුමක් සාදන්න",
   "sign_in_banner.sign_in": "පිවිසෙන්න",
   "status.admin_status": "මෙම ලිපිය මැදිහත්කරණ අතුරුමුහුණතෙහි අරින්න",
diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json
index 9b5be21f9d8bb6..4c152a21434236 100644
--- a/app/javascript/mastodon/locales/sk.json
+++ b/app/javascript/mastodon/locales/sk.json
@@ -656,13 +656,10 @@
   "server_banner.about_active_users": "Ľudia používajúci tento server za posledných 30 dní (aktívni používatelia za mesiac)",
   "server_banner.active_users": "Aktívne účty",
   "server_banner.administered_by": "Správa servera:",
-  "server_banner.introduction": "{domain} je súčasťou decentralizovanej sociálnej siete využívajúcej technológiu {mastodon}.",
-  "server_banner.learn_more": "Viac informácií",
   "server_banner.server_stats": "Štatistiky servera:",
   "sign_in_banner.create_account": "Vytvoriť účet",
   "sign_in_banner.sign_in": "Prihlásiť sa",
   "sign_in_banner.sso_redirect": "Prihlásenie alebo registrácia",
-  "sign_in_banner.text": "Prihláste sa, aby ste mohli sledovať profily alebo hashtagy, hviezdičkovať, zdieľať a odpovedať na príspevky. Môžete tiež komunikovať zo svojho účtu na inom serveri.",
   "status.admin_account": "Moderovať @{name}",
   "status.admin_domain": "Moderovať {domain}",
   "status.admin_status": "Moderovať príspevok",
diff --git a/app/javascript/mastodon/locales/sl.json b/app/javascript/mastodon/locales/sl.json
index 46e6b384a16a7b..195797143b2c9e 100644
--- a/app/javascript/mastodon/locales/sl.json
+++ b/app/javascript/mastodon/locales/sl.json
@@ -696,13 +696,13 @@
   "server_banner.about_active_users": "Osebe, ki so uporabljale ta strežnik zadnjih 30 dni (dejavni uporabniki meseca)",
   "server_banner.active_users": "dejavnih uporabnikov",
   "server_banner.administered_by": "Upravlja:",
-  "server_banner.introduction": "{domain} je del decentraliziranega družbenega omrežja, ki ga poganja {mastodon}.",
-  "server_banner.learn_more": "Več o tem",
+  "server_banner.is_one_of_many": "{domain} je en izmed mnogih neodvisnih strežnikov Mastodon, ki ga lahko uporabljate za sodelovanje v fediverzumu.",
   "server_banner.server_stats": "Statistika strežnika:",
   "sign_in_banner.create_account": "Ustvari račun",
+  "sign_in_banner.follow_anyone": "Sledite komurkoli iz fediverzuma in vidite vse objave v časovnem vrstnem redu. Brez skritih algoritmov ter brez oglasov in vab za klikanje na vidiku.",
+  "sign_in_banner.mastodon_is": "Mastodon je najboljši način, da ste na tekočem z dogajanjem.",
   "sign_in_banner.sign_in": "Prijava",
   "sign_in_banner.sso_redirect": "Prijavite ali registrirajte se",
-  "sign_in_banner.text": "Prijavite se, da sledite profilom ali ključnikom, dodajate med priljubljene, delite z drugimi ter odgovarjate na objave. V interakciji ste lahko tudi iz svojega računa na drugem strežniku.",
   "status.admin_account": "Odpri vmesnik za moderiranje za @{name}",
   "status.admin_domain": "Odpri vmesnik za moderiranje za {domain}",
   "status.admin_status": "Odpri to objavo v vmesniku za moderiranje",
diff --git a/app/javascript/mastodon/locales/sq.json b/app/javascript/mastodon/locales/sq.json
index 6b3c5fbd905fc3..6903bceff6e11b 100644
--- a/app/javascript/mastodon/locales/sq.json
+++ b/app/javascript/mastodon/locales/sq.json
@@ -415,6 +415,7 @@
   "limited_account_hint.title": "Ky profil është fshehur nga moderatorët e {domain}.",
   "link_preview.author": "Nga {name}",
   "link_preview.more_from_author": "Më tepër nga {name}",
+  "link_preview.shares": "{count, plural, one {{counter} post} other {{counter} postime}}",
   "lists.account.add": "Shto në listë",
   "lists.account.remove": "Hiqe nga lista",
   "lists.delete": "Fshije listën",
@@ -695,13 +696,13 @@
   "server_banner.about_active_users": "Persona që përdorin këtë shërbyes gjatë 30 ditëve të fundit (Përdorues Mujorë Aktivë)",
   "server_banner.active_users": "përdorues aktivë",
   "server_banner.administered_by": "Administruar nga:",
-  "server_banner.introduction": "{domain} është pjesë e rrjetit shoqëror të decentralizuar të ngritur mbi {mastodon}.",
-  "server_banner.learn_more": "Mësoni më tepër",
+  "server_banner.is_one_of_many": "{domain} është një nga mjaft shërbyes të pavarur Mastodon te të cilët mund të merrni pjesë në Fedivers.",
   "server_banner.server_stats": "Statistika shërbyesi:",
   "sign_in_banner.create_account": "Krijoni llogari",
+  "sign_in_banner.follow_anyone": "Ndiqni këdo në Fedivers dhe shihni gjithçka në rend kohor. Pa algortime, apo marifete.",
+  "sign_in_banner.mastodon_is": "Mastodon-i është rruga më e mirë për të ndjekur se ç’ndodh.",
   "sign_in_banner.sign_in": "Hyni",
   "sign_in_banner.sso_redirect": "Bëni hyrjen, ose Regjistrohuni",
-  "sign_in_banner.text": "Që të ndiqni profile ose hashtagë, t’u vini shenjë si të parapëlqyer, të ndani me të tjerë dhe t’i ripostoni në postime, bëni hyrjen në llogari. Mundeni edhe të ndërveproni që nga llogaria juaj në një shërbyes tjetër.",
   "status.admin_account": "Hap ndërfaqe moderimi për @{name}",
   "status.admin_domain": "Hap ndërfaqe moderimi për {domain}",
   "status.admin_status": "Hape këtë mesazh te ndërfaqja e moderimit",
diff --git a/app/javascript/mastodon/locales/sr-Latn.json b/app/javascript/mastodon/locales/sr-Latn.json
index a78b9ff5b49402..63b2e03c96c45d 100644
--- a/app/javascript/mastodon/locales/sr-Latn.json
+++ b/app/javascript/mastodon/locales/sr-Latn.json
@@ -415,6 +415,7 @@
   "limited_account_hint.title": "Ovaj profil su sakrili moderatori {domain}.",
   "link_preview.author": "Po {name}",
   "link_preview.more_from_author": "Više od {name}",
+  "link_preview.shares": "{count, plural, one {{counter} objava} few {{counter} objave} other {{counter} objava}}",
   "lists.account.add": "Dodaj na listu",
   "lists.account.remove": "Ukloni sa liste",
   "lists.delete": "Izbriši listu",
@@ -695,13 +696,10 @@
   "server_banner.about_active_users": "Ljudi koji su koristili ovaj server u prethodnih 30 dana (mesečno aktivnih korisnika)",
   "server_banner.active_users": "aktivnih korisnika",
   "server_banner.administered_by": "Administrira:",
-  "server_banner.introduction": "{domain} je deo decentralizovane društvene mreže koju pokreće {mastodon}.",
-  "server_banner.learn_more": "Saznajte više",
   "server_banner.server_stats": "Statistike servera:",
   "sign_in_banner.create_account": "Napravite nalog",
   "sign_in_banner.sign_in": "Prijavite se",
   "sign_in_banner.sso_redirect": "Prijavite se ili se registrujte",
-  "sign_in_banner.text": "Prijavite se da biste pratili profile ili heš oznake, označili objave kao omiljene, delili i odgovarali na njih. Takođe možete komunicirati sa svog naloga na drugom serveru.",
   "status.admin_account": "Otvori moderatorsko okruženje za @{name}",
   "status.admin_domain": "Otvori moderatorsko okruženje za {domain}",
   "status.admin_status": "Otvori ovu objavu u moderatorskom okruženju",
diff --git a/app/javascript/mastodon/locales/sr.json b/app/javascript/mastodon/locales/sr.json
index 5c14faea856aa2..c6b969e982fb22 100644
--- a/app/javascript/mastodon/locales/sr.json
+++ b/app/javascript/mastodon/locales/sr.json
@@ -415,6 +415,7 @@
   "limited_account_hint.title": "Овај профил су сакрили модератори {domain}.",
   "link_preview.author": "По {name}",
   "link_preview.more_from_author": "Више од {name}",
+  "link_preview.shares": "{count, plural, one {{counter} објава} few {{counter} објаве} other {{counter} објава}}",
   "lists.account.add": "Додај на листу",
   "lists.account.remove": "Уклони са листе",
   "lists.delete": "Избриши листу",
@@ -695,13 +696,10 @@
   "server_banner.about_active_users": "Људи који су користили овај сервер у претходних 30 дана (месечно активних корисника)",
   "server_banner.active_users": "активних корисника",
   "server_banner.administered_by": "Администрира:",
-  "server_banner.introduction": "{domain} је део децентрализоване друштвене мреже коју покреће {mastodon}.",
-  "server_banner.learn_more": "Сазнајте више",
   "server_banner.server_stats": "Статистике сервера:",
   "sign_in_banner.create_account": "Направите налог",
   "sign_in_banner.sign_in": "Пријавите се",
   "sign_in_banner.sso_redirect": "Пријавите се или се региструјте",
-  "sign_in_banner.text": "Пријавите се да бисте пратили профиле или хеш ознаке, означили објаве као омиљене, делили и одговарали на њих. Такође можете комуницирати са свог налога на другом серверу.",
   "status.admin_account": "Отвори модераторско окружење за @{name}",
   "status.admin_domain": "Отвори модераторско окружење за {domain}",
   "status.admin_status": "Отвори ову објаву у модераторском окружењу",
diff --git a/app/javascript/mastodon/locales/sv.json b/app/javascript/mastodon/locales/sv.json
index 4e80c51034e7f5..ced6c36054fd0b 100644
--- a/app/javascript/mastodon/locales/sv.json
+++ b/app/javascript/mastodon/locales/sv.json
@@ -696,13 +696,10 @@
   "server_banner.about_active_users": "Personer som använt denna server de senaste 30 dagarna (månatligt aktiva användare)",
   "server_banner.active_users": "aktiva användare",
   "server_banner.administered_by": "Administrerad av:",
-  "server_banner.introduction": "{domain} är en del av det decentraliserade sociala nätverket som drivs av {mastodon}.",
-  "server_banner.learn_more": "Lär dig mer",
   "server_banner.server_stats": "Serverstatistik:",
   "sign_in_banner.create_account": "Skapa konto",
   "sign_in_banner.sign_in": "Logga in",
   "sign_in_banner.sso_redirect": "Logga in eller registrera dig",
-  "sign_in_banner.text": "Logga in för att följa profiler eller hashtaggar, favoritmarkera, dela och svara på inlägg. Du kan också interagera med ditt konto på en annan server.",
   "status.admin_account": "Öppet modereringsgränssnitt för @{name}",
   "status.admin_domain": "Öppet modereringsgränssnitt för @{domain}",
   "status.admin_status": "Öppna detta inlägg i modereringsgränssnittet",
diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json
index e16e3935751159..64abb394bfce4b 100644
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@@ -415,6 +415,7 @@
   "limited_account_hint.title": "มีการซ่อนโปรไฟล์นี้โดยผู้กลั่นกรองของ {domain}",
   "link_preview.author": "โดย {name}",
   "link_preview.more_from_author": "เพิ่มเติมจาก {name}",
+  "link_preview.shares": "{count, plural, other {{counter} โพสต์}}",
   "lists.account.add": "เพิ่มไปยังรายการ",
   "lists.account.remove": "เอาออกจากรายการ",
   "lists.delete": "ลบรายการ",
@@ -695,13 +696,13 @@
   "server_banner.about_active_users": "ผู้คนที่ใช้เซิร์ฟเวอร์นี้ในระหว่าง 30 วันที่ผ่านมา (ผู้ใช้ที่ใช้งานอยู่รายเดือน)",
   "server_banner.active_users": "ผู้ใช้ที่ใช้งานอยู่",
   "server_banner.administered_by": "ดูแลโดย:",
-  "server_banner.introduction": "{domain} เป็นส่วนหนึ่งของเครือข่ายสังคมแบบกระจายศูนย์ที่ขับเคลื่อนโดย {mastodon}",
-  "server_banner.learn_more": "เรียนรู้เพิ่มเติม",
+  "server_banner.is_one_of_many": "{domain} เป็นหนึ่งในเซิร์ฟเวอร์ Mastodon อิสระจำนวนมากที่คุณสามารถใช้เพื่อมีส่วนร่วมในจักรวาลสหพันธ์",
   "server_banner.server_stats": "สถิติเซิร์ฟเวอร์:",
   "sign_in_banner.create_account": "สร้างบัญชี",
+  "sign_in_banner.follow_anyone": "ติดตามใครก็ตามทั่วทั้งจักรวาลสหพันธ์และดูจักรวาลสหพันธ์ทั้งหมดตามลำดับเวลา ไม่มีอัลกอริทึม, โฆษณา หรือคลิกเบตอยู่ในสายตา",
+  "sign_in_banner.mastodon_is": "Mastodon เป็นวิธีที่ดีที่สุดที่จะติดตามสิ่งที่กำลังเกิดขึ้น",
   "sign_in_banner.sign_in": "เข้าสู่ระบบ",
   "sign_in_banner.sso_redirect": "เข้าสู่ระบบหรือลงทะเบียน",
-  "sign_in_banner.text": "เข้าสู่ระบบเพื่อติดตามโปรไฟล์หรือแฮชแท็ก ชื่นชอบ แชร์ และตอบกลับโพสต์ คุณยังสามารถโต้ตอบจากบัญชีของคุณในเซิร์ฟเวอร์อื่น",
   "status.admin_account": "เปิดส่วนติดต่อการกลั่นกรองสำหรับ @{name}",
   "status.admin_domain": "เปิดส่วนติดต่อการกลั่นกรองสำหรับ {domain}",
   "status.admin_status": "เปิดโพสต์นี้ในส่วนติดต่อการกลั่นกรอง",
diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json
index c0f8d083ad2947..0bb2a0e4a60a98 100644
--- a/app/javascript/mastodon/locales/tr.json
+++ b/app/javascript/mastodon/locales/tr.json
@@ -415,6 +415,7 @@
   "limited_account_hint.title": "Bu profil {domain} moderatörleri tarafından gizlendi.",
   "link_preview.author": "Yazar: {name}",
   "link_preview.more_from_author": "{name} kişisinden daha fazlası",
+  "link_preview.shares": "{count, plural, one {{counter} gönderi} other {{counter} gönderi}}",
   "lists.account.add": "Listeye ekle",
   "lists.account.remove": "Listeden kaldır",
   "lists.delete": "Listeyi sil",
@@ -695,13 +696,13 @@
   "server_banner.about_active_users": "Bu sunucuyu son 30 günde kullanan insanlar (Aylık Etkin Kullanıcılar)",
   "server_banner.active_users": "etkin kullanıcılar",
   "server_banner.administered_by": "Yönetici:",
-  "server_banner.introduction": "{domain}, {mastodon} destekli merkeziyetsiz sosyal ağın bir parçasıdır.",
-  "server_banner.learn_more": "Daha fazlasını öğrenin",
+  "server_banner.is_one_of_many": "{domain} fediverse katılımı için kullanabileceğiniz birçok bağımsız Mastodon sunucusundan biridir.",
   "server_banner.server_stats": "Sunucu istatistikleri:",
   "sign_in_banner.create_account": "Hesap oluştur",
+  "sign_in_banner.follow_anyone": "Fediverse çapında herhangi bir kimseyi takip edin ve tümünü kronolojik sırada görüntüleyin. Algoritma, reklam veya tıklama tuzağı yok.",
+  "sign_in_banner.mastodon_is": "Neler olup bittiğini izlemenin en iyi aracı Mastodon'dur.",
   "sign_in_banner.sign_in": "Giriş yap",
   "sign_in_banner.sso_redirect": "Giriş yap veya kaydol",
-  "sign_in_banner.text": "Profilleri ve hashtagleri takip etmek, gönderileri favorilerine eklemek, paylaşmak ve yanıtlamak için giriş yap. Farklı bir sunucudaki hesabınla da etkileşimde bulunabilirsin.",
   "status.admin_account": "@{name} için denetim arayüzünü açın",
   "status.admin_domain": "{domain} için denetim arayüzünü açın",
   "status.admin_status": "Denetim arayüzünde bu gönderiyi açın",
diff --git a/app/javascript/mastodon/locales/tt.json b/app/javascript/mastodon/locales/tt.json
index 9a402472d9136e..273c1a6de703cc 100644
--- a/app/javascript/mastodon/locales/tt.json
+++ b/app/javascript/mastodon/locales/tt.json
@@ -407,7 +407,6 @@
   "search_results.statuses": "Язмалар",
   "search_results.title": "{q} өчен эзләү",
   "server_banner.administered_by": "Идарә итүче:",
-  "server_banner.learn_more": "Күбрәк белү",
   "server_banner.server_stats": "Сервер статистикасы:",
   "sign_in_banner.create_account": "Аккаунтны ясау",
   "sign_in_banner.sign_in": "Керү",
diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json
index f750fce0407fe3..22cd15bd23198b 100644
--- a/app/javascript/mastodon/locales/uk.json
+++ b/app/javascript/mastodon/locales/uk.json
@@ -695,13 +695,12 @@
   "server_banner.about_active_users": "Люди, які використовують цей сервер протягом останніх 30 днів (Щомісячні Активні Користувачі)",
   "server_banner.active_users": "активні користувачі",
   "server_banner.administered_by": "Адміністратор:",
-  "server_banner.introduction": "{domain} є частиною децентралізованої соціальної мережі від {mastodon}.",
-  "server_banner.learn_more": "Дізнайтесь більше",
+  "server_banner.is_one_of_many": "{domain} - один з багатьох незалежних серверів Mastodon, які ви можете використати, щоб брати участь у федівері.",
   "server_banner.server_stats": "Статистика сервера:",
   "sign_in_banner.create_account": "Створити обліковий запис",
+  "sign_in_banner.mastodon_is": "Мастодон - найкращий спосіб продовжувати свою справу.",
   "sign_in_banner.sign_in": "Увійти",
   "sign_in_banner.sso_redirect": "Увійдіть або зареєструйтесь",
-  "sign_in_banner.text": "Увійдіть, щоб слідкувати за профілями або хештегами, вподобаними, ділитися і відповідати на дописи. Ви також можете взаємодіяти з вашого облікового запису на іншому сервері.",
   "status.admin_account": "Відкрити інтерфейс модерації для @{name}",
   "status.admin_domain": "Відкрити інтерфейс модерації для {domain}",
   "status.admin_status": "Відкрити цей допис в інтерфейсі модерації",
diff --git a/app/javascript/mastodon/locales/vi.json b/app/javascript/mastodon/locales/vi.json
index 56b2f7e52cc196..18f0fec3c574af 100644
--- a/app/javascript/mastodon/locales/vi.json
+++ b/app/javascript/mastodon/locales/vi.json
@@ -415,6 +415,7 @@
   "limited_account_hint.title": "Người này đã bị ẩn bởi quản trị viên của {domain}.",
   "link_preview.author": "Bởi {name}",
   "link_preview.more_from_author": "Thêm từ {name}",
+  "link_preview.shares": "{count, plural, other {{counter} lượt chia sẻ}}",
   "lists.account.add": "Thêm vào danh sách",
   "lists.account.remove": "Xóa khỏi danh sách",
   "lists.delete": "Xóa danh sách",
@@ -695,13 +696,13 @@
   "server_banner.about_active_users": "Những người ở máy chủ này trong 30 ngày qua (MAU)",
   "server_banner.active_users": "người hoạt động",
   "server_banner.administered_by": "Vận hành:",
-  "server_banner.introduction": "{domain} là một phần của mạng xã hội liên hợp {mastodon}.",
-  "server_banner.learn_more": "Tìm hiểu",
+  "server_banner.is_one_of_many": "{domain} là một trong nhiều máy chủ Mastodon độc lập mà bạn có thể sử dụng để tham gia vào Fediverse.",
   "server_banner.server_stats": "Thống kê:",
   "sign_in_banner.create_account": "Đăng ký",
+  "sign_in_banner.follow_anyone": "Theo dõi bất kỳ ai trên Fediverse và đọc tút theo thứ tự thời gian. Không thuật toán, quảng cáo hoặc clickbait.",
+  "sign_in_banner.mastodon_is": "Mastodon là cách tốt nhất để nắm bắt những gì đang xảy ra.",
   "sign_in_banner.sign_in": "Đăng nhập",
   "sign_in_banner.sso_redirect": "Đăng nhập",
-  "sign_in_banner.text": "Đăng nhập để theo dõi người hoặc hashtag, thích, chia sẻ và trả lời tút. Bạn cũng có thể tương tác từ tài khoản của mình trên một máy chủ khác.",
   "status.admin_account": "Mở giao diện quản trị @{name}",
   "status.admin_domain": "Mở giao diện quản trị @{domain}",
   "status.admin_status": "Mở tút này trong giao diện quản trị",
diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json
index def95004402860..3456f99d25c15b 100644
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@@ -696,13 +696,12 @@
   "server_banner.about_active_users": "过去 30 天内使用此服务器的人(每月活跃用户)",
   "server_banner.active_users": "活跃用户",
   "server_banner.administered_by": "本站管理员：",
-  "server_banner.introduction": "{domain} 是由 {mastodon} 驱动的去中心化社交网络的一部分。",
-  "server_banner.learn_more": "详细了解",
+  "server_banner.is_one_of_many": "{domain} 是可用于参与联邦宇宙的众多独立 Mastodon 服务器之一。",
   "server_banner.server_stats": "服务器统计数据：",
   "sign_in_banner.create_account": "创建账户",
+  "sign_in_banner.mastodon_is": "Mastodon 是了解最新动态的最佳途径。",
   "sign_in_banner.sign_in": "登录",
   "sign_in_banner.sso_redirect": "登录或注册",
-  "sign_in_banner.text": "登录关注用户和话题标签，喜欢、分享和回复嘟文。您还可以与其他服务器上的用户进行互动。",
   "status.admin_account": "打开 @{name} 的管理界面",
   "status.admin_domain": "打开 {domain} 的管理界面",
   "status.admin_status": "打开此帖的管理界面",
diff --git a/app/javascript/mastodon/locales/zh-HK.json b/app/javascript/mastodon/locales/zh-HK.json
index eaa5dabe93134b..5dff466201e41c 100644
--- a/app/javascript/mastodon/locales/zh-HK.json
+++ b/app/javascript/mastodon/locales/zh-HK.json
@@ -693,13 +693,10 @@
   "server_banner.about_active_users": "在最近 30 天內內使用此伺服器的人 (月活躍用戶)",
   "server_banner.active_users": "活躍用戶",
   "server_banner.administered_by": "管理者：",
-  "server_banner.introduction": "{domain} 是由 {mastodon} 提供之去中心化社交網絡的一部份。",
-  "server_banner.learn_more": "了解更多",
   "server_banner.server_stats": "伺服器統計：",
   "sign_in_banner.create_account": "建立帳號",
   "sign_in_banner.sign_in": "登入",
   "sign_in_banner.sso_redirect": "登入或註冊",
-  "sign_in_banner.text": "登入以追蹤個人檔案、主題標籤，或最愛、分享和回覆帖文。你也可以從其他伺服器上的帳號進行互動。",
   "status.admin_account": "開啟 @{name} 的管理介面",
   "status.admin_domain": "打開 {domain} 管理介面",
   "status.admin_status": "在管理介面開啟這篇文章",
diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json
index 70b8d51dfc32be..e6cd62162bc4f7 100644
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@@ -696,13 +696,13 @@
   "server_banner.about_active_users": "最近三十日內使用此伺服器的人（月活躍使用者）",
   "server_banner.active_users": "活躍使用者",
   "server_banner.administered_by": "管理者：",
-  "server_banner.introduction": "{domain} 是由 {mastodon} 提供之去中心化社群網路一部分。",
-  "server_banner.learn_more": "了解更多",
+  "server_banner.is_one_of_many": "{domain} 為許多獨立的 Mastodon 伺服器之一，您能透過該伺服器參與聯邦宇宙。",
   "server_banner.server_stats": "伺服器統計：",
   "sign_in_banner.create_account": "新增帳號",
+  "sign_in_banner.follow_anyone": "跟隨聯邦宇宙中的任何人，並且以時間順序瀏覽所有內容。沒有演算法、廣告、或騙點擊連結。",
+  "sign_in_banner.mastodon_is": "Mastodon 是跟上時代潮流的最佳工具！",
   "sign_in_banner.sign_in": "登入",
   "sign_in_banner.sso_redirect": "登入或註冊",
-  "sign_in_banner.text": "登入以跟隨個人檔案與主題標籤，或收藏、分享及回覆嘟文。您也可以使用您的帳號於其他伺服器進行互動。",
   "status.admin_account": "開啟 @{name} 的管理介面",
   "status.admin_domain": "開啟 {domain} 的管理介面",
   "status.admin_status": "於管理介面開啟此嘟文",
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 5aca8ad0fd3918..602a26225c2d23 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -293,6 +293,7 @@ bg:
       filter_by_action: Филтриране по действие
       filter_by_user: Филтриране по потребител
       title: Одитен дневник
+      unavailable_instance: "(неналично име на домейн)"
     announcements:
       destroyed_msg: Успешно изтрито оповестяване!
       edit:
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index c91ae64a7ae0de..f892df02c1e689 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -293,6 +293,7 @@ ca:
       filter_by_action: Filtra per acció
       filter_by_user: Filtra per usuari
       title: Registre d'auditoria
+      unavailable_instance: "(nom de domini no disponible)"
     announcements:
       destroyed_msg: L’anunci s’ha esborrat amb èxit!
       edit:
diff --git a/config/locales/da.yml b/config/locales/da.yml
index cd9260dec45acf..fc7373cc94c700 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -293,6 +293,7 @@ da:
       filter_by_action: Filtrér efter handling
       filter_by_user: Filtrér efter bruger
       title: Revisionslog
+      unavailable_instance: "(domænenavn utilgængeligt)"
     announcements:
       destroyed_msg: Bekendtgørelsen er slettet!
       edit:
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 11460c3b401763..82ed9d8178c3d5 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -293,6 +293,7 @@ de:
       filter_by_action: Nach Aktion filtern
       filter_by_user: Nach Benutzer*in filtern
       title: Protokoll
+      unavailable_instance: "(Server nicht verfügbar)"
     announcements:
       destroyed_msg: Ankündigung erfolgreich gelöscht!
       edit:
diff --git a/config/locales/es-AR.yml b/config/locales/es-AR.yml
index d6bfb60a19649f..fda1566e22c478 100644
--- a/config/locales/es-AR.yml
+++ b/config/locales/es-AR.yml
@@ -293,6 +293,7 @@ es-AR:
       filter_by_action: Filtrar por acción
       filter_by_user: Filtrar por usuario
       title: Registro de auditoría
+      unavailable_instance: "[nombre de dominio no disponible]"
     announcements:
       destroyed_msg: "¡Anuncio eliminado exitosamente!"
       edit:
diff --git a/config/locales/es-MX.yml b/config/locales/es-MX.yml
index 8f4aa183d833a4..976b7a4f30cd00 100644
--- a/config/locales/es-MX.yml
+++ b/config/locales/es-MX.yml
@@ -293,6 +293,7 @@ es-MX:
       filter_by_action: Filtrar por acción
       filter_by_user: Filtrar por usuario
       title: Log de auditoría
+      unavailable_instance: "(nombre de dominio no disponible)"
     announcements:
       destroyed_msg: "¡Anuncio eliminado con éxito!"
       edit:
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 343f6f5a6363fb..aef5100a6d1fea 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -293,6 +293,7 @@ es:
       filter_by_action: Filtrar por acción
       filter_by_user: Filtrar por usuario
       title: Log de auditoría
+      unavailable_instance: "(nombre de dominio no disponible)"
     announcements:
       destroyed_msg: "¡Anuncio eliminado con éxito!"
       edit:
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index d1fa2446722e28..f108718e5ee8be 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -293,6 +293,7 @@ fi:
       filter_by_action: Suodata tapahtuman mukaan
       filter_by_user: Suodata käyttäjän mukaan
       title: Auditointiloki
+      unavailable_instance: "(verkkotunnus ei ole saatavilla)"
     announcements:
       destroyed_msg: Tiedote poistettu onnistuneesti!
       edit:
@@ -1661,7 +1662,7 @@ fi:
     preferences: Ominaisuudet
     profile: Julkinen profiili
     relationships: Seuratut ja seuraajat
-    severed_relationships: Katkenneet suhteet
+    severed_relationships: Katkenneet seurantasuhteet
     statuses_cleanup: Autom. julkaisujen poisto
     strikes: Valvontavaroitukset
     two_factor_authentication: Kaksivaiheinen todennus
@@ -1674,7 +1675,7 @@ fi:
       user_domain_block: Estit käyttäjän %{target_name}
     lost_followers: Menetetyt seuraajat
     lost_follows: Menetetyt seuratut
-    preamble: Voit menettää seurattusi ja seuraajasi, kun estät verkkotunnuksen tai kun valvojasi päättävät jäädyttää etäpalvelimen. Kun näin tapahtuu, voit ladata luetteloita katkenneista suhteista, jotta voit tarkastella niitä ja mahdollisesti viedä ne toiselle palvelimelle.
+    preamble: Voit menettää seurattusi ja seuraajasi, kun estät verkkotunnuksen tai kun valvojasi päättävät jäädyttää etäpalvelimen. Kun näin tapahtuu, voit ladata luetteloita katkenneista seurantasuhteista, jotta voit tarkastella niitä ja mahdollisesti viedä ne toiselle palvelimelle.
     purged: Palvelimesi ylläpitäjät ovat tyhjentäneet tämän palvelimen tiedot.
     type: Tapahtuma
   statuses:
@@ -1862,31 +1863,31 @@ fi:
       apps_ios_action: Lataa App Storesta
       apps_step: Lataa viralliset sovelluksemme.
       apps_title: Mastodon-sovellukset
-      checklist_subtitle: 'Aloitetaan tällä uudella sosiaalisella seudulla:'
+      checklist_subtitle: 'Näin pääset alkuun tällä uudella sosiaalisella alustalla:'
       checklist_title: Tervetulon tarkistuslista
       edit_profile_action: Mukauta
-      edit_profile_step: Tehosta vuorovaikutuksiasi täydennetyllä profiililla.
+      edit_profile_step: Tehosta vuorovaikutuksiasi kattavin profiilitiedoin.
       edit_profile_title: Mukauta profiiliasi
       explanation: Näillä vinkeillä pääset alkuun
       feature_action: Lue lisää
-      feature_audience: Mastodon tarjoaa sinulle ainutlaatuisen mahdollisuuden hallita yleisöäsi ilman välikäsiä. Omassa infrastruktuurissasi käytössä oleva Mastodon antaa sinulle mahdollisuuden seurata ja tulla seuratuksi miltä tahansa muulta verkon Mastodon-palvelimelta, ja se on vain sinun hallinnassasi.
+      feature_audience: Mastodon tarjoaa sinulle ainutlaatuisen mahdollisuuden hallita yleisöäsi ilman välikäsiä. Omassa infrastruktuurissasi toimiva Mastodon on täysin hallinnassasi, ja mahdollistaa sinun seurata mitä tahansa Mastodon-palvelimia sekä niin ikään olla seurattu niiltä päin.
       feature_audience_title: Rakenna yleisöäsi luottavaisin mielin
       feature_control: Tiedät itse parhaiten, mitä haluat nähdä kotisyötteessäsi. Ei algoritmeja eikä mainoksia tuhlaamassa aikaasi. Seuraa yhdellä tilillä ketä tahansa, miltä tahansa Mastodon-palvelimelta, vastaanota heidän julkaisunsa aikajärjestyksessä ja tee omasta internetin nurkastasi hieman enemmän omanlaisesi.
       feature_control_title: Pidä aikajanasi hallussasi
       feature_creativity: Mastodon tukee ääni-, video- ja kuvajulkaisuja, saavutettavuuskuvauksia, äänestyksiä, sisältövaroituksia, animoituja avattaria, mukautettuja emojeita, pikkukuvien rajauksen hallintaa ja paljon muuta, mikä auttaa ilmaisemaan itseäsi verkossa. Julkaisetpa sitten taidetta, musiikkia tai podcastia, Mastodon on sinua varten.
       feature_creativity_title: Luovuutta vertaansa vailla
       feature_moderation: Mastodon palauttaa päätöksenteon käsiisi. Jokainen palvelin luo omat sääntönsä ja määräyksensä, joita valvotaan paikallisesti eikä ylhäältä alas kuten kaupallisessa sosiaalisessa mediassa, mikä tekee siitä joustavimman vastaamaan eri ihmisryhmien tarpeisiin. Liity palvelimelle, jonka säännöt sopivat sinulle, tai ylläpidä omaa palvelinta.
-      feature_moderation_title: Moderointi niin kuin kuuluukin
+      feature_moderation_title: Moderointi juuri kuten sen pitäisi olla
       follow_action: Seuraa
-      follow_step: Mastodonissa on kyse kiinnostavien ihmisten seuraamisesta.
+      follow_step: Mastodon perustuu sinua kiinnostavien henkilöjen julkaisujen seuraamiseen.
       follow_title: Mukauta kotisyötettäsi
       follows_subtitle: Seuraa tunnettuja tilejä
-      follows_title: Ehdotuksia seurattavaksi
+      follows_title: Seurantaehdotuksia
       follows_view_more: Näytä lisää seurattavia henkilöitä
       hashtags_recent_count:
         one: "%{people} henkilö viimeisen 2 päivän aikana"
         other: "%{people} henkilöä viimeisen 2 päivän aikana"
-      hashtags_subtitle: Tutki, mikä on ollut suosittua viimeisenä 2 päivänä
+      hashtags_subtitle: Tutki, mikä on ollut suosittua 2 edeltävän päivän jälkeen
       hashtags_title: Suositut aihetunnisteet
       hashtags_view_more: Näytä lisää suosittuja aihetunnisteita
       post_action: Kirjoita
diff --git a/config/locales/fo.yml b/config/locales/fo.yml
index 0372d3dca3e875..945a2216a3d6ba 100644
--- a/config/locales/fo.yml
+++ b/config/locales/fo.yml
@@ -293,6 +293,7 @@ fo:
       filter_by_action: Filtrera eftir atgerð
       filter_by_user: Filtrera eftir brúkara
       title: Skoðanarloggur
+      unavailable_instance: "(økisnavn ikki tøkt)"
     announcements:
       destroyed_msg: Kunngerð strikað!
       edit:
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index a8489e425fe39c..ad4744e15b3e7b 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -293,6 +293,7 @@ gl:
       filter_by_action: Filtrar por acción
       filter_by_user: Filtrar por usuaria
       title: Rexistro de auditoría
+      unavailable_instance: "(nome de dominio non dispoñible)"
     announcements:
       destroyed_msg: Anuncio eliminado de xeito correcto!
       edit:
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 9088f48218c273..3ba823f99bc685 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -299,6 +299,7 @@ he:
       filter_by_action: סינון לפי פעולה
       filter_by_user: סינון לפי משתמש
       title: ביקורת יומן
+      unavailable_instance: "(שם מתחם לא זמין)"
     announcements:
       destroyed_msg: הכרזה נמחקה בהצלחה!
       edit:
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index d79bca7ff75793..19076910e2992c 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -293,6 +293,7 @@ hu:
       filter_by_action: Szűrés művelet alapján
       filter_by_user: Szűrés felhasználó alapján
       title: Audit napló
+      unavailable_instance: "(domain név nem elérhető)"
     announcements:
       destroyed_msg: A közlemény sikeresen törölve!
       edit:
diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index b7f4ecf85d291f..4932d42acfbea1 100644
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -293,6 +293,7 @@ ia:
       filter_by_action: Filtrar per action
       filter_by_user: Filtrar per usator
       title: Registro de inspection
+      unavailable_instance: "(nomine de dominio non disponibile)"
     announcements:
       destroyed_msg: Annuncio delite con successo!
       edit:
diff --git a/config/locales/is.yml b/config/locales/is.yml
index 75950e572dccbc..7ac50cd572dde4 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -293,6 +293,7 @@ is:
       filter_by_action: Sía eftir aðgerð
       filter_by_user: Sía eftir notanda
       title: Atvikaskrá
+      unavailable_instance: "(heiti léns ekki tiltækt)"
     announcements:
       destroyed_msg: Það tókst að eyða auglýsingunni!
       edit:
diff --git a/config/locales/it.yml b/config/locales/it.yml
index c3389f59c6bf6c..1e17c5cbd0c721 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -293,6 +293,7 @@ it:
       filter_by_action: Filtra per azione
       filter_by_user: Filtra per utente
       title: Registro di controllo
+      unavailable_instance: "(nome di dominio non disponibile)"
     announcements:
       destroyed_msg: Annuncio eliminato!
       edit:
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 9de2f6ca53cd41..a8e2ade61df8e5 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -290,6 +290,7 @@ ko:
       filter_by_action: 행동으로 거르기
       filter_by_user: 사용자로 거르기
       title: 감사 로그
+      unavailable_instance: "(도메인네임 사용불가)"
     announcements:
       destroyed_msg: 공지가 성공적으로 삭제되었습니다!
       edit:
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 9e60ddfe529954..e731deedc8e64b 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -299,6 +299,7 @@ lt:
       filter_by_action: Filtruoti pagal veiksmą
       filter_by_user: Filtruoti pagal naudotoją
       title: Audito žurnalas
+      unavailable_instance: "(domeno pavadinimas neprieinamas)"
     announcements:
       destroyed_msg: Skelbimas sėkmingai ištrintas.
       edit:
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 328467f483d2bf..baab2cb587a0e7 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -293,6 +293,7 @@ nl:
       filter_by_action: Op actie filteren
       filter_by_user: Op gebruiker filteren
       title: Auditlog
+      unavailable_instance: "(domeinnaam niet beschikbaar)"
     announcements:
       destroyed_msg: Verwijderen van mededeling geslaagd!
       edit:
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 4c7af82b94f63a..7497f1784382db 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -299,6 +299,7 @@ pl:
       filter_by_action: Filtruj według działania
       filter_by_user: Filtruj według użytkownika
       title: Dziennik działań administracyjnych
+      unavailable_instance: "(domena niedostępna)"
     announcements:
       destroyed_msg: Pomyślnie usunięto ogłoszenie!
       edit:
diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index 49522b7414306d..839ae2184edfc2 100644
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -293,6 +293,7 @@ pt-PT:
       filter_by_action: Filtrar por ação
       filter_by_user: Filtrar por utilizador
       title: Registo de auditoria
+      unavailable_instance: "(nome de domínio indisponível)"
     announcements:
       destroyed_msg: Comunicado correctamente eliminado!
       edit:
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index d6b8726ba4fc32..6dff92bb6d5386 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -298,6 +298,7 @@ ru:
       filter_by_action: Фильтр по действию
       filter_by_user: Фильтр по пользователю
       title: Журнал аудита
+      unavailable_instance: "(доменное имя недоступно)"
     announcements:
       destroyed_msg: Объявление удалено.
       edit:
diff --git a/config/locales/simple_form.fi.yml b/config/locales/simple_form.fi.yml
index 9ac36447de307e..b0bc8c735b4881 100644
--- a/config/locales/simple_form.fi.yml
+++ b/config/locales/simple_form.fi.yml
@@ -83,7 +83,7 @@ fi:
         closed_registrations_message: Näkyy, kun rekisteröityminen on suljettu
         content_cache_retention_period: Kaikki muiden palvelinten julkaisut (mukaan lukien tehostukset ja vastaukset) poistuvat, kun määritetty määrä päiviä on kulunut, ottamatta huomioon paikallisen käyttäjän vuorovaikutusta näiden julkaisujen kanssa. Sisältää julkaisut, jotka paikallinen käyttäjä on merkinnyt kirjanmerkiksi tai suosikiksi. Myös yksityiset maininnat eri palvelinten käyttäjien välillä menetetään, eikä niitä voi palauttaa. Tämä asetus on tarkoitettu käytettäväksi erityistapauksissa ja rikkoo monia käyttäjien odotuksia, kun sitä käytetään yleistarkoituksiin.
         custom_css: Voit käyttää mukautettuja tyylejä Mastodonin verkkoversiossa.
-        favicon: WEBP, PNG, GIF tai JPG. Korvaa oletusarvoisen Mastodonin suosikkikuvakkeen omalla kuvakkeella.
+        favicon: WEBP, PNG, GIF tai JPG. Korvaa oletusarvoisen Mastodonin sivustokuvakkeen (favicon) haluamallasi kuvakkeella.
         mascot: Ohittaa kuvituksen edistyneessä selainkäyttöliittymässä.
         media_cache_retention_period: Käyttäjien tekemien julkaisujen mediatiedostot ovat välimuistissa palvelimellasi. Kun arvo on positiivinen, media poistuu, kun määritetty määrä päiviä on kulunut. Jos mediaa pyydetään sen poistamisen jälkeen, se ladataan uudelleen, jos lähdesisältö on vielä saatavilla. Koska linkkien esikatselun kyselyitä kolmansien osapuolien sivustoille on rajoitettu, on suositeltavaa asettaa tämä arvo vähintään 14 päivään, tai linkkien kortteja ei päivitetä pyynnöstä ennen tätä ajankohtaa.
         peers_api_enabled: Luettelo verkkotunnuksista, jotka tämä palvelin on kohdannut fediversumissa. Se ei kerro, oletko liitossa tietyn palvelimen kanssa, vaan että palvelimesi on ylipäätään tietoinen siitä. Tätä tietoa käytetään palveluissa, jotka keräävät tilastoja federoinnista yleisellä tasolla.
diff --git a/config/locales/simple_form.th.yml b/config/locales/simple_form.th.yml
index 0816efcc5f343b..0d9a88bc380ff7 100644
--- a/config/locales/simple_form.th.yml
+++ b/config/locales/simple_form.th.yml
@@ -20,7 +20,7 @@ th:
       admin_account_action:
         include_statuses: ผู้ใช้จะเห็นว่าโพสต์ใดก่อให้เกิดการกระทำการกลั่นกรองหรือคำเตือน
         send_email_notification: ผู้ใช้จะได้รับคำอธิบายว่าเกิดอะไรขึ้นกับบัญชีของเขา
-        text_html: ไม่จำเป็น คุณสามารถใช้ไวยากรณ์โพสต์ คุณสามารถ <a href="%{path}">เพิ่มคำเตือนที่ตั้งไว้ล่วงหน้า</a> เพื่อประหยัดเวลา
+        text_html: ไม่จำเป็น คุณสามารถใช้ไวยากรณ์โพสต์ คุณสามารถ <a href="%{path}">เพิ่มค่าคำเตือนที่ตั้งไว้ล่วงหน้า</a> เพื่อประหยัดเวลา
         type_html: เลือกสิ่งที่จะทำกับ <strong>%{acct}</strong>
         types:
           disable: ป้องกันไม่ให้ผู้ใช้ใช้บัญชีของเขา แต่ไม่ลบหรือซ่อนเนื้อหาของเขา
@@ -168,7 +168,7 @@ th:
           sensitive: ละเอียดอ่อน
           silence: จำกัด
           suspend: ระงับ
-        warning_preset_id: ใช้คำเตือนที่ตั้งไว้ล่วงหน้า
+        warning_preset_id: ใช้ค่าคำเตือนที่ตั้งไว้ล่วงหน้า
       announcement:
         all_day: เหตุการณ์ตลอดทั้งวัน
         ends_at: การสิ้นสุดเหตุการณ์
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 1e4e254cf18eaa..6087b1a1749642 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -299,6 +299,7 @@ sl:
       filter_by_action: Filtriraj po dejanjih
       filter_by_user: Filtriraj po uporabnikih
       title: Dnevnik revizije
+      unavailable_instance: "(ime domene ni na voljo)"
     announcements:
       destroyed_msg: Obvestilo je bilo uspešno izbrisano!
       edit:
diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml
index 718d1c0f84f336..776e473ee7a6cb 100644
--- a/config/locales/sr-Latn.yml
+++ b/config/locales/sr-Latn.yml
@@ -296,6 +296,7 @@ sr-Latn:
       filter_by_action: Filtriraj po aktivnosti
       filter_by_user: Filtriraj po korisniku
       title: Zapisnik
+      unavailable_instance: "(ime domena nedostupno)"
     announcements:
       destroyed_msg: Saopštenje je uspešno obrisano!
       edit:
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index c9a67b1936656a..365b358d5af77c 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -296,6 +296,7 @@ sr:
       filter_by_action: Филтрирај по активности
       filter_by_user: Филтрирај по кориснику
       title: Записник
+      unavailable_instance: "(име домена недоступно)"
     announcements:
       destroyed_msg: Саопштење је успешно обрисано!
       edit:
diff --git a/config/locales/th.yml b/config/locales/th.yml
index d1359e01768d96..df76d97c00a644 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -290,6 +290,7 @@ th:
       filter_by_action: กรองตามการกระทำ
       filter_by_user: กรองตามผู้ใช้
       title: รายการบันทึกการตรวจสอบ
+      unavailable_instance: "(ชื่อโดเมนไม่พร้อมใช้งาน)"
     announcements:
       destroyed_msg: ลบประกาศสำเร็จ!
       edit:
@@ -932,9 +933,9 @@ th:
     warning_presets:
       add_new: เพิ่มใหม่
       delete: ลบ
-      edit_preset: แก้ไขคำเตือนที่ตั้งไว้ล่วงหน้า
-      empty: คุณยังไม่ได้กำหนดคำเตือนที่ตั้งไว้ล่วงหน้าใด ๆ
-      title: คำเตือนที่ตั้งไว้ล่วงหน้า
+      edit_preset: แก้ไขค่าคำเตือนที่ตั้งไว้ล่วงหน้า
+      empty: คุณยังไม่ได้กำหนดค่าคำเตือนที่ตั้งไว้ล่วงหน้าใด ๆ
+      title: ค่าคำเตือนที่ตั้งไว้ล่วงหน้า
     webhooks:
       add_new: เพิ่มปลายทาง
       delete: ลบ
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 3ce12fec87c678..c690d22580cc20 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -293,6 +293,7 @@ tr:
       filter_by_action: Eyleme göre filtre
       filter_by_user: Kullanıcıya göre filtre
       title: Denetim günlüğü
+      unavailable_instance: "(alan adı mevcut değil)"
     announcements:
       destroyed_msg: Duyuru başarıyla silindi!
       edit:
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index c4f4a263801086..9994cd9d0dadc8 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -299,6 +299,7 @@ uk:
       filter_by_action: Фільтрувати за дією
       filter_by_user: Фільтрувати за користувачем
       title: Журнал подій
+      unavailable_instance: "(ім'я домену недоступне)"
     announcements:
       destroyed_msg: Оголошення успішно видалено!
       edit:
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 459d1bb0d9985c..8b24a267c17075 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -290,6 +290,7 @@ vi:
       filter_by_action: Theo hành động
       filter_by_user: Theo người
       title: Nhật ký kiểm duyệt
+      unavailable_instance: "(tên máy chủ không khả dụng)"
     announcements:
       destroyed_msg: Xóa thông báo thành công!
       edit:
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index b668c23d29be89..794b8344c10783 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -290,6 +290,7 @@ zh-CN:
       filter_by_action: 根据行为过滤
       filter_by_user: 根据用户过滤
       title: 运营日志
+      unavailable_instance: "(域名不可用)"
     announcements:
       destroyed_msg: 公告已删除！
       edit:
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 14f54f9a12219c..93de27c0b29ae8 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -290,6 +290,7 @@ zh-TW:
       filter_by_action: 按動作過濾
       filter_by_user: 按使用者過濾
       title: 營運日誌
+      unavailable_instance: "（該域名無法使用）"
     announcements:
       destroyed_msg: 成功刪除公告！
       edit:

From d7b76173219d88d5ad52097ecb4bf6abbd59b24a Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 17 Jun 2024 08:20:57 -0400
Subject: [PATCH 1315/2191] Use `class_names` in admin/account_moderation_notes
 helper (#30719)

---
 .../admin/account_moderation_notes_helper.rb  | 41 +++++++++++++------
 .../account_moderation_notes_helper_spec.rb   | 36 ++++++++--------
 2 files changed, 46 insertions(+), 31 deletions(-)

diff --git a/app/helpers/admin/account_moderation_notes_helper.rb b/app/helpers/admin/account_moderation_notes_helper.rb
index 3b9d580499fe82..2a3d954a35447f 100644
--- a/app/helpers/admin/account_moderation_notes_helper.rb
+++ b/app/helpers/admin/account_moderation_notes_helper.rb
@@ -4,27 +4,42 @@ module Admin::AccountModerationNotesHelper
   def admin_account_link_to(account, path: nil)
     return if account.nil?
 
-    link_to path || admin_account_path(account.id), class: name_tag_classes(account), title: account.acct do
-      safe_join([
-                  image_tag(account.avatar.url, width: 15, height: 15, alt: '', class: 'avatar'),
-                  content_tag(:span, account.acct, class: 'username'),
-                ], ' ')
-    end
+    link_to(
+      labeled_account_avatar(account),
+      path || admin_account_path(account.id),
+      class: class_names('name-tag', suspended: suspended_account?(account)),
+      title: account.acct
+    )
   end
 
   def admin_account_inline_link_to(account)
     return if account.nil?
 
-    link_to admin_account_path(account.id), class: name_tag_classes(account, true), title: account.acct do
-      content_tag(:span, account.acct, class: 'username')
-    end
+    link_to(
+      account_inline_text(account),
+      admin_account_path(account.id),
+      class: class_names('inline-name-tag', suspended: suspended_account?(account)),
+      title: account.acct
+    )
   end
 
   private
 
-  def name_tag_classes(account, inline = false)
-    classes = [inline ? 'inline-name-tag' : 'name-tag']
-    classes << 'suspended' if account.suspended? || (account.local? && account.user.nil?)
-    classes.join(' ')
+  def labeled_account_avatar(account)
+    safe_join(
+      [
+        image_tag(account.avatar.url, width: 15, height: 15, alt: '', class: 'avatar'),
+        account_inline_text(account),
+      ],
+      ' '
+    )
+  end
+
+  def account_inline_text(account)
+    content_tag(:span, account.acct, class: 'username')
+  end
+
+  def suspended_account?(account)
+    account.suspended? || (account.local? && account.user.nil?)
   end
 end
diff --git a/spec/helpers/admin/account_moderation_notes_helper_spec.rb b/spec/helpers/admin/account_moderation_notes_helper_spec.rb
index 91bf4ab6fe7df1..d8fc0ee233554e 100644
--- a/spec/helpers/admin/account_moderation_notes_helper_spec.rb
+++ b/spec/helpers/admin/account_moderation_notes_helper_spec.rb
@@ -6,50 +6,50 @@
   include AccountsHelper
 
   describe '#admin_account_link_to' do
+    subject { helper.admin_account_link_to(account) }
+
     context 'when Account is nil' do
       let(:account) { nil }
 
       it 'returns nil' do
-        expect(helper.admin_account_link_to(account)).to be_nil
+        expect(subject).to be_nil
       end
     end
 
     context 'with account' do
       let(:account) { Fabricate(:account) }
 
-      it 'calls #link_to' do
-        allow(helper).to receive(:link_to)
-
-        helper.admin_account_link_to(account)
-
-        expect(helper).to have_received(:link_to).with(
-          admin_account_path(account.id),
-          class: name_tag_classes(account),
-          title: account.acct
-        )
+      it 'returns a labeled avatar link to the account' do
+        expect(parsed_html.a[:href]).to eq admin_account_path(account.id)
+        expect(parsed_html.a[:class]).to eq 'name-tag'
+        expect(parsed_html.a.span.text).to eq account.acct
       end
     end
   end
 
   describe '#admin_account_inline_link_to' do
+    subject { helper.admin_account_inline_link_to(account) }
+
     context 'when Account is nil' do
       let(:account) { nil }
 
       it 'returns nil' do
-        expect(helper.admin_account_inline_link_to(account)).to be_nil
+        expect(subject).to be_nil
       end
     end
 
     context 'with account' do
       let(:account) { Fabricate(:account) }
 
-      it 'calls #link_to' do
-        result = helper.admin_account_inline_link_to(account)
-
-        expect(result).to match(name_tag_classes(account, true))
-        expect(result).to match(account.acct)
-        expect(result).to match(admin_account_path(account.id))
+      it 'returns an inline link to the account' do
+        expect(parsed_html.a[:href]).to eq admin_account_path(account.id)
+        expect(parsed_html.a[:class]).to eq 'inline-name-tag'
+        expect(parsed_html.a.span.text).to eq account.acct
       end
     end
   end
+
+  def parsed_html
+    Nokogiri::Slop(subject)
+  end
 end

From d5f02adad716520b6b9014553bc730dcef5b2f50 Mon Sep 17 00:00:00 2001
From: Michael Stanclift <mx@vmstan.com>
Date: Mon, 17 Jun 2024 07:28:01 -0500
Subject: [PATCH 1316/2191] Add option to use native Ruby driver for Redis
 (#30717)

---
 app/lib/redis_configuration.rb | 6 +++++-
 lib/mastodon/redis_config.rb   | 6 ++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/lib/redis_configuration.rb b/app/lib/redis_configuration.rb
index f0e86d985b8a9a..fb1249640fd733 100644
--- a/app/lib/redis_configuration.rb
+++ b/app/lib/redis_configuration.rb
@@ -42,9 +42,13 @@ def url
     ENV['REDIS_URL']
   end
 
+  def redis_driver
+    ENV.fetch('REDIS_DRIVER', 'hiredis') == 'ruby' ? :ruby : :hiredis
+  end
+
   private
 
   def raw_connection
-    Redis.new(url: url, driver: :hiredis)
+    Redis.new(url: url, driver: redis_driver)
   end
 end
diff --git a/lib/mastodon/redis_config.rb b/lib/mastodon/redis_config.rb
index 10672a53587b42..c858b61a053682 100644
--- a/lib/mastodon/redis_config.rb
+++ b/lib/mastodon/redis_config.rb
@@ -30,8 +30,10 @@ def setup_redis_env_url(prefix = nil, defaults = true)
 cache_namespace   = namespace ? "#{namespace}_cache" : 'cache'
 sidekiq_namespace = namespace
 
+redis_driver = ENV.fetch('REDIS_DRIVER', 'hiredis') == 'ruby' ? :ruby : :hiredis
+
 REDIS_CACHE_PARAMS = {
-  driver: :hiredis,
+  driver: redis_driver,
   url: ENV['CACHE_REDIS_URL'],
   expires_in: 10.minutes,
   namespace: "#{cache_namespace}:7.1",
@@ -43,7 +45,7 @@ def setup_redis_env_url(prefix = nil, defaults = true)
 }.freeze
 
 REDIS_SIDEKIQ_PARAMS = {
-  driver: :hiredis,
+  driver: redis_driver,
   url: ENV['SIDEKIQ_REDIS_URL'],
   namespace: sidekiq_namespace,
 }.freeze

From f0dba9af6f1d87f5da7685f430929d9a7fadb198 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcin=20Miko=C5=82ajczak?= <git@mkljczk.pl>
Date: Thu, 13 Jun 2024 21:46:45 +0200
Subject: [PATCH 1317/2191] [Glitch] LanguageDropdown: remove unused function
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Port a243963e934123e17519711ce0378eaa7b5f8204 to glitch-soc

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../compose/components/language_dropdown.jsx         | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/app/javascript/flavours/glitch/features/compose/components/language_dropdown.jsx b/app/javascript/flavours/glitch/features/compose/components/language_dropdown.jsx
index 8edf75203facec..1ad9e030403896 100644
--- a/app/javascript/flavours/glitch/features/compose/components/language_dropdown.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/language_dropdown.jsx
@@ -110,18 +110,6 @@ class LanguageDropdownMenu extends PureComponent {
     }).map(result => result.obj);
   }
 
-  frequentlyUsed () {
-    const { languages, value } = this.props;
-    const current = languages.find(lang => lang[0] === value);
-    const results = [];
-
-    if (current) {
-      results.push(current);
-    }
-
-    return results;
-  }
-
   handleClick = e => {
     const value = e.currentTarget.getAttribute('data-index');
 

From eccec924965d1b18b315f025f38bb1563adb351f Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 14 Jun 2024 15:04:20 +0200
Subject: [PATCH 1318/2191] [Glitch] Change sidebar text in web UI

Port b9fd7571aedbfda524ab48ba15c03bd3936b8b2c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/components/server_banner.jsx  | 10 ++++------
 .../features/ui/components/sign_in_banner.jsx     |  6 ++++--
 .../flavours/glitch/styles/components.scss        | 15 ++++++++++++---
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/app/javascript/flavours/glitch/components/server_banner.jsx b/app/javascript/flavours/glitch/components/server_banner.jsx
index 1b449ff1a8d9e7..43afebe9cf2b82 100644
--- a/app/javascript/flavours/glitch/components/server_banner.jsx
+++ b/app/javascript/flavours/glitch/components/server_banner.jsx
@@ -42,10 +42,12 @@ class ServerBanner extends PureComponent {
     return (
       <div className='server-banner'>
         <div className='server-banner__introduction'>
-          <FormattedMessage id='server_banner.introduction' defaultMessage='{domain} is part of the decentralized social network powered by {mastodon}.' values={{ domain: <strong>{domain}</strong>, mastodon: <a href='https://joinmastodon.org' target='_blank'>Mastodon</a> }} />
+          <FormattedMessage id='server_banner.is_one_of_many' defaultMessage='{domain} is one of the many independent Mastodon servers you can use to participate in the fediverse.' values={{ domain: <strong>{domain}</strong>, mastodon: <a href='https://joinmastodon.org' target='_blank'>Mastodon</a> }} />
         </div>
 
-        <ServerHeroImage blurhash={server.getIn(['thumbnail', 'blurhash'])} src={server.getIn(['thumbnail', 'url'])} className='server-banner__hero' />
+        <Link to='/about'>
+          <ServerHeroImage blurhash={server.getIn(['thumbnail', 'blurhash'])} src={server.getIn(['thumbnail', 'url'])} className='server-banner__hero' />
+        </Link>
 
         <div className='server-banner__description'>
           {isLoading ? (
@@ -84,10 +86,6 @@ class ServerBanner extends PureComponent {
             )}
           </div>
         </div>
-
-        <hr className='spacer' />
-
-        <Link className='button button--block button-secondary' to='/about'><FormattedMessage id='server_banner.learn_more' defaultMessage='Learn more' /></Link>
       </div>
     );
   }
diff --git a/app/javascript/flavours/glitch/features/ui/components/sign_in_banner.jsx b/app/javascript/flavours/glitch/features/ui/components/sign_in_banner.jsx
index 5db3cb492bb6f1..bda9aed025b025 100644
--- a/app/javascript/flavours/glitch/features/ui/components/sign_in_banner.jsx
+++ b/app/javascript/flavours/glitch/features/ui/components/sign_in_banner.jsx
@@ -22,7 +22,8 @@ const SignInBanner = () => {
   if (sso_redirect) {
     return (
       <div className='sign-in-banner'>
-        <p><FormattedMessage id='sign_in_banner.text' defaultMessage='Login to follow profiles or hashtags, favorite, share and reply to posts. You can also interact from your account on a different server.' /></p>
+        <p><strong><FormattedMessage id='sign_in_banner.mastodon_is' defaultMessage="Mastodon is the best way to keep up with what's happening." /></strong></p>
+        <p><FormattedMessage id='sign_in_banner.follow_anyone' defaultMessage='Follow anyone across the fediverse and see it all in chronological order. No algorithms, ads, or clickbait in sight.' /></p>
         <a href={sso_redirect} data-method='post' className='button button--block button-tertiary'><FormattedMessage id='sign_in_banner.sso_redirect' defaultMessage='Login or Register' /></a>
       </div>
     );
@@ -44,7 +45,8 @@ const SignInBanner = () => {
 
   return (
     <div className='sign-in-banner'>
-      <p><FormattedMessage id='sign_in_banner.text' defaultMessage='Login to follow profiles or hashtags, favorite, share and reply to posts. You can also interact from your account on a different server.' /></p>
+      <p><strong><FormattedMessage id='sign_in_banner.mastodon_is' defaultMessage="Mastodon is the best way to keep up with what's happening." /></strong></p>
+      <p><FormattedMessage id='sign_in_banner.follow_anyone' defaultMessage='Follow anyone across the fediverse and see it all in chronological order. No algorithms, ads, or clickbait in sight.' /></p>
       {signupButton}
       <a href='/auth/sign_in' className='button button--block button-tertiary'><FormattedMessage id='sign_in_banner.sign_in' defaultMessage='Login' /></a>
     </div>
diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index 32cca1a8017627..9980f87adc3644 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -952,9 +952,15 @@ body > [data-popper-placement] {
   padding: 10px;
 
   p {
+    font-size: 15px;
+    line-height: 22px;
     color: $darker-text-color;
     margin-bottom: 20px;
 
+    strong {
+      font-weight: 700;
+    }
+
     a {
       color: $secondary-text-color;
       text-decoration: none;
@@ -9517,14 +9523,14 @@ noscript {
 }
 
 .server-banner {
-  padding: 20px 0;
-
   &__introduction {
+    font-size: 15px;
+    line-height: 22px;
     color: $darker-text-color;
     margin-bottom: 20px;
 
     strong {
-      font-weight: 600;
+      font-weight: 700;
     }
 
     a {
@@ -9552,6 +9558,9 @@ noscript {
   }
 
   &__description {
+    font-size: 15px;
+    line-height: 22px;
+    color: $darker-text-color;
     margin-bottom: 20px;
   }
 

From 83f07c7d9b392a90ab2ce51e81008f9b77469514 Mon Sep 17 00:00:00 2001
From: Essem <smswessem@gmail.com>
Date: Sun, 16 Jun 2024 14:30:22 -0500
Subject: [PATCH 1319/2191] Disable reactions in detailed status view when
 visibleReactions is 0

---
 .../glitch/features/status/components/detailed_status.jsx    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/javascript/flavours/glitch/features/status/components/detailed_status.jsx b/app/javascript/flavours/glitch/features/status/components/detailed_status.jsx
index c9dd0faa4ba1d3..7bfbfb303f9f1a 100644
--- a/app/javascript/flavours/glitch/features/status/components/detailed_status.jsx
+++ b/app/javascript/flavours/glitch/features/status/components/detailed_status.jsx
@@ -23,6 +23,7 @@ import { DisplayName } from '../../../components/display_name';
 import MediaGallery from '../../../components/media_gallery';
 import StatusContent from '../../../components/status_content';
 import StatusReactions from '../../../components/status_reactions';
+import { visibleReactions } from '../../../initial_state';
 import Audio from '../../audio';
 import scheduleIdleTask from '../../ui/util/schedule_idle_task';
 import Video from '../../video';
@@ -311,13 +312,13 @@ class DetailedStatus extends ImmutablePureComponent {
             {...statusContentProps}
           />
 
-          <StatusReactions
+          {visibleReactions > 0 && (<StatusReactions
             statusId={status.get('id')}
             reactions={status.get('reactions')}
             addReaction={this.props.onReactionAdd}
             removeReaction={this.props.onReactionRemove}
             canReact={this.props.identity.signedIn}
-          />
+          />)}
 
           <div className='detailed-status__meta'>
             <div className='detailed-status__meta__line'>

From 463585fc3c9540d0fee1b8a210ad9f3919b15a69 Mon Sep 17 00:00:00 2001
From: Jeremy Kescher <jeremy@kescher.at>
Date: Mon, 17 Jun 2024 22:55:11 +0200
Subject: [PATCH 1320/2191] Bump Catstodon revision to 1.0.3

---
 CHANGELOG.md            | 6 ++++++
 lib/mastodon/version.rb | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a7cbd969335b00..4bc871180ffcac 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All changes to Catstodon that aren't Mastodon or glitch-soc Mastodon changes will be documented here.
 
+## [v4.3.0-alpha.4+glitch+cat+1.0.3] - 2024-06-17
+
+- Upstream changes
+- Emoji reaction PR changes
+  - "Disable reactions in detailed status view when visibleReactions is 0" by Essem
+
 ## [v4.3.0-alpha.4+glitch+cat+1.0.2] - 2024-06-16
 
 - Upstream changes
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index ef4e56efd7fe13..9c0f92f191500e 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -25,7 +25,7 @@ def prerelease
     end
 
     def catstodon_revision
-      '1.0.2'
+      '1.0.3'
     end
 
     def build_metadata

From d0cf3e51dba9e17e0bb4c7c1b0c835848b3e4ec6 Mon Sep 17 00:00:00 2001
From: Jeremy Kescher <jeremy@kescher.at>
Date: Tue, 18 Jun 2024 00:10:40 +0200
Subject: [PATCH 1321/2191] CHANGELOG.md: Add clarification about dates being
 UTC

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4bc871180ffcac..8fb1805583111d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 All changes to Catstodon that aren't Mastodon or glitch-soc Mastodon changes will be documented here.
 
+All release dates, as well as most other dates, are intended to be read as "within the day, in UTC time."
+
 ## [v4.3.0-alpha.4+glitch+cat+1.0.3] - 2024-06-17
 
 - Upstream changes

From e53b0023799ae49607136c4dd72a8c3f623686d3 Mon Sep 17 00:00:00 2001
From: Jeremy Kescher <jeremy@kescher.at>
Date: Tue, 18 Jun 2024 00:18:20 +0200
Subject: [PATCH 1322/2191] CHANGELOG.md: Add note about ruby 3.3.3.

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8fb1805583111d..c463cfc053d8ce 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ All release dates, as well as most other dates, are intended to be read as "with
 ## [v4.3.0-alpha.4+glitch+cat+1.0.3] - 2024-06-17
 
 - Upstream changes
+  - Ruby version is now 3.3.3, and must be installed before upgrading to this version.
 - Emoji reaction PR changes
   - "Disable reactions in detailed status view when visibleReactions is 0" by Essem
 

From 3fa67cbe7abb4d955cec1b7b0ff171dfcf69fe24 Mon Sep 17 00:00:00 2001
From: Jeremy Kescher <jeremy@kescher.at>
Date: Tue, 18 Jun 2024 01:13:30 +0200
Subject: [PATCH 1323/2191] Make MASTODON_USE_LIBVIPS default to true

---
 config/application.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/application.rb b/config/application.rb
index 65407da05c91a6..95df303e25209e 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -102,7 +102,7 @@ class Application < Rails::Application
     config.before_configuration do
       require 'mastodon/redis_config'
 
-      config.x.use_vips = ENV['MASTODON_USE_LIBVIPS'] == 'true'
+      config.x.use_vips = ENV.fetch('MASTODON_USE_LIBVIPS', 'true') == 'true'
 
       if config.x.use_vips
         require_relative '../lib/paperclip/vips_lazy_thumbnail'

From d220eaab0ad57f4119434dc6a70726de0a4fe164 Mon Sep 17 00:00:00 2001
From: Jeremy Kescher <jeremy@kescher.at>
Date: Tue, 18 Jun 2024 01:17:19 +0200
Subject: [PATCH 1324/2191] Bump Catstodon revision to 1.1.0

---
 CHANGELOG.md            | 6 ++++++
 lib/mastodon/version.rb | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c463cfc053d8ce..f13eda77cd1afa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,12 @@ All changes to Catstodon that aren't Mastodon or glitch-soc Mastodon changes wil
 
 All release dates, as well as most other dates, are intended to be read as "within the day, in UTC time."
 
+## [v4.3.0-alpha.4+glitch+cat+1.1.0] - 2024-06-17
+
+- Set environment variable `MASTODON_USE_LIBVIPS` to true by default.
+  - You need to install libvips for this.
+  - If you don't want to, you'll _have to_ set this environment variable to `false`, for any commands you run.
+
 ## [v4.3.0-alpha.4+glitch+cat+1.0.3] - 2024-06-17
 
 - Upstream changes
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index 9c0f92f191500e..b80a91d6fec166 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -25,7 +25,7 @@ def prerelease
     end
 
     def catstodon_revision
-      '1.0.3'
+      '1.1.0'
     end
 
     def build_metadata

From 1a0ea1612874dc979a7abbc32a791a5e167055cd Mon Sep 17 00:00:00 2001
From: Jeremy Kescher <jeremy@kescher.at>
Date: Tue, 18 Jun 2024 01:55:35 +0200
Subject: [PATCH 1325/2191] README.md: Add note about MASTODON_USE_LIBVIPS

---
 README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/README.md b/README.md
index 8c704d24f8ad9e..0a43ec2aff46de 100644
--- a/README.md
+++ b/README.md
@@ -42,6 +42,9 @@ instead, use merge (fast-forward, if possible, with merge commit otherwise).
 - Adds the ability to disable the suspicious sign in detection entirely.
   - Useful for situations where the instance may not have up-to-date IP information, such as when the period of IP
     address retention is set to a low value (see _Previous differences now merged into vanilla Mastodon_)
+- Environment variable `MASTODON_USE_LIBVIPS` is true by default.
+  - This is a minor change, but it _requires_ all systems running Catstodon to run a recent libvips version (8.13+).
+  - Vanilla Mastodon intends to deprecate ImageMagick anyway, so sooner or later, this change will cease being one.
 
 ## Previous differences now merged into glitch-soc
 

From 38c6825edaa0a8c6520b2d1720f9b369fc63cba6 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 18 Jun 2024 08:16:16 -0400
Subject: [PATCH 1326/2191] Remove unused
 `Extractor#extract_cashtags_with_indices` method (#30742)

---
 app/lib/extractor.rb       | 4 ----
 spec/lib/extractor_spec.rb | 6 +++---
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/app/lib/extractor.rb b/app/lib/extractor.rb
index 9090773ae9b09b..7e647a75873a46 100644
--- a/app/lib/extractor.rb
+++ b/app/lib/extractor.rb
@@ -86,10 +86,6 @@ def extract_hashtags_with_indices(text, _options = {})
     possible_entries
   end
 
-  def extract_cashtags_with_indices(_text)
-    []
-  end
-
   def extract_extra_uris_with_indices(text)
     return [] unless text&.index(':')
 
diff --git a/spec/lib/extractor_spec.rb b/spec/lib/extractor_spec.rb
index b6c910171d33b4..af5c62d4c8a3a9 100644
--- a/spec/lib/extractor_spec.rb
+++ b/spec/lib/extractor_spec.rb
@@ -69,10 +69,10 @@
     end
   end
 
-  describe 'extract_cashtags_with_indices' do
-    it 'returns []' do
+  describe 'extract_entities_with_indices' do
+    it 'returns empty array when cashtag present' do
       text = '$cashtag'
-      extracted = described_class.extract_cashtags_with_indices(text)
+      extracted = described_class.extract_entities_with_indices(text)
       expect(extracted).to eq []
     end
   end

From 238dd23214eef7bcb1fe317717fd5107c530155c Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 18 Jun 2024 08:16:37 -0400
Subject: [PATCH 1327/2191] Remove already configured excludes from
 .rubocop.yml (#30741)

---
 .rubocop.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index cf4ee565e00eb0..6da1dc8cbcc648 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -4,14 +4,9 @@ AllCops:
   DisplayCopNames: true
   DisplayStyleGuide: true
   Exclude:
-    - db/schema.rb
-    - bin/*
-    - node_modules/**/*
     - Vagrantfile
-    - vendor/**/*
     - config/initializers/json_ld*
     - lib/mastodon/migration_helpers.rb
-    - lib/templates/**/*
   ExtraDetails: true
   NewCops: enable
   TargetRubyVersion: 3.1 # Oldest supported ruby version

From 7db3509a1fc929be788bf11e43391ada043cc29e Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 18 Jun 2024 08:20:23 -0400
Subject: [PATCH 1328/2191] Remove comment for ruby-core-extracted gem (#30740)

---
 Gemfile | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index b00eaecbcf9f02..ecd9088d399ead 100644
--- a/Gemfile
+++ b/Gemfile
@@ -9,9 +9,6 @@ gem 'rack', '~> 2.2.7'
 gem 'rails', '~> 7.1.1'
 gem 'thor', '~> 1.2'
 
-# For why irb is in the Gemfile, see: https://ruby.social/@st0012/111444685161478182
-gem 'irb', '~> 1.8'
-
 gem 'dotenv'
 gem 'haml-rails', '~>2.0'
 gem 'pg', '~> 1.5'
@@ -61,6 +58,7 @@ gem 'httplog', '~> 1.7.0'
 gem 'i18n'
 gem 'idn-ruby', require: 'idn'
 gem 'inline_svg'
+gem 'irb', '~> 1.8'
 gem 'kaminari', '~> 1.2'
 gem 'link_header', '~> 0.0'
 gem 'mario-redis-lock', '~> 1.2', require: 'redis_lock'

From 81f95cf08ecab324c8d9fce20a6a8a4ef2634fc6 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 18 Jun 2024 12:20:43 +0000
Subject: [PATCH 1329/2191] fix(deps): update dependency sass to v1.77.6
 (#30745)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 01b45d15690cd2..1be5eb42210ab7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -15355,15 +15355,15 @@ __metadata:
   linkType: hard
 
 "sass@npm:^1.62.1":
-  version: 1.77.5
-  resolution: "sass@npm:1.77.5"
+  version: 1.77.6
+  resolution: "sass@npm:1.77.6"
   dependencies:
     chokidar: "npm:>=3.0.0 <4.0.0"
     immutable: "npm:^4.0.0"
     source-map-js: "npm:>=0.6.2 <2.0.0"
   bin:
     sass: sass.js
-  checksum: 10c0/9da049b0a3fadab419084d6becdf471e107cf6e3c8ac87cabea2feb845afac75e86c99e06ee721a5aa4f6a2d833ec5380137c4e540ab2f760edf1e4eb6139e69
+  checksum: 10c0/fe5a393c0aa29eda9f83c06be9b94788b61fe8bad0616ee6e3a25d21ab504f430d40c0064fdca89b02b8e426411ae6dcd906c91f2e48c263575c3d392b6daeb1
   languageName: node
   linkType: hard
 

From 689ba28b07679dfe2d3ac2c22bdab832eb6b1a9d Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 18 Jun 2024 12:24:14 +0000
Subject: [PATCH 1330/2191] chore(deps): update docker/dockerfile docker tag to
 v1.8 (#30736)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Dockerfile           | 2 +-
 streaming/Dockerfile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 0d7516b10883b2..61f6095743ff30 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.7
+# syntax=docker/dockerfile:1.8
 
 # This file is designed for production server deployment, not local development work
 # For a containerized local dev environment, see: https://github.com/mastodon/mastodon/blob/main/README.md#docker
diff --git a/streaming/Dockerfile b/streaming/Dockerfile
index 564e717a402d4e..aee1f76ad39c36 100644
--- a/streaming/Dockerfile
+++ b/streaming/Dockerfile
@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.7
+# syntax=docker/dockerfile:1.8
 
 # Please see https://docs.docker.com/engine/reference/builder for information about
 # the extended buildx capabilities used in this file.

From 50db95b9a194756108e640d1054449bff3b9831d Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 18 Jun 2024 12:39:36 +0000
Subject: [PATCH 1331/2191] New Crowdin Translations (automated) (#30746)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/et.json | 33 +++++++++++++++++++------
 app/javascript/mastodon/locales/ia.json |  2 ++
 config/locales/doorkeeper.et.yml        |  2 ++
 config/locales/et.yml                   | 18 ++++++++------
 config/locales/simple_form.et.yml       |  8 +++++-
 config/locales/vi.yml                   |  4 +--
 6 files changed, 50 insertions(+), 17 deletions(-)

diff --git a/app/javascript/mastodon/locales/et.json b/app/javascript/mastodon/locales/et.json
index 46e28b999bb229..547a0fe61fb938 100644
--- a/app/javascript/mastodon/locales/et.json
+++ b/app/javascript/mastodon/locales/et.json
@@ -147,14 +147,14 @@
   "compose.published.body": "Postitus avaldatud.",
   "compose.published.open": "Ava",
   "compose.saved.body": "Postitus salvestatud.",
-  "compose_form.direct_message_warning_learn_more": "Vaata täpsemalt",
+  "compose_form.direct_message_warning_learn_more": "Vaata lisa",
   "compose_form.encryption_warning": "Postitused Mastodonis ei ole otsast-otsani krüpteeritud. Ära jaga mingeid delikaatseid andmeid Mastodoni kaudu.",
   "compose_form.hashtag_warning": "See postitus ei ilmu ühegi märksõna all, kuna pole avalik. Vaid avalikud postitused on märksõnade kaudu leitavad.",
   "compose_form.lock_disclaimer": "Su konto ei ole {locked}. Igaüks saab sind jälgida, et näha su ainult-jälgijatele postitusi.",
   "compose_form.lock_disclaimer.lock": "lukus",
   "compose_form.placeholder": "Millest mõtled?",
   "compose_form.poll.duration": "Küsitluse kestus",
-  "compose_form.poll.multiple": "Valikvastustega",
+  "compose_form.poll.multiple": "Mitu vastust",
   "compose_form.poll.option_placeholder": "Valik {number}",
   "compose_form.poll.single": "Vali üks",
   "compose_form.poll.switch_to_multiple": "Muuda küsitlust mitmikvaliku lubamiseks",
@@ -297,6 +297,7 @@
   "filter_modal.select_filter.subtitle": "Kasuta olemasolevat kategooriat või loo uus",
   "filter_modal.select_filter.title": "Filtreeri seda postitust",
   "filter_modal.title.status": "Postituse filtreerimine",
+  "filtered_notifications_banner.mentions": "{count, plural, one {mainimine} other {mainimist}}",
   "filtered_notifications_banner.pending_requests": "Teateid {count, plural, =0 {mitte üheltki} one {ühelt} other {#}} inimeselt, keda võid teada",
   "filtered_notifications_banner.title": "Filtreeritud teavitused",
   "firehose.all": "Kõik",
@@ -305,15 +306,19 @@
   "follow_request.authorize": "Autoriseeri",
   "follow_request.reject": "Hülga",
   "follow_requests.unlocked_explanation": "Kuigi su konto pole lukustatud, soovitab {domain} personal siiski nende kontode jälgimistaotlused käsitsi üle vaadata.",
-  "follow_suggestions.curated_suggestion": "Teiste valitud",
+  "follow_suggestions.curated_suggestion": "Meeskonna valitud",
   "follow_suggestions.dismiss": "Ära enam näita",
-  "follow_suggestions.hints.featured": "Selle kasutajaprofiili on soovitanud {domain} kasutajad.",
-  "follow_suggestions.hints.friends_of_friends": "See kasutajaprofiil on jälgitavate seas populaarne.",
+  "follow_suggestions.featured_longer": "Käsitsi valitud {domain} meeskonna poolt",
+  "follow_suggestions.friends_of_friends_longer": "Populaarne inimeste hulgas, keda jälgid",
+  "follow_suggestions.hints.featured": "Selle kasutajaprofiili on soovitanud {domain} meeskond.",
+  "follow_suggestions.hints.friends_of_friends": "See kasutajaprofiil on sinu jälgitavate seas populaarne.",
   "follow_suggestions.hints.most_followed": "See on {domain} enim jälgitud kasutajaprofiil.",
-  "follow_suggestions.hints.most_interactions": "See on {domain} viimasel ajal enim tähelepanu saanud kasutajaprofiil.",
+  "follow_suggestions.hints.most_interactions": "See kasutajaprofiil on viimasel ajal {domain} saanud palju tähelepanu.",
   "follow_suggestions.hints.similar_to_recently_followed": "See kasutajaprofiil sarnaneb neile, mida oled hiljuti jälgima asunud.",
   "follow_suggestions.personalized_suggestion": "Isikupärastatud soovitus",
   "follow_suggestions.popular_suggestion": "Popuplaarne soovitus",
+  "follow_suggestions.popular_suggestion_longer": "Populaarne kohas {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Sarnane profiilile, mida hiljuti jälgima hakkasid",
   "follow_suggestions.view_all": "Vaata kõiki",
   "follow_suggestions.who_to_follow": "Keda jälgida",
   "followed_tags": "Jälgitavad märksõnad",
@@ -409,6 +414,8 @@
   "limited_account_hint.action": "Näita profilli sellegipoolest",
   "limited_account_hint.title": "See profiil on peidetud {domain} moderaatorite poolt.",
   "link_preview.author": "{name} poolt",
+  "link_preview.more_from_author": "Veel kasutajalt {name}",
+  "link_preview.shares": "{count, plural, one {{counter} postitus} other {{counter} postitust}}",
   "lists.account.add": "Lisa nimekirja",
   "lists.account.remove": "Eemalda nimekirjast",
   "lists.delete": "Kustuta nimekiri",
@@ -468,13 +475,22 @@
   "notification.follow": "{name} alustas su jälgimist",
   "notification.follow_request": "{name} soovib sind jälgida",
   "notification.mention": "{name} mainis sind",
+  "notification.moderation-warning.learn_more": "Vaata lisa",
+  "notification.moderation_warning": "Said modereerimise hoiatuse",
+  "notification.moderation_warning.action_delete_statuses": "Mõni su postitus on eemaldatud.",
+  "notification.moderation_warning.action_disable": "Su konto on keelatud.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Mõni su postitustest on märgitud kui tundlik.",
+  "notification.moderation_warning.action_none": "Su konto on saanud modereerimise hoiatuse.",
+  "notification.moderation_warning.action_sensitive": "Su postitused märgitakse nüüdsest tundlikuks.",
+  "notification.moderation_warning.action_silence": "Su kontole pandi piirang.",
+  "notification.moderation_warning.action_suspend": "Su konto on peatatud.",
   "notification.own_poll": "Su küsitlus on lõppenud",
   "notification.poll": "Küsitlus, milles osalesid, on lõppenud",
   "notification.reblog": "{name} jagas edasi postitust",
   "notification.relationships_severance_event": "Kadunud ühendus kasutajaga {name}",
   "notification.relationships_severance_event.account_suspension": "{from} admin on kustutanud {target}, mis tähendab, et sa ei saa enam neilt uuendusi või suhelda nendega.",
   "notification.relationships_severance_event.domain_block": "{from} admin on blokeerinud {target}, sealhulgas {followersCount} sinu jälgijat ja {followingCount, plural, one  {# konto} other {# kontot}}, mida jälgid.",
-  "notification.relationships_severance_event.learn_more": "Saa rohkem teada",
+  "notification.relationships_severance_event.learn_more": "Vaata lisa",
   "notification.relationships_severance_event.user_domain_block": "Blokeerisid {target}, eemaldades oma jälgijate hulgast {followersCount} ja jälgitavate hulgast {followingCount, plural, one {# konto} other {# kontot}}.",
   "notification.status": "{name} just postitas",
   "notification.update": "{name} muutis postitust",
@@ -680,8 +696,11 @@
   "server_banner.about_active_users": "Inimesed, kes kasutavad seda serverit viimase 30 päeva jooksul (kuu aktiivsed kasutajad)",
   "server_banner.active_users": "aktiivsed kasutajad",
   "server_banner.administered_by": "Administraator:",
+  "server_banner.is_one_of_many": "{domain} on üks paljudest sõltumatutest Mastodoni serveritest, mida saab fediversumis osalemiseks kasutada.",
   "server_banner.server_stats": "Serveri statistika:",
   "sign_in_banner.create_account": "Loo konto",
+  "sign_in_banner.follow_anyone": "Jälgi ükskõik keda kogu fediversumist ja näe kõike ajalises järjestuses. Ei mingeid algoritme, reklaame või klikipüüdjaid segamas.",
+  "sign_in_banner.mastodon_is": "Mastodon on parim viis olemaks kursis sellega, mis toimub.",
   "sign_in_banner.sign_in": "Logi sisse",
   "sign_in_banner.sso_redirect": "Sisene või registreeru",
   "status.admin_account": "Ava @{name} moderaatorivaates",
diff --git a/app/javascript/mastodon/locales/ia.json b/app/javascript/mastodon/locales/ia.json
index 72bbe606fa679f..53cc9385924110 100644
--- a/app/javascript/mastodon/locales/ia.json
+++ b/app/javascript/mastodon/locales/ia.json
@@ -696,8 +696,10 @@
   "server_banner.about_active_users": "Personas que ha usate iste servitor in le ultime 30 dies (usatores active per mense)",
   "server_banner.active_users": "usatores active",
   "server_banner.administered_by": "Administrate per:",
+  "server_banner.is_one_of_many": "{domain} es un de multe servitores independente de Mastodon que tu pote usar pro participar in le fediverso.",
   "server_banner.server_stats": "Statos del servitor:",
   "sign_in_banner.create_account": "Crear un conto",
+  "sign_in_banner.mastodon_is": "Mastodon es le melior maniera de sequer lo que passa.",
   "sign_in_banner.sign_in": "Aperir session",
   "sign_in_banner.sso_redirect": "Aperir session o crear conto",
   "status.admin_account": "Aperir le interfacie de moderation pro @{name}",
diff --git a/config/locales/doorkeeper.et.yml b/config/locales/doorkeeper.et.yml
index 1843031706a085..13d3f40fea5e2b 100644
--- a/config/locales/doorkeeper.et.yml
+++ b/config/locales/doorkeeper.et.yml
@@ -135,6 +135,7 @@ et:
         media: Lisatud meedia
         mutes: Vaigistused
         notifications: Teavitused
+        profile: Sinu Mastodoni profiil
         push: Tõuketeated
         reports: Teavitused
         search: Otsing
@@ -165,6 +166,7 @@ et:
       admin:write:reports: teostada moderaatori tegevusi teavitustel
       crypto: kasuta otspunktkrüpeerimist
       follow: muuta kontode suhteid
+      profile: loe vaid oma konto profiili infot
       push: saab tõuketeateid
       read: lugeda konto kõiki andmeid
       read:accounts: näha konto informatsiooni
diff --git a/config/locales/et.yml b/config/locales/et.yml
index 172aad25b93ea6..30d75d25ee4944 100644
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -285,6 +285,7 @@ et:
         update_custom_emoji_html: "%{name} uuendas emotikoni %{target}"
         update_domain_block_html: "%{name} uuendas domeeni %{target} keeldu"
         update_ip_block_html: "%{name} muutis IP-aadressi %{target} reeglit"
+        update_report_html: "%{name} uuendas raportit %{target}"
         update_status_html: "%{name} muutis %{target} postitust"
         update_user_role_html: "%{name} muutis %{target} rolli"
       deleted_account: kustutatud konto
@@ -292,6 +293,7 @@ et:
       filter_by_action: Filtreeri tegevuse järgi
       filter_by_user: Filtreeri kasutaja järgi
       title: Auditilogi
+      unavailable_instance: "(domeeni nimi pole saadaval)"
     announcements:
       destroyed_msg: Teadaande kustutamine õnnestus!
       edit:
@@ -751,6 +753,7 @@ et:
         desc_html: See tugineb välistele hCaptcha skriptidele, mis võib olla turvalisuse ja privaatsuse probleem. Lisaks <strong>võib see muuta registreerimisprotsessi mõnede inimeste (eriti puudega inimeste) jaoks, oluliselt vähem ligipääsetavaks.</strong> Neil põhjustel kaalu palun teisi võimalusi, näiteks kinnitamis- või kutsepõhiseid registreerimislahendusi.
         title: Nõua uutelt kasutajatelt konto kinnitamiseks CAPTCHA lahendamist
       content_retention:
+        danger_zone: Ohutsoon
         preamble: Määra, kuidas kasutajate loodud sisu Mastodonis talletatakse.
         title: Sisu talletamine
       default_noindex:
@@ -770,7 +773,7 @@ et:
         disabled: Mitte kellelegi
         users: Sisseloginud kohalikele kasutajatele
       registrations:
-        moderation_recommandation: Enne registreeringute avamist kõigile veendu, et oleks olemas adekvaatne ja reageerimisvalmis modereerijaskond!
+        moderation_recommandation: Enne kõigi jaoks registreerimise avamist veendu, et oleks olemas adekvaatne ja reageerimisvalmis modereerijaskond!
         preamble: Kes saab serveril konto luua.
         title: Registreerimised
       registrations_mode:
@@ -791,7 +794,7 @@ et:
     software_updates:
       critical_update: Kriitiline — uuenda kiiresti
       description: On soovitav hoida oma Mastodoni paigaldus kõige uuemal kujul, et saada kasu kõige värskematest parandustest ja oskustest. Lisaks, vahel on Mastodoni kiire uuendamine kriitiline, et vältida turvaprobleeme. Neil põhjustel kontrollib Mastodon uuendusi iga 30 minuti tagant ja teavitab sind vastavalt su e-posti teavituste eelistustele.
-      documentation_link: Saa rohkem teada
+      documentation_link: Vaata lisa
       release_notes: Väljalaskemärkused
       title: Saadaval uuendused
       type: Tüüp
@@ -949,6 +952,7 @@ et:
       delete: Kustuta
       edit_preset: Hoiatuse eelseadistuse muutmine
       empty: Hoiatuste eelseadeid pole defineeritud.
+      title: Hoiatuste eelhäälestused
     webhooks:
       add_new: Lisa lõpp-punkt
       delete: Kustuta
@@ -1814,8 +1818,8 @@ et:
       title: Arhiivi väljavõte
     failed_2fa:
       details: 'Sisenemise üksikasjad:'
-      explanation: Keegi püüdis Su kontole siseneda, ent sisestas vale teisese autentimisfaktori.
-      further_actions_html: Kui see polnud Sina, siis soovitame viivitamata %{action}, kuna see võib olla lekkinud.
+      explanation: Keegi püüdis Su kontole siseneda, ent sisestas vale kaheastmelise autentimise faktori.
+      further_actions_html: Kui see polnud Sina, siis soovitame viivitamata %{action}, kuna see võib olla ohus.
       subject: Kaheastmelise autentimise nurjumine
       title: Kaheastmeline autentimine nurjus
     suspicious_sign_in:
@@ -1857,9 +1861,9 @@ et:
         silence: Konto limiteeritud
         suspend: Konto kustutatud
     welcome:
-      apps_android_action: Google Play poest
+      apps_android_action: Laadi see Google Playst
       apps_ios_action: Allalaadimine App Store'ist
-      apps_step: Meie ametlikud rakendused.
+      apps_step: Laadi meie ametlikud rakendused.
       apps_title: Mastodoni rakendused
       checklist_subtitle: 'Kuidas sel uudsel sotsiaalmeediarindel pihta hakata:'
       checklist_title: Millest alustada
@@ -1872,7 +1876,7 @@ et:
       feature_audience_title: Kogu enesekindlalt jälgijaid
       feature_control: Tead ise kõige paremini, mida soovid oma koduvoos näha. Ei aega raiskavaid algoritme ega reklaame. Jälgi ühe kasutajakonto kaudu keda iganes mistahes Mastodoni serveris ja näe postitusi ajalises järjestuses, muutes oma nurgakese Internetist rohkem endale meelepärasemaks.
       feature_control_title: Säilita oma ajajoone üle kontroll
-      feature_creativity: Mastodon toetab audiot, video- ja pildipostitusi, liigipääsetavuse kirjeldusi, küsitlusi, sisuhoiatusi, animeeritud avatare, kohandatud emotikone, pisipiltide lõikeeelistusi ja enamatki, et end võrgus väljendada. Kas avaldad kunsti, muusikat või taskuhäälingusaadet, Mastodon on mõeldud Sinu jaoks.
+      feature_creativity: Mastodon toetab audiot, video- ja pildipostitusi, ligipääsetavuse kirjeldusi, küsitlusi, sisuhoiatusi, animeeritud avatare, kohandatud emotikone, pisipiltide lõikeeelistusi ja enamatki, et end võrgus väljendada. Kas avaldad kunsti, muusikat või taskuhäälingut, Mastodon on mõeldud Sinu jaoks.
       feature_creativity_title: Võrreldamatu loovus
       feature_moderation: Mastodon annab otsustusõiguse tagasi Sinu kätte. Igal serveril on oma reeglid ja regulatsioonid, mida hallatakse kohapeal, mitte nagu ülalt-alla korporatiivses sotsiaalmeedias, võimaldades enim paindlikku vastavust erinevate vajadustega gruppide ja inimeste eelistustele. Liitu sobivate reeglitega serveriga, või käivita oma server.
       feature_moderation_title: Modereerimine, nagu see olema peab
diff --git a/config/locales/simple_form.et.yml b/config/locales/simple_form.et.yml
index b2ad4c51cfc714..4dd74e68a365c7 100644
--- a/config/locales/simple_form.et.yml
+++ b/config/locales/simple_form.et.yml
@@ -77,10 +77,15 @@ et:
           warn: Varja filtreeritud sisu hoiatusega, nimetades filtri pealkirja
       form_admin_settings:
         activity_api_enabled: Kohalike postituste, aktiivsete kasutajate ja uute registreerumistr arv nädala kaupa grupeeritult
+        app_icon: WEBP, PNG, GIF või JPG. Asendab mobiilsel seadmel äpi vaikeikooni kohandatud ikooniga.
+        backups_retention_period: Kasutajatel on võimalus genereerida oma postitustest hiljem allalaaditav arhiiv. Kui määrata positiivne arv, kustutatakse serveri talletusruumist need arhiivid määratud arvu päevade järel automaatselt.
         bootstrap_timeline_accounts: Need kasutajad kinnitatakse uute kasutajate jälgimissoovituste esiritta.
         closed_registrations_message: Kuvatakse, kui liitumised pole võimalikud
-        custom_css: Kohandatud stiile on võimalik kasutada Mastodoni veebiliideses.
+        content_cache_retention_period: Kõik teiste serverite postitused (sealhulgas jagamised ja vastused) kustutatakse pärast määratud arvu päevade möödumist, sõltumata, kuidas kohalik kasutaja on nende postitustega interakteerunud. Hõlmatud on ka postitused, mille kohalik kasutaja on märkinud järjehoidjaks või lemmikuks. Ka eri instantside kasutajate vahelised privaatsed mainimised kaovad ja neid on võimatu taastada. See seadistus on mõeldud eriotstarbeliste instantside jaoks ja rikub paljude kasutajate ootusi, kui seda rakendatakse üldotstarbelise kasutuse puhul.
+        custom_css: Mastodoni veebiliideses on võimalik kasutada kohandatud stiile.
+        favicon: WEBP, PNG, GIF või JPG. Asendab Mastodoni vaike- favicon ikooni kohandatud ikooniga.
         mascot: Asendab kohandatud veebiliidese illustratsiooni.
+        media_cache_retention_period: Kaugkasutajate tehtud postituste meediafailid salvestatakse teie serveri vahemällu. Kui see seadistus on seatud positiivsele väärtusele, kustutatakse meediumifailid määratud päevade möödumisel. Kui meediaandmeid küsitakse pärast nende kustutamist, laaditakse need uuesti alla, kui lähtesisu on veel saadaval. Kuna on olemas piirangud, kui tihti tohivad lingikaardid kolmandatelt saitidelt andmeid pärida, on soovitatav määrata väärtuseks vähemalt 14. Vastasel juhul ei uuendata linkide eelvaatekaarte nõudmise korral enne seda aega.
         peers_api_enabled: Domeeninimede loetelu, mida see server on Fediversumis kohanud. Mitte mingeid andmeid selle serveri födereerumise kohta antud serverite pole, vaid üksnes info, et sellest serverist ollakse teadlik. Seda kasutavad teenused, mis koguvad üldist födereerumise statistikat.
         profile_directory: Kasutajate kataloog kuvab nimekirja kasutajatest, kes on seda lubanud.
         require_invite_text: Kui liitumisi on tarvis kinnitada, oleks "Miks soovid liituda?" vastus vajalik
@@ -240,6 +245,7 @@ et:
         backups_retention_period: Kasutajate arhiivi talletusperiood
         bootstrap_timeline_accounts: Alati soovita neid kontosid uutele kasutajatele
         closed_registrations_message: Kohandatud teade, kui liitumine pole võimalik
+        content_cache_retention_period: Kaugsisu säilitamise aeg
         custom_css: Kohandatud CSS
         mascot: Kohandatud maskott (kunagine)
         media_cache_retention_period: Meediapuhvri talletusperiood
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 8b24a267c17075..467356d65adfab 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -1791,8 +1791,8 @@ vi:
     suspicious_sign_in:
       change_password: đổi mật khẩu của bạn
       details: 'Chi tiết thông tin đăng nhập:'
-      explanation: Chúng tôi phát hiện lần đăng nhập bất thường tài khoản của bạn từ một địa chỉ IP mới.
-      further_actions_html: Nếu đó không phải là bạn, chúng tôi khuyến nghị %{action} lập tức và bật xác minh hai bước để giữ tài khoản được an toàn.
+      explanation: Chúng tôi phát hiện tài khoản của bạn đăng nhập bất thường từ một địa chỉ IP mới.
+      further_actions_html: Nếu đây không phải là bạn, hãy %{action} lập tức và bật xác minh hai bước để giữ tài khoản được an toàn.
       subject: Đăng nhập tài khoản từ địa chỉ IP mới
       title: Lần đăng nhập mới
     warning:

From d558dfd77dc4f64d3a633efcfc0683ee603a1520 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Tue, 18 Jun 2024 15:23:30 +0200
Subject: [PATCH 1332/2191] Convert notifications policies frontend code to
 Typescript (#29868)

---
 .../mastodon/actions/notification_policies.ts | 16 +++++
 .../mastodon/actions/notifications.js         | 38 -----------
 .../mastodon/api/notification_policies.ts     | 10 +++
 .../api_types/notification_policies.ts        | 12 ++++
 .../components/column_settings.jsx            | 10 +--
 .../filtered_notifications_banner.jsx         | 49 -------------
 .../filtered_notifications_banner.tsx         | 68 +++++++++++++++++++
 .../containers/column_settings_container.js   |  8 ++-
 .../mastodon/models/notification_policy.ts    |  3 +
 .../mastodon/reducers/notification_policy.js  | 12 ----
 .../mastodon/reducers/notification_policy.ts  | 18 +++++
 .../rest/notification_policy_serializer.rb    |  2 +
 12 files changed, 140 insertions(+), 106 deletions(-)
 create mode 100644 app/javascript/mastodon/actions/notification_policies.ts
 create mode 100644 app/javascript/mastodon/api/notification_policies.ts
 create mode 100644 app/javascript/mastodon/api_types/notification_policies.ts
 delete mode 100644 app/javascript/mastodon/features/notifications/components/filtered_notifications_banner.jsx
 create mode 100644 app/javascript/mastodon/features/notifications/components/filtered_notifications_banner.tsx
 create mode 100644 app/javascript/mastodon/models/notification_policy.ts
 delete mode 100644 app/javascript/mastodon/reducers/notification_policy.js
 create mode 100644 app/javascript/mastodon/reducers/notification_policy.ts

diff --git a/app/javascript/mastodon/actions/notification_policies.ts b/app/javascript/mastodon/actions/notification_policies.ts
new file mode 100644
index 00000000000000..fcc9919c499f47
--- /dev/null
+++ b/app/javascript/mastodon/actions/notification_policies.ts
@@ -0,0 +1,16 @@
+import {
+  apiGetNotificationPolicy,
+  apiUpdateNotificationsPolicy,
+} from 'mastodon/api/notification_policies';
+import type { NotificationPolicy } from 'mastodon/models/notification_policy';
+import { createDataLoadingThunk } from 'mastodon/store/typed_functions';
+
+export const fetchNotificationPolicy = createDataLoadingThunk(
+  'notificationPolicy/fetch',
+  () => apiGetNotificationPolicy(),
+);
+
+export const updateNotificationsPolicy = createDataLoadingThunk(
+  'notificationPolicy/update',
+  (policy: Partial<NotificationPolicy>) => apiUpdateNotificationsPolicy(policy),
+);
diff --git a/app/javascript/mastodon/actions/notifications.js b/app/javascript/mastodon/actions/notifications.js
index fe728aa26ee7fc..6a59d5624e80c4 100644
--- a/app/javascript/mastodon/actions/notifications.js
+++ b/app/javascript/mastodon/actions/notifications.js
@@ -44,10 +44,6 @@ export const NOTIFICATIONS_MARK_AS_READ = 'NOTIFICATIONS_MARK_AS_READ';
 export const NOTIFICATIONS_SET_BROWSER_SUPPORT    = 'NOTIFICATIONS_SET_BROWSER_SUPPORT';
 export const NOTIFICATIONS_SET_BROWSER_PERMISSION = 'NOTIFICATIONS_SET_BROWSER_PERMISSION';
 
-export const NOTIFICATION_POLICY_FETCH_REQUEST = 'NOTIFICATION_POLICY_FETCH_REQUEST';
-export const NOTIFICATION_POLICY_FETCH_SUCCESS = 'NOTIFICATION_POLICY_FETCH_SUCCESS';
-export const NOTIFICATION_POLICY_FETCH_FAIL    = 'NOTIFICATION_POLICY_FETCH_FAIL';
-
 export const NOTIFICATION_REQUESTS_FETCH_REQUEST = 'NOTIFICATION_REQUESTS_FETCH_REQUEST';
 export const NOTIFICATION_REQUESTS_FETCH_SUCCESS = 'NOTIFICATION_REQUESTS_FETCH_SUCCESS';
 export const NOTIFICATION_REQUESTS_FETCH_FAIL    = 'NOTIFICATION_REQUESTS_FETCH_FAIL';
@@ -346,40 +342,6 @@ export function setBrowserPermission (value) {
   };
 }
 
-export const fetchNotificationPolicy = () => (dispatch) => {
-  dispatch(fetchNotificationPolicyRequest());
-
-  api().get('/api/v1/notifications/policy').then(({ data }) => {
-    dispatch(fetchNotificationPolicySuccess(data));
-  }).catch(err => {
-    dispatch(fetchNotificationPolicyFail(err));
-  });
-};
-
-export const fetchNotificationPolicyRequest = () => ({
-  type: NOTIFICATION_POLICY_FETCH_REQUEST,
-});
-
-export const fetchNotificationPolicySuccess = policy => ({
-  type: NOTIFICATION_POLICY_FETCH_SUCCESS,
-  policy,
-});
-
-export const fetchNotificationPolicyFail = error => ({
-  type: NOTIFICATION_POLICY_FETCH_FAIL,
-  error,
-});
-
-export const updateNotificationsPolicy = params => (dispatch) => {
-  dispatch(fetchNotificationPolicyRequest());
-
-  api().put('/api/v1/notifications/policy', params).then(({ data }) => {
-    dispatch(fetchNotificationPolicySuccess(data));
-  }).catch(err => {
-    dispatch(fetchNotificationPolicyFail(err));
-  });
-};
-
 export const fetchNotificationRequests = () => (dispatch, getState) => {
   const params = {};
 
diff --git a/app/javascript/mastodon/api/notification_policies.ts b/app/javascript/mastodon/api/notification_policies.ts
new file mode 100644
index 00000000000000..b2a1e5ac31f72a
--- /dev/null
+++ b/app/javascript/mastodon/api/notification_policies.ts
@@ -0,0 +1,10 @@
+import { apiRequest } from 'mastodon/api';
+import type { NotificationPolicyJSON } from 'mastodon/api_types/notification_policies';
+
+export const apiGetNotificationPolicy = () =>
+  apiRequest<NotificationPolicyJSON>('GET', '/v1/notifications/policy');
+
+export const apiUpdateNotificationsPolicy = (
+  policy: Partial<NotificationPolicyJSON>,
+) =>
+  apiRequest<NotificationPolicyJSON>('PUT', '/v1/notifications/policy', policy);
diff --git a/app/javascript/mastodon/api_types/notification_policies.ts b/app/javascript/mastodon/api_types/notification_policies.ts
new file mode 100644
index 00000000000000..0f4a2d132e0e0e
--- /dev/null
+++ b/app/javascript/mastodon/api_types/notification_policies.ts
@@ -0,0 +1,12 @@
+// See app/serializers/rest/notification_policy_serializer.rb
+
+export interface NotificationPolicyJSON {
+  filter_not_following: boolean;
+  filter_not_followers: boolean;
+  filter_new_accounts: boolean;
+  filter_private_mentions: boolean;
+  summary: {
+    pending_requests_count: number;
+    pending_notifications_count: number;
+  };
+}
diff --git a/app/javascript/mastodon/features/notifications/components/column_settings.jsx b/app/javascript/mastodon/features/notifications/components/column_settings.jsx
index e375b856c92e70..39e394e449c176 100644
--- a/app/javascript/mastodon/features/notifications/components/column_settings.jsx
+++ b/app/javascript/mastodon/features/notifications/components/column_settings.jsx
@@ -24,7 +24,7 @@ class ColumnSettings extends PureComponent {
     alertsEnabled: PropTypes.bool,
     browserSupport: PropTypes.bool,
     browserPermission: PropTypes.string,
-    notificationPolicy: ImmutablePropTypes.map,
+    notificationPolicy: PropTypes.object.isRequired,
     onChangePolicy: PropTypes.func.isRequired,
   };
 
@@ -82,22 +82,22 @@ class ColumnSettings extends PureComponent {
           <h3><FormattedMessage id='notifications.policy.title' defaultMessage='Filter out notifications from…' /></h3>
 
           <div className='column-settings__row'>
-            <CheckboxWithLabel checked={notificationPolicy.get('filter_not_following')} onChange={this.handleFilterNotFollowing}>
+            <CheckboxWithLabel checked={notificationPolicy.filter_not_following} onChange={this.handleFilterNotFollowing}>
               <strong><FormattedMessage id='notifications.policy.filter_not_following_title' defaultMessage="People you don't follow" /></strong>
               <span className='hint'><FormattedMessage id='notifications.policy.filter_not_following_hint' defaultMessage='Until you manually approve them' /></span>
             </CheckboxWithLabel>
 
-            <CheckboxWithLabel checked={notificationPolicy.get('filter_not_followers')} onChange={this.handleFilterNotFollowers}>
+            <CheckboxWithLabel checked={notificationPolicy.filter_not_followers} onChange={this.handleFilterNotFollowers}>
               <strong><FormattedMessage id='notifications.policy.filter_not_followers_title' defaultMessage='People not following you' /></strong>
               <span className='hint'><FormattedMessage id='notifications.policy.filter_not_followers_hint' defaultMessage='Including people who have been following you fewer than {days, plural, one {one day} other {# days}}' values={{ days: 3 }} /></span>
             </CheckboxWithLabel>
 
-            <CheckboxWithLabel checked={notificationPolicy.get('filter_new_accounts')} onChange={this.handleFilterNewAccounts}>
+            <CheckboxWithLabel checked={notificationPolicy.filter_new_accounts} onChange={this.handleFilterNewAccounts}>
               <strong><FormattedMessage id='notifications.policy.filter_new_accounts_title' defaultMessage='New accounts' /></strong>
               <span className='hint'><FormattedMessage id='notifications.policy.filter_new_accounts.hint' defaultMessage='Created within the past {days, plural, one {one day} other {# days}}' values={{ days: 30 }} /></span>
             </CheckboxWithLabel>
 
-            <CheckboxWithLabel checked={notificationPolicy.get('filter_private_mentions')} onChange={this.handleFilterPrivateMentions}>
+            <CheckboxWithLabel checked={notificationPolicy.filter_private_mentions} onChange={this.handleFilterPrivateMentions}>
               <strong><FormattedMessage id='notifications.policy.filter_private_mentions_title' defaultMessage='Unsolicited private mentions' /></strong>
               <span className='hint'><FormattedMessage id='notifications.policy.filter_private_mentions_hint' defaultMessage="Filtered unless it's in reply to your own mention or if you follow the sender" /></span>
             </CheckboxWithLabel>
diff --git a/app/javascript/mastodon/features/notifications/components/filtered_notifications_banner.jsx b/app/javascript/mastodon/features/notifications/components/filtered_notifications_banner.jsx
deleted file mode 100644
index 56da7ba62629c4..00000000000000
--- a/app/javascript/mastodon/features/notifications/components/filtered_notifications_banner.jsx
+++ /dev/null
@@ -1,49 +0,0 @@
-import { useEffect } from 'react';
-
-import { FormattedMessage } from 'react-intl';
-
-import { Link } from 'react-router-dom';
-
-import { useDispatch, useSelector } from 'react-redux';
-
-import InventoryIcon from '@/material-icons/400-24px/inventory_2.svg?react';
-import { fetchNotificationPolicy } from 'mastodon/actions/notifications';
-import { Icon } from 'mastodon/components/icon';
-import { toCappedNumber } from 'mastodon/utils/numbers';
-
-export const FilteredNotificationsBanner = () => {
-  const dispatch = useDispatch();
-  const policy = useSelector(state => state.get('notificationPolicy'));
-
-  useEffect(() => {
-    dispatch(fetchNotificationPolicy());
-
-    const interval = setInterval(() => {
-      dispatch(fetchNotificationPolicy());
-    }, 120000);
-
-    return () => {
-      clearInterval(interval);
-    };
-  }, [dispatch]);
-
-  if (policy === null || policy.getIn(['summary', 'pending_notifications_count']) === 0) {
-    return null;
-  }
-
-  return (
-    <Link className='filtered-notifications-banner' to='/notifications/requests'>
-      <Icon icon={InventoryIcon} />
-
-      <div className='filtered-notifications-banner__text'>
-        <strong><FormattedMessage id='filtered_notifications_banner.title' defaultMessage='Filtered notifications' /></strong>
-        <span><FormattedMessage id='filtered_notifications_banner.pending_requests' defaultMessage='Notifications from {count, plural, =0 {no one} one {one person} other {# people}} you may know' values={{ count: policy.getIn(['summary', 'pending_requests_count']) }} /></span>
-      </div>
-
-      <div className='filtered-notifications-banner__badge'>
-        <div className='filtered-notifications-banner__badge__badge'>{toCappedNumber(policy.getIn(['summary', 'pending_notifications_count']))}</div>
-        <FormattedMessage id='filtered_notifications_banner.mentions' defaultMessage='{count, plural, one {mention} other {mentions}}' values={{ count: policy.getIn(['summary', 'pending_notifications_count']) }} />
-      </div>
-    </Link>
-  );
-};
diff --git a/app/javascript/mastodon/features/notifications/components/filtered_notifications_banner.tsx b/app/javascript/mastodon/features/notifications/components/filtered_notifications_banner.tsx
new file mode 100644
index 00000000000000..2c4b3b971752d9
--- /dev/null
+++ b/app/javascript/mastodon/features/notifications/components/filtered_notifications_banner.tsx
@@ -0,0 +1,68 @@
+import { useEffect } from 'react';
+
+import { FormattedMessage } from 'react-intl';
+
+import { Link } from 'react-router-dom';
+
+import InventoryIcon from '@/material-icons/400-24px/inventory_2.svg?react';
+import { fetchNotificationPolicy } from 'mastodon/actions/notification_policies';
+import { Icon } from 'mastodon/components/icon';
+import { useAppSelector, useAppDispatch } from 'mastodon/store';
+import { toCappedNumber } from 'mastodon/utils/numbers';
+
+export const FilteredNotificationsBanner: React.FC = () => {
+  const dispatch = useAppDispatch();
+  const policy = useAppSelector((state) => state.notificationPolicy);
+
+  useEffect(() => {
+    void dispatch(fetchNotificationPolicy());
+
+    const interval = setInterval(() => {
+      void dispatch(fetchNotificationPolicy());
+    }, 120000);
+
+    return () => {
+      clearInterval(interval);
+    };
+  }, [dispatch]);
+
+  if (policy === null || policy.summary.pending_notifications_count === 0) {
+    return null;
+  }
+
+  return (
+    <Link
+      className='filtered-notifications-banner'
+      to='/notifications/requests'
+    >
+      <Icon icon={InventoryIcon} id='filtered-notifications' />
+
+      <div className='filtered-notifications-banner__text'>
+        <strong>
+          <FormattedMessage
+            id='filtered_notifications_banner.title'
+            defaultMessage='Filtered notifications'
+          />
+        </strong>
+        <span>
+          <FormattedMessage
+            id='filtered_notifications_banner.pending_requests'
+            defaultMessage='Notifications from {count, plural, =0 {no one} one {one person} other {# people}} you may know'
+            values={{ count: policy.summary.pending_requests_count }}
+          />
+        </span>
+      </div>
+
+      <div className='filtered-notifications-banner__badge'>
+        <div className='filtered-notifications-banner__badge__badge'>
+          {toCappedNumber(policy.summary.pending_notifications_count)}
+        </div>
+        <FormattedMessage
+          id='filtered_notifications_banner.mentions'
+          defaultMessage='{count, plural, one {mention} other {mentions}}'
+          values={{ count: policy.summary.pending_notifications_count }}
+        />
+      </div>
+    </Link>
+  );
+};
diff --git a/app/javascript/mastodon/features/notifications/containers/column_settings_container.js b/app/javascript/mastodon/features/notifications/containers/column_settings_container.js
index de266160f8511c..94383d0bb57ce2 100644
--- a/app/javascript/mastodon/features/notifications/containers/column_settings_container.js
+++ b/app/javascript/mastodon/features/notifications/containers/column_settings_container.js
@@ -4,7 +4,8 @@ import { connect } from 'react-redux';
 
 import { showAlert } from '../../../actions/alerts';
 import { openModal } from '../../../actions/modal';
-import { setFilter, clearNotifications, requestBrowserPermission, updateNotificationsPolicy } from '../../../actions/notifications';
+import { updateNotificationsPolicy } from '../../../actions/notification_policies';
+import { setFilter, clearNotifications, requestBrowserPermission } from '../../../actions/notifications';
 import { changeAlerts as changePushNotifications } from '../../../actions/push_notifications';
 import { changeSetting } from '../../../actions/settings';
 import ColumnSettings from '../components/column_settings';
@@ -15,13 +16,16 @@ const messages = defineMessages({
   permissionDenied: { id: 'notifications.permission_denied_alert', defaultMessage: 'Desktop notifications can\'t be enabled, as browser permission has been denied before' },
 });
 
+/**
+ * @param {import('mastodon/store').RootState} state
+ */
 const mapStateToProps = state => ({
   settings: state.getIn(['settings', 'notifications']),
   pushSettings: state.get('push_notifications'),
   alertsEnabled: state.getIn(['settings', 'notifications', 'alerts']).includes(true),
   browserSupport: state.getIn(['notifications', 'browserSupport']),
   browserPermission: state.getIn(['notifications', 'browserPermission']),
-  notificationPolicy: state.get('notificationPolicy'),
+  notificationPolicy: state.notificationPolicy,
 });
 
 const mapDispatchToProps = (dispatch, { intl }) => ({
diff --git a/app/javascript/mastodon/models/notification_policy.ts b/app/javascript/mastodon/models/notification_policy.ts
new file mode 100644
index 00000000000000..eb65403292e309
--- /dev/null
+++ b/app/javascript/mastodon/models/notification_policy.ts
@@ -0,0 +1,3 @@
+import type { NotificationPolicyJSON } from 'mastodon/api_types/notification_policies';
+
+export type NotificationPolicy = NotificationPolicyJSON; // No changes from the API type
diff --git a/app/javascript/mastodon/reducers/notification_policy.js b/app/javascript/mastodon/reducers/notification_policy.js
deleted file mode 100644
index 8edb4d12a151ef..00000000000000
--- a/app/javascript/mastodon/reducers/notification_policy.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import { fromJS } from 'immutable';
-
-import { NOTIFICATION_POLICY_FETCH_SUCCESS } from 'mastodon/actions/notifications';
-
-export const notificationPolicyReducer = (state = null, action) => {
-  switch(action.type) {
-  case NOTIFICATION_POLICY_FETCH_SUCCESS:
-    return fromJS(action.policy);
-  default:
-    return state;
-  }
-};
diff --git a/app/javascript/mastodon/reducers/notification_policy.ts b/app/javascript/mastodon/reducers/notification_policy.ts
new file mode 100644
index 00000000000000..ab111066cc3b3e
--- /dev/null
+++ b/app/javascript/mastodon/reducers/notification_policy.ts
@@ -0,0 +1,18 @@
+import { createReducer, isAnyOf } from '@reduxjs/toolkit';
+
+import {
+  fetchNotificationPolicy,
+  updateNotificationsPolicy,
+} from 'mastodon/actions/notification_policies';
+import type { NotificationPolicy } from 'mastodon/models/notification_policy';
+
+export const notificationPolicyReducer =
+  createReducer<NotificationPolicy | null>(null, (builder) => {
+    builder.addMatcher(
+      isAnyOf(
+        fetchNotificationPolicy.fulfilled,
+        updateNotificationsPolicy.fulfilled,
+      ),
+      (_state, action) => action.payload,
+    );
+  });
diff --git a/app/serializers/rest/notification_policy_serializer.rb b/app/serializers/rest/notification_policy_serializer.rb
index a50ba9e66b827f..8bf85250fa590c 100644
--- a/app/serializers/rest/notification_policy_serializer.rb
+++ b/app/serializers/rest/notification_policy_serializer.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class REST::NotificationPolicySerializer < ActiveModel::Serializer
+  # Please update `app/javascript/mastodon/api_types/notification_policies.ts` when making changes to the attributes
+
   attributes :filter_not_following,
              :filter_not_followers,
              :filter_new_accounts,

From d97fcd0cbb394ac5acaf281dbd1575cbd0fcaf2a Mon Sep 17 00:00:00 2001
From: Michael Stanclift <mx@vmstan.com>
Date: Tue, 18 Jun 2024 09:51:51 -0500
Subject: [PATCH 1333/2191] Build ffmpeg from source in Dockerfile (#30569)

---
 Dockerfile | 87 ++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 81 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 61f6095743ff30..c3e43dac8dd7e3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -24,10 +24,10 @@ FROM docker.io/node:${NODE_MAJOR_VERSION}-${DEBIAN_VERSION}-slim as node
 FROM docker.io/ruby:${RUBY_VERSION}-slim-${DEBIAN_VERSION} as ruby
 
 # Resulting version string is vX.X.X-MASTODON_VERSION_PRERELEASE+MASTODON_VERSION_METADATA
-# Example: v4.2.0-nightly.2023.11.09+something
-# Overwrite existence of 'alpha.0' in version.rb [--build-arg MASTODON_VERSION_PRERELEASE="nightly.2023.11.09"]
+# Example: v4.3.0-nightly.2023.11.09+pr-123456
+# Overwrite existence of 'alpha.X' in version.rb [--build-arg MASTODON_VERSION_PRERELEASE="nightly.2023.11.09"]
 ARG MASTODON_VERSION_PRERELEASE=""
-# Append build metadata or fork information to version.rb [--build-arg MASTODON_VERSION_METADATA="pr-12345"]
+# Append build metadata or fork information to version.rb [--build-arg MASTODON_VERSION_METADATA="pr-123456"]
 ARG MASTODON_VERSION_METADATA=""
 
 # Allow Ruby on Rails to serve static files
@@ -100,9 +100,7 @@ RUN \
   apt-get dist-upgrade -yq; \
 # Install jemalloc, curl and other necessary components
   apt-get install -y --no-install-recommends \
-    ca-certificates \
     curl \
-    ffmpeg \
     file \
     libjemalloc2 \
     patchelf \
@@ -137,7 +135,10 @@ RUN \
 --mount=type=cache,id=apt-lib-${TARGETPLATFORM},target=/var/lib/apt,sharing=locked \
 # Install build tools and bundler dependencies from APT
   apt-get install -y --no-install-recommends \
+    autoconf \
+    automake \
     build-essential \
+    cmake \
     git \
     libgdbm-dev \
     libglib2.0-dev \
@@ -146,9 +147,12 @@ RUN \
     libidn-dev \
     libpq-dev \
     libssl-dev \
+    libtool \
     meson \
+    nasm \
     pkg-config \
     shared-mime-info \
+    xz-utils \
 	# libvips components
     libcgif-dev \
     libexif-dev \
@@ -162,6 +166,16 @@ RUN \
     libspng-dev \
     libtiff-dev \
     libwebp-dev \
+  # ffmpeg components
+    libdav1d-dev \
+    liblzma-dev \
+    libmp3lame-dev \
+    libopus-dev \
+    libsnappy-dev \
+    libvorbis-dev \
+    libvpx-dev \
+    libx264-dev \
+    libx265-dev \
   ;
 
 RUN \
@@ -190,6 +204,48 @@ RUN \
   ninja; \
   ninja install;
 
+# Create temporary ffmpeg specific build layer from build layer
+FROM build as ffmpeg
+
+# ffmpeg version to compile, change with [--build-arg FFMPEG_VERSION="7.0.x"]
+# renovate: datasource=repology depName=ffmpeg packageName=openpkg_current/ffmpeg
+ARG FFMPEG_VERSION=7.0.1
+# ffmpeg download URL, change with [--build-arg FFMPEG_URL="https://ffmpeg.org/releases"]
+ARG FFMPEG_URL=https://ffmpeg.org/releases
+
+WORKDIR /usr/local/ffmpeg/src
+
+RUN \
+  curl -sSL -o ffmpeg-${FFMPEG_VERSION}.tar.xz ${FFMPEG_URL}/ffmpeg-${FFMPEG_VERSION}.tar.xz; \
+  tar xf ffmpeg-${FFMPEG_VERSION}.tar.xz; \
+  cd ffmpeg-${FFMPEG_VERSION}; \
+  ./configure \
+    --prefix=/usr/local/ffmpeg \
+    --toolchain=hardened \
+    --disable-debug \
+    --disable-devices \
+    --disable-doc \
+    --disable-ffplay \
+    --disable-network \
+    --disable-static \
+    --enable-ffmpeg \
+    --enable-ffprobe \
+    --enable-gpl \
+    --enable-libdav1d \
+    --enable-libmp3lame \
+    --enable-libopus \
+    --enable-libsnappy \
+    --enable-libvorbis \
+    --enable-libvpx \
+    --enable-libwebp \
+    --enable-libx264 \
+    --enable-libx265 \
+    --enable-shared \
+    --enable-version3 \
+  ; \
+  make -j$(nproc); \
+  make install;
+
 # Create temporary bundler specific build layer from build layer
 FROM build as bundler
 
@@ -289,6 +345,20 @@ RUN \
     libwebp7 \
     libwebpdemux2 \
     libwebpmux3 \
+  # ffmpeg components
+    libdav1d6 \
+    libmp3lame0 \
+    libopencore-amrnb0 \
+    libopencore-amrwb0 \
+    libopus0 \
+    libsnappy1v5 \
+    libtheora0 \
+    libvorbis0a \
+    libvorbisenc2 \
+    libvorbisfile3 \
+    libvpx7 \
+    libx264-164 \
+    libx265-199 \
   ;
 
 # Copy Mastodon sources into final layer
@@ -302,11 +372,16 @@ COPY --from=bundler /usr/local/bundle/ /usr/local/bundle/
 # Copy libvips components to layer
 COPY --from=libvips /usr/local/libvips/bin /usr/local/bin
 COPY --from=libvips /usr/local/libvips/lib /usr/local/lib
+# Copy ffpmeg components to layer
+COPY --from=ffmpeg /usr/local/ffmpeg/bin /usr/local/bin
+COPY --from=ffmpeg /usr/local/ffmpeg/lib /usr/local/lib
 
 RUN \
   ldconfig; \
 # Smoketest media processors
-  vips -v;
+  vips -v; \
+  ffmpeg -version; \
+  ffprobe -version;
 
 RUN \
   # Precompile bootsnap code for faster Rails startup

From 58ace2e45e16a69977267d03874568c11043f04c Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 18 Jun 2024 18:04:58 +0200
Subject: [PATCH 1334/2191] Fix SQL error in admin measures API (#30753)

---
 app/lib/admin/metrics/measure/query_helper.rb |  2 +-
 spec/requests/api/v1/admin/measures_spec.rb   | 21 +++++++++++++++++--
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/app/lib/admin/metrics/measure/query_helper.rb b/app/lib/admin/metrics/measure/query_helper.rb
index 5969a96ba9f17e..47cfc63e5c5fa2 100644
--- a/app/lib/admin/metrics/measure/query_helper.rb
+++ b/app/lib/admin/metrics/measure/query_helper.rb
@@ -18,7 +18,7 @@ def sanitized_sql_string
   def generated_series_days
     Arel.sql(
       <<~SQL.squish
-        SELECT generate_series(timestamp :start_at, :end_at, '1 day')::date AS period
+        SELECT generate_series(:start_at::timestamp, :end_at::timestamp, '1 day')::date AS period
       SQL
     )
   end
diff --git a/spec/requests/api/v1/admin/measures_spec.rb b/spec/requests/api/v1/admin/measures_spec.rb
index 15f2df84c63362..80fed79d9a6720 100644
--- a/spec/requests/api/v1/admin/measures_spec.rb
+++ b/spec/requests/api/v1/admin/measures_spec.rb
@@ -7,11 +7,28 @@
   let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
   let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
   let(:account) { Fabricate(:account) }
+  let(:params) do
+    {
+      keys: %w(instance_accounts instance_follows instance_followers),
+      instance_accounts: {
+        domain: 'mastodon.social',
+        include_subdomains: true,
+      },
+      instance_follows: {
+        domain: 'mastodon.social',
+        include_subdomains: true,
+      },
+      instance_followers: {
+        domain: 'mastodon.social',
+        include_subdomains: true,
+      },
+    }
+  end
 
   describe 'GET /api/v1/admin/measures' do
     context 'when not authorized' do
       it 'returns http forbidden' do
-        post '/api/v1/admin/measures', params: { account_id: account.id, limit: 2 }
+        post '/api/v1/admin/measures', params: params
 
         expect(response)
           .to have_http_status(403)
@@ -22,7 +39,7 @@
       let(:scopes) { 'admin:read' }
 
       it 'returns http success and status json' do
-        post '/api/v1/admin/measures', params: { account_id: account.id, limit: 2 }, headers: headers
+        post '/api/v1/admin/measures', params: params, headers: headers
 
         expect(response)
           .to have_http_status(200)

From af0a1a8774e5a74d48d9c3aff503d93700b4ccd0 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Tue, 18 Jun 2024 15:23:30 +0200
Subject: [PATCH 1335/2191] [Glitch] Convert notifications policies frontend
 code to Typescript

Port d558dfd77dc4f64d3a633efcfc0683ee603a1520 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../glitch/actions/notification_policies.ts   | 16 +++++
 .../flavours/glitch/actions/notifications.js  | 38 -----------
 .../glitch/api/notification_policies.ts       | 10 +++
 .../glitch/api_types/notification_policies.ts | 12 ++++
 .../components/column_settings.jsx            | 10 +--
 .../filtered_notifications_banner.jsx         | 49 -------------
 .../filtered_notifications_banner.tsx         | 68 +++++++++++++++++++
 .../containers/column_settings_container.js   |  8 ++-
 .../glitch/models/notification_policy.ts      |  3 +
 .../glitch/reducers/notification_policy.js    | 12 ----
 .../glitch/reducers/notification_policy.ts    | 18 +++++
 11 files changed, 138 insertions(+), 106 deletions(-)
 create mode 100644 app/javascript/flavours/glitch/actions/notification_policies.ts
 create mode 100644 app/javascript/flavours/glitch/api/notification_policies.ts
 create mode 100644 app/javascript/flavours/glitch/api_types/notification_policies.ts
 delete mode 100644 app/javascript/flavours/glitch/features/notifications/components/filtered_notifications_banner.jsx
 create mode 100644 app/javascript/flavours/glitch/features/notifications/components/filtered_notifications_banner.tsx
 create mode 100644 app/javascript/flavours/glitch/models/notification_policy.ts
 delete mode 100644 app/javascript/flavours/glitch/reducers/notification_policy.js
 create mode 100644 app/javascript/flavours/glitch/reducers/notification_policy.ts

diff --git a/app/javascript/flavours/glitch/actions/notification_policies.ts b/app/javascript/flavours/glitch/actions/notification_policies.ts
new file mode 100644
index 00000000000000..76452de324b426
--- /dev/null
+++ b/app/javascript/flavours/glitch/actions/notification_policies.ts
@@ -0,0 +1,16 @@
+import {
+  apiGetNotificationPolicy,
+  apiUpdateNotificationsPolicy,
+} from 'flavours/glitch/api/notification_policies';
+import type { NotificationPolicy } from 'flavours/glitch/models/notification_policy';
+import { createDataLoadingThunk } from 'flavours/glitch/store/typed_functions';
+
+export const fetchNotificationPolicy = createDataLoadingThunk(
+  'notificationPolicy/fetch',
+  () => apiGetNotificationPolicy(),
+);
+
+export const updateNotificationsPolicy = createDataLoadingThunk(
+  'notificationPolicy/update',
+  (policy: Partial<NotificationPolicy>) => apiUpdateNotificationsPolicy(policy),
+);
diff --git a/app/javascript/flavours/glitch/actions/notifications.js b/app/javascript/flavours/glitch/actions/notifications.js
index a2be31ffeb17d9..3a1af501c8d9e6 100644
--- a/app/javascript/flavours/glitch/actions/notifications.js
+++ b/app/javascript/flavours/glitch/actions/notifications.js
@@ -57,10 +57,6 @@ export const NOTIFICATIONS_MARK_AS_READ = 'NOTIFICATIONS_MARK_AS_READ';
 export const NOTIFICATIONS_SET_BROWSER_SUPPORT    = 'NOTIFICATIONS_SET_BROWSER_SUPPORT';
 export const NOTIFICATIONS_SET_BROWSER_PERMISSION = 'NOTIFICATIONS_SET_BROWSER_PERMISSION';
 
-export const NOTIFICATION_POLICY_FETCH_REQUEST = 'NOTIFICATION_POLICY_FETCH_REQUEST';
-export const NOTIFICATION_POLICY_FETCH_SUCCESS = 'NOTIFICATION_POLICY_FETCH_SUCCESS';
-export const NOTIFICATION_POLICY_FETCH_FAIL    = 'NOTIFICATION_POLICY_FETCH_FAIL';
-
 export const NOTIFICATION_REQUESTS_FETCH_REQUEST = 'NOTIFICATION_REQUESTS_FETCH_REQUEST';
 export const NOTIFICATION_REQUESTS_FETCH_SUCCESS = 'NOTIFICATION_REQUESTS_FETCH_SUCCESS';
 export const NOTIFICATION_REQUESTS_FETCH_FAIL    = 'NOTIFICATION_REQUESTS_FETCH_FAIL';
@@ -434,40 +430,6 @@ export function setBrowserPermission (value) {
   };
 }
 
-export const fetchNotificationPolicy = () => (dispatch) => {
-  dispatch(fetchNotificationPolicyRequest());
-
-  api().get('/api/v1/notifications/policy').then(({ data }) => {
-    dispatch(fetchNotificationPolicySuccess(data));
-  }).catch(err => {
-    dispatch(fetchNotificationPolicyFail(err));
-  });
-};
-
-export const fetchNotificationPolicyRequest = () => ({
-  type: NOTIFICATION_POLICY_FETCH_REQUEST,
-});
-
-export const fetchNotificationPolicySuccess = policy => ({
-  type: NOTIFICATION_POLICY_FETCH_SUCCESS,
-  policy,
-});
-
-export const fetchNotificationPolicyFail = error => ({
-  type: NOTIFICATION_POLICY_FETCH_FAIL,
-  error,
-});
-
-export const updateNotificationsPolicy = params => (dispatch) => {
-  dispatch(fetchNotificationPolicyRequest());
-
-  api().put('/api/v1/notifications/policy', params).then(({ data }) => {
-    dispatch(fetchNotificationPolicySuccess(data));
-  }).catch(err => {
-    dispatch(fetchNotificationPolicyFail(err));
-  });
-};
-
 export const fetchNotificationRequests = () => (dispatch, getState) => {
   const params = {};
 
diff --git a/app/javascript/flavours/glitch/api/notification_policies.ts b/app/javascript/flavours/glitch/api/notification_policies.ts
new file mode 100644
index 00000000000000..2bb5dc37ca64fc
--- /dev/null
+++ b/app/javascript/flavours/glitch/api/notification_policies.ts
@@ -0,0 +1,10 @@
+import { apiRequest } from 'flavours/glitch/api';
+import type { NotificationPolicyJSON } from 'flavours/glitch/api_types/notification_policies';
+
+export const apiGetNotificationPolicy = () =>
+  apiRequest<NotificationPolicyJSON>('GET', '/v1/notifications/policy');
+
+export const apiUpdateNotificationsPolicy = (
+  policy: Partial<NotificationPolicyJSON>,
+) =>
+  apiRequest<NotificationPolicyJSON>('PUT', '/v1/notifications/policy', policy);
diff --git a/app/javascript/flavours/glitch/api_types/notification_policies.ts b/app/javascript/flavours/glitch/api_types/notification_policies.ts
new file mode 100644
index 00000000000000..0f4a2d132e0e0e
--- /dev/null
+++ b/app/javascript/flavours/glitch/api_types/notification_policies.ts
@@ -0,0 +1,12 @@
+// See app/serializers/rest/notification_policy_serializer.rb
+
+export interface NotificationPolicyJSON {
+  filter_not_following: boolean;
+  filter_not_followers: boolean;
+  filter_new_accounts: boolean;
+  filter_private_mentions: boolean;
+  summary: {
+    pending_requests_count: number;
+    pending_notifications_count: number;
+  };
+}
diff --git a/app/javascript/flavours/glitch/features/notifications/components/column_settings.jsx b/app/javascript/flavours/glitch/features/notifications/components/column_settings.jsx
index ee78466b909379..1ed77975092421 100644
--- a/app/javascript/flavours/glitch/features/notifications/components/column_settings.jsx
+++ b/app/javascript/flavours/glitch/features/notifications/components/column_settings.jsx
@@ -25,7 +25,7 @@ class ColumnSettings extends PureComponent {
     alertsEnabled: PropTypes.bool,
     browserSupport: PropTypes.bool,
     browserPermission: PropTypes.string,
-    notificationPolicy: ImmutablePropTypes.map,
+    notificationPolicy: PropTypes.object.isRequired,
     onChangePolicy: PropTypes.func.isRequired,
   };
 
@@ -84,22 +84,22 @@ class ColumnSettings extends PureComponent {
           <h3><FormattedMessage id='notifications.policy.title' defaultMessage='Filter out notifications from…' /></h3>
 
           <div className='column-settings__row'>
-            <CheckboxWithLabel checked={notificationPolicy.get('filter_not_following')} onChange={this.handleFilterNotFollowing}>
+            <CheckboxWithLabel checked={notificationPolicy.filter_not_following} onChange={this.handleFilterNotFollowing}>
               <strong><FormattedMessage id='notifications.policy.filter_not_following_title' defaultMessage="People you don't follow" /></strong>
               <span className='hint'><FormattedMessage id='notifications.policy.filter_not_following_hint' defaultMessage='Until you manually approve them' /></span>
             </CheckboxWithLabel>
 
-            <CheckboxWithLabel checked={notificationPolicy.get('filter_not_followers')} onChange={this.handleFilterNotFollowers}>
+            <CheckboxWithLabel checked={notificationPolicy.filter_not_followers} onChange={this.handleFilterNotFollowers}>
               <strong><FormattedMessage id='notifications.policy.filter_not_followers_title' defaultMessage='People not following you' /></strong>
               <span className='hint'><FormattedMessage id='notifications.policy.filter_not_followers_hint' defaultMessage='Including people who have been following you fewer than {days, plural, one {one day} other {# days}}' values={{ days: 3 }} /></span>
             </CheckboxWithLabel>
 
-            <CheckboxWithLabel checked={notificationPolicy.get('filter_new_accounts')} onChange={this.handleFilterNewAccounts}>
+            <CheckboxWithLabel checked={notificationPolicy.filter_new_accounts} onChange={this.handleFilterNewAccounts}>
               <strong><FormattedMessage id='notifications.policy.filter_new_accounts_title' defaultMessage='New accounts' /></strong>
               <span className='hint'><FormattedMessage id='notifications.policy.filter_new_accounts.hint' defaultMessage='Created within the past {days, plural, one {one day} other {# days}}' values={{ days: 30 }} /></span>
             </CheckboxWithLabel>
 
-            <CheckboxWithLabel checked={notificationPolicy.get('filter_private_mentions')} onChange={this.handleFilterPrivateMentions}>
+            <CheckboxWithLabel checked={notificationPolicy.filter_private_mentions} onChange={this.handleFilterPrivateMentions}>
               <strong><FormattedMessage id='notifications.policy.filter_private_mentions_title' defaultMessage='Unsolicited private mentions' /></strong>
               <span className='hint'><FormattedMessage id='notifications.policy.filter_private_mentions_hint' defaultMessage="Filtered unless it's in reply to your own mention or if you follow the sender" /></span>
             </CheckboxWithLabel>
diff --git a/app/javascript/flavours/glitch/features/notifications/components/filtered_notifications_banner.jsx b/app/javascript/flavours/glitch/features/notifications/components/filtered_notifications_banner.jsx
deleted file mode 100644
index 8c8b9e4b867a3d..00000000000000
--- a/app/javascript/flavours/glitch/features/notifications/components/filtered_notifications_banner.jsx
+++ /dev/null
@@ -1,49 +0,0 @@
-import { useEffect } from 'react';
-
-import { FormattedMessage } from 'react-intl';
-
-import { Link } from 'react-router-dom';
-
-import { useDispatch, useSelector } from 'react-redux';
-
-import InventoryIcon from '@/material-icons/400-24px/inventory_2.svg?react';
-import { fetchNotificationPolicy } from 'flavours/glitch/actions/notifications';
-import { Icon } from 'flavours/glitch/components/icon';
-import { toCappedNumber } from 'flavours/glitch/utils/numbers';
-
-export const FilteredNotificationsBanner = () => {
-  const dispatch = useDispatch();
-  const policy = useSelector(state => state.get('notificationPolicy'));
-
-  useEffect(() => {
-    dispatch(fetchNotificationPolicy());
-
-    const interval = setInterval(() => {
-      dispatch(fetchNotificationPolicy());
-    }, 120000);
-
-    return () => {
-      clearInterval(interval);
-    };
-  }, [dispatch]);
-
-  if (policy === null || policy.getIn(['summary', 'pending_notifications_count']) === 0) {
-    return null;
-  }
-
-  return (
-    <Link className='filtered-notifications-banner' to='/notifications/requests'>
-      <Icon icon={InventoryIcon} />
-
-      <div className='filtered-notifications-banner__text'>
-        <strong><FormattedMessage id='filtered_notifications_banner.title' defaultMessage='Filtered notifications' /></strong>
-        <span><FormattedMessage id='filtered_notifications_banner.pending_requests' defaultMessage='Notifications from {count, plural, =0 {no one} one {one person} other {# people}} you may know' values={{ count: policy.getIn(['summary', 'pending_requests_count']) }} /></span>
-      </div>
-
-      <div className='filtered-notifications-banner__badge'>
-        <div className='filtered-notifications-banner__badge__badge'>{toCappedNumber(policy.getIn(['summary', 'pending_notifications_count']))}</div>
-        <FormattedMessage id='filtered_notifications_banner.mentions' defaultMessage='{count, plural, one {mention} other {mentions}}' values={{ count: policy.getIn(['summary', 'pending_notifications_count']) }} />
-      </div>
-    </Link>
-  );
-};
diff --git a/app/javascript/flavours/glitch/features/notifications/components/filtered_notifications_banner.tsx b/app/javascript/flavours/glitch/features/notifications/components/filtered_notifications_banner.tsx
new file mode 100644
index 00000000000000..70762be0e3e86c
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/notifications/components/filtered_notifications_banner.tsx
@@ -0,0 +1,68 @@
+import { useEffect } from 'react';
+
+import { FormattedMessage } from 'react-intl';
+
+import { Link } from 'react-router-dom';
+
+import InventoryIcon from '@/material-icons/400-24px/inventory_2.svg?react';
+import { fetchNotificationPolicy } from 'flavours/glitch/actions/notification_policies';
+import { Icon } from 'flavours/glitch/components/icon';
+import { useAppSelector, useAppDispatch } from 'flavours/glitch/store';
+import { toCappedNumber } from 'flavours/glitch/utils/numbers';
+
+export const FilteredNotificationsBanner: React.FC = () => {
+  const dispatch = useAppDispatch();
+  const policy = useAppSelector((state) => state.notificationPolicy);
+
+  useEffect(() => {
+    void dispatch(fetchNotificationPolicy());
+
+    const interval = setInterval(() => {
+      void dispatch(fetchNotificationPolicy());
+    }, 120000);
+
+    return () => {
+      clearInterval(interval);
+    };
+  }, [dispatch]);
+
+  if (policy === null || policy.summary.pending_notifications_count === 0) {
+    return null;
+  }
+
+  return (
+    <Link
+      className='filtered-notifications-banner'
+      to='/notifications/requests'
+    >
+      <Icon icon={InventoryIcon} id='filtered-notifications' />
+
+      <div className='filtered-notifications-banner__text'>
+        <strong>
+          <FormattedMessage
+            id='filtered_notifications_banner.title'
+            defaultMessage='Filtered notifications'
+          />
+        </strong>
+        <span>
+          <FormattedMessage
+            id='filtered_notifications_banner.pending_requests'
+            defaultMessage='Notifications from {count, plural, =0 {no one} one {one person} other {# people}} you may know'
+            values={{ count: policy.summary.pending_requests_count }}
+          />
+        </span>
+      </div>
+
+      <div className='filtered-notifications-banner__badge'>
+        <div className='filtered-notifications-banner__badge__badge'>
+          {toCappedNumber(policy.summary.pending_notifications_count)}
+        </div>
+        <FormattedMessage
+          id='filtered_notifications_banner.mentions'
+          defaultMessage='{count, plural, one {mention} other {mentions}}'
+          values={{ count: policy.summary.pending_notifications_count }}
+        />
+      </div>
+    </Link>
+  );
+};
diff --git a/app/javascript/flavours/glitch/features/notifications/containers/column_settings_container.js b/app/javascript/flavours/glitch/features/notifications/containers/column_settings_container.js
index de266160f8511c..4547fde04293c7 100644
--- a/app/javascript/flavours/glitch/features/notifications/containers/column_settings_container.js
+++ b/app/javascript/flavours/glitch/features/notifications/containers/column_settings_container.js
@@ -4,7 +4,8 @@ import { connect } from 'react-redux';
 
 import { showAlert } from '../../../actions/alerts';
 import { openModal } from '../../../actions/modal';
-import { setFilter, clearNotifications, requestBrowserPermission, updateNotificationsPolicy } from '../../../actions/notifications';
+import { updateNotificationsPolicy } from '../../../actions/notification_policies';
+import { setFilter, clearNotifications, requestBrowserPermission } from '../../../actions/notifications';
 import { changeAlerts as changePushNotifications } from '../../../actions/push_notifications';
 import { changeSetting } from '../../../actions/settings';
 import ColumnSettings from '../components/column_settings';
@@ -15,13 +16,16 @@ const messages = defineMessages({
   permissionDenied: { id: 'notifications.permission_denied_alert', defaultMessage: 'Desktop notifications can\'t be enabled, as browser permission has been denied before' },
 });
 
+/**
+ * @param {import('flavours/glitch/store').RootState} state
+ */
 const mapStateToProps = state => ({
   settings: state.getIn(['settings', 'notifications']),
   pushSettings: state.get('push_notifications'),
   alertsEnabled: state.getIn(['settings', 'notifications', 'alerts']).includes(true),
   browserSupport: state.getIn(['notifications', 'browserSupport']),
   browserPermission: state.getIn(['notifications', 'browserPermission']),
-  notificationPolicy: state.get('notificationPolicy'),
+  notificationPolicy: state.notificationPolicy,
 });
 
 const mapDispatchToProps = (dispatch, { intl }) => ({
diff --git a/app/javascript/flavours/glitch/models/notification_policy.ts b/app/javascript/flavours/glitch/models/notification_policy.ts
new file mode 100644
index 00000000000000..7d9755941304f7
--- /dev/null
+++ b/app/javascript/flavours/glitch/models/notification_policy.ts
@@ -0,0 +1,3 @@
+import type { NotificationPolicyJSON } from 'flavours/glitch/api_types/notification_policies';
+
+export type NotificationPolicy = NotificationPolicyJSON; // No changes from the API type
diff --git a/app/javascript/flavours/glitch/reducers/notification_policy.js b/app/javascript/flavours/glitch/reducers/notification_policy.js
deleted file mode 100644
index 579f2afdb26495..00000000000000
--- a/app/javascript/flavours/glitch/reducers/notification_policy.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import { fromJS } from 'immutable';
-
-import { NOTIFICATION_POLICY_FETCH_SUCCESS } from 'flavours/glitch/actions/notifications';
-
-export const notificationPolicyReducer = (state = null, action) => {
-  switch(action.type) {
-  case NOTIFICATION_POLICY_FETCH_SUCCESS:
-    return fromJS(action.policy);
-  default:
-    return state;
-  }
-};
diff --git a/app/javascript/flavours/glitch/reducers/notification_policy.ts b/app/javascript/flavours/glitch/reducers/notification_policy.ts
new file mode 100644
index 00000000000000..2d5450ce448e39
--- /dev/null
+++ b/app/javascript/flavours/glitch/reducers/notification_policy.ts
@@ -0,0 +1,18 @@
+import { createReducer, isAnyOf } from '@reduxjs/toolkit';
+
+import {
+  fetchNotificationPolicy,
+  updateNotificationsPolicy,
+} from 'flavours/glitch/actions/notification_policies';
+import type { NotificationPolicy } from 'flavours/glitch/models/notification_policy';
+
+export const notificationPolicyReducer =
+  createReducer<NotificationPolicy | null>(null, (builder) => {
+    builder.addMatcher(
+      isAnyOf(
+        fetchNotificationPolicy.fulfilled,
+        updateNotificationsPolicy.fulfilled,
+      ),
+      (_state, action) => action.payload,
+    );
+  });

From be19b94dea1c18802702cc8efc21ba1dfa51e6b9 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 18 Jun 2024 17:34:17 -0400
Subject: [PATCH 1336/2191] Unpluralize mistakenly changed privacy template
 (#30759)

---
 config/templates/privacy-policy.md | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/config/templates/privacy-policy.md b/config/templates/privacy-policy.md
index 9e042af80a8b63..4f5ab4ca03d045 100644
--- a/config/templates/privacy-policy.md
+++ b/config/templates/privacy-policy.md
@@ -1,10 +1,10 @@
-This privacy policy describes how %{domain}s ("%{domain}s", "we", "us")
-collects, protects and uses the personally identifiable information you may
-provide through the %{domain}s website or its API. The policy also
-describes the choices available to you regarding our use of your personal
-information and how you can access and update this information. This policy
-does not apply to the practices of companies that %{domain}s does not own
-or control, or to individuals that %{domain}s does not employ or manage.
+This privacy policy describes how %{domain} ("%{domain}", "we", "us") collects,
+protects and uses the personally identifiable information you may provide
+through the %{domain} website or its API. The policy also describes the choices
+available to you regarding our use of your personal information and how you can
+access and update this information. This policy does not apply to the practices
+of companies that %{domain} does not own or control, or to individuals that
+%{domain} does not employ or manage.
 
 # What information do we collect?
 

From 80743e0e7f091bfaa5b63148751e7842832a5fa0 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 19 Jun 2024 10:45:40 +0200
Subject: [PATCH 1337/2191] New Crowdin Translations (automated) (#30762)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 config/locales/sv.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index a3d31547cec6fc..91b1720b553f2c 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -293,6 +293,7 @@ sv:
       filter_by_action: Filtrera efter åtgärd
       filter_by_user: Filtrera efter användare
       title: Revisionslogg
+      unavailable_instance: "(domännamn inte tillgängligt)"
     announcements:
       destroyed_msg: Kungörelsen raderades!
       edit:

From a8b3d2e4e4e244f6dd44a2f9fe971279511534ac Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 19 Jun 2024 04:45:47 -0400
Subject: [PATCH 1338/2191] Consolidate time periods methods into base measure
 (#30757)

---
 app/lib/admin/metrics/measure/active_users_measure.rb     | 8 --------
 app/lib/admin/metrics/measure/base_measure.rb             | 4 ++--
 .../admin/metrics/measure/instance_accounts_measure.rb    | 8 --------
 .../admin/metrics/measure/instance_followers_measure.rb   | 8 --------
 app/lib/admin/metrics/measure/instance_follows_measure.rb | 8 --------
 .../metrics/measure/instance_media_attachments_measure.rb | 8 --------
 app/lib/admin/metrics/measure/instance_reports_measure.rb | 8 --------
 .../admin/metrics/measure/instance_statuses_measure.rb    | 8 --------
 app/lib/admin/metrics/measure/interactions_measure.rb     | 8 --------
 app/lib/admin/metrics/measure/tag_accounts_measure.rb     | 8 --------
 app/lib/admin/metrics/measure/tag_uses_measure.rb         | 8 --------
 11 files changed, 2 insertions(+), 82 deletions(-)

diff --git a/app/lib/admin/metrics/measure/active_users_measure.rb b/app/lib/admin/metrics/measure/active_users_measure.rb
index e6f09d4bcf6293..c085ced6291ac1 100644
--- a/app/lib/admin/metrics/measure/active_users_measure.rb
+++ b/app/lib/admin/metrics/measure/active_users_measure.rb
@@ -22,12 +22,4 @@ def perform_data_query
   def activity_tracker
     @activity_tracker ||= ActivityTracker.new('activity:logins', :unique)
   end
-
-  def time_period
-    (@start_at.to_date..@end_at.to_date)
-  end
-
-  def previous_time_period
-    ((@start_at.to_date - length_of_period)..(@end_at.to_date - length_of_period))
-  end
 end
diff --git a/app/lib/admin/metrics/measure/base_measure.rb b/app/lib/admin/metrics/measure/base_measure.rb
index e33a6c494f918c..8b7fe39b55a245 100644
--- a/app/lib/admin/metrics/measure/base_measure.rb
+++ b/app/lib/admin/metrics/measure/base_measure.rb
@@ -86,11 +86,11 @@ def perform_data_query
   end
 
   def time_period
-    (@start_at..@end_at)
+    (@start_at.to_date..@end_at.to_date)
   end
 
   def previous_time_period
-    ((@start_at - length_of_period)..(@end_at - length_of_period))
+    ((@start_at.to_date - length_of_period)..(@end_at.to_date - length_of_period))
   end
 
   def length_of_period
diff --git a/app/lib/admin/metrics/measure/instance_accounts_measure.rb b/app/lib/admin/metrics/measure/instance_accounts_measure.rb
index 746780ee7719e3..889a5e6f05f296 100644
--- a/app/lib/admin/metrics/measure/instance_accounts_measure.rb
+++ b/app/lib/admin/metrics/measure/instance_accounts_measure.rb
@@ -48,14 +48,6 @@ def sql_query_string
     SQL
   end
 
-  def time_period
-    (@start_at.to_date..@end_at.to_date)
-  end
-
-  def previous_time_period
-    ((@start_at.to_date - length_of_period)..(@end_at.to_date - length_of_period))
-  end
-
   def params
     @params.permit(:domain, :include_subdomains)
   end
diff --git a/app/lib/admin/metrics/measure/instance_followers_measure.rb b/app/lib/admin/metrics/measure/instance_followers_measure.rb
index 0693d5a64a91d2..fa934c6b96c58e 100644
--- a/app/lib/admin/metrics/measure/instance_followers_measure.rb
+++ b/app/lib/admin/metrics/measure/instance_followers_measure.rb
@@ -49,14 +49,6 @@ def sql_query_string
     SQL
   end
 
-  def time_period
-    (@start_at.to_date..@end_at.to_date)
-  end
-
-  def previous_time_period
-    ((@start_at.to_date - length_of_period)..(@end_at.to_date - length_of_period))
-  end
-
   def params
     @params.permit(:domain, :include_subdomains)
   end
diff --git a/app/lib/admin/metrics/measure/instance_follows_measure.rb b/app/lib/admin/metrics/measure/instance_follows_measure.rb
index 90d38193585c8d..3f3ab73fc90a2c 100644
--- a/app/lib/admin/metrics/measure/instance_follows_measure.rb
+++ b/app/lib/admin/metrics/measure/instance_follows_measure.rb
@@ -49,14 +49,6 @@ def sql_query_string
     SQL
   end
 
-  def time_period
-    (@start_at.to_date..@end_at.to_date)
-  end
-
-  def previous_time_period
-    ((@start_at.to_date - length_of_period)..(@end_at.to_date - length_of_period))
-  end
-
   def params
     @params.permit(:domain, :include_subdomains)
   end
diff --git a/app/lib/admin/metrics/measure/instance_media_attachments_measure.rb b/app/lib/admin/metrics/measure/instance_media_attachments_measure.rb
index 89f8b414973b83..996ca52e0bb5b3 100644
--- a/app/lib/admin/metrics/measure/instance_media_attachments_measure.rb
+++ b/app/lib/admin/metrics/measure/instance_media_attachments_measure.rb
@@ -58,14 +58,6 @@ def sql_query_string
     SQL
   end
 
-  def time_period
-    (@start_at.to_date..@end_at.to_date)
-  end
-
-  def previous_time_period
-    ((@start_at.to_date - length_of_period)..(@end_at.to_date - length_of_period))
-  end
-
   def params
     @params.permit(:domain, :include_subdomains)
   end
diff --git a/app/lib/admin/metrics/measure/instance_reports_measure.rb b/app/lib/admin/metrics/measure/instance_reports_measure.rb
index 5f58387a640ae0..ae1bb6e68de8da 100644
--- a/app/lib/admin/metrics/measure/instance_reports_measure.rb
+++ b/app/lib/admin/metrics/measure/instance_reports_measure.rb
@@ -49,14 +49,6 @@ def sql_query_string
     SQL
   end
 
-  def time_period
-    (@start_at.to_date..@end_at.to_date)
-  end
-
-  def previous_time_period
-    ((@start_at.to_date - length_of_period)..(@end_at.to_date - length_of_period))
-  end
-
   def params
     @params.permit(:domain, :include_subdomains)
   end
diff --git a/app/lib/admin/metrics/measure/instance_statuses_measure.rb b/app/lib/admin/metrics/measure/instance_statuses_measure.rb
index 5873c6e71fcee3..324d427b18beda 100644
--- a/app/lib/admin/metrics/measure/instance_statuses_measure.rb
+++ b/app/lib/admin/metrics/measure/instance_statuses_measure.rb
@@ -58,14 +58,6 @@ def latest_status_id
     Mastodon::Snowflake.id_at(@end_at.end_of_day, with_random: false)
   end
 
-  def time_period
-    (@start_at.to_date..@end_at.to_date)
-  end
-
-  def previous_time_period
-    ((@start_at.to_date - length_of_period)..(@end_at.to_date - length_of_period))
-  end
-
   def params
     @params.permit(:domain, :include_subdomains)
   end
diff --git a/app/lib/admin/metrics/measure/interactions_measure.rb b/app/lib/admin/metrics/measure/interactions_measure.rb
index 7a2b7e0fac48fd..f4b4836b4a8273 100644
--- a/app/lib/admin/metrics/measure/interactions_measure.rb
+++ b/app/lib/admin/metrics/measure/interactions_measure.rb
@@ -22,12 +22,4 @@ def perform_data_query
   def activity_tracker
     @activity_tracker ||= ActivityTracker.new('activity:interactions', :basic)
   end
-
-  def time_period
-    (@start_at.to_date..@end_at.to_date)
-  end
-
-  def previous_time_period
-    ((@start_at.to_date - length_of_period)..(@end_at.to_date - length_of_period))
-  end
 end
diff --git a/app/lib/admin/metrics/measure/tag_accounts_measure.rb b/app/lib/admin/metrics/measure/tag_accounts_measure.rb
index 8f4512efe7cdd8..906277b7d543f8 100644
--- a/app/lib/admin/metrics/measure/tag_accounts_measure.rb
+++ b/app/lib/admin/metrics/measure/tag_accounts_measure.rb
@@ -27,14 +27,6 @@ def tag
     @tag ||= Tag.find(params[:id])
   end
 
-  def time_period
-    (@start_at.to_date..@end_at.to_date)
-  end
-
-  def previous_time_period
-    ((@start_at.to_date - length_of_period)..(@end_at.to_date - length_of_period))
-  end
-
   def params
     @params.permit(:id)
   end
diff --git a/app/lib/admin/metrics/measure/tag_uses_measure.rb b/app/lib/admin/metrics/measure/tag_uses_measure.rb
index bce86b89f10887..2be96a02b3777c 100644
--- a/app/lib/admin/metrics/measure/tag_uses_measure.rb
+++ b/app/lib/admin/metrics/measure/tag_uses_measure.rb
@@ -27,14 +27,6 @@ def tag
     @tag ||= Tag.find(params[:id])
   end
 
-  def time_period
-    (@start_at.to_date..@end_at.to_date)
-  end
-
-  def previous_time_period
-    ((@start_at.to_date - length_of_period)..(@end_at.to_date - length_of_period))
-  end
-
   def params
     @params.permit(:id)
   end

From 4e7e31538feb329abf1be454121fc5fdb8e16bd3 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 19 Jun 2024 10:45:51 +0200
Subject: [PATCH 1339/2191] chore(deps): update opentelemetry-ruby (non-major)
 (#30755)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 3a76cc50c4cdc7..41fc86c8af5d9c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -528,32 +528,27 @@ GEM
     opentelemetry-instrumentation-concurrent_ruby (0.21.3)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-excon (0.22.1)
+    opentelemetry-instrumentation-excon (0.22.3)
       opentelemetry-api (~> 1.0)
-      opentelemetry-common (~> 0.20.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-faraday (0.24.2)
+    opentelemetry-instrumentation-faraday (0.24.4)
       opentelemetry-api (~> 1.0)
-      opentelemetry-common (~> 0.20.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
     opentelemetry-instrumentation-http (0.23.3)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-http_client (0.22.4)
+    opentelemetry-instrumentation-http_client (0.22.6)
       opentelemetry-api (~> 1.0)
-      opentelemetry-common (~> 0.20.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-net_http (0.22.4)
+    opentelemetry-instrumentation-net_http (0.22.6)
       opentelemetry-api (~> 1.0)
-      opentelemetry-common (~> 0.20.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
     opentelemetry-instrumentation-pg (0.27.3)
       opentelemetry-api (~> 1.0)
       opentelemetry-helpers-sql-obfuscation
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-rack (0.24.3)
+    opentelemetry-instrumentation-rack (0.24.5)
       opentelemetry-api (~> 1.0)
-      opentelemetry-common (~> 0.20.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
     opentelemetry-instrumentation-rails (0.30.2)
       opentelemetry-api (~> 1.0)
@@ -564,13 +559,11 @@ GEM
       opentelemetry-instrumentation-active_record (~> 0.7.0)
       opentelemetry-instrumentation-active_support (~> 0.5.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-redis (0.25.4)
+    opentelemetry-instrumentation-redis (0.25.6)
       opentelemetry-api (~> 1.0)
-      opentelemetry-common (~> 0.20.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-sidekiq (0.25.3)
+    opentelemetry-instrumentation-sidekiq (0.25.5)
       opentelemetry-api (~> 1.0)
-      opentelemetry-common (~> 0.20.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
     opentelemetry-registry (0.3.1)
       opentelemetry-api (~> 1.1)

From 556d4097804838efed16e4ac6cb57db3b4b50216 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 19 Jun 2024 05:08:04 -0400
Subject: [PATCH 1340/2191] Enable renovate `lockFileMaintenance` setting
 (#30732)

---
 .github/renovate.json5 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/renovate.json5 b/.github/renovate.json5
index 2cf7bec8eebd21..03787dfac6c21b 100644
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -14,6 +14,9 @@
   // to `null` after any other rule set it to something.
   dependencyDashboardHeader: 'This issue lists Renovate updates and detected dependencies. Read the [Dependency Dashboard](https://docs.renovatebot.com/key-concepts/dashboard/) docs to learn more. Before approving any upgrade: read the description and comments in the [`renovate.json5` file](https://github.com/mastodon/mastodon/blob/main/.github/renovate.json5).',
   postUpdateOptions: ['yarnDedupeHighest'],
+  lockFileMaintenance: {
+    enabled: true,
+  },
   packageRules: [
     {
       // Require Dependency Dashboard Approval for major version bumps of these node packages

From 8098d27f84028c226729c76f1ebdeadec881b1c5 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 19 Jun 2024 11:31:30 +0200
Subject: [PATCH 1341/2191] Stop calling Webpacker in full-stack tests (#30763)

---
 .github/workflows/test-ruby.yml          | 8 ++++++--
 spec/support/streaming_server_manager.rb | 3 ---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/test-ruby.yml b/.github/workflows/test-ruby.yml
index 513de2072a8eb9..dd71fd253b575e 100644
--- a/.github/workflows/test-ruby.yml
+++ b/.github/workflows/test-ruby.yml
@@ -285,9 +285,13 @@ jobs:
 
       - uses: actions/download-artifact@v4
         with:
-          path: './public'
+          path: './'
           name: ${{ github.sha }}
 
+      - name: Expand archived asset artifacts
+        run: |
+          tar xvzf artifacts.tar.gz
+
       - name: Set up Ruby environment
         uses: ./.github/actions/setup-ruby
         with:
@@ -405,7 +409,7 @@ jobs:
 
       - uses: actions/download-artifact@v4
         with:
-          path: './public'
+          path: './'
           name: ${{ github.sha }}
 
       - name: Set up Ruby environment
diff --git a/spec/support/streaming_server_manager.rb b/spec/support/streaming_server_manager.rb
index 3facf16b8ebab2..376d6b87251030 100644
--- a/spec/support/streaming_server_manager.rb
+++ b/spec/support/streaming_server_manager.rb
@@ -80,9 +80,6 @@ def stop
 RSpec.configure do |config|
   config.before :suite do
     if streaming_examples_present?
-      # Compile assets
-      Webpacker.compile
-
       # Start the node streaming server
       streaming_server_manager.start(port: STREAMING_PORT)
     end

From 49b323c13ddfcaad6c4ad1de74f712f44cfef0bb Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 19 Jun 2024 11:31:56 +0200
Subject: [PATCH 1342/2191] fix(deps): update dependency cssnano to v7.0.3
 (#30764)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 205 +++++++++++++++++++++++++++---------------------------
 1 file changed, 104 insertions(+), 101 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 1be5eb42210ab7..61a8f420a5932d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5643,17 +5643,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"browserslist@npm:^4.0.0, browserslist@npm:^4.22.2, browserslist@npm:^4.22.3, browserslist@npm:^4.23.0":
-  version: 4.23.0
-  resolution: "browserslist@npm:4.23.0"
+"browserslist@npm:^4.0.0, browserslist@npm:^4.22.2, browserslist@npm:^4.22.3, browserslist@npm:^4.23.0, browserslist@npm:^4.23.1":
+  version: 4.23.1
+  resolution: "browserslist@npm:4.23.1"
   dependencies:
-    caniuse-lite: "npm:^1.0.30001587"
-    electron-to-chromium: "npm:^1.4.668"
+    caniuse-lite: "npm:^1.0.30001629"
+    electron-to-chromium: "npm:^1.4.796"
     node-releases: "npm:^2.0.14"
-    update-browserslist-db: "npm:^1.0.13"
+    update-browserslist-db: "npm:^1.0.16"
   bin:
     browserslist: cli.js
-  checksum: 10c0/8e9cc154529062128d02a7af4d8adeead83ca1df8cd9ee65a88e2161039f3d68a4d40fea7353cab6bae4c16182dec2fdd9a1cf7dc2a2935498cee1af0e998943
+  checksum: 10c0/eb47c7ab9d60db25ce2faca70efeb278faa7282a2f62b7f2fa2f92e5f5251cf65144244566c86559419ff4f6d78f59ea50e39911321ad91f3b27788901f1f5e9
   languageName: node
   linkType: hard
 
@@ -5855,10 +5855,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001587, caniuse-lite@npm:^1.0.30001599":
-  version: 1.0.30001599
-  resolution: "caniuse-lite@npm:1.0.30001599"
-  checksum: 10c0/8b3b9610b5be88533a3c8d0770d6896f7b1a9fee3dbeb7339e4ee119a514c81e5e07a628a5a289a6541ca291ac78a9402f5a99cf6012139e91f379083488a8eb
+"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001599, caniuse-lite@npm:^1.0.30001629":
+  version: 1.0.30001636
+  resolution: "caniuse-lite@npm:1.0.30001636"
+  checksum: 10c0/e5f965b4da7bae1531fd9f93477d015729ff9e3fa12670ead39a9e6cdc4c43e62c272d47857c5cc332e7b02d697cb3f2f965a1030870ac7476da60c2fc81ee94
   languageName: node
   linkType: hard
 
@@ -6723,43 +6723,43 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cssnano-preset-default@npm:^7.0.2":
-  version: 7.0.2
-  resolution: "cssnano-preset-default@npm:7.0.2"
+"cssnano-preset-default@npm:^7.0.3":
+  version: 7.0.3
+  resolution: "cssnano-preset-default@npm:7.0.3"
   dependencies:
-    browserslist: "npm:^4.23.0"
+    browserslist: "npm:^4.23.1"
     css-declaration-sorter: "npm:^7.2.0"
     cssnano-utils: "npm:^5.0.0"
     postcss-calc: "npm:^10.0.0"
-    postcss-colormin: "npm:^7.0.0"
-    postcss-convert-values: "npm:^7.0.0"
-    postcss-discard-comments: "npm:^7.0.0"
+    postcss-colormin: "npm:^7.0.1"
+    postcss-convert-values: "npm:^7.0.1"
+    postcss-discard-comments: "npm:^7.0.1"
     postcss-discard-duplicates: "npm:^7.0.0"
     postcss-discard-empty: "npm:^7.0.0"
     postcss-discard-overridden: "npm:^7.0.0"
-    postcss-merge-longhand: "npm:^7.0.1"
-    postcss-merge-rules: "npm:^7.0.1"
+    postcss-merge-longhand: "npm:^7.0.2"
+    postcss-merge-rules: "npm:^7.0.2"
     postcss-minify-font-values: "npm:^7.0.0"
     postcss-minify-gradients: "npm:^7.0.0"
-    postcss-minify-params: "npm:^7.0.0"
-    postcss-minify-selectors: "npm:^7.0.1"
+    postcss-minify-params: "npm:^7.0.1"
+    postcss-minify-selectors: "npm:^7.0.2"
     postcss-normalize-charset: "npm:^7.0.0"
     postcss-normalize-display-values: "npm:^7.0.0"
     postcss-normalize-positions: "npm:^7.0.0"
     postcss-normalize-repeat-style: "npm:^7.0.0"
     postcss-normalize-string: "npm:^7.0.0"
     postcss-normalize-timing-functions: "npm:^7.0.0"
-    postcss-normalize-unicode: "npm:^7.0.0"
+    postcss-normalize-unicode: "npm:^7.0.1"
     postcss-normalize-url: "npm:^7.0.0"
     postcss-normalize-whitespace: "npm:^7.0.0"
-    postcss-ordered-values: "npm:^7.0.0"
-    postcss-reduce-initial: "npm:^7.0.0"
+    postcss-ordered-values: "npm:^7.0.1"
+    postcss-reduce-initial: "npm:^7.0.1"
     postcss-reduce-transforms: "npm:^7.0.0"
     postcss-svgo: "npm:^7.0.1"
     postcss-unique-selectors: "npm:^7.0.1"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/7c66240594c1d7a0cc761e755236228b17251455aa57abc45be0631f7de0fde070c23b0e41ffa200d39cd8351718514217d8c7a8cc4f06b54289dc1d555dfeb2
+  checksum: 10c0/ab3e51003efed6542a12d43c10ca693ab26138a1d035697b9be8f07e084e37a78617cbb8028b0a7e7841302ec151f4ecf35cbd763efe291846b62c35ea4c0bb4
   languageName: node
   linkType: hard
 
@@ -6773,14 +6773,14 @@ __metadata:
   linkType: hard
 
 "cssnano@npm:^7.0.0":
-  version: 7.0.2
-  resolution: "cssnano@npm:7.0.2"
+  version: 7.0.3
+  resolution: "cssnano@npm:7.0.3"
   dependencies:
-    cssnano-preset-default: "npm:^7.0.2"
-    lilconfig: "npm:^3.1.1"
+    cssnano-preset-default: "npm:^7.0.3"
+    lilconfig: "npm:^3.1.2"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/ad43d8c2e96fa1022fc5103064e4f08da3fdc5501a946d455edf0b81981b58cd06ad2d3f0c68d666e2b687c10c02ffbb383252aa34da0ddc3bd4d075f4a922c7
+  checksum: 10c0/4cbcd1e0ebe0bd83196cc5b16b3a60d3ebc98326c79b2f71df597bb73c8e3ee1f42b89159d7a038acc398251184d648d9dd516f4194e46746f3af6fa74b4aec7
   languageName: node
   linkType: hard
 
@@ -7395,10 +7395,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"electron-to-chromium@npm:^1.4.668":
-  version: 1.4.681
-  resolution: "electron-to-chromium@npm:1.4.681"
-  checksum: 10c0/5b2558dfb8bb82c20fb5fa1d9bbe06a3add47431dc3e1e4815e997be6ad387787047d9e534ed96839a9e7012520a5281c865158b09db41d10c029af003f05f94
+"electron-to-chromium@npm:^1.4.796":
+  version: 1.4.806
+  resolution: "electron-to-chromium@npm:1.4.806"
+  checksum: 10c0/44f925ba64bb623d0482cd2f14fcfb27017cec1f11ee642e0d49cb128cd714ba5e074c2cd8756dfc18010aa66d3c64039cdea891905f7c17160a8963db574fab
   languageName: node
   linkType: hard
 
@@ -7714,10 +7714,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"escalade@npm:^3.1.1":
-  version: 3.1.1
-  resolution: "escalade@npm:3.1.1"
-  checksum: 10c0/afd02e6ca91ffa813e1108b5e7756566173d6bc0d1eb951cb44d6b21702ec17c1cf116cfe75d4a2b02e05acb0b808a7a9387d0d1ca5cf9c04ad03a8445c3e46d
+"escalade@npm:^3.1.1, escalade@npm:^3.1.2":
+  version: 3.1.2
+  resolution: "escalade@npm:3.1.2"
+  checksum: 10c0/6b4adafecd0682f3aa1cd1106b8fff30e492c7015b178bc81b2d2f75106dabea6c6d6e8508fc491bd58e597c74abb0e8e2368f943ecb9393d4162e3c2f3cf287
   languageName: node
   linkType: hard
 
@@ -11267,10 +11267,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lilconfig@npm:^3.1.1, lilconfig@npm:~3.1.1":
-  version: 3.1.1
-  resolution: "lilconfig@npm:3.1.1"
-  checksum: 10c0/311b559794546894e3fe176663427326026c1c644145be9e8041c58e268aa9328799b8dfe7e4dd8c6a4ae305feae95a1c9e007db3569f35b42b6e1bc8274754c
+"lilconfig@npm:^3.1.2, lilconfig@npm:~3.1.1":
+  version: 3.1.2
+  resolution: "lilconfig@npm:3.1.2"
+  checksum: 10c0/f059630b1a9bddaeba83059db00c672b64dc14074e9f232adce32b38ca1b5686ab737eb665c5ba3c32f147f0002b4bee7311ad0386a9b98547b5623e87071fbe
   languageName: node
   linkType: hard
 
@@ -13236,29 +13236,29 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-colormin@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "postcss-colormin@npm:7.0.0"
+"postcss-colormin@npm:^7.0.1":
+  version: 7.0.1
+  resolution: "postcss-colormin@npm:7.0.1"
   dependencies:
-    browserslist: "npm:^4.23.0"
+    browserslist: "npm:^4.23.1"
     caniuse-api: "npm:^3.0.0"
     colord: "npm:^2.9.3"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/d365a5365e0a94748309d32c7208cd06249bc53eb82cc32c771de4073b109fa8552e58d60dbe84d7e69e68081ed8a01fbf645d38a650e90cb2e13b21043cd796
+  checksum: 10c0/e01e9e129ce39320cf10bb09ee2a3ab5b44b77805d3f7827eea07297644838b85c33b78996eeae0a1aba327ffd72a6ab1d24949ebc831523e310e916d5500371
   languageName: node
   linkType: hard
 
-"postcss-convert-values@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "postcss-convert-values@npm:7.0.0"
+"postcss-convert-values@npm:^7.0.1":
+  version: 7.0.1
+  resolution: "postcss-convert-values@npm:7.0.1"
   dependencies:
-    browserslist: "npm:^4.23.0"
+    browserslist: "npm:^4.23.1"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/5d7cfa06f307e024574a1842016f006691e0c1932352f53a99ce8f2f9930c64c3c1ae17518e9e4e5176630b99f1beaab37bc339bc779fb07dc543670ae66bb21
+  checksum: 10c0/612f025f179f0f2ad7365db8c0b423614dcb8e1e4061875a4691a39dede0bca758d1a8f9f5c8b08e12af053e9e884f65ca5626ccc723d5b3f420650d67fe3046
   languageName: node
   linkType: hard
 
@@ -13316,12 +13316,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-discard-comments@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "postcss-discard-comments@npm:7.0.0"
+"postcss-discard-comments@npm:^7.0.1":
+  version: 7.0.1
+  resolution: "postcss-discard-comments@npm:7.0.1"
+  dependencies:
+    postcss-selector-parser: "npm:^6.1.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/7fef7deea85c1e68161f69057be19a3aedd54d23c9b464c9b1531faa7a115f0c96a4f0ee3a560ce300578599dbc8114fe0fb744208b20b9d2fd8df1b4b39c58a
+  checksum: 10c0/64de3fced7e0e49dfea6aede8a5ca495b81dcd01c3c47734a5fbc86a3cb2b1ae39e1958e34e9bea64ecabd5fb4d8c287ec1d6189cf175c2434c6b6582da79948
   languageName: node
   linkType: hard
 
@@ -13466,29 +13468,29 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-merge-longhand@npm:^7.0.1":
-  version: 7.0.1
-  resolution: "postcss-merge-longhand@npm:7.0.1"
+"postcss-merge-longhand@npm:^7.0.2":
+  version: 7.0.2
+  resolution: "postcss-merge-longhand@npm:7.0.2"
   dependencies:
     postcss-value-parser: "npm:^4.2.0"
-    stylehacks: "npm:^7.0.1"
+    stylehacks: "npm:^7.0.2"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/e3d20502e65c82c9c4ba2e400bd093ee6b9c1b0019618ccd50eb40ef0e496206dd518c7e655a6986d780d5a52576e32e8f310d00484b15f67c77664a148df6eb
+  checksum: 10c0/71d22418e5850e134bfcf2038acb1c91eeb48d9b6f9e4c0252fee757e11dc4ae351097a855c327fbc38dc7658fa6edc7cc7f458c08bb4044b82c6005dc565fcb
   languageName: node
   linkType: hard
 
-"postcss-merge-rules@npm:^7.0.1":
-  version: 7.0.1
-  resolution: "postcss-merge-rules@npm:7.0.1"
+"postcss-merge-rules@npm:^7.0.2":
+  version: 7.0.2
+  resolution: "postcss-merge-rules@npm:7.0.2"
   dependencies:
-    browserslist: "npm:^4.23.0"
+    browserslist: "npm:^4.23.1"
     caniuse-api: "npm:^3.0.0"
     cssnano-utils: "npm:^5.0.0"
     postcss-selector-parser: "npm:^6.1.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/d380c162327e7aad59efb55cfddc5ec4e3bf51d18b07b832fdd876505279bac3cb44511ada8e1e1992428dcec4f64c7ec457b6ff9109063c5a61abf4b59b7176
+  checksum: 10c0/fbad20382ca45f1b3b5ff704c075f899cc9ba8418ae6effbdeb9e7c1f9b5c24996d1941ad36cd0936d60cbf127a72f235b2cbb0c44d9239a8a61042406d95b4a
   languageName: node
   linkType: hard
 
@@ -13516,27 +13518,28 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-minify-params@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "postcss-minify-params@npm:7.0.0"
+"postcss-minify-params@npm:^7.0.1":
+  version: 7.0.1
+  resolution: "postcss-minify-params@npm:7.0.1"
   dependencies:
-    browserslist: "npm:^4.23.0"
+    browserslist: "npm:^4.23.1"
     cssnano-utils: "npm:^5.0.0"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/28a7ae313a197aeaff8b3fa1e695a6443b11a74258374a05adee6a1b05f5849ef52037b7a5069d6910614b03b4610acdaf4a76f38b89cb42e813a8cb5ec2fc01
+  checksum: 10c0/84e1c4de5af47178c1f48e10ce16341560f32bb2becf5ec9b014103f6c706174bc70885e2e13ced4de9b4f1959fb970193261cbd4751c8b87d5159e859e8c5ec
   languageName: node
   linkType: hard
 
-"postcss-minify-selectors@npm:^7.0.1":
-  version: 7.0.1
-  resolution: "postcss-minify-selectors@npm:7.0.1"
+"postcss-minify-selectors@npm:^7.0.2":
+  version: 7.0.2
+  resolution: "postcss-minify-selectors@npm:7.0.2"
   dependencies:
+    cssesc: "npm:^3.0.0"
     postcss-selector-parser: "npm:^6.1.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/a8ff69657fb1808d8f0f105b13a416426902d6f498a4b7ebb3b96b4b9149e97ee2e2ad6cd98108e2f0b8f781701724e6c51e120e215cee3e40c2d7a2afac755a
+  checksum: 10c0/87e0c21a0135b6c61b58d62c4c1e0cbd3cfb516ff8105db714c6a33a5edc477846ae220399d368e4ef6518529c711aa2dee9ff49e9befd93e83d5c939f3084a1
   languageName: node
   linkType: hard
 
@@ -13661,15 +13664,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-normalize-unicode@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "postcss-normalize-unicode@npm:7.0.0"
+"postcss-normalize-unicode@npm:^7.0.1":
+  version: 7.0.1
+  resolution: "postcss-normalize-unicode@npm:7.0.1"
   dependencies:
-    browserslist: "npm:^4.23.0"
+    browserslist: "npm:^4.23.1"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/f2d6ab0076c006dcf3ed33ba30686f2d29e81a408c66acced22e2c942df6d613697ea786137833dd258aafab5fda4d3eb27df13a82df830357dbad9b79154881
+  checksum: 10c0/fcabac738765f608cb211ac01a19f9a7d784f99d223ef6f31352f37b9bcf008e0ca7849414c9e77116be8660d78b01dba6fc4a87cee7c9a977d3c2741d6a222d
   languageName: node
   linkType: hard
 
@@ -13704,15 +13707,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-ordered-values@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "postcss-ordered-values@npm:7.0.0"
+"postcss-ordered-values@npm:^7.0.1":
+  version: 7.0.1
+  resolution: "postcss-ordered-values@npm:7.0.1"
   dependencies:
     cssnano-utils: "npm:^5.0.0"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/42b14f9518b573318594c2aeb2f13fd1fbe44936d14f1b28a438e7a82644ace9a2946699bebfe7a2d383534dc24e7203c35308d749f3c585a86daa238ad920a4
+  checksum: 10c0/9fc62e9039c7d4fa417d165678b065fc577a7232aa41a94a4e9208ad7db2268e1ce003aaad7c6a569afdf890a43416b0bf21047461505b4e3a16eec311a6eb63
   languageName: node
   linkType: hard
 
@@ -13828,15 +13831,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-reduce-initial@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "postcss-reduce-initial@npm:7.0.0"
+"postcss-reduce-initial@npm:^7.0.1":
+  version: 7.0.1
+  resolution: "postcss-reduce-initial@npm:7.0.1"
   dependencies:
-    browserslist: "npm:^4.23.0"
+    browserslist: "npm:^4.23.1"
     caniuse-api: "npm:^3.0.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/ed50cd680ce258df953b82ce9b3fb52564d08548724577810800e236d017d80430cbccb4b1ad38b0f4d521663598e44ab93136b20064231181ef49e1e113ae10
+  checksum: 10c0/3e7c6c1d0cc4ace38f44971f02d0dd98131af678cf114aa05cfa0c066420019d5329c221ef8507644b8a79d0e76534303f747c97860ac777fe17f57110edefe1
   languageName: node
   linkType: hard
 
@@ -16407,15 +16410,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"stylehacks@npm:^7.0.1":
-  version: 7.0.1
-  resolution: "stylehacks@npm:7.0.1"
+"stylehacks@npm:^7.0.2":
+  version: 7.0.2
+  resolution: "stylehacks@npm:7.0.2"
   dependencies:
-    browserslist: "npm:^4.23.0"
+    browserslist: "npm:^4.23.1"
     postcss-selector-parser: "npm:^6.1.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/538d5d9c6d84906efad3706f0873b85b67fa224f17759b122bad3d60f2928c31204fd658dd16ec952bf54858a3aeaef4643e040c04030459285ce1b13c4cae91
+  checksum: 10c0/552299e869ac430e1076c025ace6c80bdfd5b672632435625eb1bd45ff5611aad7f3ee810e72edc04dc0fc3761e08dec40d27b72c50b95690eea2de43238b8d8
   languageName: node
   linkType: hard
 
@@ -17334,17 +17337,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"update-browserslist-db@npm:^1.0.13":
-  version: 1.0.13
-  resolution: "update-browserslist-db@npm:1.0.13"
+"update-browserslist-db@npm:^1.0.16":
+  version: 1.0.16
+  resolution: "update-browserslist-db@npm:1.0.16"
   dependencies:
-    escalade: "npm:^3.1.1"
-    picocolors: "npm:^1.0.0"
+    escalade: "npm:^3.1.2"
+    picocolors: "npm:^1.0.1"
   peerDependencies:
     browserslist: ">= 4.21.0"
   bin:
     update-browserslist-db: cli.js
-  checksum: 10c0/e52b8b521c78ce1e0c775f356cd16a9c22c70d25f3e01180839c407a5dc787fb05a13f67560cbaf316770d26fa99f78f1acd711b1b54a4f35d4820d4ea7136e6
+  checksum: 10c0/5995399fc202adbb51567e4810e146cdf7af630a92cc969365a099150cb00597e425cc14987ca7080b09a4d0cfd2a3de53fbe72eebff171aed7f9bb81f9bf405
   languageName: node
   linkType: hard
 

From 5f4d231e980665c0946297909df508269fb25dc6 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 19 Jun 2024 05:34:24 -0400
Subject: [PATCH 1343/2191] Use rubocop `DisplayCopNames` and `UseCache`
 defaults (true) (#30750)

---
 .rubocop.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 6da1dc8cbcc648..965f56f3e703e6 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,7 +1,6 @@
 ---
 AllCops:
   CacheRootDirectory: tmp
-  DisplayCopNames: true
   DisplayStyleGuide: true
   Exclude:
     - Vagrantfile
@@ -10,7 +9,6 @@ AllCops:
   ExtraDetails: true
   NewCops: enable
   TargetRubyVersion: 3.1 # Oldest supported ruby version
-  UseCache: true
 
 inherit_from:
   - .rubocop/layout.yml

From 53776cd58f98e93797ebc9fb34f02ccdb6dad01f Mon Sep 17 00:00:00 2001
From: Nick Schonning <nschonni@gmail.com>
Date: Wed, 19 Jun 2024 09:42:36 -0400
Subject: [PATCH 1344/2191] Enable passing ESLint rules (#30726)

---
 .eslintrc.js | 27 +--------------------------
 1 file changed, 1 insertion(+), 26 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index e3afb1c9f23030..d1182628263db2 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -20,10 +20,6 @@ module.exports = defineConfig({
     es6: true,
   },
 
-  globals: {
-    ATTACHMENT_HOST: false,
-  },
-
   parser: '@typescript-eslint/parser',
 
   plugins: [
@@ -79,7 +75,7 @@ module.exports = defineConfig({
         ],
       },
     ],
-    'no-empty': 'off',
+    'no-empty': ['error', { "allowEmptyCatch": true }],
     'no-restricted-properties': [
       'error',
       { property: 'substring', message: 'Use .slice instead of .substring.' },
@@ -94,7 +90,6 @@ module.exports = defineConfig({
         message: "Use '·' (middle dot) instead of '•' (bullet)",
       },
     ],
-    'no-self-assign': 'off',
     'no-unused-expressions': 'error',
     'no-unused-vars': 'off',
     '@typescript-eslint/no-unused-vars': [
@@ -119,12 +114,10 @@ module.exports = defineConfig({
     'react/jsx-tag-spacing': 'error',
     'react/jsx-uses-react': 'off', // not needed with new JSX transform
     'react/jsx-wrap-multilines': 'error',
-    'react/no-deprecated': 'off',
     'react/react-in-jsx-scope': 'off', // not needed with new JSX transform
     'react/self-closing-comp': 'error',
 
     // recommended values found in https://github.com/jsx-eslint/eslint-plugin-jsx-a11y/blob/v6.8.0/src/index.js#L46
-    'jsx-a11y/accessible-emoji': 'warn',
     'jsx-a11y/click-events-have-key-events': 'off',
     'jsx-a11y/label-has-associated-control': 'off',
     'jsx-a11y/media-has-caption': 'off',
@@ -139,23 +132,6 @@ module.exports = defineConfig({
     // ],
     'jsx-a11y/no-interactive-element-to-noninteractive-role': 'off',
     // recommended rule is:
-    // 'jsx-a11y/no-noninteractive-element-interactions': [
-    //   'error',
-    //   {
-    //     body: ['onError', 'onLoad'],
-    //     iframe: ['onError', 'onLoad'],
-    //     img: ['onError', 'onLoad'],
-    //   },
-    // ],
-    'jsx-a11y/no-noninteractive-element-interactions': [
-      'warn',
-      {
-        handlers: [
-          'onClick',
-        ],
-      },
-    ],
-    // recommended rule is:
     // 'jsx-a11y/no-noninteractive-tabindex': [
     //   'error',
     //   {
@@ -165,7 +141,6 @@ module.exports = defineConfig({
     //   },
     // ],
     'jsx-a11y/no-noninteractive-tabindex': 'off',
-    'jsx-a11y/no-onchange': 'off',
     // recommended is full 'error'
     'jsx-a11y/no-static-element-interactions': [
       'warn',

From 84a31319e9900260b54c05fdeec804e182d06573 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 19 Jun 2024 09:46:52 -0400
Subject: [PATCH 1345/2191] Add `match_json_values` and use in AP worker specs
 (#30720)

---
 spec/support/matchers/json/match_json_schema.rb      | 11 +++++++++++
 .../distribute_poll_update_worker_spec.rb            |  2 +-
 spec/workers/activitypub/distribution_worker_spec.rb |  6 +++---
 .../activitypub/move_distribution_worker_spec.rb     | 12 ++++++++----
 .../status_update_distribution_worker_spec.rb        |  4 ++--
 .../activitypub/update_distribution_worker_spec.rb   |  2 +-
 6 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/spec/support/matchers/json/match_json_schema.rb b/spec/support/matchers/json/match_json_schema.rb
index 3a275199efd112..b4ced8addbdc84 100644
--- a/spec/support/matchers/json/match_json_schema.rb
+++ b/spec/support/matchers/json/match_json_schema.rb
@@ -6,3 +6,14 @@
     JSON::Validator.validate(schema_path, input_json, validate_schema: true)
   end
 end
+
+RSpec::Matchers.define :match_json_values do |values|
+  match do |string|
+    expect(json_str_to_hash(string))
+      .to include(values)
+  end
+
+  failure_message do |value|
+    "expected that #{value} would have the same values as #{values}."
+  end
+end
diff --git a/spec/workers/activitypub/distribute_poll_update_worker_spec.rb b/spec/workers/activitypub/distribute_poll_update_worker_spec.rb
index afe2b291fd0228..4427cfdf95988f 100644
--- a/spec/workers/activitypub/distribute_poll_update_worker_spec.rb
+++ b/spec/workers/activitypub/distribute_poll_update_worker_spec.rb
@@ -16,7 +16,7 @@
     end
 
     it 'delivers to followers' do
-      expect_push_bulk_to_match(ActivityPub::DeliveryWorker, [[kind_of(String), account.id, 'http://example.com']]) do
+      expect_push_bulk_to_match(ActivityPub::DeliveryWorker, [[match_json_values(type: 'Update'), account.id, 'http://example.com']]) do
         subject.perform(status.id)
       end
     end
diff --git a/spec/workers/activitypub/distribution_worker_spec.rb b/spec/workers/activitypub/distribution_worker_spec.rb
index 2706967fcaea56..0eb6227859d758 100644
--- a/spec/workers/activitypub/distribution_worker_spec.rb
+++ b/spec/workers/activitypub/distribution_worker_spec.rb
@@ -19,7 +19,7 @@
       end
 
       it 'delivers to followers' do
-        expect_push_bulk_to_match(ActivityPub::DeliveryWorker, [[kind_of(String), status.account.id, 'http://example.com', anything]]) do
+        expect_push_bulk_to_match(ActivityPub::DeliveryWorker, [[match_json_values(type: 'Create'), status.account.id, 'http://example.com', anything]]) do
           subject.perform(status.id)
         end
       end
@@ -31,7 +31,7 @@
       end
 
       it 'delivers to followers' do
-        expect_push_bulk_to_match(ActivityPub::DeliveryWorker, [[kind_of(String), status.account.id, 'http://example.com', anything]]) do
+        expect_push_bulk_to_match(ActivityPub::DeliveryWorker, [[match_json_values(type: 'Create'), status.account.id, 'http://example.com', anything]]) do
           subject.perform(status.id)
         end
       end
@@ -46,7 +46,7 @@
       end
 
       it 'delivers to mentioned accounts' do
-        expect_push_bulk_to_match(ActivityPub::DeliveryWorker, [[kind_of(String), status.account.id, 'https://foo.bar/inbox', anything]]) do
+        expect_push_bulk_to_match(ActivityPub::DeliveryWorker, [[match_json_values(type: 'Create'), status.account.id, 'https://foo.bar/inbox', anything]]) do
           subject.perform(status.id)
         end
       end
diff --git a/spec/workers/activitypub/move_distribution_worker_spec.rb b/spec/workers/activitypub/move_distribution_worker_spec.rb
index 75ca21733ce379..c810b33c23a644 100644
--- a/spec/workers/activitypub/move_distribution_worker_spec.rb
+++ b/spec/workers/activitypub/move_distribution_worker_spec.rb
@@ -16,12 +16,16 @@
     end
 
     it 'delivers to followers and known blockers' do
-      expect_push_bulk_to_match(ActivityPub::DeliveryWorker, [
-                                  [kind_of(String), migration.account.id, 'http://example.com'],
-                                  [kind_of(String), migration.account.id, 'http://example2.com'],
-                                ]) do
+      expect_push_bulk_to_match(ActivityPub::DeliveryWorker, expected_migration_deliveries) do
         subject.perform(migration.id)
       end
     end
+
+    def expected_migration_deliveries
+      [
+        [match_json_values(type: 'Move'), migration.account.id, 'http://example.com'],
+        [match_json_values(type: 'Move'), migration.account.id, 'http://example2.com'],
+      ]
+    end
   end
 end
diff --git a/spec/workers/activitypub/status_update_distribution_worker_spec.rb b/spec/workers/activitypub/status_update_distribution_worker_spec.rb
index a4fd246e534eb9..66e52c4f288281 100644
--- a/spec/workers/activitypub/status_update_distribution_worker_spec.rb
+++ b/spec/workers/activitypub/status_update_distribution_worker_spec.rb
@@ -25,7 +25,7 @@
       end
 
       it 'delivers to followers' do
-        expect_push_bulk_to_match(ActivityPub::DeliveryWorker, [[kind_of(String), status.account.id, 'http://example.com', anything]]) do
+        expect_push_bulk_to_match(ActivityPub::DeliveryWorker, [[match_json_values(type: 'Update'), status.account.id, 'http://example.com', anything]]) do
           subject.perform(status.id)
         end
       end
@@ -37,7 +37,7 @@
       end
 
       it 'delivers to followers' do
-        expect_push_bulk_to_match(ActivityPub::DeliveryWorker, [[kind_of(String), status.account.id, 'http://example.com', anything]]) do
+        expect_push_bulk_to_match(ActivityPub::DeliveryWorker, [[match_json_values(type: 'Update'), status.account.id, 'http://example.com', anything]]) do
           subject.perform(status.id)
         end
       end
diff --git a/spec/workers/activitypub/update_distribution_worker_spec.rb b/spec/workers/activitypub/update_distribution_worker_spec.rb
index 4a0ed050bb7cfe..b183a58dfd074c 100644
--- a/spec/workers/activitypub/update_distribution_worker_spec.rb
+++ b/spec/workers/activitypub/update_distribution_worker_spec.rb
@@ -14,7 +14,7 @@
     end
 
     it 'delivers to followers' do
-      expect_push_bulk_to_match(ActivityPub::DeliveryWorker, [[kind_of(String), account.id, 'http://example.com', anything]]) do
+      expect_push_bulk_to_match(ActivityPub::DeliveryWorker, [[match_json_values(type: 'Update'), account.id, 'http://example.com', anything]]) do
         subject.perform(account.id)
       end
     end

From 8e8cf3666615f24b05dcbcc3616db63bf5c5678a Mon Sep 17 00:00:00 2001
From: Essem <smswessem@gmail.com>
Date: Tue, 18 Jun 2024 14:10:37 -0500
Subject: [PATCH 1346/2191] Turn custom emoji regexps into class level
 constants

---
 app/lib/activitypub/activity/emoji_react.rb | 4 +++-
 app/lib/activitypub/activity/like.rb        | 4 +++-
 app/lib/activitypub/activity/undo.rb        | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/lib/activitypub/activity/emoji_react.rb b/app/lib/activitypub/activity/emoji_react.rb
index cd70d021ca84a8..5720be12230eaf 100644
--- a/app/lib/activitypub/activity/emoji_react.rb
+++ b/app/lib/activitypub/activity/emoji_react.rb
@@ -1,12 +1,14 @@
 # frozen_string_literal: true
 
 class ActivityPub::Activity::EmojiReact < ActivityPub::Activity
+  CUSTOM_EMOJI_REGEX = /^:[^:]+:$/
+
   def perform
     original_status = status_from_uri(object_uri)
     name = @json['content']
     return if original_status.nil? || delete_arrived_first?(@json['id'])
 
-    if /^:.*:$/.match?(name)
+    if CUSTOM_EMOJI_REGEX.match?(name)
       name.delete! ':'
       custom_emoji = process_emoji_tags(name, @json['tag'])
 
diff --git a/app/lib/activitypub/activity/like.rb b/app/lib/activitypub/activity/like.rb
index b0f8d7ba09f9d9..407e49cf8609d4 100644
--- a/app/lib/activitypub/activity/like.rb
+++ b/app/lib/activitypub/activity/like.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class ActivityPub::Activity::Like < ActivityPub::Activity
+  CUSTOM_EMOJI_REGEX = /^:[^:]+:$/
+
   def perform
     original_status = status_from_uri(object_uri)
     return if original_status.nil? || delete_arrived_first?(@json['id'])
@@ -23,7 +25,7 @@ def maybe_process_embedded_reaction
     name = @json['content'] || @json['_misskey_reaction']
     return false if name.nil?
 
-    if /^:.*:$/.match?(name)
+    if CUSTOM_EMOJI_REGEX.match?(name)
       name.delete! ':'
       custom_emoji = process_emoji_tags(name, @json['tag'])
 
diff --git a/app/lib/activitypub/activity/undo.rb b/app/lib/activitypub/activity/undo.rb
index 5f9f1bbecbfaf1..0c7714d6edf0e3 100644
--- a/app/lib/activitypub/activity/undo.rb
+++ b/app/lib/activitypub/activity/undo.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class ActivityPub::Activity::Undo < ActivityPub::Activity
+  CUSTOM_EMOJI_REGEX = /^:[^:]+:$/
+
   def perform
     case @object['type']
     when 'Announce'
@@ -125,7 +127,7 @@ def undo_emoji_react
 
     return if status.nil? || !status.account.local?
 
-    if /^:.*:$/.match?(name)
+    if CUSTOM_EMOJI_REGEX.match?(name)
       name.delete! ':'
       custom_emoji = process_emoji_tags(name, @object['tag'])
 

From f883c171fb4e013593df5f72298c139875d9410b Mon Sep 17 00:00:00 2001
From: Jeremy Kescher <jeremy@kescher.at>
Date: Wed, 19 Jun 2024 17:56:52 +0200
Subject: [PATCH 1347/2191] Bump Catstodon revision to 1.1.1

---
 CHANGELOG.md            | 6 ++++++
 lib/mastodon/version.rb | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f13eda77cd1afa..8c35455f70652c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,12 @@ All changes to Catstodon that aren't Mastodon or glitch-soc Mastodon changes wil
 
 All release dates, as well as most other dates, are intended to be read as "within the day, in UTC time."
 
+## [v4.3.0-alpha.4+glitch+cat+1.1.1] - 2024-06-19
+
+- Upstream changes (18d9601464524dabc4a451524a535d0f9a3cb65e -> 0c2b1f56ef6f0c48330076498741849b79d8b18c)
+- Emoji reaction patch changes
+- "Turn custom emoji regexps into class level constants" by Essem
+
 ## [v4.3.0-alpha.4+glitch+cat+1.1.0] - 2024-06-17
 
 - Set environment variable `MASTODON_USE_LIBVIPS` to true by default.
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index b80a91d6fec166..318b7486e2eb9c 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -25,7 +25,7 @@ def prerelease
     end
 
     def catstodon_revision
-      '1.1.0'
+      '1.1.1'
     end
 
     def build_metadata

From f22da34908a115ffccc70e157f4db589be0b30c5 Mon Sep 17 00:00:00 2001
From: Jeremy Kescher <jeremy@kescher.at>
Date: Wed, 19 Jun 2024 18:54:20 +0200
Subject: [PATCH 1348/2191] Fix indentation of CHANGELOG

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8c35455f70652c..82d1510d259916 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,7 +8,7 @@ All release dates, as well as most other dates, are intended to be read as "with
 
 - Upstream changes (18d9601464524dabc4a451524a535d0f9a3cb65e -> 0c2b1f56ef6f0c48330076498741849b79d8b18c)
 - Emoji reaction patch changes
-- "Turn custom emoji regexps into class level constants" by Essem
+  - "Turn custom emoji regexps into class level constants" by Essem
 
 ## [v4.3.0-alpha.4+glitch+cat+1.1.0] - 2024-06-17
 

From 2cda1dd542b20a47245cb8d28a4f6f8750c2284c Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 19 Jun 2024 18:59:37 +0200
Subject: [PATCH 1349/2191] Fix compatibility with Redis < 6.2 again (#30412)

---
 config/application.rb                        |  1 +
 lib/stoplight/redis_data_store_extensions.rb | 17 +++++++++++++++++
 2 files changed, 18 insertions(+)
 create mode 100644 lib/stoplight/redis_data_store_extensions.rb

diff --git a/config/application.rb b/config/application.rb
index 65407da05c91a6..5aca74fd1c60a2 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -49,6 +49,7 @@
 require_relative '../lib/webpacker/helper_extensions'
 require_relative '../lib/rails/engine_extensions'
 require_relative '../lib/action_dispatch/remote_ip_extensions'
+require_relative '../lib/stoplight/redis_data_store_extensions'
 require_relative '../lib/active_record/database_tasks_extensions'
 require_relative '../lib/active_record/batches'
 require_relative '../lib/active_record/with_recursive'
diff --git a/lib/stoplight/redis_data_store_extensions.rb b/lib/stoplight/redis_data_store_extensions.rb
new file mode 100644
index 00000000000000..90074878401db4
--- /dev/null
+++ b/lib/stoplight/redis_data_store_extensions.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+# Restore compatibility with Redis < 6.2
+
+module Stoplight
+  module DataStore
+    module RedisExtensions
+      def query_failures(light, transaction: @redis)
+        window_start = Time.now.to_i - light.window_size
+
+        transaction.zrevrangebyscore(failures_key(light), Float::INFINITY, window_start)
+      end
+    end
+  end
+end
+
+Stoplight::DataStore::Redis.prepend(Stoplight::DataStore::RedisExtensions)

From cb7121e5a9ad4f0fa0a2d4a6058b3889570ca76e Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 20 Jun 2024 09:42:28 +0200
Subject: [PATCH 1350/2191] chore(deps): update dependency rspec-rails to
 v6.1.3 (#30770)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 41fc86c8af5d9c..1f8645a59e1821 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -702,7 +702,7 @@ GEM
     rqrcode_core (1.2.0)
     rspec-core (3.13.0)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.0)
+    rspec-expectations (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-github (2.4.0)
@@ -710,7 +710,7 @@ GEM
     rspec-mocks (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-rails (6.1.2)
+    rspec-rails (6.1.3)
       actionpack (>= 6.1)
       activesupport (>= 6.1)
       railties (>= 6.1)
@@ -891,7 +891,7 @@ GEM
     xorcist (1.1.3)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.15)
+    zeitwerk (2.6.16)
 
 PLATFORMS
   ruby

From a0910cd49ca0f455ed6616deb429b41dc55e2207 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 20 Jun 2024 11:03:28 +0200
Subject: [PATCH 1351/2191] New Crowdin Translations (automated) (#30772)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/ko.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index aa05887d65567e..c4c084d98ee046 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -32,7 +32,7 @@
   "account.featured_tags.last_status_never": "게시물 없음",
   "account.featured_tags.title": "{name} 님의 추천 해시태그",
   "account.follow": "팔로우",
-  "account.follow_back": "맞팔로우",
+  "account.follow_back": "맞팔로우 하기",
   "account.followers": "팔로워",
   "account.followers.empty": "아직 아무도 이 사용자를 팔로우하고 있지 않습니다.",
   "account.followers_counter": "{counter} 팔로워",
@@ -53,7 +53,7 @@
   "account.mute_notifications_short": "알림 뮤트",
   "account.mute_short": "뮤트",
   "account.muted": "뮤트됨",
-  "account.mutual": "상호 팔로우",
+  "account.mutual": "맞팔로우 중",
   "account.no_bio": "제공된 설명이 없습니다.",
   "account.open_original_page": "원본 페이지 열기",
   "account.posts": "게시물",

From 7889e983fbe7e29f3f91784cfa2117e620514ad7 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 20 Jun 2024 13:05:25 +0200
Subject: [PATCH 1352/2191] Add `group_key` attribute to
 `NotificationSerializer`  (#30776)

Co-authored-by: Renaud Chaput <renchap@gmail.com>
---
 app/serializers/rest/notification_serializer.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/serializers/rest/notification_serializer.rb b/app/serializers/rest/notification_serializer.rb
index 417245d19dda7a..966819585fcc7c 100644
--- a/app/serializers/rest/notification_serializer.rb
+++ b/app/serializers/rest/notification_serializer.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class REST::NotificationSerializer < ActiveModel::Serializer
-  attributes :id, :type, :created_at
+  attributes :id, :type, :created_at, :group_key
 
   belongs_to :from_account, key: :account, serializer: REST::AccountSerializer
   belongs_to :target_status, key: :status, if: :status_type?, serializer: REST::StatusSerializer
@@ -13,6 +13,10 @@ def id
     object.id.to_s
   end
 
+  def group_key
+    object.group_key || "ungrouped-#{object.id}"
+  end
+
   def status_type?
     [:favourite, :reblog, :status, :mention, :poll, :update].include?(object.type)
   end

From 27529247b289a0e78d2deb97626ddb60baf04d86 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Thu, 20 Jun 2024 13:42:10 +0200
Subject: [PATCH 1353/2191] Improve `createdataLoadingThunk` (#30778)

---
 .../mastodon/store/typed_functions.ts         | 36 +++++++++++++------
 1 file changed, 25 insertions(+), 11 deletions(-)

diff --git a/app/javascript/mastodon/store/typed_functions.ts b/app/javascript/mastodon/store/typed_functions.ts
index dae37e62255269..e5820149dbd9d7 100644
--- a/app/javascript/mastodon/store/typed_functions.ts
+++ b/app/javascript/mastodon/store/typed_functions.ts
@@ -82,13 +82,19 @@ export function createThunk<Arg = void, Returned = void>(
 const discardLoadDataInPayload = Symbol('discardLoadDataInPayload');
 type DiscardLoadData = typeof discardLoadDataInPayload;
 
-type OnData<LoadDataResult, ReturnedData> = (
+type OnData<ActionArg, LoadDataResult, ReturnedData> = (
   data: LoadDataResult,
   api: AppThunkApi & {
+    actionArg: ActionArg;
     discardLoadData: DiscardLoadData;
   },
 ) => ReturnedData | DiscardLoadData | Promise<ReturnedData | DiscardLoadData>;
 
+type LoadData<Args, LoadDataResult> = (
+  args: Args,
+  api: AppThunkApi,
+) => Promise<LoadDataResult>;
+
 type ArgsType = Record<string, unknown> | undefined;
 
 // Overload when there is no `onData` method, the payload is the `onData` result
@@ -101,18 +107,18 @@ export function createDataLoadingThunk<LoadDataResult, Args extends ArgsType>(
 // Overload when the `onData` method returns discardLoadDataInPayload, then the payload is empty
 export function createDataLoadingThunk<LoadDataResult, Args extends ArgsType>(
   name: string,
-  loadData: (args: Args) => Promise<LoadDataResult>,
+  loadData: LoadData<Args, LoadDataResult>,
   onDataOrThunkOptions?:
     | AppThunkOptions
-    | OnData<LoadDataResult, DiscardLoadData>,
+    | OnData<Args, LoadDataResult, DiscardLoadData>,
   thunkOptions?: AppThunkOptions,
 ): ReturnType<typeof createThunk<Args, void>>;
 
 // Overload when the `onData` method returns nothing, then the mayload is the `onData` result
 export function createDataLoadingThunk<LoadDataResult, Args extends ArgsType>(
   name: string,
-  loadData: (args: Args) => Promise<LoadDataResult>,
-  onDataOrThunkOptions?: AppThunkOptions | OnData<LoadDataResult, void>,
+  loadData: LoadData<Args, LoadDataResult>,
+  onDataOrThunkOptions?: AppThunkOptions | OnData<Args, LoadDataResult, void>,
   thunkOptions?: AppThunkOptions,
 ): ReturnType<typeof createThunk<Args, LoadDataResult>>;
 
@@ -123,8 +129,10 @@ export function createDataLoadingThunk<
   Returned,
 >(
   name: string,
-  loadData: (args: Args) => Promise<LoadDataResult>,
-  onDataOrThunkOptions?: AppThunkOptions | OnData<LoadDataResult, Returned>,
+  loadData: LoadData<Args, LoadDataResult>,
+  onDataOrThunkOptions?:
+    | AppThunkOptions
+    | OnData<Args, LoadDataResult, Returned>,
   thunkOptions?: AppThunkOptions,
 ): ReturnType<typeof createThunk<Args, Returned>>;
 
@@ -159,11 +167,13 @@ export function createDataLoadingThunk<
   Returned,
 >(
   name: string,
-  loadData: (args: Args) => Promise<LoadDataResult>,
-  onDataOrThunkOptions?: AppThunkOptions | OnData<LoadDataResult, Returned>,
+  loadData: LoadData<Args, LoadDataResult>,
+  onDataOrThunkOptions?:
+    | AppThunkOptions
+    | OnData<Args, LoadDataResult, Returned>,
   maybeThunkOptions?: AppThunkOptions,
 ) {
-  let onData: OnData<LoadDataResult, Returned> | undefined;
+  let onData: OnData<Args, LoadDataResult, Returned> | undefined;
   let thunkOptions: AppThunkOptions | undefined;
 
   if (typeof onDataOrThunkOptions === 'function') onData = onDataOrThunkOptions;
@@ -177,7 +187,10 @@ export function createDataLoadingThunk<
   return createThunk<Args, Returned>(
     name,
     async (arg, { getState, dispatch }) => {
-      const data = await loadData(arg);
+      const data = await loadData(arg, {
+        dispatch,
+        getState,
+      });
 
       if (!onData) return data as Returned;
 
@@ -185,6 +198,7 @@ export function createDataLoadingThunk<
         dispatch,
         getState,
         discardLoadData: discardLoadDataInPayload,
+        actionArg: arg,
       });
 
       // if there is no return in `onData`, we return the `onData` result

From 1c6593277696c6f4698684860f7c6d6189f9b371 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Thu, 20 Jun 2024 13:56:52 +0200
Subject: [PATCH 1354/2191] Convert `disconnectTimeline` and `timelineDelete`
 actions to Typescript (#30777)

---
 app/javascript/mastodon/actions/streaming.js  |  2 +-
 app/javascript/mastodon/actions/timelines.js  | 21 +++++--------------
 .../mastodon/actions/timelines_typed.ts       | 20 ++++++++++++++++++
 .../features/account_timeline/index.jsx       |  4 ++--
 app/javascript/mastodon/reducers/compose.js   |  9 ++++----
 app/javascript/mastodon/reducers/contexts.js  |  8 ++++---
 app/javascript/mastodon/reducers/modal.ts     |  7 ++++---
 .../mastodon/reducers/notifications.js        | 13 ++++++------
 .../mastodon/reducers/picture_in_picture.ts   |  8 +++----
 app/javascript/mastodon/reducers/statuses.js  |  7 ++++---
 app/javascript/mastodon/reducers/timelines.js | 15 ++++++-------
 11 files changed, 65 insertions(+), 49 deletions(-)
 create mode 100644 app/javascript/mastodon/actions/timelines_typed.ts

diff --git a/app/javascript/mastodon/actions/streaming.js b/app/javascript/mastodon/actions/streaming.js
index 9daeb3c60fc60b..e7fe1c53ed09ed 100644
--- a/app/javascript/mastodon/actions/streaming.js
+++ b/app/javascript/mastodon/actions/streaming.js
@@ -77,7 +77,7 @@ export const connectTimelineStream = (timelineId, channelName, params = {}, opti
       },
 
       onDisconnect() {
-        dispatch(disconnectTimeline(timelineId));
+        dispatch(disconnectTimeline({ timeline: timelineId }));
 
         if (options.fallback) {
           // @ts-expect-error
diff --git a/app/javascript/mastodon/actions/timelines.js b/app/javascript/mastodon/actions/timelines.js
index dc37cdf1f1f471..d1851551b12d15 100644
--- a/app/javascript/mastodon/actions/timelines.js
+++ b/app/javascript/mastodon/actions/timelines.js
@@ -6,9 +6,11 @@ import { usePendingItems as preferPendingItems } from 'mastodon/initial_state';
 
 import { importFetchedStatus, importFetchedStatuses } from './importer';
 import { submitMarkers } from './markers';
+import {timelineDelete} from './timelines_typed';
+
+export { disconnectTimeline } from './timelines_typed';
 
 export const TIMELINE_UPDATE  = 'TIMELINE_UPDATE';
-export const TIMELINE_DELETE  = 'TIMELINE_DELETE';
 export const TIMELINE_CLEAR   = 'TIMELINE_CLEAR';
 
 export const TIMELINE_EXPAND_REQUEST = 'TIMELINE_EXPAND_REQUEST';
@@ -17,7 +19,6 @@ export const TIMELINE_EXPAND_FAIL    = 'TIMELINE_EXPAND_FAIL';
 
 export const TIMELINE_SCROLL_TOP   = 'TIMELINE_SCROLL_TOP';
 export const TIMELINE_LOAD_PENDING = 'TIMELINE_LOAD_PENDING';
-export const TIMELINE_DISCONNECT   = 'TIMELINE_DISCONNECT';
 export const TIMELINE_CONNECT      = 'TIMELINE_CONNECT';
 
 export const TIMELINE_MARK_AS_PARTIAL = 'TIMELINE_MARK_AS_PARTIAL';
@@ -62,16 +63,10 @@ export function updateTimeline(timeline, status, accept) {
 export function deleteFromTimelines(id) {
   return (dispatch, getState) => {
     const accountId  = getState().getIn(['statuses', id, 'account']);
-    const references = getState().get('statuses').filter(status => status.get('reblog') === id).map(status => status.get('id'));
+    const references = getState().get('statuses').filter(status => status.get('reblog') === id).map(status => status.get('id')).toJSON();
     const reblogOf   = getState().getIn(['statuses', id, 'reblog'], null);
 
-    dispatch({
-      type: TIMELINE_DELETE,
-      id,
-      accountId,
-      references,
-      reblogOf,
-    });
+    dispatch(timelineDelete(id, accountId, references, reblogOf));
   };
 }
 
@@ -225,12 +220,6 @@ export function connectTimeline(timeline) {
   };
 }
 
-export const disconnectTimeline = timeline => ({
-  type: TIMELINE_DISCONNECT,
-  timeline,
-  usePendingItems: preferPendingItems,
-});
-
 export const markAsPartial = timeline => ({
   type: TIMELINE_MARK_AS_PARTIAL,
   timeline,
diff --git a/app/javascript/mastodon/actions/timelines_typed.ts b/app/javascript/mastodon/actions/timelines_typed.ts
new file mode 100644
index 00000000000000..07d82b2f015a7c
--- /dev/null
+++ b/app/javascript/mastodon/actions/timelines_typed.ts
@@ -0,0 +1,20 @@
+import { createAction } from '@reduxjs/toolkit';
+
+import { usePendingItems as preferPendingItems } from 'mastodon/initial_state';
+
+export const disconnectTimeline = createAction(
+  'timeline/disconnect',
+  ({ timeline }: { timeline: string }) => ({
+    payload: {
+      timeline,
+      usePendingItems: preferPendingItems,
+    },
+  }),
+);
+
+export const timelineDelete = createAction<{
+  statusId: string;
+  accountId: string;
+  references: string[];
+  reblogOf: string | null;
+}>('timelines/delete');
diff --git a/app/javascript/mastodon/features/account_timeline/index.jsx b/app/javascript/mastodon/features/account_timeline/index.jsx
index 0478f7a1a16b6f..dc69f83e77afaf 100644
--- a/app/javascript/mastodon/features/account_timeline/index.jsx
+++ b/app/javascript/mastodon/features/account_timeline/index.jsx
@@ -133,7 +133,7 @@ class AccountTimeline extends ImmutablePureComponent {
     }
 
     if (prevProps.accountId === me && accountId !== me) {
-      dispatch(disconnectTimeline(`account:${me}`));
+      dispatch(disconnectTimeline({ timeline: `account:${me}` }));
     }
   }
 
@@ -141,7 +141,7 @@ class AccountTimeline extends ImmutablePureComponent {
     const { dispatch, accountId } = this.props;
 
     if (accountId === me) {
-      dispatch(disconnectTimeline(`account:${me}`));
+      dispatch(disconnectTimeline({ timeline: `account:${me}` }));
     }
   }
 
diff --git a/app/javascript/mastodon/reducers/compose.js b/app/javascript/mastodon/reducers/compose.js
index 97218e9f7505d1..9f66c09631d770 100644
--- a/app/javascript/mastodon/reducers/compose.js
+++ b/app/javascript/mastodon/reducers/compose.js
@@ -1,5 +1,7 @@
 import { Map as ImmutableMap, List as ImmutableList, OrderedSet as ImmutableOrderedSet, fromJS } from 'immutable';
 
+import { timelineDelete } from 'mastodon/actions/timelines_typed';
+
 import {
   COMPOSE_MOUNT,
   COMPOSE_UNMOUNT,
@@ -51,7 +53,6 @@ import {
 } from '../actions/compose';
 import { REDRAFT } from '../actions/statuses';
 import { STORE_HYDRATE } from '../actions/store';
-import { TIMELINE_DELETE } from '../actions/timelines';
 import { me } from '../initial_state';
 import { unescapeHTML } from '../utils/html';
 import { uuid } from '../uuid';
@@ -446,10 +447,10 @@ export default function compose(state = initialState, action) {
     return updateSuggestionTags(state, action.token);
   case COMPOSE_TAG_HISTORY_UPDATE:
     return state.set('tagHistory', fromJS(action.tags));
-  case TIMELINE_DELETE:
-    if (action.id === state.get('in_reply_to')) {
+  case timelineDelete.type:
+    if (action.payload.statusId === state.get('in_reply_to')) {
       return state.set('in_reply_to', null);
-    } else if (action.id === state.get('id')) {
+    } else if (action.payload.statusId === state.get('id')) {
       return state.set('id', null);
     } else {
       return state;
diff --git a/app/javascript/mastodon/reducers/contexts.js b/app/javascript/mastodon/reducers/contexts.js
index f7d7419a4e3ab9..b2c6f3f1abeae4 100644
--- a/app/javascript/mastodon/reducers/contexts.js
+++ b/app/javascript/mastodon/reducers/contexts.js
@@ -1,11 +1,13 @@
 import { Map as ImmutableMap, List as ImmutableList } from 'immutable';
 
+import { timelineDelete } from 'mastodon/actions/timelines_typed';
+
 import {
   blockAccountSuccess,
   muteAccountSuccess,
 } from '../actions/accounts';
 import { CONTEXT_FETCH_SUCCESS } from '../actions/statuses';
-import { TIMELINE_DELETE, TIMELINE_UPDATE } from '../actions/timelines';
+import { TIMELINE_UPDATE } from '../actions/timelines';
 import { compareId } from '../compare_id';
 
 const initialState = ImmutableMap({
@@ -97,8 +99,8 @@ export default function replies(state = initialState, action) {
     return filterContexts(state, action.payload.relationship, action.payload.statuses);
   case CONTEXT_FETCH_SUCCESS:
     return normalizeContext(state, action.id, action.ancestors, action.descendants);
-  case TIMELINE_DELETE:
-    return deleteFromContexts(state, [action.id]);
+  case timelineDelete.type:
+    return deleteFromContexts(state, [action.payload.statusId]);
   case TIMELINE_UPDATE:
     return updateContext(state, action.status);
   default:
diff --git a/app/javascript/mastodon/reducers/modal.ts b/app/javascript/mastodon/reducers/modal.ts
index 368f26542c0159..ca85eb8c7f504a 100644
--- a/app/javascript/mastodon/reducers/modal.ts
+++ b/app/javascript/mastodon/reducers/modal.ts
@@ -1,10 +1,11 @@
 import type { Reducer } from '@reduxjs/toolkit';
 import { Record as ImmutableRecord, Stack } from 'immutable';
 
+import { timelineDelete } from 'mastodon/actions/timelines_typed';
+
 import { COMPOSE_UPLOAD_CHANGE_SUCCESS } from '../actions/compose';
 import type { ModalType } from '../actions/modal';
 import { openModal, closeModal } from '../actions/modal';
-import { TIMELINE_DELETE } from '../actions/timelines';
 
 export type ModalProps = Record<string, unknown>;
 interface Modal {
@@ -72,10 +73,10 @@ export const modalReducer: Reducer<State> = (state = initialState, action) => {
   // TODO: type those actions
   else if (action.type === COMPOSE_UPLOAD_CHANGE_SUCCESS)
     return popModal(state, { modalType: 'FOCAL_POINT', ignoreFocus: false });
-  else if (action.type === TIMELINE_DELETE)
+  else if (timelineDelete.match(action))
     return state.update('stack', (stack) =>
       stack.filterNot(
-        (modal) => modal.get('modalProps').statusId === action.id,
+        (modal) => modal.get('modalProps').statusId === action.payload.statusId,
       ),
     );
   else return state;
diff --git a/app/javascript/mastodon/reducers/notifications.js b/app/javascript/mastodon/reducers/notifications.js
index 64cddcb666864f..79aa5651ff1da6 100644
--- a/app/javascript/mastodon/reducers/notifications.js
+++ b/app/javascript/mastodon/reducers/notifications.js
@@ -1,6 +1,7 @@
 import { fromJS, Map as ImmutableMap, List as ImmutableList } from 'immutable';
 
 import { blockDomainSuccess } from 'mastodon/actions/domain_blocks';
+import { timelineDelete } from 'mastodon/actions/timelines_typed';
 
 import {
   authorizeFollowRequestSuccess,
@@ -30,7 +31,7 @@ import {
   NOTIFICATIONS_SET_BROWSER_SUPPORT,
   NOTIFICATIONS_SET_BROWSER_PERMISSION,
 } from '../actions/notifications';
-import { TIMELINE_DELETE, TIMELINE_DISCONNECT } from '../actions/timelines';
+import { disconnectTimeline } from '../actions/timelines';
 import { compareId } from '../compare_id';
 
 const initialState = ImmutableMap({
@@ -291,11 +292,11 @@ export default function notifications(state = initialState, action) {
     return filterNotifications(state, [action.payload.id], 'follow_request');
   case NOTIFICATIONS_CLEAR:
     return state.set('items', ImmutableList()).set('pendingItems', ImmutableList()).set('hasMore', false);
-  case TIMELINE_DELETE:
-    return deleteByStatus(state, action.id);
-  case TIMELINE_DISCONNECT:
-    return action.timeline === 'home' ?
-      state.update(action.usePendingItems ? 'pendingItems' : 'items', items => items.first() ? items.unshift(null) : items) :
+  case timelineDelete.type:
+    return deleteByStatus(state, action.payload.statusId);
+  case disconnectTimeline.type:
+    return action.payload.timeline === 'home' ?
+      state.update(action.payload.usePendingItems ? 'pendingItems' : 'items', items => items.first() ? items.unshift(null) : items) :
       state;
   case NOTIFICATIONS_MARK_AS_READ:
     const lastNotification = state.get('items').find(item => item !== null);
diff --git a/app/javascript/mastodon/reducers/picture_in_picture.ts b/app/javascript/mastodon/reducers/picture_in_picture.ts
index 0feddcb706319f..10d4f1fae51233 100644
--- a/app/javascript/mastodon/reducers/picture_in_picture.ts
+++ b/app/javascript/mastodon/reducers/picture_in_picture.ts
@@ -4,8 +4,7 @@ import {
   deployPictureInPictureAction,
   removePictureInPicture,
 } from 'mastodon/actions/picture_in_picture';
-
-import { TIMELINE_DELETE } from '../actions/timelines';
+import { timelineDelete } from 'mastodon/actions/timelines_typed';
 
 export interface PIPMediaProps {
   src: string;
@@ -49,8 +48,9 @@ export const pictureInPictureReducer: Reducer<PIPState> = (
       ...action.payload.props,
     };
   else if (removePictureInPicture.match(action)) return initialState;
-  else if (action.type === TIMELINE_DELETE)
-    if (state.type && state.statusId === action.id) return initialState;
+  else if (timelineDelete.match(action))
+    if (state.type && state.statusId === action.payload.statusId)
+      return initialState;
 
   return state;
 };
diff --git a/app/javascript/mastodon/reducers/statuses.js b/app/javascript/mastodon/reducers/statuses.js
index ca766f73a36e5d..d92174f8063bc5 100644
--- a/app/javascript/mastodon/reducers/statuses.js
+++ b/app/javascript/mastodon/reducers/statuses.js
@@ -1,5 +1,7 @@
 import { Map as ImmutableMap, fromJS } from 'immutable';
 
+import { timelineDelete } from 'mastodon/actions/timelines_typed';
+
 import { STATUS_IMPORT, STATUSES_IMPORT } from '../actions/importer';
 import { normalizeStatusTranslation } from '../actions/importer/normalizer';
 import {
@@ -27,7 +29,6 @@ import {
   STATUS_FETCH_REQUEST,
   STATUS_FETCH_FAIL,
 } from '../actions/statuses';
-import { TIMELINE_DELETE } from '../actions/timelines';
 
 const importStatus = (state, status) => state.set(status.id, fromJS(status));
 
@@ -114,8 +115,8 @@ export default function statuses(state = initialState, action) {
     });
   case STATUS_COLLAPSE:
     return state.setIn([action.id, 'collapsed'], action.isCollapsed);
-  case TIMELINE_DELETE:
-    return deleteStatus(state, action.id, action.references);
+  case timelineDelete.type:
+    return deleteStatus(state, action.payload.statusId, action.payload.references);
   case STATUS_TRANSLATE_SUCCESS:
     return statusTranslateSuccess(state, action.id, action.translation);
   case STATUS_TRANSLATE_UNDO:
diff --git a/app/javascript/mastodon/reducers/timelines.js b/app/javascript/mastodon/reducers/timelines.js
index 4c9ab98a82ec65..786d20b3073f8d 100644
--- a/app/javascript/mastodon/reducers/timelines.js
+++ b/app/javascript/mastodon/reducers/timelines.js
@@ -1,5 +1,7 @@
 import { Map as ImmutableMap, List as ImmutableList, OrderedSet as ImmutableOrderedSet, fromJS } from 'immutable';
 
+import { timelineDelete } from 'mastodon/actions/timelines_typed';
+
 import {
   blockAccountSuccess,
   muteAccountSuccess,
@@ -7,19 +9,18 @@ import {
 } from '../actions/accounts';
 import {
   TIMELINE_UPDATE,
-  TIMELINE_DELETE,
   TIMELINE_CLEAR,
   TIMELINE_EXPAND_SUCCESS,
   TIMELINE_EXPAND_REQUEST,
   TIMELINE_EXPAND_FAIL,
   TIMELINE_SCROLL_TOP,
   TIMELINE_CONNECT,
-  TIMELINE_DISCONNECT,
   TIMELINE_LOAD_PENDING,
   TIMELINE_MARK_AS_PARTIAL,
   TIMELINE_INSERT,
   TIMELINE_GAP,
   TIMELINE_SUGGESTIONS,
+  disconnectTimeline,
 } from '../actions/timelines';
 import { compareId } from '../compare_id';
 
@@ -201,8 +202,8 @@ export default function timelines(state = initialState, action) {
     return expandNormalizedTimeline(state, action.timeline, fromJS(action.statuses), action.next, action.partial, action.isLoadingRecent, action.usePendingItems);
   case TIMELINE_UPDATE:
     return updateTimeline(state, action.timeline, fromJS(action.status), action.usePendingItems);
-  case TIMELINE_DELETE:
-    return deleteStatus(state, action.id, action.references, action.reblogOf);
+  case timelineDelete.type:
+    return deleteStatus(state, action.payload.statusId, action.payload.references, action.payload.reblogOf);
   case TIMELINE_CLEAR:
     return clearTimeline(state, action.timeline);
   case blockAccountSuccess.type:
@@ -214,11 +215,11 @@ export default function timelines(state = initialState, action) {
     return updateTop(state, action.timeline, action.top);
   case TIMELINE_CONNECT:
     return state.update(action.timeline, initialTimeline, map => reconnectTimeline(map, action.usePendingItems));
-  case TIMELINE_DISCONNECT:
+  case disconnectTimeline.type:
     return state.update(
-      action.timeline,
+      action.payload.timeline,
       initialTimeline,
-      map => map.set('online', false).update(action.usePendingItems ? 'pendingItems' : 'items', items => items.first() ? items.unshift(TIMELINE_GAP) : items),
+      map => map.set('online', false).update(action.payload.usePendingItems ? 'pendingItems' : 'items', items => items.first() ? items.unshift(TIMELINE_GAP) : items),
     );
   case TIMELINE_MARK_AS_PARTIAL:
     return state.update(

From c97e798d8cc36c22e7a622628a97fb07954db993 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Thu, 20 Jun 2024 13:42:10 +0200
Subject: [PATCH 1355/2191] [Glitch] Improve `createdataLoadingThunk`

Port 27529247b289a0e78d2deb97626ddb60baf04d86 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/store/typed_functions.ts  | 36 +++++++++++++------
 1 file changed, 25 insertions(+), 11 deletions(-)

diff --git a/app/javascript/flavours/glitch/store/typed_functions.ts b/app/javascript/flavours/glitch/store/typed_functions.ts
index dae37e62255269..e5820149dbd9d7 100644
--- a/app/javascript/flavours/glitch/store/typed_functions.ts
+++ b/app/javascript/flavours/glitch/store/typed_functions.ts
@@ -82,13 +82,19 @@ export function createThunk<Arg = void, Returned = void>(
 const discardLoadDataInPayload = Symbol('discardLoadDataInPayload');
 type DiscardLoadData = typeof discardLoadDataInPayload;
 
-type OnData<LoadDataResult, ReturnedData> = (
+type OnData<ActionArg, LoadDataResult, ReturnedData> = (
   data: LoadDataResult,
   api: AppThunkApi & {
+    actionArg: ActionArg;
     discardLoadData: DiscardLoadData;
   },
 ) => ReturnedData | DiscardLoadData | Promise<ReturnedData | DiscardLoadData>;
 
+type LoadData<Args, LoadDataResult> = (
+  args: Args,
+  api: AppThunkApi,
+) => Promise<LoadDataResult>;
+
 type ArgsType = Record<string, unknown> | undefined;
 
 // Overload when there is no `onData` method, the payload is the `onData` result
@@ -101,18 +107,18 @@ export function createDataLoadingThunk<LoadDataResult, Args extends ArgsType>(
 // Overload when the `onData` method returns discardLoadDataInPayload, then the payload is empty
 export function createDataLoadingThunk<LoadDataResult, Args extends ArgsType>(
   name: string,
-  loadData: (args: Args) => Promise<LoadDataResult>,
+  loadData: LoadData<Args, LoadDataResult>,
   onDataOrThunkOptions?:
     | AppThunkOptions
-    | OnData<LoadDataResult, DiscardLoadData>,
+    | OnData<Args, LoadDataResult, DiscardLoadData>,
   thunkOptions?: AppThunkOptions,
 ): ReturnType<typeof createThunk<Args, void>>;
 
 // Overload when the `onData` method returns nothing, then the mayload is the `onData` result
 export function createDataLoadingThunk<LoadDataResult, Args extends ArgsType>(
   name: string,
-  loadData: (args: Args) => Promise<LoadDataResult>,
-  onDataOrThunkOptions?: AppThunkOptions | OnData<LoadDataResult, void>,
+  loadData: LoadData<Args, LoadDataResult>,
+  onDataOrThunkOptions?: AppThunkOptions | OnData<Args, LoadDataResult, void>,
   thunkOptions?: AppThunkOptions,
 ): ReturnType<typeof createThunk<Args, LoadDataResult>>;
 
@@ -123,8 +129,10 @@ export function createDataLoadingThunk<
   Returned,
 >(
   name: string,
-  loadData: (args: Args) => Promise<LoadDataResult>,
-  onDataOrThunkOptions?: AppThunkOptions | OnData<LoadDataResult, Returned>,
+  loadData: LoadData<Args, LoadDataResult>,
+  onDataOrThunkOptions?:
+    | AppThunkOptions
+    | OnData<Args, LoadDataResult, Returned>,
   thunkOptions?: AppThunkOptions,
 ): ReturnType<typeof createThunk<Args, Returned>>;
 
@@ -159,11 +167,13 @@ export function createDataLoadingThunk<
   Returned,
 >(
   name: string,
-  loadData: (args: Args) => Promise<LoadDataResult>,
-  onDataOrThunkOptions?: AppThunkOptions | OnData<LoadDataResult, Returned>,
+  loadData: LoadData<Args, LoadDataResult>,
+  onDataOrThunkOptions?:
+    | AppThunkOptions
+    | OnData<Args, LoadDataResult, Returned>,
   maybeThunkOptions?: AppThunkOptions,
 ) {
-  let onData: OnData<LoadDataResult, Returned> | undefined;
+  let onData: OnData<Args, LoadDataResult, Returned> | undefined;
   let thunkOptions: AppThunkOptions | undefined;
 
   if (typeof onDataOrThunkOptions === 'function') onData = onDataOrThunkOptions;
@@ -177,7 +187,10 @@ export function createDataLoadingThunk<
   return createThunk<Args, Returned>(
     name,
     async (arg, { getState, dispatch }) => {
-      const data = await loadData(arg);
+      const data = await loadData(arg, {
+        dispatch,
+        getState,
+      });
 
       if (!onData) return data as Returned;
 
@@ -185,6 +198,7 @@ export function createDataLoadingThunk<
         dispatch,
         getState,
         discardLoadData: discardLoadDataInPayload,
+        actionArg: arg,
       });
 
       // if there is no return in `onData`, we return the `onData` result

From f723370c6982d914695378ef70949b22a8bb235d Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 20 Jun 2024 15:44:49 +0200
Subject: [PATCH 1356/2191] Fix missing `account_warning` delegation in
 `NotificationGroup` (#30779)

---
 app/models/notification_group.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/models/notification_group.rb b/app/models/notification_group.rb
index 43612d49bbdc13..093fdbe33ce65f 100644
--- a/app/models/notification_group.rb
+++ b/app/models/notification_group.rb
@@ -29,5 +29,6 @@ def self.from_notification(notification)
            :target_status,
            :report,
            :account_relationship_severance_event,
+           :account_warning,
            to: :notification, prefix: false
 end

From 6ab6146c0be04271d9da1dc57b842e8998fbbfb9 Mon Sep 17 00:00:00 2001
From: Nick Schonning <nschonni@gmail.com>
Date: Thu, 20 Jun 2024 11:30:49 -0400
Subject: [PATCH 1357/2191] Remove --no-exclude-limit for RuboCop ToDo (#30427)

---
 .rubocop_todo.yml | 50 +++--------------------------------------------
 1 file changed, 3 insertions(+), 47 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 8a4e5980308023..fb3a928d343d50 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,6 +1,6 @@
 # This configuration was generated by
-# `rubocop --auto-gen-config --auto-gen-only-exclude --no-exclude-limit --no-offense-counts --no-auto-gen-timestamp`
-# using RuboCop version 1.63.5.
+# `rubocop --auto-gen-config --auto-gen-only-exclude --no-offense-counts --no-auto-gen-timestamp`
+# using RuboCop version 1.64.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -55,7 +55,6 @@ Style/FetchEnvVar:
     - 'config/initializers/vapid.rb'
     - 'lib/mastodon/redis_config.rb'
     - 'lib/tasks/repo.rake'
-    - 'spec/system/profile_spec.rb'
 
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle, MaxUnannotatedPlaceholdersAllowed, AllowedMethods, AllowedPatterns.
@@ -66,40 +65,10 @@ Style/FormatStringToken:
     - 'config/initializers/devise.rb'
     - 'lib/paperclip/color_extractor.rb'
 
-# This cop supports unsafe autocorrection (--autocorrect-all).
-Style/GlobalStdStream:
-  Exclude:
-    - 'config/environments/development.rb'
-    - 'config/environments/production.rb'
-
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: MinBodyLength, AllowConsecutiveConditionals.
 Style/GuardClause:
-  Exclude:
-    - 'app/lib/activitypub/activity/block.rb'
-    - 'app/lib/request.rb'
-    - 'app/lib/request_pool.rb'
-    - 'app/lib/webfinger.rb'
-    - 'app/lib/webfinger_resource.rb'
-    - 'app/models/concerns/account/counters.rb'
-    - 'app/models/concerns/user/ldap_authenticable.rb'
-    - 'app/models/tag.rb'
-    - 'app/models/user.rb'
-    - 'app/services/fan_out_on_write_service.rb'
-    - 'app/services/post_status_service.rb'
-    - 'app/services/process_hashtags_service.rb'
-    - 'app/workers/move_worker.rb'
-    - 'app/workers/redownload_avatar_worker.rb'
-    - 'app/workers/redownload_header_worker.rb'
-    - 'app/workers/redownload_media_worker.rb'
-    - 'app/workers/remote_account_refresh_worker.rb'
-    - 'config/initializers/devise.rb'
-    - 'lib/devise/strategies/two_factor_ldap_authenticatable.rb'
-    - 'lib/devise/strategies/two_factor_pam_authenticatable.rb'
-    - 'lib/mastodon/cli/accounts.rb'
-    - 'lib/mastodon/cli/maintenance.rb'
-    - 'lib/mastodon/cli/media.rb'
-    - 'lib/tasks/repo.rake'
+  Enabled: false
 
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Style/HashTransformValues:
@@ -121,16 +90,10 @@ Style/MutableConstant:
     - 'app/services/delete_account_service.rb'
     - 'lib/mastodon/migration_warning.rb'
 
-# This cop supports safe autocorrection (--autocorrect).
-Style/NilLambda:
-  Exclude:
-    - 'config/initializers/paperclip.rb'
-
 # Configuration parameters: AllowedMethods.
 # AllowedMethods: respond_to_missing?
 Style/OptionalBooleanParameter:
   Exclude:
-    - 'app/helpers/admin/account_moderation_notes_helper.rb'
     - 'app/helpers/jsonld_helper.rb'
     - 'app/lib/admin/system_check/message.rb'
     - 'app/lib/request.rb'
@@ -154,13 +117,6 @@ Style/RedundantConstantBase:
     - 'config/environments/production.rb'
     - 'config/initializers/sidekiq.rb'
 
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: ConvertCodeThatCanStartToReturnNil, AllowedMethods, MaxChainLength.
-# AllowedMethods: present?, blank?, presence, try, try!
-Style/SafeNavigation:
-  Exclude:
-    - 'app/models/concerns/account/finder_concern.rb'
-
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: WordRegex.
 # SupportedStyles: percent, brackets

From bb2d77b4a07e95e7d96df080f2d6994c1422b0c0 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 20 Jun 2024 17:54:50 +0200
Subject: [PATCH 1358/2191] Change `/api/v2_alpha/notifications` to only return
 historical data in pages (#30781)

---
 app/controllers/api/v2_alpha/notifications_controller.rb | 2 +-
 app/models/notification_group.rb                         | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/controllers/api/v2_alpha/notifications_controller.rb b/app/controllers/api/v2_alpha/notifications_controller.rb
index 19d3ac9018f014..edba23ab4a823c 100644
--- a/app/controllers/api/v2_alpha/notifications_controller.rb
+++ b/app/controllers/api/v2_alpha/notifications_controller.rb
@@ -15,7 +15,7 @@ def index
       @relationships = StatusRelationshipsPresenter.new(target_statuses_from_notifications, current_user&.account_id)
     end
 
-    render json: @notifications.map { |notification| NotificationGroup.from_notification(notification) }, each_serializer: REST::NotificationGroupSerializer, relationships: @relationships, group_metadata: @group_metadata
+    render json: @notifications.map { |notification| NotificationGroup.from_notification(notification, max_id: @group_metadata.dig(notification.group_key, :max_id)) }, each_serializer: REST::NotificationGroupSerializer, relationships: @relationships, group_metadata: @group_metadata
   end
 
   def show
diff --git a/app/models/notification_group.rb b/app/models/notification_group.rb
index 093fdbe33ce65f..b1cbd7c19abf9f 100644
--- a/app/models/notification_group.rb
+++ b/app/models/notification_group.rb
@@ -3,13 +3,16 @@
 class NotificationGroup < ActiveModelSerializers::Model
   attributes :group_key, :sample_accounts, :notifications_count, :notification, :most_recent_notification_id
 
-  def self.from_notification(notification)
+  def self.from_notification(notification, max_id: nil)
     if notification.group_key.present?
       # TODO: caching and preloading
-      most_recent_notifications = notification.account.notifications.where(group_key: notification.group_key).order(id: :desc).take(3)
+      scope = notification.account.notifications.where(group_key: notification.group_key)
+      scope = scope.where(id: ..max_id) if max_id.present?
+
+      most_recent_notifications = scope.order(id: :desc).take(3)
       most_recent_id = most_recent_notifications.first.id
       sample_accounts = most_recent_notifications.map(&:from_account)
-      notifications_count = notification.account.notifications.where(group_key: notification.group_key).count
+      notifications_count = scope.count
     else
       most_recent_id = notification.id
       sample_accounts = [notification.from_account]

From 8ae61fdee58706c98a8f4178ad726b81633a839e Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Thu, 20 Jun 2024 13:56:52 +0200
Subject: [PATCH 1359/2191] [Glitch] Convert `disconnectTimeline` and
 `timelineDelete` actions to Typescript

Port 1c6593277696c6f4698684860f7c6d6189f9b371 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/actions/streaming.js      |  2 +-
 .../flavours/glitch/actions/timelines.js      | 21 +++++--------------
 .../glitch/actions/timelines_typed.ts         | 20 ++++++++++++++++++
 .../flavours/glitch/reducers/compose.js       |  9 ++++----
 .../flavours/glitch/reducers/contexts.js      |  8 ++++---
 .../flavours/glitch/reducers/modal.ts         |  7 ++++---
 .../flavours/glitch/reducers/notifications.js | 13 ++++++------
 .../glitch/reducers/picture_in_picture.ts     |  8 +++----
 .../flavours/glitch/reducers/statuses.js      |  7 ++++---
 .../flavours/glitch/reducers/timelines.js     | 15 ++++++-------
 10 files changed, 63 insertions(+), 47 deletions(-)
 create mode 100644 app/javascript/flavours/glitch/actions/timelines_typed.ts

diff --git a/app/javascript/flavours/glitch/actions/streaming.js b/app/javascript/flavours/glitch/actions/streaming.js
index d8341a5c1682ce..a55240646f3e69 100644
--- a/app/javascript/flavours/glitch/actions/streaming.js
+++ b/app/javascript/flavours/glitch/actions/streaming.js
@@ -77,7 +77,7 @@ export const connectTimelineStream = (timelineId, channelName, params = {}, opti
       },
 
       onDisconnect() {
-        dispatch(disconnectTimeline(timelineId));
+        dispatch(disconnectTimeline({ timeline: timelineId }));
 
         if (options.fallback) {
           // @ts-expect-error
diff --git a/app/javascript/flavours/glitch/actions/timelines.js b/app/javascript/flavours/glitch/actions/timelines.js
index 1fa2c3cde41e4a..c10f1790e5a45f 100644
--- a/app/javascript/flavours/glitch/actions/timelines.js
+++ b/app/javascript/flavours/glitch/actions/timelines.js
@@ -7,9 +7,11 @@ import { toServerSideType } from 'flavours/glitch/utils/filters';
 
 import { importFetchedStatus, importFetchedStatuses } from './importer';
 import { submitMarkers } from './markers';
+import {timelineDelete} from './timelines_typed';
+
+export { disconnectTimeline } from './timelines_typed';
 
 export const TIMELINE_UPDATE  = 'TIMELINE_UPDATE';
-export const TIMELINE_DELETE  = 'TIMELINE_DELETE';
 export const TIMELINE_CLEAR   = 'TIMELINE_CLEAR';
 
 export const TIMELINE_EXPAND_REQUEST = 'TIMELINE_EXPAND_REQUEST';
@@ -18,7 +20,6 @@ export const TIMELINE_EXPAND_FAIL    = 'TIMELINE_EXPAND_FAIL';
 
 export const TIMELINE_SCROLL_TOP   = 'TIMELINE_SCROLL_TOP';
 export const TIMELINE_LOAD_PENDING = 'TIMELINE_LOAD_PENDING';
-export const TIMELINE_DISCONNECT   = 'TIMELINE_DISCONNECT';
 export const TIMELINE_CONNECT      = 'TIMELINE_CONNECT';
 
 export const TIMELINE_MARK_AS_PARTIAL = 'TIMELINE_MARK_AS_PARTIAL';
@@ -73,16 +74,10 @@ export function updateTimeline(timeline, status, accept) {
 export function deleteFromTimelines(id) {
   return (dispatch, getState) => {
     const accountId  = getState().getIn(['statuses', id, 'account']);
-    const references = getState().get('statuses').filter(status => status.get('reblog') === id).map(status => status.get('id'));
+    const references = getState().get('statuses').filter(status => status.get('reblog') === id).map(status => status.get('id')).toJSON();
     const reblogOf   = getState().getIn(['statuses', id, 'reblog'], null);
 
-    dispatch({
-      type: TIMELINE_DELETE,
-      id,
-      accountId,
-      references,
-      reblogOf,
-    });
+    dispatch(timelineDelete(id, accountId, references, reblogOf));
   };
 }
 
@@ -237,12 +232,6 @@ export function connectTimeline(timeline) {
   };
 }
 
-export const disconnectTimeline = timeline => ({
-  type: TIMELINE_DISCONNECT,
-  timeline,
-  usePendingItems: preferPendingItems,
-});
-
 export const markAsPartial = timeline => ({
   type: TIMELINE_MARK_AS_PARTIAL,
   timeline,
diff --git a/app/javascript/flavours/glitch/actions/timelines_typed.ts b/app/javascript/flavours/glitch/actions/timelines_typed.ts
new file mode 100644
index 00000000000000..485b94ed524fd3
--- /dev/null
+++ b/app/javascript/flavours/glitch/actions/timelines_typed.ts
@@ -0,0 +1,20 @@
+import { createAction } from '@reduxjs/toolkit';
+
+import { usePendingItems as preferPendingItems } from 'flavours/glitch/initial_state';
+
+export const disconnectTimeline = createAction(
+  'timeline/disconnect',
+  ({ timeline }: { timeline: string }) => ({
+    payload: {
+      timeline,
+      usePendingItems: preferPendingItems,
+    },
+  }),
+);
+
+export const timelineDelete = createAction<{
+  statusId: string;
+  accountId: string;
+  references: string[];
+  reblogOf: string | null;
+}>('timelines/delete');
diff --git a/app/javascript/flavours/glitch/reducers/compose.js b/app/javascript/flavours/glitch/reducers/compose.js
index 36430e823872d3..211402ab2a5ef5 100644
--- a/app/javascript/flavours/glitch/reducers/compose.js
+++ b/app/javascript/flavours/glitch/reducers/compose.js
@@ -1,5 +1,7 @@
 import { Map as ImmutableMap, List as ImmutableList, OrderedSet as ImmutableOrderedSet, fromJS } from 'immutable';
 
+import { timelineDelete } from 'flavours/glitch/actions/timelines_typed';
+
 import {
   COMPOSE_MOUNT,
   COMPOSE_UNMOUNT,
@@ -54,7 +56,6 @@ import {
 } from '../actions/compose';
 import { REDRAFT } from '../actions/statuses';
 import { STORE_HYDRATE } from '../actions/store';
-import { TIMELINE_DELETE } from '../actions/timelines';
 import { me, defaultContentType } from '../initial_state';
 import { recoverHashtags } from '../utils/hashtag';
 import { unescapeHTML } from '../utils/html';
@@ -551,10 +552,10 @@ export default function compose(state = initialState, action) {
     return updateSuggestionTags(state, action.token);
   case COMPOSE_TAG_HISTORY_UPDATE:
     return state.set('tagHistory', fromJS(action.tags));
-  case TIMELINE_DELETE:
-    if (action.id === state.get('in_reply_to')) {
+  case timelineDelete.type:
+    if (action.payload.statusId === state.get('in_reply_to')) {
       return state.set('in_reply_to', null);
-    } else if (action.id === state.get('id')) {
+    } else if (action.payload.statusId === state.get('id')) {
       return state.set('id', null);
     } else {
       return state;
diff --git a/app/javascript/flavours/glitch/reducers/contexts.js b/app/javascript/flavours/glitch/reducers/contexts.js
index f7d7419a4e3ab9..07fe8ffb8a8737 100644
--- a/app/javascript/flavours/glitch/reducers/contexts.js
+++ b/app/javascript/flavours/glitch/reducers/contexts.js
@@ -1,11 +1,13 @@
 import { Map as ImmutableMap, List as ImmutableList } from 'immutable';
 
+import { timelineDelete } from 'flavours/glitch/actions/timelines_typed';
+
 import {
   blockAccountSuccess,
   muteAccountSuccess,
 } from '../actions/accounts';
 import { CONTEXT_FETCH_SUCCESS } from '../actions/statuses';
-import { TIMELINE_DELETE, TIMELINE_UPDATE } from '../actions/timelines';
+import { TIMELINE_UPDATE } from '../actions/timelines';
 import { compareId } from '../compare_id';
 
 const initialState = ImmutableMap({
@@ -97,8 +99,8 @@ export default function replies(state = initialState, action) {
     return filterContexts(state, action.payload.relationship, action.payload.statuses);
   case CONTEXT_FETCH_SUCCESS:
     return normalizeContext(state, action.id, action.ancestors, action.descendants);
-  case TIMELINE_DELETE:
-    return deleteFromContexts(state, [action.id]);
+  case timelineDelete.type:
+    return deleteFromContexts(state, [action.payload.statusId]);
   case TIMELINE_UPDATE:
     return updateContext(state, action.status);
   default:
diff --git a/app/javascript/flavours/glitch/reducers/modal.ts b/app/javascript/flavours/glitch/reducers/modal.ts
index 368f26542c0159..c9ecdb7fdf5e34 100644
--- a/app/javascript/flavours/glitch/reducers/modal.ts
+++ b/app/javascript/flavours/glitch/reducers/modal.ts
@@ -1,10 +1,11 @@
 import type { Reducer } from '@reduxjs/toolkit';
 import { Record as ImmutableRecord, Stack } from 'immutable';
 
+import { timelineDelete } from 'flavours/glitch/actions/timelines_typed';
+
 import { COMPOSE_UPLOAD_CHANGE_SUCCESS } from '../actions/compose';
 import type { ModalType } from '../actions/modal';
 import { openModal, closeModal } from '../actions/modal';
-import { TIMELINE_DELETE } from '../actions/timelines';
 
 export type ModalProps = Record<string, unknown>;
 interface Modal {
@@ -72,10 +73,10 @@ export const modalReducer: Reducer<State> = (state = initialState, action) => {
   // TODO: type those actions
   else if (action.type === COMPOSE_UPLOAD_CHANGE_SUCCESS)
     return popModal(state, { modalType: 'FOCAL_POINT', ignoreFocus: false });
-  else if (action.type === TIMELINE_DELETE)
+  else if (timelineDelete.match(action))
     return state.update('stack', (stack) =>
       stack.filterNot(
-        (modal) => modal.get('modalProps').statusId === action.id,
+        (modal) => modal.get('modalProps').statusId === action.payload.statusId,
       ),
     );
   else return state;
diff --git a/app/javascript/flavours/glitch/reducers/notifications.js b/app/javascript/flavours/glitch/reducers/notifications.js
index c5f36dd94aecbb..226f2affe1030a 100644
--- a/app/javascript/flavours/glitch/reducers/notifications.js
+++ b/app/javascript/flavours/glitch/reducers/notifications.js
@@ -1,6 +1,7 @@
 import { fromJS, Map as ImmutableMap, List as ImmutableList } from 'immutable';
 
 import { blockDomainSuccess } from 'flavours/glitch/actions/domain_blocks';
+import { timelineDelete } from 'flavours/glitch/actions/timelines_typed';
 
 import {
   authorizeFollowRequestSuccess,
@@ -33,7 +34,7 @@ import {
   NOTIFICATIONS_SET_BROWSER_SUPPORT,
   NOTIFICATIONS_SET_BROWSER_PERMISSION,
 } from '../actions/notifications';
-import { TIMELINE_DELETE, TIMELINE_DISCONNECT } from '../actions/timelines';
+import { disconnectTimeline } from '../actions/timelines';
 import { compareId } from '../compare_id';
 
 const initialState = ImmutableMap({
@@ -333,11 +334,11 @@ export default function notifications(state = initialState, action) {
     return filterNotifications(state, [action.payload.id], 'follow_request');
   case NOTIFICATIONS_CLEAR:
     return state.set('items', ImmutableList()).set('pendingItems', ImmutableList()).set('hasMore', false);
-  case TIMELINE_DELETE:
-    return deleteByStatus(state, action.id);
-  case TIMELINE_DISCONNECT:
-    return action.timeline === 'home' ?
-      state.update(action.usePendingItems ? 'pendingItems' : 'items', items => items.first() ? items.unshift(null) : items) :
+  case timelineDelete.type:
+    return deleteByStatus(state, action.payload.statusId);
+  case disconnectTimeline.type:
+    return action.payload.timeline === 'home' ?
+      state.update(action.payload.usePendingItems ? 'pendingItems' : 'items', items => items.first() ? items.unshift(null) : items) :
       state;
   case NOTIFICATIONS_SET_BROWSER_SUPPORT:
     return state.set('browserSupport', action.value);
diff --git a/app/javascript/flavours/glitch/reducers/picture_in_picture.ts b/app/javascript/flavours/glitch/reducers/picture_in_picture.ts
index 35eb10cf577f18..6ad31d42bf1988 100644
--- a/app/javascript/flavours/glitch/reducers/picture_in_picture.ts
+++ b/app/javascript/flavours/glitch/reducers/picture_in_picture.ts
@@ -4,8 +4,7 @@ import {
   deployPictureInPictureAction,
   removePictureInPicture,
 } from 'flavours/glitch/actions/picture_in_picture';
-
-import { TIMELINE_DELETE } from '../actions/timelines';
+import { timelineDelete } from 'flavours/glitch/actions/timelines_typed';
 
 export interface PIPMediaProps {
   src: string;
@@ -49,8 +48,9 @@ export const pictureInPictureReducer: Reducer<PIPState> = (
       ...action.payload.props,
     };
   else if (removePictureInPicture.match(action)) return initialState;
-  else if (action.type === TIMELINE_DELETE)
-    if (state.type && state.statusId === action.id) return initialState;
+  else if (timelineDelete.match(action))
+    if (state.type && state.statusId === action.payload.statusId)
+      return initialState;
 
   return state;
 };
diff --git a/app/javascript/flavours/glitch/reducers/statuses.js b/app/javascript/flavours/glitch/reducers/statuses.js
index ca766f73a36e5d..39df0e956d2b68 100644
--- a/app/javascript/flavours/glitch/reducers/statuses.js
+++ b/app/javascript/flavours/glitch/reducers/statuses.js
@@ -1,5 +1,7 @@
 import { Map as ImmutableMap, fromJS } from 'immutable';
 
+import { timelineDelete } from 'flavours/glitch/actions/timelines_typed';
+
 import { STATUS_IMPORT, STATUSES_IMPORT } from '../actions/importer';
 import { normalizeStatusTranslation } from '../actions/importer/normalizer';
 import {
@@ -27,7 +29,6 @@ import {
   STATUS_FETCH_REQUEST,
   STATUS_FETCH_FAIL,
 } from '../actions/statuses';
-import { TIMELINE_DELETE } from '../actions/timelines';
 
 const importStatus = (state, status) => state.set(status.id, fromJS(status));
 
@@ -114,8 +115,8 @@ export default function statuses(state = initialState, action) {
     });
   case STATUS_COLLAPSE:
     return state.setIn([action.id, 'collapsed'], action.isCollapsed);
-  case TIMELINE_DELETE:
-    return deleteStatus(state, action.id, action.references);
+  case timelineDelete.type:
+    return deleteStatus(state, action.payload.statusId, action.payload.references);
   case STATUS_TRANSLATE_SUCCESS:
     return statusTranslateSuccess(state, action.id, action.translation);
   case STATUS_TRANSLATE_UNDO:
diff --git a/app/javascript/flavours/glitch/reducers/timelines.js b/app/javascript/flavours/glitch/reducers/timelines.js
index 08c7a483369e89..f1602e8537b428 100644
--- a/app/javascript/flavours/glitch/reducers/timelines.js
+++ b/app/javascript/flavours/glitch/reducers/timelines.js
@@ -1,5 +1,7 @@
 import { Map as ImmutableMap, List as ImmutableList, OrderedSet as ImmutableOrderedSet, fromJS } from 'immutable';
 
+import { timelineDelete } from 'flavours/glitch/actions/timelines_typed';
+
 import {
   blockAccountSuccess,
   muteAccountSuccess,
@@ -7,19 +9,18 @@ import {
 } from '../actions/accounts';
 import {
   TIMELINE_UPDATE,
-  TIMELINE_DELETE,
   TIMELINE_CLEAR,
   TIMELINE_EXPAND_SUCCESS,
   TIMELINE_EXPAND_REQUEST,
   TIMELINE_EXPAND_FAIL,
   TIMELINE_SCROLL_TOP,
   TIMELINE_CONNECT,
-  TIMELINE_DISCONNECT,
   TIMELINE_LOAD_PENDING,
   TIMELINE_MARK_AS_PARTIAL,
   TIMELINE_INSERT,
   TIMELINE_GAP,
   TIMELINE_SUGGESTIONS,
+  disconnectTimeline,
 } from '../actions/timelines';
 import { compareId } from '../compare_id';
 
@@ -207,8 +208,8 @@ export default function timelines(state = initialState, action) {
     return expandNormalizedTimeline(state, action.timeline, fromJS(action.statuses), action.next, action.partial, action.isLoadingRecent, action.usePendingItems);
   case TIMELINE_UPDATE:
     return updateTimeline(state, action.timeline, fromJS(action.status), action.usePendingItems, action.filtered);
-  case TIMELINE_DELETE:
-    return deleteStatus(state, action.id, action.references, action.reblogOf);
+  case timelineDelete.type:
+    return deleteStatus(state, action.payload.statusId, action.payload.references, action.payload.reblogOf);
   case TIMELINE_CLEAR:
     return clearTimeline(state, action.timeline);
   case blockAccountSuccess.type:
@@ -220,11 +221,11 @@ export default function timelines(state = initialState, action) {
     return updateTop(state, action.timeline, action.top);
   case TIMELINE_CONNECT:
     return state.update(action.timeline, initialTimeline, map => reconnectTimeline(map, action.usePendingItems));
-  case TIMELINE_DISCONNECT:
+  case disconnectTimeline.type:
     return state.update(
-      action.timeline,
+      action.payload.timeline,
       initialTimeline,
-      map => map.set('online', false).update(action.usePendingItems ? 'pendingItems' : 'items', items => items.first() ? items.unshift(TIMELINE_GAP) : items),
+      map => map.set('online', false).update(action.payload.usePendingItems ? 'pendingItems' : 'items', items => items.first() ? items.unshift(TIMELINE_GAP) : items),
     );
   case TIMELINE_MARK_AS_PARTIAL:
     return state.update(

From 7d12522ed71193decc2a9aeacc8cf921b09d3654 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Fri, 21 Jun 2024 00:39:06 +0200
Subject: [PATCH 1360/2191] Fix error when deleting a status (#30784)

---
 app/javascript/mastodon/actions/timelines.js  | 4 ++--
 app/javascript/mastodon/reducers/timelines.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/javascript/mastodon/actions/timelines.js b/app/javascript/mastodon/actions/timelines.js
index d1851551b12d15..4ca3c3a151dd6f 100644
--- a/app/javascript/mastodon/actions/timelines.js
+++ b/app/javascript/mastodon/actions/timelines.js
@@ -63,10 +63,10 @@ export function updateTimeline(timeline, status, accept) {
 export function deleteFromTimelines(id) {
   return (dispatch, getState) => {
     const accountId  = getState().getIn(['statuses', id, 'account']);
-    const references = getState().get('statuses').filter(status => status.get('reblog') === id).map(status => status.get('id')).toJSON();
+    const references = getState().get('statuses').filter(status => status.get('reblog') === id).map(status => status.get('id')).valueSeq().toJSON();
     const reblogOf   = getState().getIn(['statuses', id, 'reblog'], null);
 
-    dispatch(timelineDelete(id, accountId, references, reblogOf));
+    dispatch(timelineDelete({ statusId: id, accountId, references, reblogOf }));
   };
 }
 
diff --git a/app/javascript/mastodon/reducers/timelines.js b/app/javascript/mastodon/reducers/timelines.js
index 786d20b3073f8d..b07281ab877827 100644
--- a/app/javascript/mastodon/reducers/timelines.js
+++ b/app/javascript/mastodon/reducers/timelines.js
@@ -159,7 +159,7 @@ const filterTimelines = (state, relationship, statuses) => {
       return;
     }
 
-    references = statuses.filter(item => item.get('reblog') === status.get('id')).map(item => item.get('id'));
+    references = statuses.filter(item => item.get('reblog') === status.get('id')).map(item => item.get('id')).valueSeq().toJSON();
     state      = deleteStatus(state, status.get('id'), references, relationship.id);
   });
 

From 9e932fa1ddaea569ca52fe663eb4bb13a5a43e0a Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 21 Jun 2024 11:14:44 +0200
Subject: [PATCH 1361/2191] New Crowdin Translations (automated) (#30789)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/hi.json | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/javascript/mastodon/locales/hi.json b/app/javascript/mastodon/locales/hi.json
index 5dc99dd76e40b1..a2da55da85a060 100644
--- a/app/javascript/mastodon/locales/hi.json
+++ b/app/javascript/mastodon/locales/hi.json
@@ -80,6 +80,7 @@
   "admin.dashboard.retention.cohort_size": "नये उपयोगकर्ता",
   "admin.impact_report.instance_accounts": "ये अकाउंट प्रोफाइल मिटा देगा",
   "admin.impact_report.instance_followers": "हमारे यूजर्स इन फॉलोअर्स को खो देंगे",
+  "admin.impact_report.instance_follows": "उनके उपयोगकर्ता इतने फ़ॉलोअर खो देंगे",
   "admin.impact_report.title": "प्रभावकां सारांश",
   "alert.rate_limited.message": "कृप्या {retry_time, time, medium} के बाद दुबारा कोशिश करें",
   "alert.rate_limited.title": "सीमित दर",
@@ -88,6 +89,7 @@
   "announcement.announcement": "घोषणा",
   "attachments_list.unprocessed": "(असंसाधित)",
   "audio.hide": "हाईड ऑडियो",
+  "block_modal.remote_users_caveat": "हम {domain} को आपके निर्णय का सम्मान करने को कहेंगे।हालाकि इसकी आपूर्ति कि प्रत्याभूति नहीं हे। क्योंकि कुछ सर्वर ब्लॉक को अलग तरह से निभा सकते हे। अभी भी सार्वजानिक पोस्ट लोग- इन बगैर के उपयोगकर्ताओं को दिख सकती हैं।",
   "block_modal.show_less": "कम दिखाएं",
   "block_modal.show_more": "और दिखाएँ",
   "block_modal.they_cant_mention": "वे आपको मेंशन या फॉलो नहीं कर सकते",
@@ -205,7 +207,12 @@
   "dismissable_banner.dismiss": "डिसमिस",
   "dismissable_banner.explore_links": "इन समाचारों के बारे में लोगों द्वारा इस पर और डेसेंट्रलीसेड नेटवर्क के अन्य सर्वरों पर अभी बात की जा रही है।",
   "dismissable_banner.explore_tags": "ये हैशटैग अभी इस पर और डेसेंट्रलीसेड नेटवर्क के अन्य सर्वरों पर लोगों के बीच कर्षण प्राप्त कर रहे हैं।",
+  "dismissable_banner.public_timeline": "यह ताजा सार्वजनिक पोस्ट है जिसका सामाजिक वेब {domain} के लोगो द्वारा अनुसरण हो रहा हैं।",
   "domain_block_modal.block": "सर्वर ब्लॉक करें",
+  "domain_block_modal.block_account_instead": "इसकी जगह यह @{name} रखें",
+  "domain_block_modal.they_can_interact_with_old_posts": "इस सर्वर की लोग आपकी पूरानी पोस्ट्स का अनुसरण किया जा sakta है।",
+  "domain_block_modal.they_cant_follow": "इस सर्वर मेसे कोई भी आपका अनुसरण नहीं कर सकता।",
+  "domain_block_modal.they_wont_know": "उनको पता नहीं चलेगा कि वे अवरोधित किए गए है।",
   "domain_block_modal.title": "डोमेन ब्लॉक करें",
   "domain_pill.server": "सर्वर",
   "domain_pill.username": "यूज़रनेम",

From 2f994bb34a4d61f3529dd8910e7195b8c1d063ab Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Fri, 21 Jun 2024 00:39:06 +0200
Subject: [PATCH 1362/2191] [Glitch] Fix error when deleting a status

Port 7d12522ed71193decc2a9aeacc8cf921b09d3654 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/actions/timelines.js  | 4 ++--
 app/javascript/flavours/glitch/reducers/timelines.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/javascript/flavours/glitch/actions/timelines.js b/app/javascript/flavours/glitch/actions/timelines.js
index c10f1790e5a45f..d3ce4c575cf01a 100644
--- a/app/javascript/flavours/glitch/actions/timelines.js
+++ b/app/javascript/flavours/glitch/actions/timelines.js
@@ -74,10 +74,10 @@ export function updateTimeline(timeline, status, accept) {
 export function deleteFromTimelines(id) {
   return (dispatch, getState) => {
     const accountId  = getState().getIn(['statuses', id, 'account']);
-    const references = getState().get('statuses').filter(status => status.get('reblog') === id).map(status => status.get('id')).toJSON();
+    const references = getState().get('statuses').filter(status => status.get('reblog') === id).map(status => status.get('id')).valueSeq().toJSON();
     const reblogOf   = getState().getIn(['statuses', id, 'reblog'], null);
 
-    dispatch(timelineDelete(id, accountId, references, reblogOf));
+    dispatch(timelineDelete({ statusId: id, accountId, references, reblogOf }));
   };
 }
 
diff --git a/app/javascript/flavours/glitch/reducers/timelines.js b/app/javascript/flavours/glitch/reducers/timelines.js
index f1602e8537b428..f4944472bba6c1 100644
--- a/app/javascript/flavours/glitch/reducers/timelines.js
+++ b/app/javascript/flavours/glitch/reducers/timelines.js
@@ -165,7 +165,7 @@ const filterTimelines = (state, relationship, statuses) => {
       return;
     }
 
-    references = statuses.filter(item => item.get('reblog') === status.get('id')).map(item => item.get('id'));
+    references = statuses.filter(item => item.get('reblog') === status.get('id')).map(item => item.get('id')).valueSeq().toJSON();
     state      = deleteStatus(state, status.get('id'), references, relationship.id);
   });
 

From 5b938e6e20ce9956812834031c6fd8c7dfa5b184 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 21 Jun 2024 13:37:15 +0200
Subject: [PATCH 1363/2191] chore(deps): update dependency @types/uuid to v10
 (#30787)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 streaming/package.json |  2 +-
 yarn.lock              | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/streaming/package.json b/streaming/package.json
index ba024fe7af4b3c..deaa760d934509 100644
--- a/streaming/package.json
+++ b/streaming/package.json
@@ -34,7 +34,7 @@
     "@types/cors": "^2.8.16",
     "@types/express": "^4.17.17",
     "@types/pg": "^8.6.6",
-    "@types/uuid": "^9.0.0",
+    "@types/uuid": "^10.0.0",
     "@types/ws": "^8.5.9",
     "eslint-define-config": "^2.0.0",
     "pino-pretty": "^11.0.0",
diff --git a/yarn.lock b/yarn.lock
index 61a8f420a5932d..948670e2cd8936 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2925,7 +2925,7 @@ __metadata:
     "@types/cors": "npm:^2.8.16"
     "@types/express": "npm:^4.17.17"
     "@types/pg": "npm:^8.6.6"
-    "@types/uuid": "npm:^9.0.0"
+    "@types/uuid": "npm:^10.0.0"
     "@types/ws": "npm:^8.5.9"
     bufferutil: "npm:^4.0.7"
     cors: "npm:^2.8.5"
@@ -4045,10 +4045,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/uuid@npm:^9.0.0":
-  version: 9.0.8
-  resolution: "@types/uuid@npm:9.0.8"
-  checksum: 10c0/b411b93054cb1d4361919579ef3508a1f12bf15b5fdd97337d3d351bece6c921b52b6daeef89b62340fd73fd60da407878432a1af777f40648cbe53a01723489
+"@types/uuid@npm:^10.0.0":
+  version: 10.0.0
+  resolution: "@types/uuid@npm:10.0.0"
+  checksum: 10c0/9a1404bf287164481cb9b97f6bb638f78f955be57c40c6513b7655160beb29df6f84c915aaf4089a1559c216557dc4d2f79b48d978742d3ae10b937420ddac60
   languageName: node
   linkType: hard
 

From 2c65a1b0e58ef4aa0fddd1b1cb1fa0d51237b189 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 21 Jun 2024 13:37:47 +0200
Subject: [PATCH 1364/2191] chore(deps): update dependency selenium-webdriver
 to v4.22.0 (#30786)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 1f8645a59e1821..cb796409dac25c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -398,6 +398,7 @@ GEM
     llhttp-ffi (0.5.0)
       ffi-compiler (~> 1.0)
       rake (~> 13.0)
+    logger (1.6.0)
     lograge (0.14.0)
       actionpack (>= 4)
       activesupport (>= 4)
@@ -771,8 +772,9 @@ GEM
     scenic (1.8.0)
       activerecord (>= 4.0.0)
       railties (>= 4.0.0)
-    selenium-webdriver (4.21.1)
+    selenium-webdriver (4.22.0)
       base64 (~> 0.2)
+      logger (~> 1.4)
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 3.0)
       websocket (~> 1.0)

From 4e6db5e284988e77b9c2bec5c100b302f2294b74 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 21 Jun 2024 11:38:26 +0000
Subject: [PATCH 1365/2191] chore(deps): update yarn to v4.3.1 (#30790)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 package.json           | 2 +-
 streaming/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index d52f0ea1cc296f..729482f857b15c 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@mastodon/mastodon",
   "license": "AGPL-3.0-or-later",
-  "packageManager": "yarn@4.3.0",
+  "packageManager": "yarn@4.3.1",
   "engines": {
     "node": ">=18"
   },
diff --git a/streaming/package.json b/streaming/package.json
index deaa760d934509..1ee738c33207b2 100644
--- a/streaming/package.json
+++ b/streaming/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@mastodon/streaming",
   "license": "AGPL-3.0-or-later",
-  "packageManager": "yarn@4.3.0",
+  "packageManager": "yarn@4.3.1",
   "engines": {
     "node": ">=18"
   },

From 2cab1c7b09f64cae8128fa33645137fe55daf075 Mon Sep 17 00:00:00 2001
From: David Roetzel <david@roetzel.de>
Date: Fri, 21 Jun 2024 14:51:10 +0200
Subject: [PATCH 1366/2191] Improve encoding detection for link cards (#30780)

---
 app/lib/link_details_extractor.rb               | 15 ++++++++++-----
 .../fixtures/requests/low_confidence_latin1.txt | 17 +++++++++++++++++
 spec/services/fetch_link_card_service_spec.rb   |  9 +++++++++
 3 files changed, 36 insertions(+), 5 deletions(-)
 create mode 100644 spec/fixtures/requests/low_confidence_latin1.txt

diff --git a/app/lib/link_details_extractor.rb b/app/lib/link_details_extractor.rb
index 2e49d3fb4f514f..dbfdd33fccaf3a 100644
--- a/app/lib/link_details_extractor.rb
+++ b/app/lib/link_details_extractor.rb
@@ -269,16 +269,21 @@ def structured_data
   end
 
   def document
-    @document ||= Nokogiri::HTML(@html, nil, encoding)
+    @document ||= detect_encoding_and_parse_document
   end
 
-  def encoding
-    @encoding ||= begin
-      guess = detector.detect(@html, @html_charset)
-      guess&.fetch(:confidence, 0).to_i > 60 ? guess&.fetch(:encoding, nil) : nil
+  def detect_encoding_and_parse_document
+    [detect_encoding, nil, @html_charset, 'UTF-8'].uniq.each do |encoding|
+      document = Nokogiri::HTML(@html, nil, encoding)
+      return document if document.to_s.valid_encoding?
     end
   end
 
+  def detect_encoding
+    guess = detector.detect(@html, @html_charset)
+    guess&.fetch(:confidence, 0).to_i > 60 ? guess&.fetch(:encoding, nil) : nil
+  end
+
   def detector
     @detector ||= CharlockHolmes::EncodingDetector.new.tap do |detector|
       detector.strip_tags = true
diff --git a/spec/fixtures/requests/low_confidence_latin1.txt b/spec/fixtures/requests/low_confidence_latin1.txt
new file mode 100644
index 00000000000000..39c3e23d649ba8
--- /dev/null
+++ b/spec/fixtures/requests/low_confidence_latin1.txt
@@ -0,0 +1,17 @@
+HTTP/1.1 200 OK
+server: nginx
+date: Thu, 13 Jun 2024 14:33:13 GMT
+content-type: text/html; charset=ISO-8859-1
+content-length: 158
+accept-ranges: bytes
+
+<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <title>Tofu � l'orange</title>
+</head>
+<body>
+  <h2>Tofu � l'orange</h2>
+</body>
+</html>
diff --git a/spec/services/fetch_link_card_service_spec.rb b/spec/services/fetch_link_card_service_spec.rb
index 63ebc3b978d0fb..239f84fde940a3 100644
--- a/spec/services/fetch_link_card_service_spec.rb
+++ b/spec/services/fetch_link_card_service_spec.rb
@@ -26,6 +26,7 @@
     stub_request(:get, 'http://example.com/sjis_with_wrong_charset').to_return(request_fixture('sjis_with_wrong_charset.txt'))
     stub_request(:get, 'http://example.com/koi8-r').to_return(request_fixture('koi8-r.txt'))
     stub_request(:get, 'http://example.com/windows-1251').to_return(request_fixture('windows-1251.txt'))
+    stub_request(:get, 'http://example.com/low_confidence_latin1').to_return(request_fixture('low_confidence_latin1.txt'))
 
     Rails.cache.write('oembed_endpoint:example.com', oembed_cache) if oembed_cache
 
@@ -148,6 +149,14 @@
       end
     end
 
+    context 'with a URL of a page in ISO-8859-1 encoding, that charlock_holmes cannot detect' do
+      let(:status) { Fabricate(:status, text: 'Check out http://example.com/low_confidence_latin1') }
+
+      it 'decodes the HTML' do
+        expect(status.preview_card.title).to eq("Tofu á l'orange")
+      end
+    end
+
     context 'with a Japanese path URL' do
       let(:status) { Fabricate(:status, text: 'テストhttp://example.com/日本語') }
 

From 4651c0cb39c1a1e4feb6d8fc2b53de622eeb7373 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 21 Jun 2024 10:43:12 -0400
Subject: [PATCH 1367/2191] Fix `Rails/ReversibleMigrationMethodDefinition` cop
 (#30794)

---
 .../20160227230233_add_attachment_avatar_to_accounts.rb       | 4 ++--
 db/migrate/20160305115639_add_devise_to_users.rb              | 4 ++--
 .../20160312193225_add_attachment_header_to_accounts.rb       | 4 ++--
 db/migrate/20161006213403_rails_settings_migration.rb         | 4 ++--
 db/migrate/20170330164118_add_attachment_data_to_imports.rb   | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/db/migrate/20160227230233_add_attachment_avatar_to_accounts.rb b/db/migrate/20160227230233_add_attachment_avatar_to_accounts.rb
index 534df25eed1a20..cfe4c23de3a868 100644
--- a/db/migrate/20160227230233_add_attachment_avatar_to_accounts.rb
+++ b/db/migrate/20160227230233_add_attachment_avatar_to_accounts.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class AddAttachmentAvatarToAccounts < ActiveRecord::Migration[4.2]
-  def self.up
+  def up
     change_table :accounts do |t|
       # The following corresponds to `t.attachment :avatar` in an older version of Paperclip
       t.string :avatar_file_name
@@ -11,7 +11,7 @@ def self.up
     end
   end
 
-  def self.down
+  def down
     remove_attachment :accounts, :avatar
   end
 end
diff --git a/db/migrate/20160305115639_add_devise_to_users.rb b/db/migrate/20160305115639_add_devise_to_users.rb
index 64ad78dbc6a76e..22697b2389ea2f 100644
--- a/db/migrate/20160305115639_add_devise_to_users.rb
+++ b/db/migrate/20160305115639_add_devise_to_users.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class AddDeviseToUsers < ActiveRecord::Migration[4.2]
-  def self.up
+  def up
     change_table(:users, bulk: true) do |t|
       ## Database authenticatable
       t.string :encrypted_password, null: false, default: ''
@@ -24,7 +24,7 @@ def self.up
     add_index :users, :reset_password_token, unique: true
   end
 
-  def self.down
+  def down
     remove_index :users, :reset_password_token
 
     remove_column :users, :encrypted_password
diff --git a/db/migrate/20160312193225_add_attachment_header_to_accounts.rb b/db/migrate/20160312193225_add_attachment_header_to_accounts.rb
index b481fc52906ea9..45dc65236b1827 100644
--- a/db/migrate/20160312193225_add_attachment_header_to_accounts.rb
+++ b/db/migrate/20160312193225_add_attachment_header_to_accounts.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class AddAttachmentHeaderToAccounts < ActiveRecord::Migration[4.2]
-  def self.up
+  def up
     change_table :accounts do |t|
       # The following corresponds to `t.attachment :header` in an older version of Paperclip
       t.string :header_file_name
@@ -11,7 +11,7 @@ def self.up
     end
   end
 
-  def self.down
+  def down
     remove_attachment :accounts, :header
   end
 end
diff --git a/db/migrate/20161006213403_rails_settings_migration.rb b/db/migrate/20161006213403_rails_settings_migration.rb
index 9764196fab453a..d08ad2efd9b7ef 100644
--- a/db/migrate/20161006213403_rails_settings_migration.rb
+++ b/db/migrate/20161006213403_rails_settings_migration.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class RailsSettingsMigration < ActiveRecord::Migration[5.0]
-  def self.up
+  def up
     create_table :settings do |t|
       t.string     :var, null: false
       t.text       :value
@@ -11,7 +11,7 @@ def self.up
     add_index :settings, [:target_type, :target_id, :var], unique: true
   end
 
-  def self.down
+  def down
     drop_table :settings
   end
 end
diff --git a/db/migrate/20170330164118_add_attachment_data_to_imports.rb b/db/migrate/20170330164118_add_attachment_data_to_imports.rb
index 0daaa9d02e72e6..afacfa86daecd8 100644
--- a/db/migrate/20170330164118_add_attachment_data_to_imports.rb
+++ b/db/migrate/20170330164118_add_attachment_data_to_imports.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class AddAttachmentDataToImports < ActiveRecord::Migration[4.2]
-  def self.up
+  def up
     change_table :imports do |t|
       # The following corresponds to `t.attachment :data` in an older version of Paperclip
       t.string :data_file_name
@@ -11,7 +11,7 @@ def self.up
     end
   end
 
-  def self.down
+  def down
     remove_attachment :imports, :data
   end
 end

From 72484a194fb5f52cf2512a95045fc6bd2d3e2ef4 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 21 Jun 2024 11:32:49 -0400
Subject: [PATCH 1368/2191] Remove `CacheBuster` default options (#30718)

---
 app/lib/cache_buster.rb       | 9 ++-------
 spec/lib/cache_buster_spec.rb | 8 --------
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/app/lib/cache_buster.rb b/app/lib/cache_buster.rb
index 554f2ba95d7307..d3395f8f0a36a2 100644
--- a/app/lib/cache_buster.rb
+++ b/app/lib/cache_buster.rb
@@ -2,13 +2,8 @@
 
 class CacheBuster
   def initialize(options = {})
-    Rails.application.deprecators[:mastodon].warn('Default values for the cache buster secret header name and values will be removed in Mastodon 4.3. Please set them explicitely if you rely on those.') unless options[:http_method] || (options[:secret] && options[:secret_header])
-
-    @secret_header = options[:secret_header] ||
-                     (options[:http_method] ? nil : 'Secret-Header')
-    @secret = options[:secret] ||
-              (options[:http_method] ? nil : 'True')
-
+    @secret_header = options[:secret_header]
+    @secret = options[:secret]
     @http_method = options[:http_method] || 'GET'
   end
 
diff --git a/spec/lib/cache_buster_spec.rb b/spec/lib/cache_buster_spec.rb
index 78ca183490ee87..84085608e8544e 100644
--- a/spec/lib/cache_buster_spec.rb
+++ b/spec/lib/cache_buster_spec.rb
@@ -28,14 +28,6 @@
     end
 
     context 'when using default options' do
-      around do |example|
-        # Disables the CacheBuster.new deprecation warning about default arguments.
-        # Remove this `silence` block when default arg support is removed from CacheBuster
-        Rails.application.deprecators[:mastodon].silence do
-          example.run
-        end
-      end
-
       include_examples 'makes_request'
     end
 

From 348ccf206ee245309d8e44855667f92c4fc06b7d Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 21 Jun 2024 11:33:55 -0400
Subject: [PATCH 1369/2191] Fix `Style/ClassEqualityComparison` cop (#30058)

---
 .rubocop_todo.yml                                | 8 --------
 app/helpers/jsonld_helper.rb                     | 2 +-
 app/serializers/activitypub/outbox_serializer.rb | 2 +-
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index fb3a928d343d50..b05d1bc6bd8bea 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -31,14 +31,6 @@ Rails/OutputSafety:
   Exclude:
     - 'config/initializers/simple_form.rb'
 
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: AllowedMethods, AllowedPatterns.
-# AllowedMethods: ==, equal?, eql?
-Style/ClassEqualityComparison:
-  Exclude:
-    - 'app/helpers/jsonld_helper.rb'
-    - 'app/serializers/activitypub/outbox_serializer.rb'
-
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowedVars.
 Style/FetchEnvVar:
diff --git a/app/helpers/jsonld_helper.rb b/app/helpers/jsonld_helper.rb
index b0f2077db0e501..932a3420db9d61 100644
--- a/app/helpers/jsonld_helper.rb
+++ b/app/helpers/jsonld_helper.rb
@@ -141,7 +141,7 @@ def patch_for_forwarding!(original, compacted)
   def safe_for_forwarding?(original, compacted)
     original.without('@context', 'signature').all? do |key, value|
       compacted_value = compacted[key]
-      return false unless value.class == compacted_value.class
+      return false unless value.instance_of?(compacted_value.class)
 
       if value.is_a?(Hash)
         safe_for_forwarding?(value, compacted_value)
diff --git a/app/serializers/activitypub/outbox_serializer.rb b/app/serializers/activitypub/outbox_serializer.rb
index 4f4f950a5ac7c0..4d3d9706deff74 100644
--- a/app/serializers/activitypub/outbox_serializer.rb
+++ b/app/serializers/activitypub/outbox_serializer.rb
@@ -2,7 +2,7 @@
 
 class ActivityPub::OutboxSerializer < ActivityPub::CollectionSerializer
   def self.serializer_for(model, options)
-    if model.class.name == 'ActivityPub::ActivityPresenter'
+    if model.instance_of?(::ActivityPub::ActivityPresenter)
       ActivityPub::ActivitySerializer
     else
       super

From 929b9fdaff1e6d4223efd8f00bd0b53fae1c7ce1 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 21 Jun 2024 11:34:13 -0400
Subject: [PATCH 1370/2191] Remove exclusion for
 `Rails/LexicallyScopedActionFilter` cop (#30697)

---
 .rubocop/rails.yml                               | 4 ----
 app/controllers/auth/registrations_controller.rb | 8 ++++++++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.rubocop/rails.yml b/.rubocop/rails.yml
index b83928dee6b3ef..4e08f1ab91e55d 100644
--- a/.rubocop/rails.yml
+++ b/.rubocop/rails.yml
@@ -5,10 +5,6 @@ Rails/FilePath:
 Rails/HttpStatus:
   EnforcedStyle: numeric
 
-Rails/LexicallyScopedActionFilter:
-  Exclude:
-    - app/controllers/auth/* # Conflicts with `Lint/UselessMethodDefinition` for inherited controller actions
-
 Rails/NegateInclude:
   Enabled: false
 
diff --git a/app/controllers/auth/registrations_controller.rb b/app/controllers/auth/registrations_controller.rb
index f858c0ad93249b..e5a2ac0270f012 100644
--- a/app/controllers/auth/registrations_controller.rb
+++ b/app/controllers/auth/registrations_controller.rb
@@ -25,6 +25,14 @@ def new
     super(&:build_invite_request)
   end
 
+  def edit # rubocop:disable Lint/UselessMethodDefinition
+    super
+  end
+
+  def create # rubocop:disable Lint/UselessMethodDefinition
+    super
+  end
+
   def update
     super do |resource|
       resource.clear_other_sessions(current_session.session_id) if resource.saved_change_to_encrypted_password?

From 253a9f766aca839804d231c7988aede71d667893 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 21 Jun 2024 18:13:53 +0200
Subject: [PATCH 1371/2191] chore(deps): update dependency addressable to
 v2.8.7 (#30791)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index cb796409dac25c..98a1b0e1a4bd04 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -89,8 +89,8 @@ GEM
       minitest (>= 5.1)
       mutex_m
       tzinfo (~> 2.0)
-    addressable (2.8.6)
-      public_suffix (>= 2.0.2, < 6.0)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
     aes_key_wrap (1.1.0)
     android_key_attestation (0.3.0)
     annotate (3.2.0)

From abbda3dc26713d7b510a86dd2dac5ed2d20424cb Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 21 Jun 2024 18:14:20 +0200
Subject: [PATCH 1372/2191] chore(deps): update dependency node to 20.15
 (#30782)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .nvmrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.nvmrc b/.nvmrc
index c61a3d77e78f32..cecb93628953cd 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-20.14
+20.15

From f898214dea0b855a7b47de7fd6a151146f8efad4 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 21 Jun 2024 18:14:41 +0200
Subject: [PATCH 1373/2191] chore(deps): update opentelemetry-ruby (non-major)
 (#30771)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile      | 2 +-
 Gemfile.lock | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index ecd9088d399ead..c2693a3cd19cf9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -105,7 +105,7 @@ gem 'private_address_check', '~> 0.5'
 gem 'opentelemetry-api', '~> 1.2.5'
 
 group :opentelemetry do
-  gem 'opentelemetry-exporter-otlp', '~> 0.27.0', require: false
+  gem 'opentelemetry-exporter-otlp', '~> 0.28.0', require: false
   gem 'opentelemetry-instrumentation-active_job', '~> 0.7.1', require: false
   gem 'opentelemetry-instrumentation-active_model_serializers', '~> 0.20.1', require: false
   gem 'opentelemetry-instrumentation-concurrent_ruby', '~> 0.21.2', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 98a1b0e1a4bd04..aedc5718af017a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -490,8 +490,8 @@ GEM
     opentelemetry-api (1.2.5)
     opentelemetry-common (0.20.1)
       opentelemetry-api (~> 1.0)
-    opentelemetry-exporter-otlp (0.27.0)
-      google-protobuf (~> 3.14)
+    opentelemetry-exporter-otlp (0.28.0)
+      google-protobuf (>= 3.18)
       googleapis-common-protos-types (~> 1.3)
       opentelemetry-api (~> 1.1)
       opentelemetry-common (~> 0.20)
@@ -974,7 +974,7 @@ DEPENDENCIES
   omniauth-saml (~> 2.0)
   omniauth_openid_connect (~> 0.6.1)
   opentelemetry-api (~> 1.2.5)
-  opentelemetry-exporter-otlp (~> 0.27.0)
+  opentelemetry-exporter-otlp (~> 0.28.0)
   opentelemetry-instrumentation-active_job (~> 0.7.1)
   opentelemetry-instrumentation-active_model_serializers (~> 0.20.1)
   opentelemetry-instrumentation-concurrent_ruby (~> 0.21.2)

From 8fd5b59f8ff74d08514a0b8f563c9e23ad278814 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 21 Jun 2024 16:15:09 +0000
Subject: [PATCH 1374/2191] chore(deps): update dependency devise-two-factor to
 v5.1.0 (#30760)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index aedc5718af017a..15b4e41aacf351 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -143,7 +143,7 @@ GEM
     brpoplpush-redis_script (0.1.3)
       concurrent-ruby (~> 1.0, >= 1.0.5)
       redis (>= 1.0, < 6)
-    builder (3.2.4)
+    builder (3.3.0)
     bundler-audit (0.9.1)
       bundler (>= 1.2.0, < 3)
       thor (~> 1.0)
@@ -195,7 +195,7 @@ GEM
       railties (>= 4.1.0)
       responders
       warden (~> 1.2.3)
-    devise-two-factor (5.0.0)
+    devise-two-factor (5.1.0)
       activesupport (~> 7.0)
       devise (~> 4.0)
       railties (~> 7.0)
@@ -226,7 +226,7 @@ GEM
       htmlentities (~> 4.3.3)
       launchy (~> 2.1)
       mail (~> 2.7)
-    erubi (1.12.0)
+    erubi (1.13.0)
     et-orbi (1.2.11)
       tzinfo
     excon (0.110.0)
@@ -676,7 +676,7 @@ GEM
       link_header (~> 0.0, >= 0.0.8)
     rdf-normalize (0.7.0)
       rdf (~> 3.3)
-    rdoc (6.6.3.1)
+    rdoc (6.7.0)
       psych (>= 4.0.0)
     redcarpet (3.6.0)
     redis (4.8.1)

From 93741f6a707329fb3f4c1b46bfc979fa99dd16d7 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 21 Jun 2024 18:15:33 +0200
Subject: [PATCH 1375/2191] fix(deps): update dependency glob to v10.4.2
 (#30761)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 948670e2cd8936..ff4e1110d9fee9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8924,17 +8924,18 @@ __metadata:
   linkType: hard
 
 "glob@npm:^10.2.2, glob@npm:^10.2.6, glob@npm:^10.3.10":
-  version: 10.4.1
-  resolution: "glob@npm:10.4.1"
+  version: 10.4.2
+  resolution: "glob@npm:10.4.2"
   dependencies:
     foreground-child: "npm:^3.1.0"
     jackspeak: "npm:^3.1.2"
     minimatch: "npm:^9.0.4"
     minipass: "npm:^7.1.2"
+    package-json-from-dist: "npm:^1.0.0"
     path-scurry: "npm:^1.11.1"
   bin:
     glob: dist/esm/bin.mjs
-  checksum: 10c0/77f2900ed98b9cc2a0e1901ee5e476d664dae3cd0f1b662b8bfd4ccf00d0edc31a11595807706a274ca10e1e251411bbf2e8e976c82bed0d879a9b89343ed379
+  checksum: 10c0/2c7296695fa75a935f3ad17dc62e4e170a8bb8752cf64d328be8992dd6ad40777939003754e10e9741ff8fbe43aa52fba32d6930d0ffa0e3b74bc3fb5eebaa2f
   languageName: node
   linkType: hard
 
@@ -12668,6 +12669,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"package-json-from-dist@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "package-json-from-dist@npm:1.0.0"
+  checksum: 10c0/e3ffaf6ac1040ab6082a658230c041ad14e72fabe99076a2081bb1d5d41210f11872403fc09082daf4387fc0baa6577f96c9c0e94c90c394fd57794b66aa4033
+  languageName: node
+  linkType: hard
+
 "pako@npm:~1.0.5":
   version: 1.0.11
   resolution: "pako@npm:1.0.11"

From 637de635054d42a0ae43035c2658c6941498f918 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 21 Jun 2024 21:37:22 +0200
Subject: [PATCH 1376/2191] chore(deps): update dependency public_suffix to v6
 (#30738)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index c2693a3cd19cf9..f2d7d098d5ccbb 100644
--- a/Gemfile
+++ b/Gemfile
@@ -69,7 +69,7 @@ gem 'oj', '~> 3.14'
 gem 'ox', '~> 2.14'
 gem 'parslet'
 gem 'premailer-rails'
-gem 'public_suffix', '~> 5.0'
+gem 'public_suffix', '~> 6.0'
 gem 'pundit', '~> 2.3'
 gem 'rack-attack', '~> 6.6'
 gem 'rack-cors', '~> 2.0', require: 'rack/cors'
diff --git a/Gemfile.lock b/Gemfile.lock
index 15b4e41aacf351..0fe1c03b25ac88 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -603,7 +603,7 @@ GEM
       railties (>= 7.0.0)
     psych (5.1.2)
       stringio
-    public_suffix (5.1.1)
+    public_suffix (6.0.0)
     puma (6.4.2)
       nio4r (~> 2.0)
     pundit (2.3.2)
@@ -996,7 +996,7 @@ DEPENDENCIES
   premailer-rails
   private_address_check (~> 0.5)
   propshaft
-  public_suffix (~> 5.0)
+  public_suffix (~> 6.0)
   puma (~> 6.3)
   pundit (~> 2.3)
   rack (~> 2.2.7)

From 4743657ba24e83c376e9f477fbf49114e6f09a57 Mon Sep 17 00:00:00 2001
From: Michael Stanclift <mx@vmstan.com>
Date: Fri, 21 Jun 2024 15:26:39 -0500
Subject: [PATCH 1377/2191] Fix Docker buildx warnings about casing and
 undefined variables (#30798)

---
 Dockerfile           | 18 +++++++++---------
 streaming/Dockerfile |  9 ++++++++-
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index c3e43dac8dd7e3..7f7eca06dac040 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,9 +19,9 @@ ARG NODE_MAJOR_VERSION="20"
 # Debian image to use for base image, change with [--build-arg DEBIAN_VERSION="bookworm"]
 ARG DEBIAN_VERSION="bookworm"
 # Node image to use for base image based on combined variables (ex: 20-bookworm-slim)
-FROM docker.io/node:${NODE_MAJOR_VERSION}-${DEBIAN_VERSION}-slim as node
+FROM docker.io/node:${NODE_MAJOR_VERSION}-${DEBIAN_VERSION}-slim AS node
 # Ruby image to use for base image based on combined variables (ex: 3.3.x-slim-bookworm)
-FROM docker.io/ruby:${RUBY_VERSION}-slim-${DEBIAN_VERSION} as ruby
+FROM docker.io/ruby:${RUBY_VERSION}-slim-${DEBIAN_VERSION} AS ruby
 
 # Resulting version string is vX.X.X-MASTODON_VERSION_PRERELEASE+MASTODON_VERSION_METADATA
 # Example: v4.3.0-nightly.2023.11.09+pr-123456
@@ -117,7 +117,7 @@ RUN \
   ;
 
 # Create temporary build layer from base image
-FROM ruby as build
+FROM ruby AS build
 
 # Copy Node package configuration files into working directory
 COPY package.json yarn.lock .yarnrc.yml /opt/mastodon/
@@ -185,7 +185,7 @@ RUN \
   corepack prepare --activate;
 
 # Create temporary libvips specific build layer from build layer
-FROM build as libvips
+FROM build AS libvips
 
 # libvips version to compile, change with [--build-arg VIPS_VERSION="8.15.2"]
 # renovate: datasource=github-releases depName=libvips packageName=libvips/libvips
@@ -205,7 +205,7 @@ RUN \
   ninja install;
 
 # Create temporary ffmpeg specific build layer from build layer
-FROM build as ffmpeg
+FROM build AS ffmpeg
 
 # ffmpeg version to compile, change with [--build-arg FFMPEG_VERSION="7.0.x"]
 # renovate: datasource=repology depName=ffmpeg packageName=openpkg_current/ffmpeg
@@ -247,7 +247,7 @@ RUN \
   make install;
 
 # Create temporary bundler specific build layer from build layer
-FROM build as bundler
+FROM build AS bundler
 
 ARG TARGETPLATFORM
 
@@ -269,7 +269,7 @@ RUN \
   bundle install -j"$(nproc)";
 
 # Create temporary node specific build layer from build layer
-FROM build as yarn
+FROM build AS yarn
 
 ARG TARGETPLATFORM
 
@@ -286,7 +286,7 @@ RUN \
   yarn workspaces focus --production @mastodon/mastodon;
 
 # Create temporary assets build layer from build layer
-FROM build as precompiler
+FROM build AS precompiler
 
 # Copy Mastodon sources into precompiler layer
 COPY . /opt/mastodon/
@@ -310,7 +310,7 @@ RUN \
   rm -fr /opt/mastodon/tmp;
 
 # Prep final Mastodon Ruby layer
-FROM ruby as mastodon
+FROM ruby AS mastodon
 
 ARG TARGETPLATFORM
 
diff --git a/streaming/Dockerfile b/streaming/Dockerfile
index aee1f76ad39c36..319d5b7fd86dec 100644
--- a/streaming/Dockerfile
+++ b/streaming/Dockerfile
@@ -13,7 +13,14 @@ ARG NODE_MAJOR_VERSION="20"
 # Debian image to use for base image, change with [--build-arg DEBIAN_VERSION="bookworm"]
 ARG DEBIAN_VERSION="bookworm"
 # Node image to use for base image based on combined variables (ex: 20-bookworm-slim)
-FROM docker.io/node:${NODE_MAJOR_VERSION}-${DEBIAN_VERSION}-slim as streaming
+FROM docker.io/node:${NODE_MAJOR_VERSION}-${DEBIAN_VERSION}-slim AS streaming
+
+# Resulting version string is vX.X.X-MASTODON_VERSION_PRERELEASE+MASTODON_VERSION_METADATA
+# Example: v4.3.0-nightly.2023.11.09+pr-123456
+# Overwrite existence of 'alpha.X' in version.rb [--build-arg MASTODON_VERSION_PRERELEASE="nightly.2023.11.09"]
+ARG MASTODON_VERSION_PRERELEASE=""
+# Append build metadata or fork information to version.rb [--build-arg MASTODON_VERSION_METADATA="pr-123456"]
+ARG MASTODON_VERSION_METADATA=""
 
 # Timezone used by the Docker container and runtime, change with [--build-arg TZ=Europe/Berlin]
 ARG TZ="Etc/UTC"

From 61488331c4aef592444ee5f7fbc8870f4a1bb527 Mon Sep 17 00:00:00 2001
From: Jeremy Kescher <jeremy@kescher.at>
Date: Sat, 22 Jun 2024 13:30:57 +0200
Subject: [PATCH 1378/2191] Upgrade to yarn 4.3.1 ahead of time

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index f8ef5604054d91..ccfea2bc093525 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@mastodon/mastodon",
   "license": "AGPL-3.0-or-later",
-  "packageManager": "yarn@4.3.0",
+  "packageManager": "yarn@4.3.1",
   "engines": {
     "node": ">=18"
   },

From fbf9a61c550bee5a83cceebe55941f756d89da19 Mon Sep 17 00:00:00 2001
From: Jeremy Kescher <jeremy@kescher.at>
Date: Sat, 22 Jun 2024 13:34:56 +0200
Subject: [PATCH 1379/2191] Bump Catstodon revision to 1.1.2

---
 CHANGELOG.md            | 4 ++++
 lib/mastodon/version.rb | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 82d1510d259916..e16ad5de6cc609 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@ All changes to Catstodon that aren't Mastodon or glitch-soc Mastodon changes wil
 
 All release dates, as well as most other dates, are intended to be read as "within the day, in UTC time."
 
+## [v4.3.0-alpha.4+glitch+cat+1.1.2] - 2024-06-22
+
+- Upstream changes
+
 ## [v4.3.0-alpha.4+glitch+cat+1.1.1] - 2024-06-19
 
 - Upstream changes (18d9601464524dabc4a451524a535d0f9a3cb65e -> 0c2b1f56ef6f0c48330076498741849b79d8b18c)
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index 318b7486e2eb9c..a4b0059ffaaebf 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -25,7 +25,7 @@ def prerelease
     end
 
     def catstodon_revision
-      '1.1.1'
+      '1.1.2'
     end
 
     def build_metadata

From 3f81e7dcc8afbb86e48c36773fe2bc7018b44379 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 24 Jun 2024 12:16:24 +0200
Subject: [PATCH 1380/2191] chore(deps): update dependency
 @types/http-link-header to v1.0.6 (#30814)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index ff4e1110d9fee9..b6117d821e65b3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3622,11 +3622,11 @@ __metadata:
   linkType: hard
 
 "@types/http-link-header@npm:^1.0.3":
-  version: 1.0.5
-  resolution: "@types/http-link-header@npm:1.0.5"
+  version: 1.0.6
+  resolution: "@types/http-link-header@npm:1.0.6"
   dependencies:
     "@types/node": "npm:*"
-  checksum: 10c0/adeb13381b38c3625478149820772924c154b4a7250dca62c346810a8378f8968fc7f3a9a4f55ec61de5d06083637540f862c8a920f6a710310c9645d19a077d
+  checksum: 10c0/63f3f7ab5ff6312280727ba8cf836abf5d1b76f9dc5eefc8cd4389db29d57a72fb0e028db99735ada5ccfd3c2cc6607e096b5cc142fc53c2bb5688b6295f61af
   languageName: node
   linkType: hard
 

From 6d14cfbf298eec6e2ffcd4ad69a118cdd168b3a1 Mon Sep 17 00:00:00 2001
From: Nick Schonning <nschonni@gmail.com>
Date: Mon, 24 Jun 2024 06:18:36 -0400
Subject: [PATCH 1381/2191] Unset Rails/UnusedIgnoredColumns (#30800)

---
 .rubocop/rails.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.rubocop/rails.yml b/.rubocop/rails.yml
index 4e08f1ab91e55d..68c90143a692be 100644
--- a/.rubocop/rails.yml
+++ b/.rubocop/rails.yml
@@ -18,6 +18,3 @@ Rails/RakeEnvironment:
 
 Rails/SkipsModelValidations:
   Enabled: false
-
-Rails/UnusedIgnoredColumns:
-  Enabled: false # Preserve ability to migrate from arbitrary old versions

From b3710098a8edcb5cc317a280758b2a772ea722ef Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 24 Jun 2024 12:18:51 +0200
Subject: [PATCH 1382/2191] chore(deps): update dependency
 opentelemetry-instrumentation-faraday to v0.24.5 (#30797)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 0fe1c03b25ac88..abd31f49aab9ec 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -532,7 +532,7 @@ GEM
     opentelemetry-instrumentation-excon (0.22.3)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-faraday (0.24.4)
+    opentelemetry-instrumentation-faraday (0.24.5)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
     opentelemetry-instrumentation-http (0.23.3)

From 54cc204473302eda7e6e7e75b343a14859524ab1 Mon Sep 17 00:00:00 2001
From: Essem <smswessem@gmail.com>
Date: Mon, 24 Jun 2024 05:29:00 -0500
Subject: [PATCH 1383/2191] Use WebSocketServer instead of WebSocket.Server in
 streaming (#30788)

---
 streaming/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/streaming/index.js b/streaming/index.js
index 154ecbc02c5f5a..65a63bb114326a 100644
--- a/streaming/index.js
+++ b/streaming/index.js
@@ -12,7 +12,7 @@ import { Redis } from 'ioredis';
 import { JSDOM } from 'jsdom';
 import pg from 'pg';
 import pgConnectionString from 'pg-connection-string';
-import WebSocket from 'ws';
+import { WebSocketServer } from 'ws';
 
 import { AuthenticationError, RequestError, extractStatusAndMessage as extractErrorStatusAndMessage } from './errors.js';
 import { logger, httpLogger, initializeLogLevel, attachWebsocketHttpLogger, createWebsocketLogger } from './logging.js';
@@ -289,7 +289,7 @@ const CHANNEL_NAMES = [
 const startServer = async () => {
   const pgPool = new pg.Pool(pgConfigFromEnv(process.env));
   const server = http.createServer();
-  const wss = new WebSocket.Server({ noServer: true });
+  const wss = new WebSocketServer({ noServer: true });
 
   // Set the X-Request-Id header on WebSockets:
   wss.on("headers", function onHeaders(headers, req) {

From 1af6313ced5b39041cb8c480b1f0c65155429238 Mon Sep 17 00:00:00 2001
From: Essem <smswessem@gmail.com>
Date: Mon, 24 Jun 2024 05:36:26 -0500
Subject: [PATCH 1384/2191] Fix CMD syntax in streaming Dockerfile (#30795)

---
 streaming/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/streaming/Dockerfile b/streaming/Dockerfile
index 319d5b7fd86dec..d9f7615fa80c39 100644
--- a/streaming/Dockerfile
+++ b/streaming/Dockerfile
@@ -110,4 +110,4 @@ USER mastodon
 # Expose default Streaming ports
 EXPOSE 4000
 # Run streaming when started
-CMD [ node ./streaming/index.js ]
+CMD [ "node", "./streaming/index.js" ]

From 61722b1b1fb36ff5c3d6c470981f5fc6648e2d14 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 24 Jun 2024 12:46:53 +0200
Subject: [PATCH 1385/2191] New Crowdin Translations (automated) (#30808)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/fil.json   | 7 +++++++
 app/javascript/mastodon/locales/pt-BR.json | 4 ++++
 app/javascript/mastodon/locales/zh-TW.json | 2 +-
 config/locales/doorkeeper.pt-BR.yml        | 2 ++
 config/locales/pt-BR.yml                   | 1 +
 config/locales/ru.yml                      | 4 ++++
 6 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/locales/fil.json b/app/javascript/mastodon/locales/fil.json
index 9e459f76719abc..b8a2987ef052f3 100644
--- a/app/javascript/mastodon/locales/fil.json
+++ b/app/javascript/mastodon/locales/fil.json
@@ -118,6 +118,7 @@
   "confirmations.delete_list.confirm": "Tanggalin",
   "confirmations.delete_list.message": "Sigurado ka bang gusto mong burahin ang listahang ito?",
   "confirmations.discard_edit_media.confirm": "Ipagpaliban",
+  "confirmations.domain_block.confirm": "Harangan ang serbiro",
   "confirmations.edit.confirm": "Baguhin",
   "confirmations.reply.confirm": "Tumugon",
   "conversation.mark_as_read": "Markahan bilang nabasa na",
@@ -186,6 +187,7 @@
   "follow_request.authorize": "Tanggapin",
   "follow_request.reject": "Tanggihan",
   "follow_suggestions.dismiss": "Huwag nang ipakita muli",
+  "follow_suggestions.popular_suggestion_longer": "Sikat sa {domain}",
   "follow_suggestions.view_all": "Tingnan lahat",
   "follow_suggestions.who_to_follow": "Sinong maaaring sundan",
   "footer.about": "Tungkol dito",
@@ -220,6 +222,7 @@
   "link_preview.author": "Ni/ng {name}",
   "lists.account.add": "Idagdag sa talaan",
   "lists.account.remove": "Tanggalin mula sa talaan",
+  "lists.delete": "Burahin ang talaan",
   "lists.new.create": "Idagdag sa talaan",
   "lists.new.title_placeholder": "Bagong pangalan ng talaan",
   "lists.replies_policy.title": "Ipakita ang mga tugon sa:",
@@ -287,9 +290,13 @@
   "reply_indicator.cancel": "Ipagpaliban",
   "report.block": "Harangan",
   "report.categories.other": "Iba pa",
+  "report.categories.violation": "Lumalabag ang nilalaman sa isa o higit pang mga patakaran ng serbiro",
+  "report.category.subtitle": "Piliin ang pinakamahusay na tugma",
   "report.category.title": "Sabihin mo sa amin kung anong nangyari sa {type} na ito",
   "report.close": "Tapos na",
   "report.next": "Sunod",
+  "report.placeholder": "Mga Karagdagang Puna",
+  "report.reasons.dislike": "Hindi ko gusto ito",
   "report.reasons.violation": "Lumalabag ito sa mga panuntunan ng serbiro",
   "report.reasons.violation_description": "Alam mo na lumalabag ito sa mga partikular na panuntunan",
   "report.rules.title": "Aling mga patakaran ang nilabag?",
diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json
index afe54905476d3b..4d3bd2d280d6fe 100644
--- a/app/javascript/mastodon/locales/pt-BR.json
+++ b/app/javascript/mastodon/locales/pt-BR.json
@@ -415,6 +415,7 @@
   "limited_account_hint.title": "Este perfil foi ocultado pelos moderadores do {domain}.",
   "link_preview.author": "Por {name}",
   "link_preview.more_from_author": "Mais de {name}",
+  "link_preview.shares": "{count, plural, one {{counter} publicação} other {{counter} publicações}}",
   "lists.account.add": "Adicionar à lista",
   "lists.account.remove": "Remover da lista",
   "lists.delete": "Excluir lista",
@@ -695,8 +696,11 @@
   "server_banner.about_active_users": "Pessoas usando este servidor durante os últimos 30 dias (Usuários ativos mensalmente)",
   "server_banner.active_users": "usuários ativos",
   "server_banner.administered_by": "Administrado por:",
+  "server_banner.is_one_of_many": "{domain} é um dos muitos servidores Mastodon independentes que você pode usar para participar do fediverso.",
   "server_banner.server_stats": "Estatísticas do servidor:",
   "sign_in_banner.create_account": "Criar conta",
+  "sign_in_banner.follow_anyone": "Siga alguém pelo fediverso e veja tudo em ordem cronológica. Sem algoritmos, anúncios ou clickbait à vista.",
+  "sign_in_banner.mastodon_is": "O Mastodon é a melhor maneira de acompanhar o que está acontecendo.",
   "sign_in_banner.sign_in": "Entrar",
   "sign_in_banner.sso_redirect": "Entrar ou Registrar-se",
   "status.admin_account": "Abrir interface de moderação para @{name}",
diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json
index e6cd62162bc4f7..4ab22daba5af8f 100644
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@@ -62,7 +62,7 @@
   "account.requested": "正在等候審核。按一下以取消跟隨請求",
   "account.requested_follow": "{name} 要求跟隨您",
   "account.share": "分享 @{name} 的個人檔案",
-  "account.show_reblogs": "顯示來自 @{name} 的嘟文",
+  "account.show_reblogs": "顯示來自 @{name} 的轉嘟",
   "account.statuses_counter": "{count, plural,one {{counter} 則}other {{counter} 則}}嘟文",
   "account.unblock": "解除封鎖 @{name}",
   "account.unblock_domain": "解除封鎖網域 {domain}",
diff --git a/config/locales/doorkeeper.pt-BR.yml b/config/locales/doorkeeper.pt-BR.yml
index d7e9353b59be3e..6b076e9081c7a6 100644
--- a/config/locales/doorkeeper.pt-BR.yml
+++ b/config/locales/doorkeeper.pt-BR.yml
@@ -135,6 +135,7 @@ pt-BR:
         media: Mídias anexadas
         mutes: Silenciados
         notifications: Notificações
+        profile: Seu perfil do Mastodon
         push: Notificações push
         reports: Denúncias
         search: Buscar
@@ -165,6 +166,7 @@ pt-BR:
       admin:write:reports: executar ações de moderação em denúncias
       crypto: usar criptografia de ponta-a-ponta
       follow: alterar o relacionamento das contas
+      profile: ler somente as informações do perfil da sua conta
       push: receber notificações push
       read: ler todos os dados da sua conta
       read:accounts: ver informações das contas
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 8d3b53f777d630..584a9253b81a46 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -293,6 +293,7 @@ pt-BR:
       filter_by_action: Filtrar por ação
       filter_by_user: Filtrar por usuário
       title: Auditar histórico
+      unavailable_instance: "(nome de domínio indisponível)"
     announcements:
       destroyed_msg: Anúncio excluído!
       edit:
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 6dff92bb6d5386..5f5b3676fb6623 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -1699,6 +1699,7 @@ ru:
     import: Импорт
     import_and_export: Импорт и экспорт
     migrate: Миграция учётной записи
+    notifications: Уведомления по электронной почте
     preferences: Настройки
     profile: Профиль
     relationships: Подписки и подписчики
@@ -1706,6 +1707,9 @@ ru:
     strikes: Замечания модерации
     two_factor_authentication: Подтверждение входа
     webauthn_authentication: Ключи безопасности
+  severed_relationships:
+    event_type:
+      user_domain_block: Вы заблокировали %{target_name}
   statuses:
     attached:
       audio:

From 8827cd597e695c0368dfdce582755eda7f667272 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 24 Jun 2024 15:11:10 +0200
Subject: [PATCH 1386/2191] Fix `/admin/accounts/:account_id/statuses/:id` for
 edited posts with media attachments (#30819)

---
 app/models/status_edit.rb                          | 2 +-
 spec/controllers/admin/statuses_controller_spec.rb | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/models/status_edit.rb b/app/models/status_edit.rb
index 50dabb91f5bc46..089c42fb99493d 100644
--- a/app/models/status_edit.rb
+++ b/app/models/status_edit.rb
@@ -42,7 +42,7 @@ class PreservedMediaAttachment < ActiveModelSerializers::Model
   scope :ordered, -> { order(id: :asc) }
 
   delegate :local?, :application, :edited?, :edited_at,
-           :discarded?, :visibility, to: :status
+           :discarded?, :visibility, :language, to: :status
 
   def emojis
     return @emojis if defined?(@emojis)
diff --git a/spec/controllers/admin/statuses_controller_spec.rb b/spec/controllers/admin/statuses_controller_spec.rb
index 4e8bf9ead68d51..4144d97d64d666 100644
--- a/spec/controllers/admin/statuses_controller_spec.rb
+++ b/spec/controllers/admin/statuses_controller_spec.rb
@@ -44,6 +44,11 @@
 
   describe 'GET #show' do
     before do
+      status.media_attachments << Fabricate(:media_attachment, type: :image, account: status.account)
+      status.save!
+      status.snapshot!(at_time: status.created_at, rate_limit: false)
+      status.update!(text: 'Hello, this is an edited post')
+      status.snapshot!(rate_limit: false)
       get :show, params: { account_id: account.id, id: status.id }
     end
 

From f6e466058a5a70eba5001c7ad3a80d86c07eb25d Mon Sep 17 00:00:00 2001
From: Tim Rogers <rogers.timothy.john@gmail.com>
Date: Mon, 24 Jun 2024 09:41:04 -0500
Subject: [PATCH 1387/2191] Added check for STATSD_ADDR setting to emit a
 warning and proceed rather than crashing if the address is unreachable
 (#30691)

---
 config/initializers/statsd.rb | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/config/initializers/statsd.rb b/config/initializers/statsd.rb
index a655c107165bad..f1628a9d12ca32 100644
--- a/config/initializers/statsd.rb
+++ b/config/initializers/statsd.rb
@@ -3,13 +3,17 @@
 if ENV['STATSD_ADDR'].present?
   host, port = ENV['STATSD_ADDR'].split(':')
 
-  statsd = Statsd.new(host, port)
-  statsd.namespace = ENV.fetch('STATSD_NAMESPACE') { ['Mastodon', Rails.env].join('.') }
+  begin
+    statsd = Statsd.new(host, port)
+    statsd.namespace = ENV.fetch('STATSD_NAMESPACE') { ['Mastodon', Rails.env].join('.') }
 
-  NSA.inform_statsd(statsd) do |informant|
-    informant.collect(:action_controller, :web)
-    informant.collect(:active_record, :db)
-    informant.collect(:active_support_cache, :cache)
-    informant.collect(:sidekiq, :sidekiq) if ENV['STATSD_SIDEKIQ'] == 'true'
+    NSA.inform_statsd(statsd) do |informant|
+      informant.collect(:action_controller, :web)
+      informant.collect(:active_record, :db)
+      informant.collect(:active_support_cache, :cache)
+      informant.collect(:sidekiq, :sidekiq) if ENV['STATSD_SIDEKIQ'] == 'true'
+    end
+  rescue
+    Rails.logger.warn("statsd address #{ENV['STATSD_ADDR']} not reachable, proceeding without statsd")
   end
 end

From 39d80e84be660e6d3eb121ee8f1067bd87cc3783 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 24 Jun 2024 10:47:14 -0400
Subject: [PATCH 1388/2191] Remove `lockfileMaintenance` setting (#30799)

---
 .github/renovate.json5 | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/renovate.json5 b/.github/renovate.json5
index 03787dfac6c21b..2cf7bec8eebd21 100644
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -14,9 +14,6 @@
   // to `null` after any other rule set it to something.
   dependencyDashboardHeader: 'This issue lists Renovate updates and detected dependencies. Read the [Dependency Dashboard](https://docs.renovatebot.com/key-concepts/dashboard/) docs to learn more. Before approving any upgrade: read the description and comments in the [`renovate.json5` file](https://github.com/mastodon/mastodon/blob/main/.github/renovate.json5).',
   postUpdateOptions: ['yarnDedupeHighest'],
-  lockFileMaintenance: {
-    enabled: true,
-  },
   packageRules: [
     {
       // Require Dependency Dashboard Approval for major version bumps of these node packages

From 6527d5039141fe4a80645147b581d76952a64f39 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 24 Jun 2024 10:50:37 -0400
Subject: [PATCH 1389/2191] Disable `Rails/BulkChangeTable` cop (#30820)

---
 .rubocop/rails.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.rubocop/rails.yml b/.rubocop/rails.yml
index 68c90143a692be..ae31c1f266142e 100644
--- a/.rubocop/rails.yml
+++ b/.rubocop/rails.yml
@@ -1,4 +1,7 @@
 ---
+Rails/BulkChangeTable:
+  Enabled: false # Conflicts with strong_migrations features
+
 Rails/FilePath:
   EnforcedStyle: arguments
 

From 052c90b8de2164b8003c29f445f165c7e802fd25 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 25 Jun 2024 09:45:58 +0200
Subject: [PATCH 1390/2191] New Crowdin Translations (automated) (#30825)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/lt.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/javascript/mastodon/locales/lt.json b/app/javascript/mastodon/locales/lt.json
index b365d6458966d5..bb69b733997bd1 100644
--- a/app/javascript/mastodon/locales/lt.json
+++ b/app/javascript/mastodon/locales/lt.json
@@ -1,18 +1,18 @@
 {
   "about.blocks": "Prižiūrimi serveriai",
   "about.contact": "Kontaktai:",
-  "about.disclaimer": "Mastodon – tai nemokama atvirojo kodo programinė įranga ir Mastodon gGmbH prekės ženklas.",
+  "about.disclaimer": "„Mastodon“ – tai nemokama atvirojo kodo programinė įranga ir „Mastodon“ gGmbH prekės ženklas.",
   "about.domain_blocks.no_reason_available": "Priežastis nepateikta",
-  "about.domain_blocks.preamble": "Mastodon paprastai leidžia peržiūrėti turinį ir bendrauti su naudotojais iš bet kurio kito fediverse esančio serverio. Šios yra išimtys, kurios buvo padarytos šiame konkrečiame serveryje.",
+  "about.domain_blocks.preamble": "„Mastodon“ paprastai leidžia peržiūrėti turinį ir bendrauti su naudotojais iš bet kurio kito fediverse esančio serverio. Šios yra išimtys, kurios buvo padarytos šiame konkrečiame serveryje.",
   "about.domain_blocks.silenced.explanation": "Paprastai nematysi profilių ir turinio iš šio serverio, nebent jį aiškiai ieškosi arba pasirinksi jį sekdamas (-a).",
   "about.domain_blocks.silenced.title": "Ribota",
   "about.domain_blocks.suspended.explanation": "Jokie duomenys iš šio serverio nebus apdorojami, saugomi ar keičiami, todėl bet kokia sąveika ar bendravimas su šio serverio naudotojais bus neįmanomas.",
-  "about.domain_blocks.suspended.title": "Uždrausta",
+  "about.domain_blocks.suspended.title": "Pristabdyta",
   "about.not_available": "Ši informacija nebuvo pateikta šiame serveryje.",
-  "about.powered_by": "Decentralizuota socialinė medija, kurią valdo {mastodon}",
+  "about.powered_by": "Decentralizuota socialinė medija, veikianti pagal „{mastodon}“",
   "about.rules": "Serverio taisyklės",
   "account.account_note_header": "Pastaba",
-  "account.add_or_remove_from_list": "Pridėti arba ištrinti iš sąrašų",
+  "account.add_or_remove_from_list": "Pridėti arba pašalinti iš sąrašų",
   "account.badges.bot": "Automatizuotas",
   "account.badges.group": "Grupė",
   "account.block": "Blokuoti @{name}",

From 30ae5952d228b31af58534d76a8d78bf27a171f9 Mon Sep 17 00:00:00 2001
From: Emelia Smith <ThisIsMissEm@users.noreply.github.com>
Date: Tue, 25 Jun 2024 09:46:53 +0200
Subject: [PATCH 1391/2191] Fix: Ensure "With Media" is highlighted from Admin
 Accounts page (#30812)

---
 app/views/admin/statuses/index.html.haml           | 2 +-
 spec/controllers/admin/statuses_controller_spec.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/admin/statuses/index.html.haml b/app/views/admin/statuses/index.html.haml
index 770d972d934b47..b03b8ac51b9002 100644
--- a/app/views/admin/statuses/index.html.haml
+++ b/app/views/admin/statuses/index.html.haml
@@ -8,7 +8,7 @@
     %strong= t('admin.statuses.media.title')
     %ul
       %li= filter_link_to t('generic.all'), media: nil, id: nil
-      %li= filter_link_to t('admin.statuses.with_media'), media: '1'
+      %li= filter_link_to t('admin.statuses.with_media'), media: true
   .back-link
     - if params[:report_id]
       = link_to admin_report_path(params[:report_id].to_i) do
diff --git a/spec/controllers/admin/statuses_controller_spec.rb b/spec/controllers/admin/statuses_controller_spec.rb
index 4144d97d64d666..4ab6d109ef89b5 100644
--- a/spec/controllers/admin/statuses_controller_spec.rb
+++ b/spec/controllers/admin/statuses_controller_spec.rb
@@ -33,7 +33,7 @@
 
     context 'when filtering by media' do
       before do
-        get :index, params: { account_id: account.id, media: '1' }
+        get :index, params: { account_id: account.id, media: true }
       end
 
       it 'returns http success' do

From 309274839dd446d334ae2ea5c6e033debe56e4ed Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 25 Jun 2024 09:56:38 +0200
Subject: [PATCH 1392/2191] chore(deps): update dependency aws-sdk-s3 to
 v1.153.0 (#30824)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index abd31f49aab9ec..5d735eb753c29e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -100,17 +100,17 @@ GEM
     attr_required (1.0.2)
     awrence (1.2.1)
     aws-eventstream (1.3.0)
-    aws-partitions (1.940.0)
-    aws-sdk-core (3.197.0)
+    aws-partitions (1.947.0)
+    aws-sdk-core (3.198.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.8)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.83.0)
-      aws-sdk-core (~> 3, >= 3.197.0)
+    aws-sdk-kms (1.86.0)
+      aws-sdk-core (~> 3, >= 3.198.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.152.3)
-      aws-sdk-core (~> 3, >= 3.197.0)
+    aws-sdk-s3 (1.153.0)
+      aws-sdk-core (~> 3, >= 3.198.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.8)
     aws-sigv4 (1.8.0)

From 547e97945df0abc68dc473ed60d2faeb2feb2b06 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Tue, 25 Jun 2024 15:45:41 +0200
Subject: [PATCH 1393/2191] Change `apiRequest` to accept both `params` and
 `data` (#30818)

---
 app/javascript/mastodon/api.ts                | 37 ++++++++++++++++++-
 app/javascript/mastodon/api/accounts.ts       |  8 ++--
 app/javascript/mastodon/api/interactions.ts   | 10 +++--
 .../mastodon/api/notification_policies.ts     |  8 ++--
 4 files changed, 51 insertions(+), 12 deletions(-)

diff --git a/app/javascript/mastodon/api.ts b/app/javascript/mastodon/api.ts
index e133125a29cf33..24672290c74f94 100644
--- a/app/javascript/mastodon/api.ts
+++ b/app/javascript/mastodon/api.ts
@@ -59,16 +59,49 @@ export default function api(withAuthorization = true) {
   });
 }
 
+type RequestParamsOrData = Record<string, unknown>;
+
 export async function apiRequest<ApiResponse = unknown>(
   method: Method,
   url: string,
-  params?: Record<string, unknown>,
+  args: {
+    params?: RequestParamsOrData;
+    data?: RequestParamsOrData;
+  } = {},
 ) {
   const { data } = await api().request<ApiResponse>({
     method,
     url: '/api/' + url,
-    data: params,
+    ...args,
   });
 
   return data;
 }
+
+export async function apiRequestGet<ApiResponse = unknown>(
+  url: string,
+  params?: RequestParamsOrData,
+) {
+  return apiRequest<ApiResponse>('GET', url, { params });
+}
+
+export async function apiRequestPost<ApiResponse = unknown>(
+  url: string,
+  data?: RequestParamsOrData,
+) {
+  return apiRequest<ApiResponse>('POST', url, { data });
+}
+
+export async function apiRequestPut<ApiResponse = unknown>(
+  url: string,
+  data?: RequestParamsOrData,
+) {
+  return apiRequest<ApiResponse>('PUT', url, { data });
+}
+
+export async function apiRequestDelete<ApiResponse = unknown>(
+  url: string,
+  params?: RequestParamsOrData,
+) {
+  return apiRequest<ApiResponse>('DELETE', url, { params });
+}
diff --git a/app/javascript/mastodon/api/accounts.ts b/app/javascript/mastodon/api/accounts.ts
index 3d89e44b2673d3..e586087854d174 100644
--- a/app/javascript/mastodon/api/accounts.ts
+++ b/app/javascript/mastodon/api/accounts.ts
@@ -1,7 +1,9 @@
-import { apiRequest } from 'mastodon/api';
+import { apiRequestPost } from 'mastodon/api';
 import type { ApiRelationshipJSON } from 'mastodon/api_types/relationships';
 
 export const apiSubmitAccountNote = (id: string, value: string) =>
-  apiRequest<ApiRelationshipJSON>('post', `v1/accounts/${id}/note`, {
-    comment: value,
+  apiRequestPost<ApiRelationshipJSON>(`v1/accounts/${id}/note`, {
+    data: {
+      comment: value,
+    },
   });
diff --git a/app/javascript/mastodon/api/interactions.ts b/app/javascript/mastodon/api/interactions.ts
index 4c466a1b46d90b..0bdaffbda19e87 100644
--- a/app/javascript/mastodon/api/interactions.ts
+++ b/app/javascript/mastodon/api/interactions.ts
@@ -1,10 +1,12 @@
-import { apiRequest } from 'mastodon/api';
+import { apiRequestPost } from 'mastodon/api';
 import type { Status, StatusVisibility } from 'mastodon/models/status';
 
 export const apiReblog = (statusId: string, visibility: StatusVisibility) =>
-  apiRequest<{ reblog: Status }>('post', `v1/statuses/${statusId}/reblog`, {
-    visibility,
+  apiRequestPost<{ reblog: Status }>(`v1/statuses/${statusId}/reblog`, {
+    data: {
+      visibility,
+    },
   });
 
 export const apiUnreblog = (statusId: string) =>
-  apiRequest<Status>('post', `v1/statuses/${statusId}/unreblog`);
+  apiRequestPost<Status>(`v1/statuses/${statusId}/unreblog`);
diff --git a/app/javascript/mastodon/api/notification_policies.ts b/app/javascript/mastodon/api/notification_policies.ts
index b2a1e5ac31f72a..5c1ef9c1dd699b 100644
--- a/app/javascript/mastodon/api/notification_policies.ts
+++ b/app/javascript/mastodon/api/notification_policies.ts
@@ -1,10 +1,12 @@
-import { apiRequest } from 'mastodon/api';
+import { apiRequestGet, apiRequestPut } from 'mastodon/api';
 import type { NotificationPolicyJSON } from 'mastodon/api_types/notification_policies';
 
 export const apiGetNotificationPolicy = () =>
-  apiRequest<NotificationPolicyJSON>('GET', '/v1/notifications/policy');
+  apiRequestGet<NotificationPolicyJSON>('/v1/notifications/policy');
 
 export const apiUpdateNotificationsPolicy = (
   policy: Partial<NotificationPolicyJSON>,
 ) =>
-  apiRequest<NotificationPolicyJSON>('PUT', '/v1/notifications/policy', policy);
+  apiRequestPut<NotificationPolicyJSON>('/v1/notifications/policy', {
+    data: policy,
+  });

From 8ef59729a10fd77121507dcf9ef5138ff9037d39 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 25 Jun 2024 09:57:40 -0400
Subject: [PATCH 1394/2191] Ignore intermittent chrome/manifest/icon
 interaction failure (#30793)

---
 spec/support/javascript_errors.rb | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/spec/support/javascript_errors.rb b/spec/support/javascript_errors.rb
index 28a43b3b8a59aa..76452853622b78 100644
--- a/spec/support/javascript_errors.rb
+++ b/spec/support/javascript_errors.rb
@@ -2,7 +2,14 @@
 
 RSpec.configure do |config|
   config.after(:each, :js, type: :system) do
-    errors = page.driver.browser.logs.get(:browser)
+    # Classes of intermittent ignorable errors
+    ignored_errors = [
+      /Error while trying to use the following icon from the Manifest/, # https://github.com/mastodon/mastodon/pull/30793
+    ]
+    errors = page.driver.browser.logs.get(:browser).reject do |error|
+      ignored_errors.any? { |pattern| pattern.match(error.message) }
+    end
+
     if errors.present?
       aggregate_failures 'javascript errrors' do
         errors.each do |error|

From 845fe1c6936a7b386fd74ae567c19600a88e795a Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Tue, 25 Jun 2024 16:05:24 +0200
Subject: [PATCH 1395/2191] Add the Interlingua locale (#30828)

---
 config/initializers/i18n.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/initializers/i18n.rb b/config/initializers/i18n.rb
index 8643060fa663b5..5e8d3a545e7f5d 100644
--- a/config/initializers/i18n.rb
+++ b/config/initializers/i18n.rb
@@ -41,6 +41,7 @@
     :hr,
     :hu,
     :hy,
+    :ia,
     :id,
     :ie,
     :ig,

From 3a202909157af2f07fee13113a6c55ba3d5a6ff2 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Tue, 25 Jun 2024 15:45:41 +0200
Subject: [PATCH 1396/2191] [Glitch] Change `apiRequest` to accept both
 `params` and `data`

Port 547e97945df0abc68dc473ed60d2faeb2feb2b06
---
 app/javascript/flavours/glitch/api.ts         | 37 ++++++++++++++++++-
 .../flavours/glitch/api/accounts.ts           |  8 ++--
 .../flavours/glitch/api/interactions.ts       | 10 +++--
 .../glitch/api/notification_policies.ts       |  8 ++--
 4 files changed, 51 insertions(+), 12 deletions(-)

diff --git a/app/javascript/flavours/glitch/api.ts b/app/javascript/flavours/glitch/api.ts
index e133125a29cf33..24672290c74f94 100644
--- a/app/javascript/flavours/glitch/api.ts
+++ b/app/javascript/flavours/glitch/api.ts
@@ -59,16 +59,49 @@ export default function api(withAuthorization = true) {
   });
 }
 
+type RequestParamsOrData = Record<string, unknown>;
+
 export async function apiRequest<ApiResponse = unknown>(
   method: Method,
   url: string,
-  params?: Record<string, unknown>,
+  args: {
+    params?: RequestParamsOrData;
+    data?: RequestParamsOrData;
+  } = {},
 ) {
   const { data } = await api().request<ApiResponse>({
     method,
     url: '/api/' + url,
-    data: params,
+    ...args,
   });
 
   return data;
 }
+
+export async function apiRequestGet<ApiResponse = unknown>(
+  url: string,
+  params?: RequestParamsOrData,
+) {
+  return apiRequest<ApiResponse>('GET', url, { params });
+}
+
+export async function apiRequestPost<ApiResponse = unknown>(
+  url: string,
+  data?: RequestParamsOrData,
+) {
+  return apiRequest<ApiResponse>('POST', url, { data });
+}
+
+export async function apiRequestPut<ApiResponse = unknown>(
+  url: string,
+  data?: RequestParamsOrData,
+) {
+  return apiRequest<ApiResponse>('PUT', url, { data });
+}
+
+export async function apiRequestDelete<ApiResponse = unknown>(
+  url: string,
+  params?: RequestParamsOrData,
+) {
+  return apiRequest<ApiResponse>('DELETE', url, { params });
+}
diff --git a/app/javascript/flavours/glitch/api/accounts.ts b/app/javascript/flavours/glitch/api/accounts.ts
index 346b3bc38c9b29..f2c9c43319bc24 100644
--- a/app/javascript/flavours/glitch/api/accounts.ts
+++ b/app/javascript/flavours/glitch/api/accounts.ts
@@ -1,7 +1,9 @@
-import { apiRequest } from 'flavours/glitch/api';
+import { apiRequestPost } from 'flavours/glitch/api';
 import type { ApiRelationshipJSON } from 'flavours/glitch/api_types/relationships';
 
 export const apiSubmitAccountNote = (id: string, value: string) =>
-  apiRequest<ApiRelationshipJSON>('post', `v1/accounts/${id}/note`, {
-    comment: value,
+  apiRequestPost<ApiRelationshipJSON>(`v1/accounts/${id}/note`, {
+    data: {
+      comment: value,
+    },
   });
diff --git a/app/javascript/flavours/glitch/api/interactions.ts b/app/javascript/flavours/glitch/api/interactions.ts
index eaa83b2136a4c6..1fb6fd50ddf3f9 100644
--- a/app/javascript/flavours/glitch/api/interactions.ts
+++ b/app/javascript/flavours/glitch/api/interactions.ts
@@ -1,10 +1,12 @@
-import { apiRequest } from 'flavours/glitch/api';
+import { apiRequestPost } from 'flavours/glitch/api';
 import type { Status, StatusVisibility } from 'flavours/glitch/models/status';
 
 export const apiReblog = (statusId: string, visibility: StatusVisibility) =>
-  apiRequest<{ reblog: Status }>('post', `v1/statuses/${statusId}/reblog`, {
-    visibility,
+  apiRequestPost<{ reblog: Status }>(`v1/statuses/${statusId}/reblog`, {
+    data: {
+      visibility,
+    },
   });
 
 export const apiUnreblog = (statusId: string) =>
-  apiRequest<Status>('post', `v1/statuses/${statusId}/unreblog`);
+  apiRequestPost<Status>(`v1/statuses/${statusId}/unreblog`);
diff --git a/app/javascript/flavours/glitch/api/notification_policies.ts b/app/javascript/flavours/glitch/api/notification_policies.ts
index 2bb5dc37ca64fc..8ff1967b9f5598 100644
--- a/app/javascript/flavours/glitch/api/notification_policies.ts
+++ b/app/javascript/flavours/glitch/api/notification_policies.ts
@@ -1,10 +1,12 @@
-import { apiRequest } from 'flavours/glitch/api';
+import { apiRequestGet, apiRequestPut } from 'flavours/glitch/api';
 import type { NotificationPolicyJSON } from 'flavours/glitch/api_types/notification_policies';
 
 export const apiGetNotificationPolicy = () =>
-  apiRequest<NotificationPolicyJSON>('GET', '/v1/notifications/policy');
+  apiRequestGet<NotificationPolicyJSON>('/v1/notifications/policy');
 
 export const apiUpdateNotificationsPolicy = (
   policy: Partial<NotificationPolicyJSON>,
 ) =>
-  apiRequest<NotificationPolicyJSON>('PUT', '/v1/notifications/policy', policy);
+  apiRequestPut<NotificationPolicyJSON>('/v1/notifications/policy', {
+    data: policy,
+  });

From 2c7eed1fa1e7af72dd03a041a60f2cfd42e913e0 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 25 Jun 2024 18:53:03 +0200
Subject: [PATCH 1397/2191] Fix API requests after #30818 (#30837)

---
 app/javascript/mastodon/api/accounts.ts              | 4 +---
 app/javascript/mastodon/api/interactions.ts          | 4 +---
 app/javascript/mastodon/api/notification_policies.ts | 5 +----
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/app/javascript/mastodon/api/accounts.ts b/app/javascript/mastodon/api/accounts.ts
index e586087854d174..bd1757e827e42a 100644
--- a/app/javascript/mastodon/api/accounts.ts
+++ b/app/javascript/mastodon/api/accounts.ts
@@ -3,7 +3,5 @@ import type { ApiRelationshipJSON } from 'mastodon/api_types/relationships';
 
 export const apiSubmitAccountNote = (id: string, value: string) =>
   apiRequestPost<ApiRelationshipJSON>(`v1/accounts/${id}/note`, {
-    data: {
-      comment: value,
-    },
+    comment: value,
   });
diff --git a/app/javascript/mastodon/api/interactions.ts b/app/javascript/mastodon/api/interactions.ts
index 0bdaffbda19e87..118b5f06d205cd 100644
--- a/app/javascript/mastodon/api/interactions.ts
+++ b/app/javascript/mastodon/api/interactions.ts
@@ -3,9 +3,7 @@ import type { Status, StatusVisibility } from 'mastodon/models/status';
 
 export const apiReblog = (statusId: string, visibility: StatusVisibility) =>
   apiRequestPost<{ reblog: Status }>(`v1/statuses/${statusId}/reblog`, {
-    data: {
-      visibility,
-    },
+    visibility,
   });
 
 export const apiUnreblog = (statusId: string) =>
diff --git a/app/javascript/mastodon/api/notification_policies.ts b/app/javascript/mastodon/api/notification_policies.ts
index 5c1ef9c1dd699b..4032134fb584f9 100644
--- a/app/javascript/mastodon/api/notification_policies.ts
+++ b/app/javascript/mastodon/api/notification_policies.ts
@@ -6,7 +6,4 @@ export const apiGetNotificationPolicy = () =>
 
 export const apiUpdateNotificationsPolicy = (
   policy: Partial<NotificationPolicyJSON>,
-) =>
-  apiRequestPut<NotificationPolicyJSON>('/v1/notifications/policy', {
-    data: policy,
-  });
+) => apiRequestPut<NotificationPolicyJSON>('/v1/notifications/policy', policy);

From 7d89d1f1866f5e35e04b48d268f0397731794e83 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 25 Jun 2024 18:53:03 +0200
Subject: [PATCH 1398/2191] [Glitch] Fix API requests after #30818

Port 2c7eed1fa1e7af72dd03a041a60f2cfd42e913e0 to glitch-soc
---
 app/javascript/flavours/glitch/api/accounts.ts              | 4 +---
 app/javascript/flavours/glitch/api/interactions.ts          | 4 +---
 app/javascript/flavours/glitch/api/notification_policies.ts | 5 +----
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/app/javascript/flavours/glitch/api/accounts.ts b/app/javascript/flavours/glitch/api/accounts.ts
index f2c9c43319bc24..410f3d20e359de 100644
--- a/app/javascript/flavours/glitch/api/accounts.ts
+++ b/app/javascript/flavours/glitch/api/accounts.ts
@@ -3,7 +3,5 @@ import type { ApiRelationshipJSON } from 'flavours/glitch/api_types/relationship
 
 export const apiSubmitAccountNote = (id: string, value: string) =>
   apiRequestPost<ApiRelationshipJSON>(`v1/accounts/${id}/note`, {
-    data: {
-      comment: value,
-    },
+    comment: value,
   });
diff --git a/app/javascript/flavours/glitch/api/interactions.ts b/app/javascript/flavours/glitch/api/interactions.ts
index 1fb6fd50ddf3f9..172f97a25634b0 100644
--- a/app/javascript/flavours/glitch/api/interactions.ts
+++ b/app/javascript/flavours/glitch/api/interactions.ts
@@ -3,9 +3,7 @@ import type { Status, StatusVisibility } from 'flavours/glitch/models/status';
 
 export const apiReblog = (statusId: string, visibility: StatusVisibility) =>
   apiRequestPost<{ reblog: Status }>(`v1/statuses/${statusId}/reblog`, {
-    data: {
-      visibility,
-    },
+    visibility,
   });
 
 export const apiUnreblog = (statusId: string) =>
diff --git a/app/javascript/flavours/glitch/api/notification_policies.ts b/app/javascript/flavours/glitch/api/notification_policies.ts
index 8ff1967b9f5598..e52ea64f4142d8 100644
--- a/app/javascript/flavours/glitch/api/notification_policies.ts
+++ b/app/javascript/flavours/glitch/api/notification_policies.ts
@@ -6,7 +6,4 @@ export const apiGetNotificationPolicy = () =>
 
 export const apiUpdateNotificationsPolicy = (
   policy: Partial<NotificationPolicyJSON>,
-) =>
-  apiRequestPut<NotificationPolicyJSON>('/v1/notifications/policy', {
-    data: policy,
-  });
+) => apiRequestPut<NotificationPolicyJSON>('/v1/notifications/policy', policy);

From 07d222665b9974a97c78d2a500a55555ebedd640 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 25 Jun 2024 17:25:11 +0000
Subject: [PATCH 1399/2191] chore(deps): update dependency typescript to v5.5.2
 (#30815)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index b6117d821e65b3..dc73fb93b0a2ca 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -17151,22 +17151,22 @@ __metadata:
   linkType: hard
 
 "typescript@npm:5, typescript@npm:^5.0.4":
-  version: 5.4.5
-  resolution: "typescript@npm:5.4.5"
+  version: 5.5.2
+  resolution: "typescript@npm:5.5.2"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
-  checksum: 10c0/2954022ada340fd3d6a9e2b8e534f65d57c92d5f3989a263754a78aba549f7e6529acc1921913560a4b816c46dce7df4a4d29f9f11a3dc0d4213bb76d043251e
+  checksum: 10c0/8ca39b27b5f9bd7f32db795045933ab5247897660627251e8254180b792a395bf061ea7231947d5d7ffa5cb4cc771970fd4ef543275f9b559f08c9325cccfce3
   languageName: node
   linkType: hard
 
 "typescript@patch:typescript@npm%3A5#optional!builtin<compat/typescript>, typescript@patch:typescript@npm%3A^5.0.4#optional!builtin<compat/typescript>":
-  version: 5.4.5
-  resolution: "typescript@patch:typescript@npm%3A5.4.5#optional!builtin<compat/typescript>::version=5.4.5&hash=5adc0c"
+  version: 5.5.2
+  resolution: "typescript@patch:typescript@npm%3A5.5.2#optional!builtin<compat/typescript>::version=5.5.2&hash=379a07"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
-  checksum: 10c0/db2ad2a16ca829f50427eeb1da155e7a45e598eec7b086d8b4e8ba44e5a235f758e606d681c66992230d3fc3b8995865e5fd0b22a2c95486d0b3200f83072ec9
+  checksum: 10c0/a7b7ede75dc7fc32a76d0d0af6b91f5fbd8620890d84c906f663d8783bf3de6d7bd50f0430b8bb55eac88a38934af847ff709e7156e5138b95ae94cbd5f73e5b
   languageName: node
   linkType: hard
 

From a40831b3636fbca1e6d6b096e3d3cdd66569baf9 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Tue, 25 Jun 2024 22:37:48 +0200
Subject: [PATCH 1400/2191] Fix account search results (#30803)

---
 app/services/account_search_service.rb | 52 ++++++++++----------------
 1 file changed, 20 insertions(+), 32 deletions(-)

diff --git a/app/services/account_search_service.rb b/app/services/account_search_service.rb
index b86c9b9e7ed1c4..dab5f748bfd225 100644
--- a/app/services/account_search_service.rb
+++ b/app/services/account_search_service.rb
@@ -28,9 +28,7 @@ def build
               },
 
               functions: [
-                reputation_score_function,
                 followers_score_function,
-                time_distance_function,
               ],
             },
           },
@@ -81,36 +79,12 @@ def boost_following_query
       }
     end
 
-    # This function deranks accounts that follow more people than follow them
-    def reputation_score_function
-      {
-        script_score: {
-          script: {
-            source: "(Math.max(doc['followers_count'].value, 0) + 0.0) / (Math.max(doc['followers_count'].value, 0) + Math.max(doc['following_count'].value, 0) + 1)",
-          },
-        },
-      }
-    end
-
     # This function promotes accounts that have more followers
     def followers_score_function
       {
         script_score: {
           script: {
-            source: "(Math.max(doc['followers_count'].value, 0) / (Math.max(doc['followers_count'].value, 0) + 1))",
-          },
-        },
-      }
-    end
-
-    # This function deranks accounts that haven't posted in a long time
-    def time_distance_function
-      {
-        gauss: {
-          last_status_at: {
-            scale: '30d',
-            offset: '30d',
-            decay: 0.3,
+            source: "Math.log10((Math.max(doc['followers_count'].value, 0) + 1))",
           },
         },
       }
@@ -126,10 +100,24 @@ class AutocompleteQueryBuilder < QueryBuilder
 
     def core_query
       {
-        multi_match: {
-          query: @query,
-          type: 'bool_prefix',
-          fields: %w(username^2 username.*^2 display_name display_name.*),
+        dis_max: {
+          queries: [
+            {
+              multi_match: {
+                query: @query,
+                type: 'most_fields',
+                fields: %w(username username.*),
+              },
+            },
+
+            {
+              multi_match: {
+                query: @query,
+                type: 'most_fields',
+                fields: %w(display_name display_name.*),
+              },
+            },
+          ],
         },
       }
     end
@@ -142,7 +130,7 @@ def core_query
       {
         multi_match: {
           query: @query,
-          type: 'most_fields',
+          type: 'best_fields',
           fields: %w(username^2 display_name^2 text text.*),
           operator: 'and',
         },

From 8c0ff6498e090a2919e8f8104339796ed2d3d212 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Tue, 25 Jun 2024 23:57:22 +0200
Subject: [PATCH 1401/2191] Change light mode to apply CSS variables to the
 body (#30839)

---
 app/javascript/styles/mastodon-light/variables.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/javascript/styles/mastodon-light/variables.scss b/app/javascript/styles/mastodon-light/variables.scss
index 09a75a834b17db..3cdbd9bf67e340 100644
--- a/app/javascript/styles/mastodon-light/variables.scss
+++ b/app/javascript/styles/mastodon-light/variables.scss
@@ -56,11 +56,11 @@ $account-background-color: $white !default;
 
 $emojis-requiring-inversion: 'chains';
 
-.theme-mastodon-light {
+body {
   --dropdown-border-color: #d9e1e8;
   --dropdown-background-color: #fff;
   --background-border-color: #d9e1e8;
   --background-color: #fff;
-  --background-color-tint: rgba(255, 255, 255, 90%);
+  --background-color-tint: rgba(255, 255, 255, 80%);
   --background-filter: blur(10px);
 }

From 2b43c05a6a1c38a7480119a0bd12fefa8b5589c6 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 26 Jun 2024 15:42:25 +0200
Subject: [PATCH 1402/2191] chore(deps): update dependency aws-sdk-s3 to
 v1.154.0 (#30838)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 5d735eb753c29e..e8b54ed5685a36 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -101,16 +101,16 @@ GEM
     awrence (1.2.1)
     aws-eventstream (1.3.0)
     aws-partitions (1.947.0)
-    aws-sdk-core (3.198.0)
+    aws-sdk-core (3.199.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.8)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.86.0)
-      aws-sdk-core (~> 3, >= 3.198.0)
+    aws-sdk-kms (1.87.0)
+      aws-sdk-core (~> 3, >= 3.199.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.153.0)
-      aws-sdk-core (~> 3, >= 3.198.0)
+    aws-sdk-s3 (1.154.0)
+      aws-sdk-core (~> 3, >= 3.199.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.8)
     aws-sigv4 (1.8.0)

From 7a84b76bb1716b131c35d9569bfcef3b32d73e60 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 26 Jun 2024 15:44:08 +0200
Subject: [PATCH 1403/2191] Drop favicon.ico generation (#30375)

---
 app/models/site_upload.rb               |  11 ++---------
 app/views/layouts/application.html.haml |   2 --
 config/imagemagick/policy.xml           |   2 +-
 lib/tasks/branding.rake                 |   3 ---
 public/favicon.ico                      | Bin 15086 -> 0 bytes
 spec/requests/account_show_page_spec.rb |   2 +-
 6 files changed, 4 insertions(+), 16 deletions(-)
 delete mode 100644 public/favicon.ico

diff --git a/app/models/site_upload.rb b/app/models/site_upload.rb
index 6431d1007d1434..273dd6de9fd22a 100644
--- a/app/models/site_upload.rb
+++ b/app/models/site_upload.rb
@@ -31,17 +31,10 @@ class SiteUpload < ApplicationRecord
         [:"#{size}", { format: 'png', geometry: "#{size}x#{size}#", file_geometry_parser: FastGeometryParser }]
       end.freeze,
 
-    favicon: {
-      ico: {
-        format: 'ico',
-        geometry: '48x48#',
-        file_geometry_parser: FastGeometryParser,
-      }.freeze,
-    }.merge(
+    favicon:
       FAVICON_SIZES.to_h do |size|
         [:"#{size}", { format: 'png', geometry: "#{size}x#{size}#", file_geometry_parser: FastGeometryParser }]
-      end
-    ).freeze,
+      end.freeze,
 
     thumbnail: {
       '@1x': {
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index e7f1a595e53ca6..0c0512e812f4f3 100755
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -11,8 +11,6 @@
     - if storage_host?
       %link{ rel: 'dns-prefetch', href: storage_host }/
 
-    %link{ rel: 'icon', href: favicon_path('ico') || '/favicon.ico', type: 'image/x-icon' }/
-
     - SiteUpload::FAVICON_SIZES.each do |size|
       %link{ rel: 'icon', sizes: "#{size}x#{size}", href: favicon_path(size.to_i) || frontend_asset_path("icons/favicon-#{size}x#{size}.png"), type: 'image/png' }/
 
diff --git a/config/imagemagick/policy.xml b/config/imagemagick/policy.xml
index 2730a9f84e3d46..e2aa202f274433 100644
--- a/config/imagemagick/policy.xml
+++ b/config/imagemagick/policy.xml
@@ -23,5 +23,5 @@
   <!-- Disallow any coder by default, and only enable ones required by Mastodon -->
   <policy domain="coder" rights="none" pattern="*" />
   <policy domain="coder" rights="read | write" pattern="{JPEG,PNG,GIF,WEBP,HEIC,AVIF}" />
-  <policy domain="coder" rights="write" pattern="{HISTOGRAM,RGB,INFO,ICO}" />
+  <policy domain="coder" rights="write" pattern="{HISTOGRAM,RGB,INFO}" />
 </policymap>
diff --git a/lib/tasks/branding.rake b/lib/tasks/branding.rake
index 608fb3af9c4188..be72454ce29eea 100644
--- a/lib/tasks/branding.rake
+++ b/lib/tasks/branding.rake
@@ -42,7 +42,6 @@ namespace :branding do
     output_dest     = Rails.root.join('app', 'javascript', 'icons')
 
     rsvg_convert = Terrapin::CommandLine.new('rsvg-convert', '-w :size -h :size --keep-aspect-ratio :input -o :output')
-    convert = Terrapin::CommandLine.new('convert', ':input :output', environment: { 'MAGICK_CONFIGURE_PATH' => nil })
 
     favicon_sizes      = [16, 32, 48]
     apple_icon_sizes   = [57, 60, 72, 76, 114, 120, 144, 152, 167, 180, 1024]
@@ -56,8 +55,6 @@ namespace :branding do
       rsvg_convert.run(size: size, input: favicon_source, output: output_path)
     end
 
-    convert.run(input: favicons, output: Rails.public_path.join('favicon.ico'))
-
     apple_icon_sizes.each do |size|
       rsvg_convert.run(size: size, input: app_icon_source, output: output_dest.join("apple-touch-icon-#{size}x#{size}.png"))
     end
diff --git a/public/favicon.ico b/public/favicon.ico
deleted file mode 100644
index b09a98bb9b0649cb67305b6663bd56b3cfb17222..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 15086
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
J&YPUie*xt08p;3w

diff --git a/spec/requests/account_show_page_spec.rb b/spec/requests/account_show_page_spec.rb
index 81e965e6e6c7fe..830d7786081fc2 100644
--- a/spec/requests/account_show_page_spec.rb
+++ b/spec/requests/account_show_page_spec.rb
@@ -9,7 +9,7 @@
 
     get '/@alice'
 
-    expect(head_link_icons.size).to eq(4) # One general favicon and three with sizes
+    expect(head_link_icons.size).to eq(3) # Three favicons with sizes
 
     expect(head_meta_content('og:title')).to match alice.display_name
     expect(head_meta_content('og:type')).to eq 'profile'

From 528a7f57fa8a31d1a901c247cc55b214e2dc1af5 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 26 Jun 2024 09:51:11 -0400
Subject: [PATCH 1404/2191] Fix `Rails/ReversibleMigration` cop for
 `change_column` (#30835)

---
 db/migrate/20160223164502_make_uris_nullable_in_statuses.rb | 6 +++++-
 ...170322143850_change_primary_key_to_bigint_on_statuses.rb | 6 +++++-
 .../20170609145826_remove_default_language_from_statuses.rb | 6 +++++-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/db/migrate/20160223164502_make_uris_nullable_in_statuses.rb b/db/migrate/20160223164502_make_uris_nullable_in_statuses.rb
index fff07093c8ea08..ebb572bd60db99 100644
--- a/db/migrate/20160223164502_make_uris_nullable_in_statuses.rb
+++ b/db/migrate/20160223164502_make_uris_nullable_in_statuses.rb
@@ -1,7 +1,11 @@
 # frozen_string_literal: true
 
 class MakeUrisNullableInStatuses < ActiveRecord::Migration[4.2]
-  def change
+  def up
     change_column :statuses, :uri, :string, null: true, default: nil
   end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
 end
diff --git a/db/migrate/20170322143850_change_primary_key_to_bigint_on_statuses.rb b/db/migrate/20170322143850_change_primary_key_to_bigint_on_statuses.rb
index b98fffab836955..e7fcb75a44a153 100644
--- a/db/migrate/20170322143850_change_primary_key_to_bigint_on_statuses.rb
+++ b/db/migrate/20170322143850_change_primary_key_to_bigint_on_statuses.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class ChangePrimaryKeyToBigintOnStatuses < ActiveRecord::Migration[5.0]
-  def change
+  def up
     change_table(:statuses, bulk: true) do |t|
       t.change :id, :bigint
       t.change :reblog_of_id, :bigint
@@ -16,4 +16,8 @@ def change
     change_column :statuses_tags, :status_id, :bigint
     change_column :stream_entries, :activity_id, :bigint
   end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
 end
diff --git a/db/migrate/20170609145826_remove_default_language_from_statuses.rb b/db/migrate/20170609145826_remove_default_language_from_statuses.rb
index 28b4172a8c0a19..122c3222878452 100644
--- a/db/migrate/20170609145826_remove_default_language_from_statuses.rb
+++ b/db/migrate/20170609145826_remove_default_language_from_statuses.rb
@@ -1,7 +1,11 @@
 # frozen_string_literal: true
 
 class RemoveDefaultLanguageFromStatuses < ActiveRecord::Migration[5.1]
-  def change
+  def up
     change_column :statuses, :language, :string, default: nil, null: true
   end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
 end

From 51f581e03e1b2611eceddf5010ef736680e1f62b Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 26 Jun 2024 09:51:44 -0400
Subject: [PATCH 1405/2191] Fix `Rails/ReversibleMigration` cop for `remove`
 (#30833)

---
 db/migrate/20170520145338_change_language_filter_to_opt_out.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/migrate/20170520145338_change_language_filter_to_opt_out.rb b/db/migrate/20170520145338_change_language_filter_to_opt_out.rb
index f0a95819c33fdc..0e91c4680370e2 100644
--- a/db/migrate/20170520145338_change_language_filter_to_opt_out.rb
+++ b/db/migrate/20170520145338_change_language_filter_to_opt_out.rb
@@ -5,7 +5,7 @@ def change
     remove_index :users, :allowed_languages
 
     change_table(:users, bulk: true) do |t|
-      t.remove :allowed_languages
+      t.remove :allowed_languages, type: :string, array: true, default: [], null: false
       t.column :filtered_languages, :string, array: true, default: [], null: false
     end
 

From 863c470a2bc4e13a5b8df4d66a1322f4b84e2db2 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Wed, 26 Jun 2024 20:04:50 +0200
Subject: [PATCH 1406/2191] Convert `<Directory>` to Typescript / function
 component (#30829)

---
 app/javascript/mastodon/actions/directory.js  |  62 ----
 app/javascript/mastodon/actions/directory.ts  |  37 +++
 app/javascript/mastodon/api/directory.ts      |  15 +
 .../directory/components/account_card.jsx     | 234 ---------------
 .../directory/components/account_card.tsx     | 269 ++++++++++++++++++
 .../mastodon/features/directory/index.jsx     | 181 ------------
 .../mastodon/features/directory/index.tsx     | 217 ++++++++++++++
 .../mastodon/reducers/user_lists.js           |  32 +--
 8 files changed, 553 insertions(+), 494 deletions(-)
 delete mode 100644 app/javascript/mastodon/actions/directory.js
 create mode 100644 app/javascript/mastodon/actions/directory.ts
 create mode 100644 app/javascript/mastodon/api/directory.ts
 delete mode 100644 app/javascript/mastodon/features/directory/components/account_card.jsx
 create mode 100644 app/javascript/mastodon/features/directory/components/account_card.tsx
 delete mode 100644 app/javascript/mastodon/features/directory/index.jsx
 create mode 100644 app/javascript/mastodon/features/directory/index.tsx

diff --git a/app/javascript/mastodon/actions/directory.js b/app/javascript/mastodon/actions/directory.js
deleted file mode 100644
index 7a0748029d97c1..00000000000000
--- a/app/javascript/mastodon/actions/directory.js
+++ /dev/null
@@ -1,62 +0,0 @@
-import api from '../api';
-
-import { fetchRelationships } from './accounts';
-import { importFetchedAccounts } from './importer';
-
-export const DIRECTORY_FETCH_REQUEST = 'DIRECTORY_FETCH_REQUEST';
-export const DIRECTORY_FETCH_SUCCESS = 'DIRECTORY_FETCH_SUCCESS';
-export const DIRECTORY_FETCH_FAIL    = 'DIRECTORY_FETCH_FAIL';
-
-export const DIRECTORY_EXPAND_REQUEST = 'DIRECTORY_EXPAND_REQUEST';
-export const DIRECTORY_EXPAND_SUCCESS = 'DIRECTORY_EXPAND_SUCCESS';
-export const DIRECTORY_EXPAND_FAIL    = 'DIRECTORY_EXPAND_FAIL';
-
-export const fetchDirectory = params => (dispatch) => {
-  dispatch(fetchDirectoryRequest());
-
-  api().get('/api/v1/directory', { params: { ...params, limit: 20 } }).then(({ data }) => {
-    dispatch(importFetchedAccounts(data));
-    dispatch(fetchDirectorySuccess(data));
-    dispatch(fetchRelationships(data.map(x => x.id)));
-  }).catch(error => dispatch(fetchDirectoryFail(error)));
-};
-
-export const fetchDirectoryRequest = () => ({
-  type: DIRECTORY_FETCH_REQUEST,
-});
-
-export const fetchDirectorySuccess = accounts => ({
-  type: DIRECTORY_FETCH_SUCCESS,
-  accounts,
-});
-
-export const fetchDirectoryFail = error => ({
-  type: DIRECTORY_FETCH_FAIL,
-  error,
-});
-
-export const expandDirectory = params => (dispatch, getState) => {
-  dispatch(expandDirectoryRequest());
-
-  const loadedItems = getState().getIn(['user_lists', 'directory', 'items']).size;
-
-  api().get('/api/v1/directory', { params: { ...params, offset: loadedItems, limit: 20 } }).then(({ data }) => {
-    dispatch(importFetchedAccounts(data));
-    dispatch(expandDirectorySuccess(data));
-    dispatch(fetchRelationships(data.map(x => x.id)));
-  }).catch(error => dispatch(expandDirectoryFail(error)));
-};
-
-export const expandDirectoryRequest = () => ({
-  type: DIRECTORY_EXPAND_REQUEST,
-});
-
-export const expandDirectorySuccess = accounts => ({
-  type: DIRECTORY_EXPAND_SUCCESS,
-  accounts,
-});
-
-export const expandDirectoryFail = error => ({
-  type: DIRECTORY_EXPAND_FAIL,
-  error,
-});
diff --git a/app/javascript/mastodon/actions/directory.ts b/app/javascript/mastodon/actions/directory.ts
new file mode 100644
index 00000000000000..34ac309c66c4c6
--- /dev/null
+++ b/app/javascript/mastodon/actions/directory.ts
@@ -0,0 +1,37 @@
+import type { List as ImmutableList } from 'immutable';
+
+import { apiGetDirectory } from 'mastodon/api/directory';
+import { createDataLoadingThunk } from 'mastodon/store/typed_functions';
+
+import { fetchRelationships } from './accounts';
+import { importFetchedAccounts } from './importer';
+
+export const fetchDirectory = createDataLoadingThunk(
+  'directory/fetch',
+  async (params: Parameters<typeof apiGetDirectory>[0]) =>
+    apiGetDirectory(params),
+  (data, { dispatch }) => {
+    dispatch(importFetchedAccounts(data));
+    dispatch(fetchRelationships(data.map((x) => x.id)));
+
+    return { accounts: data };
+  },
+);
+
+export const expandDirectory = createDataLoadingThunk(
+  'directory/expand',
+  async (params: Parameters<typeof apiGetDirectory>[0], { getState }) => {
+    const loadedItems = getState().user_lists.getIn([
+      'directory',
+      'items',
+    ]) as ImmutableList<unknown>;
+
+    return apiGetDirectory({ ...params, offset: loadedItems.size }, 20);
+  },
+  (data, { dispatch }) => {
+    dispatch(importFetchedAccounts(data));
+    dispatch(fetchRelationships(data.map((x) => x.id)));
+
+    return { accounts: data };
+  },
+);
diff --git a/app/javascript/mastodon/api/directory.ts b/app/javascript/mastodon/api/directory.ts
new file mode 100644
index 00000000000000..cd39f8f26900ed
--- /dev/null
+++ b/app/javascript/mastodon/api/directory.ts
@@ -0,0 +1,15 @@
+import { apiRequestGet } from 'mastodon/api';
+import type { ApiAccountJSON } from 'mastodon/api_types/accounts';
+
+export const apiGetDirectory = (
+  params: {
+    order: string;
+    local: boolean;
+    offset?: number;
+  },
+  limit = 20,
+) =>
+  apiRequestGet<ApiAccountJSON[]>('v1/directory', {
+    ...params,
+    limit,
+  });
diff --git a/app/javascript/mastodon/features/directory/components/account_card.jsx b/app/javascript/mastodon/features/directory/components/account_card.jsx
deleted file mode 100644
index 9c5e688120f3e1..00000000000000
--- a/app/javascript/mastodon/features/directory/components/account_card.jsx
+++ /dev/null
@@ -1,234 +0,0 @@
-import PropTypes from 'prop-types';
-
-import { FormattedMessage, injectIntl, defineMessages } from 'react-intl';
-
-import classNames from 'classnames';
-import { Link } from 'react-router-dom';
-
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import ImmutablePureComponent from 'react-immutable-pure-component';
-import { connect } from 'react-redux';
-
-import {
-  followAccount,
-  unfollowAccount,
-  unblockAccount,
-  unmuteAccount,
-} from 'mastodon/actions/accounts';
-import { openModal } from 'mastodon/actions/modal';
-import { Avatar } from 'mastodon/components/avatar';
-import { Button } from 'mastodon/components/button';
-import { DisplayName } from 'mastodon/components/display_name';
-import { ShortNumber } from 'mastodon/components/short_number';
-import { autoPlayGif, me } from 'mastodon/initial_state';
-import { makeGetAccount } from 'mastodon/selectors';
-
-const messages = defineMessages({
-  unfollow: { id: 'account.unfollow', defaultMessage: 'Unfollow' },
-  follow: { id: 'account.follow', defaultMessage: 'Follow' },
-  cancel_follow_request: { id: 'account.cancel_follow_request', defaultMessage: 'Withdraw follow request' },
-  cancelFollowRequestConfirm: { id: 'confirmations.cancel_follow_request.confirm', defaultMessage: 'Withdraw request' },
-  requested: { id: 'account.requested', defaultMessage: 'Awaiting approval. Click to cancel follow request' },
-  unblock: { id: 'account.unblock_short', defaultMessage: 'Unblock' },
-  unmute: { id: 'account.unmute_short', defaultMessage: 'Unmute' },
-  unfollowConfirm: { id: 'confirmations.unfollow.confirm', defaultMessage: 'Unfollow' },
-  edit_profile: { id: 'account.edit_profile', defaultMessage: 'Edit profile' },
-});
-
-const makeMapStateToProps = () => {
-  const getAccount = makeGetAccount();
-
-  const mapStateToProps = (state, { id }) => ({
-    account: getAccount(state, id),
-  });
-
-  return mapStateToProps;
-};
-
-const mapDispatchToProps = (dispatch, { intl }) => ({
-  onFollow(account) {
-    if (account.getIn(['relationship', 'following'])) {
-      dispatch(
-        openModal({
-          modalType: 'CONFIRM',
-          modalProps: {
-            message: (
-              <FormattedMessage
-                id='confirmations.unfollow.message'
-                defaultMessage='Are you sure you want to unfollow {name}?'
-                values={{ name: <strong>@{account.get('acct')}</strong> }}
-              />
-            ),
-            confirm: intl.formatMessage(messages.unfollowConfirm),
-            onConfirm: () => dispatch(unfollowAccount(account.get('id'))),
-          } }),
-      );
-    } else if (account.getIn(['relationship', 'requested'])) {
-      dispatch(openModal({
-        modalType: 'CONFIRM',
-        modalProps: {
-          message: <FormattedMessage id='confirmations.cancel_follow_request.message' defaultMessage='Are you sure you want to withdraw your request to follow {name}?' values={{ name: <strong>@{account.get('acct')}</strong> }} />,
-          confirm: intl.formatMessage(messages.cancelFollowRequestConfirm),
-          onConfirm: () => dispatch(unfollowAccount(account.get('id'))),
-        },
-      }));
-    } else {
-      dispatch(followAccount(account.get('id')));
-    }
-  },
-
-  onBlock(account) {
-    if (account.getIn(['relationship', 'blocking'])) {
-      dispatch(unblockAccount(account.get('id')));
-    }
-  },
-
-  onMute(account) {
-    if (account.getIn(['relationship', 'muting'])) {
-      dispatch(unmuteAccount(account.get('id')));
-    }
-  },
-
-});
-
-class AccountCard extends ImmutablePureComponent {
-
-  static propTypes = {
-    account: ImmutablePropTypes.record.isRequired,
-    intl: PropTypes.object.isRequired,
-    onFollow: PropTypes.func.isRequired,
-    onBlock: PropTypes.func.isRequired,
-    onMute: PropTypes.func.isRequired,
-  };
-
-  handleMouseEnter = ({ currentTarget }) => {
-    if (autoPlayGif) {
-      return;
-    }
-
-    const emojis = currentTarget.querySelectorAll('.custom-emoji');
-
-    for (var i = 0; i < emojis.length; i++) {
-      let emoji = emojis[i];
-      emoji.src = emoji.getAttribute('data-original');
-    }
-  };
-
-  handleMouseLeave = ({ currentTarget }) => {
-    if (autoPlayGif) {
-      return;
-    }
-
-    const emojis = currentTarget.querySelectorAll('.custom-emoji');
-
-    for (var i = 0; i < emojis.length; i++) {
-      let emoji = emojis[i];
-      emoji.src = emoji.getAttribute('data-static');
-    }
-  };
-
-  handleFollow = () => {
-    this.props.onFollow(this.props.account);
-  };
-
-  handleBlock = () => {
-    this.props.onBlock(this.props.account);
-  };
-
-  handleMute = () => {
-    this.props.onMute(this.props.account);
-  };
-
-  handleEditProfile = () => {
-    window.open('/settings/profile', '_blank');
-  };
-
-  render() {
-    const { account, intl } = this.props;
-
-    let actionBtn;
-
-    if (me !== account.get('id')) {
-      if (!account.get('relationship')) { // Wait until the relationship is loaded
-        actionBtn = '';
-      } else if (account.getIn(['relationship', 'requested'])) {
-        actionBtn = <Button  text={intl.formatMessage(messages.cancel_follow_request)} title={intl.formatMessage(messages.requested)} onClick={this.handleFollow} />;
-      } else if (account.getIn(['relationship', 'muting'])) {
-        actionBtn = <Button  text={intl.formatMessage(messages.unmute)} onClick={this.handleMute} />;
-      } else if (!account.getIn(['relationship', 'blocking'])) {
-        actionBtn = <Button disabled={account.getIn(['relationship', 'blocked_by'])} className={classNames({ 'button--destructive': account.getIn(['relationship', 'following']) })} text={intl.formatMessage(account.getIn(['relationship', 'following']) ? messages.unfollow : messages.follow)} onClick={this.handleFollow} />;
-      } else if (account.getIn(['relationship', 'blocking'])) {
-        actionBtn = <Button  text={intl.formatMessage(messages.unblock)} onClick={this.handleBlock} />;
-      }
-    } else {
-      actionBtn = <Button  text={intl.formatMessage(messages.edit_profile)} onClick={this.handleEditProfile} />;
-    }
-
-    return (
-      <div className='account-card'>
-        <Link to={`/@${account.get('acct')}`} className='account-card__permalink'>
-          <div className='account-card__header'>
-            <img
-              src={
-                autoPlayGif ? account.get('header') : account.get('header_static')
-              }
-              alt=''
-            />
-          </div>
-
-          <div className='account-card__title'>
-            <div className='account-card__title__avatar'><Avatar account={account} size={56} /></div>
-            <DisplayName account={account} />
-          </div>
-        </Link>
-
-        {account.get('note').length > 0 && (
-          <div
-            className='account-card__bio translate'
-            onMouseEnter={this.handleMouseEnter}
-            onMouseLeave={this.handleMouseLeave}
-            dangerouslySetInnerHTML={{ __html: account.get('note_emojified') }}
-          />
-        )}
-
-        <div className='account-card__actions'>
-          <div className='account-card__counters'>
-            <div className='account-card__counters__item'>
-              <ShortNumber value={account.get('statuses_count')} />
-              <small>
-                <FormattedMessage id='account.posts' defaultMessage='Posts' />
-              </small>
-            </div>
-
-            <div className='account-card__counters__item'>
-              <ShortNumber value={account.get('followers_count')} />{' '}
-              <small>
-                <FormattedMessage
-                  id='account.followers'
-                  defaultMessage='Followers'
-                />
-              </small>
-            </div>
-
-            <div className='account-card__counters__item'>
-              <ShortNumber value={account.get('following_count')} />{' '}
-              <small>
-                <FormattedMessage
-                  id='account.following'
-                  defaultMessage='Following'
-                />
-              </small>
-            </div>
-          </div>
-
-          <div className='account-card__actions__button'>
-            {actionBtn}
-          </div>
-        </div>
-      </div>
-    );
-  }
-
-}
-
-export default injectIntl(connect(makeMapStateToProps, mapDispatchToProps)(AccountCard));
diff --git a/app/javascript/mastodon/features/directory/components/account_card.tsx b/app/javascript/mastodon/features/directory/components/account_card.tsx
new file mode 100644
index 00000000000000..7201f6135b440e
--- /dev/null
+++ b/app/javascript/mastodon/features/directory/components/account_card.tsx
@@ -0,0 +1,269 @@
+import type { MouseEventHandler } from 'react';
+import { useCallback } from 'react';
+
+import { FormattedMessage, defineMessages, useIntl } from 'react-intl';
+
+import classNames from 'classnames';
+import { Link } from 'react-router-dom';
+
+import {
+  followAccount,
+  unfollowAccount,
+  unblockAccount,
+  unmuteAccount,
+} from 'mastodon/actions/accounts';
+import { openModal } from 'mastodon/actions/modal';
+import { Avatar } from 'mastodon/components/avatar';
+import { Button } from 'mastodon/components/button';
+import { DisplayName } from 'mastodon/components/display_name';
+import { ShortNumber } from 'mastodon/components/short_number';
+import { autoPlayGif, me } from 'mastodon/initial_state';
+import type { Account } from 'mastodon/models/account';
+import { makeGetAccount } from 'mastodon/selectors';
+import { useAppDispatch, useAppSelector } from 'mastodon/store';
+
+const messages = defineMessages({
+  unfollow: { id: 'account.unfollow', defaultMessage: 'Unfollow' },
+  follow: { id: 'account.follow', defaultMessage: 'Follow' },
+  cancel_follow_request: {
+    id: 'account.cancel_follow_request',
+    defaultMessage: 'Withdraw follow request',
+  },
+  cancelFollowRequestConfirm: {
+    id: 'confirmations.cancel_follow_request.confirm',
+    defaultMessage: 'Withdraw request',
+  },
+  requested: {
+    id: 'account.requested',
+    defaultMessage: 'Awaiting approval. Click to cancel follow request',
+  },
+  unblock: { id: 'account.unblock_short', defaultMessage: 'Unblock' },
+  unmute: { id: 'account.unmute_short', defaultMessage: 'Unmute' },
+  unfollowConfirm: {
+    id: 'confirmations.unfollow.confirm',
+    defaultMessage: 'Unfollow',
+  },
+  edit_profile: { id: 'account.edit_profile', defaultMessage: 'Edit profile' },
+});
+
+const getAccount = makeGetAccount();
+
+export const AccountCard: React.FC<{ accountId: string }> = ({ accountId }) => {
+  const intl = useIntl();
+  const account = useAppSelector((s) => getAccount(s, accountId));
+  const dispatch = useAppDispatch();
+
+  const handleMouseEnter = useCallback<MouseEventHandler>(
+    ({ currentTarget }) => {
+      if (autoPlayGif) {
+        return;
+      }
+      const emojis =
+        currentTarget.querySelectorAll<HTMLImageElement>('.custom-emoji');
+
+      emojis.forEach((emoji) => {
+        const original = emoji.getAttribute('data-original');
+        if (original) emoji.src = original;
+      });
+    },
+    [],
+  );
+
+  const handleMouseLeave = useCallback<MouseEventHandler>(
+    ({ currentTarget }) => {
+      if (autoPlayGif) {
+        return;
+      }
+
+      const emojis =
+        currentTarget.querySelectorAll<HTMLImageElement>('.custom-emoji');
+
+      emojis.forEach((emoji) => {
+        const staticUrl = emoji.getAttribute('data-static');
+        if (staticUrl) emoji.src = staticUrl;
+      });
+    },
+    [],
+  );
+
+  const handleFollow = useCallback(() => {
+    if (!account) return;
+
+    if (account.getIn(['relationship', 'following'])) {
+      dispatch(
+        openModal({
+          modalType: 'CONFIRM',
+          modalProps: {
+            message: (
+              <FormattedMessage
+                id='confirmations.unfollow.message'
+                defaultMessage='Are you sure you want to unfollow {name}?'
+                values={{ name: <strong>@{account.get('acct')}</strong> }}
+              />
+            ),
+            confirm: intl.formatMessage(messages.unfollowConfirm),
+            onConfirm: () => {
+              dispatch(unfollowAccount(account.get('id')));
+            },
+          },
+        }),
+      );
+    } else if (account.getIn(['relationship', 'requested'])) {
+      dispatch(
+        openModal({
+          modalType: 'CONFIRM',
+          modalProps: {
+            message: (
+              <FormattedMessage
+                id='confirmations.cancel_follow_request.message'
+                defaultMessage='Are you sure you want to withdraw your request to follow {name}?'
+                values={{ name: <strong>@{account.get('acct')}</strong> }}
+              />
+            ),
+            confirm: intl.formatMessage(messages.cancelFollowRequestConfirm),
+            onConfirm: () => {
+              dispatch(unfollowAccount(account.get('id')));
+            },
+          },
+        }),
+      );
+    } else {
+      dispatch(followAccount(account.get('id')));
+    }
+  }, [account, dispatch, intl]);
+
+  const handleBlock = useCallback(() => {
+    if (account?.relationship?.blocking) {
+      dispatch(unblockAccount(account.get('id')));
+    }
+  }, [account, dispatch]);
+
+  const handleMute = useCallback(() => {
+    if (account?.relationship?.muting) {
+      dispatch(unmuteAccount(account.get('id')));
+    }
+  }, [account, dispatch]);
+
+  const handleEditProfile = useCallback(() => {
+    window.open('/settings/profile', '_blank');
+  }, []);
+
+  if (!account) return null;
+
+  let actionBtn;
+
+  if (me !== account.get('id')) {
+    if (!account.get('relationship')) {
+      // Wait until the relationship is loaded
+      actionBtn = '';
+    } else if (account.getIn(['relationship', 'requested'])) {
+      actionBtn = (
+        <Button
+          text={intl.formatMessage(messages.cancel_follow_request)}
+          title={intl.formatMessage(messages.requested)}
+          onClick={handleFollow}
+        />
+      );
+    } else if (account.getIn(['relationship', 'muting'])) {
+      actionBtn = (
+        <Button
+          text={intl.formatMessage(messages.unmute)}
+          onClick={handleMute}
+        />
+      );
+    } else if (!account.getIn(['relationship', 'blocking'])) {
+      actionBtn = (
+        <Button
+          disabled={account.relationship?.blocked_by}
+          className={classNames({
+            'button--destructive': account.getIn(['relationship', 'following']),
+          })}
+          text={intl.formatMessage(
+            account.getIn(['relationship', 'following'])
+              ? messages.unfollow
+              : messages.follow,
+          )}
+          onClick={handleFollow}
+        />
+      );
+    } else if (account.getIn(['relationship', 'blocking'])) {
+      actionBtn = (
+        <Button
+          text={intl.formatMessage(messages.unblock)}
+          onClick={handleBlock}
+        />
+      );
+    }
+  } else {
+    actionBtn = (
+      <Button
+        text={intl.formatMessage(messages.edit_profile)}
+        onClick={handleEditProfile}
+      />
+    );
+  }
+
+  return (
+    <div className='account-card'>
+      <Link to={`/@${account.get('acct')}`} className='account-card__permalink'>
+        <div className='account-card__header'>
+          <img
+            src={
+              autoPlayGif ? account.get('header') : account.get('header_static')
+            }
+            alt=''
+          />
+        </div>
+
+        <div className='account-card__title'>
+          <div className='account-card__title__avatar'>
+            <Avatar account={account as Account} size={56} />
+          </div>
+          <DisplayName account={account as Account} />
+        </div>
+      </Link>
+
+      {account.get('note').length > 0 && (
+        <div
+          className='account-card__bio translate'
+          onMouseEnter={handleMouseEnter}
+          onMouseLeave={handleMouseLeave}
+          dangerouslySetInnerHTML={{ __html: account.get('note_emojified') }}
+        />
+      )}
+
+      <div className='account-card__actions'>
+        <div className='account-card__counters'>
+          <div className='account-card__counters__item'>
+            <ShortNumber value={account.get('statuses_count')} />
+            <small>
+              <FormattedMessage id='account.posts' defaultMessage='Posts' />
+            </small>
+          </div>
+
+          <div className='account-card__counters__item'>
+            <ShortNumber value={account.get('followers_count')} />{' '}
+            <small>
+              <FormattedMessage
+                id='account.followers'
+                defaultMessage='Followers'
+              />
+            </small>
+          </div>
+
+          <div className='account-card__counters__item'>
+            <ShortNumber value={account.get('following_count')} />{' '}
+            <small>
+              <FormattedMessage
+                id='account.following'
+                defaultMessage='Following'
+              />
+            </small>
+          </div>
+        </div>
+
+        <div className='account-card__actions__button'>{actionBtn}</div>
+      </div>
+    </div>
+  );
+};
diff --git a/app/javascript/mastodon/features/directory/index.jsx b/app/javascript/mastodon/features/directory/index.jsx
deleted file mode 100644
index 0d3408146e2eef..00000000000000
--- a/app/javascript/mastodon/features/directory/index.jsx
+++ /dev/null
@@ -1,181 +0,0 @@
-import PropTypes from 'prop-types';
-import { PureComponent } from 'react';
-
-import { defineMessages, injectIntl } from 'react-intl';
-
-import { Helmet } from 'react-helmet';
-
-import { List as ImmutableList } from 'immutable';
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import { connect } from 'react-redux';
-
-import PeopleIcon from '@/material-icons/400-24px/group.svg?react';
-import { addColumn, removeColumn, moveColumn, changeColumnParams } from 'mastodon/actions/columns';
-import { fetchDirectory, expandDirectory } from 'mastodon/actions/directory';
-import Column from 'mastodon/components/column';
-import ColumnHeader from 'mastodon/components/column_header';
-import { LoadMore } from 'mastodon/components/load_more';
-import { LoadingIndicator } from 'mastodon/components/loading_indicator';
-import { RadioButton } from 'mastodon/components/radio_button';
-import ScrollContainer from 'mastodon/containers/scroll_container';
-
-import AccountCard from './components/account_card';
-
-const messages = defineMessages({
-  title: { id: 'column.directory', defaultMessage: 'Browse profiles' },
-  recentlyActive: { id: 'directory.recently_active', defaultMessage: 'Recently active' },
-  newArrivals: { id: 'directory.new_arrivals', defaultMessage: 'New arrivals' },
-  local: { id: 'directory.local', defaultMessage: 'From {domain} only' },
-  federated: { id: 'directory.federated', defaultMessage: 'From known fediverse' },
-});
-
-const mapStateToProps = state => ({
-  accountIds: state.getIn(['user_lists', 'directory', 'items'], ImmutableList()),
-  isLoading: state.getIn(['user_lists', 'directory', 'isLoading'], true),
-  domain: state.getIn(['meta', 'domain']),
-});
-
-class Directory extends PureComponent {
-
-  static propTypes = {
-    isLoading: PropTypes.bool,
-    accountIds: ImmutablePropTypes.list.isRequired,
-    dispatch: PropTypes.func.isRequired,
-    columnId: PropTypes.string,
-    intl: PropTypes.object.isRequired,
-    multiColumn: PropTypes.bool,
-    domain: PropTypes.string.isRequired,
-    params: PropTypes.shape({
-      order: PropTypes.string,
-      local: PropTypes.bool,
-    }),
-  };
-
-  state = {
-    order: null,
-    local: null,
-  };
-
-  handlePin = () => {
-    const { columnId, dispatch } = this.props;
-
-    if (columnId) {
-      dispatch(removeColumn(columnId));
-    } else {
-      dispatch(addColumn('DIRECTORY', this.getParams(this.props, this.state)));
-    }
-  };
-
-  getParams = (props, state) => ({
-    order: state.order === null ? (props.params.order || 'active') : state.order,
-    local: state.local === null ? (props.params.local || false) : state.local,
-  });
-
-  handleMove = dir => {
-    const { columnId, dispatch } = this.props;
-    dispatch(moveColumn(columnId, dir));
-  };
-
-  handleHeaderClick = () => {
-    this.column.scrollTop();
-  };
-
-  componentDidMount () {
-    const { dispatch } = this.props;
-    dispatch(fetchDirectory(this.getParams(this.props, this.state)));
-  }
-
-  componentDidUpdate (prevProps, prevState) {
-    const { dispatch } = this.props;
-    const paramsOld = this.getParams(prevProps, prevState);
-    const paramsNew = this.getParams(this.props, this.state);
-
-    if (paramsOld.order !== paramsNew.order || paramsOld.local !== paramsNew.local) {
-      dispatch(fetchDirectory(paramsNew));
-    }
-  }
-
-  setRef = c => {
-    this.column = c;
-  };
-
-  handleChangeOrder = e => {
-    const { dispatch, columnId } = this.props;
-
-    if (columnId) {
-      dispatch(changeColumnParams(columnId, ['order'], e.target.value));
-    } else {
-      this.setState({ order: e.target.value });
-    }
-  };
-
-  handleChangeLocal = e => {
-    const { dispatch, columnId } = this.props;
-
-    if (columnId) {
-      dispatch(changeColumnParams(columnId, ['local'], e.target.value === '1'));
-    } else {
-      this.setState({ local: e.target.value === '1' });
-    }
-  };
-
-  handleLoadMore = () => {
-    const { dispatch } = this.props;
-    dispatch(expandDirectory(this.getParams(this.props, this.state)));
-  };
-
-  render () {
-    const { isLoading, accountIds, intl, columnId, multiColumn, domain } = this.props;
-    const { order, local }  = this.getParams(this.props, this.state);
-    const pinned = !!columnId;
-
-    const scrollableArea = (
-      <div className='scrollable'>
-        <div className='filter-form'>
-          <div className='filter-form__column' role='group'>
-            <RadioButton name='order' value='active' label={intl.formatMessage(messages.recentlyActive)} checked={order === 'active'} onChange={this.handleChangeOrder} />
-            <RadioButton name='order' value='new' label={intl.formatMessage(messages.newArrivals)} checked={order === 'new'} onChange={this.handleChangeOrder} />
-          </div>
-
-          <div className='filter-form__column' role='group'>
-            <RadioButton name='local' value='1' label={intl.formatMessage(messages.local, { domain })} checked={local} onChange={this.handleChangeLocal} />
-            <RadioButton name='local' value='0' label={intl.formatMessage(messages.federated)} checked={!local} onChange={this.handleChangeLocal} />
-          </div>
-        </div>
-
-        <div className='directory__list'>
-          {isLoading ? <LoadingIndicator /> : accountIds.map(accountId => (
-            <AccountCard id={accountId} key={accountId} />
-          ))}
-        </div>
-
-        <LoadMore onClick={this.handleLoadMore} visible={!isLoading} />
-      </div>
-    );
-
-    return (
-      <Column bindToDocument={!multiColumn} ref={this.setRef} label={intl.formatMessage(messages.title)}>
-        <ColumnHeader
-          icon='address-book-o'
-          iconComponent={PeopleIcon}
-          title={intl.formatMessage(messages.title)}
-          onPin={this.handlePin}
-          onMove={this.handleMove}
-          onClick={this.handleHeaderClick}
-          pinned={pinned}
-          multiColumn={multiColumn}
-        />
-
-        {multiColumn && !pinned ? <ScrollContainer scrollKey='directory'>{scrollableArea}</ScrollContainer> : scrollableArea}
-
-        <Helmet>
-          <title>{intl.formatMessage(messages.title)}</title>
-          <meta name='robots' content='noindex' />
-        </Helmet>
-      </Column>
-    );
-  }
-
-}
-
-export default connect(mapStateToProps)(injectIntl(Directory));
diff --git a/app/javascript/mastodon/features/directory/index.tsx b/app/javascript/mastodon/features/directory/index.tsx
new file mode 100644
index 00000000000000..482c6858f48a53
--- /dev/null
+++ b/app/javascript/mastodon/features/directory/index.tsx
@@ -0,0 +1,217 @@
+import type { ChangeEventHandler } from 'react';
+import { useCallback, useEffect, useRef, useState } from 'react';
+
+import { defineMessages, useIntl } from 'react-intl';
+
+import { Helmet } from 'react-helmet';
+
+import { List as ImmutableList } from 'immutable';
+
+import PeopleIcon from '@/material-icons/400-24px/group.svg?react';
+import {
+  addColumn,
+  removeColumn,
+  moveColumn,
+  changeColumnParams,
+} from 'mastodon/actions/columns';
+import { fetchDirectory, expandDirectory } from 'mastodon/actions/directory';
+import Column from 'mastodon/components/column';
+import ColumnHeader from 'mastodon/components/column_header';
+import { LoadMore } from 'mastodon/components/load_more';
+import { LoadingIndicator } from 'mastodon/components/loading_indicator';
+import { RadioButton } from 'mastodon/components/radio_button';
+import ScrollContainer from 'mastodon/containers/scroll_container';
+import { useAppDispatch, useAppSelector } from 'mastodon/store';
+
+import { AccountCard } from './components/account_card';
+
+const messages = defineMessages({
+  title: { id: 'column.directory', defaultMessage: 'Browse profiles' },
+  recentlyActive: {
+    id: 'directory.recently_active',
+    defaultMessage: 'Recently active',
+  },
+  newArrivals: { id: 'directory.new_arrivals', defaultMessage: 'New arrivals' },
+  local: { id: 'directory.local', defaultMessage: 'From {domain} only' },
+  federated: {
+    id: 'directory.federated',
+    defaultMessage: 'From known fediverse',
+  },
+});
+
+export const Directory: React.FC<{
+  columnId?: string;
+  multiColumn?: boolean;
+  params?: { order: string; local?: boolean };
+}> = ({ columnId, multiColumn, params }) => {
+  const intl = useIntl();
+  const dispatch = useAppDispatch();
+
+  const [state, setState] = useState<{
+    order: string | null;
+    local: boolean | null;
+  }>({
+    order: null,
+    local: null,
+  });
+
+  const column = useRef<Column>(null);
+
+  const order = state.order ?? params?.order ?? 'active';
+  const local = state.local ?? params?.local ?? false;
+
+  const handlePin = useCallback(() => {
+    if (columnId) {
+      dispatch(removeColumn(columnId));
+    } else {
+      dispatch(addColumn('DIRECTORY', { order, local }));
+    }
+  }, [dispatch, columnId, order, local]);
+
+  const domain = useAppSelector((s) => s.meta.get('domain') as string);
+  const accountIds = useAppSelector(
+    (state) =>
+      state.user_lists.getIn(
+        ['directory', 'items'],
+        ImmutableList(),
+      ) as ImmutableList<string>,
+  );
+  const isLoading = useAppSelector(
+    (state) =>
+      state.user_lists.getIn(['directory', 'isLoading'], true) as boolean,
+  );
+
+  useEffect(() => {
+    void dispatch(fetchDirectory({ order, local }));
+  }, [dispatch, order, local]);
+
+  const handleMove = useCallback(
+    (dir: string) => {
+      dispatch(moveColumn(columnId, dir));
+    },
+    [dispatch, columnId],
+  );
+
+  const handleHeaderClick = useCallback(() => {
+    column.current?.scrollTop();
+  }, []);
+
+  const handleChangeOrder = useCallback<ChangeEventHandler<HTMLInputElement>>(
+    (e) => {
+      if (columnId) {
+        dispatch(changeColumnParams(columnId, ['order'], e.target.value));
+      } else {
+        setState((s) => ({ order: e.target.value, local: s.local }));
+      }
+    },
+    [dispatch, columnId],
+  );
+
+  const handleChangeLocal = useCallback<ChangeEventHandler<HTMLInputElement>>(
+    (e) => {
+      if (columnId) {
+        dispatch(
+          changeColumnParams(columnId, ['local'], e.target.value === '1'),
+        );
+      } else {
+        setState((s) => ({ local: e.target.value === '1', order: s.order }));
+      }
+    },
+    [dispatch, columnId],
+  );
+
+  const handleLoadMore = useCallback(() => {
+    void dispatch(expandDirectory({ order, local }));
+  }, [dispatch, order, local]);
+
+  const pinned = !!columnId;
+
+  const scrollableArea = (
+    <div className='scrollable'>
+      <div className='filter-form'>
+        <div className='filter-form__column' role='group'>
+          <RadioButton
+            name='order'
+            value='active'
+            label={intl.formatMessage(messages.recentlyActive)}
+            checked={order === 'active'}
+            onChange={handleChangeOrder}
+          />
+          <RadioButton
+            name='order'
+            value='new'
+            label={intl.formatMessage(messages.newArrivals)}
+            checked={order === 'new'}
+            onChange={handleChangeOrder}
+          />
+        </div>
+
+        <div className='filter-form__column' role='group'>
+          <RadioButton
+            name='local'
+            value='1'
+            label={intl.formatMessage(messages.local, { domain })}
+            checked={local}
+            onChange={handleChangeLocal}
+          />
+          <RadioButton
+            name='local'
+            value='0'
+            label={intl.formatMessage(messages.federated)}
+            checked={!local}
+            onChange={handleChangeLocal}
+          />
+        </div>
+      </div>
+
+      <div className='directory__list'>
+        {isLoading ? (
+          <LoadingIndicator />
+        ) : (
+          accountIds.map((accountId) => (
+            <AccountCard accountId={accountId} key={accountId} />
+          ))
+        )}
+      </div>
+
+      <LoadMore onClick={handleLoadMore} visible={!isLoading} />
+    </div>
+  );
+
+  return (
+    <Column
+      bindToDocument={!multiColumn}
+      ref={column}
+      label={intl.formatMessage(messages.title)}
+    >
+      <ColumnHeader
+        // @ts-expect-error ColumnHeader is not properly typed yet
+        icon='address-book-o'
+        iconComponent={PeopleIcon}
+        title={intl.formatMessage(messages.title)}
+        onPin={handlePin}
+        onMove={handleMove}
+        onClick={handleHeaderClick}
+        pinned={pinned}
+        multiColumn={multiColumn}
+      />
+
+      {multiColumn && !pinned ? (
+        // @ts-expect-error ScrollContainer is not properly typed yet
+        <ScrollContainer scrollKey='directory'>
+          {scrollableArea}
+        </ScrollContainer>
+      ) : (
+        scrollableArea
+      )}
+
+      <Helmet>
+        <title>{intl.formatMessage(messages.title)}</title>
+        <meta name='robots' content='noindex' />
+      </Helmet>
+    </Column>
+  );
+};
+
+// eslint-disable-next-line import/no-default-export -- Needed because this is called as an async components
+export default Directory;
diff --git a/app/javascript/mastodon/reducers/user_lists.js b/app/javascript/mastodon/reducers/user_lists.js
index 2f17fed5fdb64a..7a4c04c5c7ce7c 100644
--- a/app/javascript/mastodon/reducers/user_lists.js
+++ b/app/javascript/mastodon/reducers/user_lists.js
@@ -1,12 +1,8 @@
 import { Map as ImmutableMap, List as ImmutableList, fromJS } from 'immutable';
 
 import {
-  DIRECTORY_FETCH_REQUEST,
-  DIRECTORY_FETCH_SUCCESS,
-  DIRECTORY_FETCH_FAIL,
-  DIRECTORY_EXPAND_REQUEST,
-  DIRECTORY_EXPAND_SUCCESS,
-  DIRECTORY_EXPAND_FAIL,
+  expandDirectory,
+  fetchDirectory
 } from 'mastodon/actions/directory';
 import {
   FEATURED_TAGS_FETCH_REQUEST,
@@ -117,6 +113,7 @@ const normalizeFeaturedTags = (state, path, featuredTags, accountId) => {
   }));
 };
 
+/** @type {import('@reduxjs/toolkit').Reducer<typeof initialState>} */
 export default function userLists(state = initialState, action) {
   switch(action.type) {
   case FOLLOWERS_FETCH_SUCCESS:
@@ -194,16 +191,6 @@ export default function userLists(state = initialState, action) {
   case MUTES_FETCH_FAIL:
   case MUTES_EXPAND_FAIL:
     return state.setIn(['mutes', 'isLoading'], false);
-  case DIRECTORY_FETCH_SUCCESS:
-    return normalizeList(state, ['directory'], action.accounts, action.next);
-  case DIRECTORY_EXPAND_SUCCESS:
-    return appendToList(state, ['directory'], action.accounts, action.next);
-  case DIRECTORY_FETCH_REQUEST:
-  case DIRECTORY_EXPAND_REQUEST:
-    return state.setIn(['directory', 'isLoading'], true);
-  case DIRECTORY_FETCH_FAIL:
-  case DIRECTORY_EXPAND_FAIL:
-    return state.setIn(['directory', 'isLoading'], false);
   case FEATURED_TAGS_FETCH_SUCCESS:
     return normalizeFeaturedTags(state, ['featured_tags', action.id], action.tags, action.id);
   case FEATURED_TAGS_FETCH_REQUEST:
@@ -211,6 +198,17 @@ export default function userLists(state = initialState, action) {
   case FEATURED_TAGS_FETCH_FAIL:
     return state.setIn(['featured_tags', action.id, 'isLoading'], false);
   default:
-    return state;
+    if(fetchDirectory.fulfilled.match(action))
+      return normalizeList(state, ['directory'], action.payload.accounts, undefined);
+    else if( expandDirectory.fulfilled.match(action))
+      return appendToList(state, ['directory'], action.payload.accounts, undefined);
+    else if(fetchDirectory.pending.match(action) ||
+     expandDirectory.pending.match(action))
+      return state.setIn(['directory', 'isLoading'], true);
+    else if(fetchDirectory.rejected.match(action) ||
+     expandDirectory.rejected.match(action))
+      return state.setIn(['directory', 'isLoading'], false);
+    else
+      return state;
   }
 }

From e89317d4c1da991b728b6d4a21671ed33f057cc4 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 26 Jun 2024 21:33:38 +0200
Subject: [PATCH 1407/2191] Add hover cards in web UI (#30754)

Co-authored-by: Renaud Chaput <renchap@gmail.com>
---
 app/javascript/hooks/useLinks.ts              |  61 ++++++
 app/javascript/hooks/useTimeout.ts            |  29 +++
 .../mastodon/components/account_bio.tsx       |  20 ++
 .../mastodon/components/account_fields.tsx    |  42 +++++
 .../mastodon/components/follow_button.tsx     |  93 +++++++++
 .../components/hover_card_account.tsx         |  74 ++++++++
 .../components/hover_card_controller.tsx      | 117 ++++++++++++
 app/javascript/mastodon/components/status.jsx |   6 +-
 .../mastodon/components/status_content.jsx    |   3 +-
 .../explore/components/author_link.jsx        |   2 +-
 .../features/explore/components/card.jsx      |  17 +-
 .../components/inline_follow_suggestions.jsx  |  15 +-
 .../notifications/components/notification.jsx |   4 +-
 .../status/components/detailed_status.jsx     |   2 +-
 app/javascript/mastodon/features/ui/index.jsx |   2 +
 app/javascript/mastodon/locales/en.json       |   6 +-
 .../styles/mastodon-light/variables.scss      |   2 +
 .../styles/mastodon/components.scss           | 178 +++++++++++++++++-
 18 files changed, 631 insertions(+), 42 deletions(-)
 create mode 100644 app/javascript/hooks/useLinks.ts
 create mode 100644 app/javascript/hooks/useTimeout.ts
 create mode 100644 app/javascript/mastodon/components/account_bio.tsx
 create mode 100644 app/javascript/mastodon/components/account_fields.tsx
 create mode 100644 app/javascript/mastodon/components/follow_button.tsx
 create mode 100644 app/javascript/mastodon/components/hover_card_account.tsx
 create mode 100644 app/javascript/mastodon/components/hover_card_controller.tsx

diff --git a/app/javascript/hooks/useLinks.ts b/app/javascript/hooks/useLinks.ts
new file mode 100644
index 00000000000000..f08b9500da17d1
--- /dev/null
+++ b/app/javascript/hooks/useLinks.ts
@@ -0,0 +1,61 @@
+import { useCallback } from 'react';
+
+import { useHistory } from 'react-router-dom';
+
+import { openURL } from 'mastodon/actions/search';
+import { useAppDispatch } from 'mastodon/store';
+
+const isMentionClick = (element: HTMLAnchorElement) =>
+  element.classList.contains('mention');
+
+const isHashtagClick = (element: HTMLAnchorElement) =>
+  element.textContent?.[0] === '#' ||
+  element.previousSibling?.textContent?.endsWith('#');
+
+export const useLinks = () => {
+  const history = useHistory();
+  const dispatch = useAppDispatch();
+
+  const handleHashtagClick = useCallback(
+    (element: HTMLAnchorElement) => {
+      const { textContent } = element;
+
+      if (!textContent) return;
+
+      history.push(`/tags/${textContent.replace(/^#/, '')}`);
+    },
+    [history],
+  );
+
+  const handleMentionClick = useCallback(
+    (element: HTMLAnchorElement) => {
+      dispatch(
+        openURL(element.href, history, () => {
+          window.location.href = element.href;
+        }),
+      );
+    },
+    [dispatch, history],
+  );
+
+  const handleClick = useCallback(
+    (e: React.MouseEvent) => {
+      const target = (e.target as HTMLElement).closest('a');
+
+      if (!target || e.button !== 0 || e.ctrlKey || e.metaKey) {
+        return;
+      }
+
+      if (isMentionClick(target)) {
+        e.preventDefault();
+        handleMentionClick(target);
+      } else if (isHashtagClick(target)) {
+        e.preventDefault();
+        handleHashtagClick(target);
+      }
+    },
+    [handleMentionClick, handleHashtagClick],
+  );
+
+  return handleClick;
+};
diff --git a/app/javascript/hooks/useTimeout.ts b/app/javascript/hooks/useTimeout.ts
new file mode 100644
index 00000000000000..f1814ae8e3ff57
--- /dev/null
+++ b/app/javascript/hooks/useTimeout.ts
@@ -0,0 +1,29 @@
+import { useRef, useCallback, useEffect } from 'react';
+
+export const useTimeout = () => {
+  const timeoutRef = useRef<ReturnType<typeof setTimeout>>();
+
+  const set = useCallback((callback: () => void, delay: number) => {
+    if (timeoutRef.current) {
+      clearTimeout(timeoutRef.current);
+    }
+
+    timeoutRef.current = setTimeout(callback, delay);
+  }, []);
+
+  const cancel = useCallback(() => {
+    if (timeoutRef.current) {
+      clearTimeout(timeoutRef.current);
+      timeoutRef.current = undefined;
+    }
+  }, []);
+
+  useEffect(
+    () => () => {
+      cancel();
+    },
+    [cancel],
+  );
+
+  return [set, cancel] as const;
+};
diff --git a/app/javascript/mastodon/components/account_bio.tsx b/app/javascript/mastodon/components/account_bio.tsx
new file mode 100644
index 00000000000000..9d523c7402c5ab
--- /dev/null
+++ b/app/javascript/mastodon/components/account_bio.tsx
@@ -0,0 +1,20 @@
+import { useLinks } from 'mastodon/../hooks/useLinks';
+
+export const AccountBio: React.FC<{
+  note: string;
+  className: string;
+}> = ({ note, className }) => {
+  const handleClick = useLinks();
+
+  if (note.length === 0 || note === '<p></p>') {
+    return null;
+  }
+
+  return (
+    <div
+      className={`${className} translate`}
+      dangerouslySetInnerHTML={{ __html: note }}
+      onClickCapture={handleClick}
+    />
+  );
+};
diff --git a/app/javascript/mastodon/components/account_fields.tsx b/app/javascript/mastodon/components/account_fields.tsx
new file mode 100644
index 00000000000000..e297f99e3a1b54
--- /dev/null
+++ b/app/javascript/mastodon/components/account_fields.tsx
@@ -0,0 +1,42 @@
+import classNames from 'classnames';
+
+import CheckIcon from '@/material-icons/400-24px/check.svg?react';
+import { useLinks } from 'mastodon/../hooks/useLinks';
+import { Icon } from 'mastodon/components/icon';
+import type { Account } from 'mastodon/models/account';
+
+export const AccountFields: React.FC<{
+  fields: Account['fields'];
+  limit: number;
+}> = ({ fields, limit = -1 }) => {
+  const handleClick = useLinks();
+
+  if (fields.size === 0) {
+    return null;
+  }
+
+  return (
+    <div className='account-fields' onClickCapture={handleClick}>
+      {fields.take(limit).map((pair, i) => (
+        <dl
+          key={i}
+          className={classNames({ verified: pair.get('verified_at') })}
+        >
+          <dt
+            dangerouslySetInnerHTML={{ __html: pair.get('name_emojified') }}
+            className='translate'
+          />
+
+          <dd className='translate' title={pair.get('value_plain') ?? ''}>
+            {pair.get('verified_at') && (
+              <Icon id='check' icon={CheckIcon} className='verified__mark' />
+            )}
+            <span
+              dangerouslySetInnerHTML={{ __html: pair.get('value_emojified') }}
+            />
+          </dd>
+        </dl>
+      ))}
+    </div>
+  );
+};
diff --git a/app/javascript/mastodon/components/follow_button.tsx b/app/javascript/mastodon/components/follow_button.tsx
new file mode 100644
index 00000000000000..4b4d278317f175
--- /dev/null
+++ b/app/javascript/mastodon/components/follow_button.tsx
@@ -0,0 +1,93 @@
+import { useCallback, useEffect } from 'react';
+
+import { useIntl, defineMessages } from 'react-intl';
+
+import {
+  fetchRelationships,
+  followAccount,
+  unfollowAccount,
+} from 'mastodon/actions/accounts';
+import { Button } from 'mastodon/components/button';
+import { LoadingIndicator } from 'mastodon/components/loading_indicator';
+import { me } from 'mastodon/initial_state';
+import { useAppDispatch, useAppSelector } from 'mastodon/store';
+
+const messages = defineMessages({
+  unfollow: { id: 'account.unfollow', defaultMessage: 'Unfollow' },
+  follow: { id: 'account.follow', defaultMessage: 'Follow' },
+  followBack: { id: 'account.follow_back', defaultMessage: 'Follow back' },
+  mutual: { id: 'account.mutual', defaultMessage: 'Mutual' },
+  cancel_follow_request: {
+    id: 'account.cancel_follow_request',
+    defaultMessage: 'Withdraw follow request',
+  },
+  edit_profile: { id: 'account.edit_profile', defaultMessage: 'Edit profile' },
+});
+
+export const FollowButton: React.FC<{
+  accountId: string;
+}> = ({ accountId }) => {
+  const intl = useIntl();
+  const dispatch = useAppDispatch();
+  const relationship = useAppSelector((state) =>
+    state.relationships.get(accountId),
+  );
+  const following = relationship?.following || relationship?.requested;
+
+  useEffect(() => {
+    dispatch(fetchRelationships([accountId]));
+  }, [dispatch, accountId]);
+
+  const handleClick = useCallback(() => {
+    if (!relationship) return;
+    if (accountId === me) {
+      return;
+    } else if (relationship.following || relationship.requested) {
+      dispatch(unfollowAccount(accountId));
+    } else {
+      dispatch(followAccount(accountId));
+    }
+  }, [dispatch, accountId, relationship]);
+
+  let label;
+
+  if (accountId === me) {
+    label = intl.formatMessage(messages.edit_profile);
+  } else if (!relationship) {
+    label = <LoadingIndicator />;
+  } else if (relationship.requested) {
+    label = intl.formatMessage(messages.cancel_follow_request);
+  } else if (relationship.following && relationship.followed_by) {
+    label = intl.formatMessage(messages.mutual);
+  } else if (!relationship.following && relationship.followed_by) {
+    label = intl.formatMessage(messages.followBack);
+  } else if (relationship.following) {
+    label = intl.formatMessage(messages.unfollow);
+  } else {
+    label = intl.formatMessage(messages.follow);
+  }
+
+  if (accountId === me) {
+    return (
+      <a
+        href='/settings/profile'
+        target='_blank'
+        rel='noreferrer noopener'
+        className='button button-secondary'
+      >
+        {label}
+      </a>
+    );
+  }
+
+  return (
+    <Button
+      onClick={handleClick}
+      disabled={relationship?.blocked_by || relationship?.blocking}
+      secondary={following}
+      className={following ? 'button--destructive' : undefined}
+    >
+      {label}
+    </Button>
+  );
+};
diff --git a/app/javascript/mastodon/components/hover_card_account.tsx b/app/javascript/mastodon/components/hover_card_account.tsx
new file mode 100644
index 00000000000000..59f957783897af
--- /dev/null
+++ b/app/javascript/mastodon/components/hover_card_account.tsx
@@ -0,0 +1,74 @@
+import { useEffect, forwardRef } from 'react';
+
+import classNames from 'classnames';
+import { Link } from 'react-router-dom';
+
+import { fetchAccount } from 'mastodon/actions/accounts';
+import { AccountBio } from 'mastodon/components/account_bio';
+import { AccountFields } from 'mastodon/components/account_fields';
+import { Avatar } from 'mastodon/components/avatar';
+import { FollowersCounter } from 'mastodon/components/counters';
+import { DisplayName } from 'mastodon/components/display_name';
+import { FollowButton } from 'mastodon/components/follow_button';
+import { LoadingIndicator } from 'mastodon/components/loading_indicator';
+import { ShortNumber } from 'mastodon/components/short_number';
+import { domain } from 'mastodon/initial_state';
+import { useAppSelector, useAppDispatch } from 'mastodon/store';
+
+export const HoverCardAccount = forwardRef<
+  HTMLDivElement,
+  { accountId: string }
+>(({ accountId }, ref) => {
+  const dispatch = useAppDispatch();
+
+  const account = useAppSelector((state) =>
+    accountId ? state.accounts.get(accountId) : undefined,
+  );
+
+  useEffect(() => {
+    if (accountId && !account) {
+      dispatch(fetchAccount(accountId));
+    }
+  }, [dispatch, accountId, account]);
+
+  return (
+    <div
+      ref={ref}
+      id='hover-card'
+      role='tooltip'
+      className={classNames('hover-card dropdown-animation', {
+        'hover-card--loading': !account,
+      })}
+    >
+      {account ? (
+        <>
+          <Link to={`/@${account.acct}`} className='hover-card__name'>
+            <Avatar account={account} size={46} />
+            <DisplayName account={account} localDomain={domain} />
+          </Link>
+
+          <div className='hover-card__text-row'>
+            <AccountBio
+              note={account.note_emojified}
+              className='hover-card__bio'
+            />
+            <AccountFields fields={account.fields} limit={2} />
+          </div>
+
+          <div className='hover-card__number'>
+            <ShortNumber
+              value={account.followers_count}
+              renderer={FollowersCounter}
+            />
+          </div>
+
+          <FollowButton accountId={accountId} />
+        </>
+      ) : (
+        <LoadingIndicator />
+      )}
+    </div>
+  );
+});
+
+HoverCardAccount.displayName = 'HoverCardAccount';
diff --git a/app/javascript/mastodon/components/hover_card_controller.tsx b/app/javascript/mastodon/components/hover_card_controller.tsx
new file mode 100644
index 00000000000000..0130390ef8f13c
--- /dev/null
+++ b/app/javascript/mastodon/components/hover_card_controller.tsx
@@ -0,0 +1,117 @@
+import { useEffect, useRef, useState, useCallback } from 'react';
+
+import { useLocation } from 'react-router-dom';
+
+import Overlay from 'react-overlays/Overlay';
+import type {
+  OffsetValue,
+  UsePopperOptions,
+} from 'react-overlays/esm/usePopper';
+
+import { useTimeout } from 'mastodon/../hooks/useTimeout';
+import { HoverCardAccount } from 'mastodon/components/hover_card_account';
+
+const offset = [-12, 4] as OffsetValue;
+const enterDelay = 650;
+const leaveDelay = 250;
+const popperConfig = { strategy: 'fixed' } as UsePopperOptions;
+
+const isHoverCardAnchor = (element: HTMLElement) =>
+  element.matches('[data-hover-card-account]');
+
+export const HoverCardController: React.FC = () => {
+  const [open, setOpen] = useState(false);
+  const [accountId, setAccountId] = useState<string | undefined>();
+  const [anchor, setAnchor] = useState<HTMLElement | null>(null);
+  const cardRef = useRef<HTMLDivElement>(null);
+  const [setLeaveTimeout, cancelLeaveTimeout] = useTimeout();
+  const [setEnterTimeout, cancelEnterTimeout] = useTimeout();
+  const location = useLocation();
+
+  const handleAnchorMouseEnter = useCallback(
+    (e: MouseEvent) => {
+      const { target } = e;
+
+      if (target instanceof HTMLElement && isHoverCardAnchor(target)) {
+        cancelLeaveTimeout();
+
+        setEnterTimeout(() => {
+          target.setAttribute('aria-describedby', 'hover-card');
+          setAnchor(target);
+          setOpen(true);
+          setAccountId(
+            target.getAttribute('data-hover-card-account') ?? undefined,
+          );
+        }, enterDelay);
+      }
+
+      if (target === cardRef.current?.parentNode) {
+        cancelLeaveTimeout();
+      }
+    },
+    [cancelLeaveTimeout, setEnterTimeout, setOpen, setAccountId, setAnchor],
+  );
+
+  const handleAnchorMouseLeave = useCallback(
+    (e: MouseEvent) => {
+      if (e.target === anchor || e.target === cardRef.current?.parentNode) {
+        cancelEnterTimeout();
+
+        setLeaveTimeout(() => {
+          anchor?.removeAttribute('aria-describedby');
+          setOpen(false);
+          setAnchor(null);
+        }, leaveDelay);
+      }
+    },
+    [cancelEnterTimeout, setLeaveTimeout, setOpen, setAnchor, anchor],
+  );
+
+  const handleClose = useCallback(() => {
+    cancelEnterTimeout();
+    cancelLeaveTimeout();
+    setOpen(false);
+    setAnchor(null);
+  }, [cancelEnterTimeout, cancelLeaveTimeout, setOpen, setAnchor]);
+
+  useEffect(() => {
+    handleClose();
+  }, [handleClose, location]);
+
+  useEffect(() => {
+    document.body.addEventListener('mouseenter', handleAnchorMouseEnter, {
+      passive: true,
+      capture: true,
+    });
+    document.body.addEventListener('mouseleave', handleAnchorMouseLeave, {
+      passive: true,
+      capture: true,
+    });
+
+    return () => {
+      document.body.removeEventListener('mouseenter', handleAnchorMouseEnter);
+      document.body.removeEventListener('mouseleave', handleAnchorMouseLeave);
+    };
+  }, [handleAnchorMouseEnter, handleAnchorMouseLeave]);
+
+  if (!accountId) return null;
+
+  return (
+    <Overlay
+      rootClose
+      onHide={handleClose}
+      show={open}
+      target={anchor}
+      placement='bottom-start'
+      flip
+      offset={offset}
+      popperConfig={popperConfig}
+    >
+      {({ props }) => (
+        <div {...props} className='hover-card-controller'>
+          <HoverCardAccount accountId={accountId} ref={cardRef} />
+        </div>
+      )}
+    </Overlay>
+  );
+};
diff --git a/app/javascript/mastodon/components/status.jsx b/app/javascript/mastodon/components/status.jsx
index 7b97e4576670dc..dce48d70364965 100644
--- a/app/javascript/mastodon/components/status.jsx
+++ b/app/javascript/mastodon/components/status.jsx
@@ -425,7 +425,7 @@ class Status extends ImmutablePureComponent {
       prepend = (
         <div className='status__prepend'>
           <div className='status__prepend-icon-wrapper'><Icon id='retweet' icon={RepeatIcon} className='status__prepend-icon' /></div>
-          <FormattedMessage id='status.reblogged_by' defaultMessage='{name} boosted' values={{ name: <a onClick={this.handlePrependAccountClick} data-id={status.getIn(['account', 'id'])} href={`/@${status.getIn(['account', 'acct'])}`} className='status__display-name muted'><bdi><strong dangerouslySetInnerHTML={display_name_html} /></bdi></a> }} />
+          <FormattedMessage id='status.reblogged_by' defaultMessage='{name} boosted' values={{ name: <a onClick={this.handlePrependAccountClick} data-id={status.getIn(['account', 'id'])} data-hover-card-account={status.getIn(['account', 'id'])} href={`/@${status.getIn(['account', 'acct'])}`} className='status__display-name muted'><bdi><strong dangerouslySetInnerHTML={display_name_html} /></bdi></a> }} />
         </div>
       );
 
@@ -446,7 +446,7 @@ class Status extends ImmutablePureComponent {
       prepend = (
         <div className='status__prepend'>
           <div className='status__prepend-icon-wrapper'><Icon id='reply' icon={ReplyIcon} className='status__prepend-icon' /></div>
-          <FormattedMessage id='status.replied_to' defaultMessage='Replied to {name}' values={{ name: <a onClick={this.handlePrependAccountClick} data-id={status.getIn(['account', 'id'])} href={`/@${status.getIn(['account', 'acct'])}`} className='status__display-name muted'><bdi><strong dangerouslySetInnerHTML={display_name_html} /></bdi></a> }} />
+          <FormattedMessage id='status.replied_to' defaultMessage='Replied to {name}' values={{ name: <a onClick={this.handlePrependAccountClick} data-id={status.getIn(['account', 'id'])} data-hover-card-account={status.getIn(['account', 'id'])} href={`/@${status.getIn(['account', 'acct'])}`} className='status__display-name muted'><bdi><strong dangerouslySetInnerHTML={display_name_html} /></bdi></a> }} />
         </div>
       );
     }
@@ -562,7 +562,7 @@ class Status extends ImmutablePureComponent {
                 <RelativeTimestamp timestamp={status.get('created_at')} />{status.get('edited_at') && <abbr title={intl.formatMessage(messages.edited, { date: intl.formatDate(status.get('edited_at'), { year: 'numeric', month: 'short', day: '2-digit', hour: '2-digit', minute: '2-digit' }) })}> *</abbr>}
               </a>
 
-              <a onClick={this.handleAccountClick} href={`/@${status.getIn(['account', 'acct'])}`} title={status.getIn(['account', 'acct'])} className='status__display-name' target='_blank' rel='noopener noreferrer'>
+              <a onClick={this.handleAccountClick} href={`/@${status.getIn(['account', 'acct'])}`} data-hover-card-account={status.getIn(['account', 'id'])} className='status__display-name' target='_blank' rel='noopener noreferrer'>
                 <div className='status__avatar'>
                   {statusAvatar}
                 </div>
diff --git a/app/javascript/mastodon/components/status_content.jsx b/app/javascript/mastodon/components/status_content.jsx
index 24483cf512819e..82135b85cad26e 100644
--- a/app/javascript/mastodon/components/status_content.jsx
+++ b/app/javascript/mastodon/components/status_content.jsx
@@ -116,8 +116,9 @@ class StatusContent extends PureComponent {
 
       if (mention) {
         link.addEventListener('click', this.onMentionClick.bind(this, mention), false);
-        link.setAttribute('title', `@${mention.get('acct')}`);
+        link.removeAttribute('title');
         link.setAttribute('href', `/@${mention.get('acct')}`);
+        link.setAttribute('data-hover-card-account', mention.get('id'));
       } else if (link.textContent[0] === '#' || (link.previousSibling && link.previousSibling.textContent && link.previousSibling.textContent[link.previousSibling.textContent.length - 1] === '#')) {
         link.addEventListener('click', this.onHashtagClick.bind(this, link.text), false);
         link.setAttribute('href', `/tags/${link.text.replace(/^#/, '')}`);
diff --git a/app/javascript/mastodon/features/explore/components/author_link.jsx b/app/javascript/mastodon/features/explore/components/author_link.jsx
index b9dec3367e8b46..8dd9b0dabd1356 100644
--- a/app/javascript/mastodon/features/explore/components/author_link.jsx
+++ b/app/javascript/mastodon/features/explore/components/author_link.jsx
@@ -9,7 +9,7 @@ export const AuthorLink = ({ accountId }) => {
   const account = useAppSelector(state => state.getIn(['accounts', accountId]));
 
   return (
-    <Link to={`/@${account.get('acct')}`} className='story__details__shared__author-link'>
+    <Link to={`/@${account.get('acct')}`} className='story__details__shared__author-link' data-hover-card-account={accountId}>
       <Avatar account={account} size={16} />
       <bdi dangerouslySetInnerHTML={{ __html: account.get('display_name_html') }} />
     </Link>
diff --git a/app/javascript/mastodon/features/explore/components/card.jsx b/app/javascript/mastodon/features/explore/components/card.jsx
index 316203060a2a5a..19086485106400 100644
--- a/app/javascript/mastodon/features/explore/components/card.jsx
+++ b/app/javascript/mastodon/features/explore/components/card.jsx
@@ -8,34 +8,21 @@ import { Link } from 'react-router-dom';
 import { useDispatch, useSelector } from 'react-redux';
 
 import CloseIcon from '@/material-icons/400-24px/close.svg?react';
-import { followAccount, unfollowAccount } from 'mastodon/actions/accounts';
 import { dismissSuggestion } from 'mastodon/actions/suggestions';
 import { Avatar } from 'mastodon/components/avatar';
-import { Button } from 'mastodon/components/button';
 import { DisplayName } from 'mastodon/components/display_name';
+import { FollowButton } from 'mastodon/components/follow_button';
 import { IconButton } from 'mastodon/components/icon_button';
 import { domain } from 'mastodon/initial_state';
 
 const messages = defineMessages({
-  follow: { id: 'account.follow', defaultMessage: 'Follow' },
-  unfollow: { id: 'account.unfollow', defaultMessage: 'Unfollow' },
   dismiss: { id: 'follow_suggestions.dismiss', defaultMessage: "Don't show again" },
 });
 
 export const Card = ({ id, source }) => {
   const intl = useIntl();
   const account = useSelector(state => state.getIn(['accounts', id]));
-  const relationship = useSelector(state => state.getIn(['relationships', id]));
   const dispatch = useDispatch();
-  const following = relationship?.get('following') ?? relationship?.get('requested');
-
-  const handleFollow = useCallback(() => {
-    if (following) {
-      dispatch(unfollowAccount(id));
-    } else {
-      dispatch(followAccount(id));
-    }
-  }, [id, following, dispatch]);
 
   const handleDismiss = useCallback(() => {
     dispatch(dismissSuggestion(id));
@@ -74,7 +61,7 @@ export const Card = ({ id, source }) => {
           <div className='explore__suggestions__card__body__main__name-button'>
             <Link className='explore__suggestions__card__body__main__name-button__name' to={`/@${account.get('acct')}`}><DisplayName account={account} /></Link>
             <IconButton iconComponent={CloseIcon} onClick={handleDismiss} title={intl.formatMessage(messages.dismiss)} />
-            <Button text={intl.formatMessage(following ? messages.unfollow : messages.follow)} secondary={following} onClick={handleFollow} />
+            <FollowButton accountId={account.get('id')} />
           </div>
         </div>
       </div>
diff --git a/app/javascript/mastodon/features/home_timeline/components/inline_follow_suggestions.jsx b/app/javascript/mastodon/features/home_timeline/components/inline_follow_suggestions.jsx
index c39b43badefac0..1b8040e55bb00b 100644
--- a/app/javascript/mastodon/features/home_timeline/components/inline_follow_suggestions.jsx
+++ b/app/javascript/mastodon/features/home_timeline/components/inline_follow_suggestions.jsx
@@ -12,12 +12,11 @@ import ChevronLeftIcon from '@/material-icons/400-24px/chevron_left.svg?react';
 import ChevronRightIcon from '@/material-icons/400-24px/chevron_right.svg?react';
 import CloseIcon from '@/material-icons/400-24px/close.svg?react';
 import InfoIcon from '@/material-icons/400-24px/info.svg?react';
-import { followAccount, unfollowAccount } from 'mastodon/actions/accounts';
 import { changeSetting } from 'mastodon/actions/settings';
 import { fetchSuggestions, dismissSuggestion } from 'mastodon/actions/suggestions';
 import { Avatar } from 'mastodon/components/avatar';
-import { Button } from 'mastodon/components/button';
 import { DisplayName } from 'mastodon/components/display_name';
+import { FollowButton } from 'mastodon/components/follow_button';
 import { Icon } from 'mastodon/components/icon';
 import { IconButton } from 'mastodon/components/icon_button';
 import { VerifiedBadge } from 'mastodon/components/verified_badge';
@@ -79,18 +78,8 @@ Source.propTypes = {
 const Card = ({ id, sources }) => {
   const intl = useIntl();
   const account = useSelector(state => state.getIn(['accounts', id]));
-  const relationship = useSelector(state => state.getIn(['relationships', id]));
   const firstVerifiedField = account.get('fields').find(item => !!item.get('verified_at'));
   const dispatch = useDispatch();
-  const following = relationship?.get('following') ?? relationship?.get('requested');
-
-  const handleFollow = useCallback(() => {
-    if (following) {
-      dispatch(unfollowAccount(id));
-    } else {
-      dispatch(followAccount(id));
-    }
-  }, [id, following, dispatch]);
 
   const handleDismiss = useCallback(() => {
     dispatch(dismissSuggestion(id));
@@ -109,7 +98,7 @@ const Card = ({ id, sources }) => {
         {firstVerifiedField ? <VerifiedBadge link={firstVerifiedField.get('value')} /> : <Source id={sources.get(0)} />}
       </div>
 
-      <Button text={intl.formatMessage(following ? messages.unfollow : messages.follow)} secondary={following} onClick={handleFollow} />
+      <FollowButton accountId={id} />
     </div>
   );
 };
diff --git a/app/javascript/mastodon/features/notifications/components/notification.jsx b/app/javascript/mastodon/features/notifications/components/notification.jsx
index 69084c2111b47e..272893042d7e40 100644
--- a/app/javascript/mastodon/features/notifications/components/notification.jsx
+++ b/app/javascript/mastodon/features/notifications/components/notification.jsx
@@ -435,7 +435,7 @@ class Notification extends ImmutablePureComponent {
 
     const targetAccount = report.get('target_account');
     const targetDisplayNameHtml = { __html: targetAccount.get('display_name_html') };
-    const targetLink = <bdi><Link className='notification__display-name' title={targetAccount.get('acct')} to={`/@${targetAccount.get('acct')}`} dangerouslySetInnerHTML={targetDisplayNameHtml} /></bdi>;
+    const targetLink = <bdi><Link className='notification__display-name' data-hover-card-account={targetAccount.get('id')} to={`/@${targetAccount.get('acct')}`} dangerouslySetInnerHTML={targetDisplayNameHtml} /></bdi>;
 
     return (
       <HotKeys handlers={this.getHandlers()}>
@@ -458,7 +458,7 @@ class Notification extends ImmutablePureComponent {
     const { notification } = this.props;
     const account          = notification.get('account');
     const displayNameHtml  = { __html: account.get('display_name_html') };
-    const link             = <bdi><Link className='notification__display-name' href={`/@${account.get('acct')}`} title={account.get('acct')} to={`/@${account.get('acct')}`} dangerouslySetInnerHTML={displayNameHtml} /></bdi>;
+    const link             = <bdi><Link className='notification__display-name' href={`/@${account.get('acct')}`} data-hover-card-account={account.get('id')} to={`/@${account.get('acct')}`} dangerouslySetInnerHTML={displayNameHtml} /></bdi>;
 
     switch(notification.get('type')) {
     case 'follow':
diff --git a/app/javascript/mastodon/features/status/components/detailed_status.jsx b/app/javascript/mastodon/features/status/components/detailed_status.jsx
index 8843619bc93737..bc81fd2dfb1789 100644
--- a/app/javascript/mastodon/features/status/components/detailed_status.jsx
+++ b/app/javascript/mastodon/features/status/components/detailed_status.jsx
@@ -272,7 +272,7 @@ class DetailedStatus extends ImmutablePureComponent {
               <FormattedMessage id='status.direct_indicator' defaultMessage='Private mention' />
             </div>
           )}
-          <a href={`/@${status.getIn(['account', 'acct'])}`} onClick={this.handleAccountClick} className='detailed-status__display-name'>
+          <a href={`/@${status.getIn(['account', 'acct'])}`} data-hover-card-account={status.getIn(['account', 'id'])} onClick={this.handleAccountClick} className='detailed-status__display-name'>
             <div className='detailed-status__display-avatar'><Avatar account={status.get('account')} size={46} /></div>
             <DisplayName account={status.get('account')} localDomain={this.props.domain} />
           </a>
diff --git a/app/javascript/mastodon/features/ui/index.jsx b/app/javascript/mastodon/features/ui/index.jsx
index 7742f64860de2e..b58e191ed8fc2d 100644
--- a/app/javascript/mastodon/features/ui/index.jsx
+++ b/app/javascript/mastodon/features/ui/index.jsx
@@ -14,6 +14,7 @@ import { HotKeys } from 'react-hotkeys';
 import { focusApp, unfocusApp, changeLayout } from 'mastodon/actions/app';
 import { synchronouslySubmitMarkers, submitMarkers, fetchMarkers } from 'mastodon/actions/markers';
 import { INTRODUCTION_VERSION } from 'mastodon/actions/onboarding';
+import { HoverCardController } from 'mastodon/components/hover_card_controller';
 import { PictureInPicture } from 'mastodon/features/picture_in_picture';
 import { identityContextPropShape, withIdentity } from 'mastodon/identity_context';
 import { layoutFromWindow } from 'mastodon/is_mobile';
@@ -585,6 +586,7 @@ class UI extends PureComponent {
 
           {layout !== 'mobile' && <PictureInPicture />}
           <NotificationsContainer />
+          <HoverCardController />
           <LoadingBarContainer className='loading-bar' />
           <ModalContainer />
           <UploadArea active={draggingOver} onClose={this.closeUploadModal} />
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index f0c27ad7068c4c..13296e1d204479 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -35,9 +35,9 @@
   "account.follow_back": "Follow back",
   "account.followers": "Followers",
   "account.followers.empty": "No one follows this user yet.",
-  "account.followers_counter": "{count, plural, one {{counter} Follower} other {{counter} Followers}}",
+  "account.followers_counter": "{count, plural, one {{counter} follower} other {{counter} followers}}",
   "account.following": "Following",
-  "account.following_counter": "{count, plural, one {{counter} Following} other {{counter} Following}}",
+  "account.following_counter": "{count, plural, one {{counter} following} other {{counter} following}}",
   "account.follows.empty": "This user doesn't follow anyone yet.",
   "account.go_to_profile": "Go to profile",
   "account.hide_reblogs": "Hide boosts from @{name}",
@@ -63,7 +63,7 @@
   "account.requested_follow": "{name} has requested to follow you",
   "account.share": "Share @{name}'s profile",
   "account.show_reblogs": "Show boosts from @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} Post} other {{counter} Posts}}",
+  "account.statuses_counter": "{count, plural, one {{counter} post} other {{counter} posts}}",
   "account.unblock": "Unblock @{name}",
   "account.unblock_domain": "Unblock domain {domain}",
   "account.unblock_short": "Unblock",
diff --git a/app/javascript/styles/mastodon-light/variables.scss b/app/javascript/styles/mastodon-light/variables.scss
index 3cdbd9bf67e340..9f571b3f2600b9 100644
--- a/app/javascript/styles/mastodon-light/variables.scss
+++ b/app/javascript/styles/mastodon-light/variables.scss
@@ -59,6 +59,8 @@ $emojis-requiring-inversion: 'chains';
 body {
   --dropdown-border-color: #d9e1e8;
   --dropdown-background-color: #fff;
+  --modal-border-color: #d9e1e8;
+  --modal-background-color: var(--background-color-tint);
   --background-border-color: #d9e1e8;
   --background-color: #fff;
   --background-color-tint: rgba(255, 255, 255, 80%);
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 73d0e6220f48aa..cbf9314ff83de7 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -120,8 +120,27 @@
       text-decoration: none;
     }
 
-    &:disabled {
-      opacity: 0.5;
+    &.button--destructive {
+      &:active,
+      &:focus,
+      &:hover {
+        border-color: $ui-button-destructive-focus-background-color;
+        color: $ui-button-destructive-focus-background-color;
+      }
+    }
+
+    &:disabled,
+    &.disabled {
+      opacity: 0.7;
+      border-color: $ui-primary-color;
+      color: $ui-primary-color;
+
+      &:active,
+      &:focus,
+      &:hover {
+        border-color: $ui-primary-color;
+        color: $ui-primary-color;
+      }
     }
   }
 
@@ -2420,7 +2439,7 @@ a.account__display-name {
 }
 
 .dropdown-animation {
-  animation: dropdown 150ms cubic-bezier(0.1, 0.7, 0.1, 1);
+  animation: dropdown 250ms cubic-bezier(0.1, 0.7, 0.1, 1);
 
   @keyframes dropdown {
     from {
@@ -10325,3 +10344,156 @@ noscript {
     }
   }
 }
+
+.hover-card-controller[data-popper-reference-hidden='true'] {
+  opacity: 0;
+  pointer-events: none;
+}
+
+.hover-card {
+  box-shadow: var(--dropdown-shadow);
+  background: var(--modal-background-color);
+  backdrop-filter: var(--background-filter);
+  border: 1px solid var(--modal-border-color);
+  border-radius: 8px;
+  padding: 16px;
+  width: 270px;
+  display: flex;
+  flex-direction: column;
+  gap: 12px;
+
+  &--loading {
+    position: relative;
+    min-height: 100px;
+  }
+
+  &__name {
+    display: flex;
+    gap: 12px;
+    text-decoration: none;
+    color: inherit;
+  }
+
+  &__number {
+    font-size: 15px;
+    line-height: 22px;
+    color: $secondary-text-color;
+
+    strong {
+      font-weight: 700;
+    }
+  }
+
+  &__text-row {
+    display: flex;
+    flex-direction: column;
+    gap: 8px;
+  }
+
+  &__bio {
+    color: $secondary-text-color;
+    font-size: 14px;
+    line-height: 20px;
+    display: -webkit-box;
+    -webkit-line-clamp: 2;
+    -webkit-box-orient: vertical;
+    max-height: 2 * 20px;
+    overflow: hidden;
+
+    p {
+      margin-bottom: 0;
+    }
+
+    a {
+      color: inherit;
+      text-decoration: underline;
+
+      &:hover,
+      &:focus,
+      &:active {
+        text-decoration: none;
+      }
+    }
+  }
+
+  .display-name {
+    font-size: 15px;
+    line-height: 22px;
+
+    bdi {
+      font-weight: 500;
+      color: $primary-text-color;
+    }
+
+    &__account {
+      display: block;
+      color: $dark-text-color;
+    }
+  }
+
+  .account-fields {
+    color: $secondary-text-color;
+    font-size: 14px;
+    line-height: 20px;
+
+    a {
+      color: inherit;
+      text-decoration: none;
+
+      &:focus,
+      &:hover,
+      &:active {
+        text-decoration: underline;
+      }
+    }
+
+    dl {
+      display: flex;
+      align-items: center;
+      gap: 4px;
+
+      dt {
+        flex: 0 0 auto;
+        color: $dark-text-color;
+        min-width: 0;
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+      }
+
+      dd {
+        flex: 1 1 auto;
+        font-weight: 500;
+        min-width: 0;
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+      }
+
+      &.verified {
+        dd {
+          display: flex;
+          align-items: center;
+          gap: 4px;
+          overflow: hidden;
+          white-space: nowrap;
+          color: $valid-value-color;
+
+          & > span {
+            overflow: hidden;
+            text-overflow: ellipsis;
+          }
+
+          a {
+            font-weight: 500;
+          }
+
+          .icon {
+            width: 16px;
+            height: 16px;
+          }
+        }
+      }
+    }
+  }
+}

From 3939352e92f4be13b773ee243bbb6ad54d6b5bd1 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 26 Jun 2024 21:46:28 +0200
Subject: [PATCH 1408/2191] Convert `<ColumnHeader>` to Typescript (#30849)

---
 .../mastodon/components/column_header.jsx     | 233 --------------
 .../mastodon/components/column_header.tsx     | 301 ++++++++++++++++++
 .../mastodon/features/directory/index.tsx     |   5 +-
 .../features/ui/components/column_loading.tsx |  11 +-
 4 files changed, 307 insertions(+), 243 deletions(-)
 delete mode 100644 app/javascript/mastodon/components/column_header.jsx
 create mode 100644 app/javascript/mastodon/components/column_header.tsx

diff --git a/app/javascript/mastodon/components/column_header.jsx b/app/javascript/mastodon/components/column_header.jsx
deleted file mode 100644
index 42183f336dbd5b..00000000000000
--- a/app/javascript/mastodon/components/column_header.jsx
+++ /dev/null
@@ -1,233 +0,0 @@
-import PropTypes from 'prop-types';
-import { PureComponent, useCallback } from 'react';
-
-import { FormattedMessage, injectIntl, defineMessages, useIntl } from 'react-intl';
-
-import classNames from 'classnames';
-import { withRouter } from 'react-router-dom';
-
-import AddIcon from '@/material-icons/400-24px/add.svg?react';
-import ArrowBackIcon from '@/material-icons/400-24px/arrow_back.svg?react';
-import ChevronLeftIcon from '@/material-icons/400-24px/chevron_left.svg?react';
-import ChevronRightIcon from '@/material-icons/400-24px/chevron_right.svg?react';
-import CloseIcon from '@/material-icons/400-24px/close.svg?react';
-import SettingsIcon from '@/material-icons/400-24px/settings.svg?react';
-import { Icon }  from 'mastodon/components/icon';
-import { ButtonInTabsBar } from 'mastodon/features/ui/util/columns_context';
-import { identityContextPropShape, withIdentity } from 'mastodon/identity_context';
-import { WithRouterPropTypes } from 'mastodon/utils/react_router';
-
-
-import { useAppHistory } from './router';
-
-const messages = defineMessages({
-  show: { id: 'column_header.show_settings', defaultMessage: 'Show settings' },
-  hide: { id: 'column_header.hide_settings', defaultMessage: 'Hide settings' },
-  moveLeft: { id: 'column_header.moveLeft_settings', defaultMessage: 'Move column to the left' },
-  moveRight: { id: 'column_header.moveRight_settings', defaultMessage: 'Move column to the right' },
-  back: { id: 'column_back_button.label', defaultMessage: 'Back' },
-});
-
-const BackButton = ({ onlyIcon }) => {
-  const history = useAppHistory();
-  const intl = useIntl();
-
-  const handleBackClick = useCallback(() => {
-    if (history.location?.state?.fromMastodon) {
-      history.goBack();
-    } else {
-      history.push('/');
-    }
-  }, [history]);
-
-  return (
-    <button onClick={handleBackClick} className={classNames('column-header__back-button', { 'compact': onlyIcon })} aria-label={intl.formatMessage(messages.back)}>
-      <Icon id='chevron-left' icon={ArrowBackIcon} className='column-back-button__icon' />
-      {!onlyIcon && <FormattedMessage id='column_back_button.label' defaultMessage='Back' />}
-    </button>
-  );
-};
-
-BackButton.propTypes = {
-  onlyIcon: PropTypes.bool,
-};
-
-class ColumnHeader extends PureComponent {
-  static propTypes = {
-    identity: identityContextPropShape,
-    intl: PropTypes.object.isRequired,
-    title: PropTypes.node,
-    icon: PropTypes.string,
-    iconComponent: PropTypes.func,
-    active: PropTypes.bool,
-    multiColumn: PropTypes.bool,
-    extraButton: PropTypes.node,
-    showBackButton: PropTypes.bool,
-    children: PropTypes.node,
-    pinned: PropTypes.bool,
-    placeholder: PropTypes.bool,
-    onPin: PropTypes.func,
-    onMove: PropTypes.func,
-    onClick: PropTypes.func,
-    appendContent: PropTypes.node,
-    collapseIssues: PropTypes.bool,
-    ...WithRouterPropTypes,
-  };
-
-  state = {
-    collapsed: true,
-    animating: false,
-  };
-
-  handleToggleClick = (e) => {
-    e.stopPropagation();
-    this.setState({ collapsed: !this.state.collapsed, animating: true });
-  };
-
-  handleTitleClick = () => {
-    this.props.onClick?.();
-  };
-
-  handleMoveLeft = () => {
-    this.props.onMove(-1);
-  };
-
-  handleMoveRight = () => {
-    this.props.onMove(1);
-  };
-
-  handleTransitionEnd = () => {
-    this.setState({ animating: false });
-  };
-
-  handlePin = () => {
-    if (!this.props.pinned) {
-      this.props.history.replace('/');
-    }
-
-    this.props.onPin();
-  };
-
-  render () {
-    const { title, icon, iconComponent, active, children, pinned, multiColumn, extraButton, showBackButton, intl: { formatMessage }, placeholder, appendContent, collapseIssues, history } = this.props;
-    const { collapsed, animating } = this.state;
-
-    const wrapperClassName = classNames('column-header__wrapper', {
-      'active': active,
-    });
-
-    const buttonClassName = classNames('column-header', {
-      'active': active,
-    });
-
-    const collapsibleClassName = classNames('column-header__collapsible', {
-      'collapsed': collapsed,
-      'animating': animating,
-    });
-
-    const collapsibleButtonClassName = classNames('column-header__button', {
-      'active': !collapsed,
-    });
-
-    let extraContent, pinButton, moveButtons, backButton, collapseButton;
-
-    if (children) {
-      extraContent = (
-        <div key='extra-content' className='column-header__collapsible__extra'>
-          {children}
-        </div>
-      );
-    }
-
-    if (multiColumn && pinned) {
-      pinButton = <button className='text-btn column-header__setting-btn' onClick={this.handlePin}><Icon id='times' icon={CloseIcon} /> <FormattedMessage id='column_header.unpin' defaultMessage='Unpin' /></button>;
-
-      moveButtons = (
-        <div className='column-header__setting-arrows'>
-          <button title={formatMessage(messages.moveLeft)} aria-label={formatMessage(messages.moveLeft)} className='icon-button column-header__setting-btn' onClick={this.handleMoveLeft}><Icon id='chevron-left' icon={ChevronLeftIcon} /></button>
-          <button title={formatMessage(messages.moveRight)} aria-label={formatMessage(messages.moveRight)} className='icon-button column-header__setting-btn' onClick={this.handleMoveRight}><Icon id='chevron-right' icon={ChevronRightIcon} /></button>
-        </div>
-      );
-    } else if (multiColumn && this.props.onPin) {
-      pinButton = <button className='text-btn column-header__setting-btn' onClick={this.handlePin}><Icon id='plus' icon={AddIcon} /> <FormattedMessage id='column_header.pin' defaultMessage='Pin' /></button>;
-    }
-
-    if (history && !pinned && ((multiColumn && history.location?.state?.fromMastodon) || showBackButton)) {
-      backButton = <BackButton onlyIcon={!!title} />;
-    }
-
-    const collapsedContent = [
-      extraContent,
-    ];
-
-    if (multiColumn) {
-      collapsedContent.push(
-        <div key='buttons' className='column-header__advanced-buttons'>
-          {pinButton}
-          {moveButtons}
-        </div>
-      );
-    }
-
-    if (this.props.identity.signedIn && (children || (multiColumn && this.props.onPin))) {
-      collapseButton = (
-        <button
-          className={collapsibleButtonClassName}
-          title={formatMessage(collapsed ? messages.show : messages.hide)}
-          aria-label={formatMessage(collapsed ? messages.show : messages.hide)}
-          onClick={this.handleToggleClick}
-        >
-          <i className='icon-with-badge'>
-            <Icon id='sliders' icon={SettingsIcon} />
-            {collapseIssues && <i className='icon-with-badge__issue-badge' />}
-          </i>
-        </button>
-      );
-    }
-
-    const hasTitle = (icon || iconComponent) && title;
-
-    const component = (
-      <div className={wrapperClassName}>
-        <h1 className={buttonClassName}>
-          {hasTitle && (
-            <>
-              {backButton}
-
-              <button onClick={this.handleTitleClick} className='column-header__title'>
-                {!backButton && <Icon id={icon} icon={iconComponent} className='column-header__icon' />}
-                {title}
-              </button>
-            </>
-          )}
-
-          {!hasTitle && backButton}
-
-          <div className='column-header__buttons'>
-            {extraButton}
-            {collapseButton}
-          </div>
-        </h1>
-
-        <div className={collapsibleClassName} tabIndex={collapsed ? -1 : null} onTransitionEnd={this.handleTransitionEnd}>
-          <div className='column-header__collapsible-inner'>
-            {(!collapsed || animating) && collapsedContent}
-          </div>
-        </div>
-
-        {appendContent}
-      </div>
-    );
-
-    if (placeholder) {
-      return component;
-    } else {
-      return (<ButtonInTabsBar>
-        {component}
-      </ButtonInTabsBar>);
-    }
-  }
-
-}
-
-export default injectIntl(withIdentity(withRouter(ColumnHeader)));
diff --git a/app/javascript/mastodon/components/column_header.tsx b/app/javascript/mastodon/components/column_header.tsx
new file mode 100644
index 00000000000000..ec946cab3edf01
--- /dev/null
+++ b/app/javascript/mastodon/components/column_header.tsx
@@ -0,0 +1,301 @@
+import { useCallback, useState } from 'react';
+
+import { FormattedMessage, defineMessages, useIntl } from 'react-intl';
+
+import classNames from 'classnames';
+
+import AddIcon from '@/material-icons/400-24px/add.svg?react';
+import ArrowBackIcon from '@/material-icons/400-24px/arrow_back.svg?react';
+import ChevronLeftIcon from '@/material-icons/400-24px/chevron_left.svg?react';
+import ChevronRightIcon from '@/material-icons/400-24px/chevron_right.svg?react';
+import CloseIcon from '@/material-icons/400-24px/close.svg?react';
+import SettingsIcon from '@/material-icons/400-24px/settings.svg?react';
+import type { IconProp } from 'mastodon/components/icon';
+import { Icon } from 'mastodon/components/icon';
+import { ButtonInTabsBar } from 'mastodon/features/ui/util/columns_context';
+import { useIdentity } from 'mastodon/identity_context';
+
+import { useAppHistory } from './router';
+
+const messages = defineMessages({
+  show: { id: 'column_header.show_settings', defaultMessage: 'Show settings' },
+  hide: { id: 'column_header.hide_settings', defaultMessage: 'Hide settings' },
+  moveLeft: {
+    id: 'column_header.moveLeft_settings',
+    defaultMessage: 'Move column to the left',
+  },
+  moveRight: {
+    id: 'column_header.moveRight_settings',
+    defaultMessage: 'Move column to the right',
+  },
+  back: { id: 'column_back_button.label', defaultMessage: 'Back' },
+});
+
+const BackButton: React.FC<{
+  onlyIcon: boolean;
+}> = ({ onlyIcon }) => {
+  const history = useAppHistory();
+  const intl = useIntl();
+
+  const handleBackClick = useCallback(() => {
+    if (history.location.state?.fromMastodon) {
+      history.goBack();
+    } else {
+      history.push('/');
+    }
+  }, [history]);
+
+  return (
+    <button
+      onClick={handleBackClick}
+      className={classNames('column-header__back-button', {
+        compact: onlyIcon,
+      })}
+      aria-label={intl.formatMessage(messages.back)}
+    >
+      <Icon
+        id='chevron-left'
+        icon={ArrowBackIcon}
+        className='column-back-button__icon'
+      />
+      {!onlyIcon && (
+        <FormattedMessage id='column_back_button.label' defaultMessage='Back' />
+      )}
+    </button>
+  );
+};
+
+export interface Props {
+  title?: string;
+  icon?: string;
+  iconComponent?: IconProp;
+  active?: boolean;
+  children?: React.ReactNode;
+  pinned?: boolean;
+  multiColumn?: boolean;
+  extraButton?: React.ReactNode;
+  showBackButton?: boolean;
+  placeholder?: boolean;
+  appendContent?: React.ReactNode;
+  collapseIssues?: boolean;
+  onClick?: () => void;
+  onMove?: (arg0: number) => void;
+  onPin?: () => void;
+}
+
+export const ColumnHeader: React.FC<Props> = ({
+  title,
+  icon,
+  iconComponent,
+  active,
+  children,
+  pinned,
+  multiColumn,
+  extraButton,
+  showBackButton,
+  placeholder,
+  appendContent,
+  collapseIssues,
+  onClick,
+  onMove,
+  onPin,
+}) => {
+  const intl = useIntl();
+  const { signedIn } = useIdentity();
+  const history = useAppHistory();
+  const [collapsed, setCollapsed] = useState(true);
+  const [animating, setAnimating] = useState(false);
+
+  const handleToggleClick = useCallback(
+    (e: React.MouseEvent) => {
+      e.stopPropagation();
+      setCollapsed((value) => !value);
+      setAnimating(true);
+    },
+    [setCollapsed, setAnimating],
+  );
+
+  const handleTitleClick = useCallback(() => {
+    onClick?.();
+  }, [onClick]);
+
+  const handleMoveLeft = useCallback(() => {
+    onMove?.(-1);
+  }, [onMove]);
+
+  const handleMoveRight = useCallback(() => {
+    onMove?.(1);
+  }, [onMove]);
+
+  const handleTransitionEnd = useCallback(() => {
+    setAnimating(false);
+  }, [setAnimating]);
+
+  const handlePin = useCallback(() => {
+    if (!pinned) {
+      history.replace('/');
+    }
+
+    onPin?.();
+  }, [history, pinned, onPin]);
+
+  const wrapperClassName = classNames('column-header__wrapper', {
+    active,
+  });
+
+  const buttonClassName = classNames('column-header', {
+    active,
+  });
+
+  const collapsibleClassName = classNames('column-header__collapsible', {
+    collapsed,
+    animating,
+  });
+
+  const collapsibleButtonClassName = classNames('column-header__button', {
+    active: !collapsed,
+  });
+
+  let extraContent, pinButton, moveButtons, backButton, collapseButton;
+
+  if (children) {
+    extraContent = (
+      <div key='extra-content' className='column-header__collapsible__extra'>
+        {children}
+      </div>
+    );
+  }
+
+  if (multiColumn && pinned) {
+    pinButton = (
+      <button
+        className='text-btn column-header__setting-btn'
+        onClick={handlePin}
+      >
+        <Icon id='times' icon={CloseIcon} />{' '}
+        <FormattedMessage id='column_header.unpin' defaultMessage='Unpin' />
+      </button>
+    );
+
+    moveButtons = (
+      <div className='column-header__setting-arrows'>
+        <button
+          title={intl.formatMessage(messages.moveLeft)}
+          aria-label={intl.formatMessage(messages.moveLeft)}
+          className='icon-button column-header__setting-btn'
+          onClick={handleMoveLeft}
+        >
+          <Icon id='chevron-left' icon={ChevronLeftIcon} />
+        </button>
+        <button
+          title={intl.formatMessage(messages.moveRight)}
+          aria-label={intl.formatMessage(messages.moveRight)}
+          className='icon-button column-header__setting-btn'
+          onClick={handleMoveRight}
+        >
+          <Icon id='chevron-right' icon={ChevronRightIcon} />
+        </button>
+      </div>
+    );
+  } else if (multiColumn && onPin) {
+    pinButton = (
+      <button
+        className='text-btn column-header__setting-btn'
+        onClick={handlePin}
+      >
+        <Icon id='plus' icon={AddIcon} />{' '}
+        <FormattedMessage id='column_header.pin' defaultMessage='Pin' />
+      </button>
+    );
+  }
+
+  if (
+    !pinned &&
+    ((multiColumn && history.location.state?.fromMastodon) || showBackButton)
+  ) {
+    backButton = <BackButton onlyIcon={!!title} />;
+  }
+
+  const collapsedContent = [extraContent];
+
+  if (multiColumn) {
+    collapsedContent.push(
+      <div key='buttons' className='column-header__advanced-buttons'>
+        {pinButton}
+        {moveButtons}
+      </div>,
+    );
+  }
+
+  if (signedIn && (children || (multiColumn && onPin))) {
+    collapseButton = (
+      <button
+        className={collapsibleButtonClassName}
+        title={intl.formatMessage(collapsed ? messages.show : messages.hide)}
+        aria-label={intl.formatMessage(
+          collapsed ? messages.show : messages.hide,
+        )}
+        onClick={handleToggleClick}
+      >
+        <i className='icon-with-badge'>
+          <Icon id='sliders' icon={SettingsIcon} />
+          {collapseIssues && <i className='icon-with-badge__issue-badge' />}
+        </i>
+      </button>
+    );
+  }
+
+  const hasIcon = icon && iconComponent;
+  const hasTitle = hasIcon && title;
+
+  const component = (
+    <div className={wrapperClassName}>
+      <h1 className={buttonClassName}>
+        {hasTitle && (
+          <>
+            {backButton}
+
+            <button onClick={handleTitleClick} className='column-header__title'>
+              {!backButton && (
+                <Icon
+                  id={icon}
+                  icon={iconComponent}
+                  className='column-header__icon'
+                />
+              )}
+              {title}
+            </button>
+          </>
+        )}
+
+        {!hasTitle && backButton}
+
+        <div className='column-header__buttons'>
+          {extraButton}
+          {collapseButton}
+        </div>
+      </h1>
+
+      <div
+        className={collapsibleClassName}
+        tabIndex={collapsed ? -1 : undefined}
+        onTransitionEnd={handleTransitionEnd}
+      >
+        <div className='column-header__collapsible-inner'>
+          {(!collapsed || animating) && collapsedContent}
+        </div>
+      </div>
+
+      {appendContent}
+    </div>
+  );
+
+  if (placeholder) {
+    return component;
+  } else {
+    return <ButtonInTabsBar>{component}</ButtonInTabsBar>;
+  }
+};
+
+// eslint-disable-next-line import/no-default-export
+export default ColumnHeader;
diff --git a/app/javascript/mastodon/features/directory/index.tsx b/app/javascript/mastodon/features/directory/index.tsx
index 482c6858f48a53..51d283a482d9c8 100644
--- a/app/javascript/mastodon/features/directory/index.tsx
+++ b/app/javascript/mastodon/features/directory/index.tsx
@@ -16,7 +16,7 @@ import {
 } from 'mastodon/actions/columns';
 import { fetchDirectory, expandDirectory } from 'mastodon/actions/directory';
 import Column from 'mastodon/components/column';
-import ColumnHeader from 'mastodon/components/column_header';
+import { ColumnHeader } from 'mastodon/components/column_header';
 import { LoadMore } from 'mastodon/components/load_more';
 import { LoadingIndicator } from 'mastodon/components/loading_indicator';
 import { RadioButton } from 'mastodon/components/radio_button';
@@ -86,7 +86,7 @@ export const Directory: React.FC<{
   }, [dispatch, order, local]);
 
   const handleMove = useCallback(
-    (dir: string) => {
+    (dir: number) => {
       dispatch(moveColumn(columnId, dir));
     },
     [dispatch, columnId],
@@ -185,7 +185,6 @@ export const Directory: React.FC<{
       label={intl.formatMessage(messages.title)}
     >
       <ColumnHeader
-        // @ts-expect-error ColumnHeader is not properly typed yet
         icon='address-book-o'
         iconComponent={PeopleIcon}
         title={intl.formatMessage(messages.title)}
diff --git a/app/javascript/mastodon/features/ui/components/column_loading.tsx b/app/javascript/mastodon/features/ui/components/column_loading.tsx
index 42174838cf31af..d9563dda7a03de 100644
--- a/app/javascript/mastodon/features/ui/components/column_loading.tsx
+++ b/app/javascript/mastodon/features/ui/components/column_loading.tsx
@@ -1,11 +1,8 @@
-import Column from '../../../components/column';
-import ColumnHeader from '../../../components/column_header';
+import Column from 'mastodon/components/column';
+import { ColumnHeader } from 'mastodon/components/column_header';
+import type { Props as ColumnHeaderProps } from 'mastodon/components/column_header';
 
-interface Props {
-  multiColumn?: boolean;
-}
-
-export const ColumnLoading: React.FC<Props> = (otherProps) => (
+export const ColumnLoading: React.FC<ColumnHeaderProps> = (otherProps) => (
   <Column>
     <ColumnHeader {...otherProps} />
     <div className='scrollable' />

From ad53b0ab65cd9eba6d3078a3980c467428e79371 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 27 Jun 2024 03:16:59 -0400
Subject: [PATCH 1409/2191] Rely on built-in ruby private IP detection (#30848)

---
 Gemfile                          |  2 --
 Gemfile.lock                     |  2 --
 app/lib/private_address_check.rb | 33 ++++++++++++++++++++++++++++++++
 3 files changed, 33 insertions(+), 4 deletions(-)
 create mode 100644 app/lib/private_address_check.rb

diff --git a/Gemfile b/Gemfile
index f2d7d098d5ccbb..aa3ca8f792be40 100644
--- a/Gemfile
+++ b/Gemfile
@@ -100,8 +100,6 @@ gem 'json-ld'
 gem 'json-ld-preloaded', '~> 3.2'
 gem 'rdf-normalize', '~> 0.5'
 
-gem 'private_address_check', '~> 0.5'
-
 gem 'opentelemetry-api', '~> 1.2.5'
 
 group :opentelemetry do
diff --git a/Gemfile.lock b/Gemfile.lock
index e8b54ed5685a36..3b1b4b11211b6a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -595,7 +595,6 @@ GEM
       actionmailer (>= 3)
       net-smtp
       premailer (~> 1.7, >= 1.7.9)
-    private_address_check (0.5.0)
     propshaft (0.9.0)
       actionpack (>= 7.0.0)
       activesupport (>= 7.0.0)
@@ -994,7 +993,6 @@ DEPENDENCIES
   pg (~> 1.5)
   pghero
   premailer-rails
-  private_address_check (~> 0.5)
   propshaft
   public_suffix (~> 6.0)
   puma (~> 6.3)
diff --git a/app/lib/private_address_check.rb b/app/lib/private_address_check.rb
new file mode 100644
index 00000000000000..d00b16e66b58b0
--- /dev/null
+++ b/app/lib/private_address_check.rb
@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module PrivateAddressCheck
+  module_function
+
+  CIDR_LIST = [
+    IPAddr.new('0.0.0.0/8'),       # Current network (only valid as source address)
+    IPAddr.new('100.64.0.0/10'),   # Shared Address Space
+    IPAddr.new('172.16.0.0/12'),   # Private network
+    IPAddr.new('192.0.0.0/24'),    # IETF Protocol Assignments
+    IPAddr.new('192.0.2.0/24'),    # TEST-NET-1, documentation and examples
+    IPAddr.new('192.88.99.0/24'),  # IPv6 to IPv4 relay (includes 2002::/16)
+    IPAddr.new('198.18.0.0/15'),   # Network benchmark tests
+    IPAddr.new('198.51.100.0/24'), # TEST-NET-2, documentation and examples
+    IPAddr.new('203.0.113.0/24'),  # TEST-NET-3, documentation and examples
+    IPAddr.new('224.0.0.0/4'),     # IP multicast (former Class D network)
+    IPAddr.new('240.0.0.0/4'),     # Reserved (former Class E network)
+    IPAddr.new('255.255.255.255'), # Broadcast
+    IPAddr.new('64:ff9b::/96'),    # IPv4/IPv6 translation (RFC 6052)
+    IPAddr.new('100::/64'),        # Discard prefix (RFC 6666)
+    IPAddr.new('2001::/32'),       # Teredo tunneling
+    IPAddr.new('2001:10::/28'),    # Deprecated (previously ORCHID)
+    IPAddr.new('2001:20::/28'),    # ORCHIDv2
+    IPAddr.new('2001:db8::/32'),   # Addresses used in documentation and example source code
+    IPAddr.new('2002::/16'),       # 6to4
+    IPAddr.new('fc00::/7'),        # Unique local address
+    IPAddr.new('ff00::/8'),        # Multicast
+  ].freeze
+
+  def private_address?(address)
+    address.private? || address.loopback? || address.link_local? || CIDR_LIST.any? { |cidr| cidr.include?(address) }
+  end
+end

From f6390c3326b016e1a52057573839a5608ba317ea Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 27 Jun 2024 03:42:57 -0400
Subject: [PATCH 1410/2191] Use flatware to parallelize CI specs (#30284)

---
 .github/workflows/test-ruby.yml |  8 +++++---
 Gemfile                         |  3 +++
 Gemfile.lock                    | 10 ++++++++++
 bin/flatware                    | 27 +++++++++++++++++++++++++++
 spec/flatware_helper.rb         | 12 ++++++++++++
 5 files changed, 57 insertions(+), 3 deletions(-)
 create mode 100755 bin/flatware
 create mode 100644 spec/flatware_helper.rb

diff --git a/.github/workflows/test-ruby.yml b/.github/workflows/test-ruby.yml
index dd71fd253b575e..ef898968d0128c 100644
--- a/.github/workflows/test-ruby.yml
+++ b/.github/workflows/test-ruby.yml
@@ -132,15 +132,17 @@ jobs:
           additional-system-dependencies: ffmpeg libpam-dev
 
       - name: Load database schema
-        run: './bin/rails db:create db:schema:load db:seed'
+        run: |
+          bin/rails db:setup
+          bin/flatware fan bin/rails db:test:prepare
 
-      - run: bin/rspec
+      - run: bin/flatware rspec -r ./spec/flatware_helper.rb
 
       - name: Upload coverage reports to Codecov
         if: matrix.ruby-version == '.ruby-version'
         uses: codecov/codecov-action@v4
         with:
-          files: coverage/lcov/mastodon.lcov
+          files: coverage/lcov/*.lcov
         env:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 
diff --git a/Gemfile b/Gemfile
index aa3ca8f792be40..be3f9e6f98637c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -121,6 +121,9 @@ group :opentelemetry do
 end
 
 group :test do
+  # Enable usage of all available CPUs/cores during spec runs
+  gem 'flatware-rspec'
+
   # Adds RSpec Error/Warning annotations to GitHub PRs on the Files tab
   gem 'rspec-github', '~> 2.4', require: false
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 3b1b4b11211b6a..dd112d0189a3bb 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -264,6 +264,11 @@ GEM
     ffi-compiler (1.3.2)
       ffi (>= 1.15.5)
       rake
+    flatware (2.3.2)
+      thor (< 2.0)
+    flatware-rspec (2.3.2)
+      flatware (= 2.3.2)
+      rspec (>= 3.6)
     fog-core (2.4.0)
       builder
       excon (~> 0.71)
@@ -700,6 +705,10 @@ GEM
       chunky_png (~> 1.0)
       rqrcode_core (~> 1.0)
     rqrcode_core (1.2.0)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
     rspec-core (3.13.0)
       rspec-support (~> 3.13.0)
     rspec-expectations (3.13.1)
@@ -932,6 +941,7 @@ DEPENDENCIES
   faker (~> 3.2)
   fast_blank (~> 1.0)
   fastimage
+  flatware-rspec
   fog-core (<= 2.4.0)
   fog-openstack (~> 1.0)
   fuubar (~> 2.5)
diff --git a/bin/flatware b/bin/flatware
new file mode 100755
index 00000000000000..337ce9277e4687
--- /dev/null
+++ b/bin/flatware
@@ -0,0 +1,27 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'flatware' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
+
+bundle_binstub = File.expand_path("bundle", __dir__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300).include?("This file was generated by Bundler")
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("flatware", "flatware")
diff --git a/spec/flatware_helper.rb b/spec/flatware_helper.rb
new file mode 100644
index 00000000000000..57a7c1f56a4f8e
--- /dev/null
+++ b/spec/flatware_helper.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+if defined?(Flatware)
+  Flatware.configure do |config|
+    config.after_fork do |test_env_number|
+      unless ENV.fetch('DISABLE_SIMPLECOV', nil) == 'true'
+        require 'simplecov'
+        SimpleCov.at_fork.call(test_env_number) # Combines parallel coverage results
+      end
+    end
+  end
+end

From 6d1c1fd684d0f20691cba552b209b15d0107dfe4 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 27 Jun 2024 10:00:04 +0200
Subject: [PATCH 1411/2191] New Crowdin Translations (automated) (#30851)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/af.json      | 1 -
 app/javascript/mastodon/locales/an.json      | 3 ---
 app/javascript/mastodon/locales/ar.json      | 3 ---
 app/javascript/mastodon/locales/ast.json     | 2 --
 app/javascript/mastodon/locales/be.json      | 3 ---
 app/javascript/mastodon/locales/bg.json      | 3 ---
 app/javascript/mastodon/locales/bn.json      | 3 ---
 app/javascript/mastodon/locales/br.json      | 3 ---
 app/javascript/mastodon/locales/ca.json      | 6 +++---
 app/javascript/mastodon/locales/ckb.json     | 3 ---
 app/javascript/mastodon/locales/co.json      | 3 ---
 app/javascript/mastodon/locales/cs.json      | 3 ---
 app/javascript/mastodon/locales/cy.json      | 3 ---
 app/javascript/mastodon/locales/da.json      | 4 +---
 app/javascript/mastodon/locales/el.json      | 3 ---
 app/javascript/mastodon/locales/en-GB.json   | 3 ---
 app/javascript/mastodon/locales/eo.json      | 3 ---
 app/javascript/mastodon/locales/es-AR.json   | 2 +-
 app/javascript/mastodon/locales/es-MX.json   | 6 +++---
 app/javascript/mastodon/locales/es.json      | 6 +++---
 app/javascript/mastodon/locales/et.json      | 3 ---
 app/javascript/mastodon/locales/eu.json      | 3 ---
 app/javascript/mastodon/locales/fa.json      | 3 ---
 app/javascript/mastodon/locales/fi.json      | 2 +-
 app/javascript/mastodon/locales/fo.json      | 3 ---
 app/javascript/mastodon/locales/fr-CA.json   | 3 ---
 app/javascript/mastodon/locales/fr.json      | 3 ---
 app/javascript/mastodon/locales/fy.json      | 3 ---
 app/javascript/mastodon/locales/ga.json      | 3 ---
 app/javascript/mastodon/locales/gd.json      | 3 ---
 app/javascript/mastodon/locales/gl.json      | 3 ---
 app/javascript/mastodon/locales/he.json      | 3 ---
 app/javascript/mastodon/locales/hi.json      | 3 ---
 app/javascript/mastodon/locales/hr.json      | 3 ---
 app/javascript/mastodon/locales/hu.json      | 3 ---
 app/javascript/mastodon/locales/hy.json      | 3 ---
 app/javascript/mastodon/locales/ia.json      | 1 +
 app/javascript/mastodon/locales/id.json      | 3 ---
 app/javascript/mastodon/locales/ie.json      | 3 ---
 app/javascript/mastodon/locales/io.json      | 3 ---
 app/javascript/mastodon/locales/is.json      | 2 +-
 app/javascript/mastodon/locales/it.json      | 6 +++---
 app/javascript/mastodon/locales/ja.json      | 3 ---
 app/javascript/mastodon/locales/ka.json      | 1 -
 app/javascript/mastodon/locales/kab.json     | 3 ---
 app/javascript/mastodon/locales/kk.json      | 3 ---
 app/javascript/mastodon/locales/kn.json      | 1 -
 app/javascript/mastodon/locales/ko.json      | 3 ---
 app/javascript/mastodon/locales/ku.json      | 3 ---
 app/javascript/mastodon/locales/kw.json      | 3 ---
 app/javascript/mastodon/locales/la.json      | 3 ---
 app/javascript/mastodon/locales/lad.json     | 3 ---
 app/javascript/mastodon/locales/lt.json      | 3 ---
 app/javascript/mastodon/locales/lv.json      | 3 ---
 app/javascript/mastodon/locales/mk.json      | 1 -
 app/javascript/mastodon/locales/ml.json      | 3 ---
 app/javascript/mastodon/locales/mr.json      | 3 ---
 app/javascript/mastodon/locales/ms.json      | 3 ---
 app/javascript/mastodon/locales/my.json      | 3 ---
 app/javascript/mastodon/locales/ne.json      | 1 -
 app/javascript/mastodon/locales/nn.json      | 3 ---
 app/javascript/mastodon/locales/no.json      | 3 ---
 app/javascript/mastodon/locales/oc.json      | 3 ---
 app/javascript/mastodon/locales/pa.json      | 3 ---
 app/javascript/mastodon/locales/pl.json      | 3 ---
 app/javascript/mastodon/locales/pt-BR.json   | 3 ---
 app/javascript/mastodon/locales/pt-PT.json   | 3 ---
 app/javascript/mastodon/locales/ro.json      | 3 ---
 app/javascript/mastodon/locales/ru.json      | 3 ---
 app/javascript/mastodon/locales/sa.json      | 3 ---
 app/javascript/mastodon/locales/sc.json      | 3 ---
 app/javascript/mastodon/locales/sco.json     | 3 ---
 app/javascript/mastodon/locales/si.json      | 3 ---
 app/javascript/mastodon/locales/sk.json      | 3 ---
 app/javascript/mastodon/locales/sl.json      | 6 +++---
 app/javascript/mastodon/locales/sq.json      | 3 ---
 app/javascript/mastodon/locales/sr-Latn.json | 6 +++---
 app/javascript/mastodon/locales/sr.json      | 6 +++---
 app/javascript/mastodon/locales/sv.json      | 3 ---
 app/javascript/mastodon/locales/szl.json     | 1 -
 app/javascript/mastodon/locales/ta.json      | 3 ---
 app/javascript/mastodon/locales/tai.json     | 1 -
 app/javascript/mastodon/locales/te.json      | 1 -
 app/javascript/mastodon/locales/th.json      | 3 ---
 app/javascript/mastodon/locales/tr.json      | 6 +++---
 app/javascript/mastodon/locales/tt.json      | 3 ---
 app/javascript/mastodon/locales/ug.json      | 1 -
 app/javascript/mastodon/locales/uk.json      | 3 ---
 app/javascript/mastodon/locales/ur.json      | 3 ---
 app/javascript/mastodon/locales/uz.json      | 3 ---
 app/javascript/mastodon/locales/vi.json      | 3 ---
 app/javascript/mastodon/locales/zgh.json     | 1 -
 app/javascript/mastodon/locales/zh-CN.json   | 7 ++++---
 app/javascript/mastodon/locales/zh-HK.json   | 3 ---
 app/javascript/mastodon/locales/zh-TW.json   | 6 +++---
 config/locales/fi.yml                        | 2 +-
 config/locales/sr-Latn.yml                   | 2 +-
 config/locales/sr.yml                        | 2 +-
 config/locales/zh-TW.yml                     | 2 +-
 99 files changed, 40 insertions(+), 259 deletions(-)

diff --git a/app/javascript/mastodon/locales/af.json b/app/javascript/mastodon/locales/af.json
index e4f7f12b0edcfb..77e15eb2c669fc 100644
--- a/app/javascript/mastodon/locales/af.json
+++ b/app/javascript/mastodon/locales/af.json
@@ -50,7 +50,6 @@
   "account.requested_follow": "{name} het versoek om jou te volg",
   "account.share": "Deel @{name} se profiel",
   "account.show_reblogs": "Wys aangestuurde plasings van @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} Plaas} other {{counter} Plasings}}",
   "account.unblock": "Deblokkeer @{name}",
   "account.unblock_domain": "Deblokkeer domein {domain}",
   "account.unblock_short": "Deblokkeer",
diff --git a/app/javascript/mastodon/locales/an.json b/app/javascript/mastodon/locales/an.json
index af5f8426d07fba..752b6c3564f6ec 100644
--- a/app/javascript/mastodon/locales/an.json
+++ b/app/javascript/mastodon/locales/an.json
@@ -31,9 +31,7 @@
   "account.follow": "Seguir",
   "account.followers": "Seguidores",
   "account.followers.empty": "Encara no sigue dengún a este usuario.",
-  "account.followers_counter": "{count, plural, one {{counter} Seguidor} other {{counter} Seguidores}}",
   "account.following": "Seguindo",
-  "account.following_counter": "{count, plural, one {{counter} Following} other {{counter} Seguindo}}",
   "account.follows.empty": "Este usuario encara no sigue a dengún.",
   "account.go_to_profile": "Ir ta lo perfil",
   "account.hide_reblogs": "Amagar retutz de @{name}",
@@ -54,7 +52,6 @@
   "account.requested_follow": "{name} ha demandau seguir-te",
   "account.share": "Compartir lo perfil de @{name}",
   "account.show_reblogs": "Amostrar retutz de @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} Publicación} other {{counter} Publicaciones}}",
   "account.unblock": "Desblocar a @{name}",
   "account.unblock_domain": "Amostrar a {domain}",
   "account.unblock_short": "Desblocar",
diff --git a/app/javascript/mastodon/locales/ar.json b/app/javascript/mastodon/locales/ar.json
index b5ce0ae861f6d1..a9e1bdb270ebad 100644
--- a/app/javascript/mastodon/locales/ar.json
+++ b/app/javascript/mastodon/locales/ar.json
@@ -35,9 +35,7 @@
   "account.follow_back": "رد المتابعة",
   "account.followers": "مُتابِعون",
   "account.followers.empty": "لا أحدَ يُتابع هذا المُستخدم إلى حد الآن.",
-  "account.followers_counter": "{count, plural, zero{لا مُتابع} one {مُتابعٌ واحِد} two {مُتابعانِ اِثنان} few {{counter} مُتابِعين} many {{counter} مُتابِعًا} other {{counter} مُتابع}}",
   "account.following": "الاشتراكات",
-  "account.following_counter": "{count, plural, zero{لا يُتابِع أحدًا} one {يُتابِعُ واحد} two{يُتابِعُ اِثنان} few{يُتابِعُ {counter}} many{يُتابِعُ {counter}} other {يُتابِعُ {counter}}}",
   "account.follows.empty": "لا يُتابع هذا المُستخدمُ أيَّ أحدٍ حتى الآن.",
   "account.go_to_profile": "اذهب إلى الملف الشخصي",
   "account.hide_reblogs": "إخفاء المعاد نشرها مِن @{name}",
@@ -63,7 +61,6 @@
   "account.requested_follow": "لقد طلب {name} متابعتك",
   "account.share": "شارِك الملف التعريفي لـ @{name}",
   "account.show_reblogs": "اعرض إعادات نشر @{name}",
-  "account.statuses_counter": "{count, plural, zero {لَا منشورات} one {منشور واحد} two {منشوران إثنان} few {{counter} منشورات} many {{counter} منشورًا} other {{counter} منشور}}",
   "account.unblock": "إلغاء الحَظر عن @{name}",
   "account.unblock_domain": "إلغاء الحَظر عن النِّطاق {domain}",
   "account.unblock_short": "ألغ الحجب",
diff --git a/app/javascript/mastodon/locales/ast.json b/app/javascript/mastodon/locales/ast.json
index 80e0aa6cbf9734..3f32a8bf158e04 100644
--- a/app/javascript/mastodon/locales/ast.json
+++ b/app/javascript/mastodon/locales/ast.json
@@ -32,7 +32,6 @@
   "account.followers": "Siguidores",
   "account.followers.empty": "Naide sigue a esti perfil.",
   "account.following": "Siguiendo",
-  "account.following_counter": "{count, plural,one {Sigue a {counter}} other {Sigue a {counter}}}",
   "account.follows.empty": "Esti perfil nun sigue a naide.",
   "account.go_to_profile": "Dir al perfil",
   "account.hide_reblogs": "Anubrir los artículos compartíos de @{name}",
@@ -49,7 +48,6 @@
   "account.report": "Informar de: @{name}",
   "account.requested_follow": "{name} solicitó siguite",
   "account.show_reblogs": "Amosar los artículos compartíos de @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} artículu} other {{counter} artículos}}",
   "account.unblock": "Desbloquiar a @{name}",
   "account.unblock_domain": "Desbloquiar el dominiu «{domain}»",
   "account.unblock_short": "Desbloquiar",
diff --git a/app/javascript/mastodon/locales/be.json b/app/javascript/mastodon/locales/be.json
index 03164c4290f550..643725270c729a 100644
--- a/app/javascript/mastodon/locales/be.json
+++ b/app/javascript/mastodon/locales/be.json
@@ -35,9 +35,7 @@
   "account.follow_back": "Падпісацца ў адказ",
   "account.followers": "Падпісчыкі",
   "account.followers.empty": "Ніхто пакуль не падпісаны на гэтага карыстальніка.",
-  "account.followers_counter": "{count, plural, one {{counter} падпісчык} few {{counter} падпісчыкі} many {{counter} падпісчыкаў} other {{counter} падпісчыка}}",
   "account.following": "Падпіскі",
-  "account.following_counter": "{count, plural, one {{counter} падпіска} few {{counter} падпіскі} many {{counter} падпісак} other {{counter} падпіскі}}",
   "account.follows.empty": "Карыстальнік ні на каго не падпісаны.",
   "account.go_to_profile": "Перайсці да профілю",
   "account.hide_reblogs": "Схаваць пашырэнні ад @{name}",
@@ -63,7 +61,6 @@
   "account.requested_follow": "{name} адправіў запыт на падпіску",
   "account.share": "Абагуліць профіль @{name}",
   "account.show_reblogs": "Паказаць падштурхоўванні ад @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} допіс} few {{counter} допісы} many {{counter} допісаў} other {{counter} допісу}}",
   "account.unblock": "Разблакіраваць @{name}",
   "account.unblock_domain": "Разблакіраваць дамен {domain}",
   "account.unblock_short": "Разблакіраваць",
diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json
index 98e84c45d75351..323890ba2efe8a 100644
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@@ -35,9 +35,7 @@
   "account.follow_back": "Последване взаимно",
   "account.followers": "Последователи",
   "account.followers.empty": "Още никой не следва потребителя.",
-  "account.followers_counter": "{count, plural, one {{counter} последовател} other {{counter} последователи}}",
   "account.following": "Последвано",
-  "account.following_counter": "{count, plural, one {{counter} последван} other {{counter} последвани}}",
   "account.follows.empty": "Потребителят още никого не следва.",
   "account.go_to_profile": "Към профила",
   "account.hide_reblogs": "Скриване на подсилвания от @{name}",
@@ -63,7 +61,6 @@
   "account.requested_follow": "{name} поиска да ви последва",
   "account.share": "Споделяне на профила на @{name}",
   "account.show_reblogs": "Показване на подсилвания от @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} публикация} other {{counter} публикации}}",
   "account.unblock": "Отблокиране на @{name}",
   "account.unblock_domain": "Отблокиране на домейн {domain}",
   "account.unblock_short": "Отблокиране",
diff --git a/app/javascript/mastodon/locales/bn.json b/app/javascript/mastodon/locales/bn.json
index 4c4138bcf125e5..a203c43f034e24 100644
--- a/app/javascript/mastodon/locales/bn.json
+++ b/app/javascript/mastodon/locales/bn.json
@@ -33,9 +33,7 @@
   "account.follow": "অনুসরণ",
   "account.followers": "অনুসরণকারী",
   "account.followers.empty": "এই ব্যক্তিকে এখনো কেউ অনুসরণ করে না.",
-  "account.followers_counter": "{count, plural,one {{counter} জন অনুসরণকারী } other {{counter} জন অনুসরণকারী}}",
   "account.following": "অনুসরণ করা হচ্ছে",
-  "account.following_counter": "{count, plural,one {{counter} জনকে অনুসরণ} other {{counter} জনকে অনুসরণ}}",
   "account.follows.empty": "এই সদস্য কাউকে এখনো ফলো করেন না.",
   "account.go_to_profile": "প্রোফাইলে যান",
   "account.hide_reblogs": "@{name}'র সমর্থনগুলি লুকিয়ে ফেলুন",
@@ -60,7 +58,6 @@
   "account.requested_follow": "{name} আপনাকে অনুসরণ করার জন্য অনুরোধ করেছে",
   "account.share": "@{name} র প্রোফাইল অন্যদের দেখান",
   "account.show_reblogs": "@{name} র সমর্থনগুলো দেখান",
-  "account.statuses_counter": "{count, plural,one {{counter} টুট} other {{counter} টুট}}",
   "account.unblock": "@{name} র কার্যকলাপ দেখুন",
   "account.unblock_domain": "{domain} কে আবার দেখুন",
   "account.unblock_short": "আনব্লক করুন",
diff --git a/app/javascript/mastodon/locales/br.json b/app/javascript/mastodon/locales/br.json
index 7cd49ba59d8cdd..c919d2e9deab45 100644
--- a/app/javascript/mastodon/locales/br.json
+++ b/app/javascript/mastodon/locales/br.json
@@ -35,9 +35,7 @@
   "account.follow_back": "Heuliañ d'ho tro",
   "account.followers": "Tud koumanantet",
   "account.followers.empty": "Den na heul an implijer·ez-mañ c'hoazh.",
-  "account.followers_counter": "{count, plural, other{{counter} Heulier·ez}}",
   "account.following": "Koumanantoù",
-  "account.following_counter": "{count, plural, one{{counter} C'houmanant} two{{counter} Goumanant} other {{counter} a Goumanant}}",
   "account.follows.empty": "An implijer·ez-mañ na heul den ebet.",
   "account.go_to_profile": "Gwelet ar profil",
   "account.hide_reblogs": "Kuzh skignadennoù gant @{name}",
@@ -62,7 +60,6 @@
   "account.requested_follow": "Gant {name} eo bet goulennet ho heuliañ",
   "account.share": "Skignañ profil @{name}",
   "account.show_reblogs": "Diskouez skignadennoù @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} C'hannad} two {{counter} Gannad} other {{counter} a Gannadoù}}",
   "account.unblock": "Diverzañ @{name}",
   "account.unblock_domain": "Diverzañ an domani {domain}",
   "account.unblock_short": "Distankañ",
diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index 88dd34aff04006..3123e29d8d26e1 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -35,9 +35,9 @@
   "account.follow_back": "Segueix tu també",
   "account.followers": "Seguidors",
   "account.followers.empty": "A aquest usuari encara no el segueix ningú.",
-  "account.followers_counter": "{count, plural, one {{counter} seguidor} other {{counter} Seguidors}}",
+  "account.followers_counter": "{count, plural, one {{counter} seguidor} other {{counter} seguidors}}",
   "account.following": "Seguint",
-  "account.following_counter": "{count, plural, other {{counter} Seguint-ne}}",
+  "account.following_counter": "{count, plural, other {Seguint-ne {counter}}}",
   "account.follows.empty": "Aquest usuari encara no segueix ningú.",
   "account.go_to_profile": "Vés al perfil",
   "account.hide_reblogs": "Amaga els impulsos de @{name}",
@@ -63,7 +63,7 @@
   "account.requested_follow": "{name} ha demanat de seguir-te",
   "account.share": "Comparteix el perfil de @{name}",
   "account.show_reblogs": "Mostra els impulsos de @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} Tut} other {{counter} Tuts}}",
+  "account.statuses_counter": "{count, plural, one {{counter} publicació} other {{counter} publicacions}}",
   "account.unblock": "Desbloca @{name}",
   "account.unblock_domain": "Desbloca el domini {domain}",
   "account.unblock_short": "Desbloca",
diff --git a/app/javascript/mastodon/locales/ckb.json b/app/javascript/mastodon/locales/ckb.json
index c212b53a8b2ad2..3ebf9391d2e9aa 100644
--- a/app/javascript/mastodon/locales/ckb.json
+++ b/app/javascript/mastodon/locales/ckb.json
@@ -35,9 +35,7 @@
   "account.follow_back": "فۆڵۆو بکەنەوە",
   "account.followers": "شوێنکەوتووان",
   "account.followers.empty": "کەسێک شوێن ئەم بەکارهێنەرە نەکەوتووە",
-  "account.followers_counter": "{count, plural, one {{counter} شوێنکەوتوو} other {{counter} شوێنکەوتوو}}",
   "account.following": "بەدوادا",
-  "account.following_counter": "{count, plural, one {{counter} شوێنکەوتوو} other {{counter} شوێنکەوتوو}}",
   "account.follows.empty": "ئەم بەکارهێنەرە تا ئێستا شوێن کەس نەکەوتووە.",
   "account.go_to_profile": "بڕۆ بۆ پڕۆفایلی",
   "account.hide_reblogs": "داشاردنی بووستەکان لە @{name}",
@@ -63,7 +61,6 @@
   "account.requested_follow": "{name} داوای کردووە شوێنت بکەوێت",
   "account.share": "پرۆفایلی @{name} هاوبەش بکە",
   "account.show_reblogs": "پیشاندانی بەرزکردنەوەکان لە @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} Following} other {{counter} Following}}",
   "account.unblock": "@{name} لاببە",
   "account.unblock_domain": "کردنەوەی دۆمەینی {domain}",
   "account.unblock_short": "لابردنی بەربەست",
diff --git a/app/javascript/mastodon/locales/co.json b/app/javascript/mastodon/locales/co.json
index be4cce2692aaa6..78f8e6fd786eb3 100644
--- a/app/javascript/mastodon/locales/co.json
+++ b/app/javascript/mastodon/locales/co.json
@@ -16,8 +16,6 @@
   "account.follow": "Siguità",
   "account.followers": "Abbunati",
   "account.followers.empty": "Nisunu hè abbunatu à st'utilizatore.",
-  "account.followers_counter": "{count, plural, one {{counter} Abbunatu} other {{counter} Abbunati}}",
-  "account.following_counter": "{count, plural, one {{counter} Abbunamentu} other {{counter} Abbunamenti}}",
   "account.follows.empty": "St'utilizatore ùn seguita nisunu.",
   "account.hide_reblogs": "Piattà spartere da @{name}",
   "account.link_verified_on": "A prupietà di stu ligame hè stata verificata u {date}",
@@ -32,7 +30,6 @@
   "account.requested": "In attesa d'apprubazione. Cliccate per annullà a dumanda",
   "account.share": "Sparte u prufile di @{name}",
   "account.show_reblogs": "Vede spartere da @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} Statutu} other {{counter} Statuti}}",
   "account.unblock": "Sbluccà @{name}",
   "account.unblock_domain": "Ùn piattà più {domain}",
   "account.unendorse": "Ùn fà figurà nant'à u prufilu",
diff --git a/app/javascript/mastodon/locales/cs.json b/app/javascript/mastodon/locales/cs.json
index d8d83ae5fad7bf..66aa1fe0a95907 100644
--- a/app/javascript/mastodon/locales/cs.json
+++ b/app/javascript/mastodon/locales/cs.json
@@ -35,9 +35,7 @@
   "account.follow_back": "Také sledovat",
   "account.followers": "Sledující",
   "account.followers.empty": "Tohoto uživatele zatím nikdo nesleduje.",
-  "account.followers_counter": "{count, plural, one {{counter} Sledující} few {{counter} Sledující} many {{counter} Sledujících} other {{counter} Sledujících}}",
   "account.following": "Sledujete",
-  "account.following_counter": "{count, plural, one {{counter} Sledovaný} few {{counter} Sledovaní} many {{counter} Sledovaných} other {{counter} Sledovaných}}",
   "account.follows.empty": "Tento uživatel zatím nikoho nesleduje.",
   "account.go_to_profile": "Přejít na profil",
   "account.hide_reblogs": "Skrýt boosty od @{name}",
@@ -63,7 +61,6 @@
   "account.requested_follow": "{name} tě požádal o sledování",
   "account.share": "Sdílet profil @{name}",
   "account.show_reblogs": "Zobrazit boosty od @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} Příspěvek} few {{counter} Příspěvky} many {{counter} Příspěvků} other {{counter} Příspěvků}}",
   "account.unblock": "Odblokovat @{name}",
   "account.unblock_domain": "Odblokovat doménu {domain}",
   "account.unblock_short": "Odblokovat",
diff --git a/app/javascript/mastodon/locales/cy.json b/app/javascript/mastodon/locales/cy.json
index 96476b14331eb5..1c7e61832c1f29 100644
--- a/app/javascript/mastodon/locales/cy.json
+++ b/app/javascript/mastodon/locales/cy.json
@@ -35,9 +35,7 @@
   "account.follow_back": "Dilyn yn ôl",
   "account.followers": "Dilynwyr",
   "account.followers.empty": "Does neb yn dilyn y defnyddiwr hwn eto.",
-  "account.followers_counter": "{count, plural, one {Dilynwr: {counter}} other {Dilynwyr: {counter}}}",
   "account.following": "Yn dilyn",
-  "account.following_counter": "{count, plural, one {Yn dilyn: {counter}} other {Yn dilyn: {counter}}}",
   "account.follows.empty": "Nid yw'r defnyddiwr hwn yn dilyn unrhyw un eto.",
   "account.go_to_profile": "Mynd i'r proffil",
   "account.hide_reblogs": "Cuddio hybiau gan @{name}",
@@ -63,7 +61,6 @@
   "account.requested_follow": "Mae {name} wedi gwneud cais i'ch dilyn",
   "account.share": "Rhannwch broffil @{name}",
   "account.show_reblogs": "Dangos hybiau gan @{name}",
-  "account.statuses_counter": "{count, plural, one {Postiad: {counter}} other {Postiad: {counter}}}",
   "account.unblock": "Dadflocio @{name}",
   "account.unblock_domain": "Dadflocio parth {domain}",
   "account.unblock_short": "Dadflocio",
diff --git a/app/javascript/mastodon/locales/da.json b/app/javascript/mastodon/locales/da.json
index 5ac7128a375eac..d8c178d295ea4f 100644
--- a/app/javascript/mastodon/locales/da.json
+++ b/app/javascript/mastodon/locales/da.json
@@ -35,9 +35,8 @@
   "account.follow_back": "Følg tilbage",
   "account.followers": "Følgere",
   "account.followers.empty": "Ingen følger denne bruger endnu.",
-  "account.followers_counter": "{count, plural, one {{counter} Følger} other {{counter} Følgere}}",
+  "account.followers_counter": "{count, plural, one {{counter} følger} other {{counter} følgere}}",
   "account.following": "Følger",
-  "account.following_counter": "{count, plural, one {{counter} Følges} other {{counter} Følges}}",
   "account.follows.empty": "Denne bruger følger ikke nogen endnu.",
   "account.go_to_profile": "Gå til profil",
   "account.hide_reblogs": "Skjul boosts fra @{name}",
@@ -63,7 +62,6 @@
   "account.requested_follow": "{name} har anmodet om at følge dig",
   "account.share": "Del @{name}s profil",
   "account.show_reblogs": "Vis fremhævelser fra @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} Indlæg} other {{counter} Indlæg}}",
   "account.unblock": "Afblokér @{name}",
   "account.unblock_domain": "Afblokér domænet {domain}",
   "account.unblock_short": "Afblokér",
diff --git a/app/javascript/mastodon/locales/el.json b/app/javascript/mastodon/locales/el.json
index 47a8df62001c61..5442624b36881a 100644
--- a/app/javascript/mastodon/locales/el.json
+++ b/app/javascript/mastodon/locales/el.json
@@ -35,9 +35,7 @@
   "account.follow_back": "Ακολούθησε και εσύ",
   "account.followers": "Ακόλουθοι",
   "account.followers.empty": "Κανείς δεν ακολουθεί αυτόν τον χρήστη ακόμα.",
-  "account.followers_counter": "{count, plural, one {{counter} Ακόλουθος} other {{counter} Ακόλουθοι}}",
   "account.following": "Ακολουθείτε",
-  "account.following_counter": "{count, plural, one {{counter} Ακολουθεί} other {{counter} Ακολουθούν}}",
   "account.follows.empty": "Αυτός ο χρήστης δεν ακολουθεί κανέναν ακόμα.",
   "account.go_to_profile": "Μετάβαση στο προφίλ",
   "account.hide_reblogs": "Απόκρυψη ενισχύσεων από @{name}",
@@ -63,7 +61,6 @@
   "account.requested_follow": "Ο/Η {name} αιτήθηκε να σε ακολουθήσει",
   "account.share": "Κοινοποίηση του προφίλ @{name}",
   "account.show_reblogs": "Εμφάνιση ενισχύσεων από @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} Ανάρτηση} other {{counter} Αναρτήσεις}}",
   "account.unblock": "Άρση αποκλεισμού @{name}",
   "account.unblock_domain": "Άρση αποκλεισμού του τομέα {domain}",
   "account.unblock_short": "Άρση αποκλεισμού",
diff --git a/app/javascript/mastodon/locales/en-GB.json b/app/javascript/mastodon/locales/en-GB.json
index 108880cc97f961..c4f401d86d3609 100644
--- a/app/javascript/mastodon/locales/en-GB.json
+++ b/app/javascript/mastodon/locales/en-GB.json
@@ -35,9 +35,7 @@
   "account.follow_back": "Follow back",
   "account.followers": "Followers",
   "account.followers.empty": "No one follows this user yet.",
-  "account.followers_counter": "{count, plural, one {{counter} Follower} other {{counter} Followers}}",
   "account.following": "Following",
-  "account.following_counter": "{count, plural, one {{counter} Following} other {{counter} Following}}",
   "account.follows.empty": "This user doesn't follow anyone yet.",
   "account.go_to_profile": "Go to profile",
   "account.hide_reblogs": "Hide boosts from @{name}",
@@ -63,7 +61,6 @@
   "account.requested_follow": "{name} has requested to follow you",
   "account.share": "Share @{name}'s profile",
   "account.show_reblogs": "Show boosts from @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} Post} other {{counter} Posts}}",
   "account.unblock": "Unblock @{name}",
   "account.unblock_domain": "Unblock domain {domain}",
   "account.unblock_short": "Unblock",
diff --git a/app/javascript/mastodon/locales/eo.json b/app/javascript/mastodon/locales/eo.json
index bab277b483221f..e7cfc03468140e 100644
--- a/app/javascript/mastodon/locales/eo.json
+++ b/app/javascript/mastodon/locales/eo.json
@@ -35,9 +35,7 @@
   "account.follow_back": "Sekvu reen",
   "account.followers": "Sekvantoj",
   "account.followers.empty": "Ankoraŭ neniu sekvas ĉi tiun uzanton.",
-  "account.followers_counter": "{count, plural, one{{counter} Sekvanto} other {{counter} Sekvantoj}}",
   "account.following": "Sekvatoj",
-  "account.following_counter": "{count, plural, one {{counter} Sekvato} other {{counter} Sekvatoj}}",
   "account.follows.empty": "La uzanto ankoraŭ ne sekvas iun ajn.",
   "account.go_to_profile": "Iri al profilo",
   "account.hide_reblogs": "Kaŝi diskonigojn de @{name}",
@@ -63,7 +61,6 @@
   "account.requested_follow": "{name} petis sekvi vin",
   "account.share": "Diskonigi la profilon de @{name}",
   "account.show_reblogs": "Montri diskonigojn de @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} Afiŝo} other {{counter} Afiŝoj}}",
   "account.unblock": "Malbloki @{name}",
   "account.unblock_domain": "Malbloki la domajnon {domain}",
   "account.unblock_short": "Malbloki",
diff --git a/app/javascript/mastodon/locales/es-AR.json b/app/javascript/mastodon/locales/es-AR.json
index 7da39b88ccf151..28e8de92374547 100644
--- a/app/javascript/mastodon/locales/es-AR.json
+++ b/app/javascript/mastodon/locales/es-AR.json
@@ -37,7 +37,7 @@
   "account.followers.empty": "Todavía nadie sigue a este usuario.",
   "account.followers_counter": "{count, plural, one {{counter} seguidor} other {{counter} seguidores}}",
   "account.following": "Siguiendo",
-  "account.following_counter": "{count, plural, other {Siguiendo a {counter}}}",
+  "account.following_counter": "{count, plural, one {siguiendo a {counter}} other {siguiendo a {counter}}}",
   "account.follows.empty": "Todavía este usuario no sigue a nadie.",
   "account.go_to_profile": "Ir al perfil",
   "account.hide_reblogs": "Ocultar adhesiones de @{name}",
diff --git a/app/javascript/mastodon/locales/es-MX.json b/app/javascript/mastodon/locales/es-MX.json
index d3e02cd6e11af4..c10a1610155fa3 100644
--- a/app/javascript/mastodon/locales/es-MX.json
+++ b/app/javascript/mastodon/locales/es-MX.json
@@ -35,9 +35,9 @@
   "account.follow_back": "Seguir también",
   "account.followers": "Seguidores",
   "account.followers.empty": "Todavía nadie sigue a este usuario.",
-  "account.followers_counter": "{count, plural, one {{counter} Seguidor} other {{counter} Seguidores}}",
+  "account.followers_counter": "{count, plural, one {{counter} seguidor} other {{counter} seguidores}}",
   "account.following": "Siguiendo",
-  "account.following_counter": "{count, plural, other {{counter} Siguiendo}}",
+  "account.following_counter": "{count, plural, one {{counter} siguiendo} other {{counter} siguiendo}}",
   "account.follows.empty": "Este usuario todavía no sigue a nadie.",
   "account.go_to_profile": "Ir al perfil",
   "account.hide_reblogs": "Ocultar retoots de @{name}",
@@ -63,7 +63,7 @@
   "account.requested_follow": "{name} ha solicitado seguirte",
   "account.share": "Compartir el perfil de @{name}",
   "account.show_reblogs": "Mostrar retoots de @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
+  "account.statuses_counter": "{count, plural, one {{counter} publicación} other {{counter} publicaciones}}",
   "account.unblock": "Desbloquear a @{name}",
   "account.unblock_domain": "Mostrar a {domain}",
   "account.unblock_short": "Desbloquear",
diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json
index 849e0fa27f175c..259fc1795b373a 100644
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@@ -35,9 +35,9 @@
   "account.follow_back": "Seguir también",
   "account.followers": "Seguidores",
   "account.followers.empty": "Todavía nadie sigue a este usuario.",
-  "account.followers_counter": "{count, plural, one {{counter} Seguidor} other {{counter} Seguidores}}",
+  "account.followers_counter": "{count, plural, one {{counter} seguidor} other {{counter} seguidores}}",
   "account.following": "Siguiendo",
-  "account.following_counter": "{count, plural, other {Siguiendo a {counter}}}",
+  "account.following_counter": "{count, plural, one {{counter} siguiendo} other {{counter} siguiendo}}",
   "account.follows.empty": "Este usuario todavía no sigue a nadie.",
   "account.go_to_profile": "Ir al perfil",
   "account.hide_reblogs": "Ocultar impulsos de @{name}",
@@ -63,7 +63,7 @@
   "account.requested_follow": "{name} ha solicitado seguirte",
   "account.share": "Compartir el perfil de @{name}",
   "account.show_reblogs": "Mostrar impulsos de @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} Publicación} other {{counter} Publicaciones}}",
+  "account.statuses_counter": "{count, plural, one {{counter} publicación} other {{counter} publicaciones}}",
   "account.unblock": "Desbloquear a @{name}",
   "account.unblock_domain": "Desbloquear dominio {domain}",
   "account.unblock_short": "Desbloquear",
diff --git a/app/javascript/mastodon/locales/et.json b/app/javascript/mastodon/locales/et.json
index 547a0fe61fb938..94f5ef5d9eef52 100644
--- a/app/javascript/mastodon/locales/et.json
+++ b/app/javascript/mastodon/locales/et.json
@@ -35,9 +35,7 @@
   "account.follow_back": "Jälgi vastu",
   "account.followers": "Jälgijad",
   "account.followers.empty": "Keegi ei jälgi veel seda kasutajat.",
-  "account.followers_counter": "{count, plural, one {{counter} jälgija} other {{counter} jälgijat}}",
   "account.following": "Jälgib",
-  "account.following_counter": "{count, plural, one {{counter} jälgitav} other {{counter} jälgitavat}}",
   "account.follows.empty": "See kasutaja ei jälgi veel kedagi.",
   "account.go_to_profile": "Mine profiilile",
   "account.hide_reblogs": "Peida @{name} jagamised",
@@ -63,7 +61,6 @@
   "account.requested_follow": "{name} on taodelnud sinu jälgimist",
   "account.share": "Jaga @{name} profiili",
   "account.show_reblogs": "Näita @{name} jagamisi",
-  "account.statuses_counter": "{count, plural, one {{counter} postitus} other {{counter} postitust}}",
   "account.unblock": "Eemalda blokeering @{name}",
   "account.unblock_domain": "Tee {domain} nähtavaks",
   "account.unblock_short": "Eemalda blokeering",
diff --git a/app/javascript/mastodon/locales/eu.json b/app/javascript/mastodon/locales/eu.json
index 5fbac270cf8cdb..97c4250d225b23 100644
--- a/app/javascript/mastodon/locales/eu.json
+++ b/app/javascript/mastodon/locales/eu.json
@@ -35,9 +35,7 @@
   "account.follow_back": "Jarraitu bueltan",
   "account.followers": "Jarraitzaileak",
   "account.followers.empty": "Ez du inork erabiltzaile hau jarraitzen oraindik.",
-  "account.followers_counter": "{count, plural, one {Jarraitzaile {counter}} other {{counter} jarraitzaile}}",
   "account.following": "Jarraitzen",
-  "account.following_counter": "{count, plural, one {{counter} jarraitzen} other {{counter} jarraitzen}}",
   "account.follows.empty": "Erabiltzaile honek ez du inor jarraitzen oraindik.",
   "account.go_to_profile": "Joan profilera",
   "account.hide_reblogs": "Ezkutatu @{name} erabiltzailearen bultzadak",
@@ -63,7 +61,6 @@
   "account.requested_follow": "{name}-(e)k zu jarraitzeko eskaera egin du",
   "account.share": "Partekatu @{name} erabiltzailearen profila",
   "account.show_reblogs": "Erakutsi @{name} erabiltzailearen bultzadak",
-  "account.statuses_counter": "{count, plural, one {Bidalketa {counter}} other {{counter} bidalketa}}",
   "account.unblock": "Desblokeatu @{name}",
   "account.unblock_domain": "Berriz erakutsi {domain}",
   "account.unblock_short": "Desblokeatu",
diff --git a/app/javascript/mastodon/locales/fa.json b/app/javascript/mastodon/locales/fa.json
index 072a67421ae0e6..18f6466d4873fc 100644
--- a/app/javascript/mastodon/locales/fa.json
+++ b/app/javascript/mastodon/locales/fa.json
@@ -35,9 +35,7 @@
   "account.follow_back": "دنبال کردن متقابل",
   "account.followers": "پی‌گیرندگان",
   "account.followers.empty": "هنوز کسی پی‌گیر این کاربر نیست.",
-  "account.followers_counter": "{count, plural, one {{counter} پی‌گیرنده} other {{counter} پی‌گیرنده}}",
   "account.following": "پی می‌گیرید",
-  "account.following_counter": "{count, plural, one {{counter} پی‌گرفته} other {{counter} پی‌گرفته}}",
   "account.follows.empty": "این کاربر هنوز پی‌گیر کسی نیست.",
   "account.go_to_profile": "رفتن به نمایه",
   "account.hide_reblogs": "نهفتن تقویت‌های ‎@{name}",
@@ -63,7 +61,6 @@
   "account.requested_follow": "{name} درخواست پی‌گیریتان را داد",
   "account.share": "هم‌رسانی نمایهٔ ‎@{name}",
   "account.show_reblogs": "نمایش تقویت‌های ‎@{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} فرسته} other {{counter} فرسته}}",
   "account.unblock": "رفع مسدودیت ‎@{name}",
   "account.unblock_domain": "رفع مسدودیت دامنهٔ {domain}",
   "account.unblock_short": "رفع مسدودیت",
diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index 67e2b72b869fb5..0767dd5e37cf63 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -699,7 +699,7 @@
   "server_banner.is_one_of_many": "{domain} on yksi monista itsenäisistä Mastodon-palvelimista, joiden välityksellä voit toimia fediversumissa.",
   "server_banner.server_stats": "Palvelimen tilastot:",
   "sign_in_banner.create_account": "Luo tili",
-  "sign_in_banner.follow_anyone": "Seuraa kenen tahansa julkaisuja fediversumissa ja näe ne kaikki aikajärjestyksessä. Ei algoritmejä, mainoksia tai klikkikalastelua.",
+  "sign_in_banner.follow_anyone": "Seuraa kenen tahansa julkaisuja fediversumissa ja näe ne kaikki aikajärjestyksessä. Ei algoritmeja, mainoksia tai klikkausten kalastelua.",
   "sign_in_banner.mastodon_is": "Mastodon on paras tapa pysyä ajan tasalla siitä, mitä ympärillä tapahtuu.",
   "sign_in_banner.sign_in": "Kirjaudu",
   "sign_in_banner.sso_redirect": "Kirjaudu tai rekisteröidy",
diff --git a/app/javascript/mastodon/locales/fo.json b/app/javascript/mastodon/locales/fo.json
index 7a317820bbf4a2..e7786f388dfc4d 100644
--- a/app/javascript/mastodon/locales/fo.json
+++ b/app/javascript/mastodon/locales/fo.json
@@ -35,9 +35,7 @@
   "account.follow_back": "Fylg aftur",
   "account.followers": "Fylgjarar",
   "account.followers.empty": "Ongar fylgjarar enn.",
-  "account.followers_counter": "{count, plural, one {{counter} Fylgjari} other {{counter} Fylgjarar}}",
   "account.following": "Fylgir",
-  "account.following_counter": "{count, plural, one {{counter} fylgir} other {{counter} fylgja}}",
   "account.follows.empty": "Hesin brúkari fylgir ongum enn.",
   "account.go_to_profile": "Far til vanga",
   "account.hide_reblogs": "Fjal lyft frá @{name}",
@@ -63,7 +61,6 @@
   "account.requested_follow": "{name} hevur biðið um at fylgja tær",
   "account.share": "Deil vanga @{name}'s",
   "account.show_reblogs": "Vís lyft frá @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} postur} other {{counter} postar}}",
   "account.unblock": "Banna ikki @{name}",
   "account.unblock_domain": "Banna ikki økisnavnið {domain}",
   "account.unblock_short": "Banna ikki",
diff --git a/app/javascript/mastodon/locales/fr-CA.json b/app/javascript/mastodon/locales/fr-CA.json
index 50b7dcf90dc8a8..4324855003fda2 100644
--- a/app/javascript/mastodon/locales/fr-CA.json
+++ b/app/javascript/mastodon/locales/fr-CA.json
@@ -35,9 +35,7 @@
   "account.follow_back": "S'abonner en retour",
   "account.followers": "abonné·e·s",
   "account.followers.empty": "Personne ne suit ce compte pour l'instant.",
-  "account.followers_counter": "{count, plural, one {{counter} Abonné·e} other {{counter} Abonné·e·s}}",
   "account.following": "Abonné·e",
-  "account.following_counter": "{count, plural, one {{counter} Abonnement} other {{counter} Abonnements}}",
   "account.follows.empty": "Ce compte ne suit personne présentement.",
   "account.go_to_profile": "Voir ce profil",
   "account.hide_reblogs": "Masquer les boosts de @{name}",
@@ -63,7 +61,6 @@
   "account.requested_follow": "{name} a demandé à vous suivre",
   "account.share": "Partager le profil de @{name}",
   "account.show_reblogs": "Afficher les boosts de @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} Publication} other {{counter} Publications}}",
   "account.unblock": "Débloquer @{name}",
   "account.unblock_domain": "Débloquer le domaine {domain}",
   "account.unblock_short": "Débloquer",
diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json
index 2e565c200f5205..cd67cda539a06a 100644
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@@ -35,9 +35,7 @@
   "account.follow_back": "S'abonner en retour",
   "account.followers": "Abonné·e·s",
   "account.followers.empty": "Personne ne suit cet·te utilisateur·rice pour l’instant.",
-  "account.followers_counter": "{count, plural, one {{counter} Abonné·e} other {{counter} Abonné·e·s}}",
   "account.following": "Abonnements",
-  "account.following_counter": "{count, plural, one {{counter} Abonnement} other {{counter} Abonnements}}",
   "account.follows.empty": "Cet·te utilisateur·rice ne suit personne pour l’instant.",
   "account.go_to_profile": "Aller au profil",
   "account.hide_reblogs": "Masquer les partages de @{name}",
@@ -63,7 +61,6 @@
   "account.requested_follow": "{name} a demandé à vous suivre",
   "account.share": "Partager le profil de @{name}",
   "account.show_reblogs": "Afficher les partages de @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} Message} other {{counter} Messages}}",
   "account.unblock": "Débloquer @{name}",
   "account.unblock_domain": "Débloquer le domaine {domain}",
   "account.unblock_short": "Débloquer",
diff --git a/app/javascript/mastodon/locales/fy.json b/app/javascript/mastodon/locales/fy.json
index 11b11ff819fb6d..d787c16bf3b729 100644
--- a/app/javascript/mastodon/locales/fy.json
+++ b/app/javascript/mastodon/locales/fy.json
@@ -35,9 +35,7 @@
   "account.follow_back": "Weromfolgje",
   "account.followers": "Folgers",
   "account.followers.empty": "Noch net ien folget dizze brûker.",
-  "account.followers_counter": "{count, plural, one {{counter} folger} other {{counter} folgers}}",
   "account.following": "Folgjend",
-  "account.following_counter": "{count, plural, one {{counter} folgjend} other {{counter} folgjend}}",
   "account.follows.empty": "Dizze brûker folget noch net ien.",
   "account.go_to_profile": "Gean nei profyl",
   "account.hide_reblogs": "Boosts fan @{name} ferstopje",
@@ -63,7 +61,6 @@
   "account.requested_follow": "{name} hat dy in folchfersyk stjoerd",
   "account.share": "Profyl fan @{name} diele",
   "account.show_reblogs": "Boosts fan @{name} toane",
-  "account.statuses_counter": "{count, plural, one {{counter} berjocht} other {{counter} berjochten}}",
   "account.unblock": "@{name} deblokkearje",
   "account.unblock_domain": "Domein {domain} deblokkearje",
   "account.unblock_short": "Deblokkearje",
diff --git a/app/javascript/mastodon/locales/ga.json b/app/javascript/mastodon/locales/ga.json
index 97dcc752b8c18b..edf7618148ecff 100644
--- a/app/javascript/mastodon/locales/ga.json
+++ b/app/javascript/mastodon/locales/ga.json
@@ -31,9 +31,7 @@
   "account.follow": "Lean",
   "account.followers": "Leantóirí",
   "account.followers.empty": "Ní leanann éinne an t-úsáideoir seo fós.",
-  "account.followers_counter": "{count, plural, one {Leantóir amháin} other {{counter} Leantóir}}",
   "account.following": "Ag leanúint",
-  "account.following_counter": "{count, plural, one {Ag leanúint cúntas amháin} other {Ag leanúint {counter} cúntas}}",
   "account.follows.empty": "Ní leanann an t-úsáideoir seo duine ar bith fós.",
   "account.go_to_profile": "Téigh go dtí próifíl",
   "account.hide_reblogs": "Folaigh moltaí ó @{name}",
@@ -55,7 +53,6 @@
   "account.requested_follow": "D'iarr {name} ort do chuntas a leanúint",
   "account.share": "Roinn próifíl @{name}",
   "account.show_reblogs": "Taispeáin moltaí ó @{name}",
-  "account.statuses_counter": "{count, plural, one {Postáil amháin} other {{counter} Postáil}}",
   "account.unblock": "Bain bac de @{name}",
   "account.unblock_domain": "Bain bac den ainm fearainn {domain}",
   "account.unblock_short": "Bain bac de",
diff --git a/app/javascript/mastodon/locales/gd.json b/app/javascript/mastodon/locales/gd.json
index 714fa6e364bf9a..fec025045c9f78 100644
--- a/app/javascript/mastodon/locales/gd.json
+++ b/app/javascript/mastodon/locales/gd.json
@@ -35,9 +35,7 @@
   "account.follow_back": "Lean air ais",
   "account.followers": "Luchd-leantainn",
   "account.followers.empty": "Chan eil neach sam bith a’ leantainn air a’ chleachdaiche seo fhathast.",
-  "account.followers_counter": "{count, plural, one {{counter} neach-leantainn} two {{counter} neach-leantainn} few {{counter} luchd-leantainn} other {{counter} luchd-leantainn}}",
   "account.following": "A’ leantainn",
-  "account.following_counter": "{count, plural, one {A’ leantainn {counter}} two {A’ leantainn {counter}} few {A’ leantainn {counter}} other {A’ leantainn {counter}}}",
   "account.follows.empty": "Chan eil an cleachdaiche seo a’ leantainn neach sam bith fhathast.",
   "account.go_to_profile": "Tadhail air a’ phròifil",
   "account.hide_reblogs": "Falaich na brosnachaidhean o @{name}",
@@ -63,7 +61,6 @@
   "account.requested_follow": "Dh’iarr {name} ’gad leantainn",
   "account.share": "Co-roinn a’ phròifil aig @{name}",
   "account.show_reblogs": "Seall na brosnachaidhean o @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} phost} two {{counter} phost} few {{counter} postaichean} other {{counter} post}}",
   "account.unblock": "Dì-bhac @{name}",
   "account.unblock_domain": "Dì-bhac an àrainn {domain}",
   "account.unblock_short": "Dì-bhac",
diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json
index 7b77f980349421..156fe3ee861d43 100644
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@@ -35,9 +35,7 @@
   "account.follow_back": "Seguir tamén",
   "account.followers": "Seguidoras",
   "account.followers.empty": "Aínda ninguén segue esta usuaria.",
-  "account.followers_counter": "{count, plural, one {{counter} Seguidora} other {{counter} Seguidoras}}",
   "account.following": "Seguindo",
-  "account.following_counter": "{count, plural, one {{counter} Seguindo} other {{counter} Seguindo}}",
   "account.follows.empty": "Esta usuaria aínda non segue a ninguén.",
   "account.go_to_profile": "Ir ao perfil",
   "account.hide_reblogs": "Agochar promocións de @{name}",
@@ -63,7 +61,6 @@
   "account.requested_follow": "{name} solicitou seguirte",
   "account.share": "Compartir o perfil de @{name}",
   "account.show_reblogs": "Amosar compartidos de @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} Publicación} other {{counter} Publicacións}}",
   "account.unblock": "Desbloquear @{name}",
   "account.unblock_domain": "Amosar {domain}",
   "account.unblock_short": "Desbloquear",
diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json
index 1c50ba8e1f30ad..e022eac110b69a 100644
--- a/app/javascript/mastodon/locales/he.json
+++ b/app/javascript/mastodon/locales/he.json
@@ -35,9 +35,7 @@
   "account.follow_back": "לעקוב בחזרה",
   "account.followers": "עוקבים",
   "account.followers.empty": "אף אחד לא עוקב אחר המשתמש הזה עדיין.",
-  "account.followers_counter": "{count, plural,one {עוקב אחד} other {{counter} עוקבים}}",
   "account.following": "נעקבים",
-  "account.following_counter": "{count, plural,one {עוקב אחרי {counter}}other {עוקב אחרי {counter}}}",
   "account.follows.empty": "משתמש זה עדיין לא עוקב אחרי אף אחד.",
   "account.go_to_profile": "מעבר לפרופיל",
   "account.hide_reblogs": "להסתיר הידהודים מאת @{name}",
@@ -63,7 +61,6 @@
   "account.requested_follow": "{name} ביקשו לעקוב אחריך",
   "account.share": "שתף את הפרופיל של @{name}",
   "account.show_reblogs": "הצג הדהודים מאת @{name}",
-  "account.statuses_counter": "{count, plural, one {הודעה} two {הודעותיים} many {{count} הודעות} other {{count} הודעות}}",
   "account.unblock": "להסיר חסימה ל- @{name}",
   "account.unblock_domain": "הסירי את החסימה של קהילת {domain}",
   "account.unblock_short": "הסר חסימה",
diff --git a/app/javascript/mastodon/locales/hi.json b/app/javascript/mastodon/locales/hi.json
index a2da55da85a060..89c71207f003bb 100644
--- a/app/javascript/mastodon/locales/hi.json
+++ b/app/javascript/mastodon/locales/hi.json
@@ -35,9 +35,7 @@
   "account.follow_back": "फॉलो करें",
   "account.followers": "फॉलोवर",
   "account.followers.empty": "कोई भी इस यूज़र् को फ़ॉलो नहीं करता है",
-  "account.followers_counter": "{count, plural, one {{counter} अनुगामी} other {{counter} समर्थक}}",
   "account.following": "फॉलोइंग",
-  "account.following_counter": "{count, plural, one {{counter} निम्नलिखित} other {{counter} निम्नलिखित}}",
   "account.follows.empty": "यह यूज़र् अभी तक किसी को फॉलो नहीं करता है।",
   "account.go_to_profile": "प्रोफाइल में जाएँ",
   "account.hide_reblogs": "@{name} के बूस्ट छुपाएं",
@@ -63,7 +61,6 @@
   "account.requested_follow": "{name} ने आपको फॉलो करने के लिए अनुरोध किया है",
   "account.share": "@{name} की प्रोफाइल शेयर करे",
   "account.show_reblogs": "@{name} के बूस्ट दिखाए",
-  "account.statuses_counter": "{count, plural, one {{counter} भोंपू} other {{counter} भोंपू}}",
   "account.unblock": "@{name} को अनब्लॉक करें",
   "account.unblock_domain": "{domain} दिखाए",
   "account.unblock_short": "अनब्लॉक",
diff --git a/app/javascript/mastodon/locales/hr.json b/app/javascript/mastodon/locales/hr.json
index d952945c4641ec..c8f6f018623394 100644
--- a/app/javascript/mastodon/locales/hr.json
+++ b/app/javascript/mastodon/locales/hr.json
@@ -35,9 +35,7 @@
   "account.follow_back": "Slijedi natrag",
   "account.followers": "Pratitelji",
   "account.followers.empty": "Nitko još ne prati korisnika/cu.",
-  "account.followers_counter": "{count, plural, one {{counter} pratitelj} other {{counter} pratitelja}}",
   "account.following": "Pratim",
-  "account.following_counter": "{count, plural, one {{counter} praćeni} few{{counter} praćena} other {{counter} praćenih}}",
   "account.follows.empty": "Korisnik/ca još ne prati nikoga.",
   "account.go_to_profile": "Idi na profil",
   "account.hide_reblogs": "Sakrij boostove od @{name}",
@@ -62,7 +60,6 @@
   "account.requested_follow": "{name} zatražio/la je praćenje",
   "account.share": "Podijeli profil @{name}",
   "account.show_reblogs": "Prikaži boostove od @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} toot} other {{counter} toota}}",
   "account.unblock": "Deblokiraj @{name}",
   "account.unblock_domain": "Deblokiraj domenu {domain}",
   "account.unblock_short": "Deblokiraj",
diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json
index 6164335da82f69..627e3cab508f2c 100644
--- a/app/javascript/mastodon/locales/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@@ -35,9 +35,7 @@
   "account.follow_back": "Viszontkövetés",
   "account.followers": "Követő",
   "account.followers.empty": "Ezt a felhasználót még senki sem követi.",
-  "account.followers_counter": "{count, plural, one {{counter} Követő} other {{counter} Követő}}",
   "account.following": "Követve",
-  "account.following_counter": "{count, plural, one {{counter} Követett} other {{counter} Követett}}",
   "account.follows.empty": "Ez a felhasználó még senkit sem követ.",
   "account.go_to_profile": "Ugrás a profilhoz",
   "account.hide_reblogs": "@{name} megtolásainak elrejtése",
@@ -63,7 +61,6 @@
   "account.requested_follow": "{name} kérte, hogy követhessen",
   "account.share": "@{name} profiljának megosztása",
   "account.show_reblogs": "@{name} megtolásainak mutatása",
-  "account.statuses_counter": "{count, plural, one {{counter} Bejegyzés} other {{counter} Bejegyzés}}",
   "account.unblock": "@{name} letiltásának feloldása",
   "account.unblock_domain": "{domain} domain tiltásának feloldása",
   "account.unblock_short": "Tiltás feloldása",
diff --git a/app/javascript/mastodon/locales/hy.json b/app/javascript/mastodon/locales/hy.json
index cd29f441df7c51..b4abe9bf09b3d7 100644
--- a/app/javascript/mastodon/locales/hy.json
+++ b/app/javascript/mastodon/locales/hy.json
@@ -28,9 +28,7 @@
   "account.follow": "Հետեւել",
   "account.followers": "Հետեւողներ",
   "account.followers.empty": "Այս օգտատիրոջը դեռ ոչ մէկ չի հետեւում։",
-  "account.followers_counter": "{count, plural, one {{counter} Հետեւորդ} other {{counter} Հետեւորդ}}",
   "account.following": "Հետեւած",
-  "account.following_counter": "{count, plural, one {{counter} Հետեւած} other {{counter} Հետեւած}}",
   "account.follows.empty": "Այս օգտատէրը դեռ ոչ մէկի չի հետեւում։",
   "account.go_to_profile": "Գնալ անձնական հաշիւ",
   "account.hide_reblogs": "Թաքցնել @{name}֊ի տարածածները",
@@ -52,7 +50,6 @@
   "account.requested_follow": "{name}-ը ցանկանում է հետեւել քեզ",
   "account.share": "Կիսուել @{name}֊ի էջով",
   "account.show_reblogs": "Ցուցադրել @{name}֊ի տարածածները",
-  "account.statuses_counter": "{count, plural, one {{counter} Գրառում} other {{counter} Գրառումներ}}",
   "account.unblock": "Ապաարգելափակել @{name}֊ին",
   "account.unblock_domain": "Ցուցադրել {domain} թաքցուած տիրոյթի գրառումները",
   "account.unblock_short": "Արգելաբացել",
diff --git a/app/javascript/mastodon/locales/ia.json b/app/javascript/mastodon/locales/ia.json
index 53cc9385924110..a2e64c10f15ef8 100644
--- a/app/javascript/mastodon/locales/ia.json
+++ b/app/javascript/mastodon/locales/ia.json
@@ -699,6 +699,7 @@
   "server_banner.is_one_of_many": "{domain} es un de multe servitores independente de Mastodon que tu pote usar pro participar in le fediverso.",
   "server_banner.server_stats": "Statos del servitor:",
   "sign_in_banner.create_account": "Crear un conto",
+  "sign_in_banner.follow_anyone": "Seque quicunque in le fediverso, e tu videra toto in ordine chronologic. Sin algorithmo, sin publicitate, sin titulos de esca.",
   "sign_in_banner.mastodon_is": "Mastodon es le melior maniera de sequer lo que passa.",
   "sign_in_banner.sign_in": "Aperir session",
   "sign_in_banner.sso_redirect": "Aperir session o crear conto",
diff --git a/app/javascript/mastodon/locales/id.json b/app/javascript/mastodon/locales/id.json
index d86b5854f4ddfe..f4e5e1baea4723 100644
--- a/app/javascript/mastodon/locales/id.json
+++ b/app/javascript/mastodon/locales/id.json
@@ -35,9 +35,7 @@
   "account.follow_back": "Ikuti balik",
   "account.followers": "Pengikut",
   "account.followers.empty": "Pengguna ini belum ada pengikut.",
-  "account.followers_counter": "{count, plural, other {{counter} Pengikut}}",
   "account.following": "Mengikuti",
-  "account.following_counter": "{count, plural, other {{counter} Mengikuti}}",
   "account.follows.empty": "Pengguna ini belum mengikuti siapa pun.",
   "account.go_to_profile": "Buka profil",
   "account.hide_reblogs": "Sembunyikan boosts dari @{name}",
@@ -63,7 +61,6 @@
   "account.requested_follow": "{name} ingin mengikuti Anda",
   "account.share": "Bagikan profil @{name}",
   "account.show_reblogs": "Tampilkan boost dari @{name}",
-  "account.statuses_counter": "{count, plural, other {{counter} Kiriman}}",
   "account.unblock": "Buka blokir @{name}",
   "account.unblock_domain": "Buka blokir domain {domain}",
   "account.unblock_short": "Buka blokir",
diff --git a/app/javascript/mastodon/locales/ie.json b/app/javascript/mastodon/locales/ie.json
index f15b982889260b..c75788c430129e 100644
--- a/app/javascript/mastodon/locales/ie.json
+++ b/app/javascript/mastodon/locales/ie.json
@@ -35,9 +35,7 @@
   "account.follow_back": "Sequer reciprocmen",
   "account.followers": "Sequitores",
   "account.followers.empty": "Ancor nequi seque ti-ci usator.",
-  "account.followers_counter": "{count, plural, one {{counter} Sequitor} other {{counter} Sequitor}}",
   "account.following": "Sequent",
-  "account.following_counter": "{count, plural, one {{counter} Sequent} other {{counter} Sequent}}",
   "account.follows.empty": "Ti-ci usator ancor ne seque quemcunc.",
   "account.go_to_profile": "Ear a profil",
   "account.hide_reblogs": "Celar boosts de @{name}",
@@ -63,7 +61,6 @@
   "account.requested_follow": "{name} ha petit sequer te",
   "account.share": "Distribuer li profil de @{name}",
   "account.show_reblogs": "Monstrar boosts de @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} Posta} other {{counter} Postas}}",
   "account.unblock": "Desbloccar @{name}",
   "account.unblock_domain": "Desbloccar dominia {domain}",
   "account.unblock_short": "Desbloccar",
diff --git a/app/javascript/mastodon/locales/io.json b/app/javascript/mastodon/locales/io.json
index 016a111c46c66c..6aa954ae573048 100644
--- a/app/javascript/mastodon/locales/io.json
+++ b/app/javascript/mastodon/locales/io.json
@@ -33,9 +33,7 @@
   "account.follow": "Sequar",
   "account.followers": "Sequanti",
   "account.followers.empty": "Nulu sequas ca uzanto til nun.",
-  "account.followers_counter": "{count, plural, one {{counter} Sequanto} other {{counter} Sequanti}}",
   "account.following": "Sequata",
-  "account.following_counter": "{count, plural, one {{counter} Sequas} other {{counter} Sequanti}}",
   "account.follows.empty": "Ca uzanto ne sequa irgu til nun.",
   "account.go_to_profile": "Irez al profilo",
   "account.hide_reblogs": "Celez repeti de @{name}",
@@ -60,7 +58,6 @@
   "account.requested_follow": "{name} demandis sequar tu",
   "account.share": "Partigez profilo di @{name}",
   "account.show_reblogs": "Montrez repeti de @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} Posto} other {{counter} Posti}}",
   "account.unblock": "Desblokusar @{name}",
   "account.unblock_domain": "Desblokusar {domain}",
   "account.unblock_short": "Desblokusar",
diff --git a/app/javascript/mastodon/locales/is.json b/app/javascript/mastodon/locales/is.json
index 08605f5238ded3..1a38591b853b35 100644
--- a/app/javascript/mastodon/locales/is.json
+++ b/app/javascript/mastodon/locales/is.json
@@ -63,7 +63,7 @@
   "account.requested_follow": "{name} hefur beðið um að fylgjast með þér",
   "account.share": "Deila notandasniði fyrir @{name}",
   "account.show_reblogs": "Sýna endurbirtingar frá @{name}",
-  "account.statuses_counter": "{count, plural, one {Færsla: {counter}} other {Færslur: {counter}}}",
+  "account.statuses_counter": "{count, plural, one {{counter} færsla} other {{counter} færslur}}",
   "account.unblock": "Aflétta útilokun af @{name}",
   "account.unblock_domain": "Aflétta útilokun lénsins {domain}",
   "account.unblock_short": "Hætta að loka á",
diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json
index 3672b5fd7a1042..73c4f9ba60827b 100644
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@@ -35,9 +35,9 @@
   "account.follow_back": "Segui a tua volta",
   "account.followers": "Follower",
   "account.followers.empty": "Ancora nessuno segue questo utente.",
-  "account.followers_counter": "{count, plural, one {{counter} Follower} other {{counter} Follower}}",
+  "account.followers_counter": "{count, plural, one {{counter} seguace} other {{counter} seguaci}}",
   "account.following": "Seguiti",
-  "account.following_counter": "{count, plural, one {{counter} Seguiti} other {{counter} Seguiti}}",
+  "account.following_counter": "{count, plural, one {{counter} segui} other {{counter} segui}}",
   "account.follows.empty": "Questo utente non segue ancora nessuno.",
   "account.go_to_profile": "Vai al profilo",
   "account.hide_reblogs": "Nascondi potenziamenti da @{name}",
@@ -63,7 +63,7 @@
   "account.requested_follow": "{name} ha richiesto di seguirti",
   "account.share": "Condividi il profilo di @{name}",
   "account.show_reblogs": "Mostra potenziamenti da @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} Post} other {{counter} Post}}",
+  "account.statuses_counter": "{count, plural, one {{counter} post} other {{counter} post}}",
   "account.unblock": "Sblocca @{name}",
   "account.unblock_domain": "Sblocca il dominio {domain}",
   "account.unblock_short": "Sblocca",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index 90a46edd5b9e6a..575c68de038955 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -35,9 +35,7 @@
   "account.follow_back": "フォローバック",
   "account.followers": "フォロワー",
   "account.followers.empty": "まだ誰もフォローしていません。",
-  "account.followers_counter": "{counter} フォロワー",
   "account.following": "フォロー中",
-  "account.following_counter": "{counter} フォロー",
   "account.follows.empty": "まだ誰もフォローしていません。",
   "account.go_to_profile": "プロフィールページへ",
   "account.hide_reblogs": "@{name}さんからのブーストを非表示",
@@ -63,7 +61,6 @@
   "account.requested_follow": "{name}さんがあなたにフォローリクエストしました",
   "account.share": "@{name}さんのプロフィールを共有する",
   "account.show_reblogs": "@{name}さんからのブーストを表示",
-  "account.statuses_counter": "{counter} 投稿",
   "account.unblock": "@{name}さんのブロックを解除",
   "account.unblock_domain": "{domain}のブロックを解除",
   "account.unblock_short": "ブロック解除",
diff --git a/app/javascript/mastodon/locales/ka.json b/app/javascript/mastodon/locales/ka.json
index 7af4dccd86bb2f..b2e67e143ed8c3 100644
--- a/app/javascript/mastodon/locales/ka.json
+++ b/app/javascript/mastodon/locales/ka.json
@@ -26,7 +26,6 @@
   "account.requested": "დამტკიცების მოლოდინში. დააწკაპუნეთ რომ უარყოთ დადევნების მოთხონვა",
   "account.share": "გააზიარე @{name}-ის პროფილი",
   "account.show_reblogs": "აჩვენე ბუსტები @{name}-სგან",
-  "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
   "account.unblock": "განბლოკე @{name}",
   "account.unblock_domain": "გამოაჩინე {domain}",
   "account.unendorse": "არ გამოირჩეს პროფილზე",
diff --git a/app/javascript/mastodon/locales/kab.json b/app/javascript/mastodon/locales/kab.json
index 5aa46bafde4ca8..de866cc1bc4c33 100644
--- a/app/javascript/mastodon/locales/kab.json
+++ b/app/javascript/mastodon/locales/kab.json
@@ -26,9 +26,7 @@
   "account.follow": "Ḍfer",
   "account.followers": "Imeḍfaren",
   "account.followers.empty": "Ar tura, ulac yiwen i yeṭṭafaṛen amseqdac-agi.",
-  "account.followers_counter": "{count, plural, one {{count} n umeḍfar} other {{count} n imeḍfaren}}",
   "account.following": "Yeṭṭafaṛ",
-  "account.following_counter": "{count, plural, one {{counter} yettwaḍfaren} other {{counter} yettwaḍfaren}}",
   "account.follows.empty": "Ar tura, amseqdac-agi ur yeṭṭafaṛ yiwen.",
   "account.go_to_profile": "Ddu ɣer umaɣnu",
   "account.hide_reblogs": "Ffer ayen i ibeṭṭu @{name}",
@@ -51,7 +49,6 @@
   "account.requested_follow": "{name} yessuter ad k·m-yeḍfer",
   "account.share": "Bḍu amaɣnu n @{name}",
   "account.show_reblogs": "Ssken-d inebḍa n @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} n tsuffeɣt} other {{counter} n tsuffaɣ}}",
   "account.unblock": "Serreḥ i @{name}",
   "account.unblock_domain": "Ssken-d {domain}",
   "account.unblock_short": "Serreḥ",
diff --git a/app/javascript/mastodon/locales/kk.json b/app/javascript/mastodon/locales/kk.json
index bd0a806cdb9abe..efeee16c6514a7 100644
--- a/app/javascript/mastodon/locales/kk.json
+++ b/app/javascript/mastodon/locales/kk.json
@@ -31,9 +31,7 @@
   "account.follow": "Жазылу",
   "account.followers": "Жазылушы",
   "account.followers.empty": "Бұл қолданушыға әлі ешкім жазылмаған.",
-  "account.followers_counter": "{count, plural, one {{counter} жазылушы} other {{counter} жазылушы}}",
   "account.following": "Жазылым",
-  "account.following_counter": "{count, plural, one {{counter} жазылым} other {{counter} жазылым}}",
   "account.follows.empty": "Бұл қолданушы әлі ешкімге жазылмаған.",
   "account.go_to_profile": "Профиліне өту",
   "account.hide_reblogs": "@{name} бустарын жасыру",
@@ -52,7 +50,6 @@
   "account.requested": "Растауын күтіңіз. Жазылудан бас тарту үшін басыңыз",
   "account.share": "@{name} профилін бөлісу\"",
   "account.show_reblogs": "@{name} бөліскендерін көрсету",
-  "account.statuses_counter": "{count, plural, one {{counter} Пост} other {{counter} Пост}}",
   "account.unblock": "Бұғаттан шығару @{name}",
   "account.unblock_domain": "Бұғаттан шығару {domain}",
   "account.unendorse": "Профильде рекомендемеу",
diff --git a/app/javascript/mastodon/locales/kn.json b/app/javascript/mastodon/locales/kn.json
index ceb0f8b9b6139b..24592e37fc0e20 100644
--- a/app/javascript/mastodon/locales/kn.json
+++ b/app/javascript/mastodon/locales/kn.json
@@ -16,7 +16,6 @@
   "account.posts": "ಟೂಟ್‌ಗಳು",
   "account.posts_with_replies": "Toots and replies",
   "account.requested": "Awaiting approval",
-  "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
   "account.unblock_domain": "Unhide {domain}",
   "account_note.placeholder": "Click to add a note",
   "alert.unexpected.title": "ಅಯ್ಯೋ!",
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index c4c084d98ee046..90755666bbb573 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -35,9 +35,7 @@
   "account.follow_back": "맞팔로우 하기",
   "account.followers": "팔로워",
   "account.followers.empty": "아직 아무도 이 사용자를 팔로우하고 있지 않습니다.",
-  "account.followers_counter": "{counter} 팔로워",
   "account.following": "팔로잉",
-  "account.following_counter": "{counter} 팔로잉",
   "account.follows.empty": "이 사용자는 아직 아무도 팔로우하고 있지 않습니다.",
   "account.go_to_profile": "프로필로 이동",
   "account.hide_reblogs": "@{name}의 부스트를 숨기기",
@@ -63,7 +61,6 @@
   "account.requested_follow": "{name} 님이 팔로우 요청을 보냈습니다",
   "account.share": "@{name}의 프로필 공유",
   "account.show_reblogs": "@{name}의 부스트 보기",
-  "account.statuses_counter": "{counter} 게시물",
   "account.unblock": "차단 해제",
   "account.unblock_domain": "도메인 {domain} 차단 해제",
   "account.unblock_short": "차단 해제",
diff --git a/app/javascript/mastodon/locales/ku.json b/app/javascript/mastodon/locales/ku.json
index 83fcef26fb2a53..5248cdfa51b772 100644
--- a/app/javascript/mastodon/locales/ku.json
+++ b/app/javascript/mastodon/locales/ku.json
@@ -32,9 +32,7 @@
   "account.follow": "Bişopîne",
   "account.followers": "Şopîner",
   "account.followers.empty": "Kesekî hin ev bikarhêner neşopandiye.",
-  "account.followers_counter": "{count, plural, one {{counter} Şopîner} other {{counter} Şopîner}}",
   "account.following": "Dişopîne",
-  "account.following_counter": "{count, plural, one {{counter} Dişopîne} other {{counter} Dişopîne}}",
   "account.follows.empty": "Ev bikarhêner hin kesekî heya niha neşopandiye.",
   "account.go_to_profile": "Biçe bo profîlê",
   "account.hide_reblogs": "Bilindkirinên ji @{name} veşêre",
@@ -56,7 +54,6 @@
   "account.requested_follow": "{name} dixwaze te bişopîne",
   "account.share": "Profîla @{name} parve bike",
   "account.show_reblogs": "Bilindkirinên ji @{name} nîşan bike",
-  "account.statuses_counter": "{count, plural,one {{counter} Şandî}other {{counter} Şandî}}",
   "account.unblock": "Astengê li ser @{name} rake",
   "account.unblock_domain": "Astengê li ser navperê {domain} rake",
   "account.unblock_short": "Astengiyê rake",
diff --git a/app/javascript/mastodon/locales/kw.json b/app/javascript/mastodon/locales/kw.json
index 794cbd9ede362d..1afcf645cf8914 100644
--- a/app/javascript/mastodon/locales/kw.json
+++ b/app/javascript/mastodon/locales/kw.json
@@ -17,8 +17,6 @@
   "account.follow": "Holya",
   "account.followers": "Holyoryon",
   "account.followers.empty": "Ny wra nagonan holya'n devnydhyer ma hwath.",
-  "account.followers_counter": "{count, plural, one {{counter} Holyer} other {{counter} Holyer}}",
-  "account.following_counter": "{count, plural, one {Ow holya {counter}} other {Ow holya {counter}}}",
   "account.follows.empty": "Ny wra'n devnydhyer ma holya nagonan hwath.",
   "account.hide_reblogs": "Kudha kenerthow a @{name}",
   "account.link_verified_on": "Perghenogeth an kolm ma a veu checkys dhe {date}",
@@ -33,7 +31,6 @@
   "account.requested": "Ow kortos komendyans. Klyckyewgh dhe hedhi govyn holya",
   "account.share": "Kevrenna profil @{name}",
   "account.show_reblogs": "Diskwedhes kenerthow a @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} Tout} other {{counter} Tout}}",
   "account.unblock": "Anlettya @{name}",
   "account.unblock_domain": "Anlettya gorfarth {domain}",
   "account.unendorse": "Na wra diskwedhes yn profil",
diff --git a/app/javascript/mastodon/locales/la.json b/app/javascript/mastodon/locales/la.json
index d867034f01f6b9..aa209fcc00db3d 100644
--- a/app/javascript/mastodon/locales/la.json
+++ b/app/javascript/mastodon/locales/la.json
@@ -14,12 +14,9 @@
   "account.edit_profile": "Recolere notionem",
   "account.featured_tags.last_status_never": "Nulla contributa",
   "account.featured_tags.title": "Hashtag notātī {name}",
-  "account.followers_counter": "{count, plural, one {{counter} Sectator} other {{counter} Sectatores}}",
-  "account.following_counter": "{count, plural, one {{counter} Sequens} other {{counter} Sequentes}}",
   "account.moved_to": "{name} significavit eum suam rationem novam nunc esse:",
   "account.muted": "Confutatus",
   "account.requested_follow": "{name} postulavit ut te sequeretur",
-  "account.statuses_counter": "{count, plural, one {{counter} Nuntius} other {{counter} Nuntii}}",
   "account.unblock_short": "Solvere impedimentum",
   "account_note.placeholder": "Click to add a note",
   "admin.dashboard.retention.average": "Mediocritas",
diff --git a/app/javascript/mastodon/locales/lad.json b/app/javascript/mastodon/locales/lad.json
index bf676a6020f5d4..292f00818c16c4 100644
--- a/app/javascript/mastodon/locales/lad.json
+++ b/app/javascript/mastodon/locales/lad.json
@@ -35,9 +35,7 @@
   "account.follow_back": "Sige tamyen",
   "account.followers": "Suivantes",
   "account.followers.empty": "Por agora dingun no sige a este utilizador.",
-  "account.followers_counter": "{count, plural, one {{counter} suivante} other {{counter} suivantes}}",
   "account.following": "Sigiendo",
-  "account.following_counter": "{count, plural, other {Sigiendo a {counter}}}",
   "account.follows.empty": "Este utilizador ainda no sige a dingun.",
   "account.go_to_profile": "Va al profil",
   "account.hide_reblogs": "Eskonde repartajasyones de @{name}",
@@ -63,7 +61,6 @@
   "account.requested_follow": "{name} tiene solisitado segirte",
   "account.share": "Partaja el profil de @{name}",
   "account.show_reblogs": "Amostra repartajasyones de @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} publikasyon} other {{counter} publikasyones}}",
   "account.unblock": "Dezbloka a @{name}",
   "account.unblock_domain": "Dezbloka domeno {domain}",
   "account.unblock_short": "Dezbloka",
diff --git a/app/javascript/mastodon/locales/lt.json b/app/javascript/mastodon/locales/lt.json
index bb69b733997bd1..6bf8f94bd91ee5 100644
--- a/app/javascript/mastodon/locales/lt.json
+++ b/app/javascript/mastodon/locales/lt.json
@@ -35,9 +35,7 @@
   "account.follow_back": "Sekti atgal",
   "account.followers": "Sekėjai",
   "account.followers.empty": "Šio naudotojo dar niekas neseka.",
-  "account.followers_counter": "{count, plural, one {{counter} sekėjas} few {{counter} sekėjai} many {{counter} sekėjo} other {{counter} sekėjų}}",
   "account.following": "Sekama",
-  "account.following_counter": "{count, plural, one {{counter} sekimas} few {{counter} sekimai} many {{counter} sekimo} other {{counter} sekimų}}",
   "account.follows.empty": "Šis naudotojas dar nieko neseka.",
   "account.go_to_profile": "Eiti į profilį",
   "account.hide_reblogs": "Slėpti pakėlimus iš @{name}",
@@ -63,7 +61,6 @@
   "account.requested_follow": "{name} paprašė tave sekti",
   "account.share": "Bendrinti @{name} profilį",
   "account.show_reblogs": "Rodyti pakėlimus iš @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} įrašas} few {{counter} įrašai} many {{counter} įrašo} other {{counter} įrašų}}",
   "account.unblock": "Atblokuoti @{name}",
   "account.unblock_domain": "Atblokuoti domeną {domain}",
   "account.unblock_short": "Atblokuoti",
diff --git a/app/javascript/mastodon/locales/lv.json b/app/javascript/mastodon/locales/lv.json
index 13ceec21c82a9f..041072c6adecef 100644
--- a/app/javascript/mastodon/locales/lv.json
+++ b/app/javascript/mastodon/locales/lv.json
@@ -35,9 +35,7 @@
   "account.follow_back": "Sekot atpakaļ",
   "account.followers": "Sekotāji",
   "account.followers.empty": "Šim lietotājam vēl nav sekotāju.",
-  "account.followers_counter": "{count, plural, zero {{counter} sekotāju} one {{counter} sekotājs} other {{counter} sekotāji}}",
   "account.following": "Seko",
-  "account.following_counter": "{count, plural, zero{{counter} sekojamo} one {{counter} sekojamais} other {{counter} sekojamie}}",
   "account.follows.empty": "Šis lietotājs pagaidām nevienam neseko.",
   "account.go_to_profile": "Doties uz profilu",
   "account.hide_reblogs": "Paslēpt @{name} pastiprinātos ierakstus",
@@ -63,7 +61,6 @@
   "account.requested_follow": "{name} nosūtīja Tev sekošanas pieprasījumu",
   "account.share": "Dalīties ar @{name} profilu",
   "account.show_reblogs": "Parādīt @{name} pastiprinātos ierakstus",
-  "account.statuses_counter": "{count, plural, zero {{counter} ierakstu} one {{counter} ieraksts} other {{counter} ieraksti}}",
   "account.unblock": "Atbloķēt @{name}",
   "account.unblock_domain": "Atbloķēt domēnu {domain}",
   "account.unblock_short": "Atbloķēt",
diff --git a/app/javascript/mastodon/locales/mk.json b/app/javascript/mastodon/locales/mk.json
index d8a470ed47ead9..a09ad98ebf650c 100644
--- a/app/javascript/mastodon/locales/mk.json
+++ b/app/javascript/mastodon/locales/mk.json
@@ -38,7 +38,6 @@
   "account.requested": "Се чека одобрување. Кликни за да одкажиш барање за следење",
   "account.share": "Сподели @{name} профил",
   "account.show_reblogs": "Прикажи бустови од @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
   "account.unblock": "Одблокирај @{name}",
   "account.unblock_domain": "Прикажи {domain}",
   "account.unendorse": "Не прикажувај на профил",
diff --git a/app/javascript/mastodon/locales/ml.json b/app/javascript/mastodon/locales/ml.json
index 8fb4e818db2ead..d9caccef34669d 100644
--- a/app/javascript/mastodon/locales/ml.json
+++ b/app/javascript/mastodon/locales/ml.json
@@ -22,9 +22,7 @@
   "account.follow": "പിന്തുടരുക",
   "account.followers": "പിന്തുടരുന്നവർ",
   "account.followers.empty": "ഈ ഉപയോക്താവിനെ ആരും ഇതുവരെ പിന്തുടരുന്നില്ല.",
-  "account.followers_counter": "{count, plural, one {{counter} പിന്തുടരുന്നവർ} other {{counter} പിന്തുടരുന്നവർ}}",
   "account.following": "പിന്തുടരുന്നു",
-  "account.following_counter": "{count, plural, one {{counter} പിന്തുടരുന്നു} other {{counter} പിന്തുടരുന്നു}}",
   "account.follows.empty": "ഈ ഉപയോക്താവ് ആരേയും ഇതുവരെ പിന്തുടരുന്നില്ല.",
   "account.go_to_profile": "പ്രൊഫൈലിലേക്ക് പോകാം",
   "account.hide_reblogs": "@{name} ബൂസ്റ്റ് ചെയ്തവ മറയ്കുക",
@@ -42,7 +40,6 @@
   "account.requested": "അനുവാദത്തിനായി കാത്തിരിക്കുന്നു. പിന്തുടരാനുള്ള അപേക്ഷ റദ്ദാക്കുവാൻ ഞെക്കുക",
   "account.share": "@{name} ന്റെ പ്രൊഫൈൽ പങ്കിടുക",
   "account.show_reblogs": "@{name} ൽ നിന്നുള്ള ബൂസ്റ്റുകൾ കാണിക്കുക",
-  "account.statuses_counter": "{count, plural, one {{counter} ടൂട്ട്} other {{counter} ടൂട്ടുകൾ}}",
   "account.unblock": "@{name} തടഞ്ഞത് മാറ്റുക",
   "account.unblock_domain": "{domain} എന്ന മേഖല വെളിപ്പെടുത്തുക",
   "account.unblock_short": "അൺബ്ലോക്കു ചെയ്യുക",
diff --git a/app/javascript/mastodon/locales/mr.json b/app/javascript/mastodon/locales/mr.json
index c07294d90a7d50..2757b96f94084c 100644
--- a/app/javascript/mastodon/locales/mr.json
+++ b/app/javascript/mastodon/locales/mr.json
@@ -35,9 +35,7 @@
   "account.follow_back": "आपणही अनुसरण करा",
   "account.followers": "अनुयायी",
   "account.followers.empty": "ह्या वापरकर्त्याचा आतापर्यंत कोणी अनुयायी नाही.",
-  "account.followers_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
   "account.following": "अनुसरण",
-  "account.following_counter": "{count, plural, one {{counter} following} other {{counter} following}}",
   "account.follows.empty": "हा वापरकर्ता अजूनपर्यंत कोणाचा अनुयायी नाही.",
   "account.go_to_profile": "प्रोफाइल वर जा",
   "account.hide_reblogs": "@{name} पासून सर्व बूस्ट लपवा",
@@ -59,7 +57,6 @@
   "account.requested_follow": "{name} ने आपल्याला फॉलो करण्याची रिक्वेस्ट केली आहे",
   "account.share": "@{name} चे प्रोफाइल शेअर करा",
   "account.show_reblogs": "{name}चे सर्व बुस्ट्स दाखवा",
-  "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
   "account.unblock": "@{name} ला ब्लॉक करा",
   "account.unblock_domain": "उघड करा {domain}",
   "account.unblock_short": "अनब्लॉक करा",
diff --git a/app/javascript/mastodon/locales/ms.json b/app/javascript/mastodon/locales/ms.json
index 3d7992faf7dc75..88c093bdee2ab1 100644
--- a/app/javascript/mastodon/locales/ms.json
+++ b/app/javascript/mastodon/locales/ms.json
@@ -35,9 +35,7 @@
   "account.follow_back": "Ikut balik",
   "account.followers": "Pengikut",
   "account.followers.empty": "Belum ada yang mengikuti pengguna ini.",
-  "account.followers_counter": "{count, plural, one {{counter} Pengikut} other {{counter} Pengikut}}",
   "account.following": "Mengikuti",
-  "account.following_counter": "{count, plural, one {{counter} Diikuti} other {{counter} Diikuti}}",
   "account.follows.empty": "Pengguna ini belum mengikuti sesiapa.",
   "account.go_to_profile": "Pergi ke profil",
   "account.hide_reblogs": "Sembunyikan galakan daripada @{name}",
@@ -63,7 +61,6 @@
   "account.requested_follow": "{name} has requested to follow you",
   "account.share": "Kongsi profil @{name}",
   "account.show_reblogs": "Tunjukkan galakan daripada @{name}",
-  "account.statuses_counter": "{count, plural, other {{counter} kiriman}}",
   "account.unblock": "Nyahsekat @{name}",
   "account.unblock_domain": "Nyahsekat domain {domain}",
   "account.unblock_short": "Nyahsekat",
diff --git a/app/javascript/mastodon/locales/my.json b/app/javascript/mastodon/locales/my.json
index e3287f3f327356..46c8d180690c59 100644
--- a/app/javascript/mastodon/locales/my.json
+++ b/app/javascript/mastodon/locales/my.json
@@ -34,9 +34,7 @@
   "account.follow": "စောင့်ကြည့်",
   "account.followers": "စောင့်ကြည့်သူများ",
   "account.followers.empty": "ဤသူကို စောင့်ကြည့်သူ မရှိသေးပါ။",
-  "account.followers_counter": "{count, plural, one {စောင့်ကြည့်သူ {counter}} other {စောင့်ကြည့်သူများ {counter}}}",
   "account.following": "စောင့်ကြည့်နေသည်",
-  "account.following_counter": "{count, plural, one {စောင့်ကြည့်ထားသူ {counter}} other {စောင့်ကြည့်ထားသူများ {counter}}}",
   "account.follows.empty": "ဤသူသည် မည်သူ့ကိုမျှ စောင့်ကြည့်ခြင်း မရှိသေးပါ။",
   "account.go_to_profile": "ပရိုဖိုင်းသို့ သွားရန်",
   "account.hide_reblogs": "@{name} ၏ မျှဝေမှုကို ဝှက်ထားရန်",
@@ -61,7 +59,6 @@
   "account.requested_follow": "{name} က သင့်ကို စောင့်ကြည့်ရန် တောင်းဆိုထားသည်",
   "account.share": "{name}၏ပရိုဖိုင်ကိုမျှဝေပါ",
   "account.show_reblogs": "@{name} မှ မျှ၀ေမှုများကို ပြပါ\n",
-  "account.statuses_counter": "{count, plural, one {{counter} ပိုစ့်များ} other {{counter} ပိုစ့်များ}}",
   "account.unblock": "{name} ကို ဘလော့ဖြုတ်မည်",
   "account.unblock_domain": " {domain} ဒိုမိန်းကိုပြန်ဖွင့်မည်",
   "account.unblock_short": "ဘလော့ဖြုတ်ရန်",
diff --git a/app/javascript/mastodon/locales/ne.json b/app/javascript/mastodon/locales/ne.json
index 500261a34be6e1..ca23a1f781495e 100644
--- a/app/javascript/mastodon/locales/ne.json
+++ b/app/javascript/mastodon/locales/ne.json
@@ -39,7 +39,6 @@
   "account.requested_follow": "{name} ले तपाईंलाई फलो गर्न अनुरोध गर्नुभएको छ",
   "account.share": "@{name} को प्रोफाइल सेयर गर्नुहोस्",
   "account.show_reblogs": "@{name} को बूस्टहरू देखाउनुहोस्",
-  "account.statuses_counter": "{count, plural, one {{counter} पोस्ट} other {{counter} पोस्टहरू}}",
   "account.unblock": "@{name} लाई अनब्लक गर्नुहोस्",
   "account.unblock_domain": "{domain} डोमेनलाई अनब्लक गर्नुहोस्",
   "account.unblock_short": "अनब्लक गर्नुहोस्",
diff --git a/app/javascript/mastodon/locales/nn.json b/app/javascript/mastodon/locales/nn.json
index 93b44f29a13565..7eca29659557e0 100644
--- a/app/javascript/mastodon/locales/nn.json
+++ b/app/javascript/mastodon/locales/nn.json
@@ -35,9 +35,7 @@
   "account.follow_back": "Fylg tilbake",
   "account.followers": "Fylgjarar",
   "account.followers.empty": "Ingen fylgjer denne brukaren enno.",
-  "account.followers_counter": "{count, plural, one {{counter} fylgjar} other {{counter} fylgjarar}}",
   "account.following": "Fylgjer",
-  "account.following_counter": "{count, plural, one {Fylgjer {counter}} other {Fylgjer {counter}}}",
   "account.follows.empty": "Denne brukaren fylgjer ikkje nokon enno.",
   "account.go_to_profile": "Gå til profil",
   "account.hide_reblogs": "Gøym framhevingar frå @{name}",
@@ -63,7 +61,6 @@
   "account.requested_follow": "{name} har bedt om å få fylgja deg",
   "account.share": "Del @{name} sin profil",
   "account.show_reblogs": "Vis framhevingar frå @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} tut} other {{counter} tut}}",
   "account.unblock": "Stopp blokkering av @{name}",
   "account.unblock_domain": "Stopp blokkering av domenet {domain}",
   "account.unblock_short": "Stopp blokkering",
diff --git a/app/javascript/mastodon/locales/no.json b/app/javascript/mastodon/locales/no.json
index 213ba8af12b537..2bda3734044d33 100644
--- a/app/javascript/mastodon/locales/no.json
+++ b/app/javascript/mastodon/locales/no.json
@@ -35,9 +35,7 @@
   "account.follow_back": "Følg tilbake",
   "account.followers": "Følgere",
   "account.followers.empty": "Ingen følger denne brukeren ennå.",
-  "account.followers_counter": "{count, plural, one {{counter} følger} other {{counter} følgere}}",
   "account.following": "Følger",
-  "account.following_counter": "{count, plural, one {{counter} som følges} other {{counter} som følges}}",
   "account.follows.empty": "Denne brukeren følger ikke noen enda.",
   "account.go_to_profile": "Gå til profil",
   "account.hide_reblogs": "Skjul fremhevinger fra @{name}",
@@ -63,7 +61,6 @@
   "account.requested_follow": "{name} har bedt om å få følge deg",
   "account.share": "Del @{name} sin profil",
   "account.show_reblogs": "Vis fremhevinger fra @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} innlegg} other {{counter} innlegg}}",
   "account.unblock": "Opphev blokkering av @{name}",
   "account.unblock_domain": "Opphev blokkering av {domain}",
   "account.unblock_short": "Opphev blokkering",
diff --git a/app/javascript/mastodon/locales/oc.json b/app/javascript/mastodon/locales/oc.json
index d8e11415880edf..d977eed4af63a2 100644
--- a/app/javascript/mastodon/locales/oc.json
+++ b/app/javascript/mastodon/locales/oc.json
@@ -32,9 +32,7 @@
   "account.follow_back": "Sègre en retorn",
   "account.followers": "Seguidors",
   "account.followers.empty": "Degun sèc pas aqueste utilizaire pel moment.",
-  "account.followers_counter": "{count, plural, one {{counter} Seguidor} other {{counter} Seguidors}}",
   "account.following": "Abonat",
-  "account.following_counter": "{count, plural, one {{counter} Abonaments} other {{counter} Abonaments}}",
   "account.follows.empty": "Aqueste utilizaire sèc pas degun pel moment.",
   "account.go_to_profile": "Anar al perfil",
   "account.hide_reblogs": "Rescondre los partatges de @{name}",
@@ -60,7 +58,6 @@
   "account.requested_follow": "{name} a demandat a vos sègre",
   "account.share": "Partejar lo perfil a @{name}",
   "account.show_reblogs": "Mostrar los partatges de @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} Tut} other {{counter} Tuts}}",
   "account.unblock": "Desblocar @{name}",
   "account.unblock_domain": "Desblocar {domain}",
   "account.unblock_short": "Desblocat",
diff --git a/app/javascript/mastodon/locales/pa.json b/app/javascript/mastodon/locales/pa.json
index 46924d737de318..3828ff887efc71 100644
--- a/app/javascript/mastodon/locales/pa.json
+++ b/app/javascript/mastodon/locales/pa.json
@@ -25,9 +25,7 @@
   "account.follow_back": "ਵਾਪਸ ਫਾਲ਼ੋ ਕਰੋ",
   "account.followers": "ਫ਼ਾਲੋਅਰ",
   "account.followers.empty": "ਇਸ ਵਰਤੋਂਕਾਰ ਨੂੰ ਹਾਲੇ ਕੋਈ ਫ਼ਾਲੋ ਨਹੀਂ ਕਰਦਾ ਹੈ।",
-  "account.followers_counter": "{count, plural, one {{counter} ਫ਼ਾਲੋਅਰ} other {{counter} ਫ਼ਾਲੋਅਰ}}",
   "account.following": "ਫ਼ਾਲੋ ਕੀਤਾ",
-  "account.following_counter": "{count, plural, one {{counter} ਨੂੰ ਫ਼ਾਲੋ} other {{counter} ਨੂੰ ਫ਼ਾਲੋ}}",
   "account.follows.empty": "ਇਹ ਵਰਤੋਂਕਾਰ ਹਾਲੇ ਕਿਸੇ ਨੂੰ ਫ਼ਾਲੋ ਨਹੀਂ ਕਰਦਾ ਹੈ।",
   "account.go_to_profile": "ਪਰੋਫਾਇਲ ਉੱਤੇ ਜਾਓ",
   "account.media": "ਮੀਡੀਆ",
@@ -41,7 +39,6 @@
   "account.requested": "ਮਨਜ਼ੂਰੀ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ। ਫ਼ਾਲੋ ਬੇਨਤੀਆਂ ਨੂੰ ਰੱਦ ਕਰਨ ਲਈ ਕਲਿੱਕ ਕਰੋ",
   "account.requested_follow": "{name} ਨੇ ਤੁਹਾਨੂੰ ਫ਼ਾਲੋ ਕਰਨ ਦੀ ਬੇਨਤੀ ਕੀਤੀ ਹੈ",
   "account.share": "{name} ਦਾ ਪਰੋਫ਼ਾਇਲ ਸਾਂਝਾ ਕਰੋ",
-  "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
   "account.unblock": "@{name} ਤੋਂ ਪਾਬੰਦੀ ਹਟਾਓ",
   "account.unblock_domain": "{domain} ਡੋਮੇਨ ਤੋਂ ਪਾਬੰਦੀ ਹਟਾਓ",
   "account.unblock_short": "ਪਾਬੰਦੀ ਹਟਾਓ",
diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json
index ddfe1d4fbcd804..a3690e734bd170 100644
--- a/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@@ -35,9 +35,7 @@
   "account.follow_back": "Obserwuj wzajemnie",
   "account.followers": "Obserwujący",
   "account.followers.empty": "Nikt jeszcze nie obserwuje tego użytkownika.",
-  "account.followers_counter": "{count, plural, one {{counter} obserwujący} few {{counter} obserwujących} many {{counter} obserwujących} other {{counter} obserwujących}}",
   "account.following": "Obserwowani",
-  "account.following_counter": "{count, plural, one {{counter} obserwowany} few {{counter} obserwowanych} many {{counter} obserwowanych} other {{counter} obserwowanych}}",
   "account.follows.empty": "Ten użytkownik nie obserwuje jeszcze nikogo.",
   "account.go_to_profile": "Przejdź do profilu",
   "account.hide_reblogs": "Ukryj podbicia od @{name}",
@@ -63,7 +61,6 @@
   "account.requested_follow": "{name} chce zaobserwować twój profil",
   "account.share": "Udostępnij profil @{name}",
   "account.show_reblogs": "Pokazuj podbicia od @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} wpis} few {{counter} wpisy} many {{counter} wpisów} other {{counter} wpisów}}",
   "account.unblock": "Odblokuj @{name}",
   "account.unblock_domain": "Odblokuj domenę {domain}",
   "account.unblock_short": "Odblokuj",
diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json
index 4d3bd2d280d6fe..34d0ba36e6f817 100644
--- a/app/javascript/mastodon/locales/pt-BR.json
+++ b/app/javascript/mastodon/locales/pt-BR.json
@@ -35,9 +35,7 @@
   "account.follow_back": "Seguir de volta",
   "account.followers": "Seguidores",
   "account.followers.empty": "Nada aqui.",
-  "account.followers_counter": "{count, plural, one {{counter} seguidor} other {{counter} seguidores}}",
   "account.following": "Seguindo",
-  "account.following_counter": "{count, plural, one {segue {counter}} other {segue {counter}}}",
   "account.follows.empty": "Nada aqui.",
   "account.go_to_profile": "Ir ao perfil",
   "account.hide_reblogs": "Ocultar boosts de @{name}",
@@ -63,7 +61,6 @@
   "account.requested_follow": "{name} quer te seguir",
   "account.share": "Compartilhar perfil de @{name}",
   "account.show_reblogs": "Mostrar boosts de @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
   "account.unblock": "Desbloquear @{name}",
   "account.unblock_domain": "Desbloquear domínio {domain}",
   "account.unblock_short": "Desbloquear",
diff --git a/app/javascript/mastodon/locales/pt-PT.json b/app/javascript/mastodon/locales/pt-PT.json
index 9446d5ee251b99..41112c2ca44c08 100644
--- a/app/javascript/mastodon/locales/pt-PT.json
+++ b/app/javascript/mastodon/locales/pt-PT.json
@@ -35,9 +35,7 @@
   "account.follow_back": "Seguir de volta",
   "account.followers": "Seguidores",
   "account.followers.empty": "Ainda ninguém segue este utilizador.",
-  "account.followers_counter": "{count, plural, one {{counter} seguidor} other {{counter} seguidores}}",
   "account.following": "A seguir",
-  "account.following_counter": "{count, plural, other {A seguir {counter}}}",
   "account.follows.empty": "Este utilizador ainda não segue ninguém.",
   "account.go_to_profile": "Ir para o perfil",
   "account.hide_reblogs": "Esconder partilhas de @{name}",
@@ -63,7 +61,6 @@
   "account.requested_follow": "{name} pediu para segui-lo",
   "account.share": "Partilhar o perfil @{name}",
   "account.show_reblogs": "Mostrar partilhas de @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
   "account.unblock": "Desbloquear @{name}",
   "account.unblock_domain": "Desbloquear o domínio {domain}",
   "account.unblock_short": "Desbloquear",
diff --git a/app/javascript/mastodon/locales/ro.json b/app/javascript/mastodon/locales/ro.json
index 3a2fab905649df..35abf1b021f5d0 100644
--- a/app/javascript/mastodon/locales/ro.json
+++ b/app/javascript/mastodon/locales/ro.json
@@ -35,9 +35,7 @@
   "account.follow_back": "Urmăreşte înapoi",
   "account.followers": "Urmăritori",
   "account.followers.empty": "Acest utilizator nu are încă urmăritori.",
-  "account.followers_counter": "{count, plural, one {Un abonat} few {{counter} abonați} other {{counter} de abonați}}",
   "account.following": "Urmăriți",
-  "account.following_counter": "{count, plural, one {Un abonament} few {{counter} abonamente} other {{counter} de abonamente}}",
   "account.follows.empty": "Momentan acest utilizator nu are niciun abonament.",
   "account.go_to_profile": "Mergi la profil",
   "account.hide_reblogs": "Ascunde distribuirile de la @{name}",
@@ -62,7 +60,6 @@
   "account.requested_follow": "{name} A cerut să vă urmărească",
   "account.share": "Distribuie profilul lui @{name}",
   "account.show_reblogs": "Afișează distribuirile de la @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
   "account.unblock": "Deblochează pe @{name}",
   "account.unblock_domain": "Deblochează domeniul {domain}",
   "account.unblock_short": "Deblochează",
diff --git a/app/javascript/mastodon/locales/ru.json b/app/javascript/mastodon/locales/ru.json
index 40ca8481476f23..97a1f0b09c3a05 100644
--- a/app/javascript/mastodon/locales/ru.json
+++ b/app/javascript/mastodon/locales/ru.json
@@ -35,9 +35,7 @@
   "account.follow_back": "Подписаться в ответ",
   "account.followers": "Подписчики",
   "account.followers.empty": "На этого пользователя пока никто не подписан.",
-  "account.followers_counter": "{count, plural, one {{counter} подписчик} many {{counter} подписчиков} other {{counter} подписчика}}",
   "account.following": "Подписки",
-  "account.following_counter": "{count, plural, one {{counter} подписка} many {{counter} подписок} other {{counter} подписки}}",
   "account.follows.empty": "Этот пользователь пока ни на кого не подписался.",
   "account.go_to_profile": "Перейти к профилю",
   "account.hide_reblogs": "Скрыть продвижения от @{name}",
@@ -63,7 +61,6 @@
   "account.requested_follow": "{name} отправил(а) вам запрос на подписку",
   "account.share": "Поделиться профилем @{name}",
   "account.show_reblogs": "Показывать продвижения от @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} пост} many {{counter} постов} other {{counter} поста}}",
   "account.unblock": "Разблокировать @{name}",
   "account.unblock_domain": "Разблокировать {domain}",
   "account.unblock_short": "Разблокировать",
diff --git a/app/javascript/mastodon/locales/sa.json b/app/javascript/mastodon/locales/sa.json
index 58654deb0395ca..c3880a6b037504 100644
--- a/app/javascript/mastodon/locales/sa.json
+++ b/app/javascript/mastodon/locales/sa.json
@@ -32,9 +32,7 @@
   "account.follow": "अनुस्रियताम्",
   "account.followers": "अनुसर्तारः",
   "account.followers.empty": "नाऽनुसर्तारो वर्तन्ते",
-  "account.followers_counter": "{count, plural, one {{counter} अनुसर्ता} two {{counter} अनुसर्तारौ} other {{counter} अनुसर्तारः}}",
   "account.following": "अनुसरति",
-  "account.following_counter": "{count, plural, one {{counter} अनुसृतः} two {{counter} अनुसृतौ} other {{counter} अनुसृताः}}",
   "account.follows.empty": "न कोऽप्यनुसृतो वर्तते",
   "account.go_to_profile": "प्रोफायिलं गच्छ",
   "account.hide_reblogs": "@{name} मित्रस्य प्रकाशनानि छिद्यन्ताम्",
@@ -56,7 +54,6 @@
   "account.requested_follow": "{name} त्वामनुसर्तुमयाचीत्",
   "account.share": "@{name} मित्रस्य विवरणं विभाज्यताम्",
   "account.show_reblogs": "@{name} मित्रस्य प्रकाशनानि दृश्यन्ताम्",
-  "account.statuses_counter": "{count, plural, one {{counter} पत्रम्}  two{{counter} पत्रे} other {{counter} पत्राणि}}",
   "account.unblock": "निषेधता नश्यताम् @{name}",
   "account.unblock_domain": "प्रदेशनिषेधता नश्यताम् {domain}",
   "account.unblock_short": "अनवरुन्धि",
diff --git a/app/javascript/mastodon/locales/sc.json b/app/javascript/mastodon/locales/sc.json
index a0b5b327117f98..8955573737836c 100644
--- a/app/javascript/mastodon/locales/sc.json
+++ b/app/javascript/mastodon/locales/sc.json
@@ -26,9 +26,7 @@
   "account.follow": "Sighi",
   "account.followers": "Sighiduras",
   "account.followers.empty": "Nemos sighit ancora custa persone.",
-  "account.followers_counter": "{count, plural, one {{counter} sighidura} other {{counter} sighiduras}}",
   "account.following": "Sighende",
-  "account.following_counter": "{count, plural, one {Sighende a {counter}} other {Sighende a {counter}}}",
   "account.follows.empty": "Custa persone non sighit ancora a nemos.",
   "account.hide_reblogs": "Cua is cumpartziduras de @{name}",
   "account.in_memoriam": "In memoriam.",
@@ -47,7 +45,6 @@
   "account.requested_follow": "{name} at dimandadu de ti sighire",
   "account.share": "Cumpartzi su profilu de @{name}",
   "account.show_reblogs": "Ammustra is cumpartziduras de @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} publicatzione} other {{counter} publicatziones}}",
   "account.unblock": "Isbloca a @{name}",
   "account.unblock_domain": "Isbloca su domìniu {domain}",
   "account.unendorse": "Non cussiges in su profilu",
diff --git a/app/javascript/mastodon/locales/sco.json b/app/javascript/mastodon/locales/sco.json
index 53501a5937071e..397f63fed41f92 100644
--- a/app/javascript/mastodon/locales/sco.json
+++ b/app/javascript/mastodon/locales/sco.json
@@ -31,9 +31,7 @@
   "account.follow": "Follae",
   "account.followers": "Follaers",
   "account.followers.empty": "Naebody follaes this uiser yit.",
-  "account.followers_counter": "{count, plural, one {{counter} Follaer} other {{counter} Follaers}}",
   "account.following": "Follaein",
-  "account.following_counter": "{count, plural, one {{counter} Follaein} other {{counter} Follaein}}",
   "account.follows.empty": "This uiser disnae follae oniebody yit.",
   "account.go_to_profile": "Gang tae profile",
   "account.hide_reblogs": "Dinnae shaw heezes fae @{name}",
@@ -53,7 +51,6 @@
   "account.requested": "Haudin fir approval. Chap tae cancel follae request",
   "account.share": "Share @{name}'s profile",
   "account.show_reblogs": "Shaw heezes frae @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} Post} other {{counter} Posts}}",
   "account.unblock": "Undingie @{name}",
   "account.unblock_domain": "Undingie domain {domain}",
   "account.unblock_short": "Undingie",
diff --git a/app/javascript/mastodon/locales/si.json b/app/javascript/mastodon/locales/si.json
index 22320daefc14a0..fbfdfaa659d131 100644
--- a/app/javascript/mastodon/locales/si.json
+++ b/app/javascript/mastodon/locales/si.json
@@ -23,9 +23,7 @@
   "account.follow": "අනුගමනය",
   "account.followers": "අනුගාමිකයින්",
   "account.followers.empty": "කිසිවෙක් අනුගමනය කර නැත.",
-  "account.followers_counter": "{count, plural, one {අනුගාමිකයින් {counter}} other {අනුගාමිකයින් {counter}}}",
   "account.following": "අනුගමන",
-  "account.following_counter": "{count, plural, one {අනුගමන {counter}} other {අනුගමන {counter}}}",
   "account.follows.empty": "තවමත් කිසිවෙක් අනුගමනය නොකරයි.",
   "account.go_to_profile": "පැතිකඩට යන්න",
   "account.joined_short": "එක් වූ දිනය",
@@ -39,7 +37,6 @@
   "account.posts_with_replies": "ලිපි සහ පිළිතුරු",
   "account.report": "@{name} වාර්තා කරන්න",
   "account.share": "@{name} ගේ පැතිකඩ බෙදාගන්න",
-  "account.statuses_counter": "{count, plural, one {ලිපි {counter}} other {ලිපි {counter}}}",
   "account.unblock": "@{name} අනවහිර කරන්න",
   "account.unblock_domain": "{domain} වසම අනවහිර කරන්න",
   "account.unblock_short": "අනවහිර",
diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json
index 4c152a21434236..ed9c0de604f147 100644
--- a/app/javascript/mastodon/locales/sk.json
+++ b/app/javascript/mastodon/locales/sk.json
@@ -35,9 +35,7 @@
   "account.follow_back": "Sledovať späť",
   "account.followers": "Sledovatelia",
   "account.followers.empty": "Tento účet ešte nikto nesleduje.",
-  "account.followers_counter": "{count, plural, one {{counter} sledujúci účet} few {{counter} sledujúce účty} many {{counter} sledujúcich účtov} other {{counter} sledujúcich účtov}}",
   "account.following": "Sledovaný účet",
-  "account.following_counter": "{count, plural, one {{counter} sledovaný účet} few {{counter} sledované účty} many {{counter} sledovaných účtov} other {{counter} sledovaných účtov}}",
   "account.follows.empty": "Tento účet ešte nikoho nesleduje.",
   "account.go_to_profile": "Prejsť na profil",
   "account.hide_reblogs": "Skryť zdieľania od @{name}",
@@ -63,7 +61,6 @@
   "account.requested_follow": "{name} vás chce sledovať",
   "account.share": "Zdieľaj profil @{name}",
   "account.show_reblogs": "Zobrazovať zdieľania od @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} príspevok} few {{counter} príspevky} many {{counter} príspevkov} other {{counter} príspevkov}}",
   "account.unblock": "Odblokovať @{name}",
   "account.unblock_domain": "Odblokovať doménu {domain}",
   "account.unblock_short": "Odblokovať",
diff --git a/app/javascript/mastodon/locales/sl.json b/app/javascript/mastodon/locales/sl.json
index 195797143b2c9e..2a3d74a80f2b63 100644
--- a/app/javascript/mastodon/locales/sl.json
+++ b/app/javascript/mastodon/locales/sl.json
@@ -35,9 +35,9 @@
   "account.follow_back": "Sledi nazaj",
   "account.followers": "Sledilci",
   "account.followers.empty": "Nihče ne sledi temu uporabniku.",
-  "account.followers_counter": "{count, plural, one {ima {counter} sledilca} two {ima {counter} sledilca} few {ima {counter} sledilce} other {ima {counter} sledilcev}}",
+  "account.followers_counter": "{count, plural, one {{counter} sledilec} two {{counter} sledilca} few {{counter} sledilci} other {{counter} sledilcev}}",
   "account.following": "Sledim",
-  "account.following_counter": "{count, plural, one {sledi {count} osebi} two {sledi {count} osebama} few {sledi {count} osebam} other {sledi {count} osebam}}",
+  "account.following_counter": "{count, plural, one {{counter} sleden} two {{counter} sledena} few {{counter} sledeni} other {{counter} sledenih}}",
   "account.follows.empty": "Ta uporabnik še ne sledi nikomur.",
   "account.go_to_profile": "Pojdi na profil",
   "account.hide_reblogs": "Skrij izpostavitve od @{name}",
@@ -63,7 +63,7 @@
   "account.requested_follow": "{name} vam želi slediti",
   "account.share": "Deli profil osebe @{name}",
   "account.show_reblogs": "Pokaži izpostavitve osebe @{name}",
-  "account.statuses_counter": "{count, plural, one {{count} objava} two {{count} objavi} few {{count} objave} other {{count} objav}}",
+  "account.statuses_counter": "{count, plural, one {{counter} objava} two {{counter} objavi} few {{counter} objave} other {{counter} objav}}",
   "account.unblock": "Odblokiraj @{name}",
   "account.unblock_domain": "Odblokiraj domeno {domain}",
   "account.unblock_short": "Odblokiraj",
diff --git a/app/javascript/mastodon/locales/sq.json b/app/javascript/mastodon/locales/sq.json
index 6903bceff6e11b..6ac038c9f4406d 100644
--- a/app/javascript/mastodon/locales/sq.json
+++ b/app/javascript/mastodon/locales/sq.json
@@ -35,9 +35,7 @@
   "account.follow_back": "Ndiqe gjithashtu",
   "account.followers": "Ndjekës",
   "account.followers.empty": "Këtë përdorues ende s’e ndjek kush.",
-  "account.followers_counter": "{count, plural, one {{counter} Ndjekës} other {{counter} Ndjekës}}",
   "account.following": "Ndjekje",
-  "account.following_counter": "{count, plural, one {{counter} i Ndjekur} other {{counter} të Ndjekur}}",
   "account.follows.empty": "Ky përdorues ende s’ndjek kënd.",
   "account.go_to_profile": "Kalo te profili",
   "account.hide_reblogs": "Fshih përforcime nga @{name}",
@@ -63,7 +61,6 @@
   "account.requested_follow": "{name} ka kërkuar t’ju ndjekë",
   "account.share": "Ndajeni profilin e @{name} me të tjerët",
   "account.show_reblogs": "Shfaq përforcime nga @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} Mesazh} other {{counter} Mesazhe}}",
   "account.unblock": "Zhbllokoje @{name}",
   "account.unblock_domain": "Zhblloko përkatësinë {domain}",
   "account.unblock_short": "Zhbllokoje",
diff --git a/app/javascript/mastodon/locales/sr-Latn.json b/app/javascript/mastodon/locales/sr-Latn.json
index 63b2e03c96c45d..93c3b8fe2ea806 100644
--- a/app/javascript/mastodon/locales/sr-Latn.json
+++ b/app/javascript/mastodon/locales/sr-Latn.json
@@ -35,9 +35,7 @@
   "account.follow_back": "Uzvrati praćenje",
   "account.followers": "Pratioci",
   "account.followers.empty": "Još uvek niko ne prati ovog korisnika.",
-  "account.followers_counter": "{count, plural, one {{counter} pratilac} few {{counter} pratioca} other {{counter} pratilaca}}",
   "account.following": "Prati",
-  "account.following_counter": "{count, plural, one {{counter} prati} few {{counter} prati} other {{counter} prati}}",
   "account.follows.empty": "Ovaj korisnik još uvek nikog ne prati.",
   "account.go_to_profile": "Idi na profil",
   "account.hide_reblogs": "Sakrij podržavanja @{name}",
@@ -63,7 +61,6 @@
   "account.requested_follow": "{name} je zatražio da vas prati",
   "account.share": "Podeli profil korisnika @{name}",
   "account.show_reblogs": "Prikaži podržavanja od korisnika @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} objavio} few {{counter} objavio} other {{counter} objavio}}",
   "account.unblock": "Odblokiraj korisnika @{name}",
   "account.unblock_domain": "Odblokiraj domen {domain}",
   "account.unblock_short": "Odblokiraj",
@@ -696,8 +693,11 @@
   "server_banner.about_active_users": "Ljudi koji su koristili ovaj server u prethodnih 30 dana (mesečno aktivnih korisnika)",
   "server_banner.active_users": "aktivnih korisnika",
   "server_banner.administered_by": "Administrira:",
+  "server_banner.is_one_of_many": "{domain} je jedan od mnogih nezavisnih Mastodon servera koje možete koristiti za učešće u fediverzumu.",
   "server_banner.server_stats": "Statistike servera:",
   "sign_in_banner.create_account": "Napravite nalog",
+  "sign_in_banner.follow_anyone": "Pratite bilo koga širom fediverzuma i pogledajte sve hronološkim redom. Nema algoritama, reklama ili mamaca za klikove na vidiku.",
+  "sign_in_banner.mastodon_is": "Mastodon je najbolji način da budete u toku sa onim što se dešava.",
   "sign_in_banner.sign_in": "Prijavite se",
   "sign_in_banner.sso_redirect": "Prijavite se ili se registrujte",
   "status.admin_account": "Otvori moderatorsko okruženje za @{name}",
diff --git a/app/javascript/mastodon/locales/sr.json b/app/javascript/mastodon/locales/sr.json
index c6b969e982fb22..0273002b37a35f 100644
--- a/app/javascript/mastodon/locales/sr.json
+++ b/app/javascript/mastodon/locales/sr.json
@@ -35,9 +35,7 @@
   "account.follow_back": "Узврати праћење",
   "account.followers": "Пратиоци",
   "account.followers.empty": "Још увек нико не прати овог корисника.",
-  "account.followers_counter": "{count, plural, one {{counter} пратилац} few {{counter} пратиоца} other {{counter} пратилаца}}",
   "account.following": "Прати",
-  "account.following_counter": "{count, plural, one {{counter} прати} few {{counter} прати} other {{counter} прати}}",
   "account.follows.empty": "Овај корисник још увек никог не прати.",
   "account.go_to_profile": "Иди на профил",
   "account.hide_reblogs": "Сакриј подржавања од @{name}",
@@ -63,7 +61,6 @@
   "account.requested_follow": "{name} је затражио да вас прати",
   "account.share": "Подели профил корисника @{name}",
   "account.show_reblogs": "Прикажи подржавања од корисника @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} објавио} few {{counter} објавио} other {{counter} објавио}}",
   "account.unblock": "Одблокирај корисника @{name}",
   "account.unblock_domain": "Одблокирај домен {domain}",
   "account.unblock_short": "Одблокирај",
@@ -696,8 +693,11 @@
   "server_banner.about_active_users": "Људи који су користили овај сервер у претходних 30 дана (месечно активних корисника)",
   "server_banner.active_users": "активних корисника",
   "server_banner.administered_by": "Администрира:",
+  "server_banner.is_one_of_many": "{domain} је један од многих независних Mastodon сервера које можете користити за учешће у федиверзуму.",
   "server_banner.server_stats": "Статистике сервера:",
   "sign_in_banner.create_account": "Направите налог",
+  "sign_in_banner.follow_anyone": "Пратите било кога широм федиверзума и погледајте све хронолошким редом. Нема алгоритама, реклама или мамаца за кликове на видику.",
+  "sign_in_banner.mastodon_is": "Mastodon је најбољи начин да будете у току са оним што се дешава.",
   "sign_in_banner.sign_in": "Пријавите се",
   "sign_in_banner.sso_redirect": "Пријавите се или се региструјте",
   "status.admin_account": "Отвори модераторско окружење за @{name}",
diff --git a/app/javascript/mastodon/locales/sv.json b/app/javascript/mastodon/locales/sv.json
index ced6c36054fd0b..7445b77bacc34b 100644
--- a/app/javascript/mastodon/locales/sv.json
+++ b/app/javascript/mastodon/locales/sv.json
@@ -35,9 +35,7 @@
   "account.follow_back": "Följ tillbaka",
   "account.followers": "Följare",
   "account.followers.empty": "Ingen följer denna användare än.",
-  "account.followers_counter": "{count, plural, one {{counter} följare} other {{counter} följare}}",
   "account.following": "Följer",
-  "account.following_counter": "{count, plural, one {{counter} följd} other {{counter} följda}}",
   "account.follows.empty": "Denna användare följer inte någon än.",
   "account.go_to_profile": "Gå till profilen",
   "account.hide_reblogs": "Dölj boostar från @{name}",
@@ -63,7 +61,6 @@
   "account.requested_follow": "{name} har begärt att följa dig",
   "account.share": "Dela @{name}s profil",
   "account.show_reblogs": "Visa boostar från @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} inlägg} other {{counter} inlägg}}",
   "account.unblock": "Avblockera @{name}",
   "account.unblock_domain": "Avblockera {domain}",
   "account.unblock_short": "Avblockera",
diff --git a/app/javascript/mastodon/locales/szl.json b/app/javascript/mastodon/locales/szl.json
index 43cfc78d5bb373..34d086eb48c079 100644
--- a/app/javascript/mastodon/locales/szl.json
+++ b/app/javascript/mastodon/locales/szl.json
@@ -23,7 +23,6 @@
   "account.posts": "Toots",
   "account.posts_with_replies": "Toots and replies",
   "account.requested": "Awaiting approval",
-  "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
   "account_note.placeholder": "Click to add a note",
   "column.pins": "Pinned toot",
   "community.column_settings.media_only": "Media only",
diff --git a/app/javascript/mastodon/locales/ta.json b/app/javascript/mastodon/locales/ta.json
index ac0984293af780..d44ac424f4f715 100644
--- a/app/javascript/mastodon/locales/ta.json
+++ b/app/javascript/mastodon/locales/ta.json
@@ -24,9 +24,7 @@
   "account.follow_back": "பின்தொடரு",
   "account.followers": "பின்தொடர்பவர்கள்",
   "account.followers.empty": "இதுவரை யாரும் இந்த பயனரைப் பின்தொடரவில்லை.",
-  "account.followers_counter": "{count, plural, one {{counter} வாசகர்} other {{counter} வாசகர்கள்}}",
   "account.following": "பின்தொடரும்",
-  "account.following_counter": "{count, plural,one {{counter} சந்தா} other {{counter} சந்தாக்கள்}}",
   "account.follows.empty": "இந்த பயனர் இதுவரை யாரையும் பின்தொடரவில்லை.",
   "account.go_to_profile": "சுயவிவரத்திற்குச் செல்லவும்",
   "account.hide_reblogs": "இருந்து ஊக்கியாக மறை @{name}",
@@ -45,7 +43,6 @@
   "account.requested": "ஒப்புதலுக்காகக் காத்திருக்கிறது. பின்தொடரும் கோரிக்கையை நீக்க அழுத்தவும்",
   "account.share": "@{name} உடைய விவரத்தை பகிர்",
   "account.show_reblogs": "காட்டு boosts இருந்து @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} டூட்} other {{counter} டூட்டுகள்}}",
   "account.unblock": "@{name} மீது தடை நீக்குக",
   "account.unblock_domain": "{domain} ஐ காண்பி",
   "account.unblock_short": "தடையை நீக்கு",
diff --git a/app/javascript/mastodon/locales/tai.json b/app/javascript/mastodon/locales/tai.json
index 825cfb93bdff25..cad6e8eaa5a478 100644
--- a/app/javascript/mastodon/locales/tai.json
+++ b/app/javascript/mastodon/locales/tai.json
@@ -9,7 +9,6 @@
   "account.posts": "Huah-siann",
   "account.posts_with_replies": "Huah-siann kah huê-ìng",
   "account.requested": "Tán-thāi phue-tsún",
-  "account.statuses_counter": "{count, plural, one {{counter} Huah-siann} other {{counter} Huah-siann}}",
   "account_note.placeholder": "Tiám tsi̍t-ē ka-thiam pī-tsù",
   "column.pins": "Tah thâu-tsîng ê huah-siann",
   "community.column_settings.media_only": "Kan-na muî-thé",
diff --git a/app/javascript/mastodon/locales/te.json b/app/javascript/mastodon/locales/te.json
index 284102c381bc6d..c06472561f9915 100644
--- a/app/javascript/mastodon/locales/te.json
+++ b/app/javascript/mastodon/locales/te.json
@@ -25,7 +25,6 @@
   "account.requested": "ఆమోదం కోసం వేచి ఉంది. అభ్యర్థనను రద్దు చేయడానికి క్లిక్ చేయండి",
   "account.share": "@{name} యొక్క ప్రొఫైల్ను పంచుకోండి",
   "account.show_reblogs": "@{name}నుంచి బూస్ట్ లను చూపించు",
-  "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
   "account.unblock": "@{name}పై బ్లాక్ ను తొలగించు",
   "account.unblock_domain": "{domain}ను దాచవద్దు",
   "account.unendorse": "ప్రొఫైల్లో చూపించవద్దు",
diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json
index 64abb394bfce4b..e1d556ebf0e4cf 100644
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@@ -35,9 +35,7 @@
   "account.follow_back": "ติดตามกลับ",
   "account.followers": "ผู้ติดตาม",
   "account.followers.empty": "ยังไม่มีใครติดตามผู้ใช้นี้",
-  "account.followers_counter": "{count, plural, other {{counter} ผู้ติดตาม}}",
   "account.following": "กำลังติดตาม",
-  "account.following_counter": "{count, plural, other {{counter} กำลังติดตาม}}",
   "account.follows.empty": "ผู้ใช้นี้ยังไม่ได้ติดตามใคร",
   "account.go_to_profile": "ไปยังโปรไฟล์",
   "account.hide_reblogs": "ซ่อนการดันจาก @{name}",
@@ -63,7 +61,6 @@
   "account.requested_follow": "{name} ได้ขอติดตามคุณ",
   "account.share": "แชร์โปรไฟล์ของ @{name}",
   "account.show_reblogs": "แสดงการดันจาก @{name}",
-  "account.statuses_counter": "{count, plural, other {{counter} โพสต์}}",
   "account.unblock": "เลิกปิดกั้น @{name}",
   "account.unblock_domain": "เลิกปิดกั้นโดเมน {domain}",
   "account.unblock_short": "เลิกปิดกั้น",
diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json
index 0bb2a0e4a60a98..ac39a3fd7b6e39 100644
--- a/app/javascript/mastodon/locales/tr.json
+++ b/app/javascript/mastodon/locales/tr.json
@@ -35,9 +35,9 @@
   "account.follow_back": "Geri takip et",
   "account.followers": "Takipçi",
   "account.followers.empty": "Henüz kimse bu kullanıcıyı takip etmiyor.",
-  "account.followers_counter": "{count, plural, one {{counter} Takipçi} other {{counter} Takipçi}}",
+  "account.followers_counter": "{count, plural, one {{counter} takipçi} other {{counter} takipçi}}",
   "account.following": "Takip Ediliyor",
-  "account.following_counter": "{count, plural, one {{counter} Takip Edilen} other {{counter} Takip Edilen}}",
+  "account.following_counter": "{count, plural, one {{counter} takip edilen} other {{counter} takip edilen}}",
   "account.follows.empty": "Bu kullanıcı henüz kimseyi takip etmiyor.",
   "account.go_to_profile": "Profile git",
   "account.hide_reblogs": "@{name} kişisinin boostlarını gizle",
@@ -63,7 +63,7 @@
   "account.requested_follow": "{name} size takip isteği gönderdi",
   "account.share": "@{name} adlı kişinin profilini paylaş",
   "account.show_reblogs": "@{name} kişisinin yeniden paylaşımlarını göster",
-  "account.statuses_counter": "{count, plural, one {{counter} Gönderi} other {{counter} Gönderi}}",
+  "account.statuses_counter": "{count, plural, one {{counter} gönderi} other {{counter} gönderi}}",
   "account.unblock": "@{name} adlı kişinin engelini kaldır",
   "account.unblock_domain": "{domain} alan adının engelini kaldır",
   "account.unblock_short": "Engeli kaldır",
diff --git a/app/javascript/mastodon/locales/tt.json b/app/javascript/mastodon/locales/tt.json
index 273c1a6de703cc..baba3190dc39a6 100644
--- a/app/javascript/mastodon/locales/tt.json
+++ b/app/javascript/mastodon/locales/tt.json
@@ -31,9 +31,7 @@
   "account.follow": "Язылу",
   "account.followers": "Язылучы",
   "account.followers.empty": "Әле беркем дә язылмаган.",
-  "account.followers_counter": "{count, plural,one {{counter} язылучы} other {{counter} язылучы}}",
   "account.following": "Язылулар",
-  "account.following_counter": "{count, plural, one {{counter} язылу} other {{counter} язылу}}",
   "account.follows.empty": "Беркемгә дә язылмаган әле.",
   "account.go_to_profile": "Профильгә күчү",
   "account.hide_reblogs": "Скрывать көчен нче @{name}",
@@ -55,7 +53,6 @@
   "account.requested_follow": "{name} Сезгә язылу соравын җиберде",
   "account.share": "@{name} профиле белән уртаклашу",
   "account.show_reblogs": "Күрсәтергә көчәйтү нче @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} язма} other {{counter} язма}}",
   "account.unblock": "@{name} бикләвен чыгу",
   "account.unblock_domain": "{domain} бикләвен чыгу",
   "account.unblock_short": "Бикләүне чыгу",
diff --git a/app/javascript/mastodon/locales/ug.json b/app/javascript/mastodon/locales/ug.json
index 4120d4483b264c..e3dd0e6b1187b7 100644
--- a/app/javascript/mastodon/locales/ug.json
+++ b/app/javascript/mastodon/locales/ug.json
@@ -6,7 +6,6 @@
   "account.posts": "Toots",
   "account.posts_with_replies": "Toots and replies",
   "account.requested": "Awaiting approval",
-  "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
   "account_note.placeholder": "Click to add a note",
   "column.pins": "Pinned toot",
   "community.column_settings.media_only": "Media only",
diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json
index 22cd15bd23198b..338b6506178e22 100644
--- a/app/javascript/mastodon/locales/uk.json
+++ b/app/javascript/mastodon/locales/uk.json
@@ -35,9 +35,7 @@
   "account.follow_back": "Підписатися взаємно",
   "account.followers": "Підписники",
   "account.followers.empty": "Ніхто ще не підписаний на цього користувача.",
-  "account.followers_counter": "{count, plural, one {{counter} підписник} few {{counter} підписники} many {{counter} підписників} other {{counter} підписники}}",
   "account.following": "Ви стежите",
-  "account.following_counter": "{count, plural, one {{counter} підписка} few {{counter} підписки} many {{counter} підписок} other {{counter} підписки}}",
   "account.follows.empty": "Цей користувач ще ні на кого не підписався.",
   "account.go_to_profile": "Перейти до профілю",
   "account.hide_reblogs": "Сховати поширення від @{name}",
@@ -63,7 +61,6 @@
   "account.requested_follow": "{name} надсилає запит на стеження",
   "account.share": "Поділитися профілем @{name}",
   "account.show_reblogs": "Показати поширення від @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} допис} few {{counter} дописи} many {{counter} дописів} other {{counter} дописи}}",
   "account.unblock": "Розблокувати @{name}",
   "account.unblock_domain": "Розблокувати {domain}",
   "account.unblock_short": "Розблокувати",
diff --git a/app/javascript/mastodon/locales/ur.json b/app/javascript/mastodon/locales/ur.json
index 1b9f8d9691d03f..cf53eb6fe8a7d8 100644
--- a/app/javascript/mastodon/locales/ur.json
+++ b/app/javascript/mastodon/locales/ur.json
@@ -29,9 +29,7 @@
   "account.follow_back": "اکاؤنٹ کو فالو بیک ",
   "account.followers": "پیروکار",
   "account.followers.empty": "ہنوز اس صارف کی کوئی پیروی نہیں کرتا.",
-  "account.followers_counter": "{count, plural,one {{counter} پیروکار} other {{counter} پیروکار}}",
   "account.following": "فالو کر رہے ہیں",
-  "account.following_counter": "{count, plural, one {{counter} پیروی کر رہے ہیں} other {{counter} پیروی کر رہے ہیں}}",
   "account.follows.empty": "\"یہ صارف ہنوز کسی کی پیروی نہیں کرتا ہے\".",
   "account.go_to_profile": "پروفائل پر جائیں",
   "account.hide_reblogs": "@{name} سے فروغ چھپائیں",
@@ -57,7 +55,6 @@
   "account.requested_follow": "{name} آپ کو فالو کرنا چھاتا ہے۔",
   "account.share": "@{name} کے مشخص کو بانٹیں",
   "account.show_reblogs": "@{name} کی افزائشات کو دکھائیں",
-  "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
   "account.unblock": "@{name} کو بحال کریں",
   "account.unblock_domain": "{domain} کو نہ چھپائیں",
   "account.unblock_short": "بلاک ختم کریں",
diff --git a/app/javascript/mastodon/locales/uz.json b/app/javascript/mastodon/locales/uz.json
index 77892914a42263..4824b1d3320fa7 100644
--- a/app/javascript/mastodon/locales/uz.json
+++ b/app/javascript/mastodon/locales/uz.json
@@ -31,9 +31,7 @@
   "account.follow": "Obuna bo‘lish",
   "account.followers": "Obunachilar",
   "account.followers.empty": "Bu foydalanuvchini hali hech kim kuzatmaydi.",
-  "account.followers_counter": "{count, plural, one {{counter} Muxlis} other {{counter} Muxlislar}}",
   "account.following": "Kuzatish",
-  "account.following_counter": "{count, plural, one {{counter} ga Muxlis} other {{counter} larga muxlis}}",
   "account.follows.empty": "Bu foydalanuvchi hali hech kimni kuzatmagan.",
   "account.go_to_profile": "Profilga o'tish",
   "account.hide_reblogs": "@{name} dan boostlarni yashirish",
@@ -54,7 +52,6 @@
   "account.requested_follow": "{name} sizni kuzatishni soʻradi",
   "account.share": "@{name} profilini ulashing",
   "account.show_reblogs": "@{name} dan bootlarni ko'rsatish",
-  "account.statuses_counter": "{count, plural, one {{counter} Post} other {{counter} Postlar}}",
   "account.unblock": "@{name} ni blokdan chiqarish",
   "account.unblock_domain": "{domain} domenini blokdan chiqarish",
   "account.unblock_short": "Blokdan chiqarish",
diff --git a/app/javascript/mastodon/locales/vi.json b/app/javascript/mastodon/locales/vi.json
index 18f0fec3c574af..bbfecf2c8a8c52 100644
--- a/app/javascript/mastodon/locales/vi.json
+++ b/app/javascript/mastodon/locales/vi.json
@@ -35,9 +35,7 @@
   "account.follow_back": "Theo dõi lại",
   "account.followers": "Người theo dõi",
   "account.followers.empty": "Chưa có người theo dõi nào.",
-  "account.followers_counter": "{count, plural, one {{counter} Người theo dõi} other {{counter} Người theo dõi}}",
   "account.following": "Đang theo dõi",
-  "account.following_counter": "{count, plural, one {{counter} Theo dõi} other {{counter} Theo dõi}}",
   "account.follows.empty": "Người này chưa theo dõi ai.",
   "account.go_to_profile": "Xem hồ sơ",
   "account.hide_reblogs": "Ẩn tút @{name} đăng lại",
@@ -63,7 +61,6 @@
   "account.requested_follow": "{name} yêu cầu theo dõi bạn",
   "account.share": "Chia sẻ @{name}",
   "account.show_reblogs": "Hiện tút do @{name} đăng lại",
-  "account.statuses_counter": "{count, plural, one {{counter} Tút} other {{counter} Tút}}",
   "account.unblock": "Bỏ chặn @{name}",
   "account.unblock_domain": "Bỏ ẩn {domain}",
   "account.unblock_short": "Bỏ chặn",
diff --git a/app/javascript/mastodon/locales/zgh.json b/app/javascript/mastodon/locales/zgh.json
index 1d3a22108cd7ba..b42bb7589ce668 100644
--- a/app/javascript/mastodon/locales/zgh.json
+++ b/app/javascript/mastodon/locales/zgh.json
@@ -19,7 +19,6 @@
   "account.posts_with_replies": "Toots and replies",
   "account.requested": "Awaiting approval",
   "account.share": "ⴱⴹⵓ ⵉⴼⵔⵙ ⵏ @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
   "account.unfollow": "ⴽⴽⵙ ⴰⴹⴼⴼⵓⵕ",
   "account_note.placeholder": "Click to add a note",
   "bundle_column_error.retry": "ⴰⵍⵙ ⴰⵔⵎ",
diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json
index 3456f99d25c15b..f2accae0d066cb 100644
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@@ -35,9 +35,9 @@
   "account.follow_back": "回关",
   "account.followers": "关注者",
   "account.followers.empty": "目前无人关注此用户。",
-  "account.followers_counter": "被 {counter} 人关注",
+  "account.followers_counter": "{count, plural, other {{counter} 关注者}}",
   "account.following": "正在关注",
-  "account.following_counter": "正在关注 {counter} 人",
+  "account.following_counter": "{count, plural, other {{counter} 关注}}",
   "account.follows.empty": "此用户目前未关注任何人。",
   "account.go_to_profile": "前往个人资料页",
   "account.hide_reblogs": "隐藏来自 @{name} 的转嘟",
@@ -63,7 +63,7 @@
   "account.requested_follow": "{name} 已经向你发送了关注请求",
   "account.share": "分享 @{name} 的个人资料页",
   "account.show_reblogs": "显示来自 @{name} 的转嘟",
-  "account.statuses_counter": "{counter} 条嘟文",
+  "account.statuses_counter": "{count, plural, other {{counter} 嘟文}}",
   "account.unblock": "取消屏蔽 @{name}",
   "account.unblock_domain": "取消屏蔽 {domain} 域名",
   "account.unblock_short": "取消屏蔽",
@@ -699,6 +699,7 @@
   "server_banner.is_one_of_many": "{domain} 是可用于参与联邦宇宙的众多独立 Mastodon 服务器之一。",
   "server_banner.server_stats": "服务器统计数据：",
   "sign_in_banner.create_account": "创建账户",
+  "sign_in_banner.follow_anyone": "关注联邦宇宙中的任何人，并按时间顺序查看所有内容。没有算法、广告或诱导链接。",
   "sign_in_banner.mastodon_is": "Mastodon 是了解最新动态的最佳途径。",
   "sign_in_banner.sign_in": "登录",
   "sign_in_banner.sso_redirect": "登录或注册",
diff --git a/app/javascript/mastodon/locales/zh-HK.json b/app/javascript/mastodon/locales/zh-HK.json
index 5dff466201e41c..09a497e889d40c 100644
--- a/app/javascript/mastodon/locales/zh-HK.json
+++ b/app/javascript/mastodon/locales/zh-HK.json
@@ -35,9 +35,7 @@
   "account.follow_back": "追蹤對方",
   "account.followers": "追蹤者",
   "account.followers.empty": "尚未有人追蹤這位使用者。",
-  "account.followers_counter": "有 {count, plural,one {{counter} 個} other {{counter} 個}}追蹤者",
   "account.following": "正在追蹤",
-  "account.following_counter": "正在追蹤 {count, plural,one {{counter}}other {{counter} 人}}",
   "account.follows.empty": "這位使用者尚未追蹤任何人。",
   "account.go_to_profile": "前往個人檔案",
   "account.hide_reblogs": "隱藏 @{name} 的轉推",
@@ -63,7 +61,6 @@
   "account.requested_follow": "{name} 要求追蹤你",
   "account.share": "分享 @{name} 的個人檔案",
   "account.show_reblogs": "顯示 @{name} 的轉推",
-  "account.statuses_counter": "{count, plural,one {{counter} 篇}other {{counter} 篇}}帖文",
   "account.unblock": "解除封鎖 @{name}",
   "account.unblock_domain": "解除封鎖網域 {domain}",
   "account.unblock_short": "解除封鎖",
diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json
index 4ab22daba5af8f..04469a971d5cbf 100644
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@@ -35,9 +35,9 @@
   "account.follow_back": "跟隨回去",
   "account.followers": "跟隨者",
   "account.followers.empty": "尚未有人跟隨這位使用者。",
-  "account.followers_counter": "被 {count, plural, other {{counter} 人}}跟隨",
+  "account.followers_counter": "被 {count, plural, other {{count} 人}}跟隨",
   "account.following": "跟隨中",
-  "account.following_counter": "正在跟隨 {count,plural,other {{counter} 人}}",
+  "account.following_counter": "正在跟隨 {count,plural,other {{count} 人}}",
   "account.follows.empty": "這位使用者尚未跟隨任何人。",
   "account.go_to_profile": "前往個人檔案",
   "account.hide_reblogs": "隱藏來自 @{name} 的轉嘟",
@@ -63,7 +63,7 @@
   "account.requested_follow": "{name} 要求跟隨您",
   "account.share": "分享 @{name} 的個人檔案",
   "account.show_reblogs": "顯示來自 @{name} 的轉嘟",
-  "account.statuses_counter": "{count, plural,one {{counter} 則}other {{counter} 則}}嘟文",
+  "account.statuses_counter": "{count, plural, other {{count} 則嘟文}}",
   "account.unblock": "解除封鎖 @{name}",
   "account.unblock_domain": "解除封鎖網域 {domain}",
   "account.unblock_short": "解除封鎖",
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index f108718e5ee8be..be87258daf22bb 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -293,7 +293,7 @@ fi:
       filter_by_action: Suodata tapahtuman mukaan
       filter_by_user: Suodata käyttäjän mukaan
       title: Auditointiloki
-      unavailable_instance: "(verkkotunnus ei ole saatavilla)"
+      unavailable_instance: "(verkkotunnus ei saatavilla)"
     announcements:
       destroyed_msg: Tiedote poistettu onnistuneesti!
       edit:
diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml
index 776e473ee7a6cb..f6e6d4d2a68f03 100644
--- a/config/locales/sr-Latn.yml
+++ b/config/locales/sr-Latn.yml
@@ -577,7 +577,7 @@ sr-Latn:
     relays:
       add_new: Dodaj novi relej
       delete: Obriši
-      description_html: "<strong>Federalni relej</strong> je posrednički server koji razmenjuje velike količine javnih truba između servera na koji je pretplaćen i na koji objavljuje.<strong>Može pomoći malim i srednjim serverima da otkriju sadržaj iz fediversa</strong>, koji inače zahteva od lokalnih korisnika da ručno pratiti ostale ljude na udaljenim serverima."
+      description_html: "<strong>Federalni relej</strong> je posrednički server koji razmenjuje velike količine javnih objava između servera na koji je pretplaćen i na koji objavljuje.<strong>Može pomoći malim i srednjim serverima da otkriju sadržaj iz fediverzuma</strong>, koji inače zahteva od lokalnih korisnika da ručno pratiti ostale ljude na udaljenim serverima."
       disable: Isključi
       disabled: Isključen
       enable: Uključi
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 365b358d5af77c..9bfefde83c0db0 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -577,7 +577,7 @@ sr:
     relays:
       add_new: Додај нови релеј
       delete: Обриши
-      description_html: "<strong>Федерални релеј</strong> је посреднички сервер који размењује велике количине јавних труба између сервера на који је претплаћен и на који објављује.<strong>Може помоћи малим и средњим серверима да открију садржај из федиверса</strong>, који иначе захтева од локалних корисника да ручно пратити остале људе на удаљеним серверима."
+      description_html: "<strong>Федерални релеј</strong> је посреднички сервер који размењује велике количине јавних објава између сервера на који је претплаћен и на који објављује.<strong>Може помоћи малим и средњим серверима да открију садржај из федиверзума</strong>, који иначе захтева од локалних корисника да ручно пратити остале људе на удаљеним серверима."
       disable: Искључи
       disabled: Искључен
       enable: Укључи
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 93de27c0b29ae8..1317d5f70740a5 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -525,7 +525,7 @@ zh-TW:
       total_followed_by_us: 被我們跟隨
       total_reported: 關於他們的檢舉報告
       total_storage: 多媒體附加檔案
-      totals_time_period_hint_html: 以下顯示之總和包含所有時間的資料。
+      totals_time_period_hint_html: 以下顯示之統計包含所有時間的資料。
       unknown_instance: 此伺服器目前沒有這個網域的紀錄。
     invites:
       deactivate_all: 全部停用

From 096057b845f27fd6090915b22c8688a6eeb22e28 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 27 Jun 2024 15:17:18 +0200
Subject: [PATCH 1412/2191] Change `author_account` to be `authors` in REST API
 (#30846)

---
 .../mastodon/actions/importer/index.js           |  4 ++--
 .../mastodon/actions/importer/normalizer.js      | 11 +++++++++--
 app/javascript/mastodon/actions/trends.js        |  2 +-
 app/javascript/mastodon/api_types/statuses.ts    |  7 +++++++
 .../features/explore/components/author_link.jsx  |  4 ++++
 .../mastodon/features/explore/links.jsx          |  2 +-
 .../mastodon/features/status/components/card.jsx |  4 ++--
 app/models/preview_card.rb                       | 16 ++++++++++++++++
 app/serializers/rest/preview_card_serializer.rb  |  7 ++++++-
 9 files changed, 48 insertions(+), 9 deletions(-)

diff --git a/app/javascript/mastodon/actions/importer/index.js b/app/javascript/mastodon/actions/importer/index.js
index d906bdfb14c4ec..516a7a79733300 100644
--- a/app/javascript/mastodon/actions/importer/index.js
+++ b/app/javascript/mastodon/actions/importer/index.js
@@ -76,8 +76,8 @@ export function importFetchedStatuses(statuses) {
         pushUnique(polls, normalizePoll(status.poll, getState().getIn(['polls', status.poll.id])));
       }
 
-      if (status.card?.author_account) {
-        pushUnique(accounts, status.card.author_account);
+      if (status.card) {
+        status.card.authors.forEach(author => author.account && pushUnique(accounts, author.account));
       }
     }
 
diff --git a/app/javascript/mastodon/actions/importer/normalizer.js b/app/javascript/mastodon/actions/importer/normalizer.js
index be76b0f391692d..c09a3f442c7cb5 100644
--- a/app/javascript/mastodon/actions/importer/normalizer.js
+++ b/app/javascript/mastodon/actions/importer/normalizer.js
@@ -36,8 +36,15 @@ export function normalizeStatus(status, normalOldStatus) {
     normalStatus.poll = status.poll.id;
   }
 
-  if (status.card?.author_account) {
-    normalStatus.card = { ...status.card, author_account: status.card.author_account.id };
+  if (status.card) {
+    normalStatus.card = {
+      ...status.card,
+      authors: status.card.authors.map(author => ({
+        ...author,
+        accountId: author.account?.id,
+        account: undefined,
+      })),
+    };
   }
 
   if (status.filtered) {
diff --git a/app/javascript/mastodon/actions/trends.js b/app/javascript/mastodon/actions/trends.js
index 01089fccbb764d..0bdf17a5d26e50 100644
--- a/app/javascript/mastodon/actions/trends.js
+++ b/app/javascript/mastodon/actions/trends.js
@@ -51,7 +51,7 @@ export const fetchTrendingLinks = () => (dispatch) => {
   api()
     .get('/api/v1/trends/links', { params: { limit: 20 } })
     .then(({ data }) => {
-      dispatch(importFetchedAccounts(data.map(link => link.author_account).filter(account => !!account)));
+      dispatch(importFetchedAccounts(data.flatMap(link => link.authors.map(author => author.account)).filter(account => !!account)));
       dispatch(fetchTrendingLinksSuccess(data));
     })
     .catch(err => dispatch(fetchTrendingLinksFail(err)));
diff --git a/app/javascript/mastodon/api_types/statuses.ts b/app/javascript/mastodon/api_types/statuses.ts
index c7dd33b5dade30..db4e20506fedf3 100644
--- a/app/javascript/mastodon/api_types/statuses.ts
+++ b/app/javascript/mastodon/api_types/statuses.ts
@@ -30,6 +30,12 @@ export interface ApiMentionJSON {
   acct: string;
 }
 
+export interface ApiPreviewCardAuthorJSON {
+  name: string;
+  url: string;
+  account?: ApiAccountJSON;
+}
+
 export interface ApiPreviewCardJSON {
   url: string;
   title: string;
@@ -48,6 +54,7 @@ export interface ApiPreviewCardJSON {
   embed_url: string;
   blurhash: string;
   published_at: string;
+  authors: ApiPreviewCardAuthorJSON[];
 }
 
 export interface ApiStatusJSON {
diff --git a/app/javascript/mastodon/features/explore/components/author_link.jsx b/app/javascript/mastodon/features/explore/components/author_link.jsx
index 8dd9b0dabd1356..764ae753412d95 100644
--- a/app/javascript/mastodon/features/explore/components/author_link.jsx
+++ b/app/javascript/mastodon/features/explore/components/author_link.jsx
@@ -8,6 +8,10 @@ import { useAppSelector } from 'mastodon/store';
 export const AuthorLink = ({ accountId }) => {
   const account = useAppSelector(state => state.getIn(['accounts', accountId]));
 
+  if (!account) {
+    return null;
+  }
+
   return (
     <Link to={`/@${account.get('acct')}`} className='story__details__shared__author-link' data-hover-card-account={accountId}>
       <Avatar account={account} size={16} />
diff --git a/app/javascript/mastodon/features/explore/links.jsx b/app/javascript/mastodon/features/explore/links.jsx
index 93fd1fb6ddebc7..035e5aaad81d13 100644
--- a/app/javascript/mastodon/features/explore/links.jsx
+++ b/app/javascript/mastodon/features/explore/links.jsx
@@ -75,7 +75,7 @@ class Links extends PureComponent {
             publisher={link.get('provider_name')}
             publishedAt={link.get('published_at')}
             author={link.get('author_name')}
-            authorAccount={link.getIn(['author_account', 'id'])}
+            authorAccount={link.getIn(['authors', 0, 'account', 'id'])}
             sharedTimes={link.getIn(['history', 0, 'accounts']) * 1 + link.getIn(['history', 1, 'accounts']) * 1}
             thumbnail={link.get('image')}
             thumbnailDescription={link.get('image_description')}
diff --git a/app/javascript/mastodon/features/status/components/card.jsx b/app/javascript/mastodon/features/status/components/card.jsx
index f562e53f0ba334..f0ae40cbc412f5 100644
--- a/app/javascript/mastodon/features/status/components/card.jsx
+++ b/app/javascript/mastodon/features/status/components/card.jsx
@@ -138,7 +138,7 @@ export default class Card extends PureComponent {
     const interactive = card.get('type') === 'video';
     const language    = card.get('language') || '';
     const largeImage  = (card.get('image')?.length > 0 && card.get('width') > card.get('height')) || interactive;
-    const showAuthor  = !!card.get('author_account');
+    const showAuthor  = !!card.getIn(['authors', 0, 'accountId']);
 
     const description = (
       <div className='status-card__content'>
@@ -244,7 +244,7 @@ export default class Card extends PureComponent {
           {description}
         </a>
 
-        {showAuthor && <MoreFromAuthor accountId={card.get('author_account')} />}
+        {showAuthor && <MoreFromAuthor accountId={card.getIn(['authors', 0, 'accountId'])} />}
       </>
     );
   }
diff --git a/app/models/preview_card.rb b/app/models/preview_card.rb
index cbfc39378652fb..eac02ac14ff05c 100644
--- a/app/models/preview_card.rb
+++ b/app/models/preview_card.rb
@@ -128,6 +128,22 @@ def history
     @history ||= Trends::History.new('links', id)
   end
 
+  def authors
+    @authors ||= [PreviewCard::Author.new(self)]
+  end
+
+  class Author < ActiveModelSerializers::Model
+    attributes :name, :url, :account
+
+    def initialize(preview_card)
+      super(
+        name: preview_card.author_name,
+        url: preview_card.author_url,
+        account: preview_card.author_account,
+      )
+    end
+  end
+
   class << self
     private
 
diff --git a/app/serializers/rest/preview_card_serializer.rb b/app/serializers/rest/preview_card_serializer.rb
index 7d4c99c2d1f9ac..f73a051ac0f468 100644
--- a/app/serializers/rest/preview_card_serializer.rb
+++ b/app/serializers/rest/preview_card_serializer.rb
@@ -1,6 +1,11 @@
 # frozen_string_literal: true
 
 class REST::PreviewCardSerializer < ActiveModel::Serializer
+  class AuthorSerializer < ActiveModel::Serializer
+    attributes :name, :url
+    has_one :account, serializer: REST::AccountSerializer
+  end
+
   include RoutingHelper
 
   attributes :url, :title, :description, :language, :type,
@@ -8,7 +13,7 @@ class REST::PreviewCardSerializer < ActiveModel::Serializer
              :provider_url, :html, :width, :height,
              :image, :image_description, :embed_url, :blurhash, :published_at
 
-  has_one :author_account, serializer: REST::AccountSerializer, if: -> { object.author_account.present? }
+  has_many :authors, serializer: AuthorSerializer
 
   def url
     object.original_url.presence || object.url

From 42adb6eaee3250e3557403ce52513e3d31b3ab80 Mon Sep 17 00:00:00 2001
From: David Roetzel <david@roetzel.de>
Date: Thu, 27 Jun 2024 16:40:19 +0200
Subject: [PATCH 1413/2191] Add size limit for link preview URLs (#30854)

---
 app/services/fetch_link_card_service.rb       |  5 ++++-
 spec/services/fetch_link_card_service_spec.rb | 13 +++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/app/services/fetch_link_card_service.rb b/app/services/fetch_link_card_service.rb
index 900cb9863dd395..9692dd21bb54c3 100644
--- a/app/services/fetch_link_card_service.rb
+++ b/app/services/fetch_link_card_service.rb
@@ -15,6 +15,9 @@ class FetchLinkCardService < BaseService
     )
   }iox
 
+  # URL size limit to safely store in PosgreSQL's unique indexes
+  BYTESIZE_LIMIT = 2692
+
   def call(status)
     @status       = status
     @original_url = parse_urls
@@ -85,7 +88,7 @@ def parse_urls
 
   def bad_url?(uri)
     # Avoid local instance URLs and invalid URLs
-    uri.host.blank? || TagManager.instance.local_url?(uri.to_s) || !%w(http https).include?(uri.scheme)
+    uri.host.blank? || TagManager.instance.local_url?(uri.to_s) || !%w(http https).include?(uri.scheme) || uri.to_s.bytesize > BYTESIZE_LIMIT
   end
 
   def mention_link?(anchor)
diff --git a/spec/services/fetch_link_card_service_spec.rb b/spec/services/fetch_link_card_service_spec.rb
index 239f84fde940a3..4f02aba54012bc 100644
--- a/spec/services/fetch_link_card_service_spec.rb
+++ b/spec/services/fetch_link_card_service_spec.rb
@@ -193,6 +193,19 @@
       end
     end
 
+    context 'with an URL too long for PostgreSQL unique indexes' do
+      let(:url) { "http://example.com/#{'a' * 2674}" }
+      let(:status) { Fabricate(:status, text: url) }
+
+      it 'does not fetch the URL' do
+        expect(a_request(:get, url)).to_not have_been_made
+      end
+
+      it 'does not create a preview card' do
+        expect(status.preview_card).to be_nil
+      end
+    end
+
     context 'with a URL of a page with oEmbed support' do
       let(:html) { '<!doctype html><title>Hello world</title><link rel="alternate" type="application/json+oembed" href="http://example.com/oembed?url=http://example.com/html">' }
       let(:status) { Fabricate(:status, text: 'http://example.com/html') }

From ff08d99d4dceebd720e16e4a40118cbd6941b0ca Mon Sep 17 00:00:00 2001
From: David Roetzel <david@roetzel.de>
Date: Thu, 27 Jun 2024 16:41:03 +0200
Subject: [PATCH 1414/2191] Catch encoding errors when creating link previews.
 (#30853)

---
 app/services/fetch_link_card_service.rb           | 2 +-
 spec/fixtures/requests/redirect_with_utf8_url.txt | 5 +++++
 spec/services/fetch_link_card_service_spec.rb     | 9 +++++++++
 3 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 spec/fixtures/requests/redirect_with_utf8_url.txt

diff --git a/app/services/fetch_link_card_service.rb b/app/services/fetch_link_card_service.rb
index 9692dd21bb54c3..8bc9f912c55da0 100644
--- a/app/services/fetch_link_card_service.rb
+++ b/app/services/fetch_link_card_service.rb
@@ -32,7 +32,7 @@ def call(status)
     end
 
     attach_card if @card&.persisted?
-  rescue HTTP::Error, OpenSSL::SSL::SSLError, Addressable::URI::InvalidURIError, Mastodon::HostValidationError, Mastodon::LengthValidationError => e
+  rescue HTTP::Error, OpenSSL::SSL::SSLError, Addressable::URI::InvalidURIError, Mastodon::HostValidationError, Mastodon::LengthValidationError, Encoding::UndefinedConversionError => e
     Rails.logger.debug { "Error fetching link #{@original_url}: #{e}" }
     nil
   end
diff --git a/spec/fixtures/requests/redirect_with_utf8_url.txt b/spec/fixtures/requests/redirect_with_utf8_url.txt
new file mode 100644
index 00000000000000..08f99ee2aed25e
--- /dev/null
+++ b/spec/fixtures/requests/redirect_with_utf8_url.txt
@@ -0,0 +1,5 @@
+HTTP/1.1 301 Moved Permanently
+server: nginx
+date: Thu, 27 Jun 2024 11:04:53 GMT
+content-type: text/html; charset=UTF-8
+location: http://example.com/ärgerliche-umlaute.html
diff --git a/spec/services/fetch_link_card_service_spec.rb b/spec/services/fetch_link_card_service_spec.rb
index 4f02aba54012bc..d83a5275149962 100644
--- a/spec/services/fetch_link_card_service_spec.rb
+++ b/spec/services/fetch_link_card_service_spec.rb
@@ -27,6 +27,7 @@
     stub_request(:get, 'http://example.com/koi8-r').to_return(request_fixture('koi8-r.txt'))
     stub_request(:get, 'http://example.com/windows-1251').to_return(request_fixture('windows-1251.txt'))
     stub_request(:get, 'http://example.com/low_confidence_latin1').to_return(request_fixture('low_confidence_latin1.txt'))
+    stub_request(:get, 'http://example.com/aergerliche-umlaute').to_return(request_fixture('redirect_with_utf8_url.txt'))
 
     Rails.cache.write('oembed_endpoint:example.com', oembed_cache) if oembed_cache
 
@@ -101,6 +102,14 @@
       end
     end
 
+    context 'with a redirect URL with faulty encoding' do
+      let(:status) { Fabricate(:status, text: 'http://example.com/aergerliche-umlaute') }
+
+      it 'does not create a preview card' do
+        expect(status.preview_card).to be_nil
+      end
+    end
+
     context 'with a 404 URL' do
       let(:status) { Fabricate(:status, text: 'http://example.com/not-found') }
 

From b15a3614dc7466e983e1394a12a16874a812e672 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 27 Jun 2024 17:25:27 +0200
Subject: [PATCH 1415/2191] Stub `Vips::Error` when not using libvips (#30857)

---
 config/initializers/vips.rb | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/config/initializers/vips.rb b/config/initializers/vips.rb
index 25a17b2a171fca..8d5d5cdc91c114 100644
--- a/config/initializers/vips.rb
+++ b/config/initializers/vips.rb
@@ -25,3 +25,11 @@
 
   Vips.block_untrusted(true)
 end
+
+# In some places of the code, we rescue this exception, but we don't always
+# load libvips, so it may be an undefined constant:
+unless defined?(Vips)
+  module Vips
+    class Error < StandardError; end
+  end
+end

From 836c0477ac63ea61b955bfb900cf52ec29554e40 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 27 Jun 2024 12:03:26 -0400
Subject: [PATCH 1416/2191] Use vips setting instead of env var in media
 processing spec (#30859)

---
 spec/models/media_attachment_spec.rb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/spec/models/media_attachment_spec.rb b/spec/models/media_attachment_spec.rb
index 221645ac5ae356..a8f1ce7745ee6e 100644
--- a/spec/models/media_attachment_spec.rb
+++ b/spec/models/media_attachment_spec.rb
@@ -210,10 +210,14 @@
       expect(media.file.meta['original']['duration']).to be_within(0.05).of(0.235102)
       expect(media.thumbnail.present?).to be true
 
-      # NOTE: Our libvips and ImageMagick implementations currently have different results
-      expect(media.file.meta['colors']['background']).to eq(ENV['MASTODON_USE_LIBVIPS'] ? '#268cd9' : '#3088d4')
+      expect(media.file.meta['colors']['background']).to eq(expected_background_color)
       expect(media.file_file_name).to_not eq 'boop.ogg'
     end
+
+    def expected_background_color
+      # The libvips and ImageMagick implementations produce different results
+      Rails.configuration.x.use_vips ? '#268cd9' : '#3088d4'
+    end
   end
 
   describe 'mp3 with large cover art' do

From 03bbb74b0ccc5f56bb3856efb1892ae8e0872a38 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 27 Jun 2024 16:27:32 +0000
Subject: [PATCH 1417/2191] fix(deps): update dependency prom-client to v15.1.3
 (#30852)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index dc73fb93b0a2ca..f9eaef4582d98a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -14099,12 +14099,12 @@ __metadata:
   linkType: hard
 
 "prom-client@npm:^15.0.0":
-  version: 15.1.2
-  resolution: "prom-client@npm:15.1.2"
+  version: 15.1.3
+  resolution: "prom-client@npm:15.1.3"
   dependencies:
     "@opentelemetry/api": "npm:^1.4.0"
     tdigest: "npm:^0.1.1"
-  checksum: 10c0/a221db148fa64e29dfd4c6cdcaaae14635495a4272b68917e2b44fcfd988bc57027d275b04489ceeea4d0c4d64d058af842c1300966d2c1ffa255f1fa6af1277
+  checksum: 10c0/816525572e5799a2d1d45af78512fb47d073c842dc899c446e94d17cfc343d04282a1627c488c7ca1bcd47f766446d3e49365ab7249f6d9c22c7664a5bce7021
   languageName: node
   linkType: hard
 

From bc3737f0c3c4cc0af500413db53fb5443ad02b69 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 27 Jun 2024 12:27:42 -0400
Subject: [PATCH 1418/2191] Add detail about running version on vips error
 failure (#30858)

---
 config/initializers/vips.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/config/initializers/vips.rb b/config/initializers/vips.rb
index 8d5d5cdc91c114..a539d7035c4e1a 100644
--- a/config/initializers/vips.rb
+++ b/config/initializers/vips.rb
@@ -5,7 +5,11 @@
 
   require 'vips'
 
-  abort('Incompatible libvips version, please install libvips >= 8.13') unless Vips.at_least_libvips?(8, 13)
+  unless Vips.at_least_libvips?(8, 13)
+    abort <<~ERROR.squish
+      Incompatible libvips version (#{Vips.version_string}), please install libvips >= 8.13
+    ERROR
+  end
 
   Vips.block('VipsForeign', true)
 

From 3225954865c49ce7a336b73b2bc0c5ff2b707746 Mon Sep 17 00:00:00 2001
From: Michael Stanclift <mx@vmstan.com>
Date: Thu, 27 Jun 2024 11:46:20 -0500
Subject: [PATCH 1419/2191] Fix browser window color on light theme (#30861)

---
 app/lib/themes.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/lib/themes.rb b/app/lib/themes.rb
index b6da980733fa97..183258d62f832e 100644
--- a/app/lib/themes.rb
+++ b/app/lib/themes.rb
@@ -8,7 +8,7 @@ class Themes
 
   THEME_COLORS = {
     dark: '#191b22',
-    light: '#f3f5f7',
+    light: '#ffffff',
   }.freeze
 
   def initialize

From 0f3fef6fda5819824457b9c1cdc41cb3d5ca976e Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 27 Jun 2024 23:34:34 +0200
Subject: [PATCH 1420/2191] Change search modifiers to be case-insensitive
 (#30865)

---
 app/lib/search_query_transformer.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/lib/search_query_transformer.rb b/app/lib/search_query_transformer.rb
index 927495eace9795..606819ed40440f 100644
--- a/app/lib/search_query_transformer.rb
+++ b/app/lib/search_query_transformer.rb
@@ -225,7 +225,7 @@ def language_code_from_term(term)
   end
 
   rule(clause: subtree(:clause)) do
-    prefix   = clause[:prefix][:term].to_s if clause[:prefix]
+    prefix   = clause[:prefix][:term].to_s.downcase if clause[:prefix]
     operator = clause[:operator]&.to_s
     term     = clause[:phrase] ? clause[:phrase].map { |term| term[:term].to_s }.join(' ') : clause[:term].to_s
 

From ea6c455e81f9f01a64adf123d0a4f820c6e67f97 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 28 Jun 2024 00:01:40 +0200
Subject: [PATCH 1421/2191] Fix follow button in hover cards not working when
 signed out in web UI (#30864)

---
 .../mastodon/components/follow_button.tsx     | 32 ++++++++++++++++---
 1 file changed, 28 insertions(+), 4 deletions(-)

diff --git a/app/javascript/mastodon/components/follow_button.tsx b/app/javascript/mastodon/components/follow_button.tsx
index 4b4d278317f175..db59942882f4ce 100644
--- a/app/javascript/mastodon/components/follow_button.tsx
+++ b/app/javascript/mastodon/components/follow_button.tsx
@@ -2,11 +2,13 @@ import { useCallback, useEffect } from 'react';
 
 import { useIntl, defineMessages } from 'react-intl';
 
+import { useIdentity } from '@/mastodon/identity_context';
 import {
   fetchRelationships,
   followAccount,
   unfollowAccount,
 } from 'mastodon/actions/accounts';
+import { openModal } from 'mastodon/actions/modal';
 import { Button } from 'mastodon/components/button';
 import { LoadingIndicator } from 'mastodon/components/loading_indicator';
 import { me } from 'mastodon/initial_state';
@@ -29,17 +31,37 @@ export const FollowButton: React.FC<{
 }> = ({ accountId }) => {
   const intl = useIntl();
   const dispatch = useAppDispatch();
+  const { signedIn } = useIdentity();
+  const account = useAppSelector((state) =>
+    accountId ? state.accounts.get(accountId) : undefined,
+  );
   const relationship = useAppSelector((state) =>
     state.relationships.get(accountId),
   );
   const following = relationship?.following || relationship?.requested;
 
   useEffect(() => {
-    dispatch(fetchRelationships([accountId]));
-  }, [dispatch, accountId]);
+    if (accountId && signedIn) {
+      dispatch(fetchRelationships([accountId]));
+    }
+  }, [dispatch, accountId, signedIn]);
 
   const handleClick = useCallback(() => {
+    if (!signedIn) {
+      dispatch(
+        openModal({
+          modalType: 'INTERACTION',
+          modalProps: {
+            type: 'follow',
+            accountId: accountId,
+            url: account?.url,
+          },
+        }),
+      );
+    }
+
     if (!relationship) return;
+
     if (accountId === me) {
       return;
     } else if (relationship.following || relationship.requested) {
@@ -47,11 +69,13 @@ export const FollowButton: React.FC<{
     } else {
       dispatch(followAccount(accountId));
     }
-  }, [dispatch, accountId, relationship]);
+  }, [dispatch, accountId, relationship, account, signedIn]);
 
   let label;
 
-  if (accountId === me) {
+  if (!signedIn) {
+    label = intl.formatMessage(messages.follow);
+  } else if (accountId === me) {
     label = intl.formatMessage(messages.edit_profile);
   } else if (!relationship) {
     label = <LoadingIndicator />;

From a5134f2695659ccb1c40b28b1f691e2dc932a5fb Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 28 Jun 2024 10:33:57 +0200
Subject: [PATCH 1422/2191] New Crowdin Translations (automated) (#30867)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/de.json    | 2 +-
 app/javascript/mastodon/locales/gl.json    | 3 +++
 app/javascript/mastodon/locales/hu.json    | 3 +++
 app/javascript/mastodon/locales/lt.json    | 3 +++
 app/javascript/mastodon/locales/nn.json    | 6 ++++++
 app/javascript/mastodon/locales/pl.json    | 3 +++
 app/javascript/mastodon/locales/pt-PT.json | 3 +++
 app/javascript/mastodon/locales/sq.json    | 3 +++
 app/javascript/mastodon/locales/sv.json    | 2 ++
 config/locales/nn.yml                      | 1 +
 10 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json
index 86438757a30755..4a5b666d3ecbc0 100644
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@@ -37,7 +37,7 @@
   "account.followers.empty": "Diesem Profil folgt noch niemand.",
   "account.followers_counter": "{count, plural, one {{counter} Follower} other {{counter} Follower}}",
   "account.following": "Folge ich",
-  "account.following_counter": "{count, plural, one {{counter} Folge ich} other {{counter} Folge ich}}",
+  "account.following_counter": "{count, plural, one {{counter} folge ich} other {{counter} folge ich}}",
   "account.follows.empty": "Dieses Profil folgt noch niemandem.",
   "account.go_to_profile": "Profil aufrufen",
   "account.hide_reblogs": "Geteilte Beiträge von @{name} ausblenden",
diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json
index 156fe3ee861d43..fae48ed06bf362 100644
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@@ -35,7 +35,9 @@
   "account.follow_back": "Seguir tamén",
   "account.followers": "Seguidoras",
   "account.followers.empty": "Aínda ninguén segue esta usuaria.",
+  "account.followers_counter": "{count, plural, one {{counter} seguidora} other {{counter} seguidoras}}",
   "account.following": "Seguindo",
+  "account.following_counter": "{count, plural, one {{counter} seguimento} other {{counter} seguimentos}}",
   "account.follows.empty": "Esta usuaria aínda non segue a ninguén.",
   "account.go_to_profile": "Ir ao perfil",
   "account.hide_reblogs": "Agochar promocións de @{name}",
@@ -61,6 +63,7 @@
   "account.requested_follow": "{name} solicitou seguirte",
   "account.share": "Compartir o perfil de @{name}",
   "account.show_reblogs": "Amosar compartidos de @{name}",
+  "account.statuses_counter": "{count, plural, one {{counter} publicación} other {{counter} publicacións}}",
   "account.unblock": "Desbloquear @{name}",
   "account.unblock_domain": "Amosar {domain}",
   "account.unblock_short": "Desbloquear",
diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json
index 627e3cab508f2c..1fcadc8f9c4730 100644
--- a/app/javascript/mastodon/locales/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@@ -35,7 +35,9 @@
   "account.follow_back": "Viszontkövetés",
   "account.followers": "Követő",
   "account.followers.empty": "Ezt a felhasználót még senki sem követi.",
+  "account.followers_counter": "{count, plural, one {{counter} követő} other {{counter} követő}}",
   "account.following": "Követve",
+  "account.following_counter": "{count, plural, one {{counter} követett} other {{counter} követett}}",
   "account.follows.empty": "Ez a felhasználó még senkit sem követ.",
   "account.go_to_profile": "Ugrás a profilhoz",
   "account.hide_reblogs": "@{name} megtolásainak elrejtése",
@@ -61,6 +63,7 @@
   "account.requested_follow": "{name} kérte, hogy követhessen",
   "account.share": "@{name} profiljának megosztása",
   "account.show_reblogs": "@{name} megtolásainak mutatása",
+  "account.statuses_counter": "{count, plural, one {{counter} bejegyzés} other {{counter} bejegyzés}}",
   "account.unblock": "@{name} letiltásának feloldása",
   "account.unblock_domain": "{domain} domain tiltásának feloldása",
   "account.unblock_short": "Tiltás feloldása",
diff --git a/app/javascript/mastodon/locales/lt.json b/app/javascript/mastodon/locales/lt.json
index 6bf8f94bd91ee5..bb69b733997bd1 100644
--- a/app/javascript/mastodon/locales/lt.json
+++ b/app/javascript/mastodon/locales/lt.json
@@ -35,7 +35,9 @@
   "account.follow_back": "Sekti atgal",
   "account.followers": "Sekėjai",
   "account.followers.empty": "Šio naudotojo dar niekas neseka.",
+  "account.followers_counter": "{count, plural, one {{counter} sekėjas} few {{counter} sekėjai} many {{counter} sekėjo} other {{counter} sekėjų}}",
   "account.following": "Sekama",
+  "account.following_counter": "{count, plural, one {{counter} sekimas} few {{counter} sekimai} many {{counter} sekimo} other {{counter} sekimų}}",
   "account.follows.empty": "Šis naudotojas dar nieko neseka.",
   "account.go_to_profile": "Eiti į profilį",
   "account.hide_reblogs": "Slėpti pakėlimus iš @{name}",
@@ -61,6 +63,7 @@
   "account.requested_follow": "{name} paprašė tave sekti",
   "account.share": "Bendrinti @{name} profilį",
   "account.show_reblogs": "Rodyti pakėlimus iš @{name}",
+  "account.statuses_counter": "{count, plural, one {{counter} įrašas} few {{counter} įrašai} many {{counter} įrašo} other {{counter} įrašų}}",
   "account.unblock": "Atblokuoti @{name}",
   "account.unblock_domain": "Atblokuoti domeną {domain}",
   "account.unblock_short": "Atblokuoti",
diff --git a/app/javascript/mastodon/locales/nn.json b/app/javascript/mastodon/locales/nn.json
index 7eca29659557e0..0fb0edf0a04b15 100644
--- a/app/javascript/mastodon/locales/nn.json
+++ b/app/javascript/mastodon/locales/nn.json
@@ -35,7 +35,9 @@
   "account.follow_back": "Fylg tilbake",
   "account.followers": "Fylgjarar",
   "account.followers.empty": "Ingen fylgjer denne brukaren enno.",
+  "account.followers_counter": "{count, plural, one {{counter} følgjar} other {{counter} følgjarar}}",
   "account.following": "Fylgjer",
+  "account.following_counter": "{count, plural, one {{counter} følgjer} other {{counter} følgjer}}",
   "account.follows.empty": "Denne brukaren fylgjer ikkje nokon enno.",
   "account.go_to_profile": "Gå til profil",
   "account.hide_reblogs": "Gøym framhevingar frå @{name}",
@@ -61,6 +63,7 @@
   "account.requested_follow": "{name} har bedt om å få fylgja deg",
   "account.share": "Del @{name} sin profil",
   "account.show_reblogs": "Vis framhevingar frå @{name}",
+  "account.statuses_counter": "{count, plural, one {{counter} innlegg} other {{counter} innlegg}}",
   "account.unblock": "Stopp blokkering av @{name}",
   "account.unblock_domain": "Stopp blokkering av domenet {domain}",
   "account.unblock_short": "Stopp blokkering",
@@ -693,8 +696,11 @@
   "server_banner.about_active_users": "Personar som har brukt denne tenaren dei siste 30 dagane (Månadlege Aktive Brukarar)",
   "server_banner.active_users": "aktive brukarar",
   "server_banner.administered_by": "Administrert av:",
+  "server_banner.is_one_of_many": "{domain} er ein av dei mange uavhengige Mastodon-serverane du kan bruke til å delta i Fødiverset.",
   "server_banner.server_stats": "Tenarstatistikk:",
   "sign_in_banner.create_account": "Opprett konto",
+  "sign_in_banner.follow_anyone": "Følg kven som helst på tvers av Fødiverset og sjå alt i kronologisk rekkjefølgje. Ingen algoritmar, reklamar eller clickbait i sikte.",
+  "sign_in_banner.mastodon_is": "Mastodon er den beste måten å følgje med på det som skjer.",
   "sign_in_banner.sign_in": "Logg inn",
   "sign_in_banner.sso_redirect": "Logg inn eller registrer deg",
   "status.admin_account": "Opne moderasjonsgrensesnitt for @{name}",
diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json
index a3690e734bd170..ddfe1d4fbcd804 100644
--- a/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@@ -35,7 +35,9 @@
   "account.follow_back": "Obserwuj wzajemnie",
   "account.followers": "Obserwujący",
   "account.followers.empty": "Nikt jeszcze nie obserwuje tego użytkownika.",
+  "account.followers_counter": "{count, plural, one {{counter} obserwujący} few {{counter} obserwujących} many {{counter} obserwujących} other {{counter} obserwujących}}",
   "account.following": "Obserwowani",
+  "account.following_counter": "{count, plural, one {{counter} obserwowany} few {{counter} obserwowanych} many {{counter} obserwowanych} other {{counter} obserwowanych}}",
   "account.follows.empty": "Ten użytkownik nie obserwuje jeszcze nikogo.",
   "account.go_to_profile": "Przejdź do profilu",
   "account.hide_reblogs": "Ukryj podbicia od @{name}",
@@ -61,6 +63,7 @@
   "account.requested_follow": "{name} chce zaobserwować twój profil",
   "account.share": "Udostępnij profil @{name}",
   "account.show_reblogs": "Pokazuj podbicia od @{name}",
+  "account.statuses_counter": "{count, plural, one {{counter} wpis} few {{counter} wpisy} many {{counter} wpisów} other {{counter} wpisów}}",
   "account.unblock": "Odblokuj @{name}",
   "account.unblock_domain": "Odblokuj domenę {domain}",
   "account.unblock_short": "Odblokuj",
diff --git a/app/javascript/mastodon/locales/pt-PT.json b/app/javascript/mastodon/locales/pt-PT.json
index 41112c2ca44c08..6a6feca309f2bf 100644
--- a/app/javascript/mastodon/locales/pt-PT.json
+++ b/app/javascript/mastodon/locales/pt-PT.json
@@ -35,7 +35,9 @@
   "account.follow_back": "Seguir de volta",
   "account.followers": "Seguidores",
   "account.followers.empty": "Ainda ninguém segue este utilizador.",
+  "account.followers_counter": "{count, plural, one {{counter} seguidor} other {{counter} seguidores}}",
   "account.following": "A seguir",
+  "account.following_counter": "{count, plural, one {A seguir {counter}} other {A seguir {counter}}}",
   "account.follows.empty": "Este utilizador ainda não segue ninguém.",
   "account.go_to_profile": "Ir para o perfil",
   "account.hide_reblogs": "Esconder partilhas de @{name}",
@@ -61,6 +63,7 @@
   "account.requested_follow": "{name} pediu para segui-lo",
   "account.share": "Partilhar o perfil @{name}",
   "account.show_reblogs": "Mostrar partilhas de @{name}",
+  "account.statuses_counter": "{count, plural, one {{counter} publicação} other {{counter} publicações}}",
   "account.unblock": "Desbloquear @{name}",
   "account.unblock_domain": "Desbloquear o domínio {domain}",
   "account.unblock_short": "Desbloquear",
diff --git a/app/javascript/mastodon/locales/sq.json b/app/javascript/mastodon/locales/sq.json
index 6ac038c9f4406d..96b7b3fefc715a 100644
--- a/app/javascript/mastodon/locales/sq.json
+++ b/app/javascript/mastodon/locales/sq.json
@@ -35,7 +35,9 @@
   "account.follow_back": "Ndiqe gjithashtu",
   "account.followers": "Ndjekës",
   "account.followers.empty": "Këtë përdorues ende s’e ndjek kush.",
+  "account.followers_counter": "{count, plural, one {{counter} ndjekës} other {{counter} ndjekës}}",
   "account.following": "Ndjekje",
+  "account.following_counter": "{count, plural, one {{counter} i ndjekur} other {{counter} të ndjekur}}",
   "account.follows.empty": "Ky përdorues ende s’ndjek kënd.",
   "account.go_to_profile": "Kalo te profili",
   "account.hide_reblogs": "Fshih përforcime nga @{name}",
@@ -61,6 +63,7 @@
   "account.requested_follow": "{name} ka kërkuar t’ju ndjekë",
   "account.share": "Ndajeni profilin e @{name} me të tjerët",
   "account.show_reblogs": "Shfaq përforcime nga @{name}",
+  "account.statuses_counter": "{count, plural, one {{counter} postim} other {{counter} postime}}",
   "account.unblock": "Zhbllokoje @{name}",
   "account.unblock_domain": "Zhblloko përkatësinë {domain}",
   "account.unblock_short": "Zhbllokoje",
diff --git a/app/javascript/mastodon/locales/sv.json b/app/javascript/mastodon/locales/sv.json
index 7445b77bacc34b..1833a2cfdefa4b 100644
--- a/app/javascript/mastodon/locales/sv.json
+++ b/app/javascript/mastodon/locales/sv.json
@@ -35,6 +35,7 @@
   "account.follow_back": "Följ tillbaka",
   "account.followers": "Följare",
   "account.followers.empty": "Ingen följer denna användare än.",
+  "account.followers_counter": "{count, plural, one {{counter} följare} other {{counter} följare}}",
   "account.following": "Följer",
   "account.follows.empty": "Denna användare följer inte någon än.",
   "account.go_to_profile": "Gå till profilen",
@@ -61,6 +62,7 @@
   "account.requested_follow": "{name} har begärt att följa dig",
   "account.share": "Dela @{name}s profil",
   "account.show_reblogs": "Visa boostar från @{name}",
+  "account.statuses_counter": "{count, plural, one {{counter} inlägg} other {{counter} inlägg}}",
   "account.unblock": "Avblockera @{name}",
   "account.unblock_domain": "Avblockera {domain}",
   "account.unblock_short": "Avblockera",
diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index d82c92c262a436..2da30e6627184a 100644
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -293,6 +293,7 @@ nn:
       filter_by_action: Sorter etter handling
       filter_by_user: Sorter etter brukar
       title: Revisionslogg
+      unavailable_instance: "(domenenamn er utilgjengeleg)"
     announcements:
       destroyed_msg: Kunngjøringen er slettet!
       edit:

From 1bccba14082f380232a363d036b6b2e92104ffc6 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 28 Jun 2024 13:39:32 +0200
Subject: [PATCH 1423/2191] chore(deps): update dependency
 @testing-library/react to v16 (#30533)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
---
 app/javascript/mastodon/test_helpers.tsx |  7 ++++-
 package.json                             |  3 ++-
 yarn.lock                                | 33 +++++++++++++-----------
 3 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/app/javascript/mastodon/test_helpers.tsx b/app/javascript/mastodon/test_helpers.tsx
index 93b5a8453accf1..f4050907306e85 100644
--- a/app/javascript/mastodon/test_helpers.tsx
+++ b/app/javascript/mastodon/test_helpers.tsx
@@ -2,6 +2,7 @@ import { IntlProvider } from 'react-intl';
 
 import { MemoryRouter } from 'react-router';
 
+import type { RenderOptions } from '@testing-library/react';
 // eslint-disable-next-line import/no-extraneous-dependencies
 import { render as rtlRender } from '@testing-library/react';
 
@@ -9,7 +10,11 @@ import { IdentityContext } from './identity_context';
 
 function render(
   ui: React.ReactElement,
-  { locale = 'en', signedIn = true, ...renderOptions } = {},
+  {
+    locale = 'en',
+    signedIn = true,
+    ...renderOptions
+  }: RenderOptions & { locale?: string; signedIn?: boolean } = {},
 ) {
   const fakeIdentity = {
     signedIn: signedIn,
diff --git a/package.json b/package.json
index 729482f857b15c..3eb1ebad7e0269 100644
--- a/package.json
+++ b/package.json
@@ -138,8 +138,9 @@
   },
   "devDependencies": {
     "@formatjs/cli": "^6.1.1",
+    "@testing-library/dom": "^10.2.0",
     "@testing-library/jest-dom": "^6.0.0",
-    "@testing-library/react": "^15.0.0",
+    "@testing-library/react": "^16.0.0",
     "@types/babel__core": "^7.20.1",
     "@types/emoji-mart": "^3.0.9",
     "@types/escape-html": "^1.0.2",
diff --git a/yarn.lock b/yarn.lock
index f9eaef4582d98a..0e7337328bab65 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2768,8 +2768,9 @@ __metadata:
     "@rails/ujs": "npm:7.1.3"
     "@reduxjs/toolkit": "npm:^2.0.1"
     "@svgr/webpack": "npm:^5.5.0"
+    "@testing-library/dom": "npm:^10.2.0"
     "@testing-library/jest-dom": "npm:^6.0.0"
-    "@testing-library/react": "npm:^15.0.0"
+    "@testing-library/react": "npm:^16.0.0"
     "@types/babel__core": "npm:^7.20.1"
     "@types/emoji-mart": "npm:^3.0.9"
     "@types/escape-html": "npm:^1.0.2"
@@ -3348,9 +3349,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@testing-library/dom@npm:^10.0.0":
-  version: 10.0.0
-  resolution: "@testing-library/dom@npm:10.0.0"
+"@testing-library/dom@npm:^10.2.0":
+  version: 10.2.0
+  resolution: "@testing-library/dom@npm:10.2.0"
   dependencies:
     "@babel/code-frame": "npm:^7.10.4"
     "@babel/runtime": "npm:^7.12.5"
@@ -3360,7 +3361,7 @@ __metadata:
     dom-accessibility-api: "npm:^0.5.9"
     lz-string: "npm:^1.5.0"
     pretty-format: "npm:^27.0.2"
-  checksum: 10c0/2d12d2a6018a6f1d15e91834180bc068932c699ff1fcbfb80aa21aba519a4f5329c861dfa852e06ee5615bcb92ef2a0f0e755e32684ea3dada63bc34248382ab
+  checksum: 10c0/de582dfbeb632436547a0ca5851b5a714a4a17f8e96ab3dc4fb4e454eef52c912b648b7cb6e9fdf477f3eeef97e698f3250f0ce50846f39d04677a44169209f2
   languageName: node
   linkType: hard
 
@@ -3397,21 +3398,23 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@testing-library/react@npm:^15.0.0":
-  version: 15.0.7
-  resolution: "@testing-library/react@npm:15.0.7"
+"@testing-library/react@npm:^16.0.0":
+  version: 16.0.0
+  resolution: "@testing-library/react@npm:16.0.0"
   dependencies:
     "@babel/runtime": "npm:^7.12.5"
-    "@testing-library/dom": "npm:^10.0.0"
-    "@types/react-dom": "npm:^18.0.0"
   peerDependencies:
+    "@testing-library/dom": ^10.0.0
     "@types/react": ^18.0.0
+    "@types/react-dom": ^18.0.0
     react: ^18.0.0
     react-dom: ^18.0.0
   peerDependenciesMeta:
     "@types/react":
       optional: true
-  checksum: 10c0/ac8ee8968e81949ecb35f7ee34741c2c043f73dd7fee2247d56f6de6a30de4742af94f25264356863974e54387485b46c9448ecf3f6ca41cf4339011c369f2d4
+    "@types/react-dom":
+      optional: true
+  checksum: 10c0/297f97bf4722dad05f11d9cafd47d387dbdb096fea4b79b876c7466460f0f2e345b55b81b3e37fc81ed8185c528cb53dd8455ca1b6b019b229edf6c796f11c9f
   languageName: node
   linkType: hard
 
@@ -3430,9 +3433,9 @@ __metadata:
   linkType: hard
 
 "@types/aria-query@npm:^5.0.1":
-  version: 5.0.1
-  resolution: "@types/aria-query@npm:5.0.1"
-  checksum: 10c0/bc9e40ce37bd3a1654948778c7829bd55aea1bc5f2cd06fcf6cd650b07bb388995799e9aab6e2d93a6cf55dcba3b85c155f7ba93adefcc7c2e152fc6057061b5
+  version: 5.0.4
+  resolution: "@types/aria-query@npm:5.0.4"
+  checksum: 10c0/dc667bc6a3acc7bba2bccf8c23d56cb1f2f4defaa704cfef595437107efaa972d3b3db9ec1d66bc2711bfc35086821edd32c302bffab36f2e79b97f312069f08
   languageName: node
   linkType: hard
 
@@ -3829,7 +3832,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/react-dom@npm:^18.0.0, @types/react-dom@npm:^18.2.4":
+"@types/react-dom@npm:^18.2.4":
   version: 18.3.0
   resolution: "@types/react-dom@npm:18.3.0"
   dependencies:

From ba6a558a7088b811b63a90d20b82069eee7dfaa1 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Sat, 29 Jun 2024 00:41:27 +0200
Subject: [PATCH 1424/2191] Simplify color extraction code using `bandunfold`
 (#30869)

---
 lib/paperclip/color_extractor.rb | 35 +++++++++++---------------------
 1 file changed, 12 insertions(+), 23 deletions(-)

diff --git a/lib/paperclip/color_extractor.rb b/lib/paperclip/color_extractor.rb
index 378af0961de0d3..fba32ba4cb5d17 100644
--- a/lib/paperclip/color_extractor.rb
+++ b/lib/paperclip/color_extractor.rb
@@ -116,34 +116,23 @@ def palette_from_image(image)
       # The number of occurrences of a color (r, g, b) is thus encoded in band `b` at pixel position `(r, g)`
       histogram = image.hist_find_ndim(bins: BINS)
 
-      # `histogram.max` returns an array of maxima with their pixel positions, but we don't know in which
-      # band they are
+      # With `bandunfold`, we get back to a (BINS*BINS)×BINS 2D image with a single band.
+      # The number of occurrences of a color (r, g, b) is thus encoded at pixel position `(r * BINS + b, g)`
+      histogram = histogram.bandunfold
+
       _, colors = histogram.max(size: 10, out_array: true, x_array: true, y_array: true)
 
-      colors['out_array'].zip(colors['x_array'], colors['y_array']).map do |v, x, y|
-        rgb_from_xyv(histogram, x, y, v)
-      end.flatten.reverse.uniq
+      colors['x_array'].zip(colors['y_array']).map do |x, y|
+        rgb_from_hist_xy(x, y)
+      end.flatten.reverse
     end
 
     # rubocop:disable Naming/MethodParameterName
-    def rgb_from_xyv(image, x, y, v)
-      pixel = image.getpoint(x, y)
-
-      # As we only have the first 2 dimensions for this maximum, we
-      # can't distinguish with different maxima with the same `r` and `g`
-      # values but different `b` values.
-      #
-      # Therefore, we return an array of maxima, which is always non-empty,
-      # but may contain multiple colors with the same values.
-
-      pixel.filter_map.with_index do |pv, z|
-        next if pv != v
-
-        r = (x + 0.5) * 256 / BINS
-        g = (y + 0.5) * 256 / BINS
-        b = (z + 0.5) * 256 / BINS
-        ColorDiff::Color::RGB.new(r, g, b)
-      end
+    def rgb_from_hist_xy(x, y)
+      r = ((x / BINS) + 0.5) * 256 / BINS
+      g = (y + 0.5) * 256 / BINS
+      b = ((x % BINS) + 0.5) * 256 / BINS
+      ColorDiff::Color::RGB.new(r, g, b)
     end
 
     def w3c_contrast(color1, color2)

From 5d4dbbcc67c98007d417cbe67b5a2261889304dc Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 29 Jun 2024 22:51:46 +0200
Subject: [PATCH 1425/2191] chore(deps): update dependency charlock_holmes to
 v0.7.8 (#30870)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index dd112d0189a3bb..02437eab6b7aa9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -159,7 +159,7 @@ GEM
     case_transform (0.2)
       activesupport
     cbor (0.5.9.8)
-    charlock_holmes (0.7.7)
+    charlock_holmes (0.7.8)
     chewy (7.6.0)
       activesupport (>= 5.2)
       elasticsearch (>= 7.14.0, < 8)

From 1ac4e64a3ba51360dfc62f63e95c157a36c65e61 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Tue, 25 Jun 2024 23:57:22 +0200
Subject: [PATCH 1426/2191] [Glitch] Change light mode to apply CSS variables
 to the body

Port 8c0ff6498e090a2919e8f8104339796ed2d3d212 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/styles/mastodon-light/variables.scss      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/javascript/flavours/glitch/styles/mastodon-light/variables.scss b/app/javascript/flavours/glitch/styles/mastodon-light/variables.scss
index 09a75a834b17db..3cdbd9bf67e340 100644
--- a/app/javascript/flavours/glitch/styles/mastodon-light/variables.scss
+++ b/app/javascript/flavours/glitch/styles/mastodon-light/variables.scss
@@ -56,11 +56,11 @@ $account-background-color: $white !default;
 
 $emojis-requiring-inversion: 'chains';
 
-.theme-mastodon-light {
+body {
   --dropdown-border-color: #d9e1e8;
   --dropdown-background-color: #fff;
   --background-border-color: #d9e1e8;
   --background-color: #fff;
-  --background-color-tint: rgba(255, 255, 255, 90%);
+  --background-color-tint: rgba(255, 255, 255, 80%);
   --background-filter: blur(10px);
 }

From 8160a655a528856f87b8d0174bce54c78a7af4be Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Wed, 26 Jun 2024 20:04:50 +0200
Subject: [PATCH 1427/2191] [Glitch] Convert `<Directory>` to Typescript /
 function component

Port 863c470a2bc4e13a5b8df4d66a1322f4b84e2db2 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/actions/directory.js      |  62 ----
 .../flavours/glitch/actions/directory.ts      |  37 +++
 .../flavours/glitch/api/directory.ts          |  15 +
 .../directory/components/account_card.jsx     | 247 ----------------
 .../directory/components/account_card.tsx     | 273 ++++++++++++++++++
 .../glitch/features/directory/index.jsx       | 181 ------------
 .../glitch/features/directory/index.tsx       | 217 ++++++++++++++
 .../flavours/glitch/locales/en.json           |   3 +-
 .../flavours/glitch/reducers/user_lists.js    |  32 +-
 9 files changed, 558 insertions(+), 509 deletions(-)
 delete mode 100644 app/javascript/flavours/glitch/actions/directory.js
 create mode 100644 app/javascript/flavours/glitch/actions/directory.ts
 create mode 100644 app/javascript/flavours/glitch/api/directory.ts
 delete mode 100644 app/javascript/flavours/glitch/features/directory/components/account_card.jsx
 create mode 100644 app/javascript/flavours/glitch/features/directory/components/account_card.tsx
 delete mode 100644 app/javascript/flavours/glitch/features/directory/index.jsx
 create mode 100644 app/javascript/flavours/glitch/features/directory/index.tsx

diff --git a/app/javascript/flavours/glitch/actions/directory.js b/app/javascript/flavours/glitch/actions/directory.js
deleted file mode 100644
index 7a0748029d97c1..00000000000000
--- a/app/javascript/flavours/glitch/actions/directory.js
+++ /dev/null
@@ -1,62 +0,0 @@
-import api from '../api';
-
-import { fetchRelationships } from './accounts';
-import { importFetchedAccounts } from './importer';
-
-export const DIRECTORY_FETCH_REQUEST = 'DIRECTORY_FETCH_REQUEST';
-export const DIRECTORY_FETCH_SUCCESS = 'DIRECTORY_FETCH_SUCCESS';
-export const DIRECTORY_FETCH_FAIL    = 'DIRECTORY_FETCH_FAIL';
-
-export const DIRECTORY_EXPAND_REQUEST = 'DIRECTORY_EXPAND_REQUEST';
-export const DIRECTORY_EXPAND_SUCCESS = 'DIRECTORY_EXPAND_SUCCESS';
-export const DIRECTORY_EXPAND_FAIL    = 'DIRECTORY_EXPAND_FAIL';
-
-export const fetchDirectory = params => (dispatch) => {
-  dispatch(fetchDirectoryRequest());
-
-  api().get('/api/v1/directory', { params: { ...params, limit: 20 } }).then(({ data }) => {
-    dispatch(importFetchedAccounts(data));
-    dispatch(fetchDirectorySuccess(data));
-    dispatch(fetchRelationships(data.map(x => x.id)));
-  }).catch(error => dispatch(fetchDirectoryFail(error)));
-};
-
-export const fetchDirectoryRequest = () => ({
-  type: DIRECTORY_FETCH_REQUEST,
-});
-
-export const fetchDirectorySuccess = accounts => ({
-  type: DIRECTORY_FETCH_SUCCESS,
-  accounts,
-});
-
-export const fetchDirectoryFail = error => ({
-  type: DIRECTORY_FETCH_FAIL,
-  error,
-});
-
-export const expandDirectory = params => (dispatch, getState) => {
-  dispatch(expandDirectoryRequest());
-
-  const loadedItems = getState().getIn(['user_lists', 'directory', 'items']).size;
-
-  api().get('/api/v1/directory', { params: { ...params, offset: loadedItems, limit: 20 } }).then(({ data }) => {
-    dispatch(importFetchedAccounts(data));
-    dispatch(expandDirectorySuccess(data));
-    dispatch(fetchRelationships(data.map(x => x.id)));
-  }).catch(error => dispatch(expandDirectoryFail(error)));
-};
-
-export const expandDirectoryRequest = () => ({
-  type: DIRECTORY_EXPAND_REQUEST,
-});
-
-export const expandDirectorySuccess = accounts => ({
-  type: DIRECTORY_EXPAND_SUCCESS,
-  accounts,
-});
-
-export const expandDirectoryFail = error => ({
-  type: DIRECTORY_EXPAND_FAIL,
-  error,
-});
diff --git a/app/javascript/flavours/glitch/actions/directory.ts b/app/javascript/flavours/glitch/actions/directory.ts
new file mode 100644
index 00000000000000..3e0f1356b3ae05
--- /dev/null
+++ b/app/javascript/flavours/glitch/actions/directory.ts
@@ -0,0 +1,37 @@
+import type { List as ImmutableList } from 'immutable';
+
+import { apiGetDirectory } from 'flavours/glitch/api/directory';
+import { createDataLoadingThunk } from 'flavours/glitch/store/typed_functions';
+
+import { fetchRelationships } from './accounts';
+import { importFetchedAccounts } from './importer';
+
+export const fetchDirectory = createDataLoadingThunk(
+  'directory/fetch',
+  async (params: Parameters<typeof apiGetDirectory>[0]) =>
+    apiGetDirectory(params),
+  (data, { dispatch }) => {
+    dispatch(importFetchedAccounts(data));
+    dispatch(fetchRelationships(data.map((x) => x.id)));
+
+    return { accounts: data };
+  },
+);
+
+export const expandDirectory = createDataLoadingThunk(
+  'directory/expand',
+  async (params: Parameters<typeof apiGetDirectory>[0], { getState }) => {
+    const loadedItems = getState().user_lists.getIn([
+      'directory',
+      'items',
+    ]) as ImmutableList<unknown>;
+
+    return apiGetDirectory({ ...params, offset: loadedItems.size }, 20);
+  },
+  (data, { dispatch }) => {
+    dispatch(importFetchedAccounts(data));
+    dispatch(fetchRelationships(data.map((x) => x.id)));
+
+    return { accounts: data };
+  },
+);
diff --git a/app/javascript/flavours/glitch/api/directory.ts b/app/javascript/flavours/glitch/api/directory.ts
new file mode 100644
index 00000000000000..72743a2584c4f6
--- /dev/null
+++ b/app/javascript/flavours/glitch/api/directory.ts
@@ -0,0 +1,15 @@
+import { apiRequestGet } from 'flavours/glitch/api';
+import type { ApiAccountJSON } from 'flavours/glitch/api_types/accounts';
+
+export const apiGetDirectory = (
+  params: {
+    order: string;
+    local: boolean;
+    offset?: number;
+  },
+  limit = 20,
+) =>
+  apiRequestGet<ApiAccountJSON[]>('v1/directory', {
+    ...params,
+    limit,
+  });
diff --git a/app/javascript/flavours/glitch/features/directory/components/account_card.jsx b/app/javascript/flavours/glitch/features/directory/components/account_card.jsx
deleted file mode 100644
index ed4736d7e67cf2..00000000000000
--- a/app/javascript/flavours/glitch/features/directory/components/account_card.jsx
+++ /dev/null
@@ -1,247 +0,0 @@
-import PropTypes from 'prop-types';
-
-import { FormattedMessage, injectIntl, defineMessages } from 'react-intl';
-
-import classNames from 'classnames';
-
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import ImmutablePureComponent from 'react-immutable-pure-component';
-import { connect } from 'react-redux';
-
-import {
-  followAccount,
-  unfollowAccount,
-  unblockAccount,
-  unmuteAccount,
-} from 'flavours/glitch/actions/accounts';
-import { openModal } from 'flavours/glitch/actions/modal';
-import { Avatar } from 'flavours/glitch/components/avatar';
-import { Button } from 'flavours/glitch/components/button';
-import { DisplayName } from 'flavours/glitch/components/display_name';
-import { IconButton } from 'flavours/glitch/components/icon_button';
-import { Permalink } from 'flavours/glitch/components/permalink';
-import { ShortNumber } from 'flavours/glitch/components/short_number';
-import { autoPlayGif, me } from 'flavours/glitch/initial_state';
-import { makeGetAccount } from 'flavours/glitch/selectors';
-
-const messages = defineMessages({
-  unfollow: { id: 'account.unfollow', defaultMessage: 'Unfollow' },
-  follow: { id: 'account.follow', defaultMessage: 'Follow' },
-  cancel_follow_request: { id: 'account.cancel_follow_request', defaultMessage: 'Withdraw follow request' },
-  cancelFollowRequestConfirm: { id: 'confirmations.cancel_follow_request.confirm', defaultMessage: 'Withdraw request' },
-  requested: { id: 'account.requested', defaultMessage: 'Awaiting approval. Click to cancel follow request' },
-  unblock: { id: 'account.unblock_short', defaultMessage: 'Unblock' },
-  unmute: { id: 'account.unmute_short', defaultMessage: 'Unmute' },
-  unfollowConfirm: { id: 'confirmations.unfollow.confirm', defaultMessage: 'Unfollow' },
-  edit_profile: { id: 'account.edit_profile', defaultMessage: 'Edit profile' },
-  dismissSuggestion: { id: 'suggestions.dismiss', defaultMessage: 'Dismiss suggestion' },
-});
-
-const makeMapStateToProps = () => {
-  const getAccount = makeGetAccount();
-
-  const mapStateToProps = (state, { id }) => ({
-    account: getAccount(state, id),
-  });
-
-  return mapStateToProps;
-};
-
-const mapDispatchToProps = (dispatch, { intl }) => ({
-  onFollow(account) {
-    if (account.getIn(['relationship', 'following'])) {
-      dispatch(
-        openModal({
-          modalType: 'CONFIRM',
-          modalProps: {
-            message: (
-              <FormattedMessage
-                id='confirmations.unfollow.message'
-                defaultMessage='Are you sure you want to unfollow {name}?'
-                values={{ name: <strong>@{account.get('acct')}</strong> }}
-              />
-            ),
-            confirm: intl.formatMessage(messages.unfollowConfirm),
-            onConfirm: () => dispatch(unfollowAccount(account.get('id'))),
-          } }),
-      );
-    } else if (account.getIn(['relationship', 'requested'])) {
-      dispatch(openModal({
-        modalType: 'CONFIRM',
-        modalProps: {
-          message: <FormattedMessage id='confirmations.cancel_follow_request.message' defaultMessage='Are you sure you want to withdraw your request to follow {name}?' values={{ name: <strong>@{account.get('acct')}</strong> }} />,
-          confirm: intl.formatMessage(messages.cancelFollowRequestConfirm),
-          onConfirm: () => dispatch(unfollowAccount(account.get('id'))),
-        },
-      }));
-    } else {
-      dispatch(followAccount(account.get('id')));
-    }
-  },
-
-  onBlock(account) {
-    if (account.getIn(['relationship', 'blocking'])) {
-      dispatch(unblockAccount(account.get('id')));
-    }
-  },
-
-  onMute(account) {
-    if (account.getIn(['relationship', 'muting'])) {
-      dispatch(unmuteAccount(account.get('id')));
-    }
-  },
-
-});
-
-class AccountCard extends ImmutablePureComponent {
-
-  static propTypes = {
-    account: ImmutablePropTypes.record.isRequired,
-    intl: PropTypes.object.isRequired,
-    onFollow: PropTypes.func.isRequired,
-    onBlock: PropTypes.func.isRequired,
-    onMute: PropTypes.func.isRequired,
-    onDismiss: PropTypes.func,
-  };
-
-  handleMouseEnter = ({ currentTarget }) => {
-    if (autoPlayGif) {
-      return;
-    }
-
-    const emojis = currentTarget.querySelectorAll('.custom-emoji');
-
-    for (var i = 0; i < emojis.length; i++) {
-      let emoji = emojis[i];
-      emoji.src = emoji.getAttribute('data-original');
-    }
-  };
-
-  handleMouseLeave = ({ currentTarget }) => {
-    if (autoPlayGif) {
-      return;
-    }
-
-    const emojis = currentTarget.querySelectorAll('.custom-emoji');
-
-    for (var i = 0; i < emojis.length; i++) {
-      let emoji = emojis[i];
-      emoji.src = emoji.getAttribute('data-static');
-    }
-  };
-
-  handleFollow = () => {
-    this.props.onFollow(this.props.account);
-  };
-
-  handleBlock = () => {
-    this.props.onBlock(this.props.account);
-  };
-
-  handleMute = () => {
-    this.props.onMute(this.props.account);
-  };
-
-  handleEditProfile = () => {
-    window.open('/settings/profile', '_blank');
-  };
-
-  handleDismiss = (e) => {
-    const { account, onDismiss } = this.props;
-    onDismiss(account.get('id'));
-
-    e.preventDefault();
-    e.stopPropagation();
-  };
-
-  render() {
-    const { account, intl } = this.props;
-
-    let actionBtn;
-
-    if (me !== account.get('id')) {
-      if (!account.get('relationship')) { // Wait until the relationship is loaded
-        actionBtn = '';
-      } else if (account.getIn(['relationship', 'requested'])) {
-        actionBtn = <Button  text={intl.formatMessage(messages.cancel_follow_request)} title={intl.formatMessage(messages.requested)} onClick={this.handleFollow} />;
-      } else if (account.getIn(['relationship', 'muting'])) {
-        actionBtn = <Button  text={intl.formatMessage(messages.unmute)} onClick={this.handleMute} />;
-      } else if (!account.getIn(['relationship', 'blocking'])) {
-        actionBtn = <Button disabled={account.getIn(['relationship', 'blocked_by'])} className={classNames({ 'button--destructive': account.getIn(['relationship', 'following']) })} text={intl.formatMessage(account.getIn(['relationship', 'following']) ? messages.unfollow : messages.follow)} onClick={this.handleFollow} />;
-      } else if (account.getIn(['relationship', 'blocking'])) {
-        actionBtn = <Button  text={intl.formatMessage(messages.unblock)} onClick={this.handleBlock} />;
-      }
-    } else {
-      actionBtn = <Button  text={intl.formatMessage(messages.edit_profile)} onClick={this.handleEditProfile} />;
-    }
-
-    return (
-      <div className='account-card'>
-        <Permalink href={account.get('url')} to={`/@${account.get('acct')}`} className='account-card__permalink'>
-          <div className='account-card__header'>
-            {this.props.onDismiss && <IconButton className='media-modal__close' title={intl.formatMessage(messages.dismissSuggestion)} icon='times' onClick={this.handleDismiss} size={20} />}
-
-            <img
-              src={
-                autoPlayGif ? account.get('header') : account.get('header_static')
-              }
-              alt=''
-            />
-          </div>
-
-          <div className='account-card__title'>
-            <div className='account-card__title__avatar'><Avatar account={account} size={56} /></div>
-            <DisplayName account={account} />
-          </div>
-        </Permalink>
-
-        {account.get('note').length > 0 && (
-          <div
-            className='account-card__bio translate'
-            onMouseEnter={this.handleMouseEnter}
-            onMouseLeave={this.handleMouseLeave}
-            dangerouslySetInnerHTML={{ __html: account.get('note_emojified') }}
-          />
-        )}
-
-        <div className='account-card__actions'>
-          <div className='account-card__counters'>
-            <div className='account-card__counters__item'>
-              <ShortNumber value={account.get('statuses_count')} />
-              <small>
-                <FormattedMessage id='account.posts' defaultMessage='Posts' />
-              </small>
-            </div>
-
-            <div className='account-card__counters__item'>
-              {account.get('followers_count') < 0 ? '-' : <ShortNumber value={account.get('followers_count')} />}{' '}
-              <small>
-                <FormattedMessage
-                  id='account.followers'
-                  defaultMessage='Followers'
-                />
-              </small>
-            </div>
-
-            <div className='account-card__counters__item'>
-              <ShortNumber value={account.get('following_count')} />{' '}
-              <small>
-                <FormattedMessage
-                  id='account.following'
-                  defaultMessage='Following'
-                />
-              </small>
-            </div>
-          </div>
-
-          <div className='account-card__actions__button'>
-            {actionBtn}
-          </div>
-        </div>
-      </div>
-    );
-  }
-
-}
-
-export default injectIntl(connect(makeMapStateToProps, mapDispatchToProps)(AccountCard));
diff --git a/app/javascript/flavours/glitch/features/directory/components/account_card.tsx b/app/javascript/flavours/glitch/features/directory/components/account_card.tsx
new file mode 100644
index 00000000000000..907dbba9fd8414
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/directory/components/account_card.tsx
@@ -0,0 +1,273 @@
+import type { MouseEventHandler } from 'react';
+import { useCallback } from 'react';
+
+import { FormattedMessage, defineMessages, useIntl } from 'react-intl';
+
+import classNames from 'classnames';
+
+import {
+  followAccount,
+  unfollowAccount,
+  unblockAccount,
+  unmuteAccount,
+} from 'flavours/glitch/actions/accounts';
+import { openModal } from 'flavours/glitch/actions/modal';
+import { Avatar } from 'flavours/glitch/components/avatar';
+import { Button } from 'flavours/glitch/components/button';
+import { DisplayName } from 'flavours/glitch/components/display_name';
+import { Permalink } from 'flavours/glitch/components/permalink';
+import { ShortNumber } from 'flavours/glitch/components/short_number';
+import { autoPlayGif, me } from 'flavours/glitch/initial_state';
+import type { Account } from 'flavours/glitch/models/account';
+import { makeGetAccount } from 'flavours/glitch/selectors';
+import { useAppDispatch, useAppSelector } from 'flavours/glitch/store';
+
+const messages = defineMessages({
+  unfollow: { id: 'account.unfollow', defaultMessage: 'Unfollow' },
+  follow: { id: 'account.follow', defaultMessage: 'Follow' },
+  cancel_follow_request: {
+    id: 'account.cancel_follow_request',
+    defaultMessage: 'Withdraw follow request',
+  },
+  cancelFollowRequestConfirm: {
+    id: 'confirmations.cancel_follow_request.confirm',
+    defaultMessage: 'Withdraw request',
+  },
+  requested: {
+    id: 'account.requested',
+    defaultMessage: 'Awaiting approval. Click to cancel follow request',
+  },
+  unblock: { id: 'account.unblock_short', defaultMessage: 'Unblock' },
+  unmute: { id: 'account.unmute_short', defaultMessage: 'Unmute' },
+  unfollowConfirm: {
+    id: 'confirmations.unfollow.confirm',
+    defaultMessage: 'Unfollow',
+  },
+  edit_profile: { id: 'account.edit_profile', defaultMessage: 'Edit profile' },
+});
+
+const getAccount = makeGetAccount();
+
+export const AccountCard: React.FC<{ accountId: string }> = ({ accountId }) => {
+  const intl = useIntl();
+  const account = useAppSelector((s) => getAccount(s, accountId));
+  const dispatch = useAppDispatch();
+
+  const handleMouseEnter = useCallback<MouseEventHandler>(
+    ({ currentTarget }) => {
+      if (autoPlayGif) {
+        return;
+      }
+      const emojis =
+        currentTarget.querySelectorAll<HTMLImageElement>('.custom-emoji');
+
+      emojis.forEach((emoji) => {
+        const original = emoji.getAttribute('data-original');
+        if (original) emoji.src = original;
+      });
+    },
+    [],
+  );
+
+  const handleMouseLeave = useCallback<MouseEventHandler>(
+    ({ currentTarget }) => {
+      if (autoPlayGif) {
+        return;
+      }
+
+      const emojis =
+        currentTarget.querySelectorAll<HTMLImageElement>('.custom-emoji');
+
+      emojis.forEach((emoji) => {
+        const staticUrl = emoji.getAttribute('data-static');
+        if (staticUrl) emoji.src = staticUrl;
+      });
+    },
+    [],
+  );
+
+  const handleFollow = useCallback(() => {
+    if (!account) return;
+
+    if (account.getIn(['relationship', 'following'])) {
+      dispatch(
+        openModal({
+          modalType: 'CONFIRM',
+          modalProps: {
+            message: (
+              <FormattedMessage
+                id='confirmations.unfollow.message'
+                defaultMessage='Are you sure you want to unfollow {name}?'
+                values={{ name: <strong>@{account.get('acct')}</strong> }}
+              />
+            ),
+            confirm: intl.formatMessage(messages.unfollowConfirm),
+            onConfirm: () => {
+              dispatch(unfollowAccount(account.get('id')));
+            },
+          },
+        }),
+      );
+    } else if (account.getIn(['relationship', 'requested'])) {
+      dispatch(
+        openModal({
+          modalType: 'CONFIRM',
+          modalProps: {
+            message: (
+              <FormattedMessage
+                id='confirmations.cancel_follow_request.message'
+                defaultMessage='Are you sure you want to withdraw your request to follow {name}?'
+                values={{ name: <strong>@{account.get('acct')}</strong> }}
+              />
+            ),
+            confirm: intl.formatMessage(messages.cancelFollowRequestConfirm),
+            onConfirm: () => {
+              dispatch(unfollowAccount(account.get('id')));
+            },
+          },
+        }),
+      );
+    } else {
+      dispatch(followAccount(account.get('id')));
+    }
+  }, [account, dispatch, intl]);
+
+  const handleBlock = useCallback(() => {
+    if (account?.relationship?.blocking) {
+      dispatch(unblockAccount(account.get('id')));
+    }
+  }, [account, dispatch]);
+
+  const handleMute = useCallback(() => {
+    if (account?.relationship?.muting) {
+      dispatch(unmuteAccount(account.get('id')));
+    }
+  }, [account, dispatch]);
+
+  const handleEditProfile = useCallback(() => {
+    window.open('/settings/profile', '_blank');
+  }, []);
+
+  if (!account) return null;
+
+  let actionBtn;
+
+  if (me !== account.get('id')) {
+    if (!account.get('relationship')) {
+      // Wait until the relationship is loaded
+      actionBtn = '';
+    } else if (account.getIn(['relationship', 'requested'])) {
+      actionBtn = (
+        <Button
+          text={intl.formatMessage(messages.cancel_follow_request)}
+          title={intl.formatMessage(messages.requested)}
+          onClick={handleFollow}
+        />
+      );
+    } else if (account.getIn(['relationship', 'muting'])) {
+      actionBtn = (
+        <Button
+          text={intl.formatMessage(messages.unmute)}
+          onClick={handleMute}
+        />
+      );
+    } else if (!account.getIn(['relationship', 'blocking'])) {
+      actionBtn = (
+        <Button
+          disabled={account.relationship?.blocked_by}
+          className={classNames({
+            'button--destructive': account.getIn(['relationship', 'following']),
+          })}
+          text={intl.formatMessage(
+            account.getIn(['relationship', 'following'])
+              ? messages.unfollow
+              : messages.follow,
+          )}
+          onClick={handleFollow}
+        />
+      );
+    } else if (account.getIn(['relationship', 'blocking'])) {
+      actionBtn = (
+        <Button
+          text={intl.formatMessage(messages.unblock)}
+          onClick={handleBlock}
+        />
+      );
+    }
+  } else {
+    actionBtn = (
+      <Button
+        text={intl.formatMessage(messages.edit_profile)}
+        onClick={handleEditProfile}
+      />
+    );
+  }
+
+  return (
+    <div className='account-card'>
+      <Permalink
+        href={account.get('url')}
+        to={`/@${account.get('acct')}`}
+        className='account-card__permalink'
+      >
+        <div className='account-card__header'>
+          <img
+            src={
+              autoPlayGif ? account.get('header') : account.get('header_static')
+            }
+            alt=''
+          />
+        </div>
+
+        <div className='account-card__title'>
+          <div className='account-card__title__avatar'>
+            <Avatar account={account as Account} size={56} />
+          </div>
+          <DisplayName account={account as Account} />
+        </div>
+      </Permalink>
+
+      {account.get('note').length > 0 && (
+        <div
+          className='account-card__bio translate'
+          onMouseEnter={handleMouseEnter}
+          onMouseLeave={handleMouseLeave}
+          dangerouslySetInnerHTML={{ __html: account.get('note_emojified') }}
+        />
+      )}
+
+      <div className='account-card__actions'>
+        <div className='account-card__counters'>
+          <div className='account-card__counters__item'>
+            <ShortNumber value={account.get('statuses_count')} />
+            <small>
+              <FormattedMessage id='account.posts' defaultMessage='Posts' />
+            </small>
+          </div>
+
+          <div className='account-card__counters__item'>
+            <ShortNumber value={account.get('followers_count')} />{' '}
+            <small>
+              <FormattedMessage
+                id='account.followers'
+                defaultMessage='Followers'
+              />
+            </small>
+          </div>
+
+          <div className='account-card__counters__item'>
+            <ShortNumber value={account.get('following_count')} />{' '}
+            <small>
+              <FormattedMessage
+                id='account.following'
+                defaultMessage='Following'
+              />
+            </small>
+          </div>
+        </div>
+
+        <div className='account-card__actions__button'>{actionBtn}</div>
+      </div>
+    </div>
+  );
+};
diff --git a/app/javascript/flavours/glitch/features/directory/index.jsx b/app/javascript/flavours/glitch/features/directory/index.jsx
deleted file mode 100644
index 293b89272aa10a..00000000000000
--- a/app/javascript/flavours/glitch/features/directory/index.jsx
+++ /dev/null
@@ -1,181 +0,0 @@
-import PropTypes from 'prop-types';
-import { PureComponent } from 'react';
-
-import { defineMessages, injectIntl } from 'react-intl';
-
-import { Helmet } from 'react-helmet';
-
-import { List as ImmutableList } from 'immutable';
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import { connect } from 'react-redux';
-
-import PeopleIcon from '@/material-icons/400-24px/group.svg?react';
-import { addColumn, removeColumn, moveColumn, changeColumnParams } from 'flavours/glitch/actions/columns';
-import { fetchDirectory, expandDirectory } from 'flavours/glitch/actions/directory';
-import Column from 'flavours/glitch/components/column';
-import ColumnHeader from 'flavours/glitch/components/column_header';
-import { LoadMore } from 'flavours/glitch/components/load_more';
-import { LoadingIndicator } from 'flavours/glitch/components/loading_indicator';
-import { RadioButton } from 'flavours/glitch/components/radio_button';
-import ScrollContainer from 'flavours/glitch/containers/scroll_container';
-
-import AccountCard from './components/account_card';
-
-const messages = defineMessages({
-  title: { id: 'column.directory', defaultMessage: 'Browse profiles' },
-  recentlyActive: { id: 'directory.recently_active', defaultMessage: 'Recently active' },
-  newArrivals: { id: 'directory.new_arrivals', defaultMessage: 'New arrivals' },
-  local: { id: 'directory.local', defaultMessage: 'From {domain} only' },
-  federated: { id: 'directory.federated', defaultMessage: 'From known fediverse' },
-});
-
-const mapStateToProps = state => ({
-  accountIds: state.getIn(['user_lists', 'directory', 'items'], ImmutableList()),
-  isLoading: state.getIn(['user_lists', 'directory', 'isLoading'], true),
-  domain: state.getIn(['meta', 'domain']),
-});
-
-class Directory extends PureComponent {
-
-  static propTypes = {
-    isLoading: PropTypes.bool,
-    accountIds: ImmutablePropTypes.list.isRequired,
-    dispatch: PropTypes.func.isRequired,
-    columnId: PropTypes.string,
-    intl: PropTypes.object.isRequired,
-    multiColumn: PropTypes.bool,
-    domain: PropTypes.string.isRequired,
-    params: PropTypes.shape({
-      order: PropTypes.string,
-      local: PropTypes.bool,
-    }),
-  };
-
-  state = {
-    order: null,
-    local: null,
-  };
-
-  handlePin = () => {
-    const { columnId, dispatch } = this.props;
-
-    if (columnId) {
-      dispatch(removeColumn(columnId));
-    } else {
-      dispatch(addColumn('DIRECTORY', this.getParams(this.props, this.state)));
-    }
-  };
-
-  getParams = (props, state) => ({
-    order: state.order === null ? (props.params.order || 'active') : state.order,
-    local: state.local === null ? (props.params.local || false) : state.local,
-  });
-
-  handleMove = dir => {
-    const { columnId, dispatch } = this.props;
-    dispatch(moveColumn(columnId, dir));
-  };
-
-  handleHeaderClick = () => {
-    this.column.scrollTop();
-  };
-
-  componentDidMount () {
-    const { dispatch } = this.props;
-    dispatch(fetchDirectory(this.getParams(this.props, this.state)));
-  }
-
-  componentDidUpdate (prevProps, prevState) {
-    const { dispatch } = this.props;
-    const paramsOld = this.getParams(prevProps, prevState);
-    const paramsNew = this.getParams(this.props, this.state);
-
-    if (paramsOld.order !== paramsNew.order || paramsOld.local !== paramsNew.local) {
-      dispatch(fetchDirectory(paramsNew));
-    }
-  }
-
-  setRef = c => {
-    this.column = c;
-  };
-
-  handleChangeOrder = e => {
-    const { dispatch, columnId } = this.props;
-
-    if (columnId) {
-      dispatch(changeColumnParams(columnId, ['order'], e.target.value));
-    } else {
-      this.setState({ order: e.target.value });
-    }
-  };
-
-  handleChangeLocal = e => {
-    const { dispatch, columnId } = this.props;
-
-    if (columnId) {
-      dispatch(changeColumnParams(columnId, ['local'], e.target.value === '1'));
-    } else {
-      this.setState({ local: e.target.value === '1' });
-    }
-  };
-
-  handleLoadMore = () => {
-    const { dispatch } = this.props;
-    dispatch(expandDirectory(this.getParams(this.props, this.state)));
-  };
-
-  render () {
-    const { isLoading, accountIds, intl, columnId, multiColumn, domain } = this.props;
-    const { order, local }  = this.getParams(this.props, this.state);
-    const pinned = !!columnId;
-
-    const scrollableArea = (
-      <div className='scrollable'>
-        <div className='filter-form'>
-          <div className='filter-form__column' role='group'>
-            <RadioButton name='order' value='active' label={intl.formatMessage(messages.recentlyActive)} checked={order === 'active'} onChange={this.handleChangeOrder} />
-            <RadioButton name='order' value='new' label={intl.formatMessage(messages.newArrivals)} checked={order === 'new'} onChange={this.handleChangeOrder} />
-          </div>
-
-          <div className='filter-form__column' role='group'>
-            <RadioButton name='local' value='1' label={intl.formatMessage(messages.local, { domain })} checked={local} onChange={this.handleChangeLocal} />
-            <RadioButton name='local' value='0' label={intl.formatMessage(messages.federated)} checked={!local} onChange={this.handleChangeLocal} />
-          </div>
-        </div>
-
-        <div className='directory__list'>
-          {isLoading ? <LoadingIndicator /> : accountIds.map(accountId => (
-            <AccountCard id={accountId} key={accountId} />
-          ))}
-        </div>
-
-        <LoadMore onClick={this.handleLoadMore} visible={!isLoading} />
-      </div>
-    );
-
-    return (
-      <Column bindToDocument={!multiColumn} ref={this.setRef} label={intl.formatMessage(messages.title)}>
-        <ColumnHeader
-          icon='address-book-o'
-          iconComponent={PeopleIcon}
-          title={intl.formatMessage(messages.title)}
-          onPin={this.handlePin}
-          onMove={this.handleMove}
-          onClick={this.handleHeaderClick}
-          pinned={pinned}
-          multiColumn={multiColumn}
-        />
-
-        {multiColumn && !pinned ? <ScrollContainer scrollKey='directory'>{scrollableArea}</ScrollContainer> : scrollableArea}
-
-        <Helmet>
-          <title>{intl.formatMessage(messages.title)}</title>
-          <meta name='robots' content='noindex' />
-        </Helmet>
-      </Column>
-    );
-  }
-
-}
-
-export default connect(mapStateToProps)(injectIntl(Directory));
diff --git a/app/javascript/flavours/glitch/features/directory/index.tsx b/app/javascript/flavours/glitch/features/directory/index.tsx
new file mode 100644
index 00000000000000..ade047656e13cb
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/directory/index.tsx
@@ -0,0 +1,217 @@
+import type { ChangeEventHandler } from 'react';
+import { useCallback, useEffect, useRef, useState } from 'react';
+
+import { defineMessages, useIntl } from 'react-intl';
+
+import { Helmet } from 'react-helmet';
+
+import { List as ImmutableList } from 'immutable';
+
+import PeopleIcon from '@/material-icons/400-24px/group.svg?react';
+import {
+  addColumn,
+  removeColumn,
+  moveColumn,
+  changeColumnParams,
+} from 'flavours/glitch/actions/columns';
+import { fetchDirectory, expandDirectory } from 'flavours/glitch/actions/directory';
+import Column from 'flavours/glitch/components/column';
+import ColumnHeader from 'flavours/glitch/components/column_header';
+import { LoadMore } from 'flavours/glitch/components/load_more';
+import { LoadingIndicator } from 'flavours/glitch/components/loading_indicator';
+import { RadioButton } from 'flavours/glitch/components/radio_button';
+import ScrollContainer from 'flavours/glitch/containers/scroll_container';
+import { useAppDispatch, useAppSelector } from 'flavours/glitch/store';
+
+import { AccountCard } from './components/account_card';
+
+const messages = defineMessages({
+  title: { id: 'column.directory', defaultMessage: 'Browse profiles' },
+  recentlyActive: {
+    id: 'directory.recently_active',
+    defaultMessage: 'Recently active',
+  },
+  newArrivals: { id: 'directory.new_arrivals', defaultMessage: 'New arrivals' },
+  local: { id: 'directory.local', defaultMessage: 'From {domain} only' },
+  federated: {
+    id: 'directory.federated',
+    defaultMessage: 'From known fediverse',
+  },
+});
+
+export const Directory: React.FC<{
+  columnId?: string;
+  multiColumn?: boolean;
+  params?: { order: string; local?: boolean };
+}> = ({ columnId, multiColumn, params }) => {
+  const intl = useIntl();
+  const dispatch = useAppDispatch();
+
+  const [state, setState] = useState<{
+    order: string | null;
+    local: boolean | null;
+  }>({
+    order: null,
+    local: null,
+  });
+
+  const column = useRef<Column>(null);
+
+  const order = state.order ?? params?.order ?? 'active';
+  const local = state.local ?? params?.local ?? false;
+
+  const handlePin = useCallback(() => {
+    if (columnId) {
+      dispatch(removeColumn(columnId));
+    } else {
+      dispatch(addColumn('DIRECTORY', { order, local }));
+    }
+  }, [dispatch, columnId, order, local]);
+
+  const domain = useAppSelector((s) => s.meta.get('domain') as string);
+  const accountIds = useAppSelector(
+    (state) =>
+      state.user_lists.getIn(
+        ['directory', 'items'],
+        ImmutableList(),
+      ) as ImmutableList<string>,
+  );
+  const isLoading = useAppSelector(
+    (state) =>
+      state.user_lists.getIn(['directory', 'isLoading'], true) as boolean,
+  );
+
+  useEffect(() => {
+    void dispatch(fetchDirectory({ order, local }));
+  }, [dispatch, order, local]);
+
+  const handleMove = useCallback(
+    (dir: string) => {
+      dispatch(moveColumn(columnId, dir));
+    },
+    [dispatch, columnId],
+  );
+
+  const handleHeaderClick = useCallback(() => {
+    column.current?.scrollTop();
+  }, []);
+
+  const handleChangeOrder = useCallback<ChangeEventHandler<HTMLInputElement>>(
+    (e) => {
+      if (columnId) {
+        dispatch(changeColumnParams(columnId, ['order'], e.target.value));
+      } else {
+        setState((s) => ({ order: e.target.value, local: s.local }));
+      }
+    },
+    [dispatch, columnId],
+  );
+
+  const handleChangeLocal = useCallback<ChangeEventHandler<HTMLInputElement>>(
+    (e) => {
+      if (columnId) {
+        dispatch(
+          changeColumnParams(columnId, ['local'], e.target.value === '1'),
+        );
+      } else {
+        setState((s) => ({ local: e.target.value === '1', order: s.order }));
+      }
+    },
+    [dispatch, columnId],
+  );
+
+  const handleLoadMore = useCallback(() => {
+    void dispatch(expandDirectory({ order, local }));
+  }, [dispatch, order, local]);
+
+  const pinned = !!columnId;
+
+  const scrollableArea = (
+    <div className='scrollable'>
+      <div className='filter-form'>
+        <div className='filter-form__column' role='group'>
+          <RadioButton
+            name='order'
+            value='active'
+            label={intl.formatMessage(messages.recentlyActive)}
+            checked={order === 'active'}
+            onChange={handleChangeOrder}
+          />
+          <RadioButton
+            name='order'
+            value='new'
+            label={intl.formatMessage(messages.newArrivals)}
+            checked={order === 'new'}
+            onChange={handleChangeOrder}
+          />
+        </div>
+
+        <div className='filter-form__column' role='group'>
+          <RadioButton
+            name='local'
+            value='1'
+            label={intl.formatMessage(messages.local, { domain })}
+            checked={local}
+            onChange={handleChangeLocal}
+          />
+          <RadioButton
+            name='local'
+            value='0'
+            label={intl.formatMessage(messages.federated)}
+            checked={!local}
+            onChange={handleChangeLocal}
+          />
+        </div>
+      </div>
+
+      <div className='directory__list'>
+        {isLoading ? (
+          <LoadingIndicator />
+        ) : (
+          accountIds.map((accountId) => (
+            <AccountCard accountId={accountId} key={accountId} />
+          ))
+        )}
+      </div>
+
+      <LoadMore onClick={handleLoadMore} visible={!isLoading} />
+    </div>
+  );
+
+  return (
+    <Column
+      bindToDocument={!multiColumn}
+      ref={column}
+      label={intl.formatMessage(messages.title)}
+    >
+      <ColumnHeader
+        // @ts-expect-error ColumnHeader is not properly typed yet
+        icon='address-book-o'
+        iconComponent={PeopleIcon}
+        title={intl.formatMessage(messages.title)}
+        onPin={handlePin}
+        onMove={handleMove}
+        onClick={handleHeaderClick}
+        pinned={pinned}
+        multiColumn={multiColumn}
+      />
+
+      {multiColumn && !pinned ? (
+        // @ts-expect-error ScrollContainer is not properly typed yet
+        <ScrollContainer scrollKey='directory'>
+          {scrollableArea}
+        </ScrollContainer>
+      ) : (
+        scrollableArea
+      )}
+
+      <Helmet>
+        <title>{intl.formatMessage(messages.title)}</title>
+        <meta name='robots' content='noindex' />
+      </Helmet>
+    </Column>
+  );
+};
+
+// eslint-disable-next-line import/no-default-export -- Needed because this is called as an async components
+export default Directory;
diff --git a/app/javascript/flavours/glitch/locales/en.json b/app/javascript/flavours/glitch/locales/en.json
index 76f7ed535ea4f6..5ab92732ce9729 100644
--- a/app/javascript/flavours/glitch/locales/en.json
+++ b/app/javascript/flavours/glitch/locales/en.json
@@ -155,6 +155,5 @@
   "status.in_reply_to": "This toot is a reply",
   "status.is_poll": "This toot is a poll",
   "status.local_only": "Only visible from your instance",
-  "status.uncollapse": "Uncollapse",
-  "suggestions.dismiss": "Dismiss suggestion"
+  "status.uncollapse": "Uncollapse"
 }
diff --git a/app/javascript/flavours/glitch/reducers/user_lists.js b/app/javascript/flavours/glitch/reducers/user_lists.js
index 3eb80da4379bfa..0ea3debc6c7020 100644
--- a/app/javascript/flavours/glitch/reducers/user_lists.js
+++ b/app/javascript/flavours/glitch/reducers/user_lists.js
@@ -1,12 +1,8 @@
 import { Map as ImmutableMap, List as ImmutableList, fromJS } from 'immutable';
 
 import {
-  DIRECTORY_FETCH_REQUEST,
-  DIRECTORY_FETCH_SUCCESS,
-  DIRECTORY_FETCH_FAIL,
-  DIRECTORY_EXPAND_REQUEST,
-  DIRECTORY_EXPAND_SUCCESS,
-  DIRECTORY_EXPAND_FAIL,
+  expandDirectory,
+  fetchDirectory
 } from 'flavours/glitch/actions/directory';
 import {
   FEATURED_TAGS_FETCH_REQUEST,
@@ -117,6 +113,7 @@ const normalizeFeaturedTags = (state, path, featuredTags, accountId) => {
   }));
 };
 
+/** @type {import('@reduxjs/toolkit').Reducer<typeof initialState>} */
 export default function userLists(state = initialState, action) {
   switch(action.type) {
   case FOLLOWERS_FETCH_SUCCESS:
@@ -194,16 +191,6 @@ export default function userLists(state = initialState, action) {
   case MUTES_FETCH_FAIL:
   case MUTES_EXPAND_FAIL:
     return state.setIn(['mutes', 'isLoading'], false);
-  case DIRECTORY_FETCH_SUCCESS:
-    return normalizeList(state, ['directory'], action.accounts, action.next);
-  case DIRECTORY_EXPAND_SUCCESS:
-    return appendToList(state, ['directory'], action.accounts, action.next);
-  case DIRECTORY_FETCH_REQUEST:
-  case DIRECTORY_EXPAND_REQUEST:
-    return state.setIn(['directory', 'isLoading'], true);
-  case DIRECTORY_FETCH_FAIL:
-  case DIRECTORY_EXPAND_FAIL:
-    return state.setIn(['directory', 'isLoading'], false);
   case FEATURED_TAGS_FETCH_SUCCESS:
     return normalizeFeaturedTags(state, ['featured_tags', action.id], action.tags, action.id);
   case FEATURED_TAGS_FETCH_REQUEST:
@@ -211,6 +198,17 @@ export default function userLists(state = initialState, action) {
   case FEATURED_TAGS_FETCH_FAIL:
     return state.setIn(['featured_tags', action.id, 'isLoading'], false);
   default:
-    return state;
+    if(fetchDirectory.fulfilled.match(action))
+      return normalizeList(state, ['directory'], action.payload.accounts, undefined);
+    else if( expandDirectory.fulfilled.match(action))
+      return appendToList(state, ['directory'], action.payload.accounts, undefined);
+    else if(fetchDirectory.pending.match(action) ||
+     expandDirectory.pending.match(action))
+      return state.setIn(['directory', 'isLoading'], true);
+    else if(fetchDirectory.rejected.match(action) ||
+     expandDirectory.rejected.match(action))
+      return state.setIn(['directory', 'isLoading'], false);
+    else
+      return state;
   }
 }

From d612daee97d95c67009f7e6e3be25f1a2a5aa352 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 26 Jun 2024 21:46:28 +0200
Subject: [PATCH 1428/2191] [Glitch] Convert `<ColumnHeader>` to Typescript

Port 3939352e92f4be13b773ee243bbb6ad54d6b5bd1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../glitch/components/column_header.jsx       | 233 --------------
 .../glitch/components/column_header.tsx       | 301 ++++++++++++++++++
 .../glitch/features/directory/index.tsx       |  10 +-
 .../features/ui/components/column_loading.tsx |  11 +-
 4 files changed, 311 insertions(+), 244 deletions(-)
 delete mode 100644 app/javascript/flavours/glitch/components/column_header.jsx
 create mode 100644 app/javascript/flavours/glitch/components/column_header.tsx

diff --git a/app/javascript/flavours/glitch/components/column_header.jsx b/app/javascript/flavours/glitch/components/column_header.jsx
deleted file mode 100644
index 210ec396fae371..00000000000000
--- a/app/javascript/flavours/glitch/components/column_header.jsx
+++ /dev/null
@@ -1,233 +0,0 @@
-import PropTypes from 'prop-types';
-import { PureComponent, useCallback } from 'react';
-
-import { FormattedMessage, injectIntl, defineMessages, useIntl } from 'react-intl';
-
-import classNames from 'classnames';
-import { withRouter } from 'react-router-dom';
-
-import AddIcon from '@/material-icons/400-24px/add.svg?react';
-import ArrowBackIcon from '@/material-icons/400-24px/arrow_back.svg?react';
-import ChevronLeftIcon from '@/material-icons/400-24px/chevron_left.svg?react';
-import ChevronRightIcon from '@/material-icons/400-24px/chevron_right.svg?react';
-import CloseIcon from '@/material-icons/400-24px/close.svg?react';
-import SettingsIcon from '@/material-icons/400-24px/settings.svg?react';
-import { Icon }  from 'flavours/glitch/components/icon';
-import { ButtonInTabsBar } from 'flavours/glitch/features/ui/util/columns_context';
-import { identityContextPropShape, withIdentity } from 'flavours/glitch/identity_context';
-import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router';
-
-
-import { useAppHistory } from './router';
-
-const messages = defineMessages({
-  show: { id: 'column_header.show_settings', defaultMessage: 'Show settings' },
-  hide: { id: 'column_header.hide_settings', defaultMessage: 'Hide settings' },
-  moveLeft: { id: 'column_header.moveLeft_settings', defaultMessage: 'Move column to the left' },
-  moveRight: { id: 'column_header.moveRight_settings', defaultMessage: 'Move column to the right' },
-  back: { id: 'column_back_button.label', defaultMessage: 'Back' },
-});
-
-const BackButton = ({ onlyIcon }) => {
-  const history = useAppHistory();
-  const intl = useIntl();
-
-  const handleBackClick = useCallback(() => {
-    if (history.location?.state?.fromMastodon) {
-      history.goBack();
-    } else {
-      history.push('/');
-    }
-  }, [history]);
-
-  return (
-    <button onClick={handleBackClick} className={classNames('column-header__back-button', { 'compact': onlyIcon })} aria-label={intl.formatMessage(messages.back)}>
-      <Icon id='chevron-left' icon={ArrowBackIcon} className='column-back-button__icon' />
-      {!onlyIcon && <FormattedMessage id='column_back_button.label' defaultMessage='Back' />}
-    </button>
-  );
-};
-
-BackButton.propTypes = {
-  onlyIcon: PropTypes.bool,
-};
-
-class ColumnHeader extends PureComponent {
-  static propTypes = {
-    identity: identityContextPropShape,
-    intl: PropTypes.object.isRequired,
-    title: PropTypes.node,
-    icon: PropTypes.string,
-    iconComponent: PropTypes.func,
-    active: PropTypes.bool,
-    multiColumn: PropTypes.bool,
-    extraButton: PropTypes.node,
-    showBackButton: PropTypes.bool,
-    children: PropTypes.node,
-    pinned: PropTypes.bool,
-    placeholder: PropTypes.bool,
-    onPin: PropTypes.func,
-    onMove: PropTypes.func,
-    onClick: PropTypes.func,
-    appendContent: PropTypes.node,
-    collapseIssues: PropTypes.bool,
-    ...WithRouterPropTypes,
-  };
-
-  state = {
-    collapsed: true,
-    animating: false,
-  };
-
-  handleToggleClick = (e) => {
-    e.stopPropagation();
-    this.setState({ collapsed: !this.state.collapsed, animating: true });
-  };
-
-  handleTitleClick = () => {
-    this.props.onClick?.();
-  };
-
-  handleMoveLeft = () => {
-    this.props.onMove(-1);
-  };
-
-  handleMoveRight = () => {
-    this.props.onMove(1);
-  };
-
-  handleTransitionEnd = () => {
-    this.setState({ animating: false });
-  };
-
-  handlePin = () => {
-    if (!this.props.pinned) {
-      this.props.history.replace('/');
-    }
-
-    this.props.onPin();
-  };
-
-  render () {
-    const { title, icon, iconComponent, active, children, pinned, multiColumn, extraButton, showBackButton, intl: { formatMessage }, placeholder, appendContent, collapseIssues, history } = this.props;
-    const { collapsed, animating } = this.state;
-
-    const wrapperClassName = classNames('column-header__wrapper', {
-      'active': active,
-    });
-
-    const buttonClassName = classNames('column-header', {
-      'active': active,
-    });
-
-    const collapsibleClassName = classNames('column-header__collapsible', {
-      'collapsed': collapsed,
-      'animating': animating,
-    });
-
-    const collapsibleButtonClassName = classNames('column-header__button', {
-      'active': !collapsed,
-    });
-
-    let extraContent, pinButton, moveButtons, backButton, collapseButton;
-
-    if (children) {
-      extraContent = (
-        <div key='extra-content' className='column-header__collapsible__extra'>
-          {children}
-        </div>
-      );
-    }
-
-    if (multiColumn && pinned) {
-      pinButton = <button className='text-btn column-header__setting-btn' onClick={this.handlePin}><Icon id='times' icon={CloseIcon} /> <FormattedMessage id='column_header.unpin' defaultMessage='Unpin' /></button>;
-
-      moveButtons = (
-        <div className='column-header__setting-arrows'>
-          <button title={formatMessage(messages.moveLeft)} aria-label={formatMessage(messages.moveLeft)} className='icon-button column-header__setting-btn' onClick={this.handleMoveLeft}><Icon id='chevron-left' icon={ChevronLeftIcon} /></button>
-          <button title={formatMessage(messages.moveRight)} aria-label={formatMessage(messages.moveRight)} className='icon-button column-header__setting-btn' onClick={this.handleMoveRight}><Icon id='chevron-right' icon={ChevronRightIcon} /></button>
-        </div>
-      );
-    } else if (multiColumn && this.props.onPin) {
-      pinButton = <button className='text-btn column-header__setting-btn' onClick={this.handlePin}><Icon id='plus' icon={AddIcon} /> <FormattedMessage id='column_header.pin' defaultMessage='Pin' /></button>;
-    }
-
-    if (history && !pinned && ((multiColumn && history.location?.state?.fromMastodon) || showBackButton)) {
-      backButton = <BackButton onlyIcon={!!title} />;
-    }
-
-    const collapsedContent = [
-      extraContent,
-    ];
-
-    if (multiColumn) {
-      collapsedContent.push(
-        <div key='buttons' className='column-header__advanced-buttons'>
-          {pinButton}
-          {moveButtons}
-        </div>
-      );
-    }
-
-    if (this.props.identity.signedIn && (children || (multiColumn && this.props.onPin))) {
-      collapseButton = (
-        <button
-          className={collapsibleButtonClassName}
-          title={formatMessage(collapsed ? messages.show : messages.hide)}
-          aria-label={formatMessage(collapsed ? messages.show : messages.hide)}
-          onClick={this.handleToggleClick}
-        >
-          <i className='icon-with-badge'>
-            <Icon id='sliders' icon={SettingsIcon} />
-            {collapseIssues && <i className='icon-with-badge__issue-badge' />}
-          </i>
-        </button>
-      );
-    }
-
-    const hasTitle = (icon || iconComponent) && title;
-
-    const component = (
-      <div className={wrapperClassName}>
-        <h1 className={buttonClassName}>
-          {hasTitle && (
-            <>
-              {backButton}
-
-              <button onClick={this.handleTitleClick} className='column-header__title'>
-                {!backButton && <Icon id={icon} icon={iconComponent} className='column-header__icon' />}
-                {title}
-              </button>
-            </>
-          )}
-
-          {!hasTitle && backButton}
-
-          <div className='column-header__buttons'>
-            {extraButton}
-            {collapseButton}
-          </div>
-        </h1>
-
-        <div className={collapsibleClassName} tabIndex={collapsed ? -1 : null} onTransitionEnd={this.handleTransitionEnd}>
-          <div className='column-header__collapsible-inner'>
-            {(!collapsed || animating) && collapsedContent}
-          </div>
-        </div>
-
-        {appendContent}
-      </div>
-    );
-
-    if (placeholder) {
-      return component;
-    } else {
-      return (<ButtonInTabsBar>
-        {component}
-      </ButtonInTabsBar>);
-    }
-  }
-
-}
-
-export default injectIntl(withIdentity(withRouter(ColumnHeader)));
diff --git a/app/javascript/flavours/glitch/components/column_header.tsx b/app/javascript/flavours/glitch/components/column_header.tsx
new file mode 100644
index 00000000000000..9bd155990466c8
--- /dev/null
+++ b/app/javascript/flavours/glitch/components/column_header.tsx
@@ -0,0 +1,301 @@
+import { useCallback, useState } from 'react';
+
+import { FormattedMessage, defineMessages, useIntl } from 'react-intl';
+
+import classNames from 'classnames';
+
+import AddIcon from '@/material-icons/400-24px/add.svg?react';
+import ArrowBackIcon from '@/material-icons/400-24px/arrow_back.svg?react';
+import ChevronLeftIcon from '@/material-icons/400-24px/chevron_left.svg?react';
+import ChevronRightIcon from '@/material-icons/400-24px/chevron_right.svg?react';
+import CloseIcon from '@/material-icons/400-24px/close.svg?react';
+import SettingsIcon from '@/material-icons/400-24px/settings.svg?react';
+import type { IconProp } from 'flavours/glitch/components/icon';
+import { Icon } from 'flavours/glitch/components/icon';
+import { ButtonInTabsBar } from 'flavours/glitch/features/ui/util/columns_context';
+import { useIdentity } from 'flavours/glitch/identity_context';
+
+import { useAppHistory } from './router';
+
+const messages = defineMessages({
+  show: { id: 'column_header.show_settings', defaultMessage: 'Show settings' },
+  hide: { id: 'column_header.hide_settings', defaultMessage: 'Hide settings' },
+  moveLeft: {
+    id: 'column_header.moveLeft_settings',
+    defaultMessage: 'Move column to the left',
+  },
+  moveRight: {
+    id: 'column_header.moveRight_settings',
+    defaultMessage: 'Move column to the right',
+  },
+  back: { id: 'column_back_button.label', defaultMessage: 'Back' },
+});
+
+const BackButton: React.FC<{
+  onlyIcon: boolean;
+}> = ({ onlyIcon }) => {
+  const history = useAppHistory();
+  const intl = useIntl();
+
+  const handleBackClick = useCallback(() => {
+    if (history.location.state?.fromMastodon) {
+      history.goBack();
+    } else {
+      history.push('/');
+    }
+  }, [history]);
+
+  return (
+    <button
+      onClick={handleBackClick}
+      className={classNames('column-header__back-button', {
+        compact: onlyIcon,
+      })}
+      aria-label={intl.formatMessage(messages.back)}
+    >
+      <Icon
+        id='chevron-left'
+        icon={ArrowBackIcon}
+        className='column-back-button__icon'
+      />
+      {!onlyIcon && (
+        <FormattedMessage id='column_back_button.label' defaultMessage='Back' />
+      )}
+    </button>
+  );
+};
+
+export interface Props {
+  title?: string;
+  icon?: string;
+  iconComponent?: IconProp;
+  active?: boolean;
+  children?: React.ReactNode;
+  pinned?: boolean;
+  multiColumn?: boolean;
+  extraButton?: React.ReactNode;
+  showBackButton?: boolean;
+  placeholder?: boolean;
+  appendContent?: React.ReactNode;
+  collapseIssues?: boolean;
+  onClick?: () => void;
+  onMove?: (arg0: number) => void;
+  onPin?: () => void;
+}
+
+export const ColumnHeader: React.FC<Props> = ({
+  title,
+  icon,
+  iconComponent,
+  active,
+  children,
+  pinned,
+  multiColumn,
+  extraButton,
+  showBackButton,
+  placeholder,
+  appendContent,
+  collapseIssues,
+  onClick,
+  onMove,
+  onPin,
+}) => {
+  const intl = useIntl();
+  const { signedIn } = useIdentity();
+  const history = useAppHistory();
+  const [collapsed, setCollapsed] = useState(true);
+  const [animating, setAnimating] = useState(false);
+
+  const handleToggleClick = useCallback(
+    (e: React.MouseEvent) => {
+      e.stopPropagation();
+      setCollapsed((value) => !value);
+      setAnimating(true);
+    },
+    [setCollapsed, setAnimating],
+  );
+
+  const handleTitleClick = useCallback(() => {
+    onClick?.();
+  }, [onClick]);
+
+  const handleMoveLeft = useCallback(() => {
+    onMove?.(-1);
+  }, [onMove]);
+
+  const handleMoveRight = useCallback(() => {
+    onMove?.(1);
+  }, [onMove]);
+
+  const handleTransitionEnd = useCallback(() => {
+    setAnimating(false);
+  }, [setAnimating]);
+
+  const handlePin = useCallback(() => {
+    if (!pinned) {
+      history.replace('/');
+    }
+
+    onPin?.();
+  }, [history, pinned, onPin]);
+
+  const wrapperClassName = classNames('column-header__wrapper', {
+    active,
+  });
+
+  const buttonClassName = classNames('column-header', {
+    active,
+  });
+
+  const collapsibleClassName = classNames('column-header__collapsible', {
+    collapsed,
+    animating,
+  });
+
+  const collapsibleButtonClassName = classNames('column-header__button', {
+    active: !collapsed,
+  });
+
+  let extraContent, pinButton, moveButtons, backButton, collapseButton;
+
+  if (children) {
+    extraContent = (
+      <div key='extra-content' className='column-header__collapsible__extra'>
+        {children}
+      </div>
+    );
+  }
+
+  if (multiColumn && pinned) {
+    pinButton = (
+      <button
+        className='text-btn column-header__setting-btn'
+        onClick={handlePin}
+      >
+        <Icon id='times' icon={CloseIcon} />{' '}
+        <FormattedMessage id='column_header.unpin' defaultMessage='Unpin' />
+      </button>
+    );
+
+    moveButtons = (
+      <div className='column-header__setting-arrows'>
+        <button
+          title={intl.formatMessage(messages.moveLeft)}
+          aria-label={intl.formatMessage(messages.moveLeft)}
+          className='icon-button column-header__setting-btn'
+          onClick={handleMoveLeft}
+        >
+          <Icon id='chevron-left' icon={ChevronLeftIcon} />
+        </button>
+        <button
+          title={intl.formatMessage(messages.moveRight)}
+          aria-label={intl.formatMessage(messages.moveRight)}
+          className='icon-button column-header__setting-btn'
+          onClick={handleMoveRight}
+        >
+          <Icon id='chevron-right' icon={ChevronRightIcon} />
+        </button>
+      </div>
+    );
+  } else if (multiColumn && onPin) {
+    pinButton = (
+      <button
+        className='text-btn column-header__setting-btn'
+        onClick={handlePin}
+      >
+        <Icon id='plus' icon={AddIcon} />{' '}
+        <FormattedMessage id='column_header.pin' defaultMessage='Pin' />
+      </button>
+    );
+  }
+
+  if (
+    !pinned &&
+    ((multiColumn && history.location.state?.fromMastodon) || showBackButton)
+  ) {
+    backButton = <BackButton onlyIcon={!!title} />;
+  }
+
+  const collapsedContent = [extraContent];
+
+  if (multiColumn) {
+    collapsedContent.push(
+      <div key='buttons' className='column-header__advanced-buttons'>
+        {pinButton}
+        {moveButtons}
+      </div>,
+    );
+  }
+
+  if (signedIn && (children || (multiColumn && onPin))) {
+    collapseButton = (
+      <button
+        className={collapsibleButtonClassName}
+        title={intl.formatMessage(collapsed ? messages.show : messages.hide)}
+        aria-label={intl.formatMessage(
+          collapsed ? messages.show : messages.hide,
+        )}
+        onClick={handleToggleClick}
+      >
+        <i className='icon-with-badge'>
+          <Icon id='sliders' icon={SettingsIcon} />
+          {collapseIssues && <i className='icon-with-badge__issue-badge' />}
+        </i>
+      </button>
+    );
+  }
+
+  const hasIcon = icon && iconComponent;
+  const hasTitle = hasIcon && title;
+
+  const component = (
+    <div className={wrapperClassName}>
+      <h1 className={buttonClassName}>
+        {hasTitle && (
+          <>
+            {backButton}
+
+            <button onClick={handleTitleClick} className='column-header__title'>
+              {!backButton && (
+                <Icon
+                  id={icon}
+                  icon={iconComponent}
+                  className='column-header__icon'
+                />
+              )}
+              {title}
+            </button>
+          </>
+        )}
+
+        {!hasTitle && backButton}
+
+        <div className='column-header__buttons'>
+          {extraButton}
+          {collapseButton}
+        </div>
+      </h1>
+
+      <div
+        className={collapsibleClassName}
+        tabIndex={collapsed ? -1 : undefined}
+        onTransitionEnd={handleTransitionEnd}
+      >
+        <div className='column-header__collapsible-inner'>
+          {(!collapsed || animating) && collapsedContent}
+        </div>
+      </div>
+
+      {appendContent}
+    </div>
+  );
+
+  if (placeholder) {
+    return component;
+  } else {
+    return <ButtonInTabsBar>{component}</ButtonInTabsBar>;
+  }
+};
+
+// eslint-disable-next-line import/no-default-export
+export default ColumnHeader;
diff --git a/app/javascript/flavours/glitch/features/directory/index.tsx b/app/javascript/flavours/glitch/features/directory/index.tsx
index ade047656e13cb..d58ef2eab02c01 100644
--- a/app/javascript/flavours/glitch/features/directory/index.tsx
+++ b/app/javascript/flavours/glitch/features/directory/index.tsx
@@ -14,9 +14,12 @@ import {
   moveColumn,
   changeColumnParams,
 } from 'flavours/glitch/actions/columns';
-import { fetchDirectory, expandDirectory } from 'flavours/glitch/actions/directory';
+import {
+  fetchDirectory,
+  expandDirectory,
+} from 'flavours/glitch/actions/directory';
 import Column from 'flavours/glitch/components/column';
-import ColumnHeader from 'flavours/glitch/components/column_header';
+import { ColumnHeader } from 'flavours/glitch/components/column_header';
 import { LoadMore } from 'flavours/glitch/components/load_more';
 import { LoadingIndicator } from 'flavours/glitch/components/loading_indicator';
 import { RadioButton } from 'flavours/glitch/components/radio_button';
@@ -86,7 +89,7 @@ export const Directory: React.FC<{
   }, [dispatch, order, local]);
 
   const handleMove = useCallback(
-    (dir: string) => {
+    (dir: number) => {
       dispatch(moveColumn(columnId, dir));
     },
     [dispatch, columnId],
@@ -185,7 +188,6 @@ export const Directory: React.FC<{
       label={intl.formatMessage(messages.title)}
     >
       <ColumnHeader
-        // @ts-expect-error ColumnHeader is not properly typed yet
         icon='address-book-o'
         iconComponent={PeopleIcon}
         title={intl.formatMessage(messages.title)}
diff --git a/app/javascript/flavours/glitch/features/ui/components/column_loading.tsx b/app/javascript/flavours/glitch/features/ui/components/column_loading.tsx
index 42174838cf31af..aa6d105dcc3dcc 100644
--- a/app/javascript/flavours/glitch/features/ui/components/column_loading.tsx
+++ b/app/javascript/flavours/glitch/features/ui/components/column_loading.tsx
@@ -1,11 +1,8 @@
-import Column from '../../../components/column';
-import ColumnHeader from '../../../components/column_header';
+import Column from 'flavours/glitch/components/column';
+import { ColumnHeader } from 'flavours/glitch/components/column_header';
+import type { Props as ColumnHeaderProps } from 'flavours/glitch/components/column_header';
 
-interface Props {
-  multiColumn?: boolean;
-}
-
-export const ColumnLoading: React.FC<Props> = (otherProps) => (
+export const ColumnLoading: React.FC<ColumnHeaderProps> = (otherProps) => (
   <Column>
     <ColumnHeader {...otherProps} />
     <div className='scrollable' />

From 4179f5fcf32a2aaa83c1eb564f60196722825669 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 27 Jun 2024 15:17:18 +0200
Subject: [PATCH 1429/2191] [Glitch] Change `author_account` to be `authors` in
 REST API

Port 096057b845f27fd6090915b22c8688a6eeb22e28 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/actions/importer/index.js         |  4 ++--
 .../flavours/glitch/actions/importer/normalizer.js    | 11 +++++++++--
 app/javascript/flavours/glitch/actions/trends.js      |  2 +-
 app/javascript/flavours/glitch/api_types/statuses.ts  |  7 +++++++
 .../features/explore/components/author_link.jsx       |  4 ++++
 .../flavours/glitch/features/explore/links.jsx        |  2 +-
 .../glitch/features/status/components/card.jsx        |  4 ++--
 7 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/app/javascript/flavours/glitch/actions/importer/index.js b/app/javascript/flavours/glitch/actions/importer/index.js
index 63a28eb0edf9b0..7341ba8550bea2 100644
--- a/app/javascript/flavours/glitch/actions/importer/index.js
+++ b/app/javascript/flavours/glitch/actions/importer/index.js
@@ -76,8 +76,8 @@ export function importFetchedStatuses(statuses) {
         pushUnique(polls, normalizePoll(status.poll, getState().getIn(['polls', status.poll.id])));
       }
 
-      if (status.card?.author_account) {
-        pushUnique(accounts, status.card.author_account);
+      if (status.card) {
+        status.card.authors.forEach(author => author.account && pushUnique(accounts, author.account));
       }
     }
 
diff --git a/app/javascript/flavours/glitch/actions/importer/normalizer.js b/app/javascript/flavours/glitch/actions/importer/normalizer.js
index 8f5bda89b5601a..5f10c8d889306a 100644
--- a/app/javascript/flavours/glitch/actions/importer/normalizer.js
+++ b/app/javascript/flavours/glitch/actions/importer/normalizer.js
@@ -36,8 +36,15 @@ export function normalizeStatus(status, normalOldStatus, settings) {
     normalStatus.poll = status.poll.id;
   }
 
-  if (status.card?.author_account) {
-    normalStatus.card = { ...status.card, author_account: status.card.author_account.id };
+  if (status.card) {
+    normalStatus.card = {
+      ...status.card,
+      authors: status.card.authors.map(author => ({
+        ...author,
+        accountId: author.account?.id,
+        account: undefined,
+      })),
+    };
   }
 
   if (status.filtered) {
diff --git a/app/javascript/flavours/glitch/actions/trends.js b/app/javascript/flavours/glitch/actions/trends.js
index 01089fccbb764d..0bdf17a5d26e50 100644
--- a/app/javascript/flavours/glitch/actions/trends.js
+++ b/app/javascript/flavours/glitch/actions/trends.js
@@ -51,7 +51,7 @@ export const fetchTrendingLinks = () => (dispatch) => {
   api()
     .get('/api/v1/trends/links', { params: { limit: 20 } })
     .then(({ data }) => {
-      dispatch(importFetchedAccounts(data.map(link => link.author_account).filter(account => !!account)));
+      dispatch(importFetchedAccounts(data.flatMap(link => link.authors.map(author => author.account)).filter(account => !!account)));
       dispatch(fetchTrendingLinksSuccess(data));
     })
     .catch(err => dispatch(fetchTrendingLinksFail(err)));
diff --git a/app/javascript/flavours/glitch/api_types/statuses.ts b/app/javascript/flavours/glitch/api_types/statuses.ts
index d63441873d5415..261d6003052a56 100644
--- a/app/javascript/flavours/glitch/api_types/statuses.ts
+++ b/app/javascript/flavours/glitch/api_types/statuses.ts
@@ -30,6 +30,12 @@ export interface ApiMentionJSON {
   acct: string;
 }
 
+export interface ApiPreviewCardAuthorJSON {
+  name: string;
+  url: string;
+  account?: ApiAccountJSON;
+}
+
 export interface ApiPreviewCardJSON {
   url: string;
   title: string;
@@ -48,6 +54,7 @@ export interface ApiPreviewCardJSON {
   embed_url: string;
   blurhash: string;
   published_at: string;
+  authors: ApiPreviewCardAuthorJSON[];
 }
 
 export interface ApiStatusJSON {
diff --git a/app/javascript/flavours/glitch/features/explore/components/author_link.jsx b/app/javascript/flavours/glitch/features/explore/components/author_link.jsx
index 94061c009209e7..ae527db33c8718 100644
--- a/app/javascript/flavours/glitch/features/explore/components/author_link.jsx
+++ b/app/javascript/flavours/glitch/features/explore/components/author_link.jsx
@@ -7,6 +7,10 @@ import { useAppSelector } from 'flavours/glitch/store';
 export const AuthorLink = ({ accountId }) => {
   const account = useAppSelector(state => state.getIn(['accounts', accountId]));
 
+  if (!account) {
+    return null;
+  }
+
   return (
     <Permalink href={account.get('url')} to={`/@${account.get('acct')}`} className='story__details__shared__author-link'>
       <Avatar account={account} size={16} />
diff --git a/app/javascript/flavours/glitch/features/explore/links.jsx b/app/javascript/flavours/glitch/features/explore/links.jsx
index dc15030f725a88..b5eb9c9d4f4f51 100644
--- a/app/javascript/flavours/glitch/features/explore/links.jsx
+++ b/app/javascript/flavours/glitch/features/explore/links.jsx
@@ -75,7 +75,7 @@ class Links extends PureComponent {
             publisher={link.get('provider_name')}
             publishedAt={link.get('published_at')}
             author={link.get('author_name')}
-            authorAccount={link.getIn(['author_account', 'id'])}
+            authorAccount={link.getIn(['authors', 0, 'account', 'id'])}
             sharedTimes={link.getIn(['history', 0, 'accounts']) * 1 + link.getIn(['history', 1, 'accounts']) * 1}
             thumbnail={link.get('image')}
             thumbnailDescription={link.get('image_description')}
diff --git a/app/javascript/flavours/glitch/features/status/components/card.jsx b/app/javascript/flavours/glitch/features/status/components/card.jsx
index c9b0f7ebaf9cb8..0d315cbbf10ad9 100644
--- a/app/javascript/flavours/glitch/features/status/components/card.jsx
+++ b/app/javascript/flavours/glitch/features/status/components/card.jsx
@@ -127,7 +127,7 @@ export default class Card extends PureComponent {
     const interactive = card.get('type') === 'video';
     const language    = card.get('language') || '';
     const largeImage  = (card.get('image')?.length > 0 && card.get('width') > card.get('height')) || interactive;
-    const showAuthor  = !!card.get('author_account');
+    const showAuthor  = !!card.getIn(['authors', 0, 'accountId']);
 
     const description = (
       <div className='status-card__content'>
@@ -233,7 +233,7 @@ export default class Card extends PureComponent {
           {description}
         </a>
 
-        {showAuthor && <MoreFromAuthor accountId={card.get('author_account')} />}
+        {showAuthor && <MoreFromAuthor accountId={card.getIn(['authors', 0, 'accountId'])} />}
       </>
     );
   }

From 98185247b85cb2fa6b0dc9c5f5be7d22f3db7a24 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 26 Jun 2024 21:33:38 +0200
Subject: [PATCH 1430/2191] [Glitch] Add hover cards in web UI

Port e89317d4c1da991b728b6d4a21671ed33f057cc4

Co-authored-by: Renaud Chaput <renchap@gmail.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../glitch/components/account_bio.tsx         |  20 ++
 .../glitch/components/account_fields.tsx      |  42 +++++
 .../glitch/components/follow_button.tsx       |  90 +++++++++
 .../glitch/components/hover_card_account.tsx  |  78 ++++++++
 .../components/hover_card_controller.tsx      | 117 ++++++++++++
 .../glitch/components/status_content.jsx      |   3 +-
 .../glitch/components/status_header.jsx       |   1 +
 .../glitch/components/status_prepend.jsx      |   1 +
 .../explore/components/author_link.jsx        |   2 +-
 .../features/explore/components/card.jsx      |  17 +-
 .../components/inline_follow_suggestions.jsx  |  15 +-
 .../notifications/components/notification.jsx |   2 +
 .../status/components/detailed_status.jsx     |   2 +-
 .../flavours/glitch/features/ui/index.jsx     |   2 +
 .../flavours/glitch/hooks/useLinks.ts         |  61 ++++++
 .../flavours/glitch/hooks/useTimeout.ts       |  29 +++
 .../flavours/glitch/styles/components.scss    | 178 +++++++++++++++++-
 .../styles/mastodon-light/variables.scss      |   2 +
 18 files changed, 628 insertions(+), 34 deletions(-)
 create mode 100644 app/javascript/flavours/glitch/components/account_bio.tsx
 create mode 100644 app/javascript/flavours/glitch/components/account_fields.tsx
 create mode 100644 app/javascript/flavours/glitch/components/follow_button.tsx
 create mode 100644 app/javascript/flavours/glitch/components/hover_card_account.tsx
 create mode 100644 app/javascript/flavours/glitch/components/hover_card_controller.tsx
 create mode 100644 app/javascript/flavours/glitch/hooks/useLinks.ts
 create mode 100644 app/javascript/flavours/glitch/hooks/useTimeout.ts

diff --git a/app/javascript/flavours/glitch/components/account_bio.tsx b/app/javascript/flavours/glitch/components/account_bio.tsx
new file mode 100644
index 00000000000000..567a2374c20f9f
--- /dev/null
+++ b/app/javascript/flavours/glitch/components/account_bio.tsx
@@ -0,0 +1,20 @@
+import { useLinks } from 'flavours/glitch/hooks/useLinks';
+
+export const AccountBio: React.FC<{
+  note: string;
+  className: string;
+}> = ({ note, className }) => {
+  const handleClick = useLinks();
+
+  if (note.length === 0 || note === '<p></p>') {
+    return null;
+  }
+
+  return (
+    <div
+      className={`${className} translate`}
+      dangerouslySetInnerHTML={{ __html: note }}
+      onClickCapture={handleClick}
+    />
+  );
+};
diff --git a/app/javascript/flavours/glitch/components/account_fields.tsx b/app/javascript/flavours/glitch/components/account_fields.tsx
new file mode 100644
index 00000000000000..768eb1fa4b343d
--- /dev/null
+++ b/app/javascript/flavours/glitch/components/account_fields.tsx
@@ -0,0 +1,42 @@
+import classNames from 'classnames';
+
+import CheckIcon from '@/material-icons/400-24px/check.svg?react';
+import { Icon } from 'flavours/glitch/components/icon';
+import { useLinks } from 'flavours/glitch/hooks/useLinks';
+import type { Account } from 'flavours/glitch/models/account';
+
+export const AccountFields: React.FC<{
+  fields: Account['fields'];
+  limit: number;
+}> = ({ fields, limit = -1 }) => {
+  const handleClick = useLinks();
+
+  if (fields.size === 0) {
+    return null;
+  }
+
+  return (
+    <div className='account-fields' onClickCapture={handleClick}>
+      {fields.take(limit).map((pair, i) => (
+        <dl
+          key={i}
+          className={classNames({ verified: pair.get('verified_at') })}
+        >
+          <dt
+            dangerouslySetInnerHTML={{ __html: pair.get('name_emojified') }}
+            className='translate'
+          />
+
+          <dd className='translate' title={pair.get('value_plain') ?? ''}>
+            {pair.get('verified_at') && (
+              <Icon id='check' icon={CheckIcon} className='verified__mark' />
+            )}
+            <span
+              dangerouslySetInnerHTML={{ __html: pair.get('value_emojified') }}
+            />
+          </dd>
+        </dl>
+      ))}
+    </div>
+  );
+};
diff --git a/app/javascript/flavours/glitch/components/follow_button.tsx b/app/javascript/flavours/glitch/components/follow_button.tsx
new file mode 100644
index 00000000000000..664ac860001076
--- /dev/null
+++ b/app/javascript/flavours/glitch/components/follow_button.tsx
@@ -0,0 +1,90 @@
+import { useCallback, useEffect } from 'react';
+
+import { useIntl, defineMessages } from 'react-intl';
+
+import {
+  fetchRelationships,
+  followAccount,
+  unfollowAccount,
+} from 'flavours/glitch/actions/accounts';
+import { Button } from 'flavours/glitch/components/button';
+import { LoadingIndicator } from 'flavours/glitch/components/loading_indicator';
+import { me } from 'flavours/glitch/initial_state';
+import { useAppDispatch, useAppSelector } from 'flavours/glitch/store';
+
+const messages = defineMessages({
+  unfollow: { id: 'account.unfollow', defaultMessage: 'Unfollow' },
+  follow: { id: 'account.follow', defaultMessage: 'Follow' },
+  followBack: { id: 'account.follow_back', defaultMessage: 'Follow back' },
+  cancel_follow_request: {
+    id: 'account.cancel_follow_request',
+    defaultMessage: 'Withdraw follow request',
+  },
+  edit_profile: { id: 'account.edit_profile', defaultMessage: 'Edit profile' },
+});
+
+export const FollowButton: React.FC<{
+  accountId: string;
+}> = ({ accountId }) => {
+  const intl = useIntl();
+  const dispatch = useAppDispatch();
+  const relationship = useAppSelector((state) =>
+    state.relationships.get(accountId),
+  );
+  const following = relationship?.following || relationship?.requested;
+
+  useEffect(() => {
+    dispatch(fetchRelationships([accountId]));
+  }, [dispatch, accountId]);
+
+  const handleClick = useCallback(() => {
+    if (!relationship) return;
+    if (accountId === me) {
+      return;
+    } else if (relationship.following || relationship.requested) {
+      dispatch(unfollowAccount(accountId));
+    } else {
+      dispatch(followAccount(accountId));
+    }
+  }, [dispatch, accountId, relationship]);
+
+  let label;
+
+  if (accountId === me) {
+    label = intl.formatMessage(messages.edit_profile);
+  } else if (!relationship) {
+    label = <LoadingIndicator />;
+  } else if (relationship.requested) {
+    label = intl.formatMessage(messages.cancel_follow_request);
+  } else if (!relationship.following && relationship.followed_by) {
+    label = intl.formatMessage(messages.followBack);
+  } else if (relationship.following) {
+    label = intl.formatMessage(messages.unfollow);
+  } else {
+    label = intl.formatMessage(messages.follow);
+  }
+
+  if (accountId === me) {
+    return (
+      <a
+        href='/settings/profile'
+        target='_blank'
+        rel='noreferrer noopener'
+        className='button button-secondary'
+      >
+        {label}
+      </a>
+    );
+  }
+
+  return (
+    <Button
+      onClick={handleClick}
+      disabled={relationship?.blocked_by || relationship?.blocking}
+      secondary={following}
+      className={following ? 'button--destructive' : undefined}
+    >
+      {label}
+    </Button>
+  );
+};
diff --git a/app/javascript/flavours/glitch/components/hover_card_account.tsx b/app/javascript/flavours/glitch/components/hover_card_account.tsx
new file mode 100644
index 00000000000000..a62128e17bd100
--- /dev/null
+++ b/app/javascript/flavours/glitch/components/hover_card_account.tsx
@@ -0,0 +1,78 @@
+import { useEffect, forwardRef } from 'react';
+
+import classNames from 'classnames';
+
+import { fetchAccount } from 'flavours/glitch/actions/accounts';
+import { AccountBio } from 'flavours/glitch/components/account_bio';
+import { AccountFields } from 'flavours/glitch/components/account_fields';
+import { Avatar } from 'flavours/glitch/components/avatar';
+import { FollowersCounter } from 'flavours/glitch/components/counters';
+import { DisplayName } from 'flavours/glitch/components/display_name';
+import { FollowButton } from 'flavours/glitch/components/follow_button';
+import { LoadingIndicator } from 'flavours/glitch/components/loading_indicator';
+import { Permalink } from 'flavours/glitch/components/permalink';
+import { ShortNumber } from 'flavours/glitch/components/short_number';
+import { domain } from 'flavours/glitch/initial_state';
+import { useAppSelector, useAppDispatch } from 'flavours/glitch/store';
+
+export const HoverCardAccount = forwardRef<
+  HTMLDivElement,
+  { accountId: string }
+>(({ accountId }, ref) => {
+  const dispatch = useAppDispatch();
+
+  const account = useAppSelector((state) =>
+    accountId ? state.accounts.get(accountId) : undefined,
+  );
+
+  useEffect(() => {
+    if (accountId && !account) {
+      dispatch(fetchAccount(accountId));
+    }
+  }, [dispatch, accountId, account]);
+
+  return (
+    <div
+      ref={ref}
+      id='hover-card'
+      role='tooltip'
+      className={classNames('hover-card dropdown-animation', {
+        'hover-card--loading': !account,
+      })}
+    >
+      {account ? (
+        <>
+          <Permalink
+            to={`/@${account.acct}`}
+            href={account.get('url')}
+            className='hover-card__name'
+          >
+            <Avatar account={account} size={46} />
+            <DisplayName account={account} localDomain={domain} />
+          </Permalink>
+
+          <div className='hover-card__text-row'>
+            <AccountBio
+              note={account.note_emojified}
+              className='hover-card__bio'
+            />
+            <AccountFields fields={account.fields} limit={2} />
+          </div>
+
+          <div className='hover-card__number'>
+            <ShortNumber
+              value={account.followers_count}
+              renderer={FollowersCounter}
+            />
+          </div>
+
+          <FollowButton accountId={accountId} />
+        </>
+      ) : (
+        <LoadingIndicator />
+      )}
+    </div>
+  );
+});
+
+HoverCardAccount.displayName = 'HoverCardAccount';
diff --git a/app/javascript/flavours/glitch/components/hover_card_controller.tsx b/app/javascript/flavours/glitch/components/hover_card_controller.tsx
new file mode 100644
index 00000000000000..6e11d283815776
--- /dev/null
+++ b/app/javascript/flavours/glitch/components/hover_card_controller.tsx
@@ -0,0 +1,117 @@
+import { useEffect, useRef, useState, useCallback } from 'react';
+
+import { useLocation } from 'react-router-dom';
+
+import Overlay from 'react-overlays/Overlay';
+import type {
+  OffsetValue,
+  UsePopperOptions,
+} from 'react-overlays/esm/usePopper';
+
+import { HoverCardAccount } from 'flavours/glitch/components/hover_card_account';
+import { useTimeout } from 'flavours/glitch/hooks/useTimeout';
+
+const offset = [-12, 4] as OffsetValue;
+const enterDelay = 650;
+const leaveDelay = 250;
+const popperConfig = { strategy: 'fixed' } as UsePopperOptions;
+
+const isHoverCardAnchor = (element: HTMLElement) =>
+  element.matches('[data-hover-card-account]');
+
+export const HoverCardController: React.FC = () => {
+  const [open, setOpen] = useState(false);
+  const [accountId, setAccountId] = useState<string | undefined>();
+  const [anchor, setAnchor] = useState<HTMLElement | null>(null);
+  const cardRef = useRef<HTMLDivElement>(null);
+  const [setLeaveTimeout, cancelLeaveTimeout] = useTimeout();
+  const [setEnterTimeout, cancelEnterTimeout] = useTimeout();
+  const location = useLocation();
+
+  const handleAnchorMouseEnter = useCallback(
+    (e: MouseEvent) => {
+      const { target } = e;
+
+      if (target instanceof HTMLElement && isHoverCardAnchor(target)) {
+        cancelLeaveTimeout();
+
+        setEnterTimeout(() => {
+          target.setAttribute('aria-describedby', 'hover-card');
+          setAnchor(target);
+          setOpen(true);
+          setAccountId(
+            target.getAttribute('data-hover-card-account') ?? undefined,
+          );
+        }, enterDelay);
+      }
+
+      if (target === cardRef.current?.parentNode) {
+        cancelLeaveTimeout();
+      }
+    },
+    [cancelLeaveTimeout, setEnterTimeout, setOpen, setAccountId, setAnchor],
+  );
+
+  const handleAnchorMouseLeave = useCallback(
+    (e: MouseEvent) => {
+      if (e.target === anchor || e.target === cardRef.current?.parentNode) {
+        cancelEnterTimeout();
+
+        setLeaveTimeout(() => {
+          anchor?.removeAttribute('aria-describedby');
+          setOpen(false);
+          setAnchor(null);
+        }, leaveDelay);
+      }
+    },
+    [cancelEnterTimeout, setLeaveTimeout, setOpen, setAnchor, anchor],
+  );
+
+  const handleClose = useCallback(() => {
+    cancelEnterTimeout();
+    cancelLeaveTimeout();
+    setOpen(false);
+    setAnchor(null);
+  }, [cancelEnterTimeout, cancelLeaveTimeout, setOpen, setAnchor]);
+
+  useEffect(() => {
+    handleClose();
+  }, [handleClose, location]);
+
+  useEffect(() => {
+    document.body.addEventListener('mouseenter', handleAnchorMouseEnter, {
+      passive: true,
+      capture: true,
+    });
+    document.body.addEventListener('mouseleave', handleAnchorMouseLeave, {
+      passive: true,
+      capture: true,
+    });
+
+    return () => {
+      document.body.removeEventListener('mouseenter', handleAnchorMouseEnter);
+      document.body.removeEventListener('mouseleave', handleAnchorMouseLeave);
+    };
+  }, [handleAnchorMouseEnter, handleAnchorMouseLeave]);
+
+  if (!accountId) return null;
+
+  return (
+    <Overlay
+      rootClose
+      onHide={handleClose}
+      show={open}
+      target={anchor}
+      placement='bottom-start'
+      flip
+      offset={offset}
+      popperConfig={popperConfig}
+    >
+      {({ props }) => (
+        <div {...props} className='hover-card-controller'>
+          <HoverCardAccount accountId={accountId} ref={cardRef} />
+        </div>
+      )}
+    </Overlay>
+  );
+};
diff --git a/app/javascript/flavours/glitch/components/status_content.jsx b/app/javascript/flavours/glitch/components/status_content.jsx
index 24da69cdf2abdf..c28f85eb724236 100644
--- a/app/javascript/flavours/glitch/components/status_content.jsx
+++ b/app/javascript/flavours/glitch/components/status_content.jsx
@@ -181,7 +181,8 @@ class StatusContent extends PureComponent {
 
       if (mention) {
         link.addEventListener('click', this.onMentionClick.bind(this, mention), false);
-        link.setAttribute('title', `@${mention.get('acct')}`);
+        link.removeAttribute('title');
+        link.setAttribute('data-hover-card-account', mention.get('id'));
         if (rewriteMentions !== 'no') {
           while (link.firstChild) link.removeChild(link.firstChild);
           link.appendChild(document.createTextNode('@'));
diff --git a/app/javascript/flavours/glitch/components/status_header.jsx b/app/javascript/flavours/glitch/components/status_header.jsx
index 692dca5c7bf568..ee4573659c4c83 100644
--- a/app/javascript/flavours/glitch/components/status_header.jsx
+++ b/app/javascript/flavours/glitch/components/status_header.jsx
@@ -51,6 +51,7 @@ export default class StatusHeader extends PureComponent {
         target='_blank'
         onClick={this.handleAccountClick}
         rel='noopener noreferrer'
+        data-hover-card-account={status.getIn(['account', 'id'])}
       >
         <div className='status__avatar'>
           {statusAvatar}
diff --git a/app/javascript/flavours/glitch/components/status_prepend.jsx b/app/javascript/flavours/glitch/components/status_prepend.jsx
index 41902e60ba7c36..e3bb554e2a487e 100644
--- a/app/javascript/flavours/glitch/components/status_prepend.jsx
+++ b/app/javascript/flavours/glitch/components/status_prepend.jsx
@@ -38,6 +38,7 @@ export default class StatusPrepend extends PureComponent {
         onClick={this.handleClick}
         href={account.get('url')}
         className='status__display-name'
+        data-hover-card-account={account.get('id')}
       >
         <bdi>
           <strong
diff --git a/app/javascript/flavours/glitch/features/explore/components/author_link.jsx b/app/javascript/flavours/glitch/features/explore/components/author_link.jsx
index ae527db33c8718..83c2c2db404af6 100644
--- a/app/javascript/flavours/glitch/features/explore/components/author_link.jsx
+++ b/app/javascript/flavours/glitch/features/explore/components/author_link.jsx
@@ -12,7 +12,7 @@ export const AuthorLink = ({ accountId }) => {
   }
 
   return (
-    <Permalink href={account.get('url')} to={`/@${account.get('acct')}`} className='story__details__shared__author-link'>
+    <Permalink href={account.get('url')} to={`/@${account.get('acct')}`} className='story__details__shared__author-link' data-hover-card-account={accountId}>
       <Avatar account={account} size={16} />
       <bdi dangerouslySetInnerHTML={{ __html: account.get('display_name_html') }} />
     </Permalink>
diff --git a/app/javascript/flavours/glitch/features/explore/components/card.jsx b/app/javascript/flavours/glitch/features/explore/components/card.jsx
index 85faa92e577020..4612d25e2149ce 100644
--- a/app/javascript/flavours/glitch/features/explore/components/card.jsx
+++ b/app/javascript/flavours/glitch/features/explore/components/card.jsx
@@ -8,34 +8,21 @@ import { Link } from 'react-router-dom';
 import { useDispatch, useSelector } from 'react-redux';
 
 import CloseIcon from '@/material-icons/400-24px/close.svg?react';
-import { followAccount, unfollowAccount } from 'flavours/glitch/actions/accounts';
 import { dismissSuggestion } from 'flavours/glitch/actions/suggestions';
 import { Avatar } from 'flavours/glitch/components/avatar';
-import { Button } from 'flavours/glitch/components/button';
 import { DisplayName } from 'flavours/glitch/components/display_name';
+import { FollowButton } from 'flavours/glitch/components/follow_button';
 import { IconButton } from 'flavours/glitch/components/icon_button';
 import { domain } from 'flavours/glitch/initial_state';
 
 const messages = defineMessages({
-  follow: { id: 'account.follow', defaultMessage: 'Follow' },
-  unfollow: { id: 'account.unfollow', defaultMessage: 'Unfollow' },
   dismiss: { id: 'follow_suggestions.dismiss', defaultMessage: "Don't show again" },
 });
 
 export const Card = ({ id, source }) => {
   const intl = useIntl();
   const account = useSelector(state => state.getIn(['accounts', id]));
-  const relationship = useSelector(state => state.getIn(['relationships', id]));
   const dispatch = useDispatch();
-  const following = relationship?.get('following') ?? relationship?.get('requested');
-
-  const handleFollow = useCallback(() => {
-    if (following) {
-      dispatch(unfollowAccount(id));
-    } else {
-      dispatch(followAccount(id));
-    }
-  }, [id, following, dispatch]);
 
   const handleDismiss = useCallback(() => {
     dispatch(dismissSuggestion(id));
@@ -74,7 +61,7 @@ export const Card = ({ id, source }) => {
           <div className='explore__suggestions__card__body__main__name-button'>
             <Link className='explore__suggestions__card__body__main__name-button__name' to={`/@${account.get('acct')}`}><DisplayName account={account} /></Link>
             <IconButton iconComponent={CloseIcon} onClick={handleDismiss} title={intl.formatMessage(messages.dismiss)} />
-            <Button text={intl.formatMessage(following ? messages.unfollow : messages.follow)} secondary={following} onClick={handleFollow} />
+            <FollowButton accountId={account.get('id')} />
           </div>
         </div>
       </div>
diff --git a/app/javascript/flavours/glitch/features/home_timeline/components/inline_follow_suggestions.jsx b/app/javascript/flavours/glitch/features/home_timeline/components/inline_follow_suggestions.jsx
index 97b64a09b18e46..4e727a63edf843 100644
--- a/app/javascript/flavours/glitch/features/home_timeline/components/inline_follow_suggestions.jsx
+++ b/app/javascript/flavours/glitch/features/home_timeline/components/inline_follow_suggestions.jsx
@@ -12,12 +12,11 @@ import ChevronLeftIcon from '@/material-icons/400-24px/chevron_left.svg?react';
 import ChevronRightIcon from '@/material-icons/400-24px/chevron_right.svg?react';
 import CloseIcon from '@/material-icons/400-24px/close.svg?react';
 import InfoIcon from '@/material-icons/400-24px/info.svg?react';
-import { followAccount, unfollowAccount } from 'flavours/glitch/actions/accounts';
 import { changeSetting } from 'flavours/glitch/actions/settings';
 import { fetchSuggestions, dismissSuggestion } from 'flavours/glitch/actions/suggestions';
 import { Avatar } from 'flavours/glitch/components/avatar';
-import { Button } from 'flavours/glitch/components/button';
 import { DisplayName } from 'flavours/glitch/components/display_name';
+import { FollowButton } from 'flavours/glitch/components/follow_button';
 import { Icon } from 'flavours/glitch/components/icon';
 import { IconButton } from 'flavours/glitch/components/icon_button';
 import { VerifiedBadge } from 'flavours/glitch/components/verified_badge';
@@ -79,18 +78,8 @@ Source.propTypes = {
 const Card = ({ id, sources }) => {
   const intl = useIntl();
   const account = useSelector(state => state.getIn(['accounts', id]));
-  const relationship = useSelector(state => state.getIn(['relationships', id]));
   const firstVerifiedField = account.get('fields').find(item => !!item.get('verified_at'));
   const dispatch = useDispatch();
-  const following = relationship?.get('following') ?? relationship?.get('requested');
-
-  const handleFollow = useCallback(() => {
-    if (following) {
-      dispatch(unfollowAccount(id));
-    } else {
-      dispatch(followAccount(id));
-    }
-  }, [id, following, dispatch]);
 
   const handleDismiss = useCallback(() => {
     dispatch(dismissSuggestion(id));
@@ -109,7 +98,7 @@ const Card = ({ id, sources }) => {
         {firstVerifiedField ? <VerifiedBadge link={firstVerifiedField.get('value')} /> : <Source id={sources.get(0)} />}
       </div>
 
-      <Button text={intl.formatMessage(following ? messages.unfollow : messages.follow)} secondary={following} onClick={handleFollow} />
+      <FollowButton accountId={id} />
     </div>
   );
 };
diff --git a/app/javascript/flavours/glitch/features/notifications/components/notification.jsx b/app/javascript/flavours/glitch/features/notifications/components/notification.jsx
index 29593c06d8982d..0751258be922cb 100644
--- a/app/javascript/flavours/glitch/features/notifications/components/notification.jsx
+++ b/app/javascript/flavours/glitch/features/notifications/components/notification.jsx
@@ -389,6 +389,7 @@ class Notification extends ImmutablePureComponent {
           title={targetAccount.get('acct')}
           to={`/@${targetAccount.get('acct')}`}
           dangerouslySetInnerHTML={targetDisplayNameHtml}
+          data-hover-card-account={targetAccount.get('id')}
         />
       </bdi>
     );
@@ -423,6 +424,7 @@ class Notification extends ImmutablePureComponent {
           title={account.get('acct')}
           to={`/@${account.get('acct')}`}
           dangerouslySetInnerHTML={displayNameHtml}
+          data-hover-card-account={account.get('id')}
         />
       </bdi>
     );
diff --git a/app/javascript/flavours/glitch/features/status/components/detailed_status.jsx b/app/javascript/flavours/glitch/features/status/components/detailed_status.jsx
index a5704665fd8c44..2db9fa6d3a367d 100644
--- a/app/javascript/flavours/glitch/features/status/components/detailed_status.jsx
+++ b/app/javascript/flavours/glitch/features/status/components/detailed_status.jsx
@@ -285,7 +285,7 @@ class DetailedStatus extends ImmutablePureComponent {
     return (
       <div style={outerStyle}>
         <div ref={this.setRef} className={classNames('detailed-status', `detailed-status-${status.get('visibility')}`, { compact })} data-status-by={status.getIn(['account', 'acct'])}>
-          <a href={status.getIn(['account', 'url'])} onClick={this.handleAccountClick} className='detailed-status__display-name'>
+          <a href={status.getIn(['account', 'url'])} data-hover-card-account={status.getIn(['account', 'id'])} onClick={this.handleAccountClick} className='detailed-status__display-name'>
             <div className='detailed-status__display-avatar'><Avatar account={status.get('account')} size={48} /></div>
             <DisplayName account={status.get('account')} localDomain={this.props.domain} />
           </a>
diff --git a/app/javascript/flavours/glitch/features/ui/index.jsx b/app/javascript/flavours/glitch/features/ui/index.jsx
index 4a7b9ebfde828e..2f0bfd3355ee58 100644
--- a/app/javascript/flavours/glitch/features/ui/index.jsx
+++ b/app/javascript/flavours/glitch/features/ui/index.jsx
@@ -15,6 +15,7 @@ import { HotKeys } from 'react-hotkeys';
 import { changeLayout } from 'flavours/glitch/actions/app';
 import { synchronouslySubmitMarkers, submitMarkers, fetchMarkers } from 'flavours/glitch/actions/markers';
 import { INTRODUCTION_VERSION } from 'flavours/glitch/actions/onboarding';
+import { HoverCardController } from 'flavours/glitch/components/hover_card_controller';
 import { Permalink } from 'flavours/glitch/components/permalink';
 import { PictureInPicture } from 'flavours/glitch/features/picture_in_picture';
 import { identityContextPropShape, withIdentity } from 'flavours/glitch/identity_context';
@@ -648,6 +649,7 @@ class UI extends PureComponent {
 
           {layout !== 'mobile' && <PictureInPicture />}
           <NotificationsContainer />
+          <HoverCardController />
           <LoadingBarContainer className='loading-bar' />
           <ModalContainer />
           <UploadArea active={draggingOver} onClose={this.closeUploadModal} />
diff --git a/app/javascript/flavours/glitch/hooks/useLinks.ts b/app/javascript/flavours/glitch/hooks/useLinks.ts
new file mode 100644
index 00000000000000..bb988665fd640a
--- /dev/null
+++ b/app/javascript/flavours/glitch/hooks/useLinks.ts
@@ -0,0 +1,61 @@
+import { useCallback } from 'react';
+
+import { useHistory } from 'react-router-dom';
+
+import { openURL } from 'flavours/glitch/actions/search';
+import { useAppDispatch } from 'flavours/glitch/store';
+
+const isMentionClick = (element: HTMLAnchorElement) =>
+  element.classList.contains('mention');
+
+const isHashtagClick = (element: HTMLAnchorElement) =>
+  element.textContent?.[0] === '#' ||
+  element.previousSibling?.textContent?.endsWith('#');
+
+export const useLinks = () => {
+  const history = useHistory();
+  const dispatch = useAppDispatch();
+
+  const handleHashtagClick = useCallback(
+    (element: HTMLAnchorElement) => {
+      const { textContent } = element;
+
+      if (!textContent) return;
+
+      history.push(`/tags/${textContent.replace(/^#/, '')}`);
+    },
+    [history],
+  );
+
+  const handleMentionClick = useCallback(
+    (element: HTMLAnchorElement) => {
+      dispatch(
+        openURL(element.href, history, () => {
+          window.location.href = element.href;
+        }),
+      );
+    },
+    [dispatch, history],
+  );
+
+  const handleClick = useCallback(
+    (e: React.MouseEvent) => {
+      const target = (e.target as HTMLElement).closest('a');
+
+      if (!target || e.button !== 0 || e.ctrlKey || e.metaKey) {
+        return;
+      }
+
+      if (isMentionClick(target)) {
+        e.preventDefault();
+        handleMentionClick(target);
+      } else if (isHashtagClick(target)) {
+        e.preventDefault();
+        handleHashtagClick(target);
+      }
+    },
+    [handleMentionClick, handleHashtagClick],
+  );
+
+  return handleClick;
+};
diff --git a/app/javascript/flavours/glitch/hooks/useTimeout.ts b/app/javascript/flavours/glitch/hooks/useTimeout.ts
new file mode 100644
index 00000000000000..f1814ae8e3ff57
--- /dev/null
+++ b/app/javascript/flavours/glitch/hooks/useTimeout.ts
@@ -0,0 +1,29 @@
+import { useRef, useCallback, useEffect } from 'react';
+
+export const useTimeout = () => {
+  const timeoutRef = useRef<ReturnType<typeof setTimeout>>();
+
+  const set = useCallback((callback: () => void, delay: number) => {
+    if (timeoutRef.current) {
+      clearTimeout(timeoutRef.current);
+    }
+
+    timeoutRef.current = setTimeout(callback, delay);
+  }, []);
+
+  const cancel = useCallback(() => {
+    if (timeoutRef.current) {
+      clearTimeout(timeoutRef.current);
+      timeoutRef.current = undefined;
+    }
+  }, []);
+
+  useEffect(
+    () => () => {
+      cancel();
+    },
+    [cancel],
+  );
+
+  return [set, cancel] as const;
+};
diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index 9980f87adc3644..11f06dd0106033 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -120,8 +120,27 @@
       text-decoration: none;
     }
 
-    &:disabled {
-      opacity: 0.5;
+    &.button--destructive {
+      &:active,
+      &:focus,
+      &:hover {
+        border-color: $ui-button-destructive-focus-background-color;
+        color: $ui-button-destructive-focus-background-color;
+      }
+    }
+
+    &:disabled,
+    &.disabled {
+      opacity: 0.7;
+      border-color: $ui-primary-color;
+      color: $ui-primary-color;
+
+      &:active,
+      &:focus,
+      &:hover {
+        border-color: $ui-primary-color;
+        color: $ui-primary-color;
+      }
     }
   }
 
@@ -2629,7 +2648,7 @@ a.account__display-name {
 }
 
 .dropdown-animation {
-  animation: dropdown 150ms cubic-bezier(0.1, 0.7, 0.1, 1);
+  animation: dropdown 250ms cubic-bezier(0.1, 0.7, 0.1, 1);
 
   @keyframes dropdown {
     from {
@@ -10908,3 +10927,156 @@ noscript {
     }
   }
 }
+
+.hover-card-controller[data-popper-reference-hidden='true'] {
+  opacity: 0;
+  pointer-events: none;
+}
+
+.hover-card {
+  box-shadow: var(--dropdown-shadow);
+  background: var(--modal-background-color);
+  backdrop-filter: var(--background-filter);
+  border: 1px solid var(--modal-border-color);
+  border-radius: 8px;
+  padding: 16px;
+  width: 270px;
+  display: flex;
+  flex-direction: column;
+  gap: 12px;
+
+  &--loading {
+    position: relative;
+    min-height: 100px;
+  }
+
+  &__name {
+    display: flex;
+    gap: 12px;
+    text-decoration: none;
+    color: inherit;
+  }
+
+  &__number {
+    font-size: 15px;
+    line-height: 22px;
+    color: $secondary-text-color;
+
+    strong {
+      font-weight: 700;
+    }
+  }
+
+  &__text-row {
+    display: flex;
+    flex-direction: column;
+    gap: 8px;
+  }
+
+  &__bio {
+    color: $secondary-text-color;
+    font-size: 14px;
+    line-height: 20px;
+    display: -webkit-box;
+    -webkit-line-clamp: 2;
+    -webkit-box-orient: vertical;
+    max-height: 2 * 20px;
+    overflow: hidden;
+
+    p {
+      margin-bottom: 0;
+    }
+
+    a {
+      color: inherit;
+      text-decoration: underline;
+
+      &:hover,
+      &:focus,
+      &:active {
+        text-decoration: none;
+      }
+    }
+  }
+
+  .display-name {
+    font-size: 15px;
+    line-height: 22px;
+
+    bdi {
+      font-weight: 500;
+      color: $primary-text-color;
+    }
+
+    &__account {
+      display: block;
+      color: $dark-text-color;
+    }
+  }
+
+  .account-fields {
+    color: $secondary-text-color;
+    font-size: 14px;
+    line-height: 20px;
+
+    a {
+      color: inherit;
+      text-decoration: none;
+
+      &:focus,
+      &:hover,
+      &:active {
+        text-decoration: underline;
+      }
+    }
+
+    dl {
+      display: flex;
+      align-items: center;
+      gap: 4px;
+
+      dt {
+        flex: 0 0 auto;
+        color: $dark-text-color;
+        min-width: 0;
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+      }
+
+      dd {
+        flex: 1 1 auto;
+        font-weight: 500;
+        min-width: 0;
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+      }
+
+      &.verified {
+        dd {
+          display: flex;
+          align-items: center;
+          gap: 4px;
+          overflow: hidden;
+          white-space: nowrap;
+          color: $valid-value-color;
+
+          & > span {
+            overflow: hidden;
+            text-overflow: ellipsis;
+          }
+
+          a {
+            font-weight: 500;
+          }
+
+          .icon {
+            width: 16px;
+            height: 16px;
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/app/javascript/flavours/glitch/styles/mastodon-light/variables.scss b/app/javascript/flavours/glitch/styles/mastodon-light/variables.scss
index 3cdbd9bf67e340..9f571b3f2600b9 100644
--- a/app/javascript/flavours/glitch/styles/mastodon-light/variables.scss
+++ b/app/javascript/flavours/glitch/styles/mastodon-light/variables.scss
@@ -59,6 +59,8 @@ $emojis-requiring-inversion: 'chains';
 body {
   --dropdown-border-color: #d9e1e8;
   --dropdown-background-color: #fff;
+  --modal-border-color: #d9e1e8;
+  --modal-background-color: var(--background-color-tint);
   --background-border-color: #d9e1e8;
   --background-color: #fff;
   --background-color-tint: rgba(255, 255, 255, 80%);

From 412e5ddcbf50a5866b368623726d76e52e0102d0 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 28 Jun 2024 00:01:40 +0200
Subject: [PATCH 1431/2191] [Glitch] Fix follow button in hover cards not
 working when signed out in web UI

Port ea6c455e81f9f01a64adf123d0a4f820c6e67f97 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../glitch/components/follow_button.tsx       | 32 ++++++++++++++++---
 1 file changed, 28 insertions(+), 4 deletions(-)

diff --git a/app/javascript/flavours/glitch/components/follow_button.tsx b/app/javascript/flavours/glitch/components/follow_button.tsx
index 664ac860001076..5c9cd2c0677a3b 100644
--- a/app/javascript/flavours/glitch/components/follow_button.tsx
+++ b/app/javascript/flavours/glitch/components/follow_button.tsx
@@ -2,11 +2,13 @@ import { useCallback, useEffect } from 'react';
 
 import { useIntl, defineMessages } from 'react-intl';
 
+import { useIdentity } from '@/flavours/glitch/identity_context';
 import {
   fetchRelationships,
   followAccount,
   unfollowAccount,
 } from 'flavours/glitch/actions/accounts';
+import { openModal } from 'flavours/glitch/actions/modal';
 import { Button } from 'flavours/glitch/components/button';
 import { LoadingIndicator } from 'flavours/glitch/components/loading_indicator';
 import { me } from 'flavours/glitch/initial_state';
@@ -28,17 +30,37 @@ export const FollowButton: React.FC<{
 }> = ({ accountId }) => {
   const intl = useIntl();
   const dispatch = useAppDispatch();
+  const { signedIn } = useIdentity();
+  const account = useAppSelector((state) =>
+    accountId ? state.accounts.get(accountId) : undefined,
+  );
   const relationship = useAppSelector((state) =>
     state.relationships.get(accountId),
   );
   const following = relationship?.following || relationship?.requested;
 
   useEffect(() => {
-    dispatch(fetchRelationships([accountId]));
-  }, [dispatch, accountId]);
+    if (accountId && signedIn) {
+      dispatch(fetchRelationships([accountId]));
+    }
+  }, [dispatch, accountId, signedIn]);
 
   const handleClick = useCallback(() => {
+    if (!signedIn) {
+      dispatch(
+        openModal({
+          modalType: 'INTERACTION',
+          modalProps: {
+            type: 'follow',
+            accountId: accountId,
+            url: account?.url,
+          },
+        }),
+      );
+    }
+
     if (!relationship) return;
+
     if (accountId === me) {
       return;
     } else if (relationship.following || relationship.requested) {
@@ -46,11 +68,13 @@ export const FollowButton: React.FC<{
     } else {
       dispatch(followAccount(accountId));
     }
-  }, [dispatch, accountId, relationship]);
+  }, [dispatch, accountId, relationship, account, signedIn]);
 
   let label;
 
-  if (accountId === me) {
+  if (!signedIn) {
+    label = intl.formatMessage(messages.follow);
+  } else if (accountId === me) {
     label = intl.formatMessage(messages.edit_profile);
   } else if (!relationship) {
     label = <LoadingIndicator />;

From 935b955b156f6313e1a4555dbb7b0661c2de1e0a Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Sun, 30 Jun 2024 21:48:30 +0200
Subject: [PATCH 1432/2191] Temporarily disable hover cards

---
 app/javascript/flavours/glitch/features/ui/index.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/flavours/glitch/features/ui/index.jsx b/app/javascript/flavours/glitch/features/ui/index.jsx
index 2f0bfd3355ee58..9fb4a784b35bf2 100644
--- a/app/javascript/flavours/glitch/features/ui/index.jsx
+++ b/app/javascript/flavours/glitch/features/ui/index.jsx
@@ -649,7 +649,7 @@ class UI extends PureComponent {
 
           {layout !== 'mobile' && <PictureInPicture />}
           <NotificationsContainer />
-          <HoverCardController />
+          {/* Temporarily disabled while upstream improves the issue */ null && <HoverCardController />}
           <LoadingBarContainer className='loading-bar' />
           <ModalContainer />
           <UploadArea active={draggingOver} onClose={this.closeUploadModal} />

From 6d6064d2c0242c6b923b79db05fefa3d8c581827 Mon Sep 17 00:00:00 2001
From: Aria <aria@ariasuni.eu>
Date: Sun, 30 Jun 2024 22:27:38 +0200
Subject: [PATCH 1433/2191] fix(collapsing): fix and simplify post collapsing
 CSS (#2757)

---
 .../flavours/glitch/components/status.jsx     |  2 +-
 .../flavours/glitch/styles/components.scss    | 91 +++++++------------
 2 files changed, 32 insertions(+), 61 deletions(-)

diff --git a/app/javascript/flavours/glitch/components/status.jsx b/app/javascript/flavours/glitch/components/status.jsx
index 32a34a086a0f97..0915af20047427 100644
--- a/app/javascript/flavours/glitch/components/status.jsx
+++ b/app/javascript/flavours/glitch/components/status.jsx
@@ -802,7 +802,7 @@ class Status extends ImmutablePureComponent {
           {prepend}
 
           <div
-            className={classNames('status', `status-${status.get('visibility')}`, { 'status-reply': !!status.get('in_reply_to_id'), 'status--in-thread': !!rootId, 'status--first-in-thread': previousId && (!connectUp || connectToRoot), muted: this.props.muted, 'has-background': isCollapsed && background, collapsed: isCollapsed })}
+            className={classNames('status', `status-${status.get('visibility')}`, { 'status-reply': !!status.get('in_reply_to_id'), 'status--in-thread': !!rootId, 'status--first-in-thread': previousId && (!connectUp || connectToRoot), muted: this.props.muted, 'has-background': isCollapsed && background })}
             data-id={status.get('id')}
             style={isCollapsed && background ? { backgroundImage: `url(${background})` } : null}
           >
diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index 11f06dd0106033..276025934698d7 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -1541,74 +1541,49 @@ body > [data-popper-placement] {
       }
     }
   }
+}
 
-  &.collapsed {
+.status__wrapper.collapsed {
+  .status {
     background-position: center;
     background-size: cover;
     user-select: none;
     min-height: 0;
+  }
 
-    &.has-background::before {
-      display: block;
-      position: absolute;
-      inset-inline-start: 0;
-      inset-inline-end: 0;
-      top: 0;
-      bottom: 0;
-      background-image: linear-gradient(
-        to bottom,
-        rgba($base-shadow-color, 0.75),
-        rgba($base-shadow-color, 0.65) 24px,
-        rgba($base-shadow-color, 0.8)
-      );
-      pointer-events: none;
-      content: '';
-    }
-
-    .display-name:hover .display-name__html {
-      text-decoration: none;
-    }
-
-    .status__content {
-      height: 20px;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      padding-top: 0;
-
-      &::after {
-        content: '';
-        position: absolute;
-        top: 0;
-        bottom: 0;
-        inset-inline-start: 0;
-        inset-inline-end: 0;
-        background: linear-gradient(transparent, var(--background-color));
-        pointer-events: none;
-      }
+  &.has-background::before {
+    display: block;
+    position: absolute;
+    inset-inline-start: 0;
+    inset-inline-end: 0;
+    top: 0;
+    bottom: 0;
+    background-image: linear-gradient(
+      to bottom,
+      rgba($base-shadow-color, 0.75),
+      rgba($base-shadow-color, 0.65) 24px,
+      rgba($base-shadow-color, 0.8)
+    );
+    pointer-events: none;
+    content: '';
+  }
 
-      a:hover {
-        text-decoration: none;
-      }
-    }
+  .display-name:hover .display-name__html {
+    text-decoration: none;
+  }
 
-    &:focus > .status__content::after {
-      background: linear-gradient(
-        rgba(lighten($ui-base-color, 4%), 0),
-        rgba(lighten($ui-base-color, 4%), 1)
-      );
-    }
+  .status__content {
+    height: 20px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    padding-top: 0;
+    mask-image: linear-gradient(rgb(0 0 0 / 100%), transparent);
 
-    // TODO: review
-    &.status-direct > .status__content::after {
-      background: linear-gradient(
-        rgba(mix($ui-base-color, $ui-highlight-color, 95%), 0),
-        rgba(mix($ui-base-color, $ui-highlight-color, 95%), 1)
-      );
+    a:hover {
+      text-decoration: none;
     }
   }
-}
 
-.status__wrapper.collapsed {
   .notification__message {
     margin-bottom: 0;
     white-space: nowrap;
@@ -1819,10 +1794,6 @@ body > [data-popper-placement] {
 .status__wrapper-direct {
   background: rgba($ui-highlight-color, 0.05);
 
-  &:focus {
-    background: rgba($ui-highlight-color, 0.05);
-  }
-
   .status__prepend {
     color: $highlight-text-color;
   }

From 8142c7aa3eb2e0705c32e862fd7db000b898bc38 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 1 Jul 2024 10:21:15 +0200
Subject: [PATCH 1434/2191] chore(deps): update definitelytyped types
 (non-major) (#30882)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 0e7337328bab65..30141a6cc58f3d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3625,11 +3625,11 @@ __metadata:
   linkType: hard
 
 "@types/http-link-header@npm:^1.0.3":
-  version: 1.0.6
-  resolution: "@types/http-link-header@npm:1.0.6"
+  version: 1.0.7
+  resolution: "@types/http-link-header@npm:1.0.7"
   dependencies:
     "@types/node": "npm:*"
-  checksum: 10c0/63f3f7ab5ff6312280727ba8cf836abf5d1b76f9dc5eefc8cd4389db29d57a72fb0e028db99735ada5ccfd3c2cc6607e096b5cc142fc53c2bb5688b6295f61af
+  checksum: 10c0/ffde4514a286ee62fab86bd5164958f5c9ad9d8012eaeb4f5536efa6157e6cf9f93121d5a39bf160c3712554d945300a223a9f8b1f3fb08cc70b73f539767338
   languageName: node
   linkType: hard
 
@@ -3715,9 +3715,9 @@ __metadata:
   linkType: hard
 
 "@types/lodash@npm:^4.14.195":
-  version: 4.17.5
-  resolution: "@types/lodash@npm:4.17.5"
-  checksum: 10c0/55924803ed853e72261512bd3eaf2c5b16558c3817feb0a3125ef757afe46e54b86f33d1960e40b7606c0ddab91a96f47966bf5e6006b7abfd8994c13b04b19b
+  version: 4.17.6
+  resolution: "@types/lodash@npm:4.17.6"
+  checksum: 10c0/3b197ac47af9443fee8c4719c5ffde527d7febc018b827d44a6bc2523c728c7adfdd25196fdcfe3eed827993e0c41a917d0da6e78938b18b2be94164789f1117
   languageName: node
   linkType: hard
 

From 9c7d56db9a30e35d54974ea9257c2b48545b5217 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 1 Jul 2024 10:21:40 +0200
Subject: [PATCH 1435/2191] fix(deps): update dependency postcss-preset-env to
 v9.5.15 (#30878)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 404 +++++++++++++++++++++++++++---------------------------
 1 file changed, 202 insertions(+), 202 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 30141a6cc58f3d..b650d5f490cd9e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1558,69 +1558,69 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/cascade-layer-name-parser@npm:^1.0.11":
-  version: 1.0.11
-  resolution: "@csstools/cascade-layer-name-parser@npm:1.0.11"
+"@csstools/cascade-layer-name-parser@npm:^1.0.12":
+  version: 1.0.12
+  resolution: "@csstools/cascade-layer-name-parser@npm:1.0.12"
   peerDependencies:
-    "@csstools/css-parser-algorithms": ^2.6.3
-    "@csstools/css-tokenizer": ^2.3.1
-  checksum: 10c0/52ac8369877c8072ff5c111f656bd87e9a2a4b9e44e48fe005c26faeb6cffd83bfe2f463f4f385a2ae5cfe1f82bbf95d26ddaabca18b66c6b657c4fe1520fb43
+    "@csstools/css-parser-algorithms": ^2.7.0
+    "@csstools/css-tokenizer": ^2.3.2
+  checksum: 10c0/5f92aefcbb3f4b660cf7b0db54f6a4ba21a32fa1b64ea4f050a6370233152d4f561ecf5c8e98ca231e73c16e0d9f75b20b0a65153e18b14957658c81e0f68213
   languageName: node
   linkType: hard
 
-"@csstools/color-helpers@npm:^4.2.0":
-  version: 4.2.0
-  resolution: "@csstools/color-helpers@npm:4.2.0"
-  checksum: 10c0/3f1feac43c2ef35f38b3b06fe74e0acc130283d7efb6874f6624e45e178c1a7b3c7e39816c7421cddbffc2666430906aa6f0d3dd7c7209db1369c0afd4a29b1b
+"@csstools/color-helpers@npm:^4.2.1":
+  version: 4.2.1
+  resolution: "@csstools/color-helpers@npm:4.2.1"
+  checksum: 10c0/72e11b186ad0f6019a9b4b3752e620fa798c2a40cf47e8cad565dff46e572c9342eb8cf804542d7886344a1e540555d77f20119ace6b2d8a45b6e5ef8a41685c
   languageName: node
   linkType: hard
 
-"@csstools/css-calc@npm:^1.2.2":
-  version: 1.2.2
-  resolution: "@csstools/css-calc@npm:1.2.2"
+"@csstools/css-calc@npm:^1.2.3":
+  version: 1.2.3
+  resolution: "@csstools/css-calc@npm:1.2.3"
   peerDependencies:
-    "@csstools/css-parser-algorithms": ^2.6.3
-    "@csstools/css-tokenizer": ^2.3.1
-  checksum: 10c0/6032b482764a11c1b882d7502928950ab11760044fa7a2c23ecee802002902f6ea8fca045ee2919302af5a5c399e7baa9f68dff001ac6246ac7fef48fb3f6df7
+    "@csstools/css-parser-algorithms": ^2.7.0
+    "@csstools/css-tokenizer": ^2.3.2
+  checksum: 10c0/fb34767ea9638b837167bcecaf945bcc0c5e8f0d811067c4e8c7a57bc8f0955f61107b1ed5e017b95c54acacc8088473e5497a9986bee95b37ec92999e792871
   languageName: node
   linkType: hard
 
-"@csstools/css-color-parser@npm:^2.0.2":
-  version: 2.0.2
-  resolution: "@csstools/css-color-parser@npm:2.0.2"
+"@csstools/css-color-parser@npm:^2.0.3":
+  version: 2.0.3
+  resolution: "@csstools/css-color-parser@npm:2.0.3"
   dependencies:
-    "@csstools/color-helpers": "npm:^4.2.0"
-    "@csstools/css-calc": "npm:^1.2.2"
+    "@csstools/color-helpers": "npm:^4.2.1"
+    "@csstools/css-calc": "npm:^1.2.3"
   peerDependencies:
-    "@csstools/css-parser-algorithms": ^2.6.3
-    "@csstools/css-tokenizer": ^2.3.1
-  checksum: 10c0/c5ae4ad78745e425dce56da9f1ab053fb4f7963399735df3303305b32123bed0b2237689c2e7e99da2c62387e3226c12ea85e70e275c4027c7507e4ac929bffa
+    "@csstools/css-parser-algorithms": ^2.7.0
+    "@csstools/css-tokenizer": ^2.3.2
+  checksum: 10c0/d8860e6b9c65de4f90d4c21e4d66471fd858434cf63af80f812a900371343b753b86a256627e8bd024cb8903a6a0181d2d9c0c65ab5d78cf29d084a761e2adba
   languageName: node
   linkType: hard
 
-"@csstools/css-parser-algorithms@npm:^2.6.3":
-  version: 2.6.3
-  resolution: "@csstools/css-parser-algorithms@npm:2.6.3"
+"@csstools/css-parser-algorithms@npm:^2.6.3, @csstools/css-parser-algorithms@npm:^2.7.0":
+  version: 2.7.0
+  resolution: "@csstools/css-parser-algorithms@npm:2.7.0"
   peerDependencies:
-    "@csstools/css-tokenizer": ^2.3.1
-  checksum: 10c0/6648fda75a1c08096320fb5c04fd13656a0168de13584d2795547fecfb26c2c7d8b3b1fb79ba7aa758714851e98bfbec20d89e28697f999f41f91133eafe4207
+    "@csstools/css-tokenizer": ^2.3.2
+  checksum: 10c0/fb84fefdf37c41d170f81b687bf1ee1847a970e51cc1fe3a320e3eaf225383ae9a3c4eb6208b83357dfe18c5114353d780e0c65f05d86d6435e5a9ad9334c834
   languageName: node
   linkType: hard
 
-"@csstools/css-tokenizer@npm:^2.3.1":
-  version: 2.3.1
-  resolution: "@csstools/css-tokenizer@npm:2.3.1"
-  checksum: 10c0/fed6619fb5108e109d4dd10b0e967035a92793bae8fb84544e1342058b6df4e306d9d075623e2201fe88831b1ada797aea3546a8d12229d2d81cd7a5dfee4444
+"@csstools/css-tokenizer@npm:^2.3.1, @csstools/css-tokenizer@npm:^2.3.2":
+  version: 2.3.2
+  resolution: "@csstools/css-tokenizer@npm:2.3.2"
+  checksum: 10c0/f7d0d8b3e9e2dcdc6547a387253a09dbbacaaffb5c8718bcd7f15dddeefdd441b73fc5f9fad3f03fabef3b37ec4b62be7ff79caab366427fa90eaf54cd8fc452
   languageName: node
   linkType: hard
 
-"@csstools/media-query-list-parser@npm:^2.1.11":
-  version: 2.1.11
-  resolution: "@csstools/media-query-list-parser@npm:2.1.11"
+"@csstools/media-query-list-parser@npm:^2.1.11, @csstools/media-query-list-parser@npm:^2.1.12":
+  version: 2.1.12
+  resolution: "@csstools/media-query-list-parser@npm:2.1.12"
   peerDependencies:
-    "@csstools/css-parser-algorithms": ^2.6.3
-    "@csstools/css-tokenizer": ^2.3.1
-  checksum: 10c0/9bcd99f7d28ae3cdaba73fbbfef571b0393dd4e841f522cc796fe5161744f17e327ba1713dad3c481626fade1357c55890e3d365177abed50e857b69130a9be5
+    "@csstools/css-parser-algorithms": ^2.7.0
+    "@csstools/css-tokenizer": ^2.3.2
+  checksum: 10c0/7395cc710d8f54670c1e7a418a88dcf1ae726316272294ec645f6d79a8e931f5d390ba7ed5d0141d29ad7280cd447b8773143dc7676659413de79228130e1a65
   languageName: node
   linkType: hard
 
@@ -1636,46 +1636,46 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-color-function@npm:^3.0.16":
-  version: 3.0.16
-  resolution: "@csstools/postcss-color-function@npm:3.0.16"
+"@csstools/postcss-color-function@npm:^3.0.17":
+  version: 3.0.17
+  resolution: "@csstools/postcss-color-function@npm:3.0.17"
   dependencies:
-    "@csstools/css-color-parser": "npm:^2.0.2"
-    "@csstools/css-parser-algorithms": "npm:^2.6.3"
-    "@csstools/css-tokenizer": "npm:^2.3.1"
+    "@csstools/css-color-parser": "npm:^2.0.3"
+    "@csstools/css-parser-algorithms": "npm:^2.7.0"
+    "@csstools/css-tokenizer": "npm:^2.3.2"
     "@csstools/postcss-progressive-custom-properties": "npm:^3.2.0"
     "@csstools/utilities": "npm:^1.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/41756a4601a3f1086290dab6ca92b54e201bd94637b54b439c66a04fd628a14e2a0bd1452ad294d2981e2f4bb306758fa5f44639b1c4332320435050749aa487
+  checksum: 10c0/6d347fc9fe65cb897c275c129103576e551b74a7c47a1a4dc8160da2fad7752bf51e3cfbff339f86b39c723efac33643168d2dfaac4d3624d072875d18a65a4b
   languageName: node
   linkType: hard
 
-"@csstools/postcss-color-mix-function@npm:^2.0.16":
-  version: 2.0.16
-  resolution: "@csstools/postcss-color-mix-function@npm:2.0.16"
+"@csstools/postcss-color-mix-function@npm:^2.0.17":
+  version: 2.0.17
+  resolution: "@csstools/postcss-color-mix-function@npm:2.0.17"
   dependencies:
-    "@csstools/css-color-parser": "npm:^2.0.2"
-    "@csstools/css-parser-algorithms": "npm:^2.6.3"
-    "@csstools/css-tokenizer": "npm:^2.3.1"
+    "@csstools/css-color-parser": "npm:^2.0.3"
+    "@csstools/css-parser-algorithms": "npm:^2.7.0"
+    "@csstools/css-tokenizer": "npm:^2.3.2"
     "@csstools/postcss-progressive-custom-properties": "npm:^3.2.0"
     "@csstools/utilities": "npm:^1.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/70cd5b291dd615e20e4475517bf0027c90c433241397a66866f89acedb12cb91f45552a162bdd1000636ec56f7d6a099b65e44fe100fd03228fc65f17cfae285
+  checksum: 10c0/ba9a406ebe4caba6709878ee26debb06780be5cbf4e6ab7e902d79ca6e21ec6a8409b9dc0a5ef36fc4bf54bf2bd8f9642b72da8d7939145f99dc40fedd2be9d2
   languageName: node
   linkType: hard
 
-"@csstools/postcss-exponential-functions@npm:^1.0.7":
-  version: 1.0.7
-  resolution: "@csstools/postcss-exponential-functions@npm:1.0.7"
+"@csstools/postcss-exponential-functions@npm:^1.0.8":
+  version: 1.0.8
+  resolution: "@csstools/postcss-exponential-functions@npm:1.0.8"
   dependencies:
-    "@csstools/css-calc": "npm:^1.2.2"
-    "@csstools/css-parser-algorithms": "npm:^2.6.3"
-    "@csstools/css-tokenizer": "npm:^2.3.1"
+    "@csstools/css-calc": "npm:^1.2.3"
+    "@csstools/css-parser-algorithms": "npm:^2.7.0"
+    "@csstools/css-tokenizer": "npm:^2.3.2"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/2079c81c3437686ef432d88502fa3a13bf8a27b7af105b4c6c2eb8e779f14adc8967a5a3ed03271ab919eeaf999fc4489fe4b37d32a8f61ab3212439517bddcc
+  checksum: 10c0/6b049801fc1275b34f43ffbb915f447a54cbff7bf48ab0705c3ad1ffde055cb876c4dc24e7a9162cd65e219457328e298a673f6176446493db17cf7af6f90dc0
   languageName: node
   linkType: hard
 
@@ -1691,46 +1691,46 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-gamut-mapping@npm:^1.0.9":
-  version: 1.0.9
-  resolution: "@csstools/postcss-gamut-mapping@npm:1.0.9"
+"@csstools/postcss-gamut-mapping@npm:^1.0.10":
+  version: 1.0.10
+  resolution: "@csstools/postcss-gamut-mapping@npm:1.0.10"
   dependencies:
-    "@csstools/css-color-parser": "npm:^2.0.2"
-    "@csstools/css-parser-algorithms": "npm:^2.6.3"
-    "@csstools/css-tokenizer": "npm:^2.3.1"
+    "@csstools/css-color-parser": "npm:^2.0.3"
+    "@csstools/css-parser-algorithms": "npm:^2.7.0"
+    "@csstools/css-tokenizer": "npm:^2.3.2"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/412ae1410f3fce240401576441637c2c4e71d1a54153ac9b7a991b3de7519c253d03e10db78b09872eb10b0776d7f960b442779efabc11332b5be6672163c836
+  checksum: 10c0/6c2dab6a84f81904bed89cb584bd9bc6a904b49a4fa315b17be65c7d68baefe592561ee439660d5602b7481bac3be9a93189dc45404764524495400f34c6b6e6
   languageName: node
   linkType: hard
 
-"@csstools/postcss-gradients-interpolation-method@npm:^4.0.17":
-  version: 4.0.17
-  resolution: "@csstools/postcss-gradients-interpolation-method@npm:4.0.17"
+"@csstools/postcss-gradients-interpolation-method@npm:^4.0.18":
+  version: 4.0.18
+  resolution: "@csstools/postcss-gradients-interpolation-method@npm:4.0.18"
   dependencies:
-    "@csstools/css-color-parser": "npm:^2.0.2"
-    "@csstools/css-parser-algorithms": "npm:^2.6.3"
-    "@csstools/css-tokenizer": "npm:^2.3.1"
+    "@csstools/css-color-parser": "npm:^2.0.3"
+    "@csstools/css-parser-algorithms": "npm:^2.7.0"
+    "@csstools/css-tokenizer": "npm:^2.3.2"
     "@csstools/postcss-progressive-custom-properties": "npm:^3.2.0"
     "@csstools/utilities": "npm:^1.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/465ac42856ca1a57aa2b9ea41ede31d9e2bcf2fe84345dbc182ae41f463069a0cfd41041b834b5133108c702cd85ecb8636b51b0b88fff8a221628639b59f386
+  checksum: 10c0/23c431068ac205392b4953dbce411e208e79e221ba8030c5e23c0b82e8fd53bc3bc4f2cdc47050f5d91a4ac69cb80f4f1853b213aa8072fa60a6cb6ff0621e04
   languageName: node
   linkType: hard
 
-"@csstools/postcss-hwb-function@npm:^3.0.15":
-  version: 3.0.15
-  resolution: "@csstools/postcss-hwb-function@npm:3.0.15"
+"@csstools/postcss-hwb-function@npm:^3.0.16":
+  version: 3.0.16
+  resolution: "@csstools/postcss-hwb-function@npm:3.0.16"
   dependencies:
-    "@csstools/css-color-parser": "npm:^2.0.2"
-    "@csstools/css-parser-algorithms": "npm:^2.6.3"
-    "@csstools/css-tokenizer": "npm:^2.3.1"
+    "@csstools/css-color-parser": "npm:^2.0.3"
+    "@csstools/css-parser-algorithms": "npm:^2.7.0"
+    "@csstools/css-tokenizer": "npm:^2.3.2"
     "@csstools/postcss-progressive-custom-properties": "npm:^3.2.0"
     "@csstools/utilities": "npm:^1.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/fdfaeefbab1008ab1e4a98a2b45cc3db002b2724c404fa0600954b411a68b1fa4028286250bf9898eed10fa80c44e4d6b4e55f1aca073c3dfce8198a0aaedf3f
+  checksum: 10c0/4deca8831a69038aff719a77df92c53578bb28e23cc61dc4ea7b1d912b1b685683a9c6232396c2616948ac2e8488ad1e2009c9c8ed30c493d97ba8ad37b6418d
   languageName: node
   linkType: hard
 
@@ -1768,17 +1768,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-light-dark-function@npm:^1.0.5":
-  version: 1.0.5
-  resolution: "@csstools/postcss-light-dark-function@npm:1.0.5"
+"@csstools/postcss-light-dark-function@npm:^1.0.6":
+  version: 1.0.6
+  resolution: "@csstools/postcss-light-dark-function@npm:1.0.6"
   dependencies:
-    "@csstools/css-parser-algorithms": "npm:^2.6.3"
-    "@csstools/css-tokenizer": "npm:^2.3.1"
+    "@csstools/css-parser-algorithms": "npm:^2.7.0"
+    "@csstools/css-tokenizer": "npm:^2.3.2"
     "@csstools/postcss-progressive-custom-properties": "npm:^3.2.0"
     "@csstools/utilities": "npm:^1.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/4fbeda98372d0da25d3ed87da09903c9a0a5d0b8c13cc9de82a98acce4a8f8367e5ba33bfc25c2534d10f2b1db9d5b4278df4ebab755e27ef2b03a95e0ebe264
+  checksum: 10c0/6b2c64860d789cd3e3ce875c01259333911f6e32a751a7475604de8022c13abcb578e5cb941b51bd3a2022bee883df3f6b64800c6e3559b06da283d968aeb615
   languageName: node
   linkType: hard
 
@@ -1820,42 +1820,42 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-logical-viewport-units@npm:^2.0.9":
-  version: 2.0.9
-  resolution: "@csstools/postcss-logical-viewport-units@npm:2.0.9"
+"@csstools/postcss-logical-viewport-units@npm:^2.0.10":
+  version: 2.0.10
+  resolution: "@csstools/postcss-logical-viewport-units@npm:2.0.10"
   dependencies:
-    "@csstools/css-tokenizer": "npm:^2.3.1"
+    "@csstools/css-tokenizer": "npm:^2.3.2"
     "@csstools/utilities": "npm:^1.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/25b01e36b08c571806d09046be63582dbebf97a4612df59be405fa8a92e6eebcd4e768ad7fbe53b0b8739d6ab04d56957964fb04d6a3ea129fc5f72e6d0adf95
+  checksum: 10c0/fe142b11e0e8ccab4667cc5db90b45e67b7d11eaf5c038e91d867e1b18a315ef0859114185aeb48fdc1ce05986be8b644d6157fe9e19da7281f7023c99eb8877
   languageName: node
   linkType: hard
 
-"@csstools/postcss-media-minmax@npm:^1.1.6":
-  version: 1.1.6
-  resolution: "@csstools/postcss-media-minmax@npm:1.1.6"
+"@csstools/postcss-media-minmax@npm:^1.1.7":
+  version: 1.1.7
+  resolution: "@csstools/postcss-media-minmax@npm:1.1.7"
   dependencies:
-    "@csstools/css-calc": "npm:^1.2.2"
-    "@csstools/css-parser-algorithms": "npm:^2.6.3"
-    "@csstools/css-tokenizer": "npm:^2.3.1"
-    "@csstools/media-query-list-parser": "npm:^2.1.11"
+    "@csstools/css-calc": "npm:^1.2.3"
+    "@csstools/css-parser-algorithms": "npm:^2.7.0"
+    "@csstools/css-tokenizer": "npm:^2.3.2"
+    "@csstools/media-query-list-parser": "npm:^2.1.12"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/2cbfb3728a232c655d82f63d5ac7da36876d14e5fee5d62a0738efed40c58f20ef11f600395ade24d5063d750e8e093251dd93cc361f782b5a6c0e0f80288f51
+  checksum: 10c0/a02943a17b540cbd909b55bbb1f8c9331badc51b613279bbdb7127c9921a5d0675bb41675a3b4d0f15e9586120e5a96d9b9786b63b2c594fbb3a238e860c6ad8
   languageName: node
   linkType: hard
 
-"@csstools/postcss-media-queries-aspect-ratio-number-values@npm:^2.0.9":
-  version: 2.0.9
-  resolution: "@csstools/postcss-media-queries-aspect-ratio-number-values@npm:2.0.9"
+"@csstools/postcss-media-queries-aspect-ratio-number-values@npm:^2.0.10":
+  version: 2.0.10
+  resolution: "@csstools/postcss-media-queries-aspect-ratio-number-values@npm:2.0.10"
   dependencies:
-    "@csstools/css-parser-algorithms": "npm:^2.6.3"
-    "@csstools/css-tokenizer": "npm:^2.3.1"
-    "@csstools/media-query-list-parser": "npm:^2.1.11"
+    "@csstools/css-parser-algorithms": "npm:^2.7.0"
+    "@csstools/css-tokenizer": "npm:^2.3.2"
+    "@csstools/media-query-list-parser": "npm:^2.1.12"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/d431d2900a7177c938d9dc2d5bdf3c1930758adc214cc72f94b34e6bbd02fd917c200dc81482db515519c97d4f1e766ba3200f3ec9b55081887f2f8111f68e20
+  checksum: 10c0/d7879e72df98d9fe2e5d85a64837e7a73c2df1aea8659d65516f0acb070317edd353531882f0bdfd81510703d1da30d6da861052a0bda85fde1f9eab94b1e467
   languageName: node
   linkType: hard
 
@@ -1882,18 +1882,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-oklab-function@npm:^3.0.16":
-  version: 3.0.16
-  resolution: "@csstools/postcss-oklab-function@npm:3.0.16"
+"@csstools/postcss-oklab-function@npm:^3.0.17":
+  version: 3.0.17
+  resolution: "@csstools/postcss-oklab-function@npm:3.0.17"
   dependencies:
-    "@csstools/css-color-parser": "npm:^2.0.2"
-    "@csstools/css-parser-algorithms": "npm:^2.6.3"
-    "@csstools/css-tokenizer": "npm:^2.3.1"
+    "@csstools/css-color-parser": "npm:^2.0.3"
+    "@csstools/css-parser-algorithms": "npm:^2.7.0"
+    "@csstools/css-tokenizer": "npm:^2.3.2"
     "@csstools/postcss-progressive-custom-properties": "npm:^3.2.0"
     "@csstools/utilities": "npm:^1.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/9c67ee5f51116df16ab6baffa1b3c6c7aa93d53b836f421125ae8824075bd3cfaa1a93594466de0ac935c89c4fc8171e80974e1a15bafa23ea864e4cf1f1c1f2
+  checksum: 10c0/ff27a4b6fd8490439aa0f3c91ffa2a42a8cf539d7306d9329cef7ca59f28317cee40253f402d19a18c196471fd39a05842d2974d92f1b131dc748074d91ac4ee
   languageName: node
   linkType: hard
 
@@ -1908,18 +1908,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-relative-color-syntax@npm:^2.0.16":
-  version: 2.0.16
-  resolution: "@csstools/postcss-relative-color-syntax@npm:2.0.16"
+"@csstools/postcss-relative-color-syntax@npm:^2.0.17":
+  version: 2.0.17
+  resolution: "@csstools/postcss-relative-color-syntax@npm:2.0.17"
   dependencies:
-    "@csstools/css-color-parser": "npm:^2.0.2"
-    "@csstools/css-parser-algorithms": "npm:^2.6.3"
-    "@csstools/css-tokenizer": "npm:^2.3.1"
+    "@csstools/css-color-parser": "npm:^2.0.3"
+    "@csstools/css-parser-algorithms": "npm:^2.7.0"
+    "@csstools/css-tokenizer": "npm:^2.3.2"
     "@csstools/postcss-progressive-custom-properties": "npm:^3.2.0"
     "@csstools/utilities": "npm:^1.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/cdc965706212dcbc03394f55c79a0ad043d1e0174059c4d0d90e4267fe8e6fd9eef7cfed4f5bbc1f8e89c225c1c042ae792e115bba198eb2daae763d65f44679
+  checksum: 10c0/46226351b3825323e3496dcee44ff354cd3ccc9241d837659e1311f428f0b4dc878d9bb762cbb8f63243b7af346728ab7a46c311f9dc38bb609147523c698eab
   languageName: node
   linkType: hard
 
@@ -1934,41 +1934,41 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-stepped-value-functions@npm:^3.0.8":
-  version: 3.0.8
-  resolution: "@csstools/postcss-stepped-value-functions@npm:3.0.8"
+"@csstools/postcss-stepped-value-functions@npm:^3.0.9":
+  version: 3.0.9
+  resolution: "@csstools/postcss-stepped-value-functions@npm:3.0.9"
   dependencies:
-    "@csstools/css-calc": "npm:^1.2.2"
-    "@csstools/css-parser-algorithms": "npm:^2.6.3"
-    "@csstools/css-tokenizer": "npm:^2.3.1"
+    "@csstools/css-calc": "npm:^1.2.3"
+    "@csstools/css-parser-algorithms": "npm:^2.7.0"
+    "@csstools/css-tokenizer": "npm:^2.3.2"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/2be66aa769808245137be8ff14308aa17c3a0d75433f6fd6789114966a78c365dbf173d087e7ff5bc80118c75be2ff740baab83ed39fc0671980f6217779956b
+  checksum: 10c0/bafe80947abc8613903f1f3f1939ece9780696774f15960aef229733e40e483dc2830145426d49c4f6d0b1dabb35f812c8a2dda0d0dcddc930321e36b5c6ca0b
   languageName: node
   linkType: hard
 
-"@csstools/postcss-text-decoration-shorthand@npm:^3.0.6":
-  version: 3.0.6
-  resolution: "@csstools/postcss-text-decoration-shorthand@npm:3.0.6"
+"@csstools/postcss-text-decoration-shorthand@npm:^3.0.7":
+  version: 3.0.7
+  resolution: "@csstools/postcss-text-decoration-shorthand@npm:3.0.7"
   dependencies:
-    "@csstools/color-helpers": "npm:^4.2.0"
+    "@csstools/color-helpers": "npm:^4.2.1"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/5abdc4fad1c3f15e9d47c7af3995dec9cdf4e6f87c5857eb2e149764779b8389f4f4b21d11e6f2509c57c554a0dc5c11f68f212acd04bbc47defa15911ac3eb9
+  checksum: 10c0/072b9893ca2409aa16e53e84747d7b7e13071ce19738a0800a139bf71b535e439958d9093df2b85f83eee2e0c44bc22a14bf3a39b5a7508bca9e747a12273d02
   languageName: node
   linkType: hard
 
-"@csstools/postcss-trigonometric-functions@npm:^3.0.8":
-  version: 3.0.8
-  resolution: "@csstools/postcss-trigonometric-functions@npm:3.0.8"
+"@csstools/postcss-trigonometric-functions@npm:^3.0.9":
+  version: 3.0.9
+  resolution: "@csstools/postcss-trigonometric-functions@npm:3.0.9"
   dependencies:
-    "@csstools/css-calc": "npm:^1.2.2"
-    "@csstools/css-parser-algorithms": "npm:^2.6.3"
-    "@csstools/css-tokenizer": "npm:^2.3.1"
+    "@csstools/css-calc": "npm:^1.2.3"
+    "@csstools/css-parser-algorithms": "npm:^2.7.0"
+    "@csstools/css-tokenizer": "npm:^2.3.2"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/aeed8d1026f4a5cb7afafbadd739af84291d5bfcbcdef2f79b77174f003d0cd0c7f9deb3fe0b9377efab37ce9bb17a2499efd4af8211f5ff9eb01b878b0b62b3
+  checksum: 10c0/7a439d31a63d35986dab634d9e415f7ce7c32a2d3d382052b5b730a259a12e44c5f1b14e318d79086253e3d5d4f7d942d0e7317d92eb3421dd08824eebec45fb
   languageName: node
   linkType: hard
 
@@ -5646,7 +5646,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"browserslist@npm:^4.0.0, browserslist@npm:^4.22.2, browserslist@npm:^4.22.3, browserslist@npm:^4.23.0, browserslist@npm:^4.23.1":
+"browserslist@npm:^4.0.0, browserslist@npm:^4.22.2, browserslist@npm:^4.23.0, browserslist@npm:^4.23.1":
   version: 4.23.1
   resolution: "browserslist@npm:4.23.1"
   dependencies:
@@ -13208,18 +13208,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-color-functional-notation@npm:^6.0.11":
-  version: 6.0.11
-  resolution: "postcss-color-functional-notation@npm:6.0.11"
+"postcss-color-functional-notation@npm:^6.0.12":
+  version: 6.0.12
+  resolution: "postcss-color-functional-notation@npm:6.0.12"
   dependencies:
-    "@csstools/css-color-parser": "npm:^2.0.2"
-    "@csstools/css-parser-algorithms": "npm:^2.6.3"
-    "@csstools/css-tokenizer": "npm:^2.3.1"
+    "@csstools/css-color-parser": "npm:^2.0.3"
+    "@csstools/css-parser-algorithms": "npm:^2.7.0"
+    "@csstools/css-tokenizer": "npm:^2.3.2"
     "@csstools/postcss-progressive-custom-properties": "npm:^3.2.0"
     "@csstools/utilities": "npm:^1.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/7fd75e6881cf62f536f79dfc0ae1b709ea0b8b84833cce1671372711f6019ab4360c6a17089b654b2d376b87e7f9455b94f0d13b45ab0ab767e547b604709b3d
+  checksum: 10c0/2e8faecd2609e1b4eb8c1cab21ecca5e746916795df20e6997d66eb61c29fbb01d3e75fef3e0b3e1c181918a2186570441b81779b1fc429d6d8823fbfa164231
   languageName: node
   linkType: hard
 
@@ -13273,46 +13273,46 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-custom-media@npm:^10.0.6":
-  version: 10.0.6
-  resolution: "postcss-custom-media@npm:10.0.6"
+"postcss-custom-media@npm:^10.0.7":
+  version: 10.0.7
+  resolution: "postcss-custom-media@npm:10.0.7"
   dependencies:
-    "@csstools/cascade-layer-name-parser": "npm:^1.0.11"
-    "@csstools/css-parser-algorithms": "npm:^2.6.3"
-    "@csstools/css-tokenizer": "npm:^2.3.1"
-    "@csstools/media-query-list-parser": "npm:^2.1.11"
+    "@csstools/cascade-layer-name-parser": "npm:^1.0.12"
+    "@csstools/css-parser-algorithms": "npm:^2.7.0"
+    "@csstools/css-tokenizer": "npm:^2.3.2"
+    "@csstools/media-query-list-parser": "npm:^2.1.12"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/98a524bc46b780a86094bbe8007f1e577137da5490823631a683d4b3df4a13e40c5e1ab52380275a54f7011abfd98bb597c6293d964c14f9f22ec6cf9d75c550
+  checksum: 10c0/4171385ab9370806861dcf7597e53fd6aa1862e77b475c9c565c95bfcc2b950f920f8da26a6dbec42e257388bca97c274635662b5e81fe3905b5e37babe06569
   languageName: node
   linkType: hard
 
-"postcss-custom-properties@npm:^13.3.10":
-  version: 13.3.10
-  resolution: "postcss-custom-properties@npm:13.3.10"
+"postcss-custom-properties@npm:^13.3.11":
+  version: 13.3.11
+  resolution: "postcss-custom-properties@npm:13.3.11"
   dependencies:
-    "@csstools/cascade-layer-name-parser": "npm:^1.0.11"
-    "@csstools/css-parser-algorithms": "npm:^2.6.3"
-    "@csstools/css-tokenizer": "npm:^2.3.1"
+    "@csstools/cascade-layer-name-parser": "npm:^1.0.12"
+    "@csstools/css-parser-algorithms": "npm:^2.7.0"
+    "@csstools/css-tokenizer": "npm:^2.3.2"
     "@csstools/utilities": "npm:^1.0.0"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/52688fd0aaadccfdf4a3d86d3a2ab988163e8108088c5e33fc9145d261f75b92b8321c044a8161345abda10df5715d674330309dcc0c17f2980db5515f6a76d6
+  checksum: 10c0/4aa95628aa5d5b6df4dfeedbc3891b9666db88d75930cadc14d2fbba0a1b72f4e3cc3d83b5a0c0b8ce44f85b4fda6ebd7fe7792a1abc0a14d7d63b9f170d299c
   languageName: node
   linkType: hard
 
-"postcss-custom-selectors@npm:^7.1.10":
-  version: 7.1.10
-  resolution: "postcss-custom-selectors@npm:7.1.10"
+"postcss-custom-selectors@npm:^7.1.11":
+  version: 7.1.11
+  resolution: "postcss-custom-selectors@npm:7.1.11"
   dependencies:
-    "@csstools/cascade-layer-name-parser": "npm:^1.0.11"
-    "@csstools/css-parser-algorithms": "npm:^2.6.3"
-    "@csstools/css-tokenizer": "npm:^2.3.1"
-    postcss-selector-parser: "npm:^6.0.13"
+    "@csstools/cascade-layer-name-parser": "npm:^1.0.12"
+    "@csstools/css-parser-algorithms": "npm:^2.7.0"
+    "@csstools/css-tokenizer": "npm:^2.3.2"
+    postcss-selector-parser: "npm:^6.1.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/11311ae6f306420223c6bf926fb1798738f3aa525a267de204de8e8ee9de467bf63b580d9ad5dbb0fff4bd9266770a3fa7e27a24af08a2e0a4115d0727d1d043
+  checksum: 10c0/f37d2e34239e868b35b7970ec97a7a8f657a9f92ed2b221af44f19949f7c3aedcecd0abb5fa1acb120c5ceffdf7a20869338956a37d7bfc37a83d8088f5d3dd2
   languageName: node
   linkType: hard
 
@@ -13430,18 +13430,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-lab-function@npm:^6.0.16":
-  version: 6.0.16
-  resolution: "postcss-lab-function@npm:6.0.16"
+"postcss-lab-function@npm:^6.0.17":
+  version: 6.0.17
+  resolution: "postcss-lab-function@npm:6.0.17"
   dependencies:
-    "@csstools/css-color-parser": "npm:^2.0.2"
-    "@csstools/css-parser-algorithms": "npm:^2.6.3"
-    "@csstools/css-tokenizer": "npm:^2.3.1"
+    "@csstools/css-color-parser": "npm:^2.0.3"
+    "@csstools/css-parser-algorithms": "npm:^2.7.0"
+    "@csstools/css-tokenizer": "npm:^2.3.2"
     "@csstools/postcss-progressive-custom-properties": "npm:^3.2.0"
     "@csstools/utilities": "npm:^1.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/ba8717cd8a197ec17acaac1b61631cd4403f07bd406b0c92f2e430a55e3f786cd6c338b626c3326e9178a0f3e58ff838ebaded19f480f39197a9cb17349ecdcd
+  checksum: 10c0/a331f188b02cc8beb315150232b6b58bc5793e8d61585973d352a9b4d370b908ff354ccf9ea1ba20a956fd37ea4ada918ea975c8d4f69e850d26edf0106436e8
   languageName: node
   linkType: hard
 
@@ -13762,52 +13762,52 @@ __metadata:
   linkType: hard
 
 "postcss-preset-env@npm:^9.5.2":
-  version: 9.5.14
-  resolution: "postcss-preset-env@npm:9.5.14"
+  version: 9.5.15
+  resolution: "postcss-preset-env@npm:9.5.15"
   dependencies:
     "@csstools/postcss-cascade-layers": "npm:^4.0.6"
-    "@csstools/postcss-color-function": "npm:^3.0.16"
-    "@csstools/postcss-color-mix-function": "npm:^2.0.16"
-    "@csstools/postcss-exponential-functions": "npm:^1.0.7"
+    "@csstools/postcss-color-function": "npm:^3.0.17"
+    "@csstools/postcss-color-mix-function": "npm:^2.0.17"
+    "@csstools/postcss-exponential-functions": "npm:^1.0.8"
     "@csstools/postcss-font-format-keywords": "npm:^3.0.2"
-    "@csstools/postcss-gamut-mapping": "npm:^1.0.9"
-    "@csstools/postcss-gradients-interpolation-method": "npm:^4.0.17"
-    "@csstools/postcss-hwb-function": "npm:^3.0.15"
+    "@csstools/postcss-gamut-mapping": "npm:^1.0.10"
+    "@csstools/postcss-gradients-interpolation-method": "npm:^4.0.18"
+    "@csstools/postcss-hwb-function": "npm:^3.0.16"
     "@csstools/postcss-ic-unit": "npm:^3.0.6"
     "@csstools/postcss-initial": "npm:^1.0.1"
     "@csstools/postcss-is-pseudo-class": "npm:^4.0.8"
-    "@csstools/postcss-light-dark-function": "npm:^1.0.5"
+    "@csstools/postcss-light-dark-function": "npm:^1.0.6"
     "@csstools/postcss-logical-float-and-clear": "npm:^2.0.1"
     "@csstools/postcss-logical-overflow": "npm:^1.0.1"
     "@csstools/postcss-logical-overscroll-behavior": "npm:^1.0.1"
     "@csstools/postcss-logical-resize": "npm:^2.0.1"
-    "@csstools/postcss-logical-viewport-units": "npm:^2.0.9"
-    "@csstools/postcss-media-minmax": "npm:^1.1.6"
-    "@csstools/postcss-media-queries-aspect-ratio-number-values": "npm:^2.0.9"
+    "@csstools/postcss-logical-viewport-units": "npm:^2.0.10"
+    "@csstools/postcss-media-minmax": "npm:^1.1.7"
+    "@csstools/postcss-media-queries-aspect-ratio-number-values": "npm:^2.0.10"
     "@csstools/postcss-nested-calc": "npm:^3.0.2"
     "@csstools/postcss-normalize-display-values": "npm:^3.0.2"
-    "@csstools/postcss-oklab-function": "npm:^3.0.16"
+    "@csstools/postcss-oklab-function": "npm:^3.0.17"
     "@csstools/postcss-progressive-custom-properties": "npm:^3.2.0"
-    "@csstools/postcss-relative-color-syntax": "npm:^2.0.16"
+    "@csstools/postcss-relative-color-syntax": "npm:^2.0.17"
     "@csstools/postcss-scope-pseudo-class": "npm:^3.0.1"
-    "@csstools/postcss-stepped-value-functions": "npm:^3.0.8"
-    "@csstools/postcss-text-decoration-shorthand": "npm:^3.0.6"
-    "@csstools/postcss-trigonometric-functions": "npm:^3.0.8"
+    "@csstools/postcss-stepped-value-functions": "npm:^3.0.9"
+    "@csstools/postcss-text-decoration-shorthand": "npm:^3.0.7"
+    "@csstools/postcss-trigonometric-functions": "npm:^3.0.9"
     "@csstools/postcss-unset-value": "npm:^3.0.1"
     autoprefixer: "npm:^10.4.19"
-    browserslist: "npm:^4.22.3"
+    browserslist: "npm:^4.23.1"
     css-blank-pseudo: "npm:^6.0.2"
     css-has-pseudo: "npm:^6.0.5"
     css-prefers-color-scheme: "npm:^9.0.1"
     cssdb: "npm:^8.0.0"
     postcss-attribute-case-insensitive: "npm:^6.0.3"
     postcss-clamp: "npm:^4.1.0"
-    postcss-color-functional-notation: "npm:^6.0.11"
+    postcss-color-functional-notation: "npm:^6.0.12"
     postcss-color-hex-alpha: "npm:^9.0.4"
     postcss-color-rebeccapurple: "npm:^9.0.3"
-    postcss-custom-media: "npm:^10.0.6"
-    postcss-custom-properties: "npm:^13.3.10"
-    postcss-custom-selectors: "npm:^7.1.10"
+    postcss-custom-media: "npm:^10.0.7"
+    postcss-custom-properties: "npm:^13.3.11"
+    postcss-custom-selectors: "npm:^7.1.11"
     postcss-dir-pseudo-class: "npm:^8.0.1"
     postcss-double-position-gradients: "npm:^5.0.6"
     postcss-focus-visible: "npm:^9.0.1"
@@ -13815,7 +13815,7 @@ __metadata:
     postcss-font-variant: "npm:^5.0.0"
     postcss-gap-properties: "npm:^5.0.1"
     postcss-image-set-function: "npm:^6.0.3"
-    postcss-lab-function: "npm:^6.0.16"
+    postcss-lab-function: "npm:^6.0.17"
     postcss-logical: "npm:^7.0.1"
     postcss-nesting: "npm:^12.1.5"
     postcss-opacity-percentage: "npm:^2.0.0"
@@ -13827,7 +13827,7 @@ __metadata:
     postcss-selector-not: "npm:^7.0.2"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/8e0c8f5c2e7b8385a770c13185986dc50d7a73b10b98c65c2f86bb4cd2860de722caef8172b1676962dafbbc044d6be1955f2a092e951976a30d4ee33b0d7571
+  checksum: 10c0/e2ee0b5d7dbaddb82ff6d51b5882120862d6be184973ae3d55642923183ab441d421d5f9810fe02e680a70dbc85b20b1c2eb02c68f167dcaf3ef80a71dd40e78
   languageName: node
   linkType: hard
 

From 3c1e1685c73fa69dec719cb0bf2847de6df31dd1 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 1 Jul 2024 10:21:55 +0200
Subject: [PATCH 1436/2191] fix(deps): update dependency postcss to v8.4.39
 (#30877)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index b650d5f490cd9e..31b812df68b06b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -13951,13 +13951,13 @@ __metadata:
   linkType: hard
 
 "postcss@npm:^8.2.15, postcss@npm:^8.4.24, postcss@npm:^8.4.38":
-  version: 8.4.38
-  resolution: "postcss@npm:8.4.38"
+  version: 8.4.39
+  resolution: "postcss@npm:8.4.39"
   dependencies:
     nanoid: "npm:^3.3.7"
-    picocolors: "npm:^1.0.0"
+    picocolors: "npm:^1.0.1"
     source-map-js: "npm:^1.2.0"
-  checksum: 10c0/955407b8f70cf0c14acf35dab3615899a2a60a26718a63c848cf3c29f2467b0533991b985a2b994430d890bd7ec2b1963e36352b0774a19143b5f591540f7c06
+  checksum: 10c0/16f5ac3c4e32ee76d1582b3c0dcf1a1fdb91334a45ad755eeb881ccc50318fb8d64047de4f1601ac96e30061df203f0f2e2edbdc0bfc49b9c57bc9fb9bedaea3
   languageName: node
   linkType: hard
 

From 2f1df842f8ba3ec064a560685f51489aee3a5ecf Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 1 Jul 2024 10:25:52 +0200
Subject: [PATCH 1437/2191] chore(deps): update dependency test-prof to
 v1.3.3.1 (#30872)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 02437eab6b7aa9..a1340537cbd12a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -833,7 +833,7 @@ GEM
       unicode-display_width (>= 1.1.1, < 3)
     terrapin (1.0.1)
       climate_control
-    test-prof (1.3.3)
+    test-prof (1.3.3.1)
     thor (1.3.1)
     tilt (2.3.0)
     timeout (0.4.1)

From 4c701463b4717acfdf37d5992bf1d729c2221011 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 1 Jul 2024 08:26:08 +0000
Subject: [PATCH 1438/2191] chore(deps): update dependency aws-sdk-s3 to
 v1.155.0 (#30871)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index a1340537cbd12a..1d73a8ef5a49ac 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -100,8 +100,8 @@ GEM
     attr_required (1.0.2)
     awrence (1.2.1)
     aws-eventstream (1.3.0)
-    aws-partitions (1.947.0)
-    aws-sdk-core (3.199.0)
+    aws-partitions (1.949.0)
+    aws-sdk-core (3.200.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.8)
@@ -109,7 +109,7 @@ GEM
     aws-sdk-kms (1.87.0)
       aws-sdk-core (~> 3, >= 3.199.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.154.0)
+    aws-sdk-s3 (1.155.0)
       aws-sdk-core (~> 3, >= 3.199.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.8)

From ed15ae075c00b72388d06f1d62b87a6ed2028e57 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 1 Jul 2024 08:27:03 +0000
Subject: [PATCH 1439/2191] fix(deps): update dependency @reduxjs/toolkit to
 v2.2.6 (#30875)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 31b812df68b06b..5b4f3c22bd97fb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3058,8 +3058,8 @@ __metadata:
   linkType: hard
 
 "@reduxjs/toolkit@npm:^2.0.1":
-  version: 2.2.5
-  resolution: "@reduxjs/toolkit@npm:2.2.5"
+  version: 2.2.6
+  resolution: "@reduxjs/toolkit@npm:2.2.6"
   dependencies:
     immer: "npm:^10.0.3"
     redux: "npm:^5.0.1"
@@ -3073,7 +3073,7 @@ __metadata:
       optional: true
     react-redux:
       optional: true
-  checksum: 10c0/be0593bf26852482fb8716b9248531466c6e8782a3114b823ae680fce90267d8c5512a3231cfecc30b17eff81a4604112772b49ad7ca6a3366ddd4f2a838e53c
+  checksum: 10c0/60af753e6d02c8acd3c5bc843c846d60b19821d93ff9f4415fa7011ebf17a85301ed42132fabc1aaee8523d8f61418b5ba164a11c31ab29937e485842d3744a0
   languageName: node
   linkType: hard
 

From 7756db65519136d92b04b8709681f62a971836f7 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 1 Jul 2024 08:34:38 +0000
Subject: [PATCH 1440/2191] New Crowdin Translations (automated) (#30873)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/br.json |  2 ++
 app/javascript/mastodon/locales/cs.json | 18 +++++++++++++-----
 app/javascript/mastodon/locales/de.json |  2 +-
 app/javascript/mastodon/locales/fo.json |  3 +++
 app/javascript/mastodon/locales/ko.json |  3 +++
 app/javascript/mastodon/locales/th.json |  3 +++
 app/javascript/mastodon/locales/vi.json |  3 +++
 config/locales/cs.yml                   |  3 +++
 config/locales/doorkeeper.cs.yml        |  1 +
 9 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/app/javascript/mastodon/locales/br.json b/app/javascript/mastodon/locales/br.json
index c919d2e9deab45..a150fb4902be39 100644
--- a/app/javascript/mastodon/locales/br.json
+++ b/app/javascript/mastodon/locales/br.json
@@ -35,6 +35,7 @@
   "account.follow_back": "Heuliañ d'ho tro",
   "account.followers": "Tud koumanantet",
   "account.followers.empty": "Den na heul an implijer·ez-mañ c'hoazh.",
+  "account.followers_counter": "{count, plural, one {{counter} heulier} two {{counter} heulier} few {{counter} heulier} many {{counter} heulier} other {{counter} heulier}}",
   "account.following": "Koumanantoù",
   "account.follows.empty": "An implijer·ez-mañ na heul den ebet.",
   "account.go_to_profile": "Gwelet ar profil",
@@ -60,6 +61,7 @@
   "account.requested_follow": "Gant {name} eo bet goulennet ho heuliañ",
   "account.share": "Skignañ profil @{name}",
   "account.show_reblogs": "Diskouez skignadennoù @{name}",
+  "account.statuses_counter": "{count, plural, one {{counter} embannadur} two {{counter} embannadur} few {{counter} embannadur} many {{counter} embannadur} other {{counter} embannadur}}",
   "account.unblock": "Diverzañ @{name}",
   "account.unblock_domain": "Diverzañ an domani {domain}",
   "account.unblock_short": "Distankañ",
diff --git a/app/javascript/mastodon/locales/cs.json b/app/javascript/mastodon/locales/cs.json
index 66aa1fe0a95907..e96e283970f0ae 100644
--- a/app/javascript/mastodon/locales/cs.json
+++ b/app/javascript/mastodon/locales/cs.json
@@ -20,7 +20,7 @@
   "account.block_short": "Zablokovat",
   "account.blocked": "Blokovaný",
   "account.browse_more_on_origin_server": "Více na původním profilu",
-  "account.cancel_follow_request": "Zrušit žádost o sledování",
+  "account.cancel_follow_request": "Zrušit sledování",
   "account.copy": "Kopírovat odkaz na profil",
   "account.direct": "Soukromě zmínit @{name}",
   "account.disable_notifications": "Přestat mě upozorňovat, když @{name} zveřejní příspěvek",
@@ -35,7 +35,9 @@
   "account.follow_back": "Také sledovat",
   "account.followers": "Sledující",
   "account.followers.empty": "Tohoto uživatele zatím nikdo nesleduje.",
+  "account.followers_counter": "{count, plural, one {{counter} sledující} few {{counter} sledující} many {{counter} sledujících} other {{counter} sledujících}}",
   "account.following": "Sledujete",
+  "account.following_counter": "{count, plural, one {{counter} sledovaný} few {{counter} sledovaní} many {{counter} sledovaných} other {{counter} sledovaných}}",
   "account.follows.empty": "Tento uživatel zatím nikoho nesleduje.",
   "account.go_to_profile": "Přejít na profil",
   "account.hide_reblogs": "Skrýt boosty od @{name}",
@@ -61,6 +63,7 @@
   "account.requested_follow": "{name} tě požádal o sledování",
   "account.share": "Sdílet profil @{name}",
   "account.show_reblogs": "Zobrazit boosty od @{name}",
+  "account.statuses_counter": "{count, plural, one {{counter} příspěvek} few {{counter} příspěvky} many {{counter} příspěvků} other {{counter} příspěvků}}",
   "account.unblock": "Odblokovat @{name}",
   "account.unblock_domain": "Odblokovat doménu {domain}",
   "account.unblock_short": "Odblokovat",
@@ -75,9 +78,9 @@
   "admin.dashboard.retention.average": "Průměr",
   "admin.dashboard.retention.cohort": "Měsíc registrace",
   "admin.dashboard.retention.cohort_size": "Noví uživatelé",
-  "admin.impact_report.instance_accounts": "Profily účtů, které by odstranily",
-  "admin.impact_report.instance_followers": "Sledovatelé, o které by naši uživatelé přišli",
-  "admin.impact_report.instance_follows": "Následovníci jejich uživatelé by ztratili",
+  "admin.impact_report.instance_accounts": "Profily účtů, které by byli odstaněny",
+  "admin.impact_report.instance_followers": "Sledující, o které by naši uživatelé přišli",
+  "admin.impact_report.instance_follows": "Sledující, o které by naši uživatelé přišli",
   "admin.impact_report.title": "Shrnutí dopadu",
   "alert.rate_limited.message": "Zkuste to prosím znovu po {retry_time, time, medium}.",
   "alert.rate_limited.title": "Spojení omezena",
@@ -86,7 +89,7 @@
   "announcement.announcement": "Oznámení",
   "attachments_list.unprocessed": "(nezpracováno)",
   "audio.hide": "Skrýt zvuk",
-  "block_modal.remote_users_caveat": "Požádáme server {domain}, aby respektoval vaše rozhodnutí. Úplné dodržování nastavení však není zaručeno, protože některé servery mohou řešit blokování různě. Veřejné příspěvky mohou být stále viditelné pro nepřihlášené uživatele.",
+  "block_modal.remote_users_caveat": "Požádáme server {domain}, aby respektoval vaše rozhodnutí. Úplné dodržování nastavení však není zaručeno, protože některé servery mohou řešit blokování různě. Veřejné příspěvky mohou stále být viditelné pro nepřihlášené uživatele.",
   "block_modal.show_less": "Zobrazit méně",
   "block_modal.show_more": "Zobrazit více",
   "block_modal.they_cant_mention": "Nemůže vás zmiňovat ani sledovat.",
@@ -411,6 +414,8 @@
   "limited_account_hint.action": "Přesto profil zobrazit",
   "limited_account_hint.title": "Tento profil byl skryt moderátory {domain}.",
   "link_preview.author": "Podle {name}",
+  "link_preview.more_from_author": "Více od {name}",
+  "link_preview.shares": "{count, plural, one {{counter} příspěvek} few {{counter} příspěvky} many {{counter} příspěvků} other {{counter} příspěvků}}",
   "lists.account.add": "Přidat do seznamu",
   "lists.account.remove": "Odebrat ze seznamu",
   "lists.delete": "Smazat seznam",
@@ -691,8 +696,11 @@
   "server_banner.about_active_users": "Lidé používající tento server během posledních 30 dní (měsíční aktivní uživatelé)",
   "server_banner.active_users": "aktivní uživatelé",
   "server_banner.administered_by": "Spravováno:",
+  "server_banner.is_one_of_many": "{domain} je jedním z mnoha Mastodon serverů, které můžete použít k účasti na fediversu.",
   "server_banner.server_stats": "Statistiky serveru:",
   "sign_in_banner.create_account": "Vytvořit účet",
+  "sign_in_banner.follow_anyone": "Sledujte kohokoli napříč fediversem a uvidíte vše v chronologickém pořadí. Bez algoritmů, reklam a clickbaitu.",
+  "sign_in_banner.mastodon_is": "Mastodon je ten nejlepší způsob, jak udržet krok s tím, co se právě děje.",
   "sign_in_banner.sign_in": "Přihlásit se",
   "sign_in_banner.sso_redirect": "Přihlášení nebo Registrace",
   "status.admin_account": "Otevřít moderátorské rozhraní pro @{name}",
diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json
index 4a5b666d3ecbc0..86438757a30755 100644
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@@ -37,7 +37,7 @@
   "account.followers.empty": "Diesem Profil folgt noch niemand.",
   "account.followers_counter": "{count, plural, one {{counter} Follower} other {{counter} Follower}}",
   "account.following": "Folge ich",
-  "account.following_counter": "{count, plural, one {{counter} folge ich} other {{counter} folge ich}}",
+  "account.following_counter": "{count, plural, one {{counter} Folge ich} other {{counter} Folge ich}}",
   "account.follows.empty": "Dieses Profil folgt noch niemandem.",
   "account.go_to_profile": "Profil aufrufen",
   "account.hide_reblogs": "Geteilte Beiträge von @{name} ausblenden",
diff --git a/app/javascript/mastodon/locales/fo.json b/app/javascript/mastodon/locales/fo.json
index e7786f388dfc4d..c27ffe0aa7d1ff 100644
--- a/app/javascript/mastodon/locales/fo.json
+++ b/app/javascript/mastodon/locales/fo.json
@@ -35,7 +35,9 @@
   "account.follow_back": "Fylg aftur",
   "account.followers": "Fylgjarar",
   "account.followers.empty": "Ongar fylgjarar enn.",
+  "account.followers_counter": "{count, plural, one {{counter} fylgjari} other {{counter} fylgjarar}}",
   "account.following": "Fylgir",
+  "account.following_counter": "{count, plural, one {{counter} fylgir} other {{counter} fylgja}}",
   "account.follows.empty": "Hesin brúkari fylgir ongum enn.",
   "account.go_to_profile": "Far til vanga",
   "account.hide_reblogs": "Fjal lyft frá @{name}",
@@ -61,6 +63,7 @@
   "account.requested_follow": "{name} hevur biðið um at fylgja tær",
   "account.share": "Deil vanga @{name}'s",
   "account.show_reblogs": "Vís lyft frá @{name}",
+  "account.statuses_counter": "{count, plural, one {{counter} postur} other {{counter} postar}}",
   "account.unblock": "Banna ikki @{name}",
   "account.unblock_domain": "Banna ikki økisnavnið {domain}",
   "account.unblock_short": "Banna ikki",
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index 90755666bbb573..fe3582c1d89ac7 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -35,7 +35,9 @@
   "account.follow_back": "맞팔로우 하기",
   "account.followers": "팔로워",
   "account.followers.empty": "아직 아무도 이 사용자를 팔로우하고 있지 않습니다.",
+  "account.followers_counter": "{count, plural, other {{counter} 팔로워}}",
   "account.following": "팔로잉",
+  "account.following_counter": "{count, plural, other {{counter} 팔로잉}}",
   "account.follows.empty": "이 사용자는 아직 아무도 팔로우하고 있지 않습니다.",
   "account.go_to_profile": "프로필로 이동",
   "account.hide_reblogs": "@{name}의 부스트를 숨기기",
@@ -61,6 +63,7 @@
   "account.requested_follow": "{name} 님이 팔로우 요청을 보냈습니다",
   "account.share": "@{name}의 프로필 공유",
   "account.show_reblogs": "@{name}의 부스트 보기",
+  "account.statuses_counter": "{count, plural, other {{counter} 게시물}}",
   "account.unblock": "차단 해제",
   "account.unblock_domain": "도메인 {domain} 차단 해제",
   "account.unblock_short": "차단 해제",
diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json
index e1d556ebf0e4cf..64abb394bfce4b 100644
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@@ -35,7 +35,9 @@
   "account.follow_back": "ติดตามกลับ",
   "account.followers": "ผู้ติดตาม",
   "account.followers.empty": "ยังไม่มีใครติดตามผู้ใช้นี้",
+  "account.followers_counter": "{count, plural, other {{counter} ผู้ติดตาม}}",
   "account.following": "กำลังติดตาม",
+  "account.following_counter": "{count, plural, other {{counter} กำลังติดตาม}}",
   "account.follows.empty": "ผู้ใช้นี้ยังไม่ได้ติดตามใคร",
   "account.go_to_profile": "ไปยังโปรไฟล์",
   "account.hide_reblogs": "ซ่อนการดันจาก @{name}",
@@ -61,6 +63,7 @@
   "account.requested_follow": "{name} ได้ขอติดตามคุณ",
   "account.share": "แชร์โปรไฟล์ของ @{name}",
   "account.show_reblogs": "แสดงการดันจาก @{name}",
+  "account.statuses_counter": "{count, plural, other {{counter} โพสต์}}",
   "account.unblock": "เลิกปิดกั้น @{name}",
   "account.unblock_domain": "เลิกปิดกั้นโดเมน {domain}",
   "account.unblock_short": "เลิกปิดกั้น",
diff --git a/app/javascript/mastodon/locales/vi.json b/app/javascript/mastodon/locales/vi.json
index bbfecf2c8a8c52..70932d10bee96e 100644
--- a/app/javascript/mastodon/locales/vi.json
+++ b/app/javascript/mastodon/locales/vi.json
@@ -35,7 +35,9 @@
   "account.follow_back": "Theo dõi lại",
   "account.followers": "Người theo dõi",
   "account.followers.empty": "Chưa có người theo dõi nào.",
+  "account.followers_counter": "{count, plural, other {{counter} người theo dõi}}",
   "account.following": "Đang theo dõi",
+  "account.following_counter": "{count, plural, other {{counter} đang theo dõi}}",
   "account.follows.empty": "Người này chưa theo dõi ai.",
   "account.go_to_profile": "Xem hồ sơ",
   "account.hide_reblogs": "Ẩn tút @{name} đăng lại",
@@ -61,6 +63,7 @@
   "account.requested_follow": "{name} yêu cầu theo dõi bạn",
   "account.share": "Chia sẻ @{name}",
   "account.show_reblogs": "Hiện tút do @{name} đăng lại",
+  "account.statuses_counter": "{count, plural, other {{counter} tút}}",
   "account.unblock": "Bỏ chặn @{name}",
   "account.unblock_domain": "Bỏ ẩn {domain}",
   "account.unblock_short": "Bỏ chặn",
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 17c743f1de5b5e..f3b8f27d805b2e 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -291,6 +291,7 @@ cs:
         update_custom_emoji_html: Uživatel %{name} aktualizoval emoji %{target}
         update_domain_block_html: "%{name} aktualizoval blokaci domény %{target}"
         update_ip_block_html: "%{name} změnil pravidlo pro IP %{target}"
+        update_report_html: "%{name} aktualizoval hlášení %{target}"
         update_status_html: Uživatel %{name} aktualizoval příspěvek uživatele %{target}
         update_user_role_html: "%{name} změnil %{target} roli"
       deleted_account: smazaný účet
@@ -298,6 +299,7 @@ cs:
       filter_by_action: Filtrovat podle akce
       filter_by_user: Filtrovat podle uživatele
       title: Protokol auditu
+      unavailable_instance: "(doména není k dispozici)"
     announcements:
       destroyed_msg: Oznámení bylo úspěšně odstraněno!
       edit:
@@ -984,6 +986,7 @@ cs:
       delete: Smazat
       edit_preset: Upravit předlohu pro varování
       empty: Zatím jste nedefinovali žádné předlohy varování.
+      title: Předvolby varování
     webhooks:
       add_new: Přidat koncový bod
       delete: Smazat
diff --git a/config/locales/doorkeeper.cs.yml b/config/locales/doorkeeper.cs.yml
index 3323834685a165..3101779edf105a 100644
--- a/config/locales/doorkeeper.cs.yml
+++ b/config/locales/doorkeeper.cs.yml
@@ -166,6 +166,7 @@ cs:
       admin:write:reports: provádět moderátorské akce s hlášeními
       crypto: používat end-to-end šifrování
       follow: upravovat vztahy mezi profily
+      profile: číst pouze základní informace o vašem účtu
       push: přijímat vaše push oznámení
       read: vidět všechna data vašeho účtu
       read:accounts: vidět informace o účtech

From aefb4c027b035bc3022343157d31117e7ae531b4 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 1 Jul 2024 08:35:19 +0000
Subject: [PATCH 1441/2191] chore(deps): update dependency rubocop-rails to
 v2.25.1 (#30876)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 1d73a8ef5a49ac..42cc0e19861146 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -696,7 +696,7 @@ GEM
     responders (3.1.1)
       actionpack (>= 5.2)
       railties (>= 5.2)
-    rexml (3.3.0)
+    rexml (3.3.1)
       strscan
     rotp (6.3.0)
     rouge (4.2.1)
@@ -751,7 +751,7 @@ GEM
     rubocop-performance (1.21.1)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rails (2.25.0)
+    rubocop-rails (2.25.1)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)

From aeefe5b2bea6e0fb511f029c2aacdefa7bd41eb8 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 1 Jul 2024 09:03:38 +0000
Subject: [PATCH 1442/2191] chore(deps): update eslint (non-major) (#30883)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 package.json |   4 +-
 yarn.lock    | 357 ++++++++++++++++++++++++++++++++++-----------------
 2 files changed, 241 insertions(+), 120 deletions(-)

diff --git a/package.json b/package.json
index 3eb1ebad7e0269..0379c7a5f560a9 100644
--- a/package.json
+++ b/package.json
@@ -178,8 +178,8 @@
     "eslint-plugin-formatjs": "^4.10.1",
     "eslint-plugin-import": "~2.29.0",
     "eslint-plugin-jsdoc": "^48.0.0",
-    "eslint-plugin-jsx-a11y": "~6.8.0",
-    "eslint-plugin-promise": "~6.2.0",
+    "eslint-plugin-jsx-a11y": "~6.9.0",
+    "eslint-plugin-promise": "~6.4.0",
     "eslint-plugin-react": "^7.33.2",
     "eslint-plugin-react-hooks": "^4.6.0",
     "husky": "^9.0.11",
diff --git a/yarn.lock b/yarn.lock
index 5b4f3c22bd97fb..9d19cb837e0d2e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1502,7 +1502,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.0, @babel/runtime@npm:^7.12.13, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.13.8, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.2.0, @babel/runtime@npm:^7.20.13, @babel/runtime@npm:^7.22.3, @babel/runtime@npm:^7.23.2, @babel/runtime@npm:^7.3.1, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.6.3, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.8.7, @babel/runtime@npm:^7.9.2":
+"@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.0, @babel/runtime@npm:^7.12.13, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.13.8, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.2.0, @babel/runtime@npm:^7.20.13, @babel/runtime@npm:^7.22.3, @babel/runtime@npm:^7.3.1, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.6.3, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.8.7, @babel/runtime@npm:^7.9.2":
   version: 7.24.7
   resolution: "@babel/runtime@npm:7.24.7"
   dependencies:
@@ -2830,8 +2830,8 @@ __metadata:
     eslint-plugin-formatjs: "npm:^4.10.1"
     eslint-plugin-import: "npm:~2.29.0"
     eslint-plugin-jsdoc: "npm:^48.0.0"
-    eslint-plugin-jsx-a11y: "npm:~6.8.0"
-    eslint-plugin-promise: "npm:~6.2.0"
+    eslint-plugin-jsx-a11y: "npm:~6.9.0"
+    eslint-plugin-promise: "npm:~6.4.0"
     eslint-plugin-react: "npm:^7.33.2"
     eslint-plugin-react-hooks: "npm:^4.6.0"
     file-loader: "npm:^6.2.0"
@@ -3036,6 +3036,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@pkgr/core@npm:^0.1.0":
+  version: 0.1.1
+  resolution: "@pkgr/core@npm:0.1.1"
+  checksum: 10c0/3f7536bc7f57320ab2cf96f8973664bef624710c403357429fbf680a5c3b4843c1dbd389bb43daa6b1f6f1f007bb082f5abcb76bb2b5dc9f421647743b71d3d8
+  languageName: node
+  linkType: hard
+
 "@polka/url@npm:^1.0.0-next.20":
   version: 1.0.0-next.21
   resolution: "@polka/url@npm:1.0.0-next.21"
@@ -4120,14 +4127,14 @@ __metadata:
   linkType: hard
 
 "@typescript-eslint/eslint-plugin@npm:^7.0.0":
-  version: 7.11.0
-  resolution: "@typescript-eslint/eslint-plugin@npm:7.11.0"
+  version: 7.14.1
+  resolution: "@typescript-eslint/eslint-plugin@npm:7.14.1"
   dependencies:
     "@eslint-community/regexpp": "npm:^4.10.0"
-    "@typescript-eslint/scope-manager": "npm:7.11.0"
-    "@typescript-eslint/type-utils": "npm:7.11.0"
-    "@typescript-eslint/utils": "npm:7.11.0"
-    "@typescript-eslint/visitor-keys": "npm:7.11.0"
+    "@typescript-eslint/scope-manager": "npm:7.14.1"
+    "@typescript-eslint/type-utils": "npm:7.14.1"
+    "@typescript-eslint/utils": "npm:7.14.1"
+    "@typescript-eslint/visitor-keys": "npm:7.14.1"
     graphemer: "npm:^1.4.0"
     ignore: "npm:^5.3.1"
     natural-compare: "npm:^1.4.0"
@@ -4138,25 +4145,25 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 10c0/50fedf832e4de9546569106eab1d10716204ceebc5cc7d62299112c881212270d0f7857e3d6452c07db031d40b58cf27c4d1b1a36043e8e700fc3496e377b54a
+  checksum: 10c0/7c2b9b98a38d78326b0ff7348fe001203eda10817ca7834a7a01f492ae7c2508469bbafaa933208d6459f8ff6685277685983cf6f6843e556a6ab2aa5c05080c
   languageName: node
   linkType: hard
 
 "@typescript-eslint/parser@npm:^7.0.0":
-  version: 7.11.0
-  resolution: "@typescript-eslint/parser@npm:7.11.0"
+  version: 7.14.1
+  resolution: "@typescript-eslint/parser@npm:7.14.1"
   dependencies:
-    "@typescript-eslint/scope-manager": "npm:7.11.0"
-    "@typescript-eslint/types": "npm:7.11.0"
-    "@typescript-eslint/typescript-estree": "npm:7.11.0"
-    "@typescript-eslint/visitor-keys": "npm:7.11.0"
+    "@typescript-eslint/scope-manager": "npm:7.14.1"
+    "@typescript-eslint/types": "npm:7.14.1"
+    "@typescript-eslint/typescript-estree": "npm:7.14.1"
+    "@typescript-eslint/visitor-keys": "npm:7.14.1"
     debug: "npm:^4.3.4"
   peerDependencies:
     eslint: ^8.56.0
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 10c0/f5d1343fae90ccd91aea8adf194e22ed3eb4b2ea79d03d8a9ca6e7b669a6db306e93138ec64f7020c5b3128619d50304dea1f06043eaff6b015071822cad4972
+  checksum: 10c0/db3169d4852685cfb27db741c557f58a3e52104bfacc7621beb7c94ec36ac2a08d4e410ac86745db52f482fbfc87e99fa0a26c1d7a10d37a215cce85e1661f0e
   languageName: node
   linkType: hard
 
@@ -4170,22 +4177,22 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/scope-manager@npm:7.11.0":
-  version: 7.11.0
-  resolution: "@typescript-eslint/scope-manager@npm:7.11.0"
+"@typescript-eslint/scope-manager@npm:7.14.1":
+  version: 7.14.1
+  resolution: "@typescript-eslint/scope-manager@npm:7.14.1"
   dependencies:
-    "@typescript-eslint/types": "npm:7.11.0"
-    "@typescript-eslint/visitor-keys": "npm:7.11.0"
-  checksum: 10c0/35f9d88f38f2366017b15c9ee752f2605afa8009fa1eaf81c8b2b71fc22ddd2a33fff794a02015c8991a5fa99f315c3d6d76a5957d3fad1ccbb4cd46735c98b5
+    "@typescript-eslint/types": "npm:7.14.1"
+    "@typescript-eslint/visitor-keys": "npm:7.14.1"
+  checksum: 10c0/f8c05a0d6f8de4cc19b90a4da308817c66e53f36f7ec48f6cc23e93c7399bc418643d8135933aaf5fc013199cbef0e1ea4223f5147db5ca401b239eaf087011e
   languageName: node
   linkType: hard
 
-"@typescript-eslint/type-utils@npm:7.11.0":
-  version: 7.11.0
-  resolution: "@typescript-eslint/type-utils@npm:7.11.0"
+"@typescript-eslint/type-utils@npm:7.14.1":
+  version: 7.14.1
+  resolution: "@typescript-eslint/type-utils@npm:7.14.1"
   dependencies:
-    "@typescript-eslint/typescript-estree": "npm:7.11.0"
-    "@typescript-eslint/utils": "npm:7.11.0"
+    "@typescript-eslint/typescript-estree": "npm:7.14.1"
+    "@typescript-eslint/utils": "npm:7.14.1"
     debug: "npm:^4.3.4"
     ts-api-utils: "npm:^1.3.0"
   peerDependencies:
@@ -4193,7 +4200,7 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 10c0/637395cb0f4c424c610e751906a31dcfedcdbd8c479012da6e81f9be6b930f32317bfe170ccb758d93a411b2bd9c4e7e5d18892094466099c6f9c3dceda81a72
+  checksum: 10c0/bd1c4a8db6273e24156fb10da2cbeb52b4eb03f819da193d4b6bd5a95db3b5524c6fe00d088308d8855b9ae60a3b82afa3a06e89982a09a8573561da960758fd
   languageName: node
   linkType: hard
 
@@ -4204,10 +4211,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/types@npm:7.11.0, @typescript-eslint/types@npm:^7.2.0":
-  version: 7.11.0
-  resolution: "@typescript-eslint/types@npm:7.11.0"
-  checksum: 10c0/c5d6c517124017eb44aa180c8ea1fad26ec8e47502f92fd12245ba3141560e69d7f7e35b8aa160ddd5df63a2952af407e2f62cc58b663c86e1f778ffb5b01789
+"@typescript-eslint/types@npm:7.14.1, @typescript-eslint/types@npm:^7.2.0":
+  version: 7.14.1
+  resolution: "@typescript-eslint/types@npm:7.14.1"
+  checksum: 10c0/5b7bda83c47a9b386482e63447c6b0ed7bd4e82eb43f11a180c6e2f3d2e7a2828f57bcbed82196ad761c49e363cccf4c81a89f1fc976e9f5f0a79dcc928fa2d2
   languageName: node
   linkType: hard
 
@@ -4230,12 +4237,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/typescript-estree@npm:7.11.0":
-  version: 7.11.0
-  resolution: "@typescript-eslint/typescript-estree@npm:7.11.0"
+"@typescript-eslint/typescript-estree@npm:7.14.1":
+  version: 7.14.1
+  resolution: "@typescript-eslint/typescript-estree@npm:7.14.1"
   dependencies:
-    "@typescript-eslint/types": "npm:7.11.0"
-    "@typescript-eslint/visitor-keys": "npm:7.11.0"
+    "@typescript-eslint/types": "npm:7.14.1"
+    "@typescript-eslint/visitor-keys": "npm:7.14.1"
     debug: "npm:^4.3.4"
     globby: "npm:^11.1.0"
     is-glob: "npm:^4.0.3"
@@ -4245,21 +4252,21 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 10c0/a4eda43f352d20edebae0c1c221c4fd9de0673a94988cf1ae3f5e4917ef9cdb9ead8d3673ea8dd6e80d9cf3523a47c295be1326a3fae017b277233f4c4b4026b
+  checksum: 10c0/a8da9bcc4de3334a225424946abd99374de05c42098455419224bc0f46bb1b66115f8bd6ae268461294b90943ed4a407bcd255c0fa60eb76ba4cdc5fc7c20855
   languageName: node
   linkType: hard
 
-"@typescript-eslint/utils@npm:7.11.0":
-  version: 7.11.0
-  resolution: "@typescript-eslint/utils@npm:7.11.0"
+"@typescript-eslint/utils@npm:7.14.1":
+  version: 7.14.1
+  resolution: "@typescript-eslint/utils@npm:7.14.1"
   dependencies:
     "@eslint-community/eslint-utils": "npm:^4.4.0"
-    "@typescript-eslint/scope-manager": "npm:7.11.0"
-    "@typescript-eslint/types": "npm:7.11.0"
-    "@typescript-eslint/typescript-estree": "npm:7.11.0"
+    "@typescript-eslint/scope-manager": "npm:7.14.1"
+    "@typescript-eslint/types": "npm:7.14.1"
+    "@typescript-eslint/typescript-estree": "npm:7.14.1"
   peerDependencies:
     eslint: ^8.56.0
-  checksum: 10c0/539a7ff8b825ad810fc59a80269094748df1a397a42cdbb212c493fc2486711c7d8fd6d75d4cd8a067822b8e6a11f42c50441977d51c183eec47992506d1cdf8
+  checksum: 10c0/c7f635a3c2c6c085e1d51a52088e55cad9d7e1257b1f60378e5eeb6eb0871db027d42747e9ef60a2f557cf9dd68b2ce014d488d795db8f771506290b164b0e5a
   languageName: node
   linkType: hard
 
@@ -4290,13 +4297,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/visitor-keys@npm:7.11.0":
-  version: 7.11.0
-  resolution: "@typescript-eslint/visitor-keys@npm:7.11.0"
+"@typescript-eslint/visitor-keys@npm:7.14.1":
+  version: 7.14.1
+  resolution: "@typescript-eslint/visitor-keys@npm:7.14.1"
   dependencies:
-    "@typescript-eslint/types": "npm:7.11.0"
+    "@typescript-eslint/types": "npm:7.14.1"
     eslint-visitor-keys: "npm:^3.4.3"
-  checksum: 10c0/664e558d9645896484b7ffc9381837f0d52443bf8d121a5586d02d42ca4d17dc35faf526768c4b1beb52c57c43fae555898eb087651eb1c7a3d60f1085effea1
+  checksum: 10c0/39ac489990fcfdcee442f27658431a0eb44ccf694f701a45df2a108c47cea9582e0955bff0d449047549149385f72895a5d7e6c1622ece1fe32594b7cecb85f3
   languageName: node
   linkType: hard
 
@@ -4786,7 +4793,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"aria-query@npm:5.3.0, aria-query@npm:^5.0.0, aria-query@npm:^5.3.0":
+"aria-query@npm:5.3.0, aria-query@npm:^5.0.0":
   version: 5.3.0
   resolution: "aria-query@npm:5.3.0"
   dependencies:
@@ -4795,6 +4802,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"aria-query@npm:~5.1.3":
+  version: 5.1.3
+  resolution: "aria-query@npm:5.1.3"
+  dependencies:
+    deep-equal: "npm:^2.0.5"
+  checksum: 10c0/edcbc8044c4663d6f88f785e983e6784f98cb62b4ba1e9dd8d61b725d0203e4cfca38d676aee984c31f354103461102a3d583aa4fbe4fd0a89b679744f4e5faf
+  languageName: node
+  linkType: hard
+
 "arr-diff@npm:^4.0.0":
   version: 4.0.0
   resolution: "arr-diff@npm:4.0.0"
@@ -4816,7 +4832,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"array-buffer-byte-length@npm:^1.0.1":
+"array-buffer-byte-length@npm:^1.0.0, array-buffer-byte-length@npm:^1.0.1":
   version: 1.0.1
   resolution: "array-buffer-byte-length@npm:1.0.1"
   dependencies:
@@ -4960,16 +4976,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"array.prototype.tosorted@npm:^1.1.3":
-  version: 1.1.3
-  resolution: "array.prototype.tosorted@npm:1.1.3"
+"array.prototype.tosorted@npm:^1.1.4":
+  version: 1.1.4
+  resolution: "array.prototype.tosorted@npm:1.1.4"
   dependencies:
-    call-bind: "npm:^1.0.5"
+    call-bind: "npm:^1.0.7"
     define-properties: "npm:^1.2.1"
-    es-abstract: "npm:^1.22.3"
-    es-errors: "npm:^1.1.0"
+    es-abstract: "npm:^1.23.3"
+    es-errors: "npm:^1.3.0"
     es-shim-unscopables: "npm:^1.0.2"
-  checksum: 10c0/a27e1ca51168ecacf6042901f5ef021e43c8fa04b6c6b6f2a30bac3645cd2b519cecbe0bc45db1b85b843f64dc3207f0268f700b4b9fbdec076d12d432cf0865
+  checksum: 10c0/eb3c4c4fc0381b0bf6dba2ea4d48d367c2827a0d4236a5718d97caaccc6b78f11f4cadf090736e86301d295a6aa4967ed45568f92ced51be8cbbacd9ca410943
   languageName: node
   linkType: hard
 
@@ -5135,10 +5151,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"axe-core@npm:=4.7.0":
-  version: 4.7.0
-  resolution: "axe-core@npm:4.7.0"
-  checksum: 10c0/89ac5712b5932ac7d23398b4cb5ba081c394a086e343acc68ba49c83472706e18e0799804e8388c779dcdacc465377deb29f2714241d3fbb389cf3a6b275c9ba
+"axe-core@npm:^4.9.1":
+  version: 4.9.1
+  resolution: "axe-core@npm:4.9.1"
+  checksum: 10c0/ac9e5a0c6fa115a43ebffc32a1d2189e1ca6431b5a78e88cdcf94a72a25c5964185682edd94fe6bdb1cb4266c0d06301b022866e0e50dcdf6e3cefe556470110
   languageName: node
   linkType: hard
 
@@ -5153,12 +5169,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"axobject-query@npm:^3.2.1":
-  version: 3.2.1
-  resolution: "axobject-query@npm:3.2.1"
+"axobject-query@npm:~3.1.1":
+  version: 3.1.1
+  resolution: "axobject-query@npm:3.1.1"
   dependencies:
-    dequal: "npm:^2.0.3"
-  checksum: 10c0/f7debc2012e456139b57d888c223f6d3cb4b61eb104164a85e3d346273dd6ef0bc9a04b6660ca9407704a14a8e05fa6b6eb9d55f44f348c7210de7ffb350c3a7
+    deep-equal: "npm:^2.0.5"
+  checksum: 10c0/fff3175a22fd1f41fceb7ae0cd25f6594a0d7fba28c2335dd904538b80eb4e1040432564a3c643025cd2bb748f68d35aaabffb780b794da97ecfc748810b25ad
   languageName: node
   linkType: hard
 
@@ -6996,6 +7012,32 @@ __metadata:
   languageName: node
   linkType: hard
 
+"deep-equal@npm:^2.0.5":
+  version: 2.2.3
+  resolution: "deep-equal@npm:2.2.3"
+  dependencies:
+    array-buffer-byte-length: "npm:^1.0.0"
+    call-bind: "npm:^1.0.5"
+    es-get-iterator: "npm:^1.1.3"
+    get-intrinsic: "npm:^1.2.2"
+    is-arguments: "npm:^1.1.1"
+    is-array-buffer: "npm:^3.0.2"
+    is-date-object: "npm:^1.0.5"
+    is-regex: "npm:^1.1.4"
+    is-shared-array-buffer: "npm:^1.0.2"
+    isarray: "npm:^2.0.5"
+    object-is: "npm:^1.1.5"
+    object-keys: "npm:^1.1.1"
+    object.assign: "npm:^4.1.4"
+    regexp.prototype.flags: "npm:^1.5.1"
+    side-channel: "npm:^1.0.4"
+    which-boxed-primitive: "npm:^1.0.2"
+    which-collection: "npm:^1.0.1"
+    which-typed-array: "npm:^1.1.13"
+  checksum: 10c0/a48244f90fa989f63ff5ef0cc6de1e4916b48ea0220a9c89a378561960814794a5800c600254482a2c8fd2e49d6c2e196131dc983976adb024c94a42dfe4949f
+  languageName: node
+  linkType: hard
+
 "deep-is@npm:^0.1.3":
   version: 0.1.4
   resolution: "deep-is@npm:0.1.4"
@@ -7578,7 +7620,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"es-abstract@npm:^1.17.2, es-abstract@npm:^1.20.4, es-abstract@npm:^1.21.2, es-abstract@npm:^1.22.1, es-abstract@npm:^1.22.3, es-abstract@npm:^1.23.0, es-abstract@npm:^1.23.2, es-abstract@npm:^1.23.3":
+"es-abstract@npm:^1.17.2, es-abstract@npm:^1.17.5, es-abstract@npm:^1.20.4, es-abstract@npm:^1.21.2, es-abstract@npm:^1.22.1, es-abstract@npm:^1.22.3, es-abstract@npm:^1.23.0, es-abstract@npm:^1.23.2, es-abstract@npm:^1.23.3":
   version: 1.23.3
   resolution: "es-abstract@npm:1.23.3"
   dependencies:
@@ -7648,14 +7690,31 @@ __metadata:
   languageName: node
   linkType: hard
 
-"es-errors@npm:^1.1.0, es-errors@npm:^1.2.1, es-errors@npm:^1.3.0":
+"es-errors@npm:^1.2.1, es-errors@npm:^1.3.0":
   version: 1.3.0
   resolution: "es-errors@npm:1.3.0"
   checksum: 10c0/0a61325670072f98d8ae3b914edab3559b6caa980f08054a3b872052640d91da01d38df55df797fcc916389d77fc92b8d5906cf028f4db46d7e3003abecbca85
   languageName: node
   linkType: hard
 
-"es-iterator-helpers@npm:^1.0.15, es-iterator-helpers@npm:^1.0.19":
+"es-get-iterator@npm:^1.1.3":
+  version: 1.1.3
+  resolution: "es-get-iterator@npm:1.1.3"
+  dependencies:
+    call-bind: "npm:^1.0.2"
+    get-intrinsic: "npm:^1.1.3"
+    has-symbols: "npm:^1.0.3"
+    is-arguments: "npm:^1.1.1"
+    is-map: "npm:^2.0.2"
+    is-set: "npm:^2.0.2"
+    is-string: "npm:^1.0.7"
+    isarray: "npm:^2.0.5"
+    stop-iteration-iterator: "npm:^1.0.0"
+  checksum: 10c0/ebd11effa79851ea75d7f079405f9d0dc185559fd65d986c6afea59a0ff2d46c2ed8675f19f03dce7429d7f6c14ff9aede8d121fbab78d75cfda6a263030bac0
+  languageName: node
+  linkType: hard
+
+"es-iterator-helpers@npm:^1.0.19":
   version: 1.0.19
   resolution: "es-iterator-helpers@npm:1.0.19"
   dependencies:
@@ -7677,6 +7736,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"es-module-lexer@npm:^1.5.3":
+  version: 1.5.4
+  resolution: "es-module-lexer@npm:1.5.4"
+  checksum: 10c0/300a469488c2f22081df1e4c8398c78db92358496e639b0df7f89ac6455462aaf5d8893939087c1a1cbcbf20eed4610c70e0bcb8f3e4b0d80a5d2611c539408c
+  languageName: node
+  linkType: hard
+
 "es-object-atoms@npm:^1.0.0":
   version: 1.0.0
   resolution: "es-object-atoms@npm:1.0.0"
@@ -7867,8 +7933,8 @@ __metadata:
   linkType: hard
 
 "eslint-plugin-jsdoc@npm:^48.0.0":
-  version: 48.2.7
-  resolution: "eslint-plugin-jsdoc@npm:48.2.7"
+  version: 48.5.0
+  resolution: "eslint-plugin-jsdoc@npm:48.5.0"
   dependencies:
     "@es-joy/jsdoccomment": "npm:~0.43.1"
     are-docs-informative: "npm:^0.0.2"
@@ -7876,46 +7942,48 @@ __metadata:
     debug: "npm:^4.3.4"
     escape-string-regexp: "npm:^4.0.0"
     esquery: "npm:^1.5.0"
+    parse-imports: "npm:^2.1.0"
     semver: "npm:^7.6.2"
     spdx-expression-parse: "npm:^4.0.0"
+    synckit: "npm:^0.9.0"
   peerDependencies:
     eslint: ^7.0.0 || ^8.0.0 || ^9.0.0
-  checksum: 10c0/74d0f95b3d880dd4221dbc0b9341266a6cce3b8ca8d3e30032223af3552364643d6b82ad733d9bc06a20f0d640f21e4d8f5a4b00901d1771572625178b8c40c3
+  checksum: 10c0/1c5eb83df06cb228e44ad2c9da5b31987347a45b99d9e7a68957d178487a81603ad3c4c7db1ecba7e8a62d7ae20d9de1aec18a8cf2aa0e9169731cec54f78ab7
   languageName: node
   linkType: hard
 
-"eslint-plugin-jsx-a11y@npm:~6.8.0":
-  version: 6.8.0
-  resolution: "eslint-plugin-jsx-a11y@npm:6.8.0"
+"eslint-plugin-jsx-a11y@npm:~6.9.0":
+  version: 6.9.0
+  resolution: "eslint-plugin-jsx-a11y@npm:6.9.0"
   dependencies:
-    "@babel/runtime": "npm:^7.23.2"
-    aria-query: "npm:^5.3.0"
-    array-includes: "npm:^3.1.7"
+    aria-query: "npm:~5.1.3"
+    array-includes: "npm:^3.1.8"
     array.prototype.flatmap: "npm:^1.3.2"
     ast-types-flow: "npm:^0.0.8"
-    axe-core: "npm:=4.7.0"
-    axobject-query: "npm:^3.2.1"
+    axe-core: "npm:^4.9.1"
+    axobject-query: "npm:~3.1.1"
     damerau-levenshtein: "npm:^1.0.8"
     emoji-regex: "npm:^9.2.2"
-    es-iterator-helpers: "npm:^1.0.15"
-    hasown: "npm:^2.0.0"
+    es-iterator-helpers: "npm:^1.0.19"
+    hasown: "npm:^2.0.2"
     jsx-ast-utils: "npm:^3.3.5"
     language-tags: "npm:^1.0.9"
     minimatch: "npm:^3.1.2"
-    object.entries: "npm:^1.1.7"
-    object.fromentries: "npm:^2.0.7"
+    object.fromentries: "npm:^2.0.8"
+    safe-regex-test: "npm:^1.0.3"
+    string.prototype.includes: "npm:^2.0.0"
   peerDependencies:
     eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8
-  checksum: 10c0/199b883e526e6f9d7c54cb3f094abc54f11a1ec816db5fb6cae3b938eb0e503acc10ccba91ca7451633a9d0b9abc0ea03601844a8aba5fe88c5e8897c9ac8f49
+  checksum: 10c0/72ac719ca90b6149c8f3c708ac5b1177f6757668b6e174d72a78512d4ac10329331b9c666c21e9561237a96a45d7f147f6a5d270dadbb99eb4ee093f127792c3
   languageName: node
   linkType: hard
 
-"eslint-plugin-promise@npm:~6.2.0":
-  version: 6.2.0
-  resolution: "eslint-plugin-promise@npm:6.2.0"
+"eslint-plugin-promise@npm:~6.4.0":
+  version: 6.4.0
+  resolution: "eslint-plugin-promise@npm:6.4.0"
   peerDependencies:
     eslint: ^7.0.0 || ^8.0.0 || ^9.0.0
-  checksum: 10c0/5f42ee774023c089453ecb792076c64c6d0739ea6e9d6cdc9d6a63da5ba928c776e349d01cc110548f2c67045ec55343136aa7eb8b486e4ab145ac016c06a492
+  checksum: 10c0/5d07be976504f92d1d91756b0b0588a4c65e379af2520dd77c8655203085c0ab43e24d4698d1ac4b50926430cd8eb81cd1cc4c3653aae8386c805577bdf57b6c
   languageName: node
   linkType: hard
 
@@ -7929,14 +7997,14 @@ __metadata:
   linkType: hard
 
 "eslint-plugin-react@npm:^7.33.2":
-  version: 7.34.2
-  resolution: "eslint-plugin-react@npm:7.34.2"
+  version: 7.34.3
+  resolution: "eslint-plugin-react@npm:7.34.3"
   dependencies:
     array-includes: "npm:^3.1.8"
     array.prototype.findlast: "npm:^1.2.5"
     array.prototype.flatmap: "npm:^1.3.2"
     array.prototype.toreversed: "npm:^1.1.2"
-    array.prototype.tosorted: "npm:^1.1.3"
+    array.prototype.tosorted: "npm:^1.1.4"
     doctrine: "npm:^2.1.0"
     es-iterator-helpers: "npm:^1.0.19"
     estraverse: "npm:^5.3.0"
@@ -7952,7 +8020,7 @@ __metadata:
     string.prototype.matchall: "npm:^4.0.11"
   peerDependencies:
     eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8
-  checksum: 10c0/37dc04424da8626f20a071466e7238d53ed111c53e5e5398d813ac2cf76a2078f00d91f7833fe5b2f0fc98f2688a75b36e78e9ada9f1068705d23c7031094316
+  checksum: 10c0/60717e32c9948e2b4ddc53dac7c4b62c68fc7129c3249079191c941c08ebe7d1f4793d65182922d19427c2a6634e05231a7b74ceee34169afdfd0e43d4a43d26
   languageName: node
   linkType: hard
 
@@ -8821,7 +8889,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"get-intrinsic@npm:^1.1.1, get-intrinsic@npm:^1.1.3, get-intrinsic@npm:^1.2.1, get-intrinsic@npm:^1.2.3, get-intrinsic@npm:^1.2.4":
+"get-intrinsic@npm:^1.1.1, get-intrinsic@npm:^1.1.3, get-intrinsic@npm:^1.2.1, get-intrinsic@npm:^1.2.2, get-intrinsic@npm:^1.2.3, get-intrinsic@npm:^1.2.4":
   version: 1.2.4
   resolution: "get-intrinsic@npm:1.2.4"
   dependencies:
@@ -9661,7 +9729,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"internal-slot@npm:^1.0.7":
+"internal-slot@npm:^1.0.4, internal-slot@npm:^1.0.7":
   version: 1.0.7
   resolution: "internal-slot@npm:1.0.7"
   dependencies:
@@ -9777,7 +9845,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-arguments@npm:^1.0.4":
+"is-arguments@npm:^1.0.4, is-arguments@npm:^1.1.1":
   version: 1.1.1
   resolution: "is-arguments@npm:1.1.1"
   dependencies:
@@ -9787,7 +9855,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-array-buffer@npm:^3.0.4":
+"is-array-buffer@npm:^3.0.2, is-array-buffer@npm:^3.0.4":
   version: 3.0.4
   resolution: "is-array-buffer@npm:3.0.4"
   dependencies:
@@ -10043,10 +10111,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-map@npm:^2.0.1":
-  version: 2.0.2
-  resolution: "is-map@npm:2.0.2"
-  checksum: 10c0/119ff9137a37fd131a72fab3f4ab8c9d6a24b0a1ee26b4eff14dc625900d8675a97785eea5f4174265e2006ed076cc24e89f6e57ebd080a48338d914ec9168a5
+"is-map@npm:^2.0.1, is-map@npm:^2.0.2":
+  version: 2.0.3
+  resolution: "is-map@npm:2.0.3"
+  checksum: 10c0/2c4d431b74e00fdda7162cd8e4b763d6f6f217edf97d4f8538b94b8702b150610e2c64961340015fe8df5b1fcee33ccd2e9b62619c4a8a3a155f8de6d6d355fc
   languageName: node
   linkType: hard
 
@@ -10168,10 +10236,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-set@npm:^2.0.1":
-  version: 2.0.2
-  resolution: "is-set@npm:2.0.2"
-  checksum: 10c0/5f8bd1880df8c0004ce694e315e6e1e47a3452014be792880bb274a3b2cdb952fdb60789636ca6e084c7947ca8b7ae03ccaf54c93a7fcfed228af810559e5432
+"is-set@npm:^2.0.1, is-set@npm:^2.0.2":
+  version: 2.0.3
+  resolution: "is-set@npm:2.0.3"
+  checksum: 10c0/f73732e13f099b2dc879c2a12341cfc22ccaca8dd504e6edae26484bd5707a35d503fba5b4daad530a9b088ced1ae6c9d8200fd92e09b428fe14ea79ce8080b7
   languageName: node
   linkType: hard
 
@@ -12366,13 +12434,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"object-is@npm:^1.0.1":
-  version: 1.1.5
-  resolution: "object-is@npm:1.1.5"
+"object-is@npm:^1.0.1, object-is@npm:^1.1.5":
+  version: 1.1.6
+  resolution: "object-is@npm:1.1.6"
   dependencies:
-    call-bind: "npm:^1.0.2"
-    define-properties: "npm:^1.1.3"
-  checksum: 10c0/8c263fb03fc28f1ffb54b44b9147235c5e233dc1ca23768e7d2569740b5d860154d7cc29a30220fe28ed6d8008e2422aefdebfe987c103e1c5d190cf02d9d886
+    call-bind: "npm:^1.0.7"
+    define-properties: "npm:^1.2.1"
+  checksum: 10c0/506af444c4dce7f8e31f34fc549e2fb8152d6b9c4a30c6e62852badd7f520b579c679af433e7a072f9d78eb7808d230dc12e1cf58da9154dfbf8813099ea0fe0
   languageName: node
   linkType: hard
 
@@ -12404,7 +12472,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"object.entries@npm:^1.1.7, object.entries@npm:^1.1.8":
+"object.entries@npm:^1.1.8":
   version: 1.1.8
   resolution: "object.entries@npm:1.1.8"
   dependencies:
@@ -12708,6 +12776,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"parse-imports@npm:^2.1.0":
+  version: 2.1.0
+  resolution: "parse-imports@npm:2.1.0"
+  dependencies:
+    es-module-lexer: "npm:^1.5.3"
+    slashes: "npm:^3.0.12"
+  checksum: 10c0/18ef58008868d2d09e472bb540d63efc7cc27f2c33607e5d09c256ece7a30062cac292bda96d820438e94f3dbf558c85e4b084c10d238baa858796794e6cf628
+  languageName: node
+  linkType: hard
+
 "parse-json@npm:^5.0.0, parse-json@npm:^5.2.0":
   version: 5.2.0
   resolution: "parse-json@npm:5.2.0"
@@ -14940,7 +15018,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"regexp.prototype.flags@npm:^1.2.0, regexp.prototype.flags@npm:^1.5.2":
+"regexp.prototype.flags@npm:^1.2.0, regexp.prototype.flags@npm:^1.5.1, regexp.prototype.flags@npm:^1.5.2":
   version: 1.5.2
   resolution: "regexp.prototype.flags@npm:1.5.2"
   dependencies:
@@ -15742,6 +15820,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"slashes@npm:^3.0.12":
+  version: 3.0.12
+  resolution: "slashes@npm:3.0.12"
+  checksum: 10c0/71ca2a1fcd1ab6814b0fdb8cf9c33a3d54321deec2aa8d173510f0086880201446021a9b9e6a18561f7c472b69a2145977c6a8fb9c53a8ff7be31778f203d175
+  languageName: node
+  linkType: hard
+
 "slice-ansi@npm:^4.0.0":
   version: 4.0.0
   resolution: "slice-ansi@npm:4.0.0"
@@ -16151,6 +16236,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"stop-iteration-iterator@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "stop-iteration-iterator@npm:1.0.0"
+  dependencies:
+    internal-slot: "npm:^1.0.4"
+  checksum: 10c0/c4158d6188aac510d9e92925b58709207bd94699e9c31186a040c80932a687f84a51356b5895e6dc72710aad83addb9411c22171832c9ae0e6e11b7d61b0dfb9
+  languageName: node
+  linkType: hard
+
 "stream-browserify@npm:^2.0.1":
   version: 2.0.2
   resolution: "stream-browserify@npm:2.0.2"
@@ -16235,6 +16329,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"string.prototype.includes@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "string.prototype.includes@npm:2.0.0"
+  dependencies:
+    define-properties: "npm:^1.1.3"
+    es-abstract: "npm:^1.17.5"
+  checksum: 10c0/32dff118c9e9dcc87e240b05462fa8ee7248d9e335c0015c1442fe18152261508a2146d9bb87ddae56abab69148a83c61dfaea33f53853812a6a2db737689ed2
+  languageName: node
+  linkType: hard
+
 "string.prototype.matchall@npm:^4.0.11, string.prototype.matchall@npm:^4.0.6":
   version: 4.0.11
   resolution: "string.prototype.matchall@npm:4.0.11"
@@ -16678,6 +16782,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"synckit@npm:^0.9.0":
+  version: 0.9.0
+  resolution: "synckit@npm:0.9.0"
+  dependencies:
+    "@pkgr/core": "npm:^0.1.0"
+    tslib: "npm:^2.6.2"
+  checksum: 10c0/b5c1e7c03fefe3d36a9ab4e71dd21859cb32be4138712c31a893382a568fd00efc59ede8f521dd7e53d43a2fea92bdf717e987ea9ed6ad94f97ef28d71d0ba2f
+  languageName: node
+  linkType: hard
+
 "table@npm:^6.8.2":
   version: 6.8.2
   resolution: "table@npm:6.8.2"
@@ -17014,13 +17128,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tslib@npm:2.6.2, tslib@npm:^2.4.0":
+"tslib@npm:2.6.2":
   version: 2.6.2
   resolution: "tslib@npm:2.6.2"
   checksum: 10c0/e03a8a4271152c8b26604ed45535954c0a45296e32445b4b87f8a5abdb2421f40b59b4ca437c4346af0f28179780d604094eb64546bee2019d903d01c6c19bdb
   languageName: node
   linkType: hard
 
+"tslib@npm:^2.4.0, tslib@npm:^2.6.2":
+  version: 2.6.3
+  resolution: "tslib@npm:2.6.3"
+  checksum: 10c0/2598aef53d9dbe711af75522464b2104724d6467b26a60f2bdac8297d2b5f1f6b86a71f61717384aa8fd897240467aaa7bcc36a0700a0faf751293d1331db39a
+  languageName: node
+  linkType: hard
+
 "tty-browserify@npm:0.0.0":
   version: 0.0.0
   resolution: "tty-browserify@npm:0.0.0"
@@ -18009,7 +18130,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"which-typed-array@npm:^1.1.14, which-typed-array@npm:^1.1.15, which-typed-array@npm:^1.1.9":
+"which-typed-array@npm:^1.1.13, which-typed-array@npm:^1.1.14, which-typed-array@npm:^1.1.15, which-typed-array@npm:^1.1.9":
   version: 1.1.15
   resolution: "which-typed-array@npm:1.1.15"
   dependencies:

From 20fa9ce4845f1b6c8a7223f08409091808fa9bc0 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 1 Jul 2024 16:45:48 +0200
Subject: [PATCH 1443/2191] Add timeline of public posts about a trending link
 in web UI (#30840)

---
 app/javascript/mastodon/actions/timelines.js  |  1 +
 app/javascript/mastodon/api_types/statuses.ts |  1 +
 .../mastodon/components/status_list.jsx       |  1 +
 .../features/explore/components/story.jsx     |  4 +-
 .../mastodon/features/link_timeline/index.tsx | 76 +++++++++++++++++++
 app/javascript/mastodon/features/ui/index.jsx |  2 +
 .../features/ui/util/async-components.js      |  4 +
 app/javascript/mastodon/models/status.ts      |  8 ++
 config/routes.rb                              |  1 +
 9 files changed, 97 insertions(+), 1 deletion(-)
 create mode 100644 app/javascript/mastodon/features/link_timeline/index.tsx

diff --git a/app/javascript/mastodon/actions/timelines.js b/app/javascript/mastodon/actions/timelines.js
index 4ca3c3a151dd6f..f0ea46118e01a6 100644
--- a/app/javascript/mastodon/actions/timelines.js
+++ b/app/javascript/mastodon/actions/timelines.js
@@ -158,6 +158,7 @@ export const expandAccountTimeline         = (accountId, { maxId, withReplies, t
 export const expandAccountFeaturedTimeline = (accountId, { tagged } = {}) => expandTimeline(`account:${accountId}:pinned${tagged ? `:${tagged}` : ''}`, `/api/v1/accounts/${accountId}/statuses`, { pinned: true, tagged });
 export const expandAccountMediaTimeline    = (accountId, { maxId } = {}) => expandTimeline(`account:${accountId}:media`, `/api/v1/accounts/${accountId}/statuses`, { max_id: maxId, only_media: true, limit: 40 });
 export const expandListTimeline            = (id, { maxId } = {}, done = noOp) => expandTimeline(`list:${id}`, `/api/v1/timelines/list/${id}`, { max_id: maxId }, done);
+export const expandLinkTimeline            = (url, { maxId } = {}, done = noOp) => expandTimeline(`link:${url}`, `/api/v1/timelines/link`, { url, max_id: maxId }, done);
 export const expandHashtagTimeline         = (hashtag, { maxId, tags, local } = {}, done = noOp) => {
   return expandTimeline(`hashtag:${hashtag}${local ? ':local' : ''}`, `/api/v1/timelines/tag/${hashtag}`, {
     max_id: maxId,
diff --git a/app/javascript/mastodon/api_types/statuses.ts b/app/javascript/mastodon/api_types/statuses.ts
index db4e20506fedf3..a934faeb7a7001 100644
--- a/app/javascript/mastodon/api_types/statuses.ts
+++ b/app/javascript/mastodon/api_types/statuses.ts
@@ -44,6 +44,7 @@ export interface ApiPreviewCardJSON {
   type: string;
   author_name: string;
   author_url: string;
+  author_account?: ApiAccountJSON;
   provider_name: string;
   provider_url: string;
   html: string;
diff --git a/app/javascript/mastodon/components/status_list.jsx b/app/javascript/mastodon/components/status_list.jsx
index 3ed20f65eb3f2b..fee6675faa2906 100644
--- a/app/javascript/mastodon/components/status_list.jsx
+++ b/app/javascript/mastodon/components/status_list.jsx
@@ -33,6 +33,7 @@ export default class StatusList extends ImmutablePureComponent {
     withCounters: PropTypes.bool,
     timelineId: PropTypes.string,
     lastId: PropTypes.string,
+    bindToDocument: PropTypes.bool,
   };
 
   static defaultProps = {
diff --git a/app/javascript/mastodon/features/explore/components/story.jsx b/app/javascript/mastodon/features/explore/components/story.jsx
index a2cae942d4b630..125df412a14b78 100644
--- a/app/javascript/mastodon/features/explore/components/story.jsx
+++ b/app/javascript/mastodon/features/explore/components/story.jsx
@@ -4,6 +4,8 @@ import { useState, useCallback } from 'react';
 import { FormattedMessage } from 'react-intl';
 
 import classNames from 'classnames';
+import { Link } from 'react-router-dom';
+
 
 
 import { Blurhash } from 'mastodon/components/blurhash';
@@ -57,7 +59,7 @@ export const Story = ({
 
         <div className='story__details__shared'>
           {author ? <FormattedMessage id='link_preview.author' className='story__details__shared__author' defaultMessage='By {name}' values={{ name: authorAccount ? <AuthorLink accountId={authorAccount} /> : <strong>{author}</strong> }} /> : <span />}
-          {typeof sharedTimes === 'number' ? <span className='story__details__shared__pill'><ShortNumber value={sharedTimes} renderer={sharesCountRenderer} /></span> : <Skeleton width='10ch' />}
+          {typeof sharedTimes === 'number' ? <Link className='story__details__shared__pill' to={`/links/${encodeURIComponent(url)}`}><ShortNumber value={sharedTimes} renderer={sharesCountRenderer} /></Link> : <Skeleton width='10ch' />}
         </div>
       </div>
 
diff --git a/app/javascript/mastodon/features/link_timeline/index.tsx b/app/javascript/mastodon/features/link_timeline/index.tsx
new file mode 100644
index 00000000000000..dd726dac1ace2c
--- /dev/null
+++ b/app/javascript/mastodon/features/link_timeline/index.tsx
@@ -0,0 +1,76 @@
+import { useRef, useEffect, useCallback } from 'react';
+
+import { Helmet } from 'react-helmet';
+import { useParams } from 'react-router-dom';
+
+import ExploreIcon from '@/material-icons/400-24px/explore.svg?react';
+import { expandLinkTimeline } from 'mastodon/actions/timelines';
+import Column from 'mastodon/components/column';
+import { ColumnHeader } from 'mastodon/components/column_header';
+import StatusListContainer from 'mastodon/features/ui/containers/status_list_container';
+import type { Card } from 'mastodon/models/status';
+import { useAppDispatch, useAppSelector } from 'mastodon/store';
+
+export const LinkTimeline: React.FC<{
+  multiColumn: boolean;
+}> = ({ multiColumn }) => {
+  const { url } = useParams<{ url: string }>();
+  const decodedUrl = url ? decodeURIComponent(url) : undefined;
+  const dispatch = useAppDispatch();
+  const columnRef = useRef<Column>(null);
+  const firstStatusId = useAppSelector((state) =>
+    decodedUrl
+      ? // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
+        (state.timelines.getIn([`link:${decodedUrl}`, 'items', 0]) as string)
+      : undefined,
+  );
+  const story = useAppSelector((state) =>
+    firstStatusId
+      ? (state.statuses.getIn([firstStatusId, 'card']) as Card)
+      : undefined,
+  );
+
+  const handleHeaderClick = useCallback(() => {
+    columnRef.current?.scrollTop();
+  }, []);
+
+  const handleLoadMore = useCallback(
+    (maxId: string) => {
+      dispatch(expandLinkTimeline(decodedUrl, { maxId }));
+    },
+    [dispatch, decodedUrl],
+  );
+
+  useEffect(() => {
+    dispatch(expandLinkTimeline(decodedUrl));
+  }, [dispatch, decodedUrl]);
+
+  return (
+    <Column bindToDocument={!multiColumn} ref={columnRef} label={story?.title}>
+      <ColumnHeader
+        icon='explore'
+        iconComponent={ExploreIcon}
+        title={story?.title}
+        onClick={handleHeaderClick}
+        multiColumn={multiColumn}
+        showBackButton
+      />
+
+      <StatusListContainer
+        timelineId={`link:${decodedUrl}`}
+        onLoadMore={handleLoadMore}
+        trackScroll
+        scrollKey={`link_timeline-${decodedUrl}`}
+        bindToDocument={!multiColumn}
+      />
+
+      <Helmet>
+        <title>{story?.title}</title>
+        <meta name='robots' content='noindex' />
+      </Helmet>
+    </Column>
+  );
+};
+
+// eslint-disable-next-line import/no-default-export
+export default LinkTimeline;
diff --git a/app/javascript/mastodon/features/ui/index.jsx b/app/javascript/mastodon/features/ui/index.jsx
index b58e191ed8fc2d..d41132f9ca1e40 100644
--- a/app/javascript/mastodon/features/ui/index.jsx
+++ b/app/javascript/mastodon/features/ui/index.jsx
@@ -56,6 +56,7 @@ import {
   FavouritedStatuses,
   BookmarkedStatuses,
   FollowedTags,
+  LinkTimeline,
   ListTimeline,
   Blocks,
   DomainBlocks,
@@ -202,6 +203,7 @@ class SwitchingColumnsArea extends PureComponent {
             <WrappedRoute path='/public/remote' exact component={Firehose} componentParams={{ feedType: 'public:remote' }} content={children} />
             <WrappedRoute path={['/conversations', '/timelines/direct']} component={DirectTimeline} content={children} />
             <WrappedRoute path='/tags/:id' component={HashtagTimeline} content={children} />
+            <WrappedRoute path='/links/:url' component={LinkTimeline} content={children} />
             <WrappedRoute path='/lists/:id' component={ListTimeline} content={children} />
             <WrappedRoute path='/notifications' component={Notifications} content={children} exact />
             <WrappedRoute path='/notifications/requests' component={NotificationRequests} content={children} exact />
diff --git a/app/javascript/mastodon/features/ui/util/async-components.js b/app/javascript/mastodon/features/ui/util/async-components.js
index e1f5bfdaf60f66..b8a2359d92cd3f 100644
--- a/app/javascript/mastodon/features/ui/util/async-components.js
+++ b/app/javascript/mastodon/features/ui/util/async-components.js
@@ -201,3 +201,7 @@ export function NotificationRequests () {
 export function NotificationRequest () {
   return import(/*webpackChunkName: "features/notifications/request" */'../../notifications/request');
 }
+
+export function LinkTimeline () {
+  return import(/*webpackChunkName: "features/link_timeline" */'../../link_timeline');
+}
diff --git a/app/javascript/mastodon/models/status.ts b/app/javascript/mastodon/models/status.ts
index 7907fc34f8e186..3900df4e38e267 100644
--- a/app/javascript/mastodon/models/status.ts
+++ b/app/javascript/mastodon/models/status.ts
@@ -1,4 +1,12 @@
+import type { RecordOf } from 'immutable';
+
+import type { ApiPreviewCardJSON } from 'mastodon/api_types/statuses';
+
 export type { StatusVisibility } from 'mastodon/api_types/statuses';
 
 // Temporary until we type it correctly
 export type Status = Immutable.Map<string, unknown>;
+
+type CardShape = Required<ApiPreviewCardJSON>;
+
+export type Card = RecordOf<CardShape>;
diff --git a/config/routes.rb b/config/routes.rb
index f4662dd5da447d..4b3bd4f187a158 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -27,6 +27,7 @@ def redirect_with_vary(path)
     /public/remote
     /conversations
     /lists/(*any)
+    /links/(*any)
     /notifications/(*any)
     /favourites
     /bookmarks

From b728c0e8ce9ac3a74f116bedff85e36dd7cc6a1e Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 1 Jul 2024 17:52:01 +0200
Subject: [PATCH 1444/2191] Change hover cards to not appear until the mouse
 stops in web UI (#30850)

---
 app/javascript/hooks/useTimeout.ts            |  17 +-
 .../mastodon/components/follow_button.tsx     |   4 +-
 .../components/hover_card_account.tsx         |   2 +-
 .../components/hover_card_controller.tsx      | 145 ++++++++++++------
 .../components/conversation.jsx               |   2 +-
 .../styles/mastodon/components.scss           |   2 +
 6 files changed, 124 insertions(+), 48 deletions(-)

diff --git a/app/javascript/hooks/useTimeout.ts b/app/javascript/hooks/useTimeout.ts
index f1814ae8e3ff57..bb1e8848dd54b4 100644
--- a/app/javascript/hooks/useTimeout.ts
+++ b/app/javascript/hooks/useTimeout.ts
@@ -2,19 +2,34 @@ import { useRef, useCallback, useEffect } from 'react';
 
 export const useTimeout = () => {
   const timeoutRef = useRef<ReturnType<typeof setTimeout>>();
+  const callbackRef = useRef<() => void>();
 
   const set = useCallback((callback: () => void, delay: number) => {
     if (timeoutRef.current) {
       clearTimeout(timeoutRef.current);
     }
 
+    callbackRef.current = callback;
     timeoutRef.current = setTimeout(callback, delay);
   }, []);
 
+  const delay = useCallback((delay: number) => {
+    if (timeoutRef.current) {
+      clearTimeout(timeoutRef.current);
+    }
+
+    if (!callbackRef.current) {
+      return;
+    }
+
+    timeoutRef.current = setTimeout(callbackRef.current, delay);
+  }, []);
+
   const cancel = useCallback(() => {
     if (timeoutRef.current) {
       clearTimeout(timeoutRef.current);
       timeoutRef.current = undefined;
+      callbackRef.current = undefined;
     }
   }, []);
 
@@ -25,5 +40,5 @@ export const useTimeout = () => {
     [cancel],
   );
 
-  return [set, cancel] as const;
+  return [set, cancel, delay] as const;
 };
diff --git a/app/javascript/mastodon/components/follow_button.tsx b/app/javascript/mastodon/components/follow_button.tsx
index db59942882f4ce..62771c254780ff 100644
--- a/app/javascript/mastodon/components/follow_button.tsx
+++ b/app/javascript/mastodon/components/follow_button.tsx
@@ -27,7 +27,7 @@ const messages = defineMessages({
 });
 
 export const FollowButton: React.FC<{
-  accountId: string;
+  accountId?: string;
 }> = ({ accountId }) => {
   const intl = useIntl();
   const dispatch = useAppDispatch();
@@ -36,7 +36,7 @@ export const FollowButton: React.FC<{
     accountId ? state.accounts.get(accountId) : undefined,
   );
   const relationship = useAppSelector((state) =>
-    state.relationships.get(accountId),
+    accountId ? state.relationships.get(accountId) : undefined,
   );
   const following = relationship?.following || relationship?.requested;
 
diff --git a/app/javascript/mastodon/components/hover_card_account.tsx b/app/javascript/mastodon/components/hover_card_account.tsx
index 59f957783897af..8933e14a9875f9 100644
--- a/app/javascript/mastodon/components/hover_card_account.tsx
+++ b/app/javascript/mastodon/components/hover_card_account.tsx
@@ -17,7 +17,7 @@ import { useAppSelector, useAppDispatch } from 'mastodon/store';
 
 export const HoverCardAccount = forwardRef<
   HTMLDivElement,
-  { accountId: string }
+  { accountId?: string }
 >(({ accountId }, ref) => {
   const dispatch = useAppDispatch();
 
diff --git a/app/javascript/mastodon/components/hover_card_controller.tsx b/app/javascript/mastodon/components/hover_card_controller.tsx
index 0130390ef8f13c..5ca55ebde91049 100644
--- a/app/javascript/mastodon/components/hover_card_controller.tsx
+++ b/app/javascript/mastodon/components/hover_card_controller.tsx
@@ -12,8 +12,8 @@ import { useTimeout } from 'mastodon/../hooks/useTimeout';
 import { HoverCardAccount } from 'mastodon/components/hover_card_account';
 
 const offset = [-12, 4] as OffsetValue;
-const enterDelay = 650;
-const leaveDelay = 250;
+const enterDelay = 750;
+const leaveDelay = 150;
 const popperConfig = { strategy: 'fixed' } as UsePopperOptions;
 
 const isHoverCardAnchor = (element: HTMLElement) =>
@@ -23,78 +23,137 @@ export const HoverCardController: React.FC = () => {
   const [open, setOpen] = useState(false);
   const [accountId, setAccountId] = useState<string | undefined>();
   const [anchor, setAnchor] = useState<HTMLElement | null>(null);
-  const cardRef = useRef<HTMLDivElement>(null);
+  const cardRef = useRef<HTMLDivElement | null>(null);
   const [setLeaveTimeout, cancelLeaveTimeout] = useTimeout();
-  const [setEnterTimeout, cancelEnterTimeout] = useTimeout();
+  const [setEnterTimeout, cancelEnterTimeout, delayEnterTimeout] = useTimeout();
+  const [setScrollTimeout] = useTimeout();
   const location = useLocation();
 
-  const handleAnchorMouseEnter = useCallback(
-    (e: MouseEvent) => {
+  const handleClose = useCallback(() => {
+    cancelEnterTimeout();
+    cancelLeaveTimeout();
+    setOpen(false);
+    setAnchor(null);
+  }, [cancelEnterTimeout, cancelLeaveTimeout, setOpen, setAnchor]);
+
+  useEffect(() => {
+    handleClose();
+  }, [handleClose, location]);
+
+  useEffect(() => {
+    let isScrolling = false;
+    let currentAnchor: HTMLElement | null = null;
+
+    const open = (target: HTMLElement) => {
+      target.setAttribute('aria-describedby', 'hover-card');
+      setOpen(true);
+      setAnchor(target);
+      setAccountId(target.getAttribute('data-hover-card-account') ?? undefined);
+    };
+
+    const close = () => {
+      currentAnchor?.removeAttribute('aria-describedby');
+      currentAnchor = null;
+      setOpen(false);
+      setAnchor(null);
+      setAccountId(undefined);
+    };
+
+    const handleMouseEnter = (e: MouseEvent) => {
       const { target } = e;
 
-      if (target instanceof HTMLElement && isHoverCardAnchor(target)) {
+      // We've exited the window
+      if (!(target instanceof HTMLElement)) {
+        close();
+        return;
+      }
+
+      // We've entered an anchor
+      if (!isScrolling && isHoverCardAnchor(target)) {
         cancelLeaveTimeout();
 
+        currentAnchor?.removeAttribute('aria-describedby');
+        currentAnchor = target;
+
         setEnterTimeout(() => {
-          target.setAttribute('aria-describedby', 'hover-card');
-          setAnchor(target);
-          setOpen(true);
-          setAccountId(
-            target.getAttribute('data-hover-card-account') ?? undefined,
-          );
+          open(target);
         }, enterDelay);
       }
 
-      if (target === cardRef.current?.parentNode) {
+      // We've entered the hover card
+      if (
+        !isScrolling &&
+        (target === currentAnchor || target === cardRef.current)
+      ) {
         cancelLeaveTimeout();
       }
-    },
-    [cancelLeaveTimeout, setEnterTimeout, setOpen, setAccountId, setAnchor],
-  );
+    };
 
-  const handleAnchorMouseLeave = useCallback(
-    (e: MouseEvent) => {
-      if (e.target === anchor || e.target === cardRef.current?.parentNode) {
+    const handleMouseLeave = (e: MouseEvent) => {
+      if (!currentAnchor) {
+        return;
+      }
+
+      if (e.target === currentAnchor || e.target === cardRef.current) {
         cancelEnterTimeout();
 
         setLeaveTimeout(() => {
-          anchor?.removeAttribute('aria-describedby');
-          setOpen(false);
-          setAnchor(null);
+          close();
         }, leaveDelay);
       }
-    },
-    [cancelEnterTimeout, setLeaveTimeout, setOpen, setAnchor, anchor],
-  );
+    };
 
-  const handleClose = useCallback(() => {
-    cancelEnterTimeout();
-    cancelLeaveTimeout();
-    setOpen(false);
-    setAnchor(null);
-  }, [cancelEnterTimeout, cancelLeaveTimeout, setOpen, setAnchor]);
+    const handleScrollEnd = () => {
+      isScrolling = false;
+    };
 
-  useEffect(() => {
-    handleClose();
-  }, [handleClose, location]);
+    const handleScroll = () => {
+      isScrolling = true;
+      cancelEnterTimeout();
+      setScrollTimeout(handleScrollEnd, 100);
+    };
 
-  useEffect(() => {
-    document.body.addEventListener('mouseenter', handleAnchorMouseEnter, {
+    const handleMouseMove = () => {
+      delayEnterTimeout(enterDelay);
+    };
+
+    document.body.addEventListener('mouseenter', handleMouseEnter, {
+      passive: true,
+      capture: true,
+    });
+
+    document.body.addEventListener('mousemove', handleMouseMove, {
+      passive: true,
+      capture: false,
+    });
+
+    document.body.addEventListener('mouseleave', handleMouseLeave, {
       passive: true,
       capture: true,
     });
-    document.body.addEventListener('mouseleave', handleAnchorMouseLeave, {
+
+    document.addEventListener('scroll', handleScroll, {
       passive: true,
       capture: true,
     });
 
     return () => {
-      document.body.removeEventListener('mouseenter', handleAnchorMouseEnter);
-      document.body.removeEventListener('mouseleave', handleAnchorMouseLeave);
+      document.body.removeEventListener('mouseenter', handleMouseEnter);
+      document.body.removeEventListener('mousemove', handleMouseMove);
+      document.body.removeEventListener('mouseleave', handleMouseLeave);
+      document.removeEventListener('scroll', handleScroll);
     };
-  }, [handleAnchorMouseEnter, handleAnchorMouseLeave]);
-
-  if (!accountId) return null;
+  }, [
+    setEnterTimeout,
+    setLeaveTimeout,
+    setScrollTimeout,
+    cancelEnterTimeout,
+    cancelLeaveTimeout,
+    delayEnterTimeout,
+    setOpen,
+    setAccountId,
+    setAnchor,
+  ]);
 
   return (
     <Overlay
diff --git a/app/javascript/mastodon/features/direct_timeline/components/conversation.jsx b/app/javascript/mastodon/features/direct_timeline/components/conversation.jsx
index 3af89f99745ff7..a2b72f7162af04 100644
--- a/app/javascript/mastodon/features/direct_timeline/components/conversation.jsx
+++ b/app/javascript/mastodon/features/direct_timeline/components/conversation.jsx
@@ -163,7 +163,7 @@ export const Conversation = ({ conversation, scrollKey, onMoveUp, onMoveDown })
   menu.push({ text: intl.formatMessage(messages.delete), action: handleDelete });
 
   const names = accounts.map(a => (
-    <Link to={`/@${a.get('acct')}`} key={a.get('id')} title={a.get('acct')}>
+    <Link to={`/@${a.get('acct')}`} key={a.get('id')} data-hover-card-account={a.get('id')}>
       <bdi>
         <strong
           className='display-name__html'
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index cbf9314ff83de7..12eac79b984dfa 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -10468,12 +10468,14 @@ noscript {
         overflow: hidden;
         white-space: nowrap;
         text-overflow: ellipsis;
+        text-align: end;
       }
 
       &.verified {
         dd {
           display: flex;
           align-items: center;
+          justify-content: flex-end;
           gap: 4px;
           overflow: hidden;
           white-space: nowrap;

From d3f504245cab5a9a0e89262e0a1398d035dffac9 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 1 Jul 2024 20:10:22 +0200
Subject: [PATCH 1445/2191] Fix missing confirmation when unfollowing from
 hover card in web UI (#30879)

---
 .../mastodon/components/follow_button.tsx     | 31 +++++++++++++------
 .../features/account/components/header.jsx    |  6 ++--
 .../containers/header_container.jsx           | 12 +------
 3 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/app/javascript/mastodon/components/follow_button.tsx b/app/javascript/mastodon/components/follow_button.tsx
index 62771c254780ff..ecc4e1ee175f63 100644
--- a/app/javascript/mastodon/components/follow_button.tsx
+++ b/app/javascript/mastodon/components/follow_button.tsx
@@ -1,6 +1,6 @@
 import { useCallback, useEffect } from 'react';
 
-import { useIntl, defineMessages } from 'react-intl';
+import { useIntl, defineMessages, FormattedMessage } from 'react-intl';
 
 import { useIdentity } from '@/mastodon/identity_context';
 import {
@@ -19,10 +19,6 @@ const messages = defineMessages({
   follow: { id: 'account.follow', defaultMessage: 'Follow' },
   followBack: { id: 'account.follow_back', defaultMessage: 'Follow back' },
   mutual: { id: 'account.mutual', defaultMessage: 'Mutual' },
-  cancel_follow_request: {
-    id: 'account.cancel_follow_request',
-    defaultMessage: 'Withdraw follow request',
-  },
   edit_profile: { id: 'account.edit_profile', defaultMessage: 'Edit profile' },
 });
 
@@ -65,11 +61,28 @@ export const FollowButton: React.FC<{
     if (accountId === me) {
       return;
     } else if (relationship.following || relationship.requested) {
-      dispatch(unfollowAccount(accountId));
+      dispatch(
+        openModal({
+          modalType: 'CONFIRM',
+          modalProps: {
+            message: (
+              <FormattedMessage
+                id='confirmations.unfollow.message'
+                defaultMessage='Are you sure you want to unfollow {name}?'
+                values={{ name: <strong>@{account?.acct}</strong> }}
+              />
+            ),
+            confirm: intl.formatMessage(messages.unfollow),
+            onConfirm: () => {
+              dispatch(unfollowAccount(accountId));
+            },
+          },
+        }),
+      );
     } else {
       dispatch(followAccount(accountId));
     }
-  }, [dispatch, accountId, relationship, account, signedIn]);
+  }, [dispatch, intl, accountId, relationship, account, signedIn]);
 
   let label;
 
@@ -79,13 +92,11 @@ export const FollowButton: React.FC<{
     label = intl.formatMessage(messages.edit_profile);
   } else if (!relationship) {
     label = <LoadingIndicator />;
-  } else if (relationship.requested) {
-    label = intl.formatMessage(messages.cancel_follow_request);
   } else if (relationship.following && relationship.followed_by) {
     label = intl.formatMessage(messages.mutual);
   } else if (!relationship.following && relationship.followed_by) {
     label = intl.formatMessage(messages.followBack);
-  } else if (relationship.following) {
+  } else if (relationship.following || relationship.requested) {
     label = intl.formatMessage(messages.unfollow);
   } else {
     label = intl.formatMessage(messages.follow);
diff --git a/app/javascript/mastodon/features/account/components/header.jsx b/app/javascript/mastodon/features/account/components/header.jsx
index b10ef6ef760e03..1326874e50a796 100644
--- a/app/javascript/mastodon/features/account/components/header.jsx
+++ b/app/javascript/mastodon/features/account/components/header.jsx
@@ -94,7 +94,7 @@ const messageForFollowButton = relationship => {
     return messages.mutual;
   } else if (!relationship.get('following') && relationship.get('followed_by')) {
     return messages.followBack;
-  } else if (relationship.get('following')) {
+  } else if (relationship.get('following') || relationship.get('requested')) {
     return messages.unfollow;
   } else {
     return messages.follow;
@@ -291,10 +291,8 @@ class Header extends ImmutablePureComponent {
     if (me !== account.get('id')) {
       if (signedIn && !account.get('relationship')) { // Wait until the relationship is loaded
         actionBtn = <Button disabled><LoadingIndicator /></Button>;
-      } else if (account.getIn(['relationship', 'requested'])) {
-        actionBtn = <Button text={intl.formatMessage(messages.cancel_follow_request)} title={intl.formatMessage(messages.requested)} onClick={this.props.onFollow} />;
       } else if (!account.getIn(['relationship', 'blocking'])) {
-        actionBtn = <Button disabled={account.getIn(['relationship', 'blocked_by'])} className={classNames({ 'button--destructive': account.getIn(['relationship', 'following']) })} text={intl.formatMessage(messageForFollowButton(account.get('relationship')))} onClick={signedIn ? this.props.onFollow : this.props.onInteractionModal} />;
+        actionBtn = <Button disabled={account.getIn(['relationship', 'blocked_by'])} className={classNames({ 'button--destructive': (account.getIn(['relationship', 'following']) || account.getIn(['relationship', 'requested'])) })} text={intl.formatMessage(messageForFollowButton(account.get('relationship')))} onClick={signedIn ? this.props.onFollow : this.props.onInteractionModal} />;
       } else if (account.getIn(['relationship', 'blocking'])) {
         actionBtn = <Button text={intl.formatMessage(messages.unblock, { name: account.get('username') })} onClick={this.props.onBlock} />;
       }
diff --git a/app/javascript/mastodon/features/account_timeline/containers/header_container.jsx b/app/javascript/mastodon/features/account_timeline/containers/header_container.jsx
index 73fd62841b33a5..d55d8c58e416d6 100644
--- a/app/javascript/mastodon/features/account_timeline/containers/header_container.jsx
+++ b/app/javascript/mastodon/features/account_timeline/containers/header_container.jsx
@@ -25,7 +25,6 @@ import { makeGetAccount, getAccountHidden } from '../../../selectors';
 import Header from '../components/header';
 
 const messages = defineMessages({
-  cancelFollowRequestConfirm: { id: 'confirmations.cancel_follow_request.confirm', defaultMessage: 'Withdraw request' },
   unfollowConfirm: { id: 'confirmations.unfollow.confirm', defaultMessage: 'Unfollow' },
   blockDomainConfirm: { id: 'confirmations.domain_block.confirm', defaultMessage: 'Block entire domain' },
 });
@@ -45,7 +44,7 @@ const makeMapStateToProps = () => {
 const mapDispatchToProps = (dispatch, { intl }) => ({
 
   onFollow (account) {
-    if (account.getIn(['relationship', 'following'])) {
+    if (account.getIn(['relationship', 'following']) || account.getIn(['relationship', 'requested'])) {
       dispatch(openModal({
         modalType: 'CONFIRM',
         modalProps: {
@@ -54,15 +53,6 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
           onConfirm: () => dispatch(unfollowAccount(account.get('id'))),
         },
       }));
-    } else if (account.getIn(['relationship', 'requested'])) {
-      dispatch(openModal({
-        modalType: 'CONFIRM',
-        modalProps: {
-          message: <FormattedMessage id='confirmations.cancel_follow_request.message' defaultMessage='Are you sure you want to withdraw your request to follow {name}?' values={{ name: <strong>@{account.get('acct')}</strong> }} />,
-          confirm: intl.formatMessage(messages.cancelFollowRequestConfirm),
-          onConfirm: () => dispatch(unfollowAccount(account.get('id'))),
-        },
-      }));
     } else {
       dispatch(followAccount(account.get('id')));
     }

From dcfd39991b78d308d6a92ebb8c6e33c860747541 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 1 Jul 2024 17:52:01 +0200
Subject: [PATCH 1446/2191] [Glitch] Change hover cards to not appear until the
 mouse stops in web UI

Port b728c0e8ce9ac3a74f116bedff85e36dd7cc6a1e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../glitch/components/follow_button.tsx       |   4 +-
 .../glitch/components/hover_card_account.tsx  |   2 +-
 .../components/hover_card_controller.tsx      | 145 ++++++++++++------
 .../components/conversation.jsx               |   2 +-
 .../flavours/glitch/hooks/useTimeout.ts       |  17 +-
 .../flavours/glitch/styles/components.scss    |   2 +
 6 files changed, 124 insertions(+), 48 deletions(-)

diff --git a/app/javascript/flavours/glitch/components/follow_button.tsx b/app/javascript/flavours/glitch/components/follow_button.tsx
index 5c9cd2c0677a3b..151c597adbd676 100644
--- a/app/javascript/flavours/glitch/components/follow_button.tsx
+++ b/app/javascript/flavours/glitch/components/follow_button.tsx
@@ -26,7 +26,7 @@ const messages = defineMessages({
 });
 
 export const FollowButton: React.FC<{
-  accountId: string;
+  accountId?: string;
 }> = ({ accountId }) => {
   const intl = useIntl();
   const dispatch = useAppDispatch();
@@ -35,7 +35,7 @@ export const FollowButton: React.FC<{
     accountId ? state.accounts.get(accountId) : undefined,
   );
   const relationship = useAppSelector((state) =>
-    state.relationships.get(accountId),
+    accountId ? state.relationships.get(accountId) : undefined,
   );
   const following = relationship?.following || relationship?.requested;
 
diff --git a/app/javascript/flavours/glitch/components/hover_card_account.tsx b/app/javascript/flavours/glitch/components/hover_card_account.tsx
index a62128e17bd100..56f431a7867156 100644
--- a/app/javascript/flavours/glitch/components/hover_card_account.tsx
+++ b/app/javascript/flavours/glitch/components/hover_card_account.tsx
@@ -17,7 +17,7 @@ import { useAppSelector, useAppDispatch } from 'flavours/glitch/store';
 
 export const HoverCardAccount = forwardRef<
   HTMLDivElement,
-  { accountId: string }
+  { accountId?: string }
 >(({ accountId }, ref) => {
   const dispatch = useAppDispatch();
 
diff --git a/app/javascript/flavours/glitch/components/hover_card_controller.tsx b/app/javascript/flavours/glitch/components/hover_card_controller.tsx
index 6e11d283815776..347dcd4f2f99a4 100644
--- a/app/javascript/flavours/glitch/components/hover_card_controller.tsx
+++ b/app/javascript/flavours/glitch/components/hover_card_controller.tsx
@@ -12,8 +12,8 @@ import { HoverCardAccount } from 'flavours/glitch/components/hover_card_account'
 import { useTimeout } from 'flavours/glitch/hooks/useTimeout';
 
 const offset = [-12, 4] as OffsetValue;
-const enterDelay = 650;
-const leaveDelay = 250;
+const enterDelay = 750;
+const leaveDelay = 150;
 const popperConfig = { strategy: 'fixed' } as UsePopperOptions;
 
 const isHoverCardAnchor = (element: HTMLElement) =>
@@ -23,78 +23,137 @@ export const HoverCardController: React.FC = () => {
   const [open, setOpen] = useState(false);
   const [accountId, setAccountId] = useState<string | undefined>();
   const [anchor, setAnchor] = useState<HTMLElement | null>(null);
-  const cardRef = useRef<HTMLDivElement>(null);
+  const cardRef = useRef<HTMLDivElement | null>(null);
   const [setLeaveTimeout, cancelLeaveTimeout] = useTimeout();
-  const [setEnterTimeout, cancelEnterTimeout] = useTimeout();
+  const [setEnterTimeout, cancelEnterTimeout, delayEnterTimeout] = useTimeout();
+  const [setScrollTimeout] = useTimeout();
   const location = useLocation();
 
-  const handleAnchorMouseEnter = useCallback(
-    (e: MouseEvent) => {
+  const handleClose = useCallback(() => {
+    cancelEnterTimeout();
+    cancelLeaveTimeout();
+    setOpen(false);
+    setAnchor(null);
+  }, [cancelEnterTimeout, cancelLeaveTimeout, setOpen, setAnchor]);
+
+  useEffect(() => {
+    handleClose();
+  }, [handleClose, location]);
+
+  useEffect(() => {
+    let isScrolling = false;
+    let currentAnchor: HTMLElement | null = null;
+
+    const open = (target: HTMLElement) => {
+      target.setAttribute('aria-describedby', 'hover-card');
+      setOpen(true);
+      setAnchor(target);
+      setAccountId(target.getAttribute('data-hover-card-account') ?? undefined);
+    };
+
+    const close = () => {
+      currentAnchor?.removeAttribute('aria-describedby');
+      currentAnchor = null;
+      setOpen(false);
+      setAnchor(null);
+      setAccountId(undefined);
+    };
+
+    const handleMouseEnter = (e: MouseEvent) => {
       const { target } = e;
 
-      if (target instanceof HTMLElement && isHoverCardAnchor(target)) {
+      // We've exited the window
+      if (!(target instanceof HTMLElement)) {
+        close();
+        return;
+      }
+
+      // We've entered an anchor
+      if (!isScrolling && isHoverCardAnchor(target)) {
         cancelLeaveTimeout();
 
+        currentAnchor?.removeAttribute('aria-describedby');
+        currentAnchor = target;
+
         setEnterTimeout(() => {
-          target.setAttribute('aria-describedby', 'hover-card');
-          setAnchor(target);
-          setOpen(true);
-          setAccountId(
-            target.getAttribute('data-hover-card-account') ?? undefined,
-          );
+          open(target);
         }, enterDelay);
       }
 
-      if (target === cardRef.current?.parentNode) {
+      // We've entered the hover card
+      if (
+        !isScrolling &&
+        (target === currentAnchor || target === cardRef.current)
+      ) {
         cancelLeaveTimeout();
       }
-    },
-    [cancelLeaveTimeout, setEnterTimeout, setOpen, setAccountId, setAnchor],
-  );
+    };
 
-  const handleAnchorMouseLeave = useCallback(
-    (e: MouseEvent) => {
-      if (e.target === anchor || e.target === cardRef.current?.parentNode) {
+    const handleMouseLeave = (e: MouseEvent) => {
+      if (!currentAnchor) {
+        return;
+      }
+
+      if (e.target === currentAnchor || e.target === cardRef.current) {
         cancelEnterTimeout();
 
         setLeaveTimeout(() => {
-          anchor?.removeAttribute('aria-describedby');
-          setOpen(false);
-          setAnchor(null);
+          close();
         }, leaveDelay);
       }
-    },
-    [cancelEnterTimeout, setLeaveTimeout, setOpen, setAnchor, anchor],
-  );
+    };
 
-  const handleClose = useCallback(() => {
-    cancelEnterTimeout();
-    cancelLeaveTimeout();
-    setOpen(false);
-    setAnchor(null);
-  }, [cancelEnterTimeout, cancelLeaveTimeout, setOpen, setAnchor]);
+    const handleScrollEnd = () => {
+      isScrolling = false;
+    };
 
-  useEffect(() => {
-    handleClose();
-  }, [handleClose, location]);
+    const handleScroll = () => {
+      isScrolling = true;
+      cancelEnterTimeout();
+      setScrollTimeout(handleScrollEnd, 100);
+    };
 
-  useEffect(() => {
-    document.body.addEventListener('mouseenter', handleAnchorMouseEnter, {
+    const handleMouseMove = () => {
+      delayEnterTimeout(enterDelay);
+    };
+
+    document.body.addEventListener('mouseenter', handleMouseEnter, {
+      passive: true,
+      capture: true,
+    });
+
+    document.body.addEventListener('mousemove', handleMouseMove, {
+      passive: true,
+      capture: false,
+    });
+
+    document.body.addEventListener('mouseleave', handleMouseLeave, {
       passive: true,
       capture: true,
     });
-    document.body.addEventListener('mouseleave', handleAnchorMouseLeave, {
+
+    document.addEventListener('scroll', handleScroll, {
       passive: true,
       capture: true,
     });
 
     return () => {
-      document.body.removeEventListener('mouseenter', handleAnchorMouseEnter);
-      document.body.removeEventListener('mouseleave', handleAnchorMouseLeave);
+      document.body.removeEventListener('mouseenter', handleMouseEnter);
+      document.body.removeEventListener('mousemove', handleMouseMove);
+      document.body.removeEventListener('mouseleave', handleMouseLeave);
+      document.removeEventListener('scroll', handleScroll);
     };
-  }, [handleAnchorMouseEnter, handleAnchorMouseLeave]);
-
-  if (!accountId) return null;
+  }, [
+    setEnterTimeout,
+    setLeaveTimeout,
+    setScrollTimeout,
+    cancelEnterTimeout,
+    cancelLeaveTimeout,
+    delayEnterTimeout,
+    setOpen,
+    setAccountId,
+    setAnchor,
+  ]);
 
   return (
     <Overlay
diff --git a/app/javascript/flavours/glitch/features/direct_timeline/components/conversation.jsx b/app/javascript/flavours/glitch/features/direct_timeline/components/conversation.jsx
index 458a547d020c56..7071c8719d7292 100644
--- a/app/javascript/flavours/glitch/features/direct_timeline/components/conversation.jsx
+++ b/app/javascript/flavours/glitch/features/direct_timeline/components/conversation.jsx
@@ -185,7 +185,7 @@ export const Conversation = ({ conversation, scrollKey, onMoveUp, onMoveDown })
   menu.push({ text: intl.formatMessage(messages.delete), action: handleDelete });
 
   const names = accounts.map(a => (
-    <Permalink to={`/@${a.get('acct')}`} href={a.get('url')} key={a.get('id')} title={a.get('acct')}>
+    <Permalink to={`/@${a.get('acct')}`} href={a.get('url')} key={a.get('id')} data-hover-card-account={a.get('id')}>
       <bdi>
         <strong
           className='display-name__html'
diff --git a/app/javascript/flavours/glitch/hooks/useTimeout.ts b/app/javascript/flavours/glitch/hooks/useTimeout.ts
index f1814ae8e3ff57..bb1e8848dd54b4 100644
--- a/app/javascript/flavours/glitch/hooks/useTimeout.ts
+++ b/app/javascript/flavours/glitch/hooks/useTimeout.ts
@@ -2,19 +2,34 @@ import { useRef, useCallback, useEffect } from 'react';
 
 export const useTimeout = () => {
   const timeoutRef = useRef<ReturnType<typeof setTimeout>>();
+  const callbackRef = useRef<() => void>();
 
   const set = useCallback((callback: () => void, delay: number) => {
     if (timeoutRef.current) {
       clearTimeout(timeoutRef.current);
     }
 
+    callbackRef.current = callback;
     timeoutRef.current = setTimeout(callback, delay);
   }, []);
 
+  const delay = useCallback((delay: number) => {
+    if (timeoutRef.current) {
+      clearTimeout(timeoutRef.current);
+    }
+
+    if (!callbackRef.current) {
+      return;
+    }
+
+    timeoutRef.current = setTimeout(callbackRef.current, delay);
+  }, []);
+
   const cancel = useCallback(() => {
     if (timeoutRef.current) {
       clearTimeout(timeoutRef.current);
       timeoutRef.current = undefined;
+      callbackRef.current = undefined;
     }
   }, []);
 
@@ -25,5 +40,5 @@ export const useTimeout = () => {
     [cancel],
   );
 
-  return [set, cancel] as const;
+  return [set, cancel, delay] as const;
 };
diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index 276025934698d7..5c2a130cb976a4 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -11022,12 +11022,14 @@ noscript {
         overflow: hidden;
         white-space: nowrap;
         text-overflow: ellipsis;
+        text-align: end;
       }
 
       &.verified {
         dd {
           display: flex;
           align-items: center;
+          justify-content: flex-end;
           gap: 4px;
           overflow: hidden;
           white-space: nowrap;

From a70b1141d6d3039ab43366561037ea28a2747d6f Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 1 Jul 2024 20:10:22 +0200
Subject: [PATCH 1447/2191] [Glitch] Fix missing confirmation when unfollowing
 from hover card in web UI

Port d3f504245cab5a9a0e89262e0a1398d035dffac9 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../glitch/components/follow_button.tsx       | 31 +++++++++++++------
 .../containers/header_container.jsx           | 12 +------
 2 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/app/javascript/flavours/glitch/components/follow_button.tsx b/app/javascript/flavours/glitch/components/follow_button.tsx
index 151c597adbd676..a6b206470327ee 100644
--- a/app/javascript/flavours/glitch/components/follow_button.tsx
+++ b/app/javascript/flavours/glitch/components/follow_button.tsx
@@ -1,6 +1,6 @@
 import { useCallback, useEffect } from 'react';
 
-import { useIntl, defineMessages } from 'react-intl';
+import { useIntl, defineMessages, FormattedMessage } from 'react-intl';
 
 import { useIdentity } from '@/flavours/glitch/identity_context';
 import {
@@ -18,10 +18,6 @@ const messages = defineMessages({
   unfollow: { id: 'account.unfollow', defaultMessage: 'Unfollow' },
   follow: { id: 'account.follow', defaultMessage: 'Follow' },
   followBack: { id: 'account.follow_back', defaultMessage: 'Follow back' },
-  cancel_follow_request: {
-    id: 'account.cancel_follow_request',
-    defaultMessage: 'Withdraw follow request',
-  },
   edit_profile: { id: 'account.edit_profile', defaultMessage: 'Edit profile' },
 });
 
@@ -64,11 +60,28 @@ export const FollowButton: React.FC<{
     if (accountId === me) {
       return;
     } else if (relationship.following || relationship.requested) {
-      dispatch(unfollowAccount(accountId));
+      dispatch(
+        openModal({
+          modalType: 'CONFIRM',
+          modalProps: {
+            message: (
+              <FormattedMessage
+                id='confirmations.unfollow.message'
+                defaultMessage='Are you sure you want to unfollow {name}?'
+                values={{ name: <strong>@{account?.acct}</strong> }}
+              />
+            ),
+            confirm: intl.formatMessage(messages.unfollow),
+            onConfirm: () => {
+              dispatch(unfollowAccount(accountId));
+            },
+          },
+        }),
+      );
     } else {
       dispatch(followAccount(accountId));
     }
-  }, [dispatch, accountId, relationship, account, signedIn]);
+  }, [dispatch, intl, accountId, relationship, account, signedIn]);
 
   let label;
 
@@ -78,11 +91,9 @@ export const FollowButton: React.FC<{
     label = intl.formatMessage(messages.edit_profile);
   } else if (!relationship) {
     label = <LoadingIndicator />;
-  } else if (relationship.requested) {
-    label = intl.formatMessage(messages.cancel_follow_request);
   } else if (!relationship.following && relationship.followed_by) {
     label = intl.formatMessage(messages.followBack);
-  } else if (relationship.following) {
+  } else if (relationship.following || relationship.requested) {
     label = intl.formatMessage(messages.unfollow);
   } else {
     label = intl.formatMessage(messages.follow);
diff --git a/app/javascript/flavours/glitch/features/account_timeline/containers/header_container.jsx b/app/javascript/flavours/glitch/features/account_timeline/containers/header_container.jsx
index a87c7fd3e4bd8e..1e85a08cd996ea 100644
--- a/app/javascript/flavours/glitch/features/account_timeline/containers/header_container.jsx
+++ b/app/javascript/flavours/glitch/features/account_timeline/containers/header_container.jsx
@@ -23,7 +23,6 @@ import { makeGetAccount, getAccountHidden } from '../../../selectors';
 import Header from '../components/header';
 
 const messages = defineMessages({
-  cancelFollowRequestConfirm: { id: 'confirmations.cancel_follow_request.confirm', defaultMessage: 'Withdraw request' },
   unfollowConfirm: { id: 'confirmations.unfollow.confirm', defaultMessage: 'Unfollow' },
   blockDomainConfirm: { id: 'confirmations.domain_block.confirm', defaultMessage: 'Block entire domain' },
 });
@@ -43,7 +42,7 @@ const makeMapStateToProps = () => {
 const mapDispatchToProps = (dispatch, { intl }) => ({
 
   onFollow (account) {
-    if (account.getIn(['relationship', 'following'])) {
+    if (account.getIn(['relationship', 'following']) || account.getIn(['relationship', 'requested'])) {
       dispatch(openModal({
         modalType: 'CONFIRM',
         modalProps: {
@@ -52,15 +51,6 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
           onConfirm: () => dispatch(unfollowAccount(account.get('id'))),
         },
       }));
-    } else if (account.getIn(['relationship', 'requested'])) {
-      dispatch(openModal({
-        modalType: 'CONFIRM',
-        modalProps: {
-          message: <FormattedMessage id='confirmations.cancel_follow_request.message' defaultMessage='Are you sure you want to withdraw your request to follow {name}?' values={{ name: <strong>@{account.get('acct')}</strong> }} />,
-          confirm: intl.formatMessage(messages.cancelFollowRequestConfirm),
-          onConfirm: () => dispatch(unfollowAccount(account.get('id'))),
-        },
-      }));
     } else {
       dispatch(followAccount(account.get('id')));
     }

From 4c5067e3a45a446491481b370702885bc07bc77c Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 1 Jul 2024 16:45:48 +0200
Subject: [PATCH 1448/2191] [Glitch] Add timeline of public posts about a
 trending link in web UI

Port 20fa9ce4845f1b6c8a7223f08409091808fa9bc0 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/actions/timelines.js      |  1 +
 .../flavours/glitch/api_types/statuses.ts     |  1 +
 .../glitch/components/status_list.jsx         |  1 +
 .../features/explore/components/story.jsx     |  4 +-
 .../glitch/features/link_timeline/index.tsx   | 77 +++++++++++++++++++
 .../flavours/glitch/features/ui/index.jsx     |  2 +
 .../features/ui/util/async-components.js      |  4 +
 .../flavours/glitch/models/status.ts          |  8 ++
 8 files changed, 97 insertions(+), 1 deletion(-)
 create mode 100644 app/javascript/flavours/glitch/features/link_timeline/index.tsx

diff --git a/app/javascript/flavours/glitch/actions/timelines.js b/app/javascript/flavours/glitch/actions/timelines.js
index d3ce4c575cf01a..eb5050f1524f0a 100644
--- a/app/javascript/flavours/glitch/actions/timelines.js
+++ b/app/javascript/flavours/glitch/actions/timelines.js
@@ -170,6 +170,7 @@ export const expandAccountTimeline         = (accountId, { maxId, withReplies, t
 export const expandAccountFeaturedTimeline = (accountId, { tagged } = {}) => expandTimeline(`account:${accountId}:pinned`, `/api/v1/accounts/${accountId}/statuses`, { pinned: true, tagged });
 export const expandAccountMediaTimeline    = (accountId, { maxId } = {}) => expandTimeline(`account:${accountId}:media`, `/api/v1/accounts/${accountId}/statuses`, { max_id: maxId, only_media: true, limit: 40 });
 export const expandListTimeline            = (id, { maxId } = {}, done = noOp) => expandTimeline(`list:${id}`, `/api/v1/timelines/list/${id}`, { max_id: maxId }, done);
+export const expandLinkTimeline            = (url, { maxId } = {}, done = noOp) => expandTimeline(`link:${url}`, `/api/v1/timelines/link`, { url, max_id: maxId }, done);
 export const expandHashtagTimeline         = (hashtag, { maxId, tags, local } = {}, done = noOp) => {
   return expandTimeline(`hashtag:${hashtag}${local ? ':local' : ''}`, `/api/v1/timelines/tag/${hashtag}`, {
     max_id: maxId,
diff --git a/app/javascript/flavours/glitch/api_types/statuses.ts b/app/javascript/flavours/glitch/api_types/statuses.ts
index 261d6003052a56..9de86e7fa686fe 100644
--- a/app/javascript/flavours/glitch/api_types/statuses.ts
+++ b/app/javascript/flavours/glitch/api_types/statuses.ts
@@ -44,6 +44,7 @@ export interface ApiPreviewCardJSON {
   type: string;
   author_name: string;
   author_url: string;
+  author_account?: ApiAccountJSON;
   provider_name: string;
   provider_url: string;
   html: string;
diff --git a/app/javascript/flavours/glitch/components/status_list.jsx b/app/javascript/flavours/glitch/components/status_list.jsx
index dde8bd9663ed63..374d14a56a6d2d 100644
--- a/app/javascript/flavours/glitch/components/status_list.jsx
+++ b/app/javascript/flavours/glitch/components/status_list.jsx
@@ -33,6 +33,7 @@ export default class StatusList extends ImmutablePureComponent {
     withCounters: PropTypes.bool,
     timelineId: PropTypes.string.isRequired,
     lastId: PropTypes.string,
+    bindToDocument: PropTypes.bool,
     regex: PropTypes.string,
   };
 
diff --git a/app/javascript/flavours/glitch/features/explore/components/story.jsx b/app/javascript/flavours/glitch/features/explore/components/story.jsx
index 28a1d69f8a806a..b07425b277dc6b 100644
--- a/app/javascript/flavours/glitch/features/explore/components/story.jsx
+++ b/app/javascript/flavours/glitch/features/explore/components/story.jsx
@@ -4,6 +4,8 @@ import { useState, useCallback } from 'react';
 import { FormattedMessage } from 'react-intl';
 
 import classNames from 'classnames';
+import { Link } from 'react-router-dom';
+
 
 
 import { Blurhash } from 'flavours/glitch/components/blurhash';
@@ -57,7 +59,7 @@ export const Story = ({
 
         <div className='story__details__shared'>
           {author ? <FormattedMessage id='link_preview.author' className='story__details__shared__author' defaultMessage='By {name}' values={{ name: authorAccount ? <AuthorLink accountId={authorAccount} /> : <strong>{author}</strong> }} /> : <span />}
-          {typeof sharedTimes === 'number' ? <span className='story__details__shared__pill'><ShortNumber value={sharedTimes} renderer={sharesCountRenderer} /></span> : <Skeleton width='10ch' />}
+          {typeof sharedTimes === 'number' ? <Link className='story__details__shared__pill' to={`/links/${encodeURIComponent(url)}`}><ShortNumber value={sharedTimes} renderer={sharesCountRenderer} /></Link> : <Skeleton width='10ch' />}
         </div>
       </div>
 
diff --git a/app/javascript/flavours/glitch/features/link_timeline/index.tsx b/app/javascript/flavours/glitch/features/link_timeline/index.tsx
new file mode 100644
index 00000000000000..bbe295d4741675
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/link_timeline/index.tsx
@@ -0,0 +1,77 @@
+import { useRef, useEffect, useCallback } from 'react';
+
+import { Helmet } from 'react-helmet';
+import { useParams } from 'react-router-dom';
+
+import ExploreIcon from '@/material-icons/400-24px/explore.svg?react';
+import { expandLinkTimeline } from 'flavours/glitch/actions/timelines';
+import Column from 'flavours/glitch/components/column';
+import { ColumnHeader } from 'flavours/glitch/components/column_header';
+import StatusListContainer from 'flavours/glitch/features/ui/containers/status_list_container';
+import type { Card } from 'flavours/glitch/models/status';
+import { useAppDispatch, useAppSelector } from 'flavours/glitch/store';
+
+export const LinkTimeline: React.FC<{
+  multiColumn: boolean;
+}> = ({ multiColumn }) => {
+  const { url } = useParams<{ url: string }>();
+  const decodedUrl = url ? decodeURIComponent(url) : undefined;
+  const dispatch = useAppDispatch();
+  const columnRef = useRef<Column>(null);
+  const firstStatusId = useAppSelector((state) =>
+    decodedUrl
+      ? // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
+        (state.timelines.getIn([`link:${decodedUrl}`, 'items', 0]) as string)
+      : undefined,
+  );
+  const story = useAppSelector((state) =>
+    firstStatusId
+      ? (state.statuses.getIn([firstStatusId, 'card']) as Card)
+      : undefined,
+  );
+
+  const handleHeaderClick = useCallback(() => {
+    columnRef.current?.scrollTop();
+  }, []);
+
+  const handleLoadMore = useCallback(
+    (maxId: string) => {
+      dispatch(expandLinkTimeline(decodedUrl, { maxId }));
+    },
+    [dispatch, decodedUrl],
+  );
+
+  useEffect(() => {
+    dispatch(expandLinkTimeline(decodedUrl));
+  }, [dispatch, decodedUrl]);
+
+  return (
+    <Column bindToDocument={!multiColumn} ref={columnRef} label={story?.title}>
+      <ColumnHeader
+        icon='explore'
+        iconComponent={ExploreIcon}
+        title={story?.title}
+        onClick={handleHeaderClick}
+        multiColumn={multiColumn}
+        showBackButton
+      />
+
+      <StatusListContainer
+        timelineId={`link:${decodedUrl}`}
+        onLoadMore={handleLoadMore}
+        trackScroll
+        scrollKey={`link_timeline-${decodedUrl}`}
+        bindToDocument={!multiColumn}
+        regex={undefined}
+      />
+
+      <Helmet>
+        <title>{story?.title}</title>
+        <meta name='robots' content='noindex' />
+      </Helmet>
+    </Column>
+  );
+};
+
+// eslint-disable-next-line import/no-default-export
+export default LinkTimeline;
diff --git a/app/javascript/flavours/glitch/features/ui/index.jsx b/app/javascript/flavours/glitch/features/ui/index.jsx
index 9fb4a784b35bf2..514536a8366fcd 100644
--- a/app/javascript/flavours/glitch/features/ui/index.jsx
+++ b/app/javascript/flavours/glitch/features/ui/index.jsx
@@ -58,6 +58,7 @@ import {
   FavouritedStatuses,
   BookmarkedStatuses,
   FollowedTags,
+  LinkTimeline,
   ListTimeline,
   Blocks,
   DomainBlocks,
@@ -211,6 +212,7 @@ class SwitchingColumnsArea extends PureComponent {
             <WrappedRoute path='/public/remote' exact component={Firehose} componentParams={{ feedType: 'public:remote' }} content={children} />
             <WrappedRoute path={['/conversations', '/timelines/direct']} component={DirectTimeline} content={children} />
             <WrappedRoute path='/tags/:id' component={HashtagTimeline} content={children} />
+            <WrappedRoute path='/links/:url' component={LinkTimeline} content={children} />
             <WrappedRoute path='/lists/:id' component={ListTimeline} content={children} />
             <WrappedRoute path='/notifications' component={Notifications} content={children} exact />
             <WrappedRoute path='/notifications/requests' component={NotificationRequests} content={children} exact />
diff --git a/app/javascript/flavours/glitch/features/ui/util/async-components.js b/app/javascript/flavours/glitch/features/ui/util/async-components.js
index 6a140e3fd7e036..a312cefff7dcfb 100644
--- a/app/javascript/flavours/glitch/features/ui/util/async-components.js
+++ b/app/javascript/flavours/glitch/features/ui/util/async-components.js
@@ -213,3 +213,7 @@ export function NotificationRequests () {
 export function NotificationRequest () {
   return import(/*webpackChunkName: "features/glitch/notifications/request" */'../../notifications/request');
 }
+
+export function LinkTimeline () {
+  return import(/*webpackChunkName: "features/glitch/link_timeline" */'../../link_timeline');
+}
diff --git a/app/javascript/flavours/glitch/models/status.ts b/app/javascript/flavours/glitch/models/status.ts
index d9566daf3997b4..bf1784bc615404 100644
--- a/app/javascript/flavours/glitch/models/status.ts
+++ b/app/javascript/flavours/glitch/models/status.ts
@@ -1,4 +1,12 @@
+import type { RecordOf } from 'immutable';
+
+import type { ApiPreviewCardJSON } from 'flavours/glitch/api_types/statuses';
+
 export type { StatusVisibility } from 'flavours/glitch/api_types/statuses';
 
 // Temporary until we type it correctly
 export type Status = Immutable.Map<string, unknown>;
+
+type CardShape = Required<ApiPreviewCardJSON>;
+
+export type Card = RecordOf<CardShape>;

From 4d4f7ede4f10c9d10e480f525b989700181b4864 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 1 Jul 2024 21:21:22 +0200
Subject: [PATCH 1449/2191] Revert "Temporarily disable hover cards"

This reverts commit 935b955b156f6313e1a4555dbb7b0661c2de1e0a.
---
 app/javascript/flavours/glitch/features/ui/index.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/flavours/glitch/features/ui/index.jsx b/app/javascript/flavours/glitch/features/ui/index.jsx
index 514536a8366fcd..747922f23e2dc9 100644
--- a/app/javascript/flavours/glitch/features/ui/index.jsx
+++ b/app/javascript/flavours/glitch/features/ui/index.jsx
@@ -651,7 +651,7 @@ class UI extends PureComponent {
 
           {layout !== 'mobile' && <PictureInPicture />}
           <NotificationsContainer />
-          {/* Temporarily disabled while upstream improves the issue */ null && <HoverCardController />}
+          <HoverCardController />
           <LoadingBarContainer className='loading-bar' />
           <ModalContainer />
           <UploadArea active={draggingOver} onClose={this.closeUploadModal} />

From 1fc14e324bf103e379cf73ffceebbf46472cccde Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 2 Jul 2024 10:41:54 +0200
Subject: [PATCH 1450/2191] New Crowdin Translations (automated) (#30890)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/en-GB.json | 8 ++++++++
 app/javascript/mastodon/locales/sk.json    | 3 +++
 config/locales/doorkeeper.en-GB.yml        | 2 ++
 config/locales/en-GB.yml                   | 3 +++
 4 files changed, 16 insertions(+)

diff --git a/app/javascript/mastodon/locales/en-GB.json b/app/javascript/mastodon/locales/en-GB.json
index c4f401d86d3609..94d7defc7ee456 100644
--- a/app/javascript/mastodon/locales/en-GB.json
+++ b/app/javascript/mastodon/locales/en-GB.json
@@ -35,7 +35,9 @@
   "account.follow_back": "Follow back",
   "account.followers": "Followers",
   "account.followers.empty": "No one follows this user yet.",
+  "account.followers_counter": "{count, plural, one {{counter} follower} other {{counter} followers}}",
   "account.following": "Following",
+  "account.following_counter": "{count, plural, one {{counter} following} other {{counter} following}}",
   "account.follows.empty": "This user doesn't follow anyone yet.",
   "account.go_to_profile": "Go to profile",
   "account.hide_reblogs": "Hide boosts from @{name}",
@@ -61,6 +63,7 @@
   "account.requested_follow": "{name} has requested to follow you",
   "account.share": "Share @{name}'s profile",
   "account.show_reblogs": "Show boosts from @{name}",
+  "account.statuses_counter": "{count, plural, one {{counter} post} other {{counter} posts}}",
   "account.unblock": "Unblock @{name}",
   "account.unblock_domain": "Unblock domain {domain}",
   "account.unblock_short": "Unblock",
@@ -411,6 +414,8 @@
   "limited_account_hint.action": "Show profile anyway",
   "limited_account_hint.title": "This profile has been hidden by the moderators of {domain}.",
   "link_preview.author": "By {name}",
+  "link_preview.more_from_author": "More from {name}",
+  "link_preview.shares": "{count, plural, one {{counter} post} other {{counter} posts}}",
   "lists.account.add": "Add to list",
   "lists.account.remove": "Remove from list",
   "lists.delete": "Delete list",
@@ -691,8 +696,11 @@
   "server_banner.about_active_users": "People using this server during the last 30 days (Monthly Active Users)",
   "server_banner.active_users": "active users",
   "server_banner.administered_by": "Administered by:",
+  "server_banner.is_one_of_many": "{domain} is one of the many independent Mastodon servers you can use to participate in the fediverse.",
   "server_banner.server_stats": "Server stats:",
   "sign_in_banner.create_account": "Create account",
+  "sign_in_banner.follow_anyone": "Follow anyone across the fediverse and see it all in chronological order. No algorithms, ads, or clickbait in sight.",
+  "sign_in_banner.mastodon_is": "Mastodon is the best way to keep up with what's happening.",
   "sign_in_banner.sign_in": "Sign in",
   "sign_in_banner.sso_redirect": "Login or Register",
   "status.admin_account": "Open moderation interface for @{name}",
diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json
index ed9c0de604f147..ed877f7667c9b0 100644
--- a/app/javascript/mastodon/locales/sk.json
+++ b/app/javascript/mastodon/locales/sk.json
@@ -88,7 +88,10 @@
   "audio.hide": "Skryť zvuk",
   "block_modal.show_less": "Zobraziť menej",
   "block_modal.show_more": "Zobraziť viac",
+  "block_modal.they_cant_mention": "Nemôžu ťa spomenúť, alebo nasledovať.",
+  "block_modal.they_will_know": "Môžu vidieť, že sú zablokovaní/ý.",
   "block_modal.title": "Blokovať užívateľa?",
+  "block_modal.you_wont_see_mentions": "Neuvidíš príspevky, ktoré ich spomínajú.",
   "boost_modal.combo": "Nabudúce môžete preskočiť stlačením {combo}",
   "bundle_column_error.copy_stacktrace": "Kopírovať chybovú hlášku",
   "bundle_column_error.error.body": "Požadovanú stránku nebolo možné vykresliť. Môže to byť spôsobené chybou v našom kóde alebo problémom s kompatibilitou prehliadača.",
diff --git a/config/locales/doorkeeper.en-GB.yml b/config/locales/doorkeeper.en-GB.yml
index b3ceffb13f7544..f254825b1ba685 100644
--- a/config/locales/doorkeeper.en-GB.yml
+++ b/config/locales/doorkeeper.en-GB.yml
@@ -135,6 +135,7 @@ en-GB:
         media: Media attachments
         mutes: Mutes
         notifications: Notifications
+        profile: Your Mastodon profile
         push: Push notifications
         reports: Reports
         search: Search
@@ -165,6 +166,7 @@ en-GB:
       admin:write:reports: perform moderation actions on reports
       crypto: use end-to-end encryption
       follow: modify account relationships
+      profile: read only your account's profile information
       push: receive your push notifications
       read: read all your account's data
       read:accounts: see accounts information
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 07eb84ebbef0a8..928823b995b674 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -285,6 +285,7 @@ en-GB:
         update_custom_emoji_html: "%{name} updated emoji %{target}"
         update_domain_block_html: "%{name} updated domain block for %{target}"
         update_ip_block_html: "%{name} changed rule for IP %{target}"
+        update_report_html: "%{name} updated report %{target}"
         update_status_html: "%{name} updated post by %{target}"
         update_user_role_html: "%{name} changed %{target} role"
       deleted_account: deleted account
@@ -292,6 +293,7 @@ en-GB:
       filter_by_action: Filter by action
       filter_by_user: Filter by user
       title: Audit log
+      unavailable_instance: "(domain name unavailable)"
     announcements:
       destroyed_msg: Announcement successfully deleted!
       edit:
@@ -950,6 +952,7 @@ en-GB:
       delete: Delete
       edit_preset: Edit warning preset
       empty: You haven't defined any warning presets yet.
+      title: Warning presets
     webhooks:
       add_new: Add endpoint
       delete: Delete

From a2b0c0f69a9b070c2ee8d84815f21d44d8ed4741 Mon Sep 17 00:00:00 2001
From: Jeremy Kescher <jeremy@kescher.at>
Date: Tue, 2 Jul 2024 19:31:31 +0200
Subject: [PATCH 1451/2191] Bump Catstodon revision to 1.1.3

---
 CHANGELOG.md            | 4 ++++
 lib/mastodon/version.rb | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e16ad5de6cc609..7a2f8de6ab2132 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@ All changes to Catstodon that aren't Mastodon or glitch-soc Mastodon changes wil
 
 All release dates, as well as most other dates, are intended to be read as "within the day, in UTC time."
 
+## [v4.3.0-alpha.4+glitch+cat+1.1.3] - 2024-07-02
+
+- Upstream changes
+
 ## [v4.3.0-alpha.4+glitch+cat+1.1.2] - 2024-06-22
 
 - Upstream changes
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index a4b0059ffaaebf..85d951206832a9 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -25,7 +25,7 @@ def prerelease
     end
 
     def catstodon_revision
-      '1.1.2'
+      '1.1.3'
     end
 
     def build_metadata

From ebd8e1bbb6465c78f6542fe7f09938fdb768dbb7 Mon Sep 17 00:00:00 2001
From: David Roetzel <david@roetzel.de>
Date: Wed, 3 Jul 2024 09:19:54 +0200
Subject: [PATCH 1452/2191] Add system check for missing database indexes
 (#30888)

---
 Gemfile                                       |  1 +
 Gemfile.lock                                  |  2 +
 app/lib/admin/db/schema_parser.rb             | 92 +++++++++++++++++++
 app/lib/admin/system_check.rb                 |  1 +
 .../system_check/missing_indexes_check.rb     | 36 ++++++++
 config/locales/en.yml                         |  2 +
 spec/lib/admin/db/schema_parser_spec.rb       | 49 ++++++++++
 .../missing_indexes_check_spec.rb             | 65 +++++++++++++
 8 files changed, 248 insertions(+)
 create mode 100644 app/lib/admin/db/schema_parser.rb
 create mode 100644 app/lib/admin/system_check/missing_indexes_check.rb
 create mode 100644 spec/lib/admin/db/schema_parser_spec.rb
 create mode 100644 spec/lib/admin/system_check/missing_indexes_check_spec.rb

diff --git a/Gemfile b/Gemfile
index be3f9e6f98637c..0d6cc4c4e1feee 100644
--- a/Gemfile
+++ b/Gemfile
@@ -229,3 +229,4 @@ gem 'rubyzip', '~> 2.3'
 gem 'hcaptcha', '~> 7.1'
 
 gem 'mail', '~> 2.8'
+gem 'prism'
diff --git a/Gemfile.lock b/Gemfile.lock
index 42cc0e19861146..969d18493a9088 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -600,6 +600,7 @@ GEM
       actionmailer (>= 3)
       net-smtp
       premailer (~> 1.7, >= 1.7.9)
+    prism (0.30.0)
     propshaft (0.9.0)
       actionpack (>= 7.0.0)
       activesupport (>= 7.0.0)
@@ -1003,6 +1004,7 @@ DEPENDENCIES
   pg (~> 1.5)
   pghero
   premailer-rails
+  prism
   propshaft
   public_suffix (~> 6.0)
   puma (~> 6.3)
diff --git a/app/lib/admin/db/schema_parser.rb b/app/lib/admin/db/schema_parser.rb
new file mode 100644
index 00000000000000..e61a2281eebbf2
--- /dev/null
+++ b/app/lib/admin/db/schema_parser.rb
@@ -0,0 +1,92 @@
+# frozen_string_literal: true
+
+class Admin::Db::SchemaParser
+  class Index
+    attr_reader :name, :table_name, :columns, :options
+
+    def initialize(name:, table_name:, columns:, options:)
+      @name = name
+      @table_name = table_name
+      @columns = columns
+      @options = options
+    end
+  end
+
+  attr_reader :indexes_by_table
+
+  def initialize(source)
+    parse(source)
+  end
+
+  private
+
+  def parse(source)
+    @indexes_by_table = {}
+    queue = [Prism.parse(source).value]
+    while (node = queue.shift)
+      if node.type == :call_node && node.name == :create_table
+        parse_create_table(node)
+      elsif node.type == :call_node && node.name == :add_index
+        parse_add_index(node)
+      else
+        queue.concat(node.compact_child_nodes)
+      end
+    end
+  end
+
+  def parse_create_table(node)
+    table_name = parse_arguments(node).first
+    queue = node.compact_child_nodes
+    while (node = queue.shift)
+      if node.type == :call_node && node.name == :index
+        parse_index(node, table_name:)
+      else
+        queue.concat(node.compact_child_nodes)
+      end
+    end
+  end
+
+  def parse_index(node, table_name:)
+    arguments = parse_arguments(node)
+    save_index(
+      name: arguments.last[:name],
+      table_name: table_name,
+      columns: arguments.first,
+      options: arguments.last
+    )
+  end
+
+  def parse_add_index(node)
+    arguments = parse_arguments(node)
+    save_index(
+      name: arguments.last[:name],
+      table_name: arguments.first,
+      columns: arguments[1],
+      options: arguments.last
+    )
+  end
+
+  def parse_arguments(node)
+    node.arguments.arguments.map { |a| parse_argument(a) }
+  end
+
+  def parse_argument(argument)
+    case argument
+    when Prism::StringNode
+      argument.unescaped
+    when Prism::SymbolNode
+      argument.unescaped.to_sym
+    when Prism::ArrayNode
+      argument.elements.map { |e| parse_argument(e) }
+    when Prism::KeywordHashNode
+      argument.elements.to_h do |element|
+        [element.key.unescaped.to_sym, parse_argument(element.value)]
+      end
+    end
+  end
+
+  def save_index(name:, table_name:, columns:, options:)
+    @indexes_by_table[table_name] ||= []
+    @indexes_by_table[table_name] << Index.new(name:, table_name:, columns:, options:)
+  end
+end
diff --git a/app/lib/admin/system_check.rb b/app/lib/admin/system_check.rb
index 25c88341a4efe1..453011f7a6f0ca 100644
--- a/app/lib/admin/system_check.rb
+++ b/app/lib/admin/system_check.rb
@@ -8,6 +8,7 @@ class Admin::SystemCheck
     Admin::SystemCheck::SidekiqProcessCheck,
     Admin::SystemCheck::RulesCheck,
     Admin::SystemCheck::ElasticsearchCheck,
+    Admin::SystemCheck::MissingIndexesCheck,
   ].freeze
 
   def self.perform(current_user)
diff --git a/app/lib/admin/system_check/missing_indexes_check.rb b/app/lib/admin/system_check/missing_indexes_check.rb
new file mode 100644
index 00000000000000..b7eecbb067e271
--- /dev/null
+++ b/app/lib/admin/system_check/missing_indexes_check.rb
@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+class Admin::SystemCheck::MissingIndexesCheck < Admin::SystemCheck::BaseCheck
+  def skip?
+    !current_user.can?(:view_devops)
+  end
+
+  def pass?
+    missing_indexes.none?
+  end
+
+  def message
+    Admin::SystemCheck::Message.new(:missing_indexes_check, missing_indexes.join(', '))
+  end
+
+  private
+
+  def missing_indexes
+    @missing_indexes ||= begin
+      expected_indexes_by_table.flat_map do |table, indexes|
+        expected_indexes = indexes.map(&:name)
+        expected_indexes - existing_indexes_for(table)
+      end
+    end
+  end
+
+  def expected_indexes_by_table
+    schema_rb = Rails.root.join('db', 'schema.rb').read
+    schema_parser = Admin::Db::SchemaParser.new(schema_rb)
+    schema_parser.indexes_by_table
+  end
+
+  def existing_indexes_for(table)
+    ActiveRecord::Base.connection.indexes(table).map(&:name)
+  end
+end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 20df80c272fb12..270382dd110956 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -862,6 +862,8 @@ en:
       elasticsearch_version_check:
         message_html: 'Incompatible Elasticsearch version: %{value}'
         version_comparison: Elasticsearch %{running_version} is running while %{required_version} is required
+      missing_indexes_check:
+        message_html: 'The following indexes are missing from the database and should be recreated: <code>%{value}</code>.<br> Missing indexes may lead to severely reduced performance and data inconsistencies.'
       rules_check:
         action: Manage server rules
         message_html: You haven't defined any server rules.
diff --git a/spec/lib/admin/db/schema_parser_spec.rb b/spec/lib/admin/db/schema_parser_spec.rb
new file mode 100644
index 00000000000000..e28d5c1f9791b2
--- /dev/null
+++ b/spec/lib/admin/db/schema_parser_spec.rb
@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe Admin::Db::SchemaParser do
+  let(:dummy_schema) do
+    <<~SCHEMA
+      # Comment
+      ActiveRecord::Schema[7.1].define(version: 23) do
+        create_table "people", force: :cascade do |t|
+          t.string "name"
+        end
+
+        create_table "posts", force: :cascade do |t|
+          t.string "title", null: false
+          t.bigint "size", null: false
+          t.string "description"
+          # t.index ["size", "title"], name: "index_posts_on_size_and_title"
+          t.index ["title"], name: "index_posts_on_title", unique: true
+          t.index ["size"], name: "index_posts_on_size"
+        end
+
+        # add_index "people", ["name"], name: "commented_out_index"
+        add_index "people", ["name"], name: "index_people_on_name"
+      end
+    SCHEMA
+  end
+  let(:schema_parser) { described_class.new(dummy_schema) }
+
+  describe '#indexes_by_table' do
+    subject { schema_parser.indexes_by_table }
+
+    it 'returns index info for all affected tables' do
+      expect(subject.keys).to match_array(%w(people posts))
+    end
+
+    it 'returns all index information for the `people` table' do
+      people_info = subject['people']
+      expect(people_info.map(&:name)).to contain_exactly('index_people_on_name')
+    end
+
+    it 'returns all index information for the `posts` table' do
+      posts_info = subject['posts']
+      expect(posts_info.map(&:name)).to contain_exactly(
+        'index_posts_on_title', 'index_posts_on_size'
+      )
+    end
+  end
+end
diff --git a/spec/lib/admin/system_check/missing_indexes_check_spec.rb b/spec/lib/admin/system_check/missing_indexes_check_spec.rb
new file mode 100644
index 00000000000000..e183be5620094f
--- /dev/null
+++ b/spec/lib/admin/system_check/missing_indexes_check_spec.rb
@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe Admin::SystemCheck::MissingIndexesCheck do
+  subject(:check) { described_class.new(user) }
+
+  let(:user) { Fabricate(:user) }
+  let(:schema_parser) do
+    instance_double(Admin::Db::SchemaParser, indexes_by_table: index_info)
+  end
+  let(:index_info) do
+    {
+      'users' => [instance_double(Admin::Db::SchemaParser::Index, name: 'index_users_on_profile_id')],
+      'posts' => [instance_double(Admin::Db::SchemaParser::Index, name: 'index_posts_on_user_id')],
+    }
+  end
+  let(:posts_indexes) { [] }
+  let(:users_indexes) { [] }
+
+  before do
+    allow(Admin::Db::SchemaParser).to receive(:new).and_return(schema_parser)
+    allow(ActiveRecord::Base.connection).to receive(:indexes).with('posts').and_return(posts_indexes)
+    allow(ActiveRecord::Base.connection).to receive(:indexes).with('users').and_return(users_indexes)
+  end
+
+  it_behaves_like 'a check available to devops users'
+
+  describe '#pass?' do
+    context 'when indexes are missing' do
+      let(:posts_indexes) do
+        [instance_double(ActiveRecord::ConnectionAdapters::IndexDefinition, name: 'index_posts_on_user_id')]
+      end
+
+      it 'returns false' do
+        expect(check.pass?).to be false
+      end
+    end
+
+    context 'when all expected indexes are present' do
+      let(:posts_indexes) do
+        [instance_double(ActiveRecord::ConnectionAdapters::IndexDefinition, name: 'index_posts_on_user_id')]
+      end
+      let(:users_indexes) do
+        [instance_double(ActiveRecord::ConnectionAdapters::IndexDefinition, name: 'index_users_on_profile_id')]
+      end
+
+      it 'returns true' do
+        expect(check.pass?).to be true
+      end
+    end
+  end
+
+  describe '#message' do
+    subject { check.message }
+
+    it 'sets the class name as the message key' do
+      expect(subject.key).to eq(:missing_indexes_check)
+    end
+
+    it 'sets a list of missing indexes as message value' do
+      expect(subject.value).to eq('index_users_on_profile_id, index_posts_on_user_id')
+    end
+  end
+end

From 2e295bd5e7d3e7fefd4d4f03279f0dd0f3e5427d Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 3 Jul 2024 07:20:48 +0000
Subject: [PATCH 1453/2191] chore(deps): update dependency aws-sdk-s3 to
 v1.156.0 (#30899)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 969d18493a9088..d855c05f435629 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -100,19 +100,19 @@ GEM
     attr_required (1.0.2)
     awrence (1.2.1)
     aws-eventstream (1.3.0)
-    aws-partitions (1.949.0)
-    aws-sdk-core (3.200.0)
+    aws-partitions (1.950.0)
+    aws-sdk-core (3.201.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.8)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.87.0)
-      aws-sdk-core (~> 3, >= 3.199.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.155.0)
-      aws-sdk-core (~> 3, >= 3.199.0)
+    aws-sdk-kms (1.88.0)
+      aws-sdk-core (~> 3, >= 3.201.0)
+      aws-sigv4 (~> 1.5)
+    aws-sdk-s3 (1.156.0)
+      aws-sdk-core (~> 3, >= 3.201.0)
       aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.8)
+      aws-sigv4 (~> 1.5)
     aws-sigv4 (1.8.0)
       aws-eventstream (~> 1, >= 1.0.2)
     azure-storage-blob (2.0.3)

From ba7e7a6368f4e6097a7c6ee7145c5ff43e906517 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 3 Jul 2024 09:21:05 +0200
Subject: [PATCH 1454/2191] chore(deps): update opentelemetry-ruby (non-major)
 (#30898)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile      | 2 +-
 Gemfile.lock | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index 0d6cc4c4e1feee..d1a8c2c5a41601 100644
--- a/Gemfile
+++ b/Gemfile
@@ -114,7 +114,7 @@ group :opentelemetry do
   gem 'opentelemetry-instrumentation-net_http', '~> 0.22.4', require: false
   gem 'opentelemetry-instrumentation-pg', '~> 0.27.1', require: false
   gem 'opentelemetry-instrumentation-rack', '~> 0.24.1', require: false
-  gem 'opentelemetry-instrumentation-rails', '~> 0.30.0', require: false
+  gem 'opentelemetry-instrumentation-rails', '~> 0.31.0', require: false
   gem 'opentelemetry-instrumentation-redis', '~> 0.25.3', require: false
   gem 'opentelemetry-instrumentation-sidekiq', '~> 0.25.2', require: false
   gem 'opentelemetry-sdk', '~> 1.4', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index d855c05f435629..e66077ff03b9bf 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -525,7 +525,7 @@ GEM
     opentelemetry-instrumentation-active_record (0.7.2)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-active_support (0.5.1)
+    opentelemetry-instrumentation-active_support (0.6.0)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
     opentelemetry-instrumentation-base (0.22.3)
@@ -556,14 +556,14 @@ GEM
     opentelemetry-instrumentation-rack (0.24.5)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-rails (0.30.2)
+    opentelemetry-instrumentation-rails (0.31.0)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-action_mailer (~> 0.1.0)
       opentelemetry-instrumentation-action_pack (~> 0.9.0)
       opentelemetry-instrumentation-action_view (~> 0.7.0)
       opentelemetry-instrumentation-active_job (~> 0.7.0)
       opentelemetry-instrumentation-active_record (~> 0.7.0)
-      opentelemetry-instrumentation-active_support (~> 0.5.0)
+      opentelemetry-instrumentation-active_support (~> 0.6.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
     opentelemetry-instrumentation-redis (0.25.6)
       opentelemetry-api (~> 1.0)
@@ -995,7 +995,7 @@ DEPENDENCIES
   opentelemetry-instrumentation-net_http (~> 0.22.4)
   opentelemetry-instrumentation-pg (~> 0.27.1)
   opentelemetry-instrumentation-rack (~> 0.24.1)
-  opentelemetry-instrumentation-rails (~> 0.30.0)
+  opentelemetry-instrumentation-rails (~> 0.31.0)
   opentelemetry-instrumentation-redis (~> 0.25.3)
   opentelemetry-instrumentation-sidekiq (~> 0.25.2)
   opentelemetry-sdk (~> 1.4)

From dd85e3bcc5e04a11775cbdd9cb1f7d3577ddd9d7 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 3 Jul 2024 07:30:30 +0000
Subject: [PATCH 1455/2191] New Crowdin Translations (automated) (#30901)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/uk.json | 5 +++++
 config/locales/cs.yml                   | 2 +-
 config/locales/simple_form.cs.yml       | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json
index 338b6506178e22..150b808f894651 100644
--- a/app/javascript/mastodon/locales/uk.json
+++ b/app/javascript/mastodon/locales/uk.json
@@ -35,7 +35,9 @@
   "account.follow_back": "Підписатися взаємно",
   "account.followers": "Підписники",
   "account.followers.empty": "Ніхто ще не підписаний на цього користувача.",
+  "account.followers_counter": "{count, plural, one {{counter} підписник} few {{counter} підписники} many {{counter} підписників} other {{counter} підписники}}",
   "account.following": "Ви стежите",
+  "account.following_counter": "{count, plural, one {{counter} підписка} few {{counter} підписки} many {{counter} підписок} other {{counter} підписки}}",
   "account.follows.empty": "Цей користувач ще ні на кого не підписався.",
   "account.go_to_profile": "Перейти до профілю",
   "account.hide_reblogs": "Сховати поширення від @{name}",
@@ -61,6 +63,7 @@
   "account.requested_follow": "{name} надсилає запит на стеження",
   "account.share": "Поділитися профілем @{name}",
   "account.show_reblogs": "Показати поширення від @{name}",
+  "account.statuses_counter": "{count, plural, one {{counter} допис} few {{counter} дописи} many {{counter} дописів} other {{counter} допис}}",
   "account.unblock": "Розблокувати @{name}",
   "account.unblock_domain": "Розблокувати {domain}",
   "account.unblock_short": "Розблокувати",
@@ -412,6 +415,7 @@
   "limited_account_hint.title": "Цей профіль сховали модератори {domain}.",
   "link_preview.author": "Від {name}",
   "link_preview.more_from_author": "Більше від {name}",
+  "link_preview.shares": "{count, plural, one {{counter} допис} few {{counter} дописи} many {{counter} дописів} other {{counter} допис}}",
   "lists.account.add": "Додати до списку",
   "lists.account.remove": "Вилучити зі списку",
   "lists.delete": "Видалити список",
@@ -695,6 +699,7 @@
   "server_banner.is_one_of_many": "{domain} - один з багатьох незалежних серверів Mastodon, які ви можете використати, щоб брати участь у федівері.",
   "server_banner.server_stats": "Статистика сервера:",
   "sign_in_banner.create_account": "Створити обліковий запис",
+  "sign_in_banner.follow_anyone": "Слідкуйте за ким завгодно у всьому fediverse і дивіться все це в хронологічному порядку. Немає алгоритмів, реклами чи наживок для натискань при перегляді.",
   "sign_in_banner.mastodon_is": "Мастодон - найкращий спосіб продовжувати свою справу.",
   "sign_in_banner.sign_in": "Увійти",
   "sign_in_banner.sso_redirect": "Увійдіть або зареєструйтесь",
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index f3b8f27d805b2e..20e7e4d46b81d5 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -81,7 +81,7 @@ cs:
       invite_request_text: Důvody založení
       invited_by: Pozván uživatelem
       ip: IP adresa
-      joined: Uživatel založen
+      joined: Uživatelem od
       location:
         all: Všechny
         local: Místní
diff --git a/config/locales/simple_form.cs.yml b/config/locales/simple_form.cs.yml
index 0b1a34e1b99dec..f8422102f19fff 100644
--- a/config/locales/simple_form.cs.yml
+++ b/config/locales/simple_form.cs.yml
@@ -59,7 +59,7 @@ cs:
         setting_display_media_default: Skrývat média označená jako citlivá
         setting_display_media_hide_all: Vždy skrývat média
         setting_display_media_show_all: Vždy zobrazovat média
-        setting_use_blurhash: Gradienty jsou založeny na barvách skryté grafiky, ale zakrývají jakékoliv detaily
+        setting_use_blurhash: Gradienty jsou vytvořeny na základě barvev skrytých médií, ale zakrývají veškeré detaily
         setting_use_pending_items: Aktualizovat časovou osu až po kliknutí namísto automatického rolování kanálu
         username: Pouze písmena, číslice a podtržítka
         whole_word: Je-li klíčové slovo či fráze pouze alfanumerická, bude aplikován pouze, pokud se shoduje s celým slovem

From 5651c16d11a3bb35e44c260b0c18afcd451fd5aa Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 3 Jul 2024 03:47:40 -0400
Subject: [PATCH 1456/2191] Limit `browser` version to enforce ruby 3.1 support
 (#30766)

---
 Gemfile      | 2 +-
 Gemfile.lock | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile b/Gemfile
index d1a8c2c5a41601..769f834f46091a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -25,7 +25,7 @@ gem 'ruby-vips', '~> 2.2', require: false
 gem 'active_model_serializers', '~> 0.10'
 gem 'addressable', '~> 2.8'
 gem 'bootsnap', '~> 1.18.0', require: false
-gem 'browser'
+gem 'browser', '< 6' # https://github.com/fnando/browser/issues/543
 gem 'charlock_holmes', '~> 0.7.7'
 gem 'chewy', '~> 7.3'
 gem 'devise', '~> 4.9'
diff --git a/Gemfile.lock b/Gemfile.lock
index e66077ff03b9bf..aafad69ed72276 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -917,7 +917,7 @@ DEPENDENCIES
   blurhash (~> 0.1)
   bootsnap (~> 1.18.0)
   brakeman (~> 6.0)
-  browser
+  browser (< 6)
   bundler-audit (~> 0.9)
   capybara (~> 3.39)
   charlock_holmes (~> 0.7.7)

From 1dbffc30f12d20f3c5f038c72b06967480f82129 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 3 Jul 2024 08:04:38 +0000
Subject: [PATCH 1457/2191] chore(deps): update opentelemetry-ruby (non-major)
 (#30903)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index aafad69ed72276..30835adef70a5f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -516,7 +516,7 @@ GEM
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-active_support (~> 0.1)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-active_job (0.7.1)
+    opentelemetry-instrumentation-active_job (0.7.2)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
     opentelemetry-instrumentation-active_model_serializers (0.20.1)
@@ -568,7 +568,7 @@ GEM
     opentelemetry-instrumentation-redis (0.25.6)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-sidekiq (0.25.5)
+    opentelemetry-instrumentation-sidekiq (0.25.6)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
     opentelemetry-registry (0.3.1)

From 6270281037c1f0991bfbf8d195280be3f5733bf3 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 3 Jul 2024 08:05:19 +0000
Subject: [PATCH 1458/2191] chore(deps): update dependency doorkeeper to v5.7.1
 (#30053)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 30835adef70a5f..6444e46876caa7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -208,7 +208,7 @@ GEM
       activerecord (>= 4.2, < 8)
     docile (1.4.0)
     domain_name (0.6.20240107)
-    doorkeeper (5.6.9)
+    doorkeeper (5.7.1)
       railties (>= 5)
     dotenv (3.1.2)
     drb (2.2.1)
@@ -431,7 +431,7 @@ GEM
     mime-types-data (3.2024.0604)
     mini_mime (1.1.5)
     mini_portile2 (2.8.7)
-    minitest (5.23.1)
+    minitest (5.24.1)
     msgpack (1.7.2)
     multi_json (1.15.0)
     multipart-post (2.4.0)

From f99159d1eb671d72138edc42d11cd58472c33aec Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 3 Jul 2024 10:46:51 +0200
Subject: [PATCH 1459/2191] fix(deps): update dependency webpack-merge to v6
 (#30891)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 package.json |  2 +-
 yarn.lock    | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index 0379c7a5f560a9..404c4f486fcc05 100644
--- a/package.json
+++ b/package.json
@@ -127,7 +127,7 @@
     "webpack-assets-manifest": "^4.0.6",
     "webpack-bundle-analyzer": "^4.8.0",
     "webpack-cli": "^3.3.12",
-    "webpack-merge": "^5.9.0",
+    "webpack-merge": "^6.0.0",
     "wicg-inert": "^3.1.2",
     "workbox-expiration": "^7.0.0",
     "workbox-precaching": "^7.0.0",
diff --git a/yarn.lock b/yarn.lock
index 9d19cb837e0d2e..8e72138a153cab 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2901,7 +2901,7 @@ __metadata:
     webpack-bundle-analyzer: "npm:^4.8.0"
     webpack-cli: "npm:^3.3.12"
     webpack-dev-server: "npm:^3.11.3"
-    webpack-merge: "npm:^5.9.0"
+    webpack-merge: "npm:^6.0.0"
     wicg-inert: "npm:^3.1.2"
     workbox-expiration: "npm:^7.0.0"
     workbox-precaching: "npm:^7.0.0"
@@ -17928,14 +17928,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"webpack-merge@npm:^5.9.0":
-  version: 5.10.0
-  resolution: "webpack-merge@npm:5.10.0"
+"webpack-merge@npm:^6.0.0":
+  version: 6.0.1
+  resolution: "webpack-merge@npm:6.0.1"
   dependencies:
     clone-deep: "npm:^4.0.1"
     flat: "npm:^5.0.2"
-    wildcard: "npm:^2.0.0"
-  checksum: 10c0/b607c84cabaf74689f965420051a55a08722d897bdd6c29cb0b2263b451c090f962d41ecf8c9bf56b0ab3de56e65476ace0a8ecda4f4a4663684243d90e0512b
+    wildcard: "npm:^2.0.1"
+  checksum: 10c0/bf1429567858b353641801b8a2696ca0aac270fc8c55d4de8a7b586fe07d27fdcfc83099a98ab47e6162383db8dd63bb8cc25b1beb2ec82150422eec843b0dc0
   languageName: node
   linkType: hard
 
@@ -18183,7 +18183,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"wildcard@npm:^2.0.0":
+"wildcard@npm:^2.0.1":
   version: 2.0.1
   resolution: "wildcard@npm:2.0.1"
   checksum: 10c0/08f70cd97dd9a20aea280847a1fe8148e17cae7d231640e41eb26d2388697cbe65b67fd9e68715251c39b080c5ae4f76d71a9a69fa101d897273efdfb1b58bf7

From 20c749bd45286fbf0aca5610562e5dc6f2c616dd Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 3 Jul 2024 11:14:15 +0200
Subject: [PATCH 1460/2191] chore(deps): update dependency rubocop-rspec to
 v3.0.2 (#30902)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 6444e46876caa7..ca36c8cf95b6a1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -757,7 +757,7 @@ GEM
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rspec (3.0.1)
+    rubocop-rspec (3.0.2)
       rubocop (~> 1.61)
     rubocop-rspec_rails (2.30.0)
       rubocop (~> 1.61)

From 9be77fc0dbb01c1a8a54cd3da97e16c7941df367 Mon Sep 17 00:00:00 2001
From: David Roetzel <david@roetzel.de>
Date: Wed, 3 Jul 2024 15:36:42 +0200
Subject: [PATCH 1461/2191] Revert "Add system check for missing database
 indexes" (#30909)

---
 Gemfile                                       |  1 -
 Gemfile.lock                                  |  2 -
 app/lib/admin/db/schema_parser.rb             | 92 -------------------
 app/lib/admin/system_check.rb                 |  1 -
 .../system_check/missing_indexes_check.rb     | 36 --------
 config/locales/en.yml                         |  2 -
 spec/lib/admin/db/schema_parser_spec.rb       | 49 ----------
 .../missing_indexes_check_spec.rb             | 65 -------------
 8 files changed, 248 deletions(-)
 delete mode 100644 app/lib/admin/db/schema_parser.rb
 delete mode 100644 app/lib/admin/system_check/missing_indexes_check.rb
 delete mode 100644 spec/lib/admin/db/schema_parser_spec.rb
 delete mode 100644 spec/lib/admin/system_check/missing_indexes_check_spec.rb

diff --git a/Gemfile b/Gemfile
index 769f834f46091a..ef52d50cac128d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -229,4 +229,3 @@ gem 'rubyzip', '~> 2.3'
 gem 'hcaptcha', '~> 7.1'
 
 gem 'mail', '~> 2.8'
-gem 'prism'
diff --git a/Gemfile.lock b/Gemfile.lock
index ca36c8cf95b6a1..eb6720e4542b77 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -600,7 +600,6 @@ GEM
       actionmailer (>= 3)
       net-smtp
       premailer (~> 1.7, >= 1.7.9)
-    prism (0.30.0)
     propshaft (0.9.0)
       actionpack (>= 7.0.0)
       activesupport (>= 7.0.0)
@@ -1004,7 +1003,6 @@ DEPENDENCIES
   pg (~> 1.5)
   pghero
   premailer-rails
-  prism
   propshaft
   public_suffix (~> 6.0)
   puma (~> 6.3)
diff --git a/app/lib/admin/db/schema_parser.rb b/app/lib/admin/db/schema_parser.rb
deleted file mode 100644
index e61a2281eebbf2..00000000000000
--- a/app/lib/admin/db/schema_parser.rb
+++ /dev/null
@@ -1,92 +0,0 @@
-# frozen_string_literal: true
-
-class Admin::Db::SchemaParser
-  class Index
-    attr_reader :name, :table_name, :columns, :options
-
-    def initialize(name:, table_name:, columns:, options:)
-      @name = name
-      @table_name = table_name
-      @columns = columns
-      @options = options
-    end
-  end
-
-  attr_reader :indexes_by_table
-
-  def initialize(source)
-    parse(source)
-  end
-
-  private
-
-  def parse(source)
-    @indexes_by_table = {}
-    queue = [Prism.parse(source).value]
-    while (node = queue.shift)
-      if node.type == :call_node && node.name == :create_table
-        parse_create_table(node)
-      elsif node.type == :call_node && node.name == :add_index
-        parse_add_index(node)
-      else
-        queue.concat(node.compact_child_nodes)
-      end
-    end
-  end
-
-  def parse_create_table(node)
-    table_name = parse_arguments(node).first
-    queue = node.compact_child_nodes
-    while (node = queue.shift)
-      if node.type == :call_node && node.name == :index
-        parse_index(node, table_name:)
-      else
-        queue.concat(node.compact_child_nodes)
-      end
-    end
-  end
-
-  def parse_index(node, table_name:)
-    arguments = parse_arguments(node)
-    save_index(
-      name: arguments.last[:name],
-      table_name: table_name,
-      columns: arguments.first,
-      options: arguments.last
-    )
-  end
-
-  def parse_add_index(node)
-    arguments = parse_arguments(node)
-    save_index(
-      name: arguments.last[:name],
-      table_name: arguments.first,
-      columns: arguments[1],
-      options: arguments.last
-    )
-  end
-
-  def parse_arguments(node)
-    node.arguments.arguments.map { |a| parse_argument(a) }
-  end
-
-  def parse_argument(argument)
-    case argument
-    when Prism::StringNode
-      argument.unescaped
-    when Prism::SymbolNode
-      argument.unescaped.to_sym
-    when Prism::ArrayNode
-      argument.elements.map { |e| parse_argument(e) }
-    when Prism::KeywordHashNode
-      argument.elements.to_h do |element|
-        [element.key.unescaped.to_sym, parse_argument(element.value)]
-      end
-    end
-  end
-
-  def save_index(name:, table_name:, columns:, options:)
-    @indexes_by_table[table_name] ||= []
-    @indexes_by_table[table_name] << Index.new(name:, table_name:, columns:, options:)
-  end
-end
diff --git a/app/lib/admin/system_check.rb b/app/lib/admin/system_check.rb
index 453011f7a6f0ca..25c88341a4efe1 100644
--- a/app/lib/admin/system_check.rb
+++ b/app/lib/admin/system_check.rb
@@ -8,7 +8,6 @@ class Admin::SystemCheck
     Admin::SystemCheck::SidekiqProcessCheck,
     Admin::SystemCheck::RulesCheck,
     Admin::SystemCheck::ElasticsearchCheck,
-    Admin::SystemCheck::MissingIndexesCheck,
   ].freeze
 
   def self.perform(current_user)
diff --git a/app/lib/admin/system_check/missing_indexes_check.rb b/app/lib/admin/system_check/missing_indexes_check.rb
deleted file mode 100644
index b7eecbb067e271..00000000000000
--- a/app/lib/admin/system_check/missing_indexes_check.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-# frozen_string_literal: true
-
-class Admin::SystemCheck::MissingIndexesCheck < Admin::SystemCheck::BaseCheck
-  def skip?
-    !current_user.can?(:view_devops)
-  end
-
-  def pass?
-    missing_indexes.none?
-  end
-
-  def message
-    Admin::SystemCheck::Message.new(:missing_indexes_check, missing_indexes.join(', '))
-  end
-
-  private
-
-  def missing_indexes
-    @missing_indexes ||= begin
-      expected_indexes_by_table.flat_map do |table, indexes|
-        expected_indexes = indexes.map(&:name)
-        expected_indexes - existing_indexes_for(table)
-      end
-    end
-  end
-
-  def expected_indexes_by_table
-    schema_rb = Rails.root.join('db', 'schema.rb').read
-    schema_parser = Admin::Db::SchemaParser.new(schema_rb)
-    schema_parser.indexes_by_table
-  end
-
-  def existing_indexes_for(table)
-    ActiveRecord::Base.connection.indexes(table).map(&:name)
-  end
-end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 270382dd110956..20df80c272fb12 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -862,8 +862,6 @@ en:
       elasticsearch_version_check:
         message_html: 'Incompatible Elasticsearch version: %{value}'
         version_comparison: Elasticsearch %{running_version} is running while %{required_version} is required
-      missing_indexes_check:
-        message_html: 'The following indexes are missing from the database and should be recreated: <code>%{value}</code>.<br> Missing indexes may lead to severely reduced performance and data inconsistencies.'
       rules_check:
         action: Manage server rules
         message_html: You haven't defined any server rules.
diff --git a/spec/lib/admin/db/schema_parser_spec.rb b/spec/lib/admin/db/schema_parser_spec.rb
deleted file mode 100644
index e28d5c1f9791b2..00000000000000
--- a/spec/lib/admin/db/schema_parser_spec.rb
+++ /dev/null
@@ -1,49 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe Admin::Db::SchemaParser do
-  let(:dummy_schema) do
-    <<~SCHEMA
-      # Comment
-      ActiveRecord::Schema[7.1].define(version: 23) do
-        create_table "people", force: :cascade do |t|
-          t.string "name"
-        end
-
-        create_table "posts", force: :cascade do |t|
-          t.string "title", null: false
-          t.bigint "size", null: false
-          t.string "description"
-          # t.index ["size", "title"], name: "index_posts_on_size_and_title"
-          t.index ["title"], name: "index_posts_on_title", unique: true
-          t.index ["size"], name: "index_posts_on_size"
-        end
-
-        # add_index "people", ["name"], name: "commented_out_index"
-        add_index "people", ["name"], name: "index_people_on_name"
-      end
-    SCHEMA
-  end
-  let(:schema_parser) { described_class.new(dummy_schema) }
-
-  describe '#indexes_by_table' do
-    subject { schema_parser.indexes_by_table }
-
-    it 'returns index info for all affected tables' do
-      expect(subject.keys).to match_array(%w(people posts))
-    end
-
-    it 'returns all index information for the `people` table' do
-      people_info = subject['people']
-      expect(people_info.map(&:name)).to contain_exactly('index_people_on_name')
-    end
-
-    it 'returns all index information for the `posts` table' do
-      posts_info = subject['posts']
-      expect(posts_info.map(&:name)).to contain_exactly(
-        'index_posts_on_title', 'index_posts_on_size'
-      )
-    end
-  end
-end
diff --git a/spec/lib/admin/system_check/missing_indexes_check_spec.rb b/spec/lib/admin/system_check/missing_indexes_check_spec.rb
deleted file mode 100644
index e183be5620094f..00000000000000
--- a/spec/lib/admin/system_check/missing_indexes_check_spec.rb
+++ /dev/null
@@ -1,65 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe Admin::SystemCheck::MissingIndexesCheck do
-  subject(:check) { described_class.new(user) }
-
-  let(:user) { Fabricate(:user) }
-  let(:schema_parser) do
-    instance_double(Admin::Db::SchemaParser, indexes_by_table: index_info)
-  end
-  let(:index_info) do
-    {
-      'users' => [instance_double(Admin::Db::SchemaParser::Index, name: 'index_users_on_profile_id')],
-      'posts' => [instance_double(Admin::Db::SchemaParser::Index, name: 'index_posts_on_user_id')],
-    }
-  end
-  let(:posts_indexes) { [] }
-  let(:users_indexes) { [] }
-
-  before do
-    allow(Admin::Db::SchemaParser).to receive(:new).and_return(schema_parser)
-    allow(ActiveRecord::Base.connection).to receive(:indexes).with('posts').and_return(posts_indexes)
-    allow(ActiveRecord::Base.connection).to receive(:indexes).with('users').and_return(users_indexes)
-  end
-
-  it_behaves_like 'a check available to devops users'
-
-  describe '#pass?' do
-    context 'when indexes are missing' do
-      let(:posts_indexes) do
-        [instance_double(ActiveRecord::ConnectionAdapters::IndexDefinition, name: 'index_posts_on_user_id')]
-      end
-
-      it 'returns false' do
-        expect(check.pass?).to be false
-      end
-    end
-
-    context 'when all expected indexes are present' do
-      let(:posts_indexes) do
-        [instance_double(ActiveRecord::ConnectionAdapters::IndexDefinition, name: 'index_posts_on_user_id')]
-      end
-      let(:users_indexes) do
-        [instance_double(ActiveRecord::ConnectionAdapters::IndexDefinition, name: 'index_users_on_profile_id')]
-      end
-
-      it 'returns true' do
-        expect(check.pass?).to be true
-      end
-    end
-  end
-
-  describe '#message' do
-    subject { check.message }
-
-    it 'sets the class name as the message key' do
-      expect(subject.key).to eq(:missing_indexes_check)
-    end
-
-    it 'sets a list of missing indexes as message value' do
-      expect(subject.value).to eq('index_users_on_profile_id, index_posts_on_user_id')
-    end
-  end
-end

From 47f0faebc9cb197ea7b4cf8d191df0a1ec926f59 Mon Sep 17 00:00:00 2001
From: Emelia Smith <ThisIsMissEm@users.noreply.github.com>
Date: Wed, 3 Jul 2024 22:05:59 +0200
Subject: [PATCH 1462/2191] Implement HTML ruby tags for east-asian languages
 (#30897)

---
 lib/sanitize_ext/sanitize_config.rb   | 2 +-
 spec/lib/html_aware_formatter_spec.rb | 8 ++++++++
 spec/lib/plain_text_formatter_spec.rb | 8 ++++++++
 spec/lib/sanitize/config_spec.rb      | 4 ++++
 4 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/lib/sanitize_ext/sanitize_config.rb b/lib/sanitize_ext/sanitize_config.rb
index 70efe7c1ae5993..3379823cb786d8 100644
--- a/lib/sanitize_ext/sanitize_config.rb
+++ b/lib/sanitize_ext/sanitize_config.rb
@@ -65,7 +65,7 @@ module Config
     end
 
     MASTODON_STRICT = freeze_config(
-      elements: %w(p br span a del pre blockquote code b strong u i em ul ol li),
+      elements: %w(p br span a del pre blockquote code b strong u i em ul ol li ruby rt rp),
 
       attributes: {
         'a' => %w(href rel class translate),
diff --git a/spec/lib/html_aware_formatter_spec.rb b/spec/lib/html_aware_formatter_spec.rb
index a20902d4f9ee62..b75ccb06e7632a 100644
--- a/spec/lib/html_aware_formatter_spec.rb
+++ b/spec/lib/html_aware_formatter_spec.rb
@@ -41,6 +41,14 @@
           expect(subject).to_not include 'status__content__spoiler-link'
         end
       end
+
+      context 'when given text containing ruby tags for east-asian languages' do
+        let(:text) { '<ruby>明日 <rp>(</rp><rt>Ashita</rt><rp>)</rp></ruby>' }
+
+        it 'keeps the ruby tags' do
+          expect(subject).to eq '<ruby>明日 <rp>(</rp><rt>Ashita</rt><rp>)</rp></ruby>'
+        end
+      end
     end
   end
 end
diff --git a/spec/lib/plain_text_formatter_spec.rb b/spec/lib/plain_text_formatter_spec.rb
index 80b3c331a6bfcf..b22f473d0ce320 100644
--- a/spec/lib/plain_text_formatter_spec.rb
+++ b/spec/lib/plain_text_formatter_spec.rb
@@ -72,6 +72,14 @@
           expect(subject).to eq 'Lorem ipsum'
         end
       end
+
+      context 'when text contains HTML ruby tags' do
+        let(:status) { Fabricate(:status, account: remote_account, text: '<p>Lorem <ruby>明日 <rp>(</rp><rt>Ashita</rt><rp>)</rp></ruby> ipsum</p>') }
+
+        it 'strips the comment' do
+          expect(subject).to eq 'Lorem 明日 (Ashita) ipsum'
+        end
+      end
     end
   end
 end
diff --git a/spec/lib/sanitize/config_spec.rb b/spec/lib/sanitize/config_spec.rb
index 2d8dc2f63be6fb..fe0b272c0a22ee 100644
--- a/spec/lib/sanitize/config_spec.rb
+++ b/spec/lib/sanitize/config_spec.rb
@@ -18,6 +18,10 @@
       expect(Sanitize.fragment('<p>Check out:</p><ol start="3" reversed=""><li>Foo</li><li>Bar</li></ol>', subject)).to eq '<p>Check out:</p><ol start="3" reversed=""><li>Foo</li><li>Bar</li></ol>'
     end
 
+    it 'keeps ruby tags' do
+      expect(Sanitize.fragment('<p><ruby>明日 <rp>(</rp><rt>Ashita</rt><rp>)</rp></ruby></p>', subject)).to eq '<p><ruby>明日 <rp>(</rp><rt>Ashita</rt><rp>)</rp></ruby></p>'
+    end
+
     it 'removes a without href' do
       expect(Sanitize.fragment('<a>Test</a>', subject)).to eq 'Test'
     end

From 8331f9e379220847020aed9cd0a8a1d6ab0e7d43 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 4 Jul 2024 10:46:27 +0200
Subject: [PATCH 1463/2191] New Crowdin Translations (automated) (#30916)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/gl.json      | 2 +-
 app/javascript/mastodon/locales/he.json      | 8 +++++++-
 app/javascript/mastodon/locales/ia.json      | 4 ++--
 app/javascript/mastodon/locales/sr-Latn.json | 3 +++
 app/javascript/mastodon/locales/sr.json      | 3 +++
 config/locales/ia.yml                        | 8 ++++----
 config/locales/simple_form.ja.yml            | 2 +-
 7 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json
index fae48ed06bf362..03287c7e5224bc 100644
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@@ -224,7 +224,7 @@
   "domain_pill.their_server": "O seu fogar dixital, onde están as súas publicacións.",
   "domain_pill.their_username": "O seu identificador único no seu servidor. É posible atopar usuarias co mesmo nome de usuaria en diferentes servidores.",
   "domain_pill.username": "Nome de usuaria",
-  "domain_pill.whats_in_a_handle": "Que é o alcume?",
+  "domain_pill.whats_in_a_handle": "As partes do alcume?",
   "domain_pill.who_they_are": "O alcume dinos quen é esa persoa e onde está, para que poidas interactuar con ela en toda a web social de <button>plataformas ActivityPub</button>.",
   "domain_pill.who_you_are": "Como o teu alcume informa de quen es e onde estás, as persoas poden interactuar contigo desde toda a web social de <button>plataformas ActivityPub</button>.",
   "domain_pill.your_handle": "O teu alcume:",
diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json
index e022eac110b69a..8111a56e895f8c 100644
--- a/app/javascript/mastodon/locales/he.json
+++ b/app/javascript/mastodon/locales/he.json
@@ -35,7 +35,9 @@
   "account.follow_back": "לעקוב בחזרה",
   "account.followers": "עוקבים",
   "account.followers.empty": "אף אחד לא עוקב אחר המשתמש הזה עדיין.",
+  "account.followers_counter": "{count, plural,one {עוקב אחד} other {{count} עוקבים}}",
   "account.following": "נעקבים",
+  "account.following_counter": "{count, plural,one {עוקב אחרי {count}}other {עוקב אחרי {count}}}",
   "account.follows.empty": "משתמש זה עדיין לא עוקב אחרי אף אחד.",
   "account.go_to_profile": "מעבר לפרופיל",
   "account.hide_reblogs": "להסתיר הידהודים מאת @{name}",
@@ -61,6 +63,7 @@
   "account.requested_follow": "{name} ביקשו לעקוב אחריך",
   "account.share": "שתף את הפרופיל של @{name}",
   "account.show_reblogs": "הצג הדהודים מאת @{name}",
+  "account.statuses_counter": "{count, plural, one {הודעה אחת} two {הודעותיים} many {{count} הודעות} other {{count} הודעות}}",
   "account.unblock": "להסיר חסימה ל- @{name}",
   "account.unblock_domain": "הסירי את החסימה של קהילת {domain}",
   "account.unblock_short": "הסר חסימה",
@@ -693,8 +696,11 @@
   "server_banner.about_active_users": "משתמשים פעילים בשרת ב־30 הימים האחרונים (משתמשים פעילים חודשיים)",
   "server_banner.active_users": "משתמשים פעילים",
   "server_banner.administered_by": "מנוהל ע\"י:",
+  "server_banner.is_one_of_many": "{domain} הוא שרת אחד משרתי מסטודון עצמאיים רבים שדרגם תוכלו להשתתף בפדיוורס (רשת חברתית מבוזרת).",
   "server_banner.server_stats": "סטטיסטיקות שרת:",
   "sign_in_banner.create_account": "יצירת חשבון",
+  "sign_in_banner.follow_anyone": "תוכלו לעקוב אחרי כל משמתמש בפדיוורס ולקרוא הכל לפי סדר הפרסום בציר הזמן. אין אלגוריתמים, פרסומות, או קליקבייט מטעם בעלי הרשת.",
+  "sign_in_banner.mastodon_is": "מסטודון הוא הדרך הטובה ביותר לעקוב אחרי מה שקורה.",
   "sign_in_banner.sign_in": "התחברות",
   "sign_in_banner.sso_redirect": "התחברות/הרשמה",
   "status.admin_account": "פתח/י ממשק ניהול עבור @{name}",
@@ -771,7 +777,7 @@
   "timeline_hint.resources.followers": "עוקבים",
   "timeline_hint.resources.follows": "נעקבים",
   "timeline_hint.resources.statuses": "הודעות ישנות יותר",
-  "trends.counter_by_accounts": "{count, plural, one {אדם {count}} other {{count} א.נשים}} {days, plural, one {מאז אתמול} two {ביומיים האחרונים} other {במשך {days} הימים האחרונים}}",
+  "trends.counter_by_accounts": "{count, plural, one {אדם אחד} other {{count} א.נשים}} {days, plural, one {מאז אתמול} two {ביומיים האחרונים} other {במשך {days} הימים האחרונים}}",
   "trends.trending_now": "נושאים חמים",
   "ui.beforeunload": "הטיוטא תאבד אם תעזבו את מסטודון.",
   "units.short.billion": "{count} מליארד",
diff --git a/app/javascript/mastodon/locales/ia.json b/app/javascript/mastodon/locales/ia.json
index a2e64c10f15ef8..ace6402ee145de 100644
--- a/app/javascript/mastodon/locales/ia.json
+++ b/app/javascript/mastodon/locales/ia.json
@@ -354,7 +354,7 @@
   "home.pending_critical_update.link": "Vider actualisationes",
   "home.pending_critical_update.title": "Actualisation de securitate critic disponibile!",
   "home.show_announcements": "Monstrar annuncios",
-  "interaction_modal.description.favourite": "Con un conto sur Mastodon, tu pote marcar iste message como favorite pro informar le autor que tu lo apprecia e salveguarda pro plus tarde.",
+  "interaction_modal.description.favourite": "Con un conto sur Mastodon, tu pote marcar iste message como favorite pro informar le autor que tu lo apprecia e lo salva pro plus tarde.",
   "interaction_modal.description.follow": "Con un conto sur Mastodon, tu pote sequer {name} e reciper su messages in tu fluxo de initio.",
   "interaction_modal.description.reblog": "Con un conto sur Mastodon, tu pote impulsar iste message pro condivider lo con tu proprie sequitores.",
   "interaction_modal.description.reply": "Con un conto sur Mastodon, tu pote responder a iste message.",
@@ -764,7 +764,7 @@
   "status.unmute_conversation": "Non plus silentiar conversation",
   "status.unpin": "Disfixar del profilo",
   "subscribed_languages.lead": "Solmente le messages in le linguas seligite apparera in tu chronologias de initio e de listas post le cambiamento. Selige necun pro reciper messages in tote le linguas.",
-  "subscribed_languages.save": "Salveguardar le cambiamentos",
+  "subscribed_languages.save": "Salvar le cambiamentos",
   "subscribed_languages.target": "Cambiar le linguas subscribite pro {target}",
   "tabs_bar.home": "Initio",
   "tabs_bar.notifications": "Notificationes",
diff --git a/app/javascript/mastodon/locales/sr-Latn.json b/app/javascript/mastodon/locales/sr-Latn.json
index 93c3b8fe2ea806..71b69d428af7ab 100644
--- a/app/javascript/mastodon/locales/sr-Latn.json
+++ b/app/javascript/mastodon/locales/sr-Latn.json
@@ -35,7 +35,9 @@
   "account.follow_back": "Uzvrati praćenje",
   "account.followers": "Pratioci",
   "account.followers.empty": "Još uvek niko ne prati ovog korisnika.",
+  "account.followers_counter": "{count, plural, one {{counter} pratilac} few {{counter} pratioca} other {{counter} pratilaca}}",
   "account.following": "Prati",
+  "account.following_counter": "{count, plural, one {{counter} prati} few {{counter} prati} other {{counter} prati}}",
   "account.follows.empty": "Ovaj korisnik još uvek nikog ne prati.",
   "account.go_to_profile": "Idi na profil",
   "account.hide_reblogs": "Sakrij podržavanja @{name}",
@@ -61,6 +63,7 @@
   "account.requested_follow": "{name} je zatražio da vas prati",
   "account.share": "Podeli profil korisnika @{name}",
   "account.show_reblogs": "Prikaži podržavanja od korisnika @{name}",
+  "account.statuses_counter": "{count, plural, one {{counter} objava} few {{counter} objave} other {{counter} objava}}",
   "account.unblock": "Odblokiraj korisnika @{name}",
   "account.unblock_domain": "Odblokiraj domen {domain}",
   "account.unblock_short": "Odblokiraj",
diff --git a/app/javascript/mastodon/locales/sr.json b/app/javascript/mastodon/locales/sr.json
index 0273002b37a35f..2c4649f9d03941 100644
--- a/app/javascript/mastodon/locales/sr.json
+++ b/app/javascript/mastodon/locales/sr.json
@@ -35,7 +35,9 @@
   "account.follow_back": "Узврати праћење",
   "account.followers": "Пратиоци",
   "account.followers.empty": "Још увек нико не прати овог корисника.",
+  "account.followers_counter": "{count, plural, one {{counter} пратилац} few {{counter} пратиоца} other {{counter} пратилаца}}",
   "account.following": "Прати",
+  "account.following_counter": "{count, plural, one {{counter} прати} few {{counter} прати} other {{counter} прати}}",
   "account.follows.empty": "Овај корисник још увек никог не прати.",
   "account.go_to_profile": "Иди на профил",
   "account.hide_reblogs": "Сакриј подржавања од @{name}",
@@ -61,6 +63,7 @@
   "account.requested_follow": "{name} је затражио да вас прати",
   "account.share": "Подели профил корисника @{name}",
   "account.show_reblogs": "Прикажи подржавања од корисника @{name}",
+  "account.statuses_counter": "{count, plural, one {{counter} објава} few {{counter} објаве} other {{counter} објава}}",
   "account.unblock": "Одблокирај корисника @{name}",
   "account.unblock_domain": "Одблокирај домен {domain}",
   "account.unblock_short": "Одблокирај",
diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index 4932d42acfbea1..7350ffceeb8a05 100644
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -574,7 +574,7 @@ ia:
       enabled: Activate
       inbox_url: URL del repetitor
       pending: Attende le approbation del repetitor
-      save_and_enable: Salveguardar e activar
+      save_and_enable: Salvar e activar
       setup: Crear un connexion con un repetitor
       signatures_not_enabled: Le repetitores pote non functionar correctemente durante que le modo secur o le modo de federation limitate es activate
       status: Stato
@@ -1276,7 +1276,7 @@ ia:
         other: "%{count} messages individual celate"
       title: Filtros
     new:
-      save: Salveguardar nove filtro
+      save: Salvar nove filtro
       title: Adder nove filtro
     statuses:
       back_to_filter: Retro al filtro
@@ -1294,14 +1294,14 @@ ia:
       one: "<strong>%{count}</strong> elemento correspondente al recerca es seligite."
       other: Tote le <strong>%{count}</strong> elementos correspondente al recerca es seligite.
     cancel: Cancellar
-    changes_saved_msg: Cambios salveguardate con successo!
+    changes_saved_msg: Le cambiamentos ha essite salvate!
     confirm: Confirmar
     copy: Copiar
     delete: Deler
     deselect: Deseliger toto
     none: Necun
     order_by: Ordinar per
-    save_changes: Salvar le cambios
+    save_changes: Salvar le cambiamentos
     select_all_matching_items:
       one: Selige %{count} elemento correspondente a tu recerca.
       other: Selige %{count} elementos correspondente a tu recerca.
diff --git a/config/locales/simple_form.ja.yml b/config/locales/simple_form.ja.yml
index c0698c3f7a755c..664082dabc41ce 100644
--- a/config/locales/simple_form.ja.yml
+++ b/config/locales/simple_form.ja.yml
@@ -81,7 +81,7 @@ ja:
         backups_retention_period: ユーザーには、後でダウンロードするために投稿のアーカイブを生成する機能があります。正の値に設定すると、これらのアーカイブは指定された日数後に自動的にストレージから削除されます。
         bootstrap_timeline_accounts: これらのアカウントは、新しいユーザー向けのおすすめユーザーの一番上にピン留めされます。
         closed_registrations_message: アカウント作成を停止している時に表示されます
-        content_cache_retention_period: 他のサーバーからのすべての投稿（ブーストや返信を含む）は、指定された日数が経過すると、ローカルユーザーとのやりとりに関係なく削除されます。これには、ローカルユーザーがブックマークやお気に入りとして登録した投稿も含まれます。異なるサーバーのユーザー間の非公開な変身も失われ、復元することは不可能です。この設定の使用は特別な目的のインスタンスのためのものであり、一般的な目的のサーバーで使用するした場合、多くのユーザーの期待を裏切ることになります。
+        content_cache_retention_period: 他のサーバーからのすべての投稿（ブーストや返信を含む）は、指定された日数が経過すると、ローカルユーザーとのやりとりに関係なく削除されます。これには、ローカルユーザーがブックマークやお気に入りとして登録した投稿も含まれます。異なるサーバーのユーザー間の非公開な返信も失われ、復元することは不可能です。この設定の使用は特別な目的のインスタンスのためのものであり、一般的な目的のサーバーで使用した場合、多くのユーザーの期待を裏切ることになります。
         custom_css: ウェブ版のMastodonでカスタムスタイルを適用できます。
         favicon: デフォルトのMastodonのブックマークアイコンを独自のアイコンで上書きします。WEBP、PNG、GIF、JPGが利用可能です。
         mascot: 上級者向けWebインターフェースのイラストを上書きします。

From 528661a091bbef5b5359bfacd1478231a1cb7d10 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 4 Jul 2024 15:46:08 +0200
Subject: [PATCH 1464/2191] fix(deps): update dependency pino-http to v10.2.0
 (#30913)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 8e72138a153cab..52a8fff72f66e0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -13139,14 +13139,14 @@ __metadata:
   linkType: hard
 
 "pino-http@npm:^10.0.0":
-  version: 10.1.0
-  resolution: "pino-http@npm:10.1.0"
+  version: 10.2.0
+  resolution: "pino-http@npm:10.2.0"
   dependencies:
     get-caller-file: "npm:^2.0.5"
     pino: "npm:^9.0.0"
     pino-std-serializers: "npm:^7.0.0"
     process-warning: "npm:^3.0.0"
-  checksum: 10c0/d97691f2ee248b0aca0e49169d0c7ca0d4c604ee57b63ae264a6f9914fc7277cace74686d5088a876f8152a8d5b8211af904b2d24a516728a662de0e9cc79e9f
+  checksum: 10c0/0b79cd3602531ee5043693e2a3ccf9d955bd93759e80c0b3a458b95b241f36ca8ebc72c8050b395e9d8fcb9581ebc18ecd6b7dc136526bebe924bc5c5079374d
   languageName: node
   linkType: hard
 

From b73014761807f3171b7ecb46052e9aa618b9c029 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 4 Jul 2024 15:46:14 +0200
Subject: [PATCH 1465/2191] fix(deps): update dependency ws to v8.18.0 (#30914)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 52a8fff72f66e0..d61ef41632453b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -18491,8 +18491,8 @@ __metadata:
   linkType: hard
 
 "ws@npm:^8.11.0, ws@npm:^8.12.1, ws@npm:^8.17.0":
-  version: 8.17.1
-  resolution: "ws@npm:8.17.1"
+  version: 8.18.0
+  resolution: "ws@npm:8.18.0"
   peerDependencies:
     bufferutil: ^4.0.1
     utf-8-validate: ">=5.0.2"
@@ -18501,7 +18501,7 @@ __metadata:
       optional: true
     utf-8-validate:
       optional: true
-  checksum: 10c0/f4a49064afae4500be772abdc2211c8518f39e1c959640457dcee15d4488628620625c783902a52af2dd02f68558da2868fd06e6fd0e67ebcd09e6881b1b5bfe
+  checksum: 10c0/25eb33aff17edcb90721ed6b0eb250976328533ad3cd1a28a274bd263682e7296a6591ff1436d6cbc50fa67463158b062f9d1122013b361cec99a05f84680e06
   languageName: node
   linkType: hard
 

From 395f17ca17b27f9e722425a4d76ef1b02bcebea8 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 4 Jul 2024 16:11:28 +0200
Subject: [PATCH 1466/2191] Merge pull request from GHSA-vp5r-5pgw-jwqx

* Fix streaming sessions not being closed when revoking access to an app

* Add tests for GHSA-7w3c-p9j8-mq3x
---
 .../oauth/authorized_applications_controller.rb        |  1 +
 app/lib/application_extension.rb                       |  8 +++++---
 .../oauth/authorized_applications_controller_spec.rb   |  6 ++++++
 .../settings/applications_controller_spec.rb           | 10 +++++++++-
 4 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/app/controllers/oauth/authorized_applications_controller.rb b/app/controllers/oauth/authorized_applications_controller.rb
index 8440df6b7e69a9..7bb22453ca0e11 100644
--- a/app/controllers/oauth/authorized_applications_controller.rb
+++ b/app/controllers/oauth/authorized_applications_controller.rb
@@ -17,6 +17,7 @@ class Oauth::AuthorizedApplicationsController < Doorkeeper::AuthorizedApplicatio
 
   def destroy
     Web::PushSubscription.unsubscribe_for(params[:id], current_resource_owner)
+    Doorkeeper::Application.find_by(id: params[:id])&.close_streaming_sessions(current_resource_owner)
     super
   end
 
diff --git a/app/lib/application_extension.rb b/app/lib/application_extension.rb
index 2fea1057cb6db3..d7aaeba5bded76 100644
--- a/app/lib/application_extension.rb
+++ b/app/lib/application_extension.rb
@@ -16,7 +16,7 @@ module ApplicationExtension
     # dependent: delete_all, which means the ActiveRecord callback in
     # AccessTokenExtension is not run, so instead we manually announce to
     # streaming that these tokens are being deleted.
-    before_destroy :push_to_streaming_api, prepend: true
+    before_destroy :close_streaming_sessions, prepend: true
   end
 
   def confirmation_redirect_uri
@@ -29,10 +29,12 @@ def redirect_uris
     redirect_uri.split
   end
 
-  def push_to_streaming_api
+  def close_streaming_sessions(resource_owner = nil)
     # TODO: #28793 Combine into a single topic
     payload = Oj.dump(event: :kill)
-    access_tokens.in_batches do |tokens|
+    scope = access_tokens
+    scope = scope.where(resource_owner_id: resource_owner.id) unless resource_owner.nil?
+    scope.in_batches do |tokens|
       redis.pipelined do |pipeline|
         tokens.ids.each do |id|
           pipeline.publish("timeline:access_token:#{id}", payload)
diff --git a/spec/controllers/oauth/authorized_applications_controller_spec.rb b/spec/controllers/oauth/authorized_applications_controller_spec.rb
index b46b944d0eaa3d..3fd9f9499f4387 100644
--- a/spec/controllers/oauth/authorized_applications_controller_spec.rb
+++ b/spec/controllers/oauth/authorized_applications_controller_spec.rb
@@ -50,9 +50,11 @@
     let!(:application) { Fabricate(:application) }
     let!(:access_token) { Fabricate(:accessible_access_token, application: application, resource_owner_id: user.id) }
     let!(:web_push_subscription) { Fabricate(:web_push_subscription, user: user, access_token: access_token) }
+    let(:redis_pipeline_stub) { instance_double(Redis::Namespace, publish: nil) }
 
     before do
       sign_in user, scope: :user
+      allow(redis).to receive(:pipelined).and_yield(redis_pipeline_stub)
       post :destroy, params: { id: application.id }
     end
 
@@ -67,5 +69,9 @@
     it 'removes the web_push_subscription' do
       expect { web_push_subscription.reload }.to raise_error(ActiveRecord::RecordNotFound)
     end
+
+    it 'sends a session kill payload to the streaming server' do
+      expect(redis_pipeline_stub).to have_received(:publish).with("timeline:access_token:#{access_token.id}", '{"event":"kill"}')
+    end
   end
 end
diff --git a/spec/controllers/settings/applications_controller_spec.rb b/spec/controllers/settings/applications_controller_spec.rb
index ccbb6349117c51..ce2e0749a763b8 100644
--- a/spec/controllers/settings/applications_controller_spec.rb
+++ b/spec/controllers/settings/applications_controller_spec.rb
@@ -147,14 +147,22 @@
   end
 
   describe 'destroy' do
+    let(:redis_pipeline_stub) { instance_double(Redis::Namespace, publish: nil) }
+    let!(:access_token) { Fabricate(:accessible_access_token, application: app) }
+
     before do
+      allow(redis).to receive(:pipelined).and_yield(redis_pipeline_stub)
       post :destroy, params: { id: app.id }
     end
 
-    it 'redirects back to applications page and removes the app' do
+    it 'redirects back to applications page removes the app' do
       expect(response).to redirect_to(settings_applications_path)
       expect(Doorkeeper::Application.find_by(id: app.id)).to be_nil
     end
+
+    it 'sends a session kill payload to the streaming server' do
+      expect(redis_pipeline_stub).to have_received(:publish).with("timeline:access_token:#{access_token.id}", '{"event":"kill"}')
+    end
   end
 
   describe 'regenerate' do

From 502cf75b160c76f963a179d46498e3ea1a9fefca Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 4 Jul 2024 16:26:49 +0200
Subject: [PATCH 1467/2191] Merge pull request from GHSA-58x8-3qxw-6hm7

* Fix insufficient permission checking for public timeline endpoints

Note that this changes unauthenticated access failure code from 401 to 422

* Add more tests for public timelines

* Require user token in `/api/v1/statuses/:id/translate` and `/api/v1/scheduled_statuses`
---
 .../api/v1/scheduled_statuses_controller.rb   |  1 +
 .../v1/statuses/translations_controller.rb    |  1 +
 .../api/v1/timelines/base_controller.rb       |  6 +++++
 .../api/v1/timelines/link_controller.rb       |  6 +----
 .../api/v1/timelines/public_controller.rb     |  6 +----
 .../api/v1/timelines/tag_controller.rb        |  2 +-
 spec/requests/api/v1/scheduled_status_spec.rb | 11 +++++++++
 .../api/v1/statuses/translations_spec.rb      | 16 +++++++++++++
 spec/requests/api/v1/timelines/link_spec.rb   | 20 +++++++++++++---
 spec/requests/api/v1/timelines/public_spec.rb | 24 +++++++++++++++----
 spec/requests/api/v1/timelines/tag_spec.rb    | 10 +++++---
 11 files changed, 81 insertions(+), 22 deletions(-)

diff --git a/app/controllers/api/v1/scheduled_statuses_controller.rb b/app/controllers/api/v1/scheduled_statuses_controller.rb
index 45ee58651888da..c62305d7114450 100644
--- a/app/controllers/api/v1/scheduled_statuses_controller.rb
+++ b/app/controllers/api/v1/scheduled_statuses_controller.rb
@@ -6,6 +6,7 @@ class Api::V1::ScheduledStatusesController < Api::BaseController
   before_action -> { doorkeeper_authorize! :read, :'read:statuses' }, except: [:update, :destroy]
   before_action -> { doorkeeper_authorize! :write, :'write:statuses' }, only: [:update, :destroy]
 
+  before_action :require_user!
   before_action :set_statuses, only: :index
   before_action :set_status, except: :index
 
diff --git a/app/controllers/api/v1/statuses/translations_controller.rb b/app/controllers/api/v1/statuses/translations_controller.rb
index 7d406b0a36d1e6..8cf495f78ac95d 100644
--- a/app/controllers/api/v1/statuses/translations_controller.rb
+++ b/app/controllers/api/v1/statuses/translations_controller.rb
@@ -2,6 +2,7 @@
 
 class Api::V1::Statuses::TranslationsController < Api::V1::Statuses::BaseController
   before_action -> { doorkeeper_authorize! :read, :'read:statuses' }
+  before_action :require_user!
   before_action :set_translation
 
   rescue_from TranslationService::NotConfiguredError, with: :not_found
diff --git a/app/controllers/api/v1/timelines/base_controller.rb b/app/controllers/api/v1/timelines/base_controller.rb
index e79eba79ee575d..1dba4a5bb21d58 100644
--- a/app/controllers/api/v1/timelines/base_controller.rb
+++ b/app/controllers/api/v1/timelines/base_controller.rb
@@ -3,8 +3,14 @@
 class Api::V1::Timelines::BaseController < Api::BaseController
   after_action :insert_pagination_headers, unless: -> { @statuses.empty? }
 
+  before_action :require_user!, if: :require_auth?
+
   private
 
+  def require_auth?
+    !Setting.timeline_preview
+  end
+
   def pagination_collection
     @statuses
   end
diff --git a/app/controllers/api/v1/timelines/link_controller.rb b/app/controllers/api/v1/timelines/link_controller.rb
index af962c430ffd07..37ed084f0626ad 100644
--- a/app/controllers/api/v1/timelines/link_controller.rb
+++ b/app/controllers/api/v1/timelines/link_controller.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Api::V1::Timelines::LinkController < Api::V1::Timelines::BaseController
-  before_action -> { doorkeeper_authorize! :read, :'read:statuses' }, only: :show, if: :require_auth?
+  before_action -> { authorize_if_got_token! :read, :'read:statuses' }
   before_action :set_preview_card
   before_action :set_statuses
 
@@ -17,10 +17,6 @@ def show
 
   private
 
-  def require_auth?
-    !Setting.timeline_preview
-  end
-
   def set_preview_card
     @preview_card = PreviewCard.joins(:trend).merge(PreviewCardTrend.allowed).find_by!(url: params[:url])
   end
diff --git a/app/controllers/api/v1/timelines/public_controller.rb b/app/controllers/api/v1/timelines/public_controller.rb
index d164854d6a3753..029e8fc2c13b9f 100644
--- a/app/controllers/api/v1/timelines/public_controller.rb
+++ b/app/controllers/api/v1/timelines/public_controller.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Api::V1::Timelines::PublicController < Api::V1::Timelines::BaseController
-  before_action :require_user!, only: [:show], if: :require_auth?
+  before_action -> { authorize_if_got_token! :read, :'read:statuses' }
 
   PERMITTED_PARAMS = %i(local remote limit only_media).freeze
 
@@ -13,10 +13,6 @@ def show
 
   private
 
-  def require_auth?
-    !Setting.timeline_preview
-  end
-
   def load_statuses
     preloaded_public_statuses_page
   end
diff --git a/app/controllers/api/v1/timelines/tag_controller.rb b/app/controllers/api/v1/timelines/tag_controller.rb
index 3bf8f374e196f3..2b097aab0f85b8 100644
--- a/app/controllers/api/v1/timelines/tag_controller.rb
+++ b/app/controllers/api/v1/timelines/tag_controller.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Api::V1::Timelines::TagController < Api::V1::Timelines::BaseController
-  before_action -> { doorkeeper_authorize! :read, :'read:statuses' }, only: :show, if: :require_auth?
+  before_action -> { authorize_if_got_token! :read, :'read:statuses' }
   before_action :load_tag
 
   PERMITTED_PARAMS = %i(local limit only_media).freeze
diff --git a/spec/requests/api/v1/scheduled_status_spec.rb b/spec/requests/api/v1/scheduled_status_spec.rb
index 49ccde275ce7ae..f4612410bf38cc 100644
--- a/spec/requests/api/v1/scheduled_status_spec.rb
+++ b/spec/requests/api/v1/scheduled_status_spec.rb
@@ -25,6 +25,17 @@
       it_behaves_like 'forbidden for wrong scope', 'write write:statuses'
     end
 
+    context 'with an application token' do
+      let(:token) { Fabricate(:accessible_access_token, resource_owner_id: nil, scopes: 'read:statuses') }
+
+      it 'returns http unprocessable entity' do
+        get api_v1_scheduled_statuses_path, headers: headers
+
+        expect(response)
+          .to have_http_status(422)
+      end
+    end
+
     context 'with correct scope' do
       let(:scopes) { 'read:statuses' }
 
diff --git a/spec/requests/api/v1/statuses/translations_spec.rb b/spec/requests/api/v1/statuses/translations_spec.rb
index 5b0a994561c184..e2ab5d0b806825 100644
--- a/spec/requests/api/v1/statuses/translations_spec.rb
+++ b/spec/requests/api/v1/statuses/translations_spec.rb
@@ -8,6 +8,22 @@
   let(:scopes)  { 'read:statuses' }
   let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
 
+  context 'with an application token' do
+    let(:token) { Fabricate(:accessible_access_token, resource_owner_id: nil, scopes: scopes) }
+
+    describe 'POST /api/v1/statuses/:status_id/translate' do
+      let(:status) { Fabricate(:status, account: user.account, text: 'Hola', language: 'es') }
+
+      before do
+        post "/api/v1/statuses/#{status.id}/translate", headers: headers
+      end
+
+      it 'returns http unprocessable entity' do
+        expect(response).to have_http_status(422)
+      end
+    end
+  end
+
   context 'with an oauth token' do
     describe 'POST /api/v1/statuses/:status_id/translate' do
       let(:status) { Fabricate(:status, account: user.account, text: 'Hola', language: 'es') }
diff --git a/spec/requests/api/v1/timelines/link_spec.rb b/spec/requests/api/v1/timelines/link_spec.rb
index a219c9bcddec02..e1c914ab81a4ac 100644
--- a/spec/requests/api/v1/timelines/link_spec.rb
+++ b/spec/requests/api/v1/timelines/link_spec.rb
@@ -41,6 +41,8 @@
       end
     end
 
+    it_behaves_like 'forbidden for wrong scope', 'profile'
+
     context 'when there is no preview card' do
       let(:preview_card) { nil }
 
@@ -80,13 +82,25 @@
         Form::AdminSettings.new(timeline_preview: false).save
       end
 
-      context 'when the user is not authenticated' do
+      it_behaves_like 'forbidden for wrong scope', 'profile'
+
+      context 'without an authentication token' do
         let(:headers) { {} }
 
-        it 'returns http unauthorized' do
+        it 'returns http unprocessable entity' do
+          subject
+
+          expect(response).to have_http_status(422)
+        end
+      end
+
+      context 'with an application access token, not bound to a user' do
+        let(:token) { Fabricate(:accessible_access_token, resource_owner_id: nil, scopes: scopes) }
+
+        it 'returns http unprocessable entity' do
           subject
 
-          expect(response).to have_http_status(401)
+          expect(response).to have_http_status(422)
         end
       end
 
diff --git a/spec/requests/api/v1/timelines/public_spec.rb b/spec/requests/api/v1/timelines/public_spec.rb
index 364e48d3d2f824..100f6c1bfc17ec 100644
--- a/spec/requests/api/v1/timelines/public_spec.rb
+++ b/spec/requests/api/v1/timelines/public_spec.rb
@@ -34,6 +34,8 @@
     context 'when the instance allows public preview' do
       let(:expected_statuses) { [local_status, remote_status, media_status] }
 
+      it_behaves_like 'forbidden for wrong scope', 'profile'
+
       context 'with an authorized user' do
         it_behaves_like 'a successful request to the public timeline'
       end
@@ -99,14 +101,20 @@
         Form::AdminSettings.new(timeline_preview: false).save
       end
 
-      context 'with an authenticated user' do
-        let(:expected_statuses) { [local_status, remote_status, media_status] }
+      it_behaves_like 'forbidden for wrong scope', 'profile'
 
-        it_behaves_like 'a successful request to the public timeline'
+      context 'without an authentication token' do
+        let(:headers) { {} }
+
+        it 'returns http unprocessable entity' do
+          subject
+
+          expect(response).to have_http_status(422)
+        end
       end
 
-      context 'with an unauthenticated user' do
-        let(:headers) { {} }
+      context 'with an application access token, not bound to a user' do
+        let(:token) { Fabricate(:accessible_access_token, resource_owner_id: nil, scopes: scopes) }
 
         it 'returns http unprocessable entity' do
           subject
@@ -114,6 +122,12 @@
           expect(response).to have_http_status(422)
         end
       end
+
+      context 'with an authenticated user' do
+        let(:expected_statuses) { [local_status, remote_status, media_status] }
+
+        it_behaves_like 'a successful request to the public timeline'
+      end
     end
   end
 end
diff --git a/spec/requests/api/v1/timelines/tag_spec.rb b/spec/requests/api/v1/timelines/tag_spec.rb
index 8611341702d95c..5e1415bb1acb16 100644
--- a/spec/requests/api/v1/timelines/tag_spec.rb
+++ b/spec/requests/api/v1/timelines/tag_spec.rb
@@ -30,6 +30,8 @@
     let(:params)          { {} }
     let(:hashtag)         { 'life' }
 
+    it_behaves_like 'forbidden for wrong scope', 'profile'
+
     context 'when given only one hashtag' do
       let(:expected_statuses) { [life_status] }
 
@@ -93,13 +95,15 @@
         Form::AdminSettings.new(timeline_preview: false).save
       end
 
-      context 'when the user is not authenticated' do
+      it_behaves_like 'forbidden for wrong scope', 'profile'
+
+      context 'without an authentication token' do
         let(:headers) { {} }
 
-        it 'returns http unauthorized' do
+        it 'returns http unprocessable entity' do
           subject
 
-          expect(response).to have_http_status(401)
+          expect(response).to have_http_status(422)
         end
       end
 

From d3a056adfd0eca4fff57dde65ee9d95ce7c9bb3e Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 4 Jul 2024 16:45:52 +0200
Subject: [PATCH 1468/2191] Merge pull request from GHSA-xjvf-fm67-4qc3

---
 app/lib/activitypub/activity/create.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb
index 7ec7e84bd16200..5d700b49613be4 100644
--- a/app/lib/activitypub/activity/create.rb
+++ b/app/lib/activitypub/activity/create.rb
@@ -104,7 +104,7 @@ def distribute
   def find_existing_status
     status   = status_from_uri(object_uri)
     status ||= Status.find_by(uri: @object['atomUri']) if @object['atomUri'].present?
-    status
+    status if status&.account_id == @account.id
   end
 
   def process_status_params

From df9e26158d9787859b24bdc276af478abf05e1af Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 4 Jul 2024 16:59:54 +0200
Subject: [PATCH 1469/2191] Bump version to v4.3.0-alpha.5 (#30920)

---
 CHANGELOG.md            | 31 +++++++++++++++++++++++++++++++
 docker-compose.yml      |  6 +++---
 lib/mastodon/version.rb |  2 +-
 3 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c9b24d6f159e31..7c3d96ba4a4832 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,37 @@
 
 All notable changes to this project will be documented in this file.
 
+## [4.2.10] - 2024-07-04
+
+### Security
+
+- Fix incorrect permission checking on multiple API endpoints ([GHSA-58x8-3qxw-6hm7](https://github.com/mastodon/mastodon/security/advisories/GHSA-58x8-3qxw-6hm7))
+- Fix incorrect authorship checking when processing some activities (CVE-2024-37903, [GHSA-xjvf-fm67-4qc3](https://github.com/mastodon/mastodon/security/advisories/GHSA-xjvf-fm67-4qc3))
+- Fix ongoing streaming sessions not being invalidated when application tokens get revoked ([GHSA-vp5r-5pgw-jwqx](https://github.com/mastodon/mastodon/security/advisories/GHSA-vp5r-5pgw-jwqx))
+- Update dependencies
+
+### Added
+
+- Add yarn version specification to avoid confusion with Yarn 3 and Yarn 4
+
+### Changed
+
+- Change preview cards generation to skip unusually long URLs ([oneiros](https://github.com/mastodon/mastodon/pull/30854))
+- Change search modifiers to be case-insensitive ([Gargron](https://github.com/mastodon/mastodon/pull/30865))
+- Change `STATSD_ADDR` handling to emit a warning rather than crashing if the address is unreachable ([timothyjrogers](https://github.com/mastodon/mastodon/pull/30691))
+- Change PWA start URL from `/home` to `/` ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/27377))
+
+### Removed
+
+- Removed dependency on `posix-spawn` ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/18559))
+
+### Fixed
+
+- Fix scheduled statuses scheduled in less than 5 minutes being immediately published ([danielmbrasil](https://github.com/mastodon/mastodon/pull/30584))
+- Fix encoding detection for link cards ([oneiros](https://github.com/mastodon/mastodon/pull/30780))
+- Fix `/admin/accounts/:account_id/statuses/:id` for edited posts with media attachments ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/30819))
+- Fix duplicate `@context` attribute in user archive export ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/30653))
+
 ## [4.2.9] - 2024-05-30
 
 ### Security
diff --git a/docker-compose.yml b/docker-compose.yml
index 7089b0d14f3a05..7a6f9be50997de 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -58,7 +58,7 @@ services:
 
   web:
     build: .
-    image: ghcr.io/mastodon/mastodon:v4.2.9
+    image: ghcr.io/mastodon/mastodon:v4.2.10
     restart: always
     env_file: .env.production
     command: bundle exec puma -C config/puma.rb
@@ -79,7 +79,7 @@ services:
 
   streaming:
     build: .
-    image: ghcr.io/mastodon/mastodon:v4.2.9
+    image: ghcr.io/mastodon/mastodon:v4.2.10
     restart: always
     env_file: .env.production
     command: node ./streaming
@@ -97,7 +97,7 @@ services:
 
   sidekiq:
     build: .
-    image: ghcr.io/mastodon/mastodon:v4.2.9
+    image: ghcr.io/mastodon/mastodon:v4.2.10
     restart: always
     env_file: .env.production
     command: bundle exec sidekiq
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index 03972ba938de0b..96ad4092819b29 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -17,7 +17,7 @@ def patch
     end
 
     def default_prerelease
-      'alpha.4'
+      'alpha.5'
     end
 
     def prerelease

From 245684be0fb113f1b753386307a4cf530e92fbe5 Mon Sep 17 00:00:00 2001
From: Jeremy Kescher <jeremy@kescher.at>
Date: Thu, 4 Jul 2024 18:11:47 +0200
Subject: [PATCH 1470/2191] Reset Catstodon revision to 1.0.0 for alpha.5 merge

---
 lib/mastodon/version.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index 85d951206832a9..bca30683e9153d 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -17,7 +17,7 @@ def patch
     end
 
     def default_prerelease
-      'alpha.4'
+      'alpha.5'
     end
 
     def prerelease
@@ -25,7 +25,7 @@ def prerelease
     end
 
     def catstodon_revision
-      '1.1.3'
+      '1.0.0'
     end
 
     def build_metadata

From 8de5df225edb89ef13f5ea2697876018953a97d9 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 5 Jul 2024 10:54:45 +0200
Subject: [PATCH 1471/2191] Change instructions to use `bundle exec rails`
 instead of `rake` (#30917)

---
 .env.production.sample       | 6 +++---
 config/initializers/vapid.rb | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.env.production.sample b/.env.production.sample
index 0bf01bdc361d93..0b458a1aa96dfb 100644
--- a/.env.production.sample
+++ b/.env.production.sample
@@ -1,5 +1,5 @@
 # This is a sample configuration file. You can generate your configuration
-# with the `rake mastodon:setup` interactive setup wizard, but to customize
+# with the `bundle exec rails mastodon:setup` interactive setup wizard, but to customize
 # your setup even further, you'll need to edit it manually. This sample does
 # not demonstrate all available configuration options. Please look at
 # https://docs.joinmastodon.org/admin/config/ for the full documentation.
@@ -40,14 +40,14 @@ ES_PASS=password
 
 # Secrets
 # -------
-# Make sure to use `rake secret` to generate secrets
+# Make sure to use `bundle exec rails secret` to generate secrets
 # -------
 SECRET_KEY_BASE=
 OTP_SECRET=
 
 # Web Push
 # --------
-# Generate with `rake mastodon:webpush:generate_vapid_key`
+# Generate with `bundle exec rails mastodon:webpush:generate_vapid_key`
 # --------
 VAPID_PRIVATE_KEY=
 VAPID_PUBLIC_KEY=
diff --git a/config/initializers/vapid.rb b/config/initializers/vapid.rb
index 7dd870c8b7d9af..551ede34fb9004 100644
--- a/config/initializers/vapid.rb
+++ b/config/initializers/vapid.rb
@@ -5,7 +5,7 @@
   # You should only generate this once per instance. If you later decide to change it, all push subscription will
   # be invalidated, requiring the users to access the website again to resubscribe.
   #
-  # Generate with `rake mastodon:webpush:generate_vapid_key` task (`docker-compose run --rm web rake mastodon:webpush:generate_vapid_key` if you use docker compose)
+  # Generate with `bundle exec rails mastodon:webpush:generate_vapid_key` task (`docker-compose run --rm web bundle exec rails mastodon:webpush:generate_vapid_key` if you use docker compose)
   #
   # For more information visit https://rossta.net/blog/using-the-web-push-api-with-vapid.html
 

From 8c375d8a5c899b735950a7a88670a1bb2b7adcd2 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 5 Jul 2024 04:57:54 -0400
Subject: [PATCH 1472/2191] Use `scope module: ...` for settings/2FA routes
 (#30919)

---
 config/routes/settings.rb | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/config/routes/settings.rb b/config/routes/settings.rb
index 888fa9ecb55543..b14606656b680f 100644
--- a/config/routes/settings.rb
+++ b/config/routes/settings.rb
@@ -37,13 +37,13 @@
     end
   end
 
-  resource :otp_authentication, only: [:show, :create], controller: 'two_factor_authentication/otp_authentication'
+  scope module: :two_factor_authentication do
+    resource :otp_authentication, only: [:show, :create], controller: :otp_authentication
 
-  resources :webauthn_credentials, only: [:index, :new, :create, :destroy],
-                                   path: 'security_keys',
-                                   controller: 'two_factor_authentication/webauthn_credentials' do
-    collection do
-      get :options
+    resources :webauthn_credentials, only: [:index, :new, :create, :destroy], path: 'security_keys' do
+      collection do
+        get :options
+      end
     end
   end
 

From 81547845ac73f860df2c86594fe0bf346745ce0e Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 5 Jul 2024 11:09:40 +0200
Subject: [PATCH 1473/2191] New Crowdin Translations (automated) (#30925)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/ja.json |  2 ++
 app/javascript/mastodon/locales/uk.json |  2 +-
 config/locales/gl.yml                   | 42 ++++++++++++-------------
 config/locales/simple_form.gl.yml       |  2 +-
 4 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index 575c68de038955..60788baff8c695 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -411,6 +411,7 @@
   "limited_account_hint.action": "構わず表示する",
   "limited_account_hint.title": "このプロフィールは{domain}のモデレーターによって非表示にされています。",
   "link_preview.author": "{name}",
+  "link_preview.more_from_author": "{name}さんの投稿をもっと読む",
   "lists.account.add": "リストに追加",
   "lists.account.remove": "リストから外す",
   "lists.delete": "リストを削除",
@@ -693,6 +694,7 @@
   "server_banner.administered_by": "管理者",
   "server_banner.server_stats": "サーバーの情報",
   "sign_in_banner.create_account": "アカウント作成",
+  "sign_in_banner.follow_anyone": "連合内の誰でもフォローして投稿を時系列で見ることができます。アルゴリズム、広告、クリックベイトはありません。",
   "sign_in_banner.sign_in": "ログイン",
   "sign_in_banner.sso_redirect": "ログインまたは登録",
   "status.admin_account": "@{name}さんのモデレーション画面を開く",
diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json
index 150b808f894651..5d7d040fd9bfa9 100644
--- a/app/javascript/mastodon/locales/uk.json
+++ b/app/javascript/mastodon/locales/uk.json
@@ -32,7 +32,7 @@
   "account.featured_tags.last_status_never": "Немає дописів",
   "account.featured_tags.title": "{name} виділяє хештеґи",
   "account.follow": "Підписатися",
-  "account.follow_back": "Підписатися взаємно",
+  "account.follow_back": "Стежити також",
   "account.followers": "Підписники",
   "account.followers.empty": "Ніхто ще не підписаний на цього користувача.",
   "account.followers_counter": "{count, plural, one {{counter} підписник} few {{counter} підписники} many {{counter} підписників} other {{counter} підписники}}",
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index ad4744e15b3e7b..c9f08dcad74d3a 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -31,18 +31,18 @@ gl:
       created_msg: Nota de moderación creada correctamente!
       destroyed_msg: Nota de moderación eliminada de xeito correcto!
     accounts:
-      add_email_domain_block: Bloquear o dominio do email
+      add_email_domain_block: Bloquear o dominio do enderezo
       approve: Aprobar
       approved_msg: Aprobada a solicitude de rexistro de %{username}
       are_you_sure: Está segura?
       avatar: Imaxe de perfil
       by_domain: Dominio
       change_email:
-        changed_msg: Email mudado de xeito correcto!
-        current_email: Email actual
-        label: Mudar email
-        new_email: Novo email
-        submit: Mudar email
+        changed_msg: Correo cambiado de xeito correcto!
+        current_email: Enderezo actual
+        label: Cambiar de enderezo
+        new_email: Novo enderezo
+        submit: Cambiar de enderezo
         title: Mudar email de %{username}
       change_role:
         changed_msg: Rol mudado correctamente!
@@ -64,10 +64,10 @@ gl:
       display_name: Nome a amosar
       domain: Dominio
       edit: Editar
-      email: Email
-      email_status: Estado do email
+      email: Enderezo de correo
+      email_status: Estado do correo
       enable: Activar
-      enable_sign_in_token_auth: Activar autenticación cun token no email
+      enable_sign_in_token_auth: Activar autenticación cun token no correo
       enabled: Activado
       enabled_msg: Desbloqueada a conta de %{username}
       followers: Seguidoras
@@ -132,7 +132,7 @@ gl:
       resubscribe: Resubscribir
       role: Rol
       search: Procurar
-      search_same_email_domain: Outras usuarias co mesmo dominio de email
+      search_same_email_domain: Outras usuarias co mesmo dominio de correo
       search_same_ip: Outras usuarias co mesmo IP
       security: Seguridade
       security_measures:
@@ -154,9 +154,9 @@ gl:
       suspension_irreversible: Elimináronse de xeito irreversible os datos desta conta. Podes reactivar a conta para facela usable novamente pero non recuperará os datos eliminados.
       suspension_reversible_hint_html: Esta conta foi suspendida, e os datos serán totalmente eliminados o %{date}. Ata entón, a conta pode ser restaurada sen danos. Se desexas eliminar agora mesmo todos os datos da conta, podes facelo aquí embaixo.
       title: Contas
-      unblock_email: Desbloquear enderezo de email
-      unblocked_email_msg: Enderezo de email de %{username} desbloqueado
-      unconfirmed_email: Email non confirmado
+      unblock_email: Desbloquear enderezo de correo
+      unblocked_email_msg: Enderezo de correo de %{username} desbloqueado
+      unconfirmed_email: Enderezo de correo sen confirmar
       undo_sensitized: Desmarcar como sensible
       undo_silenced: Desfacer acalar
       undo_suspension: Desfacer suspensión
@@ -173,12 +173,12 @@ gl:
         approve_appeal: Aprobar apelación
         approve_user: Aprobar Usuaria
         assigned_to_self_report: Asignar denuncia
-        change_email_user: Editar email da usuaria
+        change_email_user: Editar correo electrónico da usuaria
         change_role_user: Cambiar Rol da Usuaria
         confirm_user: Confirmar usuaria
         create_account_warning: Crear aviso
         create_announcement: Crear anuncio
-        create_canonical_email_block: Crear Bloqueo de email
+        create_canonical_email_block: Crear Bloqueo de correo electrónico
         create_custom_emoji: Crear emoticonas personalizadas
         create_domain_allow: Crear Dominio Permitido
         create_domain_block: Crear bloquedo do Dominio
@@ -188,7 +188,7 @@ gl:
         create_user_role: Crear Rol
         demote_user: Degradar usuaria
         destroy_announcement: Eliminar anuncio
-        destroy_canonical_email_block: Eliminar Bloqueo de email
+        destroy_canonical_email_block: Eliminar Bloqueo de correo electrónico
         destroy_custom_emoji: Eliminar emoticona personalizada
         destroy_domain_allow: Eliminar Dominio permitido
         destroy_domain_block: Eliminar bloqueo do Dominio
@@ -200,7 +200,7 @@ gl:
         destroy_user_role: Eliminar Rol
         disable_2fa_user: Desactivar 2FA
         disable_custom_emoji: Desactivar emoticona personalizada
-        disable_sign_in_token_auth_user: Desactivar Autenticación por token no email para Usuaria
+        disable_sign_in_token_auth_user: Desactivar Autenticación con token no correo para Usuaria
         disable_user: Desactivar usuaria
         enable_custom_emoji: Activar emoticona personalizada
         enable_sign_in_token_auth_user: Activar Autenticación con token no email para Usuaria
@@ -211,14 +211,14 @@ gl:
         reject_user: Rexeitar Usuaria
         remove_avatar_user: Eliminar avatar
         reopen_report: Reabrir denuncia
-        resend_user: Reenviar o email de confirmación
+        resend_user: Reenviar o correo de confirmación
         reset_password_user: Restabelecer contrasinal
         resolve_report: Resolver denuncia
         sensitive_account: Marca o multimedia da túa conta como sensible
         silence_account: Silenciar conta
         suspend_account: Suspender conta
         unassigned_report: Desasignar denuncia
-        unblock_email_account: Desbloquear enderezo de email
+        unblock_email_account: Desbloquear enderezo de correo
         unsensitive_account: Retira a marca de sensible do multimedia da conta
         unsilence_account: Deixar de silenciar conta
         unsuspend_account: Retirar suspensión de conta
@@ -660,7 +660,7 @@ gl:
         delete_data_html: Eliminar o perfil e contidos de <strong>@%{acct}</strong> para os próximos 30 días a non ser que sexa suspendida nese período
         preview_preamble_html: "<strong>@%{acct}</strong> vai recibir un aviso co seguinte contido:"
         record_strike_html: Anotar un aviso contra <strong>@%{acct}</strong> para axudarche a xestionar futuros problemas con esta conta
-        send_email_html: Enviar un email de aviso a <strong>@%{acct}</strong>
+        send_email_html: Enviar un correo de aviso a <strong>@%{acct}</strong>
         warning_placeholder: Razóns adicionais optativas para a acción de moderación.
       target_origin: Orixe da conta denunciada
       title: Denuncias
@@ -1060,7 +1060,7 @@ gl:
       redirect_to_app_html: Ímoste redirixir á app <strong>%{app_name}</strong>. Se iso non acontece, proba %{clicking_this_link} ou volve ti manualmente á app.
       registration_complete: Completouse a creación da conta en %{domain}!
       welcome_title: Benvida, %{name}!
-      wrong_email_hint: Se o enderezo de email non é correcto, podes cambialo nos axustes da conta.
+      wrong_email_hint: Se o enderezo de correo non é correcto, podes cambialo nos axustes da conta.
     delete_account: Eliminar conta
     delete_account_html: Se queres eliminar a túa conta, podes <a href="%{path}">facelo aquí</a>. Deberás confirmar a acción.
     description:
diff --git a/config/locales/simple_form.gl.yml b/config/locales/simple_form.gl.yml
index 0411c45bc169f4..e46ccb8737fd09 100644
--- a/config/locales/simple_form.gl.yml
+++ b/config/locales/simple_form.gl.yml
@@ -255,7 +255,7 @@ gl:
         require_invite_text: Pedir unha razón para unirse
         show_domain_blocks: Amosar dominios bloqueados
         show_domain_blocks_rationale: Explicar porque están bloqueados os dominios
-        site_contact_email: Email de contacto
+        site_contact_email: Correo de contacto
         site_contact_username: Nome do contacto
         site_extended_description: Descrición ampla
         site_short_description: Descrición do servidor

From a16c2c99b576b6815c9fefede9acc0be0d60d54d Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 5 Jul 2024 11:51:55 +0200
Subject: [PATCH 1474/2191] fix(deps): update dependency cssnano to v7.0.4
 (#30927)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index d61ef41632453b..4c1a7922086e40 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6742,16 +6742,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cssnano-preset-default@npm:^7.0.3":
-  version: 7.0.3
-  resolution: "cssnano-preset-default@npm:7.0.3"
+"cssnano-preset-default@npm:^7.0.4":
+  version: 7.0.4
+  resolution: "cssnano-preset-default@npm:7.0.4"
   dependencies:
     browserslist: "npm:^4.23.1"
     css-declaration-sorter: "npm:^7.2.0"
     cssnano-utils: "npm:^5.0.0"
     postcss-calc: "npm:^10.0.0"
     postcss-colormin: "npm:^7.0.1"
-    postcss-convert-values: "npm:^7.0.1"
+    postcss-convert-values: "npm:^7.0.2"
     postcss-discard-comments: "npm:^7.0.1"
     postcss-discard-duplicates: "npm:^7.0.0"
     postcss-discard-empty: "npm:^7.0.0"
@@ -6778,7 +6778,7 @@ __metadata:
     postcss-unique-selectors: "npm:^7.0.1"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/ab3e51003efed6542a12d43c10ca693ab26138a1d035697b9be8f07e084e37a78617cbb8028b0a7e7841302ec151f4ecf35cbd763efe291846b62c35ea4c0bb4
+  checksum: 10c0/0083821e778bdf7b8aa9589408a01a717be730f73584e7b81756a6fcf87af05b8f17342025e666572a8d573cc30783f2d817b0f7ad63670398bc3135b017ccad
   languageName: node
   linkType: hard
 
@@ -6792,14 +6792,14 @@ __metadata:
   linkType: hard
 
 "cssnano@npm:^7.0.0":
-  version: 7.0.3
-  resolution: "cssnano@npm:7.0.3"
+  version: 7.0.4
+  resolution: "cssnano@npm:7.0.4"
   dependencies:
-    cssnano-preset-default: "npm:^7.0.3"
+    cssnano-preset-default: "npm:^7.0.4"
     lilconfig: "npm:^3.1.2"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/4cbcd1e0ebe0bd83196cc5b16b3a60d3ebc98326c79b2f71df597bb73c8e3ee1f42b89159d7a038acc398251184d648d9dd516f4194e46746f3af6fa74b4aec7
+  checksum: 10c0/3939a0b37b11cb4bae92f7916517c7ba21257551f92517b49a640d5df32e855fb7e73321f4be44d2c2de578309c05d711cdcb1976e95607b1b7f92bd4cbd1350
   languageName: node
   linkType: hard
 
@@ -13339,15 +13339,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-convert-values@npm:^7.0.1":
-  version: 7.0.1
-  resolution: "postcss-convert-values@npm:7.0.1"
+"postcss-convert-values@npm:^7.0.2":
+  version: 7.0.2
+  resolution: "postcss-convert-values@npm:7.0.2"
   dependencies:
     browserslist: "npm:^4.23.1"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/612f025f179f0f2ad7365db8c0b423614dcb8e1e4061875a4691a39dede0bca758d1a8f9f5c8b08e12af053e9e884f65ca5626ccc723d5b3f420650d67fe3046
+  checksum: 10c0/beb59faf6aae97e6d3c233c5e6ed06cc60d65c49eec576036e3d0da1a831a1e827e3d41f5e81d016440b4f0bdf1406268ae069c4d5b38a6667b310c3da079d22
   languageName: node
   linkType: hard
 

From 05f0d510052fb56478986c474192abc7cea3e775 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 5 Jul 2024 13:32:29 +0200
Subject: [PATCH 1475/2191] chore(deps): update dependency sidekiq-scheduler to
 v5.0.5 (#30918)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index eb6720e4542b77..c0fa8a60399867 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -793,10 +793,10 @@ GEM
       redis (>= 4.5.0, < 5)
     sidekiq-bulk (0.2.0)
       sidekiq
-    sidekiq-scheduler (5.0.3)
+    sidekiq-scheduler (5.0.5)
       rufus-scheduler (~> 3.2)
       sidekiq (>= 6, < 8)
-      tilt (>= 1.4.0)
+      tilt (>= 1.4.0, < 3)
     sidekiq-unique-jobs (7.1.33)
       brpoplpush-redis_script (> 0.1.1, <= 2.0.0)
       concurrent-ruby (~> 1.0, >= 1.0.5)

From 016c1e4e788890f0c81a47640f76de136a0a8f32 Mon Sep 17 00:00:00 2001
From: David Roetzel <david@roetzel.de>
Date: Fri, 5 Jul 2024 13:54:38 +0200
Subject: [PATCH 1476/2191] Improve handling of encoding problems when creating
 link previews (#30929)

---
 app/lib/link_details_extractor.rb             | 22 +++++++++++----
 app/services/fetch_link_card_service.rb       |  2 +-
 .../requests/latin1_posing_as_utf8_broken.txt | 17 +++++++++++
 .../latin1_posing_as_utf8_recoverable.txt     | 17 +++++++++++
 spec/services/fetch_link_card_service_spec.rb | 28 +++++++++++++++++--
 5 files changed, 76 insertions(+), 10 deletions(-)
 create mode 100644 spec/fixtures/requests/latin1_posing_as_utf8_broken.txt
 create mode 100644 spec/fixtures/requests/latin1_posing_as_utf8_recoverable.txt

diff --git a/app/lib/link_details_extractor.rb b/app/lib/link_details_extractor.rb
index dbfdd33fccaf3a..9436d20b58a14b 100644
--- a/app/lib/link_details_extractor.rb
+++ b/app/lib/link_details_extractor.rb
@@ -156,11 +156,11 @@ def height
   end
 
   def title
-    html_entities.decode(structured_data&.headline || opengraph_tag('og:title') || document.xpath('//title').map(&:content).first).strip
+    html_entities_decode(structured_data&.headline || opengraph_tag('og:title') || document.xpath('//title').map(&:content).first).strip
   end
 
   def description
-    html_entities.decode(structured_data&.description || opengraph_tag('og:description') || meta_tag('description'))
+    html_entities_decode(structured_data&.description || opengraph_tag('og:description') || meta_tag('description'))
   end
 
   def published_at
@@ -180,7 +180,7 @@ def canonical_url
   end
 
   def provider_name
-    html_entities.decode(structured_data&.publisher_name || opengraph_tag('og:site_name'))
+    html_entities_decode(structured_data&.publisher_name || opengraph_tag('og:site_name'))
   end
 
   def provider_url
@@ -188,7 +188,7 @@ def provider_url
   end
 
   def author_name
-    html_entities.decode(structured_data&.author_name || opengraph_tag('og:author') || opengraph_tag('og:author:username'))
+    html_entities_decode(structured_data&.author_name || opengraph_tag('og:author') || opengraph_tag('og:author:username'))
   end
 
   def author_url
@@ -257,7 +257,7 @@ def structured_data
 
       next if json_ld.blank?
 
-      structured_data = StructuredData.new(html_entities.decode(json_ld))
+      structured_data = StructuredData.new(html_entities_decode(json_ld))
 
       next unless structured_data.valid?
 
@@ -273,10 +273,11 @@ def document
   end
 
   def detect_encoding_and_parse_document
-    [detect_encoding, nil, @html_charset, 'UTF-8'].uniq.each do |encoding|
+    [detect_encoding, nil, @html_charset].uniq.each do |encoding|
       document = Nokogiri::HTML(@html, nil, encoding)
       return document if document.to_s.valid_encoding?
     end
+    Nokogiri::HTML(@html, nil, 'UTF-8')
   end
 
   def detect_encoding
@@ -290,6 +291,15 @@ def detector
     end
   end
 
+  def html_entities_decode(string)
+    return if string.nil?
+
+    unicode_string = string.encode('UTF-8')
+    raise EncodingError, 'cannot convert string to valid UTF-8' unless unicode_string.valid_encoding?
+
+    html_entities.decode(unicode_string)
+  end
+
   def html_entities
     @html_entities ||= HTMLEntities.new(:expanded)
   end
diff --git a/app/services/fetch_link_card_service.rb b/app/services/fetch_link_card_service.rb
index 8bc9f912c55da0..436e024c99bc3d 100644
--- a/app/services/fetch_link_card_service.rb
+++ b/app/services/fetch_link_card_service.rb
@@ -32,7 +32,7 @@ def call(status)
     end
 
     attach_card if @card&.persisted?
-  rescue HTTP::Error, OpenSSL::SSL::SSLError, Addressable::URI::InvalidURIError, Mastodon::HostValidationError, Mastodon::LengthValidationError, Encoding::UndefinedConversionError => e
+  rescue HTTP::Error, OpenSSL::SSL::SSLError, Addressable::URI::InvalidURIError, Mastodon::HostValidationError, Mastodon::LengthValidationError, EncodingError => e
     Rails.logger.debug { "Error fetching link #{@original_url}: #{e}" }
     nil
   end
diff --git a/spec/fixtures/requests/latin1_posing_as_utf8_broken.txt b/spec/fixtures/requests/latin1_posing_as_utf8_broken.txt
new file mode 100644
index 00000000000000..ed8a4716a3eba6
--- /dev/null
+++ b/spec/fixtures/requests/latin1_posing_as_utf8_broken.txt
@@ -0,0 +1,17 @@
+HTTP/1.1 200 OK
+server: nginx
+date: Thu, 13 Jun 2024 14:33:13 GMT
+content-type: text/html; charset=utf-8
+content-length: 158
+accept-ranges: bytes
+
+<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <title>Tofu � l'orange</title>
+</head>
+<body>
+  <h2>Tofu � l'orange</h2>
+</body>
+</html>
diff --git a/spec/fixtures/requests/latin1_posing_as_utf8_recoverable.txt b/spec/fixtures/requests/latin1_posing_as_utf8_recoverable.txt
new file mode 100644
index 00000000000000..a24985832ca551
--- /dev/null
+++ b/spec/fixtures/requests/latin1_posing_as_utf8_recoverable.txt
@@ -0,0 +1,17 @@
+HTTP/1.1 200 OK
+server: nginx
+date: Thu, 13 Jun 2024 14:33:13 GMT
+content-type: text/html; charset=utf-8
+content-length: 158
+accept-ranges: bytes
+
+<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <title>Tofu with orange sauce</title>
+</head>
+<body>
+  <h2>Tofu � l'orange</h2>
+</body>
+</html>
diff --git a/spec/services/fetch_link_card_service_spec.rb b/spec/services/fetch_link_card_service_spec.rb
index d83a5275149962..547737b6143b2d 100644
--- a/spec/services/fetch_link_card_service_spec.rb
+++ b/spec/services/fetch_link_card_service_spec.rb
@@ -27,6 +27,8 @@
     stub_request(:get, 'http://example.com/koi8-r').to_return(request_fixture('koi8-r.txt'))
     stub_request(:get, 'http://example.com/windows-1251').to_return(request_fixture('windows-1251.txt'))
     stub_request(:get, 'http://example.com/low_confidence_latin1').to_return(request_fixture('low_confidence_latin1.txt'))
+    stub_request(:get, 'http://example.com/latin1_posing_as_utf8_broken').to_return(request_fixture('latin1_posing_as_utf8_broken.txt'))
+    stub_request(:get, 'http://example.com/latin1_posing_as_utf8_recoverable').to_return(request_fixture('latin1_posing_as_utf8_recoverable.txt'))
     stub_request(:get, 'http://example.com/aergerliche-umlaute').to_return(request_fixture('redirect_with_utf8_url.txt'))
 
     Rails.cache.write('oembed_endpoint:example.com', oembed_cache) if oembed_cache
@@ -159,10 +161,30 @@
     end
 
     context 'with a URL of a page in ISO-8859-1 encoding, that charlock_holmes cannot detect' do
-      let(:status) { Fabricate(:status, text: 'Check out http://example.com/low_confidence_latin1') }
+      context 'when encoding in http header is correct' do
+        let(:status) { Fabricate(:status, text: 'Check out http://example.com/low_confidence_latin1') }
 
-      it 'decodes the HTML' do
-        expect(status.preview_card.title).to eq("Tofu á l'orange")
+        it 'decodes the HTML' do
+          expect(status.preview_card.title).to eq("Tofu á l'orange")
+        end
+      end
+
+      context 'when encoding in http header is incorrect' do
+        context 'when encoding problems appear in unrelated tags' do
+          let(:status) { Fabricate(:status, text: 'Check out http://example.com/latin1_posing_as_utf8_recoverable') }
+
+          it 'decodes the HTML' do
+            expect(status.preview_card.title).to eq('Tofu with orange sauce')
+          end
+        end
+
+        context 'when encoding problems appear in title tag' do
+          let(:status) { Fabricate(:status, text: 'Check out http://example.com/latin1_posing_as_utf8_broken') }
+
+          it 'does not create a preview card' do
+            expect(status.preview_card).to be_nil
+          end
+        end
       end
     end
 

From 97eddb5906640a79a1cba20823ce10e986f7f317 Mon Sep 17 00:00:00 2001
From: David Roetzel <david@roetzel.de>
Date: Fri, 5 Jul 2024 15:28:52 +0200
Subject: [PATCH 1477/2191] Fix details extraction when no title exists.
 (#30933)

---
 app/lib/link_details_extractor.rb             |  2 +-
 spec/fixtures/requests/page_without_title.txt | 17 +++++++++++++++++
 spec/services/fetch_link_card_service_spec.rb |  9 +++++++++
 3 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 spec/fixtures/requests/page_without_title.txt

diff --git a/app/lib/link_details_extractor.rb b/app/lib/link_details_extractor.rb
index 9436d20b58a14b..a62ede2bb1f356 100644
--- a/app/lib/link_details_extractor.rb
+++ b/app/lib/link_details_extractor.rb
@@ -156,7 +156,7 @@ def height
   end
 
   def title
-    html_entities_decode(structured_data&.headline || opengraph_tag('og:title') || document.xpath('//title').map(&:content).first).strip
+    html_entities_decode(structured_data&.headline || opengraph_tag('og:title') || document.xpath('//title').map(&:content).first)&.strip
   end
 
   def description
diff --git a/spec/fixtures/requests/page_without_title.txt b/spec/fixtures/requests/page_without_title.txt
new file mode 100644
index 00000000000000..0054aa3b7e0db0
--- /dev/null
+++ b/spec/fixtures/requests/page_without_title.txt
@@ -0,0 +1,17 @@
+HTTP/1.1 200 OK
+server: nginx
+date: Thu, 13 Jun 2024 14:33:13 GMT
+content-type: text/html; charset=utf-8
+content-length: 171
+accept-ranges: bytes
+
+<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+</head>
+<body>
+  <h2>I am not a valid page</h2>
+  <p>Thankfully, browsers do not care</p>
+</body>
+</html>
diff --git a/spec/services/fetch_link_card_service_spec.rb b/spec/services/fetch_link_card_service_spec.rb
index 547737b6143b2d..b2cd99cea6d25d 100644
--- a/spec/services/fetch_link_card_service_spec.rb
+++ b/spec/services/fetch_link_card_service_spec.rb
@@ -30,6 +30,7 @@
     stub_request(:get, 'http://example.com/latin1_posing_as_utf8_broken').to_return(request_fixture('latin1_posing_as_utf8_broken.txt'))
     stub_request(:get, 'http://example.com/latin1_posing_as_utf8_recoverable').to_return(request_fixture('latin1_posing_as_utf8_recoverable.txt'))
     stub_request(:get, 'http://example.com/aergerliche-umlaute').to_return(request_fixture('redirect_with_utf8_url.txt'))
+    stub_request(:get, 'http://example.com/page_without_title').to_return(request_fixture('page_without_title.txt'))
 
     Rails.cache.write('oembed_endpoint:example.com', oembed_cache) if oembed_cache
 
@@ -112,6 +113,14 @@
       end
     end
 
+    context 'with a page that has no title' do
+      let(:status) { Fabricate(:status, text: 'http://example.com/page_without_title') }
+
+      it 'does not create a preview card' do
+        expect(status.preview_card).to be_nil
+      end
+    end
+
     context 'with a 404 URL' do
       let(:status) { Fabricate(:status, text: 'http://example.com/not-found') }
 

From 8f5694d79e531b94784697d92bed24d003d77353 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 5 Jul 2024 15:40:53 +0200
Subject: [PATCH 1478/2191] Fix right-to-left text in preview cards (#30930)

---
 app/javascript/mastodon/features/status/components/card.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/features/status/components/card.jsx b/app/javascript/mastodon/features/status/components/card.jsx
index f0ae40cbc412f5..ee1fbe0f8fe826 100644
--- a/app/javascript/mastodon/features/status/components/card.jsx
+++ b/app/javascript/mastodon/features/status/components/card.jsx
@@ -141,7 +141,7 @@ export default class Card extends PureComponent {
     const showAuthor  = !!card.getIn(['authors', 0, 'accountId']);
 
     const description = (
-      <div className='status-card__content'>
+      <div className='status-card__content' dir='auto'>
         <span className='status-card__host'>
           <span lang={language}>{provider}</span>
           {card.get('published_at') && <> · <RelativeTimestamp timestamp={card.get('published_at')} /></>}

From 63ba69810eca80fc2d10114a79f2988c1b75892f Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Sat, 6 Jul 2024 09:22:24 +0200
Subject: [PATCH 1479/2191] Fix overflow behavior on profile fields in hover
 cards (#30928)

---
 app/javascript/styles/mastodon/components.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 12eac79b984dfa..c114885d171043 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -10453,7 +10453,7 @@ noscript {
       gap: 4px;
 
       dt {
-        flex: 0 0 auto;
+        flex: 0 1 auto;
         color: $dark-text-color;
         min-width: 0;
         overflow: hidden;

From aca1decf541ed7ac60176e2f0cf33ee4a481685f Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 5 Jul 2024 15:40:53 +0200
Subject: [PATCH 1480/2191] [Glitch] Fix right-to-left text in preview cards

Port 8f5694d79e531b94784697d92bed24d003d77353 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/features/status/components/card.jsx         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/flavours/glitch/features/status/components/card.jsx b/app/javascript/flavours/glitch/features/status/components/card.jsx
index 0d315cbbf10ad9..933f2b1045b559 100644
--- a/app/javascript/flavours/glitch/features/status/components/card.jsx
+++ b/app/javascript/flavours/glitch/features/status/components/card.jsx
@@ -130,7 +130,7 @@ export default class Card extends PureComponent {
     const showAuthor  = !!card.getIn(['authors', 0, 'accountId']);
 
     const description = (
-      <div className='status-card__content'>
+      <div className='status-card__content' dir='auto'>
         <span className='status-card__host'>
           <span lang={language}>{provider}</span>
           {card.get('published_at') && <> · <RelativeTimestamp timestamp={card.get('published_at')} /></>}

From a99ae90d76d91285c0336411742fa88618af8775 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Sat, 6 Jul 2024 09:22:24 +0200
Subject: [PATCH 1481/2191] [Glitch] Fix overflow behavior on profile fields in
 hover cards

Port 63ba69810eca80fc2d10114a79f2988c1b75892f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/styles/components.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index 5c2a130cb976a4..0f78aa45dc766f 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -11007,7 +11007,7 @@ noscript {
       gap: 4px;
 
       dt {
-        flex: 0 0 auto;
+        flex: 0 1 auto;
         color: $dark-text-color;
         min-width: 0;
         overflow: hidden;

From 1d35626dc7f8422e7b2da9a5e3560fa8f6aa0a25 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Sun, 7 Jul 2024 05:39:31 -0400
Subject: [PATCH 1482/2191] Limit CI push triggers to `main` and `stable-*`
 branches (#30934)

---
 .github/workflows/bundler-audit.yml   |  6 ++++--
 .github/workflows/check-i18n.yml      |  8 ++++++--
 .github/workflows/codeql.yml          | 10 +++++++---
 .github/workflows/crowdin-upload.yml  |  4 +++-
 .github/workflows/format-check.yml    |  4 ++++
 .github/workflows/lint-css.yml        |  7 ++++---
 .github/workflows/lint-haml.yml       |  7 ++++---
 .github/workflows/lint-js.yml         |  7 ++++---
 .github/workflows/lint-ruby.yml       |  7 ++++---
 .github/workflows/test-js.yml         |  7 ++++---
 .github/workflows/test-migrations.yml |  7 ++++---
 .github/workflows/test-ruby.yml       |  7 ++++---
 12 files changed, 52 insertions(+), 29 deletions(-)

diff --git a/.github/workflows/bundler-audit.yml b/.github/workflows/bundler-audit.yml
index e3e2da0c787a54..2341d6e67f6241 100644
--- a/.github/workflows/bundler-audit.yml
+++ b/.github/workflows/bundler-audit.yml
@@ -1,8 +1,10 @@
 name: Bundler Audit
 on:
+  merge_group:
   push:
-    branches-ignore:
-      - 'dependabot/**'
+    branches:
+      - 'main'
+      - 'stable-*'
     paths:
       - 'Gemfile*'
       - '.ruby-version'
diff --git a/.github/workflows/check-i18n.yml b/.github/workflows/check-i18n.yml
index ceb385933b29bb..5a1c0519665873 100644
--- a/.github/workflows/check-i18n.yml
+++ b/.github/workflows/check-i18n.yml
@@ -2,9 +2,13 @@ name: Check i18n
 
 on:
   push:
-    branches: [main]
+    branches:
+      - 'main'
+      - 'stable-*'
   pull_request:
-    branches: [main]
+    branches:
+      - 'main'
+      - 'stable-*'
 
 env:
   RAILS_ENV: test
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 6fb93b7fef45a6..8690e9ed6d1639 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -1,11 +1,15 @@
 name: 'CodeQL'
 
 on:
+  merge_group:
   push:
-    branches: ['main']
+    branches:
+      - 'main'
+      - 'stable-*'
   pull_request:
-    # The branches below must be a subset of the branches above
-    branches: ['main']
+    branches:
+      - 'main'
+      - 'stable-*'
   schedule:
     - cron: '22 6 * * 1'
 
diff --git a/.github/workflows/crowdin-upload.yml b/.github/workflows/crowdin-upload.yml
index 705af12c025044..4c9d7b096b8e63 100644
--- a/.github/workflows/crowdin-upload.yml
+++ b/.github/workflows/crowdin-upload.yml
@@ -1,9 +1,11 @@
 name: Crowdin / Upload translations
 
 on:
+  merge_group:
   push:
     branches:
-      - main
+      - 'main'
+      - 'stable-*'
     paths:
       - crowdin.yml
       - app/javascript/mastodon/locales/en.json
diff --git a/.github/workflows/format-check.yml b/.github/workflows/format-check.yml
index 2d483b50229626..c10f350a02ef28 100644
--- a/.github/workflows/format-check.yml
+++ b/.github/workflows/format-check.yml
@@ -1,6 +1,10 @@
 name: Check formatting
 on:
+  merge_group:
   push:
+    branches:
+      - 'main'
+      - 'stable-*'
   pull_request:
 
 jobs:
diff --git a/.github/workflows/lint-css.yml b/.github/workflows/lint-css.yml
index d3b8035cd86521..95fcd569420fdf 100644
--- a/.github/workflows/lint-css.yml
+++ b/.github/workflows/lint-css.yml
@@ -1,9 +1,10 @@
 name: CSS Linting
 on:
+  merge_group:
   push:
-    branches-ignore:
-      - 'dependabot/**'
-      - 'renovate/**'
+    branches:
+      - 'main'
+      - 'stable-*'
     paths:
       - 'package.json'
       - 'yarn.lock'
diff --git a/.github/workflows/lint-haml.yml b/.github/workflows/lint-haml.yml
index ca4b0c80bfdc3e..a1a9e99c902bfb 100644
--- a/.github/workflows/lint-haml.yml
+++ b/.github/workflows/lint-haml.yml
@@ -1,9 +1,10 @@
 name: Haml Linting
 on:
+  merge_group:
   push:
-    branches-ignore:
-      - 'dependabot/**'
-      - 'renovate/**'
+    branches:
+      - 'main'
+      - 'stable-*'
     paths:
       - '.github/workflows/haml-lint-problem-matcher.json'
       - '.github/workflows/lint-haml.yml'
diff --git a/.github/workflows/lint-js.yml b/.github/workflows/lint-js.yml
index 1c1ecc2b22049b..7d31a5e20e7804 100644
--- a/.github/workflows/lint-js.yml
+++ b/.github/workflows/lint-js.yml
@@ -1,9 +1,10 @@
 name: JavaScript Linting
 on:
+  merge_group:
   push:
-    branches-ignore:
-      - 'dependabot/**'
-      - 'renovate/**'
+    branches:
+      - 'main'
+      - 'stable-*'
     paths:
       - 'package.json'
       - 'yarn.lock'
diff --git a/.github/workflows/lint-ruby.yml b/.github/workflows/lint-ruby.yml
index b3a89c3caf1cbd..277e456146fdcf 100644
--- a/.github/workflows/lint-ruby.yml
+++ b/.github/workflows/lint-ruby.yml
@@ -1,9 +1,10 @@
 name: Ruby Linting
 on:
+  merge_group:
   push:
-    branches-ignore:
-      - 'dependabot/**'
-      - 'renovate/**'
+    branches:
+      - 'main'
+      - 'stable-*'
     paths:
       - 'Gemfile*'
       - '.rubocop*.yml'
diff --git a/.github/workflows/test-js.yml b/.github/workflows/test-js.yml
index 481afdba30366d..e9e43ac9e80184 100644
--- a/.github/workflows/test-js.yml
+++ b/.github/workflows/test-js.yml
@@ -1,9 +1,10 @@
 name: JavaScript Testing
 on:
+  merge_group:
   push:
-    branches-ignore:
-      - 'dependabot/**'
-      - 'renovate/**'
+    branches:
+      - 'main'
+      - 'stable-*'
     paths:
       - 'package.json'
       - 'yarn.lock'
diff --git a/.github/workflows/test-migrations.yml b/.github/workflows/test-migrations.yml
index 3eaf2c2d7402b8..43de631545c6ed 100644
--- a/.github/workflows/test-migrations.yml
+++ b/.github/workflows/test-migrations.yml
@@ -1,10 +1,11 @@
 name: Historical data migration test
 
 on:
+  merge_group:
   push:
-    branches-ignore:
-      - 'dependabot/**'
-      - 'renovate/**'
+    branches:
+      - 'main'
+      - 'stable-*'
   pull_request:
 
 jobs:
diff --git a/.github/workflows/test-ruby.yml b/.github/workflows/test-ruby.yml
index ef898968d0128c..0e75a0b764a853 100644
--- a/.github/workflows/test-ruby.yml
+++ b/.github/workflows/test-ruby.yml
@@ -1,10 +1,11 @@
 name: Ruby Testing
 
 on:
+  merge_group:
   push:
-    branches-ignore:
-      - 'dependabot/**'
-      - 'renovate/**'
+    branches:
+      - 'main'
+      - 'stable-*'
   pull_request:
 
 env:

From 0899c91d4be0e0846caf53a4b065c4904f34d23a Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Sun, 7 Jul 2024 18:13:10 +0200
Subject: [PATCH 1483/2191] Add the account hover card for account search
 results (#30949)

---
 app/javascript/mastodon/components/account.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/components/account.jsx b/app/javascript/mastodon/components/account.jsx
index 18a31cba244867..2a748e67ff139b 100644
--- a/app/javascript/mastodon/components/account.jsx
+++ b/app/javascript/mastodon/components/account.jsx
@@ -131,7 +131,7 @@ const Account = ({ size = 46, account, onFollow, onBlock, onMute, onMuteNotifica
   return (
     <div className={classNames('account', { 'account--minimal': minimal })}>
       <div className='account__wrapper'>
-        <Link key={account.get('id')} className='account__display-name' title={account.get('acct')} to={`/@${account.get('acct')}`}>
+        <Link key={account.get('id')} className='account__display-name' title={account.get('acct')} to={`/@${account.get('acct')}`} data-hover-card-account={account.get('id')}>
           <div className='account__avatar-wrapper'>
             <Avatar account={account} size={size} />
           </div>

From 981395e4d68a1c0cfccbdb8924bc11ac912d1e05 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Sun, 7 Jul 2024 18:14:15 +0200
Subject: [PATCH 1484/2191] Remove the `title` attribute when hovering a card
 anchor (#30948)

---
 .../mastodon/components/hover_card_controller.tsx | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/components/hover_card_controller.tsx b/app/javascript/mastodon/components/hover_card_controller.tsx
index 5ca55ebde91049..057ef1aaed4a71 100644
--- a/app/javascript/mastodon/components/hover_card_controller.tsx
+++ b/app/javascript/mastodon/components/hover_card_controller.tsx
@@ -43,6 +43,7 @@ export const HoverCardController: React.FC = () => {
   useEffect(() => {
     let isScrolling = false;
     let currentAnchor: HTMLElement | null = null;
+    let currentTitle: string | null = null;
 
     const open = (target: HTMLElement) => {
       target.setAttribute('aria-describedby', 'hover-card');
@@ -75,6 +76,9 @@ export const HoverCardController: React.FC = () => {
         currentAnchor?.removeAttribute('aria-describedby');
         currentAnchor = target;
 
+        currentTitle = target.getAttribute('title');
+        target.removeAttribute('title');
+
         setEnterTimeout(() => {
           open(target);
         }, enterDelay);
@@ -90,11 +94,20 @@ export const HoverCardController: React.FC = () => {
     };
 
     const handleMouseLeave = (e: MouseEvent) => {
+      const { target } = e;
+
       if (!currentAnchor) {
         return;
       }
 
-      if (e.target === currentAnchor || e.target === cardRef.current) {
+      if (
+        currentTitle &&
+        target instanceof HTMLElement &&
+        target === currentAnchor
+      )
+        target.setAttribute('title', currentTitle);
+
+      if (target === currentAnchor || target === cardRef.current) {
         cancelEnterTimeout();
 
         setLeaveTimeout(() => {

From c5883e099937971e30eb17f6da3e5e8800523cfa Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 8 Jul 2024 09:11:15 +0200
Subject: [PATCH 1485/2191] chore(deps): update dependency @testing-library/dom
 to v10.3.1 (#30954)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 4c1a7922086e40..f3f166eff5c6fb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3357,8 +3357,8 @@ __metadata:
   linkType: hard
 
 "@testing-library/dom@npm:^10.2.0":
-  version: 10.2.0
-  resolution: "@testing-library/dom@npm:10.2.0"
+  version: 10.3.1
+  resolution: "@testing-library/dom@npm:10.3.1"
   dependencies:
     "@babel/code-frame": "npm:^7.10.4"
     "@babel/runtime": "npm:^7.12.5"
@@ -3368,7 +3368,7 @@ __metadata:
     dom-accessibility-api: "npm:^0.5.9"
     lz-string: "npm:^1.5.0"
     pretty-format: "npm:^27.0.2"
-  checksum: 10c0/de582dfbeb632436547a0ca5851b5a714a4a17f8e96ab3dc4fb4e454eef52c912b648b7cb6e9fdf477f3eeef97e698f3250f0ce50846f39d04677a44169209f2
+  checksum: 10c0/e898475cd4932225c2962bf9f94353d7d88462c8912881af8e9866cee714c967b21badb0895ec8626123759cddc6663bc40300b1d1bf789957a603086eda6329
   languageName: node
   linkType: hard
 

From 5c3ec727ecff6fe74b12ae533388dbc28b5061fe Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 8 Jul 2024 09:11:29 +0200
Subject: [PATCH 1486/2191] chore(deps): update dependency typescript to v5.5.3
 (#30953)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index f3f166eff5c6fb..a9cc4416655916 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -17275,22 +17275,22 @@ __metadata:
   linkType: hard
 
 "typescript@npm:5, typescript@npm:^5.0.4":
-  version: 5.5.2
-  resolution: "typescript@npm:5.5.2"
+  version: 5.5.3
+  resolution: "typescript@npm:5.5.3"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
-  checksum: 10c0/8ca39b27b5f9bd7f32db795045933ab5247897660627251e8254180b792a395bf061ea7231947d5d7ffa5cb4cc771970fd4ef543275f9b559f08c9325cccfce3
+  checksum: 10c0/f52c71ccbc7080b034b9d3b72051d563601a4815bf3e39ded188e6ce60813f75dbedf11ad15dd4d32a12996a9ed8c7155b46c93a9b9c9bad1049766fe614bbdd
   languageName: node
   linkType: hard
 
 "typescript@patch:typescript@npm%3A5#optional!builtin<compat/typescript>, typescript@patch:typescript@npm%3A^5.0.4#optional!builtin<compat/typescript>":
-  version: 5.5.2
-  resolution: "typescript@patch:typescript@npm%3A5.5.2#optional!builtin<compat/typescript>::version=5.5.2&hash=379a07"
+  version: 5.5.3
+  resolution: "typescript@patch:typescript@npm%3A5.5.3#optional!builtin<compat/typescript>::version=5.5.3&hash=379a07"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
-  checksum: 10c0/a7b7ede75dc7fc32a76d0d0af6b91f5fbd8620890d84c906f663d8783bf3de6d7bd50f0430b8bb55eac88a38934af847ff709e7156e5138b95ae94cbd5f73e5b
+  checksum: 10c0/911c7811d61f57f07df79c4a35f56a0f426a65426a020e5fcd792f66559f399017205f5f10255329ab5a3d8c2d1f1d19530aeceffda70758a521fae1d469432e
   languageName: node
   linkType: hard
 

From bd8481784870b04cd4fda20fa18fdeeb7a07430d Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 8 Jul 2024 07:15:48 +0000
Subject: [PATCH 1487/2191] chore(deps): update dependency irb to v1.14.0
 (#30947)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index c0fa8a60399867..1c253719e4ebae 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -346,7 +346,7 @@ GEM
       activesupport (>= 3.0)
       nokogiri (>= 1.6)
     io-console (0.7.2)
-    irb (1.13.2)
+    irb (1.14.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     jmespath (1.6.2)

From bd285cdd02a079b6c1412be04cd28cf759fd0d9d Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 8 Jul 2024 09:16:47 +0200
Subject: [PATCH 1488/2191] fix(deps): update dependency glob to v10.4.3
 (#30941)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index a9cc4416655916..88ab99b2f4bd0b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8995,8 +8995,8 @@ __metadata:
   linkType: hard
 
 "glob@npm:^10.2.2, glob@npm:^10.2.6, glob@npm:^10.3.10":
-  version: 10.4.2
-  resolution: "glob@npm:10.4.2"
+  version: 10.4.3
+  resolution: "glob@npm:10.4.3"
   dependencies:
     foreground-child: "npm:^3.1.0"
     jackspeak: "npm:^3.1.2"
@@ -9006,7 +9006,7 @@ __metadata:
     path-scurry: "npm:^1.11.1"
   bin:
     glob: dist/esm/bin.mjs
-  checksum: 10c0/2c7296695fa75a935f3ad17dc62e4e170a8bb8752cf64d328be8992dd6ad40777939003754e10e9741ff8fbe43aa52fba32d6930d0ffa0e3b74bc3fb5eebaa2f
+  checksum: 10c0/bea148e5dae96c17e2764f4764c72376a6ab7072b27a21e861ae4af6f97f3e810d79d67f64de52f63ce1d7fdb73b7306f61c65b48d0f61ca7c8647ce8acaf9a7
   languageName: node
   linkType: hard
 

From c29fdadefdaae5a68f6bea85d6ae3b529b6ab7e7 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 8 Jul 2024 03:21:49 -0400
Subject: [PATCH 1489/2191] Use `scope module: ...` for more API routes
 (#30935)

---
 config/routes/api.rb | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/config/routes/api.rb b/config/routes/api.rb
index 3eb4bb4b4d58c4..9011916697452d 100644
--- a/config/routes/api.rb
+++ b/config/routes/api.rb
@@ -203,9 +203,11 @@
         post :unmute
       end
 
-      resource :pin, only: :create, controller: 'accounts/pins'
-      post :unpin, to: 'accounts/pins#destroy'
-      resource :note, only: :create, controller: 'accounts/notes'
+      scope module: :accounts do
+        resource :pin, only: :create
+        post :unpin, to: 'pins#destroy'
+        resource :note, only: :create
+      end
     end
 
     resources :tags, only: [:show] do
@@ -218,7 +220,7 @@
     resources :followed_tags, only: [:index]
 
     resources :lists, only: [:index, :create, :show, :update, :destroy] do
-      resource :accounts, only: [:show, :create, :destroy], controller: 'lists/accounts'
+      resource :accounts, only: [:show, :create, :destroy], module: :lists
     end
 
     namespace :featured_tags do
@@ -228,7 +230,7 @@
     resources :featured_tags, only: [:index, :create, :destroy]
 
     resources :polls, only: [:create, :show] do
-      resources :votes, only: :create, controller: 'polls/votes'
+      resources :votes, only: :create, module: :polls
     end
 
     namespace :push do
@@ -314,8 +316,10 @@
     resources :suggestions, only: [:index]
     resource :instance, only: [:show]
     resources :filters, only: [:index, :create, :show, :update, :destroy] do
-      resources :keywords, only: [:index, :create], controller: 'filters/keywords'
-      resources :statuses, only: [:index, :create], controller: 'filters/statuses'
+      scope module: :filters do
+        resources :keywords, only: [:index, :create]
+        resources :statuses, only: [:index, :create]
+      end
     end
 
     namespace :filters do

From fd3bfc0710999923c722222579395e9a3d9e3c73 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 8 Jul 2024 07:22:28 +0000
Subject: [PATCH 1490/2191] fix(deps): update dependency postcss-preset-env to
 v9.6.0 (#30944)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 453 ++++++++++++++++++++++++++++--------------------------
 1 file changed, 234 insertions(+), 219 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 88ab99b2f4bd0b..87586a916c66ff 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1558,13 +1558,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/cascade-layer-name-parser@npm:^1.0.12":
-  version: 1.0.12
-  resolution: "@csstools/cascade-layer-name-parser@npm:1.0.12"
+"@csstools/cascade-layer-name-parser@npm:^1.0.13":
+  version: 1.0.13
+  resolution: "@csstools/cascade-layer-name-parser@npm:1.0.13"
   peerDependencies:
-    "@csstools/css-parser-algorithms": ^2.7.0
-    "@csstools/css-tokenizer": ^2.3.2
-  checksum: 10c0/5f92aefcbb3f4b660cf7b0db54f6a4ba21a32fa1b64ea4f050a6370233152d4f561ecf5c8e98ca231e73c16e0d9f75b20b0a65153e18b14957658c81e0f68213
+    "@csstools/css-parser-algorithms": ^2.7.1
+    "@csstools/css-tokenizer": ^2.4.1
+  checksum: 10c0/a6412fc8601af1baadc8195934aa668d3476e799891c9d0883390f31ec8678e9b565ac14d919bec633bbc086657ac12aa4cd852c718851a2d34517ee6856ff8e
   languageName: node
   linkType: hard
 
@@ -1575,52 +1575,52 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/css-calc@npm:^1.2.3":
-  version: 1.2.3
-  resolution: "@csstools/css-calc@npm:1.2.3"
+"@csstools/css-calc@npm:^1.2.4":
+  version: 1.2.4
+  resolution: "@csstools/css-calc@npm:1.2.4"
   peerDependencies:
-    "@csstools/css-parser-algorithms": ^2.7.0
-    "@csstools/css-tokenizer": ^2.3.2
-  checksum: 10c0/fb34767ea9638b837167bcecaf945bcc0c5e8f0d811067c4e8c7a57bc8f0955f61107b1ed5e017b95c54acacc8088473e5497a9986bee95b37ec92999e792871
+    "@csstools/css-parser-algorithms": ^2.7.1
+    "@csstools/css-tokenizer": ^2.4.1
+  checksum: 10c0/6233746eb642797b7fbc2cf6e7651e95700b294e78e3c29e8730c3236bb92cf62903efb6e54639e8f877683c40646e137c95e615c4450809b21b61a6192888ca
   languageName: node
   linkType: hard
 
-"@csstools/css-color-parser@npm:^2.0.3":
-  version: 2.0.3
-  resolution: "@csstools/css-color-parser@npm:2.0.3"
+"@csstools/css-color-parser@npm:^2.0.4":
+  version: 2.0.4
+  resolution: "@csstools/css-color-parser@npm:2.0.4"
   dependencies:
     "@csstools/color-helpers": "npm:^4.2.1"
-    "@csstools/css-calc": "npm:^1.2.3"
+    "@csstools/css-calc": "npm:^1.2.4"
   peerDependencies:
-    "@csstools/css-parser-algorithms": ^2.7.0
-    "@csstools/css-tokenizer": ^2.3.2
-  checksum: 10c0/d8860e6b9c65de4f90d4c21e4d66471fd858434cf63af80f812a900371343b753b86a256627e8bd024cb8903a6a0181d2d9c0c65ab5d78cf29d084a761e2adba
+    "@csstools/css-parser-algorithms": ^2.7.1
+    "@csstools/css-tokenizer": ^2.4.1
+  checksum: 10c0/e009a2f34b6c328daad54262deb86b71c6a7a9a1da1db8ad39cf719641e1a728ed8ddbd23613d519d26deee33b89ba12cb15a6928718c1b3cc5e24ac1ed02f47
   languageName: node
   linkType: hard
 
-"@csstools/css-parser-algorithms@npm:^2.6.3, @csstools/css-parser-algorithms@npm:^2.7.0":
-  version: 2.7.0
-  resolution: "@csstools/css-parser-algorithms@npm:2.7.0"
+"@csstools/css-parser-algorithms@npm:^2.6.3, @csstools/css-parser-algorithms@npm:^2.7.1":
+  version: 2.7.1
+  resolution: "@csstools/css-parser-algorithms@npm:2.7.1"
   peerDependencies:
-    "@csstools/css-tokenizer": ^2.3.2
-  checksum: 10c0/fb84fefdf37c41d170f81b687bf1ee1847a970e51cc1fe3a320e3eaf225383ae9a3c4eb6208b83357dfe18c5114353d780e0c65f05d86d6435e5a9ad9334c834
+    "@csstools/css-tokenizer": ^2.4.1
+  checksum: 10c0/7d29bef6f5790ddb67d922ad232253bf910e4fa5293f5e4a5ed8b920ae9bd4e8171942df7d8943af23b42fd4e9fb460181394d20c97da9562e6ce98a875e8c47
   languageName: node
   linkType: hard
 
-"@csstools/css-tokenizer@npm:^2.3.1, @csstools/css-tokenizer@npm:^2.3.2":
-  version: 2.3.2
-  resolution: "@csstools/css-tokenizer@npm:2.3.2"
-  checksum: 10c0/f7d0d8b3e9e2dcdc6547a387253a09dbbacaaffb5c8718bcd7f15dddeefdd441b73fc5f9fad3f03fabef3b37ec4b62be7ff79caab366427fa90eaf54cd8fc452
+"@csstools/css-tokenizer@npm:^2.3.1, @csstools/css-tokenizer@npm:^2.4.1":
+  version: 2.4.1
+  resolution: "@csstools/css-tokenizer@npm:2.4.1"
+  checksum: 10c0/fe71cee85ec7372da07083d088b6a704f43e5d3d2d8071c4b8a86fae60408b559a218a43f8625bf2f0be5c7f90c8f3ad20a1aae1921119a1c02b51c310cc2b6b
   languageName: node
   linkType: hard
 
-"@csstools/media-query-list-parser@npm:^2.1.11, @csstools/media-query-list-parser@npm:^2.1.12":
-  version: 2.1.12
-  resolution: "@csstools/media-query-list-parser@npm:2.1.12"
+"@csstools/media-query-list-parser@npm:^2.1.11, @csstools/media-query-list-parser@npm:^2.1.13":
+  version: 2.1.13
+  resolution: "@csstools/media-query-list-parser@npm:2.1.13"
   peerDependencies:
-    "@csstools/css-parser-algorithms": ^2.7.0
-    "@csstools/css-tokenizer": ^2.3.2
-  checksum: 10c0/7395cc710d8f54670c1e7a418a88dcf1ae726316272294ec645f6d79a8e931f5d390ba7ed5d0141d29ad7280cd447b8773143dc7676659413de79228130e1a65
+    "@csstools/css-parser-algorithms": ^2.7.1
+    "@csstools/css-tokenizer": ^2.4.1
+  checksum: 10c0/8bf72342c15581b8f658633436d83c26a214056f6b960ff121b940271f4b1b5b07e9cc3990a73e684fb72319592f0c392408b4f0e08bbe242b2065aa456e2733
   languageName: node
   linkType: hard
 
@@ -1636,46 +1636,60 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-color-function@npm:^3.0.17":
-  version: 3.0.17
-  resolution: "@csstools/postcss-color-function@npm:3.0.17"
+"@csstools/postcss-color-function@npm:^3.0.19":
+  version: 3.0.19
+  resolution: "@csstools/postcss-color-function@npm:3.0.19"
   dependencies:
-    "@csstools/css-color-parser": "npm:^2.0.3"
-    "@csstools/css-parser-algorithms": "npm:^2.7.0"
-    "@csstools/css-tokenizer": "npm:^2.3.2"
-    "@csstools/postcss-progressive-custom-properties": "npm:^3.2.0"
+    "@csstools/css-color-parser": "npm:^2.0.4"
+    "@csstools/css-parser-algorithms": "npm:^2.7.1"
+    "@csstools/css-tokenizer": "npm:^2.4.1"
+    "@csstools/postcss-progressive-custom-properties": "npm:^3.3.0"
     "@csstools/utilities": "npm:^1.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/6d347fc9fe65cb897c275c129103576e551b74a7c47a1a4dc8160da2fad7752bf51e3cfbff339f86b39c723efac33643168d2dfaac4d3624d072875d18a65a4b
+  checksum: 10c0/067e33d7dfc32b56fe63d4f97464a3eaf27dde720961e44feab6076bd2c172dd4c1bad16aa37a922dcbba470756bd6a13e728d9e71eab6937d48d83873cd1879
   languageName: node
   linkType: hard
 
-"@csstools/postcss-color-mix-function@npm:^2.0.17":
-  version: 2.0.17
-  resolution: "@csstools/postcss-color-mix-function@npm:2.0.17"
+"@csstools/postcss-color-mix-function@npm:^2.0.19":
+  version: 2.0.19
+  resolution: "@csstools/postcss-color-mix-function@npm:2.0.19"
   dependencies:
-    "@csstools/css-color-parser": "npm:^2.0.3"
-    "@csstools/css-parser-algorithms": "npm:^2.7.0"
-    "@csstools/css-tokenizer": "npm:^2.3.2"
-    "@csstools/postcss-progressive-custom-properties": "npm:^3.2.0"
+    "@csstools/css-color-parser": "npm:^2.0.4"
+    "@csstools/css-parser-algorithms": "npm:^2.7.1"
+    "@csstools/css-tokenizer": "npm:^2.4.1"
+    "@csstools/postcss-progressive-custom-properties": "npm:^3.3.0"
     "@csstools/utilities": "npm:^1.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/ba9a406ebe4caba6709878ee26debb06780be5cbf4e6ab7e902d79ca6e21ec6a8409b9dc0a5ef36fc4bf54bf2bd8f9642b72da8d7939145f99dc40fedd2be9d2
+  checksum: 10c0/e967d93672a065806dc78da0153f8b4f5087f7c3ddfe361eba4942780760d47b317124913c9b0dda7f9bfff1253f77d1b6debd8a6a2aa3a6c80e263101da5e8c
   languageName: node
   linkType: hard
 
-"@csstools/postcss-exponential-functions@npm:^1.0.8":
-  version: 1.0.8
-  resolution: "@csstools/postcss-exponential-functions@npm:1.0.8"
+"@csstools/postcss-content-alt-text@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "@csstools/postcss-content-alt-text@npm:1.0.0"
+  dependencies:
+    "@csstools/css-parser-algorithms": "npm:^2.7.1"
+    "@csstools/css-tokenizer": "npm:^2.4.1"
+    "@csstools/postcss-progressive-custom-properties": "npm:^3.3.0"
+    "@csstools/utilities": "npm:^1.0.0"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/0c2c64857ac652989d00c3d2ba49d0cd1cc245193cba6724d2f5841aa990ee6a07267cfebc6fabde6a6246616df60373006d17c5ea9b904129fbfd826dc10a8d
+  languageName: node
+  linkType: hard
+
+"@csstools/postcss-exponential-functions@npm:^1.0.9":
+  version: 1.0.9
+  resolution: "@csstools/postcss-exponential-functions@npm:1.0.9"
   dependencies:
-    "@csstools/css-calc": "npm:^1.2.3"
-    "@csstools/css-parser-algorithms": "npm:^2.7.0"
-    "@csstools/css-tokenizer": "npm:^2.3.2"
+    "@csstools/css-calc": "npm:^1.2.4"
+    "@csstools/css-parser-algorithms": "npm:^2.7.1"
+    "@csstools/css-tokenizer": "npm:^2.4.1"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/6b049801fc1275b34f43ffbb915f447a54cbff7bf48ab0705c3ad1ffde055cb876c4dc24e7a9162cd65e219457328e298a673f6176446493db17cf7af6f90dc0
+  checksum: 10c0/eaec29ef6ec201786c606176235dced4af1922d5ac56c6b0993ad2e7d87464a32702d9b28cae9a76e8527f741b50cbc31d4c646f45d02dc69d520f241b3e7878
   languageName: node
   linkType: hard
 
@@ -1691,59 +1705,59 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-gamut-mapping@npm:^1.0.10":
-  version: 1.0.10
-  resolution: "@csstools/postcss-gamut-mapping@npm:1.0.10"
+"@csstools/postcss-gamut-mapping@npm:^1.0.11":
+  version: 1.0.11
+  resolution: "@csstools/postcss-gamut-mapping@npm:1.0.11"
   dependencies:
-    "@csstools/css-color-parser": "npm:^2.0.3"
-    "@csstools/css-parser-algorithms": "npm:^2.7.0"
-    "@csstools/css-tokenizer": "npm:^2.3.2"
+    "@csstools/css-color-parser": "npm:^2.0.4"
+    "@csstools/css-parser-algorithms": "npm:^2.7.1"
+    "@csstools/css-tokenizer": "npm:^2.4.1"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/6c2dab6a84f81904bed89cb584bd9bc6a904b49a4fa315b17be65c7d68baefe592561ee439660d5602b7481bac3be9a93189dc45404764524495400f34c6b6e6
+  checksum: 10c0/29e755013f1d1de34eb62a931ed410d2830ca3dfc81476cb3c72d9d3260b85a9adedc51aa548550c6e308f3f9640c489e6953db40e9cac9835d0421d5b14ef1f
   languageName: node
   linkType: hard
 
-"@csstools/postcss-gradients-interpolation-method@npm:^4.0.18":
-  version: 4.0.18
-  resolution: "@csstools/postcss-gradients-interpolation-method@npm:4.0.18"
+"@csstools/postcss-gradients-interpolation-method@npm:^4.0.20":
+  version: 4.0.20
+  resolution: "@csstools/postcss-gradients-interpolation-method@npm:4.0.20"
   dependencies:
-    "@csstools/css-color-parser": "npm:^2.0.3"
-    "@csstools/css-parser-algorithms": "npm:^2.7.0"
-    "@csstools/css-tokenizer": "npm:^2.3.2"
-    "@csstools/postcss-progressive-custom-properties": "npm:^3.2.0"
+    "@csstools/css-color-parser": "npm:^2.0.4"
+    "@csstools/css-parser-algorithms": "npm:^2.7.1"
+    "@csstools/css-tokenizer": "npm:^2.4.1"
+    "@csstools/postcss-progressive-custom-properties": "npm:^3.3.0"
     "@csstools/utilities": "npm:^1.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/23c431068ac205392b4953dbce411e208e79e221ba8030c5e23c0b82e8fd53bc3bc4f2cdc47050f5d91a4ac69cb80f4f1853b213aa8072fa60a6cb6ff0621e04
+  checksum: 10c0/6588825a72a1471e2d6036c8cf7dbad2bf05f369d96dbdd68ff5ce7ff91803b8ee1146f5f1bf6f3ab6299944549da872914664c3f9e8ae5a31847f76f0085c74
   languageName: node
   linkType: hard
 
-"@csstools/postcss-hwb-function@npm:^3.0.16":
-  version: 3.0.16
-  resolution: "@csstools/postcss-hwb-function@npm:3.0.16"
+"@csstools/postcss-hwb-function@npm:^3.0.18":
+  version: 3.0.18
+  resolution: "@csstools/postcss-hwb-function@npm:3.0.18"
   dependencies:
-    "@csstools/css-color-parser": "npm:^2.0.3"
-    "@csstools/css-parser-algorithms": "npm:^2.7.0"
-    "@csstools/css-tokenizer": "npm:^2.3.2"
-    "@csstools/postcss-progressive-custom-properties": "npm:^3.2.0"
+    "@csstools/css-color-parser": "npm:^2.0.4"
+    "@csstools/css-parser-algorithms": "npm:^2.7.1"
+    "@csstools/css-tokenizer": "npm:^2.4.1"
+    "@csstools/postcss-progressive-custom-properties": "npm:^3.3.0"
     "@csstools/utilities": "npm:^1.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/4deca8831a69038aff719a77df92c53578bb28e23cc61dc4ea7b1d912b1b685683a9c6232396c2616948ac2e8488ad1e2009c9c8ed30c493d97ba8ad37b6418d
+  checksum: 10c0/e9d76b0b2f9c54920124ca1804b49e3f5b26e003729418b5ef4b340ff1baa4779da1c02be618888fdbcc2d0747182352efbbd3ffe128e2417928c35c25443789
   languageName: node
   linkType: hard
 
-"@csstools/postcss-ic-unit@npm:^3.0.6":
-  version: 3.0.6
-  resolution: "@csstools/postcss-ic-unit@npm:3.0.6"
+"@csstools/postcss-ic-unit@npm:^3.0.7":
+  version: 3.0.7
+  resolution: "@csstools/postcss-ic-unit@npm:3.0.7"
   dependencies:
-    "@csstools/postcss-progressive-custom-properties": "npm:^3.2.0"
+    "@csstools/postcss-progressive-custom-properties": "npm:^3.3.0"
     "@csstools/utilities": "npm:^1.0.0"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/a4b962327d433419fdcfdcf620ce6a5cf09aa3c93029ad08b035df1e2bc35caae31de49f1d14218de0656fced35c0d2e07e5ff7b8099c29dbfb40395fc283234
+  checksum: 10c0/2add905b75860c64d7174886fecfc76d86e3818f42f003f4bbfc0604cc7f0f31c6dbd1651e6b9512fea876190d80033578ae49e813b64b17c8cf3b1f03d8e146
   languageName: node
   linkType: hard
 
@@ -1768,17 +1782,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-light-dark-function@npm:^1.0.6":
-  version: 1.0.6
-  resolution: "@csstools/postcss-light-dark-function@npm:1.0.6"
+"@csstools/postcss-light-dark-function@npm:^1.0.8":
+  version: 1.0.8
+  resolution: "@csstools/postcss-light-dark-function@npm:1.0.8"
   dependencies:
-    "@csstools/css-parser-algorithms": "npm:^2.7.0"
-    "@csstools/css-tokenizer": "npm:^2.3.2"
-    "@csstools/postcss-progressive-custom-properties": "npm:^3.2.0"
+    "@csstools/css-parser-algorithms": "npm:^2.7.1"
+    "@csstools/css-tokenizer": "npm:^2.4.1"
+    "@csstools/postcss-progressive-custom-properties": "npm:^3.3.0"
     "@csstools/utilities": "npm:^1.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/6b2c64860d789cd3e3ce875c01259333911f6e32a751a7475604de8022c13abcb578e5cb941b51bd3a2022bee883df3f6b64800c6e3559b06da283d968aeb615
+  checksum: 10c0/78fa6d799d38f14af1b32b534eedbec9478033e1fbc5a4e820f2421e865673d010b69b391546686ceb408ead64d79bb4eba2a4fb1fc9f0de70ff21e3ff8477c6
   languageName: node
   linkType: hard
 
@@ -1820,42 +1834,42 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-logical-viewport-units@npm:^2.0.10":
-  version: 2.0.10
-  resolution: "@csstools/postcss-logical-viewport-units@npm:2.0.10"
+"@csstools/postcss-logical-viewport-units@npm:^2.0.11":
+  version: 2.0.11
+  resolution: "@csstools/postcss-logical-viewport-units@npm:2.0.11"
   dependencies:
-    "@csstools/css-tokenizer": "npm:^2.3.2"
+    "@csstools/css-tokenizer": "npm:^2.4.1"
     "@csstools/utilities": "npm:^1.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/fe142b11e0e8ccab4667cc5db90b45e67b7d11eaf5c038e91d867e1b18a315ef0859114185aeb48fdc1ce05986be8b644d6157fe9e19da7281f7023c99eb8877
+  checksum: 10c0/20207e9b7fc3ab52df5fcd06fde71fca4fd22bd6bd451cfc2ec6ea69994708b7fc5381e203dc4367293a8de00b1eca7a3ebe89cfa9b933d2f2cb8e3ac4d5aa86
   languageName: node
   linkType: hard
 
-"@csstools/postcss-media-minmax@npm:^1.1.7":
-  version: 1.1.7
-  resolution: "@csstools/postcss-media-minmax@npm:1.1.7"
+"@csstools/postcss-media-minmax@npm:^1.1.8":
+  version: 1.1.8
+  resolution: "@csstools/postcss-media-minmax@npm:1.1.8"
   dependencies:
-    "@csstools/css-calc": "npm:^1.2.3"
-    "@csstools/css-parser-algorithms": "npm:^2.7.0"
-    "@csstools/css-tokenizer": "npm:^2.3.2"
-    "@csstools/media-query-list-parser": "npm:^2.1.12"
+    "@csstools/css-calc": "npm:^1.2.4"
+    "@csstools/css-parser-algorithms": "npm:^2.7.1"
+    "@csstools/css-tokenizer": "npm:^2.4.1"
+    "@csstools/media-query-list-parser": "npm:^2.1.13"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/a02943a17b540cbd909b55bbb1f8c9331badc51b613279bbdb7127c9921a5d0675bb41675a3b4d0f15e9586120e5a96d9b9786b63b2c594fbb3a238e860c6ad8
+  checksum: 10c0/7d666905282c7a89387dbce84f3429bad04870e0de264c5b1ce3e6f042b8eb72d585a18b2d7ac5e1a8c7f6785892da3cc7f6ea0b48069b06e9d383bdbc149b4a
   languageName: node
   linkType: hard
 
-"@csstools/postcss-media-queries-aspect-ratio-number-values@npm:^2.0.10":
-  version: 2.0.10
-  resolution: "@csstools/postcss-media-queries-aspect-ratio-number-values@npm:2.0.10"
+"@csstools/postcss-media-queries-aspect-ratio-number-values@npm:^2.0.11":
+  version: 2.0.11
+  resolution: "@csstools/postcss-media-queries-aspect-ratio-number-values@npm:2.0.11"
   dependencies:
-    "@csstools/css-parser-algorithms": "npm:^2.7.0"
-    "@csstools/css-tokenizer": "npm:^2.3.2"
-    "@csstools/media-query-list-parser": "npm:^2.1.12"
+    "@csstools/css-parser-algorithms": "npm:^2.7.1"
+    "@csstools/css-tokenizer": "npm:^2.4.1"
+    "@csstools/media-query-list-parser": "npm:^2.1.13"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/d7879e72df98d9fe2e5d85a64837e7a73c2df1aea8659d65516f0acb070317edd353531882f0bdfd81510703d1da30d6da861052a0bda85fde1f9eab94b1e467
+  checksum: 10c0/b4023a1951b7661196332852ce714a4e2fb4f1a67164ec0944e28a009b389e59c67e9de790920fcd082b122276414dd39c12ae12a4566e59e1bbcc794560a870
   languageName: node
   linkType: hard
 
@@ -1882,44 +1896,44 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-oklab-function@npm:^3.0.17":
-  version: 3.0.17
-  resolution: "@csstools/postcss-oklab-function@npm:3.0.17"
+"@csstools/postcss-oklab-function@npm:^3.0.19":
+  version: 3.0.19
+  resolution: "@csstools/postcss-oklab-function@npm:3.0.19"
   dependencies:
-    "@csstools/css-color-parser": "npm:^2.0.3"
-    "@csstools/css-parser-algorithms": "npm:^2.7.0"
-    "@csstools/css-tokenizer": "npm:^2.3.2"
-    "@csstools/postcss-progressive-custom-properties": "npm:^3.2.0"
+    "@csstools/css-color-parser": "npm:^2.0.4"
+    "@csstools/css-parser-algorithms": "npm:^2.7.1"
+    "@csstools/css-tokenizer": "npm:^2.4.1"
+    "@csstools/postcss-progressive-custom-properties": "npm:^3.3.0"
     "@csstools/utilities": "npm:^1.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/ff27a4b6fd8490439aa0f3c91ffa2a42a8cf539d7306d9329cef7ca59f28317cee40253f402d19a18c196471fd39a05842d2974d92f1b131dc748074d91ac4ee
+  checksum: 10c0/2909f76ba408c9f60b61c479994c96200b0e1d3dbf524d5ae6dc5ca1e21d38caf974595e0d071c3900dbe3568376928085dd811aa24ea3e715bcd9de26fb0fa9
   languageName: node
   linkType: hard
 
-"@csstools/postcss-progressive-custom-properties@npm:^3.2.0":
-  version: 3.2.0
-  resolution: "@csstools/postcss-progressive-custom-properties@npm:3.2.0"
+"@csstools/postcss-progressive-custom-properties@npm:^3.3.0":
+  version: 3.3.0
+  resolution: "@csstools/postcss-progressive-custom-properties@npm:3.3.0"
   dependencies:
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/829880844fbbeef1c67e0b380057e574659b4caed38c8414c17d7eb4a0cc727afa1cd74a889bc7ca79c819ecae757810356706901cf6bb677a36ca123915cbb7
+  checksum: 10c0/6c9987d65049a70b5090dcfe42fde9ab2b3cb88911a81bb6651ed81c8baf99502ff2cbec0cb3e022426fa994b558b4bf33fd791ccdcdf683dde75b4865d34f39
   languageName: node
   linkType: hard
 
-"@csstools/postcss-relative-color-syntax@npm:^2.0.17":
-  version: 2.0.17
-  resolution: "@csstools/postcss-relative-color-syntax@npm:2.0.17"
+"@csstools/postcss-relative-color-syntax@npm:^2.0.19":
+  version: 2.0.19
+  resolution: "@csstools/postcss-relative-color-syntax@npm:2.0.19"
   dependencies:
-    "@csstools/css-color-parser": "npm:^2.0.3"
-    "@csstools/css-parser-algorithms": "npm:^2.7.0"
-    "@csstools/css-tokenizer": "npm:^2.3.2"
-    "@csstools/postcss-progressive-custom-properties": "npm:^3.2.0"
+    "@csstools/css-color-parser": "npm:^2.0.4"
+    "@csstools/css-parser-algorithms": "npm:^2.7.1"
+    "@csstools/css-tokenizer": "npm:^2.4.1"
+    "@csstools/postcss-progressive-custom-properties": "npm:^3.3.0"
     "@csstools/utilities": "npm:^1.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/46226351b3825323e3496dcee44ff354cd3ccc9241d837659e1311f428f0b4dc878d9bb762cbb8f63243b7af346728ab7a46c311f9dc38bb609147523c698eab
+  checksum: 10c0/f0aff764f4889ff664b6fa94ddfa5a22daf39354aa2d2ac0eab893eb3ed841b7d2a72131393334d6a5379445fc80f92ab5bd63d4dc3b43746bc7c9055da46591
   languageName: node
   linkType: hard
 
@@ -1934,16 +1948,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-stepped-value-functions@npm:^3.0.9":
-  version: 3.0.9
-  resolution: "@csstools/postcss-stepped-value-functions@npm:3.0.9"
+"@csstools/postcss-stepped-value-functions@npm:^3.0.10":
+  version: 3.0.10
+  resolution: "@csstools/postcss-stepped-value-functions@npm:3.0.10"
   dependencies:
-    "@csstools/css-calc": "npm:^1.2.3"
-    "@csstools/css-parser-algorithms": "npm:^2.7.0"
-    "@csstools/css-tokenizer": "npm:^2.3.2"
+    "@csstools/css-calc": "npm:^1.2.4"
+    "@csstools/css-parser-algorithms": "npm:^2.7.1"
+    "@csstools/css-tokenizer": "npm:^2.4.1"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/bafe80947abc8613903f1f3f1939ece9780696774f15960aef229733e40e483dc2830145426d49c4f6d0b1dabb35f812c8a2dda0d0dcddc930321e36b5c6ca0b
+  checksum: 10c0/f9ebe50fb884d002aa40070196a827816f635b891fd2147ae5ddf1ad6df5bddbb50783d6786897bb3dffa33052565e38289392040cf4454aaa179ab00353117d
   languageName: node
   linkType: hard
 
@@ -1959,16 +1973,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-trigonometric-functions@npm:^3.0.9":
-  version: 3.0.9
-  resolution: "@csstools/postcss-trigonometric-functions@npm:3.0.9"
+"@csstools/postcss-trigonometric-functions@npm:^3.0.10":
+  version: 3.0.10
+  resolution: "@csstools/postcss-trigonometric-functions@npm:3.0.10"
   dependencies:
-    "@csstools/css-calc": "npm:^1.2.3"
-    "@csstools/css-parser-algorithms": "npm:^2.7.0"
-    "@csstools/css-tokenizer": "npm:^2.3.2"
+    "@csstools/css-calc": "npm:^1.2.4"
+    "@csstools/css-parser-algorithms": "npm:^2.7.1"
+    "@csstools/css-tokenizer": "npm:^2.4.1"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/7a439d31a63d35986dab634d9e415f7ce7c32a2d3d382052b5b730a259a12e44c5f1b14e318d79086253e3d5d4f7d942d0e7317d92eb3421dd08824eebec45fb
+  checksum: 10c0/31adcc66510d9788ccb0669d2761517a6135b13692007d8e4334bc0e8d3515dfecfbdcd04e060d0c09a0f5fc2f12db92221b9d53e92b65b044c89cde9a3424cb
   languageName: node
   linkType: hard
 
@@ -6726,10 +6740,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cssdb@npm:^8.0.0":
-  version: 8.0.0
-  resolution: "cssdb@npm:8.0.0"
-  checksum: 10c0/d9a31b760214624352000b16a8f7194c357f66b6c445e663ab58dd03b6f0f53efaaca6d6f96200d666e205894d2d1c346664ad993d9522ff9fc1c331804a8d62
+"cssdb@npm:^8.1.0":
+  version: 8.1.0
+  resolution: "cssdb@npm:8.1.0"
+  checksum: 10c0/1fa1f1566c7e9964f5c71e443583eaba16a90933a3ef6803815c4281d084b75da948c415bade33d7085894fe0929c082fcb3135bf4400048cfff40d227ebd5dd
   languageName: node
   linkType: hard
 
@@ -13286,18 +13300,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-color-functional-notation@npm:^6.0.12":
-  version: 6.0.12
-  resolution: "postcss-color-functional-notation@npm:6.0.12"
+"postcss-color-functional-notation@npm:^6.0.14":
+  version: 6.0.14
+  resolution: "postcss-color-functional-notation@npm:6.0.14"
   dependencies:
-    "@csstools/css-color-parser": "npm:^2.0.3"
-    "@csstools/css-parser-algorithms": "npm:^2.7.0"
-    "@csstools/css-tokenizer": "npm:^2.3.2"
-    "@csstools/postcss-progressive-custom-properties": "npm:^3.2.0"
+    "@csstools/css-color-parser": "npm:^2.0.4"
+    "@csstools/css-parser-algorithms": "npm:^2.7.1"
+    "@csstools/css-tokenizer": "npm:^2.4.1"
+    "@csstools/postcss-progressive-custom-properties": "npm:^3.3.0"
     "@csstools/utilities": "npm:^1.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/2e8faecd2609e1b4eb8c1cab21ecca5e746916795df20e6997d66eb61c29fbb01d3e75fef3e0b3e1c181918a2186570441b81779b1fc429d6d8823fbfa164231
+  checksum: 10c0/fdc5188e19c3923da32fe08d50e55d0b3ca1cedf99f46331baa0a4bbd73a1fc6b4447b0346ab16049032b56ab84b98b4758a0ede7c237637e35a4cc60caac141
   languageName: node
   linkType: hard
 
@@ -13351,46 +13365,46 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-custom-media@npm:^10.0.7":
-  version: 10.0.7
-  resolution: "postcss-custom-media@npm:10.0.7"
+"postcss-custom-media@npm:^10.0.8":
+  version: 10.0.8
+  resolution: "postcss-custom-media@npm:10.0.8"
   dependencies:
-    "@csstools/cascade-layer-name-parser": "npm:^1.0.12"
-    "@csstools/css-parser-algorithms": "npm:^2.7.0"
-    "@csstools/css-tokenizer": "npm:^2.3.2"
-    "@csstools/media-query-list-parser": "npm:^2.1.12"
+    "@csstools/cascade-layer-name-parser": "npm:^1.0.13"
+    "@csstools/css-parser-algorithms": "npm:^2.7.1"
+    "@csstools/css-tokenizer": "npm:^2.4.1"
+    "@csstools/media-query-list-parser": "npm:^2.1.13"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/4171385ab9370806861dcf7597e53fd6aa1862e77b475c9c565c95bfcc2b950f920f8da26a6dbec42e257388bca97c274635662b5e81fe3905b5e37babe06569
+  checksum: 10c0/673ca0058a2f2357a83b33ce00bbeee7cda92621c08472fa55d7ac7ae56f5f8f979132528d537f2dedf715d35a8f9b14b2f0ab6b45423d49e2554c19aab3c827
   languageName: node
   linkType: hard
 
-"postcss-custom-properties@npm:^13.3.11":
-  version: 13.3.11
-  resolution: "postcss-custom-properties@npm:13.3.11"
+"postcss-custom-properties@npm:^13.3.12":
+  version: 13.3.12
+  resolution: "postcss-custom-properties@npm:13.3.12"
   dependencies:
-    "@csstools/cascade-layer-name-parser": "npm:^1.0.12"
-    "@csstools/css-parser-algorithms": "npm:^2.7.0"
-    "@csstools/css-tokenizer": "npm:^2.3.2"
+    "@csstools/cascade-layer-name-parser": "npm:^1.0.13"
+    "@csstools/css-parser-algorithms": "npm:^2.7.1"
+    "@csstools/css-tokenizer": "npm:^2.4.1"
     "@csstools/utilities": "npm:^1.0.0"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/4aa95628aa5d5b6df4dfeedbc3891b9666db88d75930cadc14d2fbba0a1b72f4e3cc3d83b5a0c0b8ce44f85b4fda6ebd7fe7792a1abc0a14d7d63b9f170d299c
+  checksum: 10c0/6af9f6ac94a6ac887749cd38d4586349f6aca29269ebfdb837019a3ba0130032f0ff4899b431b5c348f4ac79a7b16fb7300a256514a6a68e32a63489c18a70e7
   languageName: node
   linkType: hard
 
-"postcss-custom-selectors@npm:^7.1.11":
-  version: 7.1.11
-  resolution: "postcss-custom-selectors@npm:7.1.11"
+"postcss-custom-selectors@npm:^7.1.12":
+  version: 7.1.12
+  resolution: "postcss-custom-selectors@npm:7.1.12"
   dependencies:
-    "@csstools/cascade-layer-name-parser": "npm:^1.0.12"
-    "@csstools/css-parser-algorithms": "npm:^2.7.0"
-    "@csstools/css-tokenizer": "npm:^2.3.2"
+    "@csstools/cascade-layer-name-parser": "npm:^1.0.13"
+    "@csstools/css-parser-algorithms": "npm:^2.7.1"
+    "@csstools/css-tokenizer": "npm:^2.4.1"
     postcss-selector-parser: "npm:^6.1.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/f37d2e34239e868b35b7970ec97a7a8f657a9f92ed2b221af44f19949f7c3aedcecd0abb5fa1acb120c5ceffdf7a20869338956a37d7bfc37a83d8088f5d3dd2
+  checksum: 10c0/78a7930e4f97c42b544f00c06272264432d47f9df777684b57673bb971b7ab49d5d6fb9289a5a869125e7e50dcd0cad65cf8846501253084b73a42ffab41b2c5
   languageName: node
   linkType: hard
 
@@ -13443,16 +13457,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-double-position-gradients@npm:^5.0.6":
-  version: 5.0.6
-  resolution: "postcss-double-position-gradients@npm:5.0.6"
+"postcss-double-position-gradients@npm:^5.0.7":
+  version: 5.0.7
+  resolution: "postcss-double-position-gradients@npm:5.0.7"
   dependencies:
-    "@csstools/postcss-progressive-custom-properties": "npm:^3.2.0"
+    "@csstools/postcss-progressive-custom-properties": "npm:^3.3.0"
     "@csstools/utilities": "npm:^1.0.0"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/9b24b13043fe506c0ddd94e707fe4f21f4f9a6c05ca49a4f45e23412951fd6a4cfa0095002d10b322ca8be60df0badae3715a27eefdeb7bf8da4fdd1ecd5d7a2
+  checksum: 10c0/52d96a34aa3e2e251edeaa2d4c2dd106c687f7910ec18266693656c0edd003384b927c855cecac07f52b5c7bdccd140abdc7e27082ce4c3755e3a966206a2cb9
   languageName: node
   linkType: hard
 
@@ -13508,18 +13522,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-lab-function@npm:^6.0.17":
-  version: 6.0.17
-  resolution: "postcss-lab-function@npm:6.0.17"
+"postcss-lab-function@npm:^6.0.19":
+  version: 6.0.19
+  resolution: "postcss-lab-function@npm:6.0.19"
   dependencies:
-    "@csstools/css-color-parser": "npm:^2.0.3"
-    "@csstools/css-parser-algorithms": "npm:^2.7.0"
-    "@csstools/css-tokenizer": "npm:^2.3.2"
-    "@csstools/postcss-progressive-custom-properties": "npm:^3.2.0"
+    "@csstools/css-color-parser": "npm:^2.0.4"
+    "@csstools/css-parser-algorithms": "npm:^2.7.1"
+    "@csstools/css-tokenizer": "npm:^2.4.1"
+    "@csstools/postcss-progressive-custom-properties": "npm:^3.3.0"
     "@csstools/utilities": "npm:^1.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/a331f188b02cc8beb315150232b6b58bc5793e8d61585973d352a9b4d370b908ff354ccf9ea1ba20a956fd37ea4ada918ea975c8d4f69e850d26edf0106436e8
+  checksum: 10c0/d9a91fb57dcbe967260df86e22ca335a5444f1f34d128fa7b5dbf2522772f2138ad708f1f20f0a59035d66ed736e82972ca7f1b669a157534a17ee8898af1921
   languageName: node
   linkType: hard
 
@@ -13840,60 +13854,61 @@ __metadata:
   linkType: hard
 
 "postcss-preset-env@npm:^9.5.2":
-  version: 9.5.15
-  resolution: "postcss-preset-env@npm:9.5.15"
+  version: 9.6.0
+  resolution: "postcss-preset-env@npm:9.6.0"
   dependencies:
     "@csstools/postcss-cascade-layers": "npm:^4.0.6"
-    "@csstools/postcss-color-function": "npm:^3.0.17"
-    "@csstools/postcss-color-mix-function": "npm:^2.0.17"
-    "@csstools/postcss-exponential-functions": "npm:^1.0.8"
+    "@csstools/postcss-color-function": "npm:^3.0.19"
+    "@csstools/postcss-color-mix-function": "npm:^2.0.19"
+    "@csstools/postcss-content-alt-text": "npm:^1.0.0"
+    "@csstools/postcss-exponential-functions": "npm:^1.0.9"
     "@csstools/postcss-font-format-keywords": "npm:^3.0.2"
-    "@csstools/postcss-gamut-mapping": "npm:^1.0.10"
-    "@csstools/postcss-gradients-interpolation-method": "npm:^4.0.18"
-    "@csstools/postcss-hwb-function": "npm:^3.0.16"
-    "@csstools/postcss-ic-unit": "npm:^3.0.6"
+    "@csstools/postcss-gamut-mapping": "npm:^1.0.11"
+    "@csstools/postcss-gradients-interpolation-method": "npm:^4.0.20"
+    "@csstools/postcss-hwb-function": "npm:^3.0.18"
+    "@csstools/postcss-ic-unit": "npm:^3.0.7"
     "@csstools/postcss-initial": "npm:^1.0.1"
     "@csstools/postcss-is-pseudo-class": "npm:^4.0.8"
-    "@csstools/postcss-light-dark-function": "npm:^1.0.6"
+    "@csstools/postcss-light-dark-function": "npm:^1.0.8"
     "@csstools/postcss-logical-float-and-clear": "npm:^2.0.1"
     "@csstools/postcss-logical-overflow": "npm:^1.0.1"
     "@csstools/postcss-logical-overscroll-behavior": "npm:^1.0.1"
     "@csstools/postcss-logical-resize": "npm:^2.0.1"
-    "@csstools/postcss-logical-viewport-units": "npm:^2.0.10"
-    "@csstools/postcss-media-minmax": "npm:^1.1.7"
-    "@csstools/postcss-media-queries-aspect-ratio-number-values": "npm:^2.0.10"
+    "@csstools/postcss-logical-viewport-units": "npm:^2.0.11"
+    "@csstools/postcss-media-minmax": "npm:^1.1.8"
+    "@csstools/postcss-media-queries-aspect-ratio-number-values": "npm:^2.0.11"
     "@csstools/postcss-nested-calc": "npm:^3.0.2"
     "@csstools/postcss-normalize-display-values": "npm:^3.0.2"
-    "@csstools/postcss-oklab-function": "npm:^3.0.17"
-    "@csstools/postcss-progressive-custom-properties": "npm:^3.2.0"
-    "@csstools/postcss-relative-color-syntax": "npm:^2.0.17"
+    "@csstools/postcss-oklab-function": "npm:^3.0.19"
+    "@csstools/postcss-progressive-custom-properties": "npm:^3.3.0"
+    "@csstools/postcss-relative-color-syntax": "npm:^2.0.19"
     "@csstools/postcss-scope-pseudo-class": "npm:^3.0.1"
-    "@csstools/postcss-stepped-value-functions": "npm:^3.0.9"
+    "@csstools/postcss-stepped-value-functions": "npm:^3.0.10"
     "@csstools/postcss-text-decoration-shorthand": "npm:^3.0.7"
-    "@csstools/postcss-trigonometric-functions": "npm:^3.0.9"
+    "@csstools/postcss-trigonometric-functions": "npm:^3.0.10"
     "@csstools/postcss-unset-value": "npm:^3.0.1"
     autoprefixer: "npm:^10.4.19"
     browserslist: "npm:^4.23.1"
     css-blank-pseudo: "npm:^6.0.2"
     css-has-pseudo: "npm:^6.0.5"
     css-prefers-color-scheme: "npm:^9.0.1"
-    cssdb: "npm:^8.0.0"
+    cssdb: "npm:^8.1.0"
     postcss-attribute-case-insensitive: "npm:^6.0.3"
     postcss-clamp: "npm:^4.1.0"
-    postcss-color-functional-notation: "npm:^6.0.12"
+    postcss-color-functional-notation: "npm:^6.0.14"
     postcss-color-hex-alpha: "npm:^9.0.4"
     postcss-color-rebeccapurple: "npm:^9.0.3"
-    postcss-custom-media: "npm:^10.0.7"
-    postcss-custom-properties: "npm:^13.3.11"
-    postcss-custom-selectors: "npm:^7.1.11"
+    postcss-custom-media: "npm:^10.0.8"
+    postcss-custom-properties: "npm:^13.3.12"
+    postcss-custom-selectors: "npm:^7.1.12"
     postcss-dir-pseudo-class: "npm:^8.0.1"
-    postcss-double-position-gradients: "npm:^5.0.6"
+    postcss-double-position-gradients: "npm:^5.0.7"
     postcss-focus-visible: "npm:^9.0.1"
     postcss-focus-within: "npm:^8.0.1"
     postcss-font-variant: "npm:^5.0.0"
     postcss-gap-properties: "npm:^5.0.1"
     postcss-image-set-function: "npm:^6.0.3"
-    postcss-lab-function: "npm:^6.0.17"
+    postcss-lab-function: "npm:^6.0.19"
     postcss-logical: "npm:^7.0.1"
     postcss-nesting: "npm:^12.1.5"
     postcss-opacity-percentage: "npm:^2.0.0"
@@ -13905,7 +13920,7 @@ __metadata:
     postcss-selector-not: "npm:^7.0.2"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/e2ee0b5d7dbaddb82ff6d51b5882120862d6be184973ae3d55642923183ab441d421d5f9810fe02e680a70dbc85b20b1c2eb02c68f167dcaf3ef80a71dd40e78
+  checksum: 10c0/caa91ba4d3b897d43ab2669b3edf40b24ef32c88e23b113be8956412e64b28deed6ba229c331848fcbc0d143bfde155173fb1e1ada9ccae5037b2ee8f7e554b7
   languageName: node
   linkType: hard
 

From d41b43ed4fff8ccbee5eac62064c5def14f88973 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 8 Jul 2024 09:41:50 +0200
Subject: [PATCH 1491/2191] Limit attachments to `MEDIA_ATTACHMENTS_LIMIT` when
 returning posts through the API (#30932)

---
 app/models/status.rb       |  2 +-
 app/models/status_edit.rb  | 14 ++++++++------
 spec/models/status_spec.rb | 35 +++++++++++++++++++++++++++++++++++
 3 files changed, 44 insertions(+), 7 deletions(-)

diff --git a/app/models/status.rb b/app/models/status.rb
index baa6578005532e..73f0052673569c 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -288,7 +288,7 @@ def ordered_media_attachments
     else
       map = media_attachments.index_by(&:id)
       ordered_media_attachment_ids.filter_map { |media_attachment_id| map[media_attachment_id] }
-    end
+    end.take(MEDIA_ATTACHMENTS_LIMIT)
   end
 
   def replies_count
diff --git a/app/models/status_edit.rb b/app/models/status_edit.rb
index 089c42fb99493d..6e25a6f3bbdd6b 100644
--- a/app/models/status_edit.rb
+++ b/app/models/status_edit.rb
@@ -53,12 +53,14 @@ def emojis
   def ordered_media_attachments
     return @ordered_media_attachments if defined?(@ordered_media_attachments)
 
-    @ordered_media_attachments = if ordered_media_attachment_ids.nil?
-                                   []
-                                 else
-                                   map = status.media_attachments.index_by(&:id)
-                                   ordered_media_attachment_ids.map.with_index { |media_attachment_id, index| PreservedMediaAttachment.new(media_attachment: map[media_attachment_id], description: media_descriptions[index]) }
-                                 end
+    @ordered_media_attachments = begin
+      if ordered_media_attachment_ids.nil?
+        []
+      else
+        map = status.media_attachments.index_by(&:id)
+        ordered_media_attachment_ids.map.with_index { |media_attachment_id, index| PreservedMediaAttachment.new(media_attachment: map[media_attachment_id], description: media_descriptions[index]) }
+      end
+    end.take(Status::MEDIA_ATTACHMENTS_LIMIT)
   end
 
   def proper
diff --git a/spec/models/status_spec.rb b/spec/models/status_spec.rb
index 271cf8690ecd7b..df67c365eb34a0 100644
--- a/spec/models/status_spec.rb
+++ b/spec/models/status_spec.rb
@@ -247,6 +247,41 @@
     end
   end
 
+  describe '#ordered_media_attachments' do
+    let(:status) { Fabricate(:status) }
+
+    let(:first_attachment) { Fabricate(:media_attachment) }
+    let(:second_attachment) { Fabricate(:media_attachment) }
+    let(:last_attachment) { Fabricate(:media_attachment) }
+    let(:extra_attachment) { Fabricate(:media_attachment) }
+
+    before do
+      stub_const('Status::MEDIA_ATTACHMENTS_LIMIT', 3)
+
+      # Add attachments out of order
+      status.media_attachments << second_attachment
+      status.media_attachments << last_attachment
+      status.media_attachments << extra_attachment
+      status.media_attachments << first_attachment
+    end
+
+    context 'when ordered_media_attachment_ids is not set' do
+      it 'returns up to MEDIA_ATTACHMENTS_LIMIT attachments' do
+        expect(status.ordered_media_attachments.size).to eq Status::MEDIA_ATTACHMENTS_LIMIT
+      end
+    end
+
+    context 'when ordered_media_attachment_ids is set' do
+      before do
+        status.update!(ordered_media_attachment_ids: [first_attachment.id, second_attachment.id, last_attachment.id, extra_attachment.id])
+      end
+
+      it 'returns up to MEDIA_ATTACHMENTS_LIMIT attachments in the expected order' do
+        expect(status.ordered_media_attachments).to eq [first_attachment, second_attachment, last_attachment]
+      end
+    end
+  end
+
   describe '.mutes_map' do
     subject { described_class.mutes_map([status.conversation.id], account) }
 

From 1a37862a7606058026b1e55b767f38a6f82da504 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 8 Jul 2024 10:03:44 +0200
Subject: [PATCH 1492/2191] New Crowdin Translations (automated) (#30940)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/bg.json  |  3 ++
 app/javascript/mastodon/locales/ja.json  |  2 +
 app/javascript/mastodon/locales/kab.json | 52 +++++++++++++++++++++++-
 app/javascript/mastodon/locales/lv.json  |  5 ++-
 app/javascript/mastodon/locales/uk.json  | 14 +++----
 config/locales/activerecord.kab.yml      | 28 +++++++++++++
 config/locales/devise.kab.yml            | 21 ++++++++++
 config/locales/doorkeeper.kab.yml        | 24 +++++++++++
 config/locales/doorkeeper.ko.yml         |  2 +-
 config/locales/ko.yml                    |  2 +-
 config/locales/ro.yml                    |  2 +
 config/locales/simple_form.kab.yml       | 27 ++++++++++++
 config/locales/simple_form.ro.yml        | 18 ++++++++
 13 files changed, 187 insertions(+), 13 deletions(-)

diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json
index 323890ba2efe8a..98e84c45d75351 100644
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@@ -35,7 +35,9 @@
   "account.follow_back": "Последване взаимно",
   "account.followers": "Последователи",
   "account.followers.empty": "Още никой не следва потребителя.",
+  "account.followers_counter": "{count, plural, one {{counter} последовател} other {{counter} последователи}}",
   "account.following": "Последвано",
+  "account.following_counter": "{count, plural, one {{counter} последван} other {{counter} последвани}}",
   "account.follows.empty": "Потребителят още никого не следва.",
   "account.go_to_profile": "Към профила",
   "account.hide_reblogs": "Скриване на подсилвания от @{name}",
@@ -61,6 +63,7 @@
   "account.requested_follow": "{name} поиска да ви последва",
   "account.share": "Споделяне на профила на @{name}",
   "account.show_reblogs": "Показване на подсилвания от @{name}",
+  "account.statuses_counter": "{count, plural, one {{counter} публикация} other {{counter} публикации}}",
   "account.unblock": "Отблокиране на @{name}",
   "account.unblock_domain": "Отблокиране на домейн {domain}",
   "account.unblock_short": "Отблокиране",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index 60788baff8c695..f3ba028eabde00 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -692,9 +692,11 @@
   "server_banner.about_active_users": "過去30日間にこのサーバーを使用している人 (月間アクティブユーザー)",
   "server_banner.active_users": "人のアクティブユーザー",
   "server_banner.administered_by": "管理者",
+  "server_banner.is_one_of_many": "{domain} は、数々の独立したMastodonサーバーのうちのひとつです。サーバーに登録してFediverseのコミュニティに加わってみませんか。",
   "server_banner.server_stats": "サーバーの情報",
   "sign_in_banner.create_account": "アカウント作成",
   "sign_in_banner.follow_anyone": "連合内の誰でもフォローして投稿を時系列で見ることができます。アルゴリズム、広告、クリックベイトはありません。",
+  "sign_in_banner.mastodon_is": "Mastodonに参加して、世界で起きていることを見つけよう。",
   "sign_in_banner.sign_in": "ログイン",
   "sign_in_banner.sso_redirect": "ログインまたは登録",
   "status.admin_account": "@{name}さんのモデレーション画面を開く",
diff --git a/app/javascript/mastodon/locales/kab.json b/app/javascript/mastodon/locales/kab.json
index de866cc1bc4c33..fcaa8f143ed445 100644
--- a/app/javascript/mastodon/locales/kab.json
+++ b/app/javascript/mastodon/locales/kab.json
@@ -1,6 +1,10 @@
 {
+  "about.blocks": "Ulac agbur",
   "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.preamble": "Maṣṭudun s umata yeḍmen-ak ad teẓreḍ agbur, ad tesdemreḍ akked yimseqdacen-nniḍen seg yal aqeddac deg fedivers. Ha-tent-an ɣur-k tsuraf i yellan deg uqeddac-agi.",
+  "about.domain_blocks.silenced.title": "Ɣur-s talast",
+  "about.domain_blocks.suspended.title": "Yeḥbes",
   "about.not_available": "Talɣut-a ur tettwabder ara deg uqeddac-a.",
   "about.powered_by": "Azeṭṭa inmetti yettwasɣelsen sɣur {mastodon}",
   "about.rules": "Ilugan n uqeddac",
@@ -166,6 +170,7 @@
   "dismissable_banner.explore_tags": "D wiyi i d ihacṭagen i d-yettawin tamyigawt deg web anmetti ass-a. Ihacṭagen i sseqdacen ugar n medden, εlayit d imezwura.",
   "domain_block_modal.block": "Sewḥel aqeddac",
   "domain_block_modal.they_cant_follow": "Yiwen ur yezmir ad k·m-id-yeḍfer seg uqeddac-a.",
+  "domain_block_modal.title": "Sewḥel taɣult?",
   "domain_pill.activitypub_like_language": "ActivityPub am tutlayt yettmeslay Mastodon d izeḍwan inmettiyen nniḍen.",
   "domain_pill.server": "Aqeddac",
   "domain_pill.username": "Isem n useqdac",
@@ -214,6 +219,7 @@
   "filter_modal.added.review_and_configure_title": "Iɣewwaṛen n imzizdig",
   "filter_modal.added.settings_link": "asebter n yiɣewwaṛen",
   "filter_modal.added.short_explanation": "Tasuffeɣt-a tettwarna ɣer taggayt-a n yimsizdegen: {title}.",
+  "filter_modal.added.title": "Yettwarna umsizdeg!",
   "filter_modal.select_filter.expired": "yemmut",
   "filter_modal.select_filter.prompt_new": "Taggayt tamaynutt : {name}",
   "filter_modal.select_filter.search": "Nadi neɣ snulfu-d",
@@ -224,9 +230,9 @@
   "firehose.remote": "Iqeddacen nniḍen",
   "follow_request.authorize": "Ssireg",
   "follow_request.reject": "Agi",
-  "follow_suggestions.dismiss": "Ur ttɛawad ara ad t-id-sekneṭ",
+  "follow_suggestions.dismiss": "Dayen ur t-id-skan ara",
   "follow_suggestions.view_all": "Wali-ten akk",
-  "follow_suggestions.who_to_follow": "Menhu ara ḍefṛeḍ",
+  "follow_suggestions.who_to_follow": "Ad tḍefreḍ?",
   "followed_tags": "Ihacṭagen yettwaḍfaren",
   "footer.about": "Ɣef",
   "footer.directory": "Akaram n imeɣna",
@@ -235,6 +241,7 @@
   "footer.keyboard_shortcuts": "Inegzumen n unasiw",
   "footer.privacy_policy": "Tasertit tabaḍnit",
   "footer.source_code": "Wali tangalt taɣbalut",
+  "footer.status": "N tsuffeɣt",
   "generic.saved": "Yettwasekles",
   "getting_started.heading": "Bdu",
   "hashtag.column_header.tag_mode.all": "d {additional}",
@@ -313,11 +320,14 @@
   "lightbox.previous": "Ɣer deffir",
   "limited_account_hint.action": "Wali amaɣnu akken yebɣu yili",
   "link_preview.author": "S-ɣur {name}",
+  "link_preview.more_from_author": "Ugar sɣur {name}",
+  "link_preview.shares": "{count, plural, one {{counter} post} other {{counter} posts}}",
   "lists.account.add": "Rnu ɣer tebdart",
   "lists.account.remove": "Kkes seg tebdart",
   "lists.delete": "Kkes tabdart",
   "lists.edit": "Ẓreg tabdart",
   "lists.edit.submit": "Beddel azwel",
+  "lists.exclusive": "Ffer tisuffaɣ-a seg ugejdan",
   "lists.new.create": "Rnu tabdart",
   "lists.new.title_placeholder": "Azwel amaynut n tebdart",
   "lists.replies_policy.followed": "Kra n useqdac i yettwaḍefren",
@@ -338,6 +348,7 @@
   "navigation_bar.bookmarks": "Ticraḍ",
   "navigation_bar.community_timeline": "Tasuddemt tadigant",
   "navigation_bar.compose": "Aru tajewwiqt tamaynut",
+  "navigation_bar.direct": "Tibdarin tusligin",
   "navigation_bar.discover": "Ẓer",
   "navigation_bar.domain_blocks": "Tiɣula yeffren",
   "navigation_bar.explore": "Snirem",
@@ -357,9 +368,14 @@
   "navigation_bar.search": "Nadi",
   "navigation_bar.security": "Taɣellist",
   "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
+  "notification.admin.report": "Yemla-t-id {name} {target}",
+  "notification.admin.sign_up": "Ijerred {name}",
+  "notification.favourite": "{name} yesmenyaf addad-ik·im",
   "notification.follow": "iṭṭafar-ik·em-id {name}",
   "notification.follow_request": "{name} yessuter-d ad k·m-yeḍfeṛ",
   "notification.mention": "{name} yebder-ik-id",
+  "notification.moderation-warning.learn_more": "Issin ugar",
+  "notification.moderation_warning.action_suspend": "Yettwaseḥbes umiḍan-ik.",
   "notification.own_poll": "Tafrant-ik·im tfuk",
   "notification.poll": "Tfukk tefrant ideg tettekkaḍ",
   "notification.reblog": "{name} yebḍa tajewwiqt-ik i tikelt-nniḍen",
@@ -370,6 +386,7 @@
   "notification_requests.notifications_from": "Ilɣa sɣur {name}",
   "notifications.clear": "Sfeḍ tilɣa",
   "notifications.clear_confirmation": "Tebɣiḍ s tidet ad tekkseḍ akk tilɣa-inek·em i lebda?",
+  "notifications.column_settings.admin.report": "Ineqqisen imaynuten:",
   "notifications.column_settings.alert": "Tilɣa n tnarit",
   "notifications.column_settings.favourite": "Imenyafen:",
   "notifications.column_settings.filter_bar.advanced": "Sken-d akk taggayin",
@@ -384,6 +401,7 @@
   "notifications.column_settings.sound": "Rmed imesli",
   "notifications.column_settings.status": "Tisuffaɣ timaynutin :",
   "notifications.column_settings.unread_notifications.category": "Ilɣa ur nettwaɣra",
+  "notifications.column_settings.update": "Iẓreg:",
   "notifications.filter.all": "Akk",
   "notifications.filter.boosts": "Seǧhed",
   "notifications.filter.favourites": "Imenyafen",
@@ -413,6 +431,7 @@
   "onboarding.follows.lead": "You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!",
   "onboarding.follows.title": "Ttwassnen deg Mastodon",
   "onboarding.profile.display_name": "Isem ara d-yettwaskanen",
+  "onboarding.profile.display_name_hint": "Isem-ik·im ummid neɣ isem-ik·im n uqeṣṣer…",
   "onboarding.profile.note": "Tameddurt",
   "onboarding.profile.note_hint": "Tzemreḍ ad d-@tbedreḍ imdanen niḍen neɣ #ihacṭagen …",
   "onboarding.profile.save_and_continue": "Sekles, tkemmleḍ",
@@ -441,6 +460,7 @@
   "poll.total_votes": "{count, plural, one {# n udɣaṛ} other {# n yedɣaṛen}}",
   "poll.vote": "Dɣeṛ",
   "poll.voted": "Tdeɣṛeḍ ɣef tririt-ayi",
+  "poll.votes": "{votes, plural, one {# n udɣaṛ} other {# n yedɣaṛen}}",
   "poll_button.add_poll": "Rnu asenqed",
   "poll_button.remove_poll": "Kkes asenqed",
   "privacy.change": "Seggem tabaḍnit n yizen",
@@ -465,9 +485,12 @@
   "relative_time.seconds": "{number}tas",
   "relative_time.today": "assa",
   "reply_indicator.cancel": "Sefsex",
+  "reply_indicator.poll": "Afmiḍi",
   "report.block": "Sewḥel",
+  "report.categories.legal": "Azerfan",
   "report.categories.other": "Tiyyaḍ",
   "report.categories.spam": "Aspam",
+  "report.category.subtitle": "Fren amṣada akk ufrin",
   "report.category.title_account": "ameɣnu",
   "report.category.title_status": "tasuffeɣt",
   "report.close": "Immed",
@@ -476,13 +499,25 @@
   "report.next": "Uḍfiṛ",
   "report.placeholder": "Iwenniten-nniḍen",
   "report.reasons.dislike": "Ur t-ḥemmleɣ ara",
+  "report.reasons.dislike_description": "D ayen akk ur bɣiɣ ara ad waliɣ",
   "report.reasons.other": "D ayen nniḍen",
+  "report.reasons.other_description": "Ugur ur yemṣada ara akk d taggayin-nniḍen",
   "report.reasons.spam": "D aspam",
+  "report.reasons.spam_description": "Yir iseɣwan, yir agman d tririyin i d-yettuɣalen",
+  "report.reasons.violation": "Truẓi n yilugan n uqeddac",
+  "report.reasons.violation_description": "Teẓriḍ y·tettruẓu kra n yilugan",
+  "report.rules.subtitle": "Fren ayen akk yemṣadan",
+  "report.rules.title": "Acu n yilugan i yettwarẓan?",
+  "report.statuses.subtitle": "Fren ayen akk yemṣadan",
+  "report.statuses.title": "Llant tsuffaɣ ara isdemren aneqqis-a?",
   "report.submit": "Azen",
   "report.target": "Mmel {target}",
+  "report.thanks.take_action_actionable": "Ideg nekkni nessenqad tuttra-inek•inem, tzemreḍ ad tḥadreḍ mgal @{name}:",
   "report.thanks.title": "Ur tebɣiḍ ara ad twaliḍ aya?",
+  "report.thanks.title_actionable": "Tanemmirt ɣef uneqqis, ad nwali deg waya.",
   "report.unfollow": "Seḥbes aḍfar n @{name}",
   "report_notification.attached_statuses": "{count, plural, one {# post} other {# posts}} attached",
+  "report_notification.categories.legal": "Azerfan",
   "report_notification.categories.other": "Ayen nniḍen",
   "report_notification.categories.spam": "Aspam",
   "report_notification.open": "Ldi aneqqis",
@@ -497,6 +532,7 @@
   "search_popout.full_text_search_disabled_message": "Ur yelli ara deg {domain}.",
   "search_popout.language_code": "Tangalt ISO n tutlayt",
   "search_popout.options": "Iwellihen n unadi",
+  "search_popout.quick_actions": "Tigawin tiruradin",
   "search_popout.recent": "Inadiyen ineggura",
   "search_popout.user": "amseqdac",
   "search_results.accounts": "Imeɣna",
@@ -505,7 +541,9 @@
   "search_results.see_all": "Wali-ten akk",
   "search_results.statuses": "Tisuffaɣ",
   "search_results.title": "Anadi ɣef {q}",
+  "server_banner.active_users": "iseqdacen urmiden",
   "server_banner.administered_by": "Yettwadbel sɣur :",
+  "server_banner.server_stats": "Tidaddanin n uqeddac:",
   "sign_in_banner.create_account": "Snulfu-d amiḍan",
   "sign_in_banner.sign_in": "Qqen",
   "sign_in_banner.sso_redirect": "Qqen neɣ jerred",
@@ -516,13 +554,20 @@
   "status.cannot_reblog": "Tasuffeɣt-a ur tezmir ara ad tettwabḍu tikelt-nniḍen",
   "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_x_times": "Tettwaẓreg {count, plural, one {{count} n tikkelt} other {{count} n tikkal}}",
   "status.embed": "Seddu",
+  "status.favourite": "Amenyaf",
   "status.filter": "Sizdeg tassufeɣt-a",
   "status.filtered": "Yettwasizdeg",
   "status.hide": "Ffer tasuffeɣt",
+  "status.history.created": "Yerna-t {name} {date}",
+  "status.history.edited": "Ibeddel-it {name} {date}",
   "status.load_more": "Sali ugar",
+  "status.media.open": "Sit i ulday",
+  "status.media.show": "Sit i uskan",
   "status.media_hidden": "Amidya yettwaffer",
   "status.mention": "Bder-d @{name}",
   "status.more": "Ugar",
@@ -548,6 +593,7 @@
   "status.show_less_all": "Semẓi akk tisuffɣin",
   "status.show_more": "Ssken-d ugar",
   "status.show_more_all": "Ẓerr ugar lebda",
+  "status.show_original": "Sken aɣbalu",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
   "status.translate": "Suqel",
   "status.translated_from_with": "Yettwasuqel seg {lang} s {provider}",
@@ -582,6 +628,7 @@
   "upload_form.video_description": "Glem-d i yemdanen i yesɛan ugur deg tmesliwt neɣ deg yiẓri",
   "upload_modal.analyzing_picture": "Tasleḍt n tugna tetteddu…",
   "upload_modal.apply": "Snes",
+  "upload_modal.applying": "Asnas…",
   "upload_modal.choose_image": "Fren tugna",
   "upload_modal.description_placeholder": "Aberraɣ arurad ineggez nnig n uqjun amuṭṭis",
   "upload_modal.detect_text": "Sefru-d aḍris seg tugna",
@@ -589,6 +636,7 @@
   "upload_modal.preparing_ocr": "Aheyyi n OCR…",
   "upload_modal.preview_label": "Taskant ({ratio})",
   "upload_progress.label": "Asali iteddu...",
+  "upload_progress.processing": "Asesfer…",
   "username.taken": "Yettwaṭṭef yisem-a n useqdac. Ɛreḍ wayeḍ",
   "video.close": "Mdel tabidyutt",
   "video.download": "Sidered afaylu",
diff --git a/app/javascript/mastodon/locales/lv.json b/app/javascript/mastodon/locales/lv.json
index 041072c6adecef..701569fa05ce1c 100644
--- a/app/javascript/mastodon/locales/lv.json
+++ b/app/javascript/mastodon/locales/lv.json
@@ -35,6 +35,7 @@
   "account.follow_back": "Sekot atpakaļ",
   "account.followers": "Sekotāji",
   "account.followers.empty": "Šim lietotājam vēl nav sekotāju.",
+  "account.followers_counter": "{count, plural, zero {{count} sekotāju} one {{count} sekotājs} other {{count} sekotāji}}",
   "account.following": "Seko",
   "account.follows.empty": "Šis lietotājs pagaidām nevienam neseko.",
   "account.go_to_profile": "Doties uz profilu",
@@ -312,9 +313,9 @@
   "home.column_settings.show_reblogs": "Rādīt pastiprinātos ierakstus",
   "home.column_settings.show_replies": "Rādīt atbildes",
   "home.hide_announcements": "Slēpt paziņojumus",
-  "home.pending_critical_update.body": "Lūdzu, pēc iespējas ātrāk atjaunini savu Mastodon serveri!",
+  "home.pending_critical_update.body": "Lūgums pēc iespējas drīzāk atjaunināt savu Mastodon serveri.",
   "home.pending_critical_update.link": "Skatīt jauninājumus",
-  "home.pending_critical_update.title": "Pieejams kritisks drošības jauninājums!",
+  "home.pending_critical_update.title": "Ir pieejams būtisks drošības atjauninājums.",
   "home.show_announcements": "Rādīt paziņojumus",
   "interaction_modal.description.favourite": "Ar Mastodon kontu tu vari pievienot šo ziņu izlasei, lai informētu autoru, ka to novērtē, un saglabātu to vēlākai lasīšanai.",
   "interaction_modal.description.follow": "Ar Mastodon kontu Tu vari sekot {name}, lai saņemtu lietotāja ierakstus savā mājas plūsmā.",
diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json
index 5d7d040fd9bfa9..67ebb031aefcd0 100644
--- a/app/javascript/mastodon/locales/uk.json
+++ b/app/javascript/mastodon/locales/uk.json
@@ -217,18 +217,18 @@
   "domain_block_modal.title": "Заблокувати домен?",
   "domain_block_modal.you_will_lose_followers": "Усіх ваших підписників з цього сервера буде вилучено.",
   "domain_block_modal.you_wont_see_posts": "Ви не бачитимете дописів і сповіщень від користувачів на цьому сервері.",
-  "domain_pill.activitypub_lets_connect": "Це дозволяє вам спілкуватися та взаємодіяти з людьми не лише на Mastodon, але й у різних соціальних додатках.",
-  "domain_pill.activitypub_like_language": "ActivityPub - це як мова, якою Мастодонт розмовляє з іншими соціальними мережами.",
+  "domain_pill.activitypub_lets_connect": "Це дозволяє вам спілкуватися та взаємодіяти з людьми не лише на Mastodon, але й у різних соціальних застосунках.",
+  "domain_pill.activitypub_like_language": "ActivityPub - це як мова, якою Mastodon розмовляє з іншими соціальними мережами.",
   "domain_pill.server": "Сервер",
   "domain_pill.their_handle": "Їхня адреса:",
-  "domain_pill.their_server": "Їхній цифровий дім, де живуть усі їхні пости.",
+  "domain_pill.their_server": "Їхній цифровий дім, де живуть усі їхні дописи.",
   "domain_pill.their_username": "Їхній унікальний ідентифікатор на їхньому сервері. Ви можете знайти користувачів з однаковими іменами на різних серверах.",
   "domain_pill.username": "Ім'я користувача",
   "domain_pill.whats_in_a_handle": "Що є в адресі?",
   "domain_pill.who_they_are": "Оскільки дескриптори вказують, хто це і де він знаходиться, ви можете взаємодіяти з людьми через соціальну мережу платформ на основі <button>ActivityPub</button>.",
   "domain_pill.who_you_are": "Оскільки ваш нікнейм вказує, хто ви та де ви, люди можуть взаємодіяти з вами через соціальну мережу платформ на основі <button>ActivityPub</button>.",
   "domain_pill.your_handle": "Ваша адреса:",
-  "domain_pill.your_server": "Ваш цифровий дім, де живуть усі ваші публікації. Не подобається цей? Перенесіть сервери в будь-який час і залучайте своїх підписників.",
+  "domain_pill.your_server": "Ваш цифровий дім, де живуть усі ваші дописи. Не подобається цей? Перенесіть сервери в будь-який час і залучайте своїх підписників.",
   "domain_pill.your_username": "Ваш унікальний ідентифікатор на цьому сервері. Ви можете знайти користувачів з однаковими іменами на різних серверах.",
   "embed.instructions": "Вбудуйте цей допис до вашого вебсайту, скопіювавши код нижче.",
   "embed.preview": "Ось який вигляд це матиме:",
@@ -489,9 +489,9 @@
   "notification.reblog": "{name} поширює ваш допис",
   "notification.relationships_severance_event": "Втрачено з'єднання з {name}",
   "notification.relationships_severance_event.account_suspension": "Адміністратор з {from} призупинив {target}, що означає, що ви більше не можете отримувати оновлення від них або взаємодіяти з ними.",
-  "notification.relationships_severance_event.domain_block": "Адміністратор з {from} заблокував {target}, включаючи {followersCount} ваших підписників і {{followingCount, plural, one {# account} other {# accounts}}, на які ви підписані.",
-  "notification.relationships_severance_event.learn_more": "Дізнатися більше",
-  "notification.relationships_severance_event.user_domain_block": "Ви заблокували {target}, видаливши {followersCount} ваших підписників і {followingCount, plural, one {# account} other {# accounts}}, за якими ви стежите.",
+  "notification.relationships_severance_event.domain_block": "Адміністратор з {from} заблокував {target}, включаючи {followersCount} ваших підписників і {followingCount , plural, one {# обліковий запис} few {# облікові записи} many {# облікових записів} other {# обліковий запис}}, на які ви підписані.",
+  "notification.relationships_severance_event.learn_more": "Докладніше",
+  "notification.relationships_severance_event.user_domain_block": "Ви заблокували {target}, видаливши {followersCount} ваших підписників і {followingCount, plural, one {# обліковий запис} few {# облікові записи} many {# облікових записів} other {# обліковий запис}}, за якими ви стежите.",
   "notification.status": "{name} щойно дописує",
   "notification.update": "{name} змінює допис",
   "notification_requests.accept": "Прийняти",
diff --git a/config/locales/activerecord.kab.yml b/config/locales/activerecord.kab.yml
index b3ca90069b50ed..8cdc6501cbb494 100644
--- a/config/locales/activerecord.kab.yml
+++ b/config/locales/activerecord.kab.yml
@@ -21,6 +21,18 @@ kab:
             username:
               invalid: ilaq ad ilin isekkilen, uṭṭunen d yijerriden n wadda kan
               reserved: yettwaṭṭef
+        admin/webhook:
+          attributes:
+            url:
+              invalid: mačči d URL ameɣtu
+        doorkeeper/application:
+          attributes:
+            website:
+              invalid: mačči d URL ameɣtu
+        import:
+          attributes:
+            data:
+              malformed: yir amsal
         status:
           attributes:
             reblog:
@@ -28,4 +40,20 @@ kab:
         user:
           attributes:
             email:
+              blocked: isseqdac asaǧǧaw n yimayl ur yettusirgen ara
               unreachable: ur d-ttban ara d akken yella
+            role_id:
+              elevated: ur yezmir ara ad iεeddi tamlilt-ik tamirant
+        user_role:
+          attributes:
+            permissions_as_keys:
+              dangerous: deg-s tisirag tiriɣelsanin i temlilt tazadurt
+              elevated: ur yezmir ara ad yesεu tirirag ur nelli ara deg temlilit-ik tamirant
+              own_role: ur yezmir ara ad yettwabeddel s temlilt-ik tamirant
+            position:
+              elevated: ur yezmir ara ad iεeddi tamlilt-ik tamirant
+              own_role: ur yezmir ara ad yettwabeddel s temlilt-ik tamirant
+        webhook:
+          attributes:
+            events:
+              invalid_permissions: ur yezmir ara ad yesεu tidyanin iwumi ur tesεiḍ ara tisirag
diff --git a/config/locales/devise.kab.yml b/config/locales/devise.kab.yml
index 438c1df2b9a46f..3fbc58c1f57fcb 100644
--- a/config/locales/devise.kab.yml
+++ b/config/locales/devise.kab.yml
@@ -12,6 +12,7 @@ kab:
       last_attempt: Γur-k yiwen n uɛraḍ-nniḍen kan send ad yettucekkel umiḍan-ik.
       locked: Amiḍan-ik yettwargel.
       not_found_in_database: Tella tuccḍa deg %{authentication_keys} neγ deg wawal uffir.
+      omniauth_user_creation_failure: Tuccḍa lawan n tmerna n umiḍan i timagit-a.
       pending: Amiḍan-inek mazal-it deg ɛiwed n tmuγli.
       timeout: Tiɣimit n tuqqna tezri. Ma ulac aɣilif ɛiwed tuqqna akken ad tkemmleḍ.
       unauthenticated: Ilaq ad teqqneḍ neɣ ad tjerrḍeḍ akken ad tkemmelḍ.
@@ -47,21 +48,41 @@ kab:
         subject: 'Mastodon: Iwellihen n uwennez n wawal uffir'
         title: Aɛiwed n wawal uffir
       two_factor_disabled:
+        explanation: Tuqqna tella tura s useqdec n tansa n yimayl tasuft d wawal n uεeddi.
         subject: 'Mastodon: Asesteb s snat n tarrayin yensa'
+        subtitle: Asesteb s snat tarrayin i umiḍan-ik yensan.
         title: Asesteb s snat n tarrayin insa
       two_factor_enabled:
+        explanation: Ajuṭu yettusirwen s usnas TOTP yeqqnen ilaq i wakken ad teqqneḍ.
         subject: 'Mastodon: Asesteb s snat n tarrayin yermed'
+        subtitle: Asesteb s snat tarrayin yettwarmed i umiḍan-ik.
         title: Asesteb s snat n tarrayin irmed
       two_factor_recovery_codes_changed:
         explanation: Tangalt n tuɣalin tettwaḥbes sakin nesnulfa-d yiwet d tamaynut.
         subject: 'Mastodon: Tingalin n tuɣalin n snat n tarayin ttwarnanat i tikkelt-nniḍen'
+        subtitle: Tangalt n tuɣalin tettwaḥbes sakin nesnulfa-d yiwet d tamaynut.
         title: Tangalt n tuɣalin 2FA tettwabeddel
       unlock_instructions:
         subject: 'Mastodon: iwelihhen n userreḥ'
       webauthn_credential:
         added:
+          explanation: Tasarut-a n tɣellist tettwarna ɣer umiḍan-ik·im
           subject: 'Maṣṭudun : Tasarutt tamaynutt n tɣellist'
           title: Tasarut tamaynutt n tɣellist tamaynut tettwarna
+        deleted:
+          explanation: Tasarut-a n tɣellist tettwakkes seg umiḍan-ik·im
+          subject: 'Mastodon: Tasarut n tɣellsit tettwakkes'
+          title: Yiwet seg tsura-k·m n tɣellist tettwakkes
+      webauthn_disabled:
+        explanation: Yensa usesteb s tsura n tɣellist i umiḍan-ik.
+        extra: Tzemreḍ ad tkecmeḍ tura s useqdec asuf n ujuṭu yettwasran s usnas TOPTP yeqqnen.
+        subject: 'Mastodon: Asesteb s tsura n tɣellist yensa'
+        title: Tisura n tɣellist nsant
+      webauthn_enabled:
+        explanation: Asesteb n tsarut n tɣellist tettwarmed i umiḍan-ik.
+        extra: Tasarut-ik n tɣellist tezmer tura ad tettuseqdec i unekcum.
+        subject: 'Mastodon: Asesteb n tsarut n tɣellist yermed'
+        title: Tisura n tɣellist remdent
     omniauth_callbacks:
       failure: Ur nezmir ara ad ak·akem-nsesṭeb seg %{kind} acku "%{reason}".
       success: Asesṭeb idda akken iwata seg umiḍan %{kind}.
diff --git a/config/locales/doorkeeper.kab.yml b/config/locales/doorkeeper.kab.yml
index 1b1a7df957645f..33aecd8c6f03d7 100644
--- a/config/locales/doorkeeper.kab.yml
+++ b/config/locales/doorkeeper.kab.yml
@@ -5,6 +5,7 @@ kab:
       doorkeeper/application:
         name: Isem n usnas
         redirect_uri: URI n uwelleh
+        scopes: Tinerfadin
         website: Asmel web n usnas
     errors:
       models:
@@ -39,6 +40,7 @@ kab:
         empty: Ulac ɣur-k·m isnasen.
         name: Isem
         new: Asnas amaynut
+        scopes: Tinerfadin
         show: Ẓer
         title: Isnasen-ik·im
       new:
@@ -47,6 +49,8 @@ kab:
         actions: Tigawin
         application_id: ID n usnas
         callback_urls: URL n tririt n wawal
+        scopes: Tinerfadin
+        secret: Tuffirt n umsaɣ
         title: 'Asnas: %{name}'
     authorizations:
       buttons:
@@ -55,6 +59,7 @@ kab:
       error:
         title: Tella-d tuccḍa
       new:
+        review_permissions: Asenqed n tsirag
         title: Tlaq tsiregt
       show:
         title: Nɣel tangalt n wurag sakkin senteḍ-itt deg usnas.
@@ -64,8 +69,12 @@ kab:
       confirmations:
         revoke: Tetḥeqqeḍ?
       index:
+        authorized_at: Yettwasireg ɣef %{date}
         description_html: Ha-t-an yisnasen i izemren ad kecmen ɣer umiḍan-ik·im, s useqdec n API. Ma llan yisnasen ur teεqileḍ ara da, neɣ kra n wesnas ur iteddu ara akken ilaq, tzemreḍ ad tekkseḍ anekcum-is.
         last_used_at: Yettwaseqdec i tikkelt taneggarut ass n %{date}
+        never_used: Urǧin yettwaseqdac
+        scopes: Tisirag
+        superapp: Adigan
         title: Isnasen-ik·im yettusirgen
     errors:
       messages:
@@ -82,13 +91,28 @@ kab:
         destroy:
           notice: Yettwaḥwi wesnas.
     grouped_scopes:
+      access:
+        read: Anekcum i tɣuri kan
+        read/write: Anekcum i tɣuri d tira
+        write: Anekcum i tira kan
       title:
         accounts: Imiḍanen
         admin/accounts: Tadbelt n imiḍan
+        admin/all: Akk timahilin tinebdalin
+        admin/reports: Tadbelt n yineqqisen
+        blocks: Yewḥel
+        bookmarks: Ticraḍ
+        conversations: Idiwenniyen
         crypto: Awgelhen seg yixef ɣer yixef
+        favourites: Imenyafen
         filters: Imzizdigen
+        follow: Aḍfar, asgugem akked usewḥel
+        follows: Aḍfar
         lists: Tibdarin
+        media: Imeddayen n umidya
+        mutes: Yeggugem
         notifications: Tilɣa
+        profile: Amaɣnu-k Mastodon
         push: Tilɣa yettudemmren
         reports: Ineqqisen
         search: Nadi
diff --git a/config/locales/doorkeeper.ko.yml b/config/locales/doorkeeper.ko.yml
index 3ab0698d51c4ef..7ec357bf9fdec4 100644
--- a/config/locales/doorkeeper.ko.yml
+++ b/config/locales/doorkeeper.ko.yml
@@ -31,7 +31,7 @@ ko:
       form:
         error: 이런! 오류를 확인하세요
       help:
-        native_redirect_uri: "%{native_redirect_uri}에서 로컬 테스트를 할 수 있습니다."
+        native_redirect_uri: "%{native_redirect_uri}를 이용해 로컬 테스트를 할 수 있습니다"
         redirect_uri: 한 줄에 하나의 URI를 작성하세요
         scopes: 스페이스로 범위를 구분하세요. 빈 칸으로 놔두면 기본 범위를 사용합니다.
       index:
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index a8e2ade61df8e5..f7feb73ba0b03d 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -1741,7 +1741,7 @@ ko:
     contrast: 마스토돈 (고대비)
     default: 마스토돈 (어두움)
     mastodon-light: 마스토돈 (밝음)
-    system: 자동 선택 (시스템 테마 이용)
+    system: 자동 (시스템 테마 사용)
   time:
     formats:
       default: "%Y-%m-%d %H:%M"
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index cd54d51051d838..79bc2a275f4045 100644
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -116,6 +116,8 @@ ro:
       redownloaded_msg: S-a reîmprospătat cu succes profilul %{username} de la origine
       reject: Respinge
       rejected_msg: S-a respins cu succes cererea de înregistrare a utilizatorului %{username}
+      remote_suspension_irreversible: Datele acestui cont au fost șterse în mod ireversibil.
+      remote_suspension_reversible_hint_html: Contul a fost suspendat pe server-ul respectiv, iar datele vor fi șterse complet pe %{date}. Până atunci, server-ul remote poate restabili acest cont fără consecințe negative. Dacă dorești să elimini toate datele contului numaidecât, poți face acest lucru mai jos.
       remove_avatar: Elimină avatar
       remove_header: Elimină antet
       removed_avatar_msg: S-a îndepărtat cu succes poza de profil a utilizatorului %{username}
diff --git a/config/locales/simple_form.kab.yml b/config/locales/simple_form.kab.yml
index 9461f16cd54577..63e2b9aacf1bf6 100644
--- a/config/locales/simple_form.kab.yml
+++ b/config/locales/simple_form.kab.yml
@@ -5,6 +5,7 @@ kab:
       account:
         display_name: Isem-ik·im ummid neɣ isem-ik·im n uqeṣṣer.
         fields: Asebter-ik·im agejdan, imqimen, leεmer, ayen tebɣiḍ.
+        note: 'Tzemreḍ ad d-@tbedreḍ imdanen niḍen neɣ #ihacṭagen.'
       account_alias:
         acct: Sekcem isem n umseqdac@domain n umiḍan s wansa itebγiḍ ad gujjeḍ
       account_migration:
@@ -27,6 +28,8 @@ kab:
         name: 'Ha-t-an kra seg ihacṭagen i tesseqdaceḍ ussan-a ineggura maḍi :'
       imports:
         data: Afaylu CSV id yusan seg uqeddac-nniḍen n Maṣṭudun
+      invite_request:
+        text: Aya ad aɣ-iɛiwen ad nessenqed tuttra-k•m
       ip_block:
         comment: D afrayan. Cfu ɣef wayɣer i terniḍ alugen-a.
         severities:
@@ -36,6 +39,8 @@ kab:
         fields:
           name: Tabzimt
           value: Agbur
+      account_alias:
+        acct: Tansa n umiḍan aqbur
       account_migration:
         acct: Tansa n umiḍan amaynut
       account_warning_preset:
@@ -51,6 +56,7 @@ kab:
           suspend: Ḥbes di leεḍil
       announcement:
         ends_at: Tagara n tedyant
+        starts_at: Tazwara n tedyant
         text: Alɣu
       defaults:
         autofollow: Ɛreḍ-it-id ad yeḍfer amiḍan-ik·im
@@ -59,18 +65,25 @@ kab:
         chosen_languages: Sizdeg tutlayin
         confirm_new_password: Sentem awal uffir amaynut
         confirm_password: Sentem awal uffir
+        context: Isatalen n umsizdeg
         current_password: Awal uffir n tura
         data: Isefka
         display_name: Isem ara d-yettwaskanen
         email: Tansa imayl
         expires_in: Ad yemmet
+        fields: Urtiyen niḍen
         header: Ixef
+        honeypot: "%{label} (ur tettaččar ara)"
+        inbox_url: URL n tbewwaḍt n urmas yettwacudden
+        irreversible: Kkes deg wadeg n tuffra
         locale: Tutlayt n wegrudem
         max_uses: Amḍan afellay n iseqdacen
         new_password: Awal uffir amaynut
         note: Tameddurt
         otp_attempt: Tangalt n snat n tarayin
         password: Awal uffir
+        phrase: Awal n tsarut neɣ tafyirt
+        setting_advanced_layout: Rmed agrudem n web leqqayen
         setting_default_language: Tutlayt n tira
         setting_default_privacy: Tabaḍnit n tira
         setting_display_media_default: Akk-a kan
@@ -88,8 +101,15 @@ kab:
       featured_tag:
         name: Ahacṭag
       form_admin_settings:
+        custom_css: CSS udmawan
+        profile_directory: Rmed akaram n imaγnuten
+        site_contact_email: Imayl n unermas
+        site_short_description: Aglam n uqeddac
         site_terms: Tasertit tabaḍnit
         site_title: Isem n uqeddac
+        status_page_url: URL n uusebter n waddaden
+        theme: Asentel amezwer
+        thumbnail: Tanfult n uqeddac
       interactions:
         must_be_follower: Ssewḥel ilɣa sɣur wid akked tid ur yellin ara d imeḍfaren-ik·im
         must_be_following: Ssewḥel ilɣa sɣur wid akked tid ur tettḍafareḍ ara
@@ -109,18 +129,25 @@ kab:
         follow: Yeḍfer-ik·im-id walbɛaḍ
         follow_request: Ma yella win i d-yessutren ad k·em-yeḍfer
         mention: Yuder-ik·em-id walbɛaḍ
+        pending_account: Amiḍan amaynut yesran asenqed
         reblog: Yella win yesselhan adda-dik·im
+        report: Aneqis amaynut yettwazen
       rule:
         hint: Isallen-nniḍen
         text: Alugen
       tag:
         name: Ahacṭag
       user:
+        role: Tamlilt
         time_zone: Tamnaḍt tasragant
       user_role:
         name: Isem
         permissions_as_keys: Tisirag
+      webhook:
+        events: Tidyanin turmidin
     'no': Ala
+    not_recommended: Ur yettuwelleh ara
+    overridden: Yeččur
     recommended: Yettuwelleh
     required:
       mark: "*"
diff --git a/config/locales/simple_form.ro.yml b/config/locales/simple_form.ro.yml
index dfb44c77453e56..5df411b9512d3e 100644
--- a/config/locales/simple_form.ro.yml
+++ b/config/locales/simple_form.ro.yml
@@ -2,6 +2,12 @@
 ro:
   simple_form:
     hints:
+      account:
+        discoverable: Este posibil ca postările și profilul tău să fie recomandate în diferite zone ale Mastodon, iar profilul tău ar poate fi sugerat altor utilizatori.
+        fields: Pagina ta principală, pronumele tale, vârsta, sau orice îți dorești.
+        indexable: Postările tale publice pot apărea în rezultatele căutărilor pe Mastodon. Persoanele care au interacționat cu postările tale vor putea să le caute oricând.
+        note: 'Poți @menționa alte persoane sau #hashtag-uri.'
+        unlocked: Alte persoane vă vor putea urmări fără a solicita aprobare. Debifați dacă doriți să revizuiți cererile și să alegeți dacă doriți să acceptați sau să respingeți noii urmăritori.
       account_alias:
         acct: Specificați numele de utilizator@domeniu al contului de la care doriți să treceți
       account_migration:
@@ -23,12 +29,14 @@ ro:
         text: Poți folosi sintaxa de postare. Te rugăm să fii atent la spațiul pe care anunțul îl va ocupa pe ecranul utilizatorului
       defaults:
         autofollow: Persoanele care se înregistrează datorită invitației tale te vor urmări automat
+        avatar: WEBP, PNG, GIF sau JPG. Cel mult %{size}. Va fi redimensionată la %{dimensions}px
         bot: Acest cont performează în cea mai mare parte acțiuni automate și nu poate fi monitorizat
         context: Contextele în care filtrul trebuie aplicat
         current_password: În scopuri de securitate, vă rugăm să introduceţi parola contului curent
         current_username: Pentru a confirma, vă rugăm să introduceţi numele de utilizator al contului curent
         digest: Este trimis doar după o lungă perioadă de inactivitate și numai dacă primești mesaje personale în perioada de absență
         email: Vei primi un e-mail de confirmare
+        header: WEBP, PNG, GIF sau JPG. Cel mult %{size}. Va fi redimensionată la %{dimensions}px
         inbox_url: Copiază adresa URL de pe prima pagină a reului pe care vrei să îl utilizezi
         irreversible: Postările sortate vor dispărea ireversibil, chiar dacă filtrul este ulterior șters
         locale: Limba interfaței de utilizator, e-mailurile si notificările push
@@ -36,17 +44,27 @@ ro:
         phrase: Vor fi potrivite indiferent de textul din casetă sau advertismentul unei postări
         scopes: La care API-uri aplicația are nevoie de acces. Dacă selectezi un scop principal nu mai e nevoie să selectezi fiecare sub-scop al acestuia.
         setting_aggregate_reblogs: Nu afișa impulsurile noi pentru postările care au fost deja recent impulsionate (afectează doar noile impulsuri primite)
+        setting_always_send_emails: În mod normal, notificările prin e-mail nu vor fi trimise când utilizați în mod activ Mastodon
         setting_default_sensitive: Fișierele media sensibile sunt ascunse implicit și pot fi dezvăluite cu un clic
         setting_display_media_default: Ascunde conținutul media marcat ca sensibil (NSFW)
         setting_display_media_hide_all: Întotdeauna ascunde tot conținutul media
         setting_display_media_show_all: Întotdeauna afișează conținutul media marcat ca sensibil
         setting_use_blurhash: Gradienții sunt bazați pe culorile vizualelor ascunse, dar ofuscă orice detalii
         setting_use_pending_items: Ascunde actualizările cronologice din spatele unui click în loc de a derula automat fluxul
+        username: Poți folosi litere, numere sau liniuțe de subliniere
         whole_word: Când fraza sau cuvântul este doar alfanumeric, acesta se aplică doar dacă există o potrivire completă
       domain_allow:
         domain: Acest domeniu va putea prelua date de pe acest server și datele primite de la el vor fi procesate și stocate
       email_domain_block:
+        domain: Acesta poate fi numele de domeniu care apare în adresa de e-mail sau în înregistrarea MX pe care o utilizează. Acestea vor fi verificate la înscriere.
         with_dns_records: Se va face o încercare de a rezolva înregistrările DNS ale domeniului dat și rezultatele vor fi de asemenea afișate pe lista neagră
+      featured_tag:
+        name: 'Iată câteva dintre hashtag-urile pe care le-ai folosit cel mai recent:'
+      filters:
+        action: Alege ce acţiune va fi efectuată atunci când o postare corespunde filtrului
+        actions:
+          hide: Ascunde complet conținutul filtrat, ca și cum nu ar exista
+          warn: Ascunde conținutul filtrat în spatele unui avertisment care menționează titlul filtrului
       form_challenge:
         current_password: Ați intrat într-o zonă securizată
       imports:

From 36d819bef34279bb36cdfa3ed89711405ad79591 Mon Sep 17 00:00:00 2001
From: Tianwei Dong <ileodo@users.noreply.github.com>
Date: Mon, 8 Jul 2024 09:10:57 +0100
Subject: [PATCH 1493/2191] Change to use an unified constant for max media
 attachments per status (#29073)

Co-authored-by: Renaud Chaput <renchap@gmail.com>
---
 app/javascript/mastodon/actions/compose.js                    | 4 ++--
 app/javascript/mastodon/components/media_gallery.jsx          | 4 ++--
 .../features/compose/containers/upload_button_container.js    | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/javascript/mastodon/actions/compose.js b/app/javascript/mastodon/actions/compose.js
index b07dff182a8bb4..0bcba7d57fe78b 100644
--- a/app/javascript/mastodon/actions/compose.js
+++ b/app/javascript/mastodon/actions/compose.js
@@ -279,7 +279,7 @@ export function submitComposeFail(error) {
 
 export function uploadCompose(files) {
   return function (dispatch, getState) {
-    const uploadLimit = 4;
+    const uploadLimit = getState().getIn(['server', 'server', 'configuration', 'statuses', 'max_media_attachments']);
     const media = getState().getIn(['compose', 'media_attachments']);
     const pending = getState().getIn(['compose', 'pending_media_attachments']);
     const progress = new Array(files.length).fill(0);
@@ -299,7 +299,7 @@ export function uploadCompose(files) {
     dispatch(uploadComposeRequest());
 
     for (const [i, file] of Array.from(files).entries()) {
-      if (media.size + i > 3) break;
+      if (media.size + i > (uploadLimit - 1)) break;
 
       const data = new FormData();
       data.append('file', file);
diff --git a/app/javascript/mastodon/components/media_gallery.jsx b/app/javascript/mastodon/components/media_gallery.jsx
index 91459a1285c0d1..ed4805b05d50f5 100644
--- a/app/javascript/mastodon/components/media_gallery.jsx
+++ b/app/javascript/mastodon/components/media_gallery.jsx
@@ -305,13 +305,13 @@ class MediaGallery extends PureComponent {
       style.aspectRatio = '3 / 2';
     }
 
-    const size     = media.take(4).size;
+    const size     = media.size;
     const uncached = media.every(attachment => attachment.get('type') === 'unknown');
 
     if (this.isFullSizeEligible()) {
       children = <Item standalone autoplay={autoplay} onClick={this.handleClick} attachment={media.get(0)} lang={lang} displayWidth={width} visible={visible} />;
     } else {
-      children = media.take(4).map((attachment, i) => <Item key={attachment.get('id')} autoplay={autoplay} onClick={this.handleClick} attachment={attachment} index={i} lang={lang} size={size} displayWidth={width} visible={visible || uncached} />);
+      children = media.map((attachment, i) => <Item key={attachment.get('id')} autoplay={autoplay} onClick={this.handleClick} attachment={attachment} index={i} lang={lang} size={size} displayWidth={width} visible={visible || uncached} />);
     }
 
     if (uncached) {
diff --git a/app/javascript/mastodon/features/compose/containers/upload_button_container.js b/app/javascript/mastodon/features/compose/containers/upload_button_container.js
index 066e1853468680..7cdc12663d70ca 100644
--- a/app/javascript/mastodon/features/compose/containers/upload_button_container.js
+++ b/app/javascript/mastodon/features/compose/containers/upload_button_container.js
@@ -9,7 +9,7 @@ const mapStateToProps = state => {
   const readyAttachmentsSize = state.getIn(['compose', 'media_attachments']).size ?? 0;
   const pendingAttachmentsSize = state.getIn(['compose', 'pending_media_attachments']).size ?? 0;
   const attachmentsSize = readyAttachmentsSize + pendingAttachmentsSize;
-  const isOverLimit = attachmentsSize > 3;
+  const isOverLimit = attachmentsSize > state.getIn(['server', 'server', 'configuration', 'statuses', 'max_media_attachments'])-1;
   const hasVideoOrAudio = state.getIn(['compose', 'media_attachments']).some(m => ['video', 'audio'].includes(m.get('type')));
 
   return {

From 79b0e192d9fb06dbf203e05e6f621dc3ef4d8c73 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 8 Jul 2024 04:16:00 -0400
Subject: [PATCH 1494/2191] Move test migrations paths check to workflow level
 (#30702)

---
 .github/workflows/test-migrations.yml | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/test-migrations.yml b/.github/workflows/test-migrations.yml
index 43de631545c6ed..6a0e67c58ee500 100644
--- a/.github/workflows/test-migrations.yml
+++ b/.github/workflows/test-migrations.yml
@@ -6,25 +6,24 @@ on:
     branches:
       - 'main'
       - 'stable-*'
+    paths:
+      - 'Gemfile*'
+      - '.ruby-version'
+      - '**/*.rb'
+      - '.github/workflows/test-migrations.yml'
+      - 'lib/tasks/tests.rake'
+
   pull_request:
+    paths:
+      - 'Gemfile*'
+      - '.ruby-version'
+      - '**/*.rb'
+      - '.github/workflows/test-migrations.yml'
+      - 'lib/tasks/tests.rake'
 
 jobs:
-  pre_job:
-    runs-on: ubuntu-latest
-
-    outputs:
-      should_skip: ${{ steps.skip_check.outputs.should_skip }}
-
-    steps:
-      - id: skip_check
-        uses: fkirc/skip-duplicate-actions@v5
-        with:
-          paths: '["Gemfile*", ".ruby-version", "**/*.rb", ".github/workflows/test-migrations.yml", "lib/tasks/tests.rake"]'
-
   test:
     runs-on: ubuntu-latest
-    needs: pre_job
-    if: needs.pre_job.outputs.should_skip != 'true'
 
     strategy:
       fail-fast: false

From f1300ad284d8c7877a7406e253cf7558596d9837 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 8 Jul 2024 12:01:08 -0400
Subject: [PATCH 1495/2191] Rename jobs/attachments rspec tag names (#29762)

---
 .github/workflows/test-ruby.yml                           | 2 +-
 .../controllers/admin/disputes/appeals_controller_spec.rb | 4 ++--
 spec/controllers/admin/domain_blocks_controller_spec.rb   | 2 +-
 spec/controllers/admin/resets_controller_spec.rb          | 2 +-
 spec/controllers/auth/sessions_controller_spec.rb         | 4 ++--
 spec/controllers/concerns/user_tracking_concern_spec.rb   | 2 +-
 spec/controllers/disputes/appeals_controller_spec.rb      | 4 ++--
 spec/controllers/settings/deletes_controller_spec.rb      | 2 +-
 spec/lib/activitypub/activity/delete_spec.rb              | 2 +-
 spec/lib/activitypub/activity/move_spec.rb                | 2 +-
 spec/models/admin/account_action_spec.rb                  | 2 +-
 spec/models/custom_emoji_spec.rb                          | 2 +-
 spec/models/media_attachment_spec.rb                      | 2 +-
 spec/models/user_spec.rb                                  | 4 ++--
 spec/rails_helper.rb                                      | 4 ++--
 spec/requests/api/v1/admin/account_actions_spec.rb        | 2 +-
 spec/requests/api/v1/conversations_spec.rb                | 2 +-
 spec/requests/api/v1/featured_tags_spec.rb                | 2 +-
 spec/requests/api/v1/media_spec.rb                        | 6 +++---
 spec/requests/api/v1/notifications/policies_spec.rb       | 2 +-
 spec/requests/api/v1/notifications/requests_spec.rb       | 2 +-
 spec/requests/api/v1/notifications_spec.rb                | 2 +-
 spec/requests/api/v1/reports_spec.rb                      | 2 +-
 spec/requests/api/v1/statuses/favourites_spec.rb          | 2 +-
 spec/requests/api/v1/statuses/reblogs_spec.rb             | 2 +-
 spec/requests/api/v1/timelines/home_spec.rb               | 2 +-
 spec/requests/api/v2/media_spec.rb                        | 2 +-
 spec/requests/api/v2_alpha/notifications_spec.rb          | 2 +-
 .../models/concerns/account/statuses_search_spec.rb       | 2 +-
 .../activitypub/fetch_remote_status_service_spec.rb       | 2 +-
 spec/services/activitypub/process_account_service_spec.rb | 2 +-
 spec/services/appeal_service_spec.rb                      | 2 +-
 spec/services/authorize_follow_service_spec.rb            | 2 +-
 spec/services/batched_remove_status_service_spec.rb       | 2 +-
 spec/services/block_domain_service_spec.rb                | 2 +-
 spec/services/block_service_spec.rb                       | 2 +-
 spec/services/delete_account_service_spec.rb              | 4 ++--
 spec/services/fan_out_on_write_service_spec.rb            | 8 ++++----
 spec/services/favourite_service_spec.rb                   | 2 +-
 spec/services/follow_service_spec.rb                      | 2 +-
 spec/services/import_service_spec.rb                      | 2 +-
 spec/services/mute_service_spec.rb                        | 2 +-
 spec/services/notify_service_spec.rb                      | 2 +-
 spec/services/reject_follow_service_spec.rb               | 2 +-
 spec/services/remove_from_followers_service_spec.rb       | 2 +-
 spec/services/remove_status_service_spec.rb               | 2 +-
 spec/services/report_service_spec.rb                      | 2 +-
 spec/services/resolve_account_service_spec.rb             | 2 +-
 spec/services/suspend_account_service_spec.rb             | 2 +-
 spec/services/unallow_domain_service_spec.rb              | 2 +-
 spec/services/unblock_service_spec.rb                     | 2 +-
 spec/services/unfollow_service_spec.rb                    | 4 ++--
 spec/services/unsuspend_account_service_spec.rb           | 2 +-
 spec/services/update_account_service_spec.rb              | 2 +-
 spec/support/examples/models/concerns/account_avatar.rb   | 4 ++--
 spec/support/examples/models/concerns/account_header.rb   | 2 +-
 spec/system/admin/accounts_spec.rb                        | 2 +-
 spec/system/new_statuses_spec.rb                          | 2 +-
 spec/system/ocr_spec.rb                                   | 2 +-
 spec/system/report_interface_spec.rb                      | 2 +-
 spec/workers/backup_worker_spec.rb                        | 2 +-
 spec/workers/move_worker_spec.rb                          | 2 +-
 spec/workers/post_process_media_worker_spec.rb            | 2 +-
 63 files changed, 76 insertions(+), 76 deletions(-)

diff --git a/.github/workflows/test-ruby.yml b/.github/workflows/test-ruby.yml
index 0e75a0b764a853..fcfeed5fbad7b3 100644
--- a/.github/workflows/test-ruby.yml
+++ b/.github/workflows/test-ruby.yml
@@ -224,7 +224,7 @@ jobs:
       - name: Load database schema
         run: './bin/rails db:create db:schema:load db:seed'
 
-      - run: bin/rspec --tag paperclip_processing
+      - run: bin/rspec --tag attachment_processing
 
       - name: Upload coverage reports to Codecov
         if: matrix.ruby-version == '.ruby-version'
diff --git a/spec/controllers/admin/disputes/appeals_controller_spec.rb b/spec/controllers/admin/disputes/appeals_controller_spec.rb
index bf7f9bd70485c0..678ceee1158eb1 100644
--- a/spec/controllers/admin/disputes/appeals_controller_spec.rb
+++ b/spec/controllers/admin/disputes/appeals_controller_spec.rb
@@ -34,7 +34,7 @@
 
     let(:current_user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
 
-    it 'redirects back to the strike page and notifies target account about approved appeal', :sidekiq_inline do
+    it 'redirects back to the strike page and notifies target account about approved appeal', :inline_jobs do
       emails = capture_emails { subject }
 
       expect(response)
@@ -58,7 +58,7 @@
 
     let(:current_user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
 
-    it 'redirects back to the strike page and notifies target account about rejected appeal', :sidekiq_inline do
+    it 'redirects back to the strike page and notifies target account about rejected appeal', :inline_jobs do
       emails = capture_emails { subject }
 
       expect(response)
diff --git a/spec/controllers/admin/domain_blocks_controller_spec.rb b/spec/controllers/admin/domain_blocks_controller_spec.rb
index 87b08323da917c..eb2c6265d12eec 100644
--- a/spec/controllers/admin/domain_blocks_controller_spec.rb
+++ b/spec/controllers/admin/domain_blocks_controller_spec.rb
@@ -176,7 +176,7 @@
     end
   end
 
-  describe 'PUT #update', :sidekiq_inline do
+  describe 'PUT #update', :inline_jobs do
     subject do
       post :update, params: { :id => domain_block.id, :domain_block => { domain: 'example.com', severity: new_severity }, 'confirm' => '' }
     end
diff --git a/spec/controllers/admin/resets_controller_spec.rb b/spec/controllers/admin/resets_controller_spec.rb
index 10ed2cf969730c..0cbc3b60ab6f88 100644
--- a/spec/controllers/admin/resets_controller_spec.rb
+++ b/spec/controllers/admin/resets_controller_spec.rb
@@ -13,7 +13,7 @@
     sign_in Fabricate(:user, role: UserRole.find_by(name: 'Admin')), scope: :user
   end
 
-  describe 'POST #create', :sidekiq_inline do
+  describe 'POST #create', :inline_jobs do
     it 'redirects to admin accounts page' do
       emails = capture_emails { subject }
 
diff --git a/spec/controllers/auth/sessions_controller_spec.rb b/spec/controllers/auth/sessions_controller_spec.rb
index e78554ec7dc3e8..9a94e5e1a1a464 100644
--- a/spec/controllers/auth/sessions_controller_spec.rb
+++ b/spec/controllers/auth/sessions_controller_spec.rb
@@ -123,7 +123,7 @@
           user.update(current_sign_in_at: 1.month.ago)
         end
 
-        it 'logs the user in and sends suspicious email and redirects home', :sidekiq_inline do
+        it 'logs the user in and sends suspicious email and redirects home', :inline_jobs do
           emails = capture_emails { subject }
 
           expect(response)
@@ -263,7 +263,7 @@
             travel_to '2023-12-20T10:00:00Z'
           end
 
-          it 'does not log the user in, sets a flash message, and sends a suspicious sign in email', :sidekiq_inline do
+          it 'does not log the user in, sets a flash message, and sends a suspicious sign in email', :inline_jobs do
             emails = capture_emails do
               Auth::SessionsController::MAX_2FA_ATTEMPTS_PER_HOUR.times do
                 post :create, params: { user: { otp_attempt: '1234' } }, session: { attempt_user_id: user.id, attempt_user_updated_at: user.updated_at.to_s }
diff --git a/spec/controllers/concerns/user_tracking_concern_spec.rb b/spec/controllers/concerns/user_tracking_concern_spec.rb
index b1de3cf4e2e2a0..f23d482f5f9303 100644
--- a/spec/controllers/concerns/user_tracking_concern_spec.rb
+++ b/spec/controllers/concerns/user_tracking_concern_spec.rb
@@ -75,7 +75,7 @@ def show
         expect(redis.ttl("account:#{user.account_id}:regeneration")).to be >= 0
       end
 
-      it 'regenerates feed when sign in is older than two weeks', :sidekiq_inline do
+      it 'regenerates feed when sign in is older than two weeks', :inline_jobs do
         get :show
 
         expect_updated_sign_in_at(user)
diff --git a/spec/controllers/disputes/appeals_controller_spec.rb b/spec/controllers/disputes/appeals_controller_spec.rb
index 99d5a8b17f0252..3e874bbdcc0cab 100644
--- a/spec/controllers/disputes/appeals_controller_spec.rb
+++ b/spec/controllers/disputes/appeals_controller_spec.rb
@@ -17,7 +17,7 @@
       let(:strike) { Fabricate(:account_warning, target_account: current_user.account) }
       let(:params) { { strike_id: strike.id, appeal: { text: 'Foo' } } }
 
-      it 'notifies staff about new appeal and redirects back to strike page', :sidekiq_inline do
+      it 'notifies staff about new appeal and redirects back to strike page', :inline_jobs do
         emails = capture_emails { subject }
 
         expect(emails.size)
@@ -36,7 +36,7 @@
       let(:strike) { Fabricate(:account_warning, target_account: current_user.account) }
       let(:params) { { strike_id: strike.id, appeal: { text: '' } } }
 
-      it 'does not send email and renders strike show page', :sidekiq_inline do
+      it 'does not send email and renders strike show page', :inline_jobs do
         emails = capture_emails { subject }
 
         expect(emails).to be_empty
diff --git a/spec/controllers/settings/deletes_controller_spec.rb b/spec/controllers/settings/deletes_controller_spec.rb
index ccca4564e733a1..3342599bc1172e 100644
--- a/spec/controllers/settings/deletes_controller_spec.rb
+++ b/spec/controllers/settings/deletes_controller_spec.rb
@@ -50,7 +50,7 @@
           delete :destroy, params: { form_delete_confirmation: { password: 'petsmoldoggos' } }
         end
 
-        it 'removes user record and redirects', :aggregate_failures, :sidekiq_inline do
+        it 'removes user record and redirects', :aggregate_failures, :inline_jobs do
           expect(response).to redirect_to '/auth/sign_in'
           expect(User.find_by(id: user.id)).to be_nil
           expect(user.account.reload).to be_suspended
diff --git a/spec/lib/activitypub/activity/delete_spec.rb b/spec/lib/activitypub/activity/delete_spec.rb
index 48421a116294b5..71977a96a2be81 100644
--- a/spec/lib/activitypub/activity/delete_spec.rb
+++ b/spec/lib/activitypub/activity/delete_spec.rb
@@ -47,7 +47,7 @@
         expect(Status.find_by(id: status.id)).to be_nil
       end
 
-      it 'sends delete activity to followers of rebloggers', :sidekiq_inline do
+      it 'sends delete activity to followers of rebloggers', :inline_jobs do
         expect(a_request(:post, 'http://example.com/inbox')).to have_been_made.once
       end
 
diff --git a/spec/lib/activitypub/activity/move_spec.rb b/spec/lib/activitypub/activity/move_spec.rb
index 4dda014a068565..d69ef215161210 100644
--- a/spec/lib/activitypub/activity/move_spec.rb
+++ b/spec/lib/activitypub/activity/move_spec.rb
@@ -38,7 +38,7 @@
       subject.perform
     end
 
-    context 'when all conditions are met', :sidekiq_inline do
+    context 'when all conditions are met', :inline_jobs do
       it 'sets moved account on old account' do
         expect(old_account.reload.moved_to_account_id).to eq new_account.id
       end
diff --git a/spec/models/admin/account_action_spec.rb b/spec/models/admin/account_action_spec.rb
index e55db2f814a19e..49bc2b4a91c46c 100644
--- a/spec/models/admin/account_action_spec.rb
+++ b/spec/models/admin/account_action_spec.rb
@@ -69,7 +69,7 @@
       end
     end
 
-    it 'sends email to target account user', :sidekiq_inline do
+    it 'sends email to target account user', :inline_jobs do
       emails = capture_emails { subject }
 
       expect(emails).to contain_exactly(
diff --git a/spec/models/custom_emoji_spec.rb b/spec/models/custom_emoji_spec.rb
index 038d1d0c6cda8f..cb8cb5c11bd67e 100644
--- a/spec/models/custom_emoji_spec.rb
+++ b/spec/models/custom_emoji_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe CustomEmoji, :paperclip_processing do
+RSpec.describe CustomEmoji, :attachment_processing do
   describe '#search' do
     subject { described_class.search(search_term) }
 
diff --git a/spec/models/media_attachment_spec.rb b/spec/models/media_attachment_spec.rb
index a8f1ce7745ee6e..24e8ca39c11f0e 100644
--- a/spec/models/media_attachment_spec.rb
+++ b/spec/models/media_attachment_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe MediaAttachment, :paperclip_processing do
+RSpec.describe MediaAttachment, :attachment_processing do
   describe 'local?' do
     subject { media_attachment.local? }
 
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index fa0a0503a6561d..4755500fc4e356 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -101,7 +101,7 @@
     end
   end
 
-  describe 'scopes', :sidekiq_inline do
+  describe 'scopes', :inline_jobs do
     describe 'recent' do
       it 'returns an array of recent users ordered by id' do
         first_user = Fabricate(:user)
@@ -507,7 +507,7 @@ def within_duration_window_days
     context 'when user is new' do
       let(:confirmed_at) { nil }
 
-      it 'confirms user and delivers welcome email', :sidekiq_inline do
+      it 'confirms user and delivers welcome email', :inline_jobs do
         emails = capture_emails { subject }
 
         expect(user.confirmed_at).to be_present
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 38aa711089e325..79031f1a9430f7 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -120,7 +120,7 @@ def sign_in(resource, _deprecated = nil, scope: nil)
   end
 
   config.around do |example|
-    if example.metadata[:sidekiq_inline] == true
+    if example.metadata[:inline_jobs] == true
       Sidekiq::Testing.inline!
     else
       Sidekiq::Testing.fake!
@@ -137,7 +137,7 @@ def sign_in(resource, _deprecated = nil, scope: nil)
   end
 
   config.before do |example|
-    unless example.metadata[:paperclip_processing]
+    unless example.metadata[:attachment_processing]
       allow_any_instance_of(Paperclip::Attachment).to receive(:post_process).and_return(true) # rubocop:disable RSpec/AnyInstance
     end
   end
diff --git a/spec/requests/api/v1/admin/account_actions_spec.rb b/spec/requests/api/v1/admin/account_actions_spec.rb
index 778658508ec100..5bcf809401da4c 100644
--- a/spec/requests/api/v1/admin/account_actions_spec.rb
+++ b/spec/requests/api/v1/admin/account_actions_spec.rb
@@ -10,7 +10,7 @@
   let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
 
   shared_examples 'a successful notification delivery' do
-    it 'notifies the user about the action taken', :sidekiq_inline do
+    it 'notifies the user about the action taken', :inline_jobs do
       emails = capture_emails { subject }
 
       expect(emails.size)
diff --git a/spec/requests/api/v1/conversations_spec.rb b/spec/requests/api/v1/conversations_spec.rb
index caa0f5c52c0975..f4776f18d97453 100644
--- a/spec/requests/api/v1/conversations_spec.rb
+++ b/spec/requests/api/v1/conversations_spec.rb
@@ -10,7 +10,7 @@
 
   let(:other) { Fabricate(:user) }
 
-  describe 'GET /api/v1/conversations', :sidekiq_inline do
+  describe 'GET /api/v1/conversations', :inline_jobs do
     before do
       user.account.follow!(other.account)
       PostStatusService.new.call(other.account, text: 'Hey @alice', visibility: 'direct')
diff --git a/spec/requests/api/v1/featured_tags_spec.rb b/spec/requests/api/v1/featured_tags_spec.rb
index f499dd1d09a4d5..4b9698870411aa 100644
--- a/spec/requests/api/v1/featured_tags_spec.rb
+++ b/spec/requests/api/v1/featured_tags_spec.rb
@@ -147,7 +147,7 @@
       expect(body).to be_empty
     end
 
-    it 'deletes the featured tag', :sidekiq_inline do
+    it 'deletes the featured tag', :inline_jobs do
       delete "/api/v1/featured_tags/#{id}", headers: headers
 
       featured_tag = FeaturedTag.find_by(id: id)
diff --git a/spec/requests/api/v1/media_spec.rb b/spec/requests/api/v1/media_spec.rb
index 26c76b9c5b98f6..c89c49afdf43aa 100644
--- a/spec/requests/api/v1/media_spec.rb
+++ b/spec/requests/api/v1/media_spec.rb
@@ -121,19 +121,19 @@
       end
     end
 
-    context 'with image/jpeg', :paperclip_processing do
+    context 'with image/jpeg', :attachment_processing do
       let(:params) { { file: fixture_file_upload('attachment.jpg', 'image/jpeg'), description: 'jpeg image' } }
 
       it_behaves_like 'a successful media upload', 'image'
     end
 
-    context 'with image/gif', :paperclip_processing do
+    context 'with image/gif', :attachment_processing do
       let(:params) { { file: fixture_file_upload('attachment.gif', 'image/gif') } }
 
       it_behaves_like 'a successful media upload', 'image'
     end
 
-    context 'with video/webm', :paperclip_processing do
+    context 'with video/webm', :attachment_processing do
       let(:params) { { file: fixture_file_upload('attachment.webm', 'video/webm') } }
 
       it_behaves_like 'a successful media upload', 'gifv'
diff --git a/spec/requests/api/v1/notifications/policies_spec.rb b/spec/requests/api/v1/notifications/policies_spec.rb
index d02d2ed0d7b27d..cbd4499772d443 100644
--- a/spec/requests/api/v1/notifications/policies_spec.rb
+++ b/spec/requests/api/v1/notifications/policies_spec.rb
@@ -8,7 +8,7 @@
   let(:scopes)  { 'read:notifications write:notifications' }
   let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
 
-  describe 'GET /api/v1/notifications/policy', :sidekiq_inline do
+  describe 'GET /api/v1/notifications/policy', :inline_jobs do
     subject do
       get '/api/v1/notifications/policy', headers: headers, params: params
     end
diff --git a/spec/requests/api/v1/notifications/requests_spec.rb b/spec/requests/api/v1/notifications/requests_spec.rb
index 772402a6b5a089..23ddfd2bdabe45 100644
--- a/spec/requests/api/v1/notifications/requests_spec.rb
+++ b/spec/requests/api/v1/notifications/requests_spec.rb
@@ -8,7 +8,7 @@
   let(:scopes)  { 'read:notifications write:notifications' }
   let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
 
-  describe 'GET /api/v1/notifications/requests', :sidekiq_inline do
+  describe 'GET /api/v1/notifications/requests', :inline_jobs do
     subject do
       get '/api/v1/notifications/requests', headers: headers, params: params
     end
diff --git a/spec/requests/api/v1/notifications_spec.rb b/spec/requests/api/v1/notifications_spec.rb
index 55d3cdac948896..9ff0674317bedd 100644
--- a/spec/requests/api/v1/notifications_spec.rb
+++ b/spec/requests/api/v1/notifications_spec.rb
@@ -8,7 +8,7 @@
   let(:scopes)  { 'read:notifications write:notifications' }
   let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
 
-  describe 'GET /api/v1/notifications', :sidekiq_inline do
+  describe 'GET /api/v1/notifications', :inline_jobs do
     subject do
       get '/api/v1/notifications', headers: headers, params: params
     end
diff --git a/spec/requests/api/v1/reports_spec.rb b/spec/requests/api/v1/reports_spec.rb
index 9e8954a4c65dd8..491c6263d3397e 100644
--- a/spec/requests/api/v1/reports_spec.rb
+++ b/spec/requests/api/v1/reports_spec.rb
@@ -33,7 +33,7 @@
 
     it_behaves_like 'forbidden for wrong scope', 'read read:reports'
 
-    it 'creates a report', :aggregate_failures, :sidekiq_inline do
+    it 'creates a report', :aggregate_failures, :inline_jobs do
       emails = capture_emails { subject }
 
       expect(response).to have_http_status(200)
diff --git a/spec/requests/api/v1/statuses/favourites_spec.rb b/spec/requests/api/v1/statuses/favourites_spec.rb
index 033aed7e285ddc..22d0e4831fc64d 100644
--- a/spec/requests/api/v1/statuses/favourites_spec.rb
+++ b/spec/requests/api/v1/statuses/favourites_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe 'Favourites', :sidekiq_inline do
+RSpec.describe 'Favourites', :inline_jobs do
   let(:user)    { Fabricate(:user) }
   let(:scopes)  { 'write:favourites' }
   let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
diff --git a/spec/requests/api/v1/statuses/reblogs_spec.rb b/spec/requests/api/v1/statuses/reblogs_spec.rb
index cf0a1f861d9bde..503d804ed01c0b 100644
--- a/spec/requests/api/v1/statuses/reblogs_spec.rb
+++ b/spec/requests/api/v1/statuses/reblogs_spec.rb
@@ -41,7 +41,7 @@
       end
     end
 
-    describe 'POST /api/v1/statuses/:status_id/unreblog', :sidekiq_inline do
+    describe 'POST /api/v1/statuses/:status_id/unreblog', :inline_jobs do
       context 'with public status' do
         let(:status) { Fabricate(:status, account: user.account) }
 
diff --git a/spec/requests/api/v1/timelines/home_spec.rb b/spec/requests/api/v1/timelines/home_spec.rb
index 2bebe8cf452847..96bd153affe5a4 100644
--- a/spec/requests/api/v1/timelines/home_spec.rb
+++ b/spec/requests/api/v1/timelines/home_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Home', :sidekiq_inline do
+describe 'Home', :inline_jobs do
   let(:user)    { Fabricate(:user) }
   let(:scopes)  { 'read:statuses' }
   let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
diff --git a/spec/requests/api/v2/media_spec.rb b/spec/requests/api/v2/media_spec.rb
index 990fa5d0baeeab..97540413f152d4 100644
--- a/spec/requests/api/v2/media_spec.rb
+++ b/spec/requests/api/v2/media_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe 'Media API', :paperclip_processing do
+RSpec.describe 'Media API', :attachment_processing do
   let(:user)    { Fabricate(:user) }
   let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
   let(:scopes)  { 'write' }
diff --git a/spec/requests/api/v2_alpha/notifications_spec.rb b/spec/requests/api/v2_alpha/notifications_spec.rb
index ac44605ac5d212..104651ebe39f44 100644
--- a/spec/requests/api/v2_alpha/notifications_spec.rb
+++ b/spec/requests/api/v2_alpha/notifications_spec.rb
@@ -8,7 +8,7 @@
   let(:scopes)  { 'read:notifications write:notifications' }
   let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
 
-  describe 'GET /api/v2_alpha/notifications', :sidekiq_inline do
+  describe 'GET /api/v2_alpha/notifications', :inline_jobs do
     subject do
       get '/api/v2_alpha/notifications', headers: headers, params: params
     end
diff --git a/spec/search/models/concerns/account/statuses_search_spec.rb b/spec/search/models/concerns/account/statuses_search_spec.rb
index a1b0bf405c5133..b1bf4968ca9abd 100644
--- a/spec/search/models/concerns/account/statuses_search_spec.rb
+++ b/spec/search/models/concerns/account/statuses_search_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Account::StatusesSearch, :sidekiq_inline do
+describe Account::StatusesSearch, :inline_jobs do
   describe 'a non-indexable account becoming indexable' do
     let(:account) { Account.find_by(username: 'search_test_account_1') }
 
diff --git a/spec/services/activitypub/fetch_remote_status_service_spec.rb b/spec/services/activitypub/fetch_remote_status_service_spec.rb
index a86f141fe0b747..c3adb9c470afd1 100644
--- a/spec/services/activitypub/fetch_remote_status_service_spec.rb
+++ b/spec/services/activitypub/fetch_remote_status_service_spec.rb
@@ -225,7 +225,7 @@
     end
   end
 
-  context 'with statuses referencing other statuses', :sidekiq_inline do
+  context 'with statuses referencing other statuses', :inline_jobs do
     before do
       stub_const 'ActivityPub::FetchRemoteStatusService::DISCOVERIES_PER_REQUEST', 5
     end
diff --git a/spec/services/activitypub/process_account_service_spec.rb b/spec/services/activitypub/process_account_service_spec.rb
index 8b80dafe45a924..4fbb527b39041e 100644
--- a/spec/services/activitypub/process_account_service_spec.rb
+++ b/spec/services/activitypub/process_account_service_spec.rb
@@ -224,7 +224,7 @@
       end
     end
 
-    it 'creates accounts without exceeding rate limit', :sidekiq_inline do
+    it 'creates accounts without exceeding rate limit', :inline_jobs do
       expect { subject.call('user1', 'foo.test', payload) }
         .to create_some_remote_accounts
         .and create_fewer_than_rate_limit_accounts
diff --git a/spec/services/appeal_service_spec.rb b/spec/services/appeal_service_spec.rb
index 3fad74db9d8951..6a47bb2cea61d2 100644
--- a/spec/services/appeal_service_spec.rb
+++ b/spec/services/appeal_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe AppealService, :sidekiq_inline do
+RSpec.describe AppealService, :inline_jobs do
   describe '#call' do
     let!(:admin) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
 
diff --git a/spec/services/authorize_follow_service_spec.rb b/spec/services/authorize_follow_service_spec.rb
index be2a8641854054..533b791fb7f6e7 100644
--- a/spec/services/authorize_follow_service_spec.rb
+++ b/spec/services/authorize_follow_service_spec.rb
@@ -41,7 +41,7 @@
       expect(bob.following?(sender)).to be true
     end
 
-    it 'sends an accept activity', :sidekiq_inline do
+    it 'sends an accept activity', :inline_jobs do
       expect(a_request(:post, bob.inbox_url)).to have_been_made.once
     end
   end
diff --git a/spec/services/batched_remove_status_service_spec.rb b/spec/services/batched_remove_status_service_spec.rb
index e501b9ba84a94c..628bb198ef06f3 100644
--- a/spec/services/batched_remove_status_service_spec.rb
+++ b/spec/services/batched_remove_status_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe BatchedRemoveStatusService, :sidekiq_inline do
+RSpec.describe BatchedRemoveStatusService, :inline_jobs do
   subject { described_class.new }
 
   let!(:alice)  { Fabricate(:account) }
diff --git a/spec/services/block_domain_service_spec.rb b/spec/services/block_domain_service_spec.rb
index d4f0c042d453c9..839137db4498e8 100644
--- a/spec/services/block_domain_service_spec.rb
+++ b/spec/services/block_domain_service_spec.rb
@@ -49,7 +49,7 @@
   end
 
   describe 'for a silence with reject media' do
-    it 'does not mark the domain as blocked, but silences accounts with an appropriate silencing date, clears media', :aggregate_failures, :sidekiq_inline do
+    it 'does not mark the domain as blocked, but silences accounts with an appropriate silencing date, clears media', :aggregate_failures, :inline_jobs do
       subject.call(DomainBlock.create!(domain: 'evil.org', severity: :silence, reject_media: true))
 
       expect(DomainBlock.blocked?('evil.org')).to be false
diff --git a/spec/services/block_service_spec.rb b/spec/services/block_service_spec.rb
index d096aa1ea35566..46dd69198699a4 100644
--- a/spec/services/block_service_spec.rb
+++ b/spec/services/block_service_spec.rb
@@ -33,7 +33,7 @@
       expect(sender.blocking?(bob)).to be true
     end
 
-    it 'sends a block activity', :sidekiq_inline do
+    it 'sends a block activity', :inline_jobs do
       expect(a_request(:post, 'http://example.com/inbox')).to have_been_made.once
     end
   end
diff --git a/spec/services/delete_account_service_spec.rb b/spec/services/delete_account_service_spec.rb
index de93862435afbe..741ac340cfa0be 100644
--- a/spec/services/delete_account_service_spec.rb
+++ b/spec/services/delete_account_service_spec.rb
@@ -62,7 +62,7 @@ def expect_deletion_of_associated_target_notifications
     end
   end
 
-  describe '#call on local account', :sidekiq_inline do
+  describe '#call on local account', :inline_jobs do
     before do
       stub_request(:post, remote_alice.inbox_url).to_return(status: 201)
       stub_request(:post, remote_bob.inbox_url).to_return(status: 201)
@@ -83,7 +83,7 @@ def expect_deletion_of_associated_target_notifications
     end
   end
 
-  describe '#call on remote account', :sidekiq_inline do
+  describe '#call on remote account', :inline_jobs do
     before do
       stub_request(:post, account.inbox_url).to_return(status: 201)
     end
diff --git a/spec/services/fan_out_on_write_service_spec.rb b/spec/services/fan_out_on_write_service_spec.rb
index b51d802a5b9ae2..82cdffb8cf9f5c 100644
--- a/spec/services/fan_out_on_write_service_spec.rb
+++ b/spec/services/fan_out_on_write_service_spec.rb
@@ -38,7 +38,7 @@ def home_feed_of(account)
       expect(home_feed_of(alice)).to include status.id
     end
 
-    it 'is added to the home feed of a follower', :sidekiq_inline do
+    it 'is added to the home feed of a follower', :inline_jobs do
       expect(home_feed_of(bob)).to include status.id
       expect(home_feed_of(tom)).to include status.id
     end
@@ -62,7 +62,7 @@ def home_feed_of(account)
       expect(home_feed_of(alice)).to include status.id
     end
 
-    it 'is added to the home feed of the mentioned follower', :sidekiq_inline do
+    it 'is added to the home feed of the mentioned follower', :inline_jobs do
       expect(home_feed_of(bob)).to include status.id
     end
 
@@ -83,7 +83,7 @@ def home_feed_of(account)
       expect(home_feed_of(alice)).to include status.id
     end
 
-    it 'is added to the home feed of a follower', :sidekiq_inline do
+    it 'is added to the home feed of a follower', :inline_jobs do
       expect(home_feed_of(bob)).to include status.id
       expect(home_feed_of(tom)).to include status.id
     end
@@ -101,7 +101,7 @@ def home_feed_of(account)
       expect(home_feed_of(alice)).to include status.id
     end
 
-    it 'is added to the home feed of the mentioned follower', :sidekiq_inline do
+    it 'is added to the home feed of the mentioned follower', :inline_jobs do
       expect(home_feed_of(bob)).to include status.id
     end
 
diff --git a/spec/services/favourite_service_spec.rb b/spec/services/favourite_service_spec.rb
index d0f1ff17c1ebd9..c39362def2f7f3 100644
--- a/spec/services/favourite_service_spec.rb
+++ b/spec/services/favourite_service_spec.rb
@@ -33,7 +33,7 @@
       expect(status.favourites.first).to_not be_nil
     end
 
-    it 'sends a like activity', :sidekiq_inline do
+    it 'sends a like activity', :inline_jobs do
       expect(a_request(:post, 'http://example.com/inbox')).to have_been_made.once
     end
   end
diff --git a/spec/services/follow_service_spec.rb b/spec/services/follow_service_spec.rb
index bea2412a3d36fe..0c4cd600460922 100644
--- a/spec/services/follow_service_spec.rb
+++ b/spec/services/follow_service_spec.rb
@@ -150,7 +150,7 @@
       expect(FollowRequest.find_by(account: sender, target_account: bob)).to_not be_nil
     end
 
-    it 'sends a follow activity to the inbox', :sidekiq_inline do
+    it 'sends a follow activity to the inbox', :inline_jobs do
       expect(a_request(:post, 'http://example.com/inbox')).to have_been_made.once
     end
   end
diff --git a/spec/services/import_service_spec.rb b/spec/services/import_service_spec.rb
index 90877d99975200..0a99c5e748db55 100644
--- a/spec/services/import_service_spec.rb
+++ b/spec/services/import_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe ImportService, :sidekiq_inline do
+RSpec.describe ImportService, :inline_jobs do
   include RoutingHelper
 
   let!(:account) { Fabricate(:account, locked: false) }
diff --git a/spec/services/mute_service_spec.rb b/spec/services/mute_service_spec.rb
index 681afc0b16ec39..3bde92b87aebdc 100644
--- a/spec/services/mute_service_spec.rb
+++ b/spec/services/mute_service_spec.rb
@@ -17,7 +17,7 @@
       redis.del(home_timeline_key)
     end
 
-    it "clears account's statuses", :sidekiq_inline do
+    it "clears account's statuses", :inline_jobs do
       FeedManager.instance.push_to_home(account, status)
       FeedManager.instance.push_to_home(account, other_account_status)
 
diff --git a/spec/services/notify_service_spec.rb b/spec/services/notify_service_spec.rb
index 8c810f1c32b521..c695855bec0d1c 100644
--- a/spec/services/notify_service_spec.rb
+++ b/spec/services/notify_service_spec.rb
@@ -105,7 +105,7 @@
     context 'when email notification is enabled' do
       let(:enabled) { true }
 
-      it 'sends email', :sidekiq_inline do
+      it 'sends email', :inline_jobs do
         emails = capture_emails { subject }
 
         expect(emails.size)
diff --git a/spec/services/reject_follow_service_spec.rb b/spec/services/reject_follow_service_spec.rb
index 98aaf70478539b..d2c7a00206210b 100644
--- a/spec/services/reject_follow_service_spec.rb
+++ b/spec/services/reject_follow_service_spec.rb
@@ -41,7 +41,7 @@
       expect(bob.following?(sender)).to be false
     end
 
-    it 'sends a reject activity', :sidekiq_inline do
+    it 'sends a reject activity', :inline_jobs do
       expect(a_request(:post, bob.inbox_url)).to have_been_made.once
     end
   end
diff --git a/spec/services/remove_from_followers_service_spec.rb b/spec/services/remove_from_followers_service_spec.rb
index d6420f76742dfe..515600096cfc04 100644
--- a/spec/services/remove_from_followers_service_spec.rb
+++ b/spec/services/remove_from_followers_service_spec.rb
@@ -33,7 +33,7 @@
       expect(bob.followed_by?(sender)).to be false
     end
 
-    it 'sends a reject activity', :sidekiq_inline do
+    it 'sends a reject activity', :inline_jobs do
       expect(a_request(:post, sender.inbox_url)).to have_been_made.once
     end
   end
diff --git a/spec/services/remove_status_service_spec.rb b/spec/services/remove_status_service_spec.rb
index 917b66c6df467b..08f519b5360d99 100644
--- a/spec/services/remove_status_service_spec.rb
+++ b/spec/services/remove_status_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe RemoveStatusService, :sidekiq_inline do
+RSpec.describe RemoveStatusService, :inline_jobs do
   subject { described_class.new }
 
   let!(:alice)  { Fabricate(:account) }
diff --git a/spec/services/report_service_spec.rb b/spec/services/report_service_spec.rb
index 141dc8c3be5623..bf1f937191b74c 100644
--- a/spec/services/report_service_spec.rb
+++ b/spec/services/report_service_spec.rb
@@ -23,7 +23,7 @@
       stub_request(:post, 'http://example.com/inbox').to_return(status: 200)
     end
 
-    context 'when forward is true', :sidekiq_inline do
+    context 'when forward is true', :inline_jobs do
       let(:forward) { true }
 
       it 'sends ActivityPub payload when forward is true' do
diff --git a/spec/services/resolve_account_service_spec.rb b/spec/services/resolve_account_service_spec.rb
index 316266c8f8e539..e0084a15791a1a 100644
--- a/spec/services/resolve_account_service_spec.rb
+++ b/spec/services/resolve_account_service_spec.rb
@@ -195,7 +195,7 @@
       expect(account.uri).to eq 'https://ap.example.com/users/foo'
     end
 
-    it 'merges accounts', :sidekiq_inline do
+    it 'merges accounts', :inline_jobs do
       account = subject.call('foo@ap.example.com')
 
       expect(status.reload.account_id).to eq account.id
diff --git a/spec/services/suspend_account_service_spec.rb b/spec/services/suspend_account_service_spec.rb
index 7c72a4776b4b1d..4a2f494e0cb1b8 100644
--- a/spec/services/suspend_account_service_spec.rb
+++ b/spec/services/suspend_account_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe SuspendAccountService, :sidekiq_inline do
+RSpec.describe SuspendAccountService, :inline_jobs do
   shared_examples 'common behavior' do
     subject { described_class.new.call(account) }
 
diff --git a/spec/services/unallow_domain_service_spec.rb b/spec/services/unallow_domain_service_spec.rb
index caec3d596ff144..4bf6c540432027 100644
--- a/spec/services/unallow_domain_service_spec.rb
+++ b/spec/services/unallow_domain_service_spec.rb
@@ -13,7 +13,7 @@
   let!(:already_banned_account) { Fabricate(:account, username: 'badguy', domain: bad_domain, suspended: true, silenced: true) }
   let!(:domain_allow) { Fabricate(:domain_allow, domain: bad_domain) }
 
-  context 'with limited federation mode', :sidekiq_inline do
+  context 'with limited federation mode', :inline_jobs do
     before do
       allow(Rails.configuration.x).to receive(:limited_federation_mode).and_return(true)
     end
diff --git a/spec/services/unblock_service_spec.rb b/spec/services/unblock_service_spec.rb
index 4c9fcb9aeecdd0..6132e74415ecd6 100644
--- a/spec/services/unblock_service_spec.rb
+++ b/spec/services/unblock_service_spec.rb
@@ -33,7 +33,7 @@
       expect(sender.blocking?(bob)).to be false
     end
 
-    it 'sends an unblock activity', :sidekiq_inline do
+    it 'sends an unblock activity', :inline_jobs do
       expect(a_request(:post, 'http://example.com/inbox')).to have_been_made.once
     end
   end
diff --git a/spec/services/unfollow_service_spec.rb b/spec/services/unfollow_service_spec.rb
index bba17a8d2709a2..0c206c4b983215 100644
--- a/spec/services/unfollow_service_spec.rb
+++ b/spec/services/unfollow_service_spec.rb
@@ -20,7 +20,7 @@
     end
   end
 
-  describe 'remote ActivityPub', :sidekiq_inline do
+  describe 'remote ActivityPub', :inline_jobs do
     let(:bob) { Fabricate(:account, username: 'bob', protocol: :activitypub, domain: 'example.com', inbox_url: 'http://example.com/inbox') }
 
     before do
@@ -38,7 +38,7 @@
     end
   end
 
-  describe 'remote ActivityPub (reverse)', :sidekiq_inline do
+  describe 'remote ActivityPub (reverse)', :inline_jobs do
     let(:bob) { Fabricate(:account, username: 'bob', protocol: :activitypub, domain: 'example.com', inbox_url: 'http://example.com/inbox') }
 
     before do
diff --git a/spec/services/unsuspend_account_service_spec.rb b/spec/services/unsuspend_account_service_spec.rb
index 79a4441d3ec9ef..8d4882c37f88aa 100644
--- a/spec/services/unsuspend_account_service_spec.rb
+++ b/spec/services/unsuspend_account_service_spec.rb
@@ -45,7 +45,7 @@ def match_update_actor_request(req, account)
         remote_follower.follow!(account)
       end
 
-      it 'merges back into feeds of local followers and sends update', :sidekiq_inline do
+      it 'merges back into feeds of local followers and sends update', :inline_jobs do
         subject
 
         expect_feeds_merged
diff --git a/spec/services/update_account_service_spec.rb b/spec/services/update_account_service_spec.rb
index 5204f1f34d469d..d066db481e5568 100644
--- a/spec/services/update_account_service_spec.rb
+++ b/spec/services/update_account_service_spec.rb
@@ -5,7 +5,7 @@
 RSpec.describe UpdateAccountService do
   subject { described_class.new }
 
-  describe 'switching form locked to unlocked accounts', :sidekiq_inline do
+  describe 'switching form locked to unlocked accounts', :inline_jobs do
     let(:account) { Fabricate(:account, locked: true) }
     let(:alice)   { Fabricate(:account) }
     let(:bob)     { Fabricate(:account) }
diff --git a/spec/support/examples/models/concerns/account_avatar.rb b/spec/support/examples/models/concerns/account_avatar.rb
index 2c9b5514aad7d6..ab6020d834a8f7 100644
--- a/spec/support/examples/models/concerns/account_avatar.rb
+++ b/spec/support/examples/models/concerns/account_avatar.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 shared_examples 'AccountAvatar' do |fabricator|
-  describe 'static avatars', :paperclip_processing do
+  describe 'static avatars', :attachment_processing do
     describe 'when GIF' do
       it 'creates a png static style' do
         account = Fabricate(fabricator, avatar: attachment_fixture('avatar.gif'))
@@ -17,7 +17,7 @@
     end
   end
 
-  describe 'base64-encoded files', :paperclip_processing do
+  describe 'base64-encoded files', :attachment_processing do
     let(:base64_attachment) { "data:image/jpeg;base64,#{Base64.encode64(attachment_fixture('attachment.jpg').read)}" }
     let(:account) { Fabricate(fabricator, avatar: base64_attachment) }
 
diff --git a/spec/support/examples/models/concerns/account_header.rb b/spec/support/examples/models/concerns/account_header.rb
index ce09eb006b8ae4..43bbdaacf425d9 100644
--- a/spec/support/examples/models/concerns/account_header.rb
+++ b/spec/support/examples/models/concerns/account_header.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 shared_examples 'AccountHeader' do |fabricator|
-  describe 'base64-encoded files', :paperclip_processing do
+  describe 'base64-encoded files', :attachment_processing do
     let(:base64_attachment) { "data:image/jpeg;base64,#{Base64.encode64(attachment_fixture('attachment.jpg').read)}" }
     let(:account) { Fabricate(fabricator, header: base64_attachment) }
 
diff --git a/spec/system/admin/accounts_spec.rb b/spec/system/admin/accounts_spec.rb
index 54d755b914de12..20813f6be42505 100644
--- a/spec/system/admin/accounts_spec.rb
+++ b/spec/system/admin/accounts_spec.rb
@@ -48,7 +48,7 @@
       end
     end
 
-    context 'with action of `reject`', :sidekiq_inline do
+    context 'with action of `reject`', :inline_jobs do
       it 'rejects and removes the account' do
         batch_checkbox_for(unapproved_user_account).check
 
diff --git a/spec/system/new_statuses_spec.rb b/spec/system/new_statuses_spec.rb
index 725ea8fe5209d4..2f2fcf22485ee4 100644
--- a/spec/system/new_statuses_spec.rb
+++ b/spec/system/new_statuses_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'NewStatuses', :js, :sidekiq_inline, :streaming do
+describe 'NewStatuses', :inline_jobs, :js, :streaming do
   include ProfileStories
 
   subject { page }
diff --git a/spec/system/ocr_spec.rb b/spec/system/ocr_spec.rb
index 4f4941adca581c..17d18af1586ed7 100644
--- a/spec/system/ocr_spec.rb
+++ b/spec/system/ocr_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'OCR', :js, :paperclip_processing, :sidekiq_inline, :streaming do
+describe 'OCR', :attachment_processing, :inline_jobs, :js, :streaming do
   include ProfileStories
 
   let(:email)               { 'test@example.com' }
diff --git a/spec/system/report_interface_spec.rb b/spec/system/report_interface_spec.rb
index f82604aae89643..e6cc3b1b68870f 100644
--- a/spec/system/report_interface_spec.rb
+++ b/spec/system/report_interface_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'report interface', :js, :paperclip_processing, :streaming do
+describe 'report interface', :attachment_processing, :js, :streaming do
   include ProfileStories
 
   let(:email)               { 'admin@example.com' }
diff --git a/spec/workers/backup_worker_spec.rb b/spec/workers/backup_worker_spec.rb
index 74928c7ca6ba63..db1b50140b6790 100644
--- a/spec/workers/backup_worker_spec.rb
+++ b/spec/workers/backup_worker_spec.rb
@@ -14,7 +14,7 @@
     let(:backup) { Fabricate(:backup) }
     let!(:other_backup) { Fabricate(:backup, user: backup.user) }
 
-    it 'sends the backup to the service and removes other backups', :sidekiq_inline do
+    it 'sends the backup to the service and removes other backups', :inline_jobs do
       emails = capture_emails { worker.perform(backup.id) }
 
       expect(service).to have_received(:call).with(backup)
diff --git a/spec/workers/move_worker_spec.rb b/spec/workers/move_worker_spec.rb
index 0513dc42e5282d..b25992e44bd615 100644
--- a/spec/workers/move_worker_spec.rb
+++ b/spec/workers/move_worker_spec.rb
@@ -104,7 +104,7 @@ def mute_account_comment
   end
 
   shared_examples 'lists handling' do
-    it 'puts the new account on the list and makes valid lists', :sidekiq_inline do
+    it 'puts the new account on the list and makes valid lists', :inline_jobs do
       subject.perform(source_account.id, target_account.id)
 
       expect(list.accounts.include?(target_account)).to be true
diff --git a/spec/workers/post_process_media_worker_spec.rb b/spec/workers/post_process_media_worker_spec.rb
index 828da5244f55f9..1a274623d73fba 100644
--- a/spec/workers/post_process_media_worker_spec.rb
+++ b/spec/workers/post_process_media_worker_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe PostProcessMediaWorker, :paperclip_processing do
+describe PostProcessMediaWorker, :attachment_processing do
   let(:worker) { described_class.new }
 
   describe '#perform' do

From fa8e972722fb8fc056aa348dddaee4005b4a8ac4 Mon Sep 17 00:00:00 2001
From: David Roetzel <david@roetzel.de>
Date: Mon, 8 Jul 2024 18:04:36 +0200
Subject: [PATCH 1496/2191] Fix author names as arrays in linked data. (#30957)

---
 app/lib/link_details_extractor.rb       |  5 +++--
 spec/lib/link_details_extractor_spec.rb | 29 +++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/app/lib/link_details_extractor.rb b/app/lib/link_details_extractor.rb
index a62ede2bb1f356..72992d2f42ad80 100644
--- a/app/lib/link_details_extractor.rb
+++ b/app/lib/link_details_extractor.rb
@@ -62,7 +62,8 @@ def date_modified
     end
 
     def author_name
-      author['name']
+      name = author['name']
+      name.is_a?(Array) ? name.join(', ') : name
     end
 
     def author_url
@@ -294,7 +295,7 @@ def detector
   def html_entities_decode(string)
     return if string.nil?
 
-    unicode_string = string.encode('UTF-8')
+    unicode_string = string.to_s.encode('UTF-8')
     raise EncodingError, 'cannot convert string to valid UTF-8' unless unicode_string.valid_encoding?
 
     html_entities.decode(unicode_string)
diff --git a/spec/lib/link_details_extractor_spec.rb b/spec/lib/link_details_extractor_spec.rb
index 26d9d4e2659821..2a4df70a8bf226 100644
--- a/spec/lib/link_details_extractor_spec.rb
+++ b/spec/lib/link_details_extractor_spec.rb
@@ -192,6 +192,35 @@
 
       include_examples 'structured data'
     end
+
+    context 'with author names as array' do
+      let(:ld_json) do
+        {
+          '@context' => 'https://schema.org',
+          '@type' => 'NewsArticle',
+          'headline' => 'A lot of authors',
+          'description' => 'But we decided to cram them into one',
+          'author' => {
+            '@type' => 'Person',
+            'name' => ['Author 1', 'Author 2'],
+          },
+        }.to_json
+      end
+      let(:html) { <<~HTML }
+        <!doctype html>
+        <html>
+        <body>
+          <script type="application/ld+json">
+            #{ld_json}
+          </script>
+        </body>
+        </html>
+      HTML
+
+      it 'joins author names' do
+        expect(subject.author_name).to eq 'Author 1, Author 2'
+      end
+    end
   end
 
   context 'when Open Graph protocol data is present' do

From 2fa3c3a748a3a647bae2d8fc2d1bf4776871ea8b Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Sun, 7 Jul 2024 18:13:10 +0200
Subject: [PATCH 1497/2191] [Glitch] Add the account hover card for account
 search results

Port 0899c91d4be0e0846caf53a4b065c4904f34d23a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/components/account.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/flavours/glitch/components/account.jsx b/app/javascript/flavours/glitch/components/account.jsx
index 038009cfa86e5a..e2ea8995242b3b 100644
--- a/app/javascript/flavours/glitch/components/account.jsx
+++ b/app/javascript/flavours/glitch/components/account.jsx
@@ -131,7 +131,7 @@ const Account = ({ size = 46, account, onFollow, onBlock, onMute, onMuteNotifica
   return (
     <div className={classNames('account', { 'account--minimal': minimal })}>
       <div className='account__wrapper'>
-        <Permalink key={account.get('id')} className='account__display-name' title={account.get('acct')} href={account.get('url')} to={`/@${account.get('acct')}`}>
+        <Permalink key={account.get('id')} className='account__display-name' title={account.get('acct')} href={account.get('url')} to={`/@${account.get('acct')}`} data-hover-card-account={account.get('id')}>
           <div className='account__avatar-wrapper'>
             <Avatar account={account} size={size} />
           </div>

From aa8ad92fa423d02991e92cfd571ef7b5393ebbb5 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Sun, 7 Jul 2024 18:14:15 +0200
Subject: [PATCH 1498/2191] [Glitch] Remove the `title` attribute when hovering
 a card anchor

Port 981395e4d68a1c0cfccbdb8924bc11ac912d1e05 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../glitch/components/hover_card_controller.tsx   | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/app/javascript/flavours/glitch/components/hover_card_controller.tsx b/app/javascript/flavours/glitch/components/hover_card_controller.tsx
index 347dcd4f2f99a4..d2a636e939ca4b 100644
--- a/app/javascript/flavours/glitch/components/hover_card_controller.tsx
+++ b/app/javascript/flavours/glitch/components/hover_card_controller.tsx
@@ -43,6 +43,7 @@ export const HoverCardController: React.FC = () => {
   useEffect(() => {
     let isScrolling = false;
     let currentAnchor: HTMLElement | null = null;
+    let currentTitle: string | null = null;
 
     const open = (target: HTMLElement) => {
       target.setAttribute('aria-describedby', 'hover-card');
@@ -75,6 +76,9 @@ export const HoverCardController: React.FC = () => {
         currentAnchor?.removeAttribute('aria-describedby');
         currentAnchor = target;
 
+        currentTitle = target.getAttribute('title');
+        target.removeAttribute('title');
+
         setEnterTimeout(() => {
           open(target);
         }, enterDelay);
@@ -90,11 +94,20 @@ export const HoverCardController: React.FC = () => {
     };
 
     const handleMouseLeave = (e: MouseEvent) => {
+      const { target } = e;
+
       if (!currentAnchor) {
         return;
       }
 
-      if (e.target === currentAnchor || e.target === cardRef.current) {
+      if (
+        currentTitle &&
+        target instanceof HTMLElement &&
+        target === currentAnchor
+      )
+        target.setAttribute('title', currentTitle);
+
+      if (target === currentAnchor || target === cardRef.current) {
         cancelEnterTimeout();
 
         setLeaveTimeout(() => {

From 80179d53ba825c2c82178a267498311edde077f3 Mon Sep 17 00:00:00 2001
From: Tianwei Dong <ileodo@users.noreply.github.com>
Date: Mon, 8 Jul 2024 09:10:57 +0100
Subject: [PATCH 1499/2191] [Glitch] Change to use an unified constant for max
 media attachments per status

Port 36d819bef34279bb36cdfa3ed89711405ad79591 to glitch-soc

Co-authored-by: Renaud Chaput <renchap@gmail.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/actions/compose.js             | 4 ++--
 app/javascript/flavours/glitch/components/media_gallery.jsx   | 4 ++--
 .../features/compose/containers/upload_button_container.js    | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/javascript/flavours/glitch/actions/compose.js b/app/javascript/flavours/glitch/actions/compose.js
index 61245acdba9873..8eab532f554fa4 100644
--- a/app/javascript/flavours/glitch/actions/compose.js
+++ b/app/javascript/flavours/glitch/actions/compose.js
@@ -310,7 +310,7 @@ export function doodleSet(options) {
 
 export function uploadCompose(files) {
   return function (dispatch, getState) {
-    const uploadLimit = 4;
+    const uploadLimit = getState().getIn(['server', 'server', 'configuration', 'statuses', 'max_media_attachments']);
     const media = getState().getIn(['compose', 'media_attachments']);
     const pending = getState().getIn(['compose', 'pending_media_attachments']);
     const progress = new Array(files.length).fill(0);
@@ -330,7 +330,7 @@ export function uploadCompose(files) {
     dispatch(uploadComposeRequest());
 
     for (const [i, f] of Array.from(files).entries()) {
-      if (media.size + i > 3) break;
+      if (media.size + i > (uploadLimit - 1)) break;
 
       resizeImage(f).then(file => {
         const data = new FormData();
diff --git a/app/javascript/flavours/glitch/components/media_gallery.jsx b/app/javascript/flavours/glitch/components/media_gallery.jsx
index ec18f882b64047..5c40e2b22fcad1 100644
--- a/app/javascript/flavours/glitch/components/media_gallery.jsx
+++ b/app/javascript/flavours/glitch/components/media_gallery.jsx
@@ -311,7 +311,7 @@ class MediaGallery extends PureComponent {
   render () {
     const { media, lang, intl, sensitive, letterbox, fullwidth, defaultWidth, autoplay } = this.props;
     const { visible } = this.state;
-    const size     = media.take(4).size;
+    const size     = media.size;
     const uncached = media.every(attachment => attachment.get('type') === 'unknown');
 
     const width = this.state.width || defaultWidth;
@@ -331,7 +331,7 @@ class MediaGallery extends PureComponent {
     if (this.isStandaloneEligible()) {
       children = <Item standalone autoplay={autoplay} onClick={this.handleClick} attachment={media.get(0)} lang={lang} displayWidth={width} visible={visible} />;
     } else {
-      children = media.take(4).map((attachment, i) => <Item key={attachment.get('id')} autoplay={autoplay} onClick={this.handleClick} attachment={attachment} index={i} lang={lang} size={size} letterbox={letterbox} displayWidth={width} visible={visible || uncached} />);
+      children = media.map((attachment, i) => <Item key={attachment.get('id')} autoplay={autoplay} onClick={this.handleClick} attachment={attachment} index={i} lang={lang} size={size} letterbox={letterbox} displayWidth={width} visible={visible || uncached} />);
     }
 
     if (uncached) {
diff --git a/app/javascript/flavours/glitch/features/compose/containers/upload_button_container.js b/app/javascript/flavours/glitch/features/compose/containers/upload_button_container.js
index 2e835464b85119..39cc12078c5116 100644
--- a/app/javascript/flavours/glitch/features/compose/containers/upload_button_container.js
+++ b/app/javascript/flavours/glitch/features/compose/containers/upload_button_container.js
@@ -10,7 +10,7 @@ const mapStateToProps = state => {
   const readyAttachmentsSize = state.getIn(['compose', 'media_attachments']).size ?? 0;
   const pendingAttachmentsSize = state.getIn(['compose', 'pending_media_attachments']).size ?? 0;
   const attachmentsSize = readyAttachmentsSize + pendingAttachmentsSize;
-  const isOverLimit = attachmentsSize > 3;
+  const isOverLimit = attachmentsSize > state.getIn(['server', 'server', 'configuration', 'statuses', 'max_media_attachments'])-1;
   const hasVideoOrAudio = state.getIn(['compose', 'media_attachments']).some(m => ['video', 'audio'].includes(m.get('type')));
 
   return {

From 0dd4595704896fecb69315c1617dcb74b1cfaf67 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 9 Jul 2024 09:27:13 +0200
Subject: [PATCH 1500/2191] fix(deps): update dependency glob to v10.4.4
 (#30967)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 87586a916c66ff..e377c52129c097 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9009,8 +9009,8 @@ __metadata:
   linkType: hard
 
 "glob@npm:^10.2.2, glob@npm:^10.2.6, glob@npm:^10.3.10":
-  version: 10.4.3
-  resolution: "glob@npm:10.4.3"
+  version: 10.4.4
+  resolution: "glob@npm:10.4.4"
   dependencies:
     foreground-child: "npm:^3.1.0"
     jackspeak: "npm:^3.1.2"
@@ -9020,7 +9020,7 @@ __metadata:
     path-scurry: "npm:^1.11.1"
   bin:
     glob: dist/esm/bin.mjs
-  checksum: 10c0/bea148e5dae96c17e2764f4764c72376a6ab7072b27a21e861ae4af6f97f3e810d79d67f64de52f63ce1d7fdb73b7306f61c65b48d0f61ca7c8647ce8acaf9a7
+  checksum: 10c0/8f0887ae6b9e7ec97841c88f3189643a326c9c37f9881050979c131a2198f2230d4b0a196b71ec6a6694871c25fb8631a72af6e2ea941a667c55f155765546ab
   languageName: node
   linkType: hard
 

From 7a30c689530c93e8ea473e39cfb2e2ff6d9d2807 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 9 Jul 2024 03:34:15 -0400
Subject: [PATCH 1501/2191] Use `scope module: ...` block for `.well-known`
 routes (#30959)

---
 config/routes.rb | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/config/routes.rb b/config/routes.rb
index 4b3bd4f187a158..5862731ba98a05 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -63,12 +63,16 @@ def redirect_with_vary(path)
                 tokens: 'oauth/tokens'
   end
 
-  get '.well-known/oauth-authorization-server', to: 'well_known/oauth_metadata#show', as: :oauth_metadata, defaults: { format: 'json' }
-  get '.well-known/host-meta', to: 'well_known/host_meta#show', as: :host_meta, defaults: { format: 'xml' }
-  get '.well-known/nodeinfo', to: 'well_known/node_info#index', as: :nodeinfo, defaults: { format: 'json' }
-  get '.well-known/webfinger', to: 'well_known/webfinger#show', as: :webfinger
-  get '.well-known/change-password', to: redirect('/auth/edit')
-  get '.well-known/proxy', to: redirect { |_, request| "/authorize_interaction?#{request.params.to_query}" }
+  scope path: '.well-known' do
+    scope module: :well_known do
+      get 'oauth-authorization-server', to: 'oauth_metadata#show', as: :oauth_metadata, defaults: { format: 'json' }
+      get 'host-meta', to: 'host_meta#show', as: :host_meta, defaults: { format: 'xml' }
+      get 'nodeinfo', to: 'node_info#index', as: :nodeinfo, defaults: { format: 'json' }
+      get 'webfinger', to: 'webfinger#show', as: :webfinger
+    end
+    get 'change-password', to: redirect('/auth/edit'), as: nil
+    get 'proxy', to: redirect { |_, request| "/authorize_interaction?#{request.params.to_query}" }, as: nil
+  end
 
   get '/nodeinfo/2.0', to: 'well_known/node_info#show', as: :nodeinfo_schema
 

From f47d761e12a16c4338447aa8dbeca8365ee812cc Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 9 Jul 2024 03:34:19 -0400
Subject: [PATCH 1502/2191] Remove unneeded `controller` option in routes
 (#30958)

---
 config/routes.rb          | 2 +-
 config/routes/settings.rb | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/routes.rb b/config/routes.rb
index 5862731ba98a05..2c06762c229224 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -98,7 +98,7 @@ def redirect_with_vary(path)
 
     namespace :auth do
       resource :setup, only: [:show, :update], controller: :setup
-      resource :challenge, only: [:create], controller: :challenges
+      resource :challenge, only: [:create]
       get 'sessions/security_key_options', to: 'sessions#webauthn_options'
       post 'captcha_confirmation', to: 'confirmations#confirm_captcha', as: :captcha_confirmation
     end
diff --git a/config/routes/settings.rb b/config/routes/settings.rb
index b14606656b680f..297b80942c9b5c 100644
--- a/config/routes/settings.rb
+++ b/config/routes/settings.rb
@@ -26,9 +26,9 @@
     resources :follows, only: :index, controller: :following_accounts
     resources :blocks, only: :index, controller: :blocked_accounts
     resources :mutes, only: :index, controller: :muted_accounts
-    resources :lists, only: :index, controller: :lists
+    resources :lists, only: :index
     resources :domain_blocks, only: :index, controller: :blocked_domains
-    resources :bookmarks, only: :index, controller: :bookmarks
+    resources :bookmarks, only: :index
   end
 
   resources :two_factor_authentication_methods, only: [:index] do

From 249b4117f9fbdac3888d3807a81c0e83e39d7de5 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 9 Jul 2024 07:36:13 +0000
Subject: [PATCH 1503/2191] New Crowdin Translations (automated) (#30970)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/ry.json | 39 +++++++++++++++++++++++--
 1 file changed, 37 insertions(+), 2 deletions(-)

diff --git a/app/javascript/mastodon/locales/ry.json b/app/javascript/mastodon/locales/ry.json
index 67aad910054010..f3a68b15a12a9d 100644
--- a/app/javascript/mastodon/locales/ry.json
+++ b/app/javascript/mastodon/locales/ry.json
@@ -3,6 +3,8 @@
   "about.contact": "Контакт:",
   "about.disclaimer": "Mastodon є задарьнов проґрамов из удпертым кодом тай торговов значков Mastodon gGmbH.",
   "about.domain_blocks.no_reason_available": "Причины не ясні",
+  "about.domain_blocks.preamble": "Майбульш Mastodon поволят вам позирати контент тай комуніковати из хосновачами из другых федерованых серверув. Туй лиш уняткы учинені про сись конкретный сервер.",
+  "about.domain_blocks.silenced.explanation": "Вы майбульш не будете видіти профілі тай контент из сього сервера, кидь не будете го самі глядати авадь пудпишете ся на нього.",
   "about.domain_blocks.silenced.title": "Обмежено",
   "about.domain_blocks.suspended.explanation": "Ниякі податкы из сього сервера не будут уброблені, усокочені ци поміняні, што чинит невозможнов хоть-яку інтеракцію ци зязок из хосновачами из сього сервера.",
   "about.domain_blocks.suspended.title": "Заблоковано",
@@ -20,6 +22,7 @@
   "account.browse_more_on_origin_server": "Позирайте бульше на ориґіналнум профілю",
   "account.cancel_follow_request": "Удмінити пудписку",
   "account.copy": "Зкопіровати удкликованя на профіл",
+  "account.direct": "Пошептати @{name}",
   "account.disable_notifications": "Бульше не сповіщати ми коли {name} пише",
   "account.domain_blocked": "Домен заблокованый",
   "account.edit_profile": "Управити профіл",
@@ -39,8 +42,10 @@
   "account.joined_short": "Датум прикапчованя",
   "account.languages": "Поміняти убрані языкы",
   "account.link_verified_on": "Властность сього удкликованя было звірено {date}",
+  "account.locked_info": "Сись профіл є замкнутый. Ґазда акаунта буде ручно провіряти тко го може зафоловити.",
   "account.media": "Медіа",
-  "account.moved_to": "Хосновач {name} указав, ож новый профіл йим є:",
+  "account.mention": "Спомянути @{name}",
+  "account.moved_to": "Хосновач {name} указав, ож новый профіл му є:",
   "account.mute": "Стишити {name}",
   "account.mute_notifications_short": "Стишити голошіня",
   "account.mute_short": "Стишити",
@@ -60,9 +65,12 @@
   "account.unblock_short": "Розблоковати",
   "account.unendorse": "Не указовати на профілови",
   "account.unfollow": "Удписати ся",
+  "account.unmute": "Указовати {name}",
   "account.unmute_notifications_short": "Указовати голошіня",
   "account.unmute_short": "Указовати",
   "account_note.placeholder": "Клопкніт обы додати примітку",
+  "admin.dashboard.retention.average": "Середньоє",
+  "admin.dashboard.retention.cohort": "Місяць прикапчованя",
   "admin.dashboard.retention.cohort_size": "Нові хосновачі",
   "admin.impact_report.instance_accounts": "Профілі из акаунтув, котрі ся удалят",
   "admin.impact_report.instance_followers": "Пудписникы, котрых стратят наші хосновачі",
@@ -70,11 +78,38 @@
   "admin.impact_report.title": "Вплыв цілком",
   "alert.rate_limited.message": "Попробуйте зась по {retry_time, time, medium}.",
   "alert.rate_limited.title": "Частота обмежена",
+  "alert.unexpected.message": "Стала ся нечекана хыба.",
+  "alert.unexpected.title": "Ийой!",
+  "announcement.announcement": "Голошіня",
+  "audio.hide": "Зпрятати звук",
+  "block_modal.show_less": "Указати менше",
+  "block_modal.show_more": "Указати бульше",
+  "block_modal.they_cant_mention": "Они не можут вас споминати авадь слідовати.",
+  "block_modal.they_cant_see_posts": "Они не можут видіти ваші публикації, тай наспак — вы йихні.",
+  "block_modal.they_will_know": "Они видят, ож сут заблоковані.",
+  "block_modal.title": "Заблоковати хосновача?",
+  "block_modal.you_wont_see_mentions": "Не будете видіти публикації тай споминкы сього хосновача.",
+  "boost_modal.combo": "Можете клынцнути {combo} другый раз обы сесе пропустити",
+  "bundle_column_error.copy_stacktrace": "Укопіровати звіт за хыбу",
+  "bundle_column_error.error.body": "Не годни сьме указати зажадану сторунку. Годно быти спозад хыбы у нашум сістемі, авадь проблемы зумісности бравзера.",
+  "bundle_column_error.error.title": "Ийой!",
+  "bundle_column_error.network.body": "Стала ся хыба як сьме пробовали напаровати сторунку. Годно ся йсе было стати спозад слабого споєня вашого інтернета, авадь сервера.",
+  "bundle_column_error.network.title": "Хыба споєня",
+  "bundle_column_error.retry": "Попробуйте зась",
   "bundle_column_error.return": "Вернути ся на головну",
   "bundle_column_error.routing.body": "Не можеме найти сяку сторунку. Бизувні сьте, ож URL у адресному шорикови є добрый?",
   "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Заперти",
   "bundle_modal_error.message": "Штось ся показило, закидь сьме ладовали сись компонент.",
   "bundle_modal_error.retry": "Попробовати зась",
-  "closed_registrations.other_server_instructions": "Mastodon є децентралізованов платформов, можете си учинити профіл и на другому серверови тай комуніковати из сим."
+  "closed_registrations.other_server_instructions": "Mastodon є децентралізованов платформов, можете си учинити профіл и на другому серверови тай комуніковати из сим.",
+  "closed_registrations_modal.description": "Раз не мож учинити профіл на {domain}, айбо не мусите мати профіл ипен на серверови {domain} обы хосновати Mastodon.",
+  "closed_registrations_modal.find_another_server": "Найти другый сервер",
+  "column.about": "За сайт",
+  "column.blocks": "Заблоковані хосновачі",
+  "column.bookmarks": "Усокоченоє",
+  "column.direct": "Шептаня",
+  "column.directory": "Никати профілі",
+  "column.domain_blocks": "Заблоковані домены",
+  "column.favourites": "Убраноє"
 }

From 7542a134d5fecf82d14dcc1860be87cf6645ec7f Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Tue, 9 Jul 2024 12:47:08 +0200
Subject: [PATCH 1504/2191] Add a file for Sidekiq to signal it is ready to
 process jobs (#30971)

---
 config/initializers/sidekiq.rb | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb
index 53b02edc40227e..e1d98b8ba3be33 100644
--- a/config/initializers/sidekiq.rb
+++ b/config/initializers/sidekiq.rb
@@ -2,9 +2,21 @@
 
 require_relative '../../lib/mastodon/sidekiq_middleware'
 
+SIDEKIQ_WILL_PROCESSES_JOBS_FILE = Rails.root.join('tmp', 'sidekiq_process_has_started_and_will_begin_processing_jobs').freeze
+
 Sidekiq.configure_server do |config|
   config.redis = REDIS_SIDEKIQ_PARAMS
 
+  # This is used in Kubernetes setups, to signal that the Sidekiq process has started and will begin processing jobs
+  # This comes from https://github.com/sidekiq/sidekiq/wiki/Kubernetes#sidekiq
+  config.on(:startup) do
+    FileUtils.touch(SIDEKIQ_WILL_PROCESSES_JOBS_FILE)
+  end
+
+  config.on(:shutdown) do
+    FileUtils.rm_f(SIDEKIQ_WILL_PROCESSES_JOBS_FILE)
+  end
+
   config.server_middleware do |chain|
     chain.add Mastodon::SidekiqMiddleware
   end

From 3875bd138d279eb26efce9f446fe91f49cf38f55 Mon Sep 17 00:00:00 2001
From: Daniel M Brasil <danielmbrasil@protonmail.com>
Date: Tue, 9 Jul 2024 09:41:49 -0300
Subject: [PATCH 1505/2191] Fix HTTP 500 in `/api/v1/polls/:id/votes` (#25598)

---
 app/controllers/api/v1/polls/votes_controller.rb |  4 ++--
 spec/requests/api/v1/polls/votes_spec.rb         | 11 ++++++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/app/controllers/api/v1/polls/votes_controller.rb b/app/controllers/api/v1/polls/votes_controller.rb
index 513b937ef2de34..ad1b82cb522c69 100644
--- a/app/controllers/api/v1/polls/votes_controller.rb
+++ b/app/controllers/api/v1/polls/votes_controller.rb
@@ -8,7 +8,7 @@ class Api::V1::Polls::VotesController < Api::BaseController
   before_action :set_poll
 
   def create
-    VoteService.new.call(current_account, @poll, vote_params[:choices])
+    VoteService.new.call(current_account, @poll, vote_params)
     render json: @poll, serializer: REST::PollSerializer
   end
 
@@ -22,6 +22,6 @@ def set_poll
   end
 
   def vote_params
-    params.permit(choices: [])
+    params.require(:choices)
   end
 end
diff --git a/spec/requests/api/v1/polls/votes_spec.rb b/spec/requests/api/v1/polls/votes_spec.rb
index e2b22708be8720..669f64b6e4577e 100644
--- a/spec/requests/api/v1/polls/votes_spec.rb
+++ b/spec/requests/api/v1/polls/votes_spec.rb
@@ -10,9 +10,10 @@
 
   describe 'POST /api/v1/polls/:poll_id/votes' do
     let(:poll) { Fabricate(:poll) }
+    let(:params) { { choices: %w(1) } }
 
     before do
-      post "/api/v1/polls/#{poll.id}/votes", params: { choices: %w(1) }, headers: headers
+      post "/api/v1/polls/#{poll.id}/votes", params: params, headers: headers
     end
 
     it 'creates a vote', :aggregate_failures do
@@ -24,6 +25,14 @@
       expect(poll.reload.cached_tallies).to eq [0, 1]
     end
 
+    context 'when the required choices param is not provided' do
+      let(:params) { {} }
+
+      it 'returns http bad request' do
+        expect(response).to have_http_status(400)
+      end
+    end
+
     private
 
     def vote

From ef2e48e6dac1ed327fc6ac07b0adf252d10ff607 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 9 Jul 2024 14:53:31 +0200
Subject: [PATCH 1506/2191] fix(deps): update dependency glob to v10.4.5
 (#30972)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index e377c52129c097..85a336a4a348f3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9009,8 +9009,8 @@ __metadata:
   linkType: hard
 
 "glob@npm:^10.2.2, glob@npm:^10.2.6, glob@npm:^10.3.10":
-  version: 10.4.4
-  resolution: "glob@npm:10.4.4"
+  version: 10.4.5
+  resolution: "glob@npm:10.4.5"
   dependencies:
     foreground-child: "npm:^3.1.0"
     jackspeak: "npm:^3.1.2"
@@ -9020,7 +9020,7 @@ __metadata:
     path-scurry: "npm:^1.11.1"
   bin:
     glob: dist/esm/bin.mjs
-  checksum: 10c0/8f0887ae6b9e7ec97841c88f3189643a326c9c37f9881050979c131a2198f2230d4b0a196b71ec6a6694871c25fb8631a72af6e2ea941a667c55f155765546ab
+  checksum: 10c0/19a9759ea77b8e3ca0a43c2f07ecddc2ad46216b786bb8f993c445aee80d345925a21e5280c7b7c6c59e860a0154b84e4b2b60321fea92cd3c56b4a7489f160e
   languageName: node
   linkType: hard
 

From 967505ee9bcacf0e5189aa06c654ff586c198a46 Mon Sep 17 00:00:00 2001
From: David Roetzel <david@roetzel.de>
Date: Tue, 9 Jul 2024 15:11:34 +0200
Subject: [PATCH 1507/2191] Add size limit for all PreviewCard URLs (#30973)

---
 app/models/preview_card.rb                    |  7 +++++-
 app/services/fetch_link_card_service.rb       |  7 ++----
 spec/fixtures/requests/long_canonical_url.txt | 18 +++++++++++++++
 spec/services/fetch_link_card_service_spec.rb | 22 ++++++++-----------
 4 files changed, 35 insertions(+), 19 deletions(-)
 create mode 100644 spec/fixtures/requests/long_canonical_url.txt

diff --git a/app/models/preview_card.rb b/app/models/preview_card.rb
index eac02ac14ff05c..5a11351e58808a 100644
--- a/app/models/preview_card.rb
+++ b/app/models/preview_card.rb
@@ -46,6 +46,11 @@ class PreviewCard < ApplicationRecord
     y_comp: 4,
   }.freeze
 
+  # URL size limit to safely store in PosgreSQL's unique indexes
+  # Technically this is a byte-size limit but we use it as a
+  # character limit to work with length validation
+  URL_CHARACTER_LIMIT = 2692
+
   self.inheritance_column = false
 
   enum :type, { link: 0, photo: 1, video: 2, rich: 3 }
@@ -63,7 +68,7 @@ class PreviewCard < ApplicationRecord
                     convert_options: { all: '-quality 90 +profile "!icc,*" +set date:modify +set date:create +set date:timestamp' },
                     validate_media_type: false
 
-  validates :url, presence: true, uniqueness: true, url: true
+  validates :url, presence: true, uniqueness: true, url: true, length: { maximum: URL_CHARACTER_LIMIT }
   validates_attachment_content_type :image, content_type: IMAGE_MIME_TYPES
   validates_attachment_size :image, less_than: LIMIT
   remotable_attachment :image, LIMIT
diff --git a/app/services/fetch_link_card_service.rb b/app/services/fetch_link_card_service.rb
index 436e024c99bc3d..adabb1096e86eb 100644
--- a/app/services/fetch_link_card_service.rb
+++ b/app/services/fetch_link_card_service.rb
@@ -15,9 +15,6 @@ class FetchLinkCardService < BaseService
     )
   }iox
 
-  # URL size limit to safely store in PosgreSQL's unique indexes
-  BYTESIZE_LIMIT = 2692
-
   def call(status)
     @status       = status
     @original_url = parse_urls
@@ -32,7 +29,7 @@ def call(status)
     end
 
     attach_card if @card&.persisted?
-  rescue HTTP::Error, OpenSSL::SSL::SSLError, Addressable::URI::InvalidURIError, Mastodon::HostValidationError, Mastodon::LengthValidationError, EncodingError => e
+  rescue HTTP::Error, OpenSSL::SSL::SSLError, Addressable::URI::InvalidURIError, Mastodon::HostValidationError, Mastodon::LengthValidationError, EncodingError, ActiveRecord::RecordInvalid => e
     Rails.logger.debug { "Error fetching link #{@original_url}: #{e}" }
     nil
   end
@@ -88,7 +85,7 @@ def parse_urls
 
   def bad_url?(uri)
     # Avoid local instance URLs and invalid URLs
-    uri.host.blank? || TagManager.instance.local_url?(uri.to_s) || !%w(http https).include?(uri.scheme) || uri.to_s.bytesize > BYTESIZE_LIMIT
+    uri.host.blank? || TagManager.instance.local_url?(uri.to_s) || !%w(http https).include?(uri.scheme)
   end
 
   def mention_link?(anchor)
diff --git a/spec/fixtures/requests/long_canonical_url.txt b/spec/fixtures/requests/long_canonical_url.txt
new file mode 100644
index 00000000000000..97d6c93961fb47
--- /dev/null
+++ b/spec/fixtures/requests/long_canonical_url.txt
@@ -0,0 +1,18 @@
+HTTP/1.1 200 OK
+server: nginx
+date: Thu, 13 Jun 2024 14:33:13 GMT
+content-type: text/html; charset=utf-8
+content-length: 3225
+accept-ranges: bytes
+
+<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <link rel="canonical" href="https://example.com/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">
+  <title>Very long canonical URL</title>
+</head>
+<body>
+  <h2>We have very long URLs</h2>
+</body>
+</html>
diff --git a/spec/services/fetch_link_card_service_spec.rb b/spec/services/fetch_link_card_service_spec.rb
index b2cd99cea6d25d..342902cdb3d894 100644
--- a/spec/services/fetch_link_card_service_spec.rb
+++ b/spec/services/fetch_link_card_service_spec.rb
@@ -31,6 +31,7 @@
     stub_request(:get, 'http://example.com/latin1_posing_as_utf8_recoverable').to_return(request_fixture('latin1_posing_as_utf8_recoverable.txt'))
     stub_request(:get, 'http://example.com/aergerliche-umlaute').to_return(request_fixture('redirect_with_utf8_url.txt'))
     stub_request(:get, 'http://example.com/page_without_title').to_return(request_fixture('page_without_title.txt'))
+    stub_request(:get, 'http://example.com/long_canonical_url').to_return(request_fixture('long_canonical_url.txt'))
 
     Rails.cache.write('oembed_endpoint:example.com', oembed_cache) if oembed_cache
 
@@ -233,19 +234,6 @@
       end
     end
 
-    context 'with an URL too long for PostgreSQL unique indexes' do
-      let(:url) { "http://example.com/#{'a' * 2674}" }
-      let(:status) { Fabricate(:status, text: url) }
-
-      it 'does not fetch the URL' do
-        expect(a_request(:get, url)).to_not have_been_made
-      end
-
-      it 'does not create a preview card' do
-        expect(status.preview_card).to be_nil
-      end
-    end
-
     context 'with a URL of a page with oEmbed support' do
       let(:html) { '<!doctype html><title>Hello world</title><link rel="alternate" type="application/json+oembed" href="http://example.com/oembed?url=http://example.com/html">' }
       let(:status) { Fabricate(:status, text: 'http://example.com/html') }
@@ -296,6 +284,14 @@
         end
       end
     end
+
+    context 'with a URL of a page that includes a canonical URL too long for PostgreSQL unique indexes' do
+      let(:status) { Fabricate(:status, text: 'test http://example.com/long_canonical_url') }
+
+      it 'does not create a preview card' do
+        expect(status.preview_card).to be_nil
+      end
+    end
   end
 
   context 'with a remote status' do

From c9f08f77ed8a262a4db806d814e2701794873a70 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 10 Jul 2024 08:55:26 +0200
Subject: [PATCH 1508/2191] fix(deps): update dependency sass to v1.77.7
 (#30981)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 85a336a4a348f3..cf7e5a8b952202 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -15462,15 +15462,15 @@ __metadata:
   linkType: hard
 
 "sass@npm:^1.62.1":
-  version: 1.77.6
-  resolution: "sass@npm:1.77.6"
+  version: 1.77.7
+  resolution: "sass@npm:1.77.7"
   dependencies:
     chokidar: "npm:>=3.0.0 <4.0.0"
     immutable: "npm:^4.0.0"
     source-map-js: "npm:>=0.6.2 <2.0.0"
   bin:
     sass: sass.js
-  checksum: 10c0/fe5a393c0aa29eda9f83c06be9b94788b61fe8bad0616ee6e3a25d21ab504f430d40c0064fdca89b02b8e426411ae6dcd906c91f2e48c263575c3d392b6daeb1
+  checksum: 10c0/6cacbf4b5165d30a9be0f09438aed85ff0617e5087442e65c23c8464750ff1b9988855a58f36b420b62f992d1e82403f99810aba7731519d3d026847e21a5635
   languageName: node
   linkType: hard
 

From d0137910c61a565cfdaa8cf29d3e15e6345e5066 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 10 Jul 2024 12:04:11 +0200
Subject: [PATCH 1509/2191] chore(deps): update dependency ruby to v3.3.4
 (#30969)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .ruby-version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.ruby-version b/.ruby-version
index 619b537668489e..a0891f563f38b0 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-3.3.3
+3.3.4

From 8dea897a3b2a6be08911515d291eb679dc3cd792 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 10 Jul 2024 10:04:52 +0000
Subject: [PATCH 1510/2191] chore(deps): update docker.io/ruby docker tag to
 v3.3.4 (#30980)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 7f7eca06dac040..52d3758dc67cf7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,7 +12,7 @@ ARG BUILDPLATFORM=${BUILDPLATFORM}
 
 # Ruby image to use for base image, change with [--build-arg RUBY_VERSION="3.3.x"]
 # renovate: datasource=docker depName=docker.io/ruby
-ARG RUBY_VERSION="3.3.3"
+ARG RUBY_VERSION="3.3.4"
 # # Node version to use in base image, change with [--build-arg NODE_MAJOR_VERSION="20"]
 # renovate: datasource=node-version depName=node
 ARG NODE_MAJOR_VERSION="20"

From 9984fca9a065e49acde0858487bc3cf10a744cea Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 10 Jul 2024 12:40:19 +0200
Subject: [PATCH 1511/2191] New Crowdin Translations (automated) (#30983)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/cs.json | 16 +++++-----
 app/javascript/mastodon/locales/ry.json | 41 ++++++++++++++++++++++++-
 config/locales/cs.yml                   |  2 +-
 config/locales/doorkeeper.lv.yml        |  6 ++--
 config/locales/ry.yml                   | 20 ++++++++++++
 5 files changed, 73 insertions(+), 12 deletions(-)

diff --git a/app/javascript/mastodon/locales/cs.json b/app/javascript/mastodon/locales/cs.json
index e96e283970f0ae..12de5d5ecd4794 100644
--- a/app/javascript/mastodon/locales/cs.json
+++ b/app/javascript/mastodon/locales/cs.json
@@ -197,7 +197,7 @@
   "copy_icon_button.copied": "Zkopírováno do schránky",
   "copypaste.copied": "Zkopírováno",
   "copypaste.copy_to_clipboard": "Zkopírovat do schránky",
-  "directory.federated": "Ze známého fedivesmíru",
+  "directory.federated": "Ze známého fediversu",
   "directory.local": "Pouze z {domain}",
   "directory.new_arrivals": "Nově příchozí",
   "directory.recently_active": "Nedávno aktivní",
@@ -213,7 +213,7 @@
   "domain_block_modal.block_account_instead": "Raději blokovat @{name}",
   "domain_block_modal.they_can_interact_with_old_posts": "Lidé z tohoto serveru mohou interagovat s vašimi starými příspěvky.",
   "domain_block_modal.they_cant_follow": "Nikdo z tohoto serveru vás nemůže sledovat.",
-  "domain_block_modal.they_wont_know": "Nebude vědět, že je zablokován.",
+  "domain_block_modal.they_wont_know": "Nebude vědět, že je zablokován*a.",
   "domain_block_modal.title": "Blokovat doménu?",
   "domain_block_modal.you_will_lose_followers": "Všichni vaši sledující z tohoto serveru budou odstraněni.",
   "domain_block_modal.you_wont_see_posts": "Neuvidíte příspěvky ani upozornění od uživatelů z tohoto serveru.",
@@ -341,7 +341,7 @@
   "hashtag.column_settings.tag_mode.any": "Jakýkoliv z těchto",
   "hashtag.column_settings.tag_mode.none": "Žádný z těchto",
   "hashtag.column_settings.tag_toggle": "Zahrnout v tomto sloupci další štítky",
-  "hashtag.counter_by_accounts": "{count, plural, one {{counter} účastník} few {{counter} účastníci} other {{counter} účastníků}}",
+  "hashtag.counter_by_accounts": "{count, plural, one {{counter} účastník*ice} few {{counter} účastníci} other {{counter} účastníků}}",
   "hashtag.counter_by_uses": "{count, plural, one {{counter} příspěvek} few {{counter} příspěvky} other {{counter} příspěvků}}",
   "hashtag.counter_by_uses_today": "Dnes {count, plural, one {{counter} příspěvek} few {{counter} příspěvky} other {{counter} příspěvků}}",
   "hashtag.follow": "Sledovat hashtag",
@@ -440,7 +440,7 @@
   "mute_modal.show_options": "Zobrazit možnosti",
   "mute_modal.they_can_mention_and_follow": "Mohou vás zmínit a sledovat, ale neuvidíte je.",
   "mute_modal.they_wont_know": "Nebudou vědět, že byli skryti.",
-  "mute_modal.title": "Ztlumit uživatele?",
+  "mute_modal.title": "Ztlumit uživatele*ku?",
   "mute_modal.you_wont_see_mentions": "Neuvidíte příspěvky, které je zmiňují.",
   "mute_modal.you_wont_see_posts": "Stále budou moci vidět vaše příspěvky, ale vy jejich neuvidíte.",
   "navigation_bar.about": "O aplikaci",
@@ -566,8 +566,8 @@
   "onboarding.share.message": "Jsem {username} na #Mastodonu! Pojď mě sledovat na {url}",
   "onboarding.share.next_steps": "Možné další kroky:",
   "onboarding.share.title": "Sdílejte svůj profil",
-  "onboarding.start.lead": "Your new Mastodon account is ready to go. Here's how you can make the most of it:",
-  "onboarding.start.skip": "Want to skip right ahead?",
+  "onboarding.start.lead": "Nyní jste součástí Mastodonu, unikátní sociální sítě, kde vy - ne algoritmus - vytváří vaše vlastní prožitky. Začněte na této nové sociální platformě:",
+  "onboarding.start.skip": "Nepotřebujete pomoci začít?",
   "onboarding.start.title": "Dokázali jste to!",
   "onboarding.steps.follow_people.body": "Mastodon je o sledování zajimavých lidí.",
   "onboarding.steps.follow_people.title": "Přispůsobit vlastní domovský kanál",
@@ -581,7 +581,7 @@
   "onboarding.tips.accounts_from_other_servers": "<strong>Víte, že?</strong> Protože je Mastodon decentralizovaný, některé profily, na které narazíte, budou hostovány na jiných serverech, než je ten váš. A přesto s nimi můžete bezproblémově komunikovat! Jejich server se nachází v druhé polovině uživatelského jména!",
   "onboarding.tips.migration": "<strong>Víte, že?</strong> Pokud máte pocit, že {domain} pro vás v budoucnu není vhodnou volbou, můžete se přesunout na jiný Mastodon server, aniž byste přišli o své sledující. Můžete dokonce hostovat svůj vlastní server!",
   "onboarding.tips.verification": "<strong>Víte, že?</strong> Svůj účet můžete ověřit tak, že na své webové stránky umístíte odkaz na váš Mastodon profil a odkaz na stránku přidáte do svého profilu. Nejsou k tomu potřeba žádné poplatky ani dokumenty!",
-  "password_confirmation.exceeds_maxlength": "Potvrzení hesla překračuje maximální délku hesla",
+  "password_confirmation.exceeds_maxlength": "Potvrzení hesla překračuje maximální povolenou délku hesla",
   "password_confirmation.mismatching": "Zadaná hesla se neshodují",
   "picture_in_picture.restore": "Vrátit zpět",
   "poll.closed": "Uzavřeno",
@@ -665,7 +665,7 @@
   "report.unfollow": "Přestat sledovat @{name}",
   "report.unfollow_explanation": "Tento účet sledujete. Abyste už neviděli jeho příspěvky ve své domovské časové ose, přestaňte jej sledovat.",
   "report_notification.attached_statuses": "{count, plural, one {{count} připojený příspěvek} few {{count} připojené příspěvky} many {{count} připojených příspěvků} other {{count} připojených příspěvků}}",
-  "report_notification.categories.legal": "Zákonné",
+  "report_notification.categories.legal": "Právní ustanovení",
   "report_notification.categories.other": "Ostatní",
   "report_notification.categories.spam": "Spam",
   "report_notification.categories.violation": "Porušení pravidla",
diff --git a/app/javascript/mastodon/locales/ry.json b/app/javascript/mastodon/locales/ry.json
index f3a68b15a12a9d..4f2e2410eff4a2 100644
--- a/app/javascript/mastodon/locales/ry.json
+++ b/app/javascript/mastodon/locales/ry.json
@@ -82,6 +82,7 @@
   "alert.unexpected.title": "Ийой!",
   "announcement.announcement": "Голошіня",
   "audio.hide": "Зпрятати звук",
+  "block_modal.remote_users_caveat": "Попросиме ґазду сервера {domain} честовати вашоє рішеня. Айбо не ґарантуєме повный соглас, бо даякі серверы можут брати блокованя по-инчакому. Публичні дописы годно быти видко незалоґованым хосновачам.",
   "block_modal.show_less": "Указати менше",
   "block_modal.show_more": "Указати бульше",
   "block_modal.they_cant_mention": "Они не можут вас споминати авадь слідовати.",
@@ -111,5 +112,43 @@
   "column.direct": "Шептаня",
   "column.directory": "Никати профілі",
   "column.domain_blocks": "Заблоковані домены",
-  "column.favourites": "Убраноє"
+  "column.favourites": "Убраноє",
+  "column.follow_requests": "Запросы на пудписку",
+  "column.lists": "Исписы",
+  "column.mutes": "Стишені хосновачі",
+  "column.notifications": "Убвіщеня",
+  "column.pins": "Закріплені публикації",
+  "column_back_button.label": "Назад",
+  "column_header.hide_settings": "Спрятати штімованя",
+  "column_header.moveLeft_settings": "Посунути колонку до ліва",
+  "column_header.moveRight_settings": "Посунути колонку до права",
+  "column_header.pin": "Закріпити",
+  "column_header.show_settings": "Указати штімованя",
+  "column_header.unpin": "Удкріпити",
+  "column_subheading.settings": "Штімованя",
+  "compose.language.change": "Поміняти язык",
+  "compose.language.search": "Глядати языкы...",
+  "compose.published.body": "Пост опубликованый.",
+  "compose.saved.body": "Пост усокоченый.",
+  "compose_form.direct_message_warning_learn_more": "Читайте бульше",
+  "compose_form.encryption_warning": "Публикації на Mastodon не шіфрувут ся. Не шырьте чутливу інформацію через Mastodon.",
+  "compose_form.hashtag_warning": "Сись пост не буде ся появляти у исписови по гештеґови, бо вун не є публичный. Лишек публичні посты буде видко за гештеґом.",
+  "compose_form.lock_disclaimer": "Ваш профіл є {locked}. Хоть-тко може ся на вас пудписати, обы видїти ваші ексклузівні посты.",
+  "compose_form.lock_disclaimer.lock": "замкнено",
+  "compose_form.placeholder": "Што нового?",
+  "compose_form.poll.duration": "Трывалость убзвідованя",
+  "compose_form.poll.multiple": "Дакулько варіантув",
+  "compose_form.poll.option_placeholder": "Варіант {number}",
+  "compose_form.poll.single": "Уберіт єден",
+  "compose_form.poll.switch_to_multiple": "Змінити убзвідованя обы поволити дакулько варіантув",
+  "compose_form.poll.switch_to_single": "Змінити убзвідованя обы поволити лишек єден варіант",
+  "compose_form.poll.type": "Стіл",
+  "compose_form.publish": "Публикація",
+  "compose_form.publish_form": "Нова публикація",
+  "compose_form.reply": "Удповідь",
+  "copypaste.copy_to_clipboard": "Копіровати у памнять",
+  "directory.recently_active": "Недавно актівні",
+  "disabled_account_banner.account_settings": "Штімованя акаунта",
+  "disabled_account_banner.text": "Ваш акаунт {disabledAccount} раз є неактівный.",
+  "dismissable_banner.community_timeline": "Туй сут недавні публикації уд профілув на серверови {domain}."
 }
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 20e7e4d46b81d5..7e0aaaeefb6fe3 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -118,7 +118,7 @@ cs:
       promote: Povýšit
       protocol: Protokol
       public: Veřejný
-      push_subscription_expires: Odebírání PuSH expiruje
+      push_subscription_expires: Odebírání PuSH vyprší
       redownload: Obnovit profil
       redownloaded_msg: Profil účtu %{username} byl úspěšně obnoven ze zdroje
       reject: Zamítnout
diff --git a/config/locales/doorkeeper.lv.yml b/config/locales/doorkeeper.lv.yml
index 5aa5daef3f6d16..11c50203050e4c 100644
--- a/config/locales/doorkeeper.lv.yml
+++ b/config/locales/doorkeeper.lv.yml
@@ -25,7 +25,7 @@ lv:
         edit: Labot
         submit: Apstiprināt
       confirmations:
-        destroy: Vai esi pārliecināts?
+        destroy: Vai tiešām?
       edit:
         title: Labot lietotni
       form:
@@ -69,7 +69,7 @@ lv:
       buttons:
         revoke: Atsaukt
       confirmations:
-        revoke: Vai esi pārliecināts?
+        revoke: Vai tiešām?
       index:
         authorized_at: Autorizētas %{date}
         description_html: Šīs ir lietotnes, kas var piekļūt Tavam kontam ar API. Ja šeit ir lietotnes, kuras neatpazīsti, vai lietotne darbojas ne tā, kā paredzēts, vari atsaukt tās piekļuvi.
@@ -135,6 +135,7 @@ lv:
         media: Multividesu pielikumi
         mutes: Apklusinātie
         notifications: Paziņojumi
+        profile: Tavs Mastodon profils
         push: Uznirstošie paziņojumi
         reports: Ziņojumi
         search: Meklēt
@@ -165,6 +166,7 @@ lv:
       admin:write:reports: veikt moderācijas darbības pārskatos
       crypto: lieto pilnīgu šifrēšanu
       follow: mainīt konta attiecības
+      profile: lasīt tikai Tava konta profila informāciju
       push: saņemt savus push paziņojumus
       read: lasīt visus sava konta datus
       read:accounts: apskatīt kontu informāciju
diff --git a/config/locales/ry.yml b/config/locales/ry.yml
index 6fe57b65cdb30e..e384b7f1b74810 100644
--- a/config/locales/ry.yml
+++ b/config/locales/ry.yml
@@ -1 +1,21 @@
+---
 ry:
+  accounts:
+    follow: Пудписати ся
+    following: Пудпискы
+    posts:
+      few: Публикації
+      one: Публикація
+      other: Публикації
+    posts_tab_heading: Публикації
+  imports:
+    titles:
+      following: Імпортованя пудписок
+    types:
+      following: Испис пудписок
+  notification_mailer:
+    follow:
+      body: "%{name} ся пудписує ся на вас!"
+      subject: "%{name} ся пудписує ся на вас"
+  relationships:
+    following: Пудпискы

From 182b9248c0e798e4b0fba8339d2817ed2f094b42 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Wed, 10 Jul 2024 14:23:24 +0200
Subject: [PATCH 1512/2191] Fix SCSS mixed declarations deprecation (#30986)

---
 app/javascript/styles/mastodon/components.scss | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index c114885d171043..da86a4caa71aac 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -1366,6 +1366,8 @@ body > [data-popper-placement] {
   min-height: 54px;
   border-bottom: 1px solid var(--background-border-color);
   cursor: auto;
+  opacity: 1;
+  animation: fade 150ms linear;
 
   @keyframes fade {
     0% {
@@ -1377,9 +1379,6 @@ body > [data-popper-placement] {
     }
   }
 
-  opacity: 1;
-  animation: fade 150ms linear;
-
   .media-gallery,
   .video-player,
   .audio-player,
@@ -4851,8 +4850,10 @@ a.status-card {
     &__menu {
       @include search-popout;
 
-      padding: 0;
-      background: $ui-secondary-color;
+      & {
+        padding: 0;
+        background: $ui-secondary-color;
+      }
     }
 
     &__menu-list {

From 36592d10aa497db6c9a9764ee539242cc2cfdec7 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Wed, 10 Jul 2024 14:57:25 +0200
Subject: [PATCH 1513/2191] Change Sidekiq readiness file to use an environment
 variable (#30988)

---
 Dockerfile                     |  4 +++-
 config/initializers/sidekiq.rb | 19 ++++++++++++-------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 52d3758dc67cf7..758db9bcc90b56 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -67,7 +67,9 @@ ENV \
 # Optimize jemalloc 5.x performance
   MALLOC_CONF="narenas:2,background_thread:true,thp:never,dirty_decay_ms:1000,muzzy_decay_ms:0" \
 # Enable libvips, should not be changed
-  MASTODON_USE_LIBVIPS=true
+  MASTODON_USE_LIBVIPS=true \
+# Sidekiq will touch tmp/sidekiq_process_has_started_and_will_begin_processing_jobs to indicate it is ready. This can be used for a readiness check in Kubernetes
+  MASTODON_SIDEKIQ_READY_FILENAME=sidekiq_process_has_started_and_will_begin_processing_jobs
 
 # Set default shell used for running commands
 SHELL ["/bin/bash", "-o", "pipefail", "-o", "errexit", "-c"]
diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb
index e1d98b8ba3be33..5b2f317bf2efc1 100644
--- a/config/initializers/sidekiq.rb
+++ b/config/initializers/sidekiq.rb
@@ -2,19 +2,24 @@
 
 require_relative '../../lib/mastodon/sidekiq_middleware'
 
-SIDEKIQ_WILL_PROCESSES_JOBS_FILE = Rails.root.join('tmp', 'sidekiq_process_has_started_and_will_begin_processing_jobs').freeze
-
 Sidekiq.configure_server do |config|
   config.redis = REDIS_SIDEKIQ_PARAMS
 
   # This is used in Kubernetes setups, to signal that the Sidekiq process has started and will begin processing jobs
   # This comes from https://github.com/sidekiq/sidekiq/wiki/Kubernetes#sidekiq
-  config.on(:startup) do
-    FileUtils.touch(SIDEKIQ_WILL_PROCESSES_JOBS_FILE)
-  end
+  ready_filename = ENV.fetch('MASTODON_SIDEKIQ_READY_FILENAME', nil)
+  if ready_filename
+    raise 'MASTODON_SIDEKIQ_READY_FILENAME is not a valid filename' if File.basename(ready_filename) != ready_filename
+
+    ready_path = Rails.root.join('tmp', ready_filename)
 
-  config.on(:shutdown) do
-    FileUtils.rm_f(SIDEKIQ_WILL_PROCESSES_JOBS_FILE)
+    config.on(:startup) do
+      FileUtils.touch(ready_path)
+    end
+
+    config.on(:shutdown) do
+      FileUtils.rm_f(ready_path)
+    end
   end
 
   config.server_middleware do |chain|

From 2ea9336b6855b44126a55106a81e96ea68eaf8ff Mon Sep 17 00:00:00 2001
From: David Roetzel <david@roetzel.de>
Date: Wed, 10 Jul 2024 16:25:39 +0200
Subject: [PATCH 1514/2191] Do not pass unknown encoding names to nokogiri.
 (#30987)

---
 app/lib/link_details_extractor.rb              |  9 ++++++++-
 .../alternative_utf8_spelling_in_header.txt    | 18 ++++++++++++++++++
 spec/services/fetch_link_card_service_spec.rb  |  9 +++++++++
 3 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 spec/fixtures/requests/alternative_utf8_spelling_in_header.txt

diff --git a/app/lib/link_details_extractor.rb b/app/lib/link_details_extractor.rb
index 72992d2f42ad80..d81f4a30622dec 100644
--- a/app/lib/link_details_extractor.rb
+++ b/app/lib/link_details_extractor.rb
@@ -274,7 +274,7 @@ def document
   end
 
   def detect_encoding_and_parse_document
-    [detect_encoding, nil, @html_charset].uniq.each do |encoding|
+    [detect_encoding, nil, header_encoding].uniq.each do |encoding|
       document = Nokogiri::HTML(@html, nil, encoding)
       return document if document.to_s.valid_encoding?
     end
@@ -286,6 +286,13 @@ def detect_encoding
     guess&.fetch(:confidence, 0).to_i > 60 ? guess&.fetch(:encoding, nil) : nil
   end
 
+  def header_encoding
+    Encoding.find(@html_charset).name if @html_charset
+  rescue ArgumentError
+    # Encoding from HTTP header is not recognized by ruby
+    nil
+  end
+
   def detector
     @detector ||= CharlockHolmes::EncodingDetector.new.tap do |detector|
       detector.strip_tags = true
diff --git a/spec/fixtures/requests/alternative_utf8_spelling_in_header.txt b/spec/fixtures/requests/alternative_utf8_spelling_in_header.txt
new file mode 100644
index 00000000000000..7aaea370e86230
--- /dev/null
+++ b/spec/fixtures/requests/alternative_utf8_spelling_in_header.txt
@@ -0,0 +1,18 @@
+HTTP/1.1 200 OK
+server: nginx
+date: Thu, 13 Jun 2024 14:33:13 GMT
+content-type: text/html; charset=utf8
+content-length: 192
+accept-ranges: bytes
+
+<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <title>Webserver Configs R Us</title>
+</head>
+<body>
+  <h2>Welcome</h2>
+  <p>Sneaky non-UTF character: �</p>
+</body>
+</html>
diff --git a/spec/services/fetch_link_card_service_spec.rb b/spec/services/fetch_link_card_service_spec.rb
index 342902cdb3d894..2f64f405583955 100644
--- a/spec/services/fetch_link_card_service_spec.rb
+++ b/spec/services/fetch_link_card_service_spec.rb
@@ -32,6 +32,7 @@
     stub_request(:get, 'http://example.com/aergerliche-umlaute').to_return(request_fixture('redirect_with_utf8_url.txt'))
     stub_request(:get, 'http://example.com/page_without_title').to_return(request_fixture('page_without_title.txt'))
     stub_request(:get, 'http://example.com/long_canonical_url').to_return(request_fixture('long_canonical_url.txt'))
+    stub_request(:get, 'http://example.com/alternative_utf8_spelling_in_header').to_return(request_fixture('alternative_utf8_spelling_in_header.txt'))
 
     Rails.cache.write('oembed_endpoint:example.com', oembed_cache) if oembed_cache
 
@@ -292,6 +293,14 @@
         expect(status.preview_card).to be_nil
       end
     end
+
+    context 'with a URL where the `Content-Type` header uses `utf8` instead of `utf-8`' do
+      let(:status) { Fabricate(:status, text: 'test http://example.com/alternative_utf8_spelling_in_header') }
+
+      it 'does not create a preview card' do
+        expect(status.preview_card.title).to eq 'Webserver Configs R Us'
+      end
+    end
   end
 
   context 'with a remote status' do

From 0d4a8a53d548aa4db43e52085f85126c2bf543d1 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Wed, 10 Jul 2024 14:23:24 +0200
Subject: [PATCH 1515/2191] [Glitch] Fix SCSS mixed declarations deprecation

Port 182b9248c0e798e4b0fba8339d2817ed2f094b42 to glitch-soc
---
 app/javascript/flavours/glitch/styles/components.scss | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index 0f78aa45dc766f..533a564e99687e 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -1430,6 +1430,8 @@ body > [data-popper-placement] {
   min-height: 54px;
   border-bottom: 1px solid var(--background-border-color);
   cursor: auto;
+  opacity: 1;
+  animation: fade 150ms linear;
 
   @keyframes fade {
     0% {
@@ -1441,9 +1443,6 @@ body > [data-popper-placement] {
     }
   }
 
-  opacity: 1;
-  animation: fade 150ms linear;
-
   .media-gallery,
   .video-player,
   .audio-player,
@@ -5199,8 +5198,10 @@ a.status-card {
     &__menu {
       @include search-popout;
 
-      padding: 0;
-      background: $ui-secondary-color;
+      & {
+        padding: 0;
+        background: $ui-secondary-color;
+      }
     }
 
     &__menu-list {

From 959ad1d6be5b84bd55df4e7ad04cc94e824fce5c Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 10 Jul 2024 17:46:33 +0200
Subject: [PATCH 1516/2191] Fix deprecation warning in win95 theme

---
 app/javascript/styles/win95.scss | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/javascript/styles/win95.scss b/app/javascript/styles/win95.scss
index 66d451303ab64b..2302dc40d5b6f7 100644
--- a/app/javascript/styles/win95.scss
+++ b/app/javascript/styles/win95.scss
@@ -2503,6 +2503,7 @@ body {
     background: $win95-tooltip-yellow;
     border: 1px solid black;
     padding: 4px;
+    margin-bottom: 24px;
 
     h1, h1 small {
       color:black;
@@ -2510,8 +2511,6 @@ body {
       text-overflow: unset;
     }
 
-    margin-bottom: 24px;
-
     &:after {
       content: "";
       display:block;

From d436696f46814eb4c786e48dec6dd05b4bb5c278 Mon Sep 17 00:00:00 2001
From: Emelia Smith <ThisIsMissEm@users.noreply.github.com>
Date: Wed, 10 Jul 2024 17:59:18 +0200
Subject: [PATCH 1517/2191] Streaming: Fix incorrect type definitions (#30977)

---
 streaming/index.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/streaming/index.js b/streaming/index.js
index 65a63bb114326a..2ba8b1540781b4 100644
--- a/streaming/index.js
+++ b/streaming/index.js
@@ -1107,7 +1107,7 @@ const startServer = async () => {
 
   /**
    * @param {http.IncomingMessage} req
-   * @param {WebSocket} ws
+   * @param {import('ws').WebSocket} ws
    * @param {string[]} streamName
    * @returns {function(string, string): void}
    */
@@ -1324,7 +1324,7 @@ const startServer = async () => {
 
   /**
    * @typedef WebSocketSession
-   * @property {WebSocket & { isAlive: boolean}} websocket
+   * @property {import('ws').WebSocket & { isAlive: boolean}} websocket
    * @property {http.IncomingMessage & ResolvedAccount} request
    * @property {import('pino').Logger} logger
    * @property {Object.<string, { channelName: string, listener: SubscriptionListener, stopHeartbeat: function(): void }>} subscriptions
@@ -1450,7 +1450,7 @@ const startServer = async () => {
   };
 
   /**
-   * @param {WebSocket & { isAlive: boolean }} ws
+   * @param {import('ws').WebSocket & { isAlive: boolean }} ws
    * @param {http.IncomingMessage & ResolvedAccount} req
    * @param {import('pino').Logger} log
    */

From 182fee1c454dcd71ecf408ddc2c534bf6ee3a49a Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 10 Jul 2024 18:18:15 +0200
Subject: [PATCH 1518/2191] New Crowdin Translations (automated) (#2738)

* New Crowdin translations

* Fix bogus no.yml

* Fix bogus simple_form.no.yml

---------

Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/locales/de.json    | 3 +--
 app/javascript/flavours/glitch/locales/es-AR.json | 3 +--
 app/javascript/flavours/glitch/locales/ko.json    | 5 +++++
 app/javascript/flavours/glitch/locales/zh-CN.json | 3 +--
 app/javascript/flavours/glitch/locales/zh-TW.json | 3 +--
 config/locales-glitch/simple_form.ko.yml          | 2 ++
 6 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/app/javascript/flavours/glitch/locales/de.json b/app/javascript/flavours/glitch/locales/de.json
index caad1ebcfe1ebe..6a20c8c396fda3 100644
--- a/app/javascript/flavours/glitch/locales/de.json
+++ b/app/javascript/flavours/glitch/locales/de.json
@@ -154,6 +154,5 @@
   "status.in_reply_to": "Dieser Toot ist eine Antwort",
   "status.is_poll": "Dieser Toot ist eine Umfrage",
   "status.local_only": "Nur auf deiner Instanz sichtbar",
-  "status.uncollapse": "Ausklappen",
-  "suggestions.dismiss": "Vorschlag ablehnen"
+  "status.uncollapse": "Ausklappen"
 }
diff --git a/app/javascript/flavours/glitch/locales/es-AR.json b/app/javascript/flavours/glitch/locales/es-AR.json
index 95dc7c85a6fdaf..706109d6e86fd5 100644
--- a/app/javascript/flavours/glitch/locales/es-AR.json
+++ b/app/javascript/flavours/glitch/locales/es-AR.json
@@ -155,6 +155,5 @@
   "status.in_reply_to": "Esta publicación es una respuesta",
   "status.is_poll": "Esta publicación es una encuesta",
   "status.local_only": "Sólo visible para tu instancia",
-  "status.uncollapse": "Descolapsar",
-  "suggestions.dismiss": "Descartar sugerencia"
+  "status.uncollapse": "Descolapsar"
 }
diff --git a/app/javascript/flavours/glitch/locales/ko.json b/app/javascript/flavours/glitch/locales/ko.json
index b1da79d102e65c..18e61dc03418eb 100644
--- a/app/javascript/flavours/glitch/locales/ko.json
+++ b/app/javascript/flavours/glitch/locales/ko.json
@@ -25,6 +25,9 @@
   "compose.content-type.plain_meta": "고급 양식 없이 작성",
   "compose.disable_threaded_mode": "글타래 모드 비활성화",
   "compose.enable_threaded_mode": "글타래 모드 활성화",
+  "compose_form.sensitive.hide": "{count, plural, other {미디어를 민감함으로 표시}}",
+  "compose_form.sensitive.marked": "{count, plural, other {미디어가 민감함으로 표시되었습니다}}",
+  "compose_form.sensitive.unmarked": "{count, plural, other {미디어가 민감함으로 표시되지 않았습니다}}",
   "confirmation_modal.do_not_ask_again": "다음부터 확인창을 띄우지 않기",
   "confirmations.deprecated_settings.confirm": "마스토돈 설정 사용",
   "confirmations.deprecated_settings.message": "사용하던 몇몇 기기별 글리치 {app_settings}은 마스토돈 {preferences}으로 대체되었습니다:",
@@ -61,6 +64,7 @@
   "notification_purge.btn_invert": "선택반전",
   "notification_purge.btn_none": "전체선택해제",
   "notification_purge.start": "알림 삭제모드로 들어가기",
+  "notifications.column_settings.filter_bar.show_bar": "필터 막대 표시",
   "notifications.marked_clear": "선택된 알림 모두 삭제",
   "notifications.marked_clear_confirmation": "정말로 선택된 알림들을 영구적으로 삭제할까요?",
   "settings.always_show_spoilers_field": "열람주의 항목을 언제나 활성화",
@@ -124,6 +128,7 @@
   "settings.shared_settings_link": "사용자 설정",
   "settings.show_action_bar": "접힌 글에 액션 버튼들 보이기",
   "settings.show_content_type_choice": "글을 작성할 때 콘텐트 타입을 고를 수 있도록 합니다",
+  "settings.show_published_toast": "게시물을 게시/저장할 때 토스트 표시",
   "settings.show_reply_counter": "대략적인 답글 개수를 표시합니다",
   "settings.side_arm": "보조 작성 버튼:",
   "settings.side_arm.none": "없음",
diff --git a/app/javascript/flavours/glitch/locales/zh-CN.json b/app/javascript/flavours/glitch/locales/zh-CN.json
index 26f142807abd88..e9999136fb97b7 100644
--- a/app/javascript/flavours/glitch/locales/zh-CN.json
+++ b/app/javascript/flavours/glitch/locales/zh-CN.json
@@ -155,6 +155,5 @@
   "status.in_reply_to": "此嘟文是回复",
   "status.is_poll": "此嘟文是投票",
   "status.local_only": "此嘟文仅本站可见",
-  "status.uncollapse": "展开",
-  "suggestions.dismiss": "关闭建议"
+  "status.uncollapse": "展开"
 }
diff --git a/app/javascript/flavours/glitch/locales/zh-TW.json b/app/javascript/flavours/glitch/locales/zh-TW.json
index 2fcb217434afd4..aaf00651506c40 100644
--- a/app/javascript/flavours/glitch/locales/zh-TW.json
+++ b/app/javascript/flavours/glitch/locales/zh-TW.json
@@ -151,6 +151,5 @@
   "status.in_reply_to": "貼文有回覆",
   "status.is_poll": "貼文有投票",
   "status.local_only": "只在此實例可見",
-  "status.uncollapse": "展開",
-  "suggestions.dismiss": "關閉建議"
+  "status.uncollapse": "展開"
 }
diff --git a/config/locales-glitch/simple_form.ko.yml b/config/locales-glitch/simple_form.ko.yml
index f9420f1336dafa..96e13201419de7 100644
--- a/config/locales-glitch/simple_form.ko.yml
+++ b/config/locales-glitch/simple_form.ko.yml
@@ -8,6 +8,7 @@ ko:
         setting_default_content_type_markdown: 게시물을 작성할 때, 형식을 지정하지 않았다면, 마크다운이라고 가정합니다
         setting_default_content_type_plain: 게시물을 작성할 때, 형식을 지정하지 않았다면, 일반적인 텍스트라고 가정합니다. (마스토돈의 기본 동작)
         setting_default_language: 작성하는 게시물의 언어는 자동으로 설정될 수 있습니다, 하지만 언제나 정확하지는 않습니다
+        setting_show_followers_count: 팔로워 카운트를 프로필에서 숨깁니다. 팔로워 수를 숨기면 나에게도 보이지 않으며 몇몇 앱에서는 팔로워 수가 음수로 표시될 수 있습니다.
         setting_skin: 선택한 마스토돈 풍미의 스킨을 바꿉니다
     labels:
       defaults:
@@ -16,6 +17,7 @@ ko:
         setting_default_content_type_markdown: 마크다운
         setting_default_content_type_plain: 일반 텍스트
         setting_favourite_modal: 관심글을 지정할 때 확인 창을 띄웁니다(글리치 풍미에만 적용됨)
+        setting_show_followers_count: 팔로워 수 표시
         setting_skin: 스킨
         setting_system_emoji_font: 에모지에 시스템 기본 폰트 적용하기 (글리치 풍미에만 적용됨)
       notification_emails:

From 631a5eec85946848bf0b15562f82260c1f7721d8 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 10 Jul 2024 21:59:34 +0200
Subject: [PATCH 1519/2191] chore(deps): update dependency charlock_holmes to
 v0.7.9 (#30992)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 1c253719e4ebae..18c2d34808d79a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -159,7 +159,7 @@ GEM
     case_transform (0.2)
       activesupport
     cbor (0.5.9.8)
-    charlock_holmes (0.7.8)
+    charlock_holmes (0.7.9)
     chewy (7.6.0)
       activesupport (>= 5.2)
       elasticsearch (>= 7.14.0, < 8)

From 24bdba34132b0a6e193e7246304601a8ad453425 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 11 Jul 2024 12:30:55 +0200
Subject: [PATCH 1520/2191] chore(deps): update dependency rubocop to v1.65.0
 (#30985)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 18c2d34808d79a..2d085152e861b0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -583,7 +583,7 @@ GEM
     orm_adapter (0.5.0)
     ox (2.14.18)
     parallel (1.25.1)
-    parser (3.3.3.0)
+    parser (3.3.4.0)
       ast (~> 2.4.1)
       racc
     parslet (2.0.0)
@@ -733,13 +733,13 @@ GEM
       rspec-mocks (~> 3.0)
       sidekiq (>= 5, < 8)
     rspec-support (3.13.1)
-    rubocop (1.64.1)
+    rubocop (1.65.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
+      regexp_parser (>= 2.4, < 3.0)
       rexml (>= 3.2.5, < 4.0)
       rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)

From c244b70dc21f1a41f16588820490082a1e99b7ae Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 11 Jul 2024 10:38:35 +0000
Subject: [PATCH 1521/2191] New Crowdin Translations (automated) (#30993)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/ar.json  | 24 ++++++++++++------------
 app/javascript/mastodon/locales/kab.json |  6 ++++++
 config/locales/ar.yml                    |  5 +++++
 3 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/app/javascript/mastodon/locales/ar.json b/app/javascript/mastodon/locales/ar.json
index a9e1bdb270ebad..115f6335b6f12c 100644
--- a/app/javascript/mastodon/locales/ar.json
+++ b/app/javascript/mastodon/locales/ar.json
@@ -4,7 +4,7 @@
   "about.disclaimer": "ماستدون برنامج حر ومفتوح المصدر وعلامة تجارية لـ Mastodon GmbH.",
   "about.domain_blocks.no_reason_available": "السبب غير متوفر",
   "about.domain_blocks.preamble": "يسمح لك ماستدون عموماً بعرض المحتوى من المستخدمين من أي خادم آخر في الفدرالية والتفاعل معهم. وهذه هي الاستثناءات التي وضعت على هذا الخادم بالذات.",
-  "about.domain_blocks.silenced.explanation": "عموماً، لن ترى ملفات التعريف والمحتوى من هذا الخادم، إلا إذا كنت تبحث عنه بشكل صريح أو تختار أن تتابعه.",
+  "about.domain_blocks.silenced.explanation": "لن تظهر لك ملفات التعريف الشخصية والمحتوى من هذا الخادوم، إلا إن بحثت عنه عمدًا أو تابعته.",
   "about.domain_blocks.silenced.title": "محدود",
   "about.domain_blocks.suspended.explanation": "لن يتم معالجة أي بيانات من هذا الخادم أو تخزينها أو تبادلها، مما يجعل أي تفاعل أو اتصال مع المستخدمين من هذا الخادم مستحيلا.",
   "about.domain_blocks.suspended.title": "مُعلّق",
@@ -21,7 +21,7 @@
   "account.blocked": "محظور",
   "account.browse_more_on_origin_server": "تصفح المزيد في الملف الشخصي الأصلي",
   "account.cancel_follow_request": "إلغاء طلب المتابعة",
-  "account.copy": "نسخ الرابط إلى الحساب",
+  "account.copy": "نسخ الرابط إلى الملف الشخصي",
   "account.direct": "إشارة خاصة لـ @{name}",
   "account.disable_notifications": "توقف عن إشعاري عندما ينشر @{name}",
   "account.domain_blocked": "اسم النِّطاق محظور",
@@ -32,7 +32,7 @@
   "account.featured_tags.last_status_never": "لا توجد رسائل",
   "account.featured_tags.title": "وسوم {name} المميَّزة",
   "account.follow": "متابعة",
-  "account.follow_back": "رد المتابعة",
+  "account.follow_back": "تابعهم بالمثل",
   "account.followers": "مُتابِعون",
   "account.followers.empty": "لا أحدَ يُتابع هذا المُستخدم إلى حد الآن.",
   "account.following": "الاشتراكات",
@@ -51,7 +51,7 @@
   "account.mute_notifications_short": "كتم الإشعارات",
   "account.mute_short": "اكتم",
   "account.muted": "مَكتوم",
-  "account.mutual": "متبادل",
+  "account.mutual": "متبادلة",
   "account.no_bio": "لم يتم تقديم وصف.",
   "account.open_original_page": "افتح الصفحة الأصلية",
   "account.posts": "منشورات",
@@ -70,8 +70,8 @@
   "account.unmute_notifications_short": "إلغاء كَتم الإشعارات",
   "account.unmute_short": "إلغاء الكتم",
   "account_note.placeholder": "اضغط لإضافة مُلاحظة",
-  "admin.dashboard.daily_retention": "معدل الاحتفاظ بالمستخدم بعد التسجيل بيوم",
-  "admin.dashboard.monthly_retention": "معدل الاحتفاظ بالمستخدم بعد التسجيل بالشهور",
+  "admin.dashboard.daily_retention": "معدّل بقاء المستخدمين بعد إنشاء الحسابات، بالأيام",
+  "admin.dashboard.monthly_retention": "معدّل بقاء المستخدمين بعد إنشاء الحسابات، بالشهور",
   "admin.dashboard.retention.average": "المعدل",
   "admin.dashboard.retention.cohort": "شهر التسجيل",
   "admin.dashboard.retention.cohort_size": "المستخدمون الجدد",
@@ -87,12 +87,12 @@
   "attachments_list.unprocessed": "(غير معالَج)",
   "audio.hide": "إخفاء المقطع الصوتي",
   "block_modal.remote_users_caveat": "سوف نطلب من الخادم {domain} أن يحترم قرارك، لكن الالتزام غير مضمون لأن بعض الخواديم قد تتعامل مع نصوص الكتل بشكل مختلف. قد تظل المنشورات العامة مرئية للمستخدمين غير المسجلين الدخول.",
-  "block_modal.show_less": "أظهر الأقل",
-  "block_modal.show_more": "أظهر المزيد",
+  "block_modal.show_less": "تفاصيل أقلّ",
+  "block_modal.show_more": "تفاصيل أكثر",
   "block_modal.they_cant_mention": "لن يستطيع ذِكرك أو متابعتك.",
-  "block_modal.they_cant_see_posts": "لن يستطيع رؤية منشوراتك ولن ترى منشوراته.",
-  "block_modal.they_will_know": "يمكنه أن يرى أنه قد تم حظره.",
-  "block_modal.title": "أتريد حظر المستخدم؟",
+  "block_modal.they_cant_see_posts": "لن يستطيع مطالعة منشوراتك ولن تطالع منشوراته.",
+  "block_modal.they_will_know": "سيعلم أنه قد حُظِر.",
+  "block_modal.title": "أتريد حظر هذا المستخدم؟",
   "block_modal.you_wont_see_mentions": "لن تر المنشورات التي يُشار فيهم إليه.",
   "boost_modal.combo": "يُمكنك الضّغط على {combo} لتخطي هذا في المرة المُقبلة",
   "bundle_column_error.copy_stacktrace": "انسخ تقرير الخطأ",
@@ -156,7 +156,7 @@
   "compose_form.poll.single": "اختر واحدا",
   "compose_form.poll.switch_to_multiple": "تغيِير الاستطلاع للسماح باِخيارات مُتعدِّدة",
   "compose_form.poll.switch_to_single": "تغيِير الاستطلاع للسماح باِخيار واحد فقط",
-  "compose_form.poll.type": "الأسلوب",
+  "compose_form.poll.type": "الطراز",
   "compose_form.publish": "نشر",
   "compose_form.publish_form": "منشور جديد",
   "compose_form.reply": "ردّ",
diff --git a/app/javascript/mastodon/locales/kab.json b/app/javascript/mastodon/locales/kab.json
index fcaa8f143ed445..868edbc8c0fe4c 100644
--- a/app/javascript/mastodon/locales/kab.json
+++ b/app/javascript/mastodon/locales/kab.json
@@ -28,9 +28,12 @@
   "account.featured_tags.last_status_at": "Tasuffeɣt taneggarut ass n {date}",
   "account.featured_tags.last_status_never": "Ulac tisuffaɣ",
   "account.follow": "Ḍfer",
+  "account.follow_back": "Ḍfer-it ula d kečč·m",
   "account.followers": "Imeḍfaren",
   "account.followers.empty": "Ar tura, ulac yiwen i yeṭṭafaṛen amseqdac-agi.",
+  "account.followers_counter": "{count, plural, one {{counter} n umḍfar} other {{counter} n yimeḍfaren}}",
   "account.following": "Yeṭṭafaṛ",
+  "account.following_counter": "{count, plural, one {{counter} yettwaḍfaren} other {{counter} yettwaḍfaren}}",
   "account.follows.empty": "Ar tura, amseqdac-agi ur yeṭṭafaṛ yiwen.",
   "account.go_to_profile": "Ddu ɣer umaɣnu",
   "account.hide_reblogs": "Ffer ayen i ibeṭṭu @{name}",
@@ -53,6 +56,7 @@
   "account.requested_follow": "{name} yessuter ad k·m-yeḍfer",
   "account.share": "Bḍu amaɣnu n @{name}",
   "account.show_reblogs": "Ssken-d inebḍa n @{name}",
+  "account.statuses_counter": "{count, plural, one {{counter} n tsuffeɣt} other {{counter} n tsuffaɣ}}",
   "account.unblock": "Serreḥ i @{name}",
   "account.unblock_domain": "Ssken-d {domain}",
   "account.unblock_short": "Serreḥ",
@@ -560,6 +564,7 @@
   "status.edited_x_times": "Tettwaẓreg {count, plural, one {{count} n tikkelt} other {{count} n tikkal}}",
   "status.embed": "Seddu",
   "status.favourite": "Amenyaf",
+  "status.favourites": "{count, plural, one {n usmenyaf} other {n ismenyafen}}",
   "status.filter": "Sizdeg tassufeɣt-a",
   "status.filtered": "Yettwasizdeg",
   "status.hide": "Ffer tasuffeɣt",
@@ -579,6 +584,7 @@
   "status.read_more": "Issin ugar",
   "status.reblog": "Bḍu",
   "status.reblogged_by": "Yebḍa-tt {name}",
+  "status.reblogs": "{count, plural, one {n usnerni} other {n yisnernuyen}}",
   "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",
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 2ca7538c324d00..4df24c984c0ed0 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -1762,6 +1762,10 @@ ar:
     webauthn_authentication: مفاتيح الأمان
   severed_relationships:
     download: تنزيل (%{count})
+    lost_followers: المتابعون المفقودون
+    lost_follows: المتابعات المفقودة
+    preamble: بحجبكم اسم نطاق قد تخسرون متابَعاتٍ، و كذلك إذا قرّر مديرو الخادوم حظر خادوم ما. و في هذه الحالات يكون بوسعكم تنزيل قائمة بالصلات المبتورة لمعاينتها، مع القدرة على استيرادها إلى خادوم آخر.
+    purged: حذف مدير خادومكم المعلومات عن هذا الخادوم.
   statuses:
     attached:
       audio:
@@ -1978,6 +1982,7 @@ ar:
       edit_profile_title: قم بتخصيص ملفك التعريفي
       explanation: ها هي بعض النصائح قبل بداية الاستخدام
       feature_action: اعرف المزيد
+      feature_audience: يتيح لكم مًستُدون إدارة جمهوركم بلا وسطاء. فبتنصيب و تشغيل مَستُودون على بنيتكم التحتية تمكنكم متابعة مستخدمي مَستُدون من أيّ خادوم،كما يمكنهم متابعتكم، بلا تحكُّم من أي طرف ثالث.
       feature_audience_title: اِبنوا جُمهورَكم بِثِقَة
       feature_control: أنتم الأدرى بالمحتوى الذي تريدون أن تطالعوه في فيض المنشورات الرئيس. لا خوارزميات تتحكم فيما يظهر لكم ولا إعلانات تضيع وقتكم. بحساب واحد تمكنكم متابعة من تشاؤون على أيّ خادوم ماستدون، وتلقّى منشوراتهم بترتيبها الزمني، لتصنعوا ركنكم الأليف في الإنترنت.
       feature_control_title: تحكَّموا في فيض المنشورات الخاص بكم

From 6c375297236ecd1df7a5e82c24ad025b46be46cc Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 11 Jul 2024 07:13:55 -0400
Subject: [PATCH 1522/2191] Use `module: :auth` to wrap `devise_for` routes
 config (#30990)

---
 config/routes.rb | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/config/routes.rb b/config/routes.rb
index 2c06762c229224..e4f091043d6c2a 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -104,13 +104,9 @@ def redirect_with_vary(path)
     end
   end
 
-  devise_for :users, path: 'auth', format: false, controllers: {
-    omniauth_callbacks: 'auth/omniauth_callbacks',
-    sessions: 'auth/sessions',
-    registrations: 'auth/registrations',
-    passwords: 'auth/passwords',
-    confirmations: 'auth/confirmations',
-  }
+  scope module: :auth do
+    devise_for :users, path: 'auth', format: false
+  end
 
   with_options constraints: ->(req) { req.format.nil? || req.format.html? } do
     get '/users/:username', to: redirect_with_vary('/@%{username}')

From 8c8bee5a36e0cd0b5d35903f8891896447c3e060 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Thu, 11 Jul 2024 15:43:42 +0200
Subject: [PATCH 1523/2191] Change disabled buttons color in light mode to make
 it more visible (#30998)

---
 app/javascript/styles/mastodon-light/diff.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/javascript/styles/mastodon-light/diff.scss b/app/javascript/styles/mastodon-light/diff.scss
index 07e9d9868b4272..a41272364a3106 100644
--- a/app/javascript/styles/mastodon-light/diff.scss
+++ b/app/javascript/styles/mastodon-light/diff.scss
@@ -48,6 +48,10 @@ html {
   }
 }
 
+.icon-button:disabled {
+  color: darken($action-button-color, 25%);
+}
+
 .account__header__bar .avatar .account__avatar {
   border-color: $white;
 }

From e26052192d2bc11ef8adb7bb5f9d4d0fcbfc94f4 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Thu, 11 Jul 2024 15:43:42 +0200
Subject: [PATCH 1524/2191] [Glitch] Change disabled buttons color in light
 mode to make it more visible

Port 8c8bee5a36e0cd0b5d35903f8891896447c3e060 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/styles/mastodon-light/diff.scss           | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss b/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss
index 4040ee0fe0c598..1f5059c321e765 100644
--- a/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss
+++ b/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss
@@ -48,6 +48,10 @@ html {
   }
 }
 
+.icon-button:disabled {
+  color: darken($action-button-color, 25%);
+}
+
 .account__header__bar .avatar .account__avatar {
   border-color: $white;
 }

From ad52b04a1c88574ae3be2c56bead1b0638b253fc Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 11 Jul 2024 21:42:58 +0200
Subject: [PATCH 1525/2191] Add setting to disable hover cards (#30931)

Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
---
 app/javascript/mastodon/components/status.jsx                 | 2 +-
 app/javascript/mastodon/components/status_content.jsx         | 2 +-
 .../features/notifications/components/notification.jsx        | 4 ++--
 app/javascript/mastodon/features/ui/index.jsx                 | 4 ++--
 app/javascript/mastodon/initial_state.js                      | 2 ++
 app/models/concerns/user/has_settings.rb                      | 4 ++++
 app/models/user_settings.rb                                   | 1 +
 app/serializers/initial_state_serializer.rb                   | 1 +
 app/views/settings/preferences/appearance/show.html.haml      | 1 +
 config/locales/simple_form.en.yml                             | 1 +
 10 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/app/javascript/mastodon/components/status.jsx b/app/javascript/mastodon/components/status.jsx
index dce48d70364965..502dc8bee3c0e6 100644
--- a/app/javascript/mastodon/components/status.jsx
+++ b/app/javascript/mastodon/components/status.jsx
@@ -562,7 +562,7 @@ class Status extends ImmutablePureComponent {
                 <RelativeTimestamp timestamp={status.get('created_at')} />{status.get('edited_at') && <abbr title={intl.formatMessage(messages.edited, { date: intl.formatDate(status.get('edited_at'), { year: 'numeric', month: 'short', day: '2-digit', hour: '2-digit', minute: '2-digit' }) })}> *</abbr>}
               </a>
 
-              <a onClick={this.handleAccountClick} href={`/@${status.getIn(['account', 'acct'])}`} data-hover-card-account={status.getIn(['account', 'id'])} className='status__display-name' target='_blank' rel='noopener noreferrer'>
+              <a onClick={this.handleAccountClick} href={`/@${status.getIn(['account', 'acct'])}`} title={status.getIn(['account', 'acct'])} data-hover-card-account={status.getIn(['account', 'id'])} className='status__display-name' target='_blank' rel='noopener noreferrer'>
                 <div className='status__avatar'>
                   {statusAvatar}
                 </div>
diff --git a/app/javascript/mastodon/components/status_content.jsx b/app/javascript/mastodon/components/status_content.jsx
index 82135b85cad26e..96452374dcc639 100644
--- a/app/javascript/mastodon/components/status_content.jsx
+++ b/app/javascript/mastodon/components/status_content.jsx
@@ -116,7 +116,7 @@ class StatusContent extends PureComponent {
 
       if (mention) {
         link.addEventListener('click', this.onMentionClick.bind(this, mention), false);
-        link.removeAttribute('title');
+        link.setAttribute('title', `@${mention.get('acct')}`);
         link.setAttribute('href', `/@${mention.get('acct')}`);
         link.setAttribute('data-hover-card-account', mention.get('id'));
       } else if (link.textContent[0] === '#' || (link.previousSibling && link.previousSibling.textContent && link.previousSibling.textContent[link.previousSibling.textContent.length - 1] === '#')) {
diff --git a/app/javascript/mastodon/features/notifications/components/notification.jsx b/app/javascript/mastodon/features/notifications/components/notification.jsx
index 272893042d7e40..986628fdc85a8d 100644
--- a/app/javascript/mastodon/features/notifications/components/notification.jsx
+++ b/app/javascript/mastodon/features/notifications/components/notification.jsx
@@ -435,7 +435,7 @@ class Notification extends ImmutablePureComponent {
 
     const targetAccount = report.get('target_account');
     const targetDisplayNameHtml = { __html: targetAccount.get('display_name_html') };
-    const targetLink = <bdi><Link className='notification__display-name' data-hover-card-account={targetAccount.get('id')} to={`/@${targetAccount.get('acct')}`} dangerouslySetInnerHTML={targetDisplayNameHtml} /></bdi>;
+    const targetLink = <bdi><Link className='notification__display-name' title={targetAccount.get('acct')} data-hover-card-account={targetAccount.get('id')} to={`/@${targetAccount.get('acct')}`} dangerouslySetInnerHTML={targetDisplayNameHtml} /></bdi>;
 
     return (
       <HotKeys handlers={this.getHandlers()}>
@@ -458,7 +458,7 @@ class Notification extends ImmutablePureComponent {
     const { notification } = this.props;
     const account          = notification.get('account');
     const displayNameHtml  = { __html: account.get('display_name_html') };
-    const link             = <bdi><Link className='notification__display-name' href={`/@${account.get('acct')}`} data-hover-card-account={account.get('id')} to={`/@${account.get('acct')}`} dangerouslySetInnerHTML={displayNameHtml} /></bdi>;
+    const link             = <bdi><Link className='notification__display-name' href={`/@${account.get('acct')}`} title={account.get('acct')} data-hover-card-account={account.get('id')} to={`/@${account.get('acct')}`} dangerouslySetInnerHTML={displayNameHtml} /></bdi>;
 
     switch(notification.get('type')) {
     case 'follow':
diff --git a/app/javascript/mastodon/features/ui/index.jsx b/app/javascript/mastodon/features/ui/index.jsx
index d41132f9ca1e40..d9f609620cde7b 100644
--- a/app/javascript/mastodon/features/ui/index.jsx
+++ b/app/javascript/mastodon/features/ui/index.jsx
@@ -25,7 +25,7 @@ import { clearHeight } from '../../actions/height_cache';
 import { expandNotifications } from '../../actions/notifications';
 import { fetchServer, fetchServerTranslationLanguages } from '../../actions/server';
 import { expandHomeTimeline } from '../../actions/timelines';
-import initialState, { me, owner, singleUserMode, trendsEnabled, trendsAsLanding } from '../../initial_state';
+import initialState, { me, owner, singleUserMode, trendsEnabled, trendsAsLanding, disableHoverCards } from '../../initial_state';
 
 import BundleColumnError from './components/bundle_column_error';
 import Header from './components/header';
@@ -588,7 +588,7 @@ class UI extends PureComponent {
 
           {layout !== 'mobile' && <PictureInPicture />}
           <NotificationsContainer />
-          <HoverCardController />
+          {!disableHoverCards && <HoverCardController />}
           <LoadingBarContainer className='loading-bar' />
           <ModalContainer />
           <UploadArea active={draggingOver} onClose={this.closeUploadModal} />
diff --git a/app/javascript/mastodon/initial_state.js b/app/javascript/mastodon/initial_state.js
index 9ec3df0df87814..60b35cb31ac72e 100644
--- a/app/javascript/mastodon/initial_state.js
+++ b/app/javascript/mastodon/initial_state.js
@@ -15,6 +15,7 @@
  * @property {boolean=} boost_modal
  * @property {boolean=} delete_modal
  * @property {boolean=} disable_swiping
+ * @property {boolean=} disable_hover_cards
  * @property {string=} disabled_account_id
  * @property {string} display_media
  * @property {string} domain
@@ -86,6 +87,7 @@ export const autoPlayGif = getMeta('auto_play_gif');
 export const boostModal = getMeta('boost_modal');
 export const deleteModal = getMeta('delete_modal');
 export const disableSwiping = getMeta('disable_swiping');
+export const disableHoverCards = getMeta('disable_hover_cards');
 export const disabledAccountId = getMeta('disabled_account_id');
 export const displayMedia = getMeta('display_media');
 export const domain = getMeta('domain');
diff --git a/app/models/concerns/user/has_settings.rb b/app/models/concerns/user/has_settings.rb
index 65373325f0ba79..1202f2033f1ccf 100644
--- a/app/models/concerns/user/has_settings.rb
+++ b/app/models/concerns/user/has_settings.rb
@@ -91,6 +91,10 @@ def setting_disable_swiping
     settings['web.disable_swiping']
   end
 
+  def setting_disable_hover_cards
+    settings['web.disable_hover_cards']
+  end
+
   def setting_always_send_emails
     settings['always_send_emails']
   end
diff --git a/app/models/user_settings.rb b/app/models/user_settings.rb
index 6571632fcd7a72..0ae8ab8ec79bba 100644
--- a/app/models/user_settings.rb
+++ b/app/models/user_settings.rb
@@ -25,6 +25,7 @@ class KeyError < Error; end
     setting :use_pending_items, default: false
     setting :use_system_font, default: false
     setting :disable_swiping, default: false
+    setting :disable_hover_cards, default: false
     setting :delete_modal, default: true
     setting :reblog_modal, default: false
     setting :reduce_motion, default: false
diff --git a/app/serializers/initial_state_serializer.rb b/app/serializers/initial_state_serializer.rb
index 72aaabcfcb1f81..13f332c95c4d7b 100644
--- a/app/serializers/initial_state_serializer.rb
+++ b/app/serializers/initial_state_serializer.rb
@@ -24,6 +24,7 @@ def meta
       store[:expand_spoilers]   = object_account_user.setting_expand_spoilers
       store[:reduce_motion]     = object_account_user.setting_reduce_motion
       store[:disable_swiping]   = object_account_user.setting_disable_swiping
+      store[:disable_hover_cards] = object_account_user.setting_disable_hover_cards
       store[:advanced_layout]   = object_account_user.setting_advanced_layout
       store[:use_blurhash]      = object_account_user.setting_use_blurhash
       store[:use_pending_items] = object_account_user.setting_use_pending_items
diff --git a/app/views/settings/preferences/appearance/show.html.haml b/app/views/settings/preferences/appearance/show.html.haml
index e89e015b298bee..f34ce4a6aa5e61 100644
--- a/app/views/settings/preferences/appearance/show.html.haml
+++ b/app/views/settings/preferences/appearance/show.html.haml
@@ -56,6 +56,7 @@
       = ff.input :'web.auto_play', wrapper: :with_label, recommended: true, label: I18n.t('simple_form.labels.defaults.setting_auto_play_gif')
       = ff.input :'web.reduce_motion', wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_reduce_motion')
       = ff.input :'web.disable_swiping', wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_disable_swiping')
+      = ff.input :'web.disable_hover_cards', wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_disable_hover_cards')
       = ff.input :'web.use_system_font', wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_system_font_ui')
 
     %h4= t 'appearance.discovery'
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml
index fdc9f61813d9c7..0313d4683edc66 100644
--- a/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@@ -211,6 +211,7 @@ en:
         setting_default_privacy: Posting privacy
         setting_default_sensitive: Always mark media as sensitive
         setting_delete_modal: Show confirmation dialog before deleting a post
+        setting_disable_hover_cards: Disable profile preview on hover
         setting_disable_swiping: Disable swiping motions
         setting_display_media: Media display
         setting_display_media_default: Default

From bb702e6b2037b5b0f2e76b6f9d390fa0fd7abc54 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 12 Jul 2024 10:18:35 +0200
Subject: [PATCH 1526/2191] fix(deps): update dependency sass to v1.77.8
 (#31005)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index cf7e5a8b952202..403a8310d01c61 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -15462,15 +15462,15 @@ __metadata:
   linkType: hard
 
 "sass@npm:^1.62.1":
-  version: 1.77.7
-  resolution: "sass@npm:1.77.7"
+  version: 1.77.8
+  resolution: "sass@npm:1.77.8"
   dependencies:
     chokidar: "npm:>=3.0.0 <4.0.0"
     immutable: "npm:^4.0.0"
     source-map-js: "npm:>=0.6.2 <2.0.0"
   bin:
     sass: sass.js
-  checksum: 10c0/6cacbf4b5165d30a9be0f09438aed85ff0617e5087442e65c23c8464750ff1b9988855a58f36b420b62f992d1e82403f99810aba7731519d3d026847e21a5635
+  checksum: 10c0/2bfd62794070352c804f949e69bd8bb5b4ec846deeb924251b2c3f7b503170fb1ae186f513f0166907749eb34e0277dee747edcb78c886fb471aac01be1e864c
   languageName: node
   linkType: hard
 

From 73d53827ea3ef1605f97f99bf3cbeeccb30638be Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 12 Jul 2024 04:19:15 -0400
Subject: [PATCH 1527/2191] Add change assertion to invites destroy spec
 (#31004)

---
 spec/controllers/invites_controller_spec.rb | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/spec/controllers/invites_controller_spec.rb b/spec/controllers/invites_controller_spec.rb
index 3190c82884228f..5221941267fa00 100644
--- a/spec/controllers/invites_controller_spec.rb
+++ b/spec/controllers/invites_controller_spec.rb
@@ -69,19 +69,16 @@
     end
   end
 
-  describe 'DELETE #create' do
-    let(:invite) { Fabricate(:invite, user: user, expires_at: nil) }
-
-    before do
-      delete :destroy, params: { id: invite.id }
-    end
+  describe 'DELETE #destroy' do
+    subject { delete :destroy, params: { id: invite.id } }
 
-    it 'redirects' do
-      expect(response).to redirect_to invites_path
-    end
+    let(:invite) { Fabricate(:invite, user: user, expires_at: nil) }
 
-    it 'expires invite' do
-      expect(invite.reload).to be_expired
+    it 'expires invite and redirects' do
+      expect { subject }
+        .to(change { invite.reload.expired? }.to(true))
+      expect(response)
+        .to redirect_to invites_path
     end
   end
 end

From cd1bc94cd2232b2583c6d3d1924fd0ae00f542bc Mon Sep 17 00:00:00 2001
From: Nick Schonning <nschonni@gmail.com>
Date: Fri, 12 Jul 2024 04:22:31 -0400
Subject: [PATCH 1528/2191] Regen RuboCop TODO for 1.65.0 (#31003)

---
 .rubocop_todo.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index b05d1bc6bd8bea..357ed99545028a 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config --auto-gen-only-exclude --no-offense-counts --no-auto-gen-timestamp`
-# using RuboCop version 1.64.1.
+# using RuboCop version 1.65.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -14,7 +14,7 @@ Lint/NonLocalExitFromIterator:
 Metrics/AbcSize:
   Max: 82
 
-# Configuration parameters: CountBlocks, Max.
+# Configuration parameters: CountBlocks, CountModifierForms, Max.
 Metrics/BlockNesting:
   Exclude:
     - 'lib/tasks/mastodon.rake'

From fdad4dc918d0eb8538d79173e86c82fd6d0290a6 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 12 Jul 2024 10:23:04 +0200
Subject: [PATCH 1529/2191] fix(deps): update babel monorepo to v7.24.8
 (#31002)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 222 +++++++++++++++++++++++++++---------------------------
 1 file changed, 111 insertions(+), 111 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 403a8310d01c61..988c6c79cfb5cb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -52,45 +52,45 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/compat-data@npm:^7.22.6, @babel/compat-data@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/compat-data@npm:7.24.7"
-  checksum: 10c0/dcd93a5632b04536498fbe2be5af1057f635fd7f7090483d8e797878559037e5130b26862ceb359acbae93ed27e076d395ddb4663db6b28a665756ffd02d324f
+"@babel/compat-data@npm:^7.22.6, @babel/compat-data@npm:^7.24.8":
+  version: 7.24.8
+  resolution: "@babel/compat-data@npm:7.24.8"
+  checksum: 10c0/7f465e9d8e44c5b516eeb3001362a3cd9a6df51dd90d3ac9868e1e7fa631ac57fc781cec6700110d4f555ba37fe59c4a71927b445106fe0062e79e79ffe11091
   languageName: node
   linkType: hard
 
 "@babel/core@npm:^7.10.4, @babel/core@npm:^7.11.6, @babel/core@npm:^7.12.3, @babel/core@npm:^7.22.1, @babel/core@npm:^7.24.4":
-  version: 7.24.7
-  resolution: "@babel/core@npm:7.24.7"
+  version: 7.24.8
+  resolution: "@babel/core@npm:7.24.8"
   dependencies:
     "@ampproject/remapping": "npm:^2.2.0"
     "@babel/code-frame": "npm:^7.24.7"
-    "@babel/generator": "npm:^7.24.7"
-    "@babel/helper-compilation-targets": "npm:^7.24.7"
-    "@babel/helper-module-transforms": "npm:^7.24.7"
-    "@babel/helpers": "npm:^7.24.7"
-    "@babel/parser": "npm:^7.24.7"
+    "@babel/generator": "npm:^7.24.8"
+    "@babel/helper-compilation-targets": "npm:^7.24.8"
+    "@babel/helper-module-transforms": "npm:^7.24.8"
+    "@babel/helpers": "npm:^7.24.8"
+    "@babel/parser": "npm:^7.24.8"
     "@babel/template": "npm:^7.24.7"
-    "@babel/traverse": "npm:^7.24.7"
-    "@babel/types": "npm:^7.24.7"
+    "@babel/traverse": "npm:^7.24.8"
+    "@babel/types": "npm:^7.24.8"
     convert-source-map: "npm:^2.0.0"
     debug: "npm:^4.1.0"
     gensync: "npm:^1.0.0-beta.2"
     json5: "npm:^2.2.3"
     semver: "npm:^6.3.1"
-  checksum: 10c0/4004ba454d3c20a46ea66264e06c15b82e9f6bdc35f88819907d24620da70dbf896abac1cb4cc4b6bb8642969e45f4d808497c9054a1388a386cf8c12e9b9e0d
+  checksum: 10c0/5e21b40cc69746deda3fe3d6540351d9cb0d1ad5aea055b7c319db26071ff5789fd9580d1aa47b114f07631e8e2109f4e71696ca11d7c7e60d157767022c1bd2
   languageName: node
   linkType: hard
 
-"@babel/generator@npm:^7.24.7, @babel/generator@npm:^7.7.2":
-  version: 7.24.7
-  resolution: "@babel/generator@npm:7.24.7"
+"@babel/generator@npm:^7.24.8, @babel/generator@npm:^7.7.2":
+  version: 7.24.8
+  resolution: "@babel/generator@npm:7.24.8"
   dependencies:
-    "@babel/types": "npm:^7.24.7"
+    "@babel/types": "npm:^7.24.8"
     "@jridgewell/gen-mapping": "npm:^0.3.5"
     "@jridgewell/trace-mapping": "npm:^0.3.25"
     jsesc: "npm:^2.5.1"
-  checksum: 10c0/06b1f3350baf527a3309e50ffd7065f7aee04dd06e1e7db794ddfde7fe9d81f28df64edd587173f8f9295496a7ddb74b9a185d4bf4de7bb619e6d4ec45c8fd35
+  checksum: 10c0/e8a278e75a895f13a7b17dd79abe1e894fe82a5ed3abb127c33c14c66773d69993762521c094c6c364723f8f7375683b0d4a96097781175a29407baedf67b769
   languageName: node
   linkType: hard
 
@@ -123,16 +123,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-compilation-targets@npm:^7.22.6, @babel/helper-compilation-targets@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/helper-compilation-targets@npm:7.24.7"
+"@babel/helper-compilation-targets@npm:^7.22.6, @babel/helper-compilation-targets@npm:^7.24.7, @babel/helper-compilation-targets@npm:^7.24.8":
+  version: 7.24.8
+  resolution: "@babel/helper-compilation-targets@npm:7.24.8"
   dependencies:
-    "@babel/compat-data": "npm:^7.24.7"
-    "@babel/helper-validator-option": "npm:^7.24.7"
-    browserslist: "npm:^4.22.2"
+    "@babel/compat-data": "npm:^7.24.8"
+    "@babel/helper-validator-option": "npm:^7.24.8"
+    browserslist: "npm:^4.23.1"
     lru-cache: "npm:^5.1.1"
     semver: "npm:^6.3.1"
-  checksum: 10c0/1d580a9bcacefe65e6bf02ba1dafd7ab278269fef45b5e281d8354d95c53031e019890464e7f9351898c01502dd2e633184eb0bcda49ed2ecd538675ce310f51
+  checksum: 10c0/2885c44ef6aaf82b7e4352b30089bb09fbe08ed5ec24eb452c2bdc3c021e2a65ab412f74b3d67ec1398da0356c730b33a2ceca1d67d34c85080d31ca6efa9aec
   languageName: node
   linkType: hard
 
@@ -231,9 +231,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-module-transforms@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/helper-module-transforms@npm:7.24.7"
+"@babel/helper-module-transforms@npm:^7.24.7, @babel/helper-module-transforms@npm:^7.24.8":
+  version: 7.24.8
+  resolution: "@babel/helper-module-transforms@npm:7.24.8"
   dependencies:
     "@babel/helper-environment-visitor": "npm:^7.24.7"
     "@babel/helper-module-imports": "npm:^7.24.7"
@@ -242,7 +242,7 @@ __metadata:
     "@babel/helper-validator-identifier": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10c0/4f311755fcc3b4cbdb689386309cdb349cf0575a938f0b9ab5d678e1a81bbb265aa34ad93174838245f2ac7ff6d5ddbd0104638a75e4e961958ed514355687b6
+  checksum: 10c0/b76496d5045af55be9de60e59e65e56a43033f01ccc746b26b7af911c358668c206b688ce70a23ab31ec04f9728f3a38e8d01073c85244115ab62f271a7fa3d1
   languageName: node
   linkType: hard
 
@@ -255,10 +255,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-plugin-utils@npm:^7.0.0, @babel/helper-plugin-utils@npm:^7.10.4, @babel/helper-plugin-utils@npm:^7.12.13, @babel/helper-plugin-utils@npm:^7.14.5, @babel/helper-plugin-utils@npm:^7.18.6, @babel/helper-plugin-utils@npm:^7.22.5, @babel/helper-plugin-utils@npm:^7.24.7, @babel/helper-plugin-utils@npm:^7.8.0, @babel/helper-plugin-utils@npm:^7.8.3":
-  version: 7.24.7
-  resolution: "@babel/helper-plugin-utils@npm:7.24.7"
-  checksum: 10c0/c3d38cd9b3520757bb4a279255cc3f956fc0ac1c193964bd0816ebd5c86e30710be8e35252227e0c9d9e0f4f56d9b5f916537f2bc588084b0988b4787a967d31
+"@babel/helper-plugin-utils@npm:^7.0.0, @babel/helper-plugin-utils@npm:^7.10.4, @babel/helper-plugin-utils@npm:^7.12.13, @babel/helper-plugin-utils@npm:^7.14.5, @babel/helper-plugin-utils@npm:^7.18.6, @babel/helper-plugin-utils@npm:^7.22.5, @babel/helper-plugin-utils@npm:^7.24.7, @babel/helper-plugin-utils@npm:^7.24.8, @babel/helper-plugin-utils@npm:^7.8.0, @babel/helper-plugin-utils@npm:^7.8.3":
+  version: 7.24.8
+  resolution: "@babel/helper-plugin-utils@npm:7.24.8"
+  checksum: 10c0/0376037f94a3bfe6b820a39f81220ac04f243eaee7193774b983e956c1750883ff236b30785795abbcda43fac3ece74750566830c2daa4d6e3870bb0dff34c2d
   languageName: node
   linkType: hard
 
@@ -317,10 +317,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-string-parser@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/helper-string-parser@npm:7.24.7"
-  checksum: 10c0/47840c7004e735f3dc93939c77b099bb41a64bf3dda0cae62f60e6f74a5ff80b63e9b7cf77b5ec25a324516381fc994e1f62f922533236a8e3a6af57decb5e1e
+"@babel/helper-string-parser@npm:^7.24.8":
+  version: 7.24.8
+  resolution: "@babel/helper-string-parser@npm:7.24.8"
+  checksum: 10c0/6361f72076c17fabf305e252bf6d580106429014b3ab3c1f5c4eb3e6d465536ea6b670cc0e9a637a77a9ad40454d3e41361a2909e70e305116a23d68ce094c08
   languageName: node
   linkType: hard
 
@@ -331,10 +331,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-validator-option@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/helper-validator-option@npm:7.24.7"
-  checksum: 10c0/21aea2b7bc5cc8ddfb828741d5c8116a84cbc35b4a3184ec53124f08e09746f1f67a6f9217850188995ca86059a7942e36d8965a6730784901def777b7e8a436
+"@babel/helper-validator-option@npm:^7.24.7, @babel/helper-validator-option@npm:^7.24.8":
+  version: 7.24.8
+  resolution: "@babel/helper-validator-option@npm:7.24.8"
+  checksum: 10c0/73db93a34ae89201351288bee7623eed81a54000779462a986105b54ffe82069e764afd15171a428b82e7c7a9b5fec10b5d5603b216317a414062edf5c67a21f
   languageName: node
   linkType: hard
 
@@ -350,13 +350,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helpers@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/helpers@npm:7.24.7"
+"@babel/helpers@npm:^7.24.8":
+  version: 7.24.8
+  resolution: "@babel/helpers@npm:7.24.8"
   dependencies:
     "@babel/template": "npm:^7.24.7"
-    "@babel/types": "npm:^7.24.7"
-  checksum: 10c0/aa8e230f6668773e17e141dbcab63e935c514b4b0bf1fed04d2eaefda17df68e16b61a56573f7f1d4d1e605ce6cc162b5f7e9fdf159fde1fd9b77c920ae47d27
+    "@babel/types": "npm:^7.24.8"
+  checksum: 10c0/42b8939b0a0bf72d6df9721973eb0fd7cd48f42641c5c9c740916397faa586255c06d36c6e6a7e091860723096281c620f6ffaee0011a3bb254a6f5475d89a12
   languageName: node
   linkType: hard
 
@@ -372,12 +372,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/parser@npm:7.24.7"
+"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.24.7, @babel/parser@npm:^7.24.8":
+  version: 7.24.8
+  resolution: "@babel/parser@npm:7.24.8"
   bin:
     parser: ./bin/babel-parser.js
-  checksum: 10c0/8b244756872185a1c6f14b979b3535e682ff08cb5a2a5fd97cc36c017c7ef431ba76439e95e419d43000c5b07720495b00cf29a7f0d9a483643d08802b58819b
+  checksum: 10c0/ce69671de8fa6f649abf849be262707ac700b573b8b1ce1893c66cc6cd76aeb1294a19e8c290b0eadeb2f47d3f413a2e57a281804ffbe76bfb9fa50194cf3c52
   languageName: node
   linkType: hard
 
@@ -755,21 +755,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-classes@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/plugin-transform-classes@npm:7.24.7"
+"@babel/plugin-transform-classes@npm:^7.24.8":
+  version: 7.24.8
+  resolution: "@babel/plugin-transform-classes@npm:7.24.8"
   dependencies:
     "@babel/helper-annotate-as-pure": "npm:^7.24.7"
-    "@babel/helper-compilation-targets": "npm:^7.24.7"
+    "@babel/helper-compilation-targets": "npm:^7.24.8"
     "@babel/helper-environment-visitor": "npm:^7.24.7"
     "@babel/helper-function-name": "npm:^7.24.7"
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.8"
     "@babel/helper-replace-supers": "npm:^7.24.7"
     "@babel/helper-split-export-declaration": "npm:^7.24.7"
     globals: "npm:^11.1.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/e51dba7ce8b770d1eee929e098d5a3be3efc3e8b941e22dda7d0097dc4e7be5feabd2da7b707ac06fcac5661b31223c541941dec08ce76c1faa55544d87d06ec
+  checksum: 10c0/4423da0f747bdb6aab1995d98a74533fa679f637ec20706810dd57fb4ba2b1885ec8cae6a0b2c3f69f27165de6ff6aa2da9c4061c893848736a8267d0c653079
   languageName: node
   linkType: hard
 
@@ -785,14 +785,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-destructuring@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/plugin-transform-destructuring@npm:7.24.7"
+"@babel/plugin-transform-destructuring@npm:^7.24.8":
+  version: 7.24.8
+  resolution: "@babel/plugin-transform-destructuring@npm:7.24.8"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.8"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/929f07a807fb62230bfbf881cfcedf187ac5daf2f1b01da94a75c7a0f6f72400268cf4bcfee534479e43260af8193e42c31ee03c8b0278ba77d0036ed6709c27
+  checksum: 10c0/804968c1d5f5072c717505296c1e5d5ec33e90550423de66de82bbcb78157156e8470bbe77a04ab8c710a88a06360a30103cf223ac7eff4829adedd6150de5ce
   languageName: node
   linkType: hard
 
@@ -938,16 +938,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-modules-commonjs@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/plugin-transform-modules-commonjs@npm:7.24.7"
+"@babel/plugin-transform-modules-commonjs@npm:^7.24.7, @babel/plugin-transform-modules-commonjs@npm:^7.24.8":
+  version: 7.24.8
+  resolution: "@babel/plugin-transform-modules-commonjs@npm:7.24.8"
   dependencies:
-    "@babel/helper-module-transforms": "npm:^7.24.7"
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
+    "@babel/helper-module-transforms": "npm:^7.24.8"
+    "@babel/helper-plugin-utils": "npm:^7.24.8"
     "@babel/helper-simple-access": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/9442292b3daf6a5076cdc3c4c32bf423bda824ccaeb0dd0dc8b3effaa1fecfcb0130ae6e647fef12a5d5ff25bcc99a0d6bfc6d24a7525345e1bcf46fcdf81752
+  checksum: 10c0/f1cf552307ebfced20d3907c1dd8be941b277f0364aa655e2b5fee828c84c54065745183104dae86f1f93ea0406db970a463ef7ceaaed897623748e99640e5a7
   languageName: node
   linkType: hard
 
@@ -1062,16 +1062,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-optional-chaining@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/plugin-transform-optional-chaining@npm:7.24.7"
+"@babel/plugin-transform-optional-chaining@npm:^7.24.7, @babel/plugin-transform-optional-chaining@npm:^7.24.8":
+  version: 7.24.8
+  resolution: "@babel/plugin-transform-optional-chaining@npm:7.24.8"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.8"
     "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.24.7"
     "@babel/plugin-syntax-optional-chaining": "npm:^7.8.3"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/b9e3649b299e103b0d1767bbdba56574d065ff776e5350403b7bfd4e3982743c0cdb373d33bdbf94fa3c322d155e45d0aad946acf0aa741b870aed22dfec8b8e
+  checksum: 10c0/4ffbe1aad7dec7c9aa2bf6ceb4b2f91f96815b2784f2879bde80e46934f59d64a12cb2c6262e40897c4754d77d2c35d8a5cfed63044fdebf94978b1ed3d14b17
   languageName: node
   linkType: hard
 
@@ -1279,14 +1279,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-typeof-symbol@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/plugin-transform-typeof-symbol@npm:7.24.7"
+"@babel/plugin-transform-typeof-symbol@npm:^7.24.8":
+  version: 7.24.8
+  resolution: "@babel/plugin-transform-typeof-symbol@npm:7.24.8"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.8"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/5649e7260a138681e68b296ab5931e2b1f132f287d6b4131d49b24f9dc20d62902b7e9d63c4d2decd5683b41df35ef4b9b03f58c7f9f65e4c25a6d8bbf04e9e9
+  checksum: 10c0/2f570a4fbbdc5fd85f48165a97452826560051e3b8efb48c3bb0a0a33ee8485633439e7b71bfe3ef705583a1df43f854f49125bd759abdedc195b2cf7e60012a
   languageName: node
   linkType: hard
 
@@ -1352,13 +1352,13 @@ __metadata:
   linkType: hard
 
 "@babel/preset-env@npm:^7.11.0, @babel/preset-env@npm:^7.12.1, @babel/preset-env@npm:^7.22.4":
-  version: 7.24.7
-  resolution: "@babel/preset-env@npm:7.24.7"
+  version: 7.24.8
+  resolution: "@babel/preset-env@npm:7.24.8"
   dependencies:
-    "@babel/compat-data": "npm:^7.24.7"
-    "@babel/helper-compilation-targets": "npm:^7.24.7"
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
-    "@babel/helper-validator-option": "npm:^7.24.7"
+    "@babel/compat-data": "npm:^7.24.8"
+    "@babel/helper-compilation-targets": "npm:^7.24.8"
+    "@babel/helper-plugin-utils": "npm:^7.24.8"
+    "@babel/helper-validator-option": "npm:^7.24.8"
     "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "npm:^7.24.7"
     "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "npm:^7.24.7"
     "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "npm:^7.24.7"
@@ -1389,9 +1389,9 @@ __metadata:
     "@babel/plugin-transform-block-scoping": "npm:^7.24.7"
     "@babel/plugin-transform-class-properties": "npm:^7.24.7"
     "@babel/plugin-transform-class-static-block": "npm:^7.24.7"
-    "@babel/plugin-transform-classes": "npm:^7.24.7"
+    "@babel/plugin-transform-classes": "npm:^7.24.8"
     "@babel/plugin-transform-computed-properties": "npm:^7.24.7"
-    "@babel/plugin-transform-destructuring": "npm:^7.24.7"
+    "@babel/plugin-transform-destructuring": "npm:^7.24.8"
     "@babel/plugin-transform-dotall-regex": "npm:^7.24.7"
     "@babel/plugin-transform-duplicate-keys": "npm:^7.24.7"
     "@babel/plugin-transform-dynamic-import": "npm:^7.24.7"
@@ -1404,7 +1404,7 @@ __metadata:
     "@babel/plugin-transform-logical-assignment-operators": "npm:^7.24.7"
     "@babel/plugin-transform-member-expression-literals": "npm:^7.24.7"
     "@babel/plugin-transform-modules-amd": "npm:^7.24.7"
-    "@babel/plugin-transform-modules-commonjs": "npm:^7.24.7"
+    "@babel/plugin-transform-modules-commonjs": "npm:^7.24.8"
     "@babel/plugin-transform-modules-systemjs": "npm:^7.24.7"
     "@babel/plugin-transform-modules-umd": "npm:^7.24.7"
     "@babel/plugin-transform-named-capturing-groups-regex": "npm:^7.24.7"
@@ -1414,7 +1414,7 @@ __metadata:
     "@babel/plugin-transform-object-rest-spread": "npm:^7.24.7"
     "@babel/plugin-transform-object-super": "npm:^7.24.7"
     "@babel/plugin-transform-optional-catch-binding": "npm:^7.24.7"
-    "@babel/plugin-transform-optional-chaining": "npm:^7.24.7"
+    "@babel/plugin-transform-optional-chaining": "npm:^7.24.8"
     "@babel/plugin-transform-parameters": "npm:^7.24.7"
     "@babel/plugin-transform-private-methods": "npm:^7.24.7"
     "@babel/plugin-transform-private-property-in-object": "npm:^7.24.7"
@@ -1425,7 +1425,7 @@ __metadata:
     "@babel/plugin-transform-spread": "npm:^7.24.7"
     "@babel/plugin-transform-sticky-regex": "npm:^7.24.7"
     "@babel/plugin-transform-template-literals": "npm:^7.24.7"
-    "@babel/plugin-transform-typeof-symbol": "npm:^7.24.7"
+    "@babel/plugin-transform-typeof-symbol": "npm:^7.24.8"
     "@babel/plugin-transform-unicode-escapes": "npm:^7.24.7"
     "@babel/plugin-transform-unicode-property-regex": "npm:^7.24.7"
     "@babel/plugin-transform-unicode-regex": "npm:^7.24.7"
@@ -1434,11 +1434,11 @@ __metadata:
     babel-plugin-polyfill-corejs2: "npm:^0.4.10"
     babel-plugin-polyfill-corejs3: "npm:^0.10.4"
     babel-plugin-polyfill-regenerator: "npm:^0.6.1"
-    core-js-compat: "npm:^3.31.0"
+    core-js-compat: "npm:^3.37.1"
     semver: "npm:^6.3.1"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/c6714346f3ccc1271eaa90051c75b8bb57b20ef57408ab68740e2f3552693ae0ee5a4bcce3a00211d40e4947af1f7b8ab422066b953f0095461937fb72d11274
+  checksum: 10c0/a6f29498ec58989845a61f9c10b1b4e80586f1810a33db461d597cdb0ad2cd847381a993038b09f727512a08b2c1a33a330a5d4e6d65463ee98a1b4302d52ec6
   languageName: node
   linkType: hard
 
@@ -1503,11 +1503,11 @@ __metadata:
   linkType: hard
 
 "@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.0, @babel/runtime@npm:^7.12.13, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.13.8, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.2.0, @babel/runtime@npm:^7.20.13, @babel/runtime@npm:^7.22.3, @babel/runtime@npm:^7.3.1, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.6.3, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.8.7, @babel/runtime@npm:^7.9.2":
-  version: 7.24.7
-  resolution: "@babel/runtime@npm:7.24.7"
+  version: 7.24.8
+  resolution: "@babel/runtime@npm:7.24.8"
   dependencies:
     regenerator-runtime: "npm:^0.14.0"
-  checksum: 10c0/b6fa3ec61a53402f3c1d75f4d808f48b35e0dfae0ec8e2bb5c6fc79fb95935da75766e0ca534d0f1c84871f6ae0d2ebdd950727cfadb745a2cdbef13faef5513
+  checksum: 10c0/f24b30af6b3ecae19165b3b032f9bc37b2d1769677bd63b69a6f81061967cfc847aa822518402ea6616b1d301d7eb46986b99c9f69cdb5880834fca2e6b34881
   languageName: node
   linkType: hard
 
@@ -1522,32 +1522,32 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/traverse@npm:7, @babel/traverse@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/traverse@npm:7.24.7"
+"@babel/traverse@npm:7, @babel/traverse@npm:^7.24.7, @babel/traverse@npm:^7.24.8":
+  version: 7.24.8
+  resolution: "@babel/traverse@npm:7.24.8"
   dependencies:
     "@babel/code-frame": "npm:^7.24.7"
-    "@babel/generator": "npm:^7.24.7"
+    "@babel/generator": "npm:^7.24.8"
     "@babel/helper-environment-visitor": "npm:^7.24.7"
     "@babel/helper-function-name": "npm:^7.24.7"
     "@babel/helper-hoist-variables": "npm:^7.24.7"
     "@babel/helper-split-export-declaration": "npm:^7.24.7"
-    "@babel/parser": "npm:^7.24.7"
-    "@babel/types": "npm:^7.24.7"
+    "@babel/parser": "npm:^7.24.8"
+    "@babel/types": "npm:^7.24.8"
     debug: "npm:^4.3.1"
     globals: "npm:^11.1.0"
-  checksum: 10c0/a5135e589c3f1972b8877805f50a084a04865ccb1d68e5e1f3b94a8841b3485da4142e33413d8fd76bc0e6444531d3adf1f59f359c11ffac452b743d835068ab
+  checksum: 10c0/67a5cc35824455cdb54fb9e196a44b3186283e29018a9c2331f51763921e18e891b3c60c283615a27540ec8eb4c8b89f41c237b91f732a7aa518b2eb7a0d434d
   languageName: node
   linkType: hard
 
-"@babel/types@npm:^7.0.0, @babel/types@npm:^7.0.0-beta.49, @babel/types@npm:^7.12.11, @babel/types@npm:^7.12.6, @babel/types@npm:^7.20.7, @babel/types@npm:^7.24.7, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3":
-  version: 7.24.7
-  resolution: "@babel/types@npm:7.24.7"
+"@babel/types@npm:^7.0.0, @babel/types@npm:^7.0.0-beta.49, @babel/types@npm:^7.12.11, @babel/types@npm:^7.12.6, @babel/types@npm:^7.20.7, @babel/types@npm:^7.24.7, @babel/types@npm:^7.24.8, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3":
+  version: 7.24.8
+  resolution: "@babel/types@npm:7.24.8"
   dependencies:
-    "@babel/helper-string-parser": "npm:^7.24.7"
+    "@babel/helper-string-parser": "npm:^7.24.8"
     "@babel/helper-validator-identifier": "npm:^7.24.7"
     to-fast-properties: "npm:^2.0.0"
-  checksum: 10c0/d9ecbfc3eb2b05fb1e6eeea546836ac30d990f395ef3fe3f75ced777a222c3cfc4489492f72e0ce3d9a5a28860a1ce5f81e66b88cf5088909068b3ff4fab72c1
+  checksum: 10c0/2d7bf561ae993e794cb052c5a81d3a6d1877da13e1e2eb2a59ae75a8fb1c965b618fb3e4abd42548f5f9a4587d3a149185a32d6c4c4ea82195da7dd86f2da0f1
   languageName: node
   linkType: hard
 
@@ -5676,7 +5676,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"browserslist@npm:^4.0.0, browserslist@npm:^4.22.2, browserslist@npm:^4.23.0, browserslist@npm:^4.23.1":
+"browserslist@npm:^4.0.0, browserslist@npm:^4.23.0, browserslist@npm:^4.23.1":
   version: 4.23.1
   resolution: "browserslist@npm:4.23.1"
   dependencies:
@@ -6392,12 +6392,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"core-js-compat@npm:^3.31.0, core-js-compat@npm:^3.36.1":
-  version: 3.36.1
-  resolution: "core-js-compat@npm:3.36.1"
+"core-js-compat@npm:^3.36.1, core-js-compat@npm:^3.37.1":
+  version: 3.37.1
+  resolution: "core-js-compat@npm:3.37.1"
   dependencies:
     browserslist: "npm:^4.23.0"
-  checksum: 10c0/70fba18a4095cd8ac04e5ba8cee251e328935859cf2851c1f67770068ea9f9fe71accb1b7de17cd3c9a28d304a4c41712bd9aa895110ebb6e3be71b666b029d1
+  checksum: 10c0/4e2da9c900f2951a57947af7aeef4d16f2c75d7f7e966c0d0b62953f65225003ade5e84d3ae98847f65b24c109c606821d9dc925db8ca418fb761e7c81963c2a
   languageName: node
   linkType: hard
 

From 28ad3588e4936f3429e5f062c76c37f50a2f38fb Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 12 Jul 2024 08:25:27 +0000
Subject: [PATCH 1530/2191] New Crowdin Translations (automated) (#31006)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/be.json | 4 ++++
 config/locales/simple_form.da.yml       | 1 +
 config/locales/simple_form.de.yml       | 1 +
 config/locales/simple_form.es-AR.yml    | 1 +
 config/locales/simple_form.es-MX.yml    | 1 +
 config/locales/simple_form.es.yml       | 1 +
 config/locales/simple_form.fi.yml       | 1 +
 config/locales/simple_form.fo.yml       | 1 +
 config/locales/simple_form.gl.yml       | 1 +
 config/locales/simple_form.is.yml       | 1 +
 config/locales/simple_form.it.yml       | 1 +
 config/locales/simple_form.nl.yml       | 1 +
 config/locales/simple_form.pl.yml       | 1 +
 config/locales/simple_form.pt-PT.yml    | 1 +
 config/locales/simple_form.sl.yml       | 1 +
 config/locales/simple_form.sr-Latn.yml  | 1 +
 config/locales/simple_form.sr.yml       | 1 +
 config/locales/simple_form.tr.yml       | 1 +
 config/locales/simple_form.vi.yml       | 1 +
 config/locales/simple_form.zh-TW.yml    | 1 +
 20 files changed, 23 insertions(+)

diff --git a/app/javascript/mastodon/locales/be.json b/app/javascript/mastodon/locales/be.json
index 643725270c729a..df29fbd4184fdf 100644
--- a/app/javascript/mastodon/locales/be.json
+++ b/app/javascript/mastodon/locales/be.json
@@ -35,7 +35,9 @@
   "account.follow_back": "Падпісацца ў адказ",
   "account.followers": "Падпісчыкі",
   "account.followers.empty": "Ніхто пакуль не падпісаны на гэтага карыстальніка.",
+  "account.followers_counter": "{count, plural, one {{counter} падпісчык} few {{counter} падпісчыкі} many {{counter} падпісчыкаў} other {{counter} падпісчыка}}",
   "account.following": "Падпіскі",
+  "account.following_counter": "{count, plural, one {{counter} падпіска} few {{counter} падпіскі} many {{counter} падпісак} other {{counter} падпіскі}}",
   "account.follows.empty": "Карыстальнік ні на каго не падпісаны.",
   "account.go_to_profile": "Перайсці да профілю",
   "account.hide_reblogs": "Схаваць пашырэнні ад @{name}",
@@ -61,6 +63,7 @@
   "account.requested_follow": "{name} адправіў запыт на падпіску",
   "account.share": "Абагуліць профіль @{name}",
   "account.show_reblogs": "Паказаць падштурхоўванні ад @{name}",
+  "account.statuses_counter": "{count, plural, one {{counter} допіс} few {{counter} допісы} many {{counter} допісаў} other {{counter} допісу}}",
   "account.unblock": "Разблакіраваць @{name}",
   "account.unblock_domain": "Разблакіраваць дамен {domain}",
   "account.unblock_short": "Разблакіраваць",
@@ -412,6 +415,7 @@
   "limited_account_hint.title": "Гэты профіль быў схаваны мадэратарамі",
   "link_preview.author": "Ад {name}",
   "link_preview.more_from_author": "Больш ад {name}",
+  "link_preview.shares": "{count, plural, one {{counter} допіс} few {{counter} допісы} many {{counter} допісаў} other {{counter} допісу}}",
   "lists.account.add": "Дадаць да спісу",
   "lists.account.remove": "Выдаліць са спісу",
   "lists.delete": "Выдаліць спіс",
diff --git a/config/locales/simple_form.da.yml b/config/locales/simple_form.da.yml
index 0719e26430dd4c..73a32cf2fdee2d 100644
--- a/config/locales/simple_form.da.yml
+++ b/config/locales/simple_form.da.yml
@@ -211,6 +211,7 @@ da:
         setting_default_privacy: Fortrolighed for indlæg
         setting_default_sensitive: Markér altid medier som sensitive
         setting_delete_modal: Vis bekræftelsesdialog før et indlæg slettes
+        setting_disable_hover_cards: Deaktivér profilforhåndsvisning ved svæv (hover)
         setting_disable_swiping: Deaktivér strygebevægelser
         setting_display_media: Medievisning
         setting_display_media_default: Standard
diff --git a/config/locales/simple_form.de.yml b/config/locales/simple_form.de.yml
index 7d397866977712..5711d2a12a4993 100644
--- a/config/locales/simple_form.de.yml
+++ b/config/locales/simple_form.de.yml
@@ -211,6 +211,7 @@ de:
         setting_default_privacy: Beitragssichtbarkeit
         setting_default_sensitive: Medien immer mit einer Inhaltswarnung versehen
         setting_delete_modal: Bestätigungsdialog beim Löschen eines Beitrags anzeigen
+        setting_disable_hover_cards: Profilvorschau deaktivieren, wenn die Maus über das Profil bewegt wird
         setting_disable_swiping: Wischgesten deaktivieren
         setting_display_media: Darstellung von Medien
         setting_display_media_default: Standard
diff --git a/config/locales/simple_form.es-AR.yml b/config/locales/simple_form.es-AR.yml
index e346a23a0282e8..1d1ac876894f94 100644
--- a/config/locales/simple_form.es-AR.yml
+++ b/config/locales/simple_form.es-AR.yml
@@ -211,6 +211,7 @@ es-AR:
         setting_default_privacy: Privacidad de mensajes
         setting_default_sensitive: Siempre marcar medios como sensibles
         setting_delete_modal: Mostrar diálogo de confirmación antes de eliminar un mensaje
+        setting_disable_hover_cards: Deshabilitar previsualización del perfil al pasar el cursor
         setting_disable_swiping: Deshabilitar movimientos de deslizamiento
         setting_display_media: Visualización de medios
         setting_display_media_default: Predeterminada
diff --git a/config/locales/simple_form.es-MX.yml b/config/locales/simple_form.es-MX.yml
index b3c8a857e83411..19a1c9d0c095f9 100644
--- a/config/locales/simple_form.es-MX.yml
+++ b/config/locales/simple_form.es-MX.yml
@@ -211,6 +211,7 @@ es-MX:
         setting_default_privacy: Privacidad de publicaciones
         setting_default_sensitive: Marcar siempre imágenes como sensibles
         setting_delete_modal: Mostrar diálogo de confirmación antes de borrar un toot
+        setting_disable_hover_cards: Desactivar vista previa del perfil al pasar el cursor
         setting_disable_swiping: Deshabilitar movimientos de deslizamiento
         setting_display_media: Visualización multimedia
         setting_display_media_default: Por defecto
diff --git a/config/locales/simple_form.es.yml b/config/locales/simple_form.es.yml
index 2fb5cab987f793..cc71e192665609 100644
--- a/config/locales/simple_form.es.yml
+++ b/config/locales/simple_form.es.yml
@@ -211,6 +211,7 @@ es:
         setting_default_privacy: Privacidad de publicaciones
         setting_default_sensitive: Marcar siempre imágenes como sensibles
         setting_delete_modal: Mostrar diálogo de confirmación antes de borrar una publicación
+        setting_disable_hover_cards: Desactivar vista previa del perfil al pasar el cursor
         setting_disable_swiping: Deshabilitar movimientos de deslizamiento
         setting_display_media: Visualización multimedia
         setting_display_media_default: Por defecto
diff --git a/config/locales/simple_form.fi.yml b/config/locales/simple_form.fi.yml
index b0bc8c735b4881..214308ba5cc6e6 100644
--- a/config/locales/simple_form.fi.yml
+++ b/config/locales/simple_form.fi.yml
@@ -211,6 +211,7 @@ fi:
         setting_default_privacy: Julkaisun näkyvyys
         setting_default_sensitive: Merkitse media aina arkaluonteiseksi
         setting_delete_modal: Kysy vahvistusta ennen julkaisun poistamista
+        setting_disable_hover_cards: Poista käytöstä profiilin esikatselu osoitettaessa
         setting_disable_swiping: Poista pyyhkäisyeleet käytöstä
         setting_display_media: Median näyttäminen
         setting_display_media_default: Oletus
diff --git a/config/locales/simple_form.fo.yml b/config/locales/simple_form.fo.yml
index 7d4da2b51ee38e..8f0b51719fceed 100644
--- a/config/locales/simple_form.fo.yml
+++ b/config/locales/simple_form.fo.yml
@@ -211,6 +211,7 @@ fo:
         setting_default_privacy: Hvussu privatir eru postar?
         setting_default_sensitive: Merk altíð miðlafílur sum viðkvæmar
         setting_delete_modal: Vís váttanarmynd, áðrenn postar verða strikaðir
+        setting_disable_hover_cards: Ger undanvísing, tá músin verður flutt yvir vangan, óvirkna
         setting_disable_swiping: Ger sveipurørslur óvirknar
         setting_display_media: Vístir miðlar
         setting_display_media_default: Sjálvvirði
diff --git a/config/locales/simple_form.gl.yml b/config/locales/simple_form.gl.yml
index e46ccb8737fd09..0653d7620430ec 100644
--- a/config/locales/simple_form.gl.yml
+++ b/config/locales/simple_form.gl.yml
@@ -211,6 +211,7 @@ gl:
         setting_default_privacy: Privacidade da publicación
         setting_default_sensitive: Marcar sempre multimedia como sensible
         setting_delete_modal: Solicitar confirmación antes de eliminar unha publicación
+        setting_disable_hover_cards: Desactivar vista previa do perfil ao poñerse enriba
         setting_disable_swiping: Desactivar opcións de desprazamento
         setting_display_media: Mostrar multimedia
         setting_display_media_default: Por defecto
diff --git a/config/locales/simple_form.is.yml b/config/locales/simple_form.is.yml
index 044e24deb03ac9..cc267db8d5629e 100644
--- a/config/locales/simple_form.is.yml
+++ b/config/locales/simple_form.is.yml
@@ -211,6 +211,7 @@ is:
         setting_default_privacy: Gagnaleynd færslna
         setting_default_sensitive: Alltaf merkja myndefni sem viðkvæmt
         setting_delete_modal: Birta staðfestingarglugga áður en færslu er eytt
+        setting_disable_hover_cards: Gera óvirka forskoðun notandasniðs við yfirsvif
         setting_disable_swiping: Gera strokuhreyfingar óvirkar
         setting_display_media: Birting myndefnis
         setting_display_media_default: Sjálfgefið
diff --git a/config/locales/simple_form.it.yml b/config/locales/simple_form.it.yml
index f5624344b9a3e7..540812faa9958f 100644
--- a/config/locales/simple_form.it.yml
+++ b/config/locales/simple_form.it.yml
@@ -211,6 +211,7 @@ it:
         setting_default_privacy: Privacy dei post
         setting_default_sensitive: Segna sempre i media come sensibili
         setting_delete_modal: Mostra dialogo di conferma prima di eliminare un post
+        setting_disable_hover_cards: Disabilita l'anteprima del profilo al passaggio del mouse
         setting_disable_swiping: Disabilita i movimenti di scorrimento
         setting_display_media: Visualizzazione dei media
         setting_display_media_default: Predefinita
diff --git a/config/locales/simple_form.nl.yml b/config/locales/simple_form.nl.yml
index 2271d7037efa45..d6bdb7a6f0a488 100644
--- a/config/locales/simple_form.nl.yml
+++ b/config/locales/simple_form.nl.yml
@@ -211,6 +211,7 @@ nl:
         setting_default_privacy: Zichtbaarheid van nieuwe berichten
         setting_default_sensitive: Media altijd als gevoelig markeren
         setting_delete_modal: Vraag voor het verwijderen van een bericht een bevestiging
+        setting_disable_hover_cards: Profielvoorbeeld uitschakelen bij zweven
         setting_disable_swiping: Swipebewegingen uitschakelen
         setting_display_media: Mediaweergave
         setting_display_media_default: Standaard
diff --git a/config/locales/simple_form.pl.yml b/config/locales/simple_form.pl.yml
index 9d82384af9d4a9..b8de10de26a336 100644
--- a/config/locales/simple_form.pl.yml
+++ b/config/locales/simple_form.pl.yml
@@ -211,6 +211,7 @@ pl:
         setting_default_privacy: Widoczność wpisów
         setting_default_sensitive: Zawsze oznaczaj zawartość multimedialną jako wrażliwą
         setting_delete_modal: Pytaj o potwierdzenie przed usunięciem wpisu
+        setting_disable_hover_cards: Wyłącz podgląd profilu po najechaniu
         setting_disable_swiping: Wyłącz ruchy przesuwania
         setting_display_media: Wyświetlanie zawartości multimedialnej
         setting_display_media_default: Domyślne
diff --git a/config/locales/simple_form.pt-PT.yml b/config/locales/simple_form.pt-PT.yml
index 7fcbb210c5b145..f993687b91bee4 100644
--- a/config/locales/simple_form.pt-PT.yml
+++ b/config/locales/simple_form.pt-PT.yml
@@ -211,6 +211,7 @@ pt-PT:
         setting_default_privacy: Privacidade da publicação
         setting_default_sensitive: Marcar sempre os media como problemáticos
         setting_delete_modal: Solicitar confirmação antes de eliminar uma publicação
+        setting_disable_hover_cards: Desativar visualização de perfil ao passar o cursor
         setting_disable_swiping: Desativar os movimentos de deslize
         setting_display_media: Visualização de media
         setting_display_media_default: Pré-definição
diff --git a/config/locales/simple_form.sl.yml b/config/locales/simple_form.sl.yml
index 96b36307a5795d..1e3f3046ad3256 100644
--- a/config/locales/simple_form.sl.yml
+++ b/config/locales/simple_form.sl.yml
@@ -211,6 +211,7 @@ sl:
         setting_default_privacy: Zasebnost objave
         setting_default_sensitive: Vedno označi medije kot občutljive
         setting_delete_modal: Pred brisanjem objave prikaži okno za pritrditev
+        setting_disable_hover_cards: Onemogoči predogled profila pod kazalko
         setting_disable_swiping: Onemogoči poteze drsanja
         setting_display_media: Prikaz medijev
         setting_display_media_default: Privzeto
diff --git a/config/locales/simple_form.sr-Latn.yml b/config/locales/simple_form.sr-Latn.yml
index 710f81e84fd1bd..22c07aa7c65938 100644
--- a/config/locales/simple_form.sr-Latn.yml
+++ b/config/locales/simple_form.sr-Latn.yml
@@ -211,6 +211,7 @@ sr-Latn:
         setting_default_privacy: Privatnost objava
         setting_default_sensitive: Uvek označi multimediju kao osetljivu
         setting_delete_modal: Prikaži dijalog za potvrdu pre brisanja objave
+        setting_disable_hover_cards: Onemogući pregled profila prelaskom kursora
         setting_disable_swiping: Onemogući pokrete prevlačenja
         setting_display_media: Prikaz medija
         setting_display_media_default: Podrazumevano
diff --git a/config/locales/simple_form.sr.yml b/config/locales/simple_form.sr.yml
index c5fbc9185a517e..10c1796637e999 100644
--- a/config/locales/simple_form.sr.yml
+++ b/config/locales/simple_form.sr.yml
@@ -211,6 +211,7 @@ sr:
         setting_default_privacy: Приватност објава
         setting_default_sensitive: Увек означи мултимедију као осетљиву
         setting_delete_modal: Прикажи дијалог за потврду пре брисања објаве
+        setting_disable_hover_cards: Онемогући преглед профила преласком курсора
         setting_disable_swiping: Онемогући покрете превлачења
         setting_display_media: Приказ медија
         setting_display_media_default: Подразумевано
diff --git a/config/locales/simple_form.tr.yml b/config/locales/simple_form.tr.yml
index 697417a5415956..b1e90122eca499 100644
--- a/config/locales/simple_form.tr.yml
+++ b/config/locales/simple_form.tr.yml
@@ -211,6 +211,7 @@ tr:
         setting_default_privacy: Gönderi gizliliği
         setting_default_sensitive: Medyayı her zaman hassas olarak işaretle
         setting_delete_modal: Bir gönderiyi silmeden önce onay iletişim kutusu göster
+        setting_disable_hover_cards: Üstüne geldiğinde profil önizlemesini devre dışı bırak
         setting_disable_swiping: Kaydırma hareketlerini devre dışı bırak
         setting_display_media: Medya görüntüleme
         setting_display_media_default: Varsayılan
diff --git a/config/locales/simple_form.vi.yml b/config/locales/simple_form.vi.yml
index e5063e611225de..9006156db1a4c7 100644
--- a/config/locales/simple_form.vi.yml
+++ b/config/locales/simple_form.vi.yml
@@ -211,6 +211,7 @@ vi:
         setting_default_privacy: Kiểu đăng
         setting_default_sensitive: Đánh dấu media nhạy cảm
         setting_delete_modal: Hỏi trước khi xóa tút
+        setting_disable_hover_cards: Tắt thẻ xem trước hồ sơ
         setting_disable_swiping: Không dùng chuyển động vuốt
         setting_display_media: Media nhạy cảm
         setting_display_media_default: Mặc định
diff --git a/config/locales/simple_form.zh-TW.yml b/config/locales/simple_form.zh-TW.yml
index b7a67c6a6fb8a9..7c460a25f58e24 100644
--- a/config/locales/simple_form.zh-TW.yml
+++ b/config/locales/simple_form.zh-TW.yml
@@ -211,6 +211,7 @@ zh-TW:
         setting_default_privacy: 嘟文隱私設定
         setting_default_sensitive: 總是將媒體標記為敏感內容
         setting_delete_modal: 刪除嘟文前先詢問我
+        setting_disable_hover_cards: 停用於滑鼠懸停時預覽個人檔案
         setting_disable_swiping: 停用滑動手勢
         setting_display_media: 媒體顯示
         setting_display_media_default: 預設

From 43e24dbb13f497cf13bf301e40f8790ba5960f2d Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 12 Jul 2024 04:30:52 -0400
Subject: [PATCH 1531/2191] Use `include_pagination_headers` in more places
 (#30999)

---
 .../requests/api/v1/accounts/statuses_spec.rb | 50 ++++++-------------
 spec/requests/api/v1/conversations_spec.rb    |  8 ++-
 .../statuses/favourited_by_accounts_spec.rb   |  6 ++-
 .../v1/statuses/reblogged_by_accounts_spec.rb |  6 ++-
 spec/requests/api/v2/admin/accounts_spec.rb   |  3 +-
 5 files changed, 31 insertions(+), 42 deletions(-)

diff --git a/spec/requests/api/v1/accounts/statuses_spec.rb b/spec/requests/api/v1/accounts/statuses_spec.rb
index 371867b21572c4..97cdbe0156f7b0 100644
--- a/spec/requests/api/v1/accounts/statuses_spec.rb
+++ b/spec/requests/api/v1/accounts/statuses_spec.rb
@@ -10,12 +10,15 @@
 
   describe 'GET /api/v1/accounts/:account_id/statuses' do
     it 'returns expected headers', :aggregate_failures do
-      Fabricate(:status, account: user.account)
+      status = Fabricate(:status, account: user.account)
       get "/api/v1/accounts/#{user.account.id}/statuses", params: { limit: 1 }, headers: headers
 
-      expect(response).to have_http_status(200)
-      expect(links_from_header.size)
-        .to eq(2)
+      expect(response)
+        .to have_http_status(200)
+        .and include_pagination_headers(
+          prev: api_v1_account_statuses_url(limit: 1, min_id: status.id),
+          next: api_v1_account_statuses_url(limit: 1, max_id: status.id)
+        )
     end
 
     context 'with only media' do
@@ -55,16 +58,9 @@
       it 'returns http success and includes a header link' do
         get "/api/v1/accounts/#{user.account.id}/statuses", params: { pinned: true }, headers: headers
 
-        expect(response).to have_http_status(200)
-        expect(links_from_header.size)
-          .to eq(1)
-        expect(links_from_header)
-          .to contain_exactly(
-            have_attributes(
-              href: /pinned=true/,
-              attr_pairs: contain_exactly(['rel', 'prev'])
-            )
-          )
+        expect(response)
+          .to have_http_status(200)
+          .and include_pagination_headers(prev: api_v1_account_statuses_url(pinned: true, min_id: Status.first.id))
       end
     end
 
@@ -77,19 +73,11 @@
       it 'returns http success and header pagination links to prev and next' do
         get "/api/v1/accounts/#{user.account.id}/statuses", params: { pinned: true }, headers: headers
 
-        expect(response).to have_http_status(200)
-        expect(links_from_header.size)
-          .to eq(2)
-        expect(links_from_header)
-          .to contain_exactly(
-            have_attributes(
-              href: /pinned=true/,
-              attr_pairs: contain_exactly(['rel', 'next'])
-            ),
-            have_attributes(
-              href: /pinned=true/,
-              attr_pairs: contain_exactly(['rel', 'prev'])
-            )
+        expect(response)
+          .to have_http_status(200)
+          .and include_pagination_headers(
+            prev: api_v1_account_statuses_url(pinned: true, min_id: Status.first.id),
+            next: api_v1_account_statuses_url(pinned: true, max_id: Status.first.id)
           )
       end
     end
@@ -138,12 +126,4 @@
       end
     end
   end
-
-  private
-
-  def links_from_header
-    response
-      .headers['Link']
-      .links
-  end
 end
diff --git a/spec/requests/api/v1/conversations_spec.rb b/spec/requests/api/v1/conversations_spec.rb
index f4776f18d97453..f136e1f4e84dfd 100644
--- a/spec/requests/api/v1/conversations_spec.rb
+++ b/spec/requests/api/v1/conversations_spec.rb
@@ -20,8 +20,12 @@
     it 'returns pagination headers', :aggregate_failures do
       get '/api/v1/conversations', params: { limit: 1 }, headers: headers
 
-      expect(response).to have_http_status(200)
-      expect(response.headers['Link'].links.size).to eq(2)
+      expect(response)
+        .to have_http_status(200)
+        .and include_pagination_headers(
+          prev: api_v1_conversations_url(limit: 1, min_id: Status.first.id),
+          next: api_v1_conversations_url(limit: 1, max_id: Status.first.id)
+        )
     end
 
     it 'returns conversations', :aggregate_failures do
diff --git a/spec/requests/api/v1/statuses/favourited_by_accounts_spec.rb b/spec/requests/api/v1/statuses/favourited_by_accounts_spec.rb
index 44296f4c37e5d5..2fd79f424b12b6 100644
--- a/spec/requests/api/v1/statuses/favourited_by_accounts_spec.rb
+++ b/spec/requests/api/v1/statuses/favourited_by_accounts_spec.rb
@@ -29,8 +29,10 @@
 
         expect(response)
           .to have_http_status(200)
-        expect(response.headers['Link'].links.size)
-          .to eq(2)
+          .and include_pagination_headers(
+            prev: api_v1_status_favourited_by_index_url(limit: 2, since_id: Favourite.last.id),
+            next: api_v1_status_favourited_by_index_url(limit: 2, max_id: Favourite.first.id)
+          )
 
         expect(body_as_json.size)
           .to eq(2)
diff --git a/spec/requests/api/v1/statuses/reblogged_by_accounts_spec.rb b/spec/requests/api/v1/statuses/reblogged_by_accounts_spec.rb
index 6f99ce94646670..5fc54042f91a8f 100644
--- a/spec/requests/api/v1/statuses/reblogged_by_accounts_spec.rb
+++ b/spec/requests/api/v1/statuses/reblogged_by_accounts_spec.rb
@@ -28,8 +28,10 @@
 
         expect(response)
           .to have_http_status(200)
-        expect(response.headers['Link'].links.size)
-          .to eq(2)
+          .and include_pagination_headers(
+            prev: api_v1_status_reblogged_by_index_url(limit: 2, since_id: bob.statuses.first.id),
+            next: api_v1_status_reblogged_by_index_url(limit: 2, max_id: alice.statuses.first.id)
+          )
 
         expect(body_as_json.size)
           .to eq(2)
diff --git a/spec/requests/api/v2/admin/accounts_spec.rb b/spec/requests/api/v2/admin/accounts_spec.rb
index f5db93233c2012..8f52c6a6134ed6 100644
--- a/spec/requests/api/v2/admin/accounts_spec.rb
+++ b/spec/requests/api/v2/admin/accounts_spec.rb
@@ -83,7 +83,8 @@ def body_json_ids
       let(:params) { { limit: 1 } }
 
       it 'sets the correct pagination headers' do
-        expect(response.headers['Link'].find_link(%w(rel next)).href).to eq api_v2_admin_accounts_url(limit: 1, max_id: admin_account.id)
+        expect(response)
+          .to include_pagination_headers(next: api_v2_admin_accounts_url(limit: 1, max_id: admin_account.id))
       end
     end
   end

From 9cc0607358dda4e3dd46e7bcee05e6545175f626 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 12 Jul 2024 11:29:10 +0200
Subject: [PATCH 1532/2191] chore(deps): update dependency
 database_cleaner-active_record to v2.2.0 (#31007)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 2d085152e861b0..8bb16206460927 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -180,7 +180,7 @@ GEM
     css_parser (1.17.1)
       addressable
     csv (3.3.0)
-    database_cleaner-active_record (2.1.0)
+    database_cleaner-active_record (2.2.0)
       activerecord (>= 5.a)
       database_cleaner-core (~> 2.0.0)
     database_cleaner-core (2.0.1)

From c929b4cace3f95fe54fdafe449ea7e972c8d61e8 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 12 Jul 2024 11:29:43 +0200
Subject: [PATCH 1533/2191] chore(deps): update dependency pghero to v3.6.0
 (#30994)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 8bb16206460927..5c673a6282094c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -590,8 +590,8 @@ GEM
     pastel (0.8.0)
       tty-color (~> 0.5)
     pg (1.5.6)
-    pghero (3.5.0)
-      activerecord (>= 6)
+    pghero (3.6.0)
+      activerecord (>= 6.1)
     premailer (1.23.0)
       addressable
       css_parser (>= 1.12.0)

From 8d2a93b0cba756d1fffdbc6f2d2ffa39b571044b Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 11 Jul 2024 21:42:58 +0200
Subject: [PATCH 1534/2191] [Glitch] Add setting to disable hover cards

Port ad52b04a1c88574ae3be2c56bead1b0638b253fc to glitch-soc

Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
---
 app/javascript/flavours/glitch/components/status_content.jsx | 2 +-
 app/javascript/flavours/glitch/components/status_header.jsx  | 1 +
 app/javascript/flavours/glitch/features/ui/index.jsx         | 4 ++--
 app/javascript/flavours/glitch/initial_state.js              | 2 ++
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/javascript/flavours/glitch/components/status_content.jsx b/app/javascript/flavours/glitch/components/status_content.jsx
index c28f85eb724236..634ab0db29a061 100644
--- a/app/javascript/flavours/glitch/components/status_content.jsx
+++ b/app/javascript/flavours/glitch/components/status_content.jsx
@@ -181,7 +181,7 @@ class StatusContent extends PureComponent {
 
       if (mention) {
         link.addEventListener('click', this.onMentionClick.bind(this, mention), false);
-        link.removeAttribute('title');
+        link.setAttribute('title', `@${mention.get('acct')}`);
         link.setAttribute('data-hover-card-account', mention.get('id'));
         if (rewriteMentions !== 'no') {
           while (link.firstChild) link.removeChild(link.firstChild);
diff --git a/app/javascript/flavours/glitch/components/status_header.jsx b/app/javascript/flavours/glitch/components/status_header.jsx
index ee4573659c4c83..2dd09d68ef80a7 100644
--- a/app/javascript/flavours/glitch/components/status_header.jsx
+++ b/app/javascript/flavours/glitch/components/status_header.jsx
@@ -51,6 +51,7 @@ export default class StatusHeader extends PureComponent {
         target='_blank'
         onClick={this.handleAccountClick}
         rel='noopener noreferrer'
+        title={status.getIn(['account', 'acct'])}
         data-hover-card-account={status.getIn(['account', 'id'])}
       >
         <div className='status__avatar'>
diff --git a/app/javascript/flavours/glitch/features/ui/index.jsx b/app/javascript/flavours/glitch/features/ui/index.jsx
index 747922f23e2dc9..221f789a315995 100644
--- a/app/javascript/flavours/glitch/features/ui/index.jsx
+++ b/app/javascript/flavours/glitch/features/ui/index.jsx
@@ -27,7 +27,7 @@ import { clearHeight } from '../../actions/height_cache';
 import { expandNotifications, notificationsSetVisibility } from '../../actions/notifications';
 import { fetchServer, fetchServerTranslationLanguages } from '../../actions/server';
 import { expandHomeTimeline } from '../../actions/timelines';
-import initialState, { me, owner, singleUserMode, trendsEnabled, trendsAsLanding } from '../../initial_state';
+import initialState, { me, owner, singleUserMode, trendsEnabled, trendsAsLanding, disableHoverCards } from '../../initial_state';
 
 import BundleColumnError from './components/bundle_column_error';
 import Header from './components/header';
@@ -651,7 +651,7 @@ class UI extends PureComponent {
 
           {layout !== 'mobile' && <PictureInPicture />}
           <NotificationsContainer />
-          <HoverCardController />
+          {!disableHoverCards && <HoverCardController />}
           <LoadingBarContainer className='loading-bar' />
           <ModalContainer />
           <UploadArea active={draggingOver} onClose={this.closeUploadModal} />
diff --git a/app/javascript/flavours/glitch/initial_state.js b/app/javascript/flavours/glitch/initial_state.js
index 4492813fd3a6ce..c5628f51ce475c 100644
--- a/app/javascript/flavours/glitch/initial_state.js
+++ b/app/javascript/flavours/glitch/initial_state.js
@@ -17,6 +17,7 @@
  * @property {boolean} crop_images
  * @property {boolean=} delete_modal
  * @property {boolean=} disable_swiping
+ * @property {boolean=} disable_hover_cards
  * @property {string=} disabled_account_id
  * @property {string} display_media
  * @property {string} domain
@@ -106,6 +107,7 @@ export const boostModal = getMeta('boost_modal');
 export const cropImages = getMeta('crop_images');
 export const deleteModal = getMeta('delete_modal');
 export const disableSwiping = getMeta('disable_swiping');
+export const disableHoverCards = getMeta('disable_hover_cards');
 export const disabledAccountId = getMeta('disabled_account_id');
 export const displayMedia = getMeta('display_media');
 export const domain = getMeta('domain');

From 35a437a03f4e1f606afea8953f0be62807da91cc Mon Sep 17 00:00:00 2001
From: David Roetzel <david@roetzel.de>
Date: Fri, 12 Jul 2024 14:09:52 +0200
Subject: [PATCH 1535/2191] Destroy `NotificationRequest`s that are dismissed
 (#31008)

---
 .../v1/notifications/requests_controller.rb   |  8 ++---
 app/models/notification_policy.rb             |  2 +-
 app/models/notification_request.rb            |  5 ++-
 ...ve_dismissed_from_notification_requests.rb | 14 ++++++++
 db/schema.rb                                  |  4 +--
 .../notification_request_fabricator.rb        |  1 -
 spec/models/notification_request_spec.rb      | 12 +------
 .../api/v1/notifications/requests_spec.rb     | 18 ++--------
 spec/services/notify_service_spec.rb          | 33 +++++++++++++++++++
 9 files changed, 57 insertions(+), 40 deletions(-)
 create mode 100644 db/post_migrate/20240712064044_remove_dismissed_from_notification_requests.rb

diff --git a/app/controllers/api/v1/notifications/requests_controller.rb b/app/controllers/api/v1/notifications/requests_controller.rb
index 0e58379a382e85..9ae80c28ed0732 100644
--- a/app/controllers/api/v1/notifications/requests_controller.rb
+++ b/app/controllers/api/v1/notifications/requests_controller.rb
@@ -28,14 +28,14 @@ def accept
   end
 
   def dismiss
-    @request.update!(dismissed: true)
+    @request.destroy!
     render_empty
   end
 
   private
 
   def load_requests
-    requests = NotificationRequest.where(account: current_account).where(dismissed: truthy_param?(:dismissed) || false).includes(:last_status, from_account: [:account_stat, :user]).to_a_paginated_by_id(
+    requests = NotificationRequest.where(account: current_account).includes(:last_status, from_account: [:account_stat, :user]).to_a_paginated_by_id(
       limit_param(DEFAULT_ACCOUNTS_LIMIT),
       params_slice(:max_id, :since_id, :min_id)
     )
@@ -68,8 +68,4 @@ def pagination_max_id
   def pagination_since_id
     @requests.first.id
   end
-
-  def pagination_params(core_params)
-    params.slice(:dismissed).permit(:dismissed).merge(core_params)
-  end
 end
diff --git a/app/models/notification_policy.rb b/app/models/notification_policy.rb
index f10b0c2a816e9e..2bb58004e37fad 100644
--- a/app/models/notification_policy.rb
+++ b/app/models/notification_policy.rb
@@ -31,6 +31,6 @@ def summarize!
   private
 
   def pending_notification_requests
-    @pending_notification_requests ||= notification_requests.where(dismissed: false).limit(MAX_MEANINGFUL_COUNT).pick(Arel.sql('count(*), coalesce(sum(notifications_count), 0)::bigint'))
+    @pending_notification_requests ||= notification_requests.limit(MAX_MEANINGFUL_COUNT).pick(Arel.sql('count(*), coalesce(sum(notifications_count), 0)::bigint'))
   end
 end
diff --git a/app/models/notification_request.rb b/app/models/notification_request.rb
index 6e9cae66255032..2f601ac36b7f82 100644
--- a/app/models/notification_request.rb
+++ b/app/models/notification_request.rb
@@ -9,12 +9,13 @@
 #  from_account_id     :bigint(8)        not null
 #  last_status_id      :bigint(8)
 #  notifications_count :bigint(8)        default(0), not null
-#  dismissed           :boolean          default(FALSE), not null
 #  created_at          :datetime         not null
 #  updated_at          :datetime         not null
 #
 
 class NotificationRequest < ApplicationRecord
+  self.ignored_columns += %w(dismissed)
+
   include Paginable
 
   MAX_MEANINGFUL_COUNT = 100
@@ -34,8 +35,6 @@ def self.preload_cache_collection(requests)
   end
 
   def reconsider_existence!
-    return if dismissed?
-
     prepare_notifications_count
 
     if notifications_count.positive?
diff --git a/db/post_migrate/20240712064044_remove_dismissed_from_notification_requests.rb b/db/post_migrate/20240712064044_remove_dismissed_from_notification_requests.rb
new file mode 100644
index 00000000000000..0d858380730ec4
--- /dev/null
+++ b/db/post_migrate/20240712064044_remove_dismissed_from_notification_requests.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class RemoveDismissedFromNotificationRequests < ActiveRecord::Migration[7.1]
+  def up
+    safety_assured do
+      execute 'DELETE FROM notification_requests WHERE dismissed'
+      remove_column :notification_requests, :dismissed
+    end
+  end
+
+  def down
+    add_column :notification_requests, :dismissed, :boolean, default: false, null: false
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 5f8c7e693f466d..87c49d74152358 100644
--- 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_06_07_094856) do
+ActiveRecord::Schema[7.1].define(version: 2024_07_12_064044) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -706,11 +706,9 @@
     t.bigint "from_account_id", null: false
     t.bigint "last_status_id"
     t.bigint "notifications_count", default: 0, null: false
-    t.boolean "dismissed", default: false, null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.index ["account_id", "from_account_id"], name: "index_notification_requests_on_account_id_and_from_account_id", unique: true
-    t.index ["account_id", "id"], name: "index_notification_requests_on_account_id_and_id", order: { id: :desc }, where: "(dismissed = false)"
     t.index ["from_account_id"], name: "index_notification_requests_on_from_account_id"
     t.index ["last_status_id"], name: "index_notification_requests_on_last_status_id"
   end
diff --git a/spec/fabricators/notification_request_fabricator.rb b/spec/fabricators/notification_request_fabricator.rb
index 05a13b8ef8010d..a20d3b3ef2b83d 100644
--- a/spec/fabricators/notification_request_fabricator.rb
+++ b/spec/fabricators/notification_request_fabricator.rb
@@ -4,5 +4,4 @@
   account
   from_account { Fabricate.build(:account) }
   last_status { Fabricate.build(:status) }
-  dismissed false
 end
diff --git a/spec/models/notification_request_spec.rb b/spec/models/notification_request_spec.rb
index 07bbc3e0a8e7e9..4adddc194f015c 100644
--- a/spec/models/notification_request_spec.rb
+++ b/spec/models/notification_request_spec.rb
@@ -4,9 +4,7 @@
 
 RSpec.describe NotificationRequest do
   describe '#reconsider_existence!' do
-    subject { Fabricate(:notification_request, dismissed: dismissed) }
-
-    let(:dismissed) { false }
+    subject { Fabricate(:notification_request) }
 
     context 'when there are remaining notifications' do
       before do
@@ -28,14 +26,6 @@
         subject.reconsider_existence!
       end
 
-      context 'when dismissed' do
-        let(:dismissed) { true }
-
-        it 'leaves request intact' do
-          expect(subject.destroyed?).to be false
-        end
-      end
-
       it 'removes the request' do
         expect(subject.destroyed?).to be true
       end
diff --git a/spec/requests/api/v1/notifications/requests_spec.rb b/spec/requests/api/v1/notifications/requests_spec.rb
index 23ddfd2bdabe45..d3a9753246a2ec 100644
--- a/spec/requests/api/v1/notifications/requests_spec.rb
+++ b/spec/requests/api/v1/notifications/requests_spec.rb
@@ -17,7 +17,6 @@
 
     before do
       Fabricate(:notification_request, account: user.account)
-      Fabricate(:notification_request, account: user.account, dismissed: true)
     end
 
     it_behaves_like 'forbidden for wrong scope', 'write write:notifications'
@@ -29,16 +28,6 @@
         expect(response).to have_http_status(200)
       end
     end
-
-    context 'with dismissed' do
-      let(:params) { { dismissed: '1' } }
-
-      it 'returns http success', :aggregate_failures do
-        subject
-
-        expect(response).to have_http_status(200)
-      end
-    end
   end
 
   describe 'POST /api/v1/notifications/requests/:id/accept' do
@@ -78,15 +67,14 @@
       post "/api/v1/notifications/requests/#{notification_request.id}/dismiss", headers: headers
     end
 
-    let(:notification_request) { Fabricate(:notification_request, account: user.account) }
+    let!(:notification_request) { Fabricate(:notification_request, account: user.account) }
 
     it_behaves_like 'forbidden for wrong scope', 'read read:notifications'
 
-    it 'returns http success and dismisses the notification request', :aggregate_failures do
-      subject
+    it 'returns http success and destroys the notification request', :aggregate_failures do
+      expect { subject }.to change(NotificationRequest, :count).by(-1)
 
       expect(response).to have_http_status(200)
-      expect(notification_request.reload.dismissed?).to be true
     end
 
     context 'when notification request belongs to someone else' do
diff --git a/spec/services/notify_service_spec.rb b/spec/services/notify_service_spec.rb
index c695855bec0d1c..c7e00129b2cf22 100644
--- a/spec/services/notify_service_spec.rb
+++ b/spec/services/notify_service_spec.rb
@@ -129,6 +129,39 @@
     end
   end
 
+  context 'with filtered notifications' do
+    let(:unknown)  { Fabricate(:account, username: 'unknown') }
+    let(:status)   { Fabricate(:status, account: unknown) }
+    let(:activity) { Fabricate(:mention, account: recipient, status: status) }
+    let(:type)     { :mention }
+
+    before do
+      Fabricate(:notification_policy, account: recipient, filter_not_following: true)
+    end
+
+    it 'creates a filtered notification' do
+      expect { subject }.to change(Notification, :count)
+      expect(Notification.last).to be_filtered
+    end
+
+    context 'when no notification request exists' do
+      it 'creates a notification request' do
+        expect { subject }.to change(NotificationRequest, :count)
+      end
+    end
+
+    context 'when a notification request exists' do
+      let!(:notification_request) do
+        Fabricate(:notification_request, account: recipient, from_account: unknown, last_status: Fabricate(:status, account: unknown))
+      end
+
+      it 'updates the existing notification request' do
+        expect { subject }.to_not change(NotificationRequest, :count)
+        expect(notification_request.reload.last_status).to eq status
+      end
+    end
+  end
+
   describe NotifyService::DismissCondition do
     subject { described_class.new(notification) }
 

From b87c41115e99becdfc8a6a66300b4fc6fe39bf3b Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 12 Jul 2024 14:20:32 +0200
Subject: [PATCH 1536/2191] chore(deps): update dependency rubocop-rspec to
 v3.0.3 (#31009)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 5c673a6282094c..98a3571731fedd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -756,7 +756,7 @@ GEM
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rspec (3.0.2)
+    rubocop-rspec (3.0.3)
       rubocop (~> 1.61)
     rubocop-rspec_rails (2.30.0)
       rubocop (~> 1.61)

From c953dca1dee71f32b547e68977568cd076a6f7ae Mon Sep 17 00:00:00 2001
From: Emelia Smith <ThisIsMissEm@users.noreply.github.com>
Date: Fri, 12 Jul 2024 14:23:09 +0200
Subject: [PATCH 1537/2191] Streaming: use pgPool.query instead of manually
 acquiring & releasing a connection (#30964)

---
 streaming/index.js | 79 +++++++++++++++-------------------------------
 1 file changed, 25 insertions(+), 54 deletions(-)

diff --git a/streaming/index.js b/streaming/index.js
index 2ba8b1540781b4..dd9ea0c7f68348 100644
--- a/streaming/index.js
+++ b/streaming/index.js
@@ -524,43 +524,27 @@ const startServer = async () => {
    * @param {any} req
    * @returns {Promise<ResolvedAccount>}
    */
-  const accountFromToken = (token, req) => new Promise((resolve, reject) => {
-    pgPool.connect((err, client, done) => {
-      if (err) {
-        reject(err);
-        return;
-      }
-
-      // @ts-ignore
-      client.query('SELECT oauth_access_tokens.id, oauth_access_tokens.resource_owner_id, users.account_id, users.chosen_languages, oauth_access_tokens.scopes, devices.device_id FROM oauth_access_tokens INNER JOIN users ON oauth_access_tokens.resource_owner_id = users.id LEFT OUTER JOIN devices ON oauth_access_tokens.id = devices.access_token_id WHERE oauth_access_tokens.token = $1 AND oauth_access_tokens.revoked_at IS NULL LIMIT 1', [token], (err, result) => {
-        done();
-
-        if (err) {
-          reject(err);
-          return;
-        }
+  const accountFromToken = async (token, req) => {
+    const result = await pgPool.query('SELECT oauth_access_tokens.id, oauth_access_tokens.resource_owner_id, users.account_id, users.chosen_languages, oauth_access_tokens.scopes, devices.device_id FROM oauth_access_tokens INNER JOIN users ON oauth_access_tokens.resource_owner_id = users.id LEFT OUTER JOIN devices ON oauth_access_tokens.id = devices.access_token_id WHERE oauth_access_tokens.token = $1 AND oauth_access_tokens.revoked_at IS NULL LIMIT 1', [token]);
 
-        if (result.rows.length === 0) {
-          reject(new AuthenticationError('Invalid access token'));
-          return;
-        }
-
-        req.accessTokenId = result.rows[0].id;
-        req.scopes = result.rows[0].scopes.split(' ');
-        req.accountId = result.rows[0].account_id;
-        req.chosenLanguages = result.rows[0].chosen_languages;
-        req.deviceId = result.rows[0].device_id;
+    if (result.rows.length === 0) {
+      throw new AuthenticationError('Invalid access token');
+    }
 
-        resolve({
-          accessTokenId: result.rows[0].id,
-          scopes: result.rows[0].scopes.split(' '),
-          accountId: result.rows[0].account_id,
-          chosenLanguages: result.rows[0].chosen_languages,
-          deviceId: result.rows[0].device_id
-        });
-      });
-    });
-  });
+    req.accessTokenId = result.rows[0].id;
+    req.scopes = result.rows[0].scopes.split(' ');
+    req.accountId = result.rows[0].account_id;
+    req.chosenLanguages = result.rows[0].chosen_languages;
+    req.deviceId = result.rows[0].device_id;
+
+    return {
+      accessTokenId: result.rows[0].id,
+      scopes: result.rows[0].scopes.split(' '),
+      accountId: result.rows[0].account_id,
+      chosenLanguages: result.rows[0].chosen_languages,
+      deviceId: result.rows[0].device_id
+    };
+  };
 
   /**
    * @param {any} req
@@ -771,28 +755,15 @@ const startServer = async () => {
    * @param {any} req
    * @returns {Promise.<void>}
    */
-  const authorizeListAccess = (listId, req) => new Promise((resolve, reject) => {
+  const authorizeListAccess = async (listId, req) => {
     const { accountId } = req;
 
-    pgPool.connect((err, client, done) => {
-      if (err) {
-        reject();
-        return;
-      }
-
-      // @ts-ignore
-      client.query('SELECT id, account_id FROM lists WHERE id = $1 LIMIT 1', [listId], (err, result) => {
-        done();
-
-        if (err || result.rows.length === 0 || result.rows[0].account_id !== accountId) {
-          reject();
-          return;
-        }
+    const result = await pgPool.query('SELECT id, account_id FROM lists WHERE id = $1 AND account_id = $2 LIMIT 1', [listId, accountId]);
 
-        resolve();
-      });
-    });
-  });
+    if (result.rows.length === 0) {
+      throw new AuthenticationError('List not found');
+    }
+  };
 
   /**
    * @param {string[]} channelIds

From 00cb4a0313190bfa118966692a649db9c8328094 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 12 Jul 2024 10:09:16 -0400
Subject: [PATCH 1538/2191] Avoid repeated factory creation in
 media_attachments_vacuum_spec (#31000)

---
 .../vacuum/media_attachments_vacuum_spec.rb   | 41 +++++++------------
 1 file changed, 15 insertions(+), 26 deletions(-)

diff --git a/spec/lib/vacuum/media_attachments_vacuum_spec.rb b/spec/lib/vacuum/media_attachments_vacuum_spec.rb
index 3c17ecb0003f83..1039c36cea6ff2 100644
--- a/spec/lib/vacuum/media_attachments_vacuum_spec.rb
+++ b/spec/lib/vacuum/media_attachments_vacuum_spec.rb
@@ -17,32 +17,21 @@
     let!(:old_unattached_media) { Fabricate(:media_attachment, account_id: nil, created_at: 10.days.ago) }
     let!(:new_unattached_media) { Fabricate(:media_attachment, account_id: nil, created_at: 1.hour.ago) }
 
-    before do
-      subject.perform
-    end
-
-    it 'deletes cache of remote media attachments past the retention period' do
-      expect(old_remote_media.reload.file).to be_blank
-    end
-
-    it 'does not touch local media attachments past the retention period' do
-      expect(old_local_media.reload.file).to_not be_blank
-    end
-
-    it 'does not delete cache of remote media attachments within the retention period' do
-      expect(new_remote_media.reload.file).to_not be_blank
-    end
-
-    it 'does not touch local media attachments within the retention period' do
-      expect(new_local_media.reload.file).to_not be_blank
-    end
-
-    it 'deletes unattached media attachments past TTL' do
-      expect { old_unattached_media.reload }.to raise_error(ActiveRecord::RecordNotFound)
-    end
-
-    it 'does not delete unattached media attachments within TTL' do
-      expect(new_unattached_media.reload).to be_persisted
+    before { subject.perform }
+
+    it 'handles attachments based on metadata details' do
+      expect(old_remote_media.reload.file) # Remote and past retention period
+        .to be_blank
+      expect(old_local_media.reload.file) # Local and past retention
+        .to_not be_blank
+      expect(new_remote_media.reload.file) # Remote and within retention
+        .to_not be_blank
+      expect(new_local_media.reload.file) # Local and within retention
+        .to_not be_blank
+      expect { old_unattached_media.reload } # Unattached and past TTL
+        .to raise_error(ActiveRecord::RecordNotFound)
+      expect(new_unattached_media.reload) # Unattached and within TTL
+        .to be_persisted
     end
   end
 end

From d61b536df30c6368a45fd4750c01322b14011b48 Mon Sep 17 00:00:00 2001
From: mogaminsk <mgmnjp@icloud.com>
Date: Mon, 15 Jul 2024 16:38:48 +0900
Subject: [PATCH 1539/2191] Add i18n strings for instance favicon and logo
 settings label (#31016)

---
 config/locales/simple_form.en.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml
index 0313d4683edc66..6bc7c6ac525e9f 100644
--- a/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@@ -243,11 +243,13 @@ en:
           warn: Hide with a warning
       form_admin_settings:
         activity_api_enabled: Publish aggregate statistics about user activity in the API
+        app_icon: App icon
         backups_retention_period: User archive retention period
         bootstrap_timeline_accounts: Always recommend these accounts to new users
         closed_registrations_message: Custom message when sign-ups are not available
         content_cache_retention_period: Remote content retention period
         custom_css: Custom CSS
+        favicon: Favicon
         mascot: Custom mascot (legacy)
         media_cache_retention_period: Media cache retention period
         peers_api_enabled: Publish list of discovered servers in the API

From 17117109adacd5811317b4927594992a9c5ddffb Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 15 Jul 2024 07:44:37 +0000
Subject: [PATCH 1540/2191] New Crowdin Translations (automated) (#31018)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/ar.json  |  1 +
 app/javascript/mastodon/locales/de.json  |  8 ++++----
 app/javascript/mastodon/locales/ja.json  |  4 ++++
 app/javascript/mastodon/locales/si.json  | 17 ++++++++++++++++
 app/javascript/mastodon/locales/tok.json | 25 ++++++++++++++++++++++++
 config/locales/devise.nl.yml             |  2 +-
 config/locales/doorkeeper.nl.yml         |  2 +-
 config/locales/ja.yml                    |  1 +
 config/locales/simple_form.ca.yml        |  1 +
 config/locales/simple_form.eo.yml        |  1 +
 config/locales/simple_form.he.yml        |  1 +
 config/locales/simple_form.ja.yml        |  1 +
 config/locales/simple_form.ko.yml        |  1 +
 config/locales/simple_form.nl.yml        |  2 +-
 config/locales/simple_form.sl.yml        |  2 +-
 config/locales/simple_form.sq.yml        |  1 +
 config/locales/simple_form.th.yml        |  1 +
 config/locales/simple_form.uk.yml        |  1 +
 config/locales/simple_form.zh-CN.yml     |  1 +
 19 files changed, 65 insertions(+), 8 deletions(-)

diff --git a/app/javascript/mastodon/locales/ar.json b/app/javascript/mastodon/locales/ar.json
index 115f6335b6f12c..5509769e04085b 100644
--- a/app/javascript/mastodon/locales/ar.json
+++ b/app/javascript/mastodon/locales/ar.json
@@ -35,6 +35,7 @@
   "account.follow_back": "تابعهم بالمثل",
   "account.followers": "مُتابِعون",
   "account.followers.empty": "لا أحدَ يُتابع هذا المُستخدم إلى حد الآن.",
+  "account.followers_counter": "{count, plural, zero {}one {{counter} متابع} two {{counter} متابعين} few {{counter} متابعين} many {{counter} متابعين} other {{counter} متابعين}}",
   "account.following": "الاشتراكات",
   "account.follows.empty": "لا يُتابع هذا المُستخدمُ أيَّ أحدٍ حتى الآن.",
   "account.go_to_profile": "اذهب إلى الملف الشخصي",
diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json
index 86438757a30755..0f3b3c91a9bfd0 100644
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@@ -205,10 +205,10 @@
   "disabled_account_banner.text": "Dein Konto {disabledAccount} ist derzeit deaktiviert.",
   "dismissable_banner.community_timeline": "Das sind die neuesten öffentlichen Beiträge von Profilen, deren Konten von {domain} verwaltet werden.",
   "dismissable_banner.dismiss": "Ablehnen",
-  "dismissable_banner.explore_links": "Diese Nachrichten werden heute am häufigsten im sozialen Netzwerk geteilt. Neuere Nachrichten, die von vielen verschiedenen Profilen veröffentlicht wurden, werden höher eingestuft.",
-  "dismissable_banner.explore_statuses": "Diese Beiträge stammen aus dem gesamten sozialen Netzwerk und gewinnen derzeit an Reichweite. Neuere Beiträge, die häufiger geteilt und favorisiert wurden, werden höher eingestuft.",
-  "dismissable_banner.explore_tags": "Das sind Hashtags, die derzeit an Reichweite gewinnen. Hashtags, die von vielen verschiedenen Profilen verwendet werden, werden höher eingestuft.",
-  "dismissable_banner.public_timeline": "Das sind die neuesten öffentlichen Beiträge von Profilen im sozialen Netzwerk, denen Leute auf {domain} folgen.",
+  "dismissable_banner.explore_links": "Diese Nachrichten werden heute am häufigsten im Social Web geteilt. Neuere Nachrichten, die von vielen verschiedenen Profilen geteilt wurden, erscheinen weiter oben.",
+  "dismissable_banner.explore_statuses": "Diese Beiträge sind heute im Social Web sehr beliebt. Neuere Beiträge, die häufiger geteilt und favorisiert wurden, erscheinen weiter oben.",
+  "dismissable_banner.explore_tags": "Diese Hashtags sind heute im Social Web sehr beliebt. Hashtags, die von vielen verschiedenen Profilen verwendet werden, erscheinen weiter oben.",
+  "dismissable_banner.public_timeline": "Das sind die neuesten öffentlichen Beiträge von Profilen im Social Web, denen Leute auf {domain} folgen.",
   "domain_block_modal.block": "Server blockieren",
   "domain_block_modal.block_account_instead": "Stattdessen @{name} blockieren",
   "domain_block_modal.they_can_interact_with_old_posts": "Profile von diesem Server werden mit deinen älteren Beiträgen interagieren können.",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index f3ba028eabde00..36974c76026ecc 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -35,7 +35,9 @@
   "account.follow_back": "フォローバック",
   "account.followers": "フォロワー",
   "account.followers.empty": "まだ誰もフォローしていません。",
+  "account.followers_counter": "{count, plural, other {{counter} フォロワー}}",
   "account.following": "フォロー中",
+  "account.following_counter": "{count, plural, other {{counter} フォロー}}",
   "account.follows.empty": "まだ誰もフォローしていません。",
   "account.go_to_profile": "プロフィールページへ",
   "account.hide_reblogs": "@{name}さんからのブーストを非表示",
@@ -61,6 +63,7 @@
   "account.requested_follow": "{name}さんがあなたにフォローリクエストしました",
   "account.share": "@{name}さんのプロフィールを共有する",
   "account.show_reblogs": "@{name}さんからのブーストを表示",
+  "account.statuses_counter": "{count, plural, other {{counter} 投稿}}",
   "account.unblock": "@{name}さんのブロックを解除",
   "account.unblock_domain": "{domain}のブロックを解除",
   "account.unblock_short": "ブロック解除",
@@ -412,6 +415,7 @@
   "limited_account_hint.title": "このプロフィールは{domain}のモデレーターによって非表示にされています。",
   "link_preview.author": "{name}",
   "link_preview.more_from_author": "{name}さんの投稿をもっと読む",
+  "link_preview.shares": "{count, plural, other {{counter}件の投稿}}",
   "lists.account.add": "リストに追加",
   "lists.account.remove": "リストから外す",
   "lists.delete": "リストを削除",
diff --git a/app/javascript/mastodon/locales/si.json b/app/javascript/mastodon/locales/si.json
index fbfdfaa659d131..3a67beed527a59 100644
--- a/app/javascript/mastodon/locales/si.json
+++ b/app/javascript/mastodon/locales/si.json
@@ -33,6 +33,7 @@
   "account.mute": "@{name} නිහඬ කරන්න",
   "account.mute_short": "නිහඬ",
   "account.muted": "නිහඬ කළා",
+  "account.open_original_page": "මුල් පිටුව අරින්න",
   "account.posts": "ලිපි",
   "account.posts_with_replies": "ලිපි සහ පිළිතුරු",
   "account.report": "@{name} වාර්තා කරන්න",
@@ -51,6 +52,10 @@
   "alert.unexpected.title": "අපොයි!",
   "announcement.announcement": "නිවේදනය",
   "audio.hide": "හඬපටය සඟවන්න",
+  "block_modal.show_less": "අඩුවෙන් පෙන්වන්න",
+  "block_modal.show_more": "තව පෙන්වන්න",
+  "block_modal.they_will_know": "අවහිර කළ බව දකිනු ඇත.",
+  "block_modal.title": "අවහිර කරන්නද?",
   "boost_modal.combo": "ඊළඟ වතාවේ මෙය මඟ හැරීමට {combo} එබීමට හැකිය",
   "bundle_column_error.copy_stacktrace": "දෝෂ වාර්තාවේ පිටපතක්",
   "bundle_column_error.error.title": "අපොයි!",
@@ -100,10 +105,13 @@
   "compose_form.lock_disclaimer.lock": "අගුළු දමා ඇත",
   "compose_form.placeholder": "ඔබගේ සිතුවිලි මොනවාද?",
   "compose_form.poll.duration": "මත විමසීමේ කාලය",
+  "compose_form.poll.option_placeholder": "විකල්පය {number}",
   "compose_form.poll.switch_to_multiple": "තේරීම් කිහිපයකට මත විමසුම වෙනස් කරන්න",
   "compose_form.poll.switch_to_single": "තනි තේරීමකට මත විමසුම වෙනස් කරන්න",
+  "compose_form.poll.type": "ශෛලිය",
   "compose_form.publish": "ප්‍රකාශනය",
   "compose_form.publish_form": "නව ලිපිය",
+  "compose_form.reply": "පිළිතුරු",
   "compose_form.spoiler.marked": "අන්තර්ගත අවවාදය ඉවත් කරන්න",
   "compose_form.spoiler.unmarked": "අන්තර්ගත අවවාදයක් එක් කරන්න",
   "confirmation_modal.cancel": "අවලංගු",
@@ -123,6 +131,7 @@
   "conversation.mark_as_read": "කියවූ බව යොදන්න",
   "conversation.open": "සංවාදය බලන්න",
   "conversation.with": "{names} සමඟ",
+  "copy_icon_button.copied": "පසුරුපුවරුවට පිටපත් විය",
   "copypaste.copied": "පිටපත් විය",
   "copypaste.copy_to_clipboard": "පසුරුපුවරුවට පිටපතක්",
   "directory.federated": "දන්නා ෆෙඩිවර්ස් වෙතින්",
@@ -130,6 +139,9 @@
   "directory.new_arrivals": "නව පැමිණීම්",
   "directory.recently_active": "මෑත දී සක්‍රියයි",
   "disabled_account_banner.account_settings": "ගිණුමේ සැකසුම්",
+  "dismissable_banner.dismiss": "ඉවතලන්න",
+  "domain_pill.server": "සේවාදායකය",
+  "domain_pill.username": "පරිශ්‍රීලක නාමය",
   "embed.instructions": "පහත කේතය පිටපත් කිරීමෙන් මෙම ලිපිය ඔබගේ අඩවියට කාවද්දන්න.",
   "embed.preview": "මෙන්න එය පෙනෙන අන්දම:",
   "emoji_button.activity": "ක්‍රියාකාරකම",
@@ -178,9 +190,13 @@
   "filter_modal.select_filter.search": "සොයන්න හෝ සාදන්න",
   "filter_modal.select_filter.title": "මෙම ලිපිය පෙරන්න",
   "filter_modal.title.status": "ලිපියක් පෙරන්න",
+  "filtered_notifications_banner.title": "පෙරූ දැනුම්දීම්",
+  "firehose.all": "සියල්ල",
   "firehose.local": "මෙම සේවාදායකය",
   "firehose.remote": "වෙනත් සේවාදායක",
   "follow_request.reject": "ප්‍රතික්‍ෂේප",
+  "follow_suggestions.dismiss": "නැවත පෙන්වන්න එපා",
+  "follow_suggestions.view_all": "සියල්ල බලන්න",
   "footer.about": "පිළිබඳව",
   "footer.directory": "පැතිකඩ නාමාවලිය",
   "footer.get_app": "යෙදුම ගන්න",
@@ -202,6 +218,7 @@
   "home.pending_critical_update.link": "යාවත්කාල බලන්න",
   "home.show_announcements": "නිවේදන පෙන්වන්න",
   "interaction_modal.login.action": "මුලට ගෙනයන්න",
+  "interaction_modal.on_another_server": "වෙනත් සේවාදායකයක",
   "interaction_modal.on_this_server": "මෙම සේවාදායකයෙහි",
   "interaction_modal.title.favourite": "{name}ගේ ලිපිය ප්‍රිය කරන්න",
   "interaction_modal.title.follow": "{name} අනුගමනය",
diff --git a/app/javascript/mastodon/locales/tok.json b/app/javascript/mastodon/locales/tok.json
index 80d412a20bc35a..fcdef5f32ce744 100644
--- a/app/javascript/mastodon/locales/tok.json
+++ b/app/javascript/mastodon/locales/tok.json
@@ -170,6 +170,8 @@
   "domain_block_modal.block": "o weka e ma",
   "domain_block_modal.you_will_lose_followers": "ma ni la jan alasa ale sina li weka",
   "domain_block_modal.you_wont_see_posts": "sina ken ala lukin e toki tan jan pi ma ni",
+  "domain_pill.server": "ma",
+  "domain_pill.username": "nimi jan",
   "embed.preview": "ni li jo e sitelen ni:",
   "emoji_button.activity": "musi",
   "emoji_button.flags": "len ma",
@@ -274,6 +276,7 @@
   "load_pending": "{count, plural, other {ijo sin #}}",
   "loading_indicator.label": "ni li kama…",
   "media_gallery.toggle_visible": "{number, plural, other {o len e sitelen}}",
+  "mute_modal.title": "sina wile ala wile kute e jan ni?",
   "navigation_bar.about": "sona",
   "navigation_bar.blocks": "jan weka",
   "navigation_bar.compose": "o pali e toki sin",
@@ -290,24 +293,33 @@
   "notification.follow": " {name} li kute e sina",
   "notification.follow_request": "{name} li wile kute e sina",
   "notification.mention": "jan {name} li toki e sina",
+  "notification.moderation-warning.learn_more": "o kama sona e ijo ante",
   "notification.poll": "sina pana lon pana la pana ni li pini",
   "notification.reblog": "{name} li wawa e toki sina",
   "notification.status": "{name} li toki",
   "notification.update": "{name} li ante e toki",
+  "notification_requests.dismiss": "o weka",
   "notifications.column_settings.favourite": "ijo pona:",
   "notifications.column_settings.follow": "jan kute sin",
   "notifications.column_settings.poll": "pana lon pana ni:",
   "notifications.column_settings.reblog": "wawa:",
+  "notifications.column_settings.status": "toki sin:",
   "notifications.column_settings.update": "ante toki:",
   "notifications.filter.all": "ale",
+  "notifications.filter.boosts": "wawa",
   "notifications.filter.favourites": "ijo pona",
+  "notifications.filter.mentions": "toki pi toki sina",
   "notifications.filter.polls": "pana lon pana ni",
+  "onboarding.action.back": "o tawa monsi",
+  "onboarding.actions.back": "o tawa monsi",
   "onboarding.compose.template": "toki a, #Mastodon o!",
   "onboarding.profile.display_name": "nimi tawa jan ante",
+  "onboarding.profile.note": "sona sina",
   "onboarding.share.lead": "o toki lon nasin Masoton pi alasa sina tawa jan",
   "onboarding.share.message": "ilo #Mastodon la mi jan {username} a! o kute e mi lon ni: {url}",
   "onboarding.start.title": "sina o kama pona a!",
   "onboarding.tips.migration": "<strong>sina sona ala sona e ni?</strong> tenpo kama la sina pilin ike tawa ma {domain} la, sina ken tawa ma ante lon ilo Masoton. jan li kute e sina la jan ni li awen kute e sina. kin la sina ken lawa e ma pi sina taso a!",
+  "poll.closed": "ona li pini",
   "poll.total_people": "{count, plural, other {jan #}}",
   "poll.total_votes": "{count, plural, other {pana #}}",
   "poll.vote": "o pana",
@@ -315,9 +327,15 @@
   "poll.votes": "{votes, plural, other {pana #}}",
   "privacy.direct.long": "jan ale lon toki",
   "privacy.public.short": "tawa ale",
+  "regeneration_indicator.label": "ni li kama…",
+  "relative_time.days": "{number}d",
   "relative_time.full.just_now": "tenpo ni",
+  "relative_time.hours": "{number}h",
   "relative_time.just_now": "tenpo ni",
+  "relative_time.minutes": "{number}m",
+  "relative_time.seconds": "{number}s",
   "relative_time.today": "tenpo suno ni",
+  "reply_indicator.cancel": "o ala",
   "report.block": "o weka e jan",
   "report.block_explanation": "sina kama lukin ala e toki ona. ona li kama ala ken lukin e toki sina li kama ala ken kute e sina. ona li ken sona e kama ni.",
   "report.categories.other": "ante",
@@ -336,6 +354,7 @@
   "report.thanks.title": "sina wile ala lukin e ni anu seme?",
   "report.unfollow": "o pini kute e {name}",
   "report_notification.categories.legal": "ike tawa nasin lawa",
+  "report_notification.categories.other": "ante",
   "search.placeholder": "o alasa",
   "search.quick_action.go_to_account": "o tawa lipu jan {x}",
   "search_popout.language_code": "nimi toki kepeken nasin ISO",
@@ -343,6 +362,7 @@
   "search_results.see_all": "ale",
   "search_results.statuses": "toki",
   "search_results.title": "o alasa e {q}",
+  "server_banner.administered_by": "jan lawa:",
   "status.block": "o weka e @{name}",
   "status.cancel_reblog_private": "o pini e pana",
   "status.delete": "o weka",
@@ -356,12 +376,14 @@
   "status.media.open": "o open",
   "status.media.show": "o lukin",
   "status.media_hidden": "sitelen li len",
+  "status.more": "kin",
   "status.mute": "o len e @{name}",
   "status.mute_conversation": "o kute ala e ijo pi toki ni",
   "status.pin": "o sewi lon lipu sina",
   "status.pinned": "toki sewi",
   "status.reblog": "o wawa",
   "status.share": "o pana tawa ante",
+  "status.show_filter_reason": "o lukin",
   "status.show_less": "o lili e ni",
   "status.show_less_all": "o lili e ale",
   "status.show_more": "o suli e ni",
@@ -378,7 +400,9 @@
   "timeline_hint.resources.follows": "jan lukin",
   "timeline_hint.resources.statuses": "ijo pi tenpo suli",
   "trends.trending_now": "jan mute li toki",
+  "units.short.billion": "{count}B",
   "units.short.million": "{count}AAA",
+  "units.short.thousand": "{count}K",
   "upload_button.label": "o pana e sitelen anu kalama",
   "upload_error.limit": "ilo li ken ala e suli pi ijo ni.",
   "upload_form.audio_description": "o toki e ijo kute tawa jan pi kute ala, tawa jan pi kute lili",
@@ -386,6 +410,7 @@
   "upload_form.edit": "o ante",
   "upload_form.thumbnail": "o ante e sitelen lili",
   "upload_form.video_description": "o toki e ijo kute tawa jan pi kute ala, tawa jan pi kute lili, e ijo lukin tawa jan pi lukin ala, tawa jan pi lukin lili",
+  "upload_modal.analyzing_picture": "ilo li lukin e sitelen...",
   "upload_modal.choose_image": "o wile e sitelen",
   "upload_modal.description_placeholder": "mi pu jaki tan soweli",
   "upload_modal.detect_text": "ilo o alasa e nimi tan sitelen",
diff --git a/config/locales/devise.nl.yml b/config/locales/devise.nl.yml
index ab6ae84db4d229..662401a57a679a 100644
--- a/config/locales/devise.nl.yml
+++ b/config/locales/devise.nl.yml
@@ -75,7 +75,7 @@ nl:
           title: Een van jouw beveiligingssleutels is verwijderd
       webauthn_disabled:
         explanation: Verificatie met beveiligingssleutels is uitgeschakeld voor je account.
-        extra: Het is nu alleen mogelijk om in te loggen met een door de authenticatie-app gegeneerde toegangscode.
+        extra: Het is nu alleen mogelijk om in te loggen met een door de authenticatie-app gegeneerde toegangscode als extra controle.
         subject: 'Mastodon: Verificatie met beveiligingssleutels is uitgeschakeld'
         title: Beveiligingssleutels uitgeschakeld
       webauthn_enabled:
diff --git a/config/locales/doorkeeper.nl.yml b/config/locales/doorkeeper.nl.yml
index 4115e0a17eb341..0a3d8fd081a81d 100644
--- a/config/locales/doorkeeper.nl.yml
+++ b/config/locales/doorkeeper.nl.yml
@@ -129,7 +129,7 @@ nl:
         crypto: End-to-end-encryptie
         favourites: Favorieten
         filters: Filters
-        follow: Volgers, genegeerde en geblokkeerde gebruikers
+        follow: Gevolgde, genegeerde en geblokkeerde gebruikers
         follows: Volgend
         lists: Lijsten
         media: Mediabijlagen
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index ec6963517abdcb..5142b550321c48 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -290,6 +290,7 @@ ja:
       filter_by_action: アクションでフィルター
       filter_by_user: ユーザーでフィルター
       title: 操作履歴
+      unavailable_instance: "(ドメイン名が利用できません)"
     announcements:
       destroyed_msg: お知らせが削除されました
       edit:
diff --git a/config/locales/simple_form.ca.yml b/config/locales/simple_form.ca.yml
index d3dc4b13f113f2..4bb906abdbd897 100644
--- a/config/locales/simple_form.ca.yml
+++ b/config/locales/simple_form.ca.yml
@@ -211,6 +211,7 @@ ca:
         setting_default_privacy: Privacitat dels tuts
         setting_default_sensitive: Marcar sempre el contingut gràfic com a sensible
         setting_delete_modal: Mostra la finestra de confirmació abans d'esborrar un tut
+        setting_disable_hover_cards: Deshabilita la vista prèvia del perfil en passar-hi per sobre
         setting_disable_swiping: Desactiva les animacions
         setting_display_media: Visualització multimèdia
         setting_display_media_default: Per defecte
diff --git a/config/locales/simple_form.eo.yml b/config/locales/simple_form.eo.yml
index e83f71a2cb5210..40535bf96bc12e 100644
--- a/config/locales/simple_form.eo.yml
+++ b/config/locales/simple_form.eo.yml
@@ -203,6 +203,7 @@ eo:
         setting_default_privacy: Privateco de afiŝado
         setting_default_sensitive: Ĉiam marki plurmediojn kiel tiklaj
         setting_delete_modal: Montri konfirman fenestron antaŭ ol forigi mesaĝon
+        setting_disable_hover_cards: Malebligi profilan antaŭmontron kiam oni musumas
         setting_disable_swiping: Malebligi svingajn movojn
         setting_display_media: Montrado de plurmedioj
         setting_display_media_default: Implicita
diff --git a/config/locales/simple_form.he.yml b/config/locales/simple_form.he.yml
index 65c6f6110fc2bf..1331d2f62bc157 100644
--- a/config/locales/simple_form.he.yml
+++ b/config/locales/simple_form.he.yml
@@ -211,6 +211,7 @@ he:
         setting_default_privacy: פרטיות ההודעות
         setting_default_sensitive: תמיד לתת סימון "רגיש" למדיה
         setting_delete_modal: להראות תיבת אישור לפני מחיקת חיצרוץ
+        setting_disable_hover_cards: כבה הצצה מקדימה לפרופיל בעת מעבר עכבר מעליו
         setting_disable_swiping: ביטול החלקת-צד
         setting_display_media: תצוגת מדיה
         setting_display_media_default: ברירת מחדל
diff --git a/config/locales/simple_form.ja.yml b/config/locales/simple_form.ja.yml
index 664082dabc41ce..56b17ab000718b 100644
--- a/config/locales/simple_form.ja.yml
+++ b/config/locales/simple_form.ja.yml
@@ -211,6 +211,7 @@ ja:
         setting_default_privacy: 投稿の公開範囲
         setting_default_sensitive: メディアを常に閲覧注意としてマークする
         setting_delete_modal: 投稿を削除する前に確認ダイアログを表示する
+        setting_disable_hover_cards: マウスオーバーでプロフィールをポップアップしない
         setting_disable_swiping: スワイプでの切り替えを無効にする
         setting_display_media: メディアの表示
         setting_display_media_default: 標準
diff --git a/config/locales/simple_form.ko.yml b/config/locales/simple_form.ko.yml
index 54d36eafe0393f..1107e4cba5b736 100644
--- a/config/locales/simple_form.ko.yml
+++ b/config/locales/simple_form.ko.yml
@@ -211,6 +211,7 @@ ko:
         setting_default_privacy: 게시물 프라이버시
         setting_default_sensitive: 미디어를 언제나 민감한 콘텐츠로 설정
         setting_delete_modal: 게시물 삭제 전 확인 창을 표시
+        setting_disable_hover_cards: 호버시 프로필 미리보기를 비활성화
         setting_disable_swiping: 스와이프 모션 비활성화
         setting_display_media: 미디어 표시
         setting_display_media_default: 기본
diff --git a/config/locales/simple_form.nl.yml b/config/locales/simple_form.nl.yml
index d6bdb7a6f0a488..5110e1e6d09b9a 100644
--- a/config/locales/simple_form.nl.yml
+++ b/config/locales/simple_form.nl.yml
@@ -211,7 +211,7 @@ nl:
         setting_default_privacy: Zichtbaarheid van nieuwe berichten
         setting_default_sensitive: Media altijd als gevoelig markeren
         setting_delete_modal: Vraag voor het verwijderen van een bericht een bevestiging
-        setting_disable_hover_cards: Profielvoorbeeld uitschakelen bij zweven
+        setting_disable_hover_cards: Profielvoorbeelden door eroverheen te zweven uitschakelen
         setting_disable_swiping: Swipebewegingen uitschakelen
         setting_display_media: Mediaweergave
         setting_display_media_default: Standaard
diff --git a/config/locales/simple_form.sl.yml b/config/locales/simple_form.sl.yml
index 1e3f3046ad3256..14551774fe0b29 100644
--- a/config/locales/simple_form.sl.yml
+++ b/config/locales/simple_form.sl.yml
@@ -211,7 +211,7 @@ sl:
         setting_default_privacy: Zasebnost objave
         setting_default_sensitive: Vedno označi medije kot občutljive
         setting_delete_modal: Pred brisanjem objave prikaži okno za pritrditev
-        setting_disable_hover_cards: Onemogoči predogled profila pod kazalko
+        setting_disable_hover_cards: Onemogoči predogled profila pod kazalcem
         setting_disable_swiping: Onemogoči poteze drsanja
         setting_display_media: Prikaz medijev
         setting_display_media_default: Privzeto
diff --git a/config/locales/simple_form.sq.yml b/config/locales/simple_form.sq.yml
index c3c3920962d635..6fedf315724746 100644
--- a/config/locales/simple_form.sq.yml
+++ b/config/locales/simple_form.sq.yml
@@ -211,6 +211,7 @@ sq:
         setting_default_privacy: Privatësi postimi
         setting_default_sensitive: Mediave vëru përherë shenjë si rezervat
         setting_delete_modal: Shfaq dialog ripohimi përpara fshirjes së një mesazhi
+        setting_disable_hover_cards: Çaktivizo paraparje profili, kur i kalohet kursori përsipër
         setting_disable_swiping: Çaktivizo lëvizje me fërkim
         setting_display_media: Shfaqje mediash
         setting_display_media_default: Parazgjedhje
diff --git a/config/locales/simple_form.th.yml b/config/locales/simple_form.th.yml
index 0d9a88bc380ff7..cdc82367f9346c 100644
--- a/config/locales/simple_form.th.yml
+++ b/config/locales/simple_form.th.yml
@@ -211,6 +211,7 @@ th:
         setting_default_privacy: ความเป็นส่วนตัวของการโพสต์
         setting_default_sensitive: ทำเครื่องหมายสื่อว่าละเอียดอ่อนเสมอ
         setting_delete_modal: แสดงกล่องโต้ตอบการยืนยันก่อนลบโพสต์
+        setting_disable_hover_cards: ปิดใช้งานตัวอย่างโปรไฟล์เมื่อวางเมาส์เหนือ
         setting_disable_swiping: ปิดใช้งานการเคลื่อนไหวในการปัด
         setting_display_media: การแสดงสื่อ
         setting_display_media_default: ค่าเริ่มต้น
diff --git a/config/locales/simple_form.uk.yml b/config/locales/simple_form.uk.yml
index 11337f2f61f689..332f2c91dc9daf 100644
--- a/config/locales/simple_form.uk.yml
+++ b/config/locales/simple_form.uk.yml
@@ -211,6 +211,7 @@ uk:
         setting_default_privacy: Видимість дописів
         setting_default_sensitive: Позначати медіа делікатними
         setting_delete_modal: Показувати діалог підтвердження під час видалення допису
+        setting_disable_hover_cards: Вимкнути попередній перегляд профілю при наведенні
         setting_disable_swiping: Вимкнути рух посування
         setting_display_media: Показ медіа
         setting_display_media_default: За промовчанням
diff --git a/config/locales/simple_form.zh-CN.yml b/config/locales/simple_form.zh-CN.yml
index 6058cc00cff3ac..bbee8b6706297b 100644
--- a/config/locales/simple_form.zh-CN.yml
+++ b/config/locales/simple_form.zh-CN.yml
@@ -211,6 +211,7 @@ zh-CN:
         setting_default_privacy: 嘟文默认可见范围
         setting_default_sensitive: 始终标记媒体为敏感内容
         setting_delete_modal: 在删除嘟文前询问我
+        setting_disable_hover_cards: 禁用悬停资料预览
         setting_disable_swiping: 禁用滑动动作
         setting_display_media: 媒体显示
         setting_display_media_default: 默认

From 1dd82620712eecc18f1acd72b5a8585d37e254cf Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 15 Jul 2024 11:29:57 +0200
Subject: [PATCH 1541/2191] Add optional `filtered` attribute to notification
 entities in REST API (#31011)

---
 .../rest/notification_serializer.rb           |  4 +++
 spec/requests/api/v1/notifications_spec.rb    | 26 ++++++++++++++-----
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/app/serializers/rest/notification_serializer.rb b/app/serializers/rest/notification_serializer.rb
index 966819585fcc7c..ee17af80768439 100644
--- a/app/serializers/rest/notification_serializer.rb
+++ b/app/serializers/rest/notification_serializer.rb
@@ -3,6 +3,8 @@
 class REST::NotificationSerializer < ActiveModel::Serializer
   attributes :id, :type, :created_at, :group_key
 
+  attribute :filtered, if: :filtered?
+
   belongs_to :from_account, key: :account, serializer: REST::AccountSerializer
   belongs_to :target_status, key: :status, if: :status_type?, serializer: REST::StatusSerializer
   belongs_to :report, if: :report_type?, serializer: REST::ReportSerializer
@@ -32,4 +34,6 @@ def relationship_severance_event?
   def moderation_warning_event?
     object.type == :moderation_warning
   end
+
+  delegate :filtered?, to: :object
 end
diff --git a/spec/requests/api/v1/notifications_spec.rb b/spec/requests/api/v1/notifications_spec.rb
index 9ff0674317bedd..c9034c17dcbd97 100644
--- a/spec/requests/api/v1/notifications_spec.rb
+++ b/spec/requests/api/v1/notifications_spec.rb
@@ -20,8 +20,8 @@
     before do
       first_status = PostStatusService.new.call(user.account, text: 'Test')
       ReblogService.new.call(bob.account, first_status)
-      mentioning_status = PostStatusService.new.call(bob.account, text: 'Hello @alice')
-      mentioning_status.mentions.first
+      PostStatusService.new.call(bob.account, text: 'Hello @alice')
+      PostStatusService.new.call(tom.account, text: 'Hello @alice', visibility: :direct) # Filtered by default
       FavouriteService.new.call(bob.account, first_status)
       FavouriteService.new.call(tom.account, first_status)
       FollowService.new.call(bob.account, user.account)
@@ -34,10 +34,22 @@
         subject
 
         expect(response).to have_http_status(200)
-        expect(body_json_types).to include 'reblog'
-        expect(body_json_types).to include 'mention'
-        expect(body_json_types).to include 'favourite'
-        expect(body_json_types).to include 'follow'
+        expect(body_as_json.size).to eq 5
+        expect(body_json_types).to include('reblog', 'mention', 'favourite', 'follow')
+        expect(body_as_json.any? { |x| x[:filtered] }).to be false
+      end
+    end
+
+    context 'with include_filtered' do
+      let(:params) { { include_filtered: true } }
+
+      it 'returns expected notification types, including filtered notifications' do
+        subject
+
+        expect(response).to have_http_status(200)
+        expect(body_as_json.size).to eq 6
+        expect(body_json_types).to include('reblog', 'mention', 'favourite', 'follow')
+        expect(body_as_json.any? { |x| x[:filtered] }).to be true
       end
     end
 
@@ -96,7 +108,7 @@ def body_json_account_ids
       it 'returns the requested number of notifications paginated', :aggregate_failures do
         subject
 
-        notifications = user.account.notifications
+        notifications = user.account.notifications.browserable
 
         expect(body_as_json.size)
           .to eq(params[:limit])

From 91ef4a6fc5d8536378a2d3bc456711bcb95bd8f4 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 15 Jul 2024 06:42:18 -0400
Subject: [PATCH 1542/2191] Add assertion about key columns to account key
 generate spec (#30635)

---
 spec/models/account_spec.rb | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb
index 225929ae39f9a6..dfb1f5bc61528c 100644
--- a/spec/models/account_spec.rb
+++ b/spec/models/account_spec.rb
@@ -1015,21 +1015,26 @@ def account_note_over_limit
 
   context 'when is local' do
     it 'generates keys' do
-      account = described_class.create!(domain: nil, username: Faker::Internet.user_name(separators: ['_']))
-      expect(account.keypair).to be_private
-      expect(account.keypair).to be_public
+      account = described_class.create!(domain: nil, username: 'user_without_keys')
+
+      expect(account)
+        .to be_private_key
+        .and be_public_key
+      expect(account.keypair)
+        .to be_private
+        .and be_public
     end
   end
 
   context 'when is remote' do
     it 'does not generate keys' do
       key = OpenSSL::PKey::RSA.new(1024).public_key
-      account = described_class.create!(domain: 'remote', uri: 'https://remote/actor', username: Faker::Internet.user_name(separators: ['_']), public_key: key.to_pem)
+      account = described_class.create!(domain: 'remote', uri: 'https://remote/actor', username: 'remote_user_with_public', public_key: key.to_pem)
       expect(account.keypair.params).to eq key.params
     end
 
     it 'normalizes domain' do
-      account = described_class.create!(domain: 'にゃん', uri: 'https://xn--r9j5b5b/actor', username: Faker::Internet.user_name(separators: ['_']))
+      account = described_class.create!(domain: 'にゃん', uri: 'https://xn--r9j5b5b/actor', username: 'remote_user_with_idn_domain')
       expect(account.domain).to eq 'xn--r9j5b5b'
     end
   end

From 543b59fa14a7e9b55a5a96d2cb0f38391108a561 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 15 Jul 2024 09:03:23 -0400
Subject: [PATCH 1543/2191] Clean up `theme_helper` style builders (#30617)

---
 app/helpers/theme_helper.rb | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/helpers/theme_helper.rb b/app/helpers/theme_helper.rb
index d15259851c0315..fab899a5332ebd 100644
--- a/app/helpers/theme_helper.rb
+++ b/app/helpers/theme_helper.rb
@@ -3,8 +3,10 @@
 module ThemeHelper
   def theme_style_tags(theme)
     if theme == 'system'
-      stylesheet_pack_tag('mastodon-light', media: 'not all and (prefers-color-scheme: dark)', crossorigin: 'anonymous') +
-        stylesheet_pack_tag('default', media: '(prefers-color-scheme: dark)', crossorigin: 'anonymous')
+      ''.html_safe.tap do |tags|
+        tags << stylesheet_pack_tag('mastodon-light', media: 'not all and (prefers-color-scheme: dark)', crossorigin: 'anonymous')
+        tags << stylesheet_pack_tag('default', media: '(prefers-color-scheme: dark)', crossorigin: 'anonymous')
+      end
     else
       stylesheet_pack_tag theme, media: 'all', crossorigin: 'anonymous'
     end
@@ -12,8 +14,10 @@ def theme_style_tags(theme)
 
   def theme_color_tags(theme)
     if theme == 'system'
-      tag.meta(name: 'theme-color', content: Themes::THEME_COLORS[:dark], media: '(prefers-color-scheme: dark)') +
-        tag.meta(name: 'theme-color', content: Themes::THEME_COLORS[:light], media: '(prefers-color-scheme: light)')
+      ''.html_safe.tap do |tags|
+        tags << tag.meta(name: 'theme-color', content: Themes::THEME_COLORS[:dark], media: '(prefers-color-scheme: dark)')
+        tags << tag.meta(name: 'theme-color', content: Themes::THEME_COLORS[:light], media: '(prefers-color-scheme: light)')
+      end
     else
       tag.meta name: 'theme-color', content: theme_color_for(theme)
     end

From 0b97ec3f7b0922067c1047d621975e65bfe96ad7 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 15 Jul 2024 15:03:57 +0200
Subject: [PATCH 1544/2191] fix(deps): update dependency @babel/core to v7.24.9
 (#31029)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 988c6c79cfb5cb..01645ca93b2eb2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -60,37 +60,37 @@ __metadata:
   linkType: hard
 
 "@babel/core@npm:^7.10.4, @babel/core@npm:^7.11.6, @babel/core@npm:^7.12.3, @babel/core@npm:^7.22.1, @babel/core@npm:^7.24.4":
-  version: 7.24.8
-  resolution: "@babel/core@npm:7.24.8"
+  version: 7.24.9
+  resolution: "@babel/core@npm:7.24.9"
   dependencies:
     "@ampproject/remapping": "npm:^2.2.0"
     "@babel/code-frame": "npm:^7.24.7"
-    "@babel/generator": "npm:^7.24.8"
+    "@babel/generator": "npm:^7.24.9"
     "@babel/helper-compilation-targets": "npm:^7.24.8"
-    "@babel/helper-module-transforms": "npm:^7.24.8"
+    "@babel/helper-module-transforms": "npm:^7.24.9"
     "@babel/helpers": "npm:^7.24.8"
     "@babel/parser": "npm:^7.24.8"
     "@babel/template": "npm:^7.24.7"
     "@babel/traverse": "npm:^7.24.8"
-    "@babel/types": "npm:^7.24.8"
+    "@babel/types": "npm:^7.24.9"
     convert-source-map: "npm:^2.0.0"
     debug: "npm:^4.1.0"
     gensync: "npm:^1.0.0-beta.2"
     json5: "npm:^2.2.3"
     semver: "npm:^6.3.1"
-  checksum: 10c0/5e21b40cc69746deda3fe3d6540351d9cb0d1ad5aea055b7c319db26071ff5789fd9580d1aa47b114f07631e8e2109f4e71696ca11d7c7e60d157767022c1bd2
+  checksum: 10c0/e104ec6efbf099f55184933e9ab078eb5821c792ddfef3e9c6561986ec4ff103f5c11e3d7d6e5e8929e50e2c58db1cc80e5b6f14b530335b6622095ec4b4124c
   languageName: node
   linkType: hard
 
-"@babel/generator@npm:^7.24.8, @babel/generator@npm:^7.7.2":
-  version: 7.24.8
-  resolution: "@babel/generator@npm:7.24.8"
+"@babel/generator@npm:^7.24.8, @babel/generator@npm:^7.24.9, @babel/generator@npm:^7.7.2":
+  version: 7.24.9
+  resolution: "@babel/generator@npm:7.24.9"
   dependencies:
-    "@babel/types": "npm:^7.24.8"
+    "@babel/types": "npm:^7.24.9"
     "@jridgewell/gen-mapping": "npm:^0.3.5"
     "@jridgewell/trace-mapping": "npm:^0.3.25"
     jsesc: "npm:^2.5.1"
-  checksum: 10c0/e8a278e75a895f13a7b17dd79abe1e894fe82a5ed3abb127c33c14c66773d69993762521c094c6c364723f8f7375683b0d4a96097781175a29407baedf67b769
+  checksum: 10c0/cd1f7edce7717462546c349e15289d1267a3ed627c6f6583fbf51e78eacacc6500ec2f0024f08f1cc7138989e575635b931acf4549f9e728017a22176a9ea6b6
   languageName: node
   linkType: hard
 
@@ -231,9 +231,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-module-transforms@npm:^7.24.7, @babel/helper-module-transforms@npm:^7.24.8":
-  version: 7.24.8
-  resolution: "@babel/helper-module-transforms@npm:7.24.8"
+"@babel/helper-module-transforms@npm:^7.24.7, @babel/helper-module-transforms@npm:^7.24.8, @babel/helper-module-transforms@npm:^7.24.9":
+  version: 7.24.9
+  resolution: "@babel/helper-module-transforms@npm:7.24.9"
   dependencies:
     "@babel/helper-environment-visitor": "npm:^7.24.7"
     "@babel/helper-module-imports": "npm:^7.24.7"
@@ -242,7 +242,7 @@ __metadata:
     "@babel/helper-validator-identifier": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10c0/b76496d5045af55be9de60e59e65e56a43033f01ccc746b26b7af911c358668c206b688ce70a23ab31ec04f9728f3a38e8d01073c85244115ab62f271a7fa3d1
+  checksum: 10c0/e27bca43bc113731ee4f2b33a4c5bf9c7eebf4d64487b814c305cbd5feb272c29fcd3d79634ba03131ade171e5972bc7ede8dbc83ba0deb02f1e62d318c87770
   languageName: node
   linkType: hard
 
@@ -1540,14 +1540,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/types@npm:^7.0.0, @babel/types@npm:^7.0.0-beta.49, @babel/types@npm:^7.12.11, @babel/types@npm:^7.12.6, @babel/types@npm:^7.20.7, @babel/types@npm:^7.24.7, @babel/types@npm:^7.24.8, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3":
-  version: 7.24.8
-  resolution: "@babel/types@npm:7.24.8"
+"@babel/types@npm:^7.0.0, @babel/types@npm:^7.0.0-beta.49, @babel/types@npm:^7.12.11, @babel/types@npm:^7.12.6, @babel/types@npm:^7.20.7, @babel/types@npm:^7.24.7, @babel/types@npm:^7.24.8, @babel/types@npm:^7.24.9, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3":
+  version: 7.24.9
+  resolution: "@babel/types@npm:7.24.9"
   dependencies:
     "@babel/helper-string-parser": "npm:^7.24.8"
     "@babel/helper-validator-identifier": "npm:^7.24.7"
     to-fast-properties: "npm:^2.0.0"
-  checksum: 10c0/2d7bf561ae993e794cb052c5a81d3a6d1877da13e1e2eb2a59ae75a8fb1c965b618fb3e4abd42548f5f9a4587d3a149185a32d6c4c4ea82195da7dd86f2da0f1
+  checksum: 10c0/4970b3481cab39c5c3fdb7c28c834df5c7049f3c7f43baeafe121bb05270ebf0da7c65b097abf314877f213baa591109c82204f30d66cdd46c22ece4a2f32415
   languageName: node
   linkType: hard
 

From 9d0bce40724eb77b7cc3917091b62e4ab159e29e Mon Sep 17 00:00:00 2001
From: David Roetzel <david@roetzel.de>
Date: Mon, 15 Jul 2024 15:42:47 +0200
Subject: [PATCH 1545/2191] Move filtered notifications bar in scrollable area
 (#30996)

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
---
 .../mastodon/features/notifications/index.jsx         | 11 ++++++++---
 app/javascript/styles/mastodon/components.scss        |  3 +--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/javascript/mastodon/features/notifications/index.jsx b/app/javascript/mastodon/features/notifications/index.jsx
index d45f517152ea16..54883096ef50af 100644
--- a/app/javascript/mastodon/features/notifications/index.jsx
+++ b/app/javascript/mastodon/features/notifications/index.jsx
@@ -223,6 +223,13 @@ class Notifications extends PureComponent {
 
     let scrollContainer;
 
+    const prepend = (
+      <>
+        {needsNotificationPermission && <NotificationsPermissionBanner />}
+        <FilteredNotificationsBanner />
+      </>
+    );
+
     if (signedIn) {
       scrollContainer = (
         <ScrollableList
@@ -232,7 +239,7 @@ class Notifications extends PureComponent {
           showLoading={isLoading && notifications.size === 0}
           hasMore={hasMore}
           numPending={numPending}
-          prepend={needsNotificationPermission && <NotificationsPermissionBanner />}
+          prepend={prepend}
           alwaysPrepend
           emptyMessage={emptyMessage}
           onLoadMore={this.handleLoadOlder}
@@ -282,8 +289,6 @@ class Notifications extends PureComponent {
 
         {filterBarContainer}
 
-        <FilteredNotificationsBanner />
-
         {scrollContainer}
 
         <Helmet>
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index da86a4caa71aac..e94ce2d8f49763 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -10192,8 +10192,7 @@ noscript {
 .filtered-notifications-banner {
   display: flex;
   align-items: center;
-  border: 1px solid var(--background-border-color);
-  border-top: 0;
+  border-bottom: 1px solid var(--background-border-color);
   padding: 24px 32px;
   gap: 16px;
   color: $darker-text-color;

From 70969ac64c4cf2811be9aa2f8510e3d831f2533c Mon Sep 17 00:00:00 2001
From: David Roetzel <david@roetzel.de>
Date: Mon, 15 Jul 2024 15:42:47 +0200
Subject: [PATCH 1546/2191] [Glitch] Move filtered notifications bar in
 scrollable area

Port 9d0bce40724eb77b7cc3917091b62e4ab159e29e to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/features/notifications/index.jsx  | 11 ++++++++---
 app/javascript/flavours/glitch/styles/components.scss |  3 +--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/javascript/flavours/glitch/features/notifications/index.jsx b/app/javascript/flavours/glitch/features/notifications/index.jsx
index b4f1bf5dfef7b5..bc32f9a7d2d12d 100644
--- a/app/javascript/flavours/glitch/features/notifications/index.jsx
+++ b/app/javascript/flavours/glitch/features/notifications/index.jsx
@@ -258,6 +258,13 @@ class Notifications extends PureComponent {
 
     let scrollContainer;
 
+    const prepend = (
+      <>
+        {needsNotificationPermission && <NotificationsPermissionBanner />}
+        <FilteredNotificationsBanner />
+      </>
+    );
+
     if (signedIn) {
       scrollContainer = (
         <ScrollableList
@@ -267,7 +274,7 @@ class Notifications extends PureComponent {
           showLoading={isLoading && notifications.size === 0}
           hasMore={hasMore}
           numPending={numPending}
-          prepend={needsNotificationPermission && <NotificationsPermissionBanner />}
+          prepend={prepend}
           alwaysPrepend
           emptyMessage={emptyMessage}
           onLoadMore={this.handleLoadOlder}
@@ -356,8 +363,6 @@ class Notifications extends PureComponent {
 
         {filterBarContainer}
 
-        <FilteredNotificationsBanner />
-
         {scrollContainer}
 
         <Helmet>
diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index 533a564e99687e..06225b61e6c254 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -10746,8 +10746,7 @@ noscript {
 .filtered-notifications-banner {
   display: flex;
   align-items: center;
-  border: 1px solid var(--background-border-color);
-  border-top: 0;
+  border-bottom: 1px solid var(--background-border-color);
   padding: 24px 32px;
   gap: 16px;
   color: $darker-text-color;

From 905921b2efaa7bda5acca1c19056a18186ec24ff Mon Sep 17 00:00:00 2001
From: Michael Stanclift <mx@vmstan.com>
Date: Tue, 16 Jul 2024 02:06:19 -0500
Subject: [PATCH 1547/2191] Add missing "Update Report" string in audit log
 (#31033)

---
 config/locales/en.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 20df80c272fb12..0e3d209ff33eb6 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -226,6 +226,7 @@ en:
         update_custom_emoji: Update Custom Emoji
         update_domain_block: Update Domain Block
         update_ip_block: Update IP rule
+        update_report: Update Report
         update_status: Update Post
         update_user_role: Update Role
       actions:

From c3a2f9d99309bbe2754be9ea3f5257c434ff34b0 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 16 Jul 2024 14:14:25 +0200
Subject: [PATCH 1548/2191] chore(deps): update dependency json-schema to
 v4.3.1 (#31012)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 98a3571731fedd..935b28215c6fc1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -367,7 +367,7 @@ GEM
     json-ld-preloaded (3.3.0)
       json-ld (~> 3.3)
       rdf (~> 3.3)
-    json-schema (4.3.0)
+    json-schema (4.3.1)
       addressable (>= 2.8)
     jsonapi-renderer (0.2.2)
     jwt (2.7.1)

From c27d194eb27aeedb16e17dfb2a8f2be7c0636851 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 16 Jul 2024 15:20:34 +0200
Subject: [PATCH 1549/2191] fix(deps): update dependency pino to v9.3.1
 (#31032)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 01645ca93b2eb2..c5d04800619ed5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -13196,8 +13196,8 @@ __metadata:
   linkType: hard
 
 "pino@npm:^9.0.0":
-  version: 9.2.0
-  resolution: "pino@npm:9.2.0"
+  version: 9.3.1
+  resolution: "pino@npm:9.3.1"
   dependencies:
     atomic-sleep: "npm:^1.0.0"
     fast-redact: "npm:^3.1.1"
@@ -13212,7 +13212,7 @@ __metadata:
     thread-stream: "npm:^3.0.0"
   bin:
     pino: bin.js
-  checksum: 10c0/5fbd226ff7dab0961232b5aa5eca0530cdc5bb29f6bf17d929e42239293b1a587a26cc311db6abc1090c9dd57e8f7b031eae341b41d00d4a642b4f1736474c80
+  checksum: 10c0/ab1e81b3e5a91852136d80a592939883eeb81442e5d3a2c070bdbdeb47c5aaa297ead246530b10eb6d5ff59445f4645d1333d342f255d9f002f73aea843e74ee
   languageName: node
   linkType: hard
 

From fa54b6121691dfb5d64a42aa6bf07b4d67aa504f Mon Sep 17 00:00:00 2001
From: Adam Niedzielski <adamsunday@gmail.com>
Date: Tue, 16 Jul 2024 15:21:16 +0200
Subject: [PATCH 1550/2191] Handle missing links in Webfinger response (#31030)

---
 app/lib/webfinger.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/lib/webfinger.rb b/app/lib/webfinger.rb
index ae8a3b1eae0264..aeafe197024974 100644
--- a/app/lib/webfinger.rb
+++ b/app/lib/webfinger.rb
@@ -26,7 +26,7 @@ def link(rel, attribute)
     private
 
     def links
-      @links ||= @json['links'].index_by { |link| link['rel'] }
+      @links ||= @json.fetch('links', []).index_by { |link| link['rel'] }
     end
 
     def validate_response!

From aa88aca0ad89f24fead6a1c6dbfad9def94bd47e Mon Sep 17 00:00:00 2001
From: Emelia Smith <ThisIsMissEm@users.noreply.github.com>
Date: Tue, 16 Jul 2024 15:23:08 +0200
Subject: [PATCH 1551/2191] Add optional OAuth application to reports (#30539)

---
 app/controllers/api/v1/reports_controller.rb       |  2 +-
 app/models/report.rb                               |  2 ++
 app/services/report_service.rb                     |  4 +++-
 app/views/admin/reports/_header_details.html.haml  |  6 ++++++
 config/locales/en.yml                              |  1 +
 .../20240713171841_add_application_to_reports.rb   |  8 ++++++++
 ...13171909_validate_add_application_to_reports.rb |  7 +++++++
 db/schema.rb                                       |  4 +++-
 spec/lib/activitypub/activity/flag_spec.rb         |  1 +
 spec/requests/api/v1/reports_spec.rb               |  1 +
 spec/services/report_service_spec.rb               | 14 ++++++++++++++
 11 files changed, 47 insertions(+), 3 deletions(-)
 create mode 100644 db/migrate/20240713171841_add_application_to_reports.rb
 create mode 100644 db/migrate/20240713171909_validate_add_application_to_reports.rb

diff --git a/app/controllers/api/v1/reports_controller.rb b/app/controllers/api/v1/reports_controller.rb
index 300c9faa3f0ee9..72f358bb5bcd95 100644
--- a/app/controllers/api/v1/reports_controller.rb
+++ b/app/controllers/api/v1/reports_controller.rb
@@ -10,7 +10,7 @@ def create
     @report = ReportService.new.call(
       current_account,
       reported_account,
-      report_params
+      report_params.merge(application: doorkeeper_token.application)
     )
 
     render json: @report, serializer: REST::ReportSerializer
diff --git a/app/models/report.rb b/app/models/report.rb
index 3df5a20e1819c1..17c1503436f0ff 100644
--- a/app/models/report.rb
+++ b/app/models/report.rb
@@ -18,6 +18,7 @@
 #  category                   :integer          default("other"), not null
 #  action_taken_at            :datetime
 #  rule_ids                   :bigint(8)        is an Array
+#  application_id             :bigint(8)
 #
 
 class Report < ApplicationRecord
@@ -31,6 +32,7 @@ class Report < ApplicationRecord
   rate_limit by: :account, family: :reports
 
   belongs_to :account
+  belongs_to :application, class_name: 'Doorkeeper::Application', optional: true
 
   with_options class_name: 'Account' do
     belongs_to :target_account
diff --git a/app/services/report_service.rb b/app/services/report_service.rb
index dea6df7b0a1b1b..c95e216c790162 100644
--- a/app/services/report_service.rb
+++ b/app/services/report_service.rb
@@ -10,6 +10,7 @@ def call(source_account, target_account, options = {})
     @comment        = options.delete(:comment).presence || ''
     @category       = options[:rule_ids].present? ? 'violation' : (options.delete(:category).presence || 'other')
     @rule_ids       = options.delete(:rule_ids).presence
+    @application    = options.delete(:application).presence
     @options        = options
 
     raise ActiveRecord::RecordNotFound if @target_account.unavailable?
@@ -35,7 +36,8 @@ def create_report!
       uri: @options[:uri],
       forwarded: forward_to_origin?,
       category: @category,
-      rule_ids: @rule_ids
+      rule_ids: @rule_ids,
+      application: @application
     )
   end
 
diff --git a/app/views/admin/reports/_header_details.html.haml b/app/views/admin/reports/_header_details.html.haml
index 45790b9cd50d75..434231f7333626 100644
--- a/app/views/admin/reports/_header_details.html.haml
+++ b/app/views/admin/reports/_header_details.html.haml
@@ -14,6 +14,12 @@
         = admin_account_link_to report.account
       - else
         = report.account.domain
+  - if report.application.present?
+    .report-header__details__item
+      .report-header__details__item__header
+        %strong= t('admin.reports.reported_with_application')
+      .report-header__details__item__content
+        = report.application.name
   .report-header__details__item
     .report-header__details__item__header
       %strong= t('admin.reports.status')
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 0e3d209ff33eb6..cccb1721634353 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -639,6 +639,7 @@ en:
       report: 'Report #%{id}'
       reported_account: Reported account
       reported_by: Reported by
+      reported_with_application: Reported with application
       resolved: Resolved
       resolved_msg: Report successfully resolved!
       skip_to_actions: Skip to actions
diff --git a/db/migrate/20240713171841_add_application_to_reports.rb b/db/migrate/20240713171841_add_application_to_reports.rb
new file mode 100644
index 00000000000000..42ba14e9b260a0
--- /dev/null
+++ b/db/migrate/20240713171841_add_application_to_reports.rb
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class AddApplicationToReports < ActiveRecord::Migration[7.1]
+  def change
+    add_column :reports, :application_id, :bigint, null: true
+    add_foreign_key :reports, :oauth_applications, column: :application_id, on_delete: :nullify, validate: false
+  end
+end
diff --git a/db/migrate/20240713171909_validate_add_application_to_reports.rb b/db/migrate/20240713171909_validate_add_application_to_reports.rb
new file mode 100644
index 00000000000000..34ae690a3908e3
--- /dev/null
+++ b/db/migrate/20240713171909_validate_add_application_to_reports.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class ValidateAddApplicationToReports < ActiveRecord::Migration[7.1]
+  def change
+    validate_foreign_key :reports, :oauth_applications
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 87c49d74152358..66da12f71394b2 100644
--- 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_07_12_064044) do
+ActiveRecord::Schema[7.1].define(version: 2024_07_13_171909) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -929,6 +929,7 @@
     t.integer "category", default: 0, null: false
     t.datetime "action_taken_at", precision: nil
     t.bigint "rule_ids", array: true
+    t.bigint "application_id"
     t.index ["account_id"], name: "index_reports_on_account_id"
     t.index ["action_taken_by_account_id"], name: "index_reports_on_action_taken_by_account_id", where: "(action_taken_by_account_id IS NOT NULL)"
     t.index ["assigned_account_id"], name: "index_reports_on_assigned_account_id", where: "(assigned_account_id IS NOT NULL)"
@@ -1361,6 +1362,7 @@
   add_foreign_key "reports", "accounts", column: "assigned_account_id", on_delete: :nullify
   add_foreign_key "reports", "accounts", column: "target_account_id", name: "fk_eb37af34f0", on_delete: :cascade
   add_foreign_key "reports", "accounts", name: "fk_4b81f7522c", on_delete: :cascade
+  add_foreign_key "reports", "oauth_applications", column: "application_id", on_delete: :nullify
   add_foreign_key "scheduled_statuses", "accounts", on_delete: :cascade
   add_foreign_key "session_activations", "oauth_access_tokens", column: "access_token_id", name: "fk_957e5bda89", on_delete: :cascade
   add_foreign_key "session_activations", "users", name: "fk_e5fda67334", on_delete: :cascade
diff --git a/spec/lib/activitypub/activity/flag_spec.rb b/spec/lib/activitypub/activity/flag_spec.rb
index 426cd97df9acf3..be1bd42a14a810 100644
--- a/spec/lib/activitypub/activity/flag_spec.rb
+++ b/spec/lib/activitypub/activity/flag_spec.rb
@@ -36,6 +36,7 @@
         expect(report).to_not be_nil
         expect(report.comment).to eq 'Boo!!'
         expect(report.status_ids).to eq [status.id]
+        expect(report.application).to be_nil
       end
     end
 
diff --git a/spec/requests/api/v1/reports_spec.rb b/spec/requests/api/v1/reports_spec.rb
index 491c6263d3397e..a72d9bbcd85bbb 100644
--- a/spec/requests/api/v1/reports_spec.rb
+++ b/spec/requests/api/v1/reports_spec.rb
@@ -47,6 +47,7 @@
 
       expect(target_account.targeted_reports).to_not be_empty
       expect(target_account.targeted_reports.first.comment).to eq 'reasons'
+      expect(target_account.targeted_reports.first.application).to eq token.application
 
       expect(emails.size)
         .to eq(1)
diff --git a/spec/services/report_service_spec.rb b/spec/services/report_service_spec.rb
index bf1f937191b74c..6518c5c27ad3a0 100644
--- a/spec/services/report_service_spec.rb
+++ b/spec/services/report_service_spec.rb
@@ -23,6 +23,11 @@
       stub_request(:post, 'http://example.com/inbox').to_return(status: 200)
     end
 
+    it 'does not have an application' do
+      report = subject.call(source_account, remote_account)
+      expect(report.application).to be_nil
+    end
+
     context 'when forward is true', :inline_jobs do
       let(:forward) { true }
 
@@ -96,6 +101,15 @@
     end
   end
 
+  context 'when passed an application' do
+    let(:application) { Fabricate(:application) }
+
+    it 'has an application' do
+      report = subject.call(source_account, target_account, application: application)
+      expect(report.application).to eq application
+    end
+  end
+
   context 'when the reported status is a DM' do
     subject do
       -> { described_class.new.call(source_account, target_account, status_ids: [status.id]) }

From a609940ec9a370a18789ad87532a098fe6e564c9 Mon Sep 17 00:00:00 2001
From: Adam Niedzielski <adamsunday@gmail.com>
Date: Tue, 16 Jul 2024 15:23:26 +0200
Subject: [PATCH 1552/2191] Fix test description in hashtag_bar (#30827)

---
 app/javascript/mastodon/components/__tests__/hashtag_bar.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/components/__tests__/hashtag_bar.tsx b/app/javascript/mastodon/components/__tests__/hashtag_bar.tsx
index b7225fc92e01e4..f86c1a2a6bc5b5 100644
--- a/app/javascript/mastodon/components/__tests__/hashtag_bar.tsx
+++ b/app/javascript/mastodon/components/__tests__/hashtag_bar.tsx
@@ -165,7 +165,7 @@ describe('computeHashtagBarForStatus', () => {
     );
   });
 
-  it('puts the hashtags in the bar if a status content has hashtags in the only line and has a media', () => {
+  it('does not put the hashtags in the bar if a status content has hashtags in the only line and has a media', () => {
     const status = createStatus(
       '<p>This is my content! <a href="test">#hashtag</a></p>',
       ['hashtag'],

From 66430cb25c824cfad0394216d8e7a523533bcf4b Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 16 Jul 2024 17:24:56 +0200
Subject: [PATCH 1553/2191] New Crowdin Translations (automated) (#31038)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/cy.json    | 29 ++++++++--------
 app/javascript/mastodon/locales/gl.json    |  4 +--
 app/javascript/mastodon/locales/kab.json   |  2 +-
 app/javascript/mastodon/locales/zh-TW.json | 10 +++---
 config/locales/cy.yml                      |  9 ++---
 config/locales/devise.cy.yml               |  2 +-
 config/locales/devise.zh-TW.yml            |  4 +--
 config/locales/doorkeeper.cy.yml           |  8 +++--
 config/locales/simple_form.ca.yml          |  2 ++
 config/locales/simple_form.cy.yml          |  2 ++
 config/locales/simple_form.da.yml          |  2 ++
 config/locales/simple_form.de.yml          |  2 ++
 config/locales/simple_form.eo.yml          |  1 +
 config/locales/simple_form.es-AR.yml       |  2 ++
 config/locales/simple_form.es-MX.yml       |  2 ++
 config/locales/simple_form.es.yml          |  2 ++
 config/locales/simple_form.fi.yml          |  2 ++
 config/locales/simple_form.fo.yml          |  2 ++
 config/locales/simple_form.gl.yml          |  2 ++
 config/locales/simple_form.he.yml          |  2 ++
 config/locales/simple_form.hu.yml          |  3 ++
 config/locales/simple_form.is.yml          |  2 ++
 config/locales/simple_form.it.yml          |  2 ++
 config/locales/simple_form.ko.yml          |  2 ++
 config/locales/simple_form.lt.yml          |  3 ++
 config/locales/simple_form.nl.yml          |  2 ++
 config/locales/simple_form.pl.yml          |  2 ++
 config/locales/simple_form.pt-PT.yml       |  2 ++
 config/locales/simple_form.sl.yml          |  2 ++
 config/locales/simple_form.sq.yml          |  2 ++
 config/locales/simple_form.sr-Latn.yml     |  2 ++
 config/locales/simple_form.sr.yml          |  2 ++
 config/locales/simple_form.sv.yml          |  2 ++
 config/locales/simple_form.tr.yml          |  2 ++
 config/locales/simple_form.uk.yml          |  2 ++
 config/locales/simple_form.zh-CN.yml       |  2 ++
 config/locales/simple_form.zh-TW.yml       | 18 +++++-----
 config/locales/zh-TW.yml                   | 40 +++++++++++-----------
 38 files changed, 123 insertions(+), 60 deletions(-)

diff --git a/app/javascript/mastodon/locales/cy.json b/app/javascript/mastodon/locales/cy.json
index 1c7e61832c1f29..9a3fab6155a399 100644
--- a/app/javascript/mastodon/locales/cy.json
+++ b/app/javascript/mastodon/locales/cy.json
@@ -48,8 +48,8 @@
   "account.mention": "Crybwyll @{name}",
   "account.moved_to": "Mae {name} wedi nodi fod eu cyfrif newydd yn:",
   "account.mute": "Tewi @{name}",
-  "account.mute_notifications_short": "Distewi hysbysiadau",
-  "account.mute_short": "Tewi",
+  "account.mute_notifications_short": "Diffodd hysbysiadau",
+  "account.mute_short": "Anwybyddu",
   "account.muted": "Wedi anwybyddu",
   "account.mutual": "Cydgydnabod",
   "account.no_bio": "Dim disgrifiad wedi'i gynnig.",
@@ -92,7 +92,7 @@
   "block_modal.they_cant_mention": "Nid ydynt yn gallu eich crybwyll na'ch dilyn.",
   "block_modal.they_cant_see_posts": "Nid ydynt yn gallu gweld eich postiadau ac ni fyddwch yn gweld eu rhai hwy.",
   "block_modal.they_will_know": "Gallant weld eu bod wedi'u rhwystro.",
-  "block_modal.title": "Rhwystro defnyddiwr?",
+  "block_modal.title": "Blocio defnyddiwr?",
   "block_modal.you_wont_see_mentions": "Ni welwch bostiadau sy'n sôn amdanynt.",
   "boost_modal.combo": "Mae modd pwyso {combo} er mwyn hepgor hyn tro nesa",
   "bundle_column_error.copy_stacktrace": "Copïo'r adroddiad gwall",
@@ -164,7 +164,7 @@
   "compose_form.spoiler.marked": "Dileu rhybudd cynnwys",
   "compose_form.spoiler.unmarked": "Ychwanegu rhybudd cynnwys",
   "compose_form.spoiler_placeholder": "Rhybudd cynnwys (dewisol)",
-  "confirmation_modal.cancel": "Diddymu",
+  "confirmation_modal.cancel": "Canslo",
   "confirmations.block.confirm": "Blocio",
   "confirmations.cancel_follow_request.confirm": "Tynnu'r cais yn ôl",
   "confirmations.cancel_follow_request.message": "Ydych chi'n siŵr eich bod am dynnu'ch cais i ddilyn {name} yn ôl?",
@@ -174,7 +174,7 @@
   "confirmations.delete_list.message": "Ydych chi'n siŵr eich bod eisiau dileu'r rhestr hwn am byth?",
   "confirmations.discard_edit_media.confirm": "Dileu",
   "confirmations.discard_edit_media.message": "Mae gennych newidiadau heb eu cadw i'r disgrifiad cyfryngau neu'r rhagolwg - eu dileu beth bynnag?",
-  "confirmations.domain_block.confirm": "Rhwystro gweinydd",
+  "confirmations.domain_block.confirm": "Blocio gweinydd",
   "confirmations.domain_block.message": "Ydych chi wir, wir eisiau blocio'r holl {domain}? Fel arfer, mae blocio neu dewi pobl penodol yn broses mwy effeithiol. Fyddwch chi ddim yn gweld cynnwys o'r parth hwnnw mewn ffrydiau cyhoeddus neu yn eich hysbysiadau. Bydd eich dilynwyr o'r parth hwnnw yn cael eu ddileu.",
   "confirmations.edit.confirm": "Golygu",
   "confirmations.edit.message": "Bydd golygu nawr yn trosysgrifennu'r neges rydych yn ei ysgrifennu ar hyn o bryd. Ydych chi'n siŵr eich bod eisiau gwneud hyn?",
@@ -201,17 +201,17 @@
   "disabled_account_banner.account_settings": "Gosodiadau'r cyfrif",
   "disabled_account_banner.text": "Mae eich cyfrif {disabledAccount} wedi ei analluogi ar hyn o bryd.",
   "dismissable_banner.community_timeline": "Dyma'r postiadau cyhoeddus diweddaraf gan bobl sydd â chyfrifon ar {domain}.",
-  "dismissable_banner.dismiss": "Diddymu",
+  "dismissable_banner.dismiss": "Cau",
   "dismissable_banner.explore_links": "Dyma straeon newyddion sy’n cael eu rhannu fwyaf ar y we gymdeithasol heddiw. Mae'r straeon newyddion diweddaraf sy'n cael eu postio gan fwy o unigolion gwahanol yn cael eu graddio'n uwch.",
   "dismissable_banner.explore_statuses": "Mae'r rhain yn bostiadau o bob rhan o'r we gymdeithasol sydd ar gynnydd heddiw. Mae postiadau mwy diweddar sydd â mwy o hybiau a ffefrynu'n cael eu graddio'n uwch.",
   "dismissable_banner.explore_tags": "Mae'r rhain yn hashnodau sydd ar gynnydd ar y we gymdeithasol heddiw. Mae hashnodau sy'n cael eu defnyddio gan fwy o unigolion gwahanol yn cael eu graddio'n uwch.",
   "dismissable_banner.public_timeline": "Dyma'r postiadau cyhoeddus diweddaraf gan bobl ar y we gymdeithasol y mae pobl ar {domain} yn eu dilyn.",
-  "domain_block_modal.block": "Rhwystro gweinydd",
-  "domain_block_modal.block_account_instead": "Rhwystro @{name} yn lle hynny",
+  "domain_block_modal.block": "Blocio gweinydd",
+  "domain_block_modal.block_account_instead": "Blocio @{name} yn ei le",
   "domain_block_modal.they_can_interact_with_old_posts": "Gall pobl o'r gweinydd hwn ryngweithio â'ch hen bostiadau.",
   "domain_block_modal.they_cant_follow": "Ni all neb o'r gweinydd hwn eich dilyn.",
-  "domain_block_modal.they_wont_know": "Fyddan nhw ddim yn gwybod eu bod wedi cael eu rhwystro.",
-  "domain_block_modal.title": "Rhwystro parth?",
+  "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_followers": "Bydd eich holl ddilynwyr o'r gweinydd hwn yn cael eu tynnu.",
   "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.",
@@ -252,7 +252,7 @@
   "empty_column.bookmarked_statuses": "Nid oes gennych unrhyw bostiad wedi'u cadw fel llyfrnodau eto. Pan fyddwch yn gosod nod tudalen i un, mi fydd yn ymddangos yma.",
   "empty_column.community": "Mae'r ffrwd lleol yn wag. Beth am ysgrifennu rhywbeth cyhoeddus!",
   "empty_column.direct": "Nid oes gennych unrhyw grybwylliadau preifat eto. Pan fyddwch chi'n anfon neu'n derbyn un, bydd yn ymddangos yma.",
-  "empty_column.domain_blocks": "Nid oes yna unrhyw barthau cuddiedig eto.",
+  "empty_column.domain_blocks": "Nid oes unrhyw barthau wedi'u blocio eto.",
   "empty_column.explore_statuses": "Does dim yn trendio ar hyn o bryd. Dewch nôl nes ymlaen!",
   "empty_column.favourited_statuses": "Nid oes gennych unrhyw hoff bostiadau eto. Pan byddwch yn hoffi un, bydd yn ymddangos yma.",
   "empty_column.favourites": "Nid oes unrhyw un wedi hoffi'r postiad hwn eto. Pan fydd rhywun yn gwneud hynny, byddan nhw'n ymddangos yma.",
@@ -411,6 +411,7 @@
   "limited_account_hint.action": "Dangos y proffil beth bynnag",
   "limited_account_hint.title": "Mae'r proffil hwn wedi cael ei guddio gan gymedrolwyr {domain}.",
   "link_preview.author": "Gan {name}",
+  "link_preview.more_from_author": "Mwy gan {name}",
   "lists.account.add": "Ychwanegu at restr",
   "lists.account.remove": "Tynnu o'r rhestr",
   "lists.delete": "Dileu rhestr",
@@ -484,9 +485,9 @@
   "notification.reblog": "Hybodd {name} eich post",
   "notification.relationships_severance_event": "Wedi colli cysylltiad â {name}",
   "notification.relationships_severance_event.account_suspension": "Mae gweinyddwr o {from} wedi atal {target}, sy'n golygu na allwch dderbyn diweddariadau ganddynt mwyach na rhyngweithio â nhw.",
-  "notification.relationships_severance_event.domain_block": "Mae gweinyddwr o {from} wedi rhwystro {target}, gan gynnwys {followersCount} o'ch dilynwyr a {followingCount, plural, one {# cyfrif} other {# cyfrif}} arall rydych chi'n ei ddilyn.",
+  "notification.relationships_severance_event.domain_block": "Mae gweinyddwr o {from} wedi blocio {target}, gan gynnwys {followersCount} o'ch dilynwyr a {followingCount, plural, one {# cyfrif} other {# cyfrif}} arall rydych chi'n ei ddilyn.",
   "notification.relationships_severance_event.learn_more": "Dysgu mwy",
-  "notification.relationships_severance_event.user_domain_block": "Rydych wedi rhwystro {target}, gan ddileu {followersCount} o'ch dilynwyr a {followingCount, plural, one {# cyfrif} other {#cyfrifon}} arall rydych yn ei ddilyn.",
+  "notification.relationships_severance_event.user_domain_block": "Rydych wedi blocio {target}, gan ddileu {followersCount} o'ch dilynwyr a {followingCount, plural, one {# cyfrif} other {#cyfrifon}} arall rydych yn ei ddilyn.",
   "notification.status": "{name} newydd ei bostio",
   "notification.update": "Golygodd {name} bostiad",
   "notification_requests.accept": "Derbyn",
@@ -803,7 +804,7 @@
   "video.expand": "Ymestyn fideo",
   "video.fullscreen": "Sgrin llawn",
   "video.hide": "Cuddio fideo",
-  "video.mute": "Tewi sain",
+  "video.mute": "Diffodd sain",
   "video.pause": "Oedi",
   "video.play": "Chwarae",
   "video.unmute": "Dad-dewi sain"
diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json
index 03287c7e5224bc..c1e0f97f804764 100644
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@@ -92,7 +92,7 @@
   "block_modal.remote_users_caveat": "Ímoslle pedir ao servidor {domain} que respecte a túa decisión. Emporiso, non hai garantía de que atenda a petición xa que os servidores xestionan os bloqueos de formas diferentes. As publicacións públicas poderían aínda ser visibles para usuarias que non iniciaron sesión.",
   "block_modal.show_less": "Mostrar menos",
   "block_modal.show_more": "Mostrar máis",
-  "block_modal.they_cant_mention": "Non te poden seguir nin mencionar.",
+  "block_modal.they_cant_mention": "Non te pode seguir nin mencionar.",
   "block_modal.they_cant_see_posts": "Non pode ver as túas publicacións nin ti as de ela.",
   "block_modal.they_will_know": "Pode ver que a bloqueaches.",
   "block_modal.title": "Bloquear usuaria?",
@@ -216,7 +216,7 @@
   "domain_block_modal.they_wont_know": "Non saberá que a bloqueaches.",
   "domain_block_modal.title": "Bloquear dominio?",
   "domain_block_modal.you_will_lose_followers": "Vanse eliminar todas as túas seguidoras deste servidor.",
-  "domain_block_modal.you_wont_see_posts": "Non verás publicacións ou notificación das usuarias neste servidor.",
+  "domain_block_modal.you_wont_see_posts": "Non verás publicacións ou notificacións das usuarias deste servidor.",
   "domain_pill.activitypub_lets_connect": "Permíteche conectar e interactuar con persoas non só de Mastodon, se non tamén con outras apps sociais.",
   "domain_pill.activitypub_like_language": "ActivityPub é algo así como o idioma que Mastodon fala con outras redes sociais.",
   "domain_pill.server": "Servidor",
diff --git a/app/javascript/mastodon/locales/kab.json b/app/javascript/mastodon/locales/kab.json
index 868edbc8c0fe4c..a5c3280712a97f 100644
--- a/app/javascript/mastodon/locales/kab.json
+++ b/app/javascript/mastodon/locales/kab.json
@@ -580,7 +580,7 @@
   "status.mute_conversation": "Sgugem adiwenni",
   "status.open": "Semɣeṛ tasuffeɣt-ayi",
   "status.pin": "Senteḍ-itt deg umaɣnu",
-  "status.pinned": "Tijewwiqin yettwasentḍen",
+  "status.pinned": "Tisuffaɣ yettwasentḍen",
   "status.read_more": "Issin ugar",
   "status.reblog": "Bḍu",
   "status.reblogged_by": "Yebḍa-tt {name}",
diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json
index 04469a971d5cbf..b9a5fc071468ca 100644
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@@ -113,7 +113,7 @@
   "closed_registrations.other_server_instructions": "因為 Mastodon 是去中心化的，所以您也能於其他伺服器上建立帳號，並仍然與這個伺服器互動。",
   "closed_registrations_modal.description": "目前無法於 {domain} 建立新帳號，但也請別忘了，您並不一定需要有 {domain} 伺服器的帳號，也能使用 Mastodon。",
   "closed_registrations_modal.find_another_server": "尋找另一個伺服器",
-  "closed_registrations_modal.preamble": "Mastodon 是去中心化的，所以無論您於哪個伺服器新增帳號，都可以與此伺服器上的任何人跟隨及互動。您甚至能自行架設一個自己的伺服器！",
+  "closed_registrations_modal.preamble": "Mastodon 是去中心化的，所以無論您於哪個伺服器新增帳號，都可以與此伺服器上的任何人跟隨及互動。您甚至能自行架設自己的伺服器！",
   "closed_registrations_modal.title": "註冊 Mastodon",
   "column.about": "關於",
   "column.blocks": "已封鎖的使用者",
@@ -271,7 +271,7 @@
   "empty_column.public": "這裡什麼都沒有！嘗試寫些公開的嘟文，或者跟隨其他伺服器的使用者後，就會有嘟文出現了",
   "error.unexpected_crash.explanation": "由於發生系統故障或瀏覽器相容性問題，無法正常顯示此頁面。",
   "error.unexpected_crash.explanation_addons": "此頁面無法被正常顯示，這可能是由瀏覽器附加元件或網頁自動翻譯工具造成的。",
-  "error.unexpected_crash.next_steps": "請嘗試重新整理頁面。如果狀況沒有改善，您可以使用不同的瀏覽器或應用程式來檢視來使用 Mastodon。",
+  "error.unexpected_crash.next_steps": "請嘗試重新整理頁面。如果狀況沒有改善，您可以使用不同的瀏覽器或應用程式以檢視來使用 Mastodon。",
   "error.unexpected_crash.next_steps_addons": "請嘗試關閉它們然後重新整理頁面。如果狀況沒有改善，您可以使用不同的瀏覽器或應用程式來檢視來使用 Mastodon。",
   "errors.unexpected_crash.copy_stacktrace": "複製 stacktrace 到剪貼簿",
   "errors.unexpected_crash.report_issue": "回報問題",
@@ -356,7 +356,7 @@
   "home.show_announcements": "顯示公告",
   "interaction_modal.description.favourite": "若於 Mastodon 上有個帳號，您可以將此嘟文加入最愛使作者知道您欣賞它且將它儲存下來。",
   "interaction_modal.description.follow": "若於 Mastodon 上有個帳號，您可以跟隨 {name} 以於首頁時間軸接收他們的嘟文。",
-  "interaction_modal.description.reblog": "若於 Mastodon 上有個帳號，您可以轉嘟此嘟文以分享給您的跟隨者們。",
+  "interaction_modal.description.reblog": "若於 Mastodon 上有個帳號，您可以轉嘟此嘟文以向您的跟隨者們分享。",
   "interaction_modal.description.reply": "若於 Mastodon 上有個帳號，您可以回覆此嘟文。",
   "interaction_modal.login.action": "返回首頁",
   "interaction_modal.login.prompt": "您帳號所屬伺服器之網域，例如：mastodon.social",
@@ -552,7 +552,7 @@
   "onboarding.follows.lead": "您的首頁時間軸是 Mastodon 的核心體驗。若您跟隨更多人，它將會變得更活躍有趣。這些個人檔案也許是個好起點，您可以隨時取消跟隨他們！",
   "onboarding.follows.title": "客製化您的首頁時間軸",
   "onboarding.profile.discoverable": "使我的個人檔案可以被找到",
-  "onboarding.profile.discoverable_hint": "當您於 Mastodon 上選擇加入可發現性時，您的嘟文可能會顯示於搜尋結果與趨勢中。您的個人檔案可能會被推薦給與您志趣相投的人。",
+  "onboarding.profile.discoverable_hint": "當您於 Mastodon 上選擇加入可發現性時，您的嘟文可能會顯示於搜尋結果與趨勢中。您的個人檔案可能會被推薦至與您志趣相投的人。",
   "onboarding.profile.display_name": "顯示名稱",
   "onboarding.profile.display_name_hint": "完整名稱或暱稱...",
   "onboarding.profile.lead": "您隨時可以稍候於設定中完成此操作，將有更多自訂選項可使用。",
@@ -797,7 +797,7 @@
   "upload_modal.applying": "正在套用...",
   "upload_modal.choose_image": "選擇圖片",
   "upload_modal.description_placeholder": "我能吞下玻璃而不傷身體",
-  "upload_modal.detect_text": "從圖片中偵測文字",
+  "upload_modal.detect_text": "自圖片中偵測文字",
   "upload_modal.edit_media": "編輯媒體",
   "upload_modal.hint": "於預覽中點擊或拖曳圓圈以選擇將於所有縮圖中顯示的焦點。",
   "upload_modal.preparing_ocr": "準備 OCR 中……",
diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index 35ed5ade8aa913..cd48b3e3b0ec2f 100644
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@@ -305,6 +305,7 @@ cy:
       filter_by_action: Hidlo yn ôl gweithred
       filter_by_user: Hidlo yn ôl defnyddiwr
       title: Cofnod archwilio
+      unavailable_instance: "(nid yw enw'r parth ar gael)"
     announcements:
       destroyed_msg: Cyhoeddiad wedi'i ddileu'n llwyddiannus!
       edit:
@@ -1436,7 +1437,7 @@ cy:
       domain_blocking_html: Rydych ar fin <strong>rhwystro</strong> hyd at <strong>%{total_items} parth</strong> o <strong>%{filename}</strong> .
       following_html: Rydych ar fin <strong>dilyn</strong> hyd at <strong>%{total_items} cyfrif</strong> gan <strong>%{filename}</strong> .
       lists_html: Rydych ar fin ychwanegu hyd at <strong>%{total_items} o gyfrifon</strong> o <strong>%{filename}</strong> at eich <strong>rhestrau</strong> . Bydd rhestrau newydd yn cael eu creu os nad oes rhestr i ychwanegu ati.
-      muting_html: Rydych ar fin <strong>tewi</strong> hyd at <strong>%{total_items} cyfrif</strong> o <strong>%{filename}</strong> .
+      muting_html: Rydych ar fin <strong>anwybyddu</strong> hyd at <strong>%{total_items} cyfrif</strong> o <strong>%{filename}</strong>.
     preface: Gallwch fewnforio data rydych chi wedi'i allforio o weinydd arall, fel rhestr o'r bobl rydych chi'n eu dilyn neu'n eu blocio.
     recent_imports: Mewnforion diweddar
     states:
@@ -1529,9 +1530,9 @@ cy:
       too_many: Methu atodi mwy na 4 ffeil
   migrations:
     acct: Symudwyd i
-    cancel: Diddymu ailgyfeirio
-    cancel_explanation: Bydd diddymu'r ailgyfeiriad yn ail agor eich cyfrif cyfredol, ond ni fydd yn dod â dilynwyr sydd wedi'u symud i'r cyfrif hwnnw yn ôl.
-    cancelled_msg: Wedi diddymu'r ailgyfeiriad yn llwyddiannus.
+    cancel: Canslo ailgyfeirio
+    cancel_explanation: Bydd canslo'r ailgyfeiriad yn ail agor eich cyfrif cyfredol, ond ni fydd yn dod â dilynwyr sydd wedi'u symud i'r cyfrif hwnnw yn ôl.
+    cancelled_msg: Wedi canslo'r ailgyfeiriad yn llwyddiannus.
     errors:
       already_moved: yw'r un cyfrif rydych chi wedi symud iddo eisoes
       missing_also_known_as: nid yw'n arallenw o'r cyfrif hwn
diff --git a/config/locales/devise.cy.yml b/config/locales/devise.cy.yml
index 523ae70b049c4a..b41e12f85d69fd 100644
--- a/config/locales/devise.cy.yml
+++ b/config/locales/devise.cy.yml
@@ -93,7 +93,7 @@ cy:
       updated: Mae eich cyfrinair wedi'i newid yn llwyddiannus. Rydych chi bellach wedi mewngofnodi.
       updated_not_active: Mae eich cyfrinair wedi ei newid yn llwyddiannus.
     registrations:
-      destroyed: Hwyl fawr! Mae eich cyfrif wedi ei ddiddymu'n llwyddiannus. Gobeithiwn eich gweld chi eto'n fuan.
+      destroyed: Hwyl fawr! Mae eich cyfrif wedi ei chanslo'n llwyddiannus. Gobeithiwn eich gweld chi eto'n fuan.
       signed_up: Croeso! Rydych wedi cofrestru'n llwyddiannus.
       signed_up_but_inactive: Yr ydych wedi cofrestru'n llwyddiannus. Fodd bynnag, ni allwn eich mewngofnodi achos nid yw eich cyfrif wedi ei hagor eto.
       signed_up_but_locked: Rydych chi wedi cofrestru'n llwyddiannus. Fodd bynnag, ni allem eich mewngofnodi oherwydd bod eich cyfrif wedi'i gloi.
diff --git a/config/locales/devise.zh-TW.yml b/config/locales/devise.zh-TW.yml
index 7ead831e4f75aa..3e3af9f323997c 100644
--- a/config/locales/devise.zh-TW.yml
+++ b/config/locales/devise.zh-TW.yml
@@ -75,7 +75,7 @@ zh-TW:
           title: 您的一支安全密鑰已經被移除
       webauthn_disabled:
         explanation: 您的帳號已停用安全金鑰身份驗證。
-        extra: 現在僅可使用配對的 TOTP 應用程式產生之 token 登入。
+        extra: 目前僅可使用配對的 TOTP 應用程式產生之 token 登入。
         subject: Mastodon：安全密鑰認證方式已停用
         title: 已停用安全密鑰
       webauthn_enabled:
@@ -90,7 +90,7 @@ zh-TW:
       no_token: 您必須透過密碼重設信件才能存取此頁面。若確實如此，請確定輸入的網址是完整的。
       send_instructions: 若電子郵件地址存在於我們的資料庫，幾分鐘後您將於信箱中收到密碼復原連結。若未收到請檢查垃圾郵件資料夾。
       send_paranoid_instructions: 若電子郵件地址存在於我們的資料庫，幾分鐘後您將於信箱中收到密碼復原連結。若未收到請檢查垃圾郵件資料夾。
-      updated: 您的密碼已成功變更，現在已經登入。
+      updated: 您的密碼已成功變更，您現在已經成功登入。
       updated_not_active: 您的密碼已成功變更。
     registrations:
       destroyed: 再見！您的帳號已成功取消，期待再相逢。
diff --git a/config/locales/doorkeeper.cy.yml b/config/locales/doorkeeper.cy.yml
index e79aa0359f67b8..e023bc060312c8 100644
--- a/config/locales/doorkeeper.cy.yml
+++ b/config/locales/doorkeeper.cy.yml
@@ -20,7 +20,7 @@ cy:
     applications:
       buttons:
         authorize: Awdurdodi
-        cancel: Diddymu
+        cancel: Canslo
         destroy: Dinistrio
         edit: Golygu
         submit: Cyflwyno
@@ -72,7 +72,7 @@ cy:
         revoke: Ydych chi'n siŵr?
       index:
         authorized_at: Wedi'i awdurdodi ar %{date}
-        description_html: Mae'r rhain yn raglenni sy'n gallu cael mynediad i'ch cyfrif gan ddefnyddio'r API. Os oes yna rhaglenni nad ydych chi'n eu hadnabod yma, neu os yw rhaglen yn camymddwyn, gallwch chi ddiddymu ei fynediad.
+        description_html: Mae'r rhain yn raglenni sy'n gallu cael mynediad i'ch cyfrif gan ddefnyddio'r API. Os oes yna rhaglenni nad ydych chi'n eu hadnabod yma, neu os yw rhaglen yn camymddwyn, gallwch chi ddirymu ei fynediad.
         last_used_at: Defnyddiwyd ddiwethaf ar %{date}
         never_used: Erioed wedi'i ddefnyddio
         scopes: Caniatâd
@@ -83,7 +83,7 @@ cy:
         access_denied: Mae perchennog yr adnodd neu'r gweinydd awdurdodi wedi atal y cais.
         credential_flow_not_configured: Llif meini prawf cyfrinair perchennog yr adnodd wedi methu achos fod Doorkeeper.configure.resource_owner_from_credentials heb ei ffurfweddu.
         invalid_client: Methodd dilysu cleient oherwydd cleient anhysbys, dim dilysiad cleient wedi'i gynnwys, neu ddull dilysu heb ei gefnogi.
-        invalid_grant: Mae'r grant awdurdodi ar yr amod yn annilys, wedi dod i ben, wedi'i ddiddymu, nid yw'n cyfateb i'r URI ailgyfeirio a ddefnyddiwyd yn y cais am awdurdodiad, neu wedi'i roi i gleient arall.
+        invalid_grant: Mae'r grant awdurdodi ar yr amod yn annilys, wedi dod i ben, wedi'i ddirymu, nid yw'n cyfateb i'r URI ailgyfeirio a ddefnyddiwyd yn y cais am awdurdodiad, neu wedi'i roi i gleient arall.
         invalid_redirect_uri: Nid yw'r uri ailgyfeirio a gynhwysir yn ddilys.
         invalid_request:
           missing_param: 'Paramedr gofynnol ar goll: %{value}.'
@@ -135,6 +135,7 @@ cy:
         media: Atodiadau cyfryngau
         mutes: Anwybyddiadau
         notifications: Hysbysiadau
+        profile: Eich proffil Mastodon
         push: Hysbysiadau gwthiadwy
         reports: Adroddiadau
         search: Chwilio
@@ -165,6 +166,7 @@ cy:
       admin:write:reports: cyflawni camau cymedroli ar adroddiadau
       crypto: defnyddio amgryptio ben i ben
       follow: addasu perthnasau cyfrif
+      profile: darllen dim ond gwybodaeth proffil eich cyfrif
       push: derbyn eich hysbysiadau gwthiadwy
       read: darllen holl ddata eich cyfrif
       read:accounts: gweld gwybodaeth y cyfrif
diff --git a/config/locales/simple_form.ca.yml b/config/locales/simple_form.ca.yml
index 4bb906abdbd897..2e0199d7fd5b06 100644
--- a/config/locales/simple_form.ca.yml
+++ b/config/locales/simple_form.ca.yml
@@ -243,11 +243,13 @@ ca:
           warn: Oculta amb un avís
       form_admin_settings:
         activity_api_enabled: Publica a l'API estadístiques agregades sobre l'activitat dels usuaris
+        app_icon: Icona de l'aplicació
         backups_retention_period: Període de retenció del arxiu d'usuari
         bootstrap_timeline_accounts: Recomana sempre aquests comptes als nous usuaris
         closed_registrations_message: Missatge personalitzat quan el registre no és accessible
         content_cache_retention_period: Període de retenció del contingut remot
         custom_css: CSS personalitzat
+        favicon: Icona de preferits
         mascot: Mascota personalitzada (llegat)
         media_cache_retention_period: Període de retenció del cau multimèdia
         peers_api_enabled: Publica a l'API la llista de servidors descoberts
diff --git a/config/locales/simple_form.cy.yml b/config/locales/simple_form.cy.yml
index 5e8fd85293f75a..cd5bc1add788b8 100644
--- a/config/locales/simple_form.cy.yml
+++ b/config/locales/simple_form.cy.yml
@@ -242,11 +242,13 @@ cy:
           warn: Cuddio â rhybudd
       form_admin_settings:
         activity_api_enabled: Cyhoeddi ystadegau cyfanredol am weithgarwch defnyddwyr yn yr API
+        app_icon: Eicon ap
         backups_retention_period: Cyfnod cadw archif defnyddwyr
         bootstrap_timeline_accounts: Argymhellwch y cyfrifon hyn i ddefnyddwyr newydd bob amser
         closed_registrations_message: Neges bersonol pan nad yw cofrestriadau ar gael
         content_cache_retention_period: Cyfnod cadw cynnwys o bell
         custom_css: CSS cyfaddas
+        favicon: Favicon
         mascot: Mascot cyfaddas (hen)
         media_cache_retention_period: Cyfnod cadw storfa cyfryngau
         peers_api_enabled: Cyhoeddi rhestr o weinyddion a ddarganfuwyd yn yr API
diff --git a/config/locales/simple_form.da.yml b/config/locales/simple_form.da.yml
index 73a32cf2fdee2d..9e949d16839f7d 100644
--- a/config/locales/simple_form.da.yml
+++ b/config/locales/simple_form.da.yml
@@ -243,11 +243,13 @@ da:
           warn: Skjul bag en advarsel
       form_admin_settings:
         activity_api_enabled: Offentliggør samlede statistikker vedr. brugeraktivitet i API'en
+        app_icon: App-ikon
         backups_retention_period: Brugerarkivs opbevaringsperiode
         bootstrap_timeline_accounts: Anbefal altid disse konti til nye brugere
         closed_registrations_message: Tilpasset besked, når tilmelding er utilgængelig
         content_cache_retention_period: Opbevaringsperiode for eksternt indhold
         custom_css: Tilpasset CSS
+        favicon: Favikon
         mascot: Tilpasset maskot (ældre funktion)
         media_cache_retention_period: Media-cache opbevaringsperiode
         peers_api_enabled: Udgiv liste over fundne server i API'en
diff --git a/config/locales/simple_form.de.yml b/config/locales/simple_form.de.yml
index 5711d2a12a4993..332d9513952126 100644
--- a/config/locales/simple_form.de.yml
+++ b/config/locales/simple_form.de.yml
@@ -243,11 +243,13 @@ de:
           warn: Mit einer Inhaltswarnung ausblenden
       form_admin_settings:
         activity_api_enabled: Aggregierte Nutzungsdaten über die API veröffentlichen
+        app_icon: App-Symbol
         backups_retention_period: Aufbewahrungsfrist für Archive
         bootstrap_timeline_accounts: Neuen Nutzern immer diese Konten empfehlen
         closed_registrations_message: Nachricht, falls Registrierungen deaktiviert sind
         content_cache_retention_period: Aufbewahrungsfrist für externe Inhalte
         custom_css: Eigenes CSS
+        favicon: Favicon
         mascot: Benutzerdefiniertes Maskottchen (Legacy)
         media_cache_retention_period: Aufbewahrungsfrist für Medien im Cache
         peers_api_enabled: Die entdeckten Server im Fediverse über die API veröffentlichen
diff --git a/config/locales/simple_form.eo.yml b/config/locales/simple_form.eo.yml
index 40535bf96bc12e..021be93b5d74cb 100644
--- a/config/locales/simple_form.eo.yml
+++ b/config/locales/simple_form.eo.yml
@@ -235,6 +235,7 @@ eo:
           warn: Kaŝi malantaŭ averto
       form_admin_settings:
         activity_api_enabled: Publikigi entutajn statistikojn pri uzantagado en la API
+        app_icon: Apbildo
         backups_retention_period: Uzantoarkivretendauro
         bootstrap_timeline_accounts: Ĉiam rekomendi ĉi tiujn kontojn al novaj uzantoj
         closed_registrations_message: Kutima mesaĝo kiam registroj ne estas disponeblaj
diff --git a/config/locales/simple_form.es-AR.yml b/config/locales/simple_form.es-AR.yml
index 1d1ac876894f94..71d9726b079423 100644
--- a/config/locales/simple_form.es-AR.yml
+++ b/config/locales/simple_form.es-AR.yml
@@ -243,11 +243,13 @@ es-AR:
           warn: Ocultar con una advertencia
       form_admin_settings:
         activity_api_enabled: Publicar estadísticas agregadas sobre la actividad de la cuenta en la API
+        app_icon: Ícono de la aplicación
         backups_retention_period: Período de retención del archivo historial del usuario
         bootstrap_timeline_accounts: Siempre recomendar estas cuentas a usuarios nuevos
         closed_registrations_message: Mensaje personalizado cuando los registros no están disponibles
         content_cache_retention_period: Período de retención de contenido remoto
         custom_css: CSS personalizado
+        favicon: Favicón
         mascot: Mascota personalizada (legado)
         media_cache_retention_period: Período de retención de la caché de medios
         peers_api_enabled: Publicar lista de servidores descubiertos en la API
diff --git a/config/locales/simple_form.es-MX.yml b/config/locales/simple_form.es-MX.yml
index 19a1c9d0c095f9..730e9b265b335a 100644
--- a/config/locales/simple_form.es-MX.yml
+++ b/config/locales/simple_form.es-MX.yml
@@ -243,11 +243,13 @@ es-MX:
           warn: Ocultar con una advertencia
       form_admin_settings:
         activity_api_enabled: Publicar estadísticas locales acerca de la actividad de usuario en la API
+        app_icon: Icono de la app
         backups_retention_period: Período de retención del archivo de usuario
         bootstrap_timeline_accounts: Recomendar siempre estas cuentas a nuevos usuarios
         closed_registrations_message: Mensaje personalizado cuando los registros no están disponibles
         content_cache_retention_period: Período de retención de contenido remoto
         custom_css: CSS personalizado
+        favicon: Favicon
         mascot: Mascota personalizada (legado)
         media_cache_retention_period: Período de retención de caché multimedia
         peers_api_enabled: Publicar lista de servidores descubiertos en la API
diff --git a/config/locales/simple_form.es.yml b/config/locales/simple_form.es.yml
index cc71e192665609..f2d91349adad6b 100644
--- a/config/locales/simple_form.es.yml
+++ b/config/locales/simple_form.es.yml
@@ -243,11 +243,13 @@ es:
           warn: Ocultar con una advertencia
       form_admin_settings:
         activity_api_enabled: Publicar estadísticas agregadas sobre la actividad del usuario con la API
+        app_icon: Icono de la app
         backups_retention_period: Período de retención del archivo de usuario
         bootstrap_timeline_accounts: Recomendar siempre estas cuentas a nuevos usuarios
         closed_registrations_message: Mensaje personalizado cuando los registros no están disponibles
         content_cache_retention_period: Período de retención de contenido remoto
         custom_css: CSS personalizado
+        favicon: Favicon
         mascot: Mascota personalizada (legado)
         media_cache_retention_period: Período de retención de caché multimedia
         peers_api_enabled: Publicar lista de servidores descubiertos en la API
diff --git a/config/locales/simple_form.fi.yml b/config/locales/simple_form.fi.yml
index 214308ba5cc6e6..de099a21be2e1a 100644
--- a/config/locales/simple_form.fi.yml
+++ b/config/locales/simple_form.fi.yml
@@ -243,11 +243,13 @@ fi:
           warn: Piilota varoittaen
       form_admin_settings:
         activity_api_enabled: Julkaise yhteenlasketut tilastot käyttäjätoiminnasta ohjelmointirajapinnassa
+        app_icon: Sovelluskuvake
         backups_retention_period: Käyttäjän arkiston säilytysaika
         bootstrap_timeline_accounts: Suosittele aina näitä tilejä uusille käyttäjille
         closed_registrations_message: Mukautettu viesti, kun rekisteröityminen ei ole saatavilla
         content_cache_retention_period: Etäsisällön säilytysaika
         custom_css: Mukautettu CSS
+        favicon: Suosikkikuvake
         mascot: Mukautettu maskotti (vanhentunut ominaisuus)
         media_cache_retention_period: Mediasisältövälimuistin säilytysaika
         peers_api_enabled: Julkaise löydettyjen palvelinten luettelo ohjelmointirajapinnassa
diff --git a/config/locales/simple_form.fo.yml b/config/locales/simple_form.fo.yml
index 8f0b51719fceed..b334d4f034ac5f 100644
--- a/config/locales/simple_form.fo.yml
+++ b/config/locales/simple_form.fo.yml
@@ -243,11 +243,13 @@ fo:
           warn: Fjal við eini ávaring
       form_admin_settings:
         activity_api_enabled: Útgev samantald hagtøl um brúkaravirksemi í API'num
+        app_icon: App ikon
         backups_retention_period: Hvussu leingi verða brúkarasøvn goymd
         bootstrap_timeline_accounts: Mæl altíð nýggjum brúkarum at fylgja hesar kontur
         closed_registrations_message: Serskild boð, tá tað ikki er møguligt at tilmelda seg
         content_cache_retention_period: Tíðarskeið fyri varðveiðslu av fjartilfari
         custom_css: Serskilt CSS
+        favicon: Favikon
         mascot: Serskildur maskottur (arvur)
         media_cache_retention_period: Tíðarskeið, har miðlagoymslur verða varðveittar
         peers_api_enabled: Kunnger lista við uppdagaðum ambætarum í API'num
diff --git a/config/locales/simple_form.gl.yml b/config/locales/simple_form.gl.yml
index 0653d7620430ec..57bf31b42d2851 100644
--- a/config/locales/simple_form.gl.yml
+++ b/config/locales/simple_form.gl.yml
@@ -243,11 +243,13 @@ gl:
           warn: Agochar tras un aviso
       form_admin_settings:
         activity_api_enabled: Publicar na API estatísticas agregadas acerca da actividade das usuarias
+        app_icon: Icona da app
         backups_retention_period: Período de retención do arquivo da usuaria
         bootstrap_timeline_accounts: Recomendar sempre estas contas ás novas usuarias
         closed_registrations_message: Mensaxe personalizada para cando o rexistro está pechado
         content_cache_retention_period: Período de retención de contido remoto
         custom_css: CSS personalizado
+        favicon: Favicon
         mascot: Mascota propia (herdado)
         media_cache_retention_period: Período de retención da caché multimedia
         peers_api_enabled: Publicar na API unha lista dos servidores descubertos
diff --git a/config/locales/simple_form.he.yml b/config/locales/simple_form.he.yml
index 1331d2f62bc157..f79ddb9b34e832 100644
--- a/config/locales/simple_form.he.yml
+++ b/config/locales/simple_form.he.yml
@@ -243,11 +243,13 @@ he:
           warn: הסתרה עם אזהרה
       form_admin_settings:
         activity_api_enabled: פרסום סטטיסטיקות מקובצות עבור פעילות משתמשים באמצעות מנשק התוכנה
+        app_icon: אייקון יישומון
         backups_retention_period: תקופת השמירה של ארכיון המשתמש
         bootstrap_timeline_accounts: המלצה על חשבונות אלה למשתמשים חדשים
         closed_registrations_message: הודעה מיוחדת כשההרשמה לא מאופשרת
         content_cache_retention_period: תקופת השמירה על תוכן חיצוני
         custom_css: CSS בהתאמה אישית
+        favicon: סמל מועדפים (Favicon)
         mascot: סמל השרת (ישן)
         media_cache_retention_period: תקופת שמירת מטמון מדיה
         peers_api_enabled: פרסם רשימה של שרתים שנתגלו באמצעות ה-API
diff --git a/config/locales/simple_form.hu.yml b/config/locales/simple_form.hu.yml
index 6ccca2bc847928..518a82ec163a99 100644
--- a/config/locales/simple_form.hu.yml
+++ b/config/locales/simple_form.hu.yml
@@ -211,6 +211,7 @@ hu:
         setting_default_privacy: Bejegyzések láthatósága
         setting_default_sensitive: Minden médiafájl megjelölése kényesként
         setting_delete_modal: Megerősítés kérése bejegyzés törlése előtt
+        setting_disable_hover_cards: Profilelőnézet letiltása föléhúzás esetén
         setting_disable_swiping: Elhúzás művelet kikapcsolása
         setting_display_media: Média megjelenítése
         setting_display_media_default: Alapértelmezés
@@ -242,11 +243,13 @@ hu:
           warn: Elrejtés figyelmeztetéssel
       form_admin_settings:
         activity_api_enabled: Összesített statisztikák közzététele az API-ban a felhasználók aktivitásáról
+        app_icon: Alkalmazásikon
         backups_retention_period: Felhasználói archívum megtartási időszaka
         bootstrap_timeline_accounts: Mindig javasoljuk ezeket a fiókokat az új felhasználók számára
         closed_registrations_message: A feliratkozáskor megjelenő egyéni üzenet nem érhető el
         content_cache_retention_period: Távoli tartalmak megtartási időszaka
         custom_css: Egyéni CSS
+        favicon: Könyvjelzőikon
         mascot: Egyéni kabala (örökölt)
         media_cache_retention_period: Média-gyorsítótár megtartási időszaka
         peers_api_enabled: Felfedezett kiszolgálók listájának közzététele az API-ban
diff --git a/config/locales/simple_form.is.yml b/config/locales/simple_form.is.yml
index cc267db8d5629e..9e28ef9be695b9 100644
--- a/config/locales/simple_form.is.yml
+++ b/config/locales/simple_form.is.yml
@@ -243,11 +243,13 @@ is:
           warn: Fela með aðvörun
       form_admin_settings:
         activity_api_enabled: Birta samantektartölfræði um virkni notanda í API-kerfisviðmótinu
+        app_icon: Táknmynd forrits
         backups_retention_period: Tímalengd sem safni notandans er haldið eftir
         bootstrap_timeline_accounts: Alltaf mæla með þessum notendaaðgöngum fyrir nýja notendur
         closed_registrations_message: Sérsniðin skilaboð þegar ekki er hægt að nýskrá
         content_cache_retention_period: Tímabil sem á að geyma fjartengt efni
         custom_css: Sérsniðið CSS
+        favicon: Auðkennismynd
         mascot: Sérsniðið gæludýr (eldra)
         media_cache_retention_period: Tímalengd sem myndefni haldið
         peers_api_enabled: Birta lista yfir uppgötvaða netþjóna í API-kerfisviðmótinu
diff --git a/config/locales/simple_form.it.yml b/config/locales/simple_form.it.yml
index 540812faa9958f..eddc86b4e11ad8 100644
--- a/config/locales/simple_form.it.yml
+++ b/config/locales/simple_form.it.yml
@@ -243,11 +243,13 @@ it:
           warn: Nascondi con avviso
       form_admin_settings:
         activity_api_enabled: Pubblica le statistiche aggregate sull'attività degli utenti nell'API
+        app_icon: Icona app
         backups_retention_period: Periodo di conservazione dell'archivio utente
         bootstrap_timeline_accounts: Consiglia sempre questi account ai nuovi utenti
         closed_registrations_message: Messaggio personalizzato quando le iscrizioni non sono disponibili
         content_cache_retention_period: Periodo di ritenzione del contenuto remoto
         custom_css: Personalizza CSS
+        favicon: Favicon
         mascot: Personalizza mascotte (legacy)
         media_cache_retention_period: Periodo di conservazione della cache multimediale
         peers_api_enabled: Pubblica l'elenco dei server scoperti nell'API
diff --git a/config/locales/simple_form.ko.yml b/config/locales/simple_form.ko.yml
index 1107e4cba5b736..b94b4b3d40425b 100644
--- a/config/locales/simple_form.ko.yml
+++ b/config/locales/simple_form.ko.yml
@@ -243,11 +243,13 @@ ko:
           warn: 경고와 함께 숨기기
       form_admin_settings:
         activity_api_enabled: API에 유저 활동에 대한 통계 발행
+        app_icon: 앱 아이콘
         backups_retention_period: 사용자 아카이브 유지 기한
         bootstrap_timeline_accounts: 새로운 사용자들에게 추천할 계정들
         closed_registrations_message: 가입이 불가능 할 때의 사용자 지정 메시지
         content_cache_retention_period: 리모트 콘텐츠 보유 기간
         custom_css: 사용자 정의 CSS
+        favicon: 파비콘
         mascot: 사용자 정의 마스코트 (legacy)
         media_cache_retention_period: 미디어 캐시 유지 기한
         peers_api_enabled: API에 발견 된 서버들의 목록 발행
diff --git a/config/locales/simple_form.lt.yml b/config/locales/simple_form.lt.yml
index feec37ae003676..b31803409b3976 100644
--- a/config/locales/simple_form.lt.yml
+++ b/config/locales/simple_form.lt.yml
@@ -137,6 +137,7 @@ lt:
         setting_default_privacy: Skelbimo privatumas
         setting_default_sensitive: Visada žymėti mediją kaip jautrią
         setting_delete_modal: Rodyti patvirtinimo dialogą prieš ištrinant įrašą
+        setting_disable_hover_cards: Išjungti profilio peržiūrą užvedus
         setting_disable_swiping: Išjungti perbraukimo judėjimus
         setting_display_media: Medijos rodymas
         setting_display_media_hide_all: Slėpti viską
@@ -164,9 +165,11 @@ lt:
           warn: Slėpti su įspėjimu
       form_admin_settings:
         activity_api_enabled: Skelbti suvestinį statistiką apie naudotojų veiklą per API
+        app_icon: Programėlės piktograma
         bootstrap_timeline_accounts: Visada rekomenduoti šias paskyras naujiems naudotojams
         content_cache_retention_period: Nuotolinio turinio saugojimo laikotarpis
         custom_css: Pasirinktinis CSS
+        favicon: Svetainės piktograma
         mascot: Pasirinktinis talismanas (pasenęs)
         registrations_mode: Kas gali užsiregistruoti
         require_invite_text: Reikalauti priežasties prisijungti
diff --git a/config/locales/simple_form.nl.yml b/config/locales/simple_form.nl.yml
index 5110e1e6d09b9a..56331934064401 100644
--- a/config/locales/simple_form.nl.yml
+++ b/config/locales/simple_form.nl.yml
@@ -243,11 +243,13 @@ nl:
           warn: Met een waarschuwing verbergen
       form_admin_settings:
         activity_api_enabled: Statistieken over gebruikersactiviteit via de API publiceren
+        app_icon: App-pictogram
         backups_retention_period: Bewaartermijn gebruikersarchief
         bootstrap_timeline_accounts: Accounts die altijd aan nieuwe gebruikers worden aanbevolen
         closed_registrations_message: Aangepast bericht wanneer registratie is uitgeschakeld
         content_cache_retention_period: Bewaartermijn voor externe inhoud
         custom_css: Aangepaste CSS
+        favicon: Favicon
         mascot: Aangepaste mascotte (legacy)
         media_cache_retention_period: Bewaartermijn mediacache
         peers_api_enabled: Lijst van bekende servers via de API publiceren
diff --git a/config/locales/simple_form.pl.yml b/config/locales/simple_form.pl.yml
index b8de10de26a336..39e1814195f877 100644
--- a/config/locales/simple_form.pl.yml
+++ b/config/locales/simple_form.pl.yml
@@ -243,11 +243,13 @@ pl:
           warn: Ukryj z ostrzeżeniem
       form_admin_settings:
         activity_api_enabled: Publikuj zagregowane statystyki dotyczące aktywności użytkownika w API
+        app_icon: Ikona aplikacji
         backups_retention_period: Okres przechowywania archiwum użytkownika
         bootstrap_timeline_accounts: Zawsze rekomenduj te konta nowym użytkownikom
         closed_registrations_message: Niestandardowa wiadomość, gdy rejestracje nie są dostępne
         content_cache_retention_period: Okres zachowywania zdalnych treści
         custom_css: Niestandardowy CSS
+        favicon: Favicon
         mascot: Własna ikona
         media_cache_retention_period: Okres przechowywania pamięci podręcznej
         peers_api_enabled: Opublikuj listę odkrytych serwerów w API
diff --git a/config/locales/simple_form.pt-PT.yml b/config/locales/simple_form.pt-PT.yml
index f993687b91bee4..ef7dfd00a80fa2 100644
--- a/config/locales/simple_form.pt-PT.yml
+++ b/config/locales/simple_form.pt-PT.yml
@@ -243,11 +243,13 @@ pt-PT:
           warn: Ocultar com um aviso
       form_admin_settings:
         activity_api_enabled: Publicar estatísticas agregadas sobre a atividade dos utilizadores na API
+        app_icon: Ícone da aplicação
         backups_retention_period: Período de retenção de arquivos de utilizador
         bootstrap_timeline_accounts: Recomendar sempre estas contas para novos utilizadores
         closed_registrations_message: Mensagem personalizada quando as inscrições não estiverem disponíveis
         content_cache_retention_period: Período de retenção de conteúdos remotos
         custom_css: CSS personalizado
+        favicon: Ícone de favoritos
         mascot: Mascote personalizada (legado)
         media_cache_retention_period: Período de retenção de ficheiros de media em cache
         peers_api_enabled: Publicar lista de servidores descobertos na API
diff --git a/config/locales/simple_form.sl.yml b/config/locales/simple_form.sl.yml
index 14551774fe0b29..a937f17206e465 100644
--- a/config/locales/simple_form.sl.yml
+++ b/config/locales/simple_form.sl.yml
@@ -243,11 +243,13 @@ sl:
           warn: Skrij z opozorilom
       form_admin_settings:
         activity_api_enabled: Objavi združeno statistiko o dejavnosti uporabnikov v API-ju
+        app_icon: Ikona programa
         backups_retention_period: Obdobje hrambe arhivov uporabnikov
         bootstrap_timeline_accounts: Vedno priporočaj te račune novim uporabnikom
         closed_registrations_message: Sporočilo po meri, ko registracije niso na voljo
         content_cache_retention_period: Obdobje hranjenja vsebine z ostalih strežnikov
         custom_css: CSS po meri
+        favicon: Ikona spletne strani
         mascot: Maskota po meri (opuščeno)
         media_cache_retention_period: Obdobje hrambe predpomnilnika predstavnosti
         peers_api_enabled: Objavi seznam odkritih strežnikov v API-ju
diff --git a/config/locales/simple_form.sq.yml b/config/locales/simple_form.sq.yml
index 6fedf315724746..4236d7dce2673b 100644
--- a/config/locales/simple_form.sq.yml
+++ b/config/locales/simple_form.sq.yml
@@ -243,11 +243,13 @@ sq:
           warn: Fshihe me një sinjalizim
       form_admin_settings:
         activity_api_enabled: Publikoni te API statistika përmbledhëse rreth veprimtarisë së përdoruesve
+        app_icon: Ikonë aplikacioni
         backups_retention_period: Periudhë mbajtjeje arkivash përdoruesish
         bootstrap_timeline_accounts: Rekomandoju përherë këto llogari përdoruesve të rinj
         closed_registrations_message: Mesazh vetjak për pamundësi regjistrimesh të reja
         content_cache_retention_period: Periudhë mbajtjeje lënde të largët
         custom_css: CSS Vetjake
+        favicon: Favikonë
         mascot: Simbol vetjak (e dikurshme)
         media_cache_retention_period: Periudhë mbajtjeje lënde media
         peers_api_enabled: Publiko te API listë shërbyesish të zbuluar
diff --git a/config/locales/simple_form.sr-Latn.yml b/config/locales/simple_form.sr-Latn.yml
index 22c07aa7c65938..40b710b078e690 100644
--- a/config/locales/simple_form.sr-Latn.yml
+++ b/config/locales/simple_form.sr-Latn.yml
@@ -243,11 +243,13 @@ sr-Latn:
           warn: Sakrij uz upozorenje
       form_admin_settings:
         activity_api_enabled: Objavi prikupljenu statistiku o korisničkoj aktivnosti u API
+        app_icon: Ikonica aplikacije
         backups_retention_period: Period čuvanja korisničke arhive
         bootstrap_timeline_accounts: Uvek preporuči ove naloge novim korisnicima
         closed_registrations_message: Prilagođena poruka kada prijave nisu moguće
         content_cache_retention_period: Period zadržavanja udaljenog sadržaja
         custom_css: Prilagođeni CSS
+        favicon: Favikon
         mascot: Prilagođena maskota (nasleđe)
         media_cache_retention_period: Period čuvanja keša medija
         peers_api_enabled: Objavite listu otkrivenih servera u API
diff --git a/config/locales/simple_form.sr.yml b/config/locales/simple_form.sr.yml
index 10c1796637e999..c0a9ac2d8963c6 100644
--- a/config/locales/simple_form.sr.yml
+++ b/config/locales/simple_form.sr.yml
@@ -243,11 +243,13 @@ sr:
           warn: Сакриј уз упозорење
       form_admin_settings:
         activity_api_enabled: Објави прикупљену статистику о корисничкој активности у API
+        app_icon: Иконица апликације
         backups_retention_period: Период чувања корисничке архиве
         bootstrap_timeline_accounts: Увек препоручи ове налоге новим корисницима
         closed_registrations_message: Прилагођена порука када пријаве нису могуће
         content_cache_retention_period: Период задржавања удаљеног садржаја
         custom_css: Прилагођени CSS
+        favicon: Фавикон
         mascot: Прилагођена маскота (наслеђе)
         media_cache_retention_period: Период чувања кеша медија
         peers_api_enabled: Објавите листу откривених сервера у API
diff --git a/config/locales/simple_form.sv.yml b/config/locales/simple_form.sv.yml
index 11d142a2bd6d73..2281e4b4abe109 100644
--- a/config/locales/simple_form.sv.yml
+++ b/config/locales/simple_form.sv.yml
@@ -242,11 +242,13 @@ sv:
           warn: Dölj med en varning
       form_admin_settings:
         activity_api_enabled: Publicera aggregerad statistik om användaraktivitet i API:et
+        app_icon: Appikon
         backups_retention_period: Lagringsperiod för användararkivet
         bootstrap_timeline_accounts: Rekommendera alltid dessa konton till nya användare
         closed_registrations_message: Anpassat meddelande när nyregistreringar inte är tillgängliga
         content_cache_retention_period: Förvaringsperiod för fjärrinnehåll
         custom_css: Anpassad CSS
+        favicon: Favicon
         mascot: Anpassad maskot (tekniskt arv)
         media_cache_retention_period: Tid för bibehållande av mediecache
         peers_api_enabled: Publicera lista över upptäckta servrar i API:et
diff --git a/config/locales/simple_form.tr.yml b/config/locales/simple_form.tr.yml
index b1e90122eca499..f098bfd3ca6d32 100644
--- a/config/locales/simple_form.tr.yml
+++ b/config/locales/simple_form.tr.yml
@@ -243,11 +243,13 @@ tr:
           warn: Uyarıyla gizle
       form_admin_settings:
         activity_api_enabled: API'deki kullanıcı etkinliği hakkında toplu istatistikler yayınlayın
+        app_icon: Uygulama simgesi
         backups_retention_period: Kullanıcı arşivi saklama süresi
         bootstrap_timeline_accounts: Bu hesapları yeni kullanıcılara her zaman öner
         closed_registrations_message: Kayıt olma mevcut değilken gösterilen özel ileti
         content_cache_retention_period: Uzak içerik saklama süresi
         custom_css: Özel CSS
+        favicon: Yer imi simgesi
         mascot: Özel maskot (eski)
         media_cache_retention_period: Medya önbelleği saklama süresi
         peers_api_enabled: API'de keşfedilen sunucuların listesini yayınla
diff --git a/config/locales/simple_form.uk.yml b/config/locales/simple_form.uk.yml
index 332f2c91dc9daf..2f494534ea63b9 100644
--- a/config/locales/simple_form.uk.yml
+++ b/config/locales/simple_form.uk.yml
@@ -243,11 +243,13 @@ uk:
           warn: Сховати за попередженням
       form_admin_settings:
         activity_api_enabled: Публікація агрегованої статистики про активність користувачів
+        app_icon: Значок застосунку
         backups_retention_period: Період утримання архіву користувача
         bootstrap_timeline_accounts: Завжди рекомендувати новим користувачам ці облікові записи
         closed_registrations_message: Показуване повідомлення, якщо реєстрація недоступна
         content_cache_retention_period: Період збереження віддаленого вмісту
         custom_css: Користувацький CSS
+        favicon: Значок сайту
         mascot: Користувацький символ (застарілий)
         media_cache_retention_period: Період збереження кешу медіа
         peers_api_enabled: Опублікувати список знайдених серверів у API
diff --git a/config/locales/simple_form.zh-CN.yml b/config/locales/simple_form.zh-CN.yml
index bbee8b6706297b..ab440e04f43c7f 100644
--- a/config/locales/simple_form.zh-CN.yml
+++ b/config/locales/simple_form.zh-CN.yml
@@ -243,11 +243,13 @@ zh-CN:
           warn: 隐藏时显示警告信息
       form_admin_settings:
         activity_api_enabled: 在 API 中发布有关用户活动的汇总统计数据
+        app_icon: 应用图标
         backups_retention_period: 用户存档保留期
         bootstrap_timeline_accounts: 推荐新用户关注以下账号
         closed_registrations_message: 在关闭注册时显示的自定义消息
         content_cache_retention_period: 外站内容保留期
         custom_css: 自定义 CSS
+        favicon: Favicon
         mascot: 自定义吉祥物（旧）
         media_cache_retention_period: 媒体缓存保留期
         peers_api_enabled: 在API中公开的已知实例的服务器的列表
diff --git a/config/locales/simple_form.zh-TW.yml b/config/locales/simple_form.zh-TW.yml
index 7c460a25f58e24..15ccaf8a17782d 100644
--- a/config/locales/simple_form.zh-TW.yml
+++ b/config/locales/simple_form.zh-TW.yml
@@ -24,7 +24,7 @@ zh-TW:
         type_html: 設定要使用 <strong>%{acct}</strong> 做的事
         types:
           disable: 禁止該使用者使用他們的帳號，但是不刪除或隱藏他們的內容。
-          none: 使用這個寄送警告給該使用者，而不進行其他動作。
+          none: 使用這個寄送警告至該使用者，而不進行其他動作。
           sensitive: 強制標記此使用者所有多媒體附加檔案為敏感內容。
           silence: 禁止該使用者發公開嘟文，從無跟隨他們的帳號中隱藏嘟文與通知。關閉所有對此帳號之檢舉報告。
           suspend: 禁止所有對該帳號任何互動，並且刪除其內容。三十天內可以撤銷此動作。關閉所有對此帳號之檢舉報告。
@@ -34,7 +34,7 @@ zh-TW:
         ends_at: 可選的。公告會於該時間點自動取消發布
         scheduled_at: 空白則立即發布公告
         starts_at: 可選的。使公告於特定時間範圍內顯示
-        text: 您可以使用嘟文語法，但請小心別讓公告太鴨霸而佔據使用者的整個版面。
+        text: 您可以使用嘟文語法，但請小心別使公告太鴨霸而佔據使用者的整個版面。
       appeal:
         text: 您只能對警示提出一次申訴
       defaults:
@@ -47,7 +47,7 @@ zh-TW:
         digest: 僅於您長時間未登入且於未登入期間收到私訊時傳送
         email: 您將收到一封確認電子郵件
         header: 支援 WEBP、PNG、GIF 或 JPG 圖片格式，檔案最大為 %{size}。將等比例縮減至 %{dimensions} 像素
-        inbox_url: 從您想要使用的中繼首頁複製網址
+        inbox_url: 自您想要使用的中繼首頁複製網址
         irreversible: 已過濾的嘟文將會不可逆地消失，即便之後移除過濾器也一樣
         locale: 使用者介面、電子郵件與推播通知的語言
         password: 使用至少 8 個字元
@@ -92,7 +92,7 @@ zh-TW:
         site_contact_email: 其他人如何聯繫您關於法律或支援之諮詢。
         site_contact_username: 其他人如何於 Mastodon 上聯繫您。
         site_extended_description: 任何其他可能對訪客或使用者有用的額外資訊。可由 Markdown 語法撰寫。
-        site_short_description: 一段有助於辨別您伺服器的簡短說明。例如：誰運行該伺服器、該伺服器是提供給哪些人群？
+        site_short_description: 一段有助於辨別您伺服器的簡短說明。例如：誰運行該伺服器、該伺服器是提供至哪些人群？
         site_terms: 使用您自己的隱私權政策，或者保留空白以使用預設值。可由 Markdown 語法撰寫。
         site_title: 除了網域外，其他人該如何指稱您的伺服器。
         status_page_url: 當服務中斷時，可以提供使用者了解伺服器資訊頁面之 URL
@@ -101,11 +101,11 @@ zh-TW:
         timeline_preview: 未登入之訪客能夠瀏覽此伺服器上最新的公開嘟文。
         trendable_by_default: 跳過手動審核熱門內容。仍能於登上熱門趨勢後移除個別內容。
         trends: 熱門趨勢將顯示於您伺服器上正在吸引大量注意力的嘟文、主題標籤、或者新聞。
-        trends_as_landing_page: 顯示熱門趨勢內容給未登入使用者及訪客而不是關於此伺服器之描述。需要啟用熱門趨勢。
+        trends_as_landing_page: 顯示熱門趨勢內容至未登入使用者及訪客而不是關於此伺服器之描述。需要啟用熱門趨勢。
       form_challenge:
         current_password: 您正要進入安全區域
       imports:
-        data: 從其他 Mastodon 伺服器匯出的 CSV 檔案
+        data: 自其他 Mastodon 伺服器匯出的 CSV 檔案
       invite_request:
         text: 這會協助我們審核您的申請
       ip_block:
@@ -133,7 +133,7 @@ zh-TW:
         role: 角色控制使用者有哪些權限
       user_role:
         color: 於整個使用者介面中用於角色的顏色，十六進位格式的 RGB
-        highlighted: 這會使角色公開可見
+        highlighted: 這將使角色公開可見
         name: 角色的公開名稱，如果角色設定為顯示為徽章
         permissions_as_keys: 有此角色的使用者將有權存取...
         position: 某些情況下，衝突的解決方式由更高階的角色決定。某些動作只能由優先程度較低的角色執行
@@ -243,11 +243,13 @@ zh-TW:
           warn: 隱藏於警告之後
       form_admin_settings:
         activity_api_enabled: 於 API 中公開使用者活躍度的統計數據
+        app_icon: 應用程式圖示
         backups_retention_period: 使用者封存資料保留期間
-        bootstrap_timeline_accounts: 永遠推薦這些帳號給新使用者
+        bootstrap_timeline_accounts: 永遠推薦這些帳號至新使用者
         closed_registrations_message: 當註冊關閉時的客製化訊息
         content_cache_retention_period: 遠端內容保留期限
         custom_css: 自訂 CSS
+        favicon: 網站圖示 (Favicon)
         mascot: 自訂吉祥物 (legacy)
         media_cache_retention_period: 多媒體快取資料保留期間
         peers_api_enabled: 於 API 中公開已知伺服器的列表
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 1317d5f70740a5..3a548c226557e9 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -227,7 +227,7 @@ zh-TW:
         update_user_role: 更新角色
       actions:
         approve_appeal_html: "%{name} 已批准來自 %{target} 的審核決定申訴"
-        approve_user_html: "%{name} 已批准從 %{target} 而來的註冊"
+        approve_user_html: "%{name} 已批准自 %{target} 而來的註冊"
         assigned_to_self_report_html: "%{name} 將報告 %{target} 指派給自己"
         change_email_user_html: "%{name} 已變更使用者 %{target} 的電子郵件地址"
         change_role_user_html: "%{name} 已變更 %{target} 的角色"
@@ -264,10 +264,10 @@ zh-TW:
         memorialize_account_html: "%{name} 將 %{target} 設定為追悼帳號"
         promote_user_html: "%{name} 對使用者 %{target} 已進行晉級操作"
         reject_appeal_html: "%{name} 已回絕來自 %{target} 的審核決定申訴"
-        reject_user_html: "%{name} 已回絕從 %{target} 而來的註冊"
+        reject_user_html: "%{name} 已回絕自 %{target} 而來的註冊"
         remove_avatar_user_html: "%{name} 已移除 %{target} 的大頭貼"
         reopen_report_html: "%{name} 重新開啟 %{target} 的檢舉"
-        resend_user_html: "%{name} 已重新發送驗證信給 %{target}"
+        resend_user_html: "%{name} 已重新發送驗證信至 %{target}"
         reset_password_user_html: "%{name} 已重新設定使用者 %{target} 的密碼"
         resolve_report_html: "%{name} 已處理 %{target} 的檢舉"
         sensitive_account_html: "%{name} 將 %{target} 的媒體檔案標記為敏感內容"
@@ -383,7 +383,7 @@ zh-TW:
         confirm: 停權
         permanent_action: 撤銷停權將不會回復任何資料或跟隨關係
         preamble_html: 您將要停權 <strong>%{domain}</strong> 及其子網域。
-        remove_all_data: 此操作將從您伺服器移除所有來自此網域帳號之內容、媒體、個人檔案資料。
+        remove_all_data: 此操作將自您伺服器移除所有來自此網域帳號之內容、媒體、個人檔案資料。
         stop_communication: 您伺服器將停止與這些伺服器交流。
         title: 確認對 %{domain} 網域之封鎖
         undo_relationships: 此操作將撤銷任何您伺服器與此伺服器帳號間之跟隨關係。
@@ -555,11 +555,11 @@ zh-TW:
     relays:
       add_new: 新增中繼站
       delete: 刪除
-      description_html: "<strong>聯邦中繼站</strong> 是種中繼伺服器，會於訂閱並推送至此中繼站的伺服器之間交換大量的公開嘟文。<strong>中繼站也能協助小型或中型伺服器從聯邦宇宙中探索內容</strong>，而無須本地使用者手動跟隨遠端伺服器的其他使用者。"
+      description_html: "<strong>聯邦中繼站</strong> 是種中繼伺服器，會於訂閱並推送至此中繼站的伺服器之間交換大量的公開嘟文。<strong>中繼站也能協助小型或中型伺服器自聯邦宇宙中探索內容</strong>，而無須本地使用者手動跟隨遠端伺服器的其他使用者。"
       disable: 停用
       disabled: 停用
       enable: 啟用
-      enable_hint: 啟用後，您的伺服器將訂閱該中繼的所有公開文章，並將會此伺服器的公開文章發送給它。
+      enable_hint: 啟用後，您的伺服器將訂閱該中繼的所有公開文章，並將此伺服器的公開文章向它發送。
       enabled: 已啟用
       inbox_url: 中繼 URL
       pending: 等待中繼站審核
@@ -648,7 +648,7 @@ zh-TW:
         delete_data_html: 於即日起 30 天後刪除 <strong>@%{acct}</strong>之個人檔案與內容，除非他們於期限前被解除停權
         preview_preamble_html: "<strong>@%{acct}</strong> 將收到關於以下內容之警告："
         record_strike_html: 紀錄關於 <strong>@%{acct}</strong>之警示有助於您升級對此帳號未來違規處理
-        send_email_html: 寄一封警告 e-mail 給 <strong>@%{acct}</strong>
+        send_email_html: 寄一封警告 e-mail 至 <strong>@%{acct}</strong>
         warning_placeholder: 選填之其他站務動作理由。
       target_origin: 檢舉帳號之來源
       title: 檢舉
@@ -671,7 +671,7 @@ zh-TW:
       description_html: 透過<strong>使用者角色</strong>，您可以自訂您的使用者可以存取 Mastodon 的哪些功能與區域。
       edit: 編輯「%{name}」角色
       everyone: 預設權限
-      everyone_full_description_html: 這是會影響<strong>所有使用者</strong>的<strong>基本角色</strong>，即使是那些沒有被分配角色的使用者也一樣。其他所有的角色都從它繼承權限。
+      everyone_full_description_html: 這是會影響<strong>所有使用者</strong>的<strong>基本角色</strong>，即使是那些沒有被分配角色的使用者也一樣。其他所有的角色都自它繼承權限。
       permissions_count:
         other: "%{count} 個權限"
       privileges:
@@ -757,8 +757,8 @@ zh-TW:
         title: 探索
         trends: 熱門趨勢
       domain_blocks:
-        all: 給任何人
-        disabled: 給沒有人
+        all: 至任何人
+        disabled: 至沒有人
         users: 套用至所有登入的本站使用者
       registrations:
         moderation_recommandation: 對所有人開放註冊之前，請確保您有人手充足且反應靈敏的管理員團隊！
@@ -797,7 +797,7 @@ zh-TW:
       back_to_account: 返回帳號資訊頁面
       back_to_report: 回到檢舉報告頁面
       batch:
-        remove_from_report: 從檢舉報告中移除
+        remove_from_report: 自檢舉報告中移除
         report: 檢舉報告
       deleted: 已刪除
       favourites: 最愛
@@ -1055,7 +1055,7 @@ zh-TW:
     dont_have_your_security_key: 找不到您的安全金鑰？
     forgot_password: 忘記密碼？
     invalid_reset_password_token: 密碼重設 token 無效或已過期。請重新設定密碼。
-    link_to_otp: 請從您手機輸入兩階段驗證 (2FA) 或備用驗證碼
+    link_to_otp: 請自您手機輸入兩階段驗證 (2FA) 或備用驗證碼
     link_to_webauth: 使用您的安全金鑰
     log_in_with: 登入，使用
     login: 登入
@@ -1138,7 +1138,7 @@ zh-TW:
       x_seconds: "%{count}秒"
   deletes:
     challenge_not_passed: 您所輸入的資料不正確
-    confirm_password: 輸入您現在的密碼以驗證身份
+    confirm_password: 輸入您目前的密碼以驗證身份
     confirm_username: 請輸入您的使用者名稱以作確認
     proceed: 刪除帳號
     success_msg: 您的帳號已經成功刪除
@@ -1170,7 +1170,7 @@ zh-TW:
       recipient: 此致
       reject_appeal: 駁回申訴
       status: '嘟文編號 #%{id}'
-      status_removed: 嘟文已從系統中移除
+      status_removed: 嘟文已自系統中移除
       title: "%{action} 來自 %{date}"
       title_actions:
         delete_statuses: 嘟文移除
@@ -1238,10 +1238,10 @@ zh-TW:
       add_keyword: 新增關鍵字
       keywords: 關鍵字
       statuses: 各別嘟文
-      statuses_hint_html: 此過濾器會套用至所選之各別嘟文，無論其是否符合下列關鍵字。<a href="%{path}">審閱或從過濾條件移除嘟文</a>。
+      statuses_hint_html: 此過濾器會套用至所選之各別嘟文，無論其是否符合下列關鍵字。<a href="%{path}">審閱或自過濾條件移除嘟文</a>。
       title: 編輯過濾條件
     errors:
-      deprecated_api_multiple_keywords: 這些參數無法從此應用程式中更改，因為它們適用於一或多個過濾器關鍵字。請使用較新的應用程式或是網頁介面。
+      deprecated_api_multiple_keywords: 這些參數無法自此應用程式中更改，因為它們適用於一或多個過濾器關鍵字。請使用較新的應用程式或是網頁介面。
       invalid_context: 沒有提供內文或內文無效
     index:
       contexts: "%{contexts} 中的過濾器"
@@ -1262,7 +1262,7 @@ zh-TW:
     statuses:
       back_to_filter: 回到過濾器
       batch:
-        remove: 從過濾器中移除
+        remove: 自過濾器中移除
       index:
         hint: 此過濾器會套用至所選之各別嘟文，不管它們有無符合其他條件。您可以從網頁介面中將更多嘟文加入至此過濾器。
         title: 已過濾之嘟文
@@ -1419,7 +1419,7 @@ zh-TW:
     on_cooldown: 您最近已轉移過您的帳號。此功能將於 %{count} 天後可再度使用。
     past_migrations: 以往的轉移紀錄
     proceed_with_move: 移動跟隨者
-    redirected_msg: 您的帳號現在指向 %{acct}
+    redirected_msg: 您的帳號目前重導向至 %{acct}。
     redirecting_to: 您的帳號目前正被重新導向到 %{acct}
     set_redirect: 設定重新導向
     warning:
@@ -1552,7 +1552,7 @@ zh-TW:
     mutual: 跟隨彼此
     primary: 主要
     relationship: 關係
-    remove_selected_domains: 從所選取網域中移除所有跟隨者
+    remove_selected_domains: 自所選取網域中移除所有跟隨者
     remove_selected_followers: 移除選取的跟隨者
     remove_selected_follows: 取消跟隨選取的使用者
     status: 帳號狀態
@@ -1599,7 +1599,7 @@ zh-TW:
     current_session: 目前的 session
     date: 日期
     description: "%{platform} 上的 %{browser}"
-    explanation: 這些是現在正登入於您 Mastodon 帳號的瀏覽器。
+    explanation: 這些是目前正登入於您 Mastodon 帳號的瀏覽器。
     ip: IP 位址
     platforms:
       adobe_air: Adobe Air

From 5ed78a1e9035ba7520cb3a82acfe8478b994e2c5 Mon Sep 17 00:00:00 2001
From: Jeremy Kescher <jeremy@kescher.at>
Date: Tue, 16 Jul 2024 22:38:39 +0200
Subject: [PATCH 1554/2191] Bump Catstodon revision to 1.0.1

---
 CHANGELOG.md            | 5 +++++
 lib/mastodon/version.rb | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 53f3d5a75e027c..974624ce744595 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,11 @@ All changes to Catstodon that aren't Mastodon or glitch-soc Mastodon changes wil
 
 All release dates, as well as most other dates, are intended to be read as "within the day, in UTC time."
 
+## [v4.3.0-alpha.5+glitch+cat+1.0.1] - 2024-07-16
+
+- Upstream changes
+  - You can hide hover cards now.
+
 ## [v4.3.0-alpha.5+glitch+cat+1.0.0] - 2024-07-04
 
 - Upstream changes. Important for security! Upgrade now.
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index bca30683e9153d..29392cf85dcb9b 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -25,7 +25,7 @@ def prerelease
     end
 
     def catstodon_revision
-      '1.0.0'
+      '1.0.1'
     end
 
     def build_metadata

From 00c110ac7ba0dd82840f1ff32113ed0e616c3470 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 17 Jul 2024 09:23:07 +0200
Subject: [PATCH 1555/2191] New Crowdin Translations (automated) (#31047)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/ga.json | 294 ++++++++++++++++++++++++
 app/javascript/mastodon/locales/lt.json |   4 +-
 config/locales/activerecord.ga.yml      |  33 +++
 config/locales/ca.yml                   |   2 +
 config/locales/da.yml                   |   1 +
 config/locales/de.yml                   |   2 +
 config/locales/devise.ga.yml            |  89 +++++++
 config/locales/doorkeeper.ga.yml        |   2 +
 config/locales/en-GB.yml                |   1 +
 config/locales/es-AR.yml                |   1 +
 config/locales/fi.yml                   |   1 +
 config/locales/fo.yml                   |   2 +
 config/locales/he.yml                   |   1 +
 config/locales/hu.yml                   |   2 +
 config/locales/it.yml                   |   2 +
 config/locales/ko.yml                   |   1 +
 config/locales/lt.yml                   |  19 ++
 config/locales/nl.yml                   |   1 +
 config/locales/nn.yml                   |   2 +
 config/locales/pt-PT.yml                |   2 +
 config/locales/simple_form.en-GB.yml    |   3 +
 config/locales/simple_form.nn.yml       |   3 +
 config/locales/simple_form.vi.yml       |   2 +
 config/locales/sl.yml                   |   1 +
 config/locales/sq.yml                   |   1 +
 config/locales/sv.yml                   |   1 +
 config/locales/tr.yml                   |   1 +
 config/locales/uk.yml                   |   1 +
 config/locales/vi.yml                   |   2 +
 config/locales/zh-CN.yml                |   2 +
 config/locales/zh-TW.yml                |   2 +
 31 files changed, 479 insertions(+), 2 deletions(-)

diff --git a/app/javascript/mastodon/locales/ga.json b/app/javascript/mastodon/locales/ga.json
index edf7618148ecff..468c7a03a1c4c6 100644
--- a/app/javascript/mastodon/locales/ga.json
+++ b/app/javascript/mastodon/locales/ga.json
@@ -17,9 +17,12 @@
   "account.badges.group": "Grúpa",
   "account.block": "Déan cosc ar @{name}",
   "account.block_domain": "Bac ainm fearainn {domain}",
+  "account.block_short": "Bloc",
   "account.blocked": "Bactha",
   "account.browse_more_on_origin_server": "Brabhsáil níos mó ar an phróifíl bhunaidh",
   "account.cancel_follow_request": "Éirigh as iarratas leanta",
+  "account.copy": "Cóipeáil nasc chuig an bpróifíl",
+  "account.direct": "Luaigh @{name} go príobháideach",
   "account.disable_notifications": "Éirigh as ag cuir mé in eol nuair bpostálann @{name}",
   "account.domain_blocked": "Ainm fearainn bactha",
   "account.edit_profile": "Cuir an phróifíl in eagar",
@@ -29,9 +32,12 @@
   "account.featured_tags.last_status_never": "Níl postáil ar bith ann",
   "account.featured_tags.title": "Haischlib {name}",
   "account.follow": "Lean",
+  "account.follow_back": "Leanúint ar ais",
   "account.followers": "Leantóirí",
   "account.followers.empty": "Ní leanann éinne an t-úsáideoir seo fós.",
+  "account.followers_counter": "{count, plural, one {{counter} leantóir} other {{counter} leantóirí}}",
   "account.following": "Ag leanúint",
+  "account.following_counter": "{count, plural, one {{counter} ag leanúint} other {{counter} ag leanúint}}",
   "account.follows.empty": "Ní leanann an t-úsáideoir seo duine ar bith fós.",
   "account.go_to_profile": "Téigh go dtí próifíl",
   "account.hide_reblogs": "Folaigh moltaí ó @{name}",
@@ -44,7 +50,11 @@
   "account.mention": "Luaigh @{name}",
   "account.moved_to": "Tá tugtha le fios ag {name} gurb é an cuntas nua atá acu ná:",
   "account.mute": "Balbhaigh @{name}",
+  "account.mute_notifications_short": "Balbhaigh fógraí",
+  "account.mute_short": "Balbhaigh",
   "account.muted": "Balbhaithe",
+  "account.mutual": "Frithpháirteach",
+  "account.no_bio": "Níor tugadh tuairisc.",
   "account.open_original_page": "Oscail an leathanach bunaidh",
   "account.posts": "Postálacha",
   "account.posts_with_replies": "Postálacha agus freagraí",
@@ -53,12 +63,14 @@
   "account.requested_follow": "D'iarr {name} ort do chuntas a leanúint",
   "account.share": "Roinn próifíl @{name}",
   "account.show_reblogs": "Taispeáin moltaí ó @{name}",
+  "account.statuses_counter": "{count, plural, one {{counter} post} other {{counter} poist}}",
   "account.unblock": "Bain bac de @{name}",
   "account.unblock_domain": "Bain bac den ainm fearainn {domain}",
   "account.unblock_short": "Bain bac de",
   "account.unendorse": "Ná chuir ar an phróifíl mar ghné",
   "account.unfollow": "Ná lean a thuilleadh",
   "account.unmute": "Díbhalbhaigh @{name}",
+  "account.unmute_notifications_short": "Díbhalbhaigh fógraí",
   "account.unmute_short": "Díbhalbhaigh",
   "account_note.placeholder": "Cliceáil chun nóta a chuir leis",
   "admin.dashboard.daily_retention": "Ráta coinneála an úsáideora de réir an lae tar éis clárú",
@@ -66,6 +78,10 @@
   "admin.dashboard.retention.average": "Meán",
   "admin.dashboard.retention.cohort": "Mí cláraraithe",
   "admin.dashboard.retention.cohort_size": "Úsáideoirí nua",
+  "admin.impact_report.instance_accounts": "Próifílí cuntais a scriosfadh sé seo",
+  "admin.impact_report.instance_followers": "Leanúna a chaillfeadh ár n-úsáideoirí",
+  "admin.impact_report.instance_follows": "Leanúna a bheadh ​​​​a n-úsáideoirí chailleadh",
+  "admin.impact_report.title": "Achoimre ar an tionchar",
   "alert.rate_limited.message": "Atriail aris tar éis {retry_time, time, medium}.",
   "alert.rate_limited.title": "Rátatheoranta",
   "alert.unexpected.message": "Tharla earráid gan choinne.",
@@ -73,6 +89,14 @@
   "announcement.announcement": "Fógra",
   "attachments_list.unprocessed": "(neamhphróiseáilte)",
   "audio.hide": "Cuir fuaim i bhfolach",
+  "block_modal.remote_users_caveat": "Iarrfaimid ar an bhfreastalaí {domain} meas a bheith agat ar do chinneadh. Mar sin féin, ní ráthaítear comhlíonadh toisc go bhféadfadh roinnt freastalaithe bloic a láimhseáil ar bhealach difriúil. Seans go mbeidh postálacha poiblí fós le feiceáil ag úsáideoirí nach bhfuil logáilte isteach.",
+  "block_modal.show_less": "Taispeáin níos lú",
+  "block_modal.show_more": "Taispeáin níos mó",
+  "block_modal.they_cant_mention": "Ní féidir leo tú a lua ná a leanúint.",
+  "block_modal.they_cant_see_posts": "Ní féidir leo do chuid postálacha a fheiceáil agus ní fheicfidh tú a gcuid postanna.",
+  "block_modal.they_will_know": "Is féidir leo a fheiceáil go bhfuil bac orthu.",
+  "block_modal.title": "An bhfuil fonn ort an t-úsáideoir a bhlocáil?",
+  "block_modal.you_wont_see_mentions": "Ní fheicfidh tú postálacha a luann iad.",
   "boost_modal.combo": "Is féidir leat {combo} a bhrú chun é seo a scipeáil an chéad uair eile",
   "bundle_column_error.copy_stacktrace": "Cóipeáil tuairisc earráide",
   "bundle_column_error.error.body": "Ní féidir an leathanach a iarradh a sholáthar. Seans gurb amhlaidh mar gheall ar fhabht sa chód, nó mar gheall ar mhíréireacht leis an mbrabhsálaí.",
@@ -95,8 +119,11 @@
   "column.blocks": "Cuntais choiscthe",
   "column.bookmarks": "Leabharmharcanna",
   "column.community": "Amlíne áitiúil",
+  "column.direct": "Luann príobháideach",
   "column.directory": "Brabhsáil próifílí",
   "column.domain_blocks": "Fearainn bhactha",
+  "column.favourites": "Ceanáin",
+  "column.firehose": "Fothaí beo",
   "column.follow_requests": "Iarratais leanúnaí",
   "column.home": "Baile",
   "column.lists": "Liostaí",
@@ -117,6 +144,9 @@
   "community.column_settings.remote_only": "Cian amháin",
   "compose.language.change": "Athraigh teanga",
   "compose.language.search": "Cuardaigh teangacha...",
+  "compose.published.body": "Post foilsithe.",
+  "compose.published.open": "Oscail",
+  "compose.saved.body": "Postáil sábháilte.",
   "compose_form.direct_message_warning_learn_more": "Tuilleadh eolais",
   "compose_form.encryption_warning": "Ní criptiú taobh-go-taobh déanta ar theachtaireachtaí ar Mhastodon. Ná roinn eolas íogair ar Mhastodon.",
   "compose_form.hashtag_warning": "Ní áireofar an teachtaireacht seo faoi haischlib ar bith mar níl sí ar fáil don phobal. Ní féidir ach teachtaireachtaí poiblí a chuardach de réir haischlib.",
@@ -124,11 +154,19 @@
   "compose_form.lock_disclaimer.lock": "faoi ghlas",
   "compose_form.placeholder": "Cad atá ag tarlú?",
   "compose_form.poll.duration": "Achar suirbhéanna",
+  "compose_form.poll.multiple": "Ilrogha",
+  "compose_form.poll.option_placeholder": "Rogha {number}",
+  "compose_form.poll.single": "Roghnaigh ceann amháin",
   "compose_form.poll.switch_to_multiple": "Athraigh suirbhé chun cead a thabhairt do ilrogha",
   "compose_form.poll.switch_to_single": "Athraigh suirbhé chun cead a thabhairt do rogha amháin",
+  "compose_form.poll.type": "Stíl",
+  "compose_form.publish": "Postáil",
   "compose_form.publish_form": "Foilsigh\n",
+  "compose_form.reply": "Freagra",
+  "compose_form.save_changes": "Nuashonrú",
   "compose_form.spoiler.marked": "Bain rabhadh ábhair",
   "compose_form.spoiler.unmarked": "Cuir rabhadh ábhair",
+  "compose_form.spoiler_placeholder": "Rabhadh ábhair (roghnach)",
   "confirmation_modal.cancel": "Cealaigh",
   "confirmations.block.confirm": "Bac",
   "confirmations.cancel_follow_request.confirm": "Éirigh as iarratas",
@@ -139,11 +177,15 @@
   "confirmations.delete_list.message": "An bhfuil tú cinnte gur mhaith leat an liosta seo a scriosadh go buan?",
   "confirmations.discard_edit_media.confirm": "Faigh réidh de",
   "confirmations.discard_edit_media.message": "Tá athruithe neamhshlánaithe don tuarascáil gné nó réamhamharc agat, faigh réidh dóibh ar aon nós?",
+  "confirmations.domain_block.confirm": "Bloc freastalaí",
   "confirmations.domain_block.message": "An bhfuil tú iontach cinnte gur mhaith leat bac an t-ainm fearainn {domain} in iomlán? I bhformhór na gcásanna, is leor agus is fearr cúpla baic a cur i bhfeidhm nó cúpla úsáideoirí a balbhú. Ní fheicfidh tú ábhair ón t-ainm fearainn sin in amlíne ar bith, nó i d'fhógraí. Scaoilfear do leantóirí ón ainm fearainn sin.",
+  "confirmations.edit.confirm": "Eagar",
+  "confirmations.edit.message": "Má dhéanann tú eagarthóireacht anois, déanfar an teachtaireacht atá á cumadh agat faoi láthair a fhorscríobh. An bhfuil tú cinnte gur mhaith leat leanúint ar aghaidh?",
   "confirmations.logout.confirm": "Logáil amach",
   "confirmations.logout.message": "An bhfuil tú cinnte gur mhaith leat logáil amach?",
   "confirmations.mute.confirm": "Balbhaigh",
   "confirmations.redraft.confirm": "Scrios ⁊ athdhréachtaigh",
+  "confirmations.redraft.message": "An bhfuil tú cinnte gur mhaith leat an postáil seo a scriosadh agus é a athdhréachtú? Caillfear ceanáin agus treisithe, agus dílleachtaí freagraí ar an mbunphostála.",
   "confirmations.reply.confirm": "Freagair",
   "confirmations.reply.message": "Scriosfaidh freagra láithreach an teachtaireacht atá a chumadh anois agat. An bhfuil tú cinnte gur mhaith leat leanúint leat?",
   "confirmations.unfollow.confirm": "Ná lean",
@@ -152,7 +194,9 @@
   "conversation.mark_as_read": "Marcáil mar léite",
   "conversation.open": "Féach ar comhrá",
   "conversation.with": "Le {names}",
+  "copy_icon_button.copied": "Cóipeáladh chuig an ngearrthaisce",
   "copypaste.copied": "Cóipeáilte",
+  "copypaste.copy_to_clipboard": "Cóipeáil chuig an ngearrthaisce",
   "directory.federated": "Ó chomhchruinne aitheanta",
   "directory.local": "Ó {domain} amháin",
   "directory.new_arrivals": "Daoine atá tar éis teacht",
@@ -162,7 +206,30 @@
   "dismissable_banner.community_timeline": "Seo iad na postála is déanaí ó dhaoine le cuntais ar {domain}.",
   "dismissable_banner.dismiss": "Diúltaigh",
   "dismissable_banner.explore_links": "Tá na scéalta nuachta seo á phlé anseo agus ar fhreastalaithe eile ar an líonra díláraithe faoi láthair.",
+  "dismissable_banner.explore_statuses": "Is postálacha iad seo ó ar fud an ghréasáin shóisialta atá ag éirí níos tarraingtí inniu. Rangaítear poist níos nuaí le níos mó teanntáin agus ceanáin níos airde.",
   "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.",
+  "dismissable_banner.public_timeline": "Seo iad na postálacha poiblí is déanaí ó dhaoine ar an ngréasán sóisialta a leanann daoine ar {domain}.",
+  "domain_block_modal.block": "Bloc freastalaí",
+  "domain_block_modal.block_account_instead": "Cuir bac ar @{name} ina ionad sin",
+  "domain_block_modal.they_can_interact_with_old_posts": "Is féidir le daoine ón bhfreastalaí seo idirghníomhú le do sheanphoist.",
+  "domain_block_modal.they_cant_follow": "Ní féidir le duine ar bith ón bhfreastalaí seo tú a leanúint.",
+  "domain_block_modal.they_wont_know": "Ní bheidh a fhios acu go bhfuil bac orthu.",
+  "domain_block_modal.title": "Blocáil fearann?",
+  "domain_block_modal.you_will_lose_followers": "Bainfear do leantóirí go léir ón bhfreastalaí seo.",
+  "domain_block_modal.you_wont_see_posts": "Ní fheicfidh tú postálacha nó fógraí ó úsáideoirí ar an bhfreastalaí seo.",
+  "domain_pill.activitypub_lets_connect": "Ligeann sé duit ceangal agus idirghníomhú le daoine, ní hamháin ar Mastodon, ach thar aipeanna sóisialta éagsúla freisin.",
+  "domain_pill.activitypub_like_language": "Tá GníomhaíochtPub cosúil leis an teanga a labhraíonn Mastodon le líonraí sóisialta eile.",
+  "domain_pill.server": "Freastalaí",
+  "domain_pill.their_handle": "A láimhseáil:",
+  "domain_pill.their_server": "A dteach digiteach, áit a bhfuil a gcuid post go léir ina gcónaí.",
+  "domain_pill.their_username": "Aitheantóir uathúil ar a bhfreastalaí. Is féidir teacht ar úsáideoirí leis an ainm úsáideora céanna ar fhreastalaithe éagsúla.",
+  "domain_pill.username": "Ainm úsáideora",
+  "domain_pill.whats_in_a_handle": "Cad atá i láimhseáil?",
+  "domain_pill.who_they_are": "Ós rud é go ndeir láimhseálaithe cé hé duine agus cá bhfuil siad, is féidir leat idirghníomhú le daoine ar fud an ghréasáin shóisialta de <button>ardáin atá á gcumhachtú le ActionPub</button>.",
+  "domain_pill.who_you_are": "Toisc go ndeir do láimhseáil cé tú féin agus cén áit a bhfuil tú, is féidir le daoine idirghníomhú leat ar fud an ghréasáin shóisialta de <button>ardáin atá á gcumhachtú le ActionPub</button>.",
+  "domain_pill.your_handle": "Do láimhseáil:",
+  "domain_pill.your_server": "Do theach digiteach, áit a bhfuil do phoist go léir ina gcónaí. Nach maith leat an ceann seo? Aistrigh freastalaithe am ar bith agus tabhair leat do leantóirí freisin.",
+  "domain_pill.your_username": "D'aitheantóir uathúil ar an bhfreastalaí seo. Is féidir teacht ar úsáideoirí leis an ainm úsáideora céanna ar fhreastalaithe éagsúla.",
   "embed.instructions": "Embed this status on your website by copying the code below.",
   "embed.preview": "Seo an chuma a bheidh air:",
   "emoji_button.activity": "Gníomhaíocht",
@@ -180,33 +247,48 @@
   "emoji_button.search_results": "Torthaí cuardaigh",
   "emoji_button.symbols": "Comharthaí",
   "emoji_button.travel": "Taisteal ⁊ Áiteanna",
+  "empty_column.account_hides_collections": "Roghnaigh an t-úsáideoir seo gan an fhaisnéis seo a chur ar fáil",
   "empty_column.account_suspended": "Cuntas ar fionraí",
   "empty_column.account_timeline": "Níl postálacha ar bith anseo!",
   "empty_column.account_unavailable": "Níl an phróifíl ar fáil",
   "empty_column.blocks": "Níl aon úsáideoir bactha agat fós.",
   "empty_column.bookmarked_statuses": "Níl aon phostáil leabharmharcaithe agat fós. Nuair a dhéanann tú leabharmharc, beidh sé le feiceáil anseo.",
   "empty_column.community": "Tá an amlíne áitiúil folamh. Foilsigh rud éigin go poiblí le tús a chur le cúrsaí!",
+  "empty_column.direct": "Níl aon tagairtí príobháideacha agat fós. Nuair a sheolann tú nó a gheobhaidh tú ceann, beidh sé le feiceáil anseo.",
   "empty_column.domain_blocks": "Níl aon fearainn bhactha ann go fóill.",
   "empty_column.explore_statuses": "Níl rud ar bith ag treochtáil faoi láthair. Tar ar ais ar ball!",
+  "empty_column.favourited_statuses": "Níl aon postálacha is fearr leat fós. Nuair is fearr leat ceann, beidh sé le feiceáil anseo.",
+  "empty_column.favourites": "Níor thaitin an post seo le haon duine go fóill. Nuair a dhéanann duine, taispeánfaidh siad suas anseo.",
   "empty_column.follow_requests": "Níl aon phostáil leabharmharcaithe agat fós. Nuair a dhéanann tú leabharmharc, feicfear anseo é.",
+  "empty_column.followed_tags": "Níor lean tú aon hashtags fós. Nuair a dhéanann tú, beidh siad a thaispeáint suas anseo.",
   "empty_column.hashtag": "Níl rud ar bith faoin haischlib seo go fóill.",
   "empty_column.home": "Tá d'amlíne baile folamh! B'fhiú duit cúpla duine eile a leanúint lena líonadh! {suggestions}",
   "empty_column.list": "There is nothing in this list yet. When members of this list post new statuses, they will appear here.",
   "empty_column.lists": "Níl aon liostaí fós agat. Nuair a chruthaíonn tú ceann, feicfear anseo é.",
   "empty_column.mutes": "Níl aon úsáideoir balbhaithe agat fós.",
+  "empty_column.notification_requests": "Gach soiléir! Níl aon rud anseo. Nuair a gheobhaidh tú fógraí nua, beidh siad le feiceáil anseo de réir do shocruithe.",
   "empty_column.notifications": "Níl aon fógraí agat fós. Nuair a dhéanann daoine eile idirghníomhú leat, feicfear anseo é.",
   "empty_column.public": "Faic anseo! Scríobh rud éigin go poiblí, nó lean úsáideoirí ar fhreastalaithe eile chun é a líonadh",
   "error.unexpected_crash.explanation": "De bharr fabht inár gcód, nó fadhb le chomhoiriúnacht brabhsálaí, níorbh fhéadfadh an leathanach seo a léiriú i gceart.",
   "error.unexpected_crash.explanation_addons": "Ní taispeántar an leathanach seo mar is ceart. Is dócha go gcruthaíonn breiseán brabhsálaí nó uirlisí uathaistriúcháin an fhadhb seo.",
+  "error.unexpected_crash.next_steps": "Bain triail as an leathanach a athnuachan. Mura gcabhraíonn sé sin, seans go mbeidh tú fós in ann Mastodon a úsáid trí bhrabhsálaí nó aip dhúchais eile.",
+  "error.unexpected_crash.next_steps_addons": "Déan iarracht iad a dhíchumasú agus an leathanach a athnuachan. Mura gcabhraíonn sé sin, seans go mbeidh tú fós in ann Mastodon a úsáid trí bhrabhsálaí nó aip dhúchais eile.",
+  "errors.unexpected_crash.copy_stacktrace": "Cóipeáil rian cruachta go dtí an ghearrthaisce",
   "errors.unexpected_crash.report_issue": "Tuairiscigh deacracht",
   "explore.search_results": "Torthaí cuardaigh",
+  "explore.suggested_follows": "Daoine",
   "explore.title": "Féach thart",
   "explore.trending_links": "Nuacht",
   "explore.trending_statuses": "Postálacha",
   "explore.trending_tags": "Haischlibeanna",
+  "filter_modal.added.context_mismatch_explanation": "Ní bhaineann an chatagóir scagaire seo leis an gcomhthéacs ina bhfuair tú rochtain ar an bpostáil seo. Más mian leat an postáil a scagadh sa chomhthéacs seo freisin, beidh ort an scagaire a chur in eagar.",
+  "filter_modal.added.context_mismatch_title": "Neamhréir comhthéacs!",
+  "filter_modal.added.expired_explanation": "Tá an chatagóir scagaire seo imithe in éag, beidh ort an dáta éaga a athrú chun é a chur i bhfeidhm.",
   "filter_modal.added.expired_title": "Scagaire as feidhm!",
+  "filter_modal.added.review_and_configure": "Chun an chatagóir scagaire seo a athbhreithniú agus a chumrú tuilleadh, téigh chuig {settings_link}.",
   "filter_modal.added.review_and_configure_title": "Socruithe scagtha",
   "filter_modal.added.settings_link": "leathan socruithe",
+  "filter_modal.added.short_explanation": "Cuireadh an postáil seo leis an gcatagóir scagaire seo a leanas: {title}.",
   "filter_modal.added.title": "Scagaire curtha leis!",
   "filter_modal.select_filter.context_mismatch": "ní bhaineann sé leis an gcomhthéacs seo",
   "filter_modal.select_filter.expired": "as feidhm",
@@ -215,14 +297,31 @@
   "filter_modal.select_filter.subtitle": "Bain úsáid as catagóir reatha nó cruthaigh ceann nua",
   "filter_modal.select_filter.title": "Déan scagadh ar an bpostáil seo",
   "filter_modal.title.status": "Déan scagadh ar phostáil",
+  "filtered_notifications_banner.mentions": "{count, plural, one {tagairt} other {tagairtí}}",
+  "filtered_notifications_banner.pending_requests": "Fógraí ó {count, plural, =0 {níl éinne} one {duine amháin} two {# daoine} few {# daoine} many {# daoine} other {# daoine}} b'fhéidir go mbeadh a fhios agat",
+  "filtered_notifications_banner.title": "Fógraí scagtha",
+  "firehose.all": "Gach",
+  "firehose.local": "An freastalaí seo",
+  "firehose.remote": "Freastalaithe eile",
   "follow_request.authorize": "Ceadaigh",
   "follow_request.reject": "Diúltaigh",
   "follow_requests.unlocked_explanation": "Cé nach bhfuil do chuntas faoi ghlas, cheap foireann {domain} gur mhaith leat súil siar ar iarratais leanúnaí as na cuntais seo.",
+  "follow_suggestions.curated_suggestion": "Pioc foirne",
   "follow_suggestions.dismiss": "Ná taispeáin arís",
+  "follow_suggestions.featured_longer": "Lámh-roghnaithe ag an bhfoireann {domain}",
+  "follow_suggestions.friends_of_friends_longer": "Coitianta i measc na ndaoine a leanann tú",
+  "follow_suggestions.hints.featured": "Tá an phróifíl seo roghnaithe de láimh ag foireann {domain}.",
+  "follow_suggestions.hints.friends_of_friends": "Tá an-tóir ar an bpróifíl seo i measc na ndaoine a leanann tú.",
+  "follow_suggestions.hints.most_followed": "Tá an phróifíl seo ar cheann de na cinn is mó a leantar ar {domain}.",
+  "follow_suggestions.hints.most_interactions": "Tá an phróifíl seo ag tarraingt go leor airde ar {domain} le déanaí.",
+  "follow_suggestions.hints.similar_to_recently_followed": "Tá an phróifíl seo cosúil leis na próifílí a lean tú le déanaí.",
   "follow_suggestions.personalized_suggestion": "Nod pearsantaithe",
   "follow_suggestions.popular_suggestion": "Nod coiteann",
+  "follow_suggestions.popular_suggestion_longer": "Tá an-tóir ar {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Cosúil le próifílí a lean tú le déanaí",
   "follow_suggestions.view_all": "Féach uile",
   "follow_suggestions.who_to_follow": "Cé le leanúint",
+  "followed_tags": "Hashtags le leanúint",
   "footer.about": "Maidir le",
   "footer.directory": "Eolaire próifílí",
   "footer.get_app": "Faigh an aip",
@@ -230,6 +329,7 @@
   "footer.keyboard_shortcuts": "Aicearraí méarchláir",
   "footer.privacy_policy": "Polasaí príobháideachais",
   "footer.source_code": "Féach ar an gcód foinseach",
+  "footer.status": "Stádas",
   "generic.saved": "Sábháilte",
   "getting_started.heading": "Ag tosú amach",
   "hashtag.column_header.tag_mode.all": "agus {additional}",
@@ -238,15 +338,34 @@
   "hashtag.column_settings.select.no_options_message": "Moltaí ar bith faighte",
   "hashtag.column_settings.select.placeholder": "Iontráil haischlibeanna…",
   "hashtag.column_settings.tag_mode.all": "Iad seo go léir",
+  "hashtag.column_settings.tag_mode.any": "Aon cheann díobh seo",
+  "hashtag.column_settings.tag_mode.none": "Níl aon cheann díobh seo",
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+  "hashtag.counter_by_accounts": "{count, plural, one {{counter} rannpháirtí} two {{counter} rannpháirtí} few {{counter} rannpháirtí} many {{counter} rannpháirtí} other {{counter} rannpháirtí}}",
+  "hashtag.counter_by_uses": "{count, plural, one {{counter} post} two {{counter} post} few {{counter} post} many {{counter} post} other {{counter} poist}}",
+  "hashtag.counter_by_uses_today": "{count, plural, one {{counter} post inniu} other {{counter} poist inniu}} inniu",
   "hashtag.follow": "Lean haischlib",
   "hashtag.unfollow": "Ná lean haischlib",
+  "hashtags.and_other": "agus {count, plural, one {} two {# níos} few {# níos} many {# níos} other {# níos}}",
   "home.column_settings.show_reblogs": "Taispeáin moltaí",
   "home.column_settings.show_replies": "Taispeán freagraí",
   "home.hide_announcements": "Cuir fógraí i bhfolach",
+  "home.pending_critical_update.body": "Nuashonraigh do fhreastalaí Mastodon chomh luath agus is féidir!",
+  "home.pending_critical_update.link": "Féach nuashonruithe",
+  "home.pending_critical_update.title": "Nuashonrú slándála ríthábhachtach ar fáil!",
   "home.show_announcements": "Taispeáin fógraí",
+  "interaction_modal.description.favourite": "Le cuntas ar Mastodon, is fearr leat an postáil seo chun a chur in iúl don údar go bhfuil meas agat air agus é a shábháil ar feadh níos déanaí.",
+  "interaction_modal.description.follow": "Le cuntas ar Mastodon, is féidir leat {name} a leanúint chun a gcuid postálacha a fháil i do fhotha baile.",
+  "interaction_modal.description.reblog": "Le cuntas ar Mastodon, is féidir leat an postáil seo a threisiú chun é a roinnt le do leantóirí féin.",
+  "interaction_modal.description.reply": "Le cuntas ar Mastodon, is féidir leat freagra a thabhairt ar an bpostáil seo.",
+  "interaction_modal.login.action": "Thabhairt dom abhaile",
+  "interaction_modal.login.prompt": "Fearann ​​do fhreastalaí baile, e.g. mastodon.sóisialta",
+  "interaction_modal.no_account_yet": "Ní ar Mastodon?",
   "interaction_modal.on_another_server": "Ar freastalaí eile",
   "interaction_modal.on_this_server": "Ar an freastalaí seo",
+  "interaction_modal.sign_in": "Níl tú logáilte isteach ar an bhfreastalaí seo. Cá bhfuil do chuntas á óstáil?",
+  "interaction_modal.sign_in_hint": "Leid: Sin é an suíomh Gréasáin inar chláraigh tú. Mura cuimhin leat, lorg an ríomhphost fáilte i do bhosca isteach. Is féidir leat d'ainm úsáideora iomlán a chur isteach freisin! (m.sh. @Mastodon@mastodon.social)",
+  "interaction_modal.title.favourite": "An postáil {name} is fearr leat",
   "interaction_modal.title.follow": "Lean {name}",
   "interaction_modal.title.reblog": "Mol postáil de chuid {name}",
   "interaction_modal.title.reply": "Freagair postáil {name}",
@@ -262,6 +381,8 @@
   "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "Bog síos ar an liosta",
   "keyboard_shortcuts.enter": "Oscail postáil",
+  "keyboard_shortcuts.favourite": "Postáil is fearr leat",
+  "keyboard_shortcuts.favourites": "Oscail liosta ceanáin",
   "keyboard_shortcuts.federated": "Oscail amlíne cónaidhmithe",
   "keyboard_shortcuts.heading": "Aicearraí méarchláir",
   "keyboard_shortcuts.home": "Oscail amlíne bhaile",
@@ -286,15 +407,21 @@
   "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
   "keyboard_shortcuts.up": "Bog suas ar an liosta",
   "lightbox.close": "Dún",
+  "lightbox.compress": "Comhbhrúigh an bosca amhairc íomhá",
+  "lightbox.expand": "Leathnaigh an bosca amhairc íomhá",
   "lightbox.next": "An céad eile",
   "lightbox.previous": "Roimhe seo",
   "limited_account_hint.action": "Taispeáin an phróifíl ar aon nós",
   "limited_account_hint.title": "Tá an phróifíl seo curtha i bhfolach ag na modhnóra {domain}.",
+  "link_preview.author": "Le {name}",
+  "link_preview.more_from_author": "Tuilleadh ó {name}",
+  "link_preview.shares": "{count, plural, one {{counter} post} other {{counter} poist}}",
   "lists.account.add": "Cuir leis an liosta",
   "lists.account.remove": "Scrios as an liosta",
   "lists.delete": "Scrios liosta",
   "lists.edit": "Cuir an liosta in eagar",
   "lists.edit.submit": "Athraigh teideal",
+  "lists.exclusive": "Folaigh na poist seo ón mbaile",
   "lists.new.create": "Cruthaigh liosta",
   "lists.new.title_placeholder": "Teideal liosta nua",
   "lists.replies_policy.followed": "Úsáideoir ar bith atá á leanúint",
@@ -303,20 +430,38 @@
   "lists.replies_policy.title": "Taispeáin freagraí:",
   "lists.search": "Cuardaigh i measc daoine atá á leanúint agat",
   "lists.subheading": "Do liostaí",
+  "load_pending": "{count, plural, one {# mír nua} two {# mír nua} few {# mír nua} many {# mír nua} other {# mír nua}}",
+  "loading_indicator.label": "Á lódáil…",
+  "media_gallery.toggle_visible": "{number, plural, one {Folaigh íomhá} two {Folaigh íomhánna} few {Folaigh íomhánna} many {Folaigh íomhánna} other {Folaigh íomhánna}}",
+  "moved_to_account_banner.text": "Tá do chuntas {disabledAccount} díchumasaithe faoi láthair toisc gur bhog tú go {movedToAccount}.",
+  "mute_modal.hide_from_notifications": "Folaigh ó fhógraí",
+  "mute_modal.hide_options": "Folaigh roghanna",
+  "mute_modal.indefinite": "Go dtí go ndíbhalfaidh mé iad",
+  "mute_modal.show_options": "Taispeáin roghanna",
+  "mute_modal.they_can_mention_and_follow": "Is féidir leo tú a lua agus a leanúint, ach ní fheicfidh tú iad.",
+  "mute_modal.they_wont_know": "Ní bheidh a fhios acu go bhfuil balbhú orthu.",
+  "mute_modal.title": "An bhfuil fonn ort úsáideoir a bhalbhú?",
+  "mute_modal.you_wont_see_mentions": "Ní fheicfidh tú postálacha a luann iad.",
+  "mute_modal.you_wont_see_posts": "Is féidir leo do phoist a fheiceáil go fóill, ach ní fheicfidh tú a gcuid postanna.",
   "navigation_bar.about": "Maidir le",
+  "navigation_bar.advanced_interface": "Oscail i gcomhéadan gréasáin chun cinn",
   "navigation_bar.blocks": "Cuntais bhactha",
   "navigation_bar.bookmarks": "Leabharmharcanna",
   "navigation_bar.community_timeline": "Amlíne áitiúil",
   "navigation_bar.compose": "Cum postáil nua",
+  "navigation_bar.direct": "Luann príobháideach",
   "navigation_bar.discover": "Faigh amach",
   "navigation_bar.domain_blocks": "Fearainn bhactha",
   "navigation_bar.explore": "Féach thart",
+  "navigation_bar.favourites": "Ceanáin",
   "navigation_bar.filters": "Focail bhalbhaithe",
   "navigation_bar.follow_requests": "Iarratais leanúnaí",
+  "navigation_bar.followed_tags": "Haischlibeanna ina dhiaidh",
   "navigation_bar.follows_and_followers": "Ag leanúint agus do do leanúint",
   "navigation_bar.lists": "Liostaí",
   "navigation_bar.logout": "Logáil Amach",
   "navigation_bar.mutes": "Úsáideoirí balbhaithe",
+  "navigation_bar.opened_in_classic_interface": "Osclaítear poist, cuntais agus leathanaigh shonracha eile de réir réamhshocraithe sa chomhéadan gréasáin clasaiceach.",
   "navigation_bar.personal": "Pearsanta",
   "navigation_bar.pins": "Postálacha pionnáilte",
   "navigation_bar.preferences": "Sainroghanna pearsanta",
@@ -326,17 +471,41 @@
   "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
   "notification.admin.report": "Tuairiscigh {name} {target}",
   "notification.admin.sign_up": "Chláraigh {name}",
+  "notification.favourite": "Is fearr le {name} do phostáil",
   "notification.follow": "Lean {name} thú",
   "notification.follow_request": "D'iarr {name} ort do chuntas a leanúint",
   "notification.mention": "Luaigh {name} tú",
+  "notification.moderation-warning.learn_more": "Foghlaim níos mó",
+  "notification.moderation_warning": "Tá rabhadh modhnóireachta faighte agat",
+  "notification.moderation_warning.action_delete_statuses": "Baineadh cuid de do phostálacha.",
+  "notification.moderation_warning.action_disable": "Díchumasaíodh do chuntas.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Tá cuid de do phostálacha marcáilte mar íogair.",
+  "notification.moderation_warning.action_none": "Tá rabhadh modhnóireachta faighte ag do chuntas.",
+  "notification.moderation_warning.action_sensitive": "Déanfar do phostálacha a mharcáil mar íogair as seo amach.",
+  "notification.moderation_warning.action_silence": "Tá do chuntas teoranta.",
+  "notification.moderation_warning.action_suspend": "Cuireadh do chuntas ar fionraí.",
   "notification.own_poll": "Tá do suirbhé críochnaithe",
   "notification.poll": "Tá suirbhé inar vótáil tú tar éis críochnú",
   "notification.reblog": "Mhol {name} do phostáil",
+  "notification.relationships_severance_event": "Cailleadh naisc le {name}",
+  "notification.relationships_severance_event.account_suspension": "Chuir riarthóir ó {from} {target} ar fionraí, rud a chiallaíonn nach féidir leat nuashonruithe a fháil uathu a thuilleadh ná idirghníomhú leo.",
+  "notification.relationships_severance_event.domain_block": "Chuir riarthóir ó {from} bac ar {target}, lena n-áirítear {followersCount} de do leantóirí agus {followingCount, plural, one {#cuntas} other {#cuntas}} leanann tú.",
+  "notification.relationships_severance_event.learn_more": "Foghlaim níos mó",
+  "notification.relationships_severance_event.user_domain_block": "Chuir tú bac ar {target}, bhain tú {followersCount} de do leantóirí agus {followingCount, plural, one {# cuntas} other {# cuntais}} a leanann tú.",
   "notification.status": "Phostáil {name} díreach",
   "notification.update": "Chuir {name} postáil in eagar",
+  "notification_requests.accept": "Glac",
+  "notification_requests.dismiss": "Díbhe",
+  "notification_requests.notifications_from": "Fógraí ó {name}",
+  "notification_requests.title": "Fógraí scagtha",
   "notifications.clear": "Glan fógraí",
+  "notifications.clear_confirmation": "An bhfuil tú cinnte gur mhaith leat d'fhógraí go léir a ghlanadh go buan?",
   "notifications.column_settings.admin.report": "Tuairiscí nua:",
+  "notifications.column_settings.admin.sign_up": "Clárúcháin nua:",
   "notifications.column_settings.alert": "Fógraí deisce",
+  "notifications.column_settings.favourite": "Ceanáin:",
+  "notifications.column_settings.filter_bar.advanced": "Taispeáin gach catagóir",
+  "notifications.column_settings.filter_bar.category": "Barra scagairí tapa",
   "notifications.column_settings.follow": "Leantóirí nua:",
   "notifications.column_settings.follow_request": "Iarratais leanúnaí nua:",
   "notifications.column_settings.mention": "Tráchtanna:",
@@ -347,33 +516,77 @@
   "notifications.column_settings.sound": "Seinn an fhuaim",
   "notifications.column_settings.status": "Postálacha nua:",
   "notifications.column_settings.unread_notifications.category": "Brúfhógraí neamhléite",
+  "notifications.column_settings.unread_notifications.highlight": "Aibhsigh fógraí neamhléite",
   "notifications.column_settings.update": "Eagair:",
   "notifications.filter.all": "Uile",
   "notifications.filter.boosts": "Treisithe",
+  "notifications.filter.favourites": "Ceanáin",
   "notifications.filter.follows": "Ag leanúint",
   "notifications.filter.mentions": "Tráchtanna",
   "notifications.filter.polls": "Torthaí suirbhéanna",
   "notifications.filter.statuses": "Nuashonruithe ó dhaoine a leanann tú",
   "notifications.grant_permission": "Tabhair cead.",
   "notifications.group": "{count} fógraí",
+  "notifications.mark_as_read": "Marcáil gach fógra mar atá léite",
+  "notifications.permission_denied": "Níl fógraí deisce ar fáil mar gheall ar iarratas ar chead brabhsálaí a diúltaíodh roimhe seo",
+  "notifications.permission_denied_alert": "Ní féidir fógraí deisce a chumasú, mar gur diúltaíodh cead brabhsálaí roimhe seo",
+  "notifications.permission_required": "Níl fógraí deisce ar fáil toisc nár tugadh an cead riachtanach.",
+  "notifications.policy.filter_new_accounts.hint": "Cruthaithe laistigh den {days, plural, one {lae amháin} two {# lá} few {# lá} many {# lá} other {# lá}}",
+  "notifications.policy.filter_new_accounts_title": "Cuntais nua",
+  "notifications.policy.filter_not_followers_hint": "Agus daoine a bhfuil siad ag leanúint ort le níos lú ná {days, plural, one {lae amháin} two {# lá} few {# lá} many {# lá} other {# lá}}",
+  "notifications.policy.filter_not_followers_title": "Daoine nach leanann tú",
+  "notifications.policy.filter_not_following_hint": "Go dtí go gceadaíonn tú iad de láimh",
+  "notifications.policy.filter_not_following_title": "Daoine nach leanann tú",
+  "notifications.policy.filter_private_mentions_hint": "Scagtha mura bhfuil sé mar fhreagra ar do lua féin nó má leanann tú an seoltóir",
+  "notifications.policy.filter_private_mentions_title": "Tagairtí príobháideacha gan iarraidh",
+  "notifications.policy.title": "Scag fógraí ó…",
   "notifications_permission_banner.enable": "Ceadaigh fógraí ar an deasc",
+  "notifications_permission_banner.how_to_control": "Chun fógraí a fháil nuair nach bhfuil Mastodon oscailte, cumasaigh fógraí deisce. Is féidir leat a rialú go beacht cé na cineálacha idirghníomhaíochtaí a ghineann fógraí deisce tríd an gcnaipe {icon} thuas nuair a bhíonn siad cumasaithe.",
   "notifications_permission_banner.title": "Ná caill aon rud go deo",
+  "onboarding.action.back": "Tóg ar ais mé",
+  "onboarding.actions.back": "Tóg ar ais mé",
   "onboarding.actions.go_to_explore": "See what's trending",
   "onboarding.actions.go_to_home": "Go to your home feed",
+  "onboarding.compose.template": "Dia duit #Mastodon!",
+  "onboarding.follows.empty": "Ar an drochuair, ní féidir aon torthaí a thaispeáint faoi láthair. Is féidir leat triail a bhaint as cuardach nó brabhsáil ar an leathanach taiscéalaíochta chun teacht ar dhaoine le leanúint, nó bain triail eile as níos déanaí.",
   "onboarding.follows.lead": "You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!",
   "onboarding.follows.title": "Popular on Mastodon",
+  "onboarding.profile.discoverable": "Déan mo phróifíl a fháil amach",
+  "onboarding.profile.discoverable_hint": "Nuair a roghnaíonn tú infhionnachtana ar Mastodon, d’fhéadfadh do phoist a bheith le feiceáil i dtorthaí cuardaigh agus treochtaí, agus d’fhéadfaí do phróifíl a mholadh do dhaoine a bhfuil na leasanna céanna acu leat.",
+  "onboarding.profile.display_name": "Ainm taispeána",
+  "onboarding.profile.display_name_hint": "D’ainm iomlán nó d’ainm spraíúil…",
+  "onboarding.profile.lead": "Is féidir leat é seo a chomhlánú i gcónaí níos déanaí sna socruithe, áit a bhfuil níos mó roghanna saincheaptha ar fáil.",
+  "onboarding.profile.note": "Bith",
+  "onboarding.profile.note_hint": "Is féidir leat @ daoine eile a lua nó #hashtags…",
+  "onboarding.profile.save_and_continue": "Sábháil agus lean ar aghaidh",
+  "onboarding.profile.title": "Socrú próifíle",
+  "onboarding.profile.upload_avatar": "Íosluchtaigh pictiúr próifíl",
+  "onboarding.profile.upload_header": "Íoslódáil an ceanntásca próifíl",
+  "onboarding.share.lead": "Cuir in iúl do dhaoine conas is féidir leo tú a aimsiú ar Mastodon!",
+  "onboarding.share.message": "Is {username} mé ar #Mastodon! Tar lean mé ag {url}",
+  "onboarding.share.next_steps": "Na chéad chéimeanna eile is féidir:",
+  "onboarding.share.title": "Roinn do phróifíl",
   "onboarding.start.lead": "Your new Mastodon account is ready to go. Here's how you can make the most of it:",
   "onboarding.start.skip": "Want to skip right ahead?",
+  "onboarding.start.title": "Tá sé déanta agat!",
   "onboarding.steps.follow_people.body": "You curate your own feed. Lets fill it with interesting people.",
   "onboarding.steps.follow_people.title": "Follow {count, plural, one {one person} other {# people}}",
   "onboarding.steps.publish_status.body": "Say hello to the world.",
+  "onboarding.steps.publish_status.title": "Déan do chéad phostáil",
   "onboarding.steps.setup_profile.body": "Others are more likely to interact with you with a filled out profile.",
   "onboarding.steps.setup_profile.title": "Customize your profile",
   "onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
   "onboarding.steps.share_profile.title": "Share your profile",
+  "onboarding.tips.2fa": "<strong>An raibh a fhios agat?</strong> Is féidir leat do chuntas a dhéanamh slán trí fhíordheimhniú dhá fhachtóir a shocrú i socruithe do chuntais. Oibríonn sé le haon aip TOTP de do rogha féin, níl aon uimhir theileafóin riachtanach!",
+  "onboarding.tips.accounts_from_other_servers": "<strong>An raibh a fhios agat?</strong> Ós rud é go bhfuil Mastodon díláraithe, déanfar roinnt próifílí a dtagann tú trasna orthu a óstáil ar fhreastalaithe seachas do fhreastalaithe. Agus fós is féidir leat idirghníomhú leo gan uaim! Tá an freastalaí acu sa dara leath dá n-ainm úsáideora!",
+  "onboarding.tips.migration": "<strong>An raibh a fhios agat?</strong> Más dóigh leat nach rogha freastalaí iontach é {domain} amach anseo, is féidir leat bogadh go freastalaí Mastodon eile gan do leantóirí a chailliúint. Is féidir leat do fhreastalaí féin a óstáil fiú!",
+  "onboarding.tips.verification": "<strong>An raibh a fhios agat?</strong> Is féidir leat do chuntas a fhíorú trí nasc a chur le do phróifíl Mastodon ar do shuíomh Gréasáin féin agus an suíomh Gréasáin a chur le do phróifíl. Níl aon táillí nó doiciméid riachtanach!",
+  "password_confirmation.exceeds_maxlength": "Sáraíonn dearbhú pasfhocail uasfhad an phasfhocail",
+  "password_confirmation.mismatching": "Ní hionann dearbhú pasfhocail",
   "picture_in_picture.restore": "Cuir é ar ais",
   "poll.closed": "Dúnta",
   "poll.refresh": "Athnuaigh",
+  "poll.reveal": "Féach torthaí",
   "poll.total_people": "{count, plural, one {# duine} other {# duine}}",
   "poll.total_votes": "{count, plural, one {# vóta} other {# vóta}}",
   "poll.vote": "Vótáil",
@@ -382,10 +595,21 @@
   "poll_button.add_poll": "Cruthaigh suirbhé",
   "poll_button.remove_poll": "Bain suirbhé",
   "privacy.change": "Adjust status privacy",
+  "privacy.direct.long": "Luaigh gach duine sa phost",
+  "privacy.direct.short": "Daoine ar leith",
+  "privacy.private.long": "Do leanúna amháin",
+  "privacy.private.short": "Leantóirí",
+  "privacy.public.long": "Duine ar bith ar agus amach Mastodon",
   "privacy.public.short": "Poiblí",
+  "privacy.unlisted.additional": "Iompraíonn sé seo díreach mar a bheadh ​​poiblí, ach amháin ní bheidh an postáil le feiceáil i bhfothaí beo nó i hashtags, in iniúchadh nó i gcuardach Mastodon, fiú má tá tú liostáilte ar fud an chuntais.",
+  "privacy.unlisted.long": "Níos lú fanfarraí algarthacha",
+  "privacy.unlisted.short": "Poiblí ciúin",
+  "privacy_policy.last_updated": "Nuashonraithe {date}",
   "privacy_policy.title": "Polasaí príobháideachais",
+  "recommended": "Molta",
   "refresh": "Athnuaigh",
   "regeneration_indicator.label": "Ag lódáil…",
+  "regeneration_indicator.sublabel": "Tá do bheathú baile á ullmhú!",
   "relative_time.days": "{number}l",
   "relative_time.full.days": "{number, plural, one {# lá} other {# lá}} ó shin",
   "relative_time.full.hours": "{number, plural, one {# uair} other {# uair}} ó shin",
@@ -397,47 +621,90 @@
   "relative_time.minutes": "{number}n",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "inniu",
+  "reply_indicator.attachments": "{count, plural, one {# alán} two {# aláin} few {# aláin} many {# aláin} other {# aláin}}",
   "reply_indicator.cancel": "Cealaigh",
+  "reply_indicator.poll": "Vótaíocht",
   "report.block": "Bac",
   "report.block_explanation": "Ní fheicfidh tú a c(h)úid postálacha. Ní bheidh sé/sí in ann do chuid postálacha a fheiceáil ná tú féin a leanúint. Beidh sé/sí in ann a dhéanamh amach go bhfuil sé/sí bactha.",
+  "report.categories.legal": "Dlíthiúil",
   "report.categories.other": "Eile",
   "report.categories.spam": "Turscar",
   "report.categories.violation": "Sáraíonn ábhar riail freastalaí amháin nó níos mó",
   "report.category.subtitle": "Roghnaigh an toradh is fearr",
+  "report.category.title": "Inis dúinn cad atá ar siúl leis an {type} seo",
   "report.category.title_account": "próifíl",
   "report.category.title_status": "postáil",
   "report.close": "Déanta",
+  "report.comment.title": "An bhfuil aon rud eile ba chóir dúinn a fhios agat, dar leat?",
   "report.forward": "Seol ar aghaidh chun {target}",
+  "report.forward_hint": "Is ó fhreastalaí eile an cuntas. Cuir cóip gan ainm den tuarascáil ansin freisin?",
   "report.mute": "Balbhaigh",
   "report.mute_explanation": "Ní fheicfidh tú a postálacha. Is féidir an té seo tú a leanúint agus do phostálacha a fheiceáil, agus ní fhios go bhfuil iad balbhaithe.",
   "report.next": "An céad eile",
   "report.placeholder": "Ráitis bhreise",
   "report.reasons.dislike": "Ní maith liom é",
+  "report.reasons.dislike_description": "Ní rud é ba mhaith leat a fheiceáil",
+  "report.reasons.legal": "Tá sé mídhleathach",
+  "report.reasons.legal_description": "Creideann tú go sáraíonn sé dlí do thíre nó do thír an fhreastalaí",
   "report.reasons.other": "Is rud eile é",
+  "report.reasons.other_description": "Ní luíonn an cheist le catagóirí eile",
   "report.reasons.spam": "Is turscar é",
+  "report.reasons.spam_description": "Naisc mhailíseacha, rannpháirtíocht bhréige, nó freagraí athchleachtach",
   "report.reasons.violation": "Sáraíonn sé rialacha an fhreastalaí",
   "report.reasons.violation_description": "Tá a fhios agat go sáraíonn sé rialacha ar leith",
   "report.rules.subtitle": "Roghnaigh gach atá i bhfeidhm",
   "report.rules.title": "Cén rialacha atá á sárú?",
   "report.statuses.subtitle": "Roghnaigh gach atá i bhfeidhm",
+  "report.statuses.title": "An bhfuil aon phoist a thacaíonn leis an tuarascáil seo?",
   "report.submit": "Cuir isteach",
   "report.target": "Ag tuairisciú {target}",
+  "report.thanks.take_action": "Seo do roghanna chun an méid a fheiceann tú ar Mastodon a rialú:",
+  "report.thanks.take_action_actionable": "Agus é seo á athbhreithniú againn, is féidir leat caingean a dhéanamh in aghaidh @{name}:",
+  "report.thanks.title": "Ná bí ag iarraidh é seo a fheiceáil?",
+  "report.thanks.title_actionable": "Go raibh maith agat as tuairisc a thabhairt, scrúdóimid é seo.",
   "report.unfollow": "Ná lean @{name}",
+  "report.unfollow_explanation": "Tá tú ag leanúint an chuntais seo. Chun nach bhfeicfidh tú a bpoist i do fhotha baile a thuilleadh, dílean ​​iad.",
   "report_notification.attached_statuses": "{count, plural, one {# post} other {# posts}} attached",
+  "report_notification.categories.legal": "Dlíthiúil",
   "report_notification.categories.other": "Eile",
   "report_notification.categories.spam": "Turscar",
   "report_notification.categories.violation": "Sárú rialach",
   "report_notification.open": "Oscail tuairisc",
+  "search.no_recent_searches": "Níl aon chuardach le déanaí",
   "search.placeholder": "Cuardaigh",
+  "search.quick_action.account_search": "Próifílí a mheaitseálann {x}",
+  "search.quick_action.go_to_account": "Téigh go próifíl {x}",
+  "search.quick_action.go_to_hashtag": "Téigh chuig hashtag {x}",
+  "search.quick_action.open_url": "Oscail URL i Mastodon",
+  "search.quick_action.status_search": "Postálacha a mheaitseálann {x}",
   "search.search_or_paste": "Cuardaigh nó cuir URL isteach",
+  "search_popout.full_text_search_disabled_message": "Níl sé ar fáil ar {domain}.",
+  "search_popout.full_text_search_logged_out_message": "Ar fáil ach amháin nuair atá tú logáilte isteach.",
+  "search_popout.language_code": "Cód teanga ISO",
+  "search_popout.options": "Roghanna cuardaigh",
+  "search_popout.quick_actions": "Gníomhartha tapa",
+  "search_popout.recent": "Cuardach le déanaí",
+  "search_popout.specific_date": "dáta ar leith",
+  "search_popout.user": "úsáideoir",
+  "search_results.accounts": "Próifílí",
   "search_results.all": "Uile",
   "search_results.hashtags": "Haischlibeanna",
+  "search_results.nothing_found": "Níorbh fhéidir aon rud a aimsiú do na téarmaí cuardaigh seo",
+  "search_results.see_all": "Gach rud a fheicáil",
   "search_results.statuses": "Postálacha",
   "search_results.title": "Cuardaigh ar thóir {q}",
+  "server_banner.about_active_users": "Daoine a úsáideann an freastalaí seo le 30 lá anuas (Úsáideoirí Gníomhacha Míosúla)",
   "server_banner.active_users": "úsáideoirí gníomhacha",
+  "server_banner.administered_by": "Arna riar ag:",
+  "server_banner.is_one_of_many": "Tá {domain} ar cheann de na freastalaithe Mastodon neamhspleácha go leor is féidir leat a úsáid chun páirt a ghlacadh sa feiliúnach.",
   "server_banner.server_stats": "Staitisticí freastalaí:",
   "sign_in_banner.create_account": "Cruthaigh cuntas",
+  "sign_in_banner.follow_anyone": "Lean aon duine ar fud an fhealsúnachta agus féach ar fad in ord croineolaíoch. Gan algartam, fógraí, nó clickbait i radharc.",
+  "sign_in_banner.mastodon_is": "Is é Mastodon an bealach is fearr le coinneáil suas lena bhfuil ag tarlú.",
   "sign_in_banner.sign_in": "Sinigh isteach",
+  "sign_in_banner.sso_redirect": "Logáil isteach nó Cláraigh",
+  "status.admin_account": "Oscail comhéadan modhnóireachta do @{name}",
+  "status.admin_domain": "Oscail comhéadan modhnóireachta le haghaidh {domain}",
   "status.admin_status": "Open this status in the moderation interface",
   "status.block": "Bac @{name}",
   "status.bookmark": "Leabharmharcanna",
@@ -445,15 +712,23 @@
   "status.cannot_reblog": "Ní féidir an phostáil seo a mholadh",
   "status.copy": "Copy link to status",
   "status.delete": "Scrios",
+  "status.detailed_status": "Amharc comhrá mionsonraithe",
+  "status.direct": "Luaigh @{name} go príobháideach",
+  "status.direct_indicator": "Lua príobháideach",
   "status.edit": "Cuir in eagar",
+  "status.edited": "Arna chuir in eagar anuas {date}",
   "status.edited_x_times": "Curtha in eagar {count, plural, one {{count} uair amháin} two {{count} uair} few {{count} uair} many {{count} uair} other {{count} uair}}",
   "status.embed": "Leabaigh",
+  "status.favourite": "Is fearr leat",
+  "status.favourites": "{count, plural, one {a bhfuil grá agat do} two {gráite} few {gráite} many {gráite} other {gráite}}",
   "status.filter": "Déan scagadh ar an bpostáil seo",
   "status.filtered": "Scagtha",
   "status.hide": "Cuir postáil i bhfolach",
   "status.history.created": "Chruthaigh {name} {date}",
   "status.history.edited": "Curtha in eagar ag {name} in {date}",
   "status.load_more": "Lódáil a thuilleadh",
+  "status.media.open": "Cliceáil chun oscailt",
+  "status.media.show": "Cliceáil chun a thaispeáint",
   "status.media_hidden": "Cuirtear meáin i bhfolach",
   "status.mention": "Luaigh @{name}",
   "status.more": "Tuilleadh",
@@ -466,8 +741,11 @@
   "status.reblog": "Mol",
   "status.reblog_private": "Mol le léargas bunúsach",
   "status.reblogged_by": "Mhol {name}",
+  "status.reblogs": "{count, plural, one {buaic} other {buaic}}",
   "status.reblogs.empty": "Níor mhol éinne an phostáil seo fós. Nuair a mholfaidh duine éigin í, taispeánfar anseo é sin.",
   "status.redraft": "Scrios ⁊ athdhréachtaigh",
+  "status.remove_bookmark": "Bain leabharmharc",
+  "status.replied_to": "D'fhreagair {name}",
   "status.reply": "Freagair",
   "status.replyAll": "Freagair le snáithe",
   "status.report": "Tuairiscigh @{name}",
@@ -482,38 +760,54 @@
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
   "status.translate": "Aistrigh",
   "status.translated_from_with": "D'Aistrigh ón {lang} ag úsáid {provider}",
+  "status.uncached_media_warning": "Níl an réamhamharc ar fáil",
   "status.unmute_conversation": "Díbhalbhaigh comhrá",
   "status.unpin": "Díphionnáil de do phróifíl",
+  "subscribed_languages.lead": "Ní bheidh ach postálacha i dteangacha roghnaithe le feiceáil ar do bhaile agus liostaí amlínte tar éis an athraithe. Roghnaigh ceann ar bith chun postálacha a fháil i ngach teanga.",
   "subscribed_languages.save": "Sábháil athruithe",
+  "subscribed_languages.target": "Athraigh teangacha suibscríofa le haghaidh {target}",
   "tabs_bar.home": "Baile",
   "tabs_bar.notifications": "Fógraí",
   "time_remaining.days": "{number, plural, one {# lá} other {# lá}} fágtha",
   "time_remaining.hours": "{number, plural, one {# uair} other {# uair}} fágtha",
   "time_remaining.minutes": "{number, plural, one {# nóiméad} other {# nóiméad}} fágtha",
+  "time_remaining.moments": "Chuimhneacháin fágtha",
   "time_remaining.seconds": "{number, plural, one {# soicind} other {# soicind}} fágtha",
+  "timeline_hint.remote_resource_not_displayed": "Níl {resource} ó fhreastalaithe eile ar taispeáint.",
   "timeline_hint.resources.followers": "Leantóirí",
   "timeline_hint.resources.follows": "Cuntais leanta",
   "timeline_hint.resources.statuses": "Postáilí níos sine",
   "trends.counter_by_accounts": "{count, plural, one {{counter} duine} other {{counter} duine}} le {days, plural, one {lá} other {{days} lá}} anuas",
   "trends.trending_now": "Ag treochtáil anois",
+  "ui.beforeunload": "Caillfear do dhréacht má fhágann tú Mastodon.",
   "units.short.billion": "{count}B",
   "units.short.million": "{count}M",
   "units.short.thousand": "{count}k",
   "upload_area.title": "Tarraing ⁊ scaoil chun uaslódáil",
+  "upload_button.label": "Cuir íomhánna, físeán nó comhad fuaime leis",
+  "upload_error.limit": "Sáraíodh an teorainn uaslódála comhaid.",
+  "upload_error.poll": "Ní cheadaítear uaslódáil comhad le pobalbhreith.",
   "upload_form.audio_description": "Describe for people with hearing loss",
   "upload_form.description": "Describe for the visually impaired",
   "upload_form.edit": "Cuir in eagar",
+  "upload_form.thumbnail": "Athraigh mionsamhail",
   "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
   "upload_modal.analyzing_picture": "Ag anailísiú íomhá…",
   "upload_modal.apply": "Cuir i bhFeidhm",
   "upload_modal.applying": "Á gcur i bhfeidhm…",
   "upload_modal.choose_image": "Roghnaigh íomhá",
   "upload_modal.description_placeholder": "Chuaigh bé mhórsách le dlúthspád fíorfhinn trí hata mo dhea-phorcáin bhig",
+  "upload_modal.detect_text": "Braith téacs ó phictiúr",
   "upload_modal.edit_media": "Cuir gné in eagar",
+  "upload_modal.hint": "Cliceáil nó tarraing an ciorcal ar an réamhamharc chun an pointe fócasach a roghnú a bheidh le feiceáil i gcónaí ar na mionsamhlacha go léir.",
+  "upload_modal.preparing_ocr": "OCR á ullmhú…",
+  "upload_modal.preview_label": "Réamhamharc ({ratio})",
   "upload_progress.label": "Ag uaslódáil...",
   "upload_progress.processing": "Ag próiseáil…",
+  "username.taken": "Glactar leis an ainm úsáideora sin. Bain triail eile as",
   "video.close": "Dún físeán",
   "video.download": "Íoslódáil comhad",
+  "video.exit_fullscreen": "Scoir scáileán iomlán",
   "video.expand": "Leath físeán",
   "video.fullscreen": "Lánscáileán",
   "video.hide": "Cuir físeán i bhfolach",
diff --git a/app/javascript/mastodon/locales/lt.json b/app/javascript/mastodon/locales/lt.json
index bb69b733997bd1..258e8ce08e92f3 100644
--- a/app/javascript/mastodon/locales/lt.json
+++ b/app/javascript/mastodon/locales/lt.json
@@ -1,6 +1,6 @@
 {
   "about.blocks": "Prižiūrimi serveriai",
-  "about.contact": "Kontaktai:",
+  "about.contact": "Kontaktuoti:",
   "about.disclaimer": "„Mastodon“ – tai nemokama atvirojo kodo programinė įranga ir „Mastodon“ gGmbH prekės ženklas.",
   "about.domain_blocks.no_reason_available": "Priežastis nepateikta",
   "about.domain_blocks.preamble": "„Mastodon“ paprastai leidžia peržiūrėti turinį ir bendrauti su naudotojais iš bet kurio kito fediverse esančio serverio. Šios yra išimtys, kurios buvo padarytos šiame konkrečiame serveryje.",
@@ -230,7 +230,7 @@
   "domain_pill.your_handle": "Tavo socialinis medijos vardas:",
   "domain_pill.your_server": "Tavo skaitmeniniai namai, kuriuose saugomi visi tavo įrašai. Nepatinka šis? Bet kada perkelk serverius ir atsivesk ir savo sekėjus.",
   "domain_pill.your_username": "Tavo unikalus identifikatorius šiame serveryje. Skirtinguose serveriuose galima rasti naudotojų su tuo pačiu naudotojo vardu.",
-  "embed.instructions": "Įterpk šį įrašą į savo svetainę nukopijavus (-usi) toliau pateiktą kodą.",
+  "embed.instructions": "Įterpk šį įrašą į savo svetainę nukopijuojant toliau pateiktą kodą.",
   "embed.preview": "Štai kaip tai atrodys:",
   "emoji_button.activity": "Veikla",
   "emoji_button.clear": "Išvalyti",
diff --git a/config/locales/activerecord.ga.yml b/config/locales/activerecord.ga.yml
index 236cc479e17e1b..1b61edb2e2fe00 100644
--- a/config/locales/activerecord.ga.yml
+++ b/config/locales/activerecord.ga.yml
@@ -19,8 +19,41 @@ ga:
         account:
           attributes:
             username:
+              invalid: ní mór go mbeadh litreacha, uimhreacha agus pointí béime amháin
               reserved: in áirithe
+        admin/webhook:
+          attributes:
+            url:
+              invalid: nach URL bailí é
+        doorkeeper/application:
+          attributes:
+            website:
+              invalid: nach URL bailí é
         import:
           attributes:
             data:
               malformed: míchumtha
+        status:
+          attributes:
+            reblog:
+              taken: den phost cheana féin
+        user:
+          attributes:
+            email:
+              blocked: úsáideann soláthraí ríomhphoist dícheadaithe
+              unreachable: ní cosúil go bhfuil sé ann
+            role_id:
+              elevated: ní féidir leat a bheith níos airde ná do ról reatha
+        user_role:
+          attributes:
+            permissions_as_keys:
+              dangerous: cuir san áireamh ceadanna nach bhfuil sábháilte don ról bunúsach
+              elevated: ní féidir ceadanna nach bhfuil ag do ról reatha a áireamh
+              own_role: ní féidir é a athrú le do ról reatha
+            position:
+              elevated: ní féidir leat a bheith níos airde ná do ról reatha
+              own_role: ní féidir é a athrú le do ról reatha
+        webhook:
+          attributes:
+            events:
+              invalid_permissions: ní féidir imeachtaí nach bhfuil na cearta agat ina leith a chur san áireamh
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index f892df02c1e689..4d0e2ab389d2a4 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -226,6 +226,7 @@ ca:
         update_custom_emoji: Actualitza l'emoji personalitzat
         update_domain_block: Actualitza el Bloqueig de Domini
         update_ip_block: Actualitza norma IP
+        update_report: Actualitza l'informe
         update_status: Actualitza l'estat
         update_user_role: Actualitza Rol
       actions:
@@ -638,6 +639,7 @@ ca:
       report: 'Informe #%{id}'
       reported_account: Compte denunciat
       reported_by: Denunciat per
+      reported_with_application: Reportat amb l'aplicació
       resolved: Resolt
       resolved_msg: Informe resolt correctament!
       skip_to_actions: Salta a les accions
diff --git a/config/locales/da.yml b/config/locales/da.yml
index fc7373cc94c700..75da9a0b363fdf 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -226,6 +226,7 @@ da:
         update_custom_emoji: Opdatér tilpasset emoji
         update_domain_block: Opdatér domæneblokering
         update_ip_block: Opdatér IP-regel
+        update_report: Opdatér anmeldelse
         update_status: Opdatér indlæg
         update_user_role: Opdatér rolle
       actions:
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 82ed9d8178c3d5..81b7cd172d64fb 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -226,6 +226,7 @@ de:
         update_custom_emoji: Eigenes Emoji aktualisieren
         update_domain_block: Domain-Sperre aktualisieren
         update_ip_block: IP-Regel aktualisieren
+        update_report: Meldung aktualisieren
         update_status: Beitrag aktualisieren
         update_user_role: Rolle bearbeiten
       actions:
@@ -638,6 +639,7 @@ de:
       report: "%{id}. Meldung"
       reported_account: Gemeldetes Konto
       reported_by: Gemeldet von
+      reported_with_application: Per App gemeldet
       resolved: Geklärt
       resolved_msg: Meldung erfolgreich geklärt!
       skip_to_actions: Zur Maßnahme springen
diff --git a/config/locales/devise.ga.yml b/config/locales/devise.ga.yml
index 6e6bd0a01360b3..e083896f370ec1 100644
--- a/config/locales/devise.ga.yml
+++ b/config/locales/devise.ga.yml
@@ -11,19 +11,108 @@ ga:
       invalid: "%{authentication_keys} nó pasfhocal neamhbhailí."
       last_attempt: Tá iarracht amháin eile agat sula gcuirtear do chuntas faoi ghlas.
       locked: Tá do chuntas faoi ghlas.
+      not_found_in_database: "%{authentication_keys} nó pasfhocal neamhbhailí."
+      omniauth_user_creation_failure: Earráid agus cuntas á chruthú don aitheantas seo.
       pending: Tá do chuntas fós faoi athbhreithniú.
+      timeout: Chuaigh do sheisiún in éag. Logáil isteach arís chun leanúint ar aghaidh.
       unauthenticated: Ní mór duit lógáil isteach nó síniú suas roimh leanúint leat.
       unconfirmed: Caithfidh tú do r-phost a dheimhniú roimh leanúint leat.
     mailer:
       confirmation_instructions:
         action: Deimhnigh seoladh r-phost
         action_with_app: Deimhnigh agus fill ar %{app}
+        explanation: Tá cuntas cruthaithe agat ar %{host} leis an seoladh ríomhphoist seo. Tá tú ceann cliceáil ar shiúl ó é a ghníomhachtú. Mura tusa a bhí ann, déan neamhaird den ríomhphost seo le do thoil.
+        explanation_when_pending: Chuir tú isteach ar chuireadh chuig %{host} leis an seoladh ríomhphoist seo. Nuair a dheimhníonn tú do sheoladh r-phoist, déanfaimid athbhreithniú ar d’iarratas. Is féidir leat logáil isteach chun do shonraí a athrú nó chun do chuntas a scriosadh, ach ní féidir leat rochtain a fháil ar fhormhór na bhfeidhmeanna go dtí go mbeidh do chuntas faofa. Má dhiúltaítear do d’iarratas, bainfear do shonraí, mar sin ní bheidh aon ghníomh eile ag teastáil uait. Mura tusa a bhí ann, déan neamhaird den ríomhphost seo le do thoil.
+        extra_html: Seiceáil freisin <a href="%{terms_path}">rialacha an fhreastalaí</a> agus <a href="%{policy_path}">ár dtéarmaí seirbhíse</a>.
+        subject: 'Mastodon: Treoracha dearbhaithe do %{instance}'
+        title: Fíoraigh seoladh ríomhphoist
       email_changed:
+        explanation: 'Tá seoladh ríomhphoist do chuntais á athrú go:'
+        extra: Murar athraigh tú do ríomhphost, is dócha go bhfuil rochtain faighte ag duine éigin ar do chuntas. Athraigh do phasfhocal láithreach le do thoil nó déan teagmháil le riarthóir an fhreastalaí má tá tú glasáilte amach as do chuntas.
+        subject: 'Mastodon: Athraíodh an ríomhphost'
         title: Seoladh ríomhphoist nua
       password_change:
+        explanation: Athraíodh an pasfhocal do do chuntas.
+        extra: Murar athraigh tú do phasfhocal, is dócha go bhfuil rochtain faighte ag duine éigin ar do chuntas. Athraigh do phasfhocal láithreach le do thoil nó déan teagmháil le riarthóir an fhreastalaí má tá tú glasáilte amach as do chuntas.
+        subject: 'Mastodon: Athraíodh an pasfhocal'
         title: Pasfhocal athraithe
+      reconfirmation_instructions:
+        explanation: Deimhnigh an seoladh nua chun do ríomhphost a athrú.
+        extra: Murar tusa a thionscain an t-athrú seo, déan neamhaird den ríomhphost seo le do thoil. Ní athrófar seoladh ríomhphoist an chuntais Mastodon go dtí go bhfaighidh tú rochtain ar an nasc thuas.
+        subject: 'Mastodon: Deimhnigh ríomhphost le haghaidh %{instance}'
+        title: Fíoraigh seoladh ríomhphoist
       reset_password_instructions:
         action: Athraigh pasfhocal
+        explanation: D'iarr tú pasfhocal nua do do chuntas.
+        extra: Murar iarr tú é seo, déan neamhaird den ríomhphost seo le do thoil. Ní athrófar do phasfhocal go dtí go bhfaighidh tú rochtain ar an nasc thuas agus go gcruthóidh tú ceann nua.
+        subject: 'Mastodon: Athshocraigh treoracha pasfhocail'
+        title: Athshocrú pasfhocal
+      two_factor_disabled:
+        explanation: Is féidir logáil isteach anois ach úsáid a bhaint as seoladh ríomhphoist agus pasfhocal amháin.
+        subject: 'Mastodon: Díchumasaíodh fíordheimhniú dhá fhachtóir'
+        subtitle: Díchumasaíodh fíordheimhniú dhá-fhachtóir do do chuntas.
+        title: 2FA díchumasaithe
+      two_factor_enabled:
+        explanation: Beidh comhartha ginte ag an aip TOTP péireáilte ag teastáil chun logáil isteach.
+        subject: 'Mastodon: Fíordheimhniú dhá-fhachtóir cumasaithe'
+        subtitle: Cumasaíodh fíordheimhniú dhá fhachtóir do do chuntas.
+        title: 2FA cumasaithe
+      two_factor_recovery_codes_changed:
+        explanation: Tá na cóid athshlánaithe roimhe seo neamhbhailí agus gineadh cinn nua.
+        subject: 'Mastodon: Cóid aisghabhála dhá-fhachtóir athghinte'
+        subtitle: Tá na cóid athshlánaithe roimhe seo neamhbhailí agus gineadh cinn nua.
+        title: Athraíodh cóid aisghabhála 2FA
+      unlock_instructions:
+        subject: 'Mastodon: Díghlasáil treoracha'
+      webauthn_credential:
+        added:
+          explanation: Cuireadh an eochair shlándála seo a leanas le do chuntas
+          subject: 'Mastodon: Eochair shlándála nua'
+          title: Tá eochair shlándála nua curtha leis
+        deleted:
+          explanation: Scriosadh an eochair shlándála seo a leanas ó do chuntas
+          subject: 'Mastodon: Scriosadh an eochair shlándála'
+          title: Scriosadh ceann de d'eochracha slándála
+      webauthn_disabled:
+        explanation: Díchumasaíodh fíordheimhniú le heochracha slándála do do chuntas.
+        extra: Is féidir logáil isteach anois ag baint úsáide as an comhartha a ghineann an aip TOTP péireáilte amháin.
+        subject: 'Mastodon: Díchumasaíodh fíordheimhniú le heochracha slándála'
+        title: Eochracha slándála díchumasaithe
+      webauthn_enabled:
+        explanation: Cumasaíodh fíordheimhniú eochair shlándála do do chuntas.
+        extra: Is féidir d'eochair shlándála a úsáid le logáil isteach anois.
+        subject: 'Mastodon: Fíordheimhniú eochair shlándála cumasaithe'
+        title: Eochracha slándála cumasaithe
+    omniauth_callbacks:
+      failure: Níorbh fhéidir tú a fhíordheimhniú ó %{kind} toisc "%{reason}".
+      success: D'éirigh le fíordheimhniú ó chuntas %{kind}.
+    passwords:
+      no_token: Ní féidir leat rochtain a fháil ar an leathanach seo gan teacht ó ríomhphost athshocraithe pasfhocail. Má thagann tú ó ríomhphost athshocraithe pasfhocail, cinntigh le do thoil gur úsáid tú an URL iomlán a cuireadh ar fáil.
+      send_instructions: Má tá do sheoladh ríomhphoist inár mbunachar sonraí, gheobhaidh tú nasc athshlánaithe pasfhocail ag do sheoladh ríomhphoist i gceann cúpla nóiméad. Seiceáil d'fhillteán turscair mura bhfuair tú an ríomhphost seo.
+      send_paranoid_instructions: Má tá do sheoladh ríomhphoist inár mbunachar sonraí, gheobhaidh tú nasc athshlánaithe pasfhocail ag do sheoladh ríomhphoist i gceann cúpla nóiméad. Seiceáil d'fhillteán turscair mura bhfuair tú an ríomhphost seo.
+      updated: Athraíodh do phasfhocal go rathúil. Tá tú sínithe isteach anois.
+      updated_not_active: Your password has been changed successfully.
+    registrations:
+      destroyed: Slán! Cealaíodh do chuntas go rathúil. Tá súil againn tú a fheiceáil arís go luath.
+      signed_up: Fáilte romhat! D'éirigh leat síniú suas.
+      signed_up_but_inactive: D'éirigh leat síniú suas. Mar sin féin, níorbh fhéidir linn tú a shíniú isteach toisc nach bhfuil do chuntas gníomhachtaithe fós.
+      signed_up_but_locked: D'éirigh leat síniú suas. Mar sin féin, níorbh fhéidir linn tú a shíniú isteach toisc go bhfuil do chuntas glasáilte.
+      signed_up_but_pending: Tá teachtaireacht le nasc deimhnithe seolta chuig do sheoladh ríomhphoist. Tar éis duit an nasc a chliceáil, déanfaimid athbhreithniú ar d’iarratas. Cuirfear in iúl duit má cheadaítear é.
+      signed_up_but_unconfirmed: Tá teachtaireacht le nasc deimhnithe seolta chuig do sheoladh ríomhphoist. Lean an nasc chun do chuntas a ghníomhachtú. Seiceáil d'fhillteán turscair mura bhfuair tú an ríomhphost seo.
+      update_needs_confirmation: D'éirigh leat do chuntas a nuashonrú, ach caithfimid do sheoladh ríomhphoist nua a fhíorú. Seiceáil do ríomhphost agus lean an nasc dearbhaithe chun do sheoladh ríomhphoist nua a dhearbhú. Seiceáil d'fhillteán turscair mura bhfuair tú an ríomhphost seo.
+      updated: D'éirigh le do chuntas a nuashonrú.
+    sessions:
+      already_signed_out: D'éirigh le síniú amach.
+      signed_in: D'éirigh le síniú isteach.
+      signed_out: D'éirigh le síniú amach.
+    unlocks:
+      send_instructions: Gheobhaidh tú ríomhphost le treoracha maidir le conas do chuntas a dhíghlasáil i gceann cúpla nóiméad. Seiceáil d'fhillteán turscair mura bhfuair tú an ríomhphost seo.
+      send_paranoid_instructions: Má tá do chuntas ann, gheobhaidh tú ríomhphost le treoracha maidir le conas é a dhíghlasáil i gceann cúpla nóiméad. Seiceáil d'fhillteán turscair mura bhfuair tú an ríomhphost seo.
+      unlocked: Díghlasáladh do chuntas go rathúil. Logáil isteach le do thoil chun leanúint ar aghaidh.
   errors:
     messages:
+      already_confirmed: deimhníodh cheana féin, bain triail as síniú isteach
+      confirmation_period_expired: ní mór é a dhearbhú laistigh de %{period}, iarr ceann nua le do thoil
+      expired: imithe in éag, iarr ceann nua le do thoil
       not_found: níor aimsíodh é
+      not_locked: nach raibh faoi ghlas
diff --git a/config/locales/doorkeeper.ga.yml b/config/locales/doorkeeper.ga.yml
index a263a6b15dc529..9ac4740691c928 100644
--- a/config/locales/doorkeeper.ga.yml
+++ b/config/locales/doorkeeper.ga.yml
@@ -40,6 +40,7 @@ ga:
         accounts: Cuntais
         bookmarks: Leabharmharcanna
         conversations: Comhráite
+        favourites: Ceanáin
         filters: Scagairí
         follows: Cuntais leanta
         lists: Liostaí
@@ -47,5 +48,6 @@ ga:
         search: Cuardaigh
         statuses: Postálacha
     scopes:
+      read:favourites: féach ar do cheanáin
       write:filters: cruthaigh scagairí
       write:lists: cruthaigh liostaí
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 928823b995b674..a45ba290b74a20 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -226,6 +226,7 @@ en-GB:
         update_custom_emoji: Update Custom Emoji
         update_domain_block: Update Domain Block
         update_ip_block: Update IP rule
+        update_report: Update Report
         update_status: Update Post
         update_user_role: Update Role
       actions:
diff --git a/config/locales/es-AR.yml b/config/locales/es-AR.yml
index fda1566e22c478..8c55551ce06320 100644
--- a/config/locales/es-AR.yml
+++ b/config/locales/es-AR.yml
@@ -226,6 +226,7 @@ es-AR:
         update_custom_emoji: Actualizar emoji personalizado
         update_domain_block: Actualizar bloque de dominio
         update_ip_block: Actualizar regla de dirección IP
+        update_report: Actualizar denuncia
         update_status: Actualizar mensaje
         update_user_role: Actualizar rol
       actions:
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index be87258daf22bb..2d10250f68e134 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -226,6 +226,7 @@ fi:
         update_custom_emoji: Päivitä mukautettu emoji
         update_domain_block: Päivitä verkkotunnuksen esto
         update_ip_block: Päivitä IP-sääntö
+        update_report: Päivitä raportti
         update_status: Päivitä julkaisu
         update_user_role: Päivitä rooli
       actions:
diff --git a/config/locales/fo.yml b/config/locales/fo.yml
index 945a2216a3d6ba..6a5401ced4882f 100644
--- a/config/locales/fo.yml
+++ b/config/locales/fo.yml
@@ -226,6 +226,7 @@ fo:
         update_custom_emoji: Dagfør Sergjørt Kenslutekn
         update_domain_block: Dagfør Domain forðing
         update_ip_block: Dagfør IP reglur
+        update_report: Dagfør frágreiðing
         update_status: Dagfør Uppslag
         update_user_role: Dagfør Leiklut
       actions:
@@ -638,6 +639,7 @@ fo:
       report: 'Melding #%{id}'
       reported_account: Meldað konta
       reported_by: Meldað av
+      reported_with_application: Fráboðað við umsókn
       resolved: Loyst
       resolved_msg: Melding avgreidd!
       skip_to_actions: Leyp til atgerðir
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 3ba823f99bc685..ecafbec960ba00 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -232,6 +232,7 @@ he:
         update_custom_emoji: עדכון סמלון מותאם אישית
         update_domain_block: עדכון חסימת שם מתחם
         update_ip_block: עדכון כלל IP
+        update_report: עדכון דו"ח עבירה
         update_status: סטטוס עדכון
         update_user_role: עדכון תפקיד
       actions:
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 19076910e2992c..5def03d902a367 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -226,6 +226,7 @@ hu:
         update_custom_emoji: Egyéni emodzsi frissítése
         update_domain_block: Domain tiltás frissítése
         update_ip_block: IP-szabály frissítése
+        update_report: Bejelentés Frissítése
         update_status: Bejegyzés frissítése
         update_user_role: Szerepkör frissítése
       actions:
@@ -638,6 +639,7 @@ hu:
       report: "#%{id} számú jelentés"
       reported_account: Bejelentett fiók
       reported_by: 'Jelentette:'
+      reported_with_application: Alkalmazással bejelentve
       resolved: Megoldott
       resolved_msg: A bejelentést sikeresen megoldottuk!
       skip_to_actions: Tovább az intézkedésekhez
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 1e17c5cbd0c721..68e1608d9c1990 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -226,6 +226,7 @@ it:
         update_custom_emoji: Aggiorna Emoji Personalizzata
         update_domain_block: Aggiorna Blocco del Dominio
         update_ip_block: Aggiorna regola IP
+        update_report: Aggiorna segnalazione
         update_status: Aggiorna Toot
         update_user_role: Aggiorna Ruolo
       actions:
@@ -638,6 +639,7 @@ it:
       report: 'Rapporto #%{id}'
       reported_account: Account segnalato
       reported_by: Inviato da
+      reported_with_application: Segnalato con applicazione
       resolved: Risolto
       resolved_msg: Rapporto risolto!
       skip_to_actions: Passa alle azioni
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index f7feb73ba0b03d..632bd7c097647f 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -223,6 +223,7 @@ ko:
         update_custom_emoji: 커스텀 에모지 업데이트
         update_domain_block: 도메인 차단 갱신
         update_ip_block: IP 규칙 수정
+        update_report: 신고 업데이트
         update_status: 게시물 수정
         update_user_role: 역할 수정
       actions:
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index e731deedc8e64b..004f5b4d043410 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -542,6 +542,8 @@ lt:
         manage_taxonomies_description: Leidžia naudotojams peržiūrėti tendencingą turinį ir atnaujinti saitažodžių nustatymus
         manage_user_access_description: Leidžia naudotojams išjungti kitų naudotojų dvigubo tapatybės nustatymą, pakeisti el. pašto adresą ir iš naujo nustatyti slaptažodį.
     settings:
+      branding:
+        title: Firminio ženklo kūrimas
       captcha_enabled:
         desc_html: Tai priklauso nuo hCaptcha išorinių skriptų, kurie gali kelti susirūpinimą dėl saugumo ir privatumo. Be to, <strong>dėl to registracijos procesas kai kuriems žmonėms (ypač neįgaliesiems) gali būti gerokai sunkiau prieinami</strong>. Dėl šių priežasčių apsvarstyk alternatyvias priemones, pavyzdžiui, patvirtinimu arba kvietimu grindžiamą registraciją.
       content_retention:
@@ -663,7 +665,19 @@ lt:
       edit_preset: Keisti įspėjimo nustatymus
       title: Įspėjamieji numatytieji
     webhooks:
+      add_new: Pridėti galutinį tašką
+      delete: Ištrinti
       description_html: "<strong>Webhook</strong> leidžia Mastodon siųsti <strong>realaus laiko pranešimus</strong> apie pasirinktus įvykius į tavo programą, kad programa galėtų <strong>automatiškai paleisti reakcijas</strong>."
+      disable: Išjungti
+      disabled: Išjungta
+      edit: Redaguoti galutinį tašką
+      enable: Įjungti
+      enabled: Aktyvi
+      enabled_events:
+        few: "%{count} įjungti įvykiai"
+        many: "%{count} įjungto įvykio"
+        one: "%{count} įjungtas įvykis"
+        other: "%{count} įjungtų įvykių"
       events: Įvykiai
   admin_mailer:
     auto_close_registrations:
@@ -909,6 +923,7 @@ lt:
   login_activities:
     authentication_methods:
       otp: dvigubas tapatybės nustatymo programėlė
+      webauthn: saugumo raktai
     description_html: Jei pastebėjei neatpažįstamą veiklą, apsvarstyk galimybę pakeisti slaptažodį ir įjungti dvigubą tapatybės nustatymą.
     empty: Tapatybės nustatymas istorijos nėra
     title: Tapatybės nustatymo istorija
@@ -1049,6 +1064,7 @@ lt:
     relationships: Sekimai ir sekėjai
     severed_relationships: Nutrūkę sąryšiai
     two_factor_authentication: Dvigubas tapatybės nustatymas
+    webauthn_authentication: Saugumo raktai
   severed_relationships:
     download: Atsisiųsti (%{count})
     preamble: Užblokavus domeną arba prižiūrėtojams nusprendus pristabdyti nuotolinio serverio veiklą, gali prarasti sekimus ir sekėjus. Kai taip atsitiks, galėsi atsisiųsti nutrauktų sąryšių sąrašus, kad juos patikrinti ir galbūt importuoti į kitą serverį.
@@ -1110,6 +1126,7 @@ lt:
     recovery_codes: Atsarginio atkūrimo kodai
     recovery_codes_regenerated: Atkūrimo kodai sėkmingai sugeneruoti
     recovery_instructions_html: Jeigu prarandate prieiga prie telefono, jūs galite naudoti atkūrimo kodus esančius žemiau, kad atgautumėte priega prie savo paskyros.<strong>Laikykite atkūrimo kodus saugiai</strong> Pavyzdžiui, galite norėti juos išspausdinti, ir laikyti kartu su kitais svarbiais dokumentais.
+    webauthn: Saugumo raktai
   user_mailer:
     appeal_approved:
       action: Paskyros nustatymai
@@ -1196,9 +1213,11 @@ lt:
     verification: Patvirtinimas
     verified_links: Tavo patikrintos nuorodos
   webauthn_credentials:
+    add: Pridėti naują saugumo raktą
     create:
       error: Kilo problema pridedant saugumo raktą. Bandyk dar kartą.
       success: Tavo saugumo raktas buvo sėkmingai pridėtas.
+    delete: Ištrinti
     delete_confirmation: Ar tikrai nori ištrinti šį saugumo raktą?
     description_html: Jei įjungsi <strong>saugumo rakto tapatybės nustatymą</strong>, prisijungiant reikės naudoti vieną iš savo saugumo raktų.
     destroy:
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index baab2cb587a0e7..3b88dd95282de0 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -226,6 +226,7 @@ nl:
         update_custom_emoji: Lokale emoji bijwerken
         update_domain_block: Domeinblokkade bijwerken
         update_ip_block: IP-regel bijwerken
+        update_report: Rapportage bijwerken
         update_status: Bericht bijwerken
         update_user_role: Rol bijwerken
       actions:
diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index 2da30e6627184a..ec77a2edf8792d 100644
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -226,6 +226,7 @@ nn:
         update_custom_emoji: Oppdater tilpassa emoji
         update_domain_block: Oppdater domene-sperring
         update_ip_block: Oppdater IP-regel
+        update_report: Oppdater rapport
         update_status: Oppdater tut
         update_user_role: Oppdater rolla
       actions:
@@ -638,6 +639,7 @@ nn:
       report: 'Rapporter #%{id}'
       reported_account: Rapportert konto
       reported_by: Rapportert av
+      reported_with_application: Rapportert med app
       resolved: Oppløyst
       resolved_msg: Rapporten er løyst!
       skip_to_actions: Gå til handlingar
diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index 839ae2184edfc2..1df423bb7de93f 100644
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -226,6 +226,7 @@ pt-PT:
         update_custom_emoji: Atualizar Emoji Personalizado
         update_domain_block: Atualizar Bloqueio de Domínio
         update_ip_block: Atualizar regra de IP
+        update_report: Atualizar Relatório
         update_status: Atualizar Estado
         update_user_role: Atualizar Função
       actions:
@@ -638,6 +639,7 @@ pt-PT:
       report: 'Denúncia #%{id}'
       reported_account: Conta denunciada
       reported_by: Denunciado por
+      reported_with_application: Reportado com a aplicação
       resolved: Resolvido
       resolved_msg: Denúncia correctamente resolvida!
       skip_to_actions: Passar para as ações
diff --git a/config/locales/simple_form.en-GB.yml b/config/locales/simple_form.en-GB.yml
index eaf0501a27ba9e..c1f2a015e94b27 100644
--- a/config/locales/simple_form.en-GB.yml
+++ b/config/locales/simple_form.en-GB.yml
@@ -211,6 +211,7 @@ en-GB:
         setting_default_privacy: Posting privacy
         setting_default_sensitive: Always mark media as sensitive
         setting_delete_modal: Show confirmation dialogue before deleting a post
+        setting_disable_hover_cards: Disable profile preview on hover
         setting_disable_swiping: Disable swiping motions
         setting_display_media: Media display
         setting_display_media_default: Default
@@ -242,11 +243,13 @@ en-GB:
           warn: Hide with a warning
       form_admin_settings:
         activity_api_enabled: Publish aggregate statistics about user activity in the API
+        app_icon: App icon
         backups_retention_period: User archive retention period
         bootstrap_timeline_accounts: Always recommend these accounts to new users
         closed_registrations_message: Custom message when sign-ups are not available
         content_cache_retention_period: Remote content retention period
         custom_css: Custom CSS
+        favicon: Favicon
         mascot: Custom mascot (legacy)
         media_cache_retention_period: Media cache retention period
         peers_api_enabled: Publish list of discovered servers in the API
diff --git a/config/locales/simple_form.nn.yml b/config/locales/simple_form.nn.yml
index a200e1206e38e1..c9075a89c210e3 100644
--- a/config/locales/simple_form.nn.yml
+++ b/config/locales/simple_form.nn.yml
@@ -211,6 +211,7 @@ nn:
         setting_default_privacy: Privatliv
         setting_default_sensitive: Merk alltid media som nærtakande
         setting_delete_modal: Vis stadfesting før du slettar eit tut
+        setting_disable_hover_cards: Skru av profilvising når peikaren er over
         setting_disable_swiping: Skru av sveipebevegelser
         setting_display_media: Medievisning
         setting_display_media_default: Standard
@@ -242,11 +243,13 @@ nn:
           warn: Gøym med ei åtvaring
       form_admin_settings:
         activity_api_enabled: Legg ut samla statistikk om brukaraktiviteten i APIet
+        app_icon: App-ikon
         backups_retention_period: Arkiveringsperiode for brukararkiv
         bootstrap_timeline_accounts: Tilrå alltid desse kontoane for nye brukarar
         closed_registrations_message: Eigendefinert melding når registrering ikkje er mogleg
         content_cache_retention_period: Oppbevaringstid for eksternt innhald
         custom_css: Egendefinert CSS
+        favicon: Favorittikon
         mascot: Eigendefinert maskot (eldre funksjon)
         media_cache_retention_period: Oppbevaringsperiode for mediebuffer
         peers_api_enabled: Legg ut ei liste over oppdaga tenarar i APIet
diff --git a/config/locales/simple_form.vi.yml b/config/locales/simple_form.vi.yml
index 9006156db1a4c7..c45da4713718ca 100644
--- a/config/locales/simple_form.vi.yml
+++ b/config/locales/simple_form.vi.yml
@@ -243,11 +243,13 @@ vi:
           warn: Ẩn kèm theo cảnh báo
       form_admin_settings:
         activity_api_enabled: Công khai số liệu thống kê tổng hợp về hoạt động của người dùng trong API
+        app_icon: Biểu tượng ứng dụng
         backups_retention_period: Thời hạn lưu trữ nội dung người dùng sao lưu
         bootstrap_timeline_accounts: Luôn đề xuất những người này đến người mới
         closed_registrations_message: Thông báo tùy chỉnh khi tắt đăng ký
         content_cache_retention_period: Khoảng thời gian lưu giữ nội dung máy chủ khác
         custom_css: Tùy chỉnh CSS
+        favicon: Favicon
         mascot: Tùy chỉnh linh vật (kế thừa)
         media_cache_retention_period: Thời hạn lưu trữ cache media
         peers_api_enabled: Công khai danh sách các máy chủ được phát hiện trong API
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 6087b1a1749642..344368a08a8776 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -232,6 +232,7 @@ sl:
         update_custom_emoji: Posodobi emotikon po meri
         update_domain_block: Posodobi blokado domene
         update_ip_block: Posodobi pravilo IP
+        update_report: Posodobi poročilo
         update_status: Posodobi objavo
         update_user_role: Posodobi vlogo
       actions:
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index 5439f08a04a8b2..c4bed80cc7cf47 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -226,6 +226,7 @@ sq:
         update_custom_emoji: Përditëso Emoxhi Vetjake
         update_domain_block: Përditëso Bllok Përkatësish
         update_ip_block: Përditësoni rregull IP
+        update_report: Përditësoni Raportimin
         update_status: Përditëso Gjendjen
         update_user_role: Përditësoni Rol
       actions:
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 91b1720b553f2c..de2664f8b5f109 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -226,6 +226,7 @@ sv:
         update_custom_emoji: Uppdatera egna emojis
         update_domain_block: Uppdatera blockerad domän
         update_ip_block: Uppdatera IP-regel
+        update_report: Uppdatera rapport
         update_status: Uppdatera inlägg
         update_user_role: Uppdatera roll
       actions:
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index c690d22580cc20..6b28e17441ad4c 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -226,6 +226,7 @@ tr:
         update_custom_emoji: Özel İfadeyi Güncelle
         update_domain_block: Engellenen Alan Adını Güncelle
         update_ip_block: IP kuralını güncelle
+        update_report: Raporu Güncelle
         update_status: Durumu Güncelle
         update_user_role: Rolü Güncelle
       actions:
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 9994cd9d0dadc8..69f5ca665c6362 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -232,6 +232,7 @@ uk:
         update_custom_emoji: Оновити користувацькі емодзі
         update_domain_block: Оновити блокування домену
         update_ip_block: Оновити правило IP
+        update_report: Оновити звіт
         update_status: Оновити допис
         update_user_role: Оновити роль
       actions:
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 467356d65adfab..48e026d377ff87 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -223,6 +223,7 @@ vi:
         update_custom_emoji: Cập nhật emoji
         update_domain_block: Cập nhật máy chủ chặn
         update_ip_block: Cập nhật chặn IP
+        update_report: Cập nhật báo cáo
         update_status: Cập nhật tút
         update_user_role: Cập nhật vai trò
       actions:
@@ -626,6 +627,7 @@ vi:
       report: 'Báo cáo #%{id}'
       reported_account: Tài khoản bị báo cáo
       reported_by: Báo cáo bởi
+      reported_with_application: Báo cáo bằng ứng dụng
       resolved: Đã xong
       resolved_msg: Đã xử lý báo cáo xong!
       skip_to_actions: Kiểm duyệt
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 794b8344c10783..d2d64152fa7bcc 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -223,6 +223,7 @@ zh-CN:
         update_custom_emoji: 更新自定义表情符号
         update_domain_block: 更新域名屏蔽
         update_ip_block: 编辑 IP 封禁规则
+        update_report: 更新举报
         update_status: 更新嘟文
         update_user_role: 更新角色
       actions:
@@ -626,6 +627,7 @@ zh-CN:
       report: '举报 #%{id}'
       reported_account: 举报用户
       reported_by: 举报人
+      reported_with_application: 举报人使用的应用
       resolved: 已处理
       resolved_msg: 举报处理成功！
       skip_to_actions: 跳转到操作
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 3a548c226557e9..375c79048a4d71 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -223,6 +223,7 @@ zh-TW:
         update_custom_emoji: 更新自訂 emoji 表情符號
         update_domain_block: 更新網域封鎖
         update_ip_block: 更新 IP 規則
+        update_report: 更新檢舉報告
         update_status: 更新狀態
         update_user_role: 更新角色
       actions:
@@ -626,6 +627,7 @@ zh-TW:
       report: '檢舉 #%{id}'
       reported_account: 被檢舉使用者
       reported_by: 檢舉人
+      reported_with_application: 透過應用程式檢舉
       resolved: 已解決
       resolved_msg: 檢舉報告已處理完成！
       skip_to_actions: 跳過行動

From 81877e79505f387284c7a9de88f631eab758a319 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 17 Jul 2024 03:24:14 -0400
Subject: [PATCH 1556/2191] Reduce extra round trips in
 `AP::FetchRemoteStatusService` spec (#31045)

---
 .../fetch_remote_status_service_spec.rb       | 26 ++++++++-----------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/spec/services/activitypub/fetch_remote_status_service_spec.rb b/spec/services/activitypub/fetch_remote_status_service_spec.rb
index c3adb9c470afd1..635fcb7976c954 100644
--- a/spec/services/activitypub/fetch_remote_status_service_spec.rb
+++ b/spec/services/activitypub/fetch_remote_status_service_spec.rb
@@ -227,7 +227,7 @@
 
   context 'with statuses referencing other statuses', :inline_jobs do
     before do
-      stub_const 'ActivityPub::FetchRemoteStatusService::DISCOVERIES_PER_REQUEST', 5
+      stub_const 'ActivityPub::FetchRemoteStatusService::DISCOVERIES_PER_REQUEST', 3
     end
 
     context 'when using inReplyTo' do
@@ -243,7 +243,7 @@
       end
 
       before do
-        8.times do |i|
+        5.times do |i|
           status_json = {
             '@context': 'https://www.w3.org/ns/activitystreams',
             id: "https://foo.bar/@foo/#{i}",
@@ -257,12 +257,10 @@
         end
       end
 
-      it 'creates at least some statuses' do
-        expect { subject.call(object[:id], prefetched_body: Oj.dump(object)) }.to change { sender.statuses.count }.by_at_least(2)
-      end
-
-      it 'creates no more account than the limit allows' do
-        expect { subject.call(object[:id], prefetched_body: Oj.dump(object)) }.to change { sender.statuses.count }.by_at_most(5)
+      it 'creates statuses but not more than limit allows' do
+        expect { subject.call(object[:id], prefetched_body: Oj.dump(object)) }
+          .to change { sender.statuses.count }.by_at_least(2)
+          .and change { sender.statuses.count }.by_at_most(3)
       end
     end
 
@@ -287,7 +285,7 @@
       end
 
       before do
-        8.times do |i|
+        5.times do |i|
           status_json = {
             '@context': 'https://www.w3.org/ns/activitystreams',
             id: "https://foo.bar/@foo/#{i}",
@@ -309,12 +307,10 @@
         end
       end
 
-      it 'creates at least some statuses' do
-        expect { subject.call(object[:id], prefetched_body: Oj.dump(object)) }.to change { sender.statuses.count }.by_at_least(2)
-      end
-
-      it 'creates no more account than the limit allows' do
-        expect { subject.call(object[:id], prefetched_body: Oj.dump(object)) }.to change { sender.statuses.count }.by_at_most(5)
+      it 'creates statuses but not more than limit allows' do
+        expect { subject.call(object[:id], prefetched_body: Oj.dump(object)) }
+          .to change { sender.statuses.count }.by_at_least(2)
+          .and change { sender.statuses.count }.by_at_most(3)
       end
     end
   end

From f5e90f3de3efa52c9f8ea72ffdbf091d5032cc4b Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 17 Jul 2024 03:33:08 -0400
Subject: [PATCH 1557/2191] Reduce extra round trips in
 `AP::SynchronizeFollowersService` spec (#31044)

---
 .../synchronize_followers_service_spec.rb     | 31 +++++++------------
 1 file changed, 12 insertions(+), 19 deletions(-)

diff --git a/spec/services/activitypub/synchronize_followers_service_spec.rb b/spec/services/activitypub/synchronize_followers_service_spec.rb
index 648f9a33212c3e..974368b7d77e79 100644
--- a/spec/services/activitypub/synchronize_followers_service_spec.rb
+++ b/spec/services/activitypub/synchronize_followers_service_spec.rb
@@ -13,11 +13,9 @@
   let(:collection_uri) { 'http://example.com/partial-followers' }
 
   let(:items) do
-    [
-      ActivityPub::TagManager.instance.uri_for(alice),
-      ActivityPub::TagManager.instance.uri_for(eve),
-      ActivityPub::TagManager.instance.uri_for(mallory),
-    ]
+    [alice, eve, mallory].map do |account|
+      ActivityPub::TagManager.instance.uri_for(account)
+    end
   end
 
   let(:payload) do
@@ -40,20 +38,15 @@
       subject.call(actor, collection_uri)
     end
 
-    it 'keeps expected followers' do
-      expect(alice.following?(actor)).to be true
-    end
-
-    it 'removes local followers not in the remote list' do
-      expect(bob.following?(actor)).to be false
-    end
-
-    it 'converts follow requests to follow relationships when they have been accepted' do
-      expect(mallory.following?(actor)).to be true
-    end
-
-    it 'sends an Undo Follow to the actor' do
-      expect(ActivityPub::DeliveryWorker).to have_received(:perform_async).with(anything, eve.id, actor.inbox_url)
+    it 'maintains following records and sends Undo Follow to actor' do
+      expect(alice)
+        .to be_following(actor) # Keep expected followers
+      expect(bob)
+        .to_not be_following(actor) # Remove local followers not in remote list
+      expect(mallory)
+        .to be_following(actor) # Convert follow request to follow when accepted
+      expect(ActivityPub::DeliveryWorker)
+        .to have_received(:perform_async).with(anything, eve.id, actor.inbox_url) # Send Undo Follow to actor
     end
   end
 

From 76c2c5c748ba47c2b7bc13570cd4301516290d90 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 17 Jul 2024 04:09:34 -0400
Subject: [PATCH 1558/2191] Reduce extra round trips in `activitypub`
 controller specs (#31041)

---
 .../collections_controller_spec.rb            |  28 ++---
 ...lowers_synchronizations_controller_spec.rb |  25 ++--
 .../activitypub/outboxes_controller_spec.rb   | 107 +++++-------------
 .../activitypub/replies_controller_spec.rb    |  12 +-
 4 files changed, 51 insertions(+), 121 deletions(-)

diff --git a/spec/controllers/activitypub/collections_controller_spec.rb b/spec/controllers/activitypub/collections_controller_spec.rb
index 11ef03c8425c1c..a5718fbd7d3c06 100644
--- a/spec/controllers/activitypub/collections_controller_spec.rb
+++ b/spec/controllers/activitypub/collections_controller_spec.rb
@@ -25,14 +25,12 @@
       context 'without signature' do
         let(:remote_account) { nil }
 
-        it 'returns http success and correct media type' do
+        it_behaves_like 'cacheable response'
+
+        it 'returns http success and correct media type and correct items' do
           expect(response).to have_http_status(200)
           expect(response.media_type).to eq 'application/activity+json'
-        end
 
-        it_behaves_like 'cacheable response'
-
-        it 'returns orderedItems with correct items' do
           expect(body_as_json[:orderedItems])
             .to be_an(Array)
             .and have_attributes(size: 3)
@@ -66,14 +64,12 @@
         let(:remote_account) { Fabricate(:account, domain: 'example.com') }
 
         context 'when getting a featured resource' do
-          it 'returns http success and correct media type' do
+          it_behaves_like 'cacheable response'
+
+          it 'returns http success and correct media type and expected items' do
             expect(response).to have_http_status(200)
             expect(response.media_type).to eq 'application/activity+json'
-          end
-
-          it_behaves_like 'cacheable response'
 
-          it 'returns orderedItems with expected items' do
             expect(body_as_json[:orderedItems])
               .to be_an(Array)
               .and have_attributes(size: 3)
@@ -92,16 +88,14 @@
               account.block!(remote_account)
             end
 
-            it 'returns http success and correct media type and cache headers' do
+            it 'returns http success and correct media type and cache headers and empty items' do
               expect(response).to have_http_status(200)
               expect(response.media_type).to eq 'application/activity+json'
               expect(response.headers['Cache-Control']).to include 'private'
-            end
 
-            it 'returns empty orderedItems' do
               expect(body_as_json[:orderedItems])
                 .to be_an(Array)
-                .and have_attributes(size: 0)
+                .and be_empty
             end
           end
 
@@ -110,16 +104,14 @@
               account.block_domain!(remote_account.domain)
             end
 
-            it 'returns http success and correct media type and cache headers' do
+            it 'returns http success and correct media type and cache headers and empty items' do
               expect(response).to have_http_status(200)
               expect(response.media_type).to eq 'application/activity+json'
               expect(response.headers['Cache-Control']).to include 'private'
-            end
 
-            it 'returns empty orderedItems' do
               expect(body_as_json[:orderedItems])
                 .to be_an(Array)
-                .and have_attributes(size: 0)
+                .and be_empty
             end
           end
         end
diff --git a/spec/controllers/activitypub/followers_synchronizations_controller_spec.rb b/spec/controllers/activitypub/followers_synchronizations_controller_spec.rb
index b50c7b9cdcb1d7..c030078d43a643 100644
--- a/spec/controllers/activitypub/followers_synchronizations_controller_spec.rb
+++ b/spec/controllers/activitypub/followers_synchronizations_controller_spec.rb
@@ -37,25 +37,18 @@
       let(:body) { body_as_json }
       let(:remote_account) { Fabricate(:account, domain: 'example.com', uri: 'https://example.com/instance') }
 
-      it 'returns http success' do
+      it 'returns http success and cache control and activity json types and correct items' do
         expect(response).to have_http_status(200)
-      end
-
-      it 'returns application/activity+json' do
+        expect(response.headers['Cache-Control']).to eq 'max-age=0, private'
         expect(response.media_type).to eq 'application/activity+json'
-      end
 
-      it 'returns orderedItems with followers from example.com' do
-        expect(body[:orderedItems]).to be_an Array
-        expect(body[:orderedItems]).to contain_exactly(
-          follower_example_com_instance_actor.uri,
-          follower_example_com_user_a.uri,
-          follower_example_com_user_b.uri
-        )
-      end
-
-      it 'returns private Cache-Control header' do
-        expect(response.headers['Cache-Control']).to eq 'max-age=0, private'
+        expect(body[:orderedItems])
+          .to be_an(Array)
+          .and contain_exactly(
+            follower_example_com_instance_actor.uri,
+            follower_example_com_user_a.uri,
+            follower_example_com_user_b.uri
+          )
       end
 
       context 'when account is permanently suspended' do
diff --git a/spec/controllers/activitypub/outboxes_controller_spec.rb b/spec/controllers/activitypub/outboxes_controller_spec.rb
index ead231f29fbe43..3c8e8e399f6296 100644
--- a/spec/controllers/activitypub/outboxes_controller_spec.rb
+++ b/spec/controllers/activitypub/outboxes_controller_spec.rb
@@ -25,22 +25,13 @@
       context 'with page not requested' do
         let(:page) { nil }
 
-        it 'returns http success' do
-          expect(response).to have_http_status(200)
-        end
-
-        it 'returns application/activity+json' do
-          expect(response.media_type).to eq 'application/activity+json'
-        end
-
-        it 'returns totalItems' do
-          expect(body[:totalItems]).to eq 4
-        end
-
         it_behaves_like 'cacheable response'
 
-        it 'does not have a Vary header' do
+        it 'returns http success and correct media type and headers and items count' do
+          expect(response).to have_http_status(200)
+          expect(response.media_type).to eq 'application/activity+json'
           expect(response.headers['Vary']).to be_nil
+          expect(body[:totalItems]).to eq 4
         end
 
         context 'when account is permanently suspended' do
@@ -68,26 +59,18 @@
       context 'with page requested' do
         let(:page) { 'true' }
 
-        it 'returns http success' do
-          expect(response).to have_http_status(200)
-        end
+        it_behaves_like 'cacheable response'
 
-        it 'returns application/activity+json' do
+        it 'returns http success and correct media type and vary header and items' do
+          expect(response).to have_http_status(200)
           expect(response.media_type).to eq 'application/activity+json'
-        end
+          expect(response.headers['Vary']).to include 'Signature'
 
-        it 'returns orderedItems with public or unlisted statuses' do
           expect(body[:orderedItems]).to be_an Array
           expect(body[:orderedItems].size).to eq 2
           expect(body[:orderedItems].all? { |item| targets_public_collection?(item) }).to be true
         end
 
-        it_behaves_like 'cacheable response'
-
-        it 'returns Vary header with Signature' do
-          expect(response.headers['Vary']).to include 'Signature'
-        end
-
         context 'when account is permanently suspended' do
           before do
             account.suspend!
@@ -120,23 +103,14 @@
           get :show, params: { account_username: account.username, page: page }
         end
 
-        it 'returns http success' do
+        it 'returns http success and correct media type and headers and items' do
           expect(response).to have_http_status(200)
-        end
-
-        it 'returns application/activity+json' do
           expect(response.media_type).to eq 'application/activity+json'
-        end
-
-        it 'returns orderedItems with public or unlisted statuses' do
-          json = body_as_json
-          expect(json[:orderedItems]).to be_an Array
-          expect(json[:orderedItems].size).to eq 2
-          expect(json[:orderedItems].all? { |item| targets_public_collection?(item) }).to be true
-        end
-
-        it 'returns private Cache-Control header' do
           expect(response.headers['Cache-Control']).to eq 'max-age=60, private'
+
+          expect(body_as_json[:orderedItems]).to be_an Array
+          expect(body_as_json[:orderedItems].size).to eq 2
+          expect(body_as_json[:orderedItems].all? { |item| targets_public_collection?(item) }).to be true
         end
       end
 
@@ -146,23 +120,14 @@
           get :show, params: { account_username: account.username, page: page }
         end
 
-        it 'returns http success' do
+        it 'returns http success and correct media type and headers and items' do
           expect(response).to have_http_status(200)
-        end
-
-        it 'returns application/activity+json' do
           expect(response.media_type).to eq 'application/activity+json'
-        end
-
-        it 'returns orderedItems with private statuses' do
-          json = body_as_json
-          expect(json[:orderedItems]).to be_an Array
-          expect(json[:orderedItems].size).to eq 3
-          expect(json[:orderedItems].all? { |item| targets_public_collection?(item) || targets_followers_collection?(item, account) }).to be true
-        end
-
-        it 'returns private Cache-Control header' do
           expect(response.headers['Cache-Control']).to eq 'max-age=60, private'
+
+          expect(body_as_json[:orderedItems]).to be_an Array
+          expect(body_as_json[:orderedItems].size).to eq 3
+          expect(body_as_json[:orderedItems].all? { |item| targets_public_collection?(item) || targets_followers_collection?(item, account) }).to be true
         end
       end
 
@@ -172,22 +137,14 @@
           get :show, params: { account_username: account.username, page: page }
         end
 
-        it 'returns http success' do
+        it 'returns http success and correct media type and headers and items' do
           expect(response).to have_http_status(200)
-        end
-
-        it 'returns application/activity+json' do
           expect(response.media_type).to eq 'application/activity+json'
-        end
-
-        it 'returns empty orderedItems' do
-          json = body_as_json
-          expect(json[:orderedItems]).to be_an Array
-          expect(json[:orderedItems].size).to eq 0
-        end
-
-        it 'returns private Cache-Control header' do
           expect(response.headers['Cache-Control']).to eq 'max-age=60, private'
+
+          expect(body_as_json[:orderedItems])
+            .to be_an(Array)
+            .and be_empty
         end
       end
 
@@ -197,22 +154,14 @@
           get :show, params: { account_username: account.username, page: page }
         end
 
-        it 'returns http success' do
+        it 'returns http success and correct media type and headers and items' do
           expect(response).to have_http_status(200)
-        end
-
-        it 'returns application/activity+json' do
           expect(response.media_type).to eq 'application/activity+json'
-        end
-
-        it 'returns empty orderedItems' do
-          json = body_as_json
-          expect(json[:orderedItems]).to be_an Array
-          expect(json[:orderedItems].size).to eq 0
-        end
-
-        it 'returns private Cache-Control header' do
           expect(response.headers['Cache-Control']).to eq 'max-age=60, private'
+
+          expect(body_as_json[:orderedItems])
+            .to be_an(Array)
+            .and be_empty
         end
       end
     end
diff --git a/spec/controllers/activitypub/replies_controller_spec.rb b/spec/controllers/activitypub/replies_controller_spec.rb
index db7f60d3f873dc..c556e0727047c4 100644
--- a/spec/controllers/activitypub/replies_controller_spec.rb
+++ b/spec/controllers/activitypub/replies_controller_spec.rb
@@ -66,19 +66,15 @@
 
     context 'when status is public' do
       let(:parent_visibility) { :public }
-      let(:json) { body_as_json }
-      let(:page_json) { json[:first] }
+      let(:page_json) { body_as_json[:first] }
 
-      it 'returns http success' do
-        expect(response).to have_http_status(200)
-      end
+      it_behaves_like 'cacheable response'
 
-      it 'returns application/activity+json' do
+      it 'returns http success and correct media type' do
+        expect(response).to have_http_status(200)
         expect(response.media_type).to eq 'application/activity+json'
       end
 
-      it_behaves_like 'cacheable response'
-
       context 'without only_other_accounts' do
         it "returns items with thread author's replies" do
           expect(page_json).to be_a Hash

From 4957771a8ae36e46cba4b8c4a6278f0e95e5850a Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 17 Jul 2024 11:18:25 +0200
Subject: [PATCH 1559/2191] Update rexml to version 3.3.2 (#31048)

---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 935b28215c6fc1..04505a7cc459b6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -696,7 +696,7 @@ GEM
     responders (3.1.1)
       actionpack (>= 5.2)
       railties (>= 5.2)
-    rexml (3.3.1)
+    rexml (3.3.2)
       strscan
     rotp (6.3.0)
     rouge (4.2.1)

From aa4d8987a00fe82490fb949b82d3baa33d0acd49 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 17 Jul 2024 12:42:54 +0200
Subject: [PATCH 1560/2191] chore(deps): update dependency faker to v3.4.2
 (#31046)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 04505a7cc459b6..c3e3adbbf3e323 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -231,7 +231,7 @@ GEM
       tzinfo
     excon (0.110.0)
     fabrication (2.31.0)
-    faker (3.4.1)
+    faker (3.4.2)
       i18n (>= 1.8.11, < 2)
     faraday (1.10.3)
       faraday-em_http (~> 1.0)

From c5f8256801c8c840becf0ea7201bb891adf3c35a Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 18 Jul 2024 03:45:59 -0400
Subject: [PATCH 1561/2191] Reduce extra factories in `FanOutOnWriteService`
 spec (#31053)

---
 .../services/fan_out_on_write_service_spec.rb | 85 ++++++++-----------
 1 file changed, 34 insertions(+), 51 deletions(-)

diff --git a/spec/services/fan_out_on_write_service_spec.rb b/spec/services/fan_out_on_write_service_spec.rb
index 82cdffb8cf9f5c..c6dd020cdff4b6 100644
--- a/spec/services/fan_out_on_write_service_spec.rb
+++ b/spec/services/fan_out_on_write_service_spec.rb
@@ -34,21 +34,14 @@ def home_feed_of(account)
   context 'when status is public' do
     let(:visibility) { 'public' }
 
-    it 'is added to the home feed of its author' do
-      expect(home_feed_of(alice)).to include status.id
-    end
-
-    it 'is added to the home feed of a follower', :inline_jobs do
-      expect(home_feed_of(bob)).to include status.id
-      expect(home_feed_of(tom)).to include status.id
-    end
+    it 'adds status to home feed of author and followers and broadcasts', :inline_jobs do
+      expect(status.id)
+        .to be_in(home_feed_of(alice))
+        .and be_in(home_feed_of(bob))
+        .and be_in(home_feed_of(tom))
 
-    it 'is broadcast to the hashtag stream' do
       expect(redis).to have_received(:publish).with('timeline:hashtag:hoge', anything)
       expect(redis).to have_received(:publish).with('timeline:hashtag:hoge:local', anything)
-    end
-
-    it 'is broadcast to the public stream' do
       expect(redis).to have_received(:publish).with('timeline:public', anything)
       expect(redis).to have_received(:publish).with('timeline:public:local', anything)
       expect(redis).to have_received(:publish).with('timeline:public:media', anything)
@@ -58,60 +51,41 @@ def home_feed_of(account)
   context 'when status is limited' do
     let(:visibility) { 'limited' }
 
-    it 'is added to the home feed of its author' do
-      expect(home_feed_of(alice)).to include status.id
-    end
-
-    it 'is added to the home feed of the mentioned follower', :inline_jobs do
-      expect(home_feed_of(bob)).to include status.id
-    end
-
-    it 'is not added to the home feed of the other follower' do
-      expect(home_feed_of(tom)).to_not include status.id
-    end
+    it 'adds status to home feed of author and mentioned followers and does not broadcast', :inline_jobs do
+      expect(status.id)
+        .to be_in(home_feed_of(alice))
+        .and be_in(home_feed_of(bob))
+      expect(status.id)
+        .to_not be_in(home_feed_of(tom))
 
-    it 'is not broadcast publicly' do
-      expect(redis).to_not have_received(:publish).with('timeline:hashtag:hoge', anything)
-      expect(redis).to_not have_received(:publish).with('timeline:public', anything)
+      expect_no_broadcasting
     end
   end
 
   context 'when status is private' do
     let(:visibility) { 'private' }
 
-    it 'is added to the home feed of its author' do
-      expect(home_feed_of(alice)).to include status.id
-    end
-
-    it 'is added to the home feed of a follower', :inline_jobs do
-      expect(home_feed_of(bob)).to include status.id
-      expect(home_feed_of(tom)).to include status.id
-    end
+    it 'adds status to home feed of author and followers and does not broadcast', :inline_jobs do
+      expect(status.id)
+        .to be_in(home_feed_of(alice))
+        .and be_in(home_feed_of(bob))
+        .and be_in(home_feed_of(tom))
 
-    it 'is not broadcast publicly' do
-      expect(redis).to_not have_received(:publish).with('timeline:hashtag:hoge', anything)
-      expect(redis).to_not have_received(:publish).with('timeline:public', anything)
+      expect_no_broadcasting
     end
   end
 
   context 'when status is direct' do
     let(:visibility) { 'direct' }
 
-    it 'is added to the home feed of its author' do
-      expect(home_feed_of(alice)).to include status.id
-    end
-
-    it 'is added to the home feed of the mentioned follower', :inline_jobs do
-      expect(home_feed_of(bob)).to include status.id
-    end
-
-    it 'is not added to the home feed of the other follower' do
-      expect(home_feed_of(tom)).to_not include status.id
-    end
+    it 'is added to the home feed of its author and mentioned followers and does not broadcast', :inline_jobs do
+      expect(status.id)
+        .to be_in(home_feed_of(alice))
+        .and be_in(home_feed_of(bob))
+      expect(status.id)
+        .to_not be_in(home_feed_of(tom))
 
-    it 'is not broadcast publicly' do
-      expect(redis).to_not have_received(:publish).with('timeline:hashtag:hoge', anything)
-      expect(redis).to_not have_received(:publish).with('timeline:public', anything)
+      expect_no_broadcasting
     end
 
     context 'when handling status updates' do
@@ -131,4 +105,13 @@ def home_feed_of(account)
       end
     end
   end
+
+  def expect_no_broadcasting
+    expect(redis)
+      .to_not have_received(:publish)
+      .with('timeline:hashtag:hoge', anything)
+    expect(redis)
+      .to_not have_received(:publish)
+      .with('timeline:public', anything)
+  end
 end

From 2616fde9e6edfbdbf31efad5d1818ad950ab4d4c Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 18 Jul 2024 03:49:44 -0400
Subject: [PATCH 1562/2191] Use change-requiring records in admin/reports
 controller spec (#31052)

---
 spec/controllers/admin/reports_controller_spec.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/controllers/admin/reports_controller_spec.rb b/spec/controllers/admin/reports_controller_spec.rb
index 02760154fbe5ff..5849163b5fe06e 100644
--- a/spec/controllers/admin/reports_controller_spec.rb
+++ b/spec/controllers/admin/reports_controller_spec.rb
@@ -64,7 +64,7 @@
 
   describe 'POST #reopen' do
     it 'reopens the report' do
-      report = Fabricate(:report)
+      report = Fabricate(:report, action_taken_at: 3.days.ago)
 
       put :reopen, params: { id: report }
       expect(response).to redirect_to(admin_report_path(report))
@@ -89,7 +89,7 @@
 
   describe 'POST #unassign' do
     it 'reopens the report' do
-      report = Fabricate(:report)
+      report = Fabricate(:report, assigned_account_id: Account.last.id)
 
       put :unassign, params: { id: report }
       expect(response).to redirect_to(admin_report_path(report))

From 64c7ffdc656135b7986ce92d645f5355f638cfe4 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 18 Jul 2024 09:53:36 +0200
Subject: [PATCH 1563/2191] chore(deps): update dependency ruby-vips to v2.2.2
 (#31050)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index c3e3adbbf3e323..c9781a40500cb0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -766,8 +766,9 @@ GEM
     ruby-saml (1.16.0)
       nokogiri (>= 1.13.10)
       rexml
-    ruby-vips (2.2.1)
+    ruby-vips (2.2.2)
       ffi (~> 1.12)
+      logger
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
     rufus-scheduler (3.9.1)

From 47ea83d2469e461b82e6d837ea83ad561128fe7a Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 18 Jul 2024 04:00:19 -0400
Subject: [PATCH 1564/2191] Reduce factory creation in
 `AP::ProcessStatusUpdateService` spec (#31051)

---
 .../process_status_update_service_spec.rb     | 101 +++++-------------
 1 file changed, 28 insertions(+), 73 deletions(-)

diff --git a/spec/services/activitypub/process_status_update_service_spec.rb b/spec/services/activitypub/process_status_update_service_spec.rb
index e451d15dc0359c..a97e8408026b7c 100644
--- a/spec/services/activitypub/process_status_update_service_spec.rb
+++ b/spec/services/activitypub/process_status_update_service_spec.rb
@@ -40,14 +40,13 @@ def poll_option_json(name, votes)
   end
 
   describe '#call' do
-    it 'updates text' do
+    it 'updates text and content warning' do
       subject.call(status, json, json)
-      expect(status.reload.text).to eq 'Hello universe'
-    end
-
-    it 'updates content warning' do
-      subject.call(status, json, json)
-      expect(status.reload.spoiler_text).to eq 'Show more'
+      expect(status.reload)
+        .to have_attributes(
+          text: eq('Hello universe'),
+          spoiler_text: eq('Show more')
+        )
     end
 
     context 'when the changes are only in sanitized-out HTML' do
@@ -67,12 +66,9 @@ def poll_option_json(name, votes)
         subject.call(status, json, json)
       end
 
-      it 'does not create any edits' do
+      it 'does not create any edits and does not mark status edited' do
         expect(status.reload.edits).to be_empty
-      end
-
-      it 'does not mark status as edited' do
-        expect(status.edited?).to be false
+        expect(status).to_not be_edited
       end
     end
 
@@ -90,15 +86,9 @@ def poll_option_json(name, votes)
         subject.call(status, json, json)
       end
 
-      it 'does not create any edits' do
+      it 'does not create any edits, mark status edited, or update text' do
         expect(status.reload.edits).to be_empty
-      end
-
-      it 'does not mark status as edited' do
-        expect(status.reload.edited?).to be false
-      end
-
-      it 'does not update the text' do
+        expect(status.reload).to_not be_edited
         expect(status.reload.text).to eq 'Hello world'
       end
     end
@@ -137,19 +127,10 @@ def poll_option_json(name, votes)
         subject.call(status, json, json)
       end
 
-      it 'does not create any edits' do
+      it 'does not create any edits, mark status edited, update text but does update tallies' do
         expect(status.reload.edits).to be_empty
-      end
-
-      it 'does not mark status as edited' do
-        expect(status.reload.edited?).to be false
-      end
-
-      it 'does not update the text' do
+        expect(status.reload).to_not be_edited
         expect(status.reload.text).to eq 'Hello world'
-      end
-
-      it 'updates tallies' do
         expect(status.poll.reload.cached_tallies).to eq [4, 3]
       end
     end
@@ -189,19 +170,10 @@ def poll_option_json(name, votes)
         subject.call(status, json, json)
       end
 
-      it 'does not create any edits' do
+      it 'does not create any edits, mark status edited, update text, or update tallies' do
         expect(status.reload.edits).to be_empty
-      end
-
-      it 'does not mark status as edited' do
-        expect(status.reload.edited?).to be false
-      end
-
-      it 'does not update the text' do
+        expect(status.reload).to_not be_edited
         expect(status.reload.text).to eq 'Hello world'
-      end
-
-      it 'does not update tallies' do
         expect(status.poll.reload.cached_tallies).to eq [0, 0]
       end
     end
@@ -213,13 +185,10 @@ def poll_option_json(name, votes)
         status.snapshot!(rate_limit: false)
       end
 
-      it 'does not create any edits' do
-        expect { subject.call(status, json, json) }.to_not(change { status.reload.edits.pluck(&:id) })
-      end
-
-      it 'does not update the text, spoiler_text or edited_at' do
+      it 'does not create any edits or update relevant attributes' do
         expect { subject.call(status, json, json) }
-          .to_not(change { status.reload.attributes.slice('text', 'spoiler_text', 'edited_at').values })
+          .to not_change { status.reload.edits.pluck(&:id) }
+          .and(not_change { status.reload.attributes.slice('text', 'spoiler_text', 'edited_at').values })
       end
     end
 
@@ -237,12 +206,9 @@ def poll_option_json(name, votes)
         subject.call(status, json, json)
       end
 
-      it 'does not create any edits' do
+      it 'does not create any edits or mark status edited' do
         expect(status.reload.edits).to be_empty
-      end
-
-      it 'does not mark status as edited' do
-        expect(status.edited?).to be false
+        expect(status).to_not be_edited
       end
     end
 
@@ -261,12 +227,9 @@ def poll_option_json(name, votes)
         subject.call(status, json, json)
       end
 
-      it 'does not create any edits' do
+      it 'does not create any edits or mark status edited' do
         expect(status.reload.edits).to be_empty
-      end
-
-      it 'does not mark status as edited' do
-        expect(status.edited?).to be false
+        expect(status).to_not be_edited
       end
     end
 
@@ -412,11 +375,8 @@ def poll_option_json(name, votes)
         subject.call(status, json, json)
       end
 
-      it 'removes poll' do
+      it 'removes poll and records media change in edit' do
         expect(status.reload.poll).to be_nil
-      end
-
-      it 'records media change in edit' do
         expect(status.edits.reload.last.poll_options).to be_nil
       end
     end
@@ -442,26 +402,21 @@ def poll_option_json(name, votes)
         subject.call(status, json, json)
       end
 
-      it 'creates a poll' do
+      it 'creates a poll and records media change in edit' do
         poll = status.reload.poll
 
         expect(poll).to_not be_nil
         expect(poll.options).to eq %w(Foo Bar Baz)
-      end
-
-      it 'records media change in edit' do
         expect(status.edits.reload.last.poll_options).to eq %w(Foo Bar Baz)
       end
     end
 
-    it 'creates edit history' do
-      subject.call(status, json, json)
-      expect(status.edits.reload.map(&:text)).to eq ['Hello world', 'Hello universe']
-    end
-
-    it 'sets edited timestamp' do
+    it 'creates edit history and sets edit timestamp' do
       subject.call(status, json, json)
-      expect(status.reload.edited_at.to_s).to eq '2021-09-08 22:39:25 UTC'
+      expect(status.edits.reload.map(&:text))
+        .to eq ['Hello world', 'Hello universe']
+      expect(status.reload.edited_at.to_s)
+        .to eq '2021-09-08 22:39:25 UTC'
     end
   end
 end

From 7d090b2ab6a76676c861f737c3b6922da8c1292b Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 18 Jul 2024 10:00:29 +0200
Subject: [PATCH 1565/2191] New Crowdin Translations (automated) (#31055)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/ga.json  |   76 +-
 app/javascript/mastodon/locales/kab.json |    4 +-
 config/locales/bg.yml                    |    2 +
 config/locales/devise.ga.yml             |    6 +
 config/locales/doorkeeper.ga.yml         |  144 ++
 config/locales/ga.yml                    | 1532 +++++++++++++++++++++-
 config/locales/gl.yml                    |    2 +
 config/locales/hi.yml                    |    2 +
 config/locales/hu.yml                    |    2 +-
 config/locales/simple_form.bg.yml        |    3 +
 config/locales/simple_form.ga.yml        |  265 ++++
 config/locales/sl.yml                    |    1 +
 config/locales/tr.yml                    |    1 +
 13 files changed, 1999 insertions(+), 41 deletions(-)

diff --git a/app/javascript/mastodon/locales/ga.json b/app/javascript/mastodon/locales/ga.json
index 468c7a03a1c4c6..8c5039e2a46b4f 100644
--- a/app/javascript/mastodon/locales/ga.json
+++ b/app/javascript/mastodon/locales/ga.json
@@ -29,8 +29,8 @@
   "account.enable_notifications": "Cuir mé in eol nuair bpostálann @{name}",
   "account.endorse": "Cuir ar an phróifíl mar ghné",
   "account.featured_tags.last_status_at": "Postáil is déanaí ar {date}",
-  "account.featured_tags.last_status_never": "Níl postáil ar bith ann",
-  "account.featured_tags.title": "Haischlib {name}",
+  "account.featured_tags.last_status_never": "Gan aon phoist",
+  "account.featured_tags.title": "Haischlib faoi thrácht {name}",
   "account.follow": "Lean",
   "account.follow_back": "Leanúint ar ais",
   "account.followers": "Leantóirí",
@@ -38,7 +38,7 @@
   "account.followers_counter": "{count, plural, one {{counter} leantóir} other {{counter} leantóirí}}",
   "account.following": "Ag leanúint",
   "account.following_counter": "{count, plural, one {{counter} ag leanúint} other {{counter} ag leanúint}}",
-  "account.follows.empty": "Ní leanann an t-úsáideoir seo duine ar bith fós.",
+  "account.follows.empty": "Ní leanann an t-úsáideoir seo aon duine go fóill.",
   "account.go_to_profile": "Téigh go dtí próifíl",
   "account.hide_reblogs": "Folaigh moltaí ó @{name}",
   "account.in_memoriam": "Cuimhneachán.",
@@ -46,7 +46,7 @@
   "account.languages": "Athraigh teangacha foscríofa",
   "account.link_verified_on": "Seiceáladh úinéireacht an naisc seo ar {date}",
   "account.locked_info": "Tá an socrú príobháideachais don cuntas seo curtha go 'faoi ghlas'. Déanann an t-úinéir léirmheas ar cén daoine atá ceadaithe an cuntas leanúint.",
-  "account.media": "Ábhair",
+  "account.media": "Meáin",
   "account.mention": "Luaigh @{name}",
   "account.moved_to": "Tá tugtha le fios ag {name} gurb é an cuntas nua atá acu ná:",
   "account.mute": "Balbhaigh @{name}",
@@ -66,7 +66,7 @@
   "account.statuses_counter": "{count, plural, one {{counter} post} other {{counter} poist}}",
   "account.unblock": "Bain bac de @{name}",
   "account.unblock_domain": "Bain bac den ainm fearainn {domain}",
-  "account.unblock_short": "Bain bac de",
+  "account.unblock_short": "Díbhlocáil",
   "account.unendorse": "Ná chuir ar an phróifíl mar ghné",
   "account.unfollow": "Ná lean a thuilleadh",
   "account.unmute": "Díbhalbhaigh @{name}",
@@ -100,7 +100,7 @@
   "boost_modal.combo": "Is féidir leat {combo} a bhrú chun é seo a scipeáil an chéad uair eile",
   "bundle_column_error.copy_stacktrace": "Cóipeáil tuairisc earráide",
   "bundle_column_error.error.body": "Ní féidir an leathanach a iarradh a sholáthar. Seans gurb amhlaidh mar gheall ar fhabht sa chód, nó mar gheall ar mhíréireacht leis an mbrabhsálaí.",
-  "bundle_column_error.error.title": "Ná habair!",
+  "bundle_column_error.error.title": "Ó, níl sé sin go maith!",
   "bundle_column_error.network.body": "Tharla earráid agus an leathanach á lódáil. Seans gur mar gheall ar fhadhb shealadach le do nasc idirlín nó i ndáil leis an bhfreastalaí seo atá sé.",
   "bundle_column_error.network.title": "Earráid líonra",
   "bundle_column_error.retry": "Bain triail as arís",
@@ -135,9 +135,9 @@
   "column_header.hide_settings": "Folaigh socruithe",
   "column_header.moveLeft_settings": "Bog an colún ar chlé",
   "column_header.moveRight_settings": "Bog an colún ar dheis",
-  "column_header.pin": "Greamaigh",
+  "column_header.pin": "Pionna",
   "column_header.show_settings": "Taispeáin socruithe",
-  "column_header.unpin": "Díghreamaigh",
+  "column_header.unpin": "Bain pionna",
   "column_subheading.settings": "Socruithe",
   "community.column_settings.local_only": "Áitiúil amháin",
   "community.column_settings.media_only": "Meáin Amháin",
@@ -161,7 +161,7 @@
   "compose_form.poll.switch_to_single": "Athraigh suirbhé chun cead a thabhairt do rogha amháin",
   "compose_form.poll.type": "Stíl",
   "compose_form.publish": "Postáil",
-  "compose_form.publish_form": "Foilsigh\n",
+  "compose_form.publish_form": "Post nua",
   "compose_form.reply": "Freagra",
   "compose_form.save_changes": "Nuashonrú",
   "compose_form.spoiler.marked": "Bain rabhadh ábhair",
@@ -291,7 +291,7 @@
   "filter_modal.added.short_explanation": "Cuireadh an postáil seo leis an gcatagóir scagaire seo a leanas: {title}.",
   "filter_modal.added.title": "Scagaire curtha leis!",
   "filter_modal.select_filter.context_mismatch": "ní bhaineann sé leis an gcomhthéacs seo",
-  "filter_modal.select_filter.expired": "as feidhm",
+  "filter_modal.select_filter.expired": "imithe in éag",
   "filter_modal.select_filter.prompt_new": "Catagóir nua: {name}",
   "filter_modal.select_filter.search": "Cuardaigh nó cruthaigh",
   "filter_modal.select_filter.subtitle": "Bain úsáid as catagóir reatha nó cruthaigh ceann nua",
@@ -377,7 +377,7 @@
   "keyboard_shortcuts.boost": "Treisigh postáil",
   "keyboard_shortcuts.column": "to focus a status in one of the columns",
   "keyboard_shortcuts.compose": "to focus the compose textarea",
-  "keyboard_shortcuts.description": "Cuntas",
+  "keyboard_shortcuts.description": "Cur síos",
   "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "Bog síos ar an liosta",
   "keyboard_shortcuts.enter": "Oscail postáil",
@@ -394,17 +394,17 @@
   "keyboard_shortcuts.my_profile": "Oscail do phróifíl",
   "keyboard_shortcuts.notifications": "to open notifications column",
   "keyboard_shortcuts.open_media": "Oscail meáin",
-  "keyboard_shortcuts.pinned": "to open pinned posts list",
+  "keyboard_shortcuts.pinned": "Oscail liosta postálacha pinn",
   "keyboard_shortcuts.profile": "Oscail próifíl an t-údar",
   "keyboard_shortcuts.reply": "Freagair ar phostáil",
   "keyboard_shortcuts.requests": "Oscail liosta iarratas leanúnaí",
-  "keyboard_shortcuts.search": "to focus search",
-  "keyboard_shortcuts.spoilers": "to show/hide CW field",
-  "keyboard_shortcuts.start": "to open \"get started\" column",
-  "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
+  "keyboard_shortcuts.search": "Díriú ar an mbosca cuardaigh",
+  "keyboard_shortcuts.spoilers": "Taispeáin / folaigh réimse CW",
+  "keyboard_shortcuts.start": "Oscail an colún “tosaigh”",
+  "keyboard_shortcuts.toggle_hidden": "Taispeáin/folaigh an téacs taobh thiar de CW",
   "keyboard_shortcuts.toggle_sensitivity": "Taispeáin / cuir i bhfolach meáin",
   "keyboard_shortcuts.toot": "Cuir tús le postáil nua",
-  "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
+  "keyboard_shortcuts.unfocus": "Unfocus cum textarea/search",
   "keyboard_shortcuts.up": "Bog suas ar an liosta",
   "lightbox.close": "Dún",
   "lightbox.compress": "Comhbhrúigh an bosca amhairc íomhá",
@@ -545,12 +545,12 @@
   "notifications_permission_banner.title": "Ná caill aon rud go deo",
   "onboarding.action.back": "Tóg ar ais mé",
   "onboarding.actions.back": "Tóg ar ais mé",
-  "onboarding.actions.go_to_explore": "See what's trending",
-  "onboarding.actions.go_to_home": "Go to your home feed",
+  "onboarding.actions.go_to_explore": "Tóg mé chun trending",
+  "onboarding.actions.go_to_home": "Tóg go dtí mo bheathú baile mé",
   "onboarding.compose.template": "Dia duit #Mastodon!",
   "onboarding.follows.empty": "Ar an drochuair, ní féidir aon torthaí a thaispeáint faoi láthair. Is féidir leat triail a bhaint as cuardach nó brabhsáil ar an leathanach taiscéalaíochta chun teacht ar dhaoine le leanúint, nó bain triail eile as níos déanaí.",
-  "onboarding.follows.lead": "You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!",
-  "onboarding.follows.title": "Popular on Mastodon",
+  "onboarding.follows.lead": "Is é do bheathú baile an príomhbhealach chun taithí a fháil ar Mastodon. Dá mhéad daoine a leanann tú, is ea is gníomhaí agus is suimiúla a bheidh sé. Chun tú a chur ar bun, seo roinnt moltaí:",
+  "onboarding.follows.title": "Cuir do chuid fotha baile in oiriúint duit féin",
   "onboarding.profile.discoverable": "Déan mo phróifíl a fháil amach",
   "onboarding.profile.discoverable_hint": "Nuair a roghnaíonn tú infhionnachtana ar Mastodon, d’fhéadfadh do phoist a bheith le feiceáil i dtorthaí cuardaigh agus treochtaí, agus d’fhéadfaí do phróifíl a mholadh do dhaoine a bhfuil na leasanna céanna acu leat.",
   "onboarding.profile.display_name": "Ainm taispeána",
@@ -566,17 +566,17 @@
   "onboarding.share.message": "Is {username} mé ar #Mastodon! Tar lean mé ag {url}",
   "onboarding.share.next_steps": "Na chéad chéimeanna eile is féidir:",
   "onboarding.share.title": "Roinn do phróifíl",
-  "onboarding.start.lead": "Your new Mastodon account is ready to go. Here's how you can make the most of it:",
-  "onboarding.start.skip": "Want to skip right ahead?",
+  "onboarding.start.lead": "Tá tú mar chuid de Mastodon anois, ardán meán sóisialta díláraithe uathúil ina ndéanann tú - ní algartam - do thaithí féin a choimeád. Cuirimis tús leat ar an teorainn shóisialta nua seo:",
+  "onboarding.start.skip": "Nach bhfuil cabhair uait le tosú?",
   "onboarding.start.title": "Tá sé déanta agat!",
-  "onboarding.steps.follow_people.body": "You curate your own feed. Lets fill it with interesting people.",
-  "onboarding.steps.follow_people.title": "Follow {count, plural, one {one person} other {# people}}",
-  "onboarding.steps.publish_status.body": "Say hello to the world.",
+  "onboarding.steps.follow_people.body": "Is éard atá i gceist le daoine suimiúla a leanúint ná Mastodon.",
+  "onboarding.steps.follow_people.title": "Cuir do chuid fotha baile in oiriúint duit féin",
+  "onboarding.steps.publish_status.body": "Abair heileo leis an domhan le téacs, grianghraif, físeáin nó pobalbhreith {emoji}",
   "onboarding.steps.publish_status.title": "Déan do chéad phostáil",
-  "onboarding.steps.setup_profile.body": "Others are more likely to interact with you with a filled out profile.",
-  "onboarding.steps.setup_profile.title": "Customize your profile",
-  "onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
-  "onboarding.steps.share_profile.title": "Share your profile",
+  "onboarding.steps.setup_profile.body": "Cuir le d'idirghníomhaíochtaí trí phróifíl chuimsitheach a bheith agat.",
+  "onboarding.steps.setup_profile.title": "Déan do phróifíl a phearsantú",
+  "onboarding.steps.share_profile.body": "Cuir in iúl do do chairde conas tú a aimsiú ar Mastodon",
+  "onboarding.steps.share_profile.title": "Roinn do phróifíl Mastodon",
   "onboarding.tips.2fa": "<strong>An raibh a fhios agat?</strong> Is féidir leat do chuntas a dhéanamh slán trí fhíordheimhniú dhá fhachtóir a shocrú i socruithe do chuntais. Oibríonn sé le haon aip TOTP de do rogha féin, níl aon uimhir theileafóin riachtanach!",
   "onboarding.tips.accounts_from_other_servers": "<strong>An raibh a fhios agat?</strong> Ós rud é go bhfuil Mastodon díláraithe, déanfar roinnt próifílí a dtagann tú trasna orthu a óstáil ar fhreastalaithe seachas do fhreastalaithe. Agus fós is féidir leat idirghníomhú leo gan uaim! Tá an freastalaí acu sa dara leath dá n-ainm úsáideora!",
   "onboarding.tips.migration": "<strong>An raibh a fhios agat?</strong> Más dóigh leat nach rogha freastalaí iontach é {domain} amach anseo, is féidir leat bogadh go freastalaí Mastodon eile gan do leantóirí a chailliúint. Is féidir leat do fhreastalaí féin a óstáil fiú!",
@@ -594,7 +594,7 @@
   "poll.votes": "{votes, plural, one {# vóta} other {# vóta}}",
   "poll_button.add_poll": "Cruthaigh suirbhé",
   "poll_button.remove_poll": "Bain suirbhé",
-  "privacy.change": "Adjust status privacy",
+  "privacy.change": "Athraigh príobháideacht postála",
   "privacy.direct.long": "Luaigh gach duine sa phost",
   "privacy.direct.short": "Daoine ar leith",
   "privacy.private.long": "Do leanúna amháin",
@@ -687,8 +687,8 @@
   "search_popout.specific_date": "dáta ar leith",
   "search_popout.user": "úsáideoir",
   "search_results.accounts": "Próifílí",
-  "search_results.all": "Uile",
-  "search_results.hashtags": "Haischlibeanna",
+  "search_results.all": "Gach",
+  "search_results.hashtags": "Haischlib",
   "search_results.nothing_found": "Níorbh fhéidir aon rud a aimsiú do na téarmaí cuardaigh seo",
   "search_results.see_all": "Gach rud a fheicáil",
   "search_results.statuses": "Postálacha",
@@ -705,12 +705,12 @@
   "sign_in_banner.sso_redirect": "Logáil isteach nó Cláraigh",
   "status.admin_account": "Oscail comhéadan modhnóireachta do @{name}",
   "status.admin_domain": "Oscail comhéadan modhnóireachta le haghaidh {domain}",
-  "status.admin_status": "Open this status in the moderation interface",
+  "status.admin_status": "Oscail an postáil seo sa chomhéadan modhnóireachta",
   "status.block": "Bac @{name}",
   "status.bookmark": "Leabharmharcanna",
   "status.cancel_reblog_private": "Dímhol",
   "status.cannot_reblog": "Ní féidir an phostáil seo a mholadh",
-  "status.copy": "Copy link to status",
+  "status.copy": "Cóipeáil an nasc chuig an bpostáil",
   "status.delete": "Scrios",
   "status.detailed_status": "Amharc comhrá mionsonraithe",
   "status.direct": "Luaigh @{name} go príobháideach",
@@ -734,11 +734,11 @@
   "status.more": "Tuilleadh",
   "status.mute": "Balbhaigh @{name}",
   "status.mute_conversation": "Balbhaigh comhrá",
-  "status.open": "Expand this status",
+  "status.open": "Leathnaigh an post seo",
   "status.pin": "Pionnáil ar do phróifíl",
   "status.pinned": "Postáil pionnáilte",
   "status.read_more": "Léan a thuilleadh",
-  "status.reblog": "Mol",
+  "status.reblog": "Treisiú",
   "status.reblog_private": "Mol le léargas bunúsach",
   "status.reblogged_by": "Mhol {name}",
   "status.reblogs": "{count, plural, one {buaic} other {buaic}}",
@@ -757,7 +757,7 @@
   "status.show_more": "Taispeáin níos mó",
   "status.show_more_all": "Taispeáin níos mó d'uile",
   "status.show_original": "Taispeáin bunchóip",
-  "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
+  "status.title.with_attachments": "{user} a sheol {attachmentCount, plural, one {ceangal} two {{attachmentCount} ceangal} few {{attachmentCount} ceangail} many {{attachmentCount} ceangal} other {{attachmentCount} ceangal}}",
   "status.translate": "Aistrigh",
   "status.translated_from_with": "D'Aistrigh ón {lang} ag úsáid {provider}",
   "status.uncached_media_warning": "Níl an réamhamharc ar fáil",
diff --git a/app/javascript/mastodon/locales/kab.json b/app/javascript/mastodon/locales/kab.json
index a5c3280712a97f..ab0a6ce22bdba0 100644
--- a/app/javascript/mastodon/locales/kab.json
+++ b/app/javascript/mastodon/locales/kab.json
@@ -28,7 +28,7 @@
   "account.featured_tags.last_status_at": "Tasuffeɣt taneggarut ass n {date}",
   "account.featured_tags.last_status_never": "Ulac tisuffaɣ",
   "account.follow": "Ḍfer",
-  "account.follow_back": "Ḍfer-it ula d kečč·m",
+  "account.follow_back": "Ḍfer-it ula d kečč·mm",
   "account.followers": "Imeḍfaren",
   "account.followers.empty": "Ar tura, ulac yiwen i yeṭṭafaṛen amseqdac-agi.",
   "account.followers_counter": "{count, plural, one {{counter} n umḍfar} other {{counter} n yimeḍfaren}}",
@@ -38,6 +38,7 @@
   "account.go_to_profile": "Ddu ɣer umaɣnu",
   "account.hide_reblogs": "Ffer ayen i ibeṭṭu @{name}",
   "account.joined_short": "Izeddi da seg ass n",
+  "account.languages": "Beddel tutlayin yettwajerden",
   "account.link_verified_on": "Taɣara n useɣwen-a tettwasenqed ass n {date}",
   "account.locked_info": "Amiḍan-agi uslig isekweṛ. D bab-is kan i izemren ad yeǧǧ, s ufus-is, win ara t-iḍefṛen.",
   "account.media": "Timidyatin",
@@ -235,6 +236,7 @@
   "follow_request.authorize": "Ssireg",
   "follow_request.reject": "Agi",
   "follow_suggestions.dismiss": "Dayen ur t-id-skan ara",
+  "follow_suggestions.popular_suggestion_longer": "Yettwassen deg {domain}",
   "follow_suggestions.view_all": "Wali-ten akk",
   "follow_suggestions.who_to_follow": "Ad tḍefreḍ?",
   "followed_tags": "Ihacṭagen yettwaḍfaren",
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 602a26225c2d23..c0abc3c845579d 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -226,6 +226,7 @@ bg:
         update_custom_emoji: Обновяване на персонализираното емоджи
         update_domain_block: Обновяване на блокирането за домейна
         update_ip_block: Обновяване на правило за IP
+        update_report: Обновяване на доклада
         update_status: Обновяване на публикация
         update_user_role: Обновяване на ролята
       actions:
@@ -638,6 +639,7 @@ bg:
       report: 'Докладване на #%{id}'
       reported_account: Докладван акаунт
       reported_by: Докладвано от
+      reported_with_application: Докладвано с приложението
       resolved: Разрешено
       resolved_msg: Успешно разрешен доклад!
       skip_to_actions: Прескок към действия
diff --git a/config/locales/devise.ga.yml b/config/locales/devise.ga.yml
index e083896f370ec1..cc8ae0874ea816 100644
--- a/config/locales/devise.ga.yml
+++ b/config/locales/devise.ga.yml
@@ -116,3 +116,9 @@ ga:
       expired: imithe in éag, iarr ceann nua le do thoil
       not_found: níor aimsíodh é
       not_locked: nach raibh faoi ghlas
+      not_saved:
+        few: 'Chuir %{count} earráid cosc ​​ar an %{resource} seo a shábháil:'
+        many: 'Chuir %{count} earráid cosc ​​ar an %{resource} seo a shábháil:'
+        one: 'Chuir earráid 1 cosc ​​ar an %{resource} seo a shábháil:'
+        other: 'Chuir %{count} earráid cosc ​​ar an %{resource} seo a shábháil:'
+        two: 'Chuir %{count} earráid cosc ​​ar an %{resource} seo a shábháil:'
diff --git a/config/locales/doorkeeper.ga.yml b/config/locales/doorkeeper.ga.yml
index 9ac4740691c928..09857768e39744 100644
--- a/config/locales/doorkeeper.ga.yml
+++ b/config/locales/doorkeeper.ga.yml
@@ -5,7 +5,17 @@ ga:
       doorkeeper/application:
         name: Ainm feidhmchláir
         redirect_uri: Atreoraigh URI
+        scopes: Scóip
         website: Suíomh gréasáin feidhmchláir
+    errors:
+      models:
+        doorkeeper/application:
+          attributes:
+            redirect_uri:
+              fragment_present: ní féidir blúire a bheith ann.
+              invalid_uri: caithfidh gur URI bailí é.
+              relative_uri: a bheith ina URI iomlán.
+              secured_uri: caithfidh gur URI HTTPS/SSL é.
   doorkeeper:
     applications:
       buttons:
@@ -16,38 +26,172 @@ ga:
         submit: Cuir isteach
       confirmations:
         destroy: An bhfuil tú cinnte?
+      edit:
+        title: Cuir feidhmchlár in eagar
+      form:
+        error: Úps! Seiceáil d'fhoirm le haghaidh earráidí féideartha
+      help:
+        native_redirect_uri: Úsáid %{native_redirect_uri} le haghaidh tástálacha logánta
+        redirect_uri: Úsáid líne amháin in aghaidh an URI
+        scopes: Scóipeanna ar leith le spásanna. Fág bán chun na scóip réamhshocraithe a úsáid.
       index:
         application: Ainm feidhmchláir
+        callback_url: URL aisghlaoch
         delete: Scrios
+        empty: Níl aon iarratais agat.
         name: Ainm
+        new: Feidhmchlár nua
+        scopes: Scóip
         show: Taispeáin
+        title: D'iarratais
+      new:
+        title: Feidhmchlár nua
       show:
+        actions: Gníomhartha
         application_id: Eochair chliaint
+        callback_urls: URLanna aisghlaoch
+        scopes: Scóip
         secret: Rún cliaint
         title: 'Ainm feidhmchláir: %{name}'
     authorizations:
       buttons:
         authorize: Ceadaigh
         deny: Diúltaigh
+      error:
+        title: Tharla earráid
+      new:
+        prompt_html: Ba mhaith le %{client_name} cead rochtain a fháil ar do chuntas. Is iarratas tríú páirtí é. <strong>Mura bhfuil muinín agat as, níor cheart duit é a údarú.</strong>
+        review_permissions: Ceadanna a athbhreithniú
+        title: Tá údarú ag teastáil
+      show:
+        title: Cóipeáil an cód údaraithe seo agus greamaigh don fheidhmchlár é.
     authorized_applications:
+      buttons:
+        revoke: Cúlghair
       confirmations:
         revoke: An bhfuil tú cinnte?
       index:
+        authorized_at: Ceadaithe ar %{date}
+        description_html: Is feidhmchláir iad seo ar féidir rochtain a fháil ar do chuntas leis an API. Má tá feidhmchláir ann nach n-aithníonn tú anseo, nó má tá feidhmchlár mí-iompair, is féidir leat a rochtain a chúlghairm.
+        last_used_at: Úsáidte an uair dheireanach ar %{date}
+        never_used: Ná húsáideadh
         scopes: Ceadanna
         superapp: Inmheánach
+        title: D’iarratais údaraithe
+    errors:
+      messages:
+        access_denied: Shéan úinéir na hacmhainne nó an freastalaí údaraithe an t-iarratas.
+        credential_flow_not_configured: Theip ar shreabhadh Dintiúir Pasfhocal Úinéir Acmhainne toisc go raibh Doorkeeper.configure.resource_owner_from_credentials díchumraithe.
+        invalid_client: Theip ar fhíordheimhniú cliant de bharr cliant anaithnid, níl fíordheimhniú cliant san áireamh, nó modh fíordheimhnithe nach dtacaítear leis.
+        invalid_grant: Tá an deonú údaraithe ar choinníoll neamhbhailí, imithe in éag, cúlghairthe, nach ionann é agus an URI atreoraithe a úsáideadh san iarratas ar údarú, nó gur eisíodh é chuig cliant eile.
+        invalid_redirect_uri: Níl an uri atreoraithe atá san áireamh bailí.
+        invalid_request:
+          missing_param: 'Paraiméadar riachtanach in easnamh: %{value}.'
+          request_not_authorized: Ní mór an t-iarratas a údarú. Tá an paraiméadar riachtanach chun iarratas a údarú in easnamh nó neamhbhailí.
+          unknown: Tá paraiméadar riachtanach in easnamh ar an iarratas, folaíonn sé luach paraiméadar nach dtacaítear leis, nó tá sé míchumtha ar shlí eile.
+        invalid_resource_owner: Níl na dintiúir úinéara acmhainne a soláthraíodh bailí, nó ní féidir úinéir na hacmhainne a aimsiú
+        invalid_scope: Tá an scóip iarrtha neamhbhailí, anaithnid nó míchumtha.
+        invalid_token:
+          expired: Chuaigh an comhartha rochtana in éag
+          revoked: Cúlghairmeadh an comhartha rochtana
+          unknown: Tá an comhartha rochtana neamhbhailí
+        resource_owner_authenticator_not_configured: Theip ar aimsiú Úinéir Acmhainne toisc go bhfuil Doorkeeper.configure.resource_owner_authenticator díchumraithe.
+        server_error: Tháinig an freastalaí údaraithe ar riocht gan choinne a chuir cosc ​​air an t-iarratas a chomhlíonadh.
+        temporarily_unavailable: Ní féidir leis an bhfreastalaí údaraithe an t-iarratas a láimhseáil mar gheall ar ró-ualú sealadach nó cothabháil an fhreastalaí.
+        unauthorized_client: Níl an cliant údaraithe an t-iarratas seo a dhéanamh leis an modh seo.
+        unsupported_grant_type: Ní thacaíonn an freastalaí údaraithe leis an gcineál deontais údaraithe.
+        unsupported_response_type: Ní thacaíonn an freastalaí údaraithe leis an gcineál freagartha seo.
+    flash:
+      applications:
+        create:
+          notice: Cruthaíodh feidhmchlár.
+        destroy:
+          notice: Scriosadh an feidhmchlár.
+        update:
+          notice: Feidhmchlár nuashonraithe.
+      authorized_applications:
+        destroy:
+          notice: Cúlghairmeadh an t-iarratas.
     grouped_scopes:
+      access:
+        read: Rochtain inléite-amháin
+        read/write: Léigh agus scríobh rochtain
+        write: Rochtain scríofa-amháin
       title:
         accounts: Cuntais
+        admin/accounts: Cuntas a riar
+        admin/all: Feidhmeanna riaracháin go léir
+        admin/reports: Tuarascálacha a riar
+        all: Rochtain iomlán ar do chuntas Mastodon
+        blocks: Bloic
         bookmarks: Leabharmharcanna
         conversations: Comhráite
+        crypto: Criptiú ceann-go-deireadh
         favourites: Ceanáin
         filters: Scagairí
+        follow: Leanann, Múchann agus Blocálann
         follows: Cuntais leanta
         lists: Liostaí
+        media: Ceangaltáin meán
+        mutes: Múchann
         notifications: Fógraí
+        profile: Do phróifíl Mastodon
+        push: Fógraí a bhrú
+        reports: Tuarascálacha
         search: Cuardaigh
         statuses: Postálacha
+    layouts:
+      admin:
+        nav:
+          applications: Feidhmchláir
+          oauth2_provider: Soláthraí OAuth2
+      application:
+        title: Tá údarú OAuth riachtanach
     scopes:
+      admin:read: léigh na sonraí go léir ar an bhfreastalaí
+      admin:read:accounts: faisnéis íogair na gcuntas go léir a léamh
+      admin:read:canonical_email_blocks: léigh faisnéis íogair ar gach bloc ríomhphoist canónach
+      admin:read:domain_allows: léigh faisnéis íogair gach fearainn
+      admin:read:domain_blocks: léigh faisnéis íogair gach bloc fearainn
+      admin:read:email_domain_blocks: léigh faisnéis íogair gach bloc fearainn ríomhphoist
+      admin:read:ip_blocks: léigh faisnéis íogair gach bloic IP
+      admin:read:reports: faisnéis íogair na dtuarascálacha agus na gcuntas tuairiscithe go léir a léamh
+      admin:write: na sonraí go léir ar an bhfreastalaí a mhodhnú
+      admin:write:accounts: gníomhartha modhnóireachta a dhéanamh ar chuntais
+      admin:write:canonical_email_blocks: gníomhartha modhnóireachta a dhéanamh ar bhlocanna ríomhphoist chanónacha
+      admin:write:domain_allows: gníomhartha modhnóireachta a dhéanamh ar cheadaíonn fearainn
+      admin:write:domain_blocks: gníomhartha modhnóireachta a dhéanamh ar bhlocanna fearainn
+      admin:write:email_domain_blocks: gníomhartha modhnóireachta a dhéanamh ar bhlocanna fearainn ríomhphoist
+      admin:write:ip_blocks: gníomhartha modhnóireachta a dhéanamh ar bhlocanna IP
+      admin:write:reports: gníomhartha modhnóireachta a dhéanamh ar thuarascálacha
+      crypto: úsáid criptiú ceann-go-ceann
+      follow: caidrimh chuntais a mhodhnú
+      profile: léigh faisnéis phróifíle do chuntais amháin
+      push: faigh do bhrúfhógraí
+      read: léigh sonraí do chuntais go léir
+      read:accounts: féach eolas cuntais
+      read:blocks: féach ar do bloic
+      read:bookmarks: féach ar do leabharmharcanna
       read:favourites: féach ar do cheanáin
+      read:filters: féach ar do chuid scagairí
+      read:follows: féach do chuid seo a leanas
+      read:lists: féach ar do liostaí
+      read:mutes: féach ar do bhalbh
+      read:notifications: féach ar do chuid fógraí
+      read:reports: féach ar do thuarascálacha
+      read:search: cuardach ar do shon
+      read:statuses: féach ar gach post
+      write: sonraí do chuntais go léir a mhodhnú
+      write:accounts: do phróifíl a mhodhnú
+      write:blocks: cuntais agus fearainn a bhlocáil
+      write:bookmarks: poist leabharmharcála
+      write:conversations: comhráite balbh agus scrios
+      write:favourites: poist is fearr leat
       write:filters: cruthaigh scagairí
+      write:follows: daoine a leanúint
       write:lists: cruthaigh liostaí
+      write:media: uaslódáil comhaid meáin
+      write:mutes: balbhaigh daoine agus comhráite
+      write:notifications: soiléir do chuid fógraí
+      write:reports: tuairisc a thabhairt do dhaoine eile
+      write:statuses: foilsigh poist
diff --git a/config/locales/ga.yml b/config/locales/ga.yml
index a3ad293e5bd79d..370f3e82e62ed4 100644
--- a/config/locales/ga.yml
+++ b/config/locales/ga.yml
@@ -3,13 +3,24 @@ ga:
   about:
     about_mastodon_html: 'Líonra sóisialta a sheasfaidh an aimsir: Gan fógraíocht, gan faire chorparáideach, le leagan amach eiticiúil agus dílárú. Bíodh do chuid sonraí agatsa féin le Mastodon!'
     contact_missing: Gan socrú
-    contact_unavailable: N/B
+    contact_unavailable: N/A
     hosted_on: Mastodon arna óstáil ar %{domain}
     title: Maidir le
   accounts:
     follow: Lean
+    followers:
+      few: Leantóirí
+      many: Leantóirí
+      one: Leantóir
+      other: LeantóiríLeantóirí
+      two: Leantóirí
     following: Ag leanúint
+    instance_actor_flash: Is gníomhaí fíorúil é an cuntas seo a úsáidtear chun an freastalaí féin agus ní aon úsáideoir aonair a léiriú. Úsáidtear é chun críocha cónaidhme agus níor cheart é a chur ar fionraí.
+    last_active: deireanach gníomhach
+    link_verified_on: Seiceáladh úinéireacht an naisc seo ar %{date}
     nothing_here: Níl rud ar bith anseo!
+    pin_errors:
+      following: Ní mór duit a bheith ag leanúint an duine is mian leat a fhormhuiniú cheana féin
     posts:
       few: Postálacha
       many: Postálacha
@@ -23,12 +34,17 @@ ga:
       title: Dean gníomh modhnóireachta ar %{acct}
     account_moderation_notes:
       create: Fág nóta
+      created_msg: Cruthaíodh nóta modhnóireachta go rathúil!
+      destroyed_msg: Nóta measarthachta scriosta go rathúil!
     accounts:
+      add_email_domain_block: Cuir bac ar fhearann ​​​​ríomhphoist
       approve: Faomh
+      approved_msg: D'éirigh le feidhmchlár sínithe %{username} a cheadú
       are_you_sure: An bhfuil tú cinnte?
       avatar: Abhatár
       by_domain: Fearann
       change_email:
+        changed_msg: D'éirigh leis an ríomhphost a athrú!
         current_email: Ríomhphost reatha
         label: Athraigh ríomhphost
         new_email: Ríomhphost nua
@@ -46,7 +62,9 @@ ga:
       delete: Scrios sonraí
       deleted: Scriosta
       demote: Ísligh
+      destroyed_msg: Tá sonraí %{username} ciúáilte anois le scriosadh gan mhoill
       disable: Reoigh
+      disable_sign_in_token_auth: Díchumasaigh fíordheimhniú comhartha r-phoist
       disable_two_factor_authentication: Díchumasaigh 2FA
       disabled: Reoite
       display_name: Ainm taispeána
@@ -55,22 +73,31 @@ ga:
       email: Ríomhphost
       email_status: Stádas ríomhphoist
       enable: Dí-reoigh
+      enable_sign_in_token_auth: Cumasaigh fíordheimhniú comhartha ríomhphoist
       enabled: Ar chumas
+      enabled_msg: D'éirigh le dí-reoite cuntas %{username}
       followers: Leantóirí
       follows: Ag leanúint
       header: Ceanntásc
+      inbox_url: URL an Bhosca Isteach
+      invite_request_text: Cúiseanna le bheith páirteach
+      invited_by: Ar cuireadh ó
       ip: IP
       joined: Cláraithe
       location:
         all: Uile
         local: Áitiúil
         remote: Cian
+        title: Suíomh
       login_status: Stádas logála isteach
+      media_attachments: Ceangaltáin meán
       memorialize: Déan cuntas chuimhneacháin de
       memorialized: Cuntas chuimhneacháin
+      memorialized_msg: D'éirigh le %{username} a iompú ina chuntas cuimhneacháin
       moderation:
         active: Gníomhach
         all: Uile
+        disabled: Faoi mhíchumas
         pending: Ar feitheamh
         silenced: Teoranta
         suspended: Ar fionraí
@@ -78,111 +105,389 @@ ga:
       moderation_notes: Nótaí modhnóireacht
       most_recent_activity: Gníomhaíocht is déanaí
       most_recent_ip: IP is déanaí
+      no_account_selected: Níor athraíodh aon chuntas mar níor roghnaíodh ceann ar bith
+      no_limits_imposed: Ní fhorchuirtear aon teorainneacha
+      no_role_assigned: Níl aon ról sannta
+      not_subscribed: Gan suibscríofa
+      pending: Athbhreithniú ar feitheamh
       perform_full_suspension: Fionraí
       previous_strikes: Cionta roimhe seo
+      previous_strikes_description_html:
+        few: Tá <strong>%{count}</strong> buailte ag an gcuntas seo.
+        many: Tá <strong>%{count}</strong> buailte ag an gcuntas seo.
+        one: Tá <strong>buail amháin</strong> ag an gcuntas seo.
+        other: Tá <strong>%{count}</strong> buailte ag an gcuntas seo.
+        two: Tá <strong>%{count}</strong> buailte ag an gcuntas seo.
       promote: Ardaigh
       protocol: Prótacal
       public: Poiblí
+      push_subscription_expires: Téann síntiús PuSH in éag
       redownload: Athnuaigh próifíl
+      redownloaded_msg: D'éirigh le hathnuachan próifíl %{username} ón mbunús
       reject: Diúltaigh
+      rejected_msg: D'éirigh le diúltú le feidhmchlár sínithe %{username}
+      remote_suspension_irreversible: Scriosadh sonraí an chuntais seo go do-aisiompaithe.
+      remote_suspension_reversible_hint_html: Cuireadh an cuntas ar fionraí ar a fhreastalaí, agus bainfear na sonraí go hiomlán ar %{date}. Go dtí sin, is féidir leis an gcianfhreastalaí an cuntas seo a chur ar ais gan aon drochéifeachtaí. Más mian leat sonraí uile an chuntais a bhaint láithreach, is féidir leat é sin a dhéanamh thíos.
       remove_avatar: Bain abhatár
       remove_header: Bain ceanntásc
+      removed_avatar_msg: D'éirigh leis an íomhá avatar %{username} a bhaint
+      removed_header_msg: D'éirigh le híomhá ceanntásc %{username} a bhaint
+      resend_confirmation:
+        already_confirmed: Tá an t-úsáideoir seo deimhnithe cheana féin
+        send: Seol an nasc deimhnithe arís
+        success: D'éirigh le nasc deimhnithe seolta!
       reset: Athshocraigh
       reset_password: Athshocraigh pasfhocal
       resubscribe: Athchláraigh
       role: Ról
       search: Cuardaigh
+      search_same_email_domain: Úsáideoirí eile a bhfuil an fearann ​​ríomhphoist céanna acu
+      search_same_ip: Úsáideoirí eile a bhfuil an IP céanna acu
+      security: Slándáil
       security_measures:
         only_password: Pasfhocal amháin
         password_and_2fa: Pasfhocal agus fíordheimhniú déshraithe
+      sensitive: Fórsa-íogair
       sensitized: Marcáladh mar íogair
+      shared_inbox_url: URL an bhosca isteach roinnte
+      show:
+        created_reports: Tuarascálacha déanta
+        targeted_reports: Thuairiscigh daoine eile
       silence: Teorannaigh
       silenced: Teoranta
       statuses: Postálacha
+      strikes: Stailceanna roimhe seo
       subscribe: Cláraigh
       suspend: Cuir ar fionraí
       suspended: Ar fionraí
+      suspension_irreversible: Scriosadh sonraí an chuntais seo go do-aisiompaithe. Is féidir leat an cuntas a chur ar fionraí chun é a dhéanamh inúsáidte ach ní dhéanfaidh sé aon sonraí a bhí aige roimhe seo a aisghabháil.
+      suspension_reversible_hint_html: Tá an cuntas curtha ar fionraí, agus bainfear na sonraí go hiomlán ar %{date}. Go dtí sin, is féidir an cuntas a chur ar ais gan aon drochthionchar. Más mian leat sonraí uile an chuntais a bhaint láithreach, is féidir leat é sin a dhéanamh thíos.
       title: Cuntais
+      unblock_email: Bain an bac den seoladh ríomhphoist
+      unblocked_email_msg: D'éirigh leis an mbac a bhain le seoladh ríomhphoist %{username}
+      unconfirmed_email: Ríomhphost neamhdheimhnithe
+      undo_sensitized: Cealaigh fórsa-íogair
+      undo_silenced: Cealaigh teorainn
+      undo_suspension: Cealaigh fionraí
+      unsilenced_msg: D'éirigh leis an teorainn chuntas %{username} a bhaint
+      unsubscribe: Díliostáil
+      unsuspended_msg: D'éirigh le dífhorlannú cuntas %{username}
       username: Ainm úsáideora
+      view_domain: Féach ar achoimre le haghaidh fearainn
       warn: Rabhadh a thabhairt
       web: Gréasán
+      whitelisted: Ceadaithe do chónaidhm
     action_logs:
       action_types:
+        approve_appeal: Achomharc a cheadú
+        approve_user: Úsáideoir a cheadú
         assigned_to_self_report: Sann Tuairisc
+        change_email_user: Athraigh Ríomhphost don Úsáideoir
+        change_role_user: Athrú Ról an Úsáideora
+        confirm_user: Deimhnigh Úsáideoir
         create_account_warning: Cruthaigh Rabhadh
+        create_announcement: Cruthaigh Fógra
+        create_canonical_email_block: Cruthaigh Bloc Ríomhphoist
+        create_custom_emoji: Cruthaigh Emoji Saincheaptha
+        create_domain_allow: Cruthaigh Ceadaigh Fearainn
+        create_domain_block: Cruthaigh Bloc Fearainn
+        create_email_domain_block: Cruthaigh Bloc Fearainn Ríomhphoist
         create_ip_block: Cruthaigh riail IP
+        create_unavailable_domain: Cruthaigh Fearann ​​Gan Fáil
         create_user_role: Cruthaigh Ról
         demote_user: Ísligh úsáideoir
         destroy_announcement: Scrios Fógra
+        destroy_canonical_email_block: Scrios Bloc Ríomhphoist
+        destroy_custom_emoji: Scrios Saincheaptha Emoji
+        destroy_domain_allow: Scrios Ceadaigh Fearainn
+        destroy_domain_block: Scrios Bloc Fearainn
+        destroy_email_domain_block: Scrios Bloc Fearainn R-phoist
+        destroy_instance: Fearann ​​Purge
         destroy_ip_block: Scrios riail IP
         destroy_status: Scrios Postáil
+        destroy_unavailable_domain: Scrios Fearann ​​Gan Fáil
         destroy_user_role: Scrios ról
+        disable_2fa_user: Díchumasaigh 2FA
+        disable_custom_emoji: Díchumasaigh Emoji Saincheaptha
+        disable_sign_in_token_auth_user: Díchumasaigh Fíordheimhniú Comhartha R-phoist don Úsáideoir
+        disable_user: Díchumasaigh Úsáideoir
+        enable_custom_emoji: Cumasaigh Emoji Saincheaptha
+        enable_sign_in_token_auth_user: Cumasaigh Fíordheimhniú Comhartha R-phoist don Úsáideoir
+        enable_user: Cumasaigh Úsáideoir
+        memorialize_account: Cuntas Cuimhneacháin
+        promote_user: Úsáideoir a chur chun cinn
+        reject_appeal: Diúltaigh Achomharc
+        reject_user: Diúltaigh Úsáideoir
         remove_avatar_user: Bain Abhatár
         reopen_report: Athoscail tuairisc
+        resend_user: Seol Ríomhphost Deimhnithe arís
         reset_password_user: Athshocraigh Pasfhocal
         resolve_report: Réitigh tuairisc
+        sensitive_account: Cuntas Íogair Fórsa
+        silence_account: Cuntas Teorainn
+        suspend_account: Cuntas a Fhionraí
         unassigned_report: Díshann Tuairisc
+        unblock_email_account: Bain an bac den seoladh ríomhphoist
+        unsensitive_account: Cealaigh Cuntas Íogair Fórsa
+        unsilence_account: Cealaigh an Cuntas Teorainn
+        unsuspend_account: Díghlasáil Cuntas
         update_announcement: Nuashonraigh Fógra
+        update_custom_emoji: Nuashonraigh Emoji Saincheaptha
+        update_domain_block: Nuashonraigh Emoji Saincheaptha
+        update_ip_block: Íoslódáil an riail IP
+        update_report: Tuairisc Nuashonraithe
         update_status: Nuashonraigh Postáil
         update_user_role: Nuashonraigh Ról
       actions:
+        approve_appeal_html: Cheadaigh %{name} achomharc ar chinneadh modhnóireachta ó %{target}
+        approve_user_html: Cheadaigh %{name} clárú ó %{target}
+        assigned_to_self_report_html: Shann %{name} tuairisc %{target} dóibh féin
+        change_email_user_html: D'athraigh %{name} seoladh ríomhphoist úsáideora %{target}
+        change_role_user_html: D'athraigh %{name} ról %{target}
+        confirm_user_html: Dhearbhaigh %{name} seoladh ríomhphoist úsáideora %{target}
         create_account_warning_html: Sheol %{name} rabhadh chuig %{target}
+        create_announcement_html: Chruthaigh %{name} fógra nua %{target}
+        create_canonical_email_block_html: Chuir %{name} bac ar ríomhphost leis an hash %{target}
+        create_custom_emoji_html: D'uaslódáil %{name} emoji nua %{target}
+        create_domain_allow_html: Cheadaigh %{name} cónaidhm le fearann ​​%{target}
+        create_domain_block_html: "%{name} fearann ​​bactha %{target}"
+        create_email_domain_block_html: Chuir %{name} bac ar fhearann ​​ríomhphoist %{target}
+        create_ip_block_html: Chruthaigh %{name} riail don IP %{target}
+        create_unavailable_domain_html: Chuir %{name} deireadh leis an seachadadh chuig fearann ​​%{target}
+        create_user_role_html: Chruthaigh %{name} %{target} ról
+        demote_user_html: "%{name} úsáideoir scriosta %{target}"
+        destroy_announcement_html: "%{name} fógra scriosta %{target}"
+        destroy_canonical_email_block_html: "%{name} ríomhphost díchoiscthe leis an hash %{target}"
+        destroy_custom_emoji_html: Scriosadh %{name} emoji %{target}
+        destroy_domain_allow_html: Dhiúltaigh %{name} cónaidhm le fearann ​​%{target}
+        destroy_domain_block_html: "%{name} fearann ​​%{target} bainte de"
+        destroy_email_domain_block_html: "%{name} bain an bac den fhearann ​​ríomhphoist %{target}"
+        destroy_instance_html: Glanadh %{name} fearann ​​%{target}
+        destroy_ip_block_html: "%{name} scriosta riail le haghaidh IP %{target}"
+        destroy_status_html: Bhain %{name} postáil le %{target}
+        destroy_unavailable_domain_html: D'athchrom %{name} ar an seachadadh chuig fearann ​​%{target}
         destroy_user_role_html: Scrios %{name} ról %{target}
+        disable_2fa_user_html: Dhíchumasaigh %{name} riachtanas dhá fhachtóir don úsáideoir %{target}
+        disable_custom_emoji_html: Dhíchumasaigh %{name} emoji %{target}
+        disable_sign_in_token_auth_user_html: Dhíchumasaigh %{name} fíordheimhniú comhartha ríomhphoist le haghaidh %{target}
+        disable_user_html: "%{name} logáil isteach díchumasaithe d'úsáideoir %{target}"
+        enable_custom_emoji_html: "%{name} emoji cumasaithe %{target}"
+        enable_sign_in_token_auth_user_html: Chuir %{name} fíordheimhniú comhartha ríomhphoist ar chumas %{target}
+        enable_user_html: "%{name} logáil isteach cumasaithe don úsáideoir %{target}"
+        memorialize_account_html: Rinne %{name} cuntas %{target} a iompú ina leathanach cuimhneacháin
+        promote_user_html: Chuir %{name} úsáideoir %{target} chun cinn
+        reject_appeal_html: Dhiúltaigh %{name} achomharc ar chinneadh modhnóireachta ó %{target}
+        reject_user_html: Dhiúltaigh %{name} síniú suas ó %{target}
+        remove_avatar_user_html: Bhain %{name} avatar %{target}
+        reopen_report_html: D'athoscail %{name} tuairisc %{target}
+        resend_user_html: "%{name} athsheoladh ríomhphost deimhnithe le haghaidh %{target}"
+        reset_password_user_html: Athshocraigh %{name} pasfhocal úsáideora %{target}
+        resolve_report_html: Réitigh %{name} tuairisc %{target}
+        sensitive_account_html: Mharcáil %{name} meán %{target} mar íogair
+        silence_account_html: Chuir %{name} teorainn le cuntas %{target}
+        suspend_account_html: Chuir %{name} cuntas %{target} ar fionraí
+        unassigned_report_html: "%{name} tuairisc neamhshannta %{target}"
+        unblock_email_account_html: Bhain %{name} seoladh ríomhphoist %{target} amach
+        unsensitive_account_html: "%{name} meán %{target} gan mharcáil mar íogair"
+        unsilence_account_html: Chealaigh %{name} teorainn chuntas %{target}
+        unsuspend_account_html: Níor chuir %{name} cuntas %{target} ar fionraí
+        update_announcement_html: "%{name} fógra nuashonraithe %{target}"
+        update_custom_emoji_html: "%{name} emoji nuashonraithe %{target}"
+        update_domain_block_html: "%{name} nuashonraithe bloc fearainn le haghaidh %{target}"
+        update_ip_block_html: D'athraigh %{name} riail an IP %{target}
+        update_report_html: "%{name} tuairisc nuashonraithe %{target}"
+        update_status_html: "%{name} postáil nuashonraithe faoi %{target}"
         update_user_role_html: D'athraigh %{name} ról %{target}
       deleted_account: cuntas scriosta
+      empty: Níor aimsíodh aon logaí.
+      filter_by_action: Scag de réir gnímh
+      filter_by_user: Scag de réir úsáideora
+      title: Loga iniúchta
+      unavailable_instance: "(ainm fearainn ar fáil)"
     announcements:
+      destroyed_msg: D'éirigh leis an bhfógra a scriosadh!
       edit:
         title: Cuir fógra in eagar
+      empty: Níor aimsíodh aon fhógraí.
       live: Beo
       new:
         create: Cruthaigh fógra
         title: Fógra nua
       publish: Foilsigh
+      published_msg: D’éirigh leis an bhfógra a fhoilsiú!
+      scheduled_for: Sceidealta le haghaidh %{time}
+      scheduled_msg: Tá an fógra le foilsiú!
       title: Fógraí
+      unpublish: Dífhoilsiú
+      unpublished_msg: D’éirigh leis an bhfógra neamhfhoilsithe!
+      updated_msg: D'éirigh leis an bhfógra a nuashonrú!
+    critical_update_pending: Nuashonrú criticiúil ar feitheamh
     custom_emojis:
+      assign_category: Sann catagóir
       by_domain: Fearann
+      copied_msg: Cruthaíodh cóip áitiúil den emoji go rathúil
       copy: Cóipeáil
+      copy_failed_msg: Níorbh fhéidir cóip áitiúil den emoji sin a dhéanamh
       create_new_category: Cruthaigh catagóir nua
       created_msg: Cruthaíodh emoji go rathúil!
       delete: Scrios
       destroyed_msg: Scriosadh emoji go rathúil!
       disable: Díchumasaigh
       disabled: Díchumasaithe
+      disabled_msg: D'éirigh leis an emoji sin a dhíchumasú
       emoji: Emoji
       enable: Cumasaigh
       enabled: Ar chumas
+      enabled_msg: D'éirigh leis an emoji sin a chumasú
+      image_hint: PNG nó GIF suas go %{size}
       list: Liosta
       listed: Liostaithe
+      new:
+        title: Cuir emoji saincheaptha nua leis
+      no_emoji_selected: Níor athraíodh emojis ar bith mar níor roghnaíodh ceann ar bith
+      not_permitted: Níl cead agat an gníomh seo a dhéanamh
       overwrite: Forscríobh
+      shortcode: Gearrchód
+      shortcode_hint: 2 charachtar ar a laghad, gan ach carachtair alfa-uimhriúla agus béim ar leith
+      title: Emojis saincheaptha
       uncategorized: Neamhchatagóirithe
       unlist: Neamhliostaigh
       unlisted: Neamhliostaithe
+      update_failed_msg: Níorbh fhéidir an emoji sin a nuashonrú
+      updated_msg: D'éirigh le Emoji a nuashonrú!
       upload: Uaslódáil
     dashboard:
       active_users: úsáideoirí gníomhacha
+      interactions: idirghníomhaíochtaí
+      media_storage: Stóráil meáin
       new_users: úsáideoirí nua
       opened_reports: tuairiscí oscailte
+      pending_appeals_html:
+        few: "<strong>%{count}</strong> achomharc ar feitheamh"
+        many: "<strong>%{count}</strong> achomharc ar feitheamh"
+        one: "<strong>%{count}</strong> ar feitheamh achomhairc"
+        other: "<strong>%{count}</strong> achomharc ar feitheamh"
+        two: "<strong>%{count}</strong> achomharc ar feitheamh"
+      pending_reports_html:
+        few: "<strong>%{count}</strong> tuairiscí ar feitheamh"
+        many: "<strong>%{count}</strong> tuairiscí ar feitheamh"
+        one: "<strong>%{count}</strong> tuairisc ar feitheamh"
+        other: "<strong>%{count}</strong> tuairiscí ar feitheamh"
+        two: "<strong>%{count}</strong> tuairiscí ar feitheamh"
+      pending_tags_html:
+        few: "<strong>%{count}</strong> hashtags ar feitheamh"
+        many: "<strong>%{count}</strong> hashtags ar feitheamh"
+        one: "<strong>%{count}</strong> hashtag ar feitheamh"
+        other: "<strong>%{count}</strong> hashtags ar feitheamh"
+        two: "<strong>%{count}</strong> hashtags ar feitheamh"
+      pending_users_html:
+        few: "<strong>%{count}</strong> úsáideoirí ar feitheamh"
+        many: "<strong>%{count}</strong> úsáideoirí ar feitheamh"
+        one: "<strong>%{count}</strong> úsáideoir ar feitheamh"
+        other: "<strong>%{count}</strong> úsáideoirí ar feitheamh"
+        two: "<strong>%{count}</strong> úsáideoirí ar feitheamh"
+      resolved_reports: tuarascálacha réitithe
       software: Bogearraí
+      sources: Foinsí sínithe
+      space: Úsáid spáis
       title: Deais
+      top_languages: Barr teangacha gníomhacha
+      top_servers: Barr freastalaithe gníomhacha
       website: Suíomh Gréasáin
     disputes:
       appeals:
+        empty: Níor aimsíodh aon achomharc.
         title: Achomhairc
     domain_allows:
+      add_new: Ceadaigh cónaidhm leis an bhfearann
+      created_msg: Ceadaíodh fearann ​​don chónaidhm go rathúil
+      destroyed_msg: Dícheadaíodh an fearann ​​ón gcónaidhm
       export: Easpórtáil
       import: Iompórtáil
+      undo: Dícheadaigh cónaidhm leis an bhfearann
     domain_blocks:
+      add_new: Cuir bloc fearainn nua leis
+      confirm_suspension:
+        cancel: Cealaigh
+        confirm: Fionraí
+        permanent_action: Má dhéantar an fionraí a chealú, ní dhéanfar aon sonraí nó gaol a athbhunú.
+        preamble_html: Tá tú ar tí <strong>%{domain}</strong> agus a fhofhearainn a chur ar fionraí.
+        remove_all_data: Bainfidh sé seo gach ábhar, meán agus sonraí próifíle do chuntais an fhearainn seo de do fhreastalaí.
+        stop_communication: Stopfaidh do fhreastalaí ag cumarsáid leis na freastalaithe seo.
+        title: Deimhnigh bloc fearainn le haghaidh %{domain}
+        undo_relationships: Déanfaidh sé seo aon ghaol leantach idir cuntais na bhfreastalaithe seo agus do chuid féin a chealú.
+      created_msg: Tá bloc fearainn á phróiseáil anois
+      destroyed_msg: Tá an bloc fearainn cealaithe
       domain: Fearann
+      edit: Cuir bloc fearainn in eagar
+      existing_domain_block: Chuir tú teorainneacha níos déine ar %{name} cheana féin.
+      existing_domain_block_html: Chuir tú teorainneacha níos déine ar %{name} cheana féin, ní mór duit <a href="%{unblock_url}">an bac a bhaint as</a> ar dtús.
       export: Easpórtáil
       import: Iompórtáil
       new:
+        create: Cruthaigh bloc
+        hint: Ní choiscfidh an bloc fearainn iontrálacha cuntais a chruthú sa bhunachar sonraí, ach cuirfidh sé modhanna modhnóireachta sonracha i bhfeidhm go haisghníomhach agus go huathoibríoch ar na cuntais sin.
         severity:
+          desc_html: Déanfaidh <strong>Teorainn</strong> postálacha ó chuntais ag an bhfearann ​​seo dofheicthe d'aon duine nach bhfuil á leanúint. Bainfidh <strong>Fionraí</strong> gach ábhar, meán agus sonraí próifíle do chuntais an fhearainn seo de do fhreastalaí. Úsáid <strong>Dada</strong> más mian leat comhaid meán a dhiúltú.
+          noop: Dada
           silence: Teorannaigh
           suspend: Cuir ar fionraí
+        title: Bloc fearainn nua
+      no_domain_block_selected: Níor athraíodh aon bhloc fearainn mar níor roghnaíodh ceann ar bith
+      not_permitted: Níl cead agat an gníomh seo a dhéanamh
+      obfuscate: Obfuscate ainm fearainn
+      obfuscate_hint: Cuir bac páirteach ar an ainm fearainn sa liosta má tá fógraíocht ar an liosta teorainneacha fearainn cumasaithe
+      private_comment: Trácht príobháideach
+      private_comment_hint: Déan trácht ar an teorannú fearainn seo le haghaidh úsáid inmheánach ag na modhnóirí.
+      public_comment: Trácht poiblí
+      public_comment_hint: Déan trácht ar an teorannú fearainn seo don phobal i gcoitinne, má tá fógraíocht ar an liosta teorainneacha fearainn cumasaithe.
+      reject_media: Diúltaigh comhaid meán
+      reject_media_hint: Baintear comhaid meán atá stóráilte go háitiúil agus diúltaíonn sé aon cheann a íoslódáil amach anseo. Ní bhaineann le fionraí
+      reject_reports: Diúltaigh tuarascálacha
+      reject_reports_hint: Déan neamhaird de gach tuairisc a thagann ón bhfearann ​​seo. Ní bhaineann le fionraí
+      undo: Cealaigh bloc fearainn
+      view: Féach ar bhloc fearainn
     email_domain_blocks:
+      add_new: Cuir nua leis
+      allow_registrations_with_approval: Ceadaigh clárúcháin le ceadú
+      attempts_over_week:
+        few: "%{count} iarracht chun síniú suas le seachtain anuas"
+        many: "%{count} iarracht chun síniú suas le seachtain anuas"
+        one: "%{count} iarracht le seachtain anuas"
+        other: "%{count} iarracht chun síniú suas le seachtain anuas"
+        two: "%{count} iarracht chun síniú suas le seachtain anuas"
+      created_msg: D'éirigh leis an bhfearann ​​ríomhphoist a bhlocáil
       delete: Scrios
+      dns:
+        types:
+          mx: Taifead MX
       domain: Fearann
+      new:
+        create: Cuir fearann ​​leis
+        resolve: Réitigh fearann
+        title: Cuir bac ar fhearann ​​​​r-phoist nua
+      no_email_domain_block_selected: Níor athraíodh aon bhloc fearainn ríomhphoist mar níor roghnaíodh ceann ar bith
+      not_permitted: Níl sé ceadaithe
+      resolved_dns_records_hint_html: Réitíonn an t-ainm fearainn chuig na fearainn MX seo a leanas, atá freagrach sa deireadh as glacadh le ríomhphost. Má dhéantar fearann ​​MX a bhlocáil, cuirfear bac ar chlárúcháin ó aon seoladh ríomhphoist a úsáideann an fearann ​​MX céanna, fiú má tá an t-ainm fearainn infheicthe difriúil. <strong>Bí cúramach gan bac a chur ar phríomhsholáthraithe ríomhphoist.</strong>
+      resolved_through_html: Réitithe trí %{domain}
+      title: Fearainn ríomhphoist bactha
+    export_domain_allows:
+      new:
+        title: Ceadaíonn fearann ​​​​iomportála
+      no_file: Níor roghnaíodh aon chomhad
+    export_domain_blocks:
+      import:
+        description_html: Tá tú ar tí liosta de bhlocanna fearainn a allmhairiú. Athbhreithnigh an liosta seo go han-chúramach, le do thoil, go háirithe murar scríobh tú féin an liosta seo.
+        existing_relationships_warning: Caidreamh leantach atá ann cheana féin
+        private_comment_description_html: 'Chun cabhrú leat teacht ar cad as a dtagann bloic iompórtáilte, cruthófar bloic iompórtáilte leis an nóta tráchta príobháideach seo a leanas: <q> %{comment}</q>'
+        private_comment_template: Iompórtáilte ó %{source} ar %{date}
+        title: Iompórtáil bloic fearainn
+      invalid_domain_block: 'Léiríodh bloc fearainn amháin nó níos mó mar gheall ar an earráid(í): %{error}'
+      new:
+        title: Iompórtáil bloic fearainn
+      no_file: Níor roghnaíodh aon chomhad
     follow_recommendations:
+      description_html: "<strong>Lean na moltaí cabhraíonn sé le húsáideoirí nua ábhar suimiúil a aimsiú go tapa</strong>. Nuair nach mbíonn go leor idirghníomhaithe ag úsáideoir le daoine eile chun moltaí pearsantaithe a leanúint, moltar na cuntais seo ina ionad sin. Déantar iad a athríomh ar bhonn laethúil ó mheascán de chuntais a bhfuil na rannpháirtíochtaí is airde acu le déanaí agus na háirimh áitiúla is airde leanúna do theanga ar leith."
       language: Don teanga
       status: Stádas
       suppress: Coisc moladh leanúna
@@ -190,36 +495,94 @@ ga:
       title: Moltaí leanúna
       unsuppress: Aischuir moladh leanúna
     instances:
+      availability:
+        description_html:
+          few: Má theipeann ar sheachadadh chuig an bhfearann ​​ar <strong>%{count} laethanta éagsúla</strong> gan rath, ní dhéanfar aon iarrachtaí seachadta eile mura bhfaightear <em>ó</em> seachadadh ón bhfearann.
+          many: Má theipeann ar sheachadadh chuig an bhfearann ​​ar <strong>%{count} laethanta éagsúla</strong> gan rath, ní dhéanfar aon iarrachtaí seachadta eile mura bhfaightear <em>ó</em> seachadadh ón bhfearann.
+          one: Má theipeann ar sheachadadh chuig an bhfearann ​​<strong>%{count} day</strong> gan rath, ní dhéanfar aon iarrachtaí seachadta eile mura bhfaightear <em>ó</em> seachadadh ón bhfearann.
+          other: Má theipeann ar sheachadadh chuig an bhfearann ​​ar <strong>%{count} laethanta éagsúla</strong> gan rath, ní dhéanfar aon iarrachtaí seachadta eile mura bhfaightear <em>ó</em> seachadadh ón bhfearann.
+          two: Má theipeann ar sheachadadh chuig an bhfearann ​​ar <strong>%{count} laethanta éagsúla</strong> gan rath, ní dhéanfar aon iarrachtaí seachadta eile mura bhfaightear <em>ó</em> seachadadh ón bhfearann.
+        failure_threshold_reached: Baineadh an tairseach teipe amach ar %{date}.
+        failures_recorded:
+          few: Theip ar iarrachtaí ar %{count} lá difriúil.
+          many: Theip ar iarrachtaí ar %{count} lá difriúil.
+          one: Theip ar iarracht ar %{count} lá.
+          other: Theip ar iarrachtaí ar %{count} lá difriúil.
+          two: Theip ar iarrachtaí ar %{count} lá difriúil.
+        no_failures_recorded: Uimh teipeanna ar taifead.
+        title: Infhaighteacht
+        warning: Níor éirigh leis an iarracht dheireanach chun ceangal leis an bhfreastalaí seo
       back_to_all: Uile
       back_to_limited: Teoranta
       back_to_warning: Rabhadh
       by_domain: Fearann
+      confirm_purge: An bhfuil tú cinnte gur mian leat sonraí a scriosadh go buan ón bhfearann ​​seo?
       content_policies:
         comment: Nóta inmheánach
+        description_html: Is féidir leat beartais inneachair a shainiú a chuirfear i bhfeidhm ar gach cuntas ón bhfearann ​​seo agus aon cheann dá fhofhearainn.
+        limited_federation_mode_description_html: Is féidir leat an rogha a dhéanamh maidir le cónaidhm a cheadú leis an bhfearann ​​seo.
         policies:
+          reject_media: Na meáin a dhiúltú
+          reject_reports: Diúltaigh tuarascálacha
           silence: Teorannaigh
           suspend: Cuir ar fionraí
         policy: Polasaí
+        reason: Cúis phoiblí
+        title: Polasaithe ábhair
       dashboard:
+        instance_accounts_dimension: Cuntais a lean a bhformhór
+        instance_accounts_measure: cuntais stóráilte
+        instance_followers_measure: ár leantóirí ann
+        instance_follows_measure: a lucht leanta anseo
         instance_languages_dimension: Teangacha is airde
+        instance_media_attachments_measure: ceangaltáin meáin stóráilte
+        instance_reports_measure: tuairiscí mar gheall orthu
+        instance_statuses_measure: postanna stóráilte
       delivery:
         all: Uile
+        clear: Earráidí seachadta soiléir
         failing: Ag teip
+        restart: Seachadadh a atosú
+        stop: Stad seachadadh
         unavailable: Níl ar fáil
+      delivery_available: Tá seachadadh ar fáil
+      delivery_error_days: Laethanta earráide seachadta
+      delivery_error_hint: Mura féidir seachadadh a dhéanamh ar feadh %{count} lá, marcálfar go huathoibríoch é mar dosheachadta.
+      destroyed_msg: Tá sonraí ó %{domain} ciúáilte anois le haghaidh scriosadh gan mhoill.
+      empty: Níor aimsíodh aon fhearainn.
+      known_accounts:
+        few: "%{count} cuntas aitheanta"
+        many: "%{count} cuntas aitheanta"
+        one: "%{count} cuntas aitheanta"
+        other: "%{count} cuntas aitheanta"
+        two: "%{count} cuntas aitheanta"
       moderation:
         all: Uile
         limited: Teoranta
+        title: Measarthacht
+      private_comment: Trácht príobháideach
+      public_comment: Trácht poiblí
       purge: Glan
+      purge_description_html: Má chreideann tú go bhfuil an fearann ​​seo as líne ar feadh tamaill mhaith, is féidir leat gach taifead cuntais agus sonraí gaolmhara ón bhfearann ​​​​seo a scriosadh ó do stór. Seans go dtógfaidh sé seo tamall.
       title: Cónascadh
+      total_blocked_by_us: Blocáilte ag dúinn
+      total_followed_by_them: Ina dhiaidh sin iad
       total_followed_by_us: Á leanúint againn
+      total_reported: Tuarascálacha mar gheall orthu
+      total_storage: Ceangaltáin meán
+      totals_time_period_hint_html: Áiríonn na hiomláin a thaispeántar thíos sonraí don am ar fad.
+      unknown_instance: Níl aon taifead den fhearann ​​seo ar an bhfreastalaí seo faoi láthair.
     invites:
+      deactivate_all: Díghníomhachtaigh go léir
       filter:
         all: Uile
         available: Ar fáil
+        expired: Imithe in éag
         title: Scag
       title: Cuirí
     ip_blocks:
       add_new: Cruthaigh riail
+      created_msg: Cuireadh riail IP nua leis go rathúil
       delete: Scrios
       expires_in:
         '1209600': Coicís
@@ -228,111 +591,609 @@ ga:
         '31556952': Bliain amháin
         '86400': Lá amháin
         '94670856': 3 bhliain
+      new:
+        title: Cruthaigh riail IP nua
+      no_ip_block_selected: Níor athraíodh aon rialacha IP mar níor roghnaíodh ceann ar bith
       title: Rialacha IP
+    relationships:
+      title: Caidrimh %{acct}
     relays:
+      add_new: Cuir sealaíochta nua leis
       delete: Scrios
+      description_html: Is freastalaí idirghabhálaí é <strong>athsheachadán cónaidhme</strong> a mhalartaíonn líon mór postálacha poiblí idir freastalaithe a shíníonn dó agus a fhoilsíonn é. <strong>Is féidir leis cabhrú le freastalaithe beaga agus meánmhéide inneachar a aimsiú ón bhfeideas</strong>, rud a d'éileodh ar úsáideoirí áitiúla daoine eile a leanúint de láimh ar fhreastalaithe cianda.
       disable: Díchumasaigh
       disabled: Díchumasaithe
       enable: Cumasaigh
+      enable_hint: Nuair a bheidh sé cumasaithe, liostóidh do fhreastalaí le gach postáil phoiblí ón athsheoladh seo, agus tosóidh sé ag seoladh postálacha poiblí an fhreastalaí seo chuige.
       enabled: Ar chumas
+      inbox_url: URL Athsheolta
+      pending: Ag fanacht le ceadú sealaíochta
       save_and_enable: Sábháil agus cumasaigh
+      setup: Socraigh nasc sealaíochta
+      signatures_not_enabled: Seans nach n-oibreoidh athsheachadáin i gceart agus mód slán nó modh cónaidhmthe teoranta cumasaithe
       status: Stádas
+      title: Athsheachadáin
+    report_notes:
+      created_msg: Cruthaíodh nóta tuairisce go rathúil!
+      destroyed_msg: D'éirigh leis an nóta tuairisce a scriosadh!
     reports:
+      account:
+        notes:
+          few: "%{count} nótaí"
+          many: "%{count} nótaí"
+          one: "%{count} nóta"
+          other: "%{count} nótaí"
+          two: "%{count} nótaí"
+      action_log: Loga iniúchta
+      action_taken_by: Gníomh arna ghlacadh ag
+      actions:
+        delete_description_html: Scriosfar na postálacha tuairiscithe agus déanfar stailc a thaifeadadh chun cabhrú leat dul in airde ar sháruithe sa todhchaí tríd an gcuntas céanna.
+        mark_as_sensitive_description_html: Déanfar na meáin sna poist tuairiscithe a mharcáil mar íogair agus déanfar stailc a thaifeadadh chun cabhrú leat sárú a dhéanamh ar sháruithe sa todhchaí tríd an gcuntas céanna.
+        other_description_html: Féach ar a thuilleadh roghanna chun iompar an chuntais a rialú agus cumarsáid a shaincheapadh chuig an gcuntas tuairiscithe.
+        resolve_description_html: Ní dhéanfar aon ghníomhaíocht i gcoinne an chuntais thuairiscithe, ní dhéanfar aon stailc a thaifeadadh, agus dúnfar an tuarascáil.
+        silence_description_html: Ní bheidh an cuntas le feiceáil ach amháin dóibh siúd a leanann é cheana féin nó a bhreathnaíonn suas de láimh air, rud a chuirfidh srian mór ar a rochtain. Is féidir é a chur ar ais i gcónaí. Dúnann sé gach tuairisc i gcoinne an chuntais seo.
+        suspend_description_html: Beidh an cuntas agus a bhfuil ann go léir dorochtana agus scriosfar iad ar deireadh, agus beidh sé dodhéanta idirghníomhú leis. Inchúlaithe laistigh de 30 lá. Dúnann sé gach tuairisc i gcoinne an chuntais seo.
+      actions_description_html: Déan cinneadh ar an ngníomh atá le déanamh chun an tuarascáil seo a réiteach. Má dhéanann tú beart pionósach in aghaidh an chuntais tuairiscithe, seolfar fógra ríomhphoist chucu, ach amháin nuair a roghnaítear an chatagóir <strong>Turscar</strong>.
+      actions_description_remote_html: Déan cinneadh ar an ngníomh atá le déanamh chun an tuarascáil seo a réiteach. Ní bheidh tionchar aige seo ach ar an gcaoi a ndéanann <strong>do fhreastalaí</strong> cumarsáid leis an gcianchuntas seo agus a láimhseálann sé a ábhar.
+      add_to_report: Cuir tuilleadh leis an tuairisc
+      already_suspended_badges:
+        local: Ar fionraí cheana féin ar an bhfreastalaí seo
+        remote: Ar fionraí cheana féin ar a bhfreastalaí
       are_you_sure: An bhfuil tú cinnte?
+      assign_to_self: Sann dom
+      assigned: Modhnóir sannta
+      by_target_domain: Fearann ​​an chuntais tuairiscithe
       cancel: Cealaigh
       category: Catagóir
+      category_description_html: Luafar an chúis ar tuairiscíodh an cuntas seo agus/nó an t-ábhar seo i gcumarsáid leis an gcuntas tuairiscithe
+      comment:
+        none: Dada
+      comment_description_html: 'Chun tuilleadh eolais a sholáthar, scríobh %{name}:'
+      confirm: Deimhnigh
+      confirm_action: Deimhnigh gníomh modhnóireachta i gcoinne @%{acct}
       created_at: Tuairiscithe
       delete_and_resolve: Scrios postálacha
+      forwarded: Ar aghaidh
+      forwarded_replies_explanation: Is ó chianúsáideoir an tuairisc seo agus faoi chianábhar. Tá sé curtha ar aghaidh chugat toisc go bhfuil an t-ábhar tuairiscithe mar fhreagra ar cheann de na húsáideoirí atá agat.
+      forwarded_to: Ar aghaidh chuig %{domain}
       mark_as_resolved: Marcáil mar réitithe
       mark_as_sensitive: Marcáil mar íogair
+      mark_as_unresolved: Marcáil mar gan réiteach
       no_one_assigned: Duine ar bith
       notes:
         create: Cruthaigh nóta
         create_and_resolve: Réitigh le nóta
+        create_and_unresolve: Oscail arís le nóta
         delete: Scrios
+        placeholder: Déan cur síos ar na bearta a rinneadh, nó ar aon nuashonruithe gaolmhara eile...
         title: Nótaí
+      notes_description_html: Féach ar agus fág nótaí do mhodhnóirí eile agus duit féin amach anseo
+      processed_msg: 'D''éirigh le próiseáil an tuairisc # %{id}'
+      quick_actions_description_html: 'Déan gníomh tapa nó scrollaigh síos chun ábhar tuairiscithe a fheiceáil:'
+      remote_user_placeholder: an cianúsáideoir ó %{instance}
+      reopen: Tuairisc a athoscailt
+      report: 'Tuairiscigh # %{id}'
+      reported_account: Cuntas tuairiscithe
+      reported_by: Tuairiscithe ag
+      reported_with_application: Tuairiscíodh leis an iarratas
+      resolved: Réitithe
+      resolved_msg: D'éirigh le réiteach an tuairisc!
+      skip_to_actions: Léim ar ghníomhartha
       status: Stádas
+      statuses: Ábhar tuairiscithe
+      statuses_description_html: Luafar ábhar ciontach i gcumarsáid leis an gcuntas tuairiscithe
+      summary:
+        action_preambles:
+          delete_html: 'Tá tú ar tí <strong>cuid de phostálacha </strong>@%{acct}<strong> a bhaint</strong>. Déanfaidh sé seo:'
+          mark_as_sensitive_html: 'Tá tú ar tí <strong>marcáil</strong> ar chuid de phostálacha <strong>@%{acct}</strong> mar <strong>íogair</strong>. Déanfaidh sé seo:'
+          silence_html: 'Tá tú ar tí <strong>teorannú</strong> a dhéanamh ar chuntas <strong>@%{acct}</strong>. Déanfaidh sé seo:'
+          suspend_html: 'Tá tú ar tí cuntas <strong>a chur ar fionraí</strong> <strong>@%{acct}</strong>. Déanfaidh sé seo:'
+        actions:
+          delete_html: Bain na postálacha ciontaithe
+          mark_as_sensitive_html: Marcáil meáin na bpost ciontaithe mar íogair
+          silence_html: Cuir teorainn mhór le rochtain <strong>@%{acct}</strong> trí a bpróifíl agus a n-inneachar a dhéanamh infheicthe ag daoine atá á leanúint cheana féin nó ag breathnú uirthi de láimh
+          suspend_html: Cuir <strong>@%{acct}</strong> ar fionraí, rud a fhágann go bhfuil a bpróifíl agus a bhfuil iontu dorochtana agus dodhéanta idirghníomhú leo
+        close_report: 'Marcáil an tuairisc #%{id} mar réitithe'
+        close_reports_html: Marcáil <strong>gach</strong> tuairisc in aghaidh <strong>@%{acct}</strong> mar réitithe
+        delete_data_html: Scrios próifíl agus inneachar <strong>@%{acct}</strong> 30 lá ó anois mura mbeidh siad curtha ar fionraí idir an dá linn
+        preview_preamble_html: 'Gheobhaidh <strong>@%{acct}</strong> rabhadh leis an ábhar seo a leanas:'
+        record_strike_html: Taifead stailc in aghaidh <strong>@%{acct}</strong> chun cabhrú leat dul i ngleic le sáruithe amach anseo ón gcuntas seo
+        send_email_html: Seol ríomhphost rabhaidh chuig <strong>@%{acct}</strong>
+        warning_placeholder: Réasúnaíocht bhreise roghnach don ghníomh modhnóireachta.
+      target_origin: Bunús an chuntais tuairiscithe
       title: Tuairiscí
+      unassign: Díshannadh
+      unknown_action_msg: 'Gníomh anaithnid: %{action}'
+      unresolved: Gan réiteach
+      updated_at: Nuashonraithe
+      view_profile: Féach ar phróifíl
     roles:
       add_new: Cruthaigh ról
+      assigned_users:
+        few: "%{count} úsáideoirí"
+        many: "%{count} úsáideoirí"
+        one: "%{count} úsáideoir"
+        other: "%{count} úsáideoirí"
+        two: "%{count} úsáideoirí"
       categories:
         administration: Riar
+        devops: DevOps
         invites: Cuirí
+        moderation: Measarthacht
+        special: Speisialta
       delete: Scrios
+      description_html: Le <strong>róil úsáideora</strong>, is féidir leat na feidhmeanna agus na réimsí de Mastodon ar féidir le d'úsáideoirí rochtain a fháil orthu a shaincheapadh.
+      edit: Cuir ról '%{name}' in eagar
+      everyone: Ceadanna réamhshocraithe
+      everyone_full_description_html: Seo é an <strong>bunról</strong> a théann i bhfeidhm ar <strong>gach úsáideoir</strong>, fiú iad siúd nach bhfuil ról sannta acu. Faigheann gach ról eile cead uaidh.
+      permissions_count:
+        few: "%{count} ceadanna"
+        many: "%{count} ceadanna"
+        one: "%{count} cead"
+        other: "%{count} ceadanna"
+        two: "%{count} ceadanna"
       privileges:
         administrator: Riarthóir
+        administrator_description: Seachnóidh úsáideoirí a bhfuil an cead seo acu gach cead
         delete_user_data: Scrios Sonraí Úsáideora
+        delete_user_data_description: Ligeann sé d'úsáideoirí sonraí úsáideoirí eile a scriosadh gan mhoill
+        invite_users: Tabhair cuireadh d'Úsáideoirí
+        invite_users_description: Ligeann sé d'úsáideoirí cuireadh a thabhairt do dhaoine nua chuig an bhfreastalaí
+        manage_announcements: Bainistigh Fógraí
+        manage_announcements_description: Ligeann sé d'úsáideoirí fógraí ar an bhfreastalaí a bhainistiú
+        manage_appeals: Achomharc a bhainistiú
+        manage_appeals_description: Ligeann sé d'úsáideoirí athbhreithniú a dhéanamh ar achomhairc i gcoinne gníomhartha modhnóireachta
+        manage_blocks: Bainistigh Bloic
+        manage_blocks_description: Ligeann sé d'úsáideoirí bac a chur ar sholáthraithe ríomhphoist agus seoltaí IP
+        manage_custom_emojis: Bainistigh Emojis Saincheaptha
+        manage_custom_emojis_description: Ligeann sé d'úsáideoirí emojis saincheaptha a bhainistiú ar an bhfreastalaí
+        manage_federation: Cónaidhm a bhainistiú
+        manage_federation_description: Ligeann sé d’úsáideoirí cónaidhm a bhlocáil nó a cheadú le fearainn eile, agus inseachadacht a rialú
+        manage_invites: Bainistigh Cuirí
+        manage_invites_description: Ligeann sé d'úsáideoirí naisc cuireadh a bhrabhsáil agus a dhíghníomhachtú
+        manage_reports: Tuarascálacha a bhainistiú
+        manage_reports_description: Ligeann sé d’úsáideoirí tuarascálacha a athbhreithniú agus gníomhartha modhnóireachta a dhéanamh ina gcoinne
+        manage_roles: Bainistigh Róil
+        manage_roles_description: Ligeann sé d'úsáideoirí róil faoina gcuid féin a bhainistiú agus a shannadh
+        manage_rules: Rialacha a bhainistiú
+        manage_rules_description: Ligeann sé d'úsáideoirí rialacha freastalaí a athrú
+        manage_settings: Bainistigh Socruithe
+        manage_settings_description: Ligeann sé d'úsáideoirí socruithe suímh a athrú
+        manage_taxonomies: Tacsanomaíochtaí a bhainistiú
+        manage_taxonomies_description: Ligeann sé d'úsáideoirí athbhreithniú a dhéanamh ar inneachar treochta agus socruithe hashtag a nuashonrú
+        manage_user_access: Bainistigh Rochtain Úsáideoir
+        manage_user_access_description: Ligeann sé d'úsáideoirí fíordheimhniú dhá fhachtóir úsáideoirí eile a dhíchumasú, a seoladh r-phoist a athrú, agus a bpasfhocal a athshocrú
+        manage_users: Bainistigh Úsáideoirí
+        manage_users_description: Ligeann sé d'úsáideoirí sonraí úsáideoirí eile a fheiceáil agus gníomhartha modhnóireachta a dhéanamh ina gcoinne
+        manage_webhooks: Bainistigh cuacha Gréasáin
+        manage_webhooks_description: Ligeann sé d'úsáideoirí cuacha gréasáin a shocrú le haghaidh imeachtaí riaracháin
+        view_audit_log: Féach ar Loga Iniúchta
+        view_audit_log_description: Ligeann sé d'úsáideoirí stair gníomhartha riaracháin a fheiceáil ar an bhfreastalaí
+        view_dashboard: Amharc ar an Deais
+        view_dashboard_description: Ligeann sé d’úsáideoirí rochtain a fháil ar an deais agus ar mhéadrachtaí éagsúla
+        view_devops: DevOps
+        view_devops_description: Ligeann sé d’úsáideoirí rochtain a fháil ar dheais Sidekiq agus pgHero
       title: Róil
     rules:
       add_new: Cruthaigh riail
       delete: Scrios
+      description_html: Cé go maíonn a bhformhór gur léigh siad agus go n-aontaíonn siad leis na téarmaí seirbhíse, de ghnáth ní léann daoine tríd go dtí go dtagann fadhb chun cinn. <strong>Déan rialacha do fhreastalaí a fheiceáil go sracfhéachaint trí iad a sholáthar i liosta comhréidh de phointe urchair.</strong> Déan iarracht rialacha aonair a choinneáil gearr simplí, ach déan iarracht gan iad a roinnt ina go leor míreanna ar leith ach an oiread.
+      edit: Cuir riail in eagar
+      empty: Níl aon rialacha freastalaí sainmhínithe fós.
+      title: Rialacha freastalaí
     settings:
+      about:
+        manage_rules: Bainistigh rialacha freastalaí
+        preamble: Cuir eolas domhain ar fáil faoin gcaoi a n-oibrítear, a ndéantar modhnóireacht agus maoiniú ar an bhfreastalaí.
+        rules_hint: Tá réimse tiomnaithe rialacha ann a bhfuiltear ag súil go gcloífidh d’úsáideoirí leis.
+        title: Faoi
       appearance:
+        preamble: Saincheap comhéadan gréasáin Mastodon.
         title: Cuma
+      branding:
+        preamble: Déanann brandáil do fhreastalaí é a idirdhealú ó fhreastalaithe eile sa líonra. Féadfar an fhaisnéis seo a thaispeáint ar fud timpeallachtaí éagsúla, mar shampla comhéadan gréasáin Mastodon, feidhmchláir dhúchasacha, i réamhamhairc naisc ar láithreáin ghréasáin eile agus laistigh d’aipeanna teachtaireachtaí, agus mar sin de. Ar an ábhar sin, is fearr an fhaisnéis seo a choinneáil soiléir, gearr agus gonta.
+        title: Brandáil
+      captcha_enabled:
+        desc_html: Braitheann sé seo ar scripteanna seachtracha ó hCaptcha, rud a d’fhéadfadh a bheith ina ábhar imní maidir le slándáil agus príobháideacht. Ina theannta sin, <strong>is féidir leis seo an próiseas clárúcháin a dhéanamh i bhfad níos lú inrochtana ag roinnt daoine (go háirithe faoi mhíchumas)</strong>. Ar na cúiseanna seo, smaoinigh le do thoil ar bhearta eile amhail clárú bunaithe ar fhormheas nó ar chuireadh.
+        title: A cheangal ar úsáideoirí nua CAPTCHA a réiteach chun a gcuntas a dhearbhú
+      content_retention:
+        danger_zone: Crios contúirte
+        preamble: Rialú conas a stóráiltear ábhar a ghintear ag úsáideoirí i Mastodon.
+        title: Coinneáil ábhair
       default_noindex:
         desc_html: I bhfeidhm do ghach úsáideoir nár athraigh an socrú seo iad féin
         title: Diúltaigh d'innéacsú inneall cuardaigh mar réamhshocrú d'úsáideoirí
+      discovery:
+        follow_recommendations: Lean na moltaí
+        preamble: Tá sé ríthábhachtach dromchla a chur ar ábhar suimiúil chun úsáideoirí nua a chur ar bord nach bhfuil aithne acu ar dhuine ar bith Mastodon. Rialú conas a oibríonn gnéithe fionnachtana éagsúla ar do fhreastalaí.
+        profile_directory: Eolaire próifíle
+        public_timelines: Amlínte poiblí
+        publish_discovered_servers: Foilsigh freastalaithe aimsithe
+        publish_statistics: Staitisticí a fhoilsiú
+        title: Fionnachtain
+        trends: Treochtaí
+      domain_blocks:
+        all: Do chách
+        disabled: Do dhuine ar bith
+        users: Chun úsáideoirí áitiúla logáilte isteach
       registrations:
+        moderation_recommandation: Cinntigh le do thoil go bhfuil foireann mhodhnóireachta imoibríoch leordhóthanach agat sula n-osclaíonn tú clárúcháin do gach duine!
+        preamble: Rialú cé atá in ann cuntas a chruthú ar do fhreastalaí.
         title: Clárúcháin
+      registrations_mode:
+        modes:
+          approved: Teastaíonn ceadú le clárú
+          none: Ní féidir le duine ar bith clárú
+          open: Is féidir le duine ar bith clárú
+        warning_hint: Molaimid úsáid a bhaint as “Faomhadh riachtanach chun clárú” ach amháin má tá tú muiníneach gur féidir le d’fhoireann mhodhnóireachta clárú turscair agus mailíseach a láimhseáil go tráthúil.
+      security:
+        authorized_fetch: Teastaíonn fíordheimhniú ó fhreastalaithe cónasctha
+        authorized_fetch_hint: Toisc go n-éilítear fíordheimhniú ó fhreastalaithe cónasctha, is féidir bloic ar leibhéal an úsáideora agus ar leibhéal an fhreastalaí araon a fhorfheidhmiú níos déine. Mar sin féin, tagann sé seo ar chostas pionós feidhmíochta, laghdaítear an teacht ar do chuid freagraí, agus d'fhéadfadh saincheisteanna comhoiriúnachta a thabhairt isteach le roinnt seirbhísí cónasctha. Ina theannta sin, ní chuirfidh sé seo cosc ​​ar aisteoirí tiomnaithe do phoist phoiblí agus do chuntais phoiblí a fháil.
+        authorized_fetch_overridden_hint: Ní féidir leat an socrú seo a athrú faoi láthair toisc go bhfuil sé sáraithe ag athróg timpeallachta.
+        federation_authentication: Forghníomhú fíordheimhnithe Cónaidhm
+      title: Socruithe freastalaí
     site_uploads:
       delete: Scrios comhad uaslódáilte
+      destroyed_msg: D'éirigh le huaslódáil an tsuímh a scriosadh!
+    software_updates:
+      critical_update: Criticiúil - nuashonraigh go tapa le do thoil
+      description: Moltar do shuiteáil Mastodon a choinneáil cothrom le dáta chun leas a bhaint as na socruithe agus na gnéithe is déanaí. Ina theannta sin, tá sé ríthábhachtach uaireanta Mastodon a nuashonrú go tráthúil chun saincheisteanna slándála a sheachaint. Ar na cúiseanna seo, seiceálann Mastodon nuashonruithe gach 30 nóiméad, agus tabharfaidh sé fógra duit de réir do shainroghanna fógra ríomhphoist.
+      documentation_link: Foghlaim níos mó
+      release_notes: Nótaí scaoilte
+      title: Nuashonruithe ar fáil
+      type: Cineál
+      types:
+        major: Mórscaoileadh
+        minor: Mionscaoileadh
+        patch: Scaoileadh paiste - ceartúcháin agus athruithe atá éasca a chur i bhfeidhm
+      version: Leagan
     statuses:
       account: Údar
+      application: Iarratas
       back_to_account: Ar ais go leathanach cuntais
+      back_to_report: Ar ais go leathanach tuairisce
+      batch:
+        remove_from_report: Bain den tuairisc
+        report: Tuairisc
       deleted: Scriosta
       favourites: Toghanna
+      history: Stair leagan
+      in_reply_to: Ag freagairt do
       language: Teanga
       media:
         title: Meáin
       metadata: Meiteashonraí
+      no_status_selected: Níor athraíodh aon phostáil mar níor roghnaíodh ceann ar bith
       open: Oscail postáil
       original_status: Bunphostáil
       reblogs: Athbhlaganna
       status_changed: Athraíodh postáil
+      title: Poist chuntais
       trending: Ag treochtáil
+      visibility: Infheictheacht
       with_media: Le meáin
     strikes:
       actions:
         delete_statuses: Scrios %{name} postálacha de chuid %{target}
+        disable: Reoite %{name} cuntas %{target}
+        mark_statuses_as_sensitive: Mharcáil %{name} postálacha %{target} mar íogair
+        none: Sheol %{name} rabhadh chuig %{target}
+        sensitive: Mharcáil %{name} cuntas %{target} mar íogair
+        silence: Chuir %{name} teorainn le cuntas %{target}
+        suspend: Chuir %{name} cuntas %{target} ar fionraí
+      appeal_approved: Achomharc
+      appeal_pending: Achomharc ar feitheamh
+      appeal_rejected: Diúltaíodh don achomharc
+    system_checks:
+      database_schema_check:
+        message_html: Tá aistrithe bunachar sonraí ar feitheamh. Rith iad le do thoil chun a chinntiú go n-iompraíonn an t-iarratas mar a bhíothas ag súil leis
+      elasticsearch_health_red:
+        message_html: Tá braisle Elasticsearch míshláintiúil (stádas dearg), níl gnéithe cuardaigh ar fáil
+      elasticsearch_health_yellow:
+        message_html: Tá braisle Elasticsearch míshláintiúil (stádas buí), b'fhéidir gur mhaith leat an chúis a fhiosrú
+      elasticsearch_index_mismatch:
+        message_html: Tá mapálacha innéacs Elasticsearch as dáta. Rith <code>tootctl search deploy --only=%{value}</code> le do thoil
+      elasticsearch_preset:
+        action: Féach doiciméadú
+        message_html: Tá níos mó ná nód amháin ag do bhraisle Elasticsearch, ach níl Mastodon cumraithe chun iad a úsáid.
+      elasticsearch_preset_single_node:
+        action: Féach doiciméadú
+        message_html: Níl ach nód amháin ag do bhraisle Elasticsearch, ba cheart <code>ES_PRESET</code> a shocrú go <code>single_node_cluster</code>.
+      elasticsearch_reset_chewy:
+        message_html: Tá d'innéacs córais Elasticsearch as dáta mar gheall ar athrú socruithe. Rith <code>tootctl search deploy --reset-chewy</code> chun é a nuashonrú.
+      elasticsearch_running_check:
+        message_html: Níorbh fhéidir ceangal le Elasticsearch. Cinntigh go bhfuil sé ar siúl, nó díchumasaigh cuardach téacs iomlán
+      elasticsearch_version_check:
+        message_html: 'Leagan neamh-chomhoiriúnach le Elasticsearch: %{value}'
+        version_comparison: Tá Elasticsearch %{running_version} ag rith agus %{required_version} ag teastáil
+      rules_check:
+        action: Bainistigh rialacha freastalaí
+        message_html: Níl aon rialacha freastalaí sainmhínithe agat.
+      sidekiq_process_check:
+        message_html: Níl próiseas Sidekiq ag rith don scuaine/(scuainí) %{value}. Déan athbhreithniú ar do chumraíocht Sidekiq
+      software_version_critical_check:
+        action: Féach nuashonruithe atá ar fáil
+        message_html: Tá nuashonrú ríthábhachtach Mastodon ar fáil, nuashonraigh chomh tapa agus is féidir le do thoil.
+      software_version_patch_check:
+        action: Féach nuashonruithe atá ar fáil
+        message_html: Tá nuashonrú bugfix Mastodon ar fáil.
+      upload_check_privacy_error:
+        action: Seiceáil anseo le haghaidh tuilleadh eolais
+        message_html: "<strong>Tá do fhreastalaí gréasáin míchumraithe. Tá príobháideacht d'úsáideoirí i mbaol.</strong>"
+      upload_check_privacy_error_object_storage:
+        action: Seiceáil anseo le haghaidh tuilleadh eolais
+        message_html: "<strong>Tá do stór oibiachtaí míchumraithe. Tá príobháideacht d'úsáideoirí i mbaol.</strong>"
     tags:
       review: Stádas athbhreithnithe
+      updated_msg: D'éirigh le socruithe hashtag a nuashonrú
     title: Riar
     trends:
       allow: Ceadaigh
+      approved: Ceadaithe
       disallow: Dícheadaigh
+      links:
+        allow: Ceadaigh nasc
+        allow_provider: Ceadaigh foilsitheoir
+        description_html: Is naisc iad seo atá á roinnt go mór faoi láthair ag cuntais a bhfeiceann do fhreastalaí postálacha uathu. Is féidir leis cabhrú le d’úsáideoirí a fháil amach cad atá ar siúl ar fud an domhain. Ní thaispeánfar naisc ar bith go poiblí go dtí go gceadaíonn tú an foilsitheoir. Is féidir leat naisc aonair a cheadú nó a dhiúltú freisin.
+        disallow: Nasc a dhícheadú
+        disallow_provider: Dícheadaigh foilsitheoir
+        no_link_selected: Níor athraíodh aon nasc mar níor roghnaíodh ceann ar bith
+        publishers:
+          no_publisher_selected: Níor athraíodh aon fhoilsitheoir mar níor roghnaíodh ceann ar bith
+        shared_by_over_week:
+          few: Roinnte ag %{count} duine le seachtain anuas
+          many: Roinnte ag %{count} duine le seachtain anuas
+          one: Roinnte ag duine amháin le seachtain anuas
+          other: Roinnte ag %{count} duine le seachtain anuas
+          two: Roinnte ag %{count} duine le seachtain anuas
+        title: Naisc treochta
+        usage_comparison: Roinnte %{today} uair inniu, i gcomparáid le %{yesterday} inné
+      not_allowed_to_trend: Ní cheadaítear treocht
+      only_allowed: Ní cheadaítear ach
+      pending_review: Athbhreithniú ar feitheamh
       preview_card_providers:
+        allowed: Is féidir le naisc ón bhfoilsitheoir seo treocht
+        description_html: Is fearainn iad seo óna roinntear naisc go minic ar do fhreastalaí. Ní threochtóidh naisc go poiblí mura gceadaítear fearann ​​an naisc. Síneann do cheadú (nó diúltú) chuig fofhearainn.
+        rejected: Ní bheidh treocht ag naisc ón bhfoilsitheoir seo
         title: Foilsitheoirí
       rejected: Diúltaithe
       statuses:
         allow: Ceadaigh postáil
         allow_account: Ceadaigh údar
+        description_html: Is postálacha iad seo a bhfuil do fhreastalaí ar an eolas fúthu agus atá á roinnt faoi láthair agus is fearr leat go mór faoi láthair. Is féidir leis cabhrú le d’úsáideoirí nua agus úsáideoirí atá ag filleadh níos mó daoine a aimsiú le leanúint. Ní thaispeánfar postálacha ar bith go poiblí go dtí go gceadaíonn tú an t-údar, agus ceadaíonn an t-údar a gcuntas a mholadh do dhaoine eile. Is féidir leat postálacha aonair a cheadú nó a dhiúltú freisin.
+        disallow: Dícheadaigh postáil
+        disallow_account: Údar a dhícheadú
+        no_status_selected: Níor athraíodh aon phostáil treochta mar níor roghnaíodh ceann ar bith
+        not_discoverable: Níor roghnaigh an t-údar a bheith in-aimsithe
+        shared_by:
+          few: Roinnte agus ansa leat %{friendly_count} uair
+          many: Roinnte agus ansa leat %{friendly_count} uair
+          one: Roinnte nó is fearr leat am amháin
+          other: Roinnte agus ansa leat %{friendly_count} uair
+          two: Roinnte agus ansa leat %{friendly_count} uair
+        title: Poist trending
+      tags:
+        current_score: Scór reatha %{score}
+        dashboard:
+          tag_accounts_measure: úsáidí uathúla
+          tag_languages_dimension: Barrtheangacha
+          tag_servers_dimension: Barrtheangacha
+          tag_servers_measure: freastalaithe éagsúla
+          tag_uses_measure: úsáidí iomlána
+        description_html: Is hashtags iad seo atá le feiceáil faoi láthair i go leor postálacha a fheiceann do fhreastalaí. Is féidir leis cabhrú le d’úsáideoirí a fháil amach cad é is mó atá ag caint faoi dhaoine faoi láthair. Ní thaispeánfar aon hashtags go poiblí go dtí go gceadaíonn tú iad.
+        listable: Is féidir a mholadh
+        no_tag_selected: Níor athraíodh aon chlib mar níor roghnaíodh ceann ar bith
+        not_listable: Ní mholfar
+        not_trendable: Ní bheidh le feiceáil faoi threochtaí
+        not_usable: Ní féidir é a úsáid
+        peaked_on_and_decaying: Buaicphointe ar %{date}, ag lobhadh anois
+        title: Haischlib treochta
+        trendable: Is féidir le feiceáil faoi threochtaí
+        trending_rank: 'Ag treochtáil # %{rank}'
+        usable: Is féidir é a úsáid
+        usage_comparison: Úsáidte %{today} uair inniu, i gcomparáid le %{yesterday} inné
+        used_by_over_week:
+          few: Úsáidte ag %{count} duine le seachtain anuas
+          many: Úsáidte ag %{count} duine le seachtain anuas
+          one: Úsáidte ag duine amháin le seachtain anuas
+          other: Úsáidte ag %{count} duine le seachtain anuas
+          two: Úsáidte ag %{count} duine le seachtain anuas
+      title: Treochtaí
+      trending: Treocht
     warning_presets:
+      add_new: Cuir nua leis
       delete: Scrios
+      edit_preset: Cuir réamhshocrú rabhaidh in eagar
+      empty: Níl aon réamhshocruithe rabhaidh sainithe agat fós.
+      title: Réamhshocruithe rabhaidh
     webhooks:
+      add_new: Cuir críochphointe leis
       delete: Scrios
+      description_html: Cuireann <strong>cuadóg gréasáin</strong> ar chumas Mastodon <strong>fógraí fíor-ama</strong> faoi imeachtaí roghnaithe a bhrú le d'iarratas féin, ionas gur féidir le d'iarratas <strong>imoibrithe a spreagadh go huathoibríoch</strong>.
       disable: Díchumasaigh
       disabled: Díchumasaithe
+      edit: Cuir críochphointe in eagar
+      empty: Níl aon chríochphointí cuaille gréasáin agat fós.
       enable: Cumasaigh
       enabled: Gníomhach
+      enabled_events:
+        few: "%{count} imeacht cumasaithe"
+        many: "%{count} imeacht cumasaithe"
+        one: 1 imeacht cumasaithe
+        other: "%{count} imeacht cumasaithe"
+        two: "%{count} imeacht cumasaithe"
       events: Eachtraí
+      new: Cuaille gréasáin nua
+      rotate_secret: Rothlaigh an rún
+      secret: Rún a shíniú
       status: Stádas
+      title: Crúcaí gréasáin
+      webhook: Crúca gréasáin
   admin_mailer:
+    auto_close_registrations:
+      body: De bharr easpa gníomhaíochta modhnóra le déanaí, aistríodh clárúcháin ar %{instance} go huathoibríoch chuig athbhreithniú de láimh chun nach n-úsáidfear %{instance} mar ardán do dhrochghníomhaithe féideartha. Is féidir leat é a athrú ar ais chuig clárúcháin a oscailt am ar bith.
+      subject: Athraíodh clárúcháin le haghaidh %{instance} go huathoibríoch chuig a dteastaíonn ceadú uathu
     new_appeal:
       actions:
         delete_statuses: a gcuid postálacha a scrios
+        disable: a gcuntas a reo
+        mark_statuses_as_sensitive: a bpoist a mharcáil mar íogair
         none: rabhadh
+        sensitive: a gcuntas a mharcáil mar íogair
+        silence: a gcuntas a theorannú
+        suspend: a gcuntas a chur ar fionraí
+      body: 'Tá %{target} ag achomharc in aghaidh cinneadh modhnóireachta ó %{action_taken_by} ó %{date}, arbh é %{type} é. Scríobh siad:'
+      next_steps: Is féidir leat an t-achomharc a cheadú chun an cinneadh modhnóireachta a chealú, nó neamhaird a dhéanamh air.
+      subject: Tá %{username} ag achomharc in aghaidh cinneadh modhnóireachta ar %{instance}
+    new_critical_software_updates:
+      body: Tá leaganacha criticiúla nua de Mastodon eisithe, b'fhéidir gur mhaith leat a nuashonrú chomh luath agus is féidir!
+      subject: Tá nuashonruithe Critical Mastodon ar fáil do %{instance}!
+    new_pending_account:
+      body: Tá sonraí an chuntais nua thíos. Is féidir leat an t-iarratas seo a cheadú nó a dhiúltú.
+      subject: Cuntas nua le léirmheas ar %{instance} (%{username})
+    new_report:
+      body: Thuairiscigh %{reporter} %{target}
+      body_remote: Thuairiscigh duine éigin ó %{domain} %{target}
+      subject: Tuairisc nua do %{instance} (#%{id})
+    new_software_updates:
+      body: Tá leaganacha nua Mastodon eisithe, b'fhéidir gur mhaith leat a nuashonrú!
+      subject: Tá leaganacha nua Mastodon ar fáil do %{instance}!
+    new_trends:
+      body: 'Is gá na míreanna seo a leanas a athbhreithniú sular féidir iad a thaispeáint go poiblí:'
+      new_trending_links:
+        title: Naisc treochta
+      new_trending_statuses:
+        title: Poist trending
+      new_trending_tags:
+        title: Hashtags treochta
+      subject: Treochtaí nua le hathbhreithniú ar %{instance}
+  aliases:
+    add_new: Cruthaigh ailias
+    created_msg: D'éirigh le hailias nua a chruthú. Is féidir leat an t-aistriú ón seanchuntas a thionscnamh anois.
+    deleted_msg: D'éirigh leis an ailias a bhaint. Ní bheidh sé indéanta a thuilleadh bogadh ón gcuntas sin chuig an gceann seo.
+    empty: Níl aon ailiasanna agat.
+    hint_html: Más mian leat bogadh ó chuntas eile go dtí an ceann seo, anseo is féidir leat ailias a chruthú, a theastaíonn sular féidir leat leanúint ar aghaidh le leantóirí a bhogadh ón seanchuntas go dtí an ceann seo. Tá an gníomh seo ann féin <strong>neamhdhíobhálach agus inchúlaithe</strong>. <strong>Cuirtear tús leis an aistriú cuntais ón seanchuntas</strong>.
+    remove: Dícheangail ailias
+  appearance:
+    advanced_web_interface: Comhéadan gréasáin chun cinn
+    advanced_web_interface_hint: 'Más mian leat úsáid a bhaint as do leithead scáileáin ar fad, ceadaíonn an comhéadan gréasáin ardleibhéil duit go leor colúin éagsúla a chumrú chun an oiread faisnéise a fheiceáil ag an am céanna agus is mian leat: Baile, fógraí, amlíne chónaidhme, aon líon liostaí agus hashtags.'
+    animations_and_accessibility: Beochan agus inrochtaineacht
+    confirmation_dialogs: Dialóga deimhnithe
+    discovery: Fionnachtain
+    localization:
+      body: Aistríonn oibrithe deonacha Mastodon.
+      guide_link: https://crowdin.com/project/mastodon
+      guide_link_text: Is féidir le gach duine rannchuidiú.
+    sensitive_content: Ábhar íogair
+  application_mailer:
+    notification_preferences: Athraigh roghanna ríomhphoist
+    salutation: "%{name},"
+    settings: 'Athraigh sainroghanna ríomhphoist: %{link}'
+    unsubscribe: Díliostáil
+    view: 'Amharc:'
+    view_profile: Féach ar phróifíl
+    view_status: Féach ar phostáil
+  applications:
+    created: D'éirigh leis an bhfeidhmchlár a chruthú
+    destroyed: D'éirigh leis an bhfeidhmchlár a scriosadh
+    logout: Logáil Amach
+    regenerate_token: Athghin comhartha rochtana
+    token_regenerated: D'éirigh le hathghiniúint an comhartha rochtana
+    warning: Bí an-chúramach leis na sonraí seo. Ná roinn é le haon duine riamh!
+    your_token: Do chomhartha rochtana
   auth:
+    apply_for_account: Iarr cuntas
+    captcha_confirmation:
+      help_html: Má tá fadhbanna agat ag réiteach an CAPTCHA, is féidir leat dul i dteagmháil linn trí %{email} agus is féidir linn cabhrú leat.
+      hint_html: Ach rud amháin eile! Ní mór dúinn a dhearbhú gur duine daonna thú (tá sé seo ionas gur féidir linn an turscar a choinneáil amach!). Réitigh an CAPTCHA thíos agus cliceáil "Ar aghaidh".
+      title: Seiceáil slándála
+    confirmations:
+      awaiting_review: Tá do sheoladh r-phoist deimhnithe! Tá do chlárúchán á athbhreithniú ag foireann %{domain} anois. Gheobhaidh tú r-phost má fhaomhann siad do chuntas!
+      awaiting_review_title: Tá do chlárú á athbhreithniú
+      clicking_this_link: ag cliceáil ar an nasc seo
+      login_link: logáil isteach
+      proceed_to_login_html: Is féidir leat dul ar aghaidh chuig %{login_link} anois.
+      redirect_to_app_html: Ba cheart go ndearnadh tú a atreorú chuig an aip <strong>%{app_name}</strong>. Murar tharla sin, bain triail as %{clicking_this_link} nó fill ar an aip de láimh.
+      registration_complete: Tá do chlárú ar %{domain} críochnaithe anois!
+      welcome_title: Fáilte, %{name}!
+      wrong_email_hint: Mura bhfuil an seoladh ríomhphoist sin ceart, is féidir leat é a athrú i socruithe cuntais.
     delete_account: Scrios cuntas
+    delete_account_html: Más mian leat do chuntas a scriosadh, is féidir leat <a href="%{path}">leanúint ar aghaidh anseo</a>. Iarrfar ort deimhniú.
+    description:
+      prefix_invited_by_user: Tugann @%{name} cuireadh duit páirt a ghlacadh sa fhreastalaí seo de Mastodon!
+      prefix_sign_up: Cláraigh ar Mastodon inniu!
+      suffix: Le cuntas, beidh tú in ann daoine a leanúint, nuashonruithe a phostáil agus teachtaireachtaí a mhalartú le húsáideoirí ó aon fhreastalaí Mastodon agus níos mó!
+    didnt_get_confirmation: Nach bhfuair tú nasc deimhnithe?
+    dont_have_your_security_key: Nach bhfuil d'eochair shlándála agat?
+    forgot_password: Ar rinne tú dearmad ar do Phásfhocail?
+    invalid_reset_password_token: Tá comhartha athshocraithe pasfhocail neamhbhailí nó imithe in éag. Iarr ceann nua le do thoil.
+    link_to_otp: Cuir isteach cód dhá fhachtóir ó do ghuthán nó cód aisghabhála
+    link_to_webauth: Úsáid d'eochair shlándála gléas
+    log_in_with: Logáil isteach le
     login: Logáil isteach
     logout: Logáil Amach
+    migrate_account: Bog chuig cuntas eile
+    migrate_account_html: Más mian leat an cuntas seo a atreorú chuig ceann eile, is féidir leat <a href="%{path}">é a chumrú anseo</a>.
     or_log_in_with: Nó logáil isteach le
+    privacy_policy_agreement_html: Léigh mé agus aontaím leis an <a href="%{privacy_policy_path}" target="_blank">polasaí príobháideachais</a>
+    progress:
+      confirm: Deimhnigh Ríomhphost
+      details: Do chuid sonraí
+      review: Ár léirmheas
+      rules: Glac le rialacha
+    providers:
+      cas: CAS
+      saml: SAML
     register: Clárú
+    registration_closed: Níl %{instance} ag glacadh le baill nua
+    resend_confirmation: Seol an nasc deimhnithe arís
+    reset_password: Athshocraigh pasfhocal
+    rules:
+      accept: Glac
+      back: Ar ais
+      invited_by: 'Is féidir leat páirt a ghlacadh i %{domain} a bhuíochas leis an gcuireadh a fuair tú ó:'
+      preamble: Socraíonn agus cuireann na modhnóirí %{domain} iad seo i bhfeidhm.
+      preamble_invited: Sula dtéann tú ar aghaidh, smaoinigh le do thoil ar na bunrialacha atá socraithe ag modhnóirí %{domain}.
+      title: Roinnt bunrialacha.
+      title_invited: Tá cuireadh faighte agat.
     security: Slándáil
+    set_new_password: Socraigh pasfhocal nua
+    setup:
+      email_below_hint_html: Seiceáil d'fhillteán turscair, nó iarr ceann eile. Is féidir leat do sheoladh r-phoist a cheartú má tá sé mícheart.
+      email_settings_hint_html: Cliceáil ar an nasc a sheol muid chugat chun %{email} a fhíorú. Beidh muid ag fanacht ar dheis anseo.
+      link_not_received: Nach bhfuair tú nasc?
+      new_confirmation_instructions_sent: Gheobhaidh tú r-phost nua leis an nasc deimhnithe i gceann cúpla bomaite!
+      title: Seiceáil do bhosca isteach
+    sign_in:
+      preamble_html: Logáil isteach le do dhintiúir <strong>%{domain}</strong>. Má tá do chuntas á óstáil ar fhreastalaí eile, ní bheidh tú in ann logáil isteach anseo.
+      title: Logáil isteach go %{domain}
+    sign_up:
+      manual_review: Téann clárúcháin ar %{domain} trí athbhreithniú láimhe ag ár modhnóirí. Chun cabhrú linn do chlárúchán a phróiseáil, scríobh beagán fút féin agus cén fáth a bhfuil cuntas uait ar %{domain}.
+      preamble: Le cuntas ar an bhfreastalaí Mastodon seo, beidh tú in ann aon duine eile ar an líonra a leanúint, beag beann ar an áit a bhfuil a gcuntas á óstáil.
+      title: Déanaimis tú a shocrú ar %{domain}.
     status:
       account_status: Stádas cuntais
+      confirming: Ag fanacht le deimhniú r-phoist a bheith críochnaithe.
+      functional: Tá do chuntas ag feidhmiú go hiomlán.
+      pending: Tá d’iarratas ar feitheamh athbhreithnithe ag ár bhfoireann. Seans go dtógfaidh sé seo roinnt ama. Gheobhaidh tú ríomhphost má cheadaítear d’iarratas.
+      redirecting_to: Tá do chuntas neamhghníomhach toisc go bhfuil sé á atreorú chuig %{acct} faoi láthair.
+      self_destruct: Toisc go bhfuil %{domain} ag dúnadh síos, ní bhfaighidh tú ach rochtain theoranta ar do chuntas.
+      view_strikes: Féach ar stailceanna san am atá caite i gcoinne do chuntais
     too_fast: Cuireadh an fhoirm isteach róthapa, triail arís.
+    use_security_key: Úsáid eochair shlándála
   challenge:
     confirm: Lean ar aghaidh
+    hint_html: "<strong>Leid:</strong> Ní iarrfaimid do phasfhocal ort arís go ceann uair an chloig eile."
+    invalid_password: Pasfhocal neamhbhailí
+    prompt: Deimhnigh an pasfhocal chun leanúint ar aghaidh
+  crypto:
+    errors:
+      invalid_key: nach eochair bhailí Ed25519 nó Curve25519 í
+      invalid_signature: nach síniú bailí Ed25519 é
+  date:
+    formats:
+      default: "%b %d, %Y"
+      with_month_name: "%B %d, %Y"
   datetime:
     distance_in_words:
       about_x_hours: "%{count}u"
@@ -340,6 +1201,7 @@ ga:
       about_x_years: "%{count}b"
       almost_x_years: "%{count}b"
       half_a_minute: Díreach anois
+      less_than_x_minutes: "%{count}m"
       less_than_x_seconds: Díreach anois
       over_x_years: "%{count}b"
       x_days: "%{count}l"
@@ -347,45 +1209,243 @@ ga:
       x_months: "%{count}m"
       x_seconds: "%{count}s"
   deletes:
+    challenge_not_passed: Ní raibh an fhaisnéis a d'iontráil tú ceart
+    confirm_password: Cuir isteach do phasfhocal reatha chun d'aitheantas a fhíorú
+    confirm_username: Cuir isteach d'ainm úsáideora chun an nós imeachta a dhearbhú
     proceed: Scrios cuntas
+    success_msg: Scriosadh do chuntas go rathúil
+    warning:
+      before: 'Sula dtéann tú ar aghaidh, léigh na nótaí seo go cúramach le do thoil:'
+      caches: Seans go seasfaidh inneachar atá i dtaisce ag freastalaithe eile
+      data_removal: Bainfear do phostálacha agus sonraí eile go buan
+      email_change_html: Is féidir leat <a href="%{path}">do sheoladh ríomhphoist a athrú</a> gan do chuntas a scriosadh
+      email_contact_html: Mura dtagann sé fós, is féidir leat ríomhphost a chur chuig <a href="mailto:%{email}">%{email}</a> chun cabhair a fháil
+      email_reconfirmation_html: Mura bhfuil an ríomhphost deimhnithe á fháil agat, is féidir <a href="%{path}">é a iarraidh arís</a>
+      irreversible: Ní bheidh tú in ann do chuntas a aischur nó a athghníomhachtú
+      more_details_html: Le haghaidh tuilleadh sonraí, féach an <a href="%{terms_path}">polasaí príobháideachais</a>.
+      username_available: Cuirfear d'ainm úsáideora ar fáil arís
+      username_unavailable: Ní bheidh d'ainm úsáideora ar fáil fós
   disputes:
     strikes:
+      action_taken: Gníomh déanta
+      appeal: Achomharc
+      appeal_approved: D’éirigh le hachomharc a dhéanamh ar an stailc seo agus níl sé bailí a thuilleadh
+      appeal_rejected: Diúltaíodh don achomharc
       appeal_submitted_at: Achomharc curtha isteach
       appealed_msg: Cuireadh isteach d'achomharc. Má ceadófar é, cuirfear ar an eolas tú.
       appeals:
         submit: Cuir achomharc isteach
+      approve_appeal: Achomharc a cheadú
+      associated_report: Tuarascáil ghaolmhar
+      created_at: Dátaithe
+      description_html: Is gníomhartha iad seo a rinneadh i gcoinne do chuntais agus rabhaidh a sheol foireann %{instance} chugat.
+      recipient: Seolta chuig
+      reject_appeal: Diúltú achomharc
+      status: 'Postáil # %{id}'
+      status_removed: Baineadh an postáil den chóras cheana féin
+      title: "%{action} ó %{date}"
       title_actions:
+        delete_statuses: Post a bhaint
+        disable: Reo cuntais
+        mark_statuses_as_sensitive: Postálacha a mharcáil mar íogair
         none: Rabhadh
+        sensitive: An cuntas a mharcáil mar íogair
+        silence: Teorainn le cuntas
+        suspend: Cuntas a fhionraí
+      your_appeal_approved: Tá d’achomharc ceadaithe
       your_appeal_pending: Chuir tú achomharc isteach
+      your_appeal_rejected: Diúltaíodh do d'achomharc
+  domain_validator:
+    invalid_domain: nach ainm fearainn bailí é
+  edit_profile:
+    basic_information: Eolas bunúsach
+    hint_html: "<strong>Saincheap a bhfeiceann daoine ar do phróifíl phoiblí agus in aice le do phostálacha.</strong> Is dóichí go leanfaidh daoine eile ar ais tú agus go n-idirghníomhóidh siad leat nuair a bhíonn próifíl líonta agus pictiúr próifíle agat."
+    other: Eile
+  errors:
+    '400': Bhí an t-iarratas a chuir tú isteach neamhbhailí nó míchumtha.
+    '403': Níl cead agat an leathanach seo a fheiceáil.
+    '404': Níl an leathanach atá uait anseo.
+    '406': Níl an leathanach seo ar fáil san fhormáid iarrtha.
+    '410': Níl an leathanach a bhí á lorg agat ann a thuilleadh.
+    '422':
+      content: Theip ar fhíorú slándála. An bhfuil tú ag cur bac ar fhianáin?
+      title: Theip ar fhíorú slándála
+    '429': An iomarca iarratas
+    '500':
+      content: Tá brón orainn, ach chuaigh rud éigin mícheart ar ár deireadh.
+      title: Níl an leathanach seo ceart
+    '503': Níorbh fhéidir an leathanach a sheirbheáil mar gheall ar theip shealadach ar an bhfreastalaí.
+    noscript_html: Chun feidhmchlár gréasáin Mastodon a úsáid, cumasaigh JavaScript le do thoil. Nó, bain triail as ceann de na <a href="%{apps_path}">aipeanna dúchasacha</a> do Mastodon do d'ardán.
+  existing_username_validator:
+    not_found: níorbh fhéidir úsáideoir áitiúil a aimsiú leis an ainm úsáideora sin
+    not_found_multiple: níorbh fhéidir %{usernames} a aimsiú
   exports:
     archive_takeout:
       date: Dáta
+      download: Íosluchtaigh cartlann do rang
+      hint_html: Is féidir leat cartlann de do <strong>postálacha agus meáin uaslódáilte</strong> a iarraidh. Beidh na sonraí easpórtáilte i bhformáid ActivityPub, inléite ag aon bhogearraí comhlíontacha. Is féidir leat cartlann a iarraidh gach 7 lá.
+      in_progress: Do chartlann á tiomsú...
+      request: Iarr do chartlann
       size: Méid
+    blocks: Bac leat
+    bookmarks: Leabharmharcanna
+    csv: CSV
+    domain_blocks: Bloic fearainn
     lists: Liostaí
+    mutes: Balbhaíonn tú
+    storage: Stóráil meáin
+  featured_tags:
+    add_new: Cuir nua leis
+    errors:
+      limit: Tá uaslíon na hashtags le feiceáil agat cheana féin
+    hint_html: "<strong>Áirigh na haischlibeanna is tábhachtaí ar do phróifíl.</strong> Uirlis iontach chun súil a choinneáil ar do shaothair chruthaitheacha agus do thionscadail fhadtéarmacha, taispeántar haischlibeanna faoi thrácht in áit fheiceálach ar do phróifíl agus ceadaíonn siad rochtain thapa ar do phostálacha féin."
   filters:
     contexts:
+      account: Próifílí
       home: Baile agus liostaí
       notifications: Fógraí
+      public: Amlínte poiblí
       thread: Comhráite
     edit:
       add_keyword: Cruthaigh eochairfhocal
       keywords: Eochairfhocal
+      statuses: Poist aonair
+      statuses_hint_html: Baineann an scagaire seo le postálacha aonair a roghnú is cuma má mheaitseálann siad leis na heochairfhocail thíos. <a href="%{path}">Déan postálacha a athbhreithniú nó a bhaint den scagaire</a>.
+      title: Cuir an scagaire in eagar
+    errors:
+      deprecated_api_multiple_keywords: Ní féidir na paraiméadair seo a athrú ón bhfeidhmchlár seo toisc go mbaineann siad le níos mó ná eochairfhocal scagaire amháin. Úsáid feidhmchlár níos déanaí nó an comhéadan gréasáin.
+      invalid_context: Níor soláthraíodh aon cheann nó comhthéacs neamhbhailí
     index:
+      contexts: Scagairí i %{contexts}
       delete: Scrios
       empty: Níl aon scagairí agat.
+      expires_in: In éag i %{distance}
+      expires_on: Rachaidh sé in éag ar %{date}
+      keywords:
+        few: "%{count} eochairfhocal"
+        many: "%{count} eochairfhocal"
+        one: "%{count} eochairfhocal"
+        other: "%{count} eochairfhocal"
+        two: "%{count} eochairfhocal"
+      statuses:
+        few: "%{count} postáil"
+        many: "%{count} postáil"
+        one: "%{count} postáil"
+        other: "%{count} postáil"
+        two: "%{count} postáil"
+      statuses_long:
+        few: "%{count} postáil aonair folaithe"
+        many: "%{count} postáil aonair folaithe"
+        one: "%{count} postáil aonair i bhfolach"
+        other: "%{count} postáil aonair folaithe"
+        two: "%{count} postáil aonair folaithe"
       title: Scagairí
+    new:
+      save: Sábháil scagaire nua
+      title: Cuir scagaire nua leis
+    statuses:
+      back_to_filter: Ar ais go dtí an scagaire
+      batch:
+        remove: Bain as an scagaire
+      index:
+        hint: Baineann an scagaire seo le poist aonair a roghnú beag beann ar chritéir eile. Is féidir leat tuilleadh postálacha a chur leis an scagaire seo ón gcomhéadan gréasáin.
+        title: Postálacha scagtha
   generic:
+    all: Gach
+    all_items_on_page_selected_html:
+      few: Tá gach <strong>%{count}</strong> mír ar an leathanach seo roghnaithe.
+      many: Tá gach <strong>%{count}</strong> mír ar an leathanach seo roghnaithe.
+      one: Tá <strong>%{count}</strong> mír ar an leathanach seo roghnaithe.
+      other: Tá gach <strong>%{count}</strong> mír ar an leathanach seo roghnaithe.
+      two: Tá gach <strong>%{count}</strong> mír ar an leathanach seo roghnaithe.
+    all_matching_items_selected_html:
+      few: Tá gach <strong>%{count}</strong> mír a thagann le do chuardach roghnaithe.
+      many: Tá gach <strong>%{count}</strong> mír a thagann le do chuardach roghnaithe.
+      one: Tá <strong>%{count}</strong> mír a thagann le do chuardach roghnaithe.
+      other: Tá gach <strong>%{count}</strong> mír a thagann le do chuardach roghnaithe.
+      two: Tá gach <strong>%{count}</strong> mír a thagann le do chuardach roghnaithe.
+    cancel: Cealaigh
+    changes_saved_msg: Sábháladh na hathruithe!
+    confirm: Deimhnigh
     copy: Cóipeáil
     delete: Scrios
+    deselect: Díroghnaigh go léir
+    none: Dada
+    order_by: Ordú le
+    save_changes: Sabháil na hathruithe
+    select_all_matching_items:
+      few: Roghnaigh gach %{count} mír a thagann le do chuardach.
+      many: Roghnaigh gach %{count} mír a thagann le do chuardach.
+      one: Roghnaigh %{count} mír a thagann le do chuardach.
+      other: Roghnaigh gach %{count} mír a thagann le do chuardach.
+      two: Roghnaigh gach %{count} mír a thagann le do chuardach.
     today: inniu
+    validation_errors:
+      few: Níl rud éigin ceart go leor fós! Déan athbhreithniú ar %{count} earráid thíos
+      many: Níl rud éigin ceart go leor fós! Déan athbhreithniú ar %{count} earráid thíos
+      one: Níl rud éigin ceart go leor fós! Déan athbhreithniú ar an earráid thíos
+      other: Níl rud éigin ceart go leor fós! Déan athbhreithniú ar %{count} earráid thíos
+      two: Níl rud éigin ceart go leor fós! Déan athbhreithniú ar %{count} earráid thíos
   imports:
+    errors:
+      empty: Comhad CSV folamh
+      incompatible_type: Neamh-chomhoiriúnach leis an gcineál iompórtála roghnaithe
+      invalid_csv_file: 'Comhad CSV neamhbhailí. Earráid: %{error}'
+      over_rows_processing_limit: níos mó ná %{count} sraitheanna
+      too_large: Tá an comhad ró-mhór
+    failures: Teipeanna
+    imported: Iompórtáilte
+    mismatched_types_warning: Is cosúil gur roghnaigh tú an cineál mícheart don iompórtáil seo, seiceáil arís le do thoil.
     modes:
       merge: Cumaisc
+      merge_long: Coinnigh taifid atá ann cheana féin agus cuir cinn nua leis
       overwrite: Forscríobh
+      overwrite_long: Cuir na cinn nua in ionad na dtaifead reatha
+    overwrite_preambles:
+      blocking_html: Tá tú ar tí <strong>do liosta bloc</strong> a chur in ionad suas le <strong>%{total_items} cuntas</strong> ó <strong>%{filename}</strong>.
+      bookmarks_html: Tá tú ar tí <strong>do leabharmharcanna</strong> a chur in ionad suas le <strong>%{total_items} postáil</strong> ó <strong>%{filename}</strong>.
+      domain_blocking_html: Tá tú ar tí <strong>do liosta bloc fearainn</strong> a chur in ionad suas le <strong>%{total_items} fearainn</strong> ó <strong>%{filename}</strong>.
+      following_html: Tá tú ar tí <strong>leanúint</strong> suas go dtí <strong>%{total_items} cuntas</strong> ó <strong>%{filename}</strong> agus <strong>stop a leanúint aon duine eile</strong>.
+      lists_html: Tá tú ar tí <strong>do liostaí</strong> a chur in ionad inneachair <strong>%{filename}</strong>. Cuirfear suas le <strong>%{total_items} cuntas</strong> le liostaí nua.
+      muting_html: Tá tú ar tí <strong>do liosta cuntas balbhaithe</strong> a chur in ionad suas le <strong>%{total_items} cuntas</strong> ó <strong>%{filename}</strong>.
+    preambles:
+      blocking_html: Tá tú ar tí <strong>bloc</strong> suas le <strong>%{total_items} cuntas</strong> ó <strong>%{filename}</strong>.
+      bookmarks_html: Tá tú ar tí <strong>%{total_items} postáil</strong> ó <strong>%{filename}</strong> a chur le do <strong>leabharmharcanna</strong>.
+      domain_blocking_html: Tá tú ar tí <strong>bloc</strong> suas le <strong>%{total_items} fearainn</strong> ó <strong>%{filename}</strong>.
+      following_html: Tá tú ar tí <strong>leanúint</strong> suas go dtí <strong>%{total_items} cuntas</strong> ó <strong>%{filename}</strong>.
+      lists_html: Tá tú ar tí <strong>%{total_items} cuntas</strong> ó <strong>%{filename}</strong> a chur le do <strong>liostaí</strong>. Cruthófar liostaí nua mura bhfuil aon liosta le cur leis.
+      muting_html: Tá tú ar tí <strong>balbhú</strong> suas le <strong>%{total_items} cuntas</strong> ó <strong>%{filename}</strong>.
+    preface: Is féidir leat sonraí a d’easpórtáil tú a allmhairiú ó fhreastalaí eile, mar shampla liosta de na daoine a bhfuil tú ag leanúint nó ag cur bac orthu.
+    recent_imports: Allmhairí le déanaí
+    states:
+      finished: Críochnaithe
+      in_progress: Ar siúl
+      scheduled: Sceidealta
+      unconfirmed: Neamhdhearbhaithe
+    status: Stádas
+    success: Uaslódáladh do shonraí go rathúil agus próiseálfar iad in am trátha
+    time_started: Thosaigh ag
+    titles:
+      blocking: Cuntais bhlocáilte á n-iompórtáil
+      bookmarks: Leabharmharcanna á n-iompórtáil
+      domain_blocking: Fearainn blocáilte á n-iompórtáil
+      following: Cuntais leanta á n-iompórtáil
+      lists: Liostaí á n-iompórtáil
+      muting: Cuntais bhalbhaithe á n-iompórtáil
+    type: Cineál iompórtála
+    type_groups:
+      constructive: Seo a leanas & Leabharmharcanna
+      destructive: Bloic agus balbhaigh
     types:
+      blocking: Liosta blocála
       bookmarks: Leabharmharcanna
+      domain_blocking: Liosta blocála fearainn
+      following: Liosta ina dhiaidh sin
+      lists: Liostaí
+      muting: Liosta muting
     upload: Uaslódáil
   invites:
+    delete: Díghníomhachtaigh
     expired: As feidhm
     expires_in:
       '1800': 30 nóiméid
@@ -395,43 +1455,230 @@ ga:
       '604800': Seachtain amháin
       '86400': Lá amháin
     expires_in_prompt: In am ar bith
+    generate: Gin nasc cuireadh
+    invalid: Níl an cuireadh seo bailí
+    invited_by: 'Fuair ​​tú cuireadh ó:'
+    max_uses:
+      few: Úsáideann %{count}
+      many: Úsáideann %{count}
+      one: 1 úsáid
+      other: Úsáideann %{count}
+      two: Úsáideann %{count}
+    max_uses_prompt: Gan teorainn
+    prompt: Gin agus roinn naisc le daoine eile chun rochtain a dheonú ar an bhfreastalaí seo
+    table:
+      expires_at: In éag
+      uses: Úsáidí
+    title: Tabhair cuireadh do dhaoine
+  lists:
+    errors:
+      limit: Tá uaslíon na liostaí sroichte agat
   login_activities:
     authentication_methods:
+      otp: app fíordheimhnithe dhá-fachtóir
       password: pasfhocal
+      sign_in_token: cód slándála ríomhphoist
       webauthn: eochracha slándála
+    description_html: Má fheiceann tú gníomhaíocht nach n-aithníonn tú, smaoinigh ar do phasfhocal a athrú agus fíordheimhniú dhá fhachtóir a chumasú.
+    empty: Níl aon stair fíordheimhnithe ar fáil
+    failed_sign_in_html: Theip ar iarracht síniú isteach le %{method} ó %{ip} (%{browser})
+    successful_sign_in_html: D'éirigh le síniú isteach le %{method} ó %{ip} (%{browser})
+    title: Stair fíordheimhnithe
+  mail_subscriptions:
+    unsubscribe:
+      action: Sea, díliostáil
+      complete: Gan liostáil
+      confirmation_html: An bhfuil tú cinnte gur mhaith leat díliostáil ó %{type} a fháil do Mastodon ar %{domain} chuig do ríomhphost ag %{email}? Is féidir leat liostáil arís i gcónaí ó do <a href="%{settings_path}">socruithe fógra ríomhphoist</a>.
+      emails:
+        notification_emails:
+          favourite: r-phoist fógra is fearr leat
+          follow: r-phoist fógra a leanúint
+          follow_request: r-phoist iarratais a leanúint
+          mention: trácht ar r-phoist fógra
+          reblog: r-phoist fógra a threisiú
+      resubscribe_html: Má dhíliostáil tú de dhearmad, is féidir leat liostáil arís ó do <a href="%{settings_path}">socruithe fógra ríomhphoist</a>.
+      success_html: Ní bhfaighidh tú %{type} le haghaidh Mastodon ar %{domain} chuig do ríomhphost ag %{email} a thuilleadh.
+      title: Díliostáil
+  media_attachments:
+    validations:
+      images_and_video: Ní féidir físeán a cheangal le postáil a bhfuil íomhánna ann cheana féin
+      not_ready: Ní féidir comhaid nach bhfuil próiseáil críochnaithe acu a cheangal. Bain triail eile as i gceann nóiméad!
+      too_many: Ní féidir níos mó ná 4 chomhad a cheangal
+  migrations:
+    acct: Bogtha go
+    cancel: Cealaigh atreorú
+    cancel_explanation: Má chuirtear an t-atreorú ar ceal, déanfar do chuntas reatha a athghníomhú, ach ní thabharfaidh sé seo leantóirí a aistríodh chuig an gcuntas sin ar ais.
+    cancelled_msg: D'éirigh leis an atreorú a chealú.
+    errors:
+      already_moved: an cuntas céanna ar bhog tú chuige cheana
+      missing_also_known_as: nach ailias den chuntas seo é
+      move_to_self: ní féidir é a bheith ina chuntas reatha
+      not_found: níorbh fhéidir a fháil
+      on_cooldown: Tá tú ar fuarú
+    followers_count: Leantóirí ag am aistrithe
+    incoming_migrations: Ag bogadh ó chuntas eile
+    incoming_migrations_html: Chun bogadh ó chuntas eile go dtí an ceann seo, ní mór duit <a href="%{path}">ailias cuntais a chruthú</a> ar dtús.
+    moved_msg: Tá do chuntas á atreorú chuig %{acct} anois agus tá do leantóirí á bhogadh anonn.
+    not_redirecting: Níl do chuntas á atreorú chuig aon chuntas eile faoi láthair.
+    on_cooldown: D'aistrigh tú do chuntas le déanaí. Beidh an fheidhm seo ar fáil arís i gceann %{count} lá.
+    past_migrations: Imirce san am a chuaigh thart
+    proceed_with_move: Bog leantóirí
+    redirected_msg: Tá do chuntas á atreorú chuig %{acct} anois.
+    redirecting_to: Tá do chuntas á atreorú chuig %{acct}.
+    set_redirect: Socraigh atreorú
+    warning:
+      backreference_required: Ní mór an cuntas nua a chumrú ar dtús chun cúltagairt a dhéanamh don cheann seo
+      before: 'Sula dtéann tú ar aghaidh, léigh na nótaí seo go cúramach le do thoil:'
+      cooldown: Tar éis bogadh tá tréimhse feithimh ann nach mbeidh tú in ann bogadh arís
+      disabled_account: Ní bheidh do chuntas reatha inúsáidte go hiomlán ina dhiaidh sin. Mar sin féin, beidh rochtain agat ar onnmhairiú sonraí chomh maith le hathghníomhú.
+      followers: Bogfaidh an gníomh seo gach leantóir ón gcuntas reatha go dtí an cuntas nua
+      only_redirect_html: Nó, ní féidir leat <a href="%{path}">ach atreorú a chur suas ar do phróifíl</a>.
+      other_data: Ní bhogfar aon sonraí eile go huathoibríoch
+      redirect: Déanfar próifíl do chuntais reatha a nuashonrú le fógra atreoraithe agus fágfar as an áireamh é ó chuardaigh
+  moderation:
+    title: Measarthacht
+  move_handler:
+    carry_blocks_over_text: Bhog an t-úsáideoir seo ó %{acct}, rud a chuir tú bac air.
+    carry_mutes_over_text: Bhog an t-úsáideoir seo ó %{acct}, rud a bhalbhaigh tú.
+    copy_account_note_text: 'Bhog an úsáideoir seo ó %{acct}, seo do nótaí roimhe seo fúthu:'
+  navigation:
+    toggle_menu: Scoránaigh roghchlár
   notification_mailer:
     admin:
       report:
         subject: Chuir %{name} tuairisc isteach
+      sign_up:
+        subject: Chláraigh %{name}
+    favourite:
+      body: 'B''fhearr le %{name} do phostáil:'
+      subject: B'fhearr le %{name} do phostáil
+      title: Nua is fearr leat
     follow:
       body: Tá %{name} do do leanúint anois!
       subject: Tá %{name} do do leanúint anois
       title: Leantóirí nua
+    follow_request:
+      action: Bainistigh iarratais leantacha
+      body: D'iarr %{name} tú a leanúint
+      subject: 'Leantóir ar feitheamh: %{name}'
+      title: Iarratas leantach nua
     mention:
       action: Freagair
+      body: 'Luaigh %{name} thú i:'
+      subject: Luaigh %{name} thú
+      title: Lua nua
+    poll:
+      subject: Tháinig deireadh le vótaíocht le %{name}
     reblog:
+      body: 'Treisíodh do phostáil le %{name}:'
       subject: Mhol %{name} do phostáil
       title: Moladh nua
+    status:
+      subject: Tá %{name} díreach postáilte
+    update:
+      subject: Chuir %{name} postáil in eagar
+  notifications:
+    administration_emails: Fógraí r-phoist admin
+    email_events: Imeachtaí le haghaidh fógraí ríomhphoist
+    email_events_hint: 'Roghnaigh imeachtaí ar mhaith leat fógraí a fháil ina leith:'
+  number:
+    human:
+      decimal_units:
+        format: "%n%u"
+        units:
+          billion: B
+          million: M
+          quadrillion: Q
+          thousand: K
+          trillion: T
   otp_authentication:
+    code_hint: Cuir isteach an cód ginte ag d'aip fíordheimhnitheora le deimhniú
+    description_html: Má chumasaíonn tú <strong>fíordheimhniú dhá fhachtóir</strong> ag baint úsáide as aip fíordheimhneora, beidh ort do ghuthán a bheith i seilbh logáil isteach, rud a ghinfidh comharthaí chun tú a chur isteach.
     enable: Cumasaigh
+    instructions_html: "<strong>Scan an cód QR seo isteach i Google Authenticator nó aip eile TOTP ar do ghuthán</strong>. As seo amach, ginfidh an aip sin comharthaí a chaithfidh tú a chur isteach agus tú ag logáil isteach."
+    manual_instructions: 'Mura féidir leat an cód QR a scanadh agus más gá duit é a chur isteach de láimh, seo an rún gnáth-théacs:'
+    setup: Socraigh suas
+    wrong_code: Bhí an cód a iontráladh neamhbhailí! An bhfuil am freastalaí agus am gléis ceart?
   pagination:
     newer: Níos nuaí
     next: An céad eile
     older: Níos sine
     prev: Ceann roimhe seo
+    truncate: "&hellip;"
+  polls:
+    errors:
+      already_voted: Tá tú tar éis vótáil ar an vótaíocht seo cheana féin
+      duplicate_options: go bhfuil míreanna dúblacha
+      duration_too_long: rófhada amach anseo
+      duration_too_short: ró-luath
+      expired: Tá deireadh leis an vótaíocht cheana féin
+      invalid_choice: Níl an rogha vótála roghnaithe ann
+      over_character_limit: ní féidir leis a bheith níos faide ná %{max} carachtar an ceann
+      self_vote: Ní féidir leat vótáil i do phobalbhreith féin
+      too_few_options: caithfidh níos mó ná mír amháin a bheith ann
+      too_many_options: ní féidir níos mó ná %{max} mír a bheith ann
   preferences:
     other: Eile
+    posting_defaults: Réamhshocruithe á bpostáil
+    public_timelines: Amlínte poiblí
+  privacy:
+    hint_html: "<strong>Saincheap conas is mian leat do phróifíl agus do phostálacha a fháil.</strong> Is féidir le gnéithe éagsúla i Mastodon cabhrú leat teacht ar lucht féachana níos leithne nuair atá tú cumasaithe. Tóg nóiméad chun athbhreithniú a dhéanamh ar na socruithe seo chun a chinntiú go n-oireann siad do do chás úsáide."
+    privacy: Príobháideacht
+    privacy_hint_html: Rialú ar an méid is mian leat a nochtadh ar mhaithe le daoine eile. Aimsíonn daoine próifílí suimiúla agus aipeanna fionnuara trí na haipeanna seo a leanas a bhrabhsáil agus a fheiceáil cé na haipeanna a bpostálann siad, ach b’fhéidir gurbh fhearr leat é a choinneáil faoi cheilt.
+    reach: Shroich
+    reach_hint_html: Smacht a fháil ar cé acu is mian leat a fháil amach agus daoine nua a leanúint. Ar mhaith leat do phostálacha a thaispeáint ar an scáileán Explore? Ar mhaith leat go bhfeicfeadh daoine eile tú sna moltaí a leanann siad? Ar mhaith leat glacadh le gach leantóir nua go huathoibríoch, nó smacht gráinneach a bheith agat ar gach leantóir?
+    search: Cuardach
+    search_hint_html: Rialú conas ba mhaith leat a fháil. Ar mhaith leat go bhfaighidh daoine tú tríd an rud a chuir tú suas go poiblí faoi? Ar mhaith leat go bhfaighidh daoine lasmuigh de Mastodon do phróifíl agus iad ag cuardach an ghréasáin? Tabhair faoi deara le do thoil nach féidir eisiamh iomlán ó gach inneall cuardaigh a chinntiú mar fhaisnéis don phobal.
+    title: Príobháideacht agus teacht
+  privacy_policy:
+    title: Beartas Príobháideachais
+  reactions:
+    errors:
+      limit_reached: Teorainn frithghníomhartha éagsúla bainte amach
+      unrecognized_emoji: ní emoji aitheanta é
+  redirects:
+    prompt: Má tá muinín agat as an nasc seo, cliceáil air chun leanúint ar aghaidh.
+    title: Tá tú ag fágáil %{instance}.
   relationships:
+    activity: Gníomhaíocht chuntais
+    confirm_follow_selected_followers: An bhfuil tú cinnte gur mhaith leat na leantóirí roghnaithe a leanúint?
+    confirm_remove_selected_followers: An bhfuil tú cinnte gur mhaith leat na leantóirí roghnaithe a bhaint?
+    confirm_remove_selected_follows: An bhfuil tú cinnte gur mhaith leat na nithe seo a leanas roghnaithe a bhaint?
+    dormant: Díomhaoin
+    follow_failure: Níorbh fhéidir cuid de na cuntais roghnaithe a leanúint.
     follow_selected_followers: Lean leantóirí roghnaithe
     followers: Leantóirí
     following: Ag leanúint
+    invited: Cuireadh
+    last_active: Gníomhach seo caite
+    most_recent: Is déanaí
+    moved: Ar athraíodh a ionad
+    mutual: Frithpháirteach
     primary: Príomha
+    relationship: Gaol
+    remove_selected_domains: Remove all followers from the selected domains
     remove_selected_followers: Bain leantóirí roghnaithe
     remove_selected_follows: Dí-lean úsáideoirí roghnaithe
     status: Stádas cuntais
+  remote_follow:
+    missing_resource: Níorbh fhéidir an URL atreoraithe riachtanach do do chuntas a aimsiú
+  reports:
+    errors:
+      invalid_rules: ní thagraíonn sé do rialacha bailí
   rss:
     content_warning: 'Rabhadh ábhair:'
+    descriptions:
+      account: Postálacha poiblí ó @%{acct}
+      tag: 'Postálacha poiblí clibáilte # %{hashtag}'
+  scheduled_statuses:
+    over_daily_limit: Tá an teorainn de %{limit} postáil sceidealaithe sáraithe agat don lá atá inniu ann
+    over_total_limit: Tá an teorainn de %{limit} postáil sceidealaithe sáraithe agat
+    too_soon: Caithfidh an dáta sceidealta a bheith sa todhchaí
+  self_destruct:
+    lead_html: Ar an drochuair, tá <strong>%{domain}</strong> ag dúnadh síos go buan. Má bhí cuntas agat ann, ní bheidh tú in ann leanúint ar aghaidh á úsáid, ach is féidir leat cúltaca de do shonraí a iarraidh fós.
+    title: Tá an freastalaí seo ag dúnadh
   sessions:
+    activity: An ghníomhaíocht dheireanach
     browser: Brabhsálaí
     browsers:
       alipay: Alipay
@@ -441,41 +1688,162 @@ ga:
       electron: Electron
       firefox: Firefox
       generic: Brabhsálaí anaithnid
+      huawei_browser: Brabhsálaí Huawei
+      ie: Internet Explorer
+      micro_messenger: Micreascannán
+      nokia: Nokia s40 Ovi Brabhsálaí
+      opera: Opera
+      otter: Dobharchú
+      phantom_js: PhantomJS
+      qq: Brabhsálaí QQ
+      safari: Safari
+      uc_browser: Brabhsálaí UC
+      unknown_browser: Brabhsálaí Anaithnid
+      weibo: Weibo
+    current_session: Seisiún reatha
+    date: Dáta
+    description: "%{browser} ar %{platform}"
+    explanation: Seo iad na brabhsálaithe gréasáin atá logáilte isteach i do chuntas Mastodon faoi láthair.
+    ip: IP
     platforms:
+      adobe_air: Adobe Air
       android: Android
       blackberry: BlackBerry
       chrome_os: ChromeOS
       firefox_os: Firefox OS
       ios: iOS
+      kai_os: KaiOS
       linux: Linux
       mac: macOS
+      unknown_platform: Ardán Anaithnid
       windows: Windows
       windows_mobile: Windows Mobile
       windows_phone: Windows Phone
+    revoke: Aisghair
+    revoke_success: Seisiún aisghairthe go rathúil
     title: Seisiúin
+    view_authentication_history: Féach ar stair fíordheimhnithe do chuntais
   settings:
     account: Cuntas
     account_settings: Socruithe cuntais
+    aliases: Ailiasanna cuntais
     appearance: Cuma
+    authorized_apps: Aipeanna údaraithe
     back: Ar ais go Mastodon
+    delete: Scriosadh cuntais
     development: Forbairt
     edit_profile: Cuir an phróifíl in eagar
+    export: Easpórtáil sonraí
+    featured_tags: Haischlib faoi thrácht
     import: Iompórtáil
+    import_and_export: Iompórtáil agus easpórtáil
+    migrate: Imirce cuntais
+    notifications: Fógraí ríomhphoist
     preferences: Sainroghanna pearsanta
     profile: Próifíl
+    relationships: Leantóirí agus leanúna
+    severed_relationships: Caidrimh dhearfa
+    statuses_cleanup: Uathscriosadh postála
+    strikes: Stailceanna measarthachta
+    two_factor_authentication: Údar dhá-fhachtóir
     webauthn_authentication: Eochracha slándála
+  severed_relationships:
+    download: Íoslódáil (%{count})
+    event_type:
+      account_suspension: Fionraí cuntais (%{target_name})
+      domain_block: Freastalaí ar fionraí (%{target_name})
+      user_domain_block: Chuir tú bac ar %{target_name}
+    lost_followers: Leanúna caillte
+    lost_follows: Seo a leanas caillte
+    preamble: Seans go gcaillfidh tú seo a leanas agus a leantóirí nuair a bhacálann tú fearann ​​nó nuair a shocraíonn do mhodhnóirí cianfhreastalaí a chur ar fionraí. Nuair a tharlaíonn sé sin, beidh tú in ann liostaí de chaidreamh deighilte a íoslódáil, lena n-iniúchadh agus b'fhéidir iompórtáil ar fhreastalaí eile.
+    purged: Glanadh faisnéis faoin bhfreastalaí seo ag riarthóirí do fhreastalaí.
+    type: Imeacht
   statuses:
+    attached:
+      audio:
+        few: "%{count} fuaime"
+        many: "%{count} fuaime"
+        one: "%{count} fuaime"
+        other: "%{count} fuaime"
+        two: "%{count} fuaime"
+      description: 'Ceangailte: %{attached}'
+      image:
+        few: "%{count} híomhánna"
+        many: "%{count} híomhánna"
+        one: "%{count} íomhá"
+        other: "%{count} híomhánna"
+        two: "%{count} híomhánna"
+      video:
+        few: "%{count} físeáin"
+        many: "%{count} físeáin"
+        one: "%{count} físeán"
+        other: "%{count} físeáin"
+        two: "%{count} físeáin"
     boosted_from_html: Molta ó %{acct_link}
     content_warning: 'Rabhadh ábhair: %{warning}'
+    default_language: Mar an gcéanna le teanga an chomhéadain
+    disallowed_hashtags:
+      few: 'bhí na Haischlib dícheadaithe: %{tags}'
+      many: 'bhí na Haischlib dícheadaithe: %{tags}'
+      one: 'bhí haischlib dícheadaithe: %{tags}'
+      other: 'bhí na Haischlib dícheadaithe: %{tags}'
+      two: 'bhí na Haischlib dícheadaithe: %{tags}'
+    edited_at_html: "%{date} curtha in eagar"
+    errors:
+      in_reply_not_found: Is cosúil nach ann don phostáil a bhfuil tú ag iarraidh freagra a thabhairt air.
+    open_in_web: Oscail i ngréasán
+    over_character_limit: teorainn carachtar %{max} sáraithe
+    pin_errors:
+      direct: Ní féidir postálacha nach bhfuil le feiceáil ach ag úsáideoirí luaite a phinnáil
+      limit: Tá uaslíon na bpostálacha pinn agat cheana féin
+      ownership: Ní féidir postáil duine éigin eile a phionnáil
+      reblog: Ní féidir treisiú a phinnáil
     poll:
+      total_people:
+        few: "%{count} daoine"
+        many: "%{count} daoine"
+        one: "%{count} duine"
+        other: "%{count} daoine"
+        two: "%{count} daoine"
+      total_votes:
+        few: "%{count} vótaí"
+        many: "%{count} vótaí"
+        one: "%{count} vóta"
+        other: "%{count} vótaí"
+        two: "%{count} vótaí"
       vote: Vótáil
     show_more: Taispeáin níos mó
     show_thread: Taispeáin snáithe
+    title: '%{name}: "%{quote}"'
     visibilities:
+      direct: Díreach
       private: Leantóirí amháin
       private_long: Taispeáin do leantóirí amháin
+      public: Poiblí
+      public_long: Is féidir le gach duine a fheiceáil
+      unlisted: Neamhliostaithe
+      unlisted_long: Is féidir le gach duine a fheiceáil, ach nach bhfuil liostaithe ar amlínte poiblí
   statuses_cleanup:
+    enabled: Scrios seanphostálacha go huathoibríoch
+    enabled_hint: Scriostar do phostálacha go huathoibríoch nuair a shroicheann siad tairseach aoise sonraithe, ach amháin má thagann siad le ceann de na heisceachtaí thíos
+    exceptions: Eisceachtaí
+    explanation: Toisc gur oibríocht chostasach é postálacha a scriosadh, déantar é seo go mall le himeacht ama nuair nach mbíonn an freastalaí gnóthach ar bhealach eile. Ar an ábhar sin, d’fhéadfadh sé go scriosfar do phostálacha tamall tar éis dóibh an tairseach aoise a bhaint amach.
     ignore_favs: Tabhair neamhaird ar toghanna
+    ignore_reblogs: Déan neamhaird de boosts
+    interaction_exceptions: Eisceachtaí bunaithe ar idirghníomhaíochtaí
+    interaction_exceptions_explanation: Tabhair faoi deara nach bhfuil aon ráthaíocht go scriosfar postálacha má théann siad faoi bhun na tairsí is ansa leat nó an teanndáileog tar éis dóibh dul thar iad uair amháin.
+    keep_direct: Coinnigh teachtaireachtaí díreacha
+    keep_direct_hint: Ní scriosann sé aon cheann de do theachtaireachtaí díreacha
+    keep_media: Coinnigh postálacha le ceangaltáin meán
+    keep_media_hint: Ní scriosann sé aon cheann de do phostálacha a bhfuil ceangaltáin meán acu
+    keep_pinned: Coinnigh postálacha pinn
+    keep_pinned_hint: Ní scriosann sé aon cheann de do phostálacha pinn
+    keep_polls: Coinnigh pobalbhreith
+    keep_polls_hint: Ní scriosann sé aon cheann de do vótaíochtaí
+    keep_self_bookmark: Coinnigh postálacha leabharmharcáilte agat
+    keep_self_bookmark_hint: Ní scriosann sé do phostálacha féin má tá leabharmharcáilte agat
+    keep_self_fav: Coinnigh na poist a thaitin leat
+    keep_self_fav_hint: Ní scriosann sé do phostálacha féin más fearr leat iad
     min_age:
       '1209600': Coicís
       '15778476': 6 mhí
@@ -485,20 +1853,182 @@ ga:
       '604800': Seachtain amháin
       '63113904': 2 bhliain
       '7889238': 3 mhí
+    min_age_label: Tairseach aoise
+    min_favs: Coinnigh na poist is fearr leat ar a laghad
+    min_favs_hint: Ní scriosann sé aon cheann de do phostálacha a fuair ar a laghad an líon ceanán seo. Fág bán chun postálacha a scriosadh beag beann ar líon na gceanán atá acu
+    min_reblogs: Coinnigh postálacha treisithe ar a laghad
+    min_reblogs_hint: Ní scriosann sé aon cheann de do phostálacha a cuireadh leis an líon seo uaireanta ar a laghad. Fág bán chun postálacha a scriosadh beag beann ar a líon teanndáileog
   stream_entries:
     sensitive_content: Ábhar íogair
+  strikes:
+    errors:
+      too_late: Tá sé ró-dhéanach achomharc a dhéanamh faoin stailc seo
+  tags:
+    does_not_match_previous_name: nach meaitseálann an t-ainm roimhe seo
+  themes:
+    contrast: Mastodon (Codarsnacht ard)
+    default: Mastodon (Dorcha)
+    mastodon-light: Mastodon (Solas)
+    system: Uathoibríoch (úsáid téama córais)
+  time:
+    formats:
+      default: "%b %d, %Y, %H:%M"
+      month: "%b %Y"
+      time: "%H:%M"
+      with_time_zone: "%b %d, %Y, %H:%M %Z"
+  translation:
+    errors:
+      quota_exceeded: Sáraíodh an cuóta úsáide uile-fhreastalaí don tseirbhís aistriúcháin.
+      too_many_requests: Tá an iomarca iarratas ar an tseirbhís aistriúcháin le déanaí.
   two_factor_authentication:
+    add: Cuir
+    disable: Díchumasaigh 2FA
+    disabled_success: D'éirigh le fíordheimhniú dhá-fhachtóir a dhíchumasú
     edit: Cuir in eagar
+    enabled: Tá fíordheimhniú dhá fhachtóir cumasaithe
+    enabled_success: D'éirigh le fíordheimhniú dhá fhachtóir a chumasú
+    generate_recovery_codes: Gin cóid athshlánaithe
+    lost_recovery_codes: Ligeann cóid athshlánaithe duit rochtain a fháil ar do chuntas arís má chailleann tú do ghuthán. Má tá do chóid athshlánaithe caillte agat, is féidir leat iad a athnuachan anseo. Déanfar do sheanchóid athshlánaithe a neamhbhailíochtú.
+    methods: Modhanna dhá-fhachtóir
+    otp: Aip fíordheimhnitheora
+    recovery_codes: Cóid aisghabhála cúltaca
+    recovery_codes_regenerated: D'éirigh le hathghiniúint cóid athshlánaithe
+    recovery_instructions_html: Má chailleann tú rochtain ar do ghuthán riamh, is féidir leat ceann de na cóid athshlánaithe thíos a úsáid chun rochtain a fháil ar do chuntas arís. <strong>Coinnigh na cóid athshlánaithe slán</strong>. Mar shampla, is féidir leat iad a phriontáil agus iad a stóráil le doiciméid thábhachtacha eile.
     webauthn: Eochracha slándála
   user_mailer:
+    appeal_approved:
+      action: Socruithe cuntas
+      explanation: Ceadaíodh achomharc na stailce i gcoinne do chuntais ar %{strike_date} a chuir tú isteach ar %{appeal_date}. Tá seasamh maith ag do chuntas arís.
+      subject: Ceadaíodh d'achomharc ó %{date}
+      subtitle: Tá seasamh maith ag do chuntas arís.
+      title: Achomharc ceadaithe
+    appeal_rejected:
+      explanation: Diúltaíodh d'achomharc na stailce in aghaidh do chuntais ar %{strike_date} a chuir tú isteach ar %{appeal_date}.
+      subject: Diúltaíodh do d'achomharc ó %{date}
+      subtitle: Diúltaíodh do d'achomharc.
+      title: Diúltaíodh don achomharc
+    backup_ready:
+      explanation: D'iarr tú cúltaca iomlán de do chuntas Mastodon.
+      extra: Tá sé réidh le híoslódáil anois!
+      subject: Tá do chartlann réidh le híoslódáil
+      title: Tógáil cartlainne
+    failed_2fa:
+      details: 'Seo sonraí na hiarrachta síniú isteach:'
+      explanation: Rinne duine éigin iarracht síniú isteach ar do chuntas ach sholáthair sé fachtóir fíordheimhnithe dara neamhbhailí.
+      further_actions_html: Mura tusa a bhí ann, molaimid duit %{action} a dhéanamh láithreach toisc go bhféadfadh sé a bheith i gcontúirt.
+      subject: Teip fíordheimhnithe dara fachtóir
+      title: Theip ar fhíordheimhniú an dara fachtóir
+    suspicious_sign_in:
+      change_password: do phasfhocal a athrú
+      details: 'Seo sonraí faoin síniú isteach:'
+      explanation: Bhraitheamar síniú isteach ar do chuntas ó sheoladh IP nua.
+      further_actions_html: Mura tusa a bhí ann, molaimid duit %{action} a dhéanamh láithreach agus fíordheimhniú dhá fhachtóir a chumasú chun do chuntas a choinneáil slán.
+      subject: Fuarthas rochtain ar do chuntas ó sheoladh IP nua
+      title: Síniú isteach nua
     warning:
       appeal: Cuir achomharc isteach
+      appeal_description: Má chreideann tú gur earráid é seo, is féidir leat achomharc a chur isteach chuig foireann %{instance}.
       categories:
         spam: Turscar
+        violation: Sáraíonn ábhar na treoirlínte pobail seo a leanas
+      explanation:
+        delete_statuses: Fuarthas amach gur sháraigh roinnt de do chuid postálacha treoirlínte pobail amháin nó níos mó agus bhain modhnóirí %{instance} iad ina dhiaidh sin.
+        disable: Ní féidir leat do chuntas a úsáid a thuilleadh, ach fanann do phróifíl agus sonraí eile slán. Is féidir leat cúltaca de do shonraí a iarraidh, socruithe cuntais a athrú nó do chuntas a scriosadh.
+        mark_statuses_as_sensitive: Tá cuid de do chuid postálacha marcáilte mar íogair ag modhnóirí %{instance}. Ciallaíonn sé seo go mbeidh ar dhaoine na meáin a thapáil sna poist sula dtaispeánfar réamhamharc. Is féidir leat na meáin a mharcáil mar íogair tú féin agus tú ag postáil amach anseo.
+        sensitive: As seo amach, beidh gach do chomhaid meán uaslódáilte a mharcáil mar íogair agus i bhfolach taobh thiar de rabhadh cliceáil-trí.
+        silence: Is féidir leat do chuntas a úsáid go fóill ach ní fheicfidh ach na daoine atá ag leanúint ort cheana féin do phostálacha ar an bhfreastalaí seo, agus seans go mbeidh tú eisiata ó ghnéithe éagsúla fionnachtana. Féadfaidh daoine eile tú a leanúint de láimh, áfach.
+        suspend: Ní féidir leat do chuntas a úsáid a thuilleadh, agus níl rochtain ar do phróifíl ná ar shonraí eile a thuilleadh. Is féidir leat logáil isteach fós chun cúltaca de do shonraí a iarraidh go dtí go mbaintear na sonraí go hiomlán i gceann thart ar 30 lá, ach coinneoimid roinnt sonraí bunúsacha chun cosc ​​a chur ort an fionraí a sheachaint.
       reason: 'Fáth:'
+      statuses: 'Postálacha a luadh:'
       subject:
+        delete_statuses: Baineadh do phostálacha ar %{acct}
+        disable: Tá do chuntas %{acct} reoite
+        mark_statuses_as_sensitive: Marcáladh do phostálacha ar %{acct} mar íogair
         none: Rabhadh do %{acct}
+        sensitive: Marcálfar do phostálacha ar %{acct} mar íogair as seo amach
+        silence: Tá do chuntas %{acct} teoranta
+        suspend: Tá do chuntas %{acct} curtha ar fionraí
       title:
+        delete_statuses: Baineadh postálacha
+        disable: Cuntas reoite
+        mark_statuses_as_sensitive: Postálacha marcáilte mar íogair
         none: Rabhadh
+        sensitive: Cuntas marcáilte mar íogair
+        silence: Cuntas teoranta
+        suspend: Cuntas ar fionraí
+    welcome:
+      apps_android_action: Faigh é ar Google Play
+      apps_ios_action: Íoslódáil ar an App Store
+      apps_step: Íoslódáil ár n-aipanna oifigiúla.
+      apps_title: Aipeanna Mastodon
+      checklist_subtitle: 'Cuirimis tús leat ar an teorainn shóisialta nua seo:'
+      checklist_title: Seicliosta Fáilte
+      edit_profile_action: Pearsanú
+      edit_profile_step: Cuir le d'idirghníomhaíochtaí trí phróifíl chuimsitheach a bheith agat.
+      edit_profile_title: Déan do phróifíl a phearsantú
+      explanation: Seo roinnt leideanna chun tú a chur ar bun
+      feature_action: Foghlaim níos mó
+      feature_audience: Soláthraíonn Mastodon deis uathúil duit do lucht féachana a bhainistiú gan fir lár. Ligeann Mastodon a imlonnaítear ar do bhonneagar féin duit leanúint agus leanúint ó aon fhreastalaí Mastodon eile ar líne agus níl sé faoi smacht aon duine ach mise.
+      feature_audience_title: Tóg do lucht féachana faoi rún
+      feature_control: Is fearr a fhios agat cad ba mhaith leat a fheiceáil ar do bheathú baile. Gan algartam nó fógraí chun do chuid ama a chur amú. Lean aon duine ar fud aon fhreastalaí Mastodon ó chuntas amháin agus faigh a gcuid post in ord croineolaíoch, agus déan do chúinne den idirlíon beagán níos mó cosúil leatsa.
+      feature_control_title: Coinnigh smacht ar d’amlíne féin
+      feature_creativity: Tacaíonn Mastodon le postálacha fuaime, físe agus pictiúr, tuairiscí inrochtaineachta, pobalbhreitheanna, rabhaidh inneachair, avatars beoite, emojis saincheaptha, rialú barr mionsamhlacha, agus níos mó, chun cabhrú leat tú féin a chur in iúl ar líne. Cibé an bhfuil do chuid ealaíne, do cheol nó do phodchraoladh á fhoilsiú agat, tá Mastodon ann duit.
+      feature_creativity_title: Cruthaitheacht gan sárú
+      feature_moderation: Cuireann Mastodon cinnteoireacht ar ais i do lámha. Cruthaíonn gach freastalaí a rialacha agus a rialacháin féin, a chuirtear i bhfeidhm go háitiúil agus nach bhfuil ó bharr anuas cosúil le meáin shóisialta chorparáideacha, rud a fhágann gurb é an ceann is solúbtha é chun freagairt do riachtanais grúpaí éagsúla daoine. Bí ar fhreastalaí leis na rialacha a n-aontaíonn tú leo, nó do chuid féin a óstáil.
+      feature_moderation_title: Ag maolú ar an mbealach ar cheart dó a bheith
+      follow_action: Lean
+      follow_step: Is éard atá i gceist le daoine suimiúla a leanúint ná Mastodon.
+      follow_title: Cuir do chuid fotha baile in oiriúint duit féin
+      follows_subtitle: Lean cuntais aitheanta
+      follows_title: Cé a leanúint
+      follows_view_more: Féach ar níos mó daoine a leanúint
+      hashtags_recent_count:
+        few: "%{people} daoine le 2 lá anuas"
+        many: "%{people} daoine le 2 lá anuas"
+        one: "%{people} duine le 2 lá anuas"
+        other: "%{people} daoine le 2 lá anuas"
+        two: "%{people} daoine le 2 lá anuas"
+      hashtags_subtitle: Déan iniúchadh ar a bhfuil ag dul chun cinn le 2 lá anuas
+      hashtags_title: Haischlib treochta
+      hashtags_view_more: Féach ar níos mó Haischlib treochta
+      post_action: Cum
+      post_step: Abair hello leis an domhan le téacs, grianghraif, físeáin, nó pobalbhreith.
+      post_title: Déan do chéad phostáil
+      share_action: Comhroinn
+      share_step: Cuir in iúl do do chairde conas tú a aimsiú ar Mastodon.
+      share_title: Roinn do phróifíl Mastodon
+      sign_in_action: Sínigh isteach
+      subject: Fáilte go Mastodon
+      title: Fáilte ar bord, %{name}!
+  users:
+    follow_limit_reached: Ní féidir leat níos mó ná %{limit} duine a leanúint
+    go_to_sso_account_settings: Téigh chuig socruithe cuntais do sholáthraí aitheantais
+    invalid_otp_token: Cód dhá-fhachtóir neamhbhailí
+    otp_lost_help_html: Má chaill tú rochtain ar an dá cheann, is féidir leat dul i dteagmháil le %{email}
+    rate_limited: An iomarca iarrachtaí fíordheimhnithe, bain triail eile as ar ball.
+    seamless_external_login: Tá tú logáilte isteach trí sheirbhís sheachtrach, mar sin níl socruithe pasfhocail agus ríomhphoist ar fáil.
+    signed_in_as: 'Sínithe isteach mar:'
+  verification:
+    extra_instructions_html: <strong>Leid:</strong> Is féidir an nasc ar do shuíomh Gréasáin a bheith dofheicthe. Is í an chuid thábhachtach ná <code>rel="me"</code> a chuireann cosc ​​ar phearsanú ar shuímh Ghréasáin a bhfuil inneachar a ghintear leis an úsáideoir. Is féidir leat fiú clib <code>nasc</code> a úsáid i gceanntásc an leathanaigh in ionad <code>a</code>, ach caithfidh an HTML a bheith inrochtana gan JavaScript a chur i gcrích.
+    here_is_how: Seo é an chaoi
+    hint_html: "<strong>Is do chách é d'aitheantas a fhíorú ar Mastodon.</strong> Bunaithe ar chaighdeáin oscailte gréasáin, saor in aisce anois agus go deo. Níl uait ach láithreán gréasáin pearsanta a aithníonn daoine thú. Nuair a nascann tú leis an suíomh Gréasáin seo ó do phróifíl, seiceóimid go bhfuil nasc idir an suíomh Gréasáin agus do phróifíl agus taispeánfaimid táscaire amhairc air."
+    instructions_html: Cóipeáil agus greamaigh an cód thíos isteach i HTML do shuíomh Gréasáin. Ansin cuir seoladh do shuíomh Gréasáin isteach i gceann de na réimsí breise ar do phróifíl ón gcluaisín "Cuir próifíl in eagar" agus sábháil athruithe.
+    verification: Fíorú
+    verified_links: Do naisc fhíoraithe
   webauthn_credentials:
+    add: Cuir eochair shlándála nua leis
+    create:
+      error: Bhí fadhb ann agus d'eochair shlándála á cur leis. Arís, le d'thoil.
+      success: Cuireadh d'eochair shlándála leis.
     delete: Scrios
+    delete_confirmation: An bhfuil tú cinnte gur mhaith leat an eochair shlándála seo a scriosadh?
+    description_html: Má chumasaíonn tú <strong>fíordheimhniú eochrach slándála</strong>, beidh ort ceann de na heochracha slándála a úsáid chun logáil isteach.
+    destroy:
+      error: Bhí fadhb ann agus d'eochair shlándála á scriosadh. Arís, le d'thoil.
+      success: Scriosadh d'eochair shlándála go rathúil.
+    invalid_credential: Eochair shlándála neamhbhailí
+    nickname_hint: Cuir isteach leasainm d'eochair shlándála nua
+    not_enabled: Níl WebAuthn cumasaithe agat fós
+    not_supported: This browser doesn't support security keys
+    otp_required: To use security keys please enable two-factor authentication first.
+    registered_on: Registered on %{date}
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index c9f08dcad74d3a..d1c8633badd602 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -226,6 +226,7 @@ gl:
         update_custom_emoji: Actualizar emoticona personalizada
         update_domain_block: Actualizar bloqueo do dominio
         update_ip_block: Actualizar regra IP
+        update_report: Actualización da denuncia
         update_status: Actualizar publicación
         update_user_role: Actualizar Rol
       actions:
@@ -638,6 +639,7 @@ gl:
       report: 'Denuncia #%{id}'
       reported_account: Conta denunciada
       reported_by: Denunciado por
+      reported_with_application: Denunciado coa aplicación
       resolved: Resolto
       resolved_msg: Resolveuse con éxito a denuncia!
       skip_to_actions: Ir a accións
diff --git a/config/locales/hi.yml b/config/locales/hi.yml
index b67de192f2563e..0bfc30027abef7 100644
--- a/config/locales/hi.yml
+++ b/config/locales/hi.yml
@@ -32,6 +32,8 @@ hi:
       silence: सीमा
       silenced: सीमित
       title: खाते
+    reports:
+      reported_with_application: एप्लीकेशन से रिपोर्ट किया गया
     system_checks:
       upload_check_privacy_error:
         message_html: "<strong> आपके वेब सर्वर का कन्फिगरेशन सही नहीं है। उपयोगकर्ताओं की निजता खतरे में है। </strong>"
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 5def03d902a367..df32bd39d116f7 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -226,7 +226,7 @@ hu:
         update_custom_emoji: Egyéni emodzsi frissítése
         update_domain_block: Domain tiltás frissítése
         update_ip_block: IP-szabály frissítése
-        update_report: Bejelentés Frissítése
+        update_report: Bejelentés frissítése
         update_status: Bejegyzés frissítése
         update_user_role: Szerepkör frissítése
       actions:
diff --git a/config/locales/simple_form.bg.yml b/config/locales/simple_form.bg.yml
index f14a21b0c70036..564f72e8c21231 100644
--- a/config/locales/simple_form.bg.yml
+++ b/config/locales/simple_form.bg.yml
@@ -211,6 +211,7 @@ bg:
         setting_default_privacy: Поверителност на публикуване
         setting_default_sensitive: Все да се бележи мултимедията като деликатна
         setting_delete_modal: Показване на прозорче за потвърждение преди изтриване на публикация
+        setting_disable_hover_cards: Изключване на прегледа на профила, премествайки показалеца отгоре
         setting_disable_swiping: Деактивиране на бързо плъзгащи движения
         setting_display_media: Показване на мултимедия
         setting_display_media_default: Стандартно
@@ -242,11 +243,13 @@ bg:
           warn: Скриване зад предупреждение
       form_admin_settings:
         activity_api_enabled: Публикуване на агрегатна статистика относно потребителската дейност в API
+        app_icon: Икона на приложение
         backups_retention_period: Период за съхранение на потребителския архив
         bootstrap_timeline_accounts: Винаги да се препоръчват следните акаунти на нови потребители
         closed_registrations_message: Съобщение при неналична регистрация
         content_cache_retention_period: Период на запазване на отдалечено съдържание
         custom_css: Персонализиран CSS
+        favicon: Сайтоикона
         mascot: Плашило талисман по избор (остаряло)
         media_cache_retention_period: Период на запазване на мултимедийния кеш
         peers_api_enabled: Публикуване на списъка с открити сървъри в API
diff --git a/config/locales/simple_form.ga.yml b/config/locales/simple_form.ga.yml
index 3597544ce3a623..2effe1a10cc7a0 100644
--- a/config/locales/simple_form.ga.yml
+++ b/config/locales/simple_form.ga.yml
@@ -2,47 +2,239 @@
 ga:
   simple_form:
     hints:
+      account:
+        discoverable: Seans go mbeidh do phostálacha poiblí agus do phróifíl le feiceáil nó molta i réimsí éagsúla de Mastodon agus is féidir do phróifíl a mholadh d’úsáideoirí eile.
+        display_name: D'ainm iomlán nó d'ainm spraoi.
+        fields: Do leathanach baile, forainmneacha, aois, rud ar bith is mian leat.
+        indexable: Seans go mbeidh do phostálacha poiblí le feiceáil sna torthaí cuardaigh ar Mastodon. Seans go mbeidh daoine a d’idirghníomhaigh le do phostálacha in ann iad a chuardach beag beann ar.
+        note: 'Is féidir leat @trá a dhéanamh ar dhaoine eile nó #hashtags.'
+        show_collections: Beidh daoine in ann brabhsáil trí do seo a leanas agus do leanúna. Feicfidh na daoine a leanann tú go leanann tú iad beag beann ar.
+        unlocked: Beidh daoine in ann tú a leanúint gan cead a iarraidh. Díthiceáil an dteastaíonn uait athbhreithniú a dhéanamh ar iarratais leantacha agus roghnaigh cé acu an nglacfaidh nó an diúltóidh tú do leantóirí nua.
       account_alias:
         acct: Sonraigh ainm@fearann don chuntas ar mhaith leat aistriú uaidh
       account_migration:
         acct: Sonraigh ainm@fearann don chuntas ar mhaith leat aistriú chuige
+      account_warning_preset:
+        text: Is féidir leat comhréir na bpost a úsáid, mar URLanna, hashtags agus lua
+        title: Roghnach. Níl sé le feiceáil ag an bhfaighteoir
       admin_account_action:
+        include_statuses: Feicfidh an t-úsáideoir cé na poist ba chúis leis an ngníomh modhnóireachta nó leis an rabhadh
+        send_email_notification: Gheobhaidh an t-úsáideoir míniú ar an méid a tharla lena chuntas
+        text_html: Roghnach. Is féidir leat comhréir phoist a úsáid. Is féidir leat <a href="%{path}">réamhshocruithe rabhaidh a chur leis</a> chun am a shábháil
+        type_html: Roghnaigh cad atá le déanamh le <strong>%{acct}</strong>
         types:
           disable: Cuir cosc ar an úsáideoir a chuntas a úsáid, ach ná scrios ná folaigh a bhfuil ann.
+          none: Bain úsáid as seo chun rabhadh a sheoladh chuig an úsáideoir, gan aon ghníomh eile a spreagadh.
+          sensitive: Iallach a chur ar cheangaltáin meán an úsáideora seo go léir a bheith íogair.
+          silence: Cosc a chur ar an úsáideoir ó bheith in ann postáil le hinfheictheacht phoiblí, a gcuid postálacha agus fógraí a cheilt ar dhaoine nach leanann iad. Dúnann sé gach tuairisc i gcoinne an chuntais seo.
+          suspend: Cosc ar aon idirghníomhaíocht ón gcuntas seo nó chuig an gcuntas seo agus scrios a bhfuil ann. Inchúlaithe laistigh de 30 lá. Dúnann sé gach tuairisc i gcoinne an chuntais seo.
+        warning_preset_id: Roghnach. Is féidir leat téacs saincheaptha a chur le deireadh an réamhshocraithe fós
+      announcement:
+        all_day: Nuair a dhéantar iad a sheiceáil, ní thaispeánfar ach dátaí an raon ama
+        ends_at: Roghnach. Beidh an fógra neamhfhoilsithe go huathoibríoch ag an am seo
+        scheduled_at: Fág bán chun an fógra a fhoilsiú láithreach
+        starts_at: Roghnach. I gcás go bhfuil d'fhógra ceangailte le raon ama ar leith
+        text: Is féidir leat comhréir phoist a úsáid. Tabhair aird ar an spás a ghlacfaidh an fógra ar scáileán an úsáideora
+      appeal:
+        text: Ní féidir leat achomharc a dhéanamh ach uair amháin ar stailc
       defaults:
+        autofollow: Leanfaidh daoine a chláraíonn tríd an gcuireadh thú go huathoibríoch
+        avatar: WEBP, PNG, GIF nó JPG. %{size} ar a mhéad. Íoslaghdófar é go %{dimensions}px
+        bot: Cuir in iúl do dhaoine eile go ndéanann an cuntas gníomhartha uathoibrithe den chuid is mó agus go mb’fhéidir nach ndéanfar monatóireacht air
+        context: Comhthéacs amháin nó comhthéacsanna iolracha inar cheart go mbeadh feidhm ag an scagaire
+        current_password: Chun críocha slándála cuir isteach pasfhocal an chuntais reatha
+        current_username: Le deimhniú, cuir isteach ainm úsáideora an chuntais reatha
+        digest: Seoltar é tar éis tréimhse fhada neamhghníomhaíochta amháin agus sa chás sin amháin go bhfuil aon teachtaireachtaí pearsanta faighte agat agus tú as láthair
+        email: Seolfar ríomhphost deimhnithe chugat
+        header: WEBP, PNG, GIF nó JPG. %{size} ar a mhéad. Íoslaghdófar é go %{dimensions}px
+        inbox_url: Cóipeáil an URL ó leathanach tosaigh an athsheachadáin is mian leat a úsáid
+        irreversible: Imeoidh postálacha scagtha go dochúlaithe, fiú má bhaintear an scagaire níos déanaí
+        locale: Teanga an chomhéadain úsáideora, r-phoist agus fógraí brú
+        password: Úsáid ar a laghad 8 gcarachtar
+        phrase: Déanfar é a mheaitseáil beag beann ar chásáil an téacs nó ar an ábhar atá ag tabhairt foláireamh do phostáil
+        scopes: Cé na APIanna a mbeidh cead ag an bhfeidhmchlár rochtain a fháil orthu. Má roghnaíonn tú raon feidhme barrleibhéil, ní gá duit cinn aonair a roghnú.
+        setting_aggregate_reblogs: Ná taispeáin treisithe nua do phoist a treisíodh le déanaí (ní dhéanann difear ach do threisithe nuafhaighte)
+        setting_always_send_emails: Go hiondúil ní sheolfar fógraí ríomhphoist agus tú ag úsáid Mastodon go gníomhach
+        setting_default_sensitive: Tá meáin íogair i bhfolach de réir réamhshocraithe agus is féidir iad a nochtadh le cliceáil
+        setting_display_media_default: Folaigh meáin atá marcáilte mar íogair
         setting_display_media_hide_all: Folaigh meáin i gcónaí
         setting_display_media_show_all: Taispeáin meáin i gcónaí
+        setting_use_blurhash: Tá grádáin bunaithe ar dhathanna na n-amharcanna ceilte ach cuireann siad salach ar aon mhionsonraí
+        setting_use_pending_items: Folaigh nuashonruithe amlíne taobh thiar de chlic seachas an fotha a scrollú go huathoibríoch
+        username: Is féidir leat litreacha, uimhreacha, agus béim a úsáid
+        whole_word: Nuair a bhíonn an eochairfhocal nó frása alfa-uimhriúil amháin, ní chuirfear i bhfeidhm é ach amháin má mheaitseálann sé an focal iomlán
+      domain_allow:
+        domain: Beidh an fearann ​​seo in ann sonraí a fháil ón bhfreastalaí seo agus déanfar sonraí a thagann isteach uaidh a phróiseáil agus a stóráil
+      email_domain_block:
+        domain: Is féidir gurb é seo an t-ainm fearainn a thaispeánann sa seoladh ríomhphoist nó sa taifead MX a úsáideann sé. Déanfar iad a sheiceáil nuair a chláraítear iad.
+        with_dns_records: Déanfar iarracht taifid DNS an fhearainn tugtha a réiteach agus cuirfear bac ar na torthaí freisin
+      featured_tag:
+        name: 'Seo cuid de na hashtags a d’úsáid tú le déanaí:'
+      filters:
+        action: Roghnaigh an gníomh ba cheart a dhéanamh nuair a mheaitseálann postáil an scagaire
+        actions:
+          hide: Cuir an t-ábhar scagtha i bhfolach go hiomlán, ag iompar amhail is nach raibh sé ann
+          warn: Folaigh an t-ábhar scagtha taobh thiar de rabhadh a luann teideal an scagaire
+      form_admin_settings:
+        activity_api_enabled: Áireamh na bpost a foilsíodh go háitiúil, úsáideoirí gníomhacha, agus clárúcháin nua i buicéid seachtainiúla
+        app_icon: WEBP, PNG, GIF nó JPG. Sáraíonn sé an deilbhín réamhshocraithe aipe ar ghléasanna soghluaiste le deilbhín saincheaptha.
+        backups_retention_period: Tá an cumas ag úsáideoirí cartlanna dá gcuid post a ghiniúint le híoslódáil níos déanaí. Nuair a bheidh luach dearfach socraithe, scriosfar na cartlanna seo go huathoibríoch ó do stór tar éis an líon sonraithe laethanta.
+        bootstrap_timeline_accounts: Cuirfear na cuntais seo ar bharr na moltaí a leanann úsáideoirí nua.
+        closed_registrations_message: Ar taispeáint nuair a dhúntar clárúcháin
+        content_cache_retention_period: Scriosfar gach postáil ó fhreastalaithe eile (lena n-áirítear treisithe agus freagraí) tar éis an líon sonraithe laethanta, gan aird ar aon idirghníomhaíocht úsáideora áitiúil leis na postálacha sin. Áirítear leis seo postálacha ina bhfuil úsáideoir áitiúil tar éis é a mharcáil mar leabharmharcanna nó mar cheanáin. Caillfear tagairtí príobháideacha idir úsáideoirí ó chásanna éagsúla freisin agus ní féidir iad a athchóiriú. Tá úsáid an tsocraithe seo beartaithe le haghaidh cásanna sainchuspóra agus sáraítear go leor ionchais úsáideoirí nuair a chuirtear i bhfeidhm é le haghaidh úsáid ghinearálta.
+        custom_css: Is féidir leat stíleanna saincheaptha a chur i bhfeidhm ar an leagan gréasáin de Mastodon.
+        favicon: WEBP, PNG, GIF nó JPG. Sáraíonn sé an favicon Mastodon réamhshocraithe le deilbhín saincheaptha.
+        mascot: Sáraíonn sé an léaráid san ardchomhéadan gréasáin.
+        media_cache_retention_period: Déantar comhaid meán ó phoist a dhéanann cianúsáideoirí a thaisceadh ar do fhreastalaí. Nuair a bheidh luach dearfach socraithe, scriosfar na meáin tar éis an líon sonraithe laethanta. Má iarrtar na sonraí meán tar éis é a scriosadh, déanfar é a ath-íoslódáil, má tá an t-ábhar foinse fós ar fáil. Mar gheall ar shrianta ar cé chomh minic is atá cártaí réamhamhairc ag vótaíocht do shuíomhanna tríú páirtí, moltar an luach seo a shocrú go 14 lá ar a laghad, nó ní dhéanfar cártaí réamhamhairc naisc a nuashonrú ar éileamh roimh an am sin.
+        peers_api_enabled: Liosta de na hainmneacha fearainn ar tháinig an freastalaí seo orthu sa choinbhleacht. Níl aon sonraí san áireamh anseo faoi cé acu an ndéanann tú cónascadh le freastalaí ar leith, díreach go bhfuil a fhios ag do fhreastalaí faoi. Úsáideann seirbhísí a bhailíonn staitisticí ar chónaidhm go ginearálta é seo.
+        profile_directory: Liostaíonn an t-eolaire próifíle na húsáideoirí go léir a roghnaigh isteach le bheith in-aimsithe.
+        require_invite_text: Nuair a bhíonn faomhadh láimhe ag teastáil le haghaidh clárúcháin, déan an "Cén fáth ar mhaith leat a bheith páirteach?" ionchur téacs éigeantach seachas roghnach
+        site_contact_email: Conas is féidir le daoine dul i dteagmháil leat le haghaidh fiosrúchán dlíthiúil nó tacaíochta.
+        site_contact_username: Conas is féidir le daoine dul i dteagmháil leat ar Mastodon.
+        site_extended_description: Aon fhaisnéis bhreise a d’fhéadfadh a bheith úsáideach do chuairteoirí agus d’úsáideoirí. Is féidir é a struchtúrú le comhréir Markdown.
+        site_short_description: Cur síos gairid chun cabhrú le do fhreastalaí a aithint go uathúil. Cé atá á rith, cé dó a bhfuil sé?
+        site_terms: Bain úsáid as do pholasaí príobháideachta féin nó fág bán é chun an réamhshocrú a úsáid. Is féidir é a struchtúrú le comhréir Markdown.
+        site_title: Conas is féidir le daoine tagairt a dhéanamh do do fhreastalaí seachas a ainm fearainn.
+        status_page_url: URL leathanach inar féidir le daoine stádas an fhreastalaí seo a fheiceáil le linn briseadh amach
+        theme: Téama a fheiceann cuairteoirí logáilte amach agus úsáideoirí nua.
+        thumbnail: Íomhá thart ar 2:1 ar taispeáint taobh le faisnéis do fhreastalaí.
+        timeline_preview: Beidh cuairteoirí logáilte amach in ann na postálacha poiblí is déanaí atá ar fáil ar an bhfreastalaí a bhrabhsáil.
+        trendable_by_default: Léim ar athbhreithniú láimhe ar ábhar treochta. Is féidir míreanna aonair a bhaint as treochtaí fós tar éis an fhíric.
+        trends: Léiríonn treochtaí cé na postálacha, hashtags agus scéalta nuachta atá ag tarraingt ar do fhreastalaí.
+        trends_as_landing_page: Taispeáin inneachar treochta d'úsáideoirí agus do chuairteoirí atá logáilte amach in ionad cur síos ar an bhfreastalaí seo. Éilíonn treochtaí a chumasú.
+      form_challenge:
+        current_password: Tá tú ag dul isteach i limistéar slán
+      imports:
+        data: Comhad CSV easpórtáilte ó fhreastalaí Mastodon eile
+      invite_request:
+        text: Cabhróidh sé seo linn d’iarratas a athbhreithniú
+      ip_block:
+        comment: Roghnach. Cuimhnigh cén fáth ar chuir tú an riail seo leis.
+        expires_in: Is acmhainn chríochta iad seoltaí IP, uaireanta roinntear iad agus is minic a athraíonn lámha. Ar an gcúis seo, ní mholtar bloic IP éiginnte.
+        ip: Cuir isteach seoladh IPv4 nó IPv6. Is féidir leat raonta iomlána a bhlocáil ag baint úsáide as an chomhréir CIDR. Bí cúramach gan tú féin a ghlasáil amach!
+        severities:
+          no_access: Cuir bac ar rochtain ar na hacmhainní go léir
+          sign_up_block: Ní bheidh clárú nua indéanta
+          sign_up_requires_approval: Beidh do cheadú ag teastáil le haghaidh clárúcháin nua
+        severity: Roghnaigh cad a tharlóidh le hiarratais ón IP seo
+      rule:
+        hint: Roghnach. Tabhair tuilleadh sonraí faoin riail
+        text: Déan cur síos ar riail nó riachtanas d'úsáideoirí ar an bhfreastalaí seo. Déan iarracht é a choinneáil gearr agus simplí
+      sessions:
+        otp: 'Cuir isteach an cód dhá fhachtóir ginte ag d''aip ghutháin nó úsáid ceann de do chóid athshlánaithe:'
+        webauthn: Más eochair USB atá ann déan cinnte é a chur isteach agus, más gá, tapáil í.
+      settings:
+        indexable: Seans go mbeidh do leathanach próifíle le feiceáil i dtorthaí cuardaigh ar Google, Bing agus eile.
+        show_application: Beidh tú in ann a fheiceáil i gcónaí cén aip a d’fhoilsigh do phostáil beag beann ar.
+      tag:
+        name: Ní féidir leat ach cásáil na litreacha a athrú, mar shampla, chun é a dhéanamh níos inléite
+      user:
+        chosen_languages: Nuair a dhéantar iad a sheiceáil, ní thaispeánfar ach postálacha i dteangacha roghnaithe in amlínte poiblí
+        role: Rialaíonn an ról na ceadanna atá ag an úsáideoir
+      user_role:
+        color: Dath le húsáid don ról ar fud an Chomhéadain, mar RGB i bhformáid heicsidheachúlach
+        highlighted: Déanann sé seo an ról le feiceáil go poiblí
+        name: Ainm poiblí an róil, má tá an ról socraithe le taispeáint mar shuaitheantas
+        permissions_as_keys: Beidh rochtain ag úsáideoirí a bhfuil an ról seo acu ar...
+        position: Cinneann ról níos airde réiteach coinbhleachta i gcásanna áirithe. Ní féidir gníomhartha áirithe a dhéanamh ach amháin ar róil a bhfuil tosaíocht níos ísle acu
+      webhook:
+        events: Roghnaigh imeachtaí le seoladh
+        template: Cum do phálasta JSON féin ag baint úsáide as idirshuíomh athróg. Fág bán le haghaidh JSON réamhshocraithe.
+        url: An áit a seolfar imeachtaí chuig
     labels:
       account:
+        discoverable: Próifíl gné agus postálacha in halgartaim fionnachtana
         fields:
           name: Lipéad
+          value: Ábhar
+        indexable: Cuir postálacha poiblí san áireamh sna torthaí cuardaigh
+        show_collections: Taispeáin seo a leanas agus leanúna ar phróifíl
+        unlocked: Glac le leantóirí nua go huathoibríoch
+      account_alias:
+        acct: Láimhseáil an seanchuntais
+      account_migration:
+        acct: Láimhseáil an chuntais nua
       account_warning_preset:
+        text: Téacs réamhshocraithe
         title: Teideal
       admin_account_action:
+        include_statuses: Cuir postálacha tuairiscithe san áireamh sa ríomhphost
+        send_email_notification: Cuir an t-úsáideoir ar an eolas trí ríomhphost
         text: Rabhadh saincheaptha
+        type: Gníomh
         types:
           disable: Reoigh
           none: Seol rabhadh
+          sensitive: Íogair
           silence: Teorannaigh
           suspend: Cuir ar fionraí
+        warning_preset_id: Bain úsáid as réamhshocrú rabhaidh
       announcement:
+        all_day: Imeacht uile-lae
+        ends_at: Deireadh an imeachta
+        scheduled_at: Foilsiú sceideal
+        starts_at: Tús na hócáide
         text: Fógra
+      appeal:
+        text: Mínigh cén fáth ar cheart an cinneadh seo a fhreaschur
       defaults:
+        autofollow: Tabhair cuireadh do chuntas a leanúint
         avatar: Abhatár
+        bot: Is cuntas uathoibrithe é seo
+        chosen_languages: Scag teangacha
+        confirm_new_password: Deimhnigh pasfhocal nua
+        confirm_password: Deimhnigh Pasfhocal
+        context: Comhthéacsanna a scagadh
+        current_password: Pasfhocal reatha
         data: Sonraí
         display_name: Ainm taispeána
         email: Seoladh ríomhphoist
+        expires_in: In éag tar éis
+        fields: Réimsí breise
         header: Ceanntásc
+        honeypot: "%{label} (ná líon isteach)"
+        inbox_url: URL an bhosca isteach sealaíochta
+        irreversible: Droim ar aghaidh in ionad bheith ag folaigh
+        locale: Teanga comhéadan
+        max_uses: Uaslíon úsáidí
         new_password: Pasfhocal nua
         note: Beathaisnéis
+        otp_attempt: Cód dhá-fhachtóir
         password: Pasfhocal
+        phrase: Eochairfhocal nó frása
+        setting_advanced_layout: Cumasaigh ardchomhéadan gréasáin
+        setting_aggregate_reblogs: Treisithe grúpa i línte ama
+        setting_always_send_emails: Seol fógraí ríomhphoist i gcónaí
+        setting_auto_play_gif: Gifs beoite go huathoibríoch a imirt
+        setting_boost_modal: Taispeáin dialóg deimhnithe roimh threisiú
+        setting_default_language: Teanga postála
+        setting_default_privacy: Postáil príobháideachta
+        setting_default_sensitive: Marcáil na meáin mar íogair i gcónaí
+        setting_delete_modal: Taispeáin dialóg deimhnithe sula scriostar postáil
+        setting_disable_hover_cards: Díchumasaigh réamhamharc próifíle ar ainlíon
+        setting_disable_swiping: Díchumasaigh gluaiseachtaí swiping
+        setting_display_media: Taispeáint meáin
         setting_display_media_default: Réamhshocrú
         setting_display_media_hide_all: Cuir uile i bhfolach
         setting_display_media_show_all: Taispeáin uile
+        setting_expand_spoilers: Méadaigh postálacha atá marcáilte le rabhaidh inneachair i gcónaí
+        setting_hide_network: Folaigh do ghraf sóisialta
+        setting_reduce_motion: Laghdú ar an tairiscint i beochan
+        setting_system_font_ui: Úsáid cló réamhshocraithe an chórais
         setting_theme: Téama suímh
         setting_trends: Taispeáin treochtaí an lae inniu
+        setting_unfollow_modal: Taispeáin dialóg deimhnithe sula ndíleanfaidh tú duine éigin
+        setting_use_blurhash: Taispeáin grádáin ildaite do mheáin fholaithe
+        setting_use_pending_items: Modh mall
+        severity: Déine
+        sign_in_token_attempt: Cód slándála
         title: Teideal
+        type: Cineál iompórtála
         username: Ainm úsáideora
+        username_or_email: Ainm Úsáideora nó Ríomhphost
+        whole_word: Focal ar fad
+      email_domain_block:
+        with_dns_records: Cuir taifid MX agus IPanna an fhearainn san áireamh
       featured_tag:
         name: Haischlib
       filters:
@@ -50,27 +242,100 @@ ga:
           hide: Cuir i bhfolach go hiomlán
           warn: Cuir i bhfolach le rabhadh
       form_admin_settings:
+        activity_api_enabled: Foilsigh staitisticí comhiomlána faoi ghníomhaíocht úsáideoirí san API
+        app_icon: Deilbhín aip
+        backups_retention_period: Tréimhse choinneála cartlainne úsáideora
+        bootstrap_timeline_accounts: Mol na cuntais seo d'úsáideoirí nua i gcónaí
+        closed_registrations_message: Teachtaireacht saincheaptha nuair nach bhfuil sínithe suas ar fáil
+        content_cache_retention_period: Tréimhse choinneála inneachair cianda
+        custom_css: CSS saincheaptha
+        favicon: Favicon
+        mascot: Mascóg saincheaptha (oidhreacht)
+        media_cache_retention_period: Tréimhse choinneála taisce meán
+        peers_api_enabled: Foilsigh liosta de na freastalaithe aimsithe san API
+        profile_directory: Cumasaigh eolaire próifíle
+        registrations_mode: Cé atá in ann clárú
+        require_invite_text: A cheangal ar chúis a bheith páirteach
+        show_domain_blocks: Taispeáin bloic fearainn
+        show_domain_blocks_rationale: Taispeáin cén fáth ar cuireadh bac ar fhearann
+        site_contact_email: R-phost teagmhála
+        site_contact_username: Ainm úsáideora teagmhála
         site_extended_description: Cur síos fada
         site_short_description: Cur síos freastalaí
         site_terms: Polasaí príobháideachais
         site_title: Ainm freastalaí
+        status_page_url: URL an leathanaigh stádais
+        theme: Téama réamhshocraithe
+        thumbnail: Mionsamhail freastalaí
+        timeline_preview: Ceadaigh rochtain neamhdheimhnithe ar amlínte poiblí
+        trendable_by_default: Ceadaigh treochtaí gan athbhreithniú roimh ré
+        trends: Cumasaigh treochtaí
+        trends_as_landing_page: Úsáid treochtaí mar an leathanach tuirlingthe
+      interactions:
+        must_be_follower: Cuir bac ar fhógraí ó dhaoine nach leantóirí iad
+        must_be_following: Cuir bac ar fhógraí ó dhaoine nach leanann tú
+        must_be_following_dm: Cuir bac ar theachtaireachtaí díreacha ó dhaoine nach leanann tú
       invite:
         comment: Ráiteas
+      invite_request:
+        text: Cén fáth ar mhaith leat a bheith páirteach?
       ip_block:
         comment: Ráiteas
         ip: IP
+        severities:
+          no_access: Rochtain a bhlocáil
+          sign_up_block: Cuir bac ar chlárúcháin
+          sign_up_requires_approval: Teorainn le clárú
         severity: Riail
       notification_emails:
+        appeal: Déanann duine éigin achomharc i gcoinne chinneadh modhnóra
+        digest: Seol r-phoist achoimre
+        favourite: Is fearr le duine éigin do phostáil
         follow: Lean duine éigin tú
+        follow_request: D'iarr duine éigin tú a leanúint
+        mention: Luaigh duine éigin tú
+        pending_account: Ní mór athbhreithniú a dhéanamh ar chuntas nua
         reblog: Mhol duine éigin do phostáil
+        report: Tá tuairisc nua curtha isteach
+        software_updates:
+          all: Fógra a thabhairt ar gach nuashonrú
+          critical: Fógra a thabhairt ar nuashonruithe ríthábhachtacha amháin
+          label: Tá leagan nua Mastodon ar fáil
+          none: Ná cuir nuashonruithe ar an eolas choíche (ní mholtar é)
+          patch: Fógra ar nuashonruithe bugfix
+        trending_tag: Teastaíonn athbhreithniú ar threocht nua
       rule:
+        hint: Eolas breise
         text: Riail
+      settings:
+        indexable: Cuir leathanach próifíle san innill chuardaigh
+        show_application: Taispeáin cén aip ónar sheol tú postáil
       tag:
+        listable: Lig don hashchlib seo a bheith le feiceáil i gcuardach agus i moltaí
         name: Haischlib
+        trendable: Lig don haischlib seo a bheith le feiceáil faoi threochtaí
+        usable: Lig do phostálacha an hashchlib seo a úsáid
       user:
         role: Ról
+        time_zone: Crios ama
       user_role:
+        color: Dath suaitheantas
+        highlighted: Taispeáin ról mar shuaitheantas ar phróifílí úsáideora
         name: Ainm
+        permissions_as_keys: Ceadanna
+        position: Tosaíocht
+      webhook:
+        events: Imeachtaí cumasaithe
+        template: Teimpléad pá-ualach
+        url: URL críochphointe
+    'no': Níl
+    not_recommended: Ní mholtar
+    overridden: Sáraithe
     recommended: Molta
     required:
       mark: "*"
+      text: ag teastáil
+    title:
+      sessions:
+        webauthn: Úsáid ceann de d'eochracha slándála chun síniú isteach
+    'yes': Tá
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 344368a08a8776..f63aadd6c8f794 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -663,6 +663,7 @@ sl:
       report: 'Prijavi #%{id}'
       reported_account: Prijavljeni račun
       reported_by: Prijavil/a
+      reported_with_application: Prijavljeno s programom
       resolved: Razrešeni
       resolved_msg: Prijava je uspešno razrešena!
       skip_to_actions: Preskoči na dejanja
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 6b28e17441ad4c..9855b569241153 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -639,6 +639,7 @@ tr:
       report: 'Şikayet #%{id}'
       reported_account: Şikayet edilen hesap
       reported_by: Şikayet eden
+      reported_with_application: Uygulamayla bildirildi
       resolved: Giderildi
       resolved_msg: Şikayet başarıyla çözümlendi!
       skip_to_actions: İşlemlere atla

From f587ff643f552a32a1c43e103a474a5065cd3657 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Thu, 18 Jul 2024 16:36:09 +0200
Subject: [PATCH 1566/2191] Grouped Notifications UI (#30440)

Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
---
 .../api/v2_alpha/notifications_controller.rb  |  55 +-
 app/javascript/mastodon/actions/markers.ts    |  14 +-
 .../mastodon/actions/notification_groups.ts   | 144 +++++
 .../mastodon/actions/notifications.js         |  13 +-
 .../actions/notifications_migration.tsx       |  18 +
 .../mastodon/actions/notifications_typed.ts   |   9 +-
 app/javascript/mastodon/actions/streaming.js  |  11 +-
 app/javascript/mastodon/api/notifications.ts  |  18 +
 .../mastodon/api_types/notifications.ts       | 145 +++++
 app/javascript/mastodon/api_types/reports.ts  |  16 +
 .../mastodon/components/load_gap.tsx          |  12 +-
 app/javascript/mastodon/components/status.jsx |   8 +-
 .../mastodon/components/status_list.jsx       |   2 +-
 .../compose/components/edit_indicator.jsx     |  10 +-
 .../compose/components/reply_indicator.jsx    |  10 +-
 .../components/column_settings.jsx            |  11 +
 .../filtered_notifications_banner.tsx         |   4 +-
 .../components/moderation_warning.tsx         |  51 +-
 .../notifications/components/notification.jsx |   4 +-
 .../relationships_severance_event.jsx         |  15 +-
 .../containers/column_settings_container.js   |   8 +-
 .../mastodon/features/notifications/index.jsx |   2 +-
 .../components/avatar_group.tsx               |  31 ++
 .../components/embedded_status.tsx            |  93 ++++
 .../components/embedded_status_content.tsx    | 165 ++++++
 .../components/names_list.tsx                 |  51 ++
 .../components/notification_admin_report.tsx  | 132 +++++
 .../components/notification_admin_sign_up.tsx |  31 ++
 .../components/notification_favourite.tsx     |  45 ++
 .../components/notification_follow.tsx        |  31 ++
 .../notification_follow_request.tsx           |  78 +++
 .../components/notification_group.tsx         | 134 +++++
 .../notification_group_with_status.tsx        |  91 ++++
 .../components/notification_mention.tsx       |  55 ++
 .../notification_moderation_warning.tsx       |  13 +
 .../components/notification_poll.tsx          |  41 ++
 .../components/notification_reblog.tsx        |  45 ++
 .../notification_severed_relationships.tsx    |  15 +
 .../components/notification_status.tsx        |  31 ++
 .../components/notification_update.tsx        |  31 ++
 .../components/notification_with_status.tsx   |  73 +++
 .../features/notifications_v2/filter_bar.tsx  | 145 +++++
 .../features/notifications_v2/index.tsx       | 354 ++++++++++++
 .../features/notifications_wrapper.jsx        |  13 +
 .../features/ui/components/columns_area.jsx   |   4 +-
 .../ui/components/navigation_panel.jsx        |   9 +-
 app/javascript/mastodon/features/ui/index.jsx |   9 +-
 .../features/ui/util/async-components.js      |  10 +-
 app/javascript/mastodon/locales/en.json       |  15 +-
 .../mastodon/models/notification_group.ts     | 207 +++++++
 app/javascript/mastodon/reducers/index.ts     |   2 +
 app/javascript/mastodon/reducers/markers.ts   |  22 +-
 .../mastodon/reducers/notification_groups.ts  | 508 ++++++++++++++++++
 .../mastodon/reducers/notifications.js        |   4 +-
 .../mastodon/selectors/notifications.ts       |  34 ++
 app/javascript/mastodon/selectors/settings.ts |  40 ++
 .../styles/mastodon/components.scss           | 293 +++++++++-
 app/models/notification.rb                    |   1 +
 app/models/notification_group.rb              |   8 +-
 .../rest/notification_group_serializer.rb     |   1 +
 .../rest/notification_serializer.rb           |   1 +
 app/services/notify_service.rb                |   4 +-
 config/routes.rb                              |   1 +
 package.json                                  |   1 +
 yarn.lock                                     |  10 +
 65 files changed, 3330 insertions(+), 132 deletions(-)
 create mode 100644 app/javascript/mastodon/actions/notification_groups.ts
 create mode 100644 app/javascript/mastodon/actions/notifications_migration.tsx
 create mode 100644 app/javascript/mastodon/api/notifications.ts
 create mode 100644 app/javascript/mastodon/api_types/notifications.ts
 create mode 100644 app/javascript/mastodon/api_types/reports.ts
 create mode 100644 app/javascript/mastodon/features/notifications_v2/components/avatar_group.tsx
 create mode 100644 app/javascript/mastodon/features/notifications_v2/components/embedded_status.tsx
 create mode 100644 app/javascript/mastodon/features/notifications_v2/components/embedded_status_content.tsx
 create mode 100644 app/javascript/mastodon/features/notifications_v2/components/names_list.tsx
 create mode 100644 app/javascript/mastodon/features/notifications_v2/components/notification_admin_report.tsx
 create mode 100644 app/javascript/mastodon/features/notifications_v2/components/notification_admin_sign_up.tsx
 create mode 100644 app/javascript/mastodon/features/notifications_v2/components/notification_favourite.tsx
 create mode 100644 app/javascript/mastodon/features/notifications_v2/components/notification_follow.tsx
 create mode 100644 app/javascript/mastodon/features/notifications_v2/components/notification_follow_request.tsx
 create mode 100644 app/javascript/mastodon/features/notifications_v2/components/notification_group.tsx
 create mode 100644 app/javascript/mastodon/features/notifications_v2/components/notification_group_with_status.tsx
 create mode 100644 app/javascript/mastodon/features/notifications_v2/components/notification_mention.tsx
 create mode 100644 app/javascript/mastodon/features/notifications_v2/components/notification_moderation_warning.tsx
 create mode 100644 app/javascript/mastodon/features/notifications_v2/components/notification_poll.tsx
 create mode 100644 app/javascript/mastodon/features/notifications_v2/components/notification_reblog.tsx
 create mode 100644 app/javascript/mastodon/features/notifications_v2/components/notification_severed_relationships.tsx
 create mode 100644 app/javascript/mastodon/features/notifications_v2/components/notification_status.tsx
 create mode 100644 app/javascript/mastodon/features/notifications_v2/components/notification_update.tsx
 create mode 100644 app/javascript/mastodon/features/notifications_v2/components/notification_with_status.tsx
 create mode 100644 app/javascript/mastodon/features/notifications_v2/filter_bar.tsx
 create mode 100644 app/javascript/mastodon/features/notifications_v2/index.tsx
 create mode 100644 app/javascript/mastodon/features/notifications_wrapper.jsx
 create mode 100644 app/javascript/mastodon/models/notification_group.ts
 create mode 100644 app/javascript/mastodon/reducers/notification_groups.ts
 create mode 100644 app/javascript/mastodon/selectors/notifications.ts
 create mode 100644 app/javascript/mastodon/selectors/settings.ts

diff --git a/app/controllers/api/v2_alpha/notifications_controller.rb b/app/controllers/api/v2_alpha/notifications_controller.rb
index edba23ab4a823c..83d40a0886f52f 100644
--- a/app/controllers/api/v2_alpha/notifications_controller.rb
+++ b/app/controllers/api/v2_alpha/notifications_controller.rb
@@ -12,10 +12,27 @@ def index
     with_read_replica do
       @notifications = load_notifications
       @group_metadata = load_group_metadata
+      @grouped_notifications = load_grouped_notifications
       @relationships = StatusRelationshipsPresenter.new(target_statuses_from_notifications, current_user&.account_id)
+      @sample_accounts = @grouped_notifications.flat_map(&:sample_accounts)
+
+      # Preload associations to avoid N+1s
+      ActiveRecord::Associations::Preloader.new(records: @sample_accounts, associations: [:account_stat, { user: :role }]).call
     end
 
-    render json: @notifications.map { |notification| NotificationGroup.from_notification(notification, max_id: @group_metadata.dig(notification.group_key, :max_id)) }, each_serializer: REST::NotificationGroupSerializer, relationships: @relationships, group_metadata: @group_metadata
+    MastodonOTELTracer.in_span('Api::V2Alpha::NotificationsController#index rendering') do |span|
+      statuses = @grouped_notifications.filter_map { |group| group.target_status&.id }
+
+      span.add_attributes(
+        'app.notification_grouping.count' => @grouped_notifications.size,
+        'app.notification_grouping.sample_account.count' => @sample_accounts.size,
+        'app.notification_grouping.sample_account.unique_count' => @sample_accounts.pluck(:id).uniq.size,
+        'app.notification_grouping.status.count' => statuses.size,
+        'app.notification_grouping.status.unique_count' => statuses.uniq.size
+      )
+
+      render json: @grouped_notifications, each_serializer: REST::NotificationGroupSerializer, relationships: @relationships, group_metadata: @group_metadata
+    end
   end
 
   def show
@@ -36,25 +53,35 @@ def dismiss
   private
 
   def load_notifications
-    notifications = browserable_account_notifications.includes(from_account: [:account_stat, :user]).to_a_grouped_paginated_by_id(
-      limit_param(DEFAULT_NOTIFICATIONS_LIMIT),
-      params_slice(:max_id, :since_id, :min_id)
-    )
-
-    Notification.preload_cache_collection_target_statuses(notifications) do |target_statuses|
-      preload_collection(target_statuses, Status)
+    MastodonOTELTracer.in_span('Api::V2Alpha::NotificationsController#load_notifications') do
+      notifications = browserable_account_notifications.includes(from_account: [:account_stat, :user]).to_a_grouped_paginated_by_id(
+        limit_param(DEFAULT_NOTIFICATIONS_LIMIT),
+        params_slice(:max_id, :since_id, :min_id)
+      )
+
+      Notification.preload_cache_collection_target_statuses(notifications) do |target_statuses|
+        preload_collection(target_statuses, Status)
+      end
     end
   end
 
   def load_group_metadata
     return {} if @notifications.empty?
 
-    browserable_account_notifications
-      .where(group_key: @notifications.filter_map(&:group_key))
-      .where(id: (@notifications.last.id)..(@notifications.first.id))
-      .group(:group_key)
-      .pluck(:group_key, 'min(notifications.id) as min_id', 'max(notifications.id) as max_id', 'max(notifications.created_at) as latest_notification_at')
-      .to_h { |group_key, min_id, max_id, latest_notification_at| [group_key, { min_id: min_id, max_id: max_id, latest_notification_at: latest_notification_at }] }
+    MastodonOTELTracer.in_span('Api::V2Alpha::NotificationsController#load_group_metadata') do
+      browserable_account_notifications
+        .where(group_key: @notifications.filter_map(&:group_key))
+        .where(id: (@notifications.last.id)..(@notifications.first.id))
+        .group(:group_key)
+        .pluck(:group_key, 'min(notifications.id) as min_id', 'max(notifications.id) as max_id', 'max(notifications.created_at) as latest_notification_at')
+        .to_h { |group_key, min_id, max_id, latest_notification_at| [group_key, { min_id: min_id, max_id: max_id, latest_notification_at: latest_notification_at }] }
+    end
+  end
+
+  def load_grouped_notifications
+    MastodonOTELTracer.in_span('Api::V2Alpha::NotificationsController#load_grouped_notifications') do
+      @notifications.map { |notification| NotificationGroup.from_notification(notification, max_id: @group_metadata.dig(notification.group_key, :max_id)) }
+    end
   end
 
   def browserable_account_notifications
diff --git a/app/javascript/mastodon/actions/markers.ts b/app/javascript/mastodon/actions/markers.ts
index 03f577c540fc5d..77d91d9b9c3411 100644
--- a/app/javascript/mastodon/actions/markers.ts
+++ b/app/javascript/mastodon/actions/markers.ts
@@ -75,9 +75,17 @@ interface MarkerParam {
 }
 
 function getLastNotificationId(state: RootState): string | undefined {
-  // @ts-expect-error state.notifications is not yet typed
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-return, @typescript-eslint/no-unsafe-call
-  return state.getIn(['notifications', 'lastReadId']);
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
+  const enableBeta = state.settings.getIn(
+    ['notifications', 'groupingBeta'],
+    false,
+  ) as boolean;
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-return
+  return enableBeta
+    ? state.notificationGroups.lastReadId
+    : // @ts-expect-error state.notifications is not yet typed
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-call
+      state.getIn(['notifications', 'lastReadId']);
 }
 
 const buildPostMarkersParams = (state: RootState) => {
diff --git a/app/javascript/mastodon/actions/notification_groups.ts b/app/javascript/mastodon/actions/notification_groups.ts
new file mode 100644
index 00000000000000..8fdec6e48bb4df
--- /dev/null
+++ b/app/javascript/mastodon/actions/notification_groups.ts
@@ -0,0 +1,144 @@
+import { createAction } from '@reduxjs/toolkit';
+
+import {
+  apiClearNotifications,
+  apiFetchNotifications,
+} from 'mastodon/api/notifications';
+import type { ApiAccountJSON } from 'mastodon/api_types/accounts';
+import type {
+  ApiNotificationGroupJSON,
+  ApiNotificationJSON,
+} from 'mastodon/api_types/notifications';
+import { allNotificationTypes } from 'mastodon/api_types/notifications';
+import type { ApiStatusJSON } from 'mastodon/api_types/statuses';
+import type { NotificationGap } from 'mastodon/reducers/notification_groups';
+import {
+  selectSettingsNotificationsExcludedTypes,
+  selectSettingsNotificationsQuickFilterActive,
+} from 'mastodon/selectors/settings';
+import type { AppDispatch } from 'mastodon/store';
+import {
+  createAppAsyncThunk,
+  createDataLoadingThunk,
+} from 'mastodon/store/typed_functions';
+
+import { importFetchedAccounts, importFetchedStatuses } from './importer';
+import { NOTIFICATIONS_FILTER_SET } from './notifications';
+import { saveSettings } from './settings';
+
+function excludeAllTypesExcept(filter: string) {
+  return allNotificationTypes.filter((item) => item !== filter);
+}
+
+function dispatchAssociatedRecords(
+  dispatch: AppDispatch,
+  notifications: ApiNotificationGroupJSON[] | ApiNotificationJSON[],
+) {
+  const fetchedAccounts: ApiAccountJSON[] = [];
+  const fetchedStatuses: ApiStatusJSON[] = [];
+
+  notifications.forEach((notification) => {
+    if ('sample_accounts' in notification) {
+      fetchedAccounts.push(...notification.sample_accounts);
+    }
+
+    if (notification.type === 'admin.report') {
+      fetchedAccounts.push(notification.report.target_account);
+    }
+
+    if (notification.type === 'moderation_warning') {
+      fetchedAccounts.push(notification.moderation_warning.target_account);
+    }
+
+    if ('status' in notification) {
+      fetchedStatuses.push(notification.status);
+    }
+  });
+
+  if (fetchedAccounts.length > 0)
+    dispatch(importFetchedAccounts(fetchedAccounts));
+
+  if (fetchedStatuses.length > 0)
+    dispatch(importFetchedStatuses(fetchedStatuses));
+}
+
+export const fetchNotifications = createDataLoadingThunk(
+  'notificationGroups/fetch',
+  async (_params, { getState }) => {
+    const activeFilter =
+      selectSettingsNotificationsQuickFilterActive(getState());
+
+    return apiFetchNotifications({
+      exclude_types:
+        activeFilter === 'all'
+          ? selectSettingsNotificationsExcludedTypes(getState())
+          : excludeAllTypesExcept(activeFilter),
+    });
+  },
+  ({ notifications }, { dispatch }) => {
+    dispatchAssociatedRecords(dispatch, notifications);
+    const payload: (ApiNotificationGroupJSON | NotificationGap)[] =
+      notifications;
+
+    // TODO: might be worth not using gaps for that…
+    // if (nextLink) payload.push({ type: 'gap', loadUrl: nextLink.uri });
+    if (notifications.length > 1)
+      payload.push({ type: 'gap', maxId: notifications.at(-1)?.page_min_id });
+
+    return payload;
+    // dispatch(submitMarkers());
+  },
+);
+
+export const fetchNotificationsGap = createDataLoadingThunk(
+  'notificationGroups/fetchGap',
+  async (params: { gap: NotificationGap }) =>
+    apiFetchNotifications({ max_id: params.gap.maxId }),
+
+  ({ notifications }, { dispatch }) => {
+    dispatchAssociatedRecords(dispatch, notifications);
+
+    return { notifications };
+  },
+);
+
+export const processNewNotificationForGroups = createAppAsyncThunk(
+  'notificationGroups/processNew',
+  (notification: ApiNotificationJSON, { dispatch }) => {
+    dispatchAssociatedRecords(dispatch, [notification]);
+
+    return notification;
+  },
+);
+
+export const loadPending = createAction('notificationGroups/loadPending');
+
+export const updateScrollPosition = createAction<{ top: boolean }>(
+  'notificationGroups/updateScrollPosition',
+);
+
+export const setNotificationsFilter = createAppAsyncThunk(
+  'notifications/filter/set',
+  ({ filterType }: { filterType: string }, { dispatch }) => {
+    dispatch({
+      type: NOTIFICATIONS_FILTER_SET,
+      path: ['notifications', 'quickFilter', 'active'],
+      value: filterType,
+    });
+    // dispatch(expandNotifications({ forceLoad: true }));
+    void dispatch(fetchNotifications());
+    dispatch(saveSettings());
+  },
+);
+
+export const clearNotifications = createDataLoadingThunk(
+  'notifications/clear',
+  () => apiClearNotifications(),
+);
+
+export const markNotificationsAsRead = createAction(
+  'notificationGroups/markAsRead',
+);
+
+export const mountNotifications = createAction('notificationGroups/mount');
+export const unmountNotifications = createAction('notificationGroups/unmount');
diff --git a/app/javascript/mastodon/actions/notifications.js b/app/javascript/mastodon/actions/notifications.js
index 6a59d5624e80c4..7e4320c27b7d5b 100644
--- a/app/javascript/mastodon/actions/notifications.js
+++ b/app/javascript/mastodon/actions/notifications.js
@@ -32,7 +32,6 @@ export const NOTIFICATIONS_EXPAND_FAIL    = 'NOTIFICATIONS_EXPAND_FAIL';
 
 export const NOTIFICATIONS_FILTER_SET = 'NOTIFICATIONS_FILTER_SET';
 
-export const NOTIFICATIONS_CLEAR        = 'NOTIFICATIONS_CLEAR';
 export const NOTIFICATIONS_SCROLL_TOP   = 'NOTIFICATIONS_SCROLL_TOP';
 export const NOTIFICATIONS_LOAD_PENDING = 'NOTIFICATIONS_LOAD_PENDING';
 
@@ -174,7 +173,7 @@ const noOp = () => {};
 
 let expandNotificationsController = new AbortController();
 
-export function expandNotifications({ maxId, forceLoad } = {}, done = noOp) {
+export function expandNotifications({ maxId, forceLoad = false } = {}, done = noOp) {
   return (dispatch, getState) => {
     const activeFilter = getState().getIn(['settings', 'notifications', 'quickFilter', 'active']);
     const notifications = getState().get('notifications');
@@ -257,16 +256,6 @@ export function expandNotificationsFail(error, isLoadingMore) {
   };
 }
 
-export function clearNotifications() {
-  return (dispatch) => {
-    dispatch({
-      type: NOTIFICATIONS_CLEAR,
-    });
-
-    api().post('/api/v1/notifications/clear');
-  };
-}
-
 export function scrollTopNotifications(top) {
   return {
     type: NOTIFICATIONS_SCROLL_TOP,
diff --git a/app/javascript/mastodon/actions/notifications_migration.tsx b/app/javascript/mastodon/actions/notifications_migration.tsx
new file mode 100644
index 00000000000000..f856e56828f11f
--- /dev/null
+++ b/app/javascript/mastodon/actions/notifications_migration.tsx
@@ -0,0 +1,18 @@
+import { createAppAsyncThunk } from 'mastodon/store';
+
+import { fetchNotifications } from './notification_groups';
+import { expandNotifications } from './notifications';
+
+export const initializeNotifications = createAppAsyncThunk(
+  'notifications/initialize',
+  (_, { dispatch, getState }) => {
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
+    const enableBeta = getState().settings.getIn(
+      ['notifications', 'groupingBeta'],
+      false,
+    ) as boolean;
+
+    if (enableBeta) void dispatch(fetchNotifications());
+    else dispatch(expandNotifications());
+  },
+);
diff --git a/app/javascript/mastodon/actions/notifications_typed.ts b/app/javascript/mastodon/actions/notifications_typed.ts
index 176362f4b1edd4..88d942d45e54b5 100644
--- a/app/javascript/mastodon/actions/notifications_typed.ts
+++ b/app/javascript/mastodon/actions/notifications_typed.ts
@@ -1,11 +1,6 @@
 import { createAction } from '@reduxjs/toolkit';
 
-import type { ApiAccountJSON } from '../api_types/accounts';
-// To be replaced once ApiNotificationJSON type exists
-interface FakeApiNotificationJSON {
-  type: string;
-  account: ApiAccountJSON;
-}
+import type { ApiNotificationJSON } from 'mastodon/api_types/notifications';
 
 export const notificationsUpdate = createAction(
   'notifications/update',
@@ -13,7 +8,7 @@ export const notificationsUpdate = createAction(
     playSound,
     ...args
   }: {
-    notification: FakeApiNotificationJSON;
+    notification: ApiNotificationJSON;
     usePendingItems: boolean;
     playSound: boolean;
   }) => ({
diff --git a/app/javascript/mastodon/actions/streaming.js b/app/javascript/mastodon/actions/streaming.js
index e7fe1c53ed09ed..f50f41b0d9cd4b 100644
--- a/app/javascript/mastodon/actions/streaming.js
+++ b/app/javascript/mastodon/actions/streaming.js
@@ -10,6 +10,7 @@ import {
   deleteAnnouncement,
 } from './announcements';
 import { updateConversations } from './conversations';
+import { processNewNotificationForGroups } from './notification_groups';
 import { updateNotifications, expandNotifications } from './notifications';
 import { updateStatus } from './statuses';
 import {
@@ -98,10 +99,16 @@ export const connectTimelineStream = (timelineId, channelName, params = {}, opti
         case 'delete':
           dispatch(deleteFromTimelines(data.payload));
           break;
-        case 'notification':
+        case 'notification': {
           // @ts-expect-error
-          dispatch(updateNotifications(JSON.parse(data.payload), messages, locale));
+          const notificationJSON = JSON.parse(data.payload);
+          dispatch(updateNotifications(notificationJSON, messages, locale));
+          // TODO: remove this once the groups feature replaces the previous one
+          if(getState().notificationGroups.groups.length > 0) {
+            dispatch(processNewNotificationForGroups(notificationJSON));
+          }
           break;
+        }
         case 'conversation':
           // @ts-expect-error
           dispatch(updateConversations(JSON.parse(data.payload)));
diff --git a/app/javascript/mastodon/api/notifications.ts b/app/javascript/mastodon/api/notifications.ts
new file mode 100644
index 00000000000000..c1ab6f70cafbde
--- /dev/null
+++ b/app/javascript/mastodon/api/notifications.ts
@@ -0,0 +1,18 @@
+import api, { apiRequest, getLinks } from 'mastodon/api';
+import type { ApiNotificationGroupJSON } from 'mastodon/api_types/notifications';
+
+export const apiFetchNotifications = async (params?: {
+  exclude_types?: string[];
+  max_id?: string;
+}) => {
+  const response = await api().request<ApiNotificationGroupJSON[]>({
+    method: 'GET',
+    url: '/api/v2_alpha/notifications',
+    params,
+  });
+
+  return { notifications: response.data, links: getLinks(response) };
+};
+
+export const apiClearNotifications = () =>
+  apiRequest<undefined>('POST', 'v1/notifications/clear');
diff --git a/app/javascript/mastodon/api_types/notifications.ts b/app/javascript/mastodon/api_types/notifications.ts
new file mode 100644
index 00000000000000..d7cbbca73b9ec3
--- /dev/null
+++ b/app/javascript/mastodon/api_types/notifications.ts
@@ -0,0 +1,145 @@
+// See app/serializers/rest/notification_group_serializer.rb
+
+import type { AccountWarningAction } from 'mastodon/models/notification_group';
+
+import type { ApiAccountJSON } from './accounts';
+import type { ApiReportJSON } from './reports';
+import type { ApiStatusJSON } from './statuses';
+
+// See app/model/notification.rb
+export const allNotificationTypes = [
+  'follow',
+  'follow_request',
+  'favourite',
+  'reblog',
+  'mention',
+  'poll',
+  'status',
+  'update',
+  'admin.sign_up',
+  'admin.report',
+  'moderation_warning',
+  'severed_relationships',
+];
+
+export type NotificationWithStatusType =
+  | 'favourite'
+  | 'reblog'
+  | 'status'
+  | 'mention'
+  | 'poll'
+  | 'update';
+
+export type NotificationType =
+  | NotificationWithStatusType
+  | 'follow'
+  | 'follow_request'
+  | 'moderation_warning'
+  | 'severed_relationships'
+  | 'admin.sign_up'
+  | 'admin.report';
+
+export interface BaseNotificationJSON {
+  id: string;
+  type: NotificationType;
+  created_at: string;
+  group_key: string;
+  account: ApiAccountJSON;
+}
+
+export interface BaseNotificationGroupJSON {
+  group_key: string;
+  notifications_count: number;
+  type: NotificationType;
+  sample_accounts: ApiAccountJSON[];
+  latest_page_notification_at: string; // FIXME: This will only be present if the notification group is returned in a paginated list, not requested directly
+  most_recent_notification_id: string;
+  page_min_id?: string;
+  page_max_id?: string;
+}
+
+interface NotificationGroupWithStatusJSON extends BaseNotificationGroupJSON {
+  type: NotificationWithStatusType;
+  status: ApiStatusJSON;
+}
+
+interface NotificationWithStatusJSON extends BaseNotificationJSON {
+  type: NotificationWithStatusType;
+  status: ApiStatusJSON;
+}
+
+interface ReportNotificationGroupJSON extends BaseNotificationGroupJSON {
+  type: 'admin.report';
+  report: ApiReportJSON;
+}
+
+interface ReportNotificationJSON extends BaseNotificationJSON {
+  type: 'admin.report';
+  report: ApiReportJSON;
+}
+
+type SimpleNotificationTypes = 'follow' | 'follow_request' | 'admin.sign_up';
+interface SimpleNotificationGroupJSON extends BaseNotificationGroupJSON {
+  type: SimpleNotificationTypes;
+}
+
+interface SimpleNotificationJSON extends BaseNotificationJSON {
+  type: SimpleNotificationTypes;
+}
+
+export interface ApiAccountWarningJSON {
+  id: string;
+  action: AccountWarningAction;
+  text: string;
+  status_ids: string[];
+  created_at: string;
+  target_account: ApiAccountJSON;
+  appeal: unknown;
+}
+
+interface ModerationWarningNotificationGroupJSON
+  extends BaseNotificationGroupJSON {
+  type: 'moderation_warning';
+  moderation_warning: ApiAccountWarningJSON;
+}
+
+interface ModerationWarningNotificationJSON extends BaseNotificationJSON {
+  type: 'moderation_warning';
+  moderation_warning: ApiAccountWarningJSON;
+}
+
+export interface ApiAccountRelationshipSeveranceEventJSON {
+  id: string;
+  type: 'account_suspension' | 'domain_block' | 'user_domain_block';
+  purged: boolean;
+  target_name: string;
+  followers_count: number;
+  following_count: number;
+  created_at: string;
+}
+
+interface AccountRelationshipSeveranceNotificationGroupJSON
+  extends BaseNotificationGroupJSON {
+  type: 'severed_relationships';
+  event: ApiAccountRelationshipSeveranceEventJSON;
+}
+
+interface AccountRelationshipSeveranceNotificationJSON
+  extends BaseNotificationJSON {
+  type: 'severed_relationships';
+  event: ApiAccountRelationshipSeveranceEventJSON;
+}
+
+export type ApiNotificationJSON =
+  | SimpleNotificationJSON
+  | ReportNotificationJSON
+  | AccountRelationshipSeveranceNotificationJSON
+  | NotificationWithStatusJSON
+  | ModerationWarningNotificationJSON;
+
+export type ApiNotificationGroupJSON =
+  | SimpleNotificationGroupJSON
+  | ReportNotificationGroupJSON
+  | AccountRelationshipSeveranceNotificationGroupJSON
+  | NotificationGroupWithStatusJSON
+  | ModerationWarningNotificationGroupJSON;
diff --git a/app/javascript/mastodon/api_types/reports.ts b/app/javascript/mastodon/api_types/reports.ts
new file mode 100644
index 00000000000000..b11cfdd2eb59c8
--- /dev/null
+++ b/app/javascript/mastodon/api_types/reports.ts
@@ -0,0 +1,16 @@
+import type { ApiAccountJSON } from './accounts';
+
+export type ReportCategory = 'other' | 'spam' | 'legal' | 'violation';
+
+export interface ApiReportJSON {
+  id: string;
+  action_taken: unknown;
+  action_taken_at: unknown;
+  category: ReportCategory;
+  comment: string;
+  forwarded: boolean;
+  created_at: string;
+  status_ids: string[];
+  rule_ids: string[];
+  target_account: ApiAccountJSON;
+}
diff --git a/app/javascript/mastodon/components/load_gap.tsx b/app/javascript/mastodon/components/load_gap.tsx
index 1d4193a35951ab..544b5e1461b17f 100644
--- a/app/javascript/mastodon/components/load_gap.tsx
+++ b/app/javascript/mastodon/components/load_gap.tsx
@@ -9,18 +9,18 @@ const messages = defineMessages({
   load_more: { id: 'status.load_more', defaultMessage: 'Load more' },
 });
 
-interface Props {
+interface Props<T> {
   disabled: boolean;
-  maxId: string;
-  onClick: (maxId: string) => void;
+  param: T;
+  onClick: (params: T) => void;
 }
 
-export const LoadGap: React.FC<Props> = ({ disabled, maxId, onClick }) => {
+export const LoadGap = <T,>({ disabled, param, onClick }: Props<T>) => {
   const intl = useIntl();
 
   const handleClick = useCallback(() => {
-    onClick(maxId);
-  }, [maxId, onClick]);
+    onClick(param);
+  }, [param, onClick]);
 
   return (
     <button
diff --git a/app/javascript/mastodon/components/status.jsx b/app/javascript/mastodon/components/status.jsx
index 502dc8bee3c0e6..1723080e956e35 100644
--- a/app/javascript/mastodon/components/status.jsx
+++ b/app/javascript/mastodon/components/status.jsx
@@ -116,6 +116,8 @@ class Status extends ImmutablePureComponent {
     cacheMediaWidth: PropTypes.func,
     cachedMediaWidth: PropTypes.number,
     scrollKey: PropTypes.string,
+    skipPrepend: PropTypes.bool,
+    avatarSize: PropTypes.number,
     deployPictureInPicture: PropTypes.func,
     pictureInPicture: ImmutablePropTypes.contains({
       inUse: PropTypes.bool,
@@ -353,7 +355,7 @@ class Status extends ImmutablePureComponent {
   };
 
   render () {
-    const { intl, hidden, featured, unread, showThread, scrollKey, pictureInPicture, previousId, nextInReplyToId, rootId } = this.props;
+    const { intl, hidden, featured, unread, showThread, scrollKey, pictureInPicture, previousId, nextInReplyToId, rootId, skipPrepend, avatarSize = 46 } = this.props;
 
     let { status, account, ...other } = this.props;
 
@@ -539,7 +541,7 @@ class Status extends ImmutablePureComponent {
     }
 
     if (account === undefined || account === null) {
-      statusAvatar = <Avatar account={status.get('account')} size={46} />;
+      statusAvatar = <Avatar account={status.get('account')} size={avatarSize} />;
     } else {
       statusAvatar = <AvatarOverlay account={status.get('account')} friend={account} />;
     }
@@ -550,7 +552,7 @@ class Status extends ImmutablePureComponent {
     return (
       <HotKeys handlers={handlers}>
         <div className={classNames('status__wrapper', `status__wrapper-${status.get('visibility')}`, { 'status__wrapper-reply': !!status.get('in_reply_to_id'), unread, focusable: !this.props.muted })} tabIndex={this.props.muted ? null : 0} data-featured={featured ? 'true' : null} aria-label={textForScreenReader(intl, status, rebloggedByText)} ref={this.handleRef} data-nosnippet={status.getIn(['account', 'noindex'], true) || undefined}>
-          {prepend}
+          {!skipPrepend && prepend}
 
           <div className={classNames('status', `status-${status.get('visibility')}`, { 'status-reply': !!status.get('in_reply_to_id'), 'status--in-thread': !!rootId, 'status--first-in-thread': previousId && (!connectUp || connectToRoot), muted: this.props.muted })} data-id={status.get('id')}>
             {(connectReply || connectUp || connectToRoot) && <div className={classNames('status__line', { 'status__line--full': connectReply, 'status__line--first': !status.get('in_reply_to_id') && !connectToRoot })} />}
diff --git a/app/javascript/mastodon/components/status_list.jsx b/app/javascript/mastodon/components/status_list.jsx
index fee6675faa2906..c6cacbd2b27285 100644
--- a/app/javascript/mastodon/components/status_list.jsx
+++ b/app/javascript/mastodon/components/status_list.jsx
@@ -107,7 +107,7 @@ export default class StatusList extends ImmutablePureComponent {
             <LoadGap
               key={'gap:' + statusIds.get(index + 1)}
               disabled={isLoading}
-              maxId={index > 0 ? statusIds.get(index - 1) : null}
+              param={index > 0 ? statusIds.get(index - 1) : null}
               onClick={onLoadMore}
             />
           );
diff --git a/app/javascript/mastodon/features/compose/components/edit_indicator.jsx b/app/javascript/mastodon/features/compose/components/edit_indicator.jsx
index cc37d2d7d8127b..106ff7bdaa41f6 100644
--- a/app/javascript/mastodon/features/compose/components/edit_indicator.jsx
+++ b/app/javascript/mastodon/features/compose/components/edit_indicator.jsx
@@ -13,6 +13,7 @@ import { cancelReplyCompose } from 'mastodon/actions/compose';
 import { Icon } from 'mastodon/components/icon';
 import { IconButton } from 'mastodon/components/icon_button';
 import { RelativeTimestamp } from 'mastodon/components/relative_timestamp';
+import { EmbeddedStatusContent } from 'mastodon/features/notifications_v2/components/embedded_status_content';
 
 const messages = defineMessages({
   cancel: { id: 'reply_indicator.cancel', defaultMessage: 'Cancel' },
@@ -33,8 +34,6 @@ export const EditIndicator = () => {
     return null;
   }
 
-  const content = { __html: status.get('contentHtml') };
-
   return (
     <div className='edit-indicator'>
       <div className='edit-indicator__header'>
@@ -49,7 +48,12 @@ export const EditIndicator = () => {
         </div>
       </div>
 
-      <div className='edit-indicator__content translate' dangerouslySetInnerHTML={content} />
+      <EmbeddedStatusContent
+        className='edit-indicator__content translate'
+        content={status.get('contentHtml')}
+        language={status.get('language')}
+        mentions={status.get('mentions')}
+      />
 
       {(status.get('poll') || status.get('media_attachments').size > 0) && (
         <div className='edit-indicator__attachments'>
diff --git a/app/javascript/mastodon/features/compose/components/reply_indicator.jsx b/app/javascript/mastodon/features/compose/components/reply_indicator.jsx
index b7959e211d6e45..cf5bae2e07415f 100644
--- a/app/javascript/mastodon/features/compose/components/reply_indicator.jsx
+++ b/app/javascript/mastodon/features/compose/components/reply_indicator.jsx
@@ -9,6 +9,7 @@ import PhotoLibraryIcon from '@/material-icons/400-24px/photo_library.svg?react'
 import { Avatar } from 'mastodon/components/avatar';
 import { DisplayName } from 'mastodon/components/display_name';
 import { Icon } from 'mastodon/components/icon';
+import { EmbeddedStatusContent } from 'mastodon/features/notifications_v2/components/embedded_status_content';
 
 export const ReplyIndicator = () => {
   const inReplyToId = useSelector(state => state.getIn(['compose', 'in_reply_to']));
@@ -19,8 +20,6 @@ export const ReplyIndicator = () => {
     return null;
   }
 
-  const content = { __html: status.get('contentHtml') };
-
   return (
     <div className='reply-indicator'>
       <div className='reply-indicator__line' />
@@ -34,7 +33,12 @@ export const ReplyIndicator = () => {
           <DisplayName account={account} />
         </Link>
 
-        <div className='reply-indicator__content translate' dangerouslySetInnerHTML={content} />
+        <EmbeddedStatusContent
+          className='reply-indicator__content translate'
+          content={status.get('contentHtml')}
+          language={status.get('language')}
+          mentions={status.get('mentions')}
+        />
 
         {(status.get('poll') || status.get('media_attachments').size > 0) && (
           <div className='reply-indicator__attachments'>
diff --git a/app/javascript/mastodon/features/notifications/components/column_settings.jsx b/app/javascript/mastodon/features/notifications/components/column_settings.jsx
index 39e394e449c176..d35e62f8f9fb8a 100644
--- a/app/javascript/mastodon/features/notifications/components/column_settings.jsx
+++ b/app/javascript/mastodon/features/notifications/components/column_settings.jsx
@@ -53,6 +53,7 @@ class ColumnSettings extends PureComponent {
 
     const filterAdvancedStr = <FormattedMessage id='notifications.column_settings.filter_bar.advanced' defaultMessage='Display all categories' />;
     const unreadMarkersShowStr = <FormattedMessage id='notifications.column_settings.unread_notifications.highlight' defaultMessage='Highlight unread notifications' />;
+    const groupingShowStr = <FormattedMessage id='notifications.column_settings.beta.grouping' defaultMessage='Group notifications' />;
     const alertStr = <FormattedMessage id='notifications.column_settings.alert' defaultMessage='Desktop notifications' />;
     const showStr = <FormattedMessage id='notifications.column_settings.show' defaultMessage='Show in column' />;
     const soundStr = <FormattedMessage id='notifications.column_settings.sound' defaultMessage='Play sound' />;
@@ -104,6 +105,16 @@ class ColumnSettings extends PureComponent {
           </div>
         </section>
 
+        <section role='group' aria-labelledby='notifications-beta'>
+          <h3 id='notifications-beta'>
+            <FormattedMessage id='notifications.column_settings.beta.category' defaultMessage='Experimental features' />
+          </h3>
+
+          <div className='column-settings__row'>
+            <SettingToggle id='unread-notification-markers' prefix='notifications' settings={settings} settingPath={['groupingBeta']} onChange={onChange} label={groupingShowStr} />
+          </div>
+        </section>
+
         <section role='group' aria-labelledby='notifications-unread-markers'>
           <h3 id='notifications-unread-markers'>
             <FormattedMessage id='notifications.column_settings.unread_notifications.category' defaultMessage='Unread notifications' />
diff --git a/app/javascript/mastodon/features/notifications/components/filtered_notifications_banner.tsx b/app/javascript/mastodon/features/notifications/components/filtered_notifications_banner.tsx
index 2c4b3b971752d9..be1ea2c556e1d2 100644
--- a/app/javascript/mastodon/features/notifications/components/filtered_notifications_banner.tsx
+++ b/app/javascript/mastodon/features/notifications/components/filtered_notifications_banner.tsx
@@ -35,7 +35,9 @@ export const FilteredNotificationsBanner: React.FC = () => {
       className='filtered-notifications-banner'
       to='/notifications/requests'
     >
-      <Icon icon={InventoryIcon} id='filtered-notifications' />
+      <div className='notification-group__icon'>
+        <Icon icon={InventoryIcon} id='filtered-notifications' />
+      </div>
 
       <div className='filtered-notifications-banner__text'>
         <strong>
diff --git a/app/javascript/mastodon/features/notifications/components/moderation_warning.tsx b/app/javascript/mastodon/features/notifications/components/moderation_warning.tsx
index 2c1683e218e6ab..827ec3b378bf39 100644
--- a/app/javascript/mastodon/features/notifications/components/moderation_warning.tsx
+++ b/app/javascript/mastodon/features/notifications/components/moderation_warning.tsx
@@ -1,7 +1,10 @@
 import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
 
+import classNames from 'classnames';
+
 import GavelIcon from '@/material-icons/400-24px/gavel.svg?react';
 import { Icon } from 'mastodon/components/icon';
+import type { AccountWarningAction } from 'mastodon/models/notification_group';
 
 // This needs to be kept in sync with app/models/account_warning.rb
 const messages = defineMessages({
@@ -36,19 +39,18 @@ const messages = defineMessages({
 });
 
 interface Props {
-  action:
-    | 'none'
-    | 'disable'
-    | 'mark_statuses_as_sensitive'
-    | 'delete_statuses'
-    | 'sensitive'
-    | 'silence'
-    | 'suspend';
+  action: AccountWarningAction;
   id: string;
-  hidden: boolean;
+  hidden?: boolean;
+  unread?: boolean;
 }
 
-export const ModerationWarning: React.FC<Props> = ({ action, id, hidden }) => {
+export const ModerationWarning: React.FC<Props> = ({
+  action,
+  id,
+  hidden,
+  unread,
+}) => {
   const intl = useIntl();
 
   if (hidden) {
@@ -56,23 +58,32 @@ export const ModerationWarning: React.FC<Props> = ({ action, id, hidden }) => {
   }
 
   return (
-    <a
-      href={`/disputes/strikes/${id}`}
-      target='_blank'
-      rel='noopener noreferrer'
-      className='notification__moderation-warning'
+    <div
+      role='button'
+      className={classNames(
+        'notification-group notification-group--link notification-group--moderation-warning focusable',
+        { 'notification-group--unread': unread },
+      )}
+      tabIndex={0}
     >
-      <Icon id='warning' icon={GavelIcon} />
+      <div className='notification-group__icon'>
+        <Icon id='warning' icon={GavelIcon} />
+      </div>
 
-      <div className='notification__moderation-warning__content'>
+      <div className='notification-group__main'>
         <p>{intl.formatMessage(messages[action])}</p>
-        <span className='link-button'>
+        <a
+          href={`/disputes/strikes/${id}`}
+          target='_blank'
+          rel='noopener noreferrer'
+          className='link-button'
+        >
           <FormattedMessage
             id='notification.moderation-warning.learn_more'
             defaultMessage='Learn more'
           />
-        </span>
+        </a>
       </div>
-    </a>
+    </div>
   );
 };
diff --git a/app/javascript/mastodon/features/notifications/components/notification.jsx b/app/javascript/mastodon/features/notifications/components/notification.jsx
index 986628fdc85a8d..70a3252509c5ed 100644
--- a/app/javascript/mastodon/features/notifications/components/notification.jsx
+++ b/app/javascript/mastodon/features/notifications/components/notification.jsx
@@ -34,7 +34,7 @@ const messages = defineMessages({
   favourite: { id: 'notification.favourite', defaultMessage: '{name} favorited your status' },
   follow: { id: 'notification.follow', defaultMessage: '{name} followed you' },
   ownPoll: { id: 'notification.own_poll', defaultMessage: 'Your poll has ended' },
-  poll: { id: 'notification.poll', defaultMessage: 'A poll you have voted in has ended' },
+  poll: { id: 'notification.poll', defaultMessage: 'A poll you voted in has ended' },
   reblog: { id: 'notification.reblog', defaultMessage: '{name} boosted your status' },
   status: { id: 'notification.status', defaultMessage: '{name} just posted' },
   update: { id: 'notification.update', defaultMessage: '{name} edited a post' },
@@ -340,7 +340,7 @@ class Notification extends ImmutablePureComponent {
               {ownPoll ? (
                 <FormattedMessage id='notification.own_poll' defaultMessage='Your poll has ended' />
               ) : (
-                <FormattedMessage id='notification.poll' defaultMessage='A poll you have voted in has ended' />
+                <FormattedMessage id='notification.poll' defaultMessage='A poll you voted in has ended' />
               )}
             </span>
           </div>
diff --git a/app/javascript/mastodon/features/notifications/components/relationships_severance_event.jsx b/app/javascript/mastodon/features/notifications/components/relationships_severance_event.jsx
index 738159fc5a2ba8..3075aff31bad1b 100644
--- a/app/javascript/mastodon/features/notifications/components/relationships_severance_event.jsx
+++ b/app/javascript/mastodon/features/notifications/components/relationships_severance_event.jsx
@@ -2,6 +2,8 @@ import PropTypes from 'prop-types';
 
 import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
 
+import classNames from 'classnames';
+
 import HeartBrokenIcon from '@/material-icons/400-24px/heart_broken-fill.svg?react';
 import { Icon }  from 'mastodon/components/icon';
 import { domain } from 'mastodon/initial_state';
@@ -13,7 +15,7 @@ const messages = defineMessages({
   user_domain_block: { id: 'notification.relationships_severance_event.user_domain_block', defaultMessage: 'You have blocked {target}, removing {followersCount} of your followers and {followingCount, plural, one {# account} other {# accounts}} you follow.' },
 });
 
-export const RelationshipsSeveranceEvent = ({ type, target, followingCount, followersCount, hidden }) => {
+export const RelationshipsSeveranceEvent = ({ type, target, followingCount, followersCount, hidden, unread }) => {
   const intl = useIntl();
 
   if (hidden) {
@@ -21,14 +23,14 @@ export const RelationshipsSeveranceEvent = ({ type, target, followingCount, foll
   }
 
   return (
-    <a href='/severed_relationships' target='_blank' rel='noopener noreferrer' className='notification__relationships-severance-event'>
-      <Icon id='heart_broken' icon={HeartBrokenIcon} />
+    <div role='button' className={classNames('notification-group notification-group--link notification-group--relationships-severance-event focusable', { 'notification-group--unread': unread })} tabIndex='0'>
+      <div className='notification-group__icon'><Icon id='heart_broken' icon={HeartBrokenIcon} /></div>
 
-      <div className='notification__relationships-severance-event__content'>
+      <div className='notification-group__main'>
         <p>{intl.formatMessage(messages[type], { from: <strong>{domain}</strong>, target: <strong>{target}</strong>, followingCount, followersCount })}</p>
-        <span className='link-button'><FormattedMessage id='notification.relationships_severance_event.learn_more' defaultMessage='Learn more' /></span>
+        <a href='/severed_relationships' target='_blank' rel='noopener noreferrer' className='link-button'><FormattedMessage id='notification.relationships_severance_event.learn_more' defaultMessage='Learn more' /></a>
       </div>
-    </a>
+    </div>
   );
 };
 
@@ -42,4 +44,5 @@ RelationshipsSeveranceEvent.propTypes = {
   followersCount: PropTypes.number.isRequired,
   followingCount: PropTypes.number.isRequired,
   hidden: PropTypes.bool,
+  unread: PropTypes.bool,
 };
diff --git a/app/javascript/mastodon/features/notifications/containers/column_settings_container.js b/app/javascript/mastodon/features/notifications/containers/column_settings_container.js
index 94383d0bb57ce2..2434c3982d582b 100644
--- a/app/javascript/mastodon/features/notifications/containers/column_settings_container.js
+++ b/app/javascript/mastodon/features/notifications/containers/column_settings_container.js
@@ -2,10 +2,13 @@ import { defineMessages, injectIntl } from 'react-intl';
 
 import { connect } from 'react-redux';
 
+import { initializeNotifications } from 'mastodon/actions/notifications_migration';
+
 import { showAlert } from '../../../actions/alerts';
 import { openModal } from '../../../actions/modal';
+import { clearNotifications } from '../../../actions/notification_groups';
 import { updateNotificationsPolicy } from '../../../actions/notification_policies';
-import { setFilter, clearNotifications, requestBrowserPermission } from '../../../actions/notifications';
+import { setFilter, requestBrowserPermission } from '../../../actions/notifications';
 import { changeAlerts as changePushNotifications } from '../../../actions/push_notifications';
 import { changeSetting } from '../../../actions/settings';
 import ColumnSettings from '../components/column_settings';
@@ -58,6 +61,9 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
       } else {
         dispatch(changeSetting(['notifications', ...path], checked));
       }
+    } else if(path[0] === 'groupingBeta') {
+      dispatch(changeSetting(['notifications', ...path], checked));
+      dispatch(initializeNotifications());
     } else {
       dispatch(changeSetting(['notifications', ...path], checked));
     }
diff --git a/app/javascript/mastodon/features/notifications/index.jsx b/app/javascript/mastodon/features/notifications/index.jsx
index 54883096ef50af..f5ebe6fe91c0e5 100644
--- a/app/javascript/mastodon/features/notifications/index.jsx
+++ b/app/javascript/mastodon/features/notifications/index.jsx
@@ -202,7 +202,7 @@ class Notifications extends PureComponent {
         <LoadGap
           key={'gap:' + notifications.getIn([index + 1, 'id'])}
           disabled={isLoading}
-          maxId={index > 0 ? notifications.getIn([index - 1, 'id']) : null}
+          param={index > 0 ? notifications.getIn([index - 1, 'id']) : null}
           onClick={this.handleLoadGap}
         />
       ) : (
diff --git a/app/javascript/mastodon/features/notifications_v2/components/avatar_group.tsx b/app/javascript/mastodon/features/notifications_v2/components/avatar_group.tsx
new file mode 100644
index 00000000000000..b5da8914a1da08
--- /dev/null
+++ b/app/javascript/mastodon/features/notifications_v2/components/avatar_group.tsx
@@ -0,0 +1,31 @@
+import { Link } from 'react-router-dom';
+
+import { Avatar } from 'mastodon/components/avatar';
+import { NOTIFICATIONS_GROUP_MAX_AVATARS } from 'mastodon/models/notification_group';
+import { useAppSelector } from 'mastodon/store';
+
+const AvatarWrapper: React.FC<{ accountId: string }> = ({ accountId }) => {
+  const account = useAppSelector((state) => state.accounts.get(accountId));
+
+  if (!account) return null;
+
+  return (
+    <Link
+      to={`/@${account.acct}`}
+      title={`@${account.acct}`}
+      data-hover-card-account={account.id}
+    >
+      <Avatar account={account} size={28} />
+    </Link>
+  );
+};
+
+export const AvatarGroup: React.FC<{ accountIds: string[] }> = ({
+  accountIds,
+}) => (
+  <div className='notification-group__avatar-group'>
+    {accountIds.slice(0, NOTIFICATIONS_GROUP_MAX_AVATARS).map((accountId) => (
+      <AvatarWrapper key={accountId} accountId={accountId} />
+    ))}
+  </div>
+);
diff --git a/app/javascript/mastodon/features/notifications_v2/components/embedded_status.tsx b/app/javascript/mastodon/features/notifications_v2/components/embedded_status.tsx
new file mode 100644
index 00000000000000..0881e24e3f062b
--- /dev/null
+++ b/app/javascript/mastodon/features/notifications_v2/components/embedded_status.tsx
@@ -0,0 +1,93 @@
+import { useCallback } from 'react';
+
+import { FormattedMessage } from 'react-intl';
+
+import { useHistory } from 'react-router-dom';
+
+import type { List as ImmutableList, RecordOf } from 'immutable';
+
+import BarChart4BarsIcon from '@/material-icons/400-24px/bar_chart_4_bars.svg?react';
+import PhotoLibraryIcon from '@/material-icons/400-24px/photo_library.svg?react';
+import { Avatar } from 'mastodon/components/avatar';
+import { DisplayName } from 'mastodon/components/display_name';
+import { Icon } from 'mastodon/components/icon';
+import type { Status } from 'mastodon/models/status';
+import { useAppSelector } from 'mastodon/store';
+
+import { EmbeddedStatusContent } from './embedded_status_content';
+
+export type Mention = RecordOf<{ url: string; acct: string }>;
+
+export const EmbeddedStatus: React.FC<{ statusId: string }> = ({
+  statusId,
+}) => {
+  const history = useHistory();
+
+  const status = useAppSelector(
+    (state) => state.statuses.get(statusId) as Status | undefined,
+  );
+
+  const account = useAppSelector((state) =>
+    state.accounts.get(status?.get('account') as string),
+  );
+
+  const handleClick = useCallback(() => {
+    if (!account) return;
+
+    history.push(`/@${account.acct}/${statusId}`);
+  }, [statusId, account, history]);
+
+  if (!status) {
+    return null;
+  }
+
+  // Assign status attributes to variables with a forced type, as status is not yet properly typed
+  const contentHtml = status.get('contentHtml') as string;
+  const poll = status.get('poll');
+  const language = status.get('language') as string;
+  const mentions = status.get('mentions') as ImmutableList<Mention>;
+  const mediaAttachmentsSize = (
+    status.get('media_attachments') as ImmutableList<unknown>
+  ).size;
+
+  return (
+    <div className='notification-group__embedded-status'>
+      <div className='notification-group__embedded-status__account'>
+        <Avatar account={account} size={16} />
+        <DisplayName account={account} />
+      </div>
+
+      <EmbeddedStatusContent
+        className='notification-group__embedded-status__content reply-indicator__content translate'
+        content={contentHtml}
+        language={language}
+        mentions={mentions}
+        onClick={handleClick}
+      />
+
+      {(poll || mediaAttachmentsSize > 0) && (
+        <div className='notification-group__embedded-status__attachments reply-indicator__attachments'>
+          {!!poll && (
+            <>
+              <Icon icon={BarChart4BarsIcon} id='bar-chart-4-bars' />
+              <FormattedMessage
+                id='reply_indicator.poll'
+                defaultMessage='Poll'
+              />
+            </>
+          )}
+          {mediaAttachmentsSize > 0 && (
+            <>
+              <Icon icon={PhotoLibraryIcon} id='photo-library' />
+              <FormattedMessage
+                id='reply_indicator.attachments'
+                defaultMessage='{count, plural, one {# attachment} other {# attachments}}'
+                values={{ count: mediaAttachmentsSize }}
+              />
+            </>
+          )}
+        </div>
+      )}
+    </div>
+  );
+};
diff --git a/app/javascript/mastodon/features/notifications_v2/components/embedded_status_content.tsx b/app/javascript/mastodon/features/notifications_v2/components/embedded_status_content.tsx
new file mode 100644
index 00000000000000..310a6857115a61
--- /dev/null
+++ b/app/javascript/mastodon/features/notifications_v2/components/embedded_status_content.tsx
@@ -0,0 +1,165 @@
+import { useCallback, useRef } from 'react';
+
+import { useHistory } from 'react-router-dom';
+
+import type { List } from 'immutable';
+
+import type { History } from 'history';
+
+import type { Mention } from './embedded_status';
+
+const handleMentionClick = (
+  history: History,
+  mention: Mention,
+  e: MouseEvent,
+) => {
+  if (e.button === 0 && !(e.ctrlKey || e.metaKey)) {
+    e.preventDefault();
+    history.push(`/@${mention.get('acct')}`);
+  }
+};
+
+const handleHashtagClick = (
+  history: History,
+  hashtag: string,
+  e: MouseEvent,
+) => {
+  if (e.button === 0 && !(e.ctrlKey || e.metaKey)) {
+    e.preventDefault();
+    history.push(`/tags/${hashtag.replace(/^#/, '')}`);
+  }
+};
+
+export const EmbeddedStatusContent: React.FC<{
+  content: string;
+  mentions: List<Mention>;
+  language: string;
+  onClick?: () => void;
+  className?: string;
+}> = ({ content, mentions, language, onClick, className }) => {
+  const clickCoordinatesRef = useRef<[number, number] | null>();
+  const history = useHistory();
+
+  const handleMouseDown = useCallback<React.MouseEventHandler<HTMLDivElement>>(
+    ({ clientX, clientY }) => {
+      clickCoordinatesRef.current = [clientX, clientY];
+    },
+    [clickCoordinatesRef],
+  );
+
+  const handleMouseUp = useCallback<React.MouseEventHandler<HTMLDivElement>>(
+    ({ clientX, clientY, target, button }) => {
+      const [startX, startY] = clickCoordinatesRef.current ?? [0, 0];
+      const [deltaX, deltaY] = [
+        Math.abs(clientX - startX),
+        Math.abs(clientY - startY),
+      ];
+
+      let element: HTMLDivElement | null = target as HTMLDivElement;
+
+      while (element) {
+        if (
+          element.localName === 'button' ||
+          element.localName === 'a' ||
+          element.localName === 'label'
+        ) {
+          return;
+        }
+
+        element = element.parentNode as HTMLDivElement | null;
+      }
+
+      if (deltaX + deltaY < 5 && button === 0 && onClick) {
+        onClick();
+      }
+
+      clickCoordinatesRef.current = null;
+    },
+    [clickCoordinatesRef, onClick],
+  );
+
+  const handleMouseEnter = useCallback<React.MouseEventHandler<HTMLDivElement>>(
+    ({ currentTarget }) => {
+      const emojis =
+        currentTarget.querySelectorAll<HTMLImageElement>('.custom-emoji');
+
+      for (const emoji of emojis) {
+        const newSrc = emoji.getAttribute('data-original');
+        if (newSrc) emoji.src = newSrc;
+      }
+    },
+    [],
+  );
+
+  const handleMouseLeave = useCallback<React.MouseEventHandler<HTMLDivElement>>(
+    ({ currentTarget }) => {
+      const emojis =
+        currentTarget.querySelectorAll<HTMLImageElement>('.custom-emoji');
+
+      for (const emoji of emojis) {
+        const newSrc = emoji.getAttribute('data-static');
+        if (newSrc) emoji.src = newSrc;
+      }
+    },
+    [],
+  );
+
+  const handleContentRef = useCallback(
+    (node: HTMLDivElement | null) => {
+      if (!node) {
+        return;
+      }
+
+      const links = node.querySelectorAll<HTMLAnchorElement>('a');
+
+      for (const link of links) {
+        if (link.classList.contains('status-link')) {
+          continue;
+        }
+
+        link.classList.add('status-link');
+
+        const mention = mentions.find((item) => link.href === item.get('url'));
+
+        if (mention) {
+          link.addEventListener(
+            'click',
+            handleMentionClick.bind(null, history, mention),
+            false,
+          );
+          link.setAttribute('title', `@${mention.get('acct')}`);
+          link.setAttribute('href', `/@${mention.get('acct')}`);
+        } else if (
+          link.textContent?.[0] === '#' ||
+          link.previousSibling?.textContent?.endsWith('#')
+        ) {
+          link.addEventListener(
+            'click',
+            handleHashtagClick.bind(null, history, link.text),
+            false,
+          );
+          link.setAttribute('href', `/tags/${link.text.replace(/^#/, '')}`);
+        } else {
+          link.setAttribute('title', link.href);
+          link.classList.add('unhandled-link');
+        }
+      }
+    },
+    [mentions, history],
+  );
+
+  return (
+    <div
+      role='button'
+      tabIndex={0}
+      className={className}
+      ref={handleContentRef}
+      lang={language}
+      dangerouslySetInnerHTML={{ __html: content }}
+      onMouseDown={handleMouseDown}
+      onMouseUp={handleMouseUp}
+      onMouseEnter={handleMouseEnter}
+      onMouseLeave={handleMouseLeave}
+    />
+  );
+};
diff --git a/app/javascript/mastodon/features/notifications_v2/components/names_list.tsx b/app/javascript/mastodon/features/notifications_v2/components/names_list.tsx
new file mode 100644
index 00000000000000..3d70cc0b623260
--- /dev/null
+++ b/app/javascript/mastodon/features/notifications_v2/components/names_list.tsx
@@ -0,0 +1,51 @@
+import { FormattedMessage } from 'react-intl';
+
+import { Link } from 'react-router-dom';
+
+import { useAppSelector } from 'mastodon/store';
+
+export const NamesList: React.FC<{
+  accountIds: string[];
+  total: number;
+  seeMoreHref?: string;
+}> = ({ accountIds, total, seeMoreHref }) => {
+  const lastAccountId = accountIds[0] ?? '0';
+  const account = useAppSelector((state) => state.accounts.get(lastAccountId));
+
+  if (!account) return null;
+
+  const displayedName = (
+    <Link
+      to={`/@${account.acct}`}
+      title={`@${account.acct}`}
+      data-hover-card-account={account.id}
+    >
+      <bdi dangerouslySetInnerHTML={{ __html: account.display_name_html }} />
+    </Link>
+  );
+
+  if (total === 1) {
+    return displayedName;
+  }
+
+  if (seeMoreHref)
+    return (
+      <FormattedMessage
+        id='name_and_others_with_link'
+        defaultMessage='{name} and <a>{count, plural, one {# other} other {# others}}</a>'
+        values={{
+          name: displayedName,
+          count: total - 1,
+          a: (chunks) => <Link to={seeMoreHref}>{chunks}</Link>,
+        }}
+      />
+    );
+
+  return (
+    <FormattedMessage
+      id='name_and_others'
+      defaultMessage='{name} and {count, plural, one {# other} other {# others}}'
+      values={{ name: displayedName, count: total - 1 }}
+    />
+  );
+};
diff --git a/app/javascript/mastodon/features/notifications_v2/components/notification_admin_report.tsx b/app/javascript/mastodon/features/notifications_v2/components/notification_admin_report.tsx
new file mode 100644
index 00000000000000..fda5798ae98b49
--- /dev/null
+++ b/app/javascript/mastodon/features/notifications_v2/components/notification_admin_report.tsx
@@ -0,0 +1,132 @@
+import { FormattedMessage, useIntl, defineMessages } from 'react-intl';
+
+import classNames from 'classnames';
+
+import FlagIcon from '@/material-icons/400-24px/flag-fill.svg?react';
+import { Icon } from 'mastodon/components/icon';
+import { RelativeTimestamp } from 'mastodon/components/relative_timestamp';
+import type { NotificationGroupAdminReport } from 'mastodon/models/notification_group';
+import { useAppSelector } from 'mastodon/store';
+
+// This needs to be kept in sync with app/models/report.rb
+const messages = defineMessages({
+  other: {
+    id: 'report_notification.categories.other_sentence',
+    defaultMessage: 'other',
+  },
+  spam: {
+    id: 'report_notification.categories.spam_sentence',
+    defaultMessage: 'spam',
+  },
+  legal: {
+    id: 'report_notification.categories.legal_sentence',
+    defaultMessage: 'illegal content',
+  },
+  violation: {
+    id: 'report_notification.categories.violation_sentence',
+    defaultMessage: 'rule violation',
+  },
+});
+
+export const NotificationAdminReport: React.FC<{
+  notification: NotificationGroupAdminReport;
+  unread?: boolean;
+}> = ({ notification, notification: { report }, unread }) => {
+  const intl = useIntl();
+  const targetAccount = useAppSelector((state) =>
+    state.accounts.get(report.targetAccountId),
+  );
+  const account = useAppSelector((state) =>
+    state.accounts.get(notification.sampleAccountIds[0] ?? '0'),
+  );
+
+  if (!account || !targetAccount) return null;
+
+  const values = {
+    name: (
+      <bdi
+        dangerouslySetInnerHTML={{ __html: account.get('display_name_html') }}
+      />
+    ),
+    target: (
+      <bdi
+        dangerouslySetInnerHTML={{
+          __html: targetAccount.get('display_name_html'),
+        }}
+      />
+    ),
+    category: intl.formatMessage(messages[report.category]),
+    count: report.status_ids.length,
+  };
+
+  let message;
+
+  if (report.status_ids.length > 0) {
+    if (report.category === 'other') {
+      message = (
+        <FormattedMessage
+          id='notification.admin.report_account_other'
+          defaultMessage='{name} reported {count, plural, one {one post} other {# posts}} from {target}'
+          values={values}
+        />
+      );
+    } else {
+      message = (
+        <FormattedMessage
+          id='notification.admin.report_account'
+          defaultMessage='{name} reported {count, plural, one {one post} other {# posts}} from {target} for {category}'
+          values={values}
+        />
+      );
+    }
+  } else {
+    if (report.category === 'other') {
+      message = (
+        <FormattedMessage
+          id='notification.admin.report_statuses_other'
+          defaultMessage='{name} reported {target}'
+          values={values}
+        />
+      );
+    } else {
+      message = (
+        <FormattedMessage
+          id='notification.admin.report_statuses'
+          defaultMessage='{name} reported {target} for {category}'
+          values={values}
+        />
+      );
+    }
+  }
+
+  return (
+    <a
+      href={`/admin/reports/${report.id}`}
+      target='_blank'
+      rel='noopener noreferrer'
+      className={classNames(
+        'notification-group notification-group--link notification-group--admin-report focusable',
+        { 'notification-group--unread': unread },
+      )}
+    >
+      <div className='notification-group__icon'>
+        <Icon id='flag' icon={FlagIcon} />
+      </div>
+
+      <div className='notification-group__main'>
+        <div className='notification-group__main__header'>
+          <div className='notification-group__main__header__label'>
+            {message}
+            <RelativeTimestamp timestamp={report.created_at} />
+          </div>
+        </div>
+
+        {report.comment.length > 0 && (
+          <div className='notification-group__embedded-status__content'>
+            “{report.comment}”
+          </div>
+        )}
+      </div>
+    </a>
+  );
+};
diff --git a/app/javascript/mastodon/features/notifications_v2/components/notification_admin_sign_up.tsx b/app/javascript/mastodon/features/notifications_v2/components/notification_admin_sign_up.tsx
new file mode 100644
index 00000000000000..9f7afc63f5b073
--- /dev/null
+++ b/app/javascript/mastodon/features/notifications_v2/components/notification_admin_sign_up.tsx
@@ -0,0 +1,31 @@
+import { FormattedMessage } from 'react-intl';
+
+import PersonAddIcon from '@/material-icons/400-24px/person_add-fill.svg?react';
+import type { NotificationGroupAdminSignUp } from 'mastodon/models/notification_group';
+
+import type { LabelRenderer } from './notification_group_with_status';
+import { NotificationGroupWithStatus } from './notification_group_with_status';
+
+const labelRenderer: LabelRenderer = (values) => (
+  <FormattedMessage
+    id='notification.admin.sign_up'
+    defaultMessage='{name} signed up'
+    values={values}
+  />
+);
+
+export const NotificationAdminSignUp: React.FC<{
+  notification: NotificationGroupAdminSignUp;
+  unread: boolean;
+}> = ({ notification, unread }) => (
+  <NotificationGroupWithStatus
+    type='admin-sign-up'
+    icon={PersonAddIcon}
+    iconId='person-add'
+    accountIds={notification.sampleAccountIds}
+    timestamp={notification.latest_page_notification_at}
+    count={notification.notifications_count}
+    labelRenderer={labelRenderer}
+    unread={unread}
+  />
+);
diff --git a/app/javascript/mastodon/features/notifications_v2/components/notification_favourite.tsx b/app/javascript/mastodon/features/notifications_v2/components/notification_favourite.tsx
new file mode 100644
index 00000000000000..22838fe69bc0be
--- /dev/null
+++ b/app/javascript/mastodon/features/notifications_v2/components/notification_favourite.tsx
@@ -0,0 +1,45 @@
+import { FormattedMessage } from 'react-intl';
+
+import StarIcon from '@/material-icons/400-24px/star-fill.svg?react';
+import type { NotificationGroupFavourite } from 'mastodon/models/notification_group';
+import { useAppSelector } from 'mastodon/store';
+
+import type { LabelRenderer } from './notification_group_with_status';
+import { NotificationGroupWithStatus } from './notification_group_with_status';
+
+const labelRenderer: LabelRenderer = (values) => (
+  <FormattedMessage
+    id='notification.favourite'
+    defaultMessage='{name} favorited your status'
+    values={values}
+  />
+);
+
+export const NotificationFavourite: React.FC<{
+  notification: NotificationGroupFavourite;
+  unread: boolean;
+}> = ({ notification, unread }) => {
+  const { statusId } = notification;
+  const statusAccount = useAppSelector(
+    (state) =>
+      state.accounts.get(state.statuses.getIn([statusId, 'account']) as string)
+        ?.acct,
+  );
+
+  return (
+    <NotificationGroupWithStatus
+      type='favourite'
+      icon={StarIcon}
+      iconId='star'
+      accountIds={notification.sampleAccountIds}
+      statusId={notification.statusId}
+      timestamp={notification.latest_page_notification_at}
+      count={notification.notifications_count}
+      labelRenderer={labelRenderer}
+      labelSeeMoreHref={
+        statusAccount ? `/@${statusAccount}/${statusId}/favourites` : undefined
+      }
+      unread={unread}
+    />
+  );
+};
diff --git a/app/javascript/mastodon/features/notifications_v2/components/notification_follow.tsx b/app/javascript/mastodon/features/notifications_v2/components/notification_follow.tsx
new file mode 100644
index 00000000000000..0ed96ae636c662
--- /dev/null
+++ b/app/javascript/mastodon/features/notifications_v2/components/notification_follow.tsx
@@ -0,0 +1,31 @@
+import { FormattedMessage } from 'react-intl';
+
+import PersonAddIcon from '@/material-icons/400-24px/person_add-fill.svg?react';
+import type { NotificationGroupFollow } from 'mastodon/models/notification_group';
+
+import type { LabelRenderer } from './notification_group_with_status';
+import { NotificationGroupWithStatus } from './notification_group_with_status';
+
+const labelRenderer: LabelRenderer = (values) => (
+  <FormattedMessage
+    id='notification.follow'
+    defaultMessage='{name} followed you'
+    values={values}
+  />
+);
+
+export const NotificationFollow: React.FC<{
+  notification: NotificationGroupFollow;
+  unread: boolean;
+}> = ({ notification, unread }) => (
+  <NotificationGroupWithStatus
+    type='follow'
+    icon={PersonAddIcon}
+    iconId='person-add'
+    accountIds={notification.sampleAccountIds}
+    timestamp={notification.latest_page_notification_at}
+    count={notification.notifications_count}
+    labelRenderer={labelRenderer}
+    unread={unread}
+  />
+);
diff --git a/app/javascript/mastodon/features/notifications_v2/components/notification_follow_request.tsx b/app/javascript/mastodon/features/notifications_v2/components/notification_follow_request.tsx
new file mode 100644
index 00000000000000..8c9837efa34da8
--- /dev/null
+++ b/app/javascript/mastodon/features/notifications_v2/components/notification_follow_request.tsx
@@ -0,0 +1,78 @@
+import { useCallback } from 'react';
+
+import { FormattedMessage, useIntl, defineMessages } from 'react-intl';
+
+import CheckIcon from '@/material-icons/400-24px/check.svg?react';
+import CloseIcon from '@/material-icons/400-24px/close.svg?react';
+import PersonAddIcon from '@/material-icons/400-24px/person_add-fill.svg?react';
+import {
+  authorizeFollowRequest,
+  rejectFollowRequest,
+} from 'mastodon/actions/accounts';
+import { IconButton } from 'mastodon/components/icon_button';
+import type { NotificationGroupFollowRequest } from 'mastodon/models/notification_group';
+import { useAppDispatch } from 'mastodon/store';
+
+import type { LabelRenderer } from './notification_group_with_status';
+import { NotificationGroupWithStatus } from './notification_group_with_status';
+
+const messages = defineMessages({
+  authorize: { id: 'follow_request.authorize', defaultMessage: 'Authorize' },
+  reject: { id: 'follow_request.reject', defaultMessage: 'Reject' },
+});
+
+const labelRenderer: LabelRenderer = (values) => (
+  <FormattedMessage
+    id='notification.follow_request'
+    defaultMessage='{name} has requested to follow you'
+    values={values}
+  />
+);
+
+export const NotificationFollowRequest: React.FC<{
+  notification: NotificationGroupFollowRequest;
+  unread: boolean;
+}> = ({ notification, unread }) => {
+  const intl = useIntl();
+
+  const dispatch = useAppDispatch();
+
+  const onAuthorize = useCallback(() => {
+    dispatch(authorizeFollowRequest(notification.sampleAccountIds[0]));
+  }, [dispatch, notification.sampleAccountIds]);
+
+  const onReject = useCallback(() => {
+    dispatch(rejectFollowRequest(notification.sampleAccountIds[0]));
+  }, [dispatch, notification.sampleAccountIds]);
+
+  const actions = (
+    <div className='notification-group__actions'>
+      <IconButton
+        title={intl.formatMessage(messages.reject)}
+        icon='times'
+        iconComponent={CloseIcon}
+        onClick={onReject}
+      />
+      <IconButton
+        title={intl.formatMessage(messages.authorize)}
+        icon='check'
+        iconComponent={CheckIcon}
+        onClick={onAuthorize}
+      />
+    </div>
+  );
+
+  return (
+    <NotificationGroupWithStatus
+      type='follow-request'
+      icon={PersonAddIcon}
+      iconId='person-add'
+      accountIds={notification.sampleAccountIds}
+      timestamp={notification.latest_page_notification_at}
+      count={notification.notifications_count}
+      labelRenderer={labelRenderer}
+      actions={actions}
+      unread={unread}
+    />
+  );
+};
diff --git a/app/javascript/mastodon/features/notifications_v2/components/notification_group.tsx b/app/javascript/mastodon/features/notifications_v2/components/notification_group.tsx
new file mode 100644
index 00000000000000..1cfb235b7b6d02
--- /dev/null
+++ b/app/javascript/mastodon/features/notifications_v2/components/notification_group.tsx
@@ -0,0 +1,134 @@
+import { useMemo } from 'react';
+
+import { HotKeys } from 'react-hotkeys';
+
+import type { NotificationGroup as NotificationGroupModel } from 'mastodon/models/notification_group';
+import { useAppSelector } from 'mastodon/store';
+
+import { NotificationAdminReport } from './notification_admin_report';
+import { NotificationAdminSignUp } from './notification_admin_sign_up';
+import { NotificationFavourite } from './notification_favourite';
+import { NotificationFollow } from './notification_follow';
+import { NotificationFollowRequest } from './notification_follow_request';
+import { NotificationMention } from './notification_mention';
+import { NotificationModerationWarning } from './notification_moderation_warning';
+import { NotificationPoll } from './notification_poll';
+import { NotificationReblog } from './notification_reblog';
+import { NotificationSeveredRelationships } from './notification_severed_relationships';
+import { NotificationStatus } from './notification_status';
+import { NotificationUpdate } from './notification_update';
+
+export const NotificationGroup: React.FC<{
+  notificationGroupId: NotificationGroupModel['group_key'];
+  unread: boolean;
+  onMoveUp: (groupId: string) => void;
+  onMoveDown: (groupId: string) => void;
+}> = ({ notificationGroupId, unread, onMoveUp, onMoveDown }) => {
+  const notificationGroup = useAppSelector((state) =>
+    state.notificationGroups.groups.find(
+      (item) => item.type !== 'gap' && item.group_key === notificationGroupId,
+    ),
+  );
+
+  const handlers = useMemo(
+    () => ({
+      moveUp: () => {
+        onMoveUp(notificationGroupId);
+      },
+
+      moveDown: () => {
+        onMoveDown(notificationGroupId);
+      },
+    }),
+    [notificationGroupId, onMoveUp, onMoveDown],
+  );
+
+  if (!notificationGroup || notificationGroup.type === 'gap') return null;
+
+  let content;
+
+  switch (notificationGroup.type) {
+    case 'reblog':
+      content = (
+        <NotificationReblog unread={unread} notification={notificationGroup} />
+      );
+      break;
+    case 'favourite':
+      content = (
+        <NotificationFavourite
+          unread={unread}
+          notification={notificationGroup}
+        />
+      );
+      break;
+    case 'severed_relationships':
+      content = (
+        <NotificationSeveredRelationships
+          unread={unread}
+          notification={notificationGroup}
+        />
+      );
+      break;
+    case 'mention':
+      content = (
+        <NotificationMention unread={unread} notification={notificationGroup} />
+      );
+      break;
+    case 'follow':
+      content = (
+        <NotificationFollow unread={unread} notification={notificationGroup} />
+      );
+      break;
+    case 'follow_request':
+      content = (
+        <NotificationFollowRequest
+          unread={unread}
+          notification={notificationGroup}
+        />
+      );
+      break;
+    case 'poll':
+      content = (
+        <NotificationPoll unread={unread} notification={notificationGroup} />
+      );
+      break;
+    case 'status':
+      content = (
+        <NotificationStatus unread={unread} notification={notificationGroup} />
+      );
+      break;
+    case 'update':
+      content = (
+        <NotificationUpdate unread={unread} notification={notificationGroup} />
+      );
+      break;
+    case 'admin.sign_up':
+      content = (
+        <NotificationAdminSignUp
+          unread={unread}
+          notification={notificationGroup}
+        />
+      );
+      break;
+    case 'admin.report':
+      content = (
+        <NotificationAdminReport
+          unread={unread}
+          notification={notificationGroup}
+        />
+      );
+      break;
+    case 'moderation_warning':
+      content = (
+        <NotificationModerationWarning
+          unread={unread}
+          notification={notificationGroup}
+        />
+      );
+      break;
+    default:
+      return null;
+  }
+
+  return <HotKeys handlers={handlers}>{content}</HotKeys>;
+};
diff --git a/app/javascript/mastodon/features/notifications_v2/components/notification_group_with_status.tsx b/app/javascript/mastodon/features/notifications_v2/components/notification_group_with_status.tsx
new file mode 100644
index 00000000000000..23004f7ee85563
--- /dev/null
+++ b/app/javascript/mastodon/features/notifications_v2/components/notification_group_with_status.tsx
@@ -0,0 +1,91 @@
+import { useMemo } from 'react';
+
+import classNames from 'classnames';
+
+import type { IconProp } from 'mastodon/components/icon';
+import { Icon } from 'mastodon/components/icon';
+import { RelativeTimestamp } from 'mastodon/components/relative_timestamp';
+
+import { AvatarGroup } from './avatar_group';
+import { EmbeddedStatus } from './embedded_status';
+import { NamesList } from './names_list';
+
+export type LabelRenderer = (
+  values: Record<string, React.ReactNode>,
+) => JSX.Element;
+
+export const NotificationGroupWithStatus: React.FC<{
+  icon: IconProp;
+  iconId: string;
+  statusId?: string;
+  actions?: JSX.Element;
+  count: number;
+  accountIds: string[];
+  timestamp: string;
+  labelRenderer: LabelRenderer;
+  labelSeeMoreHref?: string;
+  type: string;
+  unread: boolean;
+}> = ({
+  icon,
+  iconId,
+  timestamp,
+  accountIds,
+  actions,
+  count,
+  statusId,
+  labelRenderer,
+  labelSeeMoreHref,
+  type,
+  unread,
+}) => {
+  const label = useMemo(
+    () =>
+      labelRenderer({
+        name: (
+          <NamesList
+            accountIds={accountIds}
+            total={count}
+            seeMoreHref={labelSeeMoreHref}
+          />
+        ),
+      }),
+    [labelRenderer, accountIds, count, labelSeeMoreHref],
+  );
+
+  return (
+    <div
+      role='button'
+      className={classNames(
+        `notification-group focusable notification-group--${type}`,
+        { 'notification-group--unread': unread },
+      )}
+      tabIndex={0}
+    >
+      <div className='notification-group__icon'>
+        <Icon icon={icon} id={iconId} />
+      </div>
+
+      <div className='notification-group__main'>
+        <div className='notification-group__main__header'>
+          <div className='notification-group__main__header__wrapper'>
+            <AvatarGroup accountIds={accountIds} />
+
+            {actions}
+          </div>
+
+          <div className='notification-group__main__header__label'>
+            {label}
+            {timestamp && <RelativeTimestamp timestamp={timestamp} />}
+          </div>
+        </div>
+
+        {statusId && (
+          <div className='notification-group__main__status'>
+            <EmbeddedStatus statusId={statusId} />
+          </div>
+        )}
+      </div>
+    </div>
+  );
+};
diff --git a/app/javascript/mastodon/features/notifications_v2/components/notification_mention.tsx b/app/javascript/mastodon/features/notifications_v2/components/notification_mention.tsx
new file mode 100644
index 00000000000000..8c584f0ce1dde2
--- /dev/null
+++ b/app/javascript/mastodon/features/notifications_v2/components/notification_mention.tsx
@@ -0,0 +1,55 @@
+import { FormattedMessage } from 'react-intl';
+
+import ReplyIcon from '@/material-icons/400-24px/reply-fill.svg?react';
+import type { StatusVisibility } from 'mastodon/api_types/statuses';
+import type { NotificationGroupMention } from 'mastodon/models/notification_group';
+import { useAppSelector } from 'mastodon/store';
+
+import type { LabelRenderer } from './notification_group_with_status';
+import { NotificationWithStatus } from './notification_with_status';
+
+const labelRenderer: LabelRenderer = (values) => (
+  <FormattedMessage
+    id='notification.mention'
+    defaultMessage='{name} mentioned you'
+    values={values}
+  />
+);
+
+const privateMentionLabelRenderer: LabelRenderer = (values) => (
+  <FormattedMessage
+    id='notification.private_mention'
+    defaultMessage='{name} privately mentioned you'
+    values={values}
+  />
+);
+
+export const NotificationMention: React.FC<{
+  notification: NotificationGroupMention;
+  unread: boolean;
+}> = ({ notification, unread }) => {
+  const statusVisibility = useAppSelector(
+    (state) =>
+      state.statuses.getIn([
+        notification.statusId,
+        'visibility',
+      ]) as StatusVisibility,
+  );
+
+  return (
+    <NotificationWithStatus
+      type='mention'
+      icon={ReplyIcon}
+      iconId='reply'
+      accountIds={notification.sampleAccountIds}
+      count={notification.notifications_count}
+      statusId={notification.statusId}
+      labelRenderer={
+        statusVisibility === 'direct'
+          ? privateMentionLabelRenderer
+          : labelRenderer
+      }
+      unread={unread}
+    />
+  );
+};
diff --git a/app/javascript/mastodon/features/notifications_v2/components/notification_moderation_warning.tsx b/app/javascript/mastodon/features/notifications_v2/components/notification_moderation_warning.tsx
new file mode 100644
index 00000000000000..d653385fda83c4
--- /dev/null
+++ b/app/javascript/mastodon/features/notifications_v2/components/notification_moderation_warning.tsx
@@ -0,0 +1,13 @@
+import { ModerationWarning } from 'mastodon/features/notifications/components/moderation_warning';
+import type { NotificationGroupModerationWarning } from 'mastodon/models/notification_group';
+
+export const NotificationModerationWarning: React.FC<{
+  notification: NotificationGroupModerationWarning;
+  unread: boolean;
+}> = ({ notification: { moderationWarning }, unread }) => (
+  <ModerationWarning
+    action={moderationWarning.action}
+    id={moderationWarning.id}
+    unread={unread}
+  />
+);
diff --git a/app/javascript/mastodon/features/notifications_v2/components/notification_poll.tsx b/app/javascript/mastodon/features/notifications_v2/components/notification_poll.tsx
new file mode 100644
index 00000000000000..a7748c2c7c372b
--- /dev/null
+++ b/app/javascript/mastodon/features/notifications_v2/components/notification_poll.tsx
@@ -0,0 +1,41 @@
+import { FormattedMessage } from 'react-intl';
+
+import BarChart4BarsIcon from '@/material-icons/400-20px/bar_chart_4_bars.svg?react';
+import { me } from 'mastodon/initial_state';
+import type { NotificationGroupPoll } from 'mastodon/models/notification_group';
+
+import { NotificationWithStatus } from './notification_with_status';
+
+const labelRendererOther = () => (
+  <FormattedMessage
+    id='notification.poll'
+    defaultMessage='A poll you voted in has ended'
+  />
+);
+
+const labelRendererOwn = () => (
+  <FormattedMessage
+    id='notification.own_poll'
+    defaultMessage='Your poll has ended'
+  />
+);
+
+export const NotificationPoll: React.FC<{
+  notification: NotificationGroupPoll;
+  unread: boolean;
+}> = ({ notification, unread }) => (
+  <NotificationWithStatus
+    type='poll'
+    icon={BarChart4BarsIcon}
+    iconId='bar-chart-4-bars'
+    accountIds={notification.sampleAccountIds}
+    count={notification.notifications_count}
+    statusId={notification.statusId}
+    labelRenderer={
+      notification.sampleAccountIds[0] === me
+        ? labelRendererOwn
+        : labelRendererOther
+    }
+    unread={unread}
+  />
+);
diff --git a/app/javascript/mastodon/features/notifications_v2/components/notification_reblog.tsx b/app/javascript/mastodon/features/notifications_v2/components/notification_reblog.tsx
new file mode 100644
index 00000000000000..06255686884142
--- /dev/null
+++ b/app/javascript/mastodon/features/notifications_v2/components/notification_reblog.tsx
@@ -0,0 +1,45 @@
+import { FormattedMessage } from 'react-intl';
+
+import RepeatIcon from '@/material-icons/400-24px/repeat.svg?react';
+import type { NotificationGroupReblog } from 'mastodon/models/notification_group';
+import { useAppSelector } from 'mastodon/store';
+
+import type { LabelRenderer } from './notification_group_with_status';
+import { NotificationGroupWithStatus } from './notification_group_with_status';
+
+const labelRenderer: LabelRenderer = (values) => (
+  <FormattedMessage
+    id='notification.reblog'
+    defaultMessage='{name} boosted your status'
+    values={values}
+  />
+);
+
+export const NotificationReblog: React.FC<{
+  notification: NotificationGroupReblog;
+  unread: boolean;
+}> = ({ notification, unread }) => {
+  const { statusId } = notification;
+  const statusAccount = useAppSelector(
+    (state) =>
+      state.accounts.get(state.statuses.getIn([statusId, 'account']) as string)
+        ?.acct,
+  );
+
+  return (
+    <NotificationGroupWithStatus
+      type='reblog'
+      icon={RepeatIcon}
+      iconId='repeat'
+      accountIds={notification.sampleAccountIds}
+      statusId={notification.statusId}
+      timestamp={notification.latest_page_notification_at}
+      count={notification.notifications_count}
+      labelRenderer={labelRenderer}
+      labelSeeMoreHref={
+        statusAccount ? `/@${statusAccount}/${statusId}/reblogs` : undefined
+      }
+      unread={unread}
+    />
+  );
+};
diff --git a/app/javascript/mastodon/features/notifications_v2/components/notification_severed_relationships.tsx b/app/javascript/mastodon/features/notifications_v2/components/notification_severed_relationships.tsx
new file mode 100644
index 00000000000000..fd92498ea3dfc2
--- /dev/null
+++ b/app/javascript/mastodon/features/notifications_v2/components/notification_severed_relationships.tsx
@@ -0,0 +1,15 @@
+import { RelationshipsSeveranceEvent } from 'mastodon/features/notifications/components/relationships_severance_event';
+import type { NotificationGroupSeveredRelationships } from 'mastodon/models/notification_group';
+
+export const NotificationSeveredRelationships: React.FC<{
+  notification: NotificationGroupSeveredRelationships;
+  unread: boolean;
+}> = ({ notification: { event }, unread }) => (
+  <RelationshipsSeveranceEvent
+    type={event.type}
+    target={event.target_name}
+    followersCount={event.followers_count}
+    followingCount={event.following_count}
+    unread={unread}
+  />
+);
diff --git a/app/javascript/mastodon/features/notifications_v2/components/notification_status.tsx b/app/javascript/mastodon/features/notifications_v2/components/notification_status.tsx
new file mode 100644
index 00000000000000..9ade355a71494b
--- /dev/null
+++ b/app/javascript/mastodon/features/notifications_v2/components/notification_status.tsx
@@ -0,0 +1,31 @@
+import { FormattedMessage } from 'react-intl';
+
+import NotificationsActiveIcon from '@/material-icons/400-24px/notifications_active-fill.svg?react';
+import type { NotificationGroupStatus } from 'mastodon/models/notification_group';
+
+import type { LabelRenderer } from './notification_group_with_status';
+import { NotificationWithStatus } from './notification_with_status';
+
+const labelRenderer: LabelRenderer = (values) => (
+  <FormattedMessage
+    id='notification.status'
+    defaultMessage='{name} just posted'
+    values={values}
+  />
+);
+
+export const NotificationStatus: React.FC<{
+  notification: NotificationGroupStatus;
+  unread: boolean;
+}> = ({ notification, unread }) => (
+  <NotificationWithStatus
+    type='status'
+    icon={NotificationsActiveIcon}
+    iconId='notifications-active'
+    accountIds={notification.sampleAccountIds}
+    count={notification.notifications_count}
+    statusId={notification.statusId}
+    labelRenderer={labelRenderer}
+    unread={unread}
+  />
+);
diff --git a/app/javascript/mastodon/features/notifications_v2/components/notification_update.tsx b/app/javascript/mastodon/features/notifications_v2/components/notification_update.tsx
new file mode 100644
index 00000000000000..c518367bf5a24f
--- /dev/null
+++ b/app/javascript/mastodon/features/notifications_v2/components/notification_update.tsx
@@ -0,0 +1,31 @@
+import { FormattedMessage } from 'react-intl';
+
+import EditIcon from '@/material-icons/400-24px/edit.svg?react';
+import type { NotificationGroupUpdate } from 'mastodon/models/notification_group';
+
+import type { LabelRenderer } from './notification_group_with_status';
+import { NotificationWithStatus } from './notification_with_status';
+
+const labelRenderer: LabelRenderer = (values) => (
+  <FormattedMessage
+    id='notification.update'
+    defaultMessage='{name} edited a post'
+    values={values}
+  />
+);
+
+export const NotificationUpdate: React.FC<{
+  notification: NotificationGroupUpdate;
+  unread: boolean;
+}> = ({ notification, unread }) => (
+  <NotificationWithStatus
+    type='update'
+    icon={EditIcon}
+    iconId='edit'
+    accountIds={notification.sampleAccountIds}
+    count={notification.notifications_count}
+    statusId={notification.statusId}
+    labelRenderer={labelRenderer}
+    unread={unread}
+  />
+);
diff --git a/app/javascript/mastodon/features/notifications_v2/components/notification_with_status.tsx b/app/javascript/mastodon/features/notifications_v2/components/notification_with_status.tsx
new file mode 100644
index 00000000000000..27de76b485da63
--- /dev/null
+++ b/app/javascript/mastodon/features/notifications_v2/components/notification_with_status.tsx
@@ -0,0 +1,73 @@
+import { useMemo } from 'react';
+
+import classNames from 'classnames';
+
+import type { IconProp } from 'mastodon/components/icon';
+import { Icon } from 'mastodon/components/icon';
+import Status from 'mastodon/containers/status_container';
+import { useAppSelector } from 'mastodon/store';
+
+import { NamesList } from './names_list';
+import type { LabelRenderer } from './notification_group_with_status';
+
+export const NotificationWithStatus: React.FC<{
+  type: string;
+  icon: IconProp;
+  iconId: string;
+  accountIds: string[];
+  statusId: string;
+  count: number;
+  labelRenderer: LabelRenderer;
+  unread: boolean;
+}> = ({
+  icon,
+  iconId,
+  accountIds,
+  statusId,
+  count,
+  labelRenderer,
+  type,
+  unread,
+}) => {
+  const label = useMemo(
+    () =>
+      labelRenderer({
+        name: <NamesList accountIds={accountIds} total={count} />,
+      }),
+    [labelRenderer, accountIds, count],
+  );
+
+  const isPrivateMention = useAppSelector(
+    (state) => state.statuses.getIn([statusId, 'visibility']) === 'direct',
+  );
+
+  return (
+    <div
+      role='button'
+      className={classNames(
+        `notification-ungrouped focusable notification-ungrouped--${type}`,
+        {
+          'notification-ungrouped--unread': unread,
+          'notification-ungrouped--direct': isPrivateMention,
+        },
+      )}
+      tabIndex={0}
+    >
+      <div className='notification-ungrouped__header'>
+        <div className='notification-ungrouped__header__icon'>
+          <Icon icon={icon} id={iconId} />
+        </div>
+        {label}
+      </div>
+
+      <Status
+        // @ts-expect-error -- <Status> is not yet typed
+        id={statusId}
+        contextType='notifications'
+        withDismiss
+        skipPrepend
+        avatarSize={40}
+      />
+    </div>
+  );
+};
diff --git a/app/javascript/mastodon/features/notifications_v2/filter_bar.tsx b/app/javascript/mastodon/features/notifications_v2/filter_bar.tsx
new file mode 100644
index 00000000000000..37d2d864bbd38b
--- /dev/null
+++ b/app/javascript/mastodon/features/notifications_v2/filter_bar.tsx
@@ -0,0 +1,145 @@
+import type { PropsWithChildren } from 'react';
+import { useCallback } from 'react';
+
+import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
+
+import HomeIcon from '@/material-icons/400-24px/home-fill.svg?react';
+import InsertChartIcon from '@/material-icons/400-24px/insert_chart.svg?react';
+import PersonAddIcon from '@/material-icons/400-24px/person_add.svg?react';
+import RepeatIcon from '@/material-icons/400-24px/repeat.svg?react';
+import ReplyAllIcon from '@/material-icons/400-24px/reply_all.svg?react';
+import StarIcon from '@/material-icons/400-24px/star.svg?react';
+import { setNotificationsFilter } from 'mastodon/actions/notification_groups';
+import { Icon } from 'mastodon/components/icon';
+import {
+  selectSettingsNotificationsQuickFilterActive,
+  selectSettingsNotificationsQuickFilterAdvanced,
+} from 'mastodon/selectors/settings';
+import { useAppDispatch, useAppSelector } from 'mastodon/store';
+
+const tooltips = defineMessages({
+  mentions: { id: 'notifications.filter.mentions', defaultMessage: 'Mentions' },
+  favourites: {
+    id: 'notifications.filter.favourites',
+    defaultMessage: 'Favorites',
+  },
+  boosts: { id: 'notifications.filter.boosts', defaultMessage: 'Boosts' },
+  polls: { id: 'notifications.filter.polls', defaultMessage: 'Poll results' },
+  follows: { id: 'notifications.filter.follows', defaultMessage: 'Follows' },
+  statuses: {
+    id: 'notifications.filter.statuses',
+    defaultMessage: 'Updates from people you follow',
+  },
+});
+
+const BarButton: React.FC<
+  PropsWithChildren<{
+    selectedFilter: string;
+    type: string;
+    title?: string;
+  }>
+> = ({ selectedFilter, type, title, children }) => {
+  const dispatch = useAppDispatch();
+
+  const onClick = useCallback(() => {
+    void dispatch(setNotificationsFilter({ filterType: type }));
+  }, [dispatch, type]);
+
+  return (
+    <button
+      className={selectedFilter === type ? 'active' : ''}
+      onClick={onClick}
+      title={title}
+    >
+      {children}
+    </button>
+  );
+};
+
+export const FilterBar: React.FC = () => {
+  const intl = useIntl();
+
+  const selectedFilter = useAppSelector(
+    selectSettingsNotificationsQuickFilterActive,
+  );
+  const advancedMode = useAppSelector(
+    selectSettingsNotificationsQuickFilterAdvanced,
+  );
+
+  if (advancedMode)
+    return (
+      <div className='notification__filter-bar'>
+        <BarButton selectedFilter={selectedFilter} type='all' key='all'>
+          <FormattedMessage
+            id='notifications.filter.all'
+            defaultMessage='All'
+          />
+        </BarButton>
+        <BarButton
+          selectedFilter={selectedFilter}
+          type='mention'
+          key='mention'
+          title={intl.formatMessage(tooltips.mentions)}
+        >
+          <Icon id='reply-all' icon={ReplyAllIcon} />
+        </BarButton>
+        <BarButton
+          selectedFilter={selectedFilter}
+          type='favourite'
+          key='favourite'
+          title={intl.formatMessage(tooltips.favourites)}
+        >
+          <Icon id='star' icon={StarIcon} />
+        </BarButton>
+        <BarButton
+          selectedFilter={selectedFilter}
+          type='reblog'
+          key='reblog'
+          title={intl.formatMessage(tooltips.boosts)}
+        >
+          <Icon id='retweet' icon={RepeatIcon} />
+        </BarButton>
+        <BarButton
+          selectedFilter={selectedFilter}
+          type='poll'
+          key='poll'
+          title={intl.formatMessage(tooltips.polls)}
+        >
+          <Icon id='tasks' icon={InsertChartIcon} />
+        </BarButton>
+        <BarButton
+          selectedFilter={selectedFilter}
+          type='status'
+          key='status'
+          title={intl.formatMessage(tooltips.statuses)}
+        >
+          <Icon id='home' icon={HomeIcon} />
+        </BarButton>
+        <BarButton
+          selectedFilter={selectedFilter}
+          type='follow'
+          key='follow'
+          title={intl.formatMessage(tooltips.follows)}
+        >
+          <Icon id='user-plus' icon={PersonAddIcon} />
+        </BarButton>
+      </div>
+    );
+  else
+    return (
+      <div className='notification__filter-bar'>
+        <BarButton selectedFilter={selectedFilter} type='all' key='all'>
+          <FormattedMessage
+            id='notifications.filter.all'
+            defaultMessage='All'
+          />
+        </BarButton>
+        <BarButton selectedFilter={selectedFilter} type='mention' key='mention'>
+          <FormattedMessage
+            id='notifications.filter.mentions'
+            defaultMessage='Mentions'
+          />
+        </BarButton>
+      </div>
+    );
+};
diff --git a/app/javascript/mastodon/features/notifications_v2/index.tsx b/app/javascript/mastodon/features/notifications_v2/index.tsx
new file mode 100644
index 00000000000000..fc20f0583631ed
--- /dev/null
+++ b/app/javascript/mastodon/features/notifications_v2/index.tsx
@@ -0,0 +1,354 @@
+import { useCallback, useEffect, useMemo, useRef } from 'react';
+
+import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
+
+import { Helmet } from 'react-helmet';
+
+import { createSelector } from '@reduxjs/toolkit';
+
+import { useDebouncedCallback } from 'use-debounce';
+
+import DoneAllIcon from '@/material-icons/400-24px/done_all.svg?react';
+import NotificationsIcon from '@/material-icons/400-24px/notifications-fill.svg?react';
+import {
+  fetchNotificationsGap,
+  updateScrollPosition,
+  loadPending,
+  markNotificationsAsRead,
+  mountNotifications,
+  unmountNotifications,
+} from 'mastodon/actions/notification_groups';
+import { compareId } from 'mastodon/compare_id';
+import { Icon } from 'mastodon/components/icon';
+import { NotSignedInIndicator } from 'mastodon/components/not_signed_in_indicator';
+import { useIdentity } from 'mastodon/identity_context';
+import type { NotificationGap } from 'mastodon/reducers/notification_groups';
+import {
+  selectUnreadNotificationGroupsCount,
+  selectPendingNotificationGroupsCount,
+} from 'mastodon/selectors/notifications';
+import {
+  selectNeedsNotificationPermission,
+  selectSettingsNotificationsExcludedTypes,
+  selectSettingsNotificationsQuickFilterActive,
+  selectSettingsNotificationsQuickFilterShow,
+  selectSettingsNotificationsShowUnread,
+} from 'mastodon/selectors/settings';
+import { useAppDispatch, useAppSelector } from 'mastodon/store';
+import type { RootState } from 'mastodon/store';
+
+import { addColumn, removeColumn, moveColumn } from '../../actions/columns';
+import { submitMarkers } from '../../actions/markers';
+import Column from '../../components/column';
+import { ColumnHeader } from '../../components/column_header';
+import { LoadGap } from '../../components/load_gap';
+import ScrollableList from '../../components/scrollable_list';
+import { FilteredNotificationsBanner } from '../notifications/components/filtered_notifications_banner';
+import NotificationsPermissionBanner from '../notifications/components/notifications_permission_banner';
+import ColumnSettingsContainer from '../notifications/containers/column_settings_container';
+
+import { NotificationGroup } from './components/notification_group';
+import { FilterBar } from './filter_bar';
+
+const messages = defineMessages({
+  title: { id: 'column.notifications', defaultMessage: 'Notifications' },
+  markAsRead: {
+    id: 'notifications.mark_as_read',
+    defaultMessage: 'Mark every notification as read',
+  },
+});
+
+const getNotifications = createSelector(
+  [
+    selectSettingsNotificationsQuickFilterShow,
+    selectSettingsNotificationsQuickFilterActive,
+    selectSettingsNotificationsExcludedTypes,
+    (state: RootState) => state.notificationGroups.groups,
+  ],
+  (showFilterBar, allowedType, excludedTypes, notifications) => {
+    if (!showFilterBar || allowedType === 'all') {
+      // used if user changed the notification settings after loading the notifications from the server
+      // otherwise a list of notifications will come pre-filtered from the backend
+      // we need to turn it off for FilterBar in order not to block ourselves from seeing a specific category
+      return notifications.filter(
+        (item) => item.type === 'gap' || !excludedTypes.includes(item.type),
+      );
+    }
+    return notifications.filter(
+      (item) => item.type === 'gap' || allowedType === item.type,
+    );
+  },
+);
+
+export const Notifications: React.FC<{
+  columnId?: string;
+  multiColumn?: boolean;
+}> = ({ columnId, multiColumn }) => {
+  const intl = useIntl();
+  const notifications = useAppSelector(getNotifications);
+  const dispatch = useAppDispatch();
+  const isLoading = useAppSelector((s) => s.notificationGroups.isLoading);
+  const hasMore = notifications.at(-1)?.type === 'gap';
+
+  const lastReadId = useAppSelector((s) =>
+    selectSettingsNotificationsShowUnread(s)
+      ? s.notificationGroups.lastReadId
+      : '0',
+  );
+
+  const numPending = useAppSelector(selectPendingNotificationGroupsCount);
+
+  const unreadNotificationsCount = useAppSelector(
+    selectUnreadNotificationGroupsCount,
+  );
+
+  const isUnread = unreadNotificationsCount > 0;
+
+  const canMarkAsRead =
+    useAppSelector(selectSettingsNotificationsShowUnread) &&
+    unreadNotificationsCount > 0;
+
+  const needsNotificationPermission = useAppSelector(
+    selectNeedsNotificationPermission,
+  );
+
+  const columnRef = useRef<Column>(null);
+
+  const selectChild = useCallback((index: number, alignTop: boolean) => {
+    const container = columnRef.current?.node as HTMLElement | undefined;
+
+    if (!container) return;
+
+    const element = container.querySelector<HTMLElement>(
+      `article:nth-of-type(${index + 1}) .focusable`,
+    );
+
+    if (element) {
+      if (alignTop && container.scrollTop > element.offsetTop) {
+        element.scrollIntoView(true);
+      } else if (
+        !alignTop &&
+        container.scrollTop + container.clientHeight <
+          element.offsetTop + element.offsetHeight
+      ) {
+        element.scrollIntoView(false);
+      }
+      element.focus();
+    }
+  }, []);
+
+  // Keep track of mounted components for unread notification handling
+  useEffect(() => {
+    dispatch(mountNotifications());
+
+    return () => {
+      dispatch(unmountNotifications());
+      dispatch(updateScrollPosition({ top: false }));
+    };
+  }, [dispatch]);
+
+  const handleLoadGap = useCallback(
+    (gap: NotificationGap) => {
+      void dispatch(fetchNotificationsGap({ gap }));
+    },
+    [dispatch],
+  );
+
+  const handleLoadOlder = useDebouncedCallback(
+    () => {
+      const gap = notifications.at(-1);
+      if (gap?.type === 'gap') void dispatch(fetchNotificationsGap({ gap }));
+    },
+    300,
+    { leading: true },
+  );
+
+  const handleLoadPending = useCallback(() => {
+    dispatch(loadPending());
+  }, [dispatch]);
+
+  const handleScrollToTop = useDebouncedCallback(() => {
+    dispatch(updateScrollPosition({ top: true }));
+  }, 100);
+
+  const handleScroll = useDebouncedCallback(() => {
+    dispatch(updateScrollPosition({ top: false }));
+  }, 100);
+
+  useEffect(() => {
+    return () => {
+      handleLoadOlder.cancel();
+      handleScrollToTop.cancel();
+      handleScroll.cancel();
+    };
+  }, [handleLoadOlder, handleScrollToTop, handleScroll]);
+
+  const handlePin = useCallback(() => {
+    if (columnId) {
+      dispatch(removeColumn(columnId));
+    } else {
+      dispatch(addColumn('NOTIFICATIONS', {}));
+    }
+  }, [columnId, dispatch]);
+
+  const handleMove = useCallback(
+    (dir: unknown) => {
+      dispatch(moveColumn(columnId, dir));
+    },
+    [dispatch, columnId],
+  );
+
+  const handleHeaderClick = useCallback(() => {
+    columnRef.current?.scrollTop();
+  }, []);
+
+  const handleMoveUp = useCallback(
+    (id: string) => {
+      const elementIndex =
+        notifications.findIndex(
+          (item) => item.type !== 'gap' && item.group_key === id,
+        ) - 1;
+      selectChild(elementIndex, true);
+    },
+    [notifications, selectChild],
+  );
+
+  const handleMoveDown = useCallback(
+    (id: string) => {
+      const elementIndex =
+        notifications.findIndex(
+          (item) => item.type !== 'gap' && item.group_key === id,
+        ) + 1;
+      selectChild(elementIndex, false);
+    },
+    [notifications, selectChild],
+  );
+
+  const handleMarkAsRead = useCallback(() => {
+    dispatch(markNotificationsAsRead());
+    void dispatch(submitMarkers({ immediate: true }));
+  }, [dispatch]);
+
+  const pinned = !!columnId;
+  const emptyMessage = (
+    <FormattedMessage
+      id='empty_column.notifications'
+      defaultMessage="You don't have any notifications yet. When other people interact with you, you will see it here."
+    />
+  );
+
+  const { signedIn } = useIdentity();
+
+  const filterBar = signedIn ? <FilterBar /> : null;
+
+  const scrollableContent = useMemo(() => {
+    if (notifications.length === 0 && !hasMore) return null;
+
+    return notifications.map((item) =>
+      item.type === 'gap' ? (
+        <LoadGap
+          key={`${item.maxId}-${item.sinceId}`}
+          disabled={isLoading}
+          param={item}
+          onClick={handleLoadGap}
+        />
+      ) : (
+        <NotificationGroup
+          key={item.group_key}
+          notificationGroupId={item.group_key}
+          onMoveUp={handleMoveUp}
+          onMoveDown={handleMoveDown}
+          unread={
+            lastReadId !== '0' &&
+            !!item.page_max_id &&
+            compareId(item.page_max_id, lastReadId) > 0
+          }
+        />
+      ),
+    );
+  }, [
+    notifications,
+    isLoading,
+    hasMore,
+    lastReadId,
+    handleLoadGap,
+    handleMoveUp,
+    handleMoveDown,
+  ]);
+
+  const prepend = (
+    <>
+      {needsNotificationPermission && <NotificationsPermissionBanner />}
+      <FilteredNotificationsBanner />
+    </>
+  );
+
+  const scrollContainer = signedIn ? (
+    <ScrollableList
+      scrollKey={`notifications-${columnId}`}
+      trackScroll={!pinned}
+      isLoading={isLoading}
+      showLoading={isLoading && notifications.length === 0}
+      hasMore={hasMore}
+      numPending={numPending}
+      prepend={prepend}
+      alwaysPrepend
+      emptyMessage={emptyMessage}
+      onLoadMore={handleLoadOlder}
+      onLoadPending={handleLoadPending}
+      onScrollToTop={handleScrollToTop}
+      onScroll={handleScroll}
+      bindToDocument={!multiColumn}
+    >
+      {scrollableContent}
+    </ScrollableList>
+  ) : (
+    <NotSignedInIndicator />
+  );
+
+  const extraButton = canMarkAsRead ? (
+    <button
+      aria-label={intl.formatMessage(messages.markAsRead)}
+      title={intl.formatMessage(messages.markAsRead)}
+      onClick={handleMarkAsRead}
+      className='column-header__button'
+    >
+      <Icon id='done-all' icon={DoneAllIcon} />
+    </button>
+  ) : null;
+
+  return (
+    <Column
+      bindToDocument={!multiColumn}
+      ref={columnRef}
+      label={intl.formatMessage(messages.title)}
+    >
+      <ColumnHeader
+        icon='bell'
+        iconComponent={NotificationsIcon}
+        active={isUnread}
+        title={intl.formatMessage(messages.title)}
+        onPin={handlePin}
+        onMove={handleMove}
+        onClick={handleHeaderClick}
+        pinned={pinned}
+        multiColumn={multiColumn}
+        extraButton={extraButton}
+      >
+        <ColumnSettingsContainer />
+      </ColumnHeader>
+
+      {filterBar}
+
+      {scrollContainer}
+
+      <Helmet>
+        <title>{intl.formatMessage(messages.title)}</title>
+        <meta name='robots' content='noindex' />
+      </Helmet>
+    </Column>
+  );
+};
+
+// eslint-disable-next-line import/no-default-export
+export default Notifications;
diff --git a/app/javascript/mastodon/features/notifications_wrapper.jsx b/app/javascript/mastodon/features/notifications_wrapper.jsx
new file mode 100644
index 00000000000000..057ed1b395f8ec
--- /dev/null
+++ b/app/javascript/mastodon/features/notifications_wrapper.jsx
@@ -0,0 +1,13 @@
+import Notifications from 'mastodon/features/notifications';
+import Notifications_v2 from 'mastodon/features/notifications_v2';
+import { useAppSelector } from 'mastodon/store';
+
+export const NotificationsWrapper = (props) => {
+  const optedInGroupedNotifications = useAppSelector((state) => state.getIn(['settings', 'notifications', 'groupingBeta'], false));
+
+  return (
+    optedInGroupedNotifications ? <Notifications_v2 {...props} /> : <Notifications {...props} />
+  );
+};
+
+export default NotificationsWrapper;
\ No newline at end of file
diff --git a/app/javascript/mastodon/features/ui/components/columns_area.jsx b/app/javascript/mastodon/features/ui/components/columns_area.jsx
index 19c2f40ac61c8f..063ac28d96fd26 100644
--- a/app/javascript/mastodon/features/ui/components/columns_area.jsx
+++ b/app/javascript/mastodon/features/ui/components/columns_area.jsx
@@ -10,7 +10,7 @@ import { scrollRight } from '../../../scroll';
 import BundleContainer from '../containers/bundle_container';
 import {
   Compose,
-  Notifications,
+  NotificationsWrapper,
   HomeTimeline,
   CommunityTimeline,
   PublicTimeline,
@@ -32,7 +32,7 @@ import NavigationPanel from './navigation_panel';
 const componentMap = {
   'COMPOSE': Compose,
   'HOME': HomeTimeline,
-  'NOTIFICATIONS': Notifications,
+  'NOTIFICATIONS': NotificationsWrapper,
   'PUBLIC': PublicTimeline,
   'REMOTE': PublicTimeline,
   'COMMUNITY': CommunityTimeline,
diff --git a/app/javascript/mastodon/features/ui/components/navigation_panel.jsx b/app/javascript/mastodon/features/ui/components/navigation_panel.jsx
index ff90eef359fb6d..2648923bfc4161 100644
--- a/app/javascript/mastodon/features/ui/components/navigation_panel.jsx
+++ b/app/javascript/mastodon/features/ui/components/navigation_panel.jsx
@@ -34,6 +34,7 @@ import { NavigationPortal } from 'mastodon/components/navigation_portal';
 import { identityContextPropShape, withIdentity } from 'mastodon/identity_context';
 import { timelinePreview, trendsEnabled } from 'mastodon/initial_state';
 import { transientSingleColumn } from 'mastodon/is_mobile';
+import { selectUnreadNotificationGroupsCount } from 'mastodon/selectors/notifications';
 
 import ColumnLink from './column_link';
 import DisabledAccountBanner from './disabled_account_banner';
@@ -59,15 +60,19 @@ const messages = defineMessages({
 });
 
 const NotificationsLink = () => {
+  const optedInGroupedNotifications = useSelector((state) => state.getIn(['settings', 'notifications', 'groupingBeta'], false));
   const count = useSelector(state => state.getIn(['notifications', 'unread']));
   const intl = useIntl();
 
+  const newCount = useSelector(selectUnreadNotificationGroupsCount);
+
   return (
     <ColumnLink
+      key='notifications'
       transparent
       to='/notifications'
-      icon={<IconWithBadge id='bell' icon={NotificationsIcon} count={count} className='column-link__icon' />}
-      activeIcon={<IconWithBadge id='bell' icon={NotificationsActiveIcon} count={count} className='column-link__icon' />}
+      icon={<IconWithBadge id='bell' icon={NotificationsIcon} count={optedInGroupedNotifications ? newCount : count} className='column-link__icon' />}
+      activeIcon={<IconWithBadge id='bell' icon={NotificationsActiveIcon} count={optedInGroupedNotifications ? newCount : count} className='column-link__icon' />}
       text={intl.formatMessage(messages.notifications)}
     />
   );
diff --git a/app/javascript/mastodon/features/ui/index.jsx b/app/javascript/mastodon/features/ui/index.jsx
index d9f609620cde7b..f36e0cf501fdbf 100644
--- a/app/javascript/mastodon/features/ui/index.jsx
+++ b/app/javascript/mastodon/features/ui/index.jsx
@@ -13,6 +13,7 @@ import { HotKeys } from 'react-hotkeys';
 
 import { focusApp, unfocusApp, changeLayout } from 'mastodon/actions/app';
 import { synchronouslySubmitMarkers, submitMarkers, fetchMarkers } from 'mastodon/actions/markers';
+import { initializeNotifications } from 'mastodon/actions/notifications_migration';
 import { INTRODUCTION_VERSION } from 'mastodon/actions/onboarding';
 import { HoverCardController } from 'mastodon/components/hover_card_controller';
 import { PictureInPicture } from 'mastodon/features/picture_in_picture';
@@ -22,7 +23,6 @@ import { WithRouterPropTypes } from 'mastodon/utils/react_router';
 
 import { uploadCompose, resetCompose, changeComposeSpoilerness } from '../../actions/compose';
 import { clearHeight } from '../../actions/height_cache';
-import { expandNotifications } from '../../actions/notifications';
 import { fetchServer, fetchServerTranslationLanguages } from '../../actions/server';
 import { expandHomeTimeline } from '../../actions/timelines';
 import initialState, { me, owner, singleUserMode, trendsEnabled, trendsAsLanding, disableHoverCards } from '../../initial_state';
@@ -49,7 +49,7 @@ import {
   Favourites,
   DirectTimeline,
   HashtagTimeline,
-  Notifications,
+  NotificationsWrapper,
   NotificationRequests,
   NotificationRequest,
   FollowRequests,
@@ -71,6 +71,7 @@ import {
 } from './util/async-components';
 import { ColumnsContextProvider } from './util/columns_context';
 import { WrappedSwitch, WrappedRoute } from './util/react_router_helpers';
+
 // Dummy import, to make sure that <Status /> ends up in the application bundle.
 // Without this it ends up in ~8 very commonly used bundles.
 import '../../components/status';
@@ -205,7 +206,7 @@ class SwitchingColumnsArea extends PureComponent {
             <WrappedRoute path='/tags/:id' component={HashtagTimeline} content={children} />
             <WrappedRoute path='/links/:url' component={LinkTimeline} content={children} />
             <WrappedRoute path='/lists/:id' component={ListTimeline} content={children} />
-            <WrappedRoute path='/notifications' component={Notifications} content={children} exact />
+            <WrappedRoute path='/notifications' component={NotificationsWrapper} content={children} exact />
             <WrappedRoute path='/notifications/requests' component={NotificationRequests} content={children} exact />
             <WrappedRoute path='/notifications/requests/:id' component={NotificationRequest} content={children} exact />
             <WrappedRoute path='/favourites' component={FavouritedStatuses} content={children} />
@@ -405,7 +406,7 @@ class UI extends PureComponent {
     if (signedIn) {
       this.props.dispatch(fetchMarkers());
       this.props.dispatch(expandHomeTimeline());
-      this.props.dispatch(expandNotifications());
+      this.props.dispatch(initializeNotifications());
       this.props.dispatch(fetchServerTranslationLanguages());
 
       setTimeout(() => this.props.dispatch(fetchServer()), 3000);
diff --git a/app/javascript/mastodon/features/ui/util/async-components.js b/app/javascript/mastodon/features/ui/util/async-components.js
index b8a2359d92cd3f..7c4372d5a6442b 100644
--- a/app/javascript/mastodon/features/ui/util/async-components.js
+++ b/app/javascript/mastodon/features/ui/util/async-components.js
@@ -7,7 +7,15 @@ export function Compose () {
 }
 
 export function Notifications () {
-  return import(/* webpackChunkName: "features/notifications" */'../../notifications');
+  return import(/* webpackChunkName: "features/notifications_v1" */'../../notifications');
+}
+
+export function Notifications_v2 () {
+  return import(/* webpackChunkName: "features/notifications_v2" */'../../notifications_v2');
+}
+
+export function NotificationsWrapper () {
+  return import(/* webpackChunkName: "features/notifications" */'../../notifications_wrapper');
 }
 
 export function HomeTimeline () {
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index 13296e1d204479..60bdfd1d445471 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -443,6 +443,8 @@
   "mute_modal.title": "Mute user?",
   "mute_modal.you_wont_see_mentions": "You won't see posts that mention them.",
   "mute_modal.you_wont_see_posts": "They can still see your posts, but you won't see theirs.",
+  "name_and_others": "{name} and {count, plural, one {# other} other {# others}}",
+  "name_and_others_with_link": "{name} and <a>{count, plural, one {# other} other {# others}}</a>",
   "navigation_bar.about": "About",
   "navigation_bar.advanced_interface": "Open in advanced web interface",
   "navigation_bar.blocks": "Blocked users",
@@ -470,6 +472,10 @@
   "navigation_bar.security": "Security",
   "not_signed_in_indicator.not_signed_in": "You need to login to access this resource.",
   "notification.admin.report": "{name} reported {target}",
+  "notification.admin.report_account": "{name} reported {count, plural, one {one post} other {# posts}} from {target} for {category}",
+  "notification.admin.report_account_other": "{name} reported {count, plural, one {one post} other {# posts}} from {target}",
+  "notification.admin.report_statuses": "{name} reported {target} for {category}",
+  "notification.admin.report_statuses_other": "{name} reported {target}",
   "notification.admin.sign_up": "{name} signed up",
   "notification.favourite": "{name} favorited your post",
   "notification.follow": "{name} followed you",
@@ -485,7 +491,8 @@
   "notification.moderation_warning.action_silence": "Your account has been limited.",
   "notification.moderation_warning.action_suspend": "Your account has been suspended.",
   "notification.own_poll": "Your poll has ended",
-  "notification.poll": "A poll you have voted in has ended",
+  "notification.poll": "A poll you voted in has ended",
+  "notification.private_mention": "{name} privately mentioned you",
   "notification.reblog": "{name} boosted your post",
   "notification.relationships_severance_event": "Lost connections with {name}",
   "notification.relationships_severance_event.account_suspension": "An admin from {from} has suspended {target}, which means you can no longer receive updates from them or interact with them.",
@@ -503,6 +510,8 @@
   "notifications.column_settings.admin.report": "New reports:",
   "notifications.column_settings.admin.sign_up": "New sign-ups:",
   "notifications.column_settings.alert": "Desktop notifications",
+  "notifications.column_settings.beta.category": "Experimental features",
+  "notifications.column_settings.beta.grouping": "Group notifications",
   "notifications.column_settings.favourite": "Favorites:",
   "notifications.column_settings.filter_bar.advanced": "Display all categories",
   "notifications.column_settings.filter_bar.category": "Quick filter bar",
@@ -666,9 +675,13 @@
   "report.unfollow_explanation": "You are following this account. To not see their posts in your home feed anymore, unfollow them.",
   "report_notification.attached_statuses": "{count, plural, one {{count} post} other {{count} posts}} attached",
   "report_notification.categories.legal": "Legal",
+  "report_notification.categories.legal_sentence": "illegal content",
   "report_notification.categories.other": "Other",
+  "report_notification.categories.other_sentence": "other",
   "report_notification.categories.spam": "Spam",
+  "report_notification.categories.spam_sentence": "spam",
   "report_notification.categories.violation": "Rule violation",
+  "report_notification.categories.violation_sentence": "rule violation",
   "report_notification.open": "Open report",
   "search.no_recent_searches": "No recent searches",
   "search.placeholder": "Search",
diff --git a/app/javascript/mastodon/models/notification_group.ts b/app/javascript/mastodon/models/notification_group.ts
new file mode 100644
index 00000000000000..5fe1e6f2e43dee
--- /dev/null
+++ b/app/javascript/mastodon/models/notification_group.ts
@@ -0,0 +1,207 @@
+import type {
+  ApiAccountRelationshipSeveranceEventJSON,
+  ApiAccountWarningJSON,
+  BaseNotificationGroupJSON,
+  ApiNotificationGroupJSON,
+  ApiNotificationJSON,
+  NotificationType,
+  NotificationWithStatusType,
+} from 'mastodon/api_types/notifications';
+import type { ApiReportJSON } from 'mastodon/api_types/reports';
+
+// Maximum number of avatars displayed in a notification group
+// This corresponds to the max lenght of `group.sampleAccountIds`
+export const NOTIFICATIONS_GROUP_MAX_AVATARS = 8;
+
+interface BaseNotificationGroup
+  extends Omit<BaseNotificationGroupJSON, 'sample_accounts'> {
+  sampleAccountIds: string[];
+}
+
+interface BaseNotificationWithStatus<Type extends NotificationWithStatusType>
+  extends BaseNotificationGroup {
+  type: Type;
+  statusId: string;
+}
+
+interface BaseNotification<Type extends NotificationType>
+  extends BaseNotificationGroup {
+  type: Type;
+}
+
+export type NotificationGroupFavourite =
+  BaseNotificationWithStatus<'favourite'>;
+export type NotificationGroupReblog = BaseNotificationWithStatus<'reblog'>;
+export type NotificationGroupStatus = BaseNotificationWithStatus<'status'>;
+export type NotificationGroupMention = BaseNotificationWithStatus<'mention'>;
+export type NotificationGroupPoll = BaseNotificationWithStatus<'poll'>;
+export type NotificationGroupUpdate = BaseNotificationWithStatus<'update'>;
+export type NotificationGroupFollow = BaseNotification<'follow'>;
+export type NotificationGroupFollowRequest = BaseNotification<'follow_request'>;
+export type NotificationGroupAdminSignUp = BaseNotification<'admin.sign_up'>;
+
+export type AccountWarningAction =
+  | 'none'
+  | 'disable'
+  | 'mark_statuses_as_sensitive'
+  | 'delete_statuses'
+  | 'sensitive'
+  | 'silence'
+  | 'suspend';
+export interface AccountWarning
+  extends Omit<ApiAccountWarningJSON, 'target_account'> {
+  targetAccountId: string;
+}
+
+export interface NotificationGroupModerationWarning
+  extends BaseNotification<'moderation_warning'> {
+  moderationWarning: AccountWarning;
+}
+
+type AccountRelationshipSeveranceEvent =
+  ApiAccountRelationshipSeveranceEventJSON;
+export interface NotificationGroupSeveredRelationships
+  extends BaseNotification<'severed_relationships'> {
+  event: AccountRelationshipSeveranceEvent;
+}
+
+interface Report extends Omit<ApiReportJSON, 'target_account'> {
+  targetAccountId: string;
+}
+
+export interface NotificationGroupAdminReport
+  extends BaseNotification<'admin.report'> {
+  report: Report;
+}
+
+export type NotificationGroup =
+  | NotificationGroupFavourite
+  | NotificationGroupReblog
+  | NotificationGroupStatus
+  | NotificationGroupMention
+  | NotificationGroupPoll
+  | NotificationGroupUpdate
+  | NotificationGroupFollow
+  | NotificationGroupFollowRequest
+  | NotificationGroupModerationWarning
+  | NotificationGroupSeveredRelationships
+  | NotificationGroupAdminSignUp
+  | NotificationGroupAdminReport;
+
+function createReportFromJSON(reportJSON: ApiReportJSON): Report {
+  const { target_account, ...report } = reportJSON;
+  return {
+    targetAccountId: target_account.id,
+    ...report,
+  };
+}
+
+function createAccountWarningFromJSON(
+  warningJSON: ApiAccountWarningJSON,
+): AccountWarning {
+  const { target_account, ...warning } = warningJSON;
+  return {
+    targetAccountId: target_account.id,
+    ...warning,
+  };
+}
+
+function createAccountRelationshipSeveranceEventFromJSON(
+  eventJson: ApiAccountRelationshipSeveranceEventJSON,
+): AccountRelationshipSeveranceEvent {
+  return eventJson;
+}
+
+export function createNotificationGroupFromJSON(
+  groupJson: ApiNotificationGroupJSON,
+): NotificationGroup {
+  const { sample_accounts, ...group } = groupJson;
+  const sampleAccountIds = sample_accounts.map((account) => account.id);
+
+  switch (group.type) {
+    case 'favourite':
+    case 'reblog':
+    case 'status':
+    case 'mention':
+    case 'poll':
+    case 'update': {
+      const { status, ...groupWithoutStatus } = group;
+      return {
+        statusId: status.id,
+        sampleAccountIds,
+        ...groupWithoutStatus,
+      };
+    }
+    case 'admin.report': {
+      const { report, ...groupWithoutTargetAccount } = group;
+      return {
+        report: createReportFromJSON(report),
+        sampleAccountIds,
+        ...groupWithoutTargetAccount,
+      };
+    }
+    case 'severed_relationships':
+      return {
+        ...group,
+        event: createAccountRelationshipSeveranceEventFromJSON(group.event),
+        sampleAccountIds,
+      };
+
+    case 'moderation_warning': {
+      const { moderation_warning, ...groupWithoutModerationWarning } = group;
+      return {
+        ...groupWithoutModerationWarning,
+        moderationWarning: createAccountWarningFromJSON(moderation_warning),
+        sampleAccountIds,
+      };
+    }
+    default:
+      return {
+        sampleAccountIds,
+        ...group,
+      };
+  }
+}
+
+export function createNotificationGroupFromNotificationJSON(
+  notification: ApiNotificationJSON,
+) {
+  const group = {
+    sampleAccountIds: [notification.account.id],
+    group_key: notification.group_key,
+    notifications_count: 1,
+    type: notification.type,
+    most_recent_notification_id: notification.id,
+    page_min_id: notification.id,
+    page_max_id: notification.id,
+    latest_page_notification_at: notification.created_at,
+  } as NotificationGroup;
+
+  switch (notification.type) {
+    case 'favourite':
+    case 'reblog':
+    case 'status':
+    case 'mention':
+    case 'poll':
+    case 'update':
+      return { ...group, statusId: notification.status.id };
+    case 'admin.report':
+      return { ...group, report: createReportFromJSON(notification.report) };
+    case 'severed_relationships':
+      return {
+        ...group,
+        event: createAccountRelationshipSeveranceEventFromJSON(
+          notification.event,
+        ),
+      };
+    case 'moderation_warning':
+      return {
+        ...group,
+        moderationWarning: createAccountWarningFromJSON(
+          notification.moderation_warning,
+        ),
+      };
+    default:
+      return group;
+  }
+}
diff --git a/app/javascript/mastodon/reducers/index.ts b/app/javascript/mastodon/reducers/index.ts
index 6296ef202690a0..b92de0dbcda766 100644
--- a/app/javascript/mastodon/reducers/index.ts
+++ b/app/javascript/mastodon/reducers/index.ts
@@ -24,6 +24,7 @@ import { markersReducer } from './markers';
 import media_attachments from './media_attachments';
 import meta from './meta';
 import { modalReducer } from './modal';
+import { notificationGroupsReducer } from './notification_groups';
 import { notificationPolicyReducer } from './notification_policy';
 import { notificationRequestsReducer } from './notification_requests';
 import notifications from './notifications';
@@ -65,6 +66,7 @@ const reducers = {
   search,
   media_attachments,
   notifications,
+  notificationGroups: notificationGroupsReducer,
   height_cache,
   custom_emojis,
   lists,
diff --git a/app/javascript/mastodon/reducers/markers.ts b/app/javascript/mastodon/reducers/markers.ts
index ec85d0f17328cb..b1f10b5fa23a92 100644
--- a/app/javascript/mastodon/reducers/markers.ts
+++ b/app/javascript/mastodon/reducers/markers.ts
@@ -1,6 +1,7 @@
 import { createReducer } from '@reduxjs/toolkit';
 
-import { submitMarkersAction } from 'mastodon/actions/markers';
+import { submitMarkersAction, fetchMarkers } from 'mastodon/actions/markers';
+import { compareId } from 'mastodon/compare_id';
 
 const initialState = {
   home: '0',
@@ -15,4 +16,23 @@ export const markersReducer = createReducer(initialState, (builder) => {
       if (notifications) state.notifications = notifications;
     },
   );
+  builder.addCase(
+    fetchMarkers.fulfilled,
+    (
+      state,
+      {
+        payload: {
+          markers: { home, notifications },
+        },
+      },
+    ) => {
+      if (home && compareId(home.last_read_id, state.home) > 0)
+        state.home = home.last_read_id;
+      if (
+        notifications &&
+        compareId(notifications.last_read_id, state.notifications) > 0
+      )
+        state.notifications = notifications.last_read_id;
+    },
+  );
 });
diff --git a/app/javascript/mastodon/reducers/notification_groups.ts b/app/javascript/mastodon/reducers/notification_groups.ts
new file mode 100644
index 00000000000000..e59f3e7ca11b57
--- /dev/null
+++ b/app/javascript/mastodon/reducers/notification_groups.ts
@@ -0,0 +1,508 @@
+import { createReducer, isAnyOf } from '@reduxjs/toolkit';
+
+import {
+  authorizeFollowRequestSuccess,
+  blockAccountSuccess,
+  muteAccountSuccess,
+  rejectFollowRequestSuccess,
+} from 'mastodon/actions/accounts_typed';
+import { focusApp, unfocusApp } from 'mastodon/actions/app';
+import { blockDomainSuccess } from 'mastodon/actions/domain_blocks_typed';
+import { fetchMarkers } from 'mastodon/actions/markers';
+import {
+  clearNotifications,
+  fetchNotifications,
+  fetchNotificationsGap,
+  processNewNotificationForGroups,
+  loadPending,
+  updateScrollPosition,
+  markNotificationsAsRead,
+  mountNotifications,
+  unmountNotifications,
+} from 'mastodon/actions/notification_groups';
+import {
+  disconnectTimeline,
+  timelineDelete,
+} from 'mastodon/actions/timelines_typed';
+import type { ApiNotificationJSON } from 'mastodon/api_types/notifications';
+import { compareId } from 'mastodon/compare_id';
+import { usePendingItems } from 'mastodon/initial_state';
+import {
+  NOTIFICATIONS_GROUP_MAX_AVATARS,
+  createNotificationGroupFromJSON,
+  createNotificationGroupFromNotificationJSON,
+} from 'mastodon/models/notification_group';
+import type { NotificationGroup } from 'mastodon/models/notification_group';
+
+const NOTIFICATIONS_TRIM_LIMIT = 50;
+
+export interface NotificationGap {
+  type: 'gap';
+  maxId?: string;
+  sinceId?: string;
+}
+
+interface NotificationGroupsState {
+  groups: (NotificationGroup | NotificationGap)[];
+  pendingGroups: (NotificationGroup | NotificationGap)[];
+  scrolledToTop: boolean;
+  isLoading: boolean;
+  lastReadId: string;
+  mounted: number;
+  isTabVisible: boolean;
+}
+
+const initialState: NotificationGroupsState = {
+  groups: [],
+  pendingGroups: [], // holds pending groups in slow mode
+  scrolledToTop: false,
+  isLoading: false,
+  // The following properties are used to track unread notifications
+  lastReadId: '0', // used for unread notifications
+  mounted: 0, // number of mounted notification list components, usually 0 or 1
+  isTabVisible: true,
+};
+
+function filterNotificationsForAccounts(
+  groups: NotificationGroupsState['groups'],
+  accountIds: string[],
+  onlyForType?: string,
+) {
+  groups = groups
+    .map((group) => {
+      if (
+        group.type !== 'gap' &&
+        (!onlyForType || group.type === onlyForType)
+      ) {
+        const previousLength = group.sampleAccountIds.length;
+
+        group.sampleAccountIds = group.sampleAccountIds.filter(
+          (id) => !accountIds.includes(id),
+        );
+
+        const newLength = group.sampleAccountIds.length;
+        const removed = previousLength - newLength;
+
+        group.notifications_count -= removed;
+      }
+
+      return group;
+    })
+    .filter(
+      (group) => group.type === 'gap' || group.sampleAccountIds.length > 0,
+    );
+  mergeGaps(groups);
+  return groups;
+}
+
+function filterNotificationsForStatus(
+  groups: NotificationGroupsState['groups'],
+  statusId: string,
+) {
+  groups = groups.filter(
+    (group) =>
+      group.type === 'gap' ||
+      !('statusId' in group) ||
+      group.statusId !== statusId,
+  );
+  mergeGaps(groups);
+  return groups;
+}
+
+function removeNotificationsForAccounts(
+  state: NotificationGroupsState,
+  accountIds: string[],
+  onlyForType?: string,
+) {
+  state.groups = filterNotificationsForAccounts(
+    state.groups,
+    accountIds,
+    onlyForType,
+  );
+  state.pendingGroups = filterNotificationsForAccounts(
+    state.pendingGroups,
+    accountIds,
+    onlyForType,
+  );
+}
+
+function removeNotificationsForStatus(
+  state: NotificationGroupsState,
+  statusId: string,
+) {
+  state.groups = filterNotificationsForStatus(state.groups, statusId);
+  state.pendingGroups = filterNotificationsForStatus(
+    state.pendingGroups,
+    statusId,
+  );
+}
+
+function isNotificationGroup(
+  groupOrGap: NotificationGroup | NotificationGap,
+): groupOrGap is NotificationGroup {
+  return groupOrGap.type !== 'gap';
+}
+
+// Merge adjacent gaps in `groups` in-place
+function mergeGaps(groups: NotificationGroupsState['groups']) {
+  for (let i = 0; i < groups.length; i++) {
+    const firstGroupOrGap = groups[i];
+
+    if (firstGroupOrGap?.type === 'gap') {
+      let lastGap = firstGroupOrGap;
+      let j = i + 1;
+
+      for (; j < groups.length; j++) {
+        const groupOrGap = groups[j];
+        if (groupOrGap?.type === 'gap') lastGap = groupOrGap;
+        else break;
+      }
+
+      if (j - i > 1) {
+        groups.splice(i, j - i, {
+          type: 'gap',
+          maxId: firstGroupOrGap.maxId,
+          sinceId: lastGap.sinceId,
+        });
+      }
+    }
+  }
+}
+
+// Checks if `groups[index-1]` and `groups[index]` are gaps, and merge them in-place if they are
+function mergeGapsAround(
+  groups: NotificationGroupsState['groups'],
+  index: number,
+) {
+  if (index > 0) {
+    const potentialFirstGap = groups[index - 1];
+    const potentialSecondGap = groups[index];
+
+    if (
+      potentialFirstGap?.type === 'gap' &&
+      potentialSecondGap?.type === 'gap'
+    ) {
+      groups.splice(index - 1, 2, {
+        type: 'gap',
+        maxId: potentialFirstGap.maxId,
+        sinceId: potentialSecondGap.sinceId,
+      });
+    }
+  }
+}
+
+function processNewNotification(
+  groups: NotificationGroupsState['groups'],
+  notification: ApiNotificationJSON,
+) {
+  const existingGroupIndex = groups.findIndex(
+    (group) =>
+      group.type !== 'gap' && group.group_key === notification.group_key,
+  );
+
+  // In any case, we are going to add a group at the top
+  // If there is currently a gap at the top, now is the time to update it
+  if (groups.length > 0 && groups[0]?.type === 'gap') {
+    groups[0].maxId = notification.id;
+  }
+
+  if (existingGroupIndex > -1) {
+    const existingGroup = groups[existingGroupIndex];
+
+    if (
+      existingGroup &&
+      existingGroup.type !== 'gap' &&
+      !existingGroup.sampleAccountIds.includes(notification.account.id) // This can happen for example if you like, then unlike, then like again the same post
+    ) {
+      // Update the existing group
+      if (
+        existingGroup.sampleAccountIds.unshift(notification.account.id) >
+        NOTIFICATIONS_GROUP_MAX_AVATARS
+      )
+        existingGroup.sampleAccountIds.pop();
+
+      existingGroup.most_recent_notification_id = notification.id;
+      existingGroup.page_max_id = notification.id;
+      existingGroup.latest_page_notification_at = notification.created_at;
+      existingGroup.notifications_count += 1;
+
+      groups.splice(existingGroupIndex, 1);
+      mergeGapsAround(groups, existingGroupIndex);
+
+      groups.unshift(existingGroup);
+    }
+  } else {
+    // Create a new group
+    groups.unshift(createNotificationGroupFromNotificationJSON(notification));
+  }
+}
+
+function trimNotifications(state: NotificationGroupsState) {
+  if (state.scrolledToTop) {
+    state.groups.splice(NOTIFICATIONS_TRIM_LIMIT);
+  }
+}
+
+function shouldMarkNewNotificationsAsRead(
+  {
+    isTabVisible,
+    scrolledToTop,
+    mounted,
+    lastReadId,
+    groups,
+  }: NotificationGroupsState,
+  ignoreScroll = false,
+) {
+  const isMounted = mounted > 0;
+  const oldestGroup = groups.findLast(isNotificationGroup);
+  const hasMore = groups.at(-1)?.type === 'gap';
+  const oldestGroupReached =
+    !hasMore ||
+    lastReadId === '0' ||
+    (oldestGroup?.page_min_id &&
+      compareId(oldestGroup.page_min_id, lastReadId) <= 0);
+
+  return (
+    isTabVisible &&
+    (ignoreScroll || scrolledToTop) &&
+    isMounted &&
+    oldestGroupReached
+  );
+}
+
+function updateLastReadId(
+  state: NotificationGroupsState,
+  group: NotificationGroup | undefined = undefined,
+) {
+  if (shouldMarkNewNotificationsAsRead(state)) {
+    group = group ?? state.groups.find(isNotificationGroup);
+    if (
+      group?.page_max_id &&
+      compareId(state.lastReadId, group.page_max_id) < 0
+    )
+      state.lastReadId = group.page_max_id;
+  }
+}
+
+export const notificationGroupsReducer = createReducer<NotificationGroupsState>(
+  initialState,
+  (builder) => {
+    builder
+      .addCase(fetchNotifications.fulfilled, (state, action) => {
+        state.groups = action.payload.map((json) =>
+          json.type === 'gap' ? json : createNotificationGroupFromJSON(json),
+        );
+        state.isLoading = false;
+        updateLastReadId(state);
+      })
+      .addCase(fetchNotificationsGap.fulfilled, (state, action) => {
+        const { notifications } = action.payload;
+
+        // find the gap in the existing notifications
+        const gapIndex = state.groups.findIndex(
+          (groupOrGap) =>
+            groupOrGap.type === 'gap' &&
+            groupOrGap.sinceId === action.meta.arg.gap.sinceId &&
+            groupOrGap.maxId === action.meta.arg.gap.maxId,
+        );
+
+        if (gapIndex < 0)
+          // We do not know where to insert, let's return
+          return;
+
+        // Filling a disconnection gap means we're getting historical data
+        // about groups we may know or may not know about.
+
+        // The notifications timeline is split in two by the gap, with
+        // group information newer than the gap, and group information older
+        // than the gap.
+
+        // Filling a gap should not touch anything before the gap, so any
+        // information on groups already appearing before the gap should be
+        // discarded, while any information on groups appearing after the gap
+        // can be updated and re-ordered.
+
+        const oldestPageNotification = notifications.at(-1)?.page_min_id;
+
+        // replace the gap with the notifications + a new gap
+
+        const newerGroupKeys = state.groups
+          .slice(0, gapIndex)
+          .filter(isNotificationGroup)
+          .map((group) => group.group_key);
+
+        const toInsert: NotificationGroupsState['groups'] = notifications
+          .map((json) => createNotificationGroupFromJSON(json))
+          .filter(
+            (notification) => !newerGroupKeys.includes(notification.group_key),
+          );
+
+        const apiGroupKeys = (toInsert as NotificationGroup[]).map(
+          (group) => group.group_key,
+        );
+
+        const sinceId = action.meta.arg.gap.sinceId;
+        if (
+          notifications.length > 0 &&
+          !(
+            oldestPageNotification &&
+            sinceId &&
+            compareId(oldestPageNotification, sinceId) <= 0
+          )
+        ) {
+          // If we get an empty page, it means we reached the bottom, so we do not need to insert a new gap
+          // Similarly, if we've fetched more than the gap's, this means we have completely filled it
+          toInsert.push({
+            type: 'gap',
+            maxId: notifications.at(-1)?.page_max_id,
+            sinceId,
+          } as NotificationGap);
+        }
+
+        // Remove older groups covered by the API
+        state.groups = state.groups.filter(
+          (groupOrGap) =>
+            groupOrGap.type !== 'gap' &&
+            !apiGroupKeys.includes(groupOrGap.group_key),
+        );
+
+        // Replace the gap with API results (+ the new gap if needed)
+        state.groups.splice(gapIndex, 1, ...toInsert);
+
+        // Finally, merge any adjacent gaps that could have been created by filtering
+        // groups earlier
+        mergeGaps(state.groups);
+
+        state.isLoading = false;
+
+        updateLastReadId(state);
+      })
+      .addCase(processNewNotificationForGroups.fulfilled, (state, action) => {
+        const notification = action.payload;
+        processNewNotification(
+          usePendingItems ? state.pendingGroups : state.groups,
+          notification,
+        );
+        updateLastReadId(state);
+        trimNotifications(state);
+      })
+      .addCase(disconnectTimeline, (state, action) => {
+        if (action.payload.timeline === 'home') {
+          if (state.groups.length > 0 && state.groups[0]?.type !== 'gap') {
+            state.groups.unshift({
+              type: 'gap',
+              sinceId: state.groups[0]?.page_min_id,
+            });
+          }
+        }
+      })
+      .addCase(timelineDelete, (state, action) => {
+        removeNotificationsForStatus(state, action.payload.statusId);
+      })
+      .addCase(clearNotifications.pending, (state) => {
+        state.groups = [];
+        state.pendingGroups = [];
+      })
+      .addCase(blockAccountSuccess, (state, action) => {
+        removeNotificationsForAccounts(state, [action.payload.relationship.id]);
+      })
+      .addCase(muteAccountSuccess, (state, action) => {
+        if (action.payload.relationship.muting_notifications)
+          removeNotificationsForAccounts(state, [
+            action.payload.relationship.id,
+          ]);
+      })
+      .addCase(blockDomainSuccess, (state, action) => {
+        removeNotificationsForAccounts(
+          state,
+          action.payload.accounts.map((account) => account.id),
+        );
+      })
+      .addCase(loadPending, (state) => {
+        // First, remove any existing group and merge data
+        state.pendingGroups.forEach((group) => {
+          if (group.type !== 'gap') {
+            const existingGroupIndex = state.groups.findIndex(
+              (groupOrGap) =>
+                isNotificationGroup(groupOrGap) &&
+                groupOrGap.group_key === group.group_key,
+            );
+            if (existingGroupIndex > -1) {
+              const existingGroup = state.groups[existingGroupIndex];
+              if (existingGroup && existingGroup.type !== 'gap') {
+                group.notifications_count += existingGroup.notifications_count;
+                group.sampleAccountIds = group.sampleAccountIds
+                  .concat(existingGroup.sampleAccountIds)
+                  .slice(0, NOTIFICATIONS_GROUP_MAX_AVATARS);
+                state.groups.splice(existingGroupIndex, 1);
+              }
+            }
+          }
+          trimNotifications(state);
+        });
+
+        // Then build the consolidated list and clear pending groups
+        state.groups = state.pendingGroups.concat(state.groups);
+        state.pendingGroups = [];
+      })
+      .addCase(updateScrollPosition, (state, action) => {
+        state.scrolledToTop = action.payload.top;
+        updateLastReadId(state);
+        trimNotifications(state);
+      })
+      .addCase(markNotificationsAsRead, (state) => {
+        const mostRecentGroup = state.groups.find(isNotificationGroup);
+        if (
+          mostRecentGroup?.page_max_id &&
+          compareId(state.lastReadId, mostRecentGroup.page_max_id) < 0
+        )
+          state.lastReadId = mostRecentGroup.page_max_id;
+      })
+      .addCase(fetchMarkers.fulfilled, (state, action) => {
+        if (
+          action.payload.markers.notifications &&
+          compareId(
+            state.lastReadId,
+            action.payload.markers.notifications.last_read_id,
+          ) < 0
+        )
+          state.lastReadId = action.payload.markers.notifications.last_read_id;
+      })
+      .addCase(mountNotifications, (state) => {
+        state.mounted += 1;
+        updateLastReadId(state);
+      })
+      .addCase(unmountNotifications, (state) => {
+        state.mounted -= 1;
+      })
+      .addCase(focusApp, (state) => {
+        state.isTabVisible = true;
+        updateLastReadId(state);
+      })
+      .addCase(unfocusApp, (state) => {
+        state.isTabVisible = false;
+      })
+      .addMatcher(
+        isAnyOf(authorizeFollowRequestSuccess, rejectFollowRequestSuccess),
+        (state, action) => {
+          removeNotificationsForAccounts(
+            state,
+            [action.payload.id],
+            'follow_request',
+          );
+        },
+      )
+      .addMatcher(
+        isAnyOf(fetchNotifications.pending, fetchNotificationsGap.pending),
+        (state) => {
+          state.isLoading = true;
+        },
+      )
+      .addMatcher(
+        isAnyOf(fetchNotifications.rejected, fetchNotificationsGap.rejected),
+        (state) => {
+          state.isLoading = false;
+        },
+      );
+  },
+);
diff --git a/app/javascript/mastodon/reducers/notifications.js b/app/javascript/mastodon/reducers/notifications.js
index 79aa5651ff1da6..622f5e8e884bbd 100644
--- a/app/javascript/mastodon/reducers/notifications.js
+++ b/app/javascript/mastodon/reducers/notifications.js
@@ -16,13 +16,13 @@ import {
 import {
   fetchMarkers,
 } from '../actions/markers';
+import { clearNotifications } from '../actions/notification_groups';
 import {
   notificationsUpdate,
   NOTIFICATIONS_EXPAND_SUCCESS,
   NOTIFICATIONS_EXPAND_REQUEST,
   NOTIFICATIONS_EXPAND_FAIL,
   NOTIFICATIONS_FILTER_SET,
-  NOTIFICATIONS_CLEAR,
   NOTIFICATIONS_SCROLL_TOP,
   NOTIFICATIONS_LOAD_PENDING,
   NOTIFICATIONS_MOUNT,
@@ -290,7 +290,7 @@ export default function notifications(state = initialState, action) {
   case authorizeFollowRequestSuccess.type:
   case rejectFollowRequestSuccess.type:
     return filterNotifications(state, [action.payload.id], 'follow_request');
-  case NOTIFICATIONS_CLEAR:
+  case clearNotifications.pending.type:
     return state.set('items', ImmutableList()).set('pendingItems', ImmutableList()).set('hasMore', false);
   case timelineDelete.type:
     return deleteByStatus(state, action.payload.statusId);
diff --git a/app/javascript/mastodon/selectors/notifications.ts b/app/javascript/mastodon/selectors/notifications.ts
new file mode 100644
index 00000000000000..1b1ed2154cdaa7
--- /dev/null
+++ b/app/javascript/mastodon/selectors/notifications.ts
@@ -0,0 +1,34 @@
+import { createSelector } from '@reduxjs/toolkit';
+
+import { compareId } from 'mastodon/compare_id';
+import type { RootState } from 'mastodon/store';
+
+export const selectUnreadNotificationGroupsCount = createSelector(
+  [
+    (s: RootState) => s.notificationGroups.lastReadId,
+    (s: RootState) => s.notificationGroups.pendingGroups,
+    (s: RootState) => s.notificationGroups.groups,
+  ],
+  (notificationMarker, pendingGroups, groups) => {
+    return (
+      groups.filter(
+        (group) =>
+          group.type !== 'gap' &&
+          group.page_max_id &&
+          compareId(group.page_max_id, notificationMarker) > 0,
+      ).length +
+      pendingGroups.filter(
+        (group) =>
+          group.type !== 'gap' &&
+          group.page_max_id &&
+          compareId(group.page_max_id, notificationMarker) > 0,
+      ).length
+    );
+  },
+);
+
+export const selectPendingNotificationGroupsCount = createSelector(
+  [(s: RootState) => s.notificationGroups.pendingGroups],
+  (pendingGroups) =>
+    pendingGroups.filter((group) => group.type !== 'gap').length,
+);
diff --git a/app/javascript/mastodon/selectors/settings.ts b/app/javascript/mastodon/selectors/settings.ts
new file mode 100644
index 00000000000000..64d9440bc8d3b0
--- /dev/null
+++ b/app/javascript/mastodon/selectors/settings.ts
@@ -0,0 +1,40 @@
+import type { RootState } from 'mastodon/store';
+
+/* eslint-disable @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access */
+// state.settings is not yet typed, so we disable some ESLint checks for those selectors
+export const selectSettingsNotificationsShows = (state: RootState) =>
+  state.settings.getIn(['notifications', 'shows']).toJS() as Record<
+    string,
+    boolean
+  >;
+
+export const selectSettingsNotificationsExcludedTypes = (state: RootState) =>
+  Object.entries(selectSettingsNotificationsShows(state))
+    .filter(([_type, enabled]) => !enabled)
+    .map(([type, _enabled]) => type);
+
+export const selectSettingsNotificationsQuickFilterShow = (state: RootState) =>
+  state.settings.getIn(['notifications', 'quickFilter', 'show']) as boolean;
+
+export const selectSettingsNotificationsQuickFilterActive = (
+  state: RootState,
+) => state.settings.getIn(['notifications', 'quickFilter', 'active']) as string;
+
+export const selectSettingsNotificationsQuickFilterAdvanced = (
+  state: RootState,
+) =>
+  state.settings.getIn(['notifications', 'quickFilter', 'advanced']) as boolean;
+
+export const selectSettingsNotificationsShowUnread = (state: RootState) =>
+  state.settings.getIn(['notifications', 'showUnread']) as boolean;
+
+export const selectNeedsNotificationPermission = (state: RootState) =>
+  (state.settings.getIn(['notifications', 'alerts']).includes(true) &&
+    state.notifications.get('browserSupport') &&
+    state.notifications.get('browserPermission') === 'default' &&
+    !state.settings.getIn([
+      'notifications',
+      'dismissPermissionBanner',
+    ])) as boolean;
+
+/* eslint-enable @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access */
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index e94ce2d8f49763..5a0a41c978e6b8 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -1611,14 +1611,19 @@ body > [data-popper-placement] {
   }
 }
 
-.status__wrapper-direct {
+.status__wrapper-direct,
+.notification-ungrouped--direct {
   background: rgba($ui-highlight-color, 0.05);
 
   &:focus {
-    background: rgba($ui-highlight-color, 0.05);
+    background: rgba($ui-highlight-color, 0.1);
   }
+}
 
-  .status__prepend {
+.status__wrapper-direct,
+.notification-ungrouped--direct {
+  .status__prepend,
+  .notification-ungrouped__header {
     color: $highlight-text-color;
   }
 }
@@ -2209,41 +2214,28 @@ a.account__display-name {
   }
 }
 
-.notification__relationships-severance-event,
-.notification__moderation-warning {
-  display: flex;
-  gap: 16px;
+.notification-group--link {
   color: $secondary-text-color;
   text-decoration: none;
-  align-items: flex-start;
-  padding: 16px 32px;
-  border-bottom: 1px solid var(--background-border-color);
-
-  &:hover {
-    color: $primary-text-color;
-  }
-
-  .icon {
-    padding: 2px;
-    color: $highlight-text-color;
-  }
 
-  &__content {
+  .notification-group__main {
     display: flex;
     flex-direction: column;
     align-items: flex-start;
     gap: 8px;
     flex-grow: 1;
-    font-size: 16px;
-    line-height: 24px;
+    font-size: 15px;
+    line-height: 22px;
 
-    strong {
+    strong,
+    bdi {
       font-weight: 700;
     }
 
     .link-button {
       font-size: inherit;
       line-height: inherit;
+      font-weight: inherit;
     }
   }
 }
@@ -10193,8 +10185,8 @@ noscript {
   display: flex;
   align-items: center;
   border-bottom: 1px solid var(--background-border-color);
-  padding: 24px 32px;
-  gap: 16px;
+  padding: 16px 24px;
+  gap: 8px;
   color: $darker-text-color;
   text-decoration: none;
 
@@ -10204,10 +10196,8 @@ noscript {
     color: $secondary-text-color;
   }
 
-  .icon {
-    width: 24px;
-    height: 24px;
-    padding: 2px;
+  .notification-group__icon {
+    color: inherit;
   }
 
   &__text {
@@ -10345,6 +10335,251 @@ noscript {
   }
 }
 
+.notification-group {
+  display: flex;
+  align-items: flex-start;
+  gap: 8px;
+  padding: 16px 24px;
+  border-bottom: 1px solid var(--background-border-color);
+
+  &__icon {
+    width: 40px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    flex: 0 0 auto;
+    color: $dark-text-color;
+
+    .icon {
+      width: 28px;
+      height: 28px;
+    }
+  }
+
+  &--follow &__icon,
+  &--follow-request &__icon {
+    color: $highlight-text-color;
+  }
+
+  &--favourite &__icon {
+    color: $gold-star;
+  }
+
+  &--reblog &__icon {
+    color: $valid-value-color;
+  }
+
+  &--relationships-severance-event &__icon,
+  &--admin-report &__icon,
+  &--admin-sign-up &__icon {
+    color: $dark-text-color;
+  }
+
+  &--moderation-warning &__icon {
+    color: $red-bookmark;
+  }
+
+  &--follow-request &__actions {
+    align-items: center;
+    display: flex;
+    gap: 8px;
+
+    .icon-button {
+      border: 1px solid var(--background-border-color);
+      border-radius: 50%;
+      padding: 1px;
+    }
+  }
+
+  &__main {
+    display: flex;
+    flex-direction: column;
+    gap: 8px;
+    flex: 1 1 auto;
+    overflow: hidden;
+
+    &__header {
+      display: flex;
+      flex-direction: column;
+      gap: 8px;
+
+      &__wrapper {
+        display: flex;
+        justify-content: space-between;
+      }
+
+      &__label {
+        display: flex;
+        gap: 8px;
+        font-size: 15px;
+        line-height: 22px;
+        color: $darker-text-color;
+
+        a {
+          color: inherit;
+          text-decoration: none;
+        }
+
+        bdi {
+          font-weight: 700;
+          color: $primary-text-color;
+        }
+
+        time {
+          color: $dark-text-color;
+        }
+      }
+    }
+
+    &__status {
+      border: 1px solid var(--background-border-color);
+      border-radius: 8px;
+      padding: 8px;
+    }
+  }
+
+  &__avatar-group {
+    display: flex;
+    gap: 8px;
+    height: 28px;
+    overflow-y: hidden;
+    flex-wrap: wrap;
+  }
+
+  .status {
+    padding: 0;
+    border: 0;
+  }
+
+  &__embedded-status {
+    &__account {
+      display: flex;
+      align-items: center;
+      gap: 4px;
+      margin-bottom: 8px;
+      color: $dark-text-color;
+
+      bdi {
+        color: inherit;
+      }
+    }
+
+    .account__avatar {
+      opacity: 0.5;
+    }
+
+    &__content {
+      display: -webkit-box;
+      font-size: 15px;
+      line-height: 22px;
+      color: $dark-text-color;
+      cursor: pointer;
+      -webkit-line-clamp: 4;
+      -webkit-box-orient: vertical;
+      max-height: 4 * 22px;
+      overflow: hidden;
+
+      p,
+      a {
+        color: inherit;
+      }
+    }
+  }
+}
+
+.notification-ungrouped {
+  padding: 16px 24px;
+  border-bottom: 1px solid var(--background-border-color);
+
+  &__header {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    color: $dark-text-color;
+    font-size: 15px;
+    line-height: 22px;
+    font-weight: 500;
+    padding-inline-start: 24px;
+    margin-bottom: 16px;
+
+    &__icon {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      flex: 0 0 auto;
+
+      .icon {
+        width: 16px;
+        height: 16px;
+      }
+    }
+
+    a {
+      color: inherit;
+      text-decoration: none;
+    }
+  }
+
+  .status {
+    border: 0;
+    padding: 0;
+
+    &__avatar {
+      width: 40px;
+      height: 40px;
+    }
+  }
+
+  .status__wrapper-direct {
+    background: transparent;
+  }
+
+  $icon-margin: 48px; // 40px avatar + 8px gap
+
+  .status__content,
+  .status__action-bar,
+  .media-gallery,
+  .video-player,
+  .audio-player,
+  .attachment-list,
+  .picture-in-picture-placeholder,
+  .more-from-author,
+  .status-card,
+  .hashtag-bar {
+    margin-inline-start: $icon-margin;
+    width: calc(100% - $icon-margin);
+  }
+
+  .more-from-author {
+    width: calc(100% - $icon-margin + 2px);
+  }
+
+  .status__content__read-more-button {
+    margin-inline-start: $icon-margin;
+  }
+
+  .notification__report {
+    border: 0;
+    padding: 0;
+  }
+}
+
+.notification-group--unread,
+.notification-ungrouped--unread {
+  position: relative;
+
+  &::before {
+    content: '';
+    position: absolute;
+    top: 0;
+    inset-inline-start: 0;
+    width: 100%;
+    height: 100%;
+    border-inline-start: 4px solid $highlight-text-color;
+    pointer-events: none;
+  }
+}
+
 .hover-card-controller[data-popper-reference-hidden='true'] {
   opacity: 0;
   pointer-events: none;
diff --git a/app/models/notification.rb b/app/models/notification.rb
index 01abe74f5e7eb3..6d404114788c00 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -30,6 +30,7 @@ class Notification < ApplicationRecord
     'Poll' => :poll,
   }.freeze
 
+  # Please update app/javascript/api_types/notification.ts if you change this
   PROPERTIES = {
     mention: {
       filterable: true,
diff --git a/app/models/notification_group.rb b/app/models/notification_group.rb
index b1cbd7c19abf9f..223945f07bf681 100644
--- a/app/models/notification_group.rb
+++ b/app/models/notification_group.rb
@@ -3,13 +3,17 @@
 class NotificationGroup < ActiveModelSerializers::Model
   attributes :group_key, :sample_accounts, :notifications_count, :notification, :most_recent_notification_id
 
+  # Try to keep this consistent with `app/javascript/mastodon/models/notification_group.ts`
+  SAMPLE_ACCOUNTS_SIZE = 8
+
   def self.from_notification(notification, max_id: nil)
     if notification.group_key.present?
-      # TODO: caching and preloading
+      # TODO: caching, and, if caching, preloading
       scope = notification.account.notifications.where(group_key: notification.group_key)
       scope = scope.where(id: ..max_id) if max_id.present?
 
-      most_recent_notifications = scope.order(id: :desc).take(3)
+      # Ideally, we would not load accounts for each notification group
+      most_recent_notifications = scope.order(id: :desc).includes(:from_account).take(SAMPLE_ACCOUNTS_SIZE)
       most_recent_id = most_recent_notifications.first.id
       sample_accounts = most_recent_notifications.map(&:from_account)
       notifications_count = scope.count
diff --git a/app/serializers/rest/notification_group_serializer.rb b/app/serializers/rest/notification_group_serializer.rb
index 9aa5663f4e040c..749f71775463e0 100644
--- a/app/serializers/rest/notification_group_serializer.rb
+++ b/app/serializers/rest/notification_group_serializer.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 class REST::NotificationGroupSerializer < ActiveModel::Serializer
+  # Please update app/javascript/api_types/notification.ts when making changes to the attributes
   attributes :group_key, :notifications_count, :type, :most_recent_notification_id
 
   attribute :page_min_id, if: :paginated?
diff --git a/app/serializers/rest/notification_serializer.rb b/app/serializers/rest/notification_serializer.rb
index ee17af80768439..320bc86961d922 100644
--- a/app/serializers/rest/notification_serializer.rb
+++ b/app/serializers/rest/notification_serializer.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 class REST::NotificationSerializer < ActiveModel::Serializer
+  # Please update app/javascript/api_types/notification.ts when making changes to the attributes
   attributes :id, :type, :created_at, :group_key
 
   attribute :filtered, if: :filtered?
diff --git a/app/services/notify_service.rb b/app/services/notify_service.rb
index d69b5af141214f..acbb3fc784fe49 100644
--- a/app/services/notify_service.rb
+++ b/app/services/notify_service.rb
@@ -4,7 +4,6 @@ class NotifyService < BaseService
   include Redisable
 
   MAXIMUM_GROUP_SPAN_HOURS = 12
-  MAXIMUM_GROUP_GAP_TIME = 4.hours.to_i
 
   NON_EMAIL_TYPES = %i(
     admin.report
@@ -217,9 +216,8 @@ def notification_group_key
     previous_bucket = redis.get(redis_key).to_i
     hour_bucket = previous_bucket if hour_bucket < previous_bucket + MAXIMUM_GROUP_SPAN_HOURS
 
-    # Do not track groups past a given inactivity time
     # We do not concern ourselves with race conditions since we use hour buckets
-    redis.set(redis_key, hour_bucket, ex: MAXIMUM_GROUP_GAP_TIME)
+    redis.set(redis_key, hour_bucket, ex: MAXIMUM_GROUP_SPAN_HOURS)
 
     "#{type_prefix}-#{hour_bucket}"
   end
diff --git a/config/routes.rb b/config/routes.rb
index e4f091043d6c2a..93bdb959695aa1 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -29,6 +29,7 @@ def redirect_with_vary(path)
     /lists/(*any)
     /links/(*any)
     /notifications/(*any)
+    /notifications_v2/(*any)
     /favourites
     /bookmarks
     /pinned
diff --git a/package.json b/package.json
index 404c4f486fcc05..4571ca03af1540 100644
--- a/package.json
+++ b/package.json
@@ -123,6 +123,7 @@
     "tesseract.js": "^2.1.5",
     "tiny-queue": "^0.2.1",
     "twitter-text": "3.1.0",
+    "use-debounce": "^10.0.0",
     "webpack": "^4.47.0",
     "webpack-assets-manifest": "^4.0.6",
     "webpack-bundle-analyzer": "^4.8.0",
diff --git a/yarn.lock b/yarn.lock
index c5d04800619ed5..86640faa0596ca 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2910,6 +2910,7 @@ __metadata:
     tiny-queue: "npm:^0.2.1"
     twitter-text: "npm:3.1.0"
     typescript: "npm:^5.0.4"
+    use-debounce: "npm:^10.0.0"
     webpack: "npm:^4.47.0"
     webpack-assets-manifest: "npm:^4.0.6"
     webpack-bundle-analyzer: "npm:^4.8.0"
@@ -17543,6 +17544,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"use-debounce@npm:^10.0.0":
+  version: 10.0.0
+  resolution: "use-debounce@npm:10.0.0"
+  peerDependencies:
+    react: ">=16.8.0"
+  checksum: 10c0/c1166cba52dedeab17e3e29275af89c57a3e8981b75f6e38ae2896ac36ecd4ed7d8fff5f882ba4b2f91eac7510d5ae0dd89fa4f7d081622ed436c3c89eda5cd1
+  languageName: node
+  linkType: hard
+
 "use-isomorphic-layout-effect@npm:^1.1.1, use-isomorphic-layout-effect@npm:^1.1.2":
   version: 1.1.2
   resolution: "use-isomorphic-layout-effect@npm:1.1.2"

From 6e47637dd4f93169ec783c01f4f9b4dfb7cb66ce Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 18 Jul 2024 17:23:40 +0200
Subject: [PATCH 1567/2191] Fix grouping across hourly buckets happening in a
 12 seconds window instead of 12 hours window (#31062)

---
 app/services/notify_service.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/services/notify_service.rb b/app/services/notify_service.rb
index acbb3fc784fe49..23f92c816b86c0 100644
--- a/app/services/notify_service.rb
+++ b/app/services/notify_service.rb
@@ -217,7 +217,7 @@ def notification_group_key
     hour_bucket = previous_bucket if hour_bucket < previous_bucket + MAXIMUM_GROUP_SPAN_HOURS
 
     # We do not concern ourselves with race conditions since we use hour buckets
-    redis.set(redis_key, hour_bucket, ex: MAXIMUM_GROUP_SPAN_HOURS)
+    redis.set(redis_key, hour_bucket, ex: MAXIMUM_GROUP_SPAN_HOURS.hours.to_i)
 
     "#{type_prefix}-#{hour_bucket}"
   end

From 41b7281b56ea64b13fdf07d5ce7efadcbe65bd1c Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 18 Jul 2024 17:23:43 +0200
Subject: [PATCH 1568/2191] fix(deps): update dependency use-debounce to
 v10.0.1 (#31060)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 86640faa0596ca..1a17c5862fa249 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -17545,11 +17545,11 @@ __metadata:
   linkType: hard
 
 "use-debounce@npm:^10.0.0":
-  version: 10.0.0
-  resolution: "use-debounce@npm:10.0.0"
+  version: 10.0.1
+  resolution: "use-debounce@npm:10.0.1"
   peerDependencies:
     react: ">=16.8.0"
-  checksum: 10c0/c1166cba52dedeab17e3e29275af89c57a3e8981b75f6e38ae2896ac36ecd4ed7d8fff5f882ba4b2f91eac7510d5ae0dd89fa4f7d081622ed436c3c89eda5cd1
+  checksum: 10c0/377a11814a708f5c392f465cbbe2d119a8a2635c8226cc5e30eba397c4436f8e8234385d069467b369d105ed0d3be733c6a08d8ae1004017c6d6f58f4d4c24d8
   languageName: node
   linkType: hard
 

From 848b59c8ae366895eb690a062698bd8f653e5959 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 18 Jul 2024 11:23:46 -0400
Subject: [PATCH 1569/2191] Reduce factory creation in `MediaAttachment` model
 spec (#31058)

---
 spec/models/media_attachment_spec.rb | 99 +++++++++++++++++-----------
 spec/rails_helper.rb                 |  1 +
 2 files changed, 62 insertions(+), 38 deletions(-)

diff --git a/spec/models/media_attachment_spec.rb b/spec/models/media_attachment_spec.rb
index 24e8ca39c11f0e..3142b291fb2b00 100644
--- a/spec/models/media_attachment_spec.rb
+++ b/spec/models/media_attachment_spec.rb
@@ -90,7 +90,7 @@
       media.destroy
     end
 
-    it 'saves media attachment with correct file metadata' do
+    it 'saves media attachment with correct file and size metadata' do
       expect(media)
         .to be_persisted
         .and be_processing_complete
@@ -103,14 +103,12 @@
 
       # Rack::Mime (used by PublicFileServerMiddleware) recognizes file extension
       expect(Rack::Mime.mime_type(extension, nil)).to eq content_type
-    end
 
-    it 'saves media attachment with correct size metadata' do
-      # strips original file name
+      # Strip original file name
       expect(media.file_file_name)
         .to_not start_with '600x400'
 
-      # sets meta for original and thumbnail
+      # Set meta for original and thumbnail
       expect(media.file.meta.deep_symbolize_keys)
         .to include(
           original: include(
@@ -174,10 +172,18 @@
     let(:media) { Fabricate(:media_attachment, file: attachment_fixture('avatar.gif')) }
 
     it 'sets correct file metadata' do
-      expect(media.type).to eq 'gifv'
-      expect(media.file_content_type).to eq 'video/mp4'
-      expect(media.file.meta['original']['width']).to eq 128
-      expect(media.file.meta['original']['height']).to eq 128
+      expect(media)
+        .to have_attributes(
+          type: eq('gifv'),
+          file_content_type: eq('video/mp4')
+        )
+      expect(media_metadata)
+        .to include(
+          original: include(
+            width: eq(128),
+            height: eq(128)
+          )
+        )
     end
   end
 
@@ -192,11 +198,19 @@
         let(:media) { Fabricate(:media_attachment, file: attachment_fixture(fixture[:filename])) }
 
         it 'sets correct file metadata' do
-          expect(media.type).to eq 'image'
-          expect(media.file_content_type).to eq 'image/gif'
-          expect(media.file.meta['original']['width']).to eq fixture[:width]
-          expect(media.file.meta['original']['height']).to eq fixture[:height]
-          expect(media.file.meta['original']['aspect']).to eq fixture[:aspect]
+          expect(media)
+            .to have_attributes(
+              type: eq('image'),
+              file_content_type: eq('image/gif')
+            )
+          expect(media_metadata)
+            .to include(
+              original: include(
+                width: eq(fixture[:width]),
+                height: eq(fixture[:height]),
+                aspect: eq(fixture[:aspect])
+              )
+            )
         end
       end
     end
@@ -204,39 +218,42 @@
 
   describe 'ogg with cover art' do
     let(:media) { Fabricate(:media_attachment, file: attachment_fixture('boop.ogg')) }
+    let(:expected_media_duration) { 0.235102 }
 
-    it 'sets correct file metadata' do
-      expect(media.type).to eq 'audio'
-      expect(media.file.meta['original']['duration']).to be_within(0.05).of(0.235102)
-      expect(media.thumbnail.present?).to be true
+    # The libvips and ImageMagick implementations produce different results
+    let(:expected_background_color) { Rails.configuration.x.use_vips ? '#268cd9' : '#3088d4' }
 
-      expect(media.file.meta['colors']['background']).to eq(expected_background_color)
-      expect(media.file_file_name).to_not eq 'boop.ogg'
-    end
+    it 'sets correct file metadata' do
+      expect(media)
+        .to have_attributes(
+          type: eq('audio'),
+          thumbnail: be_present,
+          file_file_name: not_eq('boop.ogg')
+        )
 
-    def expected_background_color
-      # The libvips and ImageMagick implementations produce different results
-      Rails.configuration.x.use_vips ? '#268cd9' : '#3088d4'
+      expect(media_metadata)
+        .to include(
+          original: include(duration: be_within(0.05).of(expected_media_duration)),
+          colors: include(background: eq(expected_background_color))
+        )
     end
   end
 
   describe 'mp3 with large cover art' do
     let(:media) { Fabricate(:media_attachment, file: attachment_fixture('boop.mp3')) }
+    let(:expected_media_duration) { 0.235102 }
 
-    it 'detects it as an audio file' do
-      expect(media.type).to eq 'audio'
-    end
-
-    it 'sets meta for the duration' do
-      expect(media.file.meta['original']['duration']).to be_within(0.05).of(0.235102)
-    end
-
-    it 'extracts thumbnail' do
-      expect(media.thumbnail.present?).to be true
-    end
-
-    it 'gives the file a random name' do
-      expect(media.file_file_name).to_not eq 'boop.mp3'
+    it 'detects file type and sets correct metadata' do
+      expect(media)
+        .to have_attributes(
+          type: eq('audio'),
+          thumbnail: be_present,
+          file_file_name: not_eq('boop.mp3')
+        )
+      expect(media_metadata)
+        .to include(
+          original: include(duration: be_within(0.05).of(expected_media_duration))
+        )
     end
   end
 
@@ -274,4 +291,10 @@ def expected_background_color
       expect(media.valid?).to be true
     end
   end
+
+  private
+
+  def media_metadata
+    media.file.meta.deep_symbolize_keys
+  end
 end
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 79031f1a9430f7..d4b9bddf93f12a 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -161,6 +161,7 @@ def sign_in(resource, _deprecated = nil, scope: nil)
 end
 
 RSpec::Matchers.define_negated_matcher :not_change, :change
+RSpec::Matchers.define_negated_matcher :not_eq, :eq
 RSpec::Matchers.define_negated_matcher :not_include, :include
 
 def request_fixture(name)

From 82344342c1c5adb3f6a4b376559db737a9e982b7 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 18 Jul 2024 11:45:40 -0400
Subject: [PATCH 1570/2191] Add link to org-level contribution guidelines to
 contributing doc (#31043)

---
 CONTRIBUTING.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index b68a9bde3eafff..8286fdd2f7d2cb 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -11,6 +11,11 @@ You can contribute in the following ways:
 
 If your contributions are accepted into Mastodon, you can request to be paid through [our OpenCollective](https://opencollective.com/mastodon).
 
+Please review the org-level [contribution guidelines] for high-level acceptance
+criteria guidance.
+
+[contribution guidelines]: https://github.com/mastodon/.github/blob/main/CONTRIBUTING.md
+
 ## API Changes and Additions
 
 Please note that any changes or additions made to the API should have an accompanying pull request on [our documentation repository](https://github.com/mastodon/documentation).

From 7224e2405413b816b2fbc171a9a9e7b86bae0261 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Thu, 18 Jul 2024 16:36:09 +0200
Subject: [PATCH 1571/2191] [Glitch] Grouped Notifications UI

Port f587ff643f552a32a1c43e103a474a5065cd3657 to glitch-soc

Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/actions/app.ts |   3 +
 .../flavours/glitch/actions/markers.ts        |  14 +-
 .../glitch/actions/notification_groups.ts     | 144 +++++
 .../flavours/glitch/actions/notifications.js  |  13 +-
 .../actions/notifications_migration.tsx       |  18 +
 .../glitch/actions/notifications_typed.ts     |   9 +-
 .../flavours/glitch/actions/streaming.js      |  11 +-
 .../flavours/glitch/api/notifications.ts      |  18 +
 .../glitch/api_types/notifications.ts         | 145 +++++
 .../flavours/glitch/api_types/reports.ts      |  16 +
 .../flavours/glitch/components/load_gap.tsx   |  12 +-
 .../flavours/glitch/components/status.jsx     |  16 +-
 .../glitch/components/status_header.jsx       |   4 +-
 .../glitch/components/status_list.jsx         |   2 +-
 .../glitch/components/status_prepend.jsx      |   2 +-
 .../compose/components/edit_indicator.jsx     |  10 +-
 .../compose/components/reply_indicator.jsx    |  10 +-
 .../components/column_settings.jsx            |  11 +
 .../filtered_notifications_banner.tsx         |   4 +-
 .../components/moderation_warning.tsx         |  51 +-
 .../relationships_severance_event.jsx         |  15 +-
 .../containers/column_settings_container.js   |   8 +-
 .../glitch/features/notifications/index.jsx   |   2 +-
 .../components/avatar_group.tsx               |  31 ++
 .../components/embedded_status.tsx            |  93 ++++
 .../components/embedded_status_content.tsx    | 165 ++++++
 .../components/names_list.tsx                 |  51 ++
 .../components/notification_admin_report.tsx  | 132 +++++
 .../components/notification_admin_sign_up.tsx |  31 ++
 .../components/notification_favourite.tsx     |  45 ++
 .../components/notification_follow.tsx        |  31 ++
 .../notification_follow_request.tsx           |  78 +++
 .../components/notification_group.tsx         | 134 +++++
 .../notification_group_with_status.tsx        |  91 ++++
 .../components/notification_mention.tsx       |  55 ++
 .../notification_moderation_warning.tsx       |  13 +
 .../components/notification_poll.tsx          |  41 ++
 .../components/notification_reblog.tsx        |  45 ++
 .../notification_severed_relationships.tsx    |  15 +
 .../components/notification_status.tsx        |  31 ++
 .../components/notification_update.tsx        |  31 ++
 .../components/notification_with_status.tsx   |  73 +++
 .../features/notifications_v2/filter_bar.tsx  | 145 +++++
 .../features/notifications_v2/index.tsx       | 354 ++++++++++++
 .../glitch/features/notifications_wrapper.jsx |  13 +
 .../features/ui/components/columns_area.jsx   |   4 +-
 .../ui/components/navigation_panel.jsx        |   9 +-
 .../flavours/glitch/features/ui/index.jsx     |  15 +-
 .../features/ui/util/async-components.js      |  10 +-
 .../glitch/models/notification_group.ts       | 207 +++++++
 .../flavours/glitch/reducers/index.ts         |   2 +
 .../flavours/glitch/reducers/markers.ts       |  25 +-
 .../glitch/reducers/notification_groups.ts    | 508 ++++++++++++++++++
 .../flavours/glitch/reducers/notifications.js |   4 +-
 .../glitch/selectors/notifications.ts         |  34 ++
 .../flavours/glitch/selectors/settings.ts     |  40 ++
 .../flavours/glitch/styles/components.scss    | 295 +++++++++-
 57 files changed, 3271 insertions(+), 118 deletions(-)
 create mode 100644 app/javascript/flavours/glitch/actions/notification_groups.ts
 create mode 100644 app/javascript/flavours/glitch/actions/notifications_migration.tsx
 create mode 100644 app/javascript/flavours/glitch/api/notifications.ts
 create mode 100644 app/javascript/flavours/glitch/api_types/notifications.ts
 create mode 100644 app/javascript/flavours/glitch/api_types/reports.ts
 create mode 100644 app/javascript/flavours/glitch/features/notifications_v2/components/avatar_group.tsx
 create mode 100644 app/javascript/flavours/glitch/features/notifications_v2/components/embedded_status.tsx
 create mode 100644 app/javascript/flavours/glitch/features/notifications_v2/components/embedded_status_content.tsx
 create mode 100644 app/javascript/flavours/glitch/features/notifications_v2/components/names_list.tsx
 create mode 100644 app/javascript/flavours/glitch/features/notifications_v2/components/notification_admin_report.tsx
 create mode 100644 app/javascript/flavours/glitch/features/notifications_v2/components/notification_admin_sign_up.tsx
 create mode 100644 app/javascript/flavours/glitch/features/notifications_v2/components/notification_favourite.tsx
 create mode 100644 app/javascript/flavours/glitch/features/notifications_v2/components/notification_follow.tsx
 create mode 100644 app/javascript/flavours/glitch/features/notifications_v2/components/notification_follow_request.tsx
 create mode 100644 app/javascript/flavours/glitch/features/notifications_v2/components/notification_group.tsx
 create mode 100644 app/javascript/flavours/glitch/features/notifications_v2/components/notification_group_with_status.tsx
 create mode 100644 app/javascript/flavours/glitch/features/notifications_v2/components/notification_mention.tsx
 create mode 100644 app/javascript/flavours/glitch/features/notifications_v2/components/notification_moderation_warning.tsx
 create mode 100644 app/javascript/flavours/glitch/features/notifications_v2/components/notification_poll.tsx
 create mode 100644 app/javascript/flavours/glitch/features/notifications_v2/components/notification_reblog.tsx
 create mode 100644 app/javascript/flavours/glitch/features/notifications_v2/components/notification_severed_relationships.tsx
 create mode 100644 app/javascript/flavours/glitch/features/notifications_v2/components/notification_status.tsx
 create mode 100644 app/javascript/flavours/glitch/features/notifications_v2/components/notification_update.tsx
 create mode 100644 app/javascript/flavours/glitch/features/notifications_v2/components/notification_with_status.tsx
 create mode 100644 app/javascript/flavours/glitch/features/notifications_v2/filter_bar.tsx
 create mode 100644 app/javascript/flavours/glitch/features/notifications_v2/index.tsx
 create mode 100644 app/javascript/flavours/glitch/features/notifications_wrapper.jsx
 create mode 100644 app/javascript/flavours/glitch/models/notification_group.ts
 create mode 100644 app/javascript/flavours/glitch/reducers/notification_groups.ts
 create mode 100644 app/javascript/flavours/glitch/selectors/notifications.ts
 create mode 100644 app/javascript/flavours/glitch/selectors/settings.ts

diff --git a/app/javascript/flavours/glitch/actions/app.ts b/app/javascript/flavours/glitch/actions/app.ts
index 6fbfc07f68c931..be1a5cced20f4d 100644
--- a/app/javascript/flavours/glitch/actions/app.ts
+++ b/app/javascript/flavours/glitch/actions/app.ts
@@ -2,6 +2,9 @@ import { createAction } from '@reduxjs/toolkit';
 
 import type { LayoutType } from '../is_mobile';
 
+export const focusApp = createAction('APP_FOCUS');
+export const unfocusApp = createAction('APP_UNFOCUS');
+
 interface ChangeLayoutPayload {
   layout: LayoutType;
 }
diff --git a/app/javascript/flavours/glitch/actions/markers.ts b/app/javascript/flavours/glitch/actions/markers.ts
index a85af1c4beec48..861eae41ec4f1e 100644
--- a/app/javascript/flavours/glitch/actions/markers.ts
+++ b/app/javascript/flavours/glitch/actions/markers.ts
@@ -75,9 +75,17 @@ interface MarkerParam {
 }
 
 function getLastNotificationId(state: RootState): string | undefined {
-  // @ts-expect-error state.notifications is not yet typed
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-return, @typescript-eslint/no-unsafe-call
-  return state.getIn(['notifications', 'lastReadId']);
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
+  const enableBeta = state.settings.getIn(
+    ['notifications', 'groupingBeta'],
+    false,
+  ) as boolean;
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-return
+  return enableBeta
+    ? state.notificationGroups.lastReadId
+    : // @ts-expect-error state.notifications is not yet typed
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-call
+      state.getIn(['notifications', 'lastReadId']);
 }
 
 const buildPostMarkersParams = (state: RootState) => {
diff --git a/app/javascript/flavours/glitch/actions/notification_groups.ts b/app/javascript/flavours/glitch/actions/notification_groups.ts
new file mode 100644
index 00000000000000..3f6d14a978b154
--- /dev/null
+++ b/app/javascript/flavours/glitch/actions/notification_groups.ts
@@ -0,0 +1,144 @@
+import { createAction } from '@reduxjs/toolkit';
+
+import {
+  apiClearNotifications,
+  apiFetchNotifications,
+} from 'flavours/glitch/api/notifications';
+import type { ApiAccountJSON } from 'flavours/glitch/api_types/accounts';
+import type {
+  ApiNotificationGroupJSON,
+  ApiNotificationJSON,
+} from 'flavours/glitch/api_types/notifications';
+import { allNotificationTypes } from 'flavours/glitch/api_types/notifications';
+import type { ApiStatusJSON } from 'flavours/glitch/api_types/statuses';
+import type { NotificationGap } from 'flavours/glitch/reducers/notification_groups';
+import {
+  selectSettingsNotificationsExcludedTypes,
+  selectSettingsNotificationsQuickFilterActive,
+} from 'flavours/glitch/selectors/settings';
+import type { AppDispatch } from 'flavours/glitch/store';
+import {
+  createAppAsyncThunk,
+  createDataLoadingThunk,
+} from 'flavours/glitch/store/typed_functions';
+
+import { importFetchedAccounts, importFetchedStatuses } from './importer';
+import { NOTIFICATIONS_FILTER_SET } from './notifications';
+import { saveSettings } from './settings';
+
+function excludeAllTypesExcept(filter: string) {
+  return allNotificationTypes.filter((item) => item !== filter);
+}
+
+function dispatchAssociatedRecords(
+  dispatch: AppDispatch,
+  notifications: ApiNotificationGroupJSON[] | ApiNotificationJSON[],
+) {
+  const fetchedAccounts: ApiAccountJSON[] = [];
+  const fetchedStatuses: ApiStatusJSON[] = [];
+
+  notifications.forEach((notification) => {
+    if ('sample_accounts' in notification) {
+      fetchedAccounts.push(...notification.sample_accounts);
+    }
+
+    if (notification.type === 'admin.report') {
+      fetchedAccounts.push(notification.report.target_account);
+    }
+
+    if (notification.type === 'moderation_warning') {
+      fetchedAccounts.push(notification.moderation_warning.target_account);
+    }
+
+    if ('status' in notification) {
+      fetchedStatuses.push(notification.status);
+    }
+  });
+
+  if (fetchedAccounts.length > 0)
+    dispatch(importFetchedAccounts(fetchedAccounts));
+
+  if (fetchedStatuses.length > 0)
+    dispatch(importFetchedStatuses(fetchedStatuses));
+}
+
+export const fetchNotifications = createDataLoadingThunk(
+  'notificationGroups/fetch',
+  async (_params, { getState }) => {
+    const activeFilter =
+      selectSettingsNotificationsQuickFilterActive(getState());
+
+    return apiFetchNotifications({
+      exclude_types:
+        activeFilter === 'all'
+          ? selectSettingsNotificationsExcludedTypes(getState())
+          : excludeAllTypesExcept(activeFilter),
+    });
+  },
+  ({ notifications }, { dispatch }) => {
+    dispatchAssociatedRecords(dispatch, notifications);
+    const payload: (ApiNotificationGroupJSON | NotificationGap)[] =
+      notifications;
+
+    // TODO: might be worth not using gaps for that…
+    // if (nextLink) payload.push({ type: 'gap', loadUrl: nextLink.uri });
+    if (notifications.length > 1)
+      payload.push({ type: 'gap', maxId: notifications.at(-1)?.page_min_id });
+
+    return payload;
+    // dispatch(submitMarkers());
+  },
+);
+
+export const fetchNotificationsGap = createDataLoadingThunk(
+  'notificationGroups/fetchGap',
+  async (params: { gap: NotificationGap }) =>
+    apiFetchNotifications({ max_id: params.gap.maxId }),
+
+  ({ notifications }, { dispatch }) => {
+    dispatchAssociatedRecords(dispatch, notifications);
+
+    return { notifications };
+  },
+);
+
+export const processNewNotificationForGroups = createAppAsyncThunk(
+  'notificationGroups/processNew',
+  (notification: ApiNotificationJSON, { dispatch }) => {
+    dispatchAssociatedRecords(dispatch, [notification]);
+
+    return notification;
+  },
+);
+
+export const loadPending = createAction('notificationGroups/loadPending');
+
+export const updateScrollPosition = createAction<{ top: boolean }>(
+  'notificationGroups/updateScrollPosition',
+);
+
+export const setNotificationsFilter = createAppAsyncThunk(
+  'notifications/filter/set',
+  ({ filterType }: { filterType: string }, { dispatch }) => {
+    dispatch({
+      type: NOTIFICATIONS_FILTER_SET,
+      path: ['notifications', 'quickFilter', 'active'],
+      value: filterType,
+    });
+    // dispatch(expandNotifications({ forceLoad: true }));
+    void dispatch(fetchNotifications());
+    dispatch(saveSettings());
+  },
+);
+
+export const clearNotifications = createDataLoadingThunk(
+  'notifications/clear',
+  () => apiClearNotifications(),
+);
+
+export const markNotificationsAsRead = createAction(
+  'notificationGroups/markAsRead',
+);
+
+export const mountNotifications = createAction('notificationGroups/mount');
+export const unmountNotifications = createAction('notificationGroups/unmount');
diff --git a/app/javascript/flavours/glitch/actions/notifications.js b/app/javascript/flavours/glitch/actions/notifications.js
index 3a1af501c8d9e6..7a97e71bdd22e5 100644
--- a/app/javascript/flavours/glitch/actions/notifications.js
+++ b/app/javascript/flavours/glitch/actions/notifications.js
@@ -43,7 +43,6 @@ export const NOTIFICATIONS_EXPAND_FAIL    = 'NOTIFICATIONS_EXPAND_FAIL';
 
 export const NOTIFICATIONS_FILTER_SET = 'NOTIFICATIONS_FILTER_SET';
 
-export const NOTIFICATIONS_CLEAR        = 'NOTIFICATIONS_CLEAR';
 export const NOTIFICATIONS_SCROLL_TOP   = 'NOTIFICATIONS_SCROLL_TOP';
 export const NOTIFICATIONS_LOAD_PENDING = 'NOTIFICATIONS_LOAD_PENDING';
 
@@ -186,7 +185,7 @@ const noOp = () => {};
 
 let expandNotificationsController = new AbortController();
 
-export function expandNotifications({ maxId, forceLoad } = {}, done = noOp) {
+export function expandNotifications({ maxId, forceLoad = false } = {}, done = noOp) {
   return (dispatch, getState) => {
     const activeFilter = getState().getIn(['settings', 'notifications', 'quickFilter', 'active']);
     const notifications = getState().get('notifications');
@@ -269,16 +268,6 @@ export function expandNotificationsFail(error, isLoadingMore) {
   };
 }
 
-export function clearNotifications() {
-  return (dispatch) => {
-    dispatch({
-      type: NOTIFICATIONS_CLEAR,
-    });
-
-    api().post('/api/v1/notifications/clear');
-  };
-}
-
 export function scrollTopNotifications(top) {
   return {
     type: NOTIFICATIONS_SCROLL_TOP,
diff --git a/app/javascript/flavours/glitch/actions/notifications_migration.tsx b/app/javascript/flavours/glitch/actions/notifications_migration.tsx
new file mode 100644
index 00000000000000..32844d4b42e2d6
--- /dev/null
+++ b/app/javascript/flavours/glitch/actions/notifications_migration.tsx
@@ -0,0 +1,18 @@
+import { createAppAsyncThunk } from 'flavours/glitch/store';
+
+import { fetchNotifications } from './notification_groups';
+import { expandNotifications } from './notifications';
+
+export const initializeNotifications = createAppAsyncThunk(
+  'notifications/initialize',
+  (_, { dispatch, getState }) => {
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
+    const enableBeta = getState().settings.getIn(
+      ['notifications', 'groupingBeta'],
+      false,
+    ) as boolean;
+
+    if (enableBeta) void dispatch(fetchNotifications());
+    else dispatch(expandNotifications());
+  },
+);
diff --git a/app/javascript/flavours/glitch/actions/notifications_typed.ts b/app/javascript/flavours/glitch/actions/notifications_typed.ts
index 176362f4b1edd4..55896f4c378f49 100644
--- a/app/javascript/flavours/glitch/actions/notifications_typed.ts
+++ b/app/javascript/flavours/glitch/actions/notifications_typed.ts
@@ -1,11 +1,6 @@
 import { createAction } from '@reduxjs/toolkit';
 
-import type { ApiAccountJSON } from '../api_types/accounts';
-// To be replaced once ApiNotificationJSON type exists
-interface FakeApiNotificationJSON {
-  type: string;
-  account: ApiAccountJSON;
-}
+import type { ApiNotificationJSON } from 'flavours/glitch/api_types/notifications';
 
 export const notificationsUpdate = createAction(
   'notifications/update',
@@ -13,7 +8,7 @@ export const notificationsUpdate = createAction(
     playSound,
     ...args
   }: {
-    notification: FakeApiNotificationJSON;
+    notification: ApiNotificationJSON;
     usePendingItems: boolean;
     playSound: boolean;
   }) => ({
diff --git a/app/javascript/flavours/glitch/actions/streaming.js b/app/javascript/flavours/glitch/actions/streaming.js
index a55240646f3e69..7b006c1be7c019 100644
--- a/app/javascript/flavours/glitch/actions/streaming.js
+++ b/app/javascript/flavours/glitch/actions/streaming.js
@@ -10,6 +10,7 @@ import {
   deleteAnnouncement,
 } from './announcements';
 import { updateConversations } from './conversations';
+import { processNewNotificationForGroups } from './notification_groups';
 import { updateNotifications, expandNotifications } from './notifications';
 import { updateStatus } from './statuses';
 import {
@@ -98,10 +99,16 @@ export const connectTimelineStream = (timelineId, channelName, params = {}, opti
         case 'delete':
           dispatch(deleteFromTimelines(data.payload));
           break;
-        case 'notification':
+        case 'notification': {
           // @ts-expect-error
-          dispatch(updateNotifications(JSON.parse(data.payload), messages, locale));
+          const notificationJSON = JSON.parse(data.payload);
+          dispatch(updateNotifications(notificationJSON, messages, locale));
+          // TODO: remove this once the groups feature replaces the previous one
+          if(getState().notificationGroups.groups.length > 0) {
+            dispatch(processNewNotificationForGroups(notificationJSON));
+          }
           break;
+        }
         case 'conversation':
           // @ts-expect-error
           dispatch(updateConversations(JSON.parse(data.payload)));
diff --git a/app/javascript/flavours/glitch/api/notifications.ts b/app/javascript/flavours/glitch/api/notifications.ts
new file mode 100644
index 00000000000000..fe718788220d44
--- /dev/null
+++ b/app/javascript/flavours/glitch/api/notifications.ts
@@ -0,0 +1,18 @@
+import api, { apiRequest, getLinks } from 'flavours/glitch/api';
+import type { ApiNotificationGroupJSON } from 'flavours/glitch/api_types/notifications';
+
+export const apiFetchNotifications = async (params?: {
+  exclude_types?: string[];
+  max_id?: string;
+}) => {
+  const response = await api().request<ApiNotificationGroupJSON[]>({
+    method: 'GET',
+    url: '/api/v2_alpha/notifications',
+    params,
+  });
+
+  return { notifications: response.data, links: getLinks(response) };
+};
+
+export const apiClearNotifications = () =>
+  apiRequest<undefined>('POST', 'v1/notifications/clear');
diff --git a/app/javascript/flavours/glitch/api_types/notifications.ts b/app/javascript/flavours/glitch/api_types/notifications.ts
new file mode 100644
index 00000000000000..ea37556d8d0af0
--- /dev/null
+++ b/app/javascript/flavours/glitch/api_types/notifications.ts
@@ -0,0 +1,145 @@
+// See app/serializers/rest/notification_group_serializer.rb
+
+import type { AccountWarningAction } from 'flavours/glitch/models/notification_group';
+
+import type { ApiAccountJSON } from './accounts';
+import type { ApiReportJSON } from './reports';
+import type { ApiStatusJSON } from './statuses';
+
+// See app/model/notification.rb
+export const allNotificationTypes = [
+  'follow',
+  'follow_request',
+  'favourite',
+  'reblog',
+  'mention',
+  'poll',
+  'status',
+  'update',
+  'admin.sign_up',
+  'admin.report',
+  'moderation_warning',
+  'severed_relationships',
+];
+
+export type NotificationWithStatusType =
+  | 'favourite'
+  | 'reblog'
+  | 'status'
+  | 'mention'
+  | 'poll'
+  | 'update';
+
+export type NotificationType =
+  | NotificationWithStatusType
+  | 'follow'
+  | 'follow_request'
+  | 'moderation_warning'
+  | 'severed_relationships'
+  | 'admin.sign_up'
+  | 'admin.report';
+
+export interface BaseNotificationJSON {
+  id: string;
+  type: NotificationType;
+  created_at: string;
+  group_key: string;
+  account: ApiAccountJSON;
+}
+
+export interface BaseNotificationGroupJSON {
+  group_key: string;
+  notifications_count: number;
+  type: NotificationType;
+  sample_accounts: ApiAccountJSON[];
+  latest_page_notification_at: string; // FIXME: This will only be present if the notification group is returned in a paginated list, not requested directly
+  most_recent_notification_id: string;
+  page_min_id?: string;
+  page_max_id?: string;
+}
+
+interface NotificationGroupWithStatusJSON extends BaseNotificationGroupJSON {
+  type: NotificationWithStatusType;
+  status: ApiStatusJSON;
+}
+
+interface NotificationWithStatusJSON extends BaseNotificationJSON {
+  type: NotificationWithStatusType;
+  status: ApiStatusJSON;
+}
+
+interface ReportNotificationGroupJSON extends BaseNotificationGroupJSON {
+  type: 'admin.report';
+  report: ApiReportJSON;
+}
+
+interface ReportNotificationJSON extends BaseNotificationJSON {
+  type: 'admin.report';
+  report: ApiReportJSON;
+}
+
+type SimpleNotificationTypes = 'follow' | 'follow_request' | 'admin.sign_up';
+interface SimpleNotificationGroupJSON extends BaseNotificationGroupJSON {
+  type: SimpleNotificationTypes;
+}
+
+interface SimpleNotificationJSON extends BaseNotificationJSON {
+  type: SimpleNotificationTypes;
+}
+
+export interface ApiAccountWarningJSON {
+  id: string;
+  action: AccountWarningAction;
+  text: string;
+  status_ids: string[];
+  created_at: string;
+  target_account: ApiAccountJSON;
+  appeal: unknown;
+}
+
+interface ModerationWarningNotificationGroupJSON
+  extends BaseNotificationGroupJSON {
+  type: 'moderation_warning';
+  moderation_warning: ApiAccountWarningJSON;
+}
+
+interface ModerationWarningNotificationJSON extends BaseNotificationJSON {
+  type: 'moderation_warning';
+  moderation_warning: ApiAccountWarningJSON;
+}
+
+export interface ApiAccountRelationshipSeveranceEventJSON {
+  id: string;
+  type: 'account_suspension' | 'domain_block' | 'user_domain_block';
+  purged: boolean;
+  target_name: string;
+  followers_count: number;
+  following_count: number;
+  created_at: string;
+}
+
+interface AccountRelationshipSeveranceNotificationGroupJSON
+  extends BaseNotificationGroupJSON {
+  type: 'severed_relationships';
+  event: ApiAccountRelationshipSeveranceEventJSON;
+}
+
+interface AccountRelationshipSeveranceNotificationJSON
+  extends BaseNotificationJSON {
+  type: 'severed_relationships';
+  event: ApiAccountRelationshipSeveranceEventJSON;
+}
+
+export type ApiNotificationJSON =
+  | SimpleNotificationJSON
+  | ReportNotificationJSON
+  | AccountRelationshipSeveranceNotificationJSON
+  | NotificationWithStatusJSON
+  | ModerationWarningNotificationJSON;
+
+export type ApiNotificationGroupJSON =
+  | SimpleNotificationGroupJSON
+  | ReportNotificationGroupJSON
+  | AccountRelationshipSeveranceNotificationGroupJSON
+  | NotificationGroupWithStatusJSON
+  | ModerationWarningNotificationGroupJSON;
diff --git a/app/javascript/flavours/glitch/api_types/reports.ts b/app/javascript/flavours/glitch/api_types/reports.ts
new file mode 100644
index 00000000000000..b11cfdd2eb59c8
--- /dev/null
+++ b/app/javascript/flavours/glitch/api_types/reports.ts
@@ -0,0 +1,16 @@
+import type { ApiAccountJSON } from './accounts';
+
+export type ReportCategory = 'other' | 'spam' | 'legal' | 'violation';
+
+export interface ApiReportJSON {
+  id: string;
+  action_taken: unknown;
+  action_taken_at: unknown;
+  category: ReportCategory;
+  comment: string;
+  forwarded: boolean;
+  created_at: string;
+  status_ids: string[];
+  rule_ids: string[];
+  target_account: ApiAccountJSON;
+}
diff --git a/app/javascript/flavours/glitch/components/load_gap.tsx b/app/javascript/flavours/glitch/components/load_gap.tsx
index f0d15d37761030..1870185c2914d9 100644
--- a/app/javascript/flavours/glitch/components/load_gap.tsx
+++ b/app/javascript/flavours/glitch/components/load_gap.tsx
@@ -9,18 +9,18 @@ const messages = defineMessages({
   load_more: { id: 'status.load_more', defaultMessage: 'Load more' },
 });
 
-interface Props {
+interface Props<T> {
   disabled: boolean;
-  maxId: string;
-  onClick: (maxId: string) => void;
+  param: T;
+  onClick: (params: T) => void;
 }
 
-export const LoadGap: React.FC<Props> = ({ disabled, maxId, onClick }) => {
+export const LoadGap = <T,>({ disabled, param, onClick }: Props<T>) => {
   const intl = useIntl();
 
   const handleClick = useCallback(() => {
-    onClick(maxId);
-  }, [maxId, onClick]);
+    onClick(param);
+  }, [param, onClick]);
 
   return (
     <button
diff --git a/app/javascript/flavours/glitch/components/status.jsx b/app/javascript/flavours/glitch/components/status.jsx
index 0915af20047427..c115251d65e9cd 100644
--- a/app/javascript/flavours/glitch/components/status.jsx
+++ b/app/javascript/flavours/glitch/components/status.jsx
@@ -115,6 +115,8 @@ class Status extends ImmutablePureComponent {
     cacheMediaWidth: PropTypes.func,
     cachedMediaWidth: PropTypes.number,
     scrollKey: PropTypes.string,
+    skipPrepend: PropTypes.bool,
+    avatarSize: PropTypes.number,
     deployPictureInPicture: PropTypes.func,
     settings: ImmutablePropTypes.map.isRequired,
     pictureInPicture: ImmutablePropTypes.contains({
@@ -518,12 +520,14 @@ class Status extends ImmutablePureComponent {
   }
 
   render () {
+    const { intl, hidden, featured, unread, pictureInPicture, previousId, nextInReplyToId, rootId, skipPrepend, avatarSize = 46 } = this.props;
+
     const {
       parseClick,
       setCollapsed,
     } = this;
+
     const {
-      intl,
       status,
       account,
       settings,
@@ -533,13 +537,6 @@ class Status extends ImmutablePureComponent {
       onOpenVideo,
       onOpenMedia,
       notification,
-      hidden,
-      unread,
-      featured,
-      pictureInPicture,
-      previousId,
-      nextInReplyToId,
-      rootId,
       history,
       ...other
     } = this.props;
@@ -799,7 +796,7 @@ class Status extends ImmutablePureComponent {
           ref={this.handleRef}
           data-nosnippet={status.getIn(['account', 'noindex'], true) || undefined}
         >
-          {prepend}
+          {!skipPrepend && prepend}
 
           <div
             className={classNames('status', `status-${status.get('visibility')}`, { 'status-reply': !!status.get('in_reply_to_id'), 'status--in-thread': !!rootId, 'status--first-in-thread': previousId && (!connectUp || connectToRoot), muted: this.props.muted, 'has-background': isCollapsed && background })}
@@ -815,6 +812,7 @@ class Status extends ImmutablePureComponent {
                   friend={account}
                   collapsed={isCollapsed}
                   parseClick={parseClick}
+                  avatarSize={avatarSize}
                 />
                 <StatusIcons
                   status={status}
diff --git a/app/javascript/flavours/glitch/components/status_header.jsx b/app/javascript/flavours/glitch/components/status_header.jsx
index 2dd09d68ef80a7..5eeed3d41dcdae 100644
--- a/app/javascript/flavours/glitch/components/status_header.jsx
+++ b/app/javascript/flavours/glitch/components/status_header.jsx
@@ -14,6 +14,7 @@ export default class StatusHeader extends PureComponent {
   static propTypes = {
     status: ImmutablePropTypes.map.isRequired,
     friend: ImmutablePropTypes.map,
+    avatarSize: PropTypes.number,
     parseClick: PropTypes.func.isRequired,
   };
 
@@ -33,13 +34,14 @@ export default class StatusHeader extends PureComponent {
     const {
       status,
       friend,
+      avatarSize,
     } = this.props;
 
     const account = status.get('account');
 
     let statusAvatar;
     if (friend === undefined || friend === null) {
-      statusAvatar = <Avatar account={account} size={46} />;
+      statusAvatar = <Avatar account={account} size={avatarSize} />;
     } else {
       statusAvatar = <AvatarOverlay account={account} friend={friend} />;
     }
diff --git a/app/javascript/flavours/glitch/components/status_list.jsx b/app/javascript/flavours/glitch/components/status_list.jsx
index 374d14a56a6d2d..b0295a504d3782 100644
--- a/app/javascript/flavours/glitch/components/status_list.jsx
+++ b/app/javascript/flavours/glitch/components/status_list.jsx
@@ -108,7 +108,7 @@ export default class StatusList extends ImmutablePureComponent {
             <LoadGap
               key={'gap:' + statusIds.get(index + 1)}
               disabled={isLoading}
-              maxId={index > 0 ? statusIds.get(index - 1) : null}
+              param={index > 0 ? statusIds.get(index - 1) : null}
               onClick={onLoadMore}
             />
           );
diff --git a/app/javascript/flavours/glitch/components/status_prepend.jsx b/app/javascript/flavours/glitch/components/status_prepend.jsx
index e3bb554e2a487e..0777ffcda6ec15 100644
--- a/app/javascript/flavours/glitch/components/status_prepend.jsx
+++ b/app/javascript/flavours/glitch/components/status_prepend.jsx
@@ -98,7 +98,7 @@ export default class StatusPrepend extends PureComponent {
         return (
           <FormattedMessage
             id='notification.poll'
-            defaultMessage='A poll you have voted in has ended'
+            defaultMessage='A poll you voted in has ended'
           />
         );
       }
diff --git a/app/javascript/flavours/glitch/features/compose/components/edit_indicator.jsx b/app/javascript/flavours/glitch/features/compose/components/edit_indicator.jsx
index 060e760f06e093..bccb716daeeafe 100644
--- a/app/javascript/flavours/glitch/features/compose/components/edit_indicator.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/edit_indicator.jsx
@@ -12,6 +12,7 @@ import { Icon } from 'flavours/glitch/components/icon';
 import { IconButton } from 'flavours/glitch/components/icon_button';
 import { Permalink } from 'flavours/glitch/components/permalink';
 import { RelativeTimestamp } from 'flavours/glitch/components/relative_timestamp';
+import { EmbeddedStatusContent } from 'flavours/glitch/features/notifications_v2/components/embedded_status_content';
 
 const messages = defineMessages({
   cancel: { id: 'reply_indicator.cancel', defaultMessage: 'Cancel' },
@@ -32,8 +33,6 @@ export const EditIndicator = () => {
     return null;
   }
 
-  const content = { __html: status.get('contentHtml') };
-
   return (
     <div className='edit-indicator'>
       <div className='edit-indicator__header'>
@@ -48,7 +47,12 @@ export const EditIndicator = () => {
         </div>
       </div>
 
-      <div className='edit-indicator__content translate' dangerouslySetInnerHTML={content} />
+      <EmbeddedStatusContent
+        className='edit-indicator__content translate'
+        content={status.get('contentHtml')}
+        language={status.get('language')}
+        mentions={status.get('mentions')}
+      />
 
       {(status.get('poll') || status.get('media_attachments').size > 0) && (
         <div className='edit-indicator__attachments'>
diff --git a/app/javascript/flavours/glitch/features/compose/components/reply_indicator.jsx b/app/javascript/flavours/glitch/features/compose/components/reply_indicator.jsx
index b24f7ced9933b1..adb8f457edf16d 100644
--- a/app/javascript/flavours/glitch/features/compose/components/reply_indicator.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/reply_indicator.jsx
@@ -8,6 +8,7 @@ import { Avatar } from 'flavours/glitch/components/avatar';
 import { DisplayName } from 'flavours/glitch/components/display_name';
 import { Icon } from 'flavours/glitch/components/icon';
 import { Permalink } from 'flavours/glitch/components/permalink';
+import { EmbeddedStatusContent } from 'flavours/glitch/features/notifications_v2/components/embedded_status_content';
 
 export const ReplyIndicator = () => {
   const inReplyToId = useSelector(state => state.getIn(['compose', 'in_reply_to']));
@@ -18,8 +19,6 @@ export const ReplyIndicator = () => {
     return null;
   }
 
-  const content = { __html: status.get('contentHtml') };
-
   return (
     <div className='reply-indicator'>
       <div className='reply-indicator__line' />
@@ -33,7 +32,12 @@ export const ReplyIndicator = () => {
           <DisplayName account={account} />
         </Permalink>
 
-        <div className='reply-indicator__content translate' dangerouslySetInnerHTML={content} />
+        <EmbeddedStatusContent
+          className='reply-indicator__content translate'
+          content={status.get('contentHtml')}
+          language={status.get('language')}
+          mentions={status.get('mentions')}
+        />
 
         {(status.get('poll') || status.get('media_attachments').size > 0) && (
           <div className='reply-indicator__attachments'>
diff --git a/app/javascript/flavours/glitch/features/notifications/components/column_settings.jsx b/app/javascript/flavours/glitch/features/notifications/components/column_settings.jsx
index 1ed77975092421..3423517227da0f 100644
--- a/app/javascript/flavours/glitch/features/notifications/components/column_settings.jsx
+++ b/app/javascript/flavours/glitch/features/notifications/components/column_settings.jsx
@@ -53,6 +53,7 @@ class ColumnSettings extends PureComponent {
     const { settings, pushSettings, onChange, onClear, alertsEnabled, browserSupport, browserPermission, onRequestNotificationPermission, notificationPolicy } = this.props;
 
     const unreadMarkersShowStr = <FormattedMessage id='notifications.column_settings.unread_notifications.highlight' defaultMessage='Highlight unread notifications' />;
+    const groupingShowStr = <FormattedMessage id='notifications.column_settings.beta.grouping' defaultMessage='Group notifications' />;
     const filterBarShowStr = <FormattedMessage id='notifications.column_settings.filter_bar.show_bar' defaultMessage='Show filter bar' />;
     const filterAdvancedStr = <FormattedMessage id='notifications.column_settings.filter_bar.advanced' defaultMessage='Display all categories' />;
     const alertStr = <FormattedMessage id='notifications.column_settings.alert' defaultMessage='Desktop notifications' />;
@@ -115,6 +116,16 @@ class ColumnSettings extends PureComponent {
           </div>
         </section>
 
+        <section role='group' aria-labelledby='notifications-beta'>
+          <h3 id='notifications-beta'>
+            <FormattedMessage id='notifications.column_settings.beta.category' defaultMessage='Experimental features' />
+          </h3>
+
+          <div className='column-settings__row'>
+            <SettingToggle id='unread-notification-markers' prefix='notifications' settings={settings} settingPath={['groupingBeta']} onChange={onChange} label={groupingShowStr} />
+          </div>
+        </section>
+
         <section role='group' aria-labelledby='notifications-unread-markers'>
           <h3 id='notifications-unread-markers'>
             <FormattedMessage id='notifications.column_settings.unread_notifications.category' defaultMessage='Unread notifications' />
diff --git a/app/javascript/flavours/glitch/features/notifications/components/filtered_notifications_banner.tsx b/app/javascript/flavours/glitch/features/notifications/components/filtered_notifications_banner.tsx
index 70762be0e3e86c..2be6ac84662bba 100644
--- a/app/javascript/flavours/glitch/features/notifications/components/filtered_notifications_banner.tsx
+++ b/app/javascript/flavours/glitch/features/notifications/components/filtered_notifications_banner.tsx
@@ -35,7 +35,9 @@ export const FilteredNotificationsBanner: React.FC = () => {
       className='filtered-notifications-banner'
       to='/notifications/requests'
     >
-      <Icon icon={InventoryIcon} id='filtered-notifications' />
+      <div className='notification-group__icon'>
+        <Icon icon={InventoryIcon} id='filtered-notifications' />
+      </div>
 
       <div className='filtered-notifications-banner__text'>
         <strong>
diff --git a/app/javascript/flavours/glitch/features/notifications/components/moderation_warning.tsx b/app/javascript/flavours/glitch/features/notifications/components/moderation_warning.tsx
index 2fd19c51080344..16eac6ded55a30 100644
--- a/app/javascript/flavours/glitch/features/notifications/components/moderation_warning.tsx
+++ b/app/javascript/flavours/glitch/features/notifications/components/moderation_warning.tsx
@@ -1,7 +1,10 @@
 import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
 
+import classNames from 'classnames';
+
 import GavelIcon from '@/material-icons/400-24px/gavel.svg?react';
 import { Icon } from 'flavours/glitch/components/icon';
+import type { AccountWarningAction } from 'flavours/glitch/models/notification_group';
 
 // This needs to be kept in sync with app/models/account_warning.rb
 const messages = defineMessages({
@@ -36,19 +39,18 @@ const messages = defineMessages({
 });
 
 interface Props {
-  action:
-    | 'none'
-    | 'disable'
-    | 'mark_statuses_as_sensitive'
-    | 'delete_statuses'
-    | 'sensitive'
-    | 'silence'
-    | 'suspend';
+  action: AccountWarningAction;
   id: string;
-  hidden: boolean;
+  hidden?: boolean;
+  unread?: boolean;
 }
 
-export const ModerationWarning: React.FC<Props> = ({ action, id, hidden }) => {
+export const ModerationWarning: React.FC<Props> = ({
+  action,
+  id,
+  hidden,
+  unread,
+}) => {
   const intl = useIntl();
 
   if (hidden) {
@@ -56,23 +58,32 @@ export const ModerationWarning: React.FC<Props> = ({ action, id, hidden }) => {
   }
 
   return (
-    <a
-      href={`/disputes/strikes/${id}`}
-      target='_blank'
-      rel='noopener noreferrer'
-      className='notification__moderation-warning'
+    <div
+      role='button'
+      className={classNames(
+        'notification-group notification-group--link notification-group--moderation-warning focusable',
+        { 'notification-group--unread': unread },
+      )}
+      tabIndex={0}
     >
-      <Icon id='warning' icon={GavelIcon} />
+      <div className='notification-group__icon'>
+        <Icon id='warning' icon={GavelIcon} />
+      </div>
 
-      <div className='notification__moderation-warning__content'>
+      <div className='notification-group__main'>
         <p>{intl.formatMessage(messages[action])}</p>
-        <span className='link-button'>
+        <a
+          href={`/disputes/strikes/${id}`}
+          target='_blank'
+          rel='noopener noreferrer'
+          className='link-button'
+        >
           <FormattedMessage
             id='notification.moderation-warning.learn_more'
             defaultMessage='Learn more'
           />
-        </span>
+        </a>
       </div>
-    </a>
+    </div>
   );
 };
diff --git a/app/javascript/flavours/glitch/features/notifications/components/relationships_severance_event.jsx b/app/javascript/flavours/glitch/features/notifications/components/relationships_severance_event.jsx
index 05cee6aaa14bf8..397a2b7558be09 100644
--- a/app/javascript/flavours/glitch/features/notifications/components/relationships_severance_event.jsx
+++ b/app/javascript/flavours/glitch/features/notifications/components/relationships_severance_event.jsx
@@ -2,6 +2,8 @@ import PropTypes from 'prop-types';
 
 import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
 
+import classNames from 'classnames';
+
 import HeartBrokenIcon from '@/material-icons/400-24px/heart_broken-fill.svg?react';
 import { Icon }  from 'flavours/glitch/components/icon';
 import { domain } from 'flavours/glitch/initial_state';
@@ -13,7 +15,7 @@ const messages = defineMessages({
   user_domain_block: { id: 'notification.relationships_severance_event.user_domain_block', defaultMessage: 'You have blocked {target}, removing {followersCount} of your followers and {followingCount, plural, one {# account} other {# accounts}} you follow.' },
 });
 
-export const RelationshipsSeveranceEvent = ({ type, target, followingCount, followersCount, hidden }) => {
+export const RelationshipsSeveranceEvent = ({ type, target, followingCount, followersCount, hidden, unread }) => {
   const intl = useIntl();
 
   if (hidden) {
@@ -21,14 +23,14 @@ export const RelationshipsSeveranceEvent = ({ type, target, followingCount, foll
   }
 
   return (
-    <a href='/severed_relationships' target='_blank' rel='noopener noreferrer' className='notification__relationships-severance-event'>
-      <Icon id='heart_broken' icon={HeartBrokenIcon} />
+    <div role='button' className={classNames('notification-group notification-group--link notification-group--relationships-severance-event focusable', { 'notification-group--unread': unread })} tabIndex='0'>
+      <div className='notification-group__icon'><Icon id='heart_broken' icon={HeartBrokenIcon} /></div>
 
-      <div className='notification__relationships-severance-event__content'>
+      <div className='notification-group__main'>
         <p>{intl.formatMessage(messages[type], { from: <strong>{domain}</strong>, target: <strong>{target}</strong>, followingCount, followersCount })}</p>
-        <span className='link-button'><FormattedMessage id='notification.relationships_severance_event.learn_more' defaultMessage='Learn more' /></span>
+        <a href='/severed_relationships' target='_blank' rel='noopener noreferrer' className='link-button'><FormattedMessage id='notification.relationships_severance_event.learn_more' defaultMessage='Learn more' /></a>
       </div>
-    </a>
+    </div>
   );
 };
 
@@ -42,4 +44,5 @@ RelationshipsSeveranceEvent.propTypes = {
   followersCount: PropTypes.number.isRequired,
   followingCount: PropTypes.number.isRequired,
   hidden: PropTypes.bool,
+  unread: PropTypes.bool,
 };
diff --git a/app/javascript/flavours/glitch/features/notifications/containers/column_settings_container.js b/app/javascript/flavours/glitch/features/notifications/containers/column_settings_container.js
index 4547fde04293c7..55dcd4226c9859 100644
--- a/app/javascript/flavours/glitch/features/notifications/containers/column_settings_container.js
+++ b/app/javascript/flavours/glitch/features/notifications/containers/column_settings_container.js
@@ -2,10 +2,13 @@ import { defineMessages, injectIntl } from 'react-intl';
 
 import { connect } from 'react-redux';
 
+import { initializeNotifications } from 'flavours/glitch/actions/notifications_migration';
+
 import { showAlert } from '../../../actions/alerts';
 import { openModal } from '../../../actions/modal';
+import { clearNotifications } from '../../../actions/notification_groups';
 import { updateNotificationsPolicy } from '../../../actions/notification_policies';
-import { setFilter, clearNotifications, requestBrowserPermission } from '../../../actions/notifications';
+import { setFilter, requestBrowserPermission } from '../../../actions/notifications';
 import { changeAlerts as changePushNotifications } from '../../../actions/push_notifications';
 import { changeSetting } from '../../../actions/settings';
 import ColumnSettings from '../components/column_settings';
@@ -58,6 +61,9 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
       } else {
         dispatch(changeSetting(['notifications', ...path], checked));
       }
+    } else if(path[0] === 'groupingBeta') {
+      dispatch(changeSetting(['notifications', ...path], checked));
+      dispatch(initializeNotifications());
     } else {
       dispatch(changeSetting(['notifications', ...path], checked));
     }
diff --git a/app/javascript/flavours/glitch/features/notifications/index.jsx b/app/javascript/flavours/glitch/features/notifications/index.jsx
index bc32f9a7d2d12d..2d3d4377561e7e 100644
--- a/app/javascript/flavours/glitch/features/notifications/index.jsx
+++ b/app/javascript/flavours/glitch/features/notifications/index.jsx
@@ -237,7 +237,7 @@ class Notifications extends PureComponent {
         <LoadGap
           key={'gap:' + notifications.getIn([index + 1, 'id'])}
           disabled={isLoading}
-          maxId={index > 0 ? notifications.getIn([index - 1, 'id']) : null}
+          param={index > 0 ? notifications.getIn([index - 1, 'id']) : null}
           onClick={this.handleLoadGap}
         />
       ) : (
diff --git a/app/javascript/flavours/glitch/features/notifications_v2/components/avatar_group.tsx b/app/javascript/flavours/glitch/features/notifications_v2/components/avatar_group.tsx
new file mode 100644
index 00000000000000..48f2328bbbcfc2
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/notifications_v2/components/avatar_group.tsx
@@ -0,0 +1,31 @@
+import { Link } from 'react-router-dom';
+
+import { Avatar } from 'flavours/glitch/components/avatar';
+import { NOTIFICATIONS_GROUP_MAX_AVATARS } from 'flavours/glitch/models/notification_group';
+import { useAppSelector } from 'flavours/glitch/store';
+
+const AvatarWrapper: React.FC<{ accountId: string }> = ({ accountId }) => {
+  const account = useAppSelector((state) => state.accounts.get(accountId));
+
+  if (!account) return null;
+
+  return (
+    <Link
+      to={`/@${account.acct}`}
+      title={`@${account.acct}`}
+      data-hover-card-account={account.id}
+    >
+      <Avatar account={account} size={28} />
+    </Link>
+  );
+};
+
+export const AvatarGroup: React.FC<{ accountIds: string[] }> = ({
+  accountIds,
+}) => (
+  <div className='notification-group__avatar-group'>
+    {accountIds.slice(0, NOTIFICATIONS_GROUP_MAX_AVATARS).map((accountId) => (
+      <AvatarWrapper key={accountId} accountId={accountId} />
+    ))}
+  </div>
+);
diff --git a/app/javascript/flavours/glitch/features/notifications_v2/components/embedded_status.tsx b/app/javascript/flavours/glitch/features/notifications_v2/components/embedded_status.tsx
new file mode 100644
index 00000000000000..530f305be712d1
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/notifications_v2/components/embedded_status.tsx
@@ -0,0 +1,93 @@
+import { useCallback } from 'react';
+
+import { FormattedMessage } from 'react-intl';
+
+import { useHistory } from 'react-router-dom';
+
+import type { List as ImmutableList, RecordOf } from 'immutable';
+
+import BarChart4BarsIcon from '@/material-icons/400-24px/bar_chart_4_bars.svg?react';
+import PhotoLibraryIcon from '@/material-icons/400-24px/photo_library.svg?react';
+import { Avatar } from 'flavours/glitch/components/avatar';
+import { DisplayName } from 'flavours/glitch/components/display_name';
+import { Icon } from 'flavours/glitch/components/icon';
+import type { Status } from 'flavours/glitch/models/status';
+import { useAppSelector } from 'flavours/glitch/store';
+
+import { EmbeddedStatusContent } from './embedded_status_content';
+
+export type Mention = RecordOf<{ url: string; acct: string }>;
+
+export const EmbeddedStatus: React.FC<{ statusId: string }> = ({
+  statusId,
+}) => {
+  const history = useHistory();
+
+  const status = useAppSelector(
+    (state) => state.statuses.get(statusId) as Status | undefined,
+  );
+
+  const account = useAppSelector((state) =>
+    state.accounts.get(status?.get('account') as string),
+  );
+
+  const handleClick = useCallback(() => {
+    if (!account) return;
+
+    history.push(`/@${account.acct}/${statusId}`);
+  }, [statusId, account, history]);
+
+  if (!status) {
+    return null;
+  }
+
+  // Assign status attributes to variables with a forced type, as status is not yet properly typed
+  const contentHtml = status.get('contentHtml') as string;
+  const poll = status.get('poll');
+  const language = status.get('language') as string;
+  const mentions = status.get('mentions') as ImmutableList<Mention>;
+  const mediaAttachmentsSize = (
+    status.get('media_attachments') as ImmutableList<unknown>
+  ).size;
+
+  return (
+    <div className='notification-group__embedded-status'>
+      <div className='notification-group__embedded-status__account'>
+        <Avatar account={account} size={16} />
+        <DisplayName account={account} />
+      </div>
+
+      <EmbeddedStatusContent
+        className='notification-group__embedded-status__content reply-indicator__content translate'
+        content={contentHtml}
+        language={language}
+        mentions={mentions}
+        onClick={handleClick}
+      />
+
+      {(poll || mediaAttachmentsSize > 0) && (
+        <div className='notification-group__embedded-status__attachments reply-indicator__attachments'>
+          {!!poll && (
+            <>
+              <Icon icon={BarChart4BarsIcon} id='bar-chart-4-bars' />
+              <FormattedMessage
+                id='reply_indicator.poll'
+                defaultMessage='Poll'
+              />
+            </>
+          )}
+          {mediaAttachmentsSize > 0 && (
+            <>
+              <Icon icon={PhotoLibraryIcon} id='photo-library' />
+              <FormattedMessage
+                id='reply_indicator.attachments'
+                defaultMessage='{count, plural, one {# attachment} other {# attachments}}'
+                values={{ count: mediaAttachmentsSize }}
+              />
+            </>
+          )}
+        </div>
+      )}
+    </div>
+  );
+};
diff --git a/app/javascript/flavours/glitch/features/notifications_v2/components/embedded_status_content.tsx b/app/javascript/flavours/glitch/features/notifications_v2/components/embedded_status_content.tsx
new file mode 100644
index 00000000000000..310a6857115a61
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/notifications_v2/components/embedded_status_content.tsx
@@ -0,0 +1,165 @@
+import { useCallback, useRef } from 'react';
+
+import { useHistory } from 'react-router-dom';
+
+import type { List } from 'immutable';
+
+import type { History } from 'history';
+
+import type { Mention } from './embedded_status';
+
+const handleMentionClick = (
+  history: History,
+  mention: Mention,
+  e: MouseEvent,
+) => {
+  if (e.button === 0 && !(e.ctrlKey || e.metaKey)) {
+    e.preventDefault();
+    history.push(`/@${mention.get('acct')}`);
+  }
+};
+
+const handleHashtagClick = (
+  history: History,
+  hashtag: string,
+  e: MouseEvent,
+) => {
+  if (e.button === 0 && !(e.ctrlKey || e.metaKey)) {
+    e.preventDefault();
+    history.push(`/tags/${hashtag.replace(/^#/, '')}`);
+  }
+};
+
+export const EmbeddedStatusContent: React.FC<{
+  content: string;
+  mentions: List<Mention>;
+  language: string;
+  onClick?: () => void;
+  className?: string;
+}> = ({ content, mentions, language, onClick, className }) => {
+  const clickCoordinatesRef = useRef<[number, number] | null>();
+  const history = useHistory();
+
+  const handleMouseDown = useCallback<React.MouseEventHandler<HTMLDivElement>>(
+    ({ clientX, clientY }) => {
+      clickCoordinatesRef.current = [clientX, clientY];
+    },
+    [clickCoordinatesRef],
+  );
+
+  const handleMouseUp = useCallback<React.MouseEventHandler<HTMLDivElement>>(
+    ({ clientX, clientY, target, button }) => {
+      const [startX, startY] = clickCoordinatesRef.current ?? [0, 0];
+      const [deltaX, deltaY] = [
+        Math.abs(clientX - startX),
+        Math.abs(clientY - startY),
+      ];
+
+      let element: HTMLDivElement | null = target as HTMLDivElement;
+
+      while (element) {
+        if (
+          element.localName === 'button' ||
+          element.localName === 'a' ||
+          element.localName === 'label'
+        ) {
+          return;
+        }
+
+        element = element.parentNode as HTMLDivElement | null;
+      }
+
+      if (deltaX + deltaY < 5 && button === 0 && onClick) {
+        onClick();
+      }
+
+      clickCoordinatesRef.current = null;
+    },
+    [clickCoordinatesRef, onClick],
+  );
+
+  const handleMouseEnter = useCallback<React.MouseEventHandler<HTMLDivElement>>(
+    ({ currentTarget }) => {
+      const emojis =
+        currentTarget.querySelectorAll<HTMLImageElement>('.custom-emoji');
+
+      for (const emoji of emojis) {
+        const newSrc = emoji.getAttribute('data-original');
+        if (newSrc) emoji.src = newSrc;
+      }
+    },
+    [],
+  );
+
+  const handleMouseLeave = useCallback<React.MouseEventHandler<HTMLDivElement>>(
+    ({ currentTarget }) => {
+      const emojis =
+        currentTarget.querySelectorAll<HTMLImageElement>('.custom-emoji');
+
+      for (const emoji of emojis) {
+        const newSrc = emoji.getAttribute('data-static');
+        if (newSrc) emoji.src = newSrc;
+      }
+    },
+    [],
+  );
+
+  const handleContentRef = useCallback(
+    (node: HTMLDivElement | null) => {
+      if (!node) {
+        return;
+      }
+
+      const links = node.querySelectorAll<HTMLAnchorElement>('a');
+
+      for (const link of links) {
+        if (link.classList.contains('status-link')) {
+          continue;
+        }
+
+        link.classList.add('status-link');
+
+        const mention = mentions.find((item) => link.href === item.get('url'));
+
+        if (mention) {
+          link.addEventListener(
+            'click',
+            handleMentionClick.bind(null, history, mention),
+            false,
+          );
+          link.setAttribute('title', `@${mention.get('acct')}`);
+          link.setAttribute('href', `/@${mention.get('acct')}`);
+        } else if (
+          link.textContent?.[0] === '#' ||
+          link.previousSibling?.textContent?.endsWith('#')
+        ) {
+          link.addEventListener(
+            'click',
+            handleHashtagClick.bind(null, history, link.text),
+            false,
+          );
+          link.setAttribute('href', `/tags/${link.text.replace(/^#/, '')}`);
+        } else {
+          link.setAttribute('title', link.href);
+          link.classList.add('unhandled-link');
+        }
+      }
+    },
+    [mentions, history],
+  );
+
+  return (
+    <div
+      role='button'
+      tabIndex={0}
+      className={className}
+      ref={handleContentRef}
+      lang={language}
+      dangerouslySetInnerHTML={{ __html: content }}
+      onMouseDown={handleMouseDown}
+      onMouseUp={handleMouseUp}
+      onMouseEnter={handleMouseEnter}
+      onMouseLeave={handleMouseLeave}
+    />
+  );
+};
diff --git a/app/javascript/flavours/glitch/features/notifications_v2/components/names_list.tsx b/app/javascript/flavours/glitch/features/notifications_v2/components/names_list.tsx
new file mode 100644
index 00000000000000..a46b584e46b3c6
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/notifications_v2/components/names_list.tsx
@@ -0,0 +1,51 @@
+import { FormattedMessage } from 'react-intl';
+
+import { Link } from 'react-router-dom';
+
+import { useAppSelector } from 'flavours/glitch/store';
+
+export const NamesList: React.FC<{
+  accountIds: string[];
+  total: number;
+  seeMoreHref?: string;
+}> = ({ accountIds, total, seeMoreHref }) => {
+  const lastAccountId = accountIds[0] ?? '0';
+  const account = useAppSelector((state) => state.accounts.get(lastAccountId));
+
+  if (!account) return null;
+
+  const displayedName = (
+    <Link
+      to={`/@${account.acct}`}
+      title={`@${account.acct}`}
+      data-hover-card-account={account.id}
+    >
+      <bdi dangerouslySetInnerHTML={{ __html: account.display_name_html }} />
+    </Link>
+  );
+
+  if (total === 1) {
+    return displayedName;
+  }
+
+  if (seeMoreHref)
+    return (
+      <FormattedMessage
+        id='name_and_others_with_link'
+        defaultMessage='{name} and <a>{count, plural, one {# other} other {# others}}</a>'
+        values={{
+          name: displayedName,
+          count: total - 1,
+          a: (chunks) => <Link to={seeMoreHref}>{chunks}</Link>,
+        }}
+      />
+    );
+
+  return (
+    <FormattedMessage
+      id='name_and_others'
+      defaultMessage='{name} and {count, plural, one {# other} other {# others}}'
+      values={{ name: displayedName, count: total - 1 }}
+    />
+  );
+};
diff --git a/app/javascript/flavours/glitch/features/notifications_v2/components/notification_admin_report.tsx b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_admin_report.tsx
new file mode 100644
index 00000000000000..fc2d3149b3006f
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_admin_report.tsx
@@ -0,0 +1,132 @@
+import { FormattedMessage, useIntl, defineMessages } from 'react-intl';
+
+import classNames from 'classnames';
+
+import FlagIcon from '@/material-icons/400-24px/flag-fill.svg?react';
+import { Icon } from 'flavours/glitch/components/icon';
+import { RelativeTimestamp } from 'flavours/glitch/components/relative_timestamp';
+import type { NotificationGroupAdminReport } from 'flavours/glitch/models/notification_group';
+import { useAppSelector } from 'flavours/glitch/store';
+
+// This needs to be kept in sync with app/models/report.rb
+const messages = defineMessages({
+  other: {
+    id: 'report_notification.categories.other_sentence',
+    defaultMessage: 'other',
+  },
+  spam: {
+    id: 'report_notification.categories.spam_sentence',
+    defaultMessage: 'spam',
+  },
+  legal: {
+    id: 'report_notification.categories.legal_sentence',
+    defaultMessage: 'illegal content',
+  },
+  violation: {
+    id: 'report_notification.categories.violation_sentence',
+    defaultMessage: 'rule violation',
+  },
+});
+
+export const NotificationAdminReport: React.FC<{
+  notification: NotificationGroupAdminReport;
+  unread?: boolean;
+}> = ({ notification, notification: { report }, unread }) => {
+  const intl = useIntl();
+  const targetAccount = useAppSelector((state) =>
+    state.accounts.get(report.targetAccountId),
+  );
+  const account = useAppSelector((state) =>
+    state.accounts.get(notification.sampleAccountIds[0] ?? '0'),
+  );
+
+  if (!account || !targetAccount) return null;
+
+  const values = {
+    name: (
+      <bdi
+        dangerouslySetInnerHTML={{ __html: account.get('display_name_html') }}
+      />
+    ),
+    target: (
+      <bdi
+        dangerouslySetInnerHTML={{
+          __html: targetAccount.get('display_name_html'),
+        }}
+      />
+    ),
+    category: intl.formatMessage(messages[report.category]),
+    count: report.status_ids.length,
+  };
+
+  let message;
+
+  if (report.status_ids.length > 0) {
+    if (report.category === 'other') {
+      message = (
+        <FormattedMessage
+          id='notification.admin.report_account_other'
+          defaultMessage='{name} reported {count, plural, one {one post} other {# posts}} from {target}'
+          values={values}
+        />
+      );
+    } else {
+      message = (
+        <FormattedMessage
+          id='notification.admin.report_account'
+          defaultMessage='{name} reported {count, plural, one {one post} other {# posts}} from {target} for {category}'
+          values={values}
+        />
+      );
+    }
+  } else {
+    if (report.category === 'other') {
+      message = (
+        <FormattedMessage
+          id='notification.admin.report_statuses_other'
+          defaultMessage='{name} reported {target}'
+          values={values}
+        />
+      );
+    } else {
+      message = (
+        <FormattedMessage
+          id='notification.admin.report_statuses'
+          defaultMessage='{name} reported {target} for {category}'
+          values={values}
+        />
+      );
+    }
+  }
+
+  return (
+    <a
+      href={`/admin/reports/${report.id}`}
+      target='_blank'
+      rel='noopener noreferrer'
+      className={classNames(
+        'notification-group notification-group--link notification-group--admin-report focusable',
+        { 'notification-group--unread': unread },
+      )}
+    >
+      <div className='notification-group__icon'>
+        <Icon id='flag' icon={FlagIcon} />
+      </div>
+
+      <div className='notification-group__main'>
+        <div className='notification-group__main__header'>
+          <div className='notification-group__main__header__label'>
+            {message}
+            <RelativeTimestamp timestamp={report.created_at} />
+          </div>
+        </div>
+
+        {report.comment.length > 0 && (
+          <div className='notification-group__embedded-status__content'>
+            “{report.comment}”
+          </div>
+        )}
+      </div>
+    </a>
+  );
+};
diff --git a/app/javascript/flavours/glitch/features/notifications_v2/components/notification_admin_sign_up.tsx b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_admin_sign_up.tsx
new file mode 100644
index 00000000000000..8a56b880a8ed13
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_admin_sign_up.tsx
@@ -0,0 +1,31 @@
+import { FormattedMessage } from 'react-intl';
+
+import PersonAddIcon from '@/material-icons/400-24px/person_add-fill.svg?react';
+import type { NotificationGroupAdminSignUp } from 'flavours/glitch/models/notification_group';
+
+import type { LabelRenderer } from './notification_group_with_status';
+import { NotificationGroupWithStatus } from './notification_group_with_status';
+
+const labelRenderer: LabelRenderer = (values) => (
+  <FormattedMessage
+    id='notification.admin.sign_up'
+    defaultMessage='{name} signed up'
+    values={values}
+  />
+);
+
+export const NotificationAdminSignUp: React.FC<{
+  notification: NotificationGroupAdminSignUp;
+  unread: boolean;
+}> = ({ notification, unread }) => (
+  <NotificationGroupWithStatus
+    type='admin-sign-up'
+    icon={PersonAddIcon}
+    iconId='person-add'
+    accountIds={notification.sampleAccountIds}
+    timestamp={notification.latest_page_notification_at}
+    count={notification.notifications_count}
+    labelRenderer={labelRenderer}
+    unread={unread}
+  />
+);
diff --git a/app/javascript/flavours/glitch/features/notifications_v2/components/notification_favourite.tsx b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_favourite.tsx
new file mode 100644
index 00000000000000..8e16a042ced32e
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_favourite.tsx
@@ -0,0 +1,45 @@
+import { FormattedMessage } from 'react-intl';
+
+import StarIcon from '@/material-icons/400-24px/star-fill.svg?react';
+import type { NotificationGroupFavourite } from 'flavours/glitch/models/notification_group';
+import { useAppSelector } from 'flavours/glitch/store';
+
+import type { LabelRenderer } from './notification_group_with_status';
+import { NotificationGroupWithStatus } from './notification_group_with_status';
+
+const labelRenderer: LabelRenderer = (values) => (
+  <FormattedMessage
+    id='notification.favourite'
+    defaultMessage='{name} favorited your status'
+    values={values}
+  />
+);
+
+export const NotificationFavourite: React.FC<{
+  notification: NotificationGroupFavourite;
+  unread: boolean;
+}> = ({ notification, unread }) => {
+  const { statusId } = notification;
+  const statusAccount = useAppSelector(
+    (state) =>
+      state.accounts.get(state.statuses.getIn([statusId, 'account']) as string)
+        ?.acct,
+  );
+
+  return (
+    <NotificationGroupWithStatus
+      type='favourite'
+      icon={StarIcon}
+      iconId='star'
+      accountIds={notification.sampleAccountIds}
+      statusId={notification.statusId}
+      timestamp={notification.latest_page_notification_at}
+      count={notification.notifications_count}
+      labelRenderer={labelRenderer}
+      labelSeeMoreHref={
+        statusAccount ? `/@${statusAccount}/${statusId}/favourites` : undefined
+      }
+      unread={unread}
+    />
+  );
+};
diff --git a/app/javascript/flavours/glitch/features/notifications_v2/components/notification_follow.tsx b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_follow.tsx
new file mode 100644
index 00000000000000..92d28dccbde33c
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_follow.tsx
@@ -0,0 +1,31 @@
+import { FormattedMessage } from 'react-intl';
+
+import PersonAddIcon from '@/material-icons/400-24px/person_add-fill.svg?react';
+import type { NotificationGroupFollow } from 'flavours/glitch/models/notification_group';
+
+import type { LabelRenderer } from './notification_group_with_status';
+import { NotificationGroupWithStatus } from './notification_group_with_status';
+
+const labelRenderer: LabelRenderer = (values) => (
+  <FormattedMessage
+    id='notification.follow'
+    defaultMessage='{name} followed you'
+    values={values}
+  />
+);
+
+export const NotificationFollow: React.FC<{
+  notification: NotificationGroupFollow;
+  unread: boolean;
+}> = ({ notification, unread }) => (
+  <NotificationGroupWithStatus
+    type='follow'
+    icon={PersonAddIcon}
+    iconId='person-add'
+    accountIds={notification.sampleAccountIds}
+    timestamp={notification.latest_page_notification_at}
+    count={notification.notifications_count}
+    labelRenderer={labelRenderer}
+    unread={unread}
+  />
+);
diff --git a/app/javascript/flavours/glitch/features/notifications_v2/components/notification_follow_request.tsx b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_follow_request.tsx
new file mode 100644
index 00000000000000..eff233152d1a24
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_follow_request.tsx
@@ -0,0 +1,78 @@
+import { useCallback } from 'react';
+
+import { FormattedMessage, useIntl, defineMessages } from 'react-intl';
+
+import CheckIcon from '@/material-icons/400-24px/check.svg?react';
+import CloseIcon from '@/material-icons/400-24px/close.svg?react';
+import PersonAddIcon from '@/material-icons/400-24px/person_add-fill.svg?react';
+import {
+  authorizeFollowRequest,
+  rejectFollowRequest,
+} from 'flavours/glitch/actions/accounts';
+import { IconButton } from 'flavours/glitch/components/icon_button';
+import type { NotificationGroupFollowRequest } from 'flavours/glitch/models/notification_group';
+import { useAppDispatch } from 'flavours/glitch/store';
+
+import type { LabelRenderer } from './notification_group_with_status';
+import { NotificationGroupWithStatus } from './notification_group_with_status';
+
+const messages = defineMessages({
+  authorize: { id: 'follow_request.authorize', defaultMessage: 'Authorize' },
+  reject: { id: 'follow_request.reject', defaultMessage: 'Reject' },
+});
+
+const labelRenderer: LabelRenderer = (values) => (
+  <FormattedMessage
+    id='notification.follow_request'
+    defaultMessage='{name} has requested to follow you'
+    values={values}
+  />
+);
+
+export const NotificationFollowRequest: React.FC<{
+  notification: NotificationGroupFollowRequest;
+  unread: boolean;
+}> = ({ notification, unread }) => {
+  const intl = useIntl();
+
+  const dispatch = useAppDispatch();
+
+  const onAuthorize = useCallback(() => {
+    dispatch(authorizeFollowRequest(notification.sampleAccountIds[0]));
+  }, [dispatch, notification.sampleAccountIds]);
+
+  const onReject = useCallback(() => {
+    dispatch(rejectFollowRequest(notification.sampleAccountIds[0]));
+  }, [dispatch, notification.sampleAccountIds]);
+
+  const actions = (
+    <div className='notification-group__actions'>
+      <IconButton
+        title={intl.formatMessage(messages.reject)}
+        icon='times'
+        iconComponent={CloseIcon}
+        onClick={onReject}
+      />
+      <IconButton
+        title={intl.formatMessage(messages.authorize)}
+        icon='check'
+        iconComponent={CheckIcon}
+        onClick={onAuthorize}
+      />
+    </div>
+  );
+
+  return (
+    <NotificationGroupWithStatus
+      type='follow-request'
+      icon={PersonAddIcon}
+      iconId='person-add'
+      accountIds={notification.sampleAccountIds}
+      timestamp={notification.latest_page_notification_at}
+      count={notification.notifications_count}
+      labelRenderer={labelRenderer}
+      actions={actions}
+      unread={unread}
+    />
+  );
+};
diff --git a/app/javascript/flavours/glitch/features/notifications_v2/components/notification_group.tsx b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_group.tsx
new file mode 100644
index 00000000000000..b1346a88e0fe5d
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_group.tsx
@@ -0,0 +1,134 @@
+import { useMemo } from 'react';
+
+import { HotKeys } from 'react-hotkeys';
+
+import type { NotificationGroup as NotificationGroupModel } from 'flavours/glitch/models/notification_group';
+import { useAppSelector } from 'flavours/glitch/store';
+
+import { NotificationAdminReport } from './notification_admin_report';
+import { NotificationAdminSignUp } from './notification_admin_sign_up';
+import { NotificationFavourite } from './notification_favourite';
+import { NotificationFollow } from './notification_follow';
+import { NotificationFollowRequest } from './notification_follow_request';
+import { NotificationMention } from './notification_mention';
+import { NotificationModerationWarning } from './notification_moderation_warning';
+import { NotificationPoll } from './notification_poll';
+import { NotificationReblog } from './notification_reblog';
+import { NotificationSeveredRelationships } from './notification_severed_relationships';
+import { NotificationStatus } from './notification_status';
+import { NotificationUpdate } from './notification_update';
+
+export const NotificationGroup: React.FC<{
+  notificationGroupId: NotificationGroupModel['group_key'];
+  unread: boolean;
+  onMoveUp: (groupId: string) => void;
+  onMoveDown: (groupId: string) => void;
+}> = ({ notificationGroupId, unread, onMoveUp, onMoveDown }) => {
+  const notificationGroup = useAppSelector((state) =>
+    state.notificationGroups.groups.find(
+      (item) => item.type !== 'gap' && item.group_key === notificationGroupId,
+    ),
+  );
+
+  const handlers = useMemo(
+    () => ({
+      moveUp: () => {
+        onMoveUp(notificationGroupId);
+      },
+
+      moveDown: () => {
+        onMoveDown(notificationGroupId);
+      },
+    }),
+    [notificationGroupId, onMoveUp, onMoveDown],
+  );
+
+  if (!notificationGroup || notificationGroup.type === 'gap') return null;
+
+  let content;
+
+  switch (notificationGroup.type) {
+    case 'reblog':
+      content = (
+        <NotificationReblog unread={unread} notification={notificationGroup} />
+      );
+      break;
+    case 'favourite':
+      content = (
+        <NotificationFavourite
+          unread={unread}
+          notification={notificationGroup}
+        />
+      );
+      break;
+    case 'severed_relationships':
+      content = (
+        <NotificationSeveredRelationships
+          unread={unread}
+          notification={notificationGroup}
+        />
+      );
+      break;
+    case 'mention':
+      content = (
+        <NotificationMention unread={unread} notification={notificationGroup} />
+      );
+      break;
+    case 'follow':
+      content = (
+        <NotificationFollow unread={unread} notification={notificationGroup} />
+      );
+      break;
+    case 'follow_request':
+      content = (
+        <NotificationFollowRequest
+          unread={unread}
+          notification={notificationGroup}
+        />
+      );
+      break;
+    case 'poll':
+      content = (
+        <NotificationPoll unread={unread} notification={notificationGroup} />
+      );
+      break;
+    case 'status':
+      content = (
+        <NotificationStatus unread={unread} notification={notificationGroup} />
+      );
+      break;
+    case 'update':
+      content = (
+        <NotificationUpdate unread={unread} notification={notificationGroup} />
+      );
+      break;
+    case 'admin.sign_up':
+      content = (
+        <NotificationAdminSignUp
+          unread={unread}
+          notification={notificationGroup}
+        />
+      );
+      break;
+    case 'admin.report':
+      content = (
+        <NotificationAdminReport
+          unread={unread}
+          notification={notificationGroup}
+        />
+      );
+      break;
+    case 'moderation_warning':
+      content = (
+        <NotificationModerationWarning
+          unread={unread}
+          notification={notificationGroup}
+        />
+      );
+      break;
+    default:
+      return null;
+  }
+
+  return <HotKeys handlers={handlers}>{content}</HotKeys>;
+};
diff --git a/app/javascript/flavours/glitch/features/notifications_v2/components/notification_group_with_status.tsx b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_group_with_status.tsx
new file mode 100644
index 00000000000000..e2466209a84a35
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_group_with_status.tsx
@@ -0,0 +1,91 @@
+import { useMemo } from 'react';
+
+import classNames from 'classnames';
+
+import type { IconProp } from 'flavours/glitch/components/icon';
+import { Icon } from 'flavours/glitch/components/icon';
+import { RelativeTimestamp } from 'flavours/glitch/components/relative_timestamp';
+
+import { AvatarGroup } from './avatar_group';
+import { EmbeddedStatus } from './embedded_status';
+import { NamesList } from './names_list';
+
+export type LabelRenderer = (
+  values: Record<string, React.ReactNode>,
+) => JSX.Element;
+
+export const NotificationGroupWithStatus: React.FC<{
+  icon: IconProp;
+  iconId: string;
+  statusId?: string;
+  actions?: JSX.Element;
+  count: number;
+  accountIds: string[];
+  timestamp: string;
+  labelRenderer: LabelRenderer;
+  labelSeeMoreHref?: string;
+  type: string;
+  unread: boolean;
+}> = ({
+  icon,
+  iconId,
+  timestamp,
+  accountIds,
+  actions,
+  count,
+  statusId,
+  labelRenderer,
+  labelSeeMoreHref,
+  type,
+  unread,
+}) => {
+  const label = useMemo(
+    () =>
+      labelRenderer({
+        name: (
+          <NamesList
+            accountIds={accountIds}
+            total={count}
+            seeMoreHref={labelSeeMoreHref}
+          />
+        ),
+      }),
+    [labelRenderer, accountIds, count, labelSeeMoreHref],
+  );
+
+  return (
+    <div
+      role='button'
+      className={classNames(
+        `notification-group focusable notification-group--${type}`,
+        { 'notification-group--unread': unread },
+      )}
+      tabIndex={0}
+    >
+      <div className='notification-group__icon'>
+        <Icon icon={icon} id={iconId} />
+      </div>
+
+      <div className='notification-group__main'>
+        <div className='notification-group__main__header'>
+          <div className='notification-group__main__header__wrapper'>
+            <AvatarGroup accountIds={accountIds} />
+
+            {actions}
+          </div>
+
+          <div className='notification-group__main__header__label'>
+            {label}
+            {timestamp && <RelativeTimestamp timestamp={timestamp} />}
+          </div>
+        </div>
+
+        {statusId && (
+          <div className='notification-group__main__status'>
+            <EmbeddedStatus statusId={statusId} />
+          </div>
+        )}
+      </div>
+    </div>
+  );
+};
diff --git a/app/javascript/flavours/glitch/features/notifications_v2/components/notification_mention.tsx b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_mention.tsx
new file mode 100644
index 00000000000000..8d2d5a6282acd1
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_mention.tsx
@@ -0,0 +1,55 @@
+import { FormattedMessage } from 'react-intl';
+
+import ReplyIcon from '@/material-icons/400-24px/reply-fill.svg?react';
+import type { StatusVisibility } from 'flavours/glitch/api_types/statuses';
+import type { NotificationGroupMention } from 'flavours/glitch/models/notification_group';
+import { useAppSelector } from 'flavours/glitch/store';
+
+import type { LabelRenderer } from './notification_group_with_status';
+import { NotificationWithStatus } from './notification_with_status';
+
+const labelRenderer: LabelRenderer = (values) => (
+  <FormattedMessage
+    id='notification.mention'
+    defaultMessage='{name} mentioned you'
+    values={values}
+  />
+);
+
+const privateMentionLabelRenderer: LabelRenderer = (values) => (
+  <FormattedMessage
+    id='notification.private_mention'
+    defaultMessage='{name} privately mentioned you'
+    values={values}
+  />
+);
+
+export const NotificationMention: React.FC<{
+  notification: NotificationGroupMention;
+  unread: boolean;
+}> = ({ notification, unread }) => {
+  const statusVisibility = useAppSelector(
+    (state) =>
+      state.statuses.getIn([
+        notification.statusId,
+        'visibility',
+      ]) as StatusVisibility,
+  );
+
+  return (
+    <NotificationWithStatus
+      type='mention'
+      icon={ReplyIcon}
+      iconId='reply'
+      accountIds={notification.sampleAccountIds}
+      count={notification.notifications_count}
+      statusId={notification.statusId}
+      labelRenderer={
+        statusVisibility === 'direct'
+          ? privateMentionLabelRenderer
+          : labelRenderer
+      }
+      unread={unread}
+    />
+  );
+};
diff --git a/app/javascript/flavours/glitch/features/notifications_v2/components/notification_moderation_warning.tsx b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_moderation_warning.tsx
new file mode 100644
index 00000000000000..6faf4c2a745b1a
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_moderation_warning.tsx
@@ -0,0 +1,13 @@
+import { ModerationWarning } from 'flavours/glitch/features/notifications/components/moderation_warning';
+import type { NotificationGroupModerationWarning } from 'flavours/glitch/models/notification_group';
+
+export const NotificationModerationWarning: React.FC<{
+  notification: NotificationGroupModerationWarning;
+  unread: boolean;
+}> = ({ notification: { moderationWarning }, unread }) => (
+  <ModerationWarning
+    action={moderationWarning.action}
+    id={moderationWarning.id}
+    unread={unread}
+  />
+);
diff --git a/app/javascript/flavours/glitch/features/notifications_v2/components/notification_poll.tsx b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_poll.tsx
new file mode 100644
index 00000000000000..1e62a18483ffee
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_poll.tsx
@@ -0,0 +1,41 @@
+import { FormattedMessage } from 'react-intl';
+
+import BarChart4BarsIcon from '@/material-icons/400-20px/bar_chart_4_bars.svg?react';
+import { me } from 'flavours/glitch/initial_state';
+import type { NotificationGroupPoll } from 'flavours/glitch/models/notification_group';
+
+import { NotificationWithStatus } from './notification_with_status';
+
+const labelRendererOther = () => (
+  <FormattedMessage
+    id='notification.poll'
+    defaultMessage='A poll you voted in has ended'
+  />
+);
+
+const labelRendererOwn = () => (
+  <FormattedMessage
+    id='notification.own_poll'
+    defaultMessage='Your poll has ended'
+  />
+);
+
+export const NotificationPoll: React.FC<{
+  notification: NotificationGroupPoll;
+  unread: boolean;
+}> = ({ notification, unread }) => (
+  <NotificationWithStatus
+    type='poll'
+    icon={BarChart4BarsIcon}
+    iconId='bar-chart-4-bars'
+    accountIds={notification.sampleAccountIds}
+    count={notification.notifications_count}
+    statusId={notification.statusId}
+    labelRenderer={
+      notification.sampleAccountIds[0] === me
+        ? labelRendererOwn
+        : labelRendererOther
+    }
+    unread={unread}
+  />
+);
diff --git a/app/javascript/flavours/glitch/features/notifications_v2/components/notification_reblog.tsx b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_reblog.tsx
new file mode 100644
index 00000000000000..0748b56c9479c5
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_reblog.tsx
@@ -0,0 +1,45 @@
+import { FormattedMessage } from 'react-intl';
+
+import RepeatIcon from '@/material-icons/400-24px/repeat.svg?react';
+import type { NotificationGroupReblog } from 'flavours/glitch/models/notification_group';
+import { useAppSelector } from 'flavours/glitch/store';
+
+import type { LabelRenderer } from './notification_group_with_status';
+import { NotificationGroupWithStatus } from './notification_group_with_status';
+
+const labelRenderer: LabelRenderer = (values) => (
+  <FormattedMessage
+    id='notification.reblog'
+    defaultMessage='{name} boosted your status'
+    values={values}
+  />
+);
+
+export const NotificationReblog: React.FC<{
+  notification: NotificationGroupReblog;
+  unread: boolean;
+}> = ({ notification, unread }) => {
+  const { statusId } = notification;
+  const statusAccount = useAppSelector(
+    (state) =>
+      state.accounts.get(state.statuses.getIn([statusId, 'account']) as string)
+        ?.acct,
+  );
+
+  return (
+    <NotificationGroupWithStatus
+      type='reblog'
+      icon={RepeatIcon}
+      iconId='repeat'
+      accountIds={notification.sampleAccountIds}
+      statusId={notification.statusId}
+      timestamp={notification.latest_page_notification_at}
+      count={notification.notifications_count}
+      labelRenderer={labelRenderer}
+      labelSeeMoreHref={
+        statusAccount ? `/@${statusAccount}/${statusId}/reblogs` : undefined
+      }
+      unread={unread}
+    />
+  );
+};
diff --git a/app/javascript/flavours/glitch/features/notifications_v2/components/notification_severed_relationships.tsx b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_severed_relationships.tsx
new file mode 100644
index 00000000000000..9c2b0b3edbea9e
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_severed_relationships.tsx
@@ -0,0 +1,15 @@
+import { RelationshipsSeveranceEvent } from 'flavours/glitch/features/notifications/components/relationships_severance_event';
+import type { NotificationGroupSeveredRelationships } from 'flavours/glitch/models/notification_group';
+
+export const NotificationSeveredRelationships: React.FC<{
+  notification: NotificationGroupSeveredRelationships;
+  unread: boolean;
+}> = ({ notification: { event }, unread }) => (
+  <RelationshipsSeveranceEvent
+    type={event.type}
+    target={event.target_name}
+    followersCount={event.followers_count}
+    followingCount={event.following_count}
+    unread={unread}
+  />
+);
diff --git a/app/javascript/flavours/glitch/features/notifications_v2/components/notification_status.tsx b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_status.tsx
new file mode 100644
index 00000000000000..2d9944eb18f28f
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_status.tsx
@@ -0,0 +1,31 @@
+import { FormattedMessage } from 'react-intl';
+
+import NotificationsActiveIcon from '@/material-icons/400-24px/notifications_active-fill.svg?react';
+import type { NotificationGroupStatus } from 'flavours/glitch/models/notification_group';
+
+import type { LabelRenderer } from './notification_group_with_status';
+import { NotificationWithStatus } from './notification_with_status';
+
+const labelRenderer: LabelRenderer = (values) => (
+  <FormattedMessage
+    id='notification.status'
+    defaultMessage='{name} just posted'
+    values={values}
+  />
+);
+
+export const NotificationStatus: React.FC<{
+  notification: NotificationGroupStatus;
+  unread: boolean;
+}> = ({ notification, unread }) => (
+  <NotificationWithStatus
+    type='status'
+    icon={NotificationsActiveIcon}
+    iconId='notifications-active'
+    accountIds={notification.sampleAccountIds}
+    count={notification.notifications_count}
+    statusId={notification.statusId}
+    labelRenderer={labelRenderer}
+    unread={unread}
+  />
+);
diff --git a/app/javascript/flavours/glitch/features/notifications_v2/components/notification_update.tsx b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_update.tsx
new file mode 100644
index 00000000000000..6b9452a3ebba3a
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_update.tsx
@@ -0,0 +1,31 @@
+import { FormattedMessage } from 'react-intl';
+
+import EditIcon from '@/material-icons/400-24px/edit.svg?react';
+import type { NotificationGroupUpdate } from 'flavours/glitch/models/notification_group';
+
+import type { LabelRenderer } from './notification_group_with_status';
+import { NotificationWithStatus } from './notification_with_status';
+
+const labelRenderer: LabelRenderer = (values) => (
+  <FormattedMessage
+    id='notification.update'
+    defaultMessage='{name} edited a post'
+    values={values}
+  />
+);
+
+export const NotificationUpdate: React.FC<{
+  notification: NotificationGroupUpdate;
+  unread: boolean;
+}> = ({ notification, unread }) => (
+  <NotificationWithStatus
+    type='update'
+    icon={EditIcon}
+    iconId='edit'
+    accountIds={notification.sampleAccountIds}
+    count={notification.notifications_count}
+    statusId={notification.statusId}
+    labelRenderer={labelRenderer}
+    unread={unread}
+  />
+);
diff --git a/app/javascript/flavours/glitch/features/notifications_v2/components/notification_with_status.tsx b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_with_status.tsx
new file mode 100644
index 00000000000000..8f94e099769914
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_with_status.tsx
@@ -0,0 +1,73 @@
+import { useMemo } from 'react';
+
+import classNames from 'classnames';
+
+import type { IconProp } from 'flavours/glitch/components/icon';
+import { Icon } from 'flavours/glitch/components/icon';
+import Status from 'flavours/glitch/containers/status_container';
+import { useAppSelector } from 'flavours/glitch/store';
+
+import { NamesList } from './names_list';
+import type { LabelRenderer } from './notification_group_with_status';
+
+export const NotificationWithStatus: React.FC<{
+  type: string;
+  icon: IconProp;
+  iconId: string;
+  accountIds: string[];
+  statusId: string;
+  count: number;
+  labelRenderer: LabelRenderer;
+  unread: boolean;
+}> = ({
+  icon,
+  iconId,
+  accountIds,
+  statusId,
+  count,
+  labelRenderer,
+  type,
+  unread,
+}) => {
+  const label = useMemo(
+    () =>
+      labelRenderer({
+        name: <NamesList accountIds={accountIds} total={count} />,
+      }),
+    [labelRenderer, accountIds, count],
+  );
+
+  const isPrivateMention = useAppSelector(
+    (state) => state.statuses.getIn([statusId, 'visibility']) === 'direct',
+  );
+
+  return (
+    <div
+      role='button'
+      className={classNames(
+        `notification-ungrouped focusable notification-ungrouped--${type}`,
+        {
+          'notification-ungrouped--unread': unread,
+          'notification-ungrouped--direct': isPrivateMention,
+        },
+      )}
+      tabIndex={0}
+    >
+      <div className='notification-ungrouped__header'>
+        <div className='notification-ungrouped__header__icon'>
+          <Icon icon={icon} id={iconId} />
+        </div>
+        {label}
+      </div>
+
+      <Status
+        // @ts-expect-error -- <Status> is not yet typed
+        id={statusId}
+        contextType='notifications'
+        withDismiss
+        skipPrepend
+        avatarSize={40}
+      />
+    </div>
+  );
+};
diff --git a/app/javascript/flavours/glitch/features/notifications_v2/filter_bar.tsx b/app/javascript/flavours/glitch/features/notifications_v2/filter_bar.tsx
new file mode 100644
index 00000000000000..1299796662b1d6
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/notifications_v2/filter_bar.tsx
@@ -0,0 +1,145 @@
+import type { PropsWithChildren } from 'react';
+import { useCallback } from 'react';
+
+import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
+
+import HomeIcon from '@/material-icons/400-24px/home-fill.svg?react';
+import InsertChartIcon from '@/material-icons/400-24px/insert_chart.svg?react';
+import PersonAddIcon from '@/material-icons/400-24px/person_add.svg?react';
+import RepeatIcon from '@/material-icons/400-24px/repeat.svg?react';
+import ReplyAllIcon from '@/material-icons/400-24px/reply_all.svg?react';
+import StarIcon from '@/material-icons/400-24px/star.svg?react';
+import { setNotificationsFilter } from 'flavours/glitch/actions/notification_groups';
+import { Icon } from 'flavours/glitch/components/icon';
+import {
+  selectSettingsNotificationsQuickFilterActive,
+  selectSettingsNotificationsQuickFilterAdvanced,
+} from 'flavours/glitch/selectors/settings';
+import { useAppDispatch, useAppSelector } from 'flavours/glitch/store';
+
+const tooltips = defineMessages({
+  mentions: { id: 'notifications.filter.mentions', defaultMessage: 'Mentions' },
+  favourites: {
+    id: 'notifications.filter.favourites',
+    defaultMessage: 'Favorites',
+  },
+  boosts: { id: 'notifications.filter.boosts', defaultMessage: 'Boosts' },
+  polls: { id: 'notifications.filter.polls', defaultMessage: 'Poll results' },
+  follows: { id: 'notifications.filter.follows', defaultMessage: 'Follows' },
+  statuses: {
+    id: 'notifications.filter.statuses',
+    defaultMessage: 'Updates from people you follow',
+  },
+});
+
+const BarButton: React.FC<
+  PropsWithChildren<{
+    selectedFilter: string;
+    type: string;
+    title?: string;
+  }>
+> = ({ selectedFilter, type, title, children }) => {
+  const dispatch = useAppDispatch();
+
+  const onClick = useCallback(() => {
+    void dispatch(setNotificationsFilter({ filterType: type }));
+  }, [dispatch, type]);
+
+  return (
+    <button
+      className={selectedFilter === type ? 'active' : ''}
+      onClick={onClick}
+      title={title}
+    >
+      {children}
+    </button>
+  );
+};
+
+export const FilterBar: React.FC = () => {
+  const intl = useIntl();
+
+  const selectedFilter = useAppSelector(
+    selectSettingsNotificationsQuickFilterActive,
+  );
+  const advancedMode = useAppSelector(
+    selectSettingsNotificationsQuickFilterAdvanced,
+  );
+
+  if (advancedMode)
+    return (
+      <div className='notification__filter-bar'>
+        <BarButton selectedFilter={selectedFilter} type='all' key='all'>
+          <FormattedMessage
+            id='notifications.filter.all'
+            defaultMessage='All'
+          />
+        </BarButton>
+        <BarButton
+          selectedFilter={selectedFilter}
+          type='mention'
+          key='mention'
+          title={intl.formatMessage(tooltips.mentions)}
+        >
+          <Icon id='reply-all' icon={ReplyAllIcon} />
+        </BarButton>
+        <BarButton
+          selectedFilter={selectedFilter}
+          type='favourite'
+          key='favourite'
+          title={intl.formatMessage(tooltips.favourites)}
+        >
+          <Icon id='star' icon={StarIcon} />
+        </BarButton>
+        <BarButton
+          selectedFilter={selectedFilter}
+          type='reblog'
+          key='reblog'
+          title={intl.formatMessage(tooltips.boosts)}
+        >
+          <Icon id='retweet' icon={RepeatIcon} />
+        </BarButton>
+        <BarButton
+          selectedFilter={selectedFilter}
+          type='poll'
+          key='poll'
+          title={intl.formatMessage(tooltips.polls)}
+        >
+          <Icon id='tasks' icon={InsertChartIcon} />
+        </BarButton>
+        <BarButton
+          selectedFilter={selectedFilter}
+          type='status'
+          key='status'
+          title={intl.formatMessage(tooltips.statuses)}
+        >
+          <Icon id='home' icon={HomeIcon} />
+        </BarButton>
+        <BarButton
+          selectedFilter={selectedFilter}
+          type='follow'
+          key='follow'
+          title={intl.formatMessage(tooltips.follows)}
+        >
+          <Icon id='user-plus' icon={PersonAddIcon} />
+        </BarButton>
+      </div>
+    );
+  else
+    return (
+      <div className='notification__filter-bar'>
+        <BarButton selectedFilter={selectedFilter} type='all' key='all'>
+          <FormattedMessage
+            id='notifications.filter.all'
+            defaultMessage='All'
+          />
+        </BarButton>
+        <BarButton selectedFilter={selectedFilter} type='mention' key='mention'>
+          <FormattedMessage
+            id='notifications.filter.mentions'
+            defaultMessage='Mentions'
+          />
+        </BarButton>
+      </div>
+    );
+};
diff --git a/app/javascript/flavours/glitch/features/notifications_v2/index.tsx b/app/javascript/flavours/glitch/features/notifications_v2/index.tsx
new file mode 100644
index 00000000000000..94051713751779
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/notifications_v2/index.tsx
@@ -0,0 +1,354 @@
+import { useCallback, useEffect, useMemo, useRef } from 'react';
+
+import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
+
+import { Helmet } from 'react-helmet';
+
+import { createSelector } from '@reduxjs/toolkit';
+
+import { useDebouncedCallback } from 'use-debounce';
+
+import DoneAllIcon from '@/material-icons/400-24px/done_all.svg?react';
+import NotificationsIcon from '@/material-icons/400-24px/notifications-fill.svg?react';
+import {
+  fetchNotificationsGap,
+  updateScrollPosition,
+  loadPending,
+  markNotificationsAsRead,
+  mountNotifications,
+  unmountNotifications,
+} from 'flavours/glitch/actions/notification_groups';
+import { compareId } from 'flavours/glitch/compare_id';
+import { Icon } from 'flavours/glitch/components/icon';
+import { NotSignedInIndicator } from 'flavours/glitch/components/not_signed_in_indicator';
+import { useIdentity } from 'flavours/glitch/identity_context';
+import type { NotificationGap } from 'flavours/glitch/reducers/notification_groups';
+import {
+  selectUnreadNotificationGroupsCount,
+  selectPendingNotificationGroupsCount,
+} from 'flavours/glitch/selectors/notifications';
+import {
+  selectNeedsNotificationPermission,
+  selectSettingsNotificationsExcludedTypes,
+  selectSettingsNotificationsQuickFilterActive,
+  selectSettingsNotificationsQuickFilterShow,
+  selectSettingsNotificationsShowUnread,
+} from 'flavours/glitch/selectors/settings';
+import { useAppDispatch, useAppSelector } from 'flavours/glitch/store';
+import type { RootState } from 'flavours/glitch/store';
+
+import { addColumn, removeColumn, moveColumn } from '../../actions/columns';
+import { submitMarkers } from '../../actions/markers';
+import Column from '../../components/column';
+import { ColumnHeader } from '../../components/column_header';
+import { LoadGap } from '../../components/load_gap';
+import ScrollableList from '../../components/scrollable_list';
+import { FilteredNotificationsBanner } from '../notifications/components/filtered_notifications_banner';
+import NotificationsPermissionBanner from '../notifications/components/notifications_permission_banner';
+import ColumnSettingsContainer from '../notifications/containers/column_settings_container';
+
+import { NotificationGroup } from './components/notification_group';
+import { FilterBar } from './filter_bar';
+
+const messages = defineMessages({
+  title: { id: 'column.notifications', defaultMessage: 'Notifications' },
+  markAsRead: {
+    id: 'notifications.mark_as_read',
+    defaultMessage: 'Mark every notification as read',
+  },
+});
+
+const getNotifications = createSelector(
+  [
+    selectSettingsNotificationsQuickFilterShow,
+    selectSettingsNotificationsQuickFilterActive,
+    selectSettingsNotificationsExcludedTypes,
+    (state: RootState) => state.notificationGroups.groups,
+  ],
+  (showFilterBar, allowedType, excludedTypes, notifications) => {
+    if (!showFilterBar || allowedType === 'all') {
+      // used if user changed the notification settings after loading the notifications from the server
+      // otherwise a list of notifications will come pre-filtered from the backend
+      // we need to turn it off for FilterBar in order not to block ourselves from seeing a specific category
+      return notifications.filter(
+        (item) => item.type === 'gap' || !excludedTypes.includes(item.type),
+      );
+    }
+    return notifications.filter(
+      (item) => item.type === 'gap' || allowedType === item.type,
+    );
+  },
+);
+
+export const Notifications: React.FC<{
+  columnId?: string;
+  multiColumn?: boolean;
+}> = ({ columnId, multiColumn }) => {
+  const intl = useIntl();
+  const notifications = useAppSelector(getNotifications);
+  const dispatch = useAppDispatch();
+  const isLoading = useAppSelector((s) => s.notificationGroups.isLoading);
+  const hasMore = notifications.at(-1)?.type === 'gap';
+
+  const lastReadId = useAppSelector((s) =>
+    selectSettingsNotificationsShowUnread(s)
+      ? s.notificationGroups.lastReadId
+      : '0',
+  );
+
+  const numPending = useAppSelector(selectPendingNotificationGroupsCount);
+
+  const unreadNotificationsCount = useAppSelector(
+    selectUnreadNotificationGroupsCount,
+  );
+
+  const isUnread = unreadNotificationsCount > 0;
+
+  const canMarkAsRead =
+    useAppSelector(selectSettingsNotificationsShowUnread) &&
+    unreadNotificationsCount > 0;
+
+  const needsNotificationPermission = useAppSelector(
+    selectNeedsNotificationPermission,
+  );
+
+  const columnRef = useRef<Column>(null);
+
+  const selectChild = useCallback((index: number, alignTop: boolean) => {
+    const container = columnRef.current?.node as HTMLElement | undefined;
+
+    if (!container) return;
+
+    const element = container.querySelector<HTMLElement>(
+      `article:nth-of-type(${index + 1}) .focusable`,
+    );
+
+    if (element) {
+      if (alignTop && container.scrollTop > element.offsetTop) {
+        element.scrollIntoView(true);
+      } else if (
+        !alignTop &&
+        container.scrollTop + container.clientHeight <
+          element.offsetTop + element.offsetHeight
+      ) {
+        element.scrollIntoView(false);
+      }
+      element.focus();
+    }
+  }, []);
+
+  // Keep track of mounted components for unread notification handling
+  useEffect(() => {
+    dispatch(mountNotifications());
+
+    return () => {
+      dispatch(unmountNotifications());
+      dispatch(updateScrollPosition({ top: false }));
+    };
+  }, [dispatch]);
+
+  const handleLoadGap = useCallback(
+    (gap: NotificationGap) => {
+      void dispatch(fetchNotificationsGap({ gap }));
+    },
+    [dispatch],
+  );
+
+  const handleLoadOlder = useDebouncedCallback(
+    () => {
+      const gap = notifications.at(-1);
+      if (gap?.type === 'gap') void dispatch(fetchNotificationsGap({ gap }));
+    },
+    300,
+    { leading: true },
+  );
+
+  const handleLoadPending = useCallback(() => {
+    dispatch(loadPending());
+  }, [dispatch]);
+
+  const handleScrollToTop = useDebouncedCallback(() => {
+    dispatch(updateScrollPosition({ top: true }));
+  }, 100);
+
+  const handleScroll = useDebouncedCallback(() => {
+    dispatch(updateScrollPosition({ top: false }));
+  }, 100);
+
+  useEffect(() => {
+    return () => {
+      handleLoadOlder.cancel();
+      handleScrollToTop.cancel();
+      handleScroll.cancel();
+    };
+  }, [handleLoadOlder, handleScrollToTop, handleScroll]);
+
+  const handlePin = useCallback(() => {
+    if (columnId) {
+      dispatch(removeColumn(columnId));
+    } else {
+      dispatch(addColumn('NOTIFICATIONS', {}));
+    }
+  }, [columnId, dispatch]);
+
+  const handleMove = useCallback(
+    (dir: unknown) => {
+      dispatch(moveColumn(columnId, dir));
+    },
+    [dispatch, columnId],
+  );
+
+  const handleHeaderClick = useCallback(() => {
+    columnRef.current?.scrollTop();
+  }, []);
+
+  const handleMoveUp = useCallback(
+    (id: string) => {
+      const elementIndex =
+        notifications.findIndex(
+          (item) => item.type !== 'gap' && item.group_key === id,
+        ) - 1;
+      selectChild(elementIndex, true);
+    },
+    [notifications, selectChild],
+  );
+
+  const handleMoveDown = useCallback(
+    (id: string) => {
+      const elementIndex =
+        notifications.findIndex(
+          (item) => item.type !== 'gap' && item.group_key === id,
+        ) + 1;
+      selectChild(elementIndex, false);
+    },
+    [notifications, selectChild],
+  );
+
+  const handleMarkAsRead = useCallback(() => {
+    dispatch(markNotificationsAsRead());
+    void dispatch(submitMarkers({ immediate: true }));
+  }, [dispatch]);
+
+  const pinned = !!columnId;
+  const emptyMessage = (
+    <FormattedMessage
+      id='empty_column.notifications'
+      defaultMessage="You don't have any notifications yet. When other people interact with you, you will see it here."
+    />
+  );
+
+  const { signedIn } = useIdentity();
+
+  const filterBar = signedIn ? <FilterBar /> : null;
+
+  const scrollableContent = useMemo(() => {
+    if (notifications.length === 0 && !hasMore) return null;
+
+    return notifications.map((item) =>
+      item.type === 'gap' ? (
+        <LoadGap
+          key={`${item.maxId}-${item.sinceId}`}
+          disabled={isLoading}
+          param={item}
+          onClick={handleLoadGap}
+        />
+      ) : (
+        <NotificationGroup
+          key={item.group_key}
+          notificationGroupId={item.group_key}
+          onMoveUp={handleMoveUp}
+          onMoveDown={handleMoveDown}
+          unread={
+            lastReadId !== '0' &&
+            !!item.page_max_id &&
+            compareId(item.page_max_id, lastReadId) > 0
+          }
+        />
+      ),
+    );
+  }, [
+    notifications,
+    isLoading,
+    hasMore,
+    lastReadId,
+    handleLoadGap,
+    handleMoveUp,
+    handleMoveDown,
+  ]);
+
+  const prepend = (
+    <>
+      {needsNotificationPermission && <NotificationsPermissionBanner />}
+      <FilteredNotificationsBanner />
+    </>
+  );
+
+  const scrollContainer = signedIn ? (
+    <ScrollableList
+      scrollKey={`notifications-${columnId}`}
+      trackScroll={!pinned}
+      isLoading={isLoading}
+      showLoading={isLoading && notifications.length === 0}
+      hasMore={hasMore}
+      numPending={numPending}
+      prepend={prepend}
+      alwaysPrepend
+      emptyMessage={emptyMessage}
+      onLoadMore={handleLoadOlder}
+      onLoadPending={handleLoadPending}
+      onScrollToTop={handleScrollToTop}
+      onScroll={handleScroll}
+      bindToDocument={!multiColumn}
+    >
+      {scrollableContent}
+    </ScrollableList>
+  ) : (
+    <NotSignedInIndicator />
+  );
+
+  const extraButton = canMarkAsRead ? (
+    <button
+      aria-label={intl.formatMessage(messages.markAsRead)}
+      title={intl.formatMessage(messages.markAsRead)}
+      onClick={handleMarkAsRead}
+      className='column-header__button'
+    >
+      <Icon id='done-all' icon={DoneAllIcon} />
+    </button>
+  ) : null;
+
+  return (
+    <Column
+      bindToDocument={!multiColumn}
+      ref={columnRef}
+      label={intl.formatMessage(messages.title)}
+    >
+      <ColumnHeader
+        icon='bell'
+        iconComponent={NotificationsIcon}
+        active={isUnread}
+        title={intl.formatMessage(messages.title)}
+        onPin={handlePin}
+        onMove={handleMove}
+        onClick={handleHeaderClick}
+        pinned={pinned}
+        multiColumn={multiColumn}
+        extraButton={extraButton}
+      >
+        <ColumnSettingsContainer />
+      </ColumnHeader>
+
+      {filterBar}
+
+      {scrollContainer}
+
+      <Helmet>
+        <title>{intl.formatMessage(messages.title)}</title>
+        <meta name='robots' content='noindex' />
+      </Helmet>
+    </Column>
+  );
+};
+
+// eslint-disable-next-line import/no-default-export
+export default Notifications;
diff --git a/app/javascript/flavours/glitch/features/notifications_wrapper.jsx b/app/javascript/flavours/glitch/features/notifications_wrapper.jsx
new file mode 100644
index 00000000000000..15ab3367cc1bf8
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/notifications_wrapper.jsx
@@ -0,0 +1,13 @@
+import Notifications from 'flavours/glitch/features/notifications';
+import Notifications_v2 from 'flavours/glitch/features/notifications_v2';
+import { useAppSelector } from 'flavours/glitch/store';
+
+export const NotificationsWrapper = (props) => {
+  const optedInGroupedNotifications = useAppSelector((state) => state.getIn(['settings', 'notifications', 'groupingBeta'], false));
+
+  return (
+    optedInGroupedNotifications ? <Notifications_v2 {...props} /> : <Notifications {...props} />
+  );
+};
+
+export default NotificationsWrapper;
\ No newline at end of file
diff --git a/app/javascript/flavours/glitch/features/ui/components/columns_area.jsx b/app/javascript/flavours/glitch/features/ui/components/columns_area.jsx
index 9166499c5a08b9..e4c67ed65ef728 100644
--- a/app/javascript/flavours/glitch/features/ui/components/columns_area.jsx
+++ b/app/javascript/flavours/glitch/features/ui/components/columns_area.jsx
@@ -10,7 +10,7 @@ import { scrollRight } from '../../../scroll';
 import BundleContainer from '../containers/bundle_container';
 import {
   Compose,
-  Notifications,
+  NotificationsWrapper,
   HomeTimeline,
   CommunityTimeline,
   PublicTimeline,
@@ -32,7 +32,7 @@ import NavigationPanel from './navigation_panel';
 const componentMap = {
   'COMPOSE': Compose,
   'HOME': HomeTimeline,
-  'NOTIFICATIONS': Notifications,
+  'NOTIFICATIONS': NotificationsWrapper,
   'PUBLIC': PublicTimeline,
   'REMOTE': PublicTimeline,
   'COMMUNITY': CommunityTimeline,
diff --git a/app/javascript/flavours/glitch/features/ui/components/navigation_panel.jsx b/app/javascript/flavours/glitch/features/ui/components/navigation_panel.jsx
index 98d82342cf3b6e..6153b3ceaa7c4e 100644
--- a/app/javascript/flavours/glitch/features/ui/components/navigation_panel.jsx
+++ b/app/javascript/flavours/glitch/features/ui/components/navigation_panel.jsx
@@ -33,6 +33,7 @@ import { NavigationPortal } from 'flavours/glitch/components/navigation_portal';
 import { identityContextPropShape, withIdentity } from 'flavours/glitch/identity_context';
 import { timelinePreview, trendsEnabled } from 'flavours/glitch/initial_state';
 import { transientSingleColumn } from 'flavours/glitch/is_mobile';
+import { selectUnreadNotificationGroupsCount } from 'flavours/glitch/selectors/notifications';
 import { preferencesLink } from 'flavours/glitch/utils/backend_links';
 
 import ColumnLink from './column_link';
@@ -60,15 +61,19 @@ const messages = defineMessages({
 });
 
 const NotificationsLink = () => {
+  const optedInGroupedNotifications = useSelector((state) => state.getIn(['settings', 'notifications', 'groupingBeta'], false));
   const count = useSelector(state => state.getIn(['local_settings', 'notifications', 'tab_badge']) ? state.getIn(['notifications', 'unread']) : 0);
   const intl = useIntl();
 
+  const newCount = useSelector(selectUnreadNotificationGroupsCount);
+
   return (
     <ColumnLink
+      key='notifications'
       transparent
       to='/notifications'
-      icon={<IconWithBadge id='bell' icon={NotificationsIcon} count={count} className='column-link__icon' />}
-      activeIcon={<IconWithBadge id='bell' icon={NotificationsActiveIcon} count={count} className='column-link__icon' />}
+      icon={<IconWithBadge id='bell' icon={NotificationsIcon} count={optedInGroupedNotifications ? newCount : count} className='column-link__icon' />}
+      activeIcon={<IconWithBadge id='bell' icon={NotificationsActiveIcon} count={optedInGroupedNotifications ? newCount : count} className='column-link__icon' />}
       text={intl.formatMessage(messages.notifications)}
     />
   );
diff --git a/app/javascript/flavours/glitch/features/ui/index.jsx b/app/javascript/flavours/glitch/features/ui/index.jsx
index 221f789a315995..7a2aa21f8812c7 100644
--- a/app/javascript/flavours/glitch/features/ui/index.jsx
+++ b/app/javascript/flavours/glitch/features/ui/index.jsx
@@ -12,8 +12,9 @@ import Favico from 'favico.js';
 import { debounce } from 'lodash';
 import { HotKeys } from 'react-hotkeys';
 
-import { changeLayout } from 'flavours/glitch/actions/app';
+import { focusApp, unfocusApp, changeLayout } from 'flavours/glitch/actions/app';
 import { synchronouslySubmitMarkers, submitMarkers, fetchMarkers } from 'flavours/glitch/actions/markers';
+import { initializeNotifications } from 'flavours/glitch/actions/notifications_migration';
 import { INTRODUCTION_VERSION } from 'flavours/glitch/actions/onboarding';
 import { HoverCardController } from 'flavours/glitch/components/hover_card_controller';
 import { Permalink } from 'flavours/glitch/components/permalink';
@@ -24,7 +25,7 @@ import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router';
 
 import { uploadCompose, resetCompose, changeComposeSpoilerness } from '../../actions/compose';
 import { clearHeight } from '../../actions/height_cache';
-import { expandNotifications, notificationsSetVisibility } from '../../actions/notifications';
+import { notificationsSetVisibility } from '../../actions/notifications';
 import { fetchServer, fetchServerTranslationLanguages } from '../../actions/server';
 import { expandHomeTimeline } from '../../actions/timelines';
 import initialState, { me, owner, singleUserMode, trendsEnabled, trendsAsLanding, disableHoverCards } from '../../initial_state';
@@ -51,7 +52,7 @@ import {
   Favourites,
   DirectTimeline,
   HashtagTimeline,
-  Notifications,
+  NotificationsWrapper,
   NotificationRequests,
   NotificationRequest,
   FollowRequests,
@@ -74,6 +75,7 @@ import {
 } from './util/async-components';
 import { ColumnsContextProvider } from './util/columns_context';
 import { WrappedSwitch, WrappedRoute } from './util/react_router_helpers';
+
 // Dummy import, to make sure that <Status /> ends up in the application bundle.
 // Without this it ends up in ~8 very commonly used bundles.
 import '../../components/status';
@@ -214,7 +216,7 @@ class SwitchingColumnsArea extends PureComponent {
             <WrappedRoute path='/tags/:id' component={HashtagTimeline} content={children} />
             <WrappedRoute path='/links/:url' component={LinkTimeline} content={children} />
             <WrappedRoute path='/lists/:id' component={ListTimeline} content={children} />
-            <WrappedRoute path='/notifications' component={Notifications} content={children} exact />
+            <WrappedRoute path='/notifications' component={NotificationsWrapper} content={children} exact />
             <WrappedRoute path='/notifications/requests' component={NotificationRequests} content={children} exact />
             <WrappedRoute path='/notifications/requests/:id' component={NotificationRequest} content={children} exact />
             <WrappedRoute path='/favourites' component={FavouritedStatuses} content={children} />
@@ -304,7 +306,10 @@ class UI extends PureComponent {
     const visibility = !document[this.visibilityHiddenProp];
     this.props.dispatch(notificationsSetVisibility(visibility));
     if (visibility) {
+      this.props.dispatch(focusApp());
       this.props.dispatch(submitMarkers({ immediate: true }));
+    } else {
+      this.props.dispatch(unfocusApp());
     }
   };
 
@@ -419,7 +424,7 @@ class UI extends PureComponent {
     if (signedIn) {
       this.props.dispatch(fetchMarkers());
       this.props.dispatch(expandHomeTimeline());
-      this.props.dispatch(expandNotifications());
+      this.props.dispatch(initializeNotifications());
       this.props.dispatch(fetchServerTranslationLanguages());
 
       setTimeout(() => this.props.dispatch(fetchServer()), 3000);
diff --git a/app/javascript/flavours/glitch/features/ui/util/async-components.js b/app/javascript/flavours/glitch/features/ui/util/async-components.js
index a312cefff7dcfb..e334e1a3b6ea38 100644
--- a/app/javascript/flavours/glitch/features/ui/util/async-components.js
+++ b/app/javascript/flavours/glitch/features/ui/util/async-components.js
@@ -7,7 +7,15 @@ export function Compose () {
 }
 
 export function Notifications () {
-  return import(/* webpackChunkName: "flavours/glitch/async/notifications" */'../../notifications');
+  return import(/* webpackChunkName: "flavours/glitch/async/notifications_v1" */'../../notifications');
+}
+
+export function Notifications_v2 () {
+  return import(/* webpackChunkName: "flavours/glitch/async/notifications_v2" */'../../notifications_v2');
+}
+
+export function NotificationsWrapper () {
+  return import(/* webpackChunkName: "flavours/glitch/async/notifications" */'../../notifications_wrapper');
 }
 
 export function HomeTimeline () {
diff --git a/app/javascript/flavours/glitch/models/notification_group.ts b/app/javascript/flavours/glitch/models/notification_group.ts
new file mode 100644
index 00000000000000..6c8b8eb6e3d555
--- /dev/null
+++ b/app/javascript/flavours/glitch/models/notification_group.ts
@@ -0,0 +1,207 @@
+import type {
+  ApiAccountRelationshipSeveranceEventJSON,
+  ApiAccountWarningJSON,
+  BaseNotificationGroupJSON,
+  ApiNotificationGroupJSON,
+  ApiNotificationJSON,
+  NotificationType,
+  NotificationWithStatusType,
+} from 'flavours/glitch/api_types/notifications';
+import type { ApiReportJSON } from 'flavours/glitch/api_types/reports';
+
+// Maximum number of avatars displayed in a notification group
+// This corresponds to the max lenght of `group.sampleAccountIds`
+export const NOTIFICATIONS_GROUP_MAX_AVATARS = 8;
+
+interface BaseNotificationGroup
+  extends Omit<BaseNotificationGroupJSON, 'sample_accounts'> {
+  sampleAccountIds: string[];
+}
+
+interface BaseNotificationWithStatus<Type extends NotificationWithStatusType>
+  extends BaseNotificationGroup {
+  type: Type;
+  statusId: string;
+}
+
+interface BaseNotification<Type extends NotificationType>
+  extends BaseNotificationGroup {
+  type: Type;
+}
+
+export type NotificationGroupFavourite =
+  BaseNotificationWithStatus<'favourite'>;
+export type NotificationGroupReblog = BaseNotificationWithStatus<'reblog'>;
+export type NotificationGroupStatus = BaseNotificationWithStatus<'status'>;
+export type NotificationGroupMention = BaseNotificationWithStatus<'mention'>;
+export type NotificationGroupPoll = BaseNotificationWithStatus<'poll'>;
+export type NotificationGroupUpdate = BaseNotificationWithStatus<'update'>;
+export type NotificationGroupFollow = BaseNotification<'follow'>;
+export type NotificationGroupFollowRequest = BaseNotification<'follow_request'>;
+export type NotificationGroupAdminSignUp = BaseNotification<'admin.sign_up'>;
+
+export type AccountWarningAction =
+  | 'none'
+  | 'disable'
+  | 'mark_statuses_as_sensitive'
+  | 'delete_statuses'
+  | 'sensitive'
+  | 'silence'
+  | 'suspend';
+export interface AccountWarning
+  extends Omit<ApiAccountWarningJSON, 'target_account'> {
+  targetAccountId: string;
+}
+
+export interface NotificationGroupModerationWarning
+  extends BaseNotification<'moderation_warning'> {
+  moderationWarning: AccountWarning;
+}
+
+type AccountRelationshipSeveranceEvent =
+  ApiAccountRelationshipSeveranceEventJSON;
+export interface NotificationGroupSeveredRelationships
+  extends BaseNotification<'severed_relationships'> {
+  event: AccountRelationshipSeveranceEvent;
+}
+
+interface Report extends Omit<ApiReportJSON, 'target_account'> {
+  targetAccountId: string;
+}
+
+export interface NotificationGroupAdminReport
+  extends BaseNotification<'admin.report'> {
+  report: Report;
+}
+
+export type NotificationGroup =
+  | NotificationGroupFavourite
+  | NotificationGroupReblog
+  | NotificationGroupStatus
+  | NotificationGroupMention
+  | NotificationGroupPoll
+  | NotificationGroupUpdate
+  | NotificationGroupFollow
+  | NotificationGroupFollowRequest
+  | NotificationGroupModerationWarning
+  | NotificationGroupSeveredRelationships
+  | NotificationGroupAdminSignUp
+  | NotificationGroupAdminReport;
+
+function createReportFromJSON(reportJSON: ApiReportJSON): Report {
+  const { target_account, ...report } = reportJSON;
+  return {
+    targetAccountId: target_account.id,
+    ...report,
+  };
+}
+
+function createAccountWarningFromJSON(
+  warningJSON: ApiAccountWarningJSON,
+): AccountWarning {
+  const { target_account, ...warning } = warningJSON;
+  return {
+    targetAccountId: target_account.id,
+    ...warning,
+  };
+}
+
+function createAccountRelationshipSeveranceEventFromJSON(
+  eventJson: ApiAccountRelationshipSeveranceEventJSON,
+): AccountRelationshipSeveranceEvent {
+  return eventJson;
+}
+
+export function createNotificationGroupFromJSON(
+  groupJson: ApiNotificationGroupJSON,
+): NotificationGroup {
+  const { sample_accounts, ...group } = groupJson;
+  const sampleAccountIds = sample_accounts.map((account) => account.id);
+
+  switch (group.type) {
+    case 'favourite':
+    case 'reblog':
+    case 'status':
+    case 'mention':
+    case 'poll':
+    case 'update': {
+      const { status, ...groupWithoutStatus } = group;
+      return {
+        statusId: status.id,
+        sampleAccountIds,
+        ...groupWithoutStatus,
+      };
+    }
+    case 'admin.report': {
+      const { report, ...groupWithoutTargetAccount } = group;
+      return {
+        report: createReportFromJSON(report),
+        sampleAccountIds,
+        ...groupWithoutTargetAccount,
+      };
+    }
+    case 'severed_relationships':
+      return {
+        ...group,
+        event: createAccountRelationshipSeveranceEventFromJSON(group.event),
+        sampleAccountIds,
+      };
+
+    case 'moderation_warning': {
+      const { moderation_warning, ...groupWithoutModerationWarning } = group;
+      return {
+        ...groupWithoutModerationWarning,
+        moderationWarning: createAccountWarningFromJSON(moderation_warning),
+        sampleAccountIds,
+      };
+    }
+    default:
+      return {
+        sampleAccountIds,
+        ...group,
+      };
+  }
+}
+
+export function createNotificationGroupFromNotificationJSON(
+  notification: ApiNotificationJSON,
+) {
+  const group = {
+    sampleAccountIds: [notification.account.id],
+    group_key: notification.group_key,
+    notifications_count: 1,
+    type: notification.type,
+    most_recent_notification_id: notification.id,
+    page_min_id: notification.id,
+    page_max_id: notification.id,
+    latest_page_notification_at: notification.created_at,
+  } as NotificationGroup;
+
+  switch (notification.type) {
+    case 'favourite':
+    case 'reblog':
+    case 'status':
+    case 'mention':
+    case 'poll':
+    case 'update':
+      return { ...group, statusId: notification.status.id };
+    case 'admin.report':
+      return { ...group, report: createReportFromJSON(notification.report) };
+    case 'severed_relationships':
+      return {
+        ...group,
+        event: createAccountRelationshipSeveranceEventFromJSON(
+          notification.event,
+        ),
+      };
+    case 'moderation_warning':
+      return {
+        ...group,
+        moderationWarning: createAccountWarningFromJSON(
+          notification.moderation_warning,
+        ),
+      };
+    default:
+      return group;
+  }
+}
diff --git a/app/javascript/flavours/glitch/reducers/index.ts b/app/javascript/flavours/glitch/reducers/index.ts
index 3fee5818f981d5..d8d50be7d21621 100644
--- a/app/javascript/flavours/glitch/reducers/index.ts
+++ b/app/javascript/flavours/glitch/reducers/index.ts
@@ -25,6 +25,7 @@ import { markersReducer } from './markers';
 import media_attachments from './media_attachments';
 import meta from './meta';
 import { modalReducer } from './modal';
+import { notificationGroupsReducer } from './notification_groups';
 import { notificationPolicyReducer } from './notification_policy';
 import { notificationRequestsReducer } from './notification_requests';
 import notifications from './notifications';
@@ -68,6 +69,7 @@ const reducers = {
   search,
   media_attachments,
   notifications,
+  notificationGroups: notificationGroupsReducer,
   height_cache,
   custom_emojis,
   lists,
diff --git a/app/javascript/flavours/glitch/reducers/markers.ts b/app/javascript/flavours/glitch/reducers/markers.ts
index 380e9d39952378..8b997e47be2eab 100644
--- a/app/javascript/flavours/glitch/reducers/markers.ts
+++ b/app/javascript/flavours/glitch/reducers/markers.ts
@@ -1,6 +1,10 @@
 import { createReducer } from '@reduxjs/toolkit';
 
-import { submitMarkersAction } from 'flavours/glitch/actions/markers';
+import {
+  submitMarkersAction,
+  fetchMarkers,
+} from 'flavours/glitch/actions/markers';
+import { compareId } from 'flavours/glitch/compare_id';
 
 const initialState = {
   home: '0',
@@ -15,4 +19,23 @@ export const markersReducer = createReducer(initialState, (builder) => {
       if (notifications) state.notifications = notifications;
     },
   );
+  builder.addCase(
+    fetchMarkers.fulfilled,
+    (
+      state,
+      {
+        payload: {
+          markers: { home, notifications },
+        },
+      },
+    ) => {
+      if (home && compareId(home.last_read_id, state.home) > 0)
+        state.home = home.last_read_id;
+      if (
+        notifications &&
+        compareId(notifications.last_read_id, state.notifications) > 0
+      )
+        state.notifications = notifications.last_read_id;
+    },
+  );
 });
diff --git a/app/javascript/flavours/glitch/reducers/notification_groups.ts b/app/javascript/flavours/glitch/reducers/notification_groups.ts
new file mode 100644
index 00000000000000..b0b284b696e4bb
--- /dev/null
+++ b/app/javascript/flavours/glitch/reducers/notification_groups.ts
@@ -0,0 +1,508 @@
+import { createReducer, isAnyOf } from '@reduxjs/toolkit';
+
+import {
+  authorizeFollowRequestSuccess,
+  blockAccountSuccess,
+  muteAccountSuccess,
+  rejectFollowRequestSuccess,
+} from 'flavours/glitch/actions/accounts_typed';
+import { focusApp, unfocusApp } from 'flavours/glitch/actions/app';
+import { blockDomainSuccess } from 'flavours/glitch/actions/domain_blocks_typed';
+import { fetchMarkers } from 'flavours/glitch/actions/markers';
+import {
+  clearNotifications,
+  fetchNotifications,
+  fetchNotificationsGap,
+  processNewNotificationForGroups,
+  loadPending,
+  updateScrollPosition,
+  markNotificationsAsRead,
+  mountNotifications,
+  unmountNotifications,
+} from 'flavours/glitch/actions/notification_groups';
+import {
+  disconnectTimeline,
+  timelineDelete,
+} from 'flavours/glitch/actions/timelines_typed';
+import type { ApiNotificationJSON } from 'flavours/glitch/api_types/notifications';
+import { compareId } from 'flavours/glitch/compare_id';
+import { usePendingItems } from 'flavours/glitch/initial_state';
+import {
+  NOTIFICATIONS_GROUP_MAX_AVATARS,
+  createNotificationGroupFromJSON,
+  createNotificationGroupFromNotificationJSON,
+} from 'flavours/glitch/models/notification_group';
+import type { NotificationGroup } from 'flavours/glitch/models/notification_group';
+
+const NOTIFICATIONS_TRIM_LIMIT = 50;
+
+export interface NotificationGap {
+  type: 'gap';
+  maxId?: string;
+  sinceId?: string;
+}
+
+interface NotificationGroupsState {
+  groups: (NotificationGroup | NotificationGap)[];
+  pendingGroups: (NotificationGroup | NotificationGap)[];
+  scrolledToTop: boolean;
+  isLoading: boolean;
+  lastReadId: string;
+  mounted: number;
+  isTabVisible: boolean;
+}
+
+const initialState: NotificationGroupsState = {
+  groups: [],
+  pendingGroups: [], // holds pending groups in slow mode
+  scrolledToTop: false,
+  isLoading: false,
+  // The following properties are used to track unread notifications
+  lastReadId: '0', // used for unread notifications
+  mounted: 0, // number of mounted notification list components, usually 0 or 1
+  isTabVisible: true,
+};
+
+function filterNotificationsForAccounts(
+  groups: NotificationGroupsState['groups'],
+  accountIds: string[],
+  onlyForType?: string,
+) {
+  groups = groups
+    .map((group) => {
+      if (
+        group.type !== 'gap' &&
+        (!onlyForType || group.type === onlyForType)
+      ) {
+        const previousLength = group.sampleAccountIds.length;
+
+        group.sampleAccountIds = group.sampleAccountIds.filter(
+          (id) => !accountIds.includes(id),
+        );
+
+        const newLength = group.sampleAccountIds.length;
+        const removed = previousLength - newLength;
+
+        group.notifications_count -= removed;
+      }
+
+      return group;
+    })
+    .filter(
+      (group) => group.type === 'gap' || group.sampleAccountIds.length > 0,
+    );
+  mergeGaps(groups);
+  return groups;
+}
+
+function filterNotificationsForStatus(
+  groups: NotificationGroupsState['groups'],
+  statusId: string,
+) {
+  groups = groups.filter(
+    (group) =>
+      group.type === 'gap' ||
+      !('statusId' in group) ||
+      group.statusId !== statusId,
+  );
+  mergeGaps(groups);
+  return groups;
+}
+
+function removeNotificationsForAccounts(
+  state: NotificationGroupsState,
+  accountIds: string[],
+  onlyForType?: string,
+) {
+  state.groups = filterNotificationsForAccounts(
+    state.groups,
+    accountIds,
+    onlyForType,
+  );
+  state.pendingGroups = filterNotificationsForAccounts(
+    state.pendingGroups,
+    accountIds,
+    onlyForType,
+  );
+}
+
+function removeNotificationsForStatus(
+  state: NotificationGroupsState,
+  statusId: string,
+) {
+  state.groups = filterNotificationsForStatus(state.groups, statusId);
+  state.pendingGroups = filterNotificationsForStatus(
+    state.pendingGroups,
+    statusId,
+  );
+}
+
+function isNotificationGroup(
+  groupOrGap: NotificationGroup | NotificationGap,
+): groupOrGap is NotificationGroup {
+  return groupOrGap.type !== 'gap';
+}
+
+// Merge adjacent gaps in `groups` in-place
+function mergeGaps(groups: NotificationGroupsState['groups']) {
+  for (let i = 0; i < groups.length; i++) {
+    const firstGroupOrGap = groups[i];
+
+    if (firstGroupOrGap?.type === 'gap') {
+      let lastGap = firstGroupOrGap;
+      let j = i + 1;
+
+      for (; j < groups.length; j++) {
+        const groupOrGap = groups[j];
+        if (groupOrGap?.type === 'gap') lastGap = groupOrGap;
+        else break;
+      }
+
+      if (j - i > 1) {
+        groups.splice(i, j - i, {
+          type: 'gap',
+          maxId: firstGroupOrGap.maxId,
+          sinceId: lastGap.sinceId,
+        });
+      }
+    }
+  }
+}
+
+// Checks if `groups[index-1]` and `groups[index]` are gaps, and merge them in-place if they are
+function mergeGapsAround(
+  groups: NotificationGroupsState['groups'],
+  index: number,
+) {
+  if (index > 0) {
+    const potentialFirstGap = groups[index - 1];
+    const potentialSecondGap = groups[index];
+
+    if (
+      potentialFirstGap?.type === 'gap' &&
+      potentialSecondGap?.type === 'gap'
+    ) {
+      groups.splice(index - 1, 2, {
+        type: 'gap',
+        maxId: potentialFirstGap.maxId,
+        sinceId: potentialSecondGap.sinceId,
+      });
+    }
+  }
+}
+
+function processNewNotification(
+  groups: NotificationGroupsState['groups'],
+  notification: ApiNotificationJSON,
+) {
+  const existingGroupIndex = groups.findIndex(
+    (group) =>
+      group.type !== 'gap' && group.group_key === notification.group_key,
+  );
+
+  // In any case, we are going to add a group at the top
+  // If there is currently a gap at the top, now is the time to update it
+  if (groups.length > 0 && groups[0]?.type === 'gap') {
+    groups[0].maxId = notification.id;
+  }
+
+  if (existingGroupIndex > -1) {
+    const existingGroup = groups[existingGroupIndex];
+
+    if (
+      existingGroup &&
+      existingGroup.type !== 'gap' &&
+      !existingGroup.sampleAccountIds.includes(notification.account.id) // This can happen for example if you like, then unlike, then like again the same post
+    ) {
+      // Update the existing group
+      if (
+        existingGroup.sampleAccountIds.unshift(notification.account.id) >
+        NOTIFICATIONS_GROUP_MAX_AVATARS
+      )
+        existingGroup.sampleAccountIds.pop();
+
+      existingGroup.most_recent_notification_id = notification.id;
+      existingGroup.page_max_id = notification.id;
+      existingGroup.latest_page_notification_at = notification.created_at;
+      existingGroup.notifications_count += 1;
+
+      groups.splice(existingGroupIndex, 1);
+      mergeGapsAround(groups, existingGroupIndex);
+
+      groups.unshift(existingGroup);
+    }
+  } else {
+    // Create a new group
+    groups.unshift(createNotificationGroupFromNotificationJSON(notification));
+  }
+}
+
+function trimNotifications(state: NotificationGroupsState) {
+  if (state.scrolledToTop) {
+    state.groups.splice(NOTIFICATIONS_TRIM_LIMIT);
+  }
+}
+
+function shouldMarkNewNotificationsAsRead(
+  {
+    isTabVisible,
+    scrolledToTop,
+    mounted,
+    lastReadId,
+    groups,
+  }: NotificationGroupsState,
+  ignoreScroll = false,
+) {
+  const isMounted = mounted > 0;
+  const oldestGroup = groups.findLast(isNotificationGroup);
+  const hasMore = groups.at(-1)?.type === 'gap';
+  const oldestGroupReached =
+    !hasMore ||
+    lastReadId === '0' ||
+    (oldestGroup?.page_min_id &&
+      compareId(oldestGroup.page_min_id, lastReadId) <= 0);
+
+  return (
+    isTabVisible &&
+    (ignoreScroll || scrolledToTop) &&
+    isMounted &&
+    oldestGroupReached
+  );
+}
+
+function updateLastReadId(
+  state: NotificationGroupsState,
+  group: NotificationGroup | undefined = undefined,
+) {
+  if (shouldMarkNewNotificationsAsRead(state)) {
+    group = group ?? state.groups.find(isNotificationGroup);
+    if (
+      group?.page_max_id &&
+      compareId(state.lastReadId, group.page_max_id) < 0
+    )
+      state.lastReadId = group.page_max_id;
+  }
+}
+
+export const notificationGroupsReducer = createReducer<NotificationGroupsState>(
+  initialState,
+  (builder) => {
+    builder
+      .addCase(fetchNotifications.fulfilled, (state, action) => {
+        state.groups = action.payload.map((json) =>
+          json.type === 'gap' ? json : createNotificationGroupFromJSON(json),
+        );
+        state.isLoading = false;
+        updateLastReadId(state);
+      })
+      .addCase(fetchNotificationsGap.fulfilled, (state, action) => {
+        const { notifications } = action.payload;
+
+        // find the gap in the existing notifications
+        const gapIndex = state.groups.findIndex(
+          (groupOrGap) =>
+            groupOrGap.type === 'gap' &&
+            groupOrGap.sinceId === action.meta.arg.gap.sinceId &&
+            groupOrGap.maxId === action.meta.arg.gap.maxId,
+        );
+
+        if (gapIndex < 0)
+          // We do not know where to insert, let's return
+          return;
+
+        // Filling a disconnection gap means we're getting historical data
+        // about groups we may know or may not know about.
+
+        // The notifications timeline is split in two by the gap, with
+        // group information newer than the gap, and group information older
+        // than the gap.
+
+        // Filling a gap should not touch anything before the gap, so any
+        // information on groups already appearing before the gap should be
+        // discarded, while any information on groups appearing after the gap
+        // can be updated and re-ordered.
+
+        const oldestPageNotification = notifications.at(-1)?.page_min_id;
+
+        // replace the gap with the notifications + a new gap
+
+        const newerGroupKeys = state.groups
+          .slice(0, gapIndex)
+          .filter(isNotificationGroup)
+          .map((group) => group.group_key);
+
+        const toInsert: NotificationGroupsState['groups'] = notifications
+          .map((json) => createNotificationGroupFromJSON(json))
+          .filter(
+            (notification) => !newerGroupKeys.includes(notification.group_key),
+          );
+
+        const apiGroupKeys = (toInsert as NotificationGroup[]).map(
+          (group) => group.group_key,
+        );
+
+        const sinceId = action.meta.arg.gap.sinceId;
+        if (
+          notifications.length > 0 &&
+          !(
+            oldestPageNotification &&
+            sinceId &&
+            compareId(oldestPageNotification, sinceId) <= 0
+          )
+        ) {
+          // If we get an empty page, it means we reached the bottom, so we do not need to insert a new gap
+          // Similarly, if we've fetched more than the gap's, this means we have completely filled it
+          toInsert.push({
+            type: 'gap',
+            maxId: notifications.at(-1)?.page_max_id,
+            sinceId,
+          } as NotificationGap);
+        }
+
+        // Remove older groups covered by the API
+        state.groups = state.groups.filter(
+          (groupOrGap) =>
+            groupOrGap.type !== 'gap' &&
+            !apiGroupKeys.includes(groupOrGap.group_key),
+        );
+
+        // Replace the gap with API results (+ the new gap if needed)
+        state.groups.splice(gapIndex, 1, ...toInsert);
+
+        // Finally, merge any adjacent gaps that could have been created by filtering
+        // groups earlier
+        mergeGaps(state.groups);
+
+        state.isLoading = false;
+
+        updateLastReadId(state);
+      })
+      .addCase(processNewNotificationForGroups.fulfilled, (state, action) => {
+        const notification = action.payload;
+        processNewNotification(
+          usePendingItems ? state.pendingGroups : state.groups,
+          notification,
+        );
+        updateLastReadId(state);
+        trimNotifications(state);
+      })
+      .addCase(disconnectTimeline, (state, action) => {
+        if (action.payload.timeline === 'home') {
+          if (state.groups.length > 0 && state.groups[0]?.type !== 'gap') {
+            state.groups.unshift({
+              type: 'gap',
+              sinceId: state.groups[0]?.page_min_id,
+            });
+          }
+        }
+      })
+      .addCase(timelineDelete, (state, action) => {
+        removeNotificationsForStatus(state, action.payload.statusId);
+      })
+      .addCase(clearNotifications.pending, (state) => {
+        state.groups = [];
+        state.pendingGroups = [];
+      })
+      .addCase(blockAccountSuccess, (state, action) => {
+        removeNotificationsForAccounts(state, [action.payload.relationship.id]);
+      })
+      .addCase(muteAccountSuccess, (state, action) => {
+        if (action.payload.relationship.muting_notifications)
+          removeNotificationsForAccounts(state, [
+            action.payload.relationship.id,
+          ]);
+      })
+      .addCase(blockDomainSuccess, (state, action) => {
+        removeNotificationsForAccounts(
+          state,
+          action.payload.accounts.map((account) => account.id),
+        );
+      })
+      .addCase(loadPending, (state) => {
+        // First, remove any existing group and merge data
+        state.pendingGroups.forEach((group) => {
+          if (group.type !== 'gap') {
+            const existingGroupIndex = state.groups.findIndex(
+              (groupOrGap) =>
+                isNotificationGroup(groupOrGap) &&
+                groupOrGap.group_key === group.group_key,
+            );
+            if (existingGroupIndex > -1) {
+              const existingGroup = state.groups[existingGroupIndex];
+              if (existingGroup && existingGroup.type !== 'gap') {
+                group.notifications_count += existingGroup.notifications_count;
+                group.sampleAccountIds = group.sampleAccountIds
+                  .concat(existingGroup.sampleAccountIds)
+                  .slice(0, NOTIFICATIONS_GROUP_MAX_AVATARS);
+                state.groups.splice(existingGroupIndex, 1);
+              }
+            }
+          }
+          trimNotifications(state);
+        });
+
+        // Then build the consolidated list and clear pending groups
+        state.groups = state.pendingGroups.concat(state.groups);
+        state.pendingGroups = [];
+      })
+      .addCase(updateScrollPosition, (state, action) => {
+        state.scrolledToTop = action.payload.top;
+        updateLastReadId(state);
+        trimNotifications(state);
+      })
+      .addCase(markNotificationsAsRead, (state) => {
+        const mostRecentGroup = state.groups.find(isNotificationGroup);
+        if (
+          mostRecentGroup?.page_max_id &&
+          compareId(state.lastReadId, mostRecentGroup.page_max_id) < 0
+        )
+          state.lastReadId = mostRecentGroup.page_max_id;
+      })
+      .addCase(fetchMarkers.fulfilled, (state, action) => {
+        if (
+          action.payload.markers.notifications &&
+          compareId(
+            state.lastReadId,
+            action.payload.markers.notifications.last_read_id,
+          ) < 0
+        )
+          state.lastReadId = action.payload.markers.notifications.last_read_id;
+      })
+      .addCase(mountNotifications, (state) => {
+        state.mounted += 1;
+        updateLastReadId(state);
+      })
+      .addCase(unmountNotifications, (state) => {
+        state.mounted -= 1;
+      })
+      .addCase(focusApp, (state) => {
+        state.isTabVisible = true;
+        updateLastReadId(state);
+      })
+      .addCase(unfocusApp, (state) => {
+        state.isTabVisible = false;
+      })
+      .addMatcher(
+        isAnyOf(authorizeFollowRequestSuccess, rejectFollowRequestSuccess),
+        (state, action) => {
+          removeNotificationsForAccounts(
+            state,
+            [action.payload.id],
+            'follow_request',
+          );
+        },
+      )
+      .addMatcher(
+        isAnyOf(fetchNotifications.pending, fetchNotificationsGap.pending),
+        (state) => {
+          state.isLoading = true;
+        },
+      )
+      .addMatcher(
+        isAnyOf(fetchNotifications.rejected, fetchNotificationsGap.rejected),
+        (state) => {
+          state.isLoading = false;
+        },
+      );
+  },
+);
diff --git a/app/javascript/flavours/glitch/reducers/notifications.js b/app/javascript/flavours/glitch/reducers/notifications.js
index 226f2affe1030a..b3c138583c7f7c 100644
--- a/app/javascript/flavours/glitch/reducers/notifications.js
+++ b/app/javascript/flavours/glitch/reducers/notifications.js
@@ -12,6 +12,7 @@ import {
 import {
   fetchMarkers,
 } from '../actions/markers';
+import { clearNotifications } from '../actions/notification_groups';
 import {
   NOTIFICATIONS_MOUNT,
   NOTIFICATIONS_UNMOUNT,
@@ -21,7 +22,6 @@ import {
   NOTIFICATIONS_EXPAND_REQUEST,
   NOTIFICATIONS_EXPAND_FAIL,
   NOTIFICATIONS_FILTER_SET,
-  NOTIFICATIONS_CLEAR,
   NOTIFICATIONS_SCROLL_TOP,
   NOTIFICATIONS_LOAD_PENDING,
   NOTIFICATIONS_DELETE_MARKED_REQUEST,
@@ -332,7 +332,7 @@ export default function notifications(state = initialState, action) {
   case authorizeFollowRequestSuccess.type:
   case rejectFollowRequestSuccess.type:
     return filterNotifications(state, [action.payload.id], 'follow_request');
-  case NOTIFICATIONS_CLEAR:
+  case clearNotifications.pending.type:
     return state.set('items', ImmutableList()).set('pendingItems', ImmutableList()).set('hasMore', false);
   case timelineDelete.type:
     return deleteByStatus(state, action.payload.statusId);
diff --git a/app/javascript/flavours/glitch/selectors/notifications.ts b/app/javascript/flavours/glitch/selectors/notifications.ts
new file mode 100644
index 00000000000000..7cc64aa6c584da
--- /dev/null
+++ b/app/javascript/flavours/glitch/selectors/notifications.ts
@@ -0,0 +1,34 @@
+import { createSelector } from '@reduxjs/toolkit';
+
+import { compareId } from 'flavours/glitch/compare_id';
+import type { RootState } from 'flavours/glitch/store';
+
+export const selectUnreadNotificationGroupsCount = createSelector(
+  [
+    (s: RootState) => s.notificationGroups.lastReadId,
+    (s: RootState) => s.notificationGroups.pendingGroups,
+    (s: RootState) => s.notificationGroups.groups,
+  ],
+  (notificationMarker, pendingGroups, groups) => {
+    return (
+      groups.filter(
+        (group) =>
+          group.type !== 'gap' &&
+          group.page_max_id &&
+          compareId(group.page_max_id, notificationMarker) > 0,
+      ).length +
+      pendingGroups.filter(
+        (group) =>
+          group.type !== 'gap' &&
+          group.page_max_id &&
+          compareId(group.page_max_id, notificationMarker) > 0,
+      ).length
+    );
+  },
+);
+
+export const selectPendingNotificationGroupsCount = createSelector(
+  [(s: RootState) => s.notificationGroups.pendingGroups],
+  (pendingGroups) =>
+    pendingGroups.filter((group) => group.type !== 'gap').length,
+);
diff --git a/app/javascript/flavours/glitch/selectors/settings.ts b/app/javascript/flavours/glitch/selectors/settings.ts
new file mode 100644
index 00000000000000..ce2b8b15e59cb1
--- /dev/null
+++ b/app/javascript/flavours/glitch/selectors/settings.ts
@@ -0,0 +1,40 @@
+import type { RootState } from 'flavours/glitch/store';
+
+/* eslint-disable @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access */
+// state.settings is not yet typed, so we disable some ESLint checks for those selectors
+export const selectSettingsNotificationsShows = (state: RootState) =>
+  state.settings.getIn(['notifications', 'shows']).toJS() as Record<
+    string,
+    boolean
+  >;
+
+export const selectSettingsNotificationsExcludedTypes = (state: RootState) =>
+  Object.entries(selectSettingsNotificationsShows(state))
+    .filter(([_type, enabled]) => !enabled)
+    .map(([type, _enabled]) => type);
+
+export const selectSettingsNotificationsQuickFilterShow = (state: RootState) =>
+  state.settings.getIn(['notifications', 'quickFilter', 'show']) as boolean;
+
+export const selectSettingsNotificationsQuickFilterActive = (
+  state: RootState,
+) => state.settings.getIn(['notifications', 'quickFilter', 'active']) as string;
+
+export const selectSettingsNotificationsQuickFilterAdvanced = (
+  state: RootState,
+) =>
+  state.settings.getIn(['notifications', 'quickFilter', 'advanced']) as boolean;
+
+export const selectSettingsNotificationsShowUnread = (state: RootState) =>
+  state.settings.getIn(['notifications', 'showUnread']) as boolean;
+
+export const selectNeedsNotificationPermission = (state: RootState) =>
+  (state.settings.getIn(['notifications', 'alerts']).includes(true) &&
+    state.notifications.get('browserSupport') &&
+    state.notifications.get('browserPermission') === 'default' &&
+    !state.settings.getIn([
+      'notifications',
+      'dismissPermissionBanner',
+    ])) as boolean;
+
+/* eslint-enable @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access */
diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index 06225b61e6c254..bcc3655155940e 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -1790,10 +1790,19 @@ body > [data-popper-placement] {
   }
 }
 
-.status__wrapper-direct {
+.status__wrapper-direct,
+.notification-ungrouped--direct {
   background: rgba($ui-highlight-color, 0.05);
 
-  .status__prepend {
+  &:focus {
+    background: rgba($ui-highlight-color, 0.1);
+  }
+}
+
+.status__wrapper-direct,
+.notification-ungrouped--direct {
+  .status__prepend,
+  .notification-ungrouped__header {
     color: $highlight-text-color;
   }
 }
@@ -2389,41 +2398,28 @@ a.account__display-name {
   }
 }
 
-.notification__relationships-severance-event,
-.notification__moderation-warning {
-  display: flex;
-  gap: 16px;
+.notification-group--link {
   color: $secondary-text-color;
   text-decoration: none;
-  align-items: flex-start;
-  padding: 16px 32px;
-  border-bottom: 1px solid var(--background-border-color);
-
-  &:hover {
-    color: $primary-text-color;
-  }
-
-  .icon {
-    padding: 2px;
-    color: $highlight-text-color;
-  }
 
-  &__content {
+  .notification-group__main {
     display: flex;
     flex-direction: column;
     align-items: flex-start;
     gap: 8px;
     flex-grow: 1;
-    font-size: 16px;
-    line-height: 24px;
+    font-size: 15px;
+    line-height: 22px;
 
-    strong {
+    strong,
+    bdi {
       font-weight: 700;
     }
 
     .link-button {
       font-size: inherit;
       line-height: inherit;
+      font-weight: inherit;
     }
   }
 }
@@ -10747,8 +10743,8 @@ noscript {
   display: flex;
   align-items: center;
   border-bottom: 1px solid var(--background-border-color);
-  padding: 24px 32px;
-  gap: 16px;
+  padding: 16px 24px;
+  gap: 8px;
   color: $darker-text-color;
   text-decoration: none;
 
@@ -10758,10 +10754,8 @@ noscript {
     color: $secondary-text-color;
   }
 
-  .icon {
-    width: 24px;
-    height: 24px;
-    padding: 2px;
+  .notification-group__icon {
+    color: inherit;
   }
 
   &__text {
@@ -10899,6 +10893,251 @@ noscript {
   }
 }
 
+.notification-group {
+  display: flex;
+  align-items: flex-start;
+  gap: 8px;
+  padding: 10px 14px; // glitch: reduced padding
+  border-bottom: 1px solid var(--background-border-color);
+
+  &__icon {
+    width: 40px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    flex: 0 0 auto;
+    color: $dark-text-color;
+
+    .icon {
+      width: 28px;
+      height: 28px;
+    }
+  }
+
+  &--follow &__icon,
+  &--follow-request &__icon {
+    color: $highlight-text-color;
+  }
+
+  &--favourite &__icon {
+    color: $gold-star;
+  }
+
+  &--reblog &__icon {
+    color: $valid-value-color;
+  }
+
+  &--relationships-severance-event &__icon,
+  &--admin-report &__icon,
+  &--admin-sign-up &__icon {
+    color: $dark-text-color;
+  }
+
+  &--moderation-warning &__icon {
+    color: $red-bookmark;
+  }
+
+  &--follow-request &__actions {
+    align-items: center;
+    display: flex;
+    gap: 8px;
+
+    .icon-button {
+      border: 1px solid var(--background-border-color);
+      border-radius: 50%;
+      padding: 1px;
+    }
+  }
+
+  &__main {
+    display: flex;
+    flex-direction: column;
+    gap: 8px;
+    flex: 1 1 auto;
+    overflow: hidden;
+
+    &__header {
+      display: flex;
+      flex-direction: column;
+      gap: 8px;
+
+      &__wrapper {
+        display: flex;
+        justify-content: space-between;
+      }
+
+      &__label {
+        display: flex;
+        gap: 8px;
+        font-size: 15px;
+        line-height: 22px;
+        color: $darker-text-color;
+
+        a {
+          color: inherit;
+          text-decoration: none;
+        }
+
+        bdi {
+          font-weight: 700;
+          color: $primary-text-color;
+        }
+
+        time {
+          color: $dark-text-color;
+        }
+      }
+    }
+
+    &__status {
+      border: 1px solid var(--background-border-color);
+      border-radius: 8px;
+      padding: 8px;
+    }
+  }
+
+  &__avatar-group {
+    display: flex;
+    gap: 8px;
+    height: 28px;
+    overflow-y: hidden;
+    flex-wrap: wrap;
+  }
+
+  .status {
+    padding: 0;
+    border: 0;
+  }
+
+  &__embedded-status {
+    &__account {
+      display: flex;
+      align-items: center;
+      gap: 4px;
+      margin-bottom: 8px;
+      color: $dark-text-color;
+
+      bdi {
+        color: inherit;
+      }
+    }
+
+    .account__avatar {
+      opacity: 0.5;
+    }
+
+    &__content {
+      display: -webkit-box;
+      font-size: 15px;
+      line-height: 22px;
+      color: $dark-text-color;
+      cursor: pointer;
+      -webkit-line-clamp: 4;
+      -webkit-box-orient: vertical;
+      max-height: 4 * 22px;
+      overflow: hidden;
+
+      p,
+      a {
+        color: inherit;
+      }
+    }
+  }
+}
+
+.notification-ungrouped {
+  padding: 16px 24px;
+  border-bottom: 1px solid var(--background-border-color);
+
+  &__header {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    color: $dark-text-color;
+    font-size: 15px;
+    line-height: 22px;
+    font-weight: 500;
+    padding-inline-start: 24px;
+    margin-bottom: 16px;
+
+    &__icon {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      flex: 0 0 auto;
+
+      .icon {
+        width: 16px;
+        height: 16px;
+      }
+    }
+
+    a {
+      color: inherit;
+      text-decoration: none;
+    }
+  }
+
+  .status {
+    border: 0;
+    padding: 0;
+
+    &__avatar {
+      width: 40px;
+      height: 40px;
+    }
+  }
+
+  .status__wrapper-direct {
+    background: transparent;
+  }
+
+  $icon-margin: 48px; // 40px avatar + 8px gap
+
+  .status__content,
+  .status__action-bar,
+  .media-gallery,
+  .video-player,
+  .audio-player,
+  .attachment-list,
+  .picture-in-picture-placeholder,
+  .more-from-author,
+  .status-card,
+  .hashtag-bar {
+    margin-inline-start: $icon-margin;
+    width: calc(100% - $icon-margin);
+  }
+
+  .more-from-author {
+    width: calc(100% - $icon-margin + 2px);
+  }
+
+  .status__content__read-more-button {
+    margin-inline-start: $icon-margin;
+  }
+
+  .notification__report {
+    border: 0;
+    padding: 0;
+  }
+}
+
+.notification-group--unread,
+.notification-ungrouped--unread {
+  position: relative;
+
+  &::before {
+    content: '';
+    position: absolute;
+    top: 0;
+    inset-inline-start: 0;
+    width: 100%;
+    height: 100%;
+    border-inline-start: 4px solid $highlight-text-color;
+    pointer-events: none;
+  }
+}
+
 .hover-card-controller[data-popper-reference-hidden='true'] {
   opacity: 0;
   pointer-events: none;

From 8e0aed8ac73dda2138a71a090e1560ace9b9bcf1 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 19 Jul 2024 10:21:09 +0200
Subject: [PATCH 1572/2191] New Crowdin Translations (automated) (#31072)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/an.json      |  1 -
 app/javascript/mastodon/locales/ar.json      |  1 -
 app/javascript/mastodon/locales/ast.json     | 45 ++++++-----
 app/javascript/mastodon/locales/be.json      |  1 -
 app/javascript/mastodon/locales/bg.json      |  1 -
 app/javascript/mastodon/locales/bn.json      |  1 -
 app/javascript/mastodon/locales/br.json      |  1 -
 app/javascript/mastodon/locales/ca.json      |  1 -
 app/javascript/mastodon/locales/ckb.json     |  1 -
 app/javascript/mastodon/locales/co.json      |  1 -
 app/javascript/mastodon/locales/cs.json      |  1 -
 app/javascript/mastodon/locales/cy.json      |  1 -
 app/javascript/mastodon/locales/da.json      | 20 ++++-
 app/javascript/mastodon/locales/de.json      | 15 +++-
 app/javascript/mastodon/locales/el.json      |  1 -
 app/javascript/mastodon/locales/en-GB.json   |  1 -
 app/javascript/mastodon/locales/eo.json      |  1 -
 app/javascript/mastodon/locales/es-AR.json   | 13 ++++
 app/javascript/mastodon/locales/es-MX.json   | 15 +++-
 app/javascript/mastodon/locales/es.json      | 15 +++-
 app/javascript/mastodon/locales/et.json      |  1 -
 app/javascript/mastodon/locales/eu.json      |  1 -
 app/javascript/mastodon/locales/fa.json      |  1 -
 app/javascript/mastodon/locales/fi.json      |  1 -
 app/javascript/mastodon/locales/fo.json      | 15 +++-
 app/javascript/mastodon/locales/fr-CA.json   |  1 -
 app/javascript/mastodon/locales/fr.json      |  1 -
 app/javascript/mastodon/locales/fy.json      |  1 -
 app/javascript/mastodon/locales/ga.json      | 39 ++++++----
 app/javascript/mastodon/locales/gd.json      |  1 -
 app/javascript/mastodon/locales/gl.json      |  1 -
 app/javascript/mastodon/locales/he.json      |  1 -
 app/javascript/mastodon/locales/hr.json      |  1 -
 app/javascript/mastodon/locales/hu.json      | 15 +++-
 app/javascript/mastodon/locales/hy.json      |  1 -
 app/javascript/mastodon/locales/ia.json      |  1 -
 app/javascript/mastodon/locales/id.json      |  1 -
 app/javascript/mastodon/locales/ie.json      |  1 -
 app/javascript/mastodon/locales/io.json      |  1 -
 app/javascript/mastodon/locales/is.json      |  1 -
 app/javascript/mastodon/locales/it.json      | 13 ++++
 app/javascript/mastodon/locales/ja.json      |  1 -
 app/javascript/mastodon/locales/kab.json     |  1 -
 app/javascript/mastodon/locales/kk.json      |  1 -
 app/javascript/mastodon/locales/ko.json      |  1 -
 app/javascript/mastodon/locales/ku.json      |  1 -
 app/javascript/mastodon/locales/kw.json      |  1 -
 app/javascript/mastodon/locales/la.json      |  1 -
 app/javascript/mastodon/locales/lad.json     |  1 -
 app/javascript/mastodon/locales/lt.json      |  1 -
 app/javascript/mastodon/locales/lv.json      |  1 -
 app/javascript/mastodon/locales/ms.json      |  1 -
 app/javascript/mastodon/locales/my.json      |  1 -
 app/javascript/mastodon/locales/nl.json      | 15 +++-
 app/javascript/mastodon/locales/nn.json      |  1 -
 app/javascript/mastodon/locales/no.json      |  1 -
 app/javascript/mastodon/locales/oc.json      |  1 -
 app/javascript/mastodon/locales/pl.json      | 15 +++-
 app/javascript/mastodon/locales/pt-BR.json   |  1 -
 app/javascript/mastodon/locales/pt-PT.json   |  1 -
 app/javascript/mastodon/locales/ro.json      |  1 -
 app/javascript/mastodon/locales/ru.json      |  1 -
 app/javascript/mastodon/locales/sa.json      |  1 -
 app/javascript/mastodon/locales/sc.json      |  1 -
 app/javascript/mastodon/locales/sco.json     |  1 -
 app/javascript/mastodon/locales/si.json      |  1 -
 app/javascript/mastodon/locales/sk.json      |  1 -
 app/javascript/mastodon/locales/sl.json      | 13 ++++
 app/javascript/mastodon/locales/sq.json      |  1 -
 app/javascript/mastodon/locales/sr-Latn.json |  1 -
 app/javascript/mastodon/locales/sr.json      |  1 -
 app/javascript/mastodon/locales/sv.json      |  6 +-
 app/javascript/mastodon/locales/ta.json      |  1 -
 app/javascript/mastodon/locales/te.json      |  1 -
 app/javascript/mastodon/locales/th.json      |  1 -
 app/javascript/mastodon/locales/tok.json     |  1 -
 app/javascript/mastodon/locales/tr.json      |  1 -
 app/javascript/mastodon/locales/uk.json      |  1 -
 app/javascript/mastodon/locales/ur.json      |  1 -
 app/javascript/mastodon/locales/uz.json      |  1 -
 app/javascript/mastodon/locales/vi.json      |  1 -
 app/javascript/mastodon/locales/zh-CN.json   | 15 +++-
 app/javascript/mastodon/locales/zh-HK.json   |  1 -
 app/javascript/mastodon/locales/zh-TW.json   | 13 ++++
 config/locales/activerecord.ast.yml          |  2 +-
 config/locales/ast.yml                       | 78 ++++++++++++--------
 config/locales/devise.ast.yml                | 22 +++---
 config/locales/devise.ga.yml                 |  2 +-
 config/locales/doorkeeper.ast.yml            | 10 +--
 config/locales/en-GB.yml                     |  1 +
 config/locales/es-AR.yml                     |  1 +
 config/locales/es-MX.yml                     |  2 +
 config/locales/es.yml                        |  2 +
 config/locales/ga.yml                        |  8 +-
 config/locales/he.yml                        |  1 +
 config/locales/lt.yml                        |  1 +
 config/locales/pl.yml                        |  2 +
 config/locales/simple_form.ast.yml           | 29 ++++----
 config/locales/simple_form.kab.yml           |  1 +
 99 files changed, 336 insertions(+), 176 deletions(-)

diff --git a/app/javascript/mastodon/locales/an.json b/app/javascript/mastodon/locales/an.json
index 752b6c3564f6ec..d8f41b29bd153e 100644
--- a/app/javascript/mastodon/locales/an.json
+++ b/app/javascript/mastodon/locales/an.json
@@ -342,7 +342,6 @@
   "notification.follow_request": "{name} ha solicitau seguir-te",
   "notification.mention": "{name} t'ha mencionau",
   "notification.own_poll": "La tuya enqüesta ha rematau",
-  "notification.poll": "Una enqüesta en a quala has votau ha rematau",
   "notification.reblog": "{name} ha retutau la tuya publicación",
   "notification.status": "{name} acaba de publicar",
   "notification.update": "{name} editó una publicación",
diff --git a/app/javascript/mastodon/locales/ar.json b/app/javascript/mastodon/locales/ar.json
index 5509769e04085b..9cfda3cbc2f2ef 100644
--- a/app/javascript/mastodon/locales/ar.json
+++ b/app/javascript/mastodon/locales/ar.json
@@ -482,7 +482,6 @@
   "notification.moderation_warning.action_silence": "لقد تم تقييد حسابك.",
   "notification.moderation_warning.action_suspend": "لقد تم تعليق حسابك.",
   "notification.own_poll": "انتهى استطلاعك للرأي",
-  "notification.poll": "لقد انتهى استطلاع رأي شاركتَ فيه",
   "notification.reblog": "قام {name} بمشاركة منشورك",
   "notification.relationships_severance_event": "فقدت الاتصالات مع {name}",
   "notification.relationships_severance_event.account_suspension": "قام مشرف من {from} بتعليق {target}، مما يعني أنك لم يعد بإمكانك تلقي التحديثات منهم أو التفاعل معهم.",
diff --git a/app/javascript/mastodon/locales/ast.json b/app/javascript/mastodon/locales/ast.json
index 3f32a8bf158e04..883737eb4aa96c 100644
--- a/app/javascript/mastodon/locales/ast.json
+++ b/app/javascript/mastodon/locales/ast.json
@@ -1,7 +1,7 @@
 {
   "about.blocks": "Sirvidores moderaos",
   "about.contact": "Contautu:",
-  "about.disclaimer": "Mastodon ye software gratuito ya de códigu llibre, ya una marca rexistrada de Mastodon gGmbH.",
+  "about.disclaimer": "Mastodon ye software gratuito y de códigu llibre, y una marca rexistrada de Mastodon gGmbH.",
   "about.domain_blocks.no_reason_available": "El motivu nun ta disponible",
   "about.domain_blocks.preamble": "Polo xeneral, Mastodon permítete ver el conteníu ya interactuar colos perfiles d'otros sirvidores nel fediversu. Estes son les esceiciones que se ficieron nesti sirvidor.",
   "about.domain_blocks.silenced.explanation": "Polo xeneral, nun ves los perfiles ya'l conteníu d'esti sirvidor sacante que los busques o decidas siguilos.",
@@ -37,15 +37,15 @@
   "account.hide_reblogs": "Anubrir los artículos compartíos de @{name}",
   "account.in_memoriam": "N'alcordanza.",
   "account.joined_short": "Data de xunión",
-  "account.link_verified_on": "La propiedá d'esti enllaz foi comprobada'l {date}",
+  "account.link_verified_on": "La propiedá d'esti enllaz comprobóse'l {date}",
   "account.media": "Multimedia",
   "account.mention": "Mentar a @{name}",
   "account.moved_to": "{name} indicó qu'agora la so cuenta nueva ye:",
   "account.mute": "Desactivar los avisos de @{name}",
   "account.open_original_page": "Abrir la páxina orixinal",
   "account.posts": "Artículos",
-  "account.posts_with_replies": "Artículos ya rempuestes",
-  "account.report": "Informar de: @{name}",
+  "account.posts_with_replies": "Artículos y rempuestes",
+  "account.report": "Informar de @{name}",
   "account.requested_follow": "{name} solicitó siguite",
   "account.show_reblogs": "Amosar los artículos compartíos de @{name}",
   "account.unblock": "Desbloquiar a @{name}",
@@ -71,7 +71,7 @@
   "bundle_column_error.routing.body": "Nun se pudo atopar la páxina solicitada. ¿De xuru que la URL de la barra de direiciones ta bien escrita?",
   "bundle_column_error.routing.title": "404",
   "bundle_modal_error.message": "Asocedió daqué malo mentanto se cargaba esti componente.",
-  "closed_registrations.other_server_instructions": "Darréu que Mastodon ye una rede social descentralizada, pues crear una cuenta n'otru sirvidor ya siguir interactuando con esti.",
+  "closed_registrations.other_server_instructions": "Darréu que Mastodon ye una rede social descentralizada, pues crear una cuenta n'otru sirvidor y siguir interactuando con esti.",
   "closed_registrations_modal.description": "Anguaño nun ye posible crear cuentes en {domain}, mas ten en cuenta que nun precises una cuenta nesti sirvidor pa usar Mastodon.",
   "closed_registrations_modal.find_another_server": "Atopar otru sirvidor",
   "closed_registrations_modal.preamble": "Mastodon ye una rede social descentralizada polo que nun importa ónde crees la cuenta, vas ser a siguir ya interactuar con persones d'esti sirvidor. ¡Ya tamién pues tener el to propiu sirvidor!",
@@ -107,7 +107,7 @@
   "compose_form.lock_disclaimer.lock": "privada",
   "compose_form.placeholder": "¿En qué pienses?",
   "compose_form.poll.option_placeholder": "Opción {number}",
-  "compose_form.poll.type": "Estilu",
+  "compose_form.poll.type": "Tipu",
   "compose_form.publish_form": "Artículu nuevu",
   "confirmation_modal.cancel": "Encaboxar",
   "confirmations.block.confirm": "Bloquiar",
@@ -120,7 +120,7 @@
   "confirmations.edit.message": "La edición va sobrescribir el mensaxe que tas escribiendo. ¿De xuru que quies siguir?",
   "confirmations.logout.confirm": "Zarrar la sesión",
   "confirmations.logout.message": "¿De xuru que quies zarrar la sesión?",
-  "confirmations.redraft.confirm": "Desaniciar ya reeditar",
+  "confirmations.redraft.confirm": "Desaniciar y reeditar",
   "confirmations.reply.confirm": "Responder",
   "confirmations.unfollow.confirm": "Dexar de siguir",
   "confirmations.unfollow.message": "¿De xuru que quies dexar de siguir a {name}?",
@@ -140,7 +140,7 @@
   "embed.preview": "Va apaecer asina:",
   "emoji_button.activity": "Actividá",
   "emoji_button.flags": "Banderes",
-  "emoji_button.food": "Comida ya bébora",
+  "emoji_button.food": "Comida y bébora",
   "emoji_button.nature": "Natura",
   "emoji_button.not_found": "Nun s'atoparon fustaxes que concasen",
   "emoji_button.objects": "Oxetos",
@@ -149,7 +149,7 @@
   "emoji_button.search": "Buscar…",
   "emoji_button.search_results": "Resultaos de la busca",
   "emoji_button.symbols": "Símbolos",
-  "emoji_button.travel": "Viaxes ya llugares",
+  "emoji_button.travel": "Viaxes y llugares",
   "empty_column.account_timeline": "¡Equí nun hai nengún artículu!",
   "empty_column.blocks": "Nun bloquiesti a nengún perfil.",
   "empty_column.bookmarked_statuses": "Nun tienes nengún artículu en Marcadores. Cuando amiestes dalgún, apaez equí.",
@@ -168,7 +168,7 @@
   "error.unexpected_crash.explanation": "Pola mor d'un fallu nel códigu o un problema de compatibilidá del restolador, esta páxina nun se pudo amosar correutamente.",
   "error.unexpected_crash.explanation_addons": "Esta páxina nun se pudo amosar correutamente. Ye probable que dalgún complementu del restolador o dalguna ferramienta de traducción automática produxere esti error.",
   "error.unexpected_crash.next_steps": "Prueba a anovar la páxina. Si nun sirve, ye posible que tovía seyas a usar Mastodon pente otru restolador o una aplicación nativa.",
-  "error.unexpected_crash.next_steps_addons": "Prueba a desactivalos ya a anovar la páxina. Si nun sirve, ye posible que tovía seyas a usar Mastodon pente otru restolador o una aplicación nativa.",
+  "error.unexpected_crash.next_steps_addons": "Prueba a desactivalos y a anovar la páxina. Si nun sirve, ye posible que tovía seyas a usar Mastodon pente otru restolador o una aplicación nativa.",
   "explore.search_results": "Resultaos de la busca",
   "explore.suggested_follows": "Perfiles",
   "explore.title": "Esploración",
@@ -179,7 +179,7 @@
   "filter_modal.added.context_mismatch_title": "¡El contestu nun coincide!",
   "filter_modal.added.expired_explanation": "Esta categoría de peñera caducó, tienes de camudar la so data de caducidá p'aplicala.",
   "filter_modal.added.expired_title": "¡La peñera caducó!",
-  "filter_modal.added.review_and_configure": "Pa revisar ya configurar a fondu esta categoría de peñera, vete a la {settings_link}.",
+  "filter_modal.added.review_and_configure": "Pa revisar y configurar a fondu esta categoría de peñera, vete a la {settings_link}.",
   "filter_modal.added.review_and_configure_title": "Configuración de la peñera",
   "filter_modal.added.settings_link": "páxina de configuración",
   "filter_modal.added.short_explanation": "Esti artículu amestóse a la categoría de peñera siguiente: {title}.",
@@ -195,8 +195,10 @@
   "follow_request.reject": "Refugar",
   "follow_requests.unlocked_explanation": "Magar que la to cuenta nun seya privada, el personal del dominiu «{domain}» pensó qu'a lo meyor quies revisar manualmente les solicitúes de siguimientu d'estes cuentes.",
   "follow_suggestions.dismiss": "Nun volver amosar",
+  "follow_suggestions.friends_of_friends_longer": "Ye popular ente los perfiles que sigues",
   "follow_suggestions.personalized_suggestion": "Suxerencia personalizada",
   "follow_suggestions.popular_suggestion": "Suxerencia popular",
+  "follow_suggestions.similar_to_recently_followed_longer": "Aseméyase a los perfiles que siguiesti apocayá",
   "follow_suggestions.view_all": "Ver too",
   "follow_suggestions.who_to_follow": "A quién siguir",
   "footer.about": "Tocante a",
@@ -272,6 +274,8 @@
   "lists.subheading": "Les tos llistes",
   "load_pending": "{count, plural, one {# elementu nuevu} other {# elementos nuevos}}",
   "media_gallery.toggle_visible": "{number, plural, one {Anubrir la imaxe} other {Anubrir les imáxenes}}",
+  "name_and_others": "{name} y {count, plural, one {# más} other {# más}}",
+  "name_and_others_with_link": "{name} y <a>{count, plural, one {# más} other {# más}}</a>",
   "navigation_bar.about": "Tocante a",
   "navigation_bar.blocks": "Perfiles bloquiaos",
   "navigation_bar.bookmarks": "Marcadores",
@@ -281,11 +285,11 @@
   "navigation_bar.explore": "Esploración",
   "navigation_bar.filters": "Pallabres desactivaes",
   "navigation_bar.follow_requests": "Solicitúes de siguimientu",
-  "navigation_bar.follows_and_followers": "Perfiles que sigues ya te siguen",
+  "navigation_bar.follows_and_followers": "Perfiles que sigues y te siguen",
   "navigation_bar.lists": "Llistes",
   "navigation_bar.logout": "Zarrar la sesión",
   "navigation_bar.mutes": "Perfiles colos avisos desactivaos",
-  "navigation_bar.opened_in_classic_interface": "Los artículos, les cuentes ya otres páxines específiques ábrense por defeutu na interfaz web clásica.",
+  "navigation_bar.opened_in_classic_interface": "Los artículos, les cuentes y otres páxines específiques ábrense por defeutu na interfaz web clásica.",
   "navigation_bar.pins": "Artículos fixaos",
   "navigation_bar.preferences": "Preferencies",
   "navigation_bar.public_timeline": "Llinia de tiempu federada",
@@ -296,13 +300,13 @@
   "notification.follow": "{name} siguióte",
   "notification.follow_request": "{name} solicitó siguite",
   "notification.mention": "{name} mentóte",
-  "notification.poll": "Finó una encuesta na que votesti",
   "notification.reblog": "{name} compartió'l to artículu",
   "notification.status": "{name} ta acabante d'espublizar",
   "notification.update": "{name} editó un artículu",
   "notifications.clear": "Borrar los avisos",
   "notifications.column_settings.admin.report": "Informes nuevos:",
   "notifications.column_settings.admin.sign_up": "Rexistros nuevos:",
+  "notifications.column_settings.beta.category": "Funciones esperimentales",
   "notifications.column_settings.follow": "Siguidores nuevos:",
   "notifications.column_settings.follow_request": "Solicitúes de siguimientu nueves:",
   "notifications.column_settings.mention": "Menciones:",
@@ -319,7 +323,7 @@
   "notifications.mark_as_read": "Marcar tolos avisos como lleíos",
   "notifications.permission_required": "Los avisos d'escritoriu nun tán disponibles porque nun se concedió'l permisu riquíu.",
   "onboarding.profile.note_hint": "Pues @mentar a otros perfiles o poner #etiquetes…",
-  "onboarding.start.lead": "Xá yes parte de Mastodon, una plataforma social multimedia descentralizada onde tu ya non un algoritmu, personalices la to esperiencia. Vamos presentate esti llugar social nuevu:",
+  "onboarding.start.lead": "Yá yes parte de Mastodon, una plataforma social multimedia descentralizada onde tu y non un algoritmu, personalices la to esperiencia. Vamos presentate esti llugar social nuevu:",
   "onboarding.start.skip": "¿Nun precises ayuda pa comenzar?",
   "onboarding.steps.follow_people.body": "Mastodon trata namás de siguir a cuentes interesantes.",
   "onboarding.steps.publish_status.body": "Saluda al mundu con semeyes, vídeos, testu o encuestes {emoji}",
@@ -334,6 +338,8 @@
   "poll_button.add_poll": "Amestar una encuesta",
   "poll_button.remove_poll": "Quitar la encuesta",
   "privacy.change": "Configurar la privacidá del artículu",
+  "privacy.direct.short": "Perfiles específicos",
+  "privacy.private.short": "Siguidores",
   "privacy.public.short": "Artículu públicu",
   "privacy_policy.last_updated": "Data del últimu anovamientu: {date}",
   "privacy_policy.title": "Política de privacidá",
@@ -383,10 +389,11 @@
   "report.thanks.take_action": "Equí tienes les opciones pa controlar qué ves en Mastodon:",
   "report.thanks.take_action_actionable": "Mentanto revisamos esti informe, pues tomar midíes contra @{name}:",
   "report.thanks.title": "¿Nun quies ver esti conteníu?",
-  "report.thanks.title_actionable": "Gracies pol informe, el casu xá ta n'investigación.",
+  "report.thanks.title_actionable": "Gracies pol informe, el casu yá ta n'investigación.",
   "report.unfollow": "Dexar de siguir a @{name}",
   "report.unfollow_explanation": "Sigues a esta cuenta. Pa dexar de ver los sos artículos nel to feed d'aniciu, dexa de siguila.",
   "report_notification.attached_statuses": "{count, plural, one {Axuntóse {count} artículu} other {Axuntáronse {count} artículos}}",
+  "report_notification.categories.legal_sentence": "conteníu illegal",
   "report_notification.open": "Abrir l'informe",
   "search.no_recent_searches": "Nun hai nenguna busca recién",
   "search.placeholder": "Buscar",
@@ -396,6 +403,7 @@
   "search.quick_action.status_search": "Artículos que concasen con {x}",
   "search.search_or_paste": "Busca o apiega una URL",
   "search_popout.language_code": "códigu de llingua ISO",
+  "search_popout.options": "Opciones de busca",
   "search_popout.quick_actions": "Aiciones rápides",
   "search_popout.recent": "Busques de recién",
   "search_popout.specific_date": "data específica",
@@ -440,12 +448,13 @@
   "status.reblog": "Compartir",
   "status.reblogged_by": "{name} compartió",
   "status.reblogs.empty": "Naide nun compartió esti artículu. Cuando daquién lo faiga, apaez equí.",
-  "status.redraft": "Desaniciar ya reeditar",
+  "status.redraft": "Desaniciar y reeditar",
   "status.replied_to": "En rempuesta a {name}",
   "status.reply": "Responder",
   "status.replyAll": "Responder al filu",
   "status.report": "Informar de @{name}",
   "status.sensitive_warning": "Conteníu sensible",
+  "status.share": "Compartir",
   "status.show_filter_reason": "Amosar de toes toes",
   "status.show_less": "Amosar menos",
   "status.show_more": "Amosar más",
@@ -472,7 +481,7 @@
   "units.short.thousand": "{count} mil",
   "upload_button.label": "Amestar ficheros multimedia",
   "upload_error.poll": "La xuba de ficheros nun ta permitida coles encuestes.",
-  "upload_form.audio_description": "Describi'l conteníu pa persones sordes ya/o ciegues",
+  "upload_form.audio_description": "Describi'l conteníu pa persones sordes y/o ciegues",
   "upload_form.edit": "Editar",
   "upload_modal.analyzing_picture": "Analizando la semeya…",
   "upload_modal.apply": "Aplicar",
diff --git a/app/javascript/mastodon/locales/be.json b/app/javascript/mastodon/locales/be.json
index df29fbd4184fdf..e2120d80d9fcb7 100644
--- a/app/javascript/mastodon/locales/be.json
+++ b/app/javascript/mastodon/locales/be.json
@@ -485,7 +485,6 @@
   "notification.moderation_warning.action_silence": "Ваш уліковы запіс быў абмежаваны.",
   "notification.moderation_warning.action_suspend": "Ваш уліковы запіс быў прыпынены.",
   "notification.own_poll": "Ваша апытанне скончылася",
-  "notification.poll": "Апытанне, дзе вы прынялі ўдзел, скончылася",
   "notification.reblog": "{name} пашырыў ваш допіс",
   "notification.relationships_severance_event": "Страціў сувязь з {name}",
   "notification.relationships_severance_event.account_suspension": "Адміністратар з {from} прыпыніў працу {target}, што азначае, што вы больш не можаце атрымліваць ад іх абнаўлення ці ўзаемадзейнічаць з імі.",
diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json
index 98e84c45d75351..0e29f55e761eba 100644
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@@ -485,7 +485,6 @@
   "notification.moderation_warning.action_silence": "Вашият акаунт е ограничен.",
   "notification.moderation_warning.action_suspend": "Вашият акаунт е спрян.",
   "notification.own_poll": "Анкетата ви приключи",
-  "notification.poll": "Анкета, в която гласувахте, приключи",
   "notification.reblog": "{name} подсили ваша публикация",
   "notification.relationships_severance_event": "Изгуби се връзката с {name}",
   "notification.relationships_severance_event.account_suspension": "Администратор от {from} спря {target}, което значи че повече не може да получавате новости от тях или да взаимодействате с тях.",
diff --git a/app/javascript/mastodon/locales/bn.json b/app/javascript/mastodon/locales/bn.json
index a203c43f034e24..6d64c00a2f57a4 100644
--- a/app/javascript/mastodon/locales/bn.json
+++ b/app/javascript/mastodon/locales/bn.json
@@ -320,7 +320,6 @@
   "notification.follow_request": "{name} আপনাকে অনুসরণ করার জন্য অনুরধ করেছে",
   "notification.mention": "{name} আপনাকে উল্লেখ করেছেন",
   "notification.own_poll": "আপনার পোল শেষ হয়েছে",
-  "notification.poll": "আপনি ভোট দিয়েছিলেন এমন এক  নির্বাচনের ভোটের সময় শেষ হয়েছে",
   "notification.reblog": "{name} আপনার কার্যক্রমে সমর্থন দেখিয়েছেন",
   "notifications.clear": "প্রজ্ঞাপনগুলো মুছে ফেলতে",
   "notifications.clear_confirmation": "আপনি কি নির্চিত প্রজ্ঞাপনগুলো মুছে ফেলতে চান ?",
diff --git a/app/javascript/mastodon/locales/br.json b/app/javascript/mastodon/locales/br.json
index a150fb4902be39..76cd9d45743458 100644
--- a/app/javascript/mastodon/locales/br.json
+++ b/app/javascript/mastodon/locales/br.json
@@ -398,7 +398,6 @@
   "notification.mention": "Gant {name} oc'h bet meneget",
   "notification.moderation-warning.learn_more": "Gouzout hiroc'h",
   "notification.own_poll": "Echu eo ho sontadeg",
-  "notification.poll": "Ur sontadeg ho deus mouezhet warnañ a zo echuet",
   "notification.reblog": "Gant {name} eo bet skignet ho toud",
   "notification.status": "Emañ {name} o paouez toudañ",
   "notification.update": "Gant {name} ez eus bet kemmet un toud",
diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index 3123e29d8d26e1..1719b105f042f2 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -485,7 +485,6 @@
   "notification.moderation_warning.action_silence": "S'ha limitat el vostre compte.",
   "notification.moderation_warning.action_suspend": "S'ha suspès el vostre compte.",
   "notification.own_poll": "La teva enquesta ha finalitzat",
-  "notification.poll": "Ha finalitzat una enquesta en què has votat",
   "notification.reblog": "{name} t'ha impulsat",
   "notification.relationships_severance_event": "S'han perdut les connexions amb {name}",
   "notification.relationships_severance_event.account_suspension": "Un administrador de {from} ha suspès {target}; això vol dir que ja no en podreu rebre actualitzacions o interactuar-hi.",
diff --git a/app/javascript/mastodon/locales/ckb.json b/app/javascript/mastodon/locales/ckb.json
index 3ebf9391d2e9aa..379706a3e08c7b 100644
--- a/app/javascript/mastodon/locales/ckb.json
+++ b/app/javascript/mastodon/locales/ckb.json
@@ -391,7 +391,6 @@
   "notification.follow_request": "{name} داوای کردووە کە شوێنت بکەوێت",
   "notification.mention": "{name} باسی ئێوەی کرد",
   "notification.own_poll": "ڕاپرسیەکەت کۆتایی هات",
-  "notification.poll": "ڕاپرسییەک کە دەنگی پێداویت کۆتایی هات",
   "notification.reblog": "{name} نووسراوەکەتی دووبارە توتاند",
   "notification.status": "{name} تازە بڵاوکرایەوە",
   "notification.update": "{name} پۆستێکی دەستکاریکرد",
diff --git a/app/javascript/mastodon/locales/co.json b/app/javascript/mastodon/locales/co.json
index 78f8e6fd786eb3..4520663b52b022 100644
--- a/app/javascript/mastodon/locales/co.json
+++ b/app/javascript/mastodon/locales/co.json
@@ -240,7 +240,6 @@
   "notification.follow_request": "{name} vole abbunassi à u vostru contu",
   "notification.mention": "{name} v'hà mintuvatu",
   "notification.own_poll": "U vostru scandagliu hè compiu",
-  "notification.poll": "Un scandagliu induve avete vutatu hè finitu",
   "notification.reblog": "{name} hà spartutu u vostru statutu",
   "notification.status": "{name} hà appena pubblicatu",
   "notifications.clear": "Purgà e nutificazione",
diff --git a/app/javascript/mastodon/locales/cs.json b/app/javascript/mastodon/locales/cs.json
index 12de5d5ecd4794..213fe5e530e392 100644
--- a/app/javascript/mastodon/locales/cs.json
+++ b/app/javascript/mastodon/locales/cs.json
@@ -485,7 +485,6 @@
   "notification.moderation_warning.action_silence": "Váš účet byl omezen.",
   "notification.moderation_warning.action_suspend": "Váš účet byl pozastaven.",
   "notification.own_poll": "Vaše anketa skončila",
-  "notification.poll": "Anketa, ve které jste hlasovali, skončila",
   "notification.reblog": "Uživatel {name} boostnul váš příspěvek",
   "notification.relationships_severance_event": "Kontakt ztracen s {name}",
   "notification.relationships_severance_event.account_suspension": "Administrátor z {from} pozastavil {target}, což znamená, že již od nich nemůžete přijímat aktualizace nebo s nimi interagovat.",
diff --git a/app/javascript/mastodon/locales/cy.json b/app/javascript/mastodon/locales/cy.json
index 9a3fab6155a399..e4c10cc14269e6 100644
--- a/app/javascript/mastodon/locales/cy.json
+++ b/app/javascript/mastodon/locales/cy.json
@@ -481,7 +481,6 @@
   "notification.moderation_warning.action_silence": "Mae eich cyfrif wedi'i gyfyngu.",
   "notification.moderation_warning.action_suspend": "Mae eich cyfrif wedi'i hatal.",
   "notification.own_poll": "Mae eich pleidlais wedi dod i ben",
-  "notification.poll": "Mae pleidlais rydych wedi pleidleisio ynddi wedi dod i ben",
   "notification.reblog": "Hybodd {name} eich post",
   "notification.relationships_severance_event": "Wedi colli cysylltiad â {name}",
   "notification.relationships_severance_event.account_suspension": "Mae gweinyddwr o {from} wedi atal {target}, sy'n golygu na allwch dderbyn diweddariadau ganddynt mwyach na rhyngweithio â nhw.",
diff --git a/app/javascript/mastodon/locales/da.json b/app/javascript/mastodon/locales/da.json
index d8c178d295ea4f..9316884d7184f6 100644
--- a/app/javascript/mastodon/locales/da.json
+++ b/app/javascript/mastodon/locales/da.json
@@ -37,6 +37,7 @@
   "account.followers.empty": "Ingen følger denne bruger endnu.",
   "account.followers_counter": "{count, plural, one {{counter} følger} other {{counter} følgere}}",
   "account.following": "Følger",
+  "account.following_counter": "{count, plural, one {{counter} følger} other {{counter} følger}}",
   "account.follows.empty": "Denne bruger følger ikke nogen endnu.",
   "account.go_to_profile": "Gå til profil",
   "account.hide_reblogs": "Skjul boosts fra @{name}",
@@ -62,6 +63,7 @@
   "account.requested_follow": "{name} har anmodet om at følge dig",
   "account.share": "Del @{name}s profil",
   "account.show_reblogs": "Vis fremhævelser fra @{name}",
+  "account.statuses_counter": "{count, plural, one {{counter} indlæg} other {{counter} indlæg}}",
   "account.unblock": "Afblokér @{name}",
   "account.unblock_domain": "Afblokér domænet {domain}",
   "account.unblock_short": "Afblokér",
@@ -441,6 +443,8 @@
   "mute_modal.title": "Tavsgør bruger?",
   "mute_modal.you_wont_see_mentions": "Indlæg, som nævner vedkommende, vises ikke.",
   "mute_modal.you_wont_see_posts": "Vedkommende kan stadig se dine indlæg, med vedkommendes vise ikke.",
+  "name_and_others": "{name} og {count, plural, one {# anden} other {# andre}}",
+  "name_and_others_with_link": "{name} og <a>{count, plural, one {# anden} other {# andre}}</a>",
   "navigation_bar.about": "Om",
   "navigation_bar.advanced_interface": "Åbn i avanceret webgrænseflade",
   "navigation_bar.blocks": "Blokerede brugere",
@@ -468,6 +472,10 @@
   "navigation_bar.security": "Sikkerhed",
   "not_signed_in_indicator.not_signed_in": "Log ind for at tilgå denne ressource.",
   "notification.admin.report": "{name} anmeldte {target}",
+  "notification.admin.report_account": "{name} anmeldte {count, plural, one {et indlæg} other {# indlæg}} fra {target} angående {category}",
+  "notification.admin.report_account_other": "{name} anmeldte {count, plural, one {et indlæg} other {# indlæg}} fra {target}",
+  "notification.admin.report_statuses": "{name} anmeldte {target} angående {category}",
+  "notification.admin.report_statuses_other": "{name} anmeldte {target}",
   "notification.admin.sign_up": "{name} tilmeldte sig",
   "notification.favourite": "{name} favoritmarkerede dit indlæg",
   "notification.follow": "{name} begyndte at følge dig",
@@ -483,7 +491,8 @@
   "notification.moderation_warning.action_silence": "Din konto er blevet begrænset.",
   "notification.moderation_warning.action_suspend": "Din konto er suspenderet.",
   "notification.own_poll": "Din afstemning er afsluttet",
-  "notification.poll": "En afstemning, hvori du stemte, er slut",
+  "notification.poll": "En afstemning, hvori du har stemt, er slut",
+  "notification.private_mention": "{name} nævnte dig privat",
   "notification.reblog": "{name} boostede dit indlæg",
   "notification.relationships_severance_event": "Mistede forbindelser med {name}",
   "notification.relationships_severance_event.account_suspension": "En admin fra {from} har suspenderet {target}, hvofor opdateringer herfra eller interaktion hermed ikke længer er mulig.",
@@ -501,6 +510,8 @@
   "notifications.column_settings.admin.report": "Nye anmeldelser:",
   "notifications.column_settings.admin.sign_up": "Nye tilmeldinger:",
   "notifications.column_settings.alert": "Computernotifikationer",
+  "notifications.column_settings.beta.category": "Eksperimentelle funktioner",
+  "notifications.column_settings.beta.grouping": "Gruppér notifikationer",
   "notifications.column_settings.favourite": "Favoritter:",
   "notifications.column_settings.filter_bar.advanced": "Vis alle kategorier",
   "notifications.column_settings.filter_bar.category": "Hurtigfiltreringsbjælke",
@@ -664,9 +675,13 @@
   "report.unfollow_explanation": "Du følger denne konto. For ikke længere at se vedkommendes indlæg i dit hjemmefeed, kan du stoppe med at følge dem.",
   "report_notification.attached_statuses": "{count, plural, one {{count} post} other {{count} poster}} vedhæftet",
   "report_notification.categories.legal": "Juridisk",
+  "report_notification.categories.legal_sentence": "ikke-tilladt indhold",
   "report_notification.categories.other": "Andre",
+  "report_notification.categories.other_sentence": "andet",
   "report_notification.categories.spam": "Spam",
+  "report_notification.categories.spam_sentence": "spam",
   "report_notification.categories.violation": "Regelovertrædelse",
+  "report_notification.categories.violation_sentence": "regelovertrædelse",
   "report_notification.open": "Åbn anmeldelse",
   "search.no_recent_searches": "Ingen seneste søgninger",
   "search.placeholder": "Søg",
@@ -694,8 +709,11 @@
   "server_banner.about_active_users": "Folk, som brugte denne server de seneste 30 dage (månedlige aktive brugere)",
   "server_banner.active_users": "aktive brugere",
   "server_banner.administered_by": "Håndteres af:",
+  "server_banner.is_one_of_many": "{domain} er en af de mange uafhængige Mastodon-servere, man kan bruge for at deltage i fediverset.",
   "server_banner.server_stats": "Serverstatstik:",
   "sign_in_banner.create_account": "Opret konto",
+  "sign_in_banner.follow_anyone": "Følg alle på tværs af fediverset og se alt i kronologisk rækkefølge. Ingen algoritmer, annoncer eller clickbait i syne.",
+  "sign_in_banner.mastodon_is": "Mastodon er den bedste måde at holde sig ajour med, hvad der sker.",
   "sign_in_banner.sign_in": "Log ind",
   "sign_in_banner.sso_redirect": "Log ind eller Tilmeld",
   "status.admin_account": "Åbn modereringsbrugerflade for @{name}",
diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json
index 0f3b3c91a9bfd0..3ba058b9a74618 100644
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@@ -443,6 +443,8 @@
   "mute_modal.title": "Profil stummschalten?",
   "mute_modal.you_wont_see_mentions": "Du wirst keine Beiträge sehen, die dieses Profil erwähnen.",
   "mute_modal.you_wont_see_posts": "Deine Beiträge können weiterhin angesehen werden, aber du wirst deren Beiträge nicht mehr sehen.",
+  "name_and_others": "{name} und {count, plural, one {# weitere Person} other {# weitere Personen}}",
+  "name_and_others_with_link": "{name} und <a>{count, plural, one {# weitere Person} other {# weitere Personen}}</a>",
   "navigation_bar.about": "Über",
   "navigation_bar.advanced_interface": "Im erweiterten Webinterface öffnen",
   "navigation_bar.blocks": "Blockierte Profile",
@@ -470,6 +472,10 @@
   "navigation_bar.security": "Sicherheit",
   "not_signed_in_indicator.not_signed_in": "Du musst dich anmelden, um auf diesen Inhalt zugreifen zu können.",
   "notification.admin.report": "{name} meldete {target}",
+  "notification.admin.report_account": "{name} meldete {count, plural, one {einen Beitrag} other {# Beiträge}} von {target} wegen {category}",
+  "notification.admin.report_account_other": "{name} meldete {count, plural, one {einen Beitrag} other {# Beiträge}} von {target}",
+  "notification.admin.report_statuses": "{name} meldete {target} wegen {category}",
+  "notification.admin.report_statuses_other": "{name} meldete {target}",
   "notification.admin.sign_up": "{name} registrierte sich",
   "notification.favourite": "{name} favorisierte deinen Beitrag",
   "notification.follow": "{name} folgt dir",
@@ -486,6 +492,7 @@
   "notification.moderation_warning.action_suspend": "Dein Konto wurde gesperrt.",
   "notification.own_poll": "Deine Umfrage ist beendet",
   "notification.poll": "Eine Umfrage, an der du teilgenommen hast, ist beendet",
+  "notification.private_mention": "{name} hat dich privat erwähnt",
   "notification.reblog": "{name} teilte deinen Beitrag",
   "notification.relationships_severance_event": "Verbindungen mit {name} verloren",
   "notification.relationships_severance_event.account_suspension": "Ein Admin von {from} hat {target} gesperrt. Du wirst von diesem Profil keine Updates mehr erhalten und auch nicht mit ihm interagieren können.",
@@ -503,6 +510,8 @@
   "notifications.column_settings.admin.report": "Neue Meldungen:",
   "notifications.column_settings.admin.sign_up": "Neue Registrierungen:",
   "notifications.column_settings.alert": "Desktop-Benachrichtigungen",
+  "notifications.column_settings.beta.category": "Experimentelle Funktionen",
+  "notifications.column_settings.beta.grouping": "Benachrichtigungen gruppieren",
   "notifications.column_settings.favourite": "Favoriten:",
   "notifications.column_settings.filter_bar.advanced": "Alle Filterkategorien anzeigen",
   "notifications.column_settings.filter_bar.category": "Filterleiste",
@@ -644,7 +653,7 @@
   "report.placeholder": "Ergänzende Hinweise",
   "report.reasons.dislike": "Das gefällt mir nicht",
   "report.reasons.dislike_description": "Das ist etwas, das du nicht sehen möchtest",
-  "report.reasons.legal": "Das ist illegal",
+  "report.reasons.legal": "Das ist rechtswidrig",
   "report.reasons.legal_description": "Du glaubst, dass es gegen die Gesetze deines Landes oder des Landes des Servers verstößt",
   "report.reasons.other": "Es ist etwas anderes",
   "report.reasons.other_description": "Der Vorfall passt zu keiner dieser Kategorien",
@@ -666,9 +675,13 @@
   "report.unfollow_explanation": "Du folgst diesem Konto. Um die Beiträge nicht mehr auf deiner Startseite zu sehen, entfolge dem Konto.",
   "report_notification.attached_statuses": "{count, plural, one {{count} angehangener Beitrag} other {{count} angehängte Beiträge}}",
   "report_notification.categories.legal": "Rechtliches",
+  "report_notification.categories.legal_sentence": "rechtswidrigem Inhalt",
   "report_notification.categories.other": "Nicht aufgeführt",
+  "report_notification.categories.other_sentence": "etwas anderem",
   "report_notification.categories.spam": "Spam",
+  "report_notification.categories.spam_sentence": "Spam",
   "report_notification.categories.violation": "Regelverstoß",
+  "report_notification.categories.violation_sentence": "Regelverletzung",
   "report_notification.open": "Meldung öffnen",
   "search.no_recent_searches": "Keine früheren Suchanfragen",
   "search.placeholder": "Suche",
diff --git a/app/javascript/mastodon/locales/el.json b/app/javascript/mastodon/locales/el.json
index 5442624b36881a..3c0ef467bfd26e 100644
--- a/app/javascript/mastodon/locales/el.json
+++ b/app/javascript/mastodon/locales/el.json
@@ -389,7 +389,6 @@
   "notification.follow_request": "Ο/H {name} ζήτησε να σε ακολουθήσει",
   "notification.mention": "Ο/Η {name} σε επισήμανε",
   "notification.own_poll": "Η δημοσκόπησή σου έληξε",
-  "notification.poll": "Τελείωσε μια από τις δημοσκοπήσεις που συμμετείχες",
   "notification.reblog": "Ο/Η {name} ενίσχυσε τη δημοσίευσή σου",
   "notification.status": "Ο/Η {name} μόλις ανέρτησε κάτι",
   "notification.update": "ο/η {name} επεξεργάστηκε μια ανάρτηση",
diff --git a/app/javascript/mastodon/locales/en-GB.json b/app/javascript/mastodon/locales/en-GB.json
index 94d7defc7ee456..6143c6e1ca09a2 100644
--- a/app/javascript/mastodon/locales/en-GB.json
+++ b/app/javascript/mastodon/locales/en-GB.json
@@ -485,7 +485,6 @@
   "notification.moderation_warning.action_silence": "Your account has been limited.",
   "notification.moderation_warning.action_suspend": "Your account has been suspended.",
   "notification.own_poll": "Your poll has ended",
-  "notification.poll": "A poll you have voted in has ended",
   "notification.reblog": "{name} boosted your status",
   "notification.relationships_severance_event": "Lost connections with {name}",
   "notification.relationships_severance_event.account_suspension": "An admin from {from} has suspended {target}, which means you can no longer receive updates from them or interact with them.",
diff --git a/app/javascript/mastodon/locales/eo.json b/app/javascript/mastodon/locales/eo.json
index e7cfc03468140e..211f4ad8d91677 100644
--- a/app/javascript/mastodon/locales/eo.json
+++ b/app/javascript/mastodon/locales/eo.json
@@ -405,7 +405,6 @@
   "notification.follow_request": "{name} petis sekvi vin",
   "notification.mention": "{name} menciis vin",
   "notification.own_poll": "Via enketo finiĝis",
-  "notification.poll": "Partoprenita balotenketo finiĝis",
   "notification.reblog": "{name} diskonigis vian afiŝon",
   "notification.status": "{name} ĵus afiŝis",
   "notification.update": "{name} redaktis afiŝon",
diff --git a/app/javascript/mastodon/locales/es-AR.json b/app/javascript/mastodon/locales/es-AR.json
index 28e8de92374547..2e22865493f08a 100644
--- a/app/javascript/mastodon/locales/es-AR.json
+++ b/app/javascript/mastodon/locales/es-AR.json
@@ -443,6 +443,8 @@
   "mute_modal.title": "¿Silenciar usuario?",
   "mute_modal.you_wont_see_mentions": "No verás mensajes que los mencionen.",
   "mute_modal.you_wont_see_posts": "Todavía pueden ver tus mensajes, pero vos no verás los suyos.",
+  "name_and_others": "{name} y {count, plural, one {# cuenta más} other {# cuentas más}}",
+  "name_and_others_with_link": "{name} y <a>{count, plural, one {# cuenta más} other {# cuentas más}}</a>",
   "navigation_bar.about": "Información",
   "navigation_bar.advanced_interface": "Abrir en interface web avanzada",
   "navigation_bar.blocks": "Usuarios bloqueados",
@@ -470,6 +472,10 @@
   "navigation_bar.security": "Seguridad",
   "not_signed_in_indicator.not_signed_in": "Necesitás iniciar sesión para acceder a este recurso.",
   "notification.admin.report": "{name} denunció a {target}",
+  "notification.admin.report_account": "{name} denunció {count, plural, one {un mensaje} other {# mensajes}} de {target} por {category}",
+  "notification.admin.report_account_other": "{name} denunció {count, plural, one {un mensaje} other {# mensajes}} de {target}",
+  "notification.admin.report_statuses": "{name} denunció a {target} por {category}",
+  "notification.admin.report_statuses_other": "{name} denunció a {target}",
   "notification.admin.sign_up": "Se registró {name}",
   "notification.favourite": "{name} marcó tu mensaje como favorito",
   "notification.follow": "{name} te empezó a seguir",
@@ -486,6 +492,7 @@
   "notification.moderation_warning.action_suspend": "Tu cuenta fue suspendida.",
   "notification.own_poll": "Tu encuesta finalizó",
   "notification.poll": "Finalizó una encuesta en la que votaste",
+  "notification.private_mention": "{name} te mencionó en privado",
   "notification.reblog": "{name} adhirió a tu mensaje",
   "notification.relationships_severance_event": "Conexiones perdidas con {name}",
   "notification.relationships_severance_event.account_suspension": "Un administrador de {from} suspendió a {target}, lo que significa que ya no podés recibir actualizaciones de esa cuenta o interactuar con la misma.",
@@ -503,6 +510,8 @@
   "notifications.column_settings.admin.report": "Nuevas denuncias:",
   "notifications.column_settings.admin.sign_up": "Nuevos registros:",
   "notifications.column_settings.alert": "Notificaciones de escritorio",
+  "notifications.column_settings.beta.category": "Funciones experimentales",
+  "notifications.column_settings.beta.grouping": "Agrupar notificaciones",
   "notifications.column_settings.favourite": "Favoritos:",
   "notifications.column_settings.filter_bar.advanced": "Mostrar todas las categorías",
   "notifications.column_settings.filter_bar.category": "Barra de filtrado rápido",
@@ -666,9 +675,13 @@
   "report.unfollow_explanation": "Estás siguiendo a esta cuenta. Para no ver sus mensajes en tu línea temporal principal, dejá de seguirla.",
   "report_notification.attached_statuses": "{count, plural, one {{count} mensaje adjunto} other {{count} mensajes adjuntos}}",
   "report_notification.categories.legal": "Legal",
+  "report_notification.categories.legal_sentence": "contenido ilegal",
   "report_notification.categories.other": "Otros",
+  "report_notification.categories.other_sentence": "[otras categorías]",
   "report_notification.categories.spam": "Spam",
+  "report_notification.categories.spam_sentence": "spam",
   "report_notification.categories.violation": "Violación de regla",
+  "report_notification.categories.violation_sentence": "violación de regla",
   "report_notification.open": "Abrir denuncia",
   "search.no_recent_searches": "Sin búsquedas recientes",
   "search.placeholder": "Buscar",
diff --git a/app/javascript/mastodon/locales/es-MX.json b/app/javascript/mastodon/locales/es-MX.json
index c10a1610155fa3..837bbbc2cea639 100644
--- a/app/javascript/mastodon/locales/es-MX.json
+++ b/app/javascript/mastodon/locales/es-MX.json
@@ -443,6 +443,8 @@
   "mute_modal.title": "¿Silenciar usuario?",
   "mute_modal.you_wont_see_mentions": "No verás publicaciones que los mencionen.",
   "mute_modal.you_wont_see_posts": "Todavía pueden ver tus publicaciones, pero tú no verás las de ellos.",
+  "name_and_others": "{name} y {count, plural, one {# más} other {# más}}",
+  "name_and_others_with_link": "{name} y <a>{count, plural, one {# más} other {# más}}</a>",
   "navigation_bar.about": "Acerca de",
   "navigation_bar.advanced_interface": "Abrir en interfaz web avanzada",
   "navigation_bar.blocks": "Usuarios bloqueados",
@@ -470,6 +472,10 @@
   "navigation_bar.security": "Seguridad",
   "not_signed_in_indicator.not_signed_in": "Necesitas iniciar sesión para acceder a este recurso.",
   "notification.admin.report": "{name} denunció a {target}",
+  "notification.admin.report_account": "{name} informó de {count, plural, one {una publicación} other {# publicaciones}} de {target} por {category}",
+  "notification.admin.report_account_other": "{name} informó de {count, plural, one {una publicación} other {# publicaciones}} de {target}",
+  "notification.admin.report_statuses": "{name} informó de {target} por {category}",
+  "notification.admin.report_statuses_other": "{name} informó de {target}",
   "notification.admin.sign_up": "{name} se unio",
   "notification.favourite": "{name} marcó como favorita tu publicación",
   "notification.follow": "{name} te empezó a seguir",
@@ -485,7 +491,8 @@
   "notification.moderation_warning.action_silence": "Tu cuenta ha sido limitada.",
   "notification.moderation_warning.action_suspend": "Tu cuenta ha sido suspendida.",
   "notification.own_poll": "Tu encuesta ha terminado",
-  "notification.poll": "Una encuesta en la que has votado ha terminado",
+  "notification.poll": "Una encuesta ha terminado",
+  "notification.private_mention": "{name} te mencionó en privado",
   "notification.reblog": "{name} ha retooteado tu estado",
   "notification.relationships_severance_event": "Conexiones perdidas con {name}",
   "notification.relationships_severance_event.account_suspension": "Un administrador de {from} ha suspendido {target}, lo que significa que ya no puedes recibir actualizaciones de sus cuentas o interactuar con ellas.",
@@ -503,6 +510,8 @@
   "notifications.column_settings.admin.report": "Nuevas denuncias:",
   "notifications.column_settings.admin.sign_up": "Registros nuevos:",
   "notifications.column_settings.alert": "Notificaciones de escritorio",
+  "notifications.column_settings.beta.category": "Características experimentales",
+  "notifications.column_settings.beta.grouping": "Agrupar notificaciones",
   "notifications.column_settings.favourite": "Favoritos:",
   "notifications.column_settings.filter_bar.advanced": "Mostrar todas las categorías",
   "notifications.column_settings.filter_bar.category": "Barra de filtrado rápido",
@@ -666,9 +675,13 @@
   "report.unfollow_explanation": "Estás siguiendo esta cuenta. Para no ver sus publicaciones en tu inicio, deja de seguirla.",
   "report_notification.attached_statuses": "{count, plural, one {{count} publicación} other {{count} publicaciones}} adjunta(s)",
   "report_notification.categories.legal": "Legal",
+  "report_notification.categories.legal_sentence": "contenido ilegal",
   "report_notification.categories.other": "Otro",
+  "report_notification.categories.other_sentence": "otra",
   "report_notification.categories.spam": "Spam",
+  "report_notification.categories.spam_sentence": "spam",
   "report_notification.categories.violation": "Infracción de regla",
+  "report_notification.categories.violation_sentence": "infracción de regla",
   "report_notification.open": "Abrir denuncia",
   "search.no_recent_searches": "Sin búsquedas recientes",
   "search.placeholder": "Buscar",
diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json
index 259fc1795b373a..a6cecf160567a3 100644
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@@ -443,6 +443,8 @@
   "mute_modal.title": "¿Silenciar usuario?",
   "mute_modal.you_wont_see_mentions": "No verás mensajes que los mencionen.",
   "mute_modal.you_wont_see_posts": "Todavía pueden ver tus publicaciones, pero tú no verás las suyas.",
+  "name_and_others": "{name} y {count, plural, one {# más} other {# más}}",
+  "name_and_others_with_link": "{name} y <a>{count, plural, one {# más} other {# más}}</a>",
   "navigation_bar.about": "Acerca de",
   "navigation_bar.advanced_interface": "Abrir en la interfaz web avanzada",
   "navigation_bar.blocks": "Usuarios bloqueados",
@@ -470,6 +472,10 @@
   "navigation_bar.security": "Seguridad",
   "not_signed_in_indicator.not_signed_in": "Necesitas iniciar sesión para acceder a este recurso.",
   "notification.admin.report": "{name} informó {target}",
+  "notification.admin.report_account": "{name} informó de {count, plural, one {una publicación} other {# publicaciones}} de {target} por {category}",
+  "notification.admin.report_account_other": "{name} informó de {count, plural, one {una publicación} other {# publicaciones}} de {target}",
+  "notification.admin.report_statuses": "{name} informó de {target} por {category}",
+  "notification.admin.report_statuses_other": "{name} informó de {target}",
   "notification.admin.sign_up": "{name} se registró",
   "notification.favourite": "{name} marcó como favorita tu publicación",
   "notification.follow": "{name} te empezó a seguir",
@@ -485,7 +491,8 @@
   "notification.moderation_warning.action_silence": "Tu cuenta ha sido limitada.",
   "notification.moderation_warning.action_suspend": "Tu cuenta ha sido suspendida.",
   "notification.own_poll": "Tu encuesta ha terminado",
-  "notification.poll": "Una encuesta en la que has votado ha terminado",
+  "notification.poll": "Una encuesta ha terminado",
+  "notification.private_mention": "{name} te mencionó en privado",
   "notification.reblog": "{name} ha impulsado tu publicación",
   "notification.relationships_severance_event": "Conexiones perdidas con {name}",
   "notification.relationships_severance_event.account_suspension": "Un administrador de {from} ha suspendido {target}, lo que significa que ya no puedes recibir actualizaciones de sus cuentas o interactuar con ellas.",
@@ -503,6 +510,8 @@
   "notifications.column_settings.admin.report": "Nuevos informes:",
   "notifications.column_settings.admin.sign_up": "Nuevos registros:",
   "notifications.column_settings.alert": "Notificaciones de escritorio",
+  "notifications.column_settings.beta.category": "Características experimentales",
+  "notifications.column_settings.beta.grouping": "Agrupar notificaciones",
   "notifications.column_settings.favourite": "Favoritos:",
   "notifications.column_settings.filter_bar.advanced": "Mostrar todas las categorías",
   "notifications.column_settings.filter_bar.category": "Barra de filtrado rápido",
@@ -666,9 +675,13 @@
   "report.unfollow_explanation": "Estás siguiendo esta cuenta. Para no ver sus publicaciones en tu muro de inicio, deja de seguirla.",
   "report_notification.attached_statuses": "{count, plural, one {{count} publicación} other {{count} publicaciones}} adjunta(s)",
   "report_notification.categories.legal": "Legal",
+  "report_notification.categories.legal_sentence": "contenido ilegal",
   "report_notification.categories.other": "Otros",
+  "report_notification.categories.other_sentence": "otra",
   "report_notification.categories.spam": "Spam",
+  "report_notification.categories.spam_sentence": "spam",
   "report_notification.categories.violation": "Infracción de regla",
+  "report_notification.categories.violation_sentence": "infracción de regla",
   "report_notification.open": "Abrir informe",
   "search.no_recent_searches": "No hay búsquedas recientes",
   "search.placeholder": "Buscar",
diff --git a/app/javascript/mastodon/locales/et.json b/app/javascript/mastodon/locales/et.json
index 94f5ef5d9eef52..b07229adece46c 100644
--- a/app/javascript/mastodon/locales/et.json
+++ b/app/javascript/mastodon/locales/et.json
@@ -482,7 +482,6 @@
   "notification.moderation_warning.action_silence": "Su kontole pandi piirang.",
   "notification.moderation_warning.action_suspend": "Su konto on peatatud.",
   "notification.own_poll": "Su küsitlus on lõppenud",
-  "notification.poll": "Küsitlus, milles osalesid, on lõppenud",
   "notification.reblog": "{name} jagas edasi postitust",
   "notification.relationships_severance_event": "Kadunud ühendus kasutajaga {name}",
   "notification.relationships_severance_event.account_suspension": "{from} admin on kustutanud {target}, mis tähendab, et sa ei saa enam neilt uuendusi või suhelda nendega.",
diff --git a/app/javascript/mastodon/locales/eu.json b/app/javascript/mastodon/locales/eu.json
index 97c4250d225b23..bd1b51ba3e5f1d 100644
--- a/app/javascript/mastodon/locales/eu.json
+++ b/app/javascript/mastodon/locales/eu.json
@@ -480,7 +480,6 @@
   "notification.moderation_warning.action_silence": "Kontua murriztu egin da.",
   "notification.moderation_warning.action_suspend": "Kontua itxi da.",
   "notification.own_poll": "Zure inkesta amaitu da",
-  "notification.poll": "Zuk erantzun duzun inkesta bat bukatu da",
   "notification.reblog": "{name}(e)k bultzada eman dio zure bidalketari",
   "notification.relationships_severance_event": "{name} erabiltzailearekin galdutako konexioak",
   "notification.relationships_severance_event.account_suspension": "{from} zerbitzariko administratzaile batek {target} bertan behera utzi du, hau da, ezin izango dituzu jaso hango eguneratzerik edo hangoekin elkarreragin.",
diff --git a/app/javascript/mastodon/locales/fa.json b/app/javascript/mastodon/locales/fa.json
index 18f6466d4873fc..9dc429f7de861f 100644
--- a/app/javascript/mastodon/locales/fa.json
+++ b/app/javascript/mastodon/locales/fa.json
@@ -424,7 +424,6 @@
   "notification.follow_request": "{name} درخواست پی‌گیریتان را داد",
   "notification.mention": "‫{name}‬ به شما اشاره کرد",
   "notification.own_poll": "نظرسنجیتان پایان یافت",
-  "notification.poll": "نظرسنجی‌ای که در آن رأی دادید به پایان رسیده است",
   "notification.reblog": "‫{name}‬ فرسته‌تان را تقویت کرد",
   "notification.status": "{name} چیزی فرستاد",
   "notification.update": "{name} فرسته‌ای را ویرایش کرد",
diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index 0767dd5e37cf63..4b330ec60b4c11 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -485,7 +485,6 @@
   "notification.moderation_warning.action_silence": "Tiliäsi on rajoitettu.",
   "notification.moderation_warning.action_suspend": "Tilisi on jäädytetty.",
   "notification.own_poll": "Äänestyksesi on päättynyt",
-  "notification.poll": "Kysely, johon osallistuit, on päättynyt",
   "notification.reblog": "{name} tehosti julkaisuasi",
   "notification.relationships_severance_event": "Menetettiin yhteydet palvelimeen {name}",
   "notification.relationships_severance_event.account_suspension": "Palvelimen {from} ylläpitäjä on jäädyttänyt palvelimen {target} vuorovaikutuksen. Enää et voi siis vastaanottaa päivityksiä heiltä tai olla yhteyksissä heidän kanssaan.",
diff --git a/app/javascript/mastodon/locales/fo.json b/app/javascript/mastodon/locales/fo.json
index c27ffe0aa7d1ff..dd3d448834e06a 100644
--- a/app/javascript/mastodon/locales/fo.json
+++ b/app/javascript/mastodon/locales/fo.json
@@ -443,6 +443,8 @@
   "mute_modal.title": "Sløkk brúkara?",
   "mute_modal.you_wont_see_mentions": "Tú sært ikki postar, sum nevna tey.",
   "mute_modal.you_wont_see_posts": "Tey síggja framvegis tínar postar, men tú sært ikki teirra.",
+  "name_and_others": "{name} og {count, plural, one {# annar} other {# onnur}}",
+  "name_and_others_with_link": "{name} og <a>{count, plural, one {# annar} other {# onnur}}</a>",
   "navigation_bar.about": "Um",
   "navigation_bar.advanced_interface": "Lat upp í framkomnum vevmarkamóti",
   "navigation_bar.blocks": "Bannaðir brúkarar",
@@ -470,6 +472,10 @@
   "navigation_bar.security": "Trygd",
   "not_signed_in_indicator.not_signed_in": "Tú mást rita inn fyri at fáa atgongd til hetta tilfarið.",
   "notification.admin.report": "{name} hevur meldað {target}",
+  "notification.admin.report_account": "{name} meldaði {count, plural, one {ein post} other {# postar}} frá {target} fyri {category}",
+  "notification.admin.report_account_other": "{name} meldaði {count, plural, one {ein post} other {# postar}} frá {target}",
+  "notification.admin.report_statuses": "{name} melaði {target} fyri {category}",
+  "notification.admin.report_statuses_other": "{name} meldaði {target}",
   "notification.admin.sign_up": "{name} meldaði seg til",
   "notification.favourite": "{name} dámdi postin hjá tær",
   "notification.follow": "{name} fylgdi tær",
@@ -485,7 +491,8 @@
   "notification.moderation_warning.action_silence": "Konta tín er avmarkað.",
   "notification.moderation_warning.action_suspend": "Konta tín er ógildað.",
   "notification.own_poll": "Tín atkvøðugreiðsla er endað",
-  "notification.poll": "Ein atkvøðugreiðsla, har tú hevur atkvøtt, er endað",
+  "notification.poll": "Ein atkvøðugreiðsla, har tú atkvøddi, er endað",
+  "notification.private_mention": "{name} nevndi teg í privatum boðum",
   "notification.reblog": "{name} lyfti tín post",
   "notification.relationships_severance_event": "Mist sambond við {name}",
   "notification.relationships_severance_event.account_suspension": "Ein umsitari frá {from} hevur gjørt {target} óvirkna, sum merkir, at tú ikki kanst móttaka dagføringar ella virka saman við teimum longur.",
@@ -503,6 +510,8 @@
   "notifications.column_settings.admin.report": "Nýggjar fráboðanir:",
   "notifications.column_settings.admin.sign_up": "Nýggjar tilmeldingar:",
   "notifications.column_settings.alert": "Skriviborðsfráboðanir",
+  "notifications.column_settings.beta.category": "Royndarhentleikar",
+  "notifications.column_settings.beta.grouping": "Bólkafráboðanir",
   "notifications.column_settings.favourite": "Dámdir postar:",
   "notifications.column_settings.filter_bar.advanced": "Vís allar bólkar",
   "notifications.column_settings.filter_bar.category": "Skjótfilturbjálki",
@@ -666,9 +675,13 @@
   "report.unfollow_explanation": "Tú fylgir hesi kontuni. Gevst at fylgja henni, um tú ikki longur ynskir at síggja postarnar á heimarásini hjá tær.",
   "report_notification.attached_statuses": "{count, plural, one {{count} postur atknýttur} other {{count} postar atknýttir}}",
   "report_notification.categories.legal": "Løgfrøðisligt",
+  "report_notification.categories.legal_sentence": "ólógligt innihald",
   "report_notification.categories.other": "Aðrir",
+  "report_notification.categories.other_sentence": "aðrir",
   "report_notification.categories.spam": "Ruskpostur",
+  "report_notification.categories.spam_sentence": "ruskpostur",
   "report_notification.categories.violation": "Brotin regla",
+  "report_notification.categories.violation_sentence": "brot á reglu",
   "report_notification.open": "Opna melding",
   "search.no_recent_searches": "Ongar nýggjar leitingar",
   "search.placeholder": "Leita",
diff --git a/app/javascript/mastodon/locales/fr-CA.json b/app/javascript/mastodon/locales/fr-CA.json
index 4324855003fda2..94b73bbf18235d 100644
--- a/app/javascript/mastodon/locales/fr-CA.json
+++ b/app/javascript/mastodon/locales/fr-CA.json
@@ -466,7 +466,6 @@
   "notification.follow_request": "{name} a demandé à vous suivre",
   "notification.mention": "{name} vous a mentionné·e",
   "notification.own_poll": "Votre sondage est terminé",
-  "notification.poll": "Un sondage auquel vous avez participé est terminé",
   "notification.reblog": "{name} a boosté votre message",
   "notification.relationships_severance_event": "Connexions perdues avec {name}",
   "notification.relationships_severance_event.account_suspension": "Un·e administrateur·rice de {from} a suspendu {target}, ce qui signifie que vous ne pourrez plus recevoir de mises à jour ou interagir avec lui.",
diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json
index cd67cda539a06a..fd256fe7168688 100644
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@@ -466,7 +466,6 @@
   "notification.follow_request": "{name} a demandé à vous suivre",
   "notification.mention": "{name} vous a mentionné·e :",
   "notification.own_poll": "Votre sondage est terminé",
-  "notification.poll": "Un sondage auquel vous avez participé vient de se terminer",
   "notification.reblog": "{name} a partagé votre message",
   "notification.relationships_severance_event": "Connexions perdues avec {name}",
   "notification.relationships_severance_event.account_suspension": "Un·e administrateur·rice de {from} a suspendu {target}, ce qui signifie que vous ne pourrez plus recevoir de mises à jour ou interagir avec lui.",
diff --git a/app/javascript/mastodon/locales/fy.json b/app/javascript/mastodon/locales/fy.json
index d787c16bf3b729..a04a5b25bf6e8f 100644
--- a/app/javascript/mastodon/locales/fy.json
+++ b/app/javascript/mastodon/locales/fy.json
@@ -455,7 +455,6 @@
   "notification.follow_request": "{name} hat dy in folchfersyk stjoerd",
   "notification.mention": "{name} hat dy fermeld",
   "notification.own_poll": "Jo poll is beëinige",
-  "notification.poll": "In enkête dêr’t jo yn stimd hawwe is beëinige",
   "notification.reblog": "{name} hat jo berjocht boost",
   "notification.relationships_severance_event.learn_more": "Mear ynfo",
   "notification.status": "{name} hat in berjocht pleatst",
diff --git a/app/javascript/mastodon/locales/ga.json b/app/javascript/mastodon/locales/ga.json
index 8c5039e2a46b4f..711c97f66c7e1a 100644
--- a/app/javascript/mastodon/locales/ga.json
+++ b/app/javascript/mastodon/locales/ga.json
@@ -207,7 +207,7 @@
   "dismissable_banner.dismiss": "Diúltaigh",
   "dismissable_banner.explore_links": "Tá na scéalta nuachta seo á phlé anseo agus ar fhreastalaithe eile ar an líonra díláraithe faoi láthair.",
   "dismissable_banner.explore_statuses": "Is postálacha iad seo ó ar fud an ghréasáin shóisialta atá ag éirí níos tarraingtí inniu. Rangaítear poist níos nuaí le níos mó teanntáin agus ceanáin níos airde.",
-  "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.",
+  "dismissable_banner.explore_tags": "Is hashtags iad seo atá ag tarraingt ar an ngréasán sóisialta inniu. Tá na hashtags a úsáideann níos mó daoine difriúla rangaithe níos airde.",
   "dismissable_banner.public_timeline": "Seo iad na postálacha poiblí is déanaí ó dhaoine ar an ngréasán sóisialta a leanann daoine ar {domain}.",
   "domain_block_modal.block": "Bloc freastalaí",
   "domain_block_modal.block_account_instead": "Cuir bac ar @{name} ina ionad sin",
@@ -263,7 +263,7 @@
   "empty_column.followed_tags": "Níor lean tú aon hashtags fós. Nuair a dhéanann tú, beidh siad a thaispeáint suas anseo.",
   "empty_column.hashtag": "Níl rud ar bith faoin haischlib seo go fóill.",
   "empty_column.home": "Tá d'amlíne baile folamh! B'fhiú duit cúpla duine eile a leanúint lena líonadh! {suggestions}",
-  "empty_column.list": "There is nothing in this list yet. When members of this list post new statuses, they will appear here.",
+  "empty_column.list": "Níl aon rud ar an liosta seo fós. Nuair a fhoilseoidh baill an liosta seo postálacha nua, beidh siad le feiceáil anseo.",
   "empty_column.lists": "Níl aon liostaí fós agat. Nuair a chruthaíonn tú ceann, feicfear anseo é.",
   "empty_column.mutes": "Níl aon úsáideoir balbhaithe agat fós.",
   "empty_column.notification_requests": "Gach soiléir! Níl aon rud anseo. Nuair a gheobhaidh tú fógraí nua, beidh siad le feiceáil anseo de réir do shocruithe.",
@@ -298,7 +298,7 @@
   "filter_modal.select_filter.title": "Déan scagadh ar an bpostáil seo",
   "filter_modal.title.status": "Déan scagadh ar phostáil",
   "filtered_notifications_banner.mentions": "{count, plural, one {tagairt} other {tagairtí}}",
-  "filtered_notifications_banner.pending_requests": "Fógraí ó {count, plural, =0 {níl éinne} one {duine amháin} two {# daoine} few {# daoine} many {# daoine} other {# daoine}} b'fhéidir go mbeadh a fhios agat",
+  "filtered_notifications_banner.pending_requests": "Fógraí ó {count, plural, =0 {duine ar bith} one {duine amháin} two {# daoine} few {# daoine} many {# daoine} other {# daoine}} b'fhéidir go mbeadh a fhios agat",
   "filtered_notifications_banner.title": "Fógraí scagtha",
   "firehose.all": "Gach",
   "firehose.local": "An freastalaí seo",
@@ -340,7 +340,7 @@
   "hashtag.column_settings.tag_mode.all": "Iad seo go léir",
   "hashtag.column_settings.tag_mode.any": "Aon cheann díobh seo",
   "hashtag.column_settings.tag_mode.none": "Níl aon cheann díobh seo",
-  "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+  "hashtag.column_settings.tag_toggle": "Cuir clibeanna breise san áireamh don cholún seo",
   "hashtag.counter_by_accounts": "{count, plural, one {{counter} rannpháirtí} two {{counter} rannpháirtí} few {{counter} rannpháirtí} many {{counter} rannpháirtí} other {{counter} rannpháirtí}}",
   "hashtag.counter_by_uses": "{count, plural, one {{counter} post} two {{counter} post} few {{counter} post} many {{counter} post} other {{counter} poist}}",
   "hashtag.counter_by_uses_today": "{count, plural, one {{counter} post inniu} other {{counter} poist inniu}} inniu",
@@ -375,10 +375,10 @@
   "keyboard_shortcuts.back": "Nasclean siar",
   "keyboard_shortcuts.blocked": "Oscail liosta na n-úsáideoirí bactha",
   "keyboard_shortcuts.boost": "Treisigh postáil",
-  "keyboard_shortcuts.column": "to focus a status in one of the columns",
-  "keyboard_shortcuts.compose": "to focus the compose textarea",
+  "keyboard_shortcuts.column": "Colún fócas",
+  "keyboard_shortcuts.compose": "Fócas a chumadh textarea",
   "keyboard_shortcuts.description": "Cur síos",
-  "keyboard_shortcuts.direct": "to open direct messages column",
+  "keyboard_shortcuts.direct": "chun colún lua príobháideach a oscailt",
   "keyboard_shortcuts.down": "Bog síos ar an liosta",
   "keyboard_shortcuts.enter": "Oscail postáil",
   "keyboard_shortcuts.favourite": "Postáil is fearr leat",
@@ -387,12 +387,12 @@
   "keyboard_shortcuts.heading": "Aicearraí méarchláir",
   "keyboard_shortcuts.home": "Oscail amlíne bhaile",
   "keyboard_shortcuts.hotkey": "Eochair aicearra",
-  "keyboard_shortcuts.legend": "to display this legend",
+  "keyboard_shortcuts.legend": "Taispeáin an finscéal seo",
   "keyboard_shortcuts.local": "Oscail an amlíne áitiúil",
   "keyboard_shortcuts.mention": "Luaigh údar",
   "keyboard_shortcuts.muted": "Oscail liosta na n-úsáideoirí balbhaithe",
   "keyboard_shortcuts.my_profile": "Oscail do phróifíl",
-  "keyboard_shortcuts.notifications": "to open notifications column",
+  "keyboard_shortcuts.notifications": "Oscail colún fógraí",
   "keyboard_shortcuts.open_media": "Oscail meáin",
   "keyboard_shortcuts.pinned": "Oscail liosta postálacha pinn",
   "keyboard_shortcuts.profile": "Oscail próifíl an t-údar",
@@ -443,6 +443,8 @@
   "mute_modal.title": "An bhfuil fonn ort úsáideoir a bhalbhú?",
   "mute_modal.you_wont_see_mentions": "Ní fheicfidh tú postálacha a luann iad.",
   "mute_modal.you_wont_see_posts": "Is féidir leo do phoist a fheiceáil go fóill, ach ní fheicfidh tú a gcuid postanna.",
+  "name_and_others": "{name} and {count, plural, one {# eile} two {# eile} few {# eile} many {# eile} other {# eile}}",
+  "name_and_others_with_link": "{name} agus <a>{count, plural, one {# eile} two {# eile} few {# eile} many {# eile} other {# eile}}</a>",
   "navigation_bar.about": "Maidir le",
   "navigation_bar.advanced_interface": "Oscail i gcomhéadan gréasáin chun cinn",
   "navigation_bar.blocks": "Cuntais bhactha",
@@ -468,8 +470,12 @@
   "navigation_bar.public_timeline": "Amlíne cónaidhmithe",
   "navigation_bar.search": "Cuardaigh",
   "navigation_bar.security": "Slándáil",
-  "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
+  "not_signed_in_indicator.not_signed_in": "Ní mór duit logáil isteach chun rochtain a fháil ar an acmhainn seo.",
   "notification.admin.report": "Tuairiscigh {name} {target}",
+  "notification.admin.report_account": "{name} thuairiscigh {count, plural, one {aon phost} two {# phost} few {# phost} many {# bpost} other {# bpost}} ó {target} do {category}",
+  "notification.admin.report_account_other": "{name} thuairiscigh {count, plural, one {aon phost} two {# phost} few {# phost} many {# bpost} other {# bpost}} ó {target}",
+  "notification.admin.report_statuses": "Thuairiscigh {name} {target} le haghaidh {category}",
+  "notification.admin.report_statuses_other": "{name} tuairiscithe {target}",
   "notification.admin.sign_up": "Chláraigh {name}",
   "notification.favourite": "Is fearr le {name} do phostáil",
   "notification.follow": "Lean {name} thú",
@@ -485,7 +491,8 @@
   "notification.moderation_warning.action_silence": "Tá do chuntas teoranta.",
   "notification.moderation_warning.action_suspend": "Cuireadh do chuntas ar fionraí.",
   "notification.own_poll": "Tá do suirbhé críochnaithe",
-  "notification.poll": "Tá suirbhé inar vótáil tú tar éis críochnú",
+  "notification.poll": "Tá deireadh le vótaíocht inar vótáil tú",
+  "notification.private_mention": "luaigh {name} tú go príobháideach",
   "notification.reblog": "Mhol {name} do phostáil",
   "notification.relationships_severance_event": "Cailleadh naisc le {name}",
   "notification.relationships_severance_event.account_suspension": "Chuir riarthóir ó {from} {target} ar fionraí, rud a chiallaíonn nach féidir leat nuashonruithe a fháil uathu a thuilleadh ná idirghníomhú leo.",
@@ -503,6 +510,8 @@
   "notifications.column_settings.admin.report": "Tuairiscí nua:",
   "notifications.column_settings.admin.sign_up": "Clárúcháin nua:",
   "notifications.column_settings.alert": "Fógraí deisce",
+  "notifications.column_settings.beta.category": "Gnéithe turgnamhacha",
+  "notifications.column_settings.beta.grouping": "Fógraí grúpa",
   "notifications.column_settings.favourite": "Ceanáin:",
   "notifications.column_settings.filter_bar.advanced": "Taispeáin gach catagóir",
   "notifications.column_settings.filter_bar.category": "Barra scagairí tapa",
@@ -666,9 +675,13 @@
   "report.unfollow_explanation": "Tá tú ag leanúint an chuntais seo. Chun nach bhfeicfidh tú a bpoist i do fhotha baile a thuilleadh, dílean ​​iad.",
   "report_notification.attached_statuses": "{count, plural, one {# post} other {# posts}} attached",
   "report_notification.categories.legal": "Dlíthiúil",
+  "report_notification.categories.legal_sentence": "ábhar mídhleathach",
   "report_notification.categories.other": "Eile",
+  "report_notification.categories.other_sentence": "eile",
   "report_notification.categories.spam": "Turscar",
+  "report_notification.categories.spam_sentence": "turscar",
   "report_notification.categories.violation": "Sárú rialach",
+  "report_notification.categories.violation_sentence": "sárú riail",
   "report_notification.open": "Oscail tuairisc",
   "search.no_recent_searches": "Níl aon chuardach le déanaí",
   "search.placeholder": "Cuardaigh",
@@ -787,11 +800,11 @@
   "upload_button.label": "Cuir íomhánna, físeán nó comhad fuaime leis",
   "upload_error.limit": "Sáraíodh an teorainn uaslódála comhaid.",
   "upload_error.poll": "Ní cheadaítear uaslódáil comhad le pobalbhreith.",
-  "upload_form.audio_description": "Describe for people with hearing loss",
+  "upload_form.audio_description": "Déan cur síos ar dhaoine bodhra nó lagéisteachta",
   "upload_form.description": "Describe for the visually impaired",
   "upload_form.edit": "Cuir in eagar",
   "upload_form.thumbnail": "Athraigh mionsamhail",
-  "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
+  "upload_form.video_description": "Déan cur síos ar dhaoine atá bodhar, lagéisteachta, dall nó lagamhairc",
   "upload_modal.analyzing_picture": "Ag anailísiú íomhá…",
   "upload_modal.apply": "Cuir i bhFeidhm",
   "upload_modal.applying": "Á gcur i bhfeidhm…",
diff --git a/app/javascript/mastodon/locales/gd.json b/app/javascript/mastodon/locales/gd.json
index fec025045c9f78..93268c2715df0b 100644
--- a/app/javascript/mastodon/locales/gd.json
+++ b/app/javascript/mastodon/locales/gd.json
@@ -470,7 +470,6 @@
   "notification.mention": "Thug {name} iomradh ort",
   "notification.moderation-warning.learn_more": "Barrachd fiosrachaidh",
   "notification.own_poll": "Thàinig an cunntas-bheachd agad gu crìoch",
-  "notification.poll": "Thàinig cunntas-bheachd sa bhòt thu gu crìoch",
   "notification.reblog": "Bhrosnaich {name} am post agad",
   "notification.relationships_severance_event": "Chaill thu dàimhean le {name}",
   "notification.relationships_severance_event.account_suspension": "Chuir rianaire aig {from} {target} à rèim agus is ciall dha sin nach fhaigh thu naidheachdan uapa ’s nach urrainn dhut conaltradh leotha.",
diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json
index c1e0f97f804764..1f76ae951d20bd 100644
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@@ -485,7 +485,6 @@
   "notification.moderation_warning.action_silence": "A túa conta foi limitada.",
   "notification.moderation_warning.action_suspend": "A túa conta foi suspendida.",
   "notification.own_poll": "A túa enquisa rematou",
-  "notification.poll": "Rematou a enquisa na que votaches",
   "notification.reblog": "{name} compartiu a túa publicación",
   "notification.relationships_severance_event": "Perdeuse a conexión con {name}",
   "notification.relationships_severance_event.account_suspension": "A administración de {from} suspendeu a {target}, o que significa que xa non vas recibir actualizacións de esa conta ou interactuar con ela.",
diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json
index 8111a56e895f8c..148b3285ddb069 100644
--- a/app/javascript/mastodon/locales/he.json
+++ b/app/javascript/mastodon/locales/he.json
@@ -485,7 +485,6 @@
   "notification.moderation_warning.action_silence": "חשבונך הוגבל.",
   "notification.moderation_warning.action_suspend": "חשבונך הושעה.",
   "notification.own_poll": "הסקר שלך הסתיים",
-  "notification.poll": "סקר שהצבעת בו הסתיים",
   "notification.reblog": "הודעתך הודהדה על ידי {name}",
   "notification.relationships_severance_event": "אבד הקשר עם {name}",
   "notification.relationships_severance_event.account_suspension": "מנהל.ת משרת {from} השע(ת)ה את {target}, ולפיכך לא תעודכנו יותר על ידם ולא תוכלו להיות איתם בקשר.",
diff --git a/app/javascript/mastodon/locales/hr.json b/app/javascript/mastodon/locales/hr.json
index c8f6f018623394..5d087dae948b7b 100644
--- a/app/javascript/mastodon/locales/hr.json
+++ b/app/javascript/mastodon/locales/hr.json
@@ -342,7 +342,6 @@
   "notification.follow_request": "{name} zatražio/la je da Vas prati",
   "notification.mention": "{name} Vas je spomenuo",
   "notification.own_poll": "Vaša anketa je završila",
-  "notification.poll": "Anketa u kojoj ste glasali je završila",
   "notification.reblog": "{name} je boostao/la Vaš status",
   "notifications.clear": "Očisti obavijesti",
   "notifications.clear_confirmation": "Želite li zaista trajno očistiti sve Vaše obavijesti?",
diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json
index 1fcadc8f9c4730..fd9ce38eb120ac 100644
--- a/app/javascript/mastodon/locales/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@@ -443,6 +443,8 @@
   "mute_modal.title": "Elnémítsuk a felhasználót?",
   "mute_modal.you_wont_see_mentions": "Nem látsz majd őt említő bejegyzéseket.",
   "mute_modal.you_wont_see_posts": "Továbbra is látni fogja a bejegyzéseidet, de te nem fogod látni az övéit.",
+  "name_and_others": "{name} és {count, plural, one {# másik} other {# másik}}",
+  "name_and_others_with_link": "{name} és <a>{count, plural, one {# másik} other {# másik}}</a>",
   "navigation_bar.about": "Névjegy",
   "navigation_bar.advanced_interface": "Megnyitás a speciális webes felületben",
   "navigation_bar.blocks": "Letiltott felhasználók",
@@ -470,6 +472,10 @@
   "navigation_bar.security": "Biztonság",
   "not_signed_in_indicator.not_signed_in": "Az erőforrás eléréséhez be kell jelentkezned.",
   "notification.admin.report": "{name} jelentette: {target}",
+  "notification.admin.report_account": "{name} jelentett {count, plural, one {egy bejegyzést} other {# bejegyzést}} itt: {target}, ezért: {category}",
+  "notification.admin.report_account_other": "{name} jelentett {count, plural, one {egy bejegyzést} other {# bejegyzést}} itt: {target}",
+  "notification.admin.report_statuses": "{name} jelentette: {target}, ezért: {category}",
+  "notification.admin.report_statuses_other": "{name} jelentette: {target}",
   "notification.admin.sign_up": "{name} regisztrált",
   "notification.favourite": "{name} kedvencnek jelölte a bejegyzésedet",
   "notification.follow": "{name} követ téged",
@@ -485,7 +491,8 @@
   "notification.moderation_warning.action_silence": "A fiókod korlátozásra került.",
   "notification.moderation_warning.action_suspend": "A fiókod felfüggesztésre került.",
   "notification.own_poll": "A szavazásod véget ért",
-  "notification.poll": "Egy szavazás, melyben részt vettél, véget ért",
+  "notification.poll": "Véget ért egy szavazás, melyben részt vettél",
+  "notification.private_mention": "{name} privátban megemlített",
   "notification.reblog": "{name} megtolta a bejegyzésedet",
   "notification.relationships_severance_event": "Elvesztek a kapcsolatok vele: {name}",
   "notification.relationships_severance_event.account_suspension": "Egy admin a(z) {from} kiszolgálóról felfüggesztette {target} fiókját, ami azt jelenti, hogy mostantól nem fogsz róla értesítést kapni, és nem fogsz tudni vele kapcsolatba lépni.",
@@ -503,6 +510,8 @@
   "notifications.column_settings.admin.report": "Új jelentések:",
   "notifications.column_settings.admin.sign_up": "Új regisztrálók:",
   "notifications.column_settings.alert": "Asztali értesítések",
+  "notifications.column_settings.beta.category": "Kísérleti funkciók",
+  "notifications.column_settings.beta.grouping": "Csoportértesítések",
   "notifications.column_settings.favourite": "Kedvencek:",
   "notifications.column_settings.filter_bar.advanced": "Minden kategória megjelenítése",
   "notifications.column_settings.filter_bar.category": "Gyorsszűrő sáv",
@@ -666,9 +675,13 @@
   "report.unfollow_explanation": "Követed ezt a fiókot. Hogy ne lásd a bejegyzéseit a saját idővonaladon, szüntesd meg a követését.",
   "report_notification.attached_statuses": "{count} bejegyzés mellékelve",
   "report_notification.categories.legal": "Jogi",
+  "report_notification.categories.legal_sentence": "illegális tartalom",
   "report_notification.categories.other": "Egyéb",
+  "report_notification.categories.other_sentence": "egyéb",
   "report_notification.categories.spam": "Kéretlen üzenet",
+  "report_notification.categories.spam_sentence": "kéretlen üzenet",
   "report_notification.categories.violation": "Szabálysértés",
+  "report_notification.categories.violation_sentence": "szabálysértés",
   "report_notification.open": "Bejelentés megnyitása",
   "search.no_recent_searches": "Nincsenek keresési előzmények",
   "search.placeholder": "Keresés",
diff --git a/app/javascript/mastodon/locales/hy.json b/app/javascript/mastodon/locales/hy.json
index b4abe9bf09b3d7..4a197185e30c22 100644
--- a/app/javascript/mastodon/locales/hy.json
+++ b/app/javascript/mastodon/locales/hy.json
@@ -324,7 +324,6 @@
   "notification.follow_request": "{name} քեզ հետեւելու հայց է ուղարկել",
   "notification.mention": "{name} նշեց քեզ",
   "notification.own_poll": "Հարցումդ աւարտուեց",
-  "notification.poll": "Հարցումը, ուր դու քուէարկել ես, աւարտուեց։",
   "notification.reblog": "{name} տարածեց գրառումդ",
   "notification.status": "{name} հենց նոր գրառում արեց",
   "notification.update": "{name}-ը փոխել է գրառումը",
diff --git a/app/javascript/mastodon/locales/ia.json b/app/javascript/mastodon/locales/ia.json
index ace6402ee145de..db1ead30c82216 100644
--- a/app/javascript/mastodon/locales/ia.json
+++ b/app/javascript/mastodon/locales/ia.json
@@ -485,7 +485,6 @@
   "notification.moderation_warning.action_silence": "Tu conto ha essite limitate.",
   "notification.moderation_warning.action_suspend": "Tu conto ha essite suspendite.",
   "notification.own_poll": "Tu sondage ha finite",
-  "notification.poll": "Un sondage in le qual tu ha votate ha finite",
   "notification.reblog": "{name} ha impulsate tu message",
   "notification.relationships_severance_event": "Connexiones perdite con {name}",
   "notification.relationships_severance_event.account_suspension": "Un administrator de {from} ha suspendiute {target}. Isto significa que tu non pote plus reciper actualisationes de iste persona o interager con ille.",
diff --git a/app/javascript/mastodon/locales/id.json b/app/javascript/mastodon/locales/id.json
index f4e5e1baea4723..e139796bf1f290 100644
--- a/app/javascript/mastodon/locales/id.json
+++ b/app/javascript/mastodon/locales/id.json
@@ -426,7 +426,6 @@
   "notification.follow_request": "{name} ingin mengikuti Anda",
   "notification.mention": "{name} menyebut Anda",
   "notification.own_poll": "Japat Anda telah berakhir",
-  "notification.poll": "Japat yang Anda ikuti telah berakhir",
   "notification.reblog": "{name} mem-boost kiriman Anda",
   "notification.status": "{name} baru saja mengirim",
   "notification.update": "{name} mengedit kiriman",
diff --git a/app/javascript/mastodon/locales/ie.json b/app/javascript/mastodon/locales/ie.json
index c75788c430129e..3ece43918b19af 100644
--- a/app/javascript/mastodon/locales/ie.json
+++ b/app/javascript/mastodon/locales/ie.json
@@ -480,7 +480,6 @@
   "notification.moderation_warning.action_silence": "Tui conto ha esset limitat.",
   "notification.moderation_warning.action_suspend": "Tui conto ha esset suspendet.",
   "notification.own_poll": "Tui balotation ha finit",
-  "notification.poll": "Un balotation in quel tu votat ha finit",
   "notification.reblog": "{name} boostat tui posta",
   "notification.relationships_severance_event": "Perdit conexiones con {name}",
   "notification.relationships_severance_event.account_suspension": "Un admin de {from} ha suspendet {target}, dunc con ti person tu ne plu posse reciver actualisationes ni far interactiones.",
diff --git a/app/javascript/mastodon/locales/io.json b/app/javascript/mastodon/locales/io.json
index 6aa954ae573048..839939687d219f 100644
--- a/app/javascript/mastodon/locales/io.json
+++ b/app/javascript/mastodon/locales/io.json
@@ -402,7 +402,6 @@
   "notification.follow_request": "{name} demandas sequar vu",
   "notification.mention": "{name} mencionis tu",
   "notification.own_poll": "Vua votposto finigis",
-  "notification.poll": "Votposto quo havas vua voto finigis",
   "notification.reblog": "{name} repetis tua mesajo",
   "notification.status": "{name} nove postigis",
   "notification.update": "{name} modifikis posto",
diff --git a/app/javascript/mastodon/locales/is.json b/app/javascript/mastodon/locales/is.json
index 1a38591b853b35..733e2e541d7084 100644
--- a/app/javascript/mastodon/locales/is.json
+++ b/app/javascript/mastodon/locales/is.json
@@ -485,7 +485,6 @@
   "notification.moderation_warning.action_silence": "Notandaaðgangurinn þinn hefur verið takmarkaður.",
   "notification.moderation_warning.action_suspend": "Notandaaðgangurinn þinn hefur verið settur í frysti.",
   "notification.own_poll": "Könnuninni þinni er lokið",
-  "notification.poll": "Könnun sem þú tókst þátt í er lokið",
   "notification.reblog": "{name} endurbirti færsluna þína",
   "notification.relationships_severance_event": "Missti tengingar við {name}",
   "notification.relationships_severance_event.account_suspension": "Stjórnandi á {from} hefur fryst {target}, sem þýðir að þú færð ekki lengur skilaboð frá viðkomandi né átt í samskiptum við viðkomandi.",
diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json
index 73c4f9ba60827b..419b6bcd9f2312 100644
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@@ -443,6 +443,8 @@
   "mute_modal.title": "Silenziare l'utente?",
   "mute_modal.you_wont_see_mentions": "Non vedrai i post che li menzionano.",
   "mute_modal.you_wont_see_posts": "Possono ancora vedere i tuoi post, ma tu non vedrai i loro.",
+  "name_and_others": "{name} e {count, plural, one {# un altro} other {# altri}}",
+  "name_and_others_with_link": "{name} e <a>{count, plural, one {# un altro} other {# altri}}</a>",
   "navigation_bar.about": "Info",
   "navigation_bar.advanced_interface": "Apri nell'interfaccia web avanzata",
   "navigation_bar.blocks": "Utenti bloccati",
@@ -470,6 +472,10 @@
   "navigation_bar.security": "Sicurezza",
   "not_signed_in_indicator.not_signed_in": "Devi accedere per consultare questa risorsa.",
   "notification.admin.report": "{name} ha segnalato {target}",
+  "notification.admin.report_account": "{name} ha segnalato {count, plural, one {un post} other {# post}} da {target} per {category}",
+  "notification.admin.report_account_other": "{name} ha segnalato {count, plural, one {un post} other {# post}} da {target}",
+  "notification.admin.report_statuses": "{name} ha segnalato {target} per {category}",
+  "notification.admin.report_statuses_other": "{name} ha segnalato {target}",
   "notification.admin.sign_up": "{name} si è iscritto",
   "notification.favourite": "{name} ha aggiunto il tuo post ai preferiti",
   "notification.follow": "{name} ha iniziato a seguirti",
@@ -486,6 +492,7 @@
   "notification.moderation_warning.action_suspend": "Il tuo account è stato sospeso.",
   "notification.own_poll": "Il tuo sondaggio è terminato",
   "notification.poll": "Un sondaggio in cui hai votato è terminato",
+  "notification.private_mention": "{name} ti ha citato privatamente",
   "notification.reblog": "{name} ha rebloggato il tuo post",
   "notification.relationships_severance_event": "Connessioni perse con {name}",
   "notification.relationships_severance_event.account_suspension": "Un amministratore da {from} ha sospeso {target}, il che significa che non puoi più ricevere aggiornamenti da loro o interagire con loro.",
@@ -503,6 +510,8 @@
   "notifications.column_settings.admin.report": "Nuove segnalazioni:",
   "notifications.column_settings.admin.sign_up": "Nuove iscrizioni:",
   "notifications.column_settings.alert": "Notifiche desktop",
+  "notifications.column_settings.beta.category": "Funzioni sperimentali",
+  "notifications.column_settings.beta.grouping": "Notifiche di gruppo",
   "notifications.column_settings.favourite": "Preferiti:",
   "notifications.column_settings.filter_bar.advanced": "Mostra tutte le categorie",
   "notifications.column_settings.filter_bar.category": "Barra del filtro veloce",
@@ -666,9 +675,13 @@
   "report.unfollow_explanation": "Segui questo profilo. Per non visualizzare più i suoi post nel feed della tua home, smetti di seguirlo.",
   "report_notification.attached_statuses": "{count, plural, one {{count} post allegato} other {{count} post allegati}}",
   "report_notification.categories.legal": "Legale",
+  "report_notification.categories.legal_sentence": "contenuti illegali",
   "report_notification.categories.other": "Altro",
+  "report_notification.categories.other_sentence": "altri",
   "report_notification.categories.spam": "Spam",
+  "report_notification.categories.spam_sentence": "spam",
   "report_notification.categories.violation": "Violazione delle regole",
+  "report_notification.categories.violation_sentence": "violazione delle regole",
   "report_notification.open": "Apri segnalazione",
   "search.no_recent_searches": "Nessuna ricerca recente",
   "search.placeholder": "Cerca",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index 36974c76026ecc..13583bc1d84ded 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -485,7 +485,6 @@
   "notification.moderation_warning.action_silence": "あなたのアカウントは制限されています。",
   "notification.moderation_warning.action_suspend": "あなたのアカウントは停止されました。",
   "notification.own_poll": "アンケートが終了しました",
-  "notification.poll": "アンケートが終了しました",
   "notification.reblog": "{name}さんがあなたの投稿をブーストしました",
   "notification.relationships_severance_event": "{name} との関係が失われました",
   "notification.relationships_severance_event.account_suspension": "{from} の管理者が {target} さんを停止したため、今後このユーザーとの交流や新しい投稿の受け取りができなくなりました。",
diff --git a/app/javascript/mastodon/locales/kab.json b/app/javascript/mastodon/locales/kab.json
index ab0a6ce22bdba0..d12cf04366010e 100644
--- a/app/javascript/mastodon/locales/kab.json
+++ b/app/javascript/mastodon/locales/kab.json
@@ -383,7 +383,6 @@
   "notification.moderation-warning.learn_more": "Issin ugar",
   "notification.moderation_warning.action_suspend": "Yettwaseḥbes umiḍan-ik.",
   "notification.own_poll": "Tafrant-ik·im tfuk",
-  "notification.poll": "Tfukk tefrant ideg tettekkaḍ",
   "notification.reblog": "{name} yebḍa tajewwiqt-ik i tikelt-nniḍen",
   "notification.relationships_severance_event.learn_more": "Issin ugar",
   "notification.status": "{name} akken i d-yessufeɣ",
diff --git a/app/javascript/mastodon/locales/kk.json b/app/javascript/mastodon/locales/kk.json
index efeee16c6514a7..74fb33a91ab42f 100644
--- a/app/javascript/mastodon/locales/kk.json
+++ b/app/javascript/mastodon/locales/kk.json
@@ -248,7 +248,6 @@
   "notification.follow_request": "{name} сізге жазылғысы келеді",
   "notification.mention": "{name} сізді атап өтті",
   "notification.own_poll": "Сауалнама аяқталды",
-  "notification.poll": "Бұл сауалнаманың мерзімі аяқталыпты",
   "notification.reblog": "{name} жазбаңызды бөлісті",
   "notifications.clear": "Ескертпелерді тазарт",
   "notifications.clear_confirmation": "Шынымен барлық ескертпелерді өшіресіз бе?",
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index fe3582c1d89ac7..6619cdb2d6014a 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -485,7 +485,6 @@
   "notification.moderation_warning.action_silence": "계정이 제한되었습니다.",
   "notification.moderation_warning.action_suspend": "계정이 정지되었습니다.",
   "notification.own_poll": "설문을 마침",
-  "notification.poll": "참여한 설문이 종료됨",
   "notification.reblog": "{name} 님이 부스트했습니다",
   "notification.relationships_severance_event": "{name} 님과의 연결이 끊어졌습니다",
   "notification.relationships_severance_event.account_suspension": "{from}의 관리자가 {target}를 정지시켰기 때문에 그들과 더이상 상호작용 할 수 없고 정보를 받아볼 수 없습니다.",
diff --git a/app/javascript/mastodon/locales/ku.json b/app/javascript/mastodon/locales/ku.json
index 5248cdfa51b772..3821216a9a9d35 100644
--- a/app/javascript/mastodon/locales/ku.json
+++ b/app/javascript/mastodon/locales/ku.json
@@ -349,7 +349,6 @@
   "notification.follow_request": "{name} dixwazê te bişopîne",
   "notification.mention": "{name} qale te kir",
   "notification.own_poll": "Rapirsîya te qediya",
-  "notification.poll": "Rapirsiyeke ku te deng daye qediya",
   "notification.reblog": "{name} şandiya te bilind kir",
   "notification.status": "{name} niha şand",
   "notification.update": "{name} şandiyek serrast kir",
diff --git a/app/javascript/mastodon/locales/kw.json b/app/javascript/mastodon/locales/kw.json
index 1afcf645cf8914..f59f342cbe051a 100644
--- a/app/javascript/mastodon/locales/kw.json
+++ b/app/javascript/mastodon/locales/kw.json
@@ -239,7 +239,6 @@
   "notification.follow_request": "{name} a bysis agas holya",
   "notification.mention": "{name} a wrug agas meneges",
   "notification.own_poll": "Agas sondyans a worfennas",
-  "notification.poll": "An sondyans may hwrussowgh ragleva a worfennas",
   "notification.reblog": "{name} a generthas agas post",
   "notification.status": "{name} a wrug nowydh postya",
   "notifications.clear": "Dilea gwarnyansow",
diff --git a/app/javascript/mastodon/locales/la.json b/app/javascript/mastodon/locales/la.json
index aa209fcc00db3d..e35e7112bea950 100644
--- a/app/javascript/mastodon/locales/la.json
+++ b/app/javascript/mastodon/locales/la.json
@@ -150,7 +150,6 @@
   "notification.moderation_warning.action_silence": "Ratio tua est limitata.",
   "notification.moderation_warning.action_suspend": "Ratio tua suspensus est.",
   "notification.own_poll": "Suffragium tuum terminatum est.",
-  "notification.poll": "Electione in quam suffragium dedisti finita est.",
   "notification.reblog": "{name} tuum nuntium amplificavit.",
   "notification.relationships_severance_event.account_suspension": "Admin ab {from} {target} suspendit, quod significat nōn iam posse tē novitātēs ab eīs accipere aut cum eīs interagere.",
   "notification.relationships_severance_event.domain_block": "Admin ab {from} {target} obsēcāvit, includēns {followersCount} ex tuīs sectātōribus et {followingCount, plural, one {# ratione} other {# rationibus}} quās sequeris.",
diff --git a/app/javascript/mastodon/locales/lad.json b/app/javascript/mastodon/locales/lad.json
index 292f00818c16c4..ee45e09ad1c89f 100644
--- a/app/javascript/mastodon/locales/lad.json
+++ b/app/javascript/mastodon/locales/lad.json
@@ -457,7 +457,6 @@
   "notification.moderation_warning.action_silence": "Tu kuento tiene sido limitado.",
   "notification.moderation_warning.action_suspend": "Tu kuento tiene sido suspendido.",
   "notification.own_poll": "Tu anketa eskapo",
-  "notification.poll": "Anketa en ke votates eskapo",
   "notification.reblog": "{name} repartajo tu publikasyon",
   "notification.relationships_severance_event": "Koneksyones pedridas kon {name}",
   "notification.relationships_severance_event.learn_more": "Ambezate mas",
diff --git a/app/javascript/mastodon/locales/lt.json b/app/javascript/mastodon/locales/lt.json
index 258e8ce08e92f3..f8a2995c57aafc 100644
--- a/app/javascript/mastodon/locales/lt.json
+++ b/app/javascript/mastodon/locales/lt.json
@@ -485,7 +485,6 @@
   "notification.moderation_warning.action_silence": "Tavo paskyra buvo apribota.",
   "notification.moderation_warning.action_suspend": "Tavo paskyra buvo sustabdyta.",
   "notification.own_poll": "Tavo apklausa baigėsi",
-  "notification.poll": "Apklausa, kurioje balsavai, pasibaigė",
   "notification.reblog": "{name} pakėlė tavo įrašą",
   "notification.relationships_severance_event": "Prarasti sąryšiai su {name}",
   "notification.relationships_severance_event.learn_more": "Sužinoti daugiau",
diff --git a/app/javascript/mastodon/locales/lv.json b/app/javascript/mastodon/locales/lv.json
index 701569fa05ce1c..d4623a8b31a344 100644
--- a/app/javascript/mastodon/locales/lv.json
+++ b/app/javascript/mastodon/locales/lv.json
@@ -440,7 +440,6 @@
   "notification.moderation_warning.action_silence": "Tavs konts tika ierobežots.",
   "notification.moderation_warning.action_suspend": "Tava konta darbība tika apturēta.",
   "notification.own_poll": "Tava aptauja ir noslēgusies",
-  "notification.poll": "Aptauja, kurā tu piedalījies, ir noslēgusies",
   "notification.reblog": "{name} pastiprināja Tavu ierakstu",
   "notification.relationships_severance_event": "Zaudēti savienojumi ar {name}",
   "notification.relationships_severance_event.learn_more": "Uzzināt vairāk",
diff --git a/app/javascript/mastodon/locales/ms.json b/app/javascript/mastodon/locales/ms.json
index 88c093bdee2ab1..dc34867106d497 100644
--- a/app/javascript/mastodon/locales/ms.json
+++ b/app/javascript/mastodon/locales/ms.json
@@ -421,7 +421,6 @@
   "notification.follow_request": "{name} meminta untuk mengikuti anda",
   "notification.mention": "{name} menyebut anda",
   "notification.own_poll": "Undian anda telah tamat",
-  "notification.poll": "Sebuah undian yang anda undi telah tamat",
   "notification.reblog": "{name} menggalak hantaran anda",
   "notification.status": "{name} baru sahaja mengirim hantaran",
   "notification.update": "{name} menyunting hantaran",
diff --git a/app/javascript/mastodon/locales/my.json b/app/javascript/mastodon/locales/my.json
index 46c8d180690c59..cb3ea9723bd5be 100644
--- a/app/javascript/mastodon/locales/my.json
+++ b/app/javascript/mastodon/locales/my.json
@@ -402,7 +402,6 @@
   "notification.follow_request": "{name} က သင့်ကို စောင့်ကြည့်ရန် တောင်းဆိုထားသည်",
   "notification.mention": "{name} က သင့်ကို ဖော်ပြခဲ့သည်",
   "notification.own_poll": "စစ်တမ်းကောက်မှု ပြီးဆုံးပါပြီ",
-  "notification.poll": "သင်ပါဝင်ခဲ့သော စစ်တမ်းပြီးပါပြီ",
   "notification.reblog": "{name} boosted your status",
   "notification.status": "{name} က အခုလေးတင် ပို့စ်တင်လိုက်ပါပြီ",
   "notification.update": "{name} က ပို့စ်တစ်ခုကို ပြင်ဆင်ခဲ့သည်",
diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json
index 8246d8dfd2d0fe..05c8aa4e2600bf 100644
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@@ -443,6 +443,8 @@
   "mute_modal.title": "Gebruiker negeren?",
   "mute_modal.you_wont_see_mentions": "Je ziet geen berichten meer die dit account vermelden.",
   "mute_modal.you_wont_see_posts": "De persoon kan nog steeds jouw berichten zien, maar diens berichten zie je niet meer.",
+  "name_and_others": "{name} en {count, plural, one {# ander} other {# anderen}}",
+  "name_and_others_with_link": "{name} en <a>{count, plural, one {# ander} other {# anderen}}</a>",
   "navigation_bar.about": "Over",
   "navigation_bar.advanced_interface": "In geavanceerde webinterface openen",
   "navigation_bar.blocks": "Geblokkeerde gebruikers",
@@ -470,6 +472,10 @@
   "navigation_bar.security": "Beveiliging",
   "not_signed_in_indicator.not_signed_in": "Je moet inloggen om toegang tot deze informatie te krijgen.",
   "notification.admin.report": "{name} heeft {target} geapporteerd",
+  "notification.admin.report_account": "{name} rapporteerde {count, plural, one {een bericht} other {# berichten}} van {target} voor {category}",
+  "notification.admin.report_account_other": "{name} rapporteerde {count, plural, one {een bericht} other {# berichten}} van {target}",
+  "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.favourite": "{name} markeerde jouw bericht als favoriet",
   "notification.follow": "{name} volgt jou nu",
@@ -485,7 +491,8 @@
   "notification.moderation_warning.action_silence": "Jouw account is beperkt.",
   "notification.moderation_warning.action_suspend": "Jouw account is opgeschort.",
   "notification.own_poll": "Jouw peiling is beëindigd",
-  "notification.poll": "Een peiling waaraan jij hebt meegedaan is beëindigd",
+  "notification.poll": "Een peiling waaraan je hebt deelgenomen, is verlopen",
+  "notification.private_mention": "{name} heeft je privé genoemd",
   "notification.reblog": "{name} boostte jouw bericht",
   "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.",
@@ -503,6 +510,8 @@
   "notifications.column_settings.admin.report": "Nieuwe rapportages:",
   "notifications.column_settings.admin.sign_up": "Nieuwe registraties:",
   "notifications.column_settings.alert": "Desktopmeldingen",
+  "notifications.column_settings.beta.category": "Experimentele functies",
+  "notifications.column_settings.beta.grouping": "Groepsmeldingen",
   "notifications.column_settings.favourite": "Favorieten:",
   "notifications.column_settings.filter_bar.advanced": "Alle categorieën tonen",
   "notifications.column_settings.filter_bar.category": "Snelle filterbalk",
@@ -666,9 +675,13 @@
   "report.unfollow_explanation": "Je volgt dit account. Om diens berichten niet meer op jouw starttijdlijn te zien, kun je diegene ontvolgen.",
   "report_notification.attached_statuses": "{count, plural, one {{count} bericht} other {{count} berichten}} toegevoegd",
   "report_notification.categories.legal": "Juridisch",
+  "report_notification.categories.legal_sentence": "illegale inhoud",
   "report_notification.categories.other": "Overig",
+  "report_notification.categories.other_sentence": "overig",
   "report_notification.categories.spam": "Spam",
+  "report_notification.categories.spam_sentence": "spam",
   "report_notification.categories.violation": "Overtreden regel(s)",
+  "report_notification.categories.violation_sentence": "regel overtreden",
   "report_notification.open": "Rapportage openen",
   "search.no_recent_searches": "Geen recente zoekopdrachten",
   "search.placeholder": "Zoeken",
diff --git a/app/javascript/mastodon/locales/nn.json b/app/javascript/mastodon/locales/nn.json
index 0fb0edf0a04b15..f5efedb1aeefe0 100644
--- a/app/javascript/mastodon/locales/nn.json
+++ b/app/javascript/mastodon/locales/nn.json
@@ -485,7 +485,6 @@
   "notification.moderation_warning.action_silence": "Kontoen din har blitt avgrensa.",
   "notification.moderation_warning.action_suspend": "Kontoen din har blitt suspendert.",
   "notification.own_poll": "Rundspørjinga di er ferdig",
-  "notification.poll": "Ei rundspørjing du har røysta i er ferdig",
   "notification.reblog": "{name} framheva innlegget ditt",
   "notification.relationships_severance_event": "Tapte samband med {name}",
   "notification.relationships_severance_event.account_suspension": "Ein administrator på {from} har utvist {target}, som tyder at du ikkje lenger får oppdateringar frå dei eller kan samhandla med dei.",
diff --git a/app/javascript/mastodon/locales/no.json b/app/javascript/mastodon/locales/no.json
index 2bda3734044d33..f2476bf14cde9d 100644
--- a/app/javascript/mastodon/locales/no.json
+++ b/app/javascript/mastodon/locales/no.json
@@ -414,7 +414,6 @@
   "notification.follow_request": "{name} har bedt om å få følge deg",
   "notification.mention": "{name} nevnte deg",
   "notification.own_poll": "Avstemningen din er ferdig",
-  "notification.poll": "En avstemning du stemte på har avsluttet",
   "notification.reblog": "{name} fremhevet ditt innlegg",
   "notification.status": "{name} la nettopp ut",
   "notification.update": "{name} redigerte et innlegg",
diff --git a/app/javascript/mastodon/locales/oc.json b/app/javascript/mastodon/locales/oc.json
index d977eed4af63a2..c02c821afcec06 100644
--- a/app/javascript/mastodon/locales/oc.json
+++ b/app/javascript/mastodon/locales/oc.json
@@ -357,7 +357,6 @@
   "notification.follow_request": "{name} a demandat a vos sègre",
   "notification.mention": "{name} vos a mencionat",
   "notification.own_poll": "Vòstre sondatge es acabat",
-  "notification.poll": "Avètz participat a un sondatge que ven de s’acabar",
   "notification.reblog": "{name} a partejat vòstre estatut",
   "notification.status": "{name} ven de publicar",
   "notification.update": "{name} modiquè sa publicacion",
diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json
index ddfe1d4fbcd804..75987f5d29c67f 100644
--- a/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@@ -443,6 +443,8 @@
   "mute_modal.title": "Wyciszyć użytkownika?",
   "mute_modal.you_wont_see_mentions": "Nie zobaczysz wpisów, które wspominają tego użytkownika.",
   "mute_modal.you_wont_see_posts": "Użytkownik dalej będzie widzieć Twoje posty, ale Ty nie będziesz widzieć jego.",
+  "name_and_others": "{name} i {count, plural, one {# inny} few {# inne} many {# innych} other {# innych}}",
+  "name_and_others_with_link": "{name} i <a>{count, plural, one {# inny} few {# inne} many {# innych} other {# innych}}</a>",
   "navigation_bar.about": "O serwerze",
   "navigation_bar.advanced_interface": "Otwórz w zaawansowanym interfejsie użytkownika",
   "navigation_bar.blocks": "Zablokowani użytkownicy",
@@ -470,6 +472,10 @@
   "navigation_bar.security": "Bezpieczeństwo",
   "not_signed_in_indicator.not_signed_in": "Musisz się zalogować, aby uzyskać dostęp do tego zasobu.",
   "notification.admin.report": "{name} zgłosił {target}",
+  "notification.admin.report_account": "{name} zgłosił(a) {count, plural, one {1 wpis} few {# wpisy} other {# wpisów}} z {target} w kategorii {category}",
+  "notification.admin.report_account_other": "{name} zgłosił(a) {count, plural, one {1 wpis} few {# wpisy} other {# wpisów}} z {target}",
+  "notification.admin.report_statuses": "{name} zgłosił(a) {target} w kategorii {category}",
+  "notification.admin.report_statuses_other": "{name} zgłosił(a) {target}",
   "notification.admin.sign_up": "Użytkownik {name} zarejestrował się",
   "notification.favourite": "{name} dodaje Twój wpis do ulubionych",
   "notification.follow": "{name} obserwuje Cię",
@@ -485,7 +491,8 @@
   "notification.moderation_warning.action_silence": "Twoje konto zostało ograniczone.",
   "notification.moderation_warning.action_suspend": "Twoje konto zostało zawieszone.",
   "notification.own_poll": "Twoje głosowanie zakończyło się",
-  "notification.poll": "Głosowanie w którym brałeś(-aś) udział zakończyło się",
+  "notification.poll": "Głosowanie, w którym brałeś(-aś) udział, zostało zakończone",
+  "notification.private_mention": "{name} prywatnie o tobie wspomniał(a)",
   "notification.reblog": "Twój post został podbity przez {name}",
   "notification.relationships_severance_event": "Utracone związki z {name}",
   "notification.relationships_severance_event.account_suspension": "Administrator z {from} zawiesił {target}, więc nie dostaniesz wieści ani nie wejdziesz w interakcje z użytkownikami z tego serwera.",
@@ -502,6 +509,8 @@
   "notifications.column_settings.admin.report": "Nowe zgłoszenia:",
   "notifications.column_settings.admin.sign_up": "Nowe rejestracje:",
   "notifications.column_settings.alert": "Powiadomienia na pulpicie",
+  "notifications.column_settings.beta.category": "Funkcje eksperymentalne",
+  "notifications.column_settings.beta.grouping": "Powiadomienia grupowe",
   "notifications.column_settings.favourite": "Ulubione:",
   "notifications.column_settings.filter_bar.advanced": "Wyświetl wszystkie kategorie",
   "notifications.column_settings.filter_bar.category": "Szybkie filtrowanie",
@@ -665,9 +674,13 @@
   "report.unfollow_explanation": "Obserwujesz to konto. Jeśli nie chcesz już widzieć postów z tego konta w swojej głównej osi czasu, przestań je obserwować.",
   "report_notification.attached_statuses": "{count, plural, one {{count} wpis} few {{count} wpisy} many {{counter} wpisów} other {{counter} wpisów}}",
   "report_notification.categories.legal": "Prawne",
+  "report_notification.categories.legal_sentence": "treść nielegalna",
   "report_notification.categories.other": "Inne",
+  "report_notification.categories.other_sentence": "inne",
   "report_notification.categories.spam": "Spam",
+  "report_notification.categories.spam_sentence": "spam",
   "report_notification.categories.violation": "Naruszenie zasad",
+  "report_notification.categories.violation_sentence": "naruszenie zasad",
   "report_notification.open": "Otwórz zgłoszenie",
   "search.no_recent_searches": "Brak ostatnich wyszukiwań",
   "search.placeholder": "Szukaj",
diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json
index 34d0ba36e6f817..9ebde4e6a48dfc 100644
--- a/app/javascript/mastodon/locales/pt-BR.json
+++ b/app/javascript/mastodon/locales/pt-BR.json
@@ -482,7 +482,6 @@
   "notification.moderation_warning.action_silence": "Sua conta foi limitada.",
   "notification.moderation_warning.action_suspend": "Sua conta foi suspensa.",
   "notification.own_poll": "Sua enquete terminou",
-  "notification.poll": "Uma enquete que você votou terminou",
   "notification.reblog": "{name} deu boost no teu toot",
   "notification.relationships_severance_event": "Conexões perdidas com {name}",
   "notification.relationships_severance_event.account_suspension": "Um administrador de {from} suspendeu {target}, o que significa que você não pode mais receber atualizações deles ou interagir com eles.",
diff --git a/app/javascript/mastodon/locales/pt-PT.json b/app/javascript/mastodon/locales/pt-PT.json
index 6a6feca309f2bf..a0359fd8684589 100644
--- a/app/javascript/mastodon/locales/pt-PT.json
+++ b/app/javascript/mastodon/locales/pt-PT.json
@@ -485,7 +485,6 @@
   "notification.moderation_warning.action_silence": "A sua conta foi limitada.",
   "notification.moderation_warning.action_suspend": "A sua conta foi suspensa.",
   "notification.own_poll": "A sua votação terminou",
-  "notification.poll": "Uma votação em que participaste chegou ao fim",
   "notification.reblog": "{name} reforçou a tua publicação",
   "notification.relationships_severance_event": "Perdeu as ligações com {name}",
   "notification.relationships_severance_event.account_suspension": "Um administrador de {from} suspendeu {target}, o que significa que já não pode receber atualizações dele ou interagir com ele.",
diff --git a/app/javascript/mastodon/locales/ro.json b/app/javascript/mastodon/locales/ro.json
index 35abf1b021f5d0..bbae7112696534 100644
--- a/app/javascript/mastodon/locales/ro.json
+++ b/app/javascript/mastodon/locales/ro.json
@@ -393,7 +393,6 @@
   "notification.follow_request": "{name} a trimis o cerere de abonare",
   "notification.mention": "{name} te-a menționat",
   "notification.own_poll": "Sondajul tău s-a încheiat",
-  "notification.poll": "Un sondaj pentru care ai votat s-a încheiat",
   "notification.reblog": "{name} ți-a distribuit postarea",
   "notification.status": "{name} tocmai a postat",
   "notification.update": "{name} și-a modificat o postare",
diff --git a/app/javascript/mastodon/locales/ru.json b/app/javascript/mastodon/locales/ru.json
index 97a1f0b09c3a05..971d6c77cadd8e 100644
--- a/app/javascript/mastodon/locales/ru.json
+++ b/app/javascript/mastodon/locales/ru.json
@@ -482,7 +482,6 @@
   "notification.moderation_warning.action_silence": "Ваша учётная запись была ограничена.",
   "notification.moderation_warning.action_suspend": "Действие вашей учётной записи приостановлено.",
   "notification.own_poll": "Ваш опрос закончился",
-  "notification.poll": "Опрос, в котором вы приняли участие, завершился",
   "notification.reblog": "{name} продвинул(а) ваш пост",
   "notification.relationships_severance_event": "Потеряно соединение с {name}",
   "notification.relationships_severance_event.account_suspension": "Администратор {from} заблокировал {target}, что означает, что вы больше не сможете получать обновления от них или взаймодествовать с ними.",
diff --git a/app/javascript/mastodon/locales/sa.json b/app/javascript/mastodon/locales/sa.json
index c3880a6b037504..7f8dae326ef972 100644
--- a/app/javascript/mastodon/locales/sa.json
+++ b/app/javascript/mastodon/locales/sa.json
@@ -355,7 +355,6 @@
   "notification.follow_request": "{name} त्वामनुसर्तुमयाचीत्",
   "notification.mention": "{name} त्वामुल्लिलेख",
   "notification.own_poll": "तव निर्वाचनं समाप्तम्",
-  "notification.poll": "यस्मिन्निर्वाचने मतमदास्तन्निर्वाचनं समाप्तम्",
   "notification.reblog": "{name} तव पत्रं बुस्तिमिति अकार्षीत्",
   "notification.status": "{name} अधुना अस्थापयिष्ट",
   "notification.update": "{name} पत्रमेकं समपादयिष्ट",
diff --git a/app/javascript/mastodon/locales/sc.json b/app/javascript/mastodon/locales/sc.json
index 8955573737836c..f13514fd0232d9 100644
--- a/app/javascript/mastodon/locales/sc.json
+++ b/app/javascript/mastodon/locales/sc.json
@@ -282,7 +282,6 @@
   "notification.follow_request": "{name} at dimandadu de ti sighire",
   "notification.mention": "{name} t'at mentovadu",
   "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.status": "{name} at publicadu cosa",
   "notifications.clear": "Lìmpia notìficas",
diff --git a/app/javascript/mastodon/locales/sco.json b/app/javascript/mastodon/locales/sco.json
index 397f63fed41f92..7c4d1db60ebd9f 100644
--- a/app/javascript/mastodon/locales/sco.json
+++ b/app/javascript/mastodon/locales/sco.json
@@ -338,7 +338,6 @@
   "notification.follow_request": "{name} is wantin tae follae ye",
   "notification.mention": "{name} menshied ye",
   "notification.own_poll": "Yer poll is duin",
-  "notification.poll": "A poll thit ye votit in is duin",
   "notification.reblog": "{name} heezed yer post",
   "notification.status": "{name} juist postit",
   "notification.update": "{name} editit a post",
diff --git a/app/javascript/mastodon/locales/si.json b/app/javascript/mastodon/locales/si.json
index 3a67beed527a59..c4f82c41336c80 100644
--- a/app/javascript/mastodon/locales/si.json
+++ b/app/javascript/mastodon/locales/si.json
@@ -289,7 +289,6 @@
   "notification.follow": "{name} ඔබව අනුගමනය කළා",
   "notification.mention": "{name} ඔබව සඳහන් කර ඇත",
   "notification.own_poll": "ඔබගේ මත විමසුම නිමයි",
-  "notification.poll": "ඔබ ඡන්දය දුන් මත විමසුමක් නිමයි",
   "notification.status": "{name} දැන් පළ කළා",
   "notification.update": "{name} ලිපියක් සංස්කරණය කළා",
   "notifications.clear": "දැනුම්දීම් මකන්න",
diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json
index ed877f7667c9b0..cff79c6b9bb379 100644
--- a/app/javascript/mastodon/locales/sk.json
+++ b/app/javascript/mastodon/locales/sk.json
@@ -452,7 +452,6 @@
   "notification.moderation_warning.action_silence": "Tvoj účet bol obmedzený.",
   "notification.moderation_warning.action_suspend": "Tvoj účet bol pozastavený.",
   "notification.own_poll": "Vaša anketa sa skončila",
-  "notification.poll": "Anketa, v ktorej ste hlasovali, sa skončila",
   "notification.reblog": "{name} zdieľa váš príspevok",
   "notification.relationships_severance_event": "Stratené prepojenia s {name}",
   "notification.relationships_severance_event.account_suspension": "Správca z {from} pozastavil/a {target}, čo znamená, že od nich viac nemôžeš dostávať aktualizácie, alebo s nimi interaktovať.",
diff --git a/app/javascript/mastodon/locales/sl.json b/app/javascript/mastodon/locales/sl.json
index 2a3d74a80f2b63..b8c995b8d1c209 100644
--- a/app/javascript/mastodon/locales/sl.json
+++ b/app/javascript/mastodon/locales/sl.json
@@ -443,6 +443,8 @@
   "mute_modal.title": "Utišaj uporabnika?",
   "mute_modal.you_wont_see_mentions": "Objav, ki jih omenjajo, ne boste videli.",
   "mute_modal.you_wont_see_posts": "Še vedno vidijo vaše objave, vi pa ne njihovih.",
+  "name_and_others": "{name} in {count, plural, one {# drug} two {# druga} few {# drugi} other {# drugih}}",
+  "name_and_others_with_link": "{name} in <a>{count, plural, one {# drug} two {# druga} few {# drugi} other {# drugih}}</a>",
   "navigation_bar.about": "O Mastodonu",
   "navigation_bar.advanced_interface": "Odpri v naprednem spletnem vmesniku",
   "navigation_bar.blocks": "Blokirani uporabniki",
@@ -470,6 +472,10 @@
   "navigation_bar.security": "Varnost",
   "not_signed_in_indicator.not_signed_in": "Za dostop do tega vira se morate prijaviti.",
   "notification.admin.report": "{name} je prijavil/a {target}",
+  "notification.admin.report_account": "{name} je prijavil/a {count, plural, one {# objavo} two {# objavi} few {# objave} other {# objav}} od {target} zaradi {category}",
+  "notification.admin.report_account_other": "{name} je prijavil/a {count, plural, one {# objavo} two {# objavi} few {# objave} other {# objav}} od {target}",
+  "notification.admin.report_statuses": "{name} je prijavil/a {target} zaradi {category}",
+  "notification.admin.report_statuses_other": "{name} je prijavil/a {target}",
   "notification.admin.sign_up": "{name} se je vpisal/a",
   "notification.favourite": "{name} je vzljubil/a vašo objavo",
   "notification.follow": "{name} vam sledi",
@@ -486,6 +492,7 @@
   "notification.moderation_warning.action_suspend": "Vaš račun je bil suspendiran.",
   "notification.own_poll": "Vaša anketa je zaključena",
   "notification.poll": "Anketa, v kateri ste sodelovali, je zaključena",
+  "notification.private_mention": "{name} vas je zasebno omenil/a",
   "notification.reblog": "{name} je izpostavila/a vašo objavo",
   "notification.relationships_severance_event": "Povezave z {name} prekinjene",
   "notification.relationships_severance_event.account_suspension": "Skrbnik na {from} je suspendiral račun {target}, kar pomeni, da od računa ne morete več prejemati posodobitev ali imeti z njim interakcij.",
@@ -503,6 +510,8 @@
   "notifications.column_settings.admin.report": "Nove prijave:",
   "notifications.column_settings.admin.sign_up": "Novi vpisi:",
   "notifications.column_settings.alert": "Namizna obvestila",
+  "notifications.column_settings.beta.category": "Poskusne funkcionalnosti",
+  "notifications.column_settings.beta.grouping": "Skupine obvestil",
   "notifications.column_settings.favourite": "Priljubljeni:",
   "notifications.column_settings.filter_bar.advanced": "Prikaži vse kategorije",
   "notifications.column_settings.filter_bar.category": "Vrstica za hitro filtriranje",
@@ -666,9 +675,13 @@
   "report.unfollow_explanation": "Temu računu sledite. Da ne boste več videli njegovih objav v svojem domačem viru, mu prenehajte slediti.",
   "report_notification.attached_statuses": "{count, plural, one {{count} objava pripeta} two {{count} objavi pripeti} few {{count} objave pripete} other {{count} objav pripetih}}",
   "report_notification.categories.legal": "Legalno",
+  "report_notification.categories.legal_sentence": "nedovoljena vsebina",
   "report_notification.categories.other": "Drugo",
+  "report_notification.categories.other_sentence": "drugo",
   "report_notification.categories.spam": "Neželeno",
+  "report_notification.categories.spam_sentence": "neželeno",
   "report_notification.categories.violation": "Kršitev pravila",
+  "report_notification.categories.violation_sentence": "kršitev pravila",
   "report_notification.open": "Odpri prijavo",
   "search.no_recent_searches": "Ni nedavnih iskanj",
   "search.placeholder": "Iskanje",
diff --git a/app/javascript/mastodon/locales/sq.json b/app/javascript/mastodon/locales/sq.json
index 96b7b3fefc715a..219561688bd4e0 100644
--- a/app/javascript/mastodon/locales/sq.json
+++ b/app/javascript/mastodon/locales/sq.json
@@ -485,7 +485,6 @@
   "notification.moderation_warning.action_silence": "Llogaria juaj është kufizuar.",
   "notification.moderation_warning.action_suspend": "Llogaria juaj është pezulluar.",
   "notification.own_poll": "Pyetësori juaj ka përfunduar",
-  "notification.poll": "Ka përfunduar një pyetësor ku keni votuar",
   "notification.reblog": "{name} përforcoi mesazhin tuaj",
   "notification.relationships_severance_event": "Lidhje të humbura me {name}",
   "notification.relationships_severance_event.account_suspension": "Një përgjegjës nga {from} ka pezulluar {target}, që do të thotë se s’mund të merrni më përditësime prej tij, apo të ndërveproni me të.",
diff --git a/app/javascript/mastodon/locales/sr-Latn.json b/app/javascript/mastodon/locales/sr-Latn.json
index 71b69d428af7ab..38ff12bdcf6021 100644
--- a/app/javascript/mastodon/locales/sr-Latn.json
+++ b/app/javascript/mastodon/locales/sr-Latn.json
@@ -485,7 +485,6 @@
   "notification.moderation_warning.action_silence": "Vaš nalog je ograničen.",
   "notification.moderation_warning.action_suspend": "Vaš nalog je suspendovan.",
   "notification.own_poll": "Vaša anketa je završena",
-  "notification.poll": "Završena je anketa u kojoj ste glasali",
   "notification.reblog": "{name} je podržao vašu objavu",
   "notification.relationships_severance_event": "Izgubljena veza sa {name}",
   "notification.relationships_severance_event.account_suspension": "Administrator sa {from} je suspendovao {target}, što znači da više ne možete da primate ažuriranja od njih niti da komunicirate sa njima.",
diff --git a/app/javascript/mastodon/locales/sr.json b/app/javascript/mastodon/locales/sr.json
index 2c4649f9d03941..047e8cf3a8d41c 100644
--- a/app/javascript/mastodon/locales/sr.json
+++ b/app/javascript/mastodon/locales/sr.json
@@ -485,7 +485,6 @@
   "notification.moderation_warning.action_silence": "Ваш налог је ограничен.",
   "notification.moderation_warning.action_suspend": "Ваш налог је суспендован.",
   "notification.own_poll": "Ваша анкета је завршена",
-  "notification.poll": "Завршена је анкета у којој сте гласали",
   "notification.reblog": "{name} је подржао вашу објаву",
   "notification.relationships_severance_event": "Изгубљена веза са {name}",
   "notification.relationships_severance_event.account_suspension": "Администратор са {from} је суспендовао {target}, што значи да више не можете да примате ажурирања од њих нити да комуницирате са њима.",
diff --git a/app/javascript/mastodon/locales/sv.json b/app/javascript/mastodon/locales/sv.json
index 1833a2cfdefa4b..ba07d5a1c7cfc2 100644
--- a/app/javascript/mastodon/locales/sv.json
+++ b/app/javascript/mastodon/locales/sv.json
@@ -469,6 +469,7 @@
   "navigation_bar.security": "Säkerhet",
   "not_signed_in_indicator.not_signed_in": "Du behöver logga in för att få åtkomst till denna resurs.",
   "notification.admin.report": "{name} rapporterade {target}",
+  "notification.admin.report_statuses_other": "{name} rapporterade {target}",
   "notification.admin.sign_up": "{name} registrerade sig",
   "notification.favourite": "{name} favoritmarkerade ditt inlägg",
   "notification.follow": "{name} följer dig",
@@ -484,7 +485,7 @@
   "notification.moderation_warning.action_silence": "Ditt konto har begränsats.",
   "notification.moderation_warning.action_suspend": "Ditt konto har stängts av.",
   "notification.own_poll": "Din röstning har avslutats",
-  "notification.poll": "En omröstning du röstat i har avslutats",
+  "notification.private_mention": "{name} nämnde dig privat",
   "notification.reblog": "{name} boostade ditt inlägg",
   "notification.relationships_severance_event": "Förlorade kontakter med {name}",
   "notification.relationships_severance_event.account_suspension": "En administratör från {from} har stängt av {target}, vilket innebär att du inte längre kan ta emot uppdateringar från dem eller interagera med dem.",
@@ -502,6 +503,7 @@
   "notifications.column_settings.admin.report": "Nya rapporter:",
   "notifications.column_settings.admin.sign_up": "Nya registreringar:",
   "notifications.column_settings.alert": "Skrivbordsaviseringar",
+  "notifications.column_settings.beta.category": "Experimentella funktioner",
   "notifications.column_settings.favourite": "Favoriter:",
   "notifications.column_settings.filter_bar.advanced": "Visa alla kategorier",
   "notifications.column_settings.filter_bar.category": "Snabbfilter",
@@ -666,7 +668,9 @@
   "report_notification.attached_statuses": "bifogade {count, plural, one {{count} inlägg} other {{count} inlägg}}",
   "report_notification.categories.legal": "Rättsligt",
   "report_notification.categories.other": "Övrigt",
+  "report_notification.categories.other_sentence": "övrigt",
   "report_notification.categories.spam": "Skräppost",
+  "report_notification.categories.spam_sentence": "skräppost",
   "report_notification.categories.violation": "Regelöverträdelse",
   "report_notification.open": "Öppna rapport",
   "search.no_recent_searches": "Inga sökningar nyligen",
diff --git a/app/javascript/mastodon/locales/ta.json b/app/javascript/mastodon/locales/ta.json
index d44ac424f4f715..bb26986b818206 100644
--- a/app/javascript/mastodon/locales/ta.json
+++ b/app/javascript/mastodon/locales/ta.json
@@ -278,7 +278,6 @@
   "notification.follow_request": "{name} உங்களைப் பின்தொடரக் கோருகிறார்",
   "notification.mention": "{name} நீங்கள் குறிப்பிட்டுள்ளீர்கள்",
   "notification.own_poll": "கருத்துக்கணிப்பு நிறைவடைந்தது",
-  "notification.poll": "நீங்கள் வாக்களித்த வாக்கெடுப்பு முடிவடைந்தது",
   "notification.reblog": "{name} உங்கள் நிலை அதிகரித்தது",
   "notifications.clear": "அறிவிப்புகளை அழிக்கவும்",
   "notifications.clear_confirmation": "உங்கள் எல்லா அறிவிப்புகளையும் நிரந்தரமாக அழிக்க விரும்புகிறீர்களா?",
diff --git a/app/javascript/mastodon/locales/te.json b/app/javascript/mastodon/locales/te.json
index c06472561f9915..471890b9a36646 100644
--- a/app/javascript/mastodon/locales/te.json
+++ b/app/javascript/mastodon/locales/te.json
@@ -187,7 +187,6 @@
   "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
   "notification.follow": "{name} మిమ్మల్ని అనుసరిస్తున్నారు",
   "notification.mention": "{name} మిమ్మల్ని ప్రస్తావించారు",
-  "notification.poll": "మీరు పాల్గొనిన ఎన్సిక ముగిసినది",
   "notification.reblog": "{name} మీ స్టేటస్ ను బూస్ట్ చేసారు",
   "notifications.clear": "ప్రకటనలను తుడిచివేయు",
   "notifications.clear_confirmation": "మీరు మీ అన్ని నోటిఫికేషన్లను శాశ్వతంగా తొలగించాలనుకుంటున్నారా?",
diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json
index 64abb394bfce4b..083a0eb33f3e56 100644
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@@ -485,7 +485,6 @@
   "notification.moderation_warning.action_silence": "จำกัดบัญชีของคุณแล้ว",
   "notification.moderation_warning.action_suspend": "ระงับบัญชีของคุณแล้ว",
   "notification.own_poll": "การสำรวจความคิดเห็นของคุณได้สิ้นสุดแล้ว",
-  "notification.poll": "การสำรวจความคิดเห็นที่คุณได้ลงคะแนนได้สิ้นสุดแล้ว",
   "notification.reblog": "{name} ได้ดันโพสต์ของคุณ",
   "notification.relationships_severance_event": "สูญเสียการเชื่อมต่อกับ {name}",
   "notification.relationships_severance_event.account_suspension": "ผู้ดูแลจาก {from} ได้ระงับ {target} ซึ่งหมายความว่าคุณจะไม่สามารถรับการอัปเดตจากเขาหรือโต้ตอบกับเขาได้อีกต่อไป",
diff --git a/app/javascript/mastodon/locales/tok.json b/app/javascript/mastodon/locales/tok.json
index fcdef5f32ce744..e581978f2419a4 100644
--- a/app/javascript/mastodon/locales/tok.json
+++ b/app/javascript/mastodon/locales/tok.json
@@ -294,7 +294,6 @@
   "notification.follow_request": "{name} li wile kute e sina",
   "notification.mention": "jan {name} li toki e sina",
   "notification.moderation-warning.learn_more": "o kama sona e ijo ante",
-  "notification.poll": "sina pana lon pana la pana ni li pini",
   "notification.reblog": "{name} li wawa e toki sina",
   "notification.status": "{name} li toki",
   "notification.update": "{name} li ante e toki",
diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json
index ac39a3fd7b6e39..0b20b60f9e90ce 100644
--- a/app/javascript/mastodon/locales/tr.json
+++ b/app/javascript/mastodon/locales/tr.json
@@ -485,7 +485,6 @@
   "notification.moderation_warning.action_silence": "Hesabınız sınırlandırıldı.",
   "notification.moderation_warning.action_suspend": "Hesabınız askıya alındı.",
   "notification.own_poll": "Anketiniz sona erdi",
-  "notification.poll": "Oy verdiğiniz bir anket sona erdi",
   "notification.reblog": "{name} gönderini yeniden paylaştı",
   "notification.relationships_severance_event": "{name} ile bağlantılar koptu",
   "notification.relationships_severance_event.account_suspension": "{from} yöneticisi, {target} askıya aldı, bunun anlamı onlardan artık güncelleme alamayacak veya etkileşemeyeceksiniz demektir.",
diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json
index 67ebb031aefcd0..76abe8d299f3c4 100644
--- a/app/javascript/mastodon/locales/uk.json
+++ b/app/javascript/mastodon/locales/uk.json
@@ -485,7 +485,6 @@
   "notification.moderation_warning.action_silence": "Ваш обліковий запис було обмежено.",
   "notification.moderation_warning.action_suspend": "Ваш обліковий запис було заблоковано.",
   "notification.own_poll": "Ваше опитування завершилося",
-  "notification.poll": "Опитування, у якому ви голосували, скінчилося",
   "notification.reblog": "{name} поширює ваш допис",
   "notification.relationships_severance_event": "Втрачено з'єднання з {name}",
   "notification.relationships_severance_event.account_suspension": "Адміністратор з {from} призупинив {target}, що означає, що ви більше не можете отримувати оновлення від них або взаємодіяти з ними.",
diff --git a/app/javascript/mastodon/locales/ur.json b/app/javascript/mastodon/locales/ur.json
index cf53eb6fe8a7d8..3c61846e9c63a7 100644
--- a/app/javascript/mastodon/locales/ur.json
+++ b/app/javascript/mastodon/locales/ur.json
@@ -240,7 +240,6 @@
   "notification.follow_request": "{name} نے آپ کی پیروی کی درخواست کی",
   "notification.mention": "{name} نے آپ کا تذکرہ کیا",
   "notification.own_poll": "آپ کا پول ختم ہو گیا ہے",
-  "notification.poll": "آپ کا ووٹ دیا گیا ایک پول ختم ہو گیا ہے",
   "notification.reblog": "{name} boosted your status",
   "notification.status": "{name} نے ابھی ابھی پوسٹ کیا",
   "notifications.clear": "اطلاعات ہٹائیں",
diff --git a/app/javascript/mastodon/locales/uz.json b/app/javascript/mastodon/locales/uz.json
index 4824b1d3320fa7..90ad67d2879903 100644
--- a/app/javascript/mastodon/locales/uz.json
+++ b/app/javascript/mastodon/locales/uz.json
@@ -328,7 +328,6 @@
   "navigation_bar.security": "Xavfsizlik",
   "not_signed_in_indicator.not_signed_in": "Ushbu manbaga kirish uchun tizimga kirishingiz kerak.",
   "notification.own_poll": "So‘rovingiz tugadi",
-  "notification.poll": "Siz ovoz bergan soʻrovnoma yakunlandi",
   "notification.reblog": "{name} boosted your status",
   "onboarding.actions.go_to_explore": "See what's trending",
   "onboarding.actions.go_to_home": "Go to your home feed",
diff --git a/app/javascript/mastodon/locales/vi.json b/app/javascript/mastodon/locales/vi.json
index 70932d10bee96e..7a88bee364bba0 100644
--- a/app/javascript/mastodon/locales/vi.json
+++ b/app/javascript/mastodon/locales/vi.json
@@ -485,7 +485,6 @@
   "notification.moderation_warning.action_silence": "Tài khoản của bạn đã bị hạn chế.",
   "notification.moderation_warning.action_suspend": "Tài khoản của bạn đã bị vô hiệu hóa.",
   "notification.own_poll": "Cuộc bình chọn của bạn đã kết thúc",
-  "notification.poll": "Cuộc bình chọn đã kết thúc",
   "notification.reblog": "{name} đăng lại tút của bạn",
   "notification.relationships_severance_event": "Mất kết nối với {name}",
   "notification.relationships_severance_event.account_suspension": "Quản trị viên {from} đã vô hiệu hóa {target}, điều này có nghĩa là bạn không còn có thể nhận được cập nhật từ họ hoặc tương tác với họ nữa.",
diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json
index f2accae0d066cb..f6c0feecfdb160 100644
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@@ -443,6 +443,8 @@
   "mute_modal.title": "隐藏用户？",
   "mute_modal.you_wont_see_mentions": "你看不到提及他们的嘟文。",
   "mute_modal.you_wont_see_posts": "他们可以看到你的嘟文，但是你看不到他们的。",
+  "name_and_others": "{name} 和其它 {count, plural, other {# 人}}",
+  "name_and_others_with_link": "{name} 和<a>其它 {count, plural, other {# 人}}</a>",
   "navigation_bar.about": "关于",
   "navigation_bar.advanced_interface": "在高级网页界面中打开",
   "navigation_bar.blocks": "已屏蔽的用户",
@@ -470,6 +472,10 @@
   "navigation_bar.security": "安全",
   "not_signed_in_indicator.not_signed_in": "您需要登录才能访问此资源。",
   "notification.admin.report": "{name} 举报了 {target}",
+  "notification.admin.report_account": "{name} 举报了来自 {target} 的 {count, plural, other {# 条嘟文}}，原因为 {category}",
+  "notification.admin.report_account_other": "{name} 举报了来自 {target} 的 {count, plural, other {# 条嘟文}}",
+  "notification.admin.report_statuses": "{name} 举报了 {target}，原因为 {category}",
+  "notification.admin.report_statuses_other": "{name} 举报了 {target}",
   "notification.admin.sign_up": "{name} 注册了",
   "notification.favourite": "{name} 喜欢了你的嘟文",
   "notification.follow": "{name} 开始关注你",
@@ -485,7 +491,8 @@
   "notification.moderation_warning.action_silence": "你的账号已被限制。",
   "notification.moderation_warning.action_suspend": "你的账号已被封禁.",
   "notification.own_poll": "你的投票已经结束",
-  "notification.poll": "你参与的一个投票已经结束",
+  "notification.poll": "你参与的一项投票已结束",
+  "notification.private_mention": "{name} 私下提及了你",
   "notification.reblog": "{name} 转发了你的嘟文",
   "notification.relationships_severance_event": "与 {name} 的联系已断开",
   "notification.relationships_severance_event.account_suspension": "一名来自 {from} 的管理员已经封禁了{target}，这意味着你将无法再收到他们的更新或与他们互动。",
@@ -503,6 +510,8 @@
   "notifications.column_settings.admin.report": "新举报：",
   "notifications.column_settings.admin.sign_up": "新注册：",
   "notifications.column_settings.alert": "桌面通知",
+  "notifications.column_settings.beta.category": "实验性功能",
+  "notifications.column_settings.beta.grouping": "通知分组",
   "notifications.column_settings.favourite": "喜欢：",
   "notifications.column_settings.filter_bar.advanced": "显示所有类别",
   "notifications.column_settings.filter_bar.category": "快速筛选栏",
@@ -666,9 +675,13 @@
   "report.unfollow_explanation": "你正在关注此账户。如果不想继续在主页看到他们的嘟文，取消对他们的关注即可。",
   "report_notification.attached_statuses": "附上 {count} 条嘟文",
   "report_notification.categories.legal": "法律义务",
+  "report_notification.categories.legal_sentence": "非法内容",
   "report_notification.categories.other": "其他",
+  "report_notification.categories.other_sentence": "其它",
   "report_notification.categories.spam": "骚扰",
+  "report_notification.categories.spam_sentence": "骚扰",
   "report_notification.categories.violation": "违反规则",
+  "report_notification.categories.violation_sentence": "违反规则",
   "report_notification.open": "打开举报",
   "search.no_recent_searches": "无最近搜索",
   "search.placeholder": "搜索",
diff --git a/app/javascript/mastodon/locales/zh-HK.json b/app/javascript/mastodon/locales/zh-HK.json
index 09a497e889d40c..4b717a77dab751 100644
--- a/app/javascript/mastodon/locales/zh-HK.json
+++ b/app/javascript/mastodon/locales/zh-HK.json
@@ -479,7 +479,6 @@
   "notification.moderation_warning.action_silence": "你的帳號已受到限制。",
   "notification.moderation_warning.action_suspend": "你的帳號已被停權。",
   "notification.own_poll": "你的投票已結束",
-  "notification.poll": "你參與過的一個投票已經結束",
   "notification.reblog": "{name} 轉推你的文章",
   "notification.relationships_severance_event": "失去與 {name} 的連結",
   "notification.relationships_severance_event.account_suspension": "{from} 的管理員已將 {target} 停權，這表示你無法再收到他們的更新或與他們互動。",
diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json
index b9a5fc071468ca..dca4cd134a2ab2 100644
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@@ -443,6 +443,8 @@
   "mute_modal.title": "是否靜音該使用者？",
   "mute_modal.you_wont_see_mentions": "您不會見到提及他們的嘟文。",
   "mute_modal.you_wont_see_posts": "他們仍可讀取您的嘟文，但您不會見到他們的。",
+  "name_and_others": "{name} 與 {count, plural, other {# 個人}}",
+  "name_and_others_with_link": "{name} 與 <a>{count, plural, other {# 個人}}</a>",
   "navigation_bar.about": "關於",
   "navigation_bar.advanced_interface": "以進階網頁介面開啟",
   "navigation_bar.blocks": "已封鎖的使用者",
@@ -470,6 +472,10 @@
   "navigation_bar.security": "安全性",
   "not_signed_in_indicator.not_signed_in": "您需要登入才能存取此資源。",
   "notification.admin.report": "{name} 已檢舉 {target}",
+  "notification.admin.report_account": "{name} 已檢舉來自 {target} 關於 {category} 之 {count, plural, other {# 則嘟文}} ",
+  "notification.admin.report_account_other": "{name} 已檢舉來自 {target} 之 {count, plural, other {# 則嘟文}} ",
+  "notification.admin.report_statuses": "{name} 已檢舉 {target} 關於 {category}",
+  "notification.admin.report_statuses_other": "{name} 已檢舉 {target}",
   "notification.admin.sign_up": "{name} 已經註冊",
   "notification.favourite": "{name} 已將您的嘟文加入最愛",
   "notification.follow": "{name} 已跟隨您",
@@ -486,6 +492,7 @@
   "notification.moderation_warning.action_suspend": "您的帳號已被停權。",
   "notification.own_poll": "您的投票已結束",
   "notification.poll": "您曾投過的投票已經結束",
+  "notification.private_mention": "{name} 私訊您",
   "notification.reblog": "{name} 已轉嘟您的嘟文",
   "notification.relationships_severance_event": "與 {name} 失去連結",
   "notification.relationships_severance_event.account_suspension": "{from} 之管理員已將 {target} 停權，意味著您將不再收到來自他們的更新或與之互動。",
@@ -503,6 +510,8 @@
   "notifications.column_settings.admin.report": "新檢舉報告：",
   "notifications.column_settings.admin.sign_up": "新註冊帳號：",
   "notifications.column_settings.alert": "桌面通知",
+  "notifications.column_settings.beta.category": "實驗性功能",
+  "notifications.column_settings.beta.grouping": "分組通知",
   "notifications.column_settings.favourite": "最愛：",
   "notifications.column_settings.filter_bar.advanced": "顯示所有分類",
   "notifications.column_settings.filter_bar.category": "快速過濾器",
@@ -666,9 +675,13 @@
   "report.unfollow_explanation": "您正在跟隨此帳號。如不欲於首頁時間軸再見到他們的嘟文，請取消跟隨。",
   "report_notification.attached_statuses": "{count, plural, one {{count} 則} other {{count} 則}} 嘟文",
   "report_notification.categories.legal": "合法性",
+  "report_notification.categories.legal_sentence": "違法內容",
   "report_notification.categories.other": "其他",
+  "report_notification.categories.other_sentence": "其他",
   "report_notification.categories.spam": "垃圾訊息",
+  "report_notification.categories.spam_sentence": "垃圾訊息",
   "report_notification.categories.violation": "違反規則",
+  "report_notification.categories.violation_sentence": "違反規則",
   "report_notification.open": "開啟檢舉報告",
   "search.no_recent_searches": "尚無最近的搜尋紀錄",
   "search.placeholder": "搜尋",
diff --git a/config/locales/activerecord.ast.yml b/config/locales/activerecord.ast.yml
index 2d532071a9b420..d139a3257049cd 100644
--- a/config/locales/activerecord.ast.yml
+++ b/config/locales/activerecord.ast.yml
@@ -18,7 +18,7 @@ ast:
         account:
           attributes:
             username:
-              invalid: ha contener namás lletres, númberos ya guiones baxos
+              invalid: ha contener namás lletres, númberos y guiones baxos
               reserved: ta acutáu
         admin/webhook:
           attributes:
diff --git a/config/locales/ast.yml b/config/locales/ast.yml
index 9e6ec6d2330cb9..567e5357ebcfb7 100644
--- a/config/locales/ast.yml
+++ b/config/locales/ast.yml
@@ -1,7 +1,7 @@
 ---
 ast:
   about:
-    about_mastodon_html: 'La rede social del futuru: ¡ensin anuncios nin vixilancia, con un diseñu éticu ya descentralizáu! Controla los tos datos con Mastodon.'
+    about_mastodon_html: 'La rede social del futuru: ¡ensin anuncios nin vixilancia, con un diseñu éticu y descentralizáu! Controla los tos datos con Mastodon.'
     contact_unavailable: N/D
     hosted_on: 'Mastodon ta agospiáu en: %{domain}'
     title: Tocante a
@@ -45,11 +45,12 @@ ast:
         title: Moderación
       most_recent_activity: L'actividá más recién
       most_recent_ip: La IP más recién
+      no_limits_imposed: S'impunxo nenguna llende
       perform_full_suspension: Suspender
       protocol: Protocolu
       rejected_msg: Refugóse correutamente la solicitú de rexistru de «%{username}»
       resend_confirmation:
-        already_confirmed: Esti perfil xá ta confirmáu
+        already_confirmed: Esti perfil yá ta confirmáu
       role: Rol
       search: Buscar
       search_same_email_domain: Otros perfiles col mesmu dominiu de corréu electrónicu
@@ -125,7 +126,7 @@ ast:
       no_emoji_selected: Nun camudó nengún fustaxe darréu que nun se seleicionó nengún
       not_permitted: Nun tienes permisu pa facer esta aición
       shortcode: Códigu curtiu
-      shortcode_hint: De 2 caráuteres como muncho, namás caráuteres alfanumbéricos ya guiones baxos
+      shortcode_hint: De 2 caráuteres como muncho, namás caráuteres alfanumbéricos y guiones baxos
       title: Fustaxes personalizaos
       uncategorized: Ensin categoría
       update_failed_msg: Nun se pudo anovar esi fustaxe
@@ -176,7 +177,7 @@ ast:
     export_domain_allows:
       no_file: Nun se seleicionó nengún ficheru
     follow_recommendations:
-      description_html: "<strong>La recomendación de cuentes ayuda a que los perfiles nuevos atopen aína conteníu interesante</strong>. Cuando una cuenta nun interactuó abondo con otros perfiles como pa formar recomendaciones personalizaes, estes cuentes van ser les que se recomienden. Recalcúlense caldía a partir d'un mecíu de cuentes con más actividá recién ya mayor númberu de siguidores llocales pa una llingua determinada."
+      description_html: "<strong>La recomendación de cuentes ayuda a que los perfiles nuevos atopen aína conteníu interesante</strong>. Cuando una cuenta nun interactuó abondo con otros perfiles como pa formar recomendaciones personalizaes, estes cuentes van ser les que se recomienden. Recalcúlense caldía a partir d'un mecíu de cuentes con más actividá recién y mayor númberu de siguidores llocales pa una llingua determinada."
       language: Pa la llingua
       status: Estáu
       title: Recomendación de cuentes
@@ -240,7 +241,7 @@ ast:
           one: "%{count} nota"
           other: "%{count} notes"
       actions:
-        silence_description_html: La cuenta va ser visible namás pa quien xá la siguiere o la buscare manualmente, lo que llenda'l so algame. Esta decisión pue desfacese en cualesquier momentu. Si escueyes esta opción, zárrense tolos informes escontra esta cuenta.
+        silence_description_html: La cuenta va ser visible namás pa quien yá la siguiere o la buscare manualmente, lo que llenda'l so algame. Esta decisión pue desfacese en cualesquier momentu. Si escueyes esta opción, zárrense tolos informes escontra esta cuenta.
       actions_description_html: Decidi qué aición tomar pa resolver esti informe. Si tomes una aición punitiva escontra la cuenta de la que s'informó, va unviase un avisu per corréu electrónicu a esa cuenta, esceuto cuando se seleiciona la categoría <strong>Puxarra</strong>.
       add_to_report: Amestar más al informe
       are_you_sure: "¿De xuru que quies facer esta aición?"
@@ -314,7 +315,7 @@ ast:
         preamble: Personaliza la interfaz web de Mastodon.
         title: Aspeutu
       branding:
-        preamble: La marca del to sirvidor estrémalu d'otros sirvidores de la rede. Ye posible qu'esta información apaeza nuna variedá d'entornos, como la interfaz web de Mastodon, les aplicaciones natives, nes previsualizaciones de los enllaces d'otros sitios web, dientro de les aplicaciones de mensaxería, etc. Por esti motivu, lo meyor ye qu'esta información seya clara, curtia ya concisa.
+        preamble: La marca del to sirvidor estrémalu d'otros sirvidores de la rede. Ye posible qu'esta información apaeza nuna variedá d'entornos, como la interfaz web de Mastodon, les aplicaciones natives, nes previsualizaciones de los enllaces d'otros sitios web, dientro de les aplicaciones de mensaxería, etc. Por esti motivu, lo meyor ye qu'esta información seya clara, curtia y concisa.
         title: Marca
       content_retention:
         preamble: Controla cómo s'atroxa'l conteníu xeneráu polos perfiles en Mastodon.
@@ -438,8 +439,8 @@ ast:
     empty: Nun tienes nengún nomatu.
   appearance:
     advanced_web_interface: Interfaz web avanzada
-    advanced_web_interface_hint: 'Si quies asegúrate de que s''use tol llargor de la pantalla, la interfaz web avanzada permítete configurar columnes estremaes pa ver muncha más información al empar: Aniciu, avisos, llinia de tiempu federada ya cualesquier cantidá de llistes ya etiquetes.'
-    animations_and_accessibility: Animaciones ya accesibilidá
+    advanced_web_interface_hint: 'Si quies asegúrate de que s''use tol llargor de la pantalla, la interfaz web avanzada permítete configurar columnes estremaes pa ver muncha más información al empar: Aniciu, avisos, llinia de tiempu federada y cualesquier cantidá de llistes y etiquetes.'
+    animations_and_accessibility: Animaciones y accesibilidá
     confirmation_dialogs: Diálogos de confirmación
     discovery: Descubrimientu
     localization:
@@ -470,7 +471,7 @@ ast:
     logout: Zarrar la sesión
     migrate_account: Cambéu de cuenta
     migrate_account_html: Si quies redirixir esta cuenta a otra diferente, pues <a href="%{path}">configurar esta opción equí</a>.
-    privacy_policy_agreement_html: Lleí ya acepto la <a href="%{privacy_policy_path}" target="_blank">política de privacidá</a>
+    privacy_policy_agreement_html: Lleí y acepto la <a href="%{privacy_policy_path}" target="_blank">política de privacidá</a>
     providers:
       cas: CAS
       saml: SAML
@@ -491,7 +492,7 @@ ast:
     status:
       account_status: Estáu de la cuenta
       functional: La cuenta ta completamente operativa.
-      pending: La to solicitú ta pendiente de que la revise'l nuesu personal ya ye posible que tarde tiempu. Vas recibir un mensaxe si s'aprueba.
+      pending: La to solicitú ta pendiente de que la revise'l nuesu personal y ye posible que tarde tiempu. Vas recibir un mensaxe si s'aprueba.
     too_fast: El formulariu xubióse mui rápido, volvi tentalo.
   challenge:
     confirm: Siguir
@@ -536,7 +537,7 @@ ast:
       recipient: Dirixóse a
       reject_appeal: Refugar l'apellación
       status: 'Artículu #%{id}'
-      status_removed: L'artículu xá se quitó del sistema
+      status_removed: L'artículu yá se quitó del sistema
       your_appeal_approved: Aprobóse la to apellación
       your_appeal_pending: Unviesti una apellación
       your_appeal_rejected: Refugóse la to apellación
@@ -548,7 +549,7 @@ ast:
     '403': Nun tienes permisu pa ver esta páxina.
     '404': La páxina que busques nun ta equí.
     '406': Esta páxina nun ta disponible nel formatu solicitáu.
-    '410': La páxina que busques xá nun esiste.
+    '410': La páxina que busques yá nun esiste.
     '422':
       content: La verificación de seguranza falló. ¿Tas bloquiando les cookies?
       title: La verificación de seguranza falló
@@ -561,7 +562,7 @@ ast:
   exports:
     archive_takeout:
       date: Data
-      hint_html: Pues solicitar un archivu colos tos <strong>artículos ya ficheros xubíos</strong>. Los datos esportaos van tar nel formatu ActivityPub, llexible pa cualesquier software que seya compatible. Pues solicitar un archivu cada 7 díes.
+      hint_html: Pues solicitar un archivu colos tos <strong>artículos y ficheros xubíos</strong>. Los datos esportaos van tar nel formatu ActivityPub, llexible pa cualesquier software que seya compatible. Pues solicitar un archivu cada 7 díes.
       in_progress: Compilando l'archivu...
       request: Solicitar l'archivu
       size: Tamañu
@@ -576,7 +577,7 @@ ast:
   filters:
     contexts:
       account: Perfiles
-      home: Aniciu ya llistes
+      home: Aniciu y llistes
       notifications: Avisos
       public: Llinies de tiempu públiques
       thread: Conversaciones
@@ -617,7 +618,7 @@ ast:
       over_rows_processing_limit: contién más de %{count} fileres
     modes:
       merge: Mecíu
-      merge_long: Caltién los rexistros esistentes ya amiesta otros nuevos
+      merge_long: Caltién los rexistros esistentes y amiesta otros nuevos
       overwrite: Sobrescritura
       overwrite_long: Troca los rexistros actuales por otros nuevos
     preface: Pues importar los datos qu'esportares dende otru sirvidor, como la llista de perfiles bloquiaos o que sigas.
@@ -645,7 +646,7 @@ ast:
     max_uses:
       one: 1 usu
       other: "%{count} usos"
-    prompt: Xenera ya comparti enllaces con otres persones pa conceder l'accesu a esti sirvidor
+    prompt: Xenera y comparti enllaces con otres persones pa conceder l'accesu a esti sirvidor
     table:
       expires_at: Data de caducidá
       uses: Usos
@@ -657,7 +658,7 @@ ast:
     successful_sign_in_html: Anicióse correutamente la sesión col métodu «%{method}» dende %{ip} (%{browser})
   media_attachments:
     validations:
-      images_and_video: Nun se pue axuntar nengún videu a un artículu que xá contién imáxenes
+      images_and_video: Nun se pue axuntar nengún videu a un artículu que yá contién imáxenes
       too_many: Nun se puen axuntar más de 4 ficheros
   migrations:
     errors:
@@ -707,16 +708,16 @@ ast:
     description_html: Si actives l'<strong>autenticación en dos pasos</strong> con una aplicación autenticadora, al aniciar la sesión va ser obligatorio que tengas el teléfonu a mano, preséu que xenera los pases que tienes d'introducir.
     enable: Activar
     instructions_html: "<strong>Escania esti códigu QR con Google Authenticator o otra aplicación asemeyada nel móvil</strong>. Dende agora, esa aplicación va xenerar los pases que tienes d'introducir cuando anicies la sesión."
-    manual_instructions: 'Si nun pues escaniar el códigu QR ya tienes d''introducilu manualmente, equí tienes el secretu en testu ensin formatu:'
+    manual_instructions: 'Si nun pues escaniar el códigu QR y tienes d''introducilu manualmente, equí tienes el secretu en testu ensin formatu:'
     setup: Configurar
-    wrong_code: "¡El códigu introducíu nun yera válidu! ¿La hora del sirvidor ya la del preséu son correutes?"
+    wrong_code: "¡El códigu introducíu nun yera válidu! ¿La hora del sirvidor y la del preséu son correutes?"
   pagination:
     next: Siguiente
     truncate: "&hellip;"
   polls:
     errors:
-      already_voted: Xá votesti nesta encuesta
-      expired: La encuesta xá finó
+      already_voted: Yá votesti nesta encuesta
+      expired: La encuesta yá finó
       invalid_choice: La opción de votu escoyida nun esiste
       too_many_options: nun pue contener más de %{max} elementos
   preferences:
@@ -724,13 +725,13 @@ ast:
     posting_defaults: Configuración predeterminada del espublizamientu d'artículos
     public_timelines: Llinies de tiempu públiques
   privacy:
-    hint_html: "<strong>Personaliza cómo quies s'atope esti perfil ya los sos artículos.</strong> Hai una variedá de funciones de Mastodon que puen ayudate a algamar audiencies más grandes cuando s'activen. Dedica un momentu pa revisar estes opciones y asegurate de que s'axusten al to casu."
+    hint_html: "<strong>Personaliza cómo quies que s'atope esti perfil y los sos artículos.</strong> Hai una variedá de funciones de Mastodon que puen ayudate a algamar audiencies más grandes cuando s'activen. Dedica un momentu pa revisar estes opciones y asegurate de que s'axusten al to casu."
     privacy: Privacidá
     reach: Algame
-    reach_hint_html: Controla si quies que te descubran ya te sigan perfiles nuevos. ¿Quies que los tos artículos apaezan na pantalla «Esploración»? ¿Quies qu'otres persones te vean na recomendación de cuentes? ¿Quies aceptar toles solicitúes de siguimientu automáticamente o tener un control minuciosu de caúna?
+    reach_hint_html: Controla si quies que te descubran y te sigan perfiles nuevos. ¿Quies que los tos artículos apaezan na pantalla «Esploración»? ¿Quies qu'otres persones te vean na recomendación de cuentes? ¿Quies aceptar toles solicitúes de siguimientu automáticamente o tener un control minuciosu de caúna?
     search: Busca
     search_hint_html: Controla cómo quies que t'atopen. ¿Quies que la xente t'atope polo qu'espublices públicamente? ¿Quies que la xente fuera de Mástodon atope esti perfil cuando busque na web? Ten en cuenta que nun se pue garantizar la esclusión total de tolos motores de busca.
-    title: Privacidá ya algame
+    title: Privacidá y algame
   privacy_policy:
     title: Política de privacidá
   relationships:
@@ -797,11 +798,11 @@ ast:
     export: Esportación de datos
     featured_tags: Etiquetes destacaes
     import: Importación
-    import_and_export: Importación ya esportación
+    import_and_export: Importación y esportación
     migrate: Migración de la cuenta
     preferences: Preferencies
     profile: Perfil públicu
-    relationships: Perfiles que sigues ya te siguen
+    relationships: Perfiles que sigues y te siguen
     statuses_cleanup: Desaniciu automáticu d'artículos
     two_factor_authentication: Autenticación en dos pasos
     webauthn_authentication: Llaves de seguranza
@@ -822,7 +823,7 @@ ast:
     open_in_web: Abrir na web
     pin_errors:
       direct: Nun se puen fixar los artículos que son visibles namás pa los usuarios mentaos
-      limit: Xá fixesti'l númberu máximu d'artículos
+      limit: Yá fixesti'l númberu máximu d'artículos
       ownership: Nun se pue fixar l'artículu d'otru perfil
       reblog: Nun se pue fixar un artículu compartíu
     poll:
@@ -877,15 +878,15 @@ ast:
     webauthn: Llaves de seguranza
   user_mailer:
     suspicious_sign_in:
-      explanation: Detectemos un aniciu de sesión a la to cuenta dende una direición IP nueva.
+      explanation: Detectemos un aniciu de sesión na to cuenta dende una direición IP nueva.
       subject: Accedióse a la to cuenta dende una direición IP nueva
     warning:
       appeal: Unviar una apellación
       appeal_description: Si te paez que ye un error, pues unviar una apellación al personal de %{instance}.
       explanation:
-        disable: Xá nun pues usar la cuenta mas el perfil ya otros datos siguen intautos. Pues solicitar una copia de seguranza de los datos, camudar la configuración de la cuenta o desaniciar la cuenta.
-        silence: Pues siguir usando la cuenta mas namás vas ver los artículos de los perfiles que xá siguieres nesti sirvidor ya ye posible que se t'escluya de dalgunes funciones de descubrimientu. Por embargu, otros perfiles entá puen siguite manualmente.
-        suspend: Xá nun pues usar la cuenta nin se pue acceder a los datos del to perfil. Pues aniciar la sesión pa pidir una copia de seguranza de los tos datos hasta que se desanicien en 30 díes, mas vamos caltener dalgunos datos básicos pa evitar que te saltes la suspensión.
+        disable: Yá nun pues usar la cuenta mas el perfil y otros datos siguen intautos. Pues solicitar una copia de seguranza de los datos, camudar la configuración de la cuenta o desaniciar la cuenta.
+        silence: Pues siguir usando la cuenta mas namás vas ver los artículos de los perfiles que yá siguieres nesti sirvidor y ye posible que se t'escluya de dalgunes funciones de descubrimientu. Por embargu, otros perfiles entá puen siguite manualmente.
+        suspend: Yá nun pues usar la cuenta nin se pue acceder a los datos del to perfil. Pues aniciar la sesión pa pidir una copia de seguranza de los tos datos hasta que se desanicien en 30 díes, mas vamos caltener dalgunos datos básicos pa evitar que te saltes la suspensión.
       reason: 'Motivu:'
       statuses: 'Artículos citaos:'
       subject:
@@ -896,14 +897,27 @@ ast:
         none: Alvertencia
         suspend: Cuenta suspendida
     welcome:
+      apps_title: Aplicaciones de Mastodon
+      edit_profile_title: Personalización del perfil
       explanation: Equí tienes dalgunos conseyos pa que comiences
+      feature_action: Saber más
+      follows_title: A quién siguir
+      follows_view_more: Ver más perfiles a los que siguir
+      hashtags_recent_count:
+        one: "%{people} persona nos últimos 2 díes"
+        other: "%{people} persones nos últimos 2 díes"
+      hashtags_subtitle: Esplora qué ta en tendencia dende hai 2 díes
+      hashtags_title: Etiquetes en tendencia
+      hashtags_view_more: Ver más etiquetes en tendencia
+      post_step: Saluda al mundu con semeyes, vídeos, testu o encuestes.
+      sign_in_action: Aniciar la sesión
       subject: Afáyate en Mastodon
       title: "¡Afáyate, %{name}!"
   users:
     follow_limit_reached: Nun pues siguir a más de %{limit} persones
     invalid_otp_token: El códigu de l'autenticación en dos pasos nun ye válidu
     rate_limited: Fixéronse milenta intentos d'autenticación. Volvi tentalo dempués.
-    seamless_external_login: Aniciesti la sesión pente un serviciu esternu, polo que la configuración de la contraseña ya de la direición de corréu electrónicu nun tán disponibles.
+    seamless_external_login: Aniciesti la sesión pente un serviciu esternu, polo que la configuración de la contraseña y de la direición de corréu electrónicu nun tán disponibles.
     signed_in_as: 'Aniciesti la sesión como:'
   verification:
     verification: Verificación
diff --git a/config/locales/devise.ast.yml b/config/locales/devise.ast.yml
index 47372c2f07a68d..c3536070439b9c 100644
--- a/config/locales/devise.ast.yml
+++ b/config/locales/devise.ast.yml
@@ -6,7 +6,7 @@ ast:
       send_instructions: Nunos minutos vas recibir un mensaxe coles instrucciones pa saber cómo confirmar la direición de corréu electrónicu. Revisa la carpeta Puxarra si nun recibiesti esti mensaxe.
       send_paranoid_instructions: Si la direición de corréu electrónicu esiste na nuesa base de datos, nunos minutos vas recibir un mensaxe coles instrucciones pa saber cómo confirmala. Revisa la carpeta Puxarra si nun recibiesti esti mensaxe.
     failure:
-      already_authenticated: Xá aniciesti la sesión.
+      already_authenticated: Yá aniciesti la sesión.
       last_attempt: Quédate un intentu más enantes de bloquiar la cuenta.
       locked: La cuenta ta bloquiada.
       pending: La cuenta sigue en revisión.
@@ -16,9 +16,9 @@ ast:
     mailer:
       confirmation_instructions:
         action: Verificar la direición de corréu electrónicu
-        explanation: Creesti una cuenta en %{host} con esta direición de corréu electrónicu ya tas a un calcu d'activala. Si nun fixesti esta aición, inora esti mensaxe.
-        explanation_when_pending: Solicitesti una invitación a %{host} con esta direición de corréu electrónicu. Namás que confirmes la direición de corréu electrónicu, vamos revisar la solicitú. Entrín ya non, pues aniciar la sesión pa camudar los detalles o desaniciar la cuenta, mas nun pues acceder a la mayoría de funciones hasta que la cuenta nun tea aprobada. Si se refuga la solicitú, nun ye necesario que faigas nada más o si, per otra parte, tu nun fixesti esta aición, inora esti mensaxe.
-        extra_html: Revisa tamién <a href="%{terms_path}">les normes del sirvidor</a> ya <a href="%{policy_path}">los nuesos términos del serviciu</a>.
+        explanation: Creesti una cuenta en %{host} con esta direición de corréu electrónicu y tas a un calcu d'activala. Si nun fixesti esta aición, inora esti mensaxe.
+        explanation_when_pending: Solicitesti una invitación a %{host} con esta direición de corréu electrónicu. Namás que confirmes la direición de corréu electrónicu, vamos revisar la solicitú. Entrín y non, pues aniciar la sesión pa camudar los detalles o desaniciar la cuenta, mas nun pues acceder a la mayoría de funciones hasta que la cuenta nun tea aprobada. Si se refuga la solicitú, nun ye necesario que faigas nada más o si, per otra parte, tu nun fixesti esta aición, inora esti mensaxe.
+        extra_html: Revisa tamién <a href="%{terms_path}">les normes del sirvidor</a> y <a href="%{policy_path}">los nuesos términos del serviciu</a>.
         subject: 'Mastodon: instrucciones de confirmación de «%{instance}»'
         title: Verificación de la direición de corréu electrónicu
       email_changed:
@@ -38,7 +38,7 @@ ast:
       reset_password_instructions:
         action: Camudar la contraseña
         explanation: Solicitesti una contraseña nueva pa la to cuenta.
-        extra: Si nun solicitesti esta aición, inora esti mensaxe. La contraseña nun va camudar hasta que nun accedas al enllaz d'arriba ya crees una.
+        extra: Si nun solicitesti esta aición, inora esti mensaxe. La contraseña nun va camudar hasta que nun accedas al enllaz d'arriba y crees una.
         subject: 'Mastodon: instrucciones pa camudar la contraseña'
         title: Cambéu de la contaseña
       two_factor_disabled:
@@ -48,7 +48,7 @@ ast:
         subject: 'Mastodon: activóse l''autenticación en dos pasos'
         title: Autenticación de dos pasos desactivada
       two_factor_recovery_codes_changed:
-        explanation: Invalidáronse los códigos de recuperación anteriores ya xeneráronse otros nuevos.
+        explanation: Invalidáronse los códigos de recuperación anteriores y xeneráronse otros nuevos.
         subject: 'Mastodon: volvieron xenerase los códigos de recuperación de l''autenticación en dos pasos'
       unlock_instructions:
         subject: 'Mastodon: instrucciones de desbloquéu'
@@ -68,16 +68,16 @@ ast:
     passwords:
       send_instructions: Si la direición de corréu electrónicu esiste na nuesa base de datos, nunos minutos vas recibir un enllaz pa recuperar la contraseña. Revisa la carpeta Puxarra si nun recibiesti esti mensaxe.
       send_paranoid_instructions: Si la direición de corréu electrónicu esiste na nuesa base de datos, nunos minutos vas recibir un enllaz pa recuperar la contraseña. Revisa la carpeta Puxarra si nun recibiesti esti mensaxe.
-      updated: La contraseña camudó correutamente. Xá aniciesti la sesión.
+      updated: La contraseña camudó correutamente. yá aniciesti la sesión.
       updated_not_active: La contraseña camudó correutamente.
     registrations:
       destroyed: "¡Ta llueu! La cuenta anulóse correutamente. Esperamos volver vete pronto."
       signed_up: "¡Afáyate! Rexistréstite correutamente."
       signed_up_but_inactive: Rexistréstite correutamente. Por embargu, nun se pudo aniciar la sesión porque la cuenta entá nun s'activó.
       signed_up_but_locked: Rexistréstite correutamente. Por embargu, nun se pudo aniciar la sesión porque la cuenta ta bloquiada.
-      signed_up_but_pending: Unvióse un mensaxe a la direición de corréu electrónicu que contién un enllaz de confirmación. Darréu de calcar nel enllaz, vamos revisar la solicitú ya si s'aprueba, avisámoste.
-      signed_up_but_unconfirmed: Unvióse un mensaxe de confirmación a la to direición de corréu electrónicu. Sigui l'enllaz p'activar la cuenta ya revisa la carpeta Puxarra si nun recibiesti esti mensaxe.
-      update_needs_confirmation: Anovesti la cuenta correutamente, mas tenemos de verificar la direición de corréu electrónicu nueva. Revisa'l to corréu electrónicu ya sigui l'enllaz de confirmación pa confirmar esta direición. Si nun recibiesti'l mensaxe, revisa la carpeta Puxarra.
+      signed_up_but_pending: Unvióse un mensaxe a la direición de corréu electrónicu que contién un enllaz de confirmación. Darréu de calcar nel enllaz, vamos revisar la solicitú y si s'aprueba, avisámoste.
+      signed_up_but_unconfirmed: Unvióse un mensaxe de confirmación a la to direición de corréu electrónicu. Sigui l'enllaz p'activar la cuenta y revisa la carpeta Puxarra si nun recibiesti esti mensaxe.
+      update_needs_confirmation: Anovesti la cuenta correutamente, mas tenemos de verificar la direición de corréu electrónicu nueva. Revisa'l to corréu electrónicu y sigui l'enllaz de confirmación pa confirmar esta direición. Si nun recibiesti'l mensaxe, revisa la carpeta Puxarra.
       updated: La cuenta anovóse correutamente.
     sessions:
       already_signed_out: Zarresti la sesión correutamente.
@@ -89,7 +89,7 @@ ast:
       unlocked: La cuenta desbloquióse correutamente. Anicia la sesión pa siguir.
   errors:
     messages:
-      already_confirmed: xá se confirmó, prueba a aniciar la sesión
+      already_confirmed: yá se confirmó, prueba a aniciar la sesión
       not_saved:
         one: '1 error torgó que «%{resource}» se guardare:'
         other: "%{count} errores torgaron que «%{resource}» se guardaren:"
diff --git a/config/locales/devise.ga.yml b/config/locales/devise.ga.yml
index cc8ae0874ea816..ca51bb9467dbe6 100644
--- a/config/locales/devise.ga.yml
+++ b/config/locales/devise.ga.yml
@@ -91,7 +91,7 @@ ga:
       send_instructions: Má tá do sheoladh ríomhphoist inár mbunachar sonraí, gheobhaidh tú nasc athshlánaithe pasfhocail ag do sheoladh ríomhphoist i gceann cúpla nóiméad. Seiceáil d'fhillteán turscair mura bhfuair tú an ríomhphost seo.
       send_paranoid_instructions: Má tá do sheoladh ríomhphoist inár mbunachar sonraí, gheobhaidh tú nasc athshlánaithe pasfhocail ag do sheoladh ríomhphoist i gceann cúpla nóiméad. Seiceáil d'fhillteán turscair mura bhfuair tú an ríomhphost seo.
       updated: Athraíodh do phasfhocal go rathúil. Tá tú sínithe isteach anois.
-      updated_not_active: Your password has been changed successfully.
+      updated_not_active: Athraíodh do phasfhocal go rathúil.
     registrations:
       destroyed: Slán! Cealaíodh do chuntas go rathúil. Tá súil againn tú a fheiceáil arís go luath.
       signed_up: Fáilte romhat! D'éirigh leat síniú suas.
diff --git a/config/locales/doorkeeper.ast.yml b/config/locales/doorkeeper.ast.yml
index 0564e49dac18ff..0df15a07b62330 100644
--- a/config/locales/doorkeeper.ast.yml
+++ b/config/locales/doorkeeper.ast.yml
@@ -44,7 +44,7 @@ ast:
         prompt_html: "%{client_name}, que ye una aplicación de terceros, quier tener accesu a la cuenta. <strong>Si nun t'enfotes nella, nun habríes autorizala.</strong>"
         review_permissions: Revisión de los permisos
       show:
-        title: Copia esti códigu d'autorización ya apiégalu na aplicación.
+        title: Copia esti códigu d'autorización y apiégalu na aplicación.
     authorized_applications:
       buttons:
         revoke: Revocar
@@ -67,7 +67,7 @@ ast:
     grouped_scopes:
       access:
         read: Accesu de namás llectura
-        read/write: Accesu de llectura ya escritura
+        read/write: Accesu de llectura y escritura
         write: Accesu de namás escritura
       title:
         accounts: Cuentes
@@ -111,14 +111,14 @@ ast:
       read:statuses: mira tolos artículos
       write: modifica los datos de les cuentes
       write:accounts: modifica los perfiles
-      write:blocks: bloquia cuentes ya dominios
+      write:blocks: bloquia cuentes y dominios
       write:bookmarks: meter artículos en Marcadores
-      write:conversations: desaniciar ya desactivar los avisos de conversaciones
+      write:conversations: desaniciar y desactivar los avisos de conversaciones
       write:filters: crea peñeres
       write:follows: sigue a perfiles
       write:lists: crea llistes
       write:media: xube ficheros multimedia
-      write:mutes: desactiva los avisos de perfiles ya de conversaciones
+      write:mutes: desactiva los avisos de perfiles y de conversaciones
       write:notifications: borra los avisos
       write:reports: informa d'otros perfiles
       write:statuses: espubliza artículos
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index a45ba290b74a20..fecdab4c7d7316 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -639,6 +639,7 @@ en-GB:
       report: 'Report #%{id}'
       reported_account: Reported account
       reported_by: Reported by
+      reported_with_application: Reported with application
       resolved: Resolved
       resolved_msg: Report successfully resolved!
       skip_to_actions: Skip to actions
diff --git a/config/locales/es-AR.yml b/config/locales/es-AR.yml
index 8c55551ce06320..5add90ae62c992 100644
--- a/config/locales/es-AR.yml
+++ b/config/locales/es-AR.yml
@@ -639,6 +639,7 @@ es-AR:
       report: 'Denuncia #%{id}'
       reported_account: Cuenta denunciada
       reported_by: Denunciada por
+      reported_with_application: Informado a través de la aplicación
       resolved: Resueltas
       resolved_msg: "¡Denuncia exitosamente resuelta!"
       skip_to_actions: Ir directamente a las acciones
diff --git a/config/locales/es-MX.yml b/config/locales/es-MX.yml
index 976b7a4f30cd00..22531d2403dfa1 100644
--- a/config/locales/es-MX.yml
+++ b/config/locales/es-MX.yml
@@ -226,6 +226,7 @@ es-MX:
         update_custom_emoji: Actualizar Emoji Personalizado
         update_domain_block: Actualizar el Bloqueo de Dominio
         update_ip_block: Actualizar regla IP
+        update_report: Actualizar informe
         update_status: Actualizar Estado
         update_user_role: Actualizar Rol
       actions:
@@ -638,6 +639,7 @@ es-MX:
       report: 'Reportar #%{id}'
       reported_account: Cuenta reportada
       reported_by: Reportado por
+      reported_with_application: Informado a través de la aplicación
       resolved: Resuelto
       resolved_msg: "¡La denuncia se ha resuelto correctamente!"
       skip_to_actions: Ir directamente a las acciones
diff --git a/config/locales/es.yml b/config/locales/es.yml
index aef5100a6d1fea..567526fe8b7494 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -226,6 +226,7 @@ es:
         update_custom_emoji: Actualizar Emoji Personalizado
         update_domain_block: Actualizar el Bloqueo de Dominio
         update_ip_block: Actualizar regla IP
+        update_report: Actualizar informe
         update_status: Actualizar Publicación
         update_user_role: Actualizar Rol
       actions:
@@ -638,6 +639,7 @@ es:
       report: 'Reportar #%{id}'
       reported_account: Cuenta reportada
       reported_by: Reportado por
+      reported_with_application: Informado a través de la aplicación
       resolved: Resuelto
       resolved_msg: "¡La denuncia se ha resuelto correctamente!"
       skip_to_actions: Ir directamente a las acciones
diff --git a/config/locales/ga.yml b/config/locales/ga.yml
index 370f3e82e62ed4..647c46d7cf2726 100644
--- a/config/locales/ga.yml
+++ b/config/locales/ga.yml
@@ -1656,7 +1656,7 @@ ga:
     mutual: Frithpháirteach
     primary: Príomha
     relationship: Gaol
-    remove_selected_domains: Remove all followers from the selected domains
+    remove_selected_domains: Bain gach leantóir ó na fearainn roghnaithe
     remove_selected_followers: Bain leantóirí roghnaithe
     remove_selected_follows: Dí-lean úsáideoirí roghnaithe
     status: Stádas cuntais
@@ -2029,6 +2029,6 @@ ga:
     invalid_credential: Eochair shlándála neamhbhailí
     nickname_hint: Cuir isteach leasainm d'eochair shlándála nua
     not_enabled: Níl WebAuthn cumasaithe agat fós
-    not_supported: This browser doesn't support security keys
-    otp_required: To use security keys please enable two-factor authentication first.
-    registered_on: Registered on %{date}
+    not_supported: Ní thacaíonn an brabhsálaí seo le heochracha slándála
+    otp_required: Chun eochracha slándála a úsáid cumasaigh fíordheimhniú dhá fhachtóir ar dtús.
+    registered_on: Cláraithe ar %{date}
diff --git a/config/locales/he.yml b/config/locales/he.yml
index ecafbec960ba00..105bd059f23c87 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -663,6 +663,7 @@ he:
       report: 'דווח על #%{id}'
       reported_account: חשבון מדווח
       reported_by: דווח על ידי
+      reported_with_application: דיווחים באמצעות יישומון
       resolved: פתור
       resolved_msg: הדו"ח נפתר בהצלחה!
       skip_to_actions: דלג/י לפעולות
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 004f5b4d043410..1e717b6c204292 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -232,6 +232,7 @@ lt:
         update_custom_emoji: Atnaujinti pasirinktinį jaustuką
         update_domain_block: Atnaujinti domeno bloką
         update_ip_block: Atnaujinti IP taisyklę
+        update_report: Atnaujinti ataskaitą
         update_status: Atnaujinti įrašą
         update_user_role: Atnaujinti vaidmenį
       actions:
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 7497f1784382db..b0c733102ea886 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -232,6 +232,7 @@ pl:
         update_custom_emoji: Aktualizuj niestandardowe emoji
         update_domain_block: Zaktualizuj blokadę domeny
         update_ip_block: Aktualizuj regułę IP
+        update_report: Wiadomości or raporcie
         update_status: Aktualizuj wpis
         update_user_role: Aktualizuj rolę
       actions:
@@ -662,6 +663,7 @@ pl:
       report: 'Zgłoszenie #%{id}'
       reported_account: Zgłoszone konto
       reported_by: Zgłaszający
+      reported_with_application: Zareportowano przez aplikację
       resolved: Rozwiązane
       resolved_msg: Pomyślnie rozwiązano zgłoszenie.
       skip_to_actions: Przejdź do akcji
diff --git a/config/locales/simple_form.ast.yml b/config/locales/simple_form.ast.yml
index d1950ab15f87e2..c222c9aef5ba30 100644
--- a/config/locales/simple_form.ast.yml
+++ b/config/locales/simple_form.ast.yml
@@ -6,7 +6,7 @@ ast:
         note: 'Pues @mentar a otros perfiles o poner #etiquetes.'
         unlocked: Los perfiles van ser a siguite ensin solicitar la to aprobación. Desmarca esta opción si quies revisar les solicitúes de siguimientu y escoyer si aceptales o refugales.
       admin_account_action:
-        text_html: Opcional. Pues usar la sintaxis de los artículos ya amestar <a href="%{path}">alvertencies preconfiguraes</a> p'aforrar tiempu
+        text_html: Opcional. Pues usar la sintaxis de los artículos y amestar <a href="%{path}">alvertencies preconfiguraes</a> p'aforrar tiempu
         type_html: Escueyi qué facer con <strong>%{acct}</strong>
         types:
           none: Usa esta opción pa unviar una alvertencia al perfil, ensin aicionar nenguna otra aición.
@@ -18,14 +18,14 @@ ast:
         text: Pues usar la sintaxis de los artículos. Ten en cuenta l'espaciu que l'anunciu va ocupar na pantalla del usuariu/a
       defaults:
         autofollow: Les persones que se rexistren pente la invitación van siguite automáticamente
-        bot: Avisa a otres persones de qu'esta cuenta fai principalmente aiciones automatizaes ya de que ye posible que nun tean supervisaes
-        digest: Namás s'unvia dempués d'un periodu llongu d'inactividá ya namás si recibiesti dalgún mensaxe personal demientres la to ausencia
+        bot: Avisa a otres persones de qu'esta cuenta fai principalmente aiciones automatizaes y de que ye posible que nun tean supervisaes
+        digest: Namás s'unvia dempués d'un periodu llongu d'inactividá y namás si recibiesti dalgún mensaxe personal demientres la to ausencia
         irreversible: Los artículos peñeraos desapaecen de forma irreversible, magar que la peñera se quite dempués
-        locale: La llingua de la interfaz, los mensaxes per corréu electrónicu ya los avisos push
+        locale: La llingua de la interfaz, los mensaxes per corréu electrónicu y los avisos push
         password: Usa polo menos 8 caráuteres
-        setting_aggregate_reblogs: Nun amuesa los artículos compartíos nuevos que xá se compartieren de recién (namás afeuta a los artículos compartíos d'agora)
+        setting_aggregate_reblogs: Nun amuesa los artículos compartíos nuevos que yá se compartieren de recién (namás afeuta a los artículos compartíos d'agora)
         setting_always_send_emails: Los avisos nun se suelen unviar per corréu electrónicu si uses activamente Mastodon
-        setting_default_sensitive: El conteníu multimedia sensible anúbrese por defeutu ya pue amosase al calcar nelli
+        setting_default_sensitive: El conteníu multimedia sensible anúbrese por defeutu y pue amosase al calcar nelli
         setting_display_media_default: Anubrilu cuando se marque como sensible
         setting_display_media_hide_all: Anubrilu siempres
         setting_display_media_show_all: Amosalu siempres
@@ -37,10 +37,10 @@ ast:
         custom_css: Pues aplicar estilos personalizaos a la versión web de Mastodon.
         mascot: Anula la ilustración na interfaz web avanzada.
         require_invite_text: Cuando los rexistros riquen una aprobación manual, el campu «¿Por qué quies xunite?» vuélvese obligatoriu
-        site_extended_description: Cualesquier tipu d'información adicional que pueda ser útil pa visitantes ya pa perfiles rexistraos. El testu pue estructurase cola sintaxis de Mastodon.
+        site_extended_description: Cualesquier tipu d'información adicional que pueda ser útil pa visitantes y pa perfiles rexistraos. El testu pue estructurase cola sintaxis de Mastodon.
         site_short_description: Un descripción curtia qu'ayuda a identificar de forma única al sirvidor. ¿Quién lu lleva?, ¿pa quién ye?
-        theme: L'estilu que los visitantes ya los perfiles nuevos usen.
-        trends: Les tendencies amuesen artículos, etiquetes ya noticies que tean ganando popularidá nesti sirvidor.
+        theme: L'estilu que los visitantes y los perfiles nuevos usen.
+        trends: Les tendencies amuesen artículos, etiquetes y noticies que tean ganando popularidá nesti sirvidor.
       form_challenge:
         current_password: Tas entrando a una área segura
       imports:
@@ -49,7 +49,7 @@ ast:
         text: Esto va ayudanos a revisar la to solicitú
       ip_block:
         comment: Opcional. Un recordatoriu de por qué amestesti esta norma.
-        expires_in: Les direiciones IP son un recursu finitu, suelen compartise ya cambiar de manes. Por esti motivu, nun s'aconseyen los bloqueos indefiníos de direiciones IP.
+        expires_in: Les direiciones IP son un recursu finitu, suelen compartise y cambiar de manes. Por esti motivu, nun s'aconseyen los bloqueos indefiníos de direiciones IP.
         severities:
           no_access: Bloquia l'accesu a tolos recursos
           sign_up_block: Fai que nun se puedan rexistrar cuentes nueves
@@ -58,11 +58,12 @@ ast:
         chosen_languages: Namás los artículos de les llingües que marques son los que van apaecer nes llinies de tiempu públiques
     labels:
       account:
-        discoverable: Destacar el perfil ya los artículos nos algoritmos de descubrimientu
+        discoverable: Destacar el perfil y los artículos nos algoritmos de descubrimientu
         fields:
           name: Etiqueta
           value: Conteníu
         indexable: Incluyir los artículos públicos nos resultaos de busca
+        show_collections: Amosar los perfiles a los que sigues y los que te siguen
       account_warning_preset:
         title: Títulu
       admin_account_action:
@@ -109,10 +110,11 @@ ast:
         setting_default_privacy: Privacidá de los artículos
         setting_default_sensitive: Marcar siempres tol conteníu como sensible
         setting_delete_modal: Amosar el diálogu de confirmación enantes de desaniciar un artículu
+        setting_disable_hover_cards: Desactivar la previsualización de perfiles al pasar el mur penriba
         setting_disable_swiping: Desactivar el movimientu de desplazamientu
         setting_display_media: Conteníu multimedia
         setting_expand_spoilers: Espander siempres los artículos marcaos con alvertencies de conteníu
-        setting_hide_network: Anubrir les cuentes que sigas ya te sigan
+        setting_hide_network: Anubrir les cuentes que sigas y te sigan
         setting_reduce_motion: Amenorgar el movimientu de les animaciones
         setting_system_font_ui: Usar la fonte predeterminada del sistema
         setting_theme: Estilu del sitiu
@@ -173,8 +175,9 @@ ast:
         text: Norma
       settings:
         indexable: Incluyir la páxina del perfil nos motores de busca
+        show_application: Amosar l'aplicación dende la que s'unvien los artículos
       tag:
-        listable: Permitir qu'esta etiqueta apaeza nes busques ya nes suxerencies
+        listable: Permitir qu'esta etiqueta apaeza nes busques y nes suxerencies
         name: Etiqueta
         trendable: Permitir qu'esta etiqueta apaeza nes tendencies
         usable: Permitir que los artículos usen esta etiqueta
diff --git a/config/locales/simple_form.kab.yml b/config/locales/simple_form.kab.yml
index 63e2b9aacf1bf6..e68355da6a9f24 100644
--- a/config/locales/simple_form.kab.yml
+++ b/config/locales/simple_form.kab.yml
@@ -86,6 +86,7 @@ kab:
         setting_advanced_layout: Rmed agrudem n web leqqayen
         setting_default_language: Tutlayt n tira
         setting_default_privacy: Tabaḍnit n tira
+        setting_display_media: Askanay n imidyaten
         setting_display_media_default: Akk-a kan
         setting_display_media_hide_all: Ffer-iten akk
         setting_display_media_show_all: Sken-iten-id akk

From 784e0885333769b47c8a94fde0c34bb14b1b93bb Mon Sep 17 00:00:00 2001
From: Michael Stanclift <mx@vmstan.com>
Date: Fri, 19 Jul 2024 03:30:26 -0500
Subject: [PATCH 1573/2191] Fix double border on column filter on narrow
 screens (#31068)

---
 app/javascript/styles/mastodon/components.scss | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 5a0a41c978e6b8..adcbad202d7de8 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -7380,6 +7380,11 @@ a.status-card {
   display: flex;
   flex-shrink: 0;
 
+  @media screen and (max-width: $no-gap-breakpoint) {
+    border-right: 0;
+    border-left: 0;
+  }
+
   button {
     background: transparent;
     border: 0;

From 05342529dd5ecdd6a737451f5c3ca55de24af3e9 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 19 Jul 2024 04:31:34 -0400
Subject: [PATCH 1574/2191] Reduce factory creation in AP activity move spec
 (#31064)

---
 spec/lib/activitypub/activity/move_spec.rb | 67 +++++++++-------------
 1 file changed, 27 insertions(+), 40 deletions(-)

diff --git a/spec/lib/activitypub/activity/move_spec.rb b/spec/lib/activitypub/activity/move_spec.rb
index d69ef215161210..02c3380ab3edd7 100644
--- a/spec/lib/activitypub/activity/move_spec.rb
+++ b/spec/lib/activitypub/activity/move_spec.rb
@@ -3,6 +3,9 @@
 require 'rails_helper'
 
 RSpec.describe ActivityPub::Activity::Move do
+  RSpec::Matchers.define_negated_matcher :not_be_following, :be_following
+  RSpec::Matchers.define_negated_matcher :not_be_requested, :be_requested
+
   let(:follower)         { Fabricate(:account) }
   let(:old_account)      { Fabricate(:account, uri: 'https://example.org/alice', domain: 'example.org', protocol: :activitypub, inbox_url: 'https://example.org/inbox') }
   let(:new_account)      { Fabricate(:account, uri: 'https://example.com/alice', domain: 'example.com', protocol: :activitypub, inbox_url: 'https://example.com/inbox', also_known_as: also_known_as) }
@@ -39,48 +42,36 @@
     end
 
     context 'when all conditions are met', :inline_jobs do
-      it 'sets moved account on old account' do
-        expect(old_account.reload.moved_to_account_id).to eq new_account.id
-      end
-
-      it 'makes followers unfollow old account' do
-        expect(follower.following?(old_account)).to be false
-      end
-
-      it 'makes followers follow-request the new account' do
-        expect(follower.requested?(new_account)).to be true
+      it 'sets moved on old account, followers unfollow old account, followers request the new account' do
+        expect(old_account.reload.moved_to_account_id)
+          .to eq new_account.id
+        expect(follower)
+          .to not_be_following(old_account)
+          .and be_requested(new_account)
       end
     end
 
     context "when the new account can't be resolved" do
       let(:returned_account) { nil }
 
-      it 'does not set moved account on old account' do
-        expect(old_account.reload.moved_to_account_id).to be_nil
-      end
-
-      it 'does not make followers unfollow old account' do
-        expect(follower.following?(old_account)).to be true
-      end
-
-      it 'does not make followers follow-request the new account' do
-        expect(follower.requested?(new_account)).to be false
+      it 'does not set moved on old account, does not unfollow old, does not follow request new' do
+        expect(old_account.reload.moved_to_account_id)
+          .to be_nil
+        expect(follower)
+          .to be_following(old_account)
+          .and not_be_requested(new_account)
       end
     end
 
     context 'when the new account does not references the old account' do
       let(:also_known_as) { [] }
 
-      it 'does not set moved account on old account' do
-        expect(old_account.reload.moved_to_account_id).to be_nil
-      end
-
-      it 'does not make followers unfollow old account' do
-        expect(follower.following?(old_account)).to be true
-      end
-
-      it 'does not make followers follow-request the new account' do
-        expect(follower.requested?(new_account)).to be false
+      it 'does not set moved on old account, does not unfollow old, does not follow request new' do
+        expect(old_account.reload.moved_to_account_id)
+          .to be_nil
+        expect(follower)
+          .to be_following(old_account)
+          .and not_be_requested(new_account)
       end
     end
 
@@ -91,16 +82,12 @@
         redis.del("move_in_progress:#{old_account.id}")
       end
 
-      it 'does not set moved account on old account' do
-        expect(old_account.reload.moved_to_account_id).to be_nil
-      end
-
-      it 'does not make followers unfollow old account' do
-        expect(follower.following?(old_account)).to be true
-      end
-
-      it 'does not make followers follow-request the new account' do
-        expect(follower.requested?(new_account)).to be false
+      it 'does not set moved on old account, does not unfollow old, does not follow request new' do
+        expect(old_account.reload.moved_to_account_id)
+          .to be_nil
+        expect(follower)
+          .to be_following(old_account)
+          .and not_be_requested(new_account)
       end
     end
   end

From adadfdbc0355d9195815d25ad22fdee96e13ce6c Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 19 Jul 2024 04:32:43 -0400
Subject: [PATCH 1575/2191] Update `strong_migrations` to version 2.0.0
 (#31061)

---
 Gemfile      | 2 +-
 Gemfile.lock | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index ef52d50cac128d..135b94c7739b37 100644
--- a/Gemfile
+++ b/Gemfile
@@ -88,7 +88,7 @@ gem 'sidekiq-unique-jobs', '~> 7.1'
 gem 'simple_form', '~> 5.2'
 gem 'simple-navigation', '~> 4.4'
 gem 'stoplight', '~> 4.1'
-gem 'strong_migrations', '1.8.0'
+gem 'strong_migrations'
 gem 'tty-prompt', '~> 0.23', require: false
 gem 'twitter-text', '~> 3.1.0'
 gem 'tzinfo-data', '~> 1.2023'
diff --git a/Gemfile.lock b/Gemfile.lock
index c9781a40500cb0..c08c14cb5cbc07 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -821,8 +821,8 @@ GEM
     stoplight (4.1.0)
       redlock (~> 1.0)
     stringio (3.1.1)
-    strong_migrations (1.8.0)
-      activerecord (>= 5.2)
+    strong_migrations (2.0.0)
+      activerecord (>= 6.1)
     strscan (3.1.0)
     swd (1.3.0)
       activesupport (>= 3)
@@ -1046,7 +1046,7 @@ DEPENDENCIES
   simplecov-lcov (~> 0.8)
   stackprof
   stoplight (~> 4.1)
-  strong_migrations (= 1.8.0)
+  strong_migrations
   test-prof
   thor (~> 1.2)
   tty-prompt (~> 0.23)

From 2e63e802b32599537d80f524628a5affeb089df5 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 19 Jul 2024 12:13:50 +0200
Subject: [PATCH 1576/2191] Fix inconsistent padding in glitch-soc's grouped
 notifications (#2784)

---
 app/javascript/flavours/glitch/styles/components.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index bcc3655155940e..0bc63e247a34f2 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -11046,7 +11046,7 @@ noscript {
 }
 
 .notification-ungrouped {
-  padding: 16px 24px;
+  padding: 10px 14px; // glitch: reduced padding
   border-bottom: 1px solid var(--background-border-color);
 
   &__header {

From e768b23aa995130c14a7160165eabcf1e8570dfd Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 19 Jul 2024 17:26:44 +0200
Subject: [PATCH 1577/2191] Remove routerHistory parameters from composer
 actions  (#31077)

---
 app/javascript/mastodon/actions/compose.js    | 29 ++++++++++---------
 app/javascript/mastodon/actions/statuses.js   |  8 ++---
 app/javascript/mastodon/components/router.tsx |  2 +-
 app/javascript/mastodon/components/status.jsx |  4 +--
 .../mastodon/components/status_action_bar.jsx | 12 ++++----
 .../mastodon/containers/status_container.jsx  | 26 ++++++++---------
 .../account_timeline/components/header.jsx    | 11 +++----
 .../containers/header_container.jsx           |  8 ++---
 .../compose/components/compose_form.jsx       |  7 ++---
 .../containers/compose_form_container.js      |  4 +--
 .../components/conversation.jsx               |  6 ++--
 .../notifications/components/notification.jsx |  2 +-
 .../containers/notification_container.js      |  4 +--
 .../mastodon/features/onboarding/index.jsx    |  7 ++---
 .../picture_in_picture/components/footer.jsx  |  4 +--
 .../features/status/components/action_bar.jsx | 15 ++++------
 .../containers/detailed_status_container.js   | 20 ++++++-------
 .../mastodon/features/status/index.jsx        | 22 +++++++-------
 18 files changed, 91 insertions(+), 100 deletions(-)

diff --git a/app/javascript/mastodon/actions/compose.js b/app/javascript/mastodon/actions/compose.js
index 0bcba7d57fe78b..4f2ed450dd6c38 100644
--- a/app/javascript/mastodon/actions/compose.js
+++ b/app/javascript/mastodon/actions/compose.js
@@ -4,6 +4,7 @@ import axios from 'axios';
 import { throttle } from 'lodash';
 
 import api from 'mastodon/api';
+import { browserHistory } from 'mastodon/components/router';
 import { search as emojiSearch } from 'mastodon/features/emoji/emoji_mart_search_light';
 import { tagHistory } from 'mastodon/settings';
 
@@ -88,9 +89,9 @@ const messages = defineMessages({
   saved: { id: 'compose.saved.body', defaultMessage: 'Post saved.' },
 });
 
-export const ensureComposeIsVisible = (getState, routerHistory) => {
+export const ensureComposeIsVisible = (getState) => {
   if (!getState().getIn(['compose', 'mounted'])) {
-    routerHistory.push('/publish');
+    browserHistory.push('/publish');
   }
 };
 
@@ -110,14 +111,14 @@ export function changeCompose(text) {
   };
 }
 
-export function replyCompose(status, routerHistory) {
+export function replyCompose(status) {
   return (dispatch, getState) => {
     dispatch({
       type: COMPOSE_REPLY,
       status: status,
     });
 
-    ensureComposeIsVisible(getState, routerHistory);
+    ensureComposeIsVisible(getState);
   };
 }
 
@@ -133,38 +134,38 @@ export function resetCompose() {
   };
 }
 
-export const focusCompose = (routerHistory, defaultText) => (dispatch, getState) => {
+export const focusCompose = (defaultText) => (dispatch, getState) => {
   dispatch({
     type: COMPOSE_FOCUS,
     defaultText,
   });
 
-  ensureComposeIsVisible(getState, routerHistory);
+  ensureComposeIsVisible(getState);
 };
 
-export function mentionCompose(account, routerHistory) {
+export function mentionCompose(account) {
   return (dispatch, getState) => {
     dispatch({
       type: COMPOSE_MENTION,
       account: account,
     });
 
-    ensureComposeIsVisible(getState, routerHistory);
+    ensureComposeIsVisible(getState);
   };
 }
 
-export function directCompose(account, routerHistory) {
+export function directCompose(account) {
   return (dispatch, getState) => {
     dispatch({
       type: COMPOSE_DIRECT,
       account: account,
     });
 
-    ensureComposeIsVisible(getState, routerHistory);
+    ensureComposeIsVisible(getState);
   };
 }
 
-export function submitCompose(routerHistory) {
+export function submitCompose() {
   return function (dispatch, getState) {
     const status   = getState().getIn(['compose', 'text'], '');
     const media    = getState().getIn(['compose', 'media_attachments']);
@@ -214,8 +215,8 @@ export function submitCompose(routerHistory) {
         'Idempotency-Key': getState().getIn(['compose', 'idempotencyKey']),
       },
     }).then(function (response) {
-      if (routerHistory && (routerHistory.location.pathname === '/publish' || routerHistory.location.pathname === '/statuses/new') && window.history.state) {
-        routerHistory.goBack();
+      if ((browserHistory.location.pathname === '/publish' || browserHistory.location.pathname === '/statuses/new') && window.history.state) {
+        browserHistory.goBack();
       }
 
       dispatch(insertIntoTagHistory(response.data.tags, status));
@@ -249,7 +250,7 @@ export function submitCompose(routerHistory) {
         message: statusId === null ? messages.published : messages.saved,
         action: messages.open,
         dismissAfter: 10000,
-        onClick: () => routerHistory.push(`/@${response.data.account.username}/${response.data.id}`),
+        onClick: () => browserHistory.push(`/@${response.data.account.username}/${response.data.id}`),
       }));
     }).catch(function (error) {
       dispatch(submitComposeFail(error));
diff --git a/app/javascript/mastodon/actions/statuses.js b/app/javascript/mastodon/actions/statuses.js
index a60b80dc2c07ba..1907d3aa91ede1 100644
--- a/app/javascript/mastodon/actions/statuses.js
+++ b/app/javascript/mastodon/actions/statuses.js
@@ -93,7 +93,7 @@ export function redraft(status, raw_text) {
   };
 }
 
-export const editStatus = (id, routerHistory) => (dispatch, getState) => {
+export const editStatus = (id) => (dispatch, getState) => {
   let status = getState().getIn(['statuses', id]);
 
   if (status.get('poll')) {
@@ -104,7 +104,7 @@ export const editStatus = (id, routerHistory) => (dispatch, getState) => {
 
   api().get(`/api/v1/statuses/${id}/source`).then(response => {
     dispatch(fetchStatusSourceSuccess());
-    ensureComposeIsVisible(getState, routerHistory);
+    ensureComposeIsVisible(getState);
     dispatch(setComposeToStatus(status, response.data.text, response.data.spoiler_text));
   }).catch(error => {
     dispatch(fetchStatusSourceFail(error));
@@ -124,7 +124,7 @@ export const fetchStatusSourceFail = error => ({
   error,
 });
 
-export function deleteStatus(id, routerHistory, withRedraft = false) {
+export function deleteStatus(id, withRedraft = false) {
   return (dispatch, getState) => {
     let status = getState().getIn(['statuses', id]);
 
@@ -141,7 +141,7 @@ export function deleteStatus(id, routerHistory, withRedraft = false) {
 
       if (withRedraft) {
         dispatch(redraft(status, response.data.text));
-        ensureComposeIsVisible(getState, routerHistory);
+        ensureComposeIsVisible(getState);
       }
     }).catch(error => {
       dispatch(deleteStatusFail(id, error));
diff --git a/app/javascript/mastodon/components/router.tsx b/app/javascript/mastodon/components/router.tsx
index 42b926659cb713..33fb60abb74bfd 100644
--- a/app/javascript/mastodon/components/router.tsx
+++ b/app/javascript/mastodon/components/router.tsx
@@ -22,7 +22,7 @@ type LocationState = MastodonLocationState | null | undefined;
 
 type HistoryPath = Path | LocationDescriptor<LocationState>;
 
-const browserHistory = createBrowserHistory<LocationState>();
+export const browserHistory = createBrowserHistory<LocationState>();
 const originalPush = browserHistory.push.bind(browserHistory);
 const originalReplace = browserHistory.replace.bind(browserHistory);
 
diff --git a/app/javascript/mastodon/components/status.jsx b/app/javascript/mastodon/components/status.jsx
index 1723080e956e35..fe5f38889ba77f 100644
--- a/app/javascript/mastodon/components/status.jsx
+++ b/app/javascript/mastodon/components/status.jsx
@@ -268,7 +268,7 @@ class Status extends ImmutablePureComponent {
 
   handleHotkeyReply = e => {
     e.preventDefault();
-    this.props.onReply(this._properStatus(), this.props.history);
+    this.props.onReply(this._properStatus());
   };
 
   handleHotkeyFavourite = () => {
@@ -281,7 +281,7 @@ class Status extends ImmutablePureComponent {
 
   handleHotkeyMention = e => {
     e.preventDefault();
-    this.props.onMention(this._properStatus().get('account'), this.props.history);
+    this.props.onMention(this._properStatus().get('account'));
   };
 
   handleHotkeyOpen = () => {
diff --git a/app/javascript/mastodon/components/status_action_bar.jsx b/app/javascript/mastodon/components/status_action_bar.jsx
index c79eae8460c661..2a7bd0a3059ec9 100644
--- a/app/javascript/mastodon/components/status_action_bar.jsx
+++ b/app/javascript/mastodon/components/status_action_bar.jsx
@@ -118,7 +118,7 @@ class StatusActionBar extends ImmutablePureComponent {
     const { signedIn } = this.props.identity;
 
     if (signedIn) {
-      this.props.onReply(this.props.status, this.props.history);
+      this.props.onReply(this.props.status);
     } else {
       this.props.onInteractionModal('reply', this.props.status);
     }
@@ -157,15 +157,15 @@ class StatusActionBar extends ImmutablePureComponent {
   };
 
   handleDeleteClick = () => {
-    this.props.onDelete(this.props.status, this.props.history);
+    this.props.onDelete(this.props.status);
   };
 
   handleRedraftClick = () => {
-    this.props.onDelete(this.props.status, this.props.history, true);
+    this.props.onDelete(this.props.status, true);
   };
 
   handleEditClick = () => {
-    this.props.onEdit(this.props.status, this.props.history);
+    this.props.onEdit(this.props.status);
   };
 
   handlePinClick = () => {
@@ -173,11 +173,11 @@ class StatusActionBar extends ImmutablePureComponent {
   };
 
   handleMentionClick = () => {
-    this.props.onMention(this.props.status.get('account'), this.props.history);
+    this.props.onMention(this.props.status.get('account'));
   };
 
   handleDirectClick = () => {
-    this.props.onDirect(this.props.status.get('account'), this.props.history);
+    this.props.onDirect(this.props.status.get('account'));
   };
 
   handleMuteClick = () => {
diff --git a/app/javascript/mastodon/containers/status_container.jsx b/app/javascript/mastodon/containers/status_container.jsx
index 4a9b5257778b35..e2c0af35337be7 100644
--- a/app/javascript/mastodon/containers/status_container.jsx
+++ b/app/javascript/mastodon/containers/status_container.jsx
@@ -76,7 +76,7 @@ const makeMapStateToProps = () => {
 
 const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
 
-  onReply (status, router) {
+  onReply (status) {
     dispatch((_, getState) => {
       let state = getState();
 
@@ -86,10 +86,10 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
           modalProps: {
             message: intl.formatMessage(messages.replyMessage),
             confirm: intl.formatMessage(messages.replyConfirm),
-            onConfirm: () => dispatch(replyCompose(status, router)) },
+            onConfirm: () => dispatch(replyCompose(status)) },
         }));
       } else {
-        dispatch(replyCompose(status, router));
+        dispatch(replyCompose(status));
       }
     });
   },
@@ -144,22 +144,22 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
     }));
   },
 
-  onDelete (status, history, withRedraft = false) {
+  onDelete (status, withRedraft = false) {
     if (!deleteModal) {
-      dispatch(deleteStatus(status.get('id'), history, withRedraft));
+      dispatch(deleteStatus(status.get('id'), withRedraft));
     } else {
       dispatch(openModal({
         modalType: 'CONFIRM',
         modalProps: {
           message: intl.formatMessage(withRedraft ? messages.redraftMessage : messages.deleteMessage),
           confirm: intl.formatMessage(withRedraft ? messages.redraftConfirm : messages.deleteConfirm),
-          onConfirm: () => dispatch(deleteStatus(status.get('id'), history, withRedraft)),
+          onConfirm: () => dispatch(deleteStatus(status.get('id'), withRedraft)),
         },
       }));
     }
   },
 
-  onEdit (status, history) {
+  onEdit (status) {
     dispatch((_, getState) => {
       let state = getState();
       if (state.getIn(['compose', 'text']).trim().length !== 0) {
@@ -168,11 +168,11 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
           modalProps: {
             message: intl.formatMessage(messages.editMessage),
             confirm: intl.formatMessage(messages.editConfirm),
-            onConfirm: () => dispatch(editStatus(status.get('id'), history)),
+            onConfirm: () => dispatch(editStatus(status.get('id'))),
           },
         }));
       } else {
-        dispatch(editStatus(status.get('id'), history));
+        dispatch(editStatus(status.get('id')));
       }
     });
   },
@@ -185,12 +185,12 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
     }
   },
 
-  onDirect (account, router) {
-    dispatch(directCompose(account, router));
+  onDirect (account) {
+    dispatch(directCompose(account));
   },
 
-  onMention (account, router) {
-    dispatch(mentionCompose(account, router));
+  onMention (account) {
+    dispatch(mentionCompose(account));
   },
 
   onOpenMedia (statusId, media, index, lang) {
diff --git a/app/javascript/mastodon/features/account_timeline/components/header.jsx b/app/javascript/mastodon/features/account_timeline/components/header.jsx
index a2463b87649b82..403c423025ecd0 100644
--- a/app/javascript/mastodon/features/account_timeline/components/header.jsx
+++ b/app/javascript/mastodon/features/account_timeline/components/header.jsx
@@ -2,13 +2,11 @@ import PropTypes from 'prop-types';
 
 import { FormattedMessage } from 'react-intl';
 
-import { NavLink, withRouter } from 'react-router-dom';
+import { NavLink } from 'react-router-dom';
 
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-import { WithRouterPropTypes } from 'mastodon/utils/react_router';
-
 import InnerHeader from '../../account/components/header';
 
 import MemorialNote from './memorial_note';
@@ -36,7 +34,6 @@ class Header extends ImmutablePureComponent {
     hideTabs: PropTypes.bool,
     domain: PropTypes.string.isRequired,
     hidden: PropTypes.bool,
-    ...WithRouterPropTypes,
   };
 
   handleFollow = () => {
@@ -48,11 +45,11 @@ class Header extends ImmutablePureComponent {
   };
 
   handleMention = () => {
-    this.props.onMention(this.props.account, this.props.history);
+    this.props.onMention(this.props.account);
   };
 
   handleDirect = () => {
-    this.props.onDirect(this.props.account, this.props.history);
+    this.props.onDirect(this.props.account);
   };
 
   handleReport = () => {
@@ -155,4 +152,4 @@ class Header extends ImmutablePureComponent {
 
 }
 
-export default withRouter(Header);
+export default Header;
diff --git a/app/javascript/mastodon/features/account_timeline/containers/header_container.jsx b/app/javascript/mastodon/features/account_timeline/containers/header_container.jsx
index d55d8c58e416d6..90298879d7c967 100644
--- a/app/javascript/mastodon/features/account_timeline/containers/header_container.jsx
+++ b/app/javascript/mastodon/features/account_timeline/containers/header_container.jsx
@@ -77,12 +77,12 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
     }
   },
 
-  onMention (account, router) {
-    dispatch(mentionCompose(account, router));
+  onMention (account) {
+    dispatch(mentionCompose(account));
   },
 
-  onDirect (account, router) {
-    dispatch(directCompose(account, router));
+  onDirect (account) {
+    dispatch(directCompose(account));
   },
 
   onReblogToggle (account) {
diff --git a/app/javascript/mastodon/features/compose/components/compose_form.jsx b/app/javascript/mastodon/features/compose/components/compose_form.jsx
index 9b4d3dfeb5e2c8..b5e8dabb7b366d 100644
--- a/app/javascript/mastodon/features/compose/components/compose_form.jsx
+++ b/app/javascript/mastodon/features/compose/components/compose_form.jsx
@@ -10,8 +10,6 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
 
 import { length } from 'stringz';
 
-import { WithOptionalRouterPropTypes, withOptionalRouter } from 'mastodon/utils/react_router';
-
 import AutosuggestInput from '../../../components/autosuggest_input';
 import AutosuggestTextarea from '../../../components/autosuggest_textarea';
 import { Button } from '../../../components/button';
@@ -71,7 +69,6 @@ class ComposeForm extends ImmutablePureComponent {
     singleColumn: PropTypes.bool,
     lang: PropTypes.string,
     maxChars: PropTypes.number,
-    ...WithOptionalRouterPropTypes
   };
 
   static defaultProps = {
@@ -120,7 +117,7 @@ class ComposeForm extends ImmutablePureComponent {
       return;
     }
 
-    this.props.onSubmit(this.props.history || null);
+    this.props.onSubmit();
 
     if (e) {
       e.preventDefault();
@@ -317,4 +314,4 @@ class ComposeForm extends ImmutablePureComponent {
 
 }
 
-export default withOptionalRouter(injectIntl(ComposeForm));
+export default injectIntl(ComposeForm);
diff --git a/app/javascript/mastodon/features/compose/containers/compose_form_container.js b/app/javascript/mastodon/features/compose/containers/compose_form_container.js
index b5e5300334dcbc..bda2edba605d28 100644
--- a/app/javascript/mastodon/features/compose/containers/compose_form_container.js
+++ b/app/javascript/mastodon/features/compose/containers/compose_form_container.js
@@ -37,8 +37,8 @@ const mapDispatchToProps = (dispatch) => ({
     dispatch(changeCompose(text));
   },
 
-  onSubmit (router) {
-    dispatch(submitCompose(router));
+  onSubmit () {
+    dispatch(submitCompose());
   },
 
   onClearSuggestions () {
diff --git a/app/javascript/mastodon/features/direct_timeline/components/conversation.jsx b/app/javascript/mastodon/features/direct_timeline/components/conversation.jsx
index a2b72f7162af04..63dc705e40bde8 100644
--- a/app/javascript/mastodon/features/direct_timeline/components/conversation.jsx
+++ b/app/javascript/mastodon/features/direct_timeline/components/conversation.jsx
@@ -108,14 +108,14 @@ export const Conversation = ({ conversation, scrollKey, onMoveUp, onMoveDown })
           modalProps: {
             message: intl.formatMessage(messages.replyMessage),
             confirm: intl.formatMessage(messages.replyConfirm),
-            onConfirm: () => dispatch(replyCompose(lastStatus, history)),
+            onConfirm: () => dispatch(replyCompose(lastStatus)),
           },
         }));
       } else {
-        dispatch(replyCompose(lastStatus, history));
+        dispatch(replyCompose(lastStatus));
       }
     });
-  }, [dispatch, lastStatus, history, intl]);
+  }, [dispatch, lastStatus, intl]);
 
   const handleDelete = useCallback(() => {
     dispatch(deleteConversation(id));
diff --git a/app/javascript/mastodon/features/notifications/components/notification.jsx b/app/javascript/mastodon/features/notifications/components/notification.jsx
index 70a3252509c5ed..f1eada13595f82 100644
--- a/app/javascript/mastodon/features/notifications/components/notification.jsx
+++ b/app/javascript/mastodon/features/notifications/components/notification.jsx
@@ -101,7 +101,7 @@ class Notification extends ImmutablePureComponent {
     e.preventDefault();
 
     const { notification, onMention } = this.props;
-    onMention(notification.get('account'), this.props.history);
+    onMention(notification.get('account'));
   };
 
   handleHotkeyFavourite = () => {
diff --git a/app/javascript/mastodon/features/notifications/containers/notification_container.js b/app/javascript/mastodon/features/notifications/containers/notification_container.js
index 650acf4ccd4aa9..7b7e6e919c5f5e 100644
--- a/app/javascript/mastodon/features/notifications/containers/notification_container.js
+++ b/app/javascript/mastodon/features/notifications/containers/notification_container.js
@@ -34,8 +34,8 @@ const makeMapStateToProps = () => {
 };
 
 const mapDispatchToProps = dispatch => ({
-  onMention: (account, router) => {
-    dispatch(mentionCompose(account, router));
+  onMention: (account) => {
+    dispatch(mentionCompose(account));
   },
 
   onModalReblog (status, privacy) {
diff --git a/app/javascript/mastodon/features/onboarding/index.jsx b/app/javascript/mastodon/features/onboarding/index.jsx
index 529d53f2574781..d100a1c3d5f626 100644
--- a/app/javascript/mastodon/features/onboarding/index.jsx
+++ b/app/javascript/mastodon/features/onboarding/index.jsx
@@ -3,7 +3,7 @@ import { useCallback } from 'react';
 import { FormattedMessage, useIntl, defineMessages } from 'react-intl';
 
 import { Helmet } from 'react-helmet';
-import { Link, Switch, Route, useHistory } from 'react-router-dom';
+import { Link, Switch, Route } from 'react-router-dom';
 
 import { useDispatch } from 'react-redux';
 
@@ -35,11 +35,10 @@ const Onboarding = () => {
   const account = useAppSelector(state => state.getIn(['accounts', me]));
   const dispatch = useDispatch();
   const intl = useIntl();
-  const history = useHistory();
 
   const handleComposeClick = useCallback(() => {
-    dispatch(focusCompose(history, intl.formatMessage(messages.template)));
-  }, [dispatch, intl, history]);
+    dispatch(focusCompose(intl.formatMessage(messages.template)));
+  }, [dispatch, intl]);
 
   return (
     <Column>
diff --git a/app/javascript/mastodon/features/picture_in_picture/components/footer.jsx b/app/javascript/mastodon/features/picture_in_picture/components/footer.jsx
index ba0642da288d55..8404bf61b77aeb 100644
--- a/app/javascript/mastodon/features/picture_in_picture/components/footer.jsx
+++ b/app/javascript/mastodon/features/picture_in_picture/components/footer.jsx
@@ -61,13 +61,13 @@ class Footer extends ImmutablePureComponent {
   };
 
   _performReply = () => {
-    const { dispatch, status, onClose, history } = this.props;
+    const { dispatch, status, onClose } = this.props;
 
     if (onClose) {
       onClose(true);
     }
 
-    dispatch(replyCompose(status, history));
+    dispatch(replyCompose(status));
   };
 
   handleReplyClick = () => {
diff --git a/app/javascript/mastodon/features/status/components/action_bar.jsx b/app/javascript/mastodon/features/status/components/action_bar.jsx
index d6105399873cf1..d90ca464a7411d 100644
--- a/app/javascript/mastodon/features/status/components/action_bar.jsx
+++ b/app/javascript/mastodon/features/status/components/action_bar.jsx
@@ -4,7 +4,6 @@ import { PureComponent } from 'react';
 import { defineMessages, injectIntl } from 'react-intl';
 
 import classNames from 'classnames';
-import { withRouter } from 'react-router-dom';
 
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { connect } from 'react-redux';
@@ -23,7 +22,6 @@ import RepeatPrivateIcon from '@/svg-icons/repeat_private.svg?react';
 import RepeatPrivateActiveIcon from '@/svg-icons/repeat_private_active.svg?react';
 import { identityContextPropShape, withIdentity } from 'mastodon/identity_context';
 import { PERMISSION_MANAGE_USERS, PERMISSION_MANAGE_FEDERATION } from 'mastodon/permissions';
-import { WithRouterPropTypes } from 'mastodon/utils/react_router';
 
 import { IconButton } from '../../../components/icon_button';
 import DropdownMenuContainer from '../../../containers/dropdown_menu_container';
@@ -91,7 +89,6 @@ class ActionBar extends PureComponent {
     onPin: PropTypes.func,
     onEmbed: PropTypes.func,
     intl: PropTypes.object.isRequired,
-    ...WithRouterPropTypes,
   };
 
   handleReplyClick = () => {
@@ -111,23 +108,23 @@ class ActionBar extends PureComponent {
   };
 
   handleDeleteClick = () => {
-    this.props.onDelete(this.props.status, this.props.history);
+    this.props.onDelete(this.props.status);
   };
 
   handleRedraftClick = () => {
-    this.props.onDelete(this.props.status, this.props.history, true);
+    this.props.onDelete(this.props.status, true);
   };
 
   handleEditClick = () => {
-    this.props.onEdit(this.props.status, this.props.history);
+    this.props.onEdit(this.props.status);
   };
 
   handleDirectClick = () => {
-    this.props.onDirect(this.props.status.get('account'), this.props.history);
+    this.props.onDirect(this.props.status.get('account'));
   };
 
   handleMentionClick = () => {
-    this.props.onMention(this.props.status.get('account'), this.props.history);
+    this.props.onMention(this.props.status.get('account'));
   };
 
   handleMuteClick = () => {
@@ -323,4 +320,4 @@ class ActionBar extends PureComponent {
 
 }
 
-export default withRouter(connect(mapStateToProps)(withIdentity(injectIntl(ActionBar))));
+export default connect(mapStateToProps)(withIdentity(injectIntl(ActionBar)));
diff --git a/app/javascript/mastodon/features/status/containers/detailed_status_container.js b/app/javascript/mastodon/features/status/containers/detailed_status_container.js
index c3d4fec4dba47f..f85c3822d7cb18 100644
--- a/app/javascript/mastodon/features/status/containers/detailed_status_container.js
+++ b/app/javascript/mastodon/features/status/containers/detailed_status_container.js
@@ -55,7 +55,7 @@ const makeMapStateToProps = () => {
 
 const mapDispatchToProps = (dispatch, { intl }) => ({
 
-  onReply (status, router) {
+  onReply (status) {
     dispatch((_, getState) => {
       let state = getState();
       if (state.getIn(['compose', 'text']).trim().length !== 0) {
@@ -64,11 +64,11 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
           modalProps: {
             message: intl.formatMessage(messages.replyMessage),
             confirm: intl.formatMessage(messages.replyConfirm),
-            onConfirm: () => dispatch(replyCompose(status, router)),
+            onConfirm: () => dispatch(replyCompose(status)),
           },
         }));
       } else {
-        dispatch(replyCompose(status, router));
+        dispatch(replyCompose(status));
       }
     });
   },
@@ -115,27 +115,27 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
     }));
   },
 
-  onDelete (status, history, withRedraft = false) {
+  onDelete (status, withRedraft = false) {
     if (!deleteModal) {
-      dispatch(deleteStatus(status.get('id'), history, withRedraft));
+      dispatch(deleteStatus(status.get('id'), withRedraft));
     } else {
       dispatch(openModal({
         modalType: 'CONFIRM',
         modalProps: {
           message: intl.formatMessage(withRedraft ? messages.redraftMessage : messages.deleteMessage),
           confirm: intl.formatMessage(withRedraft ? messages.redraftConfirm : messages.deleteConfirm),
-          onConfirm: () => dispatch(deleteStatus(status.get('id'), history, withRedraft)),
+          onConfirm: () => dispatch(deleteStatus(status.get('id'), withRedraft)),
         },
       }));
     }
   },
 
-  onDirect (account, router) {
-    dispatch(directCompose(account, router));
+  onDirect (account) {
+    dispatch(directCompose(account));
   },
 
-  onMention (account, router) {
-    dispatch(mentionCompose(account, router));
+  onMention (account) {
+    dispatch(mentionCompose(account));
   },
 
   onOpenMedia (media, index, lang) {
diff --git a/app/javascript/mastodon/features/status/index.jsx b/app/javascript/mastodon/features/status/index.jsx
index 7f37cb50d2e51c..b0fbea9e2209dc 100644
--- a/app/javascript/mastodon/features/status/index.jsx
+++ b/app/javascript/mastodon/features/status/index.jsx
@@ -280,11 +280,11 @@ class Status extends ImmutablePureComponent {
           modalProps: {
             message: intl.formatMessage(messages.replyMessage),
             confirm: intl.formatMessage(messages.replyConfirm),
-            onConfirm: () => dispatch(replyCompose(status, this.props.history)),
+            onConfirm: () => dispatch(replyCompose(status)),
           },
         }));
       } else {
-        dispatch(replyCompose(status, this.props.history));
+        dispatch(replyCompose(status));
       }
     } else {
       dispatch(openModal({
@@ -336,33 +336,33 @@ class Status extends ImmutablePureComponent {
     }
   };
 
-  handleDeleteClick = (status, history, withRedraft = false) => {
+  handleDeleteClick = (status, withRedraft = false) => {
     const { dispatch, intl } = this.props;
 
     if (!deleteModal) {
-      dispatch(deleteStatus(status.get('id'), history, withRedraft));
+      dispatch(deleteStatus(status.get('id'), withRedraft));
     } else {
       dispatch(openModal({
         modalType: 'CONFIRM',
         modalProps: {
           message: intl.formatMessage(withRedraft ? messages.redraftMessage : messages.deleteMessage),
           confirm: intl.formatMessage(withRedraft ? messages.redraftConfirm : messages.deleteConfirm),
-          onConfirm: () => dispatch(deleteStatus(status.get('id'), history, withRedraft)),
+          onConfirm: () => dispatch(deleteStatus(status.get('id'), withRedraft)),
         },
       }));
     }
   };
 
-  handleEditClick = (status, history) => {
-    this.props.dispatch(editStatus(status.get('id'), history));
+  handleEditClick = (status) => {
+    this.props.dispatch(editStatus(status.get('id')));
   };
 
-  handleDirectClick = (account, router) => {
-    this.props.dispatch(directCompose(account, router));
+  handleDirectClick = (account) => {
+    this.props.dispatch(directCompose(account));
   };
 
-  handleMentionClick = (account, router) => {
-    this.props.dispatch(mentionCompose(account, router));
+  handleMentionClick = (account) => {
+    this.props.dispatch(mentionCompose(account));
   };
 
   handleOpenMedia = (media, index, lang) => {

From 3a00f89aa1f2280b995512cd5f91568e6d349cc6 Mon Sep 17 00:00:00 2001
From: kyori19 <kyori@accelf.net>
Date: Sat, 20 Jul 2024 00:31:48 +0900
Subject: [PATCH 1578/2191] Respect `Account::DISPLAY_NAME_LENGTH_LIMIT` in
 account spec correctly (#31075)

---
 spec/models/account_spec.rb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb
index dfb1f5bc61528c..5f918f159a848c 100644
--- a/spec/models/account_spec.rb
+++ b/spec/models/account_spec.rb
@@ -775,7 +775,7 @@
       end
 
       it 'is invalid if the display name is longer than the character limit' do
-        account = Fabricate.build(:account, display_name: username_over_limit)
+        account = Fabricate.build(:account, display_name: display_name_over_limit)
         account.valid?
         expect(account).to model_have_error_on_field(:display_name)
       end
@@ -821,7 +821,7 @@
       end
 
       it 'is valid even if the display name is longer than the character limit' do
-        account = Fabricate.build(:account, domain: 'domain', display_name: username_over_limit)
+        account = Fabricate.build(:account, domain: 'domain', display_name: display_name_over_limit)
         account.valid?
         expect(account).to_not model_have_error_on_field(:display_name)
       end
@@ -837,6 +837,10 @@ def username_over_limit
       'a' * described_class::USERNAME_LENGTH_LIMIT * 2
     end
 
+    def display_name_over_limit
+      'a' * described_class::DISPLAY_NAME_LENGTH_LIMIT * 2
+    end
+
     def account_note_over_limit
       'a' * described_class::NOTE_LENGTH_LIMIT * 2
     end

From 65a8dc7869360bd4e4fb45d876f7a2bd019d16c8 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 19 Jul 2024 17:32:06 +0200
Subject: [PATCH 1579/2191] chore(deps): update dependency selenium-webdriver
 to v4.23.0 (#31073)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index c08c14cb5cbc07..006a9184463c52 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -781,7 +781,7 @@ GEM
     scenic (1.8.0)
       activerecord (>= 4.0.0)
       railties (>= 4.0.0)
-    selenium-webdriver (4.22.0)
+    selenium-webdriver (4.23.0)
       base64 (~> 0.2)
       logger (~> 1.4)
       rexml (~> 3.2, >= 3.2.5)
@@ -894,7 +894,7 @@ GEM
       railties (>= 5.2)
       semantic_range (>= 2.3.0)
     webrick (1.8.1)
-    websocket (1.2.10)
+    websocket (1.2.11)
     websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)

From 0397df9bef82042221f35e9938ad5b917fa1d4fc Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 19 Jul 2024 11:32:42 -0400
Subject: [PATCH 1580/2191] Resolve `TODO` in `api/v1/admin/domain_*`
 controllers (#31067)

---
 app/controllers/api/v1/admin/domain_allows_controller.rb | 7 +------
 app/controllers/api/v1/admin/domain_blocks_controller.rb | 7 +------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/app/controllers/api/v1/admin/domain_allows_controller.rb b/app/controllers/api/v1/admin/domain_allows_controller.rb
index 9801d832b8ba84..0cd5aebd53ad8b 100644
--- a/app/controllers/api/v1/admin/domain_allows_controller.rb
+++ b/app/controllers/api/v1/admin/domain_allows_controller.rb
@@ -47,18 +47,13 @@ def destroy
   private
 
   def set_domain_allows
-    @domain_allows = filtered_domain_allows.order(id: :desc).to_a_paginated_by_id(limit_param(LIMIT), params_slice(:max_id, :since_id, :min_id))
+    @domain_allows = DomainAllow.order(id: :desc).to_a_paginated_by_id(limit_param(LIMIT), params_slice(:max_id, :since_id, :min_id))
   end
 
   def set_domain_allow
     @domain_allow = DomainAllow.find(params[:id])
   end
 
-  def filtered_domain_allows
-    # TODO: no filtering yet
-    DomainAllow.all
-  end
-
   def next_path
     api_v1_admin_domain_allows_url(pagination_params(max_id: pagination_max_id)) if records_continue?
   end
diff --git a/app/controllers/api/v1/admin/domain_blocks_controller.rb b/app/controllers/api/v1/admin/domain_blocks_controller.rb
index a20a4a9c7f8fbe..28d91ef93c2148 100644
--- a/app/controllers/api/v1/admin/domain_blocks_controller.rb
+++ b/app/controllers/api/v1/admin/domain_blocks_controller.rb
@@ -59,18 +59,13 @@ def conflicts_with_existing_block?(domain_block, existing_domain_block)
   end
 
   def set_domain_blocks
-    @domain_blocks = filtered_domain_blocks.order(id: :desc).to_a_paginated_by_id(limit_param(LIMIT), params_slice(:max_id, :since_id, :min_id))
+    @domain_blocks = DomainBlock.order(id: :desc).to_a_paginated_by_id(limit_param(LIMIT), params_slice(:max_id, :since_id, :min_id))
   end
 
   def set_domain_block
     @domain_block = DomainBlock.find(params[:id])
   end
 
-  def filtered_domain_blocks
-    # TODO: no filtering yet
-    DomainBlock.all
-  end
-
   def domain_block_params
     params.permit(:severity, :reject_media, :reject_reports, :private_comment, :public_comment, :obfuscate)
   end

From 9f05a06dee264a80827a03569664931f8d443588 Mon Sep 17 00:00:00 2001
From: Michael Stanclift <mx@vmstan.com>
Date: Fri, 19 Jul 2024 03:30:26 -0500
Subject: [PATCH 1581/2191] [Glitch] Fix double border on column filter on
 narrow screens

Port 784e0885333769b47c8a94fde0c34bb14b1b93bb to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/styles/components.scss | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index 0bc63e247a34f2..cb22ca3674ae2f 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -7933,6 +7933,11 @@ img.modal-warning {
   display: flex;
   flex-shrink: 0;
 
+  @media screen and (max-width: $no-gap-breakpoint) {
+    border-right: 0;
+    border-left: 0;
+  }
+
   button {
     background: transparent;
     border: 0;

From 95984b729a8465da36c51182e0fe5a8e518475cb Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 19 Jul 2024 17:26:44 +0200
Subject: [PATCH 1582/2191] [Glitch] Remove routerHistory parameters from
 composer actions

Port e768b23aa995130c14a7160165eabcf1e8570dfd to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/actions/compose.js        | 30 +++++++++----------
 .../flavours/glitch/actions/statuses.js       |  8 ++---
 .../flavours/glitch/components/router.tsx     |  2 +-
 .../flavours/glitch/components/status.jsx     |  4 +--
 .../glitch/components/status_action_bar.jsx   | 12 ++++----
 .../glitch/containers/status_container.js     | 26 ++++++++--------
 .../account_timeline/components/header.jsx    | 11 +++----
 .../containers/header_container.jsx           |  8 ++---
 .../compose/components/compose_form.jsx       |  9 ++----
 .../containers/compose_form_container.js      |  8 ++---
 .../components/conversation.jsx               |  6 ++--
 .../notifications/components/notification.jsx |  2 +-
 .../containers/notification_container.js      |  4 +--
 .../glitch/features/onboarding/index.jsx      |  7 ++---
 .../picture_in_picture/components/footer.jsx  |  4 +--
 .../features/status/components/action_bar.jsx | 15 ++++------
 .../containers/detailed_status_container.js   | 20 ++++++-------
 .../flavours/glitch/features/status/index.jsx | 22 +++++++-------
 18 files changed, 94 insertions(+), 104 deletions(-)

diff --git a/app/javascript/flavours/glitch/actions/compose.js b/app/javascript/flavours/glitch/actions/compose.js
index 8eab532f554fa4..2041278a1ccc7d 100644
--- a/app/javascript/flavours/glitch/actions/compose.js
+++ b/app/javascript/flavours/glitch/actions/compose.js
@@ -4,6 +4,7 @@ import axios from 'axios';
 import { throttle } from 'lodash';
 
 import api from 'flavours/glitch/api';
+import { browserHistory } from 'flavours/glitch/components/router';
 import { search as emojiSearch } from 'flavours/glitch/features/emoji/emoji_mart_search_light';
 import { tagHistory } from 'flavours/glitch/settings';
 import { recoverHashtags } from 'flavours/glitch/utils/hashtag';
@@ -94,9 +95,9 @@ const messages = defineMessages({
   saved: { id: 'compose.saved.body', defaultMessage: 'Post saved.' },
 });
 
-export const ensureComposeIsVisible = (getState, routerHistory) => {
+export const ensureComposeIsVisible = (getState) => {
   if (!getState().getIn(['compose', 'mounted'])) {
-    routerHistory.push('/publish');
+    browserHistory.push('/publish');
   }
 };
 
@@ -117,7 +118,7 @@ export function changeCompose(text) {
   };
 }
 
-export function replyCompose(status, routerHistory) {
+export function replyCompose(status) {
   return (dispatch, getState) => {
     const prependCWRe = getState().getIn(['local_settings', 'prepend_cw_re']);
     dispatch({
@@ -126,7 +127,7 @@ export function replyCompose(status, routerHistory) {
       prependCWRe: prependCWRe,
     });
 
-    ensureComposeIsVisible(getState, routerHistory);
+    ensureComposeIsVisible(getState);
   };
 }
 
@@ -142,38 +143,38 @@ export function resetCompose() {
   };
 }
 
-export const focusCompose = (routerHistory, defaultText) => (dispatch, getState) => {
+export const focusCompose = (defaultText) => (dispatch, getState) => {
   dispatch({
     type: COMPOSE_FOCUS,
     defaultText,
   });
 
-  ensureComposeIsVisible(getState, routerHistory);
+  ensureComposeIsVisible(getState);
 };
 
-export function mentionCompose(account, routerHistory) {
+export function mentionCompose(account) {
   return (dispatch, getState) => {
     dispatch({
       type: COMPOSE_MENTION,
       account: account,
     });
 
-    ensureComposeIsVisible(getState, routerHistory);
+    ensureComposeIsVisible(getState);
   };
 }
 
-export function directCompose(account, routerHistory) {
+export function directCompose(account) {
   return (dispatch, getState) => {
     dispatch({
       type: COMPOSE_DIRECT,
       account: account,
     });
 
-    ensureComposeIsVisible(getState, routerHistory);
+    ensureComposeIsVisible(getState);
   };
 }
 
-export function submitCompose(routerHistory, overridePrivacy = null) {
+export function submitCompose(overridePrivacy = null) {
   return function (dispatch, getState) {
     let status     = getState().getIn(['compose', 'text'], '');
     const media    = getState().getIn(['compose', 'media_attachments']);
@@ -230,11 +231,10 @@ export function submitCompose(routerHistory, overridePrivacy = null) {
         'Idempotency-Key': getState().getIn(['compose', 'idempotencyKey']),
       },
     }).then(function (response) {
-      if (routerHistory
-          && (routerHistory.location.pathname === '/publish' || routerHistory.location.pathname === '/statuses/new')
+      if ((browserHistory.location.pathname === '/publish' || browserHistory.location.pathname === '/statuses/new')
           && window.history.state
           && !getState().getIn(['compose', 'advanced_options', 'threaded_mode'])) {
-        routerHistory.goBack();
+        browserHistory.goBack();
       }
 
       dispatch(insertIntoTagHistory(response.data.tags, status));
@@ -272,7 +272,7 @@ export function submitCompose(routerHistory, overridePrivacy = null) {
           message: statusId === null ? messages.published : messages.saved,
           action: messages.open,
           dismissAfter: 10000,
-          onClick: () => routerHistory.push(`/@${response.data.account.username}/${response.data.id}`),
+          onClick: () => browserHistory.push(`/@${response.data.account.username}/${response.data.id}`),
         }));
       }
     }).catch(function (error) {
diff --git a/app/javascript/flavours/glitch/actions/statuses.js b/app/javascript/flavours/glitch/actions/statuses.js
index c4d292567d4d0c..054626bda0c7b6 100644
--- a/app/javascript/flavours/glitch/actions/statuses.js
+++ b/app/javascript/flavours/glitch/actions/statuses.js
@@ -94,7 +94,7 @@ export function redraft(status, raw_text, content_type) {
   };
 }
 
-export const editStatus = (id, routerHistory) => (dispatch, getState) => {
+export const editStatus = (id) => (dispatch, getState) => {
   let status = getState().getIn(['statuses', id]);
 
   if (status.get('poll')) {
@@ -105,7 +105,7 @@ export const editStatus = (id, routerHistory) => (dispatch, getState) => {
 
   api().get(`/api/v1/statuses/${id}/source`).then(response => {
     dispatch(fetchStatusSourceSuccess());
-    ensureComposeIsVisible(getState, routerHistory);
+    ensureComposeIsVisible(getState);
     dispatch(setComposeToStatus(status, response.data.text, response.data.spoiler_text, response.data.content_type));
   }).catch(error => {
     dispatch(fetchStatusSourceFail(error));
@@ -125,7 +125,7 @@ export const fetchStatusSourceFail = error => ({
   error,
 });
 
-export function deleteStatus(id, routerHistory, withRedraft = false) {
+export function deleteStatus(id, withRedraft = false) {
   return (dispatch, getState) => {
     let status = getState().getIn(['statuses', id]);
 
@@ -142,7 +142,7 @@ export function deleteStatus(id, routerHistory, withRedraft = false) {
 
       if (withRedraft) {
         dispatch(redraft(status, response.data.text, response.data.content_type));
-        ensureComposeIsVisible(getState, routerHistory);
+        ensureComposeIsVisible(getState);
       }
     }).catch(error => {
       dispatch(deleteStatusFail(id, error));
diff --git a/app/javascript/flavours/glitch/components/router.tsx b/app/javascript/flavours/glitch/components/router.tsx
index 0637c35ada131f..48f35d8aedefa9 100644
--- a/app/javascript/flavours/glitch/components/router.tsx
+++ b/app/javascript/flavours/glitch/components/router.tsx
@@ -22,7 +22,7 @@ type LocationState = MastodonLocationState | null | undefined;
 
 type HistoryPath = Path | LocationDescriptor<LocationState>;
 
-const browserHistory = createBrowserHistory<LocationState>();
+export const browserHistory = createBrowserHistory<LocationState>();
 const originalPush = browserHistory.push.bind(browserHistory);
 const originalReplace = browserHistory.replace.bind(browserHistory);
 
diff --git a/app/javascript/flavours/glitch/components/status.jsx b/app/javascript/flavours/glitch/components/status.jsx
index c115251d65e9cd..e002e4df8ce425 100644
--- a/app/javascript/flavours/glitch/components/status.jsx
+++ b/app/javascript/flavours/glitch/components/status.jsx
@@ -442,7 +442,7 @@ class Status extends ImmutablePureComponent {
 
   handleHotkeyReply = e => {
     e.preventDefault();
-    this.props.onReply(this.props.status, this.props.history);
+    this.props.onReply(this.props.status);
   };
 
   handleHotkeyFavourite = (e) => {
@@ -459,7 +459,7 @@ class Status extends ImmutablePureComponent {
 
   handleHotkeyMention = e => {
     e.preventDefault();
-    this.props.onMention(this.props.status.get('account'), this.props.history);
+    this.props.onMention(this.props.status.get('account'));
   };
 
   handleHotkeyOpen = () => {
diff --git a/app/javascript/flavours/glitch/components/status_action_bar.jsx b/app/javascript/flavours/glitch/components/status_action_bar.jsx
index 3dfe4039872ac8..7b00f84f1b96b5 100644
--- a/app/javascript/flavours/glitch/components/status_action_bar.jsx
+++ b/app/javascript/flavours/glitch/components/status_action_bar.jsx
@@ -108,7 +108,7 @@ class StatusActionBar extends ImmutablePureComponent {
     const { signedIn } = this.props.identity;
 
     if (signedIn) {
-      this.props.onReply(this.props.status, this.props.history);
+      this.props.onReply(this.props.status);
     } else {
       this.props.onInteractionModal('reply', this.props.status);
     }
@@ -145,15 +145,15 @@ class StatusActionBar extends ImmutablePureComponent {
   };
 
   handleDeleteClick = () => {
-    this.props.onDelete(this.props.status, this.props.history);
+    this.props.onDelete(this.props.status);
   };
 
   handleRedraftClick = () => {
-    this.props.onDelete(this.props.status, this.props.history, true);
+    this.props.onDelete(this.props.status, true);
   };
 
   handleEditClick = () => {
-    this.props.onEdit(this.props.status, this.props.history);
+    this.props.onEdit(this.props.status);
   };
 
   handlePinClick = () => {
@@ -161,11 +161,11 @@ class StatusActionBar extends ImmutablePureComponent {
   };
 
   handleMentionClick = () => {
-    this.props.onMention(this.props.status.get('account'), this.props.history);
+    this.props.onMention(this.props.status.get('account'));
   };
 
   handleDirectClick = () => {
-    this.props.onDirect(this.props.status.get('account'), this.props.history);
+    this.props.onDirect(this.props.status.get('account'));
   };
 
   handleMuteClick = () => {
diff --git a/app/javascript/flavours/glitch/containers/status_container.js b/app/javascript/flavours/glitch/containers/status_container.js
index 1430a0c8456789..a05ed5fe4fce86 100644
--- a/app/javascript/flavours/glitch/containers/status_container.js
+++ b/app/javascript/flavours/glitch/containers/status_container.js
@@ -93,7 +93,7 @@ const makeMapStateToProps = () => {
 
 const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
 
-  onReply (status, router) {
+  onReply (status) {
     dispatch((_, getState) => {
       let state = getState();
 
@@ -104,11 +104,11 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
             message: intl.formatMessage(messages.replyMessage),
             confirm: intl.formatMessage(messages.replyConfirm),
             onDoNotAsk: () => dispatch(changeLocalSetting(['confirm_before_clearing_draft'], false)),
-            onConfirm: () => dispatch(replyCompose(status, router)),
+            onConfirm: () => dispatch(replyCompose(status)),
           },
         }));
       } else {
-        dispatch(replyCompose(status, router));
+        dispatch(replyCompose(status));
       }
     });
   },
@@ -182,22 +182,22 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
     }));
   },
 
-  onDelete (status, history, withRedraft = false) {
+  onDelete (status, withRedraft = false) {
     if (!deleteModal) {
-      dispatch(deleteStatus(status.get('id'), history, withRedraft));
+      dispatch(deleteStatus(status.get('id'), withRedraft));
     } else {
       dispatch(openModal({
         modalType: 'CONFIRM',
         modalProps: {
           message: intl.formatMessage(withRedraft ? messages.redraftMessage : messages.deleteMessage),
           confirm: intl.formatMessage(withRedraft ? messages.redraftConfirm : messages.deleteConfirm),
-          onConfirm: () => dispatch(deleteStatus(status.get('id'), history, withRedraft)),
+          onConfirm: () => dispatch(deleteStatus(status.get('id'), withRedraft)),
         },
       }));
     }
   },
 
-  onEdit (status, history) {
+  onEdit (status) {
     dispatch((_, getState) => {
       let state = getState();
       if (state.getIn(['compose', 'text']).trim().length !== 0) {
@@ -206,11 +206,11 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
           modalProps: {
             message: intl.formatMessage(messages.editMessage),
             confirm: intl.formatMessage(messages.editConfirm),
-            onConfirm: () => dispatch(editStatus(status.get('id'), history)),
+            onConfirm: () => dispatch(editStatus(status.get('id'))),
           },
         }));
       } else {
-        dispatch(editStatus(status.get('id'), history));
+        dispatch(editStatus(status.get('id')));
       }
     });
   },
@@ -223,12 +223,12 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
     }
   },
 
-  onDirect (account, router) {
-    dispatch(directCompose(account, router));
+  onDirect (account) {
+    dispatch(directCompose(account));
   },
 
-  onMention (account, router) {
-    dispatch(mentionCompose(account, router));
+  onMention (account) {
+    dispatch(mentionCompose(account));
   },
 
   onOpenMedia (statusId, media, index, lang) {
diff --git a/app/javascript/flavours/glitch/features/account_timeline/components/header.jsx b/app/javascript/flavours/glitch/features/account_timeline/components/header.jsx
index 37258d9d83ea29..10a035a0fcba46 100644
--- a/app/javascript/flavours/glitch/features/account_timeline/components/header.jsx
+++ b/app/javascript/flavours/glitch/features/account_timeline/components/header.jsx
@@ -2,13 +2,11 @@ import PropTypes from 'prop-types';
 
 import { FormattedMessage } from 'react-intl';
 
-import { NavLink, withRouter } from 'react-router-dom';
+import { NavLink } from 'react-router-dom';
 
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router';
-
 import ActionBar from '../../account/components/action_bar';
 import InnerHeader from '../../account/components/header';
 
@@ -36,7 +34,6 @@ class Header extends ImmutablePureComponent {
     hideTabs: PropTypes.bool,
     domain: PropTypes.string.isRequired,
     hidden: PropTypes.bool,
-    ...WithRouterPropTypes,
   };
 
   handleFollow = () => {
@@ -48,11 +45,11 @@ class Header extends ImmutablePureComponent {
   };
 
   handleMention = () => {
-    this.props.onMention(this.props.account, this.props.history);
+    this.props.onMention(this.props.account);
   };
 
   handleDirect = () => {
-    this.props.onDirect(this.props.account, this.props.history);
+    this.props.onDirect(this.props.account);
   };
 
   handleReport = () => {
@@ -158,4 +155,4 @@ class Header extends ImmutablePureComponent {
 
 }
 
-export default withRouter(Header);
+export default Header;
diff --git a/app/javascript/flavours/glitch/features/account_timeline/containers/header_container.jsx b/app/javascript/flavours/glitch/features/account_timeline/containers/header_container.jsx
index 1e85a08cd996ea..ba1241d8293c53 100644
--- a/app/javascript/flavours/glitch/features/account_timeline/containers/header_container.jsx
+++ b/app/javascript/flavours/glitch/features/account_timeline/containers/header_container.jsx
@@ -75,12 +75,12 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
     }
   },
 
-  onMention (account, router) {
-    dispatch(mentionCompose(account, router));
+  onMention (account) {
+    dispatch(mentionCompose(account));
   },
 
-  onDirect (account, router) {
-    dispatch(directCompose(account, router));
+  onDirect (account) {
+    dispatch(directCompose(account));
   },
 
   onReblogToggle (account) {
diff --git a/app/javascript/flavours/glitch/features/compose/components/compose_form.jsx b/app/javascript/flavours/glitch/features/compose/components/compose_form.jsx
index 6f16abfc7f1023..ffed051c37859d 100644
--- a/app/javascript/flavours/glitch/features/compose/components/compose_form.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/compose_form.jsx
@@ -10,8 +10,6 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
 
 import { length } from 'stringz';
 
-import { WithOptionalRouterPropTypes, withOptionalRouter } from 'flavours/glitch/utils/react_router';
-
 import AutosuggestInput from '../../../components/autosuggest_input';
 import AutosuggestTextarea from '../../../components/autosuggest_textarea';
 import { Button } from '../../../components/button';
@@ -81,7 +79,6 @@ class ComposeForm extends ImmutablePureComponent {
     singleColumn: PropTypes.bool,
     lang: PropTypes.string,
     maxChars: PropTypes.number,
-    ...WithOptionalRouterPropTypes
   };
 
   static defaultProps = {
@@ -141,9 +138,9 @@ class ComposeForm extends ImmutablePureComponent {
     // Submit unless there are media with missing descriptions
     if (this.props.mediaDescriptionConfirmation && this.props.media && this.props.media.some(item => !item.get('description'))) {
       const firstWithoutDescription = this.props.media.find(item => !item.get('description'));
-      this.props.onMediaDescriptionConfirm(this.props.history || null, firstWithoutDescription.get('id'), overridePrivacy);
+      this.props.onMediaDescriptionConfirm(firstWithoutDescription.get('id'), overridePrivacy);
     } else {
-      this.props.onSubmit(this.props.history || null, overridePrivacy);
+      this.props.onSubmit(overridePrivacy);
     }
   };
 
@@ -351,4 +348,4 @@ class ComposeForm extends ImmutablePureComponent {
 
 }
 
-export default withOptionalRouter(injectIntl(ComposeForm));
+export default injectIntl(ComposeForm);
diff --git a/app/javascript/flavours/glitch/features/compose/containers/compose_form_container.js b/app/javascript/flavours/glitch/features/compose/containers/compose_form_container.js
index 067621c84ba627..227e7938695d1e 100644
--- a/app/javascript/flavours/glitch/features/compose/containers/compose_form_container.js
+++ b/app/javascript/flavours/glitch/features/compose/containers/compose_form_container.js
@@ -82,8 +82,8 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
     dispatch(changeCompose(text));
   },
 
-  onSubmit (router, overridePrivacy = null) {
-    dispatch(submitCompose(router, overridePrivacy));
+  onSubmit (overridePrivacy = null) {
+    dispatch(submitCompose(overridePrivacy));
   },
 
   onClearSuggestions () {
@@ -110,14 +110,14 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
     dispatch(insertEmojiCompose(position, data, needsSpace));
   },
 
-  onMediaDescriptionConfirm (routerHistory, mediaId, overridePrivacy = null) {
+  onMediaDescriptionConfirm (mediaId, overridePrivacy = null) {
     dispatch(openModal({
       modalType: 'CONFIRM',
       modalProps: {
         message: intl.formatMessage(messages.missingDescriptionMessage),
         confirm: intl.formatMessage(messages.missingDescriptionConfirm),
         onConfirm: () => {
-          dispatch(submitCompose(routerHistory, overridePrivacy));
+          dispatch(submitCompose(overridePrivacy));
         },
         secondary: intl.formatMessage(messages.missingDescriptionEdit),
         onSecondary: () => dispatch(openModal({
diff --git a/app/javascript/flavours/glitch/features/direct_timeline/components/conversation.jsx b/app/javascript/flavours/glitch/features/direct_timeline/components/conversation.jsx
index 7071c8719d7292..839de34dd4bc58 100644
--- a/app/javascript/flavours/glitch/features/direct_timeline/components/conversation.jsx
+++ b/app/javascript/flavours/glitch/features/direct_timeline/components/conversation.jsx
@@ -126,14 +126,14 @@ export const Conversation = ({ conversation, scrollKey, onMoveUp, onMoveDown })
           modalProps: {
             message: intl.formatMessage(messages.replyMessage),
             confirm: intl.formatMessage(messages.replyConfirm),
-            onConfirm: () => dispatch(replyCompose(lastStatus, history)),
+            onConfirm: () => dispatch(replyCompose(lastStatus)),
           },
         }));
       } else {
-        dispatch(replyCompose(lastStatus, history));
+        dispatch(replyCompose(lastStatus));
       }
     });
-  }, [dispatch, lastStatus, history, intl]);
+  }, [dispatch, lastStatus, intl]);
 
   const handleDelete = useCallback(() => {
     dispatch(deleteConversation(id));
diff --git a/app/javascript/flavours/glitch/features/notifications/components/notification.jsx b/app/javascript/flavours/glitch/features/notifications/components/notification.jsx
index 0751258be922cb..1a049847d5b792 100644
--- a/app/javascript/flavours/glitch/features/notifications/components/notification.jsx
+++ b/app/javascript/flavours/glitch/features/notifications/components/notification.jsx
@@ -92,7 +92,7 @@ class Notification extends ImmutablePureComponent {
     e.preventDefault();
 
     const { notification, onMention } = this.props;
-    onMention(notification.get('account'), this.props.history);
+    onMention(notification.get('account'));
   };
 
   handleHotkeyFavourite = () => {
diff --git a/app/javascript/flavours/glitch/features/notifications/containers/notification_container.js b/app/javascript/flavours/glitch/features/notifications/containers/notification_container.js
index 338d27d8d6b4ed..b4df05b828a970 100644
--- a/app/javascript/flavours/glitch/features/notifications/containers/notification_container.js
+++ b/app/javascript/flavours/glitch/features/notifications/containers/notification_container.js
@@ -31,8 +31,8 @@ const makeMapStateToProps = () => {
 };
 
 const mapDispatchToProps = dispatch => ({
-  onMention: (account, router) => {
-    dispatch(mentionCompose(account, router));
+  onMention: (account) => {
+    dispatch(mentionCompose(account));
   },
 
   onModalReblog (status, privacy) {
diff --git a/app/javascript/flavours/glitch/features/onboarding/index.jsx b/app/javascript/flavours/glitch/features/onboarding/index.jsx
index 187ee3b7703610..7922b616775090 100644
--- a/app/javascript/flavours/glitch/features/onboarding/index.jsx
+++ b/app/javascript/flavours/glitch/features/onboarding/index.jsx
@@ -3,7 +3,7 @@ import { useCallback } from 'react';
 import { FormattedMessage, useIntl, defineMessages } from 'react-intl';
 
 import { Helmet } from 'react-helmet';
-import { Link, Switch, Route, useHistory } from 'react-router-dom';
+import { Link, Switch, Route } from 'react-router-dom';
 
 import { useDispatch } from 'react-redux';
 
@@ -34,11 +34,10 @@ const Onboarding = () => {
   const account = useAppSelector(state => state.getIn(['accounts', me]));
   const dispatch = useDispatch();
   const intl = useIntl();
-  const history = useHistory();
 
   const handleComposeClick = useCallback(() => {
-    dispatch(focusCompose(history, intl.formatMessage(messages.template)));
-  }, [dispatch, intl, history]);
+    dispatch(focusCompose(intl.formatMessage(messages.template)));
+  }, [dispatch, intl]);
 
   return (
     <Column>
diff --git a/app/javascript/flavours/glitch/features/picture_in_picture/components/footer.jsx b/app/javascript/flavours/glitch/features/picture_in_picture/components/footer.jsx
index 13ad86f8012137..2b27070007f432 100644
--- a/app/javascript/flavours/glitch/features/picture_in_picture/components/footer.jsx
+++ b/app/javascript/flavours/glitch/features/picture_in_picture/components/footer.jsx
@@ -63,13 +63,13 @@ class Footer extends ImmutablePureComponent {
   };
 
   _performReply = () => {
-    const { dispatch, status, onClose, history } = this.props;
+    const { dispatch, status, onClose } = this.props;
 
     if (onClose) {
       onClose(true);
     }
 
-    dispatch(replyCompose(status, history));
+    dispatch(replyCompose(status));
   };
 
   handleReplyClick = () => {
diff --git a/app/javascript/flavours/glitch/features/status/components/action_bar.jsx b/app/javascript/flavours/glitch/features/status/components/action_bar.jsx
index 808712b02189d9..3377019bdc8a9d 100644
--- a/app/javascript/flavours/glitch/features/status/components/action_bar.jsx
+++ b/app/javascript/flavours/glitch/features/status/components/action_bar.jsx
@@ -4,7 +4,6 @@ import { PureComponent } from 'react';
 import { defineMessages, injectIntl } from 'react-intl';
 
 import classNames from 'classnames';
-import { withRouter } from 'react-router-dom';
 
 import ImmutablePropTypes from 'react-immutable-proptypes';
 
@@ -23,7 +22,6 @@ import RepeatPrivateActiveIcon from '@/svg-icons/repeat_private_active.svg?react
 import { identityContextPropShape, withIdentity } from 'flavours/glitch/identity_context';
 import { PERMISSION_MANAGE_USERS, PERMISSION_MANAGE_FEDERATION } from 'flavours/glitch/permissions';
 import { accountAdminLink, statusAdminLink } from 'flavours/glitch/utils/backend_links';
-import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router';
 
 import { IconButton } from '../../../components/icon_button';
 import DropdownMenuContainer from '../../../containers/dropdown_menu_container';
@@ -78,7 +76,6 @@ class ActionBar extends PureComponent {
     onPin: PropTypes.func,
     onEmbed: PropTypes.func,
     intl: PropTypes.object.isRequired,
-    ...WithRouterPropTypes,
   };
 
   handleReplyClick = () => {
@@ -98,23 +95,23 @@ class ActionBar extends PureComponent {
   };
 
   handleDeleteClick = () => {
-    this.props.onDelete(this.props.status, this.props.history);
+    this.props.onDelete(this.props.status);
   };
 
   handleRedraftClick = () => {
-    this.props.onDelete(this.props.status, this.props.history, true);
+    this.props.onDelete(this.props.status, true);
   };
 
   handleEditClick = () => {
-    this.props.onEdit(this.props.status, this.props.history);
+    this.props.onEdit(this.props.status);
   };
 
   handleDirectClick = () => {
-    this.props.onDirect(this.props.status.get('account'), this.props.history);
+    this.props.onDirect(this.props.status.get('account'));
   };
 
   handleMentionClick = () => {
-    this.props.onMention(this.props.status.get('account'), this.props.history);
+    this.props.onMention(this.props.status.get('account'));
   };
 
   handleMuteClick = () => {
@@ -262,4 +259,4 @@ class ActionBar extends PureComponent {
 
 }
 
-export default withRouter(withIdentity(injectIntl(ActionBar)));
+export default withIdentity(injectIntl(ActionBar));
diff --git a/app/javascript/flavours/glitch/features/status/containers/detailed_status_container.js b/app/javascript/flavours/glitch/features/status/containers/detailed_status_container.js
index 7cb9735cfe8260..9663f7ca4e6b40 100644
--- a/app/javascript/flavours/glitch/features/status/containers/detailed_status_container.js
+++ b/app/javascript/flavours/glitch/features/status/containers/detailed_status_container.js
@@ -52,7 +52,7 @@ const makeMapStateToProps = () => {
 
 const mapDispatchToProps = (dispatch, { intl }) => ({
 
-  onReply (status, router) {
+  onReply (status) {
     dispatch((_, getState) => {
       let state = getState();
       if (state.getIn(['compose', 'text']).trim().length !== 0) {
@@ -61,11 +61,11 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
           modalProps: {
             message: intl.formatMessage(messages.replyMessage),
             confirm: intl.formatMessage(messages.replyConfirm),
-            onConfirm: () => dispatch(replyCompose(status, router)),
+            onConfirm: () => dispatch(replyCompose(status)),
           },
         }));
       } else {
-        dispatch(replyCompose(status, router));
+        dispatch(replyCompose(status));
       }
     });
   },
@@ -112,27 +112,27 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
     }));
   },
 
-  onDelete (status, history, withRedraft = false) {
+  onDelete (status, withRedraft = false) {
     if (!deleteModal) {
-      dispatch(deleteStatus(status.get('id'), history, withRedraft));
+      dispatch(deleteStatus(status.get('id'), withRedraft));
     } else {
       dispatch(openModal({
         modalType: 'CONFIRM',
         modalProps: {
           message: intl.formatMessage(withRedraft ? messages.redraftMessage : messages.deleteMessage),
           confirm: intl.formatMessage(withRedraft ? messages.redraftConfirm : messages.deleteConfirm),
-          onConfirm: () => dispatch(deleteStatus(status.get('id'), history, withRedraft)),
+          onConfirm: () => dispatch(deleteStatus(status.get('id'), withRedraft)),
         },
       }));
     }
   },
 
-  onDirect (account, router) {
-    dispatch(directCompose(account, router));
+  onDirect (account) {
+    dispatch(directCompose(account));
   },
 
-  onMention (account, router) {
-    dispatch(mentionCompose(account, router));
+  onMention (account) {
+    dispatch(mentionCompose(account));
   },
 
   onOpenMedia (media, index, lang) {
diff --git a/app/javascript/flavours/glitch/features/status/index.jsx b/app/javascript/flavours/glitch/features/status/index.jsx
index 00639a667e62ea..eb965046d18c09 100644
--- a/app/javascript/flavours/glitch/features/status/index.jsx
+++ b/app/javascript/flavours/glitch/features/status/index.jsx
@@ -324,11 +324,11 @@ class Status extends ImmutablePureComponent {
             message: intl.formatMessage(messages.replyMessage),
             confirm: intl.formatMessage(messages.replyConfirm),
             onDoNotAsk: () => dispatch(changeLocalSetting(['confirm_before_clearing_draft'], false)),
-            onConfirm: () => dispatch(replyCompose(status, this.props.history)),
+            onConfirm: () => dispatch(replyCompose(status)),
           },
         }));
       } else {
-        dispatch(replyCompose(status, this.props.history));
+        dispatch(replyCompose(status));
       }
     } else {
       dispatch(openModal({
@@ -384,33 +384,33 @@ class Status extends ImmutablePureComponent {
     }
   };
 
-  handleDeleteClick = (status, history, withRedraft = false) => {
+  handleDeleteClick = (status, withRedraft = false) => {
     const { dispatch, intl } = this.props;
 
     if (!deleteModal) {
-      dispatch(deleteStatus(status.get('id'), history, withRedraft));
+      dispatch(deleteStatus(status.get('id'), withRedraft));
     } else {
       dispatch(openModal({
         modalType: 'CONFIRM',
         modalProps: {
           message: intl.formatMessage(withRedraft ? messages.redraftMessage : messages.deleteMessage),
           confirm: intl.formatMessage(withRedraft ? messages.redraftConfirm : messages.deleteConfirm),
-          onConfirm: () => dispatch(deleteStatus(status.get('id'), history, withRedraft)),
+          onConfirm: () => dispatch(deleteStatus(status.get('id'), withRedraft)),
         },
       }));
     }
   };
 
-  handleEditClick = (status, history) => {
-    this.props.dispatch(editStatus(status.get('id'), history));
+  handleEditClick = (status) => {
+    this.props.dispatch(editStatus(status.get('id')));
   };
 
-  handleDirectClick = (account, history) => {
-    this.props.dispatch(directCompose(account, history));
+  handleDirectClick = (account) => {
+    this.props.dispatch(directCompose(account));
   };
 
-  handleMentionClick = (account, history) => {
-    this.props.dispatch(mentionCompose(account, history));
+  handleMentionClick = (account) => {
+    this.props.dispatch(mentionCompose(account));
   };
 
   handleOpenMedia = (media, index, lang) => {

From fd8b04e9e7c0e41b281012c49963ca9b5213ace7 Mon Sep 17 00:00:00 2001
From: Essem <smswessem@gmail.com>
Date: Thu, 18 Jul 2024 21:01:46 -0500
Subject: [PATCH 1583/2191] Add notification grouping for reactions

---
 .../glitch/api_types/notifications.ts         |  2 ++
 .../components/notification_group.tsx         |  9 +++++
 .../components/notification_reaction.tsx      | 34 +++++++++++++++++++
 .../features/notifications_v2/filter_bar.tsx  | 13 +++++++
 .../glitch/models/notification_group.ts       |  4 +++
 .../flavours/glitch/styles/components.scss    |  4 +++
 .../rest/notification_group_serializer.rb     |  2 +-
 app/services/notify_service.rb                |  2 +-
 8 files changed, 68 insertions(+), 2 deletions(-)
 create mode 100644 app/javascript/flavours/glitch/features/notifications_v2/components/notification_reaction.tsx

diff --git a/app/javascript/flavours/glitch/api_types/notifications.ts b/app/javascript/flavours/glitch/api_types/notifications.ts
index ea37556d8d0af0..de9e315ca60eb9 100644
--- a/app/javascript/flavours/glitch/api_types/notifications.ts
+++ b/app/javascript/flavours/glitch/api_types/notifications.ts
@@ -11,6 +11,7 @@ export const allNotificationTypes = [
   'follow',
   'follow_request',
   'favourite',
+  'reaction',
   'reblog',
   'mention',
   'poll',
@@ -24,6 +25,7 @@ export const allNotificationTypes = [
 
 export type NotificationWithStatusType =
   | 'favourite'
+  | 'reaction'
   | 'reblog'
   | 'status'
   | 'mention'
diff --git a/app/javascript/flavours/glitch/features/notifications_v2/components/notification_group.tsx b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_group.tsx
index b1346a88e0fe5d..b0af140a4d0c74 100644
--- a/app/javascript/flavours/glitch/features/notifications_v2/components/notification_group.tsx
+++ b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_group.tsx
@@ -13,6 +13,7 @@ import { NotificationFollowRequest } from './notification_follow_request';
 import { NotificationMention } from './notification_mention';
 import { NotificationModerationWarning } from './notification_moderation_warning';
 import { NotificationPoll } from './notification_poll';
+import { NotificationReaction } from './notification_reaction';
 import { NotificationReblog } from './notification_reblog';
 import { NotificationSeveredRelationships } from './notification_severed_relationships';
 import { NotificationStatus } from './notification_status';
@@ -61,6 +62,14 @@ export const NotificationGroup: React.FC<{
         />
       );
       break;
+    case 'reaction':
+      content = (
+        <NotificationReaction
+          unread={unread}
+          notification={notificationGroup}
+        />
+      );
+      break;
     case 'severed_relationships':
       content = (
         <NotificationSeveredRelationships
diff --git a/app/javascript/flavours/glitch/features/notifications_v2/components/notification_reaction.tsx b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_reaction.tsx
new file mode 100644
index 00000000000000..95dd4d850a8ed4
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_reaction.tsx
@@ -0,0 +1,34 @@
+import { FormattedMessage } from 'react-intl';
+
+import MoodIcon from '@/material-icons/400-24px/mood.svg?react';
+import type { NotificationGroupReaction } from 'flavours/glitch/models/notification_group';
+
+import type { LabelRenderer } from './notification_group_with_status';
+import { NotificationGroupWithStatus } from './notification_group_with_status';
+
+const labelRenderer: LabelRenderer = (values) => (
+  <FormattedMessage
+    id='notification.reaction'
+    defaultMessage='{name} reacted to your status'
+    values={values}
+  />
+);
+
+export const NotificationReaction: React.FC<{
+  notification: NotificationGroupReaction;
+  unread: boolean;
+}> = ({ notification, unread }) => {
+  return (
+    <NotificationGroupWithStatus
+      type='reaction'
+      icon={MoodIcon}
+      iconId='react'
+      accountIds={notification.sampleAccountIds}
+      statusId={notification.statusId}
+      timestamp={notification.latest_page_notification_at}
+      count={notification.notifications_count}
+      labelRenderer={labelRenderer}
+      unread={unread}
+    />
+  );
+};
diff --git a/app/javascript/flavours/glitch/features/notifications_v2/filter_bar.tsx b/app/javascript/flavours/glitch/features/notifications_v2/filter_bar.tsx
index 1299796662b1d6..59d0effbd1b947 100644
--- a/app/javascript/flavours/glitch/features/notifications_v2/filter_bar.tsx
+++ b/app/javascript/flavours/glitch/features/notifications_v2/filter_bar.tsx
@@ -5,6 +5,7 @@ import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
 
 import HomeIcon from '@/material-icons/400-24px/home-fill.svg?react';
 import InsertChartIcon from '@/material-icons/400-24px/insert_chart.svg?react';
+import MoodIcon from '@/material-icons/400-24px/mood.svg?react';
 import PersonAddIcon from '@/material-icons/400-24px/person_add.svg?react';
 import RepeatIcon from '@/material-icons/400-24px/repeat.svg?react';
 import ReplyAllIcon from '@/material-icons/400-24px/reply_all.svg?react';
@@ -23,6 +24,10 @@ const tooltips = defineMessages({
     id: 'notifications.filter.favourites',
     defaultMessage: 'Favorites',
   },
+  reactions: {
+    id: 'notifications.filter.reactions',
+    defaultMessage: 'Reactions',
+  },
   boosts: { id: 'notifications.filter.boosts', defaultMessage: 'Boosts' },
   polls: { id: 'notifications.filter.polls', defaultMessage: 'Poll results' },
   follows: { id: 'notifications.filter.follows', defaultMessage: 'Follows' },
@@ -91,6 +96,14 @@ export const FilterBar: React.FC = () => {
         >
           <Icon id='star' icon={StarIcon} />
         </BarButton>
+        <BarButton
+          selectedFilter={selectedFilter}
+          type='reaction'
+          key='reaction'
+          title={intl.formatMessage(tooltips.reactions)}
+        >
+          <Icon id='react' icon={MoodIcon} />
+        </BarButton>
         <BarButton
           selectedFilter={selectedFilter}
           type='reblog'
diff --git a/app/javascript/flavours/glitch/models/notification_group.ts b/app/javascript/flavours/glitch/models/notification_group.ts
index 6c8b8eb6e3d555..58659f56da6d96 100644
--- a/app/javascript/flavours/glitch/models/notification_group.ts
+++ b/app/javascript/flavours/glitch/models/notification_group.ts
@@ -31,6 +31,7 @@ interface BaseNotification<Type extends NotificationType>
 
 export type NotificationGroupFavourite =
   BaseNotificationWithStatus<'favourite'>;
+export type NotificationGroupReaction = BaseNotificationWithStatus<'reaction'>;
 export type NotificationGroupReblog = BaseNotificationWithStatus<'reblog'>;
 export type NotificationGroupStatus = BaseNotificationWithStatus<'status'>;
 export type NotificationGroupMention = BaseNotificationWithStatus<'mention'>;
@@ -76,6 +77,7 @@ export interface NotificationGroupAdminReport
 
 export type NotificationGroup =
   | NotificationGroupFavourite
+  | NotificationGroupReaction
   | NotificationGroupReblog
   | NotificationGroupStatus
   | NotificationGroupMention
@@ -120,6 +122,7 @@ export function createNotificationGroupFromJSON(
 
   switch (group.type) {
     case 'favourite':
+    case 'reaction':
     case 'reblog':
     case 'status':
     case 'mention':
@@ -179,6 +182,7 @@ export function createNotificationGroupFromNotificationJSON(
 
   switch (notification.type) {
     case 'favourite':
+    case 'reaction':
     case 'reblog':
     case 'status':
     case 'mention':
diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index 78356b562bea96..4a5ab85de8deaa 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -10942,6 +10942,10 @@ noscript {
     color: $gold-star;
   }
 
+  &--reaction &__icon {
+    color: $blurple-300;
+  }
+
   &--reblog &__icon {
     color: $valid-value-color;
   }
diff --git a/app/serializers/rest/notification_group_serializer.rb b/app/serializers/rest/notification_group_serializer.rb
index 749f71775463e0..0e4efe9278d953 100644
--- a/app/serializers/rest/notification_group_serializer.rb
+++ b/app/serializers/rest/notification_group_serializer.rb
@@ -15,7 +15,7 @@ class REST::NotificationGroupSerializer < ActiveModel::Serializer
   belongs_to :account_warning, key: :moderation_warning, if: :moderation_warning_event?, serializer: REST::AccountWarningSerializer
 
   def status_type?
-    [:favourite, :reblog, :status, :mention, :poll, :update].include?(object.type)
+    [:favourite, :reaction, :reblog, :status, :mention, :poll, :update].include?(object.type)
   end
 
   def report_type?
diff --git a/app/services/notify_service.rb b/app/services/notify_service.rb
index 23f92c816b86c0..611894a6df8293 100644
--- a/app/services/notify_service.rb
+++ b/app/services/notify_service.rb
@@ -206,7 +206,7 @@ def call(recipient, type, activity)
   private
 
   def notification_group_key
-    return nil if @notification.filtered || %i(favourite reblog).exclude?(@notification.type)
+    return nil if @notification.filtered || %i(favourite reaction reblog).exclude?(@notification.type)
 
     type_prefix = "#{@notification.type}-#{@notification.target_status.id}"
     redis_key   = "notif-group/#{@recipient.id}/#{type_prefix}"

From 8ad361cb29b46425e99bfc8edefcada0fe70a62f Mon Sep 17 00:00:00 2001
From: hazycora <hazysu@riseup.net>
Date: Sun, 17 Dec 2023 16:42:54 -0600
Subject: [PATCH 1584/2191] allow dashes in emoji shortcodes

---
 app/models/custom_emoji.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/custom_emoji.rb b/app/models/custom_emoji.rb
index 7ea50e85d83736..817650170a4143 100644
--- a/app/models/custom_emoji.rb
+++ b/app/models/custom_emoji.rb
@@ -27,7 +27,7 @@ class CustomEmoji < ApplicationRecord
   LOCAL_LIMIT = (ENV['MAX_EMOJI_SIZE'] || 256.kilobytes).to_i
   LIMIT       = [LOCAL_LIMIT, (ENV['MAX_REMOTE_EMOJI_SIZE'] || 256.kilobytes).to_i].max
 
-  SHORTCODE_RE_FRAGMENT = '[a-zA-Z0-9_]{2,}'
+  SHORTCODE_RE_FRAGMENT = '[a-zA-Z0-9_-]{2,}'
 
   SCAN_RE = /(?<=[^[:alnum:]:]|\n|^)
     :(#{SHORTCODE_RE_FRAGMENT}):

From db7eb6c7012dab00136ca7a6115173852bf42f79 Mon Sep 17 00:00:00 2001
From: Jeremy Kescher <jeremy@kescher.at>
Date: Fri, 19 Jul 2024 18:19:44 +0200
Subject: [PATCH 1585/2191] Update README.md

Adds information about a minor change in the custom_emoji model that allows dashes in emoji shortcodes.
---
 README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/README.md b/README.md
index 0a43ec2aff46de..573534affae903 100644
--- a/README.md
+++ b/README.md
@@ -45,6 +45,9 @@ instead, use merge (fast-forward, if possible, with merge commit otherwise).
 - Environment variable `MASTODON_USE_LIBVIPS` is true by default.
   - This is a minor change, but it _requires_ all systems running Catstodon to run a recent libvips version (8.13+).
   - Vanilla Mastodon intends to deprecate ImageMagick anyway, so sooner or later, this change will cease being one.
+- Allow dashes in emoji shortcodes
+  - This is simply to allow custom emoji compat with other fedi software.
+  - Original patch by hazycora: https://github.com/TheEssem/mastodon/commit/2dde7a25a47a23f827e2fd2d07f55438f9985181
 
 ## Previous differences now merged into glitch-soc
 

From dcb356d256423f41c33c5b400fe593ab8577a24e Mon Sep 17 00:00:00 2001
From: Jeremy Kescher <jeremy@kescher.at>
Date: Fri, 19 Jul 2024 18:26:44 +0200
Subject: [PATCH 1586/2191] Bump Catstodon revision to 1.0.2

---
 CHANGELOG.md            | 14 ++++++++++++++
 lib/mastodon/version.rb |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 974624ce744595..c571b8ee17ea83 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,20 @@ All changes to Catstodon that aren't Mastodon or glitch-soc Mastodon changes wil
 
 All release dates, as well as most other dates, are intended to be read as "within the day, in UTC time."
 
+## [v4.3.0-alpha.5+glitch+cat+1.0.2] - 2024-07-16
+
+- Upstream changes
+  - Notable: Notification grouping.
+- Emoji patch changes
+  - Notification grouping now works for reactions as well.
+    - Thanks again, Essem, for maintaining the emoji reactions patch!
+    - Catstodon
+      commit: [fd8b04e9e7](https://git.kescher.at/CatCatNya/catstodon/commit/fd8b04e9e7c0e41b281012c49963ca9b5213ace7)
+- Allow dashes in emoji shortcodes. Merged mainly to support remote instances' emoji shortcodes.
+  - Thanks to hazycora for originally contributing this patch to Chuckya Mastodon.
+  - Catstodon
+    commit: [8ad361cb29](https://git.kescher.at/CatCatNya/catstodon/commit/8ad361cb29b46425e99bfc8edefcada0fe70a62f)
+
 ## [v4.3.0-alpha.5+glitch+cat+1.0.1] - 2024-07-16
 
 - Upstream changes
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index 29392cf85dcb9b..5af47335517f42 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -25,7 +25,7 @@ def prerelease
     end
 
     def catstodon_revision
-      '1.0.1'
+      '1.0.2'
     end
 
     def build_metadata

From 2774980589fd5d95a2a812527c269a4368e6889e Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 22 Jul 2024 09:37:27 +0200
Subject: [PATCH 1587/2191] Fix syntax error in grouped notifications CTE on
 some PostgreSQL versions (#31098)

---
 app/models/notification.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/notification.rb b/app/models/notification.rb
index 6d404114788c00..8b77b2a03b2f4c 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -149,7 +149,7 @@ def paginate_groups_by_max_id(limit, max_id: nil, since_id: nil)
         .with_recursive(
           grouped_notifications: [
             query
-              .select('notifications.*', "ARRAY[COALESCE(notifications.group_key, 'ungrouped-' || notifications.id)] groups")
+              .select('notifications.*', "ARRAY[COALESCE(notifications.group_key, 'ungrouped-' || notifications.id)] AS groups")
               .limit(1),
             query
               .joins('CROSS JOIN grouped_notifications')
@@ -177,7 +177,7 @@ def paginate_groups_by_min_id(limit, max_id: nil, min_id: nil)
         .with_recursive(
           grouped_notifications: [
             query
-              .select('notifications.*', "ARRAY[COALESCE(notifications.group_key, 'ungrouped-' || notifications.id)] groups")
+              .select('notifications.*', "ARRAY[COALESCE(notifications.group_key, 'ungrouped-' || notifications.id)] AS groups")
               .limit(1),
             query
               .joins('CROSS JOIN grouped_notifications')

From 77ec5e11e4385546e9b10c597c0b40002a809082 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 22 Jul 2024 07:38:52 +0000
Subject: [PATCH 1588/2191] chore(deps): update dependency email_spec to v2.3.0
 (#31097)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 006a9184463c52..3815e6960cc527 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -222,9 +222,9 @@ GEM
     elasticsearch-transport (7.17.10)
       faraday (>= 1, < 3)
       multi_json
-    email_spec (2.2.2)
+    email_spec (2.3.0)
       htmlentities (~> 4.3.3)
-      launchy (~> 2.1)
+      launchy (>= 2.1, < 4.0)
       mail (~> 2.7)
     erubi (1.13.0)
     et-orbi (1.2.11)
@@ -440,7 +440,7 @@ GEM
       uri
     net-http-persistent (4.0.2)
       connection_pool (~> 2.2)
-    net-imap (0.4.12)
+    net-imap (0.4.14)
       date
       net-protocol
     net-ldap (0.19.0)

From 22d2fba2790e258096334d13e4688ae7810ebb4f Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 22 Jul 2024 07:39:38 +0000
Subject: [PATCH 1589/2191] chore(deps): update definitelytyped types
 (non-major) (#31095)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 1a17c5862fa249..7ffd614f686629 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3737,9 +3737,9 @@ __metadata:
   linkType: hard
 
 "@types/lodash@npm:^4.14.195":
-  version: 4.17.6
-  resolution: "@types/lodash@npm:4.17.6"
-  checksum: 10c0/3b197ac47af9443fee8c4719c5ffde527d7febc018b827d44a6bc2523c728c7adfdd25196fdcfe3eed827993e0c41a917d0da6e78938b18b2be94164789f1117
+  version: 4.17.7
+  resolution: "@types/lodash@npm:4.17.7"
+  checksum: 10c0/40c965b5ffdcf7ff5c9105307ee08b782da228c01b5c0529122c554c64f6b7168fc8f11dc79aa7bae4e67e17efafaba685dc3a47e294dbf52a65ed2b67100561
   languageName: node
   linkType: hard
 
@@ -4117,11 +4117,11 @@ __metadata:
   linkType: hard
 
 "@types/ws@npm:^8.5.9":
-  version: 8.5.10
-  resolution: "@types/ws@npm:8.5.10"
+  version: 8.5.11
+  resolution: "@types/ws@npm:8.5.11"
   dependencies:
     "@types/node": "npm:*"
-  checksum: 10c0/e9af279b984c4a04ab53295a40aa95c3e9685f04888df5c6920860d1dd073fcc57c7bd33578a04b285b2c655a0b52258d34bee0a20569dca8defb8393e1e5d29
+  checksum: 10c0/50bd2e1a12659fa024a97d7e8c267fbf2a2c2251f1edf2057aa7dfc99682f5c025a188df9e27414675c78d3b189346a3567e1e4c218ad79a9d2b0f1f2b860c3a
   languageName: node
   linkType: hard
 

From 6ee5d3b5591d96c492035274e4668cfa7891fe70 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 22 Jul 2024 09:39:56 +0200
Subject: [PATCH 1590/2191] fix(deps): update dependency jsdom to v24.1.1
 (#31088)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 7ffd614f686629..bd6efa72fe18a0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9518,13 +9518,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"https-proxy-agent@npm:^7.0.1, https-proxy-agent@npm:^7.0.4":
-  version: 7.0.4
-  resolution: "https-proxy-agent@npm:7.0.4"
+"https-proxy-agent@npm:^7.0.1, https-proxy-agent@npm:^7.0.5":
+  version: 7.0.5
+  resolution: "https-proxy-agent@npm:7.0.5"
   dependencies:
     agent-base: "npm:^7.0.2"
     debug: "npm:4"
-  checksum: 10c0/bc4f7c38da32a5fc622450b6cb49a24ff596f9bd48dcedb52d2da3fa1c1a80e100fb506bd59b326c012f21c863c69b275c23de1a01d0b84db396822fdf25e52b
+  checksum: 10c0/2490e3acec397abeb88807db52cac59102d5ed758feee6df6112ab3ccd8325e8a1ce8bce6f4b66e5470eca102d31e425ace904242e4fa28dbe0c59c4bafa7b2c
   languageName: node
   linkType: hard
 
@@ -11095,8 +11095,8 @@ __metadata:
   linkType: hard
 
 "jsdom@npm:^24.0.0":
-  version: 24.1.0
-  resolution: "jsdom@npm:24.1.0"
+  version: 24.1.1
+  resolution: "jsdom@npm:24.1.1"
   dependencies:
     cssstyle: "npm:^4.0.1"
     data-urls: "npm:^5.0.0"
@@ -11104,11 +11104,11 @@ __metadata:
     form-data: "npm:^4.0.0"
     html-encoding-sniffer: "npm:^4.0.0"
     http-proxy-agent: "npm:^7.0.2"
-    https-proxy-agent: "npm:^7.0.4"
+    https-proxy-agent: "npm:^7.0.5"
     is-potential-custom-element-name: "npm:^1.0.1"
-    nwsapi: "npm:^2.2.10"
+    nwsapi: "npm:^2.2.12"
     parse5: "npm:^7.1.2"
-    rrweb-cssom: "npm:^0.7.0"
+    rrweb-cssom: "npm:^0.7.1"
     saxes: "npm:^6.0.0"
     symbol-tree: "npm:^3.2.4"
     tough-cookie: "npm:^4.1.4"
@@ -11117,14 +11117,14 @@ __metadata:
     whatwg-encoding: "npm:^3.1.1"
     whatwg-mimetype: "npm:^4.0.0"
     whatwg-url: "npm:^14.0.0"
-    ws: "npm:^8.17.0"
+    ws: "npm:^8.18.0"
     xml-name-validator: "npm:^5.0.0"
   peerDependencies:
     canvas: ^2.11.2
   peerDependenciesMeta:
     canvas:
       optional: true
-  checksum: 10c0/34eadd8a7ae20c1505abe7a0f3988b2f0881cce7e27d75c4f5224f440f81f8ac08f4f449695b0f4178f048ed1c1709f3594e9d3f2fe0406c28e8da6eddd44f5a
+  checksum: 10c0/02d6bfe32f09f26329c0e53ad9f9883a3c671fc1f75725167d2089ca412f5b7ca85ff8aa62327d1cc6fc70ffbb3b18dfc7642c4b2096c2c8b19aaf9a48473eb3
   languageName: node
   linkType: hard
 
@@ -12417,10 +12417,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"nwsapi@npm:^2.2.10, nwsapi@npm:^2.2.2":
-  version: 2.2.10
-  resolution: "nwsapi@npm:2.2.10"
-  checksum: 10c0/43dfa150387bd2a578e37556d0ae3330d5617f99e5a7b64e3400d4c2785620762aa6169caf8f5fbce17b7ef29c372060b602594320c374fba0a39da4163d77ed
+"nwsapi@npm:^2.2.12, nwsapi@npm:^2.2.2":
+  version: 2.2.12
+  resolution: "nwsapi@npm:2.2.12"
+  checksum: 10c0/95e9623d63df111405503df8c5d800e26f71675d319e2c9c70cddfa31e5ace1d3f8b6d98d354544fc156a1506d920ec291e303fab761e4f99296868e199a466e
   languageName: node
   linkType: hard
 
@@ -15361,10 +15361,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rrweb-cssom@npm:^0.7.0":
-  version: 0.7.0
-  resolution: "rrweb-cssom@npm:0.7.0"
-  checksum: 10c0/278350b1f383f76db20e37394361b709740bd4f5f27f924e1c3c3fdd7112b2ae37ed9bc7cee63776f7df395b9b0f644d1f8be104990e3028d276a3288cd7e564
+"rrweb-cssom@npm:^0.7.1":
+  version: 0.7.1
+  resolution: "rrweb-cssom@npm:0.7.1"
+  checksum: 10c0/127b8ca6c8aac45e2755abbae6138d4a813b1bedc2caabf79466ae83ab3cfc84b5bfab513b7033f0aa4561c7753edf787d0dd01163ceacdee2e8eb1b6bf7237e
   languageName: node
   linkType: hard
 
@@ -18515,7 +18515,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ws@npm:^8.11.0, ws@npm:^8.12.1, ws@npm:^8.17.0":
+"ws@npm:^8.11.0, ws@npm:^8.12.1, ws@npm:^8.18.0":
   version: 8.18.0
   resolution: "ws@npm:8.18.0"
   peerDependencies:

From ef796446e5b0827bc73a27d573b930b27efef579 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 22 Jul 2024 03:46:41 -0400
Subject: [PATCH 1591/2191] Ignore manifest JS parse/interrupt error on CI
 (#31080)

---
 spec/support/javascript_errors.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spec/support/javascript_errors.rb b/spec/support/javascript_errors.rb
index 76452853622b78..ef5945f37dcb79 100644
--- a/spec/support/javascript_errors.rb
+++ b/spec/support/javascript_errors.rb
@@ -5,6 +5,7 @@
     # Classes of intermittent ignorable errors
     ignored_errors = [
       /Error while trying to use the following icon from the Manifest/, # https://github.com/mastodon/mastodon/pull/30793
+      /Manifest: Line: 1, column: 1, Syntax error/, # Similar parsing/interruption issue as above
     ]
     errors = page.driver.browser.logs.get(:browser).reject do |error|
       ignored_errors.any? { |pattern| pattern.match(error.message) }

From 5a60a3b80c8fe1769ba737a286169636476e686c Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 22 Jul 2024 10:01:24 +0200
Subject: [PATCH 1592/2191] New Crowdin Translations (automated) (#31087)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/bg.json  |  14 ++
 app/javascript/mastodon/locales/ca.json  |  14 ++
 app/javascript/mastodon/locales/el.json  | 164 +++++++++++++++++++++++
 app/javascript/mastodon/locales/fi.json  |  26 +++-
 app/javascript/mastodon/locales/fy.json  |   1 +
 app/javascript/mastodon/locales/gl.json  |  14 ++
 app/javascript/mastodon/locales/he.json  |  14 ++
 app/javascript/mastodon/locales/is.json  |  14 ++
 app/javascript/mastodon/locales/ja.json  |   2 +
 app/javascript/mastodon/locales/kab.json |  43 +++---
 app/javascript/mastodon/locales/lad.json |  10 ++
 app/javascript/mastodon/locales/nl.json  |   8 +-
 app/javascript/mastodon/locales/sq.json  |  14 ++
 app/javascript/mastodon/locales/sv.json  |   3 +
 app/javascript/mastodon/locales/th.json  |   6 +
 app/javascript/mastodon/locales/tr.json  |  14 ++
 app/javascript/mastodon/locales/uk.json  |  14 ++
 app/javascript/mastodon/locales/vi.json  |  14 ++
 config/locales/activerecord.el.yml       |   4 +-
 config/locales/doorkeeper.el.yml         | 107 ++++++++-------
 config/locales/doorkeeper.kab.yml        |  10 +-
 config/locales/el.yml                    |  11 +-
 config/locales/fi.yml                    |   6 +-
 config/locales/is.yml                    |   2 +
 config/locales/kab.yml                   |   2 +-
 config/locales/nl.yml                    |   1 +
 config/locales/simple_form.ja.yml        |   2 +
 config/locales/simple_form.kab.yml       |  10 +-
 config/locales/simple_form.lad.yml       |   1 +
 config/locales/uk.yml                    |   1 +
 30 files changed, 442 insertions(+), 104 deletions(-)

diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json
index 0e29f55e761eba..b2dff17407f4b0 100644
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@@ -443,6 +443,8 @@
   "mute_modal.title": "Заглушавате ли потребител?",
   "mute_modal.you_wont_see_mentions": "Няма да виждате споменаващите ги публикации.",
   "mute_modal.you_wont_see_posts": "Още могат да виждат публикациите ви, но вие техните не.",
+  "name_and_others": "{name} и {count, plural, one {# друг} other {# други}}",
+  "name_and_others_with_link": "{name} и <a>{count, plural, one {# друг} other {# други}}</a>",
   "navigation_bar.about": "Относно",
   "navigation_bar.advanced_interface": "Отваряне в разширен уебинтерфейс",
   "navigation_bar.blocks": "Блокирани потребители",
@@ -470,6 +472,10 @@
   "navigation_bar.security": "Сигурност",
   "not_signed_in_indicator.not_signed_in": "Трябва ви вход за достъп до ресурса.",
   "notification.admin.report": "{name} докладва {target}",
+  "notification.admin.report_account": "{name} докладва {count, plural, one {публикация} other {# публикации}} от {target} за {category}",
+  "notification.admin.report_account_other": "{name} докладва {count, plural, one {публикация} other {# публикации}} от {target}",
+  "notification.admin.report_statuses": "{name} докладва {target} за {category}",
+  "notification.admin.report_statuses_other": "{name} докладва {target}",
   "notification.admin.sign_up": "{name} се регистрира",
   "notification.favourite": "{name} направи любима публикацията ви",
   "notification.follow": "{name} ви последва",
@@ -485,6 +491,8 @@
   "notification.moderation_warning.action_silence": "Вашият акаунт е ограничен.",
   "notification.moderation_warning.action_suspend": "Вашият акаунт е спрян.",
   "notification.own_poll": "Анкетата ви приключи",
+  "notification.poll": "Анкета, в която гласувахте, приключи",
+  "notification.private_mention": "{name} лично ви спомена",
   "notification.reblog": "{name} подсили ваша публикация",
   "notification.relationships_severance_event": "Изгуби се връзката с {name}",
   "notification.relationships_severance_event.account_suspension": "Администратор от {from} спря {target}, което значи че повече не може да получавате новости от тях или да взаимодействате с тях.",
@@ -502,6 +510,8 @@
   "notifications.column_settings.admin.report": "Нови доклади:",
   "notifications.column_settings.admin.sign_up": "Нови регистрации:",
   "notifications.column_settings.alert": "Известия на работния плот",
+  "notifications.column_settings.beta.category": "Експериментални функции",
+  "notifications.column_settings.beta.grouping": "Групови известия",
   "notifications.column_settings.favourite": "Любими:",
   "notifications.column_settings.filter_bar.advanced": "Показване на всички категории",
   "notifications.column_settings.filter_bar.category": "Лента за бърз филтър",
@@ -665,9 +675,13 @@
   "report.unfollow_explanation": "Последвали сте този акаунт. За да не виждате повече публикациите му в началния си инфопоток, спрете да го следвате.",
   "report_notification.attached_statuses": "{count, plural, one {прикаченa {count} публикация} other {прикачени {count} публикации}}",
   "report_notification.categories.legal": "Правни въпроси",
+  "report_notification.categories.legal_sentence": "незаконно съдържание",
   "report_notification.categories.other": "Друго",
+  "report_notification.categories.other_sentence": "друго",
   "report_notification.categories.spam": "Спам",
+  "report_notification.categories.spam_sentence": "спам",
   "report_notification.categories.violation": "Нарушение на правилото",
+  "report_notification.categories.violation_sentence": "нарушение на правило",
   "report_notification.open": "Отваряне на доклада",
   "search.no_recent_searches": "Няма скорошни търсения",
   "search.placeholder": "Търсене",
diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index 1719b105f042f2..80c85ce178eb67 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -443,6 +443,8 @@
   "mute_modal.title": "Silenciem l'usuari?",
   "mute_modal.you_wont_see_mentions": "No veureu publicacions que els esmentin.",
   "mute_modal.you_wont_see_posts": "Encara poden veure les vostres publicacions, però no veureu les seves.",
+  "name_and_others": "{name} i {count, plural, one {# altre} other {# altres}}",
+  "name_and_others_with_link": "{name} i <a>{count, plural, one {# altre} other {# altres}}</a>",
   "navigation_bar.about": "Quant a",
   "navigation_bar.advanced_interface": "Obre en la interfície web avançada",
   "navigation_bar.blocks": "Usuaris blocats",
@@ -470,6 +472,10 @@
   "navigation_bar.security": "Seguretat",
   "not_signed_in_indicator.not_signed_in": "Cal que iniciïs la sessió per a accedir a aquest recurs.",
   "notification.admin.report": "{name} ha reportat {target}",
+  "notification.admin.report_account": "{name} ha reportat {count, plural, one {una publicació} other {# publicacions}} de {target} per {category}",
+  "notification.admin.report_account_other": "{name} ha reportat {count, plural, one {una publicació} other {# publicacions}} de {target}",
+  "notification.admin.report_statuses": "{name} ha reportat {target} per {category}",
+  "notification.admin.report_statuses_other": "{name} ha reportat {target}",
   "notification.admin.sign_up": "{name} s'ha registrat",
   "notification.favourite": "{name} ha afavorit el teu tut",
   "notification.follow": "{name} et segueix",
@@ -485,6 +491,8 @@
   "notification.moderation_warning.action_silence": "S'ha limitat el vostre compte.",
   "notification.moderation_warning.action_suspend": "S'ha suspès el vostre compte.",
   "notification.own_poll": "La teva enquesta ha finalitzat",
+  "notification.poll": "Ha finalitzat una enquesta que heu respost",
+  "notification.private_mention": "{name} us ha esmentat en privat",
   "notification.reblog": "{name} t'ha impulsat",
   "notification.relationships_severance_event": "S'han perdut les connexions amb {name}",
   "notification.relationships_severance_event.account_suspension": "Un administrador de {from} ha suspès {target}; això vol dir que ja no en podreu rebre actualitzacions o interactuar-hi.",
@@ -502,6 +510,8 @@
   "notifications.column_settings.admin.report": "Nous informes:",
   "notifications.column_settings.admin.sign_up": "Registres nous:",
   "notifications.column_settings.alert": "Notificacions d'escriptori",
+  "notifications.column_settings.beta.category": "Característiques experimentals",
+  "notifications.column_settings.beta.grouping": "Notificacions de grup",
   "notifications.column_settings.favourite": "Favorits:",
   "notifications.column_settings.filter_bar.advanced": "Mostra totes les categories",
   "notifications.column_settings.filter_bar.category": "Barra ràpida de filtres",
@@ -665,9 +675,13 @@
   "report.unfollow_explanation": "Estàs seguint aquest compte. Per no veure els seus tuts a la teva línia de temps d'Inici, deixa de seguir-lo.",
   "report_notification.attached_statuses": "{count, plural, one {{count} tut} other {{count} tuts}} adjunts",
   "report_notification.categories.legal": "Legal",
+  "report_notification.categories.legal_sentence": "contingut no permès",
   "report_notification.categories.other": "Altres",
+  "report_notification.categories.other_sentence": "altres",
   "report_notification.categories.spam": "Brossa",
+  "report_notification.categories.spam_sentence": "brossa",
   "report_notification.categories.violation": "Violació de norma",
+  "report_notification.categories.violation_sentence": "violació de normes",
   "report_notification.open": "Obre l'informe",
   "search.no_recent_searches": "No hi ha cerques recents",
   "search.placeholder": "Cerca",
diff --git a/app/javascript/mastodon/locales/el.json b/app/javascript/mastodon/locales/el.json
index 3c0ef467bfd26e..cba2525f37763e 100644
--- a/app/javascript/mastodon/locales/el.json
+++ b/app/javascript/mastodon/locales/el.json
@@ -35,7 +35,9 @@
   "account.follow_back": "Ακολούθησε και εσύ",
   "account.followers": "Ακόλουθοι",
   "account.followers.empty": "Κανείς δεν ακολουθεί αυτόν τον χρήστη ακόμα.",
+  "account.followers_counter": "{count, plural, one {{counter} ακόλουθος} other {{counter} ακόλουθοι}}",
   "account.following": "Ακολουθείτε",
+  "account.following_counter": "{count, plural, one {{counter} ακολουθεί} other {{counter} ακολουθούν}}",
   "account.follows.empty": "Αυτός ο χρήστης δεν ακολουθεί κανέναν ακόμα.",
   "account.go_to_profile": "Μετάβαση στο προφίλ",
   "account.hide_reblogs": "Απόκρυψη ενισχύσεων από @{name}",
@@ -61,6 +63,7 @@
   "account.requested_follow": "Ο/Η {name} αιτήθηκε να σε ακολουθήσει",
   "account.share": "Κοινοποίηση του προφίλ @{name}",
   "account.show_reblogs": "Εμφάνιση ενισχύσεων από @{name}",
+  "account.statuses_counter": "{count, plural, one {{counter} ανάρτηση} other {{counter} αναρτήσεις}}",
   "account.unblock": "Άρση αποκλεισμού @{name}",
   "account.unblock_domain": "Άρση αποκλεισμού του τομέα {domain}",
   "account.unblock_short": "Άρση αποκλεισμού",
@@ -75,6 +78,10 @@
   "admin.dashboard.retention.average": "Μέσος όρος",
   "admin.dashboard.retention.cohort": "Μήνας εγγραφής",
   "admin.dashboard.retention.cohort_size": "Νέοι χρήστες",
+  "admin.impact_report.instance_accounts": "Προφίλ λογαριασμών που θα διαγράψει",
+  "admin.impact_report.instance_followers": "Ακόλουθοι που θα χάσουν οι χρήστες μας",
+  "admin.impact_report.instance_follows": "Ακόλουθοι που θα χάσουν οι χρήστες τους",
+  "admin.impact_report.title": "Περίληψη επιπτώσεων",
   "alert.rate_limited.message": "Παρακαλούμε δοκίμασε ξανά μετά τις {retry_time, time, medium}",
   "alert.rate_limited.title": "Περιορισμός συχνότητας",
   "alert.unexpected.message": "Προέκυψε απροσδόκητο σφάλμα.",
@@ -82,6 +89,14 @@
   "announcement.announcement": "Ανακοίνωση",
   "attachments_list.unprocessed": "(μη επεξεργασμένο)",
   "audio.hide": "Απόκρυψη αρχείου ήχου",
+  "block_modal.remote_users_caveat": "Θα ζητήσουμε από τον διακομιστή {domain} να σεβαστεί την απόφασή σου. Ωστόσο, η συμμόρφωση δεν είναι εγγυημένη δεδομένου ότι ορισμένοι διακομιστές ενδέχεται να χειρίζονται τους αποκλεισμούς διαφορετικά. Οι δημόσιες αναρτήσεις ενδέχεται να είναι ορατές σε μη συνδεδεμένους χρήστες.",
+  "block_modal.show_less": "Εμφάνιση λιγότερων",
+  "block_modal.show_more": "Εμφάνιση περισσότερων",
+  "block_modal.they_cant_mention": "Δεν μπορεί να σε επισημάνει ή να σε ακολουθήσει.",
+  "block_modal.they_cant_see_posts": "Δεν μπορεί να δει τις αναρτήσεις σου και δε θα δεις τις δικές του.",
+  "block_modal.they_will_know": "Μπορούν να δει ότι έχει αποκλειστεί.",
+  "block_modal.title": "Αποκλεισμός χρήστη;",
+  "block_modal.you_wont_see_mentions": "Δε θα βλέπεις τις αναρτήσεις που τον αναφέρουν.",
   "boost_modal.combo": "Μπορείς να πατήσεις {combo} για να το προσπεράσεις την επόμενη φορά",
   "bundle_column_error.copy_stacktrace": "Αντιγραφή αναφοράς σφάλματος",
   "bundle_column_error.error.body": "Δεν ήταν δυνατή η απόδοση της σελίδας που ζήτησες. Μπορεί να οφείλεται σε σφάλμα στον κώδικά μας ή σε πρόβλημα συμβατότητας του προγράμματος περιήγησης.",
@@ -108,6 +123,7 @@
   "column.directory": "Περιήγηση στα προφίλ",
   "column.domain_blocks": "Αποκλεισμένοι τομείς",
   "column.favourites": "Αγαπημένα",
+  "column.firehose": "Ζωντανές ροές",
   "column.follow_requests": "Αιτήματα ακολούθησης",
   "column.home": "Αρχική",
   "column.lists": "Λίστες",
@@ -140,6 +156,7 @@
   "compose_form.poll.duration": "Διάρκεια δημοσκόπησης",
   "compose_form.poll.multiple": "Πολλαπλή επιλογή",
   "compose_form.poll.option_placeholder": "Επιλογή {number}",
+  "compose_form.poll.single": "Διάλεξε ένα",
   "compose_form.poll.switch_to_multiple": "Ενημέρωση δημοσκόπησης με πολλαπλές επιλογές",
   "compose_form.poll.switch_to_single": "Ενημέρωση δημοσκόπησης με μοναδική επιλογή",
   "compose_form.poll.type": "Στυλ",
@@ -160,6 +177,7 @@
   "confirmations.delete_list.message": "Σίγουρα θες να διαγράψεις οριστικά αυτή τη λίστα;",
   "confirmations.discard_edit_media.confirm": "Απόρριψη",
   "confirmations.discard_edit_media.message": "Έχεις μη αποθηκευμένες αλλαγές στην περιγραφή πολυμέσων ή στην προεπισκόπηση, απόρριψη ούτως ή άλλως;",
+  "confirmations.domain_block.confirm": "Αποκλεισμός διακομιστή",
   "confirmations.domain_block.message": "Σίγουρα θες να αποκλείσεις ολόκληρο τον {domain}; Συνήθως μερικοί συγκεκρίμένοι αποκλεισμοί ή σιγάσεις επαρκούν και προτιμούνται. Δεν θα βλέπεις περιεχόμενο από αυτό τον τομέα σε καμία δημόσια ροή ή στις ειδοποιήσεις σου. Όσους ακόλουθους έχεις αυτό αυτό τον τομέα θα αφαιρεθούν.",
   "confirmations.edit.confirm": "Επεξεργασία",
   "confirmations.edit.message": "Αν το επεξεργαστείς τώρα θα αντικατασταθεί το μήνυμα που συνθέτεις. Είσαι σίγουρος ότι θέλεις να συνεχίσεις;",
@@ -190,6 +208,28 @@
   "dismissable_banner.explore_links": "Αυτές οι ειδήσεις συζητούνται σε αυτόν και άλλους διακομιστές του αποκεντρωμένου δικτύου αυτή τη στιγμή.",
   "dismissable_banner.explore_statuses": "Αυτές είναι οι αναρτήσεις που έχουν απήχηση στο κοινωνικό δίκτυο σήμερα. Οι νεώτερες αναρτήσεις με περισσότερες προωθήσεις και προτιμήσεις κατατάσσονται ψηλότερα.",
   "dismissable_banner.explore_tags": "Αυτές οι ετικέτες αποκτούν απήχηση σε αυτόν και άλλους διακομιστές του αποκεντρωμένου δικτύου αυτή τη στιγμή.",
+  "dismissable_banner.public_timeline": "Αυτές είναι οι πιο πρόσφατες δημόσιες αναρτήσεις από άτομα στον κοινωνικό ιστό που ακολουθούν άτομα από το {domain}.",
+  "domain_block_modal.block": "Αποκλεισμός διακομιστή",
+  "domain_block_modal.block_account_instead": "Αποκλεισμός @{name} αντ' αυτού",
+  "domain_block_modal.they_can_interact_with_old_posts": "Άτομα από αυτόν τον διακομιστή μπορούν να αλληλεπιδράσουν με τις παλιές αναρτήσεις σου.",
+  "domain_block_modal.they_cant_follow": "Κανείς από αυτόν τον διακομιστή δεν μπορεί να σε ακολουθήσει.",
+  "domain_block_modal.they_wont_know": "Δεν θα ξέρουν ότι έχουν αποκλειστεί.",
+  "domain_block_modal.title": "Αποκλεισμός τομέα;",
+  "domain_block_modal.you_will_lose_followers": "Οι ακόλουθοί σου από αυτόν τον διακομιστή θα αφαιρεθούν.",
+  "domain_block_modal.you_wont_see_posts": "Δεν θα βλέπεις αναρτήσεις ή ειδοποιήσεις από χρήστες σε αυτόν το διακομιστή.",
+  "domain_pill.activitypub_lets_connect": "Σού επιτρέπει να συνδεθείς και να αλληλεπιδράσεις με τους ανθρώπους όχι μόνο στο Mastodon, αλλά και σε διαφορετικές κοινωνικές εφαρμογές.",
+  "domain_pill.activitypub_like_language": "Το ActivityPub είναι σαν τη γλώσσα Mastodon μιλάει με άλλα κοινωνικά δίκτυα.",
+  "domain_pill.server": "Διακομιστής",
+  "domain_pill.their_handle": "Το πλήρες όνομα χρήστη:",
+  "domain_pill.their_server": "Το ψηφιακό του σπίτι, όπου ζουν όλες οι αναρτήσεις του.",
+  "domain_pill.their_username": "Το μοναδικό του αναγνωριστικό στο διακομιστή του. Είναι πιθανό να βρεις χρήστες με το ίδιο όνομα χρήστη σε διαφορετικούς διακομιστές.",
+  "domain_pill.username": "Όνομα χρήστη",
+  "domain_pill.whats_in_a_handle": "Τί υπάρχει σε ένα πλήρες όνομα χρήστη;",
+  "domain_pill.who_they_are": "Από τη στιγμή που τα πλήρη ονόματα λένε ποιος είναι κάποιος και πού είναι, μπορείς να αλληλεπιδράσεις με άτομα απ' όλο τον κοινωνικό ιστό των <button> πλατφορμών που στηρίζονται στο ActivityPub</button>.",
+  "domain_pill.who_you_are": "Επειδή το πλήρες όνομα χρήστη σου λέει ποιος είσαι και πού βρίσκεσαι, άτομα μπορούν να αλληλεπιδράσουν μαζί σου στον κοινωνικό ιστό των <button>πλατφορμών που στηρίζονται στο ActivityPub</button>.",
+  "domain_pill.your_handle": "Το πλήρες όνομα χρήστη σου:",
+  "domain_pill.your_server": "Το ψηφιακό σου σπίτι, όπου ζουν όλες σου οι αναρτήσεις. Δε σ' αρέσει αυτός; Μετακινήσου σε διακομιστές ανά πάσα στιγμή και πάρε και τους ακόλουθούς σου.",
+  "domain_pill.your_username": "Το μοναδικό σου αναγνωριστικό σε τούτο τον διακομιστή. Είναι πιθανό να βρεις χρήστες με το ίδιο όνομα χρήστη σε διαφορετικούς διακομιστές.",
   "embed.instructions": "Ενσωμάτωσε αυτή την ανάρτηση στην ιστοσελίδα σου αντιγράφοντας τον παρακάτω κώδικα.",
   "embed.preview": "Ορίστε πως θα φαίνεται:",
   "emoji_button.activity": "Δραστηριότητα",
@@ -207,6 +247,7 @@
   "emoji_button.search_results": "Αποτελέσματα αναζήτησης",
   "emoji_button.symbols": "Σύμβολα",
   "emoji_button.travel": "Ταξίδια & Τοποθεσίες",
+  "empty_column.account_hides_collections": "Αυτός ο χρήστης έχει επιλέξει να μην καταστήσει αυτές τις πληροφορίες διαθέσιμες",
   "empty_column.account_suspended": "Λογαριασμός σε αναστολή",
   "empty_column.account_timeline": "Δεν έχει αναρτήσεις εδώ!",
   "empty_column.account_unavailable": "Μη διαθέσιμο προφίλ",
@@ -216,6 +257,8 @@
   "empty_column.direct": "Δεν έχεις καμία προσωπική επισήμανση ακόμα. Όταν στείλεις ή λάβεις μία, θα εμφανιστεί εδώ.",
   "empty_column.domain_blocks": "Δεν υπάρχουν αποκλεισμένοι τομείς ακόμα.",
   "empty_column.explore_statuses": "Τίποτα δεν βρίσκεται στις τάσεις αυτή τη στιγμή. Έλεγξε αργότερα!",
+  "empty_column.favourited_statuses": "Δεν έχεις καμία αγαπημένη ανάρτηση ακόμα. Μόλις αγαπήσεις κάποια, θα εμφανιστεί εδώ.",
+  "empty_column.favourites": "Κανείς δεν έχει αγαπήσει αυτή την ανάρτηση ακόμα. Μόλις το κάνει κάποιος, θα εμφανιστεί εδώ.",
   "empty_column.follow_requests": "Δεν έχεις κανένα αίτημα παρακολούθησης ακόμα. Μόλις λάβεις κάποιο, θα εμφανιστεί εδώ.",
   "empty_column.followed_tags": "Δεν έχετε παρακολουθήσει ακόμα καμία ετικέτα. Όταν το κάνετε, θα εμφανιστούν εδώ.",
   "empty_column.hashtag": "Δεν υπάρχει ακόμα κάτι για αυτή την ετικέτα.",
@@ -223,6 +266,7 @@
   "empty_column.list": "Δεν υπάρχει τίποτα σε αυτή τη λίστα ακόμα. Όταν τα μέλη της δημοσιεύσουν νέες καταστάσεις, θα εμφανιστούν εδώ.",
   "empty_column.lists": "Δεν έχεις καμία λίστα ακόμα. Μόλις φτιάξεις μια, θα εμφανιστεί εδώ.",
   "empty_column.mutes": "Δεν έχεις κανένα χρήστη σε σίγαση ακόμα.",
+  "empty_column.notification_requests": "Όλα καθαρά! Δεν υπάρχει τίποτα εδώ. Όταν λαμβάνεις νέες ειδοποιήσεις, αυτές θα εμφανίζονται εδώ σύμφωνα με τις ρυθμίσεις σου.",
   "empty_column.notifications": "Δεν έχεις ειδοποιήσεις ακόμα. Όταν άλλα άτομα αλληλεπιδράσουν μαζί σου, θα το δεις εδώ.",
   "empty_column.public": "Δεν υπάρχει τίποτα εδώ! Γράψε κάτι δημόσιο ή ακολούθησε χειροκίνητα χρήστες από άλλους διακομιστές για να τη γεμίσεις",
   "error.unexpected_crash.explanation": "Είτε λόγω σφάλματος στον κώδικά μας ή λόγω ασυμβατότητας με τον περιηγητή, η σελίδα δε μπόρεσε να εμφανιστεί σωστά.",
@@ -253,12 +297,30 @@
   "filter_modal.select_filter.subtitle": "Χρησιμοποιήστε μια υπάρχουσα κατηγορία ή δημιουργήστε μια νέα",
   "filter_modal.select_filter.title": "Φιλτράρισμα αυτής της ανάρτησης",
   "filter_modal.title.status": "Φιλτράρισμα μιας ανάρτησης",
+  "filtered_notifications_banner.mentions": "{count, plural, one {επισήμανση} other {επισημάνσεις}}",
+  "filtered_notifications_banner.pending_requests": "Ειδοποιήσεις από {count, plural, =0 {κανένα} one {ένα άτομο} other {# άτομα}} που μπορεί να ξέρεις",
+  "filtered_notifications_banner.title": "Φιλτραρισμένες ειδοποιήσεις",
   "firehose.all": "Όλα",
   "firehose.local": "Αυτός ο διακομιστής",
   "firehose.remote": "Άλλοι διακομιστές",
   "follow_request.authorize": "Εξουσιοδότησε",
   "follow_request.reject": "Απέρριψε",
   "follow_requests.unlocked_explanation": "Παρόλο που ο λογαριασμός σου δεν είναι κλειδωμένος, το προσωπικό του {domain} θεώρησαν πως ίσως να θέλεις να ελέγξεις χειροκίνητα αυτά τα αιτήματα ακολούθησης.",
+  "follow_suggestions.curated_suggestion": "Επιλογή προσωπικού",
+  "follow_suggestions.dismiss": "Να μην εμφανιστεί ξανά",
+  "follow_suggestions.featured_longer": "Προσεκτικά επιλεγμένα απ' την ομάδα του {domain}",
+  "follow_suggestions.friends_of_friends_longer": "Δημοφιλή μεταξύ των ατόμων που ακολουθείς",
+  "follow_suggestions.hints.featured": "Αυτό το προφίλ έχει επιλεγεί προσεκτικά από την ομάδα του {domain}.",
+  "follow_suggestions.hints.friends_of_friends": "Αυτό το προφίλ είναι δημοφιλές μεταξύ των ατόμων που ακολουθείς.",
+  "follow_suggestions.hints.most_followed": "Αυτό το προφίλ είναι ένα από τα πιο ακολουθούμενα στο {domain}.",
+  "follow_suggestions.hints.most_interactions": "Αυτό το προφίλ έχει πάρει πρόσφατα μεγάλη προσοχή στο {domain}.",
+  "follow_suggestions.hints.similar_to_recently_followed": "Αυτό το προφίλ είναι παρόμοιο με τα προφίλ που έχεις ακολουθήσει πρόσφατα.",
+  "follow_suggestions.personalized_suggestion": "Εξατομικευμένη πρόταση",
+  "follow_suggestions.popular_suggestion": "Δημοφιλής πρόταση",
+  "follow_suggestions.popular_suggestion_longer": "Δημοφιλή στο {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Παρόμοια με προφίλ που ακολούθησες πρόσφατα",
+  "follow_suggestions.view_all": "Εμφάνιση όλων",
+  "follow_suggestions.who_to_follow": "Ποιον να ακολουθήσεις",
   "followed_tags": "Ετικέτες που ακολουθούνται",
   "footer.about": "Σχετικά με",
   "footer.directory": "Κατάλογος προφίλ",
@@ -279,21 +341,30 @@
   "hashtag.column_settings.tag_mode.any": "Οποιοδήποτε από αυτά",
   "hashtag.column_settings.tag_mode.none": "Κανένα από αυτά",
   "hashtag.column_settings.tag_toggle": "Προσθήκη επιπλέον ταμπελών για την κολώνα",
+  "hashtag.counter_by_accounts": "{count, plural, one {{counter} συμμετέχων} other {{counter} συμμετέχοντες}}",
+  "hashtag.counter_by_uses": "{count, plural, one {{counter} ανάρτηση} other {{counter} αναρτήσεις}}",
+  "hashtag.counter_by_uses_today": "{count, plural, one {{counter} ανάρτηση} other {{counter} αναρτήσεις}} σήμερα",
   "hashtag.follow": "Παρακολούθηση ετικέτας",
   "hashtag.unfollow": "Διακοπή παρακολούθησης ετικέτας",
+  "hashtags.and_other": "…και {count, plural, one {}other {# ακόμη}}",
   "home.column_settings.show_reblogs": "Εμφάνιση προωθήσεων",
   "home.column_settings.show_replies": "Εμφάνιση απαντήσεων",
   "home.hide_announcements": "Απόκρυψη ανακοινώσεων",
+  "home.pending_critical_update.body": "Παρακαλούμε ενημέρωσε τον διακομιστή Mastodon σου το συντομότερο δυνατόν!",
   "home.pending_critical_update.link": "Δείτε ενημερώσεις",
   "home.pending_critical_update.title": "Κρίσιμη ενημέρωση ασφαλείας διαθέσιμη!",
   "home.show_announcements": "Εμφάνιση ανακοινώσεων",
+  "interaction_modal.description.favourite": "Με ένα συντάκτη στο Mastodon μπορείς να αγαπήσεις αυτή την ανάρτηση, για να ενημερώσεις τον συγγραφέα ότι την εκτιμάς και να την αποθηκεύσεις για αργότερα.",
   "interaction_modal.description.follow": "Με έναν λογαριασμό Mastodon, μπορείς να ακολουθήσεις τον/την {name} ώστε να λαμβάνεις τις αναρτήσεις του/της στη δική σου ροή.",
   "interaction_modal.description.reblog": "Με ένα λογαριασμό Mastodon, μπορείς να ενισχύσεις αυτή την ανάρτηση για να τη μοιραστείς με τους δικούς σου ακολούθους.",
   "interaction_modal.description.reply": "Με ένα λογαριασμό Mastodon, μπορείς να απαντήσεις σε αυτή την ανάρτηση.",
   "interaction_modal.login.action": "Take me home\nΠήγαινέ με στην αρχική σελίδα",
+  "interaction_modal.login.prompt": "Τομέας του οικιακού σου διακομιστή, πχ. mastodon.social",
   "interaction_modal.no_account_yet": "Not on Mastodon?\nΔεν είστε στο Mastodon;",
   "interaction_modal.on_another_server": "Σε διαφορετικό διακομιστή",
   "interaction_modal.on_this_server": "Σε αυτόν τον διακομιστή",
+  "interaction_modal.sign_in": "Δεν είσαι συνδεδεμένος σε αυτόν το διακομιστή. Πού φιλοξενείται ο λογαριασμός σου;",
+  "interaction_modal.sign_in_hint": "Συμβουλή: Αυτή είναι η ιστοσελίδα όπου έχεις εγγραφεί. Αν δεν θυμάσαι, αναζήτησε το καλώς ήρθες e-mail στα εισερχόμενά σου. Μπορείς επίσης να εισάγεις το πλήρες όνομα χρήστη! (πχ. @Mastodon@mastodon.social)",
   "interaction_modal.title.favourite": "Favorite {name}'s post\nΠροτίμησε την ανάρτηση της/του {name}",
   "interaction_modal.title.follow": "Ακολούθησε {name}",
   "interaction_modal.title.reblog": "Ενίσχυσε την ανάρτηση του {name}",
@@ -311,6 +382,7 @@
   "keyboard_shortcuts.down": "κίνηση προς τα κάτω στη λίστα",
   "keyboard_shortcuts.enter": "Εμφάνιση ανάρτησης",
   "keyboard_shortcuts.favourite": "Αγαπημένη δημοσίευση",
+  "keyboard_shortcuts.favourites": "Άνοιγμα λίστας αγαπημένων",
   "keyboard_shortcuts.federated": "Άνοιγμα ροής συναλλαγών",
   "keyboard_shortcuts.heading": "Συντομεύσεις πληκτρολογίου",
   "keyboard_shortcuts.home": "Άνοιγμα ροής αρχικής σελίδας",
@@ -341,11 +413,15 @@
   "lightbox.previous": "Προηγούμενο",
   "limited_account_hint.action": "Εμφάνιση προφίλ ούτως ή άλλως",
   "limited_account_hint.title": "Αυτό το προφίλ έχει αποκρυφτεί από τους διαχειριστές του διακομιστή {domain}.",
+  "link_preview.author": "Από {name}",
+  "link_preview.more_from_author": "Περισσότερα από {name}",
+  "link_preview.shares": "{count, plural, one {{counter} ανάρτηση} other {{counter} αναρτήσεις}}",
   "lists.account.add": "Πρόσθεσε στη λίστα",
   "lists.account.remove": "Βγάλε από τη λίστα",
   "lists.delete": "Διαγραφή λίστας",
   "lists.edit": "Επεξεργασία λίστας",
   "lists.edit.submit": "Αλλαγή τίτλου",
+  "lists.exclusive": "Απόκρυψη αυτών των αναρτήσεων από την αρχική",
   "lists.new.create": "Προσθήκη λίστας",
   "lists.new.title_placeholder": "Τίτλος νέας λίστα",
   "lists.replies_policy.followed": "Οποιοσδήποτε χρήστης που ακολουθείς",
@@ -358,7 +434,19 @@
   "loading_indicator.label": "Φόρτωση…",
   "media_gallery.toggle_visible": "{number, plural, one {Απόκρυψη εικόνας} other {Απόκρυψη εικόνων}}",
   "moved_to_account_banner.text": "Ο λογαριασμός σου {disabledAccount} είναι προσωρινά απενεργοποιημένος επειδή μεταφέρθηκες στον {movedToAccount}.",
+  "mute_modal.hide_from_notifications": "Απόκρυψη από ειδοποιήσεις",
+  "mute_modal.hide_options": "Απόκρυψη επιλογών",
+  "mute_modal.indefinite": "Μέχρι να κάνω άρση σίγασης",
+  "mute_modal.show_options": "Εμφάνιση επιλογών",
+  "mute_modal.they_can_mention_and_follow": "Μπορεί να σε αναφέρει και να σε ακολουθήσει, αλλά δε θα τον βλέπεις.",
+  "mute_modal.they_wont_know": "Δε θα ξέρει ότι είναι σε σίγαση.",
+  "mute_modal.title": "Σίγαση χρήστη;",
+  "mute_modal.you_wont_see_mentions": "Δε θα βλέπεις τις αναρτήσεις που τον αναφέρουν.",
+  "mute_modal.you_wont_see_posts": "Μπορεί ακόμα να δει τις αναρτήσεις σου, αλλά δε θα βλέπεις τις δικές του.",
+  "name_and_others": "{name} και {count, plural, one {# ακόμη} other {# ακόμη}}",
+  "name_and_others_with_link": "{name} και <a>{count, plural, one {# ακόμη} other {# ακόμη}}</a>",
   "navigation_bar.about": "Σχετικά με",
+  "navigation_bar.advanced_interface": "Άνοιγμα σε προηγμένη διεπαφή ιστού",
   "navigation_bar.blocks": "Αποκλεισμένοι χρήστες",
   "navigation_bar.bookmarks": "Σελιδοδείκτες",
   "navigation_bar.community_timeline": "Τοπική ροή",
@@ -367,6 +455,7 @@
   "navigation_bar.discover": "Ανακάλυψη",
   "navigation_bar.domain_blocks": "Αποκλεισμένοι τομείς",
   "navigation_bar.explore": "Εξερεύνηση",
+  "navigation_bar.favourites": "Αγαπημένα",
   "navigation_bar.filters": "Αποσιωπημένες λέξεις",
   "navigation_bar.follow_requests": "Αιτήματα ακολούθησης",
   "navigation_bar.followed_tags": "Ετικέτες που ακολουθούνται",
@@ -383,21 +472,49 @@
   "navigation_bar.security": "Ασφάλεια",
   "not_signed_in_indicator.not_signed_in": "Πρέπει να συνδεθείς για να αποκτήσεις πρόσβαση σε αυτόν τον πόρο.",
   "notification.admin.report": "Ο/Η {name} ανέφερε τον {target}",
+  "notification.admin.report_account": "Ο χρήστης {name} ανέφερε {count, plural, one {μία ανάρτηση} other {# αναρτήσεις}} από {target} για {category}",
+  "notification.admin.report_account_other": "Ο χρήστης {name} ανέφερε {count, plural, one {μία ανάρτηση} other {# αναρτήσεις}} από {target}",
+  "notification.admin.report_statuses": "Ο χρήστης {name} ανέφερε τον χρήστη {target} για {category}",
+  "notification.admin.report_statuses_other": "Ο χρήστης {name} ανέφερε τον χρήστη {target}",
   "notification.admin.sign_up": "{name} έχει εγγραφεί",
   "notification.favourite": "{name} favorited your post\n{name} προτίμησε την ανάρτηση σου",
   "notification.follow": "Ο/Η {name} σε ακολούθησε",
   "notification.follow_request": "Ο/H {name} ζήτησε να σε ακολουθήσει",
   "notification.mention": "Ο/Η {name} σε επισήμανε",
+  "notification.moderation-warning.learn_more": "Μάθε περισσότερα",
+  "notification.moderation_warning": "Έχετε λάβει μία προειδοποίηση συντονισμού",
+  "notification.moderation_warning.action_delete_statuses": "Ορισμένες από τις αναρτήσεις σου έχουν αφαιρεθεί.",
+  "notification.moderation_warning.action_disable": "Ο λογαριασμός σου έχει απενεργοποιηθεί.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Μερικές από τις αναρτήσεις σου έχουν επισημανθεί ως ευαίσθητες.",
+  "notification.moderation_warning.action_none": "Ο λογαριασμός σου έχει λάβει προειδοποίηση συντονισμού.",
+  "notification.moderation_warning.action_sensitive": "Οι αναρτήσεις σου θα επισημαίνονται, από εδώ και στο εξής, ως ευαίσθητες.",
+  "notification.moderation_warning.action_silence": "Ο λογαριασμός σου έχει περιοριστεί.",
+  "notification.moderation_warning.action_suspend": "Ο λογαριασμός σου έχει ανασταλεί.",
   "notification.own_poll": "Η δημοσκόπησή σου έληξε",
+  "notification.poll": "Μία ψηφοφορία στην οποία συμμετείχες έχει τελειώσει",
+  "notification.private_mention": "{name} σέ επισήμανε ιδιωτικά",
   "notification.reblog": "Ο/Η {name} ενίσχυσε τη δημοσίευσή σου",
+  "notification.relationships_severance_event": "Χάθηκε η σύνδεση με το {name}",
+  "notification.relationships_severance_event.account_suspension": "Ένας διαχειριστής από το {from} ανέστειλε το {target}, πράγμα που σημαίνει ότι δεν μπορείς πλέον να λαμβάνεις ενημερώσεις από αυτούς ή να αλληλεπιδράς μαζί τους.",
+  "notification.relationships_severance_event.domain_block": "Ένας διαχειριστής από {from} έχει μπλοκάρει το {target}, συμπεριλαμβανομένων {followersCount} από τους ακόλουθούς σου και {followingCount, plural, one {# λογαριασμό} other {# λογαριασμοί}} που ακολουθείς.",
+  "notification.relationships_severance_event.learn_more": "Μάθε περισσότερα",
+  "notification.relationships_severance_event.user_domain_block": "Έχεις αποκλείσει τον λογαριασμό {target}, αφαιρώντας {followersCount} από τους ακόλουθούς σου και {followingCount, plural, one {# λογαριασμό} other {# λογαριασμοί}} που ακολουθείς.",
   "notification.status": "Ο/Η {name} μόλις ανέρτησε κάτι",
   "notification.update": "ο/η {name} επεξεργάστηκε μια ανάρτηση",
+  "notification_requests.accept": "Αποδοχή",
+  "notification_requests.dismiss": "Απόρριψη",
+  "notification_requests.notifications_from": "Ειδοποιήσεις από {name}",
+  "notification_requests.title": "Φιλτραρισμένες ειδοποιήσεις",
   "notifications.clear": "Καθαρισμός ειδοποιήσεων",
   "notifications.clear_confirmation": "Σίγουρα θέλεις να καθαρίσεις μόνιμα όλες τις ειδοποιήσεις σου;",
   "notifications.column_settings.admin.report": "Νέες αναφορές:",
   "notifications.column_settings.admin.sign_up": "Νέες εγγραφές:",
   "notifications.column_settings.alert": "Ειδοποιήσεις επιφάνειας εργασίας",
+  "notifications.column_settings.beta.category": "Πειραματικές λειτουργίες",
+  "notifications.column_settings.beta.grouping": "Ομαδοποίηση ειδοποιήσεων",
   "notifications.column_settings.favourite": "Αγαπημένα:",
+  "notifications.column_settings.filter_bar.advanced": "Εμφάνιση όλων των κατηγοριών",
+  "notifications.column_settings.filter_bar.category": "Μπάρα γρήγορου φίλτρου",
   "notifications.column_settings.follow": "Νέοι ακόλουθοι:",
   "notifications.column_settings.follow_request": "Νέο αίτημα ακολούθησης:",
   "notifications.column_settings.mention": "Επισημάνσεις:",
@@ -412,6 +529,7 @@
   "notifications.column_settings.update": "Επεξεργασίες:",
   "notifications.filter.all": "Όλες",
   "notifications.filter.boosts": "Προωθήσεις",
+  "notifications.filter.favourites": "Αγαπημένα",
   "notifications.filter.follows": "Ακολουθείς",
   "notifications.filter.mentions": "Επισημάνσεις",
   "notifications.filter.polls": "Αποτελέσματα δημοσκόπησης",
@@ -422,6 +540,15 @@
   "notifications.permission_denied": "Οι ειδοποιήσεις στην επιφάνεια εργασίας δεν είναι διαθέσιμες διότι έχει απορριφθεί κάποιο προηγούμενο αίτημα άδειας",
   "notifications.permission_denied_alert": "Δεν είναι δυνατή η ενεργοποίηση των ειδοποιήσεων της επιφάνειας εργασίας, καθώς η άδεια του προγράμματος περιήγησης έχει απορριφθεί νωρίτερα",
   "notifications.permission_required": "Οι ειδοποιήσεις δεν είναι διαθέσιμες επειδή δεν έχει δοθεί η απαιτούμενη άδεια.",
+  "notifications.policy.filter_new_accounts.hint": "Δημιουργήθηκε εντός {days, plural, one {της τελευταίας ημέρας} other {των τελευταίων # ημερών}}",
+  "notifications.policy.filter_new_accounts_title": "Νέοι λογαριασμοί",
+  "notifications.policy.filter_not_followers_hint": "Συμπεριλαμβανομένων των ατόμων που σας έχουν ακολουθήσει λιγότερο από {days, plural, one {μια ημέρα} other {# ημέρες}} πριν",
+  "notifications.policy.filter_not_followers_title": "Άτομα που δε σε ακολουθούν",
+  "notifications.policy.filter_not_following_hint": "Μέχρι να τους εγκρίνεις χειροκίνητα",
+  "notifications.policy.filter_not_following_title": "Άτομα που δεν ακολουθείς",
+  "notifications.policy.filter_private_mentions_hint": "Φιλτραρισμένο εκτός αν είναι απάντηση σε δική σου αναφορά ή αν ακολουθείς τον αποστολέα",
+  "notifications.policy.filter_private_mentions_title": "Μη συναινετικές ιδιωτικές αναφορές",
+  "notifications.policy.title": "Φιλτράρισμα ειδοποιήσεων από…",
   "notifications_permission_banner.enable": "Ενεργοποίηση ειδοποιήσεων επιφάνειας εργασίας",
   "notifications_permission_banner.how_to_control": "Για να λαμβάνεις ειδοποιήσεις όταν το Mastodon δεν είναι ανοιχτό, ενεργοποίησε τις ειδοποιήσεις επιφάνειας εργασίας. Μπορείς να ελέγξεις με ακρίβεια ποιοι τύποι αλληλεπιδράσεων δημιουργούν ειδοποιήσεις επιφάνειας εργασίας μέσω του κουμπιού {icon} μόλις ενεργοποιηθούν.",
   "notifications_permission_banner.title": "Μη χάσεις στιγμή",
@@ -429,8 +556,15 @@
   "onboarding.actions.back": "Επιστροφή",
   "onboarding.actions.go_to_explore": "See what's trending",
   "onboarding.actions.go_to_home": "Πηγαίνετε στην αρχική σας ροή",
+  "onboarding.compose.template": "Γειά σου #Mastodon!",
+  "onboarding.follows.empty": "Δυστυχώς, δεν μπορούν να εμφανιστούν αποτελέσματα αυτή τη στιγμή. Μπορείς να προσπαθήσεις να χρησιμοποιήσεις την αναζήτηση ή να περιηγηθείς στη σελίδα εξερεύνησης για να βρεις άτομα να ακολουθήσεις ή να δοκιμάσεις ξανά αργότερα.",
   "onboarding.follows.lead": "You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!",
   "onboarding.follows.title": "Δημοφιλή στο Mastodon",
+  "onboarding.profile.discoverable": "Κάνε το προφίλ μου ανακαλύψιμο",
+  "onboarding.profile.discoverable_hint": "Όταν επιλέγεις την δυνατότητα ανακάλυψης στο Mastodon, οι αναρτήσεις σου μπορεί να εμφανιστούν στα αποτελέσματα αναζήτησης και τις τάσεις, και το προφίλ σου μπορεί να προτείνεται σε άτομα με παρόμοια ενδιαφέροντα με εσένα.",
+  "onboarding.profile.display_name": "Εμφανιζόμενο όνομα",
+  "onboarding.profile.display_name_hint": "Το πλήρες ή το διασκεδαστικό σου όνομα…",
+  "onboarding.profile.lead": "Μπορείς πάντα να το ολοκληρώσεις αργότερα στις ρυθμίσεις, όπου είναι διαθέσιμες ακόμα περισσότερες επιλογές προσαρμογής.",
   "onboarding.profile.note": "Βιογραφικό",
   "onboarding.profile.note_hint": "Μπορείτε να @αναφέρετε άλλα άτομα ή #hashtags…",
   "onboarding.profile.save_and_continue": "Αποθήκευση και συνέχεια",
@@ -438,7 +572,9 @@
   "onboarding.profile.upload_avatar": "Μεταφόρτωση εικόνας προφίλ",
   "onboarding.profile.upload_header": "Μεταφόρτωση κεφαλίδας προφίλ",
   "onboarding.share.lead": "Let people know how they can find you on Mastodon!\nΕνημερώστε άλλα άτομα πώς μπορούν να σας βρουν στο Mastodon!",
+  "onboarding.share.message": "Με λένε {username} στο #Mastodon! Έλα να με ακολουθήσεις στο {url}",
   "onboarding.share.next_steps": "Πιθανά επόμενα βήματα:",
+  "onboarding.share.title": "Κοινοποίηση του προφίλ σου",
   "onboarding.start.lead": "Your new Mastodon account is ready to go. Here's how you can make the most of it:",
   "onboarding.start.skip": "Want to skip right ahead?",
   "onboarding.start.title": "You've made it!\nΤα καταφέρατε!",
@@ -450,6 +586,10 @@
   "onboarding.steps.setup_profile.title": "Customize your profile",
   "onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
   "onboarding.steps.share_profile.title": "Share your profile",
+  "onboarding.tips.2fa": "<strong>Το ήξερες;</strong> Μπορείς να ασφαλίσεις το λογαριασμό σου ρυθμίζοντας ταυτότητα δύο παραγόντων στις ρυθμίσεις του λογαριασμού σου. Λειτουργεί με οποιαδήποτε εφαρμογή TOTP της επιλογής σας, δεν απαιτείται αριθμός τηλεφώνου!",
+  "onboarding.tips.accounts_from_other_servers": "<strong>Το ήξερες;</strong> Από τη στιγμή που το Mastodon είναι αποκεντρωμένο, κάποια προφίλ που συναντάς θα φιλοξενούνται σε διακομιστές διαφορετικούς από τον δικό σου. Και παρόλα αυτά μπορείς να αλληλεπιδράσεις μαζί τους απρόσκοπτα! Ο διακομιστής τους είναι στο δεύτερο μισό του ονόματος χρήστη!",
+  "onboarding.tips.migration": "<strong>Το ήξερες;</strong> Αν αισθάνεσαι ότι το {domain} δεν είναι η κατάλληλη επιλογή διακομιστή για σένα στο μέλλον, μπορείς να μετακινηθείς σε άλλο διακομιστή Mastodon χωρίς να χάσεις τους ακόλουθούς σου. Μπορείς να κάνεις ακόμα και τον δικό σου διακομιστή!",
+  "onboarding.tips.verification": "<strong>Το ήξερες;</strong> Μπορείς να επαληθεύσεις τον λογαριασμό σου βάζοντας έναν σύνδεσμο του προφίλ σου στο Mastodon στην ιστοσελίδα σου και να προσθέσεις την ιστοσελίδα στο προφίλ σου. Χωρίς έξοδα ή έγγραφα!",
   "password_confirmation.exceeds_maxlength": "Η επιβεβαίωση κωδικού πρόσβασης υπερβαίνει το μέγιστο μήκος κωδικού πρόσβασης",
   "password_confirmation.mismatching": "Η επιβεβαίωση του κωδικού πρόσβασης δε συμπίπτει",
   "picture_in_picture.restore": "Βάλε το πίσω",
@@ -468,7 +608,11 @@
   "privacy.direct.short": "Συγκεκριμένα άτομα",
   "privacy.private.long": "Μόνο οι ακόλουθοί σας",
   "privacy.private.short": "Ακόλουθοι",
+  "privacy.public.long": "Όλοι εντός και εκτός του Mastodon",
   "privacy.public.short": "Δημόσιο",
+  "privacy.unlisted.additional": "Αυτό συμπεριφέρεται ακριβώς όπως το δημόσιο, εκτός από το ότι η ανάρτηση δεν θα εμφανιστεί σε ζωντανές ροές ή ετικέτες, εξερεύνηση ή αναζήτηση στο Mastodon, ακόμη και αν το έχεις επιλέξει για τον λογαριασμό σου.",
+  "privacy.unlisted.long": "Λιγότερα αλγοριθμικά κόλπα",
+  "privacy.unlisted.short": "Ήσυχα δημόσια",
   "privacy_policy.last_updated": "Τελευταία ενημέρωση {date}",
   "privacy_policy.title": "Πολιτική Απορρήτου",
   "recommended": "Προτεινόμενα",
@@ -486,6 +630,7 @@
   "relative_time.minutes": "{number}λ",
   "relative_time.seconds": "{number}δ",
   "relative_time.today": "σήμερα",
+  "reply_indicator.attachments": "{count, plural, one {# συνημμένο} other {# συνημμένα}}",
   "reply_indicator.cancel": "Άκυρο",
   "reply_indicator.poll": "Δημοσκόπηση",
   "report.block": "Αποκλεισμός",
@@ -529,9 +674,14 @@
   "report.unfollow": "Κατάργηση ακολούθησης του @{name}",
   "report.unfollow_explanation": "Ακολουθείς αυτό τον λογαριασμό. Για να μη βλέπεις τις αναρτήσεις τους στη δική σου ροή, πάψε να τον ακολουθείς.",
   "report_notification.attached_statuses": "{count, plural, one {{count} ανάρτηση} other {{count} αναρτήσεις}} επισυνάπτονται",
+  "report_notification.categories.legal": "Νομικά",
+  "report_notification.categories.legal_sentence": "παράνομο περιεχόμενο",
   "report_notification.categories.other": "Άλλες",
+  "report_notification.categories.other_sentence": "άλλο",
   "report_notification.categories.spam": "Ανεπιθύμητα",
+  "report_notification.categories.spam_sentence": "ανεπιθύμητα",
   "report_notification.categories.violation": "Παραβίαση κανόνα",
+  "report_notification.categories.violation_sentence": "παραβίαση κανόνα",
   "report_notification.open": "Ανοιχτή αναφορά",
   "search.no_recent_searches": "Καμία πρόσφατη αναζήτηση",
   "search.placeholder": "Αναζήτηση",
@@ -541,8 +691,13 @@
   "search.quick_action.open_url": "Άνοιγμα διεύθυνσης URL στο Mastodon",
   "search.quick_action.status_search": "Αναρτήσεις που ταιριάζουν με {x}",
   "search.search_or_paste": "Αναζήτηση ή εισαγωγή URL",
+  "search_popout.full_text_search_disabled_message": "Μη διαθέσιμο στο {domain}.",
+  "search_popout.full_text_search_logged_out_message": "Διαθέσιμο μόνο όταν συνδεθείς.",
+  "search_popout.language_code": "Κωδικός γλώσσας ISO",
+  "search_popout.options": "Επιλογές αναζήτησης",
   "search_popout.quick_actions": "Γρήγορες ενέργειες",
   "search_popout.recent": "Πρόσφατες αναζητήσεις",
+  "search_popout.specific_date": "συγκεκριμένη ημερομηνία",
   "search_popout.user": "χρήστης",
   "search_results.accounts": "Προφίλ",
   "search_results.all": "Όλα",
@@ -554,8 +709,11 @@
   "server_banner.about_active_users": "Άτομα που χρησιμοποιούν αυτόν τον διακομιστή κατά τις τελευταίες 30 ημέρες (Μηνιαία Ενεργοί Χρήστες)",
   "server_banner.active_users": "ενεργοί χρήστες",
   "server_banner.administered_by": "Διαχειριστής:",
+  "server_banner.is_one_of_many": "Το {domain} είναι ένας από τους πολλούς ανεξάρτητους διακομιστές Mastodon που μπορείς να χρησιμοποιήσεις για να συμμετάσχεις στο fediverse.",
   "server_banner.server_stats": "Στατιστικά διακομιστή:",
   "sign_in_banner.create_account": "Δημιουργία λογαριασμού",
+  "sign_in_banner.follow_anyone": "Ακολούθησε οποιονδήποτε κατά μήκος του fediverse και δες τα όλα με χρονολογική σειρά. Δεν υπάρχουν αλγόριθμοι, διαφημίσεις ή clickbait ούτε για δείγμα.",
+  "sign_in_banner.mastodon_is": "Το Mastodon είναι ο καλύτερος τρόπος για να συμβαδίσεις με τα γεγονότα.",
   "sign_in_banner.sign_in": "Σύνδεση",
   "sign_in_banner.sso_redirect": "Συνδεθείτε ή Εγγραφείτε",
   "status.admin_account": "Άνοιγμα διεπαφής συντονισμού για τον/την @{name}",
@@ -571,15 +729,19 @@
   "status.direct": "Ιδιωτική επισήμανση @{name}",
   "status.direct_indicator": "Ιδιωτική επισήμανση",
   "status.edit": "Επεξεργασία",
+  "status.edited": "Τελευταία επεξεργασία {date}",
   "status.edited_x_times": "Επεξεργάστηκε {count, plural, one {{count} φορά} other {{count} φορές}}",
   "status.embed": "Ενσωμάτωσε",
   "status.favourite": "Αγαπημένα",
+  "status.favourites": "{count, plural, one {# αγαπημένο} other {# αγαπημένα}}",
   "status.filter": "Φιλτράρισμα αυτής της ανάρτησης",
   "status.filtered": "Φιλτραρισμένα",
   "status.hide": "Απόκρυψη ανάρτησης",
   "status.history.created": "{name} δημιούργησε στις {date}",
   "status.history.edited": "{name} επεξεργάστηκε στις {date}",
   "status.load_more": "Φόρτωσε περισσότερα",
+  "status.media.open": "Κάνε κλικ για άνοιγμα",
+  "status.media.show": "Κάνε κλικ για εμφάνιση",
   "status.media_hidden": "Κρυμμένο πολυμέσο",
   "status.mention": "Επισήμανε @{name}",
   "status.more": "Περισσότερα",
@@ -592,6 +754,7 @@
   "status.reblog": "Ενίσχυση",
   "status.reblog_private": "Ενίσχυση με αρχική ορατότητα",
   "status.reblogged_by": "{name} προώθησε",
+  "status.reblogs": "{count, plural, one {# ενίσχυση} other {# ενισχύσεις}}",
   "status.reblogs.empty": "Κανείς δεν ενίσχυσε αυτή την ανάρτηση ακόμα. Μόλις το κάνει κάποιος, θα εμφανιστεί εδώ.",
   "status.redraft": "Σβήσε & ξαναγράψε",
   "status.remove_bookmark": "Αφαίρεση σελιδοδείκτη",
@@ -610,6 +773,7 @@
   "status.title.with_attachments": "{user} δημοσίευσε {attachmentCount, plural, one {ένα συνημμένο} other {{attachmentCount} συνημμένα}}",
   "status.translate": "Μετάφραση",
   "status.translated_from_with": "Μεταφράστηκε από {lang} χρησιμοποιώντας {provider}",
+  "status.uncached_media_warning": "Μη διαθέσιμη προεπισκόπηση",
   "status.unmute_conversation": "Αναίρεση σίγασης συνομιλίας",
   "status.unpin": "Ξεκαρφίτσωσε από το προφίλ",
   "subscribed_languages.lead": "Μόνο αναρτήσεις σε επιλεγμένες γλώσσες θα εμφανίζονται στην αρχική σου και θα παραθέτονται χρονοδιαγράμματα μετά την αλλαγή. Επέλεξε καμία για να λαμβάνεις αναρτήσεις σε όλες τις γλώσσες.",
diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index 4b330ec60b4c11..5ba77dd72e0813 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -157,8 +157,8 @@
   "compose_form.poll.multiple": "Monivalinta",
   "compose_form.poll.option_placeholder": "Vaihtoehto {number}",
   "compose_form.poll.single": "Valitse yksi",
-  "compose_form.poll.switch_to_multiple": "Muuta kysely monivalinnaksi",
-  "compose_form.poll.switch_to_single": "Muuta kysely sallimaan vain yksi valinta",
+  "compose_form.poll.switch_to_multiple": "Muuta äänestys monivalinnaksi",
+  "compose_form.poll.switch_to_single": "Muuta äänestys yksittäisvalinnaksi",
   "compose_form.poll.type": "Tyyli",
   "compose_form.publish": "Julkaise",
   "compose_form.publish_form": "Uusi julkaisu",
@@ -443,6 +443,8 @@
   "mute_modal.title": "Mykistetäänkö käyttäjä?",
   "mute_modal.you_wont_see_mentions": "Et tule enää näkemään julkaisuja, joissa hänet mainitaan.",
   "mute_modal.you_wont_see_posts": "Hän voi yhä nähdä julkaisusi, mutta sinä et näe hänen.",
+  "name_and_others": "{name} ja {count, plural, one {# muu} other {# muuta}}",
+  "name_and_others_with_link": "{name} ja <a>{count, plural, one {# muu} other {# muuta}}</a>",
   "navigation_bar.about": "Tietoja",
   "navigation_bar.advanced_interface": "Avaa edistyneessä selainkäyttöliittymässä",
   "navigation_bar.blocks": "Estetyt käyttäjät",
@@ -469,7 +471,11 @@
   "navigation_bar.search": "Hae",
   "navigation_bar.security": "Turvallisuus",
   "not_signed_in_indicator.not_signed_in": "Sinun on kirjauduttava sisään käyttääksesi resurssia.",
-  "notification.admin.report": "{name} teki ilmoituksen käytäjästä {target}",
+  "notification.admin.report": "{name} raportoi käyttäjän {target}",
+  "notification.admin.report_account": "{name} raportoi {count, plural, one {julkaisun} other {# julkaisua}} käyttäjältä {target}, syynä {category}",
+  "notification.admin.report_account_other": "{name} raportoi {count, plural, one {julkaisun} other {# julkaisua}} käyttäjältä {target}",
+  "notification.admin.report_statuses": "{name} raportoi käyttäjän {target}, syynä {category}",
+  "notification.admin.report_statuses_other": "{name} raportoi käyttäjän {target}",
   "notification.admin.sign_up": "{name} rekisteröityi",
   "notification.favourite": "{name} lisäsi julkaisusi suosikkeihinsa",
   "notification.follow": "{name} seurasi sinua",
@@ -485,6 +491,8 @@
   "notification.moderation_warning.action_silence": "Tiliäsi on rajoitettu.",
   "notification.moderation_warning.action_suspend": "Tilisi on jäädytetty.",
   "notification.own_poll": "Äänestyksesi on päättynyt",
+  "notification.poll": "Äänestys, johon osallistuit, on päättynyt",
+  "notification.private_mention": "{name} mainitsi sinut yksityisesti",
   "notification.reblog": "{name} tehosti julkaisuasi",
   "notification.relationships_severance_event": "Menetettiin yhteydet palvelimeen {name}",
   "notification.relationships_severance_event.account_suspension": "Palvelimen {from} ylläpitäjä on jäädyttänyt palvelimen {target} vuorovaikutuksen. Enää et voi siis vastaanottaa päivityksiä heiltä tai olla yhteyksissä heidän kanssaan.",
@@ -502,6 +510,8 @@
   "notifications.column_settings.admin.report": "Uudet ilmoitukset:",
   "notifications.column_settings.admin.sign_up": "Uudet rekisteröitymiset:",
   "notifications.column_settings.alert": "Työpöytäilmoitukset",
+  "notifications.column_settings.beta.category": "Kokeelliset ominaisuudet",
+  "notifications.column_settings.beta.grouping": "Ryhmittele ilmoitukset",
   "notifications.column_settings.favourite": "Suosikit:",
   "notifications.column_settings.filter_bar.advanced": "Näytä kaikki luokat",
   "notifications.column_settings.filter_bar.category": "Pikasuodatuspalkki",
@@ -591,8 +601,8 @@
   "poll.vote": "Äänestä",
   "poll.voted": "Äänestit tätä vastausta",
   "poll.votes": "{votes, plural, one {# ääni} other {# ääntä}}",
-  "poll_button.add_poll": "Lisää kysely",
-  "poll_button.remove_poll": "Poista kysely",
+  "poll_button.add_poll": "Lisää äänestys",
+  "poll_button.remove_poll": "Poista äänestys",
   "privacy.change": "Muuta julkaisun näkyvyyttä",
   "privacy.direct.long": "Kaikki tässä julkaisussa mainitut",
   "privacy.direct.short": "Tietyt henkilöt",
@@ -622,7 +632,7 @@
   "relative_time.today": "tänään",
   "reply_indicator.attachments": "{count, plural, one {# liite} other {# liitettä}}",
   "reply_indicator.cancel": "Peruuta",
-  "reply_indicator.poll": "Kysely",
+  "reply_indicator.poll": "Äänestys",
   "report.block": "Estä",
   "report.block_explanation": "Et näe hänen viestejään, eikä hän voi nähdä viestejäsi tai seurata sinua. Hän näkee, että olet estänyt hänet.",
   "report.categories.legal": "Juridiset tiedot",
@@ -665,9 +675,13 @@
   "report.unfollow_explanation": "Seuraat tätä tiliä. Estääksesi tilin viestejä näykymästä kotisyötteessäsi, lopeta sen seuraaminen.",
   "report_notification.attached_statuses": "{count, plural, one {{count} julkaisu} other {{count} julkaisua}} liitteenä",
   "report_notification.categories.legal": "Laillinen",
+  "report_notification.categories.legal_sentence": "laiton sisältö",
   "report_notification.categories.other": "Muu",
+  "report_notification.categories.other_sentence": "jokin muu",
   "report_notification.categories.spam": "Roskaposti",
+  "report_notification.categories.spam_sentence": "roskaposti",
   "report_notification.categories.violation": "Sääntörikkomus",
+  "report_notification.categories.violation_sentence": "sääntörikkomus",
   "report_notification.open": "Avaa raportti",
   "search.no_recent_searches": "Ei viimeaikaisia hakuja",
   "search.placeholder": "Hae",
diff --git a/app/javascript/mastodon/locales/fy.json b/app/javascript/mastodon/locales/fy.json
index a04a5b25bf6e8f..e3b3a965681583 100644
--- a/app/javascript/mastodon/locales/fy.json
+++ b/app/javascript/mastodon/locales/fy.json
@@ -422,6 +422,7 @@
   "mute_modal.hide_options": "Opsjes ferstopje",
   "mute_modal.indefinite": "Oant ik se net mear negearje",
   "mute_modal.show_options": "Opsjes toane",
+  "mute_modal.title": "Brûker negearje?",
   "navigation_bar.about": "Oer",
   "navigation_bar.advanced_interface": "Yn avansearre webomjouwing iepenje",
   "navigation_bar.blocks": "Blokkearre brûkers",
diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json
index 1f76ae951d20bd..d64789b86cb120 100644
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@@ -443,6 +443,8 @@
   "mute_modal.title": "Acalar usuaria?",
   "mute_modal.you_wont_see_mentions": "Non verás as publicacións que a mencionen.",
   "mute_modal.you_wont_see_posts": "Seguirá podendo ler as túas publicacións, pero non verás as súas.",
+  "name_and_others": "{name} e {count, plural, one {outra máis} other {# máis}}",
+  "name_and_others_with_link": "{name} e <a>{count, plural, one {outra máis} other {# máis}}</a>",
   "navigation_bar.about": "Sobre",
   "navigation_bar.advanced_interface": "Abrir coa interface web avanzada",
   "navigation_bar.blocks": "Usuarias bloqueadas",
@@ -470,6 +472,10 @@
   "navigation_bar.security": "Seguranza",
   "not_signed_in_indicator.not_signed_in": "Debes acceder para ver este recurso.",
   "notification.admin.report": "{name} denunciou a {target}",
+  "notification.admin.report_account": "{name} denunciou {count, plural, one {unha publicación} other {# publicacións}} de {target} por {category}",
+  "notification.admin.report_account_other": "{name} denunciou {count, plural, one {unha publicación} other {# publicacións}} de {target}",
+  "notification.admin.report_statuses": "{name} deununciou a {target} por {category}",
+  "notification.admin.report_statuses_other": "{name} denunciou a {target}",
   "notification.admin.sign_up": "{name} rexistrouse",
   "notification.favourite": "{name} marcou como favorita a túa publicación",
   "notification.follow": "{name} comezou a seguirte",
@@ -485,6 +491,8 @@
   "notification.moderation_warning.action_silence": "A túa conta foi limitada.",
   "notification.moderation_warning.action_suspend": "A túa conta foi suspendida.",
   "notification.own_poll": "A túa enquisa rematou",
+  "notification.poll": "Rematou a enquisa na que votaches",
+  "notification.private_mention": "{name} mencionoute de xeito privado",
   "notification.reblog": "{name} compartiu a túa publicación",
   "notification.relationships_severance_event": "Perdeuse a conexión con {name}",
   "notification.relationships_severance_event.account_suspension": "A administración de {from} suspendeu a {target}, o que significa que xa non vas recibir actualizacións de esa conta ou interactuar con ela.",
@@ -502,6 +510,8 @@
   "notifications.column_settings.admin.report": "Novas denuncias:",
   "notifications.column_settings.admin.sign_up": "Novas usuarias:",
   "notifications.column_settings.alert": "Notificacións de escritorio",
+  "notifications.column_settings.beta.category": "Características experimentais",
+  "notifications.column_settings.beta.grouping": "Notificacións de grupo",
   "notifications.column_settings.favourite": "Favoritas:",
   "notifications.column_settings.filter_bar.advanced": "Mostrar todas as categorías",
   "notifications.column_settings.filter_bar.category": "Barra de filtrado rápido",
@@ -665,9 +675,13 @@
   "report.unfollow_explanation": "Estás a seguir esta conta. Deixar de ver as súas publicacións na túa cronoloxía, non seguila.",
   "report_notification.attached_statuses": "Achegou {count, plural, one {{count} publicación} other {{count} publicacións}}",
   "report_notification.categories.legal": "Legal",
+  "report_notification.categories.legal_sentence": "contido ilegal",
   "report_notification.categories.other": "Outro",
+  "report_notification.categories.other_sentence": "outra",
   "report_notification.categories.spam": "Spam",
+  "report_notification.categories.spam_sentence": "spam",
   "report_notification.categories.violation": "Faltou ás regras",
+  "report_notification.categories.violation_sentence": "violación das regras",
   "report_notification.open": "Abrir a denuncia",
   "search.no_recent_searches": "Non hai buscas recentes",
   "search.placeholder": "Procurar",
diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json
index 148b3285ddb069..3687df7b87b2b6 100644
--- a/app/javascript/mastodon/locales/he.json
+++ b/app/javascript/mastodon/locales/he.json
@@ -443,6 +443,8 @@
   "mute_modal.title": "להשתיק משתמש?",
   "mute_modal.you_wont_see_mentions": "לא תראה הודעות שמאזכרות אותם.",
   "mute_modal.you_wont_see_posts": "הם יכולים לראות את הודעותכם, אבל אתם לא תוכלו לראות את שלהם.",
+  "name_and_others": "{name} ועוד {count, plural,one {אחד נוסף}other {# נוספים}}",
+  "name_and_others_with_link": "{name} ועוד <a>{count, plural,one {אחד נוסף}other {# נוספים}}</a>",
   "navigation_bar.about": "אודות",
   "navigation_bar.advanced_interface": "פתח במנשק ווב מתקדם",
   "navigation_bar.blocks": "משתמשים חסומים",
@@ -470,6 +472,10 @@
   "navigation_bar.security": "אבטחה",
   "not_signed_in_indicator.not_signed_in": "יש להיות מאומת כדי לגשת למשאב זה.",
   "notification.admin.report": "{name} דיווח.ה על {target}",
+  "notification.admin.report_account": "{name} דווחו על {count, plural, one {הודעה אחת} two {הודעותיים} many {# הודעות} other {# הודעות}} מאת {target} בגין {category}",
+  "notification.admin.report_account_other": "{name} דווחו על {count, plural, one {הודעה אחת} two {הודעותיים} many {# הודעות} other {# הודעות}} מאת {target}",
+  "notification.admin.report_statuses": "{name} דווחו על {target} בגין {category}",
+  "notification.admin.report_statuses_other": "{name} דיווח.ה על {target}",
   "notification.admin.sign_up": "{name} נרשמו",
   "notification.favourite": "הודעתך חובבה על ידי {name}",
   "notification.follow": "{name} במעקב אחרייך",
@@ -485,6 +491,8 @@
   "notification.moderation_warning.action_silence": "חשבונך הוגבל.",
   "notification.moderation_warning.action_suspend": "חשבונך הושעה.",
   "notification.own_poll": "הסקר שלך הסתיים",
+  "notification.poll": "סקר שהצבעת בו הסתיים",
+  "notification.private_mention": "{name} פנה/פנתה אליך בפרטיות",
   "notification.reblog": "הודעתך הודהדה על ידי {name}",
   "notification.relationships_severance_event": "אבד הקשר עם {name}",
   "notification.relationships_severance_event.account_suspension": "מנהל.ת משרת {from} השע(ת)ה את {target}, ולפיכך לא תעודכנו יותר על ידם ולא תוכלו להיות איתם בקשר.",
@@ -502,6 +510,8 @@
   "notifications.column_settings.admin.report": "דו\"חות חדשים",
   "notifications.column_settings.admin.sign_up": "הרשמות חדשות:",
   "notifications.column_settings.alert": "התראות לשולחן העבודה",
+  "notifications.column_settings.beta.category": "יכולות ניסיוניות",
+  "notifications.column_settings.beta.grouping": "התראות קבוצה",
   "notifications.column_settings.favourite": "חיבובים:",
   "notifications.column_settings.filter_bar.advanced": "להציג את כל הקטגוריות",
   "notifications.column_settings.filter_bar.category": "שורת סינון מהיר",
@@ -665,9 +675,13 @@
   "report.unfollow_explanation": "אתם עוקבים אחרי החשבון הזה. כדי להפסיק לראות את הפרסומים שלו בפיד הבית שלכם, הפסיקו לעקוב אחריו.",
   "report_notification.attached_statuses": "{count, plural, one {הודעה מצורפת} two {הודעותיים מצורפות} many {{count} הודעות מצורפות} other {{count} הודעות מצורפות}}",
   "report_notification.categories.legal": "חוקי",
+  "report_notification.categories.legal_sentence": "תוכן בלתי חוקי",
   "report_notification.categories.other": "שונות",
+  "report_notification.categories.other_sentence": "אחר",
   "report_notification.categories.spam": "ספאם (דואר זבל)",
+  "report_notification.categories.spam_sentence": "ספאם (דואר זבל)",
   "report_notification.categories.violation": "הפרת כלל",
+  "report_notification.categories.violation_sentence": "הפרת כלל",
   "report_notification.open": "פתח דו\"ח",
   "search.no_recent_searches": "לא נמצאו חיפושים אחרונים",
   "search.placeholder": "חיפוש",
diff --git a/app/javascript/mastodon/locales/is.json b/app/javascript/mastodon/locales/is.json
index 733e2e541d7084..27d23aafd0e5c8 100644
--- a/app/javascript/mastodon/locales/is.json
+++ b/app/javascript/mastodon/locales/is.json
@@ -443,6 +443,8 @@
   "mute_modal.title": "Þagga niður í notanda?",
   "mute_modal.you_wont_see_mentions": "Þú munt ekki sjá færslur sem minnast á viðkomandi aðila.",
   "mute_modal.you_wont_see_posts": "Viðkomandi geta áfram séð færslurnar þínar en þú munt ekki sjá færslurnar þeirra.",
+  "name_and_others": "{name} og {count, plural, one {# annar} other {# aðrir}}",
+  "name_and_others_with_link": "{name} og <a>{count, plural, one {# annar} other {# aðrir}}</a>",
   "navigation_bar.about": "Um hugbúnaðinn",
   "navigation_bar.advanced_interface": "Opna í ítarlegu vefviðmóti",
   "navigation_bar.blocks": "Útilokaðir notendur",
@@ -470,6 +472,10 @@
   "navigation_bar.security": "Öryggi",
   "not_signed_in_indicator.not_signed_in": "Þú þarft að skrá þig inn til að nota þetta tilfang.",
   "notification.admin.report": "{name} kærði {target}",
+  "notification.admin.report_account": "{name} kærði {count, plural, one {eina færslu} other {# færslur}} frá {target} fyrir {category}",
+  "notification.admin.report_account_other": "{name} kærði {count, plural, one {eina færslu} other {# færslur}} frá {target}",
+  "notification.admin.report_statuses": "{name} kærði {target} fyrir {category}",
+  "notification.admin.report_statuses_other": "{name} kærði {target}",
   "notification.admin.sign_up": "{name} skráði sig",
   "notification.favourite": "{name} setti færsluna þína í eftirlæti",
   "notification.follow": "{name} fylgist með þér",
@@ -485,6 +491,8 @@
   "notification.moderation_warning.action_silence": "Notandaaðgangurinn þinn hefur verið takmarkaður.",
   "notification.moderation_warning.action_suspend": "Notandaaðgangurinn þinn hefur verið settur í frysti.",
   "notification.own_poll": "Könnuninni þinni er lokið",
+  "notification.poll": "Könnun sem þú greiddir atkvæði í er lokið",
+  "notification.private_mention": "{name} minntist á þig í einrúmi",
   "notification.reblog": "{name} endurbirti færsluna þína",
   "notification.relationships_severance_event": "Missti tengingar við {name}",
   "notification.relationships_severance_event.account_suspension": "Stjórnandi á {from} hefur fryst {target}, sem þýðir að þú færð ekki lengur skilaboð frá viðkomandi né átt í samskiptum við viðkomandi.",
@@ -502,6 +510,8 @@
   "notifications.column_settings.admin.report": "Nýjar kærur:",
   "notifications.column_settings.admin.sign_up": "Nýjar skráningar:",
   "notifications.column_settings.alert": "Tilkynningar á skjáborði",
+  "notifications.column_settings.beta.category": "Eiginleikar á tilraunastigi",
+  "notifications.column_settings.beta.grouping": "Tilkynningar hópa",
   "notifications.column_settings.favourite": "Eftirlæti:",
   "notifications.column_settings.filter_bar.advanced": "Birta alla flokka",
   "notifications.column_settings.filter_bar.category": "Skyndisíustika",
@@ -665,9 +675,13 @@
   "report.unfollow_explanation": "Þú ert að fylgjast með þessum aðgangi. Til að hætta að sjá viðkomandi færslur á streyminu þínu, skaltu hætta að fylgjast með viðkomandi.",
   "report_notification.attached_statuses": "{count, plural, one {{count} færsla} other {{count} færslur}} viðhengdar",
   "report_notification.categories.legal": "Löglegt",
+  "report_notification.categories.legal_sentence": "ólöglegt efni",
   "report_notification.categories.other": "Annað",
+  "report_notification.categories.other_sentence": "annað",
   "report_notification.categories.spam": "Ruslpóstur",
+  "report_notification.categories.spam_sentence": "ruslpóstur",
   "report_notification.categories.violation": "Brot á reglum",
+  "report_notification.categories.violation_sentence": "brot á reglum",
   "report_notification.open": "Opin kæra",
   "search.no_recent_searches": "Engar nýlegar leitir",
   "search.placeholder": "Leita",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index 13583bc1d84ded..5168c1c0c0c0c9 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -502,6 +502,8 @@
   "notifications.column_settings.admin.report": "新しい通報:",
   "notifications.column_settings.admin.sign_up": "新規登録:",
   "notifications.column_settings.alert": "デスクトップ通知",
+  "notifications.column_settings.beta.category": "実験段階の機能",
+  "notifications.column_settings.beta.grouping": "通知をグループにまとめる",
   "notifications.column_settings.favourite": "お気に入り:",
   "notifications.column_settings.filter_bar.advanced": "すべてのカテゴリを表示",
   "notifications.column_settings.filter_bar.category": "クイックフィルターバー:",
diff --git a/app/javascript/mastodon/locales/kab.json b/app/javascript/mastodon/locales/kab.json
index d12cf04366010e..776b3446a2e4c2 100644
--- a/app/javascript/mastodon/locales/kab.json
+++ b/app/javascript/mastodon/locales/kab.json
@@ -20,10 +20,10 @@
   "account.cancel_follow_request": "Sefsex taḍfart",
   "account.copy": "Nɣel assaɣ ɣer umaɣnu",
   "account.direct": "Bder-d @{name} weḥd-s",
-  "account.disable_notifications": "Ḥbes ur iyi-d-ttazen ara ilɣa mi ara d-isuffeɣ @{name}",
+  "account.disable_notifications": "Ḥbes ur iyi-d-ttazen ara alɣuten mi ara d-isuffeɣ @{name}",
   "account.domain_blocked": "Taɣult yeffren",
   "account.edit_profile": "Ẓreg amaɣnu",
-  "account.enable_notifications": "Azen-iyi-d ilɣa mi ara d-isuffeɣ @{name}",
+  "account.enable_notifications": "Azen-iyi-d alɣuten mi ara d-isuffeɣ @{name}",
   "account.endorse": "Welleh fell-as deg umaɣnu-inek",
   "account.featured_tags.last_status_at": "Tasuffeɣt taneggarut ass n {date}",
   "account.featured_tags.last_status_never": "Ulac tisuffaɣ",
@@ -45,7 +45,7 @@
   "account.mention": "Bder-d @{name}",
   "account.moved_to": "{name} yenna-d dakken amiḍan-is amaynut yuɣal :",
   "account.mute": "Sgugem @{name}",
-  "account.mute_notifications_short": "Susem ilɣa",
+  "account.mute_notifications_short": "Susem alɣuten",
   "account.mute_short": "Sgugem",
   "account.muted": "Yettwasgugem",
   "account.no_bio": "Ulac aglam i d-yettunefken.",
@@ -103,7 +103,7 @@
   "column.home": "Agejdan",
   "column.lists": "Tibdarin",
   "column.mutes": "Imiḍanen yettwasgugmen",
-  "column.notifications": "Tilɣa",
+  "column.notifications": "Alɣuten",
   "column.pins": "Tisuffaɣ yettwasenṭḍen",
   "column.public": "Tasuddemt tamatut",
   "column_back_button.label": "Tuɣalin",
@@ -210,7 +210,7 @@
   "empty_column.list": "Ar tura ur yelli kra deg umuɣ-a. Ad d-yettwasken da ticki iɛeggalen n wumuɣ-a suffɣen-d kra.",
   "empty_column.lists": "Ulac ɣur-k·m kra n wumuɣ yakan. Ad d-tettwasken da ticki tesluleḍ-d yiwet.",
   "empty_column.mutes": "Ulac ɣur-k·m imseqdacen i yettwasgugmen.",
-  "empty_column.notifications": "Ulac ɣur-k·m tilɣa. Sedmer akked yemdanen-nniḍen akken ad tebduḍ adiwenni.",
+  "empty_column.notifications": "Ulac ɣur-k·m alɣuten. Sedmer akked yemdanen-nniḍen akken ad tebduḍ adiwenni.",
   "empty_column.public": "Ulac kra da! Aru kra, neɣ ḍfeṛ imdanen i yellan deg yiqeddacen-nniḍen akken ad d-teččar tsuddemt tazayezt",
   "error.unexpected_crash.next_steps": "Smiren asebter-a, ma ur yekkis ara wugur, ẓer d akken tzemreḍ ad tesqedceḍ Maṣṭudun deg yiminig-nniḍen neɣ deg usnas anaṣli.",
   "errors.unexpected_crash.copy_stacktrace": "Nɣel stacktrace ɣef wafus",
@@ -247,7 +247,7 @@
   "footer.keyboard_shortcuts": "Inegzumen n unasiw",
   "footer.privacy_policy": "Tasertit tabaḍnit",
   "footer.source_code": "Wali tangalt taɣbalut",
-  "footer.status": "N tsuffeɣt",
+  "footer.status": "Addad",
   "generic.saved": "Yettwasekles",
   "getting_started.heading": "Bdu",
   "hashtag.column_header.tag_mode.all": "d {additional}",
@@ -305,7 +305,7 @@
   "keyboard_shortcuts.mention": "akken ad d-bedreḍ ameskar",
   "keyboard_shortcuts.muted": "akken ad teldiḍ tabdart n yimseqdacen yettwasgugmen",
   "keyboard_shortcuts.my_profile": "akken ad d-teldiḍ amaɣnu-ik",
-  "keyboard_shortcuts.notifications": "akken ad d-teldiḍ ajgu n tilɣa",
+  "keyboard_shortcuts.notifications": "akken ad d-teldiḍ ajgu n walɣuten",
   "keyboard_shortcuts.open_media": "i tiɣwalin yeldin",
   "keyboard_shortcuts.pinned": "akken ad teldiḍ tabdart n tjewwiqin yettwasentḍen",
   "keyboard_shortcuts.profile": "akken ad d-teldiḍ amaɣnu n umeskar",
@@ -327,7 +327,7 @@
   "limited_account_hint.action": "Wali amaɣnu akken yebɣu yili",
   "link_preview.author": "S-ɣur {name}",
   "link_preview.more_from_author": "Ugar sɣur {name}",
-  "link_preview.shares": "{count, plural, one {{counter} post} other {{counter} posts}}",
+  "link_preview.shares": "{count, plural, one {{counter} n tsuffeɣt} other {{counter} n tsuffaɣ}}",
   "lists.account.add": "Rnu ɣer tebdart",
   "lists.account.remove": "Kkes seg tebdart",
   "lists.delete": "Kkes tabdart",
@@ -388,11 +388,12 @@
   "notification.status": "{name} akken i d-yessufeɣ",
   "notification_requests.accept": "Qbel",
   "notification_requests.dismiss": "Agi",
-  "notification_requests.notifications_from": "Ilɣa sɣur {name}",
-  "notifications.clear": "Sfeḍ tilɣa",
-  "notifications.clear_confirmation": "Tebɣiḍ s tidet ad tekkseḍ akk tilɣa-inek·em i lebda?",
+  "notification_requests.notifications_from": "Alɣuten sɣur {name}",
+  "notifications.clear": "Sfeḍ alɣuten",
+  "notifications.clear_confirmation": "Tebɣiḍ s tidet ad tekkseḍ akk alɣuten-inek·em i lebda?",
   "notifications.column_settings.admin.report": "Ineqqisen imaynuten:",
-  "notifications.column_settings.alert": "Tilɣa n tnarit",
+  "notifications.column_settings.alert": "Alɣuten n tnarit",
+  "notifications.column_settings.beta.grouping": "Segrew alɣuten",
   "notifications.column_settings.favourite": "Imenyafen:",
   "notifications.column_settings.filter_bar.advanced": "Sken-d akk taggayin",
   "notifications.column_settings.filter_bar.category": "Iri n usizdeg uzrib",
@@ -400,12 +401,12 @@
   "notifications.column_settings.follow_request": "Isuturen imaynuten n teḍfeṛt:",
   "notifications.column_settings.mention": "Abdar:",
   "notifications.column_settings.poll": "Igemmaḍ n usenqed:",
-  "notifications.column_settings.push": "Tilɣa yettudemmren",
+  "notifications.column_settings.push": "Alɣuten yettudemmren",
   "notifications.column_settings.reblog": "Seǧhed:",
   "notifications.column_settings.show": "Ssken-d tilɣa deg ujgu",
   "notifications.column_settings.sound": "Rmed imesli",
   "notifications.column_settings.status": "Tisuffaɣ timaynutin :",
-  "notifications.column_settings.unread_notifications.category": "Ilɣa ur nettwaɣra",
+  "notifications.column_settings.unread_notifications.category": "Alɣuten ur nettwaɣra",
   "notifications.column_settings.update": "Iẓreg:",
   "notifications.filter.all": "Akk",
   "notifications.filter.boosts": "Seǧhed",
@@ -415,9 +416,9 @@
   "notifications.filter.polls": "Igemmaḍ n usenqed",
   "notifications.filter.statuses": "Ileqman n yimdanen i teṭṭafareḍ",
   "notifications.grant_permission": "Mudd tasiregt.",
-  "notifications.group": "{count} n tilɣa",
-  "notifications.mark_as_read": "Creḍ meṛṛa iilɣa am wakken ttwaɣran",
-  "notifications.permission_denied": "D awezɣi ad yili wermad n yilɣa n tnarit axateṛ turagt tettwagdel.",
+  "notifications.group": "{count} n walɣuten",
+  "notifications.mark_as_read": "Creḍ meṛṛa alɣuten am wakken ttwaɣran",
+  "notifications.permission_denied": "D awezɣi ad yili wermad n walɣuten n tnarit axateṛ turagt tettwagdel",
   "notifications.policy.filter_new_accounts.hint": "Imiḍanen imaynuten i d-yennulfan deg {days, plural, one {yiwen n wass} other {# n wussan}} yezrin",
   "notifications.policy.filter_new_accounts_title": "Imiḍan imaynuten",
   "notifications.policy.filter_not_followers_hint": "Ula d wid akked tid i k·m-id-iḍefren, ur wwiḍen ara {days, plural, one {yiwen n wass} other {# n wussan}}",
@@ -425,8 +426,8 @@
   "notifications.policy.filter_not_following_hint": "Alamma tqebleḍ-ten s ufus",
   "notifications.policy.filter_not_following_title": "Wid akked tid ur tettḍafareḍ ara",
   "notifications.policy.filter_private_mentions_title": "Abdar uslig ur yettwasferken ara",
-  "notifications.policy.title": "Sizdeg ilɣa sɣur …",
-  "notifications_permission_banner.enable": "Rmed talɣutin n tnarit",
+  "notifications.policy.title": "Sizdeg alɣuten sɣur …",
+  "notifications_permission_banner.enable": "Rmed alɣuten n tnarit",
   "notifications_permission_banner.title": "Ur zeggel acemma",
   "onboarding.action.back": "Tuɣalin ɣer deffir",
   "onboarding.actions.back": "Tuɣalin ɣer deffir",
@@ -521,7 +522,7 @@
   "report.thanks.title": "Ur tebɣiḍ ara ad twaliḍ aya?",
   "report.thanks.title_actionable": "Tanemmirt ɣef uneqqis, ad nwali deg waya.",
   "report.unfollow": "Seḥbes aḍfar n @{name}",
-  "report_notification.attached_statuses": "{count, plural, one {# post} other {# posts}} attached",
+  "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.spam": "Aspam",
@@ -608,7 +609,7 @@
   "status.unpin": "Kkes asenteḍ seg umaɣnu",
   "subscribed_languages.save": "Sekles ibeddilen",
   "tabs_bar.home": "Agejdan",
-  "tabs_bar.notifications": "Tilɣa",
+  "tabs_bar.notifications": "Alɣuten",
   "time_remaining.days": "Mazal {number, plural, one {# n wass} other {# n wussan}}",
   "time_remaining.hours": "Mazal {number, plural, one {# n usrag} other {# n yesragen}}",
   "time_remaining.minutes": "Mazal {number, plural, one {# n tesdat} other {# n tesdatin}}",
diff --git a/app/javascript/mastodon/locales/lad.json b/app/javascript/mastodon/locales/lad.json
index ee45e09ad1c89f..2dc360f9eda102 100644
--- a/app/javascript/mastodon/locales/lad.json
+++ b/app/javascript/mastodon/locales/lad.json
@@ -300,6 +300,7 @@
   "follow_suggestions.hints.similar_to_recently_followed": "Este profil es similar a otros ke tienes segido resientemente.",
   "follow_suggestions.personalized_suggestion": "Sujestion personalizada",
   "follow_suggestions.popular_suggestion": "Sujestion populara",
+  "follow_suggestions.popular_suggestion_longer": "Popular en {domain}",
   "follow_suggestions.view_all": "Ve todos",
   "follow_suggestions.who_to_follow": "A ken segir",
   "followed_tags": "Etiketas segidas",
@@ -396,6 +397,7 @@
   "limited_account_hint.title": "Este profil fue eskondido por los moderadores de {domain}.",
   "link_preview.author": "Publikasyon de {name}",
   "link_preview.more_from_author": "Mas de {name}",
+  "link_preview.shares": "{count, plural, one {{counter} publikasyon} other {{counter} publikasyones}}",
   "lists.account.add": "Adjusta a lista",
   "lists.account.remove": "Kita de lista",
   "lists.delete": "Efasa lista",
@@ -448,15 +450,20 @@
   "navigation_bar.security": "Segurita",
   "not_signed_in_indicator.not_signed_in": "Nesesitas konektarse kon tu kuento para akseder este rekurso.",
   "notification.admin.report": "{name} raporto {target}",
+  "notification.admin.report_statuses_other": "{name} raporto {target}",
   "notification.admin.sign_up": "{name} kriyo un konto",
   "notification.favourite": "A {name} le plaze tu publikasyon",
   "notification.follow": "{name} te ampeso a segir",
   "notification.follow_request": "{name} tiene solisitado segirte",
   "notification.mention": "{name} te enmento",
   "notification.moderation-warning.learn_more": "Ambezate mas",
+  "notification.moderation_warning.action_disable": "Tu kuento tiene sido inkapasitado.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Algunas de tus publikasyones tienen sido markadas komo sensivles.",
+  "notification.moderation_warning.action_sensitive": "Tus publikasyones seran markadas komo sensivles dizde agora.",
   "notification.moderation_warning.action_silence": "Tu kuento tiene sido limitado.",
   "notification.moderation_warning.action_suspend": "Tu kuento tiene sido suspendido.",
   "notification.own_poll": "Tu anketa eskapo",
+  "notification.poll": "Anketa en ke votates eskapo",
   "notification.reblog": "{name} repartajo tu publikasyon",
   "notification.relationships_severance_event": "Koneksyones pedridas kon {name}",
   "notification.relationships_severance_event.learn_more": "Ambezate mas",
@@ -633,8 +640,11 @@
   "report_notification.attached_statuses": "{count, plural, one {{count} publikasyon} other {{count} publikasyones}} atadas",
   "report_notification.categories.legal": "Legal",
   "report_notification.categories.other": "Otros",
+  "report_notification.categories.other_sentence": "otros",
   "report_notification.categories.spam": "Spam",
+  "report_notification.categories.spam_sentence": "spam",
   "report_notification.categories.violation": "Violasyon de reglas",
+  "report_notification.categories.violation_sentence": "violasyon de reglas",
   "report_notification.open": "Avre raporto",
   "search.no_recent_searches": "No ay bushkedas resientes",
   "search.placeholder": "Bushka",
diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json
index 05c8aa4e2600bf..027c09280c85a2 100644
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@@ -491,8 +491,8 @@
   "notification.moderation_warning.action_silence": "Jouw account is beperkt.",
   "notification.moderation_warning.action_suspend": "Jouw account is opgeschort.",
   "notification.own_poll": "Jouw peiling is beëindigd",
-  "notification.poll": "Een peiling waaraan je hebt deelgenomen, is verlopen",
-  "notification.private_mention": "{name} heeft je privé genoemd",
+  "notification.poll": "Een peiling waaraan jij hebt meegedaan is beëindigd",
+  "notification.private_mention": "{name} heeft je een privébericht gestuurd",
   "notification.reblog": "{name} boostte jouw bericht",
   "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.",
@@ -511,7 +511,7 @@
   "notifications.column_settings.admin.sign_up": "Nieuwe registraties:",
   "notifications.column_settings.alert": "Desktopmeldingen",
   "notifications.column_settings.beta.category": "Experimentele functies",
-  "notifications.column_settings.beta.grouping": "Groepsmeldingen",
+  "notifications.column_settings.beta.grouping": "Gegroepeerde meldingen",
   "notifications.column_settings.favourite": "Favorieten:",
   "notifications.column_settings.filter_bar.advanced": "Alle categorieën tonen",
   "notifications.column_settings.filter_bar.category": "Snelle filterbalk",
@@ -681,7 +681,7 @@
   "report_notification.categories.spam": "Spam",
   "report_notification.categories.spam_sentence": "spam",
   "report_notification.categories.violation": "Overtreden regel(s)",
-  "report_notification.categories.violation_sentence": "regel overtreden",
+  "report_notification.categories.violation_sentence": "serverregel overtreden",
   "report_notification.open": "Rapportage openen",
   "search.no_recent_searches": "Geen recente zoekopdrachten",
   "search.placeholder": "Zoeken",
diff --git a/app/javascript/mastodon/locales/sq.json b/app/javascript/mastodon/locales/sq.json
index 219561688bd4e0..6f378b145eaf40 100644
--- a/app/javascript/mastodon/locales/sq.json
+++ b/app/javascript/mastodon/locales/sq.json
@@ -443,6 +443,8 @@
   "mute_modal.title": "Të heshtohet përdoruesi?",
   "mute_modal.you_wont_see_mentions": "S’do të shihni postime ku përmenden.",
   "mute_modal.you_wont_see_posts": "Ata munden ende të shohin postimet tuaja, por ju s’do të shihni të tyret.",
+  "name_and_others": "{name} dhe {count, plural, one {# tjetër} other {# të tjerë}}",
+  "name_and_others_with_link": "{name} dhe <a>{count, plural, one {# tjetër} other {# të tjerë}}</a>",
   "navigation_bar.about": "Mbi",
   "navigation_bar.advanced_interface": "Hape në ndërfaqe web të thelluar",
   "navigation_bar.blocks": "Përdorues të bllokuar",
@@ -470,6 +472,10 @@
   "navigation_bar.security": "Siguri",
   "not_signed_in_indicator.not_signed_in": "Që të përdorni këtë burim, lypset të bëni hyrjen.",
   "notification.admin.report": "{name} raportoi {target}",
+  "notification.admin.report_account": "{name} raportoi për {count, plural, one {një postim} other {# postime}} nga {target} për {category}",
+  "notification.admin.report_account_other": "{name} raportoi për {count, plural, one {një postim} other {# postime}} nga {target}",
+  "notification.admin.report_statuses": "{name} raportoi {target} për {category}",
+  "notification.admin.report_statuses_other": "{name} raportoi {target}",
   "notification.admin.sign_up": "{name} u regjistrua",
   "notification.favourite": "{name} i vuri shenjë postimit tuaj si të parapëlqyer",
   "notification.follow": "{name} zuri t’ju ndjekë",
@@ -485,6 +491,8 @@
   "notification.moderation_warning.action_silence": "Llogaria juaj është kufizuar.",
   "notification.moderation_warning.action_suspend": "Llogaria juaj është pezulluar.",
   "notification.own_poll": "Pyetësori juaj ka përfunduar",
+  "notification.poll": "Ka përfunduar një pyetësor në të cilin keni marrë pjesë",
+  "notification.private_mention": "{name} ju përmendi privatisht",
   "notification.reblog": "{name} përforcoi mesazhin tuaj",
   "notification.relationships_severance_event": "Lidhje të humbura me {name}",
   "notification.relationships_severance_event.account_suspension": "Një përgjegjës nga {from} ka pezulluar {target}, që do të thotë se s’mund të merrni më përditësime prej tij, apo të ndërveproni me të.",
@@ -502,6 +510,8 @@
   "notifications.column_settings.admin.report": "Raportime të reja:",
   "notifications.column_settings.admin.sign_up": "Regjistrime të reja:",
   "notifications.column_settings.alert": "Njoftime desktopi",
+  "notifications.column_settings.beta.category": "Veçori eksperimentale",
+  "notifications.column_settings.beta.grouping": "Njoftime grupi",
   "notifications.column_settings.favourite": "Të parapëlqyer:",
   "notifications.column_settings.filter_bar.advanced": "Shfaq krejt kategoritë",
   "notifications.column_settings.filter_bar.category": "Shtyllë filtrimesh të shpejta",
@@ -665,9 +675,13 @@
   "report.unfollow_explanation": "Po e ndiqni këtë llogari. Për të mos parë më postimet e tyre te prurja juaj e kreut, ndalni ndjekjen e tyre.",
   "report_notification.attached_statuses": "{count, plural, one {{count} postim} other {{count} postime}} bashkëngjitur",
   "report_notification.categories.legal": "Ligjore",
+  "report_notification.categories.legal_sentence": "lëndë e paligjshme",
   "report_notification.categories.other": "Tjetër",
+  "report_notification.categories.other_sentence": "tjetër",
   "report_notification.categories.spam": "I padëshiruar",
+  "report_notification.categories.spam_sentence": "mesazh i padëshiruar",
   "report_notification.categories.violation": "Cenim rregullash",
+  "report_notification.categories.violation_sentence": "cenim rregullash",
   "report_notification.open": "Hape raportimin",
   "search.no_recent_searches": "Pa kërkime së fundi",
   "search.placeholder": "Kërkoni",
diff --git a/app/javascript/mastodon/locales/sv.json b/app/javascript/mastodon/locales/sv.json
index ba07d5a1c7cfc2..53e2dde42ea416 100644
--- a/app/javascript/mastodon/locales/sv.json
+++ b/app/javascript/mastodon/locales/sv.json
@@ -442,6 +442,8 @@
   "mute_modal.title": "Tysta användare?",
   "mute_modal.you_wont_see_mentions": "Du kommer inte att se inlägg som nämner dem.",
   "mute_modal.you_wont_see_posts": "De kan fortfarande se dina inlägg, men du kan inte se deras.",
+  "name_and_others": "{name} och {count, plural, one {# annan} other {# andra}}",
+  "name_and_others_with_link": "{name} och <a>{count, plural, one {# annan} other {# andra}}</a>",
   "navigation_bar.about": "Om",
   "navigation_bar.advanced_interface": "Öppna i avancerat webbgränssnitt",
   "navigation_bar.blocks": "Blockerade användare",
@@ -672,6 +674,7 @@
   "report_notification.categories.spam": "Skräppost",
   "report_notification.categories.spam_sentence": "skräppost",
   "report_notification.categories.violation": "Regelöverträdelse",
+  "report_notification.categories.violation_sentence": "regelöverträdelse",
   "report_notification.open": "Öppna rapport",
   "search.no_recent_searches": "Inga sökningar nyligen",
   "search.placeholder": "Sök",
diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json
index 083a0eb33f3e56..ab8179863c1d3d 100644
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@@ -443,6 +443,7 @@
   "mute_modal.title": "ซ่อนผู้ใช้?",
   "mute_modal.you_wont_see_mentions": "คุณจะไม่เห็นโพสต์ที่กล่าวถึงเขา",
   "mute_modal.you_wont_see_posts": "เขายังคงสามารถเห็นโพสต์ของคุณ แต่คุณจะไม่เห็นโพสต์ของเขา",
+  "name_and_others": "{name} และ {count, plural, one {# อื่น ๆ } other {# อื่น ๆ}}",
   "navigation_bar.about": "เกี่ยวกับ",
   "navigation_bar.advanced_interface": "เปิดในส่วนติดต่อเว็บขั้นสูง",
   "navigation_bar.blocks": "ผู้ใช้ที่ปิดกั้นอยู่",
@@ -470,6 +471,7 @@
   "navigation_bar.security": "ความปลอดภัย",
   "not_signed_in_indicator.not_signed_in": "คุณจำเป็นต้องเข้าสู่ระบบเพื่อเข้าถึงทรัพยากรนี้",
   "notification.admin.report": "{name} ได้รายงาน {target}",
+  "notification.admin.report_statuses_other": "{name} รายงาน {target}",
   "notification.admin.sign_up": "{name} ได้ลงทะเบียน",
   "notification.favourite": "{name} ได้ชื่นชอบโพสต์ของคุณ",
   "notification.follow": "{name} ได้ติดตามคุณ",
@@ -485,6 +487,7 @@
   "notification.moderation_warning.action_silence": "จำกัดบัญชีของคุณแล้ว",
   "notification.moderation_warning.action_suspend": "ระงับบัญชีของคุณแล้ว",
   "notification.own_poll": "การสำรวจความคิดเห็นของคุณได้สิ้นสุดแล้ว",
+  "notification.poll": "โพลที่คุณโหวตได้จบลงแล้ว",
   "notification.reblog": "{name} ได้ดันโพสต์ของคุณ",
   "notification.relationships_severance_event": "สูญเสียการเชื่อมต่อกับ {name}",
   "notification.relationships_severance_event.account_suspension": "ผู้ดูแลจาก {from} ได้ระงับ {target} ซึ่งหมายความว่าคุณจะไม่สามารถรับการอัปเดตจากเขาหรือโต้ตอบกับเขาได้อีกต่อไป",
@@ -666,8 +669,11 @@
   "report_notification.attached_statuses": "{count, plural, other {{count} โพสต์}}ที่แนบมา",
   "report_notification.categories.legal": "กฎหมาย",
   "report_notification.categories.other": "อื่น ๆ",
+  "report_notification.categories.other_sentence": "อื่น ๆ",
   "report_notification.categories.spam": "สแปม",
+  "report_notification.categories.spam_sentence": "สแปม",
   "report_notification.categories.violation": "การละเมิดกฎ",
+  "report_notification.categories.violation_sentence": "ละเมิดกฎ",
   "report_notification.open": "รายงานที่เปิด",
   "search.no_recent_searches": "ไม่มีการค้นหาล่าสุด",
   "search.placeholder": "ค้นหา",
diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json
index 0b20b60f9e90ce..ae7b5ba25dc314 100644
--- a/app/javascript/mastodon/locales/tr.json
+++ b/app/javascript/mastodon/locales/tr.json
@@ -443,6 +443,8 @@
   "mute_modal.title": "Kullanıcıyı sustur?",
   "mute_modal.you_wont_see_mentions": "Onlardan bahseden gönderiler göremezsiniz.",
   "mute_modal.you_wont_see_posts": "Onlar sizin gönderilerinizi görmeye devam edebilir, ancak siz onlarınkini göremezsiniz.",
+  "name_and_others": "{name} ve {count, plural, one {# diğer} other {# diğerleri}}",
+  "name_and_others_with_link": "{name} ve <a>{count, plural, one {# diğer} other {# diğerleri}}</a>",
   "navigation_bar.about": "Hakkında",
   "navigation_bar.advanced_interface": "Gelişmiş web arayüzünde aç",
   "navigation_bar.blocks": "Engellenen kullanıcılar",
@@ -470,6 +472,10 @@
   "navigation_bar.security": "Güvenlik",
   "not_signed_in_indicator.not_signed_in": "Bu kaynağa erişmek için oturum açmanız gerekir.",
   "notification.admin.report": "{name}, {target} kişisini bildirdi",
+  "notification.admin.report_account": "{name}, {category} kategorisi için {target} kişisini {count, plural, one {bir gönderi} other {# gönderi}} bildirdi",
+  "notification.admin.report_account_other": "{name}, {target} kişisinden {count, plural, one {bir gönderi} other {# gönderi}} bildirdi",
+  "notification.admin.report_statuses": "{name}, {category} kategorisi için {target} kişisini bildirdi",
+  "notification.admin.report_statuses_other": "{name}, {target} kişisini bildirdi",
   "notification.admin.sign_up": "{name} kaydoldu",
   "notification.favourite": "{name} gönderinizi beğendi",
   "notification.follow": "{name} seni takip etti",
@@ -485,6 +491,8 @@
   "notification.moderation_warning.action_silence": "Hesabınız sınırlandırıldı.",
   "notification.moderation_warning.action_suspend": "Hesabınız askıya alındı.",
   "notification.own_poll": "Anketiniz sona erdi",
+  "notification.poll": "Oy verdiğiniz bir anket sona erdi",
+  "notification.private_mention": "{name} gizlice sizden bahsetti",
   "notification.reblog": "{name} gönderini yeniden paylaştı",
   "notification.relationships_severance_event": "{name} ile bağlantılar koptu",
   "notification.relationships_severance_event.account_suspension": "{from} yöneticisi, {target} askıya aldı, bunun anlamı onlardan artık güncelleme alamayacak veya etkileşemeyeceksiniz demektir.",
@@ -502,6 +510,8 @@
   "notifications.column_settings.admin.report": "Yeni bildirimler:",
   "notifications.column_settings.admin.sign_up": "Yeni kayıtlar:",
   "notifications.column_settings.alert": "Masaüstü bildirimleri",
+  "notifications.column_settings.beta.category": "Deneysel özellikler",
+  "notifications.column_settings.beta.grouping": "Grup bildirimleri",
   "notifications.column_settings.favourite": "Favorilerin:",
   "notifications.column_settings.filter_bar.advanced": "Tüm kategorileri görüntüle",
   "notifications.column_settings.filter_bar.category": "Hızlı filtre çubuğu",
@@ -665,9 +675,13 @@
   "report.unfollow_explanation": "Bu hesabı takip ediyorsunuz. Ana akışınızda gönderilerini görmek istemiyorsanız, onu takip etmeyi bırakın.",
   "report_notification.attached_statuses": "{count, plural, one {{count} gönderi} other {{count} gönderi}} eklendi",
   "report_notification.categories.legal": "Yasal",
+  "report_notification.categories.legal_sentence": "yasadışı içerik",
   "report_notification.categories.other": "Diğer",
+  "report_notification.categories.other_sentence": "diğer",
   "report_notification.categories.spam": "İstenmeyen",
+  "report_notification.categories.spam_sentence": "i̇stenmeyen",
   "report_notification.categories.violation": "Kural ihlali",
+  "report_notification.categories.violation_sentence": "kural ihlali",
   "report_notification.open": "Bildirim aç",
   "search.no_recent_searches": "Son arama yok",
   "search.placeholder": "Ara",
diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json
index 76abe8d299f3c4..b5cd1f7b283f6d 100644
--- a/app/javascript/mastodon/locales/uk.json
+++ b/app/javascript/mastodon/locales/uk.json
@@ -443,6 +443,8 @@
   "mute_modal.title": "Ігнорувати користувача?",
   "mute_modal.you_wont_see_mentions": "Ви не бачитимете дописів, де їх згадано.",
   "mute_modal.you_wont_see_posts": "Вони все ще можуть бачити ваші дописи, але ви не бачитимете їхніх.",
+  "name_and_others": "{name} і {count, plural, one {# інший} few {# інших} many {# інших} other {# інший}}",
+  "name_and_others_with_link": "{name} і <a>{count, plural, one {# інший} few {# інших} many {# інших} other {# інший}}</a>",
   "navigation_bar.about": "Про застосунок",
   "navigation_bar.advanced_interface": "Відкрити в розширеному вебінтерфейсі",
   "navigation_bar.blocks": "Заблоковані користувачі",
@@ -470,6 +472,10 @@
   "navigation_bar.security": "Безпека",
   "not_signed_in_indicator.not_signed_in": "Ви повинні увійти, щоб отримати доступ до цього ресурсу.",
   "notification.admin.report": "Скарга від {name} на {target}",
+  "notification.admin.report_account": "{name} повідомив(ла) про {count, plural, one {один допис} few {# дописи} many {# дописів} other {# дописів}} від {target} в категорії {category}",
+  "notification.admin.report_account_other": "{name} повідомив(ла) про {count, plural, one {один допис} few {# дописи} many {# дописів} other {# дописів}} від {target}",
+  "notification.admin.report_statuses": "{name} повідомив(ла) про {target} в категорії {category}",
+  "notification.admin.report_statuses_other": "{name} повідомив(ла) про {target}",
   "notification.admin.sign_up": "{name} приєдналися",
   "notification.favourite": "Ваш допис сподобався {name}",
   "notification.follow": "{name} підписалися на вас",
@@ -485,6 +491,8 @@
   "notification.moderation_warning.action_silence": "Ваш обліковий запис було обмежено.",
   "notification.moderation_warning.action_suspend": "Ваш обліковий запис було заблоковано.",
   "notification.own_poll": "Ваше опитування завершилося",
+  "notification.poll": "Опитування, в якому ви проголосували, завершено",
+  "notification.private_mention": "{name} приватно згадав(ла) вас",
   "notification.reblog": "{name} поширює ваш допис",
   "notification.relationships_severance_event": "Втрачено з'єднання з {name}",
   "notification.relationships_severance_event.account_suspension": "Адміністратор з {from} призупинив {target}, що означає, що ви більше не можете отримувати оновлення від них або взаємодіяти з ними.",
@@ -502,6 +510,8 @@
   "notifications.column_settings.admin.report": "Нові скарги:",
   "notifications.column_settings.admin.sign_up": "Нові реєстрації:",
   "notifications.column_settings.alert": "Сповіщення стільниці",
+  "notifications.column_settings.beta.category": "Експериментальні функції",
+  "notifications.column_settings.beta.grouping": "Групові сповіщення",
   "notifications.column_settings.favourite": "Уподобане:",
   "notifications.column_settings.filter_bar.advanced": "Показати всі категорії",
   "notifications.column_settings.filter_bar.category": "Панель швидкого фільтра",
@@ -665,9 +675,13 @@
   "report.unfollow_explanation": "Ви підписані на цього користувача. Щоб більше не бачити їхні дописи у вашій стрічці, відпишіться від них.",
   "report_notification.attached_statuses": "{count, plural, one {{count} допис} few {{count} дописи} many {{count} дописів} other {{count} дописи}} прикріплено",
   "report_notification.categories.legal": "Правові",
+  "report_notification.categories.legal_sentence": "незаконний контент",
   "report_notification.categories.other": "Інше",
+  "report_notification.categories.other_sentence": "інше",
   "report_notification.categories.spam": "Спам",
+  "report_notification.categories.spam_sentence": "спам",
   "report_notification.categories.violation": "Порушення правил",
+  "report_notification.categories.violation_sentence": "порушення правил",
   "report_notification.open": "Відкрити скаргу",
   "search.no_recent_searches": "Немає останніх пошуків",
   "search.placeholder": "Пошук",
diff --git a/app/javascript/mastodon/locales/vi.json b/app/javascript/mastodon/locales/vi.json
index 7a88bee364bba0..0f2cc996a2e4e1 100644
--- a/app/javascript/mastodon/locales/vi.json
+++ b/app/javascript/mastodon/locales/vi.json
@@ -443,6 +443,8 @@
   "mute_modal.title": "Ẩn người này?",
   "mute_modal.you_wont_see_mentions": "Bạn sẽ không nhìn thấy tút có nhắc đến họ.",
   "mute_modal.you_wont_see_posts": "Bạn sẽ không nhìn thấy tút của họ.",
+  "name_and_others": "{name} và {count, plural, other {# người khác}}",
+  "name_and_others_with_link": "{name} và <a>{count, plural, other {# người khác}}</a>",
   "navigation_bar.about": "Giới thiệu",
   "navigation_bar.advanced_interface": "Dùng bố cục nhiều cột",
   "navigation_bar.blocks": "Người đã chặn",
@@ -470,6 +472,10 @@
   "navigation_bar.security": "Bảo mật",
   "not_signed_in_indicator.not_signed_in": "Bạn cần đăng nhập để truy cập mục này.",
   "notification.admin.report": "{name} báo cáo {target}",
+  "notification.admin.report_account": "{name} báo cáo {count, plural, other {# tút}} của {target} vì {category}",
+  "notification.admin.report_account_other": "{name} báo cáo {count, plural, other {# tút}} của {target}",
+  "notification.admin.report_statuses": "{name} báo cáo {target} vì {category}",
+  "notification.admin.report_statuses_other": "{name} báo cáo {target}",
   "notification.admin.sign_up": "{name} tham gia máy chủ của bạn",
   "notification.favourite": "{name} thích tút của bạn",
   "notification.follow": "{name} theo dõi bạn",
@@ -485,6 +491,8 @@
   "notification.moderation_warning.action_silence": "Tài khoản của bạn đã bị hạn chế.",
   "notification.moderation_warning.action_suspend": "Tài khoản của bạn đã bị vô hiệu hóa.",
   "notification.own_poll": "Cuộc bình chọn của bạn đã kết thúc",
+  "notification.poll": "Cuộc bình chọn có bạn tham gia đã kết thúc",
+  "notification.private_mention": "{name} nhắn riêng đến bạn",
   "notification.reblog": "{name} đăng lại tút của bạn",
   "notification.relationships_severance_event": "Mất kết nối với {name}",
   "notification.relationships_severance_event.account_suspension": "Quản trị viên {from} đã vô hiệu hóa {target}, điều này có nghĩa là bạn không còn có thể nhận được cập nhật từ họ hoặc tương tác với họ nữa.",
@@ -502,6 +510,8 @@
   "notifications.column_settings.admin.report": "Báo cáo mới:",
   "notifications.column_settings.admin.sign_up": "Người mới tham gia:",
   "notifications.column_settings.alert": "Báo trên máy tính",
+  "notifications.column_settings.beta.category": "Tính năng thử nghiệm",
+  "notifications.column_settings.beta.grouping": "Gộp thông báo theo loại",
   "notifications.column_settings.favourite": "Lượt thích:",
   "notifications.column_settings.filter_bar.advanced": "Toàn bộ",
   "notifications.column_settings.filter_bar.category": "Thanh lọc nhanh",
@@ -665,9 +675,13 @@
   "report.unfollow_explanation": "Bạn đang theo dõi người này. Để không thấy tút của họ trên trang chủ nữa, hãy bỏ theo dõi.",
   "report_notification.attached_statuses": "{count, plural, other {{count} tút}} đính kèm",
   "report_notification.categories.legal": "Pháp lý",
+  "report_notification.categories.legal_sentence": "nội dung bất hợp pháp",
   "report_notification.categories.other": "Khác",
+  "report_notification.categories.other_sentence": "khác",
   "report_notification.categories.spam": "Spam",
+  "report_notification.categories.spam_sentence": "spam",
   "report_notification.categories.violation": "Vi phạm nội quy",
+  "report_notification.categories.violation_sentence": "vi phạm nội quy",
   "report_notification.open": "Mở báo cáo",
   "search.no_recent_searches": "Không có tìm kiếm gần đây",
   "search.placeholder": "Tìm kiếm",
diff --git a/config/locales/activerecord.el.yml b/config/locales/activerecord.el.yml
index 01e9a75f98e4ab..1c3bcc6ebf58be 100644
--- a/config/locales/activerecord.el.yml
+++ b/config/locales/activerecord.el.yml
@@ -36,14 +36,14 @@ el:
         status:
           attributes:
             reblog:
-              taken: της κατάστασης ήδη υπάρχει
+              taken: της ανάρτησης υπάρχει ήδη
         user:
           attributes:
             email:
               blocked: χρησιμοποιεί μη επιτρεπόμενο πάροχο e-mail
               unreachable: δεν φαίνεται να υπάρχει
             role_id:
-              elevated: δεν μπορεί να είναι μεγαλύτερο από τον τρέχοντα ρόλο σας
+              elevated: δεν μπορεί να είναι υψηλότερο από τον τρέχοντα ρόλο σου
         user_role:
           attributes:
             permissions_as_keys:
diff --git a/config/locales/doorkeeper.el.yml b/config/locales/doorkeeper.el.yml
index 1cb9b3513bbda6..167cc6bd44e99b 100644
--- a/config/locales/doorkeeper.el.yml
+++ b/config/locales/doorkeeper.el.yml
@@ -4,7 +4,7 @@ el:
     attributes:
       doorkeeper/application:
         name: Όνομα εφαρμογής
-        redirect_uri: URI Ανακατεύθυνσης (Ενιαίο Αναγνωριστικό Πόρων)
+        redirect_uri: URI Ανακατεύθυνσης
         scopes: Εύρος εφαρμογής
         website: Ιστότοπος εφαρμογής
     errors:
@@ -13,21 +13,21 @@ el:
           attributes:
             redirect_uri:
               fragment_present: δεν μπορεί να περιέχει τμήμα διεύθυνσης.
-              invalid_uri: πρέπει να είναι έγκυρο URI (Ενιαίο Αναγνωριστικό Πόρων).
-              relative_uri: πρέπει να είναι απόλυτο URI (Ενιαίο Αναγνωριστικό Πόρων).
-              secured_uri: πρέπει να είναι HTTPS/SSL URI (Ενιαίο Αναγνωριστικό Πόρων).
+              invalid_uri: πρέπει να είναι έγκυρο URI.
+              relative_uri: πρέπει να είναι απόλυτο URI.
+              secured_uri: πρέπει να είναι HTTPS/SSL URI.
   doorkeeper:
     applications:
       buttons:
-        authorize: Ενέκρινε
+        authorize: Έγκριση
         cancel: Άκυρο
         destroy: Καταστροφή
-        edit: Αλλαγή
+        edit: Επεξεργασία
         submit: Υποβολή
       confirmations:
         destroy: Σίγουρα;
       edit:
-        title: Αλλαγή εφαρμογής
+        title: Επεξεργασία εφαρμογής
       form:
         error: Ώπα! Έλεγξε τη φόρμα σου για πιθανά λάθη
       help:
@@ -36,9 +36,9 @@ el:
         scopes: Διαχώρησε το κάθε εύρος εφαρμογής με κενά. Άστο κενό για χρήση των προεπιλεγμένων ευρών εφαρμογής.
       index:
         application: Εφαρμογή
-        callback_url: URL επιστροφής (Callback)
+        callback_url: Callback URL
         delete: Διαγραφή
-        empty: Δεν έχετε αιτήσεις.
+        empty: Δεν έχεις εφαρμογές.
         name: Όνομα
         new: Νέα εφαρμογή
         scopes: Εύρος εφαρμογής
@@ -49,32 +49,32 @@ el:
       show:
         actions: Ενέργειες
         application_id: Κλειδί πελάτη
-        callback_urls: URL επιστροφής (Callback)
+        callback_urls: Callback URLs
         scopes: Εύρος εφαρμογής
         secret: Μυστικό πελάτη
         title: 'Εφαρμογή: %{name}'
     authorizations:
       buttons:
-        authorize: Ενέκρινε
-        deny: Απόρριψε
+        authorize: Έγκριση
+        deny: Απόρριψη
       error:
         title: Εμφανίστηκε σφάλμα
       new:
-        prompt_html: Ο/Η %{client_name} θα ήθελε άδεια πρόσβασης στο λογαριασμό σας. Είναι μια εφαρμογή από τρίτους. <strong>Αν δεν το εμπιστεύεστε, τότε δεν πρέπει να το εξουσιοδοτήσετε.</strong>
-        review_permissions: Αναθεώρηση δικαιωμάτων
+        prompt_html: Το %{client_name} θα ήθελε άδεια πρόσβασης στο λογαριασμό σου. Είναι μια εφαρμογή τρίτων. <strong>Αν δεν το εμπιστεύεσαι, τότε δεν πρέπει να το εγκρίνεις.</strong>
+        review_permissions: Ανασκόπηση δικαιωμάτων
         title: Απαιτείται έγκριση
       show:
         title: Αντέγραψε αυτό τον κωδικό έγκρισης στην εφαρμογή.
     authorized_applications:
       buttons:
-        revoke: Ανακάλεσε
+        revoke: Ανάκληση
       confirmations:
         revoke: Σίγουρα;
       index:
         authorized_at: Εξουσιοδοτήθηκε στις %{date}
-        description_html: Αυτές είναι εφαρμογές που μπορούν να έχουν πρόσβαση στο λογαριασμό σας χρησιμοποιώντας το API. Αν υπάρχουν εφαρμογές που δεν αναγνωρίζετε εδώ ή μια εφαρμογή δεν συμπεριφέρεται σωστά, μπορείτε να ανακαλέσετε την πρόσβασή της.
+        description_html: Αυτές είναι εφαρμογές που μπορούν να έχουν πρόσβαση στο λογαριασμό σου χρησιμοποιώντας το API. Αν υπάρχουν εφαρμογές που δεν αναγνωρίζεις εδώ ή μια εφαρμογή δεν συμπεριφέρεται σωστά, μπορείς να ανακαλέσεις την πρόσβασή της.
         last_used_at: Τελευταία χρήση στις %{date}
-        never_used: Ποτέ σε χρήση
+        never_used: Δεν έχει χρησιμοποιηθεί
         scopes: Δικαιώματα
         superapp: Εσωτερική
         title: Οι εφαρμογές που έχεις εγκρίνει
@@ -84,23 +84,23 @@ el:
         credential_flow_not_configured: Η ροή Resource Owner Password Credentials απέτυχε επειδή το Doorkeeper.configure.resource_owner_from_credentials δεν έχει ρυθμιστεί.
         invalid_client: Η ταυτοποίηση του πελάτη απέτυχε είτε λόγω άγνωστου πελάτη, είτε λόγω έλλειψης ταυτοποιημένου πελάτη ή λόγω μη υποστηριζόμενης μεθόδου ταυτοποίησης.
         invalid_grant: Η άδεια πιστοποίησης που δόθηκε είναι άκυρη, ληγμένη, έχει ανακληθεί, δεν συμφωνεί με το URI ανακατεύθυνσης που δόθηκε στο αίτημα πιστοποίησης ή εκδόθηκε προς άλλο πελάτη.
-        invalid_redirect_uri: Το URI ανακατεύθυνσης που δόθηκε δεν είναι έγκυρο.
+        invalid_redirect_uri: Το uri ανακατεύθυνσης που δόθηκε δεν είναι έγκυρο.
         invalid_request:
-          missing_param: 'Λείπει η απαιτούμενη παράμετρος: %{value}.'
+          missing_param: 'Λείπει απαιτούμενη παράμετρος: %{value}.'
           request_not_authorized: Το αίτημα πρέπει να είναι εξουσιοδοτημένο. Η απαιτούμενη παράμετρος για την έγκριση της αίτησης λείπει ή είναι άκυρη.
           unknown: Από το αίτημα λείπει μία υποχρεωτική παράμετρος ή περιλαμβάνει μια μη υποστηριζόμενη τιμή ή έχει λανθασμένη μορφή με κάποιο άλλο τρόπο.
-        invalid_resource_owner: Τα διαπιστευτήρια που έδωσε ο ιδιοκτήτης του πόρου δεν είναι έγκυρα, ή δεν βρέθηκε ο ιδιοκτήτης του πόρου
+        invalid_resource_owner: Τα διαπιστευτήρια που έδωσε ο ιδιοκτήτης του πόρου δεν είναι έγκυρα ή δεν βρέθηκε ο ιδιοκτήτης του πόρου
         invalid_scope: Το αιτούμενο εύρος εφαρμογής είναι άκυρο, άγνωστο ή λάθος διατυπωμένο.
         invalid_token:
           expired: Το διακριτικό πρόσβασης έληξε
           revoked: Το διακριτικό πρόσβασης ανακλήθηκε
           unknown: Το διακριτικό πρόσβασης δεν είναι έγκυρο
         resource_owner_authenticator_not_configured: Η αναζήτηση του ιδιοκτήτη του πόρου απέτυχε επειδή το Doorkeeper.configure.resource_owner_authenticator δεν έχει ρυθμιστεί.
-        server_error: Ο εξυπηρετητής έγκρισης (authorization server) αντιμετώπισε μια απροσδόκητη συνθήκη που τον απέτρεψε να ικανοποιήσει το αίτημα.
-        temporarily_unavailable: Ο εξυπηρετητής έγκρισης (authorization server) προς το παρόν δεν είναι διαθέσιμος να αναλάβει το αίτημα λόγω προσωρινής υπερφόρτωσης ή συντήρησής του.
+        server_error: Ο εξυπηρετητής έγκρισης αντιμετώπισε μια απροσδόκητη συνθήκη που τον απέτρεψε να ικανοποιήσει το αίτημα.
+        temporarily_unavailable: Ο εξυπηρετητής έγκρισης προς το παρόν δεν είναι δυνατό να αναλάβει το αίτημα λόγω προσωρινής υπερφόρτωσης ή συντήρησής του.
         unauthorized_client: Ο πελάτης δεν έχει άδεια να εκτελέσει αυτό το αίτημα χρησιμοποιώντας αυτή τη μέθοδο.
-        unsupported_grant_type: Το είδος άδειας έγκρισης δεν υποστηρίζεται από τον εξυπηρετητή έγκρισης (authorization server).
-        unsupported_response_type: Ο εξυπηρετητής έγκρισης (authorization server) δεν υποστηρίζει αυτό το είδος απάντησης.
+        unsupported_grant_type: Το είδος άδειας έγκρισης δεν υποστηρίζεται από τον εξυπηρετητή έγκρισης.
+        unsupported_response_type: Ο εξυπηρετητής έγκρισης δεν υποστηρίζει αυτό το είδος απάντησης.
     flash:
       applications:
         create:
@@ -122,19 +122,20 @@ el:
         admin/accounts: Διαχείριση λογαριασμών
         admin/all: Όλες οι λειτουργίες διαχείρησης
         admin/reports: Διαχείριση αναφορών
-        all: Πλήρης πρόσβαση στο λογαριασμό σας στο Mastodon
+        all: Πλήρης πρόσβαση στο λογαριασμό σου στο Mastodon
         blocks: Αποκλεισμοί
         bookmarks: Σελιδοδείκτες
         conversations: Συνομιλίες
         crypto: Κρυπτογράφηση από άκρο σε άκρο
         favourites: Αγαπημένα
         filters: Φίλτρα
-        follow: Ακολουθείτε, σε Σίγαση και Αποκλεισμοί
-        follows: Ακολουθείτε
+        follow: Ακολουθείς, σε Σίγαση και Αποκλεισμοί
+        follows: Ακολουθείς
         lists: Λίστες
         media: Συνημμένα πολυμέσα
-        mutes: Αποσιωπήσεις
+        mutes: Σιγάσεις
         notifications: Ειδοποιήσεις
+        profile: Το προφίλ σου στο Mastodon
         push: Άμεσες ειδοποιήσεις
         reports: Αναφορές
         search: Αναζήτηση
@@ -147,43 +148,45 @@ el:
       application:
         title: Απαιτείται έγκριση OAuth
     scopes:
-      admin:read: ανάγνωση δεδομένων στον διακομιστή
+      admin:read: ανάγνωση όλων των δεδομένων στον διακομιστή
       admin:read:accounts: ανάγνωση ευαίσθητων πληροφοριών όλων των λογαριασμών
       admin:read:canonical_email_blocks: ανάγνωση ευαίσθητων πληροφοριών όλων των αποκλεισμένων email
       admin:read:domain_allows: ανάγνωση ευαίσθητων πληροφοριών όλων των επιτρεπόμενων τομέων
       admin:read:domain_blocks: ανάγνωση ευαίσθητων πληροφοριών όλων των αποκλεισμένων τομέων
       admin:read:email_domain_blocks: ανάγνωση ευαίσθητων πληροφοριών όλων των αποκλεισμένων τομέων email
       admin:read:ip_blocks: ανάγνωση ευαίσθητων πληροφοριών όλων των αποκλεισμένων IP
-      admin:read:reports: ανάγνωση ευαίσθητων πληροφοριών όλων των καταγγελιών και των καταγγελλομένων λογαριασμών
-      admin:write: αλλαγή δεδομένων στον διακομιστή
-      admin:write:accounts: εκτέλεση διαχειριστικών ενεργειών σε λογαριασμούς
-      admin:write:canonical_email_blocks: εκτέλεση ενεργειών διαχείρισης σε αποκλεισμένα email
-      admin:write:domain_allows: εκτέλεση ενεργειών διαχείρισης σε επιτρεπτούς τομείς
-      admin:write:domain_blocks: εκτέλεση ενεργειών διαχείρισης σε αποκλεισμένους τομείς
-      admin:write:email_domain_blocks: εκτελέστε ενέργειες διαχείρισης σε αποκλεισμένους τομείς email
-      admin:write:ip_blocks: εκτέλεση ενεργειών διαχείρισης σε αποκλεισμένες IP
-      admin:write:reports: εκτέλεση διαχειριστικών ενεργειών σε καταγγελίες
+      admin:read:reports: ανάγνωση ευαίσθητων πληροφοριών όλων των αναφορών και των αναφερομένων λογαριασμών
+      admin:write: τροποποίηση όλων των δεδομένων στον διακομιστή
+      admin:write:accounts: εκτέλεση συντονιστικών ενεργειών σε λογαριασμούς
+      admin:write:canonical_email_blocks: εκτέλεση ενεργειών συντονισμού σε αποκλεισμένα email
+      admin:write:domain_allows: εκτέλεση ενεργειών συντονισμού σε επιτρεπτούς τομείς
+      admin:write:domain_blocks: εκτέλεση ενεργειών συντονισμού σε αποκλεισμένους τομείς
+      admin:write:email_domain_blocks: εκτέλεση ενέργειες συντονισμού σε αποκλεισμένους τομείς email
+      admin:write:ip_blocks: εκτέλεση ενεργειών συντονισμού σε αποκλεισμένες IP
+      admin:write:reports: εκτέλεση ενεργειών συντονισμού σε αναφορές
       crypto: χρήση κρυπτογράφησης από άκρο σε άκρο
-      follow: να αλλάζει τις σχέσεις με λογαριασμούς
-      push: να λαμβάνει τις ειδοποιήσεις σου
-      read: να διαβάζει όλα τα στοιχεία του λογαριασμού σου
-      read:accounts: να βλέπει τα στοιχεία λογαριασμών
-      read:blocks: να βλέπει τους αποκλεισμένους σου
-      read:bookmarks: εμφάνιση των σελιδοδεικτών σας
-      read:favourites: δείτε τα αγαπημένα σας
-      read:filters: να βλέπει τα φίλτρα σου
-      read:follows: δές ποιους ακολουθείς
-      read:lists: δές τις λίστες σου
-      read:mutes: να βλέπει ποιους αποσιωπείς
-      read:notifications: να βλέπει τις ειδοποιήσεις σου
-      read:reports: να βλέπει τις καταγγελίες σου
-      read:search: να ψάχνει για εσένα
+      follow: τροποποίηση σχέσεων λογαριασμών
+      profile: ανάγνωση μόνο των πληροφοριών προφίλ του λογαριασμού σου
+      push: λήψη των ειδοποιήσεων σου
+      read: ανάγνωση όλων των στοιχείων του λογαριασμού σου
+      read:accounts: προβολή πληροφοριών λογαριασμών
+      read:blocks: προβολή των αποκλεισμών σου
+      read:bookmarks: προβολή των σελιδοδεικτών σου
+      read:favourites: προβολή των αγαπημένα σου
+      read:filters: προβολή των φίλτρων σου
+      read:follows: προβολή αυτών που ακολουθείς
+      read:lists: προβολή των λιστών σου
+      read:mutes: προβολή των σιγάσεων σου
+      read:notifications: προβολή των ειδοποιήσεων σου
+      read:reports: προβολή των αναφορών σου
+      read:search: αναζήτηση εκ μέρους σου
       read:statuses: να βλέπει όλες τις δημοσιεύσεις σου
       write: να αλλάζει όλα τα στοιχεία του λογαριασμού σου
       write:accounts: να αλλάζει το προφίλ σου
       write:blocks: να μπλοκάρει λογαριασμούς και τομείς
       write:bookmarks: προσθήκη σελιδοδεικτών
       write:conversations: σίγαση και διαγραφή συνομιλιών
+      write:favourites: αγαπημένες αναρτήσεις
       write:filters: να δημιουργεί φίλτρα
       write:follows: ακολουθήστε ανθρώπους
       write:lists: δημιουργία λιστών
diff --git a/config/locales/doorkeeper.kab.yml b/config/locales/doorkeeper.kab.yml
index 33aecd8c6f03d7..d79c711e609f59 100644
--- a/config/locales/doorkeeper.kab.yml
+++ b/config/locales/doorkeeper.kab.yml
@@ -111,9 +111,9 @@ kab:
         lists: Tibdarin
         media: Imeddayen n umidya
         mutes: Yeggugem
-        notifications: Tilɣa
+        notifications: Alɣuten
         profile: Amaɣnu-k Mastodon
-        push: Tilɣa yettudemmren
+        push: Alɣuten yettudemmren
         reports: Ineqqisen
         search: Nadi
         statuses: Tisuffaɣ
@@ -127,7 +127,7 @@ kab:
       admin:read: ad iɣeṛ akk isefka ɣef uqeddac
       admin:write: ẓreg akk isefka γef uqeddac
       follow: beddel assaγen n umiḍan
-      push: ṭṭef-d tilγa-ik yettwademren
+      push: ṭṭef-d alɣuten-ik·im yettwademren
       read: γeṛ akk isefka n umiḍan-ik
       read:accounts: ẓer isallen n yimiḍanen
       read:blocks: ẓer imiḍanen i tesḥebseḍ
@@ -136,7 +136,7 @@ kab:
       read:follows: ẓer imeḍfaṛen-ik
       read:lists: ẓer tibdarin-ik·im
       read:mutes: ẓer wid i tesgugmeḍ
-      read:notifications: ad ẓer tilɣa-inek·inem
+      read:notifications: ad iẓer alɣuten-inek·inem
       read:reports: ẓer ineqqisen-ik·im
       read:search: anadi deg umkan-ik·im
       read:statuses: ẓer meṛṛa tisuffaɣ
@@ -148,4 +148,4 @@ kab:
       write:follows: ḍfeṛ imdanen
       write:lists: ad yesnulfu tibdarin
       write:media: ad yessali ifuyla n umidya
-      write:notifications: sfeḍ tilɣa-k·m
+      write:notifications: sfeḍ alɣuten-ik·im
diff --git a/config/locales/el.yml b/config/locales/el.yml
index 47b2250f0e04e3..e177bf342afc75 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -5,14 +5,14 @@ el:
     contact_missing: Δεν έχει οριστεί
     contact_unavailable: Μη διαθέσιμο
     hosted_on: Το Mastodon φιλοξενείται στο %{domain}
-    title: Σχετικά με
+    title: Σχετικά
   accounts:
     follow: Ακολούθησε
     followers:
       one: Ακόλουθος
       other: Ακόλουθοι
     following: Ακολουθείτε
-    instance_actor_flash: Αυτός ο λογαριασμός είναι εικονικός και χρησιμοποιείται για να αντιπροσωπεύει τον ίδιο τον διακομιστή και όχι κάποιον μεμονωμένο χρήστη. Χρησιμοποιείται για σκοπούς συναλλαγών και δεν πρέπει να ανασταλεί.
+    instance_actor_flash: Αυτός ο λογαριασμός είναι εικονικός και χρησιμοποιείται για να αντιπροσωπεύει τον ίδιο τον διακομιστή και όχι κάποιον μεμονωμένο χρήστη. Χρησιμοποιείται για σκοπούς ομοσπονδίας και δεν πρέπει να ανασταλεί.
     last_active: τελευταία ενεργός/ή
     link_verified_on: Η ιδιοκτησία αυτού του συνδέσμου ελέγχθηκε στις %{date}
     nothing_here: Δεν υπάρχει τίποτα εδώ!
@@ -159,7 +159,7 @@ el:
       unconfirmed_email: Ανεπιβεβαίωτο email
       undo_sensitized: Άρση ευαίσθητου
       undo_silenced: Άρση περιορισμού
-      undo_suspension: Αναίρεση παύσης
+      undo_suspension: Αναίρεση αναστολής
       unsilenced_msg: Επιτυχής άρση περιορισμών λογαριασμού του/της %{username}
       unsubscribe: Κατάργηση εγγραφής
       unsuspended_msg: Επιτυχής άρση αναστολής λογαριασμού του/της %{username}
@@ -167,7 +167,7 @@ el:
       view_domain: Προβολή περίληψης τομέα
       warn: Προειδοποίηση
       web: Διαδίκτυο
-      whitelisted: Εγκεκριμένοι για συναλλαγές
+      whitelisted: Εγκεκριμένοι για ομοσπονδία
     action_logs:
       action_types:
         approve_appeal: Έγκριση Έφεσης
@@ -185,7 +185,7 @@ el:
         create_email_domain_block: Δημουργία Αποκλεισμού Τομέα email
         create_ip_block: Δημιουργία κανόνα IP
         create_unavailable_domain: Δημιουργία Μη Διαθέσιμου Τομέα
-        create_user_role: Δημιουργία ρόλου
+        create_user_role: Δημιουργία Ρόλου
         demote_user: Υποβιβασμός Χρήστη
         destroy_announcement: Διαγραφή Ανακοίνωσης
         destroy_canonical_email_block: Διαγραφή Αποκλεισμού email
@@ -226,6 +226,7 @@ el:
         update_custom_emoji: Ενημέρωση Προσαρμοσμένου Emoji
         update_domain_block: Ενημέρωση Αποκλεισμού Τομέα
         update_ip_block: Ενημέρωση κανόνα IP
+        update_report: Ενημέρωση Αναφοράς
         update_status: Ενημέρωση Ανάρτησης
         update_user_role: Ενημέρωση ρόλου
       actions:
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 2d10250f68e134..c93c5edc0e664e 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -606,7 +606,7 @@ fi:
       are_you_sure: Oletko varma?
       assign_to_self: Ota tehtäväksi
       assigned: Määritetty valvoja
-      by_target_domain: Ilmoitetun tilin verkkotunnus
+      by_target_domain: Raportoidun tilin verkkotunnus
       cancel: Peruuta
       category: Luokka
       category_description_html: Syy siihen, miksi tämä tili ja/tai sisältö raportoitiin, mainitaan ilmoitetun tilin kanssa viestiessä
@@ -638,13 +638,13 @@ fi:
       reopen: Avaa raportti uudestaan
       report: Raportti nro %{id}
       reported_account: Raportoitu tili
-      reported_by: Raportoija
+      reported_by: Raportoinut
       resolved: Ratkaistut
       resolved_msg: Raportti onnistuneesti ratkaistu!
       skip_to_actions: Siirry toimintoihin
       status: Tila
       statuses: Raportoitu sisältö
-      statuses_description_html: Loukkaava sisältö mainitaan ilmoitetun tilin yhteydessä
+      statuses_description_html: Loukkaava sisältö mainitaan raportoidun tilin yhteydessä
       summary:
         action_preambles:
           delete_html: 'Olet aikeissa <strong>poistaa</strong> käyttäjän <strong>@%{acct}</strong> julkaisuja. Tästä seuraa:'
diff --git a/config/locales/is.yml b/config/locales/is.yml
index 7ac50cd572dde4..a4cc282d1d770c 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -226,6 +226,7 @@ is:
         update_custom_emoji: Uppfæra sérsniðið tjáningartákn
         update_domain_block: Uppfæra útilokun léns
         update_ip_block: Uppfæra reglu IP-vistfangs
+        update_report: Uppfæra kæru
         update_status: Uppfæra færslu
         update_user_role: Uppfæra hlutverk
       actions:
@@ -638,6 +639,7 @@ is:
       report: 'Kæra #%{id}'
       reported_account: Kærður notandaaðgangur
       reported_by: Kært af
+      reported_with_application: Kærði með forritinu
       resolved: Leyst
       resolved_msg: Það tókst að leysa kæruna!
       skip_to_actions: Sleppa og fara í aðgerðir
diff --git a/config/locales/kab.yml b/config/locales/kab.yml
index b2fc9d847735f6..a094936aaf0b38 100644
--- a/config/locales/kab.yml
+++ b/config/locales/kab.yml
@@ -604,7 +604,7 @@ kab:
   filters:
     contexts:
       account: Imeɣna
-      notifications: Ilɣa
+      notifications: Alɣuten
       thread: Idiwenniyen
     edit:
       add_keyword: Rnu awal tasarut
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 3b88dd95282de0..91872754f5cd9b 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -639,6 +639,7 @@ nl:
       report: 'Rapportage #%{id}'
       reported_account: Gerapporteerde account
       reported_by: Gerapporteerd door
+      reported_with_application: Gerapporteerd met applicatie
       resolved: Opgelost
       resolved_msg: Rapportage succesvol opgelost!
       skip_to_actions: Ga direct naar de maatregelen
diff --git a/config/locales/simple_form.ja.yml b/config/locales/simple_form.ja.yml
index 56b17ab000718b..a4bd9565081272 100644
--- a/config/locales/simple_form.ja.yml
+++ b/config/locales/simple_form.ja.yml
@@ -243,11 +243,13 @@ ja:
           warn: 警告付きで隠す
       form_admin_settings:
         activity_api_enabled: APIでユーザーアクティビティに関する集計統計を公開する
+        app_icon: アプリアイコン
         backups_retention_period: ユーザーアーカイブの保持期間
         bootstrap_timeline_accounts: おすすめユーザーに常に表示するアカウント
         closed_registrations_message: アカウント作成を停止している時のカスタムメッセージ
         content_cache_retention_period: リモートコンテンツの保存期間
         custom_css: カスタムCSS
+        favicon: ブックマークアイコン
         mascot: カスタムマスコット（レガシー）
         media_cache_retention_period: メディアキャッシュの保持期間
         peers_api_enabled: 発見したサーバーのリストをAPIで公開する
diff --git a/config/locales/simple_form.kab.yml b/config/locales/simple_form.kab.yml
index e68355da6a9f24..b4c0e0032bb3f5 100644
--- a/config/locales/simple_form.kab.yml
+++ b/config/locales/simple_form.kab.yml
@@ -11,14 +11,14 @@ kab:
       account_migration:
         acct: Sekcem isem n umseqdac@taγult n umiḍan anida itebγiḍ ad gujjeḍ
       admin_account_action:
-        send_email_notification: Amseqdac ad t-id-yewweḍ usefhem γef wayen yeḍran akked umiḍan-is
+        send_email_notification: Amseqdac ad t-id-yewweḍ usefhem ɣef wayen yeḍran akked umiḍan-is
         type_html: Fren d acu ara txedmeḍ s <strong>%{acct}</strong>
       defaults:
         autofollow: Imdanen ara ijerrden s usnebgi-inek, ad k-ḍefṛen s wudem awurman
         bot: Smekti-d wiyaḍ dakken amiḍan-a ixeddem s wudem amezwer tigawin tiwurmanin yernu ur yezmir ara ad yettwaɛass
         email: Ad n-teṭṭfeḍ imayl i usentem
         irreversible: Tisuffaɣ i tessazedgeḍ ad ttwakksent i lebda, ula ma tekkseḍ imsizdeg-nni ar zdat
-        locale: Tutlayt n ugrudem, imaylen d tilγa
+        locale: Tutlayt n ugrudem, imaylen d walɣuten yettudemren
         password: Seqdec ma drus 8 n yisekkilen
         setting_display_media_default: Ffer teywalt yettwacreḍ d tanafrit
         setting_display_media_hide_all: Ffer yal tikkelt akk taywalt
@@ -29,7 +29,7 @@ kab:
       imports:
         data: Afaylu CSV id yusan seg uqeddac-nniḍen n Maṣṭudun
       invite_request:
-        text: Aya ad aɣ-iɛiwen ad nessenqed tuttra-k•m
+        text: Aya ad aɣ-iɛiwen ad nessenqed tuttra-k·m
       ip_block:
         comment: D afrayan. Cfu ɣef wayɣer i terniḍ alugen-a.
         severities:
@@ -112,8 +112,8 @@ kab:
         theme: Asentel amezwer
         thumbnail: Tanfult n uqeddac
       interactions:
-        must_be_follower: Ssewḥel ilɣa sɣur wid akked tid ur yellin ara d imeḍfaren-ik·im
-        must_be_following: Ssewḥel ilɣa sɣur wid akked tid ur tettḍafareḍ ara
+        must_be_follower: Ssewḥel alɣuten sɣur wid akked tid ur yellin ara d imeḍfaren-ik·im
+        must_be_following: Ssewḥel alɣuten sɣur wid akked tid ur tettḍafareḍ ara
         must_be_following_dm: Sewḥel iznan usriden sɣur wid akked tid ur tettḍafareḍ ara
       invite:
         comment: Awennit
diff --git a/config/locales/simple_form.lad.yml b/config/locales/simple_form.lad.yml
index cef58e46016011..65647a77dbb47e 100644
--- a/config/locales/simple_form.lad.yml
+++ b/config/locales/simple_form.lad.yml
@@ -241,6 +241,7 @@ lad:
         bootstrap_timeline_accounts: Rekomenda siempre estos kuentos a muevos utilizadores
         closed_registrations_message: Mesaj personalizado kuando las enrejistrasyones no estan desponivles
         custom_css: CSS personalizado
+        favicon: Ikona de favoritos
         mascot: Maskota personalizada (legado)
         media_cache_retention_period: Periodo de retensyon de kashe multimedia
         peers_api_enabled: Publika lista de sirvidores diskuviertos en la API
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 69f5ca665c6362..a5cdcfefb4cc0e 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -663,6 +663,7 @@ uk:
       report: 'Скарга #%{id}'
       reported_account: Обліковий запис порушника
       reported_by: Відправник скарги
+      reported_with_application: Повідомлено через застосунок
       resolved: Вирішено
       resolved_msg: Скаргу успішно вирішено!
       skip_to_actions: Перейти до дій

From 6e4305de69bb3356d5d0038611052490527d3325 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 22 Jul 2024 04:02:31 -0400
Subject: [PATCH 1593/2191] Fix spec descriptions around configurable limit
 values (#31079)

---
 spec/models/account_spec.rb                    |  2 +-
 spec/validators/note_length_validator_spec.rb  | 18 +++++++++++++-----
 spec/validators/reaction_validator_spec.rb     |  5 +++--
 .../validators/status_length_validator_spec.rb | 18 +++++++++++++-----
 4 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb
index 5f918f159a848c..7153c7466e69f5 100644
--- a/spec/models/account_spec.rb
+++ b/spec/models/account_spec.rb
@@ -592,7 +592,7 @@
       expect(results).to eq [match]
     end
 
-    it 'limits by 10 by default' do
+    it 'limits result count by default value' do
       stub_const('Account::Search::DEFAULT_LIMIT', 1)
       2.times { Fabricate(:account, display_name: 'Display Name') }
       results = described_class.advanced_search_for('display', account)
diff --git a/spec/validators/note_length_validator_spec.rb b/spec/validators/note_length_validator_spec.rb
index 66fccad3ece3be..3bca93a283da2f 100644
--- a/spec/validators/note_length_validator_spec.rb
+++ b/spec/validators/note_length_validator_spec.rb
@@ -6,7 +6,7 @@
   subject { described_class.new(attributes: { note: true }, maximum: 500) }
 
   describe '#validate' do
-    it 'adds an error when text is over 500 characters' do
+    it 'adds an error when text is over configured character limit' do
       text = 'a' * 520
       account = instance_double(Account, note: text, errors: activemodel_errors)
 
@@ -14,16 +14,16 @@
       expect(account.errors).to have_received(:add)
     end
 
-    it 'counts URLs as 23 characters flat' do
-      text = ('a' * 476) + " http://#{'b' * 30}.com/example"
+    it 'reduces calculated length of auto-linkable space-separated URLs' do
+      text = [starting_string, example_link].join(' ')
       account = instance_double(Account, note: text, errors: activemodel_errors)
 
       subject.validate_each(account, 'note', text)
       expect(account.errors).to_not have_received(:add)
     end
 
-    it 'does not count non-autolinkable URLs as 23 characters flat' do
-      text = ('a' * 476) + "http://#{'b' * 30}.com/example"
+    it 'does not reduce calculated length of non-autolinkable URLs' do
+      text = [starting_string, example_link].join
       account = instance_double(Account, note: text, errors: activemodel_errors)
 
       subject.validate_each(account, 'note', text)
@@ -32,6 +32,14 @@
 
     private
 
+    def starting_string
+      'a' * 476
+    end
+
+    def example_link
+      "http://#{'b' * 30}.com/example"
+    end
+
     def activemodel_errors
       instance_double(ActiveModel::Errors, add: nil)
     end
diff --git a/spec/validators/reaction_validator_spec.rb b/spec/validators/reaction_validator_spec.rb
index d73104cb6928fa..f99c1cb5f93ddf 100644
--- a/spec/validators/reaction_validator_spec.rb
+++ b/spec/validators/reaction_validator_spec.rb
@@ -19,8 +19,9 @@
       expect(reaction.errors).to be_empty
     end
 
-    it 'adds error when 8 reactions already exist' do
-      %w(🐘 ❤️ 🙉 😍 😋 😂 😞 👍).each do |name|
+    it 'adds error when reaction limit count has already been reached' do
+      stub_const 'ReactionValidator::LIMIT', 2
+      %w(🐘 ❤️).each do |name|
         announcement.announcement_reactions.create!(name: name, account: Fabricate(:account))
       end
 
diff --git a/spec/validators/status_length_validator_spec.rb b/spec/validators/status_length_validator_spec.rb
index ead69dfe21df6e..249b90f4904e3d 100644
--- a/spec/validators/status_length_validator_spec.rb
+++ b/spec/validators/status_length_validator_spec.rb
@@ -42,23 +42,23 @@
       expect(status.errors).to have_received(:add)
     end
 
-    it 'counts URLs as 23 characters flat' do
-      text   = ('a' * 476) + " http://#{'b' * 30}.com/example"
+    it 'reduces calculated length of auto-linkable space-separated URLs' do
+      text = [starting_string, example_link].join(' ')
       status = status_double(text: text)
 
       subject.validate(status)
       expect(status.errors).to_not have_received(:add)
     end
 
-    it 'does not count non-autolinkable URLs as 23 characters flat' do
-      text   = ('a' * 476) + "http://#{'b' * 30}.com/example"
+    it 'does not reduce calculated length of non-autolinkable URLs' do
+      text = [starting_string, example_link].join
       status = status_double(text: text)
 
       subject.validate(status)
       expect(status.errors).to have_received(:add)
     end
 
-    it 'does not count overly long URLs as 23 characters flat' do
+    it 'does not reduce calculated length of count overly long URLs' do
       text = "http://example.com/valid?#{'#foo?' * 1000}"
       status = status_double(text: text)
       subject.validate(status)
@@ -84,6 +84,14 @@
 
   private
 
+  def starting_string
+    'a' * 476
+  end
+
+  def example_link
+    "http://#{'b' * 30}.com/example"
+  end
+
   def status_double(spoiler_text: '', text: '')
     instance_double(
       Status,

From ced5e853c7d7c7f2b849d904964ef92e93ad27c8 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 22 Jul 2024 10:56:05 +0200
Subject: [PATCH 1594/2191] Fix duplicate `orderedItems` in user archive's
 `outbox.json` (#31099)

---
 app/lib/activitypub/adapter.rb       |  2 +-
 app/services/backup_service.rb       |  6 +++---
 spec/lib/activitypub/adapter_spec.rb | 10 +++++-----
 spec/services/backup_service_spec.rb |  1 +
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/app/lib/activitypub/adapter.rb b/app/lib/activitypub/adapter.rb
index 098b6296fb053e..5b9437eb8dad40 100644
--- a/app/lib/activitypub/adapter.rb
+++ b/app/lib/activitypub/adapter.rb
@@ -20,6 +20,6 @@ def serializable_hash(options = nil)
     serialized_hash = serialized_hash.select { |k, _| options[:fields].include?(k) } if options[:fields]
     serialized_hash = self.class.transform_key_casing!(serialized_hash, instance_options)
 
-    { '@context' => serialized_context(named_contexts, context_extensions) }.merge(serialized_hash)
+    { '@context': serialized_context(named_contexts, context_extensions) }.merge(serialized_hash)
   end
 end
diff --git a/app/services/backup_service.rb b/app/services/backup_service.rb
index 1e9018437685f0..133a764873511c 100644
--- a/app/services/backup_service.rb
+++ b/app/services/backup_service.rb
@@ -19,8 +19,8 @@ def call(backup)
 
   def build_outbox_json!(file)
     skeleton = serialize(collection_presenter, ActivityPub::CollectionSerializer)
-    skeleton['@context'] = full_context
-    skeleton['orderedItems'] = ['!PLACEHOLDER!']
+    skeleton[:@context] = full_context
+    skeleton[:orderedItems] = ['!PLACEHOLDER!']
     skeleton = Oj.dump(skeleton)
     prepend, append = skeleton.split('"!PLACEHOLDER!"')
     add_comma = false
@@ -33,7 +33,7 @@ def build_outbox_json!(file)
 
       file.write(statuses.map do |status|
         item = serialize_payload(ActivityPub::ActivityPresenter.from_status(status), ActivityPub::ActivitySerializer)
-        item.delete('@context')
+        item.delete(:@context)
 
         unless item[:type] == 'Announce' || item[:object][:attachment].blank?
           item[:object][:attachment].each do |attachment|
diff --git a/spec/lib/activitypub/adapter_spec.rb b/spec/lib/activitypub/adapter_spec.rb
index 7d8d703ec2586b..5ecdfe812055fc 100644
--- a/spec/lib/activitypub/adapter_spec.rb
+++ b/spec/lib/activitypub/adapter_spec.rb
@@ -59,7 +59,7 @@ def virtual_object
       let(:serializer_class) { TestWithBasicContextSerializer }
 
       it 'renders a basic @context' do
-        expect(subject).to include({ '@context' => 'https://www.w3.org/ns/activitystreams' })
+        expect(subject).to include({ '@context': 'https://www.w3.org/ns/activitystreams' })
       end
     end
 
@@ -67,7 +67,7 @@ def virtual_object
       let(:serializer_class) { TestWithNamedContextSerializer }
 
       it 'renders a @context with both items' do
-        expect(subject).to include({ '@context' => ['https://www.w3.org/ns/activitystreams', 'https://w3id.org/security/v1'] })
+        expect(subject).to include({ '@context': ['https://www.w3.org/ns/activitystreams', 'https://w3id.org/security/v1'] })
       end
     end
 
@@ -75,7 +75,7 @@ def virtual_object
       let(:serializer_class) { TestWithNestedNamedContextSerializer }
 
       it 'renders a @context with both items' do
-        expect(subject).to include({ '@context' => ['https://www.w3.org/ns/activitystreams', 'https://w3id.org/security/v1'] })
+        expect(subject).to include({ '@context': ['https://www.w3.org/ns/activitystreams', 'https://w3id.org/security/v1'] })
       end
     end
 
@@ -83,7 +83,7 @@ def virtual_object
       let(:serializer_class) { TestWithContextExtensionSerializer }
 
       it 'renders a @context with the extension' do
-        expect(subject).to include({ '@context' => ['https://www.w3.org/ns/activitystreams', { 'sensitive' => 'as:sensitive' }] })
+        expect(subject).to include({ '@context': ['https://www.w3.org/ns/activitystreams', { 'sensitive' => 'as:sensitive' }] })
       end
     end
 
@@ -91,7 +91,7 @@ def virtual_object
       let(:serializer_class) { TestWithNestedContextExtensionSerializer }
 
       it 'renders a @context with both extensions' do
-        expect(subject).to include({ '@context' => ['https://www.w3.org/ns/activitystreams', { 'manuallyApprovesFollowers' => 'as:manuallyApprovesFollowers', 'sensitive' => 'as:sensitive' }] })
+        expect(subject).to include({ '@context': ['https://www.w3.org/ns/activitystreams', { 'manuallyApprovesFollowers' => 'as:manuallyApprovesFollowers', 'sensitive' => 'as:sensitive' }] })
       end
     end
   end
diff --git a/spec/services/backup_service_spec.rb b/spec/services/backup_service_spec.rb
index 145b06e3722ca9..878405a0fec9dc 100644
--- a/spec/services/backup_service_spec.rb
+++ b/spec/services/backup_service_spec.rb
@@ -60,6 +60,7 @@ def expect_outbox_export
 
     aggregate_failures do
       expect(body.scan('@context').count).to eq 1
+      expect(body.scan('orderedItems').count).to eq 1
       expect(json['@context']).to_not be_nil
       expect(json['type']).to eq 'OrderedCollection'
       expect(json['totalItems']).to eq 2

From 80d9bff6df137afc3376f47b62d10a2e3e9456e2 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 22 Jul 2024 15:39:37 +0200
Subject: [PATCH 1595/2191] fix(deps): update dependency immutable to v4.3.7
 (#31100)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index bd6efa72fe18a0..04e233c3c30e41 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9621,9 +9621,9 @@ __metadata:
   linkType: hard
 
 "immutable@npm:^4.0.0, immutable@npm:^4.0.0-rc.1, immutable@npm:^4.3.0":
-  version: 4.3.6
-  resolution: "immutable@npm:4.3.6"
-  checksum: 10c0/7d0952a768b4fadcee47230ed86dc9505a4517095eceaf5a47e65288571c42400c6e4a2ae21eca4eda957cb7bc50720213135b62cf6a181639111f8acae128c3
+  version: 4.3.7
+  resolution: "immutable@npm:4.3.7"
+  checksum: 10c0/9b099197081b22f6433003e34929da8ecddbbdc1474cdc8aa3b7669dee4adda349c06143de22def36016d1b6de5322b043eccd7a11db1dad2ca85dad4fff5435
   languageName: node
   linkType: hard
 

From 03dea64b794f3e6cd1e03df72578ed0004a4d84c Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 22 Jul 2024 17:45:07 +0200
Subject: [PATCH 1596/2191] Refactor code for reblogging and favouriting
 (#31102)

---
 .../mastodon/actions/interactions.js          | 50 +++++++++++++++++++
 .../mastodon/containers/status_container.jsx  | 28 ++---------
 .../containers/notification_container.js      | 28 ++---------
 .../picture_in_picture/components/footer.jsx  | 23 ++-------
 .../containers/detailed_status_container.js   | 28 ++---------
 .../mastodon/features/status/index.jsx        | 28 ++---------
 6 files changed, 73 insertions(+), 112 deletions(-)

diff --git a/app/javascript/mastodon/actions/interactions.js b/app/javascript/mastodon/actions/interactions.js
index 57f2459c016fa4..9d39b7a57facea 100644
--- a/app/javascript/mastodon/actions/interactions.js
+++ b/app/javascript/mastodon/actions/interactions.js
@@ -1,7 +1,11 @@
+import { boostModal } from 'mastodon/initial_state';
+
 import api, { getLinks } from '../api';
 
 import { fetchRelationships } from './accounts';
 import { importFetchedAccounts, importFetchedStatus } from './importer';
+import { unreblog, reblog } from './interactions_typed';
+import { openModal } from './modal';
 
 export const REBLOGS_EXPAND_REQUEST = 'REBLOGS_EXPAND_REQUEST';
 export const REBLOGS_EXPAND_SUCCESS = 'REBLOGS_EXPAND_SUCCESS';
@@ -432,3 +436,49 @@ export function unpinFail(status, error) {
     skipLoading: true,
   };
 }
+
+function toggleReblogWithoutConfirmation(status, privacy) {
+  return (dispatch) => {
+    if (status.get('reblogged')) {
+      dispatch(unreblog({ statusId: status.get('id') }));
+    } else {
+      dispatch(reblog({ statusId: status.get('id'), privacy }));
+    }
+  };
+}
+
+export function toggleReblog(statusId, skipModal = false) {
+  return (dispatch, getState) => {
+    const state = getState();
+    let status = state.statuses.get(statusId);
+
+    if (!status)
+      return;
+
+    // The reblog modal expects a pre-filled account in status
+    // TODO: fix this by having the reblog modal get a statusId and do the work itself
+    status = status.set('account', state.accounts.get(status.get('account')));
+
+    if (boostModal && !skipModal) {
+      dispatch(openModal({ modalType: 'BOOST', modalProps: { status, onReblog: toggleReblogWithoutConfirmation } }));
+    } else {
+      toggleReblogWithoutConfirmation(status);
+    }
+  };
+}
+
+export function toggleFavourite(statusId) {
+  return (dispatch, getState) => {
+    const state = getState();
+    const status = state.statuses.get(statusId);
+
+    if (!status)
+      return;
+
+    if (status.get('favourited')) {
+      dispatch(unfavourite(status));
+    } else {
+      dispatch(favourite(status));
+    }
+  };
+}
diff --git a/app/javascript/mastodon/containers/status_container.jsx b/app/javascript/mastodon/containers/status_container.jsx
index e2c0af35337be7..8e34ace87396fd 100644
--- a/app/javascript/mastodon/containers/status_container.jsx
+++ b/app/javascript/mastodon/containers/status_container.jsx
@@ -21,11 +21,9 @@ import {
   initAddFilter,
 } from '../actions/filters';
 import {
-  reblog,
-  favourite,
+  toggleReblog,
+  toggleFavourite,
   bookmark,
-  unreblog,
-  unfavourite,
   unbookmark,
   pin,
   unpin,
@@ -46,7 +44,7 @@ import {
   undoStatusTranslation,
 } from '../actions/statuses';
 import Status from '../components/status';
-import { boostModal, deleteModal } from '../initial_state';
+import { deleteModal } from '../initial_state';
 import { makeGetStatus, makeGetPictureInPicture } from '../selectors';
 
 const messages = defineMessages({
@@ -94,28 +92,12 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
     });
   },
 
-  onModalReblog (status, privacy) {
-    if (status.get('reblogged')) {
-      dispatch(unreblog({ statusId: status.get('id') }));
-    } else {
-      dispatch(reblog({ statusId: status.get('id'), visibility: privacy }));
-    }
-  },
-
   onReblog (status, e) {
-    if ((e && e.shiftKey) || !boostModal) {
-      this.onModalReblog(status);
-    } else {
-      dispatch(openModal({ modalType: 'BOOST', modalProps: { status, onReblog: this.onModalReblog } }));
-    }
+    dispatch(toggleReblog(status.get('id'), e.shiftKey));
   },
 
   onFavourite (status) {
-    if (status.get('favourited')) {
-      dispatch(unfavourite(status));
-    } else {
-      dispatch(favourite(status));
-    }
+    dispatch(toggleFavourite(status.get('id')));
   },
 
   onBookmark (status) {
diff --git a/app/javascript/mastodon/features/notifications/containers/notification_container.js b/app/javascript/mastodon/features/notifications/containers/notification_container.js
index 7b7e6e919c5f5e..98a3cf8b1ed959 100644
--- a/app/javascript/mastodon/features/notifications/containers/notification_container.js
+++ b/app/javascript/mastodon/features/notifications/containers/notification_container.js
@@ -2,17 +2,13 @@ import { connect } from 'react-redux';
 
 import { mentionCompose } from '../../../actions/compose';
 import {
-  reblog,
-  favourite,
-  unreblog,
-  unfavourite,
+  toggleFavourite,
+  toggleReblog,
 } from '../../../actions/interactions';
-import { openModal } from '../../../actions/modal';
 import {
   hideStatus,
   revealStatus,
 } from '../../../actions/statuses';
-import { boostModal } from '../../../initial_state';
 import { makeGetNotification, makeGetStatus, makeGetReport } from '../../../selectors';
 import Notification from '../components/notification';
 
@@ -38,28 +34,12 @@ const mapDispatchToProps = dispatch => ({
     dispatch(mentionCompose(account));
   },
 
-  onModalReblog (status, privacy) {
-    dispatch(reblog({ statusId: status.get('id'), visibility: privacy }));
-  },
-
   onReblog (status, e) {
-    if (status.get('reblogged')) {
-      dispatch(unreblog({ statusId: status.get('id') }));
-    } else {
-      if (e.shiftKey || !boostModal) {
-        this.onModalReblog(status);
-      } else {
-        dispatch(openModal({ modalType: 'BOOST', modalProps: { status, onReblog: this.onModalReblog } }));
-      }
-    }
+    dispatch(toggleReblog(status.get('id'), e.shiftKey));
   },
 
   onFavourite (status) {
-    if (status.get('favourited')) {
-      dispatch(unfavourite(status));
-    } else {
-      dispatch(favourite(status));
-    }
+    dispatch(toggleFavourite(status.get('id')));
   },
 
   onToggleHidden (status) {
diff --git a/app/javascript/mastodon/features/picture_in_picture/components/footer.jsx b/app/javascript/mastodon/features/picture_in_picture/components/footer.jsx
index 8404bf61b77aeb..d5226eb3461987 100644
--- a/app/javascript/mastodon/features/picture_in_picture/components/footer.jsx
+++ b/app/javascript/mastodon/features/picture_in_picture/components/footer.jsx
@@ -15,11 +15,11 @@ import ReplyIcon from '@/material-icons/400-24px/reply.svg?react';
 import ReplyAllIcon from '@/material-icons/400-24px/reply_all.svg?react';
 import StarIcon from '@/material-icons/400-24px/star.svg?react';
 import { replyCompose } from 'mastodon/actions/compose';
-import { reblog, favourite, unreblog, unfavourite } from 'mastodon/actions/interactions';
+import { toggleReblog, toggleFavourite } from 'mastodon/actions/interactions';
 import { openModal } from 'mastodon/actions/modal';
 import { IconButton } from 'mastodon/components/icon_button';
 import { identityContextPropShape, withIdentity } from 'mastodon/identity_context';
-import { me, boostModal } from 'mastodon/initial_state';
+import { me } from 'mastodon/initial_state';
 import { makeGetStatus } from 'mastodon/selectors';
 import { WithRouterPropTypes } from 'mastodon/utils/react_router';
 
@@ -104,11 +104,7 @@ class Footer extends ImmutablePureComponent {
     const { signedIn } = this.props.identity;
 
     if (signedIn) {
-      if (status.get('favourited')) {
-        dispatch(unfavourite(status));
-      } else {
-        dispatch(favourite(status));
-      }
+      dispatch(toggleFavourite(status.get('id')));
     } else {
       dispatch(openModal({
         modalType: 'INTERACTION',
@@ -121,23 +117,12 @@ class Footer extends ImmutablePureComponent {
     }
   };
 
-  _performReblog = (status, privacy) => {
-    const { dispatch } = this.props;
-    dispatch(reblog({ statusId: status.get('id'), visibility: privacy }));
-  };
-
   handleReblogClick = e => {
     const { dispatch, status } = this.props;
     const { signedIn } = this.props.identity;
 
     if (signedIn) {
-      if (status.get('reblogged')) {
-        dispatch(unreblog({ statusId: status.get('id') }));
-      } else if ((e && e.shiftKey) || !boostModal) {
-        this._performReblog(status);
-      } else {
-        dispatch(openModal({ modalType: 'BOOST', modalProps: { status, onReblog: this._performReblog } }));
-      }
+      dispatch(toggleReblog(status.get('id'), e && e.shiftKey));
     } else {
       dispatch(openModal({
         modalType: 'INTERACTION',
diff --git a/app/javascript/mastodon/features/status/containers/detailed_status_container.js b/app/javascript/mastodon/features/status/containers/detailed_status_container.js
index f85c3822d7cb18..f37860d25c8481 100644
--- a/app/javascript/mastodon/features/status/containers/detailed_status_container.js
+++ b/app/javascript/mastodon/features/status/containers/detailed_status_container.js
@@ -10,10 +10,8 @@ import {
   directCompose,
 } from '../../../actions/compose';
 import {
-  reblog,
-  favourite,
-  unreblog,
-  unfavourite,
+  toggleReblog,
+  toggleFavourite,
   pin,
   unpin,
 } from '../../../actions/interactions';
@@ -27,7 +25,7 @@ import {
   hideStatus,
   revealStatus,
 } from '../../../actions/statuses';
-import { boostModal, deleteModal } from '../../../initial_state';
+import { deleteModal } from '../../../initial_state';
 import { makeGetStatus, makeGetPictureInPicture } from '../../../selectors';
 import DetailedStatus from '../components/detailed_status';
 
@@ -73,28 +71,12 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
     });
   },
 
-  onModalReblog (status, privacy) {
-    dispatch(reblog({ statusId: status.get('id'), visibility: privacy }));
-  },
-
   onReblog (status, e) {
-    if (status.get('reblogged')) {
-      dispatch(unreblog({ statusId: status.get('id') }));
-    } else {
-      if (e.shiftKey || !boostModal) {
-        this.onModalReblog(status);
-      } else {
-        dispatch(openModal({ modalType: 'BOOST', modalProps: { status, onReblog: this.onModalReblog } }));
-      }
-    }
+    dispatch(toggleReblog(status.get('id'), e.shiftKey));
   },
 
   onFavourite (status) {
-    if (status.get('favourited')) {
-      dispatch(unfavourite(status));
-    } else {
-      dispatch(favourite(status));
-    }
+    dispatch(toggleFavourite(status.get('id')));
   },
 
   onPin (status) {
diff --git a/app/javascript/mastodon/features/status/index.jsx b/app/javascript/mastodon/features/status/index.jsx
index b0fbea9e2209dc..e9df3697a2ba9f 100644
--- a/app/javascript/mastodon/features/status/index.jsx
+++ b/app/javascript/mastodon/features/status/index.jsx
@@ -38,12 +38,10 @@ import {
   unblockDomain,
 } from '../../actions/domain_blocks';
 import {
-  favourite,
-  unfavourite,
+  toggleFavourite,
   bookmark,
   unbookmark,
-  reblog,
-  unreblog,
+  toggleReblog,
   pin,
   unpin,
 } from '../../actions/interactions';
@@ -64,7 +62,7 @@ import {
 import ColumnHeader from '../../components/column_header';
 import { textForScreenReader, defaultMediaVisibility } from '../../components/status';
 import StatusContainer from '../../containers/status_container';
-import { boostModal, deleteModal } from '../../initial_state';
+import { deleteModal } from '../../initial_state';
 import { makeGetStatus, makeGetPictureInPicture } from '../../selectors';
 import Column from '../ui/components/column';
 import { attachFullscreenListener, detachFullscreenListener, isFullscreen } from '../ui/util/fullscreen';
@@ -244,11 +242,7 @@ class Status extends ImmutablePureComponent {
     const { signedIn } = this.props.identity;
 
     if (signedIn) {
-      if (status.get('favourited')) {
-        dispatch(unfavourite(status));
-      } else {
-        dispatch(favourite(status));
-      }
+      dispatch(toggleFavourite(status.get('id')));
     } else {
       dispatch(openModal({
         modalType: 'INTERACTION',
@@ -298,24 +292,12 @@ class Status extends ImmutablePureComponent {
     }
   };
 
-  handleModalReblog = (status, privacy) => {
-    this.props.dispatch(reblog({ statusId: status.get('id'), visibility: privacy }));
-  };
-
   handleReblogClick = (status, e) => {
     const { dispatch } = this.props;
     const { signedIn } = this.props.identity;
 
     if (signedIn) {
-      if (status.get('reblogged')) {
-        dispatch(unreblog({ statusId: status.get('id') }));
-      } else {
-        if ((e && e.shiftKey) || !boostModal) {
-          this.handleModalReblog(status);
-        } else {
-          dispatch(openModal({ modalType: 'BOOST', modalProps: { status, onReblog: this.handleModalReblog } }));
-        }
-      }
+      dispatch(toggleReblog(status.get('id'), e && e.shiftKey));
     } else {
       dispatch(openModal({
         modalType: 'INTERACTION',

From 9cb94271333ccfe488fa84d49e3351f18594e480 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 22 Jul 2024 18:03:58 +0200
Subject: [PATCH 1597/2191] Refactor CW handling in an action (#31103)

---
 app/javascript/mastodon/actions/statuses.js       | 15 +++++++++++++++
 .../mastodon/containers/status_container.jsx      |  9 ++-------
 .../direct_timeline/components/conversation.jsx   |  8 ++------
 .../containers/notification_container.js          |  9 ++-------
 .../containers/detailed_status_container.js       |  9 ++-------
 5 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/app/javascript/mastodon/actions/statuses.js b/app/javascript/mastodon/actions/statuses.js
index 1907d3aa91ede1..26abaf1bccfaab 100644
--- a/app/javascript/mastodon/actions/statuses.js
+++ b/app/javascript/mastodon/actions/statuses.js
@@ -308,6 +308,21 @@ export function revealStatus(ids) {
   };
 }
 
+export function toggleStatusSpoilers(statusId) {
+  return (dispatch, getState) => {
+    const status = getState().statuses.get(statusId);
+
+    if (!status)
+      return;
+
+    if (status.get('hidden')) {
+      dispatch(revealStatus(statusId));
+    } else {
+      dispatch(hideStatus(statusId));
+    }
+  };
+}
+
 export function toggleStatusCollapse(id, isCollapsed) {
   return {
     type: STATUS_COLLAPSE,
diff --git a/app/javascript/mastodon/containers/status_container.jsx b/app/javascript/mastodon/containers/status_container.jsx
index 8e34ace87396fd..c803822dc057ff 100644
--- a/app/javascript/mastodon/containers/status_container.jsx
+++ b/app/javascript/mastodon/containers/status_container.jsx
@@ -36,8 +36,7 @@ import {
   muteStatus,
   unmuteStatus,
   deleteStatus,
-  hideStatus,
-  revealStatus,
+  toggleStatusSpoilers,
   toggleStatusCollapse,
   editStatus,
   translateStatus,
@@ -223,11 +222,7 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
   },
 
   onToggleHidden (status) {
-    if (status.get('hidden')) {
-      dispatch(revealStatus(status.get('id')));
-    } else {
-      dispatch(hideStatus(status.get('id')));
-    }
+    dispatch(toggleStatusSpoilers(status.get('id')));
   },
 
   onToggleCollapsed (status, isCollapsed) {
diff --git a/app/javascript/mastodon/features/direct_timeline/components/conversation.jsx b/app/javascript/mastodon/features/direct_timeline/components/conversation.jsx
index 63dc705e40bde8..326ea3e5ac4502 100644
--- a/app/javascript/mastodon/features/direct_timeline/components/conversation.jsx
+++ b/app/javascript/mastodon/features/direct_timeline/components/conversation.jsx
@@ -18,7 +18,7 @@ import ReplyIcon from '@/material-icons/400-24px/reply.svg?react';
 import { replyCompose } from 'mastodon/actions/compose';
 import { markConversationRead, deleteConversation } from 'mastodon/actions/conversations';
 import { openModal } from 'mastodon/actions/modal';
-import { muteStatus, unmuteStatus, revealStatus, hideStatus } from 'mastodon/actions/statuses';
+import { muteStatus, unmuteStatus, toggleStatusSpoilers } from 'mastodon/actions/statuses';
 import AttachmentList from 'mastodon/components/attachment_list';
 import AvatarComposite from 'mastodon/components/avatar_composite';
 import { IconButton } from 'mastodon/components/icon_button';
@@ -138,11 +138,7 @@ export const Conversation = ({ conversation, scrollKey, onMoveUp, onMoveDown })
   }, [dispatch, lastStatus]);
 
   const handleShowMore = useCallback(() => {
-    if (lastStatus.get('hidden')) {
-      dispatch(revealStatus(lastStatus.get('id')));
-    } else {
-      dispatch(hideStatus(lastStatus.get('id')));
-    }
+    dispatch(toggleStatusSpoilers(lastStatus.get('id')));
   }, [dispatch, lastStatus]);
 
   if (!lastStatus) {
diff --git a/app/javascript/mastodon/features/notifications/containers/notification_container.js b/app/javascript/mastodon/features/notifications/containers/notification_container.js
index 98a3cf8b1ed959..d64f2a679cfeb5 100644
--- a/app/javascript/mastodon/features/notifications/containers/notification_container.js
+++ b/app/javascript/mastodon/features/notifications/containers/notification_container.js
@@ -6,8 +6,7 @@ import {
   toggleReblog,
 } from '../../../actions/interactions';
 import {
-  hideStatus,
-  revealStatus,
+  toggleStatusSpoilers,
 } from '../../../actions/statuses';
 import { makeGetNotification, makeGetStatus, makeGetReport } from '../../../selectors';
 import Notification from '../components/notification';
@@ -43,11 +42,7 @@ const mapDispatchToProps = dispatch => ({
   },
 
   onToggleHidden (status) {
-    if (status.get('hidden')) {
-      dispatch(revealStatus(status.get('id')));
-    } else {
-      dispatch(hideStatus(status.get('id')));
-    }
+    dispatch(toggleStatusSpoilers(status.get('id')));
   },
 });
 
diff --git a/app/javascript/mastodon/features/status/containers/detailed_status_container.js b/app/javascript/mastodon/features/status/containers/detailed_status_container.js
index f37860d25c8481..5ab1013700adbd 100644
--- a/app/javascript/mastodon/features/status/containers/detailed_status_container.js
+++ b/app/javascript/mastodon/features/status/containers/detailed_status_container.js
@@ -22,8 +22,7 @@ import {
   muteStatus,
   unmuteStatus,
   deleteStatus,
-  hideStatus,
-  revealStatus,
+  toggleStatusSpoilers,
 } from '../../../actions/statuses';
 import { deleteModal } from '../../../initial_state';
 import { makeGetStatus, makeGetPictureInPicture } from '../../../selectors';
@@ -156,11 +155,7 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
   },
 
   onToggleHidden (status) {
-    if (status.get('hidden')) {
-      dispatch(revealStatus(status.get('id')));
-    } else {
-      dispatch(hideStatus(status.get('id')));
-    }
+    dispatch(toggleStatusSpoilers(status.get('id')));
   },
 
 });

From 55705d8191f31c1089095956fb4124f7505b4bd7 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 22 Jul 2024 21:30:06 +0200
Subject: [PATCH 1598/2191] Fix reblogging after refactor (#31105)

---
 app/javascript/mastodon/actions/interactions.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/javascript/mastodon/actions/interactions.js b/app/javascript/mastodon/actions/interactions.js
index 9d39b7a57facea..b296a5006ac55c 100644
--- a/app/javascript/mastodon/actions/interactions.js
+++ b/app/javascript/mastodon/actions/interactions.js
@@ -460,9 +460,9 @@ export function toggleReblog(statusId, skipModal = false) {
     status = status.set('account', state.accounts.get(status.get('account')));
 
     if (boostModal && !skipModal) {
-      dispatch(openModal({ modalType: 'BOOST', modalProps: { status, onReblog: toggleReblogWithoutConfirmation } }));
+      dispatch(openModal({ modalType: 'BOOST', modalProps: { status, onReblog: (status, privacy) => dispatch(toggleReblogWithoutConfirmation(status, privacy)) } }));
     } else {
-      toggleReblogWithoutConfirmation(status);
+      dispatch(toggleReblogWithoutConfirmation(status));
     }
   };
 }

From f13a231b3980f76fc5b105ac8e430599df19e956 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 22 Jul 2024 17:45:07 +0200
Subject: [PATCH 1599/2191] [Glitch] Refactor code for reblogging and
 favouriting

Port 03dea64b794f3e6cd1e03df72578ed0004a4d84c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/actions/interactions.js   | 62 +++++++++++++++++++
 .../glitch/containers/status_container.js     | 47 ++------------
 .../containers/notification_container.js      | 30 ++-------
 .../picture_in_picture/components/footer.jsx  | 25 ++------
 .../containers/detailed_status_container.js   | 30 ++-------
 .../flavours/glitch/features/status/index.jsx | 47 ++------------
 6 files changed, 89 insertions(+), 152 deletions(-)

diff --git a/app/javascript/flavours/glitch/actions/interactions.js b/app/javascript/flavours/glitch/actions/interactions.js
index 57f2459c016fa4..6790d3313b0291 100644
--- a/app/javascript/flavours/glitch/actions/interactions.js
+++ b/app/javascript/flavours/glitch/actions/interactions.js
@@ -1,7 +1,11 @@
+import { boostModal, favouriteModal } from 'flavours/glitch/initial_state';
+
 import api, { getLinks } from '../api';
 
 import { fetchRelationships } from './accounts';
 import { importFetchedAccounts, importFetchedStatus } from './importer';
+import { unreblog, reblog } from './interactions_typed';
+import { openModal } from './modal';
 
 export const REBLOGS_EXPAND_REQUEST = 'REBLOGS_EXPAND_REQUEST';
 export const REBLOGS_EXPAND_SUCCESS = 'REBLOGS_EXPAND_SUCCESS';
@@ -432,3 +436,61 @@ export function unpinFail(status, error) {
     skipLoading: true,
   };
 }
+
+function toggleReblogWithoutConfirmation(status, privacy) {
+  return (dispatch) => {
+    if (status.get('reblogged')) {
+      dispatch(unreblog({ statusId: status.get('id') }));
+    } else {
+      dispatch(reblog({ statusId: status.get('id'), privacy }));
+    }
+  };
+}
+
+export function toggleReblog(statusId, skipModal = false) {
+  return (dispatch, getState) => {
+    const state = getState();
+    let status = state.statuses.get(statusId);
+
+    if (!status)
+      return;
+
+    // The reblog modal expects a pre-filled account in status
+    // TODO: fix this by having the reblog modal get a statusId and do the work itself
+    status = status.set('account', state.accounts.get(status.get('account')));
+
+    const missing_description_setting = state.getIn(['local_settings', 'confirm_boost_missing_media_description']);
+    const missing_description = status.get('media_attachments').some(item => !item.get('description'));
+    if (missing_description_setting && missing_description && !status.get('reblogged')) {
+      dispatch(openModal({ modalType: 'BOOST', modalProps: { status, onReblog: toggleReblogWithoutConfirmation, missingMediaDescription: true } }));
+    } else if (boostModal && !skipModal) {
+      dispatch(openModal({ modalType: 'BOOST', modalProps: { status, onReblog: toggleReblogWithoutConfirmation } }));
+    } else {
+      toggleReblogWithoutConfirmation(status);
+    }
+  };
+}
+
+export function toggleFavourite(statusId, skipModal = false) {
+  return (dispatch, getState) => {
+    const state = getState();
+    let status = state.statuses.get(statusId);
+
+    if (!status)
+      return;
+
+    // The favourite modal expects a pre-filled account in status
+    // TODO: fix this by having the reblog modal get a statusId and do the work itself
+    status = status.set('account', state.accounts.get(status.get('account')));
+
+    if (status.get('favourited')) {
+      dispatch(unfavourite(status));
+    } else {
+      if (favouriteModal && !skipModal) {
+        dispatch(openModal({ modalType: 'FAVOURITE', modalProps: { status, onFavourite: (status) => dispatch(favourite(status)) } }));
+      } else {
+        dispatch(favourite(status));
+      }
+    }
+  };
+}
diff --git a/app/javascript/flavours/glitch/containers/status_container.js b/app/javascript/flavours/glitch/containers/status_container.js
index a05ed5fe4fce86..aac18eac0d8997 100644
--- a/app/javascript/flavours/glitch/containers/status_container.js
+++ b/app/javascript/flavours/glitch/containers/status_container.js
@@ -12,11 +12,9 @@ import {
   initAddFilter,
 } from 'flavours/glitch/actions/filters';
 import {
-  reblog,
-  favourite,
+  toggleReblog,
+  toggleFavourite,
   bookmark,
-  unreblog,
-  unfavourite,
   unbookmark,
   pin,
   unpin,
@@ -37,7 +35,7 @@ import {
   undoStatusTranslation,
 } from 'flavours/glitch/actions/statuses';
 import Status from 'flavours/glitch/components/status';
-import { boostModal, favouriteModal, deleteModal } from 'flavours/glitch/initial_state';
+import { deleteModal } from 'flavours/glitch/initial_state';
 import { makeGetStatus, makeGetPictureInPicture } from 'flavours/glitch/selectors';
 
 import { showAlertForError } from '../actions/alerts';
@@ -113,25 +111,8 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
     });
   },
 
-  onModalReblog (status, privacy) {
-    if (status.get('reblogged')) {
-      dispatch(unreblog({ statusId: status.get('id') }));
-    } else {
-      dispatch(reblog({ statusId: status.get('id'), visibility: privacy }));
-    }
-  },
-
   onReblog (status, e) {
-    dispatch((_, getState) => {
-      let state = getState();
-      if (state.getIn(['local_settings', 'confirm_boost_missing_media_description']) && status.get('media_attachments').some(item => !item.get('description')) && !status.get('reblogged')) {
-        dispatch(openModal({ modalType: 'BOOST', modalProps: { status, onReblog: this.onModalReblog, missingMediaDescription: true } }));
-      } else if (e.shiftKey || !boostModal) {
-        this.onModalReblog(status);
-      } else {
-        dispatch(openModal({ modalType: 'BOOST', modalProps: { status, onReblog: this.onModalReblog } }));
-      }
-    });
+    dispatch(toggleReblog(status.get('id'), e.shiftKey));
   },
 
   onBookmark (status) {
@@ -142,26 +123,8 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
     }
   },
 
-  onModalFavourite (status) {
-    dispatch(favourite(status));
-  },
-
   onFavourite (status, e) {
-    if (status.get('favourited')) {
-      dispatch(unfavourite(status));
-    } else {
-      if (e.shiftKey || !favouriteModal) {
-        this.onModalFavourite(status);
-      } else {
-        dispatch(openModal({
-          modalType: 'FAVOURITE',
-          modalProps: {
-            status,
-            onFavourite: this.onModalFavourite,
-          },
-        }));
-      }
-    }
+    dispatch(toggleFavourite(status.get('id'), e.shiftKey));
   },
 
   onPin (status) {
diff --git a/app/javascript/flavours/glitch/features/notifications/containers/notification_container.js b/app/javascript/flavours/glitch/features/notifications/containers/notification_container.js
index b4df05b828a970..8ecea4bc735731 100644
--- a/app/javascript/flavours/glitch/features/notifications/containers/notification_container.js
+++ b/app/javascript/flavours/glitch/features/notifications/containers/notification_container.js
@@ -2,13 +2,9 @@ import { connect } from 'react-redux';
 
 import { mentionCompose } from '../../../actions/compose';
 import {
-  reblog,
-  favourite,
-  unreblog,
-  unfavourite,
+  toggleReblog,
+  toggleFavourite,
 } from '../../../actions/interactions';
-import { openModal } from '../../../actions/modal';
-import { boostModal } from '../../../initial_state';
 import { makeGetNotification, makeGetStatus, makeGetReport } from '../../../selectors';
 import Notification from '../components/notification';
 
@@ -35,28 +31,12 @@ const mapDispatchToProps = dispatch => ({
     dispatch(mentionCompose(account));
   },
 
-  onModalReblog (status, privacy) {
-    dispatch(reblog({ statusId: status.get('id'), visibility: privacy }));
-  },
-
   onReblog (status, e) {
-    if (status.get('reblogged')) {
-      dispatch(unreblog({ statusId: status.get('id') }));
-    } else {
-      if (e.shiftKey || !boostModal) {
-        this.onModalReblog(status);
-      } else {
-        dispatch(openModal({ modalType: 'BOOST', modalProps: { status, onReblog: this.onModalReblog } }));
-      }
-    }
+    dispatch(toggleReblog(status.get('id'), e.shiftKey));
   },
 
-  onFavourite (status) {
-    if (status.get('favourited')) {
-      dispatch(unfavourite(status));
-    } else {
-      dispatch(favourite(status));
-    }
+  onFavourite (status, e) {
+    dispatch(toggleFavourite(status.get('id'), e.shiftKey));
   },
 });
 
diff --git a/app/javascript/flavours/glitch/features/picture_in_picture/components/footer.jsx b/app/javascript/flavours/glitch/features/picture_in_picture/components/footer.jsx
index 2b27070007f432..3e26d8406915c9 100644
--- a/app/javascript/flavours/glitch/features/picture_in_picture/components/footer.jsx
+++ b/app/javascript/flavours/glitch/features/picture_in_picture/components/footer.jsx
@@ -15,11 +15,11 @@ import ReplyIcon from '@/material-icons/400-24px/reply.svg?react';
 import ReplyAllIcon from '@/material-icons/400-24px/reply_all.svg?react';
 import StarIcon from '@/material-icons/400-24px/star.svg?react';
 import { replyCompose } from 'flavours/glitch/actions/compose';
-import { reblog, favourite, unreblog, unfavourite } from 'flavours/glitch/actions/interactions';
+import { toggleReblog, toggleFavourite } from 'flavours/glitch/actions/interactions';
 import { openModal } from 'flavours/glitch/actions/modal';
 import { IconButton } from 'flavours/glitch/components/icon_button';
 import { identityContextPropShape, withIdentity } from 'flavours/glitch/identity_context';
-import { me, boostModal } from 'flavours/glitch/initial_state';
+import { me } from 'flavours/glitch/initial_state';
 import { makeGetStatus } from 'flavours/glitch/selectors';
 import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router';
 
@@ -101,16 +101,12 @@ class Footer extends ImmutablePureComponent {
     }
   };
 
-  handleFavouriteClick = () => {
+  handleFavouriteClick = e => {
     const { dispatch, status } = this.props;
     const { signedIn } = this.props.identity;
 
     if (signedIn) {
-      if (status.get('favourited')) {
-        dispatch(unfavourite(status));
-      } else {
-        dispatch(favourite(status));
-      }
+      dispatch(toggleFavourite(status.get('id'), e && e.shiftKey));
     } else {
       dispatch(openModal({
         modalType: 'INTERACTION',
@@ -123,23 +119,12 @@ class Footer extends ImmutablePureComponent {
     }
   };
 
-  _performReblog = (status, privacy) => {
-    const { dispatch } = this.props;
-    dispatch(reblog({ statusId: status.get('id'), visibility: privacy }));
-  };
-
   handleReblogClick = e => {
     const { dispatch, status } = this.props;
     const { signedIn } = this.props.identity;
 
     if (signedIn) {
-      if (status.get('reblogged')) {
-        dispatch(unreblog({ statusId: status.get('id') }));
-      } else if ((e && e.shiftKey) || !boostModal) {
-        this._performReblog(status);
-      } else {
-        dispatch(openModal({ modalType: 'BOOST', modalProps: { status, onReblog: this._performReblog } }));
-      }
+      dispatch(toggleReblog(status.get('id'), e && e.shiftKey));
     } else {
       dispatch(openModal({
         modalType: 'INTERACTION',
diff --git a/app/javascript/flavours/glitch/features/status/containers/detailed_status_container.js b/app/javascript/flavours/glitch/features/status/containers/detailed_status_container.js
index 9663f7ca4e6b40..1c9e3ccce12299 100644
--- a/app/javascript/flavours/glitch/features/status/containers/detailed_status_container.js
+++ b/app/javascript/flavours/glitch/features/status/containers/detailed_status_container.js
@@ -10,10 +10,8 @@ import {
   directCompose,
 } from '../../../actions/compose';
 import {
-  reblog,
-  favourite,
-  unreblog,
-  unfavourite,
+  toggleReblog,
+  toggleFavourite,
   pin,
   unpin,
 } from '../../../actions/interactions';
@@ -25,7 +23,7 @@ import {
   unmuteStatus,
   deleteStatus,
 } from '../../../actions/statuses';
-import { boostModal, deleteModal } from '../../../initial_state';
+import { deleteModal } from '../../../initial_state';
 import { makeGetStatus } from '../../../selectors';
 import DetailedStatus from '../components/detailed_status';
 
@@ -70,28 +68,12 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
     });
   },
 
-  onModalReblog (status, privacy) {
-    dispatch(reblog({ statusId: status.get('id'), visibility: privacy }));
-  },
-
   onReblog (status, e) {
-    if (status.get('reblogged')) {
-      dispatch(unreblog({ statusId: status.get('id') }));
-    } else {
-      if (e.shiftKey || !boostModal) {
-        this.onModalReblog(status);
-      } else {
-        dispatch(openModal({ modalType: 'BOOST', modalProps: { status, onReblog: this.onModalReblog } }));
-      }
-    }
+    dispatch(toggleReblog(status.get('id'), e.shiftKey));
   },
 
-  onFavourite (status) {
-    if (status.get('favourited')) {
-      dispatch(unfavourite(status));
-    } else {
-      dispatch(favourite(status));
-    }
+  onFavourite (status, e) {
+    dispatch(toggleFavourite(status.get('id'), e.shiftKey));
   },
 
   onPin (status) {
diff --git a/app/javascript/flavours/glitch/features/status/index.jsx b/app/javascript/flavours/glitch/features/status/index.jsx
index eb965046d18c09..2fca4b61b6c26f 100644
--- a/app/javascript/flavours/glitch/features/status/index.jsx
+++ b/app/javascript/flavours/glitch/features/status/index.jsx
@@ -32,12 +32,10 @@ import {
   directCompose,
 } from '../../actions/compose';
 import {
-  favourite,
-  unfavourite,
+  toggleFavourite,
   bookmark,
   unbookmark,
-  reblog,
-  unreblog,
+  toggleReblog,
   pin,
   unpin,
 } from '../../actions/interactions';
@@ -59,7 +57,7 @@ import {
 import ColumnHeader from '../../components/column_header';
 import { textForScreenReader, defaultMediaVisibility } from '../../components/status';
 import StatusContainer from '../../containers/status_container';
-import { boostModal, favouriteModal, deleteModal } from '../../initial_state';
+import { deleteModal } from '../../initial_state';
 import { makeGetStatus, makeGetPictureInPicture } from '../../selectors';
 import Column from '../ui/components/column';
 import { attachFullscreenListener, detachFullscreenListener, isFullscreen } from '../ui/util/fullscreen';
@@ -268,30 +266,13 @@ class Status extends ImmutablePureComponent {
     this.setState({ showMedia: !this.state.showMedia });
   };
 
-  handleModalFavourite = (status) => {
-    this.props.dispatch(favourite(status));
-  };
 
   handleFavouriteClick = (status, e) => {
     const { dispatch } = this.props;
     const { signedIn } = this.props.identity;
 
     if (signedIn) {
-      if (status.get('favourited')) {
-        dispatch(unfavourite(status));
-      } else {
-        if ((e && e.shiftKey) || !favouriteModal) {
-          this.handleModalFavourite(status);
-        } else {
-          dispatch(openModal({
-            modalType: 'FAVOURITE',
-            modalProps: {
-              status,
-              onFavourite: this.handleModalFavourite,
-            },
-          }));
-        }
-      }
+      dispatch(toggleFavourite(status.get('id'), e && e.shiftKey));
     } else {
       dispatch(openModal({
         modalType: 'INTERACTION',
@@ -342,28 +323,12 @@ class Status extends ImmutablePureComponent {
     }
   };
 
-  handleModalReblog = (status, privacy) => {
-    const { dispatch } = this.props;
-
-    if (status.get('reblogged')) {
-      dispatch(unreblog({ statusId: status.get('id') }));
-    } else {
-      dispatch(reblog({ statusId: status.get('id'), visibility: privacy }));
-    }
-  };
-
   handleReblogClick = (status, e) => {
-    const { settings, dispatch } = this.props;
+    const { dispatch } = this.props;
     const { signedIn } = this.props.identity;
 
     if (signedIn) {
-      if (settings.get('confirm_boost_missing_media_description') && status.get('media_attachments').some(item => !item.get('description')) && !status.get('reblogged')) {
-        dispatch(openModal({ modalType: 'BOOST', modalProps: { status, onReblog: this.handleModalReblog, missingMediaDescription: true } }));
-      } else if ((e && e.shiftKey) || !boostModal) {
-        this.handleModalReblog(status);
-      } else {
-        dispatch(openModal({ modalType: 'BOOST', modalProps: { status, onReblog: this.handleModalReblog } }));
-      }
+      dispatch(toggleReblog(status.get('id'), e && e.shiftKey));
     } else {
       dispatch(openModal({
         modalType: 'INTERACTION',

From 643b1ef3e97684da49879f9ca7e8781b2f1b3b00 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 22 Jul 2024 18:03:58 +0200
Subject: [PATCH 1600/2191] [Glitch] Refactor CW handling in an action

Port 9cb94271333ccfe488fa84d49e3351f18594e480 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/actions/statuses.js           | 15 +++++++++++++++
 .../glitch/containers/status_container.js         |  9 ++-------
 .../direct_timeline/components/conversation.jsx   |  8 ++------
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/app/javascript/flavours/glitch/actions/statuses.js b/app/javascript/flavours/glitch/actions/statuses.js
index 054626bda0c7b6..2ebe0bf96a38f8 100644
--- a/app/javascript/flavours/glitch/actions/statuses.js
+++ b/app/javascript/flavours/glitch/actions/statuses.js
@@ -309,6 +309,21 @@ export function revealStatus(ids) {
   };
 }
 
+export function toggleStatusSpoilers(statusId) {
+  return (dispatch, getState) => {
+    const status = getState().statuses.get(statusId);
+
+    if (!status)
+      return;
+
+    if (status.get('hidden')) {
+      dispatch(revealStatus(statusId));
+    } else {
+      dispatch(hideStatus(statusId));
+    }
+  };
+}
+
 export function toggleStatusCollapse(id, isCollapsed) {
   return {
     type: STATUS_COLLAPSE,
diff --git a/app/javascript/flavours/glitch/containers/status_container.js b/app/javascript/flavours/glitch/containers/status_container.js
index aac18eac0d8997..955adc5fa7d95d 100644
--- a/app/javascript/flavours/glitch/containers/status_container.js
+++ b/app/javascript/flavours/glitch/containers/status_container.js
@@ -28,8 +28,7 @@ import {
   muteStatus,
   unmuteStatus,
   deleteStatus,
-  hideStatus,
-  revealStatus,
+  toggleStatusSpoilers,
   editStatus,
   translateStatus,
   undoStatusTranslation,
@@ -234,11 +233,7 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
   },
 
   onToggleHidden (status) {
-    if (status.get('hidden')) {
-      dispatch(revealStatus(status.get('id')));
-    } else {
-      dispatch(hideStatus(status.get('id')));
-    }
+    dispatch(toggleStatusSpoilers(status.get('id')));
   },
 
   deployPictureInPicture (status, type, mediaProps) {
diff --git a/app/javascript/flavours/glitch/features/direct_timeline/components/conversation.jsx b/app/javascript/flavours/glitch/features/direct_timeline/components/conversation.jsx
index 839de34dd4bc58..2c70f48a3740fe 100644
--- a/app/javascript/flavours/glitch/features/direct_timeline/components/conversation.jsx
+++ b/app/javascript/flavours/glitch/features/direct_timeline/components/conversation.jsx
@@ -18,7 +18,7 @@ import ReplyIcon from '@/material-icons/400-24px/reply.svg?react';
 import { replyCompose } from 'flavours/glitch/actions/compose';
 import { markConversationRead, deleteConversation } from 'flavours/glitch/actions/conversations';
 import { openModal } from 'flavours/glitch/actions/modal';
-import { muteStatus, unmuteStatus, revealStatus, hideStatus } from 'flavours/glitch/actions/statuses';
+import { muteStatus, unmuteStatus, toggleStatusSpoilers } from 'flavours/glitch/actions/statuses';
 import AttachmentList from 'flavours/glitch/components/attachment_list';
 import AvatarComposite from 'flavours/glitch/components/avatar_composite';
 import { IconButton } from 'flavours/glitch/components/icon_button';
@@ -156,11 +156,7 @@ export const Conversation = ({ conversation, scrollKey, onMoveUp, onMoveDown })
   }, [dispatch, lastStatus]);
 
   const handleShowMore = useCallback(() => {
-    if (lastStatus.get('hidden')) {
-      dispatch(revealStatus(lastStatus.get('id')));
-    } else {
-      dispatch(hideStatus(lastStatus.get('id')));
-    }
+    dispatch(toggleStatusSpoilers(lastStatus.get('id')));
 
     if (lastStatus.get('spoiler_text')) {
       setExpanded(!expanded);

From cbf25634a9144bb6420fb0350d7ea64bed4f763f Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 22 Jul 2024 21:30:06 +0200
Subject: [PATCH 1601/2191] [Glitch] Fix reblogging after refactor

Port 55705d8191f31c1089095956fb4124f7505b4bd7 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/actions/interactions.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/javascript/flavours/glitch/actions/interactions.js b/app/javascript/flavours/glitch/actions/interactions.js
index 6790d3313b0291..43673642f5cb89 100644
--- a/app/javascript/flavours/glitch/actions/interactions.js
+++ b/app/javascript/flavours/glitch/actions/interactions.js
@@ -462,11 +462,11 @@ export function toggleReblog(statusId, skipModal = false) {
     const missing_description_setting = state.getIn(['local_settings', 'confirm_boost_missing_media_description']);
     const missing_description = status.get('media_attachments').some(item => !item.get('description'));
     if (missing_description_setting && missing_description && !status.get('reblogged')) {
-      dispatch(openModal({ modalType: 'BOOST', modalProps: { status, onReblog: toggleReblogWithoutConfirmation, missingMediaDescription: true } }));
+      dispatch(openModal({ modalType: 'BOOST', modalProps: { status, onReblog: (status, privacy) => dispatch(toggleReblogWithoutConfirmation(status, privacy)), missingMediaDescription: true } }));
     } else if (boostModal && !skipModal) {
-      dispatch(openModal({ modalType: 'BOOST', modalProps: { status, onReblog: toggleReblogWithoutConfirmation } }));
+      dispatch(openModal({ modalType: 'BOOST', modalProps: { status, onReblog: (status, privacy) => dispatch(toggleReblogWithoutConfirmation(status, privacy)) } }));
     } else {
-      toggleReblogWithoutConfirmation(status);
+      dispatch(toggleReblogWithoutConfirmation(status));
     }
   };
 }

From af06d74574745deb738e6f526f4d74c31760102d Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 23 Jul 2024 08:20:17 +0200
Subject: [PATCH 1602/2191] Fix keyboard shortcuts and navigation in grouped
 notifications (#31076)

---
 app/javascript/mastodon/actions/accounts.js   | 12 +++
 app/javascript/mastodon/actions/compose.js    | 18 ++++
 app/javascript/mastodon/actions/statuses.js   | 14 +++
 app/javascript/mastodon/components/status.jsx | 15 ++--
 .../components/notification_group.tsx         | 21 ++++-
 .../notification_group_with_status.tsx        | 76 ++++++++++------
 .../components/notification_with_status.tsx   | 90 +++++++++++++------
 7 files changed, 184 insertions(+), 62 deletions(-)

diff --git a/app/javascript/mastodon/actions/accounts.js b/app/javascript/mastodon/actions/accounts.js
index cea915e5f17fd0..9144235195e3f5 100644
--- a/app/javascript/mastodon/actions/accounts.js
+++ b/app/javascript/mastodon/actions/accounts.js
@@ -1,3 +1,5 @@
+import { browserHistory } from 'mastodon/components/router';
+
 import api, { getLinks } from '../api';
 
 import {
@@ -676,3 +678,13 @@ export const updateAccount = ({ displayName, note, avatar, header, discoverable,
     dispatch(importFetchedAccount(response.data));
   });
 };
+
+export const navigateToProfile = (accountId) => {
+  return (_dispatch, getState) => {
+    const acct = getState().accounts.getIn([accountId, 'acct']);
+
+    if (acct) {
+      browserHistory.push(`/@${acct}`);
+    }
+  };
+};
diff --git a/app/javascript/mastodon/actions/compose.js b/app/javascript/mastodon/actions/compose.js
index 4f2ed450dd6c38..aa1c6de20eb61a 100644
--- a/app/javascript/mastodon/actions/compose.js
+++ b/app/javascript/mastodon/actions/compose.js
@@ -122,6 +122,18 @@ export function replyCompose(status) {
   };
 }
 
+export function replyComposeById(statusId) {
+  return (dispatch, getState) => {
+    const state = getState();
+    const status = state.statuses.get(statusId);
+
+    if (status) {
+      const account = state.accounts.get(status.get('account'));
+      dispatch(replyCompose(status.set('account', account)));
+    }
+  };
+}
+
 export function cancelReplyCompose() {
   return {
     type: COMPOSE_REPLY_CANCEL,
@@ -154,6 +166,12 @@ export function mentionCompose(account) {
   };
 }
 
+export function mentionComposeById(accountId) {
+  return (dispatch, getState) => {
+    dispatch(mentionCompose(getState().accounts.get(accountId)));
+  };
+}
+
 export function directCompose(account) {
   return (dispatch, getState) => {
     dispatch({
diff --git a/app/javascript/mastodon/actions/statuses.js b/app/javascript/mastodon/actions/statuses.js
index 26abaf1bccfaab..340cee8024b0eb 100644
--- a/app/javascript/mastodon/actions/statuses.js
+++ b/app/javascript/mastodon/actions/statuses.js
@@ -1,3 +1,5 @@
+import { browserHistory } from 'mastodon/components/router';
+
 import api from '../api';
 
 import { ensureComposeIsVisible, setComposeToStatus } from './compose';
@@ -363,3 +365,15 @@ export const undoStatusTranslation = (id, pollId) => ({
   id,
   pollId,
 });
+
+export const navigateToStatus = (statusId) => {
+  return (_dispatch, getState) => {
+    const state = getState();
+    const accountId = state.statuses.getIn([statusId, 'account']);
+    const acct = state.accounts.getIn([accountId, 'acct']);
+
+    if (acct) {
+      browserHistory.push(`/@${acct}/${statusId}`);
+    }
+  };
+};
diff --git a/app/javascript/mastodon/components/status.jsx b/app/javascript/mastodon/components/status.jsx
index fe5f38889ba77f..6e3792d7dcf220 100644
--- a/app/javascript/mastodon/components/status.jsx
+++ b/app/javascript/mastodon/components/status.jsx
@@ -119,6 +119,7 @@ class Status extends ImmutablePureComponent {
     skipPrepend: PropTypes.bool,
     avatarSize: PropTypes.number,
     deployPictureInPicture: PropTypes.func,
+    unfocusable: PropTypes.bool,
     pictureInPicture: ImmutablePropTypes.contains({
       inUse: PropTypes.bool,
       available: PropTypes.bool,
@@ -355,7 +356,7 @@ class Status extends ImmutablePureComponent {
   };
 
   render () {
-    const { intl, hidden, featured, unread, showThread, scrollKey, pictureInPicture, previousId, nextInReplyToId, rootId, skipPrepend, avatarSize = 46 } = this.props;
+    const { intl, hidden, featured, unfocusable, unread, showThread, scrollKey, pictureInPicture, previousId, nextInReplyToId, rootId, skipPrepend, avatarSize = 46 } = this.props;
 
     let { status, account, ...other } = this.props;
 
@@ -381,8 +382,8 @@ class Status extends ImmutablePureComponent {
 
     if (hidden) {
       return (
-        <HotKeys handlers={handlers}>
-          <div ref={this.handleRef} className={classNames('status__wrapper', { focusable: !this.props.muted })} tabIndex={0}>
+        <HotKeys handlers={handlers} tabIndex={unfocusable ? null : -1}>
+          <div ref={this.handleRef} className={classNames('status__wrapper', { focusable: !this.props.muted })} tabIndex={unfocusable ? null : 0}>
             <span>{status.getIn(['account', 'display_name']) || status.getIn(['account', 'username'])}</span>
             <span>{status.get('content')}</span>
           </div>
@@ -402,8 +403,8 @@ class Status extends ImmutablePureComponent {
       };
 
       return (
-        <HotKeys handlers={minHandlers}>
-          <div className='status__wrapper status__wrapper--filtered focusable' tabIndex={0} ref={this.handleRef}>
+        <HotKeys handlers={minHandlers} tabIndex={unfocusable ? null : -1}>
+          <div className='status__wrapper status__wrapper--filtered focusable' tabIndex={unfocusable ? null : 0} ref={this.handleRef}>
             <FormattedMessage id='status.filtered' defaultMessage='Filtered' />: {matchedFilters.join(', ')}.
             {' '}
             <button className='status__wrapper--filtered__button' onClick={this.handleUnfilterClick}>
@@ -550,8 +551,8 @@ class Status extends ImmutablePureComponent {
     const expanded = !status.get('hidden') || status.get('spoiler_text').length === 0;
 
     return (
-      <HotKeys handlers={handlers}>
-        <div className={classNames('status__wrapper', `status__wrapper-${status.get('visibility')}`, { 'status__wrapper-reply': !!status.get('in_reply_to_id'), unread, focusable: !this.props.muted })} tabIndex={this.props.muted ? null : 0} data-featured={featured ? 'true' : null} aria-label={textForScreenReader(intl, status, rebloggedByText)} ref={this.handleRef} data-nosnippet={status.getIn(['account', 'noindex'], true) || undefined}>
+      <HotKeys handlers={handlers} tabIndex={unfocusable ? null : -1}>
+        <div className={classNames('status__wrapper', `status__wrapper-${status.get('visibility')}`, { 'status__wrapper-reply': !!status.get('in_reply_to_id'), unread, focusable: !this.props.muted })} tabIndex={this.props.muted || unfocusable ? null : 0} data-featured={featured ? 'true' : null} aria-label={textForScreenReader(intl, status, rebloggedByText)} ref={this.handleRef} data-nosnippet={status.getIn(['account', 'noindex'], true) || undefined}>
           {!skipPrepend && prepend}
 
           <div className={classNames('status', `status-${status.get('visibility')}`, { 'status-reply': !!status.get('in_reply_to_id'), 'status--in-thread': !!rootId, 'status--first-in-thread': previousId && (!connectUp || connectToRoot), muted: this.props.muted })} data-id={status.get('id')}>
diff --git a/app/javascript/mastodon/features/notifications_v2/components/notification_group.tsx b/app/javascript/mastodon/features/notifications_v2/components/notification_group.tsx
index 1cfb235b7b6d02..36f033261ae44d 100644
--- a/app/javascript/mastodon/features/notifications_v2/components/notification_group.tsx
+++ b/app/javascript/mastodon/features/notifications_v2/components/notification_group.tsx
@@ -2,8 +2,10 @@ import { useMemo } from 'react';
 
 import { HotKeys } from 'react-hotkeys';
 
+import { navigateToProfile } from 'mastodon/actions/accounts';
+import { mentionComposeById } from 'mastodon/actions/compose';
 import type { NotificationGroup as NotificationGroupModel } from 'mastodon/models/notification_group';
-import { useAppSelector } from 'mastodon/store';
+import { useAppSelector, useAppDispatch } from 'mastodon/store';
 
 import { NotificationAdminReport } from './notification_admin_report';
 import { NotificationAdminSignUp } from './notification_admin_sign_up';
@@ -30,6 +32,13 @@ export const NotificationGroup: React.FC<{
     ),
   );
 
+  const dispatch = useAppDispatch();
+
+  const accountId =
+    notificationGroup?.type === 'gap'
+      ? undefined
+      : notificationGroup?.sampleAccountIds[0];
+
   const handlers = useMemo(
     () => ({
       moveUp: () => {
@@ -39,8 +48,16 @@ export const NotificationGroup: React.FC<{
       moveDown: () => {
         onMoveDown(notificationGroupId);
       },
+
+      openProfile: () => {
+        if (accountId) dispatch(navigateToProfile(accountId));
+      },
+
+      mention: () => {
+        if (accountId) dispatch(mentionComposeById(accountId));
+      },
     }),
-    [notificationGroupId, onMoveUp, onMoveDown],
+    [dispatch, notificationGroupId, accountId, onMoveUp, onMoveDown],
   );
 
   if (!notificationGroup || notificationGroup.type === 'gap') return null;
diff --git a/app/javascript/mastodon/features/notifications_v2/components/notification_group_with_status.tsx b/app/javascript/mastodon/features/notifications_v2/components/notification_group_with_status.tsx
index 23004f7ee85563..2af73c8362a7b7 100644
--- a/app/javascript/mastodon/features/notifications_v2/components/notification_group_with_status.tsx
+++ b/app/javascript/mastodon/features/notifications_v2/components/notification_group_with_status.tsx
@@ -2,9 +2,14 @@ import { useMemo } from 'react';
 
 import classNames from 'classnames';
 
+import { HotKeys } from 'react-hotkeys';
+
+import { replyComposeById } from 'mastodon/actions/compose';
+import { navigateToStatus } from 'mastodon/actions/statuses';
 import type { IconProp } from 'mastodon/components/icon';
 import { Icon } from 'mastodon/components/icon';
 import { RelativeTimestamp } from 'mastodon/components/relative_timestamp';
+import { useAppDispatch } from 'mastodon/store';
 
 import { AvatarGroup } from './avatar_group';
 import { EmbeddedStatus } from './embedded_status';
@@ -39,6 +44,8 @@ export const NotificationGroupWithStatus: React.FC<{
   type,
   unread,
 }) => {
+  const dispatch = useAppDispatch();
+
   const label = useMemo(
     () =>
       labelRenderer({
@@ -53,39 +60,54 @@ export const NotificationGroupWithStatus: React.FC<{
     [labelRenderer, accountIds, count, labelSeeMoreHref],
   );
 
+  const handlers = useMemo(
+    () => ({
+      open: () => {
+        dispatch(navigateToStatus(statusId));
+      },
+
+      reply: () => {
+        dispatch(replyComposeById(statusId));
+      },
+    }),
+    [dispatch, statusId],
+  );
+
   return (
-    <div
-      role='button'
-      className={classNames(
-        `notification-group focusable notification-group--${type}`,
-        { 'notification-group--unread': unread },
-      )}
-      tabIndex={0}
-    >
-      <div className='notification-group__icon'>
-        <Icon icon={icon} id={iconId} />
-      </div>
+    <HotKeys handlers={handlers}>
+      <div
+        role='button'
+        className={classNames(
+          `notification-group focusable notification-group--${type}`,
+          { 'notification-group--unread': unread },
+        )}
+        tabIndex={0}
+      >
+        <div className='notification-group__icon'>
+          <Icon icon={icon} id={iconId} />
+        </div>
 
-      <div className='notification-group__main'>
-        <div className='notification-group__main__header'>
-          <div className='notification-group__main__header__wrapper'>
-            <AvatarGroup accountIds={accountIds} />
+        <div className='notification-group__main'>
+          <div className='notification-group__main__header'>
+            <div className='notification-group__main__header__wrapper'>
+              <AvatarGroup accountIds={accountIds} />
 
-            {actions}
-          </div>
+              {actions}
+            </div>
 
-          <div className='notification-group__main__header__label'>
-            {label}
-            {timestamp && <RelativeTimestamp timestamp={timestamp} />}
+            <div className='notification-group__main__header__label'>
+              {label}
+              {timestamp && <RelativeTimestamp timestamp={timestamp} />}
+            </div>
           </div>
-        </div>
 
-        {statusId && (
-          <div className='notification-group__main__status'>
-            <EmbeddedStatus statusId={statusId} />
-          </div>
-        )}
+          {statusId && (
+            <div className='notification-group__main__status'>
+              <EmbeddedStatus statusId={statusId} />
+            </div>
+          )}
+        </div>
       </div>
-    </div>
+    </HotKeys>
   );
 };
diff --git a/app/javascript/mastodon/features/notifications_v2/components/notification_with_status.tsx b/app/javascript/mastodon/features/notifications_v2/components/notification_with_status.tsx
index 27de76b485da63..c7dd9f6be2e320 100644
--- a/app/javascript/mastodon/features/notifications_v2/components/notification_with_status.tsx
+++ b/app/javascript/mastodon/features/notifications_v2/components/notification_with_status.tsx
@@ -2,10 +2,18 @@ import { useMemo } from 'react';
 
 import classNames from 'classnames';
 
+import { HotKeys } from 'react-hotkeys';
+
+import { replyComposeById } from 'mastodon/actions/compose';
+import { toggleReblog, toggleFavourite } from 'mastodon/actions/interactions';
+import {
+  navigateToStatus,
+  toggleStatusSpoilers,
+} from 'mastodon/actions/statuses';
 import type { IconProp } from 'mastodon/components/icon';
 import { Icon } from 'mastodon/components/icon';
 import Status from 'mastodon/containers/status_container';
-import { useAppSelector } from 'mastodon/store';
+import { useAppSelector, useAppDispatch } from 'mastodon/store';
 
 import { NamesList } from './names_list';
 import type { LabelRenderer } from './notification_group_with_status';
@@ -29,6 +37,8 @@ export const NotificationWithStatus: React.FC<{
   type,
   unread,
 }) => {
+  const dispatch = useAppDispatch();
+
   const label = useMemo(
     () =>
       labelRenderer({
@@ -41,33 +51,61 @@ export const NotificationWithStatus: React.FC<{
     (state) => state.statuses.getIn([statusId, 'visibility']) === 'direct',
   );
 
+  const handlers = useMemo(
+    () => ({
+      open: () => {
+        dispatch(navigateToStatus(statusId));
+      },
+
+      reply: () => {
+        dispatch(replyComposeById(statusId));
+      },
+
+      boost: () => {
+        dispatch(toggleReblog(statusId));
+      },
+
+      favourite: () => {
+        dispatch(toggleFavourite(statusId));
+      },
+
+      toggleHidden: () => {
+        dispatch(toggleStatusSpoilers(statusId));
+      },
+    }),
+    [dispatch, statusId],
+  );
+
   return (
-    <div
-      role='button'
-      className={classNames(
-        `notification-ungrouped focusable notification-ungrouped--${type}`,
-        {
-          'notification-ungrouped--unread': unread,
-          'notification-ungrouped--direct': isPrivateMention,
-        },
-      )}
-      tabIndex={0}
-    >
-      <div className='notification-ungrouped__header'>
-        <div className='notification-ungrouped__header__icon'>
-          <Icon icon={icon} id={iconId} />
+    <HotKeys handlers={handlers}>
+      <div
+        role='button'
+        className={classNames(
+          `notification-ungrouped focusable notification-ungrouped--${type}`,
+          {
+            'notification-ungrouped--unread': unread,
+            'notification-ungrouped--direct': isPrivateMention,
+          },
+        )}
+        tabIndex={0}
+      >
+        <div className='notification-ungrouped__header'>
+          <div className='notification-ungrouped__header__icon'>
+            <Icon icon={icon} id={iconId} />
+          </div>
+          {label}
         </div>
-        {label}
-      </div>
 
-      <Status
-        // @ts-expect-error -- <Status> is not yet typed
-        id={statusId}
-        contextType='notifications'
-        withDismiss
-        skipPrepend
-        avatarSize={40}
-      />
-    </div>
+        <Status
+          // @ts-expect-error -- <Status> is not yet typed
+          id={statusId}
+          contextType='notifications'
+          withDismiss
+          skipPrepend
+          avatarSize={40}
+          unfocusable
+        />
+      </div>
+    </HotKeys>
   );
 };

From 44bdfe1fed87c77be49b948d9b7ec334558c4c85 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 23 Jul 2024 08:42:28 +0200
Subject: [PATCH 1603/2191] chore(deps): update dependency
 opentelemetry-instrumentation-active_job to v0.7.3 (#31107)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 3815e6960cc527..eae66b3539f544 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -516,7 +516,7 @@ GEM
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-active_support (~> 0.1)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-active_job (0.7.2)
+    opentelemetry-instrumentation-active_job (0.7.3)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
     opentelemetry-instrumentation-active_model_serializers (0.20.1)

From 9a015a2a157b43ea63d911327248635e629a72c9 Mon Sep 17 00:00:00 2001
From: Nick Schonning <nschonni@gmail.com>
Date: Tue, 23 Jul 2024 02:46:09 -0400
Subject: [PATCH 1604/2191] Update Prettier to 3.3.3 (#31106)

---
 app/javascript/entrypoints/public.tsx |  4 ++--
 package.json                          |  2 +-
 yarn.lock                             | 10 +++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/javascript/entrypoints/public.tsx b/app/javascript/entrypoints/public.tsx
index 40a9b7c0ca6470..149c1d28d09495 100644
--- a/app/javascript/entrypoints/public.tsx
+++ b/app/javascript/entrypoints/public.tsx
@@ -316,8 +316,8 @@ function loaded() {
 
       const message =
         statusEl.dataset.spoiler === 'expanded'
-          ? localeData['status.show_less'] ?? 'Show less'
-          : localeData['status.show_more'] ?? 'Show more';
+          ? (localeData['status.show_less'] ?? 'Show less')
+          : (localeData['status.show_more'] ?? 'Show more');
       spoilerLink.textContent = new IntlMessageFormat(
         message,
         locale,
diff --git a/package.json b/package.json
index 4571ca03af1540..3bbea344317d00 100644
--- a/package.json
+++ b/package.json
@@ -187,7 +187,7 @@
     "jest": "^29.5.0",
     "jest-environment-jsdom": "^29.5.0",
     "lint-staged": "^15.0.0",
-    "prettier": "^3.0.0",
+    "prettier": "^3.3.3",
     "react-test-renderer": "^18.2.0",
     "stylelint": "^16.0.2",
     "stylelint-config-standard-scss": "^13.0.0",
diff --git a/yarn.lock b/yarn.lock
index 04e233c3c30e41..e32c54f71c994c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2871,7 +2871,7 @@ __metadata:
     postcss: "npm:^8.4.24"
     postcss-loader: "npm:^4.3.0"
     postcss-preset-env: "npm:^9.5.2"
-    prettier: "npm:^3.0.0"
+    prettier: "npm:^3.3.3"
     prop-types: "npm:^15.8.1"
     punycode: "npm:^2.3.0"
     react: "npm:^18.2.0"
@@ -14129,12 +14129,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"prettier@npm:^3.0.0":
-  version: 3.3.2
-  resolution: "prettier@npm:3.3.2"
+"prettier@npm:^3.3.3":
+  version: 3.3.3
+  resolution: "prettier@npm:3.3.3"
   bin:
     prettier: bin/prettier.cjs
-  checksum: 10c0/39ed27d17f0238da6dd6571d63026566bd790d3d0edac57c285fbab525982060c8f1e01955fe38134ab10f0951a6076da37f015db8173c02f14bc7f0803a384c
+  checksum: 10c0/b85828b08e7505716324e4245549b9205c0cacb25342a030ba8885aba2039a115dbcf75a0b7ca3b37bc9d101ee61fab8113fc69ca3359f2a226f1ecc07ad2e26
   languageName: node
   linkType: hard
 

From 1b839d2cbab2acf6730c73ee7250c4f436cf8489 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 23 Jul 2024 02:51:57 -0400
Subject: [PATCH 1605/2191] Fix `mastodon:stats` decoration of stats rake task
 (#31104)

---
 lib/tasks/statistics.rake | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/tasks/statistics.rake b/lib/tasks/statistics.rake
index dde7890f6b445d..82840f4fdc842e 100644
--- a/lib/tasks/statistics.rake
+++ b/lib/tasks/statistics.rake
@@ -9,11 +9,13 @@ namespace :mastodon do
     [
       ['App Libraries', 'app/lib'],
       %w(Presenters app/presenters),
+      %w(Policies app/policies),
+      %w(Serializers app/serializers),
       %w(Services app/services),
       %w(Validators app/validators),
       %w(Workers app/workers),
     ].each do |name, dir|
-      STATS_DIRECTORIES << [name, Rails.root.join(dir)]
+      STATS_DIRECTORIES << [name, dir]
     end
   end
 end

From bb2e5a4b585875b85f5025a9124b9b476b408c25 Mon Sep 17 00:00:00 2001
From: Emelia Smith <ThisIsMissEm@users.noreply.github.com>
Date: Tue, 23 Jul 2024 10:12:30 +0200
Subject: [PATCH 1606/2191] Add audit logs to Admin::InstancesController
 (#27386)

---
 app/controllers/admin/instances_controller.rb |  1 +
 app/models/admin/action_log_filter.rb         | 11 ++++++++++
 app/views/admin/instances/show.html.haml      | 10 +++++++++
 config/locales/en.yml                         |  3 +++
 .../admin/instances_controller_spec.rb        | 22 +++++++++++++++++++
 5 files changed, 47 insertions(+)

diff --git a/app/controllers/admin/instances_controller.rb b/app/controllers/admin/instances_controller.rb
index a6997b62f7db6b..d7f88a71f3698f 100644
--- a/app/controllers/admin/instances_controller.rb
+++ b/app/controllers/admin/instances_controller.rb
@@ -13,6 +13,7 @@ def index
     def show
       authorize :instance, :show?
       @time_period = (6.days.ago.to_date...Time.now.utc.to_date)
+      @action_logs = Admin::ActionLogFilter.new(target_domain: @instance.domain).results.limit(5)
     end
 
     def destroy
diff --git a/app/models/admin/action_log_filter.rb b/app/models/admin/action_log_filter.rb
index fc984b2445bcdc..1f48e0a497731f 100644
--- a/app/models/admin/action_log_filter.rb
+++ b/app/models/admin/action_log_filter.rb
@@ -5,6 +5,14 @@ class Admin::ActionLogFilter
     action_type
     account_id
     target_account_id
+    target_domain
+  ).freeze
+
+  INSTANCE_TARGET_TYPES = %w(
+    DomainBlock
+    DomainAllow
+    Instance
+    UnavailableDomain
   ).freeze
 
   ACTION_TYPE_MAP = {
@@ -95,6 +103,9 @@ def scope_for(key, value)
     when 'target_account_id'
       account = Account.find_or_initialize_by(id: value)
       latest_action_logs.where(target: [account, account.user].compact)
+    when 'target_domain'
+      normalized_domain = TagManager.instance.normalize_domain(value)
+      latest_action_logs.where(human_identifier: normalized_domain, target_type: INSTANCE_TARGET_TYPES)
     else
       raise Mastodon::InvalidParameterError, "Unknown filter: #{key}"
     end
diff --git a/app/views/admin/instances/show.html.haml b/app/views/admin/instances/show.html.haml
index d916203d0c664f..c55eb89dc94933 100644
--- a/app/views/admin/instances/show.html.haml
+++ b/app/views/admin/instances/show.html.haml
@@ -114,6 +114,16 @@
 - if @instance.persisted?
   %hr.spacer/
 
+  %h3= t('admin.instances.audit_log.title')
+  - if @action_logs.empty?
+    %p= t('accounts.nothing_here')
+  - else
+    .report-notes
+      = render partial: 'admin/action_logs/action_log', collection: @action_logs
+    = link_to t('admin.instances.audit_log.view_all'), admin_action_logs_path(target_domain: @instance.domain), class: 'button'
+
+  %hr.spacer/
+
   %h3= t('admin.instances.availability.title')
 
   %p
diff --git a/config/locales/en.yml b/config/locales/en.yml
index cccb1721634353..322183f4ce9255 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -471,6 +471,9 @@ en:
       title: Follow recommendations
       unsuppress: Restore follow recommendation
     instances:
+      audit_log:
+        title: Recent Audit Logs
+        view_all: View full audit logs
       availability:
         description_html:
           one: If delivering to the domain fails <strong>%{count} day</strong> without succeeding, no further delivery attempts will be made unless a delivery <em>from</em> the domain is received.
diff --git a/spec/controllers/admin/instances_controller_spec.rb b/spec/controllers/admin/instances_controller_spec.rb
index e6fa0b9def2a1c..ca64dd90a04dd9 100644
--- a/spec/controllers/admin/instances_controller_spec.rb
+++ b/spec/controllers/admin/instances_controller_spec.rb
@@ -37,10 +37,32 @@
   end
 
   describe 'GET #show' do
+    before do
+      allow(Admin::ActionLogFilter).to receive(:new).and_call_original
+    end
+
     it 'shows an instance page' do
       get :show, params: { id: account_popular_main.domain }
 
       expect(response).to have_http_status(200)
+
+      instance = assigns(:instance)
+      expect(instance).to_not be_new_record
+
+      expect(Admin::ActionLogFilter).to have_received(:new).with(target_domain: account_popular_main.domain)
+
+      action_logs = assigns(:action_logs).to_a
+      expect(action_logs.size).to eq 0
+    end
+
+    context 'with an unknown domain' do
+      it 'returns http success' do
+        get :show, params: { id: 'unknown.example' }
+        expect(response).to have_http_status(200)
+
+        instance = assigns(:instance)
+        expect(instance).to be_new_record
+      end
     end
   end
 

From 871b6197df0be1be9ea597163b8cac0740a8b9e2 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 23 Jul 2024 10:59:18 +0200
Subject: [PATCH 1607/2191] chore(deps): update dependency public_suffix to
 v6.0.1 (#31109)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index eae66b3539f544..4fddbded4667ae 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -607,7 +607,7 @@ GEM
       railties (>= 7.0.0)
     psych (5.1.2)
       stringio
-    public_suffix (6.0.0)
+    public_suffix (6.0.1)
     puma (6.4.2)
       nio4r (~> 2.0)
     pundit (2.3.2)

From a8330be93ee825948a17c810af33e28bfa2c56c8 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 23 Jul 2024 14:11:08 +0200
Subject: [PATCH 1608/2191] Widen the clickable area for statuses in grouped
 notifications (#31111)

---
 .../components/embedded_status.tsx            | 80 +++++++++++++++++--
 .../components/embedded_status_content.tsx    | 76 +-----------------
 .../styles/mastodon/components.scss           |  3 +-
 3 files changed, 77 insertions(+), 82 deletions(-)

diff --git a/app/javascript/mastodon/features/notifications_v2/components/embedded_status.tsx b/app/javascript/mastodon/features/notifications_v2/components/embedded_status.tsx
index 0881e24e3f062b..baec0161173ff3 100644
--- a/app/javascript/mastodon/features/notifications_v2/components/embedded_status.tsx
+++ b/app/javascript/mastodon/features/notifications_v2/components/embedded_status.tsx
@@ -1,4 +1,4 @@
-import { useCallback } from 'react';
+import { useCallback, useRef } from 'react';
 
 import { FormattedMessage } from 'react-intl';
 
@@ -22,6 +22,7 @@ export const EmbeddedStatus: React.FC<{ statusId: string }> = ({
   statusId,
 }) => {
   const history = useHistory();
+  const clickCoordinatesRef = useRef<[number, number] | null>();
 
   const status = useAppSelector(
     (state) => state.statuses.get(statusId) as Status | undefined,
@@ -31,11 +32,69 @@ export const EmbeddedStatus: React.FC<{ statusId: string }> = ({
     state.accounts.get(status?.get('account') as string),
   );
 
-  const handleClick = useCallback(() => {
-    if (!account) return;
+  const handleMouseDown = useCallback<React.MouseEventHandler<HTMLDivElement>>(
+    ({ clientX, clientY }) => {
+      clickCoordinatesRef.current = [clientX, clientY];
+    },
+    [clickCoordinatesRef],
+  );
+
+  const handleMouseUp = useCallback<React.MouseEventHandler<HTMLDivElement>>(
+    ({ clientX, clientY, target, button }) => {
+      const [startX, startY] = clickCoordinatesRef.current ?? [0, 0];
+      const [deltaX, deltaY] = [
+        Math.abs(clientX - startX),
+        Math.abs(clientY - startY),
+      ];
+
+      let element: HTMLDivElement | null = target as HTMLDivElement;
+
+      while (element) {
+        if (
+          element.localName === 'button' ||
+          element.localName === 'a' ||
+          element.localName === 'label'
+        ) {
+          return;
+        }
+
+        element = element.parentNode as HTMLDivElement | null;
+      }
+
+      if (deltaX + deltaY < 5 && button === 0 && account) {
+        history.push(`/@${account.acct}/${statusId}`);
+      }
+
+      clickCoordinatesRef.current = null;
+    },
+    [clickCoordinatesRef, statusId, account, history],
+  );
 
-    history.push(`/@${account.acct}/${statusId}`);
-  }, [statusId, account, history]);
+  const handleMouseEnter = useCallback<React.MouseEventHandler<HTMLDivElement>>(
+    ({ currentTarget }) => {
+      const emojis =
+        currentTarget.querySelectorAll<HTMLImageElement>('.custom-emoji');
+
+      for (const emoji of emojis) {
+        const newSrc = emoji.getAttribute('data-original');
+        if (newSrc) emoji.src = newSrc;
+      }
+    },
+    [],
+  );
+
+  const handleMouseLeave = useCallback<React.MouseEventHandler<HTMLDivElement>>(
+    ({ currentTarget }) => {
+      const emojis =
+        currentTarget.querySelectorAll<HTMLImageElement>('.custom-emoji');
+
+      for (const emoji of emojis) {
+        const newSrc = emoji.getAttribute('data-static');
+        if (newSrc) emoji.src = newSrc;
+      }
+    },
+    [],
+  );
 
   if (!status) {
     return null;
@@ -51,7 +110,15 @@ export const EmbeddedStatus: React.FC<{ statusId: string }> = ({
   ).size;
 
   return (
-    <div className='notification-group__embedded-status'>
+    <div
+      className='notification-group__embedded-status'
+      role='button'
+      tabIndex={-1}
+      onMouseDown={handleMouseDown}
+      onMouseUp={handleMouseUp}
+      onMouseEnter={handleMouseEnter}
+      onMouseLeave={handleMouseLeave}
+    >
       <div className='notification-group__embedded-status__account'>
         <Avatar account={account} size={16} />
         <DisplayName account={account} />
@@ -62,7 +129,6 @@ export const EmbeddedStatus: React.FC<{ statusId: string }> = ({
         content={contentHtml}
         language={language}
         mentions={mentions}
-        onClick={handleClick}
       />
 
       {(poll || mediaAttachmentsSize > 0) && (
diff --git a/app/javascript/mastodon/features/notifications_v2/components/embedded_status_content.tsx b/app/javascript/mastodon/features/notifications_v2/components/embedded_status_content.tsx
index 310a6857115a61..1a38be536ba6a8 100644
--- a/app/javascript/mastodon/features/notifications_v2/components/embedded_status_content.tsx
+++ b/app/javascript/mastodon/features/notifications_v2/components/embedded_status_content.tsx
@@ -1,4 +1,4 @@
-import { useCallback, useRef } from 'react';
+import { useCallback } from 'react';
 
 import { useHistory } from 'react-router-dom';
 
@@ -34,76 +34,10 @@ export const EmbeddedStatusContent: React.FC<{
   content: string;
   mentions: List<Mention>;
   language: string;
-  onClick?: () => void;
   className?: string;
-}> = ({ content, mentions, language, onClick, className }) => {
-  const clickCoordinatesRef = useRef<[number, number] | null>();
+}> = ({ content, mentions, language, className }) => {
   const history = useHistory();
 
-  const handleMouseDown = useCallback<React.MouseEventHandler<HTMLDivElement>>(
-    ({ clientX, clientY }) => {
-      clickCoordinatesRef.current = [clientX, clientY];
-    },
-    [clickCoordinatesRef],
-  );
-
-  const handleMouseUp = useCallback<React.MouseEventHandler<HTMLDivElement>>(
-    ({ clientX, clientY, target, button }) => {
-      const [startX, startY] = clickCoordinatesRef.current ?? [0, 0];
-      const [deltaX, deltaY] = [
-        Math.abs(clientX - startX),
-        Math.abs(clientY - startY),
-      ];
-
-      let element: HTMLDivElement | null = target as HTMLDivElement;
-
-      while (element) {
-        if (
-          element.localName === 'button' ||
-          element.localName === 'a' ||
-          element.localName === 'label'
-        ) {
-          return;
-        }
-
-        element = element.parentNode as HTMLDivElement | null;
-      }
-
-      if (deltaX + deltaY < 5 && button === 0 && onClick) {
-        onClick();
-      }
-
-      clickCoordinatesRef.current = null;
-    },
-    [clickCoordinatesRef, onClick],
-  );
-
-  const handleMouseEnter = useCallback<React.MouseEventHandler<HTMLDivElement>>(
-    ({ currentTarget }) => {
-      const emojis =
-        currentTarget.querySelectorAll<HTMLImageElement>('.custom-emoji');
-
-      for (const emoji of emojis) {
-        const newSrc = emoji.getAttribute('data-original');
-        if (newSrc) emoji.src = newSrc;
-      }
-    },
-    [],
-  );
-
-  const handleMouseLeave = useCallback<React.MouseEventHandler<HTMLDivElement>>(
-    ({ currentTarget }) => {
-      const emojis =
-        currentTarget.querySelectorAll<HTMLImageElement>('.custom-emoji');
-
-      for (const emoji of emojis) {
-        const newSrc = emoji.getAttribute('data-static');
-        if (newSrc) emoji.src = newSrc;
-      }
-    },
-    [],
-  );
-
   const handleContentRef = useCallback(
     (node: HTMLDivElement | null) => {
       if (!node) {
@@ -150,16 +84,10 @@ export const EmbeddedStatusContent: React.FC<{
 
   return (
     <div
-      role='button'
-      tabIndex={0}
       className={className}
       ref={handleContentRef}
       lang={language}
       dangerouslySetInnerHTML={{ __html: content }}
-      onMouseDown={handleMouseDown}
-      onMouseUp={handleMouseUp}
-      onMouseEnter={handleMouseEnter}
-      onMouseLeave={handleMouseLeave}
     />
   );
 };
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index adcbad202d7de8..18a775fb2f13f8 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -10457,6 +10457,8 @@ noscript {
   }
 
   &__embedded-status {
+    cursor: pointer;
+
     &__account {
       display: flex;
       align-items: center;
@@ -10478,7 +10480,6 @@ noscript {
       font-size: 15px;
       line-height: 22px;
       color: $dark-text-color;
-      cursor: pointer;
       -webkit-line-clamp: 4;
       -webkit-box-orient: vertical;
       max-height: 4 * 22px;

From cd0ca4b99473f54464e5134f91b7b1c8d5544011 Mon Sep 17 00:00:00 2001
From: Adam Niedzielski <adamsunday@gmail.com>
Date: Tue, 23 Jul 2024 16:42:31 +0200
Subject: [PATCH 1609/2191] Select correct self link when parsing Webfinger
 response (#31110)

---
 app/lib/webfinger.rb                          | 17 +++++++-
 .../activitypub/fetch_remote_actor_service.rb |  5 +--
 app/services/resolve_account_service.rb       |  8 +---
 .../requests/activitypub-webfinger.txt        |  2 +-
 spec/fixtures/requests/webfinger.txt          |  2 +-
 spec/lib/webfinger_spec.rb                    | 41 +++++++++++++++++++
 .../fetch_remote_account_service_spec.rb      | 10 ++---
 .../fetch_remote_actor_service_spec.rb        | 10 ++---
 .../fetch_remote_key_service_spec.rb          |  2 +-
 .../process_account_service_spec.rb           |  2 +-
 10 files changed, 73 insertions(+), 26 deletions(-)
 create mode 100644 spec/lib/webfinger_spec.rb

diff --git a/app/lib/webfinger.rb b/app/lib/webfinger.rb
index aeafe197024974..01a5dbc21d914b 100644
--- a/app/lib/webfinger.rb
+++ b/app/lib/webfinger.rb
@@ -6,6 +6,8 @@ class GoneError < Error; end
   class RedirectError < Error; end
 
   class Response
+    ACTIVITYPUB_READY_TYPE = ['application/activity+json', 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"'].freeze
+
     attr_reader :uri
 
     def initialize(uri, body)
@@ -20,17 +22,28 @@ def subject
     end
 
     def link(rel, attribute)
-      links.dig(rel, attribute)
+      links.dig(rel, 0, attribute)
+    end
+
+    def self_link_href
+      self_link.fetch('href')
     end
 
     private
 
     def links
-      @links ||= @json.fetch('links', []).index_by { |link| link['rel'] }
+      @links ||= @json.fetch('links', []).group_by { |link| link['rel'] }
+    end
+
+    def self_link
+      links.fetch('self', []).find do |link|
+        ACTIVITYPUB_READY_TYPE.include?(link['type'])
+      end
     end
 
     def validate_response!
       raise Webfinger::Error, "Missing subject in response for #{@uri}" if subject.blank?
+      raise Webfinger::Error, "Missing self link in response for #{@uri}" if self_link.blank?
     end
   end
 
diff --git a/app/services/activitypub/fetch_remote_actor_service.rb b/app/services/activitypub/fetch_remote_actor_service.rb
index 86a134bb4ed911..2c372c2ec3fd84 100644
--- a/app/services/activitypub/fetch_remote_actor_service.rb
+++ b/app/services/activitypub/fetch_remote_actor_service.rb
@@ -49,7 +49,7 @@ def check_webfinger!
     confirmed_username, confirmed_domain = split_acct(webfinger.subject)
 
     if @username.casecmp(confirmed_username).zero? && @domain.casecmp(confirmed_domain).zero?
-      raise Error, "Webfinger response for #{@username}@#{@domain} does not loop back to #{@uri}" if webfinger.link('self', 'href') != @uri
+      raise Error, "Webfinger response for #{@username}@#{@domain} does not loop back to #{@uri}" if webfinger.self_link_href != @uri
 
       return
     end
@@ -58,8 +58,7 @@ def check_webfinger!
     @username, @domain                   = split_acct(webfinger.subject)
 
     raise Webfinger::RedirectError, "Too many webfinger redirects for URI #{@uri} (stopped at #{@username}@#{@domain})" unless confirmed_username.casecmp(@username).zero? && confirmed_domain.casecmp(@domain).zero?
-
-    raise Error, "Webfinger response for #{@username}@#{@domain} does not loop back to #{@uri}" if webfinger.link('self', 'href') != @uri
+    raise Error, "Webfinger response for #{@username}@#{@domain} does not loop back to #{@uri}" if webfinger.self_link_href != @uri
   rescue Webfinger::RedirectError => e
     raise Error, e.message
   rescue Webfinger::Error => e
diff --git a/app/services/resolve_account_service.rb b/app/services/resolve_account_service.rb
index 078a0423f287ce..8a5863baba6c7f 100644
--- a/app/services/resolve_account_service.rb
+++ b/app/services/resolve_account_service.rb
@@ -106,8 +106,6 @@ def split_acct(acct)
   end
 
   def fetch_account!
-    return unless activitypub_ready?
-
     with_redis_lock("resolve:#{@username}@#{@domain}") do
       @account = ActivityPub::FetchRemoteAccountService.new.call(actor_url, suppress_errors: @options[:suppress_errors])
     end
@@ -122,12 +120,8 @@ def webfinger_update_due?
     @options[:skip_cache] || @account.nil? || @account.possibly_stale?
   end
 
-  def activitypub_ready?
-    ['application/activity+json', 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"'].include?(@webfinger.link('self', 'type'))
-  end
-
   def actor_url
-    @actor_url ||= @webfinger.link('self', 'href')
+    @actor_url ||= @webfinger.self_link_href
   end
 
   def gone_from_origin?
diff --git a/spec/fixtures/requests/activitypub-webfinger.txt b/spec/fixtures/requests/activitypub-webfinger.txt
index 465066d84e1032..733b1693dc8807 100644
--- a/spec/fixtures/requests/activitypub-webfinger.txt
+++ b/spec/fixtures/requests/activitypub-webfinger.txt
@@ -4,4 +4,4 @@ Content-Type: application/jrd+json; charset=utf-8
 X-Content-Type-Options: nosniff
 Date: Sun, 17 Sep 2017 06:22:50 GMT
 
-{"subject":"acct:foo@ap.example.com","aliases":["https://ap.example.com/@foo","https://ap.example.com/users/foo"],"links":[{"rel":"http://webfinger.net/rel/profile-page","type":"text/html","href":"https://ap.example.com/@foo"},{"rel":"http://schemas.google.com/g/2010#updates-from","type":"application/atom+xml","href":"https://ap.example.com/users/foo.atom"},{"rel":"self","type":"application/activity+json","href":"https://ap.example.com/users/foo"},{"rel":"salmon","href":"https://ap.example.com/api/salmon/1"},{"rel":"magic-public-key","href":"data:application/magic-public-key,RSA.u3L4vnpNLzVH31MeWI394F0wKeJFsLDAsNXGeOu0QF2x-h1zLWZw_agqD2R3JPU9_kaDJGPIV2Sn5zLyUA9S6swCCMOtn7BBR9g9sucgXJmUFB0tACH2QSgHywMAybGfmSb3LsEMNKsGJ9VsvYoh8lDET6X4Pyw-ZJU0_OLo_41q9w-OrGtlsTm_PuPIeXnxa6BLqnDaxC-4IcjG_FiPahNCTINl_1F_TgSSDZ4Taf4U9XFEIFw8wmgploELozzIzKq-t8nhQYkgAkt64euWpva3qL5KD1mTIZQEP-LZvh3s2WHrLi3fhbdRuwQ2c0KkJA2oSTFPDpqqbPGZ3QvuHQ==.AQAB"},{"rel":"http://ostatus.org/schema/1.0/subscribe","template":"https://ap.example.com/authorize_follow?acct={uri}"}]}
\ No newline at end of file
+{"subject":"acct:foo@ap.example.com","aliases":["https://ap.example.com/@foo","https://ap.example.com/users/foo"],"links":[{"rel":"http://webfinger.net/rel/profile-page","type":"text/html","href":"https://ap.example.com/@foo"},{"rel":"http://schemas.google.com/g/2010#updates-from","type":"application/atom+xml","href":"https://ap.example.com/users/foo.atom"},{"rel":"self","type":"application/html","href":"https://ap.example.com/users/foo.html"},{"rel":"self","type":"application/activity+json","href":"https://ap.example.com/users/foo"},{"rel":"self","type":"application/json","href":"https://ap.example.com/users/foo.json"},{"rel":"salmon","href":"https://ap.example.com/api/salmon/1"},{"rel":"magic-public-key","href":"data:application/magic-public-key,RSA.u3L4vnpNLzVH31MeWI394F0wKeJFsLDAsNXGeOu0QF2x-h1zLWZw_agqD2R3JPU9_kaDJGPIV2Sn5zLyUA9S6swCCMOtn7BBR9g9sucgXJmUFB0tACH2QSgHywMAybGfmSb3LsEMNKsGJ9VsvYoh8lDET6X4Pyw-ZJU0_OLo_41q9w-OrGtlsTm_PuPIeXnxa6BLqnDaxC-4IcjG_FiPahNCTINl_1F_TgSSDZ4Taf4U9XFEIFw8wmgploELozzIzKq-t8nhQYkgAkt64euWpva3qL5KD1mTIZQEP-LZvh3s2WHrLi3fhbdRuwQ2c0KkJA2oSTFPDpqqbPGZ3QvuHQ==.AQAB"},{"rel":"http://ostatus.org/schema/1.0/subscribe","template":"https://ap.example.com/authorize_follow?acct={uri}"}]}
\ No newline at end of file
diff --git a/spec/fixtures/requests/webfinger.txt b/spec/fixtures/requests/webfinger.txt
index f337ecae6f1501..fce821bddbf5c8 100644
--- a/spec/fixtures/requests/webfinger.txt
+++ b/spec/fixtures/requests/webfinger.txt
@@ -8,4 +8,4 @@ Access-Control-Allow-Origin: *
 Vary: Accept-Encoding,Cookie
 Strict-Transport-Security: max-age=31536000; includeSubdomains;
 
-{"subject":"acct:gargron@quitter.no","aliases":["https:\/\/quitter.no\/user\/7477","https:\/\/quitter.no\/gargron","https:\/\/quitter.no\/index.php\/user\/7477","https:\/\/quitter.no\/index.php\/gargron"],"links":[{"rel":"http:\/\/webfinger.net\/rel\/profile-page","type":"text\/html","href":"https:\/\/quitter.no\/gargron"},{"rel":"http:\/\/gmpg.org\/xfn\/11","type":"text\/html","href":"https:\/\/quitter.no\/gargron"},{"rel":"describedby","type":"application\/rdf+xml","href":"https:\/\/quitter.no\/gargron\/foaf"},{"rel":"http:\/\/apinamespace.org\/atom","type":"application\/atomsvc+xml","href":"https:\/\/quitter.no\/api\/statusnet\/app\/service\/gargron.xml"},{"rel":"http:\/\/apinamespace.org\/twitter","href":"https:\/\/quitter.no\/api\/"},{"rel":"http:\/\/specs.openid.net\/auth\/2.0\/provider","href":"https:\/\/quitter.no\/gargron"},{"rel":"http:\/\/schemas.google.com\/g\/2010#updates-from","type":"application\/atom+xml","href":"https:\/\/quitter.no\/api\/statuses\/user_timeline\/7477.atom"},{"rel":"magic-public-key","href":"data:application\/magic-public-key,RSA.1ZBkHTavLvxH3FzlKv4O6WtlILKRFfNami3_Rcu8EuogtXSYiS-bB6hElZfUCSHbC4uLemOA34PEhz__CDMozax1iI_t8dzjDnh1x0iFSup7pSfW9iXk_WU3Dm74yWWW2jildY41vWgrEstuQ1dJ8vVFfSJ9T_tO4c-T9y8vDI8=.AQAB"},{"rel":"salmon","href":"https:\/\/quitter.no\/main\/salmon\/user\/7477"},{"rel":"http:\/\/salmon-protocol.org\/ns\/salmon-replies","href":"https:\/\/quitter.no\/main\/salmon\/user\/7477"},{"rel":"http:\/\/salmon-protocol.org\/ns\/salmon-mention","href":"https:\/\/quitter.no\/main\/salmon\/user\/7477"},{"rel":"http:\/\/ostatus.org\/schema\/1.0\/subscribe","template":"https:\/\/quitter.no\/main\/ostatussub?profile={uri}"}]}
+{"subject":"acct:gargron@quitter.no","aliases":["https:\/\/quitter.no\/user\/7477","https:\/\/quitter.no\/gargron","https:\/\/quitter.no\/index.php\/user\/7477","https:\/\/quitter.no\/index.php\/gargron"],"links":[{"rel":"http:\/\/webfinger.net\/rel\/profile-page","type":"text\/html","href":"https:\/\/quitter.no\/gargron"},{"rel":"http:\/\/gmpg.org\/xfn\/11","type":"text\/html","href":"https:\/\/quitter.no\/gargron"},{"rel":"describedby","type":"application\/rdf+xml","href":"https:\/\/quitter.no\/gargron\/foaf"},{"rel":"self","type":"application/activity+json","href":"https://ap.example.com/users/foo"},{"rel":"http:\/\/apinamespace.org\/atom","type":"application\/atomsvc+xml","href":"https:\/\/quitter.no\/api\/statusnet\/app\/service\/gargron.xml"},{"rel":"http:\/\/apinamespace.org\/twitter","href":"https:\/\/quitter.no\/api\/"},{"rel":"http:\/\/specs.openid.net\/auth\/2.0\/provider","href":"https:\/\/quitter.no\/gargron"},{"rel":"http:\/\/schemas.google.com\/g\/2010#updates-from","type":"application\/atom+xml","href":"https:\/\/quitter.no\/api\/statuses\/user_timeline\/7477.atom"},{"rel":"magic-public-key","href":"data:application\/magic-public-key,RSA.1ZBkHTavLvxH3FzlKv4O6WtlILKRFfNami3_Rcu8EuogtXSYiS-bB6hElZfUCSHbC4uLemOA34PEhz__CDMozax1iI_t8dzjDnh1x0iFSup7pSfW9iXk_WU3Dm74yWWW2jildY41vWgrEstuQ1dJ8vVFfSJ9T_tO4c-T9y8vDI8=.AQAB"},{"rel":"salmon","href":"https:\/\/quitter.no\/main\/salmon\/user\/7477"},{"rel":"http:\/\/salmon-protocol.org\/ns\/salmon-replies","href":"https:\/\/quitter.no\/main\/salmon\/user\/7477"},{"rel":"http:\/\/salmon-protocol.org\/ns\/salmon-mention","href":"https:\/\/quitter.no\/main\/salmon\/user\/7477"},{"rel":"http:\/\/ostatus.org\/schema\/1.0\/subscribe","template":"https:\/\/quitter.no\/main\/ostatussub?profile={uri}"}]}
diff --git a/spec/lib/webfinger_spec.rb b/spec/lib/webfinger_spec.rb
new file mode 100644
index 00000000000000..5015deac7ffd87
--- /dev/null
+++ b/spec/lib/webfinger_spec.rb
@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe Webfinger do
+  describe 'self link' do
+    context 'when self link is specified with type application/activity+json' do
+      let!(:webfinger) { { subject: 'acct:alice@example.com', links: [{ rel: 'self', href: 'https://example.com/alice', type: 'application/activity+json' }] } }
+
+      it 'correctly parses the response' do
+        stub_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com').to_return(body: Oj.dump(webfinger), headers: { 'Content-Type': 'application/jrd+json' })
+
+        response = described_class.new('acct:alice@example.com').perform
+
+        expect(response.self_link_href).to eq 'https://example.com/alice'
+      end
+    end
+
+    context 'when self link is specified with type application/ld+json' do
+      let!(:webfinger) { { subject: 'acct:alice@example.com', links: [{ rel: 'self', href: 'https://example.com/alice', type: 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"' }] } }
+
+      it 'correctly parses the response' do
+        stub_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com').to_return(body: Oj.dump(webfinger), headers: { 'Content-Type': 'application/jrd+json' })
+
+        response = described_class.new('acct:alice@example.com').perform
+
+        expect(response.self_link_href).to eq 'https://example.com/alice'
+      end
+    end
+
+    context 'when self link is specified with incorrect type' do
+      let!(:webfinger) { { subject: 'acct:alice@example.com', links: [{ rel: 'self', href: 'https://example.com/alice', type: 'application/json"' }] } }
+
+      it 'raises an error' do
+        stub_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com').to_return(body: Oj.dump(webfinger), headers: { 'Content-Type': 'application/jrd+json' })
+
+        expect { described_class.new('acct:alice@example.com').perform }.to raise_error(Webfinger::Error)
+      end
+    end
+  end
+end
diff --git a/spec/services/activitypub/fetch_remote_account_service_spec.rb b/spec/services/activitypub/fetch_remote_account_service_spec.rb
index 789a705c41e880..175ac9cb61fa1b 100644
--- a/spec/services/activitypub/fetch_remote_account_service_spec.rb
+++ b/spec/services/activitypub/fetch_remote_account_service_spec.rb
@@ -33,7 +33,7 @@
     end
 
     context 'when the account does not have a inbox' do
-      let!(:webfinger) { { subject: 'acct:alice@example.com', links: [{ rel: 'self', href: 'https://example.com/alice' }] } }
+      let!(:webfinger) { { subject: 'acct:alice@example.com', links: [{ rel: 'self', href: 'https://example.com/alice', type: 'application/activity+json' }] } }
 
       before do
         actor[:inbox] = nil
@@ -51,7 +51,7 @@
     end
 
     context 'when URI and WebFinger share the same host' do
-      let!(:webfinger) { { subject: 'acct:alice@example.com', links: [{ rel: 'self', href: 'https://example.com/alice' }] } }
+      let!(:webfinger) { { subject: 'acct:alice@example.com', links: [{ rel: 'self', href: 'https://example.com/alice', type: 'application/activity+json' }] } }
 
       before do
         stub_request(:get, 'https://example.com/alice').to_return(body: Oj.dump(actor), headers: { 'Content-Type': 'application/activity+json' })
@@ -72,7 +72,7 @@
     end
 
     context 'when WebFinger presents different domain than URI' do
-      let!(:webfinger) { { subject: 'acct:alice@iscool.af', links: [{ rel: 'self', href: 'https://example.com/alice' }] } }
+      let!(:webfinger) { { subject: 'acct:alice@iscool.af', links: [{ rel: 'self', href: 'https://example.com/alice', type: 'application/activity+json' }] } }
 
       before do
         stub_request(:get, 'https://example.com/alice').to_return(body: Oj.dump(actor), headers: { 'Content-Type': 'application/activity+json' })
@@ -95,7 +95,7 @@
     end
 
     context 'when WebFinger returns a different URI' do
-      let!(:webfinger) { { subject: 'acct:alice@example.com', links: [{ rel: 'self', href: 'https://example.com/bob' }] } }
+      let!(:webfinger) { { subject: 'acct:alice@example.com', links: [{ rel: 'self', href: 'https://example.com/bob', type: 'application/activity+json' }] } }
 
       before do
         stub_request(:get, 'https://example.com/alice').to_return(body: Oj.dump(actor), headers: { 'Content-Type': 'application/activity+json' })
@@ -111,7 +111,7 @@
     end
 
     context 'when WebFinger returns a different URI after a redirection' do
-      let!(:webfinger) { { subject: 'acct:alice@iscool.af', links: [{ rel: 'self', href: 'https://example.com/bob' }] } }
+      let!(:webfinger) { { subject: 'acct:alice@iscool.af', links: [{ rel: 'self', href: 'https://example.com/bob', type: 'application/activity+json' }] } }
 
       before do
         stub_request(:get, 'https://example.com/alice').to_return(body: Oj.dump(actor), headers: { 'Content-Type': 'application/activity+json' })
diff --git a/spec/services/activitypub/fetch_remote_actor_service_spec.rb b/spec/services/activitypub/fetch_remote_actor_service_spec.rb
index 025051e9fa7ef0..9d031cb89bcad9 100644
--- a/spec/services/activitypub/fetch_remote_actor_service_spec.rb
+++ b/spec/services/activitypub/fetch_remote_actor_service_spec.rb
@@ -33,7 +33,7 @@
     end
 
     context 'when the account does not have a inbox' do
-      let!(:webfinger) { { subject: 'acct:alice@example.com', links: [{ rel: 'self', href: 'https://example.com/alice' }] } }
+      let!(:webfinger) { { subject: 'acct:alice@example.com', links: [{ rel: 'self', href: 'https://example.com/alice', type: 'application/activity+json' }] } }
 
       before do
         actor[:inbox] = nil
@@ -51,7 +51,7 @@
     end
 
     context 'when URI and WebFinger share the same host' do
-      let!(:webfinger) { { subject: 'acct:alice@example.com', links: [{ rel: 'self', href: 'https://example.com/alice' }] } }
+      let!(:webfinger) { { subject: 'acct:alice@example.com', links: [{ rel: 'self', href: 'https://example.com/alice', type: 'application/activity+json' }] } }
 
       before do
         stub_request(:get, 'https://example.com/alice').to_return(body: Oj.dump(actor), headers: { 'Content-Type': 'application/activity+json' })
@@ -72,7 +72,7 @@
     end
 
     context 'when WebFinger presents different domain than URI' do
-      let!(:webfinger) { { subject: 'acct:alice@iscool.af', links: [{ rel: 'self', href: 'https://example.com/alice' }] } }
+      let!(:webfinger) { { subject: 'acct:alice@iscool.af', links: [{ rel: 'self', href: 'https://example.com/alice', type: 'application/activity+json' }] } }
 
       before do
         stub_request(:get, 'https://example.com/alice').to_return(body: Oj.dump(actor), headers: { 'Content-Type': 'application/activity+json' })
@@ -95,7 +95,7 @@
     end
 
     context 'when WebFinger returns a different URI' do
-      let!(:webfinger) { { subject: 'acct:alice@example.com', links: [{ rel: 'self', href: 'https://example.com/bob' }] } }
+      let!(:webfinger) { { subject: 'acct:alice@example.com', links: [{ rel: 'self', href: 'https://example.com/bob', type: 'application/activity+json' }] } }
 
       before do
         stub_request(:get, 'https://example.com/alice').to_return(body: Oj.dump(actor), headers: { 'Content-Type': 'application/activity+json' })
@@ -111,7 +111,7 @@
     end
 
     context 'when WebFinger returns a different URI after a redirection' do
-      let!(:webfinger) { { subject: 'acct:alice@iscool.af', links: [{ rel: 'self', href: 'https://example.com/bob' }] } }
+      let!(:webfinger) { { subject: 'acct:alice@iscool.af', links: [{ rel: 'self', href: 'https://example.com/bob', type: 'application/activity+json' }] } }
 
       before do
         stub_request(:get, 'https://example.com/alice').to_return(body: Oj.dump(actor), headers: { 'Content-Type': 'application/activity+json' })
diff --git a/spec/services/activitypub/fetch_remote_key_service_spec.rb b/spec/services/activitypub/fetch_remote_key_service_spec.rb
index b6fcf3f479a23b..847a154108cbe4 100644
--- a/spec/services/activitypub/fetch_remote_key_service_spec.rb
+++ b/spec/services/activitypub/fetch_remote_key_service_spec.rb
@@ -5,7 +5,7 @@
 RSpec.describe ActivityPub::FetchRemoteKeyService do
   subject { described_class.new }
 
-  let(:webfinger) { { subject: 'acct:alice@example.com', links: [{ rel: 'self', href: 'https://example.com/alice' }] } }
+  let(:webfinger) { { subject: 'acct:alice@example.com', links: [{ rel: 'self', href: 'https://example.com/alice', type: 'application/activity+json' }] } }
 
   let(:public_key_pem) do
     <<~TEXT
diff --git a/spec/services/activitypub/process_account_service_spec.rb b/spec/services/activitypub/process_account_service_spec.rb
index 4fbb527b39041e..86314e6b4851e8 100644
--- a/spec/services/activitypub/process_account_service_spec.rb
+++ b/spec/services/activitypub/process_account_service_spec.rb
@@ -215,7 +215,7 @@
         }.with_indifferent_access
         webfinger = {
           subject: "acct:user#{i}@foo.test",
-          links: [{ rel: 'self', href: "https://foo.test/users/#{i}" }],
+          links: [{ rel: 'self', href: "https://foo.test/users/#{i}", type: 'application/activity+json' }],
         }.with_indifferent_access
         stub_request(:get, "https://foo.test/users/#{i}").to_return(status: 200, body: actor_json.to_json, headers: { 'Content-Type': 'application/activity+json' })
         stub_request(:get, "https://foo.test/users/#{i}/featured").to_return(status: 200, body: featured_json.to_json, headers: { 'Content-Type': 'application/activity+json' })

From 8b7f93cc7fa7a8421ceddeaa79e487360a4ad223 Mon Sep 17 00:00:00 2001
From: Michael Stanclift <mx@vmstan.com>
Date: Tue, 23 Jul 2024 10:30:45 -0500
Subject: [PATCH 1610/2191] Recolor Preferences/Admin UI to better match main
 design (#31034)

---
 .../styles/mastodon-light/diff.scss           | 106 ++++++++---
 app/javascript/styles/mastodon/accounts.scss  |  10 +-
 app/javascript/styles/mastodon/admin.scss     | 176 ++++++++++--------
 app/javascript/styles/mastodon/basics.scss    |   2 +-
 .../styles/mastodon/components.scss           |  23 ++-
 .../styles/mastodon/containers.scss           |   2 +-
 app/javascript/styles/mastodon/dashboard.scss |   5 +-
 .../styles/mastodon/emoji_picker.scss         |   2 +-
 app/javascript/styles/mastodon/forms.scss     |  35 ++--
 app/javascript/styles/mastodon/rtl.scss       |   2 +-
 app/javascript/styles/mastodon/tables.scss    |  68 ++++---
 app/javascript/styles/mastodon/widgets.scss   |   8 +-
 app/views/admin/roles/index.html.haml         |   4 +-
 .../registrations/_account_warning.html.haml  |  12 +-
 14 files changed, 266 insertions(+), 189 deletions(-)

diff --git a/app/javascript/styles/mastodon-light/diff.scss b/app/javascript/styles/mastodon-light/diff.scss
index a41272364a3106..635bab546018b2 100644
--- a/app/javascript/styles/mastodon-light/diff.scss
+++ b/app/javascript/styles/mastodon-light/diff.scss
@@ -23,7 +23,7 @@ html {
 // Change default background colors of columns
 .interaction-modal {
   background: $white;
-  border: 1px solid lighten($ui-base-color, 8%);
+  border: 1px solid var(--background-border-color);
 }
 
 .rules-list li::before {
@@ -75,8 +75,8 @@ html {
 }
 
 .getting-started .navigation-bar {
-  border-top: 1px solid lighten($ui-base-color, 8%);
-  border-bottom: 1px solid lighten($ui-base-color, 8%);
+  border-top: 1px solid var(--background-border-color);
+  border-bottom: 1px solid var(--background-border-color);
 
   @media screen and (max-width: $no-gap-breakpoint) {
     border-top: 0;
@@ -88,7 +88,7 @@ html {
 .setting-text,
 .report-dialog-modal__textarea,
 .audio-player {
-  border: 1px solid lighten($ui-base-color, 8%);
+  border: 1px solid var(--background-border-color);
 }
 
 .report-dialog-modal .dialog-option .poll__input {
@@ -140,7 +140,6 @@ html {
 .actions-modal ul li:not(:empty) a:focus button,
 .actions-modal ul li:not(:empty) a:hover,
 .actions-modal ul li:not(:empty) a:hover button,
-.admin-wrapper .sidebar ul .simple-navigation-active-leaf a,
 .simple_form .block-button,
 .simple_form .button,
 .simple_form button {
@@ -175,7 +174,7 @@ html {
 .picture-in-picture__footer,
 .reactions-bar__item {
   background: $white;
-  border: 1px solid lighten($ui-base-color, 8%);
+  border: 1px solid var(--background-border-color);
 }
 
 .reactions-bar__item:hover,
@@ -217,7 +216,7 @@ html {
 
 .column-header__collapsible-inner {
   background: darken($ui-base-color, 4%);
-  border: 1px solid lighten($ui-base-color, 8%);
+  border: 1px solid var(--background-border-color);
   border-bottom: 0;
 }
 
@@ -259,7 +258,7 @@ html {
 
 .embed-modal .embed-modal__container .embed-modal__html {
   background: $white;
-  border: 1px solid lighten($ui-base-color, 8%);
+  border: 1px solid var(--background-border-color);
 
   &:focus {
     border-color: lighten($ui-base-color, 12%);
@@ -298,7 +297,7 @@ html {
 .directory__tag > a,
 .directory__tag > div {
   background: $white;
-  border: 1px solid lighten($ui-base-color, 8%);
+  border: 1px solid var(--background-border-color);
 
   @media screen and (max-width: $no-gap-breakpoint) {
     border-left: 0;
@@ -307,18 +306,6 @@ html {
   }
 }
 
-.simple_form {
-  input[type='text'],
-  input[type='number'],
-  input[type='email'],
-  input[type='password'],
-  textarea {
-    &:hover {
-      border-color: lighten($ui-base-color, 12%);
-    }
-  }
-}
-
 .picture-in-picture-placeholder {
   background: $white;
   border-color: lighten($ui-base-color, 8%);
@@ -346,7 +333,7 @@ html {
 }
 
 .activity-stream {
-  border: 1px solid lighten($ui-base-color, 8%);
+  border: 1px solid var(--background-border-color);
 
   &--under-tabs {
     border-top: 0;
@@ -411,6 +398,22 @@ html {
     color: $ui-highlight-color;
     background-color: rgba($ui-highlight-color, 0.1);
   }
+
+  input[type='text'],
+  input[type='number'],
+  input[type='email'],
+  input[type='password'],
+  input[type='url'],
+  input[type='datetime-local'],
+  textarea {
+    background: darken($ui-base-color, 10%);
+  }
+
+  select {
+    background: darken($ui-base-color, 10%)
+      url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 14.933 18.467' height='19.698' width='15.929'><path d='M3.467 14.967l-3.393-3.5H14.86l-3.392 3.5c-1.866 1.925-3.666 3.5-4 3.5-.335 0-2.135-1.575-4-3.5zm.266-11.234L7.467 0 11.2 3.733l3.733 3.734H0l3.733-3.734z' fill='#{hex-color(lighten($ui-base-color, 12%))}'/></svg>")
+      no-repeat right 8px center / auto 14px;
+  }
 }
 
 .compose-form .compose-form__warning {
@@ -449,8 +452,24 @@ html {
   box-shadow: none;
 }
 
+.card {
+  &__img {
+    background: darken($ui-base-color, 10%);
+  }
+
+  & > a {
+    &:hover,
+    &:active,
+    &:focus {
+      .card__bar {
+        background: darken($ui-base-color, 10%);
+      }
+    }
+  }
+}
+
 .mute-modal select {
-  border: 1px solid lighten($ui-base-color, 8%);
+  border: 1px solid var(--background-border-color);
   background: $simple-background-color
     url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 14.933 18.467' height='19.698' width='15.929'><path d='M3.467 14.967l-3.393-3.5H14.86l-3.392 3.5c-1.866 1.925-3.666 3.5-4 3.5-.335 0-2.135-1.575-4-3.5zm.266-11.234L7.467 0 11.2 3.733l3.733 3.734H0l3.733-3.734z' fill='#{hex-color(lighten($ui-base-color, 8%))}'/></svg>")
     no-repeat right 8px center / auto 16px;
@@ -491,6 +510,7 @@ html {
 .search__popout,
 .emoji-mart-search input,
 .language-dropdown__dropdown .emoji-mart-search input,
+// .strike-card,
 .poll__option input[type='text'] {
   background: darken($ui-base-color, 10%);
 }
@@ -507,3 +527,43 @@ html {
 .inline-follow-suggestions__body__scroll-button__icon {
   color: $white;
 }
+
+a.sparkline {
+  &:hover,
+  &:focus,
+  &:active {
+    background: darken($ui-base-color, 10%);
+  }
+}
+
+.dashboard__counters {
+  & > div {
+    & > a {
+      &:hover,
+      &:focus,
+      &:active {
+        background: darken($ui-base-color, 10%);
+      }
+    }
+  }
+}
+
+.directory {
+  &__tag {
+    & > a {
+      &:hover,
+      &:focus,
+      &:active {
+        background: darken($ui-base-color, 10%);
+      }
+    }
+  }
+}
+
+.strike-entry {
+  &:hover,
+  &:focus,
+  &:active {
+    background: darken($ui-base-color, 10%);
+  }
+}
diff --git a/app/javascript/styles/mastodon/accounts.scss b/app/javascript/styles/mastodon/accounts.scss
index 80d6c13cef72fb..e63601fa9f1fd7 100644
--- a/app/javascript/styles/mastodon/accounts.scss
+++ b/app/javascript/styles/mastodon/accounts.scss
@@ -10,7 +10,7 @@
     &:active,
     &:focus {
       .card__bar {
-        background: lighten($ui-base-color, 8%);
+        background: $ui-base-color;
       }
     }
   }
@@ -18,7 +18,9 @@
   &__img {
     height: 130px;
     position: relative;
-    background: darken($ui-base-color, 12%);
+    background: $ui-base-color;
+    border: 1px solid var(--background-border-color);
+    border-bottom: none;
 
     img {
       display: block;
@@ -39,7 +41,9 @@
     display: flex;
     justify-content: flex-start;
     align-items: center;
-    background: lighten($ui-base-color, 4%);
+    background: var(--background-color);
+    border: 1px solid var(--background-border-color);
+    border-top: none;
 
     .avatar {
       flex: 0 0 auto;
diff --git a/app/javascript/styles/mastodon/admin.scss b/app/javascript/styles/mastodon/admin.scss
index 06a3b520216d04..7420a6fc598634 100644
--- a/app/javascript/styles/mastodon/admin.scss
+++ b/app/javascript/styles/mastodon/admin.scss
@@ -1,7 +1,7 @@
 @use 'sass:math';
 
 $no-columns-breakpoint: 600px;
-$sidebar-width: 240px;
+$sidebar-width: 300px;
 $content-width: 840px;
 
 .admin-wrapper {
@@ -26,7 +26,7 @@ $content-width: 840px;
     &__inner {
       display: flex;
       justify-content: flex-end;
-      background: $ui-base-color;
+      background: var(--background-color);
       height: 100%;
     }
   }
@@ -38,7 +38,7 @@ $content-width: 840px;
 
     &__toggle {
       display: none;
-      background: darken($ui-base-color, 4%);
+      background: var(--background-color);
       border-bottom: 1px solid lighten($ui-base-color, 4%);
       align-items: center;
 
@@ -103,7 +103,6 @@ $content-width: 840px;
 
     ul {
       list-style: none;
-      border-radius: 4px 0 0 4px;
       overflow: hidden;
       margin-bottom: 20px;
 
@@ -112,13 +111,13 @@ $content-width: 840px;
       }
 
       a {
+        font-size: 14px;
         display: block;
         padding: 15px;
         color: $darker-text-color;
         text-decoration: none;
         transition: all 200ms linear;
         transition-property: color, background-color;
-        border-radius: 4px 0 0 4px;
         white-space: nowrap;
         overflow: hidden;
         text-overflow: ellipsis;
@@ -129,19 +128,13 @@ $content-width: 840px;
 
         &:hover {
           color: $primary-text-color;
-          background-color: darken($ui-base-color, 5%);
           transition: all 100ms linear;
           transition-property: color, background-color;
         }
-
-        &.selected {
-          border-radius: 4px 0 0;
-        }
       }
 
       ul {
-        background: darken($ui-base-color, 4%);
-        border-radius: 0 0 0 4px;
+        background: var(--background-color);
         margin: 0;
 
         a {
@@ -156,16 +149,10 @@ $content-width: 840px;
       }
 
       .simple-navigation-active-leaf a {
-        color: $primary-text-color;
-        background-color: $ui-highlight-color;
+        color: $highlight-text-color;
         border-bottom: 0;
-        border-radius: 0;
       }
     }
-
-    & > ul > .simple-navigation-active-leaf a {
-      border-radius: 4px 0 0 4px;
-    }
   }
 
   .content-wrapper {
@@ -299,7 +286,7 @@ $content-width: 840px;
       color: $darker-text-color;
       padding-bottom: 8px;
       margin-bottom: 8px;
-      border-bottom: 1px solid lighten($ui-base-color, 8%);
+      border-bottom: 1px solid var(--background-border-color);
     }
 
     h6 {
@@ -372,7 +359,7 @@ $content-width: 840px;
       width: 100%;
       height: 0;
       border: 0;
-      border-bottom: 1px solid rgba($ui-base-lighter-color, 0.6);
+      border-bottom: 1px solid var(--background-border-color);
       margin: 20px 0;
 
       &.spacer {
@@ -410,14 +397,14 @@ $content-width: 840px;
           inset-inline-start: 0;
           bottom: 0;
           overflow-y: auto;
-          background: $ui-base-color;
+          background: var(--background-color);
         }
       }
 
       ul a,
       ul ul a {
+        font-size: 16px;
         border-radius: 0;
-        border-bottom: 1px solid lighten($ui-base-color, 4%);
         transition: none;
 
         &:hover {
@@ -683,8 +670,10 @@ body,
   line-height: 20px;
   padding: 15px;
   padding-inline-start: 15px * 2 + 40px;
-  background: $ui-base-color;
-  border-bottom: 1px solid darken($ui-base-color, 8%);
+  background: var(--background-color);
+  border-right: 1px solid var(--background-border-color);
+  border-left: 1px solid var(--background-border-color);
+  border-bottom: 1px solid var(--background-border-color);
   position: relative;
   text-decoration: none;
   color: $darker-text-color;
@@ -693,18 +682,13 @@ body,
   &:first-child {
     border-top-left-radius: 4px;
     border-top-right-radius: 4px;
+    border-top: 1px solid var(--background-border-color);
   }
 
   &:last-child {
     border-bottom-left-radius: 4px;
     border-bottom-right-radius: 4px;
-    border-bottom: 0;
-  }
-
-  &:hover,
-  &:focus,
-  &:active {
-    background: lighten($ui-base-color, 4%);
+    border-bottom: 1px solid var(--background-border-color);
   }
 
   &__avatar {
@@ -744,6 +728,47 @@ body,
   }
 }
 
+.strike-entry {
+  display: block;
+  line-height: 20px;
+  padding: 15px;
+  padding-inline-start: 15px * 2 + 40px;
+  background: var(--background-color);
+  border: 1px solid var(--background-border-color);
+  border-radius: 4px;
+  position: relative;
+  text-decoration: none;
+  color: $darker-text-color;
+  font-size: 14px;
+  margin-bottom: 15px;
+
+  &__avatar {
+    position: absolute;
+    inset-inline-start: 15px;
+    top: 15px;
+
+    .avatar {
+      border-radius: 4px;
+      width: 40px;
+      height: 40px;
+    }
+  }
+
+  &__title {
+    word-wrap: break-word;
+  }
+
+  &__timestamp {
+    color: $dark-text-color;
+  }
+
+  &:hover,
+  &:focus,
+  &:active {
+    background: $ui-base-color;
+  }
+}
+
 a.name-tag,
 .name-tag,
 a.inline-name-tag,
@@ -751,6 +776,10 @@ a.inline-name-tag,
   text-decoration: none;
   color: $secondary-text-color;
 
+  &:hover {
+    color: $highlight-text-color;
+  }
+
   .username {
     font-weight: 500;
   }
@@ -830,7 +859,8 @@ a.name-tag,
 }
 
 .report-card {
-  background: $ui-base-color;
+  background: var(--background-color);
+  border: 1px solid var(--background-border-color);
   border-radius: 4px;
   margin-bottom: 20px;
 
@@ -842,7 +872,6 @@ a.name-tag,
 
     .account {
       padding: 0;
-      border: 0;
 
       &__avatar-wrapper {
         margin-inline-start: 0;
@@ -863,7 +892,7 @@ a.name-tag,
         &:focus,
         &:hover,
         &:active {
-          color: lighten($darker-text-color, 8%);
+          color: $highlight-text-color;
         }
       }
 
@@ -877,11 +906,7 @@ a.name-tag,
     &__item {
       display: flex;
       justify-content: flex-start;
-      border-top: 1px solid darken($ui-base-color, 4%);
-
-      &:hover {
-        background: lighten($ui-base-color, 2%);
-      }
+      border-top: 1px solid var(--background-border-color);
 
       &__reported-by,
       &__assigned {
@@ -904,7 +929,6 @@ a.name-tag,
         max-width: calc(100% - 300px);
 
         &__icon {
-          color: $dark-text-color;
           margin-inline-end: 4px;
           font-weight: 500;
         }
@@ -917,6 +941,10 @@ a.name-tag,
         padding: 15px;
         text-decoration: none;
         color: $darker-text-color;
+
+        &:hover {
+          color: $highlight-text-color;
+        }
       }
     }
   }
@@ -952,14 +980,15 @@ a.name-tag,
 
   .account__header__fields,
   .account__header__content {
-    background: lighten($ui-base-color, 8%);
+    background: var(--background-color);
+    border: 1px solid var(--background-border-color);
     border-radius: 4px;
     height: 100%;
   }
 
   .account__header__fields {
     margin: 0;
-    border: 0;
+    border: 1px solid var(--background-border-color);
 
     a {
       color: $highlight-text-color;
@@ -988,8 +1017,8 @@ a.name-tag,
 .applications-list__item,
 .filters-list__item {
   padding: 15px 0;
-  background: $ui-base-color;
-  border: 1px solid lighten($ui-base-color, 4%);
+  background: var(--background-color);
+  border: 1px solid var(--background-border-color);
   border-radius: 4px;
   margin-top: 15px;
 }
@@ -1000,13 +1029,13 @@ a.name-tag,
 
 .announcements-list,
 .filters-list {
-  border: 1px solid lighten($ui-base-color, 4%);
+  border: 1px solid var(--background-border-color);
   border-radius: 4px;
+  border-bottom: none;
 
   &__item {
     padding: 15px 0;
-    background: $ui-base-color;
-    border-bottom: 1px solid lighten($ui-base-color, 4%);
+    border-bottom: 1px solid var(--background-border-color);
 
     &__title {
       padding: 0 15px;
@@ -1018,6 +1047,10 @@ a.name-tag,
       text-decoration: none;
       margin-bottom: 10px;
 
+      &:hover {
+        color: $highlight-text-color;
+      }
+
       .account-role {
         vertical-align: middle;
       }
@@ -1056,10 +1089,6 @@ a.name-tag,
     &__permissions {
       margin-top: 10px;
     }
-
-    &:last-child {
-      border-bottom: 0;
-    }
   }
 }
 
@@ -1109,7 +1138,7 @@ a.name-tag,
 
   &__table {
     &__number {
-      color: $secondary-text-color;
+      color: var(--background-color);
       padding: 10px;
     }
 
@@ -1136,7 +1165,7 @@ a.name-tag,
 
     &__box {
       box-sizing: border-box;
-      background: $ui-highlight-color;
+      background: var(--background-color);
       padding: 10px;
       font-weight: 500;
       color: $primary-text-color;
@@ -1158,8 +1187,9 @@ a.name-tag,
 .sparkline {
   display: block;
   text-decoration: none;
-  background: lighten($ui-base-color, 4%);
+  background: var(--background-color);
   border-radius: 4px;
+  border: 1px solid var(--background-border-color);
   padding: 0;
   position: relative;
   padding-bottom: 55px + 20px;
@@ -1231,12 +1261,12 @@ a.sparkline {
   &:hover,
   &:focus,
   &:active {
-    background: lighten($ui-base-color, 6%);
+    background: $ui-base-color;
   }
 }
 
 .skeleton {
-  background-color: lighten($ui-base-color, 8%);
+  background-color: var(--background-color);
   background-image: linear-gradient(
     90deg,
     lighten($ui-base-color, 8%),
@@ -1316,17 +1346,13 @@ a.sparkline {
 
 .report-reason-selector {
   border-radius: 4px;
-  background: $ui-base-color;
+  background: var(--background-color);
   margin-bottom: 20px;
 
   &__category {
     cursor: pointer;
     border-bottom: 1px solid darken($ui-base-color, 8%);
 
-    &:last-child {
-      border-bottom: 0;
-    }
-
     &__label {
       padding: 15px;
       display: flex;
@@ -1355,7 +1381,7 @@ a.sparkline {
 
   &__details {
     &__item {
-      border-bottom: 1px solid lighten($ui-base-color, 8%);
+      border-bottom: 1px solid var(--background-border-color);
       padding: 15px 0;
 
       &:last-child {
@@ -1386,7 +1412,7 @@ a.sparkline {
 
 .account-card {
   border-radius: 4px;
-  border: 1px solid lighten($ui-base-color, 8%);
+  border: 1px solid var(--background-border-color);
   position: relative;
 
   &__warning-badge {
@@ -1474,7 +1500,6 @@ a.sparkline {
       position: absolute;
       bottom: 0;
       inset-inline-end: 15px;
-      background: linear-gradient(to left, $ui-base-color, transparent);
       pointer-events: none;
     }
 
@@ -1550,11 +1575,11 @@ a.sparkline {
   margin-bottom: 20px;
 
   &__item {
-    background: $ui-base-color;
+    background: var(--background-color);
     position: relative;
     padding: 15px;
     padding-inline-start: 15px * 2 + 40px;
-    border-bottom: 1px solid darken($ui-base-color, 8%);
+    border: 1px solid var(--background-border-color);
 
     &:first-child {
       border-top-left-radius: 4px;
@@ -1564,11 +1589,6 @@ a.sparkline {
     &:last-child {
       border-bottom-left-radius: 4px;
       border-bottom-right-radius: 4px;
-      border-bottom: 0;
-    }
-
-    &:hover {
-      background-color: lighten($ui-base-color, 4%);
     }
 
     &__avatar {
@@ -1646,13 +1666,10 @@ a.sparkline {
 }
 
 .report-actions {
-  border: 1px solid darken($ui-base-color, 8%);
-
   &__item {
     display: flex;
     align-items: center;
     line-height: 18px;
-    border-bottom: 1px solid darken($ui-base-color, 8%);
 
     &:last-child {
       border-bottom: 0;
@@ -1715,8 +1732,6 @@ a.sparkline {
 
 .strike-card {
   padding: 15px;
-  border-radius: 4px;
-  background: $ui-base-color;
   font-size: 15px;
   line-height: 20px;
   word-wrap: break-word;
@@ -1724,6 +1739,8 @@ a.sparkline {
   color: $primary-text-color;
   box-sizing: border-box;
   min-height: 100%;
+  border: 1px solid var(--background-border-color);
+  border-radius: 4px;
 
   a {
     color: $highlight-text-color;
@@ -1764,15 +1781,14 @@ a.sparkline {
 
   &__statuses-list {
     border-radius: 4px;
-    border: 1px solid darken($ui-base-color, 8%);
+    border: 1px solid var(--background-border-color);
     font-size: 13px;
     line-height: 18px;
     overflow: hidden;
 
     &__item {
       padding: 16px;
-      background: lighten($ui-base-color, 2%);
-      border-bottom: 1px solid darken($ui-base-color, 8%);
+      border-bottom: 1px solid var(--background-border-color);
 
       &:last-child {
         border-bottom: 0;
diff --git a/app/javascript/styles/mastodon/basics.scss b/app/javascript/styles/mastodon/basics.scss
index 2e7d5e5e9c5287..456e042c535357 100644
--- a/app/javascript/styles/mastodon/basics.scss
+++ b/app/javascript/styles/mastodon/basics.scss
@@ -122,7 +122,7 @@ body {
   }
 
   &.admin {
-    background: darken($ui-base-color, 4%);
+    background: var(--background-color);
     padding: 0;
   }
 
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 18a775fb2f13f8..58c9b53a2cfdd5 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -521,7 +521,7 @@ body > [data-popper-placement] {
     gap: 16px;
     flex: 0 1 auto;
     border-radius: 4px;
-    border: 1px solid lighten($ui-base-color, 8%);
+    border: 1px solid var(--background-border-color);
     transition: border-color 300ms linear;
     min-height: 0;
     position: relative;
@@ -587,7 +587,7 @@ body > [data-popper-placement] {
 
     .autosuggest-input {
       flex: 1 1 auto;
-      border-bottom: 1px solid lighten($ui-base-color, 8%);
+      border-bottom: 1px solid var(--background-border-color);
     }
   }
 
@@ -1452,7 +1452,7 @@ body > [data-popper-placement] {
   }
 
   &--first-in-thread {
-    border-top: 1px solid lighten($ui-base-color, 8%);
+    border-top: 1px solid var(--background-border-color);
   }
 
   &__line {
@@ -1794,7 +1794,6 @@ body > [data-popper-placement] {
 
 .account {
   padding: 16px;
-  border-bottom: 1px solid var(--background-border-color);
 
   .account__display-name {
     flex: 1 1 auto;
@@ -3325,7 +3324,7 @@ $ui-header-logo-wordmark-width: 99px;
 .copy-paste-text {
   background: lighten($ui-base-color, 4%);
   border-radius: 8px;
-  border: 1px solid lighten($ui-base-color, 8%);
+  border: 1px solid var(--background-border-color);
   padding: 16px;
   color: $primary-text-color;
   font-size: 15px;
@@ -4728,7 +4727,7 @@ a.status-card {
 
   section {
     padding: 16px;
-    border-bottom: 1px solid lighten($ui-base-color, 8%);
+    border-bottom: 1px solid var(--background-border-color);
 
     &:last-child {
       border-bottom: 0;
@@ -5316,7 +5315,7 @@ a.status-card {
       input {
         padding: 8px 12px;
         background: $ui-base-color;
-        border: 1px solid lighten($ui-base-color, 8%);
+        border: 1px solid var(--background-border-color);
         color: $darker-text-color;
 
         @media screen and (width <= 600px) {
@@ -5402,7 +5401,7 @@ a.status-card {
     margin-top: -2px;
     width: 100%;
     background: $ui-base-color;
-    border: 1px solid lighten($ui-base-color, 8%);
+    border: 1px solid var(--background-border-color);
     border-radius: 0 0 4px 4px;
     box-shadow: var(--dropdown-shadow);
     z-index: 99;
@@ -8789,13 +8788,13 @@ noscript {
   }
 
   .search__input {
-    border: 1px solid lighten($ui-base-color, 8%);
+    border: 1px solid var(--background-border-color);
     padding: 10px;
     padding-inline-end: 30px;
   }
 
   .search__popout {
-    border: 1px solid lighten($ui-base-color, 8%);
+    border: 1px solid var(--background-border-color);
   }
 
   .search .icon {
@@ -9114,7 +9113,7 @@ noscript {
     &__input {
       @include search-input;
 
-      border: 1px solid lighten($ui-base-color, 8%);
+      border: 1px solid var(--background-border-color);
       padding: 4px 6px;
       color: $primary-text-color;
       font-size: 16px;
@@ -9149,7 +9148,7 @@ noscript {
       margin-top: -1px;
       padding-top: 5px;
       padding-bottom: 5px;
-      border: 1px solid lighten($ui-base-color, 8%);
+      border: 1px solid var(--background-border-color);
     }
 
     &.focused &__input {
diff --git a/app/javascript/styles/mastodon/containers.scss b/app/javascript/styles/mastodon/containers.scss
index 8a472d75b13cf6..9363e428b3809b 100644
--- a/app/javascript/styles/mastodon/containers.scss
+++ b/app/javascript/styles/mastodon/containers.scss
@@ -63,7 +63,7 @@
   padding: 20px 0;
   margin-top: 40px;
   margin-bottom: 10px;
-  border-bottom: 1px solid lighten($ui-base-color, 8%);
+  border-bottom: 1px solid var(--background-border-color);
 
   @media screen and (width <= 440px) {
     width: 100%;
diff --git a/app/javascript/styles/mastodon/dashboard.scss b/app/javascript/styles/mastodon/dashboard.scss
index 36a7f44253f423..12d0a6b92f9b90 100644
--- a/app/javascript/styles/mastodon/dashboard.scss
+++ b/app/javascript/styles/mastodon/dashboard.scss
@@ -13,8 +13,9 @@
     & > div,
     & > a {
       padding: 20px;
-      background: lighten($ui-base-color, 4%);
+      background: var(--background-color);
       border-radius: 4px;
+      border: 1px solid var(--background-border-color);
       box-sizing: border-box;
       height: 100%;
     }
@@ -27,7 +28,7 @@
       &:hover,
       &:focus,
       &:active {
-        background: lighten($ui-base-color, 8%);
+        background: $ui-base-color;
       }
     }
   }
diff --git a/app/javascript/styles/mastodon/emoji_picker.scss b/app/javascript/styles/mastodon/emoji_picker.scss
index b9fdaa58473438..3652ad4abbbbaf 100644
--- a/app/javascript/styles/mastodon/emoji_picker.scss
+++ b/app/javascript/styles/mastodon/emoji_picker.scss
@@ -105,7 +105,7 @@
     width: 100%;
     background: $ui-base-color;
     color: $darker-text-color;
-    border: 1px solid lighten($ui-base-color, 8%);
+    border: 1px solid var(--background-border-color);
     border-radius: 4px;
 
     &::-moz-focus-inner {
diff --git a/app/javascript/styles/mastodon/forms.scss b/app/javascript/styles/mastodon/forms.scss
index 26bb2bee1450ad..13a731f7f6392e 100644
--- a/app/javascript/styles/mastodon/forms.scss
+++ b/app/javascript/styles/mastodon/forms.scss
@@ -414,7 +414,7 @@ code {
   }
 
   .input.static .label_input__wrapper {
-    font-size: 16px;
+    font-size: 14px;
     padding: 10px;
     border: 1px solid $dark-text-color;
     border-radius: 4px;
@@ -436,13 +436,14 @@ code {
     outline: 0;
     font-family: inherit;
     resize: vertical;
-    background: darken($ui-base-color, 10%);
-    border: 1px solid darken($ui-base-color, 10%);
-    border-radius: 8px;
+    background: $ui-base-color;
+    border: 1px solid var(--background-border-color);
+    border-radius: 4px;
     padding: 10px 16px;
 
     &::placeholder {
-      color: lighten($darker-text-color, 4%);
+      color: $dark-text-color;
+      opacity: 1;
     }
 
     &:invalid {
@@ -453,11 +454,6 @@ code {
       border-color: $valid-value-color;
     }
 
-    &:active,
-    &:focus {
-      border-color: $highlight-text-color;
-    }
-
     @media screen and (width <= 600px) {
       font-size: 16px;
     }
@@ -576,21 +572,25 @@ code {
   select {
     appearance: none;
     box-sizing: border-box;
-    font-size: 16px;
+    font-size: 14px;
     color: $primary-text-color;
     display: block;
     width: 100%;
     outline: 0;
     font-family: inherit;
     resize: vertical;
-    background: darken($ui-base-color, 10%)
+    background: $ui-base-color
       url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 14.933 18.467' height='19.698' width='15.929'><path d='M3.467 14.967l-3.393-3.5H14.86l-3.392 3.5c-1.866 1.925-3.666 3.5-4 3.5-.335 0-2.135-1.575-4-3.5zm.266-11.234L7.467 0 11.2 3.733l3.733 3.734H0l3.733-3.734z' fill='#{hex-color(lighten($ui-base-color, 12%))}'/></svg>")
-      no-repeat right 8px center / auto 16px;
-    border: 1px solid darken($ui-base-color, 14%);
+      no-repeat right 8px center / auto 14px;
+    border: 1px solid var(--background-border-color);
     border-radius: 4px;
     padding-inline-start: 10px;
     padding-inline-end: 30px;
     height: 41px;
+
+    @media screen and (width <= 600px) {
+      font-size: 16px;
+    }
   }
 
   h4 {
@@ -644,8 +644,9 @@ code {
 }
 
 .flash-message {
-  background: lighten($ui-base-color, 8%);
-  color: $darker-text-color;
+  background: var(--background-color);
+  color: $highlight-text-color;
+  border: 1px solid $highlight-text-color;
   border-radius: 4px;
   padding: 15px 10px;
   margin-bottom: 30px;
@@ -1335,7 +1336,7 @@ code {
 
     &__toggle > div {
       display: flex;
-      border-inline-start: 1px solid lighten($ui-base-color, 8%);
+      border-inline-start: 1px solid var(--background-border-color);
       padding-inline-start: 16px;
     }
   }
diff --git a/app/javascript/styles/mastodon/rtl.scss b/app/javascript/styles/mastodon/rtl.scss
index b5c4836bcd7726..8d3efcb5726197 100644
--- a/app/javascript/styles/mastodon/rtl.scss
+++ b/app/javascript/styles/mastodon/rtl.scss
@@ -46,7 +46,7 @@ body.rtl {
   }
 
   .simple_form select {
-    background: darken($ui-base-color, 10%)
+    background: $ui-base-color
       url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 14.933 18.467' height='19.698' width='15.929'><path d='M3.467 14.967l-3.393-3.5H14.86l-3.392 3.5c-1.866 1.925-3.666 3.5-4 3.5-.335 0-2.135-1.575-4-3.5zm.266-11.234L7.467 0 11.2 3.733l3.733 3.734H0l3.733-3.734z' fill='#{hex-color(lighten($ui-base-color, 12%))}'/></svg>")
       no-repeat left 8px center / auto 16px;
   }
diff --git a/app/javascript/styles/mastodon/tables.scss b/app/javascript/styles/mastodon/tables.scss
index dd5b483ec48e21..eab79371507f7c 100644
--- a/app/javascript/styles/mastodon/tables.scss
+++ b/app/javascript/styles/mastodon/tables.scss
@@ -9,9 +9,9 @@
     padding: 8px;
     line-height: 18px;
     vertical-align: top;
-    border-top: 1px solid $ui-base-color;
+    border-bottom: 1px solid var(--background-border-color);
     text-align: start;
-    background: darken($ui-base-color, 4%);
+    background: var(--background-color);
 
     &.critical {
       font-weight: 700;
@@ -21,8 +21,6 @@
 
   & > thead > tr > th {
     vertical-align: bottom;
-    border-bottom: 2px solid $ui-base-color;
-    border-top: 0;
     font-weight: 500;
   }
 
@@ -32,15 +30,20 @@
 
   & > tbody > tr:nth-child(odd) > td,
   & > tbody > tr:nth-child(odd) > th {
-    background: $ui-base-color;
+    background: var(--background-color);
+  }
+
+  & > tbody > tr:last-child > td,
+  & > tbody > tr:last-child > th {
+    border-bottom: 0;
   }
 
   a {
-    color: $highlight-text-color;
-    text-decoration: underline;
+    color: $darker-text-color;
+    text-decoration: none;
 
     &:hover {
-      text-decoration: none;
+      color: $highlight-text-color;
     }
   }
 
@@ -78,7 +81,7 @@
     & > tbody > tr > td {
       padding: 11px 10px;
       background: transparent;
-      border: 1px solid lighten($ui-base-color, 8%);
+      border: 1px solid var(--background-border-color);
       color: $secondary-text-color;
     }
 
@@ -90,18 +93,18 @@
 
   &.batch-table {
     & > thead > tr > th {
-      background: $ui-base-color;
-      border-top: 1px solid darken($ui-base-color, 8%);
-      border-bottom: 1px solid darken($ui-base-color, 8%);
+      background: var(--background-color);
+      border-top: 1px solid var(--background-border-color);
+      border-bottom: 1px solid var(--background-border-color);
 
       &:first-child {
         border-radius: 4px 0 0;
-        border-inline-start: 1px solid darken($ui-base-color, 8%);
+        border-inline-start: 1px solid var(--background-border-color);
       }
 
       &:last-child {
         border-radius: 0 4px 0 0;
-        border-inline-end: 1px solid darken($ui-base-color, 8%);
+        border-inline-end: 1px solid var(--background-border-color);
       }
     }
   }
@@ -136,7 +139,7 @@ a.table-action-link {
   font-weight: 500;
 
   &:hover {
-    color: $primary-text-color;
+    color: $highlight-text-color;
   }
 
   i.fa {
@@ -186,9 +189,9 @@ a.table-action-link {
     position: sticky;
     top: 0;
     z-index: 1;
-    border: 1px solid darken($ui-base-color, 8%);
-    background: $ui-base-color;
-    border-radius: 4px 0 0;
+    border: 1px solid var(--background-border-color);
+    background: var(--background-color);
+    border-radius: 4px 4px 0 0;
     height: 47px;
     align-items: center;
 
@@ -199,11 +202,11 @@ a.table-action-link {
   }
 
   &__select-all {
-    background: $ui-base-color;
+    background: var(--background-color);
     height: 47px;
     align-items: center;
     justify-content: center;
-    border: 1px solid darken($ui-base-color, 8%);
+    border: 1px solid var(--background-border-color);
     border-top: 0;
     color: $secondary-text-color;
     display: none;
@@ -249,9 +252,9 @@ a.table-action-link {
 
   &__form {
     padding: 16px;
-    border: 1px solid darken($ui-base-color, 8%);
+    border: 1px solid var(--background-border-color);
     border-top: 0;
-    background: $ui-base-color;
+    background: var(--background-color);
 
     .fields-row {
       padding-top: 0;
@@ -260,26 +263,18 @@ a.table-action-link {
   }
 
   &__row {
-    border: 1px solid darken($ui-base-color, 8%);
+    border: 1px solid var(--background-border-color);
     border-top: 0;
-    background: darken($ui-base-color, 4%);
+    background: var(--background-color);
 
     @media screen and (max-width: $no-gap-breakpoint) {
       .optional &:first-child {
-        border-top: 1px solid darken($ui-base-color, 8%);
+        border-top: 1px solid var(--background-border-color);
       }
     }
 
-    &:hover {
-      background: darken($ui-base-color, 2%);
-    }
-
     &:nth-child(even) {
-      background: $ui-base-color;
-
-      &:hover {
-        background: lighten($ui-base-color, 2%);
-      }
+      background: var(--background-color);
     }
 
     &__content {
@@ -357,12 +352,13 @@ a.table-action-link {
   }
 
   .nothing-here {
-    border: 1px solid darken($ui-base-color, 8%);
+    border: 1px solid var(--background-border-color);
     border-top: 0;
     box-shadow: none;
+    background: var(--background-color);
 
     @media screen and (max-width: $no-gap-breakpoint) {
-      border-top: 1px solid darken($ui-base-color, 8%);
+      border-top: 1px solid var(--background-border-color);
     }
   }
 
diff --git a/app/javascript/styles/mastodon/widgets.scss b/app/javascript/styles/mastodon/widgets.scss
index 1f69f0cf01cf69..0d56bd9c48bc71 100644
--- a/app/javascript/styles/mastodon/widgets.scss
+++ b/app/javascript/styles/mastodon/widgets.scss
@@ -204,7 +204,7 @@
 }
 
 .directory {
-  background: $ui-base-color;
+  background: var(--background-color);
   border-radius: 4px;
   box-shadow: 0 0 15px rgba($base-shadow-color, 0.2);
 
@@ -217,7 +217,7 @@
       display: flex;
       align-items: center;
       justify-content: space-between;
-      background: $ui-base-color;
+      border: 1px solid lighten($ui-base-color, 8%);
       border-radius: 4px;
       padding: 15px;
       text-decoration: none;
@@ -229,7 +229,7 @@
       &:hover,
       &:active,
       &:focus {
-        background: lighten($ui-base-color, 8%);
+        background: $ui-base-color;
       }
     }
 
@@ -351,7 +351,7 @@
       &:focus,
       &:hover,
       &:active {
-        text-decoration: underline;
+        color: $highlight-text-color;
       }
     }
   }
diff --git a/app/views/admin/roles/index.html.haml b/app/views/admin/roles/index.html.haml
index 4f6c511b4fae08..90a647cc8a8187 100644
--- a/app/views/admin/roles/index.html.haml
+++ b/app/views/admin/roles/index.html.haml
@@ -8,10 +8,10 @@
 
 %hr.spacer/
 
-.applications-list
+.announcements-list
   = render partial: 'role', collection: @roles.select(&:everyone?)
 
 %hr.spacer/
 
-.applications-list
+.announcements-list
   = render partial: 'role', collection: @roles.reject(&:everyone?)
diff --git a/app/views/auth/registrations/_account_warning.html.haml b/app/views/auth/registrations/_account_warning.html.haml
index 19e5746ff63c08..c51179b49dad8e 100644
--- a/app/views/auth/registrations/_account_warning.html.haml
+++ b/app/views/auth/registrations/_account_warning.html.haml
@@ -1,14 +1,14 @@
-= link_to disputes_strike_path(account_warning), class: 'log-entry' do
-  .log-entry__header
-    .log-entry__avatar
+= link_to disputes_strike_path(account_warning), class: 'strike-entry' do
+  .strike-entry__header
+    .strike-entry__avatar
       .indicator-icon{ class: account_warning.overruled? ? 'success' : 'failure' }
         = fa_icon 'warning'
-    .log-entry__content
-      .log-entry__title
+    .strike-entry__content
+      .strike-entry__title
         = t 'disputes.strikes.title',
             action: t(account_warning.action, scope: 'disputes.strikes.title_actions'),
             date: l(account_warning.created_at.to_date)
-      .log-entry__timestamp
+      .strike-entry__timestamp
         %time.formatted{ datetime: account_warning.created_at.iso8601 }= l(account_warning.created_at)
 
         - if account_warning.overruled?

From 838ea5f9cdac103a6f5cc9f63c35315f8985eeb1 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 23 Jul 2024 08:20:17 +0200
Subject: [PATCH 1611/2191] [Glitch] Fix keyboard shortcuts and navigation in
 grouped notifications

Port af06d74574745deb738e6f526f4d74c31760102d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/actions/accounts.js       | 12 +++
 .../flavours/glitch/actions/compose.js        | 18 ++++
 .../flavours/glitch/actions/statuses.js       | 14 +++
 .../flavours/glitch/components/status.jsx     | 14 +--
 .../components/notification_group.tsx         | 21 ++++-
 .../notification_group_with_status.tsx        | 76 +++++++++------
 .../components/notification_with_status.tsx   | 94 ++++++++++++++-----
 7 files changed, 187 insertions(+), 62 deletions(-)

diff --git a/app/javascript/flavours/glitch/actions/accounts.js b/app/javascript/flavours/glitch/actions/accounts.js
index 7c31c16998d0a3..699b92dd09f4bb 100644
--- a/app/javascript/flavours/glitch/actions/accounts.js
+++ b/app/javascript/flavours/glitch/actions/accounts.js
@@ -1,3 +1,5 @@
+import { browserHistory } from 'flavours/glitch/components/router';
+
 import api, { getLinks } from '../api';
 
 import {
@@ -722,6 +724,16 @@ export const updateAccount = ({ displayName, note, avatar, header, discoverable,
   });
 };
 
+export const navigateToProfile = (accountId) => {
+  return (_dispatch, getState) => {
+    const acct = getState().accounts.getIn([accountId, 'acct']);
+  
+    if (acct) {
+      browserHistory.push(`/@${acct}`);
+    }
+  };
+};
+
 export function fetchPinnedAccountsSuggestions(q) {
   return (dispatch) => {
     dispatch(fetchPinnedAccountsSuggestionsRequest());
diff --git a/app/javascript/flavours/glitch/actions/compose.js b/app/javascript/flavours/glitch/actions/compose.js
index 2041278a1ccc7d..e850a83a855a60 100644
--- a/app/javascript/flavours/glitch/actions/compose.js
+++ b/app/javascript/flavours/glitch/actions/compose.js
@@ -131,6 +131,18 @@ export function replyCompose(status) {
   };
 }
 
+export function replyComposeById(statusId) {
+  return (dispatch, getState) => {
+    const state = getState();
+    const status = state.statuses.get(statusId);
+
+    if (status) {
+      const account = state.accounts.get(status.get('account'));
+      dispatch(replyCompose(status.set('account', account)));
+    }
+  };
+}
+
 export function cancelReplyCompose() {
   return {
     type: COMPOSE_REPLY_CANCEL,
@@ -163,6 +175,12 @@ export function mentionCompose(account) {
   };
 }
 
+export function mentionComposeById(accountId) {
+  return (dispatch, getState) => {
+    dispatch(mentionCompose(getState().accounts.get(accountId)));
+  };
+}
+
 export function directCompose(account) {
   return (dispatch, getState) => {
     dispatch({
diff --git a/app/javascript/flavours/glitch/actions/statuses.js b/app/javascript/flavours/glitch/actions/statuses.js
index 2ebe0bf96a38f8..2d83ae9926895a 100644
--- a/app/javascript/flavours/glitch/actions/statuses.js
+++ b/app/javascript/flavours/glitch/actions/statuses.js
@@ -1,3 +1,5 @@
+import { browserHistory } from 'flavours/glitch/components/router';
+
 import api from '../api';
 
 import { ensureComposeIsVisible, setComposeToStatus } from './compose';
@@ -364,3 +366,15 @@ export const undoStatusTranslation = (id, pollId) => ({
   id,
   pollId,
 });
+
+export const navigateToStatus = (statusId) => {
+  return (_dispatch, getState) => {
+    const state = getState();
+    const accountId = state.statuses.getIn([statusId, 'account']);
+    const acct = state.accounts.getIn([accountId, 'acct']);
+
+    if (acct) {
+      browserHistory.push(`/@${acct}/${statusId}`);
+    }
+  };
+};
diff --git a/app/javascript/flavours/glitch/components/status.jsx b/app/javascript/flavours/glitch/components/status.jsx
index e002e4df8ce425..a037895b4e1924 100644
--- a/app/javascript/flavours/glitch/components/status.jsx
+++ b/app/javascript/flavours/glitch/components/status.jsx
@@ -520,7 +520,7 @@ class Status extends ImmutablePureComponent {
   }
 
   render () {
-    const { intl, hidden, featured, unread, pictureInPicture, previousId, nextInReplyToId, rootId, skipPrepend, avatarSize = 46 } = this.props;
+    const { intl, hidden, featured, unfocusable, unread, pictureInPicture, previousId, nextInReplyToId, rootId, skipPrepend, avatarSize = 46 } = this.props;
 
     const {
       parseClick,
@@ -585,8 +585,8 @@ class Status extends ImmutablePureComponent {
 
     if (hidden) {
       return (
-        <HotKeys handlers={handlers}>
-          <div ref={this.handleRef} className='status focusable' tabIndex={0}>
+        <HotKeys handlers={handlers} tabIndex={unfocusable ? null : -1}>
+          <div ref={this.handleRef} className='status focusable' tabIndex={unfocusable ? null : 0}>
             <span>{status.getIn(['account', 'display_name']) || status.getIn(['account', 'username'])}</span>
             <span>{status.get('content')}</span>
           </div>
@@ -606,8 +606,8 @@ class Status extends ImmutablePureComponent {
       };
 
       return (
-        <HotKeys handlers={minHandlers}>
-          <div className='status__wrapper status__wrapper--filtered focusable' tabIndex={0} ref={this.handleRef}>
+        <HotKeys handlers={minHandlers} tabIndex={unfocusable ? null : -1}>
+          <div className='status__wrapper status__wrapper--filtered focusable' tabIndex={unfocusable ? null : 0} ref={this.handleRef}>
             <FormattedMessage id='status.filtered' defaultMessage='Filtered' />: {matchedFilters.join(', ')}.
             {' '}
             <button className='status__wrapper--filtered__button' onClick={this.handleUnfilterClick}>
@@ -786,11 +786,11 @@ class Status extends ImmutablePureComponent {
     contentMedia.push(hashtagBar);
 
     return (
-      <HotKeys handlers={handlers}>
+      <HotKeys handlers={handlers} tabIndex={unfocusable ? null : -1}>
         <div
           className={classNames('status__wrapper', 'focusable', `status__wrapper-${status.get('visibility')}`, { 'status__wrapper-reply': !!status.get('in_reply_to_id'), unread, collapsed: isCollapsed })}
           {...selectorAttribs}
-          tabIndex={0}
+          tabIndex={unfocusable ? null : 0}
           data-featured={featured ? 'true' : null}
           aria-label={textForScreenReader(intl, status, rebloggedByText, !status.get('hidden'))}
           ref={this.handleRef}
diff --git a/app/javascript/flavours/glitch/features/notifications_v2/components/notification_group.tsx b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_group.tsx
index b1346a88e0fe5d..f4275179c5efe9 100644
--- a/app/javascript/flavours/glitch/features/notifications_v2/components/notification_group.tsx
+++ b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_group.tsx
@@ -2,8 +2,10 @@ import { useMemo } from 'react';
 
 import { HotKeys } from 'react-hotkeys';
 
+import { navigateToProfile } from 'flavours/glitch/actions/accounts';
+import { mentionComposeById } from 'flavours/glitch/actions/compose';
 import type { NotificationGroup as NotificationGroupModel } from 'flavours/glitch/models/notification_group';
-import { useAppSelector } from 'flavours/glitch/store';
+import { useAppSelector, useAppDispatch } from 'flavours/glitch/store';
 
 import { NotificationAdminReport } from './notification_admin_report';
 import { NotificationAdminSignUp } from './notification_admin_sign_up';
@@ -30,6 +32,13 @@ export const NotificationGroup: React.FC<{
     ),
   );
 
+  const dispatch = useAppDispatch();
+
+  const accountId =
+    notificationGroup?.type === 'gap'
+      ? undefined
+      : notificationGroup?.sampleAccountIds[0];
+
   const handlers = useMemo(
     () => ({
       moveUp: () => {
@@ -39,8 +48,16 @@ export const NotificationGroup: React.FC<{
       moveDown: () => {
         onMoveDown(notificationGroupId);
       },
+
+      openProfile: () => {
+        if (accountId) dispatch(navigateToProfile(accountId));
+      },
+
+      mention: () => {
+        if (accountId) dispatch(mentionComposeById(accountId));
+      },
     }),
-    [notificationGroupId, onMoveUp, onMoveDown],
+    [dispatch, notificationGroupId, accountId, onMoveUp, onMoveDown],
   );
 
   if (!notificationGroup || notificationGroup.type === 'gap') return null;
diff --git a/app/javascript/flavours/glitch/features/notifications_v2/components/notification_group_with_status.tsx b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_group_with_status.tsx
index e2466209a84a35..a7c1170d854d06 100644
--- a/app/javascript/flavours/glitch/features/notifications_v2/components/notification_group_with_status.tsx
+++ b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_group_with_status.tsx
@@ -2,9 +2,14 @@ import { useMemo } from 'react';
 
 import classNames from 'classnames';
 
+import { HotKeys } from 'react-hotkeys';
+
+import { replyComposeById } from 'flavours/glitch/actions/compose';
+import { navigateToStatus } from 'flavours/glitch/actions/statuses';
 import type { IconProp } from 'flavours/glitch/components/icon';
 import { Icon } from 'flavours/glitch/components/icon';
 import { RelativeTimestamp } from 'flavours/glitch/components/relative_timestamp';
+import { useAppDispatch } from 'flavours/glitch/store';
 
 import { AvatarGroup } from './avatar_group';
 import { EmbeddedStatus } from './embedded_status';
@@ -39,6 +44,8 @@ export const NotificationGroupWithStatus: React.FC<{
   type,
   unread,
 }) => {
+  const dispatch = useAppDispatch();
+
   const label = useMemo(
     () =>
       labelRenderer({
@@ -53,39 +60,54 @@ export const NotificationGroupWithStatus: React.FC<{
     [labelRenderer, accountIds, count, labelSeeMoreHref],
   );
 
+  const handlers = useMemo(
+    () => ({
+      open: () => {
+        dispatch(navigateToStatus(statusId));
+      },
+
+      reply: () => {
+        dispatch(replyComposeById(statusId));
+      },
+    }),
+    [dispatch, statusId],
+  );
+
   return (
-    <div
-      role='button'
-      className={classNames(
-        `notification-group focusable notification-group--${type}`,
-        { 'notification-group--unread': unread },
-      )}
-      tabIndex={0}
-    >
-      <div className='notification-group__icon'>
-        <Icon icon={icon} id={iconId} />
-      </div>
+    <HotKeys handlers={handlers}>
+      <div
+        role='button'
+        className={classNames(
+          `notification-group focusable notification-group--${type}`,
+          { 'notification-group--unread': unread },
+        )}
+        tabIndex={0}
+      >
+        <div className='notification-group__icon'>
+          <Icon icon={icon} id={iconId} />
+        </div>
 
-      <div className='notification-group__main'>
-        <div className='notification-group__main__header'>
-          <div className='notification-group__main__header__wrapper'>
-            <AvatarGroup accountIds={accountIds} />
+        <div className='notification-group__main'>
+          <div className='notification-group__main__header'>
+            <div className='notification-group__main__header__wrapper'>
+              <AvatarGroup accountIds={accountIds} />
 
-            {actions}
-          </div>
+              {actions}
+            </div>
 
-          <div className='notification-group__main__header__label'>
-            {label}
-            {timestamp && <RelativeTimestamp timestamp={timestamp} />}
+            <div className='notification-group__main__header__label'>
+              {label}
+              {timestamp && <RelativeTimestamp timestamp={timestamp} />}
+            </div>
           </div>
-        </div>
 
-        {statusId && (
-          <div className='notification-group__main__status'>
-            <EmbeddedStatus statusId={statusId} />
-          </div>
-        )}
+          {statusId && (
+            <div className='notification-group__main__status'>
+              <EmbeddedStatus statusId={statusId} />
+            </div>
+          )}
+        </div>
       </div>
-    </div>
+    </HotKeys>
   );
 };
diff --git a/app/javascript/flavours/glitch/features/notifications_v2/components/notification_with_status.tsx b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_with_status.tsx
index 8f94e099769914..23e56ce3a50c82 100644
--- a/app/javascript/flavours/glitch/features/notifications_v2/components/notification_with_status.tsx
+++ b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_with_status.tsx
@@ -2,10 +2,21 @@ import { useMemo } from 'react';
 
 import classNames from 'classnames';
 
+import { HotKeys } from 'react-hotkeys';
+
+import { replyComposeById } from 'flavours/glitch/actions/compose';
+import {
+  toggleReblog,
+  toggleFavourite,
+} from 'flavours/glitch/actions/interactions';
+import {
+  navigateToStatus,
+  toggleStatusSpoilers,
+} from 'flavours/glitch/actions/statuses';
 import type { IconProp } from 'flavours/glitch/components/icon';
 import { Icon } from 'flavours/glitch/components/icon';
 import Status from 'flavours/glitch/containers/status_container';
-import { useAppSelector } from 'flavours/glitch/store';
+import { useAppSelector, useAppDispatch } from 'flavours/glitch/store';
 
 import { NamesList } from './names_list';
 import type { LabelRenderer } from './notification_group_with_status';
@@ -29,6 +40,8 @@ export const NotificationWithStatus: React.FC<{
   type,
   unread,
 }) => {
+  const dispatch = useAppDispatch();
+
   const label = useMemo(
     () =>
       labelRenderer({
@@ -41,33 +54,62 @@ export const NotificationWithStatus: React.FC<{
     (state) => state.statuses.getIn([statusId, 'visibility']) === 'direct',
   );
 
+  const handlers = useMemo(
+    () => ({
+      open: () => {
+        dispatch(navigateToStatus(statusId));
+      },
+
+      reply: () => {
+        dispatch(replyComposeById(statusId));
+      },
+
+      boost: () => {
+        dispatch(toggleReblog(statusId));
+      },
+
+      favourite: () => {
+        dispatch(toggleFavourite(statusId));
+      },
+
+      toggleHidden: () => {
+        // TODO: glitch-soc is different and needs different handling of CWs
+        dispatch(toggleStatusSpoilers(statusId));
+      },
+    }),
+    [dispatch, statusId],
+  );
+
   return (
-    <div
-      role='button'
-      className={classNames(
-        `notification-ungrouped focusable notification-ungrouped--${type}`,
-        {
-          'notification-ungrouped--unread': unread,
-          'notification-ungrouped--direct': isPrivateMention,
-        },
-      )}
-      tabIndex={0}
-    >
-      <div className='notification-ungrouped__header'>
-        <div className='notification-ungrouped__header__icon'>
-          <Icon icon={icon} id={iconId} />
+    <HotKeys handlers={handlers}>
+      <div
+        role='button'
+        className={classNames(
+          `notification-ungrouped focusable notification-ungrouped--${type}`,
+          {
+            'notification-ungrouped--unread': unread,
+            'notification-ungrouped--direct': isPrivateMention,
+          },
+        )}
+        tabIndex={0}
+      >
+        <div className='notification-ungrouped__header'>
+          <div className='notification-ungrouped__header__icon'>
+            <Icon icon={icon} id={iconId} />
+          </div>
+          {label}
         </div>
-        {label}
-      </div>
 
-      <Status
-        // @ts-expect-error -- <Status> is not yet typed
-        id={statusId}
-        contextType='notifications'
-        withDismiss
-        skipPrepend
-        avatarSize={40}
-      />
-    </div>
+        <Status
+          // @ts-expect-error -- <Status> is not yet typed
+          id={statusId}
+          contextType='notifications'
+          withDismiss
+          skipPrepend
+          avatarSize={40}
+          unfocusable
+        />
+      </div>
+    </HotKeys>
   );
 };

From 977337f2d245a617b970021379189555e8e1edb9 Mon Sep 17 00:00:00 2001
From: Nick Schonning <nschonni@gmail.com>
Date: Tue, 23 Jul 2024 02:46:09 -0400
Subject: [PATCH 1612/2191] [Glitch] Update Prettier to 3.3.3

Port 9a015a2a157b43ea63d911327248635e629a72c9 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/entrypoints/public.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/javascript/flavours/glitch/entrypoints/public.tsx b/app/javascript/flavours/glitch/entrypoints/public.tsx
index 5a8d5e08cb76b0..649af3a8807eb1 100644
--- a/app/javascript/flavours/glitch/entrypoints/public.tsx
+++ b/app/javascript/flavours/glitch/entrypoints/public.tsx
@@ -316,8 +316,8 @@ function loaded() {
 
       const message =
         statusEl.dataset.spoiler === 'expanded'
-          ? localeData['status.show_less'] ?? 'Show less'
-          : localeData['status.show_more'] ?? 'Show more';
+          ? (localeData['status.show_less'] ?? 'Show less')
+          : (localeData['status.show_more'] ?? 'Show more');
       spoilerLink.textContent = new IntlMessageFormat(
         message,
         locale,

From e507d17520facdba0375791c5530485abe9f59ee Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 23 Jul 2024 14:11:08 +0200
Subject: [PATCH 1613/2191] [Glitch] Widen the clickable area for statuses in
 grouped notifications

Port a8330be93ee825948a17c810af33e28bfa2c56c8 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../components/embedded_status.tsx            | 80 +++++++++++++++++--
 .../components/embedded_status_content.tsx    | 76 +-----------------
 .../flavours/glitch/styles/components.scss    |  3 +-
 3 files changed, 77 insertions(+), 82 deletions(-)

diff --git a/app/javascript/flavours/glitch/features/notifications_v2/components/embedded_status.tsx b/app/javascript/flavours/glitch/features/notifications_v2/components/embedded_status.tsx
index 530f305be712d1..3ff021e574eede 100644
--- a/app/javascript/flavours/glitch/features/notifications_v2/components/embedded_status.tsx
+++ b/app/javascript/flavours/glitch/features/notifications_v2/components/embedded_status.tsx
@@ -1,4 +1,4 @@
-import { useCallback } from 'react';
+import { useCallback, useRef } from 'react';
 
 import { FormattedMessage } from 'react-intl';
 
@@ -22,6 +22,7 @@ export const EmbeddedStatus: React.FC<{ statusId: string }> = ({
   statusId,
 }) => {
   const history = useHistory();
+  const clickCoordinatesRef = useRef<[number, number] | null>();
 
   const status = useAppSelector(
     (state) => state.statuses.get(statusId) as Status | undefined,
@@ -31,11 +32,69 @@ export const EmbeddedStatus: React.FC<{ statusId: string }> = ({
     state.accounts.get(status?.get('account') as string),
   );
 
-  const handleClick = useCallback(() => {
-    if (!account) return;
+  const handleMouseDown = useCallback<React.MouseEventHandler<HTMLDivElement>>(
+    ({ clientX, clientY }) => {
+      clickCoordinatesRef.current = [clientX, clientY];
+    },
+    [clickCoordinatesRef],
+  );
+
+  const handleMouseUp = useCallback<React.MouseEventHandler<HTMLDivElement>>(
+    ({ clientX, clientY, target, button }) => {
+      const [startX, startY] = clickCoordinatesRef.current ?? [0, 0];
+      const [deltaX, deltaY] = [
+        Math.abs(clientX - startX),
+        Math.abs(clientY - startY),
+      ];
+
+      let element: HTMLDivElement | null = target as HTMLDivElement;
+
+      while (element) {
+        if (
+          element.localName === 'button' ||
+          element.localName === 'a' ||
+          element.localName === 'label'
+        ) {
+          return;
+        }
+
+        element = element.parentNode as HTMLDivElement | null;
+      }
+
+      if (deltaX + deltaY < 5 && button === 0 && account) {
+        history.push(`/@${account.acct}/${statusId}`);
+      }
+
+      clickCoordinatesRef.current = null;
+    },
+    [clickCoordinatesRef, statusId, account, history],
+  );
 
-    history.push(`/@${account.acct}/${statusId}`);
-  }, [statusId, account, history]);
+  const handleMouseEnter = useCallback<React.MouseEventHandler<HTMLDivElement>>(
+    ({ currentTarget }) => {
+      const emojis =
+        currentTarget.querySelectorAll<HTMLImageElement>('.custom-emoji');
+
+      for (const emoji of emojis) {
+        const newSrc = emoji.getAttribute('data-original');
+        if (newSrc) emoji.src = newSrc;
+      }
+    },
+    [],
+  );
+
+  const handleMouseLeave = useCallback<React.MouseEventHandler<HTMLDivElement>>(
+    ({ currentTarget }) => {
+      const emojis =
+        currentTarget.querySelectorAll<HTMLImageElement>('.custom-emoji');
+
+      for (const emoji of emojis) {
+        const newSrc = emoji.getAttribute('data-static');
+        if (newSrc) emoji.src = newSrc;
+      }
+    },
+    [],
+  );
 
   if (!status) {
     return null;
@@ -51,7 +110,15 @@ export const EmbeddedStatus: React.FC<{ statusId: string }> = ({
   ).size;
 
   return (
-    <div className='notification-group__embedded-status'>
+    <div
+      className='notification-group__embedded-status'
+      role='button'
+      tabIndex={-1}
+      onMouseDown={handleMouseDown}
+      onMouseUp={handleMouseUp}
+      onMouseEnter={handleMouseEnter}
+      onMouseLeave={handleMouseLeave}
+    >
       <div className='notification-group__embedded-status__account'>
         <Avatar account={account} size={16} />
         <DisplayName account={account} />
@@ -62,7 +129,6 @@ export const EmbeddedStatus: React.FC<{ statusId: string }> = ({
         content={contentHtml}
         language={language}
         mentions={mentions}
-        onClick={handleClick}
       />
 
       {(poll || mediaAttachmentsSize > 0) && (
diff --git a/app/javascript/flavours/glitch/features/notifications_v2/components/embedded_status_content.tsx b/app/javascript/flavours/glitch/features/notifications_v2/components/embedded_status_content.tsx
index 310a6857115a61..1a38be536ba6a8 100644
--- a/app/javascript/flavours/glitch/features/notifications_v2/components/embedded_status_content.tsx
+++ b/app/javascript/flavours/glitch/features/notifications_v2/components/embedded_status_content.tsx
@@ -1,4 +1,4 @@
-import { useCallback, useRef } from 'react';
+import { useCallback } from 'react';
 
 import { useHistory } from 'react-router-dom';
 
@@ -34,76 +34,10 @@ export const EmbeddedStatusContent: React.FC<{
   content: string;
   mentions: List<Mention>;
   language: string;
-  onClick?: () => void;
   className?: string;
-}> = ({ content, mentions, language, onClick, className }) => {
-  const clickCoordinatesRef = useRef<[number, number] | null>();
+}> = ({ content, mentions, language, className }) => {
   const history = useHistory();
 
-  const handleMouseDown = useCallback<React.MouseEventHandler<HTMLDivElement>>(
-    ({ clientX, clientY }) => {
-      clickCoordinatesRef.current = [clientX, clientY];
-    },
-    [clickCoordinatesRef],
-  );
-
-  const handleMouseUp = useCallback<React.MouseEventHandler<HTMLDivElement>>(
-    ({ clientX, clientY, target, button }) => {
-      const [startX, startY] = clickCoordinatesRef.current ?? [0, 0];
-      const [deltaX, deltaY] = [
-        Math.abs(clientX - startX),
-        Math.abs(clientY - startY),
-      ];
-
-      let element: HTMLDivElement | null = target as HTMLDivElement;
-
-      while (element) {
-        if (
-          element.localName === 'button' ||
-          element.localName === 'a' ||
-          element.localName === 'label'
-        ) {
-          return;
-        }
-
-        element = element.parentNode as HTMLDivElement | null;
-      }
-
-      if (deltaX + deltaY < 5 && button === 0 && onClick) {
-        onClick();
-      }
-
-      clickCoordinatesRef.current = null;
-    },
-    [clickCoordinatesRef, onClick],
-  );
-
-  const handleMouseEnter = useCallback<React.MouseEventHandler<HTMLDivElement>>(
-    ({ currentTarget }) => {
-      const emojis =
-        currentTarget.querySelectorAll<HTMLImageElement>('.custom-emoji');
-
-      for (const emoji of emojis) {
-        const newSrc = emoji.getAttribute('data-original');
-        if (newSrc) emoji.src = newSrc;
-      }
-    },
-    [],
-  );
-
-  const handleMouseLeave = useCallback<React.MouseEventHandler<HTMLDivElement>>(
-    ({ currentTarget }) => {
-      const emojis =
-        currentTarget.querySelectorAll<HTMLImageElement>('.custom-emoji');
-
-      for (const emoji of emojis) {
-        const newSrc = emoji.getAttribute('data-static');
-        if (newSrc) emoji.src = newSrc;
-      }
-    },
-    [],
-  );
-
   const handleContentRef = useCallback(
     (node: HTMLDivElement | null) => {
       if (!node) {
@@ -150,16 +84,10 @@ export const EmbeddedStatusContent: React.FC<{
 
   return (
     <div
-      role='button'
-      tabIndex={0}
       className={className}
       ref={handleContentRef}
       lang={language}
       dangerouslySetInnerHTML={{ __html: content }}
-      onMouseDown={handleMouseDown}
-      onMouseUp={handleMouseUp}
-      onMouseEnter={handleMouseEnter}
-      onMouseLeave={handleMouseLeave}
     />
   );
 };
diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index cb22ca3674ae2f..151c54c7d6f487 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -11015,6 +11015,8 @@ noscript {
   }
 
   &__embedded-status {
+    cursor: pointer;
+
     &__account {
       display: flex;
       align-items: center;
@@ -11036,7 +11038,6 @@ noscript {
       font-size: 15px;
       line-height: 22px;
       color: $dark-text-color;
-      cursor: pointer;
       -webkit-line-clamp: 4;
       -webkit-box-orient: vertical;
       max-height: 4 * 22px;

From 06f070d86d448b97c082c038220becaec8a038ce Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 24 Jul 2024 10:13:09 +0200
Subject: [PATCH 1614/2191] fix(deps): update dependency fuzzysort to v3
 (#30315)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
---
 babel.config.js               |  2 +-
 config/webpack/rules/babel.js | 14 +++++++-------
 package.json                  |  2 +-
 yarn.lock                     | 10 +++++-----
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/babel.config.js b/babel.config.js
index 9ced748a9615f7..4c2fe5682bb53d 100644
--- a/babel.config.js
+++ b/babel.config.js
@@ -68,7 +68,7 @@ module.exports = (api) => {
     plugins,
     overrides: [
       {
-        test: /tesseract\.js/,
+        test: [/tesseract\.js/, /fuzzysort\.js/],
         presets: [
           ['@babel/env', { ...envOptions, modules: 'commonjs' }],
         ],
diff --git a/config/webpack/rules/babel.js b/config/webpack/rules/babel.js
index c7bf886e795bf6..902b823e1f80aa 100644
--- a/config/webpack/rules/babel.js
+++ b/config/webpack/rules/babel.js
@@ -2,19 +2,19 @@ const { join, resolve } = require('path');
 
 const { env, settings } = require('../configuration');
 
+// Those modules contain modern ES code that need to be transpiled for Webpack to process it
+const nodeModulesToProcess = [
+  '@reduxjs', 'fuzzysort'
+];
+
 module.exports = {
   test: /\.(js|jsx|mjs|ts|tsx)$/,
   include: [
     settings.source_path,
     ...settings.resolved_paths,
-    'node_modules/@reduxjs'
+    ...nodeModulesToProcess.map(p => resolve(`node_modules/${p}`)),
   ].map(p => resolve(p)),
-  exclude: function(modulePath) {
-    return (
-      /node_modules/.test(modulePath) &&
-      !/@reduxjs/.test(modulePath)
-    );
-  },
+  exclude: new RegExp('node_modules\\/(?!(' + nodeModulesToProcess.join('|')+')\\/).*'),
   use: [
     {
       loader: 'babel-loader',
diff --git a/package.json b/package.json
index 3bbea344317d00..385b8fb5b4145c 100644
--- a/package.json
+++ b/package.json
@@ -72,7 +72,7 @@
     "escape-html": "^1.0.3",
     "file-loader": "^6.2.0",
     "font-awesome": "^4.7.0",
-    "fuzzysort": "^2.0.4",
+    "fuzzysort": "^3.0.0",
     "glob": "^10.2.6",
     "history": "^4.10.1",
     "hoist-non-react-statics": "^3.3.2",
diff --git a/yarn.lock b/yarn.lock
index e32c54f71c994c..4b22ff75e2ce9d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2850,7 +2850,7 @@ __metadata:
     eslint-plugin-react-hooks: "npm:^4.6.0"
     file-loader: "npm:^6.2.0"
     font-awesome: "npm:^4.7.0"
-    fuzzysort: "npm:^2.0.4"
+    fuzzysort: "npm:^3.0.0"
     glob: "npm:^10.2.6"
     history: "npm:^4.10.1"
     hoist-non-react-statics: "npm:^3.3.2"
@@ -8876,10 +8876,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fuzzysort@npm:^2.0.4":
-  version: 2.0.4
-  resolution: "fuzzysort@npm:2.0.4"
-  checksum: 10c0/3170d16fccc0f4ac5e31323dbab7d0da7b1a4024878ed4d6b4ec86c0df94e12dc335f8d4181e38d97ca7919ac51bc5de4a9c2ec94914a4e51f9e9c05208c9ea9
+"fuzzysort@npm:^3.0.0":
+  version: 3.0.2
+  resolution: "fuzzysort@npm:3.0.2"
+  checksum: 10c0/c6cdbd092a8e91ed822aeac6d4fb95559759c10602cb29f27307c1cabd01fdd384fa399f7757722435b595244efb000cd63f144104c41b8551b2faff123279cb
   languageName: node
   linkType: hard
 

From 2919d8b0979f0da5467105fb311212acf15a24ac Mon Sep 17 00:00:00 2001
From: Michael Stanclift <mx@vmstan.com>
Date: Tue, 23 Jul 2024 10:30:45 -0500
Subject: [PATCH 1615/2191] [Glitch] Recolor Preferences/Admin UI to better
 match main design

Port 8b7f93cc7fa7a8421ceddeaa79e487360a4ad223 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/styles/accounts.scss      |  10 +-
 .../flavours/glitch/styles/admin.scss         | 176 ++++++++++--------
 .../flavours/glitch/styles/basics.scss        |   2 +-
 .../flavours/glitch/styles/components.scss    |  23 ++-
 .../flavours/glitch/styles/containers.scss    |   2 +-
 .../flavours/glitch/styles/dashboard.scss     |   5 +-
 .../flavours/glitch/styles/emoji_picker.scss  |   2 +-
 .../flavours/glitch/styles/forms.scss         |  35 ++--
 .../glitch/styles/mastodon-light/diff.scss    | 106 ++++++++---
 .../flavours/glitch/styles/rtl.scss           |   2 +-
 .../flavours/glitch/styles/tables.scss        |  68 ++++---
 .../flavours/glitch/styles/widgets.scss       |   8 +-
 12 files changed, 258 insertions(+), 181 deletions(-)

diff --git a/app/javascript/flavours/glitch/styles/accounts.scss b/app/javascript/flavours/glitch/styles/accounts.scss
index f31be33058a7db..eba786ff9f6ac5 100644
--- a/app/javascript/flavours/glitch/styles/accounts.scss
+++ b/app/javascript/flavours/glitch/styles/accounts.scss
@@ -10,7 +10,7 @@
     &:active,
     &:focus {
       .card__bar {
-        background: lighten($ui-base-color, 8%);
+        background: $ui-base-color;
       }
     }
   }
@@ -18,7 +18,9 @@
   &__img {
     height: 130px;
     position: relative;
-    background: darken($ui-base-color, 12%);
+    background: $ui-base-color;
+    border: 1px solid var(--background-border-color);
+    border-bottom: none;
 
     img {
       display: block;
@@ -39,7 +41,9 @@
     display: flex;
     justify-content: flex-start;
     align-items: center;
-    background: lighten($ui-base-color, 4%);
+    background: var(--background-color);
+    border: 1px solid var(--background-border-color);
+    border-top: none;
 
     .avatar {
       flex: 0 0 auto;
diff --git a/app/javascript/flavours/glitch/styles/admin.scss b/app/javascript/flavours/glitch/styles/admin.scss
index de8cc64e4f6163..f4289a9ac34afa 100644
--- a/app/javascript/flavours/glitch/styles/admin.scss
+++ b/app/javascript/flavours/glitch/styles/admin.scss
@@ -1,7 +1,7 @@
 @use 'sass:math';
 
 $no-columns-breakpoint: 600px;
-$sidebar-width: 240px;
+$sidebar-width: 300px;
 $content-width: 840px;
 
 .admin-wrapper {
@@ -19,7 +19,7 @@ $content-width: 840px;
     &__inner {
       display: flex;
       justify-content: flex-end;
-      background: $ui-base-color;
+      background: var(--background-color);
       height: 100%;
     }
   }
@@ -31,7 +31,7 @@ $content-width: 840px;
 
     &__toggle {
       display: none;
-      background: darken($ui-base-color, 4%);
+      background: var(--background-color);
       border-bottom: 1px solid lighten($ui-base-color, 4%);
       align-items: center;
 
@@ -96,7 +96,6 @@ $content-width: 840px;
 
     ul {
       list-style: none;
-      border-radius: 4px 0 0 4px;
       overflow: hidden;
       margin-bottom: 20px;
 
@@ -105,13 +104,13 @@ $content-width: 840px;
       }
 
       a {
+        font-size: 14px;
         display: block;
         padding: 15px;
         color: $darker-text-color;
         text-decoration: none;
         transition: all 200ms linear;
         transition-property: color, background-color;
-        border-radius: 4px 0 0 4px;
         white-space: nowrap;
         overflow: hidden;
         text-overflow: ellipsis;
@@ -122,19 +121,13 @@ $content-width: 840px;
 
         &:hover {
           color: $primary-text-color;
-          background-color: darken($ui-base-color, 5%);
           transition: all 100ms linear;
           transition-property: color, background-color;
         }
-
-        &.selected {
-          border-radius: 4px 0 0;
-        }
       }
 
       ul {
-        background: darken($ui-base-color, 4%);
-        border-radius: 0 0 0 4px;
+        background: var(--background-color);
         margin: 0;
 
         a {
@@ -149,16 +142,10 @@ $content-width: 840px;
       }
 
       .simple-navigation-active-leaf a {
-        color: $primary-text-color;
-        background-color: $ui-highlight-color;
+        color: $highlight-text-color;
         border-bottom: 0;
-        border-radius: 0;
       }
     }
-
-    & > ul > .simple-navigation-active-leaf a {
-      border-radius: 4px 0 0 4px;
-    }
   }
 
   .content-wrapper {
@@ -292,7 +279,7 @@ $content-width: 840px;
       color: $darker-text-color;
       padding-bottom: 8px;
       margin-bottom: 8px;
-      border-bottom: 1px solid lighten($ui-base-color, 8%);
+      border-bottom: 1px solid var(--background-border-color);
     }
 
     h6 {
@@ -365,7 +352,7 @@ $content-width: 840px;
       width: 100%;
       height: 0;
       border: 0;
-      border-bottom: 1px solid rgba($ui-base-lighter-color, 0.6);
+      border-bottom: 1px solid var(--background-border-color);
       margin: 20px 0;
 
       &.spacer {
@@ -403,14 +390,14 @@ $content-width: 840px;
           inset-inline-start: 0;
           bottom: 0;
           overflow-y: auto;
-          background: $ui-base-color;
+          background: var(--background-color);
         }
       }
 
       ul a,
       ul ul a {
+        font-size: 16px;
         border-radius: 0;
-        border-bottom: 1px solid lighten($ui-base-color, 4%);
         transition: none;
 
         &:hover {
@@ -697,8 +684,10 @@ body,
   line-height: 20px;
   padding: 15px;
   padding-inline-start: 15px * 2 + 40px;
-  background: $ui-base-color;
-  border-bottom: 1px solid darken($ui-base-color, 8%);
+  background: var(--background-color);
+  border-right: 1px solid var(--background-border-color);
+  border-left: 1px solid var(--background-border-color);
+  border-bottom: 1px solid var(--background-border-color);
   position: relative;
   text-decoration: none;
   color: $darker-text-color;
@@ -707,18 +696,13 @@ body,
   &:first-child {
     border-top-left-radius: 4px;
     border-top-right-radius: 4px;
+    border-top: 1px solid var(--background-border-color);
   }
 
   &:last-child {
     border-bottom-left-radius: 4px;
     border-bottom-right-radius: 4px;
-    border-bottom: 0;
-  }
-
-  &:hover,
-  &:focus,
-  &:active {
-    background: lighten($ui-base-color, 4%);
+    border-bottom: 1px solid var(--background-border-color);
   }
 
   &__avatar {
@@ -758,6 +742,47 @@ body,
   }
 }
 
+.strike-entry {
+  display: block;
+  line-height: 20px;
+  padding: 15px;
+  padding-inline-start: 15px * 2 + 40px;
+  background: var(--background-color);
+  border: 1px solid var(--background-border-color);
+  border-radius: 4px;
+  position: relative;
+  text-decoration: none;
+  color: $darker-text-color;
+  font-size: 14px;
+  margin-bottom: 15px;
+
+  &__avatar {
+    position: absolute;
+    inset-inline-start: 15px;
+    top: 15px;
+
+    .avatar {
+      border-radius: 4px;
+      width: 40px;
+      height: 40px;
+    }
+  }
+
+  &__title {
+    word-wrap: break-word;
+  }
+
+  &__timestamp {
+    color: $dark-text-color;
+  }
+
+  &:hover,
+  &:focus,
+  &:active {
+    background: $ui-base-color;
+  }
+}
+
 a.name-tag,
 .name-tag,
 a.inline-name-tag,
@@ -765,6 +790,10 @@ a.inline-name-tag,
   text-decoration: none;
   color: $secondary-text-color;
 
+  &:hover {
+    color: $highlight-text-color;
+  }
+
   .username {
     font-weight: 500;
   }
@@ -844,7 +873,8 @@ a.name-tag,
 }
 
 .report-card {
-  background: $ui-base-color;
+  background: var(--background-color);
+  border: 1px solid var(--background-border-color);
   border-radius: 4px;
   margin-bottom: 20px;
 
@@ -856,7 +886,6 @@ a.name-tag,
 
     .account {
       padding: 0;
-      border: 0;
 
       &__avatar-wrapper {
         margin-inline-start: 0;
@@ -877,7 +906,7 @@ a.name-tag,
         &:focus,
         &:hover,
         &:active {
-          color: lighten($darker-text-color, 8%);
+          color: $highlight-text-color;
         }
       }
 
@@ -891,11 +920,7 @@ a.name-tag,
     &__item {
       display: flex;
       justify-content: flex-start;
-      border-top: 1px solid darken($ui-base-color, 4%);
-
-      &:hover {
-        background: lighten($ui-base-color, 2%);
-      }
+      border-top: 1px solid var(--background-border-color);
 
       &__reported-by,
       &__assigned {
@@ -918,7 +943,6 @@ a.name-tag,
         max-width: calc(100% - 300px);
 
         &__icon {
-          color: $dark-text-color;
           margin-inline-end: 4px;
           font-weight: 500;
         }
@@ -931,6 +955,10 @@ a.name-tag,
         padding: 15px;
         text-decoration: none;
         color: $darker-text-color;
+
+        &:hover {
+          color: $highlight-text-color;
+        }
       }
     }
   }
@@ -966,14 +994,15 @@ a.name-tag,
 
   .account__header__fields,
   .account__header__content {
-    background: lighten($ui-base-color, 8%);
+    background: var(--background-color);
+    border: 1px solid var(--background-border-color);
     border-radius: 4px;
     height: 100%;
   }
 
   .account__header__fields {
     margin: 0;
-    border: 0;
+    border: 1px solid var(--background-border-color);
 
     a {
       color: $highlight-text-color;
@@ -1002,8 +1031,8 @@ a.name-tag,
 .applications-list__item,
 .filters-list__item {
   padding: 15px 0;
-  background: $ui-base-color;
-  border: 1px solid lighten($ui-base-color, 4%);
+  background: var(--background-color);
+  border: 1px solid var(--background-border-color);
   border-radius: 4px;
   margin-top: 15px;
 }
@@ -1014,13 +1043,13 @@ a.name-tag,
 
 .announcements-list,
 .filters-list {
-  border: 1px solid lighten($ui-base-color, 4%);
+  border: 1px solid var(--background-border-color);
   border-radius: 4px;
+  border-bottom: none;
 
   &__item {
     padding: 15px 0;
-    background: $ui-base-color;
-    border-bottom: 1px solid lighten($ui-base-color, 4%);
+    border-bottom: 1px solid var(--background-border-color);
 
     &__title {
       padding: 0 15px;
@@ -1032,6 +1061,10 @@ a.name-tag,
       text-decoration: none;
       margin-bottom: 10px;
 
+      &:hover {
+        color: $highlight-text-color;
+      }
+
       .account-role {
         vertical-align: middle;
       }
@@ -1070,10 +1103,6 @@ a.name-tag,
     &__permissions {
       margin-top: 10px;
     }
-
-    &:last-child {
-      border-bottom: 0;
-    }
   }
 }
 
@@ -1123,7 +1152,7 @@ a.name-tag,
 
   &__table {
     &__number {
-      color: $secondary-text-color;
+      color: var(--background-color);
       padding: 10px;
     }
 
@@ -1150,7 +1179,7 @@ a.name-tag,
 
     &__box {
       box-sizing: border-box;
-      background: $ui-highlight-color;
+      background: var(--background-color);
       padding: 10px;
       font-weight: 500;
       color: $primary-text-color;
@@ -1172,8 +1201,9 @@ a.name-tag,
 .sparkline {
   display: block;
   text-decoration: none;
-  background: lighten($ui-base-color, 4%);
+  background: var(--background-color);
   border-radius: 4px;
+  border: 1px solid var(--background-border-color);
   padding: 0;
   position: relative;
   padding-bottom: 55px + 20px;
@@ -1245,12 +1275,12 @@ a.sparkline {
   &:hover,
   &:focus,
   &:active {
-    background: lighten($ui-base-color, 6%);
+    background: $ui-base-color;
   }
 }
 
 .skeleton {
-  background-color: lighten($ui-base-color, 8%);
+  background-color: var(--background-color);
   background-image: linear-gradient(
     90deg,
     lighten($ui-base-color, 8%),
@@ -1330,17 +1360,13 @@ a.sparkline {
 
 .report-reason-selector {
   border-radius: 4px;
-  background: $ui-base-color;
+  background: var(--background-color);
   margin-bottom: 20px;
 
   &__category {
     cursor: pointer;
     border-bottom: 1px solid darken($ui-base-color, 8%);
 
-    &:last-child {
-      border-bottom: 0;
-    }
-
     &__label {
       padding: 15px;
       display: flex;
@@ -1369,7 +1395,7 @@ a.sparkline {
 
   &__details {
     &__item {
-      border-bottom: 1px solid lighten($ui-base-color, 8%);
+      border-bottom: 1px solid var(--background-border-color);
       padding: 15px 0;
 
       &:last-child {
@@ -1400,7 +1426,7 @@ a.sparkline {
 
 .account-card {
   border-radius: 4px;
-  border: 1px solid lighten($ui-base-color, 8%);
+  border: 1px solid var(--background-border-color);
   position: relative;
 
   &__warning-badge {
@@ -1488,7 +1514,6 @@ a.sparkline {
       position: absolute;
       bottom: 0;
       inset-inline-end: 15px;
-      background: linear-gradient(to left, $ui-base-color, transparent);
       pointer-events: none;
     }
 
@@ -1564,11 +1589,11 @@ a.sparkline {
   margin-bottom: 20px;
 
   &__item {
-    background: $ui-base-color;
+    background: var(--background-color);
     position: relative;
     padding: 15px;
     padding-inline-start: 15px * 2 + 40px;
-    border-bottom: 1px solid darken($ui-base-color, 8%);
+    border: 1px solid var(--background-border-color);
 
     &:first-child {
       border-top-left-radius: 4px;
@@ -1578,11 +1603,6 @@ a.sparkline {
     &:last-child {
       border-bottom-left-radius: 4px;
       border-bottom-right-radius: 4px;
-      border-bottom: 0;
-    }
-
-    &:hover {
-      background-color: lighten($ui-base-color, 4%);
     }
 
     &__avatar {
@@ -1660,13 +1680,10 @@ a.sparkline {
 }
 
 .report-actions {
-  border: 1px solid darken($ui-base-color, 8%);
-
   &__item {
     display: flex;
     align-items: center;
     line-height: 18px;
-    border-bottom: 1px solid darken($ui-base-color, 8%);
 
     &:last-child {
       border-bottom: 0;
@@ -1729,8 +1746,6 @@ a.sparkline {
 
 .strike-card {
   padding: 15px;
-  border-radius: 4px;
-  background: $ui-base-color;
   font-size: 15px;
   line-height: 20px;
   word-wrap: break-word;
@@ -1738,6 +1753,8 @@ a.sparkline {
   color: $primary-text-color;
   box-sizing: border-box;
   min-height: 100%;
+  border: 1px solid var(--background-border-color);
+  border-radius: 4px;
 
   a {
     color: $highlight-text-color;
@@ -1778,15 +1795,14 @@ a.sparkline {
 
   &__statuses-list {
     border-radius: 4px;
-    border: 1px solid darken($ui-base-color, 8%);
+    border: 1px solid var(--background-border-color);
     font-size: 13px;
     line-height: 18px;
     overflow: hidden;
 
     &__item {
       padding: 16px;
-      background: lighten($ui-base-color, 2%);
-      border-bottom: 1px solid darken($ui-base-color, 8%);
+      border-bottom: 1px solid var(--background-border-color);
 
       &:last-child {
         border-bottom: 0;
diff --git a/app/javascript/flavours/glitch/styles/basics.scss b/app/javascript/flavours/glitch/styles/basics.scss
index 5f9708a8a25831..e59dba3b655048 100644
--- a/app/javascript/flavours/glitch/styles/basics.scss
+++ b/app/javascript/flavours/glitch/styles/basics.scss
@@ -122,7 +122,7 @@ body {
   }
 
   &.admin {
-    background: darken($ui-base-color, 4%);
+    background: var(--background-color);
     padding: 0;
   }
 
diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index 151c54c7d6f487..1e18d78dba6f2f 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -521,7 +521,7 @@ body > [data-popper-placement] {
     gap: 16px;
     flex: 0 1 auto;
     border-radius: 4px;
-    border: 1px solid lighten($ui-base-color, 8%);
+    border: 1px solid var(--background-border-color);
     transition: border-color 300ms linear;
     min-height: 0;
     position: relative;
@@ -587,7 +587,7 @@ body > [data-popper-placement] {
 
     .autosuggest-input {
       flex: 1 1 auto;
-      border-bottom: 1px solid lighten($ui-base-color, 8%);
+      border-bottom: 1px solid var(--background-border-color);
     }
   }
 
@@ -1504,7 +1504,7 @@ body > [data-popper-placement] {
   }
 
   &--first-in-thread {
-    border-top: 1px solid lighten($ui-base-color, 8%);
+    border-top: 1px solid var(--background-border-color);
   }
 
   &__line {
@@ -1976,7 +1976,6 @@ body > [data-popper-placement] {
 
 .account {
   padding: 10px; // glitch: reduced padding
-  border-bottom: 1px solid var(--background-border-color);
 
   .account__display-name {
     flex: 1 1 auto;
@@ -3509,7 +3508,7 @@ $ui-header-logo-wordmark-width: 99px;
 .copy-paste-text {
   background: lighten($ui-base-color, 4%);
   border-radius: 8px;
-  border: 1px solid lighten($ui-base-color, 8%);
+  border: 1px solid var(--background-border-color);
   padding: 16px;
   color: $primary-text-color;
   font-size: 15px;
@@ -5080,7 +5079,7 @@ a.status-card {
 
   section {
     padding: 16px;
-    border-bottom: 1px solid lighten($ui-base-color, 8%);
+    border-bottom: 1px solid var(--background-border-color);
 
     &:last-child {
       border-bottom: 0;
@@ -5784,7 +5783,7 @@ a.status-card {
       input {
         padding: 8px 12px;
         background: $ui-base-color;
-        border: 1px solid lighten($ui-base-color, 8%);
+        border: 1px solid var(--background-border-color);
         color: $darker-text-color;
 
         @media screen and (width <= 600px) {
@@ -5870,7 +5869,7 @@ a.status-card {
     margin-top: -2px;
     width: 100%;
     background: $ui-base-color;
-    border: 1px solid lighten($ui-base-color, 8%);
+    border: 1px solid var(--background-border-color);
     border-radius: 0 0 4px 4px;
     box-shadow: var(--dropdown-shadow);
     z-index: 99;
@@ -9347,13 +9346,13 @@ noscript {
   }
 
   .search__input {
-    border: 1px solid lighten($ui-base-color, 8%);
+    border: 1px solid var(--background-border-color);
     padding: 10px;
     padding-inline-end: 30px;
   }
 
   .search__popout {
-    border: 1px solid lighten($ui-base-color, 8%);
+    border: 1px solid var(--background-border-color);
   }
 
   .search .icon {
@@ -9672,7 +9671,7 @@ noscript {
     &__input {
       @include search-input;
 
-      border: 1px solid lighten($ui-base-color, 8%);
+      border: 1px solid var(--background-border-color);
       padding: 4px 6px;
       color: $primary-text-color;
       font-size: 16px;
@@ -9707,7 +9706,7 @@ noscript {
       margin-top: -1px;
       padding-top: 5px;
       padding-bottom: 5px;
-      border: 1px solid lighten($ui-base-color, 8%);
+      border: 1px solid var(--background-border-color);
     }
 
     &.focused &__input {
diff --git a/app/javascript/flavours/glitch/styles/containers.scss b/app/javascript/flavours/glitch/styles/containers.scss
index 632f1da8c73d88..5330b5a20a7114 100644
--- a/app/javascript/flavours/glitch/styles/containers.scss
+++ b/app/javascript/flavours/glitch/styles/containers.scss
@@ -63,7 +63,7 @@
   padding: 20px 0;
   margin-top: 40px;
   margin-bottom: 10px;
-  border-bottom: 1px solid lighten($ui-base-color, 8%);
+  border-bottom: 1px solid var(--background-border-color);
 
   @media screen and (width <= 440px) {
     width: 100%;
diff --git a/app/javascript/flavours/glitch/styles/dashboard.scss b/app/javascript/flavours/glitch/styles/dashboard.scss
index 36a7f44253f423..12d0a6b92f9b90 100644
--- a/app/javascript/flavours/glitch/styles/dashboard.scss
+++ b/app/javascript/flavours/glitch/styles/dashboard.scss
@@ -13,8 +13,9 @@
     & > div,
     & > a {
       padding: 20px;
-      background: lighten($ui-base-color, 4%);
+      background: var(--background-color);
       border-radius: 4px;
+      border: 1px solid var(--background-border-color);
       box-sizing: border-box;
       height: 100%;
     }
@@ -27,7 +28,7 @@
       &:hover,
       &:focus,
       &:active {
-        background: lighten($ui-base-color, 8%);
+        background: $ui-base-color;
       }
     }
   }
diff --git a/app/javascript/flavours/glitch/styles/emoji_picker.scss b/app/javascript/flavours/glitch/styles/emoji_picker.scss
index b9fdaa58473438..3652ad4abbbbaf 100644
--- a/app/javascript/flavours/glitch/styles/emoji_picker.scss
+++ b/app/javascript/flavours/glitch/styles/emoji_picker.scss
@@ -105,7 +105,7 @@
     width: 100%;
     background: $ui-base-color;
     color: $darker-text-color;
-    border: 1px solid lighten($ui-base-color, 8%);
+    border: 1px solid var(--background-border-color);
     border-radius: 4px;
 
     &::-moz-focus-inner {
diff --git a/app/javascript/flavours/glitch/styles/forms.scss b/app/javascript/flavours/glitch/styles/forms.scss
index a279715fca73df..4877170275f470 100644
--- a/app/javascript/flavours/glitch/styles/forms.scss
+++ b/app/javascript/flavours/glitch/styles/forms.scss
@@ -415,7 +415,7 @@ code {
   }
 
   .input.static .label_input__wrapper {
-    font-size: 16px;
+    font-size: 14px;
     padding: 10px;
     border: 1px solid $dark-text-color;
     border-radius: 4px;
@@ -437,13 +437,14 @@ code {
     outline: 0;
     font-family: inherit;
     resize: vertical;
-    background: darken($ui-base-color, 10%);
-    border: 1px solid darken($ui-base-color, 10%);
-    border-radius: 8px;
+    background: $ui-base-color;
+    border: 1px solid var(--background-border-color);
+    border-radius: 4px;
     padding: 10px 16px;
 
     &::placeholder {
-      color: lighten($darker-text-color, 4%);
+      color: $dark-text-color;
+      opacity: 1;
     }
 
     &:invalid {
@@ -454,11 +455,6 @@ code {
       border-color: $valid-value-color;
     }
 
-    &:active,
-    &:focus {
-      border-color: $highlight-text-color;
-    }
-
     @media screen and (width <= 600px) {
       font-size: 16px;
     }
@@ -577,21 +573,25 @@ code {
   select {
     appearance: none;
     box-sizing: border-box;
-    font-size: 16px;
+    font-size: 14px;
     color: $primary-text-color;
     display: block;
     width: 100%;
     outline: 0;
     font-family: inherit;
     resize: vertical;
-    background: darken($ui-base-color, 10%)
+    background: $ui-base-color
       url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 14.933 18.467' height='19.698' width='15.929'><path d='M3.467 14.967l-3.393-3.5H14.86l-3.392 3.5c-1.866 1.925-3.666 3.5-4 3.5-.335 0-2.135-1.575-4-3.5zm.266-11.234L7.467 0 11.2 3.733l3.733 3.734H0l3.733-3.734z' fill='#{hex-color(lighten($ui-base-color, 12%))}'/></svg>")
-      no-repeat right 8px center / auto 16px;
-    border: 1px solid darken($ui-base-color, 14%);
+      no-repeat right 8px center / auto 14px;
+    border: 1px solid var(--background-border-color);
     border-radius: 4px;
     padding-inline-start: 10px;
     padding-inline-end: 30px;
     height: 41px;
+
+    @media screen and (width <= 600px) {
+      font-size: 16px;
+    }
   }
 
   h4 {
@@ -644,8 +644,9 @@ code {
 }
 
 .flash-message {
-  background: lighten($ui-base-color, 8%);
-  color: $darker-text-color;
+  background: var(--background-color);
+  color: $highlight-text-color;
+  border: 1px solid $highlight-text-color;
   border-radius: 4px;
   padding: 15px 10px;
   margin-bottom: 30px;
@@ -1336,7 +1337,7 @@ code {
 
     &__toggle > div {
       display: flex;
-      border-inline-start: 1px solid lighten($ui-base-color, 8%);
+      border-inline-start: 1px solid var(--background-border-color);
       padding-inline-start: 16px;
     }
   }
diff --git a/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss b/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss
index 1f5059c321e765..b7d508cdccd14b 100644
--- a/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss
+++ b/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss
@@ -23,7 +23,7 @@ html {
 // Change default background colors of columns
 .interaction-modal {
   background: $white;
-  border: 1px solid lighten($ui-base-color, 8%);
+  border: 1px solid var(--background-border-color);
 }
 
 .rules-list li::before {
@@ -75,8 +75,8 @@ html {
 }
 
 .getting-started .navigation-bar {
-  border-top: 1px solid lighten($ui-base-color, 8%);
-  border-bottom: 1px solid lighten($ui-base-color, 8%);
+  border-top: 1px solid var(--background-border-color);
+  border-bottom: 1px solid var(--background-border-color);
 
   @media screen and (max-width: $no-gap-breakpoint) {
     border-top: 0;
@@ -88,7 +88,7 @@ html {
 .setting-text,
 .report-dialog-modal__textarea,
 .audio-player {
-  border: 1px solid lighten($ui-base-color, 8%);
+  border: 1px solid var(--background-border-color);
 }
 
 .report-dialog-modal .dialog-option .poll__input {
@@ -140,7 +140,6 @@ html {
 .actions-modal ul li:not(:empty) a:focus button,
 .actions-modal ul li:not(:empty) a:hover,
 .actions-modal ul li:not(:empty) a:hover button,
-.admin-wrapper .sidebar ul .simple-navigation-active-leaf a,
 .simple_form .block-button,
 .simple_form .button,
 .simple_form button {
@@ -175,7 +174,7 @@ html {
 .picture-in-picture__footer,
 .reactions-bar__item {
   background: $white;
-  border: 1px solid lighten($ui-base-color, 8%);
+  border: 1px solid var(--background-border-color);
 }
 
 .reactions-bar__item:hover,
@@ -217,7 +216,7 @@ html {
 
 .column-header__collapsible-inner {
   background: darken($ui-base-color, 4%);
-  border: 1px solid lighten($ui-base-color, 8%);
+  border: 1px solid var(--background-border-color);
   border-bottom: 0;
 }
 
@@ -259,7 +258,7 @@ html {
 
 .embed-modal .embed-modal__container .embed-modal__html {
   background: $white;
-  border: 1px solid lighten($ui-base-color, 8%);
+  border: 1px solid var(--background-border-color);
 
   &:focus {
     border-color: lighten($ui-base-color, 12%);
@@ -298,7 +297,7 @@ html {
 .directory__tag > a,
 .directory__tag > div {
   background: $white;
-  border: 1px solid lighten($ui-base-color, 8%);
+  border: 1px solid var(--background-border-color);
 
   @media screen and (max-width: $no-gap-breakpoint) {
     border-left: 0;
@@ -307,18 +306,6 @@ html {
   }
 }
 
-.simple_form {
-  input[type='text'],
-  input[type='number'],
-  input[type='email'],
-  input[type='password'],
-  textarea {
-    &:hover {
-      border-color: lighten($ui-base-color, 12%);
-    }
-  }
-}
-
 .picture-in-picture-placeholder {
   background: $white;
   border-color: lighten($ui-base-color, 8%);
@@ -346,7 +333,7 @@ html {
 }
 
 .activity-stream {
-  border: 1px solid lighten($ui-base-color, 8%);
+  border: 1px solid var(--background-border-color);
 
   &--under-tabs {
     border-top: 0;
@@ -411,6 +398,22 @@ html {
     color: $ui-highlight-color;
     background-color: rgba($ui-highlight-color, 0.1);
   }
+
+  input[type='text'],
+  input[type='number'],
+  input[type='email'],
+  input[type='password'],
+  input[type='url'],
+  input[type='datetime-local'],
+  textarea {
+    background: darken($ui-base-color, 10%);
+  }
+
+  select {
+    background: darken($ui-base-color, 10%)
+      url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 14.933 18.467' height='19.698' width='15.929'><path d='M3.467 14.967l-3.393-3.5H14.86l-3.392 3.5c-1.866 1.925-3.666 3.5-4 3.5-.335 0-2.135-1.575-4-3.5zm.266-11.234L7.467 0 11.2 3.733l3.733 3.734H0l3.733-3.734z' fill='#{hex-color(lighten($ui-base-color, 12%))}'/></svg>")
+      no-repeat right 8px center / auto 14px;
+  }
 }
 
 .compose-form .compose-form__warning {
@@ -449,8 +452,24 @@ html {
   box-shadow: none;
 }
 
+.card {
+  &__img {
+    background: darken($ui-base-color, 10%);
+  }
+
+  & > a {
+    &:hover,
+    &:active,
+    &:focus {
+      .card__bar {
+        background: darken($ui-base-color, 10%);
+      }
+    }
+  }
+}
+
 .mute-modal select {
-  border: 1px solid lighten($ui-base-color, 8%);
+  border: 1px solid var(--background-border-color);
   background: $simple-background-color
     url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 14.933 18.467' height='19.698' width='15.929'><path d='M3.467 14.967l-3.393-3.5H14.86l-3.392 3.5c-1.866 1.925-3.666 3.5-4 3.5-.335 0-2.135-1.575-4-3.5zm.266-11.234L7.467 0 11.2 3.733l3.733 3.734H0l3.733-3.734z' fill='#{hex-color(lighten($ui-base-color, 8%))}'/></svg>")
     no-repeat right 8px center / auto 16px;
@@ -554,6 +573,7 @@ html {
 .search__popout,
 .emoji-mart-search input,
 .language-dropdown__dropdown .emoji-mart-search input,
+// .strike-card,
 .poll__option input[type='text'] {
   background: darken($ui-base-color, 10%);
 }
@@ -570,3 +590,43 @@ html {
 .inline-follow-suggestions__body__scroll-button__icon {
   color: $white;
 }
+
+a.sparkline {
+  &:hover,
+  &:focus,
+  &:active {
+    background: darken($ui-base-color, 10%);
+  }
+}
+
+.dashboard__counters {
+  & > div {
+    & > a {
+      &:hover,
+      &:focus,
+      &:active {
+        background: darken($ui-base-color, 10%);
+      }
+    }
+  }
+}
+
+.directory {
+  &__tag {
+    & > a {
+      &:hover,
+      &:focus,
+      &:active {
+        background: darken($ui-base-color, 10%);
+      }
+    }
+  }
+}
+
+.strike-entry {
+  &:hover,
+  &:focus,
+  &:active {
+    background: darken($ui-base-color, 10%);
+  }
+}
diff --git a/app/javascript/flavours/glitch/styles/rtl.scss b/app/javascript/flavours/glitch/styles/rtl.scss
index e69d5d789118cf..1091a13238a73b 100644
--- a/app/javascript/flavours/glitch/styles/rtl.scss
+++ b/app/javascript/flavours/glitch/styles/rtl.scss
@@ -101,7 +101,7 @@ body.rtl {
   }
 
   .simple_form select {
-    background: darken($ui-base-color, 10%)
+    background: $ui-base-color
       url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 14.933 18.467' height='19.698' width='15.929'><path d='M3.467 14.967l-3.393-3.5H14.86l-3.392 3.5c-1.866 1.925-3.666 3.5-4 3.5-.335 0-2.135-1.575-4-3.5zm.266-11.234L7.467 0 11.2 3.733l3.733 3.734H0l3.733-3.734z' fill='#{hex-color(lighten($ui-base-color, 12%))}'/></svg>")
       no-repeat left 8px center / auto 16px;
   }
diff --git a/app/javascript/flavours/glitch/styles/tables.scss b/app/javascript/flavours/glitch/styles/tables.scss
index 44ef00ba7378ed..caebb952b8511a 100644
--- a/app/javascript/flavours/glitch/styles/tables.scss
+++ b/app/javascript/flavours/glitch/styles/tables.scss
@@ -9,9 +9,9 @@
     padding: 8px;
     line-height: 18px;
     vertical-align: top;
-    border-top: 1px solid $ui-base-color;
+    border-bottom: 1px solid var(--background-border-color);
     text-align: start;
-    background: darken($ui-base-color, 4%);
+    background: var(--background-color);
 
     &.critical {
       font-weight: 700;
@@ -21,8 +21,6 @@
 
   & > thead > tr > th {
     vertical-align: bottom;
-    border-bottom: 2px solid $ui-base-color;
-    border-top: 0;
     font-weight: 500;
   }
 
@@ -32,15 +30,20 @@
 
   & > tbody > tr:nth-child(odd) > td,
   & > tbody > tr:nth-child(odd) > th {
-    background: $ui-base-color;
+    background: var(--background-color);
+  }
+
+  & > tbody > tr:last-child > td,
+  & > tbody > tr:last-child > th {
+    border-bottom: 0;
   }
 
   a {
-    color: $highlight-text-color;
-    text-decoration: underline;
+    color: $darker-text-color;
+    text-decoration: none;
 
     &:hover {
-      text-decoration: none;
+      color: $highlight-text-color;
     }
   }
 
@@ -78,7 +81,7 @@
     & > tbody > tr > td {
       padding: 11px 10px;
       background: transparent;
-      border: 1px solid lighten($ui-base-color, 8%);
+      border: 1px solid var(--background-border-color);
       color: $secondary-text-color;
     }
 
@@ -90,18 +93,18 @@
 
   &.batch-table {
     & > thead > tr > th {
-      background: $ui-base-color;
-      border-top: 1px solid darken($ui-base-color, 8%);
-      border-bottom: 1px solid darken($ui-base-color, 8%);
+      background: var(--background-color);
+      border-top: 1px solid var(--background-border-color);
+      border-bottom: 1px solid var(--background-border-color);
 
       &:first-child {
         border-radius: 4px 0 0;
-        border-inline-start: 1px solid darken($ui-base-color, 8%);
+        border-inline-start: 1px solid var(--background-border-color);
       }
 
       &:last-child {
         border-radius: 0 4px 0 0;
-        border-inline-end: 1px solid darken($ui-base-color, 8%);
+        border-inline-end: 1px solid var(--background-border-color);
       }
     }
   }
@@ -136,7 +139,7 @@ a.table-action-link {
   font-weight: 500;
 
   &:hover {
-    color: $primary-text-color;
+    color: $highlight-text-color;
   }
 
   i.fa {
@@ -186,9 +189,9 @@ a.table-action-link {
     position: sticky;
     top: 0;
     z-index: 1;
-    border: 1px solid darken($ui-base-color, 8%);
-    background: $ui-base-color;
-    border-radius: 4px 0 0;
+    border: 1px solid var(--background-border-color);
+    background: var(--background-color);
+    border-radius: 4px 4px 0 0;
     height: 47px;
     align-items: center;
 
@@ -199,11 +202,11 @@ a.table-action-link {
   }
 
   &__select-all {
-    background: $ui-base-color;
+    background: var(--background-color);
     height: 47px;
     align-items: center;
     justify-content: center;
-    border: 1px solid darken($ui-base-color, 8%);
+    border: 1px solid var(--background-border-color);
     border-top: 0;
     color: $secondary-text-color;
     display: none;
@@ -249,9 +252,9 @@ a.table-action-link {
 
   &__form {
     padding: 16px;
-    border: 1px solid darken($ui-base-color, 8%);
+    border: 1px solid var(--background-border-color);
     border-top: 0;
-    background: $ui-base-color;
+    background: var(--background-color);
 
     .fields-row {
       padding-top: 0;
@@ -260,26 +263,18 @@ a.table-action-link {
   }
 
   &__row {
-    border: 1px solid darken($ui-base-color, 8%);
+    border: 1px solid var(--background-border-color);
     border-top: 0;
-    background: darken($ui-base-color, 4%);
+    background: var(--background-color);
 
     @media screen and (max-width: $no-gap-breakpoint) {
       .optional &:first-child {
-        border-top: 1px solid darken($ui-base-color, 8%);
+        border-top: 1px solid var(--background-border-color);
       }
     }
 
-    &:hover {
-      background: darken($ui-base-color, 2%);
-    }
-
     &:nth-child(even) {
-      background: $ui-base-color;
-
-      &:hover {
-        background: lighten($ui-base-color, 2%);
-      }
+      background: var(--background-color);
     }
 
     &__content {
@@ -353,12 +348,13 @@ a.table-action-link {
   }
 
   .nothing-here {
-    border: 1px solid darken($ui-base-color, 8%);
+    border: 1px solid var(--background-border-color);
     border-top: 0;
     box-shadow: none;
+    background: var(--background-color);
 
     @media screen and (max-width: $no-gap-breakpoint) {
-      border-top: 1px solid darken($ui-base-color, 8%);
+      border-top: 1px solid var(--background-border-color);
     }
   }
 
diff --git a/app/javascript/flavours/glitch/styles/widgets.scss b/app/javascript/flavours/glitch/styles/widgets.scss
index f54d2f2e587620..dd349526ade2ec 100644
--- a/app/javascript/flavours/glitch/styles/widgets.scss
+++ b/app/javascript/flavours/glitch/styles/widgets.scss
@@ -198,7 +198,7 @@
 }
 
 .directory {
-  background: $ui-base-color;
+  background: var(--background-color);
   border-radius: 4px;
   box-shadow: 0 0 15px rgba($base-shadow-color, 0.2);
 
@@ -211,7 +211,7 @@
       display: flex;
       align-items: center;
       justify-content: space-between;
-      background: $ui-base-color;
+      border: 1px solid lighten($ui-base-color, 8%);
       border-radius: 4px;
       padding: 15px;
       text-decoration: none;
@@ -223,7 +223,7 @@
       &:hover,
       &:active,
       &:focus {
-        background: lighten($ui-base-color, 8%);
+        background: $ui-base-color;
       }
     }
 
@@ -340,7 +340,7 @@
       &:focus,
       &:hover,
       &:active {
-        text-decoration: underline;
+        color: $highlight-text-color;
       }
     }
   }

From 3a49687ca0a521bbfaa4c354b817e2673b973e22 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 24 Jul 2024 20:59:15 +0200
Subject: [PATCH 1616/2191] Fix performance issue by using LATERAL in group
 notification CTE (#31123)

---
 app/models/notification.rb | 68 ++++++++++++++++++++------------------
 1 file changed, 35 insertions(+), 33 deletions(-)

diff --git a/app/models/notification.rb b/app/models/notification.rb
index 8b77b2a03b2f4c..f1605f0347ad12 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -138,33 +138,53 @@ def browserable(types: [], exclude_types: [], from_account_id: nil, include_filt
       end
     end
 
-    # This returns notifications from the request page, but with at most one notification per group.
-    # Notifications that have no `group_key` each count as a separate group.
-    def paginate_groups_by_max_id(limit, max_id: nil, since_id: nil)
-      query = reorder(id: :desc)
-      query = query.where(id: ...max_id) if max_id.present?
-      query = query.where(id: (since_id + 1)...) if since_id.present?
+    def paginate_groups(limit, pagination_order)
+      raise ArgumentError unless %i(asc desc).include?(pagination_order)
+
+      query = reorder(id: pagination_order)
 
       unscoped
         .with_recursive(
           grouped_notifications: [
+            # Base case: fetching one notification and annotating it with visited groups
             query
               .select('notifications.*', "ARRAY[COALESCE(notifications.group_key, 'ungrouped-' || notifications.id)] AS groups")
               .limit(1),
-            query
-              .joins('CROSS JOIN grouped_notifications')
-              .where('array_length(grouped_notifications.groups, 1) < :limit', limit: limit)
-              .where('notifications.id < grouped_notifications.id')
-              .where.not("COALESCE(notifications.group_key, 'ungrouped-' || notifications.id) = ANY(grouped_notifications.groups)")
-              .select('notifications.*', "array_append(grouped_notifications.groups, COALESCE(notifications.group_key, 'ungrouped-' || notifications.id))")
-              .limit(1),
+            # Recursive case, always yielding at most one annotated notification
+            unscoped
+              .from(
+                [
+                  # Expose the working table as `wt`, but quit early if we've reached the limit
+                  unscoped
+                    .select('id', 'groups')
+                    .from('grouped_notifications')
+                    .where('array_length(grouped_notifications.groups, 1) < :limit', limit: limit)
+                    .arel.as('wt'),
+                  # Recursive query, using `LATERAL` so we can refer to `wt`
+                  query
+                    .where(pagination_order == :desc ? 'notifications.id < wt.id' : 'notifications.id > wt.id')
+                    .where.not("COALESCE(notifications.group_key, 'ungrouped-' || notifications.id) = ANY(wt.groups)")
+                    .limit(1)
+                    .arel.lateral('notifications'),
+                ]
+              )
+              .select('notifications.*', "array_append(wt.groups, COALESCE(notifications.group_key, 'ungrouped-' || notifications.id))"),
           ]
         )
         .from('grouped_notifications AS notifications')
-        .order(id: :desc)
+        .order(id: pagination_order)
         .limit(limit)
     end
 
+    # This returns notifications from the request page, but with at most one notification per group.
+    # Notifications that have no `group_key` each count as a separate group.
+    def paginate_groups_by_max_id(limit, max_id: nil, since_id: nil)
+      query = reorder(id: :desc)
+      query = query.where(id: ...max_id) if max_id.present?
+      query = query.where(id: (since_id + 1)...) if since_id.present?
+      query.paginate_groups(limit, :desc)
+    end
+
     # Differs from :paginate_groups_by_max_id in that it gives the results immediately following min_id,
     # whereas since_id gives the items with largest id, but with since_id as a cutoff.
     # Results will be in ascending order by id.
@@ -172,25 +192,7 @@ def paginate_groups_by_min_id(limit, max_id: nil, min_id: nil)
       query = reorder(id: :asc)
       query = query.where(id: (min_id + 1)...) if min_id.present?
       query = query.where(id: ...max_id) if max_id.present?
-
-      unscoped
-        .with_recursive(
-          grouped_notifications: [
-            query
-              .select('notifications.*', "ARRAY[COALESCE(notifications.group_key, 'ungrouped-' || notifications.id)] AS groups")
-              .limit(1),
-            query
-              .joins('CROSS JOIN grouped_notifications')
-              .where('array_length(grouped_notifications.groups, 1) < :limit', limit: limit)
-              .where('notifications.id > grouped_notifications.id')
-              .where.not("COALESCE(notifications.group_key, 'ungrouped-' || notifications.id) = ANY(grouped_notifications.groups)")
-              .select('notifications.*', "array_append(grouped_notifications.groups, COALESCE(notifications.group_key, 'ungrouped-' || notifications.id))")
-              .limit(1),
-          ]
-        )
-        .from('grouped_notifications AS notifications')
-        .order(id: :asc)
-        .limit(limit)
+      query.paginate_groups(limit, :asc)
     end
 
     def to_a_grouped_paginated_by_id(limit, options = {})

From 9e04007020cce3dea76bd3ed6d24f129f7ede03e Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 24 Jul 2024 21:27:39 +0200
Subject: [PATCH 1617/2191] chore(deps): update opentelemetry-ruby (non-major)
 (#31126)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 4fddbded4667ae..fa09e99cb0f464 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -512,14 +512,14 @@ GEM
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
       opentelemetry-instrumentation-rack (~> 0.21)
-    opentelemetry-instrumentation-action_view (0.7.0)
+    opentelemetry-instrumentation-action_view (0.7.1)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-active_support (~> 0.1)
       opentelemetry-instrumentation-base (~> 0.22.1)
     opentelemetry-instrumentation-active_job (0.7.3)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-active_model_serializers (0.20.1)
+    opentelemetry-instrumentation-active_model_serializers (0.20.2)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
     opentelemetry-instrumentation-active_record (0.7.2)
@@ -531,32 +531,32 @@ GEM
     opentelemetry-instrumentation-base (0.22.3)
       opentelemetry-api (~> 1.0)
       opentelemetry-registry (~> 0.1)
-    opentelemetry-instrumentation-concurrent_ruby (0.21.3)
+    opentelemetry-instrumentation-concurrent_ruby (0.21.4)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-excon (0.22.3)
+    opentelemetry-instrumentation-excon (0.22.4)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-faraday (0.24.5)
+    opentelemetry-instrumentation-faraday (0.24.6)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-http (0.23.3)
+    opentelemetry-instrumentation-http (0.23.4)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-http_client (0.22.6)
+    opentelemetry-instrumentation-http_client (0.22.7)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-net_http (0.22.6)
+    opentelemetry-instrumentation-net_http (0.22.7)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-pg (0.27.3)
+    opentelemetry-instrumentation-pg (0.27.4)
       opentelemetry-api (~> 1.0)
       opentelemetry-helpers-sql-obfuscation
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-rack (0.24.5)
+    opentelemetry-instrumentation-rack (0.24.6)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-rails (0.31.0)
+    opentelemetry-instrumentation-rails (0.31.1)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-action_mailer (~> 0.1.0)
       opentelemetry-instrumentation-action_pack (~> 0.9.0)
@@ -565,10 +565,10 @@ GEM
       opentelemetry-instrumentation-active_record (~> 0.7.0)
       opentelemetry-instrumentation-active_support (~> 0.6.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-redis (0.25.6)
+    opentelemetry-instrumentation-redis (0.25.7)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-sidekiq (0.25.6)
+    opentelemetry-instrumentation-sidekiq (0.25.7)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
     opentelemetry-registry (0.3.1)

From 6be21ae8ac9b910677e983c25a6154b4ed905823 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 24 Jul 2024 22:35:39 +0200
Subject: [PATCH 1618/2191] Fix double indent for post attachments and metadata
 in grouped notifications (#2793)

---
 app/javascript/flavours/glitch/styles/components.scss | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index 1e18d78dba6f2f..aa96ef6b209628 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -11100,15 +11100,7 @@ noscript {
   $icon-margin: 48px; // 40px avatar + 8px gap
 
   .status__content,
-  .status__action-bar,
-  .media-gallery,
-  .video-player,
-  .audio-player,
-  .attachment-list,
-  .picture-in-picture-placeholder,
-  .more-from-author,
-  .status-card,
-  .hashtag-bar {
+  .status__action-bar {
     margin-inline-start: $icon-margin;
     width: calc(100% - $icon-margin);
   }

From 8117977c882c93d93ccf4ed7a11affa453d42d9d Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 25 Jul 2024 09:20:55 +0200
Subject: [PATCH 1619/2191] fix(deps): update dependency postcss to v8.4.40
 (#31137)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 4b22ff75e2ce9d..9aca26545b7f21 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -14045,13 +14045,13 @@ __metadata:
   linkType: hard
 
 "postcss@npm:^8.2.15, postcss@npm:^8.4.24, postcss@npm:^8.4.38":
-  version: 8.4.39
-  resolution: "postcss@npm:8.4.39"
+  version: 8.4.40
+  resolution: "postcss@npm:8.4.40"
   dependencies:
     nanoid: "npm:^3.3.7"
     picocolors: "npm:^1.0.1"
     source-map-js: "npm:^1.2.0"
-  checksum: 10c0/16f5ac3c4e32ee76d1582b3c0dcf1a1fdb91334a45ad755eeb881ccc50318fb8d64047de4f1601ac96e30061df203f0f2e2edbdc0bfc49b9c57bc9fb9bedaea3
+  checksum: 10c0/65ed67573e5443beaeb582282ff27a6be7c7fe3b4d9fa15761157616f2b97510cb1c335023c26220b005909f007337026d6e3ff092f25010b484ad484e80ea7f
   languageName: node
   linkType: hard
 

From 9c39fb52f300c447dce5f279e448edeb0291d002 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 25 Jul 2024 09:21:01 +0200
Subject: [PATCH 1620/2191] chore(deps): update opentelemetry-ruby (non-major)
 (#31138)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile      | 2 +-
 Gemfile.lock | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index 135b94c7739b37..de9bc45f320e6c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -100,7 +100,7 @@ gem 'json-ld'
 gem 'json-ld-preloaded', '~> 3.2'
 gem 'rdf-normalize', '~> 0.5'
 
-gem 'opentelemetry-api', '~> 1.2.5'
+gem 'opentelemetry-api', '~> 1.3.0'
 
 group :opentelemetry do
   gem 'opentelemetry-exporter-otlp', '~> 0.28.0', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index fa09e99cb0f464..657fb77fea02bd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -492,7 +492,7 @@ GEM
     openssl (3.2.0)
     openssl-signature_algorithm (1.3.0)
       openssl (> 2.0)
-    opentelemetry-api (1.2.5)
+    opentelemetry-api (1.3.0)
     opentelemetry-common (0.20.1)
       opentelemetry-api (~> 1.0)
     opentelemetry-exporter-otlp (0.28.0)
@@ -573,7 +573,7 @@ GEM
       opentelemetry-instrumentation-base (~> 0.22.1)
     opentelemetry-registry (0.3.1)
       opentelemetry-api (~> 1.1)
-    opentelemetry-sdk (1.4.1)
+    opentelemetry-sdk (1.5.0)
       opentelemetry-api (~> 1.1)
       opentelemetry-common (~> 0.20)
       opentelemetry-registry (~> 0.2)
@@ -983,7 +983,7 @@ DEPENDENCIES
   omniauth-rails_csrf_protection (~> 1.0)
   omniauth-saml (~> 2.0)
   omniauth_openid_connect (~> 0.6.1)
-  opentelemetry-api (~> 1.2.5)
+  opentelemetry-api (~> 1.3.0)
   opentelemetry-exporter-otlp (~> 0.28.0)
   opentelemetry-instrumentation-active_job (~> 0.7.1)
   opentelemetry-instrumentation-active_model_serializers (~> 0.20.1)

From ef0e3e447a7596f336939787bbccf01c00d4f6e1 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 25 Jul 2024 09:44:00 +0200
Subject: [PATCH 1621/2191] New Crowdin Translations (automated) (#31119)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/en-GB.json | 14 +++++++
 app/javascript/mastodon/locales/fo.json    |  2 +-
 app/javascript/mastodon/locales/fy.json    | 43 ++++++++++++++++++++++
 app/javascript/mastodon/locales/gd.json    |  2 +-
 app/javascript/mastodon/locales/ia.json    |  4 ++
 app/javascript/mastodon/locales/lt.json    |  2 +-
 app/javascript/mastodon/locales/pt-PT.json | 14 +++++++
 app/javascript/mastodon/locales/th.json    | 16 ++++++--
 config/locales/ca.yml                      |  3 ++
 config/locales/da.yml                      |  3 ++
 config/locales/de.yml                      |  9 +++--
 config/locales/en-GB.yml                   |  3 ++
 config/locales/es-AR.yml                   |  3 ++
 config/locales/fi.yml                      |  9 +++--
 config/locales/fo.yml                      |  3 ++
 config/locales/fy.yml                      | 13 +++++++
 config/locales/ga.yml                      |  3 ++
 config/locales/gl.yml                      |  3 ++
 config/locales/he.yml                      |  3 ++
 config/locales/hu.yml                      |  3 ++
 config/locales/ia.yml                      |  2 +
 config/locales/is.yml                      |  3 ++
 config/locales/it.yml                      |  3 ++
 config/locales/ja.yml                      |  2 +
 config/locales/kab.yml                     |  2 +-
 config/locales/ko.yml                      |  3 ++
 config/locales/nl.yml                      |  5 ++-
 config/locales/pl.yml                      |  3 ++
 config/locales/pt-PT.yml                   |  3 ++
 config/locales/simple_form.fy.yml          |  3 ++
 config/locales/simple_form.ia.yml          |  2 +
 config/locales/simple_form.th.yml          |  4 +-
 config/locales/sq.yml                      |  3 ++
 config/locales/th.yml                      |  5 +++
 config/locales/tr.yml                      |  5 ++-
 config/locales/uk.yml                      |  3 ++
 config/locales/vi.yml                      |  3 ++
 config/locales/zh-CN.yml                   |  3 ++
 config/locales/zh-TW.yml                   |  3 ++
 39 files changed, 198 insertions(+), 17 deletions(-)

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

From efa7ad9d750316917b3931ada5ed90bebed891f0 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 25 Jul 2024 07:44:54 +0000
Subject: [PATCH 1622/2191] chore(deps): update dependency node to 20.16
 (#31127)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .nvmrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.nvmrc b/.nvmrc
index cecb93628953cd..1bdd901e66fd02 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-20.15
+20.16

From 4d374cf73096be1e5347e131c91c99842e3c6dbb Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 25 Jul 2024 12:00:06 +0200
Subject: [PATCH 1623/2191] chore(deps): update dependency
 opentelemetry-exporter-otlp to v0.28.1 (#31139)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 657fb77fea02bd..31e317e8190e26 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -289,7 +289,7 @@ GEM
       ruby-progressbar (~> 1.4)
     globalid (1.2.1)
       activesupport (>= 6.1)
-    google-protobuf (3.25.3)
+    google-protobuf (3.25.4)
     googleapis-common-protos-types (1.14.0)
       google-protobuf (~> 3.18)
     haml (6.3.0)
@@ -495,7 +495,7 @@ GEM
     opentelemetry-api (1.3.0)
     opentelemetry-common (0.20.1)
       opentelemetry-api (~> 1.0)
-    opentelemetry-exporter-otlp (0.28.0)
+    opentelemetry-exporter-otlp (0.28.1)
       google-protobuf (>= 3.18)
       googleapis-common-protos-types (~> 1.3)
       opentelemetry-api (~> 1.1)
@@ -578,7 +578,7 @@ GEM
       opentelemetry-common (~> 0.20)
       opentelemetry-registry (~> 0.2)
       opentelemetry-semantic_conventions
-    opentelemetry-semantic_conventions (1.10.0)
+    opentelemetry-semantic_conventions (1.10.1)
       opentelemetry-api (~> 1.0)
     orm_adapter (0.5.0)
     ox (2.14.18)

From 34626b8291db22fafaa7963496bc304f2725ae58 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 25 Jul 2024 06:37:48 -0400
Subject: [PATCH 1624/2191] Update schema to reflect full `db:migrate` run
 results (#31128)

---
 db/schema.rb | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/db/schema.rb b/db/schema.rb
index 66da12f71394b2..453f1f7b894bbe 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -194,8 +194,8 @@
     t.integer "avatar_storage_schema_version"
     t.integer "header_storage_schema_version"
     t.string "devices_url"
-    t.integer "suspension_origin"
     t.datetime "sensitized_at", precision: nil
+    t.integer "suspension_origin"
     t.boolean "trendable"
     t.datetime "reviewed_at", precision: nil
     t.datetime "requested_review_at", precision: nil
@@ -579,12 +579,12 @@
   end
 
   create_table "ip_blocks", force: :cascade do |t|
-    t.datetime "created_at", precision: nil, null: false
-    t.datetime "updated_at", precision: nil, null: false
-    t.datetime "expires_at", precision: nil
     t.inet "ip", default: "0.0.0.0", null: false
     t.integer "severity", default: 0, null: false
+    t.datetime "expires_at", precision: nil
     t.text "comment", default: "", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.index ["ip"], name: "index_ip_blocks_on_ip", unique: true
   end
 
@@ -1421,9 +1421,9 @@
   add_index "instances", ["domain"], name: "index_instances_on_domain", unique: true
 
   create_view "user_ips", sql_definition: <<-SQL
-      SELECT t0.user_id,
-      t0.ip,
-      max(t0.used_at) AS used_at
+      SELECT user_id,
+      ip,
+      max(used_at) AS used_at
      FROM ( SELECT users.id AS user_id,
               users.sign_up_ip AS ip,
               users.created_at AS used_at
@@ -1440,7 +1440,7 @@
               login_activities.created_at
              FROM login_activities
             WHERE (login_activities.success = true)) t0
-    GROUP BY t0.user_id, t0.ip;
+    GROUP BY user_id, ip;
   SQL
   create_view "account_summaries", materialized: true, sql_definition: <<-SQL
       SELECT accounts.id AS account_id,
@@ -1461,9 +1461,9 @@
   add_index "account_summaries", ["account_id"], name: "index_account_summaries_on_account_id", unique: true
 
   create_view "global_follow_recommendations", materialized: true, sql_definition: <<-SQL
-      SELECT t0.account_id,
-      sum(t0.rank) AS rank,
-      array_agg(t0.reason) AS reason
+      SELECT account_id,
+      sum(rank) AS rank,
+      array_agg(reason) AS reason
      FROM ( SELECT account_summaries.account_id,
               ((count(follows.id))::numeric / (1.0 + (count(follows.id))::numeric)) AS rank,
               'most_followed'::text AS reason
@@ -1487,8 +1487,8 @@
                     WHERE (follow_recommendation_suppressions.account_id = statuses.account_id)))))
             GROUP BY account_summaries.account_id
            HAVING (sum((status_stats.reblogs_count + status_stats.favourites_count)) >= (5)::numeric)) t0
-    GROUP BY t0.account_id
-    ORDER BY (sum(t0.rank)) DESC;
+    GROUP BY account_id
+    ORDER BY (sum(rank)) DESC;
   SQL
   add_index "global_follow_recommendations", ["account_id"], name: "index_global_follow_recommendations_on_account_id", unique: true
 

From e881a5967149e34046f91d3f4445ebb457348b93 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 25 Jul 2024 10:18:24 -0400
Subject: [PATCH 1625/2191] Add `User.unconfirmed` scope, reduce factories in
 `scheduler/user_cleanup` spec (#31063)

---
 app/models/user.rb                            |  1 +
 .../scheduler/user_cleanup_scheduler.rb       |  2 +-
 .../scheduler/user_cleanup_scheduler_spec.rb  | 30 ++++++++++---------
 3 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index 8bc0b23ce848e8..72854569260e80 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -117,6 +117,7 @@ class User < ApplicationRecord
   scope :pending, -> { where(approved: false) }
   scope :approved, -> { where(approved: true) }
   scope :confirmed, -> { where.not(confirmed_at: nil) }
+  scope :unconfirmed, -> { where(confirmed_at: nil) }
   scope :enabled, -> { where(disabled: false) }
   scope :disabled, -> { where(disabled: true) }
   scope :active, -> { confirmed.signed_in_recently.account_not_suspended }
diff --git a/app/workers/scheduler/user_cleanup_scheduler.rb b/app/workers/scheduler/user_cleanup_scheduler.rb
index 74abc2370189af..9f58d9225b3a14 100644
--- a/app/workers/scheduler/user_cleanup_scheduler.rb
+++ b/app/workers/scheduler/user_cleanup_scheduler.rb
@@ -16,7 +16,7 @@ def perform
   private
 
   def clean_unconfirmed_accounts!
-    User.where('confirmed_at is NULL AND confirmation_sent_at <= ?', UNCONFIRMED_ACCOUNTS_MAX_AGE_DAYS.days.ago).reorder(nil).find_in_batches do |batch|
+    User.unconfirmed.where(confirmation_sent_at: ..UNCONFIRMED_ACCOUNTS_MAX_AGE_DAYS.days.ago).reorder(nil).find_in_batches do |batch|
       # We have to do it separately because of missing database constraints
       AccountModerationNote.where(target_account_id: batch.map(&:account_id)).delete_all
       Account.where(id: batch.map(&:account_id)).delete_all
diff --git a/spec/workers/scheduler/user_cleanup_scheduler_spec.rb b/spec/workers/scheduler/user_cleanup_scheduler_spec.rb
index c3940901d4e2c8..7952f2c146309c 100644
--- a/spec/workers/scheduler/user_cleanup_scheduler_spec.rb
+++ b/spec/workers/scheduler/user_cleanup_scheduler_spec.rb
@@ -12,29 +12,31 @@
 
   describe '#perform' do
     before do
-      # Need to update the already-existing users because their initialization overrides confirmation_sent_at
+      # Update already-existing users because initialization overrides `confirmation_sent_at`
       new_unconfirmed_user.update!(confirmed_at: nil, confirmation_sent_at: Time.now.utc)
       old_unconfirmed_user.update!(confirmed_at: nil, confirmation_sent_at: 10.days.ago)
       confirmed_user.update!(confirmed_at: 1.day.ago)
     end
 
-    it 'deletes the old unconfirmed user, their account, and the moderation note' do
+    it 'deletes the old unconfirmed user and metadata while preserving confirmed user and newer unconfirmed user' do
       expect { subject.perform }
-        .to change { User.exists?(old_unconfirmed_user.id) }.from(true).to(false)
-        .and change { Account.exists?(old_unconfirmed_user.account_id) }.from(true).to(false)
-      expect { moderation_note.reload }.to raise_error(ActiveRecord::RecordNotFound)
+        .to change { User.exists?(old_unconfirmed_user.id) }
+        .from(true).to(false)
+        .and change { Account.exists?(old_unconfirmed_user.account_id) }
+        .from(true).to(false)
+      expect { moderation_note.reload }
+        .to raise_error(ActiveRecord::RecordNotFound)
+      expect_preservation_of(new_unconfirmed_user)
+      expect_preservation_of(confirmed_user)
     end
 
-    it 'does not delete the new unconfirmed user or their account' do
-      subject.perform
-      expect(User.exists?(new_unconfirmed_user.id)).to be true
-      expect(Account.exists?(new_unconfirmed_user.account_id)).to be true
-    end
+    private
 
-    it 'does not delete the confirmed user or their account' do
-      subject.perform
-      expect(User.exists?(confirmed_user.id)).to be true
-      expect(Account.exists?(confirmed_user.account_id)).to be true
+    def expect_preservation_of(user)
+      expect(User.exists?(user.id))
+        .to be true
+      expect(Account.exists?(user.account_id))
+        .to be true
     end
   end
 end

From 337a7fcf30b7253830633dfe962d4411b6b2a370 Mon Sep 17 00:00:00 2001
From: Adam Niedzielski <adamsunday@gmail.com>
Date: Thu, 25 Jul 2024 16:24:19 +0200
Subject: [PATCH 1626/2191] =?UTF-8?q?Fix=20=C3=9F=20bug=20in=20regexp=20fo?=
 =?UTF-8?q?r=20mentions=20and=20tags=20(#31122)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/account.rb       | 2 +-
 app/models/tag.rb           | 2 +-
 spec/models/account_spec.rb | 8 ++++++++
 spec/models/tag_spec.rb     | 8 ++++++++
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/app/models/account.rb b/app/models/account.rb
index 8a990bb831d612..23ff07c76967eb 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -68,7 +68,7 @@ class Account < ApplicationRecord
   INSTANCE_ACTOR_ID = -99
 
   USERNAME_RE   = /[a-z0-9_]+([a-z0-9_.-]+[a-z0-9_]+)?/i
-  MENTION_RE    = %r{(?<![=/[:word:]])@((#{USERNAME_RE})(?:@[[:word:].-]+[[:word:]]+)?)}i
+  MENTION_RE    = %r{(?<![=/[:word:]])@((#{USERNAME_RE})(?:@[[:word:].-]+[[:word:]]+)?)}
   URL_PREFIX_RE = %r{\Ahttp(s?)://[^/]+}
   USERNAME_ONLY_RE = /\A#{USERNAME_RE}\z/i
   USERNAME_LENGTH_LIMIT = 30
diff --git a/app/models/tag.rb b/app/models/tag.rb
index 3f88cb06807c73..dd1cb3027d20b0 100644
--- a/app/models/tag.rb
+++ b/app/models/tag.rb
@@ -37,7 +37,7 @@ class Tag < ApplicationRecord
   HASHTAG_LAST_SEQUENCE = '([[:word:]_]*[[:alpha:]][[:word:]_]*)'
   HASHTAG_NAME_PAT = "#{HASHTAG_FIRST_SEQUENCE}|#{HASHTAG_LAST_SEQUENCE}"
 
-  HASHTAG_RE = %r{(?<![=/)\p{Alnum}])#(#{HASHTAG_NAME_PAT})}i
+  HASHTAG_RE = %r{(?<![=/)\p{Alnum}])#(#{HASHTAG_NAME_PAT})}
   HASHTAG_NAME_RE = /\A(#{HASHTAG_NAME_PAT})\z/i
   HASHTAG_INVALID_CHARS_RE = /[^[:alnum:]\u0E47-\u0E4E#{HASHTAG_SEPARATORS}]/
 
diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb
index 7153c7466e69f5..8e5648a0b0e189 100644
--- a/spec/models/account_spec.rb
+++ b/spec/models/account_spec.rb
@@ -711,6 +711,14 @@
     it 'does not match URL query string' do
       expect(subject.match('https://example.com/?x=@alice')).to be_nil
     end
+
+    it 'matches usernames immediately following the letter ß' do
+      expect(subject.match('Hello toß @alice from me')[1]).to eq 'alice'
+    end
+
+    it 'matches usernames containing uppercase characters' do
+      expect(subject.match('Hello to @aLice@Example.com from me')[1]).to eq 'aLice@Example.com'
+    end
   end
 
   describe 'validations' do
diff --git a/spec/models/tag_spec.rb b/spec/models/tag_spec.rb
index 7799afe44b2708..a3cae4a33961d0 100644
--- a/spec/models/tag_spec.rb
+++ b/spec/models/tag_spec.rb
@@ -95,6 +95,14 @@
     it 'does not match purely-numeric hashtags' do
       expect(subject.match('hello #0123456')).to be_nil
     end
+
+    it 'matches hashtags immediately following the letter ß' do
+      expect(subject.match('Hello toß #ruby').to_s).to eq '#ruby'
+    end
+
+    it 'matches hashtags containing uppercase characters' do
+      expect(subject.match('Hello #rubyOnRails').to_s).to eq '#rubyOnRails'
+    end
   end
 
   describe '#to_param' do

From bfaa53343a0806b82181073f413d1b811b259ef7 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 25 Jul 2024 10:28:08 -0400
Subject: [PATCH 1627/2191] Improve failure message on pagination matcher
 (#31146)

---
 spec/support/matchers/api_pagination.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/support/matchers/api_pagination.rb b/spec/support/matchers/api_pagination.rb
index 81e27e44b80a86..f7d552b242a25f 100644
--- a/spec/support/matchers/api_pagination.rb
+++ b/spec/support/matchers/api_pagination.rb
@@ -7,7 +7,7 @@
     end.all?
   end
 
-  failure_message do |header|
-    "expected that #{header} would have the same values as #{links}."
+  failure_message do |response|
+    "expected that #{response.headers['Link']} would have the same values as #{links}."
   end
 end

From fbf95216c55adac8af18bc709b4e3f456641013a Mon Sep 17 00:00:00 2001
From: Adam Niedzielski <adamsunday@gmail.com>
Date: Thu, 25 Jul 2024 16:51:44 +0200
Subject: [PATCH 1628/2191] Fix LinkCrawlWorker NoMethodError: undefined method
 `[]' for nil (#31144)

---
 app/lib/link_details_extractor.rb       |  2 +-
 spec/lib/link_details_extractor_spec.rb | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/app/lib/link_details_extractor.rb b/app/lib/link_details_extractor.rb
index d81f4a30622dec..bd78aef7a9f56c 100644
--- a/app/lib/link_details_extractor.rb
+++ b/app/lib/link_details_extractor.rb
@@ -101,7 +101,7 @@ def root_array(root)
     end
 
     def json
-      @json ||= root_array(Oj.load(@data)).find { |obj| SUPPORTED_TYPES.include?(obj['@type']) } || {}
+      @json ||= root_array(Oj.load(@data)).compact.find { |obj| SUPPORTED_TYPES.include?(obj['@type']) } || {}
     end
   end
 
diff --git a/spec/lib/link_details_extractor_spec.rb b/spec/lib/link_details_extractor_spec.rb
index 2a4df70a8bf226..b1e5cedced3b2d 100644
--- a/spec/lib/link_details_extractor_spec.rb
+++ b/spec/lib/link_details_extractor_spec.rb
@@ -129,6 +129,24 @@
       include_examples 'structured data'
     end
 
+    context 'with the first tag is null' do
+      let(:html) { <<~HTML }
+        <!doctype html>
+        <html>
+        <body>
+          <script type="application/ld+json">
+            null
+          </script>
+          <script type="application/ld+json">
+            #{ld_json}
+          </script>
+        </body>
+        </html>
+      HTML
+
+      include_examples 'structured data'
+    end
+
     context 'with preceding block of unsupported LD+JSON' do
       let(:html) { <<~HTML }
         <!doctype html>

From 5f5373397fd6d1bfde907c078174de6ca14d925e Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 25 Jul 2024 10:59:56 -0400
Subject: [PATCH 1629/2191] Remove duplicate `omniauth_only?` helper method
 (#31066)

---
 app/controllers/application_controller.rb | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 66e0f7e3051d56..62e3355ae62bd1 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -20,7 +20,6 @@ class ApplicationController < ActionController::Base
   helper_method :current_theme
   helper_method :single_user_mode?
   helper_method :use_seamless_external_login?
-  helper_method :omniauth_only?
   helper_method :sso_account_settings
   helper_method :limited_federation_mode?
   helper_method :body_class_string
@@ -137,10 +136,6 @@ def use_seamless_external_login?
     Devise.pam_authentication || Devise.ldap_authentication
   end
 
-  def omniauth_only?
-    ENV['OMNIAUTH_ONLY'] == 'true'
-  end
-
   def sso_account_settings
     ENV.fetch('SSO_ACCOUNT_SETTINGS', nil)
   end

From 887e64efd4abbf3980e008c7a5441b44fbd6c766 Mon Sep 17 00:00:00 2001
From: Adam Niedzielski <adamsunday@gmail.com>
Date: Thu, 25 Jul 2024 17:02:58 +0200
Subject: [PATCH 1630/2191] Allow @ at the end of an URL (#31124)

---
 config/initializers/twitter_regex.rb | 2 +-
 spec/lib/text_formatter_spec.rb      | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/config/initializers/twitter_regex.rb b/config/initializers/twitter_regex.rb
index 9ca4eb0da9a8e1..b932e97e2faf1a 100644
--- a/config/initializers/twitter_regex.rb
+++ b/config/initializers/twitter_regex.rb
@@ -9,7 +9,7 @@ def emoji_parsing_enabled
 
   class Regex
     REGEXEN[:valid_general_url_path_chars] = /[^\p{White_Space}<>()?]/iou
-    REGEXEN[:valid_url_path_ending_chars] = /[^\p{White_Space}()?!*"'「」<>;:=,.$%\[\]~&|@]|(?:#{REGEXEN[:valid_url_balanced_parens]})/iou
+    REGEXEN[:valid_url_path_ending_chars] = /[^\p{White_Space}()?!*"'「」<>;:=,.$%\[\]~&|]|(?:#{REGEXEN[:valid_url_balanced_parens]})/iou
     REGEXEN[:valid_url_balanced_parens] = /
       \(
         (?:
diff --git a/spec/lib/text_formatter_spec.rb b/spec/lib/text_formatter_spec.rb
index 8b922c018b0078..bde17bb79c5bd5 100644
--- a/spec/lib/text_formatter_spec.rb
+++ b/spec/lib/text_formatter_spec.rb
@@ -224,6 +224,14 @@
       end
     end
 
+    context 'when given a URL with trailing @ symbol' do
+      let(:text) { 'https://gta.fandom.com/wiki/TW@ Content' }
+
+      it 'matches the full URL' do
+        expect(subject).to include 'href="https://gta.fandom.com/wiki/TW@"'
+      end
+    end
+
     context 'when given a URL containing unsafe code (XSS attack, visible part)' do
       let(:text) { 'http://example.com/b<del>b</del>' }
 

From ff6d2ec34306462e3c548ca92df5992887a9d7fa Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 25 Jul 2024 15:38:05 +0000
Subject: [PATCH 1631/2191] fix(deps): update dependency pino to v9.3.2
 (#31148)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 9aca26545b7f21..c62945dd978cca 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -13197,15 +13197,15 @@ __metadata:
   linkType: hard
 
 "pino@npm:^9.0.0":
-  version: 9.3.1
-  resolution: "pino@npm:9.3.1"
+  version: 9.3.2
+  resolution: "pino@npm:9.3.2"
   dependencies:
     atomic-sleep: "npm:^1.0.0"
     fast-redact: "npm:^3.1.1"
     on-exit-leak-free: "npm:^2.1.0"
     pino-abstract-transport: "npm:^1.2.0"
     pino-std-serializers: "npm:^7.0.0"
-    process-warning: "npm:^3.0.0"
+    process-warning: "npm:^4.0.0"
     quick-format-unescaped: "npm:^4.0.3"
     real-require: "npm:^0.2.0"
     safe-stable-stringify: "npm:^2.3.1"
@@ -13213,7 +13213,7 @@ __metadata:
     thread-stream: "npm:^3.0.0"
   bin:
     pino: bin.js
-  checksum: 10c0/ab1e81b3e5a91852136d80a592939883eeb81442e5d3a2c070bdbdeb47c5aaa297ead246530b10eb6d5ff59445f4645d1333d342f255d9f002f73aea843e74ee
+  checksum: 10c0/698eb2ebfcc4252da9d035fcf9c999bf27615b66ebc47f9b3d7e942750e50ebe38429e6457abcf8014d70125964ddf114e696cb8225b480d9930271708e3fb52
   languageName: node
   linkType: hard
 
@@ -14188,6 +14188,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"process-warning@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "process-warning@npm:4.0.0"
+  checksum: 10c0/5312a72b69d37a1b82ad03f3dfa0090dab3804a8fd995d06c28e3c002852bd82f5584217d9f4a3f197892bb2afc22d57e2c662c7e906b5abb48c0380c7b0880d
+  languageName: node
+  linkType: hard
+
 "process@npm:^0.11.10":
   version: 0.11.10
   resolution: "process@npm:0.11.10"

From 8818748b9023acd84f42bf887e361d9244521df4 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 25 Jul 2024 19:05:54 +0200
Subject: [PATCH 1632/2191] Change design of confirmation modals in web UI
 (#30884)

Co-authored-by: Renaud Chaput <renchap@gmail.com>
---
 app/javascript/mastodon/components/domain.tsx | 14 +--
 .../mastodon/components/follow_button.tsx     | 29 ++-----
 .../mastodon/containers/account_container.jsx | 21 ++---
 .../mastodon/containers/domain_container.jsx  | 36 --------
 .../mastodon/containers/status_container.jsx  | 42 ++-------
 .../containers/header_container.jsx           | 19 +---
 .../compose/components/action_bar.jsx         | 15 +---
 .../mastodon/features/compose/index.jsx       | 15 +---
 .../components/conversation.jsx               | 13 +--
 .../directory/components/account_card.tsx     | 52 ++---------
 .../mastodon/features/domain_blocks/index.jsx |  5 +-
 .../mastodon/features/list_timeline/index.jsx | 23 +----
 .../containers/column_settings_container.js   | 16 +---
 .../picture_in_picture/components/footer.jsx  | 14 +--
 .../containers/detailed_status_container.js   | 31 +------
 .../mastodon/features/status/index.jsx        | 37 +++-----
 .../ui/components/confirmation_modal.jsx      | 65 --------------
 .../clear_notifications.tsx                   | 46 ++++++++++
 .../confirmation_modal.tsx                    | 79 +++++++++++++++++
 .../confirmation_modals/delete_list.tsx       | 58 +++++++++++++
 .../confirmation_modals/delete_status.tsx     | 67 +++++++++++++++
 .../confirmation_modals/edit_status.tsx       | 45 ++++++++++
 .../components/confirmation_modals/index.ts   |  8 ++
 .../confirmation_modals/log_out.tsx           | 40 +++++++++
 .../components/confirmation_modals/reply.tsx  | 46 ++++++++++
 .../confirmation_modals/unfollow.tsx          | 50 +++++++++++
 .../ui/components/disabled_account_banner.jsx | 20 +----
 .../features/ui/components/link_footer.jsx    | 21 +----
 .../features/ui/components/modal_root.jsx     | 18 +++-
 app/javascript/mastodon/locales/en.json       | 12 ++-
 .../styles/mastodon/components.scss           | 86 +++++--------------
 31 files changed, 554 insertions(+), 489 deletions(-)
 delete mode 100644 app/javascript/mastodon/containers/domain_container.jsx
 delete mode 100644 app/javascript/mastodon/features/ui/components/confirmation_modal.jsx
 create mode 100644 app/javascript/mastodon/features/ui/components/confirmation_modals/clear_notifications.tsx
 create mode 100644 app/javascript/mastodon/features/ui/components/confirmation_modals/confirmation_modal.tsx
 create mode 100644 app/javascript/mastodon/features/ui/components/confirmation_modals/delete_list.tsx
 create mode 100644 app/javascript/mastodon/features/ui/components/confirmation_modals/delete_status.tsx
 create mode 100644 app/javascript/mastodon/features/ui/components/confirmation_modals/edit_status.tsx
 create mode 100644 app/javascript/mastodon/features/ui/components/confirmation_modals/index.ts
 create mode 100644 app/javascript/mastodon/features/ui/components/confirmation_modals/log_out.tsx
 create mode 100644 app/javascript/mastodon/features/ui/components/confirmation_modals/reply.tsx
 create mode 100644 app/javascript/mastodon/features/ui/components/confirmation_modals/unfollow.tsx

diff --git a/app/javascript/mastodon/components/domain.tsx b/app/javascript/mastodon/components/domain.tsx
index ed5e8e7e4c20ef..aa64f0f8c3dd1d 100644
--- a/app/javascript/mastodon/components/domain.tsx
+++ b/app/javascript/mastodon/components/domain.tsx
@@ -3,6 +3,8 @@ import { useCallback } from 'react';
 import { defineMessages, useIntl } from 'react-intl';
 
 import LockOpenIcon from '@/material-icons/400-24px/lock_open.svg?react';
+import { unblockDomain } from 'mastodon/actions/domain_blocks';
+import { useAppDispatch } from 'mastodon/store';
 
 import { IconButton } from './icon_button';
 
@@ -13,17 +15,15 @@ const messages = defineMessages({
   },
 });
 
-interface Props {
+export const Domain: React.FC<{
   domain: string;
-  onUnblockDomain: (domain: string) => void;
-}
-
-export const Domain: React.FC<Props> = ({ domain, onUnblockDomain }) => {
+}> = ({ domain }) => {
   const intl = useIntl();
+  const dispatch = useAppDispatch();
 
   const handleDomainUnblock = useCallback(() => {
-    onUnblockDomain(domain);
-  }, [domain, onUnblockDomain]);
+    dispatch(unblockDomain(domain));
+  }, [dispatch, domain]);
 
   return (
     <div className='domain'>
diff --git a/app/javascript/mastodon/components/follow_button.tsx b/app/javascript/mastodon/components/follow_button.tsx
index ecc4e1ee175f63..222789318e83ba 100644
--- a/app/javascript/mastodon/components/follow_button.tsx
+++ b/app/javascript/mastodon/components/follow_button.tsx
@@ -1,13 +1,9 @@
 import { useCallback, useEffect } from 'react';
 
-import { useIntl, defineMessages, FormattedMessage } from 'react-intl';
+import { useIntl, defineMessages } from 'react-intl';
 
 import { useIdentity } from '@/mastodon/identity_context';
-import {
-  fetchRelationships,
-  followAccount,
-  unfollowAccount,
-} from 'mastodon/actions/accounts';
+import { fetchRelationships, followAccount } from 'mastodon/actions/accounts';
 import { openModal } from 'mastodon/actions/modal';
 import { Button } from 'mastodon/components/button';
 import { LoadingIndicator } from 'mastodon/components/loading_indicator';
@@ -60,29 +56,14 @@ export const FollowButton: React.FC<{
 
     if (accountId === me) {
       return;
-    } else if (relationship.following || relationship.requested) {
+    } else if (account && (relationship.following || relationship.requested)) {
       dispatch(
-        openModal({
-          modalType: 'CONFIRM',
-          modalProps: {
-            message: (
-              <FormattedMessage
-                id='confirmations.unfollow.message'
-                defaultMessage='Are you sure you want to unfollow {name}?'
-                values={{ name: <strong>@{account?.acct}</strong> }}
-              />
-            ),
-            confirm: intl.formatMessage(messages.unfollow),
-            onConfirm: () => {
-              dispatch(unfollowAccount(accountId));
-            },
-          },
-        }),
+        openModal({ modalType: 'CONFIRM_UNFOLLOW', modalProps: { account } }),
       );
     } else {
       dispatch(followAccount(accountId));
     }
-  }, [dispatch, intl, accountId, relationship, account, signedIn]);
+  }, [dispatch, accountId, relationship, account, signedIn]);
 
   let label;
 
diff --git a/app/javascript/mastodon/containers/account_container.jsx b/app/javascript/mastodon/containers/account_container.jsx
index f171fcc2fe5d19..d34962fa4a5f44 100644
--- a/app/javascript/mastodon/containers/account_container.jsx
+++ b/app/javascript/mastodon/containers/account_container.jsx
@@ -1,24 +1,20 @@
-import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
+import { injectIntl } from 'react-intl';
 
 import { connect } from 'react-redux';
 
+import { openModal } from 'mastodon/actions/modal';
+
 import {
   followAccount,
-  unfollowAccount,
   blockAccount,
   unblockAccount,
   muteAccount,
   unmuteAccount,
 } from '../actions/accounts';
-import { openModal } from '../actions/modal';
 import { initMuteModal } from '../actions/mutes';
 import Account from '../components/account';
 import { makeGetAccount } from '../selectors';
 
-const messages = defineMessages({
-  unfollowConfirm: { id: 'confirmations.unfollow.confirm', defaultMessage: 'Unfollow' },
-});
-
 const makeMapStateToProps = () => {
   const getAccount = makeGetAccount();
 
@@ -29,18 +25,11 @@ const makeMapStateToProps = () => {
   return mapStateToProps;
 };
 
-const mapDispatchToProps = (dispatch, { intl }) => ({
+const mapDispatchToProps = (dispatch) => ({
 
   onFollow (account) {
     if (account.getIn(['relationship', 'following']) || account.getIn(['relationship', 'requested'])) {
-      dispatch(openModal({
-        modalType: 'CONFIRM',
-        modalProps: {
-          message: <FormattedMessage id='confirmations.unfollow.message' defaultMessage='Are you sure you want to unfollow {name}?' values={{ name: <strong>@{account.get('acct')}</strong> }} />,
-          confirm: intl.formatMessage(messages.unfollowConfirm),
-          onConfirm: () => dispatch(unfollowAccount(account.get('id'))),
-        },
-      }));
+      dispatch(openModal({ modalType: 'CONFIRM_UNFOLLOW', modalProps: { account } }));
     } else {
       dispatch(followAccount(account.get('id')));
     }
diff --git a/app/javascript/mastodon/containers/domain_container.jsx b/app/javascript/mastodon/containers/domain_container.jsx
deleted file mode 100644
index c719a5775c7c16..00000000000000
--- a/app/javascript/mastodon/containers/domain_container.jsx
+++ /dev/null
@@ -1,36 +0,0 @@
-import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
-
-import { connect } from 'react-redux';
-
-import { blockDomain, unblockDomain } from '../actions/domain_blocks';
-import { openModal } from '../actions/modal';
-import { Domain } from '../components/domain';
-
-const messages = defineMessages({
-  blockDomainConfirm: { id: 'confirmations.domain_block.confirm', defaultMessage: 'Block entire domain' },
-});
-
-const makeMapStateToProps = () => {
-  const mapStateToProps = () => ({});
-
-  return mapStateToProps;
-};
-
-const mapDispatchToProps = (dispatch, { intl }) => ({
-  onBlockDomain (domain) {
-    dispatch(openModal({
-      modalType: 'CONFIRM',
-      modalProps: {
-        message: <FormattedMessage id='confirmations.domain_block.message' defaultMessage='Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable. You will not see content from that domain in any public timelines or your notifications. Your followers from that domain will be removed.' values={{ domain: <strong>{domain}</strong> }} />,
-        confirm: intl.formatMessage(messages.blockDomainConfirm),
-        onConfirm: () => dispatch(blockDomain(domain)),
-      },
-    }));
-  },
-
-  onUnblockDomain (domain) {
-    dispatch(unblockDomain(domain));
-  },
-});
-
-export default injectIntl(connect(makeMapStateToProps, mapDispatchToProps)(Domain));
diff --git a/app/javascript/mastodon/containers/status_container.jsx b/app/javascript/mastodon/containers/status_container.jsx
index c803822dc057ff..58c5aac8f803cb 100644
--- a/app/javascript/mastodon/containers/status_container.jsx
+++ b/app/javascript/mastodon/containers/status_container.jsx
@@ -1,4 +1,4 @@
-import { defineMessages, injectIntl } from 'react-intl';
+import { injectIntl } from 'react-intl';
 
 import { connect } from 'react-redux';
 
@@ -46,18 +46,6 @@ import Status from '../components/status';
 import { deleteModal } from '../initial_state';
 import { makeGetStatus, makeGetPictureInPicture } from '../selectors';
 
-const messages = defineMessages({
-  deleteConfirm: { id: 'confirmations.delete.confirm', defaultMessage: 'Delete' },
-  deleteMessage: { id: 'confirmations.delete.message', defaultMessage: 'Are you sure you want to delete this status?' },
-  redraftConfirm: { id: 'confirmations.redraft.confirm', defaultMessage: 'Delete & redraft' },
-  redraftMessage: { id: 'confirmations.redraft.message', defaultMessage: 'Are you sure you want to delete this status and re-draft it? Favorites and boosts will be lost, and replies to the original post will be orphaned.' },
-  replyConfirm: { id: 'confirmations.reply.confirm', defaultMessage: 'Reply' },
-  replyMessage: { id: 'confirmations.reply.message', defaultMessage: 'Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?' },
-  editConfirm: { id: 'confirmations.edit.confirm', defaultMessage: 'Edit' },
-  editMessage: { id: 'confirmations.edit.message', defaultMessage: 'Editing now will overwrite the message you are currently composing. Are you sure you want to proceed?' },
-  blockDomainConfirm: { id: 'confirmations.domain_block.confirm', defaultMessage: 'Block entire domain' },
-});
-
 const makeMapStateToProps = () => {
   const getStatus = makeGetStatus();
   const getPictureInPicture = makeGetPictureInPicture();
@@ -71,20 +59,14 @@ const makeMapStateToProps = () => {
   return mapStateToProps;
 };
 
-const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
+const mapDispatchToProps = (dispatch, { contextType }) => ({
 
   onReply (status) {
     dispatch((_, getState) => {
       let state = getState();
 
       if (state.getIn(['compose', 'text']).trim().length !== 0) {
-        dispatch(openModal({
-          modalType: 'CONFIRM',
-          modalProps: {
-            message: intl.formatMessage(messages.replyMessage),
-            confirm: intl.formatMessage(messages.replyConfirm),
-            onConfirm: () => dispatch(replyCompose(status)) },
-        }));
+        dispatch(openModal({ modalType: 'CONFIRM_REPLY', modalProps: { status } }));
       } else {
         dispatch(replyCompose(status));
       }
@@ -129,14 +111,7 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
     if (!deleteModal) {
       dispatch(deleteStatus(status.get('id'), withRedraft));
     } else {
-      dispatch(openModal({
-        modalType: 'CONFIRM',
-        modalProps: {
-          message: intl.formatMessage(withRedraft ? messages.redraftMessage : messages.deleteMessage),
-          confirm: intl.formatMessage(withRedraft ? messages.redraftConfirm : messages.deleteConfirm),
-          onConfirm: () => dispatch(deleteStatus(status.get('id'), withRedraft)),
-        },
-      }));
+      dispatch(openModal({ modalType: 'CONFIRM_DELETE_STATUS', modalProps: { statusId: status.get('id'), withRedraft } }));
     }
   },
 
@@ -144,14 +119,7 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
     dispatch((_, getState) => {
       let state = getState();
       if (state.getIn(['compose', 'text']).trim().length !== 0) {
-        dispatch(openModal({
-          modalType: 'CONFIRM',
-          modalProps: {
-            message: intl.formatMessage(messages.editMessage),
-            confirm: intl.formatMessage(messages.editConfirm),
-            onConfirm: () => dispatch(editStatus(status.get('id'))),
-          },
-        }));
+        dispatch(openModal({ modalType: 'CONFIRM_EDIT_STATUS', modalProps: { statusId: status.get('id') } }));
       } else {
         dispatch(editStatus(status.get('id')));
       }
diff --git a/app/javascript/mastodon/features/account_timeline/containers/header_container.jsx b/app/javascript/mastodon/features/account_timeline/containers/header_container.jsx
index 90298879d7c967..8df06bd920a004 100644
--- a/app/javascript/mastodon/features/account_timeline/containers/header_container.jsx
+++ b/app/javascript/mastodon/features/account_timeline/containers/header_container.jsx
@@ -1,4 +1,4 @@
-import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
+import { injectIntl } from 'react-intl';
 
 import { connect } from 'react-redux';
 
@@ -6,7 +6,6 @@ import { openURL } from 'mastodon/actions/search';
 
 import {
   followAccount,
-  unfollowAccount,
   unblockAccount,
   unmuteAccount,
   pinAccount,
@@ -24,11 +23,6 @@ import { initReport } from '../../../actions/reports';
 import { makeGetAccount, getAccountHidden } from '../../../selectors';
 import Header from '../components/header';
 
-const messages = defineMessages({
-  unfollowConfirm: { id: 'confirmations.unfollow.confirm', defaultMessage: 'Unfollow' },
-  blockDomainConfirm: { id: 'confirmations.domain_block.confirm', defaultMessage: 'Block entire domain' },
-});
-
 const makeMapStateToProps = () => {
   const getAccount = makeGetAccount();
 
@@ -41,18 +35,11 @@ const makeMapStateToProps = () => {
   return mapStateToProps;
 };
 
-const mapDispatchToProps = (dispatch, { intl }) => ({
+const mapDispatchToProps = (dispatch) => ({
 
   onFollow (account) {
     if (account.getIn(['relationship', 'following']) || account.getIn(['relationship', 'requested'])) {
-      dispatch(openModal({
-        modalType: 'CONFIRM',
-        modalProps: {
-          message: <FormattedMessage id='confirmations.unfollow.message' defaultMessage='Are you sure you want to unfollow {name}?' values={{ name: <strong>@{account.get('acct')}</strong> }} />,
-          confirm: intl.formatMessage(messages.unfollowConfirm),
-          onConfirm: () => dispatch(unfollowAccount(account.get('id'))),
-        },
-      }));
+      dispatch(openModal({ modalType: 'CONFIRM_UNFOLLOW', modalProps: { account } }));
     } else {
       dispatch(followAccount(account.get('id')));
     }
diff --git a/app/javascript/mastodon/features/compose/components/action_bar.jsx b/app/javascript/mastodon/features/compose/components/action_bar.jsx
index be52eac11ea4f2..6c2f27b01bfc97 100644
--- a/app/javascript/mastodon/features/compose/components/action_bar.jsx
+++ b/app/javascript/mastodon/features/compose/components/action_bar.jsx
@@ -7,7 +7,6 @@ import { useDispatch } from 'react-redux';
 import MoreHorizIcon from '@/material-icons/400-24px/more_horiz.svg?react';
 import { openModal } from 'mastodon/actions/modal';
 import DropdownMenuContainer from 'mastodon/containers/dropdown_menu_container';
-import { logOut } from 'mastodon/utils/log_out';
 
 const messages = defineMessages({
   edit_profile: { id: 'account.edit_profile', defaultMessage: 'Edit profile' },
@@ -23,8 +22,6 @@ const messages = defineMessages({
   filters: { id: 'navigation_bar.filters', defaultMessage: 'Muted words' },
   logout: { id: 'navigation_bar.logout', defaultMessage: 'Logout' },
   bookmarks: { id: 'navigation_bar.bookmarks', defaultMessage: 'Bookmarks' },
-  logoutMessage: { id: 'confirmations.logout.message', defaultMessage: 'Are you sure you want to log out?' },
-  logoutConfirm: { id: 'confirmations.logout.confirm', defaultMessage: 'Log out' },
 });
 
 export const ActionBar = () => {
@@ -32,16 +29,8 @@ export const ActionBar = () => {
   const intl = useIntl();
 
   const handleLogoutClick = useCallback(() => {
-    dispatch(openModal({
-      modalType: 'CONFIRM',
-      modalProps: {
-        message: intl.formatMessage(messages.logoutMessage),
-        confirm: intl.formatMessage(messages.logoutConfirm),
-        closeWhenConfirm: false,
-        onConfirm: () => logOut(),
-      },
-    }));
-  }, [dispatch, intl]);
+    dispatch(openModal({ modalType: 'CONFIRM_LOG_OUT' }));
+  }, [dispatch]);
 
   let menu = [];
 
diff --git a/app/javascript/mastodon/features/compose/index.jsx b/app/javascript/mastodon/features/compose/index.jsx
index 83c741fd19119e..3a96ab49c38dc3 100644
--- a/app/javascript/mastodon/features/compose/index.jsx
+++ b/app/javascript/mastodon/features/compose/index.jsx
@@ -21,7 +21,6 @@ import SettingsIcon from '@/material-icons/400-24px/settings-fill.svg?react';
 import { openModal } from 'mastodon/actions/modal';
 import Column from 'mastodon/components/column';
 import { Icon }  from 'mastodon/components/icon';
-import { logOut } from 'mastodon/utils/log_out';
 
 import elephantUIPlane from '../../../images/elephant_ui_plane.svg';
 import { changeComposing, mountCompose, unmountCompose } from '../../actions/compose';
@@ -42,8 +41,6 @@ const messages = defineMessages({
   preferences: { id: 'navigation_bar.preferences', defaultMessage: 'Preferences' },
   logout: { id: 'navigation_bar.logout', defaultMessage: 'Logout' },
   compose: { id: 'navigation_bar.compose', defaultMessage: 'Compose new post' },
-  logoutMessage: { id: 'confirmations.logout.message', defaultMessage: 'Are you sure you want to log out?' },
-  logoutConfirm: { id: 'confirmations.logout.confirm', defaultMessage: 'Log out' },
 });
 
 const mapStateToProps = (state, ownProps) => ({
@@ -72,20 +69,12 @@ class Compose extends PureComponent {
   }
 
   handleLogoutClick = e => {
-    const { dispatch, intl } = this.props;
+    const { dispatch } = this.props;
 
     e.preventDefault();
     e.stopPropagation();
 
-    dispatch(openModal({
-      modalType: 'CONFIRM',
-      modalProps: {
-        message: intl.formatMessage(messages.logoutMessage),
-        confirm: intl.formatMessage(messages.logoutConfirm),
-        closeWhenConfirm: false,
-        onConfirm: () => logOut(),
-      },
-    }));
+    dispatch(openModal({ modalType: 'CONFIRM_LOG_OUT' }));
 
     return false;
   };
diff --git a/app/javascript/mastodon/features/direct_timeline/components/conversation.jsx b/app/javascript/mastodon/features/direct_timeline/components/conversation.jsx
index 326ea3e5ac4502..6588c8b763aee6 100644
--- a/app/javascript/mastodon/features/direct_timeline/components/conversation.jsx
+++ b/app/javascript/mastodon/features/direct_timeline/components/conversation.jsx
@@ -36,8 +36,6 @@ const messages = defineMessages({
   delete: { id: 'conversation.delete', defaultMessage: 'Delete conversation' },
   muteConversation: { id: 'status.mute_conversation', defaultMessage: 'Mute conversation' },
   unmuteConversation: { id: 'status.unmute_conversation', defaultMessage: 'Unmute conversation' },
-  replyConfirm: { id: 'confirmations.reply.confirm', defaultMessage: 'Reply' },
-  replyMessage: { id: 'confirmations.reply.message', defaultMessage: 'Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?' },
 });
 
 const getAccounts = createSelector(
@@ -103,19 +101,12 @@ export const Conversation = ({ conversation, scrollKey, onMoveUp, onMoveDown })
       let state = getState();
 
       if (state.getIn(['compose', 'text']).trim().length !== 0) {
-        dispatch(openModal({
-          modalType: 'CONFIRM',
-          modalProps: {
-            message: intl.formatMessage(messages.replyMessage),
-            confirm: intl.formatMessage(messages.replyConfirm),
-            onConfirm: () => dispatch(replyCompose(lastStatus)),
-          },
-        }));
+        dispatch(openModal({ modalType: 'CONFIRM_REPLY', modalProps: { status: lastStatus } }));
       } else {
         dispatch(replyCompose(lastStatus));
       }
     });
-  }, [dispatch, lastStatus, intl]);
+  }, [dispatch, lastStatus]);
 
   const handleDelete = useCallback(() => {
     dispatch(deleteConversation(id));
diff --git a/app/javascript/mastodon/features/directory/components/account_card.tsx b/app/javascript/mastodon/features/directory/components/account_card.tsx
index 7201f6135b440e..2a0470bb728bf9 100644
--- a/app/javascript/mastodon/features/directory/components/account_card.tsx
+++ b/app/javascript/mastodon/features/directory/components/account_card.tsx
@@ -8,7 +8,6 @@ import { Link } from 'react-router-dom';
 
 import {
   followAccount,
-  unfollowAccount,
   unblockAccount,
   unmuteAccount,
 } from 'mastodon/actions/accounts';
@@ -29,20 +28,12 @@ const messages = defineMessages({
     id: 'account.cancel_follow_request',
     defaultMessage: 'Withdraw follow request',
   },
-  cancelFollowRequestConfirm: {
-    id: 'confirmations.cancel_follow_request.confirm',
-    defaultMessage: 'Withdraw request',
-  },
   requested: {
     id: 'account.requested',
     defaultMessage: 'Awaiting approval. Click to cancel follow request',
   },
   unblock: { id: 'account.unblock_short', defaultMessage: 'Unblock' },
   unmute: { id: 'account.unmute_short', defaultMessage: 'Unmute' },
-  unfollowConfirm: {
-    id: 'confirmations.unfollow.confirm',
-    defaultMessage: 'Unfollow',
-  },
   edit_profile: { id: 'account.edit_profile', defaultMessage: 'Edit profile' },
 });
 
@@ -89,48 +80,17 @@ export const AccountCard: React.FC<{ accountId: string }> = ({ accountId }) => {
   const handleFollow = useCallback(() => {
     if (!account) return;
 
-    if (account.getIn(['relationship', 'following'])) {
-      dispatch(
-        openModal({
-          modalType: 'CONFIRM',
-          modalProps: {
-            message: (
-              <FormattedMessage
-                id='confirmations.unfollow.message'
-                defaultMessage='Are you sure you want to unfollow {name}?'
-                values={{ name: <strong>@{account.get('acct')}</strong> }}
-              />
-            ),
-            confirm: intl.formatMessage(messages.unfollowConfirm),
-            onConfirm: () => {
-              dispatch(unfollowAccount(account.get('id')));
-            },
-          },
-        }),
-      );
-    } else if (account.getIn(['relationship', 'requested'])) {
+    if (
+      account.getIn(['relationship', 'following']) ||
+      account.getIn(['relationship', 'requested'])
+    ) {
       dispatch(
-        openModal({
-          modalType: 'CONFIRM',
-          modalProps: {
-            message: (
-              <FormattedMessage
-                id='confirmations.cancel_follow_request.message'
-                defaultMessage='Are you sure you want to withdraw your request to follow {name}?'
-                values={{ name: <strong>@{account.get('acct')}</strong> }}
-              />
-            ),
-            confirm: intl.formatMessage(messages.cancelFollowRequestConfirm),
-            onConfirm: () => {
-              dispatch(unfollowAccount(account.get('id')));
-            },
-          },
-        }),
+        openModal({ modalType: 'CONFIRM_UNFOLLOW', modalProps: { account } }),
       );
     } else {
       dispatch(followAccount(account.get('id')));
     }
-  }, [account, dispatch, intl]);
+  }, [account, dispatch]);
 
   const handleBlock = useCallback(() => {
     if (account?.relationship?.blocking) {
diff --git a/app/javascript/mastodon/features/domain_blocks/index.jsx b/app/javascript/mastodon/features/domain_blocks/index.jsx
index 964eada9c1e5b9..3656596806127d 100644
--- a/app/javascript/mastodon/features/domain_blocks/index.jsx
+++ b/app/javascript/mastodon/features/domain_blocks/index.jsx
@@ -11,16 +11,15 @@ import { connect } from 'react-redux';
 import { debounce } from 'lodash';
 
 import BlockIcon from '@/material-icons/400-24px/block-fill.svg?react';
+import { Domain } from 'mastodon/components/domain';
 
 import { fetchDomainBlocks, expandDomainBlocks } from '../../actions/domain_blocks';
 import { LoadingIndicator } from '../../components/loading_indicator';
 import ScrollableList from '../../components/scrollable_list';
-import DomainContainer from '../../containers/domain_container';
 import Column from '../ui/components/column';
 
 const messages = defineMessages({
   heading: { id: 'column.domain_blocks', defaultMessage: 'Blocked domains' },
-  unblockDomain: { id: 'account.unblock_domain', defaultMessage: 'Unblock domain {domain}' },
 });
 
 const mapStateToProps = state => ({
@@ -70,7 +69,7 @@ class Blocks extends ImmutablePureComponent {
           bindToDocument={!multiColumn}
         >
           {domains.map(domain =>
-            <DomainContainer key={domain} domain={domain} />,
+            <Domain key={domain} domain={domain} />,
           )}
         </ScrollableList>
 
diff --git a/app/javascript/mastodon/features/list_timeline/index.jsx b/app/javascript/mastodon/features/list_timeline/index.jsx
index f640e503c270e4..59d9f869778de9 100644
--- a/app/javascript/mastodon/features/list_timeline/index.jsx
+++ b/app/javascript/mastodon/features/list_timeline/index.jsx
@@ -15,7 +15,7 @@ import DeleteIcon from '@/material-icons/400-24px/delete.svg?react';
 import EditIcon from '@/material-icons/400-24px/edit.svg?react';
 import ListAltIcon from '@/material-icons/400-24px/list_alt.svg?react';
 import { addColumn, removeColumn, moveColumn } from 'mastodon/actions/columns';
-import { fetchList, deleteList, updateList } from 'mastodon/actions/lists';
+import { fetchList, updateList } from 'mastodon/actions/lists';
 import { openModal } from 'mastodon/actions/modal';
 import { connectListStream } from 'mastodon/actions/streaming';
 import { expandListTimeline } from 'mastodon/actions/timelines';
@@ -29,8 +29,6 @@ import StatusListContainer from 'mastodon/features/ui/containers/status_list_con
 import { WithRouterPropTypes } from 'mastodon/utils/react_router';
 
 const messages = defineMessages({
-  deleteMessage: { id: 'confirmations.delete_list.message', defaultMessage: 'Are you sure you want to permanently delete this list?' },
-  deleteConfirm: { id: 'confirmations.delete_list.confirm', defaultMessage: 'Delete' },
   followed:   { id: 'lists.replies_policy.followed', defaultMessage: 'Any followed user' },
   none:    { id: 'lists.replies_policy.none', defaultMessage: 'No one' },
   list:  { id: 'lists.replies_policy.list', defaultMessage: 'Members of the list' },
@@ -125,25 +123,10 @@ class ListTimeline extends PureComponent {
   };
 
   handleDeleteClick = () => {
-    const { dispatch, columnId, intl } = this.props;
+    const { dispatch, columnId } = this.props;
     const { id } = this.props.params;
 
-    dispatch(openModal({
-      modalType: 'CONFIRM',
-      modalProps: {
-        message: intl.formatMessage(messages.deleteMessage),
-        confirm: intl.formatMessage(messages.deleteConfirm),
-        onConfirm: () => {
-          dispatch(deleteList(id));
-
-          if (columnId) {
-            dispatch(removeColumn(columnId));
-          } else {
-            this.props.history.push('/lists');
-          }
-        },
-      },
-    }));
+    dispatch(openModal({ modalType: 'CONFIRM_DELETE_LIST', modalProps: { listId: id, columnId } }));
   };
 
   handleRepliesPolicyChange = ({ target }) => {
diff --git a/app/javascript/mastodon/features/notifications/containers/column_settings_container.js b/app/javascript/mastodon/features/notifications/containers/column_settings_container.js
index 2434c3982d582b..21dbb2aa901dd9 100644
--- a/app/javascript/mastodon/features/notifications/containers/column_settings_container.js
+++ b/app/javascript/mastodon/features/notifications/containers/column_settings_container.js
@@ -2,11 +2,10 @@ import { defineMessages, injectIntl } from 'react-intl';
 
 import { connect } from 'react-redux';
 
+import { openModal } from 'mastodon/actions/modal';
 import { initializeNotifications } from 'mastodon/actions/notifications_migration';
 
 import { showAlert } from '../../../actions/alerts';
-import { openModal } from '../../../actions/modal';
-import { clearNotifications } from '../../../actions/notification_groups';
 import { updateNotificationsPolicy } from '../../../actions/notification_policies';
 import { setFilter, requestBrowserPermission } from '../../../actions/notifications';
 import { changeAlerts as changePushNotifications } from '../../../actions/push_notifications';
@@ -14,8 +13,6 @@ import { changeSetting } from '../../../actions/settings';
 import ColumnSettings from '../components/column_settings';
 
 const messages = defineMessages({
-  clearMessage: { id: 'notifications.clear_confirmation', defaultMessage: 'Are you sure you want to permanently clear all your notifications?' },
-  clearConfirm: { id: 'notifications.clear', defaultMessage: 'Clear notifications' },
   permissionDenied: { id: 'notifications.permission_denied_alert', defaultMessage: 'Desktop notifications can\'t be enabled, as browser permission has been denied before' },
 });
 
@@ -31,7 +28,7 @@ const mapStateToProps = state => ({
   notificationPolicy: state.notificationPolicy,
 });
 
-const mapDispatchToProps = (dispatch, { intl }) => ({
+const mapDispatchToProps = (dispatch) => ({
 
   onChange (path, checked) {
     if (path[0] === 'push') {
@@ -70,14 +67,7 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
   },
 
   onClear () {
-    dispatch(openModal({
-      modalType: 'CONFIRM',
-      modalProps: {
-        message: intl.formatMessage(messages.clearMessage),
-        confirm: intl.formatMessage(messages.clearConfirm),
-        onConfirm: () => dispatch(clearNotifications()),
-      },
-    }));
+    dispatch(openModal({ modalType: 'CONFIRM_CLEAR_NOTIFICATIONS' }));
   },
 
   onRequestNotificationPermission () {
diff --git a/app/javascript/mastodon/features/picture_in_picture/components/footer.jsx b/app/javascript/mastodon/features/picture_in_picture/components/footer.jsx
index d5226eb3461987..300c8dd5b3ef05 100644
--- a/app/javascript/mastodon/features/picture_in_picture/components/footer.jsx
+++ b/app/javascript/mastodon/features/picture_in_picture/components/footer.jsx
@@ -31,8 +31,6 @@ const messages = defineMessages({
   cancel_reblog_private: { id: 'status.cancel_reblog_private', defaultMessage: 'Unboost' },
   cannot_reblog: { id: 'status.cannot_reblog', defaultMessage: 'This post cannot be boosted' },
   favourite: { id: 'status.favourite', defaultMessage: 'Favorite' },
-  replyConfirm: { id: 'confirmations.reply.confirm', defaultMessage: 'Reply' },
-  replyMessage: { id: 'confirmations.reply.message', defaultMessage: 'Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?' },
   open: { id: 'status.open', defaultMessage: 'Expand this status' },
 });
 
@@ -71,19 +69,13 @@ class Footer extends ImmutablePureComponent {
   };
 
   handleReplyClick = () => {
-    const { dispatch, askReplyConfirmation, status, intl } = this.props;
+    const { dispatch, askReplyConfirmation, status, onClose } = this.props;
     const { signedIn } = this.props.identity;
 
     if (signedIn) {
       if (askReplyConfirmation) {
-        dispatch(openModal({
-          modalType: 'CONFIRM',
-          modalProps: {
-            message: intl.formatMessage(messages.replyMessage),
-            confirm: intl.formatMessage(messages.replyConfirm),
-            onConfirm: this._performReply,
-          },
-        }));
+        onClose(true);
+        dispatch(openModal({ modalType: 'CONFIRM_REPLY', modalProps: { status } }));
       } else {
         this._performReply();
       }
diff --git a/app/javascript/mastodon/features/status/containers/detailed_status_container.js b/app/javascript/mastodon/features/status/containers/detailed_status_container.js
index 5ab1013700adbd..0e73697fef70c5 100644
--- a/app/javascript/mastodon/features/status/containers/detailed_status_container.js
+++ b/app/javascript/mastodon/features/status/containers/detailed_status_container.js
@@ -1,4 +1,4 @@
-import { defineMessages, injectIntl } from 'react-intl';
+import { injectIntl } from 'react-intl';
 
 import { connect } from 'react-redux';
 
@@ -28,15 +28,6 @@ import { deleteModal } from '../../../initial_state';
 import { makeGetStatus, makeGetPictureInPicture } from '../../../selectors';
 import DetailedStatus from '../components/detailed_status';
 
-const messages = defineMessages({
-  deleteConfirm: { id: 'confirmations.delete.confirm', defaultMessage: 'Delete' },
-  deleteMessage: { id: 'confirmations.delete.message', defaultMessage: 'Are you sure you want to delete this status?' },
-  redraftConfirm: { id: 'confirmations.redraft.confirm', defaultMessage: 'Delete & redraft' },
-  redraftMessage: { id: 'confirmations.redraft.message', defaultMessage: 'Are you sure you want to delete this status and re-draft it? Favorites and boosts will be lost, and replies to the original post will be orphaned.' },
-  replyConfirm: { id: 'confirmations.reply.confirm', defaultMessage: 'Reply' },
-  replyMessage: { id: 'confirmations.reply.message', defaultMessage: 'Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?' },
-});
-
 const makeMapStateToProps = () => {
   const getStatus = makeGetStatus();
   const getPictureInPicture = makeGetPictureInPicture();
@@ -50,20 +41,13 @@ const makeMapStateToProps = () => {
   return mapStateToProps;
 };
 
-const mapDispatchToProps = (dispatch, { intl }) => ({
+const mapDispatchToProps = (dispatch) => ({
 
   onReply (status) {
     dispatch((_, getState) => {
       let state = getState();
       if (state.getIn(['compose', 'text']).trim().length !== 0) {
-        dispatch(openModal({
-          modalType: 'CONFIRM',
-          modalProps: {
-            message: intl.formatMessage(messages.replyMessage),
-            confirm: intl.formatMessage(messages.replyConfirm),
-            onConfirm: () => dispatch(replyCompose(status)),
-          },
-        }));
+        dispatch(openModal({ modalType: 'CONFIRM_REPLY', modalProps: { status } }));
       } else {
         dispatch(replyCompose(status));
       }
@@ -100,14 +84,7 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
     if (!deleteModal) {
       dispatch(deleteStatus(status.get('id'), withRedraft));
     } else {
-      dispatch(openModal({
-        modalType: 'CONFIRM',
-        modalProps: {
-          message: intl.formatMessage(withRedraft ? messages.redraftMessage : messages.deleteMessage),
-          confirm: intl.formatMessage(withRedraft ? messages.redraftConfirm : messages.deleteConfirm),
-          onConfirm: () => dispatch(deleteStatus(status.get('id'), withRedraft)),
-        },
-      }));
+      dispatch(openModal({ modalType: 'CONFIRM_DELETE_STATUS', modalProps: { statusId: status.get('id'), withRedraft } }));
     }
   },
 
diff --git a/app/javascript/mastodon/features/status/index.jsx b/app/javascript/mastodon/features/status/index.jsx
index e9df3697a2ba9f..7f3044c5c9be0b 100644
--- a/app/javascript/mastodon/features/status/index.jsx
+++ b/app/javascript/mastodon/features/status/index.jsx
@@ -72,17 +72,10 @@ import DetailedStatus from './components/detailed_status';
 
 
 const messages = defineMessages({
-  deleteConfirm: { id: 'confirmations.delete.confirm', defaultMessage: 'Delete' },
-  deleteMessage: { id: 'confirmations.delete.message', defaultMessage: 'Are you sure you want to delete this status?' },
-  redraftConfirm: { id: 'confirmations.redraft.confirm', defaultMessage: 'Delete & redraft' },
-  redraftMessage: { id: 'confirmations.redraft.message', defaultMessage: 'Are you sure you want to delete this status and re-draft it? Favorites and boosts will be lost, and replies to the original post will be orphaned.' },
   revealAll: { id: 'status.show_more_all', defaultMessage: 'Show more for all' },
   hideAll: { id: 'status.show_less_all', defaultMessage: 'Show less for all' },
   statusTitleWithAttachments: { id: 'status.title.with_attachments', defaultMessage: '{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}' },
   detailedStatus: { id: 'status.detailed_status', defaultMessage: 'Detailed conversation view' },
-  replyConfirm: { id: 'confirmations.reply.confirm', defaultMessage: 'Reply' },
-  replyMessage: { id: 'confirmations.reply.message', defaultMessage: 'Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?' },
-  blockDomainConfirm: { id: 'confirmations.domain_block.confirm', defaultMessage: 'Block entire domain' },
 });
 
 const makeMapStateToProps = () => {
@@ -264,19 +257,12 @@ class Status extends ImmutablePureComponent {
   };
 
   handleReplyClick = (status) => {
-    const { askReplyConfirmation, dispatch, intl } = this.props;
+    const { askReplyConfirmation, dispatch } = this.props;
     const { signedIn } = this.props.identity;
 
     if (signedIn) {
       if (askReplyConfirmation) {
-        dispatch(openModal({
-          modalType: 'CONFIRM',
-          modalProps: {
-            message: intl.formatMessage(messages.replyMessage),
-            confirm: intl.formatMessage(messages.replyConfirm),
-            onConfirm: () => dispatch(replyCompose(status)),
-          },
-        }));
+        dispatch(openModal({ modalType: 'CONFIRM_REPLY', modalProps: { status } }));
       } else {
         dispatch(replyCompose(status));
       }
@@ -319,24 +305,23 @@ class Status extends ImmutablePureComponent {
   };
 
   handleDeleteClick = (status, withRedraft = false) => {
-    const { dispatch, intl } = this.props;
+    const { dispatch } = this.props;
 
     if (!deleteModal) {
       dispatch(deleteStatus(status.get('id'), withRedraft));
     } else {
-      dispatch(openModal({
-        modalType: 'CONFIRM',
-        modalProps: {
-          message: intl.formatMessage(withRedraft ? messages.redraftMessage : messages.deleteMessage),
-          confirm: intl.formatMessage(withRedraft ? messages.redraftConfirm : messages.deleteConfirm),
-          onConfirm: () => dispatch(deleteStatus(status.get('id'), withRedraft)),
-        },
-      }));
+      dispatch(openModal({ modalType: 'CONFIRM_DELETE_STATUS', modalProps: { statusId: status.get('id'), withRedraft } }));
     }
   };
 
   handleEditClick = (status) => {
-    this.props.dispatch(editStatus(status.get('id')));
+    const { dispatch, askReplyConfirmation } = this.props;
+
+    if (askReplyConfirmation) {
+      dispatch(openModal({ modalType: 'CONFIRM_EDIT_STATUS', modalProps: { statusId: status.get('id') } }));
+    } else {
+      dispatch(editStatus(status.get('id')));
+    }
   };
 
   handleDirectClick = (account) => {
diff --git a/app/javascript/mastodon/features/ui/components/confirmation_modal.jsx b/app/javascript/mastodon/features/ui/components/confirmation_modal.jsx
deleted file mode 100644
index 5080c0bf85836d..00000000000000
--- a/app/javascript/mastodon/features/ui/components/confirmation_modal.jsx
+++ /dev/null
@@ -1,65 +0,0 @@
-import PropTypes from 'prop-types';
-import { PureComponent } from 'react';
-
-import { injectIntl, FormattedMessage } from 'react-intl';
-
-import { Button } from '../../../components/button';
-
-class ConfirmationModal extends PureComponent {
-
-  static propTypes = {
-    message: PropTypes.node.isRequired,
-    confirm: PropTypes.string.isRequired,
-    onClose: PropTypes.func.isRequired,
-    onConfirm: PropTypes.func.isRequired,
-    secondary: PropTypes.string,
-    onSecondary: PropTypes.func,
-    closeWhenConfirm: PropTypes.bool,
-    intl: PropTypes.object.isRequired,
-  };
-
-  static defaultProps = {
-    closeWhenConfirm: true,
-  };
-
-  handleClick = () => {
-    if (this.props.closeWhenConfirm) {
-      this.props.onClose();
-    }
-    this.props.onConfirm();
-  };
-
-  handleSecondary = () => {
-    this.props.onClose();
-    this.props.onSecondary();
-  };
-
-  handleCancel = () => {
-    this.props.onClose();
-  };
-
-  render () {
-    const { message, confirm, secondary } = this.props;
-
-    return (
-      <div className='modal-root__modal confirmation-modal'>
-        <div className='confirmation-modal__container'>
-          {message}
-        </div>
-
-        <div className='confirmation-modal__action-bar'>
-          <Button onClick={this.handleCancel} className='confirmation-modal__cancel-button'>
-            <FormattedMessage id='confirmation_modal.cancel' defaultMessage='Cancel' />
-          </Button>
-          {secondary !== undefined && (
-            <Button text={secondary} onClick={this.handleSecondary} className='confirmation-modal__secondary-button' />
-          )}
-          <Button text={confirm} onClick={this.handleClick} autoFocus />
-        </div>
-      </div>
-    );
-  }
-
-}
-
-export default injectIntl(ConfirmationModal);
diff --git a/app/javascript/mastodon/features/ui/components/confirmation_modals/clear_notifications.tsx b/app/javascript/mastodon/features/ui/components/confirmation_modals/clear_notifications.tsx
new file mode 100644
index 00000000000000..312ec600a649e9
--- /dev/null
+++ b/app/javascript/mastodon/features/ui/components/confirmation_modals/clear_notifications.tsx
@@ -0,0 +1,46 @@
+import { useCallback } from 'react';
+
+import { defineMessages, useIntl } from 'react-intl';
+
+import { clearNotifications } from 'mastodon/actions/notification_groups';
+import { useAppDispatch } from 'mastodon/store';
+
+import type { BaseConfirmationModalProps } from './confirmation_modal';
+import { ConfirmationModal } from './confirmation_modal';
+
+const messages = defineMessages({
+  clearTitle: {
+    id: 'notifications.clear_title',
+    defaultMessage: 'Clear notifications?',
+  },
+  clearMessage: {
+    id: 'notifications.clear_confirmation',
+    defaultMessage:
+      'Are you sure you want to permanently clear all your notifications?',
+  },
+  clearConfirm: {
+    id: 'notifications.clear',
+    defaultMessage: 'Clear notifications',
+  },
+});
+
+export const ConfirmClearNotificationsModal: React.FC<
+  BaseConfirmationModalProps
+> = ({ onClose }) => {
+  const intl = useIntl();
+  const dispatch = useAppDispatch();
+
+  const onConfirm = useCallback(() => {
+    void dispatch(clearNotifications());
+  }, [dispatch]);
+
+  return (
+    <ConfirmationModal
+      title={intl.formatMessage(messages.clearTitle)}
+      message={intl.formatMessage(messages.clearMessage)}
+      confirm={intl.formatMessage(messages.clearConfirm)}
+      onConfirm={onConfirm}
+      onClose={onClose}
+    />
+  );
+};
diff --git a/app/javascript/mastodon/features/ui/components/confirmation_modals/confirmation_modal.tsx b/app/javascript/mastodon/features/ui/components/confirmation_modals/confirmation_modal.tsx
new file mode 100644
index 00000000000000..c3a0c0aa76d297
--- /dev/null
+++ b/app/javascript/mastodon/features/ui/components/confirmation_modals/confirmation_modal.tsx
@@ -0,0 +1,79 @@
+import { useCallback } from 'react';
+
+import { FormattedMessage } from 'react-intl';
+
+import { Button } from 'mastodon/components/button';
+
+export interface BaseConfirmationModalProps {
+  onClose: () => void;
+}
+
+export const ConfirmationModal: React.FC<
+  {
+    title: React.ReactNode;
+    message: React.ReactNode;
+    confirm: React.ReactNode;
+    secondary?: React.ReactNode;
+    onSecondary?: () => void;
+    onConfirm: () => void;
+    closeWhenConfirm?: boolean;
+  } & BaseConfirmationModalProps
+> = ({
+  title,
+  message,
+  confirm,
+  onClose,
+  onConfirm,
+  secondary,
+  onSecondary,
+  closeWhenConfirm = true,
+}) => {
+  const handleClick = useCallback(() => {
+    if (closeWhenConfirm) {
+      onClose();
+    }
+
+    onConfirm();
+  }, [onClose, onConfirm, closeWhenConfirm]);
+
+  const handleSecondary = useCallback(() => {
+    onClose();
+    onSecondary?.();
+  }, [onClose, onSecondary]);
+
+  const handleCancel = useCallback(() => {
+    onClose();
+  }, [onClose]);
+
+  return (
+    <div className='modal-root__modal safety-action-modal'>
+      <div className='safety-action-modal__top'>
+        <div className='safety-action-modal__confirmation'>
+          <h1>{title}</h1>
+          <p>{message}</p>
+        </div>
+      </div>
+
+      <div className='safety-action-modal__bottom'>
+        <div className='safety-action-modal__actions'>
+          {secondary && (
+            <>
+              <Button onClick={handleSecondary}>{secondary}</Button>
+
+              <div className='spacer' />
+            </>
+          )}
+
+          <button onClick={handleCancel} className='link-button'>
+            <FormattedMessage
+              id='confirmation_modal.cancel'
+              defaultMessage='Cancel'
+            />
+          </button>
+
+          <Button onClick={handleClick}>{confirm}</Button>
+        </div>
+      </div>
+    </div>
+  );
+};
diff --git a/app/javascript/mastodon/features/ui/components/confirmation_modals/delete_list.tsx b/app/javascript/mastodon/features/ui/components/confirmation_modals/delete_list.tsx
new file mode 100644
index 00000000000000..8fd9d8da01207f
--- /dev/null
+++ b/app/javascript/mastodon/features/ui/components/confirmation_modals/delete_list.tsx
@@ -0,0 +1,58 @@
+import { useCallback } from 'react';
+
+import { defineMessages, useIntl } from 'react-intl';
+
+import { useHistory } from 'react-router';
+
+import { removeColumn } from 'mastodon/actions/columns';
+import { deleteList } from 'mastodon/actions/lists';
+import { useAppDispatch } from 'mastodon/store';
+
+import type { BaseConfirmationModalProps } from './confirmation_modal';
+import { ConfirmationModal } from './confirmation_modal';
+
+const messages = defineMessages({
+  deleteListTitle: {
+    id: 'confirmations.delete_list.title',
+    defaultMessage: 'Delete list?',
+  },
+  deleteListMessage: {
+    id: 'confirmations.delete_list.message',
+    defaultMessage: 'Are you sure you want to permanently delete this list?',
+  },
+  deleteListConfirm: {
+    id: 'confirmations.delete_list.confirm',
+    defaultMessage: 'Delete',
+  },
+});
+
+export const ConfirmDeleteListModal: React.FC<
+  {
+    listId: string;
+    columnId: string;
+  } & BaseConfirmationModalProps
+> = ({ listId, columnId, onClose }) => {
+  const intl = useIntl();
+  const dispatch = useAppDispatch();
+  const history = useHistory();
+
+  const onConfirm = useCallback(() => {
+    dispatch(deleteList(listId));
+
+    if (columnId) {
+      dispatch(removeColumn(columnId));
+    } else {
+      history.push('/lists');
+    }
+  }, [dispatch, history, columnId, listId]);
+
+  return (
+    <ConfirmationModal
+      title={intl.formatMessage(messages.deleteListTitle)}
+      message={intl.formatMessage(messages.deleteListMessage)}
+      confirm={intl.formatMessage(messages.deleteListConfirm)}
+      onConfirm={onConfirm}
+      onClose={onClose}
+    />
+  );
+};
diff --git a/app/javascript/mastodon/features/ui/components/confirmation_modals/delete_status.tsx b/app/javascript/mastodon/features/ui/components/confirmation_modals/delete_status.tsx
new file mode 100644
index 00000000000000..39e80cf7410455
--- /dev/null
+++ b/app/javascript/mastodon/features/ui/components/confirmation_modals/delete_status.tsx
@@ -0,0 +1,67 @@
+import { useCallback } from 'react';
+
+import { defineMessages, useIntl } from 'react-intl';
+
+import { deleteStatus } from 'mastodon/actions/statuses';
+import { useAppDispatch } from 'mastodon/store';
+
+import type { BaseConfirmationModalProps } from './confirmation_modal';
+import { ConfirmationModal } from './confirmation_modal';
+
+const messages = defineMessages({
+  deleteAndRedraftTitle: {
+    id: 'confirmations.redraft.title',
+    defaultMessage: 'Delete & redraft post?',
+  },
+  deleteAndRedraftMessage: {
+    id: 'confirmations.redraft.message',
+    defaultMessage:
+      'Are you sure you want to delete this status and re-draft it? Favorites and boosts will be lost, and replies to the original post will be orphaned.',
+  },
+  deleteAndRedraftConfirm: {
+    id: 'confirmations.redraft.confirm',
+    defaultMessage: 'Delete & redraft',
+  },
+  deleteTitle: {
+    id: 'confirmations.delete.title',
+    defaultMessage: 'Delete post?',
+  },
+  deleteMessage: {
+    id: 'confirmations.delete.message',
+    defaultMessage: 'Are you sure you want to delete this status?',
+  },
+  deleteConfirm: {
+    id: 'confirmations.delete.confirm',
+    defaultMessage: 'Delete',
+  },
+});
+
+export const ConfirmDeleteStatusModal: React.FC<
+  {
+    statusId: string;
+    withRedraft: boolean;
+  } & BaseConfirmationModalProps
+> = ({ statusId, withRedraft, onClose }) => {
+  const intl = useIntl();
+  const dispatch = useAppDispatch();
+
+  const onConfirm = useCallback(() => {
+    dispatch(deleteStatus(statusId, withRedraft));
+  }, [dispatch, statusId, withRedraft]);
+
+  return (
+    <ConfirmationModal
+      title={intl.formatMessage(
+        withRedraft ? messages.deleteAndRedraftTitle : messages.deleteTitle,
+      )}
+      message={intl.formatMessage(
+        withRedraft ? messages.deleteAndRedraftMessage : messages.deleteMessage,
+      )}
+      confirm={intl.formatMessage(
+        withRedraft ? messages.deleteAndRedraftConfirm : messages.deleteConfirm,
+      )}
+      onConfirm={onConfirm}
+      onClose={onClose}
+    />
+  );
+};
diff --git a/app/javascript/mastodon/features/ui/components/confirmation_modals/edit_status.tsx b/app/javascript/mastodon/features/ui/components/confirmation_modals/edit_status.tsx
new file mode 100644
index 00000000000000..fb958518c2537f
--- /dev/null
+++ b/app/javascript/mastodon/features/ui/components/confirmation_modals/edit_status.tsx
@@ -0,0 +1,45 @@
+import { useCallback } from 'react';
+
+import { defineMessages, useIntl } from 'react-intl';
+
+import { editStatus } from 'mastodon/actions/statuses';
+import { useAppDispatch } from 'mastodon/store';
+
+import type { BaseConfirmationModalProps } from './confirmation_modal';
+import { ConfirmationModal } from './confirmation_modal';
+
+const messages = defineMessages({
+  editTitle: {
+    id: 'confirmations.edit.title',
+    defaultMessage: 'Overwrite post?',
+  },
+  editConfirm: { id: 'confirmations.edit.confirm', defaultMessage: 'Edit' },
+  editMessage: {
+    id: 'confirmations.edit.message',
+    defaultMessage:
+      'Editing now will overwrite the message you are currently composing. Are you sure you want to proceed?',
+  },
+});
+
+export const ConfirmEditStatusModal: React.FC<
+  {
+    statusId: string;
+  } & BaseConfirmationModalProps
+> = ({ statusId, onClose }) => {
+  const intl = useIntl();
+  const dispatch = useAppDispatch();
+
+  const onConfirm = useCallback(() => {
+    dispatch(editStatus(statusId));
+  }, [dispatch, statusId]);
+
+  return (
+    <ConfirmationModal
+      title={intl.formatMessage(messages.editTitle)}
+      message={intl.formatMessage(messages.editMessage)}
+      confirm={intl.formatMessage(messages.editConfirm)}
+      onConfirm={onConfirm}
+      onClose={onClose}
+    />
+  );
+};
diff --git a/app/javascript/mastodon/features/ui/components/confirmation_modals/index.ts b/app/javascript/mastodon/features/ui/components/confirmation_modals/index.ts
new file mode 100644
index 00000000000000..912c99a393a1f0
--- /dev/null
+++ b/app/javascript/mastodon/features/ui/components/confirmation_modals/index.ts
@@ -0,0 +1,8 @@
+export { ConfirmationModal } from './confirmation_modal';
+export { ConfirmDeleteStatusModal } from './delete_status';
+export { ConfirmDeleteListModal } from './delete_list';
+export { ConfirmReplyModal } from './reply';
+export { ConfirmEditStatusModal } from './edit_status';
+export { ConfirmUnfollowModal } from './unfollow';
+export { ConfirmClearNotificationsModal } from './clear_notifications';
+export { ConfirmLogOutModal } from './log_out';
diff --git a/app/javascript/mastodon/features/ui/components/confirmation_modals/log_out.tsx b/app/javascript/mastodon/features/ui/components/confirmation_modals/log_out.tsx
new file mode 100644
index 00000000000000..48d24182ed6d45
--- /dev/null
+++ b/app/javascript/mastodon/features/ui/components/confirmation_modals/log_out.tsx
@@ -0,0 +1,40 @@
+import { useCallback } from 'react';
+
+import { defineMessages, useIntl } from 'react-intl';
+
+import { logOut } from 'mastodon/utils/log_out';
+
+import type { BaseConfirmationModalProps } from './confirmation_modal';
+import { ConfirmationModal } from './confirmation_modal';
+
+const messages = defineMessages({
+  logoutTitle: { id: 'confirmations.logout.title', defaultMessage: 'Log out?' },
+  logoutMessage: {
+    id: 'confirmations.logout.message',
+    defaultMessage: 'Are you sure you want to log out?',
+  },
+  logoutConfirm: {
+    id: 'confirmations.logout.confirm',
+    defaultMessage: 'Log out',
+  },
+});
+
+export const ConfirmLogOutModal: React.FC<BaseConfirmationModalProps> = ({
+  onClose,
+}) => {
+  const intl = useIntl();
+
+  const onConfirm = useCallback(() => {
+    logOut();
+  }, []);
+
+  return (
+    <ConfirmationModal
+      title={intl.formatMessage(messages.logoutTitle)}
+      message={intl.formatMessage(messages.logoutMessage)}
+      confirm={intl.formatMessage(messages.logoutConfirm)}
+      onConfirm={onConfirm}
+      onClose={onClose}
+    />
+  );
+};
diff --git a/app/javascript/mastodon/features/ui/components/confirmation_modals/reply.tsx b/app/javascript/mastodon/features/ui/components/confirmation_modals/reply.tsx
new file mode 100644
index 00000000000000..cccd62e4b41b7a
--- /dev/null
+++ b/app/javascript/mastodon/features/ui/components/confirmation_modals/reply.tsx
@@ -0,0 +1,46 @@
+import { useCallback } from 'react';
+
+import { defineMessages, useIntl } from 'react-intl';
+
+import { replyCompose } from 'mastodon/actions/compose';
+import type { Status } from 'mastodon/models/status';
+import { useAppDispatch } from 'mastodon/store';
+
+import type { BaseConfirmationModalProps } from './confirmation_modal';
+import { ConfirmationModal } from './confirmation_modal';
+
+const messages = defineMessages({
+  replyTitle: {
+    id: 'confirmations.reply.title',
+    defaultMessage: 'Overwrite post?',
+  },
+  replyConfirm: { id: 'confirmations.reply.confirm', defaultMessage: 'Reply' },
+  replyMessage: {
+    id: 'confirmations.reply.message',
+    defaultMessage:
+      'Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?',
+  },
+});
+
+export const ConfirmReplyModal: React.FC<
+  {
+    status: Status;
+  } & BaseConfirmationModalProps
+> = ({ status, onClose }) => {
+  const intl = useIntl();
+  const dispatch = useAppDispatch();
+
+  const onConfirm = useCallback(() => {
+    dispatch(replyCompose(status));
+  }, [dispatch, status]);
+
+  return (
+    <ConfirmationModal
+      title={intl.formatMessage(messages.replyTitle)}
+      message={intl.formatMessage(messages.replyMessage)}
+      confirm={intl.formatMessage(messages.replyConfirm)}
+      onConfirm={onConfirm}
+      onClose={onClose}
+    />
+  );
+};
diff --git a/app/javascript/mastodon/features/ui/components/confirmation_modals/unfollow.tsx b/app/javascript/mastodon/features/ui/components/confirmation_modals/unfollow.tsx
new file mode 100644
index 00000000000000..58e39da07bf95a
--- /dev/null
+++ b/app/javascript/mastodon/features/ui/components/confirmation_modals/unfollow.tsx
@@ -0,0 +1,50 @@
+import { useCallback } from 'react';
+
+import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
+
+import { unfollowAccount } from 'mastodon/actions/accounts';
+import type { Account } from 'mastodon/models/account';
+import { useAppDispatch } from 'mastodon/store';
+
+import type { BaseConfirmationModalProps } from './confirmation_modal';
+import { ConfirmationModal } from './confirmation_modal';
+
+const messages = defineMessages({
+  unfollowTitle: {
+    id: 'confirmations.unfollow.title',
+    defaultMessage: 'Unfollow user?',
+  },
+  unfollowConfirm: {
+    id: 'confirmations.unfollow.confirm',
+    defaultMessage: 'Unfollow',
+  },
+});
+
+export const ConfirmUnfollowModal: React.FC<
+  {
+    account: Account;
+  } & BaseConfirmationModalProps
+> = ({ account, onClose }) => {
+  const intl = useIntl();
+  const dispatch = useAppDispatch();
+
+  const onConfirm = useCallback(() => {
+    dispatch(unfollowAccount(account.id));
+  }, [dispatch, account.id]);
+
+  return (
+    <ConfirmationModal
+      title={intl.formatMessage(messages.unfollowTitle)}
+      message={
+        <FormattedMessage
+          id='confirmations.unfollow.message'
+          defaultMessage='Are you sure you want to unfollow {name}?'
+          values={{ name: <strong>@{account.acct}</strong> }}
+        />
+      }
+      confirm={intl.formatMessage(messages.unfollowConfirm)}
+      onConfirm={onConfirm}
+      onClose={onClose}
+    />
+  );
+};
diff --git a/app/javascript/mastodon/features/ui/components/disabled_account_banner.jsx b/app/javascript/mastodon/features/ui/components/disabled_account_banner.jsx
index 6a71bb2465ea54..3d1380f66699bd 100644
--- a/app/javascript/mastodon/features/ui/components/disabled_account_banner.jsx
+++ b/app/javascript/mastodon/features/ui/components/disabled_account_banner.jsx
@@ -1,7 +1,7 @@
 import PropTypes from 'prop-types';
 import { PureComponent } from 'react';
 
-import { FormattedMessage, defineMessages, injectIntl } from 'react-intl';
+import { FormattedMessage, injectIntl } from 'react-intl';
 
 import { Link } from 'react-router-dom';
 
@@ -9,29 +9,15 @@ import { connect } from 'react-redux';
 
 import { openModal } from 'mastodon/actions/modal';
 import { disabledAccountId, movedToAccountId, domain } from 'mastodon/initial_state';
-import { logOut } from 'mastodon/utils/log_out';
-
-const messages = defineMessages({
-  logoutMessage: { id: 'confirmations.logout.message', defaultMessage: 'Are you sure you want to log out?' },
-  logoutConfirm: { id: 'confirmations.logout.confirm', defaultMessage: 'Log out' },
-});
 
 const mapStateToProps = (state) => ({
   disabledAcct: state.getIn(['accounts', disabledAccountId, 'acct']),
   movedToAcct: movedToAccountId ? state.getIn(['accounts', movedToAccountId, 'acct']) : undefined,
 });
 
-const mapDispatchToProps = (dispatch, { intl }) => ({
+const mapDispatchToProps = (dispatch) => ({
   onLogout () {
-    dispatch(openModal({
-      modalType: 'CONFIRM',
-      modalProps: {
-        message: intl.formatMessage(messages.logoutMessage),
-        confirm: intl.formatMessage(messages.logoutConfirm),
-        closeWhenConfirm: false,
-        onConfirm: () => logOut(),
-      },
-    }));
+    dispatch(openModal({ modalType: 'CONFIRM_LOG_OUT' }));
   },
 });
 
diff --git a/app/javascript/mastodon/features/ui/components/link_footer.jsx b/app/javascript/mastodon/features/ui/components/link_footer.jsx
index 08af6fa4442658..49b21c2e487aef 100644
--- a/app/javascript/mastodon/features/ui/components/link_footer.jsx
+++ b/app/javascript/mastodon/features/ui/components/link_footer.jsx
@@ -1,7 +1,7 @@
 import PropTypes from 'prop-types';
 import { PureComponent } from 'react';
 
-import { FormattedMessage, defineMessages, injectIntl } from 'react-intl';
+import { FormattedMessage, injectIntl } from 'react-intl';
 
 import { Link } from 'react-router-dom';
 
@@ -11,24 +11,11 @@ import { openModal } from 'mastodon/actions/modal';
 import { identityContextPropShape, withIdentity } from 'mastodon/identity_context';
 import { domain, version, source_url, statusPageUrl, profile_directory as profileDirectory } from 'mastodon/initial_state';
 import { PERMISSION_INVITE_USERS } from 'mastodon/permissions';
-import { logOut } from 'mastodon/utils/log_out';
 
-const messages = defineMessages({
-  logoutMessage: { id: 'confirmations.logout.message', defaultMessage: 'Are you sure you want to log out?' },
-  logoutConfirm: { id: 'confirmations.logout.confirm', defaultMessage: 'Log out' },
-});
-
-const mapDispatchToProps = (dispatch, { intl }) => ({
+const mapDispatchToProps = (dispatch) => ({
   onLogout () {
-    dispatch(openModal({
-      modalType: 'CONFIRM',
-      modalProps: {
-        message: intl.formatMessage(messages.logoutMessage),
-        confirm: intl.formatMessage(messages.logoutConfirm),
-        closeWhenConfirm: false,
-        onConfirm: () => logOut(),
-      },
-    }));
+    dispatch(openModal({ modalType: 'CONFIRM_LOG_OUT' }));
+
   },
 });
 
diff --git a/app/javascript/mastodon/features/ui/components/modal_root.jsx b/app/javascript/mastodon/features/ui/components/modal_root.jsx
index 404b53c7429ae6..3e900a06670a26 100644
--- a/app/javascript/mastodon/features/ui/components/modal_root.jsx
+++ b/app/javascript/mastodon/features/ui/components/modal_root.jsx
@@ -26,7 +26,16 @@ import ActionsModal from './actions_modal';
 import AudioModal from './audio_modal';
 import { BoostModal } from './boost_modal';
 import BundleModalError from './bundle_modal_error';
-import ConfirmationModal from './confirmation_modal';
+import {
+  ConfirmationModal,
+  ConfirmDeleteStatusModal,
+  ConfirmDeleteListModal,
+  ConfirmReplyModal,
+  ConfirmEditStatusModal,
+  ConfirmUnfollowModal,
+  ConfirmClearNotificationsModal,
+  ConfirmLogOutModal,
+} from './confirmation_modals';
 import FocalPointModal from './focal_point_modal';
 import ImageModal from './image_modal';
 import MediaModal from './media_modal';
@@ -40,6 +49,13 @@ export const MODAL_COMPONENTS = {
   'IMAGE': () => Promise.resolve({ default: ImageModal }),
   'BOOST': () => Promise.resolve({ default: BoostModal }),
   'CONFIRM': () => Promise.resolve({ default: ConfirmationModal }),
+  'CONFIRM_DELETE_STATUS': () => Promise.resolve({ default: ConfirmDeleteStatusModal }),
+  'CONFIRM_DELETE_LIST': () => Promise.resolve({ default: ConfirmDeleteListModal }),
+  'CONFIRM_REPLY': () => Promise.resolve({ default: ConfirmReplyModal }),
+  'CONFIRM_EDIT_STATUS': () => Promise.resolve({ default: ConfirmEditStatusModal }),
+  'CONFIRM_UNFOLLOW': () => Promise.resolve({ default: ConfirmUnfollowModal }),
+  'CONFIRM_CLEAR_NOTIFICATIONS': () => Promise.resolve({ default: ConfirmClearNotificationsModal }),
+  'CONFIRM_LOG_OUT': () => Promise.resolve({ default: ConfirmLogOutModal }),
   'MUTE': MuteModal,
   'BLOCK': BlockModal,
   'DOMAIN_BLOCK': DomainBlockModal,
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index 60bdfd1d445471..de8f2ebfcfb33c 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -169,27 +169,30 @@
   "compose_form.spoiler_placeholder": "Content warning (optional)",
   "confirmation_modal.cancel": "Cancel",
   "confirmations.block.confirm": "Block",
-  "confirmations.cancel_follow_request.confirm": "Withdraw request",
-  "confirmations.cancel_follow_request.message": "Are you sure you want to withdraw your request to follow {name}?",
   "confirmations.delete.confirm": "Delete",
   "confirmations.delete.message": "Are you sure you want to delete this post?",
+  "confirmations.delete.title": "Delete post?",
   "confirmations.delete_list.confirm": "Delete",
   "confirmations.delete_list.message": "Are you sure you want to permanently delete this list?",
+  "confirmations.delete_list.title": "Delete list?",
   "confirmations.discard_edit_media.confirm": "Discard",
   "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
-  "confirmations.domain_block.confirm": "Block server",
-  "confirmations.domain_block.message": "Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable. You will not see content from that domain in any public timelines or your notifications. Your followers from that domain will be removed.",
   "confirmations.edit.confirm": "Edit",
   "confirmations.edit.message": "Editing now will overwrite the message you are currently composing. Are you sure you want to proceed?",
+  "confirmations.edit.title": "Overwrite post?",
   "confirmations.logout.confirm": "Log out",
   "confirmations.logout.message": "Are you sure you want to log out?",
+  "confirmations.logout.title": "Log out?",
   "confirmations.mute.confirm": "Mute",
   "confirmations.redraft.confirm": "Delete & redraft",
   "confirmations.redraft.message": "Are you sure you want to delete this post and re-draft it? Favorites and boosts will be lost, and replies to the original post will be orphaned.",
+  "confirmations.redraft.title": "Delete & redraft post?",
   "confirmations.reply.confirm": "Reply",
   "confirmations.reply.message": "Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?",
+  "confirmations.reply.title": "Overwrite post?",
   "confirmations.unfollow.confirm": "Unfollow",
   "confirmations.unfollow.message": "Are you sure you want to unfollow {name}?",
+  "confirmations.unfollow.title": "Unfollow user?",
   "conversation.delete": "Delete conversation",
   "conversation.mark_as_read": "Mark as read",
   "conversation.open": "View conversation",
@@ -507,6 +510,7 @@
   "notification_requests.title": "Filtered notifications",
   "notifications.clear": "Clear notifications",
   "notifications.clear_confirmation": "Are you sure you want to permanently clear all your notifications?",
+  "notifications.clear_title": "Clear notifications?",
   "notifications.column_settings.admin.report": "New reports:",
   "notifications.column_settings.admin.sign_up": "New sign-ups:",
   "notifications.column_settings.alert": "Desktop notifications",
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 58c9b53a2cfdd5..c575a033b78095 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -6055,6 +6055,25 @@ a.status-card {
     }
   }
 
+  &__confirmation {
+    font-size: 14px;
+    line-height: 20px;
+    color: $darker-text-color;
+
+    h1 {
+      font-size: 16px;
+      line-height: 24px;
+      color: $primary-text-color;
+      font-weight: 500;
+      margin-bottom: 8px;
+    }
+
+    strong {
+      font-weight: 700;
+      color: $primary-text-color;
+    }
+  }
+
   &__bullet-points {
     display: flex;
     flex-direction: column;
@@ -6140,11 +6159,8 @@ a.status-card {
 }
 
 .boost-modal,
-.confirmation-modal,
 .report-modal,
 .actions-modal,
-.mute-modal,
-.block-modal,
 .compare-history-modal {
   background: lighten($ui-secondary-color, 8%);
   color: $inverted-text-color;
@@ -6166,10 +6182,7 @@ a.status-card {
   }
 }
 
-.boost-modal__action-bar,
-.confirmation-modal__action-bar,
-.mute-modal__action-bar,
-.block-modal__action-bar {
+.boost-modal__action-bar {
   display: flex;
   justify-content: space-between;
   align-items: center;
@@ -6192,16 +6205,6 @@ a.status-card {
   }
 }
 
-.mute-modal,
-.block-modal {
-  line-height: 24px;
-}
-
-.mute-modal .react-toggle,
-.block-modal .react-toggle {
-  vertical-align: middle;
-}
-
 .report-modal {
   width: 90vw;
   max-width: 700px;
@@ -6596,34 +6599,6 @@ a.status-card {
   }
 }
 
-.confirmation-modal__action-bar,
-.mute-modal__action-bar,
-.block-modal__action-bar {
-  .confirmation-modal__secondary-button {
-    flex-shrink: 1;
-  }
-}
-
-.confirmation-modal__secondary-button,
-.confirmation-modal__cancel-button,
-.mute-modal__cancel-button,
-.block-modal__cancel-button {
-  background-color: transparent;
-  color: $lighter-text-color;
-  font-size: 14px;
-  font-weight: 500;
-
-  &:hover,
-  &:focus,
-  &:active {
-    color: darken($lighter-text-color, 4%);
-    background-color: transparent;
-  }
-}
-
-.confirmation-modal__container,
-.mute-modal__container,
-.block-modal__container,
 .report-modal__target {
   padding: 30px;
   font-size: 16px;
@@ -6657,31 +6632,10 @@ a.status-card {
   }
 }
 
-.confirmation-modal__container,
 .report-modal__target {
   text-align: center;
 }
 
-.block-modal,
-.mute-modal {
-  &__explanation {
-    margin-top: 20px;
-  }
-
-  .setting-toggle {
-    margin-top: 20px;
-    margin-bottom: 24px;
-    display: flex;
-    align-items: center;
-
-    &__label {
-      color: $inverted-text-color;
-      margin: 0;
-      margin-inline-start: 8px;
-    }
-  }
-}
-
 .report-modal__target {
   padding: 15px;
 

From 3793c845c9f7e8edf00fb3b90d31f94562d9cc0c Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 26 Jul 2024 09:51:37 +0200
Subject: [PATCH 1633/2191] New Crowdin Translations (automated) (#31154)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/af.json      |   2 -
 app/javascript/mastodon/locales/an.json      |   3 -
 app/javascript/mastodon/locales/ar.json      |   4 -
 app/javascript/mastodon/locales/ast.json     |   2 -
 app/javascript/mastodon/locales/be.json      |   4 -
 app/javascript/mastodon/locales/bg.json      |   4 -
 app/javascript/mastodon/locales/bn.json      |   3 -
 app/javascript/mastodon/locales/br.json      |   3 -
 app/javascript/mastodon/locales/ca.json      |  12 +-
 app/javascript/mastodon/locales/ckb.json     |   3 -
 app/javascript/mastodon/locales/co.json      |   1 -
 app/javascript/mastodon/locales/cs.json      |   4 -
 app/javascript/mastodon/locales/cy.json      |   4 -
 app/javascript/mastodon/locales/da.json      |  12 +-
 app/javascript/mastodon/locales/de.json      |  12 +-
 app/javascript/mastodon/locales/el.json      |   4 -
 app/javascript/mastodon/locales/en-GB.json   |   4 -
 app/javascript/mastodon/locales/eo.json      |   3 -
 app/javascript/mastodon/locales/es-AR.json   |  12 +-
 app/javascript/mastodon/locales/es-MX.json   |  12 +-
 app/javascript/mastodon/locales/es.json      |  12 +-
 app/javascript/mastodon/locales/et.json      |   4 -
 app/javascript/mastodon/locales/eu.json      |  14 +-
 app/javascript/mastodon/locales/fa.json      |   3 -
 app/javascript/mastodon/locales/fi.json      |  80 +++--
 app/javascript/mastodon/locales/fil.json     |   3 -
 app/javascript/mastodon/locales/fo.json      |  12 +-
 app/javascript/mastodon/locales/fr-CA.json   |  12 +-
 app/javascript/mastodon/locales/fr.json      |  12 +-
 app/javascript/mastodon/locales/fy.json      |   4 -
 app/javascript/mastodon/locales/ga.json      |  12 +-
 app/javascript/mastodon/locales/gd.json      |   4 -
 app/javascript/mastodon/locales/gl.json      |  12 +-
 app/javascript/mastodon/locales/he.json      |   4 -
 app/javascript/mastodon/locales/hi.json      |   4 -
 app/javascript/mastodon/locales/hr.json      |   2 -
 app/javascript/mastodon/locales/hu.json      |  12 +-
 app/javascript/mastodon/locales/hy.json      |   2 -
 app/javascript/mastodon/locales/ia.json      |   4 -
 app/javascript/mastodon/locales/id.json      |   4 -
 app/javascript/mastodon/locales/ie.json      |   4 -
 app/javascript/mastodon/locales/io.json      |   3 -
 app/javascript/mastodon/locales/is.json      |  12 +-
 app/javascript/mastodon/locales/it.json      |   4 -
 app/javascript/mastodon/locales/ja.json      |   4 -
 app/javascript/mastodon/locales/ka.json      |   1 -
 app/javascript/mastodon/locales/kab.json     |   1 -
 app/javascript/mastodon/locales/kk.json      |   1 -
 app/javascript/mastodon/locales/ko.json      |   4 -
 app/javascript/mastodon/locales/ku.json      |   3 -
 app/javascript/mastodon/locales/kw.json      |   1 -
 app/javascript/mastodon/locales/lad.json     |   4 -
 app/javascript/mastodon/locales/lt.json      |  18 +-
 app/javascript/mastodon/locales/lv.json      |   3 -
 app/javascript/mastodon/locales/mk.json      |   1 -
 app/javascript/mastodon/locales/ms.json      |   3 -
 app/javascript/mastodon/locales/my.json      |   3 -
 app/javascript/mastodon/locales/nl.json      |  12 +-
 app/javascript/mastodon/locales/nn.json      |   4 -
 app/javascript/mastodon/locales/no.json      |   3 -
 app/javascript/mastodon/locales/oc.json      |   3 -
 app/javascript/mastodon/locales/pl.json      |  12 +-
 app/javascript/mastodon/locales/pt-BR.json   |  12 +-
 app/javascript/mastodon/locales/pt-PT.json   |  12 +-
 app/javascript/mastodon/locales/ro.json      |   3 -
 app/javascript/mastodon/locales/ru.json      |   4 -
 app/javascript/mastodon/locales/sa.json      |   3 -
 app/javascript/mastodon/locales/sc.json      | 279 +++++++++++----
 app/javascript/mastodon/locales/sco.json     |   3 -
 app/javascript/mastodon/locales/sk.json      |   4 -
 app/javascript/mastodon/locales/sl.json      |   4 -
 app/javascript/mastodon/locales/sq.json      |   4 -
 app/javascript/mastodon/locales/sr-Latn.json |   4 -
 app/javascript/mastodon/locales/sr.json      |   4 -
 app/javascript/mastodon/locales/sv.json      |   4 -
 app/javascript/mastodon/locales/ta.json      |   1 -
 app/javascript/mastodon/locales/te.json      |   1 -
 app/javascript/mastodon/locales/th.json      |   4 -
 app/javascript/mastodon/locales/tok.json     |   3 -
 app/javascript/mastodon/locales/tr.json      |   4 -
 app/javascript/mastodon/locales/tt.json      |   3 -
 app/javascript/mastodon/locales/uk.json      |   8 +-
 app/javascript/mastodon/locales/ur.json      |   1 -
 app/javascript/mastodon/locales/uz.json      |   3 -
 app/javascript/mastodon/locales/vi.json      |   4 -
 app/javascript/mastodon/locales/zh-CN.json   |  12 +-
 app/javascript/mastodon/locales/zh-HK.json   |   4 -
 app/javascript/mastodon/locales/zh-TW.json   |  12 +-
 config/locales/activerecord.fi.yml           |   2 +-
 config/locales/activerecord.sc.yml           |   2 +-
 config/locales/devise.fi.yml                 |  52 +--
 config/locales/devise.sc.yml                 |   4 +-
 config/locales/doorkeeper.fi.yml             |  38 +-
 config/locales/doorkeeper.sc.yml             |  10 +-
 config/locales/es-MX.yml                     |   3 +
 config/locales/es.yml                        |   3 +
 config/locales/fi.yml                        | 357 ++++++++++---------
 config/locales/lt.yml                        |   1 +
 config/locales/sc.yml                        | 195 ++++++++--
 config/locales/simple_form.fi.yml            |  78 ++--
 config/locales/simple_form.sc.yml            |   6 +-
 101 files changed, 891 insertions(+), 688 deletions(-)

diff --git a/app/javascript/mastodon/locales/af.json b/app/javascript/mastodon/locales/af.json
index 77e15eb2c669fc..fee553e22d56ec 100644
--- a/app/javascript/mastodon/locales/af.json
+++ b/app/javascript/mastodon/locales/af.json
@@ -119,8 +119,6 @@
   "compose_form.spoiler.unmarked": "Voeg inhoudswaarskuwing by",
   "confirmation_modal.cancel": "Kanselleer",
   "confirmations.block.confirm": "Blokkeer",
-  "confirmations.cancel_follow_request.confirm": "Herroep versoek",
-  "confirmations.cancel_follow_request.message": "Is jy seker jy wil jou versoek om {name} te volg, terugtrek?",
   "confirmations.delete.confirm": "Wis uit",
   "confirmations.delete.message": "Is jy seker jy wil hierdie plasing uitvee?",
   "confirmations.delete_list.confirm": "Wis uit",
diff --git a/app/javascript/mastodon/locales/an.json b/app/javascript/mastodon/locales/an.json
index d8f41b29bd153e..0757b9e597db1e 100644
--- a/app/javascript/mastodon/locales/an.json
+++ b/app/javascript/mastodon/locales/an.json
@@ -130,15 +130,12 @@
   "compose_form.spoiler.unmarked": "Texto no amagau",
   "confirmation_modal.cancel": "Cancelar",
   "confirmations.block.confirm": "Blocar",
-  "confirmations.cancel_follow_request.confirm": "Retirar solicitut",
-  "confirmations.cancel_follow_request.message": "Yes seguro que deseyas retirar la tuya solicitut pa seguir a {name}?",
   "confirmations.delete.confirm": "Eliminar",
   "confirmations.delete.message": "Yes seguro que quiers borrar esta publicación?",
   "confirmations.delete_list.confirm": "Eliminar",
   "confirmations.delete_list.message": "Seguro que quiers borrar esta lista permanentment?",
   "confirmations.discard_edit_media.confirm": "Descartar",
   "confirmations.discard_edit_media.message": "Tiens cambios sin alzar en a descripción u vista previa d'o fichero audiovisual, descartar-los de totz modos?",
-  "confirmations.domain_block.message": "Yes seguro que quiers blocar lo dominio {domain} entero? En cheneral ye prou, y preferible, fer uns quantos bloqueyos y silenciaus concretos. Los tuyos seguidros d'ixe dominio serán eliminaus.",
   "confirmations.logout.confirm": "Zarrar sesión",
   "confirmations.logout.message": "Yes seguro de querer zarrar la sesión?",
   "confirmations.mute.confirm": "Silenciar",
diff --git a/app/javascript/mastodon/locales/ar.json b/app/javascript/mastodon/locales/ar.json
index 9cfda3cbc2f2ef..daafb436772310 100644
--- a/app/javascript/mastodon/locales/ar.json
+++ b/app/javascript/mastodon/locales/ar.json
@@ -167,16 +167,12 @@
   "compose_form.spoiler_placeholder": "تحذير المحتوى (اختياري)",
   "confirmation_modal.cancel": "إلغاء",
   "confirmations.block.confirm": "حظر",
-  "confirmations.cancel_follow_request.confirm": "إلغاء الطلب",
-  "confirmations.cancel_follow_request.message": "متأكد من أنك تريد إلغاء طلب متابعتك لـ {name}؟",
   "confirmations.delete.confirm": "حذف",
   "confirmations.delete.message": "هل أنتَ مُتأكدٌ أنك تُريدُ حَذفَ هذا المنشور؟",
   "confirmations.delete_list.confirm": "حذف",
   "confirmations.delete_list.message": "هل أنتَ مُتأكدٌ أنكَ تُريدُ حَذفَ هذِهِ القائمة بشكلٍ دائم؟",
   "confirmations.discard_edit_media.confirm": "تجاهل",
   "confirmations.discard_edit_media.message": "لديك تغييرات غير محفوظة لوصف الوسائط أو معاينتها، أتريد تجاهلها على أي حال؟",
-  "confirmations.domain_block.confirm": "حظر الخادم",
-  "confirmations.domain_block.message": "متأكد من أنك تود حظر اسم النطاق {domain} بالكامل ؟ في غالب الأحيان يُستَحسَن كتم أو حظر بعض الحسابات بدلا من حظر نطاق بالكامل.\nلن تتمكن مِن رؤية محتوى هذا النطاق لا على خيوطك العمومية و لا في إشعاراتك. سوف يتم كذلك إزالة كافة متابعيك المنتمين إلى هذا النطاق.",
   "confirmations.edit.confirm": "تعديل",
   "confirmations.edit.message": "التعديل في الحين سوف يُعيد كتابة الرسالة التي أنت بصدد تحريرها. متأكد من أنك تريد المواصلة؟",
   "confirmations.logout.confirm": "خروج",
diff --git a/app/javascript/mastodon/locales/ast.json b/app/javascript/mastodon/locales/ast.json
index 883737eb4aa96c..3843ec69dc8523 100644
--- a/app/javascript/mastodon/locales/ast.json
+++ b/app/javascript/mastodon/locales/ast.json
@@ -111,8 +111,6 @@
   "compose_form.publish_form": "Artículu nuevu",
   "confirmation_modal.cancel": "Encaboxar",
   "confirmations.block.confirm": "Bloquiar",
-  "confirmations.cancel_follow_request.confirm": "Retirala",
-  "confirmations.cancel_follow_request.message": "¿De xuru que quies retirar la solicitú pa siguir a {name}?",
   "confirmations.delete.confirm": "Desaniciar",
   "confirmations.delete.message": "¿De xuru que quies desaniciar esti artículu?",
   "confirmations.delete_list.confirm": "Desaniciar",
diff --git a/app/javascript/mastodon/locales/be.json b/app/javascript/mastodon/locales/be.json
index e2120d80d9fcb7..80af2a76da98aa 100644
--- a/app/javascript/mastodon/locales/be.json
+++ b/app/javascript/mastodon/locales/be.json
@@ -169,16 +169,12 @@
   "compose_form.spoiler_placeholder": "Папярэджанне аб змесціве (неабавязкова)",
   "confirmation_modal.cancel": "Скасаваць",
   "confirmations.block.confirm": "Заблакіраваць",
-  "confirmations.cancel_follow_request.confirm": "Скасаваць запыт",
-  "confirmations.cancel_follow_request.message": "Сапраўды хочаце скасаваць свой запыт на падпіску на {name}?",
   "confirmations.delete.confirm": "Выдаліць",
   "confirmations.delete.message": "Вы ўпэўненыя, што хочаце выдаліць гэты допіс?",
   "confirmations.delete_list.confirm": "Выдаліць",
   "confirmations.delete_list.message": "Вы ўпэўненыя, што хочаце беззваротна выдаліць гэты чарнавік?",
   "confirmations.discard_edit_media.confirm": "Адмяніць",
   "confirmations.discard_edit_media.message": "У вас ёсць незахаваныя змены ў апісанні або прэв'ю, усе роўна скасаваць іх?",
-  "confirmations.domain_block.confirm": "Заблакіраваць сервер",
-  "confirmations.domain_block.message": "Вы абсалютна дакладна ўпэўнены, што хочаце заблакіраваць {domain} зусім? У большасці выпадкаў, дастаткова некалькіх мэтавых блакіровак ці ігнараванняў. Вы перастанеце бачыць змесціва з гэтага дамену ва ўсіх стужках і апавяшчэннях. Вашы падпіскі з гэтага дамену будуць выдаленыя.",
   "confirmations.edit.confirm": "Рэдагаваць",
   "confirmations.edit.message": "Калі вы зменіце зараз, гэта ператрэ паведамленне, якое вы пішаце. Вы ўпэўнены, што хочаце працягнуць?",
   "confirmations.logout.confirm": "Выйсці",
diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json
index b2dff17407f4b0..2161286c6c497d 100644
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@@ -169,16 +169,12 @@
   "compose_form.spoiler_placeholder": "Предупреждение за съдържание (по избор)",
   "confirmation_modal.cancel": "Отказ",
   "confirmations.block.confirm": "Блокиране",
-  "confirmations.cancel_follow_request.confirm": "Оттегляне на заявката",
-  "confirmations.cancel_follow_request.message": "Наистина ли искате да оттеглите заявката си за последване на {name}?",
   "confirmations.delete.confirm": "Изтриване",
   "confirmations.delete.message": "Наистина ли искате да изтриете публикацията?",
   "confirmations.delete_list.confirm": "Изтриване",
   "confirmations.delete_list.message": "Наистина ли искате да изтриете завинаги списъка?",
   "confirmations.discard_edit_media.confirm": "Отхвърляне",
   "confirmations.discard_edit_media.message": "Не сте запазили промени на описанието или огледа на мултимедията, отхвърляте ли ги?",
-  "confirmations.domain_block.confirm": "Блокиране на сървър",
-  "confirmations.domain_block.message": "Наистина ли искате да блокирате целия {domain}? В повечето случаи няколко блокирания или заглушавания са достатъчно и за предпочитане. Няма да виждате съдържание от домейна из публични часови оси или известията си. Вашите последователи от този домейн ще се премахнат.",
   "confirmations.edit.confirm": "Редактиране",
   "confirmations.edit.message": "Редактирането сега ще замени съобщението, което в момента съставяте. Сигурни ли сте, че искате да продължите?",
   "confirmations.logout.confirm": "Излизане",
diff --git a/app/javascript/mastodon/locales/bn.json b/app/javascript/mastodon/locales/bn.json
index 6d64c00a2f57a4..7787c1b9cfd76b 100644
--- a/app/javascript/mastodon/locales/bn.json
+++ b/app/javascript/mastodon/locales/bn.json
@@ -146,15 +146,12 @@
   "compose_form.spoiler.unmarked": "লেখাটি লুকানো নেই",
   "confirmation_modal.cancel": "বাতিল করুন",
   "confirmations.block.confirm": "ব্লক করুন",
-  "confirmations.cancel_follow_request.confirm": "অনুরোধ বাতিল করুন",
-  "confirmations.cancel_follow_request.message": "আপনি কি নিশ্চিত যে আপনি {name} কে অনুসরণ করার অনুরোধ প্রত্যাহার করতে চান?",
   "confirmations.delete.confirm": "মুছে ফেলুন",
   "confirmations.delete.message": "আপনি কি নিশ্চিত যে এই লেখাটি মুছে ফেলতে চান ?",
   "confirmations.delete_list.confirm": "মুছে ফেলুন",
   "confirmations.delete_list.message": "আপনি কি নিশ্চিত যে আপনি এই তালিকাটি স্থায়িভাবে মুছে ফেলতে চান ?",
   "confirmations.discard_edit_media.confirm": "বাতিল করো",
   "confirmations.discard_edit_media.message": "মিডিয়া Description বা Preview তে আপনার আপনার অসংরক্ষিত পরিবর্তন আছে, সেগুলো বাতিল করবেন?",
-  "confirmations.domain_block.message": "আপনি কি সত্যিই সত্যই নিশ্চিত যে আপনি পুরো {domain}'টি ব্লক করতে চান? বেশিরভাগ ক্ষেত্রে কয়েকটি লক্ষ্যযুক্ত ব্লক বা নীরবতা যথেষ্ট এবং পছন্দসই। আপনি কোনও পাবলিক টাইমলাইন বা আপনার বিজ্ঞপ্তিগুলিতে সেই ডোমেন থেকে সামগ্রী দেখতে পাবেন না। সেই ডোমেন থেকে আপনার অনুসরণকারীদের সরানো হবে।",
   "confirmations.edit.confirm": "সম্পাদন",
   "confirmations.edit.message": "এখন সম্পাদনা করলে আপনি যে মেসেজ লিখছেন তা overwrite করবে, চালিয়ে যেতে চান?",
   "confirmations.logout.confirm": "প্রস্থান",
diff --git a/app/javascript/mastodon/locales/br.json b/app/javascript/mastodon/locales/br.json
index 76cd9d45743458..fb90a01cd1bf07 100644
--- a/app/javascript/mastodon/locales/br.json
+++ b/app/javascript/mastodon/locales/br.json
@@ -159,15 +159,12 @@
   "compose_form.spoiler.unmarked": "N'eo ket kuzhet an destenn",
   "confirmation_modal.cancel": "Nullañ",
   "confirmations.block.confirm": "Stankañ",
-  "confirmations.cancel_follow_request.confirm": "Nullañ ar reked",
-  "confirmations.cancel_follow_request.message": "Ha sur oc'h e fell deoc'h nullañ ho reked evit heuliañ {name} ?",
   "confirmations.delete.confirm": "Dilemel",
   "confirmations.delete.message": "Ha sur oc'h e fell deoc'h dilemel an toud-mañ ?",
   "confirmations.delete_list.confirm": "Dilemel",
   "confirmations.delete_list.message": "Ha sur eo hoc'h eus c'hoant da zilemel ar roll-mañ da vat ?",
   "confirmations.discard_edit_media.confirm": "Nac'hañ",
   "confirmations.discard_edit_media.message": "Bez ez eus kemmoù n'int ket enrollet e deskrivadur ar media pe ar rakwel, nullañ anezho evelato?",
-  "confirmations.domain_block.message": "Ha sur oc'h e fell deoc'h berzañ an {domain} a-bezh? Peurvuiañ eo trawalc'h berzañ pe mudañ un nebeud implijer·ezed·ien. Ne welot danvez ebet o tont eus an domani-mañ. Dilamet e vo ar c'houmanantoù war an domani-mañ.",
   "confirmations.edit.confirm": "Kemmañ",
   "confirmations.logout.confirm": "Digevreañ",
   "confirmations.logout.message": "Ha sur oc'h e fell deoc'h digevreañ ?",
diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index 80c85ce178eb67..f44d60e9c44f76 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -169,27 +169,30 @@
   "compose_form.spoiler_placeholder": "Avís de contingut (opcional)",
   "confirmation_modal.cancel": "Cancel·la",
   "confirmations.block.confirm": "Bloca",
-  "confirmations.cancel_follow_request.confirm": "Retirar la sol·licitud",
-  "confirmations.cancel_follow_request.message": "Segur que vols retirar la sol·licitud de seguiment de {name}?",
   "confirmations.delete.confirm": "Elimina",
   "confirmations.delete.message": "Segur que vols eliminar aquest tut?",
+  "confirmations.delete.title": "Elimina la publicació?",
   "confirmations.delete_list.confirm": "Elimina",
   "confirmations.delete_list.message": "Segur que vols suprimir permanentment aquesta llista?",
+  "confirmations.delete_list.title": "Elimina la llista?",
   "confirmations.discard_edit_media.confirm": "Descarta",
   "confirmations.discard_edit_media.message": "Tens canvis no desats en la descripció del contingut o en la previsualització, els vols descartar?",
-  "confirmations.domain_block.confirm": "Bloca el servidor",
-  "confirmations.domain_block.message": "Segur que vols blocar {domain} del tot? En la majoria dels casos, només amb blocar o silenciar uns pocs comptes n'hi ha prou i és millor. No veuràs el contingut d’aquest domini en cap de les línies de temps ni en les notificacions. S'eliminaran els teus seguidors d’aquest domini.",
   "confirmations.edit.confirm": "Edita",
   "confirmations.edit.message": "Editant ara sobreescriuràs el missatge que estàs editant. Segur que vols continuar?",
+  "confirmations.edit.title": "Sobreescriu la publicació?",
   "confirmations.logout.confirm": "Tanca la sessió",
   "confirmations.logout.message": "Segur que vols tancar la sessió?",
+  "confirmations.logout.title": "Tanca la sessió?",
   "confirmations.mute.confirm": "Silencia",
   "confirmations.redraft.confirm": "Esborra i reescriu",
   "confirmations.redraft.message": "Segur que vols eliminar aquest tut i tornar a escriure'l? Es perdran tots els impulsos i els favorits, i les respostes al tut original quedaran aïllades.",
+  "confirmations.redraft.title": "Esborra i reescriu la publicació?",
   "confirmations.reply.confirm": "Respon",
   "confirmations.reply.message": "Si respons ara, sobreescriuràs el missatge que estàs editant. Segur que vols continuar?",
+  "confirmations.reply.title": "Sobreescriu la publicació?",
   "confirmations.unfollow.confirm": "Deixa de seguir",
   "confirmations.unfollow.message": "Segur que vols deixar de seguir {name}?",
+  "confirmations.unfollow.title": "Deixa de seguir l'usuari?",
   "conversation.delete": "Elimina la conversa",
   "conversation.mark_as_read": "Marca com a llegida",
   "conversation.open": "Mostra la conversa",
@@ -507,6 +510,7 @@
   "notification_requests.title": "Notificacions filtrades",
   "notifications.clear": "Esborra les notificacions",
   "notifications.clear_confirmation": "Segur que vols esborrar permanentment totes les teves notificacions?",
+  "notifications.clear_title": "Esborra les notificacions?",
   "notifications.column_settings.admin.report": "Nous informes:",
   "notifications.column_settings.admin.sign_up": "Registres nous:",
   "notifications.column_settings.alert": "Notificacions d'escriptori",
diff --git a/app/javascript/mastodon/locales/ckb.json b/app/javascript/mastodon/locales/ckb.json
index 379706a3e08c7b..3c11ffc7155874 100644
--- a/app/javascript/mastodon/locales/ckb.json
+++ b/app/javascript/mastodon/locales/ckb.json
@@ -158,15 +158,12 @@
   "compose_form.spoiler_placeholder": "ئاگادارکردنەوەی ناوەڕۆک (ئیختیاری)",
   "confirmation_modal.cancel": "هەڵوەشاندنەوه",
   "confirmations.block.confirm": "بلۆک",
-  "confirmations.cancel_follow_request.confirm": "داواکاری کشانەوە",
-  "confirmations.cancel_follow_request.message": "ئایا دڵنیای کە دەتەوێت داواکارییەکەت بۆ شوێنکەوتنی {ناو} بکشێنیتەوە؟",
   "confirmations.delete.confirm": "سڕینەوە",
   "confirmations.delete.message": "ئایا دڵنیایت لەوەی دەتەوێت ئەم توتە بسڕیتەوە?",
   "confirmations.delete_list.confirm": "سڕینەوە",
   "confirmations.delete_list.message": "ئایا دڵنیایت لەوەی دەتەوێت بە هەمیشەیی ئەم لیستە بسڕیتەوە?",
   "confirmations.discard_edit_media.confirm": "ڕەتکردنەوە",
   "confirmations.discard_edit_media.message": "گۆڕانکاریت لە وەسف یان پێشبینی میدیادا هەڵنەگیراوە، بەهەر حاڵ فڕێیان بدە؟",
-  "confirmations.domain_block.message": "ئایا بەڕاستی، بەڕاستی تۆ دەتەوێت هەموو {domain} بلۆک بکەیت؟ لە زۆربەی حاڵەتەکاندا چەند بلۆکێکی ئامانجدار یان بێدەنگەکان پێویست و پەسەندن. تۆ ناوەڕۆک ێک نابینیت لە دۆمەینەکە لە هیچ هێڵی کاتی گشتی یان ئاگانامەکانت. شوێنکەوتوانی تۆ لەو دۆمەینەوە لادەبرێن.",
   "confirmations.edit.confirm": "دەستکاری",
   "confirmations.edit.message": "دەستکاری کردنی ئێستا: دەبێتە هۆی نووسینەوەی ئەو پەیامەی، کە ئێستا داتدەڕشت. ئایا دڵنیای، کە دەتەوێت بەردەوام بیت؟",
   "confirmations.logout.confirm": "چوونە دەرەوە",
diff --git a/app/javascript/mastodon/locales/co.json b/app/javascript/mastodon/locales/co.json
index 4520663b52b022..d95213f9c1064b 100644
--- a/app/javascript/mastodon/locales/co.json
+++ b/app/javascript/mastodon/locales/co.json
@@ -89,7 +89,6 @@
   "confirmations.delete_list.confirm": "Toglie",
   "confirmations.delete_list.message": "Site sicuru·a che vulete toglie sta lista?",
   "confirmations.discard_edit_media.confirm": "Scartà",
-  "confirmations.domain_block.message": "Site veramente sicuru·a che vulete piattà tuttu à {domain}? Saria forse abbastanza di bluccà ò piattà alcuni conti da quallà. Ùn viderete più nunda da quallà indè e linee pubbliche o e nutificazione. I vostri abbunati da stu duminiu saranu tolti.",
   "confirmations.logout.confirm": "Scunnettassi",
   "confirmations.logout.message": "Site sicuru·a che vulete scunnettà vi?",
   "confirmations.mute.confirm": "Piattà",
diff --git a/app/javascript/mastodon/locales/cs.json b/app/javascript/mastodon/locales/cs.json
index 213fe5e530e392..2201e68aaa93ec 100644
--- a/app/javascript/mastodon/locales/cs.json
+++ b/app/javascript/mastodon/locales/cs.json
@@ -169,16 +169,12 @@
   "compose_form.spoiler_placeholder": "Upozornění na obsah (nepovinné)",
   "confirmation_modal.cancel": "Zrušit",
   "confirmations.block.confirm": "Blokovat",
-  "confirmations.cancel_follow_request.confirm": "Zrušit žádost",
-  "confirmations.cancel_follow_request.message": "Opravdu chcete zrušit svou žádost o sledování {name}?",
   "confirmations.delete.confirm": "Smazat",
   "confirmations.delete.message": "Opravdu chcete smazat tento příspěvek?",
   "confirmations.delete_list.confirm": "Smazat",
   "confirmations.delete_list.message": "Opravdu chcete tento seznam navždy smazat?",
   "confirmations.discard_edit_media.confirm": "Zahodit",
   "confirmations.discard_edit_media.message": "Máte neuložené změny popisku médií nebo náhledu, chcete je přesto zahodit?",
-  "confirmations.domain_block.confirm": "Blokovat server",
-  "confirmations.domain_block.message": "Opravdu chcete blokovat celou doménu {domain}? Ve většině případů stačí blokovat nebo skrýt pár konkrétních uživatelů, což také doporučujeme. Z této domény neuvidíte obsah v žádné veřejné časové ose ani v oznámeních. Vaši sledující z této domény budou odstraněni.",
   "confirmations.edit.confirm": "Upravit",
   "confirmations.edit.message": "Editovat teď znamená přepsání zprávy, kterou právě tvoříte. Opravdu chcete pokračovat?",
   "confirmations.logout.confirm": "Odhlásit se",
diff --git a/app/javascript/mastodon/locales/cy.json b/app/javascript/mastodon/locales/cy.json
index e4c10cc14269e6..cc9d3fd855524b 100644
--- a/app/javascript/mastodon/locales/cy.json
+++ b/app/javascript/mastodon/locales/cy.json
@@ -166,16 +166,12 @@
   "compose_form.spoiler_placeholder": "Rhybudd cynnwys (dewisol)",
   "confirmation_modal.cancel": "Canslo",
   "confirmations.block.confirm": "Blocio",
-  "confirmations.cancel_follow_request.confirm": "Tynnu'r cais yn ôl",
-  "confirmations.cancel_follow_request.message": "Ydych chi'n siŵr eich bod am dynnu'ch cais i ddilyn {name} yn ôl?",
   "confirmations.delete.confirm": "Dileu",
   "confirmations.delete.message": "Ydych chi'n sicr eich bod eisiau dileu y post hwn?",
   "confirmations.delete_list.confirm": "Dileu",
   "confirmations.delete_list.message": "Ydych chi'n siŵr eich bod eisiau dileu'r rhestr hwn am byth?",
   "confirmations.discard_edit_media.confirm": "Dileu",
   "confirmations.discard_edit_media.message": "Mae gennych newidiadau heb eu cadw i'r disgrifiad cyfryngau neu'r rhagolwg - eu dileu beth bynnag?",
-  "confirmations.domain_block.confirm": "Blocio gweinydd",
-  "confirmations.domain_block.message": "Ydych chi wir, wir eisiau blocio'r holl {domain}? Fel arfer, mae blocio neu dewi pobl penodol yn broses mwy effeithiol. Fyddwch chi ddim yn gweld cynnwys o'r parth hwnnw mewn ffrydiau cyhoeddus neu yn eich hysbysiadau. Bydd eich dilynwyr o'r parth hwnnw yn cael eu ddileu.",
   "confirmations.edit.confirm": "Golygu",
   "confirmations.edit.message": "Bydd golygu nawr yn trosysgrifennu'r neges rydych yn ei ysgrifennu ar hyn o bryd. Ydych chi'n siŵr eich bod eisiau gwneud hyn?",
   "confirmations.logout.confirm": "Allgofnodi",
diff --git a/app/javascript/mastodon/locales/da.json b/app/javascript/mastodon/locales/da.json
index 9316884d7184f6..039b088543cf38 100644
--- a/app/javascript/mastodon/locales/da.json
+++ b/app/javascript/mastodon/locales/da.json
@@ -169,27 +169,30 @@
   "compose_form.spoiler_placeholder": "Indholdsadvarsel (valgfri)",
   "confirmation_modal.cancel": "Afbryd",
   "confirmations.block.confirm": "Blokér",
-  "confirmations.cancel_follow_request.confirm": "Annullér anmodning",
-  "confirmations.cancel_follow_request.message": "Er du sikker på, at anmodningen om at følge {name} skal annulleres?",
   "confirmations.delete.confirm": "Slet",
   "confirmations.delete.message": "Er du sikker på, at du vil slette dette indlæg?",
+  "confirmations.delete.title": "Slet indlæg?",
   "confirmations.delete_list.confirm": "Slet",
   "confirmations.delete_list.message": "Er du sikker på, at du vil slette denne liste permanent?",
+  "confirmations.delete_list.title": "Slet liste?",
   "confirmations.discard_edit_media.confirm": "Kassér",
   "confirmations.discard_edit_media.message": "Der er ugemte ændringer i mediebeskrivelsen eller forhåndsvisningen, kassér dem alligevel?",
-  "confirmations.domain_block.confirm": "Blokér server",
-  "confirmations.domain_block.message": "Er du fuldstændig sikker på, at du vil blokere hele {domain}-domænet? Oftest vil nogle få målrettede blokeringer eller skjulninger være tilstrækkelige og at foretrække. Du vil ikke se indhold fra dette domæne i nogle offentlige tidslinjer eller i dine notifikationer, og dine følgere herfra fjernes ligeledes.",
   "confirmations.edit.confirm": "Redigér",
   "confirmations.edit.message": "Redigeres nu, overskrive den besked, der forfattes pt. Fortsæt alligevel?",
+  "confirmations.edit.title": "Overskriv indlæg?",
   "confirmations.logout.confirm": "Log ud",
   "confirmations.logout.message": "Er du sikker på, at du vil logge ud?",
+  "confirmations.logout.title": "Log ud?",
   "confirmations.mute.confirm": "Skjul (mute)",
   "confirmations.redraft.confirm": "Slet og omformulér",
   "confirmations.redraft.message": "Sikker på, at dette indlæg skal slettes og omskrives? Favoritter og boosts går tabt, og svar til det oprindelige indlæg mister tilknytningen.",
+  "confirmations.redraft.title": "Slet og omformulér indlæg?",
   "confirmations.reply.confirm": "Svar",
   "confirmations.reply.message": "Hvis du svarer nu, vil det overskrive den besked, du er ved at skrive. Fortsæt alligevel?",
+  "confirmations.reply.title": "Overskriv indlæg?",
   "confirmations.unfollow.confirm": "Følg ikke længere",
   "confirmations.unfollow.message": "Er du sikker på, at du ikke længere vil følge {name}?",
+  "confirmations.unfollow.title": "Følg ikke længere bruger?",
   "conversation.delete": "Slet samtale",
   "conversation.mark_as_read": "Markér som læst",
   "conversation.open": "Vis samtale",
@@ -507,6 +510,7 @@
   "notification_requests.title": "Filtrerede notifikationer",
   "notifications.clear": "Ryd notifikationer",
   "notifications.clear_confirmation": "Er du sikker på, at du vil rydde alle dine notifikationer permanent?",
+  "notifications.clear_title": "Ryd notifikationer?",
   "notifications.column_settings.admin.report": "Nye anmeldelser:",
   "notifications.column_settings.admin.sign_up": "Nye tilmeldinger:",
   "notifications.column_settings.alert": "Computernotifikationer",
diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json
index 3ba058b9a74618..78237e45cf0be3 100644
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@@ -169,27 +169,30 @@
   "compose_form.spoiler_placeholder": "Inhaltswarnung (optional)",
   "confirmation_modal.cancel": "Abbrechen",
   "confirmations.block.confirm": "Blockieren",
-  "confirmations.cancel_follow_request.confirm": "Anfrage zurückziehen",
-  "confirmations.cancel_follow_request.message": "Möchtest du deine Anfrage, {name} zu folgen, wirklich zurückziehen?",
   "confirmations.delete.confirm": "Löschen",
   "confirmations.delete.message": "Möchtest du diesen Beitrag wirklich löschen?",
+  "confirmations.delete.title": "Beitrag löschen?",
   "confirmations.delete_list.confirm": "Löschen",
   "confirmations.delete_list.message": "Möchtest du diese Liste für immer löschen?",
+  "confirmations.delete_list.title": "Liste löschen?",
   "confirmations.discard_edit_media.confirm": "Verwerfen",
   "confirmations.discard_edit_media.message": "Du hast Änderungen an der Medienbeschreibung oder -vorschau vorgenommen, die noch nicht gespeichert sind. Trotzdem verwerfen?",
-  "confirmations.domain_block.confirm": "Server blockieren",
-  "confirmations.domain_block.message": "Möchtest du die gesamte Domain {domain} wirklich blockieren? In den meisten Fällen reichen ein paar gezielte Blockierungen oder Stummschaltungen aus. Du wirst den Inhalt von dieser Domain nicht in irgendwelchen öffentlichen Timelines oder den Benachrichtigungen finden. Auch deine Follower von dieser Domain werden entfernt.",
   "confirmations.edit.confirm": "Bearbeiten",
   "confirmations.edit.message": "Das Bearbeiten überschreibt die Nachricht, die du gerade verfasst. Möchtest du wirklich fortfahren?",
+  "confirmations.edit.title": "Beitrag überschreiben?",
   "confirmations.logout.confirm": "Abmelden",
   "confirmations.logout.message": "Möchtest du dich wirklich abmelden?",
+  "confirmations.logout.title": "Abmelden?",
   "confirmations.mute.confirm": "Stummschalten",
   "confirmations.redraft.confirm": "Löschen und neu erstellen",
   "confirmations.redraft.message": "Möchtest du diesen Beitrag wirklich löschen und neu verfassen? Favoriten und geteilte Beiträge gehen verloren, und Antworten auf den ursprünglichen Beitrag verlieren den Zusammenhang.",
+  "confirmations.redraft.title": "Beitrag löschen & neu verfassen?",
   "confirmations.reply.confirm": "Antworten",
   "confirmations.reply.message": "Wenn du jetzt darauf antwortest, wird der andere Beitrag, an dem du gerade geschrieben hast, verworfen. Möchtest du wirklich fortfahren?",
+  "confirmations.reply.title": "Beitrag überschreiben?",
   "confirmations.unfollow.confirm": "Entfolgen",
   "confirmations.unfollow.message": "Möchtest du {name} wirklich entfolgen?",
+  "confirmations.unfollow.title": "Profil entfolgen?",
   "conversation.delete": "Unterhaltung löschen",
   "conversation.mark_as_read": "Als gelesen markieren",
   "conversation.open": "Unterhaltung anzeigen",
@@ -507,6 +510,7 @@
   "notification_requests.title": "Gefilterte Benachrichtigungen",
   "notifications.clear": "Benachrichtigungen löschen",
   "notifications.clear_confirmation": "Möchtest du wirklich alle Benachrichtigungen für immer löschen?",
+  "notifications.clear_title": "Benachrichtigungen löschen?",
   "notifications.column_settings.admin.report": "Neue Meldungen:",
   "notifications.column_settings.admin.sign_up": "Neue Registrierungen:",
   "notifications.column_settings.alert": "Desktop-Benachrichtigungen",
diff --git a/app/javascript/mastodon/locales/el.json b/app/javascript/mastodon/locales/el.json
index cba2525f37763e..c2eb2ce904b6a9 100644
--- a/app/javascript/mastodon/locales/el.json
+++ b/app/javascript/mastodon/locales/el.json
@@ -169,16 +169,12 @@
   "compose_form.spoiler_placeholder": "Προειδοποίηση περιεχομένου (προαιρετική)",
   "confirmation_modal.cancel": "Άκυρο",
   "confirmations.block.confirm": "Αποκλεισμός",
-  "confirmations.cancel_follow_request.confirm": "Απόσυρση αιτήματος",
-  "confirmations.cancel_follow_request.message": "Είσαι σίγουρος/η ότι θέλεις να αποσύρεις το αίτημά σου να ακολουθείς τον/την {name};",
   "confirmations.delete.confirm": "Διαγραφή",
   "confirmations.delete.message": "Σίγουρα θες να διαγράψεις αυτή τη δημοσίευση;",
   "confirmations.delete_list.confirm": "Διαγραφή",
   "confirmations.delete_list.message": "Σίγουρα θες να διαγράψεις οριστικά αυτή τη λίστα;",
   "confirmations.discard_edit_media.confirm": "Απόρριψη",
   "confirmations.discard_edit_media.message": "Έχεις μη αποθηκευμένες αλλαγές στην περιγραφή πολυμέσων ή στην προεπισκόπηση, απόρριψη ούτως ή άλλως;",
-  "confirmations.domain_block.confirm": "Αποκλεισμός διακομιστή",
-  "confirmations.domain_block.message": "Σίγουρα θες να αποκλείσεις ολόκληρο τον {domain}; Συνήθως μερικοί συγκεκρίμένοι αποκλεισμοί ή σιγάσεις επαρκούν και προτιμούνται. Δεν θα βλέπεις περιεχόμενο από αυτό τον τομέα σε καμία δημόσια ροή ή στις ειδοποιήσεις σου. Όσους ακόλουθους έχεις αυτό αυτό τον τομέα θα αφαιρεθούν.",
   "confirmations.edit.confirm": "Επεξεργασία",
   "confirmations.edit.message": "Αν το επεξεργαστείς τώρα θα αντικατασταθεί το μήνυμα που συνθέτεις. Είσαι σίγουρος ότι θέλεις να συνεχίσεις;",
   "confirmations.logout.confirm": "Αποσύνδεση",
diff --git a/app/javascript/mastodon/locales/en-GB.json b/app/javascript/mastodon/locales/en-GB.json
index 47214bb3832680..9e4331c56b8ea5 100644
--- a/app/javascript/mastodon/locales/en-GB.json
+++ b/app/javascript/mastodon/locales/en-GB.json
@@ -169,16 +169,12 @@
   "compose_form.spoiler_placeholder": "Content warning (optional)",
   "confirmation_modal.cancel": "Cancel",
   "confirmations.block.confirm": "Block",
-  "confirmations.cancel_follow_request.confirm": "Withdraw request",
-  "confirmations.cancel_follow_request.message": "Are you sure you want to withdraw your request to follow {name}?",
   "confirmations.delete.confirm": "Delete",
   "confirmations.delete.message": "Are you sure you want to delete this post?",
   "confirmations.delete_list.confirm": "Delete",
   "confirmations.delete_list.message": "Are you sure you want to permanently delete this list?",
   "confirmations.discard_edit_media.confirm": "Discard",
   "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
-  "confirmations.domain_block.confirm": "Block server",
-  "confirmations.domain_block.message": "Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable. You will not see content from that domain in any public timelines or your notifications. Your followers from that domain will be removed.",
   "confirmations.edit.confirm": "Edit",
   "confirmations.edit.message": "Editing now will overwrite the message you are currently composing. Are you sure you want to proceed?",
   "confirmations.logout.confirm": "Log out",
diff --git a/app/javascript/mastodon/locales/eo.json b/app/javascript/mastodon/locales/eo.json
index 211f4ad8d91677..de91fb39dce12f 100644
--- a/app/javascript/mastodon/locales/eo.json
+++ b/app/javascript/mastodon/locales/eo.json
@@ -150,15 +150,12 @@
   "compose_form.spoiler.unmarked": "Aldoni averton de enhavo",
   "confirmation_modal.cancel": "Nuligi",
   "confirmations.block.confirm": "Bloki",
-  "confirmations.cancel_follow_request.confirm": "Eksigi peton",
-  "confirmations.cancel_follow_request.message": "Ĉu vi certas ke vi volas eksigi vian peton por sekvi {name}?",
   "confirmations.delete.confirm": "Forigi",
   "confirmations.delete.message": "Ĉu vi certas, ke vi volas forigi ĉi tiun afiŝon?",
   "confirmations.delete_list.confirm": "Forigi",
   "confirmations.delete_list.message": "Ĉu vi certas, ke vi volas porĉiame forigi ĉi tiun liston?",
   "confirmations.discard_edit_media.confirm": "Forĵeti",
   "confirmations.discard_edit_media.message": "Vi havas nekonservitajn ŝanĝojn de la priskribo aŭ la antaŭmontro de la plurmedio, ĉu vi forĵetu ilin malgraŭe?",
-  "confirmations.domain_block.message": "Ĉu vi vere, vere certas, ke vi volas tute bloki {domain}? Plej ofte, trafa blokado kaj silentigado sufiĉas kaj preferindas. Vi ne vidos enhavon de tiu domajno en publika templinio aŭ en viaj sciigoj. Viaj sekvantoj de tiu domajno estos forigitaj.",
   "confirmations.edit.confirm": "Redakti",
   "confirmations.edit.message": "Redakti nun anstataŭigos la skribatan afiŝon. Ĉu vi certas, ke vi volas daŭrigi?",
   "confirmations.logout.confirm": "Adiaŭi",
diff --git a/app/javascript/mastodon/locales/es-AR.json b/app/javascript/mastodon/locales/es-AR.json
index 2e22865493f08a..cbb99ddd6f2c03 100644
--- a/app/javascript/mastodon/locales/es-AR.json
+++ b/app/javascript/mastodon/locales/es-AR.json
@@ -169,27 +169,30 @@
   "compose_form.spoiler_placeholder": "Advertencia de contenido (opcional)",
   "confirmation_modal.cancel": "Cancelar",
   "confirmations.block.confirm": "Bloquear",
-  "confirmations.cancel_follow_request.confirm": "Retirar solicitud",
-  "confirmations.cancel_follow_request.message": "¿Estás seguro que querés retirar tu solicitud para seguir a {name}?",
   "confirmations.delete.confirm": "Eliminar",
   "confirmations.delete.message": "¿Estás seguro que querés eliminar este mensaje?",
+  "confirmations.delete.title": "¿Eliminar publicación?",
   "confirmations.delete_list.confirm": "Eliminar",
   "confirmations.delete_list.message": "¿Estás seguro que querés eliminar permanentemente esta lista?",
+  "confirmations.delete_list.title": "¿Eliminar lista?",
   "confirmations.discard_edit_media.confirm": "Descartar",
   "confirmations.discard_edit_media.message": "Tenés cambios sin guardar en la descripción de medios o en la vista previa, ¿querés descartarlos de todos modos?",
-  "confirmations.domain_block.confirm": "Bloquear servidor",
-  "confirmations.domain_block.message": "¿Estás completamente seguro que querés bloquear el {domain} entero? En la mayoría de los casos, unos cuantos bloqueos y silenciados puntuales son suficientes y preferibles. No vas a ver contenido de ese dominio en ninguna de tus líneas temporales o en tus notificaciones. Tus seguidores de ese dominio serán quitados.",
   "confirmations.edit.confirm": "Editar",
   "confirmations.edit.message": "Editar ahora sobreescribirá el mensaje que estás redactando actualmente. ¿Estás seguro que querés seguir?",
+  "confirmations.edit.title": "¿Sobrescribir publicación?",
   "confirmations.logout.confirm": "Cerrar sesión",
   "confirmations.logout.message": "¿Estás seguro que querés cerrar la sesión?",
+  "confirmations.logout.title": "¿Cerrar sesión?",
   "confirmations.mute.confirm": "Silenciar",
   "confirmations.redraft.confirm": "Eliminar mensaje original y editarlo",
   "confirmations.redraft.message": "¿Estás seguro que querés eliminar este mensaje y volver a editarlo? Se perderán las veces marcadas como favorito y sus adhesiones, y las respuestas al mensaje original quedarán huérfanas.",
+  "confirmations.redraft.title": "¿Borrar y volver a redactar la publicación?",
   "confirmations.reply.confirm": "Responder",
   "confirmations.reply.message": "Responder ahora sobreescribirá el mensaje que estás redactando actualmente. ¿Estás seguro que querés seguir?",
+  "confirmations.reply.title": "¿Sobrescribir publicación?",
   "confirmations.unfollow.confirm": "Dejar de seguir",
   "confirmations.unfollow.message": "¿Estás seguro que querés dejar de seguir a {name}?",
+  "confirmations.unfollow.title": "¿Dejar de seguir al usuario?",
   "conversation.delete": "Eliminar conversación",
   "conversation.mark_as_read": "Marcar como leída",
   "conversation.open": "Ver conversación",
@@ -507,6 +510,7 @@
   "notification_requests.title": "Notificaciones filtradas",
   "notifications.clear": "Limpiar notificaciones",
   "notifications.clear_confirmation": "¿Estás seguro que querés limpiar todas tus notificaciones permanentemente?",
+  "notifications.clear_title": "¿Borrar notificaciones?",
   "notifications.column_settings.admin.report": "Nuevas denuncias:",
   "notifications.column_settings.admin.sign_up": "Nuevos registros:",
   "notifications.column_settings.alert": "Notificaciones de escritorio",
diff --git a/app/javascript/mastodon/locales/es-MX.json b/app/javascript/mastodon/locales/es-MX.json
index 837bbbc2cea639..3adc9146634359 100644
--- a/app/javascript/mastodon/locales/es-MX.json
+++ b/app/javascript/mastodon/locales/es-MX.json
@@ -169,27 +169,30 @@
   "compose_form.spoiler_placeholder": "Advertencia de contenido (opcional)",
   "confirmation_modal.cancel": "Cancelar",
   "confirmations.block.confirm": "Bloquear",
-  "confirmations.cancel_follow_request.confirm": "Retirar solicitud",
-  "confirmations.cancel_follow_request.message": "¿Estás seguro de que deseas retirar tu solicitud para seguir a {name}?",
   "confirmations.delete.confirm": "Eliminar",
   "confirmations.delete.message": "¿Estás seguro de que quieres borrar este toot?",
+  "confirmations.delete.title": "¿Eliminar publicación?",
   "confirmations.delete_list.confirm": "Eliminar",
   "confirmations.delete_list.message": "¿Seguro que quieres borrar esta lista permanentemente?",
+  "confirmations.delete_list.title": "¿Eliminar lista?",
   "confirmations.discard_edit_media.confirm": "Descartar",
   "confirmations.discard_edit_media.message": "Tienes cambios sin guardar en la descripción o vista previa del archivo, ¿deseas descartarlos de cualquier manera?",
-  "confirmations.domain_block.confirm": "Bloquear servidor",
-  "confirmations.domain_block.message": "¿Seguro de que quieres bloquear al dominio {domain} entero? En general unos cuantos bloqueos y silenciados concretos es suficiente y preferible.",
   "confirmations.edit.confirm": "Editar",
   "confirmations.edit.message": "Editar sobrescribirá el mensaje que estás escribiendo. ¿Estás seguro de que deseas continuar?",
+  "confirmations.edit.title": "¿Sobrescribir publicación?",
   "confirmations.logout.confirm": "Cerrar sesión",
   "confirmations.logout.message": "¿Estás seguro de querer cerrar la sesión?",
+  "confirmations.logout.title": "¿Cerrar sesión?",
   "confirmations.mute.confirm": "Silenciar",
   "confirmations.redraft.confirm": "Borrar y volver a borrador",
   "confirmations.redraft.message": "¿Estás seguro que quieres borrar esta publicación y editarla? Los favoritos e impulsos se perderán, y las respuestas a la publicación original quedarán separadas.",
+  "confirmations.redraft.title": "¿Borrar y volver a redactar la publicación?",
   "confirmations.reply.confirm": "Responder",
   "confirmations.reply.message": "Responder sobrescribirá el mensaje que estás escribiendo. ¿Estás seguro de que deseas continuar?",
+  "confirmations.reply.title": "¿Sobrescribir publicación?",
   "confirmations.unfollow.confirm": "Dejar de seguir",
   "confirmations.unfollow.message": "¿Estás seguro de que quieres dejar de seguir a {name}?",
+  "confirmations.unfollow.title": "¿Dejar de seguir al usuario?",
   "conversation.delete": "Borrar conversación",
   "conversation.mark_as_read": "Marcar como leído",
   "conversation.open": "Ver conversación",
@@ -507,6 +510,7 @@
   "notification_requests.title": "Notificaciones filtradas",
   "notifications.clear": "Limpiar notificaciones",
   "notifications.clear_confirmation": "¿Seguro de querer borrar permanentemente todas tus notificaciones?",
+  "notifications.clear_title": "¿Borrar notificaciones?",
   "notifications.column_settings.admin.report": "Nuevas denuncias:",
   "notifications.column_settings.admin.sign_up": "Registros nuevos:",
   "notifications.column_settings.alert": "Notificaciones de escritorio",
diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json
index a6cecf160567a3..8135f9c3539f10 100644
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@@ -169,27 +169,30 @@
   "compose_form.spoiler_placeholder": "Advertencia de contenido (opcional)",
   "confirmation_modal.cancel": "Cancelar",
   "confirmations.block.confirm": "Bloquear",
-  "confirmations.cancel_follow_request.confirm": "Retirar solicitud",
-  "confirmations.cancel_follow_request.message": "¿Estás seguro de que deseas retirar tu solicitud para seguir a {name}?",
   "confirmations.delete.confirm": "Eliminar",
   "confirmations.delete.message": "¿Estás seguro de que quieres borrar esta publicación?",
+  "confirmations.delete.title": "¿Eliminar publicación?",
   "confirmations.delete_list.confirm": "Eliminar",
   "confirmations.delete_list.message": "¿Seguro que quieres borrar esta lista permanentemente?",
+  "confirmations.delete_list.title": "¿Eliminar lista?",
   "confirmations.discard_edit_media.confirm": "Descartar",
   "confirmations.discard_edit_media.message": "Tienes cambios sin guardar en la descripción o vista previa del archivo audiovisual, ¿descartarlos de todos modos?",
-  "confirmations.domain_block.confirm": "Bloquear servidor",
-  "confirmations.domain_block.message": "¿Seguro que quieres bloquear todo el dominio {domain}? En general, unos cuantos bloqueos y silenciados concretos es suficiente y preferible. No verás contenido del dominio en ninguna cronología pública ni en tus notificaciones. Se eliminarán tus seguidores procedentes de ese dominio.",
   "confirmations.edit.confirm": "Editar",
   "confirmations.edit.message": "Editar ahora reemplazará el mensaje que estás escribiendo. ¿Seguro que quieres proceder?",
+  "confirmations.edit.title": "¿Sobrescribir publicación?",
   "confirmations.logout.confirm": "Cerrar sesión",
   "confirmations.logout.message": "¿Seguro que quieres cerrar la sesión?",
+  "confirmations.logout.title": "¿Cerrar sesión?",
   "confirmations.mute.confirm": "Silenciar",
   "confirmations.redraft.confirm": "Borrar y volver a borrador",
   "confirmations.redraft.message": "¿Estás seguro de querer borrar esta publicación y reescribirla? Los favoritos e impulsos se perderán, y las respuestas a la publicación original quedarán sin contexto.",
+  "confirmations.redraft.title": "¿Borrar y volver a redactar la publicación?",
   "confirmations.reply.confirm": "Responder",
   "confirmations.reply.message": "Responder sobrescribirá el mensaje que estás escribiendo. ¿Seguro que deseas continuar?",
+  "confirmations.reply.title": "¿Sobrescribir publicación?",
   "confirmations.unfollow.confirm": "Dejar de seguir",
   "confirmations.unfollow.message": "¿Seguro que quieres dejar de seguir a {name}?",
+  "confirmations.unfollow.title": "¿Dejar de seguir al usuario?",
   "conversation.delete": "Borrar conversación",
   "conversation.mark_as_read": "Marcar como leído",
   "conversation.open": "Ver conversación",
@@ -507,6 +510,7 @@
   "notification_requests.title": "Notificaciones filtradas",
   "notifications.clear": "Limpiar notificaciones",
   "notifications.clear_confirmation": "¿Seguro que quieres limpiar permanentemente todas tus notificaciones?",
+  "notifications.clear_title": "¿Borrar notificaciones?",
   "notifications.column_settings.admin.report": "Nuevos informes:",
   "notifications.column_settings.admin.sign_up": "Nuevos registros:",
   "notifications.column_settings.alert": "Notificaciones de escritorio",
diff --git a/app/javascript/mastodon/locales/et.json b/app/javascript/mastodon/locales/et.json
index b07229adece46c..4bd997801c4fcf 100644
--- a/app/javascript/mastodon/locales/et.json
+++ b/app/javascript/mastodon/locales/et.json
@@ -166,16 +166,12 @@
   "compose_form.spoiler_placeholder": "Sisuhoiatus (valikuline)",
   "confirmation_modal.cancel": "Katkesta",
   "confirmations.block.confirm": "Blokeeri",
-  "confirmations.cancel_follow_request.confirm": "Tühista taotlus",
-  "confirmations.cancel_follow_request.message": "Oled kindel, et soovid kasutaja {name} jälgimistaotluse tagasi võtta?",
   "confirmations.delete.confirm": "Kustuta",
   "confirmations.delete.message": "Oled kindel, et soovid postituse kustutada?",
   "confirmations.delete_list.confirm": "Kustuta",
   "confirmations.delete_list.message": "Oled kindel, et soovid selle loetelu pöördumatult kustutada?",
   "confirmations.discard_edit_media.confirm": "Hülga",
   "confirmations.discard_edit_media.message": "Sul on salvestamata muudatusi meediakirjelduses või eelvaates, kas hülgad need?",
-  "confirmations.domain_block.confirm": "Blokeeri server",
-  "confirmations.domain_block.message": "Oled ikka päris-päris kindel, et soovid blokeerida terve {domain}? Enamikel juhtudel piisab mõnest sihitud blokist või vaigistusest, mis on eelistatavam. Sa ei näe selle domeeni sisu ühelgi avalikul ajajoonel või enda teadetes. Su jälgijad sellest domeenist eemaldatakse.",
   "confirmations.edit.confirm": "Muuda",
   "confirmations.edit.message": "Muutes praegu kirjutatakse hetkel loodav sõnum üle. Kas oled kindel, et soovid jätkata?",
   "confirmations.logout.confirm": "Välju",
diff --git a/app/javascript/mastodon/locales/eu.json b/app/javascript/mastodon/locales/eu.json
index bd1b51ba3e5f1d..28c1a06d58ffdb 100644
--- a/app/javascript/mastodon/locales/eu.json
+++ b/app/javascript/mastodon/locales/eu.json
@@ -166,23 +166,23 @@
   "compose_form.spoiler_placeholder": "Edukiaren abisua (aukerakoa)",
   "confirmation_modal.cancel": "Utzi",
   "confirmations.block.confirm": "Blokeatu",
-  "confirmations.cancel_follow_request.confirm": "Baztertu eskaera",
-  "confirmations.cancel_follow_request.message": "Ziur {name} jarraitzeko eskaera bertan behera utzi nahi duzula?",
   "confirmations.delete.confirm": "Ezabatu",
   "confirmations.delete.message": "Ziur bidalketa hau ezabatu nahi duzula?",
+  "confirmations.delete.title": "Ezabatu bidalketa?",
   "confirmations.delete_list.confirm": "Ezabatu",
   "confirmations.delete_list.message": "Ziur behin betiko ezabatu nahi duzula zerrenda hau?",
+  "confirmations.delete_list.title": "Ezabatu zerrenda?",
   "confirmations.discard_edit_media.confirm": "Baztertu",
   "confirmations.discard_edit_media.message": "Multimediaren deskribapen edo aurrebistan gorde gabeko aldaketak daude, baztertu nahi dituzu?",
-  "confirmations.domain_block.confirm": "Blokeatu zerbitzaria",
-  "confirmations.domain_block.message": "Ziur, erabat ziur, {domain} domeinu osoa blokeatu nahi duzula? Gehienetan gutxi batzuk blokeatu edo mututzearekin nahikoa da. Ez duzu domeinu horretako edukirik ikusiko denbora lerroetan edo jakinarazpenetan. Domeinu horretako zure jarraitzaileak kenduko dira ere.",
   "confirmations.edit.confirm": "Editatu",
   "confirmations.edit.message": "Orain editatzen baduzu, une honetan idazten ari zaren mezua gainidatziko da. Ziur jarraitu nahi duzula?",
   "confirmations.logout.confirm": "Amaitu saioa",
   "confirmations.logout.message": "Ziur saioa amaitu nahi duzula?",
+  "confirmations.logout.title": "Itxi saioa?",
   "confirmations.mute.confirm": "Mututu",
   "confirmations.redraft.confirm": "Ezabatu eta berridatzi",
   "confirmations.redraft.message": "Ziur argitalpen hau ezabatu eta zirriborroa berriro egitea nahi duzula? Gogokoak eta bultzadak galduko dira, eta jatorrizko argitalpenaren erantzunak zurtz geratuko dira.",
+  "confirmations.redraft.title": "Ezabatu eta berridatzi bidalketa?",
   "confirmations.reply.confirm": "Erantzun",
   "confirmations.reply.message": "Orain erantzuteak idazten ari zaren mezua gainidatziko du. Ziur jarraitu nahi duzula?",
   "confirmations.unfollow.confirm": "Utzi jarraitzeari",
@@ -492,9 +492,12 @@
   "notification_requests.title": "Iragazitako jakinarazpenak",
   "notifications.clear": "Garbitu jakinarazpenak",
   "notifications.clear_confirmation": "Ziur zure jakinarazpen guztiak behin betirako garbitu nahi dituzula?",
+  "notifications.clear_title": "Garbitu jakinarazpenak?",
   "notifications.column_settings.admin.report": "Txosten berriak:",
   "notifications.column_settings.admin.sign_up": "Izen-emate berriak:",
   "notifications.column_settings.alert": "Mahaigaineko jakinarazpenak",
+  "notifications.column_settings.beta.category": "Ezaugarri esperimentalak",
+  "notifications.column_settings.beta.grouping": "Multzokatu jakinarazpenak",
   "notifications.column_settings.favourite": "Gogokoak:",
   "notifications.column_settings.filter_bar.advanced": "Bistaratu kategoria guztiak",
   "notifications.column_settings.filter_bar.category": "Iragazki-barra bizkorra",
@@ -659,8 +662,11 @@
   "report_notification.attached_statuses": "{count, plural, one {Bidalketa {count}} other {{count} bidalketa}} erantsita",
   "report_notification.categories.legal": "Legala",
   "report_notification.categories.other": "Bestelakoak",
+  "report_notification.categories.other_sentence": "bestelakoak",
   "report_notification.categories.spam": "Spam",
+  "report_notification.categories.spam_sentence": "spama",
   "report_notification.categories.violation": "Arau haustea",
+  "report_notification.categories.violation_sentence": "arau haustea",
   "report_notification.open": "Ireki salaketa",
   "search.no_recent_searches": "Duela gutxiko bilaketarik ez",
   "search.placeholder": "Bilatu",
diff --git a/app/javascript/mastodon/locales/fa.json b/app/javascript/mastodon/locales/fa.json
index 9dc429f7de861f..28b4a29cb9efed 100644
--- a/app/javascript/mastodon/locales/fa.json
+++ b/app/javascript/mastodon/locales/fa.json
@@ -158,15 +158,12 @@
   "compose_form.spoiler_placeholder": "هشدار محتوا (اختیاری)",
   "confirmation_modal.cancel": "لغو",
   "confirmations.block.confirm": "انسداد",
-  "confirmations.cancel_follow_request.confirm": "رد کردن درخواست",
-  "confirmations.cancel_follow_request.message": "مطمئنید که می خواهید درخواست پی‌گیری {name} را لغو کنید؟",
   "confirmations.delete.confirm": "حذف",
   "confirmations.delete.message": "آیا مطمئنید که می‌خواهید این فرسته را حذف کنید؟",
   "confirmations.delete_list.confirm": "حذف",
   "confirmations.delete_list.message": "مطمئنید می‌خواهید این سیاهه را برای همیشه حذف کنید؟",
   "confirmations.discard_edit_media.confirm": "دور انداختن",
   "confirmations.discard_edit_media.message": "تغییرات ذخیره نشده‌ای در توضیحات یا پیش‌نمایش رسانه دارید. همگی نادیده گرفته شوند؟",
-  "confirmations.domain_block.message": "آیا جدی جدی می‌خواهید تمام دامنهٔ {domain} را مسدود کنید؟ در بیشتر موارد مسدود کردن یا خموشاندن چند حساب خاص کافی است و توصیه می‌شود. پس از این کار شما هیچ محتوایی را از این دامنه در خط زمانی عمومی یا آگاهی‌هایتان نخواهید دید. پی‌گیرانتان از این دامنه هم برداشته خواهند شد.",
   "confirmations.edit.confirm": "ویرایش",
   "confirmations.edit.message": "در صورت ویرایش، پیامی که در حال نوشتنش بودید از بین خواهد رفت. می‌خواهید ادامه دهید؟",
   "confirmations.logout.confirm": "خروج از حساب",
diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index 5ba77dd72e0813..9e0db8458cf0a4 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -6,7 +6,7 @@
   "about.domain_blocks.preamble": "Mastodonin avulla voidaan yleensä tarkastella minkä tahansa fediversumiin kuuluvan palvelimen sisältöä, ja olla yhteyksissä eri palvelinten käyttäjien kanssa. Nämä poikkeukset koskevat yksin tätä palvelinta.",
   "about.domain_blocks.silenced.explanation": "Et yleensä näe tämän palvelimen profiileja ja sisältöä, jollet erityisesti etsi juuri sitä tai liity siihen seuraamalla.",
   "about.domain_blocks.silenced.title": "Rajoitettu",
-  "about.domain_blocks.suspended.explanation": "Mitään tämän palvelimen tietoja ei käsitellä, tallenneta tai vaihdeta, mikä tekee vuorovaikutuksesta ja viestinnästä sen käyttäjien kanssa mahdotonta.",
+  "about.domain_blocks.suspended.explanation": "Mitään tämän palvelimen tietoja ei käsitellä, tallenneta eikä vaihdeta, mikä tekee vuorovaikutuksesta ja viestinnästä sen käyttäjien kanssa mahdotonta.",
   "about.domain_blocks.suspended.title": "Jäädytetty",
   "about.not_available": "Näitä tietoja ei ole julkaistu tällä palvelimella.",
   "about.powered_by": "Hajautetun sosiaalisen median tarjoaa {mastodon}",
@@ -66,7 +66,7 @@
   "account.statuses_counter": "{count, plural, one {{counter} julkaisu} other {{counter} julkaisua}}",
   "account.unblock": "Kumoa käyttäjän @{name} esto",
   "account.unblock_domain": "Kumoa verkkotunnuksen {domain} esto",
-  "account.unblock_short": "Poista esto",
+  "account.unblock_short": "Kumoa esto",
   "account.unendorse": "Kumoa suosittelu profiilissasi",
   "account.unfollow": "Lopeta seuraaminen",
   "account.unmute": "Poista käyttäjän @{name} mykistys",
@@ -82,7 +82,7 @@
   "admin.impact_report.instance_followers": "Seuraajat, jotka käyttäjämme menettäisivät",
   "admin.impact_report.instance_follows": "Seuraajat, jotka heidän käyttäjänsä menettäisivät",
   "admin.impact_report.title": "Vaikutusten yhteenveto",
-  "alert.rate_limited.message": "Yritä uudestaan {retry_time, time, medium} jälkeen.",
+  "alert.rate_limited.message": "Yritä uudelleen {retry_time, time, medium} jälkeen.",
   "alert.rate_limited.title": "Pyyntömäärää rajoitettu",
   "alert.unexpected.message": "Tapahtui odottamaton virhe.",
   "alert.unexpected.title": "Hups!",
@@ -103,7 +103,7 @@
   "bundle_column_error.error.title": "Voi ei!",
   "bundle_column_error.network.body": "Sivun lataamisessa tapahtui virhe. Tämä voi johtua tilapäisestä Internet-yhteyden tai tämän palvelimen ongelmasta.",
   "bundle_column_error.network.title": "Verkkovirhe",
-  "bundle_column_error.retry": "Yritä uudestaan",
+  "bundle_column_error.retry": "Yritä uudelleen",
   "bundle_column_error.return": "Palaa takaisin kotiin",
   "bundle_column_error.routing.body": "Pyydettyä sivua ei löytynyt. Oletko varma, että osoitepalkin URL-osoite on oikein?",
   "bundle_column_error.routing.title": "404",
@@ -111,7 +111,7 @@
   "bundle_modal_error.message": "Jotain meni pieleen komponenttia ladattaessa.",
   "bundle_modal_error.retry": "Yritä uudelleen",
   "closed_registrations.other_server_instructions": "Koska Mastodon on hajautettu, voit luoda tilin toiselle palvelimelle ja olla silti vuorovaikutuksessa tämän kanssa.",
-  "closed_registrations_modal.description": "Tilin luonti palveluun {domain} ei tällä hetkellä ole mahdollista, mutta huomioi, ettei Mastodonin käyttö edellytä juuri kyseisen palvelun tiliä.",
+  "closed_registrations_modal.description": "Tilin luonti palvelimelle {domain} ei tällä hetkellä ole mahdollista, mutta huomioi, ettei Mastodonin käyttö edellytä juuri kyseisen tuon tiliä.",
   "closed_registrations_modal.find_another_server": "Etsi toinen palvelin",
   "closed_registrations_modal.preamble": "Mastodon on hajautettu, joten riippumatta siitä, missä luot tilisi, voit seurata ja olla vuorovaikutuksessa kenen tahansa kanssa tällä palvelimella. Voit jopa isännöidä palvelinta!",
   "closed_registrations_modal.title": "Rekisteröityminen Mastodoniin",
@@ -169,27 +169,30 @@
   "compose_form.spoiler_placeholder": "Sisältövaroitus (valinnainen)",
   "confirmation_modal.cancel": "Peruuta",
   "confirmations.block.confirm": "Estä",
-  "confirmations.cancel_follow_request.confirm": "Peruuta pyyntö",
-  "confirmations.cancel_follow_request.message": "Haluatko varmasti perua pyyntösi seurata käyttäjätiliä {name}?",
   "confirmations.delete.confirm": "Poista",
   "confirmations.delete.message": "Haluatko varmasti poistaa tämän julkaisun?",
+  "confirmations.delete.title": "Poistetaanko julkaisu?",
   "confirmations.delete_list.confirm": "Poista",
   "confirmations.delete_list.message": "Haluatko varmasti poistaa tämän listan pysyvästi?",
+  "confirmations.delete_list.title": "Poistetaanko lista?",
   "confirmations.discard_edit_media.confirm": "Hylkää",
   "confirmations.discard_edit_media.message": "Sinulla on tallentamattomia muutoksia median kuvaukseen tai esikatseluun. Hylätäänkö ne silti?",
-  "confirmations.domain_block.confirm": "Estä palvelin",
-  "confirmations.domain_block.message": "Haluatko aivan varmasti estää koko verkkotunnuksen {domain}? Useimmiten muutama kohdistettu esto tai mykistys on riittävä ja suositeltava toimi. Et näe sisältöä tästä verkkotunnuksesta millään julkisilla aikajanoilla tai ilmoituksissa. Tähän verkkotunnukseen kuuluvat seuraajasi poistetaan.",
   "confirmations.edit.confirm": "Muokkaa",
   "confirmations.edit.message": "Jos muokkaat viestiä nyt, se korvaa parhaillaan työstämäsi viestin. Haluatko varmasti jatkaa?",
+  "confirmations.edit.title": "Korvataanko julkaisu?",
   "confirmations.logout.confirm": "Kirjaudu ulos",
   "confirmations.logout.message": "Haluatko varmasti kirjautua ulos?",
+  "confirmations.logout.title": "Kirjaudutaanko ulos?",
   "confirmations.mute.confirm": "Mykistä",
   "confirmations.redraft.confirm": "Poista ja palauta muokattavaksi",
   "confirmations.redraft.message": "Haluatko varmasti poistaa julkaisun ja tehdä siitä luonnoksen? Suosikit ja tehostukset menetetään, ja alkuperäisen julkaisun vastaukset jäävät orvoiksi.",
+  "confirmations.redraft.title": "Poistetaanko julkaisu ja palautetaanko se muokattavaksi?",
   "confirmations.reply.confirm": "Vastaa",
   "confirmations.reply.message": "Jos vastaat nyt, vastaus korvaa parhaillaan työstämäsi viestin. Haluatko varmasti jatkaa?",
+  "confirmations.reply.title": "Korvataanko julkaisu?",
   "confirmations.unfollow.confirm": "Lopeta seuraaminen",
   "confirmations.unfollow.message": "Haluatko varmasti lopettaa profiilin {name} seuraamisen?",
+  "confirmations.unfollow.title": "Lopetetaanko käyttäjän seuraaminen?",
   "conversation.delete": "Poista keskustelu",
   "conversation.mark_as_read": "Merkitse luetuksi",
   "conversation.open": "Näytä keskustelu",
@@ -205,9 +208,9 @@
   "disabled_account_banner.text": "Tilisi {disabledAccount} on tällä hetkellä poissa käytöstä.",
   "dismissable_banner.community_timeline": "Nämä ovat tuoreimpia julkaisuja käyttäjiltä, joiden tili on palvelimella {domain}.",
   "dismissable_banner.dismiss": "Hylkää",
-  "dismissable_banner.explore_links": "Näitä uutisia jaetaan tänään sosiaalisessa verkossa eniten. Uusimmat ja eri käyttäjien eniten lähettämät uutiset nousevat listauksessa korkeammalle.",
-  "dismissable_banner.explore_statuses": "Nämä sosiaalisen verkon julkaisut keräävät tänään eniten huomiota. Uusimmat, tehostetuimmat ja suosikeiksi lisätyimmät julkaisut nousevat listauksessa korkeammalle.",
-  "dismissable_banner.explore_tags": "Nämä sosiaalisen verkon aihetunnisteet keräävät tänään eniten huomiota. Useimman käyttäjän käyttämät aihetunnisteet nousevat listauksessa korkeammalle.",
+  "dismissable_banner.explore_links": "Näitä uutisia jaetaan tänään sosiaalisessa verkossa eniten. Uusimmat ja eri käyttäjien eniten lähettämät uutiset nousevat korkeammalle sijalle.",
+  "dismissable_banner.explore_statuses": "Nämä sosiaalisen verkon julkaisut keräävät tänään eniten huomiota. Uusimmat, tehostetuimmat ja suosikeiksi lisätyimmät julkaisut nousevat korkeammalle sijalle.",
+  "dismissable_banner.explore_tags": "Nämä sosiaalisen verkon aihetunnisteet keräävät tänään eniten huomiota. Useimman käyttäjän käyttämät aihetunnisteet nousevat korkeammalle sijalle.",
   "dismissable_banner.public_timeline": "Nämä ovat viimeisimpiä julkaisuja sosiaalisen verkon käyttäjiltä, joita seurataan palvelimella {domain}.",
   "domain_block_modal.block": "Estä palvelin",
   "domain_block_modal.block_account_instead": "Estä sen sijaan @{name}",
@@ -254,7 +257,7 @@
   "empty_column.blocks": "Et ole vielä estänyt käyttäjiä.",
   "empty_column.bookmarked_statuses": "Et ole vielä lisännyt julkaisuja kirjanmerkkeihisi. Kun lisäät yhden, se näkyy tässä.",
   "empty_column.community": "Paikallinen aikajana on tyhjä. Kirjoita jotain julkista, niin homma lähtee käyntiin!",
-  "empty_column.direct": "Yksityisiä mainintoja ei vielä ole. Jos lähetät tai sinulle lähetetään sellaisia, näet ne täällä.",
+  "empty_column.direct": "Yksityismainintoja ei vielä ole. Jos lähetät tai sinulle lähetetään sellainen, näet sen tässä.",
   "empty_column.domain_blocks": "Verkkotunnuksia ei ole vielä estetty.",
   "empty_column.explore_statuses": "Mikään ei ole nyt suosittua. Tarkista myöhemmin uudelleen!",
   "empty_column.favourited_statuses": "Sinulla ei ole vielä yhtään suosikkijulkaisua. Kun lisäät sellaisen, näkyy se tässä.",
@@ -268,7 +271,7 @@
   "empty_column.mutes": "Et ole mykistänyt vielä yhtään käyttäjää.",
   "empty_column.notification_requests": "Olet ajan tasalla! Täällä ei ole mitään uutta kerrottavaa. Kun saat uusia ilmoituksia, ne näkyvät täällä asetustesi mukaisesti.",
   "empty_column.notifications": "Sinulla ei ole vielä ilmoituksia. Kun keskustelet muille, näet sen täällä.",
-  "empty_column.public": "Täällä ei ole mitään! Kirjoita jotain julkisesti. Voit myös seurata muiden palvelimien käyttäjiä",
+  "empty_column.public": "Täällä ei ole mitään! Kirjoita jotain julkisesti tai seuraa muiden palvelinten käyttäjiä, niin saat sisältöä",
   "error.unexpected_crash.explanation": "Sivua ei voida näyttää oikein ohjelmointivirheen tai selaimen yhteensopivuusvajeen vuoksi.",
   "error.unexpected_crash.explanation_addons": "Sivua ei voitu näyttää oikein. Tämä virhe johtuu todennäköisesti selaimen lisäosasta tai automaattisista käännöstyökaluista.",
   "error.unexpected_crash.next_steps": "Kokeile päivittää sivu. Jos se ei auta, voi Mastodonin käyttö ehkä onnistua eri selaimella tai natiivisovelluksella.",
@@ -378,7 +381,7 @@
   "keyboard_shortcuts.column": "Kohdista sarakkeeseen",
   "keyboard_shortcuts.compose": "Kohdista kirjoituskenttään",
   "keyboard_shortcuts.description": "Kuvaus",
-  "keyboard_shortcuts.direct": "Avaa yksityisten mainintojen sarake",
+  "keyboard_shortcuts.direct": "Avaa yksityismainintojen sarake",
   "keyboard_shortcuts.down": "Siirry listassa alaspäin",
   "keyboard_shortcuts.enter": "Avaa julkaisu",
   "keyboard_shortcuts.favourite": "Lisää julkaisu suosikkeihin",
@@ -412,7 +415,7 @@
   "lightbox.next": "Seuraava",
   "lightbox.previous": "Edellinen",
   "limited_account_hint.action": "Näytä profiili joka tapauksessa",
-  "limited_account_hint.title": "Palvelimen {domain} valvojat ovat piilottaneet tämän käyttäjätilin.",
+  "limited_account_hint.title": "Palvelimen {domain} moderaattorit ovat piilottaneet tämän profiilin.",
   "link_preview.author": "Julkaissut {name}",
   "link_preview.more_from_author": "Lisää käyttäjältä {name}",
   "link_preview.shares": "{count, plural, one {{counter} julkaisu} other {{counter} julkaisua}}",
@@ -428,7 +431,7 @@
   "lists.replies_policy.list": "Listan jäsenille",
   "lists.replies_policy.none": "Ei kellekään",
   "lists.replies_policy.title": "Näytä vastaukset:",
-  "lists.search": "Etsi seuraamiesi henkilöiden keskuudesta",
+  "lists.search": "Hae seuraamistasi henkilöistä",
   "lists.subheading": "Omat listasi",
   "load_pending": "{count, plural, one {# uusi kohde} other {# uutta kohdetta}}",
   "loading_indicator.label": "Ladataan…",
@@ -468,7 +471,7 @@
   "navigation_bar.pins": "Kiinnitetyt julkaisut",
   "navigation_bar.preferences": "Asetukset",
   "navigation_bar.public_timeline": "Yleinen aikajana",
-  "navigation_bar.search": "Hae",
+  "navigation_bar.search": "Haku",
   "navigation_bar.security": "Turvallisuus",
   "not_signed_in_indicator.not_signed_in": "Sinun on kirjauduttava sisään käyttääksesi resurssia.",
   "notification.admin.report": "{name} raportoi käyttäjän {target}",
@@ -483,9 +486,9 @@
   "notification.mention": "{name} mainitsi sinut",
   "notification.moderation-warning.learn_more": "Lue lisää",
   "notification.moderation_warning": "Olet saanut moderointivaroituksen",
-  "notification.moderation_warning.action_delete_statuses": "Jotkin julkaisusi on poistettu.",
+  "notification.moderation_warning.action_delete_statuses": "Julkaisujasi on poistettu.",
   "notification.moderation_warning.action_disable": "Tilisi on poistettu käytöstä.",
-  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Jotkin julkaisusi on merkitty arkaluonteisiksi.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Julkaisujasi on merkitty arkaluonteisiksi.",
   "notification.moderation_warning.action_none": "Tilisi on saanut moderointivaroituksen.",
   "notification.moderation_warning.action_sensitive": "Tästä lähtien julkaisusi merkitään arkaluonteisiksi.",
   "notification.moderation_warning.action_silence": "Tiliäsi on rajoitettu.",
@@ -507,7 +510,8 @@
   "notification_requests.title": "Suodatetut ilmoitukset",
   "notifications.clear": "Tyhjennä ilmoitukset",
   "notifications.clear_confirmation": "Haluatko varmasti poistaa kaikki ilmoitukset pysyvästi?",
-  "notifications.column_settings.admin.report": "Uudet ilmoitukset:",
+  "notifications.clear_title": "Tyhjennetäänkö ilmoitukset?",
+  "notifications.column_settings.admin.report": "Uudet raportit:",
   "notifications.column_settings.admin.sign_up": "Uudet rekisteröitymiset:",
   "notifications.column_settings.alert": "Työpöytäilmoitukset",
   "notifications.column_settings.beta.category": "Kokeelliset ominaisuudet",
@@ -534,12 +538,12 @@
   "notifications.filter.mentions": "Maininnat",
   "notifications.filter.polls": "Äänestyksen tulokset",
   "notifications.filter.statuses": "Päivitykset henkilöiltä, joita seuraat",
-  "notifications.grant_permission": "Myönnä lupa.",
+  "notifications.grant_permission": "Myönnä käyttöoikeus.",
   "notifications.group": "{count} ilmoitusta",
   "notifications.mark_as_read": "Merkitse jokainen ilmoitus luetuksi",
   "notifications.permission_denied": "Työpöytäilmoitukset eivät ole käytettävissä, koska selaimen käyttöoikeuspyyntö on aiemmin evätty",
-  "notifications.permission_denied_alert": "Työpöytäilmoituksia ei voi ottaa käyttöön, koska selaimen käyttöoikeus on aiemmin estetty",
-  "notifications.permission_required": "Työpöytäilmoitukset eivät ole käytettävissä, koska siihen tarvittavaa lupaa ei ole myönnetty.",
+  "notifications.permission_denied_alert": "Työpöytäilmoituksia ei voi ottaa käyttöön, koska selaimen käyttöoikeus on aiemmin evätty",
+  "notifications.permission_required": "Työpöytäilmoitukset eivät ole käytettävissä, koska siihen tarvittavaa käyttöoikeutta ei ole myönnetty.",
   "notifications.policy.filter_new_accounts.hint": "Luotu {days, plural, one {viimeisimmän päivän aikana} other {# viime päivän aikana}}",
   "notifications.policy.filter_new_accounts_title": "Uudet tilit",
   "notifications.policy.filter_not_followers_hint": "Mukaan lukien alle {days, plural, one {päivän} other {# päivän}} verran sinua seuranneet",
@@ -586,7 +590,7 @@
   "onboarding.steps.setup_profile.title": "Mukauta profiiliasi",
   "onboarding.steps.share_profile.body": "Kerro kavereillesi, kuinka sinut löytää Mastodonista",
   "onboarding.steps.share_profile.title": "Jaa Mastodon-profiilisi",
-  "onboarding.tips.2fa": "<strong>Tiesitkö?</strong> Voit suojata tilisi ottamalla kaksivaiheisen todennuksen käyttöön tilisi asetuksista. Se toimii millä tahansa TOTP-sovelluksella, eikä sen käyttö edellytä puhelinnumeron antoa!",
+  "onboarding.tips.2fa": "<strong>Tiesitkö?</strong> Voit suojata tilisi ottamalla kaksivaiheisen todennuksen käyttöön tilisi asetuksista. Se toimii millä tahansa TOTP-sovelluksella, eikä sen käyttö edellytä puhelinnumeron luovuttamista!",
   "onboarding.tips.accounts_from_other_servers": "<strong>Tiesitkö?</strong> Koska Mastodon on hajautettu, osa kohtaamistasi profiileista sijaitsee muilla kuin sinun palvelimellasi. Voit silti viestiä saumattomasti heidän kanssaan! Heidän palvelimensa mainitaan käyttäjänimen jälkiosassa!",
   "onboarding.tips.migration": "<strong>Tiesitkö?</strong> Jos koet, ettei {domain} ole jatkossa itsellesi hyvä palvelinvalinta, voit siirtyä toiselle Mastodon-palvelimelle menettämättä seuraajiasi. Voit jopa isännöidä omaa palvelintasi!",
   "onboarding.tips.verification": "<strong>Tiesitkö?</strong> Voit vahvistaa tilisi lisäämällä omalle verkkosivustollesi linkin Mastodon-profiiliisi ja lisäämällä sitten verkkosivustosi osoitteen Mastodon-profiilisi lisäkenttään. Tämä ei maksa mitään, eikä sinun tarvitse lähetellä asiakirjoja!",
@@ -635,24 +639,24 @@
   "reply_indicator.poll": "Äänestys",
   "report.block": "Estä",
   "report.block_explanation": "Et näe hänen viestejään, eikä hän voi nähdä viestejäsi tai seurata sinua. Hän näkee, että olet estänyt hänet.",
-  "report.categories.legal": "Juridiset tiedot",
+  "report.categories.legal": "Lakiseikat",
   "report.categories.other": "Muu",
   "report.categories.spam": "Roskaposti",
   "report.categories.violation": "Sisältö rikkoo yhtä tai useampaa palvelimen säännöistä",
   "report.category.subtitle": "Valitse sopivin",
   "report.category.title": "Kerro meille, miksi tämä {type} pitää raportoida",
-  "report.category.title_account": "profiilissa",
-  "report.category.title_status": "julkaisussa",
+  "report.category.title_account": "profiili",
+  "report.category.title_status": "julkaisu",
   "report.close": "Valmis",
   "report.comment.title": "Onko vielä jotain muuta, mitä meidän pitäisi tietää?",
-  "report.forward": "Välitä kohteeseen {target}",
+  "report.forward": "Välitä palvelimelle {target}",
   "report.forward_hint": "Tämä tili on toisella palvelimella. Haluatko lähettää nimettömän raportin myös sinne?",
   "report.mute": "Mykistä",
   "report.mute_explanation": "Et näe hänen julkaisujaan. Hän voi silti seurata sinua ja nähdä julkaisusi. Hän ei tiedä, että hänet on mykistetty.",
   "report.next": "Seuraava",
   "report.placeholder": "Lisäkommentit",
   "report.reasons.dislike": "En pidä siitä",
-  "report.reasons.dislike_description": "Sisältö on sen tyyppistä, ettet halua nähdä sitä",
+  "report.reasons.dislike_description": "Sisältö on sellaista, jota et halua nähdä",
   "report.reasons.legal": "Se on laitonta",
   "report.reasons.legal_description": "Katsot sisällön rikkovan maasi tai palvelimen kotimaan lakeja",
   "report.reasons.other": "Jotain muuta",
@@ -663,18 +667,18 @@
   "report.reasons.violation_description": "Tiedät sisällön rikkovan tiettyjä sääntöjä",
   "report.rules.subtitle": "Valitse kaikki sopivat",
   "report.rules.title": "Mitä sääntöjä rikotaan?",
-  "report.statuses.subtitle": "Valitse kaikki soveltuvat julkaisut",
+  "report.statuses.subtitle": "Valitse kaikki sopivat",
   "report.statuses.title": "Onko julkaisuja, jotka tukevat tätä raporttia?",
   "report.submit": "Lähetä",
   "report.target": "Raportoidaan {target}",
   "report.thanks.take_action": "Tässä on vaihtoehtosi hallita näkemääsi Mastodonissa:",
-  "report.thanks.take_action_actionable": "Sillä välin kun tarkistamme tätä, voit ryhtyä toimenpiteisiin käyttäjää @{name} vastaan:",
+  "report.thanks.take_action_actionable": "Sillä välin kun tarkistamme tätä, voit ryhtyä toimiin käyttäjää @{name} kohtaan:",
   "report.thanks.title": "Etkö halua nähdä tätä?",
-  "report.thanks.title_actionable": "Kiitos raportista, tutkimme asiaa.",
+  "report.thanks.title_actionable": "Kiitos raportista – tutkimme asiaa.",
   "report.unfollow": "Lopeta käyttäjän @{name} seuraaminen",
-  "report.unfollow_explanation": "Seuraat tätä tiliä. Estääksesi tilin viestejä näykymästä kotisyötteessäsi, lopeta sen seuraaminen.",
+  "report.unfollow_explanation": "Seuraat tätä tiliä. Jotta et enää näkisi sen julkaisuja kotisyötteessäsi, lopeta tilin seuraaminen.",
   "report_notification.attached_statuses": "{count, plural, one {{count} julkaisu} other {{count} julkaisua}} liitteenä",
-  "report_notification.categories.legal": "Laillinen",
+  "report_notification.categories.legal": "Lakiseikat",
   "report_notification.categories.legal_sentence": "laiton sisältö",
   "report_notification.categories.other": "Muu",
   "report_notification.categories.other_sentence": "jokin muu",
@@ -716,9 +720,9 @@
   "sign_in_banner.mastodon_is": "Mastodon on paras tapa pysyä ajan tasalla siitä, mitä ympärillä tapahtuu.",
   "sign_in_banner.sign_in": "Kirjaudu",
   "sign_in_banner.sso_redirect": "Kirjaudu tai rekisteröidy",
-  "status.admin_account": "Avaa tilin @{name} valvontanäkymä",
-  "status.admin_domain": "Avaa palvelimen {domain} valvontanäkymä",
-  "status.admin_status": "Avaa julkaisu valvontanäkymässä",
+  "status.admin_account": "Avaa tilin @{name} moderointinäkymä",
+  "status.admin_domain": "Avaa palvelimen {domain} moderointinäkymä",
+  "status.admin_status": "Avaa julkaisu moderointinäkymässä",
   "status.block": "Estä @{name}",
   "status.bookmark": "Lisää kirjanmerkki",
   "status.cancel_reblog_private": "Peru tehostus",
diff --git a/app/javascript/mastodon/locales/fil.json b/app/javascript/mastodon/locales/fil.json
index b8a2987ef052f3..1bdcd6f54ec909 100644
--- a/app/javascript/mastodon/locales/fil.json
+++ b/app/javascript/mastodon/locales/fil.json
@@ -112,13 +112,10 @@
   "compose_form.spoiler.unmarked": "Idagdag ang babala sa nilalaman",
   "confirmation_modal.cancel": "Pagpaliban",
   "confirmations.block.confirm": "Harangan",
-  "confirmations.cancel_follow_request.confirm": "Bawiin ang kahilingan",
-  "confirmations.cancel_follow_request.message": "Sigurdo ka bang gusto mong bawiin ang kahilingang sundan si/ang {name}?",
   "confirmations.delete.message": "Sigurado ka bang gusto mong burahin ang post na ito?",
   "confirmations.delete_list.confirm": "Tanggalin",
   "confirmations.delete_list.message": "Sigurado ka bang gusto mong burahin ang listahang ito?",
   "confirmations.discard_edit_media.confirm": "Ipagpaliban",
-  "confirmations.domain_block.confirm": "Harangan ang serbiro",
   "confirmations.edit.confirm": "Baguhin",
   "confirmations.reply.confirm": "Tumugon",
   "conversation.mark_as_read": "Markahan bilang nabasa na",
diff --git a/app/javascript/mastodon/locales/fo.json b/app/javascript/mastodon/locales/fo.json
index b44bc6c5d87bda..9f1abebad9f21c 100644
--- a/app/javascript/mastodon/locales/fo.json
+++ b/app/javascript/mastodon/locales/fo.json
@@ -169,27 +169,30 @@
   "compose_form.spoiler_placeholder": "Innihaldsávaring (valfrí)",
   "confirmation_modal.cancel": "Strika",
   "confirmations.block.confirm": "Banna",
-  "confirmations.cancel_follow_request.confirm": "Tak umbønina aftur",
-  "confirmations.cancel_follow_request.message": "Er tað tilætlað, at tú tekur umbønina at fylgja {name} aftur?",
   "confirmations.delete.confirm": "Strika",
   "confirmations.delete.message": "Er tað tilætlað, at tú strikar hetta uppslagið?",
+  "confirmations.delete.title": "Strika post?",
   "confirmations.delete_list.confirm": "Strika",
   "confirmations.delete_list.message": "Ert tú vís/ur í, at tú vilt strika hetta uppslagið?",
+  "confirmations.delete_list.title": "Strika lista?",
   "confirmations.discard_edit_media.confirm": "Vraka",
   "confirmations.discard_edit_media.message": "Tú hevur broytingar í miðlalýsingini ella undansýningini, sum ikki eru goymdar. Vilt tú kortini vraka?",
-  "confirmations.domain_block.confirm": "Banna ambætara",
-  "confirmations.domain_block.message": "Ert tú púra, púra vís/ur í, at tú vilt banna øllum {domain}? Í flestu førum er nóg mikið og betri, bert at banna ella doyva onkrum ávísum. Tú fert eingi evni at síggja frá økisnavninum á nakrari almennari tíðarrás ella í tínum fráboðanum. Tínir fylgjarar undir økisnavninum verða eisini strikaðir.",
   "confirmations.edit.confirm": "Rætta",
   "confirmations.edit.message": "Rættingar, sum verða gjørdar nú, skriva yvir boðini, sum tú ert í holt við. Ert tú vís/ur í, at tú vilt halda fram?",
+  "confirmations.edit.title": "Skriva omaná post?",
   "confirmations.logout.confirm": "Rita út",
   "confirmations.logout.message": "Ert tú vís/ur í, at tú vilt útrita teg?",
+  "confirmations.logout.title": "Rita út?",
   "confirmations.mute.confirm": "Doyv",
   "confirmations.redraft.confirm": "Sletta og skriva umaftur",
   "confirmations.redraft.message": "Vilt tú veruliga strika hendan postin og í staðin gera hann til eina nýggja kladdu? Yndisfrámerki og framhevjanir blíva burtur, og svar til upprunapostin missa tilknýtið.",
+  "confirmations.redraft.title": "Strika & ger nýtt uppskot um post?",
   "confirmations.reply.confirm": "Svara",
   "confirmations.reply.message": "Svarar tú nú, verða boðini, sum tú ert í holt við at skriva yvirskrivað. Ert tú vís/ur í, at tú vilt halda fram?",
+  "confirmations.reply.title": "Skriva omaná post?",
   "confirmations.unfollow.confirm": "Fylg ikki",
   "confirmations.unfollow.message": "Ert tú vís/ur í, at tú vil steðga við at fylgja {name}?",
+  "confirmations.unfollow.title": "Gevst at fylgja brúkara?",
   "conversation.delete": "Strika samrøðu",
   "conversation.mark_as_read": "Merk sum lisið",
   "conversation.open": "Vís samrøðu",
@@ -507,6 +510,7 @@
   "notification_requests.title": "Sáldaðar fráboðanir",
   "notifications.clear": "Rudda fráboðanir",
   "notifications.clear_confirmation": "Ert tú vís/ur í, at tú vilt strika allar tínar fráboðanir?",
+  "notifications.clear_title": "Rudda fráboðanir?",
   "notifications.column_settings.admin.report": "Nýggjar fráboðanir:",
   "notifications.column_settings.admin.sign_up": "Nýggjar tilmeldingar:",
   "notifications.column_settings.alert": "Skriviborðsfráboðanir",
diff --git a/app/javascript/mastodon/locales/fr-CA.json b/app/javascript/mastodon/locales/fr-CA.json
index 94b73bbf18235d..b4e519303c757b 100644
--- a/app/javascript/mastodon/locales/fr-CA.json
+++ b/app/javascript/mastodon/locales/fr-CA.json
@@ -166,27 +166,30 @@
   "compose_form.spoiler_placeholder": "Avertissement de contenu (optionnel)",
   "confirmation_modal.cancel": "Annuler",
   "confirmations.block.confirm": "Bloquer",
-  "confirmations.cancel_follow_request.confirm": "Retirer cette demande",
-  "confirmations.cancel_follow_request.message": "Êtes-vous sûr de vouloir retirer votre demande pour suivre {name}?",
   "confirmations.delete.confirm": "Supprimer",
   "confirmations.delete.message": "Voulez-vous vraiment supprimer cette publication?",
+  "confirmations.delete.title": "Supprimer la publication ?",
   "confirmations.delete_list.confirm": "Supprimer",
   "confirmations.delete_list.message": "Voulez-vous vraiment supprimer définitivement cette liste?",
+  "confirmations.delete_list.title": "Supprimer la liste ?",
   "confirmations.discard_edit_media.confirm": "Rejeter",
   "confirmations.discard_edit_media.message": "Vous avez des modifications non enregistrées de la description ou de l'aperçu du média, voulez-vous quand même les supprimer?",
-  "confirmations.domain_block.confirm": "Bloquer le serveur",
-  "confirmations.domain_block.message": "Voulez-vous vraiment, vraiment bloquer {domain} en entier? Dans la plupart des cas, quelques blocages ou masquages ciblés sont suffisants et préférables. Vous ne verrez plus de contenu provenant de ce domaine, ni dans vos fils publics, ni dans vos notifications. Vos abonné·e·s utilisant ce domaine seront retiré·e·s.",
   "confirmations.edit.confirm": "Éditer",
   "confirmations.edit.message": "Modifier maintenant écrasera votre message en cours de rédaction. Voulez-vous vraiment continuer ?",
+  "confirmations.edit.title": "Remplacer le message ?",
   "confirmations.logout.confirm": "Se déconnecter",
   "confirmations.logout.message": "Voulez-vous vraiment vous déconnecter?",
+  "confirmations.logout.title": "Se déconnecter ?",
   "confirmations.mute.confirm": "Masquer",
   "confirmations.redraft.confirm": "Supprimer et réécrire",
   "confirmations.redraft.message": "Êtes-vous sûr·e de vouloir effacer cette publication pour la réécrire? Ses ses mises en favori et boosts seront perdus et ses réponses seront orphelines.",
+  "confirmations.redraft.title": "Supprimer et réécrire le message ?",
   "confirmations.reply.confirm": "Répondre",
   "confirmations.reply.message": "Répondre maintenant écrasera le message que vous rédigez présentement. Voulez-vous vraiment continuer?",
+  "confirmations.reply.title": "Remplacer le message ?",
   "confirmations.unfollow.confirm": "Ne plus suivre",
   "confirmations.unfollow.message": "Voulez-vous vraiment arrêter de suivre {name}?",
+  "confirmations.unfollow.title": "Se désabonner de l'utilisateur ?",
   "conversation.delete": "Supprimer cette conversation",
   "conversation.mark_as_read": "Marquer comme lu",
   "conversation.open": "Afficher cette conversation",
@@ -480,6 +483,7 @@
   "notification_requests.title": "Notifications filtrées",
   "notifications.clear": "Effacer notifications",
   "notifications.clear_confirmation": "Voulez-vous vraiment effacer toutes vos notifications?",
+  "notifications.clear_title": "Effacer les notifications ?",
   "notifications.column_settings.admin.report": "Nouveaux signalements:",
   "notifications.column_settings.admin.sign_up": "Nouvelles inscriptions:",
   "notifications.column_settings.alert": "Notifications navigateur",
diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json
index fd256fe7168688..8aeb59f79f908a 100644
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@@ -166,27 +166,30 @@
   "compose_form.spoiler_placeholder": "Avertissement de contenu (optionnel)",
   "confirmation_modal.cancel": "Annuler",
   "confirmations.block.confirm": "Bloquer",
-  "confirmations.cancel_follow_request.confirm": "Retirer la demande",
-  "confirmations.cancel_follow_request.message": "Êtes-vous sûr de vouloir retirer votre demande pour suivre {name} ?",
   "confirmations.delete.confirm": "Supprimer",
   "confirmations.delete.message": "Voulez-vous vraiment supprimer ce message ?",
+  "confirmations.delete.title": "Supprimer la publication ?",
   "confirmations.delete_list.confirm": "Supprimer",
   "confirmations.delete_list.message": "Voulez-vous vraiment supprimer définitivement cette liste ?",
+  "confirmations.delete_list.title": "Supprimer la liste ?",
   "confirmations.discard_edit_media.confirm": "Rejeter",
   "confirmations.discard_edit_media.message": "Vous avez des modifications non enregistrées de la description ou de l'aperçu du média, les supprimer quand même ?",
-  "confirmations.domain_block.confirm": "Bloquer le serveur",
-  "confirmations.domain_block.message": "Voulez-vous vraiment, vraiment bloquer {domain} en entier ? Dans la plupart des cas, quelques blocages ou masquages ciblés sont suffisants et préférables. Vous ne verrez plus de contenu provenant de ce domaine, ni dans vos fils publics, ni dans vos notifications. Vos abonné·e·s utilisant ce domaine seront retiré·e·s.",
   "confirmations.edit.confirm": "Modifier",
   "confirmations.edit.message": "Modifier maintenant écrasera votre message en cours de rédaction. Voulez-vous vraiment continuer ?",
+  "confirmations.edit.title": "Remplacer le message ?",
   "confirmations.logout.confirm": "Se déconnecter",
   "confirmations.logout.message": "Voulez-vous vraiment vous déconnecter ?",
+  "confirmations.logout.title": "Se déconnecter ?",
   "confirmations.mute.confirm": "Masquer",
   "confirmations.redraft.confirm": "Supprimer et ré-écrire",
   "confirmations.redraft.message": "Êtes-vous sûr·e de vouloir effacer cette publication pour la réécrire ? Ses partages ainsi que ses mises en favori seront perdus et ses réponses seront orphelines.",
+  "confirmations.redraft.title": "Supprimer et réécrire le message ?",
   "confirmations.reply.confirm": "Répondre",
   "confirmations.reply.message": "Répondre maintenant écrasera votre message en cours de rédaction. Voulez-vous vraiment continuer ?",
+  "confirmations.reply.title": "Remplacer le message ?",
   "confirmations.unfollow.confirm": "Ne plus suivre",
   "confirmations.unfollow.message": "Voulez-vous vraiment vous désabonner de {name} ?",
+  "confirmations.unfollow.title": "Se désabonner de l'utilisateur ?",
   "conversation.delete": "Supprimer la conversation",
   "conversation.mark_as_read": "Marquer comme lu",
   "conversation.open": "Afficher la conversation",
@@ -480,6 +483,7 @@
   "notification_requests.title": "Notifications filtrées",
   "notifications.clear": "Effacer les notifications",
   "notifications.clear_confirmation": "Voulez-vous vraiment effacer toutes vos notifications ?",
+  "notifications.clear_title": "Effacer les notifications ?",
   "notifications.column_settings.admin.report": "Nouveaux signalements :",
   "notifications.column_settings.admin.sign_up": "Nouvelles inscriptions :",
   "notifications.column_settings.alert": "Notifications du navigateur",
diff --git a/app/javascript/mastodon/locales/fy.json b/app/javascript/mastodon/locales/fy.json
index 49b8931d508c5a..093298f156fda1 100644
--- a/app/javascript/mastodon/locales/fy.json
+++ b/app/javascript/mastodon/locales/fy.json
@@ -169,16 +169,12 @@
   "compose_form.spoiler_placeholder": "Ynhâldswarskôging (opsjoneel)",
   "confirmation_modal.cancel": "Annulearje",
   "confirmations.block.confirm": "Blokkearje",
-  "confirmations.cancel_follow_request.confirm": "Fersyk annulearje",
-  "confirmations.cancel_follow_request.message": "Binne jo wis dat jo jo fersyk om {name} te folgjen annulearje wolle?",
   "confirmations.delete.confirm": "Fuortsmite",
   "confirmations.delete.message": "Binne jo wis dat jo dit berjocht fuortsmite wolle?",
   "confirmations.delete_list.confirm": "Fuortsmite",
   "confirmations.delete_list.message": "Binne jo wis dat jo dizze list foar permanint fuortsmite wolle?",
   "confirmations.discard_edit_media.confirm": "Fuortsmite",
   "confirmations.discard_edit_media.message": "Jo hawwe net-bewarre wizigingen yn de mediabeskriuwing of foarfertoaning, wolle jo dizze dochs fuortsmite?",
-  "confirmations.domain_block.confirm": "Server blokkearje",
-  "confirmations.domain_block.message": "Binne jo echt wis dat jo alles fan {domain} negearje wolle? Yn de measte gefallen is it blokkearjen of negearjen fan in pear spesifike persoanen genôch en better. Jo sille gjin berjochten fan dizze server op iepenbiere tiidlinen sjen of yn jo meldingen. Jo folgers fan dizze server wurde fuortsmiten.",
   "confirmations.edit.confirm": "Bewurkje",
   "confirmations.edit.message": "Troch no te bewurkjen sil it berjocht dat jo no oan it skriuwen binne oerskreaun wurde. Wolle jo trochgean?",
   "confirmations.logout.confirm": "Ofmelde",
diff --git a/app/javascript/mastodon/locales/ga.json b/app/javascript/mastodon/locales/ga.json
index 711c97f66c7e1a..9f5f8c773f18fe 100644
--- a/app/javascript/mastodon/locales/ga.json
+++ b/app/javascript/mastodon/locales/ga.json
@@ -169,27 +169,30 @@
   "compose_form.spoiler_placeholder": "Rabhadh ábhair (roghnach)",
   "confirmation_modal.cancel": "Cealaigh",
   "confirmations.block.confirm": "Bac",
-  "confirmations.cancel_follow_request.confirm": "Éirigh as iarratas",
-  "confirmations.cancel_follow_request.message": "An bhfuil tú cinnte gur mhaith leat éirigh as an iarratas leanta {name}?",
   "confirmations.delete.confirm": "Scrios",
   "confirmations.delete.message": "An bhfuil tú cinnte gur mhaith leat an phostáil seo a scriosadh?",
+  "confirmations.delete.title": "Scrios postáil?",
   "confirmations.delete_list.confirm": "Scrios",
   "confirmations.delete_list.message": "An bhfuil tú cinnte gur mhaith leat an liosta seo a scriosadh go buan?",
+  "confirmations.delete_list.title": "Scrios liosta?",
   "confirmations.discard_edit_media.confirm": "Faigh réidh de",
   "confirmations.discard_edit_media.message": "Tá athruithe neamhshlánaithe don tuarascáil gné nó réamhamharc agat, faigh réidh dóibh ar aon nós?",
-  "confirmations.domain_block.confirm": "Bloc freastalaí",
-  "confirmations.domain_block.message": "An bhfuil tú iontach cinnte gur mhaith leat bac an t-ainm fearainn {domain} in iomlán? I bhformhór na gcásanna, is leor agus is fearr cúpla baic a cur i bhfeidhm nó cúpla úsáideoirí a balbhú. Ní fheicfidh tú ábhair ón t-ainm fearainn sin in amlíne ar bith, nó i d'fhógraí. Scaoilfear do leantóirí ón ainm fearainn sin.",
   "confirmations.edit.confirm": "Eagar",
   "confirmations.edit.message": "Má dhéanann tú eagarthóireacht anois, déanfar an teachtaireacht atá á cumadh agat faoi láthair a fhorscríobh. An bhfuil tú cinnte gur mhaith leat leanúint ar aghaidh?",
+  "confirmations.edit.title": "Forscríobh postáil?",
   "confirmations.logout.confirm": "Logáil amach",
   "confirmations.logout.message": "An bhfuil tú cinnte gur mhaith leat logáil amach?",
+  "confirmations.logout.title": "Logáil Amach?",
   "confirmations.mute.confirm": "Balbhaigh",
   "confirmations.redraft.confirm": "Scrios ⁊ athdhréachtaigh",
   "confirmations.redraft.message": "An bhfuil tú cinnte gur mhaith leat an postáil seo a scriosadh agus é a athdhréachtú? Caillfear ceanáin agus treisithe, agus dílleachtaí freagraí ar an mbunphostála.",
+  "confirmations.redraft.title": "Scrios & athdhréachtú postáil?",
   "confirmations.reply.confirm": "Freagair",
   "confirmations.reply.message": "Scriosfaidh freagra láithreach an teachtaireacht atá a chumadh anois agat. An bhfuil tú cinnte gur mhaith leat leanúint leat?",
+  "confirmations.reply.title": "Forscríobh postáil?",
   "confirmations.unfollow.confirm": "Ná lean",
   "confirmations.unfollow.message": "An bhfuil tú cinnte gur mhaith leat {name} a dhíleanúint?",
+  "confirmations.unfollow.title": "Dílean ​​an t-úsáideoir?",
   "conversation.delete": "Scrios comhrá",
   "conversation.mark_as_read": "Marcáil mar léite",
   "conversation.open": "Féach ar comhrá",
@@ -507,6 +510,7 @@
   "notification_requests.title": "Fógraí scagtha",
   "notifications.clear": "Glan fógraí",
   "notifications.clear_confirmation": "An bhfuil tú cinnte gur mhaith leat d'fhógraí go léir a ghlanadh go buan?",
+  "notifications.clear_title": "Glan fógraí?",
   "notifications.column_settings.admin.report": "Tuairiscí nua:",
   "notifications.column_settings.admin.sign_up": "Clárúcháin nua:",
   "notifications.column_settings.alert": "Fógraí deisce",
diff --git a/app/javascript/mastodon/locales/gd.json b/app/javascript/mastodon/locales/gd.json
index f5488cfce48c36..a4db1093483758 100644
--- a/app/javascript/mastodon/locales/gd.json
+++ b/app/javascript/mastodon/locales/gd.json
@@ -166,16 +166,12 @@
   "compose_form.spoiler_placeholder": "Rabhadh susbainte (roghainneil)",
   "confirmation_modal.cancel": "Sguir dheth",
   "confirmations.block.confirm": "Bac",
-  "confirmations.cancel_follow_request.confirm": "Cuir d’ iarrtas dhan dàrna taobh",
-  "confirmations.cancel_follow_request.message": "A bheil thu cinnteach gu bheil thu airson d’ iarrtas airson {name} a leantainn a chur dhan dàrna taobh?",
   "confirmations.delete.confirm": "Sguab às",
   "confirmations.delete.message": "A bheil thu cinnteach gu bheil thu airson am post seo a sguabadh às?",
   "confirmations.delete_list.confirm": "Sguab às",
   "confirmations.delete_list.message": "A bheil thu cinnteach gu bheil thu airson an liosta seo a sguabadh às gu buan?",
   "confirmations.discard_edit_media.confirm": "Tilg air falbh",
   "confirmations.discard_edit_media.message": "Tha atharraichean gun sàbhaladh agad ann an tuairisgeul no ro-shealladh a’ mheadhain, a bheil thu airson an tilgeil air falbh co-dhiù?",
-  "confirmations.domain_block.confirm": "Bac am frithealaiche",
-  "confirmations.domain_block.message": "A bheil thu cinnteach dha-rìribh gu bheil thu airson an àrainn {domain} a bhacadh uile gu lèir? Mar as trice, foghnaidh gun dèan thu bacadh no mùchadh no dhà gu sònraichte agus bhiodh sin na b’ fheàrr. Chan fhaic thu susbaint on àrainn ud air loidhne-ama phoblach sam bith no am measg nam brathan agad. Thèid an luchd-leantainn agad on àrainn ud a thoirt air falbh.",
   "confirmations.edit.confirm": "Deasaich",
   "confirmations.edit.message": "Ma nì thu deasachadh an-dràsta, thèid seo a sgrìobhadh thairis air an teachdaireachd a tha thu a’ sgrìobhadh an-dràsta. A bheil thu cinnteach gu bheil thu airson leantainn air adhart?",
   "confirmations.logout.confirm": "Clàraich a-mach",
diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json
index d64789b86cb120..a60fa915047c4a 100644
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@@ -169,27 +169,30 @@
   "compose_form.spoiler_placeholder": "Aviso sobre o contido (optativo)",
   "confirmation_modal.cancel": "Cancelar",
   "confirmations.block.confirm": "Bloquear",
-  "confirmations.cancel_follow_request.confirm": "Retirar solicitude",
-  "confirmations.cancel_follow_request.message": "Tes a certeza de querer retirar a solicitude para seguir a {name}?",
   "confirmations.delete.confirm": "Eliminar",
   "confirmations.delete.message": "Tes a certeza de querer eliminar esta publicación?",
+  "confirmations.delete.title": "Eliminar a publicación?",
   "confirmations.delete_list.confirm": "Eliminar",
   "confirmations.delete_list.message": "Tes a certeza de querer eliminar de xeito permanente esta listaxe?",
+  "confirmations.delete_list.title": "Eliminar a lista?",
   "confirmations.discard_edit_media.confirm": "Descartar",
   "confirmations.discard_edit_media.message": "Tes cambios sen gardar para a vista previa ou descrición do multimedia, descartamos os cambios?",
-  "confirmations.domain_block.confirm": "Bloquear servidor",
-  "confirmations.domain_block.message": "Tes a certeza de querer bloquear todo de {domain}? Na meirande parte dos casos uns bloqueos ou silenciados específicos son suficientes. Non verás máis o contido deste dominio en ningunha cronoloxía pública ou nas túas notificacións. As túas seguidoras deste dominio serán eliminadas.",
   "confirmations.edit.confirm": "Editar",
   "confirmations.edit.message": "Ao editar sobrescribirás a mensaxe que estás a compor. Tes a certeza de que queres continuar?",
+  "confirmations.edit.title": "Editar a publicación?",
   "confirmations.logout.confirm": "Pechar sesión",
   "confirmations.logout.message": "Desexas pechar a sesión?",
+  "confirmations.logout.title": "Pechar sesión?",
   "confirmations.mute.confirm": "Acalar",
   "confirmations.redraft.confirm": "Eliminar e reescribir",
   "confirmations.redraft.message": "Tes a certeza de querer eliminar esta publicación e reescribila? Perderás as promocións e favorecementos, e as respostas á publicación orixinal ficarán orfas.",
+  "confirmations.redraft.title": "Eliminar e reescribir a publicación?",
   "confirmations.reply.confirm": "Responder",
   "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.title": "Deixar de seguir á usuaria?",
   "conversation.delete": "Eliminar conversa",
   "conversation.mark_as_read": "Marcar como lido",
   "conversation.open": "Ver conversa",
@@ -507,6 +510,7 @@
   "notification_requests.title": "Notificacións filtradas",
   "notifications.clear": "Limpar notificacións",
   "notifications.clear_confirmation": "Tes a certeza de querer limpar de xeito permanente todas as túas notificacións?",
+  "notifications.clear_title": "Limpar as notificacións?",
   "notifications.column_settings.admin.report": "Novas denuncias:",
   "notifications.column_settings.admin.sign_up": "Novas usuarias:",
   "notifications.column_settings.alert": "Notificacións de escritorio",
diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json
index 3687df7b87b2b6..da9049480425b1 100644
--- a/app/javascript/mastodon/locales/he.json
+++ b/app/javascript/mastodon/locales/he.json
@@ -169,16 +169,12 @@
   "compose_form.spoiler_placeholder": "אזהרת תוכן (לא חובה)",
   "confirmation_modal.cancel": "ביטול",
   "confirmations.block.confirm": "לחסום",
-  "confirmations.cancel_follow_request.confirm": "ויתור על בקשה",
-  "confirmations.cancel_follow_request.message": "לבטל את בקשת המעקב אחרי {name}?",
   "confirmations.delete.confirm": "למחוק",
   "confirmations.delete.message": "בטוח/ה שאת/ה רוצה למחוק את ההודעה?",
   "confirmations.delete_list.confirm": "למחוק",
   "confirmations.delete_list.message": "האם אתם בטוחים שאתם רוצים למחוק את הרשימה לצמיתות?",
   "confirmations.discard_edit_media.confirm": "השלך",
   "confirmations.discard_edit_media.message": "יש לך שינויים לא שמורים לתיאור המדיה. להשליך אותם בכל זאת?",
-  "confirmations.domain_block.confirm": "חסימת שרת",
-  "confirmations.domain_block.message": "בטוחה שברצונך באמת לחסום את קהילת {domain}? ברב המקרים השתקה וחסימה של מספר משתמשים עשוייה להספיק. לא תראי תוכל מכלל שם המתחם בפידים הציבוריים או בהתראות שלך. העוקבים שלך מהקהילה הזאת יוסרו",
   "confirmations.edit.confirm": "עריכה",
   "confirmations.edit.message": "עריכה תדרוס את ההודעה שכבר התחלת לכתוב. האם להמשיך?",
   "confirmations.logout.confirm": "התנתקות",
diff --git a/app/javascript/mastodon/locales/hi.json b/app/javascript/mastodon/locales/hi.json
index 89c71207f003bb..c2a961b32c668a 100644
--- a/app/javascript/mastodon/locales/hi.json
+++ b/app/javascript/mastodon/locales/hi.json
@@ -166,16 +166,12 @@
   "compose_form.spoiler_placeholder": "सामग्री चेतावनी (वैकल्पिक)",
   "confirmation_modal.cancel": "रद्द करें",
   "confirmations.block.confirm": "ब्लॉक",
-  "confirmations.cancel_follow_request.confirm": "रिक्वेस्ट वापस लें",
-  "confirmations.cancel_follow_request.message": "क्या आप सुनिश्चित है की आप {name} का फॉलो रिक्वेस्ट वापिस लेना चाहते हैं?",
   "confirmations.delete.confirm": "मिटाए",
   "confirmations.delete.message": "क्या आप वाकई इस स्टेटस को हटाना चाहते हैं?",
   "confirmations.delete_list.confirm": "मिटाए",
   "confirmations.delete_list.message": "क्या आप वाकई इस लिस्ट को हमेशा के लिये मिटाना चाहते हैं?",
   "confirmations.discard_edit_media.confirm": "डिस्कार्ड",
   "confirmations.discard_edit_media.message": "लिस्ट में जोड़ें",
-  "confirmations.domain_block.confirm": "सर्वर ब्लॉक करें",
-  "confirmations.domain_block.message": "क्या आप वास्तव में, वास्तव में आप पूरे {domain} को ब्लॉक करना चाहते हैं? ज्यादातर मामलों में कुछ लक्षित ब्लॉक या म्यूट पर्याप्त और बेहतर हैं। आप किसी भी सार्वजनिक समय-सीमा या अपनी सूचनाओं में उस डोमेन की सामग्री नहीं देखेंगे। उस डोमेन से आपके फॉलोवर्स को हटा दिया जाएगा।",
   "confirmations.edit.confirm": "संशोधित करें",
   "confirmations.edit.message": "अभी संपादन किया तो वो संदेश मिट जायेगा जिसे आप लिख रहे थे। क्या आप जारी रखना चाहते हैं?",
   "confirmations.logout.confirm": "लॉग आउट करें",
diff --git a/app/javascript/mastodon/locales/hr.json b/app/javascript/mastodon/locales/hr.json
index 5d087dae948b7b..5598732465d23e 100644
--- a/app/javascript/mastodon/locales/hr.json
+++ b/app/javascript/mastodon/locales/hr.json
@@ -144,14 +144,12 @@
   "compose_form.spoiler.unmarked": "Tekst nije skriven",
   "confirmation_modal.cancel": "Otkaži",
   "confirmations.block.confirm": "Blokiraj",
-  "confirmations.cancel_follow_request.confirm": "Povuci zahtjev",
   "confirmations.delete.confirm": "Obriši",
   "confirmations.delete.message": "Stvarno želite obrisati ovaj toot?",
   "confirmations.delete_list.confirm": "Obriši",
   "confirmations.delete_list.message": "Jeste li sigurni da želite trajno obrisati ovu listu?",
   "confirmations.discard_edit_media.confirm": "Odbaciti",
   "confirmations.discard_edit_media.message": "Postoje nespremljene promjene u opisu medija ili u pretpregledu, svejedno ih odbaciti?",
-  "confirmations.domain_block.message": "Jeste li zaista, zaista sigurni da želite blokirati cijelu domenu {domain}? U većini slučajeva dovoljno je i preferirano nekoliko ciljanih blokiranja ili utišavanja. Nećete vidjeti sadržaj s te domene ni u kojim javnim vremenskim crtama ili Vašim obavijestima. Vaši pratitelji s te domene bit će uklonjeni.",
   "confirmations.edit.confirm": "Uredi",
   "confirmations.logout.confirm": "Odjavi se",
   "confirmations.logout.message": "Jeste li sigurni da se želite odjaviti?",
diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json
index fd9ce38eb120ac..88eeeff9524535 100644
--- a/app/javascript/mastodon/locales/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@@ -169,27 +169,30 @@
   "compose_form.spoiler_placeholder": "Tartalmi figyelmeztetés (opcionális)",
   "confirmation_modal.cancel": "Mégsem",
   "confirmations.block.confirm": "Letiltás",
-  "confirmations.cancel_follow_request.confirm": "Kérés visszavonása",
-  "confirmations.cancel_follow_request.message": "Biztos, hogy visszavonod a(z) {name} felhasználóra vonatkozó követési kérésedet?",
   "confirmations.delete.confirm": "Törlés",
   "confirmations.delete.message": "Biztos, hogy törölni szeretnéd ezt a bejegyzést?",
+  "confirmations.delete.title": "Törlöd a bejegyzést?",
   "confirmations.delete_list.confirm": "Törlés",
   "confirmations.delete_list.message": "Biztos, hogy véglegesen törölni szeretnéd ezt a listát?",
+  "confirmations.delete_list.title": "Törlöd a listát?",
   "confirmations.discard_edit_media.confirm": "Elvetés",
   "confirmations.discard_edit_media.message": "Mentetlen változtatásaid vannak a média leírásában vagy előnézetében, mindenképp elveted?",
-  "confirmations.domain_block.confirm": "Kiszolgáló letiltása",
-  "confirmations.domain_block.message": "Biztos, hogy le szeretnéd tiltani a teljes {domain} domaint? A legtöbb esetben néhány célzott tiltás vagy némítás elegendő, és kívánatosabb megoldás. Semmilyen tartalmat nem fogsz látni ebből a domainből se az idővonalakon, se az értesítésekben. Az ebben a domainben lévő követőidet is eltávolítjuk.",
   "confirmations.edit.confirm": "Szerkesztés",
   "confirmations.edit.message": "Ha most szerkeszted, ez felülírja a most szerkesztés alatt álló üzenetet. Mégis ezt szeretnéd?",
+  "confirmations.edit.title": "Felülírod a bejegyzést?",
   "confirmations.logout.confirm": "Kijelentkezés",
   "confirmations.logout.message": "Biztos, hogy kijelentkezel?",
+  "confirmations.logout.title": "Kijelentkezel?",
   "confirmations.mute.confirm": "Némítás",
   "confirmations.redraft.confirm": "Törlés és újraírás",
   "confirmations.redraft.message": "Biztos, hogy ezt a bejegyzést szeretnéd törölni és újraírni? Minden megtolást és kedvencnek jelölést elvesztesz, az eredetire adott válaszok pedig elárvulnak.",
+  "confirmations.redraft.title": "Törlöd és újraírod a bejegyzést?",
   "confirmations.reply.confirm": "Válasz",
   "confirmations.reply.message": "Ha most válaszolsz, ez felülírja a most szerkesztés alatt álló üzenetet. Mégis ezt szeretnéd?",
+  "confirmations.reply.title": "Felülírod a bejegyzést?",
   "confirmations.unfollow.confirm": "Követés visszavonása",
   "confirmations.unfollow.message": "Biztos, hogy vissza szeretnéd vonni {name} követését?",
+  "confirmations.unfollow.title": "Megszünteted a felhasználó követését?",
   "conversation.delete": "Beszélgetés törlése",
   "conversation.mark_as_read": "Megjelölés olvasottként",
   "conversation.open": "Beszélgetés megtekintése",
@@ -507,6 +510,7 @@
   "notification_requests.title": "Szűrt értesítések",
   "notifications.clear": "Értesítések törlése",
   "notifications.clear_confirmation": "Biztos, hogy véglegesen törölni akarod az összes értesítésed?",
+  "notifications.clear_title": "Törlöd az értesítéseket?",
   "notifications.column_settings.admin.report": "Új jelentések:",
   "notifications.column_settings.admin.sign_up": "Új regisztrálók:",
   "notifications.column_settings.alert": "Asztali értesítések",
diff --git a/app/javascript/mastodon/locales/hy.json b/app/javascript/mastodon/locales/hy.json
index 4a197185e30c22..e9b9e85ff9ee71 100644
--- a/app/javascript/mastodon/locales/hy.json
+++ b/app/javascript/mastodon/locales/hy.json
@@ -121,13 +121,11 @@
   "compose_form.spoiler.unmarked": "Տեքստը թաքցուած չէ",
   "confirmation_modal.cancel": "Չեղարկել",
   "confirmations.block.confirm": "Արգելափակել",
-  "confirmations.cancel_follow_request.confirm": "Կասեցնել հայցը",
   "confirmations.delete.confirm": "Ջնջել",
   "confirmations.delete.message": "Վստա՞հ ես, որ ուզում ես ջնջել այս գրառումը։",
   "confirmations.delete_list.confirm": "Ջնջել",
   "confirmations.delete_list.message": "Վստա՞հ ես, որ ուզում ես մշտապէս ջնջել այս ցանկը։",
   "confirmations.discard_edit_media.confirm": "Չեղարկել",
-  "confirmations.domain_block.message": "Հաստատ֊հաստա՞տ վստահ ես, որ ուզում ես արգելափակել ամբողջ {domain} տիրոյթը։ Սովորաբար մի երկու թիրախաւորուած արգելափակում կամ լռեցում բաւական է ու նախընտրելի։",
   "confirmations.edit.confirm": "Խմբագրել",
   "confirmations.logout.confirm": "Ելք",
   "confirmations.logout.message": "Համոզո՞ւած ես, որ ուզում ես դուրս գալ",
diff --git a/app/javascript/mastodon/locales/ia.json b/app/javascript/mastodon/locales/ia.json
index 22f9ec7dd52df8..70e48f69486185 100644
--- a/app/javascript/mastodon/locales/ia.json
+++ b/app/javascript/mastodon/locales/ia.json
@@ -169,16 +169,12 @@
   "compose_form.spoiler_placeholder": "Advertimento de contento (optional)",
   "confirmation_modal.cancel": "Cancellar",
   "confirmations.block.confirm": "Blocar",
-  "confirmations.cancel_follow_request.confirm": "Retirar requesta",
-  "confirmations.cancel_follow_request.message": "Es tu secur que tu vole retirar tu requesta de sequer {name}?",
   "confirmations.delete.confirm": "Deler",
   "confirmations.delete.message": "Es tu secur que tu vole deler iste message?",
   "confirmations.delete_list.confirm": "Deler",
   "confirmations.delete_list.message": "Es tu secur que tu vole deler permanentemente iste lista?",
   "confirmations.discard_edit_media.confirm": "Abandonar",
   "confirmations.discard_edit_media.message": "Tu ha cambiamentos non salvate in le description o previsualisation del objecto multimedial. Abandonar los?",
-  "confirmations.domain_block.confirm": "Blocar le servitor",
-  "confirmations.domain_block.message": "Es tu realmente, absolutemente secur de voler blocar tote le dominio {domain}? In le major parte del casos es preferibile blocar o silentiar alcun personas specific. Si tu bloca tote le dominio, tu non videra alcun contento de ille dominio in alcun chronologia public o in tu notificationes, e tu sequitores de ille dominio essera removite.",
   "confirmations.edit.confirm": "Modificar",
   "confirmations.edit.message": "Si tu modifica isto ora, le message in curso de composition essera perdite. Es tu secur de voler continuar?",
   "confirmations.logout.confirm": "Clauder session",
diff --git a/app/javascript/mastodon/locales/id.json b/app/javascript/mastodon/locales/id.json
index e139796bf1f290..e740fb009cf3f8 100644
--- a/app/javascript/mastodon/locales/id.json
+++ b/app/javascript/mastodon/locales/id.json
@@ -166,16 +166,12 @@
   "compose_form.spoiler_placeholder": "Peringatan konten (opsional)",
   "confirmation_modal.cancel": "Batal",
   "confirmations.block.confirm": "Blokir",
-  "confirmations.cancel_follow_request.confirm": "Batalkan permintaan",
-  "confirmations.cancel_follow_request.message": "Apakah Anda yakin ingin membatalkan permintaan Anda untuk mengikuti {name}?",
   "confirmations.delete.confirm": "Hapus",
   "confirmations.delete.message": "Apakah Anda yakin untuk menghapus kiriman ini?",
   "confirmations.delete_list.confirm": "Hapus",
   "confirmations.delete_list.message": "Apakah Anda yakin untuk menghapus daftar ini secara permanen?",
   "confirmations.discard_edit_media.confirm": "Buang",
   "confirmations.discard_edit_media.message": "Anda belum menyimpan perubahan deskripsi atau pratinjau media, buang saja?",
-  "confirmations.domain_block.confirm": "Blokir server",
-  "confirmations.domain_block.message": "Apakah Anda benar-benar yakin untuk memblokir keseluruhan {domain}? Dalam kasus tertentu beberapa pemblokiran atau penyembunyian lebih baik.",
   "confirmations.edit.confirm": "Ubah",
   "confirmations.edit.message": "Mengubah akan menimpa pesan yang sedang anda tulis. Apakah anda yakin ingin melanjutkan?",
   "confirmations.logout.confirm": "Keluar",
diff --git a/app/javascript/mastodon/locales/ie.json b/app/javascript/mastodon/locales/ie.json
index 3ece43918b19af..d672b042219e48 100644
--- a/app/javascript/mastodon/locales/ie.json
+++ b/app/javascript/mastodon/locales/ie.json
@@ -166,16 +166,12 @@
   "compose_form.spoiler_placeholder": "Advertiment de contenete (optional)",
   "confirmation_modal.cancel": "Anullar",
   "confirmations.block.confirm": "Bloccar",
-  "confirmations.cancel_follow_request.confirm": "Retraer petition",
-  "confirmations.cancel_follow_request.message": "Esque tu vermen vole retraer tui petition sequer {name}?",
   "confirmations.delete.confirm": "Deleter",
   "confirmations.delete.message": "Esque tu vermen vole deleter ti-ci posta?",
   "confirmations.delete_list.confirm": "Deleter",
   "confirmations.delete_list.message": "Esque tu vermen vole permanentmen deleter ti-ci liste?",
   "confirmations.discard_edit_media.confirm": "Forjettar",
   "confirmations.discard_edit_media.message": "Tu have ínconservat changes al descrition de medie o al previse, forjettar les sin egarda?",
-  "confirmations.domain_block.confirm": "Bloccar servitor",
-  "confirmations.domain_block.message": "Esque tu es certissim que tu vole bloccar li tot {domain}? In mult casus, bloccar o silentiar quelc specific contos es suficent e preferibil. Tu ne va vider contenete de ti dominia in quelcunc public témpor-linea o in tui notificationes. Tui sequitores de ti dominia va esser removet.",
   "confirmations.edit.confirm": "Redacter",
   "confirmations.edit.message": "Redacter nu va remplazzar li missage quel tu actualmen composi. Esque tu vermen vole proceder?",
   "confirmations.logout.confirm": "Exear",
diff --git a/app/javascript/mastodon/locales/io.json b/app/javascript/mastodon/locales/io.json
index 839939687d219f..6ff957bc800d67 100644
--- a/app/javascript/mastodon/locales/io.json
+++ b/app/javascript/mastodon/locales/io.json
@@ -147,15 +147,12 @@
   "compose_form.spoiler.unmarked": "Text is not hidden",
   "confirmation_modal.cancel": "Anulez",
   "confirmations.block.confirm": "Restriktez",
-  "confirmations.cancel_follow_request.confirm": "Desendez demando",
-  "confirmations.cancel_follow_request.message": "Ka vu certe volas desendar vua demando di sequar {name}?",
   "confirmations.delete.confirm": "Efacez",
   "confirmations.delete.message": "Are you sure you want to delete this status?",
   "confirmations.delete_list.confirm": "Efacez",
   "confirmations.delete_list.message": "Ka vu certe volas netempale efacar ca listo?",
   "confirmations.discard_edit_media.confirm": "Efacez",
   "confirmations.discard_edit_media.message": "Vu havas nesparita chanji di mediodeskript o prevido, vu volas jus efacar?",
-  "confirmations.domain_block.message": "Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable.",
   "confirmations.edit.confirm": "Modifikez",
   "confirmations.edit.message": "Modifikar nun remplasos la mesajo quon vu nune skribas. Ka vu certe volas procedar?",
   "confirmations.logout.confirm": "Ekirez",
diff --git a/app/javascript/mastodon/locales/is.json b/app/javascript/mastodon/locales/is.json
index 27d23aafd0e5c8..f145817c52a7a6 100644
--- a/app/javascript/mastodon/locales/is.json
+++ b/app/javascript/mastodon/locales/is.json
@@ -169,27 +169,30 @@
   "compose_form.spoiler_placeholder": "Aðvörun vegna efnis (valkvætt)",
   "confirmation_modal.cancel": "Hætta við",
   "confirmations.block.confirm": "Útiloka",
-  "confirmations.cancel_follow_request.confirm": "Taka beiðni til baka",
-  "confirmations.cancel_follow_request.message": "Ertu viss um að þú viljir taka til baka beiðnina um að fylgjast með {name}?",
   "confirmations.delete.confirm": "Eyða",
   "confirmations.delete.message": "Ertu viss um að þú viljir eyða þessari færslu?",
+  "confirmations.delete.title": "Eyða færslu?",
   "confirmations.delete_list.confirm": "Eyða",
   "confirmations.delete_list.message": "Ertu viss um að þú viljir eyða þessum lista endanlega?",
+  "confirmations.delete_list.title": "Eyða lista?",
   "confirmations.discard_edit_media.confirm": "Henda",
   "confirmations.discard_edit_media.message": "Þú ert með óvistaðar breytingar á lýsingu myndefnis eða forskoðunar, henda þeim samt?",
-  "confirmations.domain_block.confirm": "Útiloka netþjón",
-  "confirmations.domain_block.message": "Ertu alveg algjörlega viss um að þú viljir loka á allt {domain}? Í flestum tilfellum er vænlegra að nota færri en markvissari útilokanir eða að þagga niður tiltekna aðila. Þú munt ekki sjá efni frá þessu léni í neinum opinberum tímalínum eða í tilkynningunum þínum. Fylgjendur þínir frá þessu léni verða fjarlægðir.",
   "confirmations.edit.confirm": "Breyta",
   "confirmations.edit.message": "Ef þú breytir núna verður skrifað yfir skilaboðin sem þú ert að semja núna. Ertu viss um að þú viljir halda áfram?",
+  "confirmations.edit.title": "Skrifa yfir færslu?",
   "confirmations.logout.confirm": "Skrá út",
   "confirmations.logout.message": "Ertu viss um að þú viljir skrá þig út?",
+  "confirmations.logout.title": "Skrá út?",
   "confirmations.mute.confirm": "Þagga",
   "confirmations.redraft.confirm": "Eyða og endurvinna drög",
   "confirmations.redraft.message": "Ertu viss um að þú viljir eyða þessari færslu og enduvinna drögin? Eftirlæti og endurbirtingar munu glatast og svör við upprunalegu færslunni munu verða munaðarlaus.",
+  "confirmations.redraft.title": "Eyða og byrja ný drög að færslu?",
   "confirmations.reply.confirm": "Svara",
   "confirmations.reply.message": "Ef þú svarar núna verður skrifað yfir skilaboðin sem þú ert að semja núna. Ertu viss um að þú viljir halda áfram?",
+  "confirmations.reply.title": "Skrifa yfir færslu?",
   "confirmations.unfollow.confirm": "Hætta að fylgja",
   "confirmations.unfollow.message": "Ertu viss um að þú viljir hætta að fylgjast með {name}?",
+  "confirmations.unfollow.title": "Hætta að fylgjast með viðkomandi?",
   "conversation.delete": "Eyða samtali",
   "conversation.mark_as_read": "Merkja sem lesið",
   "conversation.open": "Skoða samtal",
@@ -507,6 +510,7 @@
   "notification_requests.title": "Síaðar tilkynningar",
   "notifications.clear": "Hreinsa tilkynningar",
   "notifications.clear_confirmation": "Ertu viss um að þú viljir endanlega eyða öllum tilkynningunum þínum?",
+  "notifications.clear_title": "Hreinsa tilkynningar?",
   "notifications.column_settings.admin.report": "Nýjar kærur:",
   "notifications.column_settings.admin.sign_up": "Nýjar skráningar:",
   "notifications.column_settings.alert": "Tilkynningar á skjáborði",
diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json
index 419b6bcd9f2312..c8c545922cf454 100644
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@@ -169,16 +169,12 @@
   "compose_form.spoiler_placeholder": "Contenuto sensibile (facoltativo)",
   "confirmation_modal.cancel": "Annulla",
   "confirmations.block.confirm": "Blocca",
-  "confirmations.cancel_follow_request.confirm": "Annulla la richiesta",
-  "confirmations.cancel_follow_request.message": "Sei sicuro di voler annullare la tua richiesta per seguire {name}?",
   "confirmations.delete.confirm": "Elimina",
   "confirmations.delete.message": "Sei sicuro di voler eliminare questo post?",
   "confirmations.delete_list.confirm": "Elimina",
   "confirmations.delete_list.message": "Sei sicuro/a di voler eliminare permanentemente questo elenco?",
   "confirmations.discard_edit_media.confirm": "Scarta",
   "confirmations.discard_edit_media.message": "Hai delle modifiche non salvate alla descrizione o anteprima del media, scartarle comunque?",
-  "confirmations.domain_block.confirm": "Blocca il server",
-  "confirmations.domain_block.message": "Sei davvero sicuro di voler bloccare l'intero {domain}? In gran parte dei casi, è sufficiente e preferibile bloccare o silenziare alcuni profili. Non visualizzerai i contenuti da quel dominio in alcuna cronologia pubblica o tra le tue notifiche. I tuoi seguaci da quel dominio saranno rimossi.",
   "confirmations.edit.confirm": "Modifica",
   "confirmations.edit.message": "Modificare ora sovrascriverà il messaggio che stai correntemente componendo. Sei sicuro di voler procedere?",
   "confirmations.logout.confirm": "Disconnettiti",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index 5168c1c0c0c0c9..a5b2c5b4d94f45 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -169,16 +169,12 @@
   "compose_form.spoiler_placeholder": "閲覧注意 (オプション)",
   "confirmation_modal.cancel": "キャンセル",
   "confirmations.block.confirm": "ブロック",
-  "confirmations.cancel_follow_request.confirm": "フォローリクエストを取り消す",
-  "confirmations.cancel_follow_request.message": "{name}に対するフォローリクエストを取り消しますか?",
   "confirmations.delete.confirm": "削除",
   "confirmations.delete.message": "本当に削除しますか？",
   "confirmations.delete_list.confirm": "削除",
   "confirmations.delete_list.message": "本当にこのリストを完全に削除しますか？",
   "confirmations.discard_edit_media.confirm": "破棄",
   "confirmations.discard_edit_media.message": "メディアの説明またはプレビューに保存されていない変更があります。それでも破棄しますか？",
-  "confirmations.domain_block.confirm": "サーバーをブロック",
-  "confirmations.domain_block.message": "本当に{domain}全体を非表示にしますか？ 多くの場合は個別にブロックやミュートするだけで充分であり、また好ましいです。公開タイムラインにそのドメインのコンテンツが表示されなくなり、通知も届かなくなります。そのドメインのフォロワーはアンフォローされます。",
   "confirmations.edit.confirm": "編集",
   "confirmations.edit.message": "今編集すると現在作成中のメッセージが上書きされます。本当に実行しますか？",
   "confirmations.logout.confirm": "ログアウト",
diff --git a/app/javascript/mastodon/locales/ka.json b/app/javascript/mastodon/locales/ka.json
index b2e67e143ed8c3..d61a29d7a33d18 100644
--- a/app/javascript/mastodon/locales/ka.json
+++ b/app/javascript/mastodon/locales/ka.json
@@ -74,7 +74,6 @@
   "confirmations.delete.message": "დარწმუნებული ხართ, გსურთ გააუქმოთ ეს სტატუსი?",
   "confirmations.delete_list.confirm": "გაუქმება",
   "confirmations.delete_list.message": "დარწმუნებული ხართ, გსურთ სამუდამოდ გააუქმოთ ეს სია?",
-  "confirmations.domain_block.message": "ნაღდად, ნაღდად, დარწმუნებული ხართ, გსურთ დაბლოკოთ მთელი {domain}? უმეტეს შემთხვევაში რამდენიმე გამიზნული ბლოკი ან გაჩუმება საკმარისი და უკეთესია. კონტენტს ამ დომენიდან ვერ იხილავთ ვერც ერთ ღია თაიმლაინზე ან თქვენს შეტყობინებებში. ამ დომენიდან არსებული მიმდევრები ამოიშლება.",
   "confirmations.mute.confirm": "გაჩუმება",
   "confirmations.redraft.confirm": "გაუქმება და გადანაწილება",
   "confirmations.unfollow.confirm": "ნუღარ მიჰყვები",
diff --git a/app/javascript/mastodon/locales/kab.json b/app/javascript/mastodon/locales/kab.json
index 776b3446a2e4c2..ea00b0eb232d21 100644
--- a/app/javascript/mastodon/locales/kab.json
+++ b/app/javascript/mastodon/locales/kab.json
@@ -146,7 +146,6 @@
   "confirmations.delete_list.confirm": "Kkes",
   "confirmations.delete_list.message": "Tebɣiḍ s tidet ad tekkseḍ umuɣ-agi i lebda?",
   "confirmations.discard_edit_media.confirm": "Sefsex",
-  "confirmations.domain_block.confirm": "Sewḥel aqeddac",
   "confirmations.edit.confirm": "Ẓreg",
   "confirmations.edit.message": "Abeddel tura ad d-yaru izen-nni i d-tegreḍ akka tura. Tetḥeqqeḍ tebɣiḍ ad tkemmleḍ?",
   "confirmations.logout.confirm": "Ffeɣ",
diff --git a/app/javascript/mastodon/locales/kk.json b/app/javascript/mastodon/locales/kk.json
index 74fb33a91ab42f..fbaa371843a73d 100644
--- a/app/javascript/mastodon/locales/kk.json
+++ b/app/javascript/mastodon/locales/kk.json
@@ -107,7 +107,6 @@
   "confirmations.delete.message": "Бұл жазбаны өшіресіз бе?",
   "confirmations.delete_list.confirm": "Өшіру",
   "confirmations.delete_list.message": "Бұл тізімді жоясыз ба шынымен?",
-  "confirmations.domain_block.message": "Бұл домендегі {domain} жазбаларды шынымен бұғаттайсыз ба? Кейде үнсіз қылып тастау да жеткілікті.",
   "confirmations.logout.confirm": "Шығу",
   "confirmations.logout.message": "Шығатыныңызға сенімдісіз бе?",
   "confirmations.mute.confirm": "Үнсіз қылу",
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index 6619cdb2d6014a..c36ba0c6476331 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -169,16 +169,12 @@
   "compose_form.spoiler_placeholder": "내용 경고 (선택사항)",
   "confirmation_modal.cancel": "취소",
   "confirmations.block.confirm": "차단",
-  "confirmations.cancel_follow_request.confirm": "요청 삭제",
-  "confirmations.cancel_follow_request.message": "정말 {name}님에 대한 팔로우 요청을 취소하시겠습니까?",
   "confirmations.delete.confirm": "삭제",
   "confirmations.delete.message": "정말로 이 게시물을 삭제하시겠습니까?",
   "confirmations.delete_list.confirm": "삭제",
   "confirmations.delete_list.message": "정말로 이 리스트를 영구적으로 삭제하시겠습니까?",
   "confirmations.discard_edit_media.confirm": "저장 안함",
   "confirmations.discard_edit_media.message": "미디어 설명이나 미리보기에 대한 저장하지 않은 변경사항이 있습니다. 버리시겠습니까?",
-  "confirmations.domain_block.confirm": "서버 차단",
-  "confirmations.domain_block.message": "정말로 {domain} 전체를 차단하시겠습니까? 대부분의 경우 개별 차단이나 뮤트로 충분합니다. 모든 공개 타임라인과 알림에서 해당 도메인에서 작성된 콘텐츠를 보지 못합니다. 해당 도메인에 속한 팔로워와의 관계가 사라집니다.",
   "confirmations.edit.confirm": "수정",
   "confirmations.edit.message": "지금 편집하면 작성 중인 메시지를 덮어씁니다. 진행이 확실한가요?",
   "confirmations.logout.confirm": "로그아웃",
diff --git a/app/javascript/mastodon/locales/ku.json b/app/javascript/mastodon/locales/ku.json
index 3821216a9a9d35..3d3c20424cf713 100644
--- a/app/javascript/mastodon/locales/ku.json
+++ b/app/javascript/mastodon/locales/ku.json
@@ -133,15 +133,12 @@
   "compose_form.spoiler.unmarked": "Hişyariya naverokê tevlî bike",
   "confirmation_modal.cancel": "Dev jê berde",
   "confirmations.block.confirm": "Asteng bike",
-  "confirmations.cancel_follow_request.confirm": "Daxwazê vekişîne",
-  "confirmations.cancel_follow_request.message": "Tu dixwazî ​​daxwaza xwe ya şopandina {name} vekşînî?",
   "confirmations.delete.confirm": "Jê bibe",
   "confirmations.delete.message": "Ma tu dixwazî vê şandiyê jê bibî?",
   "confirmations.delete_list.confirm": "Jê bibe",
   "confirmations.delete_list.message": "Tu ji dil dixwazî vê lîsteyê bi awayekî mayînde jê bibî?",
   "confirmations.discard_edit_media.confirm": "Biavêje",
   "confirmations.discard_edit_media.message": "Guhertinên neqedandî di danasîna an pêşdîtina medyayê de hene, wan bi her awayî bavêje?",
-  "confirmations.domain_block.message": "Tu pê bawerî ku tu dixwazî tevahiya {domain} asteng bikî? Di gelek rewşan de astengkirin an jî bêdengkirin têrê dike û tê hilbijartin. Tu nikarî naveroka vê navperê di demnameyê an jî agahdariyên xwe de bibînî. Şopînerên te yê di vê navperê wê werin jêbirin.",
   "confirmations.edit.confirm": "Serrast bike",
   "confirmations.logout.confirm": "Derkeve",
   "confirmations.logout.message": "Ma tu dixwazî ku derkevî?",
diff --git a/app/javascript/mastodon/locales/kw.json b/app/javascript/mastodon/locales/kw.json
index f59f342cbe051a..7ebe71b24cad9b 100644
--- a/app/javascript/mastodon/locales/kw.json
+++ b/app/javascript/mastodon/locales/kw.json
@@ -88,7 +88,6 @@
   "confirmations.delete.message": "Owgh hwi sur a vynnes dilea'n post ma?",
   "confirmations.delete_list.confirm": "Dilea",
   "confirmations.delete_list.message": "Owgh hwi sur a vynnes dilea'n rol ma yn fast?",
-  "confirmations.domain_block.message": "Owgh hwi wir, wir sur a vynnes lettya'n {domain} dhien? Y'n brassa rann a gasow, boghes lettyansow medrys po tawheansow yw lowr ha gwell. Ny wrewgh hwi gweles dalgh a'n worfarth na yn py amserlin boblek pynag po yn agas gwarnyansow. Agas holyoryon an worfarth na a vydh diles.",
   "confirmations.logout.confirm": "Digelmi",
   "confirmations.logout.message": "Owgh hwi sur a vynnes digelmi?",
   "confirmations.mute.confirm": "Tawhe",
diff --git a/app/javascript/mastodon/locales/lad.json b/app/javascript/mastodon/locales/lad.json
index 2dc360f9eda102..bbbcee886f89fa 100644
--- a/app/javascript/mastodon/locales/lad.json
+++ b/app/javascript/mastodon/locales/lad.json
@@ -164,16 +164,12 @@
   "compose_form.spoiler_placeholder": "Avertensya de kontenido (opsyonal)",
   "confirmation_modal.cancel": "Anula",
   "confirmations.block.confirm": "Bloka",
-  "confirmations.cancel_follow_request.confirm": "Anula solisitud",
-  "confirmations.cancel_follow_request.message": "Estas siguro ke keres anular tu solisitud de segir a {name}?",
   "confirmations.delete.confirm": "Efasa",
   "confirmations.delete.message": "Estas siguro ke keres efasar esta publikasyon?",
   "confirmations.delete_list.confirm": "Efasa",
   "confirmations.delete_list.message": "Estas siguro ke keres permanentemente efasar esta lista?",
   "confirmations.discard_edit_media.confirm": "Anula",
   "confirmations.discard_edit_media.message": "Tienes trokamientos no guadrados en la deskripsion o vista previa. Keres efasarlos entanto?",
-  "confirmations.domain_block.confirm": "Bloka sirvidor",
-  "confirmations.domain_block.message": "Estas totalmente siguro ke keres blokar todo el domeno {domain}? En djeneral unos kuantos blokos o silensiamientos son sufisientes i preferavles. No veras kontenido de akel domeno en dinguna linya de tiempo publika ni ent tus avizos. Tus suivantes de akel domeno seran kitados.",
   "confirmations.edit.confirm": "Edita",
   "confirmations.edit.message": "Si edites agora, kitaras el mesaj kualo estas eskriviendo aktualmente. Estas siguro ke keres fazerlo?",
   "confirmations.logout.confirm": "Sal",
diff --git a/app/javascript/mastodon/locales/lt.json b/app/javascript/mastodon/locales/lt.json
index 6899274f3e7d1d..37c37b63ebb3ba 100644
--- a/app/javascript/mastodon/locales/lt.json
+++ b/app/javascript/mastodon/locales/lt.json
@@ -169,16 +169,12 @@
   "compose_form.spoiler_placeholder": "Turinio įspėjimas (pasirinktinis)",
   "confirmation_modal.cancel": "Atšaukti",
   "confirmations.block.confirm": "Blokuoti",
-  "confirmations.cancel_follow_request.confirm": "Atšaukti prašymą",
-  "confirmations.cancel_follow_request.message": "Ar tikrai nori atšaukti savo prašymą sekti {name}?",
   "confirmations.delete.confirm": "Ištrinti",
   "confirmations.delete.message": "Ar tikrai nori ištrinti šį įrašą?",
   "confirmations.delete_list.confirm": "Ištrinti",
   "confirmations.delete_list.message": "Ar tikrai nori visam laikui ištrinti šį sąrašą?",
   "confirmations.discard_edit_media.confirm": "Atmesti",
   "confirmations.discard_edit_media.message": "Turi neišsaugotų medijos aprašymo ar peržiūros pakeitimų, vis tiek juos atmesti?",
-  "confirmations.domain_block.confirm": "Blokuoti serverį",
-  "confirmations.domain_block.message": "Ar tikrai, tikrai nori užblokuoti visą {domain}? Daugeliu atvejų užtenka kelių tikslinių blokavimų arba nutildymų. Šio domeno turinio nematysi jokiose viešose laiko skalėse ar pranešimuose. Tavo sekėjai iš to domeno bus pašalinti.",
   "confirmations.edit.confirm": "Redaguoti",
   "confirmations.edit.message": "Redaguojant dabar, bus perrašyta šiuo metu kuriama žinutė. Ar tikrai nori tęsti?",
   "confirmations.logout.confirm": "Atsijungti",
@@ -443,6 +439,8 @@
   "mute_modal.title": "Nutildyti naudotoją?",
   "mute_modal.you_wont_see_mentions": "Nematysi įrašus, kuriuose jie paminimi.",
   "mute_modal.you_wont_see_posts": "Jie vis tiek gali matyti tavo įrašus, bet tu nematysi jų.",
+  "name_and_others": "{name} ir {count, plural, one {# kitas} few {# kiti} many {# kito} other {# kitų}}",
+  "name_and_others_with_link": "{name} ir <a>{count, plural, one {# kitas} few {# kiti} many {# kito} other {# kitų}}</a>",
   "navigation_bar.about": "Apie",
   "navigation_bar.advanced_interface": "Atidaryti išplėstinę žiniatinklio sąsają",
   "navigation_bar.blocks": "Užblokuoti naudotojai",
@@ -470,6 +468,10 @@
   "navigation_bar.security": "Apsauga",
   "not_signed_in_indicator.not_signed_in": "Norint pasiekti šį išteklį, reikia prisijungti.",
   "notification.admin.report": "{name} pranešė {target}",
+  "notification.admin.report_account": "{name} pranešė {count, plural, one {# įrašą} few {# įrašus} many {# įrašo} other {# įrašų}} iš {target} kategorijai {category}",
+  "notification.admin.report_account_other": "{name} pranešė {count, plural, one {# įrašą} few {# įrašus} many {# įrašo} other {# įrašų}} iš {target}",
+  "notification.admin.report_statuses": "{name} pranešė {target} kategorijai {category}",
+  "notification.admin.report_statuses_other": "{name} pranešė {target}",
   "notification.admin.sign_up": "{name} užsiregistravo",
   "notification.favourite": "{name} pamėgo tavo įrašą",
   "notification.follow": "{name} seka tave",
@@ -485,6 +487,8 @@
   "notification.moderation_warning.action_silence": "Tavo paskyra buvo apribota.",
   "notification.moderation_warning.action_suspend": "Tavo paskyra buvo sustabdyta.",
   "notification.own_poll": "Tavo apklausa baigėsi",
+  "notification.poll": "Baigėsi apklausa, kurioje balsavai",
+  "notification.private_mention": "{name} privačiai paminėjo tave",
   "notification.reblog": "{name} pakėlė tavo įrašą",
   "notification.relationships_severance_event": "Prarasti sąryšiai su {name}",
   "notification.relationships_severance_event.learn_more": "Sužinoti daugiau",
@@ -500,6 +504,8 @@
   "notifications.column_settings.admin.report": "Naujos ataskaitos:",
   "notifications.column_settings.admin.sign_up": "Naujos registracijos:",
   "notifications.column_settings.alert": "Darbalaukio pranešimai",
+  "notifications.column_settings.beta.category": "Eksperimentinės funkcijos",
+  "notifications.column_settings.beta.grouping": "Grupuoti pranešimus",
   "notifications.column_settings.favourite": "Mėgstami:",
   "notifications.column_settings.filter_bar.advanced": "Rodyti visas kategorijas",
   "notifications.column_settings.filter_bar.category": "Spartaus filtro juosta",
@@ -660,9 +666,13 @@
   "report.unfollow_explanation": "Tu seki šią paskyrą. Jei nori nebematyti jų įrašų savo pagrindiniame sraute, nebesek jų.",
   "report_notification.attached_statuses": "Pridėti {count, plural, one {{count} įrašas} few {{count} įrašai} many {{count} įrašo} other {{count} įrašų}}",
   "report_notification.categories.legal": "Teisinės",
+  "report_notification.categories.legal_sentence": "nelegalus turinys",
   "report_notification.categories.other": "Kita",
+  "report_notification.categories.other_sentence": "kita",
   "report_notification.categories.spam": "Šlamštas",
+  "report_notification.categories.spam_sentence": "šlamštas",
   "report_notification.categories.violation": "Taisyklės pažeidimas",
+  "report_notification.categories.violation_sentence": "taisyklės pažeidimas",
   "report_notification.open": "Atidaryti ataskaitą",
   "search.no_recent_searches": "Nėra naujausių paieškų.",
   "search.placeholder": "Paieška",
diff --git a/app/javascript/mastodon/locales/lv.json b/app/javascript/mastodon/locales/lv.json
index d4623a8b31a344..42079f222f4bf2 100644
--- a/app/javascript/mastodon/locales/lv.json
+++ b/app/javascript/mastodon/locales/lv.json
@@ -163,15 +163,12 @@
   "compose_form.spoiler_placeholder": "Satura brīdinājums (pēc izvēles)",
   "confirmation_modal.cancel": "Atcelt",
   "confirmations.block.confirm": "Bloķēt",
-  "confirmations.cancel_follow_request.confirm": "Atsaukt pieprasījumu",
-  "confirmations.cancel_follow_request.message": "Vai tiešām vēlies atsaukt pieprasījumu sekot {name}?",
   "confirmations.delete.confirm": "Dzēst",
   "confirmations.delete.message": "Vai tiešām vēlies dzēst šo ierakstu?",
   "confirmations.delete_list.confirm": "Dzēst",
   "confirmations.delete_list.message": "Vai tiešām neatgriezeniski izdzēst šo sarakstu?",
   "confirmations.discard_edit_media.confirm": "Atmest",
   "confirmations.discard_edit_media.message": "Ir nesaglabātas izmaiņas informācijas nesēja aprakstā vai priekšskatījumā. Vēlies tās atmest tik un tā?",
-  "confirmations.domain_block.message": "Vai tu tiešām vēlies bloķēt visu domēnu {domain}? Parasti pietiek, ja nobloķē vai apklusini kādu. Tu neredzēsi saturu vai paziņojumus no šī domēna nevienā laika līnijā. Tavi sekotāji no šī domēna tiks noņemti.",
   "confirmations.edit.confirm": "Labot",
   "confirmations.edit.message": "Labošana pārrakstīs ziņojumu, kas šobrīd tiek sastādīts. Vai tiešām turpināt?",
   "confirmations.logout.confirm": "Iziet",
diff --git a/app/javascript/mastodon/locales/mk.json b/app/javascript/mastodon/locales/mk.json
index a09ad98ebf650c..b1f3b9fab948fd 100644
--- a/app/javascript/mastodon/locales/mk.json
+++ b/app/javascript/mastodon/locales/mk.json
@@ -84,7 +84,6 @@
   "confirmations.delete.message": "Сигурни сте дека го бришите статусот?",
   "confirmations.delete_list.confirm": "Избриши",
   "confirmations.delete_list.message": "Дали сте сигурни дека сакате да го избришете списоков?",
-  "confirmations.domain_block.message": "Дали скроз сте сигурни дека ќе блокирате сѐ од {domain}? Во повеќето случаеви неколку таргетирани блокирања или заќутувања се доволни и предложени. Нема да ја видите содржината од тој домеин во никој јавен времеплов или вашите нотификации. Вашите следбеници од тој домеин ќе бидат остранети.",
   "confirmations.logout.confirm": "Одјави се",
   "confirmations.logout.message": "Дали сте сигурни дека сакате да се одјавите?",
   "confirmations.mute.confirm": "Заќути",
diff --git a/app/javascript/mastodon/locales/ms.json b/app/javascript/mastodon/locales/ms.json
index dc34867106d497..17af770b9b5970 100644
--- a/app/javascript/mastodon/locales/ms.json
+++ b/app/javascript/mastodon/locales/ms.json
@@ -158,15 +158,12 @@
   "compose_form.spoiler_placeholder": "Amaran kandungan (pilihan)",
   "confirmation_modal.cancel": "Batal",
   "confirmations.block.confirm": "Sekat",
-  "confirmations.cancel_follow_request.confirm": "Tarik balik permintaan",
-  "confirmations.cancel_follow_request.message": "Adakah anda pasti ingin menarik balik permintaan anda untuk mengikut {name}?",
   "confirmations.delete.confirm": "Padam",
   "confirmations.delete.message": "Adakah anda pasti anda ingin memadam hantaran ini?",
   "confirmations.delete_list.confirm": "Padam",
   "confirmations.delete_list.message": "Adakah anda pasti anda ingin memadam senarai ini secara kekal?",
   "confirmations.discard_edit_media.confirm": "Singkir",
   "confirmations.discard_edit_media.message": "Anda belum menyimpan perubahan pada penerangan atau pratonton media. Anda ingin membuangnya?",
-  "confirmations.domain_block.message": "Adakah anda betul-betul, sungguh-sungguh pasti anda ingin menyekat keseluruhan {domain}? Selalunya, beberapa sekatan atau pembisuan tersasar sudah memadai dan lebih diutamakan. Anda tidak akan nampak kandungan daripada domain tersebut di mana-mana garis masa awam mahupun pemberitahuan anda. Pengikut anda daripada domain tersebut juga akan dibuang.",
   "confirmations.edit.confirm": "Sunting",
   "confirmations.edit.message": "Mengedit sekarang akan menimpa mesej yang sedang anda karang. Adakah anda pasti mahu meneruskan?",
   "confirmations.logout.confirm": "Log keluar",
diff --git a/app/javascript/mastodon/locales/my.json b/app/javascript/mastodon/locales/my.json
index cb3ea9723bd5be..cb08d76bd3011f 100644
--- a/app/javascript/mastodon/locales/my.json
+++ b/app/javascript/mastodon/locales/my.json
@@ -148,15 +148,12 @@
   "compose_form.spoiler.unmarked": "Text is not hidden",
   "confirmation_modal.cancel": "ပယ်ဖျက်မည်",
   "confirmations.block.confirm": "ဘလော့မည်",
-  "confirmations.cancel_follow_request.confirm": "ပန်ကြားချက်ကို ပယ်ဖျက်မည်",
-  "confirmations.cancel_follow_request.message": "{name} ကို စောင့်ကြည့်ခြင်းအားပယ်ဖျက်ရန် သေချာပါသလား။",
   "confirmations.delete.confirm": "ဖျက်မည်",
   "confirmations.delete.message": "Are you sure you want to delete this status?",
   "confirmations.delete_list.confirm": "ဖျက်မည်",
   "confirmations.delete_list.message": "ဖျက်ရန် သေချာပါသလား?",
   "confirmations.discard_edit_media.confirm": "ဖယ်ထုတ်ပါ",
   "confirmations.discard_edit_media.message": "သင်သည် မီဒီယာဖော်ပြချက် သို့မဟုတ် အစမ်းကြည့်ရှုခြင်းတွင် မသိမ်းဆည်းရသေးသော အပြောင်းအလဲများရှိသည်။ မည်သို့ပင်ဖြစ်စေ ဖျက်ပစ်မည်လား။",
-  "confirmations.domain_block.message": "{domain} တစ်ခုလုံးကို ဘလော့လုပ်ရန် တကယ် သေချာပါသလား? များသောအားဖြင့် အနည်းစုကို ပစ်မှတ်ထား ဘလော့လုပ်ခြင်းသည် လုံလောက်ပါသည်။ ထို ဒိုမိန်းမှ အကြောင်းအရာ တစ်ခုမှ မြင်ရမည်မဟုတ်သည့်အပြင် ထို ဒိုမိန်းတွင်ရှိသော သင်၏ စောင့်ကြည့်သူများပါ ဖယ်ရှားပစ်မည်ဖြစ်သည်။",
   "confirmations.edit.confirm": "ပြင်ရန်",
   "confirmations.edit.message": "ယခုပြင်ဆင်ခြင်းတွင် သင်လက်ရှိမက်ဆေ့ချ်ကို ဖျက်ပစ်ပြီး အသစ်ရေးပါမည်။ ရှေ့ဆက်လိုသည်မှာ သေချာပါသလား။",
   "confirmations.logout.confirm": "အကောင့်မှထွက်မည်",
diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json
index 027c09280c85a2..100396456d7735 100644
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@@ -169,27 +169,30 @@
   "compose_form.spoiler_placeholder": "Inhoudswaarschuwing (optioneel)",
   "confirmation_modal.cancel": "Annuleren",
   "confirmations.block.confirm": "Blokkeren",
-  "confirmations.cancel_follow_request.confirm": "Verzoek annuleren",
-  "confirmations.cancel_follow_request.message": "Weet je zeker dat je jouw verzoek om {name} te volgen wilt annuleren?",
   "confirmations.delete.confirm": "Verwijderen",
   "confirmations.delete.message": "Weet je het zeker dat je dit bericht wilt verwijderen?",
+  "confirmations.delete.title": "Bericht verwijderen?",
   "confirmations.delete_list.confirm": "Verwijderen",
   "confirmations.delete_list.message": "Weet je zeker dat je deze lijst definitief wilt verwijderen?",
+  "confirmations.delete_list.title": "Lijst verwijderen?",
   "confirmations.discard_edit_media.confirm": "Weggooien",
   "confirmations.discard_edit_media.message": "Je hebt niet-opgeslagen wijzigingen in de mediabeschrijving of voorvertonning, wil je deze toch weggooien?",
-  "confirmations.domain_block.confirm": "Server blokkeren",
-  "confirmations.domain_block.message": "Weet je het echt heel erg zeker dat je alles van {domain} wilt blokkeren? In de meeste gevallen is het blokkeren of negeren van een paar specifieke personen voldoende en beter. Je ziet geen berichten van deze server meer op openbare tijdlijnen of in jouw meldingen. Jouw volgers van deze server worden verwijderd.",
   "confirmations.edit.confirm": "Bewerken",
   "confirmations.edit.message": "Door nu te reageren overschrijf je het bericht dat je op dit moment aan het schrijven bent. Weet je zeker dat je verder wil gaan?",
+  "confirmations.edit.title": "Bericht overschrijven?",
   "confirmations.logout.confirm": "Uitloggen",
   "confirmations.logout.message": "Weet je zeker dat je wilt uitloggen?",
+  "confirmations.logout.title": "Uitloggen?",
   "confirmations.mute.confirm": "Negeren",
   "confirmations.redraft.confirm": "Verwijderen en herschrijven",
   "confirmations.redraft.message": "Weet je zeker dat je dit bericht wilt verwijderen en herschrijven? Je verliest wel de boosts en favorieten, en de reacties op het originele bericht raak je kwijt.",
+  "confirmations.redraft.title": "Bericht verwijderen en herschrijven?",
   "confirmations.reply.confirm": "Reageren",
   "confirmations.reply.message": "Door nu te reageren overschrijf je het bericht dat je op dit moment aan het schrijven bent. Weet je zeker dat je verder wil gaan?",
+  "confirmations.reply.title": "Bericht overschrijven?",
   "confirmations.unfollow.confirm": "Ontvolgen",
   "confirmations.unfollow.message": "Weet je het zeker dat je {name} wilt ontvolgen?",
+  "confirmations.unfollow.title": "Gebruiker ontvolgen?",
   "conversation.delete": "Gesprek verwijderen",
   "conversation.mark_as_read": "Als gelezen markeren",
   "conversation.open": "Gesprek tonen",
@@ -507,6 +510,7 @@
   "notification_requests.title": "Gefilterde meldingen",
   "notifications.clear": "Meldingen verwijderen",
   "notifications.clear_confirmation": "Weet je het zeker dat je al jouw meldingen wilt verwijderen?",
+  "notifications.clear_title": "Meldingen verwijderen?",
   "notifications.column_settings.admin.report": "Nieuwe rapportages:",
   "notifications.column_settings.admin.sign_up": "Nieuwe registraties:",
   "notifications.column_settings.alert": "Desktopmeldingen",
diff --git a/app/javascript/mastodon/locales/nn.json b/app/javascript/mastodon/locales/nn.json
index f5efedb1aeefe0..66c85e64a8b260 100644
--- a/app/javascript/mastodon/locales/nn.json
+++ b/app/javascript/mastodon/locales/nn.json
@@ -169,16 +169,12 @@
   "compose_form.spoiler_placeholder": "Innhaldsåtvaring (valfritt)",
   "confirmation_modal.cancel": "Avbryt",
   "confirmations.block.confirm": "Blokker",
-  "confirmations.cancel_follow_request.confirm": "Trekk attende førespurnad",
-  "confirmations.cancel_follow_request.message": "Er du sikker på at du vil trekkje attende førespurnaden din om å fylgje {name}?",
   "confirmations.delete.confirm": "Slett",
   "confirmations.delete.message": "Er du sikker på at du vil sletta denne statusen?",
   "confirmations.delete_list.confirm": "Slett",
   "confirmations.delete_list.message": "Er du sikker på at du vil sletta denne lista for alltid?",
   "confirmations.discard_edit_media.confirm": "Forkast",
   "confirmations.discard_edit_media.message": "Du har ulagra endringar i mediaskildringa eller førehandsvisinga. Vil du forkasta dei likevel?",
-  "confirmations.domain_block.confirm": "Blokker tenaren",
-  "confirmations.domain_block.message": "Er du heilt, heilt sikker på at du vil skjula heile {domain}? I dei fleste tilfelle er det godt nok og føretrekt med nokre få målretta blokkeringar eller dempingar. Du kjem ikkje til å sjå innhald frå domenet i fødererte tidsliner eller i varsla dine. Fylgjarane dine frå domenet vert fjerna.",
   "confirmations.edit.confirm": "Rediger",
   "confirmations.edit.message": "Å redigera no vil overskriva den meldinga du er i ferd med å skriva. Er du sikker på at du vil halda fram?",
   "confirmations.logout.confirm": "Logg ut",
diff --git a/app/javascript/mastodon/locales/no.json b/app/javascript/mastodon/locales/no.json
index f2476bf14cde9d..0f9e0d5a79cbc4 100644
--- a/app/javascript/mastodon/locales/no.json
+++ b/app/javascript/mastodon/locales/no.json
@@ -158,15 +158,12 @@
   "compose_form.spoiler_placeholder": "Innholdsadvarsel (valgfritt)",
   "confirmation_modal.cancel": "Avbryt",
   "confirmations.block.confirm": "Blokkèr",
-  "confirmations.cancel_follow_request.confirm": "Trekk tilbake forespørsel",
-  "confirmations.cancel_follow_request.message": "Er du sikker på at du vil trekke tilbake forespørselen din for å følge {name}?",
   "confirmations.delete.confirm": "Slett",
   "confirmations.delete.message": "Er du sikker på at du vil slette dette innlegget?",
   "confirmations.delete_list.confirm": "Slett",
   "confirmations.delete_list.message": "Er du sikker på at du vil slette denne listen permanent?",
   "confirmations.discard_edit_media.confirm": "Forkast",
   "confirmations.discard_edit_media.message": "Du har ulagrede endringer i mediebeskrivelsen eller i forhåndsvisning, forkast dem likevel?",
-  "confirmations.domain_block.message": "Er du sikker på at du vil skjule hele domenet {domain}? I de fleste tilfeller er det bedre med målrettet blokkering eller demping.",
   "confirmations.edit.confirm": "Redigér",
   "confirmations.edit.message": "Å redigere nå vil overskrive meldingen du skriver for øyeblikket. Er du sikker på at du vil fortsette?",
   "confirmations.logout.confirm": "Logg ut",
diff --git a/app/javascript/mastodon/locales/oc.json b/app/javascript/mastodon/locales/oc.json
index c02c821afcec06..00701cbdf9be02 100644
--- a/app/javascript/mastodon/locales/oc.json
+++ b/app/javascript/mastodon/locales/oc.json
@@ -135,14 +135,11 @@
   "compose_form.spoiler.unmarked": "Lo tèxte es pas rescondut",
   "confirmation_modal.cancel": "Anullar",
   "confirmations.block.confirm": "Blocar",
-  "confirmations.cancel_follow_request.confirm": "Retirar la demandar",
-  "confirmations.cancel_follow_request.message": "Volètz vertadièrament retirar la demanda de seguiment de {name} ?",
   "confirmations.delete.confirm": "Escafar",
   "confirmations.delete.message": "Volètz vertadièrament escafar l’estatut ?",
   "confirmations.delete_list.confirm": "Suprimir",
   "confirmations.delete_list.message": "Volètz vertadièrament suprimir aquesta lista per totjorn ?",
   "confirmations.discard_edit_media.confirm": "Ignorar",
-  "confirmations.domain_block.message": "Volètz vertadièrament blocar complètament {domain} ? De còps cal pas que blocar o rescondre unas personas solament.\nVeiretz pas cap de contengut d’aquel domeni dins cap de flux public o dins vòstras notificacions. Vòstres seguidors d’aquel domeni seràn levats.",
   "confirmations.edit.confirm": "Modificar",
   "confirmations.logout.confirm": "Desconnexion",
   "confirmations.logout.message": "Volètz vertadièrament vos desconnectar ?",
diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json
index 75987f5d29c67f..5f8467f23c2bce 100644
--- a/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@@ -169,27 +169,30 @@
   "compose_form.spoiler_placeholder": "Ostrzeżenie o treści (opcjonalne)",
   "confirmation_modal.cancel": "Anuluj",
   "confirmations.block.confirm": "Zablokuj",
-  "confirmations.cancel_follow_request.confirm": "Wycofaj prośbę",
-  "confirmations.cancel_follow_request.message": "Czy na pewno chcesz wycofać prośbę o możliwość obserwowania {name}?",
   "confirmations.delete.confirm": "Usuń",
   "confirmations.delete.message": "Czy na pewno chcesz usunąć ten wpis?",
+  "confirmations.delete.title": "Usunąć wpis?",
   "confirmations.delete_list.confirm": "Usuń",
   "confirmations.delete_list.message": "Czy na pewno chcesz bezpowrotnie usunąć tą listę?",
+  "confirmations.delete_list.title": "Usunąć listę?",
   "confirmations.discard_edit_media.confirm": "Odrzuć",
   "confirmations.discard_edit_media.message": "Masz niezapisane zmiany w opisie lub podglądzie, odrzucić je mimo to?",
-  "confirmations.domain_block.confirm": "Blokuj serwer",
-  "confirmations.domain_block.message": "Czy na pewno chcesz zablokować całą domenę {domain}? Zwykle lepszym rozwiązaniem jest blokada lub wyciszenie kilku użytkowników.",
   "confirmations.edit.confirm": "Edytuj",
   "confirmations.edit.message": "Edytowanie wpisu nadpisze wiadomość, którą obecnie piszesz. Czy na pewno chcesz to zrobić?",
+  "confirmations.edit.title": "Nadpisać wpis?",
   "confirmations.logout.confirm": "Wyloguj",
   "confirmations.logout.message": "Czy na pewno chcesz się wylogować?",
+  "confirmations.logout.title": "Wylogować?",
   "confirmations.mute.confirm": "Wycisz",
   "confirmations.redraft.confirm": "Usuń i przeredaguj",
   "confirmations.redraft.message": "Czy na pewno chcesz usunąć i przeredagować ten wpis? Polubienia i podbicia zostaną utracone, a odpowiedzi do oryginalnego wpisu zostaną osierocone.",
+  "confirmations.redraft.title": "Usunąć i przeredagować wpis?",
   "confirmations.reply.confirm": "Odpowiedz",
   "confirmations.reply.message": "W ten sposób utracisz wpis który obecnie tworzysz. Czy na pewno chcesz to zrobić?",
+  "confirmations.reply.title": "Nadpisać wpis?",
   "confirmations.unfollow.confirm": "Przestań obserwować",
   "confirmations.unfollow.message": "Czy na pewno zamierzasz przestać obserwować {name}?",
+  "confirmations.unfollow.title": "Przestać obserwować?",
   "conversation.delete": "Usuń konwersację",
   "conversation.mark_as_read": "Oznacz jako przeczytane",
   "conversation.open": "Zobacz konwersację",
@@ -506,6 +509,7 @@
   "notification_requests.title": "Powiadomienia filtrowane",
   "notifications.clear": "Wyczyść powiadomienia",
   "notifications.clear_confirmation": "Czy na pewno chcesz bezpowrotnie usunąć wszystkie powiadomienia?",
+  "notifications.clear_title": "Wyczyścić powiadomienia?",
   "notifications.column_settings.admin.report": "Nowe zgłoszenia:",
   "notifications.column_settings.admin.sign_up": "Nowe rejestracje:",
   "notifications.column_settings.alert": "Powiadomienia na pulpicie",
diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json
index 9ebde4e6a48dfc..072cbf82cbd303 100644
--- a/app/javascript/mastodon/locales/pt-BR.json
+++ b/app/javascript/mastodon/locales/pt-BR.json
@@ -166,27 +166,30 @@
   "compose_form.spoiler_placeholder": "Aviso de conteúdo (opcional)",
   "confirmation_modal.cancel": "Cancelar",
   "confirmations.block.confirm": "Bloquear",
-  "confirmations.cancel_follow_request.confirm": "Cancelar a solicitação",
-  "confirmations.cancel_follow_request.message": "Tem certeza de que deseja cancelar seu pedido para seguir {name}?",
   "confirmations.delete.confirm": "Excluir",
   "confirmations.delete.message": "Você tem certeza de que deseja excluir este toot?",
+  "confirmations.delete.title": "Excluir publicação?",
   "confirmations.delete_list.confirm": "Excluir",
   "confirmations.delete_list.message": "Você tem certeza de que deseja excluir esta lista?",
+  "confirmations.delete_list.title": "Excluir lista?",
   "confirmations.discard_edit_media.confirm": "Descartar",
   "confirmations.discard_edit_media.message": "Há mudanças não salvas na descrição ou pré-visualização da mídia. Descartar assim mesmo?",
-  "confirmations.domain_block.confirm": "Servidor de blocos",
-  "confirmations.domain_block.message": "Você tem certeza de que deseja bloquear tudo de {domain}? Você não verá mais o conteúdo desta instância em nenhuma linha do tempo pública ou nas suas notificações. Seus seguidores desta instância serão removidos.",
   "confirmations.edit.confirm": "Editar",
   "confirmations.edit.message": "Editar agora irá substituir a mensagem que está sendo criando. Tem certeza de que deseja continuar?",
+  "confirmations.edit.title": "Sobrescrever o post?",
   "confirmations.logout.confirm": "Sair",
   "confirmations.logout.message": "Você tem certeza de que deseja sair?",
+  "confirmations.logout.title": "Sair da sessão?",
   "confirmations.mute.confirm": "Silenciar",
   "confirmations.redraft.confirm": "Excluir e rascunhar",
   "confirmations.redraft.message": "Você tem certeza de que quer apagar essa postagem e rascunhá-la? Favoritos e impulsos serão perdidos, e respostas à postagem original ficarão órfãs.",
+  "confirmations.redraft.title": "Excluir e rascunhar publicação?",
   "confirmations.reply.confirm": "Responder",
   "confirmations.reply.message": "Responder agora sobrescreverá o toot que você está compondo. Deseja continuar?",
+  "confirmations.reply.title": "Sobrescrever o post?",
   "confirmations.unfollow.confirm": "Deixar de seguir",
   "confirmations.unfollow.message": "Você tem certeza de que deseja deixar de seguir {name}?",
+  "confirmations.unfollow.title": "Deixar de seguir o usuário?",
   "conversation.delete": "Excluir conversa",
   "conversation.mark_as_read": "Marcar como lida",
   "conversation.open": "Ver conversa",
@@ -496,6 +499,7 @@
   "notification_requests.title": "Notificações filtradas",
   "notifications.clear": "Limpar notificações",
   "notifications.clear_confirmation": "Você tem certeza de que deseja limpar todas as suas notificações?",
+  "notifications.clear_title": "Limpar notificações?",
   "notifications.column_settings.admin.report": "Novas denúncias:",
   "notifications.column_settings.admin.sign_up": "Novas inscrições:",
   "notifications.column_settings.alert": "Notificações no computador",
diff --git a/app/javascript/mastodon/locales/pt-PT.json b/app/javascript/mastodon/locales/pt-PT.json
index d492602d2233ec..8cfd373837d420 100644
--- a/app/javascript/mastodon/locales/pt-PT.json
+++ b/app/javascript/mastodon/locales/pt-PT.json
@@ -169,27 +169,30 @@
   "compose_form.spoiler_placeholder": "Aviso de conteúdo (opcional)",
   "confirmation_modal.cancel": "Cancelar",
   "confirmations.block.confirm": "Bloquear",
-  "confirmations.cancel_follow_request.confirm": "Retirar pedido",
-  "confirmations.cancel_follow_request.message": "Tem a certeza que pretende retirar o pedido para seguir {name}?",
   "confirmations.delete.confirm": "Eliminar",
   "confirmations.delete.message": "De certeza que quer eliminar esta publicação?",
+  "confirmations.delete.title": "Eliminar publicação?",
   "confirmations.delete_list.confirm": "Eliminar",
   "confirmations.delete_list.message": "Tens a certeza de que deseja eliminar permanentemente esta lista?",
+  "confirmations.delete_list.title": "Eliminar lista?",
   "confirmations.discard_edit_media.confirm": "Descartar",
   "confirmations.discard_edit_media.message": "Tem alterações por guardar na descrição ou pré-visualização do conteúdo. Descartar mesmo assim?",
-  "confirmations.domain_block.confirm": "Bloquear servidor",
-  "confirmations.domain_block.message": "De certeza que queres bloquear completamente o domínio {domain}? Na maioria dos casos, silenciar ou bloquear alguns utilizadores é suficiente e é o recomendado. Não irás ver conteúdo daquele domínio em cronologia alguma nem nas tuas notificações. Os teus seguidores daquele domínio serão removidos.",
   "confirmations.edit.confirm": "Editar",
   "confirmations.edit.message": "Editar agora irá sobrescrever a mensagem que está a compor. Tem a certeza de que deseja continuar?",
+  "confirmations.edit.title": "Sobrescrever publicação?",
   "confirmations.logout.confirm": "Terminar sessão",
   "confirmations.logout.message": "Tem a certeza de que quer terminar a sessão?",
+  "confirmations.logout.title": "Terminar sessão?",
   "confirmations.mute.confirm": "Silenciar",
   "confirmations.redraft.confirm": "Eliminar & reescrever",
   "confirmations.redraft.message": "Tem a certeza de que quer eliminar e reescrever esta publicação? Os favoritos e partilhas perder-se-ão e as respostas à publicação original ficarão órfãs.",
+  "confirmations.redraft.title": "Eliminar e reescrever publicação?",
   "confirmations.reply.confirm": "Responder",
   "confirmations.reply.message": "Responder agora irá reescrever a mensagem que está a compor actualmente. Tem a certeza que quer continuar?",
+  "confirmations.reply.title": "Sobrescrever publicação?",
   "confirmations.unfollow.confirm": "Deixar de seguir",
   "confirmations.unfollow.message": "De certeza que queres deixar de seguir {name}?",
+  "confirmations.unfollow.title": "Deixar de seguir utilizador?",
   "conversation.delete": "Eliminar conversa",
   "conversation.mark_as_read": "Marcar como lida",
   "conversation.open": "Ver conversa",
@@ -507,6 +510,7 @@
   "notification_requests.title": "Notificações filtradas",
   "notifications.clear": "Limpar notificações",
   "notifications.clear_confirmation": "Queres mesmo limpar todas as notificações?",
+  "notifications.clear_title": "Limpar notificações?",
   "notifications.column_settings.admin.report": "Novas denúncias:",
   "notifications.column_settings.admin.sign_up": "Novas inscrições:",
   "notifications.column_settings.alert": "Notificações no ambiente de trabalho",
diff --git a/app/javascript/mastodon/locales/ro.json b/app/javascript/mastodon/locales/ro.json
index bbae7112696534..c4d05350202f19 100644
--- a/app/javascript/mastodon/locales/ro.json
+++ b/app/javascript/mastodon/locales/ro.json
@@ -153,15 +153,12 @@
   "compose_form.spoiler_placeholder": "Atenționare de conținut (opțional)",
   "confirmation_modal.cancel": "Anulează",
   "confirmations.block.confirm": "Blochează",
-  "confirmations.cancel_follow_request.confirm": "Retrage cererea",
-  "confirmations.cancel_follow_request.message": "Sunteți sigur că doriți să retrageți cererea dvs. de urmărire pentru {name}?",
   "confirmations.delete.confirm": "Elimină",
   "confirmations.delete.message": "Ești sigur că vrei să elimini această postare?",
   "confirmations.delete_list.confirm": "Elimină",
   "confirmations.delete_list.message": "Ești sigur că vrei să elimini definitiv această listă?",
   "confirmations.discard_edit_media.confirm": "Renunță",
   "confirmations.discard_edit_media.message": "Ai modificări nesalvate în descrierea sau previzualizarea media, renunți oricum?",
-  "confirmations.domain_block.message": "Ești absolut sigur că vrei să blochezi tot domeniul {domain}? În cele mai multe cazuri, raportarea sau blocarea anumitor lucruri este suficientă și de preferat. Nu vei mai vedea niciun conținut din acest domeniu în vreun flux public sau în vreo notificare. Abonații tăi din acest domeniu vor fi eliminați.",
   "confirmations.edit.confirm": "Modifică",
   "confirmations.edit.message": "Editarea acum va suprascrie mesajul pe care îl compuneți în prezent. Sunteți sigur că vreți să continuați?",
   "confirmations.logout.confirm": "Deconectare",
diff --git a/app/javascript/mastodon/locales/ru.json b/app/javascript/mastodon/locales/ru.json
index 971d6c77cadd8e..09155654421e01 100644
--- a/app/javascript/mastodon/locales/ru.json
+++ b/app/javascript/mastodon/locales/ru.json
@@ -166,16 +166,12 @@
   "compose_form.spoiler_placeholder": "Предупреждение о контенте (опционально)",
   "confirmation_modal.cancel": "Отмена",
   "confirmations.block.confirm": "Заблокировать",
-  "confirmations.cancel_follow_request.confirm": "Отменить запрос",
-  "confirmations.cancel_follow_request.message": "Вы уверены, что хотите отозвать свой запрос на подписку {name}?",
   "confirmations.delete.confirm": "Удалить",
   "confirmations.delete.message": "Вы уверены, что хотите удалить этот пост?",
   "confirmations.delete_list.confirm": "Удалить",
   "confirmations.delete_list.message": "Вы действительно хотите навсегда удалить этот список?",
   "confirmations.discard_edit_media.confirm": "Отменить",
   "confirmations.discard_edit_media.message": "У вас есть несохранённые изменения описания мультимедиа или предпросмотра, отменить их?",
-  "confirmations.domain_block.confirm": "Заблокировать сервер",
-  "confirmations.domain_block.message": "Вы точно уверены, что хотите заблокировать {domain} полностью? В большинстве случаев нескольких блокировок и игнорирований вполне достаточно. Вы перестанете видеть публичную ленту и уведомления оттуда. Ваши подписчики из этого домена будут удалены.",
   "confirmations.edit.confirm": "Редактировать",
   "confirmations.edit.message": "В данный момент, редактирование перезапишет составляемое вами сообщение. Вы уверены, что хотите продолжить?",
   "confirmations.logout.confirm": "Выйти",
diff --git a/app/javascript/mastodon/locales/sa.json b/app/javascript/mastodon/locales/sa.json
index 7f8dae326ef972..ea18ba2091541c 100644
--- a/app/javascript/mastodon/locales/sa.json
+++ b/app/javascript/mastodon/locales/sa.json
@@ -133,15 +133,12 @@
   "compose_form.spoiler.unmarked": "अप्रच्छन्नाक्षरं विद्यते",
   "confirmation_modal.cancel": "नश्यताम्",
   "confirmations.block.confirm": "निषेधः",
-  "confirmations.cancel_follow_request.confirm": "अनुरोधनमपनय",
-  "confirmations.cancel_follow_request.message": "{name} अनुसरणस्यानुरोधमपनेतुं दृढीकृतं वा?",
   "confirmations.delete.confirm": "मार्जय",
   "confirmations.delete.message": "निश्चयेन पत्रमिदं मार्जितुमिच्छसि?",
   "confirmations.delete_list.confirm": "मार्जय",
   "confirmations.delete_list.message": "सूचिरियं निश्चयेन स्थायित्वेन च मार्जितुमिच्छसि वा?",
   "confirmations.discard_edit_media.confirm": "अपास्य",
   "confirmations.discard_edit_media.message": "माध्यमवर्णनां प्रदर्शनञ्च अरक्षितानि परिवर्तनानि सन्ति, तानि अपासितुमिच्छसि वा?",
-  "confirmations.domain_block.message": "नूनं निश्चयेनैव विनष्टुमिच्छति पूर्णप्रदेशमेव {domain} ? अधिकांशसन्दर्भेऽस्थायित्वेन निषेधता निःशब्दत्वञ्च पर्याप्तं चयनीयञ्च । न तस्मात् प्रदेशात्सर्वे विषया द्रष्टुमशक्याः किस्यांश्चिदपि सर्वजनिकसमयतालिकायां वा स्वीयसूचनापटले । सर्वेऽनुसर्तारस्ते प्रदेशात् ये सन्ति ते नश्यन्ते ।",
   "confirmations.edit.confirm": "सम्पादय",
   "confirmations.edit.message": "सम्पादनमिदानीं लिख्यते तर्हि पूर्वलिखितसन्देशं विनश्य पुनः लिख्यते। निश्चयेनैवं कर्तव्यम्?",
   "confirmations.logout.confirm": "बहिर्गम्यताम्",
diff --git a/app/javascript/mastodon/locales/sc.json b/app/javascript/mastodon/locales/sc.json
index f13514fd0232d9..0bba96e74bcc31 100644
--- a/app/javascript/mastodon/locales/sc.json
+++ b/app/javascript/mastodon/locales/sc.json
@@ -1,43 +1,60 @@
 {
   "about.blocks": "Serbidores moderados",
-  "about.contact": "Contatu:",
-  "about.disclaimer": "Mastodon est software de còdigu lìberu e unu màrchiu de Mastodon gGmbH.",
-  "about.domain_blocks.no_reason_available": "Rasone no a disponimentu",
+  "about.contact": "Cuntatu:",
+  "about.disclaimer": "Mastodon est software de còdighe lìberu e unu màrchiu de Mastodon gGmbH.",
+  "about.domain_blocks.no_reason_available": "Peruna resone a disponimentu",
   "about.domain_blocks.preamble": "Mastodon ti permitit de bìdere su cuntenutu de utentes de cale si siat àteru serbidore de su fediversu. Custas sunt etzetziones fatas in custu serbidore ispetzìficu.",
-  "about.domain_blocks.silenced.explanation": "As a bìere perfilos e contenutos dae custu serbidore sceti chi ddos chircas o detzidas de ddu sighere.",
+  "about.domain_blocks.silenced.explanation": "As a bìdere profilos e cuntenutos dae custu serbidore isceti chi ddos chircas o detzides de ddu sighire.",
   "about.domain_blocks.silenced.title": "Limitadu",
+  "about.domain_blocks.suspended.explanation": "Perunu datu de custu serbidore at a èssere protzessadu, immagasinadu o cuncambiadu; est impossìbile duncas cale si siat interatzione o comunicatzione cun is utentes de custu serbidore.",
   "about.domain_blocks.suspended.title": "Suspèndidu",
+  "about.not_available": "Custa informatzione no est istada posta a disponimentu in custu serbidore.",
+  "about.powered_by": "Rete sotziale detzentralizada impulsada dae {mastodon}",
   "about.rules": "Règulas de su serbidore",
   "account.account_note_header": "Nota",
   "account.add_or_remove_from_list": "Agiunghe o boga dae is listas",
-  "account.badges.bot": "Robot",
+  "account.badges.bot": "Automatizadu",
   "account.badges.group": "Grupu",
   "account.block": "Bloca @{name}",
   "account.block_domain": "Bloca su domìniu {domain}",
   "account.block_short": "Bloca",
   "account.blocked": "Blocadu",
   "account.browse_more_on_origin_server": "Esplora de prus in su profilu originale",
-  "account.cancel_follow_request": "Withdraw follow request",
+  "account.cancel_follow_request": "Annulla sa sighidura",
+  "account.copy": "Còpia su ligòngiu a su profilu",
+  "account.direct": "Mèntova a @{name} in privadu",
   "account.disable_notifications": "Non mi notìfiches prus cando @{name} pùblichet messàgios",
   "account.domain_blocked": "Domìniu blocadu",
   "account.edit_profile": "Modìfica profilu",
   "account.enable_notifications": "Notìfica·mi cando @{name} pùblicat messàgios",
   "account.endorse": "Cussìgia in su profilu tuo",
+  "account.featured_tags.last_status_never": "Peruna publicatzione",
+  "account.featured_tags.title": "Etichetas de {name} in evidèntzia",
   "account.follow": "Sighi",
+  "account.follow_back": "Sighi tue puru",
   "account.followers": "Sighiduras",
   "account.followers.empty": "Nemos sighit ancora custa persone.",
+  "account.followers_counter": "{count, plural, one {{counter} sighidura} other {{counter} sighiduras}}",
   "account.following": "Sighende",
+  "account.following_counter": "{count, plural, one {sighende a {counter}} other {sighende a {counter}}}",
   "account.follows.empty": "Custa persone non sighit ancora a nemos.",
+  "account.go_to_profile": "Bae a su profilu",
   "account.hide_reblogs": "Cua is cumpartziduras de @{name}",
   "account.in_memoriam": "In memoriam.",
   "account.joined_short": "At aderidu",
+  "account.languages": "Muda is idiomas sutiscritos",
   "account.link_verified_on": "Sa propiedade de custu ligòngiu est istada controllada su {date}",
   "account.locked_info": "S'istadu de riservadesa de custu contu est istadu cunfiguradu comente blocadu. Sa persone chi tenet sa propiedade revisionat a manu chie dda podet sighire.",
   "account.media": "Cuntenutu multimediale",
   "account.mention": "Mèntova a @{name}",
+  "account.moved_to": "{name} at indicadu chi su contu nou issoro immoe est:",
   "account.mute": "Pone a @{name} a sa muda",
+  "account.mute_notifications_short": "Pone is notìficas a sa muda",
   "account.mute_short": "A sa muda",
   "account.muted": "A sa muda",
+  "account.mutual": "Pari-pari",
+  "account.no_bio": "Peruna descritzione frunida.",
+  "account.open_original_page": "Aberi sa pàgina originale",
   "account.posts": "Publicatziones",
   "account.posts_with_replies": "Publicatziones e rispostas",
   "account.report": "Signala @{name}",
@@ -45,32 +62,54 @@
   "account.requested_follow": "{name} at dimandadu de ti sighire",
   "account.share": "Cumpartzi su profilu de @{name}",
   "account.show_reblogs": "Ammustra is cumpartziduras de @{name}",
+  "account.statuses_counter": "{count, plural, one {{counter} publicatzione} other {{counter} publicatziones}}",
   "account.unblock": "Isbloca a @{name}",
   "account.unblock_domain": "Isbloca su domìniu {domain}",
+  "account.unblock_short": "Isbloca",
   "account.unendorse": "Non cussiges in su profilu",
   "account.unfollow": "Non sigas prus",
   "account.unmute": "Torra a ativare a @{name}",
+  "account.unmute_notifications_short": "Ativa is notìficas",
+  "account.unmute_short": "Ativa su sonu",
   "account_note.placeholder": "Incarca pro agiùnghere una nota",
+  "admin.dashboard.retention.cohort_size": "Utentes noos",
+  "admin.impact_report.instance_accounts": "Contos de profilu chi custu diat cantzellare",
+  "admin.impact_report.instance_followers": "Sighiduras chi is utentes nostros diant pèrdere",
+  "admin.impact_report.instance_follows": "Sighiduras chi is utentes issoro diant pèrdere",
   "alert.rate_limited.message": "Torra·bi a proare a pustis de {retry_time, time, medium}.",
   "alert.rate_limited.title": "Màssimu de rechestas barigadu",
   "alert.unexpected.message": "Ddoe est istada una faddina.",
   "alert.unexpected.title": "Oh!",
   "announcement.announcement": "Annùntziu",
+  "attachments_list.unprocessed": "(non protzessadu)",
   "audio.hide": "Cua s'àudio",
+  "block_modal.show_less": "Ammustra·nde prus pagu",
+  "block_modal.show_more": "Ammustra·nde prus",
+  "block_modal.they_cant_mention": "Non ti podent mentovare nen sighire.",
+  "block_modal.they_cant_see_posts": "Non podent bìdere is publicatziones tuas e tue non podes bìdere cussas issoro.",
+  "block_modal.they_will_know": "Non podent bìdere chi ddos as blocadu.",
+  "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",
+  "bundle_column_error.copy_stacktrace": "Còpia s'informe de faddina",
   "bundle_column_error.error.title": "Oh, no!",
   "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.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_modal.find_another_server": "Agata un'àteru serbidore",
   "column.about": "Informatziones",
   "column.blocks": "Persones blocadas",
   "column.bookmarks": "Sinnalibros",
   "column.community": "Lìnia de tempus locale",
+  "column.direct": "Mentziones privadas",
   "column.directory": "Nàviga in is profilos",
   "column.domain_blocks": "Domìnios blocados",
+  "column.favourites": "Preferidos",
+  "column.firehose": "Publicatziones in direta",
   "column.follow_requests": "Rechestas de sighidura",
   "column.home": "Printzipale",
   "column.lists": "Listas",
@@ -89,31 +128,42 @@
   "community.column_settings.local_only": "Isceti locale",
   "community.column_settings.media_only": "Isceti multimediale",
   "community.column_settings.remote_only": "Isceti remotu",
-  "compose.language.change": "Càmbia sa limba",
+  "compose.language.change": "Càmbia s'idioma",
+  "compose.language.search": "Chirca idiomas...",
+  "compose.published.body": "Publicadu.",
+  "compose.published.open": "Aberi",
+  "compose.saved.body": "Publicatzione sarvada.",
   "compose_form.direct_message_warning_learn_more": "Àteras informatziones",
-  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
-  "compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.",
+  "compose_form.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",
   "compose_form.placeholder": "A ite ses pensende?",
   "compose_form.poll.duration": "Longària de su sondàgiu",
+  "compose_form.poll.option_placeholder": "Optzione {number}",
+  "compose_form.poll.single": "Sèbera·nde una",
   "compose_form.poll.switch_to_multiple": "Muda su sondàgiu pro permìtere multi-optziones",
   "compose_form.poll.switch_to_single": "Muda su sondàgiu pro permìtere un'optzione isceti",
-  "compose_form.publish_form": "Publish",
+  "compose_form.poll.type": "Istile",
+  "compose_form.publish": "Pùblica",
+  "compose_form.publish_form": "Publicatzione noa",
+  "compose_form.reply": "Risponde",
+  "compose_form.save_changes": "Atualiza",
   "compose_form.spoiler.marked": "Boga avisu de cuntenutu",
   "compose_form.spoiler.unmarked": "Agiunghe avisu de cuntenutu",
+  "compose_form.spoiler_placeholder": "Avisu de cuntenutu (optzionale)",
   "confirmation_modal.cancel": "Annulla",
   "confirmations.block.confirm": "Bloca",
   "confirmations.delete.confirm": "Cantzella",
   "confirmations.delete.message": "Seguru chi boles cantzellare custa publicatzione?",
   "confirmations.delete_list.confirm": "Cantzella",
   "confirmations.delete_list.message": "Seguru chi boles cantzellare custa lista in manera permanente?",
-  "confirmations.domain_block.message": "Boles de seguru, ma a beru a beru, blocare {domain}? In sa parte manna de is casos, pagos blocos o silentziamentos de persones sunt sufitzientes e preferìbiles. No as a bìdere cuntenutos dae custu domìniu in peruna lìnia de tempus pùblica o in is notìficas tuas. Sa gente chi ti sighit dae cussu domìniu at a èssere bogada.",
+  "confirmations.discard_edit_media.confirm": "Iscarta",
   "confirmations.edit.confirm": "Modìfica",
   "confirmations.logout.confirm": "Essi·nche",
   "confirmations.logout.message": "Seguru chi boles essire?",
   "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.reply.confirm": "Risponde",
   "confirmations.reply.message": "Rispondende immoe as a subrascrìere su messàgiu chi ses iscriende. Seguru chi boles sighire?",
   "confirmations.unfollow.confirm": "Non sigas prus",
@@ -122,22 +172,30 @@
   "conversation.mark_as_read": "Signala comente lèghidu",
   "conversation.open": "Ammustra arresonada",
   "conversation.with": "Cun {names}",
+  "copy_icon_button.copied": "Copiadu in punta de billete",
+  "copypaste.copied": "Copiadu",
+  "copypaste.copy_to_clipboard": "Còpia in punta de billete",
   "directory.federated": "Dae unu fediversu connotu",
   "directory.local": "Isceti dae {domain}",
   "directory.new_arrivals": "Arribos noos",
   "directory.recently_active": "Cun atividade dae pagu",
   "disabled_account_banner.account_settings": "Cunfiguratziones de su contu",
-  "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
-  "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.",
+  "disabled_account_banner.text": "Su contu tuo {disabledAccount} no est ativu.",
+  "dismissable_banner.dismiss": "Iscarta",
+  "domain_block_modal.block": "Bloca su serbidore",
+  "domain_block_modal.title": "Boles blocare su domìniu?",
+  "domain_pill.server": "Serbidore",
+  "domain_pill.username": "Nòmine de utente",
   "embed.instructions": "Inserta custa publicatzione in su situ web tuo copiende su còdighe de suta.",
   "embed.preview": "At a aparèssere aici:",
   "emoji_button.activity": "Atividade",
+  "emoji_button.clear": "Isbòida",
   "emoji_button.custom": "Personalizadu",
   "emoji_button.flags": "Banderas",
   "emoji_button.food": "Mandigòngiu e bufòngiu",
   "emoji_button.label": "Inserta un'emoji",
   "emoji_button.nature": "Natura",
-  "emoji_button.not_found": "Emojis no!! (╯°□°）╯︵ ┻━┻",
+  "emoji_button.not_found": "Perunu emoji agatadu",
   "emoji_button.objects": "Ogetos",
   "emoji_button.people": "Gente",
   "emoji_button.recent": "Impreadu a fitianu",
@@ -168,17 +226,43 @@
   "errors.unexpected_crash.report_issue": "Sinnala unu problema",
   "explore.search_results": "Resurtados de sa chirca",
   "explore.suggested_follows": "Gente",
+  "explore.title": "Esplora",
+  "explore.trending_links": "Noas",
   "explore.trending_statuses": "Publicatziones",
   "explore.trending_tags": "Etichetas",
+  "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",
+  "filter_modal.added.short_explanation": "Custa publicatzione est istada agiunta a sa categoria de filtros imbeniente: {title}.",
+  "filter_modal.added.title": "Filtru agiuntu!",
   "filter_modal.select_filter.expired": "iscadidu",
+  "filter_modal.select_filter.prompt_new": "Categoria noa: {name}",
+  "filter_modal.select_filter.search": "Chirca o crea",
+  "filter_modal.select_filter.subtitle": "Imprea una categoria chi esistit giai o crea·nde una",
+  "filter_modal.select_filter.title": "Filtra custa publicatzione",
+  "filter_modal.title.status": "Filtra una publicatzione",
+  "filtered_notifications_banner.mentions": "{count, plural, one {mèntovu} other {mèntovos}}",
+  "filtered_notifications_banner.pending_requests": "Notìficas dae {count, plural, =0 {nemos} one {una persone} other {# persones}} chi connosches",
+  "filtered_notifications_banner.title": "Notìficas filtradas",
   "firehose.all": "Totus",
+  "firehose.local": "Custu serbidore",
+  "firehose.remote": "Àteros serbidores",
   "follow_request.authorize": "Autoriza",
   "follow_request.reject": "Refuda",
   "follow_requests.unlocked_explanation": "Fintzas si su contu tuo no est blocadu, su personale de {domain} at pensadu chi forsis bolias revisionare a manu is rechestas de custos contos.",
+  "follow_suggestions.curated_suggestion": "Sa seletzione de s'iscuadra de traballu",
+  "follow_suggestions.dismiss": "No ammustres prus",
+  "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.view_all": "Ammustra totu",
   "footer.about": "Informatziones",
+  "footer.directory": "Diretòriu de profilos",
+  "footer.get_app": "Otene s'aplicatzione",
   "footer.invite": "Invita gente",
   "footer.keyboard_shortcuts": "Incurtzaduras de tecladu",
   "footer.privacy_policy": "Polìtica de riservadesa",
+  "footer.source_code": "Ammustra su còdighe de orìgine",
   "footer.status": "Istadu",
   "generic.saved": "Sarvadu",
   "getting_started.heading": "Comente cumintzare",
@@ -191,56 +275,64 @@
   "hashtag.column_settings.tag_mode.any": "Cale si siat de custos",
   "hashtag.column_settings.tag_mode.none": "Perunu de custos",
   "hashtag.column_settings.tag_toggle": "Include etichetas additzionales pro custa colunna",
+  "hashtag.counter_by_accounts": "{count, plural, one {{counter} partetzipante} other {{counter} partetzipantes}}",
+  "hashtag.counter_by_uses": "{count, plural, one {{counter} publicatzione} other {{counter} publicatziones}}",
+  "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",
   "home.column_settings.show_reblogs": "Ammustra is cumpartziduras",
   "home.column_settings.show_replies": "Ammustra rispostas",
   "home.hide_announcements": "Cua annùntzios",
+  "home.pending_critical_update.body": "Atualiza su serbidore Mastodon tuo su prima possìbile.",
+  "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",
-  "interaction_modal.description.reply": "Podes arrespondere a custu post con una conta in Mastodon.",
+  "interaction_modal.description.reply": "Podes rispòndere a custa publicatzione cun unu contu de Mastodon.",
   "interaction_modal.on_this_server": "In custu serbidore",
   "interaction_modal.title.follow": "Sighi a {name}",
-  "interaction_modal.title.reply": "Arresponde a su post de {name}",
+  "interaction_modal.title.reply": "Risponde a sa publicatzione de {name}",
   "intervals.full.days": "{number, plural, one {# die} other {# dies}}",
   "intervals.full.hours": "{number, plural, one {# ora} other {# oras}}",
   "intervals.full.minutes": "{number, plural, one {# minutu} other {# minutos}}",
-  "keyboard_shortcuts.back": "pro navigare a coa",
-  "keyboard_shortcuts.blocked": "pro abèrrere sa lista de persones blocadas",
-  "keyboard_shortcuts.boost": "pro cumpartzire",
-  "keyboard_shortcuts.column": "pro atzentrare una publicatzione in una de is colunnas",
-  "keyboard_shortcuts.compose": "pro atzentrare in s'àrea de cumpositzione de testu",
+  "keyboard_shortcuts.back": "Nàviga a coa",
+  "keyboard_shortcuts.blocked": "Aberi sa lista de persones blocadas",
+  "keyboard_shortcuts.boost": "Potèntzia sa publicatzione",
+  "keyboard_shortcuts.column": "Atzentra sa colunna",
+  "keyboard_shortcuts.compose": "Atzentra s'àrea de cumpositzione de testu",
   "keyboard_shortcuts.description": "Descritzione",
-  "keyboard_shortcuts.direct": "to open direct messages column",
-  "keyboard_shortcuts.down": "pro mòere in bàsciu in sa lista",
-  "keyboard_shortcuts.enter": "pro abèrrere una publicatzione",
-  "keyboard_shortcuts.federated": "pro abèrrere sa lìnia de tempus federada",
+  "keyboard_shortcuts.direct": "pro abèrrere sa colunna de mèntovos privados",
+  "keyboard_shortcuts.down": "Move in bàsciu in sa lista",
+  "keyboard_shortcuts.enter": "Aberi una publicatzione",
+  "keyboard_shortcuts.favourites": "Aberi sa lista de preferidos",
+  "keyboard_shortcuts.federated": "Aberi sa lìnia de tempus federada",
   "keyboard_shortcuts.heading": "Incurtzaduras de tecladu",
-  "keyboard_shortcuts.home": "pro abèrrere sa lìnia de tempus printzipale",
+  "keyboard_shortcuts.home": "Aberi sa lìnia de tempus printzipale",
   "keyboard_shortcuts.hotkey": "Tecla de atzessu diretu",
-  "keyboard_shortcuts.legend": "pro ammustrare custa didascalia",
-  "keyboard_shortcuts.local": "pro abèrrere sa lìnia de tempus locale",
-  "keyboard_shortcuts.mention": "pro mentovare s'atributzione",
-  "keyboard_shortcuts.muted": "pro abèrrere sa lista de persones a sa muda",
-  "keyboard_shortcuts.my_profile": "pro abèrrere su profilu tuo",
-  "keyboard_shortcuts.notifications": "pro abèrrere sa colunna de notificatziones",
-  "keyboard_shortcuts.open_media": "pro abèrrere elementos multimediales",
-  "keyboard_shortcuts.pinned": "pro abèrrere sa lista de publicatziones apicadas",
-  "keyboard_shortcuts.profile": "pro abèrrere su profilu de s'autore",
-  "keyboard_shortcuts.reply": "pro rispòndere",
-  "keyboard_shortcuts.requests": "pro abèrrere sa lista de rechestas de sighidura",
-  "keyboard_shortcuts.search": "pro atzentrare sa chirca",
-  "keyboard_shortcuts.spoilers": "pro ammustrare/cuare su campu AC",
-  "keyboard_shortcuts.start": "pro abèrrere sa colunna \"Cumintza\"",
-  "keyboard_shortcuts.toggle_hidden": "pro ammustrare o cuare testu de is AC",
-  "keyboard_shortcuts.toggle_sensitivity": "pro ammustrare o cuare elementos multimediales",
-  "keyboard_shortcuts.toot": "pro cumintzare a iscrìere una publicatzione noa",
-  "keyboard_shortcuts.unfocus": "pro essire de s'àrea de cumpositzione de testu o de chirca",
-  "keyboard_shortcuts.up": "pro mòere in susu in sa lista",
+  "keyboard_shortcuts.legend": "Ammustra custa didascalia",
+  "keyboard_shortcuts.local": "Aberi sa lìnia de tempus locale",
+  "keyboard_shortcuts.mention": "Mèntova a s'atributzione",
+  "keyboard_shortcuts.muted": "Aberi sa lista de persones a sa muda",
+  "keyboard_shortcuts.my_profile": "Aberi su profilu tuo",
+  "keyboard_shortcuts.notifications": "Aberi sa colunna de notificatziones",
+  "keyboard_shortcuts.open_media": "Aberi is elementos multimediales",
+  "keyboard_shortcuts.pinned": "Aberi sa lista de publicatziones apicadas",
+  "keyboard_shortcuts.profile": "Aberi su profilu de s'autore",
+  "keyboard_shortcuts.reply": "Risponde a sa publicatzioe",
+  "keyboard_shortcuts.requests": "Aberi sa lista de rechestas de sighiduras",
+  "keyboard_shortcuts.search": "Atzentra sa barra de chirca",
+  "keyboard_shortcuts.spoilers": "Ammustra/cua su campu AC",
+  "keyboard_shortcuts.start": "Aberi sa colunna \"Cumintza\"",
+  "keyboard_shortcuts.toggle_hidden": "Ammustra o cua su testu de is AC",
+  "keyboard_shortcuts.toggle_sensitivity": "Ammustra/cua elementos multimediales",
+  "keyboard_shortcuts.toot": "Cumintza a iscrìere una publicatzione noa",
+  "keyboard_shortcuts.unfocus": "Essi de s'àrea de cumpositzione de testu o de chirca",
+  "keyboard_shortcuts.up": "Move in susu in sa lista",
   "lightbox.close": "Serra",
   "lightbox.compress": "Cumprime sa casella de visualizatzione de is immàgines",
   "lightbox.expand": "Ismànnia sa casella de visualizatzione de is immàgines",
   "lightbox.next": "Imbeniente",
   "lightbox.previous": "Pretzedente",
-  "limited_account_hint.title": "Custu perfilu dd'ant cuadu is moderadores de {domain}.",
+  "limited_account_hint.title": "Custu profilu est istadu cuadu dae sa moderatzione de {domain}.",
   "lists.account.add": "Agiunghe a sa lista",
   "lists.account.remove": "Boga dae sa lista",
   "lists.delete": "Cantzella sa lista",
@@ -262,8 +354,11 @@
   "navigation_bar.bookmarks": "Sinnalibros",
   "navigation_bar.community_timeline": "Lìnia de tempus locale",
   "navigation_bar.compose": "Cumpone una publicatzione noa",
+  "navigation_bar.direct": "Mentziones privadas",
   "navigation_bar.discover": "Iscoberi",
   "navigation_bar.domain_blocks": "Domìnios blocados",
+  "navigation_bar.explore": "Esplora",
+  "navigation_bar.favourites": "Preferidos",
   "navigation_bar.filters": "Faeddos a sa muda",
   "navigation_bar.follow_requests": "Rechestas de sighidura",
   "navigation_bar.follows_and_followers": "Gente chi sighis e sighiduras",
@@ -276,17 +371,42 @@
   "navigation_bar.public_timeline": "Lìnia de tempus federada",
   "navigation_bar.search": "Chirca",
   "navigation_bar.security": "Seguresa",
-  "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
+  "not_signed_in_indicator.not_signed_in": "Ti depes identificare pro atzèdere a custa resursa.",
+  "notification.admin.sign_up": "{name} at aderidu",
   "notification.favourite": "{name} at marcadu comente a preferidu s'istadu tuo",
   "notification.follow": "{name} ti sighit",
   "notification.follow_request": "{name} at dimandadu de ti sighire",
   "notification.mention": "{name} t'at mentovadu",
+  "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.",
+  "notification.moderation_warning.action_disable": "Su contu tuo est istadu disativadu.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Unas cantas de is publicatziones tuas sunt istadas marcadas comente sensìbiles.",
+  "notification.moderation_warning.action_none": "Su contu tuo at retzidu un'avisu de moderatzione.",
+  "notification.moderation_warning.action_sensitive": "Is publicatziones tuas ant a èssere marcadas comente sensìbiles dae immoe.",
+  "notification.moderation_warning.action_silence": "Su contu tuo est istadu limitadu.",
+  "notification.moderation_warning.action_suspend": "Su contu tuo est istadu suspèndidu.",
   "notification.own_poll": "Sondàgiu acabbadu",
+  "notification.poll": "Unu sondàgiu in su chi as votadu est acabbadu",
+  "notification.private_mention": "{name} t'at mentovadu in privadu",
   "notification.reblog": "{name} at cumpartzidu sa publicatzione tua",
+  "notification.relationships_severance_event": "Connessiones pèrdidas cun {name}",
+  "notification.relationships_severance_event.learn_more": "Àteras informatziones",
   "notification.status": "{name} at publicadu cosa",
+  "notification.update": "{name} at modificadu una publicatzione",
+  "notification_requests.accept": "Atzeta",
+  "notification_requests.dismiss": "Iscarta",
+  "notification_requests.notifications_from": "Notìficas dae {name}",
+  "notification_requests.title": "Notìficas filtradas",
   "notifications.clear": "Lìmpia notìficas",
   "notifications.clear_confirmation": "Seguru chi boles isboidare in manera permanente totu is notìficas tuas?",
+  "notifications.column_settings.admin.report": "Informes noos:",
   "notifications.column_settings.alert": "Notìficas de iscrivania",
+  "notifications.column_settings.beta.category": "Funtzionalidades isperimentales",
+  "notifications.column_settings.beta.grouping": "Notìficas de grupu",
+  "notifications.column_settings.favourite": "Preferidos:",
+  "notifications.column_settings.filter_bar.advanced": "Ammustra totu is categorias",
+  "notifications.column_settings.filter_bar.category": "Barra de filtru lestru",
   "notifications.column_settings.follow": "Sighiduras noas:",
   "notifications.column_settings.follow_request": "Rechestas noas de sighidura:",
   "notifications.column_settings.mention": "Mèntovos:",
@@ -296,8 +416,12 @@
   "notifications.column_settings.show": "Ammustra in sa colunna",
   "notifications.column_settings.sound": "Reprodue unu sonu",
   "notifications.column_settings.status": "Publicatziones noas:",
+  "notifications.column_settings.unread_notifications.category": "Notìficas de lèghere",
+  "notifications.column_settings.unread_notifications.highlight": "Evidèntzia is notìficas de lèghere",
+  "notifications.column_settings.update": "Modìficas:",
   "notifications.filter.all": "Totus",
   "notifications.filter.boosts": "Cumpartziduras",
+  "notifications.filter.favourites": "Preferidos",
   "notifications.filter.follows": "Sighende",
   "notifications.filter.mentions": "Mèntovos",
   "notifications.filter.polls": "Resurtados de su sondàgiu",
@@ -308,27 +432,23 @@
   "notifications.permission_denied": "Is notìficas de iscrivania non sunt a disponimentu pro neghe de rechestas de permissu chi sunt istadas dennegadas in antis",
   "notifications.permission_denied_alert": "Is notìficas de iscrivania non podent èssere abilitadas, ca su permissu de su navigadore est istadu dennegadu in antis",
   "notifications.permission_required": "Is notìficas de iscrivania no sunt a disponimentu ca ammancat su permissu rechèdidu.",
+  "notifications.policy.filter_new_accounts.hint": "Creadu {days, plural, one {erisero} other {in is ùrtimas # dies}}",
+  "notifications.policy.filter_new_accounts_title": "Contos noos",
+  "notifications.policy.filter_not_followers_title": "Gente chi non ti sighit",
+  "notifications.policy.filter_not_following_hint": "Fintzas a cando no donas s'aprovatzione tua",
+  "notifications.policy.filter_not_following_title": "Gente chi non sighis",
   "notifications_permission_banner.enable": "Abilita is notìficas de iscrivania",
   "notifications_permission_banner.how_to_control": "Pro retzire notìficas cando Mastodon no est abertu, abilita is notìficas de iscrivania. Podes controllare cun pretzisione is castas de interatziones chi ingendrant notìficas de iscrivania pro mèdiu de su butone {icon} in subra, cando sunt abilitadas.",
   "notifications_permission_banner.title": "Non ti perdas mai nudda",
-  "onboarding.actions.go_to_explore": "See what's trending",
-  "onboarding.actions.go_to_home": "Go to your home feed",
-  "onboarding.follows.lead": "You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!",
-  "onboarding.follows.title": "Popular on Mastodon",
+  "onboarding.compose.template": "Salude #Mastodon!",
   "onboarding.profile.display_name": "Nòmine visìbile",
   "onboarding.profile.note": "Biografia",
-  "onboarding.start.lead": "Your new Mastodon account is ready to go. Here's how you can make the most of it:",
-  "onboarding.start.skip": "Want to skip right ahead?",
-  "onboarding.steps.follow_people.body": "You curate your own feed. Lets fill it with interesting people.",
-  "onboarding.steps.follow_people.title": "Follow {count, plural, one {one person} other {# people}}",
-  "onboarding.steps.publish_status.body": "Say hello to the world.",
-  "onboarding.steps.setup_profile.body": "Others are more likely to interact with you with a filled out profile.",
-  "onboarding.steps.setup_profile.title": "Customize your profile",
-  "onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
-  "onboarding.steps.share_profile.title": "Share your profile",
+  "onboarding.steps.setup_profile.title": "Personaliza su profilu tuo",
+  "onboarding.steps.share_profile.title": "Cumpartzi su profilu tuo",
   "picture_in_picture.restore": "Torra·ddu a ue fiat",
   "poll.closed": "Serradu",
   "poll.refresh": "Atualiza",
+  "poll.reveal": "Ammustra is resurtados",
   "poll.total_people": "{count, plural, one {# persone} other {# persones}}",
   "poll.total_votes": "{count, plural, one {# votu} other {# votos}}",
   "poll.vote": "Vota",
@@ -338,20 +458,30 @@
   "poll_button.remove_poll": "Cantzella su sondàgiu",
   "privacy.change": "Modìfica s'istadu de riservadesa",
   "privacy.public.short": "Pùblicu",
+  "privacy_policy.last_updated": "Ùrtima atualizatzione: {date}",
+  "privacy_policy.title": "Polìtica de riservadesa",
   "recommended": "Cussigiadu",
   "refresh": "Atualiza",
   "regeneration_indicator.label": "Carrighende…",
   "regeneration_indicator.sublabel": "Preparende sa lìnia de tempus printzipale tua.",
   "relative_time.days": "{number} dies a oe",
-  "relative_time.full.just_now": "immoe etotu",
+  "relative_time.full.days": "{number, plural, one {# die} other {# dies}} a oe",
+  "relative_time.full.hours": "{number, plural, one {# ora} other {# oras}} a immoe",
+  "relative_time.full.just_now": "immoe immoe",
+  "relative_time.full.minutes": "{number, plural, one {# minutu} other {# minutos}} a immoe",
+  "relative_time.full.seconds": "{number, plural, one {# segundu} other {# segundos}} a immoe",
   "relative_time.hours": "{number} oras a immoe",
   "relative_time.just_now": "immoe",
   "relative_time.minutes": "{number} minutos a immoe",
   "relative_time.seconds": "{number} segundos a immoe",
   "relative_time.today": "oe",
+  "reply_indicator.attachments": "{count, plural, one {# alligongiadu} other {# alligongiados}}",
   "reply_indicator.cancel": "Annulla",
+  "reply_indicator.poll": "Sondàgiu",
   "report.block": "Bloca",
+  "report.categories.legal": "Giurìdicu",
   "report.categories.other": "Àteru",
+  "report.categories.spam": "Àliga",
   "report.category.title_account": "profilu",
   "report.category.title_status": "publicatzione",
   "report.close": "Fatu",
@@ -360,19 +490,31 @@
   "report.mute": "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.spam": "Est àliga",
   "report.submit": "Imbia",
   "report.target": "Informende de {target}",
+  "report.unfollow": "Non sigas prus a @{name}",
   "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",
   "search.placeholder": "Chirca",
   "search_popout.user": "utente",
   "search_results.accounts": "Profilos",
   "search_results.all": "Totus",
   "search_results.hashtags": "Etichetas",
   "search_results.statuses": "Publicatziones",
+  "server_banner.active_users": "utentes ativos",
   "server_banner.administered_by": "Amministradu dae:",
   "server_banner.server_stats": "Istatìsticas de su serbidore:",
-  "sign_in_banner.sign_in": "Sign in",
+  "sign_in_banner.create_account": "Crea contu",
+  "sign_in_banner.sign_in": "Identificatzione",
   "status.admin_account": "Aberi s'interfache de moderatzione pro @{name}",
   "status.admin_status": "Aberi custa publicatzione in s'interfache de moderatzione",
   "status.block": "Bloca a @{name}",
@@ -383,8 +525,9 @@
   "status.delete": "Cantzella",
   "status.detailed_status": "Visualizatzione de detàlliu de arresonada",
   "status.edit": "Modìfica",
-  "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
+  "status.edited_x_times": "Modificadu {count, plural, one {{count} # borta} other {{count} bortas}}",
   "status.embed": "Afissa",
+  "status.favourites": "{count, plural, one {preferidu} other {preferidos}}",
   "status.filtered": "Filtradu",
   "status.load_more": "Càrriga·nde àteros",
   "status.media_hidden": "Elementos multimediales cuados",
@@ -411,7 +554,7 @@
   "status.show_less_all": "Ammustra·nde prus pagu pro totus",
   "status.show_more": "Ammustra·nde prus",
   "status.show_more_all": "Ammustra·nde prus pro totus",
-  "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
+  "status.title.with_attachments": "{user} at publicadu {attachmentCount, plural, one {un'alligongiadu} other {{attachmentCount} alligongiados}}",
   "status.unmute_conversation": "Torra a ativare s'arresonada",
   "status.unpin": "Boga dae pitzu de su profilu",
   "subscribed_languages.save": "Sarva is modìficas",
@@ -422,11 +565,11 @@
   "time_remaining.minutes": "{number, plural, one {abarrat # minutu} other {abarrant # minutos}}",
   "time_remaining.moments": "Abarrant pagu momentos",
   "time_remaining.seconds": "{number, plural, one {abarrat # segundu} other {abarrant # segundos}}",
-  "timeline_hint.remote_resource_not_displayed": "{resource} dae àteros serbidores non benint ammustrados.",
+  "timeline_hint.remote_resource_not_displayed": "Is {resource} dae àteros serbidores non benint ammustradas.",
   "timeline_hint.resources.followers": "Sighiduras",
   "timeline_hint.resources.follows": "Sighende",
   "timeline_hint.resources.statuses": "Publicatziones prus betzas",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {# days}}",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} persone} other {{counter} persones}} in {days, plural, one {s'ùrtima die} other {{days} is ùrtimas dies}}",
   "trends.trending_now": "Est tendèntzia immoe",
   "ui.beforeunload": "S'abbotzu tuo at a èssere pèrdidu si essis dae Mastodon.",
   "units.short.billion": "{count}Mrd",
@@ -437,10 +580,10 @@
   "upload_error.limit": "Lìmite de càrriga de archìvios barigadu.",
   "upload_error.poll": "Non si permitit s'imbiu de archìvios in is sondàgios.",
   "upload_form.audio_description": "Descritzione pro persones cun pèrdida auditiva",
-  "upload_form.description": "Descritzione pro persones cun problemas visuales",
+  "upload_form.description": "Descritzione pro persones cun pèrdida visuale",
   "upload_form.edit": "Modìfica",
   "upload_form.thumbnail": "Càmbia sa miniadura",
-  "upload_form.video_description": "Descritzione pro persones cun pèrdida auditiva o problemas visuales",
+  "upload_form.video_description": "Descritzione pro persones cun pèrdida auditiva o visuale",
   "upload_modal.analyzing_picture": "Analizende immàgine…",
   "upload_modal.apply": "Àplica",
   "upload_modal.choose_image": "Sèbera un'immàgine",
diff --git a/app/javascript/mastodon/locales/sco.json b/app/javascript/mastodon/locales/sco.json
index 7c4d1db60ebd9f..99f474ace50f38 100644
--- a/app/javascript/mastodon/locales/sco.json
+++ b/app/javascript/mastodon/locales/sco.json
@@ -129,15 +129,12 @@
   "compose_form.spoiler.unmarked": "Pit on a content warnin",
   "confirmation_modal.cancel": "Stap",
   "confirmations.block.confirm": "Dingie",
-  "confirmations.cancel_follow_request.confirm": "Tak back yer request",
-  "confirmations.cancel_follow_request.message": "Ye shair thit ye'r wantin tae tak back yer request fir tae follae {name}?",
   "confirmations.delete.confirm": "Delete",
   "confirmations.delete.message": "Ye shair thit ye'r wantin tae delete this post?",
   "confirmations.delete_list.confirm": "Delete",
   "confirmations.delete_list.message": "Ye shair thit ye'r wantin fir tae delete this post fir ever?",
   "confirmations.discard_edit_media.confirm": "Fling awa",
   "confirmations.discard_edit_media.message": "Ye'v chynges tae the media description or preview thit ye'v no saved, fling them awa onie weys?",
-  "confirmations.domain_block.message": "Ye a hunner percent shair thit ye'r wantin tae dingie the hail {domain}? In maist cases a haunfae tairgtit dingies an wheeshts are eneuch an preferit. Ye wullnae see content fae that domain in onie public timelines or in yer notes. Yer follaers fae that domain wull be taen awa.",
   "confirmations.logout.confirm": "Log oot",
   "confirmations.logout.message": "Ye shair thit ye'r wantin tae log oot?",
   "confirmations.mute.confirm": "Wheesht",
diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json
index cff79c6b9bb379..ee8622029ccf84 100644
--- a/app/javascript/mastodon/locales/sk.json
+++ b/app/javascript/mastodon/locales/sk.json
@@ -164,16 +164,12 @@
   "compose_form.spoiler_placeholder": "Varovanie o obsahu (voliteľné)",
   "confirmation_modal.cancel": "Zruš",
   "confirmations.block.confirm": "Zablokovať",
-  "confirmations.cancel_follow_request.confirm": "Stiahnuť žiadosť",
-  "confirmations.cancel_follow_request.message": "Určite chcete stiahnuť svoju žiadosť o sledovanie {name}?",
   "confirmations.delete.confirm": "Vymazať",
   "confirmations.delete.message": "Určite chcete tento príspevok vymazať?",
   "confirmations.delete_list.confirm": "Vymazať",
   "confirmations.delete_list.message": "Určite chcete tento zoznam trvalo vymazať?",
   "confirmations.discard_edit_media.confirm": "Zahodiť",
   "confirmations.discard_edit_media.message": "Máte neuložené zmeny v popise alebo náhľade média, zahodiť ich aj tak?",
-  "confirmations.domain_block.confirm": "Blokovať server",
-  "confirmations.domain_block.message": "Určite chcete blokovať celú doménu {domain}? Vo väčšine prípadov stačí blokovať alebo ignorovať pár konkrétnych účtov, čo aj odporúčame. Obsah z tejto domény neuvidíte v žiadnej verejnej časovej osi ani v upozorneniach. Vaši sledujúci pochádzajúci z tejto domény budú odstránení.",
   "confirmations.edit.confirm": "Upraviť",
   "confirmations.edit.message": "Úpravou prepíšete príspevok, ktorý máte rozpísaný. Určite chcete pokračovať?",
   "confirmations.logout.confirm": "Odhlásiť sa",
diff --git a/app/javascript/mastodon/locales/sl.json b/app/javascript/mastodon/locales/sl.json
index b8c995b8d1c209..4109dfee85f247 100644
--- a/app/javascript/mastodon/locales/sl.json
+++ b/app/javascript/mastodon/locales/sl.json
@@ -169,16 +169,12 @@
   "compose_form.spoiler_placeholder": "Opozorilo o vsebini (ni obvezno)",
   "confirmation_modal.cancel": "Prekliči",
   "confirmations.block.confirm": "Blokiraj",
-  "confirmations.cancel_follow_request.confirm": "Umakni zahtevo",
-  "confirmations.cancel_follow_request.message": "Ali ste prepričani, da želite umakniti svojo zahtevo, da bi sledili {name}?",
   "confirmations.delete.confirm": "Izbriši",
   "confirmations.delete.message": "Ali ste prepričani, da želite izbrisati to objavo?",
   "confirmations.delete_list.confirm": "Izbriši",
   "confirmations.delete_list.message": "Ali ste prepričani, da želite trajno izbrisati ta seznam?",
   "confirmations.discard_edit_media.confirm": "Opusti",
   "confirmations.discard_edit_media.message": "Imate ne shranjene spremembe za medijski opis ali predogled; jih želite kljub temu opustiti?",
-  "confirmations.domain_block.confirm": "Blokiraj strežnik",
-  "confirmations.domain_block.message": "Ali ste res, res prepričani, da želite blokirati celotno {domain}? V večini primerov je nekaj ciljnih blokiranj ali utišanj dovolj in boljše. Vsebino iz te domene ne boste videli v javnih časovnicah ali obvestilih. Vaši sledilci iz te domene bodo odstranjeni.",
   "confirmations.edit.confirm": "Uredi",
   "confirmations.edit.message": "Urejanje bo prepisalo sporočilo, ki ga trenutno sestavljate. Ali ste prepričani, da želite nadaljevati?",
   "confirmations.logout.confirm": "Odjava",
diff --git a/app/javascript/mastodon/locales/sq.json b/app/javascript/mastodon/locales/sq.json
index 6f378b145eaf40..9562757036234e 100644
--- a/app/javascript/mastodon/locales/sq.json
+++ b/app/javascript/mastodon/locales/sq.json
@@ -169,16 +169,12 @@
   "compose_form.spoiler_placeholder": "Sinjalizim lënde (opsional)",
   "confirmation_modal.cancel": "Anuloje",
   "confirmations.block.confirm": "Bllokoje",
-  "confirmations.cancel_follow_request.confirm": "Tërhiqeni mbrapsht kërkesën",
-  "confirmations.cancel_follow_request.message": "Jeni i sigurt se doni të tërhiqni mbrapsht kërkesën tuaj për ndjekje të {name}?",
   "confirmations.delete.confirm": "Fshije",
   "confirmations.delete.message": "Jeni i sigurt se doni të fshihet kjo gjendje?",
   "confirmations.delete_list.confirm": "Fshije",
   "confirmations.delete_list.message": "Jeni i sigurt se doni të fshihet përgjithmonë kjo listë?",
   "confirmations.discard_edit_media.confirm": "Hidhe tej",
   "confirmations.discard_edit_media.message": "Keni ndryshime të paruajtura te përshkrimi ose paraparja e medias, të hidhen tej, sido qoftë?",
-  "confirmations.domain_block.confirm": "Bllokoje shërbyesin",
-  "confirmations.domain_block.message": "Jeni i sigurt, shumë i sigurt se doni të bllokohet krejt {domain}? Në shumicën e rasteve, ndoca bllokime ose heshtime me synim të caktuar janë të mjaftueshme dhe të parapëlqyera. S’keni për të parë lëndë nga kjo përkatësi në ndonjë rrjedhë kohore publike, apo te njoftimet tuaja. Ndjekësit tuaj prej asaj përkatësie do të hiqen.",
   "confirmations.edit.confirm": "Përpunojeni",
   "confirmations.edit.message": "Përpunimi tani do të sjellë mbishkrim të mesazhit që po hartoni aktualisht. Jeni i sigurt se doni të vazhdohet?",
   "confirmations.logout.confirm": "Dilni",
diff --git a/app/javascript/mastodon/locales/sr-Latn.json b/app/javascript/mastodon/locales/sr-Latn.json
index 38ff12bdcf6021..3167f4a815921f 100644
--- a/app/javascript/mastodon/locales/sr-Latn.json
+++ b/app/javascript/mastodon/locales/sr-Latn.json
@@ -169,16 +169,12 @@
   "compose_form.spoiler_placeholder": "Upozorenje o sadržaju (opciono)",
   "confirmation_modal.cancel": "Otkaži",
   "confirmations.block.confirm": "Blokiraj",
-  "confirmations.cancel_follow_request.confirm": "Povuci zahtev",
-  "confirmations.cancel_follow_request.message": "Da li ste sigurni da želite da povučete zahtev da pratite {name}?",
   "confirmations.delete.confirm": "Izbriši",
   "confirmations.delete.message": "Da li ste sigurni da želite da izbrišete ovu objavu?",
   "confirmations.delete_list.confirm": "Izbriši",
   "confirmations.delete_list.message": "Da li ste sigurni da želite da trajno izbrišete ovu listu?",
   "confirmations.discard_edit_media.confirm": "Odbaci",
   "confirmations.discard_edit_media.message": "Imate nesačuvane promene u opisu ili pregledu medija, da li ipak hoćete da ih odbacite?",
-  "confirmations.domain_block.confirm": "Blokiraj server",
-  "confirmations.domain_block.message": "Da li ste zaista sigurni da želite da blokirate ceo domen {domain}? U većini slučajeva, dovoljno je i poželjno nekoliko ciljanih blokiranja ili ignorisanja. Nećete videti sadržaj sa tog domena ni u jednoj javnoj vremenskoj liniji ili u vašim obaveštenjima. Vaši pratioci sa tog domena će biti uklonjeni.",
   "confirmations.edit.confirm": "Uredi",
   "confirmations.edit.message": "Uređivanjem će se obrisati poruka koju trenutno sastavljate. Da li ste sigurni da želite da nastavite?",
   "confirmations.logout.confirm": "Odjava",
diff --git a/app/javascript/mastodon/locales/sr.json b/app/javascript/mastodon/locales/sr.json
index 047e8cf3a8d41c..8729fa59dd1c83 100644
--- a/app/javascript/mastodon/locales/sr.json
+++ b/app/javascript/mastodon/locales/sr.json
@@ -169,16 +169,12 @@
   "compose_form.spoiler_placeholder": "Упозорење о садржају (опционо)",
   "confirmation_modal.cancel": "Откажи",
   "confirmations.block.confirm": "Блокирај",
-  "confirmations.cancel_follow_request.confirm": "Повуци захтев",
-  "confirmations.cancel_follow_request.message": "Да ли сте сигурни да желите да повучете захтев да пратите {name}?",
   "confirmations.delete.confirm": "Избриши",
   "confirmations.delete.message": "Да ли сте сигурни да желите да избришете ову објаву?",
   "confirmations.delete_list.confirm": "Избриши",
   "confirmations.delete_list.message": "Да ли сте сигурни да желите да трајно избришете ову листу?",
   "confirmations.discard_edit_media.confirm": "Одбаци",
   "confirmations.discard_edit_media.message": "Имате несачуване промене у опису или прегледу медија, да ли ипак хоћете да их одбаците?",
-  "confirmations.domain_block.confirm": "Блокирај сервер",
-  "confirmations.domain_block.message": "Да ли сте заиста сигурни да желите да блокирате цео домен {domain}? У већини случајева, довољно је и пожељно неколико циљаних блокирања или игнорисања. Нећете видети садржај са тог домена ни у једној јавној временској линији или у вашим обавештењима. Ваши пратиоци са тог домена ће бити уклоњени.",
   "confirmations.edit.confirm": "Уреди",
   "confirmations.edit.message": "Уређивањем ће се обрисати порука коју тренутно састављате. Да ли сте сигурни да желите да наставите?",
   "confirmations.logout.confirm": "Одјава",
diff --git a/app/javascript/mastodon/locales/sv.json b/app/javascript/mastodon/locales/sv.json
index 53e2dde42ea416..6ed17422672417 100644
--- a/app/javascript/mastodon/locales/sv.json
+++ b/app/javascript/mastodon/locales/sv.json
@@ -168,16 +168,12 @@
   "compose_form.spoiler_placeholder": "Innehållsvarning (valfritt)",
   "confirmation_modal.cancel": "Avbryt",
   "confirmations.block.confirm": "Blockera",
-  "confirmations.cancel_follow_request.confirm": "Återkalla förfrågan",
-  "confirmations.cancel_follow_request.message": "Är du säker på att du vill återkalla din begäran om att följa {name}?",
   "confirmations.delete.confirm": "Radera",
   "confirmations.delete.message": "Är du säker på att du vill radera detta inlägg?",
   "confirmations.delete_list.confirm": "Radera",
   "confirmations.delete_list.message": "Är du säker på att du vill radera denna lista permanent?",
   "confirmations.discard_edit_media.confirm": "Kasta",
   "confirmations.discard_edit_media.message": "Du har osparade ändringar till mediabeskrivningen eller förhandsgranskningen, kasta bort dem ändå?",
-  "confirmations.domain_block.confirm": "Blockera server",
-  "confirmations.domain_block.message": "Är du verkligen, verkligen säker på att du vill blockera hela {domain}? I de flesta fall är några riktade blockeringar eller nedtystade konton tillräckligt och att föredra. Du kommer inte se innehåll från den domänen i den allmänna tidslinjen eller i dina aviseringar. Dina följare från den domänen komer att tas bort.",
   "confirmations.edit.confirm": "Redigera",
   "confirmations.edit.message": "Om du svarar nu kommer det att ersätta meddelandet du håller på att skapa. Är du säker på att du vill fortsätta?",
   "confirmations.logout.confirm": "Logga ut",
diff --git a/app/javascript/mastodon/locales/ta.json b/app/javascript/mastodon/locales/ta.json
index bb26986b818206..ef3255a7dad623 100644
--- a/app/javascript/mastodon/locales/ta.json
+++ b/app/javascript/mastodon/locales/ta.json
@@ -130,7 +130,6 @@
   "confirmations.delete_list.message": "இப்பட்டியலை நிரந்தரமாக நீக்க நிச்சயம் விரும்புகிறீர்களா?",
   "confirmations.discard_edit_media.confirm": "நிராகரி",
   "confirmations.discard_edit_media.message": "சேமிக்கப்படாத மாற்றங்கள் ஊடக விளக்கம் அல்லது முன்னோட்டத்தில் உள்ளது. அவற்றை நிராகரிக்கவா?",
-  "confirmations.domain_block.message": "நீங்கள் முழு {domain} களத்தையும் நிச்சயமாக, நிச்சயமாகத் தடுக்க விரும்புகிறீர்களா? பெரும்பாலும் சில குறிப்பிட்ட பயனர்களைத் தடுப்பதே போதுமானது. முழு களத்தையும் தடுத்தால், அதிலிருந்து வரும் எந்தப் பதிவையும் உங்களால் காண முடியாது, மேலும் அப்பதிவுகள் குறித்த அறிவிப்புகளும் உங்களுக்கு வராது. அந்தக் களத்தில் இருக்கும் பின்தொடர்பவர்கள் உங்கள் பக்கத்திலிருந்து நீக்கப்படுவார்கள்.",
   "confirmations.logout.confirm": "வெளியேறு",
   "confirmations.logout.message": "நிச்சயமாக நீங்கள் வெளியேற விரும்புகிறீர்களா?",
   "confirmations.mute.confirm": "அமைதியாக்கு",
diff --git a/app/javascript/mastodon/locales/te.json b/app/javascript/mastodon/locales/te.json
index 471890b9a36646..d3e1026889fb3e 100644
--- a/app/javascript/mastodon/locales/te.json
+++ b/app/javascript/mastodon/locales/te.json
@@ -73,7 +73,6 @@
   "confirmations.delete.message": "మీరు ఖచ్చితంగా ఈ స్టేటస్ ని తొలగించాలనుకుంటున్నారా?",
   "confirmations.delete_list.confirm": "తొలగించు",
   "confirmations.delete_list.message": "మీరు ఖచ్చితంగా ఈ జాబితాను శాశ్వతంగా తొలగించాలనుకుంటున్నారా?",
-  "confirmations.domain_block.message": "మీరు నిజంగా నిజంగా మొత్తం {domain} ని బ్లాక్ చేయాలనుకుంటున్నారా? చాలా సందర్భాలలో కొన్ని లక్ష్యంగా ఉన్న బ్లాక్స్ లేదా మ్యూట్స్ సరిపోతాయి మరియు ఉత్తమమైనవి. మీరు ఆ డొమైన్ నుండి కంటెంట్ను ఏ ప్రజా కాలక్రమాలలో లేదా మీ నోటిఫికేషన్లలో చూడలేరు. ఆ డొమైన్ నుండి మీ అనుచరులు తీసివేయబడతారు.",
   "confirmations.mute.confirm": "మ్యూట్ చేయి",
   "confirmations.redraft.confirm": "తొలగించు & తిరగరాయు",
   "confirmations.reply.confirm": "ప్రత్యుత్తరమివ్వు",
diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json
index 3591d07d129850..508fb15d15ba64 100644
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@@ -169,16 +169,12 @@
   "compose_form.spoiler_placeholder": "คำเตือนเนื้อหา (ไม่จำเป็น)",
   "confirmation_modal.cancel": "ยกเลิก",
   "confirmations.block.confirm": "ปิดกั้น",
-  "confirmations.cancel_follow_request.confirm": "ถอนคำขอ",
-  "confirmations.cancel_follow_request.message": "คุณแน่ใจหรือไม่ว่าต้องการถอนคำขอเพื่อติดตาม {name} ของคุณ?",
   "confirmations.delete.confirm": "ลบ",
   "confirmations.delete.message": "คุณแน่ใจหรือไม่ว่าต้องการลบโพสต์นี้?",
   "confirmations.delete_list.confirm": "ลบ",
   "confirmations.delete_list.message": "คุณแน่ใจหรือไม่ว่าต้องการลบรายการนี้อย่างถาวร?",
   "confirmations.discard_edit_media.confirm": "ละทิ้ง",
   "confirmations.discard_edit_media.message": "คุณมีการเปลี่ยนแปลงคำอธิบายหรือตัวอย่างสื่อที่ยังไม่ได้บันทึก ละทิ้งการเปลี่ยนแปลงเหล่านั้นต่อไป?",
-  "confirmations.domain_block.confirm": "ปิดกั้นเซิร์ฟเวอร์",
-  "confirmations.domain_block.message": "คุณแน่ใจจริง ๆ หรือไม่ว่าต้องการปิดกั้นทั้ง {domain}? ในกรณีส่วนใหญ่ การปิดกั้นหรือการซ่อนแบบกำหนดเป้าหมายไม่กี่รายการนั้นเพียงพอและเป็นที่นิยม คุณจะไม่เห็นเนื้อหาจากโดเมนนั้นในเส้นเวลาสาธารณะใด ๆ หรือการแจ้งเตือนของคุณ จะเอาผู้ติดตามของคุณจากโดเมนนั้นออก",
   "confirmations.edit.confirm": "แก้ไข",
   "confirmations.edit.message": "การแก้ไขในตอนนี้จะเขียนทับข้อความที่คุณกำลังเขียนในปัจจุบัน คุณแน่ใจหรือไม่ว่าต้องการดำเนินการต่อ?",
   "confirmations.logout.confirm": "ออกจากระบบ",
diff --git a/app/javascript/mastodon/locales/tok.json b/app/javascript/mastodon/locales/tok.json
index e581978f2419a4..cf76b31f927de0 100644
--- a/app/javascript/mastodon/locales/tok.json
+++ b/app/javascript/mastodon/locales/tok.json
@@ -130,15 +130,12 @@
   "compose_form.spoiler.marked": "o weka e toki pi ijo ike ken",
   "confirmation_modal.cancel": "o pini",
   "confirmations.block.confirm": "o weka",
-  "confirmations.cancel_follow_request.confirm": "o weka e wile sina",
-  "confirmations.cancel_follow_request.message": "sina awen ala awen wile weka e wile kute sina lon {name}?",
   "confirmations.delete.confirm": "o weka",
   "confirmations.delete.message": "sina wile ala wile weka e toki ni?",
   "confirmations.delete_list.confirm": "o weka",
   "confirmations.delete_list.message": "sina wile ala wile weka e lipu ni?",
   "confirmations.discard_edit_media.confirm": "o weka",
   "confirmations.discard_edit_media.message": "toki sitelen anu lukin lili sitelen la ante pi awen ala li lon. sina wile weka e ante ni?",
-  "confirmations.domain_block.message": "sina wile ala a wile a len e ma {domain} ꞏ ken suli la len jan taso li pona ꞏ len pi ma ni la sina ken ala lukin e ijo pi ma ni lon lipu toki ale anu lukin toki ꞏ len ni la jan kute sina pi ma ni li weka",
   "confirmations.edit.confirm": "o ante",
   "confirmations.edit.message": "sina ante e toki sina la toki pali sina li weka. sina wile ala wile e ni?",
   "confirmations.logout.confirm": "o weka",
diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json
index ae7b5ba25dc314..bb0b96943b3615 100644
--- a/app/javascript/mastodon/locales/tr.json
+++ b/app/javascript/mastodon/locales/tr.json
@@ -169,16 +169,12 @@
   "compose_form.spoiler_placeholder": "İçerik uyarısı (isteğe bağlı)",
   "confirmation_modal.cancel": "İptal",
   "confirmations.block.confirm": "Engelle",
-  "confirmations.cancel_follow_request.confirm": "İsteği geri çek",
-  "confirmations.cancel_follow_request.message": "{name} kişisini takip etme isteğini geri çekmek istediğinden emin misin?",
   "confirmations.delete.confirm": "Sil",
   "confirmations.delete.message": "Bu tootu silmek istediğinden emin misin?",
   "confirmations.delete_list.confirm": "Sil",
   "confirmations.delete_list.message": "Bu listeyi kalıcı olarak silmek istediğinden emin misin?",
   "confirmations.discard_edit_media.confirm": "Vazgeç",
   "confirmations.discard_edit_media.message": "Medya açıklaması veya ön izlemede kaydedilmemiş değişiklikleriniz var, yine de vazgeçmek istiyor musunuz?",
-  "confirmations.domain_block.confirm": "Sunucuyu engelle",
-  "confirmations.domain_block.message": "{domain} alanının tamamını engellemek istediğinden gerçekten emin misin? Genellikle hedeflenen birkaç engelleme veya sessize alma yeterlidir ve tercih edilir. Bu alan adından gelen içeriği herhangi bir genel zaman çizelgesinde veya bildirimlerinde görmezsin. Bu alan adındaki takipçilerin kaldırılır.",
   "confirmations.edit.confirm": "Düzenle",
   "confirmations.edit.message": "Şimdi düzenlersen şu an oluşturduğun iletinin üzerine yazılır. Devam etmek istediğine emin misin?",
   "confirmations.logout.confirm": "Oturumu kapat",
diff --git a/app/javascript/mastodon/locales/tt.json b/app/javascript/mastodon/locales/tt.json
index baba3190dc39a6..1c150c99c6c4b9 100644
--- a/app/javascript/mastodon/locales/tt.json
+++ b/app/javascript/mastodon/locales/tt.json
@@ -132,15 +132,12 @@
   "compose_form.spoiler.unmarked": "Text is not hidden",
   "confirmation_modal.cancel": "Баш тарту",
   "confirmations.block.confirm": "Блоклау",
-  "confirmations.cancel_follow_request.confirm": "Сорауны баш тарту",
-  "confirmations.cancel_follow_request.message": "Сез абонемент соравыгызны кире кайтарырга телисез {name}?",
   "confirmations.delete.confirm": "Бетерү",
   "confirmations.delete.message": "Are you sure you want to delete this status?",
   "confirmations.delete_list.confirm": "Бетерү",
   "confirmations.delete_list.message": "Сез бу исемлекне мәңгегә бетерергә телисезме?",
   "confirmations.discard_edit_media.confirm": "Баш тарту",
   "confirmations.discard_edit_media.message": "Сезнең медиа тасвирламасында яки алдан карау өчен сакланмаган үзгәрешләр бармы? ",
-  "confirmations.domain_block.message": "Сез чыннан да барысын да блокларга телисез {domain}? Күпчелек очракта берничә максатлы блоклар яки тавышсызлар җитәрлек һәм өстенлекле. Сез бу доменнан эчтәлекне җәмәгать срокларында яки хәбәрләрегездә күрмәячәксез. Бу доменнан сезнең шәкертләр бетереләчәк.",
   "confirmations.edit.confirm": "Үзгәртү",
   "confirmations.logout.confirm": "Чыгу",
   "confirmations.logout.message": "Сез чыгарга телисезме?",
diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json
index b5cd1f7b283f6d..fb9c35e438834d 100644
--- a/app/javascript/mastodon/locales/uk.json
+++ b/app/javascript/mastodon/locales/uk.json
@@ -169,20 +169,19 @@
   "compose_form.spoiler_placeholder": "Попередження про вміст (необов'язково)",
   "confirmation_modal.cancel": "Скасувати",
   "confirmations.block.confirm": "Заблокувати",
-  "confirmations.cancel_follow_request.confirm": "Відкликати запит",
-  "confirmations.cancel_follow_request.message": "Ви дійсно бажаєте відкликати запит на стеження за {name}?",
   "confirmations.delete.confirm": "Видалити",
   "confirmations.delete.message": "Ви впевнені, що хочете видалити цей допис?",
+  "confirmations.delete.title": "Видалити допис?",
   "confirmations.delete_list.confirm": "Видалити",
   "confirmations.delete_list.message": "Ви впевнені, що хочете видалити цей список назавжди?",
+  "confirmations.delete_list.title": "Видалити список?",
   "confirmations.discard_edit_media.confirm": "Відкинути",
   "confirmations.discard_edit_media.message": "У вас є незбережені зміни в описі медіа або попереднього перегляду, все одно відкинути їх?",
-  "confirmations.domain_block.confirm": "Блокувати сервер",
-  "confirmations.domain_block.message": "Ви точно, точно впевнені, що хочете заблокувати весь домен {domain}? У більшості випадків для нормальної роботи краще заблокувати або приховати лише деяких користувачів. Ви не зможете бачити контент з цього домену у будь-яких стрічках або ваших сповіщеннях. Ваші підписники з цього домену будуть відписані від вас.",
   "confirmations.edit.confirm": "Змінити",
   "confirmations.edit.message": "Редагування перезапише повідомлення, яке ви зараз пишете. Ви впевнені, що хочете продовжити?",
   "confirmations.logout.confirm": "Вийти",
   "confirmations.logout.message": "Ви впевнені, що хочете вийти?",
+  "confirmations.logout.title": "Вийти?",
   "confirmations.mute.confirm": "Приховати",
   "confirmations.redraft.confirm": "Видалити та виправити",
   "confirmations.redraft.message": "Ви впевнені, що хочете видалити цей допис та переписати його? Додавання у вибране та поширення буде втрачено, а відповіді на оригінальний допис залишаться без першоджерела.",
@@ -507,6 +506,7 @@
   "notification_requests.title": "Відфільтровані сповіщення",
   "notifications.clear": "Очистити сповіщення",
   "notifications.clear_confirmation": "Ви впевнені, що хочете назавжди видалити всі сповіщення?",
+  "notifications.clear_title": "Очистити сповіщення?",
   "notifications.column_settings.admin.report": "Нові скарги:",
   "notifications.column_settings.admin.sign_up": "Нові реєстрації:",
   "notifications.column_settings.alert": "Сповіщення стільниці",
diff --git a/app/javascript/mastodon/locales/ur.json b/app/javascript/mastodon/locales/ur.json
index 3c61846e9c63a7..d82e52ae505464 100644
--- a/app/javascript/mastodon/locales/ur.json
+++ b/app/javascript/mastodon/locales/ur.json
@@ -126,7 +126,6 @@
   "confirmations.delete.message": "Are you sure you want to delete this status?",
   "confirmations.delete_list.confirm": "ڈیلیٹ",
   "confirmations.delete_list.message": "کیا آپ واقعی اس فہرست کو مستقل طور پر ڈیلیٹ کرنا چاہتے ہیں؟",
-  "confirmations.domain_block.message": "کیا آپ واقعی، واقعی یقین رکھتے ہیں کہ آپ پورے {domain} کو بلاک کرنا چاہتے ہیں؟ زیادہ تر معاملات میں چند ٹارگٹیڈ بلاکس یا خاموش کرنا کافی اور افضل ہیں۔ آپ اس ڈومین کا مواد کسی بھی عوامی ٹائم لائنز یا اپنی اطلاعات میں نہیں دیکھیں گے۔ اس ڈومین سے آپ کے پیروکاروں کو ہٹا دیا جائے گا۔",
   "confirmations.logout.confirm": "لاگ آؤٹ",
   "confirmations.logout.message": "کیا واقعی آپ لاگ آؤٹ ہونا چاہتے ہیں؟",
   "confirmations.mute.confirm": "خاموش",
diff --git a/app/javascript/mastodon/locales/uz.json b/app/javascript/mastodon/locales/uz.json
index 90ad67d2879903..d0bcb90924cfc3 100644
--- a/app/javascript/mastodon/locales/uz.json
+++ b/app/javascript/mastodon/locales/uz.json
@@ -130,15 +130,12 @@
   "compose_form.spoiler.unmarked": "Kontent haqida ogohlantirish qo'shing",
   "confirmation_modal.cancel": "Bekor qilish",
   "confirmations.block.confirm": "Bloklash",
-  "confirmations.cancel_follow_request.confirm": "Bekor qilish",
-  "confirmations.cancel_follow_request.message": "Haqiqatan ham {name}ga obuna boʻlish soʻrovingizni qaytarib olmoqchimisiz?",
   "confirmations.delete.confirm": "Oʻchirish",
   "confirmations.delete.message": "Haqiqatan ham bu postni oʻchirib tashlamoqchimisiz?",
   "confirmations.delete_list.confirm": "Oʻchirish",
   "confirmations.delete_list.message": "Haqiqatan ham bu roʻyxatni butunlay oʻchirib tashlamoqchimisiz?",
   "confirmations.discard_edit_media.confirm": "Bekor qilish",
   "confirmations.discard_edit_media.message": "Sizda media tavsifi yoki oldindan ko‘rishda saqlanmagan o‘zgarishlar bor, ular baribir bekor qilinsinmi?",
-  "confirmations.domain_block.message": "Haqiqatan ham, {domain} ni butunlay bloklamoqchimisiz? Ko'pgina hollarda bir nechta maqsadli bloklar yoki ovozni o'chirish etarli va afzaldir. Siz oʻsha domendagi kontentni hech qanday umumiy vaqt jadvallarida yoki bildirishnomalaringizda koʻrmaysiz. Bu domendagi obunachilaringiz olib tashlanadi.",
   "confirmations.logout.confirm": "Chiqish",
   "confirmations.logout.message": "Chiqishingizga aminmisiz?",
   "confirmations.mute.confirm": "Ovozsiz",
diff --git a/app/javascript/mastodon/locales/vi.json b/app/javascript/mastodon/locales/vi.json
index 0f2cc996a2e4e1..af8008b272dfa6 100644
--- a/app/javascript/mastodon/locales/vi.json
+++ b/app/javascript/mastodon/locales/vi.json
@@ -169,16 +169,12 @@
   "compose_form.spoiler_placeholder": "Nội dung ẩn (tùy chọn)",
   "confirmation_modal.cancel": "Hủy bỏ",
   "confirmations.block.confirm": "Chặn",
-  "confirmations.cancel_follow_request.confirm": "Thu hồi yêu cầu",
-  "confirmations.cancel_follow_request.message": "Bạn có chắc muốn thu hồi yêu cầu theo dõi của bạn với {name}?",
   "confirmations.delete.confirm": "Xóa bỏ",
   "confirmations.delete.message": "Bạn thật sự muốn xóa tút này?",
   "confirmations.delete_list.confirm": "Xóa bỏ",
   "confirmations.delete_list.message": "Bạn thật sự muốn xóa vĩnh viễn danh sách này?",
   "confirmations.discard_edit_media.confirm": "Bỏ qua",
   "confirmations.discard_edit_media.message": "Bạn chưa lưu thay đổi đối với phần mô tả hoặc bản xem trước của media, vẫn bỏ luôn?",
-  "confirmations.domain_block.confirm": "Chặn máy chủ",
-  "confirmations.domain_block.message": "Bạn thật sự muốn ẩn toàn bộ nội dung từ {domain}? Sẽ hợp lý hơn nếu bạn chỉ chặn hoặc ẩn một vài tài khoản cụ thể. Ẩn toàn bộ nội dung từ máy chủ sẽ khiến bạn không còn thấy nội dung từ máy chủ đó ở bất kỳ nơi nào, kể cả thông báo. Người quan tâm bạn từ máy chủ đó cũng sẽ bị xóa luôn.",
   "confirmations.edit.confirm": "Sửa",
   "confirmations.edit.message": "Nội dung tút cũ sẽ bị ghi đè, bạn có tiếp tục?",
   "confirmations.logout.confirm": "Đăng xuất",
diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json
index f6c0feecfdb160..f5b72f05043800 100644
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@@ -169,27 +169,30 @@
   "compose_form.spoiler_placeholder": "内容警告 (可选)",
   "confirmation_modal.cancel": "取消",
   "confirmations.block.confirm": "屏蔽",
-  "confirmations.cancel_follow_request.confirm": "撤回请求",
-  "confirmations.cancel_follow_request.message": "确定撤回关注 {name} 的请求吗？",
   "confirmations.delete.confirm": "删除",
   "confirmations.delete.message": "你确定要删除这条嘟文吗？",
+  "confirmations.delete.title": "删除嘟文？",
   "confirmations.delete_list.confirm": "删除",
   "confirmations.delete_list.message": "确定永久删除这个列表吗？",
+  "confirmations.delete_list.title": "删除列表？",
   "confirmations.discard_edit_media.confirm": "丢弃",
   "confirmations.discard_edit_media.message": "您还有未保存的媒体描述或预览修改，仍要丢弃吗？",
-  "confirmations.domain_block.confirm": "屏蔽服务器",
-  "confirmations.domain_block.message": "你真的确定要屏蔽所有来自 {domain} 的内容吗？多数情况下，对几个特定的用户进行屏蔽或禁用对他们的消息提醒就足够了。屏蔽后，来自该域名的内容将不再出现在你任何的公共时间轴或通知列表里，你来自该域名下的关注者也将被移除。",
   "confirmations.edit.confirm": "编辑",
   "confirmations.edit.message": "编辑此消息将会覆盖当前正在撰写的信息。仍要继续吗？",
+  "confirmations.edit.title": "覆盖嘟文？",
   "confirmations.logout.confirm": "退出登录",
   "confirmations.logout.message": "确定要退出登录吗？",
+  "confirmations.logout.title": "退出登录？",
   "confirmations.mute.confirm": "隐藏",
   "confirmations.redraft.confirm": "删除并重新编辑",
   "confirmations.redraft.message": "确定删除这条嘟文并重写吗？所有相关的喜欢和转嘟都将丢失，嘟文的回复也会失去关联。",
+  "confirmations.redraft.title": "删除并重新嘟文？",
   "confirmations.reply.confirm": "回复",
   "confirmations.reply.message": "回复此消息将会覆盖当前正在编辑的信息。确定继续吗？",
+  "confirmations.reply.title": "覆盖嘟文？",
   "confirmations.unfollow.confirm": "取消关注",
   "confirmations.unfollow.message": "你确定要取消关注 {name} 吗？",
+  "confirmations.unfollow.title": "取消关注用户？",
   "conversation.delete": "删除对话",
   "conversation.mark_as_read": "标记为已读",
   "conversation.open": "查看对话",
@@ -507,6 +510,7 @@
   "notification_requests.title": "通知（已过滤）",
   "notifications.clear": "清空通知列表",
   "notifications.clear_confirmation": "你确定要永久清空通知列表吗？",
+  "notifications.clear_title": "清空通知？",
   "notifications.column_settings.admin.report": "新举报：",
   "notifications.column_settings.admin.sign_up": "新注册：",
   "notifications.column_settings.alert": "桌面通知",
diff --git a/app/javascript/mastodon/locales/zh-HK.json b/app/javascript/mastodon/locales/zh-HK.json
index 4b717a77dab751..58a3a339993e6d 100644
--- a/app/javascript/mastodon/locales/zh-HK.json
+++ b/app/javascript/mastodon/locales/zh-HK.json
@@ -166,16 +166,12 @@
   "compose_form.spoiler_placeholder": "內容警告 (選用)",
   "confirmation_modal.cancel": "取消",
   "confirmations.block.confirm": "封鎖",
-  "confirmations.cancel_follow_request.confirm": "撤回請求",
-  "confirmations.cancel_follow_request.message": "您確定要撤回追蹤 {name} 的請求嗎？",
   "confirmations.delete.confirm": "刪除",
   "confirmations.delete.message": "你確定要刪除這文章嗎？",
   "confirmations.delete_list.confirm": "刪除",
   "confirmations.delete_list.message": "你確定要永久刪除這列表嗎？",
   "confirmations.discard_edit_media.confirm": "捨棄",
   "confirmations.discard_edit_media.message": "您在媒體描述或預覽有尚未儲存的變更。確定要捨棄它們嗎？",
-  "confirmations.domain_block.confirm": "封鎖伺服器",
-  "confirmations.domain_block.message": "你真的真的確定要封鎖整個 {domain} ？多數情況下，封鎖或靜音幾個特定目標就已經有效，也是比較建議的做法。若然封鎖全站，你將不會再在這裏看到該站的內容和通知。來自該站的關注者亦會被移除。",
   "confirmations.edit.confirm": "編輯",
   "confirmations.edit.message": "現在編輯將會覆蓋你目前正在撰寫的訊息。你確定要繼續嗎？",
   "confirmations.logout.confirm": "登出",
diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json
index dca4cd134a2ab2..4cdf640fe101ee 100644
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@@ -169,27 +169,30 @@
   "compose_form.spoiler_placeholder": "內容警告 (可選的)",
   "confirmation_modal.cancel": "取消",
   "confirmations.block.confirm": "封鎖",
-  "confirmations.cancel_follow_request.confirm": "收回跟隨請求",
-  "confirmations.cancel_follow_request.message": "您確定要收回跟隨 {name} 的請求嗎？",
   "confirmations.delete.confirm": "刪除",
   "confirmations.delete.message": "您確定要刪除這則嘟文嗎？",
+  "confirmations.delete.title": "是否刪除該嘟文？",
   "confirmations.delete_list.confirm": "刪除",
   "confirmations.delete_list.message": "您確定要永久刪除此列表嗎？",
+  "confirmations.delete_list.title": "是否刪除該列表？",
   "confirmations.discard_edit_media.confirm": "捨棄",
   "confirmations.discard_edit_media.message": "您於媒體描述或預覽區塊有未儲存的變更。是否要捨棄這些變更？",
-  "confirmations.domain_block.confirm": "封鎖伺服器",
-  "confirmations.domain_block.message": "您真的非常確定要封鎖整個 {domain} 網域嗎？大部分情況下，封鎖或靜音少數特定的帳號就能滿足需求了。您將不能在任何公開的時間軸及通知中看到來自此網域的內容。您來自該網域的跟隨者也將被移除。",
   "confirmations.edit.confirm": "編輯",
   "confirmations.edit.message": "編輯嘟文將覆蓋掉您目前正在撰寫之嘟文內容。您是否仍要繼續？",
+  "confirmations.edit.title": "是否覆寫該嘟文？",
   "confirmations.logout.confirm": "登出",
   "confirmations.logout.message": "您確定要登出嗎？",
+  "confirmations.logout.title": "您確定要登出嗎？",
   "confirmations.mute.confirm": "靜音",
   "confirmations.redraft.confirm": "刪除並重新編輯",
   "confirmations.redraft.message": "您確定要刪除這則嘟文並重新編輯嗎？您將失去這則嘟文之轉嘟及最愛，且對此嘟文之回覆會變成獨立的嘟文。",
+  "confirmations.redraft.title": "是否刪除並重新編輯該嘟文？",
   "confirmations.reply.confirm": "回覆",
   "confirmations.reply.message": "回覆嘟文將覆蓋掉您目前正在撰寫之嘟文內容。您是否仍要繼續？",
+  "confirmations.reply.title": "是否覆寫該嘟文？",
   "confirmations.unfollow.confirm": "取消跟隨",
   "confirmations.unfollow.message": "您確定要取消跟隨 {name} 嗎？",
+  "confirmations.unfollow.title": "是否取消跟隨該使用者？",
   "conversation.delete": "刪除對話",
   "conversation.mark_as_read": "標記為已讀",
   "conversation.open": "檢視對話",
@@ -507,6 +510,7 @@
   "notification_requests.title": "已過濾之通知",
   "notifications.clear": "清除通知",
   "notifications.clear_confirmation": "您確定要永久清除您的通知嗎？",
+  "notifications.clear_title": "是否清除推播通知？",
   "notifications.column_settings.admin.report": "新檢舉報告：",
   "notifications.column_settings.admin.sign_up": "新註冊帳號：",
   "notifications.column_settings.alert": "桌面通知",
diff --git a/config/locales/activerecord.fi.yml b/config/locales/activerecord.fi.yml
index feb4fbf4c58342..b731de6d3c0685 100644
--- a/config/locales/activerecord.fi.yml
+++ b/config/locales/activerecord.fi.yml
@@ -28,7 +28,7 @@ fi:
         doorkeeper/application:
           attributes:
             website:
-              invalid: ei ole kelvollinen verkko-osoite
+              invalid: ei ole kelvollinen URL-osoite
         import:
           attributes:
             data:
diff --git a/config/locales/activerecord.sc.yml b/config/locales/activerecord.sc.yml
index aadd00287f54ad..cd474ea542c068 100644
--- a/config/locales/activerecord.sc.yml
+++ b/config/locales/activerecord.sc.yml
@@ -24,7 +24,7 @@ sc:
         status:
           attributes:
             reblog:
-              taken: de s'istadu esistet giai
+              taken: de sa publicatzione esistet giai
         user:
           attributes:
             email:
diff --git a/config/locales/devise.fi.yml b/config/locales/devise.fi.yml
index 8963bf5a45b021..f6223fc4800695 100644
--- a/config/locales/devise.fi.yml
+++ b/config/locales/devise.fi.yml
@@ -2,9 +2,9 @@
 fi:
   devise:
     confirmations:
-      confirmed: Sähköpostiosoitteesi on vahvistettu.
-      send_instructions: Saat pian sähköpostitse ohjeet sähköpostiosoitteesi vahvistamiseen. Jos et saanut viestiä, tarkista roskapostikansiosi.
-      send_paranoid_instructions: Jos sähköpostiosoitteesi on tiedossammme, saat pian sähköpostiisi ohjeet sen vahvistamiseen. Jos et saanut viestiä, tarkista roskapostikansiosi.
+      confirmed: Sähköpostiosoitteesi vahvistus onnistui.
+      send_instructions: Saat pian sähköpostiisi ohjeet sähköpostiosoitteesi vahvistamiseen. Jos viestiä ei kuulu, tarkista roskapostikansiosi.
+      send_paranoid_instructions: Jos sähköpostiosoitteesi on tiedossammme, saat pian sähköpostiisi ohjeet sen vahvistamiseen. Jos viestiä ei kuulu, tarkista roskapostikansiosi.
     failure:
       already_authenticated: Olet jo kirjautunut sisään.
       inactive: Tiliäsi ei ole vielä aktivoitu.
@@ -14,7 +14,7 @@ fi:
       not_found_in_database: Virheellinen %{authentication_keys} tai salasana.
       omniauth_user_creation_failure: Virhe luotaessa tiliä tälle henkilöllisyydelle.
       pending: Tilisi on vielä tarkistamatta.
-      timeout: Istuntosi on vanhentunut. Jatkaaksesi käyttöä, kirjaudu uudelleen.
+      timeout: Istuntosi on vanhentunut. Jatka kirjautumalla uudelleen sisään.
       unauthenticated: Sinun on kirjauduttava tai rekisteröidyttävä ennen kuin voit jatkaa.
       unconfirmed: Vahvista sähköpostiosoitteesi, ennen kuin jatkat.
     mailer:
@@ -24,27 +24,27 @@ fi:
         explanation: Olet luonut käyttäjätilin palvelimelle %{host} tätä sähköpostiosoitetta käyttäen. Olet painalluksen päässä tilin aktivoinnista. Jos et luonut tiliä itse, voit jättää tämän viestin huomiotta.
         explanation_when_pending: Teit hakemuksen kutsusta palvelimelle %{host} tällä sähköpostiosoitteella. Kun olet vahvistanut sähköpostiosoitteesi, tarkistamme hakemuksesi. Voit kirjautua sisään muuttaaksesi hakemuksen sisältöä tai poistaaksesi tilin, mutta et voi käyttää suurinta osaa toiminnallisuudesta ennen kuin hakemuksesi on hyväksytty. Jos hakemuksesi hylätään, tietosi poistetaan eikä sinulta tarvita enempää toimia. Jos sinä et tehnyt hakemusta, voit jättää tämän viestin huomiotta.
         extra_html: Tutustu myös <a href="%{terms_path}">palvelimen sääntöihin</a> ja <a href="%{policy_path}">palveluehtoihimme</a>.
-        subject: 'Mastodon: Vahvistusohjeet instanssille %{instance}'
+        subject: 'Mastodon: vahvistusohjeet palvelimelle %{instance}'
         title: Vahvista sähköpostiosoite
       email_changed:
         explanation: 'Tilin sähköpostiosoitteeksi vaihdetaan:'
         extra: Jos et vaihtanut sähköpostiosoitettasi, joku muu on todennäköisesti päässyt käyttämään tiliäsi. Vaihda salasanasi viipymättä, tai ota yhteys palvelimen ylläpitoon, ellet pääse sisään käyttäjätilillesi.
-        subject: 'Mastodon: Sähköpostiosoite vaihdettu'
+        subject: 'Mastodon: sähköpostiosoite vaihdettu'
         title: Uusi sähköpostiosoite
       password_change:
         explanation: Tilisi salasana on vaihdettu.
-        extra: Ellet vaihtanut salasanaasi, joku muu on todennäköisesti päässyt käyttäjätilillesi. Vaihda salasanasi viipymättä, tai ota yhteys palvelimen ylläpitoon, jos kirjautuminen käyttäjätilillesi ei onnistu.
+        extra: Jos et vaihtanut salasanaasi, joku muu on todennäköisesti päässyt käyttämään tiliäsi. Vaihda salasanasi viipymättä, tai ota yhteys palvelimen ylläpitoon, ellet pääse sisään käyttäjätilillesi.
         subject: 'Mastodon: salasana vaihdettu'
         title: Salasana vaihdettu
       reconfirmation_instructions:
         explanation: Vahvista uusi sähköpostiosoite, niin muutos astuu voimaan.
-        extra: Jos et tehnyt muutosta itse, voit jättää tämän viestin huomiotta. Mastodon-tilin sähköpostiosoitetta ei vaihdeta, ennen kuin klikkaat yllä olevaa linkkiä.
-        subject: 'Mastodon: Vahvista sähköpostiosoite palvelimelle %{instance}'
+        extra: Jos et tehnyt muutosta itse, voit jättää tämän viestin huomiotta. Mastodon-tilin sähköpostiosoitetta ei vaihdeta, ennen kuin painat edellä olevaa linkkiä.
+        subject: 'Mastodon: vahvista sähköpostiosoite palvelimelle %{instance}'
         title: Vahvista sähköpostiosoite
       reset_password_instructions:
         action: Vaihda salasana
         explanation: Pyysit tilillesi uuden salasanan.
-        extra: Jos et tehnyt pyyntöä itse, voit jättää tämän viestin huomiotta. Salasanaasi ei vaihdeta, ennen kuin klikkaat yllä olevaa linkkiä ja luot uuden salasanan.
+        extra: Jos et tehnyt pyyntöä itse, voit jättää tämän viestin huomiotta. Salasanaasi ei vaihdeta, ennen kuin painat edellä olevaa linkkiä ja luot uuden salasanan.
         subject: 'Mastodon: ohjeet salasanan vaihtoon'
         title: Salasanan vaihto
       two_factor_disabled:
@@ -59,37 +59,37 @@ fi:
         title: Kaksivaiheinen todennus käytössä
       two_factor_recovery_codes_changed:
         explanation: Uudet palautuskoodit on nyt luotu ja vanhat mitätöity.
-        subject: 'Mastodon: Kaksivaihetodennuksen palautuskoodit luotiin uudelleen'
+        subject: 'Mastodon: kaksivaiheisen todennuksen palautuskoodit luotiin uudelleen'
         subtitle: Aiemmat palautuskoodit on mitätöity, ja korvaavat uudet koodit on luotu.
         title: 2-vaiheisen todennuksen palautuskoodit vaihdettiin
       unlock_instructions:
-        subject: 'Mastodon: lukituksen poistamisen ohjeet'
+        subject: 'Mastodon: ohjeet lukituksen poistoon'
       webauthn_credential:
         added:
           explanation: Seuraava suojausavain on lisätty tilillesi
-          subject: 'Mastodon: Uusi suojausavain'
+          subject: 'Mastodon: uusi suojausavain'
           title: Uusi suojausavain on lisätty
         deleted:
           explanation: Seuraava suojausavain on poistettu tililtäsi
-          subject: 'Mastodon: Suojausavain poistettu'
+          subject: 'Mastodon: suojausavain poistettu'
           title: Yksi suojausavaimistasi on poistettu
       webauthn_disabled:
-        explanation: Turva-avaimin kirjautuminen tilillesi on kytketty pois käytöstä.
+        explanation: Suojausavaimella todennus on poissa käytöstä tililläsi.
         extra: Olet nyt mahdollistanut sisäänkirjautumisen käyttäjätilillesi pelkästään palveluun liitetyn TOTP-sovelluksen luomalla aikarajoitteisella kertatunnusluvulla.
-        subject: 'Mastodon: Turva-avaintodennus on poistettu käytöstä'
+        subject: 'Mastodon: suojausavaimella todennus poistettu käytöstä'
         title: Suojausavaimet poistettu käytöstä
       webauthn_enabled:
-        explanation: Turva-avaimella kirjautuminen on otettu käyttöön tilillesi.
-        extra: Voit nyt kirjautua sisään turva-avaimellasi.
-        subject: 'Mastodon: Todennus suojausavaimella on otettu käyttöön'
+        explanation: Suojausavaimella todennus on käytössä tililläsi.
+        extra: Voit nyt kirjautua sisään suojausavaimellasi.
+        subject: 'Mastodon: suojausavaimella todennus otettu käyttöön'
         title: Suojausavaimet käytössä
     omniauth_callbacks:
-      failure: Tunnistautuminen lähteestä %{kind} ei onnistunut, koska "%{reason}".
+      failure: Tunnistautuminen lähteestä %{kind} ei onnistunut, syynä ”%{reason}”.
       success: Tunnistautuminen tililtä %{kind} onnistui.
     passwords:
       no_token: Tälle sivulle pääsee vain salasananvaihtoviestin kautta. Jos tiedät tulevasi sen kautta, varmista, että käytät viestissä mainittua URL-osoitetta kokonaisuudessaan.
-      send_instructions: Jos sähköpostiosoite on tietokannassamme, siihen lähetetään pian viesti, jossa on linkki salasanan vaihtamiseksi. Mikäli viestiä ei kuulu, tarkista myös roskapostisi.
-      send_paranoid_instructions: Jos sähköpostiosoite on tietokannassamme, siihen lähetetään pian viesti, jossa on linkki salasanan vaihtamiseksi. Mikäli viestiä ei kuulu, tarkista myös roskapostisi.
+      send_instructions: Jos sähköpostiosoiteesi on tiedossamme, siihen lähetetään pian viesti, jossa on linkki salasanan vaihtamiseksi. Jos viestiä ei kuulu, tarkista roskapostikansiosi.
+      send_paranoid_instructions: Jos sähköpostiosoiteesi on tiedossamme, siihen lähetetään pian viesti, jossa on linkki salasanan vaihtamiseksi. Jos viestiä ei kuulu, tarkista roskapostikansiosi.
       updated: Salasanan vaihto onnistui. Olet nyt kirjautunut sisään.
       updated_not_active: Salasanan vaihto onnistui.
     registrations:
@@ -98,16 +98,16 @@ fi:
       signed_up_but_inactive: Rekisteröityminen onnistui. Emme kuitenkaan voi kirjata sinua sisään, sillä käyttäjätiliäsi ei ole vielä aktivoitu.
       signed_up_but_locked: Rekisteröityminen onnistui. Emme kuitenkaan voi kirjata sinua sisään, sillä käyttäjätilisi on lukittuna.
       signed_up_but_pending: Sähköpostiosoitteeseesi on lähetetty vahvistuslinkki. Sen avattuasi tarkistamme hakemuksesi, ja ilmoitamme hyväksynnästä.
-      signed_up_but_unconfirmed: Sähköpostiosoitteeseesi on lähetetty vahvistuslinkki. Aktivoi käyttäjätilisi seuraamalla linkkiä. Mikäli sitä ei kuulu, tarkista myös roskapostisi.
-      update_needs_confirmation: Tilin päivitys onnistui. Uusi sähköpostiosoite on kuitenkin vahvistettava. Tarkista saapuneet viestisi, ja vahvista uusi sähköpostiosoitteesi vahvistuslinkkiä seuraten. Mikäli viestiä ei kuulu, tarkista myös roskapostisi.
+      signed_up_but_unconfirmed: Sähköpostiosoitteeseesi on lähetetty vahvistuslinkki. Aktivoi käyttäjätilisi seuraamalla linkkiä. Jos sitä ei kuulu, tarkista roskapostikansiosi.
+      update_needs_confirmation: Tilin päivitys onnistui. Uusi sähköpostiosoite on kuitenkin vahvistettava. Tarkista saapuneet viestisi, ja vahvista uusi sähköpostiosoitteesi vahvistuslinkkiä seuraten. Jos viestiä ei kuulu, tarkista myös roskapostikansiosi.
       updated: Käyttäjätilisi tietojen päivittäminen onnistui.
     sessions:
       already_signed_out: Uloskirjautuminen onnistui.
       signed_in: Sisäänkirjautuminen onnistui.
       signed_out: Uloskirjautuminen onnistui.
     unlocks:
-      send_instructions: Saat pian sähköpostitse ohjeet tilin lukituksen poistoon. Jos et saanut viestiä, tarkista roskapostikansio.
-      send_paranoid_instructions: Jos tili on olemassa, saat pian sähköpostitse ohjeet tilin lukituksen poistoon. Jos et saanut viestiä, tarkista roskapostikansio.
+      send_instructions: Saat pian sähköpostiisi ohjeet tilin lukituksen poistoon. Jos viestiä ei kuulu, tarkista roskapostikansiosi.
+      send_paranoid_instructions: Jos tili on olemassa, saat pian sähköpostiisi ohjeet tilin lukituksen poistoon. Jos viestiä ei kuulu, tarkista roskapostikansiosi.
       unlocked: Tilisi lukituksen poisto onnistui. Jatka kirjautumalla sisään.
   errors:
     messages:
diff --git a/config/locales/devise.sc.yml b/config/locales/devise.sc.yml
index 5486371a4c671a..dde8fd229e9b15 100644
--- a/config/locales/devise.sc.yml
+++ b/config/locales/devise.sc.yml
@@ -14,7 +14,7 @@ sc:
       not_found_in_database: "%{authentication_keys} o crae non vàlida."
       pending: Su contu tuo est ancora in revisione.
       timeout: Sa sessione tua est iscadida. Torra·bi a intrare pro sighire.
-      unauthenticated: Tocat a ti autenticare o ti registrare prima de sighire.
+      unauthenticated: Ti depes identificare o registrare prima de sighire.
       unconfirmed: Depes cunfirmare s'indiritzu tuo de posta eletrònica prima de sighire.
     mailer:
       confirmation_instructions:
@@ -74,7 +74,7 @@ sc:
         subject: 'Mastodon: Autenticatzione cun sa crae de seguresa ativada'
         title: Craes de seguresa abilitadas
     omniauth_callbacks:
-      failure: Faddina in s'autenticatzione dae %{kind}, ca "%{reason}".
+      failure: 'Faddina in s''autenticatzione dae %{kind}; resone: "%{reason}".'
       success: Autenticatzione curreta dae su contu de %{kind}.
     passwords:
       no_token: No podes intrare a custa pàgina sena passare dae unu messàgiu de posta eletrònica pro resetare sa crae. Si benes dae su messàgiu de posta pro resetare sa crae, faghe in modu de impreare s'URL intreu chi t'ant donadu.
diff --git a/config/locales/doorkeeper.fi.yml b/config/locales/doorkeeper.fi.yml
index b028c10a826270..3aae89f6cacaff 100644
--- a/config/locales/doorkeeper.fi.yml
+++ b/config/locales/doorkeeper.fi.yml
@@ -4,7 +4,7 @@ fi:
     attributes:
       doorkeeper/application:
         name: Sovelluksen nimi
-        redirect_uri: Uudelleenohjauksen URI
+        redirect_uri: Uudelleenohjaus-URI
         scopes: Oikeudet
         website: Sovelluksen verkkosivusto
     errors:
@@ -12,10 +12,10 @@ fi:
         doorkeeper/application:
           attributes:
             redirect_uri:
-              fragment_present: ei voi sisältää osia.
+              fragment_present: ei voi sisältää ankkuria (#).
               invalid_uri: on oltava kelvollinen URI.
               relative_uri: on oltava täysi URI.
-              secured_uri: on oltava HTTPS/SSL-URI.
+              secured_uri: on oltava HTTPS-/SSL-URI.
   doorkeeper:
     applications:
       buttons:
@@ -48,10 +48,10 @@ fi:
         title: Uusi sovellus
       show:
         actions: Toiminnot
-        application_id: Ohjelman tunnus
+        application_id: Asiakasohjelman tunnus
         callback_urls: Takaisinkutsu-URL:t
         scopes: Oikeudet
-        secret: Ohjelman salaisuus
+        secret: Asiakasohjelman salaisuus
         title: 'Sovellus: %{name}'
     authorizations:
       buttons:
@@ -67,7 +67,7 @@ fi:
         title: Kopioi tämä valtuutuskoodi ja liitä se sovellukseen.
     authorized_applications:
       buttons:
-        revoke: Hylkää
+        revoke: Poista
       confirmations:
         revoke: Oletko varma?
       index:
@@ -77,17 +77,17 @@ fi:
         never_used: Ei käytetty
         scopes: Oikeudet
         superapp: Sisäinen
-        title: Valtuutetut sovellukset
+        title: Valtuuttamasi sovellukset
     errors:
       messages:
         access_denied: Resurssin omistaja tai valtuutuspalvelin hylkäsi pyynnön.
         credential_flow_not_configured: Resurssin omistajan salasanatietojen luku epäonnistui, koska asetusta Doorkeeper.configure.resource_owner_from_credentials ei ole konfiguroitu.
-        invalid_client: Asiakasohjelman valtuutus epäonnistui, koska asiakas on tuntematon, asiakkaan valtuutus ei ollut mukana tai valtuutustapaa ei tueta.
-        invalid_grant: Valtuutuslupa on virheellinen, umpeutunut, peruttu, valtuutuspyynnössä käytettyä uudelleenohjaus-URI:tä vastaamaton tai myönnetty toiselle asiakkaalle.
+        invalid_client: Asiakasohjelman todennus epäonnistui, koska asiakas on tuntematon, asiakkaan todennus ei ollut mukana tai todennustapaa ei tueta.
+        invalid_grant: Valtuutuslupa on virheellinen, vanhentunut, peruttu, valtuutuspyynnössä käytettyä uudelleenohjaus-URI:tä vastaamaton tai myönnetty toiselle asiakkaalle.
         invalid_redirect_uri: Uudelleenohjaus-URI on virheellinen.
         invalid_request:
           missing_param: 'Vaadittu parametri puuttuu: %{value}.'
-          request_not_authorized: Pyyntö on hyväksyttävä. Vaadittu parametri pyynnön hyväksymiseksi puuttuu tai on virheellinen.
+          request_not_authorized: Pyyntö on valtuutettava. Vaadittu parametri pyynnön valtuuttamiseksi puuttuu tai on virheellinen.
           unknown: Pyynnöstä puuttuu vaadittu parametri, se sisältää tukemattoman parametriarvon tai on muulla tavoin väärin muotoiltu.
         invalid_resource_owner: Annetut resurssin omistajan tunnnukset ovat virheelliset, tai resurssin omistajaa ei löydy
         invalid_scope: Pyydetyt oikeudet ovat virheellisiä, tuntemattomia tai väärin muotoiltuja.
@@ -139,7 +139,7 @@ fi:
         push: Puskuilmoitukset
         reports: Raportit
         search: Hae
-        statuses: Viestit
+        statuses: Julkaisut
     layouts:
       admin:
         nav:
@@ -157,17 +157,17 @@ fi:
       admin:read:ip_blocks: lue arkaluonteisia tietoja kaikista estetyistä IP-osoitteista
       admin:read:reports: lue arkaluonteisia tietoja kaikista raporteista ja raportoiduista tileistä
       admin:write: muokkaa kaikkia palvelimen tietoja
-      admin:write:accounts: suorita valvontatoimia tileille
-      admin:write:canonical_email_blocks: suorita valvontatoimia estetyille kanonisille sähköpostiosoitteille
-      admin:write:domain_allows: suorita valvontatoimia sallituille verkkotunnuksille
-      admin:write:domain_blocks: suorita valvontatoimia estetyille verkkotunnuksille
-      admin:write:email_domain_blocks: suorita valvontatoimia estetyille sähköpostiverkkotunnuksille
-      admin:write:ip_blocks: suorita valvontatoimia estetyille IP-osoitteille
-      admin:write:reports: suorita valvontatoimia raporteille
+      admin:write:accounts: suorita moderointitoimia tileille
+      admin:write:canonical_email_blocks: suorita moderointitoimia estetyille kanonisille sähköpostiosoitteille
+      admin:write:domain_allows: suorita moderointitoimia sallituille verkkotunnuksille
+      admin:write:domain_blocks: suorita moderointitoimia estetyille verkkotunnuksille
+      admin:write:email_domain_blocks: suorita moderointitoimia estetyille sähköpostiverkkotunnuksille
+      admin:write:ip_blocks: suorita moderointitoimia estetyille IP-osoitteille
+      admin:write:reports: suorita moderointitoimia raporteille
       crypto: käytä päästä päähän -salausta
       follow: muokkaa tilin suhteita
       profile: lue vain tilisi profiilitietoja
-      push: vastaanota puskuilmoituksiasi
+      push: vastaanota puskuilmoituksesi
       read: lue kaikkia tilin tietoja
       read:accounts: katso tilien tietoja
       read:blocks: katso estojasi
diff --git a/config/locales/doorkeeper.sc.yml b/config/locales/doorkeeper.sc.yml
index 297d6bd8f0c3ed..4c18e46197068d 100644
--- a/config/locales/doorkeeper.sc.yml
+++ b/config/locales/doorkeeper.sc.yml
@@ -110,10 +110,11 @@ sc:
         accounts: Contos
         bookmarks: Sinnalibros
         conversations: Arresonadas
+        favourites: Preferidos
         filters: Filtros
         follows: Sighende
         lists: Listas
-        media: Allegados multimediales
+        media: Elementos multimediales alligongiados
         notifications: Notìficas
         push: Notìficas push
         reports: Informes
@@ -139,6 +140,7 @@ sc:
       read:accounts: bìdere is informatziones in su contu
       read:blocks: bìdere is blocos tuos
       read:bookmarks: bìdere is sinnalibros tuos
+      read:favourites: bide is preferidos tuos
       read:filters: bìdere is filtros tuos
       read:follows: bìdere is sighiduras tuas
       read:lists: bìdere is listas tuas
@@ -146,11 +148,11 @@ sc:
       read:notifications: bìdere is notìficas tuas
       read:reports: bìdere is sinnalatziones tuas
       read:search: chircare a nòmine tuo
-      read:statuses: bìdere totu is istados
+      read:statuses: bide totu is publicatziones
       write: modificare totu is datos de su contu tuo
       write:accounts: modificare su profilu tuo
       write:blocks: blocare contos e domìnios
-      write:bookmarks: agiùnghere is istados a is sinnalibros
+      write:bookmarks: agiunghe is publicatziones a is sinnalibros
       write:filters: creare filtros
       write:follows: sighire persones
       write:lists: creare listas
@@ -158,4 +160,4 @@ sc:
       write:mutes: pònnere persones e arresonadas a sa muda
       write:notifications: isboidare is notìficas tuas
       write:reports: sinnalare àteras persones
-      write:statuses: publicare istados
+      write:statuses: pùblica
diff --git a/config/locales/es-MX.yml b/config/locales/es-MX.yml
index 22531d2403dfa1..f39de2b27b1dfe 100644
--- a/config/locales/es-MX.yml
+++ b/config/locales/es-MX.yml
@@ -471,6 +471,9 @@ es-MX:
       title: Recomendaciones de cuentas
       unsuppress: Restaurar recomendaciones de cuentas
     instances:
+      audit_log:
+        title: Registros de auditoría recientes
+        view_all: Ver registros de auditoría completos
       availability:
         description_html:
           one: Si el envío al dominio falla <strong>%{count} día</strong> sin éxito, no se harán más intentos de entrega a menos que se reciba un envío <em>desde</em> el dominio.
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 567526fe8b7494..fbee73ed2ac05d 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -471,6 +471,9 @@ es:
       title: Recomendaciones de cuentas
       unsuppress: Restaurar recomendaciones de cuentas
     instances:
+      audit_log:
+        title: Registros de auditoría recientes
+        view_all: Ver registros de auditoría completos
       availability:
         description_html:
           one: Si el envío al dominio falla <strong>%{count} día</strong> sin éxito, no se harán más intentos de entrega a menos que se reciba un envío <em>desde</em> el dominio.
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 25604d6a1cc2ca..344d6b84caf55b 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -12,7 +12,7 @@ fi:
       one: seuraaja
       other: seuraajaa
     following: seurattu(a)
-    instance_actor_flash: Tämä tili on virtuaalinen toimija, jota käytetään edustamaan itse palvelinta eikä yksittäistä käyttäjää. Sitä käytetään liittoutumistarkoituksiin, eikä sitä tule jäädyttää.
+    instance_actor_flash: Tämä tili on virtuaalinen toimija, jota käytetään edustamaan itse palvelinta eikä yksittäistä käyttäjää. Sitä käytetään federointitarkoituksiin, eikä sitä tule jäädyttää.
     last_active: viimeksi aktiivinen
     link_verified_on: Tämän linkin omistus on tarkastettu %{date}
     nothing_here: Täällä ei ole mitään!
@@ -24,12 +24,12 @@ fi:
     posts_tab_heading: Julkaisut
   admin:
     account_actions:
-      action: Suorita toimenpide
-      title: Suorita valvontatoimi käyttäjälle %{acct}
+      action: Suorita toimi
+      title: Suorita moderointitoimi käyttäjälle %{acct}
     account_moderation_notes:
       create: Jätä muistiinpano
-      created_msg: Valvontamuistiinpanon luonti onnistui!
-      destroyed_msg: Valvontamuistiinpanon poisto onnistui!
+      created_msg: Moderointimuistiinpanon luonti onnistui!
+      destroyed_msg: Moderointimuistiinpanon poisto onnistui!
     accounts:
       add_email_domain_block: Estä sähköpostiverkkotunnus
       approve: Hyväksy
@@ -38,14 +38,14 @@ fi:
       avatar: Profiilikuva
       by_domain: Verkkotunnus
       change_email:
-        changed_msg: Sähköpostin vaihto onnistui!
+        changed_msg: Sähköpostiosoitteen vaihto onnistui!
         current_email: Nykyinen sähköposti
         label: Vaihda sähköposti
         new_email: Uusi sähköposti
         submit: Vaihda sähköposti
         title: Vaihda käyttäjän %{username} sähköposti-osoite
       change_role:
-        changed_msg: Rooli vaihdettu onnistuneesti!
+        changed_msg: Roolin vaihto onnistui!
         label: Vaihda roolia
         no_role: Ei roolia
         title: Vaihda käyttäjän %{username} roolia
@@ -58,18 +58,18 @@ fi:
       demote: Alenna
       destroyed_msg: Käyttäjän %{username} tiedot ovat nyt jonossa poistettavaksi välittömästi
       disable: Poista käytöstä
-      disable_sign_in_token_auth: Poista sähköpostitunnuksen todennus käytöstä
+      disable_sign_in_token_auth: Poista sähköpostitunnuksella todennus käytöstä
       disable_two_factor_authentication: Poista 2FA käytöstä
       disabled: Poistettu käytöstä
       display_name: Näyttönimi
       domain: Verkkotunnus
       edit: Muokkaa
-      email: Sähköposti
+      email: Sähköpostiosoite
       email_status: Sähköpostin tila
       enable: Ota käyttöön
-      enable_sign_in_token_auth: Ota sähköpostitunnuksen todennus käyttöön
+      enable_sign_in_token_auth: Ota sähköpostitunnuksella todennus käyttöön
       enabled: Käytössä
-      enabled_msg: Käyttäjän %{username} tili palautettu onnistuneesti käyttöön
+      enabled_msg: Käyttäjän %{username} tilin jäädytys kumottiin onnistuneesti
       followers: Seuraajat
       follows: Seuratut
       header: Otsakekuva
@@ -87,23 +87,23 @@ fi:
       media_attachments: Medialiitteet
       memorialize: Muuta muistosivuksi
       memorialized: Muutettu muistotiliksi
-      memorialized_msg: Käyttäjän %{username} tili muutettu onnistuneesti muistotiliksi
+      memorialized_msg: Käyttäjän %{username} tili muutettiin muistotiliksi onnistuneesti
       moderation:
         active: Aktiivinen
         all: Kaikki
         disabled: Ei käytössä
-        pending: Odottavat
+        pending: Odottaa
         silenced: Rajoitettu
         suspended: Jäädytetty
-        title: Valvonta
-      moderation_notes: Valvontamuistiinpanot
+        title: Moderointi
+      moderation_notes: Moderointimuistiinpanot
       most_recent_activity: Viimeisin toiminta
       most_recent_ip: Viimeisin IP
       no_account_selected: Tilejä ei muutettu, koska yhtään ei ollut valittuna
       no_limits_imposed: Rajoituksia ei ole asetettu
-      no_role_assigned: Roolia ei ole määritetty
+      no_role_assigned: Roolia ei määritetty
       not_subscribed: Ei tilaaja
-      pending: Odottaa tarkistusta
+      pending: Odottaa tarkastusta
       perform_full_suspension: Jäädytä
       previous_strikes: Aiemmat varoitukset
       previous_strikes_description_html:
@@ -114,19 +114,19 @@ fi:
       public: Julkinen
       push_subscription_expires: PuSH-tilaus vanhenee
       redownload: Päivitä profiilikuva
-      redownloaded_msg: Käyttäjän %{username} profiilin päivittäminen alkuperästä onnistui
+      redownloaded_msg: Käyttäjän %{username} profiili päivitettiin alkuperästä onnistuneesti
       reject: Hylkää
       rejected_msg: Käyttäjän %{username} rekisteröitymishakemus hylättiin
       remote_suspension_irreversible: Tämän tilin tiedot on poistettu peruuttamattomasti.
       remote_suspension_reversible_hint_html: Tili on jäädytetty omalla palvelimellaan, ja kaikki tiedot poistetaan %{date}. Sitä ennen etäpalvelin voi palauttaa tilin ongelmitta. Jos haluat poistaa kaikki tilin tiedot heti, onnistuu se alta.
       remove_avatar: Poista profiilikuva
       remove_header: Poista otsakekuva
-      removed_avatar_msg: Käyttäjän %{username} avatar-kuva poistettu onnistuneesti
+      removed_avatar_msg: Käyttäjän %{username} avatar-kuva poistettiin onnistuneesti
       removed_header_msg: Käyttäjän %{username} otsakekuva poistettiin onnistuneesti
       resend_confirmation:
         already_confirmed: Tämä käyttäjä on jo vahvistettu
         send: Lähetä vahvistuslinkki uudelleen
-        success: Vahvistuslinkki on lähetetty!
+        success: Vahvistuslinkin lähetys onnistui!
       reset: Palauta
       reset_password: Palauta salasana
       resubscribe: Tilaa uudelleen
@@ -154,25 +154,25 @@ fi:
       suspension_irreversible: Tämän tilin tiedot on poistettu peruuttamattomasti. Voit kumota tilin jäädytyksen, jolloin siitä tulee käyttökelpoinen, mutta toiminto ei palauta sillä aiemmin olleita tietoja.
       suspension_reversible_hint_html: Tili on jäädytetty, ja tiedot poistetaan kokonaan %{date}. Siihen asti tili voidaan palauttaa ongelmitta. Jos haluat poistaa kaikki tilin tiedot heti, onnistuu se alta.
       title: Tilit
-      unblock_email: Poista sähköpostiosoitteen esto
+      unblock_email: Kumoa sähköpostiosoitteen esto
       unblocked_email_msg: Käyttäjän %{username} sähköpostiosoitteen esto kumottiin
       unconfirmed_email: Sähköpostia ei vahvistettu
       undo_sensitized: Kumoa pakotus arkaluonteiseksi
       undo_silenced: Kumoa rajoitus
       undo_suspension: Peru jäähy
-      unsilenced_msg: Tilin %{username} rajoituksen kumoaminen onnistui
+      unsilenced_msg: Tilin %{username} rajoitus kumottiin onnistuneesti
       unsubscribe: Lopeta tilaus
-      unsuspended_msg: Tilin %{username} jäädytyksen kumoaminen onnistui
+      unsuspended_msg: Tilin %{username} jäädytys kumottiin onnistuneesti
       username: Käyttäjänimi
       view_domain: Näytä verkkotunnuksen yhteenveto
       warn: Varoita
       web: Verkko
-      whitelisted: Sallittu liittoutua
+      whitelisted: Salli federointi
     action_logs:
       action_types:
         approve_appeal: Hyväksy valitus
         approve_user: Hyväksy käyttäjä
-        assigned_to_self_report: Määritä raportti
+        assigned_to_self_report: Ota raportti käsiteltäväksi
         change_email_user: Vaihda sähköposti käyttäjälle
         change_role_user: Muuta käyttäjän roolia
         confirm_user: Vahvista käyttäjä
@@ -200,25 +200,25 @@ fi:
         destroy_user_role: Hävitä rooli
         disable_2fa_user: Poista kaksivaiheinen tunnistautuminen käytöstä
         disable_custom_emoji: Poista mukautettu emoji käytöstä
-        disable_sign_in_token_auth_user: Estä käyttäjältä sähköpostitunnuksen todennus
+        disable_sign_in_token_auth_user: Estä käyttäjältä sähköpostitunnuksella todennus
         disable_user: Poista tili käytöstä
         enable_custom_emoji: Käytä mukautettuja emojeita
-        enable_sign_in_token_auth_user: Salli käyttäjälle sähköpostitunnuksen todennus
+        enable_sign_in_token_auth_user: Salli käyttäjälle sähköpostitunnuksella todennuksen
         enable_user: Ota tili käyttöön
         memorialize_account: Muuta muistotiliksi
         promote_user: Käyttäjä ylennetty
         reject_appeal: Hylkää valitus
         reject_user: Hylkää käyttäjä
         remove_avatar_user: Profiilikuvan poisto
-        reopen_report: Uudelleenavaa raportti
+        reopen_report: Avaa raportti uudelleen
         resend_user: Lähetä vahvistusviesti uudelleen
         reset_password_user: Nollaa salasana
         resolve_report: Selvitä raportti
         sensitive_account: Pakotus arkaluonteiseksi tiliksi
         silence_account: Rajoita tiliä
         suspend_account: Jäädytä tili
-        unassigned_report: Peruuta raportin määritys
-        unblock_email_account: Poista sähköpostiosoitteen esto
+        unassigned_report: Poista raportti käsittelystä
+        unblock_email_account: Kumoa sähköpostiosoitteen esto
         unsensitive_account: Kumoa pakotus arkaluonteiseksi tiliksi
         unsilence_account: Kumoa tilin rajoitus
         unsuspend_account: Kumoa tilin jäädytys
@@ -230,9 +230,9 @@ fi:
         update_status: Päivitä julkaisu
         update_user_role: Päivitä rooli
       actions:
-        approve_appeal_html: "%{name} hyväksyi valvontapäätöksen valituksen käyttäjältä %{target}"
+        approve_appeal_html: "%{name} hyväksyi käyttäjän %{target} valituksen moderointipäätöksestä"
         approve_user_html: "%{name} hyväksyi käyttäjän rekisteröitymisen kohteesta %{target}"
-        assigned_to_self_report_html: "%{name} otti raportin %{target} tehtäväkseen"
+        assigned_to_self_report_html: "%{name} otti raportin %{target} käsiteltäväkseen"
         change_email_user_html: "%{name} vaihtoi käyttäjän %{target} sähköpostiosoitteen"
         change_role_user_html: "%{name} muutti käyttäjän %{target} roolia"
         confirm_user_html: "%{name} vahvisti käyttäjän %{target} sähköpostiosoitteen"
@@ -240,7 +240,7 @@ fi:
         create_announcement_html: "%{name} loi uuden tiedotteen %{target}"
         create_canonical_email_block_html: "%{name} esti sähköpostin tiivisteellä %{target}"
         create_custom_emoji_html: "%{name} lähetti uuden emojin %{target}"
-        create_domain_allow_html: "%{name} salli liittoutumisen verkkotunnuksen %{target} kanssa"
+        create_domain_allow_html: "%{name} salli federoinnin verkkotunnuksen %{target} kanssa"
         create_domain_block_html: "%{name} esti verkkotunnuksen %{target}"
         create_email_domain_block_html: "%{name} esti sähköpostiverkkotunnuksen %{target}"
         create_ip_block_html: "%{name} loi IP-säännön %{target}"
@@ -248,11 +248,11 @@ fi:
         create_user_role_html: "%{name} loi roolin %{target}"
         demote_user_html: "%{name} alensi käyttäjän %{target}"
         destroy_announcement_html: "%{name} poisti tiedotteen %{target}"
-        destroy_canonical_email_block_html: "%{name} poisti sähköpostin eston tiivisteellä %{target}"
+        destroy_canonical_email_block_html: "%{name} kumosi sähköpostin eston tiivisteellä %{target}"
         destroy_custom_emoji_html: "%{name} poisti emojin %{target}"
-        destroy_domain_allow_html: "%{name} kielsi liittoutumisen verkkotunnuksen %{target} kanssa"
-        destroy_domain_block_html: "%{name} poisti verkkotunnuksen %{target} eston"
-        destroy_email_domain_block_html: "%{name} poisti sähköpostiverkkotunnuksen %{target} eston"
+        destroy_domain_allow_html: "%{name} kielsi federoinnin verkkotunnuksen %{target} kanssa"
+        destroy_domain_block_html: "%{name} kumosi verkkotunnuksen %{target} eston"
+        destroy_email_domain_block_html: "%{name} kumosi sähköpostiverkkotunnuksen %{target} eston"
         destroy_instance_html: "%{name} tyhjensi verkkotunnuksen %{target}"
         destroy_ip_block_html: "%{name} poisti IP-säännön %{target}"
         destroy_status_html: "%{name} poisti käyttäjän %{target} julkaisun"
@@ -260,14 +260,14 @@ fi:
         destroy_user_role_html: "%{name} poisti roolin %{target}"
         disable_2fa_user_html: "%{name} poisti käyttäjältä %{target} vaatimuksen kaksivaiheisen todentamiseen"
         disable_custom_emoji_html: "%{name} poisti käytöstä emojin %{target}"
-        disable_sign_in_token_auth_user_html: "%{name} poisti sähköpostitunnuksen %{target} todennuksen käytöstä"
+        disable_sign_in_token_auth_user_html: "%{name} poisti sähköpostitunnuksella todennuksen käytöstä tililtä %{target}"
         disable_user_html: "%{name} poisti kirjautumisen käyttäjältä %{target}"
         enable_custom_emoji_html: "%{name} otti käyttöön emojin %{target}"
-        enable_sign_in_token_auth_user_html: "%{name} otti todennuksen sähköpostivaltuutuksella käyttöön käyttäjälle %{target}"
+        enable_sign_in_token_auth_user_html: "%{name} otti sähköpostitunnuksella todennuksen käyttöön tilille %{target}"
         enable_user_html: "%{name} otti kirjautumisen käyttöön käyttäjälle %{target}"
         memorialize_account_html: "%{name} muutti käyttäjän %{target} tilin muistosivuksi"
         promote_user_html: "%{name} ylensi käyttäjän %{target}"
-        reject_appeal_html: "%{name} hylkäsi valvontapäätöksen valituksen käyttäjältä %{target}"
+        reject_appeal_html: "%{name} hylkäsi käyttäjän %{target} valituksen moderointipäätöksestä"
         reject_user_html: "%{name} hylkäsi käyttäjän rekisteröitymisen kohteesta %{target}"
         remove_avatar_user_html: "%{name} poisti käyttäjän %{target} profiilikuvan"
         reopen_report_html: "%{name} avasi uudelleen raportin %{target}"
@@ -277,8 +277,8 @@ fi:
         sensitive_account_html: "%{name} merkitsi käyttäjän %{target} median arkaluonteiseksi"
         silence_account_html: "%{name} rajoitti käyttäjän %{target} tiliä"
         suspend_account_html: "%{name} jäädytti käyttäjän %{target} tilin"
-        unassigned_report_html: "%{name} peruutti raportin määrityksen %{target}"
-        unblock_email_account_html: "%{name} poisti käyttäjän %{target} sähköpostiosoitteen eston"
+        unassigned_report_html: "%{name} poisti raportin käsittelystä %{target}"
+        unblock_email_account_html: "%{name} kumosi käyttäjän %{target} sähköpostiosoitteen eston"
         unsensitive_account_html: "%{name} kumosi käyttäjän %{target} median arkaluonteisuusmerkinnän"
         unsilence_account_html: "%{name} kumosi käyttäjän %{target} rajoituksen"
         unsuspend_account_html: "%{name} kumosi käyttäjän %{target} tilin jäädytyksen"
@@ -291,12 +291,12 @@ fi:
         update_user_role_html: "%{name} muutti roolia %{target}"
       deleted_account: poisti tilin
       empty: Lokeja ei löytynyt.
-      filter_by_action: Suodata tapahtuman mukaan
+      filter_by_action: Suodata toimen mukaan
       filter_by_user: Suodata käyttäjän mukaan
       title: Tarkastusloki
       unavailable_instance: "(verkkotunnus ei saatavilla)"
     announcements:
-      destroyed_msg: Tiedote poistettu onnistuneesti!
+      destroyed_msg: Tiedotteen poisto onnistui!
       edit:
         title: Muokkaa tiedotetta
       empty: Tiedotteita ei löytynyt.
@@ -305,18 +305,18 @@ fi:
         create: Luo tiedote
         title: Uusi tiedote
       publish: Julkaise
-      published_msg: Tiedote julkaistu onnistuneesti!
+      published_msg: Tiedotteen julkaisu onnistui!
       scheduled_for: Ajoitettu %{time}
       scheduled_msg: Tiedotteen julkaisu ajoitettu!
       title: Tiedotteet
       unpublish: Lopeta julkaisu
-      unpublished_msg: Tiedotteen julkaisu lopetettu onnistuneesti!
-      updated_msg: Tiedote päivitetty onnistuneesti!
+      unpublished_msg: Tiedotteen julkaisun lopetus onnistui!
+      updated_msg: Tiedotteen päivitys onnistui!
     critical_update_pending: Kriittinen päivitys odottaa
     custom_emojis:
       assign_category: Aseta luokka
       by_domain: Verkkotunnus
-      copied_msg: Emojin paikallisen kopion luonti onnistui
+      copied_msg: Emojista luotiin paikallinen kopio onnistuneesti
       copy: Kopioi
       copy_failed_msg: Emojista ei voitu tehdä paikallista kopiota
       create_new_category: Luo uusi luokka
@@ -325,11 +325,11 @@ fi:
       destroyed_msg: Emojon poisto onnistui!
       disable: Poista käytöstä
       disabled: Ei käytössä
-      disabled_msg: Emojin käytöstäpoisto onnistui
+      disabled_msg: Emoji poistettiin käytöstä onnistuneesti
       emoji: Emoji
       enable: Ota käyttöön
       enabled: Käytössä
-      enabled_msg: Emojin käyttöönotto onnistui
+      enabled_msg: Emoji otettiin käyttöön onnistuneesti
       image_hint: PNG tai GIF, enintään %{size}
       list: Lisää listalle
       listed: Listalla
@@ -369,7 +369,7 @@ fi:
       software: Ohjelmisto
       sources: Rekisteröitymislähteet
       space: Tilankäyttö
-      title: Hallintapaneeli
+      title: Koontinäyttö
       top_languages: Aktiivisimmat kielet
       top_servers: Aktiivisimmat palvelimet
       website: Sivusto
@@ -378,12 +378,12 @@ fi:
         empty: Valituksia ei löytynyt.
         title: Valitukset
     domain_allows:
-      add_new: Salli liittoutuminen tämän verkkotunnuksen kanssa
-      created_msg: Verkkotunnuksen on onnistuneesti sallittu liittoutua
-      destroyed_msg: Verkkotunnusta on kielletty liittoutumasta
+      add_new: Salli federointi tämän verkkotunnuksen kanssa
+      created_msg: Verkkotunnuksen kanssa federointi on onnistuneesti sallittu
+      destroyed_msg: Verkkotunnuksen kanssa federointi on kielletty
       export: Vie
       import: Tuo
-      undo: Kiellä liittoutuminen tämän verkkotunnuksen kanssa
+      undo: Kiellä federointi tämän verkkotunnuksen kanssa
     domain_blocks:
       add_new: Lisää uusi verkkotunnuksen esto
       confirm_suspension:
@@ -391,7 +391,7 @@ fi:
         confirm: Jäädytä
         permanent_action: Jäädytyksen kumoaminen ei palauta mitään tietoja tai suhteita.
         preamble_html: Olet jäädyttämässä verkkotunnuksen <strong>%{domain}</strong> aliverkkotunnuksineen.
-        remove_all_data: Tämä toiminto poistaa palvelimeltasi kaiken sisällön, median ja profiilitiedot tämän palvelun tileiltä.
+        remove_all_data: Tämä poistaa palvelimeltasi kaiken sisällön, median ja profiilitiedot tämän verkkotunnuksen tileiltä.
         stop_communication: Palvelimesi lopettaa viestinnän näiden palvelinten kanssa.
         title: Vahvista verkkotunnuksen %{domain} esto
         undo_relationships: Tämä kumoaa näiden palvelimien ja sinun tilien välisen seurannan.
@@ -400,12 +400,12 @@ fi:
       domain: Verkkotunnus
       edit: Muokkaa verkkotunnuksen estoa
       existing_domain_block: Olet jo asettanut tiukemmat rajoitukset käyttäjälle %{name}.
-      existing_domain_block_html: Olet jo asettanut tiukemmat rajoitukset käyttäjälle %{name}, joten sinun täytyy <a href="%{unblock_url}">poistaa sen esto</a> ensin.
+      existing_domain_block_html: Olet jo asettanut tiukemmat rajoitukset käyttäjälle %{name}, joten sinun täytyy <a href="%{unblock_url}">kumota sen esto</a> ensin.
       export: Vie
       import: Tuo
       new:
         create: Luo esto
-        hint: Verkkotunnuksen esto ei estä tilien lisäämistä tietokantaan, mutta se soveltaa näihin tileihin takautuvasti ja automaattisesti tiettyjä valvontatoimia.
+        hint: Verkkotunnuksen esto ei estä tilien lisäämistä tietokantaan, mutta se soveltaa näihin tileihin takautuvasti ja automaattisesti tiettyjä moderointitoimia.
         severity:
           desc_html: Valinta <strong>Rajoita</strong> piilottaa tässä verkkotunnuksessa sijaitsevien tilien julkaisut kaikilta, jotka eivät seuraa näitä tilejä. Valinta <strong>Jäädytä</strong> poistaa palvelimeltasi kaikkien tässä verkkotunnuksessa sijaitsevien tilien sisällön, median ja profiilitiedot. Käytä valintaa <strong>Ei mitään</strong>, jos haluat vain hylätä mediatiedostot.
           noop: Ei mitään
@@ -413,17 +413,17 @@ fi:
           suspend: Jäädytä
         title: Uusi verkkotunnuksen esto
       no_domain_block_selected: Verkkotunnusten estoja ei muutettu, koska yhtään ei ollut valittuna
-      not_permitted: Nykyiset käyttöoikeutesi eivät kata tätä toimintoa
-      obfuscate: Peitä verkkotunnuksen nimi
+      not_permitted: Sinulla ei ole oikeutta suorittaa tätä toimintoa
+      obfuscate: Peitä verkkotunnus
       obfuscate_hint: Peitä verkkotunnus osittain luettelossa, jos julkinen verkkotunnusten rajoitusluettelo on käytössä
       private_comment: Yksityinen kommentti
-      private_comment_hint: Kommentoi tätä verkkotunnuksen rajoitusta, valvojien sisäiseen käyttöön.
+      private_comment_hint: Kommentoi tätä verkkotunnuksen rajoitusta, moderaattorien sisäiseen käyttöön.
       public_comment: Julkinen kommentti
       public_comment_hint: Kommentoi tätä verkkotunnuksen rajoitusta suurelle yleisölle, jos julkinen verkkotunnusten rajoitusluettelo on käytössä.
       reject_media: Hylkää mediatiedostot
       reject_media_hint: Poistaa paikallisesti tallennetut mediatiedostot eikä lataa niitä enää jatkossa. Ei merkitystä jäähyn kohdalla
       reject_reports: Hylkää raportit
-      reject_reports_hint: Ohita kaikki tästä verkkotunnuksesta tulevat raportit. Erottamisen kannalta ei merkitystä
+      reject_reports_hint: Ohita kaikki tästä verkkotunnuksesta tulevat raportit. Ei vaikuta jäädytyksiin
       undo: Peru verkkotunnuksen esto
       view: Näytä verkkotunnuksen esto
     email_domain_blocks:
@@ -432,7 +432,7 @@ fi:
       attempts_over_week:
         one: "%{count} yritystä viimeisen viikon aikana"
         other: "%{count} rekisteröitymisyritystä viimeisen viikon aikana"
-      created_msg: Sähköpostiverkkotunnus estetty onnistuneesti
+      created_msg: Sähköpostiverkkotunnus estettiin onnistuneesti
       delete: Poista
       dns:
         types:
@@ -440,12 +440,12 @@ fi:
       domain: Verkkotunnus
       new:
         create: Lisää verkkotunnus
-        resolve: Ratkaise verkkotunnus
+        resolve: Selvitä verkkotunnus
         title: Estä uusi sähköpostiverkkotunnus
       no_email_domain_block_selected: Sähköpostin verkkotunnuksia ei muutettu, koska yhtään ei ollut valittuna
       not_permitted: Ei sallittu
       resolved_dns_records_hint_html: Verkkotunnuksen nimi määräytyy seuraaviin MX-verkkotunnuksiin, jotka ovat viime kädessä vastuussa sähköpostin vastaanottamisesta. MX-verkkotunnuksen estäminen estää rekisteröitymisen mistä tahansa sähköpostiosoitteesta, joka käyttää samaa MX-verkkotunnusta, vaikka näkyvä verkkotunnuksen nimi olisikin erilainen. <strong>Varo estämästä suuria sähköpostin palveluntarjoajia.</strong>
-      resolved_through_html: Ratkaistu %{domain} kautta
+      resolved_through_html: Ratkaistu verkkotunnuksen %{domain} kautta
       title: Estetyt sähköpostiverkkotunnukset
     export_domain_allows:
       new:
@@ -476,8 +476,8 @@ fi:
         view_all: Näytä kaikki tarkastuslokit
       availability:
         description_html:
-          one: Jos toimitus verkkotunnukseen epäonnistuu <strong>%{count} päivä</strong> ilman onnistumista, uusia yrityksiä ei tehdä ennen kuin toimitus <em>alkaen</em> verkkotunnukselta on vastaanotettu.
-          other: Jos toimitus verkkotunnukselle, epäonnistuu <strong>%{count} eri päivänä</strong> ilman onnistumista, uusia yrityksiä ei tehdä ennen kuin toimitus <em>alkaen</em> verkkotunnuselta on vastaanotettu.
+          one: Jos toimitus verkkotunnukseen epäonnistuu <strong>%{count} päivän</strong> ajan, sitä ei yritetä uudelleen ennen kuin verkkotunnuksesta <em>vastaanotetaan</em> toimitus.
+          other: Jos toimitus verkkotunnukseen epäonnistuu <strong>%{count} päivän</strong> ajan, sitä ei yritetä uudelleen ennen kuin verkkotunnuksesta <em>vastaanotetaan</em> toimitus.
         failure_threshold_reached: Epäonnistumisen kynnys saavutettu %{date}.
         failures_recorded:
           one: Epäonnistuneita yrityksiä %{count} päivässä.
@@ -521,7 +521,7 @@ fi:
       delivery_available: Toimitus on saatavilla
       delivery_error_days: Toimitusvirheen päivät
       delivery_error_hint: Jos toimitus ei ole mahdollista %{count} päivän aikana, se merkitään automaattisesti toimittamattomaksi.
-      destroyed_msg: Tiedot %{domain} on nyt jonossa välitöntä poistoa varten.
+      destroyed_msg: Palvelimelta %{domain} peräisin olevat tiedot ovat nyt jonossa poistattaviksi.
       empty: Verkkotunnuksia ei löytynyt.
       known_accounts:
         one: "%{count} tunnettu tili"
@@ -529,12 +529,12 @@ fi:
       moderation:
         all: Kaikki
         limited: Rajoitettu
-        title: Valvonta
+        title: Moderointi
       private_comment: Yksityinen kommentti
       public_comment: Julkinen kommentti
       purge: Tyhjennä
       purge_description_html: Jos uskot, että tämä verkkotunnus on offline-tilassa tarkoituksella, voit poistaa kaikki verkkotunnuksen tilitietueet ja niihin liittyvät tiedot tallennustilastasi. Tämä voi kestää jonkin aikaa.
-      title: Liittoutuminen
+      title: Federointi
       total_blocked_by_us: Estämämme
       total_followed_by_them: Heidän seuraama
       total_followed_by_us: Meidän seuraama
@@ -552,7 +552,7 @@ fi:
       title: Kutsut
     ip_blocks:
       add_new: Luo sääntö
-      created_msg: Lisätty uusi IP-sääntö onnistuneesti
+      created_msg: Uusi IP-sääntö lisättiin onnistuneesti
       delete: Poista
       expires_in:
         '1209600': 2 viikkoa
@@ -570,7 +570,7 @@ fi:
     relays:
       add_new: Lisää uusi välittäjä
       delete: Poista
-      description_html: "<strong>Liittoutumisvälittäjä</strong> on välityspalvelin, joka siirtää suuria määriä julkisia julkaisuja siihen liittyneiden palvelinten välillä. <strong>Se voi auttaa pieniä ja keskisuuria palvelimia löytämään fediversumin sisältöä</strong>, mikä muutoin vaatisi paikallisia käyttäjiä seuraamaan etäpalvalinten käyttäjiä manuaalisesti."
+      description_html: "<strong>Federoinninvälittäjä</strong> on välityspalvelin, joka siirtää suuria määriä julkisia julkaisuja siihen liittyneiden palvelinten välillä. <strong>Se voi auttaa pieniä ja keskisuuria palvelimia löytämään fediversumin sisältöä</strong>, mikä muutoin vaatisi paikallisia käyttäjiä seuraamaan etäpalvalinten käyttäjiä manuaalisesti."
       disable: Poista käytöstä
       disabled: Poissa käytöstä
       enable: Ota käyttöön
@@ -584,8 +584,8 @@ fi:
       status: Tila
       title: Välittäjät
     report_notes:
-      created_msg: Muistiinpano lisätty raporttiin onnistuneesti!
-      destroyed_msg: Muistiinpano poistettu raportista onnistuneesti!
+      created_msg: Muistiinpanon lisäys raporttiin onnistui!
+      destroyed_msg: Muistiinpanon poisto raportista onnistui!
     reports:
       account:
         notes:
@@ -598,17 +598,17 @@ fi:
         mark_as_sensitive_description_html: Raportoitujen julkaisujen media merkitään arkaluonteiseksi ja kirjataan varoitus, joka auttaa suhtautumaan vakavammin saman tilin tuleviin rikkomuksiin.
         other_description_html: Katso lisää vaihtoehtoja tilin käytöksen hallitsemiseksi ja raportoidulle tilille kohdistuvan viestinnän mukauttamiseksi.
         resolve_description_html: Ilmoitettua tiliä kohtaan ei ryhdytä toimiin, varoitusta ei kirjata ja raportti suljetaan.
-        silence_description_html: Tili näkyy vain niille, jotka jo seuraavat sitä tai etsivät sen manuaalisesti, mikä rajoittaa merkittävästi sen tavoitettavuutta. Voidaan perua milloin vain. Sulkee kaikki tilin vastaiset raportit.
-        suspend_description_html: Tili ja mikään sen sisältö eivät ole käytettävissä, ja lopulta ne poistetaan, ja vuorovaikutus tilin kanssa on mahdotonta. Peruttavissa 30 päivän ajan. Sulkee kaikki tämän tilin vastaiset raportit.
+        silence_description_html: Tili näkyy vain niille, jotka jo seuraavat sitä tai etsivät sen manuaalisesti, mikä rajoittaa merkittävästi sen tavoitettavuutta. Voidaan perua milloin vain. Sulkee kaikki tiliin kohdistuvat raportit.
+        suspend_description_html: Tili ja mikään sen sisältö eivät ole käytettävissä, ja lopulta ne poistetaan ja vuorovaikutus tilin kanssa on mahdotonta. Peruttavissa 30 päivän ajan. Sulkee kaikki tiliin kohdistuvat raportit.
       actions_description_html: Päätä, mihin toimiin ryhdyt tämän raportin ratkaisemiseksi. Jos ryhdyt rangaistustoimeen ilmoitettua tiliä kohtaan, hänelle lähetetään sähköposti-ilmoitus, paitsi jos <strong>Roskaposti</strong>-luokka on valittuna.
-      actions_description_remote_html: Päätä, mihin toimiin ryhdyt tämän raportin ratkaisemiseksi. Tämä vaikuttaa vain siihen, miten <strong>palvelimesi</strong> kommunikoi tämän etätilin kanssa ja käsittelee sen sisältöä.
+      actions_description_remote_html: Päätä, mihin toimiin ryhdyt tämän raportin ratkaisemiseksi. Tämä vaikuttaa vain siihen, miten <strong>sinun</strong> palvelimesi viestii tämän etätilin kanssa ja käsittelee sen sisältöä.
       add_to_report: Lisää raporttiin
       already_suspended_badges:
         local: Jäädytetty jo tällä palvelimella
         remote: Jäädytetty jo tällä palvelimella
       are_you_sure: Oletko varma?
-      assign_to_self: Ota tehtäväksi
-      assigned: Määritetty valvoja
+      assign_to_self: Ota käsiteltäväkseni
+      assigned: Määritetty moderaattori
       by_target_domain: Raportoidun tilin verkkotunnus
       cancel: Peruuta
       category: Luokka
@@ -617,12 +617,12 @@ fi:
         none: Ei mitään
       comment_description_html: 'Antaakseen lisätietoja %{name} kirjoitti:'
       confirm: Vahvista
-      confirm_action: Vahvista valvontatoimi käyttäjää @%{acct} kohtaan
+      confirm_action: Vahvista moderointitoimi käyttäjää @%{acct} kohtaan
       created_at: Raportoitu
       delete_and_resolve: Poista julkaisut
       forwarded: Välitetty
       forwarded_replies_explanation: Tämä raportti on etäkäyttäjältä ja koskee etäsisältöä. Se on välitetty sinulle, koska raportoitu sisältö on vastaus jollekin käyttäjällesi.
-      forwarded_to: Välitetty %{domain}
+      forwarded_to: Välitetty palvelimelle %{domain}
       mark_as_resolved: Merkitse ratkaistuksi
       mark_as_sensitive: Merkitse arkaluonteiseksi
       mark_as_unresolved: Merkitse ratkaisemattomaksi
@@ -632,19 +632,20 @@ fi:
         create_and_resolve: Ratkaise ja lisää muistiinpano
         create_and_unresolve: Avaa uudelleen ja lisää muistiinpano
         delete: Poista
-        placeholder: Kuvaile mitä toimia on tehty tai muita päivityksiä tähän raporttiin…
+        placeholder: Kuvaile tehtyjä toimia tai lisää muita käyttäjään liittyviä merkintöjä...
         title: Muistiinpanot
-      notes_description_html: Tarkastele ja jätä muistiinpanoja muille valvojille ja itsellesi tulevaisuuteen
-      processed_msg: 'Raportti #%{id} käsitelty'
-      quick_actions_description_html: 'Suorita nopea toiminto tai vieritä alas nähdäksesi raportoitu sisältö:'
-      remote_user_placeholder: etäkäyttäjä instanssista %{instance}
-      reopen: Avaa raportti uudestaan
+      notes_description_html: Tarkastele ja jätä muistiinpanoja muille moderaattoreille ja itsellesi tulevaisuuteen
+      processed_msg: Raportin nro %{id} käsittely onnistui
+      quick_actions_description_html: 'Suorita pikatoiminto tai vieritä alas nähdäksesi raportoitu sisältö:'
+      remote_user_placeholder: etäkäyttäjä palvelimelta %{instance}
+      reopen: Avaa raportti uudelleen
       report: Raportti nro %{id}
       reported_account: Raportoitu tili
       reported_by: Raportoinut
+      reported_with_application: Raportoitu sovelluksella
       resolved: Ratkaistut
-      resolved_msg: Raportti onnistuneesti ratkaistu!
-      skip_to_actions: Siirry toimintoihin
+      resolved_msg: Raportin ratkaisu onnistui!
+      skip_to_actions: Siirry toimiin
       status: Tila
       statuses: Raportoitu sisältö
       statuses_description_html: Loukkaava sisältö mainitaan raportoidun tilin yhteydessä
@@ -659,17 +660,17 @@ fi:
           mark_as_sensitive_html: Merkitse loukkaavien julkaisujen media arkaluonteiseksi
           silence_html: Rajoita merkittävästi käyttäjän <strong>@%{acct}</strong> tavoitettavuutta tekemällä profiilista ja sen sisällöstä näkyviä vain niille, jotka jo seuraavat tiliä tai etsivät sen manuaalisesti
           suspend_html: Jäädytä <strong>@%{acct}</strong>, jolloin hänen profiilinsa ja sisältönsä ei ole käytettävissä ja hänen kanssaan on mahdotonta olla vuorovaikutuksessa
-        close_report: 'Merkitse raportti #%{id} selvitetyksi'
+        close_report: Merkitse raportti nro %{id} ratkaistuksi
         close_reports_html: Merkitse <strong>kaikki</strong> käyttäjään <strong>@%{acct}</strong> kohdistuvat raportit ratkaistuiksi
         delete_data_html: Poista käyttäjän <strong>@%{acct}</strong> profiili ja sen sisältö 30 päivän kuluttua, ellei jäädytystä sillä välin kumota
         preview_preamble_html: "<strong>@%{acct}</strong> saa varoituksen, jonka sisältö on seuraava:"
-        record_strike_html: Tallenna varoitus <strong>@%{acct}</strong> vastaan, joka auttaa sinua selvittämään tulevia rikkomuksia tältä tililtä
+        record_strike_html: Kirjaa käyttäjään <strong>@%{acct}</strong> kohdistuva varoitus, joka auttaa suhtautumaan vakavammin tämän tilin tuleviin rikkomuksiin
         send_email_html: Lähetä käyttäjälle <strong>@%{acct}</strong> varoitus sähköpostitse
-        warning_placeholder: Valinnaiset lisäperustelut valvontatoimelle.
+        warning_placeholder: Valinnaiset lisäperustelut moderointitoimelle.
       target_origin: Raportoidun tilin alkuperä
       title: Raportit
-      unassign: Määrittämätön
-      unknown_action_msg: 'Tuntematon toiminto: %{action}'
+      unassign: Poista käsittelystä
+      unknown_action_msg: 'Tuntematon toimi: %{action}'
       unresolved: Ratkaisemattomat
       updated_at: Päivitetty
       view_profile: Näytä profiili
@@ -682,10 +683,10 @@ fi:
         administration: Ylläpito
         devops: DevOps
         invites: Kutsut
-        moderation: Valvonta
+        moderation: Moderointi
         special: Erityistä
       delete: Poista
-      description_html: "<strong>Käyttäjärooleilla</strong> voit muokata, mihin toimintoihin ja alueisiin käyttäjäsi pääsevät käsiksi."
+      description_html: "<strong>Käyttäjärooleilla</strong> voit mukauttaa, mihin Mastodonin toimintoihin ja alueisiin käyttäjäsi pääsevät käsiksi."
       edit: Muokkaa roolia ”%{name}”
       everyone: Oletuskäyttöoikeudet
       everyone_full_description_html: Tämä on <strong>perusrooli</strong>, joka vaikuttaa <strong>kaikkiin käyttäjiin</strong>, jopa ilman määrättyä roolia. Kaikki muut roolit perivät sen käyttöoikeudet.
@@ -702,17 +703,17 @@ fi:
         manage_announcements: Hallita tiedotteita
         manage_announcements_description: Sallii käyttäjien hallita tiedotteita palvelimella
         manage_appeals: Hallita valituksia
-        manage_appeals_description: Sallii käyttäjien tarkistaa valvontatoimia koskevia valituksia
+        manage_appeals_description: Sallii käyttäjien tarkistaa moderointitoimiin kohdistuvia valituksia
         manage_blocks: Hallita estoja
         manage_blocks_description: Sallii käyttäjien estää sähköpostipalveluntarjoajia ja IP-osoitteita
         manage_custom_emojis: Hallita mukautettuja emojeita
         manage_custom_emojis_description: Sallii käyttäjien hallita mukautettuja emojeita palvelimella
-        manage_federation: Hallita liittoutumista
-        manage_federation_description: Sallii käyttäjien estää tai sallia liittoutuminen muiden verkkotunnusten kanssa ja hallita toimitusta
+        manage_federation: Hallita federointia
+        manage_federation_description: Sallii käyttäjien estää tai sallia federointi muiden verkkotunnusten kanssa ja hallita toimitusta
         manage_invites: Hallita kutsuja
-        manage_invites_description: Sallii käyttäjien selata ja poistaa kutsulinkkejä käytöstä
+        manage_invites_description: Sallii käyttäjien selata kutsulinkkejä ja poistaa niitä käytöstä
         manage_reports: Hallita raportteja
-        manage_reports_description: Sallii käyttäjien tarkistaa raportteja ja suorittaa valvontatoimia niitä vastaan
+        manage_reports_description: Sallii käyttäjien tarkistaa raportteja ja suorittaa moderointitoimia niiden perusteella
         manage_roles: Hallita rooleja
         manage_roles_description: Sallii käyttäjien hallita ja määrittää rooleja heidän alapuolellaan
         manage_rules: Hallita sääntöjä
@@ -724,13 +725,13 @@ fi:
         manage_user_access: Hallita käyttäjäoikeuksia
         manage_user_access_description: Sallii käyttäjien poistaa muiden käyttäjien kaksivaiheinen todennus käytöstä, vaihtaa heidän sähköpostiosoitteensa ja nollata heidän salasanansa
         manage_users: Hallita käyttäjiä
-        manage_users_description: Sallii käyttäjien tarkastella muiden käyttäjien tietoja ja suorittaa valvontatoimia heitä kohtaan
+        manage_users_description: Sallii käyttäjien tarkastella muiden käyttäjien tietoja ja suorittaa moderointitoimia heitä kohtaan
         manage_webhooks: Hallita webhookeja
         manage_webhooks_description: Sallii käyttäjien luoda webhookeja hallinnollisiin tapahtumiin
         view_audit_log: Katsoa tarkastuslokia
         view_audit_log_description: Sallii käyttäjien nähdä palvelimen hallinnollisten toimien historian
         view_dashboard: Katsoa koontinäyttöä
-        view_dashboard_description: Sallii käyttäjien käyttää kojelautaa ja erilaisia mittareita
+        view_dashboard_description: Sallii käyttäjille pääsyn koontinäyttöön ja erilaisiin mittareihin
         view_devops: DevOps
         view_devops_description: Sallii käyttäjille pääsyn Sidekiq- ja pgHero-hallintapaneeleihin
       title: Roolit
@@ -744,17 +745,17 @@ fi:
     settings:
       about:
         manage_rules: Hallitse palvelimen sääntöjä
-        preamble: Anna perusteellista tietoa siitä, miten palvelinta käytetään, valvotaan ja rahoitetaan.
+        preamble: Kerro syventävästi siitä, kuinka palvelinta käytetään, moderoidaan ja rahoitetaan.
         rules_hint: On olemassa erityinen alue sääntöjä, joita käyttäjien odotetaan noudattavan.
         title: Tietoja
       appearance:
         preamble: Mukauta Mastodonin selainkäyttöliittymää.
         title: Ulkoasu
       branding:
-        preamble: Palvelimesi brändäys erottaa sen muista verkon palvelimista. Nämä tiedot voivat näkyä monissa eri ympäristöissä, kuten Mastodonin selainkäyttöliittymässä, natiivisovelluksissa, linkkien esikatseluissa muilla sivustoilla, viestintäsovelluksissa ja niin edelleen. Siksi nämä tiedot kannattaa pitää selkeinä, lyhyinä ja ytimekkäinä.
+        preamble: Palvelimesi brändäys erottaa sen muista verkon palvelimista. Nämä tiedot voivat näkyä monissa eri ympäristöissä, kuten Mastodonin selainkäyttöliittymässä, natiivisovelluksissa, linkkien esikatseluissa muilla sivustoilla, viestintäsovelluksissa ja niin edelleen. Siksi nämä tiedot kannattaa pitää selvinä, lyhyinä ja ytimekkäinä.
         title: Brändäys
       captcha_enabled:
-        desc_html: Tämä perustuu ulkoisiin skripteihin hCaptchasta, mikä voi olla turvallisuus- ja yksityisyysongelma. Lisäksi <strong>tämä voi tehdä rekisteröinnin ihmisille huomattavasti (erityisesti vammaisten) helpommaksi</strong>. Harkitse vaihtoehtoisia toimenpiteitä, kuten hyväksymisperusteista tai kutsupohjaista rekisteröintiä.
+        desc_html: Tämä perustuu ulkoisiin hCaptchan skripteihin, mikä voi olla turvallisuus- ja yksityisyysongelma. Lisäksi <strong>tämä voi tehdä rekisteröitymisprosessista joillekin (erityisesti vammaisille) ihmisille huomattavasti vähemmän saavutettavan</strong>. Harkitse siksi vaihtoehtoisia toimia, kuten hyväksymis- tai kutsuperusteista rekisteröitymistä.
         title: Vaadi uusia käyttäjiä vahvistaamaan tilinsä ratkaisemalla CAPTCHA-vahvistus
       content_retention:
         danger_zone: Vaaravyöhyke
@@ -777,9 +778,9 @@ fi:
         disabled: Ei kenellekkään
         users: Kirjautuneille paikallisille käyttäjille
       registrations:
-        moderation_recommandation: Varmista, että sinulla on riittävä ja toimintavalmis joukko moderaattoreita, ennen kuin vapautat rekisteröitymismenettelyn kaikille!
+        moderation_recommandation: Varmista, että sinulla on riittävä ja toimintavalmis joukko moderaattoreita, ennen kuin avaat rekisteröitymisen kaikille!
         preamble: Määritä, kuka voi luoda tilin palvelimellesi.
-        title: Rekisteröityminen
+        title: Rekisteröinnit
       registrations_mode:
         modes:
           approved: Rekisteröityminen vaatii hyväksynnän
@@ -787,14 +788,14 @@ fi:
           open: Kaikki voivat rekisteröityä
         warning_hint: Suosittelemme käyttämään asetusta ”Rekisteröityminen vaatii hyväksynnän”, ellet ole varma siitä, että moderaattorit ovat valmiina käsittelemään roskapostia ja haittarekisteröitymisiä oikea-aikaisesti.
       security:
-        authorized_fetch: Vaadi todennus liittoutuvilta palvelimilta
-        authorized_fetch_hint: Todennuksen vaatiminen liittoutuvilta palvelimilta mahdollistaa sekä käyttäjä- että palvelintason estojen tiukemman valvonnan. Tämä tapahtuu kuitenkin suorituskyvyn kustannuksella, vähentää vastauksiesi tavoittavuutta ja voi aiheuttaa yhteensopivuusongelmia joidenkin liittoutuvien palvelujen kanssa. Tämä ei myöskään estä omistautuneita toimijoita hakemasta julkisia julkaisujasi ja tilejäsi.
+        authorized_fetch: Vaadi todennus federoivilta palvelimilta
+        authorized_fetch_hint: Todennuksen vaatiminen federoivilta palvelimilta mahdollistaa sekä käyttäjä- että palvelintason estojen tiukemman valvonnan. Tämä tapahtuu kuitenkin suorituskyvyn kustannuksella, vähentää vastauksiesi tavoittavuutta ja voi aiheuttaa yhteensopivuusongelmia joidenkin federoivien palvelujen kanssa. Tämä ei myöskään estä asialleen omistautuneita toimijoita hakemasta julkisia julkaisujasi ja tilejäsi.
         authorized_fetch_overridden_hint: Et voi tällä hetkellä muuttaa tätä asetusta, koska se on ohitettu ympäristömuuttujalla.
-        federation_authentication: Liittoutumisen todentamisen täytäntöönpano
+        federation_authentication: Federoinnin todennuksen valvonta
       title: Palvelimen asetukset
     site_uploads:
       delete: Poista ladattu tiedosto
-      destroyed_msg: Sivuston lataus onnistuneesti poistettu!
+      destroyed_msg: Sivustolatauksen poisto onnistui!
     software_updates:
       critical_update: Kriittinen – päivitä viivyttelemättä
       description: On suositeltavaa pitää Mastodon-asennus ajantasaisena ja siten hyödyntää uusimpia korjauksia sekä ominaisuuksia. Lisäksi joskus on ratkaisevan tärkeää päivittää Mastodon ajoissa tietoturvaongelmien välttämiseksi. Näistä syistä Mastodon tarkistaa päivitykset 30 minuutin välein, ja ilmoittaa sinulle sähköposti-ilmoitusasetustesi mukaisesti.
@@ -841,9 +842,9 @@ fi:
         sensitive: "%{name} merkitsi käyttäjän %{target} tilin arkaluonteiseksi"
         silence: "%{name} rajoitti käyttäjän %{target} tiliä"
         suspend: "%{name} jäädytti käyttäjän %{target} tilin"
-      appeal_approved: Valitti
+      appeal_approved: Valittanut
       appeal_pending: Valitus vireillä
-      appeal_rejected: Vetoomus hylättiin
+      appeal_rejected: Valitus hylätty
     system_checks:
       database_schema_check:
         message_html: Tietokannan siirto on vireillä. Suorita ne varmistaaksesi, että sovellus toimii odotetulla tavalla
@@ -885,7 +886,7 @@ fi:
         message_html: "<strong>Objektivarastosi on määritetty virheellisesti, ja käyttäjiesi yksityisyys on vaarassa.</strong>"
     tags:
       review: Tarkista tila
-      updated_msg: Aihetunnisteen asetukset päivitetty onnistuneesti
+      updated_msg: Aihetunnisteiden asetusten päivitys onnistui
     title: Ylläpito
     trends:
       allow: Salli
@@ -907,7 +908,7 @@ fi:
         usage_comparison: Jaettu %{today} kertaa tänään verrattuna eilen %{yesterday}
       not_allowed_to_trend: Ei saa trendata
       only_allowed: Vain sallittu
-      pending_review: Odottaa tarkistusta
+      pending_review: Odottaa tarkastusta
       preview_card_providers:
         allowed: Tämän julkaisijan linkit voivat trendata
         description_html: Nämä ovat verkkotunnuksia, joiden linkkejä jaetaan usein palvelimellasi. Linkit eivät trendaa julkisesti, ellei linkin verkkotunnusta ole hyväksytty. Hyväksyntäsi (tai hylkäys) ulottuu aliverkkotunnuksiin.
@@ -938,12 +939,12 @@ fi:
         listable: Voidaan ehdottaa
         no_tag_selected: Tunnisteita ei muutettu, koska yhtään ei ollut valittuna
         not_listable: Ei tulla ehdottamaan
-        not_trendable: Ei näy trendien alla
+        not_trendable: Ei näy trendeissä
         not_usable: Ei voida käyttää
         peaked_on_and_decaying: Saavutti huipun %{date}, nyt hiipuu
         title: Suositut aihetunnisteet
-        trendable: Voi näkyä trendien alla
-        trending_rank: 'Suosittua #%{rank}'
+        trendable: Voi näkyä trendeissä
+        trending_rank: Suosittu, sijalla %{rank}
         usable: Voidaan käyttää
         usage_comparison: Käytetty %{today} kertaa tänään, verrattuna %{yesterday} eiliseen
         used_by_over_week:
@@ -979,33 +980,33 @@ fi:
       webhook: Webhook
   admin_mailer:
     auto_close_registrations:
-      body: Palvelimen %{instance} moderaattorit eivät ole olleet viime aikoina aktiivisia. Tästä syystä rekisteröitymismenettely on automaattisesti vaihdettu erillishyväksyntöjä edellyttäväksi. Näin vähennetään riskiä palvelimen %{instance} käyttöön haitallisten toimijoiden alustana. Voit koska tahansa palauttaa käyttöön vapaat rekisteröitymiset.
+      body: Palvelimen %{instance} moderaattorit eivät ole olleet viime aikoina aktiivisia. Tästä syystä rekisteröitymismenettely on automaattisesti vaihdettu erillishyväksyntöjä edellyttäväksi. Näin vähennetään riskiä palvelimen %{instance} käyttöön haitallisten toimijoiden alustana. Voit milloin tahansa palauttaa käyttöön vapaat rekisteröitymiset.
       subject: Rekisteröitymiset palvelimelle %{instance} on automaattisesti vaihdettu vaatimaan hyväksyntää
     new_appeal:
       actions:
         delete_statuses: poistaa hänen julkaisunsa
-        disable: jäädyttää heidän tilinsä
+        disable: jäädyttää hänen tilinsä
         mark_statuses_as_sensitive: merkitä hänen julkaisunsa arkaluonteisiksi
         none: varoitus
-        sensitive: merkitä heidän tilinsä arkaluonteiseksi
+        sensitive: merkitä hänen tilinsä arkaluonteiseksi
         silence: rajoittaa hänen tiliään
         suspend: jäädyttää hänen tilinsä
-      body: "%{target} valittaa valvojan %{action_taken_by} päätöksestä %{date}, joka oli %{type}. Hän kirjoitti:"
-      next_steps: Voit hyväksyä valituksen, jolloin valvontapäätös kumoutuu, tai sivuuttaa sen.
-      subject: "%{username} valittaa valvontapäätöksestä, joka koskee instanssia %{instance}"
+      body: "%{target} valittaa moderaattorin %{action_taken_by} päätöksestä %{date}, joka oli %{type}. Hän kirjoitti:"
+      next_steps: Voit hyväksyä valituksen, jolloin moderointipäätös kumoutuu, tai sivuuttaa sen.
+      subject: "%{username} valittaa palvelinta %{instance} koskevasta moderointipäätöksestä"
     new_critical_software_updates:
       body: Mastodonin uusia kriittisen tärkeitä versioita on julkaistu, joten saatat haluta päivittää niin pian kuin mahdollista!
-      subject: Kriittisiä Mastodon-päivityksiä on saatavilla instanssille %{instance}!
+      subject: Palvelimelle %{instance} on saatavilla kriittisiä Mastodon-päivityksiä!
     new_pending_account:
       body: Uuden tilin tiedot ovat alla. Voit hyväksyä tai hylätä tämän hakemuksen.
-      subject: Uusi tili tarkastettavana instanssissa %{instance} (%{username})
+      subject: Uusi tili tarkastettavana palvelimella %{instance} (%{username})
     new_report:
       body: "%{reporter} on raportoinut kohteen %{target}"
-      body_remote: Joku palvelimelta %{domain} raportoi käyttäjän %{target}
-      subject: Uusi raportti instanssista %{instance} (nro %{id})
+      body_remote: Joku palvelimelta %{domain} raportoi kohteen %{target}
+      subject: Uusi raportti palvelimesta %{instance} (nro %{id})
     new_software_updates:
       body: Uusia Mastodon-versioita on julkaistu, joten saatat haluta päivittää!
-      subject: Uusia Mastodon-versioita ovat saatavilla instanssille %{instance}!
+      subject: Palvelimelle %{instance} ovat saatavilla uusia Mastodon-versioita!
     new_trends:
       body: 'Seuraavat kohteet on tarkistettava ennen kuin ne voidaan näyttää julkisesti:'
       new_trending_links:
@@ -1014,11 +1015,11 @@ fi:
         title: Suositut julkaisut
       new_trending_tags:
         title: Suositut aihetunnisteet
-      subject: Uusia trendejä tarkistettavaksi instanssissa %{instance}
+      subject: Palvelimella %{instance} on uusia trendejä tarkistettavaksi
   aliases:
     add_new: Luo alias
-    created_msg: Uusi alias luotiin onnistuneesti. Voit nyt aloittaa siirron vanhasta tilistä.
-    deleted_msg: Alias poistettiin onnistuneesti. Siirtyminen tuolta tililtä tähän ei ole enää mahdollista.
+    created_msg: Uusi alias luotiin onnistuneesti. Voit nyt aloittaa muuton vanhasta tilistä.
+    deleted_msg: Alias poistettiin onnistuneesti. Muuttaminen tuolta tililtä tähän ei ole enää mahdollista.
     empty: Sinulla ei ole aliaksia.
     hint_html: Jos haluat muuttaa toiselta tililtä tälle tilille, voit luoda tässä aliaksen, mitä vaaditaan ennen kuin voit edetä siirtämään seuraajat vanhalta tililtä tälle tilille. Tänä toiminto on itsessään <strong>vaaraton ja kumottavissa</strong>. <strong>Tilin muuttaminen aloitetaan vanhalta tililtä</strong>.
     remove: Poista aliaksen linkitys
@@ -1035,7 +1036,7 @@ fi:
     sensitive_content: Arkaluonteinen sisältö
   application_mailer:
     notification_preferences: Muuta sähköpostiasetuksia
-    salutation: "%{name},"
+    salutation: "%{name}"
     settings: 'Muuta sähköpostiasetuksia: %{link}'
     unsubscribe: Lopeta tilaus
     view: 'Näytä:'
@@ -1045,10 +1046,10 @@ fi:
     created: Sovelluksen luonti onnistui
     destroyed: Sovelluksen poisto onnistui
     logout: Kirjaudu ulos
-    regenerate_token: Luo pääsytunnus uudelleen
-    token_regenerated: Pääsytunnuksen uudelleenluonti onnistui
-    warning: Säilytä tietoa hyvin. Älä milloinkaan jaa sitä muille!
-    your_token: Pääsytunnus
+    regenerate_token: Luo uusi käyttöoikeustunnus
+    token_regenerated: Uuden käyttöoikeustunnuksen luonti onnistui
+    warning: Ole varovainen näiden tietojen kanssa. Älä koskaan jaa niitä muille!
+    your_token: Käyttöoikeustunnus
   auth:
     apply_for_account: Pyydä tiliä
     captcha_confirmation:
@@ -1056,7 +1057,7 @@ fi:
       hint_html: Vielä yksi juttu! Meidän on vahvistettava, että olet ihminen (tämän avulla pidämme roskapostin poissa!). Ratkaise alla oleva CAPTCHA-vahvistus ja paina "Jatka".
       title: Turvatarkastus
     confirmations:
-      awaiting_review: Sähköpostiosoitteesi on vahvistettu! Seuraavaksi palvelimen %{domain} ylläpito tarkistaa rekisteröitymisesi, ja saat lopuksi ilmoituksen sähköpostitse, jos tilisi hyväksytään!
+      awaiting_review: Sähköpostiosoitteesi on vahvistettu! Seuraavaksi palvelimen %{domain} ylläpito tarkastaa rekisteröitymisesi, ja saat lopuksi ilmoituksen sähköpostitse, jos tilisi hyväksytään!
       awaiting_review_title: Rekisteröitymisesi on tarkistettavana
       clicking_this_link: napsauttaa tätä linkkiä
       login_link: kirjautumalla sisään
@@ -1099,9 +1100,9 @@ fi:
     rules:
       accept: Hyväksy
       back: Takaisin
-      invited_by: 'Seuraavalta käyttäjältä vastaanottamasi kutsun ansiosta voit liittyä palvelimelle %{domain}:'
-      preamble: Palvelimen %{domain} valvojat määrittävät ja valvovat sääntöjä.
-      preamble_invited: Ennen kuin jatkat, ota huomioon palvelimen %{domain} valvojien asettamat perussäännöt.
+      invited_by: 'Voit liittyä palvelimelle %{domain} kutsulla, jonka sait seuraavalta käyttäjältä:'
+      preamble: Palvelimen %{domain} moderaattorit määrittävät ja valvovat sääntöjä.
+      preamble_invited: Ennen kuin jatkat ota huomioon palvelimen %{domain} moderaattorien asettamat perussäännöt.
       title: Joitakin perussääntöjä.
       title_invited: Sinut on kutsuttu.
     security: Tunnukset
@@ -1110,15 +1111,15 @@ fi:
       email_below_hint_html: Tarkista roskapostikansiosi tai pyydä uusi viesti. Voit korjata sähköpostiosoitteesi, jos se oli väärin.
       email_settings_hint_html: Napsauta lähettämäämme linkkiä vahvistaaksesi osoitteen %{email}. Odotamme täällä.
       link_not_received: Etkö saanut linkkiä?
-      new_confirmation_instructions_sent: Saat uuden vahvistuslinkin sisältävän sähköpostiviestin muutamassa minuutissa!
+      new_confirmation_instructions_sent: Saat pian uuden vahvistuslinkin sisältävän sähköpostiviestin!
       title: Tarkista sähköpostilaatikkosi
     sign_in:
       preamble_html: Kirjaudu <strong>%{domain}</strong>-tunnuksellasi. Jos tilisi sijaitsee eri palvelimella, et voi kirjautua tässä.
       title: Kirjaudu palvelimelle %{domain}
     sign_up:
-      manual_review: Palvelimen %{domain} valvojat tarkistavat rekisteröitymiset käsin. Helpottaaksesi rekisteröitymisesi käsittelyä kerro hieman itsestäsi ja miksi haluat luoda käyttäjätilin palvelimelle %{domain}.
+      manual_review: Palvelimen %{domain} ylläpito tarkastaa rekisteröitymiset käsin. Helpottaaksesi rekisteröitymisesi käsittelyä kerro hieman itsestäsi ja siitä, miksi haluat luoda käyttäjätilin palvelimelle %{domain}.
       preamble: Kun sinulla on tili tällä Mastodon-palvelimella, voit seurata kaikkia muita verkossa olevia henkilöitä riippumatta siitä, missä heidän tilinsä on.
-      title: Otetaan sinulle käyttöön %{domain}.
+      title: Otetaan %{domain} käyttöösi.
     status:
       account_status: Tilin tila
       confirming: Odotetaan sähköpostivahvistuksen valmistumista.
@@ -1126,7 +1127,7 @@ fi:
       pending: Hakemuksesi odottaa palvelimen ylläpidon tarkastusta. Tämä voi kestää jonkin aikaa. Saat sähköpostiviestin, jos hakemuksesi hyväksytään.
       redirecting_to: Tilisi ei ole aktiivinen, koska se ohjaa tällä hetkellä tilille %{acct}.
       self_destruct: Koska %{domain} sulkeutuu, voit käyttää tiliäsi vain rajoitetusti.
-      view_strikes: Näytä tiliäsi koskevia aiempia varoituksia
+      view_strikes: Näytä aiemmat tiliäsi koskevat varoitukset
     too_fast: Lomake lähetettiin liian nopeasti, yritä uudelleen.
     use_security_key: Käytä suojausavainta
   challenge:
@@ -1171,13 +1172,13 @@ fi:
       email_reconfirmation_html: Jos et saa vahvistuksen sähköpostia, niin voit <a href="%{path}">pyytää sitä uudelleen</a>
       irreversible: Et voi palauttaa tiliäsi tai aktivoida sitä uudelleen
       more_details_html: Lisätietoja saat <a href="%{terms_path}">tietosuojakäytännöstämme</a>.
-      username_available: Käyttäjänimesi tulee saataville uudestaan
-      username_unavailable: Käyttäjänimesi ei tule saataville enää uudestaan
+      username_available: Käyttäjänimesi tulee saataville uudelleen
+      username_unavailable: Käyttäjänimesi ei tule saataville enää uudelleen
   disputes:
     strikes:
       action_taken: Tehty toimi
-      appeal: Vetoomus
-      appeal_approved: Tähän valitukseen on haettu muutosta, eikä se ole enää voimassa
+      appeal: Valitus
+      appeal_approved: Tähän varoitukseen haettiin onnistuneesti muutosta, eikä se ole enää voimassa
       appeal_rejected: Valitus on hylätty
       appeal_submitted_at: Valitus lähetetty
       appealed_msg: Valituksesi on lähetetty. Jos se hyväksytään, sinulle ilmoitetaan.
@@ -1186,10 +1187,10 @@ fi:
       approve_appeal: Hyväksy valitus
       associated_report: Liittyvä raportti
       created_at: Päivätty
-      description_html: Nämä ovat tiliäsi koskevia toimia ja varoituksia, jotka instanssin %{instance} ylläpito on lähettänyt sinulle.
+      description_html: Nämä ovat tiliisi kohdistuvia toimia sekä varoituksia, jotka palvelimen %{instance} ylläpito on lähettänyt sinulle.
       recipient: Osoitettu
       reject_appeal: Hylkää valitus
-      status: 'Julkaisu #%{id}'
+      status: Julkaisu nro %{id}
       status_removed: Julkaisu on jo poistettu järjestelmästä
       title: "%{action} alkaen %{date}"
       title_actions:
@@ -1204,7 +1205,7 @@ fi:
       your_appeal_pending: Olet lähettänyt valituksen
       your_appeal_rejected: Valituksesi on hylätty
   domain_validator:
-    invalid_domain: ei ole kelvollinen toimialueen nimi
+    invalid_domain: ei ole kelvollinen verkkotunnus
   edit_profile:
     basic_information: Perustiedot
     hint_html: "<strong>Mukauta, mitä ihmiset näkevät julkisessa profiilissasi ja julkaisujesi vieressä.</strong> Ihmiset seuraavat sinua takaisin ja ovat kanssasi vuorovaikutuksessa todennäköisemmin, kun sinulla on täytetty profiili ja profiilikuva."
@@ -1350,7 +1351,7 @@ fi:
       scheduled: Ajoitettu
       unconfirmed: Varmistamaton
     status: Tila
-    success: Tietojen lähettäminen onnistui, ja ne käsitellään kohtapuoliin
+    success: Tietojen lähettäminen onnistui, ja ne käsitellään aivan pian
     time_started: Aloitettu
     titles:
       blocking: Tuodaan estettyjä tilejä
@@ -1389,7 +1390,7 @@ fi:
       one: kertakäyttöinen
       other: "%{count} käyttökertaa"
     max_uses_prompt: Ei rajoitusta
-    prompt: Luo linkkejä ja jaa niiden avulla muille pääsyoikeus tähän instanssiin
+    prompt: Luo linkkejä ja jaa niiden avulla muille pääsyoikeus tälle palvelimelle
     table:
       expires_at: Vanhenee
       uses: Käytetty
@@ -1460,11 +1461,11 @@ fi:
       other_data: Muita tietoja ei siirretä automaattisesti
       redirect: Nykyisen tilisi profiili päivitetään ohjaushuomautuksella ja suljetaan pois hauista
   moderation:
-    title: Valvonta
+    title: Moderointi
   move_handler:
     carry_blocks_over_text: Tämä käyttäjä siirtyi paikasta %{acct}, jonka olit estänyt.
     carry_mutes_over_text: Tämä käyttäjä siirtyi tililtä %{acct}, jonka olet mykistänyt.
-    copy_account_note_text: 'Tämä käyttäjä siirtyi paikasta %{acct}, tässä olivat aiemmat muistiinpanosi niistä:'
+    copy_account_note_text: 'Tämä käyttäjä siirtyi tililtä %{acct}. Nämä olivat muistiinpanosi hänestä:'
   navigation:
     toggle_menu: Avaa/sulje valikko
   notification_mailer:
@@ -1535,7 +1536,7 @@ fi:
       duplicate_options: sisältää kaksoiskappaleita
       duration_too_long: on liian kaukana tulevaisuudessa
       duration_too_short: on liian aikainen
-      expired: Äänestys on jo loppunut
+      expired: Äänestys on jo päättynyt
       invalid_choice: Valittua äänestysvaihtoehtoa ei ole
       over_character_limit: voi olla enintään %{max} merkkiä
       self_vote: Et voi äänestää omissa äänestyksissäsi
@@ -1551,7 +1552,7 @@ fi:
     privacy_hint_html: Määritä, kuinka paljon muita avustavia tietoja haluat paljastaa. Käyttäjät löytävät kiinnostavia profiileja ja hienoja sovelluksia, kun he selaavat toisten seuraamia käyttäjiä ja kun he näkevät, millä sovelluksilla nämä julkaisevat. Saatat kuitenkin haluta piilottaa nämä tiedot.
     reach: Tavoittavuus
     reach_hint_html: Määritä, haluatko tulla uusien käyttäjien löytämäksi ja seuraamaksi. Haluatko julkaisujesi näkyvän Selaa-sivulla? Haluatko muiden käyttäjien näkevän sinut seuraamissuosituksissaan? Haluatko hyväksyä kaikki uudet seuraajat automaattisesti vai päättää jokaisesta erikseen?
-    search: Hae
+    search: Haku
     search_hint_html: Määritä, kuinka haluat tulla löydetyksi. Haluatko, että ihmiset löytävät sinut julkisten julkaisujesi perusteella? Haluatko, että ihmiset Mastodonin ulkopuolella löytävät profiilisi tehdessään hakuja verkossa? Otathan huomioon, ettei julkisten tietojen täyttä kaikista hakukoneista poisjäämistä voi taata.
     title: Yksityisyys ja tavoittavuus
   privacy_policy:
@@ -1668,7 +1669,7 @@ fi:
     relationships: Seuratut ja seuraajat
     severed_relationships: Katkenneet seurantasuhteet
     statuses_cleanup: Autom. julkaisujen poisto
-    strikes: Valvontavaroitukset
+    strikes: Moderointivaroitukset
     two_factor_authentication: Kaksivaiheinen todennus
     webauthn_authentication: Suojausavaimet
   severed_relationships:
@@ -1679,7 +1680,7 @@ fi:
       user_domain_block: Estit käyttäjän %{target_name}
     lost_followers: Menetetyt seuraajat
     lost_follows: Menetetyt seuratut
-    preamble: Voit menettää seurattusi ja seuraajasi, kun estät verkkotunnuksen tai kun valvojasi päättävät jäädyttää etäpalvelimen. Kun näin tapahtuu, voit ladata luetteloita katkenneista seurantasuhteista, jotta voit tarkastella niitä ja mahdollisesti viedä ne toiselle palvelimelle.
+    preamble: Voit menettää seurattusi ja seuraajasi, kun estät verkkotunnuksen tai kun moderaattorisi päättävät jäädyttää etäpalvelimen. Kun näin tapahtuu, voit ladata luetteloita katkenneista seurantasuhteista, jotta voit tarkastella niitä ja mahdollisesti viedä ne toiselle palvelimelle.
     purged: Palvelimesi ylläpitäjät ovat tyhjentäneet tämän palvelimen tiedot.
     type: Tapahtuma
   statuses:
@@ -1789,12 +1790,12 @@ fi:
   two_factor_authentication:
     add: Lisää
     disable: Poista 2FA käytöstä
-    disabled_success: Kaksivaiheinen todennus on poistettu käytöstä
+    disabled_success: Kaksivaiheisen todennuksen käytöstäpoisto onnistui
     edit: Muokkaa
     enabled: Kaksivaiheinen todennus käytössä
     enabled_success: Kaksivaiheisen todennuksen käyttöönotto onnistui
     generate_recovery_codes: Luo palautuskoodit
-    lost_recovery_codes: Palautuskoodien avulla voit käyttää tiliä, jos menetät puhelimesi. Jos olet hukannut palautuskoodisi, voit luoda uudet tästä. Vanhat palautuskoodit poistetaan käytöstä.
+    lost_recovery_codes: Palautuskoodien avulla voit käyttää tiliä, jos menetät puhelimesi. Jos olet hukannut palautuskoodisi, voit luoda uudet tästä. Vanhat palautuskoodit poistuvat käytöstä.
     methods: Kaksivaiheisen todennuksen menetelmät
     otp: Todennussovellus
     recovery_codes: Ota palautuskoodit talteen
@@ -1804,14 +1805,14 @@ fi:
   user_mailer:
     appeal_approved:
       action: Tilin asetukset
-      explanation: Valitus tiliäsi koskevasta varoituksesta %{strike_date} jonka lähetit %{appeal_date} on hyväksytty. Tilisi on jälleen hyvässä kunnossa.
+      explanation: "%{appeal_date} lähettämäsi valitus tiliisi kohdistuvasta varoituksesta %{strike_date} on hyväksytty. Tilisi on jälleen hyvässä kunnossa."
       subject: Valituksesi %{date} on hyväksytty
       subtitle: Tilisi on jälleen normaalissa tilassa.
       title: Valitus hyväksytty
     appeal_rejected:
-      explanation: Valitus tiliäsi koskevasta varoituksesta %{strike_date} jonka lähetit %{appeal_date} on hylätty.
-      subject: Valituksesi %{date} on hylätty
-      subtitle: Vetoomuksesi on hylätty.
+      explanation: "%{appeal_date} lähettämäsi valitus tiliisi kohdistuvasta varoituksesta %{strike_date} on hylätty."
+      subject: "%{date} lähettämäsi valitus on hylätty"
+      subtitle: Valituksesi on hylätty.
       title: Valitus hylätty
     backup_ready:
       explanation: Olet pyytänyt täyden varmuuskopion Mastodon-tilistäsi.
@@ -1820,10 +1821,10 @@ fi:
       title: Arkiston tallennus
     failed_2fa:
       details: 'Sisäänkirjautumispyrkimyksen yksityiskohtaiset tiedot:'
-      explanation: Joku on yrittänyt kirjautua tilillesi antaen väärän toisen todennustunnisteen.
+      explanation: Joku on yrittänyt kirjautua tilillesi mutta antoi väärän toisen todennustunnisteen.
       further_actions_html: Jos se et ollut sinä, suosittelemme, että %{action} välittömästi, sillä se on saattanut vaarantua.
       subject: Kaksivaiheisen todennuksen virhe
-      title: Kaksivaiheisen kirjautumisen toinen vaihe epäonnistui
+      title: Kaksivaiheisen todennuksen toinen vaihe epäonnistui
     suspicious_sign_in:
       change_password: vaihda salasanasi
       details: 'Tässä on tiedot kirjautumisesta:'
@@ -1833,14 +1834,14 @@ fi:
       title: Uusi kirjautuminen
     warning:
       appeal: Lähetä valitus
-      appeal_description: Jos uskot, että tämä on virhe, voit hakea muutosta instanssin %{instance} ylläpidolta.
+      appeal_description: Jos uskot, että tämä on virhe, voit hakea muutosta palvelimen %{instance} ylläpidolta.
       categories:
         spam: Roskaposti
         violation: Sisältö rikkoo seuraavia yhteisön sääntöjä
       explanation:
-        delete_statuses: Joidenkin julkaisuistasi on havaittu rikkovan ainakin yhtä yhteisön sääntöä, joten instanssin %{instance} valvojat ovat poistaneet ne.
+        delete_statuses: Joidenkin julkaisuistasi on havaittu rikkovan ainakin yhtä yhteisön sääntöä, joten palvelimen %{instance} moderaattorit ovat poistaneet ne.
         disable: Et voi enää käyttää tiliäsi, mutta profiilisi ja muut tiedot pysyvät muuttumattomina. Voit pyytää varmuuskopiota tiedoistasi, vaihtaa tilin asetuksia tai poistaa tilisi.
-        mark_statuses_as_sensitive: Palvelimen %{instance} valvojat ovat merkinneet osan julkaisuistasi arkaluonteisiksi. Tämä tarkoittaa sitä, että ihmisten täytyy napauttaa mediaa ennen kuin sen esikatselu näytetään. Voit merkitä median itse arkaluonteiseksi, kun julkaiset tulevaisuudessa.
+        mark_statuses_as_sensitive: Palvelimen %{instance} moderaattorit ovat merkinneet osan julkaisuistasi arkaluonteisiksi. Tämä tarkoittaa sitä, että ihmisten täytyy napauttaa mediaa ennen kuin sen esikatselu näytetään. Voit merkitä median itse arkaluonteiseksi, kun julkaiset tulevaisuudessa.
         sensitive: Tästä lähtien kaikki ladatut mediatiedostot merkitään arkaluonteisiksi ja piilotetaan napsautusvaroituksen taakse.
         silence: Voit edelleen käyttää tiliäsi, mutta vain sinua jo seuraavat käyttäjät näkevät julkaisusi tällä palvelimella ja sinut voidaan sulkea pois eri löytämisominaisuuksista. Toiset voivat kuitenkin edelleen seurata sinua manuaalisesti.
         suspend: Et voi enää käyttää tiliäsi, eivätkä profiilisi ja muut tiedot ole enää käytettävissä. Voit silti kirjautua sisään pyytääksesi tietojesi varmuuskopiota, kunnes tiedot on poistettu kokonaan noin 30 päivän kuluttua. Säilytämme kuitenkin joitain perustietoja, jotka estävät sinua kiertämästä jäädytystä.
@@ -1870,7 +1871,7 @@ fi:
       checklist_subtitle: 'Näin pääset alkuun tällä uudella sosiaalisella alustalla:'
       checklist_title: Tervetulon tarkistuslista
       edit_profile_action: Mukauta
-      edit_profile_step: Tehosta vuorovaikutuksiasi kattavin profiilitiedoin.
+      edit_profile_step: Täydentämällä profiilisi tietoja tehostat vuorovaikutteisuutta.
       edit_profile_title: Mukauta profiiliasi
       explanation: Näillä vinkeillä pääset alkuun
       feature_action: Lue lisää
@@ -1891,7 +1892,7 @@ fi:
       hashtags_recent_count:
         one: "%{people} henkilö viimeisen 2 päivän aikana"
         other: "%{people} henkilöä viimeisen 2 päivän aikana"
-      hashtags_subtitle: Tutki, mikä on ollut suosittua 2 edeltävän päivän jälkeen
+      hashtags_subtitle: Tutki, mikä on ollut suosittua viimeisenä 2 päivänä
       hashtags_title: Suositut aihetunnisteet
       hashtags_view_more: Näytä lisää suosittuja aihetunnisteita
       post_action: Kirjoita
@@ -1915,20 +1916,20 @@ fi:
     extra_instructions_html: <strong>Vinkki:</strong> Verkkosivustollasi oleva linkki voi olla myös näkymätön. Olennainen osuus on <code>rel="me"</code>, joka estää toiseksi henkilöksi tekeytymisen verkkosivustoilla, joilla on käyttäjien luomaa sisältöä. Voit käyttää jopa <code>link</code>-elementtiä sivun <code>head</code>-osassa elementin <code>a</code> sijaan, mutta HTML:n pitää olla käytettävissä ilman JavaScript-koodin suorittamista.
     here_is_how: Näin voit tehdä sen
     hint_html: "<strong>Henkilöllisyyden vahvistaminen on Mastodonissa jokaisen käyttäjän ulottuvilla.</strong> Se perustuu avoimiin standardeihin ja on maksutonta nyt ja aina. Tarvitset vain henkilökohtaisen verkkosivuston, jonka perusteella sinut voidaan tunnistaa. Kun teet linkin tuolle verkkosivulle profiilistasi, tarkistamme, että verkkosivustolla on linkki takaisin profiiliisi, ja näytämme profiilissasi visuaalisen ilmaisimen."
-    instructions_html: Kopioi ja liitä alla oleva koodi verkkosivustosi HTML-lähdekoodiin. Lisää sitten verkkosivustosi osoite johonkin profiilisi lisäkentistä ”Muokkaa profiilia” -välilehdellä ja tallenna muutokset.
+    instructions_html: Kopioi ja liitä seuraava koodi verkkosivustosi HTML-lähdekoodiin. Lisää sitten verkkosivustosi osoite johonkin profiilisi lisäkentistä ”Muokkaa profiilia” -välilehdellä ja tallenna muutokset.
     verification: Vahvistus
     verified_links: Vahvistetut linkkisi
   webauthn_credentials:
     add: Lisää uusi suojausavain
     create:
       error: Suojausavaimen lisäämisessä oli ongelma. Yritä uudelleen.
-      success: Suojausavaimesi lisääminen onnistui.
+      success: Suojausavaimesi lisäys onnistui.
     delete: Poista
     delete_confirmation: Haluatko varmasti poistaa tämän suojausavaimen?
-    description_html: Jos otat <strong>suojausavaimen todennuksen</strong> käyttöön, kirjautuminen edellyttää jonkin suojausavaimen käyttämistä.
+    description_html: Jos otat <strong>suojausavaimella todennuksen</strong> käyttöön, kirjautuminen edellyttää jonkin suojausavaimesi käyttämistä.
     destroy:
       error: Suojausavaimen poistamisessa oli ongelma. Yritä uudelleen.
-      success: Suojausavaimesi poistaminen onnistui.
+      success: Suojausavaimesi poisto onnistui.
     invalid_credential: Virheellinen suojausavain
     nickname_hint: Anna uuden suojausaivaimesi lempinimi
     not_enabled: Et ole vielä ottanut WebAuthn-ohjelmaa käyttöön
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 1e717b6c204292..eaeada4d1d87bc 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -523,6 +523,7 @@ lt:
       report: 'Skundas #%{id}'
       reported_account: Reportuota paskyra
       reported_by: Skundas sukurtas
+      reported_with_application: Pranešta su programėle
       resolved: Išspręsta
       resolved_msg: Skundas sėkmingai įšspręstas!
       status: Statusas
diff --git a/config/locales/sc.yml b/config/locales/sc.yml
index 449d8d9c7f3296..6f4fd6eb30da66 100644
--- a/config/locales/sc.yml
+++ b/config/locales/sc.yml
@@ -118,7 +118,7 @@ sc:
       search_same_ip: Àteras persones cun sa pròpiu IP
       security: Seguresa
       sensitive: Sensìbile
-      sensitized: marcadu comente a sensìbile
+      sensitized: Marcadu comente sensìbile
       shared_inbox_url: URL de intrada cumpartzida
       show:
         created_reports: Informes creados
@@ -127,13 +127,13 @@ sc:
       silenced: Limitadas
       statuses: Tuts
       subscribe: Sutascrie·ti
-      suspend: Suspensione
+      suspend: Suspende
       suspended: Suspèndidu
       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
       unconfirmed_email: Posta eletrònica sena cunfirmare
-      undo_sensitized: Boga sa marcadura comente "sensìbile"
+      undo_sensitized: Boga sa marcadura comente sensìbile
       undo_silenced: Non pòngias a sa muda
       undo_suspension: Iscontza sa suspensione
       unsilenced_msg: As bogadu is lìmites a su contu de %{username}
@@ -280,36 +280,44 @@ sc:
       updated_msg: Emoji atualizadu
       upload: Càrriga
     dashboard:
-      media_storage: Immagasinamentu
+      active_users: utentes ativos
+      interactions: interatziones
+      media_storage: Immagasinamentu multimèdia
+      new_users: utentes noos
+      opened_reports: informes abertos
       software: Programmas
       space: Impreu de ispàtziu
       title: Pannellu
+      website: Situ web
     domain_allows:
       add_new: Permite sa federatzione cun domìniu
       created_msg: Sa federatzione cun su domìniu est istada permìtida
       destroyed_msg: Sa federatzione cun su domìniu no est istada permìtida
-      import: Importatzione
+      export: Esporta
+      import: Importa
       undo: Non permitas sa federatzione cun su domìniu
     domain_blocks:
       add_new: Agiunghe blocu de domìniu nou
       confirm_suspension:
         cancel: Annulla
-        confirm: Suspensione
+        confirm: Suspende
+        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
       domain: Domìniu
       edit: Modìfica su blocu de su domìniu
       existing_domain_block_html: As giai impostu lìmites prus astrintos a %{name}, ddu dias dèpere <a href="%{unblock_url}">isblocare</a> prima.
-      import: Importatzione
+      export: Esporta
+      import: Importa
       new:
         create: Crea unu blocu
         hint: Su blocu de domìniu no at a impedire sa creatzione de contos noos in sa base de datos, ma ant a èssere aplicados in manera retroativa mètodos de moderatzione ispetzìficos subra custos contos.
         severity:
           noop: Perunu
-          silence: A sa muda
+          silence: Lìmita
           suspend: Suspensione
         title: Blocu de domìniu nou
-      not_permitted: Non tenes su permissu de fàghere custa atzione
+      not_permitted: Non tenes permissu pro fàghere custa atzione
       obfuscate: Cua su nòmine de domìniu
       obfuscate_hint: Cua una parte de su nòmine de domìniu in sa lista si sa visualizatzione de sa lista de domìnios limitados est ativa
       private_comment: Cummentu privadu
@@ -330,7 +338,16 @@ sc:
       new:
         create: Agiunghe unu domìniu
         title: Bloca su domìniu de posta eletrònica nou
+      not_permitted: Non permìtidu
       title: Domìnios de posta eletrònica blocados
+    export_domain_allows:
+      no_file: Perunu archìviu seletzionadu
+    export_domain_blocks:
+      import:
+        title: Importa blocos de domìniu
+      new:
+        title: Importa blocos de domìniu
+      no_file: Perunu archìviu seletzionadu
     follow_recommendations:
       description_html: "<strong>Is cussìgios de sighiduras agiudant a is persones noas a agatare deretu cuntenutu interessante</strong>. Si una persone at interagidu cun pagu gente e non podet retzire cussìgios de sighiduras personalizados, custos contos ant a èssere ammustrados. Ant a èssere torrados a carculare dae un'ammisturu de contos cun is pertzentuales de cumpromissu prus artos e su nùmeru prus artu de sighiduras pro un'idioma ispetzìficu."
       language: Pro idioma
@@ -341,15 +358,22 @@ sc:
       unsuppress: Recùpera su cussìgiu de sighidura
     instances:
       back_to_all: Totus
-      back_to_limited: Limitadu
+      back_to_limited: Limitadas
       back_to_warning: Atentzione
       by_domain: Domìniu
       content_policies:
+        comment: Apuntu internu
         policies:
+          reject_media: Refuda elementos multimediales
           reject_reports: Refuda informes
-          silence: A sa muda
-          suspend: Suspensione
+          silence: Lìmita
+          suspend: Suspende
+        policy: Polìtica
+        reason: Resone pùblica
+        title: Polìticas de cuntenutu
       dashboard:
+        instance_accounts_dimension: Contos prus sighidos
+        instance_accounts_measure: contos sarvados
         instance_reports_measure: informes a subra de àtere
       delivery:
         all: Totus
@@ -426,10 +450,12 @@ sc:
       assigned: Moderatzione assignada
       by_target_domain: Domìniu de su contu signaladu
       cancel: Annulla
+      category: Categoria
       comment:
         none: Perunu
       confirm: Cunfirma
       created_at: Sinnaladu
+      delete_and_resolve: Cantzella publicatziones
       forwarded: Torradu a imbiare
       forwarded_to: Torradu a imbiare a %{domain}
       mark_as_resolved: Marca comente a isòrvidu
@@ -442,12 +468,14 @@ sc:
         create_and_unresolve: Torra a abèrrere cun una nota
         delete: Cantzella
         placeholder: Descrie is atziones chi as pigadu o cale si siat àtera atualizatzione de importu...
+        title: Notas
       reopen: Torra a abèrrere s'informe
       report: 'Informe #%{id}'
       reported_account: Contu sinnaladu
       reported_by: Sinnaladu dae
       resolved: Isòrvidu
       resolved_msg: Informe isòrvidu.
+      skip_to_actions: Brinca a is atziones
       status: Istadu
       title: Informes
       unassign: Boga s'assignatzione
@@ -455,13 +483,18 @@ sc:
       updated_at: Atualizadu
       view_profile: Visualiza profilu
     roles:
+      assigned_users:
+        one: "%{count} utente"
+        other: "%{count} utentes"
       categories:
         administration: Amministratzione
         invites: Invitos
         moderation: Moderatzione
+        special: Ispetziale
       delete: Cantzella
       privileges:
         administrator: Amministratzione
+        invite_users: Invita gente
     rules:
       add_new: Agiunghe règula
       delete: Cantzella
@@ -481,7 +514,8 @@ sc:
       discovery:
         follow_recommendations: Cussìgios de sighidura
         profile_directory: Diretòriu de profilos
-        public_timelines: Lìnias de tempos pùblicas
+        public_timelines: Lìnias de tempus pùblicas
+        publish_statistics: Pùblica istatìsticas
         title: Iscoberta
         trends: Tendèntzias
       domain_blocks:
@@ -495,19 +529,32 @@ sc:
           approved: Aprovatzione rechesta pro si registrare
           none: Nemos si podet registrare
           open: Chie si siat si podet registrare
+      title: Cunfiguratziones de su serbidore
     site_uploads:
       delete: Cantzella s'archìviu carrigadu
       destroyed_msg: Càrriga de su situ cantzellada.
     software_updates:
       documentation_link: Àteras informatziones
+      title: Atualizatziones a disponimentu
+      type: Casta
+      version: Versione
     statuses:
+      account: Autore
       application: Aplicatzione
       back_to_account: Torra a sa pàgina de su contu
       deleted: Cantzelladu
+      favourites: Preferidos
+      language: Idioma
       media:
         title: Elementos multimediales
+      metadata: Metadatos
       no_status_selected: Perunu istadu est istadu mudadu dae chi non nd'as seletzionadu
+      open: Aberi sa publicatzione
+      original_status: Publicatzione originale
+      status_changed: Publicatzione modificada
       title: Istados de su contu
+      trending: Populares
+      visibility: Visibilidade
       with_media: Cun elementos multimediales
     strikes:
       actions:
@@ -515,7 +562,7 @@ sc:
         suspend: "%{name} at suspèndidu su contu de %{target}"
     system_checks:
       database_schema_check:
-        message_html: Ddoe at tràmudas de base de datos in suspesu. Pone·ddas in esecutzione pro ti assegurare chi s'aplicatzione funtzionet comente si tocat
+        message_html: Ddoe at tràmudas de bases de datos in suspesu. Pone·ddas in esecutzione pro ti assegurare chi s'aplicatzione funtzionet comente si tocat
       rules_check:
         action: Gesti is règulas de su serbidore
         message_html: No as cunfiguradu peruna règula de su serbidore.
@@ -527,6 +574,12 @@ sc:
     title: Amministratzione
     trends:
       pending_review: De revisionare
+      rejected: Refudadas
+      statuses:
+        allow: Permite sa publicatzione
+        allow_account: Permite a s'autore
+        disallow: Non permitas sa publicatzione
+        disallow_account: Non permitas a s'autore
       tags:
         title: Etichetas de tendèntzia
       title: Tendèntzias
@@ -541,8 +594,17 @@ sc:
       disabled: Disativadu
       enable: Ativa
       enabled: Ativu
+      events: Eventos
       status: Istadu
   admin_mailer:
+    new_appeal:
+      actions:
+        delete_statuses: cantzellare is publicatziones issoro
+        mark_statuses_as_sensitive: marcare is publicatziones issoro comente sensìbiles
+        none: un'avisu
+        sensitive: marcare su contu issoro comente sensìbile
+        silence: limitare su contu issoro
+        suspend: suspèndere su contu issoro
     new_pending_account:
       body: Is detàllios de su contu nou sunt a suta. Podes aprovare o refudare custa rechesta.
       subject: Contu nou de revisionare in %{instance} (%{username})
@@ -551,6 +613,10 @@ sc:
       body_remote: Una persone de su domìniu %{domain} at sinnaladu %{target}
       subject: Informe nou pro %{instance} (#%{id})
     new_trends:
+      new_trending_links:
+        title: Ligòngios populares
+      new_trending_statuses:
+        title: Publicatziones populares
       new_trending_tags:
         title: Etichetas de tendèntzia
   aliases:
@@ -588,8 +654,11 @@ sc:
     warning: Dae cara a custos datos. Non ddos cumpartzas mai cun nemos!
     your_token: S'identificadore tuo de atzessu
   auth:
+    apply_for_account: Pedi unu contu
     confirmations:
+      clicking_this_link: incarchende custu ligòngiu
       login_link: intra
+      welcome_title: Ti donamus su benebènnidu, %{name}!
     delete_account: Cantzella su contu
     delete_account_html: Si boles cantzellare su contu, ddu podes <a href="%{path}">fàghere inoghe</a>. T'amus a dimandare una cunfirmatzione.
     description:
@@ -601,21 +670,32 @@ sc:
     invalid_reset_password_token: Su còdighe de autorizatzione pro resetare sa crae no est vàlidu o est iscadidu. Dimanda·nde un'àteru.
     link_to_otp: Inserta unu còdighe a duas fases dae su telèfono tuo o unu còdighe de recùperu
     link_to_webauth: Imprea su dispositivu tuo de crae de seguresa
+    log_in_with: Intra cun
     login: Intra
     logout: Essi
     migrate_account: Moe a unu contu diferente
     migrate_account_html: Si boles torrare a indiritzare custu contu a un'àteru, ddu as a pòdere <a href="%{path}">fàghere inoghe</a>.
     or_log_in_with: O intra cun
+    progress:
+      confirm: Cunfirma s'indiritzu de posta eletrònica
+      details: Is detàllios tuos
+      review: Sa revisione nostra
+      rules: Atzeta is règulas
     providers:
       cas: CAS
       saml: SAML
     register: Registru
     registration_closed: "%{instance} no atzetat àteras persones"
+    resend_confirmation: Torra a imbiare su ligòngiu de cunfirmatzione
     reset_password: Reseta sa crae
     rules:
+      accept: Atzeta
       back: A coa
+      title_invited: As retzidu un'invitu.
     security: Seguresa
     set_new_password: Cunfigura una crae noa
+    setup:
+      link_not_received: No as retzidu su ligòngiu?
     status:
       account_status: Istadu de su contu
       confirming: Isetende chi sa posta eletrònica siat cumpletada.
@@ -670,11 +750,15 @@ sc:
       username_unavailable: Su nòmine de utente tuo no at a abarrare a disponimentu
   disputes:
     strikes:
+      status_removed: Sa publicatzione est giai istada cantzellada de su sistema
+      title: "%{action} de sa data imbeniente: %{date}"
       title_actions:
+        delete_statuses: Cantzelladura de publicatziones
         none: Atentzione
   domain_validator:
     invalid_domain: no est unu nòmine de domìniu vàlidu
   edit_profile:
+    basic_information: Informatzione bàsica
     other: Àteru
   errors:
     '400': Sa dimanda chi as imbiadu non fiat vàlida o non fiat curreta.
@@ -720,15 +804,36 @@ sc:
       public: Lìnias de tempos pùblicas
       thread: Arresonadas
     edit:
+      add_keyword: Agiunghe paràulas crae
+      keywords: Paràulas crae
+      statuses: Publicatziones individuales
       title: Modìfica filtru
     errors:
       invalid_context: Cuntestu mancante o non vàlidu
     index:
       delete: Cantzella
       empty: Non tenes perunu filtru.
+      expires_in: Iscadit in %{distance}
+      expires_on: Iscadit su %{date}
+      keywords:
+        one: "%{count} paràula crae"
+        other: "%{count} paràulas crae"
+      statuses:
+        one: "%{count} publicatzione"
+        other: "%{count} publicatziones"
+      statuses_long:
+        one: "%{count} publicatzione individuale cuada"
+        other: "%{count} publicatziones individuales cuadas"
       title: Filtros
     new:
+      save: Sarva filtru nou
       title: Agiunghe unu filtru nou
+    statuses:
+      back_to_filter: Torra a su filtru
+      batch:
+        remove: Boga dae su filtru
+      index:
+        title: Publicatziones filtradas
   generic:
     all: Totus
     cancel: Annulla
@@ -736,6 +841,7 @@ sc:
     confirm: Cunfirma
     copy: Còpia
     delete: Cantzella
+    deselect: Boga sa seletzione
     none: Perunu
     order_by: Òrdina pro
     save_changes: Sarva is modìficas
@@ -745,7 +851,12 @@ sc:
       other: Calicuna cosa ancora no est andende. Bide is %{count} faddinas in bàsciu
   imports:
     errors:
+      empty: Archìviu CSV bòidu
       over_rows_processing_limit: cuntenet prus de %{count} filas
+      too_large: S'archìviu est tropu mannu
+    failures: Faddinas
+    imported: Importadu
+    mismatched_types_warning: Forsis as seletzionadu unu tipu chi no est curretu pro s'importatzione.
     modes:
       merge: Uni
       merge_long: Mantene is registros chi esistint e agiunghe·nde àteros
@@ -836,8 +947,8 @@ sc:
     copy_account_note_text: 'Custa persone s''est tramudada dae %{acct}, custas sunt is notas antepostas tuas chi ddi pertocant:'
   notification_mailer:
     favourite:
-      body: "%{name} at marcadu comente a preferidu s'istadu tuo:"
-      subject: "%{name} at marcadu comente a preferidu s'istadu tuo"
+      body: "%{name} at marcadu comente preferida sa publicatzione tua:"
+      subject: "%{name} at marcadu comente preferida sa publicatzione tua"
       title: Preferidu nou
     follow:
       body: "%{name} t'est sighende!"
@@ -904,7 +1015,10 @@ sc:
     posting_defaults: Valores predefinidos de publicatzione
     public_timelines: Lìnias de tempos pùblicas
   privacy:
+    privacy: Riservadesa
     search: Chirca
+  privacy_policy:
+    title: Polìtica de riservadesa
   reactions:
     errors:
       limit_reached: Lìmite de reatziones diferentes cròmpidu
@@ -928,8 +1042,13 @@ sc:
     status: Istadu de su contu
   remote_follow:
     missing_resource: Impossìbile agatare sa rechesta de indiritzamentu URL pro su contu tuo
+  rss:
+    content_warning: 'Avisu de cuntenutu:'
+    descriptions:
+      account: Publicatziones pùblicas dae @%{acct}
+      tag: 'Publicatziones pùblicas etichetadas cun #%{hashtag}'
   scheduled_statuses:
-    over_daily_limit: As superadu su lìmite de %{limit} tuts programmados pro cudda die
+    over_daily_limit: As superadu su lìmite de %{limit} publicatziones programmadas pro cudda die
     over_total_limit: As superadu su lìmite de %{limit} tuts programmados
     too_soon: Sa data programmada depet èssere benidora
   sessions:
@@ -937,11 +1056,13 @@ sc:
     browser: Navigadore
     browsers:
       alipay: Alipay
+      blackberry: BlackBerry
       chrome: Chrome
       edge: Microsoft Edge
       electron: Electron
       firefox: Firefox
       generic: Navigadore disconnotu
+      huawei_browser: Navigadore Huawei
       ie: Internet Explorer
       micro_messenger: MicroMessenger
       nokia: Navigadore Nokia S40 Ovi
@@ -950,19 +1071,25 @@ sc:
       phantom_js: PhantomJS
       qq: QQ Browser
       safari: Safari
+      uc_browser: Navigadore UC
+      unknown_browser: Navigadore disconnotu
       weibo: Weibo
     current_session: Sessione atuale
+    date: Data
     description: "%{browser} de %{platform}"
     explanation: Custos sunt is navigadores web de is chi ses intradu in su contu tuo de Mastodon.
     ip: IP
     platforms:
       adobe_air: Adobe Air
       android: Android
+      blackberry: BlackBerry
       chrome_os: ChromeOS
       firefox_os: Firefox OS
       ios: iOS
+      kai_os: KaiOS
       linux: Linux
       mac: macOS
+      unknown_platform: Prataforma disconnota
       windows: Windows
       windows_mobile: Windows Mobile
       windows_phone: Windows Phone
@@ -984,8 +1111,9 @@ sc:
     import: Importatzione
     import_and_export: Importatzione e esportatzione
     migrate: Tràmuda de contu
+    notifications: Notìficas tràmite posta eletrònica
     preferences: Preferèntzias
-    profile: Profilu
+    profile: Profilu pùblicu
     relationships: Gente chi sighis e sighiduras
     two_factor_authentication: Autenticatzione de duos fatores
     webauthn_authentication: Craes de seguresa
@@ -1034,6 +1162,7 @@ sc:
       unlisted: Esclùidu de sa lista
       unlisted_long: Podet èssere bidu dae chie si siat, però non podet èssere ammustradu in lìnias de tempus pùblicas
   statuses_cleanup:
+    exceptions: Etzetziones
     min_age:
       '1209600': 2 chidas
       '15778476': 6 meses
@@ -1055,6 +1184,8 @@ sc:
     formats:
       default: "%d %b %Y, %H:%M"
       month: "%b %Y"
+      time: "%H:%M"
+      with_time_zone: "%d %b, %Y, %H:%M %Z"
   two_factor_authentication:
     add: Agiunghe
     disable: Disativa 2FA
@@ -1071,23 +1202,47 @@ sc:
     recovery_instructions_html: Si una die as a pèrdere s'atzessu a su telèfonu tuo, as a pòdere impreare unu de is còdighes de recùperu inoghe in suta pro recuperare s'atzessu a su contu tuo. <strong>Cunserva is còdighes in manera segura</strong>. Pro esèmpiu, ddos dias pòdere imprentare e archiviare in paris a àteros documentos de importu.
     webauthn: Craes de seguresa
   user_mailer:
+    appeal_approved:
+      action: Cunfiguratziones de su contu
     backup_ready:
       subject: S'archìviu tuo est prontu pro èssere iscarrigadu
       title: Collida dae s'archìviu
+    suspicious_sign_in:
+      change_password: muda sa crae
+      details: 'Custos sunt is detàllios de s''identificatzione:'
     warning:
+      categories:
+        spam: Àliga
       reason: 'Resone:'
+      statuses: 'Publicatziones tzitadas:'
       subject:
         disable: Su contu tuo %{acct} est istadu cungeladu
         none: Avisu pro %{acct}
         silence: Su contu tuo %{acct} est istadu limitadu
         suspend: Su contu tuo %{acct} est istadu suspèndidu
       title:
+        delete_statuses: Publicatziones cantzelladas
         disable: Contu congeladu
+        mark_statuses_as_sensitive: Publicatziones marcadas comente sensìbiles
         none: Atentzione
+        sensitive: Contu marcadu comente sensìbile
         silence: Contu limitadu
         suspend: Contu suspèndidu
     welcome:
+      apps_ios_action: Iscàrriga·dda dae sa butega de aplicatziones
+      apps_step: Iscàrriga is aplicatziones ufitziales nostras.
+      apps_title: Aplicatziones de Mastodon
+      edit_profile_action: Personaliza
+      edit_profile_title: Personaliza su profilu tuo
       explanation: Inoghe ddoe at una paja de impòsitos pro cumintzare
+      feature_action: Àteras informatziones
+      follow_action: Sighi
+      follow_title: Personaliza s'ischermu printzipale
+      post_action: Iscrie
+      post_title: Pùblica pro sa primu borta
+      share_action: Cumpartzi
+      share_title: Cumpartzi su profilu tuo de Mastodon
+      sign_in_action: Intra
       subject: Ti donamus su benebènnidu a Mastodon
       title: Ti donamus su benebènnidu, %{name}!
   users:
@@ -1101,13 +1256,13 @@ sc:
   webauthn_credentials:
     add: Agiunghe una crae de seguresa noa
     create:
-      error: Ddoe at àpidu unu problema cun s'agiunta de sa crae de seguresa tua. Torra a proare.
+      error: Ddoe est istadu unu problema cun s'agiunta de sa crae de seguresa tua. Torra a proare.
       success: Sa crae de seguresa tua est istada agiunta.
     delete: Cantzella
     delete_confirmation: Seguru chi boles cantzellare custa crae de seguresa?
     description_html: Si permites s'<strong>autenticatzione cun crae de seguresa</strong>, as a tènnere bisòngiu de impreare una de is craes de seguresa tuas pro ti identificare.
     destroy:
-      error: Ddoe at àpidu unu problema cun sa cantzelladura de sa crae de seguresa tua. Torra a proare.
+      error: Ddoe est istadu unu problema cun sa cantzelladura de sa crae de seguresa tua. Torra a proare.
       success: Sa crae de seguresa tua est istada cantzellada.
     invalid_credential: Crae de seguresa non vàlida
     nickname_hint: Inserta su nomìngiu de sa crae de seguresa tua noa
diff --git a/config/locales/simple_form.fi.yml b/config/locales/simple_form.fi.yml
index de099a21be2e1a..a59368ca4ef4c3 100644
--- a/config/locales/simple_form.fi.yml
+++ b/config/locales/simple_form.fi.yml
@@ -9,25 +9,25 @@ fi:
         indexable: Julkiset julkaisusi voivat näkyä hakutuloksissa Mastodonissa. Ihmiset, jotka ovat olleet vuorovaikutuksessa julkaisujesi kanssa, voivat etsiä niitä asetuksesta riippumatta.
         note: 'Voit @mainita muita käyttäjiä tai #aihetunnisteita.'
         show_collections: Käyttäjät voivat selata seurattujasi ja seuraajiasi. Käyttäjät, joita seuraat, näkevät joka tapauksessa, että seuraat heitä.
-        unlocked: Käyttäjät voivat seurata sinua pyytämättä hyväksyntää. Poista valinta, jos haluat tarkistaa ja hyväksyä tai hylätä vastaanottamasi seuraamispyynnöt.
+        unlocked: Käyttäjät voivat seurata sinua pyytämättä hyväksyntääsi. Poista valinta, jos haluat tarkistaa sekä hyväksyä tai hylätä vastaanottamasi seuraamispyynnöt.
       account_alias:
-        acct: Määrittele sen tilin käyttäjänimi@verkkotunnus, josta haluat siirtyä
+        acct: Määrittele sen tilin käyttäjänimi@verkkotunnus, josta haluat muuttaa
       account_migration:
-        acct: Määrittele sen tilin käyttäjänimi@verkkotunnus, johon haluat siirtyä
+        acct: Määrittele sen tilin käyttäjänimi@verkkotunnus, jonne haluat muuttaa
       account_warning_preset:
         text: Voit käyttää julkaisun syntaksia, kuten URL-osoitteita, aihetunnisteita ja mainintoja
         title: Valinnainen. Ei näy vastaanottajalle
       admin_account_action:
-        include_statuses: Käyttäjä näkee, mitkä julkaisut johtivat valvontatoimeen tai varoitukseen
+        include_statuses: Käyttäjä näkee, mitkä julkaisut johtivat moderointitoimeen tai -varoitukseen
         send_email_notification: Käyttäjä saa selvityksen siitä, mitä hänen tililleen tapahtui
         text_html: Valinnainen. Voit käyttää julkaisun syntaksia. Voit <a href="%{path}">lisätä varoitusasetuksia</a> säästääksesi aikaa
         type_html: Valitse mitä teet käyttäjälle <strong>%{acct}</strong>
         types:
           disable: Estä käyttäjää käyttämästä tiliään, mutta älä poista tai piilota sen sisältöä.
-          none: Käytä tätä lähettääksesi varoituksen käyttäjälle käynnistämättä mitään muita toimintoja.
+          none: Käytä tätä lähettääksesi varoitus käyttäjälle käynnistämättä mitään muita toimia.
           sensitive: Pakota kaikki tämän käyttäjän mediatiedostot arkaluonteisiksi.
-          silence: Estä käyttäjää lähettämästä viestejä julkisesti, piilota hänen viestinsä ja ilmoituksensa ihmisiltä, jotka eivät seuraa häntä. Sulkee kaikki tämän tilin raportit.
-          suspend: Estä kaikki vuorovaikutus tältä -tai tälle tilille ja poista sen kaikki sisältö. Päätös voidaan peruuttaa 30 päivän aikana. Sulkee kaikki raportit tätä tiliä vasten.
+          silence: Estä käyttäjää lähettämästä julkaisuja, joiden näkyvyys on julkinen, sekä piilota hänen julkaisunsa ja häneen liittyvät ilmoitukset niiltä, jotka eivät seuraa häntä. Sulkee kaikki tiliin kohdistuvat raportit.
+          suspend: Estä kaikki vuorovaikutus tältä tililtä ja tälle tilille sekä poista kaikki sen sisältö. Peruttavissa 30 päivän ajan. Sulkee kaikki tiliin kohdistuvat raportit.
         warning_preset_id: Valinnainen. Voit silti lisätä mukautetun tekstin esiasetuksen loppuun
       announcement:
         all_day: Kun valittu, vain valittu aikaväli näytetään
@@ -40,7 +40,7 @@ fi:
       defaults:
         autofollow: Henkilöt, jotka rekisteröityvät kutsun kautta, seuraavat sinua automaattisesti
         avatar: WEBP, PNG, GIF tai JPG. Enintään %{size}. Skaalataan kokoon %{dimensions} px
-        bot: Tämä tili suorittaa enimmäkseen automaattisia toimintoja eikä sitä ehkä valvota
+        bot: Ilmaise muille, että tili suorittaa enimmäkseen automaattisia toimia eikä sitä valvota
         context: Ainakin yksi konteksti, jossa suodattimen pitäisi olla voimassa
         current_password: Turvallisuussyistä kirjoita nykyisen tilin salasana
         current_username: Vahvista kirjoittamalla nykyisen tilin käyttäjänimi
@@ -52,7 +52,7 @@ fi:
         locale: Käyttöliittymän, sähköpostien ja puskuilmoitusten kieli
         password: Käytä vähintään 8 merkkiä
         phrase: Täsmää riippumatta tekstin aakkoslajista tai julkaisun sisältövaroituksesta
-        scopes: Mihin sovellusliittymiin sovellus pääsee käsiksi. Jos valitset ylätason laajuuden, sinun ei tarvitse valita yksittäisiä.
+        scopes: Mihin ohjelmointirajapintoihin sovellus pääsee käsiksi. Jos valitset ylätason oikeuden, sinun ei tarvitse valita yksittäisiä.
         setting_aggregate_reblogs: Älä näytä uusia tehostuksia julkaisuille, joita on äskettäin tehostettu (koskee vain juuri vastaanotettuja tehostuksia)
         setting_always_send_emails: Yleensä sähköposti-ilmoituksia ei lähetetä, kun käytät Mastodonia aktiivisesti
         setting_default_sensitive: Arkaluonteinen media piilotetaan oletusarvoisesti, ja se voidaan näyttää yhdellä napsautuksella
@@ -64,10 +64,10 @@ fi:
         username: Voit käyttää kirjaimia, numeroita ja alaviivoja
         whole_word: Kun avainsana tai -fraasi on täysin aakkosnumeerinen, suodatin aktivoituu vain sen täysvastineille
       domain_allow:
-        domain: Tämä verkkotunnus voi noutaa tietoja tältä palvelimelta ja sieltä saapuvat tiedot käsitellään ja tallennetaan
+        domain: Tämä verkkotunnus voi noutaa tietoja tältä palvelimelta, ja sieltä saapuvat tiedot käsitellään ja tallennetaan
       email_domain_block:
         domain: Tämä voi olla verkkotunnus, joka näkyy sähköpostiosoitteessa tai sen käyttämässä MX-tietueessa. Ne tarkistetaan rekisteröitymisen yhteydessä.
-        with_dns_records: Annetun verkkotunnuksen DNS-tietueet yritetään ratkaista ja tulokset myös estetään
+        with_dns_records: Annetun verkkotunnuksen DNS-tietueet yritetään selvittää ja myös tulokset estetään
       featured_tag:
         name: 'Tässä muutamia hiljattain käyttämiäsi aihetunnisteita:'
       filters:
@@ -78,29 +78,29 @@ fi:
       form_admin_settings:
         activity_api_enabled: Paikallisesti julkaistujen julkaisujen, aktiivisten käyttäjien ja rekisteröitymisten viikoittainen määrä
         app_icon: WEBP, PNG, GIF tai JPG. Korvaa oletusarvoisen mobiililaitteiden sovelluskuvakkeen omalla kuvakkeella.
-        backups_retention_period: Käyttäjillä on mahdollisuus arkistoida julkaisujaan myöhemmin ladattaviksi. Kun arvo on positiivinen, nämä arkistot poistuvat automaattisesti, kun määritetty määrä päiviä on kulunut.
-        bootstrap_timeline_accounts: Nämä tilit kiinnitetään uusien käyttäjien seuraamissuosituslistojen alkuun.
+        backups_retention_period: Käyttäjillä on mahdollisuus arkistoida julkaisujaan myöhemmin ladattaviksi. Kun kentän arvo on positiivinen, nämä arkistot poistuvat automaattisesti, kun määritetty määrä päiviä on kulunut.
+        bootstrap_timeline_accounts: Nämä tilit kiinnitetään uusien käyttäjien seuraamissuositusten alkuun.
         closed_registrations_message: Näkyy, kun rekisteröityminen on suljettu
-        content_cache_retention_period: Kaikki muiden palvelinten julkaisut (mukaan lukien tehostukset ja vastaukset) poistuvat, kun määritetty määrä päiviä on kulunut, ottamatta huomioon paikallisen käyttäjän vuorovaikutusta näiden julkaisujen kanssa. Sisältää julkaisut, jotka paikallinen käyttäjä on merkinnyt kirjanmerkiksi tai suosikiksi. Myös yksityiset maininnat eri palvelinten käyttäjien välillä menetetään, eikä niitä voi palauttaa. Tämä asetus on tarkoitettu käytettäväksi erityistapauksissa ja rikkoo monia käyttäjien odotuksia, kun sitä käytetään yleistarkoituksiin.
-        custom_css: Voit käyttää mukautettuja tyylejä Mastodonin verkkoversiossa.
+        content_cache_retention_period: Kaikki muiden palvelinten julkaisut (mukaan lukien tehostukset ja vastaukset) poistuvat, kun määritetty määrä päiviä on kulunut, lukuun ottamatta paikallisen käyttäjän vuorovaikutusta näiden julkaisujen kanssa. Tämä sisältää julkaisut, jotka paikallinen käyttäjä on merkinnyt kirjanmerkiksi tai suosikiksi. Myös yksityismaininnat eri palvelinten käyttäjien välillä menetetään, eikä niitä voi palauttaa. Tämä asetus on tarkoitettu käytettäväksi erityistapauksissa ja rikkoo monia käyttäjien odotuksia, kun sitä sovelletaan yleiskäyttöön.
+        custom_css: Voit käyttää mukautettuja tyylejä Mastodonin selainversiossa.
         favicon: WEBP, PNG, GIF tai JPG. Korvaa oletusarvoisen Mastodonin sivustokuvakkeen (favicon) haluamallasi kuvakkeella.
         mascot: Ohittaa kuvituksen edistyneessä selainkäyttöliittymässä.
-        media_cache_retention_period: Käyttäjien tekemien julkaisujen mediatiedostot ovat välimuistissa palvelimellasi. Kun arvo on positiivinen, media poistuu, kun määritetty määrä päiviä on kulunut. Jos mediaa pyydetään sen poistamisen jälkeen, se ladataan uudelleen, jos lähdesisältö on vielä saatavilla. Koska linkkien esikatselun kyselyitä kolmansien osapuolien sivustoille on rajoitettu, on suositeltavaa asettaa tämä arvo vähintään 14 päivään, tai linkkien kortteja ei päivitetä pyynnöstä ennen tätä ajankohtaa.
-        peers_api_enabled: Luettelo verkkotunnuksista, jotka tämä palvelin on kohdannut fediversumissa. Se ei kerro, oletko liitossa tietyn palvelimen kanssa, vaan että palvelimesi on ylipäätään tietoinen siitä. Tätä tietoa käytetään palveluissa, jotka keräävät tilastoja federoinnista yleisellä tasolla.
-        profile_directory: Profiilihakemisto lueteloi kaikki käyttäjät, jotka ovat ilmoittaneet olevansa löydettävissä.
+        media_cache_retention_period: Etäkäyttäjien tekemien julkaisujen mediatiedostot ovat välimuistissa palvelimellasi. Kun kentän arvo on positiivinen, media poistuu, kun määritetty määrä päiviä on kulunut. Jos mediaa pyydetään sen poistamisen jälkeen, se ladataan uudelleen, jos lähdesisältö on vielä saatavilla. Koska linkkien esikatselun kyselyitä kolmansien osapuolien sivustoille on rajoitettu, on suositeltavaa asettaa tämä arvo vähintään 14 päivään, tai linkkien kortteja ei päivitetä pyynnöstä ennen tätä ajankohtaa.
+        peers_api_enabled: Luettelo verkkotunnuksista, jotka tämä palvelin on kohdannut fediversumissa. Se ei kerro, federoitko tietyn palvelimen kanssa, vaan että palvelimesi on ylipäätään tietoinen siitä. Tätä tietoa käytetään palveluissa, jotka keräävät tilastoja federoinnista yleisellä tasolla.
+        profile_directory: Profiilihakemisto luetteloi kaikki käyttäjät, jotka ovat valinneet olla löydettävissä.
         require_invite_text: Kun rekisteröityminen vaatii manuaalisen hyväksynnän, tee ”Miksi haluat liittyä?” -tekstikentästä pakollinen vapaaehtoisen sijaan
-        site_contact_email: Kuinka ihmiset voivat tavoittaa sinut oikeudellisissa tai tukikysymyksissä.
+        site_contact_email: Miten ihmiset voivat tavoittaa sinut oikeus- tai tukikysymyksissä.
         site_contact_username: Miten ihmiset voivat tavoittaa sinut Mastodonissa.
         site_extended_description: Kaikki lisätiedot, jotka voivat olla hyödyllisiä kävijöille ja käyttäjille. Voidaan jäsentää Markdown-syntaksilla.
-        site_short_description: Lyhyt kuvaus auttaa yksilöimään palvelimesi. Kuka sitä johtaa, kenelle se on tarkoitettu?
+        site_short_description: Lyhyt kuvaus, joka auttaa yksilöimään palvelimesi. Kuka sitä johtaa, ja keille se on tarkoitettu?
         site_terms: Käytä omaa tietosuojakäytäntöä tai jätä tyhjäksi, jos haluat käyttää oletusta. Voidaan jäsentää Markdown-syntaksilla.
-        site_title: Kuinka ihmiset voivat viitata palvelimeen sen verkkotunnuksen lisäksi.
-        status_page_url: URL-osoite sivulle, jonka kautta tämän palvelimen tila voidaan ongelmatilanteissa tarkastaa
+        site_title: Miten ihmiset voivat viitata palvelimeesi sen verkkotunnuksen lisäksi.
+        status_page_url: URL-osoite sivulle, josta tämän palvelimen tilan voi ongelmatilanteissa tarkistaa
         theme: Teema, jonka uloskirjautuneet vierailijat ja uudet käyttäjät näkevät.
-        thumbnail: Noin 2:1 kuva näytetään palvelimen tietojen rinnalla.
+        thumbnail: Noin 2:1 kuva näkyy palvelimen tietojen ohessa.
         timeline_preview: Uloskirjautuneet vierailijat voivat selata uusimpia julkisia julkaisuja, jotka ovat saatavilla palvelimella.
-        trendable_by_default: Ohita suositun sisällön manuaalinen tarkistus. Yksittäisiä kohteita voidaan edelleen poistaa jälkikäteen.
-        trends: Trendit osoittavat, mitkä julkaisut, aihetunnisteet ja uutiset ovat saamassa vetoa palvelimellasi.
+        trendable_by_default: Ohita suositun sisällön manuaalinen tarkastus. Yksittäisiä kohteita voidaan edelleen poistaa jälkikäteen.
+        trends: Trendit osoittavat, mitkä julkaisut, aihetunnisteet ja uutiset keräävät huomiota palvelimellasi.
         trends_as_landing_page: Näytä vierailijoille ja uloskirjautuneille käyttäjille suosittua sisältöä palvelimen kuvauksen sijaan. Edellyttää, että trendit on otettu käyttöön.
       form_challenge:
         current_password: Olet menossa suojatulle alueelle
@@ -110,7 +110,7 @@ fi:
         text: Tämä auttaa meitä arvioimaan hakemustasi
       ip_block:
         comment: Valinnainen. Muista miksi lisäsit tämän säännön.
-        expires_in: IP-osoitteet ovat rajallinen resurssi – joskus niitä jaetaan, ja ne vaihtavat usein omistajaa. Niinpä epämääräisiä IP-lohkoja ei suositella.
+        expires_in: IP-osoitteet ovat rajallinen resurssi – joskus niitä jaetaan eteenpäin, ja ne vaihtavat usein omistajaa. Niinpä epämääräisiä IP-lohkoja ei suositella.
         ip: Kirjoita IPv4- tai IPv6-osoite. Voit estää kokonaisia IP-osoitealueita CIDR-syntaksin avulla. Varo lukitsemasta itseäsi ulos!
         severities:
           no_access: Estä pääsy kaikkiin resursseihin
@@ -129,14 +129,14 @@ fi:
       tag:
         name: Voit esimerkiksi vaihtaa suur- ja pienaakkosten kesken helppolukuistaaksesi tekstiäsi
       user:
-        chosen_languages: Jos valitset kieliä oheisesta listauksesta, vain niidenkieliset julkaisut näkyvät julkisilla aikajanoilla sinulle
+        chosen_languages: Jos valitset kieliä oheisesta luettelosta, vain niidenkieliset julkaisut näkyvät sinulle julkisilla aikajanoilla
         role: Rooli vaikuttaa käyttäjän käyttöoikeuksiin
       user_role:
         color: Väri, jota käytetään roolille kaikkialla käyttöliittymässä, RGB-heksadesimaalimuodossa
         highlighted: Tämä tekee roolista julkisesti näkyvän
         name: Roolin julkinen nimi, jos rooli on asetettu näytettäväksi merkkinä
         permissions_as_keys: Käyttäjillä, joilla on tämä rooli, on käyttöoikeus...
-        position: Korkeampi rooli ratkaisee konfliktit tietyissä tilanteissa. Tiettyjä toimintoja voidaan suorittaa vain rooleille, joiden prioriteetti on pienempi
+        position: Korkeampi rooli ratkaisee konfliktit tietyissä tilanteissa. Tiettyjä toimia voidaan suorittaa vain rooleilla, joiden prioriteetti on pienempi
       webhook:
         events: Valitse lähetettävät tapahtumat
         template: Luo oma JSON-hyötykuorma käyttäen muuttujien interpolointia. Jätä kenttä tyhjäksi käyttääksesi vakio-JSON-kuormaa.
@@ -234,7 +234,7 @@ fi:
         username_or_email: Käyttäjänimi tai sähköpostiosoite
         whole_word: Koko sana
       email_domain_block:
-        with_dns_records: Sisällytä toimialueen MX-tietueet ja IP-osoitteet
+        with_dns_records: Sisällytä verkkotunnuksen MX-tietueet ja IP-osoitteet
       featured_tag:
         name: Aihetunniste
       filters:
@@ -250,15 +250,15 @@ fi:
         content_cache_retention_period: Etäsisällön säilytysaika
         custom_css: Mukautettu CSS
         favicon: Suosikkikuvake
-        mascot: Mukautettu maskotti (vanhentunut ominaisuus)
-        media_cache_retention_period: Mediasisältövälimuistin säilytysaika
+        mascot: Mukautettu maskotti (vanhentunut)
+        media_cache_retention_period: Mediasisällön välimuistin säilytysaika
         peers_api_enabled: Julkaise löydettyjen palvelinten luettelo ohjelmointirajapinnassa
         profile_directory: Ota profiilihakemisto käyttöön
         registrations_mode: Kuka voi rekisteröityä
         require_invite_text: Vaadi syy liittyä
         show_domain_blocks: Näytä verkkotunnusten estot
         show_domain_blocks_rationale: Näytä, miksi verkkotunnukset on estetty
-        site_contact_email: Ota yhteys sähköpostitse
+        site_contact_email: Yhteyshenkilön sähköpostiosoite
         site_contact_username: Yhteyshenkilön käyttäjänimi
         site_extended_description: Laajennettu kuvaus
         site_short_description: Palvelimen kuvaus
@@ -268,9 +268,9 @@ fi:
         theme: Oletusteema
         thumbnail: Palvelimen pienoiskuva
         timeline_preview: Salli todentamaton pääsy julkisille aikajanoille
-        trendable_by_default: Salli suositun sisällön koonti ilman ennakkotarkastusta
+        trendable_by_default: Salli trendit ilman ennakkotarkastusta
         trends: Ota trendit käyttöön
-        trends_as_landing_page: Käytä suosittua sisältöä aloitussivuna
+        trends_as_landing_page: Käytä trendejä aloitussivuna
       interactions:
         must_be_follower: Estä ilmoitukset käyttäjiltä, jotka eivät seuraa sinua
         must_be_following: Estä ilmoitukset käyttäjiltä, joita et seuraa
@@ -288,22 +288,22 @@ fi:
           sign_up_requires_approval: Rajoita rekisteröitymisiä
         severity: Sääntö
       notification_emails:
-        appeal: Joku valittaa valvojan päätöksestä
+        appeal: Joku valittaa moderaattorin päätöksestä
         digest: Lähetä koosteviestejä sähköpostitse
         favourite: Joku lisäsi julkaisusi suosikkeihinsa
         follow: Joku seurasi sinua
         follow_request: Joku pyysi saada seurata sinua
         mention: Joku mainitsi sinut
-        pending_account: Uusi tili tarvitsee tarkistusta
+        pending_account: Uusi tili tarvitsee tarkistuksen
         reblog: Joku tehosti julkaisuasi
-        report: Uusi raportti on lähetetty
+        report: Uusi raportti lähetettiin
         software_updates:
           all: Ilmoita kaikista päivityksistä
           critical: Ilmoita vain kriittisistä päivityksistä
           label: Uusi Mastodon-versio on saatavilla
           none: Älä koskaan ilmoita päivityksistä (ei suositeltu)
           patch: Ilmoita virhekorjauspäivityksistä
-        trending_tag: Uusi trendi vaatii tarkistusta
+        trending_tag: Uusi trendi vaatii tarkastuksen
       rule:
         hint: Lisätietoja
         text: Sääntö
@@ -337,5 +337,5 @@ fi:
       text: vaadittu tieto
     title:
       sessions:
-        webauthn: Käytä yhtä turva-avaimistasi kirjautuaksesi sisään
+        webauthn: Käytä yhtä suojausavaimistasi kirjautuaksesi sisään
     'yes': Kyllä
diff --git a/config/locales/simple_form.sc.yml b/config/locales/simple_form.sc.yml
index 792619e6c7b1a1..84ed5c4115c565 100644
--- a/config/locales/simple_form.sc.yml
+++ b/config/locales/simple_form.sc.yml
@@ -52,7 +52,7 @@ sc:
       email_domain_block:
         with_dns_records: S'at a fàghere unu tentativu de risòlvere is registros DNS de su domìniu e fintzas is risultados ant a èssere blocados
       form_admin_settings:
-        activity_api_enabled: Nùmeru de tuts publicados in locale, utentes ativos e registros noos in perìodos chidajolos
+        activity_api_enabled: Nùmeru de publicatziones in locale, utentes ativos e registros noos in perìodos chidajolos
       form_challenge:
         current_password: Ses intrende in un'àrea segura
       imports:
@@ -191,12 +191,12 @@ sc:
         severity: Règula
       notification_emails:
         digest: Imbia lìteras eletrònicas de resumu
-        favourite: Una persone at postu s'istadu tuo in is preferidos suos
+        favourite: Una persone at postu sa publicatzione tua in is preferidos
         follow: Una persone t'at incumentzadu a sighire
         follow_request: Una persone at pedidu de ti sighire
         mention: Una persone t'at mentovadu
         pending_account: Unu contu nou tenet bisòngiu de una revisione
-        reblog: Una persone at cumpartzidu s'istadu tuo
+        reblog: Una persone at potentziadu sa publicatzione tua
         report: Imbiu de un'informe nou
       rule:
         text: Règula

From 693d9b03ed37f5d74cae66dd8bfece4447cb973f Mon Sep 17 00:00:00 2001
From: Emelia Smith <ThisIsMissEm@users.noreply.github.com>
Date: Fri, 26 Jul 2024 10:53:10 +0200
Subject: [PATCH 1634/2191] Enable OAuth PKCE Extension (#31129)

---
 app/lib/oauth_pre_authorization_extension.rb  |  13 ++
 app/presenters/oauth_metadata_presenter.rb    |   5 +
 app/serializers/oauth_metadata_serializer.rb  |   1 +
 app/views/oauth/authorizations/new.html.haml  |   4 +
 config/application.rb                         |   1 +
 config/locales/doorkeeper.en.yml              |   1 +
 db/migrate/20240724181224_enable_pkce.rb      |   8 ++
 db/schema.rb                                  |   4 +-
 .../oauth/authorizations_controller_spec.rb   | 130 +++++++++++++++++-
 .../well_known/oauth_metadata_spec.rb         |   3 +
 10 files changed, 164 insertions(+), 6 deletions(-)
 create mode 100644 app/lib/oauth_pre_authorization_extension.rb
 create mode 100644 db/migrate/20240724181224_enable_pkce.rb

diff --git a/app/lib/oauth_pre_authorization_extension.rb b/app/lib/oauth_pre_authorization_extension.rb
new file mode 100644
index 00000000000000..1885e0823d8015
--- /dev/null
+++ b/app/lib/oauth_pre_authorization_extension.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module OauthPreAuthorizationExtension
+  extend ActiveSupport::Concern
+
+  included do
+    validate :code_challenge_method_s256, error: Doorkeeper::Errors::InvalidCodeChallengeMethod
+  end
+
+  def validate_code_challenge_method_s256
+    code_challenge.blank? || code_challenge_method == 'S256'
+  end
+end
diff --git a/app/presenters/oauth_metadata_presenter.rb b/app/presenters/oauth_metadata_presenter.rb
index 546503bfcca22e..1e4d25165c7118 100644
--- a/app/presenters/oauth_metadata_presenter.rb
+++ b/app/presenters/oauth_metadata_presenter.rb
@@ -7,6 +7,7 @@ class OauthMetadataPresenter < ActiveModelSerializers::Model
              :revocation_endpoint, :scopes_supported,
              :response_types_supported, :response_modes_supported,
              :grant_types_supported, :token_endpoint_auth_methods_supported,
+             :code_challenge_methods_supported,
              :service_documentation, :app_registration_endpoint
 
   def issuer
@@ -59,6 +60,10 @@ def token_endpoint_auth_methods_supported
     %w(client_secret_basic client_secret_post)
   end
 
+  def code_challenge_methods_supported
+    %w(S256)
+  end
+
   private
 
   def doorkeeper
diff --git a/app/serializers/oauth_metadata_serializer.rb b/app/serializers/oauth_metadata_serializer.rb
index 5f3dc7b87e2e05..2afb4208fbc5ae 100644
--- a/app/serializers/oauth_metadata_serializer.rb
+++ b/app/serializers/oauth_metadata_serializer.rb
@@ -5,5 +5,6 @@ class OauthMetadataSerializer < ActiveModel::Serializer
              :revocation_endpoint, :scopes_supported,
              :response_types_supported, :response_modes_supported,
              :grant_types_supported, :token_endpoint_auth_methods_supported,
+             :code_challenge_methods_supported,
              :service_documentation, :app_registration_endpoint
 end
diff --git a/app/views/oauth/authorizations/new.html.haml b/app/views/oauth/authorizations/new.html.haml
index c50c224cce6193..d4563b2f01d644 100644
--- a/app/views/oauth/authorizations/new.html.haml
+++ b/app/views/oauth/authorizations/new.html.haml
@@ -26,6 +26,8 @@
                             value: @pre_auth.client.uid
         = form.hidden_field :redirect_uri,
                             value: @pre_auth.redirect_uri
+        = form.hidden_field :code_challenge, value: @pre_auth.code_challenge
+        = form.hidden_field :code_challenge_method, value: @pre_auth.code_challenge_method
         = form.hidden_field :state,
                             value: @pre_auth.state
         = form.hidden_field :response_type,
@@ -40,6 +42,8 @@
                             value: @pre_auth.client.uid
         = form.hidden_field :redirect_uri,
                             value: @pre_auth.redirect_uri
+        = form.hidden_field :code_challenge, value: @pre_auth.code_challenge
+        = form.hidden_field :code_challenge_method, value: @pre_auth.code_challenge_method
         = form.hidden_field :state,
                             value: @pre_auth.state
         = form.hidden_field :response_type,
diff --git a/config/application.rb b/config/application.rb
index 5aca74fd1c60a2..3c62a4922898d4 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -118,6 +118,7 @@ class Application < Rails::Application
       Doorkeeper::Application.include ApplicationExtension
       Doorkeeper::AccessGrant.include AccessGrantExtension
       Doorkeeper::AccessToken.include AccessTokenExtension
+      Doorkeeper::OAuth::PreAuthorization.include OauthPreAuthorizationExtension
       Devise::FailureApp.include AbstractController::Callbacks
       Devise::FailureApp.include Localized
     end
diff --git a/config/locales/doorkeeper.en.yml b/config/locales/doorkeeper.en.yml
index b623cc713506fe..e28f6a79664be1 100644
--- a/config/locales/doorkeeper.en.yml
+++ b/config/locales/doorkeeper.en.yml
@@ -83,6 +83,7 @@ en:
         access_denied: The resource owner or authorization server denied the request.
         credential_flow_not_configured: Resource Owner Password Credentials flow failed due to Doorkeeper.configure.resource_owner_from_credentials being unconfigured.
         invalid_client: Client authentication failed due to unknown client, no client authentication included, or unsupported authentication method.
+        invalid_code_challenge_method: The code challenge method must be S256, plain is unsupported.
         invalid_grant: The provided authorization grant is invalid, expired, revoked, does not match the redirection URI used in the authorization request, or was issued to another client.
         invalid_redirect_uri: The redirect uri included is not valid.
         invalid_request:
diff --git a/db/migrate/20240724181224_enable_pkce.rb b/db/migrate/20240724181224_enable_pkce.rb
new file mode 100644
index 00000000000000..4816f58f07d36f
--- /dev/null
+++ b/db/migrate/20240724181224_enable_pkce.rb
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class EnablePkce < ActiveRecord::Migration[7.1]
+  def change
+    add_column :oauth_access_grants, :code_challenge, :string, null: true
+    add_column :oauth_access_grants, :code_challenge_method, :string, null: true
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 453f1f7b894bbe..d4796079caeb2a 100644
--- 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_07_13_171909) do
+ActiveRecord::Schema[7.1].define(version: 2024_07_24_181224) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -739,6 +739,8 @@
     t.string "scopes"
     t.bigint "application_id", null: false
     t.bigint "resource_owner_id", null: false
+    t.string "code_challenge"
+    t.string "code_challenge_method"
     t.index ["resource_owner_id"], name: "index_oauth_access_grants_on_resource_owner_id"
     t.index ["token"], name: "index_oauth_access_grants_on_token", unique: true
   end
diff --git a/spec/controllers/oauth/authorizations_controller_spec.rb b/spec/controllers/oauth/authorizations_controller_spec.rb
index 9b3ae251e6cad8..3908ef8db0fdd9 100644
--- a/spec/controllers/oauth/authorizations_controller_spec.rb
+++ b/spec/controllers/oauth/authorizations_controller_spec.rb
@@ -12,6 +12,26 @@
       get :new, params: { client_id: app.uid, response_type: 'code', redirect_uri: 'http://localhost/', scope: 'read' }
     end
 
+    def body
+      Nokogiri::Slop(response.body)
+    end
+
+    def error_message
+      body.at_css('.form-container .flash-message').text
+    end
+
+    shared_examples 'shows authorize and deny buttons' do
+      it 'gives options to authorize and deny' do
+        subject
+
+        authorize_button = body.at_css('.oauth-prompt button[type="submit"]:not(.negative)')
+        deny_button = body.at_css('.oauth-prompt button[type="submit"].negative')
+
+        expect(authorize_button).to be_present
+        expect(deny_button).to be_present
+      end
+    end
+
     shared_examples 'stores location for user' do
       it 'stores location for user' do
         subject
@@ -36,10 +56,7 @@
         expect(response.headers['Cache-Control']).to include('private, no-store')
       end
 
-      it 'gives options to authorize and deny' do
-        subject
-        expect(response.body).to match(/Authorize/)
-      end
+      include_examples 'shows authorize and deny buttons'
 
       include_examples 'stores location for user'
 
@@ -61,7 +78,110 @@
 
         it 'does not redirect to callback with force_login=true' do
           get :new, params: { client_id: app.uid, response_type: 'code', redirect_uri: 'http://localhost/', scope: 'read', force_login: 'true' }
-          expect(response.body).to match(/Authorize/)
+
+          authorize_button = body.at_css('.oauth-prompt button[type="submit"]:not(.negative)')
+          deny_button = body.at_css('.oauth-prompt button[type="submit"].negative')
+
+          expect(authorize_button).to be_present
+          expect(deny_button).to be_present
+        end
+      end
+
+      # The tests in this context ensures that requests without PKCE parameters
+      # still work; In the future we likely want to force usage of PKCE for
+      # security reasons, as per:
+      #
+      # https://www.ietf.org/archive/id/draft-ietf-oauth-security-topics-27.html#section-2.1.1-9
+      context 'when not using PKCE' do
+        subject do
+          get :new, params: { client_id: app.uid, response_type: 'code', redirect_uri: 'http://localhost/', scope: 'read' }
+        end
+
+        it 'returns http success' do
+          subject
+          expect(response).to have_http_status(200)
+        end
+
+        it 'does not include the PKCE values in the response' do
+          subject
+
+          code_challenge_input = body.at_css('.oauth-prompt input[name=code_challenge]')
+          code_challenge_method_input = body.at_css('.oauth-prompt input[name=code_challenge_method]')
+
+          expect(code_challenge_input).to be_present
+          expect(code_challenge_method_input).to be_present
+
+          expect(code_challenge_input.attr('value')).to be_nil
+          expect(code_challenge_method_input.attr('value')).to be_nil
+        end
+
+        include_examples 'shows authorize and deny buttons'
+      end
+
+      context 'when using PKCE' do
+        subject do
+          get :new, params: { client_id: app.uid, response_type: 'code', redirect_uri: 'http://localhost/', scope: 'read', code_challenge_method: pkce_code_challenge_method, code_challenge: pkce_code_challenge }
+        end
+
+        let(:pkce_code_challenge) { SecureRandom.hex(32) }
+        let(:pkce_code_challenge_method) { 'S256' }
+
+        context 'when using S256 code challenge method' do
+          it 'returns http success' do
+            subject
+            expect(response).to have_http_status(200)
+          end
+
+          it 'includes the PKCE values in the response' do
+            subject
+
+            code_challenge_input = body.at_css('.oauth-prompt input[name=code_challenge]')
+            code_challenge_method_input = body.at_css('.oauth-prompt input[name=code_challenge_method]')
+
+            expect(code_challenge_input).to be_present
+            expect(code_challenge_method_input).to be_present
+
+            expect(code_challenge_input.attr('value')).to eq pkce_code_challenge
+            expect(code_challenge_method_input.attr('value')).to eq pkce_code_challenge_method
+          end
+
+          include_examples 'shows authorize and deny buttons'
+        end
+
+        context 'when using plain code challenge method' do
+          subject do
+            get :new, params: { client_id: app.uid, response_type: 'code', redirect_uri: 'http://localhost/', scope: 'read', code_challenge_method: pkce_code_challenge_method, code_challenge: pkce_code_challenge }
+          end
+
+          let(:pkce_code_challenge_method) { 'plain' }
+
+          it 'returns http success' do
+            subject
+            expect(response).to have_http_status(400)
+          end
+
+          it 'does not include the PKCE values in the response' do
+            subject
+
+            code_challenge_input = body.at_css('.oauth-prompt input[name=code_challenge]')
+            code_challenge_method_input = body.at_css('.oauth-prompt input[name=code_challenge_method]')
+
+            expect(code_challenge_input).to_not be_present
+            expect(code_challenge_method_input).to_not be_present
+          end
+
+          it 'does not include the authorize button' do
+            subject
+
+            authorize_button = body.at_css('.oauth-prompt button[type="submit"]')
+
+            expect(authorize_button).to_not be_present
+          end
+
+          it 'includes an error message' do
+            subject
+            expect(error_message).to match I18n.t('doorkeeper.errors.messages.invalid_code_challenge_method')
+          end
         end
       end
     end
diff --git a/spec/requests/well_known/oauth_metadata_spec.rb b/spec/requests/well_known/oauth_metadata_spec.rb
index 3350d593156d92..9d2d20228677e4 100644
--- a/spec/requests/well_known/oauth_metadata_spec.rb
+++ b/spec/requests/well_known/oauth_metadata_spec.rb
@@ -29,7 +29,10 @@
       revocation_endpoint: oauth_revoke_url(protocol: protocol),
       scopes_supported: Doorkeeper.configuration.scopes.map(&:to_s),
       response_types_supported: Doorkeeper.configuration.authorization_response_types,
+      response_modes_supported: Doorkeeper.configuration.authorization_response_flows.flat_map(&:response_mode_matches).uniq,
+      token_endpoint_auth_methods_supported: %w(client_secret_basic client_secret_post),
       grant_types_supported: grant_types_supported,
+      code_challenge_methods_supported: ['S256'],
       # non-standard extension:
       app_registration_endpoint: api_v1_apps_url(protocol: protocol)
     )

From c091fa71052690deab98f41dec42096935f0f94e Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 26 Jul 2024 11:27:48 +0200
Subject: [PATCH 1635/2191] chore(deps): update devdependencies (non-major)
 (#31096)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 85 ++++++++++++++++++++++---------------------------------
 1 file changed, 34 insertions(+), 51 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index c62945dd978cca..692787093a46be 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1598,7 +1598,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/css-parser-algorithms@npm:^2.6.3, @csstools/css-parser-algorithms@npm:^2.7.1":
+"@csstools/css-parser-algorithms@npm:^2.7.1":
   version: 2.7.1
   resolution: "@csstools/css-parser-algorithms@npm:2.7.1"
   peerDependencies:
@@ -1607,14 +1607,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/css-tokenizer@npm:^2.3.1, @csstools/css-tokenizer@npm:^2.4.1":
+"@csstools/css-tokenizer@npm:^2.4.1":
   version: 2.4.1
   resolution: "@csstools/css-tokenizer@npm:2.4.1"
   checksum: 10c0/fe71cee85ec7372da07083d088b6a704f43e5d3d2d8071c4b8a86fae60408b559a218a43f8625bf2f0be5c7f90c8f3ad20a1aae1921119a1c02b51c310cc2b6b
   languageName: node
   linkType: hard
 
-"@csstools/media-query-list-parser@npm:^2.1.11, @csstools/media-query-list-parser@npm:^2.1.13":
+"@csstools/media-query-list-parser@npm:^2.1.13":
   version: 2.1.13
   resolution: "@csstools/media-query-list-parser@npm:2.1.13"
   peerDependencies:
@@ -3372,8 +3372,8 @@ __metadata:
   linkType: hard
 
 "@testing-library/dom@npm:^10.2.0":
-  version: 10.3.1
-  resolution: "@testing-library/dom@npm:10.3.1"
+  version: 10.4.0
+  resolution: "@testing-library/dom@npm:10.4.0"
   dependencies:
     "@babel/code-frame": "npm:^7.10.4"
     "@babel/runtime": "npm:^7.12.5"
@@ -3383,13 +3383,13 @@ __metadata:
     dom-accessibility-api: "npm:^0.5.9"
     lz-string: "npm:^1.5.0"
     pretty-format: "npm:^27.0.2"
-  checksum: 10c0/e898475cd4932225c2962bf9f94353d7d88462c8912881af8e9866cee714c967b21badb0895ec8626123759cddc6663bc40300b1d1bf789957a603086eda6329
+  checksum: 10c0/0352487720ecd433400671e773df0b84b8268fb3fe8e527cdfd7c11b1365b398b4e0eddba6e7e0c85e8d615f48257753283fccec41f6b986fd6c85f15eb5f84f
   languageName: node
   linkType: hard
 
 "@testing-library/jest-dom@npm:^6.0.0":
-  version: 6.4.6
-  resolution: "@testing-library/jest-dom@npm:6.4.6"
+  version: 6.4.8
+  resolution: "@testing-library/jest-dom@npm:6.4.8"
   dependencies:
     "@adobe/css-tools": "npm:^4.4.0"
     "@babel/runtime": "npm:^7.9.2"
@@ -3399,24 +3399,7 @@ __metadata:
     dom-accessibility-api: "npm:^0.6.3"
     lodash: "npm:^4.17.21"
     redent: "npm:^3.0.0"
-  peerDependencies:
-    "@jest/globals": ">= 28"
-    "@types/bun": "*"
-    "@types/jest": ">= 28"
-    jest: ">= 28"
-    vitest: ">= 0.32"
-  peerDependenciesMeta:
-    "@jest/globals":
-      optional: true
-    "@types/bun":
-      optional: true
-    "@types/jest":
-      optional: true
-    jest:
-      optional: true
-    vitest:
-      optional: true
-  checksum: 10c0/8f369c1d27f8128b3794c6b9af5f5b794a47af4670819756e9f4e7cf69e277b30e8b89c548277a279918f648c85c6c7874f1a867e52edd4edb0629a2cf377daa
+  checksum: 10c0/8eececcac1ec7728c038b9d9eabfc8b8dcf4dc1e997c959450bff16d946e3344275862b84bfe0e1d1beb3817368e782464816aca47ab5c94f0ebf66db71df55d
   languageName: node
   linkType: hard
 
@@ -6959,15 +6942,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"debug@npm:4, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.4, debug@npm:~4.3.4":
-  version: 4.3.4
-  resolution: "debug@npm:4.3.4"
+"debug@npm:4, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.4, debug@npm:^4.3.5, debug@npm:~4.3.4":
+  version: 4.3.5
+  resolution: "debug@npm:4.3.5"
   dependencies:
     ms: "npm:2.1.2"
   peerDependenciesMeta:
     supports-color:
       optional: true
-  checksum: 10c0/cedbec45298dd5c501d01b92b119cd3faebe5438c3917ff11ae1bff86a6c722930ac9c8659792824013168ba6db7c4668225d845c633fbdafbbf902a6389f736
+  checksum: 10c0/082c375a2bdc4f4469c99f325ff458adad62a3fc2c482d59923c260cb08152f34e2659f72b3767db8bb2f21ca81a60a42d1019605a412132d7b9f59363a005cc
   languageName: node
   linkType: hard
 
@@ -9543,11 +9526,11 @@ __metadata:
   linkType: hard
 
 "husky@npm:^9.0.11":
-  version: 9.0.11
-  resolution: "husky@npm:9.0.11"
+  version: 9.1.2
+  resolution: "husky@npm:9.1.2"
   bin:
-    husky: bin.mjs
-  checksum: 10c0/2c787dcf74a837fc9a4fea7da907509d4bd9a289f4ea10ecc9d86279e4d4542b0f5f6443a619bccae19e265f2677172cc2b86aae5c932a35a330cc227d914605
+    husky: bin.js
+  checksum: 10c0/7e25c31ef98ac35d357147005d6e5d87db2abca7297e7c5aac931de3699acd32a3f1a9f8e53f101daeab818f0cfe9d18fa7e34f7cf5c9c4437c3665123456dea
   languageName: node
   linkType: hard
 
@@ -11314,10 +11297,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"known-css-properties@npm:^0.31.0":
-  version: 0.31.0
-  resolution: "known-css-properties@npm:0.31.0"
-  checksum: 10c0/8e643cbed32d7733278ba215c43dfc38fc7e77d391f66b81f07228af97d69ce2cebba03a9bc1ac859479e162aea812e258b30f4c93cb7b7adfd0622a141d36da
+"known-css-properties@npm:^0.34.0":
+  version: 0.34.0
+  resolution: "known-css-properties@npm:0.34.0"
+  checksum: 10c0/8549969f02b1858554e89faf4548ece37625d0d21b42e8d54fa53184e68e1512ef2531bb15941575ad816361ab7447b598c1b18c1b96ce0a868333d1a68f2e2c
   languageName: node
   linkType: hard
 
@@ -13166,8 +13149,8 @@ __metadata:
   linkType: hard
 
 "pino-pretty@npm:^11.0.0":
-  version: 11.2.1
-  resolution: "pino-pretty@npm:11.2.1"
+  version: 11.2.2
+  resolution: "pino-pretty@npm:11.2.2"
   dependencies:
     colorette: "npm:^2.0.7"
     dateformat: "npm:^4.6.3"
@@ -13185,7 +13168,7 @@ __metadata:
     strip-json-comments: "npm:^3.1.1"
   bin:
     pino-pretty: bin.js
-  checksum: 10c0/6c7f15b5bf8a007c8b7157eae445675b13cd95097ffa512d5ebd661f9e7abd328fa27592b25708756a09f098f87cb03ca81837518cd725c16e3f801129b941d4
+  checksum: 10c0/3ce1769907886a5584f6c8123d9bc987712ad10a375797733a0fe95a238df587dac8e2b709bab291c4e30d41b0cf65808c708c96f8eb98b2778b6df60afa7e66
   languageName: node
   linkType: hard
 
@@ -14044,7 +14027,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss@npm:^8.2.15, postcss@npm:^8.4.24, postcss@npm:^8.4.38":
+"postcss@npm:^8.2.15, postcss@npm:^8.4.24, postcss@npm:^8.4.39":
   version: 8.4.40
   resolution: "postcss@npm:8.4.40"
   dependencies:
@@ -16629,12 +16612,12 @@ __metadata:
   linkType: hard
 
 "stylelint@npm:^16.0.2":
-  version: 16.6.1
-  resolution: "stylelint@npm:16.6.1"
+  version: 16.7.0
+  resolution: "stylelint@npm:16.7.0"
   dependencies:
-    "@csstools/css-parser-algorithms": "npm:^2.6.3"
-    "@csstools/css-tokenizer": "npm:^2.3.1"
-    "@csstools/media-query-list-parser": "npm:^2.1.11"
+    "@csstools/css-parser-algorithms": "npm:^2.7.1"
+    "@csstools/css-tokenizer": "npm:^2.4.1"
+    "@csstools/media-query-list-parser": "npm:^2.1.13"
     "@csstools/selector-specificity": "npm:^3.1.1"
     "@dual-bundle/import-meta-resolve": "npm:^4.1.0"
     balanced-match: "npm:^2.0.0"
@@ -16642,7 +16625,7 @@ __metadata:
     cosmiconfig: "npm:^9.0.0"
     css-functions-list: "npm:^3.2.2"
     css-tree: "npm:^2.3.1"
-    debug: "npm:^4.3.4"
+    debug: "npm:^4.3.5"
     fast-glob: "npm:^3.3.2"
     fastest-levenshtein: "npm:^1.0.16"
     file-entry-cache: "npm:^9.0.0"
@@ -16653,13 +16636,13 @@ __metadata:
     ignore: "npm:^5.3.1"
     imurmurhash: "npm:^0.1.4"
     is-plain-object: "npm:^5.0.0"
-    known-css-properties: "npm:^0.31.0"
+    known-css-properties: "npm:^0.34.0"
     mathml-tag-names: "npm:^2.1.3"
     meow: "npm:^13.2.0"
     micromatch: "npm:^4.0.7"
     normalize-path: "npm:^3.0.0"
     picocolors: "npm:^1.0.1"
-    postcss: "npm:^8.4.38"
+    postcss: "npm:^8.4.39"
     postcss-resolve-nested-selector: "npm:^0.1.1"
     postcss-safe-parser: "npm:^7.0.0"
     postcss-selector-parser: "npm:^6.1.0"
@@ -16673,7 +16656,7 @@ __metadata:
     write-file-atomic: "npm:^5.0.1"
   bin:
     stylelint: bin/stylelint.mjs
-  checksum: 10c0/8dc9b0024d6fb109380a142171ab8a134c3863aa8b8736f0083310a0d05f173dcda5680f29267697dfa0aaeb2f08aef4ef113e4bb4f8582fcfdd97f35be51d71
+  checksum: 10c0/98cb36037684433d991a0c507bbf8155309e96470177487f493e66de098631e5303b235470fc5c8086cd98013385b669c4e3cb68ad01421b898e1da6848e5d78
   languageName: node
   linkType: hard
 

From dfd43869c9180d4f4ebfc26ebce30f468a8f5422 Mon Sep 17 00:00:00 2001
From: David Roetzel <david@roetzel.de>
Date: Fri, 26 Jul 2024 11:36:54 +0200
Subject: [PATCH 1636/2191] Decrease count of filtered notifications  when
 notification requests are accepted or dismissed (#31149)

---
 .../mastodon/actions/notification_policies.ts |  6 +++++
 .../mastodon/actions/notifications.js         | 15 +++++++++++--
 .../mastodon/reducers/notification_policy.ts  | 22 +++++++++++++------
 3 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/app/javascript/mastodon/actions/notification_policies.ts b/app/javascript/mastodon/actions/notification_policies.ts
index fcc9919c499f47..b182bcf6996326 100644
--- a/app/javascript/mastodon/actions/notification_policies.ts
+++ b/app/javascript/mastodon/actions/notification_policies.ts
@@ -1,3 +1,5 @@
+import { createAction } from '@reduxjs/toolkit';
+
 import {
   apiGetNotificationPolicy,
   apiUpdateNotificationsPolicy,
@@ -14,3 +16,7 @@ export const updateNotificationsPolicy = createDataLoadingThunk(
   'notificationPolicy/update',
   (policy: Partial<NotificationPolicy>) => apiUpdateNotificationsPolicy(policy),
 );
+
+export const decreasePendingNotificationsCount = createAction<number>(
+  'notificationPolicy/decreasePendingNotificationCount',
+);
diff --git a/app/javascript/mastodon/actions/notifications.js b/app/javascript/mastodon/actions/notifications.js
index 7e4320c27b7d5b..48afb003ad32c8 100644
--- a/app/javascript/mastodon/actions/notifications.js
+++ b/app/javascript/mastodon/actions/notifications.js
@@ -18,6 +18,7 @@ import {
   importFetchedStatuses,
 } from './importer';
 import { submitMarkers } from './markers';
+import { decreasePendingNotificationsCount } from './notification_policies';
 import { notificationsUpdate } from "./notifications_typed";
 import { register as registerPushNotifications } from './push_notifications';
 import { saveSettings } from './settings';
@@ -84,6 +85,12 @@ const fetchRelatedRelationships = (dispatch, notifications) => {
   }
 };
 
+const selectNotificationCountForRequest = (state, id) => {
+  const requests = state.getIn(['notificationRequests', 'items']);
+  const thisRequest = requests.find(request => request.get('id') === id);
+  return thisRequest ? thisRequest.get('notifications_count') : 0;
+};
+
 export const loadPending = () => ({
   type: NOTIFICATIONS_LOAD_PENDING,
 });
@@ -433,11 +440,13 @@ export const fetchNotificationRequestFail = (id, error) => ({
   error,
 });
 
-export const acceptNotificationRequest = id => (dispatch) => {
+export const acceptNotificationRequest = (id) => (dispatch, getState) => {
+  const count = selectNotificationCountForRequest(getState(), id);
   dispatch(acceptNotificationRequestRequest(id));
 
   api().post(`/api/v1/notifications/requests/${id}/accept`).then(() => {
     dispatch(acceptNotificationRequestSuccess(id));
+    dispatch(decreasePendingNotificationsCount(count));
   }).catch(err => {
     dispatch(acceptNotificationRequestFail(id, err));
   });
@@ -459,11 +468,13 @@ export const acceptNotificationRequestFail = (id, error) => ({
   error,
 });
 
-export const dismissNotificationRequest = id => (dispatch) => {
+export const dismissNotificationRequest = (id) => (dispatch, getState) => {
+  const count = selectNotificationCountForRequest(getState(), id);
   dispatch(dismissNotificationRequestRequest(id));
 
   api().post(`/api/v1/notifications/requests/${id}/dismiss`).then(() =>{
     dispatch(dismissNotificationRequestSuccess(id));
+    dispatch(decreasePendingNotificationsCount(count));
   }).catch(err => {
     dispatch(dismissNotificationRequestFail(id, err));
   });
diff --git a/app/javascript/mastodon/reducers/notification_policy.ts b/app/javascript/mastodon/reducers/notification_policy.ts
index ab111066cc3b3e..ed912dde5d648a 100644
--- a/app/javascript/mastodon/reducers/notification_policy.ts
+++ b/app/javascript/mastodon/reducers/notification_policy.ts
@@ -2,17 +2,25 @@ import { createReducer, isAnyOf } from '@reduxjs/toolkit';
 
 import {
   fetchNotificationPolicy,
+  decreasePendingNotificationsCount,
   updateNotificationsPolicy,
 } from 'mastodon/actions/notification_policies';
 import type { NotificationPolicy } from 'mastodon/models/notification_policy';
 
 export const notificationPolicyReducer =
   createReducer<NotificationPolicy | null>(null, (builder) => {
-    builder.addMatcher(
-      isAnyOf(
-        fetchNotificationPolicy.fulfilled,
-        updateNotificationsPolicy.fulfilled,
-      ),
-      (_state, action) => action.payload,
-    );
+    builder
+      .addCase(decreasePendingNotificationsCount, (state, action) => {
+        if (state) {
+          state.summary.pending_notifications_count -= action.payload;
+          state.summary.pending_requests_count -= 1;
+        }
+      })
+      .addMatcher(
+        isAnyOf(
+          fetchNotificationPolicy.fulfilled,
+          updateNotificationsPolicy.fulfilled,
+        ),
+        (_state, action) => action.payload,
+      );
   });

From b120792f2752d358ea8142ab3f91f2ed93652fce Mon Sep 17 00:00:00 2001
From: Michael Stanclift <mx@vmstan.com>
Date: Fri, 26 Jul 2024 09:13:56 -0500
Subject: [PATCH 1637/2191] Adjust ffmpeg version detection in admin panel
 (#31130)

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
---
 .../admin/metrics/dimension/software_versions_dimension.rb   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/lib/admin/metrics/dimension/software_versions_dimension.rb b/app/lib/admin/metrics/dimension/software_versions_dimension.rb
index a260a66e2af960..71d6c63fb5f347 100644
--- a/app/lib/admin/metrics/dimension/software_versions_dimension.rb
+++ b/app/lib/admin/metrics/dimension/software_versions_dimension.rb
@@ -98,7 +98,8 @@ def imagemagick_version
   end
 
   def ffmpeg_version
-    version = `ffmpeg -version`.match(/ffmpeg version ([\d\.]+)/)[1]
+    version_output = Terrapin::CommandLine.new(Rails.configuration.x.ffprobe_binary, '-show_program_version -v 0 -of json').run
+    version = Oj.load(version_output, mode: :strict, symbol_keys: true).dig(:program_version, :version)
 
     {
       key: 'ffmpeg',
@@ -106,7 +107,7 @@ def ffmpeg_version
       value: version,
       human_value: version,
     }
-  rescue Errno::ENOENT
+  rescue Terrapin::CommandNotFoundError, Terrapin::ExitStatusError, Oj::ParseError
     nil
   end
 

From dd5379271410219de0806bb33e7cdfa427ea6988 Mon Sep 17 00:00:00 2001
From: David Roetzel <david@roetzel.de>
Date: Fri, 26 Jul 2024 16:53:49 +0200
Subject: [PATCH 1638/2191] Move UI tests from controller to system spec
 (#31158)

---
 .../oauth/authorizations_controller_spec.rb   | 128 +-----------------
 spec/system/oauth_spec.rb                     |  86 +++++++++++-
 2 files changed, 82 insertions(+), 132 deletions(-)

diff --git a/spec/controllers/oauth/authorizations_controller_spec.rb b/spec/controllers/oauth/authorizations_controller_spec.rb
index 3908ef8db0fdd9..9bb520211c2cfa 100644
--- a/spec/controllers/oauth/authorizations_controller_spec.rb
+++ b/spec/controllers/oauth/authorizations_controller_spec.rb
@@ -3,8 +3,6 @@
 require 'rails_helper'
 
 RSpec.describe Oauth::AuthorizationsController do
-  render_views
-
   let(:app) { Doorkeeper::Application.create!(name: 'test', redirect_uri: 'http://localhost/', scopes: 'read') }
 
   describe 'GET #new' do
@@ -12,26 +10,6 @@
       get :new, params: { client_id: app.uid, response_type: 'code', redirect_uri: 'http://localhost/', scope: 'read' }
     end
 
-    def body
-      Nokogiri::Slop(response.body)
-    end
-
-    def error_message
-      body.at_css('.form-container .flash-message').text
-    end
-
-    shared_examples 'shows authorize and deny buttons' do
-      it 'gives options to authorize and deny' do
-        subject
-
-        authorize_button = body.at_css('.oauth-prompt button[type="submit"]:not(.negative)')
-        deny_button = body.at_css('.oauth-prompt button[type="submit"].negative')
-
-        expect(authorize_button).to be_present
-        expect(deny_button).to be_present
-      end
-    end
-
     shared_examples 'stores location for user' do
       it 'stores location for user' do
         subject
@@ -56,8 +34,6 @@ def error_message
         expect(response.headers['Cache-Control']).to include('private, no-store')
       end
 
-      include_examples 'shows authorize and deny buttons'
-
       include_examples 'stores location for user'
 
       context 'when app is already authorized' do
@@ -79,109 +55,7 @@ def error_message
         it 'does not redirect to callback with force_login=true' do
           get :new, params: { client_id: app.uid, response_type: 'code', redirect_uri: 'http://localhost/', scope: 'read', force_login: 'true' }
 
-          authorize_button = body.at_css('.oauth-prompt button[type="submit"]:not(.negative)')
-          deny_button = body.at_css('.oauth-prompt button[type="submit"].negative')
-
-          expect(authorize_button).to be_present
-          expect(deny_button).to be_present
-        end
-      end
-
-      # The tests in this context ensures that requests without PKCE parameters
-      # still work; In the future we likely want to force usage of PKCE for
-      # security reasons, as per:
-      #
-      # https://www.ietf.org/archive/id/draft-ietf-oauth-security-topics-27.html#section-2.1.1-9
-      context 'when not using PKCE' do
-        subject do
-          get :new, params: { client_id: app.uid, response_type: 'code', redirect_uri: 'http://localhost/', scope: 'read' }
-        end
-
-        it 'returns http success' do
-          subject
-          expect(response).to have_http_status(200)
-        end
-
-        it 'does not include the PKCE values in the response' do
-          subject
-
-          code_challenge_input = body.at_css('.oauth-prompt input[name=code_challenge]')
-          code_challenge_method_input = body.at_css('.oauth-prompt input[name=code_challenge_method]')
-
-          expect(code_challenge_input).to be_present
-          expect(code_challenge_method_input).to be_present
-
-          expect(code_challenge_input.attr('value')).to be_nil
-          expect(code_challenge_method_input.attr('value')).to be_nil
-        end
-
-        include_examples 'shows authorize and deny buttons'
-      end
-
-      context 'when using PKCE' do
-        subject do
-          get :new, params: { client_id: app.uid, response_type: 'code', redirect_uri: 'http://localhost/', scope: 'read', code_challenge_method: pkce_code_challenge_method, code_challenge: pkce_code_challenge }
-        end
-
-        let(:pkce_code_challenge) { SecureRandom.hex(32) }
-        let(:pkce_code_challenge_method) { 'S256' }
-
-        context 'when using S256 code challenge method' do
-          it 'returns http success' do
-            subject
-            expect(response).to have_http_status(200)
-          end
-
-          it 'includes the PKCE values in the response' do
-            subject
-
-            code_challenge_input = body.at_css('.oauth-prompt input[name=code_challenge]')
-            code_challenge_method_input = body.at_css('.oauth-prompt input[name=code_challenge_method]')
-
-            expect(code_challenge_input).to be_present
-            expect(code_challenge_method_input).to be_present
-
-            expect(code_challenge_input.attr('value')).to eq pkce_code_challenge
-            expect(code_challenge_method_input.attr('value')).to eq pkce_code_challenge_method
-          end
-
-          include_examples 'shows authorize and deny buttons'
-        end
-
-        context 'when using plain code challenge method' do
-          subject do
-            get :new, params: { client_id: app.uid, response_type: 'code', redirect_uri: 'http://localhost/', scope: 'read', code_challenge_method: pkce_code_challenge_method, code_challenge: pkce_code_challenge }
-          end
-
-          let(:pkce_code_challenge_method) { 'plain' }
-
-          it 'returns http success' do
-            subject
-            expect(response).to have_http_status(400)
-          end
-
-          it 'does not include the PKCE values in the response' do
-            subject
-
-            code_challenge_input = body.at_css('.oauth-prompt input[name=code_challenge]')
-            code_challenge_method_input = body.at_css('.oauth-prompt input[name=code_challenge_method]')
-
-            expect(code_challenge_input).to_not be_present
-            expect(code_challenge_method_input).to_not be_present
-          end
-
-          it 'does not include the authorize button' do
-            subject
-
-            authorize_button = body.at_css('.oauth-prompt button[type="submit"]')
-
-            expect(authorize_button).to_not be_present
-          end
-
-          it 'includes an error message' do
-            subject
-            expect(error_message).to match I18n.t('doorkeeper.errors.messages.invalid_code_challenge_method')
-          end
+          expect(response).to have_http_status(:success)
         end
       end
     end
diff --git a/spec/system/oauth_spec.rb b/spec/system/oauth_spec.rb
index 1c9aca3114113c..42ff4a48ac32a5 100644
--- a/spec/system/oauth_spec.rb
+++ b/spec/system/oauth_spec.rb
@@ -2,8 +2,13 @@
 
 require 'rails_helper'
 
-describe 'Using OAuth from an external app', :js, :streaming do
+describe 'Using OAuth from an external app' do
+  subject { visit "/oauth/authorize?#{params.to_query}" }
+
   let(:client_app) { Doorkeeper::Application.create!(name: 'test', redirect_uri: about_url(host: Rails.application.config.x.local_domain), scopes: 'read') }
+  let(:params) do
+    { client_id: client_app.uid, response_type: 'code', redirect_uri: client_app.redirect_uri, scope: 'read' }
+  end
 
   context 'when the user is already logged in' do
     let!(:user) { Fabricate(:user) }
@@ -14,8 +19,7 @@
     end
 
     it 'when accepting the authorization request' do
-      params = { client_id: client_app.uid, response_type: 'code', redirect_uri: client_app.redirect_uri, scope: 'read' }
-      visit "/oauth/authorize?#{params.to_query}"
+      subject
 
       # It presents the user with an authorization page
       expect(page).to have_content(I18n.t('doorkeeper.authorizations.buttons.authorize'))
@@ -29,8 +33,7 @@
     end
 
     it 'when rejecting the authorization request' do
-      params = { client_id: client_app.uid, response_type: 'code', redirect_uri: client_app.redirect_uri, scope: 'read' }
-      visit "/oauth/authorize?#{params.to_query}"
+      subject
 
       # It presents the user with an authorization page
       expect(page).to have_content(I18n.t('doorkeeper.authorizations.buttons.deny'))
@@ -42,6 +45,79 @@
       # It does not grant the app access to the account
       expect(Doorkeeper::AccessGrant.exists?(application: client_app, resource_owner_id: user.id)).to be false
     end
+
+    # The tests in this context ensures that requests without PKCE parameters
+    # still work; In the future we likely want to force usage of PKCE for
+    # security reasons, as per:
+    #
+    # https://www.ietf.org/archive/id/draft-ietf-oauth-security-topics-27.html#section-2.1.1-9
+    context 'when not using PKCE' do
+      it 'does not include the PKCE values in the hidden inputs' do
+        subject
+
+        code_challenge_inputs = all('.oauth-prompt input[name=code_challenge]', visible: false)
+        code_challenge_method_inputs = all('.oauth-prompt input[name=code_challenge_method]', visible: false)
+
+        expect(code_challenge_inputs).to_not be_empty
+        expect(code_challenge_method_inputs).to_not be_empty
+
+        (code_challenge_inputs.to_a + code_challenge_method_inputs.to_a).each do |input|
+          expect(input.value).to be_nil
+        end
+      end
+    end
+
+    context 'when using PKCE' do
+      let(:params) do
+        { client_id: client_app.uid, response_type: 'code', redirect_uri: client_app.redirect_uri, scope: 'read', code_challenge_method: pkce_code_challenge_method, code_challenge: pkce_code_challenge }
+      end
+      let(:pkce_code_challenge) { SecureRandom.hex(32) }
+      let(:pkce_code_challenge_method) { 'S256' }
+
+      context 'when using S256 code challenge method' do
+        it 'includes the PKCE values in the hidden inputs' do
+          subject
+
+          code_challenge_inputs = all('.oauth-prompt input[name=code_challenge]', visible: false)
+          code_challenge_method_inputs = all('.oauth-prompt input[name=code_challenge_method]', visible: false)
+
+          expect(code_challenge_inputs).to_not be_empty
+          expect(code_challenge_method_inputs).to_not be_empty
+
+          code_challenge_inputs.each do |input|
+            expect(input.value).to eq pkce_code_challenge
+          end
+          code_challenge_method_inputs.each do |input|
+            expect(input.value).to eq pkce_code_challenge_method
+          end
+        end
+      end
+
+      context 'when using plain code challenge method' do
+        let(:pkce_code_challenge_method) { 'plain' }
+
+        it 'does not include the PKCE values in the response' do
+          subject
+
+          expect(page).to have_no_css('.oauth-prompt input[name=code_challenge]')
+          expect(page).to have_no_css('.oauth-prompt input[name=code_challenge_method]')
+        end
+
+        it 'does not include the authorize button' do
+          subject
+
+          expect(page).to have_no_css('.oauth-prompt button[type="submit"]')
+        end
+
+        it 'includes an error message' do
+          subject
+
+          within '.form-container .flash-message' do
+            expect(page).to have_content(I18n.t('doorkeeper.errors.messages.invalid_code_challenge_method'))
+          end
+        end
+      end
+    end
   end
 
   context 'when the user is not already logged in' do

From 14bc73e94cb40b10404468bb6bda75af2c9995a6 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 25 Jul 2024 19:05:54 +0200
Subject: [PATCH 1639/2191] [Glitch] Change design of confirmation modals in
 web UI

Port 8818748b9023acd84f42bf887e361d9244521df4 to glitch-soc

Co-authored-by: Renaud Chaput <renchap@gmail.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/components/domain.tsx     | 14 +--
 .../glitch/components/follow_button.tsx       | 24 +----
 .../glitch/containers/account_container.jsx   | 21 ++---
 .../glitch/containers/domain_container.jsx    | 36 --------
 .../glitch/containers/status_container.js     | 50 ++---------
 .../containers/header_container.jsx           | 19 +---
 .../compose/components/action_bar.jsx         | 15 +---
 .../glitch/features/compose/index.jsx         | 15 +---
 .../components/conversation.jsx               | 13 +--
 .../directory/components/account_card.tsx     | 52 ++---------
 .../glitch/features/domain_blocks/index.jsx   |  5 +-
 .../glitch/features/list_timeline/index.jsx   | 23 +----
 .../containers/column_settings_container.js   | 16 +---
 .../picture_in_picture/components/footer.jsx  | 14 +--
 .../containers/detailed_status_container.js   | 31 +------
 .../flavours/glitch/features/status/index.jsx | 38 +++-----
 .../ui/components/confirmation_modal.jsx      | 83 ------------------
 .../clear_notifications.tsx                   | 46 ++++++++++
 .../confirmation_modal.tsx                    | 87 +++++++++++++++++++
 .../confirmation_modals/delete_list.tsx       | 58 +++++++++++++
 .../confirmation_modals/delete_status.tsx     | 67 ++++++++++++++
 .../confirmation_modals/edit_status.tsx       | 45 ++++++++++
 .../components/confirmation_modals/index.ts   |  8 ++
 .../confirmation_modals/log_out.tsx           | 40 +++++++++
 .../components/confirmation_modals/reply.tsx  | 46 ++++++++++
 .../confirmation_modals/unfollow.tsx          | 50 +++++++++++
 .../ui/components/disabled_account_banner.jsx | 20 +----
 .../features/ui/components/link_footer.jsx    | 21 +----
 .../features/ui/components/modal_root.jsx     | 18 +++-
 .../flavours/glitch/locales/en.json           |  4 -
 .../flavours/glitch/styles/components.scss    | 87 +++++--------------
 31 files changed, 554 insertions(+), 512 deletions(-)
 delete mode 100644 app/javascript/flavours/glitch/containers/domain_container.jsx
 delete mode 100644 app/javascript/flavours/glitch/features/ui/components/confirmation_modal.jsx
 create mode 100644 app/javascript/flavours/glitch/features/ui/components/confirmation_modals/clear_notifications.tsx
 create mode 100644 app/javascript/flavours/glitch/features/ui/components/confirmation_modals/confirmation_modal.tsx
 create mode 100644 app/javascript/flavours/glitch/features/ui/components/confirmation_modals/delete_list.tsx
 create mode 100644 app/javascript/flavours/glitch/features/ui/components/confirmation_modals/delete_status.tsx
 create mode 100644 app/javascript/flavours/glitch/features/ui/components/confirmation_modals/edit_status.tsx
 create mode 100644 app/javascript/flavours/glitch/features/ui/components/confirmation_modals/index.ts
 create mode 100644 app/javascript/flavours/glitch/features/ui/components/confirmation_modals/log_out.tsx
 create mode 100644 app/javascript/flavours/glitch/features/ui/components/confirmation_modals/reply.tsx
 create mode 100644 app/javascript/flavours/glitch/features/ui/components/confirmation_modals/unfollow.tsx

diff --git a/app/javascript/flavours/glitch/components/domain.tsx b/app/javascript/flavours/glitch/components/domain.tsx
index ed5e8e7e4c20ef..e3eec2bd9bfabe 100644
--- a/app/javascript/flavours/glitch/components/domain.tsx
+++ b/app/javascript/flavours/glitch/components/domain.tsx
@@ -3,6 +3,8 @@ import { useCallback } from 'react';
 import { defineMessages, useIntl } from 'react-intl';
 
 import LockOpenIcon from '@/material-icons/400-24px/lock_open.svg?react';
+import { unblockDomain } from 'flavours/glitch/actions/domain_blocks';
+import { useAppDispatch } from 'flavours/glitch/store';
 
 import { IconButton } from './icon_button';
 
@@ -13,17 +15,15 @@ const messages = defineMessages({
   },
 });
 
-interface Props {
+export const Domain: React.FC<{
   domain: string;
-  onUnblockDomain: (domain: string) => void;
-}
-
-export const Domain: React.FC<Props> = ({ domain, onUnblockDomain }) => {
+}> = ({ domain }) => {
   const intl = useIntl();
+  const dispatch = useAppDispatch();
 
   const handleDomainUnblock = useCallback(() => {
-    onUnblockDomain(domain);
-  }, [domain, onUnblockDomain]);
+    dispatch(unblockDomain(domain));
+  }, [dispatch, domain]);
 
   return (
     <div className='domain'>
diff --git a/app/javascript/flavours/glitch/components/follow_button.tsx b/app/javascript/flavours/glitch/components/follow_button.tsx
index a6b206470327ee..a27872c1aac8dc 100644
--- a/app/javascript/flavours/glitch/components/follow_button.tsx
+++ b/app/javascript/flavours/glitch/components/follow_button.tsx
@@ -1,12 +1,11 @@
 import { useCallback, useEffect } from 'react';
 
-import { useIntl, defineMessages, FormattedMessage } from 'react-intl';
+import { useIntl, defineMessages } from 'react-intl';
 
 import { useIdentity } from '@/flavours/glitch/identity_context';
 import {
   fetchRelationships,
   followAccount,
-  unfollowAccount,
 } from 'flavours/glitch/actions/accounts';
 import { openModal } from 'flavours/glitch/actions/modal';
 import { Button } from 'flavours/glitch/components/button';
@@ -59,29 +58,14 @@ export const FollowButton: React.FC<{
 
     if (accountId === me) {
       return;
-    } else if (relationship.following || relationship.requested) {
+    } else if (account && (relationship.following || relationship.requested)) {
       dispatch(
-        openModal({
-          modalType: 'CONFIRM',
-          modalProps: {
-            message: (
-              <FormattedMessage
-                id='confirmations.unfollow.message'
-                defaultMessage='Are you sure you want to unfollow {name}?'
-                values={{ name: <strong>@{account?.acct}</strong> }}
-              />
-            ),
-            confirm: intl.formatMessage(messages.unfollow),
-            onConfirm: () => {
-              dispatch(unfollowAccount(accountId));
-            },
-          },
-        }),
+        openModal({ modalType: 'CONFIRM_UNFOLLOW', modalProps: { account } }),
       );
     } else {
       dispatch(followAccount(accountId));
     }
-  }, [dispatch, intl, accountId, relationship, account, signedIn]);
+  }, [dispatch, accountId, relationship, account, signedIn]);
 
   let label;
 
diff --git a/app/javascript/flavours/glitch/containers/account_container.jsx b/app/javascript/flavours/glitch/containers/account_container.jsx
index f171fcc2fe5d19..7fd186b657a7a7 100644
--- a/app/javascript/flavours/glitch/containers/account_container.jsx
+++ b/app/javascript/flavours/glitch/containers/account_container.jsx
@@ -1,24 +1,20 @@
-import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
+import { injectIntl } from 'react-intl';
 
 import { connect } from 'react-redux';
 
+import { openModal } from 'flavours/glitch/actions/modal';
+
 import {
   followAccount,
-  unfollowAccount,
   blockAccount,
   unblockAccount,
   muteAccount,
   unmuteAccount,
 } from '../actions/accounts';
-import { openModal } from '../actions/modal';
 import { initMuteModal } from '../actions/mutes';
 import Account from '../components/account';
 import { makeGetAccount } from '../selectors';
 
-const messages = defineMessages({
-  unfollowConfirm: { id: 'confirmations.unfollow.confirm', defaultMessage: 'Unfollow' },
-});
-
 const makeMapStateToProps = () => {
   const getAccount = makeGetAccount();
 
@@ -29,18 +25,11 @@ const makeMapStateToProps = () => {
   return mapStateToProps;
 };
 
-const mapDispatchToProps = (dispatch, { intl }) => ({
+const mapDispatchToProps = (dispatch) => ({
 
   onFollow (account) {
     if (account.getIn(['relationship', 'following']) || account.getIn(['relationship', 'requested'])) {
-      dispatch(openModal({
-        modalType: 'CONFIRM',
-        modalProps: {
-          message: <FormattedMessage id='confirmations.unfollow.message' defaultMessage='Are you sure you want to unfollow {name}?' values={{ name: <strong>@{account.get('acct')}</strong> }} />,
-          confirm: intl.formatMessage(messages.unfollowConfirm),
-          onConfirm: () => dispatch(unfollowAccount(account.get('id'))),
-        },
-      }));
+      dispatch(openModal({ modalType: 'CONFIRM_UNFOLLOW', modalProps: { account } }));
     } else {
       dispatch(followAccount(account.get('id')));
     }
diff --git a/app/javascript/flavours/glitch/containers/domain_container.jsx b/app/javascript/flavours/glitch/containers/domain_container.jsx
deleted file mode 100644
index c719a5775c7c16..00000000000000
--- a/app/javascript/flavours/glitch/containers/domain_container.jsx
+++ /dev/null
@@ -1,36 +0,0 @@
-import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
-
-import { connect } from 'react-redux';
-
-import { blockDomain, unblockDomain } from '../actions/domain_blocks';
-import { openModal } from '../actions/modal';
-import { Domain } from '../components/domain';
-
-const messages = defineMessages({
-  blockDomainConfirm: { id: 'confirmations.domain_block.confirm', defaultMessage: 'Block entire domain' },
-});
-
-const makeMapStateToProps = () => {
-  const mapStateToProps = () => ({});
-
-  return mapStateToProps;
-};
-
-const mapDispatchToProps = (dispatch, { intl }) => ({
-  onBlockDomain (domain) {
-    dispatch(openModal({
-      modalType: 'CONFIRM',
-      modalProps: {
-        message: <FormattedMessage id='confirmations.domain_block.message' defaultMessage='Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable. You will not see content from that domain in any public timelines or your notifications. Your followers from that domain will be removed.' values={{ domain: <strong>{domain}</strong> }} />,
-        confirm: intl.formatMessage(messages.blockDomainConfirm),
-        onConfirm: () => dispatch(blockDomain(domain)),
-      },
-    }));
-  },
-
-  onUnblockDomain (domain) {
-    dispatch(unblockDomain(domain));
-  },
-});
-
-export default injectIntl(connect(makeMapStateToProps, mapDispatchToProps)(Domain));
diff --git a/app/javascript/flavours/glitch/containers/status_container.js b/app/javascript/flavours/glitch/containers/status_container.js
index 955adc5fa7d95d..116a3455f786eb 100644
--- a/app/javascript/flavours/glitch/containers/status_container.js
+++ b/app/javascript/flavours/glitch/containers/status_container.js
@@ -1,5 +1,3 @@
-import { defineMessages, injectIntl } from 'react-intl';
-
 import { connect } from 'react-redux';
 
 import { initBlockModal } from 'flavours/glitch/actions/blocks';
@@ -19,7 +17,6 @@ import {
   pin,
   unpin,
 } from 'flavours/glitch/actions/interactions';
-import { changeLocalSetting } from 'flavours/glitch/actions/local_settings';
 import { openModal } from 'flavours/glitch/actions/modal';
 import { initMuteModal } from 'flavours/glitch/actions/mutes';
 import { deployPictureInPicture } from 'flavours/glitch/actions/picture_in_picture';
@@ -39,21 +36,6 @@ import { makeGetStatus, makeGetPictureInPicture } from 'flavours/glitch/selector
 
 import { showAlertForError } from '../actions/alerts';
 
-const messages = defineMessages({
-  deleteConfirm: { id: 'confirmations.delete.confirm', defaultMessage: 'Delete' },
-  deleteMessage: { id: 'confirmations.delete.message', defaultMessage: 'Are you sure you want to delete this status?' },
-  redraftConfirm: { id: 'confirmations.redraft.confirm', defaultMessage: 'Delete & redraft' },
-  redraftMessage: { id: 'confirmations.redraft.message', defaultMessage: 'Are you sure you want to delete this status and re-draft it? Favorites and boosts will be lost, and replies to the original post will be orphaned.' },
-  replyConfirm: { id: 'confirmations.reply.confirm', defaultMessage: 'Reply' },
-  replyMessage: { id: 'confirmations.reply.message', defaultMessage: 'Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?' },
-  editConfirm: { id: 'confirmations.edit.confirm', defaultMessage: 'Edit' },
-  editMessage: { id: 'confirmations.edit.message', defaultMessage: 'Editing now will overwrite the message you are currently composing. Are you sure you want to proceed?' },
-  unfilterConfirm: { id: 'confirmations.unfilter.confirm', defaultMessage: 'Show' },
-  author: { id: 'confirmations.unfilter.author', defaultMessage: 'Author' },
-  matchingFilters: { id: 'confirmations.unfilter.filters', defaultMessage: 'Matching {count, plural, one {filter} other {filters}}' },
-  editFilter: { id: 'confirmations.unfilter.edit_filter', defaultMessage: 'Edit filter' },
-});
-
 const makeMapStateToProps = () => {
   const getStatus = makeGetStatus();
   const getPictureInPicture = makeGetPictureInPicture();
@@ -88,22 +70,14 @@ const makeMapStateToProps = () => {
   return mapStateToProps;
 };
 
-const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
+const mapDispatchToProps = (dispatch, { contextType }) => ({
 
   onReply (status) {
     dispatch((_, getState) => {
       let state = getState();
 
       if (state.getIn(['local_settings', 'confirm_before_clearing_draft']) && state.getIn(['compose', 'text']).trim().length !== 0) {
-        dispatch(openModal({
-          modalType: 'CONFIRM',
-          modalProps: {
-            message: intl.formatMessage(messages.replyMessage),
-            confirm: intl.formatMessage(messages.replyConfirm),
-            onDoNotAsk: () => dispatch(changeLocalSetting(['confirm_before_clearing_draft'], false)),
-            onConfirm: () => dispatch(replyCompose(status)),
-          },
-        }));
+        dispatch(openModal({ modalType: 'CONFIRM_REPLY', modalProps: { status } }));
       } else {
         dispatch(replyCompose(status));
       }
@@ -148,14 +122,7 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
     if (!deleteModal) {
       dispatch(deleteStatus(status.get('id'), withRedraft));
     } else {
-      dispatch(openModal({
-        modalType: 'CONFIRM',
-        modalProps: {
-          message: intl.formatMessage(withRedraft ? messages.redraftMessage : messages.deleteMessage),
-          confirm: intl.formatMessage(withRedraft ? messages.redraftConfirm : messages.deleteConfirm),
-          onConfirm: () => dispatch(deleteStatus(status.get('id'), withRedraft)),
-        },
-      }));
+      dispatch(openModal({ modalType: 'CONFIRM_DELETE_STATUS', modalProps: { statusId: status.get('id'), withRedraft } }));
     }
   },
 
@@ -163,14 +130,7 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
     dispatch((_, getState) => {
       let state = getState();
       if (state.getIn(['compose', 'text']).trim().length !== 0) {
-        dispatch(openModal({
-          modalType: 'CONFIRM',
-          modalProps: {
-            message: intl.formatMessage(messages.editMessage),
-            confirm: intl.formatMessage(messages.editConfirm),
-            onConfirm: () => dispatch(editStatus(status.get('id'))),
-          },
-        }));
+        dispatch(openModal({ modalType: 'CONFIRM_EDIT_STATUS', modalProps: { statusId: status.get('id') } }));
       } else {
         dispatch(editStatus(status.get('id')));
       }
@@ -257,4 +217,4 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
 
 });
 
-export default injectIntl(connect(makeMapStateToProps, mapDispatchToProps)(Status));
+export default connect(makeMapStateToProps, mapDispatchToProps)(Status);
diff --git a/app/javascript/flavours/glitch/features/account_timeline/containers/header_container.jsx b/app/javascript/flavours/glitch/features/account_timeline/containers/header_container.jsx
index ba1241d8293c53..3ceb201e2f7ddc 100644
--- a/app/javascript/flavours/glitch/features/account_timeline/containers/header_container.jsx
+++ b/app/javascript/flavours/glitch/features/account_timeline/containers/header_container.jsx
@@ -1,10 +1,9 @@
-import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
+import { injectIntl } from 'react-intl';
 
 import { connect } from 'react-redux';
 
 import {
   followAccount,
-  unfollowAccount,
   unblockAccount,
   unmuteAccount,
   pinAccount,
@@ -22,11 +21,6 @@ import { initReport } from '../../../actions/reports';
 import { makeGetAccount, getAccountHidden } from '../../../selectors';
 import Header from '../components/header';
 
-const messages = defineMessages({
-  unfollowConfirm: { id: 'confirmations.unfollow.confirm', defaultMessage: 'Unfollow' },
-  blockDomainConfirm: { id: 'confirmations.domain_block.confirm', defaultMessage: 'Block entire domain' },
-});
-
 const makeMapStateToProps = () => {
   const getAccount = makeGetAccount();
 
@@ -39,18 +33,11 @@ const makeMapStateToProps = () => {
   return mapStateToProps;
 };
 
-const mapDispatchToProps = (dispatch, { intl }) => ({
+const mapDispatchToProps = (dispatch) => ({
 
   onFollow (account) {
     if (account.getIn(['relationship', 'following']) || account.getIn(['relationship', 'requested'])) {
-      dispatch(openModal({
-        modalType: 'CONFIRM',
-        modalProps: {
-          message: <FormattedMessage id='confirmations.unfollow.message' defaultMessage='Are you sure you want to unfollow {name}?' values={{ name: <strong>@{account.get('acct')}</strong> }} />,
-          confirm: intl.formatMessage(messages.unfollowConfirm),
-          onConfirm: () => dispatch(unfollowAccount(account.get('id'))),
-        },
-      }));
+      dispatch(openModal({ modalType: 'CONFIRM_UNFOLLOW', modalProps: { account } }));
     } else {
       dispatch(followAccount(account.get('id')));
     }
diff --git a/app/javascript/flavours/glitch/features/compose/components/action_bar.jsx b/app/javascript/flavours/glitch/features/compose/components/action_bar.jsx
index 7fda25ded59854..43c2899373a0e8 100644
--- a/app/javascript/flavours/glitch/features/compose/components/action_bar.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/action_bar.jsx
@@ -7,7 +7,6 @@ import { useDispatch } from 'react-redux';
 import MoreHorizIcon from '@/material-icons/400-24px/more_horiz.svg?react';
 import { openModal } from 'flavours/glitch/actions/modal';
 import DropdownMenuContainer from 'flavours/glitch/containers/dropdown_menu_container';
-import { logOut } from 'flavours/glitch/utils/log_out';
 
 const messages = defineMessages({
   edit_profile: { id: 'account.edit_profile', defaultMessage: 'Edit profile' },
@@ -23,8 +22,6 @@ const messages = defineMessages({
   filters: { id: 'navigation_bar.filters', defaultMessage: 'Muted words' },
   logout: { id: 'navigation_bar.logout', defaultMessage: 'Logout' },
   bookmarks: { id: 'navigation_bar.bookmarks', defaultMessage: 'Bookmarks' },
-  logoutMessage: { id: 'confirmations.logout.message', defaultMessage: 'Are you sure you want to log out?' },
-  logoutConfirm: { id: 'confirmations.logout.confirm', defaultMessage: 'Log out' },
 });
 
 export const ActionBar = () => {
@@ -32,16 +29,8 @@ export const ActionBar = () => {
   const intl = useIntl();
 
   const handleLogoutClick = useCallback(() => {
-    dispatch(openModal({
-      modalType: 'CONFIRM',
-      modalProps: {
-        message: intl.formatMessage(messages.logoutMessage),
-        confirm: intl.formatMessage(messages.logoutConfirm),
-        closeWhenConfirm: false,
-        onConfirm: () => logOut(),
-      },
-    }));
-  }, [dispatch, intl]);
+    dispatch(openModal({ modalType: 'CONFIRM_LOG_OUT' }));
+  }, [dispatch]);
 
   let menu = [];
 
diff --git a/app/javascript/flavours/glitch/features/compose/index.jsx b/app/javascript/flavours/glitch/features/compose/index.jsx
index b59fafe0481676..f9a763ef8befbd 100644
--- a/app/javascript/flavours/glitch/features/compose/index.jsx
+++ b/app/javascript/flavours/glitch/features/compose/index.jsx
@@ -24,7 +24,6 @@ import { Icon }  from 'flavours/glitch/components/icon';
 import glitchedElephant1 from 'flavours/glitch/images/mbstobon-ui-0.png';
 import glitchedElephant2 from 'flavours/glitch/images/mbstobon-ui-1.png';
 import glitchedElephant3 from 'flavours/glitch/images/mbstobon-ui-2.png';
-import { logOut } from 'flavours/glitch/utils/log_out';
 
 import elephantUIPlane from '../../../../images/elephant_ui_plane.svg';
 import { changeComposing, mountCompose, unmountCompose } from '../../actions/compose';
@@ -45,8 +44,6 @@ const messages = defineMessages({
   settings: { id: 'navigation_bar.app_settings', defaultMessage: 'App settings' },
   logout: { id: 'navigation_bar.logout', defaultMessage: 'Logout' },
   compose: { id: 'navigation_bar.compose', defaultMessage: 'Compose new post' },
-  logoutMessage: { id: 'confirmations.logout.message', defaultMessage: 'Are you sure you want to log out?' },
-  logoutConfirm: { id: 'confirmations.logout.confirm', defaultMessage: 'Log out' },
 });
 
 const mapStateToProps = (state, ownProps) => ({
@@ -88,20 +85,12 @@ class Compose extends PureComponent {
   }
 
   handleLogoutClick = e => {
-    const { dispatch, intl } = this.props;
+    const { dispatch } = this.props;
 
     e.preventDefault();
     e.stopPropagation();
 
-    dispatch(openModal({
-      modalType: 'CONFIRM',
-      modalProps: {
-        message: intl.formatMessage(messages.logoutMessage),
-        confirm: intl.formatMessage(messages.logoutConfirm),
-        closeWhenConfirm: false,
-        onConfirm: () => logOut(),
-      },
-    }));
+    dispatch(openModal({ modalType: 'CONFIRM_LOG_OUT' }));
 
     return false;
   };
diff --git a/app/javascript/flavours/glitch/features/direct_timeline/components/conversation.jsx b/app/javascript/flavours/glitch/features/direct_timeline/components/conversation.jsx
index 2c70f48a3740fe..50b2a9d5ab8f83 100644
--- a/app/javascript/flavours/glitch/features/direct_timeline/components/conversation.jsx
+++ b/app/javascript/flavours/glitch/features/direct_timeline/components/conversation.jsx
@@ -37,8 +37,6 @@ const messages = defineMessages({
   delete: { id: 'conversation.delete', defaultMessage: 'Delete conversation' },
   muteConversation: { id: 'status.mute_conversation', defaultMessage: 'Mute conversation' },
   unmuteConversation: { id: 'status.unmute_conversation', defaultMessage: 'Unmute conversation' },
-  replyConfirm: { id: 'confirmations.reply.confirm', defaultMessage: 'Reply' },
-  replyMessage: { id: 'confirmations.reply.message', defaultMessage: 'Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?' },
 });
 
 const getAccounts = createSelector(
@@ -121,19 +119,12 @@ export const Conversation = ({ conversation, scrollKey, onMoveUp, onMoveDown })
       let state = getState();
 
       if (state.getIn(['compose', 'text']).trim().length !== 0) {
-        dispatch(openModal({
-          modalType: 'CONFIRM',
-          modalProps: {
-            message: intl.formatMessage(messages.replyMessage),
-            confirm: intl.formatMessage(messages.replyConfirm),
-            onConfirm: () => dispatch(replyCompose(lastStatus)),
-          },
-        }));
+        dispatch(openModal({ modalType: 'CONFIRM_REPLY', modalProps: { status: lastStatus } }));
       } else {
         dispatch(replyCompose(lastStatus));
       }
     });
-  }, [dispatch, lastStatus, intl]);
+  }, [dispatch, lastStatus]);
 
   const handleDelete = useCallback(() => {
     dispatch(deleteConversation(id));
diff --git a/app/javascript/flavours/glitch/features/directory/components/account_card.tsx b/app/javascript/flavours/glitch/features/directory/components/account_card.tsx
index 907dbba9fd8414..8afb9f59d5b0fe 100644
--- a/app/javascript/flavours/glitch/features/directory/components/account_card.tsx
+++ b/app/javascript/flavours/glitch/features/directory/components/account_card.tsx
@@ -7,7 +7,6 @@ import classNames from 'classnames';
 
 import {
   followAccount,
-  unfollowAccount,
   unblockAccount,
   unmuteAccount,
 } from 'flavours/glitch/actions/accounts';
@@ -29,20 +28,12 @@ const messages = defineMessages({
     id: 'account.cancel_follow_request',
     defaultMessage: 'Withdraw follow request',
   },
-  cancelFollowRequestConfirm: {
-    id: 'confirmations.cancel_follow_request.confirm',
-    defaultMessage: 'Withdraw request',
-  },
   requested: {
     id: 'account.requested',
     defaultMessage: 'Awaiting approval. Click to cancel follow request',
   },
   unblock: { id: 'account.unblock_short', defaultMessage: 'Unblock' },
   unmute: { id: 'account.unmute_short', defaultMessage: 'Unmute' },
-  unfollowConfirm: {
-    id: 'confirmations.unfollow.confirm',
-    defaultMessage: 'Unfollow',
-  },
   edit_profile: { id: 'account.edit_profile', defaultMessage: 'Edit profile' },
 });
 
@@ -89,48 +80,17 @@ export const AccountCard: React.FC<{ accountId: string }> = ({ accountId }) => {
   const handleFollow = useCallback(() => {
     if (!account) return;
 
-    if (account.getIn(['relationship', 'following'])) {
-      dispatch(
-        openModal({
-          modalType: 'CONFIRM',
-          modalProps: {
-            message: (
-              <FormattedMessage
-                id='confirmations.unfollow.message'
-                defaultMessage='Are you sure you want to unfollow {name}?'
-                values={{ name: <strong>@{account.get('acct')}</strong> }}
-              />
-            ),
-            confirm: intl.formatMessage(messages.unfollowConfirm),
-            onConfirm: () => {
-              dispatch(unfollowAccount(account.get('id')));
-            },
-          },
-        }),
-      );
-    } else if (account.getIn(['relationship', 'requested'])) {
+    if (
+      account.getIn(['relationship', 'following']) ||
+      account.getIn(['relationship', 'requested'])
+    ) {
       dispatch(
-        openModal({
-          modalType: 'CONFIRM',
-          modalProps: {
-            message: (
-              <FormattedMessage
-                id='confirmations.cancel_follow_request.message'
-                defaultMessage='Are you sure you want to withdraw your request to follow {name}?'
-                values={{ name: <strong>@{account.get('acct')}</strong> }}
-              />
-            ),
-            confirm: intl.formatMessage(messages.cancelFollowRequestConfirm),
-            onConfirm: () => {
-              dispatch(unfollowAccount(account.get('id')));
-            },
-          },
-        }),
+        openModal({ modalType: 'CONFIRM_UNFOLLOW', modalProps: { account } }),
       );
     } else {
       dispatch(followAccount(account.get('id')));
     }
-  }, [account, dispatch, intl]);
+  }, [account, dispatch]);
 
   const handleBlock = useCallback(() => {
     if (account?.relationship?.blocking) {
diff --git a/app/javascript/flavours/glitch/features/domain_blocks/index.jsx b/app/javascript/flavours/glitch/features/domain_blocks/index.jsx
index 964eada9c1e5b9..67ee801cbff24c 100644
--- a/app/javascript/flavours/glitch/features/domain_blocks/index.jsx
+++ b/app/javascript/flavours/glitch/features/domain_blocks/index.jsx
@@ -11,16 +11,15 @@ import { connect } from 'react-redux';
 import { debounce } from 'lodash';
 
 import BlockIcon from '@/material-icons/400-24px/block-fill.svg?react';
+import { Domain } from 'flavours/glitch/components/domain';
 
 import { fetchDomainBlocks, expandDomainBlocks } from '../../actions/domain_blocks';
 import { LoadingIndicator } from '../../components/loading_indicator';
 import ScrollableList from '../../components/scrollable_list';
-import DomainContainer from '../../containers/domain_container';
 import Column from '../ui/components/column';
 
 const messages = defineMessages({
   heading: { id: 'column.domain_blocks', defaultMessage: 'Blocked domains' },
-  unblockDomain: { id: 'account.unblock_domain', defaultMessage: 'Unblock domain {domain}' },
 });
 
 const mapStateToProps = state => ({
@@ -70,7 +69,7 @@ class Blocks extends ImmutablePureComponent {
           bindToDocument={!multiColumn}
         >
           {domains.map(domain =>
-            <DomainContainer key={domain} domain={domain} />,
+            <Domain key={domain} domain={domain} />,
           )}
         </ScrollableList>
 
diff --git a/app/javascript/flavours/glitch/features/list_timeline/index.jsx b/app/javascript/flavours/glitch/features/list_timeline/index.jsx
index 08ce97f1ba75b0..122e43669d89a8 100644
--- a/app/javascript/flavours/glitch/features/list_timeline/index.jsx
+++ b/app/javascript/flavours/glitch/features/list_timeline/index.jsx
@@ -15,7 +15,7 @@ import DeleteIcon from '@/material-icons/400-24px/delete.svg?react';
 import EditIcon from '@/material-icons/400-24px/edit.svg?react';
 import ListAltIcon from '@/material-icons/400-24px/list_alt.svg?react';
 import { addColumn, removeColumn, moveColumn } from 'flavours/glitch/actions/columns';
-import { fetchList, deleteList, updateList } from 'flavours/glitch/actions/lists';
+import { fetchList, updateList } from 'flavours/glitch/actions/lists';
 import { openModal } from 'flavours/glitch/actions/modal';
 import { connectListStream } from 'flavours/glitch/actions/streaming';
 import { expandListTimeline } from 'flavours/glitch/actions/timelines';
@@ -29,8 +29,6 @@ import StatusListContainer from 'flavours/glitch/features/ui/containers/status_l
 import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router';
 
 const messages = defineMessages({
-  deleteMessage: { id: 'confirmations.delete_list.message', defaultMessage: 'Are you sure you want to permanently delete this list?' },
-  deleteConfirm: { id: 'confirmations.delete_list.confirm', defaultMessage: 'Delete' },
   followed:   { id: 'lists.replies_policy.followed', defaultMessage: 'Any followed user' },
   none:    { id: 'lists.replies_policy.none', defaultMessage: 'No one' },
   list:  { id: 'lists.replies_policy.list', defaultMessage: 'Members of the list' },
@@ -125,25 +123,10 @@ class ListTimeline extends PureComponent {
   };
 
   handleDeleteClick = () => {
-    const { dispatch, columnId, intl } = this.props;
+    const { dispatch, columnId } = this.props;
     const { id } = this.props.params;
 
-    dispatch(openModal({
-      modalType: 'CONFIRM',
-      modalProps: {
-        message: intl.formatMessage(messages.deleteMessage),
-        confirm: intl.formatMessage(messages.deleteConfirm),
-        onConfirm: () => {
-          dispatch(deleteList(id));
-
-          if (columnId) {
-            dispatch(removeColumn(columnId));
-          } else {
-            this.props.history.push('/lists');
-          }
-        },
-      },
-    }));
+    dispatch(openModal({ modalType: 'CONFIRM_DELETE_LIST', modalProps: { listId: id, columnId } }));
   };
 
   handleRepliesPolicyChange = ({ target }) => {
diff --git a/app/javascript/flavours/glitch/features/notifications/containers/column_settings_container.js b/app/javascript/flavours/glitch/features/notifications/containers/column_settings_container.js
index 55dcd4226c9859..1212a88b388842 100644
--- a/app/javascript/flavours/glitch/features/notifications/containers/column_settings_container.js
+++ b/app/javascript/flavours/glitch/features/notifications/containers/column_settings_container.js
@@ -2,11 +2,10 @@ import { defineMessages, injectIntl } from 'react-intl';
 
 import { connect } from 'react-redux';
 
+import { openModal } from 'flavours/glitch/actions/modal';
 import { initializeNotifications } from 'flavours/glitch/actions/notifications_migration';
 
 import { showAlert } from '../../../actions/alerts';
-import { openModal } from '../../../actions/modal';
-import { clearNotifications } from '../../../actions/notification_groups';
 import { updateNotificationsPolicy } from '../../../actions/notification_policies';
 import { setFilter, requestBrowserPermission } from '../../../actions/notifications';
 import { changeAlerts as changePushNotifications } from '../../../actions/push_notifications';
@@ -14,8 +13,6 @@ import { changeSetting } from '../../../actions/settings';
 import ColumnSettings from '../components/column_settings';
 
 const messages = defineMessages({
-  clearMessage: { id: 'notifications.clear_confirmation', defaultMessage: 'Are you sure you want to permanently clear all your notifications?' },
-  clearConfirm: { id: 'notifications.clear', defaultMessage: 'Clear notifications' },
   permissionDenied: { id: 'notifications.permission_denied_alert', defaultMessage: 'Desktop notifications can\'t be enabled, as browser permission has been denied before' },
 });
 
@@ -31,7 +28,7 @@ const mapStateToProps = state => ({
   notificationPolicy: state.notificationPolicy,
 });
 
-const mapDispatchToProps = (dispatch, { intl }) => ({
+const mapDispatchToProps = (dispatch) => ({
 
   onChange (path, checked) {
     if (path[0] === 'push') {
@@ -70,14 +67,7 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
   },
 
   onClear () {
-    dispatch(openModal({
-      modalType: 'CONFIRM',
-      modalProps: {
-        message: intl.formatMessage(messages.clearMessage),
-        confirm: intl.formatMessage(messages.clearConfirm),
-        onConfirm: () => dispatch(clearNotifications()),
-      },
-    }));
+    dispatch(openModal({ modalType: 'CONFIRM_CLEAR_NOTIFICATIONS' }));
   },
 
   onRequestNotificationPermission () {
diff --git a/app/javascript/flavours/glitch/features/picture_in_picture/components/footer.jsx b/app/javascript/flavours/glitch/features/picture_in_picture/components/footer.jsx
index 3e26d8406915c9..b57f882a74fe76 100644
--- a/app/javascript/flavours/glitch/features/picture_in_picture/components/footer.jsx
+++ b/app/javascript/flavours/glitch/features/picture_in_picture/components/footer.jsx
@@ -31,8 +31,6 @@ const messages = defineMessages({
   cancel_reblog_private: { id: 'status.cancel_reblog_private', defaultMessage: 'Unboost' },
   cannot_reblog: { id: 'status.cannot_reblog', defaultMessage: 'This post cannot be boosted' },
   favourite: { id: 'status.favourite', defaultMessage: 'Favorite' },
-  replyConfirm: { id: 'confirmations.reply.confirm', defaultMessage: 'Reply' },
-  replyMessage: { id: 'confirmations.reply.message', defaultMessage: 'Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?' },
   open: { id: 'status.open', defaultMessage: 'Expand this status' },
 });
 
@@ -73,19 +71,13 @@ class Footer extends ImmutablePureComponent {
   };
 
   handleReplyClick = () => {
-    const { dispatch, askReplyConfirmation, status, intl } = this.props;
+    const { dispatch, askReplyConfirmation, status, onClose } = this.props;
     const { signedIn } = this.props.identity;
 
     if (signedIn) {
       if (askReplyConfirmation) {
-        dispatch(openModal({
-          modalType: 'CONFIRM',
-          modalProps: {
-            message: intl.formatMessage(messages.replyMessage),
-            confirm: intl.formatMessage(messages.replyConfirm),
-            onConfirm: this._performReply,
-          },
-        }));
+        onClose(true);
+        dispatch(openModal({ modalType: 'CONFIRM_REPLY', modalProps: { status } }));
       } else {
         this._performReply();
       }
diff --git a/app/javascript/flavours/glitch/features/status/containers/detailed_status_container.js b/app/javascript/flavours/glitch/features/status/containers/detailed_status_container.js
index 1c9e3ccce12299..34bde2fc6ed66b 100644
--- a/app/javascript/flavours/glitch/features/status/containers/detailed_status_container.js
+++ b/app/javascript/flavours/glitch/features/status/containers/detailed_status_container.js
@@ -1,4 +1,4 @@
-import { defineMessages, injectIntl } from 'react-intl';
+import { injectIntl } from 'react-intl';
 
 import { connect } from 'react-redux';
 
@@ -27,15 +27,6 @@ import { deleteModal } from '../../../initial_state';
 import { makeGetStatus } from '../../../selectors';
 import DetailedStatus from '../components/detailed_status';
 
-const messages = defineMessages({
-  deleteConfirm: { id: 'confirmations.delete.confirm', defaultMessage: 'Delete' },
-  deleteMessage: { id: 'confirmations.delete.message', defaultMessage: 'Are you sure you want to delete this status?' },
-  redraftConfirm: { id: 'confirmations.redraft.confirm', defaultMessage: 'Delete & redraft' },
-  redraftMessage: { id: 'confirmations.redraft.message', defaultMessage: 'Are you sure you want to delete this status and re-draft it? Favorites and boosts will be lost, and replies to the original post will be orphaned.' },
-  replyConfirm: { id: 'confirmations.reply.confirm', defaultMessage: 'Reply' },
-  replyMessage: { id: 'confirmations.reply.message', defaultMessage: 'Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?' },
-});
-
 const makeMapStateToProps = () => {
   const getStatus = makeGetStatus();
 
@@ -48,20 +39,13 @@ const makeMapStateToProps = () => {
   return mapStateToProps;
 };
 
-const mapDispatchToProps = (dispatch, { intl }) => ({
+const mapDispatchToProps = (dispatch) => ({
 
   onReply (status) {
     dispatch((_, getState) => {
       let state = getState();
       if (state.getIn(['compose', 'text']).trim().length !== 0) {
-        dispatch(openModal({
-          modalType: 'CONFIRM',
-          modalProps: {
-            message: intl.formatMessage(messages.replyMessage),
-            confirm: intl.formatMessage(messages.replyConfirm),
-            onConfirm: () => dispatch(replyCompose(status)),
-          },
-        }));
+        dispatch(openModal({ modalType: 'CONFIRM_REPLY', modalProps: { status } }));
       } else {
         dispatch(replyCompose(status));
       }
@@ -98,14 +82,7 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
     if (!deleteModal) {
       dispatch(deleteStatus(status.get('id'), withRedraft));
     } else {
-      dispatch(openModal({
-        modalType: 'CONFIRM',
-        modalProps: {
-          message: intl.formatMessage(withRedraft ? messages.redraftMessage : messages.deleteMessage),
-          confirm: intl.formatMessage(withRedraft ? messages.redraftConfirm : messages.deleteConfirm),
-          onConfirm: () => dispatch(deleteStatus(status.get('id'), withRedraft)),
-        },
-      }));
+      dispatch(openModal({ modalType: 'CONFIRM_DELETE_STATUS', modalProps: { statusId: status.get('id'), withRedraft } }));
     }
   },
 
diff --git a/app/javascript/flavours/glitch/features/status/index.jsx b/app/javascript/flavours/glitch/features/status/index.jsx
index 2fca4b61b6c26f..5bc99c661426df 100644
--- a/app/javascript/flavours/glitch/features/status/index.jsx
+++ b/app/javascript/flavours/glitch/features/status/index.jsx
@@ -39,7 +39,6 @@ import {
   pin,
   unpin,
 } from '../../actions/interactions';
-import { changeLocalSetting } from '../../actions/local_settings';
 import { openModal } from '../../actions/modal';
 import { initMuteModal } from '../../actions/mutes';
 import { initReport } from '../../actions/reports';
@@ -67,16 +66,10 @@ import DetailedStatus from './components/detailed_status';
 
 
 const messages = defineMessages({
-  deleteConfirm: { id: 'confirmations.delete.confirm', defaultMessage: 'Delete' },
-  deleteMessage: { id: 'confirmations.delete.message', defaultMessage: 'Are you sure you want to delete this status?' },
-  redraftConfirm: { id: 'confirmations.redraft.confirm', defaultMessage: 'Delete & redraft' },
-  redraftMessage: { id: 'confirmations.redraft.message', defaultMessage: 'Are you sure you want to delete this status and re-draft it? Favorites and boosts will be lost, and replies to the original post will be orphaned.' },
   revealAll: { id: 'status.show_more_all', defaultMessage: 'Show more for all' },
   hideAll: { id: 'status.show_less_all', defaultMessage: 'Show less for all' },
   statusTitleWithAttachments: { id: 'status.title.with_attachments', defaultMessage: '{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}' },
   detailedStatus: { id: 'status.detailed_status', defaultMessage: 'Detailed conversation view' },
-  replyConfirm: { id: 'confirmations.reply.confirm', defaultMessage: 'Reply' },
-  replyMessage: { id: 'confirmations.reply.message', defaultMessage: 'Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?' },
   tootHeading: { id: 'account.posts_with_replies', defaultMessage: 'Posts and replies' },
 });
 
@@ -294,20 +287,12 @@ class Status extends ImmutablePureComponent {
   };
 
   handleReplyClick = (status) => {
-    const { askReplyConfirmation, dispatch, intl } = this.props;
+    const { askReplyConfirmation, dispatch } = this.props;
     const { signedIn } = this.props.identity;
 
     if (signedIn) {
       if (askReplyConfirmation) {
-        dispatch(openModal({
-          modalType: 'CONFIRM',
-          modalProps: {
-            message: intl.formatMessage(messages.replyMessage),
-            confirm: intl.formatMessage(messages.replyConfirm),
-            onDoNotAsk: () => dispatch(changeLocalSetting(['confirm_before_clearing_draft'], false)),
-            onConfirm: () => dispatch(replyCompose(status)),
-          },
-        }));
+        dispatch(openModal({ modalType: 'CONFIRM_REPLY', modalProps: { status } }));
       } else {
         dispatch(replyCompose(status));
       }
@@ -350,24 +335,23 @@ class Status extends ImmutablePureComponent {
   };
 
   handleDeleteClick = (status, withRedraft = false) => {
-    const { dispatch, intl } = this.props;
+    const { dispatch } = this.props;
 
     if (!deleteModal) {
       dispatch(deleteStatus(status.get('id'), withRedraft));
     } else {
-      dispatch(openModal({
-        modalType: 'CONFIRM',
-        modalProps: {
-          message: intl.formatMessage(withRedraft ? messages.redraftMessage : messages.deleteMessage),
-          confirm: intl.formatMessage(withRedraft ? messages.redraftConfirm : messages.deleteConfirm),
-          onConfirm: () => dispatch(deleteStatus(status.get('id'), withRedraft)),
-        },
-      }));
+      dispatch(openModal({ modalType: 'CONFIRM_DELETE_STATUS', modalProps: { statusId: status.get('id'), withRedraft } }));
     }
   };
 
   handleEditClick = (status) => {
-    this.props.dispatch(editStatus(status.get('id')));
+    const { dispatch, askReplyConfirmation } = this.props;
+
+    if (askReplyConfirmation) {
+      dispatch(openModal({ modalType: 'CONFIRM_EDIT_STATUS', modalProps: { statusId: status.get('id') } }));
+    } else {
+      dispatch(editStatus(status.get('id')));
+    }
   };
 
   handleDirectClick = (account) => {
diff --git a/app/javascript/flavours/glitch/features/ui/components/confirmation_modal.jsx b/app/javascript/flavours/glitch/features/ui/components/confirmation_modal.jsx
deleted file mode 100644
index 51a501595bb6e0..00000000000000
--- a/app/javascript/flavours/glitch/features/ui/components/confirmation_modal.jsx
+++ /dev/null
@@ -1,83 +0,0 @@
-import PropTypes from 'prop-types';
-import { PureComponent } from 'react';
-
-import { injectIntl, FormattedMessage } from 'react-intl';
-
-import { Button } from '../../../components/button';
-
-class ConfirmationModal extends PureComponent {
-
-  static propTypes = {
-    message: PropTypes.node.isRequired,
-    confirm: PropTypes.string.isRequired,
-    onClose: PropTypes.func.isRequired,
-    onConfirm: PropTypes.func.isRequired,
-    secondary: PropTypes.string,
-    onSecondary: PropTypes.func,
-    closeWhenConfirm: PropTypes.bool,
-    onDoNotAsk: PropTypes.func,
-    intl: PropTypes.object.isRequired,
-  };
-
-  static defaultProps = {
-    closeWhenConfirm: true,
-  };
-
-  handleClick = () => {
-    if (this.props.closeWhenConfirm) {
-      this.props.onClose();
-    }
-    this.props.onConfirm();
-    if (this.props.onDoNotAsk && this.doNotAskCheckbox.checked) {
-      this.props.onDoNotAsk();
-    }
-  };
-
-  handleSecondary = () => {
-    this.props.onClose();
-    this.props.onSecondary();
-  };
-
-  handleCancel = () => {
-    this.props.onClose();
-  };
-
-  setDoNotAskRef = (c) => {
-    this.doNotAskCheckbox = c;
-  };
-
-  render () {
-    const { message, confirm, secondary, onDoNotAsk } = this.props;
-
-    return (
-      <div className='modal-root__modal confirmation-modal'>
-        <div className='confirmation-modal__container'>
-          {message}
-        </div>
-
-        <div>
-          { onDoNotAsk && (
-            <div className='confirmation-modal__do_not_ask_again'>
-              <input type='checkbox' id='confirmation-modal__do_not_ask_again-checkbox' ref={this.setDoNotAskRef} />
-              <label htmlFor='confirmation-modal__do_not_ask_again-checkbox'>
-                <FormattedMessage id='confirmation_modal.do_not_ask_again' defaultMessage='Do not ask for confirmation again' />
-              </label>
-            </div>
-          )}
-          <div className='confirmation-modal__action-bar'>
-            <Button onClick={this.handleCancel} className='confirmation-modal__cancel-button'>
-              <FormattedMessage id='confirmation_modal.cancel' defaultMessage='Cancel' />
-            </Button>
-            {secondary !== undefined && (
-              <Button text={secondary} onClick={this.handleSecondary} className='confirmation-modal__secondary-button' />
-            )}
-            <Button text={confirm} onClick={this.handleClick} autoFocus />
-          </div>
-        </div>
-      </div>
-    );
-  }
-
-}
-
-export default injectIntl(ConfirmationModal);
diff --git a/app/javascript/flavours/glitch/features/ui/components/confirmation_modals/clear_notifications.tsx b/app/javascript/flavours/glitch/features/ui/components/confirmation_modals/clear_notifications.tsx
new file mode 100644
index 00000000000000..65604462896db1
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/ui/components/confirmation_modals/clear_notifications.tsx
@@ -0,0 +1,46 @@
+import { useCallback } from 'react';
+
+import { defineMessages, useIntl } from 'react-intl';
+
+import { clearNotifications } from 'flavours/glitch/actions/notification_groups';
+import { useAppDispatch } from 'flavours/glitch/store';
+
+import type { BaseConfirmationModalProps } from './confirmation_modal';
+import { ConfirmationModal } from './confirmation_modal';
+
+const messages = defineMessages({
+  clearTitle: {
+    id: 'notifications.clear_title',
+    defaultMessage: 'Clear notifications?',
+  },
+  clearMessage: {
+    id: 'notifications.clear_confirmation',
+    defaultMessage:
+      'Are you sure you want to permanently clear all your notifications?',
+  },
+  clearConfirm: {
+    id: 'notifications.clear',
+    defaultMessage: 'Clear notifications',
+  },
+});
+
+export const ConfirmClearNotificationsModal: React.FC<
+  BaseConfirmationModalProps
+> = ({ onClose }) => {
+  const intl = useIntl();
+  const dispatch = useAppDispatch();
+
+  const onConfirm = useCallback(() => {
+    void dispatch(clearNotifications());
+  }, [dispatch]);
+
+  return (
+    <ConfirmationModal
+      title={intl.formatMessage(messages.clearTitle)}
+      message={intl.formatMessage(messages.clearMessage)}
+      confirm={intl.formatMessage(messages.clearConfirm)}
+      onConfirm={onConfirm}
+      onClose={onClose}
+    />
+  );
+};
diff --git a/app/javascript/flavours/glitch/features/ui/components/confirmation_modals/confirmation_modal.tsx b/app/javascript/flavours/glitch/features/ui/components/confirmation_modals/confirmation_modal.tsx
new file mode 100644
index 00000000000000..429850ef32ce80
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/ui/components/confirmation_modals/confirmation_modal.tsx
@@ -0,0 +1,87 @@
+import { useCallback } from 'react';
+
+import { FormattedMessage, defineMessages } from 'react-intl';
+
+import { Button } from 'flavours/glitch/components/button';
+
+export interface BaseConfirmationModalProps {
+  onClose: () => void;
+}
+
+// eslint-disable-next-line @typescript-eslint/no-unused-vars -- keep the message around while we find a place to show it
+const messages = defineMessages({
+  doNotAskAgain: {
+    id: 'confirmation_modal.do_not_ask_again',
+    defaultMessage: 'Do not ask for confirmation again',
+  },
+});
+
+export const ConfirmationModal: React.FC<
+  {
+    title: React.ReactNode;
+    message: React.ReactNode;
+    confirm: React.ReactNode;
+    secondary?: React.ReactNode;
+    onSecondary?: () => void;
+    onConfirm: () => void;
+    closeWhenConfirm?: boolean;
+  } & BaseConfirmationModalProps
+> = ({
+  title,
+  message,
+  confirm,
+  onClose,
+  onConfirm,
+  secondary,
+  onSecondary,
+  closeWhenConfirm = true,
+}) => {
+  const handleClick = useCallback(() => {
+    if (closeWhenConfirm) {
+      onClose();
+    }
+
+    onConfirm();
+  }, [onClose, onConfirm, closeWhenConfirm]);
+
+  const handleSecondary = useCallback(() => {
+    onClose();
+    onSecondary?.();
+  }, [onClose, onSecondary]);
+
+  const handleCancel = useCallback(() => {
+    onClose();
+  }, [onClose]);
+
+  return (
+    <div className='modal-root__modal safety-action-modal'>
+      <div className='safety-action-modal__top'>
+        <div className='safety-action-modal__confirmation'>
+          <h1>{title}</h1>
+          <p>{message}</p>
+        </div>
+      </div>
+
+      <div className='safety-action-modal__bottom'>
+        <div className='safety-action-modal__actions'>
+          {secondary && (
+            <>
+              <Button onClick={handleSecondary}>{secondary}</Button>
+
+              <div className='spacer' />
+            </>
+          )}
+
+          <button onClick={handleCancel} className='link-button'>
+            <FormattedMessage
+              id='confirmation_modal.cancel'
+              defaultMessage='Cancel'
+            />
+          </button>
+
+          <Button onClick={handleClick}>{confirm}</Button>
+        </div>
+      </div>
+    </div>
+  );
+};
diff --git a/app/javascript/flavours/glitch/features/ui/components/confirmation_modals/delete_list.tsx b/app/javascript/flavours/glitch/features/ui/components/confirmation_modals/delete_list.tsx
new file mode 100644
index 00000000000000..948b6c83da5734
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/ui/components/confirmation_modals/delete_list.tsx
@@ -0,0 +1,58 @@
+import { useCallback } from 'react';
+
+import { defineMessages, useIntl } from 'react-intl';
+
+import { useHistory } from 'react-router';
+
+import { removeColumn } from 'flavours/glitch/actions/columns';
+import { deleteList } from 'flavours/glitch/actions/lists';
+import { useAppDispatch } from 'flavours/glitch/store';
+
+import type { BaseConfirmationModalProps } from './confirmation_modal';
+import { ConfirmationModal } from './confirmation_modal';
+
+const messages = defineMessages({
+  deleteListTitle: {
+    id: 'confirmations.delete_list.title',
+    defaultMessage: 'Delete list?',
+  },
+  deleteListMessage: {
+    id: 'confirmations.delete_list.message',
+    defaultMessage: 'Are you sure you want to permanently delete this list?',
+  },
+  deleteListConfirm: {
+    id: 'confirmations.delete_list.confirm',
+    defaultMessage: 'Delete',
+  },
+});
+
+export const ConfirmDeleteListModal: React.FC<
+  {
+    listId: string;
+    columnId: string;
+  } & BaseConfirmationModalProps
+> = ({ listId, columnId, onClose }) => {
+  const intl = useIntl();
+  const dispatch = useAppDispatch();
+  const history = useHistory();
+
+  const onConfirm = useCallback(() => {
+    dispatch(deleteList(listId));
+
+    if (columnId) {
+      dispatch(removeColumn(columnId));
+    } else {
+      history.push('/lists');
+    }
+  }, [dispatch, history, columnId, listId]);
+
+  return (
+    <ConfirmationModal
+      title={intl.formatMessage(messages.deleteListTitle)}
+      message={intl.formatMessage(messages.deleteListMessage)}
+      confirm={intl.formatMessage(messages.deleteListConfirm)}
+      onConfirm={onConfirm}
+      onClose={onClose}
+    />
+  );
+};
diff --git a/app/javascript/flavours/glitch/features/ui/components/confirmation_modals/delete_status.tsx b/app/javascript/flavours/glitch/features/ui/components/confirmation_modals/delete_status.tsx
new file mode 100644
index 00000000000000..e86cec10c0b015
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/ui/components/confirmation_modals/delete_status.tsx
@@ -0,0 +1,67 @@
+import { useCallback } from 'react';
+
+import { defineMessages, useIntl } from 'react-intl';
+
+import { deleteStatus } from 'flavours/glitch/actions/statuses';
+import { useAppDispatch } from 'flavours/glitch/store';
+
+import type { BaseConfirmationModalProps } from './confirmation_modal';
+import { ConfirmationModal } from './confirmation_modal';
+
+const messages = defineMessages({
+  deleteAndRedraftTitle: {
+    id: 'confirmations.redraft.title',
+    defaultMessage: 'Delete & redraft post?',
+  },
+  deleteAndRedraftMessage: {
+    id: 'confirmations.redraft.message',
+    defaultMessage:
+      'Are you sure you want to delete this status and re-draft it? Favorites and boosts will be lost, and replies to the original post will be orphaned.',
+  },
+  deleteAndRedraftConfirm: {
+    id: 'confirmations.redraft.confirm',
+    defaultMessage: 'Delete & redraft',
+  },
+  deleteTitle: {
+    id: 'confirmations.delete.title',
+    defaultMessage: 'Delete post?',
+  },
+  deleteMessage: {
+    id: 'confirmations.delete.message',
+    defaultMessage: 'Are you sure you want to delete this status?',
+  },
+  deleteConfirm: {
+    id: 'confirmations.delete.confirm',
+    defaultMessage: 'Delete',
+  },
+});
+
+export const ConfirmDeleteStatusModal: React.FC<
+  {
+    statusId: string;
+    withRedraft: boolean;
+  } & BaseConfirmationModalProps
+> = ({ statusId, withRedraft, onClose }) => {
+  const intl = useIntl();
+  const dispatch = useAppDispatch();
+
+  const onConfirm = useCallback(() => {
+    dispatch(deleteStatus(statusId, withRedraft));
+  }, [dispatch, statusId, withRedraft]);
+
+  return (
+    <ConfirmationModal
+      title={intl.formatMessage(
+        withRedraft ? messages.deleteAndRedraftTitle : messages.deleteTitle,
+      )}
+      message={intl.formatMessage(
+        withRedraft ? messages.deleteAndRedraftMessage : messages.deleteMessage,
+      )}
+      confirm={intl.formatMessage(
+        withRedraft ? messages.deleteAndRedraftConfirm : messages.deleteConfirm,
+      )}
+      onConfirm={onConfirm}
+      onClose={onClose}
+    />
+  );
+};
diff --git a/app/javascript/flavours/glitch/features/ui/components/confirmation_modals/edit_status.tsx b/app/javascript/flavours/glitch/features/ui/components/confirmation_modals/edit_status.tsx
new file mode 100644
index 00000000000000..4a7e56c2a120d2
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/ui/components/confirmation_modals/edit_status.tsx
@@ -0,0 +1,45 @@
+import { useCallback } from 'react';
+
+import { defineMessages, useIntl } from 'react-intl';
+
+import { editStatus } from 'flavours/glitch/actions/statuses';
+import { useAppDispatch } from 'flavours/glitch/store';
+
+import type { BaseConfirmationModalProps } from './confirmation_modal';
+import { ConfirmationModal } from './confirmation_modal';
+
+const messages = defineMessages({
+  editTitle: {
+    id: 'confirmations.edit.title',
+    defaultMessage: 'Overwrite post?',
+  },
+  editConfirm: { id: 'confirmations.edit.confirm', defaultMessage: 'Edit' },
+  editMessage: {
+    id: 'confirmations.edit.message',
+    defaultMessage:
+      'Editing now will overwrite the message you are currently composing. Are you sure you want to proceed?',
+  },
+});
+
+export const ConfirmEditStatusModal: React.FC<
+  {
+    statusId: string;
+  } & BaseConfirmationModalProps
+> = ({ statusId, onClose }) => {
+  const intl = useIntl();
+  const dispatch = useAppDispatch();
+
+  const onConfirm = useCallback(() => {
+    dispatch(editStatus(statusId));
+  }, [dispatch, statusId]);
+
+  return (
+    <ConfirmationModal
+      title={intl.formatMessage(messages.editTitle)}
+      message={intl.formatMessage(messages.editMessage)}
+      confirm={intl.formatMessage(messages.editConfirm)}
+      onConfirm={onConfirm}
+      onClose={onClose}
+    />
+  );
+};
diff --git a/app/javascript/flavours/glitch/features/ui/components/confirmation_modals/index.ts b/app/javascript/flavours/glitch/features/ui/components/confirmation_modals/index.ts
new file mode 100644
index 00000000000000..912c99a393a1f0
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/ui/components/confirmation_modals/index.ts
@@ -0,0 +1,8 @@
+export { ConfirmationModal } from './confirmation_modal';
+export { ConfirmDeleteStatusModal } from './delete_status';
+export { ConfirmDeleteListModal } from './delete_list';
+export { ConfirmReplyModal } from './reply';
+export { ConfirmEditStatusModal } from './edit_status';
+export { ConfirmUnfollowModal } from './unfollow';
+export { ConfirmClearNotificationsModal } from './clear_notifications';
+export { ConfirmLogOutModal } from './log_out';
diff --git a/app/javascript/flavours/glitch/features/ui/components/confirmation_modals/log_out.tsx b/app/javascript/flavours/glitch/features/ui/components/confirmation_modals/log_out.tsx
new file mode 100644
index 00000000000000..ac9439461f3360
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/ui/components/confirmation_modals/log_out.tsx
@@ -0,0 +1,40 @@
+import { useCallback } from 'react';
+
+import { defineMessages, useIntl } from 'react-intl';
+
+import { logOut } from 'flavours/glitch/utils/log_out';
+
+import type { BaseConfirmationModalProps } from './confirmation_modal';
+import { ConfirmationModal } from './confirmation_modal';
+
+const messages = defineMessages({
+  logoutTitle: { id: 'confirmations.logout.title', defaultMessage: 'Log out?' },
+  logoutMessage: {
+    id: 'confirmations.logout.message',
+    defaultMessage: 'Are you sure you want to log out?',
+  },
+  logoutConfirm: {
+    id: 'confirmations.logout.confirm',
+    defaultMessage: 'Log out',
+  },
+});
+
+export const ConfirmLogOutModal: React.FC<BaseConfirmationModalProps> = ({
+  onClose,
+}) => {
+  const intl = useIntl();
+
+  const onConfirm = useCallback(() => {
+    logOut();
+  }, []);
+
+  return (
+    <ConfirmationModal
+      title={intl.formatMessage(messages.logoutTitle)}
+      message={intl.formatMessage(messages.logoutMessage)}
+      confirm={intl.formatMessage(messages.logoutConfirm)}
+      onConfirm={onConfirm}
+      onClose={onClose}
+    />
+  );
+};
diff --git a/app/javascript/flavours/glitch/features/ui/components/confirmation_modals/reply.tsx b/app/javascript/flavours/glitch/features/ui/components/confirmation_modals/reply.tsx
new file mode 100644
index 00000000000000..415a4539549fdf
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/ui/components/confirmation_modals/reply.tsx
@@ -0,0 +1,46 @@
+import { useCallback } from 'react';
+
+import { defineMessages, useIntl } from 'react-intl';
+
+import { replyCompose } from 'flavours/glitch/actions/compose';
+import type { Status } from 'flavours/glitch/models/status';
+import { useAppDispatch } from 'flavours/glitch/store';
+
+import type { BaseConfirmationModalProps } from './confirmation_modal';
+import { ConfirmationModal } from './confirmation_modal';
+
+const messages = defineMessages({
+  replyTitle: {
+    id: 'confirmations.reply.title',
+    defaultMessage: 'Overwrite post?',
+  },
+  replyConfirm: { id: 'confirmations.reply.confirm', defaultMessage: 'Reply' },
+  replyMessage: {
+    id: 'confirmations.reply.message',
+    defaultMessage:
+      'Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?',
+  },
+});
+
+export const ConfirmReplyModal: React.FC<
+  {
+    status: Status;
+  } & BaseConfirmationModalProps
+> = ({ status, onClose }) => {
+  const intl = useIntl();
+  const dispatch = useAppDispatch();
+
+  const onConfirm = useCallback(() => {
+    dispatch(replyCompose(status));
+  }, [dispatch, status]);
+
+  return (
+    <ConfirmationModal
+      title={intl.formatMessage(messages.replyTitle)}
+      message={intl.formatMessage(messages.replyMessage)}
+      confirm={intl.formatMessage(messages.replyConfirm)}
+      onConfirm={onConfirm}
+      onClose={onClose}
+    />
+  );
+};
diff --git a/app/javascript/flavours/glitch/features/ui/components/confirmation_modals/unfollow.tsx b/app/javascript/flavours/glitch/features/ui/components/confirmation_modals/unfollow.tsx
new file mode 100644
index 00000000000000..fe6f5e362d00e2
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/ui/components/confirmation_modals/unfollow.tsx
@@ -0,0 +1,50 @@
+import { useCallback } from 'react';
+
+import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
+
+import { unfollowAccount } from 'flavours/glitch/actions/accounts';
+import type { Account } from 'flavours/glitch/models/account';
+import { useAppDispatch } from 'flavours/glitch/store';
+
+import type { BaseConfirmationModalProps } from './confirmation_modal';
+import { ConfirmationModal } from './confirmation_modal';
+
+const messages = defineMessages({
+  unfollowTitle: {
+    id: 'confirmations.unfollow.title',
+    defaultMessage: 'Unfollow user?',
+  },
+  unfollowConfirm: {
+    id: 'confirmations.unfollow.confirm',
+    defaultMessage: 'Unfollow',
+  },
+});
+
+export const ConfirmUnfollowModal: React.FC<
+  {
+    account: Account;
+  } & BaseConfirmationModalProps
+> = ({ account, onClose }) => {
+  const intl = useIntl();
+  const dispatch = useAppDispatch();
+
+  const onConfirm = useCallback(() => {
+    dispatch(unfollowAccount(account.id));
+  }, [dispatch, account.id]);
+
+  return (
+    <ConfirmationModal
+      title={intl.formatMessage(messages.unfollowTitle)}
+      message={
+        <FormattedMessage
+          id='confirmations.unfollow.message'
+          defaultMessage='Are you sure you want to unfollow {name}?'
+          values={{ name: <strong>@{account.acct}</strong> }}
+        />
+      }
+      confirm={intl.formatMessage(messages.unfollowConfirm)}
+      onConfirm={onConfirm}
+      onClose={onClose}
+    />
+  );
+};
diff --git a/app/javascript/flavours/glitch/features/ui/components/disabled_account_banner.jsx b/app/javascript/flavours/glitch/features/ui/components/disabled_account_banner.jsx
index 396127829b5847..7a19983a9c5a76 100644
--- a/app/javascript/flavours/glitch/features/ui/components/disabled_account_banner.jsx
+++ b/app/javascript/flavours/glitch/features/ui/components/disabled_account_banner.jsx
@@ -1,7 +1,7 @@
 import PropTypes from 'prop-types';
 import { PureComponent } from 'react';
 
-import { FormattedMessage, defineMessages, injectIntl } from 'react-intl';
+import { FormattedMessage, injectIntl } from 'react-intl';
 
 import { Link } from 'react-router-dom';
 
@@ -9,29 +9,15 @@ import { connect } from 'react-redux';
 
 import { openModal } from 'flavours/glitch/actions/modal';
 import { disabledAccountId, movedToAccountId, domain } from 'flavours/glitch/initial_state';
-import { logOut } from 'flavours/glitch/utils/log_out';
-
-const messages = defineMessages({
-  logoutMessage: { id: 'confirmations.logout.message', defaultMessage: 'Are you sure you want to log out?' },
-  logoutConfirm: { id: 'confirmations.logout.confirm', defaultMessage: 'Log out' },
-});
 
 const mapStateToProps = (state) => ({
   disabledAcct: state.getIn(['accounts', disabledAccountId, 'acct']),
   movedToAcct: movedToAccountId ? state.getIn(['accounts', movedToAccountId, 'acct']) : undefined,
 });
 
-const mapDispatchToProps = (dispatch, { intl }) => ({
+const mapDispatchToProps = (dispatch) => ({
   onLogout () {
-    dispatch(openModal({
-      modalType: 'CONFIRM',
-      modalProps: {
-        message: intl.formatMessage(messages.logoutMessage),
-        confirm: intl.formatMessage(messages.logoutConfirm),
-        closeWhenConfirm: false,
-        onConfirm: () => logOut(),
-      },
-    }));
+    dispatch(openModal({ modalType: 'CONFIRM_LOG_OUT' }));
   },
 });
 
diff --git a/app/javascript/flavours/glitch/features/ui/components/link_footer.jsx b/app/javascript/flavours/glitch/features/ui/components/link_footer.jsx
index 7c0ece465f0d71..fb07f9e549ebb0 100644
--- a/app/javascript/flavours/glitch/features/ui/components/link_footer.jsx
+++ b/app/javascript/flavours/glitch/features/ui/components/link_footer.jsx
@@ -1,7 +1,7 @@
 import PropTypes from 'prop-types';
 import { PureComponent } from 'react';
 
-import { FormattedMessage, defineMessages, injectIntl } from 'react-intl';
+import { FormattedMessage, injectIntl } from 'react-intl';
 
 import { Link } from 'react-router-dom';
 
@@ -11,24 +11,11 @@ import { openModal } from 'flavours/glitch/actions/modal';
 import { identityContextPropShape, withIdentity } from 'flavours/glitch/identity_context';
 import { domain, version, source_url, statusPageUrl, profile_directory as profileDirectory } from 'flavours/glitch/initial_state';
 import { PERMISSION_INVITE_USERS } from 'flavours/glitch/permissions';
-import { logOut } from 'flavours/glitch/utils/log_out';
 
-const messages = defineMessages({
-  logoutMessage: { id: 'confirmations.logout.message', defaultMessage: 'Are you sure you want to log out?' },
-  logoutConfirm: { id: 'confirmations.logout.confirm', defaultMessage: 'Log out' },
-});
-
-const mapDispatchToProps = (dispatch, { intl }) => ({
+const mapDispatchToProps = (dispatch) => ({
   onLogout () {
-    dispatch(openModal({
-      modalType: 'CONFIRM',
-      modalProps: {
-        message: intl.formatMessage(messages.logoutMessage),
-        confirm: intl.formatMessage(messages.logoutConfirm),
-        closeWhenConfirm: false,
-        onConfirm: () => logOut(),
-      },
-    }));
+    dispatch(openModal({ modalType: 'CONFIRM_LOG_OUT' }));
+
   },
 });
 
diff --git a/app/javascript/flavours/glitch/features/ui/components/modal_root.jsx b/app/javascript/flavours/glitch/features/ui/components/modal_root.jsx
index 063316ef1b7db2..0bc393f7e859f4 100644
--- a/app/javascript/flavours/glitch/features/ui/components/modal_root.jsx
+++ b/app/javascript/flavours/glitch/features/ui/components/modal_root.jsx
@@ -28,7 +28,16 @@ import ActionsModal from './actions_modal';
 import AudioModal from './audio_modal';
 import { BoostModal } from './boost_modal';
 import BundleModalError from './bundle_modal_error';
-import ConfirmationModal from './confirmation_modal';
+import {
+  ConfirmationModal,
+  ConfirmDeleteStatusModal,
+  ConfirmDeleteListModal,
+  ConfirmReplyModal,
+  ConfirmEditStatusModal,
+  ConfirmUnfollowModal,
+  ConfirmClearNotificationsModal,
+  ConfirmLogOutModal,
+} from './confirmation_modals';
 import DeprecatedSettingsModal from './deprecated_settings_modal';
 import DoodleModal from './doodle_modal';
 import FavouriteModal from './favourite_modal';
@@ -47,6 +56,13 @@ export const MODAL_COMPONENTS = {
   'FAVOURITE': () => Promise.resolve({ default: FavouriteModal }),
   'DOODLE': () => Promise.resolve({ default: DoodleModal }),
   'CONFIRM': () => Promise.resolve({ default: ConfirmationModal }),
+  'CONFIRM_DELETE_STATUS': () => Promise.resolve({ default: ConfirmDeleteStatusModal }),
+  'CONFIRM_DELETE_LIST': () => Promise.resolve({ default: ConfirmDeleteListModal }),
+  'CONFIRM_REPLY': () => Promise.resolve({ default: ConfirmReplyModal }),
+  'CONFIRM_EDIT_STATUS': () => Promise.resolve({ default: ConfirmEditStatusModal }),
+  'CONFIRM_UNFOLLOW': () => Promise.resolve({ default: ConfirmUnfollowModal }),
+  'CONFIRM_CLEAR_NOTIFICATIONS': () => Promise.resolve({ default: ConfirmClearNotificationsModal }),
+  'CONFIRM_LOG_OUT': () => Promise.resolve({ default: ConfirmLogOutModal }),
   'MUTE': MuteModal,
   'BLOCK': BlockModal,
   'DOMAIN_BLOCK': DomainBlockModal,
diff --git a/app/javascript/flavours/glitch/locales/en.json b/app/javascript/flavours/glitch/locales/en.json
index 5ab92732ce9729..02e44932f8adbf 100644
--- a/app/javascript/flavours/glitch/locales/en.json
+++ b/app/javascript/flavours/glitch/locales/en.json
@@ -34,10 +34,6 @@
   "confirmations.missing_media_description.confirm": "Send anyway",
   "confirmations.missing_media_description.edit": "Edit media",
   "confirmations.missing_media_description.message": "At least one media attachment is lacking a description. Consider describing all media attachments for the visually impaired before sending your toot.",
-  "confirmations.unfilter.author": "Author",
-  "confirmations.unfilter.confirm": "Show",
-  "confirmations.unfilter.edit_filter": "Edit filter",
-  "confirmations.unfilter.filters": "Matching {count, plural, one {filter} other {filters}}",
   "direct.group_by_conversations": "Group by conversation",
   "endorsed_accounts_editor.endorsed_accounts": "Featured accounts",
   "favourite_modal.combo": "You can press {combo} to skip this next time",
diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index aa96ef6b209628..35342a1da4c12c 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -6523,6 +6523,25 @@ a.status-card {
     }
   }
 
+  &__confirmation {
+    font-size: 14px;
+    line-height: 20px;
+    color: $darker-text-color;
+
+    h1 {
+      font-size: 16px;
+      line-height: 24px;
+      color: $primary-text-color;
+      font-weight: 500;
+      margin-bottom: 8px;
+    }
+
+    strong {
+      font-weight: 700;
+      color: $primary-text-color;
+    }
+  }
+
   &__bullet-points {
     display: flex;
     flex-direction: column;
@@ -6609,11 +6628,8 @@ a.status-card {
 
 .doodle-modal,
 .boost-modal,
-.confirmation-modal,
 .report-modal,
 .actions-modal,
-.mute-modal,
-.block-modal,
 .compare-history-modal {
   background: lighten($ui-secondary-color, 8%);
   color: $inverted-text-color;
@@ -6648,10 +6664,7 @@ a.status-card {
 }
 
 .doodle-modal__action-bar,
-.boost-modal__action-bar,
-.confirmation-modal__action-bar,
-.mute-modal__action-bar,
-.block-modal__action-bar {
+.boost-modal__action-bar {
   display: flex;
   justify-content: space-between;
   align-items: center;
@@ -6674,16 +6687,6 @@ a.status-card {
   }
 }
 
-.mute-modal,
-.block-modal {
-  line-height: 24px;
-}
-
-.mute-modal .react-toggle,
-.block-modal .react-toggle {
-  vertical-align: middle;
-}
-
 .report-modal {
   width: 90vw;
   max-width: 700px;
@@ -7078,31 +7081,7 @@ a.status-card {
   }
 }
 
-.confirmation-modal__action-bar,
-.mute-modal__action-bar,
-.block-modal__action-bar {
-  .confirmation-modal__secondary-button {
-    flex-shrink: 1;
-  }
-}
-
-.confirmation-modal__secondary-button,
-.confirmation-modal__cancel-button,
-.mute-modal__cancel-button,
-.block-modal__cancel-button {
-  background-color: transparent;
-  color: $lighter-text-color;
-  font-size: 14px;
-  font-weight: 500;
-
-  &:hover,
-  &:focus,
-  &:active {
-    color: darken($lighter-text-color, 4%);
-    background-color: transparent;
-  }
-}
-
+// TODO
 .confirmation-modal__do_not_ask_again {
   padding-inline-start: 20px;
   padding-inline-end: 20px;
@@ -7115,9 +7094,6 @@ a.status-card {
   }
 }
 
-.confirmation-modal__container,
-.mute-modal__container,
-.block-modal__container,
 .report-modal__target {
   padding: 30px;
   font-size: 16px;
@@ -7151,31 +7127,10 @@ a.status-card {
   }
 }
 
-.confirmation-modal__container,
 .report-modal__target {
   text-align: center;
 }
 
-.block-modal,
-.mute-modal {
-  &__explanation {
-    margin-top: 20px;
-  }
-
-  .setting-toggle {
-    margin-top: 20px;
-    margin-bottom: 24px;
-    display: flex;
-    align-items: center;
-
-    &__label {
-      color: $inverted-text-color;
-      margin: 0;
-      margin-inline-start: 8px;
-    }
-  }
-}
-
 .report-modal__target {
   padding: 15px;
 

From 0e18e1ba31034ac103c7a7b5acd0e7cd299ed062 Mon Sep 17 00:00:00 2001
From: David Roetzel <david@roetzel.de>
Date: Fri, 26 Jul 2024 11:36:54 +0200
Subject: [PATCH 1640/2191] [Glitch] Decrease count of filtered notifications
 when notification requests are accepted or dismissed

Port dfd43869c9180d4f4ebfc26ebce30f468a8f5422 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../glitch/actions/notification_policies.ts   |  6 +++++
 .../flavours/glitch/actions/notifications.js  | 15 +++++++++++--
 .../glitch/reducers/notification_policy.ts    | 22 +++++++++++++------
 3 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/app/javascript/flavours/glitch/actions/notification_policies.ts b/app/javascript/flavours/glitch/actions/notification_policies.ts
index 76452de324b426..65b9882d3baf14 100644
--- a/app/javascript/flavours/glitch/actions/notification_policies.ts
+++ b/app/javascript/flavours/glitch/actions/notification_policies.ts
@@ -1,3 +1,5 @@
+import { createAction } from '@reduxjs/toolkit';
+
 import {
   apiGetNotificationPolicy,
   apiUpdateNotificationsPolicy,
@@ -14,3 +16,7 @@ export const updateNotificationsPolicy = createDataLoadingThunk(
   'notificationPolicy/update',
   (policy: Partial<NotificationPolicy>) => apiUpdateNotificationsPolicy(policy),
 );
+
+export const decreasePendingNotificationsCount = createAction<number>(
+  'notificationPolicy/decreasePendingNotificationCount',
+);
diff --git a/app/javascript/flavours/glitch/actions/notifications.js b/app/javascript/flavours/glitch/actions/notifications.js
index 7a97e71bdd22e5..fc879dce64ffff 100644
--- a/app/javascript/flavours/glitch/actions/notifications.js
+++ b/app/javascript/flavours/glitch/actions/notifications.js
@@ -18,6 +18,7 @@ import {
   importFetchedStatuses,
 } from './importer';
 import { submitMarkers } from './markers';
+import { decreasePendingNotificationsCount } from './notification_policies';
 import { notificationsUpdate } from "./notifications_typed";
 import { register as registerPushNotifications } from './push_notifications';
 import { saveSettings } from './settings';
@@ -96,6 +97,12 @@ const fetchRelatedRelationships = (dispatch, notifications) => {
   }
 };
 
+const selectNotificationCountForRequest = (state, id) => {
+  const requests = state.getIn(['notificationRequests', 'items']);
+  const thisRequest = requests.find(request => request.get('id') === id);
+  return thisRequest ? thisRequest.get('notifications_count') : 0;
+};
+
 export const loadPending = () => ({
   type: NOTIFICATIONS_LOAD_PENDING,
 });
@@ -521,11 +528,13 @@ export const fetchNotificationRequestFail = (id, error) => ({
   error,
 });
 
-export const acceptNotificationRequest = id => (dispatch) => {
+export const acceptNotificationRequest = (id) => (dispatch, getState) => {
+  const count = selectNotificationCountForRequest(getState(), id);
   dispatch(acceptNotificationRequestRequest(id));
 
   api().post(`/api/v1/notifications/requests/${id}/accept`).then(() => {
     dispatch(acceptNotificationRequestSuccess(id));
+    dispatch(decreasePendingNotificationsCount(count));
   }).catch(err => {
     dispatch(acceptNotificationRequestFail(id, err));
   });
@@ -547,11 +556,13 @@ export const acceptNotificationRequestFail = (id, error) => ({
   error,
 });
 
-export const dismissNotificationRequest = id => (dispatch) => {
+export const dismissNotificationRequest = (id) => (dispatch, getState) => {
+  const count = selectNotificationCountForRequest(getState(), id);
   dispatch(dismissNotificationRequestRequest(id));
 
   api().post(`/api/v1/notifications/requests/${id}/dismiss`).then(() =>{
     dispatch(dismissNotificationRequestSuccess(id));
+    dispatch(decreasePendingNotificationsCount(count));
   }).catch(err => {
     dispatch(dismissNotificationRequestFail(id, err));
   });
diff --git a/app/javascript/flavours/glitch/reducers/notification_policy.ts b/app/javascript/flavours/glitch/reducers/notification_policy.ts
index 2d5450ce448e39..0ec68f89506601 100644
--- a/app/javascript/flavours/glitch/reducers/notification_policy.ts
+++ b/app/javascript/flavours/glitch/reducers/notification_policy.ts
@@ -2,17 +2,25 @@ import { createReducer, isAnyOf } from '@reduxjs/toolkit';
 
 import {
   fetchNotificationPolicy,
+  decreasePendingNotificationsCount,
   updateNotificationsPolicy,
 } from 'flavours/glitch/actions/notification_policies';
 import type { NotificationPolicy } from 'flavours/glitch/models/notification_policy';
 
 export const notificationPolicyReducer =
   createReducer<NotificationPolicy | null>(null, (builder) => {
-    builder.addMatcher(
-      isAnyOf(
-        fetchNotificationPolicy.fulfilled,
-        updateNotificationsPolicy.fulfilled,
-      ),
-      (_state, action) => action.payload,
-    );
+    builder
+      .addCase(decreasePendingNotificationsCount, (state, action) => {
+        if (state) {
+          state.summary.pending_notifications_count -= action.payload;
+          state.summary.pending_requests_count -= 1;
+        }
+      })
+      .addMatcher(
+        isAnyOf(
+          fetchNotificationPolicy.fulfilled,
+          updateNotificationsPolicy.fulfilled,
+        ),
+        (_state, action) => action.payload,
+      );
   });

From 90d6297191ddf5ebd9e290d9725df96cfda00681 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 29 Jul 2024 10:06:12 +0200
Subject: [PATCH 1641/2191] chore(deps): update eslint (non-major) (#31188)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 package.json |   2 +-
 yarn.lock    | 218 ++++++++++++++++++++++++---------------------------
 2 files changed, 102 insertions(+), 118 deletions(-)

diff --git a/package.json b/package.json
index 385b8fb5b4145c..18983b43e34cc0 100644
--- a/package.json
+++ b/package.json
@@ -180,7 +180,7 @@
     "eslint-plugin-import": "~2.29.0",
     "eslint-plugin-jsdoc": "^48.0.0",
     "eslint-plugin-jsx-a11y": "~6.9.0",
-    "eslint-plugin-promise": "~6.4.0",
+    "eslint-plugin-promise": "~6.6.0",
     "eslint-plugin-react": "^7.33.2",
     "eslint-plugin-react-hooks": "^4.6.0",
     "husky": "^9.0.11",
diff --git a/yarn.lock b/yarn.lock
index 692787093a46be..d71e73b09ab67a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2153,17 +2153,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@es-joy/jsdoccomment@npm:~0.43.1":
-  version: 0.43.1
-  resolution: "@es-joy/jsdoccomment@npm:0.43.1"
+"@es-joy/jsdoccomment@npm:~0.46.0":
+  version: 0.46.0
+  resolution: "@es-joy/jsdoccomment@npm:0.46.0"
   dependencies:
-    "@types/eslint": "npm:^8.56.5"
-    "@types/estree": "npm:^1.0.5"
-    "@typescript-eslint/types": "npm:^7.2.0"
     comment-parser: "npm:1.4.1"
-    esquery: "npm:^1.5.0"
+    esquery: "npm:^1.6.0"
     jsdoc-type-pratt-parser: "npm:~4.0.0"
-  checksum: 10c0/2a4842b0e37eb937d55e3028ab2cd7ece7097e1f8c878bb9e28c3309371844688c2869d25bb949e2664c9ba63e388ea09b769c9f42f77515d328ec40e6fcfed1
+  checksum: 10c0/a7a67936ebf6d9aaf74af018c3ac744769af3552b05ad9b88fca96b2ffdca16e724b0ff497f53634ec4cca81e98d8c471b6b6bde0fa5b725af4222ad9a0707f0
   languageName: node
   linkType: hard
 
@@ -2845,7 +2842,7 @@ __metadata:
     eslint-plugin-import: "npm:~2.29.0"
     eslint-plugin-jsdoc: "npm:^48.0.0"
     eslint-plugin-jsx-a11y: "npm:~6.9.0"
-    eslint-plugin-promise: "npm:~6.4.0"
+    eslint-plugin-promise: "npm:~6.6.0"
     eslint-plugin-react: "npm:^7.33.2"
     eslint-plugin-react-hooks: "npm:^4.6.0"
     file-loader: "npm:^6.2.0"
@@ -3538,7 +3535,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/eslint@npm:7 || 8, @types/eslint@npm:^8.56.5":
+"@types/eslint@npm:7 || 8":
   version: 8.56.10
   resolution: "@types/eslint@npm:8.56.10"
   dependencies:
@@ -3548,7 +3545,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/estree@npm:*, @types/estree@npm:^1.0.0, @types/estree@npm:^1.0.5":
+"@types/estree@npm:*, @types/estree@npm:^1.0.0":
   version: 1.0.5
   resolution: "@types/estree@npm:1.0.5"
   checksum: 10c0/b3b0e334288ddb407c7b3357ca67dbee75ee22db242ca7c56fe27db4e1a31989cb8af48a84dd401deb787fe10cc6b2ab1ee82dc4783be87ededbe3d53c79c70d
@@ -4125,14 +4122,14 @@ __metadata:
   linkType: hard
 
 "@typescript-eslint/eslint-plugin@npm:^7.0.0":
-  version: 7.14.1
-  resolution: "@typescript-eslint/eslint-plugin@npm:7.14.1"
+  version: 7.17.0
+  resolution: "@typescript-eslint/eslint-plugin@npm:7.17.0"
   dependencies:
     "@eslint-community/regexpp": "npm:^4.10.0"
-    "@typescript-eslint/scope-manager": "npm:7.14.1"
-    "@typescript-eslint/type-utils": "npm:7.14.1"
-    "@typescript-eslint/utils": "npm:7.14.1"
-    "@typescript-eslint/visitor-keys": "npm:7.14.1"
+    "@typescript-eslint/scope-manager": "npm:7.17.0"
+    "@typescript-eslint/type-utils": "npm:7.17.0"
+    "@typescript-eslint/utils": "npm:7.17.0"
+    "@typescript-eslint/visitor-keys": "npm:7.17.0"
     graphemer: "npm:^1.4.0"
     ignore: "npm:^5.3.1"
     natural-compare: "npm:^1.4.0"
@@ -4143,25 +4140,25 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 10c0/7c2b9b98a38d78326b0ff7348fe001203eda10817ca7834a7a01f492ae7c2508469bbafaa933208d6459f8ff6685277685983cf6f6843e556a6ab2aa5c05080c
+  checksum: 10c0/654d589531ae45b8ca8f3969e785926b2544100a985968d86c828e2a1ff50331250e19c8b4af83a4ba17847a0047479662eb317e4ad94f6279cac03acd5cda5a
   languageName: node
   linkType: hard
 
 "@typescript-eslint/parser@npm:^7.0.0":
-  version: 7.14.1
-  resolution: "@typescript-eslint/parser@npm:7.14.1"
+  version: 7.17.0
+  resolution: "@typescript-eslint/parser@npm:7.17.0"
   dependencies:
-    "@typescript-eslint/scope-manager": "npm:7.14.1"
-    "@typescript-eslint/types": "npm:7.14.1"
-    "@typescript-eslint/typescript-estree": "npm:7.14.1"
-    "@typescript-eslint/visitor-keys": "npm:7.14.1"
+    "@typescript-eslint/scope-manager": "npm:7.17.0"
+    "@typescript-eslint/types": "npm:7.17.0"
+    "@typescript-eslint/typescript-estree": "npm:7.17.0"
+    "@typescript-eslint/visitor-keys": "npm:7.17.0"
     debug: "npm:^4.3.4"
   peerDependencies:
     eslint: ^8.56.0
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 10c0/db3169d4852685cfb27db741c557f58a3e52104bfacc7621beb7c94ec36ac2a08d4e410ac86745db52f482fbfc87e99fa0a26c1d7a10d37a215cce85e1661f0e
+  checksum: 10c0/0cf6922412517b4c005609b035119ddd2798e1b6e74e1bccd487aa53119d27067cfd89311f00b8e96b2b044a0fb7373418a16552be86079879158b260c397418
   languageName: node
   linkType: hard
 
@@ -4175,22 +4172,22 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/scope-manager@npm:7.14.1":
-  version: 7.14.1
-  resolution: "@typescript-eslint/scope-manager@npm:7.14.1"
+"@typescript-eslint/scope-manager@npm:7.17.0":
+  version: 7.17.0
+  resolution: "@typescript-eslint/scope-manager@npm:7.17.0"
   dependencies:
-    "@typescript-eslint/types": "npm:7.14.1"
-    "@typescript-eslint/visitor-keys": "npm:7.14.1"
-  checksum: 10c0/f8c05a0d6f8de4cc19b90a4da308817c66e53f36f7ec48f6cc23e93c7399bc418643d8135933aaf5fc013199cbef0e1ea4223f5147db5ca401b239eaf087011e
+    "@typescript-eslint/types": "npm:7.17.0"
+    "@typescript-eslint/visitor-keys": "npm:7.17.0"
+  checksum: 10c0/e1a693e19dc855fe6d04b46c6c205019bfc937eda5f8b255393f8267ebddd282165568336e37b04aab544b155a807784b9c4a92129dfc7c1eef5a9e9fe052685
   languageName: node
   linkType: hard
 
-"@typescript-eslint/type-utils@npm:7.14.1":
-  version: 7.14.1
-  resolution: "@typescript-eslint/type-utils@npm:7.14.1"
+"@typescript-eslint/type-utils@npm:7.17.0":
+  version: 7.17.0
+  resolution: "@typescript-eslint/type-utils@npm:7.17.0"
   dependencies:
-    "@typescript-eslint/typescript-estree": "npm:7.14.1"
-    "@typescript-eslint/utils": "npm:7.14.1"
+    "@typescript-eslint/typescript-estree": "npm:7.17.0"
+    "@typescript-eslint/utils": "npm:7.17.0"
     debug: "npm:^4.3.4"
     ts-api-utils: "npm:^1.3.0"
   peerDependencies:
@@ -4198,7 +4195,7 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 10c0/bd1c4a8db6273e24156fb10da2cbeb52b4eb03f819da193d4b6bd5a95db3b5524c6fe00d088308d8855b9ae60a3b82afa3a06e89982a09a8573561da960758fd
+  checksum: 10c0/b415cf37c0922cded78735c5049cb5a5b0065e1c0ce4a81ca2a26422763ccacca8945efa45480f40530f2ec414a14d35a88a6798258aa889f7a9cf4ca4a240cd
   languageName: node
   linkType: hard
 
@@ -4209,10 +4206,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/types@npm:7.14.1, @typescript-eslint/types@npm:^7.2.0":
-  version: 7.14.1
-  resolution: "@typescript-eslint/types@npm:7.14.1"
-  checksum: 10c0/5b7bda83c47a9b386482e63447c6b0ed7bd4e82eb43f11a180c6e2f3d2e7a2828f57bcbed82196ad761c49e363cccf4c81a89f1fc976e9f5f0a79dcc928fa2d2
+"@typescript-eslint/types@npm:7.17.0":
+  version: 7.17.0
+  resolution: "@typescript-eslint/types@npm:7.17.0"
+  checksum: 10c0/8f734294d432b37c534f17eb2befdfe43b76874d09118d6adf7e308e5a586e9e11b7021abe4f6692a6e6226de58a15b3cfe1300939556ce1c908d9af627b7400
   languageName: node
   linkType: hard
 
@@ -4235,12 +4232,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/typescript-estree@npm:7.14.1":
-  version: 7.14.1
-  resolution: "@typescript-eslint/typescript-estree@npm:7.14.1"
+"@typescript-eslint/typescript-estree@npm:7.17.0":
+  version: 7.17.0
+  resolution: "@typescript-eslint/typescript-estree@npm:7.17.0"
   dependencies:
-    "@typescript-eslint/types": "npm:7.14.1"
-    "@typescript-eslint/visitor-keys": "npm:7.14.1"
+    "@typescript-eslint/types": "npm:7.17.0"
+    "@typescript-eslint/visitor-keys": "npm:7.17.0"
     debug: "npm:^4.3.4"
     globby: "npm:^11.1.0"
     is-glob: "npm:^4.0.3"
@@ -4250,21 +4247,21 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 10c0/a8da9bcc4de3334a225424946abd99374de05c42098455419224bc0f46bb1b66115f8bd6ae268461294b90943ed4a407bcd255c0fa60eb76ba4cdc5fc7c20855
+  checksum: 10c0/10967823ce00c9f8cd4a8b56bed3524c098e38cc0e27aaa49ffd8fad4e671c00226bf0330ba858948750b88dc55527ebeb62c74be8a30bac18a106d6c033ab59
   languageName: node
   linkType: hard
 
-"@typescript-eslint/utils@npm:7.14.1":
-  version: 7.14.1
-  resolution: "@typescript-eslint/utils@npm:7.14.1"
+"@typescript-eslint/utils@npm:7.17.0":
+  version: 7.17.0
+  resolution: "@typescript-eslint/utils@npm:7.17.0"
   dependencies:
     "@eslint-community/eslint-utils": "npm:^4.4.0"
-    "@typescript-eslint/scope-manager": "npm:7.14.1"
-    "@typescript-eslint/types": "npm:7.14.1"
-    "@typescript-eslint/typescript-estree": "npm:7.14.1"
+    "@typescript-eslint/scope-manager": "npm:7.17.0"
+    "@typescript-eslint/types": "npm:7.17.0"
+    "@typescript-eslint/typescript-estree": "npm:7.17.0"
   peerDependencies:
     eslint: ^8.56.0
-  checksum: 10c0/c7f635a3c2c6c085e1d51a52088e55cad9d7e1257b1f60378e5eeb6eb0871db027d42747e9ef60a2f557cf9dd68b2ce014d488d795db8f771506290b164b0e5a
+  checksum: 10c0/1f3e22820b3ab3e47809c45e576614ad4a965f5c8634856eca5c70981386b9351a77fb172ba32345e7c5667479cf9526c673699dd38dccd0616ad6db21704e72
   languageName: node
   linkType: hard
 
@@ -4295,13 +4292,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/visitor-keys@npm:7.14.1":
-  version: 7.14.1
-  resolution: "@typescript-eslint/visitor-keys@npm:7.14.1"
+"@typescript-eslint/visitor-keys@npm:7.17.0":
+  version: 7.17.0
+  resolution: "@typescript-eslint/visitor-keys@npm:7.17.0"
   dependencies:
-    "@typescript-eslint/types": "npm:7.14.1"
+    "@typescript-eslint/types": "npm:7.17.0"
     eslint-visitor-keys: "npm:^3.4.3"
-  checksum: 10c0/39ac489990fcfdcee442f27658431a0eb44ccf694f701a45df2a108c47cea9582e0955bff0d449047549149385f72895a5d7e6c1622ece1fe32594b7cecb85f3
+  checksum: 10c0/fa6b339d51fc3710288bb2ffaa46d639551d77965cc42c36f96c4f43aed663ff12972e8a28652a280f6ce20b7a92dc2aea14b2b4049012799be2fc2d3cbb2c60
   languageName: node
   linkType: hard
 
@@ -4962,18 +4959,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"array.prototype.toreversed@npm:^1.1.2":
-  version: 1.1.2
-  resolution: "array.prototype.toreversed@npm:1.1.2"
-  dependencies:
-    call-bind: "npm:^1.0.2"
-    define-properties: "npm:^1.2.0"
-    es-abstract: "npm:^1.22.1"
-    es-shim-unscopables: "npm:^1.0.0"
-  checksum: 10c0/2b7627ea85eae1e80ecce665a500cc0f3355ac83ee4a1a727562c7c2a1d5f1c0b4dd7b65c468ec6867207e452ba01256910a2c0b41486bfdd11acf875a7a3435
-  languageName: node
-  linkType: hard
-
 "array.prototype.tosorted@npm:^1.1.4":
   version: 1.1.4
   resolution: "array.prototype.tosorted@npm:1.1.4"
@@ -7931,22 +7916,22 @@ __metadata:
   linkType: hard
 
 "eslint-plugin-jsdoc@npm:^48.0.0":
-  version: 48.5.0
-  resolution: "eslint-plugin-jsdoc@npm:48.5.0"
+  version: 48.8.3
+  resolution: "eslint-plugin-jsdoc@npm:48.8.3"
   dependencies:
-    "@es-joy/jsdoccomment": "npm:~0.43.1"
+    "@es-joy/jsdoccomment": "npm:~0.46.0"
     are-docs-informative: "npm:^0.0.2"
     comment-parser: "npm:1.4.1"
-    debug: "npm:^4.3.4"
+    debug: "npm:^4.3.5"
     escape-string-regexp: "npm:^4.0.0"
-    esquery: "npm:^1.5.0"
-    parse-imports: "npm:^2.1.0"
-    semver: "npm:^7.6.2"
+    esquery: "npm:^1.6.0"
+    parse-imports: "npm:^2.1.1"
+    semver: "npm:^7.6.3"
     spdx-expression-parse: "npm:^4.0.0"
-    synckit: "npm:^0.9.0"
+    synckit: "npm:^0.9.1"
   peerDependencies:
     eslint: ^7.0.0 || ^8.0.0 || ^9.0.0
-  checksum: 10c0/1c5eb83df06cb228e44ad2c9da5b31987347a45b99d9e7a68957d178487a81603ad3c4c7db1ecba7e8a62d7ae20d9de1aec18a8cf2aa0e9169731cec54f78ab7
+  checksum: 10c0/78d893614b188617de5a03d8163406455e3b739fd7b86192eb05a29cf8e7f06909a6f6a1b9dc2acd31e5ae2bccd94600eaea247d277f58c3c946c0fdb36a57f7
   languageName: node
   linkType: hard
 
@@ -7976,12 +7961,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint-plugin-promise@npm:~6.4.0":
-  version: 6.4.0
-  resolution: "eslint-plugin-promise@npm:6.4.0"
+"eslint-plugin-promise@npm:~6.6.0":
+  version: 6.6.0
+  resolution: "eslint-plugin-promise@npm:6.6.0"
   peerDependencies:
     eslint: ^7.0.0 || ^8.0.0 || ^9.0.0
-  checksum: 10c0/5d07be976504f92d1d91756b0b0588a4c65e379af2520dd77c8655203085c0ab43e24d4698d1ac4b50926430cd8eb81cd1cc4c3653aae8386c805577bdf57b6c
+  checksum: 10c0/93a667dbc9ff15c4d586b0d40a31c7828314cbbb31b2b9a75802aa4ef536e9457bb3e1a89b384b07aa336dd61b315ae8b0aadc0870210378023dd018819b59b3
   languageName: node
   linkType: hard
 
@@ -7995,30 +7980,30 @@ __metadata:
   linkType: hard
 
 "eslint-plugin-react@npm:^7.33.2":
-  version: 7.34.3
-  resolution: "eslint-plugin-react@npm:7.34.3"
+  version: 7.35.0
+  resolution: "eslint-plugin-react@npm:7.35.0"
   dependencies:
     array-includes: "npm:^3.1.8"
     array.prototype.findlast: "npm:^1.2.5"
     array.prototype.flatmap: "npm:^1.3.2"
-    array.prototype.toreversed: "npm:^1.1.2"
     array.prototype.tosorted: "npm:^1.1.4"
     doctrine: "npm:^2.1.0"
     es-iterator-helpers: "npm:^1.0.19"
     estraverse: "npm:^5.3.0"
+    hasown: "npm:^2.0.2"
     jsx-ast-utils: "npm:^2.4.1 || ^3.0.0"
     minimatch: "npm:^3.1.2"
     object.entries: "npm:^1.1.8"
     object.fromentries: "npm:^2.0.8"
-    object.hasown: "npm:^1.1.4"
     object.values: "npm:^1.2.0"
     prop-types: "npm:^15.8.1"
     resolve: "npm:^2.0.0-next.5"
     semver: "npm:^6.3.1"
     string.prototype.matchall: "npm:^4.0.11"
+    string.prototype.repeat: "npm:^1.0.0"
   peerDependencies:
-    eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8
-  checksum: 10c0/60717e32c9948e2b4ddc53dac7c4b62c68fc7129c3249079191c941c08ebe7d1f4793d65182922d19427c2a6634e05231a7b74ceee34169afdfd0e43d4a43d26
+    eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8 || ^9.7
+  checksum: 10c0/eedcc33de4b2cda91d56ae517a4f771a0c76da9c1e26c95543969012871381e11d4d6cffdf6fa8423036585c289eb3500f3f93fb1d314fb2624e0aa1e463305e
   languageName: node
   linkType: hard
 
@@ -8118,12 +8103,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"esquery@npm:^1.4.2, esquery@npm:^1.5.0":
-  version: 1.5.0
-  resolution: "esquery@npm:1.5.0"
+"esquery@npm:^1.4.2, esquery@npm:^1.6.0":
+  version: 1.6.0
+  resolution: "esquery@npm:1.6.0"
   dependencies:
     estraverse: "npm:^5.1.0"
-  checksum: 10c0/a084bd049d954cc88ac69df30534043fb2aee5555b56246493f42f27d1e168f00d9e5d4192e46f10290d312dc30dc7d58994d61a609c579c1219d636996f9213
+  checksum: 10c0/cb9065ec605f9da7a76ca6dadb0619dfb611e37a81e318732977d90fab50a256b95fee2d925fba7c2f3f0523aa16f91587246693bc09bc34d5a59575fe6e93d2
   languageName: node
   linkType: hard
 
@@ -12518,17 +12503,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"object.hasown@npm:^1.1.4":
-  version: 1.1.4
-  resolution: "object.hasown@npm:1.1.4"
-  dependencies:
-    define-properties: "npm:^1.2.1"
-    es-abstract: "npm:^1.23.2"
-    es-object-atoms: "npm:^1.0.0"
-  checksum: 10c0/f23187b08d874ef1aea060118c8259eb7f99f93c15a50771d710569534119062b90e087b92952b2d0fb1bb8914d61fb0b43c57fb06f622aaad538fe6868ab987
-  languageName: node
-  linkType: hard
-
 "object.pick@npm:^1.3.0":
   version: 1.3.0
   resolution: "object.pick@npm:1.3.0"
@@ -12774,13 +12748,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"parse-imports@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "parse-imports@npm:2.1.0"
+"parse-imports@npm:^2.1.1":
+  version: 2.1.1
+  resolution: "parse-imports@npm:2.1.1"
   dependencies:
     es-module-lexer: "npm:^1.5.3"
     slashes: "npm:^3.0.12"
-  checksum: 10c0/18ef58008868d2d09e472bb540d63efc7cc27f2c33607e5d09c256ece7a30062cac292bda96d820438e94f3dbf558c85e4b084c10d238baa858796794e6cf628
+  checksum: 10c0/c9bb0b4e1823f84f034d2d7bd2b37415b1715a5c963fda14968c706186b48b02c10e97d04bce042b9dcd679b42f29c391ea120799ddf581c7f54786edd99e3a9
   languageName: node
   linkType: hard
 
@@ -15574,12 +15548,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.5.3, semver@npm:^7.5.4, semver@npm:^7.6.0, semver@npm:^7.6.2":
-  version: 7.6.2
-  resolution: "semver@npm:7.6.2"
+"semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.5.3, semver@npm:^7.5.4, semver@npm:^7.6.0, semver@npm:^7.6.3":
+  version: 7.6.3
+  resolution: "semver@npm:7.6.3"
   bin:
     semver: bin/semver.js
-  checksum: 10c0/97d3441e97ace8be4b1976433d1c32658f6afaff09f143e52c593bae7eef33de19e3e369c88bd985ce1042c6f441c80c6803078d1de2a9988080b66684cbb30c
+  checksum: 10c0/88f33e148b210c153873cb08cfe1e281d518aaa9a666d4d148add6560db5cd3c582f3a08ccb91f38d5f379ead256da9931234ed122057f40bb5766e65e58adaf
   languageName: node
   linkType: hard
 
@@ -16365,6 +16339,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"string.prototype.repeat@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "string.prototype.repeat@npm:1.0.0"
+  dependencies:
+    define-properties: "npm:^1.1.3"
+    es-abstract: "npm:^1.17.5"
+  checksum: 10c0/94c7978566cffa1327d470fd924366438af9b04b497c43a9805e476e2e908aa37a1fd34cc0911156c17556dab62159d12c7b92b3cc304c3e1281fe4c8e668f40
+  languageName: node
+  linkType: hard
+
 "string.prototype.trim@npm:^1.2.9":
   version: 1.2.9
   resolution: "string.prototype.trim@npm:1.2.9"
@@ -16788,13 +16772,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"synckit@npm:^0.9.0":
-  version: 0.9.0
-  resolution: "synckit@npm:0.9.0"
+"synckit@npm:^0.9.1":
+  version: 0.9.1
+  resolution: "synckit@npm:0.9.1"
   dependencies:
     "@pkgr/core": "npm:^0.1.0"
     tslib: "npm:^2.6.2"
-  checksum: 10c0/b5c1e7c03fefe3d36a9ab4e71dd21859cb32be4138712c31a893382a568fd00efc59ede8f521dd7e53d43a2fea92bdf717e987ea9ed6ad94f97ef28d71d0ba2f
+  checksum: 10c0/d8b89e1bf30ba3ffb469d8418c836ad9c0c062bf47028406b4d06548bc66af97155ea2303b96c93bf5c7c0f0d66153a6fbd6924c76521b434e6a9898982abc2e
   languageName: node
   linkType: hard
 

From cefd8b54848d111c4a6ad8366ed2951768311be2 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 29 Jul 2024 08:06:53 +0000
Subject: [PATCH 1642/2191] chore(deps): update dependency husky to v9.1.3
 (#31185)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index d71e73b09ab67a..8a65f7672f4a35 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9511,11 +9511,11 @@ __metadata:
   linkType: hard
 
 "husky@npm:^9.0.11":
-  version: 9.1.2
-  resolution: "husky@npm:9.1.2"
+  version: 9.1.3
+  resolution: "husky@npm:9.1.3"
   bin:
     husky: bin.js
-  checksum: 10c0/7e25c31ef98ac35d357147005d6e5d87db2abca7297e7c5aac931de3699acd32a3f1a9f8e53f101daeab818f0cfe9d18fa7e34f7cf5c9c4437c3665123456dea
+  checksum: 10c0/3fb8657ff97f529dab0b9a0afa6b818ec604f60c39abc13e8e3f4263ea30a3aa6fff7a1b625b8a53700899ce0ea2f5f656981c46b8f1837cfd84ddb6da883fb2
   languageName: node
   linkType: hard
 

From 4cc634dc4454148b918b27057703ccfab8950a47 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 29 Jul 2024 10:07:28 +0200
Subject: [PATCH 1643/2191] fix(deps): update dependency use-debounce to
 v10.0.2 (#31177)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 8a65f7672f4a35..2c90f719e2567d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -17519,11 +17519,11 @@ __metadata:
   linkType: hard
 
 "use-debounce@npm:^10.0.0":
-  version: 10.0.1
-  resolution: "use-debounce@npm:10.0.1"
+  version: 10.0.2
+  resolution: "use-debounce@npm:10.0.2"
   peerDependencies:
     react: ">=16.8.0"
-  checksum: 10c0/377a11814a708f5c392f465cbbe2d119a8a2635c8226cc5e30eba397c4436f8e8234385d069467b369d105ed0d3be733c6a08d8ae1004017c6d6f58f4d4c24d8
+  checksum: 10c0/2d992108557a0ad3e59bc35028c0dbc6ad12088a08d992fd52aad3881dd24663606fe71f7fd925327fb98599c6252bfa4c143649351d48e6243d7a3332594fd6
   languageName: node
   linkType: hard
 

From 37f57184824e8ca688314bfdb34e359fc36f0a43 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 29 Jul 2024 08:08:07 +0000
Subject: [PATCH 1644/2191] chore(deps): update dependency sanitize to v6.1.2
 (#31172)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 31e317e8190e26..60d83624324bff 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -451,7 +451,7 @@ GEM
     net-smtp (0.5.0)
       net-protocol
     nio4r (2.7.3)
-    nokogiri (1.16.6)
+    nokogiri (1.16.7)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     nsa (0.3.0)
@@ -775,7 +775,7 @@ GEM
       fugit (~> 1.1, >= 1.1.6)
     safety_net_attestation (0.4.0)
       jwt (~> 2.0)
-    sanitize (6.1.1)
+    sanitize (6.1.2)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     scenic (1.8.0)

From 848a5ca53d47d335cf74e82c584c36dce701172a Mon Sep 17 00:00:00 2001
From: Michael Stanclift <mx@vmstan.com>
Date: Mon, 29 Jul 2024 03:10:23 -0500
Subject: [PATCH 1645/2191] Follow up tweaking of admin UI changes (#31168)

---
 app/javascript/styles/mastodon-light/diff.scss | 10 ----------
 app/javascript/styles/mastodon/admin.scss      |  2 +-
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/app/javascript/styles/mastodon-light/diff.scss b/app/javascript/styles/mastodon-light/diff.scss
index 635bab546018b2..0ad8e1028ea231 100644
--- a/app/javascript/styles/mastodon-light/diff.scss
+++ b/app/javascript/styles/mastodon-light/diff.scss
@@ -298,12 +298,6 @@ html {
 .directory__tag > div {
   background: $white;
   border: 1px solid var(--background-border-color);
-
-  @media screen and (max-width: $no-gap-breakpoint) {
-    border-left: 0;
-    border-right: 0;
-    border-top: 0;
-  }
 }
 
 .picture-in-picture-placeholder {
@@ -318,10 +312,6 @@ html {
   &:focus {
     background: $ui-base-color;
   }
-
-  @media screen and (max-width: $no-gap-breakpoint) {
-    border: 0;
-  }
 }
 
 .batch-table {
diff --git a/app/javascript/styles/mastodon/admin.scss b/app/javascript/styles/mastodon/admin.scss
index 7420a6fc598634..810f59b9a53894 100644
--- a/app/javascript/styles/mastodon/admin.scss
+++ b/app/javascript/styles/mastodon/admin.scss
@@ -1,6 +1,6 @@
 @use 'sass:math';
 
-$no-columns-breakpoint: 600px;
+$no-columns-breakpoint: 890px;
 $sidebar-width: 300px;
 $content-width: 840px;
 

From ec5a860924183f1f21d73c6660b9fff197b889cb Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 29 Jul 2024 10:24:15 +0200
Subject: [PATCH 1646/2191] New Crowdin Translations (automated) (#31169)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/bg.json    |  8 ++++
 app/javascript/mastodon/locales/ca.json    | 16 +++----
 app/javascript/mastodon/locales/cy.json    | 27 ++++++++++-
 app/javascript/mastodon/locales/de.json    |  2 +-
 app/javascript/mastodon/locales/es-AR.json | 10 ++--
 app/javascript/mastodon/locales/fi.json    | 40 ++++++++--------
 app/javascript/mastodon/locales/he.json    | 10 +++-
 app/javascript/mastodon/locales/ia.json    |  6 +++
 app/javascript/mastodon/locales/it.json    |  8 ++++
 app/javascript/mastodon/locales/kab.json   |  2 +
 app/javascript/mastodon/locales/lt.json    |  8 ++++
 app/javascript/mastodon/locales/sk.json    | 12 +++++
 app/javascript/mastodon/locales/sq.json    |  8 ++++
 app/javascript/mastodon/locales/sv.json    | 18 ++++++++
 app/javascript/mastodon/locales/tr.json    |  8 ++++
 app/javascript/mastodon/locales/uk.json    |  4 ++
 app/javascript/mastodon/locales/vi.json    |  8 ++++
 config/locales/bg.yml                      |  5 +-
 config/locales/cy.yml                      |  2 +
 config/locales/devise.fi.yml               |  8 ++--
 config/locales/doorkeeper.bg.yml           |  1 +
 config/locales/doorkeeper.ca.yml           |  1 +
 config/locales/doorkeeper.cy.yml           |  1 +
 config/locales/doorkeeper.da.yml           |  1 +
 config/locales/doorkeeper.de.yml           |  1 +
 config/locales/doorkeeper.es-AR.yml        |  1 +
 config/locales/doorkeeper.es-MX.yml        |  1 +
 config/locales/doorkeeper.es.yml           |  1 +
 config/locales/doorkeeper.fi.yml           |  3 +-
 config/locales/doorkeeper.fo.yml           |  1 +
 config/locales/doorkeeper.ga.yml           |  1 +
 config/locales/doorkeeper.is.yml           |  1 +
 config/locales/doorkeeper.it.yml           |  1 +
 config/locales/doorkeeper.lt.yml           |  1 +
 config/locales/doorkeeper.nl.yml           |  1 +
 config/locales/doorkeeper.pl.yml           |  1 +
 config/locales/doorkeeper.pt-PT.yml        |  1 +
 config/locales/doorkeeper.sq.yml           |  1 +
 config/locales/doorkeeper.sv.yml           |  1 +
 config/locales/doorkeeper.tr.yml           |  1 +
 config/locales/doorkeeper.uk.yml           |  1 +
 config/locales/doorkeeper.vi.yml           |  1 +
 config/locales/doorkeeper.zh-CN.yml        |  1 +
 config/locales/doorkeeper.zh-TW.yml        |  1 +
 config/locales/fi.yml                      | 54 +++++++++++-----------
 config/locales/lt.yml                      |  7 ++-
 config/locales/simple_form.cy.yml          |  1 +
 config/locales/simple_form.fi.yml          |  4 +-
 config/locales/simple_form.sv.yml          |  1 +
 config/locales/sv.yml                      |  4 ++
 50 files changed, 234 insertions(+), 73 deletions(-)

diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json
index 2161286c6c497d..b83286bf9061e6 100644
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@@ -171,21 +171,28 @@
   "confirmations.block.confirm": "Блокиране",
   "confirmations.delete.confirm": "Изтриване",
   "confirmations.delete.message": "Наистина ли искате да изтриете публикацията?",
+  "confirmations.delete.title": "Изтривате ли публикацията?",
   "confirmations.delete_list.confirm": "Изтриване",
   "confirmations.delete_list.message": "Наистина ли искате да изтриете завинаги списъка?",
+  "confirmations.delete_list.title": "Изтривате ли списъка?",
   "confirmations.discard_edit_media.confirm": "Отхвърляне",
   "confirmations.discard_edit_media.message": "Не сте запазили промени на описанието или огледа на мултимедията, отхвърляте ли ги?",
   "confirmations.edit.confirm": "Редактиране",
   "confirmations.edit.message": "Редактирането сега ще замени съобщението, което в момента съставяте. Сигурни ли сте, че искате да продължите?",
+  "confirmations.edit.title": "Презаписвате ли публикацията?",
   "confirmations.logout.confirm": "Излизане",
   "confirmations.logout.message": "Наистина ли искате да излезете?",
+  "confirmations.logout.title": "Излизате ли от системата?",
   "confirmations.mute.confirm": "Заглушаване",
   "confirmations.redraft.confirm": "Изтриване и преработване",
   "confirmations.redraft.message": "Наистина ли искате да изтриете тази публикация и да я направите чернова? Означаванията като любими и подсилванията ще се изгубят, а и отговорите към първоначалната публикация ще осиротеят.",
+  "confirmations.redraft.title": "Изтривате и преработвате ли публикацията?",
   "confirmations.reply.confirm": "Отговор",
   "confirmations.reply.message": "Отговарянето сега ще замени съобщението, което в момента съставяте. Сигурни ли сте, че искате да продължите?",
+  "confirmations.reply.title": "Презаписвате ли публикацията?",
   "confirmations.unfollow.confirm": "Без следване",
   "confirmations.unfollow.message": "Наистина ли искате да не следвате {name}?",
+  "confirmations.unfollow.title": "Спирате ли да следвате потребителя?",
   "conversation.delete": "Изтриване на разговора",
   "conversation.mark_as_read": "Маркиране като прочетено",
   "conversation.open": "Преглед на разговора",
@@ -503,6 +510,7 @@
   "notification_requests.title": "Филтрирани известия",
   "notifications.clear": "Изчистване на известията",
   "notifications.clear_confirmation": "Наистина ли искате да изчистите завинаги всичките си известия?",
+  "notifications.clear_title": "Изчиствате ли известията?",
   "notifications.column_settings.admin.report": "Нови доклади:",
   "notifications.column_settings.admin.sign_up": "Нови регистрации:",
   "notifications.column_settings.alert": "Известия на работния плот",
diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index f44d60e9c44f76..164a2cdb3a767e 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -171,28 +171,28 @@
   "confirmations.block.confirm": "Bloca",
   "confirmations.delete.confirm": "Elimina",
   "confirmations.delete.message": "Segur que vols eliminar aquest tut?",
-  "confirmations.delete.title": "Elimina la publicació?",
+  "confirmations.delete.title": "Eliminar la publicació?",
   "confirmations.delete_list.confirm": "Elimina",
   "confirmations.delete_list.message": "Segur que vols suprimir permanentment aquesta llista?",
-  "confirmations.delete_list.title": "Elimina la llista?",
+  "confirmations.delete_list.title": "Eliminar la llista?",
   "confirmations.discard_edit_media.confirm": "Descarta",
   "confirmations.discard_edit_media.message": "Tens canvis no desats en la descripció del contingut o en la previsualització, els vols descartar?",
   "confirmations.edit.confirm": "Edita",
   "confirmations.edit.message": "Editant ara sobreescriuràs el missatge que estàs editant. Segur que vols continuar?",
-  "confirmations.edit.title": "Sobreescriu la publicació?",
+  "confirmations.edit.title": "Sobreescriure la publicació?",
   "confirmations.logout.confirm": "Tanca la sessió",
   "confirmations.logout.message": "Segur que vols tancar la sessió?",
-  "confirmations.logout.title": "Tanca la sessió?",
+  "confirmations.logout.title": "Tancar la sessió?",
   "confirmations.mute.confirm": "Silencia",
   "confirmations.redraft.confirm": "Esborra i reescriu",
   "confirmations.redraft.message": "Segur que vols eliminar aquest tut i tornar a escriure'l? Es perdran tots els impulsos i els favorits, i les respostes al tut original quedaran aïllades.",
-  "confirmations.redraft.title": "Esborra i reescriu la publicació?",
+  "confirmations.redraft.title": "Esborrar i reescriure la publicació?",
   "confirmations.reply.confirm": "Respon",
   "confirmations.reply.message": "Si respons ara, sobreescriuràs el missatge que estàs editant. Segur que vols continuar?",
-  "confirmations.reply.title": "Sobreescriu la publicació?",
+  "confirmations.reply.title": "Sobreescriure la publicació?",
   "confirmations.unfollow.confirm": "Deixa de seguir",
   "confirmations.unfollow.message": "Segur que vols deixar de seguir {name}?",
-  "confirmations.unfollow.title": "Deixa de seguir l'usuari?",
+  "confirmations.unfollow.title": "Deixar de seguir l'usuari?",
   "conversation.delete": "Elimina la conversa",
   "conversation.mark_as_read": "Marca com a llegida",
   "conversation.open": "Mostra la conversa",
@@ -510,7 +510,7 @@
   "notification_requests.title": "Notificacions filtrades",
   "notifications.clear": "Esborra les notificacions",
   "notifications.clear_confirmation": "Segur que vols esborrar permanentment totes les teves notificacions?",
-  "notifications.clear_title": "Esborra les notificacions?",
+  "notifications.clear_title": "Esborrar les notificacions?",
   "notifications.column_settings.admin.report": "Nous informes:",
   "notifications.column_settings.admin.sign_up": "Registres nous:",
   "notifications.column_settings.alert": "Notificacions d'escriptori",
diff --git a/app/javascript/mastodon/locales/cy.json b/app/javascript/mastodon/locales/cy.json
index cc9d3fd855524b..828896678b1c12 100644
--- a/app/javascript/mastodon/locales/cy.json
+++ b/app/javascript/mastodon/locales/cy.json
@@ -9,7 +9,7 @@
   "about.domain_blocks.suspended.explanation": "Ni fydd data o'r gweinydd hwn yn cael ei brosesu, ei gadw na'i gyfnewid, gan wneud unrhyw ryngweithio neu gyfathrebu gyda defnyddwyr o'r gweinydd hwn yn amhosibl.",
   "about.domain_blocks.suspended.title": "Ataliwyd",
   "about.not_available": "Nid yw'r wybodaeth hon ar gael ar y gweinydd hwn.",
-  "about.powered_by": "Cyfrwng cymdeithasol datganoledig sy'n cael ei yrru gan {mastodon}",
+  "about.powered_by": "Cyfrwng cymdeithasol datganoledig wedi ei yrru gan {mastodon}",
   "about.rules": "Rheolau'r gweinydd",
   "account.account_note_header": "Nodyn",
   "account.add_or_remove_from_list": "Ychwanegu neu Ddileu o'r rhestrau",
@@ -35,7 +35,9 @@
   "account.follow_back": "Dilyn yn ôl",
   "account.followers": "Dilynwyr",
   "account.followers.empty": "Does neb yn dilyn y defnyddiwr hwn eto.",
+  "account.followers_counter": "{count, plural, one {{counter} dilynwr} two {{counter} ddilynwr} other {{counter} dilynwyr}}",
   "account.following": "Yn dilyn",
+  "account.following_counter": "{count, plural, one {Yn dilyn {counter}} other {Yn dilyn {counter}}}",
   "account.follows.empty": "Nid yw'r defnyddiwr hwn yn dilyn unrhyw un eto.",
   "account.go_to_profile": "Mynd i'r proffil",
   "account.hide_reblogs": "Cuddio hybiau gan @{name}",
@@ -61,6 +63,7 @@
   "account.requested_follow": "Mae {name} wedi gwneud cais i'ch dilyn",
   "account.share": "Rhannwch broffil @{name}",
   "account.show_reblogs": "Dangos hybiau gan @{name}",
+  "account.statuses_counter": "{count, plural, one {{counter} post} two {{counter} bost} few {{counter} phost} many {{counter} post} other {{counter} post}}",
   "account.unblock": "Dadflocio @{name}",
   "account.unblock_domain": "Dadflocio parth {domain}",
   "account.unblock_short": "Dadflocio",
@@ -168,21 +171,28 @@
   "confirmations.block.confirm": "Blocio",
   "confirmations.delete.confirm": "Dileu",
   "confirmations.delete.message": "Ydych chi'n sicr eich bod eisiau dileu y post hwn?",
+  "confirmations.delete.title": "Dileu post?",
   "confirmations.delete_list.confirm": "Dileu",
   "confirmations.delete_list.message": "Ydych chi'n siŵr eich bod eisiau dileu'r rhestr hwn am byth?",
+  "confirmations.delete_list.title": "Dileu rhestr?",
   "confirmations.discard_edit_media.confirm": "Dileu",
   "confirmations.discard_edit_media.message": "Mae gennych newidiadau heb eu cadw i'r disgrifiad cyfryngau neu'r rhagolwg - eu dileu beth bynnag?",
   "confirmations.edit.confirm": "Golygu",
   "confirmations.edit.message": "Bydd golygu nawr yn trosysgrifennu'r neges rydych yn ei ysgrifennu ar hyn o bryd. Ydych chi'n siŵr eich bod eisiau gwneud hyn?",
+  "confirmations.edit.title": "Trosysgrifo post?",
   "confirmations.logout.confirm": "Allgofnodi",
   "confirmations.logout.message": "Ydych chi'n siŵr eich bod am allgofnodi?",
+  "confirmations.logout.title": "Allgofnodi?",
   "confirmations.mute.confirm": "Tewi",
   "confirmations.redraft.confirm": "Dileu ac ailddrafftio",
   "confirmations.redraft.message": "Ydych chi'n siŵr eich bod am ddileu'r postiad hwn a'i ailddrafftio? Bydd ffefrynnau a hybiau'n cael eu colli, a bydd atebion i'r post gwreiddiol yn mynd yn amddifad.",
+  "confirmations.redraft.title": "Dileu & ailddraftio post?",
   "confirmations.reply.confirm": "Ateb",
   "confirmations.reply.message": "Bydd ateb nawr yn cymryd lle y neges yr ydych yn cyfansoddi ar hyn o bryd. Ydych chi'n siŵr eich bod am barhau?",
+  "confirmations.reply.title": "Trosysgrifo post?",
   "confirmations.unfollow.confirm": "Dad-ddilyn",
   "confirmations.unfollow.message": "Ydych chi'n siŵr eich bod am ddad-ddilyn {name}?",
+  "confirmations.unfollow.title": "Dad-ddilyn defnyddiwr?",
   "conversation.delete": "Dileu sgwrs",
   "conversation.mark_as_read": "Nodi fel wedi'i ddarllen",
   "conversation.open": "Gweld sgwrs",
@@ -408,6 +418,7 @@
   "limited_account_hint.title": "Mae'r proffil hwn wedi cael ei guddio gan gymedrolwyr {domain}.",
   "link_preview.author": "Gan {name}",
   "link_preview.more_from_author": "Mwy gan {name}",
+  "link_preview.shares": "{count, plural, one {{counter} post} two {{counter} bost} few {{counter} phost} many {{counter} post} other {{counter} post}}",
   "lists.account.add": "Ychwanegu at restr",
   "lists.account.remove": "Tynnu o'r rhestr",
   "lists.delete": "Dileu rhestr",
@@ -435,6 +446,8 @@
   "mute_modal.title": "Tewi defnyddiwr?",
   "mute_modal.you_wont_see_mentions": "Welwch chi ddim postiadau sy'n sôn amdanyn nhw.",
   "mute_modal.you_wont_see_posts": "Gallan nhw weld eich postiadau o hyd, ond fyddwch chi ddim yn gweld eu rhai hwy.",
+  "name_and_others": "{name} a(c) {count, plural, one {# arall} other {# eraill}}",
+  "name_and_others_with_link": "{name} a<a>{count, plural, zero {}one {c # arall} two { # eraill} few { # eraill} many { # eraill} other { # eraill}}</a>",
   "navigation_bar.about": "Ynghylch",
   "navigation_bar.advanced_interface": "Agor mewn rhyngwyneb gwe uwch",
   "navigation_bar.blocks": "Defnyddwyr wedi eu blocio",
@@ -462,6 +475,9 @@
   "navigation_bar.security": "Diogelwch",
   "not_signed_in_indicator.not_signed_in": "Rhaid i chi fewngofnodi i weld yr adnodd hwn.",
   "notification.admin.report": "Adroddwyd ar {name} {target}",
+  "notification.admin.report_account_other": "Adroddodd {name} {count, plural, one {un post} two {# bost} few {# phost} other {# post}} gan {target}",
+  "notification.admin.report_statuses": "Adroddodd {name} {target} ar gyfer {category}",
+  "notification.admin.report_statuses_other": "Adroddodd {name} {target}",
   "notification.admin.sign_up": "Cofrestrodd {name}",
   "notification.favourite": "Hoffodd {name} eich postiad",
   "notification.follow": "Dilynodd {name} chi",
@@ -477,6 +493,8 @@
   "notification.moderation_warning.action_silence": "Mae eich cyfrif wedi'i gyfyngu.",
   "notification.moderation_warning.action_suspend": "Mae eich cyfrif wedi'i hatal.",
   "notification.own_poll": "Mae eich pleidlais wedi dod i ben",
+  "notification.poll": "Mae arolwg y gwnaethoch bleidleisio ynddo wedi dod i ben",
+  "notification.private_mention": "Mae {name} wedi eich crybwyll yn breifat",
   "notification.reblog": "Hybodd {name} eich post",
   "notification.relationships_severance_event": "Wedi colli cysylltiad â {name}",
   "notification.relationships_severance_event.account_suspension": "Mae gweinyddwr o {from} wedi atal {target}, sy'n golygu na allwch dderbyn diweddariadau ganddynt mwyach na rhyngweithio â nhw.",
@@ -491,9 +509,12 @@
   "notification_requests.title": "Hysbysiadau wedi'u hidlo",
   "notifications.clear": "Clirio hysbysiadau",
   "notifications.clear_confirmation": "Ydych chi'n siŵr eich bod am glirio'ch holl hysbysiadau am byth?",
+  "notifications.clear_title": "Clirio hysbysiadau?",
   "notifications.column_settings.admin.report": "Adroddiadau newydd:",
   "notifications.column_settings.admin.sign_up": "Cofrestriadau newydd:",
   "notifications.column_settings.alert": "Hysbysiadau bwrdd gwaith",
+  "notifications.column_settings.beta.category": "Nodweddion arbrofol",
+  "notifications.column_settings.beta.grouping": "Grŵpio hysbysiadau",
   "notifications.column_settings.favourite": "Ffefrynnau:",
   "notifications.column_settings.filter_bar.advanced": "Dangos pob categori",
   "notifications.column_settings.filter_bar.category": "Bar hidlo cyflym",
@@ -657,9 +678,13 @@
   "report.unfollow_explanation": "Rydych chi'n dilyn y cyfrif hwn. I beidio â gweld eu postiadau yn eich porthiant cartref mwyach, dad-ddilynwch nhw.",
   "report_notification.attached_statuses": "{count, plural, one {{count} postiad} arall {{count} postiad}} atodwyd",
   "report_notification.categories.legal": "Cyfreithiol",
+  "report_notification.categories.legal_sentence": "cynnwys anghyfreithlon",
   "report_notification.categories.other": "Arall",
+  "report_notification.categories.other_sentence": "arall",
   "report_notification.categories.spam": "Sbam",
+  "report_notification.categories.spam_sentence": "sbam",
   "report_notification.categories.violation": "Torri rheol",
+  "report_notification.categories.violation_sentence": "torri rheolau",
   "report_notification.open": "Agor adroddiad",
   "search.no_recent_searches": "Does dim chwiliadau diweddar",
   "search.placeholder": "Chwilio",
diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json
index 78237e45cf0be3..a4c277b8a8a59e 100644
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@@ -186,7 +186,7 @@
   "confirmations.mute.confirm": "Stummschalten",
   "confirmations.redraft.confirm": "Löschen und neu erstellen",
   "confirmations.redraft.message": "Möchtest du diesen Beitrag wirklich löschen und neu verfassen? Favoriten und geteilte Beiträge gehen verloren, und Antworten auf den ursprünglichen Beitrag verlieren den Zusammenhang.",
-  "confirmations.redraft.title": "Beitrag löschen & neu verfassen?",
+  "confirmations.redraft.title": "Beitrag löschen und neu erstellen?",
   "confirmations.reply.confirm": "Antworten",
   "confirmations.reply.message": "Wenn du jetzt darauf antwortest, wird der andere Beitrag, an dem du gerade geschrieben hast, verworfen. Möchtest du wirklich fortfahren?",
   "confirmations.reply.title": "Beitrag überschreiben?",
diff --git a/app/javascript/mastodon/locales/es-AR.json b/app/javascript/mastodon/locales/es-AR.json
index cbb99ddd6f2c03..791f66e5074597 100644
--- a/app/javascript/mastodon/locales/es-AR.json
+++ b/app/javascript/mastodon/locales/es-AR.json
@@ -171,7 +171,7 @@
   "confirmations.block.confirm": "Bloquear",
   "confirmations.delete.confirm": "Eliminar",
   "confirmations.delete.message": "¿Estás seguro que querés eliminar este mensaje?",
-  "confirmations.delete.title": "¿Eliminar publicación?",
+  "confirmations.delete.title": "¿Eliminar mensaje?",
   "confirmations.delete_list.confirm": "Eliminar",
   "confirmations.delete_list.message": "¿Estás seguro que querés eliminar permanentemente esta lista?",
   "confirmations.delete_list.title": "¿Eliminar lista?",
@@ -179,17 +179,17 @@
   "confirmations.discard_edit_media.message": "Tenés cambios sin guardar en la descripción de medios o en la vista previa, ¿querés descartarlos de todos modos?",
   "confirmations.edit.confirm": "Editar",
   "confirmations.edit.message": "Editar ahora sobreescribirá el mensaje que estás redactando actualmente. ¿Estás seguro que querés seguir?",
-  "confirmations.edit.title": "¿Sobrescribir publicación?",
+  "confirmations.edit.title": "¿Sobrescribir mensaje?",
   "confirmations.logout.confirm": "Cerrar sesión",
   "confirmations.logout.message": "¿Estás seguro que querés cerrar la sesión?",
   "confirmations.logout.title": "¿Cerrar sesión?",
   "confirmations.mute.confirm": "Silenciar",
   "confirmations.redraft.confirm": "Eliminar mensaje original y editarlo",
   "confirmations.redraft.message": "¿Estás seguro que querés eliminar este mensaje y volver a editarlo? Se perderán las veces marcadas como favorito y sus adhesiones, y las respuestas al mensaje original quedarán huérfanas.",
-  "confirmations.redraft.title": "¿Borrar y volver a redactar la publicación?",
+  "confirmations.redraft.title": "¿Eliminar y volver a redactar mensaje?",
   "confirmations.reply.confirm": "Responder",
   "confirmations.reply.message": "Responder ahora sobreescribirá el mensaje que estás redactando actualmente. ¿Estás seguro que querés seguir?",
-  "confirmations.reply.title": "¿Sobrescribir publicación?",
+  "confirmations.reply.title": "¿Sobrescribir mensaje?",
   "confirmations.unfollow.confirm": "Dejar de seguir",
   "confirmations.unfollow.message": "¿Estás seguro que querés dejar de seguir a {name}?",
   "confirmations.unfollow.title": "¿Dejar de seguir al usuario?",
@@ -510,7 +510,7 @@
   "notification_requests.title": "Notificaciones filtradas",
   "notifications.clear": "Limpiar notificaciones",
   "notifications.clear_confirmation": "¿Estás seguro que querés limpiar todas tus notificaciones permanentemente?",
-  "notifications.clear_title": "¿Borrar notificaciones?",
+  "notifications.clear_title": "¿Limpiar notificaciones?",
   "notifications.column_settings.admin.report": "Nuevas denuncias:",
   "notifications.column_settings.admin.sign_up": "Nuevos registros:",
   "notifications.column_settings.alert": "Notificaciones de escritorio",
diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index 9e0db8458cf0a4..fc1d252325e48d 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -59,7 +59,7 @@
   "account.posts": "Julkaisut",
   "account.posts_with_replies": "Julkaisut ja vastaukset",
   "account.report": "Raportoi @{name}",
-  "account.requested": "Odottaa hyväksyntää. Peruuta seuraamispyyntö napsauttamalla",
+  "account.requested": "Odottaa hyväksyntää. Peruuta seurantapyyntö napsauttamalla",
   "account.requested_follow": "{name} on pyytänyt lupaa seurata sinua",
   "account.share": "Jaa käyttäjän @{name} profiili",
   "account.show_reblogs": "Näytä käyttäjän @{name} tehostukset",
@@ -96,7 +96,7 @@
   "block_modal.they_cant_see_posts": "Hän ei voi enää nähdä julkaisujasi, etkä sinä voi nähdä hänen.",
   "block_modal.they_will_know": "Hän voi nähdä, että hänet on estetty.",
   "block_modal.title": "Estetäänkö käyttäjä?",
-  "block_modal.you_wont_see_mentions": "Et tule enää näkemään julkaisuja, joissa hänet mainitaan.",
+  "block_modal.you_wont_see_mentions": "Et näe enää julkaisuja, joissa hänet mainitaan.",
   "boost_modal.combo": "Ensi kerralla voit ohittaa tämän painamalla {combo}",
   "bundle_column_error.copy_stacktrace": "Kopioi virheraportti",
   "bundle_column_error.error.body": "Pyydettyä sivua ei voitu hahmontaa. Se voi johtua virheestä koodissamme tai selaimen yhteensopivuudessa.",
@@ -111,7 +111,7 @@
   "bundle_modal_error.message": "Jotain meni pieleen komponenttia ladattaessa.",
   "bundle_modal_error.retry": "Yritä uudelleen",
   "closed_registrations.other_server_instructions": "Koska Mastodon on hajautettu, voit luoda tilin toiselle palvelimelle ja olla silti vuorovaikutuksessa tämän kanssa.",
-  "closed_registrations_modal.description": "Tilin luonti palvelimelle {domain} ei tällä hetkellä ole mahdollista, mutta huomioi, ettei Mastodonin käyttö edellytä juuri kyseisen tuon tiliä.",
+  "closed_registrations_modal.description": "Tilin luonti palvelimelle {domain} ei tällä hetkellä ole mahdollista, mutta ota huomioon, ettei Mastodonin käyttö edellytä juuri kyseisen palvelimen tiliä.",
   "closed_registrations_modal.find_another_server": "Etsi toinen palvelin",
   "closed_registrations_modal.preamble": "Mastodon on hajautettu, joten riippumatta siitä, missä luot tilisi, voit seurata ja olla vuorovaikutuksessa kenen tahansa kanssa tällä palvelimella. Voit jopa isännöidä palvelinta!",
   "closed_registrations_modal.title": "Rekisteröityminen Mastodoniin",
@@ -124,7 +124,7 @@
   "column.domain_blocks": "Estetyt verkkotunnukset",
   "column.favourites": "Suosikit",
   "column.firehose": "Livesyötteet",
-  "column.follow_requests": "Seuraamispyynnöt",
+  "column.follow_requests": "Seurantapyynnöt",
   "column.home": "Koti",
   "column.lists": "Listat",
   "column.mutes": "Mykistetyt käyttäjät",
@@ -216,7 +216,7 @@
   "domain_block_modal.block_account_instead": "Estä sen sijaan @{name}",
   "domain_block_modal.they_can_interact_with_old_posts": "Ihmiset tältä palvelimelta eivät voi olla vuorovaikutuksessa vanhojen julkaisujesi kanssa.",
   "domain_block_modal.they_cant_follow": "Kukaan tältä palvelimelta ei voi seurata sinua.",
-  "domain_block_modal.they_wont_know": "Hän ei saa ilmoitusta tulleensa estetyksi.",
+  "domain_block_modal.they_wont_know": "Hän ei saa tietää tulleensa estetyksi.",
   "domain_block_modal.title": "Estetäänkö verkkotunnus?",
   "domain_block_modal.you_will_lose_followers": "Kaikki seuraajasi tältä palvelimelta poistetaan.",
   "domain_block_modal.you_wont_see_posts": "Et enää näe julkaisuja etkä ilmoituksia tämän palvelimen käyttäjiltä.",
@@ -257,12 +257,12 @@
   "empty_column.blocks": "Et ole vielä estänyt käyttäjiä.",
   "empty_column.bookmarked_statuses": "Et ole vielä lisännyt julkaisuja kirjanmerkkeihisi. Kun lisäät yhden, se näkyy tässä.",
   "empty_column.community": "Paikallinen aikajana on tyhjä. Kirjoita jotain julkista, niin homma lähtee käyntiin!",
-  "empty_column.direct": "Yksityismainintoja ei vielä ole. Jos lähetät tai sinulle lähetetään sellainen, näet sen tässä.",
+  "empty_column.direct": "Yksityismainintoja ei vielä ole. Jos lähetät tai sinulle lähetetään sellaisia, näet ne täällä.",
   "empty_column.domain_blocks": "Verkkotunnuksia ei ole vielä estetty.",
   "empty_column.explore_statuses": "Mikään ei ole nyt suosittua. Tarkista myöhemmin uudelleen!",
   "empty_column.favourited_statuses": "Sinulla ei ole vielä yhtään suosikkijulkaisua. Kun lisäät sellaisen, näkyy se tässä.",
   "empty_column.favourites": "Kukaan ei ole vielä lisännyt tätä julkaisua suosikkeihinsa. Kun joku tekee niin, tulee hän tähän näkyviin.",
-  "empty_column.follow_requests": "Et ole vielä vastaanottanut seuraamispyyntöjä. Saamasi pyynnöt näkyvät täällä.",
+  "empty_column.follow_requests": "Et ole vielä vastaanottanut seurantapyyntöjä. Saamasi pyynnöt näkyvät täällä.",
   "empty_column.followed_tags": "Et seuraa vielä yhtäkään aihetunnistetta. Kun alat seurata, ne tulevat tähän näkyviin.",
   "empty_column.hashtag": "Tällä aihetunnisteella ei löydy vielä sisältöä.",
   "empty_column.home": "Kotiaikajanasi on tyhjä! Seuraa useampia henkilöjä, niin näet enemmän sisältöä.",
@@ -308,7 +308,7 @@
   "firehose.remote": "Muut palvelimet",
   "follow_request.authorize": "Valtuuta",
   "follow_request.reject": "Hylkää",
-  "follow_requests.unlocked_explanation": "Vaikkei tiliäsi ole lukittu, palvelimen {domain} ylläpito on arvioinut, että saatat olla halukas tarkistamaan nämä seuraamispyynnöt erikseen.",
+  "follow_requests.unlocked_explanation": "Vaikkei tiliäsi ole lukittu, palvelimen {domain} ylläpito on arvioinut, että saatat olla halukas tarkistamaan nämä seurantapyynnöt erikseen.",
   "follow_suggestions.curated_suggestion": "Ehdotus ylläpidolta",
   "follow_suggestions.dismiss": "Älä näytä uudelleen",
   "follow_suggestions.featured_longer": "Palvelimen {domain} tiimin poimintoja",
@@ -400,7 +400,7 @@
   "keyboard_shortcuts.pinned": "Avaa kiinnitettyjen julkaisujen luettelo",
   "keyboard_shortcuts.profile": "Avaa kirjoittajan profiili",
   "keyboard_shortcuts.reply": "Vastaa julkaisuun",
-  "keyboard_shortcuts.requests": "Avaa seuraamispyyntöjen luettelo",
+  "keyboard_shortcuts.requests": "Avaa seurantapyyntöjen luettelo",
   "keyboard_shortcuts.search": "Kohdista hakukenttään",
   "keyboard_shortcuts.spoilers": "Näytä/piilota sisältövaroituskenttä",
   "keyboard_shortcuts.start": "Avaa Näin pääset alkuun -sarake",
@@ -417,7 +417,7 @@
   "limited_account_hint.action": "Näytä profiili joka tapauksessa",
   "limited_account_hint.title": "Palvelimen {domain} moderaattorit ovat piilottaneet tämän profiilin.",
   "link_preview.author": "Julkaissut {name}",
-  "link_preview.more_from_author": "Lisää käyttäjältä {name}",
+  "link_preview.more_from_author": "Lisää tekijältä {name}",
   "link_preview.shares": "{count, plural, one {{counter} julkaisu} other {{counter} julkaisua}}",
   "lists.account.add": "Lisää listalle",
   "lists.account.remove": "Poista listalta",
@@ -439,12 +439,12 @@
   "moved_to_account_banner.text": "Tilisi {disabledAccount} on tällä hetkellä poissa käytöstä, koska teit siirron tiliin {movedToAccount}.",
   "mute_modal.hide_from_notifications": "Piilota ilmoituksista",
   "mute_modal.hide_options": "Piilota vaihtoehdot",
-  "mute_modal.indefinite": "Kunnes perun häntä koskevan mykistyksen",
+  "mute_modal.indefinite": "Kunnes kumoan häntä koskevan mykistyksen",
   "mute_modal.show_options": "Näytä vaihtoehdot",
   "mute_modal.they_can_mention_and_follow": "Hän voi mainita sinut ja seurata sinua, mutta sinä et näe häntä.",
-  "mute_modal.they_wont_know": "Hän ei saa ilmoitusta tulleensa mykistetyksi.",
+  "mute_modal.they_wont_know": "Hän ei saa tietää tulleensa mykistetyksi.",
   "mute_modal.title": "Mykistetäänkö käyttäjä?",
-  "mute_modal.you_wont_see_mentions": "Et tule enää näkemään julkaisuja, joissa hänet mainitaan.",
+  "mute_modal.you_wont_see_mentions": "Et näe enää julkaisuja, joissa hänet mainitaan.",
   "mute_modal.you_wont_see_posts": "Hän voi yhä nähdä julkaisusi, mutta sinä et näe hänen.",
   "name_and_others": "{name} ja {count, plural, one {# muu} other {# muuta}}",
   "name_and_others_with_link": "{name} ja <a>{count, plural, one {# muu} other {# muuta}}</a>",
@@ -460,7 +460,7 @@
   "navigation_bar.explore": "Selaa",
   "navigation_bar.favourites": "Suosikit",
   "navigation_bar.filters": "Mykistetyt sanat",
-  "navigation_bar.follow_requests": "Seuraamispyynnöt",
+  "navigation_bar.follow_requests": "Seurantapyynnöt",
   "navigation_bar.followed_tags": "Seuratut aihetunnisteet",
   "navigation_bar.follows_and_followers": "Seuratut ja seuraajat",
   "navigation_bar.lists": "Listat",
@@ -482,7 +482,7 @@
   "notification.admin.sign_up": "{name} rekisteröityi",
   "notification.favourite": "{name} lisäsi julkaisusi suosikkeihinsa",
   "notification.follow": "{name} seurasi sinua",
-  "notification.follow_request": "{name} on pyytänyt lupaa saada seurata sinua",
+  "notification.follow_request": "{name} on pyytänyt lupaa seurata sinua",
   "notification.mention": "{name} mainitsi sinut",
   "notification.moderation-warning.learn_more": "Lue lisää",
   "notification.moderation_warning": "Olet saanut moderointivaroituksen",
@@ -520,7 +520,7 @@
   "notifications.column_settings.filter_bar.advanced": "Näytä kaikki luokat",
   "notifications.column_settings.filter_bar.category": "Pikasuodatuspalkki",
   "notifications.column_settings.follow": "Uudet seuraajat:",
-  "notifications.column_settings.follow_request": "Uudet seuraamispyynnöt:",
+  "notifications.column_settings.follow_request": "Uudet seurantapyynnöt:",
   "notifications.column_settings.mention": "Maininnat:",
   "notifications.column_settings.poll": "Äänestyksen tulokset:",
   "notifications.column_settings.push": "Puskuilmoitukset",
@@ -544,11 +544,11 @@
   "notifications.permission_denied": "Työpöytäilmoitukset eivät ole käytettävissä, koska selaimen käyttöoikeuspyyntö on aiemmin evätty",
   "notifications.permission_denied_alert": "Työpöytäilmoituksia ei voi ottaa käyttöön, koska selaimen käyttöoikeus on aiemmin evätty",
   "notifications.permission_required": "Työpöytäilmoitukset eivät ole käytettävissä, koska siihen tarvittavaa käyttöoikeutta ei ole myönnetty.",
-  "notifications.policy.filter_new_accounts.hint": "Luotu {days, plural, one {viimeisimmän päivän aikana} other {# viime päivän aikana}}",
+  "notifications.policy.filter_new_accounts.hint": "Luotu {days, plural, one {viime päivänä} other {viimeisenä # päivänä}}",
   "notifications.policy.filter_new_accounts_title": "Uudet tilit",
-  "notifications.policy.filter_not_followers_hint": "Mukaan lukien alle {days, plural, one {päivän} other {# päivän}} verran sinua seuranneet",
+  "notifications.policy.filter_not_followers_hint": "Mukaan lukien alle {days, plural, one {päivän} other {# päivää}} sinua seuranneet",
   "notifications.policy.filter_not_followers_title": "Henkilöt, jotka eivät seuraa sinua",
-  "notifications.policy.filter_not_following_hint": "Kunnes hyväksyt ne omin käsin",
+  "notifications.policy.filter_not_following_hint": "Kunnes hyväksyt ne manuaalisesti",
   "notifications.policy.filter_not_following_title": "Henkilöt, joita et seuraa",
   "notifications.policy.filter_private_mentions_hint": "Suodatetaan, ellei se vastaa omaan mainintaasi tai ellet seuraa lähettäjää",
   "notifications.policy.filter_private_mentions_title": "Ei-toivotut yksityismaininnat",
@@ -716,7 +716,7 @@
   "server_banner.is_one_of_many": "{domain} on yksi monista itsenäisistä Mastodon-palvelimista, joiden välityksellä voit toimia fediversumissa.",
   "server_banner.server_stats": "Palvelimen tilastot:",
   "sign_in_banner.create_account": "Luo tili",
-  "sign_in_banner.follow_anyone": "Seuraa kenen tahansa julkaisuja fediversumissa ja näe ne kaikki aikajärjestyksessä. Ei algoritmeja, mainoksia tai klikkausten kalastelua.",
+  "sign_in_banner.follow_anyone": "Seuraa kenen tahansa julkaisuja fediversumissa ja näe ne kaikki aikajärjestyksessä. Ei algoritmeja, mainoksia eikä klikkausten kalastelua.",
   "sign_in_banner.mastodon_is": "Mastodon on paras tapa pysyä ajan tasalla siitä, mitä ympärillä tapahtuu.",
   "sign_in_banner.sign_in": "Kirjaudu",
   "sign_in_banner.sso_redirect": "Kirjaudu tai rekisteröidy",
diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json
index da9049480425b1..eedbc35ff5b92f 100644
--- 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": "הסיבה אינה זמינה",
@@ -171,21 +171,28 @@
   "confirmations.block.confirm": "לחסום",
   "confirmations.delete.confirm": "למחוק",
   "confirmations.delete.message": "בטוח/ה שאת/ה רוצה למחוק את ההודעה?",
+  "confirmations.delete.title": "למחוק הודעה?",
   "confirmations.delete_list.confirm": "למחוק",
   "confirmations.delete_list.message": "האם אתם בטוחים שאתם רוצים למחוק את הרשימה לצמיתות?",
+  "confirmations.delete_list.title": "למחוק רשימה?",
   "confirmations.discard_edit_media.confirm": "השלך",
   "confirmations.discard_edit_media.message": "יש לך שינויים לא שמורים לתיאור המדיה. להשליך אותם בכל זאת?",
   "confirmations.edit.confirm": "עריכה",
   "confirmations.edit.message": "עריכה תדרוס את ההודעה שכבר התחלת לכתוב. האם להמשיך?",
+  "confirmations.edit.title": "לבצע החלפת תוכן?",
   "confirmations.logout.confirm": "התנתקות",
   "confirmations.logout.message": "האם אתם בטוחים שאתם רוצים להתנתק?",
+  "confirmations.logout.title": "להתנתק?",
   "confirmations.mute.confirm": "להשתיק",
   "confirmations.redraft.confirm": "מחיקה ועריכה מחדש",
   "confirmations.redraft.message": "למחוק ולהתחיל טיוטה חדשה? חיבובים והדהודים יאבדו, ותגובות להודעה המקורית ישארו יתומות.",
+  "confirmations.redraft.title": "מחיקה ועריכה מחדש?",
   "confirmations.reply.confirm": "תגובה",
   "confirmations.reply.message": "תגובה עכשיו תמחק את ההודעה שכבר התחלת לכתוב. להמשיך?",
+  "confirmations.reply.title": "לבצע החלפת תוכן?",
   "confirmations.unfollow.confirm": "הפסקת מעקב",
   "confirmations.unfollow.message": "להפסיק מעקב אחרי {name}?",
+  "confirmations.unfollow.title": "לבטל מעקב אחר המשתמש.ת?",
   "conversation.delete": "מחיקת שיחה",
   "conversation.mark_as_read": "סמן כנקרא",
   "conversation.open": "צפו בשיחה",
@@ -503,6 +510,7 @@
   "notification_requests.title": "התראות מסוננות",
   "notifications.clear": "הסרת התראות",
   "notifications.clear_confirmation": "להסיר את כל ההתראות לצמיתות ? ",
+  "notifications.clear_title": "לנקות התראות?",
   "notifications.column_settings.admin.report": "דו\"חות חדשים",
   "notifications.column_settings.admin.sign_up": "הרשמות חדשות:",
   "notifications.column_settings.alert": "התראות לשולחן העבודה",
diff --git a/app/javascript/mastodon/locales/ia.json b/app/javascript/mastodon/locales/ia.json
index 70e48f69486185..f8253865aead0d 100644
--- a/app/javascript/mastodon/locales/ia.json
+++ b/app/javascript/mastodon/locales/ia.json
@@ -171,21 +171,26 @@
   "confirmations.block.confirm": "Blocar",
   "confirmations.delete.confirm": "Deler",
   "confirmations.delete.message": "Es tu secur que tu vole deler iste message?",
+  "confirmations.delete.title": "Deler message?",
   "confirmations.delete_list.confirm": "Deler",
   "confirmations.delete_list.message": "Es tu secur que tu vole deler permanentemente iste lista?",
+  "confirmations.delete_list.title": "Deler lista?",
   "confirmations.discard_edit_media.confirm": "Abandonar",
   "confirmations.discard_edit_media.message": "Tu ha cambiamentos non salvate in le description o previsualisation del objecto multimedial. Abandonar los?",
   "confirmations.edit.confirm": "Modificar",
   "confirmations.edit.message": "Si tu modifica isto ora, le message in curso de composition essera perdite. Es tu secur de voler continuar?",
   "confirmations.logout.confirm": "Clauder session",
   "confirmations.logout.message": "Es tu secur que tu vole clauder le session?",
+  "confirmations.logout.title": "Clauder session?",
   "confirmations.mute.confirm": "Silentiar",
   "confirmations.redraft.confirm": "Deler e rescriber",
   "confirmations.redraft.message": "Es tu secur de voler deler iste message e rescriber lo? Le favorites e le impulsos essera perdite, e le responsas al message original essera orphanate.",
+  "confirmations.redraft.title": "Deler e rescriber le message?",
   "confirmations.reply.confirm": "Responder",
   "confirmations.reply.message": "Si tu responde ora, le message in curso de composition essera perdite. Es tu secur de voler continuar?",
   "confirmations.unfollow.confirm": "Non plus sequer",
   "confirmations.unfollow.message": "Es tu secur que tu vole cessar de sequer {name}?",
+  "confirmations.unfollow.title": "Cessar de sequer le usator?",
   "conversation.delete": "Deler conversation",
   "conversation.mark_as_read": "Marcar como legite",
   "conversation.open": "Vider conversation",
@@ -497,6 +502,7 @@
   "notification_requests.title": "Notificationes filtrate",
   "notifications.clear": "Rader notificationes",
   "notifications.clear_confirmation": "Es tu secur que tu vole rader permanentemente tote tu notificationes?",
+  "notifications.clear_title": "Rader le notificationes?",
   "notifications.column_settings.admin.report": "Nove reportos:",
   "notifications.column_settings.admin.sign_up": "Nove inscriptiones:",
   "notifications.column_settings.alert": "Notificationes de scriptorio",
diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json
index c8c545922cf454..6e37961e12516d 100644
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@@ -171,21 +171,28 @@
   "confirmations.block.confirm": "Blocca",
   "confirmations.delete.confirm": "Elimina",
   "confirmations.delete.message": "Sei sicuro di voler eliminare questo post?",
+  "confirmations.delete.title": "Eliminare il post?",
   "confirmations.delete_list.confirm": "Elimina",
   "confirmations.delete_list.message": "Sei sicuro/a di voler eliminare permanentemente questo elenco?",
+  "confirmations.delete_list.title": "Eliminare la lista?",
   "confirmations.discard_edit_media.confirm": "Scarta",
   "confirmations.discard_edit_media.message": "Hai delle modifiche non salvate alla descrizione o anteprima del media, scartarle comunque?",
   "confirmations.edit.confirm": "Modifica",
   "confirmations.edit.message": "Modificare ora sovrascriverà il messaggio che stai correntemente componendo. Sei sicuro di voler procedere?",
+  "confirmations.edit.title": "Sovrascrivere il post?",
   "confirmations.logout.confirm": "Disconnettiti",
   "confirmations.logout.message": "Sei sicuro di volerti disconnettere?",
+  "confirmations.logout.title": "Uscire?",
   "confirmations.mute.confirm": "Silenzia",
   "confirmations.redraft.confirm": "Elimina e riscrivi",
   "confirmations.redraft.message": "Sei sicuro di voler eliminare questo post e riscriverlo? I preferiti e i boost andranno persi e le risposte al post originale non saranno più collegate.",
+  "confirmations.redraft.title": "Eliminare e riformulare il post?",
   "confirmations.reply.confirm": "Rispondi",
   "confirmations.reply.message": "Rispondere ora sovrascriverà il messaggio che stai correntemente componendo. Sei sicuro di voler procedere?",
+  "confirmations.reply.title": "Sovrascrivere il post?",
   "confirmations.unfollow.confirm": "Smetti di seguire",
   "confirmations.unfollow.message": "Sei sicuro di voler smettere di seguire {name}?",
+  "confirmations.unfollow.title": "Smettere di seguire l'utente?",
   "conversation.delete": "Elimina conversazione",
   "conversation.mark_as_read": "Segna come letto",
   "conversation.open": "Visualizza conversazione",
@@ -503,6 +510,7 @@
   "notification_requests.title": "Notifiche filtrate",
   "notifications.clear": "Cancella le notifiche",
   "notifications.clear_confirmation": "Sei sicuro di voler cancellare permanentemente tutte le tue notifiche?",
+  "notifications.clear_title": "Cancellare le notifiche?",
   "notifications.column_settings.admin.report": "Nuove segnalazioni:",
   "notifications.column_settings.admin.sign_up": "Nuove iscrizioni:",
   "notifications.column_settings.alert": "Notifiche desktop",
diff --git a/app/javascript/mastodon/locales/kab.json b/app/javascript/mastodon/locales/kab.json
index ea00b0eb232d21..b8fd039b8dbffe 100644
--- a/app/javascript/mastodon/locales/kab.json
+++ b/app/javascript/mastodon/locales/kab.json
@@ -235,6 +235,8 @@
   "follow_request.authorize": "Ssireg",
   "follow_request.reject": "Agi",
   "follow_suggestions.dismiss": "Dayen ur t-id-skan ara",
+  "follow_suggestions.featured_longer": "Yettwafraned s ufus sɣur agraw n {domain}",
+  "follow_suggestions.hints.featured": "Amaɣnu-a ifren-it-id wegraw n {domain} s ufus.",
   "follow_suggestions.popular_suggestion_longer": "Yettwassen deg {domain}",
   "follow_suggestions.view_all": "Wali-ten akk",
   "follow_suggestions.who_to_follow": "Ad tḍefreḍ?",
diff --git a/app/javascript/mastodon/locales/lt.json b/app/javascript/mastodon/locales/lt.json
index 37c37b63ebb3ba..04d2c3c8e471c2 100644
--- a/app/javascript/mastodon/locales/lt.json
+++ b/app/javascript/mastodon/locales/lt.json
@@ -171,21 +171,28 @@
   "confirmations.block.confirm": "Blokuoti",
   "confirmations.delete.confirm": "Ištrinti",
   "confirmations.delete.message": "Ar tikrai nori ištrinti šį įrašą?",
+  "confirmations.delete.title": "Ištrinti įrašą?",
   "confirmations.delete_list.confirm": "Ištrinti",
   "confirmations.delete_list.message": "Ar tikrai nori visam laikui ištrinti šį sąrašą?",
+  "confirmations.delete_list.title": "Ištrinti sąrašą?",
   "confirmations.discard_edit_media.confirm": "Atmesti",
   "confirmations.discard_edit_media.message": "Turi neišsaugotų medijos aprašymo ar peržiūros pakeitimų, vis tiek juos atmesti?",
   "confirmations.edit.confirm": "Redaguoti",
   "confirmations.edit.message": "Redaguojant dabar, bus perrašyta šiuo metu kuriama žinutė. Ar tikrai nori tęsti?",
+  "confirmations.edit.title": "Perrašyti įrašą?",
   "confirmations.logout.confirm": "Atsijungti",
   "confirmations.logout.message": "Ar tikrai nori atsijungti?",
+  "confirmations.logout.title": "Atsijungti?",
   "confirmations.mute.confirm": "Nutildyti",
   "confirmations.redraft.confirm": "Ištrinti ir perrašyti",
   "confirmations.redraft.message": "Ar tikrai nori ištrinti šį įrašą ir parašyti jį iš naujo? Bus prarastos mėgstamai ir pakėlimai, o atsakymai į originalinį įrašą taps liekamojais.",
+  "confirmations.redraft.title": "Ištrinti ir iš naujo parengti įrašą?",
   "confirmations.reply.confirm": "Atsakyti",
   "confirmations.reply.message": "Atsakant dabar, bus perrašyta šiuo metu kuriama žinutė. Ar tikrai nori tęsti?",
+  "confirmations.reply.title": "Perrašyti įrašą?",
   "confirmations.unfollow.confirm": "Nebesekti",
   "confirmations.unfollow.message": "Ar tikrai nori nebesekti {name}?",
+  "confirmations.unfollow.title": "Nebesekti naudotoją?",
   "conversation.delete": "Ištrinti pokalbį",
   "conversation.mark_as_read": "Žymėti kaip skaitytą",
   "conversation.open": "Peržiūrėti pokalbį",
@@ -501,6 +508,7 @@
   "notification_requests.title": "Filtruojami pranešimai",
   "notifications.clear": "Išvalyti pranešimus",
   "notifications.clear_confirmation": "Ar tikrai nori visam laikui išvalyti visus pranešimus?",
+  "notifications.clear_title": "Valyti pranešimus?",
   "notifications.column_settings.admin.report": "Naujos ataskaitos:",
   "notifications.column_settings.admin.sign_up": "Naujos registracijos:",
   "notifications.column_settings.alert": "Darbalaukio pranešimai",
diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json
index ee8622029ccf84..e10d423a0fa8f1 100644
--- a/app/javascript/mastodon/locales/sk.json
+++ b/app/javascript/mastodon/locales/sk.json
@@ -166,21 +166,28 @@
   "confirmations.block.confirm": "Zablokovať",
   "confirmations.delete.confirm": "Vymazať",
   "confirmations.delete.message": "Určite chcete tento príspevok vymazať?",
+  "confirmations.delete.title": "Vymazať príspevok?",
   "confirmations.delete_list.confirm": "Vymazať",
   "confirmations.delete_list.message": "Určite chcete tento zoznam trvalo vymazať?",
+  "confirmations.delete_list.title": "Vymazať zoznam?",
   "confirmations.discard_edit_media.confirm": "Zahodiť",
   "confirmations.discard_edit_media.message": "Máte neuložené zmeny v popise alebo náhľade média, zahodiť ich aj tak?",
   "confirmations.edit.confirm": "Upraviť",
   "confirmations.edit.message": "Úpravou prepíšete príspevok, ktorý máte rozpísaný. Určite chcete pokračovať?",
+  "confirmations.edit.title": "Prepísať príspevok?",
   "confirmations.logout.confirm": "Odhlásiť sa",
   "confirmations.logout.message": "Určite sa chcete odhlásiť?",
+  "confirmations.logout.title": "Odhlásiť sa?",
   "confirmations.mute.confirm": "Stíšiť",
   "confirmations.redraft.confirm": "Vymazať a prepísať",
   "confirmations.redraft.message": "Určite chcete tento príspevok vymazať a prepísať? Prídete o jeho zdieľania a ohviezdičkovania a odpovede na pôvodný príspevok budú odlúčené.",
+  "confirmations.redraft.title": "Vymazať a prepísať príspevok?",
   "confirmations.reply.confirm": "Odpovedať",
   "confirmations.reply.message": "Odpovedaním akurát teraz prepíšeš správu, ktorú máš práve rozpísanú. Si si istý/á, že chceš pokračovať?",
+  "confirmations.reply.title": "Prepísať príspevok?",
   "confirmations.unfollow.confirm": "Prestať sledovať",
   "confirmations.unfollow.message": "Určite chcete prestať sledovať {name}?",
+  "confirmations.unfollow.title": "Prestať sledovať užívateľa?",
   "conversation.delete": "Vymazať konverzáciu",
   "conversation.mark_as_read": "Označiť ako prečítanú",
   "conversation.open": "Zobraziť konverzáciu",
@@ -202,7 +209,12 @@
   "dismissable_banner.public_timeline": "Toto sú najnovšie verejné príspevky od účtov na sociálnej sieti, ktoré sú sledované účtami z {domain}.",
   "domain_block_modal.block": "Blokovať server",
   "domain_block_modal.block_account_instead": "Namiesto toho zablokuj @{name}",
+  "domain_block_modal.they_can_interact_with_old_posts": "Ľudia z tohto servera môžu interaktovať s tvojimi starými príspevkami.",
+  "domain_block_modal.they_cant_follow": "Nikto z tohoto servera ťa nemôže nasledovať.",
+  "domain_block_modal.they_wont_know": "Nebude vedieť, že bol/a zablokovaný/á.",
   "domain_block_modal.title": "Blokovať doménu?",
+  "domain_block_modal.you_will_lose_followers": "Všetci tvoji nasledovatelia z tohto servera budú odstránení.",
+  "domain_block_modal.you_wont_see_posts": "Neuvidíš príspevky, ani oboznámenia od užívateľov na tomto serveri.",
   "domain_pill.server": "Server",
   "domain_pill.their_server": "Ich digitálny domov, kde žijú všetky ich príspevky.",
   "domain_pill.username": "Používateľské meno",
diff --git a/app/javascript/mastodon/locales/sq.json b/app/javascript/mastodon/locales/sq.json
index 9562757036234e..279bc097155a6d 100644
--- a/app/javascript/mastodon/locales/sq.json
+++ b/app/javascript/mastodon/locales/sq.json
@@ -171,21 +171,28 @@
   "confirmations.block.confirm": "Bllokoje",
   "confirmations.delete.confirm": "Fshije",
   "confirmations.delete.message": "Jeni i sigurt se doni të fshihet kjo gjendje?",
+  "confirmations.delete.title": "Të fshihet postimi?",
   "confirmations.delete_list.confirm": "Fshije",
   "confirmations.delete_list.message": "Jeni i sigurt se doni të fshihet përgjithmonë kjo listë?",
+  "confirmations.delete_list.title": "Të fshihet lista?",
   "confirmations.discard_edit_media.confirm": "Hidhe tej",
   "confirmations.discard_edit_media.message": "Keni ndryshime të paruajtura te përshkrimi ose paraparja e medias, të hidhen tej, sido qoftë?",
   "confirmations.edit.confirm": "Përpunojeni",
   "confirmations.edit.message": "Përpunimi tani do të sjellë mbishkrim të mesazhit që po hartoni aktualisht. Jeni i sigurt se doni të vazhdohet?",
+  "confirmations.edit.title": "Të mbishkruhet postimi?",
   "confirmations.logout.confirm": "Dilni",
   "confirmations.logout.message": "Jeni i sigurt se doni të dilet?",
+  "confirmations.logout.title": "Të dilet?",
   "confirmations.mute.confirm": "Heshtoje",
   "confirmations.redraft.confirm": "Fshijeni & rihartojeni",
   "confirmations.redraft.message": "Jeni i sigurt se doni të fshihet kjo gjendje dhe të rihartohet? Të parapëlqyerit dhe përforcimet do të humbin, ndërsa përgjigjet te postimi origjinal do të bëhen jetime.",
+  "confirmations.redraft.title": "Të fshihet & riharothet postimi?",
   "confirmations.reply.confirm": "Përgjigjuni",
   "confirmations.reply.message": "Po të përgjigjeni tani, mesazhi që po hartoni, do të mbishkruhet. Jeni i sigurt se doni të vazhdohet më tej?",
+  "confirmations.reply.title": "Të mbishkruhet postimi?",
   "confirmations.unfollow.confirm": "Resht së ndjekuri",
   "confirmations.unfollow.message": "Jeni i sigurt se doni të mos ndiqet më {name}?",
+  "confirmations.unfollow.title": "Të ndalet ndjekja e përdoruesit?",
   "conversation.delete": "Fshije bisedën",
   "conversation.mark_as_read": "Vëri shenjë si të lexuar",
   "conversation.open": "Shfaq bisedën",
@@ -503,6 +510,7 @@
   "notification_requests.title": "Njoftime të filtruar",
   "notifications.clear": "Spastroji njoftimet",
   "notifications.clear_confirmation": "Jeni i sigurt se doni të spastrohen përgjithmonë krejt njoftimet tuaja?",
+  "notifications.clear_title": "Të spastrohen njoftimet?",
   "notifications.column_settings.admin.report": "Raportime të reja:",
   "notifications.column_settings.admin.sign_up": "Regjistrime të reja:",
   "notifications.column_settings.alert": "Njoftime desktopi",
diff --git a/app/javascript/mastodon/locales/sv.json b/app/javascript/mastodon/locales/sv.json
index 6ed17422672417..096de0f42edd80 100644
--- a/app/javascript/mastodon/locales/sv.json
+++ b/app/javascript/mastodon/locales/sv.json
@@ -37,6 +37,7 @@
   "account.followers.empty": "Ingen följer denna användare än.",
   "account.followers_counter": "{count, plural, one {{counter} följare} other {{counter} följare}}",
   "account.following": "Följer",
+  "account.following_counter": "{count, plural, one {{counter} följer} other {{counter} följer}}",
   "account.follows.empty": "Denna användare följer inte någon än.",
   "account.go_to_profile": "Gå till profilen",
   "account.hide_reblogs": "Dölj boostar från @{name}",
@@ -170,21 +171,28 @@
   "confirmations.block.confirm": "Blockera",
   "confirmations.delete.confirm": "Radera",
   "confirmations.delete.message": "Är du säker på att du vill radera detta inlägg?",
+  "confirmations.delete.title": "Ta bort inlägg?",
   "confirmations.delete_list.confirm": "Radera",
   "confirmations.delete_list.message": "Är du säker på att du vill radera denna lista permanent?",
+  "confirmations.delete_list.title": "Ta bort listan?",
   "confirmations.discard_edit_media.confirm": "Kasta",
   "confirmations.discard_edit_media.message": "Du har osparade ändringar till mediabeskrivningen eller förhandsgranskningen, kasta bort dem ändå?",
   "confirmations.edit.confirm": "Redigera",
   "confirmations.edit.message": "Om du svarar nu kommer det att ersätta meddelandet du håller på att skapa. Är du säker på att du vill fortsätta?",
+  "confirmations.edit.title": "Skriva över inlägg?",
   "confirmations.logout.confirm": "Logga ut",
   "confirmations.logout.message": "Är du säker på att du vill logga ut?",
+  "confirmations.logout.title": "Logga ut?",
   "confirmations.mute.confirm": "Tysta",
   "confirmations.redraft.confirm": "Radera & gör om",
   "confirmations.redraft.message": "Är du säker på att du vill radera detta inlägg och göra om det? Favoritmarkeringar, boostar och svar till det ursprungliga inlägget kommer förlora sitt sammanhang.",
+  "confirmations.redraft.title": "Ta bort & gör om inlägget?",
   "confirmations.reply.confirm": "Svara",
   "confirmations.reply.message": "Om du svarar nu kommer det att ersätta meddelandet du håller på att skapa. Är du säker på att du vill fortsätta?",
+  "confirmations.reply.title": "Skriva över inlägget?",
   "confirmations.unfollow.confirm": "Avfölj",
   "confirmations.unfollow.message": "Är du säker på att du vill avfölja {name}?",
+  "confirmations.unfollow.title": "Avfölj %s?",
   "conversation.delete": "Radera konversation",
   "conversation.mark_as_read": "Markera som läst",
   "conversation.open": "Visa konversation",
@@ -467,6 +475,9 @@
   "navigation_bar.security": "Säkerhet",
   "not_signed_in_indicator.not_signed_in": "Du behöver logga in för att få åtkomst till denna resurs.",
   "notification.admin.report": "{name} rapporterade {target}",
+  "notification.admin.report_account": "{name} rapporterade {count, plural, one {ett inlägg} other {# inlägg}} från {target} för {category}",
+  "notification.admin.report_account_other": "{name} rapporterade {count, plural, one {ett inlägg} other {# inlägg}} från {target}",
+  "notification.admin.report_statuses": "{name} rapporterade {target} för {category}",
   "notification.admin.report_statuses_other": "{name} rapporterade {target}",
   "notification.admin.sign_up": "{name} registrerade sig",
   "notification.favourite": "{name} favoritmarkerade ditt inlägg",
@@ -483,6 +494,7 @@
   "notification.moderation_warning.action_silence": "Ditt konto har begränsats.",
   "notification.moderation_warning.action_suspend": "Ditt konto har stängts av.",
   "notification.own_poll": "Din röstning har avslutats",
+  "notification.poll": "En enkät som du röstat i har avslutats",
   "notification.private_mention": "{name} nämnde dig privat",
   "notification.reblog": "{name} boostade ditt inlägg",
   "notification.relationships_severance_event": "Förlorade kontakter med {name}",
@@ -498,10 +510,12 @@
   "notification_requests.title": "Filtrerade meddelanden",
   "notifications.clear": "Rensa aviseringar",
   "notifications.clear_confirmation": "Är du säker på att du vill rensa alla dina aviseringar permanent?",
+  "notifications.clear_title": "Rensa aviseringar?",
   "notifications.column_settings.admin.report": "Nya rapporter:",
   "notifications.column_settings.admin.sign_up": "Nya registreringar:",
   "notifications.column_settings.alert": "Skrivbordsaviseringar",
   "notifications.column_settings.beta.category": "Experimentella funktioner",
+  "notifications.column_settings.beta.grouping": "Gruppera notifikationer",
   "notifications.column_settings.favourite": "Favoriter:",
   "notifications.column_settings.filter_bar.advanced": "Visa alla kategorier",
   "notifications.column_settings.filter_bar.category": "Snabbfilter",
@@ -665,6 +679,7 @@
   "report.unfollow_explanation": "Du följer detta konto. Avfölj hen för att inte se hens inlägg i ditt hemflöde.",
   "report_notification.attached_statuses": "bifogade {count, plural, one {{count} inlägg} other {{count} inlägg}}",
   "report_notification.categories.legal": "Rättsligt",
+  "report_notification.categories.legal_sentence": "olagligt innehåll",
   "report_notification.categories.other": "Övrigt",
   "report_notification.categories.other_sentence": "övrigt",
   "report_notification.categories.spam": "Skräppost",
@@ -698,8 +713,11 @@
   "server_banner.about_active_users": "Personer som använt denna server de senaste 30 dagarna (månatligt aktiva användare)",
   "server_banner.active_users": "aktiva användare",
   "server_banner.administered_by": "Administrerad av:",
+  "server_banner.is_one_of_many": "{domain} är en av de många oberoende Mastodon-servrar som du kan använda för att delta i Fediversen.",
   "server_banner.server_stats": "Serverstatistik:",
   "sign_in_banner.create_account": "Skapa konto",
+  "sign_in_banner.follow_anyone": "Följ vem som helst över Fediverse och se allt i kronologisk ordning. Inga algoritmer, inga annonser och inga klickbeten i sikte.",
+  "sign_in_banner.mastodon_is": "Mastodon är det bästa sättet att hänga med i vad som händer.",
   "sign_in_banner.sign_in": "Logga in",
   "sign_in_banner.sso_redirect": "Logga in eller registrera dig",
   "status.admin_account": "Öppet modereringsgränssnitt för @{name}",
diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json
index bb0b96943b3615..1bb22da225a85d 100644
--- a/app/javascript/mastodon/locales/tr.json
+++ b/app/javascript/mastodon/locales/tr.json
@@ -171,21 +171,28 @@
   "confirmations.block.confirm": "Engelle",
   "confirmations.delete.confirm": "Sil",
   "confirmations.delete.message": "Bu tootu silmek istediğinden emin misin?",
+  "confirmations.delete.title": "Gönderiyi sil?",
   "confirmations.delete_list.confirm": "Sil",
   "confirmations.delete_list.message": "Bu listeyi kalıcı olarak silmek istediğinden emin misin?",
+  "confirmations.delete_list.title": "Listeyi sil?",
   "confirmations.discard_edit_media.confirm": "Vazgeç",
   "confirmations.discard_edit_media.message": "Medya açıklaması veya ön izlemede kaydedilmemiş değişiklikleriniz var, yine de vazgeçmek istiyor musunuz?",
   "confirmations.edit.confirm": "Düzenle",
   "confirmations.edit.message": "Şimdi düzenlersen şu an oluşturduğun iletinin üzerine yazılır. Devam etmek istediğine emin misin?",
+  "confirmations.edit.title": "Gönderinin üzerine yaz?",
   "confirmations.logout.confirm": "Oturumu kapat",
   "confirmations.logout.message": "Oturumu kapatmak istediğinden emin misin?",
+  "confirmations.logout.title": "Oturumu kapat?",
   "confirmations.mute.confirm": "Sessize al",
   "confirmations.redraft.confirm": "Sil Düzenle ve yeniden paylaş",
   "confirmations.redraft.message": "Bu gönderiyi silip taslak haline getirmek istediğinize emin misiniz? Mevcut favoriler ve boostlar silinecek ve gönderiye verilen yanıtlar başıboş kalacak.",
+  "confirmations.redraft.title": "Gönderiyi sil veya taslağa dönüştür?",
   "confirmations.reply.confirm": "Yanıtla",
   "confirmations.reply.message": "Şimdi yanıtlarken o an oluşturduğun mesajın üzerine yazılır. Devam etmek istediğine emin misin?",
+  "confirmations.reply.title": "Gönderinin üzerine yaz?",
   "confirmations.unfollow.confirm": "Takibi bırak",
   "confirmations.unfollow.message": "{name} adlı kullanıcıyı takibi bırakmak istediğinden emin misin?",
+  "confirmations.unfollow.title": "Kullanıcıyı takipten çık?",
   "conversation.delete": "Sohbeti sil",
   "conversation.mark_as_read": "Okundu olarak işaretle",
   "conversation.open": "Sohbeti görüntüle",
@@ -503,6 +510,7 @@
   "notification_requests.title": "Filtrelenmiş bildirimler",
   "notifications.clear": "Bildirimleri temizle",
   "notifications.clear_confirmation": "Tüm bildirimlerinizi kalıcı olarak temizlemek ister misiniz?",
+  "notifications.clear_title": "Bildirimleri temizle?",
   "notifications.column_settings.admin.report": "Yeni bildirimler:",
   "notifications.column_settings.admin.sign_up": "Yeni kayıtlar:",
   "notifications.column_settings.alert": "Masaüstü bildirimleri",
diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json
index fb9c35e438834d..dd91e0e77a5b1f 100644
--- a/app/javascript/mastodon/locales/uk.json
+++ b/app/javascript/mastodon/locales/uk.json
@@ -179,16 +179,20 @@
   "confirmations.discard_edit_media.message": "У вас є незбережені зміни в описі медіа або попереднього перегляду, все одно відкинути їх?",
   "confirmations.edit.confirm": "Змінити",
   "confirmations.edit.message": "Редагування перезапише повідомлення, яке ви зараз пишете. Ви впевнені, що хочете продовжити?",
+  "confirmations.edit.title": "Перезаписати допис?",
   "confirmations.logout.confirm": "Вийти",
   "confirmations.logout.message": "Ви впевнені, що хочете вийти?",
   "confirmations.logout.title": "Вийти?",
   "confirmations.mute.confirm": "Приховати",
   "confirmations.redraft.confirm": "Видалити та виправити",
   "confirmations.redraft.message": "Ви впевнені, що хочете видалити цей допис та переписати його? Додавання у вибране та поширення буде втрачено, а відповіді на оригінальний допис залишаться без першоджерела.",
+  "confirmations.redraft.title": "Видалити та переробити допис?",
   "confirmations.reply.confirm": "Відповісти",
   "confirmations.reply.message": "Нова відповідь перезапише повідомлення, яке ви зараз пишете. Ви впевнені, що хочете продовжити?",
+  "confirmations.reply.title": "Перезаписати допис?",
   "confirmations.unfollow.confirm": "Відписатися",
   "confirmations.unfollow.message": "Ви впевнені, що хочете відписатися від {name}?",
+  "confirmations.unfollow.title": "Відписатися від користувача?",
   "conversation.delete": "Видалити бесіду",
   "conversation.mark_as_read": "Позначити як прочитане",
   "conversation.open": "Переглянути бесіду",
diff --git a/app/javascript/mastodon/locales/vi.json b/app/javascript/mastodon/locales/vi.json
index af8008b272dfa6..30016754988f10 100644
--- a/app/javascript/mastodon/locales/vi.json
+++ b/app/javascript/mastodon/locales/vi.json
@@ -171,21 +171,28 @@
   "confirmations.block.confirm": "Chặn",
   "confirmations.delete.confirm": "Xóa bỏ",
   "confirmations.delete.message": "Bạn thật sự muốn xóa tút này?",
+  "confirmations.delete.title": "Xóa tút?",
   "confirmations.delete_list.confirm": "Xóa bỏ",
   "confirmations.delete_list.message": "Bạn thật sự muốn xóa vĩnh viễn danh sách này?",
+  "confirmations.delete_list.title": "Xóa danh sách?",
   "confirmations.discard_edit_media.confirm": "Bỏ qua",
   "confirmations.discard_edit_media.message": "Bạn chưa lưu thay đổi đối với phần mô tả hoặc bản xem trước của media, vẫn bỏ luôn?",
   "confirmations.edit.confirm": "Sửa",
   "confirmations.edit.message": "Nội dung tút cũ sẽ bị ghi đè, bạn có tiếp tục?",
+  "confirmations.edit.title": "Viết đè lên tút cũ?",
   "confirmations.logout.confirm": "Đăng xuất",
   "confirmations.logout.message": "Bạn có thật sự muốn thoát?",
+  "confirmations.logout.title": "Đăng xuất?",
   "confirmations.mute.confirm": "Ẩn",
   "confirmations.redraft.confirm": "Xóa & viết lại",
   "confirmations.redraft.message": "Bạn thật sự muốn xóa tút và viết lại? Điều này sẽ xóa mất những lượt thích và đăng lại của tút, cũng như những trả lời sẽ không còn nội dung gốc.",
+  "confirmations.redraft.title": "Xóa & viết lại?",
   "confirmations.reply.confirm": "Trả lời",
   "confirmations.reply.message": "Nội dung bạn đang soạn thảo sẽ bị ghi đè, bạn có tiếp tục?",
+  "confirmations.reply.title": "Viết đè lên tút cũ?",
   "confirmations.unfollow.confirm": "Bỏ theo dõi",
   "confirmations.unfollow.message": "Bạn thật sự muốn bỏ theo dõi {name}?",
+  "confirmations.unfollow.title": "Bỏ theo dõi?",
   "conversation.delete": "Xóa tin nhắn này",
   "conversation.mark_as_read": "Đánh dấu là đã đọc",
   "conversation.open": "Xem toàn bộ tin nhắn",
@@ -503,6 +510,7 @@
   "notification_requests.title": "Thông báo đã lọc",
   "notifications.clear": "Xóa hết thông báo",
   "notifications.clear_confirmation": "Bạn thật sự muốn xóa vĩnh viễn tất cả thông báo của mình?",
+  "notifications.clear_title": "Xóa hết thông báo?",
   "notifications.column_settings.admin.report": "Báo cáo mới:",
   "notifications.column_settings.admin.sign_up": "Người mới tham gia:",
   "notifications.column_settings.alert": "Báo trên máy tính",
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index c0abc3c845579d..fdaab7ac2afa59 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -12,7 +12,7 @@ bg:
       one: Последовател
       other: Последователи
     following: Следва
-    instance_actor_flash: Акаунтът е виртуално действащо лице, представляващо сървъра, а не отделен потребител. Използва се за федерацията и не бива да се спира.
+    instance_actor_flash: Акаунтът е виртуално действащо лице, представляващо сървъра, а не отделен потребител. Използва се за целите на федериране и не бива да се спира.
     last_active: последна дейност
     link_verified_on: Собствеността върху тази връзка е проверена на %{date}
     nothing_here: Тук няма нищо!
@@ -471,6 +471,9 @@ bg:
       title: Препоръки за следване
       unsuppress: Възстановяване на препоръките за следване
     instances:
+      audit_log:
+        title: Скорошни одитни дневници
+        view_all: Преглед на пълните одитни дневници
       availability:
         description_html:
           one: Ако доставянето до домейна не е успешно за <strong>%{count} ден</strong>, няма да има последващи опити, докато не се получи доставка <em>от</em> домейна.
diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index cd48b3e3b0ec2f..5f1b0b4bcef1c3 100644
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@@ -238,6 +238,7 @@ cy:
         update_custom_emoji: Diweddaru Emoji Addasedig
         update_domain_block: Diweddaru'r Blocio Parth
         update_ip_block: Diweddaru rheol IP
+        update_report: Diweddaru Adroddiad
         update_status: Diweddaru Postiad
         update_user_role: Diweddaru Rôl
       actions:
@@ -686,6 +687,7 @@ cy:
       report: 'Adroddiad #%{id}'
       reported_account: Cyfrif wedi ei adrodd
       reported_by: Adroddwyd gan
+      reported_with_application: Adroddwyd gydag ap
       resolved: Wedi ei ddatrys
       resolved_msg: Llwyddwyd i ddatrys yr adroddiad!
       skip_to_actions: Mynd i gamau gweithredu
diff --git a/config/locales/devise.fi.yml b/config/locales/devise.fi.yml
index f6223fc4800695..61d58981d84162 100644
--- a/config/locales/devise.fi.yml
+++ b/config/locales/devise.fi.yml
@@ -51,7 +51,7 @@ fi:
         explanation: Sisäänkirjautuminen on nyt mahdollista pelkällä sähköpostiosoitteella ja salasanalla.
         subject: 'Mastodon: kaksivaiheinen todennus poistettu käytöstä'
         subtitle: Kaksivaiheinen todennus on poistettu käytöstä tililtäsi.
-        title: 2-vaiheinen todennus pois käytöstä
+        title: Kaksivaiheinen todennus poissa käytöstä
       two_factor_enabled:
         explanation: Sisäänkirjautuminen edellyttää liitetyn TOTP-sovelluksen luomaa aikarajattua kertatunnuslukua.
         subject: 'Mastodon: kaksivaiheinen todennus otettu käyttöön'
@@ -61,7 +61,7 @@ fi:
         explanation: Uudet palautuskoodit on nyt luotu ja vanhat mitätöity.
         subject: 'Mastodon: kaksivaiheisen todennuksen palautuskoodit luotiin uudelleen'
         subtitle: Aiemmat palautuskoodit on mitätöity, ja korvaavat uudet koodit on luotu.
-        title: 2-vaiheisen todennuksen palautuskoodit vaihdettiin
+        title: Kaksivaiheisen todennuksen palautuskoodit vaihdettiin
       unlock_instructions:
         subject: 'Mastodon: ohjeet lukituksen poistoon'
       webauthn_credential:
@@ -84,8 +84,8 @@ fi:
         subject: 'Mastodon: suojausavaimella todennus otettu käyttöön'
         title: Suojausavaimet käytössä
     omniauth_callbacks:
-      failure: Tunnistautuminen lähteestä %{kind} ei onnistunut, syynä ”%{reason}”.
-      success: Tunnistautuminen tililtä %{kind} onnistui.
+      failure: Todentaminen lähteestä %{kind} ei onnistunut, syynä ”%{reason}”.
+      success: Todentaminen tililtä %{kind} onnistui.
     passwords:
       no_token: Tälle sivulle pääsee vain salasananvaihtoviestin kautta. Jos tiedät tulevasi sen kautta, varmista, että käytät viestissä mainittua URL-osoitetta kokonaisuudessaan.
       send_instructions: Jos sähköpostiosoiteesi on tiedossamme, siihen lähetetään pian viesti, jossa on linkki salasanan vaihtamiseksi. Jos viestiä ei kuulu, tarkista roskapostikansiosi.
diff --git a/config/locales/doorkeeper.bg.yml b/config/locales/doorkeeper.bg.yml
index dd536618276155..a1ef1778547c02 100644
--- a/config/locales/doorkeeper.bg.yml
+++ b/config/locales/doorkeeper.bg.yml
@@ -83,6 +83,7 @@ bg:
         access_denied: Заявката беше отказана от собственика на ресурса или от сървъра за упълномощаване.
         credential_flow_not_configured: Resource Owner Password Credentials предизвика грешка, заради това, че настройките за Doorkeeper.configure.resource_owner_from_credentials липсват.
         invalid_client: Удостоверяването на клиента предизвика грешка, поради непознат клиент, липсващо клиентско удостоверяване, или заради това, че методът на удостоверяване не се поддържа.
+        invalid_code_challenge_method: Методът на предизвикателството на кода трябва да е S256, обикновен не се поддържа.
         invalid_grant: Предоставеното удостоверение за достъп е невалидно, изтекло, отхвърлено, не съвпада с пренасочващото URI, използвано в заявката за удостоверение, или е бил издадено от друг клиент.
         invalid_redirect_uri: Включеният пренасочващ Uri е невалиден.
         invalid_request:
diff --git a/config/locales/doorkeeper.ca.yml b/config/locales/doorkeeper.ca.yml
index 0323656dabfadd..85a09b5b433571 100644
--- a/config/locales/doorkeeper.ca.yml
+++ b/config/locales/doorkeeper.ca.yml
@@ -83,6 +83,7 @@ ca:
         access_denied: El propietari del recurs o servidor d'autorizació ha denegat la petició.
         credential_flow_not_configured: Les credencials de contrasenya del propietari del recurs han fallat degut a que Doorkeeper.configure.resource_owner_from_credentials està sense configurar.
         invalid_client: La autentificació del client ha fallat perquè és un client desconegut o no està inclòsa l'autentificació del client o el mètode d'autenticació no està confirmat.
+        invalid_code_challenge_method: El mètode de desafiament de codi ha de ser S256, no es permet que sigui pla.
         invalid_grant: La concessió d'autorizació oferta és invàlida, ha vençut, s'ha revocat, no coincideix amb l'URI de redirecció utilizada en la petició d'autorizació, o fou emesa per a un altre client.
         invalid_redirect_uri: L'uri de redirecció inclòsa no és vàlida.
         invalid_request:
diff --git a/config/locales/doorkeeper.cy.yml b/config/locales/doorkeeper.cy.yml
index e023bc060312c8..f15d74d72146a8 100644
--- a/config/locales/doorkeeper.cy.yml
+++ b/config/locales/doorkeeper.cy.yml
@@ -83,6 +83,7 @@ cy:
         access_denied: Mae perchennog yr adnodd neu'r gweinydd awdurdodi wedi atal y cais.
         credential_flow_not_configured: Llif meini prawf cyfrinair perchennog yr adnodd wedi methu achos fod Doorkeeper.configure.resource_owner_from_credentials heb ei ffurfweddu.
         invalid_client: Methodd dilysu cleient oherwydd cleient anhysbys, dim dilysiad cleient wedi'i gynnwys, neu ddull dilysu heb ei gefnogi.
+        invalid_code_challenge_method: Rhaid i'r dull herio cod fod yn S256, nid oes cefnogaeth i'r plaen.
         invalid_grant: Mae'r grant awdurdodi ar yr amod yn annilys, wedi dod i ben, wedi'i ddirymu, nid yw'n cyfateb i'r URI ailgyfeirio a ddefnyddiwyd yn y cais am awdurdodiad, neu wedi'i roi i gleient arall.
         invalid_redirect_uri: Nid yw'r uri ailgyfeirio a gynhwysir yn ddilys.
         invalid_request:
diff --git a/config/locales/doorkeeper.da.yml b/config/locales/doorkeeper.da.yml
index d462f43d3bc051..cd11dcf4e391ff 100644
--- a/config/locales/doorkeeper.da.yml
+++ b/config/locales/doorkeeper.da.yml
@@ -83,6 +83,7 @@ da:
         access_denied: Ressourceejeren eller godkendelsesserveren afviste anmodningen.
         credential_flow_not_configured: Ressourceejeradgangskodeakkreditiver-flow mislykkedes grundet ikke-opsat Doorkeeper.configure.resource_owner_from_credentials.
         invalid_client: Klientgodkendelse mislykkedes grundet en ukendt klient, ingen inkluderet klientgodkendelse eller uunderstøttet godkendelsesmetode.
+        invalid_code_challenge_method: Kodeudfordringsmetoden skal være S256, simpel (plain) er uunderstøttet.
         invalid_grant: Den leverede godkendelse er ugyldig, udløbet, ophævet, matcher ikke omdirigerings-URI'en brugt i godkendelsesanmodningen eller er udstedt til en anden klient.
         invalid_redirect_uri: Inkluderede ormdirigerings-URI er ugyldig.
         invalid_request:
diff --git a/config/locales/doorkeeper.de.yml b/config/locales/doorkeeper.de.yml
index f303aa23a26a01..b29d668b2ed2ef 100644
--- a/config/locales/doorkeeper.de.yml
+++ b/config/locales/doorkeeper.de.yml
@@ -83,6 +83,7 @@ de:
         access_denied: Diese Anfrage wurde von den Inhaber*innen oder durch den Autorisierungsserver abgelehnt.
         credential_flow_not_configured: Das Konto konnte nicht gefunden werden, da Doorkeeper.configure.resource_owner_from_credentials nicht konfiguriert ist.
         invalid_client: 'Client-Authentisierung ist fehlgeschlagen: Client unbekannt, keine Authentisierung mitgeliefert oder Authentisierungsmethode wird nicht unterstützt.'
+        invalid_code_challenge_method: Die Code-Challenge-Methode muss „S256“ sein, „plain“ wird nicht unterstützt.
         invalid_grant: Die beigefügte Autorisierung ist ungültig, abgelaufen, wurde widerrufen oder einem anderen Client ausgestellt, oder der Weiterleitungs-URI stimmt nicht mit der Autorisierungs-Anfrage überein.
         invalid_redirect_uri: Der beigefügte Weiterleitungs-URI ist ungültig.
         invalid_request:
diff --git a/config/locales/doorkeeper.es-AR.yml b/config/locales/doorkeeper.es-AR.yml
index 0b04696b6a14bb..91f41912477480 100644
--- a/config/locales/doorkeeper.es-AR.yml
+++ b/config/locales/doorkeeper.es-AR.yml
@@ -83,6 +83,7 @@ es-AR:
         access_denied: El propietario del recurso o servidor de autorización denegó la petición.
         credential_flow_not_configured: Las credenciales de contraseña del propietario del recurso fallaron debido a que "Doorkeeper.configure.resource_owner_from_credentials" está sin configurar.
         invalid_client: La autenticación del cliente falló debido a que es un cliente desconocido, o no está incluída la autenticación del cliente, o el método de autenticación no está soportado.
+        invalid_code_challenge_method: El método de desafío de código debe ser S256, «plain» no está soportado.
         invalid_grant: La concesión de autorización ofrecida no es válida, venció, se revocó, no coincide con la dirección web de redireccionamiento usada en la petición de autorización, o fue emitida para otro cliente.
         invalid_redirect_uri: La dirección web de redireccionamiento incluida no es válida.
         invalid_request:
diff --git a/config/locales/doorkeeper.es-MX.yml b/config/locales/doorkeeper.es-MX.yml
index 54386c4c3326de..b5987676d2824c 100644
--- a/config/locales/doorkeeper.es-MX.yml
+++ b/config/locales/doorkeeper.es-MX.yml
@@ -83,6 +83,7 @@ es-MX:
         access_denied: El propietario del recurso o servidor de autorización denegó la petición.
         credential_flow_not_configured: Las credenciales de contraseña del propietario del recurso falló debido a que Doorkeeper.configure.resource_owner_from_credentials está sin configurar.
         invalid_client: La autentificación del cliente falló ya que es un cliente desconocido, no está incluída la autentificación del cliente o el método de autentificación no es compatible.
+        invalid_code_challenge_method: El método de desafío de código debe ser S256, «plain» no está soportado.
         invalid_grant: La concesión de autorización ofrecida es inválida, venció, se revocó, no coincide con la URI de redirección utilizada en la petición de autorización, o fue emitida para otro cliente.
         invalid_redirect_uri: La URI de redirección incluida no es válida.
         invalid_request:
diff --git a/config/locales/doorkeeper.es.yml b/config/locales/doorkeeper.es.yml
index 9be036a1d46ce6..b3c7ccddd46d89 100644
--- a/config/locales/doorkeeper.es.yml
+++ b/config/locales/doorkeeper.es.yml
@@ -83,6 +83,7 @@ es:
         access_denied: El propietario del recurso o servidor de autorización denegó la petición.
         credential_flow_not_configured: Las credenciales de contraseña del propietario del recurso falló debido a que Doorkeeper.configure.resource_owner_from_credentials está sin configurar.
         invalid_client: La autentificación del cliente falló debido o a que es un cliente desconocido o no está incluída la autentificación del cliente o el método de autentificación no está confirmado.
+        invalid_code_challenge_method: El método de desafío de código debe ser S256, «plain» no está soportado.
         invalid_grant: La concesión de autorización ofrecida es inválida, venció, se revocó, no coincide con la URI de redirección utilizada en la petición de autorización, o fue emitida para otro cliente.
         invalid_redirect_uri: La URI de redirección incluida no es válida.
         invalid_request:
diff --git a/config/locales/doorkeeper.fi.yml b/config/locales/doorkeeper.fi.yml
index 3aae89f6cacaff..ecd2fab6901acf 100644
--- a/config/locales/doorkeeper.fi.yml
+++ b/config/locales/doorkeeper.fi.yml
@@ -83,6 +83,7 @@ fi:
         access_denied: Resurssin omistaja tai valtuutuspalvelin hylkäsi pyynnön.
         credential_flow_not_configured: Resurssin omistajan salasanatietojen luku epäonnistui, koska asetusta Doorkeeper.configure.resource_owner_from_credentials ei ole konfiguroitu.
         invalid_client: Asiakasohjelman todennus epäonnistui, koska asiakas on tuntematon, asiakkaan todennus ei ollut mukana tai todennustapaa ei tueta.
+        invalid_code_challenge_method: Koodihaastemenetelmän tulee olla S256 – selväkielistä ei tueta.
         invalid_grant: Valtuutuslupa on virheellinen, vanhentunut, peruttu, valtuutuspyynnössä käytettyä uudelleenohjaus-URI:tä vastaamaton tai myönnetty toiselle asiakkaalle.
         invalid_redirect_uri: Uudelleenohjaus-URI on virheellinen.
         invalid_request:
@@ -165,7 +166,7 @@ fi:
       admin:write:ip_blocks: suorita moderointitoimia estetyille IP-osoitteille
       admin:write:reports: suorita moderointitoimia raporteille
       crypto: käytä päästä päähän -salausta
-      follow: muokkaa tilin suhteita
+      follow: muokkaa tilin seurantasuhteita
       profile: lue vain tilisi profiilitietoja
       push: vastaanota puskuilmoituksesi
       read: lue kaikkia tilin tietoja
diff --git a/config/locales/doorkeeper.fo.yml b/config/locales/doorkeeper.fo.yml
index bd9457b620b83f..29f8cd3387ee49 100644
--- a/config/locales/doorkeeper.fo.yml
+++ b/config/locales/doorkeeper.fo.yml
@@ -83,6 +83,7 @@ fo:
         access_denied: Tilfarseigarin ella váttanarambætarin noktaðu umbønina.
         credential_flow_not_configured: Resource Owner Password Credentials floymurin eydnaðist ikki. Orsøkin var, at Doorkeeper.configure.resource_owner_from_credentials var ikki sett upp.
         invalid_client: Viðskiftaraváttan miseydnaðist. Orsøkin var ein ókendur viðskiftari, at eingin viðskiftaraváttan var við ella at váttanarmannagongdin er ókend.
+        invalid_code_challenge_method: Koduavbjóðingarmetodan má vera S256, einfalt format riggar ikki.
         invalid_grant: Veitta váttanarheimildin er antin ógildug, útgingin, tikin aftur, samsvarar ikki við endursendingar-URI'ið, sum bleiv brúkt í váttanarumbønini ella var flýggjað øðrum viðskiftara.
         invalid_redirect_uri: Endursendingar-URI'ið, sum var viðheft, er ógyldugt.
         invalid_request:
diff --git a/config/locales/doorkeeper.ga.yml b/config/locales/doorkeeper.ga.yml
index 09857768e39744..95c3c4d2237449 100644
--- a/config/locales/doorkeeper.ga.yml
+++ b/config/locales/doorkeeper.ga.yml
@@ -83,6 +83,7 @@ ga:
         access_denied: Shéan úinéir na hacmhainne nó an freastalaí údaraithe an t-iarratas.
         credential_flow_not_configured: Theip ar shreabhadh Dintiúir Pasfhocal Úinéir Acmhainne toisc go raibh Doorkeeper.configure.resource_owner_from_credentials díchumraithe.
         invalid_client: Theip ar fhíordheimhniú cliant de bharr cliant anaithnid, níl fíordheimhniú cliant san áireamh, nó modh fíordheimhnithe nach dtacaítear leis.
+        invalid_code_challenge_method: Ní mór gur S256 an modh dúshlán cód, ach ní thacaítear leis.
         invalid_grant: Tá an deonú údaraithe ar choinníoll neamhbhailí, imithe in éag, cúlghairthe, nach ionann é agus an URI atreoraithe a úsáideadh san iarratas ar údarú, nó gur eisíodh é chuig cliant eile.
         invalid_redirect_uri: Níl an uri atreoraithe atá san áireamh bailí.
         invalid_request:
diff --git a/config/locales/doorkeeper.is.yml b/config/locales/doorkeeper.is.yml
index 84a4d389547f04..01093f44298a42 100644
--- a/config/locales/doorkeeper.is.yml
+++ b/config/locales/doorkeeper.is.yml
@@ -83,6 +83,7 @@ is:
         access_denied: Eigandi tilfangs eða auðkenningarþjónn höfnuðu beininni.
         credential_flow_not_configured: Flæði á lykilorðsauðkennum eiganda tilfangs (Resource Owner) brást vegna þess að Doorkeeper.configure.resource_owner_from_credentials er óskilgreint.
         invalid_client: Auðkenning á biðlara brást vegna þess að biðlarinn er óþekktur, að auðkenning biðlarans fylgdi ekki með, eða að notuð var óstudd auðkenningaraðferð.
+        invalid_code_challenge_method: Aðferð við ráðningu kóðans verður að vera í S256, hreinn texti er ekki studdur.
         invalid_grant: Uppgefin auðkenningarheimild er ógild, útrunnin, afturkölluð, samsvarar ekki endurbirtingarslóðinni í auðkenningarbeiðninni, eða var gefin út til annars biðlara.
         invalid_redirect_uri: Endurbeiningarslóðin sem fylgdi er ekki gild.
         invalid_request:
diff --git a/config/locales/doorkeeper.it.yml b/config/locales/doorkeeper.it.yml
index f5df14deac3373..9654cb2a20b1a3 100644
--- a/config/locales/doorkeeper.it.yml
+++ b/config/locales/doorkeeper.it.yml
@@ -83,6 +83,7 @@ it:
         access_denied: Il proprietario della risorsa o il server d'autorizzazione ha negato la richiesta.
         credential_flow_not_configured: Il processo delle Credenziali Password del Proprietario della Risorsa è fallito a causa della mancata configurazione di Doorkeeper.configure.resource_owner_from_credentials.
         invalid_client: Autenticazione del client fallita a causa di un client sconosciuto, di nessun'autenticazione del client inclusa o di un metodo d'autenticazione non supportato.
+        invalid_code_challenge_method: Il metodo di verifica del codice deve essere S256, semplice non è supportato.
         invalid_grant: L'autorizzazione fornita non è valida, è scaduta, è stata revocata, non corrisponde all'URI di reindirizzamento utilizzato nella richiesta d'autorizzazione o è stata emessa a un altro client.
         invalid_redirect_uri: L'uri di reindirizzamento incluso non è valido.
         invalid_request:
diff --git a/config/locales/doorkeeper.lt.yml b/config/locales/doorkeeper.lt.yml
index 38bb17ad139918..d04e4c9f2c9610 100644
--- a/config/locales/doorkeeper.lt.yml
+++ b/config/locales/doorkeeper.lt.yml
@@ -83,6 +83,7 @@ lt:
         access_denied: Išteklių savininkas (-ė) arba įgaliojimų serveris atmetė užklausą.
         credential_flow_not_configured: Išteklių savininko slaptažodžio kredencialų srautas nepavyko, nes Doorkeeper.configure.resource_owner_from_credentials nėra nesukonfigūruotas.
         invalid_client: Kliento tapatybės nustatymas nepavyko dėl nežinomo kliento, neįtraukto kliento tapatybės nustatymo arba nepalaikomo tapatybės nustatymo metodo.
+        invalid_code_challenge_method: Kodo iššūkio būdas turi būti S256. Paprastas nepalaikomas.
         invalid_grant: Pateiktas įgaliojimas yra netinkamas, pasibaigęs, panaikintas, neatitinka įgaliojimo užklausoje naudoto nukreipimo URI arba buvo išduotas kitam klientui.
         invalid_redirect_uri: Nukreipimo uri įtrauktas yra netinkamas.
         invalid_request:
diff --git a/config/locales/doorkeeper.nl.yml b/config/locales/doorkeeper.nl.yml
index 0a3d8fd081a81d..f75cc04eab2d82 100644
--- a/config/locales/doorkeeper.nl.yml
+++ b/config/locales/doorkeeper.nl.yml
@@ -83,6 +83,7 @@ nl:
         access_denied: De resource-eigenaar of autorisatie-server weigerde het verzoek.
         credential_flow_not_configured: De wachtwoordgegevens-flow van de resource-eigenaar is mislukt omdat Doorkeeper.configure.resource_owner_from_credentials niet is ingesteld.
         invalid_client: Clientverificatie is mislukt door een onbekende client, ontbrekende client-authenticatie of een niet ondersteunde authenticatie-methode.
+        invalid_code_challenge_method: De code-uitdagingsmethode moet S256 zijn, eenvoudig wordt niet ondersteund.
         invalid_grant: De verstrekte autorisatie is ongeldig, verlopen, ingetrokken, komt niet overeen met de redirect-URI die is opgegeven of werd uitgegeven aan een andere client.
         invalid_redirect_uri: De opgegeven redirect-URI is ongeldig.
         invalid_request:
diff --git a/config/locales/doorkeeper.pl.yml b/config/locales/doorkeeper.pl.yml
index a18a86e97900ae..bf2da6f8083d76 100644
--- a/config/locales/doorkeeper.pl.yml
+++ b/config/locales/doorkeeper.pl.yml
@@ -83,6 +83,7 @@ pl:
         access_denied: Właściciel zasobu lub serwer autoryzujący odrzuciły żądanie.
         credential_flow_not_configured: Ścieżka "Resource Owner Password Credentials" zakończyła się błędem, ponieważ Doorkeeper.configure.resource_owner_from_credentials nie został skonfigurowany.
         invalid_client: Autoryzacja klienta nie powiodła się z powodu nieznanego klienta, braku uwierzytelnienia klienta, lub niewspieranej metody uwierzytelniania.
+        invalid_code_challenge_method: Metodą wyzwania kodowego musi być S256, plain jest nieobsługiwany.
         invalid_grant: Grant uwierzytelnienia jest niepoprawny, przeterminowany, unieważniony, nie pasuje do URI przekierowwania użytego w żądaniu uwierzytelnienia, lub został wystawiony przez innego klienta.
         invalid_redirect_uri: URI przekierowania jest nieprawidłowy.
         invalid_request:
diff --git a/config/locales/doorkeeper.pt-PT.yml b/config/locales/doorkeeper.pt-PT.yml
index f03cee6b3a61ea..30ea62d9eb5562 100644
--- a/config/locales/doorkeeper.pt-PT.yml
+++ b/config/locales/doorkeeper.pt-PT.yml
@@ -83,6 +83,7 @@ pt-PT:
         access_denied: O proprietário do recurso ou servidor de autorização negou o pedido.
         credential_flow_not_configured: As credenciais da palavra-passe do proprietário do recurso falhou devido a que Doorkeeper.configure.resource_owner_from_credentials não foram configuradas.
         invalid_client: Autenticação do cliente falhou por causa de um cliente desconhecido, nenhum cliente de autenticação incluído ou método de autenticação não suportado.
+        invalid_code_challenge_method: O método de validação do código tem de ser S256, o método simples não é suportado.
         invalid_grant: A concessão de autorização fornecida é inválida, expirou, foi revogada, não corresponde à URI de redirecionamento usada no pedido de autorização ou foi emitida para outro cliente.
         invalid_redirect_uri: A URI de redirecionamento incluída não é válida.
         invalid_request:
diff --git a/config/locales/doorkeeper.sq.yml b/config/locales/doorkeeper.sq.yml
index de3415406715fc..651f90b3b4ce42 100644
--- a/config/locales/doorkeeper.sq.yml
+++ b/config/locales/doorkeeper.sq.yml
@@ -83,6 +83,7 @@ sq:
         access_denied: I zoti i burimit ose shërbyesi i autorizimit e hodhi poshtë kërkesën.
         credential_flow_not_configured: Rrjedha për Kredenciale Fjalëkalimi të të Zotit të Burimit dështoi për shkak se Doorkeeper.configure.resource_owner_from_credentials është i paformësuar.
         invalid_client: Mirëfilltësimi i klientit dështoi për shkak klienti të panjohur, mospërfshirjeje mirëfilltësimi klienti, ose metode të pambuluar mirëfilltësimi.
+        invalid_code_challenge_method: Metoda me kod duhet të jetë e llojit S256, e thjeshta nuk mbulohet.
         invalid_grant: Autorizimi i dhënë është i pavlefshëm, ka skaduar, është shfuqizuar, s’përputhet me URI-n e ridrejtimit të përdorur te kërkesa e autorizimit, ose është emetuar për klient tjetër.
         invalid_redirect_uri: URI e ridrejtimit s’është e vlefshme.
         invalid_request:
diff --git a/config/locales/doorkeeper.sv.yml b/config/locales/doorkeeper.sv.yml
index b46c16d4de0f55..83927d10977bd8 100644
--- a/config/locales/doorkeeper.sv.yml
+++ b/config/locales/doorkeeper.sv.yml
@@ -83,6 +83,7 @@ sv:
         access_denied: Resursägaren eller behörighetsservern nekade begäran.
         credential_flow_not_configured: Resurs Ägare Lösenord Credentials flöde misslyckades på grund av att Doorkeeper.configure.resource_owner_from_credentials är okonfigurerad.
         invalid_client: Klientautentisering misslyckades på grund av okänd klient, ingen klientautentisering inkluderad eller icke godkänd autentiseringsmetod.
+        invalid_code_challenge_method: Kodutmaningsmetoden måste vara S256, en slät stöds inte.
         invalid_grant: Det beviljade godkännandetillskottet är ogiltigt, upphört, återkallat, matchar inte den omdirigering URI som användes i auktorisationsförfrågan eller har utfärdats till en annan klient.
         invalid_redirect_uri: Den omdirigerade uri är inte giltig.
         invalid_request:
diff --git a/config/locales/doorkeeper.tr.yml b/config/locales/doorkeeper.tr.yml
index 330449b1b5f5e2..41996d96035b32 100644
--- a/config/locales/doorkeeper.tr.yml
+++ b/config/locales/doorkeeper.tr.yml
@@ -83,6 +83,7 @@ tr:
         access_denied: Kaynak sahibi veya yetkilendirme sunucusu isteği reddetti.
         credential_flow_not_configured: Kaynak Sahibi Parolası Kimlik Bilgileri akışı Doorkeeper.configure.resource_owner_from_credentials 'ın yapılandırılmamış olması nedeniyle başarısız oldu.
         invalid_client: İstemcinin kimlik doğrulaması bilinmeyen istemci, istemci kimlik doğrulamasının dahil olmaması veya desteklenmeyen kimlik doğrulama yöntemi nedeniyle başarısız oldu.
+        invalid_code_challenge_method: Kod zorluk metodu S256 olmalı, düz yöntem desteklenmiyor.
         invalid_grant: Sağlanan yetkilendirme izni geçersiz, süresi dolmuş, iptal edilmiş, yetkilendirme isteğinde kullanılan yönlendirme URL'siyle eşleşmiyor veya başka bir istemciye verilmiş.
         invalid_redirect_uri: Dahil edilmiş yönlendirme uri'si geçersiz.
         invalid_request:
diff --git a/config/locales/doorkeeper.uk.yml b/config/locales/doorkeeper.uk.yml
index ca54fcb65a83be..55b91fd69dabdc 100644
--- a/config/locales/doorkeeper.uk.yml
+++ b/config/locales/doorkeeper.uk.yml
@@ -83,6 +83,7 @@ uk:
         access_denied: Власник ресурсу або сервер авторизації відхилив Ваш запит.
         credential_flow_not_configured: Не вдалося перевірити парольні дані клієнту через неналаштований параметр Doorkeeper.configure.resource_owner_from_credentials.
         invalid_client: Не вдалося аутентифікувати клієнта (клієнт невідомий, аутентифікацію клієнта не увімкнено, або непідтримуваний метод аутентифікації).
+        invalid_code_challenge_method: Метод виклику коду повинен бути S256, простий не підтримується.
         invalid_grant: Наданий санкціонований дозвіл недійсний, прострочений, анульований, не відповідає URI перенаправлення, що використовується в запиті авторизації, або був виданий іншому клієнту.
         invalid_redirect_uri: Включений uri перенаправлення не є дійсним.
         invalid_request:
diff --git a/config/locales/doorkeeper.vi.yml b/config/locales/doorkeeper.vi.yml
index d0bdd2cc7b1606..5837961737aa63 100644
--- a/config/locales/doorkeeper.vi.yml
+++ b/config/locales/doorkeeper.vi.yml
@@ -83,6 +83,7 @@ vi:
         access_denied: Chủ sở hữu tài nguyên hoặc máy chủ đã từ chối yêu cầu.
         credential_flow_not_configured: Resource Owner Password Credentials không thành công do Doorkeeper.configure.resource_owner_from_credentials không được định cấu hình.
         invalid_client: Xác minh ứng dụng khách không thành công do máy khách mơ hồ, không bao gồm xác thực ứng dụng khách hoặc phương thức xác thực không được hỗ trợ.
+        invalid_code_challenge_method: Phương pháp thử thách mã phải là S256, phương pháp plain không được hỗ trợ.
         invalid_grant: Yêu cầu không hợp lệ, hết hạn, bị gỡ hoặc không khớp với tài khoản đã cấp phép. Hoặc xung đột với ứng dụng khác.
         invalid_redirect_uri: URL chuyển hướng không hợp lệ.
         invalid_request:
diff --git a/config/locales/doorkeeper.zh-CN.yml b/config/locales/doorkeeper.zh-CN.yml
index 18477bc84581df..36bbe2b8745274 100644
--- a/config/locales/doorkeeper.zh-CN.yml
+++ b/config/locales/doorkeeper.zh-CN.yml
@@ -83,6 +83,7 @@ zh-CN:
         access_denied: 资源所有者或验证服务器拒绝了此请求
         credential_flow_not_configured: 由于 Doorkeeper.configure.resource_owner_from_credentials 尚未配置，应用验证授权流程失败。
         invalid_client: 由于应用信息未知、未提交认证信息或使用了不支持的认证方式，认证失败
+        invalid_code_challenge_method: 代码验证方法必须是 S256，不支持明文。
         invalid_grant: 授权方式无效、过期或已被撤销、与授权请求中的回调地址不一致，或使用了其他应用的回调地址
         invalid_redirect_uri: 无效的登录回调地址
         invalid_request:
diff --git a/config/locales/doorkeeper.zh-TW.yml b/config/locales/doorkeeper.zh-TW.yml
index d12651a6486e2d..1a4c62fdbf6fc9 100644
--- a/config/locales/doorkeeper.zh-TW.yml
+++ b/config/locales/doorkeeper.zh-TW.yml
@@ -83,6 +83,7 @@ zh-TW:
         access_denied: 資源持有者或授權伺服器拒絕請求。
         credential_flow_not_configured: 因為 Doorkeeper.configure.resource_owner_from_credentials 未設定，所以資源持有者密碼認證程序失敗。
         invalid_client: 用戶端驗證失敗，可能是因為未知的用戶端程式、未包含用戶端驗證、或使用了不支援的認證方法。
+        invalid_code_challenge_method: code challenge 方式必須為 S256 (SHA256)，不支援 plain 方式。
         invalid_grant: 授權申請不正確、逾期、已被註銷、與授權請求內的重新導向 URI 不符、或屬於別的用戶端程式。
         invalid_redirect_uri: 包含的重新導向 URI 是不正確的。
         invalid_request:
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 344d6b84caf55b..0aa38ed923acf4 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -59,7 +59,7 @@ fi:
       destroyed_msg: Käyttäjän %{username} tiedot ovat nyt jonossa poistettavaksi välittömästi
       disable: Poista käytöstä
       disable_sign_in_token_auth: Poista sähköpostitunnuksella todennus käytöstä
-      disable_two_factor_authentication: Poista 2FA käytöstä
+      disable_two_factor_authentication: Poista kaksivaiheinen todennus käytöstä
       disabled: Poistettu käytöstä
       display_name: Näyttönimi
       domain: Verkkotunnus
@@ -137,7 +137,7 @@ fi:
       security: Turvallisuus
       security_measures:
         only_password: Vain salasana
-        password_and_2fa: Salasana ja kaksivaiheinen tunnistautuminen
+        password_and_2fa: Salasana ja kaksivaiheinen todennus
       sensitive: Pakota arkaluonteiseksi
       sensitized: Merkitty arkaluonteiseksi
       shared_inbox_url: Jaetun saapuvan postilaatikon osoite
@@ -159,7 +159,7 @@ fi:
       unconfirmed_email: Sähköpostia ei vahvistettu
       undo_sensitized: Kumoa pakotus arkaluonteiseksi
       undo_silenced: Kumoa rajoitus
-      undo_suspension: Peru jäähy
+      undo_suspension: Kumoa jäädytys
       unsilenced_msg: Tilin %{username} rajoitus kumottiin onnistuneesti
       unsubscribe: Lopeta tilaus
       unsuspended_msg: Tilin %{username} jäädytys kumottiin onnistuneesti
@@ -198,23 +198,23 @@ fi:
         destroy_status: Poista julkaisu
         destroy_unavailable_domain: Poista ei-saatavilla oleva verkkotunnus
         destroy_user_role: Hävitä rooli
-        disable_2fa_user: Poista kaksivaiheinen tunnistautuminen käytöstä
+        disable_2fa_user: Poista kaksivaiheinen todennus käytöstä
         disable_custom_emoji: Poista mukautettu emoji käytöstä
-        disable_sign_in_token_auth_user: Estä käyttäjältä sähköpostitunnuksella todennus
+        disable_sign_in_token_auth_user: Poista sähköpostitunnuksella todennus käytöstä käyttäjältä
         disable_user: Poista tili käytöstä
-        enable_custom_emoji: Käytä mukautettuja emojeita
+        enable_custom_emoji: Ota mukautetut emojit käyttöön
         enable_sign_in_token_auth_user: Salli käyttäjälle sähköpostitunnuksella todennuksen
         enable_user: Ota tili käyttöön
         memorialize_account: Muuta muistotiliksi
-        promote_user: Käyttäjä ylennetty
+        promote_user: Ylennä käyttäjä
         reject_appeal: Hylkää valitus
         reject_user: Hylkää käyttäjä
-        remove_avatar_user: Profiilikuvan poisto
+        remove_avatar_user: Poista profiilikuva
         reopen_report: Avaa raportti uudelleen
         resend_user: Lähetä vahvistusviesti uudelleen
         reset_password_user: Nollaa salasana
         resolve_report: Selvitä raportti
-        sensitive_account: Pakotus arkaluonteiseksi tiliksi
+        sensitive_account: Pakota arkaluonteiseksi tiliksi
         silence_account: Rajoita tiliä
         suspend_account: Jäädytä tili
         unassigned_report: Poista raportti käsittelystä
@@ -262,7 +262,7 @@ fi:
         disable_custom_emoji_html: "%{name} poisti käytöstä emojin %{target}"
         disable_sign_in_token_auth_user_html: "%{name} poisti sähköpostitunnuksella todennuksen käytöstä tililtä %{target}"
         disable_user_html: "%{name} poisti kirjautumisen käyttäjältä %{target}"
-        enable_custom_emoji_html: "%{name} otti käyttöön emojin %{target}"
+        enable_custom_emoji_html: "%{name} otti emojin %{target} käyttöön"
         enable_sign_in_token_auth_user_html: "%{name} otti sähköpostitunnuksella todennuksen käyttöön tilille %{target}"
         enable_user_html: "%{name} otti kirjautumisen käyttöön käyttäjälle %{target}"
         memorialize_account_html: "%{name} muutti käyttäjän %{target} tilin muistosivuksi"
@@ -389,14 +389,14 @@ fi:
       confirm_suspension:
         cancel: Peruuta
         confirm: Jäädytä
-        permanent_action: Jäädytyksen kumoaminen ei palauta mitään tietoja tai suhteita.
+        permanent_action: Jäädytyksen kumoaminen ei palauta mitään tietoja tai seurantasuhteita.
         preamble_html: Olet jäädyttämässä verkkotunnuksen <strong>%{domain}</strong> aliverkkotunnuksineen.
         remove_all_data: Tämä poistaa palvelimeltasi kaiken sisällön, median ja profiilitiedot tämän verkkotunnuksen tileiltä.
         stop_communication: Palvelimesi lopettaa viestinnän näiden palvelinten kanssa.
         title: Vahvista verkkotunnuksen %{domain} esto
-        undo_relationships: Tämä kumoaa näiden palvelimien ja sinun tilien välisen seurannan.
+        undo_relationships: Tämä kumoaa näiden palvelinten ja sinun palvelimesi tilien väliset seurantasuhteet.
       created_msg: Verkkotunnuksen estoa käsitellään
-      destroyed_msg: Verkkotunnuksen esto on peruttu
+      destroyed_msg: Verkkotunnuksen esto on kumottu
       domain: Verkkotunnus
       edit: Muokkaa verkkotunnuksen estoa
       existing_domain_block: Olet jo asettanut tiukemmat rajoitukset käyttäjälle %{name}.
@@ -424,7 +424,7 @@ fi:
       reject_media_hint: Poistaa paikallisesti tallennetut mediatiedostot eikä lataa niitä enää jatkossa. Ei merkitystä jäähyn kohdalla
       reject_reports: Hylkää raportit
       reject_reports_hint: Ohita kaikki tästä verkkotunnuksesta tulevat raportit. Ei vaikuta jäädytyksiin
-      undo: Peru verkkotunnuksen esto
+      undo: Kumoa verkkotunnuksen esto
       view: Näytä verkkotunnuksen esto
     email_domain_blocks:
       add_new: Lisää uusi
@@ -454,7 +454,7 @@ fi:
     export_domain_blocks:
       import:
         description_html: Olet tuomassa verkkotunnusten estoluetteloa. Tarkista luettelo huolella – etenkin, jos et ole laatinut sitä itse.
-        existing_relationships_warning: Olemassa olevat seuraussuhteet
+        existing_relationships_warning: Olemassa olevat seurantasuhteet
         private_comment_description_html: 'Seurataksesi tuotujen estojen alkuperää lisätään estojen yhteyteen seuraava yksityinen kommentti: <q>%{comment}</q>'
         private_comment_template: Tuotu lähteestä %{source} %{date}
         title: Tuo verkkotunnusten estoja
@@ -566,7 +566,7 @@ fi:
       no_ip_block_selected: IP-sääntöjä ei muutettu, koska yhtään ei ollut valittuna
       title: IP-säännöt
     relationships:
-      title: "%{acct}n suhteet"
+      title: Tilin %{acct} seurantasuhteet
     relays:
       add_new: Lisää uusi välittäjä
       delete: Poista
@@ -1418,7 +1418,7 @@ fi:
         notification_emails:
           favourite: sähköposti-ilmoituksia suosikkeihin lisäämisistä
           follow: sähköposti-ilmoituksia seuraamisista
-          follow_request: sähköposti-ilmoituksia seuraamispyynnöistä
+          follow_request: sähköposti-ilmoituksia seurantapyynnöistä
           mention: sähköposti-ilmoituksia maininnoista
           reblog: sähköposti-ilmoituksia tehostuksista
       resubscribe_html: Jos olet perunut tilauksen erehdyksessä, voit tilata ilmoitusviestejä uudelleen <a href="%{settings_path}">sähköposti-ilmoitusten asetuksista</a>.
@@ -1439,7 +1439,7 @@ fi:
       missing_also_known_as: ei ole tämän tilin alias
       move_to_self: ei voi olla nykyinen tili
       not_found: ei voitu löytää
-      on_cooldown: Sinä olet jäähyllä
+      on_cooldown: Olet jäähyllä
     followers_count: Seuraajat muuton aikana
     incoming_migrations: Muutto toiselta tililtä
     incoming_migrations_html: Muuttaaksesi toisesta tilistä tähän, sinun täytyy ensin <a href="%{path}">luoda tilin alias</a>.
@@ -1483,10 +1483,10 @@ fi:
       subject: "%{name} seuraa nyt sinua"
       title: Uusi seuraaja
     follow_request:
-      action: Hallitse seuraamispyyntöjä
-      body: "%{name} haluaa seurata sinua"
+      action: Hallitse seurantapyyntöjä
+      body: "%{name} on pyytänyt lupaa seurata sinua"
       subject: 'Odottava seuraamispyyntö: %{name}'
-      title: Uusi seuraamispyyntö
+      title: Uusi seurantapyyntö
     mention:
       action: Vastaa
       body: "%{name} mainitsi sinut:"
@@ -1580,7 +1580,7 @@ fi:
     moved: Muuttaneet
     mutual: Seuraatte toisianne
     primary: Ensisijaiset
-    relationship: Suhde
+    relationship: Seurantasuhde
     remove_selected_domains: Poista kaikki seuraajat valituista verkkotunnuksista
     remove_selected_followers: Poista valitut seuraajat
     remove_selected_follows: Lopeta valittujen käyttäjien seuraaminen
@@ -1789,7 +1789,7 @@ fi:
       too_many_requests: Käännöspalvelulle on hiljattain esitetty liian monta pyyntöä.
   two_factor_authentication:
     add: Lisää
-    disable: Poista 2FA käytöstä
+    disable: Poista kaksivaiheinen todennus käytöstä
     disabled_success: Kaksivaiheisen todennuksen käytöstäpoisto onnistui
     edit: Muokkaa
     enabled: Kaksivaiheinen todennus käytössä
@@ -1875,7 +1875,7 @@ fi:
       edit_profile_title: Mukauta profiiliasi
       explanation: Näillä vinkeillä pääset alkuun
       feature_action: Lue lisää
-      feature_audience: Mastodon tarjoaa sinulle ainutlaatuisen mahdollisuuden hallita yleisöäsi ilman välikäsiä. Omassa infrastruktuurissasi toimiva Mastodon on täysin hallinnassasi, ja mahdollistaa sinun seurata mitä tahansa Mastodon-palvelimia sekä niin ikään olla seurattu niiltä päin.
+      feature_audience: Mastodon tarjoaa sinulle ainutlaatuisen mahdollisuuden hallita yleisöäsi ilman välikäsiä. Omassa infrastruktuurissasi toimiva Mastodon on täysin hallinnassasi ja antaa sinun seurata ja tulla seuratuksi miltä tahansa verkon Mastodon-palvelimelta.
       feature_audience_title: Rakenna yleisöäsi luottavaisin mielin
       feature_control: Tiedät itse parhaiten, mitä haluat nähdä kotisyötteessäsi. Ei algoritmeja eikä mainoksia tuhlaamassa aikaasi. Seuraa yhdellä tilillä ketä tahansa, miltä tahansa Mastodon-palvelimelta, vastaanota heidän julkaisunsa aikajärjestyksessä ja tee omasta internetin nurkastasi hieman enemmän omanlaisesi.
       feature_control_title: Pidä aikajanasi hallussasi
@@ -1884,14 +1884,14 @@ fi:
       feature_moderation: Mastodon palauttaa päätöksenteon käsiisi. Jokainen palvelin luo omat sääntönsä ja määräyksensä, joita valvotaan paikallisesti eikä ylhäältä alas kuten kaupallisessa sosiaalisessa mediassa, mikä tekee siitä joustavimman vastaamaan eri ihmisryhmien tarpeisiin. Liity palvelimelle, jonka säännöt sopivat sinulle, tai ylläpidä omaa palvelinta.
       feature_moderation_title: Moderointi juuri kuten sen pitäisi olla
       follow_action: Seuraa
-      follow_step: Mastodon perustuu sinua kiinnostavien henkilöjen julkaisujen seuraamiseen.
+      follow_step: Mastodonissa on kyse kiinnostavien ihmisten seuraamisesta.
       follow_title: Mukauta kotisyötettäsi
       follows_subtitle: Seuraa tunnettuja tilejä
       follows_title: Seurantaehdotuksia
       follows_view_more: Näytä lisää seurattavia henkilöitä
       hashtags_recent_count:
-        one: "%{people} henkilö viimeisen 2 päivän aikana"
-        other: "%{people} henkilöä viimeisen 2 päivän aikana"
+        one: "%{people} henkilö viimeisenä 2 päivänä"
+        other: "%{people} henkilöä viimeisenä 2 päivänä"
       hashtags_subtitle: Tutki, mikä on ollut suosittua viimeisenä 2 päivänä
       hashtags_title: Suositut aihetunnisteet
       hashtags_view_more: Näytä lisää suosittuja aihetunnisteita
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index eaeada4d1d87bc..f8bbda2e96f2ea 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -348,7 +348,7 @@ lt:
       shortcode_hint: Bent du ženklai, tik raidiniai skaitmeniniai ženklai bei akcentai(_)
       title: Asmeniniai jaustukai
       uncategorized: Be kategorijos
-      unlist: Išbraukti iš sąrašo
+      unlist: Neįtraukti į sąrašą
       unlisted: Neįtrauktas į sąrašą
       update_failed_msg: Jaustukas negalėjo būti pakeistas
       updated_msg: Jaustukas sėkmingai pakeistas!
@@ -446,6 +446,9 @@ lt:
       import:
         description_html: Netrukus importuosi domenų blokavimų sąrašą. Labai atidžiai peržiūrėk šį sąrašą, ypač jei ne tu jį sudarei.
     instances:
+      audit_log:
+        title: Naujausi audito žurnalai
+        view_all: Peržiūrėti visus audito žurnalus
       availability:
         title: Prieinamumas
         warning: Paskutinis bandymas prisijungti prie šio serverio buvo nesėkmingas
@@ -1101,7 +1104,7 @@ lt:
       private_long: rodyti tik sekėjams
       public: Vieša
       public_long: visi gali matyti
-      unlisted: Neįtrauktas į sąrašus
+      unlisted: Neįtrauktas į sąrašą
       unlisted_long: matyti gali visi, bet nėra išvardyti į viešąsias laiko skales
   statuses_cleanup:
     enabled_hint: Automatiškai ištrina įrašus, kai jie pasiekia nustatytą amžiaus ribą, nebent jie atitinka vieną iš toliau nurodytų išimčių
diff --git a/config/locales/simple_form.cy.yml b/config/locales/simple_form.cy.yml
index cd5bc1add788b8..64c67a1463e8e9 100644
--- a/config/locales/simple_form.cy.yml
+++ b/config/locales/simple_form.cy.yml
@@ -211,6 +211,7 @@ cy:
         setting_default_privacy: Preifatrwydd cyhoeddi
         setting_default_sensitive: Marcio cyfryngau fel eu bod yn sensitif bob tro
         setting_delete_modal: Dangos deialog cadarnhau cyn dileu postiad
+        setting_disable_hover_cards: Analluogi rhagolwg proffil ar lusgo
         setting_disable_swiping: Analluogi cynigion llusgo
         setting_display_media: Dangos cyfryngau
         setting_display_media_default: Rhagosodiad
diff --git a/config/locales/simple_form.fi.yml b/config/locales/simple_form.fi.yml
index a59368ca4ef4c3..80e08234f3921f 100644
--- a/config/locales/simple_form.fi.yml
+++ b/config/locales/simple_form.fi.yml
@@ -9,7 +9,7 @@ fi:
         indexable: Julkiset julkaisusi voivat näkyä hakutuloksissa Mastodonissa. Ihmiset, jotka ovat olleet vuorovaikutuksessa julkaisujesi kanssa, voivat etsiä niitä asetuksesta riippumatta.
         note: 'Voit @mainita muita käyttäjiä tai #aihetunnisteita.'
         show_collections: Käyttäjät voivat selata seurattujasi ja seuraajiasi. Käyttäjät, joita seuraat, näkevät joka tapauksessa, että seuraat heitä.
-        unlocked: Käyttäjät voivat seurata sinua pyytämättä hyväksyntääsi. Poista valinta, jos haluat tarkistaa sekä hyväksyä tai hylätä vastaanottamasi seuraamispyynnöt.
+        unlocked: Käyttäjät voivat seurata sinua pyytämättä hyväksyntääsi. Poista valinta, jos haluat tarkistaa sekä hyväksyä tai hylätä vastaanottamasi seurantapyynnöt.
       account_alias:
         acct: Määrittele sen tilin käyttäjänimi@verkkotunnus, josta haluat muuttaa
       account_migration:
@@ -292,7 +292,7 @@ fi:
         digest: Lähetä koosteviestejä sähköpostitse
         favourite: Joku lisäsi julkaisusi suosikkeihinsa
         follow: Joku seurasi sinua
-        follow_request: Joku pyysi saada seurata sinua
+        follow_request: Joku pyysi lupaa seurata sinua
         mention: Joku mainitsi sinut
         pending_account: Uusi tili tarvitsee tarkistuksen
         reblog: Joku tehosti julkaisuasi
diff --git a/config/locales/simple_form.sv.yml b/config/locales/simple_form.sv.yml
index 2281e4b4abe109..1e1aee5246c761 100644
--- a/config/locales/simple_form.sv.yml
+++ b/config/locales/simple_form.sv.yml
@@ -211,6 +211,7 @@ sv:
         setting_default_privacy: Inläggsintegritet
         setting_default_sensitive: Markera alltid media som känsligt
         setting_delete_modal: Visa bekräftelsedialog innan radering av inlägg
+        setting_disable_hover_cards: Inaktivera profilförhandsgranskning vid hovring
         setting_disable_swiping: Inaktivera svepande rörelser
         setting_display_media: Mediavisning
         setting_display_media_default: Standard
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index de2664f8b5f109..72eefe5632b340 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -471,6 +471,9 @@ sv:
       title: Följ rekommendationer
       unsuppress: Återställ följrekommendation
     instances:
+      audit_log:
+        title: Senaste revisionsloggar
+        view_all: Visa fullständiga revisionssloggar
       availability:
         description_html:
           one: Om leveranser till domänen misslyckas i <strong>%{count} dag</strong> kommer inga ytterligare leveransförsök att göras förrän en leverans <em>från</em> domänen tas emot.
@@ -639,6 +642,7 @@ sv:
       report: 'Rapport #%{id}'
       reported_account: Anmält konto
       reported_by: Anmäld av
+      reported_with_application: Rapporterat med applikation
       resolved: Löst
       resolved_msg: Anmälan har lösts framgångsrikt!
       skip_to_actions: Hoppa till åtgärder

From 6ad477d146552bf8ee5415ad2bc629f1bbef188b Mon Sep 17 00:00:00 2001
From: kyori19 <kyori@accelf.net>
Date: Mon, 29 Jul 2024 17:27:11 +0900
Subject: [PATCH 1647/2191] Fix Codespaces startup fails due to Corepack
 download prompt (#31189)

---
 .devcontainer/codespaces/devcontainer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.devcontainer/codespaces/devcontainer.json b/.devcontainer/codespaces/devcontainer.json
index d2358657f6d664..8acffec8259867 100644
--- a/.devcontainer/codespaces/devcontainer.json
+++ b/.devcontainer/codespaces/devcontainer.json
@@ -39,7 +39,7 @@
   },
 
   "onCreateCommand": "git config --global --add safe.directory ${containerWorkspaceFolder}",
-  "postCreateCommand": "bin/setup",
+  "postCreateCommand": "COREPACK_ENABLE_DOWNLOAD_PROMPT=0 bin/setup",
   "waitFor": "postCreateCommand",
 
   "customizations": {

From 95eadabe4419a6c50ad836289f97a75d152a8f36 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 29 Jul 2024 04:31:42 -0400
Subject: [PATCH 1648/2191] Extrude `fill_in_auth_details` method to
 `ProfileStories` spec support module (#31163)

---
 spec/support/stories/profile_stories.rb | 10 +++++++---
 spec/system/log_in_spec.rb              | 12 +++---------
 spec/system/oauth_spec.rb               |  8 ++------
 3 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/spec/support/stories/profile_stories.rb b/spec/support/stories/profile_stories.rb
index f5fc9a441fd698..07eaaca9fb93b0 100644
--- a/spec/support/stories/profile_stories.rb
+++ b/spec/support/stories/profile_stories.rb
@@ -3,6 +3,12 @@
 module ProfileStories
   attr_reader :bob, :alice, :alice_bio
 
+  def fill_in_auth_details(email, password)
+    fill_in 'user_email', with: email
+    fill_in 'user_password', with: password
+    click_on I18n.t('auth.login')
+  end
+
   def as_a_registered_user
     @bob = Fabricate(
       :user,
@@ -16,9 +22,7 @@ def as_a_registered_user
   def as_a_logged_in_user
     as_a_registered_user
     visit new_user_session_path
-    fill_in 'user_email', with: email
-    fill_in 'user_password', with: password
-    click_on I18n.t('auth.login')
+    fill_in_auth_details(email, password)
   end
 
   def as_a_logged_in_admin
diff --git a/spec/system/log_in_spec.rb b/spec/system/log_in_spec.rb
index c64e19d2b7c43f..8a73c42d2edf00 100644
--- a/spec/system/log_in_spec.rb
+++ b/spec/system/log_in_spec.rb
@@ -17,17 +17,13 @@
   end
 
   it 'A valid email and password user is able to log in' do
-    fill_in 'user_email', with: email
-    fill_in 'user_password', with: password
-    click_on I18n.t('auth.login')
+    fill_in_auth_details(email, password)
 
     expect(subject).to have_css('div.app-holder')
   end
 
   it 'A invalid email and password user is not able to log in' do
-    fill_in 'user_email', with: 'invalid_email'
-    fill_in 'user_password', with: 'invalid_password'
-    click_on I18n.t('auth.login')
+    fill_in_auth_details('invalid_email', 'invalid_password')
 
     expect(subject).to have_css('.flash-message', text: failure_message('invalid'))
   end
@@ -36,9 +32,7 @@
     let(:confirmed_at) { nil }
 
     it 'A unconfirmed user is able to log in' do
-      fill_in 'user_email', with: email
-      fill_in 'user_password', with: password
-      click_on I18n.t('auth.login')
+      fill_in_auth_details(email, password)
 
       expect(subject).to have_css('div.admin-wrapper')
     end
diff --git a/spec/system/oauth_spec.rb b/spec/system/oauth_spec.rb
index 42ff4a48ac32a5..5d06f6111cee79 100644
--- a/spec/system/oauth_spec.rb
+++ b/spec/system/oauth_spec.rb
@@ -3,6 +3,8 @@
 require 'rails_helper'
 
 describe 'Using OAuth from an external app' do
+  include ProfileStories
+
   subject { visit "/oauth/authorize?#{params.to_query}" }
 
   let(:client_app) { Doorkeeper::Application.create!(name: 'test', redirect_uri: about_url(host: Rails.application.config.x.local_domain), scopes: 'read') }
@@ -246,12 +248,6 @@
 
   private
 
-  def fill_in_auth_details(email, password)
-    fill_in 'user_email', with: email
-    fill_in 'user_password', with: password
-    click_on I18n.t('auth.login')
-  end
-
   def fill_in_otp_details(value)
     fill_in 'user_otp_attempt', with: value
     click_on I18n.t('auth.login')

From 8edd77a7552875abafb76ea7703364b76311c57a Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 29 Jul 2024 09:07:22 +0000
Subject: [PATCH 1649/2191] chore(deps): update dependency typescript to v5.5.4
 (#31186)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 2c90f719e2567d..f050110cd639ba 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -17265,22 +17265,22 @@ __metadata:
   linkType: hard
 
 "typescript@npm:5, typescript@npm:^5.0.4":
-  version: 5.5.3
-  resolution: "typescript@npm:5.5.3"
+  version: 5.5.4
+  resolution: "typescript@npm:5.5.4"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
-  checksum: 10c0/f52c71ccbc7080b034b9d3b72051d563601a4815bf3e39ded188e6ce60813f75dbedf11ad15dd4d32a12996a9ed8c7155b46c93a9b9c9bad1049766fe614bbdd
+  checksum: 10c0/422be60f89e661eab29ac488c974b6cc0a660fb2228003b297c3d10c32c90f3bcffc1009b43876a082515a3c376b1eefcce823d6e78982e6878408b9a923199c
   languageName: node
   linkType: hard
 
 "typescript@patch:typescript@npm%3A5#optional!builtin<compat/typescript>, typescript@patch:typescript@npm%3A^5.0.4#optional!builtin<compat/typescript>":
-  version: 5.5.3
-  resolution: "typescript@patch:typescript@npm%3A5.5.3#optional!builtin<compat/typescript>::version=5.5.3&hash=379a07"
+  version: 5.5.4
+  resolution: "typescript@patch:typescript@npm%3A5.5.4#optional!builtin<compat/typescript>::version=5.5.4&hash=379a07"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
-  checksum: 10c0/911c7811d61f57f07df79c4a35f56a0f426a65426a020e5fcd792f66559f399017205f5f10255329ab5a3d8c2d1f1d19530aeceffda70758a521fae1d469432e
+  checksum: 10c0/73409d7b9196a5a1217b3aaad929bf76294d3ce7d6e9766dd880ece296ee91cf7d7db6b16c6c6c630ee5096eccde726c0ef17c7dfa52b01a243e57ae1f09ef07
   languageName: node
   linkType: hard
 

From 91fbd5b422625bdf30b9ce6655378db7f804e510 Mon Sep 17 00:00:00 2001
From: Michael Stanclift <mx@vmstan.com>
Date: Mon, 29 Jul 2024 09:32:29 -0500
Subject: [PATCH 1650/2191] Adjust magick version detection in admin panel 
 (#30845)

---
 .../metrics/dimension/software_versions_dimension.rb  | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/lib/admin/metrics/dimension/software_versions_dimension.rb b/app/lib/admin/metrics/dimension/software_versions_dimension.rb
index 71d6c63fb5f347..84ffc41d7428eb 100644
--- a/app/lib/admin/metrics/dimension/software_versions_dimension.rb
+++ b/app/lib/admin/metrics/dimension/software_versions_dimension.rb
@@ -85,7 +85,14 @@ def libvips_version
   def imagemagick_version
     return if Rails.configuration.x.use_vips
 
-    version = `convert -version`.match(/Version: ImageMagick ([\d\.]+)/)[1]
+    imagemagick_binary = Paperclip.options[:is_windows] ? 'magick convert' : 'convert'
+
+    version_output = Terrapin::CommandLine.new(imagemagick_binary, '-version').run
+    version_match = version_output.match(/Version: ImageMagick (\S+)/)[1].strip
+
+    return nil unless version_match
+
+    version = version_match
 
     {
       key: 'imagemagick',
@@ -93,7 +100,7 @@ def imagemagick_version
       value: version,
       human_value: version,
     }
-  rescue Errno::ENOENT
+  rescue Terrapin::CommandNotFoundError, Terrapin::ExitStatusError, Paperclip::Errors::CommandNotFoundError, Paperclip::Errors::CommandFailedError
     nil
   end
 

From 6d2ed0dcba69329062234687645a9b6f4c705344 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 29 Jul 2024 17:00:01 +0200
Subject: [PATCH 1651/2191] chore(deps): update dependency pg to v1.5.7
 (#31176)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 60d83624324bff..1cf7f8d7696bc4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -589,7 +589,7 @@ GEM
     parslet (2.0.0)
     pastel (0.8.0)
       tty-color (~> 0.5)
-    pg (1.5.6)
+    pg (1.5.7)
     pghero (3.6.0)
       activerecord (>= 6.1)
     premailer (1.23.0)

From c40e48116993e9a0b1701c40eded924dd496d5a7 Mon Sep 17 00:00:00 2001
From: Emelia Smith <ThisIsMissEm@users.noreply.github.com>
Date: Mon, 29 Jul 2024 17:49:44 +0200
Subject: [PATCH 1652/2191] Implement UI for Admin Search of Hashtags (#30880)

---
 app/controllers/admin/tags_controller.rb      | 18 ++++-
 app/helpers/admin/tags_helper.rb              | 15 ++++
 app/javascript/styles/mastodon/accounts.scss  |  4 +
 app/javascript/styles/mastodon/tables.scss    |  4 +
 app/models/admin/tag_filter.rb                | 74 +++++++++++++++++++
 app/models/tag.rb                             |  9 ++-
 app/views/admin/tags/_tag.html.haml           | 27 +++++++
 app/views/admin/tags/index.html.haml          | 39 ++++++++++
 app/views/admin/tags/show.html.haml           |  7 +-
 app/views/admin/trends/tags/_tag.html.haml    |  4 +-
 config/locales/en.yml                         | 16 ++++
 config/locales/simple_form.en.yml             |  2 +-
 config/navigation.rb                          |  3 +-
 config/routes/admin.rb                        |  2 +-
 .../controllers/admin/tags_controller_spec.rb | 37 ++++++++++
 spec/models/admin/tag_filter_spec.rb          | 36 +++++++++
 spec/models/tag_spec.rb                       | 30 ++++++++
 17 files changed, 316 insertions(+), 11 deletions(-)
 create mode 100644 app/helpers/admin/tags_helper.rb
 create mode 100644 app/models/admin/tag_filter.rb
 create mode 100644 app/views/admin/tags/_tag.html.haml
 create mode 100644 app/views/admin/tags/index.html.haml
 create mode 100644 spec/models/admin/tag_filter_spec.rb

diff --git a/app/controllers/admin/tags_controller.rb b/app/controllers/admin/tags_controller.rb
index 4f727c398a0be0..4759d15bc4b047 100644
--- a/app/controllers/admin/tags_controller.rb
+++ b/app/controllers/admin/tags_controller.rb
@@ -2,7 +2,15 @@
 
 module Admin
   class TagsController < BaseController
-    before_action :set_tag
+    before_action :set_tag, except: [:index]
+
+    PER_PAGE = 20
+
+    def index
+      authorize :tag, :index?
+
+      @tags = filtered_tags.page(params[:page]).per(PER_PAGE)
+    end
 
     def show
       authorize @tag, :show?
@@ -31,5 +39,13 @@ def set_tag
     def tag_params
       params.require(:tag).permit(:name, :display_name, :trendable, :usable, :listable)
     end
+
+    def filtered_tags
+      TagFilter.new(filter_params.with_defaults(order: 'newest')).results
+    end
+
+    def filter_params
+      params.slice(:page, *TagFilter::KEYS).permit(:page, *TagFilter::KEYS)
+    end
   end
 end
diff --git a/app/helpers/admin/tags_helper.rb b/app/helpers/admin/tags_helper.rb
new file mode 100644
index 00000000000000..eb928a6db2beb0
--- /dev/null
+++ b/app/helpers/admin/tags_helper.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Admin::TagsHelper
+  def admin_tags_moderation_options
+    [
+      [t('admin.tags.moderation.reviewed'), 'reviewed'],
+      [t('admin.tags.moderation.review_requested'), 'review_requested'],
+      [t('admin.tags.moderation.unreviewed'), 'unreviewed'],
+      [t('admin.tags.moderation.trendable'), 'trendable'],
+      [t('admin.tags.moderation.not_trendable'), 'not_trendable'],
+      [t('admin.tags.moderation.usable'), 'usable'],
+      [t('admin.tags.moderation.not_usable'), 'not_usable'],
+    ]
+  end
+end
diff --git a/app/javascript/styles/mastodon/accounts.scss b/app/javascript/styles/mastodon/accounts.scss
index e63601fa9f1fd7..894332acb5868d 100644
--- a/app/javascript/styles/mastodon/accounts.scss
+++ b/app/javascript/styles/mastodon/accounts.scss
@@ -350,6 +350,10 @@
       color: $primary-text-color;
       font-weight: 700;
     }
+
+    .warning-hint {
+      font-weight: normal !important;
+    }
   }
 
   &__body {
diff --git a/app/javascript/styles/mastodon/tables.scss b/app/javascript/styles/mastodon/tables.scss
index eab79371507f7c..65f42d0467b747 100644
--- a/app/javascript/styles/mastodon/tables.scss
+++ b/app/javascript/styles/mastodon/tables.scss
@@ -286,6 +286,10 @@ a.table-action-link {
         padding: 0;
       }
 
+      &--padded {
+        padding: 12px 16px 16px;
+      }
+
       &--with-image {
         display: flex;
         align-items: center;
diff --git a/app/models/admin/tag_filter.rb b/app/models/admin/tag_filter.rb
new file mode 100644
index 00000000000000..6149c52175884b
--- /dev/null
+++ b/app/models/admin/tag_filter.rb
@@ -0,0 +1,74 @@
+# frozen_string_literal: true
+
+class Admin::TagFilter
+  KEYS = %i(
+    status
+    name
+    order
+  ).freeze
+
+  attr_reader :params
+
+  def initialize(params)
+    @params = params.to_h.symbolize_keys
+  end
+
+  def results
+    scope = Tag.reorder(nil)
+
+    params.each do |key, value|
+      next if key == :page
+
+      scope.merge!(scope_for(key, value)) if value.present?
+    end
+
+    scope
+  end
+
+  private
+
+  def scope_for(key, value)
+    case key
+    when :status
+      status_scope(value)
+    when :name
+      Tag.search_for(value.to_s.strip, params[:limit], params[:offset], exclude_unlistable: false)
+    when :order
+      order_scope(value)
+    else
+      raise Mastodon::InvalidParameterError, "Unknown filter: #{key}"
+    end
+  end
+
+  def status_scope(value)
+    case value.to_s
+    when 'reviewed'
+      Tag.reviewed
+    when 'review_requested'
+      Tag.pending_review
+    when 'unreviewed'
+      Tag.unreviewed
+    when 'trendable'
+      Tag.trendable
+    when 'not_trendable'
+      Tag.not_trendable
+    when 'usable'
+      Tag.usable
+    when 'not_usable'
+      Tag.not_usable
+    else
+      raise Mastodon::InvalidParameterError, "Unknown status: #{value}"
+    end
+  end
+
+  def order_scope(value)
+    case value.to_s
+    when 'newest'
+      Tag.order(created_at: :desc)
+    when 'oldest'
+      Tag.order(created_at: :asc)
+    else
+      raise Mastodon::InvalidParameterError, "Unknown order: #{value}"
+    end
+  end
+end
diff --git a/app/models/tag.rb b/app/models/tag.rb
index dd1cb3027d20b0..9006e1f25d9c4b 100644
--- a/app/models/tag.rb
+++ b/app/models/tag.rb
@@ -52,6 +52,7 @@ class Tag < ApplicationRecord
   scope :unreviewed, -> { where(reviewed_at: nil) }
   scope :pending_review, -> { unreviewed.where.not(requested_review_at: nil) }
   scope :usable, -> { where(usable: [true, nil]) }
+  scope :not_usable, -> { where(usable: false) }
   scope :listable, -> { where(listable: [true, nil]) }
   scope :trendable, -> { Setting.trendable_by_default ? where(trendable: [true, nil]) : where(trendable: true) }
   scope :not_trendable, -> { where(trendable: false) }
@@ -74,6 +75,10 @@ def display_name
     attributes['display_name'] || name
   end
 
+  def formatted_name
+    "##{display_name}"
+  end
+
   def usable
     boolean_with_default('usable', true)
   end
@@ -132,8 +137,10 @@ def find_or_create_by_names(name_or_names)
 
     def search_for(term, limit = 5, offset = 0, options = {})
       stripped_term = term.strip
+      options.reverse_merge!({ exclude_unlistable: true, exclude_unreviewed: false })
 
-      query = Tag.listable.matches_name(stripped_term)
+      query = Tag.matches_name(stripped_term)
+      query = query.merge(Tag.listable) if options[:exclude_unlistable]
       query = query.merge(matching_name(stripped_term).or(where.not(reviewed_at: nil))) if options[:exclude_unreviewed]
 
       query.order(Arel.sql('length(name) ASC, name ASC'))
diff --git a/app/views/admin/tags/_tag.html.haml b/app/views/admin/tags/_tag.html.haml
new file mode 100644
index 00000000000000..322eee0407ff53
--- /dev/null
+++ b/app/views/admin/tags/_tag.html.haml
@@ -0,0 +1,27 @@
+.batch-table__row{ class: [!tag.requires_review? && !tag.usable? && 'batch-table__row--muted'] }
+  .batch-table__row__content.batch-table__row__content--padded.pending-account
+    .pending-account__header
+      %strong
+        = link_to tag.formatted_name, admin_tag_path(tag.id)
+
+      %br/
+
+      - if tag.usable?
+        = t('admin.tags.moderation.usable')
+      - else
+        = t('admin.tags.moderation.not_usable')
+
+      ·
+      - if tag.trendable?
+        = t('admin.tags.moderation.trendable')
+      - else
+        = t('admin.tags.moderation.not_trendable')
+
+      - if tag.requested_review? || tag.requires_review?
+        ·
+        - if tag.requested_review?
+          %span.negative-hint
+            = t('admin.tags.moderation.review_requested')
+        - else
+          %span.warning-hint
+            = t('admin.tags.moderation.pending_review')
diff --git a/app/views/admin/tags/index.html.haml b/app/views/admin/tags/index.html.haml
new file mode 100644
index 00000000000000..8d76d8ffa7469f
--- /dev/null
+++ b/app/views/admin/tags/index.html.haml
@@ -0,0 +1,39 @@
+- content_for :page_title do
+  = t('admin.tags.title')
+
+= form_with url: admin_tags_url, method: :get, class: :simple_form do |form|
+  .filters
+    .filter-subset.filter-subset--with-select
+      %strong= t('admin.tags.moderation.title')
+      .input.select.optional
+        = form.select :status,
+                      options_for_select(admin_tags_moderation_options, params[:status]),
+                      prompt: t('generic.all')
+
+    .filter-subset.filter-subset--with-select
+      %strong= t 'generic.order_by'
+      .input.select
+        = form.select :order,
+                      options_for_select([[t('admin.tags.newest'), 'newest'], [t('admin.tags.oldest'), 'oldest']], params[:order])
+
+  .fields-group
+    .input.string.optional
+      = form.text_field :name,
+                        value: params[:name],
+                        class: 'string optional',
+                        placeholder: t('admin.tags.name')
+
+  .actions
+    %button.button= t('admin.tags.search')
+    = link_to t('admin.tags.reset'), admin_tags_path, class: 'button negative'
+
+%hr.spacer/
+
+.batch-table
+  .batch-table__body
+    - if @tags.empty?
+      = nothing_here 'nothing-here--under-tabs'
+    - else
+      = render partial: 'tag', collection: @tags
+
+= paginate @tags
diff --git a/app/views/admin/tags/show.html.haml b/app/views/admin/tags/show.html.haml
index f2d87b54b04378..f6155575ae25d0 100644
--- a/app/views/admin/tags/show.html.haml
+++ b/app/views/admin/tags/show.html.haml
@@ -1,12 +1,13 @@
 - content_for :page_title do
-  = "##{@tag.display_name}"
+  = @tag.formatted_name
 
-- if current_user.can?(:view_dashboard)
-  - content_for :heading_actions do
+- content_for :heading_actions do
+  - if current_user.can?(:view_dashboard)
     = l(@time_period.first)
     = ' - '
     = l(@time_period.last)
 
+- if current_user.can?(:view_dashboard)
   .dashboard
     .dashboard__item
       = react_admin_component :counter,
diff --git a/app/views/admin/trends/tags/_tag.html.haml b/app/views/admin/trends/tags/_tag.html.haml
index 8cc0d713b9e178..b1e714a912410f 100644
--- a/app/views/admin/trends/tags/_tag.html.haml
+++ b/app/views/admin/trends/tags/_tag.html.haml
@@ -4,9 +4,7 @@
 
   .batch-table__row__content.pending-account
     .pending-account__header
-      = link_to admin_tag_path(tag.id) do
-        = material_symbol 'tag'
-        = tag.display_name
+      = link_to tag.formatted_name, admin_tag_path(tag.id)
 
       %br/
 
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 322183f4ce9255..aab8db18153424 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -885,7 +885,23 @@ en:
         action: Check here for more information
         message_html: "<strong>Your object storage is misconfigured. The privacy of your users is at risk.</strong>"
     tags:
+      moderation:
+        not_trendable: Not trendable
+        not_usable: Not usable
+        pending_review: Pending review
+        review_requested: Review requested
+        reviewed: Reviewed
+        title: Status
+        trendable: Trendable
+        unreviewed: Unreviewed
+        usable: Usable
+      name: Name
+      newest: Newest
+      oldest: Oldest
+      reset: Reset
       review: Review status
+      search: Search
+      title: Hashtags
       updated_msg: Hashtag settings updated successfully
     title: Administration
     trends:
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml
index 6bc7c6ac525e9f..fee3a6151ad419 100644
--- a/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@@ -314,7 +314,7 @@ en:
         listable: Allow this hashtag to appear in searches and suggestions
         name: Hashtag
         trendable: Allow this hashtag to appear under trends
-        usable: Allow posts to use this hashtag
+        usable: Allow posts to use this hashtag locally
       user:
         role: Role
         time_zone: Time zone
diff --git a/config/navigation.rb b/config/navigation.rb
index c1dd81501cf90d..f006f39a54070e 100644
--- a/config/navigation.rb
+++ b/config/navigation.rb
@@ -40,13 +40,14 @@
 
     n.item :trends, safe_join([fa_icon('fire fw'), t('admin.trends.title')]), admin_trends_statuses_path, if: -> { current_user.can?(:manage_taxonomies) && !self_destruct } do |s|
       s.item :statuses, safe_join([fa_icon('comments-o fw'), t('admin.trends.statuses.title')]), admin_trends_statuses_path, highlights_on: %r{/admin/trends/statuses}
-      s.item :tags, safe_join([fa_icon('hashtag fw'), t('admin.trends.tags.title')]), admin_trends_tags_path, highlights_on: %r{/admin/tags|/admin/trends/tags}
+      s.item :tags, safe_join([fa_icon('hashtag fw'), t('admin.trends.tags.title')]), admin_trends_tags_path, highlights_on: %r{/admin/trends/tags}
       s.item :links, safe_join([fa_icon('newspaper-o fw'), t('admin.trends.links.title')]), admin_trends_links_path, highlights_on: %r{/admin/trends/links}
     end
 
     n.item :moderation, safe_join([fa_icon('gavel fw'), t('moderation.title')]), nil, if: -> { current_user.can?(:manage_reports, :view_audit_log, :manage_users, :manage_invites, :manage_taxonomies, :manage_federation, :manage_blocks) && !self_destruct } do |s|
       s.item :reports, safe_join([fa_icon('flag fw'), t('admin.reports.title')]), admin_reports_path, highlights_on: %r{/admin/reports|admin/report_notes}, if: -> { current_user.can?(:manage_reports) }
       s.item :accounts, safe_join([fa_icon('users fw'), t('admin.accounts.title')]), admin_accounts_path(origin: 'local'), highlights_on: %r{/admin/accounts|admin/account_moderation_notes|/admin/pending_accounts|/admin/disputes|/admin/users}, if: -> { current_user.can?(:manage_users) }
+      s.item :tags, safe_join([fa_icon('hashtag fw'), t('admin.tags.title')]), admin_tags_path, highlights_on: %r{/admin/tags}, if: -> { current_user.can?(:manage_taxonomies) }
       s.item :invites, safe_join([fa_icon('user-plus fw'), t('admin.invites.title')]), admin_invites_path, if: -> { current_user.can?(:manage_invites) }
       s.item :follow_recommendations, safe_join([fa_icon('user-plus fw'), t('admin.follow_recommendations.title')]), admin_follow_recommendations_path, highlights_on: %r{/admin/follow_recommendations}, if: -> { current_user.can?(:manage_taxonomies) }
       s.item :instances, safe_join([fa_icon('cloud fw'), t('admin.instances.title')]), admin_instances_path(limited: limited_federation_mode? ? nil : '1'), highlights_on: %r{/admin/instances|/admin/domain_blocks|/admin/domain_allows}, if: -> { current_user.can?(:manage_federation) }
diff --git a/config/routes/admin.rb b/config/routes/admin.rb
index 207cb0580dcaaf..50c4c10594a010 100644
--- a/config/routes/admin.rb
+++ b/config/routes/admin.rb
@@ -163,7 +163,7 @@
   resources :roles, except: [:show]
   resources :account_moderation_notes, only: [:create, :destroy]
   resource :follow_recommendations, only: [:show, :update]
-  resources :tags, only: [:show, :update]
+  resources :tags, only: [:index, :show, :update]
 
   namespace :trends do
     resources :links, only: [:index] do
diff --git a/spec/controllers/admin/tags_controller_spec.rb b/spec/controllers/admin/tags_controller_spec.rb
index 4e06adaca6780d..1df2bc400309a0 100644
--- a/spec/controllers/admin/tags_controller_spec.rb
+++ b/spec/controllers/admin/tags_controller_spec.rb
@@ -9,6 +9,43 @@
     sign_in Fabricate(:user, role: UserRole.find_by(name: 'Admin'))
   end
 
+  describe 'GET #index' do
+    before do
+      Fabricate(:tag)
+
+      tag_filter = instance_double(Admin::TagFilter, results: Tag.all)
+      allow(Admin::TagFilter).to receive(:new).and_return(tag_filter)
+    end
+
+    let(:params) { { order: 'newest' } }
+
+    it 'returns http success' do
+      get :index
+
+      expect(response).to have_http_status(200)
+      expect(response).to render_template(:index)
+
+      expect(Admin::TagFilter)
+        .to have_received(:new)
+        .with(hash_including(params))
+    end
+
+    describe 'with filters' do
+      let(:params) { { order: 'newest', name: 'test' } }
+
+      it 'returns http success' do
+        get :index, params: { name: 'test' }
+
+        expect(response).to have_http_status(200)
+        expect(response).to render_template(:index)
+
+        expect(Admin::TagFilter)
+          .to have_received(:new)
+          .with(hash_including(params))
+      end
+    end
+  end
+
   describe 'GET #show' do
     let!(:tag) { Fabricate(:tag) }
 
diff --git a/spec/models/admin/tag_filter_spec.rb b/spec/models/admin/tag_filter_spec.rb
new file mode 100644
index 00000000000000..21dc28affb3209
--- /dev/null
+++ b/spec/models/admin/tag_filter_spec.rb
@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe Admin::TagFilter do
+  describe 'with invalid params' do
+    it 'raises with key error' do
+      filter = described_class.new(wrong: true)
+
+      expect { filter.results }.to raise_error(/wrong/)
+    end
+
+    it 'raises with status scope error' do
+      filter = described_class.new(status: 'unknown')
+
+      expect { filter.results }.to raise_error(/Unknown status: unknown/)
+    end
+
+    it 'raises with order value error' do
+      filter = described_class.new(order: 'unknown')
+
+      expect { filter.results }.to raise_error(/Unknown order: unknown/)
+    end
+  end
+
+  describe '#results' do
+    let(:listable_tag) { Fabricate(:tag, name: 'test1', listable: true) }
+    let(:not_listable_tag) { Fabricate(:tag, name: 'test2', listable: false) }
+
+    it 'returns tags filtered by name' do
+      filter = described_class.new(name: 'test')
+
+      expect(filter.results).to eq([listable_tag, not_listable_tag])
+    end
+  end
+end
diff --git a/spec/models/tag_spec.rb b/spec/models/tag_spec.rb
index a3cae4a33961d0..ff0a0551133102 100644
--- a/spec/models/tag_spec.rb
+++ b/spec/models/tag_spec.rb
@@ -112,6 +112,18 @@
     end
   end
 
+  describe '#formatted_name' do
+    it 'returns name with a proceeding hash symbol' do
+      tag = Fabricate(:tag, name: 'foo')
+      expect(tag.formatted_name).to eq '#foo'
+    end
+
+    it 'returns display_name with a proceeding hash symbol, if display name present' do
+      tag = Fabricate(:tag, name: 'foobar', display_name: 'FooBar')
+      expect(tag.formatted_name).to eq '#FooBar'
+    end
+  end
+
   describe '.recently_used' do
     let(:account) { Fabricate(:account) }
     let(:other_person_status) { Fabricate(:status) }
@@ -240,5 +252,23 @@
 
       expect(results).to eq [tag, similar_tag]
     end
+
+    it 'finds only listable tags' do
+      tag = Fabricate(:tag, name: 'match')
+      _miss_tag = Fabricate(:tag, name: 'matchunlisted', listable: false)
+
+      results = described_class.search_for('match')
+
+      expect(results).to eq [tag]
+    end
+
+    it 'finds non-listable tags as well via option' do
+      tag = Fabricate(:tag, name: 'match')
+      unlisted_tag = Fabricate(:tag, name: 'matchunlisted', listable: false)
+
+      results = described_class.search_for('match', 5, 0, exclude_unlistable: false)
+
+      expect(results).to eq [tag, unlisted_tag]
+    end
   end
 end

From 1229d2907a4a7ee09ee42cd24043d74561507e0a Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 29 Jul 2024 18:00:55 +0200
Subject: [PATCH 1653/2191] chore(deps): update docker/dockerfile docker tag to
 v1.9 (#31187)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Dockerfile           | 2 +-
 streaming/Dockerfile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 758db9bcc90b56..bc7cd3b682122d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.8
+# syntax=docker/dockerfile:1.9
 
 # This file is designed for production server deployment, not local development work
 # For a containerized local dev environment, see: https://github.com/mastodon/mastodon/blob/main/README.md#docker
diff --git a/streaming/Dockerfile b/streaming/Dockerfile
index d9f7615fa80c39..938f1655d15d24 100644
--- a/streaming/Dockerfile
+++ b/streaming/Dockerfile
@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.8
+# syntax=docker/dockerfile:1.9
 
 # Please see https://docs.docker.com/engine/reference/builder for information about
 # the extended buildx capabilities used in this file.

From 7e33583daaeff838c649a2720858017e9bea1d22 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 29 Jul 2024 13:19:05 -0400
Subject: [PATCH 1654/2191] Dont run crowdin upload workflow on forks (#31195)

---
 .github/workflows/crowdin-upload.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/crowdin-upload.yml b/.github/workflows/crowdin-upload.yml
index 4c9d7b096b8e63..c1da4088e931ce 100644
--- a/.github/workflows/crowdin-upload.yml
+++ b/.github/workflows/crowdin-upload.yml
@@ -19,6 +19,7 @@ on:
 jobs:
   upload-translations:
     runs-on: ubuntu-latest
+    if: github.repository == 'mastodon/mastodon'
 
     steps:
       - name: Checkout

From eae81d32544d4433f7b46b7a527304757fa8183a Mon Sep 17 00:00:00 2001
From: Michael Stanclift <mx@vmstan.com>
Date: Mon, 29 Jul 2024 03:10:23 -0500
Subject: [PATCH 1655/2191] [Glitch] Follow up tweaking of admin UI changes

Port 848a5ca53d47d335cf74e82c584c36dce701172a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/styles/admin.scss       |  2 +-
 .../flavours/glitch/styles/mastodon-light/diff.scss    | 10 ----------
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/app/javascript/flavours/glitch/styles/admin.scss b/app/javascript/flavours/glitch/styles/admin.scss
index f4289a9ac34afa..110d5f249d7f94 100644
--- a/app/javascript/flavours/glitch/styles/admin.scss
+++ b/app/javascript/flavours/glitch/styles/admin.scss
@@ -1,6 +1,6 @@
 @use 'sass:math';
 
-$no-columns-breakpoint: 600px;
+$no-columns-breakpoint: 890px;
 $sidebar-width: 300px;
 $content-width: 840px;
 
diff --git a/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss b/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss
index b7d508cdccd14b..e97b40d3f744f4 100644
--- a/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss
+++ b/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss
@@ -298,12 +298,6 @@ html {
 .directory__tag > div {
   background: $white;
   border: 1px solid var(--background-border-color);
-
-  @media screen and (max-width: $no-gap-breakpoint) {
-    border-left: 0;
-    border-right: 0;
-    border-top: 0;
-  }
 }
 
 .picture-in-picture-placeholder {
@@ -318,10 +312,6 @@ html {
   &:focus {
     background: $ui-base-color;
   }
-
-  @media screen and (max-width: $no-gap-breakpoint) {
-    border: 0;
-  }
 }
 
 .batch-table {

From ceb7972e6e6ae709f1d3f6cc9ff3a19d61873d71 Mon Sep 17 00:00:00 2001
From: Emelia Smith <ThisIsMissEm@users.noreply.github.com>
Date: Mon, 29 Jul 2024 17:49:44 +0200
Subject: [PATCH 1656/2191] [Glitch] Implement UI for Admin Search of Hashtags

Port SCSS changes from c40e48116993e9a0b1701c40eded924dd496d5a7 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/styles/accounts.scss | 4 ++++
 app/javascript/flavours/glitch/styles/tables.scss   | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/app/javascript/flavours/glitch/styles/accounts.scss b/app/javascript/flavours/glitch/styles/accounts.scss
index eba786ff9f6ac5..719d21fa818138 100644
--- a/app/javascript/flavours/glitch/styles/accounts.scss
+++ b/app/javascript/flavours/glitch/styles/accounts.scss
@@ -359,6 +359,10 @@
       color: $primary-text-color;
       font-weight: 700;
     }
+
+    .warning-hint {
+      font-weight: normal !important;
+    }
   }
 
   &__body {
diff --git a/app/javascript/flavours/glitch/styles/tables.scss b/app/javascript/flavours/glitch/styles/tables.scss
index caebb952b8511a..dd73f6e2055f1b 100644
--- a/app/javascript/flavours/glitch/styles/tables.scss
+++ b/app/javascript/flavours/glitch/styles/tables.scss
@@ -286,6 +286,10 @@ a.table-action-link {
         padding: 0;
       }
 
+      &--padded {
+        padding: 12px 16px 16px;
+      }
+
       &--with-image {
         display: flex;
         align-items: center;

From 30899e050e4de5952da14278e804ea23110f9204 Mon Sep 17 00:00:00 2001
From: Essem <smswessem@gmail.com>
Date: Wed, 24 Jul 2024 23:10:43 -0500
Subject: [PATCH 1657/2191] Fix reactions bar alignment in grouped
 notifications

---
 app/javascript/flavours/glitch/styles/components.scss | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index 32268b032ca9ef..e439a393644264 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -11078,7 +11078,8 @@ noscript {
   $icon-margin: 48px; // 40px avatar + 8px gap
 
   .status__content,
-  .status__action-bar {
+  .status__action-bar,
+  .reactions-bar {
     margin-inline-start: $icon-margin;
     width: calc(100% - $icon-margin);
   }

From 5b2f994ad4c56f07b75374e75fb63fa819809039 Mon Sep 17 00:00:00 2001
From: Jeremy Kescher <jeremy@kescher.at>
Date: Tue, 30 Jul 2024 08:46:23 +0200
Subject: [PATCH 1658/2191] Bump Catstodon revision to 1.0.3

---
 CHANGELOG.md            | 8 ++++++++
 lib/mastodon/version.rb | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c571b8ee17ea83..835bc66567a52a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,14 @@ All changes to Catstodon that aren't Mastodon or glitch-soc Mastodon changes wil
 
 All release dates, as well as most other dates, are intended to be read as "within the day, in UTC time."
 
+## [4.3.0-alpha.5+glitch+cat+1.0.3] - 2024-07-30
+
+- Upstream changes
+  - Fixes for intermittent errors in grouped notifications
+- Emoji reaction patch changes
+  - "Fix reactions bar alignment in ungrouped notifications" ([30899e050e](https://git.kescher.at/CatCatNya/catstodon/commit/30899e050e4de5952da14278e804ea23110f9204)) by Essem
+  - Other commit for i18n fixes was already applied in Catstodon.
+
 ## [v4.3.0-alpha.5+glitch+cat+1.0.2] - 2024-07-16
 
 - Upstream changes
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index 5af47335517f42..f4a590dbd2d44c 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -25,7 +25,7 @@ def prerelease
     end
 
     def catstodon_revision
-      '1.0.2'
+      '1.0.3'
     end
 
     def build_metadata

From e1f7ca7cedd22ecf402abe484aefacaa93f994ab Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 30 Jul 2024 10:00:33 +0200
Subject: [PATCH 1659/2191] chore(deps): update dependency json-ld to v3.3.2
 (#31205)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 1cf7f8d7696bc4..5022270270e1ea 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -357,13 +357,14 @@ GEM
       aes_key_wrap
       bindata
       httpclient
-    json-ld (3.3.1)
+    json-ld (3.3.2)
       htmlentities (~> 4.3)
       json-canonicalization (~> 1.0)
       link_header (~> 0.0, >= 0.0.8)
       multi_json (~> 1.15)
       rack (>= 2.2, < 4)
       rdf (~> 3.3)
+      rexml (~> 3.2)
     json-ld-preloaded (3.3.0)
       json-ld (~> 3.3)
       rdf (~> 3.3)
@@ -675,8 +676,9 @@ GEM
       zeitwerk (~> 2.6)
     rainbow (3.1.1)
     rake (13.2.1)
-    rdf (3.3.1)
+    rdf (3.3.2)
       bcp47_spec (~> 0.2)
+      bigdecimal (~> 3.1, >= 3.1.5)
       link_header (~> 0.0, >= 0.0.8)
     rdf-normalize (0.7.0)
       rdf (~> 3.3)

From 7d11a6c9b0e75868f803c11d97957359e3e2d218 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 30 Jul 2024 10:15:40 +0200
Subject: [PATCH 1660/2191] New Crowdin Translations (automated) (#31206)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/fi.json | 20 +++++++--------
 app/javascript/mastodon/locales/th.json |  8 ++++++
 config/locales/bg.yml                   | 16 ++++++++++++
 config/locales/da.yml                   | 16 ++++++++++++
 config/locales/de.yml                   | 20 +++++++++++++--
 config/locales/doorkeeper.nl.yml        |  2 +-
 config/locales/doorkeeper.th.yml        |  1 +
 config/locales/fi.yml                   | 34 ++++++++++++++++++-------
 config/locales/fo.yml                   | 16 ++++++++++++
 config/locales/gl.yml                   | 16 ++++++++++++
 config/locales/hu.yml                   | 16 ++++++++++++
 config/locales/ia.yml                   |  3 +++
 config/locales/is.yml                   | 16 ++++++++++++
 config/locales/lt.yml                   | 17 +++++++++++++
 config/locales/nl.yml                   | 16 ++++++++++++
 config/locales/pl.yml                   | 16 ++++++++++++
 config/locales/simple_form.an.yml       |  1 -
 config/locales/simple_form.ar.yml       |  1 -
 config/locales/simple_form.ast.yml      |  1 -
 config/locales/simple_form.be.yml       |  1 -
 config/locales/simple_form.bg.yml       |  2 +-
 config/locales/simple_form.br.yml       |  1 -
 config/locales/simple_form.ca.yml       |  1 -
 config/locales/simple_form.ckb.yml      |  1 -
 config/locales/simple_form.co.yml       |  1 -
 config/locales/simple_form.cs.yml       |  1 -
 config/locales/simple_form.cy.yml       |  1 -
 config/locales/simple_form.da.yml       |  2 +-
 config/locales/simple_form.de.yml       |  2 +-
 config/locales/simple_form.el.yml       |  1 -
 config/locales/simple_form.en-GB.yml    |  1 -
 config/locales/simple_form.eo.yml       |  1 -
 config/locales/simple_form.es-AR.yml    |  1 -
 config/locales/simple_form.es-MX.yml    |  1 -
 config/locales/simple_form.es.yml       |  1 -
 config/locales/simple_form.et.yml       |  1 -
 config/locales/simple_form.eu.yml       |  1 -
 config/locales/simple_form.fa.yml       |  1 -
 config/locales/simple_form.fi.yml       | 10 ++++----
 config/locales/simple_form.fo.yml       |  2 +-
 config/locales/simple_form.fr-CA.yml    |  1 -
 config/locales/simple_form.fr.yml       |  1 -
 config/locales/simple_form.fy.yml       |  1 -
 config/locales/simple_form.ga.yml       |  1 -
 config/locales/simple_form.gd.yml       |  1 -
 config/locales/simple_form.gl.yml       |  2 +-
 config/locales/simple_form.he.yml       |  1 -
 config/locales/simple_form.hu.yml       |  2 +-
 config/locales/simple_form.hy.yml       |  1 -
 config/locales/simple_form.ia.yml       |  1 -
 config/locales/simple_form.id.yml       |  1 -
 config/locales/simple_form.ie.yml       |  1 -
 config/locales/simple_form.io.yml       |  1 -
 config/locales/simple_form.is.yml       |  2 +-
 config/locales/simple_form.it.yml       |  1 -
 config/locales/simple_form.ja.yml       |  1 -
 config/locales/simple_form.kk.yml       |  1 -
 config/locales/simple_form.ko.yml       |  1 -
 config/locales/simple_form.ku.yml       |  1 -
 config/locales/simple_form.lad.yml      |  1 -
 config/locales/simple_form.lt.yml       |  2 +-
 config/locales/simple_form.lv.yml       |  1 -
 config/locales/simple_form.ms.yml       |  1 -
 config/locales/simple_form.my.yml       |  1 -
 config/locales/simple_form.nl.yml       |  2 +-
 config/locales/simple_form.nn.yml       |  1 -
 config/locales/simple_form.no.yml       |  1 -
 config/locales/simple_form.oc.yml       |  1 -
 config/locales/simple_form.pl.yml       |  2 +-
 config/locales/simple_form.pt-BR.yml    |  1 -
 config/locales/simple_form.pt-PT.yml    |  1 -
 config/locales/simple_form.ro.yml       |  1 -
 config/locales/simple_form.ru.yml       |  1 -
 config/locales/simple_form.sc.yml       |  1 -
 config/locales/simple_form.sco.yml      |  1 -
 config/locales/simple_form.si.yml       |  1 -
 config/locales/simple_form.sk.yml       |  1 -
 config/locales/simple_form.sl.yml       |  1 -
 config/locales/simple_form.sq.yml       |  1 -
 config/locales/simple_form.sr-Latn.yml  |  1 -
 config/locales/simple_form.sr.yml       |  1 -
 config/locales/simple_form.sv.yml       |  1 -
 config/locales/simple_form.th.yml       |  1 -
 config/locales/simple_form.tr.yml       |  1 -
 config/locales/simple_form.uk.yml       |  1 -
 config/locales/simple_form.vi.yml       |  1 -
 config/locales/simple_form.zh-CN.yml    |  1 -
 config/locales/simple_form.zh-HK.yml    |  1 -
 config/locales/zh-TW.yml                | 16 ++++++++++++
 89 files changed, 242 insertions(+), 98 deletions(-)

diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index fc1d252325e48d..c1cdb684627eb7 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -223,14 +223,14 @@
   "domain_pill.activitypub_lets_connect": "Sen avulla voit muodostaa yhteyden ja olla vuorovaikutuksessa ihmisten kanssa, ei vain Mastodonissa vaan myös muissa sosiaalisissa sovelluksissa.",
   "domain_pill.activitypub_like_language": "ActivityPub on kuin kieli, jota Mastodon puhuu muiden sosiaalisten verkostojen kanssa.",
   "domain_pill.server": "Palvelin",
-  "domain_pill.their_handle": "Hänen käyttäjänimensä:",
+  "domain_pill.their_handle": "Hänen käyttäjätunnuksensa:",
   "domain_pill.their_server": "Hänen digitaalinen kotinsa, jossa kaikki hänen julkaisunsa sijaitsevat.",
   "domain_pill.their_username": "Hänen yksilöllinen tunnisteensa omalla palvelimellaan. Eri palvelimilta on mahdollista löytää käyttäjiä, joilla on sama käyttäjänimi.",
   "domain_pill.username": "Käyttäjänimi",
-  "domain_pill.whats_in_a_handle": "Mitä käyttäjänimessä on?",
+  "domain_pill.whats_in_a_handle": "Mitä käyttäjätunnuksessa on?",
   "domain_pill.who_they_are": "Koska käyttäjätunnukset kertovat, kuka ja missä joku on, voit olla vuorovaikutuksessa ihmisten kanssa läpi sosiaalisen verkon, joka koostuu <button>ActivityPub-pohjaisista alustoista</button>.",
   "domain_pill.who_you_are": "Koska käyttäjätunnuksesi kertoo, kuka ja missä olet, ihmiset voivat olla vaikutuksessa kanssasi läpi sosiaalisen verkon, joka koostuu <button>ActivityPub-pohjaisista alustoista</button>.",
-  "domain_pill.your_handle": "Käyttäjänimesi:",
+  "domain_pill.your_handle": "Käyttäjätunnuksesi:",
   "domain_pill.your_server": "Digitaalinen kotisi, jossa kaikki julkaisusi sijaitsevat. Etkö pidä tästä? Siirry palvelimelta toiselle milloin tahansa ja tuo myös seuraajasi mukanasi.",
   "domain_pill.your_username": "Yksilöllinen tunnisteesi tällä palvelimella. Eri palvelimilta on mahdollista löytää käyttäjiä, joilla on sama käyttäjänimi.",
   "embed.instructions": "Upota julkaisu verkkosivullesi kopioimalla alla oleva koodi.",
@@ -357,7 +357,7 @@
   "home.pending_critical_update.link": "Tutustu päivityssisältöihin",
   "home.pending_critical_update.title": "Kriittinen tietoturvapäivitys saatavilla!",
   "home.show_announcements": "Näytä tiedotteet",
-  "interaction_modal.description.favourite": "Mastodon-tilillä voit lisätä tämän julkaisun suosikkeihisi osoittaaksesi kirjoittajalle arvostavasi sitä ja tallentaaksesi sen tulevaa käyttöä varten.",
+  "interaction_modal.description.favourite": "Mastodon-tilillä voit lisätä tämän julkaisun suosikkeihisi osoittaaksesi tekijälle arvostavasi sitä ja tallentaaksesi sen tulevaa käyttöä varten.",
   "interaction_modal.description.follow": "Mastodon-tilillä voit seurata käyttäjää {name} saadaksesi hänen julkaisunsa kotisyötteeseesi.",
   "interaction_modal.description.reblog": "Mastodon-tilillä voit tehostaa tätä julkaisua jakaaksesi sen seuraajiesi kanssa.",
   "interaction_modal.description.reply": "Mastodon-tilillä voit vastata tähän julkaisuun.",
@@ -367,7 +367,7 @@
   "interaction_modal.on_another_server": "Toisella palvelimella",
   "interaction_modal.on_this_server": "Tällä palvelimella",
   "interaction_modal.sign_in": "Et ole kirjautunut tälle palvelimelle. Millä palvelimella tilisi sijaitsee?",
-  "interaction_modal.sign_in_hint": "Vihje: Se on sama verkkosivusto, jolle rekisteröidyit. Jos et muista, etsi tervetulosähköposti saapuneista viesteistäsi. Voit myös syöttää koko käyttäjätunnuksesi! (Esimerkki: @Mastodon@Mastodon.social)",
+  "interaction_modal.sign_in_hint": "Vihje: Se on sama verkkosivusto, jolle rekisteröidyit. Jos et muista palvelintasi, etsi tervetulosähköposti saapuneista viesteistäsi. Voit myös syöttää koko käyttäjätunnuksesi! (Esimerkki: @Mastodon@Mastodon.social)",
   "interaction_modal.title.favourite": "Lisää käyttäjän {name} julkaisu suosikkeihin",
   "interaction_modal.title.follow": "Seuraa käyttäjää {name}",
   "interaction_modal.title.reblog": "Tehosta käyttäjän {name} julkaisua",
@@ -392,13 +392,13 @@
   "keyboard_shortcuts.hotkey": "Pikanäppäin",
   "keyboard_shortcuts.legend": "Näytä tämä ohje",
   "keyboard_shortcuts.local": "Avaa paikallinen aikajana",
-  "keyboard_shortcuts.mention": "Mainitse julkaisija",
+  "keyboard_shortcuts.mention": "Mainitse tekijä",
   "keyboard_shortcuts.muted": "Avaa mykistettyjen käyttäjien luettelo",
   "keyboard_shortcuts.my_profile": "Avaa profiilisi",
   "keyboard_shortcuts.notifications": "Avaa ilmoitussarake",
   "keyboard_shortcuts.open_media": "Avaa media",
   "keyboard_shortcuts.pinned": "Avaa kiinnitettyjen julkaisujen luettelo",
-  "keyboard_shortcuts.profile": "Avaa kirjoittajan profiili",
+  "keyboard_shortcuts.profile": "Avaa tekijän profiili",
   "keyboard_shortcuts.reply": "Vastaa julkaisuun",
   "keyboard_shortcuts.requests": "Avaa seurantapyyntöjen luettelo",
   "keyboard_shortcuts.search": "Kohdista hakukenttään",
@@ -591,7 +591,7 @@
   "onboarding.steps.share_profile.body": "Kerro kavereillesi, kuinka sinut löytää Mastodonista",
   "onboarding.steps.share_profile.title": "Jaa Mastodon-profiilisi",
   "onboarding.tips.2fa": "<strong>Tiesitkö?</strong> Voit suojata tilisi ottamalla kaksivaiheisen todennuksen käyttöön tilisi asetuksista. Se toimii millä tahansa TOTP-sovelluksella, eikä sen käyttö edellytä puhelinnumeron luovuttamista!",
-  "onboarding.tips.accounts_from_other_servers": "<strong>Tiesitkö?</strong> Koska Mastodon on hajautettu, osa kohtaamistasi profiileista sijaitsee muilla kuin sinun palvelimellasi. Voit silti viestiä saumattomasti heidän kanssaan! Heidän palvelimensa mainitaan käyttäjänimen jälkiosassa!",
+  "onboarding.tips.accounts_from_other_servers": "<strong>Tiesitkö?</strong> Koska Mastodon on hajautettu, osa kohtaamistasi profiileista sijaitsee muilla kuin sinun palvelimellasi. Voit silti viestiä saumattomasti heidän kanssaan! Heidän palvelimensa mainitaan käyttäjätunnuksen jälkiosassa!",
   "onboarding.tips.migration": "<strong>Tiesitkö?</strong> Jos koet, ettei {domain} ole jatkossa itsellesi hyvä palvelinvalinta, voit siirtyä toiselle Mastodon-palvelimelle menettämättä seuraajiasi. Voit jopa isännöidä omaa palvelintasi!",
   "onboarding.tips.verification": "<strong>Tiesitkö?</strong> Voit vahvistaa tilisi lisäämällä omalle verkkosivustollesi linkin Mastodon-profiiliisi ja lisäämällä sitten verkkosivustosi osoitteen Mastodon-profiilisi lisäkenttään. Tämä ei maksa mitään, eikä sinun tarvitse lähetellä asiakirjoja!",
   "password_confirmation.exceeds_maxlength": "Salasanan vahvistus ylittää salasanan enimmäispituuden",
@@ -727,7 +727,7 @@
   "status.bookmark": "Lisää kirjanmerkki",
   "status.cancel_reblog_private": "Peru tehostus",
   "status.cannot_reblog": "Tätä julkaisua ei voi tehostaa",
-  "status.copy": "Kopioi julkaisun linkki",
+  "status.copy": "Kopioi linkki julkaisuun",
   "status.delete": "Poista",
   "status.detailed_status": "Yksityiskohtainen keskustelunäkymä",
   "status.direct": "Mainitse @{name} yksityisesti",
@@ -821,7 +821,7 @@
   "upload_modal.preview_label": "Esikatselu ({ratio})",
   "upload_progress.label": "Tallennetaan...",
   "upload_progress.processing": "Käsitellään…",
-  "username.taken": "Käyttäjänimi on jo varattu. Kokeile toista",
+  "username.taken": "Tämä käyttäjänimi on jo käytössä. Kokeile toista",
   "video.close": "Sulje video",
   "video.download": "Lataa tiedosto",
   "video.exit_fullscreen": "Poistu koko näytön tilasta",
diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json
index 508fb15d15ba64..99300b86dbedf2 100644
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@@ -171,21 +171,28 @@
   "confirmations.block.confirm": "ปิดกั้น",
   "confirmations.delete.confirm": "ลบ",
   "confirmations.delete.message": "คุณแน่ใจหรือไม่ว่าต้องการลบโพสต์นี้?",
+  "confirmations.delete.title": "ลบโพสต์?",
   "confirmations.delete_list.confirm": "ลบ",
   "confirmations.delete_list.message": "คุณแน่ใจหรือไม่ว่าต้องการลบรายการนี้อย่างถาวร?",
+  "confirmations.delete_list.title": "ลบรายการ?",
   "confirmations.discard_edit_media.confirm": "ละทิ้ง",
   "confirmations.discard_edit_media.message": "คุณมีการเปลี่ยนแปลงคำอธิบายหรือตัวอย่างสื่อที่ยังไม่ได้บันทึก ละทิ้งการเปลี่ยนแปลงเหล่านั้นต่อไป?",
   "confirmations.edit.confirm": "แก้ไข",
   "confirmations.edit.message": "การแก้ไขในตอนนี้จะเขียนทับข้อความที่คุณกำลังเขียนในปัจจุบัน คุณแน่ใจหรือไม่ว่าต้องการดำเนินการต่อ?",
+  "confirmations.edit.title": "เขียนทับโพสต์?",
   "confirmations.logout.confirm": "ออกจากระบบ",
   "confirmations.logout.message": "คุณแน่ใจหรือไม่ว่าต้องการออกจากระบบ?",
+  "confirmations.logout.title": "ออกจากระบบ?",
   "confirmations.mute.confirm": "ซ่อน",
   "confirmations.redraft.confirm": "ลบแล้วร่างใหม่",
   "confirmations.redraft.message": "คุณแน่ใจหรือไม่ว่าต้องการลบโพสต์นี้แล้วร่างโพสต์ใหม่? รายการโปรดและการดันจะสูญหาย และการตอบกลับโพสต์ดั้งเดิมจะไม่มีความเกี่ยวพัน",
+  "confirmations.redraft.title": "ลบแล้วร่างโพสต์ใหม่?",
   "confirmations.reply.confirm": "ตอบกลับ",
   "confirmations.reply.message": "การตอบกลับในตอนนี้จะเขียนทับข้อความที่คุณกำลังเขียนในปัจจุบัน คุณแน่ใจหรือไม่ว่าต้องการดำเนินการต่อ?",
+  "confirmations.reply.title": "เขียนทับโพสต์?",
   "confirmations.unfollow.confirm": "เลิกติดตาม",
   "confirmations.unfollow.message": "คุณแน่ใจหรือไม่ว่าต้องการเลิกติดตาม {name}?",
+  "confirmations.unfollow.title": "เลิกติดตามผู้ใช้?",
   "conversation.delete": "ลบการสนทนา",
   "conversation.mark_as_read": "ทำเครื่องหมายว่าอ่านแล้ว",
   "conversation.open": "ดูการสนทนา",
@@ -503,6 +510,7 @@
   "notification_requests.title": "การแจ้งเตือนที่กรองอยู่",
   "notifications.clear": "ล้างการแจ้งเตือน",
   "notifications.clear_confirmation": "คุณแน่ใจหรือไม่ว่าต้องการล้างการแจ้งเตือนทั้งหมดของคุณอย่างถาวร?",
+  "notifications.clear_title": "ล้างการแจ้งเตือน?",
   "notifications.column_settings.admin.report": "รายงานใหม่:",
   "notifications.column_settings.admin.sign_up": "การลงทะเบียนใหม่:",
   "notifications.column_settings.alert": "การแจ้งเตือนบนเดสก์ท็อป",
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index fdaab7ac2afa59..c71fab2177eb8c 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -885,7 +885,23 @@ bg:
         action: Щракнете тук за повече информация
         message_html: "<strong>Вашето съхранение на предмети е погрешно конфигурирано. Поверителността на потребителите ви е изложена на риск.</strong>"
     tags:
+      moderation:
+        not_trendable: Не изгряващо
+        not_usable: Не употребимо
+        pending_review: Чака се преглед
+        review_requested: Иска се преглед
+        reviewed: Прегледано
+        title: Състояние
+        trendable: Изгряващо
+        unreviewed: Непрегледано
+        usable: Употребимо
+      name: Име
+      newest: Най-нови
+      oldest: Най-стари
+      reset: Нулиране
       review: Преглед на състояние
+      search: Търсене
+      title: Хаштагове
       updated_msg: Успешно осъвременени настройки на хаштага
     title: Администрация
     trends:
diff --git a/config/locales/da.yml b/config/locales/da.yml
index e699d9e8adefd9..004aea520adc58 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -884,7 +884,23 @@ da:
         action: Tjek her for flere oplysninger
         message_html: "<strong>Objektlageret er fejlopsat. Brugernes fortrolighed er i fare.</strong>"
     tags:
+      moderation:
+        not_trendable: Ikke trendegnet
+        not_usable: Ikke brugbar
+        pending_review: Afventer revision
+        review_requested: Revision anmodet
+        reviewed: Revideret
+        title: Status
+        trendable: Trendegnet
+        unreviewed: Urevideret
+        usable: Brugbar
+      name: Navn
+      newest: Seneste
+      oldest: Ældste
+      reset: Nulstil
       review: Revisionsstatus
+      search: Søg
+      title: Hashtags
       updated_msg: Hashtag-indstillinger opdateret
     title: Administration
     trends:
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 33df54538520e4..b133cf94bcbf8c 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -151,7 +151,7 @@ de:
       subscribe: Abonnieren
       suspend: Sperren
       suspended: Gesperrt
-      suspension_irreversible: Die Daten dieses Kontos wurden unwiderruflich gelöscht. Du kannst das Konto entsperren, um es wieder nutzbar zu machen, aber es wird keine Daten wiederherstellen, die es davor hatte.
+      suspension_irreversible: Die Daten dieses Kontos wurden unwiderruflich gelöscht. Du kannst das Konto entsperren, um es wieder zu verwenden, aber es wird keine Daten wiederherstellen, die es davor hatte.
       suspension_reversible_hint_html: Das Konto wurde gesperrt und die Daten werden am %{date} vollständig gelöscht. Bis dahin kann das Konto ohne irgendwelche negativen Auswirkungen wiederhergestellt werden. Wenn du alle Daten des Kontos sofort entfernen möchtest, kannst du das nachfolgend tun.
       title: Konten
       unblock_email: E-Mail-Adresse entsperren
@@ -885,7 +885,23 @@ de:
         action: Für weitere Informationen hier klicken
         message_html: "<strong>Die Konfiguration deines Objektspeichers ist fehlerhaft. Die Privatsphäre deiner Benutzer*innen ist gefährdet.</strong>"
     tags:
+      moderation:
+        not_trendable: Nicht trendfähig
+        not_usable: Nicht verwendbar
+        pending_review: Überprüfung ausstehend
+        review_requested: Überprüfung angefordert
+        reviewed: Überprüft
+        title: Status
+        trendable: Trendfähig
+        unreviewed: Ungeprüft
+        usable: Verwendbar
+      name: Name
+      newest: Neueste
+      oldest: Älteste
+      reset: Zurücksetzen
       review: Prüfstatus
+      search: Suchen
+      title: Hashtags
       updated_msg: Hashtag-Einstellungen erfolgreich aktualisiert
     title: Administration
     trends:
@@ -1455,7 +1471,7 @@ de:
       backreference_required: Das neue Konto muss zuerst auf das alte Konto verweisen
       before: 'Bevor du fortfährst, lies bitte diese Hinweise sorgfältig durch:'
       cooldown: Nach dem Umzug wird es eine Weile dauern, bis du erneut umziehen darfst
-      disabled_account: Dein altes Konto ist nur noch eingeschränkt nutzbar. Du kannst jedoch deine Daten exportieren und das Konto wieder reaktivieren.
+      disabled_account: Dein altes Konto ist nur noch eingeschränkt verwendbar. Du kannst jedoch deine Daten exportieren und das Konto wieder reaktivieren.
       followers: Alle Follower werden vom alten zum neuen Konto übertragen
       only_redirect_html: Alternativ kannst du auch <a href="%{path}">nur eine Weiterleitung zu deinem neuen Konto</a> einrichten, ohne die Follower zu übertragen.
       other_data: Keine anderen Daten werden automatisch zum neuen Konto übertragen
diff --git a/config/locales/doorkeeper.nl.yml b/config/locales/doorkeeper.nl.yml
index f75cc04eab2d82..65ef826d387d8f 100644
--- a/config/locales/doorkeeper.nl.yml
+++ b/config/locales/doorkeeper.nl.yml
@@ -83,7 +83,7 @@ nl:
         access_denied: De resource-eigenaar of autorisatie-server weigerde het verzoek.
         credential_flow_not_configured: De wachtwoordgegevens-flow van de resource-eigenaar is mislukt omdat Doorkeeper.configure.resource_owner_from_credentials niet is ingesteld.
         invalid_client: Clientverificatie is mislukt door een onbekende client, ontbrekende client-authenticatie of een niet ondersteunde authenticatie-methode.
-        invalid_code_challenge_method: De code-uitdagingsmethode moet S256 zijn, eenvoudig wordt niet ondersteund.
+        invalid_code_challenge_method: De code challenge method moet S256 zijn, plain wordt niet ondersteund.
         invalid_grant: De verstrekte autorisatie is ongeldig, verlopen, ingetrokken, komt niet overeen met de redirect-URI die is opgegeven of werd uitgegeven aan een andere client.
         invalid_redirect_uri: De opgegeven redirect-URI is ongeldig.
         invalid_request:
diff --git a/config/locales/doorkeeper.th.yml b/config/locales/doorkeeper.th.yml
index b0d0549d1df2c1..3735386ba3831f 100644
--- a/config/locales/doorkeeper.th.yml
+++ b/config/locales/doorkeeper.th.yml
@@ -83,6 +83,7 @@ th:
         access_denied: เจ้าของทรัพยากรหรือเซิร์ฟเวอร์การอนุญาตปฏิเสธคำขอ
         credential_flow_not_configured: โฟลว์ข้อมูลประจำตัวรหัสผ่านเจ้าของทรัพยากรล้มเหลวเนื่องจากไม่ได้กำหนดค่า Doorkeeper.configure.resource_owner_from_credentials
         invalid_client: การรับรองความถูกต้องไคลเอ็นต์ล้มเหลวเนื่องจากไคลเอ็นต์ที่ไม่รู้จัก ไม่ได้รวมการรับรองความถูกต้องไคลเอ็นต์ หรือวิธีการรับรองความถูกต้องที่ไม่รองรับ
+        invalid_code_challenge_method: วิธีการทดสอบรหัสต้องเป็น S256 ไม่รองรับแบบธรรมดา
         invalid_grant: การให้การรับรองความถูกต้องที่ให้มาไม่ถูกต้อง หมดอายุแล้ว เพิกถอนแล้ว ไม่ตรงกับ URI การเปลี่ยนเส้นทางที่ใช้ในคำขอการรับรองความถูกต้อง หรือออกให้ไคลเอ็นต์อื่น
         invalid_redirect_uri: URI การเปลี่ยนเส้นทางที่รวมอยู่ไม่ถูกต้อง
         invalid_request:
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 0aa38ed923acf4..8e05e4ae34d260 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -463,13 +463,13 @@ fi:
         title: Tuo verkkotunnusten estoja
       no_file: Yhtäkään tiedostoa ei ole valittu
     follow_recommendations:
-      description_html: "<strong>Seuraamissuositukset auttavat uusia käyttäjiä löytämään nopeasti kiinnostavaa sisältöä</strong>. Kun käyttäjä ei ole ollut tarpeeksi vuorovaikutuksessa muiden kanssa, jotta hänelle olisi muodostunut henkilökohtaisia seuraamissuosituksia, suositellaan niiden sijaan näitä tilejä. Ne lasketaan päivittäin uudelleen yhdistelmästä tilejä, jotka ovat viime aikoina olleet aktiivisimmin sitoutuneita ja joilla on suurimmat paikalliset seuraajamäärät tietyllä kielellä."
+      description_html: "<strong>Seurantasuositukset auttavat uusia käyttäjiä löytämään nopeasti kiinnostavaa sisältöä</strong>. Kun käyttäjä ei ole ollut tarpeeksi vuorovaikutuksessa muiden kanssa, jotta hänelle olisi muodostunut henkilökohtaisia seuraamissuosituksia, suositellaan niiden sijaan näitä tilejä. Ne lasketaan päivittäin uudelleen yhdistelmästä tilejä, jotka ovat viime aikoina olleet aktiivisimmin sitoutuneita ja joilla on suurimmat paikalliset seuraajamäärät tietyllä kielellä."
       language: Kielelle
       status: Tila
-      suppress: Hylkää seuraamissuositus
+      suppress: Hylkää seurantasuositus
       suppressed: Hylätty
-      title: Seuraamissuositukset
-      unsuppress: Palauta seuraamissuositus
+      title: Seurantasuositukset
+      unsuppress: Palauta seurantasuositus
     instances:
       audit_log:
         title: Viimeaikaiset tarkastuslokit
@@ -765,7 +765,7 @@ fi:
         desc_html: Vaikuttaa kaikkiin käyttäjiin, jotka eivät ole muuttaneet tätä asetusta itse
         title: Jätä käyttäjät oletusarvoisesti hakukoneindeksoinnin ulkopuolelle
       discovery:
-        follow_recommendations: Seuraamissuositukset
+        follow_recommendations: Seurantasuositukset
         preamble: Mielenkiintoisen sisällön esille tuominen auttaa saamaan uusia käyttäjiä, jotka eivät ehkä tunne ketään Mastodonista. Määrittele, kuinka erilaiset löytämisominaisuudet toimivat palvelimellasi.
         profile_directory: Profiilihakemisto
         public_timelines: Julkiset aikajanat
@@ -885,7 +885,23 @@ fi:
         action: Katso täältä lisätietoja
         message_html: "<strong>Objektivarastosi on määritetty virheellisesti, ja käyttäjiesi yksityisyys on vaarassa.</strong>"
     tags:
+      moderation:
+        not_trendable: Ei trendattava
+        not_usable: Ei käytettävissä
+        pending_review: Odottaa tarkastusta
+        review_requested: Tarkastus pyydetty
+        reviewed: Tarkastettu
+        title: Tila
+        trendable: Trendattava
+        unreviewed: Tarkastamaton
+        usable: Käytettävissä
+      name: Nimi
+      newest: Uusin
+      oldest: Vanhin
+      reset: Tyhjennä
       review: Tarkista tila
+      search: Hae
+      title: Aihetunnisteet
       updated_msg: Aihetunnisteiden asetusten päivitys onnistui
     title: Ylläpito
     trends:
@@ -918,7 +934,7 @@ fi:
       statuses:
         allow: Salli julkaisu
         allow_account: Salli tekijä
-        description_html: Nämä ovat julkaisuja, joita palvelimesi tietää jaettavan ja lisättävän suosikkeihin paljon tällä hetkellä. Listaus voi auttaa uusia ja palaavia käyttäjiäsi löytämään lisää seurattavia. Julkaisut eivät näy julkisesti ennen kuin hyväksyt niiden julkaisijan ja julkaisija sallii tilinsä ehdottamisen. Voit myös sallia tai hylätä yksittäisiä julkaisuja.
+        description_html: Nämä ovat julkaisuja, joita palvelimesi tietää jaettavan ja lisättävän suosikkeihin paljon tällä hetkellä. Listaus voi auttaa uusia ja palaavia käyttäjiäsi löytämään lisää seurattavia. Julkaisut eivät näy julkisesti ennen kuin hyväksyt niiden tekijän ja tekijä sallii tilinsä ehdottamisen. Voit myös sallia tai hylätä yksittäisiä julkaisuja.
         disallow: Kiellä julkaisu
         disallow_account: Estä tekijä
         no_status_selected: Suosittuja julkaisuja ei muutettu, koska yhtään ei ollut valittuna
@@ -1227,7 +1243,7 @@ fi:
     noscript_html: Käyttääksesi Mastodonin verkkosovellusta, ota JavaScript käyttöön. Vaihtoehtoisesti voit kokeilla käyttämällesi alustalle kehitettyjä Mastodonin <a href="%{apps_path}">natiivisovelluksia</a>.
   existing_username_validator:
     not_found: paikallista käyttäjää ei löydy kyseisellä käyttäjänimellä
-    not_found_multiple: "%{usernames} ei löytynyt"
+    not_found_multiple: käyttäjänimiä %{usernames} ei löytynyt
   exports:
     archive_takeout:
       date: Päiväys
@@ -1265,7 +1281,7 @@ fi:
       deprecated_api_multiple_keywords: Näitä parametreja ei voi muuttaa tästä sovelluksesta, koska ne koskevat useampaa kuin yhtä suodattimen avainsanaa. Käytä uudempaa sovellusta tai selainkäyttöliittymää.
       invalid_context: Ei sisältöä tai se on virheellinen
     index:
-      contexts: Suodattaa kontektissa %{contexts}
+      contexts: Suodattaa kontekstissa %{contexts}
       delete: Poista
       empty: Sinulla ei ole suodattimia.
       expires_in: Vanhenee %{distance}
@@ -1551,7 +1567,7 @@ fi:
     privacy: Yksityisyys
     privacy_hint_html: Määritä, kuinka paljon muita avustavia tietoja haluat paljastaa. Käyttäjät löytävät kiinnostavia profiileja ja hienoja sovelluksia, kun he selaavat toisten seuraamia käyttäjiä ja kun he näkevät, millä sovelluksilla nämä julkaisevat. Saatat kuitenkin haluta piilottaa nämä tiedot.
     reach: Tavoittavuus
-    reach_hint_html: Määritä, haluatko tulla uusien käyttäjien löytämäksi ja seuraamaksi. Haluatko julkaisujesi näkyvän Selaa-sivulla? Haluatko muiden käyttäjien näkevän sinut seuraamissuosituksissaan? Haluatko hyväksyä kaikki uudet seuraajat automaattisesti vai päättää jokaisesta erikseen?
+    reach_hint_html: Määritä, haluatko tulla uusien käyttäjien löytämäksi ja seuraamaksi. Haluatko julkaisujesi näkyvän Selaa-sivulla? Haluatko muiden käyttäjien näkevän sinut seurantasuosituksissaan? Haluatko hyväksyä kaikki uudet seuraajat automaattisesti vai päättää jokaisesta erikseen?
     search: Haku
     search_hint_html: Määritä, kuinka haluat tulla löydetyksi. Haluatko, että ihmiset löytävät sinut julkisten julkaisujesi perusteella? Haluatko, että ihmiset Mastodonin ulkopuolella löytävät profiilisi tehdessään hakuja verkossa? Otathan huomioon, ettei julkisten tietojen täyttä kaikista hakukoneista poisjäämistä voi taata.
     title: Yksityisyys ja tavoittavuus
diff --git a/config/locales/fo.yml b/config/locales/fo.yml
index b483a321a92839..74b37c759efd4e 100644
--- a/config/locales/fo.yml
+++ b/config/locales/fo.yml
@@ -885,7 +885,23 @@ fo:
         action: Kekka her fyri at fáa fleiri upplýsingar
         message_html: "<strong>Objekt-goymslan hjá tær er skeivt uppsett. Privatlívið hjá brúkarunum hjá tær er í vanda.</strong>"
     tags:
+      moderation:
+        not_trendable: Ikki rákbært
+        not_usable: Kann ikki brúkast
+        pending_review: Viðgerð í gongd
+        review_requested: Viðgerð umbiðin
+        reviewed: Viðgjørt
+        title: Støða
+        trendable: Rákbært
+        unreviewed: Ikki viðgjørt
+        usable: Ónýtiligt
+      name: Navn
+      newest: Nýggjasta/u
+      oldest: Elsta/u
+      reset: Endurstilla
       review: Eftirkanna støðu
+      search: Leita
+      title: Frámerki
       updated_msg: Frámerkjastillingar dagførdar
     title: Umsiting
     trends:
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 45ae60008cf0ed..d6c00d205ca5b1 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -885,7 +885,23 @@ gl:
         action: Mira aquí para máis información
         message_html: "<strong>A almacenaxe de obxectos está mal configurada. A privacidade das usuarias está en risco.</strong>"
     tags:
+      moderation:
+        not_trendable: Non permitir en voga
+        not_usable: Non utilizable
+        pending_review: Pendente de revisión
+        review_requested: Revisión solicitada
+        reviewed: Revisada
+        title: Estado
+        trendable: Permitir en voga
+        unreviewed: Sen revisar
+        usable: Utilizable
+      name: Nome
+      newest: Máis recente
+      oldest: Máis antiga
+      reset: Restabelecer
       review: Estado de revisión
+      search: Buscar
+      title: Cancelos
       updated_msg: Actualizaronse os axustes dos cancelos
     title: Administración
     trends:
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 695b3786f26429..e4f5c1b847b07f 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -885,7 +885,23 @@ hu:
         action: Itt találsz több információt
         message_html: "<strong>Az objektumtárolód félre van konfigurálva. Kockázat merül fel a felhasználóid adatainak biztonságával kapcsolatban.</strong>"
     tags:
+      moderation:
+        not_trendable: Nem lehet felkapott
+        not_usable: Nem használható
+        pending_review: Ellenőrzésre vár
+        review_requested: Ellenőrzés kérve
+        reviewed: Ellenőrizve
+        title: Állapot
+        trendable: Lehet felkapott
+        unreviewed: Nem ellenőrzött
+        usable: Használható
+      name: Név
+      newest: Legújabb
+      oldest: Legrégebbi
+      reset: Visszaállítás
       review: Engedélyezés állapota
+      search: Keresés
+      title: Hashtagek
       updated_msg: A hashtag beállításokat sikeresen frissítettük
     title: Karbantartás
     trends:
diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index 101d1ecc81ec3b..964230d5a577e8 100644
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -882,7 +882,10 @@ ia:
         action: Consulta hic pro plus information
         message_html: "<strong>Tu immagazinage de objectos es mal configurate. Le confidentialitate de tu usatores es in risco.</strong>"
     tags:
+      name: Nomine
       review: Revide le stato
+      search: Cercar
+      title: Hashtags
       updated_msg: Parametros de hashtag actualisate con successo
     title: Administration
     trends:
diff --git a/config/locales/is.yml b/config/locales/is.yml
index b008e284dd6d99..4aa05fb10cde85 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -887,7 +887,23 @@ is:
         action: Skoðaðu hér til að fá frekari upplýsingar
         message_html: "<strong>Gagnageymslan þín er ekki rétt stillt. Friðhelgi notendanna þinna gæti verið í hættu.</strong>"
     tags:
+      moderation:
+        not_trendable: Getur ekki orðið vinsælt
+        not_usable: Ekki nothæft
+        pending_review: Bíður eftir yfirferð
+        review_requested: Beðið um yfirferð
+        reviewed: Yfirfarið
+        title: Staða
+        trendable: Getur orðið vinsælt
+        unreviewed: Óyfirfarið
+        usable: Nothæft
+      name: Nafn
+      newest: Nýjast
+      oldest: Elsta
+      reset: Endurstilla
       review: Yfirfara stöðufærslu
+      search: Leita
+      title: Myllumerki
       updated_msg: Það tókst að uppfæra stillingar myllumerkja
     title: Stjórnendur
     trends:
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index f8bbda2e96f2ea..5e18751e0989cc 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -611,6 +611,23 @@ lt:
         message_html: Tavo Elasticsearch klasteris turi tik vieną mazgą, <code>ES_PRESET</code> turėtų būti nustatyta į <code>single_node_cluster</code>.
       elasticsearch_running_check:
         message_html: Nepavyko prijungti prie Elasticsearch. Patikrink, ar ji veikia, arba išjunk viso teksto paiešką.
+    tags:
+      moderation:
+        not_trendable: Netendencinga
+        not_usable: Nenaudojama
+        pending_review: Laukiama peržiūros
+        review_requested: Paprašyta peržiūros
+        reviewed: Peržiūrėta
+        title: Statusas
+        trendable: Tendencinga
+        unreviewed: Neperžiūrėta
+        usable: Naudojama
+      name: Pavadinimas
+      newest: Naujausias
+      oldest: Seniausias
+      reset: Atkurti
+      search: Paieška
+      title: Saitažodžiai
     title: Administracija
     trends:
       allow: Leisti
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index b23b4e10afb59a..da1684e8a9b1cc 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -885,7 +885,23 @@ nl:
         action: Klik hier voor meer informatie
         message_html: "<strong>Jouw objectopslag is verkeerd geconfigureerd. De privacy van je gebruikers is in gevaar.</strong>"
     tags:
+      moderation:
+        not_trendable: Niet trendbaar
+        not_usable: Niet bruikbaar
+        pending_review: In afwachting van beoordeling
+        review_requested: Beoordeling aangevraagd
+        reviewed: Beoordeeld
+        title: Status
+        trendable: Trendbaar
+        unreviewed: Onbeoordeeld
+        usable: Bruikbaar
+      name: Naam
+      newest: Nieuwste
+      oldest: Oudste
+      reset: Opnieuw
       review: Status beoordelen
+      search: Zoeken
+      title: Hashtags
       updated_msg: Instellingen hashtag succesvol bijgewerkt
     title: Beheer
     trends:
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 8a2dab5b991a06..1477396999f5cc 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -913,7 +913,23 @@ pl:
         action: Kliknij tutaj, aby dowiedzieć się więcej
         message_html: "<strong>Pamięć obiektu jest nieprawidłowa. Prywatność twoich użytkowników jest zagrożona.</strong>"
     tags:
+      moderation:
+        not_trendable: Nie mogą trendować
+        not_usable: Nieużywalne
+        pending_review: Oczekuje na przejrzenie
+        review_requested: Prośba o przejrzenie
+        reviewed: Przejrzane
+        title: Status
+        trendable: Mogą trendować
+        unreviewed: Nieprzejrzane
+        usable: Używalne
+      name: Nazwa
+      newest: Najnowsze
+      oldest: Najstarsze
+      reset: Resetuj
       review: Stan przeglądu
+      search: Szukaj
+      title: Hashtagi
       updated_msg: Pomyślnie uaktualniono ustawienia hashtagów
     title: Administracja
     trends:
diff --git a/config/locales/simple_form.an.yml b/config/locales/simple_form.an.yml
index e409c39ae10f29..7119aadba252f7 100644
--- a/config/locales/simple_form.an.yml
+++ b/config/locales/simple_form.an.yml
@@ -271,7 +271,6 @@ an:
         listable: Permitir que esta etiqueta amaneixca en as busquedas y en o directorio d'o perfil
         name: Etiqueta
         trendable: Permitir que esta etiqueta amaneixca baixo tendencias
-        usable: Permitir a las publicacions usar esta etiqueta
       user:
         role: Rol
       user_role:
diff --git a/config/locales/simple_form.ar.yml b/config/locales/simple_form.ar.yml
index 370667d48ea5f8..744da9d0554477 100644
--- a/config/locales/simple_form.ar.yml
+++ b/config/locales/simple_form.ar.yml
@@ -311,7 +311,6 @@ ar:
         listable: اسمح لهذا الوسم بالظهور في البحث وفي دليل الصفحات التعريفية
         name: الوسم
         trendable: السماح لهذه الكلمة المفتاحية بالظهور تحت المتداوَلة
-        usable: اسمح للمنشورات استخدام هذا الوسم
       user:
         role: الدور
         time_zone: النطاق الزمني
diff --git a/config/locales/simple_form.ast.yml b/config/locales/simple_form.ast.yml
index c222c9aef5ba30..5e3f1af89a5299 100644
--- a/config/locales/simple_form.ast.yml
+++ b/config/locales/simple_form.ast.yml
@@ -180,7 +180,6 @@ ast:
         listable: Permitir qu'esta etiqueta apaeza nes busques y nes suxerencies
         name: Etiqueta
         trendable: Permitir qu'esta etiqueta apaeza nes tendencies
-        usable: Permitir que los artículos usen esta etiqueta
       user:
         role: Rol
         time_zone: Fusu horariu
diff --git a/config/locales/simple_form.be.yml b/config/locales/simple_form.be.yml
index 101d40f117364c..fca41d3fe3c4ea 100644
--- a/config/locales/simple_form.be.yml
+++ b/config/locales/simple_form.be.yml
@@ -311,7 +311,6 @@ be:
         listable: Дазволіць паказ хэштэгу ў пошуку і ў каталозе профіляў
         name: Хэштэг
         trendable: Дазволіць паказ гэтага хэштэга ў трэндах
-        usable: Дазволіць выкарыстанне хэштэгу ў допісах
       user:
         role: Роля
         time_zone: Часавы пояс
diff --git a/config/locales/simple_form.bg.yml b/config/locales/simple_form.bg.yml
index 564f72e8c21231..333ab25c825490 100644
--- a/config/locales/simple_form.bg.yml
+++ b/config/locales/simple_form.bg.yml
@@ -314,7 +314,7 @@ bg:
         listable: Позволяване на хаштага да се появява при търсене и предложения
         name: Хаштаг
         trendable: Показване на хаштага да се появява под нашумели
-        usable: Позволяване на публикациите да употребяват този хаштаг
+        usable: Позволяване на публикациите да употребяват този хаштаг локално
       user:
         role: Роля
         time_zone: Часова зона
diff --git a/config/locales/simple_form.br.yml b/config/locales/simple_form.br.yml
index 196711aee97b1a..f4d442cfdab828 100644
--- a/config/locales/simple_form.br.yml
+++ b/config/locales/simple_form.br.yml
@@ -72,7 +72,6 @@ br:
       tag:
         name: Hashtag
         trendable: Aotren an hashtag-mañ da zont war wel dindan tuadurioù
-        usable: Aotren an embannadurioù da implijout an hashtag-mañ
       user:
         role: Roll
         time_zone: Gwerzhid eur
diff --git a/config/locales/simple_form.ca.yml b/config/locales/simple_form.ca.yml
index 2e0199d7fd5b06..7b1c67d39279a5 100644
--- a/config/locales/simple_form.ca.yml
+++ b/config/locales/simple_form.ca.yml
@@ -314,7 +314,6 @@ ca:
         listable: Permet que aquesta etiqueta aparegui en les cerques i en el directori de perfils
         name: Etiqueta
         trendable: Permet que aquesta etiqueta aparegui en les tendències
-        usable: Permet als tuts emprar aquesta etiqueta
       user:
         role: Rol
         time_zone: Zona horària
diff --git a/config/locales/simple_form.ckb.yml b/config/locales/simple_form.ckb.yml
index 3c1d8315e326f4..cfadea034da4fa 100644
--- a/config/locales/simple_form.ckb.yml
+++ b/config/locales/simple_form.ckb.yml
@@ -182,7 +182,6 @@ ckb:
         listable: ڕیگەبدە ئەم هاشتاگە لە پێرستی هەڵبژاردەی بەکارهێنەران و پەڕەی گەڕان نیشان بدرێت
         name: هەشتاگ
         trendable: ڕێگەبدە ئەم هەشتاگە لە نووسراوەی بەرچاوکراو نیسان بدرێت
-        usable: ڕێگەبدە بە توتەکان بۆ بەکارهێنانی ئەم هەشتاگە
     'no': نە
     recommended: پێشنیارکراوە
     required:
diff --git a/config/locales/simple_form.co.yml b/config/locales/simple_form.co.yml
index dfec033469efb6..06c993f406a72e 100644
--- a/config/locales/simple_form.co.yml
+++ b/config/locales/simple_form.co.yml
@@ -186,7 +186,6 @@ co:
         listable: Auturizà stu hashtag à esse vistu nant'à l'annuariu di i prufili
         name: Hashtag
         trendable: Auturizà stu hashtag à esse vistu in e tendenze
-        usable: Auturizà i statuti à utilizà stu hashtag
     'no': Nò
     recommended: Ricumandati
     required:
diff --git a/config/locales/simple_form.cs.yml b/config/locales/simple_form.cs.yml
index f8422102f19fff..5a1bd3c88390ea 100644
--- a/config/locales/simple_form.cs.yml
+++ b/config/locales/simple_form.cs.yml
@@ -311,7 +311,6 @@ cs:
         listable: Povolit zobrazení tohoto hashtagu ve vyhledávání a návrzích
         name: Hashtag
         trendable: Povolit zobrazení tohoto hashtagu mezi populárními
-        usable: Povolit používat tento hashtag v příspěvcích
       user:
         role: Role
         time_zone: Časové pásmo
diff --git a/config/locales/simple_form.cy.yml b/config/locales/simple_form.cy.yml
index 64c67a1463e8e9..611223ea665bb2 100644
--- a/config/locales/simple_form.cy.yml
+++ b/config/locales/simple_form.cy.yml
@@ -314,7 +314,6 @@ cy:
         listable: Caniatáu i'r hashnod hwn ymddangos mewn chwiliadau ac awgrymiadau
         name: Hashnod
         trendable: Caniatáu i'r hashnod hwn ymddangos o dan bynciau llosg
-        usable: Caniatáu i bostiadau ddefnyddio'r hashnod hwn
       user:
         role: Rôl
         time_zone: Cylchfa amser
diff --git a/config/locales/simple_form.da.yml b/config/locales/simple_form.da.yml
index 9e949d16839f7d..5763885ac4b5cd 100644
--- a/config/locales/simple_form.da.yml
+++ b/config/locales/simple_form.da.yml
@@ -314,7 +314,7 @@ da:
         listable: Tillad visning af dette hashtag i søgninger og forslag
         name: Hashtag
         trendable: Tillad visning af dette hashtag under trends
-        usable: Tillad indlæg at benytte dette hashtag
+        usable: Tillad indlæg at benytte dette hashtag lokalt
       user:
         role: Rolle
         time_zone: Tidszone
diff --git a/config/locales/simple_form.de.yml b/config/locales/simple_form.de.yml
index 332d9513952126..fb7bda94896089 100644
--- a/config/locales/simple_form.de.yml
+++ b/config/locales/simple_form.de.yml
@@ -314,7 +314,7 @@ de:
         listable: Erlaube, dass dieser Hashtag in Suchen und Empfehlungen erscheint
         name: Hashtag
         trendable: Erlaube, dass dieser Hashtag in den Trends erscheint
-        usable: Erlaube, dass dieser Hashtag in Beiträgen erscheint
+        usable: Beiträge dürfen diesen Hashtag lokal verwenden
       user:
         role: Rolle
         time_zone: Zeitzone
diff --git a/config/locales/simple_form.el.yml b/config/locales/simple_form.el.yml
index 29b9f59e14a87d..af93f65fecd76e 100644
--- a/config/locales/simple_form.el.yml
+++ b/config/locales/simple_form.el.yml
@@ -276,7 +276,6 @@ el:
         listable: Εμφάνιση αυτής της ετικέτας στο δημόσιο κατάλογο
         name: Ετικέτα
         trendable: Εμφάνιση της ετικέτας στις τάσεις
-        usable: Χρήση της ετικέτας σε τουτ
       user:
         role: Ρόλος
       user_role:
diff --git a/config/locales/simple_form.en-GB.yml b/config/locales/simple_form.en-GB.yml
index c1f2a015e94b27..606b9a4d4040b7 100644
--- a/config/locales/simple_form.en-GB.yml
+++ b/config/locales/simple_form.en-GB.yml
@@ -314,7 +314,6 @@ en-GB:
         listable: Allow this hashtag to appear in searches and suggestions
         name: Hashtag
         trendable: Allow this hashtag to appear under trends
-        usable: Allow posts to use this hashtag
       user:
         role: Role
         time_zone: Time Zone
diff --git a/config/locales/simple_form.eo.yml b/config/locales/simple_form.eo.yml
index 021be93b5d74cb..3b51c1590867ef 100644
--- a/config/locales/simple_form.eo.yml
+++ b/config/locales/simple_form.eo.yml
@@ -303,7 +303,6 @@ eo:
         listable: Permesi ĉi tiun kradvorton aperi en serĉoj kaj sugestoj
         name: Kradvorto
         trendable: Permesi al ĉi tiu kradvorto aperi en furoraĵoj
-        usable: Permesi mesaĝojn uzi ĉi tiun kradvorton
       user:
         role: Rolo
         time_zone: Horzono
diff --git a/config/locales/simple_form.es-AR.yml b/config/locales/simple_form.es-AR.yml
index 71d9726b079423..a1dbeea91610a1 100644
--- a/config/locales/simple_form.es-AR.yml
+++ b/config/locales/simple_form.es-AR.yml
@@ -314,7 +314,6 @@ es-AR:
         listable: Permitir que esta etiqueta aparezca en las búsquedas y en las sugerencias
         name: Etiqueta
         trendable: Permitir que esta etiqueta aparezca bajo tendencias
-        usable: Permitir a los mensajes usar esta etiqueta
       user:
         role: Rol
         time_zone: Zona horaria
diff --git a/config/locales/simple_form.es-MX.yml b/config/locales/simple_form.es-MX.yml
index 730e9b265b335a..43dd38ac7c7620 100644
--- a/config/locales/simple_form.es-MX.yml
+++ b/config/locales/simple_form.es-MX.yml
@@ -314,7 +314,6 @@ es-MX:
         listable: Permitir que esta etiqueta aparezca en las búsquedas y en el directorio del perfil
         name: Etiqueta
         trendable: Permitir que esta etiqueta aparezca bajo tendencias
-        usable: Permitir a los toots usar esta etiqueta
       user:
         role: Rol
         time_zone: Zona horaria
diff --git a/config/locales/simple_form.es.yml b/config/locales/simple_form.es.yml
index f2d91349adad6b..1e7401d0e23054 100644
--- a/config/locales/simple_form.es.yml
+++ b/config/locales/simple_form.es.yml
@@ -314,7 +314,6 @@ es:
         listable: Permitir que esta etiqueta aparezca en las búsquedas y en el directorio del perfil
         name: Etiqueta
         trendable: Permitir que esta etiqueta aparezca bajo tendencias
-        usable: Permitir a las publicaciones usar esta etiqueta
       user:
         role: Rol
         time_zone: Zona horaria
diff --git a/config/locales/simple_form.et.yml b/config/locales/simple_form.et.yml
index 4dd74e68a365c7..74660921d2d552 100644
--- a/config/locales/simple_form.et.yml
+++ b/config/locales/simple_form.et.yml
@@ -311,7 +311,6 @@ et:
         listable: Luba sellel sildil ilmuda profiilide kataloogis
         name: Silt
         trendable: Luba sellel sildil trendida
-        usable: Luba postitustel seda silti kasutada
       user:
         role: Roll
         time_zone: Ajavöönd
diff --git a/config/locales/simple_form.eu.yml b/config/locales/simple_form.eu.yml
index 8c467bc9bff422..c7e2667cad0111 100644
--- a/config/locales/simple_form.eu.yml
+++ b/config/locales/simple_form.eu.yml
@@ -311,7 +311,6 @@ eu:
         listable: Baimendu traola hau bilaketetan agertzea eta profilen direktorioan
         name: Traola
         trendable: Baimendu traola hau joeretan agertzea
-        usable: Baimendu tootek traola hau erabiltzea
       user:
         role: Rola
         time_zone: Ordu zona
diff --git a/config/locales/simple_form.fa.yml b/config/locales/simple_form.fa.yml
index dd1c56e3bddaeb..0610f7fced987f 100644
--- a/config/locales/simple_form.fa.yml
+++ b/config/locales/simple_form.fa.yml
@@ -286,7 +286,6 @@ fa:
         listable: اجازه به این برچسب برای ظاهر شدن در جست‌وجوها و پیشنهادها
         name: برچسب
         trendable: بگذارید که این برچسب در موضوعات پرطرفدار دیده شود
-        usable: بگذارید که این برچسب در فرسته‌ها به کار بروند
       user:
         role: نقش
         time_zone: منطقهٔ زمانی
diff --git a/config/locales/simple_form.fi.yml b/config/locales/simple_form.fi.yml
index 80e08234f3921f..a6004cee35440d 100644
--- a/config/locales/simple_form.fi.yml
+++ b/config/locales/simple_form.fi.yml
@@ -73,13 +73,13 @@ fi:
       filters:
         action: Valitse, mikä toiminto suoritetaan, kun julkaisu vastaa suodatinta
         actions:
-          hide: Piilota suodatettu sisältö kokonaan ja käyttäydy ikään kuin sitä ei olisi olemassa
+          hide: Piilota suodatettu sisältö kokonaan, ikään kuin sitä ei olisi olemassa
           warn: Piilota suodatettu sisältö varoituksen taakse, jossa mainitaan suodattimen nimi
       form_admin_settings:
         activity_api_enabled: Paikallisesti julkaistujen julkaisujen, aktiivisten käyttäjien ja rekisteröitymisten viikoittainen määrä
         app_icon: WEBP, PNG, GIF tai JPG. Korvaa oletusarvoisen mobiililaitteiden sovelluskuvakkeen omalla kuvakkeella.
         backups_retention_period: Käyttäjillä on mahdollisuus arkistoida julkaisujaan myöhemmin ladattaviksi. Kun kentän arvo on positiivinen, nämä arkistot poistuvat automaattisesti, kun määritetty määrä päiviä on kulunut.
-        bootstrap_timeline_accounts: Nämä tilit kiinnitetään uusien käyttäjien seuraamissuositusten alkuun.
+        bootstrap_timeline_accounts: Nämä tilit kiinnitetään uusien käyttäjien seurantasuositusten alkuun.
         closed_registrations_message: Näkyy, kun rekisteröityminen on suljettu
         content_cache_retention_period: Kaikki muiden palvelinten julkaisut (mukaan lukien tehostukset ja vastaukset) poistuvat, kun määritetty määrä päiviä on kulunut, lukuun ottamatta paikallisen käyttäjän vuorovaikutusta näiden julkaisujen kanssa. Tämä sisältää julkaisut, jotka paikallinen käyttäjä on merkinnyt kirjanmerkiksi tai suosikiksi. Myös yksityismaininnat eri palvelinten käyttäjien välillä menetetään, eikä niitä voi palauttaa. Tämä asetus on tarkoitettu käytettäväksi erityistapauksissa ja rikkoo monia käyttäjien odotuksia, kun sitä sovelletaan yleiskäyttöön.
         custom_css: Voit käyttää mukautettuja tyylejä Mastodonin selainversiossa.
@@ -151,9 +151,9 @@ fi:
         show_collections: Näytä seuratut ja seuraajat profiilissa
         unlocked: Hyväksy uudet seuraajat automaattisesti
       account_alias:
-        acct: Vanhan tilin käyttäjänimi
+        acct: Vanhan tilin käyttäjätunnus
       account_migration:
-        acct: Uuden tilin käyttäjänimi
+        acct: Uuden tilin käyttäjätunnus
       account_warning_preset:
         text: Esimääritetty teksti
         title: Nimi
@@ -314,7 +314,7 @@ fi:
         listable: Salli tämän aihetunnisteen näkyä hauissa ja ehdotuksissa
         name: Aihetunniste
         trendable: Salli tämän aihetunnisteen näkyä trendeissä
-        usable: Salli julkaisujen käyttää tätä aihetunnistetta
+        usable: Salli julkaisujen käyttää tätä aihetunnistetta paikallisesti
       user:
         role: Rooli
         time_zone: Aikavyöhyke
diff --git a/config/locales/simple_form.fo.yml b/config/locales/simple_form.fo.yml
index b334d4f034ac5f..ecd8402680dfa5 100644
--- a/config/locales/simple_form.fo.yml
+++ b/config/locales/simple_form.fo.yml
@@ -314,7 +314,7 @@ fo:
         listable: Loyva hesum tvíkrossið, at verða vístur í leitingum og uppskotum
         name: Tvíkrossur
         trendable: Loyv hesum frámerki at síggjast undir rákum
-        usable: Loyva uppsløgum at brúka hendan tvíkross
+        usable: Loyv postum at brúka hetta frámerki lokalt
       user:
         role: Leiklutur
         time_zone: Tíðarsona
diff --git a/config/locales/simple_form.fr-CA.yml b/config/locales/simple_form.fr-CA.yml
index 4b3f53e22233f7..5edffb49d4bf18 100644
--- a/config/locales/simple_form.fr-CA.yml
+++ b/config/locales/simple_form.fr-CA.yml
@@ -305,7 +305,6 @@ fr-CA:
         listable: Autoriser ce hashtag à apparaître dans les recherches et dans l’annuaire des profils
         name: Mot-clic
         trendable: Autoriser ce hashtag à apparaitre dans les tendances
-        usable: Autoriser les messages à utiliser ce hashtag
       user:
         role: Rôle
         time_zone: Fuseau horaire
diff --git a/config/locales/simple_form.fr.yml b/config/locales/simple_form.fr.yml
index 476f197f417b09..9694b00b48cfda 100644
--- a/config/locales/simple_form.fr.yml
+++ b/config/locales/simple_form.fr.yml
@@ -305,7 +305,6 @@ fr:
         listable: Autoriser ce hashtag à apparaître dans les recherches et dans l’annuaire des profils
         name: Hashtag
         trendable: Autoriser ce hashtag à apparaitre dans les tendances
-        usable: Autoriser les messages à utiliser ce hashtag
       user:
         role: Rôle
         time_zone: Fuseau horaire
diff --git a/config/locales/simple_form.fy.yml b/config/locales/simple_form.fy.yml
index 64e5dd68da6994..bde97237f6f393 100644
--- a/config/locales/simple_form.fy.yml
+++ b/config/locales/simple_form.fy.yml
@@ -314,7 +314,6 @@ fy:
         listable: Tastean dat dizze hashtag yn sykopdrachten en oanrekommandaasjes te sjen is
         name: Hashtag
         trendable: Goedkarre dat dizze hashtag ûnder trends te sjen is
-        usable: Tastean dat dizze hashtag yn berjochten brûkt wurde mei
       user:
         role: Rol
         time_zone: Tiidsône
diff --git a/config/locales/simple_form.ga.yml b/config/locales/simple_form.ga.yml
index 2effe1a10cc7a0..60faa07f275f25 100644
--- a/config/locales/simple_form.ga.yml
+++ b/config/locales/simple_form.ga.yml
@@ -314,7 +314,6 @@ ga:
         listable: Lig don hashchlib seo a bheith le feiceáil i gcuardach agus i moltaí
         name: Haischlib
         trendable: Lig don haischlib seo a bheith le feiceáil faoi threochtaí
-        usable: Lig do phostálacha an hashchlib seo a úsáid
       user:
         role: Ról
         time_zone: Crios ama
diff --git a/config/locales/simple_form.gd.yml b/config/locales/simple_form.gd.yml
index 8a36f73dc1de35..946320aa044c81 100644
--- a/config/locales/simple_form.gd.yml
+++ b/config/locales/simple_form.gd.yml
@@ -305,7 +305,6 @@ gd:
         listable: Faodaidh an taga hais seo nochdadh ann an toraidhean luirg ’s am measg nam molaidhean
         name: Taga hais
         trendable: Faodaidh an taga hais seo nochdadh am measg nan treandaichean
-        usable: Faodaidh postaichean an taga hais seo a chleachdadh
       user:
         role: Dreuchd
         time_zone: Roinn-tìde
diff --git a/config/locales/simple_form.gl.yml b/config/locales/simple_form.gl.yml
index 57bf31b42d2851..a7074af0f9bb69 100644
--- a/config/locales/simple_form.gl.yml
+++ b/config/locales/simple_form.gl.yml
@@ -314,7 +314,7 @@ gl:
         listable: Permitir que este cancelo apareza en buscas e no directorio de perfil
         name: Cancelo
         trendable: Permitir que este cancelo apareza en tendencias
-        usable: Permitir que as publicacións utilicen este cancelo
+        usable: Permitir que as publicacións usen este cancelo localmente
       user:
         role: Rol
         time_zone: Fuso horario
diff --git a/config/locales/simple_form.he.yml b/config/locales/simple_form.he.yml
index f79ddb9b34e832..edc3cc8f38314b 100644
--- a/config/locales/simple_form.he.yml
+++ b/config/locales/simple_form.he.yml
@@ -314,7 +314,6 @@ he:
         listable: הרשה/י לתגית זו להופיע בחיפושים והצעות
         name: תגית
         trendable: הרשה/י לתגית זו להופיע תחת נושאים חמים
-        usable: הרשה/י להודעות להכיל תגית זו
       user:
         role: תפקיד
         time_zone: אזור זמן
diff --git a/config/locales/simple_form.hu.yml b/config/locales/simple_form.hu.yml
index 518a82ec163a99..512e13d3af8c13 100644
--- a/config/locales/simple_form.hu.yml
+++ b/config/locales/simple_form.hu.yml
@@ -314,7 +314,7 @@ hu:
         listable: A hashtag megjelenhet a profiladatbázisban
         name: Hashtag
         trendable: A hashtag megjelenhet a felkapottak között
-        usable: Bejegyzések használhatják ezt a hashtaget
+        usable: A helyi bejegyzések használhatják ezt a hashtaget
       user:
         role: Szerep
         time_zone: Időzóna
diff --git a/config/locales/simple_form.hy.yml b/config/locales/simple_form.hy.yml
index 0525f2d6fc47c6..36185f73e428c5 100644
--- a/config/locales/simple_form.hy.yml
+++ b/config/locales/simple_form.hy.yml
@@ -187,7 +187,6 @@ hy:
         listable: Թոյլատրել, որ այս պիտակը յայտնուի որոնումների եւ հաշուի մատեանում
         name: Պիտակ
         trendable: Թոյլատրել, որ այս պիտակը յայտնուի թրենդներում
-        usable: Թոյլատրել գրառումներին օգտագործել այս պիտակը
     'no': Ոչ
     recommended: Խորհուրդ է տրվում
     required:
diff --git a/config/locales/simple_form.ia.yml b/config/locales/simple_form.ia.yml
index bee2454cf04a78..00226aee90b4b9 100644
--- a/config/locales/simple_form.ia.yml
+++ b/config/locales/simple_form.ia.yml
@@ -313,7 +313,6 @@ ia:
         listable: Permitter a iste hashtag apparer in le recercas e suggestiones
         name: Hashtag
         trendable: Permitter a iste hashtag de sub tendentias
-        usable: Permitter al messages usar iste hashtag
       user:
         role: Rolo
         time_zone: Fuso horari
diff --git a/config/locales/simple_form.id.yml b/config/locales/simple_form.id.yml
index 1f493435e873c4..99f4372cc15e20 100644
--- a/config/locales/simple_form.id.yml
+++ b/config/locales/simple_form.id.yml
@@ -268,7 +268,6 @@ id:
         listable: Izinkan tagar ini muncul di penelusuran dan di direktori profil
         name: Tagar
         trendable: Izinkan tagar ini muncul di bawah tren
-        usable: Izinkan toot memakai tagar ini
       user:
         role: Peran
       user_role:
diff --git a/config/locales/simple_form.ie.yml b/config/locales/simple_form.ie.yml
index 2b995e7efa5e8a..0828139a4304ba 100644
--- a/config/locales/simple_form.ie.yml
+++ b/config/locales/simple_form.ie.yml
@@ -311,7 +311,6 @@ ie:
         listable: Permisser que ti hashtag apari in serchas e suggestiones
         name: Hashtag
         trendable: Permisse que ti-ci hashtag apari sub tendenties
-        usable: Permisser que postas usa ti hashtag
       user:
         role: Rol
         time_zone: Zone temporal
diff --git a/config/locales/simple_form.io.yml b/config/locales/simple_form.io.yml
index 81f298249ee2a2..4de7475b2e8958 100644
--- a/config/locales/simple_form.io.yml
+++ b/config/locales/simple_form.io.yml
@@ -300,7 +300,6 @@ io:
         listable: Permisez ca hashtago aparar en trovaji e sugestaji
         name: Hashtago
         trendable: Permisez ca hashtago aparar che tendenci
-        usable: Permisez posti uzar ca hashtago
       user:
         role: Rolo
         time_zone: Klokozono
diff --git a/config/locales/simple_form.is.yml b/config/locales/simple_form.is.yml
index 9e28ef9be695b9..a7e2083f4d83a4 100644
--- a/config/locales/simple_form.is.yml
+++ b/config/locales/simple_form.is.yml
@@ -314,7 +314,7 @@ is:
         listable: Leyfa þessu myllumerki að birtast í leitum og í persónusniðamöppunni
         name: Myllumerki
         trendable: Leyfa þessu myllumerki að birtast undir vinsælu efni
-        usable: Leyfa færslum að nota þetta myllumerki
+        usable: Leyfa færslum að nota þetta myllumerki staðvært
       user:
         role: Hlutverk
         time_zone: Tímabelti
diff --git a/config/locales/simple_form.it.yml b/config/locales/simple_form.it.yml
index eddc86b4e11ad8..b0f7ef7a6b23c3 100644
--- a/config/locales/simple_form.it.yml
+++ b/config/locales/simple_form.it.yml
@@ -314,7 +314,6 @@ it:
         listable: Permetti a questo hashtag di apparire nella directory dei profili
         name: Hashtag
         trendable: Permetti a questo hashtag di apparire nelle tendenze
-        usable: Permetti ai post di usare questo hashtag
       user:
         role: Ruolo
         time_zone: Fuso orario
diff --git a/config/locales/simple_form.ja.yml b/config/locales/simple_form.ja.yml
index a4bd9565081272..7f4a9daeff85a2 100644
--- a/config/locales/simple_form.ja.yml
+++ b/config/locales/simple_form.ja.yml
@@ -314,7 +314,6 @@ ja:
         listable: 検索とディレクトリへの使用を許可する
         name: ハッシュタグ
         trendable: トレンドへの表示を許可する
-        usable: 投稿への使用を許可する
       user:
         role: ロール
         time_zone: タイムゾーン
diff --git a/config/locales/simple_form.kk.yml b/config/locales/simple_form.kk.yml
index 5c1854d1886d38..e6ba46fdf87874 100644
--- a/config/locales/simple_form.kk.yml
+++ b/config/locales/simple_form.kk.yml
@@ -86,7 +86,6 @@ kk:
         listable: Бұл хештегті барлық жерде көрсетуге рұқсат бер
         name: Хэштег
         trendable: Хештегті трендтерде көрсетуге рұқсат бер
-        usable: Бұл хештегті қолдануға рұқсат бер
     'no': Жоқ
     recommended: Рекоменделген
     required:
diff --git a/config/locales/simple_form.ko.yml b/config/locales/simple_form.ko.yml
index b94b4b3d40425b..b2ff68c5ddbc84 100644
--- a/config/locales/simple_form.ko.yml
+++ b/config/locales/simple_form.ko.yml
@@ -314,7 +314,6 @@ ko:
         listable: 이 해시태그가 검색과 추천에 보여지도록 허용
         name: 해시태그
         trendable: 이 해시태그가 유행에 나타날 수 있도록 허용
-        usable: 이 해시태그를 게시물에 사용 가능하도록 허용
       user:
         role: 역할
         time_zone: 시간대
diff --git a/config/locales/simple_form.ku.yml b/config/locales/simple_form.ku.yml
index 0c4f8721313213..96e047d9371229 100644
--- a/config/locales/simple_form.ku.yml
+++ b/config/locales/simple_form.ku.yml
@@ -267,7 +267,6 @@ ku:
         listable: Bihêle ku ev hashtag werê xuyakirin di lêgerîn û pêşniyaran de
         name: Hashtag
         trendable: Bihêle ku ev hashtag werê xuyakirin di bin rojevê de
-        usable: Bihêle ku şandî ev hashtag bi kar bînin
       user:
         role: Rol
       user_role:
diff --git a/config/locales/simple_form.lad.yml b/config/locales/simple_form.lad.yml
index 65647a77dbb47e..f7093ff73beb46 100644
--- a/config/locales/simple_form.lad.yml
+++ b/config/locales/simple_form.lad.yml
@@ -306,7 +306,6 @@ lad:
         listable: Permite ke esta etiketa apareska en bushkedas i sujestyones
         name: Etiketa
         trendable: Permite ke esta etiketa apareska en trendes
-        usable: Permite ke publikasyones uzen esta etiketa
       user:
         role: Rolo
         time_zone: Zona de tiempo
diff --git a/config/locales/simple_form.lt.yml b/config/locales/simple_form.lt.yml
index b31803409b3976..02f0360938107e 100644
--- a/config/locales/simple_form.lt.yml
+++ b/config/locales/simple_form.lt.yml
@@ -208,7 +208,7 @@ lt:
         listable: Leisti šį saitažodį rodyti paieškose ir pasiūlymuose
         name: Saitažodis
         trendable: Leisti šį saitažodį rodyti pagal trendus
-        usable: Leisti įrašams naudoti šį saitažodį
+        usable: Leisti įrašams naudoti šį saitažodį vietoje
       user:
         role: Vaidmuo
         time_zone: Laiko juosta
diff --git a/config/locales/simple_form.lv.yml b/config/locales/simple_form.lv.yml
index 017acd0a53ccb0..eedae998e40479 100644
--- a/config/locales/simple_form.lv.yml
+++ b/config/locales/simple_form.lv.yml
@@ -309,7 +309,6 @@ lv:
         listable: Atļaut šim tēmturim parādīties meklējumos un ieteikumos
         name: Tēmturis
         trendable: Atļaut šim tēmturim parādīties zem tendencēm
-        usable: Atļaut lietot ziņās šo tēmturi
       user:
         role: Loma
         time_zone: Laika josla
diff --git a/config/locales/simple_form.ms.yml b/config/locales/simple_form.ms.yml
index ae375149eb582f..da00e2dc2b05d2 100644
--- a/config/locales/simple_form.ms.yml
+++ b/config/locales/simple_form.ms.yml
@@ -301,7 +301,6 @@ ms:
         listable: Benarkan hashtag ini muncul dalam carian dan cadangan
         name: Tanda pagar
         trendable: Benarkan hashtag ini muncul di bawah aliran
-        usable: Benarkan siaran untuk menggunakan tanda pagar ini
       user:
         role: Peranan
         time_zone: Zon masa
diff --git a/config/locales/simple_form.my.yml b/config/locales/simple_form.my.yml
index 20c862ab27a0cd..a44635edd4b4f9 100644
--- a/config/locales/simple_form.my.yml
+++ b/config/locales/simple_form.my.yml
@@ -301,7 +301,6 @@ my:
         listable: ရှာဖွေမှုများနှင့် အကြံပြုချက်များတွင် ဤ hashtag ပေါ်လာစေရန် ခွင့်ပြုပါ
         name: Hashtag
         trendable: ခေတ်စားနေသောအကြောင်းအရာများအောက်တွင် ဤ hashtag ပေါ်လာစေရန် ခွင့်ပြုပါ
-        usable: ပို့စ်များကို ဤ hashtag သုံးခွင့်ပြုပါ
       user:
         role: အခန်းကဏ္ဍ
         time_zone: အချိန်ဇုန်
diff --git a/config/locales/simple_form.nl.yml b/config/locales/simple_form.nl.yml
index 56331934064401..91ee9bc3e3b7b9 100644
--- a/config/locales/simple_form.nl.yml
+++ b/config/locales/simple_form.nl.yml
@@ -314,7 +314,7 @@ nl:
         listable: Toestaan dat deze hashtag in zoekopdrachten en aanbevelingen te zien valt
         name: Hashtag
         trendable: Goedkeuren dat deze hashtag onder trends te zien valt
-        usable: Toestaan dat deze hashtag in berichten gebruikt mag worden
+        usable: Berichten toestaan deze hashtag lokaal te gebruiken
       user:
         role: Rol
         time_zone: Tijdzone
diff --git a/config/locales/simple_form.nn.yml b/config/locales/simple_form.nn.yml
index c9075a89c210e3..f7551cc313e5bf 100644
--- a/config/locales/simple_form.nn.yml
+++ b/config/locales/simple_form.nn.yml
@@ -314,7 +314,6 @@ nn:
         listable: Tillat denne emneknaggen å synast i søk og i profilmappa
         name: Emneknagg
         trendable: Tillat denne emneknaggen til å synast under trendar
-        usable: Gje tut lov til å nytta denne emneknaggen
       user:
         role: Rolle
         time_zone: Tidssone
diff --git a/config/locales/simple_form.no.yml b/config/locales/simple_form.no.yml
index de3788aa42d256..82de0adb7b5e29 100644
--- a/config/locales/simple_form.no.yml
+++ b/config/locales/simple_form.no.yml
@@ -303,7 +303,6 @@
         listable: Tillat denne emneknaggen å vises i søk og på profilmappen
         name: Emneknagg
         trendable: Tillat denne emneknaggen til å vises under trender
-        usable: Tillat innlegg å bruke denne emneknaggen
       user:
         role: Rolle
         time_zone: Tidssone
diff --git a/config/locales/simple_form.oc.yml b/config/locales/simple_form.oc.yml
index ba9c260e472e01..05b0508a5151f2 100644
--- a/config/locales/simple_form.oc.yml
+++ b/config/locales/simple_form.oc.yml
@@ -217,7 +217,6 @@ oc:
         listable: Permetre a aquesta etiqueta d’aparéisser a las recèrcas e a l’annuari de perfils
         name: Etiqueta
         trendable: Permetre a aquesta etiqueta d’aparéisser a las tendéncias
-        usable: Permetre als tuts d’utilizar aquesta etiqueta
       user:
         role: Ròtle
       user_role:
diff --git a/config/locales/simple_form.pl.yml b/config/locales/simple_form.pl.yml
index 39e1814195f877..1a9051b9510b28 100644
--- a/config/locales/simple_form.pl.yml
+++ b/config/locales/simple_form.pl.yml
@@ -314,7 +314,7 @@ pl:
         listable: Pozwól, aby ten hashtag pojawiał się w wynikach wyszukiwania i katalogu profilów
         name: Hasztag
         trendable: Pozwól na wyświetlanie tego hashtagu w „Na czasie”
-        usable: Pozwól na umieszczanie tego hashtagu we wpisach
+        usable: Pozwól na umieszczanie tego hashtagu w lokalnych wpisach
       user:
         role: Rola
         time_zone: Strefa czasowa
diff --git a/config/locales/simple_form.pt-BR.yml b/config/locales/simple_form.pt-BR.yml
index 77a0d8cd6f576b..fc3c09cf1d09d0 100644
--- a/config/locales/simple_form.pt-BR.yml
+++ b/config/locales/simple_form.pt-BR.yml
@@ -311,7 +311,6 @@ pt-BR:
         listable: Permitir que esta hashtag apareça em pesquisas e sugestões
         name: Hashtag
         trendable: Permitir que esta hashtag fique em alta
-        usable: Permitir que toots usem esta hashtag
       user:
         role: Cargo
         time_zone: Fuso horário
diff --git a/config/locales/simple_form.pt-PT.yml b/config/locales/simple_form.pt-PT.yml
index ef7dfd00a80fa2..a1a2bc657c3085 100644
--- a/config/locales/simple_form.pt-PT.yml
+++ b/config/locales/simple_form.pt-PT.yml
@@ -314,7 +314,6 @@ pt-PT:
         listable: Permitir que esta etiqueta apareça em pesquisas e no diretório de perfis
         name: Etiqueta
         trendable: Permitir que esta etiqueta apareça em alta
-        usable: Permitir que as publicações usem esta etiqueta
       user:
         role: Cargo
         time_zone: Fuso horário
diff --git a/config/locales/simple_form.ro.yml b/config/locales/simple_form.ro.yml
index 5df411b9512d3e..458638ddec1acb 100644
--- a/config/locales/simple_form.ro.yml
+++ b/config/locales/simple_form.ro.yml
@@ -177,7 +177,6 @@ ro:
       tag:
         listable: Permite acestui hashtag să apară în căutări și în directorul de profil
         trendable: Permite acestui hashtag să apară sub tendințe
-        usable: Permite postărilor să folosească acest hashtag
     'no': Nu
     recommended: Recomandat
     required:
diff --git a/config/locales/simple_form.ru.yml b/config/locales/simple_form.ru.yml
index a050b5a529fce1..de0d631ae65abd 100644
--- a/config/locales/simple_form.ru.yml
+++ b/config/locales/simple_form.ru.yml
@@ -301,7 +301,6 @@ ru:
         listable: Разрешить показ хэштега в поиске или в каталоге профилей
         name: Хэштег
         trendable: Разрешить показ хэштега в трендах
-        usable: Разрешить использовать этот хэштег в постах
       user:
         role: Роль
         time_zone: Часовой пояс
diff --git a/config/locales/simple_form.sc.yml b/config/locales/simple_form.sc.yml
index 84ed5c4115c565..fc5310395070e3 100644
--- a/config/locales/simple_form.sc.yml
+++ b/config/locales/simple_form.sc.yml
@@ -204,7 +204,6 @@ sc:
         listable: Permite a custa eticheta de apàrrere in is chircas e in sa cartella de is profilos
         name: Eticheta
         trendable: Permite a custa eticheta de apàrrere in is tendèntzias
-        usable: Permite a is tuts de impreare custa eticheta
       user_role:
         name: Nòmine
         permissions_as_keys: Permissos
diff --git a/config/locales/simple_form.sco.yml b/config/locales/simple_form.sco.yml
index f9dc4ba29118a4..9fc6fd57dbb363 100644
--- a/config/locales/simple_form.sco.yml
+++ b/config/locales/simple_form.sco.yml
@@ -265,7 +265,6 @@ sco:
         listable: Alloo this hashtag tae appear in seirches an suggestions
         name: Hashtag
         trendable: Alloo this hashtag fir tae appear unner trends
-        usable: Alloo posts fir tae uise this hashtag
       user:
         role: Role
       user_role:
diff --git a/config/locales/simple_form.si.yml b/config/locales/simple_form.si.yml
index a81ba27bb913f2..41658c76ac29ff 100644
--- a/config/locales/simple_form.si.yml
+++ b/config/locales/simple_form.si.yml
@@ -207,7 +207,6 @@ si:
         listable: මෙම හැෂ් ටැගය සෙවීම් සහ යෝජනා වල දිස් වීමට ඉඩ දෙන්න
         name: හෑෂ් ටැගය
         trendable: මෙම හැෂ් ටැගය ප්‍රවණතා යටතේ දිස් වීමට ඉඩ දෙන්න
-        usable: ලිපි සඳහා මෙම පූරක අනන්‍යනය භාවිතයට ඉඩදෙන්න
       user:
         role: භූමිකාව
         time_zone: වේලා කලාපය
diff --git a/config/locales/simple_form.sk.yml b/config/locales/simple_form.sk.yml
index 71bd25d6dfe0c4..fa15a6e3f7f10c 100644
--- a/config/locales/simple_form.sk.yml
+++ b/config/locales/simple_form.sk.yml
@@ -165,7 +165,6 @@ sk:
         listable: Povoľ zobrazovanie tohto haštagu v návrhoch vyhľadávaní
         name: Haštag
         trendable: Povoľ zobrazovanie tohto haštagu medzi trendujúcimi
-        usable: Povoľ používanie tohto haštagu v príspevkoch
     'no': Nie
     recommended: Odporúčané
     required:
diff --git a/config/locales/simple_form.sl.yml b/config/locales/simple_form.sl.yml
index a937f17206e465..b558a62fc8367d 100644
--- a/config/locales/simple_form.sl.yml
+++ b/config/locales/simple_form.sl.yml
@@ -314,7 +314,6 @@ sl:
         listable: Dovoli, da se ta ključnik pojavi v iskanjih in predlogih
         name: Ključnik
         trendable: Dovoli, da se ta ključnik pojavi med trendi
-        usable: Dovoli, da objave uporabljajo ta ključnik
       user:
         role: Vloga
         time_zone: Časovni pas
diff --git a/config/locales/simple_form.sq.yml b/config/locales/simple_form.sq.yml
index 4236d7dce2673b..912e0bda82cdc8 100644
--- a/config/locales/simple_form.sq.yml
+++ b/config/locales/simple_form.sq.yml
@@ -314,7 +314,6 @@ sq:
         listable: Lejoje këtë hashtag të shfaqet në kërkime dhe në drejtori profilesh
         name: Hashtag
         trendable: Lejoje këtë hashtag të shfaqet në prirje
-        usable: Lejoji mesazhet të përdorin këtë hashtag
       user:
         role: Rol
         time_zone: Zonë kohore
diff --git a/config/locales/simple_form.sr-Latn.yml b/config/locales/simple_form.sr-Latn.yml
index 40b710b078e690..e163de2f80a764 100644
--- a/config/locales/simple_form.sr-Latn.yml
+++ b/config/locales/simple_form.sr-Latn.yml
@@ -314,7 +314,6 @@ sr-Latn:
         listable: Dozvoli da se ova heš oznaka pojavljuje u pretragama i predlozima
         name: Heš oznaka
         trendable: Dozvoli da se ova heš oznaka pojavi u okviru trendova
-        usable: Dozvoli objavama da koriste ovu heš oznaku
       user:
         role: Uloga
         time_zone: Vremenska zona
diff --git a/config/locales/simple_form.sr.yml b/config/locales/simple_form.sr.yml
index c0a9ac2d8963c6..d7142390c91db0 100644
--- a/config/locales/simple_form.sr.yml
+++ b/config/locales/simple_form.sr.yml
@@ -314,7 +314,6 @@ sr:
         listable: Дозволи да се ова хеш ознака појављује у претрагама и предлозима
         name: Хеш ознака
         trendable: Дозволи да се ова хеш ознака појави у оквиру трендова
-        usable: Дозволи објавама да користе ову хеш ознаку
       user:
         role: Улога
         time_zone: Временска зона
diff --git a/config/locales/simple_form.sv.yml b/config/locales/simple_form.sv.yml
index 1e1aee5246c761..b0b974d7421c49 100644
--- a/config/locales/simple_form.sv.yml
+++ b/config/locales/simple_form.sv.yml
@@ -314,7 +314,6 @@ sv:
         listable: Tillåt denna hashtagg att visas i sökningar och förslag
         name: Hashtagg
         trendable: Tillåt denna hashtagg att visas under trender
-        usable: Tillåt inlägg att använda denna hashtagg
       user:
         role: Roll
         time_zone: Tidszon
diff --git a/config/locales/simple_form.th.yml b/config/locales/simple_form.th.yml
index c72112645b7703..387f74e74202ae 100644
--- a/config/locales/simple_form.th.yml
+++ b/config/locales/simple_form.th.yml
@@ -314,7 +314,6 @@ th:
         listable: อนุญาตให้แฮชแท็กนี้ปรากฏในการค้นหาและข้อเสนอแนะ
         name: แฮชแท็ก
         trendable: อนุญาตให้แฮชแท็กนี้ปรากฏภายใต้แนวโน้ม
-        usable: อนุญาตให้โพสต์ใช้แฮชแท็กนี้
       user:
         role: บทบาท
         time_zone: โซนเวลา
diff --git a/config/locales/simple_form.tr.yml b/config/locales/simple_form.tr.yml
index f098bfd3ca6d32..2cc2c1788e2e3b 100644
--- a/config/locales/simple_form.tr.yml
+++ b/config/locales/simple_form.tr.yml
@@ -314,7 +314,6 @@ tr:
         listable: Bu etiketin aramalarda ve profil dizininde görünmesine izin ver
         name: Etiket
         trendable: Bu etiketin gündem altında görünmesine izin ver
-        usable: Gönderilerin bu etiketi kullanmasına izin ver
       user:
         role: Rol
         time_zone: Zaman dilimi
diff --git a/config/locales/simple_form.uk.yml b/config/locales/simple_form.uk.yml
index 2f494534ea63b9..45478849b28ece 100644
--- a/config/locales/simple_form.uk.yml
+++ b/config/locales/simple_form.uk.yml
@@ -314,7 +314,6 @@ uk:
         listable: Дозволити появу цього хештеґа у каталозі пошуку і пропозицій
         name: Хештеґ
         trendable: Дозволити появу цього хештеґа у списку популярних хештеґів
-        usable: Дозволити дописам використовувати цей хештег
       user:
         role: Роль
         time_zone: Часовий пояс
diff --git a/config/locales/simple_form.vi.yml b/config/locales/simple_form.vi.yml
index c45da4713718ca..2310d1e3299379 100644
--- a/config/locales/simple_form.vi.yml
+++ b/config/locales/simple_form.vi.yml
@@ -314,7 +314,6 @@ vi:
         listable: Cho phép xuất hiện trong tìm kiếm và đề xuất
         name: Hashtag
         trendable: Cho phép hashtag này lên xu hướng
-        usable: Cho phép dùng trong tút
       user:
         role: Vai trò
         time_zone: Múi giờ
diff --git a/config/locales/simple_form.zh-CN.yml b/config/locales/simple_form.zh-CN.yml
index ab440e04f43c7f..58334471a37c43 100644
--- a/config/locales/simple_form.zh-CN.yml
+++ b/config/locales/simple_form.zh-CN.yml
@@ -314,7 +314,6 @@ zh-CN:
         listable: 允许这个话题标签在用户目录中显示
         name: 话题标签
         trendable: 允许在热门下显示此话题
-        usable: 允许嘟文使用此话题标签
       user:
         role: 角色
         time_zone: 时区
diff --git a/config/locales/simple_form.zh-HK.yml b/config/locales/simple_form.zh-HK.yml
index 0e2ee81db7f2c8..6a7cd5a2471553 100644
--- a/config/locales/simple_form.zh-HK.yml
+++ b/config/locales/simple_form.zh-HK.yml
@@ -309,7 +309,6 @@ zh-HK:
         listable: 允許此主題標籤在搜尋及個人檔案目錄中顯示
         name: 主題標籤
         trendable: 允許此主題標籤在趨勢下顯示
-        usable: 允許文章使用此主題標籤
       user:
         role: 角色
         time_zone: 時區
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 388fe35d842065..ef2da39f30b533 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -873,7 +873,23 @@ zh-TW:
         action: 檢查這裡以取得更多資訊
         message_html: "<strong>您的物件資料儲存空間 (object storage) 設定錯誤。您的使用者隱私正暴露於風險之中。</strong>"
     tags:
+      moderation:
+        not_trendable: 無法作為熱門趨勢
+        not_usable: 無法使用
+        pending_review: 等待審核中
+        review_requested: 需要審核
+        reviewed: 已審核
+        title: 狀態
+        trendable: 可作為熱門趨勢
+        unreviewed: 待審核
+        usable: 可以使用
+      name: 名稱
+      newest: 最新
+      oldest: 最舊
+      reset: 重設
       review: 審核嘟文
+      search: 搜尋
+      title: 主題標籤
       updated_msg: 成功更新主題標籤設定
     title: 管理介面
     trends:

From 2ce99c51dd37ace101ff43a701c51bd7778a3666 Mon Sep 17 00:00:00 2001
From: Tim Rogers <rogers.timothy.john@gmail.com>
Date: Tue, 30 Jul 2024 03:18:00 -0500
Subject: [PATCH 1661/2191] Fixed Rails route covering %40-encoded profile URL
 paths to not 404 (#31184)

---
 config/routes.rb                      |   6 +-
 spec/routing/accounts_routing_spec.rb | 101 ++++++++++++++++++++++++++
 2 files changed, 106 insertions(+), 1 deletion(-)

diff --git a/config/routes.rb b/config/routes.rb
index 93bdb959695aa1..3ac619519d40f7 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -142,7 +142,11 @@ def redirect_with_vary(path)
 
   resource :inbox, only: [:create], module: :activitypub
 
-  get '/:encoded_at(*path)', to: redirect('/@%{path}'), constraints: { encoded_at: /%40/ }
+  constraints(encoded_path: /%40.*/) do
+    get '/:encoded_path', to: redirect { |params|
+      "/#{params[:encoded_path].gsub('%40', '@')}"
+    }
+  end
 
   constraints(username: %r{[^@/.]+}) do
     with_options to: 'accounts#show' do
diff --git a/spec/routing/accounts_routing_spec.rb b/spec/routing/accounts_routing_spec.rb
index 8b2c124fd21a72..588855943e64be 100644
--- a/spec/routing/accounts_routing_spec.rb
+++ b/spec/routing/accounts_routing_spec.rb
@@ -47,6 +47,61 @@
     end
   end
 
+  context 'with local username encoded at' do
+    include RSpec::Rails::RequestExampleGroup
+    let(:username) { 'alice' }
+
+    it 'routes /%40:username' do
+      get "/%40#{username}"
+      expect(response).to redirect_to("/@#{username}")
+    end
+
+    it 'routes /%40:username.json' do
+      get("/%40#{username}.json")
+      expect(response).to redirect_to("/@#{username}.json")
+    end
+
+    it 'routes /%40:username.rss' do
+      get("/%40#{username}.rss")
+      expect(response).to redirect_to("/@#{username}.rss")
+    end
+
+    it 'routes /%40:username/:id' do
+      get("/%40#{username}/123")
+      expect(response).to redirect_to("/@#{username}/123")
+    end
+
+    it 'routes /%40:username/:id/embed' do
+      get("/%40#{username}/123/embed")
+      expect(response).to redirect_to("/@#{username}/123/embed")
+    end
+
+    it 'routes /%40:username/following' do
+      get("/%40#{username}/following")
+      expect(response).to redirect_to("/@#{username}/following")
+    end
+
+    it 'routes /%40:username/followers' do
+      get("/%40#{username}/followers")
+      expect(response).to redirect_to("/@#{username}/followers")
+    end
+
+    it 'routes /%40:username/with_replies' do
+      get("/%40#{username}/with_replies")
+      expect(response).to redirect_to("/@#{username}/with_replies")
+    end
+
+    it 'routes /%40:username/media' do
+      get("/%40#{username}/media")
+      expect(response).to redirect_to("/@#{username}/media")
+    end
+
+    it 'routes /%40:username/tagged/:tag' do
+      get("/%40#{username}/tagged/foo")
+      expect(response).to redirect_to("/@#{username}/tagged/foo")
+    end
+  end
+
   context 'with remote username' do
     let(:username) { 'alice@example.com' }
 
@@ -82,4 +137,50 @@
       expect(get("/@#{username}/tagged/foo")).to route_to('home#index', username_with_domain: username, any: 'tagged/foo')
     end
   end
+
+  context 'with remote username encoded at' do
+    include RSpec::Rails::RequestExampleGroup
+    let(:username) { 'alice%40example.com' }
+    let(:username_decoded) { 'alice@example.com' }
+
+    it 'routes /%40:username' do
+      get("/%40#{username}")
+      expect(response).to redirect_to("/@#{username_decoded}")
+    end
+
+    it 'routes /%40:username/:id' do
+      get("/%40#{username}/123")
+      expect(response).to redirect_to("/@#{username_decoded}/123")
+    end
+
+    it 'routes /%40:username/:id/embed' do
+      get("/%40#{username}/123/embed")
+      expect(response).to redirect_to("/@#{username_decoded}/123/embed")
+    end
+
+    it 'routes /%40:username/following' do
+      get("/%40#{username}/following")
+      expect(response).to redirect_to("/@#{username_decoded}/following")
+    end
+
+    it 'routes /%40:username/followers' do
+      get("/%40#{username}/followers")
+      expect(response).to redirect_to("/@#{username_decoded}/followers")
+    end
+
+    it 'routes /%40:username/with_replies' do
+      get("/%40#{username}/with_replies")
+      expect(response).to redirect_to("/@#{username_decoded}/with_replies")
+    end
+
+    it 'routes /%40:username/media' do
+      get("/%40#{username}/media")
+      expect(response).to redirect_to("/@#{username_decoded}/media")
+    end
+
+    it 'routes /%40:username/tagged/:tag' do
+      get("/%40#{username}/tagged/foo")
+      expect(response).to redirect_to("/@#{username_decoded}/tagged/foo")
+    end
+  end
 end

From 598ae4f2da86029b1c3c3e35e64b89873037b598 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 30 Jul 2024 10:39:11 +0200
Subject: [PATCH 1662/2191] Add endpoints for unread notifications count
 (#31191)

---
 app/controllers/api/base_controller.rb        |  4 +-
 .../api/v1/notifications_controller.rb        | 14 ++++
 .../api/v2_alpha/notifications_controller.rb  | 14 ++++
 config/routes/api.rb                          |  2 +
 spec/requests/api/v1/notifications_spec.rb    | 77 +++++++++++++++++++
 .../api/v2_alpha/notifications_spec.rb        | 77 +++++++++++++++++++
 6 files changed, 186 insertions(+), 2 deletions(-)

diff --git a/app/controllers/api/base_controller.rb b/app/controllers/api/base_controller.rb
index c1a5e43f882dd0..0980e0ebbc60be 100644
--- a/app/controllers/api/base_controller.rb
+++ b/app/controllers/api/base_controller.rb
@@ -30,10 +30,10 @@ def doorkeeper_forbidden_render_options(*)
 
   protected
 
-  def limit_param(default_limit)
+  def limit_param(default_limit, max_limit = nil)
     return default_limit unless params[:limit]
 
-    [params[:limit].to_i.abs, default_limit * 2].min
+    [params[:limit].to_i.abs, max_limit || (default_limit * 2)].min
   end
 
   def params_slice(*keys)
diff --git a/app/controllers/api/v1/notifications_controller.rb b/app/controllers/api/v1/notifications_controller.rb
index 1d0aa10d2e70cd..13919b400df6a3 100644
--- a/app/controllers/api/v1/notifications_controller.rb
+++ b/app/controllers/api/v1/notifications_controller.rb
@@ -7,6 +7,8 @@ class Api::V1::NotificationsController < Api::BaseController
   after_action :insert_pagination_headers, only: :index
 
   DEFAULT_NOTIFICATIONS_LIMIT = 40
+  DEFAULT_NOTIFICATIONS_COUNT_LIMIT = 100
+  MAX_NOTIFICATIONS_COUNT_LIMIT = 1_000
 
   def index
     with_read_replica do
@@ -17,6 +19,14 @@ def index
     render json: @notifications, each_serializer: REST::NotificationSerializer, relationships: @relationships
   end
 
+  def unread_count
+    limit = limit_param(DEFAULT_NOTIFICATIONS_COUNT_LIMIT, MAX_NOTIFICATIONS_COUNT_LIMIT)
+
+    with_read_replica do
+      render json: { count: browserable_account_notifications.paginate_by_min_id(limit, notification_marker&.last_read_id).count }
+    end
+  end
+
   def show
     @notification = current_account.notifications.without_suspended.find(params[:id])
     render json: @notification, serializer: REST::NotificationSerializer
@@ -54,6 +64,10 @@ def browserable_account_notifications
     )
   end
 
+  def notification_marker
+    current_user.markers.find_by(timeline: 'notifications')
+  end
+
   def target_statuses_from_notifications
     @notifications.reject { |notification| notification.target_status.nil? }.map(&:target_status)
   end
diff --git a/app/controllers/api/v2_alpha/notifications_controller.rb b/app/controllers/api/v2_alpha/notifications_controller.rb
index 83d40a0886f52f..d1126baaf46e64 100644
--- a/app/controllers/api/v2_alpha/notifications_controller.rb
+++ b/app/controllers/api/v2_alpha/notifications_controller.rb
@@ -7,6 +7,8 @@ class Api::V2Alpha::NotificationsController < Api::BaseController
   after_action :insert_pagination_headers, only: :index
 
   DEFAULT_NOTIFICATIONS_LIMIT = 40
+  DEFAULT_NOTIFICATIONS_COUNT_LIMIT = 100
+  MAX_NOTIFICATIONS_COUNT_LIMIT = 1_000
 
   def index
     with_read_replica do
@@ -35,6 +37,14 @@ def index
     end
   end
 
+  def unread_count
+    limit = limit_param(DEFAULT_NOTIFICATIONS_COUNT_LIMIT, MAX_NOTIFICATIONS_COUNT_LIMIT)
+
+    with_read_replica do
+      render json: { count: browserable_account_notifications.paginate_groups_by_min_id(limit, min_id: notification_marker&.last_read_id).count }
+    end
+  end
+
   def show
     @notification = current_account.notifications.without_suspended.find_by!(group_key: params[:id])
     render json: NotificationGroup.from_notification(@notification), serializer: REST::NotificationGroupSerializer
@@ -92,6 +102,10 @@ def browserable_account_notifications
     )
   end
 
+  def notification_marker
+    current_user.markers.find_by(timeline: 'notifications')
+  end
+
   def target_statuses_from_notifications
     @notifications.filter_map(&:target_status)
   end
diff --git a/config/routes/api.rb b/config/routes/api.rb
index 9011916697452d..e488bb9187ef5d 100644
--- a/config/routes/api.rb
+++ b/config/routes/api.rb
@@ -167,6 +167,7 @@
     resources :notifications, only: [:index, :show] do
       collection do
         post :clear
+        get :unread_count
       end
 
       member do
@@ -336,6 +337,7 @@
     resources :notifications, only: [:index, :show] do
       collection do
         post :clear
+        get :unread_count
       end
 
       member do
diff --git a/spec/requests/api/v1/notifications_spec.rb b/spec/requests/api/v1/notifications_spec.rb
index c9034c17dcbd97..3d1e8a4787bb6a 100644
--- a/spec/requests/api/v1/notifications_spec.rb
+++ b/spec/requests/api/v1/notifications_spec.rb
@@ -8,6 +8,83 @@
   let(:scopes)  { 'read:notifications write:notifications' }
   let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
 
+  describe 'GET /api/v1/notifications/unread_count', :inline_jobs do
+    subject do
+      get '/api/v1/notifications/unread_count', headers: headers, params: params
+    end
+
+    let(:params) { {} }
+
+    before do
+      first_status = PostStatusService.new.call(user.account, text: 'Test')
+      ReblogService.new.call(Fabricate(:account), first_status)
+      PostStatusService.new.call(Fabricate(:account), text: 'Hello @alice')
+      FavouriteService.new.call(Fabricate(:account), first_status)
+      FavouriteService.new.call(Fabricate(:account), first_status)
+      FollowService.new.call(Fabricate(:account), user.account)
+    end
+
+    it_behaves_like 'forbidden for wrong scope', 'write write:notifications'
+
+    context 'with no options' do
+      it 'returns expected notifications count' do
+        subject
+
+        expect(response).to have_http_status(200)
+        expect(body_as_json[:count]).to eq 5
+      end
+    end
+
+    context 'with a read marker' do
+      before do
+        id = user.account.notifications.browserable.order(id: :desc).offset(2).first.id
+        user.markers.create!(timeline: 'notifications', last_read_id: id)
+      end
+
+      it 'returns expected notifications count' do
+        subject
+
+        expect(response).to have_http_status(200)
+        expect(body_as_json[:count]).to eq 2
+      end
+    end
+
+    context 'with exclude_types param' do
+      let(:params) { { exclude_types: %w(mention) } }
+
+      it 'returns expected notifications count' do
+        subject
+
+        expect(response).to have_http_status(200)
+        expect(body_as_json[:count]).to eq 4
+      end
+    end
+
+    context 'with a user-provided limit' do
+      let(:params) { { limit: 2 } }
+
+      it 'returns a capped value' do
+        subject
+
+        expect(response).to have_http_status(200)
+        expect(body_as_json[:count]).to eq 2
+      end
+    end
+
+    context 'when there are more notifications than the limit' do
+      before do
+        stub_const('Api::V1::NotificationsController::DEFAULT_NOTIFICATIONS_COUNT_LIMIT', 2)
+      end
+
+      it 'returns a capped value' do
+        subject
+
+        expect(response).to have_http_status(200)
+        expect(body_as_json[:count]).to eq Api::V1::NotificationsController::DEFAULT_NOTIFICATIONS_COUNT_LIMIT
+      end
+    end
+  end
+
   describe 'GET /api/v1/notifications', :inline_jobs do
     subject do
       get '/api/v1/notifications', headers: headers, params: params
diff --git a/spec/requests/api/v2_alpha/notifications_spec.rb b/spec/requests/api/v2_alpha/notifications_spec.rb
index 104651ebe39f44..381987e7e7a0f1 100644
--- a/spec/requests/api/v2_alpha/notifications_spec.rb
+++ b/spec/requests/api/v2_alpha/notifications_spec.rb
@@ -8,6 +8,83 @@
   let(:scopes)  { 'read:notifications write:notifications' }
   let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
 
+  describe 'GET /api/v2_alpha/notifications/unread_count', :inline_jobs do
+    subject do
+      get '/api/v2_alpha/notifications/unread_count', headers: headers, params: params
+    end
+
+    let(:params) { {} }
+
+    before do
+      first_status = PostStatusService.new.call(user.account, text: 'Test')
+      ReblogService.new.call(Fabricate(:account), first_status)
+      PostStatusService.new.call(Fabricate(:account), text: 'Hello @alice')
+      FavouriteService.new.call(Fabricate(:account), first_status)
+      FavouriteService.new.call(Fabricate(:account), first_status)
+      FollowService.new.call(Fabricate(:account), user.account)
+    end
+
+    it_behaves_like 'forbidden for wrong scope', 'write write:notifications'
+
+    context 'with no options' do
+      it 'returns expected notifications count' do
+        subject
+
+        expect(response).to have_http_status(200)
+        expect(body_as_json[:count]).to eq 4
+      end
+    end
+
+    context 'with a read marker' do
+      before do
+        id = user.account.notifications.browserable.order(id: :desc).offset(2).first.id
+        user.markers.create!(timeline: 'notifications', last_read_id: id)
+      end
+
+      it 'returns expected notifications count' do
+        subject
+
+        expect(response).to have_http_status(200)
+        expect(body_as_json[:count]).to eq 2
+      end
+    end
+
+    context 'with exclude_types param' do
+      let(:params) { { exclude_types: %w(mention) } }
+
+      it 'returns expected notifications count' do
+        subject
+
+        expect(response).to have_http_status(200)
+        expect(body_as_json[:count]).to eq 3
+      end
+    end
+
+    context 'with a user-provided limit' do
+      let(:params) { { limit: 2 } }
+
+      it 'returns a capped value' do
+        subject
+
+        expect(response).to have_http_status(200)
+        expect(body_as_json[:count]).to eq 2
+      end
+    end
+
+    context 'when there are more notifications than the limit' do
+      before do
+        stub_const('Api::V2Alpha::NotificationsController::DEFAULT_NOTIFICATIONS_COUNT_LIMIT', 2)
+      end
+
+      it 'returns a capped value' do
+        subject
+
+        expect(response).to have_http_status(200)
+        expect(body_as_json[:count]).to eq Api::V2Alpha::NotificationsController::DEFAULT_NOTIFICATIONS_COUNT_LIMIT
+      end
+    end
+  end
+
   describe 'GET /api/v2_alpha/notifications', :inline_jobs do
     subject do
       get '/api/v2_alpha/notifications', headers: headers, params: params

From 4eab6aef95554d74237fcdbe13c986373a643739 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 30 Jul 2024 23:40:42 +0200
Subject: [PATCH 1663/2191] Change User-Agent to use Mastodon as the product,
 and http.rb as platform details (#31192)

---
 lib/mastodon/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index 96ad4092819b29..fd05dac7b98c9f 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -65,7 +65,7 @@ def source_url
     end
 
     def user_agent
-      @user_agent ||= "#{HTTP::Request::USER_AGENT} (Mastodon/#{Version}; +http#{Rails.configuration.x.use_https ? 's' : ''}://#{Rails.configuration.x.web_domain}/)"
+      @user_agent ||= "Mastodon/#{Version} (#{HTTP::Request::USER_AGENT}; +http#{Rails.configuration.x.use_https ? 's' : ''}://#{Rails.configuration.x.web_domain}/)"
     end
   end
 end

From fd1bade13524f281ec93b03e3a2b6ae5435ffa5c Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 31 Jul 2024 09:52:59 +0200
Subject: [PATCH 1664/2191] Fix inconsistent dismiss icon for notification
 requests (#31220)

---
 app/javascript/mastodon/features/notifications/request.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/javascript/mastodon/features/notifications/request.jsx b/app/javascript/mastodon/features/notifications/request.jsx
index 09bef3beab8cf0..7cba9461659ab1 100644
--- a/app/javascript/mastodon/features/notifications/request.jsx
+++ b/app/javascript/mastodon/features/notifications/request.jsx
@@ -7,9 +7,9 @@ import { Helmet } from 'react-helmet';
 
 import { useSelector, useDispatch } from 'react-redux';
 
+import DeleteIcon from '@/material-icons/400-24px/delete.svg?react';
 import DoneIcon from '@/material-icons/400-24px/done.svg?react';
 import InventoryIcon from '@/material-icons/400-24px/inventory_2.svg?react';
-import VolumeOffIcon from '@/material-icons/400-24px/volume_off.svg?react';
 import { fetchNotificationRequest, fetchNotificationsForRequest, expandNotificationsForRequest, acceptNotificationRequest, dismissNotificationRequest } from 'mastodon/actions/notifications';
 import Column from 'mastodon/components/column';
 import ColumnHeader from 'mastodon/components/column_header';
@@ -101,7 +101,7 @@ export const NotificationRequest = ({ multiColumn, params: { id } }) => {
         showBackButton
         extraButton={!removed && (
           <>
-            <IconButton className='column-header__button' iconComponent={VolumeOffIcon} onClick={handleDismiss} title={intl.formatMessage(messages.dismiss)} />
+            <IconButton className='column-header__button' iconComponent={DeleteIcon} onClick={handleDismiss} title={intl.formatMessage(messages.dismiss)} />
             <IconButton className='column-header__button' iconComponent={DoneIcon} onClick={handleAccept} title={intl.formatMessage(messages.accept)} />
           </>
         )}

From 66a16bf49cf7729d8d2fac866832b12f8dec42a0 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 31 Jul 2024 10:01:07 +0200
Subject: [PATCH 1665/2191] chore(deps): update dependency
 opentelemetry-instrumentation-active_job to v0.7.4 (#31218)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 5022270270e1ea..ba8673bbf8d647 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -517,7 +517,7 @@ GEM
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-active_support (~> 0.1)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-active_job (0.7.3)
+    opentelemetry-instrumentation-active_job (0.7.4)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
     opentelemetry-instrumentation-active_model_serializers (0.20.2)

From 520ff042480ac4772fb84d02677fc7c6825816a9 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 31 Jul 2024 08:09:49 +0000
Subject: [PATCH 1666/2191] New Crowdin Translations (automated) (#31219)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/fi.json    | 32 ++++----
 app/javascript/mastodon/locales/zh-CN.json | 24 +++---
 config/locales/ca.yml                      | 16 ++++
 config/locales/es-AR.yml                   | 18 +++-
 config/locales/fi.yml                      | 96 +++++++++++-----------
 config/locales/hi.yml                      | 17 ++++
 config/locales/it.yml                      | 16 ++++
 config/locales/pt-PT.yml                   | 16 ++++
 config/locales/simple_form.ca.yml          |  1 +
 config/locales/simple_form.es-AR.yml       |  1 +
 config/locales/simple_form.fi.yml          | 10 +--
 config/locales/simple_form.hi.yml          |  5 ++
 config/locales/simple_form.it.yml          |  1 +
 config/locales/simple_form.pt-PT.yml       |  1 +
 config/locales/simple_form.ru.yml          |  1 +
 config/locales/simple_form.sq.yml          |  1 +
 config/locales/simple_form.vi.yml          |  1 +
 config/locales/simple_form.zh-CN.yml       |  1 +
 config/locales/sq.yml                      | 14 ++++
 config/locales/sv.yml                      |  5 ++
 config/locales/vi.yml                      | 16 ++++
 config/locales/zh-CN.yml                   | 16 ++++
 22 files changed, 227 insertions(+), 82 deletions(-)

diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index c1cdb684627eb7..168472326c82ca 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -1,6 +1,6 @@
 {
   "about.blocks": "Moderoidut palvelimet",
-  "about.contact": "Ota yhteys:",
+  "about.contact": "Yhteydenotto:",
   "about.disclaimer": "Mastodon on vapaa avoimen lähdekoodin ohjelmisto ja Mastodon gGmbH:n tavaramerkki.",
   "about.domain_blocks.no_reason_available": "Syy ei ole tiedossa",
   "about.domain_blocks.preamble": "Mastodonin avulla voidaan yleensä tarkastella minkä tahansa fediversumiin kuuluvan palvelimen sisältöä, ja olla yhteyksissä eri palvelinten käyttäjien kanssa. Nämä poikkeukset koskevat yksin tätä palvelinta.",
@@ -45,7 +45,7 @@
   "account.joined_short": "Liittynyt",
   "account.languages": "Vaihda tilattuja kieliä",
   "account.link_verified_on": "Linkin omistus tarkistettiin {date}",
-  "account.locked_info": "Tilin yksityisyystilaksi on määritetty lukittu ja tilin omistaja arvioi erikseen, kuka voi seurata häntä.",
+  "account.locked_info": "Tilin yksityisyystilaksi on määritetty lukittu. Tilin omistaja arvioi erikseen, kuka voi seurata häntä.",
   "account.media": "Media",
   "account.mention": "Mainitse @{name}",
   "account.moved_to": "{name} on ilmoittanut uudeksi tilikseen",
@@ -119,7 +119,7 @@
   "column.blocks": "Estetyt käyttäjät",
   "column.bookmarks": "Kirjanmerkit",
   "column.community": "Paikallinen aikajana",
-  "column.direct": "Yksityiset maininnat",
+  "column.direct": "Yksityismaininnat",
   "column.directory": "Selaa profiileja",
   "column.domain_blocks": "Estetyt verkkotunnukset",
   "column.favourites": "Suosikit",
@@ -246,7 +246,7 @@
   "emoji_button.objects": "Esineet",
   "emoji_button.people": "Ihmiset",
   "emoji_button.recent": "Usein käytetyt",
-  "emoji_button.search": "Etsi...",
+  "emoji_button.search": "Hae...",
   "emoji_button.search_results": "Hakutulokset",
   "emoji_button.symbols": "Symbolit",
   "emoji_button.travel": "Matkailu ja paikat",
@@ -544,13 +544,13 @@
   "notifications.permission_denied": "Työpöytäilmoitukset eivät ole käytettävissä, koska selaimen käyttöoikeuspyyntö on aiemmin evätty",
   "notifications.permission_denied_alert": "Työpöytäilmoituksia ei voi ottaa käyttöön, koska selaimen käyttöoikeus on aiemmin evätty",
   "notifications.permission_required": "Työpöytäilmoitukset eivät ole käytettävissä, koska siihen tarvittavaa käyttöoikeutta ei ole myönnetty.",
-  "notifications.policy.filter_new_accounts.hint": "Luotu {days, plural, one {viime päivänä} other {viimeisenä # päivänä}}",
+  "notifications.policy.filter_new_accounts.hint": "Luotu {days, plural, one {viime päivän} other {viimeisen # päivän}} aikana",
   "notifications.policy.filter_new_accounts_title": "Uudet tilit",
   "notifications.policy.filter_not_followers_hint": "Mukaan lukien alle {days, plural, one {päivän} other {# päivää}} sinua seuranneet",
   "notifications.policy.filter_not_followers_title": "Henkilöt, jotka eivät seuraa sinua",
-  "notifications.policy.filter_not_following_hint": "Kunnes hyväksyt ne manuaalisesti",
+  "notifications.policy.filter_not_following_hint": "Kunnes hyväksyt heidät manuaalisesti",
   "notifications.policy.filter_not_following_title": "Henkilöt, joita et seuraa",
-  "notifications.policy.filter_private_mentions_hint": "Suodatetaan, ellei se vastaa omaan mainintaasi tai ellet seuraa lähettäjää",
+  "notifications.policy.filter_private_mentions_hint": "Suodatetaan, ellei se ole vastaus omaan mainintaasi tai ellet seuraa lähettäjää",
   "notifications.policy.filter_private_mentions_title": "Ei-toivotut yksityismaininnat",
   "notifications.policy.title": "Suodata ilmoitukset pois kohteesta…",
   "notifications_permission_banner.enable": "Ota työpöytäilmoitukset käyttöön",
@@ -573,8 +573,8 @@
   "onboarding.profile.note_hint": "Voit @mainita muita käyttäjiä tai #aihetunnisteita…",
   "onboarding.profile.save_and_continue": "Tallenna ja jatka",
   "onboarding.profile.title": "Profiilin määritys",
-  "onboarding.profile.upload_avatar": "Lataa profiilikuva",
-  "onboarding.profile.upload_header": "Lataa profiilin otsakekuva",
+  "onboarding.profile.upload_avatar": "Lähetä profiilikuva",
+  "onboarding.profile.upload_header": "Lähetä profiilin otsakekuva",
   "onboarding.share.lead": "Kerro ihmisille, kuinka he voivat löytää sinut Mastodonista!",
   "onboarding.share.message": "Olen {username} #Mastodon⁠issa! Seuraa minua osoitteessa {url}",
   "onboarding.share.next_steps": "Mahdolliset seuraavat vaiheet:",
@@ -614,10 +614,10 @@
   "privacy.private.short": "Seuraajat",
   "privacy.public.long": "Kuka tahansa Mastodonissa ja sen ulkopuolella",
   "privacy.public.short": "Julkinen",
-  "privacy.unlisted.additional": "Tämä on muutoin kuin julkinen julkaisu, mutta sitä ei näytetä livesyöte-, aihetunniste- tai selailunäkymissä eikä Mastodon-hakutuloksissakaan, vaikka ne olisivat käyttäjätililläsi yleisesti sallittuina.",
+  "privacy.unlisted.additional": "Tämä toimii muuten kuin julkinen, mutta julkaisut eivät näy livesyöte-, aihetunniste- tai selausnäkymissä eivätkä Mastodonin hakutuloksissa, vaikka ne olisivat käyttäjätililläsi yleisesti sallittuina.",
   "privacy.unlisted.long": "Vähemmän algoritmiperusteista sisältöä",
   "privacy.unlisted.short": "Vaivihkaisesti julkinen",
-  "privacy_policy.last_updated": "Viimeksi päivitetty {date}",
+  "privacy_policy.last_updated": "Päivitetty viimeksi {date}",
   "privacy_policy.title": "Tietosuojakäytäntö",
   "recommended": "Suositeltu",
   "refresh": "Päivitä",
@@ -692,7 +692,7 @@
   "search.quick_action.account_search": "Profiilit haulla {x}",
   "search.quick_action.go_to_account": "Siirry profiiliin {x}",
   "search.quick_action.go_to_hashtag": "Siirry aihetunnisteeseen {x}",
-  "search.quick_action.open_url": "Avaa verkko-osoite Mastodonissa",
+  "search.quick_action.open_url": "Avaa URL-osoite Mastodonissa",
   "search.quick_action.status_search": "Julkaisut haulla {x}",
   "search.search_or_paste": "Hae tai liitä URL-osoite",
   "search_popout.full_text_search_disabled_message": "Ei saatavilla palvelimella {domain}.",
@@ -800,10 +800,10 @@
   "units.short.billion": "{count} mrd.",
   "units.short.million": "{count} milj.",
   "units.short.thousand": "{count} t.",
-  "upload_area.title": "Lataa raahaamalla ja pudottamalla tähän",
+  "upload_area.title": "Lähetä raahaamalla ja pudottamalla tähän",
   "upload_button.label": "Lisää kuvia, video tai äänitiedosto",
-  "upload_error.limit": "Tiedostolatauksien rajoitus ylitetty.",
-  "upload_error.poll": "Tiedostojen lisääminen ei ole sallittua kyselyjen ohessa.",
+  "upload_error.limit": "Tiedostolähetysten rajoitus ylitetty.",
+  "upload_error.poll": "Tiedostojen lisääminen äänestysten oheen ei ole sallittua.",
   "upload_form.audio_description": "Kuvaile sisältöä kuuroille ja kuulorajoitteisille",
   "upload_form.description": "Kuvaile sisältöä sokeille ja näkörajoitteisille",
   "upload_form.edit": "Muokkaa",
@@ -819,7 +819,7 @@
   "upload_modal.hint": "Napsauta tai vedä ympyrä esikatselussa valitaksesi keskipiste, joka näkyy aina pienoiskuvissa.",
   "upload_modal.preparing_ocr": "Valmistellaan tekstintunnistusta…",
   "upload_modal.preview_label": "Esikatselu ({ratio})",
-  "upload_progress.label": "Tallennetaan...",
+  "upload_progress.label": "Lähetetään...",
   "upload_progress.processing": "Käsitellään…",
   "username.taken": "Tämä käyttäjänimi on jo käytössä. Kokeile toista",
   "video.close": "Sulje video",
diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json
index f5b72f05043800..6e6d6d5d373384 100644
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@@ -1,12 +1,12 @@
 {
-  "about.blocks": "服务器被限制",
+  "about.blocks": "受限服务器",
   "about.contact": "联系方式：",
   "about.disclaimer": "Mastodon 是自由的开源软件，商标由 Mastodon gGmbH 持有。",
   "about.domain_blocks.no_reason_available": "原因不可用",
   "about.domain_blocks.preamble": "通常来说，在 Mastodon 上，你可以浏览联邦宇宙中任何一台服务器上的内容，并且和上面的用户互动。但其中一些在本服务器上被设置为例外。",
   "about.domain_blocks.silenced.explanation": "除非明确地搜索并关注对方，否则你不会看到来自此服务器的用户信息与内容。",
-  "about.domain_blocks.silenced.title": "已隐藏",
-  "about.domain_blocks.suspended.explanation": "此服务器的数据将不会被处理、存储或者交换，本站也将无法和来自此服务器的用户互动或者交流。",
+  "about.domain_blocks.silenced.title": "访问受限",
+  "about.domain_blocks.suspended.explanation": "不处理、存储或交换来自本服务器的任何数据，不可能与本服务器上的用户进行任何交互或通信。",
   "about.domain_blocks.suspended.title": "已封禁",
   "about.not_available": "此信息在当前服务器尚不可用。",
   "about.powered_by": "由 {mastodon} 驱动的去中心化社交媒体",
@@ -63,7 +63,7 @@
   "account.requested_follow": "{name} 已经向你发送了关注请求",
   "account.share": "分享 @{name} 的个人资料页",
   "account.show_reblogs": "显示来自 @{name} 的转嘟",
-  "account.statuses_counter": "{count, plural, other {{counter} 嘟文}}",
+  "account.statuses_counter": "{count, plural, other {{counter} 条嘟文}}",
   "account.unblock": "取消屏蔽 @{name}",
   "account.unblock_domain": "取消屏蔽 {domain} 域名",
   "account.unblock_short": "取消屏蔽",
@@ -81,7 +81,7 @@
   "admin.impact_report.instance_accounts": "将要删除的账户资料",
   "admin.impact_report.instance_followers": "本实例用户即将丢失的关注者",
   "admin.impact_report.instance_follows": "对方实例用户将会丢失的关注者",
-  "admin.impact_report.title": "影响摘要",
+  "admin.impact_report.title": "权重一览",
   "alert.rate_limited.message": "请在 {retry_time, time, medium} 后重试。",
   "alert.rate_limited.title": "频率受限",
   "alert.unexpected.message": "发生了意外错误。",
@@ -89,14 +89,14 @@
   "announcement.announcement": "公告",
   "attachments_list.unprocessed": "(未处理)",
   "audio.hide": "隐藏音频",
-  "block_modal.remote_users_caveat": "我们将要求服务器 {domain} 尊重您的决定。然而，无法保证对方一定遵从，因为某些服务器可能会以不同的方式处理屏蔽操作。公开嘟文仍然可能对未登录用户可见。",
-  "block_modal.show_less": "显示更少",
-  "block_modal.show_more": "显示更多",
+  "block_modal.remote_users_caveat": "我们将要求服务器 {domain} 尊重您的决定。然而，我们无法保证对方一定遵从，因为某些服务器可能会以不同的方案处理屏蔽操作。公开嘟文仍然可能对未登录的用户可见。",
+  "block_modal.show_less": "隐藏",
+  "block_modal.show_more": "展开",
   "block_modal.they_cant_mention": "他们不能提及或关注你。",
-  "block_modal.they_cant_see_posts": "他们看不到你的嘟文，你也看不到他们的嘟文。",
-  "block_modal.they_will_know": "他们可以看到他们被屏蔽。",
-  "block_modal.title": "屏蔽用户？",
-  "block_modal.you_wont_see_mentions": "你不会看到提及他们的嘟文。",
+  "block_modal.they_cant_see_posts": "嘟文将被设置为互相不可见。",
+  "block_modal.they_will_know": "他们将会获知他们被屏蔽。",
+  "block_modal.title": "屏蔽该用户？",
+  "block_modal.you_wont_see_mentions": "你将无法看到提及他们的嘟文。",
   "boost_modal.combo": "下次按住 {combo} 即可跳过此提示",
   "bundle_column_error.copy_stacktrace": "复制错误报告",
   "bundle_column_error.error.body": "请求的页面无法渲染，可能是代码出现错误或浏览器存在兼容性问题。",
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 321afb4dcb5398..f3fd91d11f62fa 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -885,7 +885,23 @@ ca:
         action: Consulta aquí per a més informació
         message_html: "<strong>El teu emagatzamatge d'objectes no està ben configurat. La privacitat dels teus usuaris està en risc.</strong>"
     tags:
+      moderation:
+        not_trendable: No pot ser en tendència
+        not_usable: No es pot fer servir
+        pending_review: Pendent de revisió
+        review_requested: Revisió demanada
+        reviewed: Revisada
+        title: Estat
+        trendable: Pot ser tendència
+        unreviewed: No revisada
+        usable: Es pot fer servir
+      name: Nom
+      newest: Més nous
+      oldest: Més vells
+      reset: Restableix
       review: Revisar l'estat
+      search: Cerca
+      title: Etiquetes
       updated_msg: Ajustaments d'etiquetes actualitzats amb èxit
     title: Administració
     trends:
diff --git a/config/locales/es-AR.yml b/config/locales/es-AR.yml
index 35dc9a348de51d..8ebe203560a0ad 100644
--- a/config/locales/es-AR.yml
+++ b/config/locales/es-AR.yml
@@ -642,7 +642,7 @@ es-AR:
       report: 'Denuncia #%{id}'
       reported_account: Cuenta denunciada
       reported_by: Denunciada por
-      reported_with_application: Informado a través de la aplicación
+      reported_with_application: Denunciado con aplicación
       resolved: Resueltas
       resolved_msg: "¡Denuncia exitosamente resuelta!"
       skip_to_actions: Ir directamente a las acciones
@@ -885,7 +885,23 @@ es-AR:
         action: Revisá acá para más información
         message_html: "<strong>El almacenamiento de tu objeto está mal configurado. La privacidad de tus usuarios está en riesgo.</strong>"
     tags:
+      moderation:
+        not_trendable: No disponible para tendencia
+        not_usable: No disponible para uso
+        pending_review: Revisión pendiente
+        review_requested: Revisión solicitada
+        reviewed: Revisada
+        title: Estado
+        trendable: Disponible para tendencia
+        unreviewed: No revisada
+        usable: Disponible para uso
+      name: Nombre
+      newest: Lo más reciente
+      oldest: Lo más antiguo
+      reset: Restablecer
       review: Estado de revisión
+      search: Buscar
+      title: Etiquetas
       updated_msg: La configuración de la etiqueta se actualizó exitosamente
     title: Administración
     trends:
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 8e05e4ae34d260..f3cb791e60d6a2 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -101,7 +101,7 @@ fi:
       most_recent_ip: Viimeisin IP
       no_account_selected: Tilejä ei muutettu, koska yhtään ei ollut valittuna
       no_limits_imposed: Rajoituksia ei ole asetettu
-      no_role_assigned: Roolia ei määritetty
+      no_role_assigned: Roolia ei asetettu
       not_subscribed: Ei tilaaja
       pending: Odottaa tarkastusta
       perform_full_suspension: Jäädytä
@@ -173,8 +173,8 @@ fi:
         approve_appeal: Hyväksy valitus
         approve_user: Hyväksy käyttäjä
         assigned_to_self_report: Ota raportti käsiteltäväksi
-        change_email_user: Vaihda sähköposti käyttäjälle
-        change_role_user: Muuta käyttäjän roolia
+        change_email_user: Vaihda käyttäjän sähköpostiosoite
+        change_role_user: Vaihda käyttäjän roolia
         confirm_user: Vahvista käyttäjä
         create_account_warning: Luo varoitus
         create_announcement: Luo tiedote
@@ -231,44 +231,44 @@ fi:
         update_user_role: Päivitä rooli
       actions:
         approve_appeal_html: "%{name} hyväksyi käyttäjän %{target} valituksen moderointipäätöksestä"
-        approve_user_html: "%{name} hyväksyi käyttäjän rekisteröitymisen kohteesta %{target}"
+        approve_user_html: "%{name} hyväksyi käyttäjän %{target} rekisteröitymisen"
         assigned_to_self_report_html: "%{name} otti raportin %{target} käsiteltäväkseen"
         change_email_user_html: "%{name} vaihtoi käyttäjän %{target} sähköpostiosoitteen"
         change_role_user_html: "%{name} muutti käyttäjän %{target} roolia"
         confirm_user_html: "%{name} vahvisti käyttäjän %{target} sähköpostiosoitteen"
         create_account_warning_html: "%{name} lähetti varoituksen käyttäjälle %{target}"
         create_announcement_html: "%{name} loi uuden tiedotteen %{target}"
-        create_canonical_email_block_html: "%{name} esti sähköpostin tiivisteellä %{target}"
+        create_canonical_email_block_html: "%{name} esti sähköpostiosoitteen tiivisteellä %{target}"
         create_custom_emoji_html: "%{name} lähetti uuden emojin %{target}"
         create_domain_allow_html: "%{name} salli federoinnin verkkotunnuksen %{target} kanssa"
         create_domain_block_html: "%{name} esti verkkotunnuksen %{target}"
         create_email_domain_block_html: "%{name} esti sähköpostiverkkotunnuksen %{target}"
-        create_ip_block_html: "%{name} loi IP-säännön %{target}"
+        create_ip_block_html: "%{name} loi säännön IP-osoitteelle %{target}"
         create_unavailable_domain_html: "%{name} pysäytti toimituksen verkkotunnukseen %{target}"
         create_user_role_html: "%{name} loi roolin %{target}"
         demote_user_html: "%{name} alensi käyttäjän %{target}"
         destroy_announcement_html: "%{name} poisti tiedotteen %{target}"
-        destroy_canonical_email_block_html: "%{name} kumosi sähköpostin eston tiivisteellä %{target}"
+        destroy_canonical_email_block_html: "%{name} kumosi sähköpostiosoitteen eston tiivisteellä %{target}"
         destroy_custom_emoji_html: "%{name} poisti emojin %{target}"
         destroy_domain_allow_html: "%{name} kielsi federoinnin verkkotunnuksen %{target} kanssa"
         destroy_domain_block_html: "%{name} kumosi verkkotunnuksen %{target} eston"
         destroy_email_domain_block_html: "%{name} kumosi sähköpostiverkkotunnuksen %{target} eston"
         destroy_instance_html: "%{name} tyhjensi verkkotunnuksen %{target}"
-        destroy_ip_block_html: "%{name} poisti IP-säännön %{target}"
+        destroy_ip_block_html: "%{name} poisti säännön IP-osoitteelta %{target}"
         destroy_status_html: "%{name} poisti käyttäjän %{target} julkaisun"
         destroy_unavailable_domain_html: "%{name} jatkoi toimitusta verkkotunnukseen %{target}"
         destroy_user_role_html: "%{name} poisti roolin %{target}"
-        disable_2fa_user_html: "%{name} poisti käyttäjältä %{target} vaatimuksen kaksivaiheisen todentamiseen"
-        disable_custom_emoji_html: "%{name} poisti käytöstä emojin %{target}"
-        disable_sign_in_token_auth_user_html: "%{name} poisti sähköpostitunnuksella todennuksen käytöstä tililtä %{target}"
-        disable_user_html: "%{name} poisti kirjautumisen käyttäjältä %{target}"
+        disable_2fa_user_html: "%{name} poisti käyttäjältä %{target} vaatimuksen kaksivaiheiseen todentamiseen"
+        disable_custom_emoji_html: "%{name} poisti emojin %{target} käytöstä"
+        disable_sign_in_token_auth_user_html: "%{name} poisti sähköpostitunnuksella todennuksen käytöstä käyttäjältä %{target}"
+        disable_user_html: "%{name} poisti kirjautumisen käytöstä käyttäjältä %{target}"
         enable_custom_emoji_html: "%{name} otti emojin %{target} käyttöön"
-        enable_sign_in_token_auth_user_html: "%{name} otti sähköpostitunnuksella todennuksen käyttöön tilille %{target}"
+        enable_sign_in_token_auth_user_html: "%{name} otti sähköpostitunnuksella todennuksen käyttöön käyttäjälle %{target}"
         enable_user_html: "%{name} otti kirjautumisen käyttöön käyttäjälle %{target}"
         memorialize_account_html: "%{name} muutti käyttäjän %{target} tilin muistosivuksi"
         promote_user_html: "%{name} ylensi käyttäjän %{target}"
         reject_appeal_html: "%{name} hylkäsi käyttäjän %{target} valituksen moderointipäätöksestä"
-        reject_user_html: "%{name} hylkäsi käyttäjän rekisteröitymisen kohteesta %{target}"
+        reject_user_html: "%{name} hylkäsi käyttäjän %{target} rekisteröitymisen"
         remove_avatar_user_html: "%{name} poisti käyttäjän %{target} profiilikuvan"
         reopen_report_html: "%{name} avasi uudelleen raportin %{target}"
         resend_user_html: "%{name} lähetti vahvistussähköpostiviestin uudelleen käyttäjälle %{target}"
@@ -277,7 +277,7 @@ fi:
         sensitive_account_html: "%{name} merkitsi käyttäjän %{target} median arkaluonteiseksi"
         silence_account_html: "%{name} rajoitti käyttäjän %{target} tiliä"
         suspend_account_html: "%{name} jäädytti käyttäjän %{target} tilin"
-        unassigned_report_html: "%{name} poisti raportin käsittelystä %{target}"
+        unassigned_report_html: "%{name} poisti raportin %{target} käsittelystä"
         unblock_email_account_html: "%{name} kumosi käyttäjän %{target} sähköpostiosoitteen eston"
         unsensitive_account_html: "%{name} kumosi käyttäjän %{target} median arkaluonteisuusmerkinnän"
         unsilence_account_html: "%{name} kumosi käyttäjän %{target} rajoituksen"
@@ -476,15 +476,15 @@ fi:
         view_all: Näytä kaikki tarkastuslokit
       availability:
         description_html:
-          one: Jos toimitus verkkotunnukseen epäonnistuu <strong>%{count} päivän</strong> ajan, sitä ei yritetä uudelleen ennen kuin verkkotunnuksesta <em>vastaanotetaan</em> toimitus.
-          other: Jos toimitus verkkotunnukseen epäonnistuu <strong>%{count} päivän</strong> ajan, sitä ei yritetä uudelleen ennen kuin verkkotunnuksesta <em>vastaanotetaan</em> toimitus.
-        failure_threshold_reached: Epäonnistumisen kynnys saavutettu %{date}.
+          one: Jos toimitus verkkotunnukseen epäonnistuu <strong>päivän ajan</strong>, sitä ei yritetä uudelleen ennen kuin verkkotunnuksesta <em>vastaanotetaan</em> toimitus.
+          other: Jos toimitus verkkotunnukseen epäonnistuu <strong>%{count} päivän ajan</strong>, sitä ei yritetä uudelleen ennen kuin verkkotunnuksesta <em>vastaanotetaan</em> toimitus.
+        failure_threshold_reached: Epäonnistumisten yläraja saavutettu %{date}.
         failures_recorded:
-          one: Epäonnistuneita yrityksiä %{count} päivässä.
-          other: Epäonnistuneita yrityksiä %{count} päivää.
-        no_failures_recorded: Ei epäonnistumisia kirjattu.
+          one: Epäonnistuneita yrityksiä %{count} päivänä.
+          other: Epäonnistuneita yrityksiä %{count} päivänä.
+        no_failures_recorded: Epäonnistumisia ei kirjattu.
         title: Saatavuus
-        warning: Viimeisin yritys yhdistää yhteys tähän palvelimeen on epäonnistunut
+        warning: Viimeisin yritys yhdistää tähän palvelimeen epäonnistui
       back_to_all: Kaikki
       back_to_limited: Rajoitettu
       back_to_warning: Varoitus
@@ -492,24 +492,24 @@ fi:
       confirm_purge: Haluatko varmasti poistaa pysyvästi tämän verkkotunnuksen tiedot?
       content_policies:
         comment: Sisäinen muistiinpano
-        description_html: Voit määrittää sisältökäytännöt, joita sovelletaan kaikkiin tämän verkkotunnuksen ja sen aliverkkotunnuksien tileihin.
+        description_html: Voit määrittää sisältökäytännöt, joita sovelletaan kaikkiin tämän verkkotunnuksen ja sen aliverkkotunnusten tileihin.
         limited_federation_mode_description_html: Voit valita sallitaanko federointi tällä verkkotunnuksella.
         policies:
           reject_media: Hylkää media
           reject_reports: Hylkää raportit
           silence: Rajoita
           suspend: Jäädytä
-        policy: Käytännöt
+        policy: Käytäntö
         reason: Julkinen syy
-        title: Sisällön toimintatavat
+        title: Sisältökäytännöt
       dashboard:
         instance_accounts_dimension: Seuratuimmat tilit
         instance_accounts_measure: tallennetut tilit
         instance_followers_measure: seuraajamme siellä
         instance_follows_measure: heidän seuraajansa täällä
         instance_languages_dimension: Suosituimmat kielet
-        instance_media_attachments_measure: tallennetut median liitteet
-        instance_reports_measure: niitä koskevat raportit
+        instance_media_attachments_measure: tallennetut medialiitteet
+        instance_reports_measure: heitä koskevat raportit
         instance_statuses_measure: tallennetut julkaisut
       delivery:
         all: Kaikki
@@ -520,7 +520,7 @@ fi:
         unavailable: Ei saatavilla
       delivery_available: Toimitus on saatavilla
       delivery_error_days: Toimitusvirheen päivät
-      delivery_error_hint: Jos toimitus ei ole mahdollista %{count} päivän aikana, se merkitään automaattisesti toimittamattomaksi.
+      delivery_error_hint: Jos toimitus ei ole mahdollista %{count} päivään, se merkitään automaattisesti toimituskelvottomaksi.
       destroyed_msg: Palvelimelta %{domain} peräisin olevat tiedot ovat nyt jonossa poistattaviksi.
       empty: Verkkotunnuksia ei löytynyt.
       known_accounts:
@@ -533,14 +533,14 @@ fi:
       private_comment: Yksityinen kommentti
       public_comment: Julkinen kommentti
       purge: Tyhjennä
-      purge_description_html: Jos uskot, että tämä verkkotunnus on offline-tilassa tarkoituksella, voit poistaa kaikki verkkotunnuksen tilitietueet ja niihin liittyvät tiedot tallennustilastasi. Tämä voi kestää jonkin aikaa.
+      purge_description_html: Jos uskot, että tämä verkkotunnus on yhteydettömässä tilassa tarkoituksella, voit poistaa kaikki verkkotunnuksen tilitietueet ja niihin liittyvät tiedot tallennustilastasi. Tämä voi kestää jonkin aikaa.
       title: Federointi
       total_blocked_by_us: Estämämme
       total_followed_by_them: Heidän seuraama
       total_followed_by_us: Meidän seuraama
-      total_reported: Niitä koskevat raportit
+      total_reported: Heitä koskevat raportit
       total_storage: Medialiitteet
-      totals_time_period_hint_html: Alla näkyvät yhteenlasketut tiedot sisältävät koko ajan.
+      totals_time_period_hint_html: Seuraavassa näkyvät määrät sisältävät tiedot koko ajalta.
       unknown_instance: Tällä palvelimella ei tällä hetkellä ole tähän verkkotunnukseen liittyviä tietueita.
     invites:
       deactivate_all: Poista kaikki käytöstä
@@ -689,7 +689,7 @@ fi:
       description_html: "<strong>Käyttäjärooleilla</strong> voit mukauttaa, mihin Mastodonin toimintoihin ja alueisiin käyttäjäsi pääsevät käsiksi."
       edit: Muokkaa roolia ”%{name}”
       everyone: Oletuskäyttöoikeudet
-      everyone_full_description_html: Tämä on <strong>perusrooli</strong>, joka vaikuttaa <strong>kaikkiin käyttäjiin</strong>, jopa ilman määrättyä roolia. Kaikki muut roolit perivät sen käyttöoikeudet.
+      everyone_full_description_html: Tämä on <strong>perusrooli</strong>, joka vaikuttaa <strong>kaikkiin käyttäjiin</strong>, jopa ilman asetettua roolia. Kaikki muut roolit perivät sen käyttöoikeudet.
       permissions_count:
         one: "%{count} käyttöoikeus"
         other: "%{count} käyttöoikeutta"
@@ -794,7 +794,7 @@ fi:
         federation_authentication: Federoinnin todennuksen valvonta
       title: Palvelimen asetukset
     site_uploads:
-      delete: Poista ladattu tiedosto
+      delete: Poista lähetetty tiedosto
       destroyed_msg: Sivustolatauksen poisto onnistui!
     software_updates:
       critical_update: Kriittinen – päivitä viivyttelemättä
@@ -851,7 +851,7 @@ fi:
       elasticsearch_health_red:
         message_html: Elasticsearch-klusteri on vikatilassa (punainen tila), joten hakuominaisuudet eivät ole käytettävissä
       elasticsearch_health_yellow:
-        message_html: Elasticsearch-klusteri on häiriötilassa (keltainen tila), joten suosittelemme tutkimaan syyn
+        message_html: Elasticsearch-klusteri on vikatilassa (keltainen tila), joten suosittelemme tutkimaan syyn
       elasticsearch_index_mismatch:
         message_html: Elasticsearch-indeksin sidokset ovat vanhentuneet. Suorita <code>tootctl search deploy --only=%{value}</code>
       elasticsearch_preset:
@@ -863,10 +863,10 @@ fi:
       elasticsearch_reset_chewy:
         message_html: Elasticsearch-järjestelmäindeksi on vanhentunut asetusmuutoksen vuoksi. Suorita <code>tootctl search deploy --reset-chewy</code> päivittääksesi sen.
       elasticsearch_running_check:
-        message_html: Ei saatu yhteyttä Elasticsearchiin. Tarkista, että se on käynnissä tai poista kokotekstihaku käytöstä
+        message_html: Elasticsearchiin ei saatu yhteyttä. Tarkista, että se on käynnissä, tai poista kokotekstihaku käytöstä
       elasticsearch_version_check:
         message_html: 'Yhteensopimaton Elasticsearch-versio: %{value}'
-        version_comparison: Elasticsearch %{running_version} on käynnissä, kun %{required_version} vaaditaan
+        version_comparison: Käynnissä on Elasticsearch %{running_version}, kun vaaditaan %{required_version}
       rules_check:
         action: Hallitse palvelimen sääntöjä
         message_html: Et ole määrittänyt lainkaan palvelimen sääntöjä.
@@ -879,11 +879,11 @@ fi:
         action: Näytä saatavilla olevat päivitykset
         message_html: Mastodonin virhekorjauspäivitys on saatavilla.
       upload_check_privacy_error:
-        action: Katso täältä lisätietoja
-        message_html: "<strong>Verkkopalvelimesi on määritetty väärin. Käyttäjiesi yksityisyys on vaarassa.</strong>"
+        action: Katso lisätietoja täältä
+        message_html: "<strong>Verkkopalvelimesi on määritetty väärin. Käyttäjiesi tietosuoja on vaarassa.</strong>"
       upload_check_privacy_error_object_storage:
-        action: Katso täältä lisätietoja
-        message_html: "<strong>Objektivarastosi on määritetty virheellisesti, ja käyttäjiesi yksityisyys on vaarassa.</strong>"
+        action: Katso lisätietoja täältä
+        message_html: "<strong>Oliovarastosi on määritetty virheellisesti. Käyttäjiesi tietosuoja on vaarassa.</strong>"
     tags:
       moderation:
         not_trendable: Ei trendattava
@@ -1070,7 +1070,7 @@ fi:
     apply_for_account: Pyydä tiliä
     captcha_confirmation:
       help_html: Jos kohtaat ongelmia CAPTCHAn ratkaisemisessa, voit pyytää meiltä apua osoitteella %{email}.
-      hint_html: Vielä yksi juttu! Meidän on vahvistettava, että olet ihminen (tämän avulla pidämme roskapostin poissa!). Ratkaise alla oleva CAPTCHA-vahvistus ja paina "Jatka".
+      hint_html: Vielä yksi asia! Meidän on vahvistettava, että olet ihminen (tämän avulla pidämme roskapostin poissa!). Ratkaise alla oleva CAPTCHA-vahvistus ja paina ”Jatka”.
       title: Turvatarkastus
     confirmations:
       awaiting_review: Sähköpostiosoitteesi on vahvistettu! Seuraavaksi palvelimen %{domain} ylläpito tarkastaa rekisteröitymisesi, ja saat lopuksi ilmoituksen sähköpostitse, jos tilisi hyväksytään!
@@ -1100,7 +1100,7 @@ fi:
     migrate_account: Muuta toiseen tiliin
     migrate_account_html: Jos haluat ohjata tämän tilin toiseen, voit <a href="%{path}">asettaa toisen tilin tästä</a>.
     or_log_in_with: Tai käytä kirjautumiseen
-    privacy_policy_agreement_html: Olen lukenut ja hyväksynyt <a href="%{privacy_policy_path}" target="_blank">tietosuojakäytännön</a>
+    privacy_policy_agreement_html: Olen lukenut ja hyväksyn <a href="%{privacy_policy_path}" target="_blank">tietosuojakäytännön</a>
     progress:
       confirm: Vahvista sähköpostiosoite
       details: Omat tietosi
@@ -1187,7 +1187,7 @@ fi:
       email_contact_html: Jos ei saavu perille, voit pyytää apua sähköpostilla <a href="mailto:%{email}">%{email}</a>
       email_reconfirmation_html: Jos et saa vahvistuksen sähköpostia, niin voit <a href="%{path}">pyytää sitä uudelleen</a>
       irreversible: Et voi palauttaa tiliäsi tai aktivoida sitä uudelleen
-      more_details_html: Lisätietoja saat <a href="%{terms_path}">tietosuojakäytännöstämme</a>.
+      more_details_html: Tarkempia tietoja saat <a href="%{terms_path}">tietosuojakäytännöstämme</a>.
       username_available: Käyttäjänimesi tulee saataville uudelleen
       username_unavailable: Käyttäjänimesi ei tule saataville enää uudelleen
   disputes:
@@ -1312,8 +1312,8 @@ fi:
       one: "<strong>%{count}</strong> kohde tällä sivulla on valittu."
       other: Kaikki <strong>%{count}</strong> kohdetta tällä sivulla on valittu.
     all_matching_items_selected_html:
-      one: "<strong>%{count}</strong> kohde, joka vastaa hakuasi."
-      other: Kaikki <strong>%{count}</strong> hakuasi vastaavaa kohdetta.
+      one: "<strong>%{count}</strong> hakuasi vastaava kohde on valittuna."
+      other: Kaikki <strong>%{count}</strong> hakuasi vastaavat kohteet ovat valittuina.
     cancel: Peruuta
     changes_saved_msg: Muutosten tallennus onnistui!
     confirm: Vahvista
@@ -1324,7 +1324,7 @@ fi:
     order_by: Järjestys
     save_changes: Tallenna muutokset
     select_all_matching_items:
-      one: Valitse %{count} kohde, joka vastaa hakuasi.
+      one: Valitse %{count} hakuasi vastaava kohde.
       other: Valitse kaikki %{count} hakuasi vastaavaa kohdetta.
     today: tänään
     validation_errors:
@@ -1475,7 +1475,7 @@ fi:
       followers: Tämä toiminto siirtää kaikki seuraajat nykyisestä tilistä uudelle tilille
       only_redirect_html: Vaihtoehtoisesti voit <a href="%{path}">asettaa vain ohjauksen profiiliisi</a>.
       other_data: Muita tietoja ei siirretä automaattisesti
-      redirect: Nykyisen tilisi profiili päivitetään ohjaushuomautuksella ja suljetaan pois hauista
+      redirect: Nykyisen tilisi profiili päivitetään uudelleenohjaushuomautuksella ja suljetaan pois hauista
   moderation:
     title: Moderointi
   move_handler:
@@ -1858,7 +1858,7 @@ fi:
         delete_statuses: Joidenkin julkaisuistasi on havaittu rikkovan ainakin yhtä yhteisön sääntöä, joten palvelimen %{instance} moderaattorit ovat poistaneet ne.
         disable: Et voi enää käyttää tiliäsi, mutta profiilisi ja muut tiedot pysyvät muuttumattomina. Voit pyytää varmuuskopiota tiedoistasi, vaihtaa tilin asetuksia tai poistaa tilisi.
         mark_statuses_as_sensitive: Palvelimen %{instance} moderaattorit ovat merkinneet osan julkaisuistasi arkaluonteisiksi. Tämä tarkoittaa sitä, että ihmisten täytyy napauttaa mediaa ennen kuin sen esikatselu näytetään. Voit merkitä median itse arkaluonteiseksi, kun julkaiset tulevaisuudessa.
-        sensitive: Tästä lähtien kaikki ladatut mediatiedostot merkitään arkaluonteisiksi ja piilotetaan napsautusvaroituksen taakse.
+        sensitive: Tästä lähtien kaikki lähetetyt mediatiedostot merkitään arkaluonteisiksi ja piilotetaan napsautusvaroituksen taakse.
         silence: Voit edelleen käyttää tiliäsi, mutta vain sinua jo seuraavat käyttäjät näkevät julkaisusi tällä palvelimella ja sinut voidaan sulkea pois eri löytämisominaisuuksista. Toiset voivat kuitenkin edelleen seurata sinua manuaalisesti.
         suspend: Et voi enää käyttää tiliäsi, eivätkä profiilisi ja muut tiedot ole enää käytettävissä. Voit silti kirjautua sisään pyytääksesi tietojesi varmuuskopiota, kunnes tiedot on poistettu kokonaan noin 30 päivän kuluttua. Säilytämme kuitenkin joitain perustietoja, jotka estävät sinua kiertämästä jäädytystä.
       reason: 'Syy:'
diff --git a/config/locales/hi.yml b/config/locales/hi.yml
index 0bfc30027abef7..d6a8e3cc355bcb 100644
--- a/config/locales/hi.yml
+++ b/config/locales/hi.yml
@@ -40,6 +40,23 @@ hi:
       upload_check_privacy_error_object_storage:
         action: अधिक जानकारी हेतु यहां क्लिक करें।
         message_html: "<strong> आपके वेब सर्वर का कन्फिगरेशन सही नहीं है। उपयोगकर्ताओं की निजता खतरे में है। </strong>"
+    tags:
+      moderation:
+        not_trendable: ट्रेंड नहीं किया जाएगा
+        not_usable: उपयोगी नहीं
+        pending_review: लंबित समीक्षा
+        review_requested: समीक्षा की मांग की गई
+        reviewed: समीक्षित
+        title: स्टेटस
+        trendable: चर्चा में
+        unreviewed: गैर समीक्षित
+        usable: उपयुक्त
+      name: नाम
+      newest: नवीनतम
+      oldest: सबसे पुराने
+      reset: पुनः नियत करें
+      search: खोजें
+      title: हैशटैग
   redirects:
     prompt: अगर आपको इस लिंक पर भरोसा है तो आगे बढ़ने के लिए इसे क्लिक करें
     title: आप इस %{instance} को छोड़ने वाले हैं
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 02c21ac312c978..d552d08a45cab4 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -885,7 +885,23 @@ it:
         action: Controlla qui per maggiori informazioni
         message_html: "<strong>La tua archiviazione oggetti è mal configurata. La privacy dei tuoi utenti è a rischio.</strong>"
     tags:
+      moderation:
+        not_trendable: Non di tendenza
+        not_usable: Non utilizzabile
+        pending_review: In attesa di revisione
+        review_requested: Revisione richiesta
+        reviewed: Controllato
+        title: Stato
+        trendable: Di tendenza
+        unreviewed: Non revisionato
+        usable: Utilizzabile
+      name: Nome
+      newest: Più recenti
+      oldest: Più vecchio
+      reset: Ripristina
       review: Esamina status
+      search: Cerca
+      title: Hashtag
       updated_msg: Impostazioni hashtag aggiornate con successo
     title: Amministrazione
     trends:
diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index b0db0709c16e1d..ed6a8a4028caf9 100644
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -885,7 +885,23 @@ pt-PT:
         action: Verifique aqui para mais informações
         message_html: "<strong>O seu armazenamento de objetos está mal configurado. A privacidade dos seus utilizadores está em risco.</strong>"
     tags:
+      moderation:
+        not_trendable: Não pode ser tendência
+        not_usable: Não utilizável
+        pending_review: Pendente de revisão
+        review_requested: Revisão solicitada
+        reviewed: Revista
+        title: Estado
+        trendable: Pode ser tendência
+        unreviewed: Não revista
+        usable: Utilizável
+      name: Nome
+      newest: Mais recente
+      oldest: Mais antiga
+      reset: Repor
       review: Estado da revisão
+      search: Pesquisar
+      title: Hashtags
       updated_msg: 'Definições de #etiquetas correctamente actualizadas'
     title: Administração
     trends:
diff --git a/config/locales/simple_form.ca.yml b/config/locales/simple_form.ca.yml
index 7b1c67d39279a5..4daf657234bb73 100644
--- a/config/locales/simple_form.ca.yml
+++ b/config/locales/simple_form.ca.yml
@@ -314,6 +314,7 @@ ca:
         listable: Permet que aquesta etiqueta aparegui en les cerques i en el directori de perfils
         name: Etiqueta
         trendable: Permet que aquesta etiqueta aparegui en les tendències
+        usable: Permet a les publicacions emprar aquesta etiqueta localment
       user:
         role: Rol
         time_zone: Zona horària
diff --git a/config/locales/simple_form.es-AR.yml b/config/locales/simple_form.es-AR.yml
index a1dbeea91610a1..e26af5b0c60ea4 100644
--- a/config/locales/simple_form.es-AR.yml
+++ b/config/locales/simple_form.es-AR.yml
@@ -314,6 +314,7 @@ es-AR:
         listable: Permitir que esta etiqueta aparezca en las búsquedas y en las sugerencias
         name: Etiqueta
         trendable: Permitir que esta etiqueta aparezca bajo tendencias
+        usable: Permitir que los mensajes usen esta etiqueta localmente
       user:
         role: Rol
         time_zone: Zona horaria
diff --git a/config/locales/simple_form.fi.yml b/config/locales/simple_form.fi.yml
index a6004cee35440d..ddbd1dd2890569 100644
--- a/config/locales/simple_form.fi.yml
+++ b/config/locales/simple_form.fi.yml
@@ -77,13 +77,13 @@ fi:
           warn: Piilota suodatettu sisältö varoituksen taakse, jossa mainitaan suodattimen nimi
       form_admin_settings:
         activity_api_enabled: Paikallisesti julkaistujen julkaisujen, aktiivisten käyttäjien ja rekisteröitymisten viikoittainen määrä
-        app_icon: WEBP, PNG, GIF tai JPG. Korvaa oletusarvoisen mobiililaitteiden sovelluskuvakkeen omalla kuvakkeella.
+        app_icon: WEBP, PNG, GIF tai JPG. Korvaa oletusarvoisen mobiililaitteiden sovelluskuvakkeen haluamallasi kuvakkeella.
         backups_retention_period: Käyttäjillä on mahdollisuus arkistoida julkaisujaan myöhemmin ladattaviksi. Kun kentän arvo on positiivinen, nämä arkistot poistuvat automaattisesti, kun määritetty määrä päiviä on kulunut.
         bootstrap_timeline_accounts: Nämä tilit kiinnitetään uusien käyttäjien seurantasuositusten alkuun.
         closed_registrations_message: Näkyy, kun rekisteröityminen on suljettu
         content_cache_retention_period: Kaikki muiden palvelinten julkaisut (mukaan lukien tehostukset ja vastaukset) poistuvat, kun määritetty määrä päiviä on kulunut, lukuun ottamatta paikallisen käyttäjän vuorovaikutusta näiden julkaisujen kanssa. Tämä sisältää julkaisut, jotka paikallinen käyttäjä on merkinnyt kirjanmerkiksi tai suosikiksi. Myös yksityismaininnat eri palvelinten käyttäjien välillä menetetään, eikä niitä voi palauttaa. Tämä asetus on tarkoitettu käytettäväksi erityistapauksissa ja rikkoo monia käyttäjien odotuksia, kun sitä sovelletaan yleiskäyttöön.
         custom_css: Voit käyttää mukautettuja tyylejä Mastodonin selainversiossa.
-        favicon: WEBP, PNG, GIF tai JPG. Korvaa oletusarvoisen Mastodonin sivustokuvakkeen (favicon) haluamallasi kuvakkeella.
+        favicon: WEBP, PNG, GIF tai JPG. Korvaa oletusarvoisen Mastodonin sivustokuvakkeen haluamallasi kuvakkeella.
         mascot: Ohittaa kuvituksen edistyneessä selainkäyttöliittymässä.
         media_cache_retention_period: Etäkäyttäjien tekemien julkaisujen mediatiedostot ovat välimuistissa palvelimellasi. Kun kentän arvo on positiivinen, media poistuu, kun määritetty määrä päiviä on kulunut. Jos mediaa pyydetään sen poistamisen jälkeen, se ladataan uudelleen, jos lähdesisältö on vielä saatavilla. Koska linkkien esikatselun kyselyitä kolmansien osapuolien sivustoille on rajoitettu, on suositeltavaa asettaa tämä arvo vähintään 14 päivään, tai linkkien kortteja ei päivitetä pyynnöstä ennen tätä ajankohtaa.
         peers_api_enabled: Luettelo verkkotunnuksista, jotka tämä palvelin on kohdannut fediversumissa. Se ei kerro, federoitko tietyn palvelimen kanssa, vaan että palvelimesi on ylipäätään tietoinen siitä. Tätä tietoa käytetään palveluissa, jotka keräävät tilastoja federoinnista yleisellä tasolla.
@@ -109,14 +109,14 @@ fi:
       invite_request:
         text: Tämä auttaa meitä arvioimaan hakemustasi
       ip_block:
-        comment: Valinnainen. Muista miksi lisäsit tämän säännön.
+        comment: Valinnainen. Muista, miksi lisäsit tämän säännön.
         expires_in: IP-osoitteet ovat rajallinen resurssi – joskus niitä jaetaan eteenpäin, ja ne vaihtavat usein omistajaa. Niinpä epämääräisiä IP-lohkoja ei suositella.
         ip: Kirjoita IPv4- tai IPv6-osoite. Voit estää kokonaisia IP-osoitealueita CIDR-syntaksin avulla. Varo lukitsemasta itseäsi ulos!
         severities:
           no_access: Estä pääsy kaikkiin resursseihin
           sign_up_block: Uudet rekisteröitymiset eivät ole mahdollisia
           sign_up_requires_approval: Uudet rekisteröitymiset edellyttävät hyväksyntääsi
-        severity: Valitse, mitä tapahtuu tämän IP-osoitteen pyynnöille
+        severity: Valitse, mitä tapahtuu tästä IP-osoitteesta tuleville pyynnöille
       rule:
         hint: Vapaaehtoinen. Anna yksityiskohtaisempia tietoja säännöstä
         text: Kuvaile sääntöä tai edellytystä palvelimesi käyttäjille. Suosi tiivistä, yksinkertaista ilmaisua
@@ -249,7 +249,7 @@ fi:
         closed_registrations_message: Mukautettu viesti, kun rekisteröityminen ei ole saatavilla
         content_cache_retention_period: Etäsisällön säilytysaika
         custom_css: Mukautettu CSS
-        favicon: Suosikkikuvake
+        favicon: Sivustokuvake
         mascot: Mukautettu maskotti (vanhentunut)
         media_cache_retention_period: Mediasisällön välimuistin säilytysaika
         peers_api_enabled: Julkaise löydettyjen palvelinten luettelo ohjelmointirajapinnassa
diff --git a/config/locales/simple_form.hi.yml b/config/locales/simple_form.hi.yml
index d758a5b5357d76..51c0868cdbb616 100644
--- a/config/locales/simple_form.hi.yml
+++ b/config/locales/simple_form.hi.yml
@@ -1 +1,6 @@
+---
 hi:
+  simple_form:
+    labels:
+      tag:
+        usable: पोस्ट को ये हैशटैग स्थानीय उपयोग करने दें
diff --git a/config/locales/simple_form.it.yml b/config/locales/simple_form.it.yml
index b0f7ef7a6b23c3..ea175e2bf567b7 100644
--- a/config/locales/simple_form.it.yml
+++ b/config/locales/simple_form.it.yml
@@ -314,6 +314,7 @@ it:
         listable: Permetti a questo hashtag di apparire nella directory dei profili
         name: Hashtag
         trendable: Permetti a questo hashtag di apparire nelle tendenze
+        usable: Permetti ai post di utilizzare questo hashtag localmente
       user:
         role: Ruolo
         time_zone: Fuso orario
diff --git a/config/locales/simple_form.pt-PT.yml b/config/locales/simple_form.pt-PT.yml
index a1a2bc657c3085..a76076a5cbc6ee 100644
--- a/config/locales/simple_form.pt-PT.yml
+++ b/config/locales/simple_form.pt-PT.yml
@@ -314,6 +314,7 @@ pt-PT:
         listable: Permitir que esta etiqueta apareça em pesquisas e no diretório de perfis
         name: Etiqueta
         trendable: Permitir que esta etiqueta apareça em alta
+        usable: Permitir que as publicações usem esta hashtag localmente
       user:
         role: Cargo
         time_zone: Fuso horário
diff --git a/config/locales/simple_form.ru.yml b/config/locales/simple_form.ru.yml
index de0d631ae65abd..c2effdcb883fd6 100644
--- a/config/locales/simple_form.ru.yml
+++ b/config/locales/simple_form.ru.yml
@@ -203,6 +203,7 @@ ru:
         setting_default_privacy: Видимость постов
         setting_default_sensitive: Всегда отмечать медиафайлы как «деликатного характера»
         setting_delete_modal: Всегда спрашивать перед удалении поста
+        setting_disable_hover_cards: Отключить предпросмотр профиля при наведении
         setting_disable_swiping: Отключить анимацию смахивания
         setting_display_media: Отображение медиафайлов
         setting_display_media_default: По умолчанию
diff --git a/config/locales/simple_form.sq.yml b/config/locales/simple_form.sq.yml
index 912e0bda82cdc8..8b00751d98251a 100644
--- a/config/locales/simple_form.sq.yml
+++ b/config/locales/simple_form.sq.yml
@@ -314,6 +314,7 @@ sq:
         listable: Lejoje këtë hashtag të shfaqet në kërkime dhe në drejtori profilesh
         name: Hashtag
         trendable: Lejoje këtë hashtag të shfaqet në prirje
+        usable: Lejoji postimet të përdorin lokalisht këtë hashtag
       user:
         role: Rol
         time_zone: Zonë kohore
diff --git a/config/locales/simple_form.vi.yml b/config/locales/simple_form.vi.yml
index 2310d1e3299379..7954bb1e6ff54f 100644
--- a/config/locales/simple_form.vi.yml
+++ b/config/locales/simple_form.vi.yml
@@ -314,6 +314,7 @@ vi:
         listable: Cho phép xuất hiện trong tìm kiếm và đề xuất
         name: Hashtag
         trendable: Cho phép hashtag này lên xu hướng
+        usable: Cho phép dùng hashtag này khi soạn tút
       user:
         role: Vai trò
         time_zone: Múi giờ
diff --git a/config/locales/simple_form.zh-CN.yml b/config/locales/simple_form.zh-CN.yml
index 58334471a37c43..d059adf0e6bcf1 100644
--- a/config/locales/simple_form.zh-CN.yml
+++ b/config/locales/simple_form.zh-CN.yml
@@ -314,6 +314,7 @@ zh-CN:
         listable: 允许这个话题标签在用户目录中显示
         name: 话题标签
         trendable: 允许在热门下显示此话题
+        usable: 允许本站嘟文使用此话题标签
       user:
         role: 角色
         time_zone: 时区
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index 7ba5bf6570bad0..92e182cfda31af 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -880,7 +880,21 @@ sq:
         action: Për më tepër hollësi, shihni këtu
         message_html: "<strong>Depozita juaj e objekteve është e formësuar keq. Privatësia e përdoruesve tuaj është në rrezik.</strong>"
     tags:
+      moderation:
+        not_usable: Të papërdorshme
+        pending_review: Në pritje të shqyrtimit
+        review_requested: U kërkua shqyrtim
+        reviewed: Shqyrtuar
+        title: Gjendje
+        unreviewed: Të pashqyrtuar
+        usable: Të përdorshëm
+      name: Emër
+      newest: Më të rejat
+      oldest: Më të vjetrat
+      reset: Riktheje te parazgjedhjet
       review: Gjendje rishikimi
+      search: Kërkim
+      title: Hashtag-ë
       updated_msg: Rregullimet për hashtag-ët u përditësuan me sukses
     title: Administrim
     trends:
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 72eefe5632b340..8054c113558a05 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -885,7 +885,12 @@ sv:
         action: Kolla här för mer information
         message_html: "<strong>Din objektlagring är felkonfigurerad. Sekretessen för dina användare är i riskzonen.</strong>"
     tags:
+      moderation:
+        title: Status
+      name: Namn
+      reset: Återställ
       review: Granskningsstatus
+      search: Sök
       updated_msg: Hashtagg-inställningarna har uppdaterats
     title: Administration
     trends:
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index b44ba15a77f3ca..dacaafd7681c18 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -871,7 +871,23 @@ vi:
         action: Nhấn vào đây để biết thêm thông tin
         message_html: "<strong>Lưu trữ đối tượng của bạn bị cấu hình sai. Có nguy cơ ảnh hưởng bảo mật của người dùng.</strong>"
     tags:
+      moderation:
+        not_trendable: Không xu hướng
+        not_usable: Không được dùng
+        pending_review: Chờ duyệt
+        review_requested: Yêu cầu duyệt
+        reviewed: Đã duyệt
+        title: Trạng thái
+        trendable: Có thể xu hướng
+        unreviewed: Chưa duyệt
+        usable: Có thể dùng
+      name: Tên
+      newest: Mới nhất
+      oldest: Cũ nhất
+      reset: Đặt lại
       review: Phê duyệt
+      search: Tìm kiếm
+      title: Hashtag
       updated_msg: Hashtag đã được cập nhật thành công
     title: Quản trị
     trends:
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 50921b07d8cc8e..f08142719aac46 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -871,7 +871,23 @@ zh-CN:
         action: 点击这里查看更多信息
         message_html: "<strong>您的对象存储空间配置错误，您用户的隐私处于危险中。</strong>"
     tags:
+      moderation:
+        not_trendable: 不在趋势中显示
+        not_usable: 不可用
+        pending_review: 待审核
+        review_requested: 已请求审核
+        reviewed: 已审核
+        title: 状态
+        trendable: 可在趋势中显示
+        unreviewed: 未审核
+        usable: 可用
+      name: 名称
+      newest: 最新
+      oldest: 最早
+      reset: 重置
       review: 审核状态
+      search: 搜索
+      title: 话题标签
       updated_msg: 话题标签设置更新成功
     title: 管理
     trends:

From 288961bbb99b626128e4bc222deb4f749922edb8 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 31 Jul 2024 12:26:43 +0200
Subject: [PATCH 1667/2191] Change private mention icon for consistency in
 grouped notifications (#31223)

---
 .../notifications_v2/components/notification_mention.tsx       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/features/notifications_v2/components/notification_mention.tsx b/app/javascript/mastodon/features/notifications_v2/components/notification_mention.tsx
index 8c584f0ce1dde2..f8d646b07e163e 100644
--- a/app/javascript/mastodon/features/notifications_v2/components/notification_mention.tsx
+++ b/app/javascript/mastodon/features/notifications_v2/components/notification_mention.tsx
@@ -1,5 +1,6 @@
 import { FormattedMessage } from 'react-intl';
 
+import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
 import ReplyIcon from '@/material-icons/400-24px/reply-fill.svg?react';
 import type { StatusVisibility } from 'mastodon/api_types/statuses';
 import type { NotificationGroupMention } from 'mastodon/models/notification_group';
@@ -39,7 +40,7 @@ export const NotificationMention: React.FC<{
   return (
     <NotificationWithStatus
       type='mention'
-      icon={ReplyIcon}
+      icon={statusVisibility === 'direct' ? AlternateEmailIcon : ReplyIcon}
       iconId='reply'
       accountIds={notification.sampleAccountIds}
       count={notification.notifications_count}

From 549ab089eed07ee3ad90288ee5e134b4cfdc1e76 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 31 Jul 2024 12:50:13 +0200
Subject: [PATCH 1668/2191] Change grouped notifications API shape (take 2)
 (#31214)

---
 .../api/v2_alpha/notifications_controller.rb  |  6 ++++--
 .../mastodon/actions/notification_groups.ts   | 12 +++++------
 app/javascript/mastodon/api/notifications.ts  | 13 +++++++++---
 .../mastodon/api_types/notifications.ts       |  8 ++++++-
 .../mastodon/models/notification_group.ts     |  5 ++---
 .../grouped_notifications_presenter.rb        | 21 +++++++++++++++++++
 .../dedup_notification_group_serializer.rb    |  7 +++++++
 .../rest/notification_group_serializer.rb     | 12 +++++++++--
 .../api/v2_alpha/notifications_spec.rb        |  6 +++---
 9 files changed, 70 insertions(+), 20 deletions(-)
 create mode 100644 app/presenters/grouped_notifications_presenter.rb
 create mode 100644 app/serializers/rest/dedup_notification_group_serializer.rb

diff --git a/app/controllers/api/v2_alpha/notifications_controller.rb b/app/controllers/api/v2_alpha/notifications_controller.rb
index d1126baaf46e64..837499e8984a34 100644
--- a/app/controllers/api/v2_alpha/notifications_controller.rb
+++ b/app/controllers/api/v2_alpha/notifications_controller.rb
@@ -33,7 +33,8 @@ def index
         'app.notification_grouping.status.unique_count' => statuses.uniq.size
       )
 
-      render json: @grouped_notifications, each_serializer: REST::NotificationGroupSerializer, relationships: @relationships, group_metadata: @group_metadata
+      presenter = GroupedNotificationsPresenter.new(@grouped_notifications)
+      render json: presenter, serializer: REST::DedupNotificationGroupSerializer, relationships: @relationships, group_metadata: @group_metadata
     end
   end
 
@@ -47,7 +48,8 @@ def unread_count
 
   def show
     @notification = current_account.notifications.without_suspended.find_by!(group_key: params[:id])
-    render json: NotificationGroup.from_notification(@notification), serializer: REST::NotificationGroupSerializer
+    presenter = GroupedNotificationsPresenter.new([NotificationGroup.from_notification(@notification)])
+    render json: presenter, serializer: REST::DedupNotificationGroupSerializer
   end
 
   def clear
diff --git a/app/javascript/mastodon/actions/notification_groups.ts b/app/javascript/mastodon/actions/notification_groups.ts
index 8fdec6e48bb4df..fc5807c8c081df 100644
--- a/app/javascript/mastodon/actions/notification_groups.ts
+++ b/app/javascript/mastodon/actions/notification_groups.ts
@@ -38,10 +38,6 @@ function dispatchAssociatedRecords(
   const fetchedStatuses: ApiStatusJSON[] = [];
 
   notifications.forEach((notification) => {
-    if ('sample_accounts' in notification) {
-      fetchedAccounts.push(...notification.sample_accounts);
-    }
-
     if (notification.type === 'admin.report') {
       fetchedAccounts.push(notification.report.target_account);
     }
@@ -75,7 +71,9 @@ export const fetchNotifications = createDataLoadingThunk(
           : excludeAllTypesExcept(activeFilter),
     });
   },
-  ({ notifications }, { dispatch }) => {
+  ({ notifications, accounts, statuses }, { dispatch }) => {
+    dispatch(importFetchedAccounts(accounts));
+    dispatch(importFetchedStatuses(statuses));
     dispatchAssociatedRecords(dispatch, notifications);
     const payload: (ApiNotificationGroupJSON | NotificationGap)[] =
       notifications;
@@ -95,7 +93,9 @@ export const fetchNotificationsGap = createDataLoadingThunk(
   async (params: { gap: NotificationGap }) =>
     apiFetchNotifications({ max_id: params.gap.maxId }),
 
-  ({ notifications }, { dispatch }) => {
+  ({ notifications, accounts, statuses }, { dispatch }) => {
+    dispatch(importFetchedAccounts(accounts));
+    dispatch(importFetchedStatuses(statuses));
     dispatchAssociatedRecords(dispatch, notifications);
 
     return { notifications };
diff --git a/app/javascript/mastodon/api/notifications.ts b/app/javascript/mastodon/api/notifications.ts
index c1ab6f70cafbde..ed187da5eccae0 100644
--- a/app/javascript/mastodon/api/notifications.ts
+++ b/app/javascript/mastodon/api/notifications.ts
@@ -1,17 +1,24 @@
 import api, { apiRequest, getLinks } from 'mastodon/api';
-import type { ApiNotificationGroupJSON } from 'mastodon/api_types/notifications';
+import type { ApiNotificationGroupsResultJSON } from 'mastodon/api_types/notifications';
 
 export const apiFetchNotifications = async (params?: {
   exclude_types?: string[];
   max_id?: string;
 }) => {
-  const response = await api().request<ApiNotificationGroupJSON[]>({
+  const response = await api().request<ApiNotificationGroupsResultJSON>({
     method: 'GET',
     url: '/api/v2_alpha/notifications',
     params,
   });
 
-  return { notifications: response.data, links: getLinks(response) };
+  const { statuses, accounts, notification_groups } = response.data;
+
+  return {
+    statuses,
+    accounts,
+    notifications: notification_groups,
+    links: getLinks(response),
+  };
 };
 
 export const apiClearNotifications = () =>
diff --git a/app/javascript/mastodon/api_types/notifications.ts b/app/javascript/mastodon/api_types/notifications.ts
index d7cbbca73b9ec3..fba0b7941b6faa 100644
--- a/app/javascript/mastodon/api_types/notifications.ts
+++ b/app/javascript/mastodon/api_types/notifications.ts
@@ -51,7 +51,7 @@ export interface BaseNotificationGroupJSON {
   group_key: string;
   notifications_count: number;
   type: NotificationType;
-  sample_accounts: ApiAccountJSON[];
+  sample_account_ids: string[];
   latest_page_notification_at: string; // FIXME: This will only be present if the notification group is returned in a paginated list, not requested directly
   most_recent_notification_id: string;
   page_min_id?: string;
@@ -143,3 +143,9 @@ export type ApiNotificationGroupJSON =
   | AccountRelationshipSeveranceNotificationGroupJSON
   | NotificationGroupWithStatusJSON
   | ModerationWarningNotificationGroupJSON;
+
+export interface ApiNotificationGroupsResultJSON {
+  accounts: ApiAccountJSON[];
+  statuses: ApiStatusJSON[];
+  notification_groups: ApiNotificationGroupJSON[];
+}
diff --git a/app/javascript/mastodon/models/notification_group.ts b/app/javascript/mastodon/models/notification_group.ts
index 5fe1e6f2e43dee..330bba88a8a8ff 100644
--- a/app/javascript/mastodon/models/notification_group.ts
+++ b/app/javascript/mastodon/models/notification_group.ts
@@ -14,7 +14,7 @@ import type { ApiReportJSON } from 'mastodon/api_types/reports';
 export const NOTIFICATIONS_GROUP_MAX_AVATARS = 8;
 
 interface BaseNotificationGroup
-  extends Omit<BaseNotificationGroupJSON, 'sample_accounts'> {
+  extends Omit<BaseNotificationGroupJSON, 'sample_account_ids'> {
   sampleAccountIds: string[];
 }
 
@@ -115,8 +115,7 @@ function createAccountRelationshipSeveranceEventFromJSON(
 export function createNotificationGroupFromJSON(
   groupJson: ApiNotificationGroupJSON,
 ): NotificationGroup {
-  const { sample_accounts, ...group } = groupJson;
-  const sampleAccountIds = sample_accounts.map((account) => account.id);
+  const { sample_account_ids: sampleAccountIds, ...group } = groupJson;
 
   switch (group.type) {
     case 'favourite':
diff --git a/app/presenters/grouped_notifications_presenter.rb b/app/presenters/grouped_notifications_presenter.rb
new file mode 100644
index 00000000000000..f01acfd41c70a2
--- /dev/null
+++ b/app/presenters/grouped_notifications_presenter.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+class GroupedNotificationsPresenter < ActiveModelSerializers::Model
+  def initialize(grouped_notifications)
+    super()
+
+    @grouped_notifications = grouped_notifications
+  end
+
+  def notification_groups
+    @grouped_notifications
+  end
+
+  def statuses
+    @grouped_notifications.filter_map(&:target_status).uniq(&:id)
+  end
+
+  def accounts
+    @grouped_notifications.flat_map(&:sample_accounts).uniq(&:id)
+  end
+end
diff --git a/app/serializers/rest/dedup_notification_group_serializer.rb b/app/serializers/rest/dedup_notification_group_serializer.rb
new file mode 100644
index 00000000000000..fd0c6b3c415a91
--- /dev/null
+++ b/app/serializers/rest/dedup_notification_group_serializer.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class REST::DedupNotificationGroupSerializer < ActiveModel::Serializer
+  has_many :accounts, serializer: REST::AccountSerializer
+  has_many :statuses, serializer: REST::StatusSerializer
+  has_many :notification_groups, serializer: REST::NotificationGroupSerializer
+end
diff --git a/app/serializers/rest/notification_group_serializer.rb b/app/serializers/rest/notification_group_serializer.rb
index 749f71775463e0..b855f1cba9c53b 100644
--- a/app/serializers/rest/notification_group_serializer.rb
+++ b/app/serializers/rest/notification_group_serializer.rb
@@ -8,12 +8,20 @@ class REST::NotificationGroupSerializer < ActiveModel::Serializer
   attribute :page_max_id, if: :paginated?
   attribute :latest_page_notification_at, if: :paginated?
 
-  has_many :sample_accounts, serializer: REST::AccountSerializer
-  belongs_to :target_status, key: :status, if: :status_type?, serializer: REST::StatusSerializer
+  attribute :sample_account_ids
+  attribute :status_id, if: :status_type?
   belongs_to :report, if: :report_type?, serializer: REST::ReportSerializer
   belongs_to :account_relationship_severance_event, key: :event, if: :relationship_severance_event?, serializer: REST::AccountRelationshipSeveranceEventSerializer
   belongs_to :account_warning, key: :moderation_warning, if: :moderation_warning_event?, serializer: REST::AccountWarningSerializer
 
+  def sample_account_ids
+    object.sample_accounts.pluck(:id).map(&:to_s)
+  end
+
+  def status_id
+    object.target_status&.id&.to_s
+  end
+
   def status_type?
     [:favourite, :reblog, :status, :mention, :poll, :update].include?(object.type)
   end
diff --git a/spec/requests/api/v2_alpha/notifications_spec.rb b/spec/requests/api/v2_alpha/notifications_spec.rb
index 381987e7e7a0f1..fc1daef43fe9df 100644
--- a/spec/requests/api/v2_alpha/notifications_spec.rb
+++ b/spec/requests/api/v2_alpha/notifications_spec.rb
@@ -135,7 +135,7 @@
 
         expect(response).to have_http_status(200)
         expect(body_json_types.uniq).to eq ['mention']
-        expect(body_as_json[0][:page_min_id]).to_not be_nil
+        expect(body_as_json.dig(:notification_groups, 0, :page_min_id)).to_not be_nil
       end
     end
 
@@ -147,7 +147,7 @@
 
         notifications = user.account.notifications
 
-        expect(body_as_json.size)
+        expect(body_as_json[:notification_groups].size)
           .to eq(params[:limit])
 
         expect(response)
@@ -161,7 +161,7 @@
     end
 
     def body_json_types
-      body_as_json.pluck(:type)
+      body_as_json[:notification_groups].pluck(:type)
     end
   end
 

From 2c1e75727dbf84cc0c3590a0a8e53d28640b37d0 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 31 Jul 2024 14:36:08 +0200
Subject: [PATCH 1669/2191] Change filtered notification banner design to take
 up less space (#31222)

---
 .../filtered_notifications_banner.tsx         | 11 ++-------
 app/javascript/mastodon/locales/en.json       |  3 +--
 .../styles/mastodon/components.scss           | 23 ++++---------------
 3 files changed, 7 insertions(+), 30 deletions(-)

diff --git a/app/javascript/mastodon/features/notifications/components/filtered_notifications_banner.tsx b/app/javascript/mastodon/features/notifications/components/filtered_notifications_banner.tsx
index be1ea2c556e1d2..9f93d25c56665d 100644
--- a/app/javascript/mastodon/features/notifications/components/filtered_notifications_banner.tsx
+++ b/app/javascript/mastodon/features/notifications/components/filtered_notifications_banner.tsx
@@ -49,21 +49,14 @@ export const FilteredNotificationsBanner: React.FC = () => {
         <span>
           <FormattedMessage
             id='filtered_notifications_banner.pending_requests'
-            defaultMessage='Notifications from {count, plural, =0 {no one} one {one person} other {# people}} you may know'
+            defaultMessage='From {count, plural, =0 {no one} one {one person} other {# people}} you may know'
             values={{ count: policy.summary.pending_requests_count }}
           />
         </span>
       </div>
 
       <div className='filtered-notifications-banner__badge'>
-        <div className='filtered-notifications-banner__badge__badge'>
-          {toCappedNumber(policy.summary.pending_notifications_count)}
-        </div>
-        <FormattedMessage
-          id='filtered_notifications_banner.mentions'
-          defaultMessage='{count, plural, one {mention} other {mentions}}'
-          values={{ count: policy.summary.pending_notifications_count }}
-        />
+        {toCappedNumber(policy.summary.pending_notifications_count)}
       </div>
     </Link>
   );
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index de8f2ebfcfb33c..c9484a1432c995 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -300,8 +300,7 @@
   "filter_modal.select_filter.subtitle": "Use an existing category or create a new one",
   "filter_modal.select_filter.title": "Filter this post",
   "filter_modal.title.status": "Filter a post",
-  "filtered_notifications_banner.mentions": "{count, plural, one {mention} other {mentions}}",
-  "filtered_notifications_banner.pending_requests": "Notifications from {count, plural, =0 {no one} one {one person} other {# people}} you may know",
+  "filtered_notifications_banner.pending_requests": "From {count, plural, =0 {no one} one {one person} other {# people}} you may know",
   "filtered_notifications_banner.title": "Filtered notifications",
   "firehose.all": "All",
   "firehose.local": "This server",
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index c575a033b78095..e64ebbad4b4839 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -10171,25 +10171,10 @@ noscript {
   }
 
   &__badge {
-    display: flex;
-    align-items: center;
-    border-radius: 999px;
-    background: var(--background-border-color);
-    color: $darker-text-color;
-    padding: 4px;
-    padding-inline-end: 8px;
-    gap: 6px;
-    font-weight: 500;
-    font-size: 11px;
-    line-height: 16px;
-    word-break: keep-all;
-
-    &__badge {
-      background: $ui-button-background-color;
-      color: $white;
-      border-radius: 100px;
-      padding: 2px 8px;
-    }
+    background: $ui-button-background-color;
+    color: $white;
+    border-radius: 100px;
+    padding: 2px 8px;
   }
 }
 

From 1145f232e80be011eb5a80bbb4e12481410fd417 Mon Sep 17 00:00:00 2001
From: Jeremy Kescher <jeremy@kescher.at>
Date: Wed, 31 Jul 2024 15:03:30 +0200
Subject: [PATCH 1670/2191] Bump Catstodon revision to 1.0.4

---
 CHANGELOG.md            | 4 ++++
 lib/mastodon/version.rb | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 835bc66567a52a..c6b0b094fb81d0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@ All changes to Catstodon that aren't Mastodon or glitch-soc Mastodon changes wil
 
 All release dates, as well as most other dates, are intended to be read as "within the day, in UTC time."
 
+## [4.3.0-alpha.5+glitch+cat+1.0.4] - 2024-07-31
+
+- Upstream changes
+
 ## [4.3.0-alpha.5+glitch+cat+1.0.3] - 2024-07-30
 
 - Upstream changes
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index f4a590dbd2d44c..3a3f6bd3df41af 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -25,7 +25,7 @@ def prerelease
     end
 
     def catstodon_revision
-      '1.0.3'
+      '1.0.4'
     end
 
     def build_metadata

From a50c8e951f03a8eb53957ad1c3703155b223ed24 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 31 Jul 2024 15:23:08 +0200
Subject: [PATCH 1671/2191] Fix issue with grouped notifications UI due to
 recent API change (#31224)

---
 app/javascript/mastodon/api_types/notifications.ts   | 2 +-
 app/javascript/mastodon/models/notification_group.ts | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/javascript/mastodon/api_types/notifications.ts b/app/javascript/mastodon/api_types/notifications.ts
index fba0b7941b6faa..ed73ceda6b332d 100644
--- a/app/javascript/mastodon/api_types/notifications.ts
+++ b/app/javascript/mastodon/api_types/notifications.ts
@@ -60,7 +60,7 @@ export interface BaseNotificationGroupJSON {
 
 interface NotificationGroupWithStatusJSON extends BaseNotificationGroupJSON {
   type: NotificationWithStatusType;
-  status: ApiStatusJSON;
+  status_id: string;
 }
 
 interface NotificationWithStatusJSON extends BaseNotificationJSON {
diff --git a/app/javascript/mastodon/models/notification_group.ts b/app/javascript/mastodon/models/notification_group.ts
index 330bba88a8a8ff..76034e644e9d8d 100644
--- a/app/javascript/mastodon/models/notification_group.ts
+++ b/app/javascript/mastodon/models/notification_group.ts
@@ -124,9 +124,9 @@ export function createNotificationGroupFromJSON(
     case 'mention':
     case 'poll':
     case 'update': {
-      const { status, ...groupWithoutStatus } = group;
+      const { status_id: statusId, ...groupWithoutStatus } = group;
       return {
-        statusId: status.id,
+        statusId,
         sampleAccountIds,
         ...groupWithoutStatus,
       };

From 2be70ae7dcf0b2482b71437fa4b818fecdf4b419 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 31 Jul 2024 09:52:59 +0200
Subject: [PATCH 1672/2191] [Glitch] Fix inconsistent dismiss icon for
 notification requests

Port a50c8e951f03a8eb53957ad1c3703155b223ed24 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/features/notifications/request.jsx        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/javascript/flavours/glitch/features/notifications/request.jsx b/app/javascript/flavours/glitch/features/notifications/request.jsx
index 4a6a189b8f8de6..b95533aa3638f5 100644
--- a/app/javascript/flavours/glitch/features/notifications/request.jsx
+++ b/app/javascript/flavours/glitch/features/notifications/request.jsx
@@ -7,9 +7,9 @@ import { Helmet } from 'react-helmet';
 
 import { useSelector, useDispatch } from 'react-redux';
 
+import DeleteIcon from '@/material-icons/400-24px/delete.svg?react';
 import DoneIcon from '@/material-icons/400-24px/done.svg?react';
 import InventoryIcon from '@/material-icons/400-24px/inventory_2.svg?react';
-import VolumeOffIcon from '@/material-icons/400-24px/volume_off.svg?react';
 import { fetchNotificationRequest, fetchNotificationsForRequest, expandNotificationsForRequest, acceptNotificationRequest, dismissNotificationRequest } from 'flavours/glitch/actions/notifications';
 import Column from 'flavours/glitch/components/column';
 import ColumnHeader from 'flavours/glitch/components/column_header';
@@ -101,7 +101,7 @@ export const NotificationRequest = ({ multiColumn, params: { id } }) => {
         showBackButton
         extraButton={!removed && (
           <>
-            <IconButton className='column-header__button' iconComponent={VolumeOffIcon} onClick={handleDismiss} title={intl.formatMessage(messages.dismiss)} />
+            <IconButton className='column-header__button' iconComponent={DeleteIcon} onClick={handleDismiss} title={intl.formatMessage(messages.dismiss)} />
             <IconButton className='column-header__button' iconComponent={DoneIcon} onClick={handleAccept} title={intl.formatMessage(messages.accept)} />
           </>
         )}

From de1ef5b4701bcdf4c0b4802787e41ec560c613b8 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 31 Jul 2024 12:26:43 +0200
Subject: [PATCH 1673/2191] [Glitch] Change private mention icon for
 consistency in grouped notifications

Port 288961bbb99b626128e4bc222deb4f749922edb8 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../notifications_v2/components/notification_mention.tsx       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/javascript/flavours/glitch/features/notifications_v2/components/notification_mention.tsx b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_mention.tsx
index 8d2d5a6282acd1..2868cddde01b30 100644
--- a/app/javascript/flavours/glitch/features/notifications_v2/components/notification_mention.tsx
+++ b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_mention.tsx
@@ -1,5 +1,6 @@
 import { FormattedMessage } from 'react-intl';
 
+import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
 import ReplyIcon from '@/material-icons/400-24px/reply-fill.svg?react';
 import type { StatusVisibility } from 'flavours/glitch/api_types/statuses';
 import type { NotificationGroupMention } from 'flavours/glitch/models/notification_group';
@@ -39,7 +40,7 @@ export const NotificationMention: React.FC<{
   return (
     <NotificationWithStatus
       type='mention'
-      icon={ReplyIcon}
+      icon={statusVisibility === 'direct' ? AlternateEmailIcon : ReplyIcon}
       iconId='reply'
       accountIds={notification.sampleAccountIds}
       count={notification.notifications_count}

From feed8163981c8c7631f49e662ed902cb1ba7202a Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 31 Jul 2024 12:50:13 +0200
Subject: [PATCH 1674/2191] [Glitch] Change grouped notifications API shape
 (take 2)

Port front-end changes from 549ab089eed07ee3ad90288ee5e134b4cfdc1e76 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/actions/notification_groups.ts  | 12 ++++++------
 app/javascript/flavours/glitch/api/notifications.ts | 13 ++++++++++---
 .../flavours/glitch/api_types/notifications.ts      |  8 +++++++-
 .../flavours/glitch/models/notification_group.ts    |  5 ++---
 4 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/app/javascript/flavours/glitch/actions/notification_groups.ts b/app/javascript/flavours/glitch/actions/notification_groups.ts
index 3f6d14a978b154..e034792275271f 100644
--- a/app/javascript/flavours/glitch/actions/notification_groups.ts
+++ b/app/javascript/flavours/glitch/actions/notification_groups.ts
@@ -38,10 +38,6 @@ function dispatchAssociatedRecords(
   const fetchedStatuses: ApiStatusJSON[] = [];
 
   notifications.forEach((notification) => {
-    if ('sample_accounts' in notification) {
-      fetchedAccounts.push(...notification.sample_accounts);
-    }
-
     if (notification.type === 'admin.report') {
       fetchedAccounts.push(notification.report.target_account);
     }
@@ -75,7 +71,9 @@ export const fetchNotifications = createDataLoadingThunk(
           : excludeAllTypesExcept(activeFilter),
     });
   },
-  ({ notifications }, { dispatch }) => {
+  ({ notifications, accounts, statuses }, { dispatch }) => {
+    dispatch(importFetchedAccounts(accounts));
+    dispatch(importFetchedStatuses(statuses));
     dispatchAssociatedRecords(dispatch, notifications);
     const payload: (ApiNotificationGroupJSON | NotificationGap)[] =
       notifications;
@@ -95,7 +93,9 @@ export const fetchNotificationsGap = createDataLoadingThunk(
   async (params: { gap: NotificationGap }) =>
     apiFetchNotifications({ max_id: params.gap.maxId }),
 
-  ({ notifications }, { dispatch }) => {
+  ({ notifications, accounts, statuses }, { dispatch }) => {
+    dispatch(importFetchedAccounts(accounts));
+    dispatch(importFetchedStatuses(statuses));
     dispatchAssociatedRecords(dispatch, notifications);
 
     return { notifications };
diff --git a/app/javascript/flavours/glitch/api/notifications.ts b/app/javascript/flavours/glitch/api/notifications.ts
index fe718788220d44..781f4b1ddedbab 100644
--- a/app/javascript/flavours/glitch/api/notifications.ts
+++ b/app/javascript/flavours/glitch/api/notifications.ts
@@ -1,17 +1,24 @@
 import api, { apiRequest, getLinks } from 'flavours/glitch/api';
-import type { ApiNotificationGroupJSON } from 'flavours/glitch/api_types/notifications';
+import type { ApiNotificationGroupsResultJSON } from 'flavours/glitch/api_types/notifications';
 
 export const apiFetchNotifications = async (params?: {
   exclude_types?: string[];
   max_id?: string;
 }) => {
-  const response = await api().request<ApiNotificationGroupJSON[]>({
+  const response = await api().request<ApiNotificationGroupsResultJSON>({
     method: 'GET',
     url: '/api/v2_alpha/notifications',
     params,
   });
 
-  return { notifications: response.data, links: getLinks(response) };
+  const { statuses, accounts, notification_groups } = response.data;
+
+  return {
+    statuses,
+    accounts,
+    notifications: notification_groups,
+    links: getLinks(response),
+  };
 };
 
 export const apiClearNotifications = () =>
diff --git a/app/javascript/flavours/glitch/api_types/notifications.ts b/app/javascript/flavours/glitch/api_types/notifications.ts
index ea37556d8d0af0..3e0d43bb236f8c 100644
--- a/app/javascript/flavours/glitch/api_types/notifications.ts
+++ b/app/javascript/flavours/glitch/api_types/notifications.ts
@@ -51,7 +51,7 @@ export interface BaseNotificationGroupJSON {
   group_key: string;
   notifications_count: number;
   type: NotificationType;
-  sample_accounts: ApiAccountJSON[];
+  sample_account_ids: string[];
   latest_page_notification_at: string; // FIXME: This will only be present if the notification group is returned in a paginated list, not requested directly
   most_recent_notification_id: string;
   page_min_id?: string;
@@ -143,3 +143,9 @@ export type ApiNotificationGroupJSON =
   | AccountRelationshipSeveranceNotificationGroupJSON
   | NotificationGroupWithStatusJSON
   | ModerationWarningNotificationGroupJSON;
+
+export interface ApiNotificationGroupsResultJSON {
+  accounts: ApiAccountJSON[];
+  statuses: ApiStatusJSON[];
+  notification_groups: ApiNotificationGroupJSON[];
+}
diff --git a/app/javascript/flavours/glitch/models/notification_group.ts b/app/javascript/flavours/glitch/models/notification_group.ts
index 6c8b8eb6e3d555..448487915d2967 100644
--- a/app/javascript/flavours/glitch/models/notification_group.ts
+++ b/app/javascript/flavours/glitch/models/notification_group.ts
@@ -14,7 +14,7 @@ import type { ApiReportJSON } from 'flavours/glitch/api_types/reports';
 export const NOTIFICATIONS_GROUP_MAX_AVATARS = 8;
 
 interface BaseNotificationGroup
-  extends Omit<BaseNotificationGroupJSON, 'sample_accounts'> {
+  extends Omit<BaseNotificationGroupJSON, 'sample_account_ids'> {
   sampleAccountIds: string[];
 }
 
@@ -115,8 +115,7 @@ function createAccountRelationshipSeveranceEventFromJSON(
 export function createNotificationGroupFromJSON(
   groupJson: ApiNotificationGroupJSON,
 ): NotificationGroup {
-  const { sample_accounts, ...group } = groupJson;
-  const sampleAccountIds = sample_accounts.map((account) => account.id);
+  const { sample_account_ids: sampleAccountIds, ...group } = groupJson;
 
   switch (group.type) {
     case 'favourite':

From de8a31f7df1a79f722182c7eb1f3b0faf5786b3f Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 31 Jul 2024 14:36:08 +0200
Subject: [PATCH 1675/2191] [Glitch] Change filtered notification banner design
 to take up less space

Port 2c1e75727dbf84cc0c3590a0a8e53d28640b37d0 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../filtered_notifications_banner.tsx         | 11 ++-------
 .../flavours/glitch/styles/components.scss    | 23 ++++---------------
 2 files changed, 6 insertions(+), 28 deletions(-)

diff --git a/app/javascript/flavours/glitch/features/notifications/components/filtered_notifications_banner.tsx b/app/javascript/flavours/glitch/features/notifications/components/filtered_notifications_banner.tsx
index 2be6ac84662bba..8aaa486b1994e8 100644
--- a/app/javascript/flavours/glitch/features/notifications/components/filtered_notifications_banner.tsx
+++ b/app/javascript/flavours/glitch/features/notifications/components/filtered_notifications_banner.tsx
@@ -49,21 +49,14 @@ export const FilteredNotificationsBanner: React.FC = () => {
         <span>
           <FormattedMessage
             id='filtered_notifications_banner.pending_requests'
-            defaultMessage='Notifications from {count, plural, =0 {no one} one {one person} other {# people}} you may know'
+            defaultMessage='From {count, plural, =0 {no one} one {one person} other {# people}} you may know'
             values={{ count: policy.summary.pending_requests_count }}
           />
         </span>
       </div>
 
       <div className='filtered-notifications-banner__badge'>
-        <div className='filtered-notifications-banner__badge__badge'>
-          {toCappedNumber(policy.summary.pending_notifications_count)}
-        </div>
-        <FormattedMessage
-          id='filtered_notifications_banner.mentions'
-          defaultMessage='{count, plural, one {mention} other {mentions}}'
-          values={{ count: policy.summary.pending_notifications_count }}
-        />
+        {toCappedNumber(policy.summary.pending_notifications_count)}
       </div>
     </Link>
   );
diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index 35342a1da4c12c..1983050338d03c 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -10730,25 +10730,10 @@ noscript {
   }
 
   &__badge {
-    display: flex;
-    align-items: center;
-    border-radius: 999px;
-    background: var(--background-border-color);
-    color: $darker-text-color;
-    padding: 4px;
-    padding-inline-end: 8px;
-    gap: 6px;
-    font-weight: 500;
-    font-size: 11px;
-    line-height: 16px;
-    word-break: keep-all;
-
-    &__badge {
-      background: $ui-button-background-color;
-      color: $white;
-      border-radius: 100px;
-      padding: 2px 8px;
-    }
+    background: $ui-button-background-color;
+    color: $white;
+    border-radius: 100px;
+    padding: 2px 8px;
   }
 }
 

From 49ad1475fba20876761a3725a7405299877607b4 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 31 Jul 2024 15:23:08 +0200
Subject: [PATCH 1676/2191] [Glitch] Fix issue with grouped notifications UI
 due to recent API change

Port a50c8e951f03a8eb53957ad1c3703155b223ed24 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/api_types/notifications.ts   | 2 +-
 app/javascript/flavours/glitch/models/notification_group.ts | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/javascript/flavours/glitch/api_types/notifications.ts b/app/javascript/flavours/glitch/api_types/notifications.ts
index 3e0d43bb236f8c..09dc8efe3123ad 100644
--- a/app/javascript/flavours/glitch/api_types/notifications.ts
+++ b/app/javascript/flavours/glitch/api_types/notifications.ts
@@ -60,7 +60,7 @@ export interface BaseNotificationGroupJSON {
 
 interface NotificationGroupWithStatusJSON extends BaseNotificationGroupJSON {
   type: NotificationWithStatusType;
-  status: ApiStatusJSON;
+  status_id: string;
 }
 
 interface NotificationWithStatusJSON extends BaseNotificationJSON {
diff --git a/app/javascript/flavours/glitch/models/notification_group.ts b/app/javascript/flavours/glitch/models/notification_group.ts
index 448487915d2967..b29ad35249c2b1 100644
--- a/app/javascript/flavours/glitch/models/notification_group.ts
+++ b/app/javascript/flavours/glitch/models/notification_group.ts
@@ -124,9 +124,9 @@ export function createNotificationGroupFromJSON(
     case 'mention':
     case 'poll':
     case 'update': {
-      const { status, ...groupWithoutStatus } = group;
+      const { status_id: statusId, ...groupWithoutStatus } = group;
       return {
-        statusId: status.id,
+        statusId,
         sampleAccountIds,
         ...groupWithoutStatus,
       };

From dfb5ac3b986dd8bc22013a101eeaa409b003482b Mon Sep 17 00:00:00 2001
From: Jeremy Kescher <jeremy@kescher.at>
Date: Thu, 1 Aug 2024 00:29:17 +0200
Subject: [PATCH 1677/2191] Bump Catstodon revision to 1.0.5

---
 CHANGELOG.md            | 4 ++++
 lib/mastodon/version.rb | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c6b0b094fb81d0..f5d43e8cfffe52 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@ All changes to Catstodon that aren't Mastodon or glitch-soc Mastodon changes wil
 
 All release dates, as well as most other dates, are intended to be read as "within the day, in UTC time."
 
+## [4.3.0-alpha.5+glitch+cat+1.0.5] - 2024-07-31
+
+- Upstream changes
+
 ## [4.3.0-alpha.5+glitch+cat+1.0.4] - 2024-07-31
 
 - Upstream changes
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index ef084e952fd9e9..f0834dbad753b5 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -25,7 +25,7 @@ def prerelease
     end
 
     def catstodon_revision
-      '1.0.4'
+      '1.0.5'
     end
 
     def build_metadata

From f6dc8ae8e39cbc626b001cd1026a6fa2de8f4215 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 1 Aug 2024 09:41:32 +0200
Subject: [PATCH 1678/2191] Fix handling of long display names in notification
 requests (#31225)

---
 app/javascript/styles/mastodon/components.scss | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index e64ebbad4b4839..cba6a5aa38accc 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -10215,6 +10215,12 @@ noscript {
       letter-spacing: 0.5px;
       line-height: 24px;
       color: $secondary-text-color;
+
+      bdi {
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+      }
     }
 
     .filtered-notifications-banner__badge {

From 06c3a41fafacd8de16004409c47e4eaa354d26dc Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 1 Aug 2024 11:13:10 +0200
Subject: [PATCH 1679/2191] chore(deps): update dependency rubocop to v1.65.1
 (#31239)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index ba8673bbf8d647..49bd446d9b1fa2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -614,7 +614,7 @@ GEM
     pundit (2.3.2)
       activesupport (>= 3.0.0)
     raabro (1.4.0)
-    racc (1.8.0)
+    racc (1.8.1)
     rack (2.2.9)
     rack-attack (6.7.0)
       rack (>= 1.0, < 4)
@@ -698,7 +698,7 @@ GEM
     responders (3.1.1)
       actionpack (>= 5.2)
       railties (>= 5.2)
-    rexml (3.3.2)
+    rexml (3.3.4)
       strscan
     rotp (6.3.0)
     rouge (4.2.1)
@@ -735,7 +735,7 @@ GEM
       rspec-mocks (~> 3.0)
       sidekiq (>= 5, < 8)
     rspec-support (3.13.1)
-    rubocop (1.65.0)
+    rubocop (1.65.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)

From 4853a2badaef7916c90e2fc546c9d7551ce8a706 Mon Sep 17 00:00:00 2001
From: Christian Schmidt <github@chsc.dk>
Date: Thu, 1 Aug 2024 11:14:24 +0200
Subject: [PATCH 1680/2191] Add Accept-Language header when fetching preview
 card (#31232)

---
 app/services/fetch_link_card_service.rb | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/services/fetch_link_card_service.rb b/app/services/fetch_link_card_service.rb
index adabb1096e86eb..49b8205574786b 100644
--- a/app/services/fetch_link_card_service.rb
+++ b/app/services/fetch_link_card_service.rb
@@ -45,7 +45,13 @@ def process_url
   def html
     return @html if defined?(@html)
 
-    @html = Request.new(:get, @url).add_headers('Accept' => 'text/html', 'User-Agent' => "#{Mastodon::Version.user_agent} Bot").perform do |res|
+    headers = {
+      'Accept' => 'text/html',
+      'Accept-Language' => "#{I18n.default_locale}, *;q=0.5",
+      'User-Agent' => "#{Mastodon::Version.user_agent} Bot",
+    }
+
+    @html = Request.new(:get, @url).add_headers(headers).perform do |res|
       next unless res.code == 200 && res.mime_type == 'text/html'
 
       # We follow redirects, and ideally we want to save the preview card for

From 584b1524dd64a3fb4daa4ffb80f38c522972bade Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 1 Aug 2024 11:27:24 +0200
Subject: [PATCH 1681/2191] New Crowdin Translations (automated) (#31237)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/ar.json      |   2 -
 app/javascript/mastodon/locales/be.json      |   2 -
 app/javascript/mastodon/locales/bg.json      |   3 +-
 app/javascript/mastodon/locales/br.json      |   1 -
 app/javascript/mastodon/locales/ca.json      |   3 +-
 app/javascript/mastodon/locales/cs.json      |   2 -
 app/javascript/mastodon/locales/cy.json      |   2 -
 app/javascript/mastodon/locales/da.json      |   3 +-
 app/javascript/mastodon/locales/de.json      |   3 +-
 app/javascript/mastodon/locales/el.json      |   2 -
 app/javascript/mastodon/locales/en-GB.json   |   2 -
 app/javascript/mastodon/locales/es-AR.json   |   3 +-
 app/javascript/mastodon/locales/es-MX.json   |   2 -
 app/javascript/mastodon/locales/es.json      |   2 -
 app/javascript/mastodon/locales/et.json      |   2 -
 app/javascript/mastodon/locales/eu.json      |   2 -
 app/javascript/mastodon/locales/fi.json      |  53 ++--
 app/javascript/mastodon/locales/fo.json      |   2 -
 app/javascript/mastodon/locales/fr-CA.json   |   1 -
 app/javascript/mastodon/locales/fr.json      |   1 -
 app/javascript/mastodon/locales/fy.json      |   2 -
 app/javascript/mastodon/locales/ga.json      |   2 -
 app/javascript/mastodon/locales/gd.json      |   2 -
 app/javascript/mastodon/locales/gl.json      |   3 +-
 app/javascript/mastodon/locales/he.json      |   3 +-
 app/javascript/mastodon/locales/hu.json      |   2 -
 app/javascript/mastodon/locales/ia.json      |   2 -
 app/javascript/mastodon/locales/ie.json      |   2 -
 app/javascript/mastodon/locales/is.json      |   3 +-
 app/javascript/mastodon/locales/it.json      |   3 +-
 app/javascript/mastodon/locales/ja.json      |   2 -
 app/javascript/mastodon/locales/ko.json      |  10 +-
 app/javascript/mastodon/locales/la.json      |   1 -
 app/javascript/mastodon/locales/lad.json     |   1 -
 app/javascript/mastodon/locales/lt.json      |   2 -
 app/javascript/mastodon/locales/lv.json      |   1 -
 app/javascript/mastodon/locales/nl.json      |   3 +-
 app/javascript/mastodon/locales/nn.json      |   3 +-
 app/javascript/mastodon/locales/pl.json      |   3 +-
 app/javascript/mastodon/locales/pt-BR.json   |   2 -
 app/javascript/mastodon/locales/pt-PT.json   |   3 +-
 app/javascript/mastodon/locales/ru.json      |   2 -
 app/javascript/mastodon/locales/sc.json      |   2 -
 app/javascript/mastodon/locales/sk.json      |   1 -
 app/javascript/mastodon/locales/sl.json      |   2 -
 app/javascript/mastodon/locales/sq.json      |   2 -
 app/javascript/mastodon/locales/sr-Latn.json |   2 -
 app/javascript/mastodon/locales/sr.json      |   2 -
 app/javascript/mastodon/locales/sv.json      |   2 -
 app/javascript/mastodon/locales/th.json      |   2 -
 app/javascript/mastodon/locales/tr.json      |   2 -
 app/javascript/mastodon/locales/uk.json      |   2 -
 app/javascript/mastodon/locales/vi.json      |   3 +-
 app/javascript/mastodon/locales/zh-CN.json   |   3 +-
 app/javascript/mastodon/locales/zh-HK.json   |   2 -
 app/javascript/mastodon/locales/zh-TW.json   |   3 +-
 config/locales/activerecord.fi.yml           |   6 +-
 config/locales/doorkeeper.fi.yml             |  16 +-
 config/locales/doorkeeper.he.yml             |   1 +
 config/locales/doorkeeper.ko.yml             |   1 +
 config/locales/es-MX.yml                     |  16 ++
 config/locales/es.yml                        |  16 ++
 config/locales/fi.yml                        | 286 +++++++++----------
 config/locales/ga.yml                        |  16 ++
 config/locales/he.yml                        |  16 ++
 config/locales/ko.yml                        |  16 ++
 config/locales/simple_form.es-MX.yml         |   1 +
 config/locales/simple_form.es.yml            |   1 +
 config/locales/simple_form.fi.yml            |  22 +-
 config/locales/simple_form.ga.yml            |   1 +
 config/locales/simple_form.he.yml            |   1 +
 config/locales/simple_form.ko.yml            |   1 +
 72 files changed, 302 insertions(+), 295 deletions(-)

diff --git a/app/javascript/mastodon/locales/ar.json b/app/javascript/mastodon/locales/ar.json
index daafb436772310..5cfd587e088341 100644
--- a/app/javascript/mastodon/locales/ar.json
+++ b/app/javascript/mastodon/locales/ar.json
@@ -291,8 +291,6 @@
   "filter_modal.select_filter.subtitle": "استخدم فئة موجودة أو قم بإنشاء فئة جديدة",
   "filter_modal.select_filter.title": "تصفية هذا المنشور",
   "filter_modal.title.status": "تصفية منشور",
-  "filtered_notifications_banner.mentions": "{count, plural, one {إشارة} two {إشارتين} few {# إشارات} other {# إشارة}}",
-  "filtered_notifications_banner.pending_requests": "إشعارات من {count, plural, zero {}=0 {لا أحد} one {شخص واحد قد تعرفه} two {شخصين قد تعرفهما} few {# أشخاص قد تعرفهم} many {# شخص قد تعرفهم} other {# شخص قد تعرفهم}}",
   "filtered_notifications_banner.title": "الإشعارات المصفاة",
   "firehose.all": "الكل",
   "firehose.local": "هذا الخادم",
diff --git a/app/javascript/mastodon/locales/be.json b/app/javascript/mastodon/locales/be.json
index 80af2a76da98aa..bb59001273a373 100644
--- a/app/javascript/mastodon/locales/be.json
+++ b/app/javascript/mastodon/locales/be.json
@@ -293,8 +293,6 @@
   "filter_modal.select_filter.subtitle": "Скарыстайцеся існуючай катэгорыяй або стварыце новую",
   "filter_modal.select_filter.title": "Фільтраваць гэты допіс",
   "filter_modal.title.status": "Фільтраваць допіс",
-  "filtered_notifications_banner.mentions": "{count, plural, one {згадванне} few {згадванні} many {згадванняў} other {згадвання}}",
-  "filtered_notifications_banner.pending_requests": "Апавяшчэнні ад {count, plural, =0 {# людзей якіх} one {# чалавека якіх} few {# чалавек якіх} many {# людзей якіх} other {# чалавека якіх}} вы магчыма ведаеце",
   "filtered_notifications_banner.title": "Адфільтраваныя апавяшчэнні",
   "firehose.all": "Усе",
   "firehose.local": "Гэты сервер",
diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json
index b83286bf9061e6..657341d253e3ac 100644
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@@ -300,8 +300,7 @@
   "filter_modal.select_filter.subtitle": "Изберете съществуваща категория или създайте нова",
   "filter_modal.select_filter.title": "Филтриране на публ.",
   "filter_modal.title.status": "Филтриране на публ.",
-  "filtered_notifications_banner.mentions": "{count, plural, one {споменаване} other {споменавания}}",
-  "filtered_notifications_banner.pending_requests": "Известията от {count, plural, =0 {никого, когото може да познавате} one {едно лице, което може да познавате} other {# души, които може да познавате}}",
+  "filtered_notifications_banner.pending_requests": "От {count, plural, =0 {никого, когото може да познавате} one {едно лице, което може да познавате} other {# души, които може да познавате}}",
   "filtered_notifications_banner.title": "Филтрирани известия",
   "firehose.all": "Всичко",
   "firehose.local": "Този сървър",
diff --git a/app/javascript/mastodon/locales/br.json b/app/javascript/mastodon/locales/br.json
index fb90a01cd1bf07..b38f43631641b0 100644
--- a/app/javascript/mastodon/locales/br.json
+++ b/app/javascript/mastodon/locales/br.json
@@ -252,7 +252,6 @@
   "filter_modal.select_filter.subtitle": "Implijout ur rummad a zo anezhañ pe krouiñ unan nevez",
   "filter_modal.select_filter.title": "Silañ an toud-mañ",
   "filter_modal.title.status": "Silañ un toud",
-  "filtered_notifications_banner.mentions": "{count, plural, one {meneg} two {veneg} few {meneg} other {a venegoù}}",
   "firehose.all": "Pep tra",
   "firehose.local": "Ar servijer-mañ",
   "firehose.remote": "Servijerioù all",
diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index 164a2cdb3a767e..6b79a8efec09a4 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -300,8 +300,7 @@
   "filter_modal.select_filter.subtitle": "Usa una categoria existent o crea'n una de nova",
   "filter_modal.select_filter.title": "Filtra aquest tut",
   "filter_modal.title.status": "Filtra un tut",
-  "filtered_notifications_banner.mentions": "{count, plural, one {menció} other {mencions}}",
-  "filtered_notifications_banner.pending_requests": "Notificacions {count, plural, =0 {de ningú} one {d'una persona} other {de # persones}} que potser coneixes",
+  "filtered_notifications_banner.pending_requests": "Des {count, plural, =0 {de ningú} one {d'una persona} other {de # persones}} que potser coneixes",
   "filtered_notifications_banner.title": "Notificacions filtrades",
   "firehose.all": "Tots",
   "firehose.local": "Aquest servidor",
diff --git a/app/javascript/mastodon/locales/cs.json b/app/javascript/mastodon/locales/cs.json
index 2201e68aaa93ec..a5c90befe366ea 100644
--- a/app/javascript/mastodon/locales/cs.json
+++ b/app/javascript/mastodon/locales/cs.json
@@ -293,8 +293,6 @@
   "filter_modal.select_filter.subtitle": "Použít existující kategorii nebo vytvořit novou kategorii",
   "filter_modal.select_filter.title": "Filtrovat tento příspěvek",
   "filter_modal.title.status": "Filtrovat příspěvek",
-  "filtered_notifications_banner.mentions": "{count, plural, one {zmínka} few {zmínky} many {zmínek} other {zmínek}}",
-  "filtered_notifications_banner.pending_requests": "Oznámení od {count, plural, =0 {nikoho} one {jednoho člověka, kterého znáte} few {# lidí, které znáte} many {# lidí, které znáte} other {# lidí, které znáte}}",
   "filtered_notifications_banner.title": "Filtrovaná oznámení",
   "firehose.all": "Vše",
   "firehose.local": "Tento server",
diff --git a/app/javascript/mastodon/locales/cy.json b/app/javascript/mastodon/locales/cy.json
index 828896678b1c12..45fdbfef3ab034 100644
--- a/app/javascript/mastodon/locales/cy.json
+++ b/app/javascript/mastodon/locales/cy.json
@@ -300,8 +300,6 @@
   "filter_modal.select_filter.subtitle": "Defnyddiwch gategori sy'n bodoli eisoes neu crëu un newydd",
   "filter_modal.select_filter.title": "Hidlo'r postiad hwn",
   "filter_modal.title.status": "Hidlo postiad",
-  "filtered_notifications_banner.mentions": "{count, plural, one {crybwylliad} other {crybwylliad}}",
-  "filtered_notifications_banner.pending_requests": "Hysbysiadau gan {count, plural, =0 {neb} one {un person} other {# person}} efallai y gwyddoch amdanyn nhw",
   "filtered_notifications_banner.title": "Hysbysiadau wedi'u hidlo",
   "firehose.all": "Popeth",
   "firehose.local": "Gweinydd hwn",
diff --git a/app/javascript/mastodon/locales/da.json b/app/javascript/mastodon/locales/da.json
index 039b088543cf38..42deb4f42502c5 100644
--- a/app/javascript/mastodon/locales/da.json
+++ b/app/javascript/mastodon/locales/da.json
@@ -300,8 +300,7 @@
   "filter_modal.select_filter.subtitle": "Vælg en eksisterende kategori eller opret en ny",
   "filter_modal.select_filter.title": "Filtrér dette indlæg",
   "filter_modal.title.status": "Filtrér et indlæg",
-  "filtered_notifications_banner.mentions": "{count, plural, one {omtale} other {omtaler}}",
-  "filtered_notifications_banner.pending_requests": "Notifikationer fra {count, plural, =0 {ingen} one {én person} other {# personer}} du måske kender",
+  "filtered_notifications_banner.pending_requests": "Fra {count, plural, =0 {ingen} one {én person} other {# personer}}, man måske kender",
   "filtered_notifications_banner.title": "Filtrerede notifikationer",
   "firehose.all": "Alle",
   "firehose.local": "Denne server",
diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json
index a4c277b8a8a59e..d718135494c14b 100644
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@@ -300,8 +300,7 @@
   "filter_modal.select_filter.subtitle": "Einem vorhandenen Filter hinzufügen oder einen neuen erstellen",
   "filter_modal.select_filter.title": "Diesen Beitrag filtern",
   "filter_modal.title.status": "Beitrag per Filter ausblenden",
-  "filtered_notifications_banner.mentions": "{count, plural, one {Erwähnung} other {Erwähnungen}}",
-  "filtered_notifications_banner.pending_requests": "Benachrichtigungen von {count, plural, =0 {keinem Profil, das du möglicherweise kennst} one {einem Profil, das du möglicherweise kennst} other {# Profilen, die du möglicherweise kennst}}",
+  "filtered_notifications_banner.pending_requests": "Von {count, plural, =0 {keinem, den} one {einer Person, die} other {# Personen, die}} du möglicherweise kennst",
   "filtered_notifications_banner.title": "Gefilterte Benachrichtigungen",
   "firehose.all": "Alles",
   "firehose.local": "Dieser Server",
diff --git a/app/javascript/mastodon/locales/el.json b/app/javascript/mastodon/locales/el.json
index c2eb2ce904b6a9..3b181b42a688d3 100644
--- a/app/javascript/mastodon/locales/el.json
+++ b/app/javascript/mastodon/locales/el.json
@@ -293,8 +293,6 @@
   "filter_modal.select_filter.subtitle": "Χρησιμοποιήστε μια υπάρχουσα κατηγορία ή δημιουργήστε μια νέα",
   "filter_modal.select_filter.title": "Φιλτράρισμα αυτής της ανάρτησης",
   "filter_modal.title.status": "Φιλτράρισμα μιας ανάρτησης",
-  "filtered_notifications_banner.mentions": "{count, plural, one {επισήμανση} other {επισημάνσεις}}",
-  "filtered_notifications_banner.pending_requests": "Ειδοποιήσεις από {count, plural, =0 {κανένα} one {ένα άτομο} other {# άτομα}} που μπορεί να ξέρεις",
   "filtered_notifications_banner.title": "Φιλτραρισμένες ειδοποιήσεις",
   "firehose.all": "Όλα",
   "firehose.local": "Αυτός ο διακομιστής",
diff --git a/app/javascript/mastodon/locales/en-GB.json b/app/javascript/mastodon/locales/en-GB.json
index 9e4331c56b8ea5..eaf4f9465b6c76 100644
--- a/app/javascript/mastodon/locales/en-GB.json
+++ b/app/javascript/mastodon/locales/en-GB.json
@@ -293,8 +293,6 @@
   "filter_modal.select_filter.subtitle": "Use an existing category or create a new one",
   "filter_modal.select_filter.title": "Filter this post",
   "filter_modal.title.status": "Filter a post",
-  "filtered_notifications_banner.mentions": "{count, plural, one {mention} other {mentions}}",
-  "filtered_notifications_banner.pending_requests": "Notifications from {count, plural, =0 {no one} one {one person} other {# people}} you may know",
   "filtered_notifications_banner.title": "Filtered notifications",
   "firehose.all": "All",
   "firehose.local": "This server",
diff --git a/app/javascript/mastodon/locales/es-AR.json b/app/javascript/mastodon/locales/es-AR.json
index 791f66e5074597..9a5405edbec972 100644
--- a/app/javascript/mastodon/locales/es-AR.json
+++ b/app/javascript/mastodon/locales/es-AR.json
@@ -300,8 +300,7 @@
   "filter_modal.select_filter.subtitle": "Usar una categoría existente o crear una nueva",
   "filter_modal.select_filter.title": "Filtrar este mensaje",
   "filter_modal.title.status": "Filtrar un mensaje",
-  "filtered_notifications_banner.mentions": "{count, plural, one {mención} other {menciones}}",
-  "filtered_notifications_banner.pending_requests": "Notificaciones de {count, plural, =0 {nadie} one {una persona} other {# personas}} que podrías conocer",
+  "filtered_notifications_banner.pending_requests": "De {count, plural, =0 {nadie} one {una persona} other {# personas}} que podrías conocer",
   "filtered_notifications_banner.title": "Notificaciones filtradas",
   "firehose.all": "Todos",
   "firehose.local": "Este servidor",
diff --git a/app/javascript/mastodon/locales/es-MX.json b/app/javascript/mastodon/locales/es-MX.json
index 3adc9146634359..869def31a69259 100644
--- a/app/javascript/mastodon/locales/es-MX.json
+++ b/app/javascript/mastodon/locales/es-MX.json
@@ -300,8 +300,6 @@
   "filter_modal.select_filter.subtitle": "Usar una categoría existente o crear una nueva",
   "filter_modal.select_filter.title": "Filtrar esta publicación",
   "filter_modal.title.status": "Filtrar una publicación",
-  "filtered_notifications_banner.mentions": "{count, plural, one {mención} other {menciones}}",
-  "filtered_notifications_banner.pending_requests": "Notificaciones de {count, plural, =0 {nadie} one {una persona} other {# personas}} que podrías conocer",
   "filtered_notifications_banner.title": "Notificaciones filtradas",
   "firehose.all": "Todas",
   "firehose.local": "Este servidor",
diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json
index 8135f9c3539f10..41dd71c3869597 100644
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@@ -300,8 +300,6 @@
   "filter_modal.select_filter.subtitle": "Usar una categoría existente o crear una nueva",
   "filter_modal.select_filter.title": "Filtrar esta publicación",
   "filter_modal.title.status": "Filtrar una publicación",
-  "filtered_notifications_banner.mentions": "{count, plural, one {mención} other {menciones}}",
-  "filtered_notifications_banner.pending_requests": "Notificaciones de {count, plural, =0 {nadie} one {una persona} other {# personas}} que podrías conocer",
   "filtered_notifications_banner.title": "Notificaciones filtradas",
   "firehose.all": "Todas",
   "firehose.local": "Este servidor",
diff --git a/app/javascript/mastodon/locales/et.json b/app/javascript/mastodon/locales/et.json
index 4bd997801c4fcf..7369a89c462518 100644
--- a/app/javascript/mastodon/locales/et.json
+++ b/app/javascript/mastodon/locales/et.json
@@ -290,8 +290,6 @@
   "filter_modal.select_filter.subtitle": "Kasuta olemasolevat kategooriat või loo uus",
   "filter_modal.select_filter.title": "Filtreeri seda postitust",
   "filter_modal.title.status": "Postituse filtreerimine",
-  "filtered_notifications_banner.mentions": "{count, plural, one {mainimine} other {mainimist}}",
-  "filtered_notifications_banner.pending_requests": "Teateid {count, plural, =0 {mitte üheltki} one {ühelt} other {#}} inimeselt, keda võid teada",
   "filtered_notifications_banner.title": "Filtreeritud teavitused",
   "firehose.all": "Kõik",
   "firehose.local": "See server",
diff --git a/app/javascript/mastodon/locales/eu.json b/app/javascript/mastodon/locales/eu.json
index 28c1a06d58ffdb..a4b502ccc0cbc0 100644
--- a/app/javascript/mastodon/locales/eu.json
+++ b/app/javascript/mastodon/locales/eu.json
@@ -294,8 +294,6 @@
   "filter_modal.select_filter.subtitle": "Hautatu lehendik dagoen kategoria bat edo sortu berria",
   "filter_modal.select_filter.title": "Iragazi bidalketa hau",
   "filter_modal.title.status": "Iragazi bidalketa bat",
-  "filtered_notifications_banner.mentions": "{count, plural, one {aipamen} other {aipamen}}",
-  "filtered_notifications_banner.pending_requests": "Ezagutu {count, plural, =0 {dezakezun inoren} one {dezakezun pertsona baten} other {ditzakezun # pertsonen}} jakinarazpenak",
   "filtered_notifications_banner.title": "Iragazitako jakinarazpenak",
   "firehose.all": "Guztiak",
   "firehose.local": "Zerbitzari hau",
diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index 168472326c82ca..fc331809e72217 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -19,7 +19,7 @@
   "account.block_domain": "Estä verkkotunnus {domain}",
   "account.block_short": "Estä",
   "account.blocked": "Estetty",
-  "account.browse_more_on_origin_server": "Selaile kattavampaa alkuperäprofiilia",
+  "account.browse_more_on_origin_server": "Selaa lisää alkuperäisessä profiilissa",
   "account.cancel_follow_request": "Peruuta seurantapyyntö",
   "account.copy": "Kopioi linkki profiiliin",
   "account.direct": "Mainitse @{name} yksityisesti",
@@ -30,7 +30,7 @@
   "account.endorse": "Suosittele profiilissasi",
   "account.featured_tags.last_status_at": "Viimeisin julkaisu {date}",
   "account.featured_tags.last_status_never": "Ei julkaisuja",
-  "account.featured_tags.title": "Käyttäjän {name} esillä pidettävät aihetunnisteet",
+  "account.featured_tags.title": "{name} pitää esillä aihetunnisteita",
   "account.follow": "Seuraa",
   "account.follow_back": "Seuraa takaisin",
   "account.followers": "Seuraajat",
@@ -68,14 +68,14 @@
   "account.unblock_domain": "Kumoa verkkotunnuksen {domain} esto",
   "account.unblock_short": "Kumoa esto",
   "account.unendorse": "Kumoa suosittelu profiilissasi",
-  "account.unfollow": "Lopeta seuraaminen",
+  "account.unfollow": "Älä seuraa",
   "account.unmute": "Poista käyttäjän @{name} mykistys",
   "account.unmute_notifications_short": "Poista ilmoitusten mykistys",
   "account.unmute_short": "Poista mykistys",
   "account_note.placeholder": "Lisää muistiinpano napsauttamalla",
-  "admin.dashboard.daily_retention": "Käyttäjien pysyvyys rekisteröitymisen jälkeen päivittäin",
-  "admin.dashboard.monthly_retention": "Käyttäjien pysyvyys rekisteröitymisen jälkeen kuukausittain",
-  "admin.dashboard.retention.average": "Keskiarvo",
+  "admin.dashboard.daily_retention": "Käyttäjien pysyvyys päivittäin rekisteröitymisen jälkeen",
+  "admin.dashboard.monthly_retention": "Käyttäjien pysyvyys kuukausittain rekisteröitymisen jälkeen",
+  "admin.dashboard.retention.average": "Keskimäärin",
   "admin.dashboard.retention.cohort": "Rekisteröitymis-kk.",
   "admin.dashboard.retention.cohort_size": "Uusia käyttäjiä",
   "admin.impact_report.instance_accounts": "Tilien profiilit, jotka tämä poistaisi",
@@ -200,7 +200,7 @@
   "copy_icon_button.copied": "Sisältö kopioitiin leikepöydälle",
   "copypaste.copied": "Kopioitu",
   "copypaste.copy_to_clipboard": "Kopioi leikepöydälle",
-  "directory.federated": "Koko tunnettu fediversumi",
+  "directory.federated": "Tunnetusta fediversumista",
   "directory.local": "Vain palvelimelta {domain}",
   "directory.new_arrivals": "Äskettäin saapuneet",
   "directory.recently_active": "Hiljattain aktiiviset",
@@ -214,7 +214,7 @@
   "dismissable_banner.public_timeline": "Nämä ovat viimeisimpiä julkaisuja sosiaalisen verkon käyttäjiltä, joita seurataan palvelimella {domain}.",
   "domain_block_modal.block": "Estä palvelin",
   "domain_block_modal.block_account_instead": "Estä sen sijaan @{name}",
-  "domain_block_modal.they_can_interact_with_old_posts": "Ihmiset tältä palvelimelta eivät voi olla vuorovaikutuksessa vanhojen julkaisujesi kanssa.",
+  "domain_block_modal.they_can_interact_with_old_posts": "Tämän palvelimen käyttäjät eivät voi olla vuorovaikutuksessa vanhojen julkaisujesi kanssa.",
   "domain_block_modal.they_cant_follow": "Kukaan tältä palvelimelta ei voi seurata sinua.",
   "domain_block_modal.they_wont_know": "Hän ei saa tietää tulleensa estetyksi.",
   "domain_block_modal.title": "Estetäänkö verkkotunnus?",
@@ -228,8 +228,8 @@
   "domain_pill.their_username": "Hänen yksilöllinen tunnisteensa omalla palvelimellaan. Eri palvelimilta on mahdollista löytää käyttäjiä, joilla on sama käyttäjänimi.",
   "domain_pill.username": "Käyttäjänimi",
   "domain_pill.whats_in_a_handle": "Mitä käyttäjätunnuksessa on?",
-  "domain_pill.who_they_are": "Koska käyttäjätunnukset kertovat, kuka ja missä joku on, voit olla vuorovaikutuksessa ihmisten kanssa läpi sosiaalisen verkon, joka koostuu <button>ActivityPub-pohjaisista alustoista</button>.",
-  "domain_pill.who_you_are": "Koska käyttäjätunnuksesi kertoo, kuka ja missä olet, ihmiset voivat olla vaikutuksessa kanssasi läpi sosiaalisen verkon, joka koostuu <button>ActivityPub-pohjaisista alustoista</button>.",
+  "domain_pill.who_they_are": "Koska käyttäjätunnukset kertovat, kuka ja missä joku on, voit olla vuorovaikutuksessa ihmisten kanssa kaikkialla sosiaalisessa verkossa, joka koostuu <button>ActivityPub-pohjaisista alustoista</button>.",
+  "domain_pill.who_you_are": "Koska käyttäjätunnuksesi kertoo, kuka ja missä olet, ihmiset voivat olla vaikutuksessa kanssasi kaikkialla sosiaalisessa verkossa, joka koostuu <button>ActivityPub-pohjaisista alustoista</button>.",
   "domain_pill.your_handle": "Käyttäjätunnuksesi:",
   "domain_pill.your_server": "Digitaalinen kotisi, jossa kaikki julkaisusi sijaitsevat. Etkö pidä tästä? Siirry palvelimelta toiselle milloin tahansa ja tuo myös seuraajasi mukanasi.",
   "domain_pill.your_username": "Yksilöllinen tunnisteesi tällä palvelimella. Eri palvelimilta on mahdollista löytää käyttäjiä, joilla on sama käyttäjänimi.",
@@ -265,12 +265,12 @@
   "empty_column.follow_requests": "Et ole vielä vastaanottanut seurantapyyntöjä. Saamasi pyynnöt näkyvät täällä.",
   "empty_column.followed_tags": "Et seuraa vielä yhtäkään aihetunnistetta. Kun alat seurata, ne tulevat tähän näkyviin.",
   "empty_column.hashtag": "Tällä aihetunnisteella ei löydy vielä sisältöä.",
-  "empty_column.home": "Kotiaikajanasi on tyhjä! Seuraa useampia henkilöjä, niin näet enemmän sisältöä.",
+  "empty_column.home": "Kotiaikajanasi on tyhjä! Seuraa useampia käyttäjiä, niin näet enemmän sisältöä.",
   "empty_column.list": "Tällä listalla ei ole vielä mitään. Kun tämän listan jäsenet lähettävät uusia julkaisuja, ne näkyvät tässä.",
   "empty_column.lists": "Sinulla ei ole vielä yhtään listaa. Kun luot sellaisen, näkyy se tässä.",
   "empty_column.mutes": "Et ole mykistänyt vielä yhtään käyttäjää.",
   "empty_column.notification_requests": "Olet ajan tasalla! Täällä ei ole mitään uutta kerrottavaa. Kun saat uusia ilmoituksia, ne näkyvät täällä asetustesi mukaisesti.",
-  "empty_column.notifications": "Sinulla ei ole vielä ilmoituksia. Kun keskustelet muille, näet sen täällä.",
+  "empty_column.notifications": "Sinulla ei ole vielä ilmoituksia. Kun muut ovat vuorovaikutuksessa kanssasi, näet sen täällä.",
   "empty_column.public": "Täällä ei ole mitään! Kirjoita jotain julkisesti tai seuraa muiden palvelinten käyttäjiä, niin saat sisältöä",
   "error.unexpected_crash.explanation": "Sivua ei voida näyttää oikein ohjelmointivirheen tai selaimen yhteensopivuusvajeen vuoksi.",
   "error.unexpected_crash.explanation_addons": "Sivua ei voitu näyttää oikein. Tämä virhe johtuu todennäköisesti selaimen lisäosasta tai automaattisista käännöstyökaluista.",
@@ -300,8 +300,7 @@
   "filter_modal.select_filter.subtitle": "Käytä olemassa olevaa luokkaa tai luo uusi",
   "filter_modal.select_filter.title": "Suodata tämä julkaisu",
   "filter_modal.title.status": "Suodata julkaisu",
-  "filtered_notifications_banner.mentions": "{count, plural, one {maininta} other {mainintaa}}",
-  "filtered_notifications_banner.pending_requests": "Ilmoituksia {count, plural, =0 {ei ole} one {1 henkilöltä} other {# henkilöltä}}, jonka saatat tuntea",
+  "filtered_notifications_banner.pending_requests": "{count, plural, =0 {Ei keneltäkään} one {Yhdeltä henkilöltä} other {# henkilöltä}}, jonka saatat tuntea",
   "filtered_notifications_banner.title": "Suodatetut ilmoitukset",
   "firehose.all": "Kaikki",
   "firehose.local": "Tämä palvelin",
@@ -312,9 +311,9 @@
   "follow_suggestions.curated_suggestion": "Ehdotus ylläpidolta",
   "follow_suggestions.dismiss": "Älä näytä uudelleen",
   "follow_suggestions.featured_longer": "Palvelimen {domain} tiimin poimintoja",
-  "follow_suggestions.friends_of_friends_longer": "Suosittu seuraamiesi ihmisten keskuudessa",
+  "follow_suggestions.friends_of_friends_longer": "Suosittu seuraamiesi käyttäjien joukossa",
   "follow_suggestions.hints.featured": "Tämän profiilin on valinnut palvelimen {domain} tiimi.",
-  "follow_suggestions.hints.friends_of_friends": "Seuraamasi käyttäjät suosivat tätä profiilia.",
+  "follow_suggestions.hints.friends_of_friends": "Tämä profiili on suosittu seuraamiesi käyttäjien joukossa.",
   "follow_suggestions.hints.most_followed": "Tämä profiili on palvelimen {domain} seuratuimpia.",
   "follow_suggestions.hints.most_interactions": "Tämä profiili on viime aikoina saanut paljon huomiota palvelimella {domain}.",
   "follow_suggestions.hints.similar_to_recently_followed": "Tämä profiili on samankaltainen kuin profiilit, joita olet viimeksi seurannut.",
@@ -431,7 +430,7 @@
   "lists.replies_policy.list": "Listan jäsenille",
   "lists.replies_policy.none": "Ei kellekään",
   "lists.replies_policy.title": "Näytä vastaukset:",
-  "lists.search": "Hae seuraamistasi henkilöistä",
+  "lists.search": "Hae seuraamistasi käyttäjistä",
   "lists.subheading": "Omat listasi",
   "load_pending": "{count, plural, one {# uusi kohde} other {# uutta kohdetta}}",
   "loading_indicator.label": "Ladataan…",
@@ -501,7 +500,7 @@
   "notification.relationships_severance_event.account_suspension": "Palvelimen {from} ylläpitäjä on jäädyttänyt palvelimen {target} vuorovaikutuksen. Enää et voi siis vastaanottaa päivityksiä heiltä tai olla yhteyksissä heidän kanssaan.",
   "notification.relationships_severance_event.domain_block": "Palvelimen {from} ylläpitäjä on estänyt palvelimen {target} vuorovaikutuksen – mukaan lukien {followersCount} seuraajistasi ja {followingCount, plural, one {# seuratuistasi} other {# seuratuistasi}}.",
   "notification.relationships_severance_event.learn_more": "Lue lisää",
-  "notification.relationships_severance_event.user_domain_block": "Olet estänyt palvelimen {target}, mikä poisti {followersCount} seuraajistasi ja {followingCount, plural, one {# seuratuistasi} other {# seuratuistasi}}.",
+  "notification.relationships_severance_event.user_domain_block": "Olet estänyt verkkotunnuksen {target}, mikä poisti {followersCount} seuraajistasi ja {followingCount, plural, one {# seuratuistasi} other {# seuratuistasi}}.",
   "notification.status": "{name} julkaisi juuri",
   "notification.update": "{name} muokkasi julkaisua",
   "notification_requests.accept": "Hyväksy",
@@ -534,10 +533,10 @@
   "notifications.filter.all": "Kaikki",
   "notifications.filter.boosts": "Tehostukset",
   "notifications.filter.favourites": "Suosikit",
-  "notifications.filter.follows": "Seuraa",
+  "notifications.filter.follows": "Seuratut",
   "notifications.filter.mentions": "Maininnat",
   "notifications.filter.polls": "Äänestyksen tulokset",
-  "notifications.filter.statuses": "Päivitykset henkilöiltä, joita seuraat",
+  "notifications.filter.statuses": "Päivitykset seuraamiltasi käyttäjiltä",
   "notifications.grant_permission": "Myönnä käyttöoikeus.",
   "notifications.group": "{count} ilmoitusta",
   "notifications.mark_as_read": "Merkitse jokainen ilmoitus luetuksi",
@@ -547,9 +546,9 @@
   "notifications.policy.filter_new_accounts.hint": "Luotu {days, plural, one {viime päivän} other {viimeisen # päivän}} aikana",
   "notifications.policy.filter_new_accounts_title": "Uudet tilit",
   "notifications.policy.filter_not_followers_hint": "Mukaan lukien alle {days, plural, one {päivän} other {# päivää}} sinua seuranneet",
-  "notifications.policy.filter_not_followers_title": "Henkilöt, jotka eivät seuraa sinua",
+  "notifications.policy.filter_not_followers_title": "Käyttäjät, jotka eivät seuraa sinua",
   "notifications.policy.filter_not_following_hint": "Kunnes hyväksyt heidät manuaalisesti",
-  "notifications.policy.filter_not_following_title": "Henkilöt, joita et seuraa",
+  "notifications.policy.filter_not_following_title": "Käyttäjät, joita et seuraa",
   "notifications.policy.filter_private_mentions_hint": "Suodatetaan, ellei se ole vastaus omaan mainintaasi tai ellet seuraa lähettäjää",
   "notifications.policy.filter_private_mentions_title": "Ei-toivotut yksityismaininnat",
   "notifications.policy.title": "Suodata ilmoitukset pois kohteesta…",
@@ -619,7 +618,7 @@
   "privacy.unlisted.short": "Vaivihkaisesti julkinen",
   "privacy_policy.last_updated": "Päivitetty viimeksi {date}",
   "privacy_policy.title": "Tietosuojakäytäntö",
-  "recommended": "Suositeltu",
+  "recommended": "Suositellaan",
   "refresh": "Päivitä",
   "regeneration_indicator.label": "Ladataan…",
   "regeneration_indicator.sublabel": "Kotisyötettäsi valmistellaan!",
@@ -790,10 +789,10 @@
   "time_remaining.minutes": "{number, plural, one {# minuutti} other {# minuuttia}} jäljellä",
   "time_remaining.moments": "Hetkiä jäljellä",
   "time_remaining.seconds": "{number, plural, one {# sekunti} other {# sekuntia}} jäljellä",
-  "timeline_hint.remote_resource_not_displayed": "Muiden palvelinten {resource}-tietoa ei näytetä täällä.",
-  "timeline_hint.resources.followers": "Seuraajat",
-  "timeline_hint.resources.follows": "seurattua",
-  "timeline_hint.resources.statuses": "Vanhemmat julkaisut",
+  "timeline_hint.remote_resource_not_displayed": "Muiden palvelinten {resource} eivät näy tässä.",
+  "timeline_hint.resources.followers": "seuraajat",
+  "timeline_hint.resources.follows": "seuratut",
+  "timeline_hint.resources.statuses": "vanhemmat julkaisut",
   "trends.counter_by_accounts": "{count, plural, one {{counter} henkilö} other {{counter} henkilöä}} {days, plural, one {viime päivänä} other {viimeisenä {days} päivänä}}",
   "trends.trending_now": "Suosittua nyt",
   "ui.beforeunload": "Luonnos häviää, jos poistut Mastodonista.",
diff --git a/app/javascript/mastodon/locales/fo.json b/app/javascript/mastodon/locales/fo.json
index 9f1abebad9f21c..39070514683c44 100644
--- a/app/javascript/mastodon/locales/fo.json
+++ b/app/javascript/mastodon/locales/fo.json
@@ -300,8 +300,6 @@
   "filter_modal.select_filter.subtitle": "Brúka ein verandi bólk ella skapa ein nýggjan",
   "filter_modal.select_filter.title": "Filtrera hendan postin",
   "filter_modal.title.status": "Filtrera ein post",
-  "filtered_notifications_banner.mentions": "{count, plural, one {umrøða} other {umrøður}}",
-  "filtered_notifications_banner.pending_requests": "Fráboðanir frá {count, plural, =0 {ongum} one {einum persóni} other {# persónum}}, sum tú kanska kennir",
   "filtered_notifications_banner.title": "Sáldaðar fráboðanir",
   "firehose.all": "Allar",
   "firehose.local": "Hesin ambætarin",
diff --git a/app/javascript/mastodon/locales/fr-CA.json b/app/javascript/mastodon/locales/fr-CA.json
index b4e519303c757b..ad442df778ef5d 100644
--- a/app/javascript/mastodon/locales/fr-CA.json
+++ b/app/javascript/mastodon/locales/fr-CA.json
@@ -297,7 +297,6 @@
   "filter_modal.select_filter.subtitle": "Utilisez une catégorie existante ou en créer une nouvelle",
   "filter_modal.select_filter.title": "Filtrer cette publication",
   "filter_modal.title.status": "Filtrer une publication",
-  "filtered_notifications_banner.pending_requests": "Notifications {count, plural, =0 {de personne} one {d’une personne} other {de # personnes}} que vous pouvez connaitre",
   "filtered_notifications_banner.title": "Notifications filtrées",
   "firehose.all": "Tout",
   "firehose.local": "Ce serveur",
diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json
index 8aeb59f79f908a..b849ab8f87aadb 100644
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@@ -297,7 +297,6 @@
   "filter_modal.select_filter.subtitle": "Utilisez une catégorie existante ou en créer une nouvelle",
   "filter_modal.select_filter.title": "Filtrer ce message",
   "filter_modal.title.status": "Filtrer un message",
-  "filtered_notifications_banner.pending_requests": "Notifications {count, plural, =0 {de personne} one {d’une personne} other {de # personnes}} que vous pouvez connaitre",
   "filtered_notifications_banner.title": "Notifications filtrées",
   "firehose.all": "Tout",
   "firehose.local": "Ce serveur",
diff --git a/app/javascript/mastodon/locales/fy.json b/app/javascript/mastodon/locales/fy.json
index 093298f156fda1..3045def0282154 100644
--- a/app/javascript/mastodon/locales/fy.json
+++ b/app/javascript/mastodon/locales/fy.json
@@ -290,8 +290,6 @@
   "filter_modal.select_filter.subtitle": "In besteande kategory brûke of in nije oanmeitsje",
   "filter_modal.select_filter.title": "Dit berjocht filterje",
   "filter_modal.title.status": "In berjocht filterje",
-  "filtered_notifications_banner.mentions": "{count, plural, one {fermelding} other {fermeldingen}}",
-  "filtered_notifications_banner.pending_requests": "Meldingen fan {count, plural, =0 {net ien} one {ien persoan} other {# minsken}} dy’t jo miskien kenne",
   "filtered_notifications_banner.title": "Filtere meldingen",
   "firehose.all": "Alles",
   "firehose.local": "Dizze server",
diff --git a/app/javascript/mastodon/locales/ga.json b/app/javascript/mastodon/locales/ga.json
index 9f5f8c773f18fe..3880ab0daaf750 100644
--- a/app/javascript/mastodon/locales/ga.json
+++ b/app/javascript/mastodon/locales/ga.json
@@ -300,8 +300,6 @@
   "filter_modal.select_filter.subtitle": "Bain úsáid as catagóir reatha nó cruthaigh ceann nua",
   "filter_modal.select_filter.title": "Déan scagadh ar an bpostáil seo",
   "filter_modal.title.status": "Déan scagadh ar phostáil",
-  "filtered_notifications_banner.mentions": "{count, plural, one {tagairt} other {tagairtí}}",
-  "filtered_notifications_banner.pending_requests": "Fógraí ó {count, plural, =0 {duine ar bith} one {duine amháin} two {# daoine} few {# daoine} many {# daoine} other {# daoine}} b'fhéidir go mbeadh a fhios agat",
   "filtered_notifications_banner.title": "Fógraí scagtha",
   "firehose.all": "Gach",
   "firehose.local": "An freastalaí seo",
diff --git a/app/javascript/mastodon/locales/gd.json b/app/javascript/mastodon/locales/gd.json
index a4db1093483758..846c96b2d6ae0d 100644
--- a/app/javascript/mastodon/locales/gd.json
+++ b/app/javascript/mastodon/locales/gd.json
@@ -290,8 +290,6 @@
   "filter_modal.select_filter.subtitle": "Cleachd roinn-seòrsa a tha ann no cruthaich tè ùr",
   "filter_modal.select_filter.title": "Criathraich am post seo",
   "filter_modal.title.status": "Criathraich post",
-  "filtered_notifications_banner.mentions": "{count, plural, one {iomradh} two {iomradh} few {iomraidhean} other {iomradh}}",
-  "filtered_notifications_banner.pending_requests": "{count, plural, =0 {Chan eil brath ann o dhaoine} one {Tha brathan ann o # neach} two {Tha brathan ann o # neach} few {Tha brathan ann o # daoine} other {Tha brathan ann o # duine}} air a bheil thu eòlach ’s dòcha",
   "filtered_notifications_banner.title": "Brathan criathraichte",
   "firehose.all": "Na h-uile",
   "firehose.local": "Am frithealaiche seo",
diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json
index a60fa915047c4a..ddbf6fa273c0eb 100644
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@@ -300,8 +300,7 @@
   "filter_modal.select_filter.subtitle": "Usar unha categoría existente ou crear unha nova",
   "filter_modal.select_filter.title": "Filtrar esta publicación",
   "filter_modal.title.status": "Filtrar unha publicación",
-  "filtered_notifications_banner.mentions": "{count, plural, one {mención} other {mencións}}",
-  "filtered_notifications_banner.pending_requests": "Notificacións de {count, plural, =0 {ninguén} one {unha persoa} other {# persoas}} que poderías coñecer",
+  "filtered_notifications_banner.pending_requests": "De {count, plural, =0 {ninguén} one {unha persoa} other {# persoas}} que igual coñeces",
   "filtered_notifications_banner.title": "Notificacións filtradas",
   "firehose.all": "Todo",
   "firehose.local": "Este servidor",
diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json
index eedbc35ff5b92f..0734a9b0221984 100644
--- a/app/javascript/mastodon/locales/he.json
+++ b/app/javascript/mastodon/locales/he.json
@@ -300,8 +300,7 @@
   "filter_modal.select_filter.subtitle": "שימוש בקטגורייה קיימת או יצירת אחת חדשה",
   "filter_modal.select_filter.title": "סינון ההודעה הזו",
   "filter_modal.title.status": "סנן הודעה",
-  "filtered_notifications_banner.mentions": "{count, plural, one {איזכור} other {איזכורים} two {איזכוריים}}",
-  "filtered_notifications_banner.pending_requests": "{count, plural,=0 {אין התראות ממשתמשים ה}one {התראה אחת ממישהו/מישהי ה}two {יש התראותיים ממשתמשים }other {יש # התראות ממשתמשים }}מוכרים לך",
+  "filtered_notifications_banner.pending_requests": "{count, plural,=0 {אין בקשות ממשתמשים }one {בקשה אחת ממישהו/מישהי }two {יש בקשותיים ממשתמשים }other {יש # בקשות ממשתמשים }}שאולי מוכרים לך",
   "filtered_notifications_banner.title": "התראות מסוננות",
   "firehose.all": "הכל",
   "firehose.local": "שרת זה",
diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json
index 88eeeff9524535..967efd8d0c6bcc 100644
--- a/app/javascript/mastodon/locales/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@@ -300,8 +300,6 @@
   "filter_modal.select_filter.subtitle": "Válassz egy meglévő kategóriát, vagy hozz létre egy újat",
   "filter_modal.select_filter.title": "E bejegyzés szűrése",
   "filter_modal.title.status": "Egy bejegyzés szűrése",
-  "filtered_notifications_banner.mentions": "{count, plural, one {említés} other {említés}}",
-  "filtered_notifications_banner.pending_requests": "Értesítések {count, plural, =0 {nincsenek} one {egy valósztínűleg ismerős személytől} other {# valószínűleg ismerős személytől}}",
   "filtered_notifications_banner.title": "Szűrt értesítések",
   "firehose.all": "Összes",
   "firehose.local": "Ez a kiszolgáló",
diff --git a/app/javascript/mastodon/locales/ia.json b/app/javascript/mastodon/locales/ia.json
index f8253865aead0d..60838c3a5dd697 100644
--- a/app/javascript/mastodon/locales/ia.json
+++ b/app/javascript/mastodon/locales/ia.json
@@ -298,8 +298,6 @@
   "filter_modal.select_filter.subtitle": "Usa un categoria existente o crea un nove",
   "filter_modal.select_filter.title": "Filtrar iste message",
   "filter_modal.title.status": "Filtrar un message",
-  "filtered_notifications_banner.mentions": "{count, plural, one {mention} other {mentiones}}",
-  "filtered_notifications_banner.pending_requests": "Notificationes ab {count, plural, =0 {nemo} one {un persona} other {# personas}} tu poterea cognoscer",
   "filtered_notifications_banner.title": "Notificationes filtrate",
   "firehose.all": "Toto",
   "firehose.local": "Iste servitor",
diff --git a/app/javascript/mastodon/locales/ie.json b/app/javascript/mastodon/locales/ie.json
index d672b042219e48..27519b4776b050 100644
--- a/app/javascript/mastodon/locales/ie.json
+++ b/app/javascript/mastodon/locales/ie.json
@@ -290,8 +290,6 @@
   "filter_modal.select_filter.subtitle": "Usar un existent categorie o crear nov",
   "filter_modal.select_filter.title": "Filtrar ti-ci posta",
   "filter_modal.title.status": "Filtrar un posta",
-  "filtered_notifications_banner.mentions": "{count, plural, one {mention} other {mentiones}}",
-  "filtered_notifications_banner.pending_requests": "Notificationes de {count, plural, =0 {nequi} one {un person} other {# persones}} quel tu possibilmen conosse",
   "filtered_notifications_banner.title": "Filtrat notificationes",
   "firehose.all": "Omno",
   "firehose.local": "Ti-ci servitor",
diff --git a/app/javascript/mastodon/locales/is.json b/app/javascript/mastodon/locales/is.json
index f145817c52a7a6..99d2d98fafac56 100644
--- a/app/javascript/mastodon/locales/is.json
+++ b/app/javascript/mastodon/locales/is.json
@@ -300,8 +300,7 @@
   "filter_modal.select_filter.subtitle": "Notaðu fyrirliggjandi flokk eða útbúðu nýjan",
   "filter_modal.select_filter.title": "Sía þessa færslu",
   "filter_modal.title.status": "Sía færslu",
-  "filtered_notifications_banner.mentions": "{count, plural, one {tilvísun} other {tilvísanir}}",
-  "filtered_notifications_banner.pending_requests": "Tilkynningar frá {count, plural, =0 {engum} one {einum aðila} other {# aðilum}} sem þú gætir þekkt",
+  "filtered_notifications_banner.pending_requests": "Frá {count, plural, =0 {engum} one {einum aðila} other {# manns}} sem þú gætir þekkt",
   "filtered_notifications_banner.title": "Síaðar tilkynningar",
   "firehose.all": "Allt",
   "firehose.local": "þessum netþjóni",
diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json
index 6e37961e12516d..b3194e6a109d35 100644
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@@ -300,8 +300,7 @@
   "filter_modal.select_filter.subtitle": "Usa una categoria esistente o creane una nuova",
   "filter_modal.select_filter.title": "Filtra questo post",
   "filter_modal.title.status": "Filtra un post",
-  "filtered_notifications_banner.mentions": "{count, plural, one {menzione} other {menzioni}}",
-  "filtered_notifications_banner.pending_requests": "Notifiche da {count, plural, =0 {nessuno} one {una persona} other {# persone}} che potresti conoscere",
+  "filtered_notifications_banner.pending_requests": "Da {count, plural, =0 {nessuno} one {una persona} other {# persone}} che potresti conoscere",
   "filtered_notifications_banner.title": "Notifiche filtrate",
   "firehose.all": "Tutto",
   "firehose.local": "Questo server",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index a5b2c5b4d94f45..77a501843075fa 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -293,8 +293,6 @@
   "filter_modal.select_filter.subtitle": "既存のカテゴリーを使用するか新規作成します",
   "filter_modal.select_filter.title": "この投稿をフィルターする",
   "filter_modal.title.status": "投稿をフィルターする",
-  "filtered_notifications_banner.mentions": "{count, plural, one {メンション} other {メンション}}",
-  "filtered_notifications_banner.pending_requests": "{count, plural, =0 {通知がブロックされているアカウントはありません} other {#アカウントからの通知がブロックされています}}",
   "filtered_notifications_banner.title": "保留中の通知",
   "firehose.all": "すべて",
   "firehose.local": "このサーバー",
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index c36ba0c6476331..4f70e3bcf24d8f 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -171,21 +171,28 @@
   "confirmations.block.confirm": "차단",
   "confirmations.delete.confirm": "삭제",
   "confirmations.delete.message": "정말로 이 게시물을 삭제하시겠습니까?",
+  "confirmations.delete.title": "게시물을 삭제할까요?",
   "confirmations.delete_list.confirm": "삭제",
   "confirmations.delete_list.message": "정말로 이 리스트를 영구적으로 삭제하시겠습니까?",
+  "confirmations.delete_list.title": "리스트를 삭제할까요?",
   "confirmations.discard_edit_media.confirm": "저장 안함",
   "confirmations.discard_edit_media.message": "미디어 설명이나 미리보기에 대한 저장하지 않은 변경사항이 있습니다. 버리시겠습니까?",
   "confirmations.edit.confirm": "수정",
   "confirmations.edit.message": "지금 편집하면 작성 중인 메시지를 덮어씁니다. 진행이 확실한가요?",
+  "confirmations.edit.title": "게시물을 덮어쓸까요?",
   "confirmations.logout.confirm": "로그아웃",
   "confirmations.logout.message": "정말로 로그아웃 하시겠습니까?",
+  "confirmations.logout.title": "로그아웃 할까요?",
   "confirmations.mute.confirm": "뮤트",
   "confirmations.redraft.confirm": "삭제하고 다시 쓰기",
   "confirmations.redraft.message": "정말로 이 게시물을 삭제하고 다시 쓰시겠습니까? 해당 게시물에 대한 부스트와 좋아요를 잃게 되고 원본에 대한 답장은 연결 되지 않습니다.",
+  "confirmations.redraft.title": "삭제하고 다시 작성할까요?",
   "confirmations.reply.confirm": "답글",
   "confirmations.reply.message": "지금 답장하면 작성 중인 메시지를 덮어쓰게 됩니다. 정말 진행합니까?",
+  "confirmations.reply.title": "게시물을 덮어쓸까요?",
   "confirmations.unfollow.confirm": "팔로우 해제",
   "confirmations.unfollow.message": "정말로 {name} 님을 팔로우 해제하시겠습니까?",
+  "confirmations.unfollow.title": "사용자를 언팔로우 할까요?",
   "conversation.delete": "대화 삭제",
   "conversation.mark_as_read": "읽은 상태로 표시",
   "conversation.open": "대화 보기",
@@ -293,8 +300,6 @@
   "filter_modal.select_filter.subtitle": "기존의 카테고리를 사용하거나 새로 하나를 만듧니다",
   "filter_modal.select_filter.title": "이 게시물을 필터",
   "filter_modal.title.status": "게시물 필터",
-  "filtered_notifications_banner.mentions": "{count, plural, other {멘션}}",
-  "filtered_notifications_banner.pending_requests": "알 수도 있는 {count, plural, =0 {0 명} one {한 명} other {# 명}}의 사람들로부터의 알림",
   "filtered_notifications_banner.title": "걸러진 알림",
   "firehose.all": "모두",
   "firehose.local": "이 서버",
@@ -495,6 +500,7 @@
   "notification_requests.title": "걸러진 알림",
   "notifications.clear": "알림 비우기",
   "notifications.clear_confirmation": "정말로 알림을 삭제하시겠습니까?",
+  "notifications.clear_title": "알림을 모두 지울까요?",
   "notifications.column_settings.admin.report": "새 신고:",
   "notifications.column_settings.admin.sign_up": "새로운 가입:",
   "notifications.column_settings.alert": "데스크탑 알림",
diff --git a/app/javascript/mastodon/locales/la.json b/app/javascript/mastodon/locales/la.json
index e35e7112bea950..1e2d54396aa832 100644
--- a/app/javascript/mastodon/locales/la.json
+++ b/app/javascript/mastodon/locales/la.json
@@ -82,7 +82,6 @@
   "empty_column.notification_requests": "Omnia clara sunt! Nihil hic est. Cum novās notificātiōnēs accipīs, hic secundum tua praecepta apparebunt.",
   "empty_column.notifications": "Nōn adhūc habēs ullo notificātiōnēs. Cum aliī tē interagunt, hīc videbis.",
   "explore.trending_statuses": "Contributa",
-  "filtered_notifications_banner.mentions": "{count, plural, one {mentiō} other {mentiōnēs}}",
   "firehose.all": "Omnis",
   "footer.about": "De",
   "generic.saved": "Servavit",
diff --git a/app/javascript/mastodon/locales/lad.json b/app/javascript/mastodon/locales/lad.json
index bbbcee886f89fa..96ca615e211e5c 100644
--- a/app/javascript/mastodon/locales/lad.json
+++ b/app/javascript/mastodon/locales/lad.json
@@ -278,7 +278,6 @@
   "filter_modal.select_filter.subtitle": "Kulanea una kategoria egzistente o kriya mueva",
   "filter_modal.select_filter.title": "Filtra esta publikasyon",
   "filter_modal.title.status": "Filtra una publikasyon",
-  "filtered_notifications_banner.pending_requests": "Avizos de {count, plural, =0 {dingun} one {una persona} other {# personas}} ke puedes koneser",
   "filtered_notifications_banner.title": "Avizos filtrados",
   "firehose.all": "Todo",
   "firehose.local": "Este sirvidor",
diff --git a/app/javascript/mastodon/locales/lt.json b/app/javascript/mastodon/locales/lt.json
index 04d2c3c8e471c2..2d3626ff9aad20 100644
--- a/app/javascript/mastodon/locales/lt.json
+++ b/app/javascript/mastodon/locales/lt.json
@@ -300,8 +300,6 @@
   "filter_modal.select_filter.subtitle": "Naudok esamą kategoriją arba sukurk naują.",
   "filter_modal.select_filter.title": "Filtruoti šį įrašą",
   "filter_modal.title.status": "Filtruoti įrašą",
-  "filtered_notifications_banner.mentions": "{count, plural, one {paminėjimas} few {paminėjimai} many {paminėjimo} other {paminėjimų}}",
-  "filtered_notifications_banner.pending_requests": "Pranešimai iš {count, plural, =0 {nė vieno} one {vienos žmogaus} few {# žmonių} many {# žmonių} other {# žmonių}}, kuriuos galbūt pažįsti",
   "filtered_notifications_banner.title": "Filtruojami pranešimai",
   "firehose.all": "Visi",
   "firehose.local": "Šis serveris",
diff --git a/app/javascript/mastodon/locales/lv.json b/app/javascript/mastodon/locales/lv.json
index 42079f222f4bf2..86ed6262a933f4 100644
--- a/app/javascript/mastodon/locales/lv.json
+++ b/app/javascript/mastodon/locales/lv.json
@@ -268,7 +268,6 @@
   "filter_modal.select_filter.subtitle": "Izmanto esošu kategoriju vai izveido jaunu",
   "filter_modal.select_filter.title": "Filtrēt šo ziņu",
   "filter_modal.title.status": "Filtrēt ziņu",
-  "filtered_notifications_banner.pending_requests": "Paziņojumi no {count, plural, =0 {neviena} one {viena cilvēka} other {# cilvēkiem}}, ko Tu varētu zināt",
   "firehose.all": "Visi",
   "firehose.local": "Šis serveris",
   "firehose.remote": "Citi serveri",
diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json
index 100396456d7735..803070a094129e 100644
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@@ -300,8 +300,7 @@
   "filter_modal.select_filter.subtitle": "Een bestaande categorie gebruiken of een nieuwe aanmaken",
   "filter_modal.select_filter.title": "Dit bericht filteren",
   "filter_modal.title.status": "Een bericht filteren",
-  "filtered_notifications_banner.mentions": "{count, plural, one {vermelding} other {vermeldingen}}",
-  "filtered_notifications_banner.pending_requests": "Meldingen van {count, plural, =0 {niemand} one {één persoon} other {# mensen}} die je misschien kent",
+  "filtered_notifications_banner.pending_requests": "Van {count, plural, =0 {niemand} one {een persoon} other {# personen}} die je mogelijk kent",
   "filtered_notifications_banner.title": "Gefilterde meldingen",
   "firehose.all": "Alles",
   "firehose.local": "Deze server",
diff --git a/app/javascript/mastodon/locales/nn.json b/app/javascript/mastodon/locales/nn.json
index 66c85e64a8b260..26973f830f0094 100644
--- a/app/javascript/mastodon/locales/nn.json
+++ b/app/javascript/mastodon/locales/nn.json
@@ -293,8 +293,7 @@
   "filter_modal.select_filter.subtitle": "Bruk ein eksisterande kategori eller opprett ein ny",
   "filter_modal.select_filter.title": "Filtrer dette innlegget",
   "filter_modal.title.status": "Filtrer eit innlegg",
-  "filtered_notifications_banner.mentions": "{count, plural, one {omtale} other {omtaler}}",
-  "filtered_notifications_banner.pending_requests": "Varsel frå {count, plural, =0 {ingen} one {ein person} other {# folk}} du kanskje kjenner",
+  "filtered_notifications_banner.pending_requests": "Frå {count, plural, =0 {ingen} one {éin person} other {# personar}} du kanskje kjenner",
   "filtered_notifications_banner.title": "Filtrerte varslingar",
   "firehose.all": "Alle",
   "firehose.local": "Denne tenaren",
diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json
index 5f8467f23c2bce..efd2d2c156efc7 100644
--- a/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@@ -300,8 +300,7 @@
   "filter_modal.select_filter.subtitle": "Użyj istniejącej kategorii lub utwórz nową",
   "filter_modal.select_filter.title": "Filtruj ten wpis",
   "filter_modal.title.status": "Filtruj wpis",
-  "filtered_notifications_banner.mentions": "{count, plural, one {wzmianka} few {wzmianki} other {wzmianek}}",
-  "filtered_notifications_banner.pending_requests": "Powiadomienia od {count, plural, =0 {żadnej osoby którą możesz znać} one {# osoby którą możesz znać} other {# osób które możesz znać}}",
+  "filtered_notifications_banner.pending_requests": "Od {count, plural, =0 {żadnej osoby którą możesz znać} one {# osoby którą możesz znać} other {# osób które możesz znać}}",
   "filtered_notifications_banner.title": "Powiadomienia filtrowane",
   "firehose.all": "Wszystko",
   "firehose.local": "Ten serwer",
diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json
index 072cbf82cbd303..3f831dba250815 100644
--- a/app/javascript/mastodon/locales/pt-BR.json
+++ b/app/javascript/mastodon/locales/pt-BR.json
@@ -297,8 +297,6 @@
   "filter_modal.select_filter.subtitle": "Use uma categoria existente ou crie uma nova",
   "filter_modal.select_filter.title": "Filtrar esta publicação",
   "filter_modal.title.status": "Filtrar uma publicação",
-  "filtered_notifications_banner.mentions": "{count, plural, one {menção} other {menções}}",
-  "filtered_notifications_banner.pending_requests": "Notificações de {count, plural, =0 {no one} one {one person} other {# people}} que você talvez conheça",
   "filtered_notifications_banner.title": "Notificações filtradas",
   "firehose.all": "Tudo",
   "firehose.local": "Este servidor",
diff --git a/app/javascript/mastodon/locales/pt-PT.json b/app/javascript/mastodon/locales/pt-PT.json
index 8cfd373837d420..42b9e7c9ecc5df 100644
--- a/app/javascript/mastodon/locales/pt-PT.json
+++ b/app/javascript/mastodon/locales/pt-PT.json
@@ -300,8 +300,7 @@
   "filter_modal.select_filter.subtitle": "Utilize uma categoria existente ou crie uma nova",
   "filter_modal.select_filter.title": "Filtrar esta publicação",
   "filter_modal.title.status": "Filtrar uma publicação",
-  "filtered_notifications_banner.mentions": "{count, plural, one {menção} other {menções}}",
-  "filtered_notifications_banner.pending_requests": "Notificações de {count, plural, =0 {ninguém} one {uma pessoa} other {# pessoas}} que talvez conheça",
+  "filtered_notifications_banner.pending_requests": "De {count, plural, =0 {ninguém} one {uma pessoa} other {# pessoas}} que pode conhecer",
   "filtered_notifications_banner.title": "Notificações filtradas",
   "firehose.all": "Todas",
   "firehose.local": "Este servidor",
diff --git a/app/javascript/mastodon/locales/ru.json b/app/javascript/mastodon/locales/ru.json
index 09155654421e01..61395c17abef62 100644
--- a/app/javascript/mastodon/locales/ru.json
+++ b/app/javascript/mastodon/locales/ru.json
@@ -290,8 +290,6 @@
   "filter_modal.select_filter.subtitle": "Используйте существующую категорию или создайте новую",
   "filter_modal.select_filter.title": "Фильтровать этот пост",
   "filter_modal.title.status": "Фильтровать пост",
-  "filtered_notifications_banner.mentions": "{count, plural, one {упоминание} other {упоминания}}",
-  "filtered_notifications_banner.pending_requests": "Уведомления от {count, plural, =0 {никого} one {# человека} other {# других людей, с кем вы можете быть знакомы}}",
   "filtered_notifications_banner.title": "Отфильтрованные уведомления",
   "firehose.all": "Все",
   "firehose.local": "Текущий сервер",
diff --git a/app/javascript/mastodon/locales/sc.json b/app/javascript/mastodon/locales/sc.json
index 0bba96e74bcc31..050e1e6faefd9c 100644
--- a/app/javascript/mastodon/locales/sc.json
+++ b/app/javascript/mastodon/locales/sc.json
@@ -241,8 +241,6 @@
   "filter_modal.select_filter.subtitle": "Imprea una categoria chi esistit giai o crea·nde una",
   "filter_modal.select_filter.title": "Filtra custa publicatzione",
   "filter_modal.title.status": "Filtra una publicatzione",
-  "filtered_notifications_banner.mentions": "{count, plural, one {mèntovu} other {mèntovos}}",
-  "filtered_notifications_banner.pending_requests": "Notìficas dae {count, plural, =0 {nemos} one {una persone} other {# persones}} chi connosches",
   "filtered_notifications_banner.title": "Notìficas filtradas",
   "firehose.all": "Totus",
   "firehose.local": "Custu serbidore",
diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json
index e10d423a0fa8f1..2127ab2efbf96f 100644
--- a/app/javascript/mastodon/locales/sk.json
+++ b/app/javascript/mastodon/locales/sk.json
@@ -285,7 +285,6 @@
   "filter_modal.select_filter.subtitle": "Použite existujúcu kategóriu alebo vytvorte novú",
   "filter_modal.select_filter.title": "Filtrovanie tohto príspevku",
   "filter_modal.title.status": "Filtrovanie príspevku",
-  "filtered_notifications_banner.pending_requests": "Oboznámenia od {count, plural, =0 {nikoho} one {jedného človeka} other {# ľudí}} čo môžeš poznať",
   "filtered_notifications_banner.title": "Filtrované oznámenia",
   "firehose.all": "Všetko",
   "firehose.local": "Tento server",
diff --git a/app/javascript/mastodon/locales/sl.json b/app/javascript/mastodon/locales/sl.json
index 4109dfee85f247..77bd899ad8cfbb 100644
--- a/app/javascript/mastodon/locales/sl.json
+++ b/app/javascript/mastodon/locales/sl.json
@@ -293,8 +293,6 @@
   "filter_modal.select_filter.subtitle": "Uporabite obstoječo kategorijo ali ustvarite novo",
   "filter_modal.select_filter.title": "Filtriraj to objavo",
   "filter_modal.title.status": "Filtrirajte objavo",
-  "filtered_notifications_banner.mentions": "{count, plural, one {omemba} two {omembi} few {omembe} other {omemb}}",
-  "filtered_notifications_banner.pending_requests": "Obvestila od {count, plural, =0 {nikogar, ki bi ga} one {# človeka, ki bi ga} two {# ljudi, ki bi ju} few {# ljudi, ki bi jih} other {# ljudi, ki bi jih}} lahko poznali",
   "filtered_notifications_banner.title": "Filtrirana obvestila",
   "firehose.all": "Vse",
   "firehose.local": "Ta strežnik",
diff --git a/app/javascript/mastodon/locales/sq.json b/app/javascript/mastodon/locales/sq.json
index 279bc097155a6d..a9a98e239da0e9 100644
--- a/app/javascript/mastodon/locales/sq.json
+++ b/app/javascript/mastodon/locales/sq.json
@@ -300,8 +300,6 @@
   "filter_modal.select_filter.subtitle": "Përdorni një kategori ekzistuese, ose krijoni një të re",
   "filter_modal.select_filter.title": "Filtroje këtë postim",
   "filter_modal.title.status": "Filtroni një postim",
-  "filtered_notifications_banner.mentions": "{count, plural, one {përmendje} other {përmendje}}",
-  "filtered_notifications_banner.pending_requests": "Njoftime prej {count, plural, =0 {askujt} one {një personi} other {# vetësh}} që mund të njihni",
   "filtered_notifications_banner.title": "Njoftime të filtruar",
   "firehose.all": "Krejt",
   "firehose.local": "Këtë shërbyes",
diff --git a/app/javascript/mastodon/locales/sr-Latn.json b/app/javascript/mastodon/locales/sr-Latn.json
index 3167f4a815921f..a58376af041f5b 100644
--- a/app/javascript/mastodon/locales/sr-Latn.json
+++ b/app/javascript/mastodon/locales/sr-Latn.json
@@ -293,8 +293,6 @@
   "filter_modal.select_filter.subtitle": "Koristite postojeću kategoriju ili kreirajte novu",
   "filter_modal.select_filter.title": "Filtriraj ovu objavu",
   "filter_modal.title.status": "Filtriraj objavu",
-  "filtered_notifications_banner.mentions": "{count, plural, one {pominjanje} few {pominjanja} other {pominjanja}}",
-  "filtered_notifications_banner.pending_requests": "Obaveštenja od {count, plural, =0 {nikoga koga možda poznajete} one {# osobe koju možda poznajete} few {# osobe koje možda poznajete} other {# osoba koje možda poznajete}}",
   "filtered_notifications_banner.title": "Filtrirana obaveštenja",
   "firehose.all": "Sve",
   "firehose.local": "Ovaj server",
diff --git a/app/javascript/mastodon/locales/sr.json b/app/javascript/mastodon/locales/sr.json
index 8729fa59dd1c83..2c9948299da665 100644
--- a/app/javascript/mastodon/locales/sr.json
+++ b/app/javascript/mastodon/locales/sr.json
@@ -293,8 +293,6 @@
   "filter_modal.select_filter.subtitle": "Користите постојећу категорију или креирајте нову",
   "filter_modal.select_filter.title": "Филтрирај ову објаву",
   "filter_modal.title.status": "Филтрирај објаву",
-  "filtered_notifications_banner.mentions": "{count, plural, one {помињање} few {помињања} other {помињања}}",
-  "filtered_notifications_banner.pending_requests": "Обавештења од {count, plural, =0 {никога кога можда познајете} one {# особе коју можда познајете} few {# особе које можда познајете} other {# особа које можда познајете}}",
   "filtered_notifications_banner.title": "Филтрирана обавештења",
   "firehose.all": "Све",
   "firehose.local": "Овај сервер",
diff --git a/app/javascript/mastodon/locales/sv.json b/app/javascript/mastodon/locales/sv.json
index 096de0f42edd80..b3f70cf2ede5fc 100644
--- a/app/javascript/mastodon/locales/sv.json
+++ b/app/javascript/mastodon/locales/sv.json
@@ -300,8 +300,6 @@
   "filter_modal.select_filter.subtitle": "Använd en befintlig kategori eller skapa en ny",
   "filter_modal.select_filter.title": "Filtrera detta inlägg",
   "filter_modal.title.status": "Filtrera ett inlägg",
-  "filtered_notifications_banner.mentions": "{count, plural, one {omnämning} other {omnämnanden}}",
-  "filtered_notifications_banner.pending_requests": "Aviseringar från {count, plural, =0 {ingen} one {en person} other {# personer}} du kanske känner",
   "filtered_notifications_banner.title": "Filtrerade aviseringar",
   "firehose.all": "Allt",
   "firehose.local": "Denna server",
diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json
index 99300b86dbedf2..b4d259f174fb4f 100644
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@@ -300,8 +300,6 @@
   "filter_modal.select_filter.subtitle": "ใช้หมวดหมู่ที่มีอยู่หรือสร้างหมวดหมู่ใหม่",
   "filter_modal.select_filter.title": "กรองโพสต์นี้",
   "filter_modal.title.status": "กรองโพสต์",
-  "filtered_notifications_banner.mentions": "{count, plural, other {การกล่าวถึง}}",
-  "filtered_notifications_banner.pending_requests": "การแจ้งเตือนจาก {count, plural, =0 {ไม่มีใคร} other {# คน}} ที่คุณอาจรู้จัก",
   "filtered_notifications_banner.title": "การแจ้งเตือนที่กรองอยู่",
   "firehose.all": "ทั้งหมด",
   "firehose.local": "เซิร์ฟเวอร์นี้",
diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json
index 1bb22da225a85d..3b8238fe06de3a 100644
--- a/app/javascript/mastodon/locales/tr.json
+++ b/app/javascript/mastodon/locales/tr.json
@@ -300,8 +300,6 @@
   "filter_modal.select_filter.subtitle": "Mevcut bir kategoriyi kullan veya yeni bir tane oluştur",
   "filter_modal.select_filter.title": "Bu gönderiyi süzgeçle",
   "filter_modal.title.status": "Bir gönderi süzgeçle",
-  "filtered_notifications_banner.mentions": "{count, plural, one {bahsetme} other {bahsetme}}",
-  "filtered_notifications_banner.pending_requests": "Bildiğiniz {count, plural, =0 {hiç kimseden} one {bir kişiden} other {# kişiden}} bildirim",
   "filtered_notifications_banner.title": "Filtrelenmiş bildirimler",
   "firehose.all": "Tümü",
   "firehose.local": "Bu sunucu",
diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json
index dd91e0e77a5b1f..9535f1f445f443 100644
--- a/app/javascript/mastodon/locales/uk.json
+++ b/app/javascript/mastodon/locales/uk.json
@@ -300,8 +300,6 @@
   "filter_modal.select_filter.subtitle": "Використати наявну категорію або створити нову",
   "filter_modal.select_filter.title": "Фільтрувати цей допис",
   "filter_modal.title.status": "Фільтрувати допис",
-  "filtered_notifications_banner.mentions": "{count, plural, one {mention} other {mentions}}",
-  "filtered_notifications_banner.pending_requests": "Сповіщення від {count, plural, =0 {жодної особи} one {однієї особи} few {# осіб} many {# осіб} other {# особи}}, котрих ви можете знати",
   "filtered_notifications_banner.title": "Відфільтровані сповіщення",
   "firehose.all": "Всі",
   "firehose.local": "Цей сервер",
diff --git a/app/javascript/mastodon/locales/vi.json b/app/javascript/mastodon/locales/vi.json
index 30016754988f10..a3cec8185db19d 100644
--- a/app/javascript/mastodon/locales/vi.json
+++ b/app/javascript/mastodon/locales/vi.json
@@ -300,8 +300,7 @@
   "filter_modal.select_filter.subtitle": "Sử dụng một danh mục hiện có hoặc tạo một danh mục mới",
   "filter_modal.select_filter.title": "Lọc tút này",
   "filter_modal.title.status": "Lọc một tút",
-  "filtered_notifications_banner.mentions": "{count, plural, other {lượt nhắc}}",
-  "filtered_notifications_banner.pending_requests": "Thông báo từ {count, plural, =0 {không ai} other {# người}} bạn có thể biết",
+  "filtered_notifications_banner.pending_requests": "Từ {count, plural, =0 {không ai} other {# người}} bạn có thể biết",
   "filtered_notifications_banner.title": "Thông báo đã lọc",
   "firehose.all": "Toàn bộ",
   "firehose.local": "Máy chủ này",
diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json
index 6e6d6d5d373384..1095502fb9b7f0 100644
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@@ -300,8 +300,7 @@
   "filter_modal.select_filter.subtitle": "使用一个已存在类别，或创建一个新类别",
   "filter_modal.select_filter.title": "过滤此嘟文",
   "filter_modal.title.status": "过滤一条嘟文",
-  "filtered_notifications_banner.mentions": "{count, plural, other {提及}}",
-  "filtered_notifications_banner.pending_requests": "来自你可能认识的 {count, plural, =0 {0 个人} other {# 个人}}的通知",
+  "filtered_notifications_banner.pending_requests": "来自你可能认识的 {count, plural, =0 {0 个人} other {# 个人}}",
   "filtered_notifications_banner.title": "通知（已过滤）",
   "firehose.all": "全部",
   "firehose.local": "此服务器",
diff --git a/app/javascript/mastodon/locales/zh-HK.json b/app/javascript/mastodon/locales/zh-HK.json
index 58a3a339993e6d..f5a7c31a217365 100644
--- a/app/javascript/mastodon/locales/zh-HK.json
+++ b/app/javascript/mastodon/locales/zh-HK.json
@@ -290,8 +290,6 @@
   "filter_modal.select_filter.subtitle": "使用既有類別，或創建一個新類別",
   "filter_modal.select_filter.title": "過濾此帖文",
   "filter_modal.title.status": "過濾一則帖文",
-  "filtered_notifications_banner.mentions": "{count, plural, one {則提及} other {則提及}}",
-  "filtered_notifications_banner.pending_requests": "來自 {count, plural, =0 {0 位} other {# 位}}你可能認識的人的通知",
   "filtered_notifications_banner.title": "已過濾之通知",
   "firehose.all": "全部",
   "firehose.local": "本伺服器",
diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json
index 4cdf640fe101ee..bd4f89169f5ff1 100644
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@@ -300,8 +300,7 @@
   "filter_modal.select_filter.subtitle": "使用既有的類別或是新增",
   "filter_modal.select_filter.title": "過濾此嘟文",
   "filter_modal.title.status": "過濾一則嘟文",
-  "filtered_notifications_banner.mentions": "{count, plural, other {# 則提及}}",
-  "filtered_notifications_banner.pending_requests": "來自您可能認識的 {count, plural, =0 {0 人} other {# 人}} 之通知",
+  "filtered_notifications_banner.pending_requests": "來自您可能認識的 {count, plural, =0 {0 人} other {# 人}}",
   "filtered_notifications_banner.title": "已過濾之通知",
   "firehose.all": "全部",
   "firehose.local": "本站",
diff --git a/config/locales/activerecord.fi.yml b/config/locales/activerecord.fi.yml
index b731de6d3c0685..9da69b7dbd0f8b 100644
--- a/config/locales/activerecord.fi.yml
+++ b/config/locales/activerecord.fi.yml
@@ -40,15 +40,15 @@ fi:
         user:
           attributes:
             email:
-              blocked: käyttää kiellettyä sähköpostipalvelun tarjoajaa
+              blocked: käyttää kiellettyä sähköpostipalveluntarjoajaa
               unreachable: ei näytä olevan olemassa
             role_id:
               elevated: ei voi olla korkeampi kuin nykyinen roolisi
         user_role:
           attributes:
             permissions_as_keys:
-              dangerous: sisältää oikeuksia, jotka eivät ole turvallisia perusroolille
-              elevated: ei voi sisältää oikeuksia, joita nykyisellä roolillasi ei ole
+              dangerous: sisällytä käyttöoikeuksia, jotka eivät ole turvallisia perusroolille
+              elevated: ei voi sisältää käyttöoikeuksia, joita nykyisellä roolillasi ei ole
               own_role: ei voi muuttaa nykyisellä roolillasi
             position:
               elevated: ei voi olla korkeampi kuin nykyinen roolisi
diff --git a/config/locales/doorkeeper.fi.yml b/config/locales/doorkeeper.fi.yml
index ecd2fab6901acf..ce8aef4a9fc6cb 100644
--- a/config/locales/doorkeeper.fi.yml
+++ b/config/locales/doorkeeper.fi.yml
@@ -31,7 +31,7 @@ fi:
       form:
         error: Hupsis! Tarkista, ettei lomakkeessasi ole virheitä
       help:
-        native_redirect_uri: Käytä %{native_redirect_uri} paikallisiin testeihin
+        native_redirect_uri: Käytä tunnistetta %{native_redirect_uri} paikallisiin testeihin
         redirect_uri: Lisää jokainen URI omalle rivilleen
         scopes: Erota oikeudet välilyönneillä. Jätä kenttä tyhjäksi, jos haluat käyttää oletusoikeuksia.
       index:
@@ -43,7 +43,7 @@ fi:
         new: Uusi sovellus
         scopes: Oikeudet
         show: Näytä
-        title: Omat sovellukset
+        title: Omat sovelluksesi
       new:
         title: Uusi sovellus
       show:
@@ -60,7 +60,7 @@ fi:
       error:
         title: Tapahtui virhe
       new:
-        prompt_html: "%{client_name} pyytää lupaa käyttää tiliäsi. Se on kolmannen osapuolen sovellus. <strong>Jos et luota siihen, älä valtuuta sitä.</strong>"
+        prompt_html: "%{client_name} pyytää oikeutta käyttää tiliäsi. Se on kolmannen osapuolen sovellus. <strong>Jos et luota siihen, älä valtuuta sitä.</strong>"
         review_permissions: Tarkista käyttöoikeudet
         title: Valtuutus vaaditaan
       show:
@@ -75,7 +75,7 @@ fi:
         description_html: Nämä sovellukset voivat käyttää tiliäsi ohjelmointirajapinnan kautta. Jos tässä on sovelluksia, joita et tunnista, tai sovellus toimii väärin, voit peruuttaa sen käyttöoikeuden.
         last_used_at: Käytetty viimeksi %{date}
         never_used: Ei käytetty
-        scopes: Oikeudet
+        scopes: Käyttöoikeudet
         superapp: Sisäinen
         title: Valtuuttamasi sovellukset
     errors:
@@ -130,8 +130,8 @@ fi:
         crypto: Päästä päähän -salaus
         favourites: Suosikit
         filters: Suodattimet
-        follow: Seuraamiset, mykistykset ja estot
-        follows: Seuraa
+        follow: Seuratut, mykistykset ja estot
+        follows: Seuratut
         lists: Listat
         media: Medialiitteet
         mutes: Mykistykset
@@ -169,7 +169,7 @@ fi:
       follow: muokkaa tilin seurantasuhteita
       profile: lue vain tilisi profiilitietoja
       push: vastaanota puskuilmoituksesi
-      read: lue kaikkia tilin tietoja
+      read: lue kaikkia tilisi tietoja
       read:accounts: katso tilien tietoja
       read:blocks: katso estojasi
       read:bookmarks: katso kirjanmerkkejäsi
@@ -187,7 +187,7 @@ fi:
       write:blocks: estä tilejä ja verkkotunnuksia
       write:bookmarks: lisää julkaisuja kirjanmerkkeihin
       write:conversations: mykistä ja poista keskusteluja
-      write:favourites: suosikkijulkaisut
+      write:favourites: lisää julkaisuja suosikkeihin
       write:filters: luo suodattimia
       write:follows: seuraa käyttäjiä
       write:lists: luo listoja
diff --git a/config/locales/doorkeeper.he.yml b/config/locales/doorkeeper.he.yml
index 7a664c486e2b49..16a8fc94cf54d6 100644
--- a/config/locales/doorkeeper.he.yml
+++ b/config/locales/doorkeeper.he.yml
@@ -83,6 +83,7 @@ he:
         access_denied: בעלי המשאב או שרת ההרשאה דחו את הבקשה.
         credential_flow_not_configured: התהליך "Resource Owner Password Credentials" נכשל בשל חוסר בתצורת Doorkeeper.configure.resource_owner_from_credentials.
         invalid_client: הרשאת הלקוח נכשלה עקב לקוח שאינו ידוע, חוסר בהרשאת לקוח או שיטת הרשאה שאינה נתמכת.
+        invalid_code_challenge_method: הצופן חייב להיות בשיטת S256, לא תומכים בבלתי מוצפן.
         invalid_grant: חוזה ההרשאה המצורף אינו חוקי, אינו תקף, מבוטל, או שאינו מתאים לקישורית ההפניה שבשימוש על ידי בקשת ההרשאה, או שהופק על ידי לקוח אחר.
         invalid_redirect_uri: קישורית ההפניה המצורפת אינה חוקית.
         invalid_request:
diff --git a/config/locales/doorkeeper.ko.yml b/config/locales/doorkeeper.ko.yml
index 7ec357bf9fdec4..f35333f1df3859 100644
--- a/config/locales/doorkeeper.ko.yml
+++ b/config/locales/doorkeeper.ko.yml
@@ -83,6 +83,7 @@ ko:
         access_denied: 리소스 소유자 또는 인증 서버가 요청을 거부했습니다.
         credential_flow_not_configured: Doorkeeper.configure.resource_owner_from_credentials의 설정이 되어있지 않아 리소스 소유자 암호 자격증명이 실패하였습니다.
         invalid_client: 클라이언트를 확인할 수 없기 때문에 인증이 실패하였습니다. 클라이언트 자격 증명이 포함되지 않았거나 지원되지 않는 메소드입니다.
+        invalid_code_challenge_method: 코드 챌린지는 S256이어야 합니다. 평문은 지원되지 않습니다.
         invalid_grant: 제공된 권한 부여가 잘못되거나, 만료되었거나, 취소되었거나, 권한 부여 요청에 사용된 리디렉션 URI가 일치하지 않거나, 다른 클라이언트에 지정되었습니다.
         invalid_redirect_uri: 리디렉션 URI가 올바르지 않습니다
         invalid_request:
diff --git a/config/locales/es-MX.yml b/config/locales/es-MX.yml
index f39de2b27b1dfe..1623d110267590 100644
--- a/config/locales/es-MX.yml
+++ b/config/locales/es-MX.yml
@@ -885,7 +885,23 @@ es-MX:
         action: Para más información aquí
         message_html: "<strong>Su almacenamiento no está configurado. Está en riesgo la privacidad de sus usuarios.</strong>"
     tags:
+      moderation:
+        not_trendable: No puede ser tendencia
+        not_usable: No disponible
+        pending_review: Pendientes de revisión
+        review_requested: Revisión solicitada
+        reviewed: Revisada
+        title: Estado
+        trendable: Puede ser tendencia
+        unreviewed: Sin revisar
+        usable: Disponible
+      name: Nombre
+      newest: Más reciente
+      oldest: Menos reciente
+      reset: Reiniciar
       review: Estado de revisión
+      search: Buscar
+      title: Etiquetas
       updated_msg: Hashtags actualizados exitosamente
     title: Administración
     trends:
diff --git a/config/locales/es.yml b/config/locales/es.yml
index fbee73ed2ac05d..9e3689557ac97f 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -885,7 +885,23 @@ es:
         action: Haga clic aquí para obtener más información
         message_html: "<strong>El almacenamiento de su objeto está mal configurado. La privacidad de sus usuarios está en riesgo.</strong>"
     tags:
+      moderation:
+        not_trendable: No puede ser tendencia
+        not_usable: No disponible
+        pending_review: Pendientes de revisión
+        review_requested: Revisión solicitada
+        reviewed: Revisada
+        title: Estado
+        trendable: Puede ser tendencia
+        unreviewed: Sin revisar
+        usable: Disponible
+      name: Nombre
+      newest: Más reciente
+      oldest: Menos reciente
+      reset: Reiniciar
       review: Estado de revisión
+      search: Buscar
+      title: Etiquetas
       updated_msg: Hashtags actualizados exitosamente
     title: Administración
     trends:
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index f3cb791e60d6a2..a9a8f199509097 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -39,16 +39,16 @@ fi:
       by_domain: Verkkotunnus
       change_email:
         changed_msg: Sähköpostiosoitteen vaihto onnistui!
-        current_email: Nykyinen sähköposti
-        label: Vaihda sähköposti
-        new_email: Uusi sähköposti
-        submit: Vaihda sähköposti
+        current_email: Nykyinen sähköpostiosoite
+        label: Vaihda sähköpostiosoite
+        new_email: Uusi sähköpostiosoite
+        submit: Vaihda sähköpostiosoite
         title: Vaihda käyttäjän %{username} sähköposti-osoite
       change_role:
         changed_msg: Roolin vaihto onnistui!
-        label: Vaihda roolia
+        label: Vaihda rooli
         no_role: Ei roolia
-        title: Vaihda käyttäjän %{username} roolia
+        title: Vaihda käyttäjän %{username} rooli
       confirm: Vahvista
       confirmed: Vahvistettu
       confirming: Vahvistetaan
@@ -57,23 +57,23 @@ fi:
       deleted: Poistettu
       demote: Alenna
       destroyed_msg: Käyttäjän %{username} tiedot ovat nyt jonossa poistettavaksi välittömästi
-      disable: Poista käytöstä
+      disable: Jäädytä
       disable_sign_in_token_auth: Poista sähköpostitunnuksella todennus käytöstä
       disable_two_factor_authentication: Poista kaksivaiheinen todennus käytöstä
-      disabled: Poistettu käytöstä
+      disabled: Jäädytetty
       display_name: Näyttönimi
       domain: Verkkotunnus
       edit: Muokkaa
       email: Sähköpostiosoite
-      email_status: Sähköpostin tila
-      enable: Ota käyttöön
+      email_status: Sähköpostiosoitteen tila
+      enable: Kumoa jäädytys
       enable_sign_in_token_auth: Ota sähköpostitunnuksella todennus käyttöön
       enabled: Käytössä
       enabled_msg: Käyttäjän %{username} tilin jäädytys kumottiin onnistuneesti
       followers: Seuraajat
       follows: Seuratut
       header: Otsakekuva
-      inbox_url: Saapuvan postilaatikon osoite
+      inbox_url: Postilaatikon osoite
       invite_request_text: Syitä liittymiseen
       invited_by: Kutsuja
       ip: IP-osoite
@@ -86,21 +86,21 @@ fi:
       login_status: Sisäänkirjautumisen tila
       media_attachments: Medialiitteet
       memorialize: Muuta muistosivuksi
-      memorialized: Muutettu muistotiliksi
-      memorialized_msg: Käyttäjän %{username} tili muutettiin muistotiliksi onnistuneesti
+      memorialized: Muutettu muistosivuksi
+      memorialized_msg: Käyttäjän %{username} tili muutettiin muistosivuksi onnistuneesti
       moderation:
-        active: Aktiivinen
+        active: Aktiiviset
         all: Kaikki
-        disabled: Ei käytössä
-        pending: Odottaa
-        silenced: Rajoitettu
-        suspended: Jäädytetty
+        disabled: Eivät käytössä
+        pending: Odottavat
+        silenced: Rajoitetut
+        suspended: Jäädytetyt
         title: Moderointi
       moderation_notes: Moderointimuistiinpanot
       most_recent_activity: Viimeisin toiminta
-      most_recent_ip: Viimeisin IP
+      most_recent_ip: Viimeisin IP-osoite
       no_account_selected: Tilejä ei muutettu, koska yhtään ei ollut valittuna
-      no_limits_imposed: Rajoituksia ei ole asetettu
+      no_limits_imposed: Ei asetettuja rajoituksia
       no_role_assigned: Roolia ei asetettu
       not_subscribed: Ei tilaaja
       pending: Odottaa tarkastusta
@@ -113,7 +113,7 @@ fi:
       protocol: Protokolla
       public: Julkinen
       push_subscription_expires: PuSH-tilaus vanhenee
-      redownload: Päivitä profiilikuva
+      redownload: Päivitä profiili
       redownloaded_msg: Käyttäjän %{username} profiili päivitettiin alkuperästä onnistuneesti
       reject: Hylkää
       rejected_msg: Käyttäjän %{username} rekisteröitymishakemus hylättiin
@@ -132,7 +132,7 @@ fi:
       resubscribe: Tilaa uudelleen
       role: Rooli
       search: Hae
-      search_same_email_domain: Muut käyttäjät, joilla on sama sähköpostin verkkotunnus
+      search_same_email_domain: Muut käyttäjät, joilla on sama sähköpostiverkkotunnus
       search_same_ip: Muut käyttäjät, joilla on sama IP-osoite
       security: Turvallisuus
       security_measures:
@@ -140,7 +140,7 @@ fi:
         password_and_2fa: Salasana ja kaksivaiheinen todennus
       sensitive: Pakota arkaluonteiseksi
       sensitized: Merkitty arkaluonteiseksi
-      shared_inbox_url: Jaetun saapuvan postilaatikon osoite
+      shared_inbox_url: Jaetun postilaatikon osoite
       show:
         created_reports: Tämän tilin luomat raportit
         targeted_reports: Tästä tilistä tehdyt raportit
@@ -156,7 +156,7 @@ fi:
       title: Tilit
       unblock_email: Kumoa sähköpostiosoitteen esto
       unblocked_email_msg: Käyttäjän %{username} sähköpostiosoitteen esto kumottiin
-      unconfirmed_email: Sähköpostia ei vahvistettu
+      unconfirmed_email: Vahvistamaton sähköpostiosoite
       undo_sensitized: Kumoa pakotus arkaluonteiseksi
       undo_silenced: Kumoa rajoitus
       undo_suspension: Kumoa jäädytys
@@ -174,11 +174,11 @@ fi:
         approve_user: Hyväksy käyttäjä
         assigned_to_self_report: Ota raportti käsiteltäväksi
         change_email_user: Vaihda käyttäjän sähköpostiosoite
-        change_role_user: Vaihda käyttäjän roolia
+        change_role_user: Vaihda käyttäjän rooli
         confirm_user: Vahvista käyttäjä
         create_account_warning: Luo varoitus
         create_announcement: Luo tiedote
-        create_canonical_email_block: Luo sähköpostin esto
+        create_canonical_email_block: Luo sähköpostiosoitteen esto
         create_custom_emoji: Luo mukautettu emoji
         create_domain_allow: Luo verkkotunnuksen salliminen
         create_domain_block: Luo verkkotunnuksen esto
@@ -188,7 +188,7 @@ fi:
         create_user_role: Luo rooli
         demote_user: Alenna käyttäjä
         destroy_announcement: Poista tiedote
-        destroy_canonical_email_block: Poista sähköpostin esto
+        destroy_canonical_email_block: Poista sähköpostiosoitteen esto
         destroy_custom_emoji: Poista mukautettu emoji
         destroy_domain_allow: Poista verkkotunnuksen salliminen
         destroy_domain_block: Poista verkkotunnuksen esto
@@ -202,8 +202,8 @@ fi:
         disable_custom_emoji: Poista mukautettu emoji käytöstä
         disable_sign_in_token_auth_user: Poista sähköpostitunnuksella todennus käytöstä käyttäjältä
         disable_user: Poista tili käytöstä
-        enable_custom_emoji: Ota mukautetut emojit käyttöön
-        enable_sign_in_token_auth_user: Salli käyttäjälle sähköpostitunnuksella todennuksen
+        enable_custom_emoji: Ota mukautettu emoji käyttöön
+        enable_sign_in_token_auth_user: Salli käyttäjälle sähköpostitunnuksella todennus
         enable_user: Ota tili käyttöön
         memorialize_account: Muuta muistotiliksi
         promote_user: Ylennä käyttäjä
@@ -212,7 +212,7 @@ fi:
         remove_avatar_user: Poista profiilikuva
         reopen_report: Avaa raportti uudelleen
         resend_user: Lähetä vahvistusviesti uudelleen
-        reset_password_user: Nollaa salasana
+        reset_password_user: Palauta salasana
         resolve_report: Selvitä raportti
         sensitive_account: Pakota arkaluonteiseksi tiliksi
         silence_account: Rajoita tiliä
@@ -234,11 +234,11 @@ fi:
         approve_user_html: "%{name} hyväksyi käyttäjän %{target} rekisteröitymisen"
         assigned_to_self_report_html: "%{name} otti raportin %{target} käsiteltäväkseen"
         change_email_user_html: "%{name} vaihtoi käyttäjän %{target} sähköpostiosoitteen"
-        change_role_user_html: "%{name} muutti käyttäjän %{target} roolia"
+        change_role_user_html: "%{name} vaihtoi käyttäjän %{target} roolin"
         confirm_user_html: "%{name} vahvisti käyttäjän %{target} sähköpostiosoitteen"
         create_account_warning_html: "%{name} lähetti varoituksen käyttäjälle %{target}"
         create_announcement_html: "%{name} loi uuden tiedotteen %{target}"
-        create_canonical_email_block_html: "%{name} esti sähköpostiosoitteen tiivisteellä %{target}"
+        create_canonical_email_block_html: "%{name} esti tiivistettä %{target} vastaavan sähköpostiosoitteen"
         create_custom_emoji_html: "%{name} lähetti uuden emojin %{target}"
         create_domain_allow_html: "%{name} salli federoinnin verkkotunnuksen %{target} kanssa"
         create_domain_block_html: "%{name} esti verkkotunnuksen %{target}"
@@ -248,7 +248,7 @@ fi:
         create_user_role_html: "%{name} loi roolin %{target}"
         demote_user_html: "%{name} alensi käyttäjän %{target}"
         destroy_announcement_html: "%{name} poisti tiedotteen %{target}"
-        destroy_canonical_email_block_html: "%{name} kumosi sähköpostiosoitteen eston tiivisteellä %{target}"
+        destroy_canonical_email_block_html: "%{name} kumosi eston tiivistettä %{target} vastaavalta sähköpostiosoitteelta"
         destroy_custom_emoji_html: "%{name} poisti emojin %{target}"
         destroy_domain_allow_html: "%{name} kielsi federoinnin verkkotunnuksen %{target} kanssa"
         destroy_domain_block_html: "%{name} kumosi verkkotunnuksen %{target} eston"
@@ -280,12 +280,12 @@ fi:
         unassigned_report_html: "%{name} poisti raportin %{target} käsittelystä"
         unblock_email_account_html: "%{name} kumosi käyttäjän %{target} sähköpostiosoitteen eston"
         unsensitive_account_html: "%{name} kumosi käyttäjän %{target} median arkaluonteisuusmerkinnän"
-        unsilence_account_html: "%{name} kumosi käyttäjän %{target} rajoituksen"
+        unsilence_account_html: "%{name} kumosi käyttäjän %{target} tilin rajoituksen"
         unsuspend_account_html: "%{name} kumosi käyttäjän %{target} tilin jäädytyksen"
         update_announcement_html: "%{name} päivitti tiedotteen %{target}"
         update_custom_emoji_html: "%{name} päivitti emojin %{target}"
         update_domain_block_html: "%{name} päivitti verkkotunnuksen %{target} eston"
-        update_ip_block_html: "%{name} muutti sääntöä IP-osoitteelle %{target}"
+        update_ip_block_html: "%{name} muutti IP-osoitteen %{target} sääntöä"
         update_report_html: "%{name} päivitti raportin %{target}"
         update_status_html: "%{name} päivitti käyttäjän %{target} julkaisun"
         update_user_role_html: "%{name} muutti roolia %{target}"
@@ -322,7 +322,7 @@ fi:
       create_new_category: Luo uusi luokka
       created_msg: Emojin luonti onnistui!
       delete: Poista
-      destroyed_msg: Emojon poisto onnistui!
+      destroyed_msg: Emojon hävitys onnistui!
       disable: Poista käytöstä
       disabled: Ei käytössä
       disabled_msg: Emoji poistettiin käytöstä onnistuneesti
@@ -339,7 +339,7 @@ fi:
       not_permitted: Sinulla ei ole oikeutta suorittaa tätä toimintoa
       overwrite: Korvaa
       shortcode: Lyhennekoodi
-      shortcode_hint: Vähintään kaksi merkkiä, vain kirjaimia, numeroita ja alaviivoja
+      shortcode_hint: Vähintään 2 merkkiä, vain kirjaimia, numeroita ja alaviivoja
       title: Mukautetut emojit
       uncategorized: Luokittelemattomat
       unlist: Poista listalta
@@ -354,8 +354,8 @@ fi:
       new_users: uudet käyttäjät
       opened_reports: avatut raportit
       pending_appeals_html:
-        one: "<strong>%{count}</strong> vireillä oleva valitus"
-        other: "<strong>%{count}</strong> vireillä olevaa valitusta"
+        one: "<strong>%{count}</strong> odottava valitus"
+        other: "<strong>%{count}</strong> odottavaa valitusta"
       pending_reports_html:
         one: "<strong>%{count}</strong> odottava raportti"
         other: "<strong>%{count}</strong> odottavaa raporttia"
@@ -421,7 +421,7 @@ fi:
       public_comment: Julkinen kommentti
       public_comment_hint: Kommentoi tätä verkkotunnuksen rajoitusta suurelle yleisölle, jos julkinen verkkotunnusten rajoitusluettelo on käytössä.
       reject_media: Hylkää mediatiedostot
-      reject_media_hint: Poistaa paikallisesti tallennetut mediatiedostot eikä lataa niitä enää jatkossa. Ei merkitystä jäähyn kohdalla
+      reject_media_hint: Poistaa paikallisesti tallennetut mediatiedostot eikä lataa niitä enää jatkossa. Ei vaikuta jäädytyksiin
       reject_reports: Hylkää raportit
       reject_reports_hint: Ohita kaikki tästä verkkotunnuksesta tulevat raportit. Ei vaikuta jäädytyksiin
       undo: Kumoa verkkotunnuksen esto
@@ -430,7 +430,7 @@ fi:
       add_new: Lisää uusi
       allow_registrations_with_approval: Salli rekisteröitymiset hyväksynnällä
       attempts_over_week:
-        one: "%{count} yritystä viimeisen viikon aikana"
+        one: "%{count} rekisteröitymisyritys viimeisen viikon aikana"
         other: "%{count} rekisteröitymisyritystä viimeisen viikon aikana"
       created_msg: Sähköpostiverkkotunnus estettiin onnistuneesti
       delete: Poista
@@ -455,7 +455,7 @@ fi:
       import:
         description_html: Olet tuomassa verkkotunnusten estoluetteloa. Tarkista luettelo huolella – etenkin, jos et ole laatinut sitä itse.
         existing_relationships_warning: Olemassa olevat seurantasuhteet
-        private_comment_description_html: 'Seurataksesi tuotujen estojen alkuperää lisätään estojen yhteyteen seuraava yksityinen kommentti: <q>%{comment}</q>'
+        private_comment_description_html: 'Seurataksesi tuotujen estojen alkuperää estojen yhteyteen lisätään seuraava yksityinen kommentti: <q>%{comment}</q>'
         private_comment_template: Tuotu lähteestä %{source} %{date}
         title: Tuo verkkotunnusten estoja
       invalid_domain_block: 'Yksi tai useampi verkkotunnuksen esto ohitettiin seuraavien virheiden vuoksi: %{error}'
@@ -467,7 +467,7 @@ fi:
       language: Kielelle
       status: Tila
       suppress: Hylkää seurantasuositus
-      suppressed: Hylätty
+      suppressed: Hylätyt
       title: Seurantasuositukset
       unsuppress: Palauta seurantasuositus
     instances:
@@ -482,7 +482,7 @@ fi:
         failures_recorded:
           one: Epäonnistuneita yrityksiä %{count} päivänä.
           other: Epäonnistuneita yrityksiä %{count} päivänä.
-        no_failures_recorded: Epäonnistumisia ei kirjattu.
+        no_failures_recorded: Ei kirjattuja epäonnistumisia.
         title: Saatavuus
         warning: Viimeisin yritys yhdistää tähän palvelimeen epäonnistui
       back_to_all: Kaikki
@@ -492,7 +492,7 @@ fi:
       confirm_purge: Haluatko varmasti poistaa pysyvästi tämän verkkotunnuksen tiedot?
       content_policies:
         comment: Sisäinen muistiinpano
-        description_html: Voit määrittää sisältökäytännöt, joita sovelletaan kaikkiin tämän verkkotunnuksen ja sen aliverkkotunnusten tileihin.
+        description_html: Voit määritellä sisältökäytännöt, joita sovelletaan kaikkiin tämän verkkotunnuksen ja sen aliverkkotunnusten tileihin.
         limited_federation_mode_description_html: Voit valita sallitaanko federointi tällä verkkotunnuksella.
         policies:
           reject_media: Hylkää media
@@ -514,10 +514,10 @@ fi:
       delivery:
         all: Kaikki
         clear: Tyhjennä toimitusvirheet
-        failing: Epäonnistuminen
+        failing: Epäonnistuneet
         restart: Käynnistä toimitus uudelleen
         stop: Lopeta toimitus
-        unavailable: Ei saatavilla
+        unavailable: Eivät saatavilla
       delivery_available: Toimitus on saatavilla
       delivery_error_days: Toimitusvirheen päivät
       delivery_error_hint: Jos toimitus ei ole mahdollista %{count} päivään, se merkitään automaattisesti toimituskelvottomaksi.
@@ -528,7 +528,7 @@ fi:
         other: "%{count} tunnettua tiliä"
       moderation:
         all: Kaikki
-        limited: Rajoitettu
+        limited: Rajoitetut
         title: Moderointi
       private_comment: Yksityinen kommentti
       public_comment: Julkinen kommentti
@@ -547,8 +547,8 @@ fi:
       filter:
         all: Kaikki
         available: Saatavilla
-        expired: Vanhentunut
-        title: Suodata
+        expired: Vanhentuneet
+        title: Suodatus
       title: Kutsut
     ip_blocks:
       add_new: Luo sääntö
@@ -580,7 +580,7 @@ fi:
       pending: Odotetaan välittäjän hyväksyntää
       save_and_enable: Tallenna ja ota käyttöön
       setup: Määritä yhteys välittäjään
-      signatures_not_enabled: Välittäjät eivät toimi oikein, kun turvallinen tai rajoitettu federaatio -tila on käytössä
+      signatures_not_enabled: Välittäjät eivät välttämättä toimi oikein, kun turvallinen tai rajoitetun federoinnin tila on käytössä
       status: Tila
       title: Välittäjät
     report_notes:
@@ -686,7 +686,7 @@ fi:
         moderation: Moderointi
         special: Erityistä
       delete: Poista
-      description_html: "<strong>Käyttäjärooleilla</strong> voit mukauttaa, mihin Mastodonin toimintoihin ja alueisiin käyttäjäsi pääsevät käsiksi."
+      description_html: "<strong>Käyttäjärooleilla</strong> voit mukauttaa, mihin Mastodonin toimintoihin ja alueisiin käyttäjäsi on pääsy."
       edit: Muokkaa roolia ”%{name}”
       everyone: Oletuskäyttöoikeudet
       everyone_full_description_html: Tämä on <strong>perusrooli</strong>, joka vaikuttaa <strong>kaikkiin käyttäjiin</strong>, jopa ilman asetettua roolia. Kaikki muut roolit perivät sen käyttöoikeudet.
@@ -701,7 +701,7 @@ fi:
         invite_users: Kutsua käyttäjiä
         invite_users_description: Sallii käyttäjien kutsua uusia ihmisiä palvelimelle
         manage_announcements: Hallita tiedotteita
-        manage_announcements_description: Sallii käyttäjien hallita tiedotteita palvelimella
+        manage_announcements_description: Sallii käyttäjien hallita palvelimen tiedotteita
         manage_appeals: Hallita valituksia
         manage_appeals_description: Sallii käyttäjien tarkistaa moderointitoimiin kohdistuvia valituksia
         manage_blocks: Hallita estoja
@@ -723,7 +723,7 @@ fi:
         manage_taxonomies: Hallita luokittelua
         manage_taxonomies_description: Sallii käyttäjien tarkistaa suositun sisällön ja päivittää aihetunnisteiden asetuksia
         manage_user_access: Hallita käyttäjäoikeuksia
-        manage_user_access_description: Sallii käyttäjien poistaa muiden käyttäjien kaksivaiheinen todennus käytöstä, vaihtaa heidän sähköpostiosoitteensa ja nollata heidän salasanansa
+        manage_user_access_description: Sallii käyttäjien poistaa muiden käyttäjien kaksivaiheinen todennus käytöstä, vaihtaa heidän sähköpostiosoitteensa ja palauttaa heidän salasanansa
         manage_users: Hallita käyttäjiä
         manage_users_description: Sallii käyttäjien tarkastella muiden käyttäjien tietoja ja suorittaa moderointitoimia heitä kohtaan
         manage_webhooks: Hallita webhookeja
@@ -760,7 +760,7 @@ fi:
       content_retention:
         danger_zone: Vaaravyöhyke
         preamble: Määritä, miten käyttäjän luoma sisältö tallennetaan Mastodoniin.
-        title: Sisällön säilyttäminen
+        title: Sisällön säilytys
       default_noindex:
         desc_html: Vaikuttaa kaikkiin käyttäjiin, jotka eivät ole muuttaneet tätä asetusta itse
         title: Jätä käyttäjät oletusarvoisesti hakukoneindeksoinnin ulkopuolelle
@@ -771,7 +771,7 @@ fi:
         public_timelines: Julkiset aikajanat
         publish_discovered_servers: Julkaise löydetyt palvelimet
         publish_statistics: Julkaise tilastot
-        title: Löytäminen
+        title: Löydettävyys
         trends: Trendit
       domain_blocks:
         all: Kaikille
@@ -780,7 +780,7 @@ fi:
       registrations:
         moderation_recommandation: Varmista, että sinulla on riittävä ja toimintavalmis joukko moderaattoreita, ennen kuin avaat rekisteröitymisen kaikille!
         preamble: Määritä, kuka voi luoda tilin palvelimellesi.
-        title: Rekisteröinnit
+        title: Rekisteröityminen
       registrations_mode:
         modes:
           approved: Rekisteröityminen vaatii hyväksynnän
@@ -869,7 +869,7 @@ fi:
         version_comparison: Käynnissä on Elasticsearch %{running_version}, kun vaaditaan %{required_version}
       rules_check:
         action: Hallitse palvelimen sääntöjä
-        message_html: Et ole määrittänyt lainkaan palvelimen sääntöjä.
+        message_html: Et ole määritellyt palvelimen sääntöjä lainkaan.
       sidekiq_process_check:
         message_html: Ei ole Sidekiq-prosessia käynnissä jonossa %{value}. Tarkista Sidekiq-asetukset
       software_version_critical_check:
@@ -898,76 +898,76 @@ fi:
       name: Nimi
       newest: Uusin
       oldest: Vanhin
-      reset: Tyhjennä
-      review: Tarkista tila
+      reset: Palauta
+      review: Tarkastuksen tila
       search: Hae
       title: Aihetunnisteet
       updated_msg: Aihetunnisteiden asetusten päivitys onnistui
     title: Ylläpito
     trends:
       allow: Salli
-      approved: Hyväksytty
-      disallow: Estä
+      approved: Hyväksytyt
+      disallow: Kiellä
       links:
         allow: Salli linkki
         allow_provider: Salli julkaisija
-        description_html: Nämä ovat linkkejä, joita jaetaan tällä hetkellä paljon tileillä, joilta palvelimesi näkee viestejä. Se voi auttaa käyttäjiäsi saamaan selville, mitä maailmassa tapahtuu. Linkkejä ei näytetä julkisesti, ennen kuin hyväksyt julkaisijan. Voit myös sallia tai hylätä yksittäiset linkit.
-        disallow: Hylkää linkki
-        disallow_provider: Estä julkaisija
+        description_html: Näitä linkkejä jaetaan parhaillaan paljon tileillä, joiden julkaisuja palvelimesi näkee. Luettelo voi auttaa käyttäjiäsi saamaan selville, mitä maailmassa tapahtuu. Linkit eivät näy julkisesti ennen kuin hyväksyt julkaisijan. Voit myös sallia tai hylätä yksittäisiä linkkejä.
+        disallow: Kiellä linkki
+        disallow_provider: Kiellä julkaisija
         no_link_selected: Linkkejä ei muutettu, koska yhtään ei ollut valittuna
         publishers:
           no_publisher_selected: Julkaisijoita ei muutettu, koska yhtään ei ollut valittuna
         shared_by_over_week:
-          one: Yksi henkilö jakanut viimeisen viikon aikana
+          one: Jakanut yksi henkilö viimeisen viikon aikana
           other: Jakanut %{count} henkilöä viimeisen viikon aikana
         title: Suositut linkit
-        usage_comparison: Jaettu %{today} kertaa tänään verrattuna eilen %{yesterday}
+        usage_comparison: Jaettu tänään %{today} kertaa verrattuna eilisen %{yesterday} kertaan
       not_allowed_to_trend: Ei saa trendata
-      only_allowed: Vain sallittu
+      only_allowed: Vain sallitut
       pending_review: Odottaa tarkastusta
       preview_card_providers:
-        allowed: Tämän julkaisijan linkit voivat trendata
-        description_html: Nämä ovat verkkotunnuksia, joiden linkkejä jaetaan usein palvelimellasi. Linkit eivät trendaa julkisesti, ellei linkin verkkotunnusta ole hyväksytty. Hyväksyntäsi (tai hylkäys) ulottuu aliverkkotunnuksiin.
-        rejected: Tämän julkaisijan linkit eivät voi trendata
+        allowed: Tämän julkaisijan lähettämät linkit voivat trendata
+        description_html: Näistä verkkotunnuksista lähetettyjä linkkejä jaetaan usein palvelimellasi. Linkit eivät trendaa julkisesti, ellei linkin verkkotunnusta ole hyväksytty. Hyväksyntäsi (tai hylkäyksesi) ulottuu aliverkkotunnuksiin.
+        rejected: Tämän julkaisijan lähettämät linkit eivät voi trendata
         title: Julkaisijat
-      rejected: Hylätty
+      rejected: Hylätyt
       statuses:
         allow: Salli julkaisu
         allow_account: Salli tekijä
-        description_html: Nämä ovat julkaisuja, joita palvelimesi tietää jaettavan ja lisättävän suosikkeihin paljon tällä hetkellä. Listaus voi auttaa uusia ja palaavia käyttäjiäsi löytämään lisää seurattavia. Julkaisut eivät näy julkisesti ennen kuin hyväksyt niiden tekijän ja tekijä sallii tilinsä ehdottamisen. Voit myös sallia tai hylätä yksittäisiä julkaisuja.
+        description_html: Näitä julkaisuja palvelimesi tietää parhaillaan jaettavan ja lisättävän suosikkeihin paljon. Luettelo voi auttaa uusia ja palaavia käyttäjiäsi löytämään lisää seurattavia. Julkaisut eivät näy julkisesti ennen kuin hyväksyt niiden tekijän ja tekijä sallii tilinsä ehdottamisen. Voit myös sallia tai hylätä yksittäisiä julkaisuja.
         disallow: Kiellä julkaisu
-        disallow_account: Estä tekijä
+        disallow_account: Kiellä tekijä
         no_status_selected: Suosittuja julkaisuja ei muutettu, koska yhtään ei ollut valittuna
         not_discoverable: Tekijä ei ole ilmoittanut olevansa löydettävissä
         shared_by:
           one: Jaettu tai lisätty suosikkeihin kerran
-          other: Jaettu tai merkitty suosikiksi %{friendly_count} kertaa
+          other: Jaettu tai lisätty suosikkeihin %{friendly_count} kertaa
         title: Suositut julkaisut
       tags:
         current_score: Nykyinen tulos %{score}
         dashboard:
-          tag_accounts_measure: uniikit käyttötarkoitukset
+          tag_accounts_measure: uniikit käyttökerrat
           tag_languages_dimension: Suosituimmat kielet
           tag_servers_dimension: Suosituimmat palvelimet
           tag_servers_measure: eri palvelimet
-          tag_uses_measure: käyttökerrat
-        description_html: Nämä ovat aihetunnisteita, jotka näkyvät tällä hetkellä monissa julkaisuissa, jotka palvelimesi näkee. Tämä voi auttaa käyttäjiäsi selvittämään, mistä ihmiset puhuvat eniten tällä hetkellä. Mitään aihetunnisteita ei näytetä julkisesti, ennen kuin hyväksyt ne.
-        listable: Voidaan ehdottaa
+          tag_uses_measure: käyttökerrat yhteensä
+        description_html: Nämä aihetunnisteet näkyvät parhaillaan monissa julkaisuissa, jotka palvelimesi näkee. Tämä luettelo voi auttaa käyttäjiäsi selvittämään, mistä ihmiset puhuvat eniten juuri nyt. Mitkään aihetunnisteet ei näy julkisesti ennen kuin hyväksyt ne.
+        listable: Voi ehdottaa
         no_tag_selected: Tunnisteita ei muutettu, koska yhtään ei ollut valittuna
-        not_listable: Ei tulla ehdottamaan
+        not_listable: Ei ehdoteta
         not_trendable: Ei näy trendeissä
-        not_usable: Ei voida käyttää
+        not_usable: Ei voi käyttää
         peaked_on_and_decaying: Saavutti huipun %{date}, nyt hiipuu
         title: Suositut aihetunnisteet
         trendable: Voi näkyä trendeissä
         trending_rank: Suosittu, sijalla %{rank}
-        usable: Voidaan käyttää
-        usage_comparison: Käytetty %{today} kertaa tänään, verrattuna %{yesterday} eiliseen
+        usable: Voi käyttää
+        usage_comparison: Käytetty tänään %{today} kertaa, verrattuna elisen %{yesterday} kertaan
         used_by_over_week:
-          one: Yhden henkilön käyttämä viime viikon aikana
+          one: Käyttänyt yksi henkilö viimeisen viikon aikana
           other: Käyttänyt %{count} henkilöä viimeisen viikon aikana
       title: Trendit
-      trending: Suosittua
+      trending: Trendaus
     warning_presets:
       add_new: Lisää uusi
       delete: Poista
@@ -979,7 +979,7 @@ fi:
       delete: Poista
       description_html: "<strong>Webhookin</strong> avulla Mastodon voi puskea sovellukseesi <strong>reaaliaikaisia ilmoituksia</strong> valituista tapahtumista, jotta sovelluksesi voi <strong>laukaista reaktioita automaattisesti</strong>."
       disable: Poista käytöstä
-      disabled: Pois käytöstä
+      disabled: Poissa käytöstä
       edit: Muokkaa päätepistettä
       empty: Et ole vielä määrittänyt webhook-päätepisteitä.
       enable: Ota käyttöön
@@ -989,8 +989,8 @@ fi:
         other: "%{count} aktivoitua tapahtumaa"
       events: Tapahtumat
       new: Uusi webhook
-      rotate_secret: Vaihda salaus
-      secret: Salainen tunnus
+      rotate_secret: Vaihda salaisuus
+      secret: Allekirjoituksen salaisuus
       status: Tila
       title: Webhookit
       webhook: Webhook
@@ -1037,14 +1037,14 @@ fi:
     created_msg: Uusi alias luotiin onnistuneesti. Voit nyt aloittaa muuton vanhasta tilistä.
     deleted_msg: Alias poistettiin onnistuneesti. Muuttaminen tuolta tililtä tähän ei ole enää mahdollista.
     empty: Sinulla ei ole aliaksia.
-    hint_html: Jos haluat muuttaa toiselta tililtä tälle tilille, voit luoda tässä aliaksen, mitä vaaditaan ennen kuin voit edetä siirtämään seuraajat vanhalta tililtä tälle tilille. Tänä toiminto on itsessään <strong>vaaraton ja kumottavissa</strong>. <strong>Tilin muuttaminen aloitetaan vanhalta tililtä</strong>.
+    hint_html: Jos haluat muuttaa toisesta tilistä tähän tiliin, voit luoda tässä aliaksen, mitä vaaditaan ennen kuin voit edetä siirtämään seuraajasi vanhalta tililtä tälle tilille. Tänä toiminto on itsessään <strong>vaaraton ja kumottavissa</strong>. <strong>Tilin muuttaminen aloitetaan vanhalta tililtä</strong>.
     remove: Poista aliaksen linkitys
   appearance:
     advanced_web_interface: Edistynyt selainkäyttöliittymä
     advanced_web_interface_hint: 'Jos haluat hyödyntää näytön koko leveyttä, edistyneen selainkäyttöliittymän avulla voit määrittää useita erilaisia sarakkeita, niin näet kerralla niin paljon tietoa kuin haluat: kotisyöte, ilmoitukset, yleinen aikajana, mikä tahansa määrä listoja ja aihetunnisteita.'
     animations_and_accessibility: Animaatiot ja saavutettavuus
     confirmation_dialogs: Vahvistusvalinnat
-    discovery: Löytäminen
+    discovery: Löydettävyys
     localization:
       body: Mastodonin ovat kääntäneet vapaaehtoiset.
       guide_link: https://crowdin.com/project/mastodon
@@ -1121,7 +1121,7 @@ fi:
       preamble_invited: Ennen kuin jatkat ota huomioon palvelimen %{domain} moderaattorien asettamat perussäännöt.
       title: Joitakin perussääntöjä.
       title_invited: Sinut on kutsuttu.
-    security: Tunnukset
+    security: Turvallisuus
     set_new_password: Aseta uusi salasana
     setup:
       email_below_hint_html: Tarkista roskapostikansiosi tai pyydä uusi viesti. Voit korjata sähköpostiosoitteesi, jos se oli väärin.
@@ -1181,12 +1181,12 @@ fi:
     success_msg: Tilin poisto onnistui
     warning:
       before: 'Ennen kuin etenet, lue nämä huomautukset huolellisesti:'
-      caches: Muiden palvelimien välimuistiin tallentamaa sisältöä voi vielä löytyä
+      caches: Muiden palvelinten välimuistiinsa tallentamaa sisältöä voi säilyä
       data_removal: Julkaisusi ja muut tietosi poistetaan pysyvästi
       email_change_html: Voit <a href="%{path}">muuttaa sähköpostiosoitettasi</a> poistamatta tiliäsi
       email_contact_html: Jos ei saavu perille, voit pyytää apua sähköpostilla <a href="mailto:%{email}">%{email}</a>
       email_reconfirmation_html: Jos et saa vahvistuksen sähköpostia, niin voit <a href="%{path}">pyytää sitä uudelleen</a>
-      irreversible: Et voi palauttaa tiliäsi tai aktivoida sitä uudelleen
+      irreversible: Et voi palauttaa tiliäsi etkä aktivoida sitä uudelleen
       more_details_html: Tarkempia tietoja saat <a href="%{terms_path}">tietosuojakäytännöstämme</a>.
       username_available: Käyttäjänimesi tulee saataville uudelleen
       username_unavailable: Käyttäjänimesi ei tule saataville enää uudelleen
@@ -1228,7 +1228,7 @@ fi:
     other: Muut
   errors:
     '400': Lähettämäsi pyyntö oli virheellinen tai muotoiltu virheellisesti.
-    '403': Sinulla ei ole lupaa nähdä tätä sivua.
+    '403': Sinulla ei ole oikeutta nähdä tätä sivua.
     '404': Etsimääsi sivua ei ole olemassa.
     '406': Tämä sivu ei ole saatavilla pyydetyssä muodossa.
     '410': Etsimääsi sivua ei ole enää olemassa.
@@ -1257,13 +1257,13 @@ fi:
     csv: CSV
     domain_blocks: Verkkotunnusten estot
     lists: Listat
-    mutes: Mykistetyt
-    storage: Media-arkisto
+    mutes: Mykistykset
+    storage: Mediatiedostot
   featured_tags:
     add_new: Lisää uusi
     errors:
-      limit: Pidät jo esillä aihetunnisteiden enimmäismäärää
-    hint_html: "<strong>Pidä tärkeimpiä aihetunnisteitasi esillä profiilissasi.</strong> Erinomainen työkalu, jolla pidät kirjaa luovista teoksistasi ja pitkäaikaisista projekteistasi. Esillä pitämäsi aihetunnisteet ovat näyttävällä paikalla profiilissasi ja mahdollistavat nopean pääsyn omiin julkaisuihisi."
+      limit: Pidät esillä jo aihetunnisteiden enimmäismäärää
+    hint_html: "<strong>Pidä tärkeimpiä aihetunnisteitasi esillä profiilissasi.</strong> Erinomainen työkalu, jolla pidät kirjaa luovista teoksistasi ja pitkäaikaisista projekteistasi. Esillä pitämäsi aihetunnisteet ovat näyttävällä paikalla profiilissasi ja mahdollistavat nopean pääsyn julkaisuihisi."
   filters:
     contexts:
       account: Profiilit
@@ -1354,16 +1354,16 @@ fi:
       muting_html: Olet aikeissa <strong>korvata mykistettyjen tilien luettelosi</strong> kaikkiaan <strong>%{total_items} tilillä</strong> tiedostosta <strong>%{filename}</strong>.
     preambles:
       blocking_html: Olet aikeissa <strong>estää</strong> kaikkiaan <strong>%{total_items} tiliä</strong> tiedostosta <strong>%{filename}</strong>.
-      bookmarks_html: Olet lisäämässä kaikkiaan <strong>%{total_items} julkaisua</strong> tiedostosta <strong>%{filename}</strong><strong>kirjanmerkkeihisi</strong>.
+      bookmarks_html: Olet aikeissa lisätä kaikkiaan <strong>%{total_items} julkaisua</strong> tiedostosta <strong>%{filename}</strong><strong>kirjanmerkkeihisi</strong>.
       domain_blocking_html: Olet aikeissa <strong>estää</strong> kaikkiaan <strong>%{total_items} verkkotunnusta</strong> tiedostosta <strong>%{filename}</strong>.
       following_html: Olet aikeissa <strong>seurata</strong> kaikkiaan <strong>%{total_items} tiliä</strong> tiedostosta <strong>%{filename}</strong>.
-      lists_html: Olet lisäämässä <strong>listoihisi</strong> kaikkiaan <strong>%{total_items} tiliä</strong> tiedostosta <strong>%{filename}</strong>. Uusia listoja luodaan, jos sopivaa kohdelistaa ei ole olemassa.
+      lists_html: Olet aikeissa lisätä <strong>listoihisi</strong> kaikkiaan <strong>%{total_items} tiliä</strong> tiedostosta <strong>%{filename}</strong>. Uusia listoja luodaan, jos sopivaa kohdelistaa ei ole olemassa.
       muting_html: Olet aikeissa <strong>mykistää</strong> kaikkiaan <strong>%{total_items} tiliä</strong> tiedostosta <strong>%{filename}</strong>.
     preface: Voit tuoda toiselta palvelimelta viemiäsi tietoja, kuten seuraamiesi tai estämiesi henkilöiden luettelon.
     recent_imports: Viimeksi tuotu
     states:
       finished: Valmis
-      in_progress: Toiminto käynnissä
+      in_progress: Käynnissä
       scheduled: Ajoitettu
       unconfirmed: Varmistamaton
     status: Tila
@@ -1376,7 +1376,7 @@ fi:
       following: Tuodaan seurattuja tilejä
       lists: Tuodaan listoja
       muting: Tuodaan mykistettyjä tilejä
-    type: Tuonnin tyyppi
+    type: Tuontityyppi
     type_groups:
       constructive: Seuratut ja kirjanmerkit
       destructive: Estot ja mykistykset
@@ -1409,21 +1409,21 @@ fi:
     prompt: Luo linkkejä ja jaa niiden avulla muille pääsyoikeus tälle palvelimelle
     table:
       expires_at: Vanhenee
-      uses: Käytetty
+      uses: Käyttökertoja
     title: Kutsu ihmisiä
   lists:
     errors:
       limit: Sinulla on enimmäismäärä listoja
   login_activities:
     authentication_methods:
-      otp: kaksivaiheisen todennuksen sovellus
-      password: salasana
-      sign_in_token: sähköpostin turvakoodi
-      webauthn: suojausavaimet
-    description_html: Jos näet toimintaa, jota et tunnista, harkitse salasanan vaihtamista ja kaksivaiheisen todennuksen ottamista käyttöön.
+      otp: kaksivaiheisen todennuksen sovelluksella
+      password: salasanalla
+      sign_in_token: sähköpostin suojauskoodilla
+      webauthn: suojausavaimella
+    description_html: Jos näet toimintaa, jota et tunnista, harkitse salasanan vaihtamista ja kaksivaiheisen todennuksen käyttöön ottamista.
     empty: Todennushistoriaa ei ole saatavilla
-    failed_sign_in_html: Kirjautumisyritys epäonnistui %{method} - %{ip} (%{browser})
-    successful_sign_in_html: Kirjautuminen onnistui %{method} - %{ip} (%{browser})
+    failed_sign_in_html: Epäonnistunut kirjautumisyritys %{method} IP-osoitteesta %{ip} (%{browser})
+    successful_sign_in_html: Onnistunut kirjautuminen %{method} IP-osoitteesta %{ip} (%{browser})
     title: Todennushistoria
   mail_subscriptions:
     unsubscribe:
@@ -1457,7 +1457,7 @@ fi:
       not_found: ei voitu löytää
       on_cooldown: Olet jäähyllä
     followers_count: Seuraajat muuton aikana
-    incoming_migrations: Muutto toiselta tililtä
+    incoming_migrations: Muutto toisesta tilistä
     incoming_migrations_html: Muuttaaksesi toisesta tilistä tähän, sinun täytyy ensin <a href="%{path}">luoda tilin alias</a>.
     moved_msg: Tilisi ohjaa nyt kohteeseen %{acct} ja seuraajiasi siirretään.
     not_redirecting: Tilisi ei ohjaa tällä hetkellä mihinkään muuhun tiliin.
@@ -1468,11 +1468,11 @@ fi:
     redirecting_to: 'Tilisi uudelleenohjaa nyt kohteeseen: %{acct}.'
     set_redirect: Aseta uudelleenohjaus
     warning:
-      backreference_required: Uusi tili on ensin määritettävä viittaamaan tähän tiliin
+      backreference_required: Uusi tili on ensin määritettävä viittaamaan takaisin tähän tiliin
       before: 'Ennen kuin etenet, lue nämä huomautukset huolellisesti:'
-      cooldown: Muuton jälkeen on odotusaika, jonka aikana et pysty enää muuttamaan
-      disabled_account: Nykyinen tilisi ei ole täysin käytettävissä tämän jälkeen. Sinulla on kuitenkin pääsy tietojen vientiin ja uudelleenaktivointiin.
-      followers: Tämä toiminto siirtää kaikki seuraajat nykyisestä tilistä uudelle tilille
+      cooldown: Muuton jälkeen on odotusaika, jonka aikana et voi muuttaa uudelleen
+      disabled_account: Nykyinen tilisi ei ole täysin käytettävissä tämän jälkeen. Sinulla on kuitenkin pääsy tietojen vientiin ja tilin uudelleenaktivointiin.
+      followers: Tämä toiminto siirtää kaikki seuraajasi nykyiseltä tililtä uudelle tilille
       only_redirect_html: Vaihtoehtoisesti voit <a href="%{path}">asettaa vain ohjauksen profiiliisi</a>.
       other_data: Muita tietoja ei siirretä automaattisesti
       redirect: Nykyisen tilisi profiili päivitetään uudelleenohjaushuomautuksella ja suljetaan pois hauista
@@ -1593,7 +1593,7 @@ fi:
     invited: Kutsutut
     last_active: Viimeksi aktiiviset
     most_recent: Viimeisimmät
-    moved: Muuttaneet
+    moved: Muuttanut
     mutual: Seuraatte toisianne
     primary: Ensisijaiset
     relationship: Seurantasuhde
@@ -1625,41 +1625,41 @@ fi:
       alipay: Alipay
       blackberry: BlackBerry
       chrome: Chrome
-      edge: Microsoft Edge
+      edge: Edge
       electron: Electron
       firefox: Firefox
-      generic: Tuntematon selain
+      generic: tuntematon selain
       huawei_browser: Huawei-selain
       ie: Internet Explorer
       micro_messenger: MicroMessenger
-      nokia: Nokia S40 Ovi -selain
+      nokia: Nokia S40:n Ovi-selain
       opera: Opera
       otter: Otter
       phantom_js: PhantomJS
       qq: QQ Browser
       safari: Safari
       uc_browser: UC Browser
-      unknown_browser: Tuntematon selain
+      unknown_browser: tuntematon selain
       weibo: Weibo
     current_session: Nykyinen istunto
     date: Päiväys
-    description: "%{browser} alustalla %{platform}"
-    explanation: Nämä verkkoselaimet ovat tällä hetkellä kirjautuneena Mastodon-tilillesi.
+    description: "%{browser} %{platform}"
+    explanation: Nämä verkkoselaimet ovat parhaillaan kirjautuneena Mastodon-tilillesi.
     ip: IP-osoite
     platforms:
-      adobe_air: Adobe AIR
-      android: Android
-      blackberry: BlackBerry
-      chrome_os: ChromeOS
-      firefox_os: Firefox OS
-      ios: iOS
-      kai_os: KaiOS
-      linux: Linux
-      mac: macOS
-      unknown_platform: Tuntematon alusta
-      windows: Windows
-      windows_mobile: Windows Mobile
-      windows_phone: Windows Phone
+      adobe_air: alustalla Adobe Air
+      android: alustalla Android
+      blackberry: alustalla BlackBerry
+      chrome_os: alustalla ChromeOS
+      firefox_os: alustalla Firefox OS
+      ios: alustalla iOS
+      kai_os: alustalla KaiOS
+      linux: alustalla Linux
+      mac: alustalla macOS
+      unknown_platform: tuntemattomalla alustalla
+      windows: alustalla Windows
+      windows_mobile: alustalla Windows Mobile
+      windows_phone: alustalla Windows Phone
     revoke: Hylkää
     revoke_success: Istunnon hylkäys onnistui
     title: Istunnot
@@ -1676,9 +1676,9 @@ fi:
     edit_profile: Muokkaa profiilia
     export: Vie tietoja
     featured_tags: Esillä pidettävät aihetunnisteet
-    import: Tuo
+    import: Tuo tietoja
     import_and_export: Tuonti ja vienti
-    migrate: Tilin muutto muualle
+    migrate: Tilin muutto toisaalle
     notifications: Sähköposti-ilmoitukset
     preferences: Ominaisuudet
     profile: Julkinen profiili
@@ -1748,9 +1748,9 @@ fi:
       unlisted_long: Kaikki voivat nähdä, mutta ei näytetä julkisilla aikajanoilla
   statuses_cleanup:
     enabled: Poista vanhat julkaisut automaattisesti
-    enabled_hint: Poistaa julkaisusi automaattisesti, kun ne saavuttavat valitun ikärajan, ellei jokin alla olevista poikkeuksista tule kyseeseen
+    enabled_hint: Poistaa julkaisusi automaattisesti, kun ne saavuttavat valitun ikäkynnyksen, ellei jokin alla olevista poikkeuksista tule kyseeseen
     exceptions: Poikkeukset
-    explanation: Koska julkaisujen poistaminen on raskas toimi, se tapahtuu hitaasti ajan mittaan, kun palvelin ei ole muutoin ruuhkainen. Siksi viestejäsi voi poistua vasta tovi sen jälkeen, kun ne ovat saavuttaneet ikärajan.
+    explanation: Koska julkaisujen poistaminen on raskas toimi, se tapahtuu hitaasti ajan mittaan, kun palvelin ei ole muutoin ruuhkainen. Siksi viestejäsi voi poistua vasta tovi sen jälkeen, kun ne ovat saavuttaneet ikäkynnyksen.
     ignore_favs: Ohita suosikit
     ignore_reblogs: Ohita tehostukset
     interaction_exceptions: Vuorovaikutuksiin perustuvat poikkeukset
@@ -1776,9 +1776,9 @@ fi:
       '604800': 1 viikko
       '63113904': 2 vuotta
       '7889238': 3 kuukautta
-    min_age_label: Ikäraja
+    min_age_label: Ikäkynnys
     min_favs: Säilytä julkaisut, joilla on suosikiksi lisäyksiä vähintään
-    min_favs_hint: Ei poista julkaisujasi, joita on lisätty suosikeihin vähintään näin monta kertaa. Jätä tyhjäksi, jos haluat poistaa julkaisuja riippumatta suosikkeihin lisäysmääristä
+    min_favs_hint: Ei poista julkaisujasi, joita on lisätty suosikeihin vähintään näin monta kertaa. Jätä tyhjäksi, jos haluat poistaa julkaisuja riippumatta niiden suosikkeihin lisäämisen määrästä
     min_reblogs: Säilytä julkaisut, joilla on tehostuksia vähintään
     min_reblogs_hint: Ei poista julkaisujasi, joita on tehostettu vähintään näin monta kertaa. Jätä tyhjäksi, jos haluat poistaa julkaisuja riippumatta niiden tehostusten määrästä
   stream_entries:
@@ -1808,10 +1808,10 @@ fi:
     disable: Poista kaksivaiheinen todennus käytöstä
     disabled_success: Kaksivaiheisen todennuksen käytöstäpoisto onnistui
     edit: Muokkaa
-    enabled: Kaksivaiheinen todennus käytössä
+    enabled: Kaksivaiheinen todennus on käytössä
     enabled_success: Kaksivaiheisen todennuksen käyttöönotto onnistui
     generate_recovery_codes: Luo palautuskoodit
-    lost_recovery_codes: Palautuskoodien avulla voit käyttää tiliä, jos menetät puhelimesi. Jos olet hukannut palautuskoodisi, voit luoda uudet tästä. Vanhat palautuskoodit poistuvat käytöstä.
+    lost_recovery_codes: Palautuskoodien avulla saat jälleen pääsyn tilillesi, jos menetät puhelimesi. Jos olet hukannut palautuskoodisi, voit luoda uudet tästä. Vanhat palautuskoodit poistuvat käytöstä.
     methods: Kaksivaiheisen todennuksen menetelmät
     otp: Todennussovellus
     recovery_codes: Ota palautuskoodit talteen
diff --git a/config/locales/ga.yml b/config/locales/ga.yml
index 57162e2ed1db4d..0de8a2fede8426 100644
--- a/config/locales/ga.yml
+++ b/config/locales/ga.yml
@@ -927,7 +927,23 @@ ga:
         action: Seiceáil anseo le haghaidh tuilleadh eolais
         message_html: "<strong>Tá do stór oibiachtaí míchumraithe. Tá príobháideacht d'úsáideoirí i mbaol.</strong>"
     tags:
+      moderation:
+        not_trendable: Ní trendable
+        not_usable: Ní inúsáidte
+        pending_review: Athbhreithniú ar feitheamh
+        review_requested: Athbhreithniú iarrtha
+        reviewed: Athbhreithnithe
+        title: Stádas
+        trendable: Treocht
+        unreviewed: Gan athbhreithniú
+        usable: Inúsáidte
+      name: Ainm
+      newest: Is nuaí
+      oldest: Is sine
+      reset: Athshocraigh
       review: Stádas athbhreithnithe
+      search: Cuardach
+      title: Haischlibeanna
       updated_msg: D'éirigh le socruithe hashtag a nuashonrú
     title: Riar
     trends:
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 5a9571da7545f0..8e09bed939cfd4 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -913,7 +913,23 @@ he:
         action: למידע נוסף
         message_html: "<strong>שרות אחסון הענן שלך אינו מוגדר כראוי. פרטיות המשתמשות והמשתמשים שלך בסכנה.</strong>"
     tags:
+      moderation:
+        not_trendable: לא מזוהה כאופנתי
+        not_usable: בלתי שמיש
+        pending_review: ממתינים לסקירה
+        review_requested: התבקשה סקירה
+        reviewed: נסקר
+        title: מצב
+        trendable: ניתן לאפיון כאופנה
+        unreviewed: לא נסקר
+        usable: שמיש
+      name: שם
+      newest: החדש ביותר
+      oldest: הישן ביותר
+      reset: איפוס
       review: סקירת מצב
+      search: חיפוש
+      title: תגיות
       updated_msg: הגדרות תגיות עודכנו בהצלחה
     title: ניהול
     trends:
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 4a1afee842711a..18fe9cf9920f1a 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -872,7 +872,23 @@ ko:
         action: 더 많은 정보를 보려면 여기를 확인하세요
         message_html: "<strong>오브젝트 스토리지가 잘못 설정되어 있습니다. 사용자의 개인정보가 위험한 상태입니다.</strong>"
     tags:
+      moderation:
+        not_trendable: 유행에 오를 수 없음
+        not_usable: 사용 불가
+        pending_review: 심사 대기
+        review_requested: 검토 요청
+        reviewed: 검토함
+        title: 게시물
+        trendable: 유행에 오를 수 있음
+        unreviewed: 검토되지 않음
+        usable: 사용 가능
+      name: 이름
+      newest: 최신
+      oldest: 오래된 순
+      reset: 초기화
       review: 심사 상태
+      search: 검색
+      title: 해시태그
       updated_msg: 해시태그 설정이 성공적으로 갱신되었습니다
     title: 관리
     trends:
diff --git a/config/locales/simple_form.es-MX.yml b/config/locales/simple_form.es-MX.yml
index 43dd38ac7c7620..b2c26020dae5e5 100644
--- a/config/locales/simple_form.es-MX.yml
+++ b/config/locales/simple_form.es-MX.yml
@@ -314,6 +314,7 @@ es-MX:
         listable: Permitir que esta etiqueta aparezca en las búsquedas y en el directorio del perfil
         name: Etiqueta
         trendable: Permitir que esta etiqueta aparezca bajo tendencias
+        usable: Permitir a las publicacions usar esta etiqueta localmente
       user:
         role: Rol
         time_zone: Zona horaria
diff --git a/config/locales/simple_form.es.yml b/config/locales/simple_form.es.yml
index 1e7401d0e23054..0e6cc47e366505 100644
--- a/config/locales/simple_form.es.yml
+++ b/config/locales/simple_form.es.yml
@@ -314,6 +314,7 @@ es:
         listable: Permitir que esta etiqueta aparezca en las búsquedas y en el directorio del perfil
         name: Etiqueta
         trendable: Permitir que esta etiqueta aparezca bajo tendencias
+        usable: Permitir a las publicacions usar esta etiqueta localmente
       user:
         role: Rol
         time_zone: Zona horaria
diff --git a/config/locales/simple_form.fi.yml b/config/locales/simple_form.fi.yml
index ddbd1dd2890569..fa1fd49b3815c9 100644
--- a/config/locales/simple_form.fi.yml
+++ b/config/locales/simple_form.fi.yml
@@ -30,7 +30,7 @@ fi:
           suspend: Estä kaikki vuorovaikutus tältä tililtä ja tälle tilille sekä poista kaikki sen sisältö. Peruttavissa 30 päivän ajan. Sulkee kaikki tiliin kohdistuvat raportit.
         warning_preset_id: Valinnainen. Voit silti lisätä mukautetun tekstin esiasetuksen loppuun
       announcement:
-        all_day: Kun valittu, vain valittu aikaväli näytetään
+        all_day: Kun valittuna, vain aikavälin päivät näytetään
         ends_at: Valinnainen. Tiedote poistetaan automaattisesti tällä hetkellä
         scheduled_at: Jätä tyhjäksi julkaistaksesi tiedotteen heti
         starts_at: Valinnainen. Jos tiedotteesi on sidottu tiettyyn aikaväliin
@@ -45,14 +45,14 @@ fi:
         current_password: Turvallisuussyistä kirjoita nykyisen tilin salasana
         current_username: Vahvista kirjoittamalla nykyisen tilin käyttäjänimi
         digest: Lähetetään vain pitkän poissaolon jälkeen ja vain, jos olet saanut suoria viestejä poissaolosi aikana
-        email: Sinulle lähetetään vahvistussähköposti
+        email: Sinulle lähetetään vahvistusviesti
         header: WEBP, PNG, GIF tai JPG. Enintään %{size}. Skaalataan kokoon %{dimensions} px
         inbox_url: Kopioi URL-osoite haluamasi välittäjän etusivulta
-        irreversible: Suodatetut julkaisut katoavat lopullisesti, vaikka suodatin poistettaisiin myöhemmin
+        irreversible: Suodatetut julkaisut katoavat peruuttamattomasti, vaikka suodatin poistettaisiin myöhemmin
         locale: Käyttöliittymän, sähköpostien ja puskuilmoitusten kieli
-        password: Käytä vähintään 8 merkkiä
+        password: Käytä vähintään 8:aa merkkiä
         phrase: Täsmää riippumatta tekstin aakkoslajista tai julkaisun sisältövaroituksesta
-        scopes: Mihin ohjelmointirajapintoihin sovellus pääsee käsiksi. Jos valitset ylätason oikeuden, sinun ei tarvitse valita yksittäisiä.
+        scopes: Mihin ohjelmointirajapintoihin sovelluksella on pääsy. Jos valitset ylätason käyttöoikeuden, sinun ei tarvitse valita yksittäisiä.
         setting_aggregate_reblogs: Älä näytä uusia tehostuksia julkaisuille, joita on äskettäin tehostettu (koskee vain juuri vastaanotettuja tehostuksia)
         setting_always_send_emails: Yleensä sähköposti-ilmoituksia ei lähetetä, kun käytät Mastodonia aktiivisesti
         setting_default_sensitive: Arkaluonteinen media piilotetaan oletusarvoisesti, ja se voidaan näyttää yhdellä napsautuksella
@@ -84,7 +84,7 @@ fi:
         content_cache_retention_period: Kaikki muiden palvelinten julkaisut (mukaan lukien tehostukset ja vastaukset) poistuvat, kun määritetty määrä päiviä on kulunut, lukuun ottamatta paikallisen käyttäjän vuorovaikutusta näiden julkaisujen kanssa. Tämä sisältää julkaisut, jotka paikallinen käyttäjä on merkinnyt kirjanmerkiksi tai suosikiksi. Myös yksityismaininnat eri palvelinten käyttäjien välillä menetetään, eikä niitä voi palauttaa. Tämä asetus on tarkoitettu käytettäväksi erityistapauksissa ja rikkoo monia käyttäjien odotuksia, kun sitä sovelletaan yleiskäyttöön.
         custom_css: Voit käyttää mukautettuja tyylejä Mastodonin selainversiossa.
         favicon: WEBP, PNG, GIF tai JPG. Korvaa oletusarvoisen Mastodonin sivustokuvakkeen haluamallasi kuvakkeella.
-        mascot: Ohittaa kuvituksen edistyneessä selainkäyttöliittymässä.
+        mascot: Korvaa kuvituksen edistyneessä selainkäyttöliittymässä.
         media_cache_retention_period: Etäkäyttäjien tekemien julkaisujen mediatiedostot ovat välimuistissa palvelimellasi. Kun kentän arvo on positiivinen, media poistuu, kun määritetty määrä päiviä on kulunut. Jos mediaa pyydetään sen poistamisen jälkeen, se ladataan uudelleen, jos lähdesisältö on vielä saatavilla. Koska linkkien esikatselun kyselyitä kolmansien osapuolien sivustoille on rajoitettu, on suositeltavaa asettaa tämä arvo vähintään 14 päivään, tai linkkien kortteja ei päivitetä pyynnöstä ennen tätä ajankohtaa.
         peers_api_enabled: Luettelo verkkotunnuksista, jotka tämä palvelin on kohdannut fediversumissa. Se ei kerro, federoitko tietyn palvelimen kanssa, vaan että palvelimesi on ylipäätään tietoinen siitä. Tätä tietoa käytetään palveluissa, jotka keräävät tilastoja federoinnista yleisellä tasolla.
         profile_directory: Profiilihakemisto luetteloi kaikki käyttäjät, jotka ovat valinneet olla löydettävissä.
@@ -201,7 +201,7 @@ fi:
         note: Elämäkerta
         otp_attempt: Kaksivaiheisen todennuksen tunnusluku
         password: Salasana
-        phrase: Avainsana tai -fraasi
+        phrase: Avainsana tai fraasi
         setting_advanced_layout: Ota edistynyt selainkäyttöliittymä käyttöön
         setting_aggregate_reblogs: Ryhmitä tehostukset aikajanoilla
         setting_always_send_emails: Lähetä sähköposti-ilmoitukset aina
@@ -255,7 +255,7 @@ fi:
         peers_api_enabled: Julkaise löydettyjen palvelinten luettelo ohjelmointirajapinnassa
         profile_directory: Ota profiilihakemisto käyttöön
         registrations_mode: Kuka voi rekisteröityä
-        require_invite_text: Vaadi syy liittyä
+        require_invite_text: Vaadi liittymissyy
         show_domain_blocks: Näytä verkkotunnusten estot
         show_domain_blocks_rationale: Näytä, miksi verkkotunnukset on estetty
         site_contact_email: Yhteyshenkilön sähköpostiosoite
@@ -311,7 +311,7 @@ fi:
         indexable: Sisällytä profiilisivu hakukoneisiin
         show_application: Näytä, mistä sovelluksesta lähetit julkaisun
       tag:
-        listable: Salli tämän aihetunnisteen näkyä hauissa ja ehdotuksissa
+        listable: Salli tämän aihetunnisteen näkyä hakutuloksissa ja ehdotuksissa
         name: Aihetunniste
         trendable: Salli tämän aihetunnisteen näkyä trendeissä
         usable: Salli julkaisujen käyttää tätä aihetunnistetta paikallisesti
@@ -322,7 +322,7 @@ fi:
         color: Merkin väri
         highlighted: Näytä rooli merkkinä käyttäjäprofiileissa
         name: Nimi
-        permissions_as_keys: Oikeudet
+        permissions_as_keys: Käyttöoikeudet
         position: Prioriteetti
       webhook:
         events: Käytössä olevat tapahtumat
@@ -331,7 +331,7 @@ fi:
     'no': Ei
     not_recommended: Ei suositella
     overridden: Ohitettu
-    recommended: Suositeltu
+    recommended: Suositellaan
     required:
       mark: "*"
       text: vaadittu tieto
diff --git a/config/locales/simple_form.ga.yml b/config/locales/simple_form.ga.yml
index 60faa07f275f25..15ea3094b2ff7a 100644
--- a/config/locales/simple_form.ga.yml
+++ b/config/locales/simple_form.ga.yml
@@ -314,6 +314,7 @@ ga:
         listable: Lig don hashchlib seo a bheith le feiceáil i gcuardach agus i moltaí
         name: Haischlib
         trendable: Lig don haischlib seo a bheith le feiceáil faoi threochtaí
+        usable: Lig do phostálacha an hashchlib seo a úsáid go háitiúil
       user:
         role: Ról
         time_zone: Crios ama
diff --git a/config/locales/simple_form.he.yml b/config/locales/simple_form.he.yml
index edc3cc8f38314b..95a334bb3a538f 100644
--- a/config/locales/simple_form.he.yml
+++ b/config/locales/simple_form.he.yml
@@ -314,6 +314,7 @@ he:
         listable: הרשה/י לתגית זו להופיע בחיפושים והצעות
         name: תגית
         trendable: הרשה/י לתגית זו להופיע תחת נושאים חמים
+        usable: הרשה/י להודעות להכיל תגית זו באופן מקומי
       user:
         role: תפקיד
         time_zone: אזור זמן
diff --git a/config/locales/simple_form.ko.yml b/config/locales/simple_form.ko.yml
index b2ff68c5ddbc84..5fa3aee6c4c010 100644
--- a/config/locales/simple_form.ko.yml
+++ b/config/locales/simple_form.ko.yml
@@ -314,6 +314,7 @@ ko:
         listable: 이 해시태그가 검색과 추천에 보여지도록 허용
         name: 해시태그
         trendable: 이 해시태그가 유행에 나타날 수 있도록 허용
+        usable: 이 해시태그를 로컬 게시물에서 사용 가능하도록 허용
       user:
         role: 역할
         time_zone: 시간대

From da5b45a573808d345839507cf024c8be73b1d610 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 1 Aug 2024 14:36:54 +0200
Subject: [PATCH 1682/2191] Add endpoints to accept and dismiss multiple
 notification requests at once (#31242)

---
 .../v1/notifications/requests_controller.rb   | 17 +++++++++-
 config/routes/api.rb                          |  5 +++
 .../api/v1/notifications/requests_spec.rb     | 33 +++++++++++++++++++
 3 files changed, 54 insertions(+), 1 deletion(-)

diff --git a/app/controllers/api/v1/notifications/requests_controller.rb b/app/controllers/api/v1/notifications/requests_controller.rb
index 9ae80c28ed0732..b4207147c87104 100644
--- a/app/controllers/api/v1/notifications/requests_controller.rb
+++ b/app/controllers/api/v1/notifications/requests_controller.rb
@@ -5,7 +5,8 @@ class Api::V1::Notifications::RequestsController < Api::BaseController
   before_action -> { doorkeeper_authorize! :write, :'write:notifications' }, except: :index
 
   before_action :require_user!
-  before_action :set_request, except: :index
+  before_action :set_request, only: [:show, :accept, :dismiss]
+  before_action :set_requests, only: [:accept_bulk, :dismiss_bulk]
 
   after_action :insert_pagination_headers, only: :index
 
@@ -32,6 +33,16 @@ def dismiss
     render_empty
   end
 
+  def accept_bulk
+    @requests.each { |request| AcceptNotificationRequestService.new.call(request) }
+    render_empty
+  end
+
+  def dismiss_bulk
+    @requests.each(&:destroy!)
+    render_empty
+  end
+
   private
 
   def load_requests
@@ -53,6 +64,10 @@ def set_request
     @request = NotificationRequest.where(account: current_account).find(params[:id])
   end
 
+  def set_requests
+    @requests = NotificationRequest.where(account: current_account, id: Array(params[:id]).uniq.map(&:to_i))
+  end
+
   def next_path
     api_v1_notifications_requests_url pagination_params(max_id: pagination_max_id) unless @requests.empty?
   end
diff --git a/config/routes/api.rb b/config/routes/api.rb
index e488bb9187ef5d..fa74c025b4ed34 100644
--- a/config/routes/api.rb
+++ b/config/routes/api.rb
@@ -155,6 +155,11 @@
 
     namespace :notifications do
       resources :requests, only: [:index, :show] do
+        collection do
+          post :accept, to: 'requests#accept_bulk'
+          post :dismiss, to: 'requests#dismiss_bulk'
+        end
+
         member do
           post :accept
           post :dismiss
diff --git a/spec/requests/api/v1/notifications/requests_spec.rb b/spec/requests/api/v1/notifications/requests_spec.rb
index d3a9753246a2ec..e1fe17426a28a5 100644
--- a/spec/requests/api/v1/notifications/requests_spec.rb
+++ b/spec/requests/api/v1/notifications/requests_spec.rb
@@ -87,4 +87,37 @@
       end
     end
   end
+
+  describe 'POST /api/v1/notifications/requests/accept' do
+    subject do
+      post '/api/v1/notifications/requests/accept', params: { id: [notification_request.id] }, headers: headers
+    end
+
+    let!(:notification_request) { Fabricate(:notification_request, account: user.account) }
+
+    it_behaves_like 'forbidden for wrong scope', 'read read:notifications'
+
+    it 'returns http success and creates notification permission', :aggregate_failures do
+      subject
+
+      expect(NotificationPermission.find_by(account: notification_request.account, from_account: notification_request.from_account)).to_not be_nil
+      expect(response).to have_http_status(200)
+    end
+  end
+
+  describe 'POST /api/v1/notifications/requests/dismiss' do
+    subject do
+      post '/api/v1/notifications/requests/dismiss', params: { id: [notification_request.id] }, headers: headers
+    end
+
+    let!(:notification_request) { Fabricate(:notification_request, account: user.account) }
+
+    it_behaves_like 'forbidden for wrong scope', 'read read:notifications'
+
+    it 'returns http success and destroys the notification request', :aggregate_failures do
+      expect { subject }.to change(NotificationRequest, :count).by(-1)
+
+      expect(response).to have_http_status(200)
+    end
+  end
 end

From afdfeb585640af53cf7e9c63d82aa56ca8bae1e4 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 1 Aug 2024 22:50:36 +0200
Subject: [PATCH 1683/2191] Fix click event handling when clicking outside of
 an open dropdown menu (#31251)

---
 app/javascript/mastodon/components/dropdown_menu.jsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/javascript/mastodon/components/dropdown_menu.jsx b/app/javascript/mastodon/components/dropdown_menu.jsx
index 524dbb927b426a..49951cfb5faeb4 100644
--- a/app/javascript/mastodon/components/dropdown_menu.jsx
+++ b/app/javascript/mastodon/components/dropdown_menu.jsx
@@ -39,6 +39,7 @@ class DropdownMenu extends PureComponent {
     if (this.node && !this.node.contains(e.target)) {
       this.props.onClose();
       e.stopPropagation();
+      e.preventDefault();
     }
   };
 

From d19edc4c4ab0d700efa70f0df4981ec9931aca22 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 2 Aug 2024 08:53:41 +0200
Subject: [PATCH 1684/2191] fix(deps): update dependency axios to v1.7.3
 (#31248)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index f050110cd639ba..b10c375f702eb7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5142,13 +5142,13 @@ __metadata:
   linkType: hard
 
 "axios@npm:^1.4.0":
-  version: 1.7.2
-  resolution: "axios@npm:1.7.2"
+  version: 1.7.3
+  resolution: "axios@npm:1.7.3"
   dependencies:
     follow-redirects: "npm:^1.15.6"
     form-data: "npm:^4.0.0"
     proxy-from-env: "npm:^1.1.0"
-  checksum: 10c0/cbd47ce380fe045313364e740bb03b936420b8b5558c7ea36a4563db1258c658f05e40feb5ddd41f6633fdd96d37ac2a76f884dad599c5b0224b4c451b3fa7ae
+  checksum: 10c0/a18cbe559203efa05fb1fec2d1898e23bf6329bd2575784ee32aa11b5bbe1d54b9f472c49a261294125519cf62aa4fe5ef6e647bb7482eafc15bffe15ab314ce
   languageName: node
   linkType: hard
 

From f55099fea3f25a42d2ed3733caa8402d9a0a3f10 Mon Sep 17 00:00:00 2001
From: Emelia Smith <ThisIsMissEm@users.noreply.github.com>
Date: Fri, 2 Aug 2024 08:54:48 +0200
Subject: [PATCH 1685/2191] Increase maximum page size for Admin Domain
 Management APIs (#31253)

---
 app/controllers/api/v1/admin/domain_allows_controller.rb | 5 +++--
 app/controllers/api/v1/admin/domain_blocks_controller.rb | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/controllers/api/v1/admin/domain_allows_controller.rb b/app/controllers/api/v1/admin/domain_allows_controller.rb
index 0cd5aebd53ad8b..24f68aa1bd8746 100644
--- a/app/controllers/api/v1/admin/domain_allows_controller.rb
+++ b/app/controllers/api/v1/admin/domain_allows_controller.rb
@@ -5,6 +5,7 @@ class Api::V1::Admin::DomainAllowsController < Api::BaseController
   include AccountableConcern
 
   LIMIT = 100
+  MAX_LIMIT = 500
 
   before_action -> { authorize_if_got_token! :'admin:read', :'admin:read:domain_allows' }, only: [:index, :show]
   before_action -> { authorize_if_got_token! :'admin:write', :'admin:write:domain_allows' }, except: [:index, :show]
@@ -47,7 +48,7 @@ def destroy
   private
 
   def set_domain_allows
-    @domain_allows = DomainAllow.order(id: :desc).to_a_paginated_by_id(limit_param(LIMIT), params_slice(:max_id, :since_id, :min_id))
+    @domain_allows = DomainAllow.order(id: :desc).to_a_paginated_by_id(limit_param(LIMIT, MAX_LIMIT), params_slice(:max_id, :since_id, :min_id))
   end
 
   def set_domain_allow
@@ -67,7 +68,7 @@ def pagination_collection
   end
 
   def records_continue?
-    @domain_allows.size == limit_param(LIMIT)
+    @domain_allows.size == limit_param(LIMIT, MAX_LIMIT)
   end
 
   def resource_params
diff --git a/app/controllers/api/v1/admin/domain_blocks_controller.rb b/app/controllers/api/v1/admin/domain_blocks_controller.rb
index 28d91ef93c2148..b44ae2ae2a2130 100644
--- a/app/controllers/api/v1/admin/domain_blocks_controller.rb
+++ b/app/controllers/api/v1/admin/domain_blocks_controller.rb
@@ -5,6 +5,7 @@ class Api::V1::Admin::DomainBlocksController < Api::BaseController
   include AccountableConcern
 
   LIMIT = 100
+  MAX_LIMIT = 500
 
   before_action -> { authorize_if_got_token! :'admin:read', :'admin:read:domain_blocks' }, only: [:index, :show]
   before_action -> { authorize_if_got_token! :'admin:write', :'admin:write:domain_blocks' }, except: [:index, :show]
@@ -59,7 +60,7 @@ def conflicts_with_existing_block?(domain_block, existing_domain_block)
   end
 
   def set_domain_blocks
-    @domain_blocks = DomainBlock.order(id: :desc).to_a_paginated_by_id(limit_param(LIMIT), params_slice(:max_id, :since_id, :min_id))
+    @domain_blocks = DomainBlock.order(id: :desc).to_a_paginated_by_id(limit_param(LIMIT, MAX_LIMIT), params_slice(:max_id, :since_id, :min_id))
   end
 
   def set_domain_block
@@ -83,7 +84,7 @@ def pagination_collection
   end
 
   def records_continue?
-    @domain_blocks.size == limit_param(LIMIT)
+    @domain_blocks.size == limit_param(LIMIT, MAX_LIMIT)
   end
 
   def resource_params

From 74900195353313f83bbf8fa9e55e67890792c0e7 Mon Sep 17 00:00:00 2001
From: Emelia Smith <ThisIsMissEm@users.noreply.github.com>
Date: Fri, 2 Aug 2024 08:56:09 +0200
Subject: [PATCH 1686/2191] Fix support for IPv6 redis connections in streaming
 (#31229)

---
 streaming/index.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/streaming/index.js b/streaming/index.js
index dd9ea0c7f68348..8f66362178a2c2 100644
--- a/streaming/index.js
+++ b/streaming/index.js
@@ -248,6 +248,10 @@ const redisConfigFromEnv = (env) => {
   const redisParams = {
     host: env.REDIS_HOST || '127.0.0.1',
     port: redisPort,
+    // Force support for both IPv6 and IPv4, by default ioredis sets this to 4,
+    // only allowing IPv4 connections:
+    // https://github.com/redis/ioredis/issues/1576
+    family: 0,
     db: redisDatabase,
     password: env.REDIS_PASSWORD || undefined,
   };

From caeae25b558e733d887b0f7cf6420a28d331068e Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 2 Aug 2024 07:01:04 +0000
Subject: [PATCH 1687/2191] New Crowdin Translations (automated) (#31261)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/ca.json    |  2 +-
 app/javascript/mastodon/locales/es-MX.json |  1 +
 app/javascript/mastodon/locales/es.json    |  1 +
 app/javascript/mastodon/locales/fi.json    | 10 +++---
 app/javascript/mastodon/locales/fo.json    |  1 +
 app/javascript/mastodon/locales/ga.json    |  1 +
 app/javascript/mastodon/locales/gd.json    | 41 ++++++++++++++++++++++
 app/javascript/mastodon/locales/hu.json    |  1 +
 app/javascript/mastodon/locales/ko.json    | 17 ++++++++-
 app/javascript/mastodon/locales/sq.json    |  1 +
 app/javascript/mastodon/locales/zh-HK.json |  2 ++
 config/locales/doorkeeper.gd.yml           |  3 ++
 config/locales/fi.yml                      | 16 ++++-----
 config/locales/gd.yml                      | 25 +++++++++++++
 config/locales/ko.yml                      |  1 +
 config/locales/simple_form.gd.yml          | 10 ++++++
 config/locales/zh-HK.yml                   |  2 +-
 17 files changed, 119 insertions(+), 16 deletions(-)

diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index 6b79a8efec09a4..2ef926054ef42e 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -300,7 +300,7 @@
   "filter_modal.select_filter.subtitle": "Usa una categoria existent o crea'n una de nova",
   "filter_modal.select_filter.title": "Filtra aquest tut",
   "filter_modal.title.status": "Filtra un tut",
-  "filtered_notifications_banner.pending_requests": "Des {count, plural, =0 {de ningú} one {d'una persona} other {de # persones}} que potser coneixes",
+  "filtered_notifications_banner.pending_requests": "{count, plural, =0 {De ningú} one {D'una persona} other {De # persones}} que potser coneixes",
   "filtered_notifications_banner.title": "Notificacions filtrades",
   "firehose.all": "Tots",
   "firehose.local": "Aquest servidor",
diff --git a/app/javascript/mastodon/locales/es-MX.json b/app/javascript/mastodon/locales/es-MX.json
index 869def31a69259..7fe0ae1ba1ad86 100644
--- a/app/javascript/mastodon/locales/es-MX.json
+++ b/app/javascript/mastodon/locales/es-MX.json
@@ -300,6 +300,7 @@
   "filter_modal.select_filter.subtitle": "Usar una categoría existente o crear una nueva",
   "filter_modal.select_filter.title": "Filtrar esta publicación",
   "filter_modal.title.status": "Filtrar una publicación",
+  "filtered_notifications_banner.pending_requests": "De {count, plural, =0 {nadie} one {una persona} other {# personas}} que puede que conozcas",
   "filtered_notifications_banner.title": "Notificaciones filtradas",
   "firehose.all": "Todas",
   "firehose.local": "Este servidor",
diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json
index 41dd71c3869597..3fb1cdf0945fde 100644
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@@ -300,6 +300,7 @@
   "filter_modal.select_filter.subtitle": "Usar una categoría existente o crear una nueva",
   "filter_modal.select_filter.title": "Filtrar esta publicación",
   "filter_modal.title.status": "Filtrar una publicación",
+  "filtered_notifications_banner.pending_requests": "De {count, plural, =0 {nadie} one {una persona} other {# personas}} que puede que conozcas",
   "filtered_notifications_banner.title": "Notificaciones filtradas",
   "firehose.all": "Todas",
   "firehose.local": "Este servidor",
diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index fc331809e72217..168c2de410268b 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -30,7 +30,7 @@
   "account.endorse": "Suosittele profiilissasi",
   "account.featured_tags.last_status_at": "Viimeisin julkaisu {date}",
   "account.featured_tags.last_status_never": "Ei julkaisuja",
-  "account.featured_tags.title": "{name} pitää esillä aihetunnisteita",
+  "account.featured_tags.title": "Käyttäjän {name} esille nostamat aihetunnisteet",
   "account.follow": "Seuraa",
   "account.follow_back": "Seuraa takaisin",
   "account.followers": "Seuraajat",
@@ -211,7 +211,7 @@
   "dismissable_banner.explore_links": "Näitä uutisia jaetaan tänään sosiaalisessa verkossa eniten. Uusimmat ja eri käyttäjien eniten lähettämät uutiset nousevat korkeammalle sijalle.",
   "dismissable_banner.explore_statuses": "Nämä sosiaalisen verkon julkaisut keräävät tänään eniten huomiota. Uusimmat, tehostetuimmat ja suosikeiksi lisätyimmät julkaisut nousevat korkeammalle sijalle.",
   "dismissable_banner.explore_tags": "Nämä sosiaalisen verkon aihetunnisteet keräävät tänään eniten huomiota. Useimman käyttäjän käyttämät aihetunnisteet nousevat korkeammalle sijalle.",
-  "dismissable_banner.public_timeline": "Nämä ovat viimeisimpiä julkaisuja sosiaalisen verkon käyttäjiltä, joita seurataan palvelimella {domain}.",
+  "dismissable_banner.public_timeline": "Nämä ovat tuoreimpia julkaisuja sosiaalisen verkon käyttäjiltä, joita seurataan palvelimella {domain}.",
   "domain_block_modal.block": "Estä palvelin",
   "domain_block_modal.block_account_instead": "Estä sen sijaan @{name}",
   "domain_block_modal.they_can_interact_with_old_posts": "Tämän palvelimen käyttäjät eivät voi olla vuorovaikutuksessa vanhojen julkaisujesi kanssa.",
@@ -300,7 +300,7 @@
   "filter_modal.select_filter.subtitle": "Käytä olemassa olevaa luokkaa tai luo uusi",
   "filter_modal.select_filter.title": "Suodata tämä julkaisu",
   "filter_modal.title.status": "Suodata julkaisu",
-  "filtered_notifications_banner.pending_requests": "{count, plural, =0 {Ei keneltäkään} one {Yhdeltä henkilöltä} other {# henkilöltä}}, jonka saatat tuntea",
+  "filtered_notifications_banner.pending_requests": "{count, plural, =0 {Ei keneltäkään, jonka} one {1 käyttäjältä, jonka} other {# käyttäjältä, jotka}} saatat tuntea",
   "filtered_notifications_banner.title": "Suodatetut ilmoitukset",
   "firehose.all": "Kaikki",
   "firehose.local": "Tämä palvelin",
@@ -366,7 +366,7 @@
   "interaction_modal.on_another_server": "Toisella palvelimella",
   "interaction_modal.on_this_server": "Tällä palvelimella",
   "interaction_modal.sign_in": "Et ole kirjautunut tälle palvelimelle. Millä palvelimella tilisi sijaitsee?",
-  "interaction_modal.sign_in_hint": "Vihje: Se on sama verkkosivusto, jolle rekisteröidyit. Jos et muista palvelintasi, etsi tervetulosähköposti saapuneista viesteistäsi. Voit myös syöttää koko käyttäjätunnuksesi! (Esimerkki: @Mastodon@Mastodon.social)",
+  "interaction_modal.sign_in_hint": "Vihje: Se on sama verkkosivusto, jolle rekisteröidyit. Jos et muista palvelintasi, etsi tervetulosähköposti saapuneista viesteistäsi. Voit syöttää myös koko käyttäjätunnuksesi! (Esimerkki: @Mastodon@Mastodon.social)",
   "interaction_modal.title.favourite": "Lisää käyttäjän {name} julkaisu suosikkeihin",
   "interaction_modal.title.follow": "Seuraa käyttäjää {name}",
   "interaction_modal.title.reblog": "Tehosta käyttäjän {name} julkaisua",
@@ -533,7 +533,7 @@
   "notifications.filter.all": "Kaikki",
   "notifications.filter.boosts": "Tehostukset",
   "notifications.filter.favourites": "Suosikit",
-  "notifications.filter.follows": "Seuratut",
+  "notifications.filter.follows": "Seuraamiset",
   "notifications.filter.mentions": "Maininnat",
   "notifications.filter.polls": "Äänestyksen tulokset",
   "notifications.filter.statuses": "Päivitykset seuraamiltasi käyttäjiltä",
diff --git a/app/javascript/mastodon/locales/fo.json b/app/javascript/mastodon/locales/fo.json
index 39070514683c44..a9004ea189e3d3 100644
--- a/app/javascript/mastodon/locales/fo.json
+++ b/app/javascript/mastodon/locales/fo.json
@@ -300,6 +300,7 @@
   "filter_modal.select_filter.subtitle": "Brúka ein verandi bólk ella skapa ein nýggjan",
   "filter_modal.select_filter.title": "Filtrera hendan postin",
   "filter_modal.title.status": "Filtrera ein post",
+  "filtered_notifications_banner.pending_requests": "Frá {count, plural, =0 {ongum} one {einum persóni} other {# persónum}}, sum tú kanska kennir",
   "filtered_notifications_banner.title": "Sáldaðar fráboðanir",
   "firehose.all": "Allar",
   "firehose.local": "Hesin ambætarin",
diff --git a/app/javascript/mastodon/locales/ga.json b/app/javascript/mastodon/locales/ga.json
index 3880ab0daaf750..44bc62c755f8fc 100644
--- a/app/javascript/mastodon/locales/ga.json
+++ b/app/javascript/mastodon/locales/ga.json
@@ -300,6 +300,7 @@
   "filter_modal.select_filter.subtitle": "Bain úsáid as catagóir reatha nó cruthaigh ceann nua",
   "filter_modal.select_filter.title": "Déan scagadh ar an bpostáil seo",
   "filter_modal.title.status": "Déan scagadh ar phostáil",
+  "filtered_notifications_banner.pending_requests": "Ó {count, plural, =0 {duine ar bith} one {duine amháin} two {# daoine} few {# daoine} many {# daoine} other {# daoine}} b’fhéidir go bhfuil aithne agat orthu",
   "filtered_notifications_banner.title": "Fógraí scagtha",
   "firehose.all": "Gach",
   "firehose.local": "An freastalaí seo",
diff --git a/app/javascript/mastodon/locales/gd.json b/app/javascript/mastodon/locales/gd.json
index 846c96b2d6ae0d..440654b0db59f8 100644
--- a/app/javascript/mastodon/locales/gd.json
+++ b/app/javascript/mastodon/locales/gd.json
@@ -35,7 +35,9 @@
   "account.follow_back": "Lean air ais",
   "account.followers": "Luchd-leantainn",
   "account.followers.empty": "Chan eil neach sam bith a’ leantainn air a’ chleachdaiche seo fhathast.",
+  "account.followers_counter": "{count, plural, one {{counter} neach-leantainn} other {{counter} luchd-leantainn}}",
   "account.following": "A’ leantainn",
+  "account.following_counter": "{count, plural, one {Tha {counter} a’ leantainn} other {Tha {counter} a’ leantainn}}",
   "account.follows.empty": "Chan eil an cleachdaiche seo a’ leantainn neach sam bith fhathast.",
   "account.go_to_profile": "Tadhail air a’ phròifil",
   "account.hide_reblogs": "Falaich na brosnachaidhean o @{name}",
@@ -61,6 +63,7 @@
   "account.requested_follow": "Dh’iarr {name} ’gad leantainn",
   "account.share": "Co-roinn a’ phròifil aig @{name}",
   "account.show_reblogs": "Seall na brosnachaidhean o @{name}",
+  "account.statuses_counter": "{count, plural, one {{counter} phost} two {{counter} phost} few {{counter} postaichean} other {{counter} post}}",
   "account.unblock": "Dì-bhac @{name}",
   "account.unblock_domain": "Dì-bhac an àrainn {domain}",
   "account.unblock_short": "Dì-bhac",
@@ -168,21 +171,28 @@
   "confirmations.block.confirm": "Bac",
   "confirmations.delete.confirm": "Sguab às",
   "confirmations.delete.message": "A bheil thu cinnteach gu bheil thu airson am post seo a sguabadh às?",
+  "confirmations.delete.title": "A bheil thu airson am post a sguabadh às?",
   "confirmations.delete_list.confirm": "Sguab às",
   "confirmations.delete_list.message": "A bheil thu cinnteach gu bheil thu airson an liosta seo a sguabadh às gu buan?",
+  "confirmations.delete_list.title": "A bheil thu airson an liosta a sguabadh às?",
   "confirmations.discard_edit_media.confirm": "Tilg air falbh",
   "confirmations.discard_edit_media.message": "Tha atharraichean gun sàbhaladh agad ann an tuairisgeul no ro-shealladh a’ mheadhain, a bheil thu airson an tilgeil air falbh co-dhiù?",
   "confirmations.edit.confirm": "Deasaich",
   "confirmations.edit.message": "Ma nì thu deasachadh an-dràsta, thèid seo a sgrìobhadh thairis air an teachdaireachd a tha thu a’ sgrìobhadh an-dràsta. A bheil thu cinnteach gu bheil thu airson leantainn air adhart?",
+  "confirmations.edit.title": "A bheil thu airson sgrìobhadh thairis air a’ phost?",
   "confirmations.logout.confirm": "Clàraich a-mach",
   "confirmations.logout.message": "A bheil thu cinnteach gu bheil thu airson clàradh a-mach?",
+  "confirmations.logout.title": "A bheil thu airson clàradh a-mach?",
   "confirmations.mute.confirm": "Mùch",
   "confirmations.redraft.confirm": "Sguab às ⁊ dèan dreachd ùr",
   "confirmations.redraft.message": "A bheil thu cinnteach gu bheil thu airson am post seo a sguabadh às agus dreachd ùr a thòiseachadh? Caillidh tu gach annsachd is brosnachadh air agus thèid freagairtean dhan phost thùsail ’nan dìlleachdanan.",
+  "confirmations.redraft.title": "A bheil thu airson am post a sguabadh às ⁊ dreachd ùr a dhèanamh dheth?",
   "confirmations.reply.confirm": "Freagair",
   "confirmations.reply.message": "Ma bheir thu freagairt an-dràsta, thèid seo a sgrìobhadh thairis air an teachdaireachd a tha thu a’ sgrìobhadh an-dràsta. A bheil thu cinnteach gu bheil thu airson leantainn air adhart?",
+  "confirmations.reply.title": "A bheil thu airson sgrìobhadh thairis air a’ phost?",
   "confirmations.unfollow.confirm": "Na lean tuilleadh",
   "confirmations.unfollow.message": "A bheil thu cinnteach nach eil thu airson {name} a leantainn tuilleadh?",
+  "confirmations.unfollow.title": "A bheil thu airson sgur de leantainn a chleachdaiche?",
   "conversation.delete": "Sguab às an còmhradh",
   "conversation.mark_as_read": "Cuir comharra gun deach a leughadh",
   "conversation.open": "Seall an còmhradh",
@@ -290,6 +300,7 @@
   "filter_modal.select_filter.subtitle": "Cleachd roinn-seòrsa a tha ann no cruthaich tè ùr",
   "filter_modal.select_filter.title": "Criathraich am post seo",
   "filter_modal.title.status": "Criathraich post",
+  "filtered_notifications_banner.pending_requests": "{count, plural, =0 {Chan eil gin ann} one {O # neach} two {O # neach} few {O # daoine} other {O # duine}} air a bheil thu eòlach ’s dòcha",
   "filtered_notifications_banner.title": "Brathan criathraichte",
   "firehose.all": "Na h-uile",
   "firehose.local": "Am frithealaiche seo",
@@ -299,6 +310,7 @@
   "follow_requests.unlocked_explanation": "Ged nach eil an cunntas agad glaiste, tha sgioba {domain} dhen bheachd gum b’ fheàirrde thu lèirmheas a dhèanamh air na h-iarrtasan leantainn o na cunntasan seo a làimh.",
   "follow_suggestions.curated_suggestion": "Roghainn an sgioba",
   "follow_suggestions.dismiss": "Na seall seo a-rithist",
+  "follow_suggestions.featured_longer": "Chaidh a thaghadh a làmh leis an sgioba aig {domain}",
   "follow_suggestions.friends_of_friends_longer": "Fèill mhòr am measg nan daoine a leanas tu",
   "follow_suggestions.hints.featured": "Chaidh a’ phròifil seo a thaghadh le sgioba {domain} a làimh.",
   "follow_suggestions.hints.friends_of_friends": "Tha fèill mhòr air a’ phròifil seo am measg nan daoine a leanas tu.",
@@ -308,6 +320,7 @@
   "follow_suggestions.personalized_suggestion": "Moladh pearsanaichte",
   "follow_suggestions.popular_suggestion": "Moladh air a bheil fèill mhòr",
   "follow_suggestions.popular_suggestion_longer": "Fèill mhòr air {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Tha e coltach ri pròifilean a lean thu o chionn goirid",
   "follow_suggestions.view_all": "Seall na h-uile",
   "follow_suggestions.who_to_follow": "Molaidhean leantainn",
   "followed_tags": "Tagaichean hais ’gan leantainn",
@@ -403,6 +416,8 @@
   "limited_account_hint.action": "Seall a’ phròifil co-dhiù",
   "limited_account_hint.title": "Chaidh a’ phròifil seo fhalach le maoir {domain}.",
   "link_preview.author": "Le {name}",
+  "link_preview.more_from_author": "Barrachd le {name}",
+  "link_preview.shares": "{count, plural, one {{counter} phost} two {{counter} phost} few {{counter} postaichean} other {{counter} post}}",
   "lists.account.add": "Cuir ris an liosta",
   "lists.account.remove": "Thoir air falbh on liosta",
   "lists.delete": "Sguab às an liosta",
@@ -430,6 +445,8 @@
   "mute_modal.title": "A bheil thu airson an cleachdaiche a mhùchadh?",
   "mute_modal.you_wont_see_mentions": "Chan fhaic thu na postaichean a bheir iomradh orra.",
   "mute_modal.you_wont_see_posts": "Chì iad na postaichean agad fhathast ach chan fhaic thu na postaichean aca-san.",
+  "name_and_others": "{name} ’s {count, plural, one {# eile} other {# eile}}",
+  "name_and_others_with_link": "{name} ’s <a>{count, plural, one {# eile} other {# eile}}</a>",
   "navigation_bar.about": "Mu dhèidhinn",
   "navigation_bar.advanced_interface": "Fosgail san eadar-aghaidh-lìn adhartach",
   "navigation_bar.blocks": "Cleachdaichean bacte",
@@ -457,13 +474,27 @@
   "navigation_bar.security": "Tèarainteachd",
   "not_signed_in_indicator.not_signed_in": "Feumaidh tu clàradh a-steach mus fhaigh thu cothrom air a’ ghoireas seo.",
   "notification.admin.report": "Rinn {name} gearan mu {target}",
+  "notification.admin.report_account": "Rinn {name} gearan mu {count, plural, one {# phost} two {# phost} few {# postaichean} other {# post}} le {target} air adhbhar {category}",
+  "notification.admin.report_account_other": "Rinn {name} gearan mu {count, plural, one {# phost} two {# phost} few {# postaichean} other {# post}} le {target}",
+  "notification.admin.report_statuses": "Rinn {name} gearan mu {target} air adhbhar {category}",
+  "notification.admin.report_statuses_other": "Rinn {name} gearan mu {target}",
   "notification.admin.sign_up": "Chlàraich {name}",
   "notification.favourite": "Is annsa le {name} am post agad",
   "notification.follow": "Tha {name} ’gad leantainn a-nis",
   "notification.follow_request": "Dh’iarr {name} ’gad leantainn",
   "notification.mention": "Thug {name} iomradh ort",
   "notification.moderation-warning.learn_more": "Barrachd fiosrachaidh",
+  "notification.moderation_warning": "Fhuair thu rabhadh on mhaorsainneachd",
+  "notification.moderation_warning.action_delete_statuses": "Chaidh cuid dhe na postaichean agad a thoirt air falbh.",
+  "notification.moderation_warning.action_disable": "Chaidh an cunntas agad a chur à comas.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Chaidh comharra a chur ri cuid dhe na postaichean agad gu bheil iad frionasach.",
+  "notification.moderation_warning.action_none": "Fhuair an cunntas agad rabhadh on mhaorsainneachd.",
+  "notification.moderation_warning.action_sensitive": "Thèid comharra na frionasachd a chur ris na postaichean agad o seo a-mach.",
+  "notification.moderation_warning.action_silence": "Chaidh an cunntas agad a chuingeachadh.",
+  "notification.moderation_warning.action_suspend": "Chaidh an cunntas agad a chur à rèim.",
   "notification.own_poll": "Thàinig an cunntas-bheachd agad gu crìoch",
+  "notification.poll": "Thàinig cunntas-bheachd sa bhòt thu gu crìoch",
+  "notification.private_mention": "Thug {name} iomradh ort gu prìobhaideach",
   "notification.reblog": "Bhrosnaich {name} am post agad",
   "notification.relationships_severance_event": "Chaill thu dàimhean le {name}",
   "notification.relationships_severance_event.account_suspension": "Chuir rianaire aig {from} {target} à rèim agus is ciall dha sin nach fhaigh thu naidheachdan uapa ’s nach urrainn dhut conaltradh leotha.",
@@ -478,9 +509,12 @@
   "notification_requests.title": "Brathan criathraichte",
   "notifications.clear": "Falamhaich na brathan",
   "notifications.clear_confirmation": "A bheil thu cinnteach gu bheil thu airson na brathan uile agad fhalamhachadh gu buan?",
+  "notifications.clear_title": "A bheil thu airson na brathan fhalamhachadh?",
   "notifications.column_settings.admin.report": "Gearanan ùra:",
   "notifications.column_settings.admin.sign_up": "Clàraidhean ùra:",
   "notifications.column_settings.alert": "Brathan deasga",
+  "notifications.column_settings.beta.category": "Gleusan deuchainneil",
+  "notifications.column_settings.beta.grouping": "Buidhnich na brathan",
   "notifications.column_settings.favourite": "Annsachdan:",
   "notifications.column_settings.filter_bar.advanced": "Seall a h-uile roinn-seòrsa",
   "notifications.column_settings.filter_bar.category": "Bàr-criathraidh luath",
@@ -644,9 +678,13 @@
   "report.unfollow_explanation": "Tha thu a’ leantainn a’ chunntais seo. Sgur dhen leantainn ach nach fhaic thu na puist aca nad dhachaigh.",
   "report_notification.attached_statuses": "Tha {count, plural, one {{counter} phost} two {{counter} phost} few {{counter} postaichean} other {{counter} post}} ceangailte ris",
   "report_notification.categories.legal": "Laghail",
+  "report_notification.categories.legal_sentence": "susbaint mhì-laghail",
   "report_notification.categories.other": "Eile",
+  "report_notification.categories.other_sentence": "eile",
   "report_notification.categories.spam": "Spama",
+  "report_notification.categories.spam_sentence": "spama",
   "report_notification.categories.violation": "Briseadh riaghailte",
+  "report_notification.categories.violation_sentence": "briseadh riaghailte",
   "report_notification.open": "Fosgail an gearan",
   "search.no_recent_searches": "Cha do rinn thu lorg o chionn goirid",
   "search.placeholder": "Lorg",
@@ -674,8 +712,11 @@
   "server_banner.about_active_users": "Daoine a chleachd am frithealaiche seo rè an 30 latha mu dheireadh (Cleachdaichean gnìomhach gach mìos)",
   "server_banner.active_users": "cleachdaichean gnìomhach",
   "server_banner.administered_by": "Rianachd le:",
+  "server_banner.is_one_of_many": "Is {domain} fear de dh’iomadh frithealaiche Mastodon neo-eisimeileach as urrainn dhut cleachdadh airson pàirt a ghabhail sa cho-shaoghal.",
   "server_banner.server_stats": "Stadastaireachd an fhrithealaiche:",
   "sign_in_banner.create_account": "Cruthaich cunntas",
+  "sign_in_banner.follow_anyone": "Lean duine sam bith air a’ cho-shaoghal agus faic a h-uile càil a-rèir an ama. Chan eil sgeul air algairimean, sanasachd no clickbait.",
+  "sign_in_banner.mastodon_is": "Is Mastodon an dòigh as fheàrr airson sùil a chumail air na tha a’ dol.",
   "sign_in_banner.sign_in": "Clàraich a-steach",
   "sign_in_banner.sso_redirect": "Clàraich a-steach no clàraich leinn",
   "status.admin_account": "Fosgail eadar-aghaidh na maorsainneachd dha @{name}",
diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json
index 967efd8d0c6bcc..9e9a3cd251fcea 100644
--- a/app/javascript/mastodon/locales/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@@ -300,6 +300,7 @@
   "filter_modal.select_filter.subtitle": "Válassz egy meglévő kategóriát, vagy hozz létre egy újat",
   "filter_modal.select_filter.title": "E bejegyzés szűrése",
   "filter_modal.title.status": "Egy bejegyzés szűrése",
+  "filtered_notifications_banner.pending_requests": "{count, plural, =0 {senkitől} one {egy valószínűleg ismerős személytől} other {# valószínűleg ismerős személytől}}",
   "filtered_notifications_banner.title": "Szűrt értesítések",
   "firehose.all": "Összes",
   "firehose.local": "Ez a kiszolgáló",
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index 4f70e3bcf24d8f..a9b634dbaeba37 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -300,6 +300,7 @@
   "filter_modal.select_filter.subtitle": "기존의 카테고리를 사용하거나 새로 하나를 만듧니다",
   "filter_modal.select_filter.title": "이 게시물을 필터",
   "filter_modal.title.status": "게시물 필터",
+  "filtered_notifications_banner.pending_requests": "알 수도 있는 {count, plural, =0 {0 명} one {한 명} other {# 명}}의 사람들로부터",
   "filtered_notifications_banner.title": "걸러진 알림",
   "firehose.all": "모두",
   "firehose.local": "이 서버",
@@ -444,6 +445,8 @@
   "mute_modal.title": "사용자를 뮤트할까요?",
   "mute_modal.you_wont_see_mentions": "그를 멘션하는 게시물을 더는 보지 않게 됩니다.",
   "mute_modal.you_wont_see_posts": "내가 작성한 게시물을 볼 수는 있지만, 나는 그가 작성한 것을 보지 않게 됩니다.",
+  "name_and_others": "{name} 외 {count, plural, other {# 명}}",
+  "name_and_others_with_link": "{name} 외 <a>{count, plural, other {# 명}}</a>",
   "navigation_bar.about": "정보",
   "navigation_bar.advanced_interface": "고급 웹 인터페이스에서 열기",
   "navigation_bar.blocks": "차단한 사용자",
@@ -471,6 +474,10 @@
   "navigation_bar.security": "보안",
   "not_signed_in_indicator.not_signed_in": "이 정보에 접근하려면 로그인을 해야 합니다.",
   "notification.admin.report": "{name} 님이 {target}를 신고했습니다",
+  "notification.admin.report_account": "{name} 님이 {target}의 게시물 {count, plural, other {# 개}}를 {category}로 신고했습니다",
+  "notification.admin.report_account_other": "{name} 님이 {target}의 게시물 {count, plural, other {# 개}}를 신고했습니다",
+  "notification.admin.report_statuses": "{name} 님이 {target}을 {category}로 신고했습니다",
+  "notification.admin.report_statuses_other": "{name} 님이 {target}을 신고했습니다",
   "notification.admin.sign_up": "{name} 님이 가입했습니다",
   "notification.favourite": "{name} 님이 내 게시물을 좋아합니다",
   "notification.follow": "{name} 님이 나를 팔로우했습니다",
@@ -486,6 +493,8 @@
   "notification.moderation_warning.action_silence": "계정이 제한되었습니다.",
   "notification.moderation_warning.action_suspend": "계정이 정지되었습니다.",
   "notification.own_poll": "설문을 마침",
+  "notification.poll": "참여한 투표가 끝났습니다",
+  "notification.private_mention": "{name} 님이 나를 개인적으로 멘션했습니다",
   "notification.reblog": "{name} 님이 부스트했습니다",
   "notification.relationships_severance_event": "{name} 님과의 연결이 끊어졌습니다",
   "notification.relationships_severance_event.account_suspension": "{from}의 관리자가 {target}를 정지시켰기 때문에 그들과 더이상 상호작용 할 수 없고 정보를 받아볼 수 없습니다.",
@@ -504,6 +513,8 @@
   "notifications.column_settings.admin.report": "새 신고:",
   "notifications.column_settings.admin.sign_up": "새로운 가입:",
   "notifications.column_settings.alert": "데스크탑 알림",
+  "notifications.column_settings.beta.category": "실험적인 기능",
+  "notifications.column_settings.beta.grouping": "알림 그룹화",
   "notifications.column_settings.favourite": "좋아요:",
   "notifications.column_settings.filter_bar.advanced": "모든 범주 표시",
   "notifications.column_settings.filter_bar.category": "빠른 필터 막대",
@@ -667,9 +678,13 @@
   "report.unfollow_explanation": "이 계정을 팔로우하고 있습니다. 홈 피드에서 더 이상 게시물을 받아 보지 않으려면 팔로우를 해제하십시오.",
   "report_notification.attached_statuses": "{count}개의 게시물 첨부됨",
   "report_notification.categories.legal": "법령",
+  "report_notification.categories.legal_sentence": "불법적인 내용",
   "report_notification.categories.other": "기타",
+  "report_notification.categories.other_sentence": "기타",
   "report_notification.categories.spam": "스팸",
+  "report_notification.categories.spam_sentence": "스팸",
   "report_notification.categories.violation": "규칙 위반",
+  "report_notification.categories.violation_sentence": "규칙 위반",
   "report_notification.open": "신고 열기",
   "search.no_recent_searches": "최근 검색 기록이 없습니다",
   "search.placeholder": "검색",
@@ -761,7 +776,7 @@
   "status.title.with_attachments": "{user} 님이 {attachmentCount, plural, one {첨부파일} other {{attachmentCount}개의 첨부파일}}과 함께 게시함",
   "status.translate": "번역",
   "status.translated_from_with": "{provider}에 의해 {lang}에서 번역됨",
-  "status.uncached_media_warning": "마리보기 허용되지 않음",
+  "status.uncached_media_warning": "미리보기를 사용할 수 없습니다",
   "status.unmute_conversation": "이 대화의 뮤트 해제하기",
   "status.unpin": "고정 해제",
   "subscribed_languages.lead": "변경 후에는 선택한 언어들로 작성된 게시물들만 홈 타임라인과 리스트 타임라인에 나타나게 됩니다. 아무 것도 선택하지 않으면 모든 언어로 작성된 게시물을 받아봅니다.",
diff --git a/app/javascript/mastodon/locales/sq.json b/app/javascript/mastodon/locales/sq.json
index a9a98e239da0e9..078092b50a1081 100644
--- a/app/javascript/mastodon/locales/sq.json
+++ b/app/javascript/mastodon/locales/sq.json
@@ -300,6 +300,7 @@
   "filter_modal.select_filter.subtitle": "Përdorni një kategori ekzistuese, ose krijoni një të re",
   "filter_modal.select_filter.title": "Filtroje këtë postim",
   "filter_modal.title.status": "Filtroni një postim",
+  "filtered_notifications_banner.pending_requests": "Nga {count, plural, =0 {askush} one {një person} other {# vetë}} që mund të njihni",
   "filtered_notifications_banner.title": "Njoftime të filtruar",
   "firehose.all": "Krejt",
   "firehose.local": "Këtë shërbyes",
diff --git a/app/javascript/mastodon/locales/zh-HK.json b/app/javascript/mastodon/locales/zh-HK.json
index f5a7c31a217365..389b5c4a3a5a04 100644
--- a/app/javascript/mastodon/locales/zh-HK.json
+++ b/app/javascript/mastodon/locales/zh-HK.json
@@ -168,6 +168,7 @@
   "confirmations.block.confirm": "封鎖",
   "confirmations.delete.confirm": "刪除",
   "confirmations.delete.message": "你確定要刪除這文章嗎？",
+  "confirmations.delete.title": "刪除帖文？",
   "confirmations.delete_list.confirm": "刪除",
   "confirmations.delete_list.message": "你確定要永久刪除這列表嗎？",
   "confirmations.discard_edit_media.confirm": "捨棄",
@@ -176,6 +177,7 @@
   "confirmations.edit.message": "現在編輯將會覆蓋你目前正在撰寫的訊息。你確定要繼續嗎？",
   "confirmations.logout.confirm": "登出",
   "confirmations.logout.message": "確定要登出嗎？",
+  "confirmations.logout.title": "登出？",
   "confirmations.mute.confirm": "靜音",
   "confirmations.redraft.confirm": "刪除並編輯",
   "confirmations.redraft.message": "你確定要移除並重新起草這篇帖文嗎？你將會失去最愛和轉推，而回覆也會與原始帖文斷開連接。",
diff --git a/config/locales/doorkeeper.gd.yml b/config/locales/doorkeeper.gd.yml
index 4db4497b4ea25c..1db1a90f8014a3 100644
--- a/config/locales/doorkeeper.gd.yml
+++ b/config/locales/doorkeeper.gd.yml
@@ -83,6 +83,7 @@ gd:
         access_denied: Dhiùlt sealbhadair a’ ghoireis no am frithealaiche ùghdarrachaidh an t-iarrtas.
         credential_flow_not_configured: Dh’fhàillig le sruth cruthachadh teisteas facail-fhaire do shealbhadair a’ ghoireis ri linn Doorkeeper.configure.resource_owner_from_credentials gun rèiteachadh.
         invalid_client: Dh’fhàillig le dearbhadh a’ chliant ri linn cliant nach aithne dhuinn, dearbhadh cliant nach deach gabhail a-staigh no dòigh dearbhaidh ris nach cuirear taic.
+        invalid_code_challenge_method: Feumaidh an dòigh an dùbhlain a bhith na S256, chan eil taic ri plain.
         invalid_grant: Chan eil an t-ùghdarrachadh a chaidh a thoirt seachad dligheach, dh’fhalbh an ùine air, chaidh a chùl-ghairm no chan eil e a-rèir URI an ath-stiùiridh a chaidh a chleachdadh san iarrtas ùghdarrachaidh no chaidh fhoillseachadh le cliant eile.
         invalid_redirect_uri: Chan eil an URI ath-stiùiridh a chaidh a ghabhail a-staigh dligheach.
         invalid_request:
@@ -135,6 +136,7 @@ gd:
         media: Ceanglachain mheadhanan
         mutes: Mùchaidhean
         notifications: Brathan
+        profile: A’ phròifil Mastodon agad
         push: Brathan putaidh
         reports: Gearanan
         search: Lorg
@@ -165,6 +167,7 @@ gd:
       admin:write:reports: gnìomhan na maorsainneachd air gearanan
       crypto: cleachdadh crioptachaidh o cheann gu ceann
       follow: atharrachadh dàimhean chunntasan
+      profile: leughadh fiosrachadh pròifil a’ chunntais agad a-mhàin
       push: faighinn nam brathan putaidh agad
       read: leughadh dàta sam bith a’ cunntais agad
       read:accounts: sealltainn fiosrachadh nan cunntasan
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index a9a8f199509097..d90de587b7c81f 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -775,7 +775,7 @@ fi:
         trends: Trendit
       domain_blocks:
         all: Kaikille
-        disabled: Ei kenellekkään
+        disabled: Ei kenellekään
         users: Kirjautuneille paikallisille käyttäjille
       registrations:
         moderation_recommandation: Varmista, että sinulla on riittävä ja toimintavalmis joukko moderaattoreita, ennen kuin avaat rekisteröitymisen kaikille!
@@ -896,8 +896,8 @@ fi:
         unreviewed: Tarkastamaton
         usable: Käytettävissä
       name: Nimi
-      newest: Uusin
-      oldest: Vanhin
+      newest: Uusimmat
+      oldest: Vanhimmat
       reset: Palauta
       review: Tarkastuksen tila
       search: Hae
@@ -1130,7 +1130,7 @@ fi:
       new_confirmation_instructions_sent: Saat pian uuden vahvistuslinkin sisältävän sähköpostiviestin!
       title: Tarkista sähköpostilaatikkosi
     sign_in:
-      preamble_html: Kirjaudu <strong>%{domain}</strong>-tunnuksellasi. Jos tilisi sijaitsee eri palvelimella, et voi kirjautua tässä.
+      preamble_html: Kirjaudu <strong>%{domain}</strong>-tunnuksellasi. Jos tilisi on eri palvelimella, et voi kirjautua tässä.
       title: Kirjaudu palvelimelle %{domain}
     sign_up:
       manual_review: Palvelimen %{domain} ylläpito tarkastaa rekisteröitymiset käsin. Helpottaaksesi rekisteröitymisesi käsittelyä kerro hieman itsestäsi ja siitä, miksi haluat luoda käyttäjätilin palvelimelle %{domain}.
@@ -1262,8 +1262,8 @@ fi:
   featured_tags:
     add_new: Lisää uusi
     errors:
-      limit: Pidät esillä jo aihetunnisteiden enimmäismäärää
-    hint_html: "<strong>Pidä tärkeimpiä aihetunnisteitasi esillä profiilissasi.</strong> Erinomainen työkalu, jolla pidät kirjaa luovista teoksistasi ja pitkäaikaisista projekteistasi. Esillä pitämäsi aihetunnisteet ovat näyttävällä paikalla profiilissasi ja mahdollistavat nopean pääsyn julkaisuihisi."
+      limit: Olet nostanut esille jo enimmäismäärän aihetunnisteita
+    hint_html: "<strong>Nosta tärkeimmät aihetunnisteesi esille profiilissasi.</strong> Erinomainen työkalu, jolla pidät kirjaa luovista teoksistasi ja pitkäaikaisista projekteistasi. Esille nostamasi aihetunnisteet ovat näyttävällä paikalla profiilissasi ja mahdollistavat nopean pääsyn julkaisuihisi."
   filters:
     contexts:
       account: Profiilit
@@ -1593,7 +1593,7 @@ fi:
     invited: Kutsutut
     last_active: Viimeksi aktiiviset
     most_recent: Viimeisimmät
-    moved: Muuttanut
+    moved: Muuttaneet
     mutual: Seuraatte toisianne
     primary: Ensisijaiset
     relationship: Seurantasuhde
@@ -1675,7 +1675,7 @@ fi:
     development: Kehitys
     edit_profile: Muokkaa profiilia
     export: Vie tietoja
-    featured_tags: Esillä pidettävät aihetunnisteet
+    featured_tags: Esille nostetut aihetunnisteet
     import: Tuo tietoja
     import_and_export: Tuonti ja vienti
     migrate: Tilin muutto toisaalle
diff --git a/config/locales/gd.yml b/config/locales/gd.yml
index 52b25e28543dd8..b9f0260f52459e 100644
--- a/config/locales/gd.yml
+++ b/config/locales/gd.yml
@@ -232,6 +232,7 @@ gd:
         update_custom_emoji: Ùraich an t-Emoji gnàthaichte
         update_domain_block: Ùraich bacadh na h-àrainne
         update_ip_block: Ùraich an riaghailt IP
+        update_report: Ùraich an gearan
         update_status: Ùraich am post
         update_user_role: Ùraich an dreuchd
       actions:
@@ -291,6 +292,7 @@ gd:
         update_custom_emoji_html: Dh’ùraich %{name} an Emoji %{target}
         update_domain_block_html: Dh’ùraich %{name} bacadh na h-àrainne %{target}
         update_ip_block_html: Sguab %{name} às riaghailt dhan IP %{target}
+        update_report_html: Dh’ùraich %{name} an gearan %{target}
         update_status_html: Dh’ùraich %{name} post le %{target}
         update_user_role_html: Dh’atharraich %{name} an dreuchd %{target}
       deleted_account: chaidh an cunntas a sguabadh às
@@ -298,6 +300,7 @@ gd:
       filter_by_action: Criathraich a-rèir gnìomha
       filter_by_user: Criathraich a-rèir cleachdaiche
       title: Sgrùd an loga
+      unavailable_instance: "(chan eil ainm na h-àrainn ri fhaighinn)"
     announcements:
       destroyed_msg: Chaidh am brath-fios a sguabadh às!
       edit:
@@ -484,6 +487,9 @@ gd:
       title: Molaidhean leantainn
       unsuppress: Aisig am moladh leantainn
     instances:
+      audit_log:
+        title: Logaichean sgrùdaidh o chionn goirid
+        view_all: Seall na logaichean sgrùdaidh slàna
       availability:
         description_html:
           few: Ma dh’fhàilligeas an lìbhrigeadh dhan àrainn fad <strong>%{count} làithean</strong>, chan fheuch sinn a-rithist leis an lìbhrigeadh ach às dèidh lìbhrigeadh fhaighinn <em>on àrainn ud fhèin</em>.
@@ -660,6 +666,7 @@ gd:
       report: 'Gearan air #%{id}'
       reported_account: Cunntas mun a chaidh a ghearan
       reported_by: Chaidh gearan a dhèanamh le
+      reported_with_application: Chaidh an gearan a dhèanamh le aplacaid
       resolved: Air fhuasgladh
       resolved_msg: Chaidh an gearan fhuasgladh!
       skip_to_actions: Geàrr leum dha na gnìomhan
@@ -779,6 +786,7 @@ gd:
         desc_html: Tha seo an eisimeil air sgriobtaichean hCaptcha on taobh a-muigh a dh’fhaodadh a bhith ’na dhragh tèarainteachd ’s prìobhaideachd. A bharrachd air sin, <strong>nì seo an clàradh mòran nas do-ruigsinn no chuid (gu h-àraidh an fheadhainn air a bheil ciorram)</strong>. Air na h-adhbharan sin, beachdaich air dòighean eile mar clàradh stèidhichte air aontachadh no cuireadh.
         title: Iarr air cleachdaichean ùra gum fuasgail iad CAPTCHA gus an cunntas aca a dhearbhadh
       content_retention:
+        danger_zone: Earrann chunnartach
         preamble: Stiùirich mar a tha susbaint an luchd-cleachdaidh ’ga stòradh ann am Mastodon.
         title: Glèidheadh na susbaint
       default_noindex:
@@ -905,7 +913,23 @@ gd:
         action: Thoir sùil an-seo airson barrachd fiosrachaidh
         message_html: "<strong>Chaidh stòras nan oibseactan agad a dhroch-rèiteachadh. Tha prìobhaideachd an luchd-cleachdaidh agad fo chunnart.</strong>"
     tags:
+      moderation:
+        not_trendable: Chan fhaod a threandadh
+        not_usable: Cha ghabh a chleachdadh
+        pending_review: A’ feitheamh air lèirmheas
+        review_requested: Chaidh lèirmheas iarraidh
+        reviewed: Chaidh lèirmheas a dhèanamh air
+        title: Staid
+        trendable: Faodaidh a threandadh
+        unreviewed: Gun lèirmheas
+        usable: Gabhaidh a chleachdadh
+      name: Ainm
+      newest: As ùire
+      oldest: As sine
+      reset: Ath-shuidhich
       review: Dèan lèirmheas air an staid
+      search: Lorg
+      title: Tagaichean hais
       updated_msg: Chaidh roghainnean an taga hais ùrachadh
     title: Rianachd
     trends:
@@ -983,6 +1007,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
     webhooks:
       add_new: Cuir puing-dheiridh ris
       delete: Sguab às
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 18fe9cf9920f1a..4d21a7dd3d092c 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -632,6 +632,7 @@ ko:
       report: '신고 #%{id}'
       reported_account: 신고 대상 계정
       reported_by: 신고자
+      reported_with_application: 신고에 사용된 앱
       resolved: 해결
       resolved_msg: 신고를 잘 해결했습니다!
       skip_to_actions: 작업으로 건너뛰기
diff --git a/config/locales/simple_form.gd.yml b/config/locales/simple_form.gd.yml
index 946320aa044c81..4375feb492b696 100644
--- a/config/locales/simple_form.gd.yml
+++ b/config/locales/simple_form.gd.yml
@@ -77,10 +77,15 @@ gd:
           warn: Falaich an t-susbaint chriathraichte air cùlaibh rabhaidh a dh’innseas tiotal na criathraige
       form_admin_settings:
         activity_api_enabled: Cunntasan nam postaichean a chaidh fhoillseachadh gu h-ionadail, nan cleachdaichean gnìomhach ’s nan clàraidhean ùra an am bucaidean seachdaineil
+        app_icon: WEBP, PNG, GIF no JPG. Tar-àithnidh seo ìomhaigheag bhunaiteach na h-aplacaid air uidheaman mobile le ìomhaigheag ghnàthaichte.
+        backups_retention_period: "’S urrainn do chleachdaichean tasg-lannan dhe na postaichean aca a gintinn airson an luchdadh a-nuas an uairsin. Nuair a bhios luach dearbh air, thèid na tasg-lannan a sguabadh às on stòras agad gu fèin-obrachail às dèidh an àireamh de làithean a shònraich thu."
         bootstrap_timeline_accounts: Thèid na cunntasan seo a phrìneachadh air bàrr nam molaidhean leantainn dhan luchd-cleachdaidh ùr.
         closed_registrations_message: Thèid seo a shealltainn nuair a bhios an clàradh dùinte
+        content_cache_retention_period: Thèid a h-uile post o fhrithealaiche sam bith eile (a’ gabhail a-staigh brosnachaidhean is freagairtean) a sguabadh às às dèidh na h-àireimh de làithean a shònraich thu ’s gun diù a chon air eadar-ghabhail ionadail air na postaichean ud. Gabhaidh seo a-steach na postaichean a chuir cleachdaiche ionadail ris na h-annsachdan aca no comharran-lìn riutha. Thèid iomraidhean prìobhaideach eadar cleachdaichean o ionstansan diofraichte air chall cuideachd agus cha ghabh an aiseag idir. Tha an roghainn seo do dh’ionstansan sònraichte a-mhàin agus briseadh e dùilean an luchd-cleachdaidh nuair a rachadh a chleachdadh gu coitcheann.
         custom_css: "’S urrainn dhut stoidhlean gnàthaichte a chur an sàs air an tionndadh-lìn de Mhastodon."
+        favicon: WEBP, PNG, GIF no JPG. Tar-àithnidh seo favicon bunaiteach Mhastodon le ìomhaigheag ghnàthaichte.
         mascot: Tar-àithnidh seo an sgead-dhealbh san eadar-aghaidh-lìn adhartach.
+        media_cache_retention_period: Thèid faidhlichean meadhain o phostaichean a chruthaich cleachdaichean cèine a chur ri tasgadan an fhrithealaiche agad. Nuair a shuidhicheas tu seo air luach dearbh, thèid na meadhanan a sguabadh às às dèidh na h-àireimh de làithean a shònraich thu. Ma tha dàta meadhain ga iarraidh às dèidh a sguabaidh às, thèid a luchdadh a-nuas a-rithist ma tha susbaint an tùis ri fhaighinn fhathast. Ri linn cuingeachaidhean air mar a cheasnaicheas cairtean ro-sheallaidh làraichean threas-phàrtaidhean, mholamaid gun suidhich thu an luach seo air 14 làithean ar a char as giorra no cha dèid an ùrachadh nuair a thèid an iarraidh ron àm sin.
         peers_api_enabled: Seo liosta de dh’ainmean àrainne ris an do thachair am frithealaiche seo sa cho-shaoghal. Chan eil dàta sam bith ’ga ghabhail a-staigh an-seo mu a bheil thu co-naisgte ri frithealaiche sònraichte gus nach eil ach dìreach gu bheil am frithealaiche agad eòlach air. Thèid seo a chleachdadh le seirbheisean a chruinnicheas stadastaireachd air a’ cho-nasgadh san fharsaingeachd.
         profile_directory: Seallaidh eòlaire nam pròifil liosta dhen luchd-cleachdaidh a dh’aontaich gun gabh an rùrachadh.
         require_invite_text: Nuair a bhios aontachadh a làimh riatanach dhan chlàradh, dèan an raon teacsa “Carson a bu mhiann leat ballrachd fhaighinn?” riatanach seach roghainneil
@@ -206,6 +211,7 @@ gd:
         setting_default_privacy: Prìobhaideachd postaidh
         setting_default_sensitive: Cuir comharra ri meadhanan an-còmhnaidh gu bheil iad frionasach
         setting_delete_modal: Seall còmhradh dearbhaidh mus sguab thu às post
+        setting_disable_hover_cards: Na ro-sheall pròifil nuair a dh’fhanas mi os a cionn
         setting_disable_swiping: Cuir gluasadan grad-shlaighdidh à comas
         setting_display_media: Sealltainn nam meadhanan
         setting_display_media_default: Bun-roghainn
@@ -237,10 +243,13 @@ gd:
           warn: Falaich le rabhadh
       form_admin_settings:
         activity_api_enabled: Foillsich agragaid dhen stadastaireachd mu ghnìomhachd nan cleachdaichean san API
+        app_icon: Ìomhaigheag na h-aplacaid
         backups_retention_period: Ùine glèidhidh aig tasg-lannan an luchd-cleachdaidh
         bootstrap_timeline_accounts: Mol na cunntasan seo do chleachdaichean ùra an-còmhnaidh
         closed_registrations_message: Teachdaireachd ghnàthaichte nuair nach eil clàradh ri fhaighinn
+        content_cache_retention_period: Ùine glèidhidh aig susbaint chèin
         custom_css: CSS gnàthaichte
+        favicon: Favicon
         mascot: Suaichnean gnàthaichte (dìleabach)
         media_cache_retention_period: Ùine glèidhidh aig tasgadan nam meadhanan
         peers_api_enabled: Foillsich liosta nam frithealaichean a chaidh a rùrachadh san API
@@ -305,6 +314,7 @@ gd:
         listable: Faodaidh an taga hais seo nochdadh ann an toraidhean luirg ’s am measg nam molaidhean
         name: Taga hais
         trendable: Faodaidh an taga hais seo nochdadh am measg nan treandaichean
+        usable: Faodaidh postaichean an taga hais seo a chleachdadh gu h-ionadail
       user:
         role: Dreuchd
         time_zone: Roinn-tìde
diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml
index ddc6571e6da9a5..6ec0b098349e56 100644
--- a/config/locales/zh-HK.yml
+++ b/config/locales/zh-HK.yml
@@ -1739,7 +1739,7 @@ zh-HK:
     system: 自動（使用系統主題）
   time:
     formats:
-      default: "%Y年%-m月%d日 %H:%M"
+      default: "%Y年%b月%d日 %H:%M"
       month: "%b %Y"
       time: "%H:%M"
       with_time_zone: "%b %d, %Y, %H:%M %Z"

From 6a27a8c3e74d08ae8d3477ae0a40c1b2e2995e4b Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 2 Aug 2024 12:01:41 +0200
Subject: [PATCH 1688/2191] fix(deps): update babel monorepo (#31167)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 359 ++++++++++++++++++++++++++++--------------------------
 1 file changed, 185 insertions(+), 174 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index b10c375f702eb7..bdd3bd9837aef4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -52,45 +52,45 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/compat-data@npm:^7.22.6, @babel/compat-data@npm:^7.24.8":
-  version: 7.24.8
-  resolution: "@babel/compat-data@npm:7.24.8"
-  checksum: 10c0/7f465e9d8e44c5b516eeb3001362a3cd9a6df51dd90d3ac9868e1e7fa631ac57fc781cec6700110d4f555ba37fe59c4a71927b445106fe0062e79e79ffe11091
+"@babel/compat-data@npm:^7.22.6, @babel/compat-data@npm:^7.25.2":
+  version: 7.25.2
+  resolution: "@babel/compat-data@npm:7.25.2"
+  checksum: 10c0/5bf1f14d6e5f0d37c19543e99209ff4a94bb97915e1ce01e5334a144aa08cd56b6e62ece8135dac77e126723d63d4d4b96fc603a12c43b88c28f4b5e070270c5
   languageName: node
   linkType: hard
 
 "@babel/core@npm:^7.10.4, @babel/core@npm:^7.11.6, @babel/core@npm:^7.12.3, @babel/core@npm:^7.22.1, @babel/core@npm:^7.24.4":
-  version: 7.24.9
-  resolution: "@babel/core@npm:7.24.9"
+  version: 7.25.2
+  resolution: "@babel/core@npm:7.25.2"
   dependencies:
     "@ampproject/remapping": "npm:^2.2.0"
     "@babel/code-frame": "npm:^7.24.7"
-    "@babel/generator": "npm:^7.24.9"
-    "@babel/helper-compilation-targets": "npm:^7.24.8"
-    "@babel/helper-module-transforms": "npm:^7.24.9"
-    "@babel/helpers": "npm:^7.24.8"
-    "@babel/parser": "npm:^7.24.8"
-    "@babel/template": "npm:^7.24.7"
-    "@babel/traverse": "npm:^7.24.8"
-    "@babel/types": "npm:^7.24.9"
+    "@babel/generator": "npm:^7.25.0"
+    "@babel/helper-compilation-targets": "npm:^7.25.2"
+    "@babel/helper-module-transforms": "npm:^7.25.2"
+    "@babel/helpers": "npm:^7.25.0"
+    "@babel/parser": "npm:^7.25.0"
+    "@babel/template": "npm:^7.25.0"
+    "@babel/traverse": "npm:^7.25.2"
+    "@babel/types": "npm:^7.25.2"
     convert-source-map: "npm:^2.0.0"
     debug: "npm:^4.1.0"
     gensync: "npm:^1.0.0-beta.2"
     json5: "npm:^2.2.3"
     semver: "npm:^6.3.1"
-  checksum: 10c0/e104ec6efbf099f55184933e9ab078eb5821c792ddfef3e9c6561986ec4ff103f5c11e3d7d6e5e8929e50e2c58db1cc80e5b6f14b530335b6622095ec4b4124c
+  checksum: 10c0/a425fa40e73cb72b6464063a57c478bc2de9dbcc19c280f1b55a3d88b35d572e87e8594e7d7b4880331addb6faef641bbeb701b91b41b8806cd4deae5d74f401
   languageName: node
   linkType: hard
 
-"@babel/generator@npm:^7.24.8, @babel/generator@npm:^7.24.9, @babel/generator@npm:^7.7.2":
-  version: 7.24.9
-  resolution: "@babel/generator@npm:7.24.9"
+"@babel/generator@npm:^7.25.0, @babel/generator@npm:^7.7.2":
+  version: 7.25.0
+  resolution: "@babel/generator@npm:7.25.0"
   dependencies:
-    "@babel/types": "npm:^7.24.9"
+    "@babel/types": "npm:^7.25.0"
     "@jridgewell/gen-mapping": "npm:^0.3.5"
     "@jridgewell/trace-mapping": "npm:^0.3.25"
     jsesc: "npm:^2.5.1"
-  checksum: 10c0/cd1f7edce7717462546c349e15289d1267a3ed627c6f6583fbf51e78eacacc6500ec2f0024f08f1cc7138989e575635b931acf4549f9e728017a22176a9ea6b6
+  checksum: 10c0/d0e2dfcdc8bdbb5dded34b705ceebf2e0bc1b06795a1530e64fb6a3ccf313c189db7f60c1616effae48114e1a25adc75855bc4496f3779a396b3377bae718ce7
   languageName: node
   linkType: hard
 
@@ -123,16 +123,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-compilation-targets@npm:^7.22.6, @babel/helper-compilation-targets@npm:^7.24.7, @babel/helper-compilation-targets@npm:^7.24.8":
-  version: 7.24.8
-  resolution: "@babel/helper-compilation-targets@npm:7.24.8"
+"@babel/helper-compilation-targets@npm:^7.22.6, @babel/helper-compilation-targets@npm:^7.24.7, @babel/helper-compilation-targets@npm:^7.24.8, @babel/helper-compilation-targets@npm:^7.25.2":
+  version: 7.25.2
+  resolution: "@babel/helper-compilation-targets@npm:7.25.2"
   dependencies:
-    "@babel/compat-data": "npm:^7.24.8"
+    "@babel/compat-data": "npm:^7.25.2"
     "@babel/helper-validator-option": "npm:^7.24.8"
     browserslist: "npm:^4.23.1"
     lru-cache: "npm:^5.1.1"
     semver: "npm:^6.3.1"
-  checksum: 10c0/2885c44ef6aaf82b7e4352b30089bb09fbe08ed5ec24eb452c2bdc3c021e2a65ab412f74b3d67ec1398da0356c730b33a2ceca1d67d34c85080d31ca6efa9aec
+  checksum: 10c0/de10e986b5322c9f807350467dc845ec59df9e596a5926a3b5edbb4710d8e3b8009d4396690e70b88c3844fe8ec4042d61436dd4b92d1f5f75655cf43ab07e99
   languageName: node
   linkType: hard
 
@@ -155,16 +155,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-create-regexp-features-plugin@npm:^7.18.6, @babel/helper-create-regexp-features-plugin@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/helper-create-regexp-features-plugin@npm:7.24.7"
+"@babel/helper-create-regexp-features-plugin@npm:^7.18.6, @babel/helper-create-regexp-features-plugin@npm:^7.24.7, @babel/helper-create-regexp-features-plugin@npm:^7.25.0":
+  version: 7.25.2
+  resolution: "@babel/helper-create-regexp-features-plugin@npm:7.25.2"
   dependencies:
     "@babel/helper-annotate-as-pure": "npm:^7.24.7"
     regexpu-core: "npm:^5.3.1"
     semver: "npm:^6.3.1"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10c0/ed611a7eb0c71843f9cdc471eeb38767972229f9225f7aaa90d124d7ee0062cf6908fd53ee9c34f731394c429594f06049a7738a71d342e0191d4047b2fc0ac2
+  checksum: 10c0/85a7e3639c118856fb1113f54fb7e3bf7698171ddfd0cd6fccccd5426b3727bc1434fe7f69090441dcde327feef9de917e00d35e47ab820047057518dd675317
   languageName: node
   linkType: hard
 
@@ -202,22 +202,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-hoist-variables@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/helper-hoist-variables@npm:7.24.7"
-  dependencies:
-    "@babel/types": "npm:^7.24.7"
-  checksum: 10c0/19ee37563bbd1219f9d98991ad0e9abef77803ee5945fd85aa7aa62a67c69efca9a801696a1b58dda27f211e878b3327789e6fd2a6f6c725ccefe36774b5ce95
-  languageName: node
-  linkType: hard
-
-"@babel/helper-member-expression-to-functions@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/helper-member-expression-to-functions@npm:7.24.7"
+"@babel/helper-member-expression-to-functions@npm:^7.24.7, @babel/helper-member-expression-to-functions@npm:^7.24.8":
+  version: 7.24.8
+  resolution: "@babel/helper-member-expression-to-functions@npm:7.24.8"
   dependencies:
-    "@babel/traverse": "npm:^7.24.7"
-    "@babel/types": "npm:^7.24.7"
-  checksum: 10c0/9638c1d33cf6aba028461ccd3db6061c76ff863ca0d5013dd9a088bf841f2f77c46956493f9da18355c16759449d23b74cc1de4da357ade5c5c34c858f840f0a
+    "@babel/traverse": "npm:^7.24.8"
+    "@babel/types": "npm:^7.24.8"
+  checksum: 10c0/7e14a5acc91f6cd26305a4441b82eb6f616bd70b096a4d2099a968f16b26d50207eec0b9ebfc466fefd62bd91587ac3be878117cdfec819b7151911183cb0e5a
   languageName: node
   linkType: hard
 
@@ -231,18 +222,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-module-transforms@npm:^7.24.7, @babel/helper-module-transforms@npm:^7.24.8, @babel/helper-module-transforms@npm:^7.24.9":
-  version: 7.24.9
-  resolution: "@babel/helper-module-transforms@npm:7.24.9"
+"@babel/helper-module-transforms@npm:^7.24.7, @babel/helper-module-transforms@npm:^7.24.8, @babel/helper-module-transforms@npm:^7.25.0, @babel/helper-module-transforms@npm:^7.25.2":
+  version: 7.25.2
+  resolution: "@babel/helper-module-transforms@npm:7.25.2"
   dependencies:
-    "@babel/helper-environment-visitor": "npm:^7.24.7"
     "@babel/helper-module-imports": "npm:^7.24.7"
     "@babel/helper-simple-access": "npm:^7.24.7"
-    "@babel/helper-split-export-declaration": "npm:^7.24.7"
     "@babel/helper-validator-identifier": "npm:^7.24.7"
+    "@babel/traverse": "npm:^7.25.2"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10c0/e27bca43bc113731ee4f2b33a4c5bf9c7eebf4d64487b814c305cbd5feb272c29fcd3d79634ba03131ade171e5972bc7ede8dbc83ba0deb02f1e62d318c87770
+  checksum: 10c0/adaa15970ace0aee5934b5a633789b5795b6229c6a9cf3e09a7e80aa33e478675eee807006a862aa9aa517935d81f88a6db8a9f5936e3a2a40ec75f8062bc329
   languageName: node
   linkType: hard
 
@@ -262,29 +252,29 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-remap-async-to-generator@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/helper-remap-async-to-generator@npm:7.24.7"
+"@babel/helper-remap-async-to-generator@npm:^7.24.7, @babel/helper-remap-async-to-generator@npm:^7.25.0":
+  version: 7.25.0
+  resolution: "@babel/helper-remap-async-to-generator@npm:7.25.0"
   dependencies:
     "@babel/helper-annotate-as-pure": "npm:^7.24.7"
-    "@babel/helper-environment-visitor": "npm:^7.24.7"
-    "@babel/helper-wrap-function": "npm:^7.24.7"
+    "@babel/helper-wrap-function": "npm:^7.25.0"
+    "@babel/traverse": "npm:^7.25.0"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10c0/4e7fa2cdcbc488e41c27066c16e562857ef3c5c2bfe70d2f1e32e9ee7546b17c3fc1c20d05bf2a7f1c291bd9e7a0a219f6a9fa387209013294be79a26fcfe64d
+  checksum: 10c0/0d17b5f7bb6a607edc9cc62fff8056dd9f341bf2f919884f97b99170d143022a5e7ae57922c4891e4fc360ad291e708d2f8cd8989f1d3cd7a17600159984f5a6
   languageName: node
   linkType: hard
 
-"@babel/helper-replace-supers@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/helper-replace-supers@npm:7.24.7"
+"@babel/helper-replace-supers@npm:^7.24.7, @babel/helper-replace-supers@npm:^7.25.0":
+  version: 7.25.0
+  resolution: "@babel/helper-replace-supers@npm:7.25.0"
   dependencies:
-    "@babel/helper-environment-visitor": "npm:^7.24.7"
-    "@babel/helper-member-expression-to-functions": "npm:^7.24.7"
+    "@babel/helper-member-expression-to-functions": "npm:^7.24.8"
     "@babel/helper-optimise-call-expression": "npm:^7.24.7"
+    "@babel/traverse": "npm:^7.25.0"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10c0/0e133bb03371dee78e519c334a09c08e1493103a239d9628db0132dfaac3fc16380479ca3c590d278a9b71b624030a338c18ebbfe6d430ebb2e4653775c4b3e3
+  checksum: 10c0/b4b6650ab3d56c39a259367cd97f8df2f21c9cebb3716fea7bca40a150f8847bfb82f481e98927c7c6579b48a977b5a8f77318a1c6aeb497f41ecd6dbc3fdfef
   languageName: node
   linkType: hard
 
@@ -338,25 +328,24 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-wrap-function@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/helper-wrap-function@npm:7.24.7"
+"@babel/helper-wrap-function@npm:^7.25.0":
+  version: 7.25.0
+  resolution: "@babel/helper-wrap-function@npm:7.25.0"
   dependencies:
-    "@babel/helper-function-name": "npm:^7.24.7"
-    "@babel/template": "npm:^7.24.7"
-    "@babel/traverse": "npm:^7.24.7"
-    "@babel/types": "npm:^7.24.7"
-  checksum: 10c0/d5689f031bf0eb38c0d7fad6b7e320ddef4bfbdf08d12d7d76ef41b7ca365a32721e74cb5ed5a9a9ec634bc20f9b7a27314fa6fb08f1576b8f6d8330fcea6f47
+    "@babel/template": "npm:^7.25.0"
+    "@babel/traverse": "npm:^7.25.0"
+    "@babel/types": "npm:^7.25.0"
+  checksum: 10c0/d54601a98384c191cbc1ff07b03a19e288ef8d5c6bfafe270b2a303d96e7304eb296002921ed464cc1b105a547d1db146eb86b0be617924dee1ba1b379cdc216
   languageName: node
   linkType: hard
 
-"@babel/helpers@npm:^7.24.8":
-  version: 7.24.8
-  resolution: "@babel/helpers@npm:7.24.8"
+"@babel/helpers@npm:^7.25.0":
+  version: 7.25.0
+  resolution: "@babel/helpers@npm:7.25.0"
   dependencies:
-    "@babel/template": "npm:^7.24.7"
-    "@babel/types": "npm:^7.24.8"
-  checksum: 10c0/42b8939b0a0bf72d6df9721973eb0fd7cd48f42641c5c9c740916397faa586255c06d36c6e6a7e091860723096281c620f6ffaee0011a3bb254a6f5475d89a12
+    "@babel/template": "npm:^7.25.0"
+    "@babel/types": "npm:^7.25.0"
+  checksum: 10c0/b7fe007fc4194268abf70aa3810365085e290e6528dcb9fbbf7a765d43c74b6369ce0f99c5ccd2d44c413853099daa449c9a0123f0b212ac8d18643f2e8174b8
   languageName: node
   linkType: hard
 
@@ -372,35 +361,48 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.24.7, @babel/parser@npm:^7.24.8":
-  version: 7.24.8
-  resolution: "@babel/parser@npm:7.24.8"
+"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.25.0, @babel/parser@npm:^7.25.3":
+  version: 7.25.3
+  resolution: "@babel/parser@npm:7.25.3"
+  dependencies:
+    "@babel/types": "npm:^7.25.2"
   bin:
     parser: ./bin/babel-parser.js
-  checksum: 10c0/ce69671de8fa6f649abf849be262707ac700b573b8b1ce1893c66cc6cd76aeb1294a19e8c290b0eadeb2f47d3f413a2e57a281804ffbe76bfb9fa50194cf3c52
+  checksum: 10c0/874b01349aedb805d6694f867a752fdc7469778fad76aca4548d2cc6ce96087c3ba5fb917a6f8d05d2d1a74aae309b5f50f1a4dba035f5a2c9fcfe6e106d2c4e
   languageName: node
   linkType: hard
 
-"@babel/plugin-bugfix-firefox-class-in-computed-class-key@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/plugin-bugfix-firefox-class-in-computed-class-key@npm:7.24.7"
+"@babel/plugin-bugfix-firefox-class-in-computed-class-key@npm:^7.25.3":
+  version: 7.25.3
+  resolution: "@babel/plugin-bugfix-firefox-class-in-computed-class-key@npm:7.25.3"
   dependencies:
-    "@babel/helper-environment-visitor": "npm:^7.24.7"
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.8"
+    "@babel/traverse": "npm:^7.25.3"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10c0/394c30e2b708ad385fa1219528e039066a1f1cb40f47986f283878848fd354c745e6397f588b4e5a046ee8d64bfdf4c208e4c3dfbdcfb2fd34315ec67c64e7af
+  checksum: 10c0/814b4d3f102e7556a5053d1acf57ef601cfcff39a2c81b8cdc6a5c842e3cb9838f5925d1466a5f1e6416e74c9c83586a3c07fbd7fb8610a396c2becdf9ae5790
   languageName: node
   linkType: hard
 
-"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:7.24.7"
+"@babel/plugin-bugfix-safari-class-field-initializer-scope@npm:^7.25.0":
+  version: 7.25.0
+  resolution: "@babel/plugin-bugfix-safari-class-field-initializer-scope@npm:7.25.0"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.8"
+  peerDependencies:
+    "@babel/core": ^7.0.0
+  checksum: 10c0/9645a1f47b3750acadb1353c02e71cc712d072aafe5ce115ed3a886bc14c5d9200cfb0b5b5e60e813baa549b800cf798f8714019fd246c699053cf68c428e426
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:^7.25.0":
+  version: 7.25.0
+  resolution: "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:7.25.0"
+  dependencies:
+    "@babel/helper-plugin-utils": "npm:^7.24.8"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10c0/a36307428ecc1a01b00cf90812335eed1575d13f211ab24fe4d0c55c28a2fcbd4135f142efabc3b277b2a8e09ee05df594a1272353f061b63829495b5dcfdb96
+  checksum: 10c0/ed1ce1c90cac46c01825339fd0f2a96fa071b016fb819d8dfaf8e96300eae30e74870cb47e4dc80d4ce2fb287869f102878b4f3b35bc927fec8b1d0d76bcf612
   languageName: node
   linkType: hard
 
@@ -417,15 +419,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@npm:7.24.7"
+"@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@npm:^7.25.0":
+  version: 7.25.0
+  resolution: "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@npm:7.25.0"
   dependencies:
-    "@babel/helper-environment-visitor": "npm:^7.24.7"
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.8"
+    "@babel/traverse": "npm:^7.25.0"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10c0/2b52a73e444f6adc73f927b623e53a4cf64397170dd1071268536df1b3db1e02131418c8dc91351af48837a6298212118f4a72d5407f8005cf9a732370a315b0
+  checksum: 10c0/45988025537a9d4a27b610fd696a18fd9ba9336621a69b4fb40560eeb10c79657f85c92a37f30c7c8fb29c22970eea0b373315795a891f1a05549a6cfe5a6bfe
   languageName: node
   linkType: hard
 
@@ -681,17 +683,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-async-generator-functions@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/plugin-transform-async-generator-functions@npm:7.24.7"
+"@babel/plugin-transform-async-generator-functions@npm:^7.25.0":
+  version: 7.25.0
+  resolution: "@babel/plugin-transform-async-generator-functions@npm:7.25.0"
   dependencies:
-    "@babel/helper-environment-visitor": "npm:^7.24.7"
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
-    "@babel/helper-remap-async-to-generator": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.8"
+    "@babel/helper-remap-async-to-generator": "npm:^7.25.0"
     "@babel/plugin-syntax-async-generators": "npm:^7.8.4"
+    "@babel/traverse": "npm:^7.25.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/6b5e33ae66dce0afce9b06d8dace6fa052528e60f7622aa6cfd3e71bd372ca5079d426e78336ca564bc0d5f37acbcda1b21f4fe656fcb642f1a93a697ab39742
+  checksum: 10c0/5348c3a33d16e0d62f13482c6fa432185ba096d58880b08d42450f7db662d6b03e6149d495c8620897dcd3da35061068cbd6c09da7d0ec95743e55a788809e4e
   languageName: node
   linkType: hard
 
@@ -719,14 +721,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-block-scoping@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/plugin-transform-block-scoping@npm:7.24.7"
+"@babel/plugin-transform-block-scoping@npm:^7.25.0":
+  version: 7.25.0
+  resolution: "@babel/plugin-transform-block-scoping@npm:7.25.0"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.8"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/dcbc5e385c0ca5fb5736b1c720c90755cffe9f91d8c854f82e61e59217dd3f6c91b3633eeee4b55a89d3f59e5275d0f5b0b1b1363d4fa70c49c468b55aa87700
+  checksum: 10c0/382931c75a5d0ea560387e76cb57b03461300527e4784efcb2fb62f36c1eb0ab331327b6034def256baa0cad9050925a61f9c0d56261b6afd6a29c3065fb0bd4
   languageName: node
   linkType: hard
 
@@ -755,21 +757,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-classes@npm:^7.24.8":
-  version: 7.24.8
-  resolution: "@babel/plugin-transform-classes@npm:7.24.8"
+"@babel/plugin-transform-classes@npm:^7.25.0":
+  version: 7.25.0
+  resolution: "@babel/plugin-transform-classes@npm:7.25.0"
   dependencies:
     "@babel/helper-annotate-as-pure": "npm:^7.24.7"
     "@babel/helper-compilation-targets": "npm:^7.24.8"
-    "@babel/helper-environment-visitor": "npm:^7.24.7"
-    "@babel/helper-function-name": "npm:^7.24.7"
     "@babel/helper-plugin-utils": "npm:^7.24.8"
-    "@babel/helper-replace-supers": "npm:^7.24.7"
-    "@babel/helper-split-export-declaration": "npm:^7.24.7"
+    "@babel/helper-replace-supers": "npm:^7.25.0"
+    "@babel/traverse": "npm:^7.25.0"
     globals: "npm:^11.1.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/4423da0f747bdb6aab1995d98a74533fa679f637ec20706810dd57fb4ba2b1885ec8cae6a0b2c3f69f27165de6ff6aa2da9c4061c893848736a8267d0c653079
+  checksum: 10c0/4451dccf8a7979427ae042afe381233f30764a8072faf0de1337a4fc297c6d7cb40df9e28931ac096e5b56392d0cd97d3ce10aee68288150a8701624d362a791
   languageName: node
   linkType: hard
 
@@ -819,6 +819,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-duplicate-named-capturing-groups-regex@npm:^7.25.0":
+  version: 7.25.0
+  resolution: "@babel/plugin-transform-duplicate-named-capturing-groups-regex@npm:7.25.0"
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin": "npm:^7.25.0"
+    "@babel/helper-plugin-utils": "npm:^7.24.8"
+  peerDependencies:
+    "@babel/core": ^7.0.0
+  checksum: 10c0/1c9b57ddd9b33696e88911d0e7975e1573ebc46219c4b30eb1dc746cbb71aedfac6f6dab7fdfdec54dd58f31468bf6ab56b157661ea4ffe58f906d71f89544c8
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-dynamic-import@npm:^7.24.7":
   version: 7.24.7
   resolution: "@babel/plugin-transform-dynamic-import@npm:7.24.7"
@@ -867,16 +879,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-function-name@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/plugin-transform-function-name@npm:7.24.7"
+"@babel/plugin-transform-function-name@npm:^7.25.1":
+  version: 7.25.1
+  resolution: "@babel/plugin-transform-function-name@npm:7.25.1"
   dependencies:
-    "@babel/helper-compilation-targets": "npm:^7.24.7"
-    "@babel/helper-function-name": "npm:^7.24.7"
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
+    "@babel/helper-compilation-targets": "npm:^7.24.8"
+    "@babel/helper-plugin-utils": "npm:^7.24.8"
+    "@babel/traverse": "npm:^7.25.1"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/3e9642428d6952851850d89ea9307d55946528d18973784d0e2f04a651b23bd9924dd8a2641c824b483bd4ab1223bab1d2f6a1106a939998f7ced512cb60ac5b
+  checksum: 10c0/e74912174d5e33d1418b840443c2e226a7b76cc017c1ed20ee30a566e4f1794d4a123be03180da046241576e8b692731807ba1f52608922acf1cb2cb6957593f
   languageName: node
   linkType: hard
 
@@ -892,14 +904,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-literals@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/plugin-transform-literals@npm:7.24.7"
+"@babel/plugin-transform-literals@npm:^7.25.2":
+  version: 7.25.2
+  resolution: "@babel/plugin-transform-literals@npm:7.25.2"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.8"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/9f3f6f3831929cd2a977748c07addf9944d5cccb50bd3a24a58beb54f91f00d6cacd3d7831d13ffe1ad6f8aba0aefd7bca5aec65d63b77f39c62ad1f2d484a3e
+  checksum: 10c0/0796883217b0885d37e7f6d350773be349e469a812b6bf11ccf862a6edf65103d3e7c849529d65381b441685c12e756751d8c2489a0fd3f8139bb5ef93185f58
   languageName: node
   linkType: hard
 
@@ -951,17 +963,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-modules-systemjs@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/plugin-transform-modules-systemjs@npm:7.24.7"
+"@babel/plugin-transform-modules-systemjs@npm:^7.25.0":
+  version: 7.25.0
+  resolution: "@babel/plugin-transform-modules-systemjs@npm:7.25.0"
   dependencies:
-    "@babel/helper-hoist-variables": "npm:^7.24.7"
-    "@babel/helper-module-transforms": "npm:^7.24.7"
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
+    "@babel/helper-module-transforms": "npm:^7.25.0"
+    "@babel/helper-plugin-utils": "npm:^7.24.8"
     "@babel/helper-validator-identifier": "npm:^7.24.7"
+    "@babel/traverse": "npm:^7.25.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/e2a795e0a6baafe26f4a74010622212ddd873170742d673f450e0097f8d984f6e6a95eb8ce41b05071ee9790c4be088b33801aaab3f78ee202c567634e52a331
+  checksum: 10c0/fca6198da71237e4bb1274b3b67a0c81d56013c9535361242b6bfa87d70a9597854aadb45d4d8203369be4a655e158be2a5d20af0040b1f8d1bfc47db3ad7b68
   languageName: node
   linkType: hard
 
@@ -1352,17 +1364,18 @@ __metadata:
   linkType: hard
 
 "@babel/preset-env@npm:^7.11.0, @babel/preset-env@npm:^7.12.1, @babel/preset-env@npm:^7.22.4":
-  version: 7.24.8
-  resolution: "@babel/preset-env@npm:7.24.8"
+  version: 7.25.3
+  resolution: "@babel/preset-env@npm:7.25.3"
   dependencies:
-    "@babel/compat-data": "npm:^7.24.8"
-    "@babel/helper-compilation-targets": "npm:^7.24.8"
+    "@babel/compat-data": "npm:^7.25.2"
+    "@babel/helper-compilation-targets": "npm:^7.25.2"
     "@babel/helper-plugin-utils": "npm:^7.24.8"
     "@babel/helper-validator-option": "npm:^7.24.8"
-    "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "npm:^7.24.7"
-    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "npm:^7.24.7"
+    "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "npm:^7.25.3"
+    "@babel/plugin-bugfix-safari-class-field-initializer-scope": "npm:^7.25.0"
+    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "npm:^7.25.0"
     "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "npm:^7.24.7"
-    "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "npm:^7.24.7"
+    "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "npm:^7.25.0"
     "@babel/plugin-proposal-private-property-in-object": "npm:7.21.0-placeholder-for-preset-env.2"
     "@babel/plugin-syntax-async-generators": "npm:^7.8.4"
     "@babel/plugin-syntax-class-properties": "npm:^7.12.13"
@@ -1383,29 +1396,30 @@ __metadata:
     "@babel/plugin-syntax-top-level-await": "npm:^7.14.5"
     "@babel/plugin-syntax-unicode-sets-regex": "npm:^7.18.6"
     "@babel/plugin-transform-arrow-functions": "npm:^7.24.7"
-    "@babel/plugin-transform-async-generator-functions": "npm:^7.24.7"
+    "@babel/plugin-transform-async-generator-functions": "npm:^7.25.0"
     "@babel/plugin-transform-async-to-generator": "npm:^7.24.7"
     "@babel/plugin-transform-block-scoped-functions": "npm:^7.24.7"
-    "@babel/plugin-transform-block-scoping": "npm:^7.24.7"
+    "@babel/plugin-transform-block-scoping": "npm:^7.25.0"
     "@babel/plugin-transform-class-properties": "npm:^7.24.7"
     "@babel/plugin-transform-class-static-block": "npm:^7.24.7"
-    "@babel/plugin-transform-classes": "npm:^7.24.8"
+    "@babel/plugin-transform-classes": "npm:^7.25.0"
     "@babel/plugin-transform-computed-properties": "npm:^7.24.7"
     "@babel/plugin-transform-destructuring": "npm:^7.24.8"
     "@babel/plugin-transform-dotall-regex": "npm:^7.24.7"
     "@babel/plugin-transform-duplicate-keys": "npm:^7.24.7"
+    "@babel/plugin-transform-duplicate-named-capturing-groups-regex": "npm:^7.25.0"
     "@babel/plugin-transform-dynamic-import": "npm:^7.24.7"
     "@babel/plugin-transform-exponentiation-operator": "npm:^7.24.7"
     "@babel/plugin-transform-export-namespace-from": "npm:^7.24.7"
     "@babel/plugin-transform-for-of": "npm:^7.24.7"
-    "@babel/plugin-transform-function-name": "npm:^7.24.7"
+    "@babel/plugin-transform-function-name": "npm:^7.25.1"
     "@babel/plugin-transform-json-strings": "npm:^7.24.7"
-    "@babel/plugin-transform-literals": "npm:^7.24.7"
+    "@babel/plugin-transform-literals": "npm:^7.25.2"
     "@babel/plugin-transform-logical-assignment-operators": "npm:^7.24.7"
     "@babel/plugin-transform-member-expression-literals": "npm:^7.24.7"
     "@babel/plugin-transform-modules-amd": "npm:^7.24.7"
     "@babel/plugin-transform-modules-commonjs": "npm:^7.24.8"
-    "@babel/plugin-transform-modules-systemjs": "npm:^7.24.7"
+    "@babel/plugin-transform-modules-systemjs": "npm:^7.25.0"
     "@babel/plugin-transform-modules-umd": "npm:^7.24.7"
     "@babel/plugin-transform-named-capturing-groups-regex": "npm:^7.24.7"
     "@babel/plugin-transform-new-target": "npm:^7.24.7"
@@ -1438,7 +1452,7 @@ __metadata:
     semver: "npm:^6.3.1"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/a6f29498ec58989845a61f9c10b1b4e80586f1810a33db461d597cdb0ad2cd847381a993038b09f727512a08b2c1a33a330a5d4e6d65463ee98a1b4302d52ec6
+  checksum: 10c0/9287dc2e296fe2aa3367d84c2a799db17c9d1e48bba86525f47c6f51f5ba2e2cce454f45f4ae2ef928f9077c0640b04556b55b94835675ceeca94a0c5133205e
   languageName: node
   linkType: hard
 
@@ -1503,51 +1517,48 @@ __metadata:
   linkType: hard
 
 "@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.0, @babel/runtime@npm:^7.12.13, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.13.8, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.2.0, @babel/runtime@npm:^7.20.13, @babel/runtime@npm:^7.22.3, @babel/runtime@npm:^7.3.1, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.6.3, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.8.7, @babel/runtime@npm:^7.9.2":
-  version: 7.24.8
-  resolution: "@babel/runtime@npm:7.24.8"
+  version: 7.25.0
+  resolution: "@babel/runtime@npm:7.25.0"
   dependencies:
     regenerator-runtime: "npm:^0.14.0"
-  checksum: 10c0/f24b30af6b3ecae19165b3b032f9bc37b2d1769677bd63b69a6f81061967cfc847aa822518402ea6616b1d301d7eb46986b99c9f69cdb5880834fca2e6b34881
+  checksum: 10c0/bd3faf246170826cef2071a94d7b47b49d532351360ecd17722d03f6713fd93a3eb3dbd9518faa778d5e8ccad7392a7a604e56bd37aaad3f3aa68d619ccd983d
   languageName: node
   linkType: hard
 
-"@babel/template@npm:^7.24.7, @babel/template@npm:^7.3.3":
-  version: 7.24.7
-  resolution: "@babel/template@npm:7.24.7"
+"@babel/template@npm:^7.24.7, @babel/template@npm:^7.25.0, @babel/template@npm:^7.3.3":
+  version: 7.25.0
+  resolution: "@babel/template@npm:7.25.0"
   dependencies:
     "@babel/code-frame": "npm:^7.24.7"
-    "@babel/parser": "npm:^7.24.7"
-    "@babel/types": "npm:^7.24.7"
-  checksum: 10c0/95b0b3ee80fcef685b7f4426f5713a855ea2cd5ac4da829b213f8fb5afe48a2a14683c2ea04d446dbc7f711c33c5cd4a965ef34dcbe5bc387c9e966b67877ae3
+    "@babel/parser": "npm:^7.25.0"
+    "@babel/types": "npm:^7.25.0"
+  checksum: 10c0/4e31afd873215744c016e02b04f43b9fa23205d6d0766fb2e93eb4091c60c1b88897936adb895fb04e3c23de98dfdcbe31bc98daaa1a4e0133f78bb948e1209b
   languageName: node
   linkType: hard
 
-"@babel/traverse@npm:7, @babel/traverse@npm:^7.24.7, @babel/traverse@npm:^7.24.8":
-  version: 7.24.8
-  resolution: "@babel/traverse@npm:7.24.8"
+"@babel/traverse@npm:7, @babel/traverse@npm:^7.24.7, @babel/traverse@npm:^7.24.8, @babel/traverse@npm:^7.25.0, @babel/traverse@npm:^7.25.1, @babel/traverse@npm:^7.25.2, @babel/traverse@npm:^7.25.3":
+  version: 7.25.3
+  resolution: "@babel/traverse@npm:7.25.3"
   dependencies:
     "@babel/code-frame": "npm:^7.24.7"
-    "@babel/generator": "npm:^7.24.8"
-    "@babel/helper-environment-visitor": "npm:^7.24.7"
-    "@babel/helper-function-name": "npm:^7.24.7"
-    "@babel/helper-hoist-variables": "npm:^7.24.7"
-    "@babel/helper-split-export-declaration": "npm:^7.24.7"
-    "@babel/parser": "npm:^7.24.8"
-    "@babel/types": "npm:^7.24.8"
+    "@babel/generator": "npm:^7.25.0"
+    "@babel/parser": "npm:^7.25.3"
+    "@babel/template": "npm:^7.25.0"
+    "@babel/types": "npm:^7.25.2"
     debug: "npm:^4.3.1"
     globals: "npm:^11.1.0"
-  checksum: 10c0/67a5cc35824455cdb54fb9e196a44b3186283e29018a9c2331f51763921e18e891b3c60c283615a27540ec8eb4c8b89f41c237b91f732a7aa518b2eb7a0d434d
+  checksum: 10c0/4c8a1966fa90b53a783a4afd2fcdaa6ab1a912e6621dca9fcc6633e80ccb9491620e88caf73b537da4e16cefd537b548c87d7087868d5b0066414dea375c0e9b
   languageName: node
   linkType: hard
 
-"@babel/types@npm:^7.0.0, @babel/types@npm:^7.0.0-beta.49, @babel/types@npm:^7.12.11, @babel/types@npm:^7.12.6, @babel/types@npm:^7.20.7, @babel/types@npm:^7.24.7, @babel/types@npm:^7.24.8, @babel/types@npm:^7.24.9, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3":
-  version: 7.24.9
-  resolution: "@babel/types@npm:7.24.9"
+"@babel/types@npm:^7.0.0, @babel/types@npm:^7.0.0-beta.49, @babel/types@npm:^7.12.11, @babel/types@npm:^7.12.6, @babel/types@npm:^7.20.7, @babel/types@npm:^7.24.7, @babel/types@npm:^7.24.8, @babel/types@npm:^7.25.0, @babel/types@npm:^7.25.2, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4":
+  version: 7.25.2
+  resolution: "@babel/types@npm:7.25.2"
   dependencies:
     "@babel/helper-string-parser": "npm:^7.24.8"
     "@babel/helper-validator-identifier": "npm:^7.24.7"
     to-fast-properties: "npm:^2.0.0"
-  checksum: 10c0/4970b3481cab39c5c3fdb7c28c834df5c7049f3c7f43baeafe121bb05270ebf0da7c65b097abf314877f213baa591109c82204f30d66cdd46c22ece4a2f32415
+  checksum: 10c0/e489435856be239f8cc1120c90a197e4c2865385121908e5edb7223cfdff3768cba18f489adfe0c26955d9e7bbb1fb10625bc2517505908ceb0af848989bd864
   languageName: node
   linkType: hard
 

From 2a704add90a9853db357711e41605bb6b12cec19 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 2 Aug 2024 12:39:12 +0200
Subject: [PATCH 1689/2191] Fix status processing failing halfway when a remote
 post has a malformed `replies` attribute (#31246)

---
 app/lib/activitypub/activity/create.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb
index 5d700b49613be4..d539ce41a07175 100644
--- a/app/lib/activitypub/activity/create.rb
+++ b/app/lib/activitypub/activity/create.rb
@@ -336,13 +336,15 @@ def resolve_thread(status)
 
   def fetch_replies(status)
     collection = @object['replies']
-    return if collection.nil?
+    return if collection.blank?
 
     replies = ActivityPub::FetchRepliesService.new.call(status, collection, allow_synchronous_requests: false, request_id: @options[:request_id])
     return unless replies.nil?
 
     uri = value_or_id(collection)
     ActivityPub::FetchRepliesWorker.perform_async(status.id, uri, { 'request_id' => @options[:request_id] }) unless uri.nil?
+  rescue => e
+    Rails.logger.warn "Error fetching replies: #{e}"
   end
 
   def conversation_from_uri(uri)

From bb3941f885beee3843742edd31d67901c6ba0995 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 2 Aug 2024 15:15:18 +0200
Subject: [PATCH 1690/2191] Change `DropdownMenu` component's `items` prop type
 (#31263)

---
 app/javascript/mastodon/components/dropdown_menu.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/javascript/mastodon/components/dropdown_menu.jsx b/app/javascript/mastodon/components/dropdown_menu.jsx
index 49951cfb5faeb4..d731a8e2d1f6ef 100644
--- a/app/javascript/mastodon/components/dropdown_menu.jsx
+++ b/app/javascript/mastodon/components/dropdown_menu.jsx
@@ -20,7 +20,7 @@ let id = 0;
 class DropdownMenu extends PureComponent {
 
   static propTypes = {
-    items: PropTypes.oneOfType([PropTypes.array, ImmutablePropTypes.list]).isRequired,
+    items: PropTypes.array.isRequired,
     loading: PropTypes.bool,
     scrollable: PropTypes.bool,
     onClose: PropTypes.func.isRequired,
@@ -165,7 +165,7 @@ class Dropdown extends PureComponent {
     children: PropTypes.node,
     icon: PropTypes.string,
     iconComponent: PropTypes.func,
-    items: PropTypes.oneOfType([PropTypes.array, ImmutablePropTypes.list]),
+    items: PropTypes.array.isRequired,
     loading: PropTypes.bool,
     size: PropTypes.number,
     title: PropTypes.string,

From 99c446b7cf6dc1ade27ba2658ce1812442ebffbc Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Fri, 2 Aug 2024 15:17:36 +0200
Subject: [PATCH 1691/2191] Change PostCSS config to allow logical properties
 (#31264)

---
 package.json      | 1 -
 postcss.config.js | 9 +++++++--
 yarn.lock         | 3 +--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 18983b43e34cc0..27edd7dc2705a2 100644
--- a/package.json
+++ b/package.json
@@ -50,7 +50,6 @@
     "@svgr/webpack": "^5.5.0",
     "arrow-key-navigation": "^1.2.0",
     "async-mutex": "^0.5.0",
-    "autoprefixer": "^10.4.14",
     "axios": "^1.4.0",
     "babel-loader": "^8.3.0",
     "babel-plugin-formatjs": "^10.5.1",
diff --git a/postcss.config.js b/postcss.config.js
index 63aeafb36d9939..ddcbbbeeec3898 100644
--- a/postcss.config.js
+++ b/postcss.config.js
@@ -1,8 +1,13 @@
+const postcssPresetEnv = require('postcss-preset-env');
+
 /** @type {import('postcss-load-config').Config} */
 const config = ({ env }) => ({
   plugins: [
-    require('postcss-preset-env'),
-    require('autoprefixer'),
+    postcssPresetEnv({
+      features: {
+        'logical-properties-and-values': false
+      }
+    }),
     env === 'production' ? require('cssnano') : '',
   ],
 });
diff --git a/yarn.lock b/yarn.lock
index bdd3bd9837aef4..d7adb6b64052cf 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2825,7 +2825,6 @@ __metadata:
     "@typescript-eslint/parser": "npm:^7.0.0"
     arrow-key-navigation: "npm:^1.2.0"
     async-mutex: "npm:^0.5.0"
-    autoprefixer: "npm:^10.4.14"
     axios: "npm:^1.4.0"
     babel-jest: "npm:^29.5.0"
     babel-loader: "npm:^8.3.0"
@@ -5118,7 +5117,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"autoprefixer@npm:^10.4.14, autoprefixer@npm:^10.4.19":
+"autoprefixer@npm:^10.4.19":
   version: 10.4.19
   resolution: "autoprefixer@npm:10.4.19"
   dependencies:

From cc453f222146bf1d48af3edbdc6396e856e81893 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Fri, 2 Aug 2024 15:18:19 +0200
Subject: [PATCH 1692/2191] Change the filtered notification count to be in the
 account avatar (#31262)

---
 app/javascript/mastodon/components/avatar.tsx | 12 +++++++++
 .../components/notification_request.jsx       |  3 +--
 app/javascript/styles/mastodon/_mixins.scss   | 13 ---------
 .../styles/mastodon/components.scss           | 27 ++++++++++++++++---
 4 files changed, 37 insertions(+), 18 deletions(-)

diff --git a/app/javascript/mastodon/components/avatar.tsx b/app/javascript/mastodon/components/avatar.tsx
index 8f866a3c65645e..8b16296c2c0403 100644
--- a/app/javascript/mastodon/components/avatar.tsx
+++ b/app/javascript/mastodon/components/avatar.tsx
@@ -11,6 +11,8 @@ interface Props {
   style?: React.CSSProperties;
   inline?: boolean;
   animate?: boolean;
+  counter?: number | string;
+  counterBorderColor?: string;
 }
 
 export const Avatar: React.FC<Props> = ({
@@ -19,6 +21,8 @@ export const Avatar: React.FC<Props> = ({
   size = 20,
   inline = false,
   style: styleFromParent,
+  counter,
+  counterBorderColor,
 }) => {
   const { hovering, handleMouseEnter, handleMouseLeave } = useHovering(animate);
 
@@ -43,6 +47,14 @@ export const Avatar: React.FC<Props> = ({
       style={style}
     >
       {src && <img src={src} alt='' />}
+      {counter && (
+        <div
+          className='account__avatar__counter'
+          style={{ borderColor: counterBorderColor }}
+        >
+          {counter}
+        </div>
+      )}
     </div>
   );
 };
diff --git a/app/javascript/mastodon/features/notifications/components/notification_request.jsx b/app/javascript/mastodon/features/notifications/components/notification_request.jsx
index 3a77ef4e2e14ad..fc96bd2ee73c46 100644
--- a/app/javascript/mastodon/features/notifications/components/notification_request.jsx
+++ b/app/javascript/mastodon/features/notifications/components/notification_request.jsx
@@ -38,12 +38,11 @@ export const NotificationRequest = ({ id, accountId, notificationsCount }) => {
   return (
     <div className='notification-request'>
       <Link to={`/notifications/requests/${id}`} className='notification-request__link'>
-        <Avatar account={account} size={36} />
+        <Avatar account={account} size={40} counter={toCappedNumber(notificationsCount)} />
 
         <div className='notification-request__name'>
           <div className='notification-request__name__display-name'>
             <bdi><strong dangerouslySetInnerHTML={{ __html: account?.get('display_name_html') }} /></bdi>
-            <span className='filtered-notifications-banner__badge'>{toCappedNumber(notificationsCount)}</span>
           </div>
 
           <span>@{account?.get('acct')}</span>
diff --git a/app/javascript/styles/mastodon/_mixins.scss b/app/javascript/styles/mastodon/_mixins.scss
index d7f8586dd29623..899b494e549312 100644
--- a/app/javascript/styles/mastodon/_mixins.scss
+++ b/app/javascript/styles/mastodon/_mixins.scss
@@ -1,16 +1,3 @@
-@mixin avatar-radius {
-  border-radius: 4px;
-  background: transparent no-repeat;
-  background-position: 50%;
-  background-clip: padding-box;
-}
-
-@mixin avatar-size($size: 48px) {
-  width: $size;
-  height: $size;
-  background-size: $size $size;
-}
-
 @mixin search-input {
   outline: 0;
   box-sizing: border-box;
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index cba6a5aa38accc..3c1ec28163df46 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -1980,17 +1980,15 @@ body > [data-popper-placement] {
 }
 
 .account__avatar {
-  @include avatar-radius;
-
   display: block;
   position: relative;
-  overflow: hidden;
 
   img {
     display: block;
     width: 100%;
     height: 100%;
     object-fit: cover;
+    border-radius: 4px;
   }
 
   &-inline {
@@ -2027,6 +2025,29 @@ body > [data-popper-placement] {
       font-size: 15px;
     }
   }
+
+  &__counter {
+    $height: 16px;
+    $h-padding: 5px;
+
+    position: absolute;
+    bottom: -3px;
+    inset-inline-end: -3px;
+    padding-left: $h-padding;
+    padding-right: $h-padding;
+    height: $height;
+    border-radius: $height;
+    min-width: $height - 2 * $h-padding; // to ensure that it is never narrower than a circle
+    line-height: $height + 1px; // to visually center the numbers
+    background-color: $ui-button-background-color;
+    color: $white;
+    border-width: 1px;
+    border-style: solid;
+    border-color: var(--background-color);
+    font-size: 11px;
+    font-weight: 500;
+    text-align: center;
+  }
 }
 
 a .account__avatar {

From 2ec1181ee5c409dd6d2f89cdf04e983e84fce9ab Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 2 Aug 2024 15:55:31 +0200
Subject: [PATCH 1693/2191] Fix contrast between background and form elements
 on some pages (#31266)

---
 app/controllers/auth/confirmations_controller.rb          | 5 -----
 app/controllers/auth/passwords_controller.rb              | 5 -----
 app/controllers/auth/registrations_controller.rb          | 2 +-
 app/controllers/auth/sessions_controller.rb               | 6 ------
 app/controllers/auth/setup_controller.rb                  | 5 -----
 .../concerns/auth/two_factor_authentication_concern.rb    | 1 -
 app/controllers/concerns/challengable_concern.rb          | 1 -
 app/controllers/mail_subscriptions_controller.rb          | 5 -----
 app/javascript/styles/mastodon/basics.scss                | 8 --------
 9 files changed, 1 insertion(+), 37 deletions(-)

diff --git a/app/controllers/auth/confirmations_controller.rb b/app/controllers/auth/confirmations_controller.rb
index 7ca7be5f8ef8ec..bf5c84ccf45a88 100644
--- a/app/controllers/auth/confirmations_controller.rb
+++ b/app/controllers/auth/confirmations_controller.rb
@@ -5,7 +5,6 @@ class Auth::ConfirmationsController < Devise::ConfirmationsController
 
   layout 'auth'
 
-  before_action :set_body_classes
   before_action :set_confirmation_user!, only: [:show, :confirm_captcha]
   before_action :redirect_confirmed_user, if: :signed_in_confirmed_user?
 
@@ -73,10 +72,6 @@ def signed_in_confirmed_user?
     user_signed_in? && current_user.confirmed? && current_user.unconfirmed_email.blank?
   end
 
-  def set_body_classes
-    @body_classes = 'lighter'
-  end
-
   def after_resending_confirmation_instructions_path_for(_resource_name)
     if user_signed_in?
       if current_user.confirmed? && current_user.approved?
diff --git a/app/controllers/auth/passwords_controller.rb b/app/controllers/auth/passwords_controller.rb
index de001f062b04d7..7c1ff59671d94c 100644
--- a/app/controllers/auth/passwords_controller.rb
+++ b/app/controllers/auth/passwords_controller.rb
@@ -3,7 +3,6 @@
 class Auth::PasswordsController < Devise::PasswordsController
   skip_before_action :check_self_destruct!
   before_action :redirect_invalid_reset_token, only: :edit, unless: :reset_password_token_is_valid?
-  before_action :set_body_classes
 
   layout 'auth'
 
@@ -24,10 +23,6 @@ def redirect_invalid_reset_token
     redirect_to new_password_path(resource_name)
   end
 
-  def set_body_classes
-    @body_classes = 'lighter'
-  end
-
   def reset_password_token_is_valid?
     resource_class.with_reset_password_token(params[:reset_password_token]).present?
   end
diff --git a/app/controllers/auth/registrations_controller.rb b/app/controllers/auth/registrations_controller.rb
index e5a2ac0270f012..c12960934e35e5 100644
--- a/app/controllers/auth/registrations_controller.rb
+++ b/app/controllers/auth/registrations_controller.rb
@@ -105,7 +105,7 @@ def invite_code
   private
 
   def set_body_classes
-    @body_classes = %w(edit update).include?(action_name) ? 'admin' : 'lighter'
+    @body_classes = 'admin' if %w(edit update).include?(action_name)
   end
 
   def set_invite
diff --git a/app/controllers/auth/sessions_controller.rb b/app/controllers/auth/sessions_controller.rb
index 6ed7b2baacc7c4..6210e4dbf9a721 100644
--- a/app/controllers/auth/sessions_controller.rb
+++ b/app/controllers/auth/sessions_controller.rb
@@ -16,8 +16,6 @@ class Auth::SessionsController < Devise::SessionsController
 
   include Auth::TwoFactorAuthenticationConcern
 
-  before_action :set_body_classes
-
   content_security_policy only: :new do |p|
     p.form_action(false)
   end
@@ -103,10 +101,6 @@ def require_no_authentication
 
   private
 
-  def set_body_classes
-    @body_classes = 'lighter'
-  end
-
   def home_paths(resource)
     paths = [about_path, '/explore']
 
diff --git a/app/controllers/auth/setup_controller.rb b/app/controllers/auth/setup_controller.rb
index 40916d2887702c..ad872dc607285f 100644
--- a/app/controllers/auth/setup_controller.rb
+++ b/app/controllers/auth/setup_controller.rb
@@ -5,7 +5,6 @@ class Auth::SetupController < ApplicationController
 
   before_action :authenticate_user!
   before_action :require_unconfirmed_or_pending!
-  before_action :set_body_classes
   before_action :set_user
 
   skip_before_action :require_functional!
@@ -35,10 +34,6 @@ def set_user
     @user = current_user
   end
 
-  def set_body_classes
-    @body_classes = 'lighter'
-  end
-
   def user_params
     params.require(:user).permit(:email)
   end
diff --git a/app/controllers/concerns/auth/two_factor_authentication_concern.rb b/app/controllers/concerns/auth/two_factor_authentication_concern.rb
index 404164751a86cb..0fb11428dca520 100644
--- a/app/controllers/concerns/auth/two_factor_authentication_concern.rb
+++ b/app/controllers/concerns/auth/two_factor_authentication_concern.rb
@@ -83,7 +83,6 @@ def authenticate_with_two_factor_via_otp(user)
   def prompt_for_two_factor(user)
     register_attempt_in_session(user)
 
-    @body_classes     = 'lighter'
     @webauthn_enabled = user.webauthn_enabled?
     @scheme_type      = if user.webauthn_enabled? && user_params[:otp_attempt].blank?
                           'webauthn'
diff --git a/app/controllers/concerns/challengable_concern.rb b/app/controllers/concerns/challengable_concern.rb
index 09874fb4054435..c8d1a0bef7f013 100644
--- a/app/controllers/concerns/challengable_concern.rb
+++ b/app/controllers/concerns/challengable_concern.rb
@@ -42,7 +42,6 @@ def require_challenge!
   end
 
   def render_challenge
-    @body_classes = 'lighter'
     render 'auth/challenges/new', layout: 'auth'
   end
 
diff --git a/app/controllers/mail_subscriptions_controller.rb b/app/controllers/mail_subscriptions_controller.rb
index 1caeaaacf4ce44..34df75f63ad6c4 100644
--- a/app/controllers/mail_subscriptions_controller.rb
+++ b/app/controllers/mail_subscriptions_controller.rb
@@ -5,7 +5,6 @@ class MailSubscriptionsController < ApplicationController
 
   skip_before_action :require_functional!
 
-  before_action :set_body_classes
   before_action :set_user
   before_action :set_type
 
@@ -25,10 +24,6 @@ def set_user
     not_found unless @user
   end
 
-  def set_body_classes
-    @body_classes = 'lighter'
-  end
-
   def set_type
     @type = email_type_from_param
   end
diff --git a/app/javascript/styles/mastodon/basics.scss b/app/javascript/styles/mastodon/basics.scss
index 456e042c535357..1f961cb9e1279d 100644
--- a/app/javascript/styles/mastodon/basics.scss
+++ b/app/javascript/styles/mastodon/basics.scss
@@ -66,10 +66,6 @@ body {
     }
   }
 
-  &.lighter {
-    background: $ui-base-color;
-  }
-
   &.with-modals {
     overflow-x: hidden;
     overflow-y: scroll;
@@ -109,7 +105,6 @@ body {
   }
 
   &.embed {
-    background: lighten($ui-base-color, 4%);
     margin: 0;
     padding-bottom: 0;
 
@@ -122,15 +117,12 @@ body {
   }
 
   &.admin {
-    background: var(--background-color);
     padding: 0;
   }
 
   &.error {
     position: absolute;
     text-align: center;
-    color: $darker-text-color;
-    background: $ui-base-color;
     width: 100%;
     height: 100%;
     padding: 0;

From ad95c98054574080ac5d15584b3018d1db836531 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 2 Aug 2024 16:59:37 +0200
Subject: [PATCH 1694/2191] Further de-emphasize filtered notifications banner
 and add setting to minimize it (#31250)

---
 .../components/checkbox_with_label.jsx        |  31 ----
 .../components/checkbox_with_label.tsx        |  40 +++++
 .../components/column_settings.jsx            |  48 +-----
 .../filtered_notifications_banner.tsx         |  60 +++++++-
 .../components/policy_controls.tsx            | 141 ++++++++++++++++++
 .../containers/column_settings_container.js   |   8 -
 .../mastodon/features/notifications/index.jsx |  34 +++--
 .../features/notifications/requests.jsx       |  40 ++++-
 .../features/notifications_v2/index.tsx       |  30 ++--
 app/javascript/mastodon/locales/en.json       |   2 +
 app/javascript/mastodon/reducers/settings.js  |   1 +
 app/javascript/mastodon/selectors/settings.ts |   5 +
 12 files changed, 321 insertions(+), 119 deletions(-)
 delete mode 100644 app/javascript/mastodon/features/notifications/components/checkbox_with_label.jsx
 create mode 100644 app/javascript/mastodon/features/notifications/components/checkbox_with_label.tsx
 create mode 100644 app/javascript/mastodon/features/notifications/components/policy_controls.tsx

diff --git a/app/javascript/mastodon/features/notifications/components/checkbox_with_label.jsx b/app/javascript/mastodon/features/notifications/components/checkbox_with_label.jsx
deleted file mode 100644
index 5a7bb2307be3bc..00000000000000
--- a/app/javascript/mastodon/features/notifications/components/checkbox_with_label.jsx
+++ /dev/null
@@ -1,31 +0,0 @@
-import PropTypes from 'prop-types';
-import { useCallback } from 'react';
-
-import Toggle from 'react-toggle';
-
-export const CheckboxWithLabel = ({ checked, disabled, children, onChange }) => {
-  const handleChange = useCallback(({ target }) => {
-    onChange(target.checked);
-  }, [onChange]);
-
-  return (
-    <label className='app-form__toggle'>
-      <div className='app-form__toggle__label'>
-        {children}
-      </div>
-
-      <div className='app-form__toggle__toggle'>
-        <div>
-          <Toggle checked={checked} onChange={handleChange} disabled={disabled} />
-        </div>
-      </div>
-    </label>
-  );
-};
-
-CheckboxWithLabel.propTypes = {
-  checked: PropTypes.bool,
-  disabled: PropTypes.bool,
-  children: PropTypes.children,
-  onChange: PropTypes.func,
-};
diff --git a/app/javascript/mastodon/features/notifications/components/checkbox_with_label.tsx b/app/javascript/mastodon/features/notifications/components/checkbox_with_label.tsx
new file mode 100644
index 00000000000000..9922bc6c7c5923
--- /dev/null
+++ b/app/javascript/mastodon/features/notifications/components/checkbox_with_label.tsx
@@ -0,0 +1,40 @@
+import type { PropsWithChildren } from 'react';
+import { useCallback } from 'react';
+
+import Toggle from 'react-toggle';
+
+interface Props {
+  checked: boolean;
+  disabled?: boolean;
+  onChange: (checked: boolean) => void;
+}
+
+export const CheckboxWithLabel: React.FC<PropsWithChildren<Props>> = ({
+  checked,
+  disabled,
+  children,
+  onChange,
+}) => {
+  const handleChange = useCallback(
+    ({ target }: React.ChangeEvent<HTMLInputElement>) => {
+      onChange(target.checked);
+    },
+    [onChange],
+  );
+
+  return (
+    <label className='app-form__toggle'>
+      <div className='app-form__toggle__label'>{children}</div>
+
+      <div className='app-form__toggle__toggle'>
+        <div>
+          <Toggle
+            checked={checked}
+            onChange={handleChange}
+            disabled={disabled}
+          />
+        </div>
+      </div>
+    </label>
+  );
+};
diff --git a/app/javascript/mastodon/features/notifications/components/column_settings.jsx b/app/javascript/mastodon/features/notifications/components/column_settings.jsx
index d35e62f8f9fb8a..d511c5365fcc96 100644
--- a/app/javascript/mastodon/features/notifications/components/column_settings.jsx
+++ b/app/javascript/mastodon/features/notifications/components/column_settings.jsx
@@ -8,9 +8,9 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import { identityContextPropShape, withIdentity } from 'mastodon/identity_context';
 import { PERMISSION_MANAGE_USERS, PERMISSION_MANAGE_REPORTS } from 'mastodon/permissions';
 
-import { CheckboxWithLabel } from './checkbox_with_label';
 import ClearColumnButton from './clear_column_button';
 import GrantPermissionButton from './grant_permission_button';
+import { PolicyControls } from './policy_controls';
 import SettingToggle from './setting_toggle';
 
 class ColumnSettings extends PureComponent {
@@ -24,32 +24,14 @@ class ColumnSettings extends PureComponent {
     alertsEnabled: PropTypes.bool,
     browserSupport: PropTypes.bool,
     browserPermission: PropTypes.string,
-    notificationPolicy: PropTypes.object.isRequired,
-    onChangePolicy: PropTypes.func.isRequired,
   };
 
   onPushChange = (path, checked) => {
     this.props.onChange(['push', ...path], checked);
   };
 
-  handleFilterNotFollowing = checked => {
-    this.props.onChangePolicy('filter_not_following', checked);
-  };
-
-  handleFilterNotFollowers = checked => {
-    this.props.onChangePolicy('filter_not_followers', checked);
-  };
-
-  handleFilterNewAccounts = checked => {
-    this.props.onChangePolicy('filter_new_accounts', checked);
-  };
-
-  handleFilterPrivateMentions = checked => {
-    this.props.onChangePolicy('filter_private_mentions', checked);
-  };
-
   render () {
-    const { settings, pushSettings, onChange, onClear, alertsEnabled, browserSupport, browserPermission, onRequestNotificationPermission, notificationPolicy } = this.props;
+    const { settings, pushSettings, onChange, onClear, alertsEnabled, browserSupport, browserPermission, onRequestNotificationPermission } = this.props;
 
     const filterAdvancedStr = <FormattedMessage id='notifications.column_settings.filter_bar.advanced' defaultMessage='Display all categories' />;
     const unreadMarkersShowStr = <FormattedMessage id='notifications.column_settings.unread_notifications.highlight' defaultMessage='Highlight unread notifications' />;
@@ -79,31 +61,7 @@ class ColumnSettings extends PureComponent {
           </section>
         )}
 
-        <section>
-          <h3><FormattedMessage id='notifications.policy.title' defaultMessage='Filter out notifications from…' /></h3>
-
-          <div className='column-settings__row'>
-            <CheckboxWithLabel checked={notificationPolicy.filter_not_following} onChange={this.handleFilterNotFollowing}>
-              <strong><FormattedMessage id='notifications.policy.filter_not_following_title' defaultMessage="People you don't follow" /></strong>
-              <span className='hint'><FormattedMessage id='notifications.policy.filter_not_following_hint' defaultMessage='Until you manually approve them' /></span>
-            </CheckboxWithLabel>
-
-            <CheckboxWithLabel checked={notificationPolicy.filter_not_followers} onChange={this.handleFilterNotFollowers}>
-              <strong><FormattedMessage id='notifications.policy.filter_not_followers_title' defaultMessage='People not following you' /></strong>
-              <span className='hint'><FormattedMessage id='notifications.policy.filter_not_followers_hint' defaultMessage='Including people who have been following you fewer than {days, plural, one {one day} other {# days}}' values={{ days: 3 }} /></span>
-            </CheckboxWithLabel>
-
-            <CheckboxWithLabel checked={notificationPolicy.filter_new_accounts} onChange={this.handleFilterNewAccounts}>
-              <strong><FormattedMessage id='notifications.policy.filter_new_accounts_title' defaultMessage='New accounts' /></strong>
-              <span className='hint'><FormattedMessage id='notifications.policy.filter_new_accounts.hint' defaultMessage='Created within the past {days, plural, one {one day} other {# days}}' values={{ days: 30 }} /></span>
-            </CheckboxWithLabel>
-
-            <CheckboxWithLabel checked={notificationPolicy.filter_private_mentions} onChange={this.handleFilterPrivateMentions}>
-              <strong><FormattedMessage id='notifications.policy.filter_private_mentions_title' defaultMessage='Unsolicited private mentions' /></strong>
-              <span className='hint'><FormattedMessage id='notifications.policy.filter_private_mentions_hint' defaultMessage="Filtered unless it's in reply to your own mention or if you follow the sender" /></span>
-            </CheckboxWithLabel>
-          </div>
-        </section>
+        <PolicyControls />
 
         <section role='group' aria-labelledby='notifications-beta'>
           <h3 id='notifications-beta'>
diff --git a/app/javascript/mastodon/features/notifications/components/filtered_notifications_banner.tsx b/app/javascript/mastodon/features/notifications/components/filtered_notifications_banner.tsx
index 9f93d25c56665d..d9e60d48cdbca4 100644
--- a/app/javascript/mastodon/features/notifications/components/filtered_notifications_banner.tsx
+++ b/app/javascript/mastodon/features/notifications/components/filtered_notifications_banner.tsx
@@ -1,18 +1,62 @@
-import { useEffect } from 'react';
+import { useCallback, useEffect } from 'react';
 
-import { FormattedMessage } from 'react-intl';
+import { FormattedMessage, useIntl, defineMessages } from 'react-intl';
 
-import { Link } from 'react-router-dom';
+import { Link, useHistory } from 'react-router-dom';
 
 import InventoryIcon from '@/material-icons/400-24px/inventory_2.svg?react';
 import { fetchNotificationPolicy } from 'mastodon/actions/notification_policies';
 import { Icon } from 'mastodon/components/icon';
+import { selectSettingsNotificationsMinimizeFilteredBanner } from 'mastodon/selectors/settings';
 import { useAppSelector, useAppDispatch } from 'mastodon/store';
-import { toCappedNumber } from 'mastodon/utils/numbers';
+
+const messages = defineMessages({
+  filteredNotifications: {
+    id: 'notification_requests.title',
+    defaultMessage: 'Filtered notifications',
+  },
+});
+
+export const FilteredNotificationsIconButton: React.FC<{
+  className?: string;
+}> = ({ className }) => {
+  const intl = useIntl();
+  const history = useHistory();
+  const policy = useAppSelector((state) => state.notificationPolicy);
+  const minimizeSetting = useAppSelector(
+    selectSettingsNotificationsMinimizeFilteredBanner,
+  );
+
+  const handleClick = useCallback(() => {
+    history.push('/notifications/requests');
+  }, [history]);
+
+  if (policy === null || policy.summary.pending_notifications_count === 0) {
+    return null;
+  }
+
+  if (!minimizeSetting) {
+    return null;
+  }
+
+  return (
+    <button
+      aria-label={intl.formatMessage(messages.filteredNotifications)}
+      title={intl.formatMessage(messages.filteredNotifications)}
+      onClick={handleClick}
+      className={className}
+    >
+      <Icon id='filtered-notifications' icon={InventoryIcon} />
+    </button>
+  );
+};
 
 export const FilteredNotificationsBanner: React.FC = () => {
   const dispatch = useAppDispatch();
   const policy = useAppSelector((state) => state.notificationPolicy);
+  const minimizeSetting = useAppSelector(
+    selectSettingsNotificationsMinimizeFilteredBanner,
+  );
 
   useEffect(() => {
     void dispatch(fetchNotificationPolicy());
@@ -30,6 +74,10 @@ export const FilteredNotificationsBanner: React.FC = () => {
     return null;
   }
 
+  if (minimizeSetting) {
+    return null;
+  }
+
   return (
     <Link
       className='filtered-notifications-banner'
@@ -54,10 +102,6 @@ export const FilteredNotificationsBanner: React.FC = () => {
           />
         </span>
       </div>
-
-      <div className='filtered-notifications-banner__badge'>
-        {toCappedNumber(policy.summary.pending_notifications_count)}
-      </div>
     </Link>
   );
 };
diff --git a/app/javascript/mastodon/features/notifications/components/policy_controls.tsx b/app/javascript/mastodon/features/notifications/components/policy_controls.tsx
new file mode 100644
index 00000000000000..1647bf6b45682a
--- /dev/null
+++ b/app/javascript/mastodon/features/notifications/components/policy_controls.tsx
@@ -0,0 +1,141 @@
+import { useCallback } from 'react';
+
+import { FormattedMessage } from 'react-intl';
+
+import { updateNotificationsPolicy } from 'mastodon/actions/notification_policies';
+import { useAppSelector, useAppDispatch } from 'mastodon/store';
+
+import { CheckboxWithLabel } from './checkbox_with_label';
+
+export const PolicyControls: React.FC = () => {
+  const dispatch = useAppDispatch();
+
+  const notificationPolicy = useAppSelector(
+    (state) => state.notificationPolicy,
+  );
+
+  const handleFilterNotFollowing = useCallback(
+    (checked: boolean) => {
+      void dispatch(
+        updateNotificationsPolicy({ filter_not_following: checked }),
+      );
+    },
+    [dispatch],
+  );
+
+  const handleFilterNotFollowers = useCallback(
+    (checked: boolean) => {
+      void dispatch(
+        updateNotificationsPolicy({ filter_not_followers: checked }),
+      );
+    },
+    [dispatch],
+  );
+
+  const handleFilterNewAccounts = useCallback(
+    (checked: boolean) => {
+      void dispatch(
+        updateNotificationsPolicy({ filter_new_accounts: checked }),
+      );
+    },
+    [dispatch],
+  );
+
+  const handleFilterPrivateMentions = useCallback(
+    (checked: boolean) => {
+      void dispatch(
+        updateNotificationsPolicy({ filter_private_mentions: checked }),
+      );
+    },
+    [dispatch],
+  );
+
+  if (!notificationPolicy) return null;
+
+  return (
+    <section>
+      <h3>
+        <FormattedMessage
+          id='notifications.policy.title'
+          defaultMessage='Filter out notifications from…'
+        />
+      </h3>
+
+      <div className='column-settings__row'>
+        <CheckboxWithLabel
+          checked={notificationPolicy.filter_not_following}
+          onChange={handleFilterNotFollowing}
+        >
+          <strong>
+            <FormattedMessage
+              id='notifications.policy.filter_not_following_title'
+              defaultMessage="People you don't follow"
+            />
+          </strong>
+          <span className='hint'>
+            <FormattedMessage
+              id='notifications.policy.filter_not_following_hint'
+              defaultMessage='Until you manually approve them'
+            />
+          </span>
+        </CheckboxWithLabel>
+
+        <CheckboxWithLabel
+          checked={notificationPolicy.filter_not_followers}
+          onChange={handleFilterNotFollowers}
+        >
+          <strong>
+            <FormattedMessage
+              id='notifications.policy.filter_not_followers_title'
+              defaultMessage='People not following you'
+            />
+          </strong>
+          <span className='hint'>
+            <FormattedMessage
+              id='notifications.policy.filter_not_followers_hint'
+              defaultMessage='Including people who have been following you fewer than {days, plural, one {one day} other {# days}}'
+              values={{ days: 3 }}
+            />
+          </span>
+        </CheckboxWithLabel>
+
+        <CheckboxWithLabel
+          checked={notificationPolicy.filter_new_accounts}
+          onChange={handleFilterNewAccounts}
+        >
+          <strong>
+            <FormattedMessage
+              id='notifications.policy.filter_new_accounts_title'
+              defaultMessage='New accounts'
+            />
+          </strong>
+          <span className='hint'>
+            <FormattedMessage
+              id='notifications.policy.filter_new_accounts.hint'
+              defaultMessage='Created within the past {days, plural, one {one day} other {# days}}'
+              values={{ days: 30 }}
+            />
+          </span>
+        </CheckboxWithLabel>
+
+        <CheckboxWithLabel
+          checked={notificationPolicy.filter_private_mentions}
+          onChange={handleFilterPrivateMentions}
+        >
+          <strong>
+            <FormattedMessage
+              id='notifications.policy.filter_private_mentions_title'
+              defaultMessage='Unsolicited private mentions'
+            />
+          </strong>
+          <span className='hint'>
+            <FormattedMessage
+              id='notifications.policy.filter_private_mentions_hint'
+              defaultMessage="Filtered unless it's in reply to your own mention or if you follow the sender"
+            />
+          </span>
+        </CheckboxWithLabel>
+      </div>
+    </section>
+  );
+};
diff --git a/app/javascript/mastodon/features/notifications/containers/column_settings_container.js b/app/javascript/mastodon/features/notifications/containers/column_settings_container.js
index 21dbb2aa901dd9..8bcc7ab4ef79ab 100644
--- a/app/javascript/mastodon/features/notifications/containers/column_settings_container.js
+++ b/app/javascript/mastodon/features/notifications/containers/column_settings_container.js
@@ -6,7 +6,6 @@ import { openModal } from 'mastodon/actions/modal';
 import { initializeNotifications } from 'mastodon/actions/notifications_migration';
 
 import { showAlert } from '../../../actions/alerts';
-import { updateNotificationsPolicy } from '../../../actions/notification_policies';
 import { setFilter, requestBrowserPermission } from '../../../actions/notifications';
 import { changeAlerts as changePushNotifications } from '../../../actions/push_notifications';
 import { changeSetting } from '../../../actions/settings';
@@ -25,7 +24,6 @@ const mapStateToProps = state => ({
   alertsEnabled: state.getIn(['settings', 'notifications', 'alerts']).includes(true),
   browserSupport: state.getIn(['notifications', 'browserSupport']),
   browserPermission: state.getIn(['notifications', 'browserPermission']),
-  notificationPolicy: state.notificationPolicy,
 });
 
 const mapDispatchToProps = (dispatch) => ({
@@ -74,12 +72,6 @@ const mapDispatchToProps = (dispatch) => ({
     dispatch(requestBrowserPermission());
   },
 
-  onChangePolicy (param, checked) {
-    dispatch(updateNotificationsPolicy({
-      [param]: checked,
-    }));
-  },
-
 });
 
 export default injectIntl(connect(mapStateToProps, mapDispatchToProps)(ColumnSettings));
diff --git a/app/javascript/mastodon/features/notifications/index.jsx b/app/javascript/mastodon/features/notifications/index.jsx
index f5ebe6fe91c0e5..cefbd544b0a781 100644
--- a/app/javascript/mastodon/features/notifications/index.jsx
+++ b/app/javascript/mastodon/features/notifications/index.jsx
@@ -34,7 +34,10 @@ import ColumnHeader from '../../components/column_header';
 import { LoadGap } from '../../components/load_gap';
 import ScrollableList from '../../components/scrollable_list';
 
-import { FilteredNotificationsBanner } from './components/filtered_notifications_banner';
+import {
+  FilteredNotificationsBanner,
+  FilteredNotificationsIconButton,
+} from './components/filtered_notifications_banner';
 import NotificationsPermissionBanner from './components/notifications_permission_banner';
 import ColumnSettingsContainer from './containers/column_settings_container';
 import FilterBarContainer from './containers/filter_bar_container';
@@ -255,20 +258,21 @@ class Notifications extends PureComponent {
       scrollContainer = <NotSignedInIndicator />;
     }
 
-    let extraButton = null;
-
-    if (canMarkAsRead) {
-      extraButton = (
-        <button
-          aria-label={intl.formatMessage(messages.markAsRead)}
-          title={intl.formatMessage(messages.markAsRead)}
-          onClick={this.handleMarkAsRead}
-          className='column-header__button'
-        >
-          <Icon id='done-all' icon={DoneAllIcon} />
-        </button>
-      );
-    }
+    const extraButton = (
+      <>
+        <FilteredNotificationsIconButton className='column-header__button' />
+        {canMarkAsRead && (
+          <button
+            aria-label={intl.formatMessage(messages.markAsRead)}
+            title={intl.formatMessage(messages.markAsRead)}
+            onClick={this.handleMarkAsRead}
+            className='column-header__button'
+          >
+            <Icon id='done-all' icon={DoneAllIcon} />
+          </button>
+        )}
+      </>
+    );
 
     return (
       <Column bindToDocument={!multiColumn} ref={this.setColumnRef} label={intl.formatMessage(messages.title)}>
diff --git a/app/javascript/mastodon/features/notifications/requests.jsx b/app/javascript/mastodon/features/notifications/requests.jsx
index 2d10c6a06c0771..66db35b588e605 100644
--- a/app/javascript/mastodon/features/notifications/requests.jsx
+++ b/app/javascript/mastodon/features/notifications/requests.jsx
@@ -9,16 +9,52 @@ import { useSelector, useDispatch } from 'react-redux';
 
 import InventoryIcon from '@/material-icons/400-24px/inventory_2.svg?react';
 import { fetchNotificationRequests, expandNotificationRequests } from 'mastodon/actions/notifications';
+import { changeSetting } from 'mastodon/actions/settings';
 import Column from 'mastodon/components/column';
 import ColumnHeader from 'mastodon/components/column_header';
 import ScrollableList from 'mastodon/components/scrollable_list';
 
 import { NotificationRequest } from './components/notification_request';
+import { PolicyControls } from './components/policy_controls';
+import SettingToggle from './components/setting_toggle';
 
 const messages = defineMessages({
   title: { id: 'notification_requests.title', defaultMessage: 'Filtered notifications' },
+  maximize: { id: 'notification_requests.maximize', defaultMessage: 'Maximize' }
 });
 
+const ColumnSettings = () => {
+  const dispatch = useDispatch();
+  const settings = useSelector((state) => state.settings.get('notifications'));
+
+  const onChange = useCallback(
+    (key, checked) => {
+      dispatch(changeSetting(['notifications', ...key], checked));
+    },
+    [dispatch],
+  );
+
+  return (
+    <div className='column-settings'>
+      <section>
+        <div className='column-settings__row'>
+          <SettingToggle
+            prefix='notifications'
+            settings={settings}
+            settingPath={['minimizeFilteredBanner']}
+            onChange={onChange}
+            label={
+              <FormattedMessage id='notification_requests.minimize_banner' defaultMessage='Minimize filtred notifications banner' />
+            }
+          />
+        </div>
+      </section>
+
+      <PolicyControls />
+    </div>
+  );
+};
+
 export const NotificationRequests = ({ multiColumn }) => {
   const columnRef = useRef();
   const intl = useIntl();
@@ -48,7 +84,9 @@ export const NotificationRequests = ({ multiColumn }) => {
         onClick={handleHeaderClick}
         multiColumn={multiColumn}
         showBackButton
-      />
+      >
+        <ColumnSettings />
+      </ColumnHeader>
 
       <ScrollableList
         scrollKey='notification_requests'
diff --git a/app/javascript/mastodon/features/notifications_v2/index.tsx b/app/javascript/mastodon/features/notifications_v2/index.tsx
index fc20f0583631ed..05dcf422e97fb3 100644
--- a/app/javascript/mastodon/features/notifications_v2/index.tsx
+++ b/app/javascript/mastodon/features/notifications_v2/index.tsx
@@ -43,7 +43,10 @@ import Column from '../../components/column';
 import { ColumnHeader } from '../../components/column_header';
 import { LoadGap } from '../../components/load_gap';
 import ScrollableList from '../../components/scrollable_list';
-import { FilteredNotificationsBanner } from '../notifications/components/filtered_notifications_banner';
+import {
+  FilteredNotificationsBanner,
+  FilteredNotificationsIconButton,
+} from '../notifications/components/filtered_notifications_banner';
 import NotificationsPermissionBanner from '../notifications/components/notifications_permission_banner';
 import ColumnSettingsContainer from '../notifications/containers/column_settings_container';
 
@@ -306,16 +309,21 @@ export const Notifications: React.FC<{
     <NotSignedInIndicator />
   );
 
-  const extraButton = canMarkAsRead ? (
-    <button
-      aria-label={intl.formatMessage(messages.markAsRead)}
-      title={intl.formatMessage(messages.markAsRead)}
-      onClick={handleMarkAsRead}
-      className='column-header__button'
-    >
-      <Icon id='done-all' icon={DoneAllIcon} />
-    </button>
-  ) : null;
+  const extraButton = (
+    <>
+      <FilteredNotificationsIconButton className='column-header__button' />
+      {canMarkAsRead && (
+        <button
+          aria-label={intl.formatMessage(messages.markAsRead)}
+          title={intl.formatMessage(messages.markAsRead)}
+          onClick={handleMarkAsRead}
+          className='column-header__button'
+        >
+          <Icon id='done-all' icon={DoneAllIcon} />
+        </button>
+      )}
+    </>
+  );
 
   return (
     <Column
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index c9484a1432c995..d5494cadd3eb4f 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -505,6 +505,8 @@
   "notification.update": "{name} edited a post",
   "notification_requests.accept": "Accept",
   "notification_requests.dismiss": "Dismiss",
+  "notification_requests.maximize": "Maximize",
+  "notification_requests.minimize_banner": "Minimize filtred notifications banner",
   "notification_requests.notifications_from": "Notifications from {name}",
   "notification_requests.title": "Filtered notifications",
   "notifications.clear": "Clear notifications",
diff --git a/app/javascript/mastodon/reducers/settings.js b/app/javascript/mastodon/reducers/settings.js
index 0e353e0d1b7c51..6f55241dc1ce29 100644
--- a/app/javascript/mastodon/reducers/settings.js
+++ b/app/javascript/mastodon/reducers/settings.js
@@ -51,6 +51,7 @@ const initialState = ImmutableMap({
 
     dismissPermissionBanner: false,
     showUnread: true,
+    minimizeFilteredBanner: false,
 
     shows: ImmutableMap({
       follow: true,
diff --git a/app/javascript/mastodon/selectors/settings.ts b/app/javascript/mastodon/selectors/settings.ts
index 64d9440bc8d3b0..93276c66920609 100644
--- a/app/javascript/mastodon/selectors/settings.ts
+++ b/app/javascript/mastodon/selectors/settings.ts
@@ -37,4 +37,9 @@ export const selectNeedsNotificationPermission = (state: RootState) =>
       'dismissPermissionBanner',
     ])) as boolean;
 
+export const selectSettingsNotificationsMinimizeFilteredBanner = (
+  state: RootState,
+) =>
+  state.settings.getIn(['notifications', 'minimizeFilteredBanner']) as boolean;
+
 /* eslint-enable @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access */

From 80d315826f4476aea96c68bb86e19aa872d3db1e Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 1 Aug 2024 09:41:32 +0200
Subject: [PATCH 1695/2191] [Glitch] Fix handling of long display names in
 notification requests

Port f6dc8ae8e39cbc626b001cd1026a6fa2de8f4215 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/styles/components.scss | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index 1983050338d03c..08c7bf4eb04f88 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -10774,6 +10774,12 @@ noscript {
       letter-spacing: 0.5px;
       line-height: 24px;
       color: $secondary-text-color;
+
+      bdi {
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+      }
     }
 
     .filtered-notifications-banner__badge {

From 7946d986a771262ac9fb4b23d04ab6db3d65adf9 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 1 Aug 2024 22:50:36 +0200
Subject: [PATCH 1696/2191] [Glitch] Fix click event handling when clicking
 outside of an open dropdown menu

Port afdfeb585640af53cf7e9c63d82aa56ca8bae1e4 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/components/dropdown_menu.jsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/javascript/flavours/glitch/components/dropdown_menu.jsx b/app/javascript/flavours/glitch/components/dropdown_menu.jsx
index 26c828fd64f96c..204d6fb0fb173f 100644
--- a/app/javascript/flavours/glitch/components/dropdown_menu.jsx
+++ b/app/javascript/flavours/glitch/components/dropdown_menu.jsx
@@ -39,6 +39,7 @@ class DropdownMenu extends PureComponent {
     if (this.node && !this.node.contains(e.target)) {
       this.props.onClose();
       e.stopPropagation();
+      e.preventDefault();
     }
   };
 

From a51cdd6b6dd7e5f7a8ef1ce0497c2943970e88a0 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 2 Aug 2024 15:15:18 +0200
Subject: [PATCH 1697/2191] [Glitch] Change `DropdownMenu` component's `items`
 prop type

Port bb3941f885beee3843742edd31d67901c6ba0995 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/components/dropdown_menu.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/javascript/flavours/glitch/components/dropdown_menu.jsx b/app/javascript/flavours/glitch/components/dropdown_menu.jsx
index 204d6fb0fb173f..051ae6299a6f32 100644
--- a/app/javascript/flavours/glitch/components/dropdown_menu.jsx
+++ b/app/javascript/flavours/glitch/components/dropdown_menu.jsx
@@ -20,7 +20,7 @@ let id = 0;
 class DropdownMenu extends PureComponent {
 
   static propTypes = {
-    items: PropTypes.oneOfType([PropTypes.array, ImmutablePropTypes.list]).isRequired,
+    items: PropTypes.array.isRequired,
     loading: PropTypes.bool,
     scrollable: PropTypes.bool,
     onClose: PropTypes.func.isRequired,
@@ -165,7 +165,7 @@ class Dropdown extends PureComponent {
     children: PropTypes.node,
     icon: PropTypes.string,
     iconComponent: PropTypes.func,
-    items: PropTypes.oneOfType([PropTypes.array, ImmutablePropTypes.list]),
+    items: PropTypes.array.isRequired,
     loading: PropTypes.bool,
     size: PropTypes.number,
     title: PropTypes.string,

From 61f5f5c4d1d7397ab4348bf634c3a8366054a7a1 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Fri, 2 Aug 2024 15:18:19 +0200
Subject: [PATCH 1698/2191] [Glitch] Change the filtered notification count to
 be in the account avatar

Port cc453f222146bf1d48af3edbdc6396e856e81893 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/components/avatar.tsx     | 14 ++++++++-
 .../components/notification_request.jsx       |  3 +-
 .../flavours/glitch/styles/_mixins.scss       | 12 --------
 .../flavours/glitch/styles/accounts.scss      |  4 ---
 .../flavours/glitch/styles/components.scss    | 29 +++++++++++++++----
 .../flavours/glitch/styles/containers.scss    |  8 ++---
 6 files changed, 40 insertions(+), 30 deletions(-)

diff --git a/app/javascript/flavours/glitch/components/avatar.tsx b/app/javascript/flavours/glitch/components/avatar.tsx
index c45c26981f8089..c8bf388d268d9b 100644
--- a/app/javascript/flavours/glitch/components/avatar.tsx
+++ b/app/javascript/flavours/glitch/components/avatar.tsx
@@ -11,6 +11,8 @@ interface Props {
   style?: React.CSSProperties;
   inline?: boolean;
   animate?: boolean;
+  counter?: number | string;
+  counterBorderColor?: string;
 }
 
 export const Avatar: React.FC<Props> = ({
@@ -19,6 +21,8 @@ export const Avatar: React.FC<Props> = ({
   size = 20,
   inline = false,
   style: styleFromParent,
+  counter,
+  counterBorderColor,
 }) => {
   const { hovering, handleMouseEnter, handleMouseLeave } = useHovering(animate);
 
@@ -43,7 +47,15 @@ export const Avatar: React.FC<Props> = ({
       style={style}
       data-avatar-of={account && `@${account.get('acct')}`}
     >
-      {src && <img src={src} alt={account?.get('acct')} />}
+      {src && <img src={src} alt='' />}
+      {counter && (
+        <div
+          className='account__avatar__counter'
+          style={{ borderColor: counterBorderColor }}
+        >
+          {counter}
+        </div>
+      )}
     </div>
   );
 };
diff --git a/app/javascript/flavours/glitch/features/notifications/components/notification_request.jsx b/app/javascript/flavours/glitch/features/notifications/components/notification_request.jsx
index 6c9e2980deca42..3b32955348cf52 100644
--- a/app/javascript/flavours/glitch/features/notifications/components/notification_request.jsx
+++ b/app/javascript/flavours/glitch/features/notifications/components/notification_request.jsx
@@ -38,12 +38,11 @@ export const NotificationRequest = ({ id, accountId, notificationsCount }) => {
   return (
     <div className='notification-request'>
       <Link to={`/notifications/requests/${id}`} className='notification-request__link'>
-        <Avatar account={account} size={36} />
+        <Avatar account={account} size={40} counter={toCappedNumber(notificationsCount)} />
 
         <div className='notification-request__name'>
           <div className='notification-request__name__display-name'>
             <bdi><strong dangerouslySetInnerHTML={{ __html: account?.get('display_name_html') }} /></bdi>
-            <span className='filtered-notifications-banner__badge'>{toCappedNumber(notificationsCount)}</span>
           </div>
 
           <span>@{account?.get('acct')}</span>
diff --git a/app/javascript/flavours/glitch/styles/_mixins.scss b/app/javascript/flavours/glitch/styles/_mixins.scss
index a59bb2d4419559..444d2e01609641 100644
--- a/app/javascript/flavours/glitch/styles/_mixins.scss
+++ b/app/javascript/flavours/glitch/styles/_mixins.scss
@@ -1,15 +1,3 @@
-@mixin avatar-radius() {
-  border-radius: $ui-avatar-border-size;
-  background-position: 50%;
-  background-clip: padding-box;
-}
-
-@mixin avatar-size($size: 48px) {
-  width: $size;
-  height: $size;
-  background-size: $size $size;
-}
-
 @mixin fullwidth-gallery {
   &.full-width {
     margin-left: -14px;
diff --git a/app/javascript/flavours/glitch/styles/accounts.scss b/app/javascript/flavours/glitch/styles/accounts.scss
index 719d21fa818138..aa0d739e295004 100644
--- a/app/javascript/flavours/glitch/styles/accounts.scss
+++ b/app/javascript/flavours/glitch/styles/accounts.scss
@@ -49,8 +49,6 @@
       flex: 0 0 auto;
       width: 48px;
       height: 48px;
-      @include avatar-size(48px);
-
       padding-top: 2px;
 
       img {
@@ -59,8 +57,6 @@
         display: block;
         margin: 0;
         border-radius: 4px;
-        @include avatar-radius;
-
         background: darken($ui-base-color, 8%);
         object-fit: cover;
       }
diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index 08c7bf4eb04f88..6506151b283d04 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -2162,17 +2162,15 @@ body > [data-popper-placement] {
 }
 
 .account__avatar {
-  @include avatar-radius;
-
   display: block;
   position: relative;
-  overflow: hidden;
 
   img {
     display: block;
     width: 100%;
     height: 100%;
     object-fit: cover;
+    border-radius: 4px;
   }
 
   &-inline {
@@ -2182,8 +2180,6 @@ body > [data-popper-placement] {
   }
 
   &-composite {
-    @include avatar-radius;
-
     overflow: hidden;
     position: relative;
 
@@ -2210,6 +2206,29 @@ body > [data-popper-placement] {
       font-size: 15px;
     }
   }
+
+  &__counter {
+    $height: 16px;
+    $h-padding: 5px;
+
+    position: absolute;
+    bottom: -3px;
+    inset-inline-end: -3px;
+    padding-left: $h-padding;
+    padding-right: $h-padding;
+    height: $height;
+    border-radius: $height;
+    min-width: $height - 2 * $h-padding; // to ensure that it is never narrower than a circle
+    line-height: $height + 1px; // to visually center the numbers
+    background-color: $ui-button-background-color;
+    color: $white;
+    border-width: 1px;
+    border-style: solid;
+    border-color: var(--background-color);
+    font-size: 11px;
+    font-weight: 500;
+    text-align: center;
+  }
 }
 
 a .account__avatar {
diff --git a/app/javascript/flavours/glitch/styles/containers.scss b/app/javascript/flavours/glitch/styles/containers.scss
index 5330b5a20a7114..9363e428b3809b 100644
--- a/app/javascript/flavours/glitch/styles/containers.scss
+++ b/app/javascript/flavours/glitch/styles/containers.scss
@@ -72,12 +72,9 @@
   }
 
   .avatar {
-    width: 40px;
-    height: 40px;
+    width: 48px;
+    height: 48px;
     flex: 0 0 auto;
-    @include avatar-size(40px);
-
-    margin-inline-end: 10px;
 
     img {
       width: 100%;
@@ -85,7 +82,6 @@
       display: block;
       margin: 0;
       border-radius: 4px;
-      @include avatar-radius;
     }
   }
 

From f2736715e494dbed28a9a4da0c516661a35aa37b Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 2 Aug 2024 15:55:31 +0200
Subject: [PATCH 1699/2191] [Glitch] Fix contrast between background and form
 elements on some pages

Port 2ec1181ee5c409dd6d2f89cdf04e983e84fce9ab to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/styles/basics.scss | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/app/javascript/flavours/glitch/styles/basics.scss b/app/javascript/flavours/glitch/styles/basics.scss
index e59dba3b655048..2223893336c30c 100644
--- a/app/javascript/flavours/glitch/styles/basics.scss
+++ b/app/javascript/flavours/glitch/styles/basics.scss
@@ -66,10 +66,6 @@ body {
     }
   }
 
-  &.lighter {
-    background: $ui-base-color;
-  }
-
   &.with-modals {
     overflow-x: hidden;
     overflow-y: scroll;
@@ -109,7 +105,6 @@ body {
   }
 
   &.embed {
-    background: lighten($ui-base-color, 4%);
     margin: 0;
     padding-bottom: 0;
 
@@ -122,15 +117,12 @@ body {
   }
 
   &.admin {
-    background: var(--background-color);
     padding: 0;
   }
 
   &.error {
     position: absolute;
     text-align: center;
-    color: $darker-text-color;
-    background: $ui-base-color;
     width: 100%;
     height: 100%;
     padding: 0;

From 096f622496e8ed163fffb6ca30ecde6b873e1f8c Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 2 Aug 2024 16:59:37 +0200
Subject: [PATCH 1700/2191] [Glitch] Further de-emphasize filtered
 notifications banner and add setting to minimize it

Port ad95c98054574080ac5d15584b3018d1db836531 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../components/checkbox_with_label.jsx        |  31 ----
 .../components/checkbox_with_label.tsx        |  40 +++++
 .../components/column_settings.jsx            |  48 +-----
 .../filtered_notifications_banner.tsx         |  60 +++++++-
 .../components/policy_controls.tsx            | 141 ++++++++++++++++++
 .../containers/column_settings_container.js   |   8 -
 .../glitch/features/notifications/index.jsx   |   9 +-
 .../features/notifications/requests.jsx       |  40 ++++-
 .../features/notifications_v2/index.tsx       |  30 ++--
 .../flavours/glitch/reducers/settings.js      |   1 +
 .../flavours/glitch/selectors/settings.ts     |   5 +
 11 files changed, 307 insertions(+), 106 deletions(-)
 delete mode 100644 app/javascript/flavours/glitch/features/notifications/components/checkbox_with_label.jsx
 create mode 100644 app/javascript/flavours/glitch/features/notifications/components/checkbox_with_label.tsx
 create mode 100644 app/javascript/flavours/glitch/features/notifications/components/policy_controls.tsx

diff --git a/app/javascript/flavours/glitch/features/notifications/components/checkbox_with_label.jsx b/app/javascript/flavours/glitch/features/notifications/components/checkbox_with_label.jsx
deleted file mode 100644
index 5a7bb2307be3bc..00000000000000
--- a/app/javascript/flavours/glitch/features/notifications/components/checkbox_with_label.jsx
+++ /dev/null
@@ -1,31 +0,0 @@
-import PropTypes from 'prop-types';
-import { useCallback } from 'react';
-
-import Toggle from 'react-toggle';
-
-export const CheckboxWithLabel = ({ checked, disabled, children, onChange }) => {
-  const handleChange = useCallback(({ target }) => {
-    onChange(target.checked);
-  }, [onChange]);
-
-  return (
-    <label className='app-form__toggle'>
-      <div className='app-form__toggle__label'>
-        {children}
-      </div>
-
-      <div className='app-form__toggle__toggle'>
-        <div>
-          <Toggle checked={checked} onChange={handleChange} disabled={disabled} />
-        </div>
-      </div>
-    </label>
-  );
-};
-
-CheckboxWithLabel.propTypes = {
-  checked: PropTypes.bool,
-  disabled: PropTypes.bool,
-  children: PropTypes.children,
-  onChange: PropTypes.func,
-};
diff --git a/app/javascript/flavours/glitch/features/notifications/components/checkbox_with_label.tsx b/app/javascript/flavours/glitch/features/notifications/components/checkbox_with_label.tsx
new file mode 100644
index 00000000000000..9922bc6c7c5923
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/notifications/components/checkbox_with_label.tsx
@@ -0,0 +1,40 @@
+import type { PropsWithChildren } from 'react';
+import { useCallback } from 'react';
+
+import Toggle from 'react-toggle';
+
+interface Props {
+  checked: boolean;
+  disabled?: boolean;
+  onChange: (checked: boolean) => void;
+}
+
+export const CheckboxWithLabel: React.FC<PropsWithChildren<Props>> = ({
+  checked,
+  disabled,
+  children,
+  onChange,
+}) => {
+  const handleChange = useCallback(
+    ({ target }: React.ChangeEvent<HTMLInputElement>) => {
+      onChange(target.checked);
+    },
+    [onChange],
+  );
+
+  return (
+    <label className='app-form__toggle'>
+      <div className='app-form__toggle__label'>{children}</div>
+
+      <div className='app-form__toggle__toggle'>
+        <div>
+          <Toggle
+            checked={checked}
+            onChange={handleChange}
+            disabled={disabled}
+          />
+        </div>
+      </div>
+    </label>
+  );
+};
diff --git a/app/javascript/flavours/glitch/features/notifications/components/column_settings.jsx b/app/javascript/flavours/glitch/features/notifications/components/column_settings.jsx
index 3423517227da0f..e38a24884a80c2 100644
--- a/app/javascript/flavours/glitch/features/notifications/components/column_settings.jsx
+++ b/app/javascript/flavours/glitch/features/notifications/components/column_settings.jsx
@@ -8,10 +8,10 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import { identityContextPropShape, withIdentity } from 'flavours/glitch/identity_context';
 import { PERMISSION_MANAGE_USERS, PERMISSION_MANAGE_REPORTS } from 'flavours/glitch/permissions';
 
-import { CheckboxWithLabel } from './checkbox_with_label';
 import ClearColumnButton from './clear_column_button';
 import GrantPermissionButton from './grant_permission_button';
 import PillBarButton from './pill_bar_button';
+import { PolicyControls } from './policy_controls';
 import SettingToggle from './setting_toggle';
 
 class ColumnSettings extends PureComponent {
@@ -25,32 +25,14 @@ class ColumnSettings extends PureComponent {
     alertsEnabled: PropTypes.bool,
     browserSupport: PropTypes.bool,
     browserPermission: PropTypes.string,
-    notificationPolicy: PropTypes.object.isRequired,
-    onChangePolicy: PropTypes.func.isRequired,
   };
 
   onPushChange = (path, checked) => {
     this.props.onChange(['push', ...path], checked);
   };
 
-  handleFilterNotFollowing = checked => {
-    this.props.onChangePolicy('filter_not_following', checked);
-  };
-
-  handleFilterNotFollowers = checked => {
-    this.props.onChangePolicy('filter_not_followers', checked);
-  };
-
-  handleFilterNewAccounts = checked => {
-    this.props.onChangePolicy('filter_new_accounts', checked);
-  };
-
-  handleFilterPrivateMentions = checked => {
-    this.props.onChangePolicy('filter_private_mentions', checked);
-  };
-
   render () {
-    const { settings, pushSettings, onChange, onClear, alertsEnabled, browserSupport, browserPermission, onRequestNotificationPermission, notificationPolicy } = this.props;
+    const { settings, pushSettings, onChange, onClear, alertsEnabled, browserSupport, browserPermission, onRequestNotificationPermission } = this.props;
 
     const unreadMarkersShowStr = <FormattedMessage id='notifications.column_settings.unread_notifications.highlight' defaultMessage='Highlight unread notifications' />;
     const groupingShowStr = <FormattedMessage id='notifications.column_settings.beta.grouping' defaultMessage='Group notifications' />;
@@ -81,31 +63,7 @@ class ColumnSettings extends PureComponent {
           </section>
         )}
 
-        <section>
-          <h3><FormattedMessage id='notifications.policy.title' defaultMessage='Filter out notifications from…' /></h3>
-
-          <div className='column-settings__row'>
-            <CheckboxWithLabel checked={notificationPolicy.filter_not_following} onChange={this.handleFilterNotFollowing}>
-              <strong><FormattedMessage id='notifications.policy.filter_not_following_title' defaultMessage="People you don't follow" /></strong>
-              <span className='hint'><FormattedMessage id='notifications.policy.filter_not_following_hint' defaultMessage='Until you manually approve them' /></span>
-            </CheckboxWithLabel>
-
-            <CheckboxWithLabel checked={notificationPolicy.filter_not_followers} onChange={this.handleFilterNotFollowers}>
-              <strong><FormattedMessage id='notifications.policy.filter_not_followers_title' defaultMessage='People not following you' /></strong>
-              <span className='hint'><FormattedMessage id='notifications.policy.filter_not_followers_hint' defaultMessage='Including people who have been following you fewer than {days, plural, one {one day} other {# days}}' values={{ days: 3 }} /></span>
-            </CheckboxWithLabel>
-
-            <CheckboxWithLabel checked={notificationPolicy.filter_new_accounts} onChange={this.handleFilterNewAccounts}>
-              <strong><FormattedMessage id='notifications.policy.filter_new_accounts_title' defaultMessage='New accounts' /></strong>
-              <span className='hint'><FormattedMessage id='notifications.policy.filter_new_accounts.hint' defaultMessage='Created within the past {days, plural, one {one day} other {# days}}' values={{ days: 30 }} /></span>
-            </CheckboxWithLabel>
-
-            <CheckboxWithLabel checked={notificationPolicy.filter_private_mentions} onChange={this.handleFilterPrivateMentions}>
-              <strong><FormattedMessage id='notifications.policy.filter_private_mentions_title' defaultMessage='Unsolicited private mentions' /></strong>
-              <span className='hint'><FormattedMessage id='notifications.policy.filter_private_mentions_hint' defaultMessage="Filtered unless it's in reply to your own mention or if you follow the sender" /></span>
-            </CheckboxWithLabel>
-          </div>
-        </section>
+        <PolicyControls />
 
         <section role='group' aria-labelledby='notifications-filter-bar'>
           <h3 id='notifications-filter-bar'><FormattedMessage id='notifications.column_settings.filter_bar.category' defaultMessage='Quick filter bar' /></h3>
diff --git a/app/javascript/flavours/glitch/features/notifications/components/filtered_notifications_banner.tsx b/app/javascript/flavours/glitch/features/notifications/components/filtered_notifications_banner.tsx
index 8aaa486b1994e8..f4413a8c170d82 100644
--- a/app/javascript/flavours/glitch/features/notifications/components/filtered_notifications_banner.tsx
+++ b/app/javascript/flavours/glitch/features/notifications/components/filtered_notifications_banner.tsx
@@ -1,18 +1,62 @@
-import { useEffect } from 'react';
+import { useCallback, useEffect } from 'react';
 
-import { FormattedMessage } from 'react-intl';
+import { FormattedMessage, useIntl, defineMessages } from 'react-intl';
 
-import { Link } from 'react-router-dom';
+import { Link, useHistory } from 'react-router-dom';
 
 import InventoryIcon from '@/material-icons/400-24px/inventory_2.svg?react';
 import { fetchNotificationPolicy } from 'flavours/glitch/actions/notification_policies';
 import { Icon } from 'flavours/glitch/components/icon';
+import { selectSettingsNotificationsMinimizeFilteredBanner } from 'flavours/glitch/selectors/settings';
 import { useAppSelector, useAppDispatch } from 'flavours/glitch/store';
-import { toCappedNumber } from 'flavours/glitch/utils/numbers';
+
+const messages = defineMessages({
+  filteredNotifications: {
+    id: 'notification_requests.title',
+    defaultMessage: 'Filtered notifications',
+  },
+});
+
+export const FilteredNotificationsIconButton: React.FC<{
+  className?: string;
+}> = ({ className }) => {
+  const intl = useIntl();
+  const history = useHistory();
+  const policy = useAppSelector((state) => state.notificationPolicy);
+  const minimizeSetting = useAppSelector(
+    selectSettingsNotificationsMinimizeFilteredBanner,
+  );
+
+  const handleClick = useCallback(() => {
+    history.push('/notifications/requests');
+  }, [history]);
+
+  if (policy === null || policy.summary.pending_notifications_count === 0) {
+    return null;
+  }
+
+  if (!minimizeSetting) {
+    return null;
+  }
+
+  return (
+    <button
+      aria-label={intl.formatMessage(messages.filteredNotifications)}
+      title={intl.formatMessage(messages.filteredNotifications)}
+      onClick={handleClick}
+      className={className}
+    >
+      <Icon id='filtered-notifications' icon={InventoryIcon} />
+    </button>
+  );
+};
 
 export const FilteredNotificationsBanner: React.FC = () => {
   const dispatch = useAppDispatch();
   const policy = useAppSelector((state) => state.notificationPolicy);
+  const minimizeSetting = useAppSelector(
+    selectSettingsNotificationsMinimizeFilteredBanner,
+  );
 
   useEffect(() => {
     void dispatch(fetchNotificationPolicy());
@@ -30,6 +74,10 @@ export const FilteredNotificationsBanner: React.FC = () => {
     return null;
   }
 
+  if (minimizeSetting) {
+    return null;
+  }
+
   return (
     <Link
       className='filtered-notifications-banner'
@@ -54,10 +102,6 @@ export const FilteredNotificationsBanner: React.FC = () => {
           />
         </span>
       </div>
-
-      <div className='filtered-notifications-banner__badge'>
-        {toCappedNumber(policy.summary.pending_notifications_count)}
-      </div>
     </Link>
   );
 };
diff --git a/app/javascript/flavours/glitch/features/notifications/components/policy_controls.tsx b/app/javascript/flavours/glitch/features/notifications/components/policy_controls.tsx
new file mode 100644
index 00000000000000..58eff3fbcf2d5c
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/notifications/components/policy_controls.tsx
@@ -0,0 +1,141 @@
+import { useCallback } from 'react';
+
+import { FormattedMessage } from 'react-intl';
+
+import { updateNotificationsPolicy } from 'flavours/glitch/actions/notification_policies';
+import { useAppSelector, useAppDispatch } from 'flavours/glitch/store';
+
+import { CheckboxWithLabel } from './checkbox_with_label';
+
+export const PolicyControls: React.FC = () => {
+  const dispatch = useAppDispatch();
+
+  const notificationPolicy = useAppSelector(
+    (state) => state.notificationPolicy,
+  );
+
+  const handleFilterNotFollowing = useCallback(
+    (checked: boolean) => {
+      void dispatch(
+        updateNotificationsPolicy({ filter_not_following: checked }),
+      );
+    },
+    [dispatch],
+  );
+
+  const handleFilterNotFollowers = useCallback(
+    (checked: boolean) => {
+      void dispatch(
+        updateNotificationsPolicy({ filter_not_followers: checked }),
+      );
+    },
+    [dispatch],
+  );
+
+  const handleFilterNewAccounts = useCallback(
+    (checked: boolean) => {
+      void dispatch(
+        updateNotificationsPolicy({ filter_new_accounts: checked }),
+      );
+    },
+    [dispatch],
+  );
+
+  const handleFilterPrivateMentions = useCallback(
+    (checked: boolean) => {
+      void dispatch(
+        updateNotificationsPolicy({ filter_private_mentions: checked }),
+      );
+    },
+    [dispatch],
+  );
+
+  if (!notificationPolicy) return null;
+
+  return (
+    <section>
+      <h3>
+        <FormattedMessage
+          id='notifications.policy.title'
+          defaultMessage='Filter out notifications from…'
+        />
+      </h3>
+
+      <div className='column-settings__row'>
+        <CheckboxWithLabel
+          checked={notificationPolicy.filter_not_following}
+          onChange={handleFilterNotFollowing}
+        >
+          <strong>
+            <FormattedMessage
+              id='notifications.policy.filter_not_following_title'
+              defaultMessage="People you don't follow"
+            />
+          </strong>
+          <span className='hint'>
+            <FormattedMessage
+              id='notifications.policy.filter_not_following_hint'
+              defaultMessage='Until you manually approve them'
+            />
+          </span>
+        </CheckboxWithLabel>
+
+        <CheckboxWithLabel
+          checked={notificationPolicy.filter_not_followers}
+          onChange={handleFilterNotFollowers}
+        >
+          <strong>
+            <FormattedMessage
+              id='notifications.policy.filter_not_followers_title'
+              defaultMessage='People not following you'
+            />
+          </strong>
+          <span className='hint'>
+            <FormattedMessage
+              id='notifications.policy.filter_not_followers_hint'
+              defaultMessage='Including people who have been following you fewer than {days, plural, one {one day} other {# days}}'
+              values={{ days: 3 }}
+            />
+          </span>
+        </CheckboxWithLabel>
+
+        <CheckboxWithLabel
+          checked={notificationPolicy.filter_new_accounts}
+          onChange={handleFilterNewAccounts}
+        >
+          <strong>
+            <FormattedMessage
+              id='notifications.policy.filter_new_accounts_title'
+              defaultMessage='New accounts'
+            />
+          </strong>
+          <span className='hint'>
+            <FormattedMessage
+              id='notifications.policy.filter_new_accounts.hint'
+              defaultMessage='Created within the past {days, plural, one {one day} other {# days}}'
+              values={{ days: 30 }}
+            />
+          </span>
+        </CheckboxWithLabel>
+
+        <CheckboxWithLabel
+          checked={notificationPolicy.filter_private_mentions}
+          onChange={handleFilterPrivateMentions}
+        >
+          <strong>
+            <FormattedMessage
+              id='notifications.policy.filter_private_mentions_title'
+              defaultMessage='Unsolicited private mentions'
+            />
+          </strong>
+          <span className='hint'>
+            <FormattedMessage
+              id='notifications.policy.filter_private_mentions_hint'
+              defaultMessage="Filtered unless it's in reply to your own mention or if you follow the sender"
+            />
+          </span>
+        </CheckboxWithLabel>
+      </div>
+    </section>
+  );
+};
diff --git a/app/javascript/flavours/glitch/features/notifications/containers/column_settings_container.js b/app/javascript/flavours/glitch/features/notifications/containers/column_settings_container.js
index 1212a88b388842..3c4c4b30ca1ffa 100644
--- a/app/javascript/flavours/glitch/features/notifications/containers/column_settings_container.js
+++ b/app/javascript/flavours/glitch/features/notifications/containers/column_settings_container.js
@@ -6,7 +6,6 @@ import { openModal } from 'flavours/glitch/actions/modal';
 import { initializeNotifications } from 'flavours/glitch/actions/notifications_migration';
 
 import { showAlert } from '../../../actions/alerts';
-import { updateNotificationsPolicy } from '../../../actions/notification_policies';
 import { setFilter, requestBrowserPermission } from '../../../actions/notifications';
 import { changeAlerts as changePushNotifications } from '../../../actions/push_notifications';
 import { changeSetting } from '../../../actions/settings';
@@ -25,7 +24,6 @@ const mapStateToProps = state => ({
   alertsEnabled: state.getIn(['settings', 'notifications', 'alerts']).includes(true),
   browserSupport: state.getIn(['notifications', 'browserSupport']),
   browserPermission: state.getIn(['notifications', 'browserPermission']),
-  notificationPolicy: state.notificationPolicy,
 });
 
 const mapDispatchToProps = (dispatch) => ({
@@ -74,12 +72,6 @@ const mapDispatchToProps = (dispatch) => ({
     dispatch(requestBrowserPermission());
   },
 
-  onChangePolicy (param, checked) {
-    dispatch(updateNotificationsPolicy({
-      [param]: checked,
-    }));
-  },
-
 });
 
 export default injectIntl(connect(mapStateToProps, mapDispatchToProps)(ColumnSettings));
diff --git a/app/javascript/flavours/glitch/features/notifications/index.jsx b/app/javascript/flavours/glitch/features/notifications/index.jsx
index 2d3d4377561e7e..b3b133411aa02f 100644
--- a/app/javascript/flavours/glitch/features/notifications/index.jsx
+++ b/app/javascript/flavours/glitch/features/notifications/index.jsx
@@ -38,7 +38,10 @@ import { LoadGap } from '../../components/load_gap';
 import ScrollableList from '../../components/scrollable_list';
 import NotificationPurgeButtonsContainer from '../../containers/notification_purge_buttons_container';
 
-import { FilteredNotificationsBanner } from './components/filtered_notifications_banner';
+import {
+  FilteredNotificationsBanner,
+  FilteredNotificationsIconButton,
+} from './components/filtered_notifications_banner';
 import NotificationsPermissionBanner from './components/notifications_permission_banner';
 import ColumnSettingsContainer from './containers/column_settings_container';
 import FilterBarContainer from './containers/filter_bar_container';
@@ -290,7 +293,9 @@ class Notifications extends PureComponent {
       scrollContainer = <NotSignedInIndicator />;
     }
 
-    const extraButtons = [];
+    const extraButtons = [
+      <FilteredNotificationsIconButton key='filtered-notifications-icon' className='column-header__button' />,
+    ];
 
     if (canMarkAsRead) {
       extraButtons.push(
diff --git a/app/javascript/flavours/glitch/features/notifications/requests.jsx b/app/javascript/flavours/glitch/features/notifications/requests.jsx
index d7a07da152c750..3df8bc2616314e 100644
--- a/app/javascript/flavours/glitch/features/notifications/requests.jsx
+++ b/app/javascript/flavours/glitch/features/notifications/requests.jsx
@@ -9,16 +9,52 @@ import { useSelector, useDispatch } from 'react-redux';
 
 import InventoryIcon from '@/material-icons/400-24px/inventory_2.svg?react';
 import { fetchNotificationRequests, expandNotificationRequests } from 'flavours/glitch/actions/notifications';
+import { changeSetting } from 'flavours/glitch/actions/settings';
 import Column from 'flavours/glitch/components/column';
 import ColumnHeader from 'flavours/glitch/components/column_header';
 import ScrollableList from 'flavours/glitch/components/scrollable_list';
 
 import { NotificationRequest } from './components/notification_request';
+import { PolicyControls } from './components/policy_controls';
+import SettingToggle from './components/setting_toggle';
 
 const messages = defineMessages({
   title: { id: 'notification_requests.title', defaultMessage: 'Filtered notifications' },
+  maximize: { id: 'notification_requests.maximize', defaultMessage: 'Maximize' }
 });
 
+const ColumnSettings = () => {
+  const dispatch = useDispatch();
+  const settings = useSelector((state) => state.settings.get('notifications'));
+
+  const onChange = useCallback(
+    (key, checked) => {
+      dispatch(changeSetting(['notifications', ...key], checked));
+    },
+    [dispatch],
+  );
+
+  return (
+    <div className='column-settings'>
+      <section>
+        <div className='column-settings__row'>
+          <SettingToggle
+            prefix='notifications'
+            settings={settings}
+            settingPath={['minimizeFilteredBanner']}
+            onChange={onChange}
+            label={
+              <FormattedMessage id='notification_requests.minimize_banner' defaultMessage='Minimize filtred notifications banner' />
+            }
+          />
+        </div>
+      </section>
+
+      <PolicyControls />
+    </div>
+  );
+};
+
 export const NotificationRequests = ({ multiColumn }) => {
   const columnRef = useRef();
   const intl = useIntl();
@@ -48,7 +84,9 @@ export const NotificationRequests = ({ multiColumn }) => {
         onClick={handleHeaderClick}
         multiColumn={multiColumn}
         showBackButton
-      />
+      >
+        <ColumnSettings />
+      </ColumnHeader>
 
       <ScrollableList
         scrollKey='notification_requests'
diff --git a/app/javascript/flavours/glitch/features/notifications_v2/index.tsx b/app/javascript/flavours/glitch/features/notifications_v2/index.tsx
index 94051713751779..586b2da3fe7a62 100644
--- a/app/javascript/flavours/glitch/features/notifications_v2/index.tsx
+++ b/app/javascript/flavours/glitch/features/notifications_v2/index.tsx
@@ -43,7 +43,10 @@ import Column from '../../components/column';
 import { ColumnHeader } from '../../components/column_header';
 import { LoadGap } from '../../components/load_gap';
 import ScrollableList from '../../components/scrollable_list';
-import { FilteredNotificationsBanner } from '../notifications/components/filtered_notifications_banner';
+import {
+  FilteredNotificationsBanner,
+  FilteredNotificationsIconButton,
+} from '../notifications/components/filtered_notifications_banner';
 import NotificationsPermissionBanner from '../notifications/components/notifications_permission_banner';
 import ColumnSettingsContainer from '../notifications/containers/column_settings_container';
 
@@ -306,16 +309,21 @@ export const Notifications: React.FC<{
     <NotSignedInIndicator />
   );
 
-  const extraButton = canMarkAsRead ? (
-    <button
-      aria-label={intl.formatMessage(messages.markAsRead)}
-      title={intl.formatMessage(messages.markAsRead)}
-      onClick={handleMarkAsRead}
-      className='column-header__button'
-    >
-      <Icon id='done-all' icon={DoneAllIcon} />
-    </button>
-  ) : null;
+  const extraButton = (
+    <>
+      <FilteredNotificationsIconButton className='column-header__button' />
+      {canMarkAsRead && (
+        <button
+          aria-label={intl.formatMessage(messages.markAsRead)}
+          title={intl.formatMessage(messages.markAsRead)}
+          onClick={handleMarkAsRead}
+          className='column-header__button'
+        >
+          <Icon id='done-all' icon={DoneAllIcon} />
+        </button>
+      )}
+    </>
+  );
 
   return (
     <Column
diff --git a/app/javascript/flavours/glitch/reducers/settings.js b/app/javascript/flavours/glitch/reducers/settings.js
index f5768aedc6d0b5..ff4af68752b82f 100644
--- a/app/javascript/flavours/glitch/reducers/settings.js
+++ b/app/javascript/flavours/glitch/reducers/settings.js
@@ -52,6 +52,7 @@ const initialState = ImmutableMap({
 
     dismissPermissionBanner: false,
     showUnread: true,
+    minimizeFilteredBanner: false,
 
     shows: ImmutableMap({
       follow: true,
diff --git a/app/javascript/flavours/glitch/selectors/settings.ts b/app/javascript/flavours/glitch/selectors/settings.ts
index ce2b8b15e59cb1..9a1a2c990baa40 100644
--- a/app/javascript/flavours/glitch/selectors/settings.ts
+++ b/app/javascript/flavours/glitch/selectors/settings.ts
@@ -37,4 +37,9 @@ export const selectNeedsNotificationPermission = (state: RootState) =>
       'dismissPermissionBanner',
     ])) as boolean;
 
+export const selectSettingsNotificationsMinimizeFilteredBanner = (
+  state: RootState,
+) =>
+  state.settings.getIn(['notifications', 'minimizeFilteredBanner']) as boolean;
+
 /* eslint-enable @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access */

From 19f4aa11472eb5bedd97e0541a48126078715193 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Fri, 2 Aug 2024 21:55:13 +0200
Subject: [PATCH 1701/2191] Fix typo in english message (filtred => filtered)
 (#31273)

---
 app/javascript/mastodon/features/notifications/requests.jsx | 2 +-
 app/javascript/mastodon/locales/en.json                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/javascript/mastodon/features/notifications/requests.jsx b/app/javascript/mastodon/features/notifications/requests.jsx
index 66db35b588e605..2fe8dc2b6c20c6 100644
--- a/app/javascript/mastodon/features/notifications/requests.jsx
+++ b/app/javascript/mastodon/features/notifications/requests.jsx
@@ -44,7 +44,7 @@ const ColumnSettings = () => {
             settingPath={['minimizeFilteredBanner']}
             onChange={onChange}
             label={
-              <FormattedMessage id='notification_requests.minimize_banner' defaultMessage='Minimize filtred notifications banner' />
+              <FormattedMessage id='notification_requests.minimize_banner' defaultMessage='Minimize filtered notifications banner' />
             }
           />
         </div>
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index d5494cadd3eb4f..e9a1d1899fc09a 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -506,7 +506,7 @@
   "notification_requests.accept": "Accept",
   "notification_requests.dismiss": "Dismiss",
   "notification_requests.maximize": "Maximize",
-  "notification_requests.minimize_banner": "Minimize filtred notifications banner",
+  "notification_requests.minimize_banner": "Minimize filtered notifications banner",
   "notification_requests.notifications_from": "Notifications from {name}",
   "notification_requests.title": "Filtered notifications",
   "notifications.clear": "Clear notifications",

From 3d6e8d68344cb6b8604d2321705c83f2eebf8add Mon Sep 17 00:00:00 2001
From: Christian Schmidt <github@chsc.dk>
Date: Sun, 4 Aug 2024 10:57:46 +0200
Subject: [PATCH 1702/2191] Disable irrelevant fields unless cleanup is enabled
 (#26562)

---
 app/javascript/entrypoints/public.tsx     | 36 +++++++++++++++++++++++
 app/views/statuses_cleanup/show.html.haml |  9 ++++++
 2 files changed, 45 insertions(+)

diff --git a/app/javascript/entrypoints/public.tsx b/app/javascript/entrypoints/public.tsx
index 149c1d28d09495..b06675c2ee2cce 100644
--- a/app/javascript/entrypoints/public.tsx
+++ b/app/javascript/entrypoints/public.tsx
@@ -431,6 +431,42 @@ Rails.delegate(document, 'img.custom-emoji', 'mouseout', ({ target }) => {
     target.src = target.dataset.static;
 });
 
+const setInputDisabled = (
+  input: HTMLInputElement | HTMLSelectElement,
+  disabled: boolean,
+) => {
+  input.disabled = disabled;
+
+  const wrapper = input.closest('.with_label');
+  if (wrapper) {
+    wrapper.classList.toggle('disabled', input.disabled);
+
+    const hidden =
+      input.type === 'checkbox' &&
+      wrapper.querySelector<HTMLInputElement>('input[type=hidden][value="0"]');
+    if (hidden) {
+      hidden.disabled = input.disabled;
+    }
+  }
+};
+
+Rails.delegate(
+  document,
+  '#account_statuses_cleanup_policy_enabled',
+  'change',
+  ({ target }) => {
+    if (!(target instanceof HTMLInputElement) || !target.form) return;
+
+    target.form
+      .querySelectorAll<
+        HTMLInputElement | HTMLSelectElement
+      >('input:not([type=hidden], #account_statuses_cleanup_policy_enabled), select')
+      .forEach((input) => {
+        setInputDisabled(input, !target.checked);
+      });
+  },
+);
+
 // Empty the honeypot fields in JS in case something like an extension
 // automatically filled them.
 Rails.delegate(document, '#registration_new_user,#new_user', 'submit', () => {
diff --git a/app/views/statuses_cleanup/show.html.haml b/app/views/statuses_cleanup/show.html.haml
index 07e833537ecad5..78ed6a4fc4e337 100644
--- a/app/views/statuses_cleanup/show.html.haml
+++ b/app/views/statuses_cleanup/show.html.haml
@@ -14,6 +14,7 @@
                 wrapper: :with_label
     .fields-row__column.fields-row__column-6.fields-group
       = f.input :min_status_age,
+                disabled: !@policy.enabled?,
                 collection: AccountStatusesCleanupPolicy::ALLOWED_MIN_STATUS_AGE.map(&:to_i),
                 hint: false,
                 include_blank: false,
@@ -28,11 +29,13 @@
   .fields-row
     .fields-row__column.fields-row__column-6.fields-group
       = f.input :keep_pinned,
+                disabled: !@policy.enabled?,
                 hint: t('statuses_cleanup.keep_pinned_hint'),
                 label: t('statuses_cleanup.keep_pinned'),
                 wrapper: :with_label
     .fields-row__column.fields-row__column-6.fields-group
       = f.input :keep_direct,
+                disabled: !@policy.enabled?,
                 hint: t('statuses_cleanup.keep_direct_hint'),
                 label: t('statuses_cleanup.keep_direct'),
                 wrapper: :with_label
@@ -40,11 +43,13 @@
   .fields-row
     .fields-row__column.fields-row__column-6.fields-group
       = f.input :keep_self_fav,
+                disabled: !@policy.enabled?,
                 hint: t('statuses_cleanup.keep_self_fav_hint'),
                 label: t('statuses_cleanup.keep_self_fav'),
                 wrapper: :with_label
     .fields-row__column.fields-row__column-6.fields-group
       = f.input :keep_self_bookmark,
+                disabled: !@policy.enabled?,
                 hint: t('statuses_cleanup.keep_self_bookmark_hint'),
                 label: t('statuses_cleanup.keep_self_bookmark'),
                 wrapper: :with_label
@@ -52,11 +57,13 @@
   .fields-row
     .fields-row__column.fields-row__column-6.fields-group
       = f.input :keep_polls,
+                disabled: !@policy.enabled?,
                 hint: t('statuses_cleanup.keep_polls_hint'),
                 label: t('statuses_cleanup.keep_polls'),
                 wrapper: :with_label
     .fields-row__column.fields-row__column-6.fields-group
       = f.input :keep_media,
+                disabled: !@policy.enabled?,
                 hint: t('statuses_cleanup.keep_media_hint'),
                 label: t('statuses_cleanup.keep_media'),
                 wrapper: :with_label
@@ -66,12 +73,14 @@
   .fields-row
     .fields-row__column.fields-row__column-6.fields-group
       = f.input :min_favs,
+                disabled: !@policy.enabled?,
                 hint: t('statuses_cleanup.min_favs_hint'),
                 input_html: { min: 1, placeholder: t('statuses_cleanup.ignore_favs') },
                 label: t('statuses_cleanup.min_favs'),
                 wrapper: :with_label
     .fields-row__column.fields-row__column-6.fields-group
       = f.input :min_reblogs,
+                disabled: !@policy.enabled?,
                 hint: t('statuses_cleanup.min_reblogs_hint'),
                 input_html: { min: 1, placeholder: t('statuses_cleanup.ignore_reblogs') },
                 label: t('statuses_cleanup.min_reblogs'),

From 81609f09baa6b297635d86efd9b08c998cdb62b5 Mon Sep 17 00:00:00 2001
From: Jeremy Kescher <jeremy@kescher.at>
Date: Sun, 4 Aug 2024 13:50:03 +0200
Subject: [PATCH 1703/2191] Bump Catstodon revision to 1.0.6

---
 CHANGELOG.md            | 4 ++++
 lib/mastodon/version.rb | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f5d43e8cfffe52..0b52a96a3e3dcc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@ All changes to Catstodon that aren't Mastodon or glitch-soc Mastodon changes wil
 
 All release dates, as well as most other dates, are intended to be read as "within the day, in UTC time."
 
+## [4.3.0-alpha.5+glitch+cat+1.0.6] - 2024-08-04
+
+- Upstream changes
+
 ## [4.3.0-alpha.5+glitch+cat+1.0.5] - 2024-07-31
 
 - Upstream changes
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index f0834dbad753b5..a757fbbe7999ad 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -25,7 +25,7 @@ def prerelease
     end
 
     def catstodon_revision
-      '1.0.5'
+      '1.0.6'
     end
 
     def build_metadata

From b6c1b8f7480d87340a128c593ad267e4b5501beb Mon Sep 17 00:00:00 2001
From: Valtteri Laitinen <dev@valtlai.fi>
Date: Sun, 4 Aug 2024 18:13:15 +0300
Subject: [PATCH 1704/2191] Fix missing border around tab/filter bar (#31286)

---
 app/javascript/styles/mastodon/components.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 3c1ec28163df46..1bd113814c7b0a 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -7354,7 +7354,7 @@ a.status-card {
   display: flex;
   flex-shrink: 0;
 
-  @media screen and (max-width: $no-gap-breakpoint) {
+  @media screen and (max-width: $no-gap-breakpoint - 1px) {
     border-right: 0;
     border-left: 0;
   }

From 315308b10cf1d6431053c1553a2f0b596471f039 Mon Sep 17 00:00:00 2001
From: Valtteri Laitinen <dev@valtlai.fi>
Date: Sun, 4 Aug 2024 18:14:11 +0300
Subject: [PATCH 1705/2191] Fix duplicate border around search results (#31284)

---
 app/javascript/styles/mastodon/components.scss | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 1bd113814c7b0a..583b5d4c5ae124 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -3086,6 +3086,11 @@ $ui-header-logo-wordmark-width: 99px;
   .explore__search-header {
     display: flex;
   }
+
+  .explore__search-results {
+    border: 0;
+    border-radius: 0;
+  }
 }
 
 .icon-with-badge {

From 3fec1baefdeb7da5685e109fabaf56a3575201bb Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 5 Aug 2024 08:28:22 +0200
Subject: [PATCH 1706/2191] chore(deps): update devdependencies (non-major)
 (#31294)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 170 +++++++++++++++++++++++++++++-------------------------
 1 file changed, 93 insertions(+), 77 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index d7adb6b64052cf..0c6f7fdb83418b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4677,12 +4677,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ansi-escapes@npm:^6.2.0":
-  version: 6.2.0
-  resolution: "ansi-escapes@npm:6.2.0"
+"ansi-escapes@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "ansi-escapes@npm:7.0.0"
   dependencies:
-    type-fest: "npm:^3.0.0"
-  checksum: 10c0/3eec75deedd8b10192c5f98e4cd9715cc3ff268d33fc463c24b7d22446668bfcd4ad1803993ea89c0f51f88b5a3399572bacb7c8cb1a067fc86e189c5f3b0c7e
+    environment: "npm:^1.0.0"
+  checksum: 10c0/86e51e36fabef18c9c004af0a280573e828900641cea35134a124d2715e0c5a473494ab4ce396614505da77638ae290ff72dd8002d9747d2ee53f5d6bbe336be
   languageName: node
   linkType: hard
 
@@ -6034,12 +6034,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cli-cursor@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "cli-cursor@npm:4.0.0"
+"cli-cursor@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "cli-cursor@npm:5.0.0"
   dependencies:
-    restore-cursor: "npm:^4.0.0"
-  checksum: 10c0/e776e8c3c6727300d0539b0d25160b2bb56aed1a63942753ba1826b012f337a6f4b7ace3548402e4f2f13b5e16bfd751be672c44b203205e7eca8be94afec42c
+    restore-cursor: "npm:^5.0.0"
+  checksum: 10c0/7ec62f69b79f6734ab209a3e4dbdc8af7422d44d360a7cb1efa8a0887bbe466a6e625650c466fe4359aee44dbe2dc0b6994b583d40a05d0808a5cb193641d220
   languageName: node
   linkType: hard
 
@@ -6937,15 +6937,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"debug@npm:4, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.4, debug@npm:^4.3.5, debug@npm:~4.3.4":
-  version: 4.3.5
-  resolution: "debug@npm:4.3.5"
+"debug@npm:4, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.4, debug@npm:^4.3.5, debug@npm:^4.3.6, debug@npm:~4.3.6":
+  version: 4.3.6
+  resolution: "debug@npm:4.3.6"
   dependencies:
     ms: "npm:2.1.2"
   peerDependenciesMeta:
     supports-color:
       optional: true
-  checksum: 10c0/082c375a2bdc4f4469c99f325ff458adad62a3fc2c482d59923c260cb08152f34e2659f72b3767db8bb2f21ca81a60a42d1019605a412132d7b9f59363a005cc
+  checksum: 10c0/3293416bff072389c101697d4611c402a6bacd1900ac20c0492f61a9cdd6b3b29750fc7f5e299f8058469ef60ff8fb79b86395a30374fbd2490113c1c7112285
   languageName: node
   linkType: hard
 
@@ -7577,6 +7577,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"environment@npm:^1.0.0":
+  version: 1.1.0
+  resolution: "environment@npm:1.1.0"
+  checksum: 10c0/fb26434b0b581ab397039e51ff3c92b34924a98b2039dcb47e41b7bca577b9dbf134a8eadb364415c74464b682e2d3afe1a4c0eb9873dc44ea814c5d3103331d
+  languageName: node
+  linkType: hard
+
 "err-code@npm:^2.0.2":
   version: 2.0.3
   resolution: "err-code@npm:2.0.3"
@@ -9521,11 +9528,11 @@ __metadata:
   linkType: hard
 
 "husky@npm:^9.0.11":
-  version: 9.1.3
-  resolution: "husky@npm:9.1.3"
+  version: 9.1.4
+  resolution: "husky@npm:9.1.4"
   bin:
     husky: bin.js
-  checksum: 10c0/3fb8657ff97f529dab0b9a0afa6b818ec604f60c39abc13e8e3f4263ea30a3aa6fff7a1b625b8a53700899ce0ea2f5f656981c46b8f1837cfd84ddb6da883fb2
+  checksum: 10c0/f5185003bef9ad9ec3f40e821963e4c12409b993fdcab89e3d660bed7d8c9d8bfd399f05222e27e0ead6589601fb1bb08d1a589c51751a4ab0547ead3429b8de
   languageName: node
   linkType: hard
 
@@ -11332,7 +11339,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lilconfig@npm:^3.1.2, lilconfig@npm:~3.1.1":
+"lilconfig@npm:^3.1.2, lilconfig@npm:~3.1.2":
   version: 3.1.2
   resolution: "lilconfig@npm:3.1.2"
   checksum: 10c0/f059630b1a9bddaeba83059db00c672b64dc14074e9f232adce32b38ca1b5686ab737eb665c5ba3c32f147f0002b4bee7311ad0386a9b98547b5623e87071fbe
@@ -11347,36 +11354,36 @@ __metadata:
   linkType: hard
 
 "lint-staged@npm:^15.0.0":
-  version: 15.2.7
-  resolution: "lint-staged@npm:15.2.7"
+  version: 15.2.8
+  resolution: "lint-staged@npm:15.2.8"
   dependencies:
     chalk: "npm:~5.3.0"
     commander: "npm:~12.1.0"
-    debug: "npm:~4.3.4"
+    debug: "npm:~4.3.6"
     execa: "npm:~8.0.1"
-    lilconfig: "npm:~3.1.1"
-    listr2: "npm:~8.2.1"
+    lilconfig: "npm:~3.1.2"
+    listr2: "npm:~8.2.4"
     micromatch: "npm:~4.0.7"
     pidtree: "npm:~0.6.0"
     string-argv: "npm:~0.3.2"
-    yaml: "npm:~2.4.2"
+    yaml: "npm:~2.5.0"
   bin:
     lint-staged: bin/lint-staged.js
-  checksum: 10c0/c14399f9782ae222a1748144254f24b5b9afc816dc8840bd02d50f523c6582796ff18410767eb1a73cf1a83bc6e492dea7b1c4f0912bf3e434c068221f13c878
+  checksum: 10c0/7d43f11f493d27951c746b4c077fed16ba954c0517cf2fd999034e9e7bf86fde506a797b23531a56a1fde4c24846e0f6583ce6db3bdfd42e92335b1aab367737
   languageName: node
   linkType: hard
 
-"listr2@npm:~8.2.1":
-  version: 8.2.1
-  resolution: "listr2@npm:8.2.1"
+"listr2@npm:~8.2.4":
+  version: 8.2.4
+  resolution: "listr2@npm:8.2.4"
   dependencies:
     cli-truncate: "npm:^4.0.0"
     colorette: "npm:^2.0.20"
     eventemitter3: "npm:^5.0.1"
-    log-update: "npm:^6.0.0"
-    rfdc: "npm:^1.3.1"
+    log-update: "npm:^6.1.0"
+    rfdc: "npm:^1.4.1"
     wrap-ansi: "npm:^9.0.0"
-  checksum: 10c0/ac32cba8e5c79bcf0dbbb43c2fcc73e47902320c1fa1891074fefb3aa3dfaeef9c76348da22909f65334ba9bee1140bfc903e2f0c64427dd08ef4ba8f6b1dbd0
+  checksum: 10c0/df5b129e9767de1997973cec6103cd4bd6fc3b3367685b7c23048d12b61d5b7e44fecd8a3d3534c0e1c963bd5ac43ca501d14712f46fa101050037be323a5c16
   languageName: node
   linkType: hard
 
@@ -11544,16 +11551,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"log-update@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "log-update@npm:6.0.0"
+"log-update@npm:^6.1.0":
+  version: 6.1.0
+  resolution: "log-update@npm:6.1.0"
   dependencies:
-    ansi-escapes: "npm:^6.2.0"
-    cli-cursor: "npm:^4.0.0"
-    slice-ansi: "npm:^7.0.0"
+    ansi-escapes: "npm:^7.0.0"
+    cli-cursor: "npm:^5.0.0"
+    slice-ansi: "npm:^7.1.0"
     strip-ansi: "npm:^7.1.0"
     wrap-ansi: "npm:^9.0.0"
-  checksum: 10c0/e0b3c3401ef49ce3eb17e2f83d644765e4f7988498fc1344eaa4f31ab30e510dcc469a7fb64dc01bd1c8d9237d917598fa677a9818705fb3774c10f6e9d4b27c
+  checksum: 10c0/4b350c0a83d7753fea34dcac6cd797d1dc9603291565de009baa4aa91c0447eab0d3815a05c8ec9ac04fdfffb43c82adcdb03ec1fceafd8518e1a8c1cff4ff89
   languageName: node
   linkType: hard
 
@@ -11909,6 +11916,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"mimic-function@npm:^5.0.0":
+  version: 5.0.1
+  resolution: "mimic-function@npm:5.0.1"
+  checksum: 10c0/f3d9464dd1816ecf6bdf2aec6ba32c0728022039d992f178237d8e289b48764fee4131319e72eedd4f7f094e22ded0af836c3187a7edc4595d28dd74368fd81d
+  languageName: node
+  linkType: hard
+
 "min-indent@npm:^1.0.0":
   version: 1.0.1
   resolution: "min-indent@npm:1.0.1"
@@ -12572,7 +12586,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"onetime@npm:^5.1.0, onetime@npm:^5.1.2":
+"onetime@npm:^5.1.2":
   version: 5.1.2
   resolution: "onetime@npm:5.1.2"
   dependencies:
@@ -12590,6 +12604,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"onetime@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "onetime@npm:7.0.0"
+  dependencies:
+    mimic-function: "npm:^5.0.0"
+  checksum: 10c0/5cb9179d74b63f52a196a2e7037ba2b9a893245a5532d3f44360012005c9cadb60851d56716ebff18a6f47129dab7168022445df47c2aff3b276d92585ed1221
+  languageName: node
+  linkType: hard
+
 "opencollective-postinstall@npm:^2.0.2":
   version: 2.0.3
   resolution: "opencollective-postinstall@npm:2.0.3"
@@ -13935,10 +13958,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-resolve-nested-selector@npm:^0.1.1":
-  version: 0.1.1
-  resolution: "postcss-resolve-nested-selector@npm:0.1.1"
-  checksum: 10c0/e86412064c5d805fbee20f4e851395304102addd7d583b6a991adaa5616e8d5f45549864eb6292d4cf15075cd261c289f069acdf6a2556689fc44fe72bcb306e
+"postcss-resolve-nested-selector@npm:^0.1.1, postcss-resolve-nested-selector@npm:^0.1.4":
+  version: 0.1.4
+  resolution: "postcss-resolve-nested-selector@npm:0.1.4"
+  checksum: 10c0/c265c35ddd474968bc4efbe4027e33f28910ef3931ffae9c448878d7c02735aeeea6d33aa6f89902e4c111e6fe87f2cc2aa72dcb3ac242d58809f1f932baa2b6
   languageName: node
   linkType: hard
 
@@ -13971,13 +13994,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-selector-parser@npm:^6.0.13, postcss-selector-parser@npm:^6.0.16, postcss-selector-parser@npm:^6.0.2, postcss-selector-parser@npm:^6.0.4, postcss-selector-parser@npm:^6.1.0":
-  version: 6.1.0
-  resolution: "postcss-selector-parser@npm:6.1.0"
+"postcss-selector-parser@npm:^6.0.13, postcss-selector-parser@npm:^6.0.16, postcss-selector-parser@npm:^6.0.2, postcss-selector-parser@npm:^6.0.4, postcss-selector-parser@npm:^6.1.0, postcss-selector-parser@npm:^6.1.1":
+  version: 6.1.1
+  resolution: "postcss-selector-parser@npm:6.1.1"
   dependencies:
     cssesc: "npm:^3.0.0"
     util-deprecate: "npm:^1.0.2"
-  checksum: 10c0/91e9c6434772506bc7f318699dd9d19d32178b52dfa05bed24cb0babbdab54f8fb765d9920f01ac548be0a642aab56bce493811406ceb00ae182bbb53754c473
+  checksum: 10c0/5608765e033fee35d448e1f607ffbaa750eb86901824a8bc4a911ea8bc137cb82f29239330787427c5d3695afd90d8721e190f211dbbf733e25033d8b3100763
   languageName: node
   linkType: hard
 
@@ -14011,7 +14034,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss@npm:^8.2.15, postcss@npm:^8.4.24, postcss@npm:^8.4.39":
+"postcss@npm:^8.2.15, postcss@npm:^8.4.24, postcss@npm:^8.4.40":
   version: 8.4.40
   resolution: "postcss@npm:8.4.40"
   dependencies:
@@ -15244,13 +15267,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"restore-cursor@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "restore-cursor@npm:4.0.0"
+"restore-cursor@npm:^5.0.0":
+  version: 5.1.0
+  resolution: "restore-cursor@npm:5.1.0"
   dependencies:
-    onetime: "npm:^5.1.0"
-    signal-exit: "npm:^3.0.2"
-  checksum: 10c0/6f7da8c5e422ac26aa38354870b1afac09963572cf2879443540449068cb43476e9cbccf6f8de3e0171e0d6f7f533c2bc1a0a008003c9a525bbc098e89041318
+    onetime: "npm:^7.0.0"
+    signal-exit: "npm:^4.1.0"
+  checksum: 10c0/c2ba89131eea791d1b25205bdfdc86699767e2b88dee2a590b1a6caa51737deac8bad0260a5ded2f7c074b7db2f3a626bcf1fcf3cdf35974cbeea5e2e6764f60
   languageName: node
   linkType: hard
 
@@ -15275,10 +15298,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rfdc@npm:^1.3.1":
-  version: 1.3.1
-  resolution: "rfdc@npm:1.3.1"
-  checksum: 10c0/69f65e3ed30970f8055fac9fbbef9ce578800ca19554eab1dcbffe73a4b8aef536bc4248313889cf25e3b4e38b212c721eabe30856575bf2b2bc3d90f8ba93ef
+"rfdc@npm:^1.4.1":
+  version: 1.4.1
+  resolution: "rfdc@npm:1.4.1"
+  checksum: 10c0/4614e4292356cafade0b6031527eea9bc90f2372a22c012313be1dcc69a3b90c7338158b414539be863fa95bfcb2ddcd0587be696841af4e6679d85e62c060c7
   languageName: node
   linkType: hard
 
@@ -15838,7 +15861,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"slice-ansi@npm:^7.0.0":
+"slice-ansi@npm:^7.1.0":
   version: 7.1.0
   resolution: "slice-ansi@npm:7.1.0"
   dependencies:
@@ -16606,8 +16629,8 @@ __metadata:
   linkType: hard
 
 "stylelint@npm:^16.0.2":
-  version: 16.7.0
-  resolution: "stylelint@npm:16.7.0"
+  version: 16.8.1
+  resolution: "stylelint@npm:16.8.1"
   dependencies:
     "@csstools/css-parser-algorithms": "npm:^2.7.1"
     "@csstools/css-tokenizer": "npm:^2.4.1"
@@ -16619,7 +16642,7 @@ __metadata:
     cosmiconfig: "npm:^9.0.0"
     css-functions-list: "npm:^3.2.2"
     css-tree: "npm:^2.3.1"
-    debug: "npm:^4.3.5"
+    debug: "npm:^4.3.6"
     fast-glob: "npm:^3.3.2"
     fastest-levenshtein: "npm:^1.0.16"
     file-entry-cache: "npm:^9.0.0"
@@ -16636,10 +16659,10 @@ __metadata:
     micromatch: "npm:^4.0.7"
     normalize-path: "npm:^3.0.0"
     picocolors: "npm:^1.0.1"
-    postcss: "npm:^8.4.39"
-    postcss-resolve-nested-selector: "npm:^0.1.1"
+    postcss: "npm:^8.4.40"
+    postcss-resolve-nested-selector: "npm:^0.1.4"
     postcss-safe-parser: "npm:^7.0.0"
-    postcss-selector-parser: "npm:^6.1.0"
+    postcss-selector-parser: "npm:^6.1.1"
     postcss-value-parser: "npm:^4.2.0"
     resolve-from: "npm:^5.0.0"
     string-width: "npm:^4.2.3"
@@ -16650,7 +16673,7 @@ __metadata:
     write-file-atomic: "npm:^5.0.1"
   bin:
     stylelint: bin/stylelint.mjs
-  checksum: 10c0/98cb36037684433d991a0c507bbf8155309e96470177487f493e66de098631e5303b235470fc5c8086cd98013385b669c4e3cb68ad01421b898e1da6848e5d78
+  checksum: 10c0/7bc6b0193f83420b2170026078b427d7fb22a07d3345fc99a16241625a572f2fc3e1fa1999e54c01cc2b15bd59d135715c2b140b089c17aa7f4e377ded1fc1b5
   languageName: node
   linkType: hard
 
@@ -17205,13 +17228,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"type-fest@npm:^3.0.0":
-  version: 3.13.1
-  resolution: "type-fest@npm:3.13.1"
-  checksum: 10c0/547d22186f73a8c04590b70dcf63baff390078c75ea8acd366bbd510fd0646e348bd1970e47ecf795b7cff0b41d26e9c475c1fedd6ef5c45c82075fbf916b629
-  languageName: node
-  linkType: hard
-
 "type-is@npm:~1.6.18":
   version: 1.6.18
   resolution: "type-is@npm:1.6.18"
@@ -18577,12 +18593,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"yaml@npm:~2.4.2":
-  version: 2.4.2
-  resolution: "yaml@npm:2.4.2"
+"yaml@npm:~2.5.0":
+  version: 2.5.0
+  resolution: "yaml@npm:2.5.0"
   bin:
     yaml: bin.mjs
-  checksum: 10c0/280ddb2e43ffa7d91a95738e80c8f33e860749cdc25aa6d9e4d350a28e174fd7e494e4aa023108aaee41388e451e3dc1292261d8f022aabcf90df9c63d647549
+  checksum: 10c0/771a1df083c8217cf04ef49f87244ae2dd7d7457094425e793b8f056159f167602ce172aa32d6bca21f787d24ec724aee3cecde938f6643564117bd151452631
   languageName: node
   linkType: hard
 

From e99c0e61ea12233904aeb4a0581d14b7ae4ce619 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 5 Aug 2024 06:29:03 +0000
Subject: [PATCH 1707/2191] chore(deps): update dependency @types/ws to v8.5.12
 (#31293)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 0c6f7fdb83418b..59345e05a104fd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4107,11 +4107,11 @@ __metadata:
   linkType: hard
 
 "@types/ws@npm:^8.5.9":
-  version: 8.5.11
-  resolution: "@types/ws@npm:8.5.11"
+  version: 8.5.12
+  resolution: "@types/ws@npm:8.5.12"
   dependencies:
     "@types/node": "npm:*"
-  checksum: 10c0/50bd2e1a12659fa024a97d7e8c267fbf2a2c2251f1edf2057aa7dfc99682f5c025a188df9e27414675c78d3b189346a3567e1e4c218ad79a9d2b0f1f2b860c3a
+  checksum: 10c0/3fd77c9e4e05c24ce42bfc7647f7506b08c40a40fe2aea236ef6d4e96fc7cb4006a81ed1b28ec9c457e177a74a72924f4768b7b4652680b42dfd52bc380e15f9
   languageName: node
   linkType: hard
 

From f33049ffe43edf8886a4d549d506dd13ee06c36f Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 5 Aug 2024 08:29:38 +0200
Subject: [PATCH 1708/2191] chore(deps): update dependency ffmpeg to v7.0.2
 (#31289)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index bc7cd3b682122d..a0af1eda6b65fa 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -211,7 +211,7 @@ FROM build AS ffmpeg
 
 # ffmpeg version to compile, change with [--build-arg FFMPEG_VERSION="7.0.x"]
 # renovate: datasource=repology depName=ffmpeg packageName=openpkg_current/ffmpeg
-ARG FFMPEG_VERSION=7.0.1
+ARG FFMPEG_VERSION=7.0.2
 # ffmpeg download URL, change with [--build-arg FFMPEG_URL="https://ffmpeg.org/releases"]
 ARG FFMPEG_URL=https://ffmpeg.org/releases
 

From 3a368933b400c8fb6d49749efd6674c22c9a34e7 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 5 Aug 2024 09:11:57 +0200
Subject: [PATCH 1709/2191] fix(deps): update dependency core-js to v3.38.0
 (#31290)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 59345e05a104fd..8afa819f5c1aa4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6388,9 +6388,9 @@ __metadata:
   linkType: hard
 
 "core-js@npm:^3.30.2":
-  version: 3.37.1
-  resolution: "core-js@npm:3.37.1"
-  checksum: 10c0/440eb51a7a39128a320225fe349f870a3641b96c9ecd26470227db730ef8c161ea298eaea621db66ec0ff622a85299efb4e23afebf889c0a1748616102307675
+  version: 3.38.0
+  resolution: "core-js@npm:3.38.0"
+  checksum: 10c0/3218ae19bfe0c6560663012cbd3e7f3dc1b36d50fc71e8c365f3b119185e8a35ac4e8bb9698ae510b3c201ef93f40bdc29f9215716ccf31aca28f77969bb4ed0
   languageName: node
   linkType: hard
 

From 176d1feadf26e635f3b3e83da3d688f002b9c342 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 5 Aug 2024 09:12:47 +0200
Subject: [PATCH 1710/2191] chore(deps): update yarn to v4.4.0 (#31274)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 package.json           | 2 +-
 streaming/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 27edd7dc2705a2..e9ded52a3d950a 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@mastodon/mastodon",
   "license": "AGPL-3.0-or-later",
-  "packageManager": "yarn@4.3.1",
+  "packageManager": "yarn@4.4.0",
   "engines": {
     "node": ">=18"
   },
diff --git a/streaming/package.json b/streaming/package.json
index 1ee738c33207b2..4f44927831d3d6 100644
--- a/streaming/package.json
+++ b/streaming/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@mastodon/streaming",
   "license": "AGPL-3.0-or-later",
-  "packageManager": "yarn@4.3.1",
+  "packageManager": "yarn@4.4.0",
   "engines": {
     "node": ">=18"
   },

From 9e440bee195f7107fb7b7ec9371ab360dcb6de67 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 5 Aug 2024 09:13:00 +0200
Subject: [PATCH 1711/2191] chore(deps): update dependency aws-sdk-s3 to
 v1.157.0 (#31252)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 49bd446d9b1fa2..093f15339c59bd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -100,8 +100,8 @@ GEM
     attr_required (1.0.2)
     awrence (1.2.1)
     aws-eventstream (1.3.0)
-    aws-partitions (1.950.0)
-    aws-sdk-core (3.201.0)
+    aws-partitions (1.961.0)
+    aws-sdk-core (3.201.3)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.8)
@@ -109,11 +109,11 @@ GEM
     aws-sdk-kms (1.88.0)
       aws-sdk-core (~> 3, >= 3.201.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.156.0)
+    aws-sdk-s3 (1.157.0)
       aws-sdk-core (~> 3, >= 3.201.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
-    aws-sigv4 (1.8.0)
+    aws-sigv4 (1.9.1)
       aws-eventstream (~> 1, >= 1.0.2)
     azure-storage-blob (2.0.3)
       azure-storage-common (~> 2.0)

From 29d6310b806c3d8d940396250bd8af080d6437b9 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 5 Aug 2024 09:13:14 +0200
Subject: [PATCH 1712/2191] chore(deps): update dependency sidekiq-scheduler to
 v5.0.6 (#31245)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 093f15339c59bd..c3b5ab9150107b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -796,7 +796,7 @@ GEM
       redis (>= 4.5.0, < 5)
     sidekiq-bulk (0.2.0)
       sidekiq
-    sidekiq-scheduler (5.0.5)
+    sidekiq-scheduler (5.0.6)
       rufus-scheduler (~> 3.2)
       sidekiq (>= 6, < 8)
       tilt (>= 1.4.0, < 3)

From 02c22228790bec1cbce527edd711fbf995078578 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 5 Aug 2024 07:13:47 +0000
Subject: [PATCH 1713/2191] fix(deps): update dependency postcss-preset-env to
 v10 (#31279)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 package.json |   2 +-
 yarn.lock    | 849 +++++++++++++++++++++++++++------------------------
 2 files changed, 443 insertions(+), 408 deletions(-)

diff --git a/package.json b/package.json
index e9ded52a3d950a..26ee3570a9e6a4 100644
--- a/package.json
+++ b/package.json
@@ -87,7 +87,7 @@
     "path-complete-extname": "^1.0.0",
     "postcss": "^8.4.24",
     "postcss-loader": "^4.3.0",
-    "postcss-preset-env": "^9.5.2",
+    "postcss-preset-env": "^10.0.0",
     "prop-types": "^15.8.1",
     "punycode": "^2.3.0",
     "react": "^18.2.0",
diff --git a/yarn.lock b/yarn.lock
index 8afa819f5c1aa4..9786925f65df8f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1569,13 +1569,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/cascade-layer-name-parser@npm:^1.0.13":
-  version: 1.0.13
-  resolution: "@csstools/cascade-layer-name-parser@npm:1.0.13"
+"@csstools/cascade-layer-name-parser@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "@csstools/cascade-layer-name-parser@npm:2.0.0"
   peerDependencies:
-    "@csstools/css-parser-algorithms": ^2.7.1
-    "@csstools/css-tokenizer": ^2.4.1
-  checksum: 10c0/a6412fc8601af1baadc8195934aa668d3476e799891c9d0883390f31ec8678e9b565ac14d919bec633bbc086657ac12aa4cd852c718851a2d34517ee6856ff8e
+    "@csstools/css-parser-algorithms": ^3.0.0
+    "@csstools/css-tokenizer": ^3.0.0
+  checksum: 10c0/11de0c4abad1316a6b29a2c4f7966fc39af5cbcd0a542d92cbcca8a8173d472f3d577175fc097bebf793158936193a74829a035e1cb2abccbe056473a3076d89
   languageName: node
   linkType: hard
 
@@ -1586,26 +1586,26 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/css-calc@npm:^1.2.4":
-  version: 1.2.4
-  resolution: "@csstools/css-calc@npm:1.2.4"
+"@csstools/css-calc@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "@csstools/css-calc@npm:2.0.0"
   peerDependencies:
-    "@csstools/css-parser-algorithms": ^2.7.1
-    "@csstools/css-tokenizer": ^2.4.1
-  checksum: 10c0/6233746eb642797b7fbc2cf6e7651e95700b294e78e3c29e8730c3236bb92cf62903efb6e54639e8f877683c40646e137c95e615c4450809b21b61a6192888ca
+    "@csstools/css-parser-algorithms": ^3.0.0
+    "@csstools/css-tokenizer": ^3.0.0
+  checksum: 10c0/441f8fafaa4f87302b85e2c46bc8a3efb388e0357f0db5c45438fe99c5660afeb524332a0a3339574fdd26392e65f8db9c7ab6db3361726f1702987e8522c531
   languageName: node
   linkType: hard
 
-"@csstools/css-color-parser@npm:^2.0.4":
-  version: 2.0.4
-  resolution: "@csstools/css-color-parser@npm:2.0.4"
+"@csstools/css-color-parser@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "@csstools/css-color-parser@npm:3.0.0"
   dependencies:
     "@csstools/color-helpers": "npm:^4.2.1"
-    "@csstools/css-calc": "npm:^1.2.4"
+    "@csstools/css-calc": "npm:^2.0.0"
   peerDependencies:
-    "@csstools/css-parser-algorithms": ^2.7.1
-    "@csstools/css-tokenizer": ^2.4.1
-  checksum: 10c0/e009a2f34b6c328daad54262deb86b71c6a7a9a1da1db8ad39cf719641e1a728ed8ddbd23613d519d26deee33b89ba12cb15a6928718c1b3cc5e24ac1ed02f47
+    "@csstools/css-parser-algorithms": ^3.0.0
+    "@csstools/css-tokenizer": ^3.0.0
+  checksum: 10c0/9b56ba3b56691d2133f1d9b881131bfd9745024a79f825284109adac05578e15ae3eed0e99c98db162932d69770fc970b5b005996c32cdf7167af3418da263c3
   languageName: node
   linkType: hard
 
@@ -1618,6 +1618,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@csstools/css-parser-algorithms@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "@csstools/css-parser-algorithms@npm:3.0.0"
+  peerDependencies:
+    "@csstools/css-tokenizer": ^3.0.0
+  checksum: 10c0/ffa06c9d883e6bbb6198c98b5a395abe9847ff63ae41db54d75812e52764f550b36625fdb427c9a4ea6dfd71362aa98194ccd63afad0e521f6f3470c7515d241
+  languageName: node
+  linkType: hard
+
 "@csstools/css-tokenizer@npm:^2.4.1":
   version: 2.4.1
   resolution: "@csstools/css-tokenizer@npm:2.4.1"
@@ -1625,6 +1634,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@csstools/css-tokenizer@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "@csstools/css-tokenizer@npm:3.0.0"
+  checksum: 10c0/6d0f3e44bfb4b309bc4e260e6399163653f5715b16ebf1f2907ec98a2b31e9b2de94c09012b6d291c6f4229cc2a521e4f66594cac1b6276a4eb205e8e23e446b
+  languageName: node
+  linkType: hard
+
 "@csstools/media-query-list-parser@npm:^2.1.13":
   version: 2.1.13
   resolution: "@csstools/media-query-list-parser@npm:2.1.13"
@@ -1635,383 +1651,393 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-cascade-layers@npm:^4.0.6":
-  version: 4.0.6
-  resolution: "@csstools/postcss-cascade-layers@npm:4.0.6"
+"@csstools/media-query-list-parser@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "@csstools/media-query-list-parser@npm:3.0.0"
+  peerDependencies:
+    "@csstools/css-parser-algorithms": ^3.0.0
+    "@csstools/css-tokenizer": ^3.0.0
+  checksum: 10c0/0a83ab7cba4fec5543c5abf3f7145ab5742c44e0ed3349d41787739a1bd897a8cf27f35f3bc714d1d02a44b2a34f28b3b82ce6d0cb6b9c4fbb679dc034f8a152
+  languageName: node
+  linkType: hard
+
+"@csstools/postcss-cascade-layers@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "@csstools/postcss-cascade-layers@npm:5.0.0"
   dependencies:
-    "@csstools/selector-specificity": "npm:^3.1.1"
-    postcss-selector-parser: "npm:^6.0.13"
+    "@csstools/selector-specificity": "npm:^4.0.0"
+    postcss-selector-parser: "npm:^6.1.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/134019e9b3f71de39034658e2a284f549883745a309f774d8d272871f9e65680e0981c893766537a8a56ed7f41dba2d0f9fc3cb4fa4057c227bc193976a2ec79
+  checksum: 10c0/b608c69c12671682676598e451dcd79bfc6f5030a4e17b4d1bf9659e531f1daf03526be023f9aafdc952ecc87c87b04f379a763309e3eadb2140572cd4aa5b60
   languageName: node
   linkType: hard
 
-"@csstools/postcss-color-function@npm:^3.0.19":
-  version: 3.0.19
-  resolution: "@csstools/postcss-color-function@npm:3.0.19"
+"@csstools/postcss-color-function@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "@csstools/postcss-color-function@npm:4.0.0"
   dependencies:
-    "@csstools/css-color-parser": "npm:^2.0.4"
-    "@csstools/css-parser-algorithms": "npm:^2.7.1"
-    "@csstools/css-tokenizer": "npm:^2.4.1"
-    "@csstools/postcss-progressive-custom-properties": "npm:^3.3.0"
-    "@csstools/utilities": "npm:^1.0.0"
+    "@csstools/css-color-parser": "npm:^3.0.0"
+    "@csstools/css-parser-algorithms": "npm:^3.0.0"
+    "@csstools/css-tokenizer": "npm:^3.0.0"
+    "@csstools/postcss-progressive-custom-properties": "npm:^4.0.0"
+    "@csstools/utilities": "npm:^2.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/067e33d7dfc32b56fe63d4f97464a3eaf27dde720961e44feab6076bd2c172dd4c1bad16aa37a922dcbba470756bd6a13e728d9e71eab6937d48d83873cd1879
+  checksum: 10c0/ff0c0c44f5d17bc5e7ea287eff9c10ca334a84d086998a6b243a209f1795d32ba872357935f4176e5206b88dc8d2a204f452c13bc940540b7122e9e807511ac6
   languageName: node
   linkType: hard
 
-"@csstools/postcss-color-mix-function@npm:^2.0.19":
-  version: 2.0.19
-  resolution: "@csstools/postcss-color-mix-function@npm:2.0.19"
+"@csstools/postcss-color-mix-function@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "@csstools/postcss-color-mix-function@npm:3.0.0"
   dependencies:
-    "@csstools/css-color-parser": "npm:^2.0.4"
-    "@csstools/css-parser-algorithms": "npm:^2.7.1"
-    "@csstools/css-tokenizer": "npm:^2.4.1"
-    "@csstools/postcss-progressive-custom-properties": "npm:^3.3.0"
-    "@csstools/utilities": "npm:^1.0.0"
+    "@csstools/css-color-parser": "npm:^3.0.0"
+    "@csstools/css-parser-algorithms": "npm:^3.0.0"
+    "@csstools/css-tokenizer": "npm:^3.0.0"
+    "@csstools/postcss-progressive-custom-properties": "npm:^4.0.0"
+    "@csstools/utilities": "npm:^2.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/e967d93672a065806dc78da0153f8b4f5087f7c3ddfe361eba4942780760d47b317124913c9b0dda7f9bfff1253f77d1b6debd8a6a2aa3a6c80e263101da5e8c
+  checksum: 10c0/120e96581834b2363df1fb653959dc243d93c01bcd70bf2e34418c20cd418a75f8b4e2e81da6955345619dcbb246e7d023f395521522bacb455583c15f61c677
   languageName: node
   linkType: hard
 
-"@csstools/postcss-content-alt-text@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "@csstools/postcss-content-alt-text@npm:1.0.0"
+"@csstools/postcss-content-alt-text@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "@csstools/postcss-content-alt-text@npm:2.0.0"
   dependencies:
-    "@csstools/css-parser-algorithms": "npm:^2.7.1"
-    "@csstools/css-tokenizer": "npm:^2.4.1"
-    "@csstools/postcss-progressive-custom-properties": "npm:^3.3.0"
-    "@csstools/utilities": "npm:^1.0.0"
+    "@csstools/css-parser-algorithms": "npm:^3.0.0"
+    "@csstools/css-tokenizer": "npm:^3.0.0"
+    "@csstools/postcss-progressive-custom-properties": "npm:^4.0.0"
+    "@csstools/utilities": "npm:^2.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/0c2c64857ac652989d00c3d2ba49d0cd1cc245193cba6724d2f5841aa990ee6a07267cfebc6fabde6a6246616df60373006d17c5ea9b904129fbfd826dc10a8d
+  checksum: 10c0/978e99425f1b5420c55282f51de65646b910f9d60621f5ad7adb7a2dace26c68dc384cd4798604e2c5d8bcd1e635a20474a6ea044a7e9b449d068d6db77a2738
   languageName: node
   linkType: hard
 
-"@csstools/postcss-exponential-functions@npm:^1.0.9":
-  version: 1.0.9
-  resolution: "@csstools/postcss-exponential-functions@npm:1.0.9"
+"@csstools/postcss-exponential-functions@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "@csstools/postcss-exponential-functions@npm:2.0.0"
   dependencies:
-    "@csstools/css-calc": "npm:^1.2.4"
-    "@csstools/css-parser-algorithms": "npm:^2.7.1"
-    "@csstools/css-tokenizer": "npm:^2.4.1"
+    "@csstools/css-calc": "npm:^2.0.0"
+    "@csstools/css-parser-algorithms": "npm:^3.0.0"
+    "@csstools/css-tokenizer": "npm:^3.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/eaec29ef6ec201786c606176235dced4af1922d5ac56c6b0993ad2e7d87464a32702d9b28cae9a76e8527f741b50cbc31d4c646f45d02dc69d520f241b3e7878
+  checksum: 10c0/a5ccd4fb5b6f6f370bf07ef8f918658ef4d9865a92d9866f57edfe7479c6a486701520cbe0efb8f39af9b78eda0819d8663554e9797b8bdcadc2291733bf6b3f
   languageName: node
   linkType: hard
 
-"@csstools/postcss-font-format-keywords@npm:^3.0.2":
-  version: 3.0.2
-  resolution: "@csstools/postcss-font-format-keywords@npm:3.0.2"
+"@csstools/postcss-font-format-keywords@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "@csstools/postcss-font-format-keywords@npm:4.0.0"
   dependencies:
-    "@csstools/utilities": "npm:^1.0.0"
+    "@csstools/utilities": "npm:^2.0.0"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/1b9bf031ce1a00fef1fae0b1ad614eddc6bb4c036ecad47e065c99063ba3d2f6ab8e47f9db02a6fbe8b75b0e02a075a7a80480d4296918970ba9e8d36f07a523
+  checksum: 10c0/eb794fb95fefcac75e606d185255e601636af177866a317b0c6b6c375055e7240be53918229fd8d4bba00df01bedd2256bdac2b0ad4a4c2ec64f9d27cd6ff639
   languageName: node
   linkType: hard
 
-"@csstools/postcss-gamut-mapping@npm:^1.0.11":
-  version: 1.0.11
-  resolution: "@csstools/postcss-gamut-mapping@npm:1.0.11"
+"@csstools/postcss-gamut-mapping@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "@csstools/postcss-gamut-mapping@npm:2.0.0"
   dependencies:
-    "@csstools/css-color-parser": "npm:^2.0.4"
-    "@csstools/css-parser-algorithms": "npm:^2.7.1"
-    "@csstools/css-tokenizer": "npm:^2.4.1"
+    "@csstools/css-color-parser": "npm:^3.0.0"
+    "@csstools/css-parser-algorithms": "npm:^3.0.0"
+    "@csstools/css-tokenizer": "npm:^3.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/29e755013f1d1de34eb62a931ed410d2830ca3dfc81476cb3c72d9d3260b85a9adedc51aa548550c6e308f3f9640c489e6953db40e9cac9835d0421d5b14ef1f
+  checksum: 10c0/be1d7f4c96f3bbcb69ed4ccc2ff406a884ae7129e6542ab6800782fbfe4e077159352409961f2da8054ec9fabbf6ed211288f1004c96632a1f6b10bef332d880
   languageName: node
   linkType: hard
 
-"@csstools/postcss-gradients-interpolation-method@npm:^4.0.20":
-  version: 4.0.20
-  resolution: "@csstools/postcss-gradients-interpolation-method@npm:4.0.20"
+"@csstools/postcss-gradients-interpolation-method@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "@csstools/postcss-gradients-interpolation-method@npm:5.0.0"
   dependencies:
-    "@csstools/css-color-parser": "npm:^2.0.4"
-    "@csstools/css-parser-algorithms": "npm:^2.7.1"
-    "@csstools/css-tokenizer": "npm:^2.4.1"
-    "@csstools/postcss-progressive-custom-properties": "npm:^3.3.0"
-    "@csstools/utilities": "npm:^1.0.0"
+    "@csstools/css-color-parser": "npm:^3.0.0"
+    "@csstools/css-parser-algorithms": "npm:^3.0.0"
+    "@csstools/css-tokenizer": "npm:^3.0.0"
+    "@csstools/postcss-progressive-custom-properties": "npm:^4.0.0"
+    "@csstools/utilities": "npm:^2.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/6588825a72a1471e2d6036c8cf7dbad2bf05f369d96dbdd68ff5ce7ff91803b8ee1146f5f1bf6f3ab6299944549da872914664c3f9e8ae5a31847f76f0085c74
+  checksum: 10c0/04e29fd877a499b9570665aea5b23cd70635b538dd903b9f9706ddd85a2d9c93445aea4b6b7dbcf8986ab58b45bb502ec5060044d945096d0af2eb6cebadb88e
   languageName: node
   linkType: hard
 
-"@csstools/postcss-hwb-function@npm:^3.0.18":
-  version: 3.0.18
-  resolution: "@csstools/postcss-hwb-function@npm:3.0.18"
+"@csstools/postcss-hwb-function@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "@csstools/postcss-hwb-function@npm:4.0.0"
   dependencies:
-    "@csstools/css-color-parser": "npm:^2.0.4"
-    "@csstools/css-parser-algorithms": "npm:^2.7.1"
-    "@csstools/css-tokenizer": "npm:^2.4.1"
-    "@csstools/postcss-progressive-custom-properties": "npm:^3.3.0"
-    "@csstools/utilities": "npm:^1.0.0"
+    "@csstools/css-color-parser": "npm:^3.0.0"
+    "@csstools/css-parser-algorithms": "npm:^3.0.0"
+    "@csstools/css-tokenizer": "npm:^3.0.0"
+    "@csstools/postcss-progressive-custom-properties": "npm:^4.0.0"
+    "@csstools/utilities": "npm:^2.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/e9d76b0b2f9c54920124ca1804b49e3f5b26e003729418b5ef4b340ff1baa4779da1c02be618888fdbcc2d0747182352efbbd3ffe128e2417928c35c25443789
+  checksum: 10c0/1aff69ca364417ac2b7ef1c737f88567f441bfd54d93d7b635e0ad605c61edcc2282bc0e2df73c83d1c6a24487e0acec34a4585d27d5f6027402aaea71696190
   languageName: node
   linkType: hard
 
-"@csstools/postcss-ic-unit@npm:^3.0.7":
-  version: 3.0.7
-  resolution: "@csstools/postcss-ic-unit@npm:3.0.7"
+"@csstools/postcss-ic-unit@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "@csstools/postcss-ic-unit@npm:4.0.0"
   dependencies:
-    "@csstools/postcss-progressive-custom-properties": "npm:^3.3.0"
-    "@csstools/utilities": "npm:^1.0.0"
+    "@csstools/postcss-progressive-custom-properties": "npm:^4.0.0"
+    "@csstools/utilities": "npm:^2.0.0"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/2add905b75860c64d7174886fecfc76d86e3818f42f003f4bbfc0604cc7f0f31c6dbd1651e6b9512fea876190d80033578ae49e813b64b17c8cf3b1f03d8e146
+  checksum: 10c0/6f94ec31002a245768a30d240c432b8712af4d9ea76a62403e16d4e0afb5be7636348a2d4619046ed29aa7726f88a0c191ca41c96d7ab0f3da940025c91b056e
   languageName: node
   linkType: hard
 
-"@csstools/postcss-initial@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "@csstools/postcss-initial@npm:1.0.1"
+"@csstools/postcss-initial@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "@csstools/postcss-initial@npm:2.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/5d21c7c611d90a4b6758ba5be5e38d8d9eea9499c62797c4f5e01fbc9ccc2c68daf1c201850efe70ffa4ff9e979e7dea80b854b8793768550879562881aa6f9f
+  checksum: 10c0/44c443cba84cc66367f2082bf20db06c8437338c02c244c38798c5bf5342932d89fed0dd13e4409f084ecf7fce47ae6394e9a7a006fd98a973decfa24ab1eb04
   languageName: node
   linkType: hard
 
-"@csstools/postcss-is-pseudo-class@npm:^4.0.8":
-  version: 4.0.8
-  resolution: "@csstools/postcss-is-pseudo-class@npm:4.0.8"
+"@csstools/postcss-is-pseudo-class@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "@csstools/postcss-is-pseudo-class@npm:5.0.0"
   dependencies:
-    "@csstools/selector-specificity": "npm:^3.1.1"
-    postcss-selector-parser: "npm:^6.0.13"
+    "@csstools/selector-specificity": "npm:^4.0.0"
+    postcss-selector-parser: "npm:^6.1.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/82f191571c3e0973354a54ef15feeb17f9408b4abbefad19fc0f087683b1212fc854cdf09a47324267dd47be4c5cb47d63b8d083695a67c3f8f3e53df3d561f6
+  checksum: 10c0/738eb84728b24bfe19ca06ccf6ff773a423552df2f31c87704ce79da4abfd2ccf2a45d5d6d3e11e71e42cc3d92eb35a856209b9cd6116c879acf15ac75454683
   languageName: node
   linkType: hard
 
-"@csstools/postcss-light-dark-function@npm:^1.0.8":
-  version: 1.0.8
-  resolution: "@csstools/postcss-light-dark-function@npm:1.0.8"
+"@csstools/postcss-light-dark-function@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "@csstools/postcss-light-dark-function@npm:2.0.0"
   dependencies:
-    "@csstools/css-parser-algorithms": "npm:^2.7.1"
-    "@csstools/css-tokenizer": "npm:^2.4.1"
-    "@csstools/postcss-progressive-custom-properties": "npm:^3.3.0"
-    "@csstools/utilities": "npm:^1.0.0"
+    "@csstools/css-parser-algorithms": "npm:^3.0.0"
+    "@csstools/css-tokenizer": "npm:^3.0.0"
+    "@csstools/postcss-progressive-custom-properties": "npm:^4.0.0"
+    "@csstools/utilities": "npm:^2.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/78fa6d799d38f14af1b32b534eedbec9478033e1fbc5a4e820f2421e865673d010b69b391546686ceb408ead64d79bb4eba2a4fb1fc9f0de70ff21e3ff8477c6
+  checksum: 10c0/d0eb1e04854c4ae425c6aff51ce9d0db90e9457aea3307d3ed916f500d2b5a3314a25d3487ea893e7b006a34c0d155462566d6066c8c54baec33eb104891c6db
   languageName: node
   linkType: hard
 
-"@csstools/postcss-logical-float-and-clear@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "@csstools/postcss-logical-float-and-clear@npm:2.0.1"
+"@csstools/postcss-logical-float-and-clear@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "@csstools/postcss-logical-float-and-clear@npm:3.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/92d9184bf8a159753a5872463dcfde580abd9b935e2a59f7ebe601cd14d9871f2f9f4dc18d8bbe251e7d8a3e446e302d9d99bf408d9cabbd9a6323825f5e833d
+  checksum: 10c0/71a20e8c37877bf68ae615d7bb93fc11b4f8da8be8b1dc1a6e0fc69e27f189712ed71436b8ed51fa69fdb98b8e6718df2b5f42f246c4d39badaf0e43020fcfd4
   languageName: node
   linkType: hard
 
-"@csstools/postcss-logical-overflow@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "@csstools/postcss-logical-overflow@npm:1.0.1"
+"@csstools/postcss-logical-overflow@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "@csstools/postcss-logical-overflow@npm:2.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/a8f5b1fdaf4ce7b1665407dac2f2e0c0ea11195e6873cfc714d9cd206489170fd91fc172b337330baf60191206f60579e235264f0dc7fee750ccd27ffe02c163
+  checksum: 10c0/0e103343d3ff8b34eef01b02355c5e010d272fd12d149a242026bb13ab1577b7f3a11fd4514be9342d96f73d61dac1f093a9bd36ece591753ed09a84eb7fca0a
   languageName: node
   linkType: hard
 
-"@csstools/postcss-logical-overscroll-behavior@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "@csstools/postcss-logical-overscroll-behavior@npm:1.0.1"
+"@csstools/postcss-logical-overscroll-behavior@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "@csstools/postcss-logical-overscroll-behavior@npm:2.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/9485502bd9235276525351818d6cc11544ac1b270bb4f527f3fac32fe98ac66269366c34cdb8f61920b10ff9aac5824935004a5927490a5febca77eb41226604
+  checksum: 10c0/1649601bb26f04d760fb5ebc42cdf414fa2a380b8ec22fe1c117f664c286665a786bd7bbda01b7e7567eaf3cc018a4f36a5c9805f6751cc497da223e0ffe9524
   languageName: node
   linkType: hard
 
-"@csstools/postcss-logical-resize@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "@csstools/postcss-logical-resize@npm:2.0.1"
+"@csstools/postcss-logical-resize@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "@csstools/postcss-logical-resize@npm:3.0.0"
   dependencies:
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/18f7e19ea465a15b334d8231b9ed98b630c74a6c2a6c52884437b852065f7b55bb1282cdbbdc1136aade479e996605b01799ab0ab771e2c47fd78d966ed33162
+  checksum: 10c0/4f12efcaf5468ff359bb3f32f0f66034b9acc9b3ac21fcd2f30a1c8998fc653ebac0091f35c8b7e8dbfe6ccf595aee67f9b06a67adf45a8844e49a82d98b4386
   languageName: node
   linkType: hard
 
-"@csstools/postcss-logical-viewport-units@npm:^2.0.11":
-  version: 2.0.11
-  resolution: "@csstools/postcss-logical-viewport-units@npm:2.0.11"
+"@csstools/postcss-logical-viewport-units@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "@csstools/postcss-logical-viewport-units@npm:3.0.0"
   dependencies:
-    "@csstools/css-tokenizer": "npm:^2.4.1"
-    "@csstools/utilities": "npm:^1.0.0"
+    "@csstools/css-tokenizer": "npm:^3.0.0"
+    "@csstools/utilities": "npm:^2.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/20207e9b7fc3ab52df5fcd06fde71fca4fd22bd6bd451cfc2ec6ea69994708b7fc5381e203dc4367293a8de00b1eca7a3ebe89cfa9b933d2f2cb8e3ac4d5aa86
+  checksum: 10c0/d474f3b8b3949516ad431c8297eb26ad7ba8829dc323c1a99c25be79af0fa16eef43ddd4d980ea97a676599c5587b4b2afd44c9a1055cf3573bfb2090ecbbd5c
   languageName: node
   linkType: hard
 
-"@csstools/postcss-media-minmax@npm:^1.1.8":
-  version: 1.1.8
-  resolution: "@csstools/postcss-media-minmax@npm:1.1.8"
+"@csstools/postcss-media-minmax@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "@csstools/postcss-media-minmax@npm:2.0.0"
   dependencies:
-    "@csstools/css-calc": "npm:^1.2.4"
-    "@csstools/css-parser-algorithms": "npm:^2.7.1"
-    "@csstools/css-tokenizer": "npm:^2.4.1"
-    "@csstools/media-query-list-parser": "npm:^2.1.13"
+    "@csstools/css-calc": "npm:^2.0.0"
+    "@csstools/css-parser-algorithms": "npm:^3.0.0"
+    "@csstools/css-tokenizer": "npm:^3.0.0"
+    "@csstools/media-query-list-parser": "npm:^3.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/7d666905282c7a89387dbce84f3429bad04870e0de264c5b1ce3e6f042b8eb72d585a18b2d7ac5e1a8c7f6785892da3cc7f6ea0b48069b06e9d383bdbc149b4a
+  checksum: 10c0/30f8cde005ae5d3750f8d2d62a26570381e306a2a4c3fdeef2ad48febbefd389c65ea471914b69ae8772a4abbd11cd52a78ecdb5d8929ed553ca1d5731f212a2
   languageName: node
   linkType: hard
 
-"@csstools/postcss-media-queries-aspect-ratio-number-values@npm:^2.0.11":
-  version: 2.0.11
-  resolution: "@csstools/postcss-media-queries-aspect-ratio-number-values@npm:2.0.11"
+"@csstools/postcss-media-queries-aspect-ratio-number-values@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "@csstools/postcss-media-queries-aspect-ratio-number-values@npm:3.0.0"
   dependencies:
-    "@csstools/css-parser-algorithms": "npm:^2.7.1"
-    "@csstools/css-tokenizer": "npm:^2.4.1"
-    "@csstools/media-query-list-parser": "npm:^2.1.13"
+    "@csstools/css-parser-algorithms": "npm:^3.0.0"
+    "@csstools/css-tokenizer": "npm:^3.0.0"
+    "@csstools/media-query-list-parser": "npm:^3.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/b4023a1951b7661196332852ce714a4e2fb4f1a67164ec0944e28a009b389e59c67e9de790920fcd082b122276414dd39c12ae12a4566e59e1bbcc794560a870
+  checksum: 10c0/c7af426e44c4ca2c7cb48c2f54bd8b5e4531d4d7a568011c367038956789bf47bab996fa062f767e255229de3598fb89abdb85011872158c885a4d3ace142509
   languageName: node
   linkType: hard
 
-"@csstools/postcss-nested-calc@npm:^3.0.2":
-  version: 3.0.2
-  resolution: "@csstools/postcss-nested-calc@npm:3.0.2"
+"@csstools/postcss-nested-calc@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "@csstools/postcss-nested-calc@npm:4.0.0"
   dependencies:
-    "@csstools/utilities": "npm:^1.0.0"
+    "@csstools/utilities": "npm:^2.0.0"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/3e24cf641170f9090f0dce088f6dae09ed9a0f38af1bdaa369ecc791a94cce54d7a02a0634f661a97fae24e04f1601c21d753593de018c80ad4236d36144b975
+  checksum: 10c0/fb61512fa4909bdf0ee32a23e771145086c445f2208a737b52093c8adfab7362c56d3aeaf2a6e33ffcec067e99a07219775465d2fbb1a3ac30cdcfb278b218b7
   languageName: node
   linkType: hard
 
-"@csstools/postcss-normalize-display-values@npm:^3.0.2":
-  version: 3.0.2
-  resolution: "@csstools/postcss-normalize-display-values@npm:3.0.2"
+"@csstools/postcss-normalize-display-values@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "@csstools/postcss-normalize-display-values@npm:4.0.0"
   dependencies:
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/a20e2f4c213a5ec6e004c2ba76b543d3288a39aae21b3198b06a57df0d2c7916111d2cd70dcb0e8c6ca1cf1b01751e88fd2fe9abbc070e1efab1a4e54dcdbbbe
+  checksum: 10c0/d3a3a362b532163bd791f97348ef28b7a43baf01987c7702b06285e751cdc5ea3e3a2553f088260515b4d28263d5c475923d4d4780ecb4078ec66dff50c9e638
   languageName: node
   linkType: hard
 
-"@csstools/postcss-oklab-function@npm:^3.0.19":
-  version: 3.0.19
-  resolution: "@csstools/postcss-oklab-function@npm:3.0.19"
+"@csstools/postcss-oklab-function@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "@csstools/postcss-oklab-function@npm:4.0.0"
   dependencies:
-    "@csstools/css-color-parser": "npm:^2.0.4"
-    "@csstools/css-parser-algorithms": "npm:^2.7.1"
-    "@csstools/css-tokenizer": "npm:^2.4.1"
-    "@csstools/postcss-progressive-custom-properties": "npm:^3.3.0"
-    "@csstools/utilities": "npm:^1.0.0"
+    "@csstools/css-color-parser": "npm:^3.0.0"
+    "@csstools/css-parser-algorithms": "npm:^3.0.0"
+    "@csstools/css-tokenizer": "npm:^3.0.0"
+    "@csstools/postcss-progressive-custom-properties": "npm:^4.0.0"
+    "@csstools/utilities": "npm:^2.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/2909f76ba408c9f60b61c479994c96200b0e1d3dbf524d5ae6dc5ca1e21d38caf974595e0d071c3900dbe3568376928085dd811aa24ea3e715bcd9de26fb0fa9
+  checksum: 10c0/9e228049645e6a6baa77d6e7e35b3862f3e2e4836fbf2de43fa246d91f0efa36e7f18eae3f2b224c61e72628aaf14d4bff86c555fb06378d5e05e71dca92f9ec
   languageName: node
   linkType: hard
 
-"@csstools/postcss-progressive-custom-properties@npm:^3.3.0":
-  version: 3.3.0
-  resolution: "@csstools/postcss-progressive-custom-properties@npm:3.3.0"
+"@csstools/postcss-progressive-custom-properties@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "@csstools/postcss-progressive-custom-properties@npm:4.0.0"
   dependencies:
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/6c9987d65049a70b5090dcfe42fde9ab2b3cb88911a81bb6651ed81c8baf99502ff2cbec0cb3e022426fa994b558b4bf33fd791ccdcdf683dde75b4865d34f39
+  checksum: 10c0/517e5e0b1525667ea1c4469bb2af52995934b9ab3165bba33e3bfdfac63b20bb51c878da582d805957dc0291e396e5a540cac18d1220a08190d98d5463d26ce2
   languageName: node
   linkType: hard
 
-"@csstools/postcss-relative-color-syntax@npm:^2.0.19":
-  version: 2.0.19
-  resolution: "@csstools/postcss-relative-color-syntax@npm:2.0.19"
+"@csstools/postcss-relative-color-syntax@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "@csstools/postcss-relative-color-syntax@npm:3.0.0"
   dependencies:
-    "@csstools/css-color-parser": "npm:^2.0.4"
-    "@csstools/css-parser-algorithms": "npm:^2.7.1"
-    "@csstools/css-tokenizer": "npm:^2.4.1"
-    "@csstools/postcss-progressive-custom-properties": "npm:^3.3.0"
-    "@csstools/utilities": "npm:^1.0.0"
+    "@csstools/css-color-parser": "npm:^3.0.0"
+    "@csstools/css-parser-algorithms": "npm:^3.0.0"
+    "@csstools/css-tokenizer": "npm:^3.0.0"
+    "@csstools/postcss-progressive-custom-properties": "npm:^4.0.0"
+    "@csstools/utilities": "npm:^2.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/f0aff764f4889ff664b6fa94ddfa5a22daf39354aa2d2ac0eab893eb3ed841b7d2a72131393334d6a5379445fc80f92ab5bd63d4dc3b43746bc7c9055da46591
+  checksum: 10c0/d7ae180d746bd9778d8b9f74f8d644f4c6a98b29659423d4ee2b48f461e90a3e30b44dcf44a181ade083b6c6d1b0346b7b3e62fe67fdeaba59a13f050a19c7d1
   languageName: node
   linkType: hard
 
-"@csstools/postcss-scope-pseudo-class@npm:^3.0.1":
-  version: 3.0.1
-  resolution: "@csstools/postcss-scope-pseudo-class@npm:3.0.1"
+"@csstools/postcss-scope-pseudo-class@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "@csstools/postcss-scope-pseudo-class@npm:4.0.0"
   dependencies:
-    postcss-selector-parser: "npm:^6.0.13"
+    postcss-selector-parser: "npm:^6.1.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/489c5469951277b810754ba02e9f6c42196e03f2203b908181a81747bf1dcaa7b194c8c0f5c7dcb6b7276d08f2573a71bd7df4f2251c034ef1b92968c7070285
+  checksum: 10c0/a6f562df1417c6f257c0fec95babf4cea99a25622573a2dbcfb416e2fcb8e1e53561127f5e7277d19fcb2a4603bdbc64dd6a4c416429623503c604050c99229a
   languageName: node
   linkType: hard
 
-"@csstools/postcss-stepped-value-functions@npm:^3.0.10":
-  version: 3.0.10
-  resolution: "@csstools/postcss-stepped-value-functions@npm:3.0.10"
+"@csstools/postcss-stepped-value-functions@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "@csstools/postcss-stepped-value-functions@npm:4.0.0"
   dependencies:
-    "@csstools/css-calc": "npm:^1.2.4"
-    "@csstools/css-parser-algorithms": "npm:^2.7.1"
-    "@csstools/css-tokenizer": "npm:^2.4.1"
+    "@csstools/css-calc": "npm:^2.0.0"
+    "@csstools/css-parser-algorithms": "npm:^3.0.0"
+    "@csstools/css-tokenizer": "npm:^3.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/f9ebe50fb884d002aa40070196a827816f635b891fd2147ae5ddf1ad6df5bddbb50783d6786897bb3dffa33052565e38289392040cf4454aaa179ab00353117d
+  checksum: 10c0/02d9b99921a69838d5df7cc2703f381e8e18d14ac5a4bd8b8b24ff80bc9657ff70b1997cdbfd9c2f1985a5d07478a0e97d1617760519450c5475cc1d8159e788
   languageName: node
   linkType: hard
 
-"@csstools/postcss-text-decoration-shorthand@npm:^3.0.7":
-  version: 3.0.7
-  resolution: "@csstools/postcss-text-decoration-shorthand@npm:3.0.7"
+"@csstools/postcss-text-decoration-shorthand@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "@csstools/postcss-text-decoration-shorthand@npm:4.0.0"
   dependencies:
     "@csstools/color-helpers": "npm:^4.2.1"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/072b9893ca2409aa16e53e84747d7b7e13071ce19738a0800a139bf71b535e439958d9093df2b85f83eee2e0c44bc22a14bf3a39b5a7508bca9e747a12273d02
+  checksum: 10c0/dedc98134648d5306e795e4176b2c39a578a237669562e7d934d0b0ac7411d37bab4065c8b0adfc075b57250daba62f045b86c79286b5f9be55502acef0d88c6
   languageName: node
   linkType: hard
 
-"@csstools/postcss-trigonometric-functions@npm:^3.0.10":
-  version: 3.0.10
-  resolution: "@csstools/postcss-trigonometric-functions@npm:3.0.10"
+"@csstools/postcss-trigonometric-functions@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "@csstools/postcss-trigonometric-functions@npm:4.0.0"
   dependencies:
-    "@csstools/css-calc": "npm:^1.2.4"
-    "@csstools/css-parser-algorithms": "npm:^2.7.1"
-    "@csstools/css-tokenizer": "npm:^2.4.1"
+    "@csstools/css-calc": "npm:^2.0.0"
+    "@csstools/css-parser-algorithms": "npm:^3.0.0"
+    "@csstools/css-tokenizer": "npm:^3.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/31adcc66510d9788ccb0669d2761517a6135b13692007d8e4334bc0e8d3515dfecfbdcd04e060d0c09a0f5fc2f12db92221b9d53e92b65b044c89cde9a3424cb
+  checksum: 10c0/3a53d6724f068511d02a2de3b39e76bf99d622614e1c79b3d2c2eace2f0d36d865288dc2c4a1368fee8db38be7973803504400b2752cd5a1200f825ddc27b253
   languageName: node
   linkType: hard
 
-"@csstools/postcss-unset-value@npm:^3.0.1":
-  version: 3.0.1
-  resolution: "@csstools/postcss-unset-value@npm:3.0.1"
+"@csstools/postcss-unset-value@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "@csstools/postcss-unset-value@npm:4.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/5032c3125eada0a3a77d0867644cf994e28b789aaa40e990e7eebcdf5a9ed9f36b30e0904827044cea39849c9a9a19c90e82d3ca655550d82a7530872b3b6ff8
+  checksum: 10c0/8424ac700ded5bf59d49310335896f10c069e2c3fc6a676b5d13ca5a6fb78689b948f50494df875da284c4c76651deb005eafba70d87e693274628c5a685abfa
   languageName: node
   linkType: hard
 
-"@csstools/selector-resolve-nested@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "@csstools/selector-resolve-nested@npm:1.1.0"
+"@csstools/selector-resolve-nested@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "@csstools/selector-resolve-nested@npm:2.0.0"
   peerDependencies:
-    postcss-selector-parser: ^6.0.13
-  checksum: 10c0/3a53b14e048d48b8900c1cf30442ab5eec1a1087c74ce41459c4dcd42ad7d363c9327890ba7aed25288d09c206d9565178bae126b25cdc3e1170a1d55e763c77
+    postcss-selector-parser: ^6.1.0
+  checksum: 10c0/10516fd1db5e0a3963063caa57d24eeb1d1f69fcb63f0b5aec5d7a44f8b36ff07b1eded3012e8a9b92fc1f484e1a5a9def0cf57d788aa7f944ee79877837cc77
   languageName: node
   linkType: hard
 
@@ -2024,12 +2050,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/utilities@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "@csstools/utilities@npm:1.0.0"
+"@csstools/selector-specificity@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "@csstools/selector-specificity@npm:4.0.0"
+  peerDependencies:
+    postcss-selector-parser: ^6.1.0
+  checksum: 10c0/6f4d4ecfdcd37f950100de8ffe0b4c1b1cc8c004aab2c2ebaa5c3e2bca2412d15b17d4628435f47a62d2c56db41bcbf985cb9c69e74b89964d48e421e93e75ba
+  languageName: node
+  linkType: hard
+
+"@csstools/utilities@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "@csstools/utilities@npm:2.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/2ac10895e0a1f9e1fc9c092197c8595a09f632552791af91219f38c55bb39083fb44b74a6a7de9112492cf24a2fe66d20c955a2b4aff041d5c017d87bbebc0f2
+  checksum: 10c0/be5c31437b726928f64cd4bb3e47f5b90bfd2e2a69a8eaabd8e89cc6c0977e4f0f7ee48de50c8ed8b07e04e3956a02293247e0da3236d521fb2e836f88f65822
   languageName: node
   linkType: hard
 
@@ -2877,7 +2912,7 @@ __metadata:
     path-complete-extname: "npm:^1.0.0"
     postcss: "npm:^8.4.24"
     postcss-loader: "npm:^4.3.0"
-    postcss-preset-env: "npm:^9.5.2"
+    postcss-preset-env: "npm:^10.0.0"
     prettier: "npm:^3.3.3"
     prop-types: "npm:^15.8.1"
     punycode: "npm:^2.3.0"
@@ -6557,14 +6592,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"css-blank-pseudo@npm:^6.0.2":
-  version: 6.0.2
-  resolution: "css-blank-pseudo@npm:6.0.2"
+"css-blank-pseudo@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "css-blank-pseudo@npm:7.0.0"
   dependencies:
-    postcss-selector-parser: "npm:^6.0.13"
+    postcss-selector-parser: "npm:^6.1.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/609303551c2a518ca23ed12fed43945ca4f7af04140da68a5536f5dc9d42f33412c13ac3fe5c616d7401a9e13a23d80b4cfa87149a45f94b244d8067bb11f3dd
+  checksum: 10c0/74c6c0af773a8d2c8c5a53bcfc2b2c06f9c3fd4a8bd756b7aafc102b91a1060b179a4f0aa21475b54685b62bfd9724fee90778dd992b42e0cd3ea3698132af92
   languageName: node
   linkType: hard
 
@@ -6584,16 +6619,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"css-has-pseudo@npm:^6.0.5":
-  version: 6.0.5
-  resolution: "css-has-pseudo@npm:6.0.5"
+"css-has-pseudo@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "css-has-pseudo@npm:7.0.0"
   dependencies:
-    "@csstools/selector-specificity": "npm:^3.1.1"
-    postcss-selector-parser: "npm:^6.0.13"
+    "@csstools/selector-specificity": "npm:^4.0.0"
+    postcss-selector-parser: "npm:^6.1.0"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/946930b7e699d6dbcb8426ebcd593228ee0e2143a148fb2399111ea4c9ed8d6eb3447e944251f1be44ae987d5ab16e450b0b006ca197f318c2a3760ba431fbb9
+  checksum: 10c0/2c72602ca9bcdb3afe2cce3b014e7dd17548658904c17560042ebf4bd6727b1ed8706961b1f44bff43bbdb8dc932c30a0b29f536c353df858e300e68e163b872
   languageName: node
   linkType: hard
 
@@ -6617,12 +6652,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"css-prefers-color-scheme@npm:^9.0.1":
-  version: 9.0.1
-  resolution: "css-prefers-color-scheme@npm:9.0.1"
+"css-prefers-color-scheme@npm:^10.0.0":
+  version: 10.0.0
+  resolution: "css-prefers-color-scheme@npm:10.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/b94da00d84c4ebb56eb8fce96d4fdb20d2e622a7cd8cd6d7b87d1d2b718a55ce88bccc9d871771bfe77c5107de06132ba87190e3656f049e45f19f652d50136c
+  checksum: 10c0/a66c727bb2455328b18862f720819fc98ff5c1486b69f758bdb5c66f46cc6d484f9fc0bfa4f00f2693c5da6707ad136ca789496982f713ade693f08af624930e
   languageName: node
   linkType: hard
 
@@ -13257,14 +13292,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-attribute-case-insensitive@npm:^6.0.3":
-  version: 6.0.3
-  resolution: "postcss-attribute-case-insensitive@npm:6.0.3"
+"postcss-attribute-case-insensitive@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-attribute-case-insensitive@npm:7.0.0"
   dependencies:
-    postcss-selector-parser: "npm:^6.0.13"
+    postcss-selector-parser: "npm:^6.1.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/6161a625356db17ea23daa50797e23fa830a15629fa45e7438b5ac72a389f81ba51088503c5893a941d34d287857882867199584c5f03bf7762258c74570f456
+  checksum: 10c0/ce2a96bc29f59a6113953f1f72bfa2d4d34e54b194ff4d49aad0d548aa738835afaf479f22060a2605952b842f63aeae278b44e41f8f3a05731df28d08e2df97
   languageName: node
   linkType: hard
 
@@ -13291,42 +13326,42 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-color-functional-notation@npm:^6.0.14":
-  version: 6.0.14
-  resolution: "postcss-color-functional-notation@npm:6.0.14"
+"postcss-color-functional-notation@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-color-functional-notation@npm:7.0.0"
   dependencies:
-    "@csstools/css-color-parser": "npm:^2.0.4"
-    "@csstools/css-parser-algorithms": "npm:^2.7.1"
-    "@csstools/css-tokenizer": "npm:^2.4.1"
-    "@csstools/postcss-progressive-custom-properties": "npm:^3.3.0"
-    "@csstools/utilities": "npm:^1.0.0"
+    "@csstools/css-color-parser": "npm:^3.0.0"
+    "@csstools/css-parser-algorithms": "npm:^3.0.0"
+    "@csstools/css-tokenizer": "npm:^3.0.0"
+    "@csstools/postcss-progressive-custom-properties": "npm:^4.0.0"
+    "@csstools/utilities": "npm:^2.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/fdc5188e19c3923da32fe08d50e55d0b3ca1cedf99f46331baa0a4bbd73a1fc6b4447b0346ab16049032b56ab84b98b4758a0ede7c237637e35a4cc60caac141
+  checksum: 10c0/6afe7b681a16783a27fa9600db348f995dfdbc9c945f6cdcec94ee2419e09cfd1c6e533264b830207f130e19ae18ff689ad9b48bced338f27f898eaecd61f844
   languageName: node
   linkType: hard
 
-"postcss-color-hex-alpha@npm:^9.0.4":
-  version: 9.0.4
-  resolution: "postcss-color-hex-alpha@npm:9.0.4"
+"postcss-color-hex-alpha@npm:^10.0.0":
+  version: 10.0.0
+  resolution: "postcss-color-hex-alpha@npm:10.0.0"
   dependencies:
-    "@csstools/utilities": "npm:^1.0.0"
+    "@csstools/utilities": "npm:^2.0.0"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/57b5cfe17e0b659d5444f267c485462b8b25f6ab087b810c7dd44662af4828e1e8f9c4a9169b8635a4755509ca7c0f3463c2e96444764c4e6ff9f4036aad05e5
+  checksum: 10c0/8a6dcb27403d04b55d6de88bf3074622bcea537fc4436bbcb346e92289c4d17059444e2e6c3554c325e7a777bb4cdc711e764a83123b4000aec211052e957d5b
   languageName: node
   linkType: hard
 
-"postcss-color-rebeccapurple@npm:^9.0.3":
-  version: 9.0.3
-  resolution: "postcss-color-rebeccapurple@npm:9.0.3"
+"postcss-color-rebeccapurple@npm:^10.0.0":
+  version: 10.0.0
+  resolution: "postcss-color-rebeccapurple@npm:10.0.0"
   dependencies:
-    "@csstools/utilities": "npm:^1.0.0"
+    "@csstools/utilities": "npm:^2.0.0"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/ab36d29df23dd475a2a540101427640ef9c7936bbf941816e8582caea05feced26c65f795a849e2ad17469cee6682d1bbccd2f8ab0da07fe91efcc0649568038
+  checksum: 10c0/308e33f76f2b48c1c2121d4502fc053e869f3415898de7d30314353df680e79b37497e7b628e3447edc1049091da3672f7d891e45604f238598e846e06b893ed
   languageName: node
   linkType: hard
 
@@ -13356,57 +13391,57 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-custom-media@npm:^10.0.8":
-  version: 10.0.8
-  resolution: "postcss-custom-media@npm:10.0.8"
+"postcss-custom-media@npm:^11.0.0":
+  version: 11.0.0
+  resolution: "postcss-custom-media@npm:11.0.0"
   dependencies:
-    "@csstools/cascade-layer-name-parser": "npm:^1.0.13"
-    "@csstools/css-parser-algorithms": "npm:^2.7.1"
-    "@csstools/css-tokenizer": "npm:^2.4.1"
-    "@csstools/media-query-list-parser": "npm:^2.1.13"
+    "@csstools/cascade-layer-name-parser": "npm:^2.0.0"
+    "@csstools/css-parser-algorithms": "npm:^3.0.0"
+    "@csstools/css-tokenizer": "npm:^3.0.0"
+    "@csstools/media-query-list-parser": "npm:^3.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/673ca0058a2f2357a83b33ce00bbeee7cda92621c08472fa55d7ac7ae56f5f8f979132528d537f2dedf715d35a8f9b14b2f0ab6b45423d49e2554c19aab3c827
+  checksum: 10c0/99e58454453581a1a4f5b7eae5cf6504c445e45d48035f09857603437fe80de06a216d0dad6036d32d14108b490e82a0845e1b4e0ec5114f752b325e388f0f1c
   languageName: node
   linkType: hard
 
-"postcss-custom-properties@npm:^13.3.12":
-  version: 13.3.12
-  resolution: "postcss-custom-properties@npm:13.3.12"
+"postcss-custom-properties@npm:^14.0.0":
+  version: 14.0.0
+  resolution: "postcss-custom-properties@npm:14.0.0"
   dependencies:
-    "@csstools/cascade-layer-name-parser": "npm:^1.0.13"
-    "@csstools/css-parser-algorithms": "npm:^2.7.1"
-    "@csstools/css-tokenizer": "npm:^2.4.1"
-    "@csstools/utilities": "npm:^1.0.0"
+    "@csstools/cascade-layer-name-parser": "npm:^2.0.0"
+    "@csstools/css-parser-algorithms": "npm:^3.0.0"
+    "@csstools/css-tokenizer": "npm:^3.0.0"
+    "@csstools/utilities": "npm:^2.0.0"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/6af9f6ac94a6ac887749cd38d4586349f6aca29269ebfdb837019a3ba0130032f0ff4899b431b5c348f4ac79a7b16fb7300a256514a6a68e32a63489c18a70e7
+  checksum: 10c0/f587e2f3026fa7ceb63dd111674848b97dc452f9e75a6480b4b87611a4705dd97e5ae5247e7d34888aecd95b4e50706170c93f57f14f05fb352135d2decdc00f
   languageName: node
   linkType: hard
 
-"postcss-custom-selectors@npm:^7.1.12":
-  version: 7.1.12
-  resolution: "postcss-custom-selectors@npm:7.1.12"
+"postcss-custom-selectors@npm:^8.0.0":
+  version: 8.0.0
+  resolution: "postcss-custom-selectors@npm:8.0.0"
   dependencies:
-    "@csstools/cascade-layer-name-parser": "npm:^1.0.13"
-    "@csstools/css-parser-algorithms": "npm:^2.7.1"
-    "@csstools/css-tokenizer": "npm:^2.4.1"
+    "@csstools/cascade-layer-name-parser": "npm:^2.0.0"
+    "@csstools/css-parser-algorithms": "npm:^3.0.0"
+    "@csstools/css-tokenizer": "npm:^3.0.0"
     postcss-selector-parser: "npm:^6.1.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/78a7930e4f97c42b544f00c06272264432d47f9df777684b57673bb971b7ab49d5d6fb9289a5a869125e7e50dcd0cad65cf8846501253084b73a42ffab41b2c5
+  checksum: 10c0/efc9ce0e9c92f298b9196e1cf240ef0e15f88bb3f90f441beecd05756e31628b27a56dcb176f696d3d34c8d4d879c0eb70d1cb62b44c55e01ebd2a653b8a9e94
   languageName: node
   linkType: hard
 
-"postcss-dir-pseudo-class@npm:^8.0.1":
-  version: 8.0.1
-  resolution: "postcss-dir-pseudo-class@npm:8.0.1"
+"postcss-dir-pseudo-class@npm:^9.0.0":
+  version: 9.0.0
+  resolution: "postcss-dir-pseudo-class@npm:9.0.0"
   dependencies:
-    postcss-selector-parser: "npm:^6.0.13"
+    postcss-selector-parser: "npm:^6.1.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/8c096e096b09e4041818bd2edf5581b5172375621f5eeca013633166ea100ab98e71bf60fccd92fa20cfa7b55c57598605a1655c6bcbe54a80728a7d4e36859e
+  checksum: 10c0/debae71bf508c0e494ebb1892ce6b3c1c4eeb6b23231180151a93920a12fec771815510cdec54db54605e090ae56af9f07c68ef6a61260d0c837adc719f9e1e4
   languageName: node
   linkType: hard
 
@@ -13448,38 +13483,38 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-double-position-gradients@npm:^5.0.7":
-  version: 5.0.7
-  resolution: "postcss-double-position-gradients@npm:5.0.7"
+"postcss-double-position-gradients@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "postcss-double-position-gradients@npm:6.0.0"
   dependencies:
-    "@csstools/postcss-progressive-custom-properties": "npm:^3.3.0"
-    "@csstools/utilities": "npm:^1.0.0"
+    "@csstools/postcss-progressive-custom-properties": "npm:^4.0.0"
+    "@csstools/utilities": "npm:^2.0.0"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/52d96a34aa3e2e251edeaa2d4c2dd106c687f7910ec18266693656c0edd003384b927c855cecac07f52b5c7bdccd140abdc7e27082ce4c3755e3a966206a2cb9
+  checksum: 10c0/7a0e119df1b4af59d169b1a9dfc563275ce29b4ae5e6a6c90be29a7a59272ebc55bf3b2ed05a962f73b03194f7a88f6fe738e65c1659d43351fbdc705cc951ad
   languageName: node
   linkType: hard
 
-"postcss-focus-visible@npm:^9.0.1":
-  version: 9.0.1
-  resolution: "postcss-focus-visible@npm:9.0.1"
+"postcss-focus-visible@npm:^10.0.0":
+  version: 10.0.0
+  resolution: "postcss-focus-visible@npm:10.0.0"
   dependencies:
-    postcss-selector-parser: "npm:^6.0.13"
+    postcss-selector-parser: "npm:^6.1.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/b8eb14ef51df62969559a7b2b4a4b6313a802fc2de225de293ad484ed6528833fc6bb7574aad5fabe7eeb27e8cd62663c2d547b25ff058d31c06d3d066abd904
+  checksum: 10c0/b86b825bac597092b300127c2686c0669ce0766165716ecda42f298f21ca69dda721e44917732cbcb2611a4ab650f1231bf8c5d4d07c9daefef815329251ae8a
   languageName: node
   linkType: hard
 
-"postcss-focus-within@npm:^8.0.1":
-  version: 8.0.1
-  resolution: "postcss-focus-within@npm:8.0.1"
+"postcss-focus-within@npm:^9.0.0":
+  version: 9.0.0
+  resolution: "postcss-focus-within@npm:9.0.0"
   dependencies:
-    postcss-selector-parser: "npm:^6.0.13"
+    postcss-selector-parser: "npm:^6.1.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/cb0380d89f3b9313345dbea65c78c7ad16a6e6ab2ba9e90451d5b14f05ee691a0cdf458376368061327182e031644da21eee7e6e9ae508d195f083e0a20c0502
+  checksum: 10c0/1d6f1b4f4d12e23a2824f394652d520942f00fd582d3016c933a492fe0ba38aaf26bc1855576878aaeaeda1d6fc38da39bb51e8e6470c50ef03f3ea9a286b3d1
   languageName: node
   linkType: hard
 
@@ -13492,39 +13527,39 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-gap-properties@npm:^5.0.1":
-  version: 5.0.1
-  resolution: "postcss-gap-properties@npm:5.0.1"
+"postcss-gap-properties@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "postcss-gap-properties@npm:6.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/3b28c38819add37a2fc7decd7e3bdda1cab1de861af228abfb3e4310d87786eff4572a693bec6cea1c435bcd3dd0bb58bc9a58f1dde3a1c7def9feaf800762b8
+  checksum: 10c0/4e07e0d3927d0e65d67eaf047ac39e08d39cb1bf74e16e10c7df7f0d01b184a77ea59f63fd5691b5ed6df159970b972db28cb784d883e26e981137696460897d
   languageName: node
   linkType: hard
 
-"postcss-image-set-function@npm:^6.0.3":
-  version: 6.0.3
-  resolution: "postcss-image-set-function@npm:6.0.3"
+"postcss-image-set-function@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-image-set-function@npm:7.0.0"
   dependencies:
-    "@csstools/utilities": "npm:^1.0.0"
+    "@csstools/utilities": "npm:^2.0.0"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/b35ce25aeca95f7abc5e5820f2398588150f5be02209054d714e870ae2fa01a8482fd10600fe1f847add898c39690275a60a5999f83f6bed6c66be9b0444b704
+  checksum: 10c0/913fd9492f00122aa0c2550fb0d72130428cbe1e6465bc65e8fe71e9deb10ac0c01d7caceb68b560da759139e8cbc6c90ed22dfe6cf34949af49bb86bcbf4d3a
   languageName: node
   linkType: hard
 
-"postcss-lab-function@npm:^6.0.19":
-  version: 6.0.19
-  resolution: "postcss-lab-function@npm:6.0.19"
+"postcss-lab-function@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-lab-function@npm:7.0.0"
   dependencies:
-    "@csstools/css-color-parser": "npm:^2.0.4"
-    "@csstools/css-parser-algorithms": "npm:^2.7.1"
-    "@csstools/css-tokenizer": "npm:^2.4.1"
-    "@csstools/postcss-progressive-custom-properties": "npm:^3.3.0"
-    "@csstools/utilities": "npm:^1.0.0"
+    "@csstools/css-color-parser": "npm:^3.0.0"
+    "@csstools/css-parser-algorithms": "npm:^3.0.0"
+    "@csstools/css-tokenizer": "npm:^3.0.0"
+    "@csstools/postcss-progressive-custom-properties": "npm:^4.0.0"
+    "@csstools/utilities": "npm:^2.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/d9a91fb57dcbe967260df86e22ca335a5444f1f34d128fa7b5dbf2522772f2138ad708f1f20f0a59035d66ed736e82972ca7f1b669a157534a17ee8898af1921
+  checksum: 10c0/f3647bcdd8d6140631b97276ecf51f40df2c7564610262a20c608c37c8ab79bf6e02888419dc657afc4720a7378e3ad19f4fdf811a69363424160d548ac68daf
   languageName: node
   linkType: hard
 
@@ -13544,14 +13579,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-logical@npm:^7.0.1":
-  version: 7.0.1
-  resolution: "postcss-logical@npm:7.0.1"
+"postcss-logical@npm:^8.0.0":
+  version: 8.0.0
+  resolution: "postcss-logical@npm:8.0.0"
   dependencies:
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/66a06b5d3cb31181dd76c80286addd219205066a4a8c216076869fc54769ee0011cdaa8063e1b2c19c114cdc5ad12a2e2e8b730f6971960dc77d55f25f290223
+  checksum: 10c0/2caa04e45227ab9dec728416ccde47514e1c347ee72aac58e13ecee3bc7fbc8b53e3fe4f1e2e4396432feb1d54e70a1f06ec5a74d60e84bafff05ab82f196475
   languageName: node
   linkType: hard
 
@@ -13681,16 +13716,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-nesting@npm:^12.1.5":
-  version: 12.1.5
-  resolution: "postcss-nesting@npm:12.1.5"
+"postcss-nesting@npm:^13.0.0":
+  version: 13.0.0
+  resolution: "postcss-nesting@npm:13.0.0"
   dependencies:
-    "@csstools/selector-resolve-nested": "npm:^1.1.0"
-    "@csstools/selector-specificity": "npm:^3.1.1"
+    "@csstools/selector-resolve-nested": "npm:^2.0.0"
+    "@csstools/selector-specificity": "npm:^4.0.0"
     postcss-selector-parser: "npm:^6.1.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/8f049fe24dccb186707e065ffb697f9f0633a03b0e1139e9c24656f3d2158a738a51c7b1f405b48fdb8b4f19515ad4ad9d3cd4ec9d9fe1dd4e5f18729bf8e589
+  checksum: 10c0/b82a3c7010f7c6097bd3f3fe6c03f3f3af9a63a58e255f120dadd506a0ea9444aeeaba994f2a3fa34fb26e666dc72032edf5786c5fbdade790b02ad07d91ef95
   languageName: node
   linkType: hard
 
@@ -13813,14 +13848,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-overflow-shorthand@npm:^5.0.1":
-  version: 5.0.1
-  resolution: "postcss-overflow-shorthand@npm:5.0.1"
+"postcss-overflow-shorthand@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "postcss-overflow-shorthand@npm:6.0.0"
   dependencies:
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/328407adffae084c096b3ea2c03037f0083a0000cae744872bb1168fdd317eef12bb049cdfef749343c3ed65b4275dc6eefe577d99cbc78e3617cb36d07e8717
+  checksum: 10c0/6598321b2ed0b68461135395bba9c7f76a4672617770df1e8487f459bc975f4ded6c3d37b6f72a44f4f77f7b6789e0c6f927e66dbbf1bcde1537167dbea39968
   languageName: node
   linkType: hard
 
@@ -13833,96 +13868,96 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-place@npm:^9.0.1":
-  version: 9.0.1
-  resolution: "postcss-place@npm:9.0.1"
+"postcss-place@npm:^10.0.0":
+  version: 10.0.0
+  resolution: "postcss-place@npm:10.0.0"
   dependencies:
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/d0fb5b0416fd15d5ac7da5fcc1829b9b78c5a90caba5bd045052c6ac0467910cbbeb2fff6c5257190affa656be27168c94ff339f86c0b7df54f9bea04bcadba7
-  languageName: node
-  linkType: hard
-
-"postcss-preset-env@npm:^9.5.2":
-  version: 9.6.0
-  resolution: "postcss-preset-env@npm:9.6.0"
-  dependencies:
-    "@csstools/postcss-cascade-layers": "npm:^4.0.6"
-    "@csstools/postcss-color-function": "npm:^3.0.19"
-    "@csstools/postcss-color-mix-function": "npm:^2.0.19"
-    "@csstools/postcss-content-alt-text": "npm:^1.0.0"
-    "@csstools/postcss-exponential-functions": "npm:^1.0.9"
-    "@csstools/postcss-font-format-keywords": "npm:^3.0.2"
-    "@csstools/postcss-gamut-mapping": "npm:^1.0.11"
-    "@csstools/postcss-gradients-interpolation-method": "npm:^4.0.20"
-    "@csstools/postcss-hwb-function": "npm:^3.0.18"
-    "@csstools/postcss-ic-unit": "npm:^3.0.7"
-    "@csstools/postcss-initial": "npm:^1.0.1"
-    "@csstools/postcss-is-pseudo-class": "npm:^4.0.8"
-    "@csstools/postcss-light-dark-function": "npm:^1.0.8"
-    "@csstools/postcss-logical-float-and-clear": "npm:^2.0.1"
-    "@csstools/postcss-logical-overflow": "npm:^1.0.1"
-    "@csstools/postcss-logical-overscroll-behavior": "npm:^1.0.1"
-    "@csstools/postcss-logical-resize": "npm:^2.0.1"
-    "@csstools/postcss-logical-viewport-units": "npm:^2.0.11"
-    "@csstools/postcss-media-minmax": "npm:^1.1.8"
-    "@csstools/postcss-media-queries-aspect-ratio-number-values": "npm:^2.0.11"
-    "@csstools/postcss-nested-calc": "npm:^3.0.2"
-    "@csstools/postcss-normalize-display-values": "npm:^3.0.2"
-    "@csstools/postcss-oklab-function": "npm:^3.0.19"
-    "@csstools/postcss-progressive-custom-properties": "npm:^3.3.0"
-    "@csstools/postcss-relative-color-syntax": "npm:^2.0.19"
-    "@csstools/postcss-scope-pseudo-class": "npm:^3.0.1"
-    "@csstools/postcss-stepped-value-functions": "npm:^3.0.10"
-    "@csstools/postcss-text-decoration-shorthand": "npm:^3.0.7"
-    "@csstools/postcss-trigonometric-functions": "npm:^3.0.10"
-    "@csstools/postcss-unset-value": "npm:^3.0.1"
+  checksum: 10c0/ebb13deaac7648ba6042622375a31f78fbcc5209b7d196e478debbdf94525963fe621c932f4737a5b6b3d487af3b5ed6d059ed6193fdcbff6d3d5b150886ccc1
+  languageName: node
+  linkType: hard
+
+"postcss-preset-env@npm:^10.0.0":
+  version: 10.0.0
+  resolution: "postcss-preset-env@npm:10.0.0"
+  dependencies:
+    "@csstools/postcss-cascade-layers": "npm:^5.0.0"
+    "@csstools/postcss-color-function": "npm:^4.0.0"
+    "@csstools/postcss-color-mix-function": "npm:^3.0.0"
+    "@csstools/postcss-content-alt-text": "npm:^2.0.0"
+    "@csstools/postcss-exponential-functions": "npm:^2.0.0"
+    "@csstools/postcss-font-format-keywords": "npm:^4.0.0"
+    "@csstools/postcss-gamut-mapping": "npm:^2.0.0"
+    "@csstools/postcss-gradients-interpolation-method": "npm:^5.0.0"
+    "@csstools/postcss-hwb-function": "npm:^4.0.0"
+    "@csstools/postcss-ic-unit": "npm:^4.0.0"
+    "@csstools/postcss-initial": "npm:^2.0.0"
+    "@csstools/postcss-is-pseudo-class": "npm:^5.0.0"
+    "@csstools/postcss-light-dark-function": "npm:^2.0.0"
+    "@csstools/postcss-logical-float-and-clear": "npm:^3.0.0"
+    "@csstools/postcss-logical-overflow": "npm:^2.0.0"
+    "@csstools/postcss-logical-overscroll-behavior": "npm:^2.0.0"
+    "@csstools/postcss-logical-resize": "npm:^3.0.0"
+    "@csstools/postcss-logical-viewport-units": "npm:^3.0.0"
+    "@csstools/postcss-media-minmax": "npm:^2.0.0"
+    "@csstools/postcss-media-queries-aspect-ratio-number-values": "npm:^3.0.0"
+    "@csstools/postcss-nested-calc": "npm:^4.0.0"
+    "@csstools/postcss-normalize-display-values": "npm:^4.0.0"
+    "@csstools/postcss-oklab-function": "npm:^4.0.0"
+    "@csstools/postcss-progressive-custom-properties": "npm:^4.0.0"
+    "@csstools/postcss-relative-color-syntax": "npm:^3.0.0"
+    "@csstools/postcss-scope-pseudo-class": "npm:^4.0.0"
+    "@csstools/postcss-stepped-value-functions": "npm:^4.0.0"
+    "@csstools/postcss-text-decoration-shorthand": "npm:^4.0.0"
+    "@csstools/postcss-trigonometric-functions": "npm:^4.0.0"
+    "@csstools/postcss-unset-value": "npm:^4.0.0"
     autoprefixer: "npm:^10.4.19"
     browserslist: "npm:^4.23.1"
-    css-blank-pseudo: "npm:^6.0.2"
-    css-has-pseudo: "npm:^6.0.5"
-    css-prefers-color-scheme: "npm:^9.0.1"
+    css-blank-pseudo: "npm:^7.0.0"
+    css-has-pseudo: "npm:^7.0.0"
+    css-prefers-color-scheme: "npm:^10.0.0"
     cssdb: "npm:^8.1.0"
-    postcss-attribute-case-insensitive: "npm:^6.0.3"
+    postcss-attribute-case-insensitive: "npm:^7.0.0"
     postcss-clamp: "npm:^4.1.0"
-    postcss-color-functional-notation: "npm:^6.0.14"
-    postcss-color-hex-alpha: "npm:^9.0.4"
-    postcss-color-rebeccapurple: "npm:^9.0.3"
-    postcss-custom-media: "npm:^10.0.8"
-    postcss-custom-properties: "npm:^13.3.12"
-    postcss-custom-selectors: "npm:^7.1.12"
-    postcss-dir-pseudo-class: "npm:^8.0.1"
-    postcss-double-position-gradients: "npm:^5.0.7"
-    postcss-focus-visible: "npm:^9.0.1"
-    postcss-focus-within: "npm:^8.0.1"
+    postcss-color-functional-notation: "npm:^7.0.0"
+    postcss-color-hex-alpha: "npm:^10.0.0"
+    postcss-color-rebeccapurple: "npm:^10.0.0"
+    postcss-custom-media: "npm:^11.0.0"
+    postcss-custom-properties: "npm:^14.0.0"
+    postcss-custom-selectors: "npm:^8.0.0"
+    postcss-dir-pseudo-class: "npm:^9.0.0"
+    postcss-double-position-gradients: "npm:^6.0.0"
+    postcss-focus-visible: "npm:^10.0.0"
+    postcss-focus-within: "npm:^9.0.0"
     postcss-font-variant: "npm:^5.0.0"
-    postcss-gap-properties: "npm:^5.0.1"
-    postcss-image-set-function: "npm:^6.0.3"
-    postcss-lab-function: "npm:^6.0.19"
-    postcss-logical: "npm:^7.0.1"
-    postcss-nesting: "npm:^12.1.5"
+    postcss-gap-properties: "npm:^6.0.0"
+    postcss-image-set-function: "npm:^7.0.0"
+    postcss-lab-function: "npm:^7.0.0"
+    postcss-logical: "npm:^8.0.0"
+    postcss-nesting: "npm:^13.0.0"
     postcss-opacity-percentage: "npm:^2.0.0"
-    postcss-overflow-shorthand: "npm:^5.0.1"
+    postcss-overflow-shorthand: "npm:^6.0.0"
     postcss-page-break: "npm:^3.0.4"
-    postcss-place: "npm:^9.0.1"
-    postcss-pseudo-class-any-link: "npm:^9.0.2"
+    postcss-place: "npm:^10.0.0"
+    postcss-pseudo-class-any-link: "npm:^10.0.0"
     postcss-replace-overflow-wrap: "npm:^4.0.0"
-    postcss-selector-not: "npm:^7.0.2"
+    postcss-selector-not: "npm:^8.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/caa91ba4d3b897d43ab2669b3edf40b24ef32c88e23b113be8956412e64b28deed6ba229c331848fcbc0d143bfde155173fb1e1ada9ccae5037b2ee8f7e554b7
+  checksum: 10c0/0b61c44233ee7fd17e32912ce028edc19998f30183f1ff2186523c4f9eac4a2a36513af31670e13ceb05f2146c4549a0b870ba0de0e3a08e77a9d57d8de72654
   languageName: node
   linkType: hard
 
-"postcss-pseudo-class-any-link@npm:^9.0.2":
-  version: 9.0.2
-  resolution: "postcss-pseudo-class-any-link@npm:9.0.2"
+"postcss-pseudo-class-any-link@npm:^10.0.0":
+  version: 10.0.0
+  resolution: "postcss-pseudo-class-any-link@npm:10.0.0"
   dependencies:
-    postcss-selector-parser: "npm:^6.0.13"
+    postcss-selector-parser: "npm:^6.1.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/cc2cb455a793b1f5dc0ac290e02296eafb317d9ce987dc9f2102027e22f265299666dbd1e78f1d7836fce549dead73f41e24251c08a2dd0cf482f3cc43cf7909
+  checksum: 10c0/8357716e0ba0f01c70dba65a1efd268f610249ac2fbd41833e5e87dc19ffa7911c8d5e234d0d7c77d94ba6cdfa04fe7f0f98461c34f64cdbb59abd9737ab7d32
   languageName: node
   linkType: hard
 
@@ -13983,14 +14018,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-selector-not@npm:^7.0.2":
-  version: 7.0.2
-  resolution: "postcss-selector-not@npm:7.0.2"
+"postcss-selector-not@npm:^8.0.0":
+  version: 8.0.0
+  resolution: "postcss-selector-not@npm:8.0.0"
   dependencies:
-    postcss-selector-parser: "npm:^6.0.13"
+    postcss-selector-parser: "npm:^6.1.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/624b6e516d37d43406ff1414b3413fe7a5dc34eccadd6a6082fe7df13c5c2fab3e244af33ff0916f9be0a4f7db91d1c22102f5166d7a6e6595e7c00e11e20281
+  checksum: 10c0/677f2cd9d0cd481d276663b57001b2ba96db94ad5bba397f277e53d560ccb074b27c21792deff44720a9f2d96da85fa34f438bb1d33198305b5866b35f1a4708
   languageName: node
   linkType: hard
 

From a1eaf12d63422f227dfe5f486253abdcb51d279d Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 5 Aug 2024 07:14:05 +0000
Subject: [PATCH 1714/2191] chore(deps): update dependency fog-core to '<=
 2.5.0' (#31267)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile      | 2 +-
 Gemfile.lock | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index de9bc45f320e6c..cf930dadb6eb7f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -16,7 +16,7 @@ gem 'pghero'
 
 gem 'aws-sdk-s3', '~> 1.123', require: false
 gem 'blurhash', '~> 0.1'
-gem 'fog-core', '<= 2.4.0'
+gem 'fog-core', '<= 2.5.0'
 gem 'fog-openstack', '~> 1.0', require: false
 gem 'kt-paperclip', '~> 7.2'
 gem 'md-paperclip-azure', '~> 2.2', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index c3b5ab9150107b..e1382732cbe5c9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -229,7 +229,7 @@ GEM
     erubi (1.13.0)
     et-orbi (1.2.11)
       tzinfo
-    excon (0.110.0)
+    excon (0.111.0)
     fabrication (2.31.0)
     faker (3.4.2)
       i18n (>= 1.8.11, < 2)
@@ -269,7 +269,7 @@ GEM
     flatware-rspec (2.3.2)
       flatware (= 2.3.2)
       rspec (>= 3.6)
-    fog-core (2.4.0)
+    fog-core (2.5.0)
       builder
       excon (~> 0.71)
       formatador (>= 0.2, < 2.0)
@@ -429,7 +429,7 @@ GEM
     memory_profiler (1.0.2)
     mime-types (3.5.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2024.0604)
+    mime-types-data (3.2024.0702)
     mini_mime (1.1.5)
     mini_portile2 (2.8.7)
     minitest (5.24.1)
@@ -945,7 +945,7 @@ DEPENDENCIES
   fast_blank (~> 1.0)
   fastimage
   flatware-rspec
-  fog-core (<= 2.4.0)
+  fog-core (<= 2.5.0)
   fog-openstack (~> 1.0)
   fuubar (~> 2.5)
   haml-rails (~> 2.0)

From cb56a6dc7efa06c4a9c974fc60a4825d5cc89e1d Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 5 Aug 2024 07:43:04 +0000
Subject: [PATCH 1715/2191] New Crowdin Translations (automated) (#31276)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/be.json    | 34 ++++++++++-
 app/javascript/mastodon/locales/bg.json    |  2 +
 app/javascript/mastodon/locales/ca.json    |  2 +
 app/javascript/mastodon/locales/cs.json    | 16 +++++
 app/javascript/mastodon/locales/cy.json    |  6 +-
 app/javascript/mastodon/locales/da.json    |  2 +
 app/javascript/mastodon/locales/de.json    |  4 +-
 app/javascript/mastodon/locales/es-AR.json |  2 +
 app/javascript/mastodon/locales/fa.json    | 26 ++++++++
 app/javascript/mastodon/locales/fi.json    | 48 ++++++++-------
 app/javascript/mastodon/locales/fo.json    |  1 +
 app/javascript/mastodon/locales/gl.json    |  2 +
 app/javascript/mastodon/locales/he.json    |  2 +
 app/javascript/mastodon/locales/hu.json    |  4 +-
 app/javascript/mastodon/locales/is.json    |  2 +
 app/javascript/mastodon/locales/it.json    |  2 +
 app/javascript/mastodon/locales/ja.json    |  2 +
 app/javascript/mastodon/locales/nl.json    |  2 +
 app/javascript/mastodon/locales/pa.json    |  3 +
 app/javascript/mastodon/locales/pl.json    |  2 +
 app/javascript/mastodon/locales/pt-PT.json |  2 +
 app/javascript/mastodon/locales/ry.json    |  1 +
 app/javascript/mastodon/locales/sk.json    |  5 ++
 app/javascript/mastodon/locales/sq.json    |  2 +
 app/javascript/mastodon/locales/tr.json    |  3 +
 app/javascript/mastodon/locales/uk.json    | 13 ++--
 app/javascript/mastodon/locales/vi.json    |  2 +
 app/javascript/mastodon/locales/zh-CN.json | 32 +++++-----
 app/javascript/mastodon/locales/zh-TW.json |  2 +
 config/locales/be.yml                      | 22 +++++++
 config/locales/cs.yml                      | 21 +++++++
 config/locales/cy.yml                      | 23 ++++++-
 config/locales/da.yml                      |  1 +
 config/locales/de.yml                      |  2 +-
 config/locales/doorkeeper.be.yml           |  1 +
 config/locales/doorkeeper.hu.yml           | 11 ++--
 config/locales/fi.yml                      | 70 +++++++++++-----------
 config/locales/ia.yml                      |  3 +
 config/locales/simple_form.be.yml          |  4 ++
 config/locales/simple_form.cs.yml          |  2 +
 config/locales/simple_form.cy.yml          |  1 +
 config/locales/simple_form.es-MX.yml       |  2 +-
 config/locales/simple_form.es.yml          |  2 +-
 config/locales/simple_form.fi.yml          | 24 ++++----
 config/locales/simple_form.tr.yml          |  1 +
 config/locales/simple_form.uk.yml          |  8 +--
 config/locales/tr.yml                      | 16 +++++
 config/locales/uk.yml                      |  2 +-
 48 files changed, 331 insertions(+), 111 deletions(-)

diff --git a/app/javascript/mastodon/locales/be.json b/app/javascript/mastodon/locales/be.json
index bb59001273a373..58aff7da44739f 100644
--- a/app/javascript/mastodon/locales/be.json
+++ b/app/javascript/mastodon/locales/be.json
@@ -171,21 +171,28 @@
   "confirmations.block.confirm": "Заблакіраваць",
   "confirmations.delete.confirm": "Выдаліць",
   "confirmations.delete.message": "Вы ўпэўненыя, што хочаце выдаліць гэты допіс?",
+  "confirmations.delete.title": "Выдаліць допіс?",
   "confirmations.delete_list.confirm": "Выдаліць",
   "confirmations.delete_list.message": "Вы ўпэўненыя, што хочаце беззваротна выдаліць гэты чарнавік?",
+  "confirmations.delete_list.title": "Выдаліць спіс?",
   "confirmations.discard_edit_media.confirm": "Адмяніць",
   "confirmations.discard_edit_media.message": "У вас ёсць незахаваныя змены ў апісанні або прэв'ю, усе роўна скасаваць іх?",
   "confirmations.edit.confirm": "Рэдагаваць",
   "confirmations.edit.message": "Калі вы зменіце зараз, гэта ператрэ паведамленне, якое вы пішаце. Вы ўпэўнены, што хочаце працягнуць?",
+  "confirmations.edit.title": "Замяніць допіс?",
   "confirmations.logout.confirm": "Выйсці",
   "confirmations.logout.message": "Вы ўпэўненыя, што хочаце выйсці?",
+  "confirmations.logout.title": "Выйсці?",
   "confirmations.mute.confirm": "Ігнараваць",
   "confirmations.redraft.confirm": "Выдаліць і перапісаць",
   "confirmations.redraft.message": "Вы ўпэўнены, што хочаце выдаліць допіс і перапісаць яго? Упадабанні і пашырэнні згубяцца, а адказы да арыгінальнага допісу асірацеюць.",
+  "confirmations.redraft.title": "Выдаліць і перапісаць допіс?",
   "confirmations.reply.confirm": "Адказаць",
   "confirmations.reply.message": "Калі вы адкажаце зараз, гэта ператрэ паведамленне, якое вы пішаце. Вы ўпэўнены, што хочаце працягнуць?",
+  "confirmations.reply.title": "Замяніць допіс?",
   "confirmations.unfollow.confirm": "Адпісацца",
   "confirmations.unfollow.message": "Вы ўпэўненыя, што хочаце адпісацца ад {name}?",
+  "confirmations.unfollow.title": "Адпісацца ад карыстальніка?",
   "conversation.delete": "Выдаліць размову",
   "conversation.mark_as_read": "Адзначыць прачытаным",
   "conversation.open": "Прагледзець размову",
@@ -293,6 +300,7 @@
   "filter_modal.select_filter.subtitle": "Скарыстайцеся існуючай катэгорыяй або стварыце новую",
   "filter_modal.select_filter.title": "Фільтраваць гэты допіс",
   "filter_modal.title.status": "Фільтраваць допіс",
+  "filtered_notifications_banner.pending_requests": "Ад {count, plural, =0 {# людзей якіх} one {# чалавека якіх} few {# чалавек якіх} many {# людзей якіх} other {# чалавека якіх}} вы магчыма ведаеце",
   "filtered_notifications_banner.title": "Адфільтраваныя апавяшчэнні",
   "firehose.all": "Усе",
   "firehose.local": "Гэты сервер",
@@ -341,7 +349,7 @@
   "hashtag.follow": "Падпісацца на хэштэг",
   "hashtag.unfollow": "Адпісацца ад хэштэга",
   "hashtags.and_other": "…і яшчэ {count, plural,  other {#}}",
-  "home.column_settings.show_reblogs": "Паказаць пашырэнні",
+  "home.column_settings.show_reblogs": "Паказваць пашырэнні",
   "home.column_settings.show_replies": "Паказваць адказы",
   "home.hide_announcements": "Схаваць аб'явы",
   "home.pending_critical_update.body": "Калі ласка, абнавіце свой сервер Mastodon як мага хутчэй!",
@@ -437,6 +445,8 @@
   "mute_modal.title": "Ігнараваць карыстальніка?",
   "mute_modal.you_wont_see_mentions": "Вы не ўбачыце паведамленняў са згадваннем карыстальніка.",
   "mute_modal.you_wont_see_posts": "Карыстальнік па-ранейшаму будзе бачыць вашыя паведамленні, але вы не будзеце паведамленні карыстальніка.",
+  "name_and_others": "{name} і {count, plural, one {# іншы} many {# іншых} other {# іншых}}",
+  "name_and_others_with_link": "{name} і <a>{count, plural, one {# іншы} many {# іншых} other {# іншых}}</a>",
   "navigation_bar.about": "Пра нас",
   "navigation_bar.advanced_interface": "Адкрыць у пашыраным вэб-інтэрфейсе",
   "navigation_bar.blocks": "Заблакіраваныя карыстальнікі",
@@ -464,6 +474,10 @@
   "navigation_bar.security": "Бяспека",
   "not_signed_in_indicator.not_signed_in": "Вам трэба ўвайсці каб атрымаць доступ да гэтага рэсурсу.",
   "notification.admin.report": "{name} паскардзіўся на {target}",
+  "notification.admin.report_account": "{name} паскардзіўся на {count, plural, one {# допіс} many {# допісаў} other {# допіса}} ад {target} з прычыны {category}",
+  "notification.admin.report_account_other": "{name} паскардзіўся на {count, plural, one {# допіс} many {# допісаў} other {# допіса}} ад {target}",
+  "notification.admin.report_statuses": "{name} паскардзіўся на {target} з прычыны {category}",
+  "notification.admin.report_statuses_other": "{name} паскардзіўся на {target}",
   "notification.admin.sign_up": "{name} зарэгістраваўся",
   "notification.favourite": "Ваш допіс упадабаны {name}",
   "notification.follow": "{name} падпісаўся на вас",
@@ -479,6 +493,8 @@
   "notification.moderation_warning.action_silence": "Ваш уліковы запіс быў абмежаваны.",
   "notification.moderation_warning.action_suspend": "Ваш уліковы запіс быў прыпынены.",
   "notification.own_poll": "Ваша апытанне скончылася",
+  "notification.poll": "Апытанне, дзе вы прынялі ўдзел, скончылася",
+  "notification.private_mention": "{name} згадаў вас асабіста",
   "notification.reblog": "{name} пашырыў ваш допіс",
   "notification.relationships_severance_event": "Страціў сувязь з {name}",
   "notification.relationships_severance_event.account_suspension": "Адміністратар з {from} прыпыніў працу {target}, што азначае, што вы больш не можаце атрымліваць ад іх абнаўлення ці ўзаемадзейнічаць з імі.",
@@ -489,13 +505,18 @@
   "notification.update": "Допіс {name} адрэдагаваны",
   "notification_requests.accept": "Прыняць",
   "notification_requests.dismiss": "Адхіліць",
+  "notification_requests.maximize": "Разгарнуць",
+  "notification_requests.minimize_banner": "Згарнуць банер адфільтраваных апавяшчэнняў",
   "notification_requests.notifications_from": "Апавяшчэнні ад {name}",
   "notification_requests.title": "Адфільтраваныя апавяшчэнні",
   "notifications.clear": "Ачысціць апавяшчэнні",
   "notifications.clear_confirmation": "Вы ўпэўнены, што жадаеце назаўсёды сцерці ўсё паведамленні?",
+  "notifications.clear_title": "Ачысціць апавяшчэнні?",
   "notifications.column_settings.admin.report": "Новыя скаргі:",
   "notifications.column_settings.admin.sign_up": "Новыя ўваходы:",
   "notifications.column_settings.alert": "Апавяшчэнні на працоўным стале",
+  "notifications.column_settings.beta.category": "Эксперыментальныя функцыі",
+  "notifications.column_settings.beta.grouping": "Групаваць апавяшчэннi",
   "notifications.column_settings.favourite": "Упадабанае:",
   "notifications.column_settings.filter_bar.advanced": "Паказаць усе катэгорыі",
   "notifications.column_settings.filter_bar.category": "Панэль хуткай фільтрацыі",
@@ -659,9 +680,13 @@
   "report.unfollow_explanation": "Вы падпісаныя на гэты ўліковы запіс. Каб не бачыць допісы з яго ў вашай стужцы, адпішыцеся.",
   "report_notification.attached_statuses": "{count, plural, one {{count} допіс прымацаваны} few {{count} допісы прымацаваны} many {{count} допісаў прымацавана} other {{count} допісу прымацавана}}",
   "report_notification.categories.legal": "Права",
+  "report_notification.categories.legal_sentence": "нелегальнае змесціва",
   "report_notification.categories.other": "Іншае",
+  "report_notification.categories.other_sentence": "іншае",
   "report_notification.categories.spam": "Спам",
+  "report_notification.categories.spam_sentence": "спам",
   "report_notification.categories.violation": "Парушэнне правілаў",
+  "report_notification.categories.violation_sentence": "парушэнне правілаў",
   "report_notification.open": "Адкрыць скаргу",
   "search.no_recent_searches": "Гісторыя пошуку пустая",
   "search.placeholder": "Пошук",
@@ -689,8 +714,11 @@
   "server_banner.about_active_users": "Людзі, якія карыстаюцца гэтым сервера на працягу апошніх 30 дзён (Штомесячна Актыўныя Карыстальнікі)",
   "server_banner.active_users": "актыўныя карыстальнікі",
   "server_banner.administered_by": "Адміністратар:",
+  "server_banner.is_one_of_many": "{domain} - гэта адзін з многіх незалежных сервераў Mastodon, якія вы можаце выкарыстоўваць для ўдзелу ў fediverse.",
   "server_banner.server_stats": "Статыстыка сервера:",
   "sign_in_banner.create_account": "Стварыць уліковы запіс",
+  "sign_in_banner.follow_anyone": "Сачыце за кім заўгодна ва ўсім fediverse і глядзіце ўсё ў храналагічным парадку. Ніякіх алгарытмаў, рэкламы або клікбэйту.",
+  "sign_in_banner.mastodon_is": "Mastodon - лепшы спосаб быць у курсе ўсяго, што адбываецца.",
   "sign_in_banner.sign_in": "Увайсці",
   "sign_in_banner.sso_redirect": "Уваход ці рэгістрацыя",
   "status.admin_account": "Адкрыць інтэрфейс мадэратара для @{name}",
@@ -765,8 +793,8 @@
   "time_remaining.seconds": "{number, plural, one {засталася # секунда} few {засталося # секунды} many {засталося # секунд} other {засталося # секунды}}",
   "timeline_hint.remote_resource_not_displayed": "{resource} з іншых сервераў не адлюстроўваецца.",
   "timeline_hint.resources.followers": "Падпісчыкі",
-  "timeline_hint.resources.follows": "Падпісаны на",
-  "timeline_hint.resources.statuses": "Старэйшыя допісы",
+  "timeline_hint.resources.follows": "Падпіскі",
+  "timeline_hint.resources.statuses": "Старыя допісы",
   "trends.counter_by_accounts": "{count, plural, one {{counter} чалавек} few {{counter} чалавекі} many {{counter} людзей} other {{counter} чалавек}} за {days, plural, one {{days} апошні дзень} few {{days} апошнія дні} many {{days} апошніх дзён} other {{days} апошніх дзён}}",
   "trends.trending_now": "Актуальнае",
   "ui.beforeunload": "Ваш чарнавік знішчыцца калі вы пакінеце Mastodon.",
diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json
index 657341d253e3ac..98581306682152 100644
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@@ -505,6 +505,8 @@
   "notification.update": "{name} промени публикация",
   "notification_requests.accept": "Приемам",
   "notification_requests.dismiss": "Отхвърлям",
+  "notification_requests.maximize": "Максимизиране",
+  "notification_requests.minimize_banner": "Минимизиране на банера за филтрирани известия",
   "notification_requests.notifications_from": "Известия от {name}",
   "notification_requests.title": "Филтрирани известия",
   "notifications.clear": "Изчистване на известията",
diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index 2ef926054ef42e..b52f5977119e4c 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -505,6 +505,8 @@
   "notification.update": "{name} ha editat un tut",
   "notification_requests.accept": "Accepta",
   "notification_requests.dismiss": "Ignora",
+  "notification_requests.maximize": "Maximitza",
+  "notification_requests.minimize_banner": "Minimitza el bàner de notificacions filtrades",
   "notification_requests.notifications_from": "Notificacions de {name}",
   "notification_requests.title": "Notificacions filtrades",
   "notifications.clear": "Esborra les notificacions",
diff --git a/app/javascript/mastodon/locales/cs.json b/app/javascript/mastodon/locales/cs.json
index a5c90befe366ea..2afbbfb6733195 100644
--- a/app/javascript/mastodon/locales/cs.json
+++ b/app/javascript/mastodon/locales/cs.json
@@ -171,21 +171,28 @@
   "confirmations.block.confirm": "Blokovat",
   "confirmations.delete.confirm": "Smazat",
   "confirmations.delete.message": "Opravdu chcete smazat tento příspěvek?",
+  "confirmations.delete.title": "Smazat příspěvek?",
   "confirmations.delete_list.confirm": "Smazat",
   "confirmations.delete_list.message": "Opravdu chcete tento seznam navždy smazat?",
+  "confirmations.delete_list.title": "Smazat seznam?",
   "confirmations.discard_edit_media.confirm": "Zahodit",
   "confirmations.discard_edit_media.message": "Máte neuložené změny popisku médií nebo náhledu, chcete je přesto zahodit?",
   "confirmations.edit.confirm": "Upravit",
   "confirmations.edit.message": "Editovat teď znamená přepsání zprávy, kterou právě tvoříte. Opravdu chcete pokračovat?",
+  "confirmations.edit.title": "Přepsat příspěvek?",
   "confirmations.logout.confirm": "Odhlásit se",
   "confirmations.logout.message": "Opravdu se chcete odhlásit?",
+  "confirmations.logout.title": "Odhlásit se?",
   "confirmations.mute.confirm": "Skrýt",
   "confirmations.redraft.confirm": "Smazat a přepsat",
   "confirmations.redraft.message": "Jste si jistí, že chcete odstranit tento příspěvek a vytvořit z něj koncept? Oblíbené a boosty budou ztraceny a odpovědi na původní příspěvek ztratí kontext.",
+  "confirmations.redraft.title": "Smazat a přepracovat příspěvek na koncept?",
   "confirmations.reply.confirm": "Odpovědět",
   "confirmations.reply.message": "Odpověď přepíše vaši rozepsanou zprávu. Opravdu chcete pokračovat?",
+  "confirmations.reply.title": "Přepsat příspěvek?",
   "confirmations.unfollow.confirm": "Přestat sledovat",
   "confirmations.unfollow.message": "Opravdu chcete {name} přestat sledovat?",
+  "confirmations.unfollow.title": "Přestat sledovat uživatele?",
   "conversation.delete": "Smazat konverzaci",
   "conversation.mark_as_read": "Označit jako přečtené",
   "conversation.open": "Zobrazit konverzaci",
@@ -479,6 +486,7 @@
   "notification.moderation_warning.action_silence": "Váš účet byl omezen.",
   "notification.moderation_warning.action_suspend": "Váš účet byl pozastaven.",
   "notification.own_poll": "Vaše anketa skončila",
+  "notification.poll": "Anketa, ve které jste hlasovali, skončila",
   "notification.reblog": "Uživatel {name} boostnul váš příspěvek",
   "notification.relationships_severance_event": "Kontakt ztracen s {name}",
   "notification.relationships_severance_event.account_suspension": "Administrátor z {from} pozastavil {target}, což znamená, že již od nich nemůžete přijímat aktualizace nebo s nimi interagovat.",
@@ -489,13 +497,17 @@
   "notification.update": "Uživatel {name} upravil příspěvek",
   "notification_requests.accept": "Přijmout",
   "notification_requests.dismiss": "Zamítnout",
+  "notification_requests.maximize": "Maximalizovat",
+  "notification_requests.minimize_banner": "Minimalizovat banner filtrovaných oznámení",
   "notification_requests.notifications_from": "Oznámení od {name}",
   "notification_requests.title": "Vyfiltrovaná oznámení",
   "notifications.clear": "Vyčistit oznámení",
   "notifications.clear_confirmation": "Opravdu chcete trvale smazat všechna vaše oznámení?",
+  "notifications.clear_title": "Vyčistit oznámení?",
   "notifications.column_settings.admin.report": "Nová hlášení:",
   "notifications.column_settings.admin.sign_up": "Nové registrace:",
   "notifications.column_settings.alert": "Oznámení na počítači",
+  "notifications.column_settings.beta.category": "Experimentální funkce",
   "notifications.column_settings.favourite": "Oblíbené:",
   "notifications.column_settings.filter_bar.advanced": "Zobrazit všechny kategorie",
   "notifications.column_settings.filter_bar.category": "Panel rychlého filtrování",
@@ -659,9 +671,13 @@
   "report.unfollow_explanation": "Tento účet sledujete. Abyste už neviděli jeho příspěvky ve své domovské časové ose, přestaňte jej sledovat.",
   "report_notification.attached_statuses": "{count, plural, one {{count} připojený příspěvek} few {{count} připojené příspěvky} many {{count} připojených příspěvků} other {{count} připojených příspěvků}}",
   "report_notification.categories.legal": "Právní ustanovení",
+  "report_notification.categories.legal_sentence": "nezákonný obsah",
   "report_notification.categories.other": "Ostatní",
+  "report_notification.categories.other_sentence": "další",
   "report_notification.categories.spam": "Spam",
+  "report_notification.categories.spam_sentence": "spam",
   "report_notification.categories.violation": "Porušení pravidla",
+  "report_notification.categories.violation_sentence": "porušení pravidla",
   "report_notification.open": "Otevřít hlášení",
   "search.no_recent_searches": "Žádná nedávná vyhledávání",
   "search.placeholder": "Hledat",
diff --git a/app/javascript/mastodon/locales/cy.json b/app/javascript/mastodon/locales/cy.json
index 45fdbfef3ab034..a5f81aad702b6c 100644
--- a/app/javascript/mastodon/locales/cy.json
+++ b/app/javascript/mastodon/locales/cy.json
@@ -3,7 +3,7 @@
   "about.contact": "Cysylltwch â:",
   "about.disclaimer": "Mae Mastodon yn feddalwedd cod agored rhydd ac o dan hawlfraint Mastodon gGmbH.",
   "about.domain_blocks.no_reason_available": "Nid yw'r rheswm ar gael",
-  "about.domain_blocks.preamble": "Fel rheol, mae Mastodon yn caniatáu i chi weld cynnwys gan unrhyw weinyddwr arall yn y ffederasiwn a rhyngweithio â hi. Dyma'r eithriadau a wnaed ar y gweinydd penodol hwn.",
+  "about.domain_blocks.preamble": "Fel rheol, mae Mastodon yn caniatáu i chi weld cynnwys gan unrhyw weinyddwr arall yn y ffedysawd a rhyngweithio â hi. Dyma'r eithriadau a wnaed ar y gweinydd penodol hwn.",
   "about.domain_blocks.silenced.explanation": "Fel rheol, fyddwch chi ddim yn gweld proffiliau a chynnwys o'r gweinydd hwn, oni bai eich bod yn chwilio'n benodol amdano neu yn ymuno drwy ei ddilyn.",
   "about.domain_blocks.silenced.title": "Cyfyngedig",
   "about.domain_blocks.suspended.explanation": "Ni fydd data o'r gweinydd hwn yn cael ei brosesu, ei gadw na'i gyfnewid, gan wneud unrhyw ryngweithio neu gyfathrebu gyda defnyddwyr o'r gweinydd hwn yn amhosibl.",
@@ -503,6 +503,7 @@
   "notification.update": "Golygodd {name} bostiad",
   "notification_requests.accept": "Derbyn",
   "notification_requests.dismiss": "Cau",
+  "notification_requests.maximize": "Mwyhau",
   "notification_requests.notifications_from": "Hysbysiadau gan {name}",
   "notification_requests.title": "Hysbysiadau wedi'u hidlo",
   "notifications.clear": "Clirio hysbysiadau",
@@ -710,8 +711,11 @@
   "server_banner.about_active_users": "Pobl sy'n defnyddio'r gweinydd hwn yn ystod y 30 diwrnod diwethaf (Defnyddwyr Gweithredol Misol)",
   "server_banner.active_users": "defnyddwyr gweithredol",
   "server_banner.administered_by": "Gweinyddir gan:",
+  "server_banner.is_one_of_many": "Mae {domain} yn un o'r nifer o weinyddion Mastodon annibynnol y gallwch eu defnyddio i gymryd rhan yn y ffedysawd.",
   "server_banner.server_stats": "Ystadegau'r gweinydd:",
   "sign_in_banner.create_account": "Creu cyfrif",
+  "sign_in_banner.follow_anyone": "Dilynwch unrhyw un ar draws y ffedysawd a gweld y cyfan mewn trefn gronolegol. Dim algorithmau, hysbysebion, na straeon er mwyn cliciadau yn y golwg.",
+  "sign_in_banner.mastodon_is": "Mastodon yw'r ffordd orau o gadw i fyny â'r hyn sy'n digwydd.",
   "sign_in_banner.sign_in": "Mewngofnodi",
   "sign_in_banner.sso_redirect": "Mewngofnodi neu Gofrestru",
   "status.admin_account": "Agor rhyngwyneb cymedroli ar gyfer @{name}",
diff --git a/app/javascript/mastodon/locales/da.json b/app/javascript/mastodon/locales/da.json
index 42deb4f42502c5..2ad5bdc9658902 100644
--- a/app/javascript/mastodon/locales/da.json
+++ b/app/javascript/mastodon/locales/da.json
@@ -505,6 +505,8 @@
   "notification.update": "{name} redigerede et indlæg",
   "notification_requests.accept": "Acceptér",
   "notification_requests.dismiss": "Afvis",
+  "notification_requests.maximize": "Maksimér",
+  "notification_requests.minimize_banner": "Minimér filtrerede notifikationsbanner",
   "notification_requests.notifications_from": "Notifikationer fra {name}",
   "notification_requests.title": "Filtrerede notifikationer",
   "notifications.clear": "Ryd notifikationer",
diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json
index d718135494c14b..52a2cf2b9bc713 100644
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@@ -505,6 +505,8 @@
   "notification.update": "{name} bearbeitete einen Beitrag",
   "notification_requests.accept": "Akzeptieren",
   "notification_requests.dismiss": "Ablehnen",
+  "notification_requests.maximize": "Maximieren",
+  "notification_requests.minimize_banner": "Banner für gefilterte Benachrichtigungen minimieren",
   "notification_requests.notifications_from": "Benachrichtigungen von {name}",
   "notification_requests.title": "Gefilterte Benachrichtigungen",
   "notifications.clear": "Benachrichtigungen löschen",
@@ -687,7 +689,7 @@
   "report_notification.categories.violation_sentence": "Regelverletzung",
   "report_notification.open": "Meldung öffnen",
   "search.no_recent_searches": "Keine früheren Suchanfragen",
-  "search.placeholder": "Suche",
+  "search.placeholder": "Suchen",
   "search.quick_action.account_search": "Profile passend zu {x}",
   "search.quick_action.go_to_account": "Profil {x} aufrufen",
   "search.quick_action.go_to_hashtag": "Hashtag {x} aufrufen",
diff --git a/app/javascript/mastodon/locales/es-AR.json b/app/javascript/mastodon/locales/es-AR.json
index 9a5405edbec972..2a86e789a45954 100644
--- a/app/javascript/mastodon/locales/es-AR.json
+++ b/app/javascript/mastodon/locales/es-AR.json
@@ -505,6 +505,8 @@
   "notification.update": "{name} editó un mensaje",
   "notification_requests.accept": "Aceptar",
   "notification_requests.dismiss": "Descartar",
+  "notification_requests.maximize": "Maximizar",
+  "notification_requests.minimize_banner": "Minimizar la barra de notificaciones filtradas",
   "notification_requests.notifications_from": "Notificaciones de {name}",
   "notification_requests.title": "Notificaciones filtradas",
   "notifications.clear": "Limpiar notificaciones",
diff --git a/app/javascript/mastodon/locales/fa.json b/app/javascript/mastodon/locales/fa.json
index 28b4a29cb9efed..414e453fa3b792 100644
--- a/app/javascript/mastodon/locales/fa.json
+++ b/app/javascript/mastodon/locales/fa.json
@@ -86,6 +86,10 @@
   "announcement.announcement": "اعلامیه",
   "attachments_list.unprocessed": "(پردازش نشده)",
   "audio.hide": "نهفتن صدا",
+  "block_modal.show_less": "نمایش کم‌تر",
+  "block_modal.show_more": "نمایش بیش‌تر",
+  "block_modal.title": "انسداد کاربر؟",
+  "block_modal.you_wont_see_mentions": "فرسته‌هایی که از اون نام برده را نخواهید دید.",
   "boost_modal.combo": "دکمهٔ {combo} را بزنید تا دیگر این را نبینید",
   "bundle_column_error.copy_stacktrace": "رونوشت از گزارش خطا",
   "bundle_column_error.error.body": "صفحهٔ درخواستی نتوانست پرداخت شود. ممکن است به خاطر اشکالی در کدمان یا مشکل سازگاری مرورگر باشد.",
@@ -160,21 +164,28 @@
   "confirmations.block.confirm": "انسداد",
   "confirmations.delete.confirm": "حذف",
   "confirmations.delete.message": "آیا مطمئنید که می‌خواهید این فرسته را حذف کنید؟",
+  "confirmations.delete.title": "حذف فرسته؟",
   "confirmations.delete_list.confirm": "حذف",
   "confirmations.delete_list.message": "مطمئنید می‌خواهید این سیاهه را برای همیشه حذف کنید؟",
+  "confirmations.delete_list.title": "حذف سیاهه؟",
   "confirmations.discard_edit_media.confirm": "دور انداختن",
   "confirmations.discard_edit_media.message": "تغییرات ذخیره نشده‌ای در توضیحات یا پیش‌نمایش رسانه دارید. همگی نادیده گرفته شوند؟",
   "confirmations.edit.confirm": "ویرایش",
   "confirmations.edit.message": "در صورت ویرایش، پیامی که در حال نوشتنش بودید از بین خواهد رفت. می‌خواهید ادامه دهید؟",
+  "confirmations.edit.title": "رونویسی فرسته؟",
   "confirmations.logout.confirm": "خروج از حساب",
   "confirmations.logout.message": "مطمئنید می‌خواهید خارج شوید؟",
+  "confirmations.logout.title": "خروج؟",
   "confirmations.mute.confirm": "خموش",
   "confirmations.redraft.confirm": "حذف و بازنویسی",
   "confirmations.redraft.message": "مطمئنید که می‌خواهید این فرسته را حذف کنید و از نو بنویسید؟ با این کار تقویت‌ها و پسندهایش از دست رفته و پاسخ‌ها به آن بی‌مرجع می‌شود.",
+  "confirmations.redraft.title": "حذف و پیش‌نویسی دوبارهٔ فرسته؟",
   "confirmations.reply.confirm": "پاسخ",
   "confirmations.reply.message": "اگر الان پاسخ دهید، چیزی که در حال نوشتنش بودید پاک خواهد شد. می‌خواهید ادامه دهید؟",
+  "confirmations.reply.title": "رونویسی فرسته؟",
   "confirmations.unfollow.confirm": "پی‌نگرفتن",
   "confirmations.unfollow.message": "مطمئنید که می‌خواهید به پی‌گیری از {name} پایان دهید؟",
+  "confirmations.unfollow.title": "ناپی‌گیری کاربر؟",
   "conversation.delete": "حذف گفتگو",
   "conversation.mark_as_read": "علامت‌گذاری به عنوان خوانده شده",
   "conversation.open": "دیدن گفتگو",
@@ -194,6 +205,10 @@
   "dismissable_banner.explore_statuses": "هم‌اکنون این فرسته‌ها از این کارساز و دیگر کارسازهای شبکهٔ نامتمرکز داغ شده‌اند.",
   "dismissable_banner.explore_tags": "هم‌اکنون این برچسب‌ها بین افراد این کارساز و دیگر کارسازهای شبکهٔ نامتمرکز داغ شده‌اند.",
   "dismissable_banner.public_timeline": "این‌ها جدیدترین فرسته‌های عمومی از افرادی روی وب اجتماعیند که اعضای {domain} پی می‌گیرندشان.",
+  "domain_block_modal.block": "انسداد کارساز",
+  "domain_block_modal.title": "انسداد دامنه؟",
+  "domain_pill.server": "کارساز",
+  "domain_pill.username": "نام کاربری",
   "embed.instructions": "جاسازی این فرسته روی پایگاهتان با رونوشت کردن کد زیر.",
   "embed.preview": "این گونه دیده خواهد شد:",
   "emoji_button.activity": "فعالیت",
@@ -388,6 +403,8 @@
   "loading_indicator.label": "در حال بارگذاری…",
   "media_gallery.toggle_visible": "{number, plural, one {نهفتن تصویر} other {نهفتن تصاویر}}",
   "moved_to_account_banner.text": "حسابتان {disabledAccount} اکنون از کار افتاده؛ چرا که به {movedToAccount} منتقل شدید.",
+  "mute_modal.show_options": "نمایش گزینه‌ها",
+  "mute_modal.title": "خموشی کاربر؟",
   "navigation_bar.about": "درباره",
   "navigation_bar.advanced_interface": "بازکردن در رابط کاربری وب پیشرفته",
   "navigation_bar.blocks": "کاربران مسدود شده",
@@ -420,15 +437,21 @@
   "notification.follow": "‫{name}‬ پی‌گیرتان شد",
   "notification.follow_request": "{name} درخواست پی‌گیریتان را داد",
   "notification.mention": "‫{name}‬ به شما اشاره کرد",
+  "notification.moderation-warning.learn_more": "بیشتر بدانید",
   "notification.own_poll": "نظرسنجیتان پایان یافت",
   "notification.reblog": "‫{name}‬ فرسته‌تان را تقویت کرد",
+  "notification.relationships_severance_event.learn_more": "بیشتر بدانید",
   "notification.status": "{name} چیزی فرستاد",
   "notification.update": "{name} فرسته‌ای را ویرایش کرد",
+  "notification_requests.accept": "پذیرش",
+  "notification_requests.dismiss": "دورانداختن",
+  "notification_requests.maximize": "بیشنه",
   "notifications.clear": "پاک‌سازی آگاهی‌ها",
   "notifications.clear_confirmation": "مطمئنید می‌خواهید همهٔ آگاهی‌هایتان را برای همیشه پاک کنید؟",
   "notifications.column_settings.admin.report": "گزارش‌های جدید:",
   "notifications.column_settings.admin.sign_up": "ثبت نام‌های جدید:",
   "notifications.column_settings.alert": "آگاهی‌های میزکار",
+  "notifications.column_settings.beta.category": "ویژگی‌های آزمایشی",
   "notifications.column_settings.favourite": "برگزیده‌ها:",
   "notifications.column_settings.follow": "پی‌گیرندگان جدید:",
   "notifications.column_settings.follow_request": "درخواست‌های جدید پی‌گیری:",
@@ -583,8 +606,11 @@
   "report.unfollow_explanation": "شما این حساب را پی‌گرفته‌اید، برای اینکه دیگر فرسته‌هایش را در خوراک خانه‌تان نبینید؛ آن را پی‌نگیرید.",
   "report_notification.attached_statuses": "{count, plural, one {{count} فرسته} other {{count} فرسته}} پیوست شده",
   "report_notification.categories.legal": "قانونی",
+  "report_notification.categories.legal_sentence": "محتوای غیرقانونی",
   "report_notification.categories.other": "دیگر",
+  "report_notification.categories.other_sentence": "دیگر",
   "report_notification.categories.spam": "هرزنامه",
+  "report_notification.categories.spam_sentence": "هرزنامه",
   "report_notification.categories.violation": "تخطّی از قانون",
   "report_notification.open": "گشودن گزارش",
   "search.no_recent_searches": "جست‌وجوی اخیری نیست",
diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index 168c2de410268b..ae1ccc0a3c49b6 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -3,7 +3,7 @@
   "about.contact": "Yhteydenotto:",
   "about.disclaimer": "Mastodon on vapaa avoimen lähdekoodin ohjelmisto ja Mastodon gGmbH:n tavaramerkki.",
   "about.domain_blocks.no_reason_available": "Syy ei ole tiedossa",
-  "about.domain_blocks.preamble": "Mastodonin avulla voidaan yleensä tarkastella minkä tahansa fediversumiin kuuluvan palvelimen sisältöä, ja olla yhteyksissä eri palvelinten käyttäjien kanssa. Nämä poikkeukset koskevat yksin tätä palvelinta.",
+  "about.domain_blocks.preamble": "Mastodonin avulla voi yleensä tarkastella minkä tahansa fediversumiin kuuluvan palvelimen sisältöä ja olla yhteyksissä eri palvelinten käyttäjien kanssa. Nämä poikkeukset koskevat yksin tätä palvelinta.",
   "about.domain_blocks.silenced.explanation": "Et yleensä näe tämän palvelimen profiileja ja sisältöä, jollet erityisesti etsi juuri sitä tai liity siihen seuraamalla.",
   "about.domain_blocks.silenced.title": "Rajoitettu",
   "about.domain_blocks.suspended.explanation": "Mitään tämän palvelimen tietoja ei käsitellä, tallenneta eikä vaihdeta, mikä tekee vuorovaikutuksesta ja viestinnästä sen käyttäjien kanssa mahdotonta.",
@@ -30,7 +30,7 @@
   "account.endorse": "Suosittele profiilissasi",
   "account.featured_tags.last_status_at": "Viimeisin julkaisu {date}",
   "account.featured_tags.last_status_never": "Ei julkaisuja",
-  "account.featured_tags.title": "Käyttäjän {name} esille nostamat aihetunnisteet",
+  "account.featured_tags.title": "Käyttäjän {name} suosittelemat aihetunnisteet",
   "account.follow": "Seuraa",
   "account.follow_back": "Seuraa takaisin",
   "account.followers": "Seuraajat",
@@ -143,7 +143,7 @@
   "community.column_settings.media_only": "Vain media",
   "community.column_settings.remote_only": "Vain etätilit",
   "compose.language.change": "Vaihda kieli",
-  "compose.language.search": "Hae kieliä...",
+  "compose.language.search": "Hae kieliä…",
   "compose.published.body": "Julkaisu lähetetty.",
   "compose.published.open": "Avaa",
   "compose.saved.body": "Julkaisu tallennettu.",
@@ -228,8 +228,8 @@
   "domain_pill.their_username": "Hänen yksilöllinen tunnisteensa omalla palvelimellaan. Eri palvelimilta on mahdollista löytää käyttäjiä, joilla on sama käyttäjänimi.",
   "domain_pill.username": "Käyttäjänimi",
   "domain_pill.whats_in_a_handle": "Mitä käyttäjätunnuksessa on?",
-  "domain_pill.who_they_are": "Koska käyttäjätunnukset kertovat, kuka ja missä joku on, voit olla vuorovaikutuksessa ihmisten kanssa kaikkialla sosiaalisessa verkossa, joka koostuu <button>ActivityPub-pohjaisista alustoista</button>.",
-  "domain_pill.who_you_are": "Koska käyttäjätunnuksesi kertoo, kuka ja missä olet, ihmiset voivat olla vaikutuksessa kanssasi kaikkialla sosiaalisessa verkossa, joka koostuu <button>ActivityPub-pohjaisista alustoista</button>.",
+  "domain_pill.who_they_are": "Koska käyttäjätunnukset kertovat, kuka ja missä joku on, voit olla vuorovaikutuksessa käyttäjien kanssa kaikkialla sosiaalisessa verkossa, joka koostuu <button>ActivityPub-pohjaisista alustoista</button>.",
+  "domain_pill.who_you_are": "Koska käyttäjätunnuksesi kertoo, kuka ja missä olet, käyttäjät voivat olla vaikutuksessa kanssasi kaikkialla sosiaalisessa verkossa, joka koostuu <button>ActivityPub-pohjaisista alustoista</button>.",
   "domain_pill.your_handle": "Käyttäjätunnuksesi:",
   "domain_pill.your_server": "Digitaalinen kotisi, jossa kaikki julkaisusi sijaitsevat. Etkö pidä tästä? Siirry palvelimelta toiselle milloin tahansa ja tuo myös seuraajasi mukanasi.",
   "domain_pill.your_username": "Yksilöllinen tunnisteesi tällä palvelimella. Eri palvelimilta on mahdollista löytää käyttäjiä, joilla on sama käyttäjänimi.",
@@ -246,7 +246,7 @@
   "emoji_button.objects": "Esineet",
   "emoji_button.people": "Ihmiset",
   "emoji_button.recent": "Usein käytetyt",
-  "emoji_button.search": "Hae...",
+  "emoji_button.search": "Hae…",
   "emoji_button.search_results": "Hakutulokset",
   "emoji_button.symbols": "Symbolit",
   "emoji_button.travel": "Matkailu ja paikat",
@@ -279,7 +279,7 @@
   "errors.unexpected_crash.copy_stacktrace": "Kopioi pinon jäljitys leikepöydälle",
   "errors.unexpected_crash.report_issue": "Ilmoita ongelmasta",
   "explore.search_results": "Hakutulokset",
-  "explore.suggested_follows": "Henkilöt",
+  "explore.suggested_follows": "Käyttäjät",
   "explore.title": "Selaa",
   "explore.trending_links": "Uutiset",
   "explore.trending_statuses": "Julkaisut",
@@ -381,7 +381,7 @@
   "keyboard_shortcuts.compose": "Kohdista kirjoituskenttään",
   "keyboard_shortcuts.description": "Kuvaus",
   "keyboard_shortcuts.direct": "Avaa yksityismainintojen sarake",
-  "keyboard_shortcuts.down": "Siirry listassa alaspäin",
+  "keyboard_shortcuts.down": "Siirry luettelossa eteenpäin",
   "keyboard_shortcuts.enter": "Avaa julkaisu",
   "keyboard_shortcuts.favourite": "Lisää julkaisu suosikkeihin",
   "keyboard_shortcuts.favourites": "Avaa suosikkiluettelo",
@@ -401,13 +401,13 @@
   "keyboard_shortcuts.reply": "Vastaa julkaisuun",
   "keyboard_shortcuts.requests": "Avaa seurantapyyntöjen luettelo",
   "keyboard_shortcuts.search": "Kohdista hakukenttään",
-  "keyboard_shortcuts.spoilers": "Näytä/piilota sisältövaroituskenttä",
+  "keyboard_shortcuts.spoilers": "Näytä tai piilota sisältövaroituskenttä",
   "keyboard_shortcuts.start": "Avaa Näin pääset alkuun -sarake",
-  "keyboard_shortcuts.toggle_hidden": "Näytä/piilota sisältövaroituksella merkitty teksti",
-  "keyboard_shortcuts.toggle_sensitivity": "Näytä/piilota media",
+  "keyboard_shortcuts.toggle_hidden": "Näytä tai piilota sisältövaroituksella merkitty teksti",
+  "keyboard_shortcuts.toggle_sensitivity": "Näytä tai piilota media",
   "keyboard_shortcuts.toot": "Luo uusi julkaisu",
-  "keyboard_shortcuts.unfocus": "Poistu teksti-/hakukentästä",
-  "keyboard_shortcuts.up": "Siirry listassa ylöspäin",
+  "keyboard_shortcuts.unfocus": "Poistu kirjoitus- tai hakukentästä",
+  "keyboard_shortcuts.up": "Siirry luettelossa taaksepäin",
   "lightbox.close": "Sulje",
   "lightbox.compress": "Tiivis kuvankatselunäkymä",
   "lightbox.expand": "Laajennettu kuvankatselunäkymä",
@@ -415,7 +415,7 @@
   "lightbox.previous": "Edellinen",
   "limited_account_hint.action": "Näytä profiili joka tapauksessa",
   "limited_account_hint.title": "Palvelimen {domain} moderaattorit ovat piilottaneet tämän profiilin.",
-  "link_preview.author": "Julkaissut {name}",
+  "link_preview.author": "Tehnyt {name}",
   "link_preview.more_from_author": "Lisää tekijältä {name}",
   "link_preview.shares": "{count, plural, one {{counter} julkaisu} other {{counter} julkaisua}}",
   "lists.account.add": "Lisää listalle",
@@ -453,7 +453,7 @@
   "navigation_bar.bookmarks": "Kirjanmerkit",
   "navigation_bar.community_timeline": "Paikallinen aikajana",
   "navigation_bar.compose": "Luo uusi julkaisu",
-  "navigation_bar.direct": "Yksityiset maininnat",
+  "navigation_bar.direct": "Yksityismaininnat",
   "navigation_bar.discover": "Löydä uutta",
   "navigation_bar.domain_blocks": "Estetyt verkkotunnukset",
   "navigation_bar.explore": "Selaa",
@@ -505,6 +505,8 @@
   "notification.update": "{name} muokkasi julkaisua",
   "notification_requests.accept": "Hyväksy",
   "notification_requests.dismiss": "Hylkää",
+  "notification_requests.maximize": "Suurenna",
+  "notification_requests.minimize_banner": "Pienennä suodatettujen ilmoitusten palkki",
   "notification_requests.notifications_from": "Ilmoitukset käyttäjältä {name}",
   "notification_requests.title": "Suodatetut ilmoitukset",
   "notifications.clear": "Tyhjennä ilmoitukset",
@@ -581,7 +583,7 @@
   "onboarding.start.lead": "Uusi Mastodon-tilisi on nyt valmiina käyttöön. Kyseessä on ainutlaatuinen, hajautettu sosiaalisen median alusta, jolla sinä itse – algoritmin sijaan – määrität käyttökokemuksesi. Näin hyödyt Mastodonista eniten:",
   "onboarding.start.skip": "Haluatko hypätä suoraan eteenpäin ilman alkuunpääsyohjeistuksia?",
   "onboarding.start.title": "Olet tehnyt sen!",
-  "onboarding.steps.follow_people.body": "Mastodon perustuu sinua kiinnostavien henkilöjen julkaisujen seuraamiseen.",
+  "onboarding.steps.follow_people.body": "Mastodonissa on kyse kiinnostavien käyttäjien seuraamisesta.",
   "onboarding.steps.follow_people.title": "Mukauta kotisyötettäsi",
   "onboarding.steps.publish_status.body": "Tervehdi maailmaa sanoin, kuvin tai äänestyksin {emoji}",
   "onboarding.steps.publish_status.title": "Laadi ensimmäinen julkaisusi",
@@ -596,10 +598,10 @@
   "password_confirmation.exceeds_maxlength": "Salasanan vahvistus ylittää salasanan enimmäispituuden",
   "password_confirmation.mismatching": "Salasanan vahvistus ei täsmää",
   "picture_in_picture.restore": "Laita se takaisin",
-  "poll.closed": "Suljettu",
+  "poll.closed": "Päättynyt",
   "poll.refresh": "Päivitä",
   "poll.reveal": "Näytä tulokset",
-  "poll.total_people": "{count, plural, one {# henkilö} other {# henkilöä}}",
+  "poll.total_people": "{count, plural, one {# käyttäjä} other {# käyttäjää}}",
   "poll.total_votes": "{count, plural, one {# ääni} other {# ääntä}}",
   "poll.vote": "Äänestä",
   "poll.voted": "Äänestit tätä vastausta",
@@ -608,7 +610,7 @@
   "poll_button.remove_poll": "Poista äänestys",
   "privacy.change": "Muuta julkaisun näkyvyyttä",
   "privacy.direct.long": "Kaikki tässä julkaisussa mainitut",
-  "privacy.direct.short": "Tietyt henkilöt",
+  "privacy.direct.short": "Tietyt käyttäjät",
   "privacy.private.long": "Vain seuraajasi",
   "privacy.private.short": "Seuraajat",
   "privacy.public.long": "Kuka tahansa Mastodonissa ja sen ulkopuolella",
@@ -730,7 +732,7 @@
   "status.delete": "Poista",
   "status.detailed_status": "Yksityiskohtainen keskustelunäkymä",
   "status.direct": "Mainitse @{name} yksityisesti",
-  "status.direct_indicator": "Yksityinen maininta",
+  "status.direct_indicator": "Yksityismaininta",
   "status.edit": "Muokkaa",
   "status.edited": "Viimeksi muokattu {date}",
   "status.edited_x_times": "Muokattu {count, plural, one {{count} kerran} other {{count} kertaa}}",
@@ -781,7 +783,7 @@
   "status.unpin": "Irrota profiilista",
   "subscribed_languages.lead": "Vain valituilla kielillä kirjoitetut julkaisut näkyvät koti- ja lista-aikajanoillasi muutoksen jälkeen. Älä valitse mitään, jos haluat nähdä julkaisuja kaikilla kielillä.",
   "subscribed_languages.save": "Tallenna muutokset",
-  "subscribed_languages.target": "Vaihda tilatut kielet {target}",
+  "subscribed_languages.target": "Vaihda tilattuja kieliä käyttäjältä {target}",
   "tabs_bar.home": "Koti",
   "tabs_bar.notifications": "Ilmoitukset",
   "time_remaining.days": "{number, plural, one {# päivä} other {# päivää}} jäljellä",
@@ -793,7 +795,7 @@
   "timeline_hint.resources.followers": "seuraajat",
   "timeline_hint.resources.follows": "seuratut",
   "timeline_hint.resources.statuses": "vanhemmat julkaisut",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} henkilö} other {{counter} henkilöä}} {days, plural, one {viime päivänä} other {viimeisenä {days} päivänä}}",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} käyttäjä} other {{counter} käyttäjää}} {days, plural, one {viime päivänä} other {viimeisenä {days} päivänä}}",
   "trends.trending_now": "Suosittua nyt",
   "ui.beforeunload": "Luonnos häviää, jos poistut Mastodonista.",
   "units.short.billion": "{count} mrd.",
@@ -818,7 +820,7 @@
   "upload_modal.hint": "Napsauta tai vedä ympyrä esikatselussa valitaksesi keskipiste, joka näkyy aina pienoiskuvissa.",
   "upload_modal.preparing_ocr": "Valmistellaan tekstintunnistusta…",
   "upload_modal.preview_label": "Esikatselu ({ratio})",
-  "upload_progress.label": "Lähetetään...",
+  "upload_progress.label": "Lähetetään…",
   "upload_progress.processing": "Käsitellään…",
   "username.taken": "Tämä käyttäjänimi on jo käytössä. Kokeile toista",
   "video.close": "Sulje video",
diff --git a/app/javascript/mastodon/locales/fo.json b/app/javascript/mastodon/locales/fo.json
index a9004ea189e3d3..5f7062b11af98c 100644
--- a/app/javascript/mastodon/locales/fo.json
+++ b/app/javascript/mastodon/locales/fo.json
@@ -505,6 +505,7 @@
   "notification.update": "{name} rættaði ein post",
   "notification_requests.accept": "Góðtak",
   "notification_requests.dismiss": "Avvís",
+  "notification_requests.maximize": "Mesta",
   "notification_requests.notifications_from": "Fráboðanir frá {name}",
   "notification_requests.title": "Sáldaðar fráboðanir",
   "notifications.clear": "Rudda fráboðanir",
diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json
index ddbf6fa273c0eb..137130e9e9db20 100644
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@@ -505,6 +505,8 @@
   "notification.update": "{name} editou unha publicación",
   "notification_requests.accept": "Aceptar",
   "notification_requests.dismiss": "Desbotar",
+  "notification_requests.maximize": "Maximizar",
+  "notification_requests.minimize_banner": "Minimizar o anuncio de notificacións filtradas",
   "notification_requests.notifications_from": "Notificacións de {name}",
   "notification_requests.title": "Notificacións filtradas",
   "notifications.clear": "Limpar notificacións",
diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json
index 0734a9b0221984..a1f718d24f47e8 100644
--- a/app/javascript/mastodon/locales/he.json
+++ b/app/javascript/mastodon/locales/he.json
@@ -505,6 +505,8 @@
   "notification.update": "{name} ערכו הודעה",
   "notification_requests.accept": "לקבל",
   "notification_requests.dismiss": "לבטל",
+  "notification_requests.maximize": "הגדלה למקסימום",
+  "notification_requests.minimize_banner": "להקטין את כותרת ההודעות המפולטרות",
   "notification_requests.notifications_from": "התראות מ־ {name}",
   "notification_requests.title": "התראות מסוננות",
   "notifications.clear": "הסרת התראות",
diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json
index 9e9a3cd251fcea..4acff61740c23d 100644
--- a/app/javascript/mastodon/locales/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@@ -160,7 +160,7 @@
   "compose_form.poll.switch_to_multiple": "Szavazás megváltoztatása több választásosra",
   "compose_form.poll.switch_to_single": "Szavazás megváltoztatása egyetlen választásosra",
   "compose_form.poll.type": "Stílus",
-  "compose_form.publish": "Bejegyzés",
+  "compose_form.publish": "Közzététel",
   "compose_form.publish_form": "Új bejegyzés",
   "compose_form.reply": "Válasz",
   "compose_form.save_changes": "Frissítés",
@@ -505,6 +505,8 @@
   "notification.update": "{name} szerkesztett egy bejegyzést",
   "notification_requests.accept": "Elfogadás",
   "notification_requests.dismiss": "Elvetés",
+  "notification_requests.maximize": "Maximalizálás",
+  "notification_requests.minimize_banner": "Szűrt értesítések sávjának minimalizálása",
   "notification_requests.notifications_from": "{name} értesítései",
   "notification_requests.title": "Szűrt értesítések",
   "notifications.clear": "Értesítések törlése",
diff --git a/app/javascript/mastodon/locales/is.json b/app/javascript/mastodon/locales/is.json
index 99d2d98fafac56..a38e56714ac9b1 100644
--- a/app/javascript/mastodon/locales/is.json
+++ b/app/javascript/mastodon/locales/is.json
@@ -505,6 +505,8 @@
   "notification.update": "{name} breytti færslu",
   "notification_requests.accept": "Samþykkja",
   "notification_requests.dismiss": "Afgreiða",
+  "notification_requests.maximize": "Hámarka",
+  "notification_requests.minimize_banner": "Minnka borða með síuðum tilkynningum",
   "notification_requests.notifications_from": "Tilkynningar frá {name}",
   "notification_requests.title": "Síaðar tilkynningar",
   "notifications.clear": "Hreinsa tilkynningar",
diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json
index b3194e6a109d35..b317e9e64cb53b 100644
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@@ -505,6 +505,8 @@
   "notification.update": "{name} ha modificato un post",
   "notification_requests.accept": "Accetta",
   "notification_requests.dismiss": "Ignora",
+  "notification_requests.maximize": "Ingrandisci",
+  "notification_requests.minimize_banner": "Riduci al minimo il banner delle notifiche filtrate",
   "notification_requests.notifications_from": "Notifiche da {name}",
   "notification_requests.title": "Notifiche filtrate",
   "notifications.clear": "Cancella le notifiche",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index 77a501843075fa..9a1ef03efc883d 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -293,6 +293,7 @@
   "filter_modal.select_filter.subtitle": "既存のカテゴリーを使用するか新規作成します",
   "filter_modal.select_filter.title": "この投稿をフィルターする",
   "filter_modal.title.status": "投稿をフィルターする",
+  "filtered_notifications_banner.pending_requests": "{count, plural,  =0 {すべて完了しました} other {#人の通知がブロックされています}}",
   "filtered_notifications_banner.title": "保留中の通知",
   "firehose.all": "すべて",
   "firehose.local": "このサーバー",
@@ -489,6 +490,7 @@
   "notification.update": "{name}さんが投稿を編集しました",
   "notification_requests.accept": "受け入れる",
   "notification_requests.dismiss": "無視",
+  "notification_requests.minimize_banner": "「保留中の通知」のバナーを最小化する",
   "notification_requests.notifications_from": "{name}からの通知",
   "notification_requests.title": "保留中の通知",
   "notifications.clear": "通知を消去",
diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json
index 803070a094129e..dd5a931b6fc033 100644
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@@ -505,6 +505,8 @@
   "notification.update": "{name} heeft een bericht bewerkt",
   "notification_requests.accept": "Accepteren",
   "notification_requests.dismiss": "Afwijzen",
+  "notification_requests.maximize": "Maximaliseer",
+  "notification_requests.minimize_banner": "Banner met gefilterde meldingen minimaliseren",
   "notification_requests.notifications_from": "Meldingen van {name}",
   "notification_requests.title": "Gefilterde meldingen",
   "notifications.clear": "Meldingen verwijderen",
diff --git a/app/javascript/mastodon/locales/pa.json b/app/javascript/mastodon/locales/pa.json
index 3828ff887efc71..feca55fad45356 100644
--- a/app/javascript/mastodon/locales/pa.json
+++ b/app/javascript/mastodon/locales/pa.json
@@ -29,6 +29,9 @@
   "account.follows.empty": "ਇਹ ਵਰਤੋਂਕਾਰ ਹਾਲੇ ਕਿਸੇ ਨੂੰ ਫ਼ਾਲੋ ਨਹੀਂ ਕਰਦਾ ਹੈ।",
   "account.go_to_profile": "ਪਰੋਫਾਇਲ ਉੱਤੇ ਜਾਓ",
   "account.media": "ਮੀਡੀਆ",
+  "account.mute": "{name} ਨੂੰ ਮੌਨ ਕਰੋ",
+  "account.mute_notifications_short": "ਨੋਟਫਿਕੇਸ਼ਨਾਂ ਨੂੰ ਮੌਨ ਕਰੋ",
+  "account.mute_short": "ਮੌਨ ਕਰੋ",
   "account.muted": "ਮੌਨ ਕੀਤੀਆਂ",
   "account.mutual": "ਸਾਂਝੇ",
   "account.no_bio": "ਕੋਈ ਵਰਣਨ ਨਹੀਂ ਦਿੱਤਾ।",
diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json
index efd2d2c156efc7..2136d3fa826a0d 100644
--- a/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@@ -504,6 +504,8 @@
   "notification.update": "{name} edytował(a) post",
   "notification_requests.accept": "Akceptuj",
   "notification_requests.dismiss": "Odrzuć",
+  "notification_requests.maximize": "Zmaksymalizuj",
+  "notification_requests.minimize_banner": "Zminimalizuj baner powiadomień filtrowanych",
   "notification_requests.notifications_from": "Powiadomienia od {name}",
   "notification_requests.title": "Powiadomienia filtrowane",
   "notifications.clear": "Wyczyść powiadomienia",
diff --git a/app/javascript/mastodon/locales/pt-PT.json b/app/javascript/mastodon/locales/pt-PT.json
index 42b9e7c9ecc5df..a4340f95d51bf5 100644
--- a/app/javascript/mastodon/locales/pt-PT.json
+++ b/app/javascript/mastodon/locales/pt-PT.json
@@ -505,6 +505,8 @@
   "notification.update": "{name} editou uma publicação",
   "notification_requests.accept": "Aceitar",
   "notification_requests.dismiss": "Descartar",
+  "notification_requests.maximize": "Maximizar",
+  "notification_requests.minimize_banner": "Minimizar o cabeçalho das notificações filtradas",
   "notification_requests.notifications_from": "Notificações de {name}",
   "notification_requests.title": "Notificações filtradas",
   "notifications.clear": "Limpar notificações",
diff --git a/app/javascript/mastodon/locales/ry.json b/app/javascript/mastodon/locales/ry.json
index 4f2e2410eff4a2..cbd9e3d928cd3d 100644
--- a/app/javascript/mastodon/locales/ry.json
+++ b/app/javascript/mastodon/locales/ry.json
@@ -129,6 +129,7 @@
   "compose.language.change": "Поміняти язык",
   "compose.language.search": "Глядати языкы...",
   "compose.published.body": "Пост опубликованый.",
+  "compose.published.open": "Удкрыти",
   "compose.saved.body": "Пост усокоченый.",
   "compose_form.direct_message_warning_learn_more": "Читайте бульше",
   "compose_form.encryption_warning": "Публикації на Mastodon не шіфрувут ся. Не шырьте чутливу інформацію через Mastodon.",
diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json
index 2127ab2efbf96f..57cfd25bf7e6e3 100644
--- a/app/javascript/mastodon/locales/sk.json
+++ b/app/javascript/mastodon/locales/sk.json
@@ -449,12 +449,14 @@
   "navigation_bar.security": "Zabezpečenie",
   "not_signed_in_indicator.not_signed_in": "Ak chcete získať prístup k tomuto zdroju, prihláste sa.",
   "notification.admin.report": "Účet {name} nahlásil {target}",
+  "notification.admin.report_statuses_other": "{name} nahlásil/a {target}",
   "notification.admin.sign_up": "Nová registráciu účtu {name}",
   "notification.favourite": "{name} hviezdičkuje váš príspevok",
   "notification.follow": "{name} vás sleduje",
   "notification.follow_request": "{name} vás žiada sledovať",
   "notification.mention": "{name} vás spomína",
   "notification.moderation-warning.learn_more": "Zisti viac",
+  "notification.moderation_warning.action_delete_statuses": "Niektoré z tvojich príspevkov boli odstránené.",
   "notification.moderation_warning.action_disable": "Tvoj účet bol vypnutý.",
   "notification.moderation_warning.action_silence": "Tvoj účet bol obmedzený.",
   "notification.moderation_warning.action_suspend": "Tvoj účet bol pozastavený.",
@@ -471,6 +473,7 @@
   "notification_requests.title": "Filtrované oboznámenia",
   "notifications.clear": "Vyčistiť upozornenia",
   "notifications.clear_confirmation": "Určite chcete nenávratne odstrániť všetky svoje upozornenia?",
+  "notifications.clear_title": "Vyčistiť upozornenia?",
   "notifications.column_settings.admin.report": "Nové hlásenia:",
   "notifications.column_settings.admin.sign_up": "Nové registrácie:",
   "notifications.column_settings.alert": "Upozornenia na ploche",
@@ -632,7 +635,9 @@
   "report.unfollow_explanation": "Tento účet sledujete. Ak už nechcete vidieť jeho príspevky vo svojom domovskom kanáli, prestaňte ho sledovať.",
   "report_notification.attached_statuses": "{count, plural, one {{count} príspevok} few {{count} príspevky} other {{count} príspevkov}} ako príloha",
   "report_notification.categories.legal": "Právne",
+  "report_notification.categories.legal_sentence": "nelegálny obsah",
   "report_notification.categories.other": "Ostatné",
+  "report_notification.categories.other_sentence": "ostatné",
   "report_notification.categories.spam": "Spam",
   "report_notification.categories.violation": "Porušenie pravidla",
   "report_notification.open": "Otvoriť hlásenie",
diff --git a/app/javascript/mastodon/locales/sq.json b/app/javascript/mastodon/locales/sq.json
index 078092b50a1081..e7b79c08bb3267 100644
--- a/app/javascript/mastodon/locales/sq.json
+++ b/app/javascript/mastodon/locales/sq.json
@@ -505,6 +505,8 @@
   "notification.update": "{name} përpunoi një postim",
   "notification_requests.accept": "Pranoje",
   "notification_requests.dismiss": "Hidhe tej",
+  "notification_requests.maximize": "Maksimizoje",
+  "notification_requests.minimize_banner": "Minimizo banderolë njoftimesh të filtruara",
   "notification_requests.notifications_from": "Njoftime prej {name}",
   "notification_requests.title": "Njoftime të filtruar",
   "notifications.clear": "Spastroji njoftimet",
diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json
index 3b8238fe06de3a..198ee75eb824f9 100644
--- a/app/javascript/mastodon/locales/tr.json
+++ b/app/javascript/mastodon/locales/tr.json
@@ -300,6 +300,7 @@
   "filter_modal.select_filter.subtitle": "Mevcut bir kategoriyi kullan veya yeni bir tane oluştur",
   "filter_modal.select_filter.title": "Bu gönderiyi süzgeçle",
   "filter_modal.title.status": "Bir gönderi süzgeçle",
+  "filtered_notifications_banner.pending_requests": "Bildiğiniz {count, plural, =0 {hiç kimseden} one {bir kişiden} other {# kişiden}}",
   "filtered_notifications_banner.title": "Filtrelenmiş bildirimler",
   "firehose.all": "Tümü",
   "firehose.local": "Bu sunucu",
@@ -504,6 +505,8 @@
   "notification.update": "{name} bir gönderiyi düzenledi",
   "notification_requests.accept": "Onayla",
   "notification_requests.dismiss": "Yoksay",
+  "notification_requests.maximize": "Büyüt",
+  "notification_requests.minimize_banner": "Filtrelenmiş bildirimler başlığını küçült",
   "notification_requests.notifications_from": "{name} bildirimleri",
   "notification_requests.title": "Filtrelenmiş bildirimler",
   "notifications.clear": "Bildirimleri temizle",
diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json
index 9535f1f445f443..a1c674caa198fd 100644
--- a/app/javascript/mastodon/locales/uk.json
+++ b/app/javascript/mastodon/locales/uk.json
@@ -300,6 +300,7 @@
   "filter_modal.select_filter.subtitle": "Використати наявну категорію або створити нову",
   "filter_modal.select_filter.title": "Фільтрувати цей допис",
   "filter_modal.title.status": "Фільтрувати допис",
+  "filtered_notifications_banner.pending_requests": "Від {count, plural, =0 {жодної особи} one {однієї особи} few {# осіб} many {# осіб} other {# особи}}, котрих ви можете знати",
   "filtered_notifications_banner.title": "Відфільтровані сповіщення",
   "firehose.all": "Всі",
   "firehose.local": "Цей сервер",
@@ -473,10 +474,10 @@
   "navigation_bar.security": "Безпека",
   "not_signed_in_indicator.not_signed_in": "Ви повинні увійти, щоб отримати доступ до цього ресурсу.",
   "notification.admin.report": "Скарга від {name} на {target}",
-  "notification.admin.report_account": "{name} повідомив(ла) про {count, plural, one {один допис} few {# дописи} many {# дописів} other {# дописів}} від {target} в категорії {category}",
-  "notification.admin.report_account_other": "{name} повідомив(ла) про {count, plural, one {один допис} few {# дописи} many {# дописів} other {# дописів}} від {target}",
-  "notification.admin.report_statuses": "{name} повідомив(ла) про {target} в категорії {category}",
-  "notification.admin.report_statuses_other": "{name} повідомив(ла) про {target}",
+  "notification.admin.report_account": "{name} повідомляє про {count, plural, one {один допис} few {# дописи} many {# дописів} other {# дописів}} від {target} в категорії {category}",
+  "notification.admin.report_account_other": "{name} повідомляє про {count, plural, one {один допис} few {# дописи} many {# дописів} other {# дописів}} від {target}",
+  "notification.admin.report_statuses": "{name} повідомляє про {target} в категорії {category}",
+  "notification.admin.report_statuses_other": "{name} повідомляє про {target}",
   "notification.admin.sign_up": "{name} приєдналися",
   "notification.favourite": "Ваш допис сподобався {name}",
   "notification.follow": "{name} підписалися на вас",
@@ -493,7 +494,7 @@
   "notification.moderation_warning.action_suspend": "Ваш обліковий запис було заблоковано.",
   "notification.own_poll": "Ваше опитування завершилося",
   "notification.poll": "Опитування, в якому ви проголосували, завершено",
-  "notification.private_mention": "{name} приватно згадав(ла) вас",
+  "notification.private_mention": "{name} приватно згадує вас",
   "notification.reblog": "{name} поширює ваш допис",
   "notification.relationships_severance_event": "Втрачено з'єднання з {name}",
   "notification.relationships_severance_event.account_suspension": "Адміністратор з {from} призупинив {target}, що означає, що ви більше не можете отримувати оновлення від них або взаємодіяти з ними.",
@@ -504,6 +505,8 @@
   "notification.update": "{name} змінює допис",
   "notification_requests.accept": "Прийняти",
   "notification_requests.dismiss": "Відхилити",
+  "notification_requests.maximize": "Розгорнути",
+  "notification_requests.minimize_banner": "Мінімізувати відфільтрований банер сповіщень",
   "notification_requests.notifications_from": "Сповіщення від {name}",
   "notification_requests.title": "Відфільтровані сповіщення",
   "notifications.clear": "Очистити сповіщення",
diff --git a/app/javascript/mastodon/locales/vi.json b/app/javascript/mastodon/locales/vi.json
index a3cec8185db19d..0f5eeebd07bc9f 100644
--- a/app/javascript/mastodon/locales/vi.json
+++ b/app/javascript/mastodon/locales/vi.json
@@ -505,6 +505,8 @@
   "notification.update": "{name} đã sửa tút",
   "notification_requests.accept": "Chấp nhận",
   "notification_requests.dismiss": "Bỏ qua",
+  "notification_requests.maximize": "Tối đa",
+  "notification_requests.minimize_banner": "Tinh giản banner lọc thông báo",
   "notification_requests.notifications_from": "Thông báo từ {name}",
   "notification_requests.title": "Thông báo đã lọc",
   "notifications.clear": "Xóa hết thông báo",
diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json
index 1095502fb9b7f0..53fe9b985346ad 100644
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@@ -1,12 +1,12 @@
 {
-  "about.blocks": "受限服务器",
+  "about.blocks": "被限制的服务器",
   "about.contact": "联系方式：",
   "about.disclaimer": "Mastodon 是自由的开源软件，商标由 Mastodon gGmbH 持有。",
   "about.domain_blocks.no_reason_available": "原因不可用",
   "about.domain_blocks.preamble": "通常来说，在 Mastodon 上，你可以浏览联邦宇宙中任何一台服务器上的内容，并且和上面的用户互动。但其中一些在本服务器上被设置为例外。",
   "about.domain_blocks.silenced.explanation": "除非明确地搜索并关注对方，否则你不会看到来自此服务器的用户信息与内容。",
-  "about.domain_blocks.silenced.title": "访问受限",
-  "about.domain_blocks.suspended.explanation": "不处理、存储或交换来自本服务器的任何数据，不可能与本服务器上的用户进行任何交互或通信。",
+  "about.domain_blocks.silenced.title": "已隐藏",
+  "about.domain_blocks.suspended.explanation": "此服务器的数据将不会被处理、存储或者交换，本站也将无法和来自此服务器的用户互动或者交流。",
   "about.domain_blocks.suspended.title": "已封禁",
   "about.not_available": "此信息在当前服务器尚不可用。",
   "about.powered_by": "由 {mastodon} 驱动的去中心化社交媒体",
@@ -81,7 +81,7 @@
   "admin.impact_report.instance_accounts": "将要删除的账户资料",
   "admin.impact_report.instance_followers": "本实例用户即将丢失的关注者",
   "admin.impact_report.instance_follows": "对方实例用户将会丢失的关注者",
-  "admin.impact_report.title": "权重一览",
+  "admin.impact_report.title": "影响摘要",
   "alert.rate_limited.message": "请在 {retry_time, time, medium} 后重试。",
   "alert.rate_limited.title": "频率受限",
   "alert.unexpected.message": "发生了意外错误。",
@@ -91,10 +91,10 @@
   "audio.hide": "隐藏音频",
   "block_modal.remote_users_caveat": "我们将要求服务器 {domain} 尊重您的决定。然而，我们无法保证对方一定遵从，因为某些服务器可能会以不同的方案处理屏蔽操作。公开嘟文仍然可能对未登录的用户可见。",
   "block_modal.show_less": "隐藏",
-  "block_modal.show_more": "展开",
+  "block_modal.show_more": "显示更多",
   "block_modal.they_cant_mention": "他们不能提及或关注你。",
-  "block_modal.they_cant_see_posts": "嘟文将被设置为互相不可见。",
-  "block_modal.they_will_know": "他们将会获知他们被屏蔽。",
+  "block_modal.they_cant_see_posts": "他们看不到你的嘟文，你也看不到他们的嘟文。",
+  "block_modal.they_will_know": "他们将能看到他们被屏蔽。",
   "block_modal.title": "屏蔽该用户？",
   "block_modal.you_wont_see_mentions": "你将无法看到提及他们的嘟文。",
   "boost_modal.combo": "下次按住 {combo} 即可跳过此提示",
@@ -171,28 +171,28 @@
   "confirmations.block.confirm": "屏蔽",
   "confirmations.delete.confirm": "删除",
   "confirmations.delete.message": "你确定要删除这条嘟文吗？",
-  "confirmations.delete.title": "删除嘟文？",
+  "confirmations.delete.title": "确认删除嘟文？",
   "confirmations.delete_list.confirm": "删除",
   "confirmations.delete_list.message": "确定永久删除这个列表吗？",
-  "confirmations.delete_list.title": "删除列表？",
+  "confirmations.delete_list.title": "确认删除列表？",
   "confirmations.discard_edit_media.confirm": "丢弃",
   "confirmations.discard_edit_media.message": "您还有未保存的媒体描述或预览修改，仍要丢弃吗？",
   "confirmations.edit.confirm": "编辑",
   "confirmations.edit.message": "编辑此消息将会覆盖当前正在撰写的信息。仍要继续吗？",
-  "confirmations.edit.title": "覆盖嘟文？",
+  "confirmations.edit.title": "确认覆盖嘟文？",
   "confirmations.logout.confirm": "退出登录",
   "confirmations.logout.message": "确定要退出登录吗？",
-  "confirmations.logout.title": "退出登录？",
+  "confirmations.logout.title": "是否退出登录？",
   "confirmations.mute.confirm": "隐藏",
   "confirmations.redraft.confirm": "删除并重新编辑",
   "confirmations.redraft.message": "确定删除这条嘟文并重写吗？所有相关的喜欢和转嘟都将丢失，嘟文的回复也会失去关联。",
-  "confirmations.redraft.title": "删除并重新嘟文？",
+  "confirmations.redraft.title": "是否删除并重新编辑嘟文？",
   "confirmations.reply.confirm": "回复",
   "confirmations.reply.message": "回复此消息将会覆盖当前正在编辑的信息。确定继续吗？",
-  "confirmations.reply.title": "覆盖嘟文？",
+  "confirmations.reply.title": "确认覆盖嘟文？",
   "confirmations.unfollow.confirm": "取消关注",
   "confirmations.unfollow.message": "你确定要取消关注 {name} 吗？",
-  "confirmations.unfollow.title": "取消关注用户？",
+  "confirmations.unfollow.title": "是否取消关注用户？",
   "conversation.delete": "删除对话",
   "conversation.mark_as_read": "标记为已读",
   "conversation.open": "查看对话",
@@ -505,11 +505,13 @@
   "notification.update": "{name} 编辑了嘟文",
   "notification_requests.accept": "接受",
   "notification_requests.dismiss": "拒绝",
+  "notification_requests.maximize": "最大化",
+  "notification_requests.minimize_banner": "最小化被过滤通知的横幅",
   "notification_requests.notifications_from": "来自 {name} 的通知",
   "notification_requests.title": "通知（已过滤）",
   "notifications.clear": "清空通知列表",
   "notifications.clear_confirmation": "你确定要永久清空通知列表吗？",
-  "notifications.clear_title": "清空通知？",
+  "notifications.clear_title": "是否清空通知？",
   "notifications.column_settings.admin.report": "新举报：",
   "notifications.column_settings.admin.sign_up": "新注册：",
   "notifications.column_settings.alert": "桌面通知",
diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json
index bd4f89169f5ff1..8be00b273a1375 100644
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@@ -505,6 +505,8 @@
   "notification.update": "{name} 已編輯嘟文",
   "notification_requests.accept": "接受",
   "notification_requests.dismiss": "關閉",
+  "notification_requests.maximize": "最大化",
+  "notification_requests.minimize_banner": "最小化已過濾通知橫幅",
   "notification_requests.notifications_from": "來自 {name} 之通知",
   "notification_requests.title": "已過濾之通知",
   "notifications.clear": "清除通知",
diff --git a/config/locales/be.yml b/config/locales/be.yml
index a14ba3d2243e9d..2e3d6558dcd010 100644
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -232,6 +232,7 @@ be:
         update_custom_emoji: Абнавіць адвольныя эмодзі
         update_domain_block: Актуалізаваць блакіроўку дамена
         update_ip_block: Абнавіць IP правіла
+        update_report: Абнавіць скаргу
         update_status: Абнавіць допіс
         update_user_role: Абнавіць ролю
       actions:
@@ -299,6 +300,7 @@ be:
       filter_by_action: Фільтраваць па дзеянню
       filter_by_user: Адфільтраваць па карыстальніку
       title: Аўдыт
+      unavailable_instance: "(імя дамена недаступнае)"
     announcements:
       destroyed_msg: Аб'ява паспяхова выдалена!
       edit:
@@ -485,6 +487,9 @@ be:
       title: Рэкамендацыі падпісак
       unsuppress: Аднавіць рэкамендацыі падпісак
     instances:
+      audit_log:
+        title: Нядаўнія журналы аўдыту
+        view_all: Праглядзець поўныя журналы аўдыту
       availability:
         description_html:
           few: Калі дастаўка на дамен не атрымоўваецца праз <strong>%{count} іншыя дні</strong>, далейшыя спробы дастаўкі не будуць зроблены, пакуль не будзе атрымана дастаўка <em>з</em> дамена.
@@ -661,6 +666,7 @@ be:
       report: 'Скарга #%{id}'
       reported_account: Уліковы запіс парушальніка
       reported_by: Адпраўнік скаргі
+      reported_with_application: Паведамлена праз праграму
       resolved: Вырашана
       resolved_msg: Скарга была паспяхова вырашана!
       skip_to_actions: Прапусціць дзеянні
@@ -907,7 +913,23 @@ be:
         action: Для падрабязнасцей націсніце тут
         message_html: "<strong>Ваша сховішча не наладжана. Прыватнасць карыстальнікаў пад пагрозай.</strong>"
     tags:
+      moderation:
+        not_trendable: Не ў трэндзе
+        not_usable: Непрыгодныя
+        pending_review: Чакае праверкі
+        review_requested: Патрабуюць прагледжвання
+        reviewed: Прагледжаныя
+        title: Стан
+        trendable: У трэндзе
+        unreviewed: Непрагледжаныя
+        usable: Прыгодныя
+      name: Назва
+      newest: Спачатку новыя
+      oldest: Спачатку старыя
+      reset: Скінуць
       review: Стан праверкі
+      search: Пошук
+      title: Хэштэгі
       updated_msg: Налады хэштэгаў паспяхова змененыя
     title: Адміністрацыя
     trends:
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 7e0aaaeefb6fe3..9046769a213f89 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -232,6 +232,7 @@ cs:
         update_custom_emoji: Aktualizovat vlastní emoji
         update_domain_block: Změnit blokaci domény
         update_ip_block: Aktualizovat pravidlo IP
+        update_report: Upravit hlášení
         update_status: Aktualizovat Příspěvek
         update_user_role: Aktualizovat roli
       actions:
@@ -486,6 +487,9 @@ cs:
       title: Doporučená sledování
       unsuppress: Obnovit doporučení sledování
     instances:
+      audit_log:
+        title: Nedávné protokoly auditu
+        view_all: Zobrazit úplné protokoly auditu
       availability:
         description_html:
           few: Pokud doručování na doménu selže ve <strong>%{count} různých dnech</strong>, nebudou činěny žádné další pokusy o doručení, dokud nedorazí doručení <em>od</em> domény.
@@ -662,6 +666,7 @@ cs:
       report: 'Hlášení #%{id}'
       reported_account: Nahlášený účet
       reported_by: Nahlášeno uživatelem
+      reported_with_application: Nahlášeno aplikací
       resolved: Vyřešeno
       resolved_msg: Hlášení úspěšně vyřešeno!
       skip_to_actions: Přeskočit k akcím
@@ -908,7 +913,23 @@ cs:
         action: Pro více informací se podívejte zde
         message_html: "<strong>Váš object storage je špatně nakonfigurován. Soukromí vašich uživatelů je ohroženo.</strong>"
     tags:
+      moderation:
+        not_trendable: Netrendovatelné
+        not_usable: Nepoužitelné
+        pending_review: Čeká na posouzení
+        review_requested: Posouzení vyžádáno
+        reviewed: Posouzené
+        title: Stav
+        trendable: Trendovatelné
+        unreviewed: Neposouzené
+        usable: Použitelné
+      name: Název
+      newest: Nejnovější
+      oldest: Nejstarší
+      reset: Resetovat
       review: Stav posouzení
+      search: Hledat
+      title: Hashtagy
       updated_msg: Nastavení hashtagů bylo úspěšně aktualizováno
     title: Administrace
     trends:
diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index 5f1b0b4bcef1c3..5b26322be3347e 100644
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@@ -17,11 +17,11 @@ cy:
       zero: Dilynwyr
     following: Yn dilyn
     instance_actor_flash: Mae'r cyfrif hwn yn actor rhithwir sy'n cael ei ddefnyddio i gynrychioli'r gweinydd ei hun ac nid unrhyw ddefnyddiwr unigol. Fe'i defnyddir at ddibenion ffederasiwn ac ni ddylid ei atal.
-    last_active: y diweddaraf
+    last_active: gweithgar ddiwethaf
     link_verified_on: Gwiriwyd perchnogaeth y ddolen yma ar %{date}
     nothing_here: Does dim byd yma!
     pin_errors:
-      following: Rhaid i chi fod yn dilyn yn barod y person rydych am ei gymeradwyo
+      following: Rhaid i chi fod yn dilyn y person rydych am ei gymeradwyo, yn barod.
     posts:
       few: Postiadau
       many: Postiadau
@@ -503,6 +503,9 @@ cy:
       title: Dilyn yr argymhellion
       unsuppress: Adfer argymhelliad dilyn
     instances:
+      audit_log:
+        title: Cofnodion Archwilio Diweddar
+        view_all: Gweld y cofnodion archwilio llawn
       availability:
         description_html:
           few: Os bydd anfon i'r parth yn methu ar <strong>%{count} o ddiwrnodau gwahanol</strong> heb lwyddo, ni fydd unrhyw ymdrechion dosbarthu pellach yn cael eu gwneud oni bai y bydd danfoniad yn cael ei dderbyn <em>o'r</em> parth.
@@ -938,7 +941,23 @@ cy:
         action: Ewch yma am fwy o wybodaeth
         message_html: "<strong>Mae eich storfa gwrthrychau wedi'i cham ffurfweddu. Mae preifatrwydd eich defnyddwyr mewn perygl.</strong>"
     tags:
+      moderation:
+        not_trendable: Ddim yn dueddol
+        not_usable: Ddim yn ddefnyddiadwy
+        pending_review: O dan ystyriaeth
+        review_requested: Gofynnwyd am adolygiad
+        reviewed: Adolygwyd
+        title: Statws
+        trendable: Tueddadwy
+        unreviewed: Heb ei adolygu
+        usable: Defnyddiadwy
+      name: Enw
+      newest: Mwyaf newydd
+      oldest: Hynaf
+      reset: Ailosod
       review: Adolygu statws
+      search: Chwilio
+      title: Hashnodau
       updated_msg: Gosodiadau hashnodau wedi'i diweddaru'n llwyddiannus
     title: Gweinyddiaeth
     trends:
diff --git a/config/locales/da.yml b/config/locales/da.yml
index 004aea520adc58..90a669ccb9d5f1 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -642,6 +642,7 @@ da:
       report: 'Anmeldelse #%{id}'
       reported_account: Anmeldt konto
       reported_by: Anmeldt af
+      reported_with_application: Rapporteret via applikation
       resolved: Løst
       resolved_msg: Anmeldelse løst!
       skip_to_actions: Overspring til foranstaltninger
diff --git a/config/locales/de.yml b/config/locales/de.yml
index b133cf94bcbf8c..1e6d29106849ac 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -1130,7 +1130,7 @@ de:
       new_confirmation_instructions_sent: In wenigen Minuten wirst du eine neue E-Mail mit dem Bestätigungslink erhalten!
       title: Überprüfe dein E-Mail-Postfach
     sign_in:
-      preamble_html: Melde dich mit deinen Zugangsdaten für <strong>%{domain}</strong> an. Solltest du dein Konto auf einem anderen Server registriert haben, ist eine Anmeldung hier nicht möglich.
+      preamble_html: Melde dich mit deinen Zugangsdaten für <strong>%{domain}</strong> an. Falls dein Konto auf einem anderen Server erstellt wurde, ist eine Anmeldung hier nicht möglich.
       title: Bei %{domain} anmelden
     sign_up:
       manual_review: Registrierungen für den Server %{domain} werden manuell durch unsere Moderator*innen überprüft. Um uns dabei zu unterstützen, schreibe etwas über dich und sage uns, weshalb du ein Konto auf %{domain} anlegen möchtest.
diff --git a/config/locales/doorkeeper.be.yml b/config/locales/doorkeeper.be.yml
index f4faed1f09e1cf..75f9930e1a6b3a 100644
--- a/config/locales/doorkeeper.be.yml
+++ b/config/locales/doorkeeper.be.yml
@@ -83,6 +83,7 @@ be:
         access_denied: Уласнік рэсурсу або сэрвер аўтарызацыі адхіліў ваш запыт.
         credential_flow_not_configured: Resource Owner Password Credentials flow не прайшоў з-за таго, што ўласцівасць Doorkeeper.configure.resource_owner_from_credentials была не вызначана.
         invalid_client: Збой аўтэнтыфікацыі кліента з-за невядомага кліента, адсутнасці аўтэнтыфікацыі кліента або метаду аўтэнтыфікацыі, які не падтрымліваецца.
+        invalid_code_challenge_method: Метад праверкі кода павінен быць S256, просты тэкст не падтрымліваецца.
         invalid_grant: Прадастаўлены дазвол на аўтарызацыю несапраўдны, пратэрмінованы, быў адкліканы, не адпавядае URI перанакіравання, які выкарыстоўваецца ў запыце аўтарызацыі або быў выдадзены іншаму кліенту.
         invalid_redirect_uri: Прадстаўлены URI перанакіравання не сапраўдны.
         invalid_request:
diff --git a/config/locales/doorkeeper.hu.yml b/config/locales/doorkeeper.hu.yml
index b2e51a47c1f215..b3cd00f4beeec4 100644
--- a/config/locales/doorkeeper.hu.yml
+++ b/config/locales/doorkeeper.hu.yml
@@ -20,7 +20,7 @@ hu:
     applications:
       buttons:
         authorize: Hitelesítés
-        cancel: Mégsem
+        cancel: Mégse
         destroy: Törlés
         edit: Szerkesztés
         submit: Elküldés
@@ -51,20 +51,20 @@ hu:
         application_id: Ügyfélkulcs
         callback_urls: Visszahívási URL-ek
         scopes: Hatáskörök
-        secret: Ügyfél titkos kulcs
+        secret: Ügyféltitok
         title: 'Alkalmazás: %{name}'
     authorizations:
       buttons:
-        authorize: Hitelesítés
+        authorize: Engedélyezés
         deny: Tiltás
       error:
         title: Hiba történt
       new:
         prompt_html: "%{client_name} szeretné elérni a fiókodat. Ez egy harmadik féltől származó alkalmazás. <strong>Ha nem bízol meg benne, ne addj felhatalmazást neki.</strong>"
         review_permissions: Jogosultságok áttekintése
-        title: Hitelesítés szükséges
+        title: Engedélyezés szükséges
       show:
-        title: Másold le ezt az engedélyező kódot és írd be az alkalmazásba.
+        title: Másold le ezt az engedélyezési kódot és írd be az alkalmazásba.
     authorized_applications:
       buttons:
         revoke: Visszavonás
@@ -83,6 +83,7 @@ hu:
         access_denied: Az erőforrás tulajdonosa vagy az engedélyező kiszolgáló elutasította a kérést.
         credential_flow_not_configured: Az erőforrás tulajdonos jelszóadatainak átadása megszakadt, mert a Doorkeeper.configure.resource_owner_from_credentials beállítatlan.
         invalid_client: A kliens hitelesítése megszakadt, mert ismeretlen a kliens, a kliens nem küldött hitelesítést, vagy a hitelesítés módja nem támogatott.
+        invalid_code_challenge_method: A kódkihívási módszernek S256-nak kell lennie, az egyszerű kód nem támogatott.
         invalid_grant: A biztosított hitelesítés érvénytelen, lejárt, visszavont, vagy nem egyezik a hitelesítési kérésben használt URI-val, vagy más kliensnek címezték.
         invalid_redirect_uri: Az átirányító URI nem valós.
         invalid_request:
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index d90de587b7c81f..28906f9dbfc194 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -17,7 +17,7 @@ fi:
     link_verified_on: Tämän linkin omistus on tarkastettu %{date}
     nothing_here: Täällä ei ole mitään!
     pin_errors:
-      following: Sinun täytyy seurata henkilöä jota haluat tukea
+      following: Sinun täytyy seurata käyttäjää, jota haluat tukea
     posts:
       one: Julkaisu
       other: viestiä
@@ -632,7 +632,7 @@ fi:
         create_and_resolve: Ratkaise ja lisää muistiinpano
         create_and_unresolve: Avaa uudelleen ja lisää muistiinpano
         delete: Poista
-        placeholder: Kuvaile tehtyjä toimia tai lisää muita käyttäjään liittyviä merkintöjä...
+        placeholder: Kuvaile tehtyjä toimia tai lisää muita käyttäjään liittyviä merkintöjä…
         title: Muistiinpanot
       notes_description_html: Tarkastele ja jätä muistiinpanoja muille moderaattoreille ja itsellesi tulevaisuuteen
       processed_msg: Raportin nro %{id} käsittely onnistui
@@ -771,7 +771,7 @@ fi:
         public_timelines: Julkiset aikajanat
         publish_discovered_servers: Julkaise löydetyt palvelimet
         publish_statistics: Julkaise tilastot
-        title: Löydettävyys
+        title: Löytäminen
         trends: Trendit
       domain_blocks:
         all: Kaikille
@@ -838,7 +838,7 @@ fi:
         delete_statuses: "%{name} poisti käyttäjän %{target} julkaisut"
         disable: "%{name} jäädytti %{target} tilin"
         mark_statuses_as_sensitive: "%{name} merkitsi käyttäjän %{target} julkaisut arkaluonteisiksi"
-        none: "%{name} lähetti varoituksen henkilölle %{target}"
+        none: "%{name} lähetti varoituksen käyttäjälle %{target}"
         sensitive: "%{name} merkitsi käyttäjän %{target} tilin arkaluonteiseksi"
         silence: "%{name} rajoitti käyttäjän %{target} tiliä"
         suspend: "%{name} jäädytti käyttäjän %{target} tilin"
@@ -918,8 +918,8 @@ fi:
         publishers:
           no_publisher_selected: Julkaisijoita ei muutettu, koska yhtään ei ollut valittuna
         shared_by_over_week:
-          one: Jakanut yksi henkilö viimeisen viikon aikana
-          other: Jakanut %{count} henkilöä viimeisen viikon aikana
+          one: Jakanut yksi käyttäjä viimeisen viikon aikana
+          other: Jakanut %{count} käyttäjää viimeisen viikon aikana
         title: Suositut linkit
         usage_comparison: Jaettu tänään %{today} kertaa verrattuna eilisen %{yesterday} kertaan
       not_allowed_to_trend: Ei saa trendata
@@ -951,7 +951,7 @@ fi:
           tag_servers_dimension: Suosituimmat palvelimet
           tag_servers_measure: eri palvelimet
           tag_uses_measure: käyttökerrat yhteensä
-        description_html: Nämä aihetunnisteet näkyvät parhaillaan monissa julkaisuissa, jotka palvelimesi näkee. Tämä luettelo voi auttaa käyttäjiäsi selvittämään, mistä ihmiset puhuvat eniten juuri nyt. Mitkään aihetunnisteet ei näy julkisesti ennen kuin hyväksyt ne.
+        description_html: Nämä aihetunnisteet näkyvät parhaillaan monissa julkaisuissa, jotka palvelimesi näkee. Tämä luettelo voi auttaa käyttäjiäsi selvittämään, mistä puhutaan eniten juuri nyt. Mitkään aihetunnisteet ei näy julkisesti ennen kuin hyväksyt ne.
         listable: Voi ehdottaa
         no_tag_selected: Tunnisteita ei muutettu, koska yhtään ei ollut valittuna
         not_listable: Ei ehdoteta
@@ -964,8 +964,8 @@ fi:
         usable: Voi käyttää
         usage_comparison: Käytetty tänään %{today} kertaa, verrattuna elisen %{yesterday} kertaan
         used_by_over_week:
-          one: Käyttänyt yksi henkilö viimeisen viikon aikana
-          other: Käyttänyt %{count} henkilöä viimeisen viikon aikana
+          one: Käyttänyt yksi käyttäjä viimeisen viikon aikana
+          other: Käyttänyt %{count} käyttäjää viimeisen viikon aikana
       title: Trendit
       trending: Trendaus
     warning_presets:
@@ -1043,8 +1043,8 @@ fi:
     advanced_web_interface: Edistynyt selainkäyttöliittymä
     advanced_web_interface_hint: 'Jos haluat hyödyntää näytön koko leveyttä, edistyneen selainkäyttöliittymän avulla voit määrittää useita erilaisia sarakkeita, niin näet kerralla niin paljon tietoa kuin haluat: kotisyöte, ilmoitukset, yleinen aikajana, mikä tahansa määrä listoja ja aihetunnisteita.'
     animations_and_accessibility: Animaatiot ja saavutettavuus
-    confirmation_dialogs: Vahvistusvalinnat
-    discovery: Löydettävyys
+    confirmation_dialogs: Vahvistusikkunat
+    discovery: Löytäminen
     localization:
       body: Mastodonin ovat kääntäneet vapaaehtoiset.
       guide_link: https://crowdin.com/project/mastodon
@@ -1092,7 +1092,7 @@ fi:
     dont_have_your_security_key: Eikö sinulla ole suojausavainta?
     forgot_password: Unohditko salasanasi?
     invalid_reset_password_token: Salasanan palautustunnus on virheellinen tai vanhentunut. Pyydä uusi.
-    link_to_otp: Syötä puhelimesi kaksivaiheisen todennuksen koodi tai palautuskoodi
+    link_to_otp: Syötä kaksivaiheisen todennuksen tunnusluku puhelimestasi tai palautuskoodi
     link_to_webauth: Käytä suojausavaintasi
     log_in_with: Kirjaudu käyttäen
     login: Kirjaudu sisään
@@ -1134,7 +1134,7 @@ fi:
       title: Kirjaudu palvelimelle %{domain}
     sign_up:
       manual_review: Palvelimen %{domain} ylläpito tarkastaa rekisteröitymiset käsin. Helpottaaksesi rekisteröitymisesi käsittelyä kerro hieman itsestäsi ja siitä, miksi haluat luoda käyttäjätilin palvelimelle %{domain}.
-      preamble: Kun sinulla on tili tällä Mastodon-palvelimella, voit seurata kaikkia muita verkossa olevia henkilöitä riippumatta siitä, missä heidän tilinsä on.
+      preamble: Kun sinulla on tili tällä Mastodon-palvelimella, voit seurata kaikkia muita verkossa olevia käyttäjiä riippumatta siitä, missä heidän tilinsä on.
       title: Otetaan %{domain} käyttöösi.
     status:
       account_status: Tilin tila
@@ -1224,7 +1224,7 @@ fi:
     invalid_domain: ei ole kelvollinen verkkotunnus
   edit_profile:
     basic_information: Perustiedot
-    hint_html: "<strong>Mukauta, mitä ihmiset näkevät julkisessa profiilissasi ja julkaisujesi vieressä.</strong> Ihmiset seuraavat sinua takaisin ja ovat kanssasi vuorovaikutuksessa todennäköisemmin, kun sinulla on täytetty profiili ja profiilikuva."
+    hint_html: "<strong>Mukauta, mitä ihmiset näkevät julkisessa profiilissasi ja julkaisujesi vieressä.</strong> Sinua seurataan takaisin ja kanssasi ollaan vuorovaikutuksessa todennäköisemmin, kun sinulla on täytetty profiili ja profiilikuva."
     other: Muut
   errors:
     '400': Lähettämäsi pyyntö oli virheellinen tai muotoiltu virheellisesti.
@@ -1249,7 +1249,7 @@ fi:
       date: Päiväys
       download: Lataa arkisto
       hint_html: Voit pyytää arkistoa omista <strong>julkaisuista ja mediasta</strong>. Viedyt tiedot ovat ActivityPub-muodossa, ja ne voi lukea millä tahansa yhteensopivalla ohjelmalla. Voit pyytää arkistoa 7 päivän välein.
-      in_progress: Arkistoa kootaan...
+      in_progress: Arkistoa kootaan…
       request: Pyydä arkisto
       size: Koko
     blocks: Estot
@@ -1262,8 +1262,8 @@ fi:
   featured_tags:
     add_new: Lisää uusi
     errors:
-      limit: Olet nostanut esille jo enimmäismäärän aihetunnisteita
-    hint_html: "<strong>Nosta tärkeimmät aihetunnisteesi esille profiilissasi.</strong> Erinomainen työkalu, jolla pidät kirjaa luovista teoksistasi ja pitkäaikaisista projekteistasi. Esille nostamasi aihetunnisteet ovat näyttävällä paikalla profiilissasi ja mahdollistavat nopean pääsyn julkaisuihisi."
+      limit: Suosittelet jo aihetunnisteiden enimmäismäärää
+    hint_html: "<strong>Suosittele tärkeimpiä aihetunnisteitasi profiilissasi.</strong> Erinomainen työkalu, jolla pidät kirjaa luovista teoksistasi ja pitkäaikaisista projekteistasi. Suosittelemasi aihetunnisteet ovat näyttävällä paikalla profiilissasi ja mahdollistavat nopean pääsyn julkaisuihisi."
   filters:
     contexts:
       account: Profiilit
@@ -1359,7 +1359,7 @@ fi:
       following_html: Olet aikeissa <strong>seurata</strong> kaikkiaan <strong>%{total_items} tiliä</strong> tiedostosta <strong>%{filename}</strong>.
       lists_html: Olet aikeissa lisätä <strong>listoihisi</strong> kaikkiaan <strong>%{total_items} tiliä</strong> tiedostosta <strong>%{filename}</strong>. Uusia listoja luodaan, jos sopivaa kohdelistaa ei ole olemassa.
       muting_html: Olet aikeissa <strong>mykistää</strong> kaikkiaan <strong>%{total_items} tiliä</strong> tiedostosta <strong>%{filename}</strong>.
-    preface: Voit tuoda toiselta palvelimelta viemiäsi tietoja, kuten seuraamiesi tai estämiesi henkilöiden luettelon.
+    preface: Voit tuoda toiselta palvelimelta viemiäsi tietoja, kuten seuraamiesi tai estämiesi käyttäjien luettelon.
     recent_imports: Viimeksi tuotu
     states:
       finished: Valmis
@@ -1386,7 +1386,7 @@ fi:
       domain_blocking: Verkkotunnusten estoluettelo
       following: Seurattujen luettelo
       lists: Listat
-      muting: Mykistettyjen luettelo
+      muting: Mykistysluettelo
     upload: Lähetä
   invites:
     delete: Poista käytöstä
@@ -1480,7 +1480,7 @@ fi:
     title: Moderointi
   move_handler:
     carry_blocks_over_text: Tämä käyttäjä siirtyi paikasta %{acct}, jonka olit estänyt.
-    carry_mutes_over_text: Tämä käyttäjä siirtyi tililtä %{acct}, jonka olet mykistänyt.
+    carry_mutes_over_text: Tämä käyttäjä muutti tilistä %{acct}, jonka olet mykistänyt.
     copy_account_note_text: 'Tämä käyttäjä siirtyi tililtä %{acct}. Nämä olivat muistiinpanosi hänestä:'
   navigation:
     toggle_menu: Avaa/sulje valikko
@@ -1569,7 +1569,7 @@ fi:
     reach: Tavoittavuus
     reach_hint_html: Määritä, haluatko tulla uusien käyttäjien löytämäksi ja seuraamaksi. Haluatko julkaisujesi näkyvän Selaa-sivulla? Haluatko muiden käyttäjien näkevän sinut seurantasuosituksissaan? Haluatko hyväksyä kaikki uudet seuraajat automaattisesti vai päättää jokaisesta erikseen?
     search: Haku
-    search_hint_html: Määritä, kuinka haluat tulla löydetyksi. Haluatko, että ihmiset löytävät sinut julkisten julkaisujesi perusteella? Haluatko, että ihmiset Mastodonin ulkopuolella löytävät profiilisi tehdessään hakuja verkossa? Otathan huomioon, ettei julkisten tietojen täyttä kaikista hakukoneista poisjäämistä voi taata.
+    search_hint_html: Määritä, kuinka haluat tulla löydetyksi. Haluatko, että sinut löydetään julkisten julkaisujesi perusteella? Haluatko, että Mastodonin ulkopuoliset ihmiset löytävät profiilisi tehdessään hakuja verkossa? Otathan huomioon, ettei julkisten tietojen täyttä kaikista hakukoneista poisjäämistä voi taata.
     title: Yksityisyys ja tavoittavuus
   privacy_policy:
     title: Tietosuojakäytäntö
@@ -1675,16 +1675,16 @@ fi:
     development: Kehitys
     edit_profile: Muokkaa profiilia
     export: Vie tietoja
-    featured_tags: Esille nostetut aihetunnisteet
+    featured_tags: Suositellut aihetunnisteet
     import: Tuo tietoja
     import_and_export: Tuonti ja vienti
     migrate: Tilin muutto toisaalle
     notifications: Sähköposti-ilmoitukset
-    preferences: Ominaisuudet
+    preferences: Asetukset
     profile: Julkinen profiili
     relationships: Seuratut ja seuraajat
-    severed_relationships: Katkenneet seurantasuhteet
-    statuses_cleanup: Autom. julkaisujen poisto
+    severed_relationships: Katkenneet suhteet
+    statuses_cleanup: Julkaisujen automaattipoisto
     strikes: Moderointivaroitukset
     two_factor_authentication: Kaksivaiheinen todennus
     webauthn_authentication: Suojausavaimet
@@ -1729,8 +1729,8 @@ fi:
       reblog: Tehostusta ei voi kiinnittää
     poll:
       total_people:
-        one: "%{count} henkilö"
-        other: "%{count} henkilöä"
+        one: "%{count} käyttäjä"
+        other: "%{count} käyttäjää"
       total_votes:
         one: "%{count} ääni"
         other: "%{count} ääntä"
@@ -1750,7 +1750,7 @@ fi:
     enabled: Poista vanhat julkaisut automaattisesti
     enabled_hint: Poistaa julkaisusi automaattisesti, kun ne saavuttavat valitun ikäkynnyksen, ellei jokin alla olevista poikkeuksista tule kyseeseen
     exceptions: Poikkeukset
-    explanation: Koska julkaisujen poistaminen on raskas toimi, se tapahtuu hitaasti ajan mittaan, kun palvelin ei ole muutoin ruuhkainen. Siksi viestejäsi voi poistua vasta tovi sen jälkeen, kun ne ovat saavuttaneet ikäkynnyksen.
+    explanation: Koska julkaisujen poistaminen on raskas toimi, se tapahtuu hitaasti aikaa myöten silloin kun palvelin ei ole muutoin ruuhkainen. Siksi viestejäsi voi poistua vasta tovi sen jälkeen kun ne ovat ylittäneet ikäkynnyksen.
     ignore_favs: Ohita suosikit
     ignore_reblogs: Ohita tehostukset
     interaction_exceptions: Vuorovaikutuksiin perustuvat poikkeukset
@@ -1857,7 +1857,7 @@ fi:
       explanation:
         delete_statuses: Joidenkin julkaisuistasi on havaittu rikkovan ainakin yhtä yhteisön sääntöä, joten palvelimen %{instance} moderaattorit ovat poistaneet ne.
         disable: Et voi enää käyttää tiliäsi, mutta profiilisi ja muut tiedot pysyvät muuttumattomina. Voit pyytää varmuuskopiota tiedoistasi, vaihtaa tilin asetuksia tai poistaa tilisi.
-        mark_statuses_as_sensitive: Palvelimen %{instance} moderaattorit ovat merkinneet osan julkaisuistasi arkaluonteisiksi. Tämä tarkoittaa sitä, että ihmisten täytyy napauttaa mediaa ennen kuin sen esikatselu näytetään. Voit merkitä median itse arkaluonteiseksi, kun julkaiset tulevaisuudessa.
+        mark_statuses_as_sensitive: Palvelimen %{instance} moderaattorit ovat merkinneet osan julkaisuistasi arkaluonteisiksi. Tämä tarkoittaa sitä, että mediaa täytyy napauttaa ennen kuin sen esikatselu näytetään. Voit merkitä median itse arkaluonteiseksi, kun julkaiset tulevaisuudessa.
         sensitive: Tästä lähtien kaikki lähetetyt mediatiedostot merkitään arkaluonteisiksi ja piilotetaan napsautusvaroituksen taakse.
         silence: Voit edelleen käyttää tiliäsi, mutta vain sinua jo seuraavat käyttäjät näkevät julkaisusi tällä palvelimella ja sinut voidaan sulkea pois eri löytämisominaisuuksista. Toiset voivat kuitenkin edelleen seurata sinua manuaalisesti.
         suspend: Et voi enää käyttää tiliäsi, eivätkä profiilisi ja muut tiedot ole enää käytettävissä. Voit silti kirjautua sisään pyytääksesi tietojesi varmuuskopiota, kunnes tiedot on poistettu kokonaan noin 30 päivän kuluttua. Säilytämme kuitenkin joitain perustietoja, jotka estävät sinua kiertämästä jäädytystä.
@@ -1900,14 +1900,14 @@ fi:
       feature_moderation: Mastodon palauttaa päätöksenteon käsiisi. Jokainen palvelin luo omat sääntönsä ja määräyksensä, joita valvotaan paikallisesti eikä ylhäältä alas kuten kaupallisessa sosiaalisessa mediassa, mikä tekee siitä joustavimman vastaamaan eri ihmisryhmien tarpeisiin. Liity palvelimelle, jonka säännöt sopivat sinulle, tai ylläpidä omaa palvelinta.
       feature_moderation_title: Moderointi juuri kuten sen pitäisi olla
       follow_action: Seuraa
-      follow_step: Mastodonissa on kyse kiinnostavien ihmisten seuraamisesta.
+      follow_step: Mastodonissa on kyse kiinnostavien käyttäjien seuraamisesta.
       follow_title: Mukauta kotisyötettäsi
       follows_subtitle: Seuraa tunnettuja tilejä
       follows_title: Seurantaehdotuksia
-      follows_view_more: Näytä lisää seurattavia henkilöitä
+      follows_view_more: Näytä lisää seurattavia käyttäjiä
       hashtags_recent_count:
-        one: "%{people} henkilö viimeisenä 2 päivänä"
-        other: "%{people} henkilöä viimeisenä 2 päivänä"
+        one: "%{people} käyttäjä viimeisenä 2 päivänä"
+        other: "%{people} käyttäjää viimeisenä 2 päivänä"
       hashtags_subtitle: Tutki, mikä on ollut suosittua viimeisenä 2 päivänä
       hashtags_title: Suositut aihetunnisteet
       hashtags_view_more: Näytä lisää suosittuja aihetunnisteita
@@ -1921,9 +1921,9 @@ fi:
       subject: Tervetuloa Mastodoniin
       title: Tervetuloa mukaan, %{name}!
   users:
-    follow_limit_reached: Et voi seurata yli %{limit} henkilöä
+    follow_limit_reached: Et voi seurata yli %{limit} käyttäjää
     go_to_sso_account_settings: Avaa identiteettitarjoajasi tiliasetukset
-    invalid_otp_token: Virheellinen kaksivaiheisen todentamisen koodi
+    invalid_otp_token: Virheellinen kaksivaiheisen todennuksen koodi
     otp_lost_help_html: Jos sinulla ei ole pääsyä kumpaankaan, voit ottaa yhteyden osoitteeseen %{email}
     rate_limited: Liian monta todennusyritystä – yritä uudelleen myöhemmin.
     seamless_external_login: Olet kirjautunut ulkoisen palvelun kautta, joten salasana- ja sähköpostiasetukset eivät ole käytettävissä.
diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index 964230d5a577e8..9d8e00cb7efd31 100644
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -882,6 +882,9 @@ ia:
         action: Consulta hic pro plus information
         message_html: "<strong>Tu immagazinage de objectos es mal configurate. Le confidentialitate de tu usatores es in risco.</strong>"
     tags:
+      moderation:
+        pending_review: Attende revision
+        title: Stato
       name: Nomine
       review: Revide le stato
       search: Cercar
diff --git a/config/locales/simple_form.be.yml b/config/locales/simple_form.be.yml
index fca41d3fe3c4ea..a50db22987a000 100644
--- a/config/locales/simple_form.be.yml
+++ b/config/locales/simple_form.be.yml
@@ -211,6 +211,7 @@ be:
         setting_default_privacy: Прыватнасць допісаў
         setting_default_sensitive: Заўсёды пазначаць кантэнт як далікатны
         setting_delete_modal: Паказваць акно пацвярджэння перад выдаленнем допісу
+        setting_disable_hover_cards: Адключыць перадпрагляд профілю пры навядзенні
         setting_disable_swiping: Адключыць прагортванні
         setting_display_media: Адлюстраванне медыя
         setting_display_media_default: Перадвызначана
@@ -242,11 +243,13 @@ be:
           warn: Схаваць з папярэджаннем
       form_admin_settings:
         activity_api_enabled: Апублікаваць зводную статыстыку аб актыўнасці карыстальнікаў API
+        app_icon: Значок праграмы
         backups_retention_period: Працягласць захавання архіву карыстальніка
         bootstrap_timeline_accounts: Заўсёды раіць гэтыя ўліковыя запісы новым карыстальнікам
         closed_registrations_message: Уласнае паведамленне, калі рэгістрацыя немагчымая
         content_cache_retention_period: Перыяд захоўвання выдаленага змесціва
         custom_css: CSS карыстальніка
+        favicon: Значок сайта
         mascot: Уласны маскот(спадчына)
         media_cache_retention_period: Працягласць захавання кэшу для медыя
         peers_api_enabled: Апублікаваць спіс знойдзеных сервераў у API
@@ -311,6 +314,7 @@ be:
         listable: Дазволіць паказ хэштэгу ў пошуку і ў каталозе профіляў
         name: Хэштэг
         trendable: Дазволіць паказ гэтага хэштэга ў трэндах
+        usable: Дазволіць допісам выкарыстоўваць гэты хэштэг лакальна
       user:
         role: Роля
         time_zone: Часавы пояс
diff --git a/config/locales/simple_form.cs.yml b/config/locales/simple_form.cs.yml
index 5a1bd3c88390ea..d4d370ff5bee42 100644
--- a/config/locales/simple_form.cs.yml
+++ b/config/locales/simple_form.cs.yml
@@ -242,11 +242,13 @@ cs:
           warn: Skrýt s varováním
       form_admin_settings:
         activity_api_enabled: Zveřejnit souhrnné statistiky o aktivitě uživatele v API
+        app_icon: Ikona aplikace
         backups_retention_period: Doba uchovávání archivu uživatelů
         bootstrap_timeline_accounts: Vždy doporučovat tyto účty novým uživatelům
         closed_registrations_message: Vlastní zpráva, když přihlášení není k dispozici
         content_cache_retention_period: Doba uchovávání vzdáleného obsahu
         custom_css: Vlastní CSS
+        favicon: Favicon
         mascot: Vlastní maskot (zastaralé)
         media_cache_retention_period: Doba uchovávání mezipaměti médií
         peers_api_enabled: Zveřejnit seznam nalezených serverů v API
diff --git a/config/locales/simple_form.cy.yml b/config/locales/simple_form.cy.yml
index 611223ea665bb2..22545a776a664e 100644
--- a/config/locales/simple_form.cy.yml
+++ b/config/locales/simple_form.cy.yml
@@ -314,6 +314,7 @@ cy:
         listable: Caniatáu i'r hashnod hwn ymddangos mewn chwiliadau ac awgrymiadau
         name: Hashnod
         trendable: Caniatáu i'r hashnod hwn ymddangos o dan bynciau llosg
+        usable: Caniatáu i bostiadau ddefnyddio'r hashnod hwn yn lleol
       user:
         role: Rôl
         time_zone: Cylchfa amser
diff --git a/config/locales/simple_form.es-MX.yml b/config/locales/simple_form.es-MX.yml
index b2c26020dae5e5..733a5c2769635b 100644
--- a/config/locales/simple_form.es-MX.yml
+++ b/config/locales/simple_form.es-MX.yml
@@ -314,7 +314,7 @@ es-MX:
         listable: Permitir que esta etiqueta aparezca en las búsquedas y en el directorio del perfil
         name: Etiqueta
         trendable: Permitir que esta etiqueta aparezca bajo tendencias
-        usable: Permitir a las publicacions usar esta etiqueta localmente
+        usable: Permitir a las publicaciones usar esta etiqueta localmente
       user:
         role: Rol
         time_zone: Zona horaria
diff --git a/config/locales/simple_form.es.yml b/config/locales/simple_form.es.yml
index 0e6cc47e366505..02f0562d28457f 100644
--- a/config/locales/simple_form.es.yml
+++ b/config/locales/simple_form.es.yml
@@ -314,7 +314,7 @@ es:
         listable: Permitir que esta etiqueta aparezca en las búsquedas y en el directorio del perfil
         name: Etiqueta
         trendable: Permitir que esta etiqueta aparezca bajo tendencias
-        usable: Permitir a las publicacions usar esta etiqueta localmente
+        usable: Permitir a las publicaciones usar esta etiqueta localmente
       user:
         role: Rol
         time_zone: Zona horaria
diff --git a/config/locales/simple_form.fi.yml b/config/locales/simple_form.fi.yml
index fa1fd49b3815c9..c20ff9fa5f57f0 100644
--- a/config/locales/simple_form.fi.yml
+++ b/config/locales/simple_form.fi.yml
@@ -6,7 +6,7 @@ fi:
         discoverable: Julkisia julkaisujasi ja profiiliasi voidaan pitää esillä tai suositella Mastodonin eri alueilla ja profiiliasi voidaan ehdottaa toisille käyttäjille.
         display_name: Koko nimesi tai lempinimesi.
         fields: Verkkosivustosi, pronominisi, ikäsi ja mitä ikinä haluatkaan ilmoittaa.
-        indexable: Julkiset julkaisusi voivat näkyä hakutuloksissa Mastodonissa. Ihmiset, jotka ovat olleet vuorovaikutuksessa julkaisujesi kanssa, voivat etsiä niitä asetuksesta riippumatta.
+        indexable: Julkiset julkaisusi voivat näkyä Mastodonin hakutuloksissa. Käyttäjät, jotka ovat olleet vuorovaikutuksessa julkaisujesi kanssa, voivat etsiä niitä asetuksesta riippumatta.
         note: 'Voit @mainita muita käyttäjiä tai #aihetunnisteita.'
         show_collections: Käyttäjät voivat selata seurattujasi ja seuraajiasi. Käyttäjät, joita seuraat, näkevät joka tapauksessa, että seuraat heitä.
         unlocked: Käyttäjät voivat seurata sinua pyytämättä hyväksyntääsi. Poista valinta, jos haluat tarkistaa sekä hyväksyä tai hylätä vastaanottamasi seurantapyynnöt.
@@ -38,7 +38,7 @@ fi:
       appeal:
         text: Voit valittaa varoituksesta vain kerran
       defaults:
-        autofollow: Henkilöt, jotka rekisteröityvät kutsun kautta, seuraavat sinua automaattisesti
+        autofollow: Kutsun kautta rekisteröityvät käyttäjät seuraavat sinua automaattisesti
         avatar: WEBP, PNG, GIF tai JPG. Enintään %{size}. Skaalataan kokoon %{dimensions} px
         bot: Ilmaise muille, että tili suorittaa enimmäkseen automaattisia toimia eikä sitä valvota
         context: Ainakin yksi konteksti, jossa suodattimen pitäisi olla voimassa
@@ -49,14 +49,14 @@ fi:
         header: WEBP, PNG, GIF tai JPG. Enintään %{size}. Skaalataan kokoon %{dimensions} px
         inbox_url: Kopioi URL-osoite haluamasi välittäjän etusivulta
         irreversible: Suodatetut julkaisut katoavat peruuttamattomasti, vaikka suodatin poistettaisiin myöhemmin
-        locale: Käyttöliittymän, sähköpostien ja puskuilmoitusten kieli
+        locale: Käyttöliittymän, sähköpostiviestien ja puskuilmoitusten kieli
         password: Käytä vähintään 8:aa merkkiä
         phrase: Täsmää riippumatta tekstin aakkoslajista tai julkaisun sisältövaroituksesta
         scopes: Mihin ohjelmointirajapintoihin sovelluksella on pääsy. Jos valitset ylätason käyttöoikeuden, sinun ei tarvitse valita yksittäisiä.
         setting_aggregate_reblogs: Älä näytä uusia tehostuksia julkaisuille, joita on äskettäin tehostettu (koskee vain juuri vastaanotettuja tehostuksia)
         setting_always_send_emails: Yleensä sähköposti-ilmoituksia ei lähetetä, kun käytät Mastodonia aktiivisesti
         setting_default_sensitive: Arkaluonteinen media piilotetaan oletusarvoisesti, ja se voidaan näyttää yhdellä napsautuksella
-        setting_display_media_default: Piilota arkaluonteiseksi merkitty media
+        setting_display_media_default: Piilota arkaluonteiseksi merkitty mediasisältö
         setting_display_media_hide_all: Piilota mediasisältö aina
         setting_display_media_show_all: Näytä mediasisältö aina
         setting_use_blurhash: Liukuvärit perustuvat piilotettujen kuvien väreihin mutta sumentavat yksityiskohdat
@@ -89,12 +89,12 @@ fi:
         peers_api_enabled: Luettelo verkkotunnuksista, jotka tämä palvelin on kohdannut fediversumissa. Se ei kerro, federoitko tietyn palvelimen kanssa, vaan että palvelimesi on ylipäätään tietoinen siitä. Tätä tietoa käytetään palveluissa, jotka keräävät tilastoja federoinnista yleisellä tasolla.
         profile_directory: Profiilihakemisto luetteloi kaikki käyttäjät, jotka ovat valinneet olla löydettävissä.
         require_invite_text: Kun rekisteröityminen vaatii manuaalisen hyväksynnän, tee ”Miksi haluat liittyä?” -tekstikentästä pakollinen vapaaehtoisen sijaan
-        site_contact_email: Miten ihmiset voivat tavoittaa sinut oikeus- tai tukikysymyksissä.
-        site_contact_username: Miten ihmiset voivat tavoittaa sinut Mastodonissa.
+        site_contact_email: Miten sinut voi tavoittaa oikeus- tai tukikysymyksissä.
+        site_contact_username: Miten sinut voi tavoittaa Mastodonissa.
         site_extended_description: Kaikki lisätiedot, jotka voivat olla hyödyllisiä kävijöille ja käyttäjille. Voidaan jäsentää Markdown-syntaksilla.
         site_short_description: Lyhyt kuvaus, joka auttaa yksilöimään palvelimesi. Kuka sitä johtaa, ja keille se on tarkoitettu?
         site_terms: Käytä omaa tietosuojakäytäntöä tai jätä tyhjäksi, jos haluat käyttää oletusta. Voidaan jäsentää Markdown-syntaksilla.
-        site_title: Miten ihmiset voivat viitata palvelimeesi sen verkkotunnuksen lisäksi.
+        site_title: Miten palvelimeesi voi viitata sen verkkotunnuksen lisäksi.
         status_page_url: URL-osoite sivulle, josta tämän palvelimen tilan voi ongelmatilanteissa tarkistaa
         theme: Teema, jonka uloskirjautuneet vierailijat ja uudet käyttäjät näkevät.
         thumbnail: Noin 2:1 kuva näkyy palvelimen tietojen ohessa.
@@ -121,7 +121,7 @@ fi:
         hint: Vapaaehtoinen. Anna yksityiskohtaisempia tietoja säännöstä
         text: Kuvaile sääntöä tai edellytystä palvelimesi käyttäjille. Suosi tiivistä, yksinkertaista ilmaisua
       sessions:
-        otp: 'Näppäile mobiilisovelluksessa näkyvä kaksivaiheisen todennuksen tunnusluku, tai käytä tarvittaessa palautuskoodia:'
+        otp: 'Näppäile mobiilisovelluksessa näkyvä kaksivaiheisen todennuksen tunnusluku tai käytä tarvittaessa palautuskoodia:'
         webauthn: Jos kyseessä on USB-avain, muista laittaa se paikalleen ja tarvittaessa napauttaa sitä.
       settings:
         indexable: Profiilisi voi näkyä Googlen, Bingin ja muiden hakukoneiden hakutuloksissa.
@@ -135,7 +135,7 @@ fi:
         color: Väri, jota käytetään roolille kaikkialla käyttöliittymässä, RGB-heksadesimaalimuodossa
         highlighted: Tämä tekee roolista julkisesti näkyvän
         name: Roolin julkinen nimi, jos rooli on asetettu näytettäväksi merkkinä
-        permissions_as_keys: Käyttäjillä, joilla on tämä rooli, on käyttöoikeus...
+        permissions_as_keys: Käyttäjillä, joilla on tämä rooli, on käyttöoikeus…
         position: Korkeampi rooli ratkaisee konfliktit tietyissä tilanteissa. Tiettyjä toimia voidaan suorittaa vain rooleilla, joiden prioriteetti on pienempi
       webhook:
         events: Valitse lähetettävät tapahtumat
@@ -213,7 +213,7 @@ fi:
         setting_delete_modal: Kysy vahvistusta ennen julkaisun poistamista
         setting_disable_hover_cards: Poista käytöstä profiilin esikatselu osoitettaessa
         setting_disable_swiping: Poista pyyhkäisyeleet käytöstä
-        setting_display_media: Median näyttäminen
+        setting_display_media: Median näkyminen
         setting_display_media_default: Oletus
         setting_display_media_hide_all: Piilota kaikki
         setting_display_media_show_all: Näytä kaikki
@@ -224,7 +224,7 @@ fi:
         setting_theme: Sivuston teema
         setting_trends: Näytä päivän trendit
         setting_unfollow_modal: Kysy vahvistusta ennen seuraamisen lopettamista
-        setting_use_blurhash: Käytä värikästä liukusävytystä piilotetulle medialle
+        setting_use_blurhash: Käytä värikästä liukusävytystä piilotetulle mediasisällölle
         setting_use_pending_items: Hidas tila
         severity: Vakavuus
         sign_in_token_attempt: Turvakoodi
@@ -294,7 +294,7 @@ fi:
         follow: Joku seurasi sinua
         follow_request: Joku pyysi lupaa seurata sinua
         mention: Joku mainitsi sinut
-        pending_account: Uusi tili tarvitsee tarkistuksen
+        pending_account: Uusi tili tarvitsee tarkastuksen
         reblog: Joku tehosti julkaisuasi
         report: Uusi raportti lähetettiin
         software_updates:
diff --git a/config/locales/simple_form.tr.yml b/config/locales/simple_form.tr.yml
index 2cc2c1788e2e3b..b07a79d3ebc816 100644
--- a/config/locales/simple_form.tr.yml
+++ b/config/locales/simple_form.tr.yml
@@ -314,6 +314,7 @@ tr:
         listable: Bu etiketin aramalarda ve profil dizininde görünmesine izin ver
         name: Etiket
         trendable: Bu etiketin gündem altında görünmesine izin ver
+        usable: Gönderilerin yerelde bu etiketi kullanmasına izin ver
       user:
         role: Rol
         time_zone: Zaman dilimi
diff --git a/config/locales/simple_form.uk.yml b/config/locales/simple_form.uk.yml
index 45478849b28ece..7d7f0fc7657ddf 100644
--- a/config/locales/simple_form.uk.yml
+++ b/config/locales/simple_form.uk.yml
@@ -77,13 +77,13 @@ uk:
           warn: Сховати відфільтрований вміст за попередженням, у якому вказано заголовок фільтра
       form_admin_settings:
         activity_api_enabled: Кількість локальних опублікованих дописів, активних і нових користувачів у тижневих розрізах
-        app_icon: WEBP, PNG, GIF або JPG. Замінює іконку програми за замовчуванням на мобільних пристроях на власну іконку.
+        app_icon: WEBP, PNG, GIF або JPG. Замінює типову піктограму застосунку на мобільних пристроях на власну.
         backups_retention_period: Користувачі мають можливість створювати архіви своїх дописів, щоб завантажити їх пізніше. Якщо встановлено додатне значення, ці архіви будуть автоматично видалені з вашого сховища через вказану кількість днів.
         bootstrap_timeline_accounts: Ці облікові записи будуть закріплені в топі пропозицій для нових користувачів.
         closed_registrations_message: Показується, коли реєстрація закрита
         content_cache_retention_period: Усі дописи з інших серверів (включно з коментарями та відповідями) будуть видалені через певну кількість днів, незважаючи на будь-яку локальну взаємодію користувачів з цими дописами. Сюди входять дописи, які локальний користувач позначив як закладки або вибране. Приватні згадки між користувачами з різних інстанцій також будуть втрачені і не підлягатимуть відновленню. Використання цього параметра призначено для екземплярів спеціального призначення і порушує багато очікувань користувачів, якщо його застосовано для загального використання.
         custom_css: Ви можете застосувати користувацькі стилі у вебверсії Mastodon.
-        favicon: WEBP, PNG, GIF або JPG. Замінює стандартну піктограму Mastodon на власну піктограму.
+        favicon: WEBP, PNG, GIF або JPG. Замінює стандартну піктограму Mastodon на власну.
         mascot: Змінює ілюстрацію в розширеному вебінтерфейсі.
         media_cache_retention_period: Медіафайли з дописів віддалених користувачів кешуються на вашому сервері. Якщо встановлено додатне значення, медіа буде видалено через вказану кількість днів. Якщо медіа-дані будуть запитані після видалення, вони будуть завантажені повторно, якщо вихідний вміст все ще доступний. Через обмеження на частоту опитування карток попереднього перегляду посилань на сторонніх сайтах, рекомендується встановити це значення не менше 14 днів, інакше картки попереднього перегляду посилань не будуть оновлюватися на вимогу раніше цього часу.
         peers_api_enabled: Список доменів імен цього сервера з'явився у федівсесвіті. Сюди не входять дані чи ви пов'язані федерацією з цим сервером, а лише відомості, що вашому серверу відомо про нього. Його використовують служби, які збирають загальну статистику про федерації.
@@ -243,13 +243,13 @@ uk:
           warn: Сховати за попередженням
       form_admin_settings:
         activity_api_enabled: Публікація агрегованої статистики про активність користувачів
-        app_icon: Значок застосунку
+        app_icon: Піктограма застосунку
         backups_retention_period: Період утримання архіву користувача
         bootstrap_timeline_accounts: Завжди рекомендувати новим користувачам ці облікові записи
         closed_registrations_message: Показуване повідомлення, якщо реєстрація недоступна
         content_cache_retention_period: Період збереження віддаленого вмісту
         custom_css: Користувацький CSS
-        favicon: Значок сайту
+        favicon: Піктограма сайту
         mascot: Користувацький символ (застарілий)
         media_cache_retention_period: Період збереження кешу медіа
         peers_api_enabled: Опублікувати список знайдених серверів у API
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index f561781e59ead9..dac16917f5b05d 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -885,7 +885,23 @@ tr:
         action: Daha fazla bilgi için buraya göz atın
         message_html: "<strong>Nesne depolamanız hatalı yapılandırılmış. Kullanıcılarınızın gizliliği tehlikede.</strong>"
     tags:
+      moderation:
+        not_trendable: Öne çıkarılamaz
+        not_usable: Kullanılamaz
+        pending_review: İnceleme bekliyor
+        review_requested: İnceleme istendi
+        reviewed: İncelendi
+        title: Durum
+        trendable: Öne çıkarılabilir
+        unreviewed: İncelenmemiş
+        usable: Kullanılabilir
+      name: Ad
+      newest: En yeni
+      oldest: En eski
+      reset: Sıfırla
       review: Durumu gözden geçir
+      search: Ara
+      title: Etiketler
       updated_msg: Etiket ayarları başarıyla güncellendi
     title: Yönetim
     trends:
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 31ce3e6b7989fe..e7aa5e40846a0e 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -292,7 +292,7 @@ uk:
         update_custom_emoji_html: "%{name} оновлює емодзі %{target}"
         update_domain_block_html: "%{name} оновлює блокування домену для %{target}"
         update_ip_block_html: "%{name} змінює правило для IP %{target}"
-        update_report_html: "%{name} оновлений звіт %{target}"
+        update_report_html: "%{name} оновлює звіт %{target}"
         update_status_html: "%{name} оновлює допис %{target}"
         update_user_role_html: "%{name} змінює роль %{target}"
       deleted_account: видалений обліковий запис

From 656373817ef10b6d988a0d69259839ed29ced632 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 5 Aug 2024 13:30:35 +0200
Subject: [PATCH 1716/2191] chore(deps): update dependency bootsnap to v1.18.4
 (#31297)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index e1382732cbe5c9..699e2f83e1eb36 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -135,7 +135,7 @@ GEM
     binding_of_caller (1.0.1)
       debug_inspector (>= 1.2.0)
     blurhash (0.1.7)
-    bootsnap (1.18.3)
+    bootsnap (1.18.4)
       msgpack (~> 1.2)
     brakeman (6.1.2)
       racc

From c01a6a6eeb055c594df9b846d60afe05465b56f3 Mon Sep 17 00:00:00 2001
From: Valtteri Laitinen <dev@valtlai.fi>
Date: Mon, 5 Aug 2024 14:35:16 +0300
Subject: [PATCH 1717/2191] Improve look of verified header fields in profile
 (#31275)

---
 app/javascript/styles/mastodon/components.scss | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 583b5d4c5ae124..fa25a08150f6f7 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -8081,16 +8081,17 @@ noscript {
       .verified {
         border: 1px solid rgba($valid-value-color, 0.5);
         margin-top: -1px;
+        margin-inline: -1px;
 
         &:first-child {
           border-top-left-radius: 4px;
           border-top-right-radius: 4px;
-          margin-top: 0;
         }
 
         &:last-child {
           border-bottom-left-radius: 4px;
           border-bottom-right-radius: 4px;
+          margin-bottom: -1px;
         }
 
         dt,

From c2cde41eb98a2a412bf0f5b7c32b076e9ddf14e4 Mon Sep 17 00:00:00 2001
From: Essem <smswessem@gmail.com>
Date: Sun, 4 Aug 2024 19:13:04 -0500
Subject: [PATCH 1718/2191] Fix reblog reactions being hydrated improperly

---
 app/lib/status_cache_hydrator.rb | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/lib/status_cache_hydrator.rb b/app/lib/status_cache_hydrator.rb
index e3c9e49847edc2..baeec20d52968a 100644
--- a/app/lib/status_cache_hydrator.rb
+++ b/app/lib/status_cache_hydrator.rb
@@ -32,7 +32,7 @@ def hydrate_non_reblog_payload(empty_payload, account_id)
       payload[:bookmarked] = Bookmark.exists?(account_id: account_id, status_id: @status.id)
       payload[:pinned]     = StatusPin.exists?(account_id: account_id, status_id: @status.id) if @status.account_id == account_id
       payload[:filtered]   = mapped_applied_custom_filter(account_id, @status)
-      payload[:reactions]  = serialized_reactions(account_id)
+      payload[:reactions]  = serialized_reactions(account_id, @status)
 
       if payload[:poll]
         payload[:poll][:voted] = @status.account_id == account_id
@@ -58,7 +58,7 @@ def hydrate_reblog_payload(empty_payload, account_id)
       payload[:reblog][:bookmarked] = Bookmark.exists?(account_id: account_id, status_id: @status.reblog_of_id)
       payload[:reblog][:pinned]     = StatusPin.exists?(account_id: account_id, status_id: @status.reblog_of_id) if @status.reblog.account_id == account_id
       payload[:reblog][:filtered]   = payload[:filtered]
-      payload[:reblog][:reactions]  = serialized_reactions(account_id)
+      payload[:reblog][:reactions]  = serialized_reactions(account_id, @status.reblog)
 
       if payload[:reblog][:poll]
         if @status.reblog.account_id == account_id
@@ -73,7 +73,6 @@ def hydrate_reblog_payload(empty_payload, account_id)
 
       payload[:favourited] = payload[:reblog][:favourited]
       payload[:reblogged]  = payload[:reblog][:reblogged]
-      payload[:reactions]  = payload[:reblog][:reactions]
     end
   end
 
@@ -90,8 +89,8 @@ def serialized_filter(filter)
     ).as_json
   end
 
-  def serialized_reactions(account_id)
-    reactions = @status.reactions(account_id)
+  def serialized_reactions(account_id, status)
+    reactions = status.reactions(account_id)
     ActiveModelSerializers::SerializableResource.new(
       reactions,
       each_serializer: REST::ReactionSerializer,

From 4e0b287075b3504a5c07fe0771252b109128c9cd Mon Sep 17 00:00:00 2001
From: Jeremy Kescher <jeremy@kescher.at>
Date: Mon, 5 Aug 2024 21:46:46 +0200
Subject: [PATCH 1719/2191] Bump Catstodon revision to 1.0.7

---
 CHANGELOG.md            | 5 +++++
 lib/mastodon/version.rb | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0b52a96a3e3dcc..be3d6796b75790 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,11 @@ All changes to Catstodon that aren't Mastodon or glitch-soc Mastodon changes wil
 
 All release dates, as well as most other dates, are intended to be read as "within the day, in UTC time."
 
+## [4.3.0-alpha.5+glitch+cat+1.0.7] - 2024-08-05
+
+- Emoji reaction patch changes
+  - "Fix reblog reactions being hydrated improperly" by Essem
+
 ## [4.3.0-alpha.5+glitch+cat+1.0.6] - 2024-08-04
 
 - Upstream changes
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index a757fbbe7999ad..9230c1d52c4a2c 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -25,7 +25,7 @@ def prerelease
     end
 
     def catstodon_revision
-      '1.0.6'
+      '1.0.7'
     end
 
     def build_metadata

From 97b9e8befd7355af7a2a2905a16f5f0527f0b48c Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Tue, 6 Aug 2024 08:53:59 +0200
Subject: [PATCH 1720/2191] Add account notes to hover cards (#31300)

---
 .../components/hover_card_account.tsx         | 18 ++++++++++++++++++
 .../account/components/account_note.jsx       |  2 +-
 app/javascript/mastodon/locales/en.json       |  2 +-
 .../styles/mastodon/components.scss           | 19 +++++++++++++++++++
 4 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/app/javascript/mastodon/components/hover_card_account.tsx b/app/javascript/mastodon/components/hover_card_account.tsx
index 8933e14a9875f9..05033e4ac7d38e 100644
--- a/app/javascript/mastodon/components/hover_card_account.tsx
+++ b/app/javascript/mastodon/components/hover_card_account.tsx
@@ -1,5 +1,7 @@
 import { useEffect, forwardRef } from 'react';
 
+import { FormattedMessage } from 'react-intl';
+
 import classNames from 'classnames';
 import { Link } from 'react-router-dom';
 
@@ -25,6 +27,11 @@ export const HoverCardAccount = forwardRef<
     accountId ? state.accounts.get(accountId) : undefined,
   );
 
+  const note = useAppSelector(
+    (state) =>
+      state.relationships.getIn([accountId, 'note']) as string | undefined,
+  );
+
   useEffect(() => {
     if (accountId && !account) {
       dispatch(fetchAccount(accountId));
@@ -53,6 +60,17 @@ export const HoverCardAccount = forwardRef<
               className='hover-card__bio'
             />
             <AccountFields fields={account.fields} limit={2} />
+            {note && note.length > 0 && (
+              <dl className='hover-card__note'>
+                <dt className='hover-card__note-label'>
+                  <FormattedMessage
+                    id='account.account_note_header'
+                    defaultMessage='Personal note'
+                  />
+                </dt>
+                <dd>{note}</dd>
+              </dl>
+            )}
           </div>
 
           <div className='hover-card__number'>
diff --git a/app/javascript/mastodon/features/account/components/account_note.jsx b/app/javascript/mastodon/features/account/components/account_note.jsx
index 272a4ee312c08d..e736e7ad64db3e 100644
--- a/app/javascript/mastodon/features/account/components/account_note.jsx
+++ b/app/javascript/mastodon/features/account/components/account_note.jsx
@@ -151,7 +151,7 @@ class AccountNote extends ImmutablePureComponent {
     return (
       <div className='account__header__account-note'>
         <label htmlFor={`account-note-${account.get('id')}`}>
-          <FormattedMessage id='account.account_note_header' defaultMessage='Note' /> <InlineAlert show={saved} />
+          <FormattedMessage id='account.account_note_header' defaultMessage='Personal note' /> <InlineAlert show={saved} />
         </label>
 
         <Textarea
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index e9a1d1899fc09a..a6fa4764b26936 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -11,7 +11,7 @@
   "about.not_available": "This information has not been made available on this server.",
   "about.powered_by": "Decentralized social media powered by {mastodon}",
   "about.rules": "Server rules",
-  "account.account_note_header": "Note",
+  "account.account_note_header": "Personal note",
   "account.add_or_remove_from_list": "Add or Remove from lists",
   "account.badges.bot": "Automated",
   "account.badges.group": "Group",
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index fa25a08150f6f7..8ecda33aab5677 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -10628,6 +10628,25 @@ noscript {
     }
   }
 
+  &__note {
+    &-label {
+      color: $dark-text-color;
+      font-size: 12px;
+      font-weight: 500;
+      text-transform: uppercase;
+    }
+
+    dd {
+      white-space: pre-line;
+      color: $secondary-text-color;
+      overflow: hidden;
+      line-clamp: 3; // Not yet supported in browers
+      display: -webkit-box; // The next 3 properties are needed
+      -webkit-line-clamp: 3;
+      -webkit-box-orient: vertical;
+    }
+  }
+
   .display-name {
     font-size: 15px;
     line-height: 22px;

From d15f46a0b888ff668a5eb3d97b222da2320a1634 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 6 Aug 2024 09:22:38 +0200
Subject: [PATCH 1721/2191] New Crowdin Translations (automated) (#31307)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/es-MX.json |  2 ++
 app/javascript/mastodon/locales/es.json    |  2 ++
 app/javascript/mastodon/locales/it.json    |  2 +-
 app/javascript/mastodon/locales/ko.json    |  2 +-
 app/javascript/mastodon/locales/sk.json    |  2 ++
 config/locales/da.yml                      | 12 ++++++------
 config/locales/simple_form.sk.yml          |  2 +-
 config/locales/sk.yml                      |  8 ++++----
 8 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/app/javascript/mastodon/locales/es-MX.json b/app/javascript/mastodon/locales/es-MX.json
index 7fe0ae1ba1ad86..93534ce105aafa 100644
--- a/app/javascript/mastodon/locales/es-MX.json
+++ b/app/javascript/mastodon/locales/es-MX.json
@@ -505,6 +505,8 @@
   "notification.update": "{name} editó una publicación",
   "notification_requests.accept": "Aceptar",
   "notification_requests.dismiss": "Descartar",
+  "notification_requests.maximize": "Maximizar",
+  "notification_requests.minimize_banner": "Minimizar banner de notificaciones filtradas",
   "notification_requests.notifications_from": "Notificaciones de {name}",
   "notification_requests.title": "Notificaciones filtradas",
   "notifications.clear": "Limpiar notificaciones",
diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json
index 3fb1cdf0945fde..253416a838454d 100644
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@@ -505,6 +505,8 @@
   "notification.update": "{name} editó una publicación",
   "notification_requests.accept": "Aceptar",
   "notification_requests.dismiss": "Descartar",
+  "notification_requests.maximize": "Maximizar",
+  "notification_requests.minimize_banner": "Minimizar banner de notificaciones filtradas",
   "notification_requests.notifications_from": "Notificaciones de {name}",
   "notification_requests.title": "Notificaciones filtradas",
   "notifications.clear": "Limpiar notificaciones",
diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json
index b317e9e64cb53b..c0980edc04ee49 100644
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@@ -506,7 +506,7 @@
   "notification_requests.accept": "Accetta",
   "notification_requests.dismiss": "Ignora",
   "notification_requests.maximize": "Ingrandisci",
-  "notification_requests.minimize_banner": "Riduci al minimo il banner delle notifiche filtrate",
+  "notification_requests.minimize_banner": "Minimizza il banner delle notifiche filtrate",
   "notification_requests.notifications_from": "Notifiche da {name}",
   "notification_requests.title": "Notifiche filtrate",
   "notifications.clear": "Cancella le notifiche",
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index a9b634dbaeba37..be060065f2bb86 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -804,7 +804,7 @@
   "upload_error.limit": "파일 업로드 제한에 도달했습니다.",
   "upload_error.poll": "파일 업로드는 설문과 함께 쓸 수 없습니다.",
   "upload_form.audio_description": "청각 장애인을 위한 설명",
-  "upload_form.description": "시각장애인을 위한 설명",
+  "upload_form.description": "시각장애인이나 저시력자를 위한 설명",
   "upload_form.edit": "수정",
   "upload_form.thumbnail": "썸네일 변경",
   "upload_form.video_description": "청각, 시각 장애인을 위한 설명",
diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json
index 57cfd25bf7e6e3..665c85dd41d3e5 100644
--- a/app/javascript/mastodon/locales/sk.json
+++ b/app/javascript/mastodon/locales/sk.json
@@ -215,6 +215,7 @@
   "domain_block_modal.title": "Blokovať doménu?",
   "domain_block_modal.you_will_lose_followers": "Všetci tvoji nasledovatelia z tohto servera budú odstránení.",
   "domain_block_modal.you_wont_see_posts": "Neuvidíš príspevky, ani oboznámenia od užívateľov na tomto serveri.",
+  "domain_pill.activitypub_like_language": "ActivityPub je ako jazyk, ktorým Mastodon hovorí s ostatnými sociálnymi sieťami.",
   "domain_pill.server": "Server",
   "domain_pill.their_server": "Ich digitálny domov, kde žijú všetky ich príspevky.",
   "domain_pill.username": "Používateľské meno",
@@ -640,6 +641,7 @@
   "report_notification.categories.other_sentence": "ostatné",
   "report_notification.categories.spam": "Spam",
   "report_notification.categories.violation": "Porušenie pravidla",
+  "report_notification.categories.violation_sentence": "porušenie pravidla",
   "report_notification.open": "Otvoriť hlásenie",
   "search.no_recent_searches": "Žiadne nedávne vyhľadávania",
   "search.placeholder": "Hľadať",
diff --git a/config/locales/da.yml b/config/locales/da.yml
index 90a669ccb9d5f1..f2329ea9b3942e 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -888,8 +888,8 @@ da:
       moderation:
         not_trendable: Ikke trendegnet
         not_usable: Ikke brugbar
-        pending_review: Afventer revision
-        review_requested: Revision anmodet
+        pending_review: Afventer gennemgang
+        review_requested: Gennemgang ønsket
         reviewed: Revideret
         title: Status
         trendable: Trendegnet
@@ -899,7 +899,7 @@ da:
       newest: Seneste
       oldest: Ældste
       reset: Nulstil
-      review: Revisionsstatus
+      review: Gennmgangsstatus
       search: Søg
       title: Hashtags
       updated_msg: Hashtag-indstillinger opdateret
@@ -924,7 +924,7 @@ da:
         usage_comparison: Delt %{today} gange i dag, sammenlignet med %{yesterday} i går
       not_allowed_to_trend: Ikke tilladt at trende
       only_allowed: Kun tilladte
-      pending_review: Afventer revision
+      pending_review: Afventer gennemgang
       preview_card_providers:
         allowed: Links fra denne udgiver kan trende
         description_html: Disse er domæner, hvorfra links ofte deles på serveren. Links vil ikke trende offentligt, medmindre man har godkendt domænet for linket. Godkendelse/afvisning indbefatter underdomæner.
@@ -1024,14 +1024,14 @@ da:
       body: Nye Mastodon-versioner er udgivet. Opgradering bør overvejes!
       subject: Nye Mastodon-versioner er tilgængelige til %{instance}!
     new_trends:
-      body: 'Flg. emner kræver revision, inden de kan vises offentligt:'
+      body: 'Flg. emner kræver gennemgang, inden de kan vises offentligt:'
       new_trending_links:
         title: Populære links
       new_trending_statuses:
         title: Populære opslag
       new_trending_tags:
         title: Populære hashtags
-      subject: Nye tendenser klar til revision på %{instance}
+      subject: Nye tendenser klar til gennemgang på %{instance}
   aliases:
     add_new: Opret alias
     created_msg: Nyt alias oprettet. Du kan nu påbegynde flytningen fra den gamle konto.
diff --git a/config/locales/simple_form.sk.yml b/config/locales/simple_form.sk.yml
index fa15a6e3f7f10c..9d3845e7a752a6 100644
--- a/config/locales/simple_form.sk.yml
+++ b/config/locales/simple_form.sk.yml
@@ -15,7 +15,7 @@ sk:
         type_html: Vyber si, čo urobiť s účtom <strong>%{acct}</strong>
         warning_preset_id: Voliteľné. Stále môžeš vložiť vlastný text na samý koniec predlohy
       defaults:
-        autofollow: Ľudia ktorí sa zaregistrujú prostredníctvom pozvánky, ťa budú inheď následovať
+        autofollow: Ľudia ktorí sa zaregistrujú prostredníctvom pozvánky, ťa budú inheď nasledovať
         avatar: WEBP, PNG, GIF, alebo JPG. Najviac %{size}. Bude zmenšený na %{dimensions}px
         bot: Tento účet vykonáva hlavne automatizované akcie, a je pravdepodobne nespravovaný
         context: Jedno, alebo viac kritérií, v ktorých má byť filtrovanie uplatnené
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index f10815129dd286..cedb5d614a5362 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -19,7 +19,7 @@ sk:
     link_verified_on: Vlastníctvo tohto odkazu bolo skontrolované %{date}
     nothing_here: Nič tu nie je!
     pin_errors:
-      following: Musíš už následovať toho človeka, ktorého si praješ zviditeľniť
+      following: Už musíš nasledovať toho človeka, ktorého si praješ zviditeľniť
     posts:
       few: Príspevky
       many: Príspevkov
@@ -837,7 +837,7 @@ sk:
     description:
       prefix_invited_by_user: "@%{name} ťa pozýva na tento Mastodon server!"
       prefix_sign_up: Zaregistruj sa na Mastodone už dnes!
-      suffix: S pomocou účtu budeš môcť nasledovať ľudí, posielať príspevky, a vymieňať si správy s užívateľmi na hocijakom Mastodon serveri, ale aj na iných serveroch!
+      suffix: S účtom budeš môcť nasledovať ľudí, posielať príspevky, a vymieňať si správy s užívateľmi z hocijakého Mastodon servera a viac!
     dont_have_your_security_key: Nemáš svoj bezpečnostný kľúč?
     forgot_password: Zabudnuté heslo?
     invalid_reset_password_token: Token na obnovu hesla vypršal. Prosím vypítaj si nový.
@@ -1129,7 +1129,7 @@ sk:
       title: Nový sledovateľ
     follow_request:
       action: Spravuj žiadosti o sledovanie
-      body: "%{name} žiada povolenie ťa následovať"
+      body: "%{name} si žiada ťa nasledovať"
       subject: "%{name} ťa žiadá o možnosť sledovania"
       title: Nová žiadosť o následovanie
     mention:
@@ -1408,7 +1408,7 @@ sk:
       subject: Vitaj na Mastodone
       title: Vitaj na palube, %{name}!
   users:
-    follow_limit_reached: Nemôžeš následovať viac ako %{limit} ľudí
+    follow_limit_reached: Nemôžeš nasledovať viac ako %{limit} ľudí
     invalid_otp_token: Neplatný kód pre dvojfaktorovú autentikáciu
     otp_lost_help_html: Pokiaľ si stratil/a prístup k obom, môžeš dať vedieť %{email}
     rate_limited: Príliš veľa pokusov o overenie, skús to znova neskôr.

From 135493c0b4d87ed9d2fb0d1dcc81f8b7f6315e42 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 6 Aug 2024 09:47:03 +0200
Subject: [PATCH 1722/2191] chore(deps): update dependency rubocop-rspec to
 v3.0.4 (#31301)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 699e2f83e1eb36..e4d787eb6463d6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -758,7 +758,7 @@ GEM
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rspec (3.0.3)
+    rubocop-rspec (3.0.4)
       rubocop (~> 1.61)
     rubocop-rspec_rails (2.30.0)
       rubocop (~> 1.61)

From e9e63ed203996a4e06e31a7220e9d8a2df71f67c Mon Sep 17 00:00:00 2001
From: Christian Schmidt <github@chsc.dk>
Date: Tue, 6 Aug 2024 09:52:47 +0200
Subject: [PATCH 1723/2191] Support JSON-LD named graph (#31288)

---
 app/lib/link_details_extractor.rb       |  4 ++-
 spec/lib/link_details_extractor_spec.rb | 36 ++++++++++++++++++-------
 2 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/app/lib/link_details_extractor.rb b/app/lib/link_details_extractor.rb
index bd78aef7a9f56c..6929fc1b0f0f13 100644
--- a/app/lib/link_details_extractor.rb
+++ b/app/lib/link_details_extractor.rb
@@ -101,7 +101,9 @@ def root_array(root)
     end
 
     def json
-      @json ||= root_array(Oj.load(@data)).compact.find { |obj| SUPPORTED_TYPES.include?(obj['@type']) } || {}
+      @json ||= root_array(Oj.load(@data))
+                .map { |node| JSON::LD::API.compact(node, 'https://schema.org') }
+                .find { |node| SUPPORTED_TYPES.include?(node['type']) } || {}
     end
   end
 
diff --git a/spec/lib/link_details_extractor_spec.rb b/spec/lib/link_details_extractor_spec.rb
index b1e5cedced3b2d..7ceb6f511d3913 100644
--- a/spec/lib/link_details_extractor_spec.rb
+++ b/spec/lib/link_details_extractor_spec.rb
@@ -79,6 +79,16 @@
         },
       }.to_json
     end
+    let(:html) { <<~HTML }
+      <!doctype html>
+      <html>
+      <body>
+        <script type="application/ld+json">
+          #{ld_json}
+        </script>
+      </body>
+      </html>
+    HTML
 
     shared_examples 'structured data' do
       it 'extracts the expected values from structured data' do
@@ -224,21 +234,27 @@
           },
         }.to_json
       end
-      let(:html) { <<~HTML }
-        <!doctype html>
-        <html>
-        <body>
-          <script type="application/ld+json">
-            #{ld_json}
-          </script>
-        </body>
-        </html>
-      HTML
 
       it 'joins author names' do
         expect(subject.author_name).to eq 'Author 1, Author 2'
       end
     end
+
+    context 'with named graph' do
+      let(:ld_json) do
+        {
+          '@context' => 'https://schema.org',
+          '@graph' => [
+            '@type' => 'NewsArticle',
+            'headline' => "What's in a name",
+          ],
+        }.to_json
+      end
+
+      it 'descends into @graph node' do
+        expect(subject.title).to eq "What's in a name"
+      end
+    end
   end
 
   context 'when Open Graph protocol data is present' do

From 103e544cfaadd33f33369cf6e8496accbebc3906 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 6 Aug 2024 07:54:00 +0000
Subject: [PATCH 1724/2191] fix(deps): update dependency @reduxjs/toolkit to
 v2.2.7 - abandoned (#31173)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
---
 app/javascript/mastodon/store/typed_functions.ts | 2 +-
 yarn.lock                                        | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/javascript/mastodon/store/typed_functions.ts b/app/javascript/mastodon/store/typed_functions.ts
index e5820149dbd9d7..98d0d31fa32dd8 100644
--- a/app/javascript/mastodon/store/typed_functions.ts
+++ b/app/javascript/mastodon/store/typed_functions.ts
@@ -2,7 +2,7 @@ import { createAsyncThunk } from '@reduxjs/toolkit';
 // eslint-disable-next-line @typescript-eslint/no-restricted-imports
 import { useDispatch, useSelector } from 'react-redux';
 
-import type { BaseThunkAPI } from '@reduxjs/toolkit/dist/createAsyncThunk';
+import type { BaseThunkAPI } from '@reduxjs/toolkit/src/createAsyncThunk';
 
 import type { AppDispatch, RootState } from './store';
 
diff --git a/yarn.lock b/yarn.lock
index 9786925f65df8f..ea934cac9d45d6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3122,8 +3122,8 @@ __metadata:
   linkType: hard
 
 "@reduxjs/toolkit@npm:^2.0.1":
-  version: 2.2.6
-  resolution: "@reduxjs/toolkit@npm:2.2.6"
+  version: 2.2.7
+  resolution: "@reduxjs/toolkit@npm:2.2.7"
   dependencies:
     immer: "npm:^10.0.3"
     redux: "npm:^5.0.1"
@@ -3137,7 +3137,7 @@ __metadata:
       optional: true
     react-redux:
       optional: true
-  checksum: 10c0/60af753e6d02c8acd3c5bc843c846d60b19821d93ff9f4415fa7011ebf17a85301ed42132fabc1aaee8523d8f61418b5ba164a11c31ab29937e485842d3744a0
+  checksum: 10c0/7761a91adac2b5e1d50a8163ba5441480bb86a3a80b7583037c27a88463394b132dd7592862fc2be03aa7ab98a6e1710549889986dc0d3f033c169a3ba2cb02e
   languageName: node
   linkType: hard
 

From 9d0cafd06b45bd8169727d8994a849a222c3515e Mon Sep 17 00:00:00 2001
From: Christian Schmidt <github@chsc.dk>
Date: Tue, 6 Aug 2024 10:23:48 +0200
Subject: [PATCH 1725/2191] Check Content-Length in ResponseWithLimitAdapter
 (#31285)

---
 app/lib/request.rb                            |  8 +-
 lib/paperclip/response_with_limit_adapter.rb  |  7 +-
 .../response_with_limit_adapter_spec.rb       | 93 +++++++++++++++++++
 spec/lib/request_spec.rb                      |  8 +-
 4 files changed, 107 insertions(+), 9 deletions(-)
 create mode 100644 spec/lib/paperclip/response_with_limit_adapter_spec.rb

diff --git a/app/lib/request.rb b/app/lib/request.rb
index 8d4120868d4feb..ab42e823009047 100644
--- a/app/lib/request.rb
+++ b/app/lib/request.rb
@@ -234,13 +234,17 @@ def truncated_body(limit = 1.megabyte)
     end
 
     def body_with_limit(limit = 1.megabyte)
-      raise Mastodon::LengthValidationError if content_length.present? && content_length > limit
+      require_limit_not_exceeded!(limit)
 
       contents = truncated_body(limit)
-      raise Mastodon::LengthValidationError if contents.bytesize > limit
+      raise Mastodon::LengthValidationError, "Body size exceeds limit of #{limit}" if contents.bytesize > limit
 
       contents
     end
+
+    def require_limit_not_exceeded!(limit)
+      raise Mastodon::LengthValidationError, "Content-Length #{content_length} exceeds limit of #{limit}" if content_length.present? && content_length > limit
+    end
   end
 
   if ::HTTP::Response.methods.include?(:body_with_limit) && !Rails.env.production?
diff --git a/lib/paperclip/response_with_limit_adapter.rb b/lib/paperclip/response_with_limit_adapter.rb
index ff7a938abb3967..6c01d9825da27d 100644
--- a/lib/paperclip/response_with_limit_adapter.rb
+++ b/lib/paperclip/response_with_limit_adapter.rb
@@ -16,6 +16,8 @@ def initialize(target, options = {})
     private
 
     def cache_current_values
+      @target.response.require_limit_not_exceeded!(@target.limit)
+
       @original_filename = truncated_filename
       @tempfile = copy_to_tempfile(@target)
       @content_type = ContentTypeDetector.new(@tempfile.path).detect
@@ -27,16 +29,15 @@ def copy_to_tempfile(source)
 
       source.response.body.each do |chunk|
         bytes_read += chunk.bytesize
+        raise Mastodon::LengthValidationError, "Body size exceeds limit of #{source.limit}" if bytes_read > source.limit
 
         destination.write(chunk)
         chunk.clear
-
-        raise Mastodon::LengthValidationError if bytes_read > source.limit
       end
 
       destination.rewind
       destination
-    rescue Mastodon::LengthValidationError
+    rescue
       destination.close(true)
       raise
     ensure
diff --git a/spec/lib/paperclip/response_with_limit_adapter_spec.rb b/spec/lib/paperclip/response_with_limit_adapter_spec.rb
new file mode 100644
index 00000000000000..baf8bf5bb72b59
--- /dev/null
+++ b/spec/lib/paperclip/response_with_limit_adapter_spec.rb
@@ -0,0 +1,93 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe Paperclip::ResponseWithLimitAdapter do
+  subject { described_class.new(response_with_limit) }
+
+  before { stub_request(:get, url).to_return(headers: headers, body: body) }
+
+  let(:response_with_limit) { ResponseWithLimit.new(response, 50.kilobytes) }
+  let(:response) { Request.new(:get, url).perform(&:itself) }
+  let(:url) { 'https://example.com/dir/foo.png' }
+  let(:headers) { nil }
+  let(:body) { attachment_fixture('600x400.jpeg').binmode.read }
+
+  it 'writes temporary file' do
+    expect(subject.tempfile.read).to eq body
+    expect(subject.size).to eq body.bytesize
+  end
+
+  context 'with Content-Disposition header' do
+    let(:headers) { { 'Content-Disposition' => 'attachment; filename="bar.png"' } }
+
+    it 'uses filename from header' do
+      expect(subject.original_filename).to eq 'bar.png'
+    end
+
+    it 'detects MIME type from content' do
+      expect(subject.content_type).to eq 'image/jpeg'
+    end
+  end
+
+  context 'without Content-Disposition header' do
+    it 'uses filename from path' do
+      expect(subject.original_filename).to eq 'foo.png'
+    end
+
+    it 'detects MIME type from content' do
+      expect(subject.content_type).to eq 'image/jpeg'
+    end
+  end
+
+  context 'without filename in path' do
+    let(:url) { 'https://example.com/' }
+
+    it 'falls back to "data"' do
+      expect(subject.original_filename).to eq 'data'
+    end
+
+    it 'detects MIME type from content' do
+      expect(subject.content_type).to eq 'image/jpeg'
+    end
+  end
+
+  context 'with very long filename' do
+    let(:url) { 'https://example.com/abcdefghijklmnopqrstuvwxyz.0123456789' }
+
+    it 'truncates the filename' do
+      expect(subject.original_filename).to eq 'abcdefghijklmnopqrst.0123'
+    end
+  end
+
+  context 'when response size exceeds limit' do
+    context 'with Content-Length header' do
+      let(:headers) { { 'Content-Length' => 5.megabytes } }
+
+      it 'raises without reading the body' do
+        allow(response).to receive(:body).and_call_original
+
+        expect { subject }.to raise_error(Mastodon::LengthValidationError, 'Content-Length 5242880 exceeds limit of 51200')
+
+        expect(response).to_not have_received(:body)
+      end
+    end
+
+    context 'without Content-Length header' do
+      let(:body) { SecureRandom.random_bytes(1.megabyte) }
+
+      it 'raises while reading the body' do
+        expect { subject }.to raise_error(Mastodon::LengthValidationError, 'Body size exceeds limit of 51200')
+        expect(response.content_length).to be_nil
+      end
+    end
+  end
+
+  context 'when response times out' do
+    it 'raises' do
+      allow(response.body.connection).to receive(:readpartial).and_raise(HTTP::TimeoutError)
+
+      expect { subject }.to raise_error(HTTP::TimeoutError)
+    end
+  end
+end
diff --git a/spec/lib/request_spec.rb b/spec/lib/request_spec.rb
index c7620cf9b6eae1..c99f18838ba432 100644
--- a/spec/lib/request_spec.rb
+++ b/spec/lib/request_spec.rb
@@ -100,7 +100,7 @@
   describe "response's body_with_limit method" do
     it 'rejects body more than 1 megabyte by default' do
       stub_request(:any, 'http://example.com').to_return(body: SecureRandom.random_bytes(2.megabytes))
-      expect { subject.perform(&:body_with_limit) }.to raise_error Mastodon::LengthValidationError
+      expect { subject.perform(&:body_with_limit) }.to raise_error(Mastodon::LengthValidationError, 'Body size exceeds limit of 1048576')
     end
 
     it 'accepts body less than 1 megabyte by default' do
@@ -110,17 +110,17 @@
 
     it 'rejects body by given size' do
       stub_request(:any, 'http://example.com').to_return(body: SecureRandom.random_bytes(2.kilobytes))
-      expect { subject.perform { |response| response.body_with_limit(1.kilobyte) } }.to raise_error Mastodon::LengthValidationError
+      expect { subject.perform { |response| response.body_with_limit(1.kilobyte) } }.to raise_error(Mastodon::LengthValidationError, 'Body size exceeds limit of 1024')
     end
 
     it 'rejects too large chunked body' do
       stub_request(:any, 'http://example.com').to_return(body: SecureRandom.random_bytes(2.megabytes), headers: { 'Transfer-Encoding' => 'chunked' })
-      expect { subject.perform(&:body_with_limit) }.to raise_error Mastodon::LengthValidationError
+      expect { subject.perform(&:body_with_limit) }.to raise_error(Mastodon::LengthValidationError, 'Body size exceeds limit of 1048576')
     end
 
     it 'rejects too large monolithic body' do
       stub_request(:any, 'http://example.com').to_return(body: SecureRandom.random_bytes(2.megabytes), headers: { 'Content-Length' => 2.megabytes })
-      expect { subject.perform(&:body_with_limit) }.to raise_error Mastodon::LengthValidationError
+      expect { subject.perform(&:body_with_limit) }.to raise_error(Mastodon::LengthValidationError, 'Content-Length 2097152 exceeds limit of 1048576')
     end
 
     it 'truncates large monolithic body' do

From 5d890ebc574a8ec778619c3ddfe2530b3e0a7297 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 6 Aug 2024 12:07:16 +0200
Subject: [PATCH 1726/2191] Delete pending notification requests on block and
 notification mutes (#31310)

---
 app/services/after_block_service.rb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/services/after_block_service.rb b/app/services/after_block_service.rb
index 899e84be44f18b..f0f836a545b229 100644
--- a/app/services/after_block_service.rb
+++ b/app/services/after_block_service.rb
@@ -7,6 +7,7 @@ def call(account, target_account)
 
     clear_home_feed!
     clear_list_feeds!
+    clear_notification_requests!
     clear_notifications!
     clear_conversations!
   end
@@ -28,4 +29,8 @@ def clear_conversations!
   def clear_notifications!
     Notification.where(account: @account).where(from_account: @target_account).in_batches.delete_all
   end
+
+  def clear_notification_requests!
+    NotificationRequest.where(account: @account, from_account: @target_account).destroy_all
+  end
 end

From 438dac99d6afcb5873f5aafee29bf9de2cabb864 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 6 Aug 2024 14:09:35 +0200
Subject: [PATCH 1727/2191] Add option to request partial accounts in grouped
 notifications API (#31299)

---
 .../api/v2_alpha/notifications_controller.rb  | 25 +++++++++++-----
 .../grouped_notifications_presenter.rb        | 27 +++++++++++++++--
 .../dedup_notification_group_serializer.rb    | 15 ++++++++++
 .../api/v2_alpha/notifications_spec.rb        | 30 +++++++++++++++++++
 4 files changed, 88 insertions(+), 9 deletions(-)

diff --git a/app/controllers/api/v2_alpha/notifications_controller.rb b/app/controllers/api/v2_alpha/notifications_controller.rb
index 837499e8984a34..d0205ad6af890e 100644
--- a/app/controllers/api/v2_alpha/notifications_controller.rb
+++ b/app/controllers/api/v2_alpha/notifications_controller.rb
@@ -16,10 +16,10 @@ def index
       @group_metadata = load_group_metadata
       @grouped_notifications = load_grouped_notifications
       @relationships = StatusRelationshipsPresenter.new(target_statuses_from_notifications, current_user&.account_id)
-      @sample_accounts = @grouped_notifications.flat_map(&:sample_accounts)
+      @presenter = GroupedNotificationsPresenter.new(@grouped_notifications, expand_accounts: expand_accounts_param)
 
       # Preload associations to avoid N+1s
-      ActiveRecord::Associations::Preloader.new(records: @sample_accounts, associations: [:account_stat, { user: :role }]).call
+      ActiveRecord::Associations::Preloader.new(records: @presenter.accounts, associations: [:account_stat, { user: :role }]).call
     end
 
     MastodonOTELTracer.in_span('Api::V2Alpha::NotificationsController#index rendering') do |span|
@@ -27,14 +27,14 @@ def index
 
       span.add_attributes(
         'app.notification_grouping.count' => @grouped_notifications.size,
-        'app.notification_grouping.sample_account.count' => @sample_accounts.size,
-        'app.notification_grouping.sample_account.unique_count' => @sample_accounts.pluck(:id).uniq.size,
+        'app.notification_grouping.account.count' => @presenter.accounts.size,
+        'app.notification_grouping.partial_account.count' => @presenter.partial_accounts.size,
         'app.notification_grouping.status.count' => statuses.size,
-        'app.notification_grouping.status.unique_count' => statuses.uniq.size
+        'app.notification_grouping.status.unique_count' => statuses.uniq.size,
+        'app.notification_grouping.expand_accounts_param' => expand_accounts_param
       )
 
-      presenter = GroupedNotificationsPresenter.new(@grouped_notifications)
-      render json: presenter, serializer: REST::DedupNotificationGroupSerializer, relationships: @relationships, group_metadata: @group_metadata
+      render json: @presenter, serializer: REST::DedupNotificationGroupSerializer, relationships: @relationships, group_metadata: @group_metadata, expand_accounts: expand_accounts_param
     end
   end
 
@@ -131,4 +131,15 @@ def browserable_params
   def pagination_params(core_params)
     params.slice(:limit, :types, :exclude_types, :include_filtered).permit(:limit, :include_filtered, types: [], exclude_types: []).merge(core_params)
   end
+
+  def expand_accounts_param
+    case params[:expand_accounts]
+    when nil, 'full'
+      'full'
+    when 'partial_avatars'
+      'partial_avatars'
+    else
+      raise Mastodon::InvalidParameterError, "Invalid value for 'expand_accounts': '#{params[:expand_accounts]}', allowed values are 'full' and 'partial_avatars'"
+    end
+  end
 end
diff --git a/app/presenters/grouped_notifications_presenter.rb b/app/presenters/grouped_notifications_presenter.rb
index f01acfd41c70a2..9ced1d0c7b2402 100644
--- a/app/presenters/grouped_notifications_presenter.rb
+++ b/app/presenters/grouped_notifications_presenter.rb
@@ -1,10 +1,11 @@
 # frozen_string_literal: true
 
 class GroupedNotificationsPresenter < ActiveModelSerializers::Model
-  def initialize(grouped_notifications)
+  def initialize(grouped_notifications, options = {})
     super()
 
     @grouped_notifications = grouped_notifications
+    @options = options
   end
 
   def notification_groups
@@ -16,6 +17,28 @@ def statuses
   end
 
   def accounts
-    @grouped_notifications.flat_map(&:sample_accounts).uniq(&:id)
+    @accounts ||= begin
+      if partial_avatars?
+        @grouped_notifications.map { |group| group.sample_accounts.first }.uniq(&:id)
+      else
+        @grouped_notifications.flat_map(&:sample_accounts).uniq(&:id)
+      end
+    end
+  end
+
+  def partial_accounts
+    @partial_accounts ||= begin
+      if partial_avatars?
+        @grouped_notifications.flat_map { |group| group.sample_accounts[1...] }.uniq(&:id).filter { |account| accounts.exclude?(account) }
+      else
+        []
+      end
+    end
+  end
+
+  private
+
+  def partial_avatars?
+    @options[:expand_accounts] == 'partial_avatars'
   end
 end
diff --git a/app/serializers/rest/dedup_notification_group_serializer.rb b/app/serializers/rest/dedup_notification_group_serializer.rb
index fd0c6b3c415a91..4f02505e25f295 100644
--- a/app/serializers/rest/dedup_notification_group_serializer.rb
+++ b/app/serializers/rest/dedup_notification_group_serializer.rb
@@ -1,7 +1,22 @@
 # frozen_string_literal: true
 
 class REST::DedupNotificationGroupSerializer < ActiveModel::Serializer
+  class PartialAccountSerializer < REST::AccountSerializer
+    # This is a hack to reset ActiveModel::Serializer internals and only expose the attributes
+    # we care about.
+    self._attributes_data = {}
+    self._reflections = []
+    self._links = []
+
+    attributes :id, :acct, :locked, :bot, :url, :avatar, :avatar_static
+  end
+
   has_many :accounts, serializer: REST::AccountSerializer
+  has_many :partial_accounts, serializer: PartialAccountSerializer, if: :return_partial_accounts?
   has_many :statuses, serializer: REST::StatusSerializer
   has_many :notification_groups, serializer: REST::NotificationGroupSerializer
+
+  def return_partial_accounts?
+    instance_options[:expand_accounts] == 'partial_avatars'
+  end
 end
diff --git a/spec/requests/api/v2_alpha/notifications_spec.rb b/spec/requests/api/v2_alpha/notifications_spec.rb
index fc1daef43fe9df..94bc7b0ee36722 100644
--- a/spec/requests/api/v2_alpha/notifications_spec.rb
+++ b/spec/requests/api/v2_alpha/notifications_spec.rb
@@ -160,6 +160,36 @@
       end
     end
 
+    context 'when requesting stripped-down accounts' do
+      let(:params) { { expand_accounts: 'partial_avatars' } }
+
+      let(:recent_account) { Fabricate(:account) }
+
+      before do
+        FavouriteService.new.call(recent_account, user.account.statuses.first)
+      end
+
+      it 'returns an account in "partial_accounts", with the expected keys', :aggregate_failures do
+        subject
+
+        expect(response).to have_http_status(200)
+        expect(body_as_json[:partial_accounts].size).to be > 0
+        expect(body_as_json[:partial_accounts][0].keys).to contain_exactly(:acct, :avatar, :avatar_static, :bot, :id, :locked, :url)
+        expect(body_as_json[:partial_accounts].pluck(:id)).to_not include(recent_account.id.to_s)
+        expect(body_as_json[:accounts].pluck(:id)).to include(recent_account.id.to_s)
+      end
+    end
+
+    context 'when passing an invalid value for "expand_accounts"' do
+      let(:params) { { expand_accounts: 'unknown_foobar' } }
+
+      it 'returns http bad request' do
+        subject
+
+        expect(response).to have_http_status(400)
+      end
+    end
+
     def body_json_types
       body_as_json[:notification_groups].pluck(:type)
     end

From 57a1f86626ad00f12ccf055c4f0e0ade506b8fba Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Tue, 6 Aug 2024 14:22:18 +0200
Subject: [PATCH 1728/2191] Remove usage of non-public RTK types (#31312)

---
 .../mastodon/store/typed_functions.ts         | 30 +++++++------------
 1 file changed, 10 insertions(+), 20 deletions(-)

diff --git a/app/javascript/mastodon/store/typed_functions.ts b/app/javascript/mastodon/store/typed_functions.ts
index 98d0d31fa32dd8..cd0f95cef9a9c0 100644
--- a/app/javascript/mastodon/store/typed_functions.ts
+++ b/app/javascript/mastodon/store/typed_functions.ts
@@ -1,9 +1,8 @@
+import type { GetThunkAPI } from '@reduxjs/toolkit';
 import { createAsyncThunk } from '@reduxjs/toolkit';
 // eslint-disable-next-line @typescript-eslint/no-restricted-imports
 import { useDispatch, useSelector } from 'react-redux';
 
-import type { BaseThunkAPI } from '@reduxjs/toolkit/src/createAsyncThunk';
-
 import type { AppDispatch, RootState } from './store';
 
 export const useAppDispatch = useDispatch.withTypes<AppDispatch>();
@@ -25,29 +24,20 @@ export const createAppAsyncThunk = createAsyncThunk.withTypes<{
   rejectValue: AsyncThunkRejectValue;
 }>();
 
-type AppThunkApi = Pick<
-  BaseThunkAPI<
-    RootState,
-    unknown,
-    AppDispatch,
-    AsyncThunkRejectValue,
-    AppMeta,
-    AppMeta
-  >,
-  'getState' | 'dispatch'
->;
-
-interface AppThunkOptions {
-  skipLoading?: boolean;
-}
-
-const createBaseAsyncThunk = createAsyncThunk.withTypes<{
+interface AppThunkConfig {
   state: RootState;
   dispatch: AppDispatch;
   rejectValue: AsyncThunkRejectValue;
   fulfilledMeta: AppMeta;
   rejectedMeta: AppMeta;
-}>();
+}
+type AppThunkApi = Pick<GetThunkAPI<AppThunkConfig>, 'getState' | 'dispatch'>;
+
+interface AppThunkOptions {
+  skipLoading?: boolean;
+}
+
+const createBaseAsyncThunk = createAsyncThunk.withTypes<AppThunkConfig>();
 
 export function createThunk<Arg = void, Returned = void>(
   name: string,

From 30430a62e2a049c924ba33273b9c3c90178a0eb8 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 6 Aug 2024 15:34:55 +0200
Subject: [PATCH 1729/2191] =?UTF-8?q?Fix=20broken=20=E2=80=9Cmute=E2=80=9D?=
 =?UTF-8?q?=20button=20in=20mutes=20list=20(#31315)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/javascript/mastodon/components/account.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/components/account.jsx b/app/javascript/mastodon/components/account.jsx
index 2a748e67ff139b..265c68697baf3e 100644
--- a/app/javascript/mastodon/components/account.jsx
+++ b/app/javascript/mastodon/components/account.jsx
@@ -106,7 +106,7 @@ const Account = ({ size = 46, account, onFollow, onBlock, onMute, onMuteNotifica
         </>
       );
     } else if (defaultAction === 'mute') {
-      buttons = <Button title={intl.formatMessage(messages.mute)} onClick={handleMute} />;
+      buttons = <Button text={intl.formatMessage(messages.mute)} onClick={handleMute} />;
     } else if (defaultAction === 'block') {
       buttons = <Button text={intl.formatMessage(messages.block)} onClick={handleBlock} />;
     } else if (!account.get('suspended') && !account.get('moved') || following) {

From c8b9e60ec123c458efff83eedcfd07f067ef05ae Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 6 Aug 2024 15:35:15 +0200
Subject: [PATCH 1730/2191] Fix mutes and blocks not immediately cleaning up
 notification requests in Web UI (#31316)

---
 .../mastodon/reducers/notification_requests.js      | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/app/javascript/mastodon/reducers/notification_requests.js b/app/javascript/mastodon/reducers/notification_requests.js
index 4247062a582704..1aaf167fa67dcf 100644
--- a/app/javascript/mastodon/reducers/notification_requests.js
+++ b/app/javascript/mastodon/reducers/notification_requests.js
@@ -1,5 +1,6 @@
 import { Map as ImmutableMap, List as ImmutableList, fromJS } from 'immutable';
 
+import { blockAccountSuccess, muteAccountSuccess } from 'mastodon/actions/accounts';
 import {
   NOTIFICATION_REQUESTS_EXPAND_REQUEST,
   NOTIFICATION_REQUESTS_EXPAND_SUCCESS,
@@ -51,6 +52,14 @@ const removeRequest = (state, id) => {
   return state.update('items', list => list.filterNot(item => item.get('id') === id));
 };
 
+const removeRequestByAccount = (state, account_id) => {
+  if (state.getIn(['current', 'item', 'account']) === account_id) {
+    state = state.setIn(['current', 'removed'], true);
+  }
+
+  return state.update('items', list => list.filterNot(item => item.get('account') === account_id));
+};
+
 export const notificationRequestsReducer = (state = initialState, action) => {
   switch(action.type) {
   case NOTIFICATION_REQUESTS_FETCH_SUCCESS:
@@ -74,6 +83,10 @@ export const notificationRequestsReducer = (state = initialState, action) => {
   case NOTIFICATION_REQUEST_ACCEPT_REQUEST:
   case NOTIFICATION_REQUEST_DISMISS_REQUEST:
     return removeRequest(state, action.id);
+  case blockAccountSuccess.type:
+    return removeRequestByAccount(state, action.payload.relationship.id);
+  case muteAccountSuccess.type:
+    return action.payload.relationship.muting_notifications ? removeRequestByAccount(state, action.payload.relationship.id) : state;
   case NOTIFICATION_REQUEST_FETCH_REQUEST:
     return state.set('current', initialState.get('current').set('isLoading', true));
   case NOTIFICATION_REQUEST_FETCH_SUCCESS:

From 700ebdb5e268522658f828e630ec075eec38d93e Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Fri, 2 Aug 2024 21:55:13 +0200
Subject: [PATCH 1731/2191] [Glitch] Fix typo in english message (filtred =>
 filtered)

Port 19f4aa11472eb5bedd97e0541a48126078715193 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/features/notifications/requests.jsx         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/flavours/glitch/features/notifications/requests.jsx b/app/javascript/flavours/glitch/features/notifications/requests.jsx
index 3df8bc2616314e..82baffb90e4e1d 100644
--- a/app/javascript/flavours/glitch/features/notifications/requests.jsx
+++ b/app/javascript/flavours/glitch/features/notifications/requests.jsx
@@ -44,7 +44,7 @@ const ColumnSettings = () => {
             settingPath={['minimizeFilteredBanner']}
             onChange={onChange}
             label={
-              <FormattedMessage id='notification_requests.minimize_banner' defaultMessage='Minimize filtred notifications banner' />
+              <FormattedMessage id='notification_requests.minimize_banner' defaultMessage='Minimize filtered notifications banner' />
             }
           />
         </div>

From 5cdc0c2b43e78fb582837b8b3c2be165549c857a Mon Sep 17 00:00:00 2001
From: Christian Schmidt <github@chsc.dk>
Date: Sun, 4 Aug 2024 10:57:46 +0200
Subject: [PATCH 1732/2191] [Glitch] Disable irrelevant fields unless cleanup
 is enabled

Port 3d6e8d68344cb6b8604d2321705c83f2eebf8add to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/entrypoints/public.tsx    | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/app/javascript/flavours/glitch/entrypoints/public.tsx b/app/javascript/flavours/glitch/entrypoints/public.tsx
index 649af3a8807eb1..44afc9d825d0af 100644
--- a/app/javascript/flavours/glitch/entrypoints/public.tsx
+++ b/app/javascript/flavours/glitch/entrypoints/public.tsx
@@ -431,6 +431,42 @@ Rails.delegate(document, 'img.custom-emoji', 'mouseout', ({ target }) => {
     target.src = target.dataset.static;
 });
 
+const setInputDisabled = (
+  input: HTMLInputElement | HTMLSelectElement,
+  disabled: boolean,
+) => {
+  input.disabled = disabled;
+
+  const wrapper = input.closest('.with_label');
+  if (wrapper) {
+    wrapper.classList.toggle('disabled', input.disabled);
+
+    const hidden =
+      input.type === 'checkbox' &&
+      wrapper.querySelector<HTMLInputElement>('input[type=hidden][value="0"]');
+    if (hidden) {
+      hidden.disabled = input.disabled;
+    }
+  }
+};
+
+Rails.delegate(
+  document,
+  '#account_statuses_cleanup_policy_enabled',
+  'change',
+  ({ target }) => {
+    if (!(target instanceof HTMLInputElement) || !target.form) return;
+
+    target.form
+      .querySelectorAll<
+        HTMLInputElement | HTMLSelectElement
+      >('input:not([type=hidden], #account_statuses_cleanup_policy_enabled), select')
+      .forEach((input) => {
+        setInputDisabled(input, !target.checked);
+      });
+  },
+);
+
 // Empty the honeypot fields in JS in case something like an extension
 // automatically filled them.
 Rails.delegate(document, '#registration_new_user,#new_user', 'submit', () => {

From c5b7f48ccef57eb18aa514d5ada5150c10df82bb Mon Sep 17 00:00:00 2001
From: Valtteri Laitinen <dev@valtlai.fi>
Date: Sun, 4 Aug 2024 18:13:15 +0300
Subject: [PATCH 1733/2191] [Glitch] Fix missing border around tab/filter bar

Port b6c1b8f7480d87340a128c593ad267e4b5501beb to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/styles/components.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index 6506151b283d04..ca2088a10beef0 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -7906,7 +7906,7 @@ img.modal-warning {
   display: flex;
   flex-shrink: 0;
 
-  @media screen and (max-width: $no-gap-breakpoint) {
+  @media screen and (max-width: $no-gap-breakpoint - 1px) {
     border-right: 0;
     border-left: 0;
   }

From 316132bdbd99cd84fc4cb0afd418fc55cac04a11 Mon Sep 17 00:00:00 2001
From: Valtteri Laitinen <dev@valtlai.fi>
Date: Sun, 4 Aug 2024 18:14:11 +0300
Subject: [PATCH 1734/2191] [Glitch] Fix duplicate border around search results

Port 315308b10cf1d6431053c1553a2f0b596471f039 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/styles/components.scss | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index ca2088a10beef0..d3668853f344d9 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -3268,6 +3268,11 @@ $ui-header-logo-wordmark-width: 99px;
   .explore__search-header {
     display: flex;
   }
+
+  .explore__search-results {
+    border: 0;
+    border-radius: 0;
+  }
 }
 
 .icon-with-badge {

From ad786cb7af150b99f2952f4dc8ab5d2f2630f5c7 Mon Sep 17 00:00:00 2001
From: Valtteri Laitinen <dev@valtlai.fi>
Date: Mon, 5 Aug 2024 14:35:16 +0300
Subject: [PATCH 1735/2191] [Glitch] Improve look of verified header fields in
 profile

Port c01a6a6eeb055c594df9b846d60afe05465b56f3 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/styles/components.scss | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index d3668853f344d9..d238611cafa564 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -8632,16 +8632,17 @@ noscript {
       .verified {
         border: 1px solid rgba($valid-value-color, 0.5);
         margin-top: -1px;
+        margin-inline: -1px;
 
         &:first-child {
           border-top-left-radius: 4px;
           border-top-right-radius: 4px;
-          margin-top: 0;
         }
 
         &:last-child {
           border-bottom-left-radius: 4px;
           border-bottom-right-radius: 4px;
+          margin-bottom: -1px;
         }
 
         dt,

From 01b4c996b2712d200dde1517ec58d65b06173608 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Tue, 6 Aug 2024 08:53:59 +0200
Subject: [PATCH 1736/2191] [Glitch] Add account notes to hover cards

Port 97b9e8befd7355af7a2a2905a16f5f0527f0b48c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../glitch/components/hover_card_account.tsx  | 18 ++++++++++++++++++
 .../account/components/account_note.jsx       |  2 +-
 .../flavours/glitch/styles/components.scss    | 19 +++++++++++++++++++
 3 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/app/javascript/flavours/glitch/components/hover_card_account.tsx b/app/javascript/flavours/glitch/components/hover_card_account.tsx
index 56f431a7867156..caec1a84b013b6 100644
--- a/app/javascript/flavours/glitch/components/hover_card_account.tsx
+++ b/app/javascript/flavours/glitch/components/hover_card_account.tsx
@@ -1,5 +1,7 @@
 import { useEffect, forwardRef } from 'react';
 
+import { FormattedMessage } from 'react-intl';
+
 import classNames from 'classnames';
 
 import { fetchAccount } from 'flavours/glitch/actions/accounts';
@@ -25,6 +27,11 @@ export const HoverCardAccount = forwardRef<
     accountId ? state.accounts.get(accountId) : undefined,
   );
 
+  const note = useAppSelector(
+    (state) =>
+      state.relationships.getIn([accountId, 'note']) as string | undefined,
+  );
+
   useEffect(() => {
     if (accountId && !account) {
       dispatch(fetchAccount(accountId));
@@ -57,6 +64,17 @@ export const HoverCardAccount = forwardRef<
               className='hover-card__bio'
             />
             <AccountFields fields={account.fields} limit={2} />
+            {note && note.length > 0 && (
+              <dl className='hover-card__note'>
+                <dt className='hover-card__note-label'>
+                  <FormattedMessage
+                    id='account.account_note_header'
+                    defaultMessage='Personal note'
+                  />
+                </dt>
+                <dd>{note}</dd>
+              </dl>
+            )}
           </div>
 
           <div className='hover-card__number'>
diff --git a/app/javascript/flavours/glitch/features/account/components/account_note.jsx b/app/javascript/flavours/glitch/features/account/components/account_note.jsx
index 272a4ee312c08d..e736e7ad64db3e 100644
--- a/app/javascript/flavours/glitch/features/account/components/account_note.jsx
+++ b/app/javascript/flavours/glitch/features/account/components/account_note.jsx
@@ -151,7 +151,7 @@ class AccountNote extends ImmutablePureComponent {
     return (
       <div className='account__header__account-note'>
         <label htmlFor={`account-note-${account.get('id')}`}>
-          <FormattedMessage id='account.account_note_header' defaultMessage='Note' /> <InlineAlert show={saved} />
+          <FormattedMessage id='account.account_note_header' defaultMessage='Personal note' /> <InlineAlert show={saved} />
         </label>
 
         <Textarea
diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index d238611cafa564..b8647cd559fe1b 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -11177,6 +11177,25 @@ noscript {
     }
   }
 
+  &__note {
+    &-label {
+      color: $dark-text-color;
+      font-size: 12px;
+      font-weight: 500;
+      text-transform: uppercase;
+    }
+
+    dd {
+      white-space: pre-line;
+      color: $secondary-text-color;
+      overflow: hidden;
+      line-clamp: 3; // Not yet supported in browers
+      display: -webkit-box; // The next 3 properties are needed
+      -webkit-line-clamp: 3;
+      -webkit-box-orient: vertical;
+    }
+  }
+
   .display-name {
     font-size: 15px;
     line-height: 22px;

From f0f2ce2855ba3151a4831bf2ab72b757b1074097 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 6 Aug 2024 07:54:00 +0000
Subject: [PATCH 1737/2191] [Glitch] fix(deps): update dependency
 @reduxjs/toolkit to v2.2.7 - abandoned

Port 103e544cfaadd33f33369cf6e8496accbebc3906 to glitch-soc

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/store/typed_functions.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/flavours/glitch/store/typed_functions.ts b/app/javascript/flavours/glitch/store/typed_functions.ts
index e5820149dbd9d7..98d0d31fa32dd8 100644
--- a/app/javascript/flavours/glitch/store/typed_functions.ts
+++ b/app/javascript/flavours/glitch/store/typed_functions.ts
@@ -2,7 +2,7 @@ import { createAsyncThunk } from '@reduxjs/toolkit';
 // eslint-disable-next-line @typescript-eslint/no-restricted-imports
 import { useDispatch, useSelector } from 'react-redux';
 
-import type { BaseThunkAPI } from '@reduxjs/toolkit/dist/createAsyncThunk';
+import type { BaseThunkAPI } from '@reduxjs/toolkit/src/createAsyncThunk';
 
 import type { AppDispatch, RootState } from './store';
 

From 7bb171a9eae6b9857f8b6f23400678a0103fd65c Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Tue, 6 Aug 2024 14:22:18 +0200
Subject: [PATCH 1738/2191] [Glitch] Remove usage of non-public RTK types

Port 57a1f86626ad00f12ccf055c4f0e0ade506b8fba to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/store/typed_functions.ts  | 30 +++++++------------
 1 file changed, 10 insertions(+), 20 deletions(-)

diff --git a/app/javascript/flavours/glitch/store/typed_functions.ts b/app/javascript/flavours/glitch/store/typed_functions.ts
index 98d0d31fa32dd8..cd0f95cef9a9c0 100644
--- a/app/javascript/flavours/glitch/store/typed_functions.ts
+++ b/app/javascript/flavours/glitch/store/typed_functions.ts
@@ -1,9 +1,8 @@
+import type { GetThunkAPI } from '@reduxjs/toolkit';
 import { createAsyncThunk } from '@reduxjs/toolkit';
 // eslint-disable-next-line @typescript-eslint/no-restricted-imports
 import { useDispatch, useSelector } from 'react-redux';
 
-import type { BaseThunkAPI } from '@reduxjs/toolkit/src/createAsyncThunk';
-
 import type { AppDispatch, RootState } from './store';
 
 export const useAppDispatch = useDispatch.withTypes<AppDispatch>();
@@ -25,29 +24,20 @@ export const createAppAsyncThunk = createAsyncThunk.withTypes<{
   rejectValue: AsyncThunkRejectValue;
 }>();
 
-type AppThunkApi = Pick<
-  BaseThunkAPI<
-    RootState,
-    unknown,
-    AppDispatch,
-    AsyncThunkRejectValue,
-    AppMeta,
-    AppMeta
-  >,
-  'getState' | 'dispatch'
->;
-
-interface AppThunkOptions {
-  skipLoading?: boolean;
-}
-
-const createBaseAsyncThunk = createAsyncThunk.withTypes<{
+interface AppThunkConfig {
   state: RootState;
   dispatch: AppDispatch;
   rejectValue: AsyncThunkRejectValue;
   fulfilledMeta: AppMeta;
   rejectedMeta: AppMeta;
-}>();
+}
+type AppThunkApi = Pick<GetThunkAPI<AppThunkConfig>, 'getState' | 'dispatch'>;
+
+interface AppThunkOptions {
+  skipLoading?: boolean;
+}
+
+const createBaseAsyncThunk = createAsyncThunk.withTypes<AppThunkConfig>();
 
 export function createThunk<Arg = void, Returned = void>(
   name: string,

From 1c91b363d557a7a6443d3a643d3da59e4c694d0c Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 6 Aug 2024 15:34:55 +0200
Subject: [PATCH 1739/2191] =?UTF-8?q?[Glitch]=20Fix=20broken=20=E2=80=9Cmu?=
 =?UTF-8?q?te=E2=80=9D=20button=20in=20mutes=20list?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Port 30430a62e2a049c924ba33273b9c3c90178a0eb8 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/components/account.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/flavours/glitch/components/account.jsx b/app/javascript/flavours/glitch/components/account.jsx
index e2ea8995242b3b..29ffc60c6bacd5 100644
--- a/app/javascript/flavours/glitch/components/account.jsx
+++ b/app/javascript/flavours/glitch/components/account.jsx
@@ -106,7 +106,7 @@ const Account = ({ size = 46, account, onFollow, onBlock, onMute, onMuteNotifica
         </>
       );
     } else if (defaultAction === 'mute') {
-      buttons = <Button title={intl.formatMessage(messages.mute)} onClick={handleMute} />;
+      buttons = <Button text={intl.formatMessage(messages.mute)} onClick={handleMute} />;
     } else if (defaultAction === 'block') {
       buttons = <Button text={intl.formatMessage(messages.block)} onClick={handleBlock} />;
     } else if (!account.get('suspended') && !account.get('moved') || following) {

From 43546659bf0d5672c76c4d26b6f571958dd725ed Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 6 Aug 2024 15:35:15 +0200
Subject: [PATCH 1740/2191] [Glitch] Fix mutes and blocks not immediately
 cleaning up notification requests in Web UI

Port c8b9e60ec123c458efff83eedcfd07f067ef05ae to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../glitch/reducers/notification_requests.js        | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/app/javascript/flavours/glitch/reducers/notification_requests.js b/app/javascript/flavours/glitch/reducers/notification_requests.js
index c1da951f6c515f..f10f982d2a9530 100644
--- a/app/javascript/flavours/glitch/reducers/notification_requests.js
+++ b/app/javascript/flavours/glitch/reducers/notification_requests.js
@@ -1,5 +1,6 @@
 import { Map as ImmutableMap, List as ImmutableList, fromJS } from 'immutable';
 
+import { blockAccountSuccess, muteAccountSuccess } from 'flavours/glitch/actions/accounts';
 import {
   NOTIFICATION_REQUESTS_EXPAND_REQUEST,
   NOTIFICATION_REQUESTS_EXPAND_SUCCESS,
@@ -51,6 +52,14 @@ const removeRequest = (state, id) => {
   return state.update('items', list => list.filterNot(item => item.get('id') === id));
 };
 
+const removeRequestByAccount = (state, account_id) => {
+  if (state.getIn(['current', 'item', 'account']) === account_id) {
+    state = state.setIn(['current', 'removed'], true);
+  }
+
+  return state.update('items', list => list.filterNot(item => item.get('account') === account_id));
+};
+
 export const notificationRequestsReducer = (state = initialState, action) => {
   switch(action.type) {
   case NOTIFICATION_REQUESTS_FETCH_SUCCESS:
@@ -74,6 +83,10 @@ export const notificationRequestsReducer = (state = initialState, action) => {
   case NOTIFICATION_REQUEST_ACCEPT_REQUEST:
   case NOTIFICATION_REQUEST_DISMISS_REQUEST:
     return removeRequest(state, action.id);
+  case blockAccountSuccess.type:
+    return removeRequestByAccount(state, action.payload.relationship.id);
+  case muteAccountSuccess.type:
+    return action.payload.relationship.muting_notifications ? removeRequestByAccount(state, action.payload.relationship.id) : state;
   case NOTIFICATION_REQUEST_FETCH_REQUEST:
     return state.set('current', initialState.get('current').set('isLoading', true));
   case NOTIFICATION_REQUEST_FETCH_SUCCESS:

From 719cabe024e87fcc5cc57d3ec66de956af2d3db7 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 7 Aug 2024 08:52:10 +0200
Subject: [PATCH 1741/2191] Fix logic of block/mute bypass for mentions from
 moderators (#31271)

---
 app/services/notify_service.rb       |  2 +-
 spec/services/notify_service_spec.rb | 34 ++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/app/services/notify_service.rb b/app/services/notify_service.rb
index 23f92c816b86c0..b0bef8cd65524d 100644
--- a/app/services/notify_service.rb
+++ b/app/services/notify_service.rb
@@ -48,7 +48,7 @@ def message?
     end
 
     def from_staff?
-      @sender.local? && @sender.user.present? && @sender.user_role&.overrides?(@recipient.user_role)
+      @sender.local? && @sender.user.present? && @sender.user_role&.overrides?(@recipient.user_role) && @sender.user_role&.highlighted? && @sender.user_role&.can?(*UserRole::Flags::CATEGORIES[:moderation])
     end
 
     def from_self?
diff --git a/spec/services/notify_service_spec.rb b/spec/services/notify_service_spec.rb
index c7e00129b2cf22..d64cfe5907bd4e 100644
--- a/spec/services/notify_service_spec.rb
+++ b/spec/services/notify_service_spec.rb
@@ -129,6 +129,40 @@
     end
   end
 
+  context 'when the blocked sender has a role' do
+    let(:sender) { Fabricate(:user, role: sender_role).account }
+    let(:activity) { Fabricate(:mention, status: Fabricate(:status, account: sender)) }
+    let(:type) { :mention }
+
+    before do
+      recipient.block!(sender)
+    end
+
+    context 'when the role is a visible moderator' do
+      let(:sender_role) { Fabricate(:user_role, highlighted: true, permissions: UserRole::FLAGS[:manage_users]) }
+
+      it 'does notify' do
+        expect { subject }.to change(Notification, :count)
+      end
+    end
+
+    context 'when the role is a non-visible moderator' do
+      let(:sender_role) { Fabricate(:user_role, highlighted: false, permissions: UserRole::FLAGS[:manage_users]) }
+
+      it 'does not notify' do
+        expect { subject }.to_not change(Notification, :count)
+      end
+    end
+
+    context 'when the role is a visible non-moderator' do
+      let(:sender_role) { Fabricate(:user_role, highlighted: true) }
+
+      it 'does not notify' do
+        expect { subject }.to_not change(Notification, :count)
+      end
+    end
+  end
+
   context 'with filtered notifications' do
     let(:unknown)  { Fabricate(:account, username: 'unknown') }
     let(:status)   { Fabricate(:status, account: unknown) }

From fc964c9bfdc59d69b758919520f56d060ac2eeac Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 7 Aug 2024 11:32:16 +0200
Subject: [PATCH 1742/2191] New Crowdin Translations (automated) (#31321)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/af.json      |  1 -
 app/javascript/mastodon/locales/an.json      |  1 -
 app/javascript/mastodon/locales/ar.json      |  1 -
 app/javascript/mastodon/locales/ast.json     |  1 -
 app/javascript/mastodon/locales/be.json      |  1 -
 app/javascript/mastodon/locales/bg.json      |  2 +-
 app/javascript/mastodon/locales/bn.json      |  1 -
 app/javascript/mastodon/locales/br.json      |  1 -
 app/javascript/mastodon/locales/ca.json      |  2 +-
 app/javascript/mastodon/locales/ckb.json     |  1 -
 app/javascript/mastodon/locales/co.json      |  1 -
 app/javascript/mastodon/locales/cs.json      |  6 ++-
 app/javascript/mastodon/locales/cy.json      |  1 -
 app/javascript/mastodon/locales/da.json      |  2 +-
 app/javascript/mastodon/locales/de.json      |  2 +-
 app/javascript/mastodon/locales/el.json      |  1 -
 app/javascript/mastodon/locales/en-GB.json   |  1 -
 app/javascript/mastodon/locales/eo.json      |  1 -
 app/javascript/mastodon/locales/es-AR.json   |  2 +-
 app/javascript/mastodon/locales/es-MX.json   |  2 +-
 app/javascript/mastodon/locales/es.json      |  2 +-
 app/javascript/mastodon/locales/et.json      |  1 -
 app/javascript/mastodon/locales/eu.json      |  1 -
 app/javascript/mastodon/locales/fa.json      |  1 -
 app/javascript/mastodon/locales/fi.json      |  2 +-
 app/javascript/mastodon/locales/fil.json     |  1 -
 app/javascript/mastodon/locales/fo.json      |  4 +-
 app/javascript/mastodon/locales/fr-CA.json   |  1 -
 app/javascript/mastodon/locales/fr.json      |  1 -
 app/javascript/mastodon/locales/fy.json      |  1 -
 app/javascript/mastodon/locales/ga.json      |  1 -
 app/javascript/mastodon/locales/gd.json      |  4 +-
 app/javascript/mastodon/locales/gl.json      |  2 +-
 app/javascript/mastodon/locales/he.json      |  2 +-
 app/javascript/mastodon/locales/hi.json      |  1 -
 app/javascript/mastodon/locales/hr.json      |  1 -
 app/javascript/mastodon/locales/hu.json      |  2 +-
 app/javascript/mastodon/locales/hy.json      |  1 -
 app/javascript/mastodon/locales/ia.json      |  5 ++-
 app/javascript/mastodon/locales/id.json      |  1 -
 app/javascript/mastodon/locales/ie.json      |  1 -
 app/javascript/mastodon/locales/io.json      |  1 -
 app/javascript/mastodon/locales/is.json      |  2 +-
 app/javascript/mastodon/locales/it.json      |  2 +-
 app/javascript/mastodon/locales/ja.json      |  1 -
 app/javascript/mastodon/locales/ka.json      |  1 -
 app/javascript/mastodon/locales/kab.json     |  8 ++--
 app/javascript/mastodon/locales/kk.json      |  1 -
 app/javascript/mastodon/locales/kn.json      |  1 -
 app/javascript/mastodon/locales/ko.json      |  8 ++--
 app/javascript/mastodon/locales/ku.json      |  1 -
 app/javascript/mastodon/locales/kw.json      |  1 -
 app/javascript/mastodon/locales/la.json      |  1 -
 app/javascript/mastodon/locales/lad.json     |  1 -
 app/javascript/mastodon/locales/lt.json      |  2 +-
 app/javascript/mastodon/locales/lv.json      |  1 -
 app/javascript/mastodon/locales/mk.json      |  1 -
 app/javascript/mastodon/locales/ml.json      |  1 -
 app/javascript/mastodon/locales/mr.json      |  1 -
 app/javascript/mastodon/locales/ms.json      |  1 -
 app/javascript/mastodon/locales/my.json      |  1 -
 app/javascript/mastodon/locales/nl.json      |  2 +-
 app/javascript/mastodon/locales/nn.json      |  1 -
 app/javascript/mastodon/locales/no.json      |  1 -
 app/javascript/mastodon/locales/oc.json      |  1 -
 app/javascript/mastodon/locales/pa.json      |  1 -
 app/javascript/mastodon/locales/pl.json      |  2 +-
 app/javascript/mastodon/locales/pt-BR.json   |  1 -
 app/javascript/mastodon/locales/pt-PT.json   |  2 +-
 app/javascript/mastodon/locales/ro.json      |  1 -
 app/javascript/mastodon/locales/ru.json      |  1 -
 app/javascript/mastodon/locales/ry.json      |  1 -
 app/javascript/mastodon/locales/sa.json      |  1 -
 app/javascript/mastodon/locales/sc.json      |  1 -
 app/javascript/mastodon/locales/sco.json     |  1 -
 app/javascript/mastodon/locales/si.json      |  1 -
 app/javascript/mastodon/locales/sk.json      |  1 -
 app/javascript/mastodon/locales/sl.json      | 11 +++++-
 app/javascript/mastodon/locales/sq.json      |  2 +-
 app/javascript/mastodon/locales/sr-Latn.json |  1 -
 app/javascript/mastodon/locales/sr.json      |  1 -
 app/javascript/mastodon/locales/sv.json      |  2 +-
 app/javascript/mastodon/locales/szl.json     |  1 -
 app/javascript/mastodon/locales/ta.json      |  1 -
 app/javascript/mastodon/locales/th.json      |  1 -
 app/javascript/mastodon/locales/tok.json     |  1 -
 app/javascript/mastodon/locales/tr.json      |  2 +-
 app/javascript/mastodon/locales/tt.json      |  1 -
 app/javascript/mastodon/locales/uk.json      |  2 +-
 app/javascript/mastodon/locales/ur.json      |  1 -
 app/javascript/mastodon/locales/uz.json      |  1 -
 app/javascript/mastodon/locales/vi.json      |  2 +-
 app/javascript/mastodon/locales/zgh.json     |  1 -
 app/javascript/mastodon/locales/zh-CN.json   |  2 +-
 app/javascript/mastodon/locales/zh-HK.json   |  1 -
 app/javascript/mastodon/locales/zh-TW.json   |  2 +-
 config/locales/devise.kab.yml                |  2 +-
 config/locales/devise.lt.yml                 |  2 +-
 config/locales/doorkeeper.cs.yml             |  1 +
 config/locales/doorkeeper.gl.yml             |  1 +
 config/locales/doorkeeper.kab.yml            |  2 +-
 config/locales/fi.yml                        | 40 ++++++++++----------
 config/locales/gd.yml                        |  4 +-
 config/locales/ia.yml                        |  3 ++
 config/locales/kab.yml                       |  9 +++++
 config/locales/lt.yml                        |  6 +++
 config/locales/simple_form.cs.yml            |  2 +
 config/locales/simple_form.kab.yml           |  2 +-
 config/locales/simple_form.sl.yml            |  1 +
 config/locales/sl.yml                        | 14 +++++++
 110 files changed, 121 insertions(+), 127 deletions(-)

diff --git a/app/javascript/mastodon/locales/af.json b/app/javascript/mastodon/locales/af.json
index fee553e22d56ec..bedb3d1719e0f1 100644
--- a/app/javascript/mastodon/locales/af.json
+++ b/app/javascript/mastodon/locales/af.json
@@ -9,7 +9,6 @@
   "about.not_available": "Hierdie inligting is nie op hierdie bediener beskikbaar gestel nie.",
   "about.powered_by": "Gedesentraliseerde sosiale media aangedryf deur {mastodon}",
   "about.rules": "Bedienerreëls",
-  "account.account_note_header": "Nota",
   "account.add_or_remove_from_list": "Voeg by of verwyder van lyste",
   "account.badges.bot": "Bot",
   "account.badges.group": "Groep",
diff --git a/app/javascript/mastodon/locales/an.json b/app/javascript/mastodon/locales/an.json
index 0757b9e597db1e..959d3b81c42216 100644
--- a/app/javascript/mastodon/locales/an.json
+++ b/app/javascript/mastodon/locales/an.json
@@ -11,7 +11,6 @@
   "about.not_available": "Esta información no ye disponible en este servidor.",
   "about.powered_by": "Retz socials descentralizaus con tecnolochía de {mastodon}",
   "about.rules": "Reglas d'o servidor",
-  "account.account_note_header": "Nota",
   "account.add_or_remove_from_list": "Adhibir u eliminar de listas",
   "account.badges.bot": "Bot",
   "account.badges.group": "Grupo",
diff --git a/app/javascript/mastodon/locales/ar.json b/app/javascript/mastodon/locales/ar.json
index 5cfd587e088341..97526c40e6c38b 100644
--- a/app/javascript/mastodon/locales/ar.json
+++ b/app/javascript/mastodon/locales/ar.json
@@ -11,7 +11,6 @@
   "about.not_available": "لم يتم توفير هذه المعلومات على هذا الخادم.",
   "about.powered_by": "شبكة اجتماعية لامركزية مدعومة من {mastodon}",
   "about.rules": "قواعد الخادم",
-  "account.account_note_header": "مُلاحظة",
   "account.add_or_remove_from_list": "الإضافة أو الإزالة من القائمة",
   "account.badges.bot": "آلي",
   "account.badges.group": "فريق",
diff --git a/app/javascript/mastodon/locales/ast.json b/app/javascript/mastodon/locales/ast.json
index 3843ec69dc8523..fd673f1f855091 100644
--- a/app/javascript/mastodon/locales/ast.json
+++ b/app/javascript/mastodon/locales/ast.json
@@ -11,7 +11,6 @@
   "about.not_available": "Esta información nun ta disponible nesti sirvidor.",
   "about.powered_by": "Una rede social descentralizada que tien la teunoloxía de {mastodon}",
   "about.rules": "Normes del sirvidor",
-  "account.account_note_header": "Nota",
   "account.add_or_remove_from_list": "Amestar o quitar de les llistes",
   "account.badges.group": "Grupu",
   "account.block": "Bloquiar a @{name}",
diff --git a/app/javascript/mastodon/locales/be.json b/app/javascript/mastodon/locales/be.json
index 58aff7da44739f..4a567582fce045 100644
--- a/app/javascript/mastodon/locales/be.json
+++ b/app/javascript/mastodon/locales/be.json
@@ -11,7 +11,6 @@
   "about.not_available": "Дадзеная інфармацыя не дасяжная на гэтым серверы.",
   "about.powered_by": "Дэцэнтралізаваная сацыяльная сетка, створаная {mastodon}",
   "about.rules": "Правілы сервера",
-  "account.account_note_header": "Нататка",
   "account.add_or_remove_from_list": "Дадаць або выдаліць са спісаў",
   "account.badges.bot": "Бот",
   "account.badges.group": "Група",
diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json
index 98581306682152..dca64711fa1099 100644
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@@ -11,7 +11,7 @@
   "about.not_available": "Тази информация не е публична на този сървър.",
   "about.powered_by": "Децентрализирана социална мрежа, захранвана от {mastodon}",
   "about.rules": "Правила на сървъра",
-  "account.account_note_header": "Бележка",
+  "account.account_note_header": "Лична бележка",
   "account.add_or_remove_from_list": "Добавяне или премахване от списъци",
   "account.badges.bot": "Бот",
   "account.badges.group": "Група",
diff --git a/app/javascript/mastodon/locales/bn.json b/app/javascript/mastodon/locales/bn.json
index 7787c1b9cfd76b..bc5b5ae97d71b3 100644
--- a/app/javascript/mastodon/locales/bn.json
+++ b/app/javascript/mastodon/locales/bn.json
@@ -11,7 +11,6 @@
   "about.not_available": "এই তথ্য এই সার্ভারে উন্মুক্ত করা হয়নি.",
   "about.powered_by": "{mastodon} দ্বারা তৈরি বিকেন্দ্রীভূত সামাজিক মিডিয়া।",
   "about.rules": "সার্ভারের নিয়মাবলী",
-  "account.account_note_header": "বিজ্ঞপ্তি",
   "account.add_or_remove_from_list": "তালিকাতে যোগ বা অপসারণ করো",
   "account.badges.bot": "বট",
   "account.badges.group": "দল",
diff --git a/app/javascript/mastodon/locales/br.json b/app/javascript/mastodon/locales/br.json
index b38f43631641b0..bf801d75339868 100644
--- a/app/javascript/mastodon/locales/br.json
+++ b/app/javascript/mastodon/locales/br.json
@@ -11,7 +11,6 @@
   "about.not_available": "An titour-mañ ne c'heller ket gwelet war ar servijer-mañ.",
   "about.powered_by": "Rouedad sokial digreizenned kaset gant {mastodon}",
   "about.rules": "Reolennoù ar servijer",
-  "account.account_note_header": "Notenn",
   "account.add_or_remove_from_list": "Ouzhpenn pe dilemel eus al listennadoù",
   "account.badges.bot": "Robot",
   "account.badges.group": "Strollad",
diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index b52f5977119e4c..c06fb1e3340383 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -11,7 +11,7 @@
   "about.not_available": "Aquesta informació no és disponible en aquest servidor.",
   "about.powered_by": "Xarxa social descentralitzada impulsada per {mastodon}",
   "about.rules": "Normes del servidor",
-  "account.account_note_header": "Nota",
+  "account.account_note_header": "Nota personal",
   "account.add_or_remove_from_list": "Afegeix o elimina de les llistes",
   "account.badges.bot": "Automatitzat",
   "account.badges.group": "Grup",
diff --git a/app/javascript/mastodon/locales/ckb.json b/app/javascript/mastodon/locales/ckb.json
index 3c11ffc7155874..237a49d8e77a30 100644
--- a/app/javascript/mastodon/locales/ckb.json
+++ b/app/javascript/mastodon/locales/ckb.json
@@ -11,7 +11,6 @@
   "about.not_available": "ئەم زانیاریانە لەسەر ئەم سێرڤەرە بەردەست نەکراون.",
   "about.powered_by": "سۆشیال میدیای لامەرکەزی کە لەلایەن {mastodon} ەوە بەهێز دەکرێت",
   "about.rules": "یاساکانی سێرڤەر",
-  "account.account_note_header": "تێبینی    ",
   "account.add_or_remove_from_list": "زیادکردن یان سڕینەوە لە پێرستەکان",
   "account.badges.bot": "بوت",
   "account.badges.group": "گرووپ",
diff --git a/app/javascript/mastodon/locales/co.json b/app/javascript/mastodon/locales/co.json
index d95213f9c1064b..a479c2fedcdd87 100644
--- a/app/javascript/mastodon/locales/co.json
+++ b/app/javascript/mastodon/locales/co.json
@@ -1,5 +1,4 @@
 {
-  "account.account_note_header": "Nota",
   "account.add_or_remove_from_list": "Aghjunghje o toglie da e liste",
   "account.badges.bot": "Bot",
   "account.badges.group": "Gruppu",
diff --git a/app/javascript/mastodon/locales/cs.json b/app/javascript/mastodon/locales/cs.json
index 2afbbfb6733195..abfbcbfa5e146d 100644
--- a/app/javascript/mastodon/locales/cs.json
+++ b/app/javascript/mastodon/locales/cs.json
@@ -11,7 +11,7 @@
   "about.not_available": "Tato informace nebyla zpřístupněna na tomto serveru.",
   "about.powered_by": "Decentralizovaná sociální média poháněná {mastodon}",
   "about.rules": "Pravidla serveru",
-  "account.account_note_header": "Poznámka",
+  "account.account_note_header": "Osobní poznámka",
   "account.add_or_remove_from_list": "Přidat nebo odstranit ze seznamů",
   "account.badges.bot": "Bot",
   "account.badges.group": "Skupina",
@@ -471,6 +471,8 @@
   "navigation_bar.security": "Zabezpečení",
   "not_signed_in_indicator.not_signed_in": "Pro přístup k tomuto zdroji se musíte přihlásit.",
   "notification.admin.report": "Uživatel {name} nahlásil {target}",
+  "notification.admin.report_statuses": "{name} nahlásil {target} za {category}",
+  "notification.admin.report_statuses_other": "{name} nahlásil {target}",
   "notification.admin.sign_up": "Uživatel {name} se zaregistroval",
   "notification.favourite": "Uživatel {name} si oblíbil váš příspěvek",
   "notification.follow": "Uživatel {name} vás začal sledovat",
@@ -487,6 +489,7 @@
   "notification.moderation_warning.action_suspend": "Váš účet byl pozastaven.",
   "notification.own_poll": "Vaše anketa skončila",
   "notification.poll": "Anketa, ve které jste hlasovali, skončila",
+  "notification.private_mention": "{name} vás soukromě zmínil",
   "notification.reblog": "Uživatel {name} boostnul váš příspěvek",
   "notification.relationships_severance_event": "Kontakt ztracen s {name}",
   "notification.relationships_severance_event.account_suspension": "Administrátor z {from} pozastavil {target}, což znamená, že již od nich nemůžete přijímat aktualizace nebo s nimi interagovat.",
@@ -508,6 +511,7 @@
   "notifications.column_settings.admin.sign_up": "Nové registrace:",
   "notifications.column_settings.alert": "Oznámení na počítači",
   "notifications.column_settings.beta.category": "Experimentální funkce",
+  "notifications.column_settings.beta.grouping": "Seskupit notifikace",
   "notifications.column_settings.favourite": "Oblíbené:",
   "notifications.column_settings.filter_bar.advanced": "Zobrazit všechny kategorie",
   "notifications.column_settings.filter_bar.category": "Panel rychlého filtrování",
diff --git a/app/javascript/mastodon/locales/cy.json b/app/javascript/mastodon/locales/cy.json
index a5f81aad702b6c..f769810d272897 100644
--- a/app/javascript/mastodon/locales/cy.json
+++ b/app/javascript/mastodon/locales/cy.json
@@ -11,7 +11,6 @@
   "about.not_available": "Nid yw'r wybodaeth hon ar gael ar y gweinydd hwn.",
   "about.powered_by": "Cyfrwng cymdeithasol datganoledig wedi ei yrru gan {mastodon}",
   "about.rules": "Rheolau'r gweinydd",
-  "account.account_note_header": "Nodyn",
   "account.add_or_remove_from_list": "Ychwanegu neu Ddileu o'r rhestrau",
   "account.badges.bot": "Bot",
   "account.badges.group": "Grŵp",
diff --git a/app/javascript/mastodon/locales/da.json b/app/javascript/mastodon/locales/da.json
index 2ad5bdc9658902..9fcd24b29e0a1e 100644
--- a/app/javascript/mastodon/locales/da.json
+++ b/app/javascript/mastodon/locales/da.json
@@ -11,7 +11,7 @@
   "about.not_available": "Denne information er ikke blevet gjort tilgængelig på denne server.",
   "about.powered_by": "Decentraliserede sociale medier drevet af {mastodon}",
   "about.rules": "Serverregler",
-  "account.account_note_header": "Note",
+  "account.account_note_header": "Personligt notat",
   "account.add_or_remove_from_list": "Tilføj eller fjern fra lister",
   "account.badges.bot": "Bot",
   "account.badges.group": "Gruppe",
diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json
index 52a2cf2b9bc713..49821da68e1cd4 100644
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@@ -11,7 +11,7 @@
   "about.not_available": "Diese Informationen sind auf diesem Server nicht verfügbar.",
   "about.powered_by": "Ein dezentralisiertes soziales Netzwerk, angetrieben von {mastodon}",
   "about.rules": "Serverregeln",
-  "account.account_note_header": "Notiz",
+  "account.account_note_header": "Persönliche Notiz",
   "account.add_or_remove_from_list": "Hinzufügen oder Entfernen von Listen",
   "account.badges.bot": "Automatisiert",
   "account.badges.group": "Gruppe",
diff --git a/app/javascript/mastodon/locales/el.json b/app/javascript/mastodon/locales/el.json
index 3b181b42a688d3..eab319fdbae5c0 100644
--- a/app/javascript/mastodon/locales/el.json
+++ b/app/javascript/mastodon/locales/el.json
@@ -11,7 +11,6 @@
   "about.not_available": "Αυτές οι πληροφορίες δεν έχουν είναι διαθέσιμες σε αυτόν τον διακομιστή.",
   "about.powered_by": "Αποκεντρωμένα μέσα κοινωνικής δικτύωσης που βασίζονται στο {mastodon}",
   "about.rules": "Κανόνες διακομιστή",
-  "account.account_note_header": "Σημείωση",
   "account.add_or_remove_from_list": "Προσθήκη ή Αφαίρεση από λίστες",
   "account.badges.bot": "Αυτοματοποιημένος",
   "account.badges.group": "Ομάδα",
diff --git a/app/javascript/mastodon/locales/en-GB.json b/app/javascript/mastodon/locales/en-GB.json
index eaf4f9465b6c76..1307184ddbcff3 100644
--- a/app/javascript/mastodon/locales/en-GB.json
+++ b/app/javascript/mastodon/locales/en-GB.json
@@ -11,7 +11,6 @@
   "about.not_available": "This information has not been made available on this server.",
   "about.powered_by": "Decentralised social media powered by {mastodon}",
   "about.rules": "Server rules",
-  "account.account_note_header": "Note",
   "account.add_or_remove_from_list": "Add or Remove from lists",
   "account.badges.bot": "Automated",
   "account.badges.group": "Group",
diff --git a/app/javascript/mastodon/locales/eo.json b/app/javascript/mastodon/locales/eo.json
index de91fb39dce12f..851b3bfd1a8095 100644
--- a/app/javascript/mastodon/locales/eo.json
+++ b/app/javascript/mastodon/locales/eo.json
@@ -11,7 +11,6 @@
   "about.not_available": "Ĉi tiu informo ne estas disponebla ĉe ĉi tiu servilo.",
   "about.powered_by": "Malcentrigita socia retejo pere de {mastodon}",
   "about.rules": "Regularo de la servilo",
-  "account.account_note_header": "Noto",
   "account.add_or_remove_from_list": "Aldoni al aŭ forigi el listoj",
   "account.badges.bot": "Roboto",
   "account.badges.group": "Grupo",
diff --git a/app/javascript/mastodon/locales/es-AR.json b/app/javascript/mastodon/locales/es-AR.json
index 2a86e789a45954..bf5b1e2248df17 100644
--- a/app/javascript/mastodon/locales/es-AR.json
+++ b/app/javascript/mastodon/locales/es-AR.json
@@ -11,7 +11,7 @@
   "about.not_available": "Esta información no está disponible en este servidor.",
   "about.powered_by": "Redes sociales descentralizadas con tecnología de {mastodon}",
   "about.rules": "Reglas del servidor",
-  "account.account_note_header": "Nota",
+  "account.account_note_header": "Nota personal",
   "account.add_or_remove_from_list": "Agregar o quitar de las listas",
   "account.badges.bot": "Automatizada",
   "account.badges.group": "Grupo",
diff --git a/app/javascript/mastodon/locales/es-MX.json b/app/javascript/mastodon/locales/es-MX.json
index 93534ce105aafa..71c9e3b7a1cf98 100644
--- a/app/javascript/mastodon/locales/es-MX.json
+++ b/app/javascript/mastodon/locales/es-MX.json
@@ -11,7 +11,7 @@
   "about.not_available": "Esta información no está disponible en este servidor.",
   "about.powered_by": "Medio social descentralizado con tecnología de {mastodon}",
   "about.rules": "Reglas del servidor",
-  "account.account_note_header": "Nota",
+  "account.account_note_header": "Nota personal",
   "account.add_or_remove_from_list": "Agregar o eliminar de las listas",
   "account.badges.bot": "Bot",
   "account.badges.group": "Grupo",
diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json
index 253416a838454d..29d5cfb3ace642 100644
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@@ -11,7 +11,7 @@
   "about.not_available": "Esta información no está disponible en este servidor.",
   "about.powered_by": "Redes sociales descentralizadas con tecnología de {mastodon}",
   "about.rules": "Reglas del servidor",
-  "account.account_note_header": "Nota",
+  "account.account_note_header": "Nota personal",
   "account.add_or_remove_from_list": "Agregar o eliminar de listas",
   "account.badges.bot": "Automatizada",
   "account.badges.group": "Grupo",
diff --git a/app/javascript/mastodon/locales/et.json b/app/javascript/mastodon/locales/et.json
index 7369a89c462518..031904d54a3acf 100644
--- a/app/javascript/mastodon/locales/et.json
+++ b/app/javascript/mastodon/locales/et.json
@@ -11,7 +11,6 @@
   "about.not_available": "See info ei ole sellel serveril saadavaks tehtud.",
   "about.powered_by": "Hajutatud sotsiaalmeedia, mille taga on {mastodon}",
   "about.rules": "Serveri reeglid",
-  "account.account_note_header": "Märge",
   "account.add_or_remove_from_list": "Lisa või Eemalda nimekirjadest",
   "account.badges.bot": "Robot",
   "account.badges.group": "Grupp",
diff --git a/app/javascript/mastodon/locales/eu.json b/app/javascript/mastodon/locales/eu.json
index a4b502ccc0cbc0..291f19002e40e3 100644
--- a/app/javascript/mastodon/locales/eu.json
+++ b/app/javascript/mastodon/locales/eu.json
@@ -11,7 +11,6 @@
   "about.not_available": "Zerbitzari honek ez du informazio hau eskuragarri jarri.",
   "about.powered_by": "{mastodon} erabiltzen duen sare sozial deszentralizatua",
   "about.rules": "Zerbitzariaren arauak",
-  "account.account_note_header": "Oharra",
   "account.add_or_remove_from_list": "Gehitu edo kendu zerrendetatik",
   "account.badges.bot": "Bot-a",
   "account.badges.group": "Taldea",
diff --git a/app/javascript/mastodon/locales/fa.json b/app/javascript/mastodon/locales/fa.json
index 414e453fa3b792..514ce5959a2892 100644
--- a/app/javascript/mastodon/locales/fa.json
+++ b/app/javascript/mastodon/locales/fa.json
@@ -11,7 +11,6 @@
   "about.not_available": "این اطّلاعات روی این کارساز موجود نشده.",
   "about.powered_by": "رسانهٔ اجتماعی نامتمرکز قدرت گرفته از {mastodon}",
   "about.rules": "قوانین کارساز",
-  "account.account_note_header": "یادداشت",
   "account.add_or_remove_from_list": "افزودن یا برداشتن از سیاهه‌ها",
   "account.badges.bot": "خودکار",
   "account.badges.group": "گروه",
diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index ae1ccc0a3c49b6..5161343d30e7bb 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -11,7 +11,7 @@
   "about.not_available": "Näitä tietoja ei ole julkaistu tällä palvelimella.",
   "about.powered_by": "Hajautetun sosiaalisen median tarjoaa {mastodon}",
   "about.rules": "Palvelimen säännöt",
-  "account.account_note_header": "Muistiinpano",
+  "account.account_note_header": "Henkilökohtainen muistiinpano",
   "account.add_or_remove_from_list": "Lisää tai poista listoilta",
   "account.badges.bot": "Botti",
   "account.badges.group": "Ryhmä",
diff --git a/app/javascript/mastodon/locales/fil.json b/app/javascript/mastodon/locales/fil.json
index 1bdcd6f54ec909..f5cc407eceb778 100644
--- a/app/javascript/mastodon/locales/fil.json
+++ b/app/javascript/mastodon/locales/fil.json
@@ -6,7 +6,6 @@
   "about.domain_blocks.silenced.title": "Limitado",
   "about.domain_blocks.suspended.title": "Suspendido",
   "about.rules": "Mga alituntunin ng server",
-  "account.account_note_header": "Tala",
   "account.add_or_remove_from_list": "I-dagdag o tanggalin mula sa mga listahan",
   "account.badges.bot": "Pakusa",
   "account.badges.group": "Pangkat",
diff --git a/app/javascript/mastodon/locales/fo.json b/app/javascript/mastodon/locales/fo.json
index 5f7062b11af98c..a0d2b347fc00c5 100644
--- a/app/javascript/mastodon/locales/fo.json
+++ b/app/javascript/mastodon/locales/fo.json
@@ -11,7 +11,7 @@
   "about.not_available": "Hetta er ikki tøkt á føroyska servaranum enn.",
   "about.powered_by": "Miðfirra almennur miðil koyrandi á {mastodon}",
   "about.rules": "Ambætarareglur",
-  "account.account_note_header": "Viðmerking",
+  "account.account_note_header": "Persónlig viðmerking",
   "account.add_or_remove_from_list": "Legg afturat ella tak av listum",
   "account.badges.bot": "Bottur",
   "account.badges.group": "Bólkur",
@@ -72,7 +72,7 @@
   "account.unmute": "Doyv ikki @{name}",
   "account.unmute_notifications_short": "Tendra fráboðanir",
   "account.unmute_short": "Doyv ikki",
-  "account_note.placeholder": "Klikka fyri at leggja notu afturat",
+  "account_note.placeholder": "Klikka fyri at leggja viðmerking afturat",
   "admin.dashboard.daily_retention": "Hvussu nógvir brúkarar eru eftir, síðani tey skrásettu seg, roknað í døgum",
   "admin.dashboard.monthly_retention": "Hvussu nógvir brúkarar eru eftir síðani tey skrásettu seg, roknað í mánaðum",
   "admin.dashboard.retention.average": "Miðal",
diff --git a/app/javascript/mastodon/locales/fr-CA.json b/app/javascript/mastodon/locales/fr-CA.json
index ad442df778ef5d..02e3396575c6a2 100644
--- a/app/javascript/mastodon/locales/fr-CA.json
+++ b/app/javascript/mastodon/locales/fr-CA.json
@@ -11,7 +11,6 @@
   "about.not_available": "Cette information n'a pas été rendue disponible sur ce serveur.",
   "about.powered_by": "Réseau social décentralisé propulsé par {mastodon}",
   "about.rules": "Règles du serveur",
-  "account.account_note_header": "Note",
   "account.add_or_remove_from_list": "Ajouter ou enlever de listes",
   "account.badges.bot": "Bot",
   "account.badges.group": "Groupe",
diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json
index b849ab8f87aadb..d218148c257c43 100644
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@@ -11,7 +11,6 @@
   "about.not_available": "Cette information n'a pas été rendue disponible sur ce serveur.",
   "about.powered_by": "Réseau social décentralisé propulsé par {mastodon}",
   "about.rules": "Règles du serveur",
-  "account.account_note_header": "Note",
   "account.add_or_remove_from_list": "Ajouter ou retirer des listes",
   "account.badges.bot": "Bot",
   "account.badges.group": "Groupe",
diff --git a/app/javascript/mastodon/locales/fy.json b/app/javascript/mastodon/locales/fy.json
index 3045def0282154..1eceec08a06431 100644
--- a/app/javascript/mastodon/locales/fy.json
+++ b/app/javascript/mastodon/locales/fy.json
@@ -11,7 +11,6 @@
   "about.not_available": "Dizze ynformaasje is troch dizze server net iepenbier makke.",
   "about.powered_by": "Desintralisearre sosjale media, mooglik makke troch {mastodon}",
   "about.rules": "Serverrigels",
-  "account.account_note_header": "Opmerking",
   "account.add_or_remove_from_list": "Tafoegje oan of fuortsmite út listen",
   "account.badges.bot": "Automatisearre",
   "account.badges.group": "Groep",
diff --git a/app/javascript/mastodon/locales/ga.json b/app/javascript/mastodon/locales/ga.json
index 44bc62c755f8fc..04be6bc2fa11b7 100644
--- a/app/javascript/mastodon/locales/ga.json
+++ b/app/javascript/mastodon/locales/ga.json
@@ -11,7 +11,6 @@
   "about.not_available": "Níor cuireadh an t-eolas seo ar fáil ar an bhfreastalaí seo.",
   "about.powered_by": "Meáin shóisialta díláraithe faoi chumhacht {mastodon}",
   "about.rules": "Rialacha an fhreastalaí",
-  "account.account_note_header": "Nóta",
   "account.add_or_remove_from_list": "Cuir Le nó Bain De na liostaí",
   "account.badges.bot": "Bota",
   "account.badges.group": "Grúpa",
diff --git a/app/javascript/mastodon/locales/gd.json b/app/javascript/mastodon/locales/gd.json
index 440654b0db59f8..5b5009e853d548 100644
--- a/app/javascript/mastodon/locales/gd.json
+++ b/app/javascript/mastodon/locales/gd.json
@@ -11,7 +11,7 @@
   "about.not_available": "Cha deach am fiosrachadh seo a sholar air an fhrithealaiche seo.",
   "about.powered_by": "Lìonra sòisealta sgaoilte le cumhachd {mastodon}",
   "about.rules": "Riaghailtean an fhrithealaiche",
-  "account.account_note_header": "Nòta",
+  "account.account_note_header": "Nòta pearsanta",
   "account.add_or_remove_from_list": "Cuir ris no thoir air falbh o liostaichean",
   "account.badges.bot": "Fèin-obrachail",
   "account.badges.group": "Buidheann",
@@ -505,6 +505,8 @@
   "notification.update": "Dheasaich {name} post",
   "notification_requests.accept": "Gabh ris",
   "notification_requests.dismiss": "Leig seachad",
+  "notification_requests.maximize": "Làn-mheudaich",
+  "notification_requests.minimize_banner": "Fìor-lùghdaich bratach nam brathan criathraichte",
   "notification_requests.notifications_from": "Brathan o {name}",
   "notification_requests.title": "Brathan criathraichte",
   "notifications.clear": "Falamhaich na brathan",
diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json
index 137130e9e9db20..493b2fcb1757af 100644
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@@ -11,7 +11,7 @@
   "about.not_available": "Esta información non está dispoñible neste servidor.",
   "about.powered_by": "Comunicación social descentralizada grazas a {mastodon}",
   "about.rules": "Regras do servidor",
-  "account.account_note_header": "Nota",
+  "account.account_note_header": "Nota persoal",
   "account.add_or_remove_from_list": "Engadir ou eliminar das listaxes",
   "account.badges.bot": "Automatizada",
   "account.badges.group": "Grupo",
diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json
index a1f718d24f47e8..3505e14768cb6f 100644
--- a/app/javascript/mastodon/locales/he.json
+++ b/app/javascript/mastodon/locales/he.json
@@ -11,7 +11,7 @@
   "about.not_available": "המידע אינו זמין על שרת זה.",
   "about.powered_by": "רשת חברתית מבוזרת המופעלת על ידי {mastodon}",
   "about.rules": "כללי השרת",
-  "account.account_note_header": "הערה",
+  "account.account_note_header": "הערה אישית",
   "account.add_or_remove_from_list": "הוספה או הסרה מרשימות",
   "account.badges.bot": "בוט",
   "account.badges.group": "קבוצה",
diff --git a/app/javascript/mastodon/locales/hi.json b/app/javascript/mastodon/locales/hi.json
index c2a961b32c668a..0d2a9065692d50 100644
--- a/app/javascript/mastodon/locales/hi.json
+++ b/app/javascript/mastodon/locales/hi.json
@@ -11,7 +11,6 @@
   "about.not_available": "यह जानकारी इस सर्वर पर उपलब्ध नहीं कराई गई है।",
   "about.powered_by": "{mastodon} द्वारा संचालित डेसेंट्रलीसेड सोशल मीडिया प्लैटफ़ॉर्म!",
   "about.rules": "सर्वर के नियम",
-  "account.account_note_header": "टिप्पणियाँ",
   "account.add_or_remove_from_list": "सूची में जोड़ें या हटाए",
   "account.badges.bot": "बॉट",
   "account.badges.group": "समूह",
diff --git a/app/javascript/mastodon/locales/hr.json b/app/javascript/mastodon/locales/hr.json
index 5598732465d23e..da833079187bef 100644
--- a/app/javascript/mastodon/locales/hr.json
+++ b/app/javascript/mastodon/locales/hr.json
@@ -11,7 +11,6 @@
   "about.not_available": "Te informacije nisu dostupne na ovom poslužitelju.",
   "about.powered_by": "Decentralizirani društveni mediji koje pokreće {mastodon}",
   "about.rules": "Pravila servera",
-  "account.account_note_header": "Bilješka",
   "account.add_or_remove_from_list": "Dodaj ili ukloni s liste",
   "account.badges.bot": "Bot",
   "account.badges.group": "Grupa",
diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json
index 4acff61740c23d..4291954e202a93 100644
--- a/app/javascript/mastodon/locales/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@@ -11,7 +11,7 @@
   "about.not_available": "Ez az információ nem lett közzétéve ezen a kiszolgálón.",
   "about.powered_by": "Decentralizált közösségi média a {mastodon} segítségével",
   "about.rules": "Kiszolgáló szabályai",
-  "account.account_note_header": "Feljegyzés",
+  "account.account_note_header": "Személyes megjegyzés",
   "account.add_or_remove_from_list": "Hozzáadás vagy eltávolítás a listákról",
   "account.badges.bot": "Automatizált",
   "account.badges.group": "Csoport",
diff --git a/app/javascript/mastodon/locales/hy.json b/app/javascript/mastodon/locales/hy.json
index e9b9e85ff9ee71..c926e7b4f38586 100644
--- a/app/javascript/mastodon/locales/hy.json
+++ b/app/javascript/mastodon/locales/hy.json
@@ -7,7 +7,6 @@
   "about.not_available": "Այս տեղեկութիւնը տեսանելի չի այս սերուերում։",
   "about.powered_by": "Ապակենտրոն սոց. ցանց սեղծուած {mastodon}-ով։",
   "about.rules": "Սերուերի կանոնները",
-  "account.account_note_header": "Նշում",
   "account.add_or_remove_from_list": "Աւելացնել կամ հեռացնել ցանկերից",
   "account.badges.bot": "Բոտ",
   "account.badges.group": "Խումբ",
diff --git a/app/javascript/mastodon/locales/ia.json b/app/javascript/mastodon/locales/ia.json
index 60838c3a5dd697..d775408b173222 100644
--- a/app/javascript/mastodon/locales/ia.json
+++ b/app/javascript/mastodon/locales/ia.json
@@ -11,7 +11,7 @@
   "about.not_available": "Iste information non ha essite rendite disponibile sur iste servitor.",
   "about.powered_by": "Rete social decentralisate, actionate per {mastodon}",
   "about.rules": "Regulas del servitor",
-  "account.account_note_header": "Nota",
+  "account.account_note_header": "Nota personal",
   "account.add_or_remove_from_list": "Adder a, o remover de listas",
   "account.badges.bot": "Automatisate",
   "account.badges.group": "Gruppo",
@@ -670,8 +670,11 @@
   "report_notification.attached_statuses": "{count, plural, one {{count} message} other {{count} messages}} annexate",
   "report_notification.categories.legal": "Juridic",
   "report_notification.categories.other": "Alteres",
+  "report_notification.categories.other_sentence": "alteres",
   "report_notification.categories.spam": "Spam",
+  "report_notification.categories.spam_sentence": "spam",
   "report_notification.categories.violation": "Violation del regulas",
+  "report_notification.categories.violation_sentence": "violation del regulas",
   "report_notification.open": "Aperir reporto",
   "search.no_recent_searches": "Nulle recercas recente",
   "search.placeholder": "Cercar",
diff --git a/app/javascript/mastodon/locales/id.json b/app/javascript/mastodon/locales/id.json
index e740fb009cf3f8..db6e3efe5f4107 100644
--- a/app/javascript/mastodon/locales/id.json
+++ b/app/javascript/mastodon/locales/id.json
@@ -11,7 +11,6 @@
   "about.not_available": "Informasi ini belum tersedia di server ini.",
   "about.powered_by": "Media sosial terdesentralisasi diberdayakan oleh {mastodon}",
   "about.rules": "Aturan server",
-  "account.account_note_header": "Catatan",
   "account.add_or_remove_from_list": "Tambah atau Hapus dari daftar",
   "account.badges.bot": "Bot",
   "account.badges.group": "Grup",
diff --git a/app/javascript/mastodon/locales/ie.json b/app/javascript/mastodon/locales/ie.json
index 27519b4776b050..c5290d18b829e5 100644
--- a/app/javascript/mastodon/locales/ie.json
+++ b/app/javascript/mastodon/locales/ie.json
@@ -11,7 +11,6 @@
   "about.not_available": "On ne ha disponibilisat ti-ci information sur ti-ci servitor.",
   "about.powered_by": "Decentralisat social medie disponibilisat de {mastodon}",
   "about.rules": "Regules del servitor",
-  "account.account_note_header": "Nota",
   "account.add_or_remove_from_list": "Adjunter o remover de listes",
   "account.badges.bot": "Automatisat",
   "account.badges.group": "Gruppe",
diff --git a/app/javascript/mastodon/locales/io.json b/app/javascript/mastodon/locales/io.json
index 6ff957bc800d67..38ece266e6bddf 100644
--- a/app/javascript/mastodon/locales/io.json
+++ b/app/javascript/mastodon/locales/io.json
@@ -10,7 +10,6 @@
   "about.not_available": "Ca informo ne igesis che ca servilo.",
   "about.powered_by": "Necentraligita sociala ret quo povigesas da {mastodon}",
   "about.rules": "Servilreguli",
-  "account.account_note_header": "Noto",
   "account.add_or_remove_from_list": "Insertez o removez de listi",
   "account.badges.bot": "Boto",
   "account.badges.group": "Grupo",
diff --git a/app/javascript/mastodon/locales/is.json b/app/javascript/mastodon/locales/is.json
index a38e56714ac9b1..47daa30fc4bcb3 100644
--- a/app/javascript/mastodon/locales/is.json
+++ b/app/javascript/mastodon/locales/is.json
@@ -11,7 +11,7 @@
   "about.not_available": "Þessar upplýsingar hafa ekki verið gerðar aðgengilegar á þessum netþjóni.",
   "about.powered_by": "Dreifhýstur samskiptamiðill keyrður með {mastodon}",
   "about.rules": "Reglur netþjónsins",
-  "account.account_note_header": "Minnispunktur",
+  "account.account_note_header": "Einkaminnispunktur",
   "account.add_or_remove_from_list": "Bæta við eða fjarlægja af listum",
   "account.badges.bot": "Yrki",
   "account.badges.group": "Hópur",
diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json
index c0980edc04ee49..3d9df8a234e3db 100644
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@@ -11,7 +11,7 @@
   "about.not_available": "Queste informazioni non sono state rese disponibili su questo server.",
   "about.powered_by": "Social media decentralizzato alimentato da {mastodon}",
   "about.rules": "Regole del server",
-  "account.account_note_header": "Nota",
+  "account.account_note_header": "Note personali",
   "account.add_or_remove_from_list": "Aggiungi o Rimuovi dalle liste",
   "account.badges.bot": "Bot",
   "account.badges.group": "Gruppo",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index 9a1ef03efc883d..97f64b179e4fd0 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -11,7 +11,6 @@
   "about.not_available": "この情報はこのサーバーでは利用できません。",
   "about.powered_by": "{mastodon}による分散型ソーシャルメディア",
   "about.rules": "サーバーのルール",
-  "account.account_note_header": "メモ",
   "account.add_or_remove_from_list": "リストから追加または外す",
   "account.badges.bot": "Bot",
   "account.badges.group": "Group",
diff --git a/app/javascript/mastodon/locales/ka.json b/app/javascript/mastodon/locales/ka.json
index d61a29d7a33d18..a54998e92ba83e 100644
--- a/app/javascript/mastodon/locales/ka.json
+++ b/app/javascript/mastodon/locales/ka.json
@@ -1,7 +1,6 @@
 {
   "about.contact": "კონტაქტი:",
   "about.domain_blocks.no_reason_available": "მიზეზი მიუწვდომელია",
-  "account.account_note_header": "ჩანაწერი",
   "account.add_or_remove_from_list": "სიებში დამატება ან წაშლა",
   "account.badges.bot": "ბოტი",
   "account.badges.group": "ჯგუფი",
diff --git a/app/javascript/mastodon/locales/kab.json b/app/javascript/mastodon/locales/kab.json
index b8fd039b8dbffe..2c5b24adb6690d 100644
--- a/app/javascript/mastodon/locales/kab.json
+++ b/app/javascript/mastodon/locales/kab.json
@@ -8,7 +8,6 @@
   "about.not_available": "Talɣut-a ur tettwabder ara deg uqeddac-a.",
   "about.powered_by": "Azeṭṭa inmetti yettwasɣelsen sɣur {mastodon}",
   "about.rules": "Ilugan n uqeddac",
-  "account.account_note_header": "Tazmilt",
   "account.add_or_remove_from_list": "Rnu neɣ kkes seg tebdarin",
   "account.badges.bot": "Aṛubut",
   "account.badges.group": "Agraw",
@@ -84,6 +83,7 @@
   "bundle_column_error.network.title": "Tuccḍa deg uẓeṭṭa",
   "bundle_column_error.retry": "Ɛreḍ tikelt-nniḍen",
   "bundle_column_error.return": "Uɣal ɣer ugejdan",
+  "bundle_column_error.routing.body": "Asebter i d-yettwasutren ur yettwaf ara. Tetḥeqqeḍ belli tansa URL deg ufeggag n tansa tṣeḥḥa?",
   "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Mdel",
   "bundle_modal_error.message": "Tella-d kra n tuccḍa mi d-yettali ugbur-agi.",
@@ -143,20 +143,22 @@
   "confirmations.block.confirm": "Sewḥel",
   "confirmations.delete.confirm": "Kkes",
   "confirmations.delete.message": "Tebɣiḍ s tidet ad tekkseḍ tasuffeɣt-agi?",
+  "confirmations.delete.title": "Tukksa n tasuffeɣt?",
   "confirmations.delete_list.confirm": "Kkes",
   "confirmations.delete_list.message": "Tebɣiḍ s tidet ad tekkseḍ umuɣ-agi i lebda?",
+  "confirmations.delete_list.title": "Tukksa n tebdart?",
   "confirmations.discard_edit_media.confirm": "Sefsex",
   "confirmations.edit.confirm": "Ẓreg",
   "confirmations.edit.message": "Abeddel tura ad d-yaru izen-nni i d-tegreḍ akka tura. Tetḥeqqeḍ tebɣiḍ ad tkemmleḍ?",
   "confirmations.logout.confirm": "Ffeɣ",
   "confirmations.logout.message": "D tidet tebɣiḍ ad teffɣeḍ?",
   "confirmations.mute.confirm": "Sgugem",
-  "confirmations.redraft.confirm": "Sfeḍ & Ɛiwed tira",
+  "confirmations.redraft.confirm": "Kkes sakin ɛiwed tira",
   "confirmations.reply.confirm": "Err",
   "confirmations.reply.message": "Tiririt akka tura ad k-degger izen-agi i tettaruḍ. Tebɣiḍ ad tkemmleḍ?",
   "confirmations.unfollow.confirm": "Ur ḍḍafaṛ ara",
   "confirmations.unfollow.message": "Tetḥeqqeḍ belli tebɣiḍ ur teṭafaṛeḍ ara {name}?",
-  "conversation.delete": "Sfeḍ adiwenni",
+  "conversation.delete": "Kkes adiwenni",
   "conversation.mark_as_read": "Creḍ yettwaɣṛa",
   "conversation.open": "Ssken adiwenni",
   "conversation.with": "Akked {names}",
diff --git a/app/javascript/mastodon/locales/kk.json b/app/javascript/mastodon/locales/kk.json
index fbaa371843a73d..c530ce8f6a6fa5 100644
--- a/app/javascript/mastodon/locales/kk.json
+++ b/app/javascript/mastodon/locales/kk.json
@@ -11,7 +11,6 @@
   "about.not_available": "Бұл ақпарат бұл серверде қолжетімді емес.",
   "about.powered_by": "{mastodon} негізіндегі орталықсыз әлеуметтік желі",
   "about.rules": "Сервер ережелері",
-  "account.account_note_header": "Жазба",
   "account.add_or_remove_from_list": "Тізімге қосу немесе жою",
   "account.badges.bot": "Бот",
   "account.badges.group": "Топ",
diff --git a/app/javascript/mastodon/locales/kn.json b/app/javascript/mastodon/locales/kn.json
index 24592e37fc0e20..2dabae0c147b60 100644
--- a/app/javascript/mastodon/locales/kn.json
+++ b/app/javascript/mastodon/locales/kn.json
@@ -4,7 +4,6 @@
   "about.disclaimer": "ಮಾಸ್ಟೋಡಾನ್ ಇದು ಉಚಿತ, ಮುಕ್ತ ತಂತ್ರಾಂಶ ಮತ್ತು Mastodon gGmbH ಇದರ ನೊಂದಾಯಿತ ಗುರುತು.",
   "about.domain_blocks.no_reason_available": "ಕಾರಣ ಲಭ್ಯವಿಲ್ಲ",
   "about.domain_blocks.preamble": "ಸಾಮಾನ್ಯವಾಗಿ ಮಾಸ್ಟೊಡಾನ್ ನಿಮಗೆ ಇತರೆ ಬಳಕೆದಾರರಿಂದ ಹಂಚಲ್ಪಟ್ಟ ವಿಷಯಗಳನ್ನು ನೋಡಲು ಮತ್ತು ಅವರೊಂದಿಗೆ ಸಂಭಾಷಿಸಲು ಅನುಮತಿಸುತ್ತದೆ.\nಆದರೆ ಈ ಸರ್ವ್ರರ್‌ನಲ್ಲಿ ಅಳವಡಿಸಲಾದ ಕೆಲವು ವಿನಾಯಿತಿಗಳು ಇಂತಿವೆ.",
-  "account.account_note_header": "ಟಿಪ್ಪಣಿ",
   "account.add_or_remove_from_list": "ಪಟ್ಟಿಗೆ ಸೇರಿಸು ಅಥವ ಪಟ್ಟಿಯಿಂದ ತೆಗೆದುಹಾಕು",
   "account.badges.bot": "Bot",
   "account.badges.group": "ಗುಂಪು",
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index be060065f2bb86..5700e174668a79 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -11,7 +11,7 @@
   "about.not_available": "이 정보는 이 서버에서 사용할 수 없습니다.",
   "about.powered_by": "{mastodon}으로 구동되는 분산 소셜 미디어",
   "about.rules": "서버 규칙",
-  "account.account_note_header": "노트",
+  "account.account_note_header": "개인 메모",
   "account.add_or_remove_from_list": "리스트에 추가 혹은 삭제",
   "account.badges.bot": "자동화됨",
   "account.badges.group": "그룹",
@@ -505,6 +505,8 @@
   "notification.update": "{name} 님이 게시물을 수정했습니다",
   "notification_requests.accept": "수락",
   "notification_requests.dismiss": "지우기",
+  "notification_requests.maximize": "최대화",
+  "notification_requests.minimize_banner": "걸러진 알림 배너 최소화",
   "notification_requests.notifications_from": "{name} 님으로부터의 알림",
   "notification_requests.title": "걸러진 알림",
   "notifications.clear": "알림 비우기",
@@ -803,11 +805,11 @@
   "upload_button.label": "이미지, 영상, 오디오 파일 추가",
   "upload_error.limit": "파일 업로드 제한에 도달했습니다.",
   "upload_error.poll": "파일 업로드는 설문과 함께 쓸 수 없습니다.",
-  "upload_form.audio_description": "청각 장애인을 위한 설명",
+  "upload_form.audio_description": "청각장애인이나 저청각자를 위한 설명",
   "upload_form.description": "시각장애인이나 저시력자를 위한 설명",
   "upload_form.edit": "수정",
   "upload_form.thumbnail": "썸네일 변경",
-  "upload_form.video_description": "청각, 시각 장애인을 위한 설명",
+  "upload_form.video_description": "청각장애인, 저청각자, 시각장애인, 저시력자를 위한 설명",
   "upload_modal.analyzing_picture": "사진 분석 중…",
   "upload_modal.apply": "적용",
   "upload_modal.applying": "적용 중...",
diff --git a/app/javascript/mastodon/locales/ku.json b/app/javascript/mastodon/locales/ku.json
index 3d3c20424cf713..a4a6bfc58c333e 100644
--- a/app/javascript/mastodon/locales/ku.json
+++ b/app/javascript/mastodon/locales/ku.json
@@ -11,7 +11,6 @@
   "about.not_available": "Ev zanyarî li ser vê rajekarê nehatine peydakirin.",
   "about.powered_by": "Medyaya civakî ya nenavendî bi hêzdariya {mastodon}",
   "about.rules": "Rêbazên rajekar",
-  "account.account_note_header": "Nîşe",
   "account.add_or_remove_from_list": "Li lîsteyan zêde bike yan jî rake",
   "account.badges.bot": "Bot",
   "account.badges.group": "Kom",
diff --git a/app/javascript/mastodon/locales/kw.json b/app/javascript/mastodon/locales/kw.json
index 7ebe71b24cad9b..657688a0bbc3c4 100644
--- a/app/javascript/mastodon/locales/kw.json
+++ b/app/javascript/mastodon/locales/kw.json
@@ -1,6 +1,5 @@
 {
   "about.blocks": "Leurennow koswys",
-  "account.account_note_header": "Noten",
   "account.add_or_remove_from_list": "Keworra po Dilea a rolyow",
   "account.badges.bot": "Bot",
   "account.badges.group": "Bagas",
diff --git a/app/javascript/mastodon/locales/la.json b/app/javascript/mastodon/locales/la.json
index 1e2d54396aa832..81cc9cd99838eb 100644
--- a/app/javascript/mastodon/locales/la.json
+++ b/app/javascript/mastodon/locales/la.json
@@ -2,7 +2,6 @@
   "about.contact": "Ratio:",
   "about.domain_blocks.no_reason_available": "Ratio abdere est",
   "about.domain_blocks.silenced.explanation": "Tua profilia atque tuum contentum ab hac serve praecipue non videbis, nisi explōrēs expresse aut subsequeris et optēs.",
-  "account.account_note_header": "Annotatio",
   "account.add_or_remove_from_list": "Adde aut ēripe ex tabellīs",
   "account.badges.bot": "Robotum",
   "account.badges.group": "Congregatio",
diff --git a/app/javascript/mastodon/locales/lad.json b/app/javascript/mastodon/locales/lad.json
index 96ca615e211e5c..8da6cdecea065b 100644
--- a/app/javascript/mastodon/locales/lad.json
+++ b/app/javascript/mastodon/locales/lad.json
@@ -11,7 +11,6 @@
   "about.not_available": "Esta enformasyon no esta desponivle en este sirvidor.",
   "about.powered_by": "Redes sosyalas desentralizadas kon uzo de {mastodon}",
   "about.rules": "Reglas del sirvidor",
-  "account.account_note_header": "Nota",
   "account.add_or_remove_from_list": "Adjusta a o kita de listas",
   "account.badges.bot": "Otomatizado",
   "account.badges.group": "Grupo",
diff --git a/app/javascript/mastodon/locales/lt.json b/app/javascript/mastodon/locales/lt.json
index 2d3626ff9aad20..e2a7e947eb6388 100644
--- a/app/javascript/mastodon/locales/lt.json
+++ b/app/javascript/mastodon/locales/lt.json
@@ -11,7 +11,7 @@
   "about.not_available": "Ši informacija nebuvo pateikta šiame serveryje.",
   "about.powered_by": "Decentralizuota socialinė medija, veikianti pagal „{mastodon}“",
   "about.rules": "Serverio taisyklės",
-  "account.account_note_header": "Pastaba",
+  "account.account_note_header": "Asmeninė pastaba",
   "account.add_or_remove_from_list": "Pridėti arba pašalinti iš sąrašų",
   "account.badges.bot": "Automatizuotas",
   "account.badges.group": "Grupė",
diff --git a/app/javascript/mastodon/locales/lv.json b/app/javascript/mastodon/locales/lv.json
index 86ed6262a933f4..f1c065b92a0ba3 100644
--- a/app/javascript/mastodon/locales/lv.json
+++ b/app/javascript/mastodon/locales/lv.json
@@ -11,7 +11,6 @@
   "about.not_available": "Šī informācija nav padarīta pieejama šajā serverī.",
   "about.powered_by": "Decentralizētu sociālo tīklu nodrošina {mastodon}",
   "about.rules": "Servera noteikumi",
-  "account.account_note_header": "Piezīme",
   "account.add_or_remove_from_list": "Pievienot vai Noņemt no sarakstiem",
   "account.badges.bot": "Automatizēts",
   "account.badges.group": "Grupa",
diff --git a/app/javascript/mastodon/locales/mk.json b/app/javascript/mastodon/locales/mk.json
index b1f3b9fab948fd..5c8b752cf96c92 100644
--- a/app/javascript/mastodon/locales/mk.json
+++ b/app/javascript/mastodon/locales/mk.json
@@ -10,7 +10,6 @@
   "about.not_available": "Оваа информација не е достапна на овој сервер.",
   "about.powered_by": "Децентрализиран друштвен медиум овозможен од {mastodon}",
   "about.rules": "Правила на серверот",
-  "account.account_note_header": "Белешка",
   "account.add_or_remove_from_list": "Додади или одстрани од листа",
   "account.badges.bot": "Бот",
   "account.badges.group": "Група",
diff --git a/app/javascript/mastodon/locales/ml.json b/app/javascript/mastodon/locales/ml.json
index d9caccef34669d..d929b1f461c301 100644
--- a/app/javascript/mastodon/locales/ml.json
+++ b/app/javascript/mastodon/locales/ml.json
@@ -5,7 +5,6 @@
   "about.domain_blocks.silenced.title": "പരിമിതമായത്",
   "about.domain_blocks.suspended.title": "താൽക്കാലികമായി നിർത്തിവെച്ചിരിക്കുന്നു",
   "about.rules": "സെർവ്വർ നിയമങ്ങൾ",
-  "account.account_note_header": "കുറിപ്പ്",
   "account.add_or_remove_from_list": "പട്ടികയിൽ ചേർക്കുകയോ/മാറ്റുകയോ ചെയ്യുക",
   "account.badges.bot": "റോബോട്ട്",
   "account.badges.group": "ഗ്രൂപ്പ്",
diff --git a/app/javascript/mastodon/locales/mr.json b/app/javascript/mastodon/locales/mr.json
index 2757b96f94084c..b72d44aa55896e 100644
--- a/app/javascript/mastodon/locales/mr.json
+++ b/app/javascript/mastodon/locales/mr.json
@@ -11,7 +11,6 @@
   "about.not_available": "ही माहिती या सर्व्हरवर उपलब्ध करून देण्यात आलेली नाही.",
   "about.powered_by": "{mastodon} द्वारा समर्थित विकेंद्रित सोशल मीडिया",
   "about.rules": "सर्व्हर नियम",
-  "account.account_note_header": "नोंद",
   "account.add_or_remove_from_list": "यादीत घाला किंवा यादीतून काढून टाका",
   "account.badges.bot": "स्वयंचलित खाते",
   "account.badges.group": "गट",
diff --git a/app/javascript/mastodon/locales/ms.json b/app/javascript/mastodon/locales/ms.json
index 17af770b9b5970..b4ee161edff625 100644
--- a/app/javascript/mastodon/locales/ms.json
+++ b/app/javascript/mastodon/locales/ms.json
@@ -11,7 +11,6 @@
   "about.not_available": "Maklumat ini belum tersedia pada pelayan ini.",
   "about.powered_by": "Media sosial terpencar yang dikuasakan oleh {mastodon}",
   "about.rules": "Peraturan pelayan",
-  "account.account_note_header": "Catatan",
   "account.add_or_remove_from_list": "Tambah atau Buang dari senarai",
   "account.badges.bot": "Bot",
   "account.badges.group": "Kumpulan",
diff --git a/app/javascript/mastodon/locales/my.json b/app/javascript/mastodon/locales/my.json
index cb08d76bd3011f..6a462b1c7c960d 100644
--- a/app/javascript/mastodon/locales/my.json
+++ b/app/javascript/mastodon/locales/my.json
@@ -11,7 +11,6 @@
   "about.not_available": "ဤအချက်အလက်ကို ဤဆာဗာတွင် မရရှိနိုင်ပါ။",
   "about.powered_by": "{mastodon} မှ ဗဟိုချုပ်ကိုင်မှုလျှော့ချထားသော ဆိုရှယ်မီဒီယာ",
   "about.rules": "ဆာဗာစည်းမျဉ်းများ",
-  "account.account_note_header": "မှတ်ချက်",
   "account.add_or_remove_from_list": "စာရင်းများမှ ထည့်ပါ သို့မဟုတ် ဖယ်ရှားပါ။",
   "account.badges.bot": "စက်ရုပ်",
   "account.badges.group": "အဖွဲ့",
diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json
index dd5a931b6fc033..c9be1a2735b403 100644
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@@ -11,7 +11,7 @@
   "about.not_available": "Deze informatie is niet beschikbaar gemaakt op deze server.",
   "about.powered_by": "Gedecentraliseerde sociale media mogelijk gemaakt door {mastodon}",
   "about.rules": "Serverregels",
-  "account.account_note_header": "Opmerking",
+  "account.account_note_header": "Persoonlijke opmerking",
   "account.add_or_remove_from_list": "Toevoegen aan of verwijderen uit lijsten",
   "account.badges.bot": "Geautomatiseerd",
   "account.badges.group": "Groep",
diff --git a/app/javascript/mastodon/locales/nn.json b/app/javascript/mastodon/locales/nn.json
index 26973f830f0094..c408f59d0d3e2a 100644
--- a/app/javascript/mastodon/locales/nn.json
+++ b/app/javascript/mastodon/locales/nn.json
@@ -11,7 +11,6 @@
   "about.not_available": "Denne informasjonen er ikkje gjort tilgjengeleg på denne tenaren.",
   "about.powered_by": "Desentraliserte sosiale medium drive av {mastodon}",
   "about.rules": "Tenarreglar",
-  "account.account_note_header": "Merknad",
   "account.add_or_remove_from_list": "Legg til eller fjern frå lister",
   "account.badges.bot": "Robot",
   "account.badges.group": "Gruppe",
diff --git a/app/javascript/mastodon/locales/no.json b/app/javascript/mastodon/locales/no.json
index 0f9e0d5a79cbc4..9aeb6be9c2b04d 100644
--- a/app/javascript/mastodon/locales/no.json
+++ b/app/javascript/mastodon/locales/no.json
@@ -11,7 +11,6 @@
   "about.not_available": "Denne informasjonen er ikke gjort tilgjengelig på denne tjeneren.",
   "about.powered_by": "Desentraliserte sosiale medier drevet av {mastodon}",
   "about.rules": "Regler for serveren",
-  "account.account_note_header": "Notat",
   "account.add_or_remove_from_list": "Legg til eller fjern fra lister",
   "account.badges.bot": "Automatisert",
   "account.badges.group": "Gruppe",
diff --git a/app/javascript/mastodon/locales/oc.json b/app/javascript/mastodon/locales/oc.json
index 00701cbdf9be02..382b7b127d16cd 100644
--- a/app/javascript/mastodon/locales/oc.json
+++ b/app/javascript/mastodon/locales/oc.json
@@ -8,7 +8,6 @@
   "about.not_available": "Aquesta informacion foguèt pas renduda disponibla sus aqueste servidor.",
   "about.powered_by": "Malhum social descentralizat propulsat per {mastodon}",
   "about.rules": "Règlas del servidor",
-  "account.account_note_header": "Nòta",
   "account.add_or_remove_from_list": "Ajustar o tirar de las listas",
   "account.badges.bot": "Robòt",
   "account.badges.group": "Grop",
diff --git a/app/javascript/mastodon/locales/pa.json b/app/javascript/mastodon/locales/pa.json
index feca55fad45356..83ded408ecebbb 100644
--- a/app/javascript/mastodon/locales/pa.json
+++ b/app/javascript/mastodon/locales/pa.json
@@ -4,7 +4,6 @@
   "about.domain_blocks.silenced.title": "ਸੀਮਿਤ",
   "about.domain_blocks.suspended.title": "ਮੁਅੱਤਲ ਕੀਤੀ",
   "about.rules": "ਸਰਵਰ ਨਿਯਮ",
-  "account.account_note_header": "ਨੋਟ",
   "account.add_or_remove_from_list": "ਸੂਚੀ ਵਿੱਚ ਜੋੜੋ ਜਾਂ ਹਟਾਓ",
   "account.badges.bot": "ਆਟੋਮੇਟ ਕੀਤਾ",
   "account.badges.group": "ਗਰੁੱਪ",
diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json
index 2136d3fa826a0d..05f4511b57ff2a 100644
--- a/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@@ -11,7 +11,7 @@
   "about.not_available": "Ta informacja nie została udostępniona na tym serwerze.",
   "about.powered_by": "Zdecentralizowane media społecznościowe napędzane przez {mastodon}",
   "about.rules": "Regulamin serwera",
-  "account.account_note_header": "Notatka",
+  "account.account_note_header": "Twoja notatka",
   "account.add_or_remove_from_list": "Dodaj lub usuń z list",
   "account.badges.bot": "Bot",
   "account.badges.group": "Grupa",
diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json
index 3f831dba250815..6ebb771002343f 100644
--- a/app/javascript/mastodon/locales/pt-BR.json
+++ b/app/javascript/mastodon/locales/pt-BR.json
@@ -11,7 +11,6 @@
   "about.not_available": "Esta informação não foi disponibilizada neste servidor.",
   "about.powered_by": "Redes sociais descentralizadas alimentadas por {mastodon}",
   "about.rules": "Regras do servidor",
-  "account.account_note_header": "Nota",
   "account.add_or_remove_from_list": "Adicionar ou remover de listas",
   "account.badges.bot": "Robô",
   "account.badges.group": "Grupo",
diff --git a/app/javascript/mastodon/locales/pt-PT.json b/app/javascript/mastodon/locales/pt-PT.json
index a4340f95d51bf5..8e67900ae01c76 100644
--- a/app/javascript/mastodon/locales/pt-PT.json
+++ b/app/javascript/mastodon/locales/pt-PT.json
@@ -11,7 +11,7 @@
   "about.not_available": "Esta informação não foi disponibilizada neste servidor.",
   "about.powered_by": "Rede social descentralizada baseada no {mastodon}",
   "about.rules": "Regras do servidor",
-  "account.account_note_header": "Nota",
+  "account.account_note_header": "Nota pessoal",
   "account.add_or_remove_from_list": "Adicionar ou remover das listas",
   "account.badges.bot": "Robô",
   "account.badges.group": "Grupo",
diff --git a/app/javascript/mastodon/locales/ro.json b/app/javascript/mastodon/locales/ro.json
index c4d05350202f19..36e5565fdf4f7a 100644
--- a/app/javascript/mastodon/locales/ro.json
+++ b/app/javascript/mastodon/locales/ro.json
@@ -11,7 +11,6 @@
   "about.not_available": "Această informație nu a fost pusă la dispoziție pe acest server.",
   "about.powered_by": "Media socială descentralizată furnizată de {mastodon}",
   "about.rules": "Reguli server",
-  "account.account_note_header": "Notă",
   "account.add_or_remove_from_list": "Adaugă sau elimină din liste",
   "account.badges.bot": "Robot",
   "account.badges.group": "Grup",
diff --git a/app/javascript/mastodon/locales/ru.json b/app/javascript/mastodon/locales/ru.json
index 61395c17abef62..bff2fe4e7b0fc8 100644
--- a/app/javascript/mastodon/locales/ru.json
+++ b/app/javascript/mastodon/locales/ru.json
@@ -11,7 +11,6 @@
   "about.not_available": "Эта информация не указана на данном сервере.",
   "about.powered_by": "Децентрализованная социальная сеть на базе {mastodon}",
   "about.rules": "Правила сервера",
-  "account.account_note_header": "Заметка",
   "account.add_or_remove_from_list": "Управление списками",
   "account.badges.bot": "Бот",
   "account.badges.group": "Группа",
diff --git a/app/javascript/mastodon/locales/ry.json b/app/javascript/mastodon/locales/ry.json
index cbd9e3d928cd3d..a53394dc5a224c 100644
--- a/app/javascript/mastodon/locales/ry.json
+++ b/app/javascript/mastodon/locales/ry.json
@@ -11,7 +11,6 @@
   "about.not_available": "Ися інформація не была доступна на сюм сервері.",
   "about.powered_by": "Децентралізована медіа основана на {mastodon}",
   "about.rules": "Правила сервера",
-  "account.account_note_header": "Примітка",
   "account.add_or_remove_from_list": "Дати авадь забрати из исписа",
   "account.badges.bot": "Автоматічно",
   "account.badges.group": "Ґрупа",
diff --git a/app/javascript/mastodon/locales/sa.json b/app/javascript/mastodon/locales/sa.json
index ea18ba2091541c..e230156615d783 100644
--- a/app/javascript/mastodon/locales/sa.json
+++ b/app/javascript/mastodon/locales/sa.json
@@ -11,7 +11,6 @@
   "about.not_available": "अस्मिन्सर्वरि अस्यास्सूचनायाः उपलभ्यो न कृतः।",
   "about.powered_by": "अकेन्द्रीयितसामाजिकजालकर्म {mastodon} द्वारा आधारितम्",
   "about.rules": "सर्वरो नियमाः",
-  "account.account_note_header": "टीका",
   "account.add_or_remove_from_list": "युज्यतां / नश्यतां सूच्याः",
   "account.badges.bot": "यन्त्रम्",
   "account.badges.group": "समूहः",
diff --git a/app/javascript/mastodon/locales/sc.json b/app/javascript/mastodon/locales/sc.json
index 050e1e6faefd9c..6be1cd41fa5f62 100644
--- a/app/javascript/mastodon/locales/sc.json
+++ b/app/javascript/mastodon/locales/sc.json
@@ -11,7 +11,6 @@
   "about.not_available": "Custa informatzione no est istada posta a disponimentu in custu serbidore.",
   "about.powered_by": "Rete sotziale detzentralizada impulsada dae {mastodon}",
   "about.rules": "Règulas de su serbidore",
-  "account.account_note_header": "Nota",
   "account.add_or_remove_from_list": "Agiunghe o boga dae is listas",
   "account.badges.bot": "Automatizadu",
   "account.badges.group": "Grupu",
diff --git a/app/javascript/mastodon/locales/sco.json b/app/javascript/mastodon/locales/sco.json
index 99f474ace50f38..54f1d9fe15f133 100644
--- a/app/javascript/mastodon/locales/sco.json
+++ b/app/javascript/mastodon/locales/sco.json
@@ -11,7 +11,6 @@
   "about.not_available": "This information haesnae been made available on this server.",
   "about.powered_by": "Decentralised social media pooert bi {mastodon}",
   "about.rules": "Server rules",
-  "account.account_note_header": "Note",
   "account.add_or_remove_from_list": "Add or Remuive frae lists",
   "account.badges.bot": "Bot",
   "account.badges.group": "Group",
diff --git a/app/javascript/mastodon/locales/si.json b/app/javascript/mastodon/locales/si.json
index c4f82c41336c80..432b2dff8f9fbd 100644
--- a/app/javascript/mastodon/locales/si.json
+++ b/app/javascript/mastodon/locales/si.json
@@ -4,7 +4,6 @@
   "about.disclaimer": "මාස්ටඩන් යනු නිදහස් විවෘත මූලාශ්‍ර මෘදුකාංගයකි. එය මාස්ටඩන් gGmbH හි වෙළඳ නාමයකි.",
   "about.domain_blocks.suspended.title": "අත්හිටුවා ඇත",
   "about.rules": "සේවාදායකයේ නීති",
-  "account.account_note_header": "සටහන",
   "account.add_or_remove_from_list": "ලැයිස්තු වලින් එකතු හෝ ඉවත් කරන්න",
   "account.badges.bot": "ස්වයංක්‍රියයි",
   "account.badges.group": "සමූහය",
diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json
index 665c85dd41d3e5..9abeea62dcb645 100644
--- a/app/javascript/mastodon/locales/sk.json
+++ b/app/javascript/mastodon/locales/sk.json
@@ -11,7 +11,6 @@
   "about.not_available": "Tieto informácie neboli sprístupnené na tomto serveri.",
   "about.powered_by": "Decentralizovaná sociálna sieť na základe technológie {mastodon}",
   "about.rules": "Pravidlá servera",
-  "account.account_note_header": "Poznámka",
   "account.add_or_remove_from_list": "Pridať alebo odobrať zo zoznamov",
   "account.badges.bot": "Bot",
   "account.badges.group": "Skupina",
diff --git a/app/javascript/mastodon/locales/sl.json b/app/javascript/mastodon/locales/sl.json
index 77bd899ad8cfbb..ad282fd60fac19 100644
--- a/app/javascript/mastodon/locales/sl.json
+++ b/app/javascript/mastodon/locales/sl.json
@@ -11,7 +11,7 @@
   "about.not_available": "Ti podatki še niso na voljo na tem strežniku.",
   "about.powered_by": "Decentraliziran družabni medij, ki ga poganja {mastodon}",
   "about.rules": "Pravila strežnika",
-  "account.account_note_header": "Opombe",
+  "account.account_note_header": "Zasebna opomba",
   "account.add_or_remove_from_list": "Dodaj ali odstrani s seznamov",
   "account.badges.bot": "Robot",
   "account.badges.group": "Skupina",
@@ -171,21 +171,28 @@
   "confirmations.block.confirm": "Blokiraj",
   "confirmations.delete.confirm": "Izbriši",
   "confirmations.delete.message": "Ali ste prepričani, da želite izbrisati to objavo?",
+  "confirmations.delete.title": "Želite izbrisati objavo?",
   "confirmations.delete_list.confirm": "Izbriši",
   "confirmations.delete_list.message": "Ali ste prepričani, da želite trajno izbrisati ta seznam?",
+  "confirmations.delete_list.title": "Želite izbrisati seznam?",
   "confirmations.discard_edit_media.confirm": "Opusti",
   "confirmations.discard_edit_media.message": "Imate ne shranjene spremembe za medijski opis ali predogled; jih želite kljub temu opustiti?",
   "confirmations.edit.confirm": "Uredi",
   "confirmations.edit.message": "Urejanje bo prepisalo sporočilo, ki ga trenutno sestavljate. Ali ste prepričani, da želite nadaljevati?",
+  "confirmations.edit.title": "Želite prepisati objavo?",
   "confirmations.logout.confirm": "Odjava",
   "confirmations.logout.message": "Ali ste prepričani, da se želite odjaviti?",
+  "confirmations.logout.title": "Se želite odjaviti?",
   "confirmations.mute.confirm": "Utišanje",
   "confirmations.redraft.confirm": "Izbriši in preoblikuj",
   "confirmations.redraft.message": "Ali ste prepričani, da želite izbrisati ta status in ga preoblikovati? Vzljubi in izpostavitve bodo izgubljeni, odgovori na izvirno objavo pa bodo osiroteli.",
+  "confirmations.redraft.title": "Želite izbrisati in predelati objavo?",
   "confirmations.reply.confirm": "Odgovori",
   "confirmations.reply.message": "Odgovarjanje bo prepisalo sporočilo, ki ga trenutno sestavljate. Ali ste prepričani, da želite nadaljevati?",
+  "confirmations.reply.title": "Želite prepisati objavo?",
   "confirmations.unfollow.confirm": "Ne sledi več",
   "confirmations.unfollow.message": "Ali ste prepričani, da ne želite več slediti {name}?",
+  "confirmations.unfollow.title": "Želite nehati spremljati uporabnika?",
   "conversation.delete": "Izbriši pogovor",
   "conversation.mark_as_read": "Označi kot prebrano",
   "conversation.open": "Pokaži pogovor",
@@ -497,10 +504,12 @@
   "notification.update": "{name} je uredil(a) objavo",
   "notification_requests.accept": "Sprejmi",
   "notification_requests.dismiss": "Zavrni",
+  "notification_requests.maximize": "Maksimiraj",
   "notification_requests.notifications_from": "Obvestila od {name}",
   "notification_requests.title": "Filtrirana obvestila",
   "notifications.clear": "Počisti obvestila",
   "notifications.clear_confirmation": "Ali ste prepričani, da želite trajno izbrisati vsa svoja obvestila?",
+  "notifications.clear_title": "Želite počistiti obvestila?",
   "notifications.column_settings.admin.report": "Nove prijave:",
   "notifications.column_settings.admin.sign_up": "Novi vpisi:",
   "notifications.column_settings.alert": "Namizna obvestila",
diff --git a/app/javascript/mastodon/locales/sq.json b/app/javascript/mastodon/locales/sq.json
index e7b79c08bb3267..af44c702471884 100644
--- a/app/javascript/mastodon/locales/sq.json
+++ b/app/javascript/mastodon/locales/sq.json
@@ -11,7 +11,7 @@
   "about.not_available": "Ky informacion, në këtë shërbyes, nuk jepet.",
   "about.powered_by": "Media shoqërore e decentralizuar, bazuar në {mastodon}",
   "about.rules": "Rregulla shërbyesi",
-  "account.account_note_header": "Shënim",
+  "account.account_note_header": "Shënim personal",
   "account.add_or_remove_from_list": "Shtoni ose Hiqni prej listash",
   "account.badges.bot": "Robot",
   "account.badges.group": "Grup",
diff --git a/app/javascript/mastodon/locales/sr-Latn.json b/app/javascript/mastodon/locales/sr-Latn.json
index a58376af041f5b..d0636614e844e5 100644
--- a/app/javascript/mastodon/locales/sr-Latn.json
+++ b/app/javascript/mastodon/locales/sr-Latn.json
@@ -11,7 +11,6 @@
   "about.not_available": "Ove informacije nisu dostupne na ovom serveru.",
   "about.powered_by": "Decentralizovana društvena mreža koju pokreće {mastodon}",
   "about.rules": "Pravila servera",
-  "account.account_note_header": "Napomena",
   "account.add_or_remove_from_list": "Dodaj ili ukloni sa lista",
   "account.badges.bot": "Automatizovano",
   "account.badges.group": "Grupa",
diff --git a/app/javascript/mastodon/locales/sr.json b/app/javascript/mastodon/locales/sr.json
index 2c9948299da665..c41cda123a0cea 100644
--- a/app/javascript/mastodon/locales/sr.json
+++ b/app/javascript/mastodon/locales/sr.json
@@ -11,7 +11,6 @@
   "about.not_available": "Ове информације нису доступне на овом серверу.",
   "about.powered_by": "Децентрализована друштвена мрежа коју покреће {mastodon}",
   "about.rules": "Правила сервера",
-  "account.account_note_header": "Напомена",
   "account.add_or_remove_from_list": "Додај или уклони са листа",
   "account.badges.bot": "Аутоматизовано",
   "account.badges.group": "Група",
diff --git a/app/javascript/mastodon/locales/sv.json b/app/javascript/mastodon/locales/sv.json
index b3f70cf2ede5fc..a88502500db9e1 100644
--- a/app/javascript/mastodon/locales/sv.json
+++ b/app/javascript/mastodon/locales/sv.json
@@ -11,7 +11,7 @@
   "about.not_available": "Denna information har inte gjorts tillgänglig på denna server.",
   "about.powered_by": "En decentraliserad plattform for sociala medier, drivet av {mastodon}",
   "about.rules": "Serverregler",
-  "account.account_note_header": "Anteckning",
+  "account.account_note_header": "Personlig anteckning",
   "account.add_or_remove_from_list": "Lägg till i eller ta bort från listor",
   "account.badges.bot": "Bot",
   "account.badges.group": "Grupp",
diff --git a/app/javascript/mastodon/locales/szl.json b/app/javascript/mastodon/locales/szl.json
index 34d086eb48c079..269e3b06b50cea 100644
--- a/app/javascript/mastodon/locales/szl.json
+++ b/app/javascript/mastodon/locales/szl.json
@@ -10,7 +10,6 @@
   "about.domain_blocks.suspended.title": "Zawiyszōne",
   "about.not_available": "Ta informacyjŏ niy bōła udostympniōna na tym serwerze.",
   "about.rules": "Zasady serwera",
-  "account.account_note_header": "Notatka",
   "account.badges.bot": "Bot",
   "account.badges.group": "Grupa",
   "account.block": "Zablokuj @{name}",
diff --git a/app/javascript/mastodon/locales/ta.json b/app/javascript/mastodon/locales/ta.json
index ef3255a7dad623..402d34b9fdd249 100644
--- a/app/javascript/mastodon/locales/ta.json
+++ b/app/javascript/mastodon/locales/ta.json
@@ -4,7 +4,6 @@
   "about.disclaimer": "மாஸ்டோடன் இலவச, திறந்த மூல மென்பொருள் மற்றும் மாஸ்டோடன் gGmbH இன் வர்த்தக முத்திரை.",
   "about.domain_blocks.no_reason_available": "காரணம் கிடைக்கவில்லை",
   "about.domain_blocks.preamble": "மாஸ்டோடன் பொதுவாக நீங்கள் ஃபெடிவர்ஸில் உள்ள வேறு எந்தச் சர்வரிலிருந்தும் உள்ளடக்கத்தைப் பார்க்கவும், பயனர்களுடன் தொடர்பு கொள்ளவும் அனுமதிக்கிறது. இந்தக் குறிப்பிட்ட சர்வரில் செய்யப்பட்ட விதிவிலக்குகள் இவை.",
-  "account.account_note_header": "குறிப்பு",
   "account.add_or_remove_from_list": "பட்டியல்களில் சேர்/நீக்கு",
   "account.badges.bot": "பாட்",
   "account.badges.group": "குழு",
diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json
index b4d259f174fb4f..a6df1cc976fb54 100644
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@@ -11,7 +11,6 @@
   "about.not_available": "ไม่ได้ทำให้ข้อมูลนี้พร้อมใช้งานในเซิร์ฟเวอร์นี้",
   "about.powered_by": "สื่อสังคมแบบกระจายศูนย์ที่ขับเคลื่อนโดย {mastodon}",
   "about.rules": "กฎของเซิร์ฟเวอร์",
-  "account.account_note_header": "หมายเหตุ",
   "account.add_or_remove_from_list": "เพิ่มหรือเอาออกจากรายการ",
   "account.badges.bot": "อัตโนมัติ",
   "account.badges.group": "กลุ่ม",
diff --git a/app/javascript/mastodon/locales/tok.json b/app/javascript/mastodon/locales/tok.json
index cf76b31f927de0..03ad31a7284bd8 100644
--- a/app/javascript/mastodon/locales/tok.json
+++ b/app/javascript/mastodon/locales/tok.json
@@ -8,7 +8,6 @@
   "about.domain_blocks.suspended.title": "weka",
   "about.not_available": "lon kulupu ni la sina ken alasa ala e sona ni.",
   "about.rules": "lawa kulupu",
-  "account.account_note_header": "sona awen",
   "account.add_or_remove_from_list": "o ante e lipu jan",
   "account.badges.bot": "ilo nanpa li lawa e ni",
   "account.badges.group": "kulupu",
diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json
index 198ee75eb824f9..cc9fd78c0a77c8 100644
--- a/app/javascript/mastodon/locales/tr.json
+++ b/app/javascript/mastodon/locales/tr.json
@@ -11,7 +11,7 @@
   "about.not_available": "Bu sunucuda bu bilgi kullanıma sunulmadı.",
   "about.powered_by": "{mastodon} destekli merkeziyetsiz sosyal ağ",
   "about.rules": "Sunucu kuralları",
-  "account.account_note_header": "Not",
+  "account.account_note_header": "Kişisel not",
   "account.add_or_remove_from_list": "Listelere ekle veya kaldır",
   "account.badges.bot": "Bot",
   "account.badges.group": "Grup",
diff --git a/app/javascript/mastodon/locales/tt.json b/app/javascript/mastodon/locales/tt.json
index 1c150c99c6c4b9..0f95b904eb06b7 100644
--- a/app/javascript/mastodon/locales/tt.json
+++ b/app/javascript/mastodon/locales/tt.json
@@ -11,7 +11,6 @@
   "about.not_available": "Бу серверда бу мәгълүмат юк иде.",
   "about.powered_by": "{mastodon} нигезендә үзәкчелеге бетерелгән социаль челтәр нигезендә",
   "about.rules": "Сервер кагыйдәләре",
-  "account.account_note_header": "Язма",
   "account.add_or_remove_from_list": "Исемлеккә кушу яки бетерү",
   "account.badges.bot": "Бот",
   "account.badges.group": "Төркем",
diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json
index a1c674caa198fd..9e9d59f08706c5 100644
--- a/app/javascript/mastodon/locales/uk.json
+++ b/app/javascript/mastodon/locales/uk.json
@@ -11,7 +11,7 @@
   "about.not_available": "Ця інформація не доступна на цьому сервері.",
   "about.powered_by": "Децентралізовані соціальні мережі від {mastodon}",
   "about.rules": "Правила сервера",
-  "account.account_note_header": "Примітка",
+  "account.account_note_header": "Особиста нотатка",
   "account.add_or_remove_from_list": "Додати або видалити зі списків",
   "account.badges.bot": "Бот",
   "account.badges.group": "Група",
diff --git a/app/javascript/mastodon/locales/ur.json b/app/javascript/mastodon/locales/ur.json
index d82e52ae505464..8b387839534788 100644
--- a/app/javascript/mastodon/locales/ur.json
+++ b/app/javascript/mastodon/locales/ur.json
@@ -6,7 +6,6 @@
   "about.domain_blocks.silenced.title": "محدود",
   "about.domain_blocks.suspended.title": "معطل شدہ",
   "about.rules": "سرور کے اصول",
-  "account.account_note_header": "نوٹ",
   "account.add_or_remove_from_list": "فہرست میں شامل یا برطرف کریں",
   "account.badges.bot": "روبوٹ",
   "account.badges.group": "گروپ",
diff --git a/app/javascript/mastodon/locales/uz.json b/app/javascript/mastodon/locales/uz.json
index d0bcb90924cfc3..534ba74ef74245 100644
--- a/app/javascript/mastodon/locales/uz.json
+++ b/app/javascript/mastodon/locales/uz.json
@@ -11,7 +11,6 @@
   "about.not_available": "Ushbu ma'lumot ushbu serverda mavjud emas.",
   "about.powered_by": "{mastodon} tomonidan boshqariladigan markazlashtirilmagan ijtimoiy media",
   "about.rules": "Server qoidalari",
-  "account.account_note_header": "Eslatma",
   "account.add_or_remove_from_list": "Roʻyxatlarga qoʻshish yoki oʻchirish",
   "account.badges.bot": "Bo't",
   "account.badges.group": "Guruhlar",
diff --git a/app/javascript/mastodon/locales/vi.json b/app/javascript/mastodon/locales/vi.json
index 0f5eeebd07bc9f..197969aa6ab4d6 100644
--- a/app/javascript/mastodon/locales/vi.json
+++ b/app/javascript/mastodon/locales/vi.json
@@ -11,7 +11,7 @@
   "about.not_available": "Máy chủ này chưa cung cấp thông tin.",
   "about.powered_by": "Mạng xã hội liên hợp {mastodon}",
   "about.rules": "Nội quy máy chủ",
-  "account.account_note_header": "Ghi chú",
+  "account.account_note_header": "Ghi chú cá nhân",
   "account.add_or_remove_from_list": "Sửa danh sách",
   "account.badges.bot": "Bot",
   "account.badges.group": "Nhóm",
diff --git a/app/javascript/mastodon/locales/zgh.json b/app/javascript/mastodon/locales/zgh.json
index b42bb7589ce668..2e09642af93189 100644
--- a/app/javascript/mastodon/locales/zgh.json
+++ b/app/javascript/mastodon/locales/zgh.json
@@ -1,5 +1,4 @@
 {
-  "account.account_note_header": "ⵍⵎⴷ ⵓⴳⴳⴰⵔ",
   "account.add_or_remove_from_list": "ⵔⵏⵓ ⵏⵖ ⵙⵉⵜⵜⵢ ⵙⴳ ⵜⵍⴳⴰⵎⵜ",
   "account.badges.bot": "ⴰⴱⵓⵜ",
   "account.badges.group": "ⵜⴰⵔⴰⴱⴱⵓⵜ",
diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json
index 53fe9b985346ad..e0c11010a25dac 100644
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@@ -11,7 +11,7 @@
   "about.not_available": "此信息在当前服务器尚不可用。",
   "about.powered_by": "由 {mastodon} 驱动的去中心化社交媒体",
   "about.rules": "站点规则",
-  "account.account_note_header": "备注",
+  "account.account_note_header": "个人备注",
   "account.add_or_remove_from_list": "从列表中添加或移除",
   "account.badges.bot": "机器人",
   "account.badges.group": "群组",
diff --git a/app/javascript/mastodon/locales/zh-HK.json b/app/javascript/mastodon/locales/zh-HK.json
index 389b5c4a3a5a04..97feb9120d91a0 100644
--- a/app/javascript/mastodon/locales/zh-HK.json
+++ b/app/javascript/mastodon/locales/zh-HK.json
@@ -11,7 +11,6 @@
   "about.not_available": "本伺服器尚未提供這資訊。",
   "about.powered_by": "由 {mastodon} 提供之去中心化社交媒體",
   "about.rules": "伺服器規則",
-  "account.account_note_header": "備忘",
   "account.add_or_remove_from_list": "從列表中新增或移除",
   "account.badges.bot": "機械人",
   "account.badges.group": "群組",
diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json
index 8be00b273a1375..9e2f783e6b9b4a 100644
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@@ -11,7 +11,7 @@
   "about.not_available": "無法於本伺服器上使用此資訊。",
   "about.powered_by": "由 {mastodon} 提供的去中心化社群媒體",
   "about.rules": "伺服器規則",
-  "account.account_note_header": "備註",
+  "account.account_note_header": "個人備註",
   "account.add_or_remove_from_list": "自列表中新增或移除",
   "account.badges.bot": "機器人",
   "account.badges.group": "群組",
diff --git a/config/locales/devise.kab.yml b/config/locales/devise.kab.yml
index 3fbc58c1f57fcb..8f9e63c21412d8 100644
--- a/config/locales/devise.kab.yml
+++ b/config/locales/devise.kab.yml
@@ -22,7 +22,7 @@ kab:
         action: Senqed tansa-inek imayl
         action_with_app: Sentem sakkin uɣal ɣer %{app}
         explanation: Aqla-k terniḍ amiḍan deg %{host} s tansa imayl-agi. Mazal-ak yiwen utekki akken ad t-tremdeḍ. Ma mačči d kečč i yessutren ay-agi, ttxil-k ssinef izen-a.
-        explanation_when_pending: Tsutreḍ-d ajerred deg %{host} s tansa-agi imayl. Ad nγeṛ asuter-ik ticki tsentmeḍ tansa-ik imayl. Send asentem, ur tezmireḍ ara ad teqqneḍ γer umiḍan-ik. Ma yella nugi asuter-ik, isefka-ik ad ttwakksen seg uqeddac, ihi ulac tigawt-nniḍen ara k-d-yettuqeblen. Ma mačči d kečč i yellan deffir n usuter-agi, ttxil-k ssinef izen-agi.
+        explanation_when_pending: Tsutreḍ-d ajerred deg %{host} s tansa-agi imayl. Ad nɣeṛ asuter-ik·im ticki tsentmeḍ tansa-inek·inem imayl. Send asentem, ur tezmireḍ ara ad teqqneḍ ɣer umiḍan-ik·im. Ma yella nugi asuter-ik·im, isefka-inek·inem ad ttwakksen seg uqeddac, ihi ulac tigawt-nniḍen ara k-d-yettuqeblen. Ma mačči d kečč· kemm i yellan deffir n usuter-agi, ttxil-k·m ssinef izen-agi.
         extra_html: Ttxil-k ẓer daγen <a href="%{terms_path}">ilugan n uqeddac</a> akked <a href="%{policy_path}">twetlin n useqdec-nneγ</a>.
         subject: 'Maṣṭudun: Asentem n ujerred deg uqeddac %{instance}'
         title: Senqed tansa-inek imayl
diff --git a/config/locales/devise.lt.yml b/config/locales/devise.lt.yml
index f27b68b7089dd0..7c72543574d654 100644
--- a/config/locales/devise.lt.yml
+++ b/config/locales/devise.lt.yml
@@ -15,7 +15,7 @@ lt:
       omniauth_user_creation_failure: Klaida kuriant šios tapatybės paskyrą.
       pending: Tavo paskyra vis dar peržiūrima.
       timeout: Tavo seansas baigėsi. Norėdamas (-a) tęsti, prisijunk dar kartą.
-      unauthenticated: Prieš tęsdamas (-a) turi prisijungti arba užsiregistruoti.
+      unauthenticated: Prieš tęsiant turi prisijungti arba užsiregistruoti.
       unconfirmed: Prieš tęsdamas (-a) turi patvirtinti savo el. pašto adresą.
     mailer:
       confirmation_instructions:
diff --git a/config/locales/doorkeeper.cs.yml b/config/locales/doorkeeper.cs.yml
index 3101779edf105a..1b98d0f88b3e9c 100644
--- a/config/locales/doorkeeper.cs.yml
+++ b/config/locales/doorkeeper.cs.yml
@@ -83,6 +83,7 @@ cs:
         access_denied: Vlastník zdroje či autorizační server žádost zamítl.
         credential_flow_not_configured: Proud Resource Owner Password Credentials selhal, protože Doorkeeper.configure.resource_owner_from_credentials nebylo nakonfigurováno.
         invalid_client: Ověření klienta selhalo kvůli neznámému klientovi, chybějící klientské autentizaci či nepodporované autentizační metodě.
+        invalid_code_challenge_method: Metoda code challenge musí být S256, plain není podporována.
         invalid_grant: Poskytnuté oprávnění je neplatné, vypršela jeho platnost, bylo odvoláno, neshoduje se s URI přesměrování použitým v požadavku o autorizaci, nebo bylo uděleno jinému klientu.
         invalid_redirect_uri: Zahrnutá přesměrovací URI není platná.
         invalid_request:
diff --git a/config/locales/doorkeeper.gl.yml b/config/locales/doorkeeper.gl.yml
index e86babd64c0eb3..2103e50ea198d0 100644
--- a/config/locales/doorkeeper.gl.yml
+++ b/config/locales/doorkeeper.gl.yml
@@ -83,6 +83,7 @@ gl:
         access_denied: O propietario do recurso ou o servidor autorizado denegaron a petición.
         credential_flow_not_configured: O fluxo do Contrasinal de Credenciais do Dono do Recurso fallou debido a que Doorkeeper.configure.resource_owner_from_credentials non están configuradas.
         invalid_client: A autenticación do cliente fallou por ser un cliente descoñecido, non se incluíu autenticación do cliente, ou o método de autenticación non está soportado.
+        invalid_code_challenge_method: O método de desafío para o código debe ser S256, texto claro non ten soporte.
         invalid_grant: A validación da autorización proporcionada non é valida, caducou, foi rexeitada, non coincide a redirección URI utilizada na petición de autorización, ou foi proporcionada para outro cliente.
         invalid_redirect_uri: A uri de redirección incluída non é válida.
         invalid_request:
diff --git a/config/locales/doorkeeper.kab.yml b/config/locales/doorkeeper.kab.yml
index d79c711e609f59..13d8d93258dc35 100644
--- a/config/locales/doorkeeper.kab.yml
+++ b/config/locales/doorkeeper.kab.yml
@@ -84,7 +84,7 @@ kab:
         create:
           notice: Asnas yettwarna-d.
         destroy:
-          notice: Asnan yettwakkes.
+          notice: Yettwakkes wesnas-nni.
         update:
           notice: Asnan yettwalqem.
       authorized_applications:
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 28906f9dbfc194..9c20c1c14fb88a 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -80,8 +80,8 @@ fi:
       joined: Liittynyt
       location:
         all: Kaikki
-        local: Paikalliset
-        remote: Etätilit
+        local: Paikallinen
+        remote: Etäinen
         title: Sijainti
       login_status: Sisäänkirjautumisen tila
       media_attachments: Medialiitteet
@@ -89,12 +89,12 @@ fi:
       memorialized: Muutettu muistosivuksi
       memorialized_msg: Käyttäjän %{username} tili muutettiin muistosivuksi onnistuneesti
       moderation:
-        active: Aktiiviset
+        active: Aktiivinen
         all: Kaikki
-        disabled: Eivät käytössä
-        pending: Odottavat
-        silenced: Rajoitetut
-        suspended: Jäädytetyt
+        disabled: Ei käytössä
+        pending: Odottava
+        silenced: Rajoitettu
+        suspended: Jäädytetty
         title: Moderointi
       moderation_notes: Moderointimuistiinpanot
       most_recent_activity: Viimeisin toiminta
@@ -341,7 +341,7 @@ fi:
       shortcode: Lyhennekoodi
       shortcode_hint: Vähintään 2 merkkiä, vain kirjaimia, numeroita ja alaviivoja
       title: Mukautetut emojit
-      uncategorized: Luokittelemattomat
+      uncategorized: Luokittelematon
       unlist: Poista listalta
       unlisted: Ei listalla
       update_failed_msg: Emojin päivitys epäonnistui
@@ -467,7 +467,7 @@ fi:
       language: Kielelle
       status: Tila
       suppress: Hylkää seurantasuositus
-      suppressed: Hylätyt
+      suppressed: Hylätty
       title: Seurantasuositukset
       unsuppress: Palauta seurantasuositus
     instances:
@@ -514,10 +514,10 @@ fi:
       delivery:
         all: Kaikki
         clear: Tyhjennä toimitusvirheet
-        failing: Epäonnistuneet
+        failing: Epäonnistuva
         restart: Käynnistä toimitus uudelleen
         stop: Lopeta toimitus
-        unavailable: Eivät saatavilla
+        unavailable: Ei saatavilla
       delivery_available: Toimitus on saatavilla
       delivery_error_days: Toimitusvirheen päivät
       delivery_error_hint: Jos toimitus ei ole mahdollista %{count} päivään, se merkitään automaattisesti toimituskelvottomaksi.
@@ -528,7 +528,7 @@ fi:
         other: "%{count} tunnettua tiliä"
       moderation:
         all: Kaikki
-        limited: Rajoitetut
+        limited: Rajoitettu
         title: Moderointi
       private_comment: Yksityinen kommentti
       public_comment: Julkinen kommentti
@@ -547,7 +547,7 @@ fi:
       filter:
         all: Kaikki
         available: Saatavilla
-        expired: Vanhentuneet
+        expired: Vanhentunut
         title: Suodatus
       title: Kutsut
     ip_blocks:
@@ -643,7 +643,7 @@ fi:
       reported_account: Raportoitu tili
       reported_by: Raportoinut
       reported_with_application: Raportoitu sovelluksella
-      resolved: Ratkaistut
+      resolved: Ratkaistu
       resolved_msg: Raportin ratkaisu onnistui!
       skip_to_actions: Siirry toimiin
       status: Tila
@@ -671,7 +671,7 @@ fi:
       title: Raportit
       unassign: Poista käsittelystä
       unknown_action_msg: 'Tuntematon toimi: %{action}'
-      unresolved: Ratkaisemattomat
+      unresolved: Ratkaisematon
       updated_at: Päivitetty
       view_profile: Näytä profiili
     roles:
@@ -906,7 +906,7 @@ fi:
     title: Ylläpito
     trends:
       allow: Salli
-      approved: Hyväksytyt
+      approved: Hyväksytty
       disallow: Kiellä
       links:
         allow: Salli linkki
@@ -923,14 +923,14 @@ fi:
         title: Suositut linkit
         usage_comparison: Jaettu tänään %{today} kertaa verrattuna eilisen %{yesterday} kertaan
       not_allowed_to_trend: Ei saa trendata
-      only_allowed: Vain sallitut
+      only_allowed: Vain sallittu
       pending_review: Odottaa tarkastusta
       preview_card_providers:
         allowed: Tämän julkaisijan lähettämät linkit voivat trendata
         description_html: Näistä verkkotunnuksista lähetettyjä linkkejä jaetaan usein palvelimellasi. Linkit eivät trendaa julkisesti, ellei linkin verkkotunnusta ole hyväksytty. Hyväksyntäsi (tai hylkäyksesi) ulottuu aliverkkotunnuksiin.
         rejected: Tämän julkaisijan lähettämät linkit eivät voi trendata
         title: Julkaisijat
-      rejected: Hylätyt
+      rejected: Hylätty
       statuses:
         allow: Salli julkaisu
         allow_account: Salli tekijä
@@ -1591,8 +1591,8 @@ fi:
     followers: Seuraajat
     following: Seuratut
     invited: Kutsutut
-    last_active: Viimeksi aktiiviset
-    most_recent: Viimeisimmät
+    last_active: Viimeksi aktiivinen
+    most_recent: Tuorein
     moved: Muuttaneet
     mutual: Seuraatte toisianne
     primary: Ensisijaiset
diff --git a/config/locales/gd.yml b/config/locales/gd.yml
index b9f0260f52459e..017cc660e097a6 100644
--- a/config/locales/gd.yml
+++ b/config/locales/gd.yml
@@ -1011,7 +1011,7 @@ gd:
     webhooks:
       add_new: Cuir puing-dheiridh ris
       delete: Sguab às
-      description_html: Bheir <strong>webhook</strong> comas do Mhastodon gus <strong>brathan fìor-ama</strong> a phutadh dhan aplacaid agad fhèin mu na tachartasan a thagh thu ach an adhbharaich an aplacaid agad <strong>freagairtean gu fèin-obrachail</strong>.
+      description_html: Bheir <strong>webhook</strong> comas do Mhastodon gus <strong>brathan fìor-ama</strong> a phutadh dhan aplacaid agad fhèin mu na tachartasan a thagh thu ach an adhbharaich an aplacaid agad <strong>frith-ghnìomhan gu fèin-obrachail</strong>.
       disable: Cuir à comas
       disabled: À comas
       edit: Deasaich a’ phuing-dheiridh
@@ -1627,7 +1627,7 @@ gd:
     title: Poileasaidh prìobhaideachd
   reactions:
     errors:
-      limit_reached: Ràinig thu crìoch nam freagairtean eadar-dhealaichte
+      limit_reached: Ràinig thu crìoch nam frith-ghnìomhan eadar-dhealaichte
       unrecognized_emoji: "– chan aithne dhuinn an Emoji seo"
   redirects:
     prompt: Ma tha earbsa agad sa cheangal seo, briog airson leantainn air adhart.
diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index 9d8e00cb7efd31..28a078bb3eae18 100644
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -886,6 +886,9 @@ ia:
         pending_review: Attende revision
         title: Stato
       name: Nomine
+      newest: Le plus nove
+      oldest: Le plus ancian
+      reset: Reinitialisar
       review: Revide le stato
       search: Cercar
       title: Hashtags
diff --git a/config/locales/kab.yml b/config/locales/kab.yml
index d6295ec9ae0981..28f2368dd94f42 100644
--- a/config/locales/kab.yml
+++ b/config/locales/kab.yml
@@ -581,11 +581,13 @@ kab:
     strikes:
       status: 'Tasuffeɣt #%{id}'
       title_actions:
+        delete_statuses: Tukksa n tsuffeɣt
         none: Ɣur-wat
   edit_profile:
     basic_information: Talɣut tamatut
     hint_html: "<strong>Mudd udem i wayen ttwalin medden deg umaɣnu-inek azayez ɣer yidis n yiznan-ik.</strong> Imdanen niḍen zemren ad k-ḍefren yernu ad gen assaɣ yid-k mi ara tesɛuḍ amaɣnu yeccuṛen ed tugna n umaɣnu."
   errors:
+    '404': Asebter i tettnadiḍ ulac-it da.
     '500':
       title: Asebter-ayi d arameɣtu
   existing_username_validator:
@@ -831,6 +833,7 @@ kab:
       public_long: Yal yiwen·t yezmer at iwali
       unlisted: War tabdert
   statuses_cleanup:
+    enabled: Tukksa n tsuffaɣ tiqburin s wudem awurman
     min_age:
       '1209600': 2 n yimalasen
       '15778476': 6 n wayyuren
@@ -877,10 +880,16 @@ kab:
       apps_ios_action: Sader-it-id seg App Store
       apps_step: Zdem-d isnasen-nneɣ unṣiben.
       apps_title: Isnasen n Mastodon
+      edit_profile_action: Sagen
+      edit_profile_title: Sagen amaɣnu-inek·inem
       feature_action: Issin ugar
       follow_action: Ḍfeṛ
+      follows_subtitle: Ḍfer imiḍanen yettwassnen mliḥ
       follows_title: Anwa ara ḍefṛeḍ
       follows_view_more: Ssken-d ugar n medden ay tzemred ad tḍefred
+      hashtags_subtitle: Wali ayen ileḥḥun seg sin wussan-a iεeddan
+      hashtags_title: Ihacṭagen mucaɛen
+      hashtags_view_more: Sken-d ugar n yihacṭagen mucaɛen
       post_step: Ini-as azul i umaḍal s uḍris, s tiwlafin, s tividyutin neɣ s tefranin.
       post_title: Aru tasuffeɣt-inek·inem tamezwarut
       share_action: Bḍu
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 5e18751e0989cc..ad9730aca7a2c3 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -445,6 +445,9 @@ lt:
     export_domain_blocks:
       import:
         description_html: Netrukus importuosi domenų blokavimų sąrašą. Labai atidžiai peržiūrėk šį sąrašą, ypač jei ne tu jį sudarei.
+    follow_recommendations:
+      language: Kalbui
+      status: Būsena
     instances:
       audit_log:
         title: Naujausi audito žurnalai
@@ -457,6 +460,9 @@ lt:
       back_to_warning: Įspėjimas
       by_domain: Domenas
       content_policies:
+        policies:
+          reject_media: Atmesti mediją
+          reject_reports: Atmesti ataskaitas
         policy: Politika
         reason: Viešoji priežastis
         title: Turinio politika
diff --git a/config/locales/simple_form.cs.yml b/config/locales/simple_form.cs.yml
index d4d370ff5bee42..2fe08e698aec11 100644
--- a/config/locales/simple_form.cs.yml
+++ b/config/locales/simple_form.cs.yml
@@ -211,6 +211,7 @@ cs:
         setting_default_privacy: Soukromí příspěvků
         setting_default_sensitive: Vždy označovat média jako citlivá
         setting_delete_modal: Před smazáním příspěvku zobrazovat potvrzovací dialog
+        setting_disable_hover_cards: Zakázat náhled profilu při přejetí myší
         setting_disable_swiping: Vypnout gesta přejetí prsty
         setting_display_media: Zobrazování médií
         setting_display_media_default: Výchozí
@@ -313,6 +314,7 @@ cs:
         listable: Povolit zobrazení tohoto hashtagu ve vyhledávání a návrzích
         name: Hashtag
         trendable: Povolit zobrazení tohoto hashtagu mezi populárními
+        usable: Povolit příspěvkům používat tento hashtag lokálně
       user:
         role: Role
         time_zone: Časové pásmo
diff --git a/config/locales/simple_form.kab.yml b/config/locales/simple_form.kab.yml
index b4c0e0032bb3f5..16f4bdd41696b7 100644
--- a/config/locales/simple_form.kab.yml
+++ b/config/locales/simple_form.kab.yml
@@ -14,7 +14,7 @@ kab:
         send_email_notification: Amseqdac ad t-id-yewweḍ usefhem ɣef wayen yeḍran akked umiḍan-is
         type_html: Fren d acu ara txedmeḍ s <strong>%{acct}</strong>
       defaults:
-        autofollow: Imdanen ara ijerrden s usnebgi-inek, ad k-ḍefṛen s wudem awurman
+        autofollow: Imdanen ara ijerrden s usnebgi-inek·inem, ad k·m-ḍefṛen s wudem awurman
         bot: Smekti-d wiyaḍ dakken amiḍan-a ixeddem s wudem amezwer tigawin tiwurmanin yernu ur yezmir ara ad yettwaɛass
         email: Ad n-teṭṭfeḍ imayl i usentem
         irreversible: Tisuffaɣ i tessazedgeḍ ad ttwakksent i lebda, ula ma tekkseḍ imsizdeg-nni ar zdat
diff --git a/config/locales/simple_form.sl.yml b/config/locales/simple_form.sl.yml
index b558a62fc8367d..bb16e56a0ceac1 100644
--- a/config/locales/simple_form.sl.yml
+++ b/config/locales/simple_form.sl.yml
@@ -314,6 +314,7 @@ sl:
         listable: Dovoli, da se ta ključnik pojavi v iskanjih in predlogih
         name: Ključnik
         trendable: Dovoli, da se ta ključnik pojavi med trendi
+        usable: Dovoli, da objave krajevno uporabljajo ta ključnik
       user:
         role: Vloga
         time_zone: Časovni pas
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index f63aadd6c8f794..2915960554d36a 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -910,7 +910,21 @@ sl:
         action: Preverite tukaj za več informacij
         message_html: "<strong>Vaša predmetna shramba je napačno nastavljena. Zasebnost vaših uporabnikov je izpostavljena tveganjem.</strong>"
     tags:
+      moderation:
+        not_usable: Ni uporabno
+        pending_review: Čakajoče na pregled
+        review_requested: Zahtevan pregled
+        reviewed: Pregledano
+        title: Stanje
+        unreviewed: Nepregledano
+        usable: Uporabno
+      name: Ime
+      newest: Najnovejše
+      oldest: Najstarejše
+      reset: Ponastavi
       review: Stanje pregleda
+      search: Išči
+      title: Ključniki
       updated_msg: Nastavitve ključnikov uspešno posodobljene
     title: Upravljanje
     trends:

From af2aec1a82a13dc755d0dae893861d35c01fb0c6 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 7 Aug 2024 13:12:36 +0200
Subject: [PATCH 1743/2191] Change notification requests to only count mentions
 (#31322)

---
 app/models/notification_request.rb       | 2 +-
 spec/models/notification_policy_spec.rb  | 2 +-
 spec/models/notification_request_spec.rb | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/models/notification_request.rb b/app/models/notification_request.rb
index 2f601ac36b7f82..f0778b3af32919 100644
--- a/app/models/notification_request.rb
+++ b/app/models/notification_request.rb
@@ -47,6 +47,6 @@ def reconsider_existence!
   private
 
   def prepare_notifications_count
-    self.notifications_count = Notification.where(account: account, from_account: from_account, filtered: true).limit(MAX_MEANINGFUL_COUNT).count
+    self.notifications_count = Notification.where(account: account, from_account: from_account, type: :mention, filtered: true).limit(MAX_MEANINGFUL_COUNT).count
   end
 end
diff --git a/spec/models/notification_policy_spec.rb b/spec/models/notification_policy_spec.rb
index cfd8e85edad4df..02a582bb0860c1 100644
--- a/spec/models/notification_policy_spec.rb
+++ b/spec/models/notification_policy_spec.rb
@@ -9,7 +9,7 @@
     let(:sender) { Fabricate(:account) }
 
     before do
-      Fabricate.times(2, :notification, account: subject.account, activity: Fabricate(:status, account: sender), filtered: true)
+      Fabricate.times(2, :notification, account: subject.account, activity: Fabricate(:status, account: sender), filtered: true, type: :mention)
       Fabricate(:notification_request, account: subject.account, from_account: sender)
       subject.summarize!
     end
diff --git a/spec/models/notification_request_spec.rb b/spec/models/notification_request_spec.rb
index 4adddc194f015c..9884132ca71831 100644
--- a/spec/models/notification_request_spec.rb
+++ b/spec/models/notification_request_spec.rb
@@ -8,7 +8,7 @@
 
     context 'when there are remaining notifications' do
       before do
-        Fabricate(:notification, account: subject.account, activity: Fabricate(:status, account: subject.from_account), filtered: true)
+        Fabricate(:notification, account: subject.account, activity: Fabricate(:status, account: subject.from_account), filtered: true, type: :mention)
         subject.reconsider_existence!
       end
 

From 6f285bb2a606467bac555b630364f82fb1f3eaaf Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 7 Aug 2024 13:12:42 +0200
Subject: [PATCH 1744/2191] Change group notifications unread markers to only
 be cleared when focusing/navigating again (#31325)

---
 .../mastodon/features/notifications_v2/index.tsx |  7 +++++--
 .../mastodon/reducers/notification_groups.ts     | 13 ++++++++++++-
 .../mastodon/selectors/notifications.ts          | 16 ++++++++++++++++
 3 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/app/javascript/mastodon/features/notifications_v2/index.tsx b/app/javascript/mastodon/features/notifications_v2/index.tsx
index 05dcf422e97fb3..21afd9516eea6f 100644
--- a/app/javascript/mastodon/features/notifications_v2/index.tsx
+++ b/app/javascript/mastodon/features/notifications_v2/index.tsx
@@ -26,6 +26,7 @@ import type { NotificationGap } from 'mastodon/reducers/notification_groups';
 import {
   selectUnreadNotificationGroupsCount,
   selectPendingNotificationGroupsCount,
+  selectAnyPendingNotification,
 } from 'mastodon/selectors/notifications';
 import {
   selectNeedsNotificationPermission,
@@ -95,7 +96,7 @@ export const Notifications: React.FC<{
 
   const lastReadId = useAppSelector((s) =>
     selectSettingsNotificationsShowUnread(s)
-      ? s.notificationGroups.lastReadId
+      ? s.notificationGroups.readMarkerId
       : '0',
   );
 
@@ -105,11 +106,13 @@ export const Notifications: React.FC<{
     selectUnreadNotificationGroupsCount,
   );
 
+  const anyPendingNotification = useAppSelector(selectAnyPendingNotification);
+
   const isUnread = unreadNotificationsCount > 0;
 
   const canMarkAsRead =
     useAppSelector(selectSettingsNotificationsShowUnread) &&
-    unreadNotificationsCount > 0;
+    anyPendingNotification;
 
   const needsNotificationPermission = useAppSelector(
     selectNeedsNotificationPermission,
diff --git a/app/javascript/mastodon/reducers/notification_groups.ts b/app/javascript/mastodon/reducers/notification_groups.ts
index e59f3e7ca11b57..3a360232112f38 100644
--- a/app/javascript/mastodon/reducers/notification_groups.ts
+++ b/app/javascript/mastodon/reducers/notification_groups.ts
@@ -48,6 +48,7 @@ interface NotificationGroupsState {
   scrolledToTop: boolean;
   isLoading: boolean;
   lastReadId: string;
+  readMarkerId: string;
   mounted: number;
   isTabVisible: boolean;
 }
@@ -58,7 +59,8 @@ const initialState: NotificationGroupsState = {
   scrolledToTop: false,
   isLoading: false,
   // The following properties are used to track unread notifications
-  lastReadId: '0', // used for unread notifications
+  lastReadId: '0', // used internally for unread notifications
+  readMarkerId: '0', // user-facing and updated when focus changes
   mounted: 0, // number of mounted notification list components, usually 0 or 1
   isTabVisible: true,
 };
@@ -284,6 +286,12 @@ function updateLastReadId(
   }
 }
 
+function commitLastReadId(state: NotificationGroupsState) {
+  if (shouldMarkNewNotificationsAsRead(state)) {
+    state.readMarkerId = state.lastReadId;
+  }
+}
+
 export const notificationGroupsReducer = createReducer<NotificationGroupsState>(
   initialState,
   (builder) => {
@@ -457,6 +465,7 @@ export const notificationGroupsReducer = createReducer<NotificationGroupsState>(
           compareId(state.lastReadId, mostRecentGroup.page_max_id) < 0
         )
           state.lastReadId = mostRecentGroup.page_max_id;
+        commitLastReadId(state);
       })
       .addCase(fetchMarkers.fulfilled, (state, action) => {
         if (
@@ -470,6 +479,7 @@ export const notificationGroupsReducer = createReducer<NotificationGroupsState>(
       })
       .addCase(mountNotifications, (state) => {
         state.mounted += 1;
+        commitLastReadId(state);
         updateLastReadId(state);
       })
       .addCase(unmountNotifications, (state) => {
@@ -477,6 +487,7 @@ export const notificationGroupsReducer = createReducer<NotificationGroupsState>(
       })
       .addCase(focusApp, (state) => {
         state.isTabVisible = true;
+        commitLastReadId(state);
         updateLastReadId(state);
       })
       .addCase(unfocusApp, (state) => {
diff --git a/app/javascript/mastodon/selectors/notifications.ts b/app/javascript/mastodon/selectors/notifications.ts
index 1b1ed2154cdaa7..962dedd65042ff 100644
--- a/app/javascript/mastodon/selectors/notifications.ts
+++ b/app/javascript/mastodon/selectors/notifications.ts
@@ -27,6 +27,22 @@ export const selectUnreadNotificationGroupsCount = createSelector(
   },
 );
 
+// Whether there is any unread notification according to the user-facing state
+export const selectAnyPendingNotification = createSelector(
+  [
+    (s: RootState) => s.notificationGroups.readMarkerId,
+    (s: RootState) => s.notificationGroups.groups,
+  ],
+  (notificationMarker, groups) => {
+    return groups.some(
+      (group) =>
+        group.type !== 'gap' &&
+        group.page_max_id &&
+        compareId(group.page_max_id, notificationMarker) > 0,
+    );
+  },
+);
+
 export const selectPendingNotificationGroupsCount = createSelector(
   [(s: RootState) => s.notificationGroups.pendingGroups],
   (pendingGroups) =>

From 670e4655d13975e0597bd1c74ebeeeeffc4edc37 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 7 Aug 2024 17:14:37 +0200
Subject: [PATCH 1745/2191] Change dismissing a notification to clear existing
 filtered notifications for that account (#31329)

---
 .../v1/notifications/requests_controller.rb   |  2 +-
 .../dismiss_notification_request_service.rb   |  8 +++++++
 .../filtered_notification_cleanup_worker.rb   |  9 +++++++
 ...smiss_notification_request_service_spec.rb | 19 +++++++++++++++
 ...ltered_notification_cleanup_worker_spec.rb | 24 +++++++++++++++++++
 5 files changed, 61 insertions(+), 1 deletion(-)
 create mode 100644 app/services/dismiss_notification_request_service.rb
 create mode 100644 app/workers/filtered_notification_cleanup_worker.rb
 create mode 100644 spec/services/dismiss_notification_request_service_spec.rb
 create mode 100644 spec/workers/filtered_notification_cleanup_worker_spec.rb

diff --git a/app/controllers/api/v1/notifications/requests_controller.rb b/app/controllers/api/v1/notifications/requests_controller.rb
index b4207147c87104..0710166d05b89c 100644
--- a/app/controllers/api/v1/notifications/requests_controller.rb
+++ b/app/controllers/api/v1/notifications/requests_controller.rb
@@ -29,7 +29,7 @@ def accept
   end
 
   def dismiss
-    @request.destroy!
+    DismissNotificationRequestService.new.call(@request)
     render_empty
   end
 
diff --git a/app/services/dismiss_notification_request_service.rb b/app/services/dismiss_notification_request_service.rb
new file mode 100644
index 00000000000000..90b26d0bbf0f86
--- /dev/null
+++ b/app/services/dismiss_notification_request_service.rb
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class DismissNotificationRequestService < BaseService
+  def call(request)
+    FilteredNotificationCleanupWorker.perform_async(request.account_id, request.from_account_id)
+    request.destroy!
+  end
+end
diff --git a/app/workers/filtered_notification_cleanup_worker.rb b/app/workers/filtered_notification_cleanup_worker.rb
new file mode 100644
index 00000000000000..2b955da3c0a1ac
--- /dev/null
+++ b/app/workers/filtered_notification_cleanup_worker.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class FilteredNotificationCleanupWorker
+  include Sidekiq::Worker
+
+  def perform(account_id, from_account_id)
+    Notification.where(account_id: account_id, from_account_id: from_account_id, filtered: true).reorder(nil).in_batches(order: :desc).delete_all
+  end
+end
diff --git a/spec/services/dismiss_notification_request_service_spec.rb b/spec/services/dismiss_notification_request_service_spec.rb
new file mode 100644
index 00000000000000..590725c8715cdb
--- /dev/null
+++ b/spec/services/dismiss_notification_request_service_spec.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe DismissNotificationRequestService do
+  describe '#call' do
+    let(:sender) { Fabricate(:account) }
+    let(:receiver) { Fabricate(:account) }
+    let(:request) { Fabricate(:notification_request, account: receiver, from_account: sender) }
+
+    it 'destroys the request and queues a worker', :aggregate_failures do
+      expect { described_class.new.call(request) }
+        .to change(request, :destroyed?).to(true)
+
+      expect(FilteredNotificationCleanupWorker)
+        .to have_enqueued_sidekiq_job(receiver.id, sender.id)
+    end
+  end
+end
diff --git a/spec/workers/filtered_notification_cleanup_worker_spec.rb b/spec/workers/filtered_notification_cleanup_worker_spec.rb
new file mode 100644
index 00000000000000..2636b70ad4aec1
--- /dev/null
+++ b/spec/workers/filtered_notification_cleanup_worker_spec.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe FilteredNotificationCleanupWorker do
+  describe '#perform' do
+    let(:sender) { Fabricate(:account) }
+    let(:recipient) { Fabricate(:account) }
+    let(:bystander) { Fabricate(:account) }
+
+    before do
+      Fabricate(:notification, account: recipient, activity: Fabricate(:favourite, account: sender), filtered: true)
+      Fabricate(:notification, account: recipient, activity: Fabricate(:favourite, account: bystander), filtered: true)
+      Fabricate(:notification, account: recipient, activity: Fabricate(:follow, account: sender), filtered: true)
+      Fabricate(:notification, account: recipient, activity: Fabricate(:favourite, account: bystander), filtered: true)
+    end
+
+    it 'deletes all filtered notifications to the account' do
+      expect { described_class.new.perform(recipient.id, sender.id) }
+        .to change { recipient.notifications.where(from_account: sender).count }.from(2).to(0)
+        .and(not_change { recipient.notifications.where(from_account: bystander).count })
+    end
+  end
+end

From 56b280186fd16a0c17668ec2fce53c707abaf698 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 7 Aug 2024 13:12:42 +0200
Subject: [PATCH 1746/2191] [Glitch] Change group notifications unread markers
 to only be cleared when focusing/navigating again

Port 6f285bb2a606467bac555b630364f82fb1f3eaaf to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../glitch/features/notifications_v2/index.tsx   |  7 +++++--
 .../glitch/reducers/notification_groups.ts       | 13 ++++++++++++-
 .../flavours/glitch/selectors/notifications.ts   | 16 ++++++++++++++++
 3 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/app/javascript/flavours/glitch/features/notifications_v2/index.tsx b/app/javascript/flavours/glitch/features/notifications_v2/index.tsx
index 586b2da3fe7a62..d58efc4b8fd2ec 100644
--- a/app/javascript/flavours/glitch/features/notifications_v2/index.tsx
+++ b/app/javascript/flavours/glitch/features/notifications_v2/index.tsx
@@ -26,6 +26,7 @@ import type { NotificationGap } from 'flavours/glitch/reducers/notification_grou
 import {
   selectUnreadNotificationGroupsCount,
   selectPendingNotificationGroupsCount,
+  selectAnyPendingNotification,
 } from 'flavours/glitch/selectors/notifications';
 import {
   selectNeedsNotificationPermission,
@@ -95,7 +96,7 @@ export const Notifications: React.FC<{
 
   const lastReadId = useAppSelector((s) =>
     selectSettingsNotificationsShowUnread(s)
-      ? s.notificationGroups.lastReadId
+      ? s.notificationGroups.readMarkerId
       : '0',
   );
 
@@ -105,11 +106,13 @@ export const Notifications: React.FC<{
     selectUnreadNotificationGroupsCount,
   );
 
+  const anyPendingNotification = useAppSelector(selectAnyPendingNotification);
+
   const isUnread = unreadNotificationsCount > 0;
 
   const canMarkAsRead =
     useAppSelector(selectSettingsNotificationsShowUnread) &&
-    unreadNotificationsCount > 0;
+    anyPendingNotification;
 
   const needsNotificationPermission = useAppSelector(
     selectNeedsNotificationPermission,
diff --git a/app/javascript/flavours/glitch/reducers/notification_groups.ts b/app/javascript/flavours/glitch/reducers/notification_groups.ts
index b0b284b696e4bb..a657cf5c970e57 100644
--- a/app/javascript/flavours/glitch/reducers/notification_groups.ts
+++ b/app/javascript/flavours/glitch/reducers/notification_groups.ts
@@ -48,6 +48,7 @@ interface NotificationGroupsState {
   scrolledToTop: boolean;
   isLoading: boolean;
   lastReadId: string;
+  readMarkerId: string;
   mounted: number;
   isTabVisible: boolean;
 }
@@ -58,7 +59,8 @@ const initialState: NotificationGroupsState = {
   scrolledToTop: false,
   isLoading: false,
   // The following properties are used to track unread notifications
-  lastReadId: '0', // used for unread notifications
+  lastReadId: '0', // used internally for unread notifications
+  readMarkerId: '0', // user-facing and updated when focus changes
   mounted: 0, // number of mounted notification list components, usually 0 or 1
   isTabVisible: true,
 };
@@ -284,6 +286,12 @@ function updateLastReadId(
   }
 }
 
+function commitLastReadId(state: NotificationGroupsState) {
+  if (shouldMarkNewNotificationsAsRead(state)) {
+    state.readMarkerId = state.lastReadId;
+  }
+}
+
 export const notificationGroupsReducer = createReducer<NotificationGroupsState>(
   initialState,
   (builder) => {
@@ -457,6 +465,7 @@ export const notificationGroupsReducer = createReducer<NotificationGroupsState>(
           compareId(state.lastReadId, mostRecentGroup.page_max_id) < 0
         )
           state.lastReadId = mostRecentGroup.page_max_id;
+        commitLastReadId(state);
       })
       .addCase(fetchMarkers.fulfilled, (state, action) => {
         if (
@@ -470,6 +479,7 @@ export const notificationGroupsReducer = createReducer<NotificationGroupsState>(
       })
       .addCase(mountNotifications, (state) => {
         state.mounted += 1;
+        commitLastReadId(state);
         updateLastReadId(state);
       })
       .addCase(unmountNotifications, (state) => {
@@ -477,6 +487,7 @@ export const notificationGroupsReducer = createReducer<NotificationGroupsState>(
       })
       .addCase(focusApp, (state) => {
         state.isTabVisible = true;
+        commitLastReadId(state);
         updateLastReadId(state);
       })
       .addCase(unfocusApp, (state) => {
diff --git a/app/javascript/flavours/glitch/selectors/notifications.ts b/app/javascript/flavours/glitch/selectors/notifications.ts
index 7cc64aa6c584da..efc2dff68a0d4c 100644
--- a/app/javascript/flavours/glitch/selectors/notifications.ts
+++ b/app/javascript/flavours/glitch/selectors/notifications.ts
@@ -27,6 +27,22 @@ export const selectUnreadNotificationGroupsCount = createSelector(
   },
 );
 
+// Whether there is any unread notification according to the user-facing state
+export const selectAnyPendingNotification = createSelector(
+  [
+    (s: RootState) => s.notificationGroups.readMarkerId,
+    (s: RootState) => s.notificationGroups.groups,
+  ],
+  (notificationMarker, groups) => {
+    return groups.some(
+      (group) =>
+        group.type !== 'gap' &&
+        group.page_max_id &&
+        compareId(group.page_max_id, notificationMarker) > 0,
+    );
+  },
+);
+
 export const selectPendingNotificationGroupsCount = createSelector(
   [(s: RootState) => s.notificationGroups.pendingGroups],
   (pendingGroups) =>

From abc4ed48f26a2998d6b6d69f68af681693a46dfb Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 7 Aug 2024 18:52:08 -0400
Subject: [PATCH 1747/2191] Replace more `font-awesome` icons in navigation
 sidebar area (#30974)

---
 .../material-icons/400-24px/breaking_news.svg |  1 +
 .../400-24px/captive_portal.svg               |  1 +
 .../material-icons/400-24px/chat_bubble.svg   |  1 +
 .../material-icons/400-24px/cloud.svg         |  1 +
 .../400-24px/cloud_download.svg               |  1 +
 .../material-icons/400-24px/cloud_sync.svg    |  1 +
 .../material-icons/400-24px/cloud_upload.svg  |  1 +
 .../material-icons/400-24px/code.svg          |  1 +
 .../material-icons/400-24px/computer.svg      |  1 +
 .../material-icons/400-24px/contact_mail.svg  |  1 +
 .../material-icons/400-24px/database.svg      |  1 +
 .../material-icons/400-24px/diamond.svg       |  1 +
 .../material-icons/400-24px/filter_alt.svg    |  1 +
 .../material-icons/400-24px/groups.svg        |  1 +
 .../material-icons/400-24px/hide_source.svg   |  1 +
 .../material-icons/400-24px/inbox.svg         |  1 +
 .../material-icons/400-24px/list.svg          |  1 +
 .../material-icons/400-24px/mail.svg          |  1 +
 .../material-icons/400-24px/manufacturing.svg |  1 +
 .../material-icons/400-24px/mood.svg          |  1 +
 .../material-icons/400-24px/report.svg        |  1 +
 .../material-icons/400-24px/safety_check.svg  |  1 +
 .../material-icons/400-24px/speed.svg         |  1 +
 .../material-icons/400-24px/trending_up.svg   |  1 +
 config/navigation.rb                          | 96 +++++++++----------
 25 files changed, 72 insertions(+), 48 deletions(-)
 create mode 100644 app/javascript/material-icons/400-24px/breaking_news.svg
 create mode 100644 app/javascript/material-icons/400-24px/captive_portal.svg
 create mode 100644 app/javascript/material-icons/400-24px/chat_bubble.svg
 create mode 100644 app/javascript/material-icons/400-24px/cloud.svg
 create mode 100644 app/javascript/material-icons/400-24px/cloud_download.svg
 create mode 100644 app/javascript/material-icons/400-24px/cloud_sync.svg
 create mode 100644 app/javascript/material-icons/400-24px/cloud_upload.svg
 create mode 100644 app/javascript/material-icons/400-24px/code.svg
 create mode 100644 app/javascript/material-icons/400-24px/computer.svg
 create mode 100644 app/javascript/material-icons/400-24px/contact_mail.svg
 create mode 100644 app/javascript/material-icons/400-24px/database.svg
 create mode 100644 app/javascript/material-icons/400-24px/diamond.svg
 create mode 100644 app/javascript/material-icons/400-24px/filter_alt.svg
 create mode 100644 app/javascript/material-icons/400-24px/groups.svg
 create mode 100644 app/javascript/material-icons/400-24px/hide_source.svg
 create mode 100644 app/javascript/material-icons/400-24px/inbox.svg
 create mode 100644 app/javascript/material-icons/400-24px/list.svg
 create mode 100644 app/javascript/material-icons/400-24px/mail.svg
 create mode 100644 app/javascript/material-icons/400-24px/manufacturing.svg
 create mode 100644 app/javascript/material-icons/400-24px/mood.svg
 create mode 100644 app/javascript/material-icons/400-24px/report.svg
 create mode 100644 app/javascript/material-icons/400-24px/safety_check.svg
 create mode 100644 app/javascript/material-icons/400-24px/speed.svg
 create mode 100644 app/javascript/material-icons/400-24px/trending_up.svg

diff --git a/app/javascript/material-icons/400-24px/breaking_news.svg b/app/javascript/material-icons/400-24px/breaking_news.svg
new file mode 100644
index 00000000000000..d7dd0c12f47fec
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/breaking_news.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#5f6368"><path d="M280-280q17 0 28.5-11.5T320-320q0-17-11.5-28.5T280-360q-17 0-28.5 11.5T240-320q0 17 11.5 28.5T280-280Zm-40-160h80v-240h-80v240Zm200 160h280v-80H440v80Zm0-160h280v-80H440v80Zm0-160h280v-80H440v80ZM160-120q-33 0-56.5-23.5T80-200v-560q0-33 23.5-56.5T160-840h640q33 0 56.5 23.5T880-760v560q0 33-23.5 56.5T800-120H160Zm0-80h640v-560H160v560Zm0 0v-560 560Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/captive_portal.svg b/app/javascript/material-icons/400-24px/captive_portal.svg
new file mode 100644
index 00000000000000..1f0f09c7734912
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/captive_portal.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#5f6368"><path d="M838-65 720-183v89h-80v-226h226v80h-90l118 118-56 57ZM480-80q-83 0-156-31.5T197-197q-54-54-85.5-127T80-480q0-83 31.5-156T197-763q54-54 127-85.5T480-880q83 0 156 31.5T763-763q54 54 85.5 127T880-480q0 20-2 40t-6 40h-82q5-20 7.5-40t2.5-40q0-20-2.5-40t-7.5-40H654q3 20 4.5 40t1.5 40q0 20-1.5 40t-4.5 40h-80q3-20 4.5-40t1.5-40q0-20-1.5-40t-4.5-40H386q-3 20-4.5 40t-1.5 40q0 20 1.5 40t4.5 40h134v80H404q12 43 31 82.5t45 75.5q20 0 40-2.5t40-4.5v82q-20 2-40 4.5T480-80ZM170-400h136q-3-20-4.5-40t-1.5-40q0-20 1.5-40t4.5-40H170q-5 20-7.5 40t-2.5 40q0 20 2.5 40t7.5 40Zm34-240h118q9-37 22.5-72.5T376-782q-55 18-99 54.5T204-640Zm172 462q-18-34-31.5-69.5T322-320H204q29 51 73 87.5t99 54.5Zm28-462h152q-12-43-31-82.5T480-798q-26 36-45 75.5T404-640Zm234 0h118q-29-51-73-87.5T584-782q18 34 31.5 69.5T638-640Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/chat_bubble.svg b/app/javascript/material-icons/400-24px/chat_bubble.svg
new file mode 100644
index 00000000000000..7d210b460865ee
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/chat_bubble.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#5f6368"><path d="M80-80v-720q0-33 23.5-56.5T160-880h640q33 0 56.5 23.5T880-800v480q0 33-23.5 56.5T800-240H240L80-80Zm126-240h594v-480H160v525l46-45Zm-46 0v-480 480Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/cloud.svg b/app/javascript/material-icons/400-24px/cloud.svg
new file mode 100644
index 00000000000000..75b4e957fc416a
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/cloud.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#5f6368"><path d="M260-160q-91 0-155.5-63T40-377q0-78 47-139t123-78q25-92 100-149t170-57q117 0 198.5 81.5T760-520q69 8 114.5 59.5T920-340q0 75-52.5 127.5T740-160H260Zm0-80h480q42 0 71-29t29-71q0-42-29-71t-71-29h-60v-80q0-83-58.5-141.5T480-720q-83 0-141.5 58.5T280-520h-20q-58 0-99 41t-41 99q0 58 41 99t99 41Zm220-240Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/cloud_download.svg b/app/javascript/material-icons/400-24px/cloud_download.svg
new file mode 100644
index 00000000000000..2fc3717ff9e35e
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/cloud_download.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#5f6368"><path d="M260-160q-91 0-155.5-63T40-377q0-78 47-139t123-78q17-72 85-137t145-65q33 0 56.5 23.5T520-716v242l64-62 56 56-160 160-160-160 56-56 64 62v-242q-76 14-118 73.5T280-520h-20q-58 0-99 41t-41 99q0 58 41 99t99 41h480q42 0 71-29t29-71q0-42-29-71t-71-29h-60v-80q0-48-22-89.5T600-680v-93q74 35 117 103.5T760-520q69 8 114.5 59.5T920-340q0 75-52.5 127.5T740-160H260Zm220-358Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/cloud_sync.svg b/app/javascript/material-icons/400-24px/cloud_sync.svg
new file mode 100644
index 00000000000000..dbf6adc0001ada
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/cloud_sync.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#5f6368"><path d="M160-160v-80h109q-51-44-80-106t-29-134q0-112 68-197.5T400-790v84q-70 25-115 86.5T240-480q0 54 21.5 99.5T320-302v-98h80v240H160Zm440 0q-50 0-85-35t-35-85q0-48 33-82.5t81-36.5q17-36 50.5-58.5T720-480q53 0 91.5 34.5T858-360q42 0 72 29t30 70q0 42-29 71.5T860-160H600Zm116-360q-7-41-27-76t-49-62v98h-80v-240h240v80H691q43 38 70.5 89T797-520h-81ZM600-240h260q8 0 14-6t6-14q0-8-6-14t-14-6h-70v-50q0-29-20.5-49.5T720-400q-29 0-49.5 20.5T650-330v10h-50q-17 0-28.5 11.5T560-280q0 17 11.5 28.5T600-240Zm120-80Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/cloud_upload.svg b/app/javascript/material-icons/400-24px/cloud_upload.svg
new file mode 100644
index 00000000000000..5e1a4b9aef684f
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/cloud_upload.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#5f6368"><path d="M260-160q-91 0-155.5-63T40-377q0-78 47-139t123-78q25-92 100-149t170-57q117 0 198.5 81.5T760-520q69 8 114.5 59.5T920-340q0 75-52.5 127.5T740-160H520q-33 0-56.5-23.5T440-240v-206l-64 62-56-56 160-160 160 160-56 56-64-62v206h220q42 0 71-29t29-71q0-42-29-71t-71-29h-60v-80q0-83-58.5-141.5T480-720q-83 0-141.5 58.5T280-520h-20q-58 0-99 41t-41 99q0 58 41 99t99 41h100v80H260Zm220-280Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/code.svg b/app/javascript/material-icons/400-24px/code.svg
new file mode 100644
index 00000000000000..5bdc338f7f5bc6
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/code.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#5f6368"><path d="M320-240 80-480l240-240 57 57-184 184 183 183-56 56Zm320 0-57-57 184-184-183-183 56-56 240 240-240 240Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/computer.svg b/app/javascript/material-icons/400-24px/computer.svg
new file mode 100644
index 00000000000000..8c5bd9110e1d23
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/computer.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#5f6368"><path d="M40-120v-80h880v80H40Zm120-120q-33 0-56.5-23.5T80-320v-440q0-33 23.5-56.5T160-840h640q33 0 56.5 23.5T880-760v440q0 33-23.5 56.5T800-240H160Zm0-80h640v-440H160v440Zm0 0v-440 440Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/contact_mail.svg b/app/javascript/material-icons/400-24px/contact_mail.svg
new file mode 100644
index 00000000000000..1ae26cc4d157ed
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/contact_mail.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#5f6368"><path d="M560-520h280v-200H560v200Zm140-50-100-70v-40l100 70 100-70v40l-100 70ZM80-120q-33 0-56.5-23.5T0-200v-560q0-33 23.5-56.5T80-840h800q33 0 56.5 23.5T960-760v560q0 33-23.5 56.5T880-120H80Zm556-80h244v-560H80v560h4q42-75 116-117.5T360-360q86 0 160 42.5T636-200ZM360-400q50 0 85-35t35-85q0-50-35-85t-85-35q-50 0-85 35t-35 85q0 50 35 85t85 35ZM182-200h356q-34-38-80.5-59T360-280q-51 0-97 21t-81 59Zm178-280q-17 0-28.5-11.5T320-520q0-17 11.5-28.5T360-560q17 0 28.5 11.5T400-520q0 17-11.5 28.5T360-480Zm120 0Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/database.svg b/app/javascript/material-icons/400-24px/database.svg
new file mode 100644
index 00000000000000..54ca2f4e560b2e
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/database.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#5f6368"><path d="M480-120q-151 0-255.5-46.5T120-280v-400q0-66 105.5-113T480-840q149 0 254.5 47T840-680v400q0 67-104.5 113.5T480-120Zm0-479q89 0 179-25.5T760-679q-11-29-100.5-55T480-760q-91 0-178.5 25.5T200-679q14 30 101.5 55T480-599Zm0 199q42 0 81-4t74.5-11.5q35.5-7.5 67-18.5t57.5-25v-120q-26 14-57.5 25t-67 18.5Q600-528 561-524t-81 4q-42 0-82-4t-75.5-11.5Q287-543 256-554t-56-25v120q25 14 56 25t66.5 18.5Q358-408 398-404t82 4Zm0 200q46 0 93.5-7t87.5-18.5q40-11.5 67-26t32-29.5v-98q-26 14-57.5 25t-67 18.5Q600-328 561-324t-81 4q-42 0-82-4t-75.5-11.5Q287-343 256-354t-56-25v99q5 15 31.5 29t66.5 25.5q40 11.5 88 18.5t94 7Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/diamond.svg b/app/javascript/material-icons/400-24px/diamond.svg
new file mode 100644
index 00000000000000..26f4814b443b95
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/diamond.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#5f6368"><path d="M480-120 80-600l120-240h560l120 240-400 480Zm-95-520h190l-60-120h-70l-60 120Zm55 347v-267H218l222 267Zm80 0 222-267H520v267Zm144-347h106l-60-120H604l60 120Zm-474 0h106l60-120H250l-60 120Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/filter_alt.svg b/app/javascript/material-icons/400-24px/filter_alt.svg
new file mode 100644
index 00000000000000..0294cf1da53ac0
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/filter_alt.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#5f6368"><path d="M440-160q-17 0-28.5-11.5T400-200v-240L168-736q-15-20-4.5-42t36.5-22h560q26 0 36.5 22t-4.5 42L560-440v240q0 17-11.5 28.5T520-160h-80Zm40-308 198-252H282l198 252Zm0 0Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/groups.svg b/app/javascript/material-icons/400-24px/groups.svg
new file mode 100644
index 00000000000000..0e795eb301d89d
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/groups.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#5f6368"><path d="M0-240v-63q0-43 44-70t116-27q13 0 25 .5t23 2.5q-14 21-21 44t-7 48v65H0Zm240 0v-65q0-32 17.5-58.5T307-410q32-20 76.5-30t96.5-10q53 0 97.5 10t76.5 30q32 20 49 46.5t17 58.5v65H240Zm540 0v-65q0-26-6.5-49T754-397q11-2 22.5-2.5t23.5-.5q72 0 116 26.5t44 70.5v63H780Zm-455-80h311q-10-20-55.5-35T480-370q-55 0-100.5 15T325-320ZM160-440q-33 0-56.5-23.5T80-520q0-34 23.5-57t56.5-23q34 0 57 23t23 57q0 33-23 56.5T160-440Zm640 0q-33 0-56.5-23.5T720-520q0-34 23.5-57t56.5-23q34 0 57 23t23 57q0 33-23 56.5T800-440Zm-320-40q-50 0-85-35t-35-85q0-51 35-85.5t85-34.5q51 0 85.5 34.5T600-600q0 50-34.5 85T480-480Zm0-80q17 0 28.5-11.5T520-600q0-17-11.5-28.5T480-640q-17 0-28.5 11.5T440-600q0 17 11.5 28.5T480-560Zm1 240Zm-1-280Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/hide_source.svg b/app/javascript/material-icons/400-24px/hide_source.svg
new file mode 100644
index 00000000000000..d103ed770a5d6b
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/hide_source.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#5f6368"><path d="m791-55-91-91q-49 32-104.5 49T480-80q-83 0-156-31.5T197-197q-54-54-85.5-127T80-480q0-60 17-115.5T146-700l-91-91 57-57 736 736-57 57ZM480-160q43 0 83.5-11t78.5-33L204-642q-22 38-33 78.5T160-480q0 133 93.5 226.5T480-160Zm334-100-58-58q22-38 33-78.5t11-83.5q0-133-93.5-226.5T480-800q-43 0-83.5 11T318-756l-58-58q49-32 104.5-49T480-880q83 0 156 31.5T763-763q54 54 85.5 127T880-480q0 60-17 115.5T814-260ZM537-537ZM423-423Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/inbox.svg b/app/javascript/material-icons/400-24px/inbox.svg
new file mode 100644
index 00000000000000..427817958c169a
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/inbox.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#5f6368"><path d="M200-120q-33 0-56.5-23.5T120-200v-560q0-33 23.5-56.5T200-840h560q33 0 56.5 23.5T840-760v560q0 33-23.5 56.5T760-120H200Zm0-80h560v-120H640q-30 38-71.5 59T480-240q-47 0-88.5-21T320-320H200v120Zm280-120q38 0 69-22t43-58h168v-360H200v360h168q12 36 43 58t69 22ZM200-200h560-560Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/list.svg b/app/javascript/material-icons/400-24px/list.svg
new file mode 100644
index 00000000000000..457a820ab1781b
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/list.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#5f6368"><path d="M280-600v-80h560v80H280Zm0 160v-80h560v80H280Zm0 160v-80h560v80H280ZM160-600q-17 0-28.5-11.5T120-640q0-17 11.5-28.5T160-680q17 0 28.5 11.5T200-640q0 17-11.5 28.5T160-600Zm0 160q-17 0-28.5-11.5T120-480q0-17 11.5-28.5T160-520q17 0 28.5 11.5T200-480q0 17-11.5 28.5T160-440Zm0 160q-17 0-28.5-11.5T120-320q0-17 11.5-28.5T160-360q17 0 28.5 11.5T200-320q0 17-11.5 28.5T160-280Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/mail.svg b/app/javascript/material-icons/400-24px/mail.svg
new file mode 100644
index 00000000000000..a92ea7b198a82f
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/mail.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#5f6368"><path d="M160-160q-33 0-56.5-23.5T80-240v-480q0-33 23.5-56.5T160-800h640q33 0 56.5 23.5T880-720v480q0 33-23.5 56.5T800-160H160Zm320-280L160-640v400h640v-400L480-440Zm0-80 320-200H160l320 200ZM160-640v-80 480-400Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/manufacturing.svg b/app/javascript/material-icons/400-24px/manufacturing.svg
new file mode 100644
index 00000000000000..e0946f5ba52434
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/manufacturing.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#5f6368"><path d="m234-480-12-60q-12-5-22.5-10.5T178-564l-58 18-40-68 46-40q-2-13-2-26t2-26l-46-40 40-68 58 18q11-8 21.5-13.5T222-820l12-60h80l12 60q12 5 22.5 10.5T370-796l58-18 40 68-46 40q2 13 2 26t-2 26l46 40-40 68-58-18q-11 8-21.5 13.5T326-540l-12 60h-80Zm40-120q33 0 56.5-23.5T354-680q0-33-23.5-56.5T274-760q-33 0-56.5 23.5T194-680q0 33 23.5 56.5T274-600ZM592-40l-18-84q-17-6-31.5-14.5T514-158l-80 26-56-96 64-56q-2-18-2-36t2-36l-64-56 56-96 80 26q14-11 28.5-19.5T574-516l18-84h112l18 84q17 6 31.5 14.5T782-482l80-26 56 96-64 56q2 18 2 36t-2 36l64 56-56 96-80-26q-14 11-28.5 19.5T722-124l-18 84H592Zm56-160q50 0 85-35t35-85q0-50-35-85t-85-35q-50 0-85 35t-35 85q0 50 35 85t85 35Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/mood.svg b/app/javascript/material-icons/400-24px/mood.svg
new file mode 100644
index 00000000000000..27b3534244888c
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/mood.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#5f6368"><path d="M620-520q25 0 42.5-17.5T680-580q0-25-17.5-42.5T620-640q-25 0-42.5 17.5T560-580q0 25 17.5 42.5T620-520Zm-280 0q25 0 42.5-17.5T400-580q0-25-17.5-42.5T340-640q-25 0-42.5 17.5T280-580q0 25 17.5 42.5T340-520Zm140 260q68 0 123.5-38.5T684-400H276q25 63 80.5 101.5T480-260Zm0 180q-83 0-156-31.5T197-197q-54-54-85.5-127T80-480q0-83 31.5-156T197-763q54-54 127-85.5T480-880q83 0 156 31.5T763-763q54 54 85.5 127T880-480q0 83-31.5 156T763-197q-54 54-127 85.5T480-80Zm0-400Zm0 320q134 0 227-93t93-227q0-134-93-227t-227-93q-134 0-227 93t-93 227q0 134 93 227t227 93Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/report.svg b/app/javascript/material-icons/400-24px/report.svg
new file mode 100644
index 00000000000000..f281f0e1fa8f01
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/report.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#5f6368"><path d="M480-280q17 0 28.5-11.5T520-320q0-17-11.5-28.5T480-360q-17 0-28.5 11.5T440-320q0 17 11.5 28.5T480-280Zm-40-160h80v-240h-80v240ZM330-120 120-330v-300l210-210h300l210 210v300L630-120H330Zm34-80h232l164-164v-232L596-760H364L200-596v232l164 164Zm116-280Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/safety_check.svg b/app/javascript/material-icons/400-24px/safety_check.svg
new file mode 100644
index 00000000000000..f4eab46fb75b82
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/safety_check.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#5f6368"><path d="M480-280q83 0 141.5-58.5T680-480q0-83-58.5-141.5T480-680q-83 0-141.5 58.5T280-480q0 83 58.5 141.5T480-280Zm66-106-86-86v-128h40v112l74 74-28 28ZM480-80q-139-35-229.5-159.5T160-516v-244l320-120 320 120v244q0 152-90.5 276.5T480-80Zm0-84q104-33 172-132t68-220v-189l-240-90-240 90v189q0 121 68 220t172 132Zm0-316Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/speed.svg b/app/javascript/material-icons/400-24px/speed.svg
new file mode 100644
index 00000000000000..ceb855c684f8c3
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/speed.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#5f6368"><path d="M418-340q24 24 62 23.5t56-27.5l224-336-336 224q-27 18-28.5 55t22.5 61Zm62-460q59 0 113.5 16.5T696-734l-76 48q-33-17-68.5-25.5T480-720q-133 0-226.5 93.5T160-400q0 42 11.5 83t32.5 77h552q23-38 33.5-79t10.5-85q0-36-8.5-70T766-540l48-76q30 47 47.5 100T880-406q1 57-13 109t-41 99q-11 18-30 28t-40 10H204q-21 0-40-10t-30-28q-26-45-40-95.5T80-400q0-83 31.5-155.5t86-127Q252-737 325-768.5T480-800Zm7 313Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/trending_up.svg b/app/javascript/material-icons/400-24px/trending_up.svg
new file mode 100644
index 00000000000000..06f9ba20639860
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/trending_up.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#5f6368"><path d="m136-240-56-56 296-298 160 160 208-206H640v-80h240v240h-80v-104L536-320 376-480 136-240Z"/></svg>
\ No newline at end of file
diff --git a/config/navigation.rb b/config/navigation.rb
index f006f39a54070e..ff71479180f633 100644
--- a/config/navigation.rb
+++ b/config/navigation.rb
@@ -4,72 +4,72 @@
   self_destruct = SelfDestructHelper.self_destruct?
 
   navigation.items do |n|
-    n.item :web, safe_join([fa_icon('chevron-left fw'), t('settings.back')]), root_path
+    n.item :web, safe_join([material_symbol('chevron_left'), t('settings.back')]), root_path
 
-    n.item :software_updates, safe_join([fa_icon('exclamation-circle fw'), t('admin.critical_update_pending')]), admin_software_updates_path, if: -> { ENV['UPDATE_CHECK_URL'] != '' && current_user.can?(:view_devops) && SoftwareUpdate.urgent_pending? }, html: { class: 'warning' }
+    n.item :software_updates, safe_join([material_symbol('report'), t('admin.critical_update_pending')]), admin_software_updates_path, if: -> { ENV['UPDATE_CHECK_URL'] != '' && current_user.can?(:view_devops) && SoftwareUpdate.urgent_pending? }, html: { class: 'warning' }
 
-    n.item :profile, safe_join([fa_icon('user fw'), t('settings.profile')]), settings_profile_path, if: -> { current_user.functional? && !self_destruct }, highlights_on: %r{/settings/profile|/settings/featured_tags|/settings/verification|/settings/privacy}
+    n.item :profile, safe_join([material_symbol('person'), t('settings.profile')]), settings_profile_path, if: -> { current_user.functional? && !self_destruct }, highlights_on: %r{/settings/profile|/settings/featured_tags|/settings/verification|/settings/privacy}
 
-    n.item :preferences, safe_join([fa_icon('cog fw'), t('settings.preferences')]), settings_preferences_path, if: -> { current_user.functional? && !self_destruct } do |s|
-      s.item :appearance, safe_join([fa_icon('desktop fw'), t('settings.appearance')]), settings_preferences_appearance_path
-      s.item :notifications, safe_join([fa_icon('envelope fw'), t('settings.notifications')]), settings_preferences_notifications_path
-      s.item :other, safe_join([fa_icon('cog fw'), t('preferences.other')]), settings_preferences_other_path
+    n.item :preferences, safe_join([material_symbol('settings'), t('settings.preferences')]), settings_preferences_path, if: -> { current_user.functional? && !self_destruct } do |s|
+      s.item :appearance, safe_join([material_symbol('computer'), t('settings.appearance')]), settings_preferences_appearance_path
+      s.item :notifications, safe_join([material_symbol('mail'), t('settings.notifications')]), settings_preferences_notifications_path
+      s.item :other, safe_join([material_symbol('settings'), t('preferences.other')]), settings_preferences_other_path
     end
 
-    n.item :relationships, safe_join([fa_icon('users fw'), t('settings.relationships')]), relationships_path, if: -> { current_user.functional? && !self_destruct } do |s|
-      s.item :current, safe_join([fa_icon('users fw'), t('settings.relationships')]), relationships_path
-      s.item :severed_relationships, safe_join([fa_icon('unlink fw'), t('settings.severed_relationships')]), severed_relationships_path
+    n.item :relationships, safe_join([material_symbol('groups'), t('settings.relationships')]), relationships_path, if: -> { current_user.functional? && !self_destruct } do |s|
+      s.item :current, safe_join([material_symbol('groups'), t('settings.relationships')]), relationships_path
+      s.item :severed_relationships, safe_join([material_symbol('link_off'), t('settings.severed_relationships')]), severed_relationships_path
     end
 
-    n.item :filters, safe_join([fa_icon('filter fw'), t('filters.index.title')]), filters_path, highlights_on: %r{/filters}, if: -> { current_user.functional? && !self_destruct }
-    n.item :statuses_cleanup, safe_join([fa_icon('history fw'), t('settings.statuses_cleanup')]), statuses_cleanup_path, if: -> { current_user.functional_or_moved? && !self_destruct }
+    n.item :filters, safe_join([material_symbol('filter_alt'), t('filters.index.title')]), filters_path, highlights_on: %r{/filters}, if: -> { current_user.functional? && !self_destruct }
+    n.item :statuses_cleanup, safe_join([material_symbol('history'), t('settings.statuses_cleanup')]), statuses_cleanup_path, if: -> { current_user.functional_or_moved? && !self_destruct }
 
-    n.item :security, safe_join([fa_icon('lock fw'), t('settings.account')]), edit_user_registration_path do |s|
-      s.item :password, safe_join([fa_icon('lock fw'), t('settings.account_settings')]), edit_user_registration_path, highlights_on: %r{/auth/edit|/settings/delete|/settings/migration|/settings/aliases|/settings/login_activities|^/disputes}
-      s.item :two_factor_authentication, safe_join([fa_icon('mobile fw'), t('settings.two_factor_authentication')]), settings_two_factor_authentication_methods_path, highlights_on: %r{/settings/two_factor_authentication|/settings/otp_authentication|/settings/security_keys}
-      s.item :authorized_apps, safe_join([fa_icon('list fw'), t('settings.authorized_apps')]), oauth_authorized_applications_path, if: -> { !self_destruct }
+    n.item :security, safe_join([material_symbol('lock'), t('settings.account')]), edit_user_registration_path do |s|
+      s.item :password, safe_join([material_symbol('lock'), t('settings.account_settings')]), edit_user_registration_path, highlights_on: %r{/auth/edit|/settings/delete|/settings/migration|/settings/aliases|/settings/login_activities|^/disputes}
+      s.item :two_factor_authentication, safe_join([material_symbol('safety_check'), t('settings.two_factor_authentication')]), settings_two_factor_authentication_methods_path, highlights_on: %r{/settings/two_factor_authentication|/settings/otp_authentication|/settings/security_keys}
+      s.item :authorized_apps, safe_join([material_symbol('list_alt'), t('settings.authorized_apps')]), oauth_authorized_applications_path, if: -> { !self_destruct }
     end
 
-    n.item :data, safe_join([fa_icon('cloud-download fw'), t('settings.import_and_export')]), settings_export_path do |s|
-      s.item :import, safe_join([fa_icon('cloud-upload fw'), t('settings.import')]), settings_imports_path, if: -> { current_user.functional? && !self_destruct }
-      s.item :export, safe_join([fa_icon('cloud-download fw'), t('settings.export')]), settings_export_path
+    n.item :data, safe_join([material_symbol('cloud_sync'), t('settings.import_and_export')]), settings_export_path do |s|
+      s.item :import, safe_join([material_symbol('cloud_upload'), t('settings.import')]), settings_imports_path, if: -> { current_user.functional? && !self_destruct }
+      s.item :export, safe_join([material_symbol('cloud_download'), t('settings.export')]), settings_export_path
     end
 
-    n.item :invites, safe_join([fa_icon('user-plus fw'), t('invites.title')]), invites_path, if: -> { current_user.can?(:invite_users) && current_user.functional? && !self_destruct }
-    n.item :development, safe_join([fa_icon('code fw'), t('settings.development')]), settings_applications_path, highlights_on: %r{/settings/applications}, if: -> { current_user.functional? && !self_destruct }
+    n.item :invites, safe_join([material_symbol('person_add'), t('invites.title')]), invites_path, if: -> { current_user.can?(:invite_users) && current_user.functional? && !self_destruct }
+    n.item :development, safe_join([material_symbol('code'), t('settings.development')]), settings_applications_path, highlights_on: %r{/settings/applications}, if: -> { current_user.functional? && !self_destruct }
 
-    n.item :trends, safe_join([fa_icon('fire fw'), t('admin.trends.title')]), admin_trends_statuses_path, if: -> { current_user.can?(:manage_taxonomies) && !self_destruct } do |s|
-      s.item :statuses, safe_join([fa_icon('comments-o fw'), t('admin.trends.statuses.title')]), admin_trends_statuses_path, highlights_on: %r{/admin/trends/statuses}
-      s.item :tags, safe_join([fa_icon('hashtag fw'), t('admin.trends.tags.title')]), admin_trends_tags_path, highlights_on: %r{/admin/trends/tags}
-      s.item :links, safe_join([fa_icon('newspaper-o fw'), t('admin.trends.links.title')]), admin_trends_links_path, highlights_on: %r{/admin/trends/links}
+    n.item :trends, safe_join([material_symbol('trending_up'), t('admin.trends.title')]), admin_trends_statuses_path, if: -> { current_user.can?(:manage_taxonomies) && !self_destruct } do |s|
+      s.item :statuses, safe_join([material_symbol('chat_bubble'), t('admin.trends.statuses.title')]), admin_trends_statuses_path, highlights_on: %r{/admin/trends/statuses}
+      s.item :tags, safe_join([material_symbol('tag'), t('admin.trends.tags.title')]), admin_trends_tags_path, highlights_on: %r{/admin/trends/tags}
+      s.item :links, safe_join([material_symbol('breaking_news'), t('admin.trends.links.title')]), admin_trends_links_path, highlights_on: %r{/admin/trends/links}
     end
 
-    n.item :moderation, safe_join([fa_icon('gavel fw'), t('moderation.title')]), nil, if: -> { current_user.can?(:manage_reports, :view_audit_log, :manage_users, :manage_invites, :manage_taxonomies, :manage_federation, :manage_blocks) && !self_destruct } do |s|
-      s.item :reports, safe_join([fa_icon('flag fw'), t('admin.reports.title')]), admin_reports_path, highlights_on: %r{/admin/reports|admin/report_notes}, if: -> { current_user.can?(:manage_reports) }
-      s.item :accounts, safe_join([fa_icon('users fw'), t('admin.accounts.title')]), admin_accounts_path(origin: 'local'), highlights_on: %r{/admin/accounts|admin/account_moderation_notes|/admin/pending_accounts|/admin/disputes|/admin/users}, if: -> { current_user.can?(:manage_users) }
-      s.item :tags, safe_join([fa_icon('hashtag fw'), t('admin.tags.title')]), admin_tags_path, highlights_on: %r{/admin/tags}, if: -> { current_user.can?(:manage_taxonomies) }
-      s.item :invites, safe_join([fa_icon('user-plus fw'), t('admin.invites.title')]), admin_invites_path, if: -> { current_user.can?(:manage_invites) }
-      s.item :follow_recommendations, safe_join([fa_icon('user-plus fw'), t('admin.follow_recommendations.title')]), admin_follow_recommendations_path, highlights_on: %r{/admin/follow_recommendations}, if: -> { current_user.can?(:manage_taxonomies) }
-      s.item :instances, safe_join([fa_icon('cloud fw'), t('admin.instances.title')]), admin_instances_path(limited: limited_federation_mode? ? nil : '1'), highlights_on: %r{/admin/instances|/admin/domain_blocks|/admin/domain_allows}, if: -> { current_user.can?(:manage_federation) }
-      s.item :email_domain_blocks, safe_join([fa_icon('envelope fw'), t('admin.email_domain_blocks.title')]), admin_email_domain_blocks_path, highlights_on: %r{/admin/email_domain_blocks}, if: -> { current_user.can?(:manage_blocks) }
-      s.item :ip_blocks, safe_join([fa_icon('ban fw'), t('admin.ip_blocks.title')]), admin_ip_blocks_path, highlights_on: %r{/admin/ip_blocks}, if: -> { current_user.can?(:manage_blocks) }
-      s.item :action_logs, safe_join([fa_icon('bars fw'), t('admin.action_logs.title')]), admin_action_logs_path, if: -> { current_user.can?(:view_audit_log) }
+    n.item :moderation, safe_join([material_symbol('gavel'), t('moderation.title')]), nil, if: -> { current_user.can?(:manage_reports, :view_audit_log, :manage_users, :manage_invites, :manage_taxonomies, :manage_federation, :manage_blocks) && !self_destruct } do |s|
+      s.item :reports, safe_join([material_symbol('flag'), t('admin.reports.title')]), admin_reports_path, highlights_on: %r{/admin/reports|admin/report_notes}, if: -> { current_user.can?(:manage_reports) }
+      s.item :accounts, safe_join([material_symbol('groups'), t('admin.accounts.title')]), admin_accounts_path(origin: 'local'), highlights_on: %r{/admin/accounts|admin/account_moderation_notes|/admin/pending_accounts|/admin/disputes|/admin/users}, if: -> { current_user.can?(:manage_users) }
+      s.item :tags, safe_join([material_symbol('tag'), t('admin.tags.title')]), admin_tags_path, highlights_on: %r{/admin/tags}, if: -> { current_user.can?(:manage_taxonomies) }
+      s.item :invites, safe_join([material_symbol('person_add'), t('admin.invites.title')]), admin_invites_path, if: -> { current_user.can?(:manage_invites) }
+      s.item :follow_recommendations, safe_join([material_symbol('person_add'), t('admin.follow_recommendations.title')]), admin_follow_recommendations_path, highlights_on: %r{/admin/follow_recommendations}, if: -> { current_user.can?(:manage_taxonomies) }
+      s.item :instances, safe_join([material_symbol('cloud'), t('admin.instances.title')]), admin_instances_path(limited: limited_federation_mode? ? nil : '1'), highlights_on: %r{/admin/instances|/admin/domain_blocks|/admin/domain_allows}, if: -> { current_user.can?(:manage_federation) }
+      s.item :email_domain_blocks, safe_join([material_symbol('mail'), t('admin.email_domain_blocks.title')]), admin_email_domain_blocks_path, highlights_on: %r{/admin/email_domain_blocks}, if: -> { current_user.can?(:manage_blocks) }
+      s.item :ip_blocks, safe_join([material_symbol('hide_source'), t('admin.ip_blocks.title')]), admin_ip_blocks_path, highlights_on: %r{/admin/ip_blocks}, if: -> { current_user.can?(:manage_blocks) }
+      s.item :action_logs, safe_join([material_symbol('list'), t('admin.action_logs.title')]), admin_action_logs_path, if: -> { current_user.can?(:view_audit_log) }
     end
 
-    n.item :admin, safe_join([fa_icon('cogs fw'), t('admin.title')]), nil, if: -> { current_user.can?(:view_dashboard, :manage_settings, :manage_rules, :manage_announcements, :manage_custom_emojis, :manage_webhooks, :manage_federation) && !self_destruct } do |s|
-      s.item :dashboard, safe_join([fa_icon('tachometer fw'), t('admin.dashboard.title')]), admin_dashboard_path, if: -> { current_user.can?(:view_dashboard) }
-      s.item :settings, safe_join([fa_icon('cogs fw'), t('admin.settings.title')]), admin_settings_path, if: -> { current_user.can?(:manage_settings) }, highlights_on: %r{/admin/settings}
-      s.item :rules, safe_join([fa_icon('gavel fw'), t('admin.rules.title')]), admin_rules_path, highlights_on: %r{/admin/rules}, if: -> { current_user.can?(:manage_rules) }
-      s.item :warning_presets, safe_join([fa_icon('warning fw'), t('admin.warning_presets.title')]), admin_warning_presets_path, highlights_on: %r{/admin/warning_presets}, if: -> { current_user.can?(:manage_settings) }
-      s.item :roles, safe_join([fa_icon('vcard fw'), t('admin.roles.title')]), admin_roles_path, highlights_on: %r{/admin/roles}, if: -> { current_user.can?(:manage_roles) }
-      s.item :announcements, safe_join([fa_icon('bullhorn fw'), t('admin.announcements.title')]), admin_announcements_path, highlights_on: %r{/admin/announcements}, if: -> { current_user.can?(:manage_announcements) }
-      s.item :custom_emojis, safe_join([fa_icon('smile-o fw'), t('admin.custom_emojis.title')]), admin_custom_emojis_path, highlights_on: %r{/admin/custom_emojis}, if: -> { current_user.can?(:manage_custom_emojis) }
-      s.item :webhooks, safe_join([fa_icon('inbox fw'), t('admin.webhooks.title')]), admin_webhooks_path, highlights_on: %r{/admin/webhooks}, if: -> { current_user.can?(:manage_webhooks) }
-      s.item :relays, safe_join([fa_icon('exchange fw'), t('admin.relays.title')]), admin_relays_path, highlights_on: %r{/admin/relays}, if: -> { !limited_federation_mode? && current_user.can?(:manage_federation) }
+    n.item :admin, safe_join([material_symbol('manufacturing'), t('admin.title')]), nil, if: -> { current_user.can?(:view_dashboard, :manage_settings, :manage_rules, :manage_announcements, :manage_custom_emojis, :manage_webhooks, :manage_federation) && !self_destruct } do |s|
+      s.item :dashboard, safe_join([material_symbol('speed'), t('admin.dashboard.title')]), admin_dashboard_path, if: -> { current_user.can?(:view_dashboard) }
+      s.item :settings, safe_join([material_symbol('manufacturing'), t('admin.settings.title')]), admin_settings_path, if: -> { current_user.can?(:manage_settings) }, highlights_on: %r{/admin/settings}
+      s.item :rules, safe_join([material_symbol('gavel'), t('admin.rules.title')]), admin_rules_path, highlights_on: %r{/admin/rules}, if: -> { current_user.can?(:manage_rules) }
+      s.item :warning_presets, safe_join([material_symbol('warning'), t('admin.warning_presets.title')]), admin_warning_presets_path, highlights_on: %r{/admin/warning_presets}, if: -> { current_user.can?(:manage_settings) }
+      s.item :roles, safe_join([material_symbol('contact_mail'), t('admin.roles.title')]), admin_roles_path, highlights_on: %r{/admin/roles}, if: -> { current_user.can?(:manage_roles) }
+      s.item :announcements, safe_join([material_symbol('campaign'), t('admin.announcements.title')]), admin_announcements_path, highlights_on: %r{/admin/announcements}, if: -> { current_user.can?(:manage_announcements) }
+      s.item :custom_emojis, safe_join([material_symbol('mood'), t('admin.custom_emojis.title')]), admin_custom_emojis_path, highlights_on: %r{/admin/custom_emojis}, if: -> { current_user.can?(:manage_custom_emojis) }
+      s.item :webhooks, safe_join([material_symbol('inbox'), t('admin.webhooks.title')]), admin_webhooks_path, highlights_on: %r{/admin/webhooks}, if: -> { current_user.can?(:manage_webhooks) }
+      s.item :relays, safe_join([material_symbol('captive_portal'), t('admin.relays.title')]), admin_relays_path, highlights_on: %r{/admin/relays}, if: -> { !limited_federation_mode? && current_user.can?(:manage_federation) }
     end
 
-    n.item :sidekiq, safe_join([fa_icon('diamond fw'), 'Sidekiq']), sidekiq_path, link_html: { target: 'sidekiq' }, if: -> { current_user.can?(:view_devops) }
-    n.item :pghero, safe_join([fa_icon('database fw'), 'PgHero']), pghero_path, link_html: { target: 'pghero' }, if: -> { current_user.can?(:view_devops) }
-    n.item :logout, safe_join([fa_icon('sign-out fw'), t('auth.logout')]), destroy_user_session_path, link_html: { 'data-method' => 'delete' }
+    n.item :sidekiq, safe_join([material_symbol('diamond'), 'Sidekiq']), sidekiq_path, link_html: { target: 'sidekiq' }, if: -> { current_user.can?(:view_devops) }
+    n.item :pghero, safe_join([material_symbol('database'), 'PgHero']), pghero_path, link_html: { target: 'pghero' }, if: -> { current_user.can?(:view_devops) }
+    n.item :logout, safe_join([material_symbol('logout'), t('auth.logout')]), destroy_user_session_path, link_html: { 'data-method' => 'delete' }
   end
 end

From e4092cc73a5647b5c880cb312928cc9c4cea94fd Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 7 Aug 2024 18:52:35 -0400
Subject: [PATCH 1748/2191] Replace more `font-awesome` icons in
 `views/settings` (#30963)

---
 app/views/settings/featured_tags/index.html.haml          | 2 +-
 .../settings/login_activities/_login_activity.html.haml   | 2 +-
 app/views/settings/profiles/show.html.haml                | 4 ++--
 app/views/settings/shared/_profile_navigation.html.haml   | 8 ++++----
 .../two_factor_authentication_methods/index.html.haml     | 2 +-
 app/views/settings/verifications/show.html.haml           | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/views/settings/featured_tags/index.html.haml b/app/views/settings/featured_tags/index.html.haml
index c8c9ec4069fb7b..4b6c019e69b250 100644
--- a/app/views/settings/featured_tags/index.html.haml
+++ b/app/views/settings/featured_tags/index.html.haml
@@ -24,7 +24,7 @@
   .directory__tag
     %div
       %h4
-        = fa_icon 'hashtag'
+        = material_symbol 'tag'
         = featured_tag.display_name
         %small
           - if featured_tag.last_status_at.nil?
diff --git a/app/views/settings/login_activities/_login_activity.html.haml b/app/views/settings/login_activities/_login_activity.html.haml
index 36314926a3dbdd..d003058aea61ec 100644
--- a/app/views/settings/login_activities/_login_activity.html.haml
+++ b/app/views/settings/login_activities/_login_activity.html.haml
@@ -2,7 +2,7 @@
   .log-entry__header
     .log-entry__avatar
       .indicator-icon{ class: login_activity.success? ? 'success' : 'failure' }
-        = fa_icon login_activity.success? ? 'check' : 'times'
+        = material_symbol login_activity.success? ? 'check' : 'close'
     .log-entry__content
       .log-entry__title
         = login_activity_title(login_activity)
diff --git a/app/views/settings/profiles/show.html.haml b/app/views/settings/profiles/show.html.haml
index b7b0a0da92e97c..9790df7d05cff7 100644
--- a/app/views/settings/profiles/show.html.haml
+++ b/app/views/settings/profiles/show.html.haml
@@ -43,7 +43,7 @@
         = image_tag @account.avatar.url, class: 'fields-group__thumbnail', id: 'account_avatar-preview'
         - if @account.avatar.present?
           = link_to settings_profile_picture_path('avatar'), data: { method: :delete }, class: 'link-button link-button--destructive' do
-            = fa_icon 'trash fw'
+            = material_symbol 'delete'
             = t('generic.delete')
 
   .fields-row
@@ -59,7 +59,7 @@
         = image_tag @account.header.url, class: 'fields-group__thumbnail', id: 'account_header-preview'
         - if @account.header.present?
           = link_to settings_profile_picture_path('header'), data: { method: :delete }, class: 'link-button link-button--destructive' do
-            = fa_icon 'trash fw'
+            = material_symbol 'delete'
             = t('generic.delete')
 
   %h4= t('edit_profile.other')
diff --git a/app/views/settings/shared/_profile_navigation.html.haml b/app/views/settings/shared/_profile_navigation.html.haml
index 3a657c5bded7ad..d490bd75661704 100644
--- a/app/views/settings/shared/_profile_navigation.html.haml
+++ b/app/views/settings/shared/_profile_navigation.html.haml
@@ -1,7 +1,7 @@
 .content__heading__tabs
   = render_navigation renderer: :links do |primary|
     :ruby
-      primary.item :profile, safe_join([fa_icon('user fw'), t('settings.edit_profile')]), settings_profile_path
-      primary.item :privacy, safe_join([fa_icon('lock fw'), t('privacy.title')]), settings_privacy_path
-      primary.item :verification, safe_join([fa_icon('check fw'), t('verification.verification')]), settings_verification_path
-      primary.item :featured_tags, safe_join([fa_icon('hashtag fw'), t('settings.featured_tags')]), settings_featured_tags_path
+      primary.item :profile, safe_join([material_symbol('person'), t('settings.edit_profile')]), settings_profile_path
+      primary.item :privacy, safe_join([material_symbol('lock'), t('privacy.title')]), settings_privacy_path
+      primary.item :verification, safe_join([material_symbol('check'), t('verification.verification')]), settings_verification_path
+      primary.item :featured_tags, safe_join([material_symbol('tag'), t('settings.featured_tags')]), settings_featured_tags_path
diff --git a/app/views/settings/two_factor_authentication_methods/index.html.haml b/app/views/settings/two_factor_authentication_methods/index.html.haml
index 51141fab4fd2eb..2e4ff4091c7b51 100644
--- a/app/views/settings/two_factor_authentication_methods/index.html.haml
+++ b/app/views/settings/two_factor_authentication_methods/index.html.haml
@@ -6,7 +6,7 @@
 
 %p.hint
   %span.positive-hint
-    = fa_icon 'check'
+    = material_symbol 'check'
     &nbsp;
     = t 'two_factor_authentication.enabled'
 
diff --git a/app/views/settings/verifications/show.html.haml b/app/views/settings/verifications/show.html.haml
index 94283d2050eb41..4fb2918018413f 100644
--- a/app/views/settings/verifications/show.html.haml
+++ b/app/views/settings/verifications/show.html.haml
@@ -26,5 +26,5 @@
       - @verified_links.each do |field|
         %li
           %span.verified-badge
-            = fa_icon 'check', class: 'verified-badge__mark'
+            = material_symbol 'check', class: 'verified-badge__mark'
             %span= field.value

From 52a626f39b1daab1b8573eaa0613ee5b70afc79f Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 7 Aug 2024 18:53:15 -0400
Subject: [PATCH 1749/2191] Replace more `font-awesome` icons in `app/helpers`
 (#30962)

---
 app/helpers/application_helper.rb                | 16 ++++++++--------
 app/helpers/statuses_helper.rb                   |  8 ++++----
 .../material-icons/400-24px/arrow_left_alt.svg   |  1 +
 .../material-icons/400-24px/sync_alt.svg         |  1 +
 spec/helpers/application_helper_spec.rb          |  4 ++--
 spec/helpers/statuses_helper_spec.rb             |  8 ++++----
 6 files changed, 20 insertions(+), 18 deletions(-)
 create mode 100644 app/javascript/material-icons/400-24px/arrow_left_alt.svg
 create mode 100644 app/javascript/material-icons/400-24px/sync_alt.svg

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 7e9cfee3f68eb0..a6ab4044bcba8c 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -116,7 +116,7 @@ def fa_icon(icon, attributes = {})
   def material_symbol(icon, attributes = {})
     inline_svg_tag(
       "400-24px/#{icon}.svg",
-      class: %w(icon).concat(attributes[:class].to_s.split),
+      class: ['icon', "material-#{icon}"].concat(attributes[:class].to_s.split),
       role: :img
     )
   end
@@ -127,23 +127,23 @@ def check_icon
 
   def visibility_icon(status)
     if status.public_visibility?
-      fa_icon('globe', title: I18n.t('statuses.visibilities.public'))
+      material_symbol('globe', title: I18n.t('statuses.visibilities.public'))
     elsif status.unlisted_visibility?
-      fa_icon('unlock', title: I18n.t('statuses.visibilities.unlisted'))
+      material_symbol('lock_open', title: I18n.t('statuses.visibilities.unlisted'))
     elsif status.private_visibility? || status.limited_visibility?
-      fa_icon('lock', title: I18n.t('statuses.visibilities.private'))
+      material_symbol('lock', title: I18n.t('statuses.visibilities.private'))
     elsif status.direct_visibility?
-      fa_icon('at', title: I18n.t('statuses.visibilities.direct'))
+      material_symbol('alternate_email', title: I18n.t('statuses.visibilities.direct'))
     end
   end
 
   def interrelationships_icon(relationships, account_id)
     if relationships.following[account_id] && relationships.followed_by[account_id]
-      fa_icon('exchange', title: I18n.t('relationships.mutual'), class: 'fa-fw active passive')
+      material_symbol('sync_alt', title: I18n.t('relationships.mutual'), class: 'active passive')
     elsif relationships.following[account_id]
-      fa_icon(locale_direction == 'ltr' ? 'arrow-right' : 'arrow-left', title: I18n.t('relationships.following'), class: 'fa-fw active')
+      material_symbol(locale_direction == 'ltr' ? 'arrow_right_alt' : 'arrow_left_alt', title: I18n.t('relationships.following'), class: 'active')
     elsif relationships.followed_by[account_id]
-      fa_icon(locale_direction == 'ltr' ? 'arrow-left' : 'arrow-right', title: I18n.t('relationships.followers'), class: 'fa-fw passive')
+      material_symbol(locale_direction == 'ltr' ? 'arrow_left_alt' : 'arrow_right_alt', title: I18n.t('relationships.followers'), class: 'passive')
     end
   end
 
diff --git a/app/helpers/statuses_helper.rb b/app/helpers/statuses_helper.rb
index ca693a8a78a9af..d956e4fcd8fb29 100644
--- a/app/helpers/statuses_helper.rb
+++ b/app/helpers/statuses_helper.rb
@@ -60,13 +60,13 @@ def stream_link_target
   def fa_visibility_icon(status)
     case status.visibility
     when 'public'
-      fa_icon 'globe fw'
+      material_symbol 'globe'
     when 'unlisted'
-      fa_icon 'unlock fw'
+      material_symbol 'lock_open'
     when 'private'
-      fa_icon 'lock fw'
+      material_symbol 'lock'
     when 'direct'
-      fa_icon 'at fw'
+      material_symbol 'alternate_email'
     end
   end
 
diff --git a/app/javascript/material-icons/400-24px/arrow_left_alt.svg b/app/javascript/material-icons/400-24px/arrow_left_alt.svg
new file mode 100644
index 00000000000000..a2b57a7f3c1c44
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/arrow_left_alt.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#5f6368"><path d="M400-240 160-480l240-240 56 58-142 142h486v80H314l142 142-56 58Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/sync_alt.svg b/app/javascript/material-icons/400-24px/sync_alt.svg
new file mode 100644
index 00000000000000..a3bbb26a7a364f
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/sync_alt.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#5f6368"><path d="M280-120 80-320l200-200 57 56-104 104h607v80H233l104 104-57 56Zm400-320-57-56 104-104H120v-80h607L623-784l57-56 200 200-200 200Z"/></svg>
\ No newline at end of file
diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
index 56974513bef162..463a90b6986460 100644
--- a/spec/helpers/application_helper_spec.rb
+++ b/spec/helpers/application_helper_spec.rb
@@ -223,7 +223,7 @@ def current_theme = 'default'
 
     it 'returns an unlock icon for a unlisted visible status' do
       result = helper.visibility_icon Status.new(visibility: 'unlisted')
-      expect(result).to match(/unlock/)
+      expect(result).to match(/lock_open/)
     end
 
     it 'returns a lock icon for a private visible status' do
@@ -233,7 +233,7 @@ def current_theme = 'default'
 
     it 'returns an at icon for a direct visible status' do
       result = helper.visibility_icon Status.new(visibility: 'direct')
-      expect(result).to match(/at/)
+      expect(result).to match(/alternate_email/)
     end
   end
 
diff --git a/spec/helpers/statuses_helper_spec.rb b/spec/helpers/statuses_helper_spec.rb
index 73d7d80e46043f..ba6fe361d96685 100644
--- a/spec/helpers/statuses_helper_spec.rb
+++ b/spec/helpers/statuses_helper_spec.rb
@@ -36,7 +36,7 @@ def status_text_summary(status)
       it 'returns the correct fa icon' do
         result = helper.fa_visibility_icon(status)
 
-        expect(result).to match('fa-globe')
+        expect(result).to match('material-globe')
       end
     end
 
@@ -46,7 +46,7 @@ def status_text_summary(status)
       it 'returns the correct fa icon' do
         result = helper.fa_visibility_icon(status)
 
-        expect(result).to match('fa-unlock')
+        expect(result).to match('material-lock_open')
       end
     end
 
@@ -56,7 +56,7 @@ def status_text_summary(status)
       it 'returns the correct fa icon' do
         result = helper.fa_visibility_icon(status)
 
-        expect(result).to match('fa-lock')
+        expect(result).to match('material-lock')
       end
     end
 
@@ -66,7 +66,7 @@ def status_text_summary(status)
       it 'returns the correct fa icon' do
         result = helper.fa_visibility_icon(status)
 
-        expect(result).to match('fa-at')
+        expect(result).to match('material-alternate_email')
       end
     end
   end

From 84c3cc4e5bf3c148982231222baab9ccfcc107b3 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 7 Aug 2024 19:08:36 -0400
Subject: [PATCH 1750/2191] Replace more `font-awesome` icons in `views/admin`
 area (#30961)

---
 app/javascript/material-icons/400-24px/comment.svg     |  1 +
 app/javascript/material-icons/400-24px/hourglass.svg   |  1 +
 .../400-24px/keyboard_double_arrow_down.svg            |  1 +
 .../material-icons/400-24px/photo_camera.svg           |  1 +
 app/javascript/material-icons/400-24px/power.svg       |  1 +
 app/javascript/material-icons/400-24px/power_off.svg   |  1 +
 .../material-icons/400-24px/radio_button_checked.svg   |  1 +
 .../material-icons/400-24px/radio_button_unchecked.svg |  1 +
 app/javascript/material-icons/400-24px/save.svg        |  1 +
 app/javascript/styles/mastodon/admin.scss              |  2 +-
 app/views/admin/custom_emojis/index.html.haml          |  6 +++---
 app/views/admin/instances/_instance.html.haml          |  2 +-
 app/views/admin/relays/_relay.html.haml                |  2 +-
 app/views/admin/reports/_status.html.haml              |  2 +-
 app/views/admin/reports/index.html.haml                |  4 ++--
 app/views/admin/reports/show.html.haml                 |  2 +-
 app/views/admin/settings/appearance/show.html.haml     |  2 +-
 app/views/admin/settings/branding/show.html.haml       |  6 +++---
 app/views/admin/settings/shared/_links.html.haml       | 10 +++++-----
 app/views/admin/statuses/index.html.haml               |  2 +-
 app/views/admin/webhooks/_webhook.html.haml            |  2 +-
 app/views/admin/webhooks/show.html.haml                |  2 +-
 22 files changed, 31 insertions(+), 22 deletions(-)
 create mode 100644 app/javascript/material-icons/400-24px/comment.svg
 create mode 100644 app/javascript/material-icons/400-24px/hourglass.svg
 create mode 100644 app/javascript/material-icons/400-24px/keyboard_double_arrow_down.svg
 create mode 100644 app/javascript/material-icons/400-24px/photo_camera.svg
 create mode 100644 app/javascript/material-icons/400-24px/power.svg
 create mode 100644 app/javascript/material-icons/400-24px/power_off.svg
 create mode 100644 app/javascript/material-icons/400-24px/radio_button_checked.svg
 create mode 100644 app/javascript/material-icons/400-24px/radio_button_unchecked.svg
 create mode 100644 app/javascript/material-icons/400-24px/save.svg

diff --git a/app/javascript/material-icons/400-24px/comment.svg b/app/javascript/material-icons/400-24px/comment.svg
new file mode 100644
index 00000000000000..da1ae0392e7329
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/comment.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#5f6368"><path d="M240-400h480v-80H240v80Zm0-120h480v-80H240v80Zm0-120h480v-80H240v80ZM880-80 720-240H160q-33 0-56.5-23.5T80-320v-480q0-33 23.5-56.5T160-880h640q33 0 56.5 23.5T880-800v720ZM160-320h594l46 45v-525H160v480Zm0 0v-480 480Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/hourglass.svg b/app/javascript/material-icons/400-24px/hourglass.svg
new file mode 100644
index 00000000000000..07667a06e4995d
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/hourglass.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#5f6368"><path d="M320-160h320v-120q0-66-47-113t-113-47q-66 0-113 47t-47 113v120Zm160-360q66 0 113-47t47-113v-120H320v120q0 66 47 113t113 47ZM160-80v-80h80v-120q0-61 28.5-114.5T348-480q-51-32-79.5-85.5T240-680v-120h-80v-80h640v80h-80v120q0 61-28.5 114.5T612-480q51 32 79.5 85.5T720-280v120h80v80H160Zm320-80Zm0-640Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/keyboard_double_arrow_down.svg b/app/javascript/material-icons/400-24px/keyboard_double_arrow_down.svg
new file mode 100644
index 00000000000000..45b6e420f46692
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/keyboard_double_arrow_down.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#5f6368"><path d="M480-200 240-440l56-56 184 183 184-183 56 56-240 240Zm0-240L240-680l56-56 184 183 184-183 56 56-240 240Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/photo_camera.svg b/app/javascript/material-icons/400-24px/photo_camera.svg
new file mode 100644
index 00000000000000..4621435ce097ac
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/photo_camera.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#5f6368"><path d="M480-260q75 0 127.5-52.5T660-440q0-75-52.5-127.5T480-620q-75 0-127.5 52.5T300-440q0 75 52.5 127.5T480-260Zm0-80q-42 0-71-29t-29-71q0-42 29-71t71-29q42 0 71 29t29 71q0 42-29 71t-71 29ZM160-120q-33 0-56.5-23.5T80-200v-480q0-33 23.5-56.5T160-760h126l74-80h240l74 80h126q33 0 56.5 23.5T880-680v480q0 33-23.5 56.5T800-120H160Zm0-80h640v-480H638l-73-80H395l-73 80H160v480Zm320-240Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/power.svg b/app/javascript/material-icons/400-24px/power.svg
new file mode 100644
index 00000000000000..023a3a31daf5d8
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/power.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#5f6368"><path d="M460-200h40v-74l140-140v-186H320v186l140 140v74Zm-80 80v-120L240-380v-220q0-33 23.5-56.5T320-680h40l-40 40v-200h80v160h160v-160h80v200l-40-40h40q33 0 56.5 23.5T720-600v220L580-240v120H380Zm100-280Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/power_off.svg b/app/javascript/material-icons/400-24px/power_off.svg
new file mode 100644
index 00000000000000..25edd4de108108
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/power_off.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#5f6368"><path d="M380-120v-120L240-380v-220q0-24 11-45t32-32l77 77h-40v186l140 140v74h40v-74l37-37L56-792l56-56 736 736-56 56-198-198-14 14v120H380Zm306-268-46-46v-166H474L320-754v-86h80v160h160v-160h80v200l-40-40h40q33 0 56.5 23.5T720-600v178l-34 34ZM558-516Zm-130 97Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/radio_button_checked.svg b/app/javascript/material-icons/400-24px/radio_button_checked.svg
new file mode 100644
index 00000000000000..a8ab2c9b9c3dcd
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/radio_button_checked.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#5f6368"><path d="M480-280q83 0 141.5-58.5T680-480q0-83-58.5-141.5T480-680q-83 0-141.5 58.5T280-480q0 83 58.5 141.5T480-280Zm0 200q-83 0-156-31.5T197-197q-54-54-85.5-127T80-480q0-83 31.5-156T197-763q54-54 127-85.5T480-880q83 0 156 31.5T763-763q54 54 85.5 127T880-480q0 83-31.5 156T763-197q-54 54-127 85.5T480-80Zm0-80q134 0 227-93t93-227q0-134-93-227t-227-93q-134 0-227 93t-93 227q0 134 93 227t227 93Zm0-320Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/radio_button_unchecked.svg b/app/javascript/material-icons/400-24px/radio_button_unchecked.svg
new file mode 100644
index 00000000000000..37665285d5eda6
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/radio_button_unchecked.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#5f6368"><path d="M480-80q-83 0-156-31.5T197-197q-54-54-85.5-127T80-480q0-83 31.5-156T197-763q54-54 127-85.5T480-880q83 0 156 31.5T763-763q54 54 85.5 127T880-480q0 83-31.5 156T763-197q-54 54-127 85.5T480-80Zm0-80q134 0 227-93t93-227q0-134-93-227t-227-93q-134 0-227 93t-93 227q0 134 93 227t227 93Zm0-320Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/save.svg b/app/javascript/material-icons/400-24px/save.svg
new file mode 100644
index 00000000000000..a86028d9955c73
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/save.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#5f6368"><path d="M840-680v480q0 33-23.5 56.5T760-120H200q-33 0-56.5-23.5T120-200v-560q0-33 23.5-56.5T200-840h480l160 160Zm-80 34L646-760H200v560h560v-446ZM480-240q50 0 85-35t35-85q0-50-35-85t-85-35q-50 0-85 35t-35 85q0 50 35 85t85 35ZM240-560h360v-160H240v160Zm-40-86v446-560 114Z"/></svg>
diff --git a/app/javascript/styles/mastodon/admin.scss b/app/javascript/styles/mastodon/admin.scss
index 810f59b9a53894..045a435de273ec 100644
--- a/app/javascript/styles/mastodon/admin.scss
+++ b/app/javascript/styles/mastodon/admin.scss
@@ -13,7 +13,7 @@ $content-width: 840px;
   .icon {
     width: 16px;
     height: 16px;
-    vertical-align: middle;
+    vertical-align: top;
     margin: 0 2px;
   }
 
diff --git a/app/views/admin/custom_emojis/index.html.haml b/app/views/admin/custom_emojis/index.html.haml
index 82fec554b03345..6db97e2e8e973c 100644
--- a/app/views/admin/custom_emojis/index.html.haml
+++ b/app/views/admin/custom_emojis/index.html.haml
@@ -49,15 +49,15 @@
         = check_box_tag :batch_checkbox_all, nil, false
       .batch-table__toolbar__actions
         - if params[:local] == '1'
-          = f.button safe_join([fa_icon('save'), t('generic.save_changes')]), name: :update, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
+          = f.button safe_join([material_symbol('save'), t('generic.save_changes')]), name: :update, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
 
           = f.button safe_join([material_symbol('visibility'), t('admin.custom_emojis.list')]), name: :list, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
 
           = f.button safe_join([material_symbol('visibility_off'), t('admin.custom_emojis.unlist')]), name: :unlist, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
 
-        = f.button safe_join([fa_icon('power-off'), t('admin.custom_emojis.enable')]), name: :enable, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
+        = f.button safe_join([material_symbol('radio_button_checked'), t('admin.custom_emojis.enable')]), name: :enable, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
 
-        = f.button safe_join([fa_icon('power-off'), t('admin.custom_emojis.disable')]), name: :disable, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
+        = f.button safe_join([material_symbol('radio_button_unchecked'), t('admin.custom_emojis.disable')]), name: :disable, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
 
         - if can?(:destroy, :custom_emoji)
           = f.button safe_join([material_symbol('close'), t('admin.custom_emojis.delete')]), name: :delete, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
diff --git a/app/views/admin/instances/_instance.html.haml b/app/views/admin/instances/_instance.html.haml
index 522a2444bb9d6b..4cae3caf5251f2 100644
--- a/app/views/admin/instances/_instance.html.haml
+++ b/app/views/admin/instances/_instance.html.haml
@@ -1,7 +1,7 @@
 .directory__tag
   = link_to admin_instance_path(instance) do
     %h4
-      = fa_icon 'warning fw', title: t('admin.instances.availability.warning') if instance.failing?
+      = material_symbol 'warning', title: t('admin.instances.availability.warning') if instance.failing?
       = instance.domain
 
       %small
diff --git a/app/views/admin/relays/_relay.html.haml b/app/views/admin/relays/_relay.html.haml
index 0960124ccfae4e..2e76f5430838be 100644
--- a/app/views/admin/relays/_relay.html.haml
+++ b/app/views/admin/relays/_relay.html.haml
@@ -8,7 +8,7 @@
         &nbsp;
         = t 'admin.relays.enabled'
     - elsif relay.pending?
-      = fa_icon('hourglass')
+      = material_symbol('hourglass')
       &nbsp;
       = t 'admin.relays.pending'
     - else
diff --git a/app/views/admin/reports/_status.html.haml b/app/views/admin/reports/_status.html.haml
index 66820f0a6e7fb2..11be38ef845106 100644
--- a/app/views/admin/reports/_status.html.haml
+++ b/app/views/admin/reports/_status.html.haml
@@ -30,7 +30,7 @@
         %span.negative-hint= t('admin.statuses.deleted')
       ·
       - if status.reblog?
-        = fa_icon('retweet fw')
+        = material_symbol('repeat_active')
         = t('statuses.boosted_from_html', acct_link: admin_account_inline_link_to(status.proper.account))
       - else
         = fa_visibility_icon(status)
diff --git a/app/views/admin/reports/index.html.haml b/app/views/admin/reports/index.html.haml
index dae2c1aa5bb7e3..b476c6ccfa0342 100644
--- a/app/views/admin/reports/index.html.haml
+++ b/app/views/admin/reports/index.html.haml
@@ -61,11 +61,11 @@
               .one-line= report.comment.presence || t('admin.reports.comment.none')
 
               %span.report-card__summary__item__content__icon{ title: t('admin.accounts.statuses') }
-                = fa_icon('comment')
+                = material_symbol('comment')
                 = report.status_ids.size
 
               %span.report-card__summary__item__content__icon{ title: t('admin.accounts.media_attachments') }
-                = fa_icon('camera')
+                = material_symbol('photo_camera')
                 = report.media_attachments_count
 
               - if report.forwarded?
diff --git a/app/views/admin/reports/show.html.haml b/app/views/admin/reports/show.html.haml
index ca1edea0fe3148..69e9c02921ea51 100644
--- a/app/views/admin/reports/show.html.haml
+++ b/app/views/admin/reports/show.html.haml
@@ -35,7 +35,7 @@
   = t 'admin.reports.statuses'
   %small.section-skip-link
     = link_to '#actions' do
-      = fa_icon 'angle-double-down'
+      = material_symbol 'keyboard_double_arrow_down'
       = t('admin.reports.skip_to_actions')
 
 %p
diff --git a/app/views/admin/settings/appearance/show.html.haml b/app/views/admin/settings/appearance/show.html.haml
index 3ef4920cd50d5a..c610f9f94174c3 100644
--- a/app/views/admin/settings/appearance/show.html.haml
+++ b/app/views/admin/settings/appearance/show.html.haml
@@ -33,7 +33,7 @@
       - if @admin_settings.mascot.persisted?
         = image_tag @admin_settings.mascot.file.url, class: 'fields-group__thumbnail'
         = link_to admin_site_upload_path(@admin_settings.mascot), data: { method: :delete }, class: 'link-button link-button--destructive' do
-          = fa_icon 'trash fw'
+          = material_symbol 'delete'
           = t('admin.site_uploads.delete')
 
   .actions
diff --git a/app/views/admin/settings/branding/show.html.haml b/app/views/admin/settings/branding/show.html.haml
index 71aac5ead1c1f0..e03c16a25a88f8 100644
--- a/app/views/admin/settings/branding/show.html.haml
+++ b/app/views/admin/settings/branding/show.html.haml
@@ -37,7 +37,7 @@
       - if @admin_settings.thumbnail.persisted?
         = image_tag @admin_settings.thumbnail.file.url(:'@1x'), class: 'fields-group__thumbnail'
         = link_to admin_site_upload_path(@admin_settings.thumbnail), data: { method: :delete }, class: 'link-button link-button--destructive' do
-          = fa_icon 'trash fw'
+          = material_symbol 'delete'
           = t('admin.site_uploads.delete')
 
   .fields-row
@@ -51,7 +51,7 @@
       - if @admin_settings.favicon.persisted?
         = image_tag @admin_settings.favicon.file.url('48'), class: 'fields-group__thumbnail'
         = link_to admin_site_upload_path(@admin_settings.favicon), data: { method: :delete }, class: 'link-button link-button--destructive' do
-          = fa_icon 'trash fw'
+          = material_symbol 'delete'
           = t('admin.site_uploads.delete')
 
   .fields-row
@@ -65,7 +65,7 @@
       - if @admin_settings.app_icon.persisted?
         = image_tag @admin_settings.app_icon.file.url('48'), class: 'fields-group__thumbnail'
         = link_to admin_site_upload_path(@admin_settings.app_icon), data: { method: :delete }, class: 'link-button link-button--destructive' do
-          = fa_icon 'trash fw'
+          = material_symbol 'delete'
           = t('admin.site_uploads.delete')
 
   .actions
diff --git a/app/views/admin/settings/shared/_links.html.haml b/app/views/admin/settings/shared/_links.html.haml
index 8b0678d4c91a37..c03e5cfd9fa33d 100644
--- a/app/views/admin/settings/shared/_links.html.haml
+++ b/app/views/admin/settings/shared/_links.html.haml
@@ -1,9 +1,9 @@
 .content__heading__tabs
   = render_navigation renderer: :links do |primary|
     :ruby
-      primary.item :branding, safe_join([fa_icon('pencil fw'), t('admin.settings.branding.title')]), admin_settings_branding_path
-      primary.item :about, safe_join([fa_icon('file-text fw'), t('admin.settings.about.title')]), admin_settings_about_path
+      primary.item :branding, safe_join([material_symbol('edit'), t('admin.settings.branding.title')]), admin_settings_branding_path
+      primary.item :about, safe_join([material_symbol('description'), t('admin.settings.about.title')]), admin_settings_about_path
       primary.item :registrations, safe_join([material_symbol('group'), t('admin.settings.registrations.title')]), admin_settings_registrations_path
-      primary.item :discovery, safe_join([fa_icon('search fw'), t('admin.settings.discovery.title')]), admin_settings_discovery_path
-      primary.item :content_retention, safe_join([fa_icon('history fw'), t('admin.settings.content_retention.title')]), admin_settings_content_retention_path
-      primary.item :appearance, safe_join([fa_icon('desktop fw'), t('admin.settings.appearance.title')]), admin_settings_appearance_path
+      primary.item :discovery, safe_join([material_symbol('search'), t('admin.settings.discovery.title')]), admin_settings_discovery_path
+      primary.item :content_retention, safe_join([material_symbol('history'), t('admin.settings.content_retention.title')]), admin_settings_content_retention_path
+      primary.item :appearance, safe_join([material_symbol('computer'), t('admin.settings.appearance.title')]), admin_settings_appearance_path
diff --git a/app/views/admin/statuses/index.html.haml b/app/views/admin/statuses/index.html.haml
index b03b8ac51b9002..4d5d03706084d1 100644
--- a/app/views/admin/statuses/index.html.haml
+++ b/app/views/admin/statuses/index.html.haml
@@ -33,7 +33,7 @@
         = check_box_tag :batch_checkbox_all, nil, false
       .batch-table__toolbar__actions
         - unless @statuses.empty?
-          = f.button safe_join([fa_icon('flag'), t('admin.statuses.batch.report')]),
+          = f.button safe_join([material_symbol('flag'), t('admin.statuses.batch.report')]),
                      class: 'table-action-link',
                      data: { confirm: t('admin.reports.are_you_sure') },
                      name: :report,
diff --git a/app/views/admin/webhooks/_webhook.html.haml b/app/views/admin/webhooks/_webhook.html.haml
index 6b3e49eba0a44a..39abb7dd2c7608 100644
--- a/app/views/admin/webhooks/_webhook.html.haml
+++ b/app/views/admin/webhooks/_webhook.html.haml
@@ -1,6 +1,6 @@
 .applications-list__item
   = link_to admin_webhook_path(webhook), class: 'announcements-list__item__title' do
-    = fa_icon 'inbox'
+    = material_symbol 'inbox'
     = webhook.url
 
   .announcements-list__item__action-bar
diff --git a/app/views/admin/webhooks/show.html.haml b/app/views/admin/webhooks/show.html.haml
index 5ac809efc55907..c2c4f55788e38a 100644
--- a/app/views/admin/webhooks/show.html.haml
+++ b/app/views/admin/webhooks/show.html.haml
@@ -5,7 +5,7 @@
   .content__heading__row
     %h2
       %small
-        = fa_icon 'inbox'
+        = material_symbol 'inbox'
         = t('admin.webhooks.webhook')
       = @webhook.url
     .content__heading__actions

From f8629367d2cbb6495bb81d5357611e3759dbf35a Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 8 Aug 2024 01:09:30 +0200
Subject: [PATCH 1751/2191] Add unchangeable filtered notification setting for
 limited accounts (#31324)

---
 .../components/policy_controls.tsx             | 18 ++++++++++++++++++
 app/javascript/mastodon/locales/en.json        |  2 ++
 2 files changed, 20 insertions(+)

diff --git a/app/javascript/mastodon/features/notifications/components/policy_controls.tsx b/app/javascript/mastodon/features/notifications/components/policy_controls.tsx
index 1647bf6b45682a..d6bc412994161b 100644
--- a/app/javascript/mastodon/features/notifications/components/policy_controls.tsx
+++ b/app/javascript/mastodon/features/notifications/components/policy_controls.tsx
@@ -7,6 +7,9 @@ import { useAppSelector, useAppDispatch } from 'mastodon/store';
 
 import { CheckboxWithLabel } from './checkbox_with_label';
 
+// eslint-disable-next-line @typescript-eslint/no-empty-function
+const noop = () => {};
+
 export const PolicyControls: React.FC = () => {
   const dispatch = useAppDispatch();
 
@@ -135,6 +138,21 @@ export const PolicyControls: React.FC = () => {
             />
           </span>
         </CheckboxWithLabel>
+
+        <CheckboxWithLabel checked disabled onChange={noop}>
+          <strong>
+            <FormattedMessage
+              id='notifications.policy.filter_limited_accounts_title'
+              defaultMessage='Moderated accounts'
+            />
+          </strong>
+          <span className='hint'>
+            <FormattedMessage
+              id='notifications.policy.filter_limited_accounts_hint'
+              defaultMessage='Limited by server moderators'
+            />
+          </span>
+        </CheckboxWithLabel>
       </div>
     </section>
   );
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index a6fa4764b26936..d257da39704bcd 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -545,6 +545,8 @@
   "notifications.permission_denied": "Desktop notifications are unavailable due to previously denied browser permissions request",
   "notifications.permission_denied_alert": "Desktop notifications can't be enabled, as browser permission has been denied before",
   "notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
+  "notifications.policy.filter_limited_accounts_hint": "Limited by server moderators",
+  "notifications.policy.filter_limited_accounts_title": "Moderated accounts",
   "notifications.policy.filter_new_accounts.hint": "Created within the past {days, plural, one {one day} other {# days}}",
   "notifications.policy.filter_new_accounts_title": "New accounts",
   "notifications.policy.filter_not_followers_hint": "Including people who have been following you fewer than {days, plural, one {one day} other {# days}}",

From ac9040b76b22212865df932936ee62d7ab9a9adb Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 8 Aug 2024 11:16:33 +0200
Subject: [PATCH 1752/2191] Add explainer for filtered notifications from
 limited accounts (#31331)

---
 .../features/notifications/request.jsx        | 20 ++++++++++++++++++-
 app/javascript/mastodon/locales/en.json       |  2 ++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/features/notifications/request.jsx b/app/javascript/mastodon/features/notifications/request.jsx
index 7cba9461659ab1..30ec004e707bc2 100644
--- a/app/javascript/mastodon/features/notifications/request.jsx
+++ b/app/javascript/mastodon/features/notifications/request.jsx
@@ -1,7 +1,7 @@
 import PropTypes from 'prop-types';
 import { useRef, useCallback, useEffect } from 'react';
 
-import { defineMessages, useIntl } from 'react-intl';
+import { defineMessages, useIntl, FormattedMessage } from 'react-intl';
 
 import { Helmet } from 'react-helmet';
 
@@ -90,6 +90,23 @@ export const NotificationRequest = ({ multiColumn, params: { id } }) => {
 
   const columnTitle = intl.formatMessage(messages.title, { name: account?.get('display_name') || account?.get('username') });
 
+  let explainer = null;
+
+  if (account?.limited) {
+    const isLocal = account.acct.indexOf('@') === -1;
+    explainer = (
+      <div className='dismissable-banner'>
+        <div className='dismissable-banner__message'>
+          {isLocal ? (
+            <FormattedMessage id='notification_requests.explainer_for_limited_account' defaultMessage='Notifications from this account have been filtered because the account has been limited by a moderator.' />
+          ) : (
+            <FormattedMessage id='notification_requests.explainer_for_limited_remote_account' defaultMessage='Notifications from this account have been filtered because the account or its server has been limited by a moderator.' />
+          )}
+        </div>
+      </div>
+    );
+  }
+
   return (
     <Column bindToDocument={!multiColumn} ref={columnRef} label={columnTitle}>
       <ColumnHeader
@@ -109,6 +126,7 @@ export const NotificationRequest = ({ multiColumn, params: { id } }) => {
 
       <SensitiveMediaContextProvider hideMediaByDefault>
         <ScrollableList
+          prepend={explainer}
           scrollKey={`notification_requests/${id}`}
           trackScroll={!multiColumn}
           bindToDocument={!multiColumn}
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index d257da39704bcd..8db48c1a28966f 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -505,6 +505,8 @@
   "notification.update": "{name} edited a post",
   "notification_requests.accept": "Accept",
   "notification_requests.dismiss": "Dismiss",
+  "notification_requests.explainer_for_limited_account": "Notifications from this account have been filtered because the account has been limited by a moderator.",
+  "notification_requests.explainer_for_limited_remote_account": "Notifications from this account have been filtered because the account or its server has been limited by a moderator.",
   "notification_requests.maximize": "Maximize",
   "notification_requests.minimize_banner": "Minimize filtered notifications banner",
   "notification_requests.notifications_from": "Notifications from {name}",

From 176ba984d4812717c5cad5fcd7d5bcbb8ece0f2a Mon Sep 17 00:00:00 2001
From: Michael Stanclift <mx@vmstan.com>
Date: Thu, 8 Aug 2024 04:21:54 -0500
Subject: [PATCH 1753/2191] Follow up tweaking of admin UI changes part 2
 (#31268)

---
 app/javascript/styles/mastodon-light/diff.scss |  2 +-
 app/javascript/styles/mastodon/_mixins.scss    |  2 +-
 app/javascript/styles/mastodon/components.scss |  2 +-
 app/javascript/styles/mastodon/forms.scss      | 13 +------------
 app/javascript/styles/mastodon/rtl.scss        | 10 ----------
 app/javascript/styles/mastodon/tables.scss     |  4 ++--
 app/javascript/styles/mastodon/widgets.scss    |  2 +-
 7 files changed, 7 insertions(+), 28 deletions(-)

diff --git a/app/javascript/styles/mastodon-light/diff.scss b/app/javascript/styles/mastodon-light/diff.scss
index 0ad8e1028ea231..5684a99e519727 100644
--- a/app/javascript/styles/mastodon-light/diff.scss
+++ b/app/javascript/styles/mastodon-light/diff.scss
@@ -496,11 +496,11 @@ html {
 
 .compose-form .autosuggest-textarea__textarea,
 .compose-form__highlightable,
+.autosuggest-textarea__suggestions,
 .search__input,
 .search__popout,
 .emoji-mart-search input,
 .language-dropdown__dropdown .emoji-mart-search input,
-// .strike-card,
 .poll__option input[type='text'] {
   background: darken($ui-base-color, 10%);
 }
diff --git a/app/javascript/styles/mastodon/_mixins.scss b/app/javascript/styles/mastodon/_mixins.scss
index 899b494e549312..c2e4acba4d649f 100644
--- a/app/javascript/styles/mastodon/_mixins.scss
+++ b/app/javascript/styles/mastodon/_mixins.scss
@@ -7,7 +7,7 @@
   background: $ui-base-color;
   color: $darker-text-color;
   border-radius: 4px;
-  border: 1px solid lighten($ui-base-color, 8%);
+  border: 1px solid var(--background-border-color);
   font-size: 17px;
   line-height: normal;
   margin: 0;
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 8ecda33aab5677..3b8adb96a6a37b 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -403,7 +403,7 @@ body > [data-popper-placement] {
   &__suggestions {
     box-shadow: var(--dropdown-shadow);
     background: $ui-base-color;
-    border: 1px solid lighten($ui-base-color, 14%);
+    border: 1px solid var(--background-border-color);
     border-radius: 0 0 4px 4px;
     color: $secondary-text-color;
     font-size: 14px;
diff --git a/app/javascript/styles/mastodon/forms.scss b/app/javascript/styles/mastodon/forms.scss
index 13a731f7f6392e..971e78f76f57c4 100644
--- a/app/javascript/styles/mastodon/forms.scss
+++ b/app/javascript/styles/mastodon/forms.scss
@@ -441,11 +441,6 @@ code {
     border-radius: 4px;
     padding: 10px 16px;
 
-    &::placeholder {
-      color: $dark-text-color;
-      opacity: 1;
-    }
-
     &:invalid {
       box-shadow: none;
     }
@@ -607,8 +602,7 @@ code {
       inset-inline-end: 3px;
       top: 1px;
       padding: 10px;
-      padding-bottom: 9px;
-      font-size: 16px;
+      font-size: 14px;
       color: $dark-text-color;
       font-family: inherit;
       pointer-events: none;
@@ -626,11 +620,6 @@ code {
         inset-inline-end: 0;
         bottom: 1px;
         width: 5px;
-        background-image: linear-gradient(
-          to right,
-          rgba(darken($ui-base-color, 10%), 0),
-          darken($ui-base-color, 10%)
-        );
       }
     }
   }
diff --git a/app/javascript/styles/mastodon/rtl.scss b/app/javascript/styles/mastodon/rtl.scss
index 8d3efcb5726197..07fe96fc3ad1f1 100644
--- a/app/javascript/styles/mastodon/rtl.scss
+++ b/app/javascript/styles/mastodon/rtl.scss
@@ -35,16 +35,6 @@ body.rtl {
     direction: rtl;
   }
 
-  .simple_form .label_input__append {
-    &::after {
-      background-image: linear-gradient(
-        to left,
-        rgba(darken($ui-base-color, 10%), 0),
-        darken($ui-base-color, 10%)
-      );
-    }
-  }
-
   .simple_form select {
     background: $ui-base-color
       url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 14.933 18.467' height='19.698' width='15.929'><path d='M3.467 14.967l-3.393-3.5H14.86l-3.392 3.5c-1.866 1.925-3.666 3.5-4 3.5-.335 0-2.135-1.575-4-3.5zm.266-11.234L7.467 0 11.2 3.733l3.733 3.734H0l3.733-3.734z' fill='#{hex-color(lighten($ui-base-color, 12%))}'/></svg>")
diff --git a/app/javascript/styles/mastodon/tables.scss b/app/javascript/styles/mastodon/tables.scss
index 65f42d0467b747..4997ed9b847611 100644
--- a/app/javascript/styles/mastodon/tables.scss
+++ b/app/javascript/styles/mastodon/tables.scss
@@ -273,8 +273,8 @@ a.table-action-link {
       }
     }
 
-    &:nth-child(even) {
-      background: var(--background-color);
+    &:last-child {
+      border-radius: 0 0 4px 4px;
     }
 
     &__content {
diff --git a/app/javascript/styles/mastodon/widgets.scss b/app/javascript/styles/mastodon/widgets.scss
index 0d56bd9c48bc71..da7d68ce8db39d 100644
--- a/app/javascript/styles/mastodon/widgets.scss
+++ b/app/javascript/styles/mastodon/widgets.scss
@@ -217,7 +217,7 @@
       display: flex;
       align-items: center;
       justify-content: space-between;
-      border: 1px solid lighten($ui-base-color, 8%);
+      border: 1px solid var(--background-border-color);
       border-radius: 4px;
       padding: 15px;
       text-decoration: none;

From a95fe931d71ea0fa1d81a94c779553048b4e69f5 Mon Sep 17 00:00:00 2001
From: Valtteri Laitinen <dev@valtlai.fi>
Date: Thu, 8 Aug 2024 12:22:48 +0300
Subject: [PATCH 1754/2191] Really fix duplicate border around search results
 (#31305)

---
 app/javascript/styles/mastodon/components.scss | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 3b8adb96a6a37b..2b1ae6e14f3f28 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -3086,11 +3086,6 @@ $ui-header-logo-wordmark-width: 99px;
   .explore__search-header {
     display: flex;
   }
-
-  .explore__search-results {
-    border: 0;
-    border-radius: 0;
-  }
 }
 
 .icon-with-badge {
@@ -8789,10 +8784,13 @@ noscript {
   flex: 1 1 auto;
   display: flex;
   flex-direction: column;
-  border: 1px solid var(--background-border-color);
-  border-top: 0;
-  border-bottom-left-radius: 4px;
-  border-bottom-right-radius: 4px;
+
+  @media screen and (min-width: $no-gap-breakpoint) {
+    border: 1px solid var(--background-border-color);
+    border-top: 0;
+    border-bottom-left-radius: 4px;
+    border-bottom-right-radius: 4px;
+  }
 }
 
 .story {

From 2edae5ea28bcddb59f2d38416d03d2b52175b58c Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 8 Aug 2024 12:57:21 +0200
Subject: [PATCH 1755/2191] Convert PrivacyDropdownMenu to Typescript and
 generalize it to DropdownSelector component (#31338)

---
 .../mastodon/components/dropdown_selector.tsx | 185 ++++++++++++++++++
 .../compose/components/privacy_dropdown.jsx   |   5 +-
 .../components/privacy_dropdown_menu.jsx      | 128 ------------
 3 files changed, 187 insertions(+), 131 deletions(-)
 create mode 100644 app/javascript/mastodon/components/dropdown_selector.tsx
 delete mode 100644 app/javascript/mastodon/features/compose/components/privacy_dropdown_menu.jsx

diff --git a/app/javascript/mastodon/components/dropdown_selector.tsx b/app/javascript/mastodon/components/dropdown_selector.tsx
new file mode 100644
index 00000000000000..f8bf96c634294a
--- /dev/null
+++ b/app/javascript/mastodon/components/dropdown_selector.tsx
@@ -0,0 +1,185 @@
+import { useCallback, useEffect, useRef, useState } from 'react';
+
+import classNames from 'classnames';
+
+import { supportsPassiveEvents } from 'detect-passive-events';
+
+import InfoIcon from '@/material-icons/400-24px/info.svg?react';
+
+import type { IconProp } from './icon';
+import { Icon } from './icon';
+
+const listenerOptions = supportsPassiveEvents
+  ? { passive: true, capture: true }
+  : true;
+
+interface SelectItem {
+  value: string;
+  icon?: string;
+  iconComponent?: IconProp;
+  text: string;
+  meta: string;
+  extra?: string;
+}
+
+interface Props {
+  value: string;
+  classNamePrefix: string;
+  style?: React.CSSProperties;
+  items: SelectItem[];
+  onChange: (value: string) => void;
+  onClose: () => void;
+}
+
+export const DropdownSelector: React.FC<Props> = ({
+  style,
+  items,
+  value,
+  classNamePrefix = 'privacy-dropdown',
+  onClose,
+  onChange,
+}) => {
+  const nodeRef = useRef<HTMLUListElement>(null);
+  const focusedItemRef = useRef<HTMLLIElement>(null);
+  const [currentValue, setCurrentValue] = useState(value);
+
+  const handleDocumentClick = useCallback(
+    (e: MouseEvent | TouchEvent) => {
+      if (
+        nodeRef.current &&
+        e.target instanceof Node &&
+        !nodeRef.current.contains(e.target)
+      ) {
+        onClose();
+        e.stopPropagation();
+      }
+    },
+    [nodeRef, onClose],
+  );
+
+  const handleClick = useCallback(
+    (
+      e: React.MouseEvent<HTMLLIElement> | React.KeyboardEvent<HTMLLIElement>,
+    ) => {
+      const value = e.currentTarget.getAttribute('data-index');
+
+      e.preventDefault();
+
+      onClose();
+      if (value) onChange(value);
+    },
+    [onClose, onChange],
+  );
+
+  const handleKeyDown = useCallback(
+    (e: React.KeyboardEvent<HTMLLIElement>) => {
+      const value = e.currentTarget.getAttribute('data-index');
+      const index = items.findIndex((item) => item.value === value);
+
+      let element: Element | null | undefined = null;
+
+      switch (e.key) {
+        case 'Escape':
+          onClose();
+          break;
+        case ' ':
+        case 'Enter':
+          handleClick(e);
+          break;
+        case 'ArrowDown':
+          element =
+            nodeRef.current?.children[index + 1] ??
+            nodeRef.current?.firstElementChild;
+          break;
+        case 'ArrowUp':
+          element =
+            nodeRef.current?.children[index - 1] ??
+            nodeRef.current?.lastElementChild;
+          break;
+        case 'Tab':
+          if (e.shiftKey) {
+            element =
+              nodeRef.current?.children[index + 1] ??
+              nodeRef.current?.firstElementChild;
+          } else {
+            element =
+              nodeRef.current?.children[index - 1] ??
+              nodeRef.current?.lastElementChild;
+          }
+          break;
+        case 'Home':
+          element = nodeRef.current?.firstElementChild;
+          break;
+        case 'End':
+          element = nodeRef.current?.lastElementChild;
+          break;
+      }
+
+      if (element && element instanceof HTMLElement) {
+        const selectedValue = element.getAttribute('data-index');
+        element.focus();
+        if (selectedValue) setCurrentValue(selectedValue);
+        e.preventDefault();
+        e.stopPropagation();
+      }
+    },
+    [nodeRef, items, onClose, handleClick, setCurrentValue],
+  );
+
+  useEffect(() => {
+    document.addEventListener('click', handleDocumentClick, { capture: true });
+    document.addEventListener('touchend', handleDocumentClick, listenerOptions);
+    focusedItemRef.current?.focus({ preventScroll: true });
+
+    return () => {
+      document.removeEventListener('click', handleDocumentClick, {
+        capture: true,
+      });
+      document.removeEventListener(
+        'touchend',
+        handleDocumentClick,
+        listenerOptions,
+      );
+    };
+  }, [handleDocumentClick]);
+
+  return (
+    <ul style={style} role='listbox' ref={nodeRef}>
+      {items.map((item) => (
+        <li
+          role='option'
+          tabIndex={0}
+          key={item.value}
+          data-index={item.value}
+          onKeyDown={handleKeyDown}
+          onClick={handleClick}
+          className={classNames(`${classNamePrefix}__option`, {
+            active: item.value === currentValue,
+          })}
+          aria-selected={item.value === currentValue}
+          ref={item.value === currentValue ? focusedItemRef : null}
+        >
+          {item.icon && item.iconComponent && (
+            <div className={`${classNamePrefix}__option__icon`}>
+              <Icon id={item.icon} icon={item.iconComponent} />
+            </div>
+          )}
+
+          <div className={`${classNamePrefix}__option__content`}>
+            <strong>{item.text}</strong>
+            {item.meta}
+          </div>
+
+          {item.extra && (
+            <div
+              className={`${classNamePrefix}__option__additional`}
+              title={item.extra}
+            >
+              <Icon id='info-circle' icon={InfoIcon} />
+            </div>
+          )}
+        </li>
+      ))}
+    </ul>
+  );
+};
diff --git a/app/javascript/mastodon/features/compose/components/privacy_dropdown.jsx b/app/javascript/mastodon/features/compose/components/privacy_dropdown.jsx
index 071f0a6fabf399..f474aecf284932 100644
--- a/app/javascript/mastodon/features/compose/components/privacy_dropdown.jsx
+++ b/app/javascript/mastodon/features/compose/components/privacy_dropdown.jsx
@@ -11,10 +11,9 @@ import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?re
 import LockIcon from '@/material-icons/400-24px/lock.svg?react';
 import PublicIcon from '@/material-icons/400-24px/public.svg?react';
 import QuietTimeIcon from '@/material-icons/400-24px/quiet_time.svg?react';
+import { DropdownSelector } from 'mastodon/components/dropdown_selector';
 import { Icon }  from 'mastodon/components/icon';
 
-import { PrivacyDropdownMenu } from './privacy_dropdown_menu';
-
 const messages = defineMessages({
   public_short: { id: 'privacy.public.short', defaultMessage: 'Public' },
   public_long: { id: 'privacy.public.long', defaultMessage: 'Anyone on and off Mastodon' },
@@ -143,7 +142,7 @@ class PrivacyDropdown extends PureComponent {
           {({ props, placement }) => (
             <div {...props}>
               <div className={`dropdown-animation privacy-dropdown__dropdown ${placement}`}>
-                <PrivacyDropdownMenu
+                <DropdownSelector
                   items={this.options}
                   value={value}
                   onClose={this.handleClose}
diff --git a/app/javascript/mastodon/features/compose/components/privacy_dropdown_menu.jsx b/app/javascript/mastodon/features/compose/components/privacy_dropdown_menu.jsx
deleted file mode 100644
index 1a5ff1fa803b03..00000000000000
--- a/app/javascript/mastodon/features/compose/components/privacy_dropdown_menu.jsx
+++ /dev/null
@@ -1,128 +0,0 @@
-import PropTypes from 'prop-types';
-import { useCallback, useEffect, useRef, useState } from 'react';
-
-import classNames from 'classnames';
-
-import { supportsPassiveEvents } from 'detect-passive-events';
-
-import InfoIcon from '@/material-icons/400-24px/info.svg?react';
-import { Icon } from 'mastodon/components/icon';
-
-const listenerOptions = supportsPassiveEvents ? { passive: true, capture: true } : true;
-
-export const PrivacyDropdownMenu = ({ style, items, value, onClose, onChange }) => {
-  const nodeRef = useRef(null);
-  const focusedItemRef = useRef(null);
-  const [currentValue, setCurrentValue] = useState(value);
-
-  const handleDocumentClick = useCallback((e) => {
-    if (nodeRef.current && !nodeRef.current.contains(e.target)) {
-      onClose();
-      e.stopPropagation();
-    }
-  }, [nodeRef, onClose]);
-
-  const handleClick = useCallback((e) => {
-    const value = e.currentTarget.getAttribute('data-index');
-
-    e.preventDefault();
-
-    onClose();
-    onChange(value);
-  }, [onClose, onChange]);
-
-  const handleKeyDown = useCallback((e) => {
-    const value = e.currentTarget.getAttribute('data-index');
-    const index = items.findIndex(item => (item.value === value));
-
-    let element = null;
-
-    switch (e.key) {
-    case 'Escape':
-      onClose();
-      break;
-    case ' ':
-    case 'Enter':
-      handleClick(e);
-      break;
-    case 'ArrowDown':
-      element = nodeRef.current.childNodes[index + 1] || nodeRef.current.firstChild;
-      break;
-    case 'ArrowUp':
-      element = nodeRef.current.childNodes[index - 1] || nodeRef.current.lastChild;
-      break;
-    case 'Tab':
-      if (e.shiftKey) {
-        element = nodeRef.current.childNodes[index + 1] || nodeRef.current.firstChild;
-      } else {
-        element = nodeRef.current.childNodes[index - 1] || nodeRef.current.lastChild;
-      }
-      break;
-    case 'Home':
-      element = nodeRef.current.firstChild;
-      break;
-    case 'End':
-      element = nodeRef.current.lastChild;
-      break;
-    }
-
-    if (element) {
-      element.focus();
-      setCurrentValue(element.getAttribute('data-index'));
-      e.preventDefault();
-      e.stopPropagation();
-    }
-  }, [nodeRef, items, onClose, handleClick, setCurrentValue]);
-
-  useEffect(() => {
-    document.addEventListener('click', handleDocumentClick, { capture: true });
-    document.addEventListener('touchend', handleDocumentClick, listenerOptions);
-    focusedItemRef.current?.focus({ preventScroll: true });
-
-    return () => {
-      document.removeEventListener('click', handleDocumentClick, { capture: true });
-      document.removeEventListener('touchend', handleDocumentClick, listenerOptions);
-    };
-  }, [handleDocumentClick]);
-
-  return (
-    <ul style={{ ...style }} role='listbox' ref={nodeRef}>
-      {items.map(item => (
-        <li
-          role='option'
-          tabIndex={0}
-          key={item.value}
-          data-index={item.value}
-          onKeyDown={handleKeyDown}
-          onClick={handleClick}
-          className={classNames('privacy-dropdown__option', { active: item.value === currentValue })}
-          aria-selected={item.value === currentValue}
-          ref={item.value === currentValue ? focusedItemRef : null}
-        >
-          <div className='privacy-dropdown__option__icon'>
-            <Icon id={item.icon} icon={item.iconComponent} />
-          </div>
-
-          <div className='privacy-dropdown__option__content'>
-            <strong>{item.text}</strong>
-            {item.meta}
-          </div>
-
-          {item.extra && (
-            <div className='privacy-dropdown__option__additional' title={item.extra}>
-              <Icon id='info-circle' icon={InfoIcon} />
-            </div>
-          )}
-        </li>
-      ))}
-    </ul>
-  );
-};
-
-PrivacyDropdownMenu.propTypes = {
-  style: PropTypes.object,
-  items: PropTypes.array.isRequired,
-  value: PropTypes.string.isRequired,
-  onClose: PropTypes.func.isRequired,
-  onChange: PropTypes.func.isRequired,
-};

From 0e4d3c0403d087d36c9259155d42928651dbb90e Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 8 Aug 2024 13:54:10 +0000
Subject: [PATCH 1756/2191] New Crowdin Translations (automated) (#31337)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/da.json    |  2 +
 app/javascript/mastodon/locales/el.json    | 12 +++++
 app/javascript/mastodon/locales/es-AR.json |  2 +
 app/javascript/mastodon/locales/fi.json    |  2 +
 app/javascript/mastodon/locales/kab.json   | 13 ++++-
 app/javascript/mastodon/locales/ko.json    |  2 +
 app/javascript/mastodon/locales/zh-CN.json |  2 +-
 config/locales/devise.el.yml               |  1 +
 config/locales/doorkeeper.el.yml           |  1 +
 config/locales/el.yml                      | 60 ++++++++++++++++++++++
 10 files changed, 94 insertions(+), 3 deletions(-)

diff --git a/app/javascript/mastodon/locales/da.json b/app/javascript/mastodon/locales/da.json
index 9fcd24b29e0a1e..981ecaa02ed43a 100644
--- a/app/javascript/mastodon/locales/da.json
+++ b/app/javascript/mastodon/locales/da.json
@@ -545,6 +545,8 @@
   "notifications.permission_denied": "Computernotifikationer er utilgængelige grundet tidligere afvist browsertilladelsesanmodning",
   "notifications.permission_denied_alert": "Computernotifikationer kan ikke aktiveres, da browsertilladelse tidligere blev nægtet",
   "notifications.permission_required": "Computernotifikationer er utilgængelige, da den krævede tilladelse ikke er tildelt.",
+  "notifications.policy.filter_limited_accounts_hint": "Begrænset af servermoderatorer",
+  "notifications.policy.filter_limited_accounts_title": "Modererede konti",
   "notifications.policy.filter_new_accounts.hint": "Oprettet indenfor {days, plural, one {den seneste dag} other {de seneste # dage}}",
   "notifications.policy.filter_new_accounts_title": "Ny konti",
   "notifications.policy.filter_not_followers_hint": "Inklusiv personer, som har fulgt dig {days, plural, one {mindre end én dag} other {færre end # dage}}",
diff --git a/app/javascript/mastodon/locales/el.json b/app/javascript/mastodon/locales/el.json
index eab319fdbae5c0..f500bd352d4efa 100644
--- a/app/javascript/mastodon/locales/el.json
+++ b/app/javascript/mastodon/locales/el.json
@@ -11,6 +11,7 @@
   "about.not_available": "Αυτές οι πληροφορίες δεν έχουν είναι διαθέσιμες σε αυτόν τον διακομιστή.",
   "about.powered_by": "Αποκεντρωμένα μέσα κοινωνικής δικτύωσης που βασίζονται στο {mastodon}",
   "about.rules": "Κανόνες διακομιστή",
+  "account.account_note_header": "Προσωπική σημείωση",
   "account.add_or_remove_from_list": "Προσθήκη ή Αφαίρεση από λίστες",
   "account.badges.bot": "Αυτοματοποιημένος",
   "account.badges.group": "Ομάδα",
@@ -170,21 +171,28 @@
   "confirmations.block.confirm": "Αποκλεισμός",
   "confirmations.delete.confirm": "Διαγραφή",
   "confirmations.delete.message": "Σίγουρα θες να διαγράψεις αυτή τη δημοσίευση;",
+  "confirmations.delete.title": "Διαγραφή ανάρτησης;",
   "confirmations.delete_list.confirm": "Διαγραφή",
   "confirmations.delete_list.message": "Σίγουρα θες να διαγράψεις οριστικά αυτή τη λίστα;",
+  "confirmations.delete_list.title": "Διαγραφή λίστας;",
   "confirmations.discard_edit_media.confirm": "Απόρριψη",
   "confirmations.discard_edit_media.message": "Έχεις μη αποθηκευμένες αλλαγές στην περιγραφή πολυμέσων ή στην προεπισκόπηση, απόρριψη ούτως ή άλλως;",
   "confirmations.edit.confirm": "Επεξεργασία",
   "confirmations.edit.message": "Αν το επεξεργαστείς τώρα θα αντικατασταθεί το μήνυμα που συνθέτεις. Είσαι σίγουρος ότι θέλεις να συνεχίσεις;",
+  "confirmations.edit.title": "Αντικατάσταση ανάρτησης;",
   "confirmations.logout.confirm": "Αποσύνδεση",
   "confirmations.logout.message": "Σίγουρα θέλεις να αποσυνδεθείς;",
+  "confirmations.logout.title": "Αποσύνδεση;",
   "confirmations.mute.confirm": "Αποσιώπηση",
   "confirmations.redraft.confirm": "Διαγραφή & ξαναγράψιμο",
   "confirmations.redraft.message": "Σίγουρα θέλεις να σβήσεις αυτή την ανάρτηση και να την ξαναγράψεις; Οι προτιμήσεις και προωθήσεις θα χαθούν και οι απαντήσεις στην αρχική ανάρτηση θα μείνουν ορφανές.",
+  "confirmations.redraft.title": "Διαγραφή & επανασύνταξη;",
   "confirmations.reply.confirm": "Απάντησε",
   "confirmations.reply.message": "Απαντώντας τώρα θα αντικαταστήσεις το κείμενο που ήδη γράφεις. Σίγουρα θέλεις να συνεχίσεις;",
+  "confirmations.reply.title": "Αντικατάσταση ανάρτησης;",
   "confirmations.unfollow.confirm": "Άρση ακολούθησης",
   "confirmations.unfollow.message": "Σίγουρα θες να πάψεις να ακολουθείς τον/την {name};",
+  "confirmations.unfollow.title": "Άρση ακολούθησης;",
   "conversation.delete": "Διαγραφή συζήτησης",
   "conversation.mark_as_read": "Σήμανση ως αναγνωσμένο",
   "conversation.open": "Προβολή συνομιλίας",
@@ -292,6 +300,7 @@
   "filter_modal.select_filter.subtitle": "Χρησιμοποιήστε μια υπάρχουσα κατηγορία ή δημιουργήστε μια νέα",
   "filter_modal.select_filter.title": "Φιλτράρισμα αυτής της ανάρτησης",
   "filter_modal.title.status": "Φιλτράρισμα μιας ανάρτησης",
+  "filtered_notifications_banner.pending_requests": "Από {count, plural, =0 {κανένα} one {ένα άτομο} other {# άτομα}} που μπορεί να ξέρεις",
   "filtered_notifications_banner.title": "Φιλτραρισμένες ειδοποιήσεις",
   "firehose.all": "Όλα",
   "firehose.local": "Αυτός ο διακομιστής",
@@ -496,10 +505,13 @@
   "notification.update": "ο/η {name} επεξεργάστηκε μια ανάρτηση",
   "notification_requests.accept": "Αποδοχή",
   "notification_requests.dismiss": "Απόρριψη",
+  "notification_requests.maximize": "Μεγιστοποίηση",
+  "notification_requests.minimize_banner": "Ελαχιστοποίηση μπάνερ φιλτραρισμένων ειδοποιήσεων",
   "notification_requests.notifications_from": "Ειδοποιήσεις από {name}",
   "notification_requests.title": "Φιλτραρισμένες ειδοποιήσεις",
   "notifications.clear": "Καθαρισμός ειδοποιήσεων",
   "notifications.clear_confirmation": "Σίγουρα θέλεις να καθαρίσεις μόνιμα όλες τις ειδοποιήσεις σου;",
+  "notifications.clear_title": "Εκκαθάριση ειδοποιήσεων;",
   "notifications.column_settings.admin.report": "Νέες αναφορές:",
   "notifications.column_settings.admin.sign_up": "Νέες εγγραφές:",
   "notifications.column_settings.alert": "Ειδοποιήσεις επιφάνειας εργασίας",
diff --git a/app/javascript/mastodon/locales/es-AR.json b/app/javascript/mastodon/locales/es-AR.json
index bf5b1e2248df17..7dcc6eb4959340 100644
--- a/app/javascript/mastodon/locales/es-AR.json
+++ b/app/javascript/mastodon/locales/es-AR.json
@@ -545,6 +545,8 @@
   "notifications.permission_denied": "Las notificaciones de escritorio no están disponibles, debido a una solicitud de permiso del navegador web previamente denegada",
   "notifications.permission_denied_alert": "No se pueden habilitar las notificaciones de escritorio, ya que el permiso del navegador fue denegado antes",
   "notifications.permission_required": "Las notificaciones de escritorio no están disponibles porque no se concedió el permiso requerido.",
+  "notifications.policy.filter_limited_accounts_hint": "Limitada por los moderadores del servidor",
+  "notifications.policy.filter_limited_accounts_title": "Cuentas moderadas",
   "notifications.policy.filter_new_accounts.hint": "Creada hace {days, plural, one {un día} other {# días}}",
   "notifications.policy.filter_new_accounts_title": "Nuevas cuentas",
   "notifications.policy.filter_not_followers_hint": "Incluyendo cuentas que te han estado siguiendo menos de {days, plural, one {un día} other {# días}}",
diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index 5161343d30e7bb..0f70d95e3e6108 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -545,6 +545,8 @@
   "notifications.permission_denied": "Työpöytäilmoitukset eivät ole käytettävissä, koska selaimen käyttöoikeuspyyntö on aiemmin evätty",
   "notifications.permission_denied_alert": "Työpöytäilmoituksia ei voi ottaa käyttöön, koska selaimen käyttöoikeus on aiemmin evätty",
   "notifications.permission_required": "Työpöytäilmoitukset eivät ole käytettävissä, koska siihen tarvittavaa käyttöoikeutta ei ole myönnetty.",
+  "notifications.policy.filter_limited_accounts_hint": "Palvelimen moderaattorien rajoittamat",
+  "notifications.policy.filter_limited_accounts_title": "Moderoidut tilit",
   "notifications.policy.filter_new_accounts.hint": "Luotu {days, plural, one {viime päivän} other {viimeisen # päivän}} aikana",
   "notifications.policy.filter_new_accounts_title": "Uudet tilit",
   "notifications.policy.filter_not_followers_hint": "Mukaan lukien alle {days, plural, one {päivän} other {# päivää}} sinua seuranneet",
diff --git a/app/javascript/mastodon/locales/kab.json b/app/javascript/mastodon/locales/kab.json
index 2c5b24adb6690d..0cf2fbcdb49ed7 100644
--- a/app/javascript/mastodon/locales/kab.json
+++ b/app/javascript/mastodon/locales/kab.json
@@ -75,8 +75,9 @@
   "block_modal.show_less": "Ssken-d drus",
   "block_modal.show_more": "Ssken-d ugar",
   "block_modal.they_cant_mention": "Ur zmiren ad k·m-id-bedren, ur zmiren ad k·m-ḍefren.",
-  "block_modal.they_cant_see_posts": "Ur zmiren ad walin tisufaɣ-nwen, ur tettwalim tid-nsen.",
+  "block_modal.they_cant_see_posts": "Ur yezmir ad wali tisuffaɣ-ik·im, ur tettwaliḍ tidak-is.",
   "block_modal.title": "Sewḥel aseqdac ?",
+  "block_modal.you_wont_see_mentions": "Ur tezmireḍ ara ad twaliḍ tisuffaɣ anda d-yettwabdar.",
   "boost_modal.combo": "Tzemreḍ ad tsiteḍ ɣef {combo} akken ad tzegleḍ aya tikelt i d-iteddun",
   "bundle_column_error.copy_stacktrace": "Nɣel tuccḍa n uneqqis",
   "bundle_column_error.error.title": "Uh, ala !",
@@ -176,7 +177,9 @@
   "dismissable_banner.explore_tags": "D wiyi i d ihacṭagen i d-yettawin tamyigawt deg web anmetti ass-a. Ihacṭagen i sseqdacen ugar n medden, εlayit d imezwura.",
   "domain_block_modal.block": "Sewḥel aqeddac",
   "domain_block_modal.they_cant_follow": "Yiwen ur yezmir ad k·m-id-yeḍfer seg uqeddac-a.",
+  "domain_block_modal.they_wont_know": "Ur-d yettawi ara s lexbaṛ belli yettuseḥbes.",
   "domain_block_modal.title": "Sewḥel taɣult?",
+  "domain_block_modal.you_wont_see_posts": "Ur tettuɣaleḍ ara ttwaliḍ tisuffaɣ neɣ ulɣuten n iseqdacen n uqeddac-a.",
   "domain_pill.activitypub_like_language": "ActivityPub am tutlayt yettmeslay Mastodon d izeḍwan inmettiyen nniḍen.",
   "domain_pill.server": "Aqeddac",
   "domain_pill.username": "Isem n useqdac",
@@ -348,9 +351,15 @@
   "load_pending": "{count, plural, one {# n uferdis amaynut} other {# n yiferdisen imaynuten}}",
   "loading_indicator.label": "Yessalay-d …",
   "media_gallery.toggle_visible": "{number, plural, one {Ffer tugna} other {Ffer tugniwin}}",
+  "mute_modal.hide_from_notifications": "Ffer-it deg ulɣuten",
   "mute_modal.hide_options": "Ffer tinefrunin",
+  "mute_modal.indefinite": "Alamma ssnesreɣ asgugem fell-as",
   "mute_modal.show_options": "Sken-d tinefrunin",
-  "mute_modal.title": "Sgugem aseqdac?",
+  "mute_modal.they_can_mention_and_follow": "Yezmer ad k·m-id-yebder, ad k·m-yeḍfer, maca ur t-tettwaliḍt ara.",
+  "mute_modal.they_wont_know": "Ur yezmir ara ad iẓer dakken tesgugmeṭ.",
+  "mute_modal.title": "Asgugem n useqdac?",
+  "mute_modal.you_wont_see_mentions": "Ur tezmireḍ ara ad twaliḍ tisuffaɣ anda d-yettwabdar.",
+  "mute_modal.you_wont_see_posts": "Yezmer ad yettwali tisuffaɣ-ik·im, maca ur tettwaliḍ ara tidak-is.",
   "navigation_bar.about": "Ɣef",
   "navigation_bar.advanced_interface": "Ldi deg ugrudem n web leqqayen",
   "navigation_bar.blocks": "Iseqdacen yettusḥebsen",
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index 5700e174668a79..56d0dda7ec9c16 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -545,6 +545,8 @@
   "notifications.permission_denied": "권한이 거부되었기 때문에 데스크탑 알림을 활성화할 수 없음",
   "notifications.permission_denied_alert": "이전에 브라우저 권한이 거부되었기 때문에, 데스크탑 알림이 활성화 될 수 없습니다.",
   "notifications.permission_required": "필요한 권한이 승인되지 않아 데스크탑 알림을 사용할 수 없습니다.",
+  "notifications.policy.filter_limited_accounts_hint": "서버 중재자에 의해 제한됨",
+  "notifications.policy.filter_limited_accounts_title": "중재된 계정",
   "notifications.policy.filter_new_accounts.hint": "{days, plural, one {하루} other {#일}} 안에 만들어진",
   "notifications.policy.filter_new_accounts_title": "새 계정",
   "notifications.policy.filter_not_followers_hint": "나를 팔로우 한 지 {days, plural, other {# 일}}이 되지 않은 사람들을 포함",
diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json
index e0c11010a25dac..5b7116a2b668ba 100644
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@@ -610,7 +610,7 @@
   "poll_button.remove_poll": "移除投票",
   "privacy.change": "设置嘟文的可见范围",
   "privacy.direct.long": "帖子中提到的每个人",
-  "privacy.direct.short": "具体的人",
+  "privacy.direct.short": "特定的人",
   "privacy.private.long": "仅限您的关注者",
   "privacy.private.short": "关注者",
   "privacy.public.long": "所有 Mastodon 内外的人",
diff --git a/config/locales/devise.el.yml b/config/locales/devise.el.yml
index 52674dc8493994..209dfe5bdf8ae2 100644
--- a/config/locales/devise.el.yml
+++ b/config/locales/devise.el.yml
@@ -12,6 +12,7 @@ el:
       last_attempt: Έχεις μια ακόμα προσπάθεια πριν κλειδωθεί ο λογαριασμός σου.
       locked: Ο λογαριασμός σου κλειδώθηκε.
       not_found_in_database: Λάθος %{authentication_keys} ή συνθηματικό.
+      omniauth_user_creation_failure: Σφάλμα δημιουργίας λογαριασμού για αυτήν την ταυτότητα.
       pending: Εκκρεμεί η έγκριση του λογαριασμού σου.
       timeout: Η τρέχουσα σύνδεσή σου έληξε. Παρακαλούμε συνδέσου ξανά για να συνεχίσεις.
       unauthenticated: Πρέπει να συνδεθείς ή να εγγραφείς για να συνεχίσεις.
diff --git a/config/locales/doorkeeper.el.yml b/config/locales/doorkeeper.el.yml
index 167cc6bd44e99b..7fcd69c2384b53 100644
--- a/config/locales/doorkeeper.el.yml
+++ b/config/locales/doorkeeper.el.yml
@@ -83,6 +83,7 @@ el:
         access_denied: Ο ιδιοκτήτης του πόρου ή του παρόχου έγκρισης απέρριψε το αίτημα.
         credential_flow_not_configured: Η ροή Resource Owner Password Credentials απέτυχε επειδή το Doorkeeper.configure.resource_owner_from_credentials δεν έχει ρυθμιστεί.
         invalid_client: Η ταυτοποίηση του πελάτη απέτυχε είτε λόγω άγνωστου πελάτη, είτε λόγω έλλειψης ταυτοποιημένου πελάτη ή λόγω μη υποστηριζόμενης μεθόδου ταυτοποίησης.
+        invalid_code_challenge_method: Η μέθοδος πρόκλησης κώδικα πρέπει να είναι S256, το απλό δεν υποστηρίζεται.
         invalid_grant: Η άδεια πιστοποίησης που δόθηκε είναι άκυρη, ληγμένη, έχει ανακληθεί, δεν συμφωνεί με το URI ανακατεύθυνσης που δόθηκε στο αίτημα πιστοποίησης ή εκδόθηκε προς άλλο πελάτη.
         invalid_redirect_uri: Το uri ανακατεύθυνσης που δόθηκε δεν είναι έγκυρο.
         invalid_request:
diff --git a/config/locales/el.yml b/config/locales/el.yml
index e177bf342afc75..009e1f82edffc9 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -286,6 +286,7 @@ el:
         update_custom_emoji_html: Ο/Η %{name} ενημέρωσε το emoji %{target}
         update_domain_block_html: Ο/Η %{name} ενημέρωσε τον αποκλεισμό τομέα για %{target}
         update_ip_block_html: Ο/Η %{name} άλλαξε τον κανόνα για την IP %{target}
+        update_report_html: Ο χρήστης %{name} ενημέρωσε την αναφορά %{target}
         update_status_html: Ο/Η %{name} ενημέρωσε την ανάρτηση του/της %{target}
         update_user_role_html: Ο/Η %{name} άλλαξε τον ρόλο %{target}
       deleted_account: διαγεγραμμένος λογαριασμός
@@ -293,6 +294,7 @@ el:
       filter_by_action: Φιλτράρισμα ανά ενέργεια
       filter_by_user: Φιλτράρισμα ανά χρήστη
       title: Αρχείο ελέγχου
+      unavailable_instance: "(μη διαθέσιμο όνομα τομέα)"
     announcements:
       destroyed_msg: Επιτυχής διαγραφή ανακοίνωσης!
       edit:
@@ -469,6 +471,9 @@ el:
       title: Ακολούθησε τις προτάσεις
       unsuppress: Επαναφορά των συστάσεων ακολούθησης
     instances:
+      audit_log:
+        title: Πρόσφατα Αρχεία Ελέγχου
+        view_all: Δείτε πλήρη αρχεία καταγραφής ελέγχων
       availability:
         description_html:
           one: Εάν η παράδοση στον τομέα αποτύχει για <strong>%{count} ημέρα</strong>, δεν θα γίνουν περαιτέρω προσπάθειες παράδοσης εκτός αν μια παράδοση <em>από</em> τον τομέα ληφθεί.
@@ -598,6 +603,9 @@ el:
       actions_description_html: Αποφάσισε ποια μέτρα θα ληφθούν για την επίλυση αυτής της αναφοράς. Εάν προβείς σε τιμωρητική ενέργεια κατά του αναφερόμενου λογαριασμού, θα αποσταλεί ειδοποίηση μέσω ηλεκτρονικού ταχυδρομείου σε αυτόν, εκτός όταν η κατηγορία <strong>Σπαμ</strong> είναι επιλεγμένη.
       actions_description_remote_html: Αποφάσισε ποια μέτρα θα ληφθούν για την επίλυση αυτής της αναφοράς. Αυτό θα επηρεάσει μόνο το πώς <strong>ο δικός σας</strong> διακομιστής επικοινωνεί με αυτόν τον απομακρυσμένο λογαριασμό και χειρίζεται το περιεχόμενό του.
       add_to_report: Πρόσθεσε περισσότερα στην αναφορά
+      already_suspended_badges:
+        local: Ήδη σε αναστολή σε αυτόν τον διακομιστή
+        remote: Ήδη σε αναστολή στο διακομιστή του
       are_you_sure: Σίγουρα;
       assign_to_self: Ανάθεση σε μένα
       assigned: Αρμόδιος συντονιστής
@@ -634,6 +642,7 @@ el:
       report: 'Αναφορά #%{id}'
       reported_account: Αναφερόμενος λογαριασμός
       reported_by: Αναφέρθηκε από
+      reported_with_application: Αναφέρθηκε με την εφαρμογή
       resolved: Επιλύθηκε
       resolved_msg: Η αναφορά επιλύθηκε επιτυχώς!
       skip_to_actions: Μετάβαση στις ενέργειες
@@ -745,7 +754,11 @@ el:
       branding:
         preamble: Η ταυτότητα του διακομιστή σου, τον διαφοροποιεί από άλλους διακομιστές του δικτύου. Αυτές οι πληροφορίες μπορεί να εμφανίζονται σε διάφορα περιβάλλοντα, όπως η ιστοσελίδα του Mastodon, εγγενείς εφαρμογές, σε προεπισκοπήσεις συνδέσμου σε άλλους ιστότοπους και εντός εφαρμογών μηνυμάτων και ούτω καθεξής. Γι' αυτό, είναι καλύτερο να διατηρούνται αυτές οι πληροφορίες σαφείς, σύντομες και συνοπτικές.
         title: Ταυτότητα
+      captcha_enabled:
+        desc_html: Αυτό βασίζεται σε εξωτερικά scripts από το hCaptcha, όπου υπάρχει ανησυχία πέρι ασφάλειας και ιδιωτηκότητας. Επιπρόσθετα, <strong> μπορεί να κάνει τη διαδικασία εγγραφής πολύ λιγότερο προσβάσιμη για κάποια άτομα (ειδικά αυτά με αναπηρίες)</strong>. Για αυτούς τους λόγους, παρακαλώ σκέψου άλλου τρόπους εγγραφής όπως με αποδοχή ή με πρόσκληση.
+        title: Απαιτείται από νέους χρήστες να λύσουν ένα CAPTCHA για να επιβεβαιώσουν τον λογαριασμό τους
       content_retention:
+        danger_zone: Επικίνδυνη Ζώνη
         preamble: Έλεγξε πώς αποθηκεύεται το περιεχόμενο που δημιουργείται από τους χρήστες στο Mastodon.
         title: Διατήρηση περιεχομένου
       default_noindex:
@@ -765,6 +778,7 @@ el:
         disabled: Για κανέναν
         users: Προς συνδεδεμένους τοπικούς χρήστες
       registrations:
+        moderation_recommandation: Παρακαλώ βεβαιώσου ότι έχεις μια επαρκής και ενεργή ομάδα συντονισμού πριν ανοίξεις τις εγγραφές για όλους!
         preamble: Έλεγξε ποιος μπορεί να δημιουργήσει ένα λογαριασμό στον διακομιστή σας.
         title: Εγγραφές
       registrations_mode:
@@ -772,9 +786,28 @@ el:
           approved: Απαιτείται έγκριση για εγγραφή
           none: Δεν μπορεί να εγγραφεί κανείς
           open: Μπορεί να εγγραφεί ο οποιοσδήποτε
+        warning_hint: Προτείνουμε τη χρήση του "Απαιτείται έγκριση για εγγραφή" εκτός αν ξέρεις ότι η ομάδα συντονισμού σου μπορεί να διαχειριστεί τις κακόβουλες και σπαμ εγγραφές σε εύλογο χρονικό διάστημα.
+      security:
+        authorized_fetch: Απαίτηση ταυτόποιησης από διακομιστές σε ομοσπονδία
+        authorized_fetch_hint: Η απαίτηση ελέγχου ταυτότητας από ομοσπονδιακούς διακομιστές επιτρέπει την αυστηρότερη επιβολή αποκλεισμού τόσο σε επίπεδο χρήστη όσο και σε επίπεδο διακομιστή. Ωστόσο, αυτό έχει το κόστος στην απόδοσης μειώνει την εμβέλεια των απαντήσεών σας και μπορεί να δημιουργήσει προβλήματα συμβατότητας με ορισμένες ομοσπονδιακές υπηρεσίες. Επιπλέον, αυτό δεν θα εμποδίσει τους αφοσιωμένους ηθοποιούς να ανακτήσουν τις δημόσιες αναρτήσεις και τους λογαριασμούς σας.
+        authorized_fetch_overridden_hint: Προς το παρόν, δε μπορείς να αλλάξεις αυτή την ρύθμιση επειδή παρακάμπτεται από μια μεταβλητή περιβάλλοντος.
+        federation_authentication: Επιβολή ομοσπονδιακής ταυτοποίησης
+      title: Ρυθμίσεις διακομιστή
     site_uploads:
       delete: Διαγραφή μεταφορτωμένου αρχείου
       destroyed_msg: Η μεταφόρτωση ιστότοπου διαγράφηκε επιτυχώς!
+    software_updates:
+      critical_update: Κρίσιμο - παρακαλώ ενημέρωσε γρήγορα
+      description: Συνιστάται να διατηρείς την εγκατάσταση του Mastodon ενημερωμένη για να επωφεληθείς από τις πιο πρόσφατες διορθώσεις και δυνατότητες. Επιπλέον, μερικές φορές είναι κρίσιμο να ενημερώσεις το Mastodon εγκαίρως για να αποφύγεις προβλήματα ασφαλείας. Για αυτούς τους λόγους, το Mastodon ελέγχει για ενημερώσεις κάθε 30 λεπτά και θα σας ειδοποιεί σύμφωνα με τις προτιμήσεις ειδοποίησης μέσω email.
+      documentation_link: Μάθε περισσότερα
+      release_notes: Σημειώσεις έκδοσης
+      title: Διαθέσιμες ενημερώσεις
+      type: Τύπος
+      types:
+        major: Κύρια έκδοση
+        minor: Τυπική ενημέρωση
+        patch: Ενημέρωση επιδιόρθωσης - διορθώσεις σφαλμάτων και εύκολα εφαρμόσιμες αλλαγές
+      version: Έκδοση
     statuses:
       account: Συντάκτης
       application: Εφαρμογή
@@ -815,6 +848,20 @@ el:
     system_checks:
       database_schema_check:
         message_html: Υπάρχουν μετακινήσεις βάσεων δεδομένων που εκκρεμούν. Παρακαλώ εκτέλεσέ τες για να βεβαιωθείς ότι η εφαρμογή συμπεριφέρεται όπως αναμένεται
+      elasticsearch_health_red:
+        message_html: Το σύμπλεγμα Elasticsearch δεν είναι υγιές (κόκκινη κατάσταση), μη διαθέσιμες δυνατότητες αναζήτησης
+      elasticsearch_health_yellow:
+        message_html: Το σύμπλεγμα Elasticsearch δεν είναι υγιές (κίτρινη κατάσταση), ίσως θες να διαπιστώσεις την αιτία
+      elasticsearch_index_mismatch:
+        message_html: Οι αντιστοιχές δείκτη του Elasticsearch δεν είναι ενημερωμένες. Παρακαλώ εκτέλεσε το <code>tootctl search deploy --only=%{value}</code>
+      elasticsearch_preset:
+        action: Δες το εγχειρίδιο
+        message_html: Το σύμπλεγμα Elasticsearch σου, έχει παραπάνω από ένα κόμβο, το Mastodon δεν είναι ρυθμισμένο για να τους χρησιμοποιεί.
+      elasticsearch_preset_single_node:
+        action: Δες το εγχειρίδιο
+        message_html: Το σύμπλεγμα Elasticsearch σου έχει μόνο ένα κόμβο, το <code>ES_PRESET</code> πρέπει να οριστεί ως <code>single_node_cluster</code>.
+      elasticsearch_reset_chewy:
+        message_html: Ο δείκτης του συστήματος Elasticsearch είναι ξεπερασμένος λόγω μιας αλλαγής ρύθμισης. Παρακαλώ εκτέλεσε <code>tootctl search deploy --reset-chewy</code> για να τον ενημερώσεις.
       elasticsearch_running_check:
         message_html: Δεν ήταν δυνατή η σύνδεση στο Elasticsearch. Παρακαλώ έλεγξε ότι εκτελείται ή απενεργοποίησε την αναζήτηση πλήρους κειμένου
       elasticsearch_version_check:
@@ -825,6 +872,12 @@ el:
         message_html: Δεν έχεις ορίσει κανέναν κανόνα διακομιστή.
       sidekiq_process_check:
         message_html: Καμία διεργασία Sidekiq δεν εκτελείται για την ουρά %{value}. Παρακαλώ έλεγξε τη διαμόρφωση του Sidekiq
+      software_version_critical_check:
+        action: Δες τις διαθέσιμες ενημερώσεις
+        message_html: Μια κρίσιμη ενημέρωση του Mastodon είναι διαθέσιμη, παρακαλώ ενήμερωσε το συντομότερο δυνατόν.
+      software_version_patch_check:
+        action: Δες τις διαθέσιμες ενημερώσεις
+        message_html: Μια ενημέρωση διόρθωσης σφαλμάτων του Mastodon είναι διαθέσιμη.
       upload_check_privacy_error:
         action: Δες εδώ για περισσότερες πληροφορίες
         message_html: "<strong>Ο διακομιστής σας δεν έχει ρυθμιστεί σωστά. Το απόρρητο των χρηστών σας κινδυνεύει.</strong>"
@@ -832,6 +885,13 @@ el:
         action: Δες εδώ για περισσότερες πληροφορίες
         message_html: "<strong>Ο χώρος αποθήκευσης αντικειμένων σου δεν έχει ρυθμιστεί σωστά. Το απόρρητο των χρηστών σου κινδυνεύει.</strong>"
     tags:
+      moderation:
+        not_trendable: Δε δημιουργεί τάσεις
+        not_usable: Μη χρησιμοποιήσιμη
+        pending_review: Εκκρεμεί αξιολόγηση
+        review_requested: Αιτήθηκε αξιολόγηση
+        reviewed: Αξιολογήθηκε
+        title: Κατάσταση
       review: Κατάσταση αξιολόγησης
       updated_msg: Οι ρυθμίσεις των ετικετών ενημερώθηκαν επιτυχώς
     title: Διαχείριση

From 079d681ac6f279f3a7a6be5c3734549f3be8f912 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 8 Aug 2024 19:00:05 +0200
Subject: [PATCH 1757/2191] Fix uninitialized grouped notifications read marker
 on initial load (#31347)

---
 app/javascript/mastodon/reducers/notification_groups.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/reducers/notification_groups.ts b/app/javascript/mastodon/reducers/notification_groups.ts
index 3a360232112f38..871f50364b3b00 100644
--- a/app/javascript/mastodon/reducers/notification_groups.ts
+++ b/app/javascript/mastodon/reducers/notification_groups.ts
@@ -474,8 +474,11 @@ export const notificationGroupsReducer = createReducer<NotificationGroupsState>(
             state.lastReadId,
             action.payload.markers.notifications.last_read_id,
           ) < 0
-        )
+        ) {
           state.lastReadId = action.payload.markers.notifications.last_read_id;
+          state.readMarkerId =
+            action.payload.markers.notifications.last_read_id;
+        }
       })
       .addCase(mountNotifications, (state) => {
         state.mounted += 1;

From 664bef35730542791c44c739b8f39e37d7baddd3 Mon Sep 17 00:00:00 2001
From: Michael Stanclift <mx@vmstan.com>
Date: Thu, 8 Aug 2024 12:31:06 -0500
Subject: [PATCH 1758/2191] Fix styling issues with notification settings and
 mobile borders (#31346)

---
 .../styles/mastodon-light/diff.scss           |  6 ---
 .../styles/mastodon-light/variables.scss      |  2 +-
 .../styles/mastodon/components.scss           | 15 ++++++++
 .../styles/mastodon/emoji_picker.scss         |  5 ---
 app/javascript/styles/mastodon/reset.scss     | 37 -------------------
 5 files changed, 16 insertions(+), 49 deletions(-)

diff --git a/app/javascript/styles/mastodon-light/diff.scss b/app/javascript/styles/mastodon-light/diff.scss
index 5684a99e519727..b28ae8860cf249 100644
--- a/app/javascript/styles/mastodon-light/diff.scss
+++ b/app/javascript/styles/mastodon-light/diff.scss
@@ -214,12 +214,6 @@ html {
   border-top-color: lighten($ui-base-color, 8%);
 }
 
-.column-header__collapsible-inner {
-  background: darken($ui-base-color, 4%);
-  border: 1px solid var(--background-border-color);
-  border-bottom: 0;
-}
-
 .column-settings__hashtags .column-select__option {
   color: $white;
 }
diff --git a/app/javascript/styles/mastodon-light/variables.scss b/app/javascript/styles/mastodon-light/variables.scss
index 9f571b3f2600b9..9d4fd60945a7d5 100644
--- a/app/javascript/styles/mastodon-light/variables.scss
+++ b/app/javascript/styles/mastodon-light/variables.scss
@@ -21,7 +21,7 @@ $valid-value-color: $success-green !default;
 
 $ui-base-color: $classic-secondary-color !default;
 $ui-base-lighter-color: #b0c0cf;
-$ui-primary-color: #9bcbed;
+$ui-primary-color: $classic-primary-color !default;
 $ui-secondary-color: $classic-base-color !default;
 $ui-highlight-color: $classic-highlight-color !default;
 
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 2b1ae6e14f3f28..67e47460b543be 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -2779,6 +2779,11 @@ $ui-header-logo-wordmark-width: 99px;
     &.privacy-policy {
       border-top: 1px solid var(--background-border-color);
       border-radius: 4px;
+
+      @media screen and (max-width: $no-gap-breakpoint) {
+        border-top: 0;
+        border-bottom: 0;
+      }
     }
   }
 }
@@ -4472,6 +4477,11 @@ a.status-card {
 .column-header__collapsible-inner {
   border: 1px solid var(--background-border-color);
   border-top: 0;
+
+  @media screen and (max-width: $no-gap-breakpoint) {
+    border-left: 0;
+    border-right: 0;
+  }
 }
 
 .column-header__setting-btn {
@@ -7657,6 +7667,11 @@ noscript {
       width: 100%;
     }
   }
+
+  @media screen and (max-width: $no-gap-breakpoint) {
+    border-left: 0;
+    border-right: 0;
+  }
 }
 
 .drawer__backdrop {
diff --git a/app/javascript/styles/mastodon/emoji_picker.scss b/app/javascript/styles/mastodon/emoji_picker.scss
index 3652ad4abbbbaf..68e016d44b877a 100644
--- a/app/javascript/styles/mastodon/emoji_picker.scss
+++ b/app/javascript/styles/mastodon/emoji_picker.scss
@@ -83,11 +83,6 @@
   max-height: 35vh;
   padding: 0 6px 6px;
   will-change: transform;
-
-  &::-webkit-scrollbar-track:hover,
-  &::-webkit-scrollbar-track:active {
-    background-color: rgba($base-overlay-background, 0.3);
-  }
 }
 
 .emoji-mart-search {
diff --git a/app/javascript/styles/mastodon/reset.scss b/app/javascript/styles/mastodon/reset.scss
index f54ed5bc79b1a7..903b6c804fcf50 100644
--- a/app/javascript/styles/mastodon/reset.scss
+++ b/app/javascript/styles/mastodon/reset.scss
@@ -56,40 +56,3 @@ table {
 html {
   scrollbar-color: lighten($ui-base-color, 4%) rgba($base-overlay-background, 0.1);
 }
-
-::-webkit-scrollbar {
-  width: 12px;
-  height: 12px;
-}
-
-::-webkit-scrollbar-thumb {
-  background: lighten($ui-base-color, 4%);
-  border: 0px none $base-border-color;
-  border-radius: 50px;
-}
-
-::-webkit-scrollbar-thumb:hover {
-  background: lighten($ui-base-color, 6%);
-}
-
-::-webkit-scrollbar-thumb:active {
-  background: lighten($ui-base-color, 4%);
-}
-
-::-webkit-scrollbar-track {
-  border: 0px none $base-border-color;
-  border-radius: 0;
-  background: rgba($base-overlay-background, 0.1);
-}
-
-::-webkit-scrollbar-track:hover {
-  background: $ui-base-color;
-}
-
-::-webkit-scrollbar-track:active {
-  background: $ui-base-color;
-}
-
-::-webkit-scrollbar-corner {
-  background: transparent;
-}

From 15dc195029e4a39b31c9f2832bccd0a604a02962 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 23 Apr 2024 12:43:49 -0400
Subject: [PATCH 1759/2191] [Glitch] Add material design icons to
 admin/settings views

Port 32ead51e5a8d6abbc0b4bacb00192ddc72a9817a to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/styles/admin.scss | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/javascript/flavours/glitch/styles/admin.scss b/app/javascript/flavours/glitch/styles/admin.scss
index 110d5f249d7f94..963a9b2c4d048b 100644
--- a/app/javascript/flavours/glitch/styles/admin.scss
+++ b/app/javascript/flavours/glitch/styles/admin.scss
@@ -10,6 +10,13 @@ $content-width: 840px;
   width: 100%;
   min-height: 100vh;
 
+  .icon {
+    width: 16px;
+    height: 16px;
+    vertical-align: middle;
+    margin: 0 2px;
+  }
+
   .sidebar-wrapper {
     min-height: 100vh;
     overflow: hidden;

From 48e4c57905f835ba86a42165e20374d4a430fb2b Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 7 Aug 2024 19:08:36 -0400
Subject: [PATCH 1760/2191] [Glitch] Replace more `font-awesome` icons in
 `views/admin` area

Port 84c3cc4e5bf3c148982231222baab9ccfcc107b3 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/styles/admin.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/flavours/glitch/styles/admin.scss b/app/javascript/flavours/glitch/styles/admin.scss
index 963a9b2c4d048b..08c0a08be368d5 100644
--- a/app/javascript/flavours/glitch/styles/admin.scss
+++ b/app/javascript/flavours/glitch/styles/admin.scss
@@ -13,7 +13,7 @@ $content-width: 840px;
   .icon {
     width: 16px;
     height: 16px;
-    vertical-align: middle;
+    vertical-align: top;
     margin: 0 2px;
   }
 

From ca6ad45121ab78a15f54567ce22ed77d057b7f90 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 8 Aug 2024 01:09:30 +0200
Subject: [PATCH 1761/2191] [Glitch] Add unchangeable filtered notification
 setting for limited accounts

Port f8629367d2cbb6495bb81d5357611e3759dbf35a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../components/policy_controls.tsx             | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/app/javascript/flavours/glitch/features/notifications/components/policy_controls.tsx b/app/javascript/flavours/glitch/features/notifications/components/policy_controls.tsx
index 58eff3fbcf2d5c..5982db29239ba4 100644
--- a/app/javascript/flavours/glitch/features/notifications/components/policy_controls.tsx
+++ b/app/javascript/flavours/glitch/features/notifications/components/policy_controls.tsx
@@ -7,6 +7,9 @@ import { useAppSelector, useAppDispatch } from 'flavours/glitch/store';
 
 import { CheckboxWithLabel } from './checkbox_with_label';
 
+// eslint-disable-next-line @typescript-eslint/no-empty-function
+const noop = () => {};
+
 export const PolicyControls: React.FC = () => {
   const dispatch = useAppDispatch();
 
@@ -135,6 +138,21 @@ export const PolicyControls: React.FC = () => {
             />
           </span>
         </CheckboxWithLabel>
+
+        <CheckboxWithLabel checked disabled onChange={noop}>
+          <strong>
+            <FormattedMessage
+              id='notifications.policy.filter_limited_accounts_title'
+              defaultMessage='Moderated accounts'
+            />
+          </strong>
+          <span className='hint'>
+            <FormattedMessage
+              id='notifications.policy.filter_limited_accounts_hint'
+              defaultMessage='Limited by server moderators'
+            />
+          </span>
+        </CheckboxWithLabel>
       </div>
     </section>
   );

From 3ef5adc526daab6815462fbf93e7015ca4184543 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 8 Aug 2024 11:16:33 +0200
Subject: [PATCH 1762/2191] [Glitch] Add explainer for filtered notifications
 from limited accounts

Port ac9040b76b22212865df932936ee62d7ab9a9adb to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../glitch/features/notifications/request.jsx | 20 ++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/app/javascript/flavours/glitch/features/notifications/request.jsx b/app/javascript/flavours/glitch/features/notifications/request.jsx
index b95533aa3638f5..3dd186f2bfa753 100644
--- a/app/javascript/flavours/glitch/features/notifications/request.jsx
+++ b/app/javascript/flavours/glitch/features/notifications/request.jsx
@@ -1,7 +1,7 @@
 import PropTypes from 'prop-types';
 import { useRef, useCallback, useEffect } from 'react';
 
-import { defineMessages, useIntl } from 'react-intl';
+import { defineMessages, useIntl, FormattedMessage } from 'react-intl';
 
 import { Helmet } from 'react-helmet';
 
@@ -90,6 +90,23 @@ export const NotificationRequest = ({ multiColumn, params: { id } }) => {
 
   const columnTitle = intl.formatMessage(messages.title, { name: account?.get('display_name') || account?.get('username') });
 
+  let explainer = null;
+
+  if (account?.limited) {
+    const isLocal = account.acct.indexOf('@') === -1;
+    explainer = (
+      <div className='dismissable-banner'>
+        <div className='dismissable-banner__message'>
+          {isLocal ? (
+            <FormattedMessage id='notification_requests.explainer_for_limited_account' defaultMessage='Notifications from this account have been filtered because the account has been limited by a moderator.' />
+          ) : (
+            <FormattedMessage id='notification_requests.explainer_for_limited_remote_account' defaultMessage='Notifications from this account have been filtered because the account or its server has been limited by a moderator.' />
+          )}
+        </div>
+      </div>
+    );
+  }
+
   return (
     <Column bindToDocument={!multiColumn} ref={columnRef} label={columnTitle}>
       <ColumnHeader
@@ -109,6 +126,7 @@ export const NotificationRequest = ({ multiColumn, params: { id } }) => {
 
       <SensitiveMediaContextProvider hideMediaByDefault>
         <ScrollableList
+          prepend={explainer}
           scrollKey={`notification_requests/${id}`}
           trackScroll={!multiColumn}
           bindToDocument={!multiColumn}

From e01f4378e115d9a90d39fe9c5e5c488ce66021f0 Mon Sep 17 00:00:00 2001
From: Michael Stanclift <mx@vmstan.com>
Date: Thu, 8 Aug 2024 04:21:54 -0500
Subject: [PATCH 1763/2191] [Glitch] Follow up tweaking of admin UI changes
 part 2

Port 176ba984d4812717c5cad5fcd7d5bcbb8ece0f2a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/styles/_mixins.scss  |  2 +-
 .../flavours/glitch/styles/components.scss          |  2 +-
 app/javascript/flavours/glitch/styles/forms.scss    | 13 +------------
 .../flavours/glitch/styles/mastodon-light/diff.scss |  2 +-
 app/javascript/flavours/glitch/styles/rtl.scss      | 10 ----------
 app/javascript/flavours/glitch/styles/tables.scss   |  4 ++--
 app/javascript/flavours/glitch/styles/widgets.scss  |  2 +-
 7 files changed, 7 insertions(+), 28 deletions(-)

diff --git a/app/javascript/flavours/glitch/styles/_mixins.scss b/app/javascript/flavours/glitch/styles/_mixins.scss
index 444d2e01609641..f139bef21b5ef1 100644
--- a/app/javascript/flavours/glitch/styles/_mixins.scss
+++ b/app/javascript/flavours/glitch/styles/_mixins.scss
@@ -17,7 +17,7 @@
   background: $ui-base-color;
   color: $darker-text-color;
   border-radius: 4px;
-  border: 1px solid lighten($ui-base-color, 8%);
+  border: 1px solid var(--background-border-color);
   font-size: 17px;
   line-height: normal;
   margin: 0;
diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index b8647cd559fe1b..306e25443ff542 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -403,7 +403,7 @@ body > [data-popper-placement] {
   &__suggestions {
     box-shadow: var(--dropdown-shadow);
     background: $ui-base-color;
-    border: 1px solid lighten($ui-base-color, 14%);
+    border: 1px solid var(--background-border-color);
     border-radius: 0 0 4px 4px;
     color: $secondary-text-color;
     font-size: 14px;
diff --git a/app/javascript/flavours/glitch/styles/forms.scss b/app/javascript/flavours/glitch/styles/forms.scss
index 4877170275f470..d206af1f189e3a 100644
--- a/app/javascript/flavours/glitch/styles/forms.scss
+++ b/app/javascript/flavours/glitch/styles/forms.scss
@@ -442,11 +442,6 @@ code {
     border-radius: 4px;
     padding: 10px 16px;
 
-    &::placeholder {
-      color: $dark-text-color;
-      opacity: 1;
-    }
-
     &:invalid {
       box-shadow: none;
     }
@@ -608,8 +603,7 @@ code {
       inset-inline-end: 3px;
       top: 1px;
       padding: 10px;
-      padding-bottom: 9px;
-      font-size: 16px;
+      font-size: 14px;
       color: $dark-text-color;
       font-family: inherit;
       pointer-events: none;
@@ -626,11 +620,6 @@ code {
         inset-inline-end: 0;
         bottom: 1px;
         width: 5px;
-        background-image: linear-gradient(
-          to right,
-          rgba(darken($ui-base-color, 10%), 0),
-          darken($ui-base-color, 10%)
-        );
       }
     }
   }
diff --git a/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss b/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss
index e97b40d3f744f4..73ec36c1b68bf8 100644
--- a/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss
+++ b/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss
@@ -559,11 +559,11 @@ html {
 
 .compose-form .autosuggest-textarea__textarea,
 .compose-form__highlightable,
+.autosuggest-textarea__suggestions,
 .search__input,
 .search__popout,
 .emoji-mart-search input,
 .language-dropdown__dropdown .emoji-mart-search input,
-// .strike-card,
 .poll__option input[type='text'] {
   background: darken($ui-base-color, 10%);
 }
diff --git a/app/javascript/flavours/glitch/styles/rtl.scss b/app/javascript/flavours/glitch/styles/rtl.scss
index 1091a13238a73b..3f03051ce19776 100644
--- a/app/javascript/flavours/glitch/styles/rtl.scss
+++ b/app/javascript/flavours/glitch/styles/rtl.scss
@@ -90,16 +90,6 @@ body.rtl {
     direction: rtl;
   }
 
-  .simple_form .label_input__append {
-    &::after {
-      background-image: linear-gradient(
-        to left,
-        rgba(darken($ui-base-color, 10%), 0),
-        darken($ui-base-color, 10%)
-      );
-    }
-  }
-
   .simple_form select {
     background: $ui-base-color
       url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 14.933 18.467' height='19.698' width='15.929'><path d='M3.467 14.967l-3.393-3.5H14.86l-3.392 3.5c-1.866 1.925-3.666 3.5-4 3.5-.335 0-2.135-1.575-4-3.5zm.266-11.234L7.467 0 11.2 3.733l3.733 3.734H0l3.733-3.734z' fill='#{hex-color(lighten($ui-base-color, 12%))}'/></svg>")
diff --git a/app/javascript/flavours/glitch/styles/tables.scss b/app/javascript/flavours/glitch/styles/tables.scss
index dd73f6e2055f1b..992ad0cbe4e548 100644
--- a/app/javascript/flavours/glitch/styles/tables.scss
+++ b/app/javascript/flavours/glitch/styles/tables.scss
@@ -273,8 +273,8 @@ a.table-action-link {
       }
     }
 
-    &:nth-child(even) {
-      background: var(--background-color);
+    &:last-child {
+      border-radius: 0 0 4px 4px;
     }
 
     &__content {
diff --git a/app/javascript/flavours/glitch/styles/widgets.scss b/app/javascript/flavours/glitch/styles/widgets.scss
index dd349526ade2ec..ac419b4570dda7 100644
--- a/app/javascript/flavours/glitch/styles/widgets.scss
+++ b/app/javascript/flavours/glitch/styles/widgets.scss
@@ -211,7 +211,7 @@
       display: flex;
       align-items: center;
       justify-content: space-between;
-      border: 1px solid lighten($ui-base-color, 8%);
+      border: 1px solid var(--background-border-color);
       border-radius: 4px;
       padding: 15px;
       text-decoration: none;

From eacfb9fc5523fc1880c3457286e09fc2d3d5d169 Mon Sep 17 00:00:00 2001
From: Valtteri Laitinen <dev@valtlai.fi>
Date: Thu, 8 Aug 2024 12:22:48 +0300
Subject: [PATCH 1764/2191] [Glitch] Really fix duplicate border around search
 results

Port a95fe931d71ea0fa1d81a94c779553048b4e69f5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/styles/components.scss       | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index 306e25443ff542..cd1b04d2848053 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -3268,11 +3268,6 @@ $ui-header-logo-wordmark-width: 99px;
   .explore__search-header {
     display: flex;
   }
-
-  .explore__search-results {
-    border: 0;
-    border-radius: 0;
-  }
 }
 
 .icon-with-badge {
@@ -9346,10 +9341,13 @@ noscript {
   flex: 1 1 auto;
   display: flex;
   flex-direction: column;
-  border: 1px solid var(--background-border-color);
-  border-top: 0;
-  border-bottom-left-radius: 4px;
-  border-bottom-right-radius: 4px;
+
+  @media screen and (min-width: $no-gap-breakpoint) {
+    border: 1px solid var(--background-border-color);
+    border-top: 0;
+    border-bottom-left-radius: 4px;
+    border-bottom-right-radius: 4px;
+  }
 }
 
 .story {

From 29db81e1bb244b41c8041aaffa21911f37cc0b8e Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 8 Aug 2024 12:57:21 +0200
Subject: [PATCH 1765/2191] [Glitch] Convert PrivacyDropdownMenu to Typescript
 and generalize it to DropdownSelector component

Port 2edae5ea28bcddb59f2d38416d03d2b52175b58c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../glitch/components/dropdown_selector.tsx   | 185 ++++++++++++++++++
 .../components/dropdown_icon_button.jsx       |   5 +-
 .../compose/components/privacy_dropdown.jsx   |   5 +-
 .../components/privacy_dropdown_menu.jsx      | 128 ------------
 4 files changed, 189 insertions(+), 134 deletions(-)
 create mode 100644 app/javascript/flavours/glitch/components/dropdown_selector.tsx
 delete mode 100644 app/javascript/flavours/glitch/features/compose/components/privacy_dropdown_menu.jsx

diff --git a/app/javascript/flavours/glitch/components/dropdown_selector.tsx b/app/javascript/flavours/glitch/components/dropdown_selector.tsx
new file mode 100644
index 00000000000000..f8bf96c634294a
--- /dev/null
+++ b/app/javascript/flavours/glitch/components/dropdown_selector.tsx
@@ -0,0 +1,185 @@
+import { useCallback, useEffect, useRef, useState } from 'react';
+
+import classNames from 'classnames';
+
+import { supportsPassiveEvents } from 'detect-passive-events';
+
+import InfoIcon from '@/material-icons/400-24px/info.svg?react';
+
+import type { IconProp } from './icon';
+import { Icon } from './icon';
+
+const listenerOptions = supportsPassiveEvents
+  ? { passive: true, capture: true }
+  : true;
+
+interface SelectItem {
+  value: string;
+  icon?: string;
+  iconComponent?: IconProp;
+  text: string;
+  meta: string;
+  extra?: string;
+}
+
+interface Props {
+  value: string;
+  classNamePrefix: string;
+  style?: React.CSSProperties;
+  items: SelectItem[];
+  onChange: (value: string) => void;
+  onClose: () => void;
+}
+
+export const DropdownSelector: React.FC<Props> = ({
+  style,
+  items,
+  value,
+  classNamePrefix = 'privacy-dropdown',
+  onClose,
+  onChange,
+}) => {
+  const nodeRef = useRef<HTMLUListElement>(null);
+  const focusedItemRef = useRef<HTMLLIElement>(null);
+  const [currentValue, setCurrentValue] = useState(value);
+
+  const handleDocumentClick = useCallback(
+    (e: MouseEvent | TouchEvent) => {
+      if (
+        nodeRef.current &&
+        e.target instanceof Node &&
+        !nodeRef.current.contains(e.target)
+      ) {
+        onClose();
+        e.stopPropagation();
+      }
+    },
+    [nodeRef, onClose],
+  );
+
+  const handleClick = useCallback(
+    (
+      e: React.MouseEvent<HTMLLIElement> | React.KeyboardEvent<HTMLLIElement>,
+    ) => {
+      const value = e.currentTarget.getAttribute('data-index');
+
+      e.preventDefault();
+
+      onClose();
+      if (value) onChange(value);
+    },
+    [onClose, onChange],
+  );
+
+  const handleKeyDown = useCallback(
+    (e: React.KeyboardEvent<HTMLLIElement>) => {
+      const value = e.currentTarget.getAttribute('data-index');
+      const index = items.findIndex((item) => item.value === value);
+
+      let element: Element | null | undefined = null;
+
+      switch (e.key) {
+        case 'Escape':
+          onClose();
+          break;
+        case ' ':
+        case 'Enter':
+          handleClick(e);
+          break;
+        case 'ArrowDown':
+          element =
+            nodeRef.current?.children[index + 1] ??
+            nodeRef.current?.firstElementChild;
+          break;
+        case 'ArrowUp':
+          element =
+            nodeRef.current?.children[index - 1] ??
+            nodeRef.current?.lastElementChild;
+          break;
+        case 'Tab':
+          if (e.shiftKey) {
+            element =
+              nodeRef.current?.children[index + 1] ??
+              nodeRef.current?.firstElementChild;
+          } else {
+            element =
+              nodeRef.current?.children[index - 1] ??
+              nodeRef.current?.lastElementChild;
+          }
+          break;
+        case 'Home':
+          element = nodeRef.current?.firstElementChild;
+          break;
+        case 'End':
+          element = nodeRef.current?.lastElementChild;
+          break;
+      }
+
+      if (element && element instanceof HTMLElement) {
+        const selectedValue = element.getAttribute('data-index');
+        element.focus();
+        if (selectedValue) setCurrentValue(selectedValue);
+        e.preventDefault();
+        e.stopPropagation();
+      }
+    },
+    [nodeRef, items, onClose, handleClick, setCurrentValue],
+  );
+
+  useEffect(() => {
+    document.addEventListener('click', handleDocumentClick, { capture: true });
+    document.addEventListener('touchend', handleDocumentClick, listenerOptions);
+    focusedItemRef.current?.focus({ preventScroll: true });
+
+    return () => {
+      document.removeEventListener('click', handleDocumentClick, {
+        capture: true,
+      });
+      document.removeEventListener(
+        'touchend',
+        handleDocumentClick,
+        listenerOptions,
+      );
+    };
+  }, [handleDocumentClick]);
+
+  return (
+    <ul style={style} role='listbox' ref={nodeRef}>
+      {items.map((item) => (
+        <li
+          role='option'
+          tabIndex={0}
+          key={item.value}
+          data-index={item.value}
+          onKeyDown={handleKeyDown}
+          onClick={handleClick}
+          className={classNames(`${classNamePrefix}__option`, {
+            active: item.value === currentValue,
+          })}
+          aria-selected={item.value === currentValue}
+          ref={item.value === currentValue ? focusedItemRef : null}
+        >
+          {item.icon && item.iconComponent && (
+            <div className={`${classNamePrefix}__option__icon`}>
+              <Icon id={item.icon} icon={item.iconComponent} />
+            </div>
+          )}
+
+          <div className={`${classNamePrefix}__option__content`}>
+            <strong>{item.text}</strong>
+            {item.meta}
+          </div>
+
+          {item.extra && (
+            <div
+              className={`${classNamePrefix}__option__additional`}
+              title={item.extra}
+            >
+              <Icon id='info-circle' icon={InfoIcon} />
+            </div>
+          )}
+        </li>
+      ))}
+    </ul>
+  );
+};
diff --git a/app/javascript/flavours/glitch/features/compose/components/dropdown_icon_button.jsx b/app/javascript/flavours/glitch/features/compose/components/dropdown_icon_button.jsx
index 9774d4260eb462..55830f0a92723e 100644
--- a/app/javascript/flavours/glitch/features/compose/components/dropdown_icon_button.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/dropdown_icon_button.jsx
@@ -3,10 +3,9 @@ import { useCallback, useState, useRef } from 'react';
 
 import Overlay from 'react-overlays/Overlay';
 
+import { DropdownSelector } from 'flavours/glitch/components/dropdown_selector';
 import { IconButton } from 'flavours/glitch/components/icon_button';
 
-import { PrivacyDropdownMenu } from './privacy_dropdown_menu';
-
 export const DropdownIconButton = ({ value, disabled, icon, onChange, iconComponent, title, options }) => {
   const containerRef = useRef(null);
 
@@ -53,7 +52,7 @@ export const DropdownIconButton = ({ value, disabled, icon, onChange, iconCompon
         {({ props, placement }) => (
           <div {...props}>
             <div className={`dropdown-animation privacy-dropdown__dropdown ${placement}`}>
-              <PrivacyDropdownMenu
+              <DropdownSelector
                 items={options}
                 value={value}
                 onClose={handleClose}
diff --git a/app/javascript/flavours/glitch/features/compose/components/privacy_dropdown.jsx b/app/javascript/flavours/glitch/features/compose/components/privacy_dropdown.jsx
index c99f18545ba605..4a7cc2e9a92919 100644
--- a/app/javascript/flavours/glitch/features/compose/components/privacy_dropdown.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/privacy_dropdown.jsx
@@ -11,10 +11,9 @@ import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?re
 import LockIcon from '@/material-icons/400-24px/lock.svg?react';
 import PublicIcon from '@/material-icons/400-24px/public.svg?react';
 import QuietTimeIcon from '@/material-icons/400-24px/quiet_time.svg?react';
+import { DropdownSelector } from 'flavours/glitch/components/dropdown_selector';
 import { Icon }  from 'flavours/glitch/components/icon';
 
-import { PrivacyDropdownMenu } from './privacy_dropdown_menu';
-
 const messages = defineMessages({
   public_short: { id: 'privacy.public.short', defaultMessage: 'Public' },
   public_long: { id: 'privacy.public.long', defaultMessage: 'Anyone on and off Mastodon' },
@@ -143,7 +142,7 @@ class PrivacyDropdown extends PureComponent {
           {({ props, placement }) => (
             <div {...props}>
               <div className={`dropdown-animation privacy-dropdown__dropdown ${placement}`}>
-                <PrivacyDropdownMenu
+                <DropdownSelector
                   items={this.options}
                   value={value}
                   onClose={this.handleClose}
diff --git a/app/javascript/flavours/glitch/features/compose/components/privacy_dropdown_menu.jsx b/app/javascript/flavours/glitch/features/compose/components/privacy_dropdown_menu.jsx
deleted file mode 100644
index 03a0b76d23914d..00000000000000
--- a/app/javascript/flavours/glitch/features/compose/components/privacy_dropdown_menu.jsx
+++ /dev/null
@@ -1,128 +0,0 @@
-import PropTypes from 'prop-types';
-import { useCallback, useEffect, useRef, useState } from 'react';
-
-import classNames from 'classnames';
-
-import { supportsPassiveEvents } from 'detect-passive-events';
-
-import InfoIcon from '@/material-icons/400-24px/info.svg?react';
-import { Icon } from 'flavours/glitch/components/icon';
-
-const listenerOptions = supportsPassiveEvents ? { passive: true, capture: true } : true;
-
-export const PrivacyDropdownMenu = ({ style, items, value, onClose, onChange }) => {
-  const nodeRef = useRef(null);
-  const focusedItemRef = useRef(null);
-  const [currentValue, setCurrentValue] = useState(value);
-
-  const handleDocumentClick = useCallback((e) => {
-    if (nodeRef.current && !nodeRef.current.contains(e.target)) {
-      onClose();
-      e.stopPropagation();
-    }
-  }, [nodeRef, onClose]);
-
-  const handleClick = useCallback((e) => {
-    const value = e.currentTarget.getAttribute('data-index');
-
-    e.preventDefault();
-
-    onClose();
-    onChange(value);
-  }, [onClose, onChange]);
-
-  const handleKeyDown = useCallback((e) => {
-    const value = e.currentTarget.getAttribute('data-index');
-    const index = items.findIndex(item => (item.value === value));
-
-    let element = null;
-
-    switch (e.key) {
-    case 'Escape':
-      onClose();
-      break;
-    case ' ':
-    case 'Enter':
-      handleClick(e);
-      break;
-    case 'ArrowDown':
-      element = nodeRef.current.childNodes[index + 1] || nodeRef.current.firstChild;
-      break;
-    case 'ArrowUp':
-      element = nodeRef.current.childNodes[index - 1] || nodeRef.current.lastChild;
-      break;
-    case 'Tab':
-      if (e.shiftKey) {
-        element = nodeRef.current.childNodes[index + 1] || nodeRef.current.firstChild;
-      } else {
-        element = nodeRef.current.childNodes[index - 1] || nodeRef.current.lastChild;
-      }
-      break;
-    case 'Home':
-      element = nodeRef.current.firstChild;
-      break;
-    case 'End':
-      element = nodeRef.current.lastChild;
-      break;
-    }
-
-    if (element) {
-      element.focus();
-      setCurrentValue(element.getAttribute('data-index'));
-      e.preventDefault();
-      e.stopPropagation();
-    }
-  }, [nodeRef, items, onClose, handleClick, setCurrentValue]);
-
-  useEffect(() => {
-    document.addEventListener('click', handleDocumentClick, { capture: true });
-    document.addEventListener('touchend', handleDocumentClick, listenerOptions);
-    focusedItemRef.current?.focus({ preventScroll: true });
-
-    return () => {
-      document.removeEventListener('click', handleDocumentClick, { capture: true });
-      document.removeEventListener('touchend', handleDocumentClick, listenerOptions);
-    };
-  }, [handleDocumentClick]);
-
-  return (
-    <ul style={{ ...style }} role='listbox' ref={nodeRef}>
-      {items.map(item => (
-        <li
-          role='option'
-          tabIndex={0}
-          key={item.value}
-          data-index={item.value}
-          onKeyDown={handleKeyDown}
-          onClick={handleClick}
-          className={classNames('privacy-dropdown__option', { active: item.value === currentValue })}
-          aria-selected={item.value === currentValue}
-          ref={item.value === currentValue ? focusedItemRef : null}
-        >
-          <div className='privacy-dropdown__option__icon'>
-            <Icon id={item.icon} icon={item.iconComponent} />
-          </div>
-
-          <div className='privacy-dropdown__option__content'>
-            <strong>{item.text}</strong>
-            {item.meta}
-          </div>
-
-          {item.extra && (
-            <div className='privacy-dropdown__option__additional' title={item.extra}>
-              <Icon id='info-circle' icon={InfoIcon} />
-            </div>
-          )}
-        </li>
-      ))}
-    </ul>
-  );
-};
-
-PrivacyDropdownMenu.propTypes = {
-  style: PropTypes.object,
-  items: PropTypes.array.isRequired,
-  value: PropTypes.string.isRequired,
-  onClose: PropTypes.func.isRequired,
-  onChange: PropTypes.func.isRequired,
-};

From dad9baaa5456cc6ea58b54e05a4e96bf891b34e7 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 8 Aug 2024 19:00:05 +0200
Subject: [PATCH 1766/2191] [Glitch] Fix uninitialized grouped notifications
 read marker on initial load

Port 079d681ac6f279f3a7a6be5c3734549f3be8f912 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/reducers/notification_groups.ts          | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/javascript/flavours/glitch/reducers/notification_groups.ts b/app/javascript/flavours/glitch/reducers/notification_groups.ts
index a657cf5c970e57..4dedfe27a89851 100644
--- a/app/javascript/flavours/glitch/reducers/notification_groups.ts
+++ b/app/javascript/flavours/glitch/reducers/notification_groups.ts
@@ -474,8 +474,11 @@ export const notificationGroupsReducer = createReducer<NotificationGroupsState>(
             state.lastReadId,
             action.payload.markers.notifications.last_read_id,
           ) < 0
-        )
+        ) {
           state.lastReadId = action.payload.markers.notifications.last_read_id;
+          state.readMarkerId =
+            action.payload.markers.notifications.last_read_id;
+        }
       })
       .addCase(mountNotifications, (state) => {
         state.mounted += 1;

From a207a1f7dcf85b3cea24c016e0d35c4a8e308265 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Thu, 8 Aug 2024 21:22:16 +0200
Subject: [PATCH 1767/2191] Disable stylelint rules that are conflicting with
 Prettier (#31339)

---
 package.json        |  1 +
 stylelint.config.js |  2 +-
 yarn.lock           | 13 +++++++++++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 26ee3570a9e6a4..d183398f17e585 100644
--- a/package.json
+++ b/package.json
@@ -189,6 +189,7 @@
     "prettier": "^3.3.3",
     "react-test-renderer": "^18.2.0",
     "stylelint": "^16.0.2",
+    "stylelint-config-prettier-scss": "^1.0.0",
     "stylelint-config-standard-scss": "^13.0.0",
     "typescript": "^5.0.4",
     "webpack-dev-server": "^3.11.3"
diff --git a/stylelint.config.js b/stylelint.config.js
index 9f95091630a471..632463c59678b6 100644
--- a/stylelint.config.js
+++ b/stylelint.config.js
@@ -1,5 +1,5 @@
 module.exports = {
-  extends: ['stylelint-config-standard-scss'],
+  extends: ['stylelint-config-standard-scss', 'stylelint-config-prettier-scss'],
   ignoreFiles: [
     'app/javascript/styles/mastodon/reset.scss',
     'coverage/**/*',
diff --git a/yarn.lock b/yarn.lock
index ea934cac9d45d6..77fda4e4064e05 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2945,6 +2945,7 @@ __metadata:
     stacktrace-js: "npm:^2.0.2"
     stringz: "npm:^2.1.0"
     stylelint: "npm:^16.0.2"
+    stylelint-config-prettier-scss: "npm:^1.0.0"
     stylelint-config-standard-scss: "npm:^13.0.0"
     substring-trie: "npm:^1.0.2"
     terser-webpack-plugin: "npm:^4.2.3"
@@ -16595,6 +16596,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"stylelint-config-prettier-scss@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "stylelint-config-prettier-scss@npm:1.0.0"
+  peerDependencies:
+    stylelint: ">=15.0.0"
+  bin:
+    stylelint-config-prettier-scss: bin/check.js
+    stylelint-config-prettier-scss-check: bin/check.js
+  checksum: 10c0/4d5e1d1c200d4611b5b7bd2d2528cc9e301f26645802a2774aec192c4c2949cbf5a0147eba8b2e6e4ff14a071b03024f3034bb1b4fda37a8ed5a0081a9597d4d
+  languageName: node
+  linkType: hard
+
 "stylelint-config-recommended-scss@npm:^14.0.0":
   version: 14.0.0
   resolution: "stylelint-config-recommended-scss@npm:14.0.0"

From 389549e7838291f09bc291c7559730fe3f2aad58 Mon Sep 17 00:00:00 2001
From: Michael Stanclift <mx@vmstan.com>
Date: Thu, 8 Aug 2024 14:23:15 -0500
Subject: [PATCH 1768/2191] Fix list creation textbox styling (#31348)

---
 app/javascript/styles/mastodon-light/diff.scss | 4 ++++
 app/javascript/styles/mastodon/components.scss | 7 +++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/javascript/styles/mastodon-light/diff.scss b/app/javascript/styles/mastodon-light/diff.scss
index b28ae8860cf249..f056cb0668f665 100644
--- a/app/javascript/styles/mastodon-light/diff.scss
+++ b/app/javascript/styles/mastodon-light/diff.scss
@@ -551,3 +551,7 @@ a.sparkline {
     background: darken($ui-base-color, 10%);
   }
 }
+
+.setting-text {
+  background: darken($ui-base-color, 10%);
+}
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 67e47460b543be..6c1b56337cf13c 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -3881,18 +3881,17 @@ $ui-header-logo-wordmark-width: 99px;
   display: block;
   box-sizing: border-box;
   margin: 0;
-  color: $inverted-text-color;
-  background: $white;
+  color: $primary-text-color;
+  background: $ui-base-color;
   padding: 7px 10px;
   font-family: inherit;
   font-size: 14px;
   line-height: 22px;
   border-radius: 4px;
-  border: 1px solid $white;
+  border: 1px solid var(--background-border-color);
 
   &:focus {
     outline: 0;
-    border-color: lighten($ui-highlight-color, 12%);
   }
 
   &__wrapper {

From f045ef8e927b19a53fb4c399306a661c6e7eca63 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 8 Aug 2024 21:30:42 +0200
Subject: [PATCH 1769/2191] Update dependency eslint-plugin-jsdoc to v50
 (#31330)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 package.json |  2 +-
 yarn.lock    | 37 ++++++++++++++++++++++++++++---------
 2 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index d183398f17e585..69fa90c610a9e3 100644
--- a/package.json
+++ b/package.json
@@ -177,7 +177,7 @@
     "eslint-import-resolver-typescript": "^3.5.5",
     "eslint-plugin-formatjs": "^4.10.1",
     "eslint-plugin-import": "~2.29.0",
-    "eslint-plugin-jsdoc": "^48.0.0",
+    "eslint-plugin-jsdoc": "^50.0.0",
     "eslint-plugin-jsx-a11y": "~6.9.0",
     "eslint-plugin-promise": "~6.6.0",
     "eslint-plugin-react": "^7.33.2",
diff --git a/yarn.lock b/yarn.lock
index 77fda4e4064e05..44d59d66986c14 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2885,7 +2885,7 @@ __metadata:
     eslint-import-resolver-typescript: "npm:^3.5.5"
     eslint-plugin-formatjs: "npm:^4.10.1"
     eslint-plugin-import: "npm:~2.29.0"
-    eslint-plugin-jsdoc: "npm:^48.0.0"
+    eslint-plugin-jsdoc: "npm:^50.0.0"
     eslint-plugin-jsx-a11y: "npm:~6.9.0"
     eslint-plugin-promise: "npm:~6.6.0"
     eslint-plugin-react: "npm:^7.33.2"
@@ -4618,12 +4618,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"acorn@npm:^8.0.4, acorn@npm:^8.1.0, acorn@npm:^8.8.1, acorn@npm:^8.8.2, acorn@npm:^8.9.0":
-  version: 8.11.2
-  resolution: "acorn@npm:8.11.2"
+"acorn@npm:^8.0.4, acorn@npm:^8.1.0, acorn@npm:^8.12.0, acorn@npm:^8.8.1, acorn@npm:^8.8.2, acorn@npm:^8.9.0":
+  version: 8.12.1
+  resolution: "acorn@npm:8.12.1"
   bin:
     acorn: bin/acorn
-  checksum: 10c0/a3ed76c761b75ec54b1ec3068fb7f113a182e95aea7f322f65098c2958d232e3d211cb6dac35ff9c647024b63714bc528a26d54a925d1fef2c25585b4c8e4017
+  checksum: 10c0/51fb26cd678f914e13287e886da2d7021f8c2bc0ccc95e03d3e0447ee278dd3b40b9c57dc222acd5881adcf26f3edc40901a4953403232129e3876793cd17386
   languageName: node
   linkType: hard
 
@@ -7968,15 +7968,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint-plugin-jsdoc@npm:^48.0.0":
-  version: 48.8.3
-  resolution: "eslint-plugin-jsdoc@npm:48.8.3"
+"eslint-plugin-jsdoc@npm:^50.0.0":
+  version: 50.0.0
+  resolution: "eslint-plugin-jsdoc@npm:50.0.0"
   dependencies:
     "@es-joy/jsdoccomment": "npm:~0.46.0"
     are-docs-informative: "npm:^0.0.2"
     comment-parser: "npm:1.4.1"
     debug: "npm:^4.3.5"
     escape-string-regexp: "npm:^4.0.0"
+    espree: "npm:^10.1.0"
     esquery: "npm:^1.6.0"
     parse-imports: "npm:^2.1.1"
     semver: "npm:^7.6.3"
@@ -7984,7 +7985,7 @@ __metadata:
     synckit: "npm:^0.9.1"
   peerDependencies:
     eslint: ^7.0.0 || ^8.0.0 || ^9.0.0
-  checksum: 10c0/78d893614b188617de5a03d8163406455e3b739fd7b86192eb05a29cf8e7f06909a6f6a1b9dc2acd31e5ae2bccd94600eaea247d277f58c3c946c0fdb36a57f7
+  checksum: 10c0/1d476eabdf604f4a07ef9a22fb7b13ba898d0aed81b2c428d4b6aea766b908ebdc7e6e82a16bac3f83e1013c6edba6d9a15a4015cab9a94c584ebccbd7255b70
   languageName: node
   linkType: hard
 
@@ -8087,6 +8088,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"eslint-visitor-keys@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "eslint-visitor-keys@npm:4.0.0"
+  checksum: 10c0/76619f42cf162705a1515a6868e6fc7567e185c7063a05621a8ac4c3b850d022661262c21d9f1fc1d144ecf0d5d64d70a3f43c15c3fc969a61ace0fb25698cf5
+  languageName: node
+  linkType: hard
+
 "eslint@npm:^8.41.0":
   version: 8.57.0
   resolution: "eslint@npm:8.57.0"
@@ -8135,6 +8143,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"espree@npm:^10.1.0":
+  version: 10.1.0
+  resolution: "espree@npm:10.1.0"
+  dependencies:
+    acorn: "npm:^8.12.0"
+    acorn-jsx: "npm:^5.3.2"
+    eslint-visitor-keys: "npm:^4.0.0"
+  checksum: 10c0/52e6feaa77a31a6038f0c0e3fce93010a4625701925b0715cd54a2ae190b3275053a0717db698697b32653788ac04845e489d6773b508d6c2e8752f3c57470a0
+  languageName: node
+  linkType: hard
+
 "espree@npm:^9.6.0, espree@npm:^9.6.1":
   version: 9.6.1
   resolution: "espree@npm:9.6.1"

From 6e01a23e3bea35f7bf90bd420f9372a6a7421fae Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 8 Aug 2024 21:31:00 +0200
Subject: [PATCH 1770/2191] Update dependency eslint-plugin-promise to v7
 (#31120)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 package.json |  2 +-
 yarn.lock    | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 69fa90c610a9e3..371b7cbf3d1ef6 100644
--- a/package.json
+++ b/package.json
@@ -179,7 +179,7 @@
     "eslint-plugin-import": "~2.29.0",
     "eslint-plugin-jsdoc": "^50.0.0",
     "eslint-plugin-jsx-a11y": "~6.9.0",
-    "eslint-plugin-promise": "~6.6.0",
+    "eslint-plugin-promise": "~7.1.0",
     "eslint-plugin-react": "^7.33.2",
     "eslint-plugin-react-hooks": "^4.6.0",
     "husky": "^9.0.11",
diff --git a/yarn.lock b/yarn.lock
index 44d59d66986c14..08379101ba31fe 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2887,7 +2887,7 @@ __metadata:
     eslint-plugin-import: "npm:~2.29.0"
     eslint-plugin-jsdoc: "npm:^50.0.0"
     eslint-plugin-jsx-a11y: "npm:~6.9.0"
-    eslint-plugin-promise: "npm:~6.6.0"
+    eslint-plugin-promise: "npm:~7.1.0"
     eslint-plugin-react: "npm:^7.33.2"
     eslint-plugin-react-hooks: "npm:^4.6.0"
     file-loader: "npm:^6.2.0"
@@ -8015,12 +8015,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint-plugin-promise@npm:~6.6.0":
-  version: 6.6.0
-  resolution: "eslint-plugin-promise@npm:6.6.0"
+"eslint-plugin-promise@npm:~7.1.0":
+  version: 7.1.0
+  resolution: "eslint-plugin-promise@npm:7.1.0"
   peerDependencies:
     eslint: ^7.0.0 || ^8.0.0 || ^9.0.0
-  checksum: 10c0/93a667dbc9ff15c4d586b0d40a31c7828314cbbb31b2b9a75802aa4ef536e9457bb3e1a89b384b07aa336dd61b315ae8b0aadc0870210378023dd018819b59b3
+  checksum: 10c0/bbc3406139715dfa5f48d04f6d5b5e82f68929d954b0fa3821eb8cd6dc381b210512cedd2d874e5de5381005d316566f4ae046a4750ce3f5f5cbf28a14cc0ab2
   languageName: node
   linkType: hard
 

From 2095d0f2b08c52a39380bb8b303851e475c6b3a7 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Thu, 8 Aug 2024 22:20:35 +0200
Subject: [PATCH 1771/2191] Update notification labels for mentions (#31304)

---
 .../components/notification_mention.tsx       | 54 +++++++++++--------
 app/javascript/mastodon/locales/en.json       |  7 ++-
 2 files changed, 37 insertions(+), 24 deletions(-)

diff --git a/app/javascript/mastodon/features/notifications_v2/components/notification_mention.tsx b/app/javascript/mastodon/features/notifications_v2/components/notification_mention.tsx
index f8d646b07e163e..b7cd995118a688 100644
--- a/app/javascript/mastodon/features/notifications_v2/components/notification_mention.tsx
+++ b/app/javascript/mastodon/features/notifications_v2/components/notification_mention.tsx
@@ -2,26 +2,33 @@ import { FormattedMessage } from 'react-intl';
 
 import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
 import ReplyIcon from '@/material-icons/400-24px/reply-fill.svg?react';
-import type { StatusVisibility } from 'mastodon/api_types/statuses';
+import { me } from 'mastodon/initial_state';
 import type { NotificationGroupMention } from 'mastodon/models/notification_group';
+import type { Status } from 'mastodon/models/status';
 import { useAppSelector } from 'mastodon/store';
 
 import type { LabelRenderer } from './notification_group_with_status';
 import { NotificationWithStatus } from './notification_with_status';
 
-const labelRenderer: LabelRenderer = (values) => (
+const mentionLabelRenderer: LabelRenderer = () => (
+  <FormattedMessage id='notification.label.mention' defaultMessage='Mention' />
+);
+
+const privateMentionLabelRenderer: LabelRenderer = () => (
   <FormattedMessage
-    id='notification.mention'
-    defaultMessage='{name} mentioned you'
-    values={values}
+    id='notification.label.private_mention'
+    defaultMessage='Private mention'
   />
 );
 
-const privateMentionLabelRenderer: LabelRenderer = (values) => (
+const replyLabelRenderer: LabelRenderer = () => (
+  <FormattedMessage id='notification.label.reply' defaultMessage='Reply' />
+);
+
+const privateReplyLabelRenderer: LabelRenderer = () => (
   <FormattedMessage
-    id='notification.private_mention'
-    defaultMessage='{name} privately mentioned you'
-    values={values}
+    id='notification.label.private_reply'
+    defaultMessage='Private reply'
   />
 );
 
@@ -29,27 +36,30 @@ export const NotificationMention: React.FC<{
   notification: NotificationGroupMention;
   unread: boolean;
 }> = ({ notification, unread }) => {
-  const statusVisibility = useAppSelector(
-    (state) =>
-      state.statuses.getIn([
-        notification.statusId,
-        'visibility',
-      ]) as StatusVisibility,
-  );
+  const [isDirect, isReply] = useAppSelector((state) => {
+    const status = state.statuses.get(notification.statusId) as Status;
+
+    return [
+      status.get('visibility') === 'direct',
+      status.get('in_reply_to_account_id') === me,
+    ] as const;
+  });
+
+  let labelRenderer = mentionLabelRenderer;
+
+  if (isReply && isDirect) labelRenderer = privateReplyLabelRenderer;
+  else if (isReply) labelRenderer = replyLabelRenderer;
+  else if (isDirect) labelRenderer = privateMentionLabelRenderer;
 
   return (
     <NotificationWithStatus
       type='mention'
-      icon={statusVisibility === 'direct' ? AlternateEmailIcon : ReplyIcon}
+      icon={isReply ? ReplyIcon : AlternateEmailIcon}
       iconId='reply'
       accountIds={notification.sampleAccountIds}
       count={notification.notifications_count}
       statusId={notification.statusId}
-      labelRenderer={
-        statusVisibility === 'direct'
-          ? privateMentionLabelRenderer
-          : labelRenderer
-      }
+      labelRenderer={labelRenderer}
       unread={unread}
     />
   );
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index 8db48c1a28966f..86afa7cd0d7cbc 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -482,7 +482,11 @@
   "notification.favourite": "{name} favorited your post",
   "notification.follow": "{name} followed you",
   "notification.follow_request": "{name} has requested to follow you",
-  "notification.mention": "{name} mentioned you",
+  "notification.label.mention": "Mention",
+  "notification.label.private_mention": "Private mention",
+  "notification.label.private_reply": "Private reply",
+  "notification.label.reply": "Reply",
+  "notification.mention": "Mention",
   "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.",
@@ -494,7 +498,6 @@
   "notification.moderation_warning.action_suspend": "Your account has been suspended.",
   "notification.own_poll": "Your poll has ended",
   "notification.poll": "A poll you voted in has ended",
-  "notification.private_mention": "{name} privately mentioned you",
   "notification.reblog": "{name} boosted your post",
   "notification.relationships_severance_event": "Lost connections with {name}",
   "notification.relationships_severance_event.account_suspension": "An admin from {from} has suspended {target}, which means you can no longer receive updates from them or interact with them.",

From 6ca731e9b69962a0023df2c5314562293bb4b6b6 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 8 Aug 2024 22:20:52 +0200
Subject: [PATCH 1772/2191] Change unread notification count to only cover the
 selected notification type (#31326)

---
 .../features/notifications_v2/index.tsx       | 31 +---------
 .../mastodon/selectors/notifications.ts       | 57 +++++++++++++++++--
 2 files changed, 54 insertions(+), 34 deletions(-)

diff --git a/app/javascript/mastodon/features/notifications_v2/index.tsx b/app/javascript/mastodon/features/notifications_v2/index.tsx
index 21afd9516eea6f..63e602bdcc133d 100644
--- a/app/javascript/mastodon/features/notifications_v2/index.tsx
+++ b/app/javascript/mastodon/features/notifications_v2/index.tsx
@@ -4,8 +4,6 @@ import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
 
 import { Helmet } from 'react-helmet';
 
-import { createSelector } from '@reduxjs/toolkit';
-
 import { useDebouncedCallback } from 'use-debounce';
 
 import DoneAllIcon from '@/material-icons/400-24px/done_all.svg?react';
@@ -27,16 +25,13 @@ import {
   selectUnreadNotificationGroupsCount,
   selectPendingNotificationGroupsCount,
   selectAnyPendingNotification,
+  selectNotificationGroups,
 } from 'mastodon/selectors/notifications';
 import {
   selectNeedsNotificationPermission,
-  selectSettingsNotificationsExcludedTypes,
-  selectSettingsNotificationsQuickFilterActive,
-  selectSettingsNotificationsQuickFilterShow,
   selectSettingsNotificationsShowUnread,
 } from 'mastodon/selectors/settings';
 import { useAppDispatch, useAppSelector } from 'mastodon/store';
-import type { RootState } from 'mastodon/store';
 
 import { addColumn, removeColumn, moveColumn } from '../../actions/columns';
 import { submitMarkers } from '../../actions/markers';
@@ -62,34 +57,12 @@ const messages = defineMessages({
   },
 });
 
-const getNotifications = createSelector(
-  [
-    selectSettingsNotificationsQuickFilterShow,
-    selectSettingsNotificationsQuickFilterActive,
-    selectSettingsNotificationsExcludedTypes,
-    (state: RootState) => state.notificationGroups.groups,
-  ],
-  (showFilterBar, allowedType, excludedTypes, notifications) => {
-    if (!showFilterBar || allowedType === 'all') {
-      // used if user changed the notification settings after loading the notifications from the server
-      // otherwise a list of notifications will come pre-filtered from the backend
-      // we need to turn it off for FilterBar in order not to block ourselves from seeing a specific category
-      return notifications.filter(
-        (item) => item.type === 'gap' || !excludedTypes.includes(item.type),
-      );
-    }
-    return notifications.filter(
-      (item) => item.type === 'gap' || allowedType === item.type,
-    );
-  },
-);
-
 export const Notifications: React.FC<{
   columnId?: string;
   multiColumn?: boolean;
 }> = ({ columnId, multiColumn }) => {
   const intl = useIntl();
-  const notifications = useAppSelector(getNotifications);
+  const notifications = useAppSelector(selectNotificationGroups);
   const dispatch = useAppDispatch();
   const isLoading = useAppSelector((s) => s.notificationGroups.isLoading);
   const hasMore = notifications.at(-1)?.type === 'gap';
diff --git a/app/javascript/mastodon/selectors/notifications.ts b/app/javascript/mastodon/selectors/notifications.ts
index 962dedd65042ff..ea640406ea19c4 100644
--- a/app/javascript/mastodon/selectors/notifications.ts
+++ b/app/javascript/mastodon/selectors/notifications.ts
@@ -1,15 +1,62 @@
 import { createSelector } from '@reduxjs/toolkit';
 
 import { compareId } from 'mastodon/compare_id';
+import type { NotificationGroup } from 'mastodon/models/notification_group';
+import type { NotificationGap } from 'mastodon/reducers/notification_groups';
 import type { RootState } from 'mastodon/store';
 
+import {
+  selectSettingsNotificationsExcludedTypes,
+  selectSettingsNotificationsQuickFilterActive,
+  selectSettingsNotificationsQuickFilterShow,
+} from './settings';
+
+const filterNotificationsByAllowedTypes = (
+  showFilterBar: boolean,
+  allowedType: string,
+  excludedTypes: string[],
+  notifications: (NotificationGroup | NotificationGap)[],
+) => {
+  if (!showFilterBar || allowedType === 'all') {
+    // used if user changed the notification settings after loading the notifications from the server
+    // otherwise a list of notifications will come pre-filtered from the backend
+    // we need to turn it off for FilterBar in order not to block ourselves from seeing a specific category
+    return notifications.filter(
+      (item) => item.type === 'gap' || !excludedTypes.includes(item.type),
+    );
+  }
+  return notifications.filter(
+    (item) => item.type === 'gap' || allowedType === item.type,
+  );
+};
+
+export const selectNotificationGroups = createSelector(
+  [
+    selectSettingsNotificationsQuickFilterShow,
+    selectSettingsNotificationsQuickFilterActive,
+    selectSettingsNotificationsExcludedTypes,
+    (state: RootState) => state.notificationGroups.groups,
+  ],
+  filterNotificationsByAllowedTypes,
+);
+
+const selectPendingNotificationGroups = createSelector(
+  [
+    selectSettingsNotificationsQuickFilterShow,
+    selectSettingsNotificationsQuickFilterActive,
+    selectSettingsNotificationsExcludedTypes,
+    (state: RootState) => state.notificationGroups.pendingGroups,
+  ],
+  filterNotificationsByAllowedTypes,
+);
+
 export const selectUnreadNotificationGroupsCount = createSelector(
   [
     (s: RootState) => s.notificationGroups.lastReadId,
-    (s: RootState) => s.notificationGroups.pendingGroups,
-    (s: RootState) => s.notificationGroups.groups,
+    selectNotificationGroups,
+    selectPendingNotificationGroups,
   ],
-  (notificationMarker, pendingGroups, groups) => {
+  (notificationMarker, groups, pendingGroups) => {
     return (
       groups.filter(
         (group) =>
@@ -31,7 +78,7 @@ export const selectUnreadNotificationGroupsCount = createSelector(
 export const selectAnyPendingNotification = createSelector(
   [
     (s: RootState) => s.notificationGroups.readMarkerId,
-    (s: RootState) => s.notificationGroups.groups,
+    selectNotificationGroups,
   ],
   (notificationMarker, groups) => {
     return groups.some(
@@ -44,7 +91,7 @@ export const selectAnyPendingNotification = createSelector(
 );
 
 export const selectPendingNotificationGroupsCount = createSelector(
-  [(s: RootState) => s.notificationGroups.pendingGroups],
+  [selectPendingNotificationGroups],
   (pendingGroups) =>
     pendingGroups.filter((group) => group.type !== 'gap').length,
 );

From 9538d9c298ed98127e3ba297a1933608976b1906 Mon Sep 17 00:00:00 2001
From: Michael Stanclift <mx@vmstan.com>
Date: Fri, 9 Aug 2024 07:45:39 -0500
Subject: [PATCH 1773/2191] Fix post filter & report styling (#31349)

---
 .../styles/mastodon-light/diff.scss           |  4 ++
 .../styles/mastodon/components.scss           | 38 +++++++++----------
 .../styles/mastodon/emoji_picker.scss         |  1 -
 3 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/app/javascript/styles/mastodon-light/diff.scss b/app/javascript/styles/mastodon-light/diff.scss
index f056cb0668f665..1f282605edcbc9 100644
--- a/app/javascript/styles/mastodon-light/diff.scss
+++ b/app/javascript/styles/mastodon-light/diff.scss
@@ -555,3 +555,7 @@ a.sparkline {
 .setting-text {
   background: darken($ui-base-color, 10%);
 }
+
+.report-dialog-modal__textarea {
+  background: darken($ui-base-color, 10%);
+}
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 6c1b56337cf13c..3c938ac4c59d87 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -6244,9 +6244,10 @@ a.status-card {
   max-width: 90vw;
   width: 480px;
   height: 80vh;
-  background: lighten($ui-secondary-color, 8%);
-  color: $inverted-text-color;
-  border-radius: 8px;
+  background: var(--background-color);
+  color: $primary-text-color;
+  border-radius: 4px;
+  border: 1px solid var(--background-border-color);
   overflow: hidden;
   position: relative;
   flex-direction: column;
@@ -6254,7 +6255,7 @@ a.status-card {
 
   &__container {
     box-sizing: border-box;
-    border-top: 1px solid $ui-secondary-color;
+    border-top: 1px solid var(--background-border-color);
     padding: 20px;
     flex-grow: 1;
     display: flex;
@@ -6284,7 +6285,7 @@ a.status-card {
   &__lead {
     font-size: 17px;
     line-height: 22px;
-    color: lighten($inverted-text-color, 16%);
+    color: $secondary-text-color;
     margin-bottom: 30px;
 
     a {
@@ -6319,7 +6320,7 @@ a.status-card {
 
   .status__content,
   .status__content p {
-    color: $inverted-text-color;
+    color: $primary-text-color;
   }
 
   .status__content__spoiler-link {
@@ -6364,7 +6365,7 @@ a.status-card {
   .poll__option.dialog-option {
     padding: 15px 0;
     flex: 0 0 auto;
-    border-bottom: 1px solid $ui-secondary-color;
+    border-bottom: 1px solid var(--background-border-color);
 
     &:last-child {
       border-bottom: 0;
@@ -6372,13 +6373,13 @@ a.status-card {
 
     & > .poll__option__text {
       font-size: 13px;
-      color: lighten($inverted-text-color, 16%);
+      color: $secondary-text-color;
 
       strong {
         font-size: 17px;
         font-weight: 500;
         line-height: 22px;
-        color: $inverted-text-color;
+        color: $primary-text-color;
         display: block;
         margin-bottom: 4px;
 
@@ -6397,22 +6398,19 @@ a.status-card {
     display: block;
     box-sizing: border-box;
     width: 100%;
-    color: $inverted-text-color;
-    background: $simple-background-color;
+    color: $primary-text-color;
+    background: $ui-base-color;
     padding: 10px;
     font-family: inherit;
     font-size: 17px;
     line-height: 22px;
     resize: vertical;
     border: 0;
+    border: 1px solid var(--background-border-color);
     outline: 0;
     border-radius: 4px;
     margin: 20px 0;
 
-    &::placeholder {
-      color: $dark-text-color;
-    }
-
     &:focus {
       outline: 0;
     }
@@ -6433,16 +6431,16 @@ a.status-card {
   }
 
   .button.button-secondary {
-    border-color: $inverted-text-color;
-    color: $inverted-text-color;
+    border-color: $ui-button-destructive-background-color;
+    color: $ui-button-destructive-background-color;
     flex: 0 0 auto;
 
     &:hover,
     &:focus,
     &:active {
-      background: transparent;
-      border-color: $ui-button-background-color;
-      color: $ui-button-background-color;
+      background: $ui-button-destructive-background-color;
+      border-color: $ui-button-destructive-background-color;
+      color: $white;
     }
   }
 
diff --git a/app/javascript/styles/mastodon/emoji_picker.scss b/app/javascript/styles/mastodon/emoji_picker.scss
index 68e016d44b877a..31890005881c52 100644
--- a/app/javascript/styles/mastodon/emoji_picker.scss
+++ b/app/javascript/styles/mastodon/emoji_picker.scss
@@ -111,7 +111,6 @@
     &:focus {
       outline: none !important;
       border-width: 1px !important;
-      border-color: $ui-button-background-color;
     }
 
     &::-webkit-search-cancel-button {

From 9bae2377924f4cda71bdff54fd270ef03ac9443c Mon Sep 17 00:00:00 2001
From: Jeong Arm <kjwonmail@gmail.com>
Date: Fri, 9 Aug 2024 21:47:02 +0900
Subject: [PATCH 1774/2191] Change confirmation prompt on trending management
 (#19626)

---
 app/views/admin/trends/links/index.html.haml    |  8 ++++----
 app/views/admin/trends/statuses/index.html.haml |  8 ++++----
 app/views/admin/trends/tags/index.html.haml     |  4 ++--
 config/locales/en.yml                           | 10 ++++++++++
 4 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/app/views/admin/trends/links/index.html.haml b/app/views/admin/trends/links/index.html.haml
index 647c24b1e9e1c4..e54acd656f433f 100644
--- a/app/views/admin/trends/links/index.html.haml
+++ b/app/views/admin/trends/links/index.html.haml
@@ -39,22 +39,22 @@
       .batch-table__toolbar__actions
         = f.button safe_join([material_symbol('check'), t('admin.trends.links.allow')]),
                    class: 'table-action-link',
-                   data: { confirm: t('admin.reports.are_you_sure') },
+                   data: { confirm: t('admin.trends.links.confirm_allow') },
                    name: :approve,
                    type: :submit
         = f.button safe_join([material_symbol('check'), t('admin.trends.links.allow_provider')]),
                    class: 'table-action-link',
-                   data: { confirm: t('admin.reports.are_you_sure') },
+                   data: { confirm: t('admin.trends.links.confirm_allow_provider') },
                    name: :approve_providers,
                    type: :submit
         = f.button safe_join([material_symbol('close'), t('admin.trends.links.disallow')]),
                    class: 'table-action-link',
-                   data: { confirm: t('admin.reports.are_you_sure') },
+                   data: { confirm: t('admin.trends.links.confirm_disallow') },
                    name: :reject,
                    type: :submit
         = f.button safe_join([material_symbol('close'), t('admin.trends.links.disallow_provider')]),
                    class: 'table-action-link',
-                   data: { confirm: t('admin.reports.are_you_sure') },
+                   data: { confirm: t('admin.trends.links.confirm_disallow_provider') },
                    name: :reject_providers,
                    type: :submit
     .batch-table__body
diff --git a/app/views/admin/trends/statuses/index.html.haml b/app/views/admin/trends/statuses/index.html.haml
index 4713f8c2ae8d9d..f9238dee461e6a 100644
--- a/app/views/admin/trends/statuses/index.html.haml
+++ b/app/views/admin/trends/statuses/index.html.haml
@@ -35,22 +35,22 @@
       .batch-table__toolbar__actions
         = f.button safe_join([material_symbol('check'), t('admin.trends.statuses.allow')]),
                    class: 'table-action-link',
-                   data: { confirm: t('admin.reports.are_you_sure') },
+                   data: { confirm: t('admin.trends.statuses.confirm_allow') },
                    name: :approve,
                    type: :submit
         = f.button safe_join([material_symbol('check'), t('admin.trends.statuses.allow_account')]),
                    class: 'table-action-link',
-                   data: { confirm: t('admin.reports.are_you_sure') },
+                   data: { confirm: t('admin.trends.statuses.confirm_allow_account') },
                    name: :approve_accounts,
                    type: :submit
         = f.button safe_join([material_symbol('close'), t('admin.trends.statuses.disallow')]),
                    class: 'table-action-link',
-                   data: { confirm: t('admin.reports.are_you_sure') },
+                   data: { confirm: t('admin.trends.statuses.confirm_disallow') },
                    name: :reject,
                    type: :submit
         = f.button safe_join([material_symbol('close'), t('admin.trends.statuses.disallow_account')]),
                    class: 'table-action-link',
-                   data: { confirm: t('admin.reports.are_you_sure') },
+                   data: { confirm: t('admin.trends.statuses.confirm_disallow_account') },
                    name: :reject_accounts,
                    type: :submit
     .batch-table__body
diff --git a/app/views/admin/trends/tags/index.html.haml b/app/views/admin/trends/tags/index.html.haml
index 3a44cf3a70ef3a..480877456f5f96 100644
--- a/app/views/admin/trends/tags/index.html.haml
+++ b/app/views/admin/trends/tags/index.html.haml
@@ -27,12 +27,12 @@
       .batch-table__toolbar__actions
         = f.button safe_join([material_symbol('check'), t('admin.trends.allow')]),
                    class: 'table-action-link',
-                   data: { confirm: t('admin.reports.are_you_sure') },
+                   data: { confirm: t('admin.trends.confirm_allow') },
                    name: :approve,
                    type: :submit
         = f.button safe_join([material_symbol('close'), t('admin.trends.disallow')]),
                    class: 'table-action-link',
-                   data: { confirm: t('admin.reports.are_you_sure') },
+                   data: { confirm: t('admin.trends.confirm_disallow') },
                    name: :reject,
                    type: :submit
 
diff --git a/config/locales/en.yml b/config/locales/en.yml
index aab8db18153424..771bada5203c80 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -907,10 +907,16 @@ en:
     trends:
       allow: Allow
       approved: Approved
+      confirm_allow: Are you sure you want to allow selected tags?
+      confirm_disallow: Are you sure you want to disallow selected tags?
       disallow: Disallow
       links:
         allow: Allow link
         allow_provider: Allow publisher
+        confirm_allow: Are you sure you want to allow selected links?
+        confirm_allow_provider: Are you sure you want to allow selected providers?
+        confirm_disallow: Are you sure you want to disallow selected links?
+        confirm_disallow_provider: Are you sure you want to disallow selected providers?
         description_html: These are links that are currently being shared a lot by accounts that your server sees posts from. It can help your users find out what's going on in the world. No links are displayed publicly until you approve the publisher. You can also allow or reject individual links.
         disallow: Disallow link
         disallow_provider: Disallow publisher
@@ -934,6 +940,10 @@ en:
       statuses:
         allow: Allow post
         allow_account: Allow author
+        confirm_allow: Are you sure you want to allow selected statuses?
+        confirm_allow_account: Are you sure you want to allow selected accounts?
+        confirm_disallow: Are you sure you want to disallow selected statuses?
+        confirm_disallow_account: Are you sure you want to disallow selected accounts?
         description_html: These are posts that your server knows about that are currently being shared and favorited a lot at the moment. It can help your new and returning users to find more people to follow. No posts are displayed publicly until you approve the author, and the author allows their account to be suggested to others. You can also allow or reject individual posts.
         disallow: Disallow post
         disallow_account: Disallow author

From 994ef16b72478c3c33f81466a13b77ef4fee5ebb Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 9 Aug 2024 14:48:34 +0200
Subject: [PATCH 1775/2191] Bust CDN cache on media deletion (#31353)

---
 app/models/media_attachment.rb       | 28 ++++++++++++++++++++++++++++
 spec/models/media_attachment_spec.rb | 19 +++++++++++++++++++
 2 files changed, 47 insertions(+)

diff --git a/app/models/media_attachment.rb b/app/models/media_attachment.rb
index f53da04a9755be..a9470e1ad2085e 100644
--- a/app/models/media_attachment.rb
+++ b/app/models/media_attachment.rb
@@ -276,6 +276,9 @@ def delay_processing_for_attachment?(attachment_name)
   before_create :set_unknown_type
   before_create :set_processing
 
+  before_destroy :prepare_cache_bust!, prepend: true
+  after_destroy :bust_cache!
+
   after_commit :enqueue_processing, on: :create
   after_commit :reset_parent_cache, on: :update
 
@@ -410,4 +413,29 @@ def enqueue_processing
   def reset_parent_cache
     Rails.cache.delete("v3:statuses/#{status_id}") if status_id.present?
   end
+
+  # Record the cache keys to burst before the file get actually deleted
+  def prepare_cache_bust!
+    return unless Rails.configuration.x.cache_buster_enabled
+
+    @paths_to_cache_bust = MediaAttachment.attachment_definitions.keys.flat_map do |attachment_name|
+      attachment = public_send(attachment_name)
+      styles = DEFAULT_STYLES | attachment.styles.keys
+      styles.map { |style| attachment.path(style) }
+    end
+  rescue => e
+    # We really don't want any error here preventing media deletion
+    Rails.logger.warn "Error #{e.class} busting cache: #{e.message}"
+  end
+
+  # Once Paperclip has deleted the files, we can't recover the cache keys,
+  # so use the previously-saved ones
+  def bust_cache!
+    return unless Rails.configuration.x.cache_buster_enabled
+
+    CacheBusterWorker.push_bulk(@paths_to_cache_bust) { |path| [path] }
+  rescue => e
+    # We really don't want any error here preventing media deletion
+    Rails.logger.warn "Error #{e.class} busting cache: #{e.message}"
+  end
 end
diff --git a/spec/models/media_attachment_spec.rb b/spec/models/media_attachment_spec.rb
index 3142b291fb2b00..3297387ff72730 100644
--- a/spec/models/media_attachment_spec.rb
+++ b/spec/models/media_attachment_spec.rb
@@ -292,6 +292,25 @@
     end
   end
 
+  describe 'cache deletion hooks' do
+    let(:media) { Fabricate(:media_attachment) }
+
+    before do
+      allow(Rails.configuration.x).to receive(:cache_buster_enabled).and_return(true)
+    end
+
+    it 'queues CacheBusterWorker jobs' do
+      original_path = media.file.path(:original)
+      small_path = media.file.path(:small)
+      thumbnail_path = media.thumbnail.path(:original)
+
+      expect { media.destroy }
+        .to enqueue_sidekiq_job(CacheBusterWorker).with(original_path)
+        .and enqueue_sidekiq_job(CacheBusterWorker).with(small_path)
+        .and enqueue_sidekiq_job(CacheBusterWorker).with(thumbnail_path)
+    end
+  end
+
   private
 
   def media_metadata

From e29c401f774613b5c47fb69faf6ec99abf7c61a6 Mon Sep 17 00:00:00 2001
From: Christian Schmidt <github@chsc.dk>
Date: Fri, 9 Aug 2024 15:05:34 +0200
Subject: [PATCH 1776/2191] Add lang attribute on preview card title (#31303)

---
 app/views/admin/trends/links/_preview_card.html.haml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/admin/trends/links/_preview_card.html.haml b/app/views/admin/trends/links/_preview_card.html.haml
index ee3774790c45ad..49e0dd3fca06b5 100644
--- a/app/views/admin/trends/links/_preview_card.html.haml
+++ b/app/views/admin/trends/links/_preview_card.html.haml
@@ -4,12 +4,12 @@
 
   .batch-table__row__content.pending-account
     .pending-account__header
-      = link_to preview_card.title, url_for_preview_card(preview_card)
+      = link_to preview_card.title, url_for_preview_card(preview_card), lang: preview_card.language
 
       %br/
 
       - if preview_card.provider_name.present?
-        = preview_card.provider_name
+        %span{ lang: preview_card.language }= preview_card.provider_name
         ·
 
       - if preview_card.language.present?

From cbdd8edf68321b384d871855cd73b717ca394de2 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 9 Aug 2024 15:30:55 +0200
Subject: [PATCH 1777/2191] Revamp notification policy options (#31343)

---
 .../v1/notifications/policies_controller.rb   |   4 +-
 .../v2/notifications/policies_controller.rb   |  38 ++++
 app/models/notification_policy.rb             |  47 ++++-
 .../rest/notification_policy_serializer.rb    |   9 +-
 .../rest/v1/notification_policy_serializer.rb |  32 +++
 app/services/notify_service.rb                | 195 ++++++++++--------
 config/routes/api.rb                          |   4 +
 ...808114841_add_new_notification_policies.rb |  11 +
 ...8124338_migrate_notifications_policy_v2.rb |  26 +++
 ...loyment_migrate_notifications_policy_v2.rb |  26 +++
 ..._old_policies_from_notifications_policy.rb |  12 ++
 db/schema.rb                                  |  11 +-
 lib/tasks/tests.rake                          |   4 +-
 .../api/v1/notifications/policies_spec.rb     |   2 +-
 .../api/v2/notifications/policies_spec.rb     |  72 +++++++
 spec/services/notify_service_spec.rb          |  58 +++++-
 16 files changed, 442 insertions(+), 109 deletions(-)
 create mode 100644 app/controllers/api/v2/notifications/policies_controller.rb
 create mode 100644 app/serializers/rest/v1/notification_policy_serializer.rb
 create mode 100644 db/migrate/20240808114841_add_new_notification_policies.rb
 create mode 100644 db/migrate/20240808124338_migrate_notifications_policy_v2.rb
 create mode 100644 db/post_migrate/20240808124339_post_deployment_migrate_notifications_policy_v2.rb
 create mode 100644 db/post_migrate/20240808125420_drop_old_policies_from_notifications_policy.rb
 create mode 100644 spec/requests/api/v2/notifications/policies_spec.rb

diff --git a/app/controllers/api/v1/notifications/policies_controller.rb b/app/controllers/api/v1/notifications/policies_controller.rb
index 1ec336f9a594dc..9d70c283bec001 100644
--- a/app/controllers/api/v1/notifications/policies_controller.rb
+++ b/app/controllers/api/v1/notifications/policies_controller.rb
@@ -8,12 +8,12 @@ class Api::V1::Notifications::PoliciesController < Api::BaseController
   before_action :set_policy
 
   def show
-    render json: @policy, serializer: REST::NotificationPolicySerializer
+    render json: @policy, serializer: REST::V1::NotificationPolicySerializer
   end
 
   def update
     @policy.update!(resource_params)
-    render json: @policy, serializer: REST::NotificationPolicySerializer
+    render json: @policy, serializer: REST::V1::NotificationPolicySerializer
   end
 
   private
diff --git a/app/controllers/api/v2/notifications/policies_controller.rb b/app/controllers/api/v2/notifications/policies_controller.rb
new file mode 100644
index 00000000000000..637587967fe328
--- /dev/null
+++ b/app/controllers/api/v2/notifications/policies_controller.rb
@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+class Api::V2::Notifications::PoliciesController < Api::BaseController
+  before_action -> { doorkeeper_authorize! :read, :'read:notifications' }, only: :show
+  before_action -> { doorkeeper_authorize! :write, :'write:notifications' }, only: :update
+
+  before_action :require_user!
+  before_action :set_policy
+
+  def show
+    render json: @policy, serializer: REST::NotificationPolicySerializer
+  end
+
+  def update
+    @policy.update!(resource_params)
+    render json: @policy, serializer: REST::NotificationPolicySerializer
+  end
+
+  private
+
+  def set_policy
+    @policy = NotificationPolicy.find_or_initialize_by(account: current_account)
+
+    with_read_replica do
+      @policy.summarize!
+    end
+  end
+
+  def resource_params
+    params.permit(
+      :for_not_following,
+      :for_not_followers,
+      :for_new_accounts,
+      :for_private_mentions,
+      :for_limited_accounts
+    )
+  end
+end
diff --git a/app/models/notification_policy.rb b/app/models/notification_policy.rb
index 2bb58004e37fad..3b16f33d88155a 100644
--- a/app/models/notification_policy.rb
+++ b/app/models/notification_policy.rb
@@ -4,17 +4,25 @@
 #
 # Table name: notification_policies
 #
-#  id                      :bigint(8)        not null, primary key
-#  account_id              :bigint(8)        not null
-#  filter_not_following    :boolean          default(FALSE), not null
-#  filter_not_followers    :boolean          default(FALSE), not null
-#  filter_new_accounts     :boolean          default(FALSE), not null
-#  filter_private_mentions :boolean          default(TRUE), not null
-#  created_at              :datetime         not null
-#  updated_at              :datetime         not null
+#  id                   :bigint(8)        not null, primary key
+#  account_id           :bigint(8)        not null
+#  created_at           :datetime         not null
+#  updated_at           :datetime         not null
+#  for_not_following    :integer          default("accept"), not null
+#  for_not_followers    :integer          default("accept"), not null
+#  for_new_accounts     :integer          default("accept"), not null
+#  for_private_mentions :integer          default("filter"), not null
+#  for_limited_accounts :integer          default("filter"), not null
 #
 
 class NotificationPolicy < ApplicationRecord
+  self.ignored_columns += %w(
+    filter_not_following
+    filter_not_followers
+    filter_new_accounts
+    filter_private_mentions
+  )
+
   belongs_to :account
 
   has_many :notification_requests, primary_key: :account_id, foreign_key: :account_id, dependent: nil, inverse_of: false
@@ -23,11 +31,34 @@ class NotificationPolicy < ApplicationRecord
 
   MAX_MEANINGFUL_COUNT = 100
 
+  enum :for_not_following, { accept: 0, filter: 1, drop: 2 }, suffix: :not_following
+  enum :for_not_followers, { accept: 0, filter: 1, drop: 2 }, suffix: :not_followers
+  enum :for_new_accounts, { accept: 0, filter: 1, drop: 2 }, suffix: :new_accounts
+  enum :for_private_mentions, { accept: 0, filter: 1, drop: 2 }, suffix: :private_mentions
+  enum :for_limited_accounts, { accept: 0, filter: 1, drop: 2 }, suffix: :limited_accounts
+
   def summarize!
     @pending_requests_count = pending_notification_requests.first
     @pending_notifications_count = pending_notification_requests.last
   end
 
+  # Compat helpers with V1
+  def filter_not_following=(value)
+    self.for_not_following = value ? :filter : :accept
+  end
+
+  def filter_not_followers=(value)
+    self.for_not_followers = value ? :filter : :accept
+  end
+
+  def filter_new_accounts=(value)
+    self.for_new_accounts = value ? :filter : :accept
+  end
+
+  def filter_private_mentions=(value)
+    self.for_private_mentions = value ? :filter : :accept
+  end
+
   private
 
   def pending_notification_requests
diff --git a/app/serializers/rest/notification_policy_serializer.rb b/app/serializers/rest/notification_policy_serializer.rb
index 8bf85250fa590c..3902c1a04a2f96 100644
--- a/app/serializers/rest/notification_policy_serializer.rb
+++ b/app/serializers/rest/notification_policy_serializer.rb
@@ -3,10 +3,11 @@
 class REST::NotificationPolicySerializer < ActiveModel::Serializer
   # Please update `app/javascript/mastodon/api_types/notification_policies.ts` when making changes to the attributes
 
-  attributes :filter_not_following,
-             :filter_not_followers,
-             :filter_new_accounts,
-             :filter_private_mentions,
+  attributes :for_not_following,
+             :for_not_followers,
+             :for_new_accounts,
+             :for_private_mentions,
+             :for_limited_accounts,
              :summary
 
   def summary
diff --git a/app/serializers/rest/v1/notification_policy_serializer.rb b/app/serializers/rest/v1/notification_policy_serializer.rb
new file mode 100644
index 00000000000000..e1bbdc44ff1958
--- /dev/null
+++ b/app/serializers/rest/v1/notification_policy_serializer.rb
@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+class REST::V1::NotificationPolicySerializer < ActiveModel::Serializer
+  attributes :filter_not_following,
+             :filter_not_followers,
+             :filter_new_accounts,
+             :filter_private_mentions,
+             :summary
+
+  def summary
+    {
+      pending_requests_count: object.pending_requests_count.to_i,
+      pending_notifications_count: object.pending_notifications_count.to_i,
+    }
+  end
+
+  def filter_not_following
+    !object.accept_not_following?
+  end
+
+  def filter_not_followers
+    !object.accept_not_followers?
+  end
+
+  def filter_new_accounts
+    !object.accept_new_accounts?
+  end
+
+  def filter_private_mentions
+    !object.accept_private_mentions?
+  end
+end
diff --git a/app/services/notify_service.rb b/app/services/notify_service.rb
index b0bef8cd65524d..788381fe6b10e8 100644
--- a/app/services/notify_service.rb
+++ b/app/services/notify_service.rb
@@ -16,59 +16,7 @@ class NotifyService < BaseService
     severed_relationships
   ).freeze
 
-  class DismissCondition
-    def initialize(notification)
-      @recipient = notification.account
-      @sender = notification.from_account
-      @notification = notification
-    end
-
-    def dismiss?
-      blocked   = @recipient.unavailable?
-      blocked ||= from_self? && %i(poll severed_relationships moderation_warning).exclude?(@notification.type)
-
-      return blocked if message? && from_staff?
-
-      blocked ||= domain_blocking?
-      blocked ||= @recipient.blocking?(@sender)
-      blocked ||= @recipient.muting_notifications?(@sender)
-      blocked ||= conversation_muted?
-      blocked ||= blocked_mention? if message?
-      blocked
-    end
-
-    private
-
-    def blocked_mention?
-      FeedManager.instance.filter?(:mentions, @notification.target_status, @recipient)
-    end
-
-    def message?
-      @notification.type == :mention
-    end
-
-    def from_staff?
-      @sender.local? && @sender.user.present? && @sender.user_role&.overrides?(@recipient.user_role) && @sender.user_role&.highlighted? && @sender.user_role&.can?(*UserRole::Flags::CATEGORIES[:moderation])
-    end
-
-    def from_self?
-      @recipient.id == @sender.id
-    end
-
-    def domain_blocking?
-      @recipient.domain_blocking?(@sender.domain) && !following_sender?
-    end
-
-    def conversation_muted?
-      @notification.target_status && @recipient.muting_conversation?(@notification.target_status.conversation)
-    end
-
-    def following_sender?
-      @recipient.following?(@sender)
-    end
-  end
-
-  class FilterCondition
+  class BaseCondition
     NEW_ACCOUNT_THRESHOLD = 30.days.freeze
 
     NEW_FOLLOWER_THRESHOLD = 3.days.freeze
@@ -82,39 +30,16 @@ class FilterCondition
     ).freeze
 
     def initialize(notification)
-      @notification = notification
       @recipient = notification.account
       @sender = notification.from_account
+      @notification = notification
       @policy = NotificationPolicy.find_or_initialize_by(account: @recipient)
     end
 
-    def filter?
-      return false unless Notification::PROPERTIES[@notification.type][:filterable]
-      return false if override_for_sender?
-
-      from_limited? ||
-        filtered_by_not_following_policy? ||
-        filtered_by_not_followers_policy? ||
-        filtered_by_new_accounts_policy? ||
-        filtered_by_private_mentions_policy?
-    end
-
     private
 
-    def filtered_by_not_following_policy?
-      @policy.filter_not_following? && not_following?
-    end
-
-    def filtered_by_not_followers_policy?
-      @policy.filter_not_followers? && not_follower?
-    end
-
-    def filtered_by_new_accounts_policy?
-      @policy.filter_new_accounts? && new_account?
-    end
-
-    def filtered_by_private_mentions_policy?
-      @policy.filter_private_mentions? && not_following? && private_mention_not_in_response?
+    def filterable_type?
+      Notification::PROPERTIES[@notification.type][:filterable]
     end
 
     def not_following?
@@ -174,6 +99,112 @@ def statuses_that_mention_sender
     end
   end
 
+  class DropCondition < BaseCondition
+    def drop?
+      blocked   = @recipient.unavailable?
+      blocked ||= from_self? && %i(poll severed_relationships moderation_warning).exclude?(@notification.type)
+
+      return blocked if message? && from_staff?
+
+      blocked ||= domain_blocking?
+      blocked ||= @recipient.blocking?(@sender)
+      blocked ||= @recipient.muting_notifications?(@sender)
+      blocked ||= conversation_muted?
+      blocked ||= blocked_mention? if message?
+
+      return true if blocked
+      return false unless filterable_type?
+      return false if override_for_sender?
+
+      blocked_by_limited_accounts_policy? ||
+        blocked_by_not_following_policy? ||
+        blocked_by_not_followers_policy? ||
+        blocked_by_new_accounts_policy? ||
+        blocked_by_private_mentions_policy?
+    end
+
+    private
+
+    def blocked_mention?
+      FeedManager.instance.filter?(:mentions, @notification.target_status, @recipient)
+    end
+
+    def message?
+      @notification.type == :mention
+    end
+
+    def from_staff?
+      @sender.local? && @sender.user.present? && @sender.user_role&.overrides?(@recipient.user_role) && @sender.user_role&.highlighted? && @sender.user_role&.can?(*UserRole::Flags::CATEGORIES[:moderation])
+    end
+
+    def from_self?
+      @recipient.id == @sender.id
+    end
+
+    def domain_blocking?
+      @recipient.domain_blocking?(@sender.domain) && not_following?
+    end
+
+    def conversation_muted?
+      @notification.target_status && @recipient.muting_conversation?(@notification.target_status.conversation)
+    end
+
+    def blocked_by_not_following_policy?
+      @policy.drop_not_following? && not_following?
+    end
+
+    def blocked_by_not_followers_policy?
+      @policy.drop_not_followers? && not_follower?
+    end
+
+    def blocked_by_new_accounts_policy?
+      @policy.drop_new_accounts? && new_account? && not_following?
+    end
+
+    def blocked_by_private_mentions_policy?
+      @policy.drop_private_mentions? && not_following? && private_mention_not_in_response?
+    end
+
+    def blocked_by_limited_accounts_policy?
+      @policy.drop_limited_accounts? && @sender.silenced? && not_following?
+    end
+  end
+
+  class FilterCondition < BaseCondition
+    def filter?
+      return false unless filterable_type?
+      return false if override_for_sender?
+
+      filtered_by_limited_accounts_policy? ||
+        filtered_by_not_following_policy? ||
+        filtered_by_not_followers_policy? ||
+        filtered_by_new_accounts_policy? ||
+        filtered_by_private_mentions_policy?
+    end
+
+    private
+
+    def filtered_by_not_following_policy?
+      @policy.filter_not_following? && not_following?
+    end
+
+    def filtered_by_not_followers_policy?
+      @policy.filter_not_followers? && not_follower?
+    end
+
+    def filtered_by_new_accounts_policy?
+      @policy.filter_new_accounts? && new_account? && not_following?
+    end
+
+    def filtered_by_private_mentions_policy?
+      @policy.filter_private_mentions? && not_following? && private_mention_not_in_response?
+    end
+
+    def filtered_by_limited_accounts_policy?
+      @policy.filter_limited_accounts? && @sender.silenced? && not_following?
+    end
+  end
+
   def call(recipient, type, activity)
     return if recipient.user.nil?
 
@@ -182,7 +213,7 @@ def call(recipient, type, activity)
     @notification = Notification.new(account: @recipient, type: type, activity: @activity)
 
     # For certain conditions we don't need to create a notification at all
-    return if dismiss?
+    return if drop?
 
     @notification.filtered = filter?
     @notification.group_key = notification_group_key
@@ -222,8 +253,8 @@ def notification_group_key
     "#{type_prefix}-#{hour_bucket}"
   end
 
-  def dismiss?
-    DismissCondition.new(@notification).dismiss?
+  def drop?
+    DropCondition.new(@notification).drop?
   end
 
   def filter?
diff --git a/config/routes/api.rb b/config/routes/api.rb
index fa74c025b4ed34..488bdb7453eb8e 100644
--- a/config/routes/api.rb
+++ b/config/routes/api.rb
@@ -336,6 +336,10 @@
     namespace :admin do
       resources :accounts, only: [:index]
     end
+
+    namespace :notifications do
+      resource :policy, only: [:show, :update]
+    end
   end
 
   namespace :v2_alpha do
diff --git a/db/migrate/20240808114841_add_new_notification_policies.rb b/db/migrate/20240808114841_add_new_notification_policies.rb
new file mode 100644
index 00000000000000..9087ee35dcb5c7
--- /dev/null
+++ b/db/migrate/20240808114841_add_new_notification_policies.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class AddNewNotificationPolicies < ActiveRecord::Migration[7.1]
+  def change
+    add_column :notification_policies, :for_not_following, :integer, default: 0, null: false
+    add_column :notification_policies, :for_not_followers, :integer, default: 0, null: false
+    add_column :notification_policies, :for_new_accounts, :integer, default: 0, null: false
+    add_column :notification_policies, :for_private_mentions, :integer, default: 1, null: false
+    add_column :notification_policies, :for_limited_accounts, :integer, default: 1, null: false
+  end
+end
diff --git a/db/migrate/20240808124338_migrate_notifications_policy_v2.rb b/db/migrate/20240808124338_migrate_notifications_policy_v2.rb
new file mode 100644
index 00000000000000..2e0684826a1d54
--- /dev/null
+++ b/db/migrate/20240808124338_migrate_notifications_policy_v2.rb
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+class MigrateNotificationsPolicyV2 < ActiveRecord::Migration[7.1]
+  disable_ddl_transaction!
+
+  # Dummy classes, to make migration possible across version changes
+  class NotificationPolicy < ApplicationRecord; end
+
+  def up
+    NotificationPolicy.in_batches.update_all(<<~SQL.squish)
+      for_not_following = CASE filter_not_following WHEN true THEN 1 ELSE 0 END,
+      for_not_followers = CASE filter_not_following WHEN true THEN 1 ELSE 0 END,
+      for_new_accounts = CASE filter_new_accounts WHEN true THEN 1 ELSE 0 END,
+      for_private_mentions = CASE filter_private_mentions WHEN true THEN 1 ELSE 0 END
+    SQL
+  end
+
+  def down
+    NotificationPolicy.in_batches.update_all(<<~SQL.squish)
+      filter_not_following = CASE for_not_following WHEN 0 THEN false ELSE true END,
+      filter_not_following = CASE for_not_followers WHEN 0 THEN false ELSE true END,
+      filter_new_accounts = CASE for_new_accounts WHEN 0 THEN false ELSE true END,
+      filter_private_mentions = CASE for_private_mentions WHEN 0 THEN false ELSE true END
+    SQL
+  end
+end
diff --git a/db/post_migrate/20240808124339_post_deployment_migrate_notifications_policy_v2.rb b/db/post_migrate/20240808124339_post_deployment_migrate_notifications_policy_v2.rb
new file mode 100644
index 00000000000000..eb0c9097293d0c
--- /dev/null
+++ b/db/post_migrate/20240808124339_post_deployment_migrate_notifications_policy_v2.rb
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+class PostDeploymentMigrateNotificationsPolicyV2 < ActiveRecord::Migration[7.1]
+  disable_ddl_transaction!
+
+  # Dummy classes, to make migration possible across version changes
+  class NotificationPolicy < ApplicationRecord; end
+
+  def up
+    NotificationPolicy.in_batches.update_all(<<~SQL.squish)
+      for_not_following = CASE filter_not_following WHEN true THEN 1 ELSE 0 END,
+      for_not_followers = CASE filter_not_following WHEN true THEN 1 ELSE 0 END,
+      for_new_accounts = CASE filter_new_accounts WHEN true THEN 1 ELSE 0 END,
+      for_private_mentions = CASE filter_private_mentions WHEN true THEN 1 ELSE 0 END
+    SQL
+  end
+
+  def down
+    NotificationPolicy.in_batches.update_all(<<~SQL.squish)
+      filter_not_following = CASE for_not_following WHEN 0 THEN false ELSE true END,
+      filter_not_following = CASE for_not_followers WHEN 0 THEN false ELSE true END,
+      filter_new_accounts = CASE for_new_accounts WHEN 0 THEN false ELSE true END,
+      filter_private_mentions = CASE for_private_mentions WHEN 0 THEN false ELSE true END
+    SQL
+  end
+end
diff --git a/db/post_migrate/20240808125420_drop_old_policies_from_notifications_policy.rb b/db/post_migrate/20240808125420_drop_old_policies_from_notifications_policy.rb
new file mode 100644
index 00000000000000..99ab1e4344dbbc
--- /dev/null
+++ b/db/post_migrate/20240808125420_drop_old_policies_from_notifications_policy.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+class DropOldPoliciesFromNotificationsPolicy < ActiveRecord::Migration[7.1]
+  def change
+    safety_assured do
+      remove_column :notification_policies, :filter_not_following, :boolean, default: false, null: false
+      remove_column :notification_policies, :filter_not_followers, :boolean, default: false, null: false
+      remove_column :notification_policies, :filter_new_accounts, :boolean, default: false, null: false
+      remove_column :notification_policies, :filter_private_mentions, :boolean, default: true, null: false
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index d4796079caeb2a..f01e11792debc3 100644
--- 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_07_24_181224) do
+ActiveRecord::Schema[7.1].define(version: 2024_08_08_125420) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -692,12 +692,13 @@
 
   create_table "notification_policies", force: :cascade do |t|
     t.bigint "account_id", null: false
-    t.boolean "filter_not_following", default: false, null: false
-    t.boolean "filter_not_followers", default: false, null: false
-    t.boolean "filter_new_accounts", default: false, null: false
-    t.boolean "filter_private_mentions", default: true, null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.integer "for_not_following", default: 0, null: false
+    t.integer "for_not_followers", default: 0, null: false
+    t.integer "for_new_accounts", default: 0, null: false
+    t.integer "for_private_mentions", default: 1, null: false
+    t.integer "for_limited_accounts", default: 1, null: false
     t.index ["account_id"], name: "index_notification_policies_on_account_id", unique: true
   end
 
diff --git a/lib/tasks/tests.rake b/lib/tasks/tests.rake
index c8e4dc31cd7f13..cb7fce31399f4d 100644
--- a/lib/tasks/tests.rake
+++ b/lib/tasks/tests.rake
@@ -107,8 +107,8 @@ namespace :tests do
       end
 
       policy = NotificationPolicy.find_by(account: User.find(1).account)
-      unless policy.filter_private_mentions == false && policy.filter_not_following == true
-        puts 'Notification policy not migrated as expected'
+      unless policy.for_private_mentions == 'accept' && policy.for_not_following == 'filter'
+        puts "Notification policy not migrated as expected: #{policy.for_private_mentions.inspect}, #{policy.for_not_following.inspect}"
         exit(1)
       end
 
diff --git a/spec/requests/api/v1/notifications/policies_spec.rb b/spec/requests/api/v1/notifications/policies_spec.rb
index cbd4499772d443..a73d4217be3b08 100644
--- a/spec/requests/api/v1/notifications/policies_spec.rb
+++ b/spec/requests/api/v1/notifications/policies_spec.rb
@@ -51,7 +51,7 @@
 
     it 'changes notification policy and returns an updated json object', :aggregate_failures do
       expect { subject }
-        .to change { NotificationPolicy.find_or_initialize_by(account: user.account).filter_not_following }.from(false).to(true)
+        .to change { NotificationPolicy.find_or_initialize_by(account: user.account).for_not_following.to_sym }.from(:accept).to(:filter)
 
       expect(response).to have_http_status(200)
       expect(body_as_json).to include(
diff --git a/spec/requests/api/v2/notifications/policies_spec.rb b/spec/requests/api/v2/notifications/policies_spec.rb
new file mode 100644
index 00000000000000..f9860b5fb487a1
--- /dev/null
+++ b/spec/requests/api/v2/notifications/policies_spec.rb
@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Policies' do
+  let(:user)    { Fabricate(:user, account_attributes: { username: 'alice' }) }
+  let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+  let(:scopes)  { 'read:notifications write:notifications' }
+  let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
+
+  describe 'GET /api/v2/notifications/policy', :inline_jobs do
+    subject do
+      get '/api/v2/notifications/policy', headers: headers, params: params
+    end
+
+    let(:params) { {} }
+
+    before do
+      Fabricate(:notification_request, account: user.account)
+    end
+
+    it_behaves_like 'forbidden for wrong scope', 'write write:notifications'
+
+    context 'with no options' do
+      it 'returns json with expected attributes', :aggregate_failures do
+        subject
+
+        expect(response).to have_http_status(200)
+        expect(body_as_json).to include(
+          for_not_following: 'accept',
+          for_not_followers: 'accept',
+          for_new_accounts: 'accept',
+          for_private_mentions: 'filter',
+          for_limited_accounts: 'filter',
+          summary: a_hash_including(
+            pending_requests_count: 1,
+            pending_notifications_count: 0
+          )
+        )
+      end
+    end
+  end
+
+  describe 'PUT /api/v2/notifications/policy' do
+    subject do
+      put '/api/v2/notifications/policy', headers: headers, params: params
+    end
+
+    let(:params) { { for_not_following: 'filter', for_limited_accounts: 'drop' } }
+
+    it_behaves_like 'forbidden for wrong scope', 'read read:notifications'
+
+    it 'changes notification policy and returns an updated json object', :aggregate_failures do
+      expect { subject }
+        .to change { NotificationPolicy.find_or_initialize_by(account: user.account).for_not_following.to_sym }.from(:accept).to(:filter)
+        .and change { NotificationPolicy.find_or_initialize_by(account: user.account).for_limited_accounts.to_sym }.from(:filter).to(:drop)
+
+      expect(response).to have_http_status(200)
+      expect(body_as_json).to include(
+        for_not_following: 'filter',
+        for_not_followers: 'accept',
+        for_new_accounts: 'accept',
+        for_private_mentions: 'filter',
+        for_limited_accounts: 'drop',
+        summary: a_hash_including(
+          pending_requests_count: 0,
+          pending_notifications_count: 0
+        )
+      )
+    end
+  end
+end
diff --git a/spec/services/notify_service_spec.rb b/spec/services/notify_service_spec.rb
index d64cfe5907bd4e..935b94c70923ac 100644
--- a/spec/services/notify_service_spec.rb
+++ b/spec/services/notify_service_spec.rb
@@ -196,20 +196,58 @@
     end
   end
 
-  describe NotifyService::DismissCondition do
+  describe NotifyService::DropCondition do
     subject { described_class.new(notification) }
 
     let(:activity) { Fabricate(:mention, status: Fabricate(:status)) }
     let(:notification) { Fabricate(:notification, type: :mention, activity: activity, from_account: activity.status.account, account: activity.account) }
 
-    describe '#dismiss?' do
-      context 'when sender is silenced' do
+    describe '#drop' do
+      context 'when sender is silenced and recipient has a default policy' do
+        before do
+          notification.from_account.silence!
+        end
+
+        it 'returns false' do
+          expect(subject.drop?).to be false
+        end
+      end
+
+      context 'when sender is silenced and recipient has a policy to ignore silenced accounts' do
         before do
           notification.from_account.silence!
+          notification.account.create_notification_policy!(for_limited_accounts: :drop)
         end
 
+        it 'returns true' do
+          expect(subject.drop?).to be true
+        end
+      end
+
+      context 'when sender is new and recipient has a default policy' do
         it 'returns false' do
-          expect(subject.dismiss?).to be false
+          expect(subject.drop?).to be false
+        end
+      end
+
+      context 'when sender is new and recipient has a policy to ignore silenced accounts' do
+        before do
+          notification.account.create_notification_policy!(for_new_accounts: :drop)
+        end
+
+        it 'returns true' do
+          expect(subject.drop?).to be true
+        end
+      end
+
+      context 'when sender is new and followed and recipient has a policy to ignore silenced accounts' do
+        before do
+          notification.account.create_notification_policy!(for_new_accounts: :drop)
+          notification.account.follow!(notification.from_account)
+        end
+
+        it 'returns false' do
+          expect(subject.drop?).to be false
         end
       end
 
@@ -219,7 +257,7 @@
         end
 
         it 'returns true' do
-          expect(subject.dismiss?).to be true
+          expect(subject.drop?).to be true
         end
       end
     end
@@ -250,6 +288,16 @@
             expect(subject.filter?).to be false
           end
         end
+
+        context 'when recipient is allowing limited accounts' do
+          before do
+            notification.account.create_notification_policy!(for_limited_accounts: :accept)
+          end
+
+          it 'returns false' do
+            expect(subject.filter?).to be false
+          end
+        end
       end
 
       context 'when recipient is filtering not-followed senders' do

From 8a5b57f66874dd936bcaa2532f0fb9d3fabc6e5c Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 9 Aug 2024 15:48:54 +0200
Subject: [PATCH 1778/2191] Revert "Support JSON-LD named graph (#31288)"
 (#31355)

---
 app/lib/link_details_extractor.rb       |  4 +--
 spec/lib/link_details_extractor_spec.rb | 36 +++++++------------------
 2 files changed, 11 insertions(+), 29 deletions(-)

diff --git a/app/lib/link_details_extractor.rb b/app/lib/link_details_extractor.rb
index 6929fc1b0f0f13..bd78aef7a9f56c 100644
--- a/app/lib/link_details_extractor.rb
+++ b/app/lib/link_details_extractor.rb
@@ -101,9 +101,7 @@ def root_array(root)
     end
 
     def json
-      @json ||= root_array(Oj.load(@data))
-                .map { |node| JSON::LD::API.compact(node, 'https://schema.org') }
-                .find { |node| SUPPORTED_TYPES.include?(node['type']) } || {}
+      @json ||= root_array(Oj.load(@data)).compact.find { |obj| SUPPORTED_TYPES.include?(obj['@type']) } || {}
     end
   end
 
diff --git a/spec/lib/link_details_extractor_spec.rb b/spec/lib/link_details_extractor_spec.rb
index 7ceb6f511d3913..b1e5cedced3b2d 100644
--- a/spec/lib/link_details_extractor_spec.rb
+++ b/spec/lib/link_details_extractor_spec.rb
@@ -79,16 +79,6 @@
         },
       }.to_json
     end
-    let(:html) { <<~HTML }
-      <!doctype html>
-      <html>
-      <body>
-        <script type="application/ld+json">
-          #{ld_json}
-        </script>
-      </body>
-      </html>
-    HTML
 
     shared_examples 'structured data' do
       it 'extracts the expected values from structured data' do
@@ -234,27 +224,21 @@
           },
         }.to_json
       end
+      let(:html) { <<~HTML }
+        <!doctype html>
+        <html>
+        <body>
+          <script type="application/ld+json">
+            #{ld_json}
+          </script>
+        </body>
+        </html>
+      HTML
 
       it 'joins author names' do
         expect(subject.author_name).to eq 'Author 1, Author 2'
       end
     end
-
-    context 'with named graph' do
-      let(:ld_json) do
-        {
-          '@context' => 'https://schema.org',
-          '@graph' => [
-            '@type' => 'NewsArticle',
-            'headline' => "What's in a name",
-          ],
-        }.to_json
-      end
-
-      it 'descends into @graph node' do
-        expect(subject.title).to eq "What's in a name"
-      end
-    end
   end
 
   context 'when Open Graph protocol data is present' do

From 170157570447d30732445f6339b0c7b2fe7617d8 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 9 Aug 2024 16:21:55 +0200
Subject: [PATCH 1779/2191] Add option to ignore filtered notifications to the
 web interface (#31342)

---
 .../mastodon/api/notification_policies.ts     |   4 +-
 .../api_types/notification_policies.ts        |  11 +-
 .../mastodon/components/dropdown_selector.tsx |   2 +-
 .../components/policy_controls.tsx            | 133 ++++++++++-----
 .../components/select_with_label.tsx          | 153 ++++++++++++++++++
 .../components/ignore_notifications_modal.jsx | 108 +++++++++++++
 .../features/ui/components/modal_root.jsx     |   2 +
 .../features/ui/util/async-components.js      |   4 +
 app/javascript/mastodon/locales/en.json       |  19 ++-
 .../400-24px/person_alert-fill.svg            |   1 +
 .../material-icons/400-24px/person_alert.svg  |   1 +
 .../400-24px/shield_question-fill.svg         |   1 +
 .../400-24px/shield_question.svg              |   1 +
 .../styles/mastodon/components.scss           |   7 +
 14 files changed, 403 insertions(+), 44 deletions(-)
 create mode 100644 app/javascript/mastodon/features/notifications/components/select_with_label.tsx
 create mode 100644 app/javascript/mastodon/features/ui/components/ignore_notifications_modal.jsx
 create mode 100644 app/javascript/material-icons/400-24px/person_alert-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/person_alert.svg
 create mode 100644 app/javascript/material-icons/400-24px/shield_question-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/shield_question.svg

diff --git a/app/javascript/mastodon/api/notification_policies.ts b/app/javascript/mastodon/api/notification_policies.ts
index 4032134fb584f9..7747397556832f 100644
--- a/app/javascript/mastodon/api/notification_policies.ts
+++ b/app/javascript/mastodon/api/notification_policies.ts
@@ -2,8 +2,8 @@ import { apiRequestGet, apiRequestPut } from 'mastodon/api';
 import type { NotificationPolicyJSON } from 'mastodon/api_types/notification_policies';
 
 export const apiGetNotificationPolicy = () =>
-  apiRequestGet<NotificationPolicyJSON>('/v1/notifications/policy');
+  apiRequestGet<NotificationPolicyJSON>('/v2/notifications/policy');
 
 export const apiUpdateNotificationsPolicy = (
   policy: Partial<NotificationPolicyJSON>,
-) => apiRequestPut<NotificationPolicyJSON>('/v1/notifications/policy', policy);
+) => apiRequestPut<NotificationPolicyJSON>('/v2/notifications/policy', policy);
diff --git a/app/javascript/mastodon/api_types/notification_policies.ts b/app/javascript/mastodon/api_types/notification_policies.ts
index 0f4a2d132e0e0e..1c3970782cb464 100644
--- a/app/javascript/mastodon/api_types/notification_policies.ts
+++ b/app/javascript/mastodon/api_types/notification_policies.ts
@@ -1,10 +1,13 @@
 // See app/serializers/rest/notification_policy_serializer.rb
 
+export type NotificationPolicyValue = 'accept' | 'filter' | 'drop';
+
 export interface NotificationPolicyJSON {
-  filter_not_following: boolean;
-  filter_not_followers: boolean;
-  filter_new_accounts: boolean;
-  filter_private_mentions: boolean;
+  for_not_following: NotificationPolicyValue;
+  for_not_followers: NotificationPolicyValue;
+  for_new_accounts: NotificationPolicyValue;
+  for_private_mentions: NotificationPolicyValue;
+  for_limited_accounts: NotificationPolicyValue;
   summary: {
     pending_requests_count: number;
     pending_notifications_count: number;
diff --git a/app/javascript/mastodon/components/dropdown_selector.tsx b/app/javascript/mastodon/components/dropdown_selector.tsx
index f8bf96c634294a..b86d2d0f808392 100644
--- a/app/javascript/mastodon/components/dropdown_selector.tsx
+++ b/app/javascript/mastodon/components/dropdown_selector.tsx
@@ -13,7 +13,7 @@ const listenerOptions = supportsPassiveEvents
   ? { passive: true, capture: true }
   : true;
 
-interface SelectItem {
+export interface SelectItem {
   value: string;
   icon?: string;
   iconComponent?: IconProp;
diff --git a/app/javascript/mastodon/features/notifications/components/policy_controls.tsx b/app/javascript/mastodon/features/notifications/components/policy_controls.tsx
index d6bc412994161b..032c0ea48359e7 100644
--- a/app/javascript/mastodon/features/notifications/components/policy_controls.tsx
+++ b/app/javascript/mastodon/features/notifications/components/policy_controls.tsx
@@ -1,16 +1,52 @@
 import { useCallback } from 'react';
 
-import { FormattedMessage } from 'react-intl';
+import { useIntl, defineMessages, FormattedMessage } from 'react-intl';
 
+import { openModal } from 'mastodon/actions/modal';
 import { updateNotificationsPolicy } from 'mastodon/actions/notification_policies';
+import type { AppDispatch } from 'mastodon/store';
 import { useAppSelector, useAppDispatch } from 'mastodon/store';
 
-import { CheckboxWithLabel } from './checkbox_with_label';
-
-// eslint-disable-next-line @typescript-eslint/no-empty-function
-const noop = () => {};
+import { SelectWithLabel } from './select_with_label';
+
+const messages = defineMessages({
+  accept: { id: 'notifications.policy.accept', defaultMessage: 'Accept' },
+  accept_hint: {
+    id: 'notifications.policy.accept_hint',
+    defaultMessage: 'Show in notifications',
+  },
+  filter: { id: 'notifications.policy.filter', defaultMessage: 'Filter' },
+  filter_hint: {
+    id: 'notifications.policy.filter_hint',
+    defaultMessage: 'Send to filtered notifications inbox',
+  },
+  drop: { id: 'notifications.policy.drop', defaultMessage: 'Ignore' },
+  drop_hint: {
+    id: 'notifications.policy.drop_hint',
+    defaultMessage: 'Send to the void, never to be seen again',
+  },
+});
+
+// TODO: change the following when we change the API
+const changeFilter = (
+  dispatch: AppDispatch,
+  filterType: string,
+  value: string,
+) => {
+  if (value === 'drop') {
+    dispatch(
+      openModal({
+        modalType: 'IGNORE_NOTIFICATIONS',
+        modalProps: { filterType },
+      }),
+    );
+  } else {
+    void dispatch(updateNotificationsPolicy({ [filterType]: value }));
+  }
+};
 
 export const PolicyControls: React.FC = () => {
+  const intl = useIntl();
   const dispatch = useAppDispatch();
 
   const notificationPolicy = useAppSelector(
@@ -18,56 +54,74 @@ export const PolicyControls: React.FC = () => {
   );
 
   const handleFilterNotFollowing = useCallback(
-    (checked: boolean) => {
-      void dispatch(
-        updateNotificationsPolicy({ filter_not_following: checked }),
-      );
+    (value: string) => {
+      changeFilter(dispatch, 'for_not_following', value);
     },
     [dispatch],
   );
 
   const handleFilterNotFollowers = useCallback(
-    (checked: boolean) => {
-      void dispatch(
-        updateNotificationsPolicy({ filter_not_followers: checked }),
-      );
+    (value: string) => {
+      changeFilter(dispatch, 'for_not_followers', value);
     },
     [dispatch],
   );
 
   const handleFilterNewAccounts = useCallback(
-    (checked: boolean) => {
-      void dispatch(
-        updateNotificationsPolicy({ filter_new_accounts: checked }),
-      );
+    (value: string) => {
+      changeFilter(dispatch, 'for_new_accounts', value);
     },
     [dispatch],
   );
 
   const handleFilterPrivateMentions = useCallback(
-    (checked: boolean) => {
-      void dispatch(
-        updateNotificationsPolicy({ filter_private_mentions: checked }),
-      );
+    (value: string) => {
+      changeFilter(dispatch, 'for_private_mentions', value);
+    },
+    [dispatch],
+  );
+
+  const handleFilterLimitedAccounts = useCallback(
+    (value: string) => {
+      changeFilter(dispatch, 'for_limited_accounts', value);
     },
     [dispatch],
   );
 
   if (!notificationPolicy) return null;
 
+  const options = [
+    {
+      value: 'accept',
+      text: intl.formatMessage(messages.accept),
+      meta: intl.formatMessage(messages.accept_hint),
+    },
+    {
+      value: 'filter',
+      text: intl.formatMessage(messages.filter),
+      meta: intl.formatMessage(messages.filter_hint),
+    },
+    {
+      value: 'drop',
+      text: intl.formatMessage(messages.drop),
+      meta: intl.formatMessage(messages.drop_hint),
+    },
+  ];
+
   return (
     <section>
       <h3>
         <FormattedMessage
           id='notifications.policy.title'
-          defaultMessage='Filter out notifications from…'
+          defaultMessage='Manage notifications from…'
         />
       </h3>
 
       <div className='column-settings__row'>
-        <CheckboxWithLabel
-          checked={notificationPolicy.filter_not_following}
+        <SelectWithLabel
+          value={notificationPolicy.for_not_following}
           onChange={handleFilterNotFollowing}
+          options={options}
         >
           <strong>
             <FormattedMessage
@@ -81,11 +135,12 @@ export const PolicyControls: React.FC = () => {
               defaultMessage='Until you manually approve them'
             />
           </span>
-        </CheckboxWithLabel>
+        </SelectWithLabel>
 
-        <CheckboxWithLabel
-          checked={notificationPolicy.filter_not_followers}
+        <SelectWithLabel
+          value={notificationPolicy.for_not_followers}
           onChange={handleFilterNotFollowers}
+          options={options}
         >
           <strong>
             <FormattedMessage
@@ -100,11 +155,12 @@ export const PolicyControls: React.FC = () => {
               values={{ days: 3 }}
             />
           </span>
-        </CheckboxWithLabel>
+        </SelectWithLabel>
 
-        <CheckboxWithLabel
-          checked={notificationPolicy.filter_new_accounts}
+        <SelectWithLabel
+          value={notificationPolicy.for_new_accounts}
           onChange={handleFilterNewAccounts}
+          options={options}
         >
           <strong>
             <FormattedMessage
@@ -119,11 +175,12 @@ export const PolicyControls: React.FC = () => {
               values={{ days: 30 }}
             />
           </span>
-        </CheckboxWithLabel>
+        </SelectWithLabel>
 
-        <CheckboxWithLabel
-          checked={notificationPolicy.filter_private_mentions}
+        <SelectWithLabel
+          value={notificationPolicy.for_private_mentions}
           onChange={handleFilterPrivateMentions}
+          options={options}
         >
           <strong>
             <FormattedMessage
@@ -137,9 +194,13 @@ export const PolicyControls: React.FC = () => {
               defaultMessage="Filtered unless it's in reply to your own mention or if you follow the sender"
             />
           </span>
-        </CheckboxWithLabel>
+        </SelectWithLabel>
 
-        <CheckboxWithLabel checked disabled onChange={noop}>
+        <SelectWithLabel
+          value={notificationPolicy.for_limited_accounts}
+          onChange={handleFilterLimitedAccounts}
+          options={options}
+        >
           <strong>
             <FormattedMessage
               id='notifications.policy.filter_limited_accounts_title'
@@ -152,7 +213,7 @@ export const PolicyControls: React.FC = () => {
               defaultMessage='Limited by server moderators'
             />
           </span>
-        </CheckboxWithLabel>
+        </SelectWithLabel>
       </div>
     </section>
   );
diff --git a/app/javascript/mastodon/features/notifications/components/select_with_label.tsx b/app/javascript/mastodon/features/notifications/components/select_with_label.tsx
new file mode 100644
index 00000000000000..413267c0f8cb1b
--- /dev/null
+++ b/app/javascript/mastodon/features/notifications/components/select_with_label.tsx
@@ -0,0 +1,153 @@
+import type { PropsWithChildren } from 'react';
+import { useCallback, useState, useRef } from 'react';
+
+import classNames from 'classnames';
+
+import type { Placement, State as PopperState } from '@popperjs/core';
+import Overlay from 'react-overlays/Overlay';
+
+import ArrowDropDownIcon from '@/material-icons/400-24px/arrow_drop_down.svg?react';
+import type { SelectItem } from 'mastodon/components/dropdown_selector';
+import { DropdownSelector } from 'mastodon/components/dropdown_selector';
+import { Icon } from 'mastodon/components/icon';
+
+interface DropdownProps {
+  value: string;
+  options: SelectItem[];
+  disabled?: boolean;
+  onChange: (value: string) => void;
+  placement?: Placement;
+}
+
+const Dropdown: React.FC<DropdownProps> = ({
+  value,
+  options,
+  disabled,
+  onChange,
+  placement: initialPlacement = 'bottom-end',
+}) => {
+  const activeElementRef = useRef<Element | null>(null);
+  const containerRef = useRef(null);
+  const [isOpen, setOpen] = useState<boolean>(false);
+  const [placement, setPlacement] = useState<Placement>(initialPlacement);
+
+  const handleToggle = useCallback(() => {
+    if (
+      isOpen &&
+      activeElementRef.current &&
+      activeElementRef.current instanceof HTMLElement
+    ) {
+      activeElementRef.current.focus({ preventScroll: true });
+    }
+
+    setOpen(!isOpen);
+  }, [isOpen, setOpen]);
+
+  const handleMouseDown = useCallback(() => {
+    if (!isOpen) activeElementRef.current = document.activeElement;
+  }, [isOpen]);
+
+  const handleKeyDown = useCallback(
+    (e: React.KeyboardEvent) => {
+      switch (e.key) {
+        case ' ':
+        case 'Enter':
+          if (!isOpen) activeElementRef.current = document.activeElement;
+          break;
+      }
+    },
+    [isOpen],
+  );
+
+  const handleClose = useCallback(() => {
+    if (
+      isOpen &&
+      activeElementRef.current &&
+      activeElementRef.current instanceof HTMLElement
+    )
+      activeElementRef.current.focus({ preventScroll: true });
+    setOpen(false);
+  }, [isOpen]);
+
+  const handleOverlayEnter = useCallback(
+    (state: Partial<PopperState>) => {
+      if (state.placement) setPlacement(state.placement);
+    },
+    [setPlacement],
+  );
+
+  const valueOption = options.find((item) => item.value === value);
+
+  return (
+    <div ref={containerRef}>
+      <button
+        type='button'
+        onClick={handleToggle}
+        onMouseDown={handleMouseDown}
+        onKeyDown={handleKeyDown}
+        disabled={disabled}
+        className={classNames('dropdown-button', { active: isOpen })}
+      >
+        <span className='dropdown-button__label'>{valueOption?.text}</span>
+        <Icon id='down' icon={ArrowDropDownIcon} />
+      </button>
+
+      <Overlay
+        show={isOpen}
+        offset={[5, 5]}
+        placement={placement}
+        flip
+        target={containerRef}
+        popperConfig={{ strategy: 'fixed', onFirstUpdate: handleOverlayEnter }}
+      >
+        {({ props, placement }) => (
+          <div {...props}>
+            <div
+              className={`dropdown-animation privacy-dropdown__dropdown ${placement}`}
+            >
+              <DropdownSelector
+                items={options}
+                value={value}
+                onClose={handleClose}
+                onChange={onChange}
+                classNamePrefix='privacy-dropdown'
+              />
+            </div>
+          </div>
+        )}
+      </Overlay>
+    </div>
+  );
+};
+
+interface Props {
+  value: string;
+  options: SelectItem[];
+  disabled?: boolean;
+  onChange: (value: string) => void;
+}
+
+export const SelectWithLabel: React.FC<PropsWithChildren<Props>> = ({
+  value,
+  options,
+  disabled,
+  children,
+  onChange,
+}) => {
+  return (
+    <label className='app-form__toggle'>
+      <div className='app-form__toggle__label'>{children}</div>
+
+      <div className='app-form__toggle__toggle'>
+        <div>
+          <Dropdown
+            value={value}
+            onChange={onChange}
+            disabled={disabled}
+            options={options}
+          />
+        </div>
+      </div>
+    </label>
+  );
+};
diff --git a/app/javascript/mastodon/features/ui/components/ignore_notifications_modal.jsx b/app/javascript/mastodon/features/ui/components/ignore_notifications_modal.jsx
new file mode 100644
index 00000000000000..b163b8ce4703aa
--- /dev/null
+++ b/app/javascript/mastodon/features/ui/components/ignore_notifications_modal.jsx
@@ -0,0 +1,108 @@
+import PropTypes from 'prop-types';
+import { useCallback } from 'react';
+
+import { FormattedMessage } from 'react-intl';
+
+import { useDispatch } from 'react-redux';
+
+import InventoryIcon from '@/material-icons/400-24px/inventory_2.svg?react';
+import PersonAlertIcon from '@/material-icons/400-24px/person_alert.svg?react';
+import ShieldQuestionIcon from '@/material-icons/400-24px/shield_question.svg?react';
+import { closeModal } from 'mastodon/actions/modal';
+import { updateNotificationsPolicy } from 'mastodon/actions/notification_policies';
+import { Button } from 'mastodon/components/button';
+import { Icon } from 'mastodon/components/icon';
+
+export const IgnoreNotificationsModal = ({ filterType }) => {
+  const dispatch = useDispatch();
+
+  const handleClick = useCallback(() => {
+    dispatch(closeModal({ modalType: undefined, ignoreFocus: false }));
+    void dispatch(updateNotificationsPolicy({ [filterType]: 'drop' }));
+  }, [dispatch, filterType]);
+
+  const handleSecondaryClick = useCallback(() => {
+    dispatch(closeModal({ modalType: undefined, ignoreFocus: false }));
+    void dispatch(updateNotificationsPolicy({ [filterType]: 'filter' }));
+  }, [dispatch, filterType]);
+
+  const handleCancel = useCallback(() => {
+    dispatch(closeModal({ modalType: undefined, ignoreFocus: false }));
+  }, [dispatch]);
+
+  let title = null;
+
+  switch(filterType) {
+  case 'for_not_following':
+    title = <FormattedMessage id='ignore_notifications_modal.not_following_title' defaultMessage="Ignore notifications from people you don't follow?" />;
+    break;
+  case 'for_not_followers':
+    title = <FormattedMessage id='ignore_notifications_modal.not_followers_title' defaultMessage='Ignore notifications from people not following you?' />;
+    break;
+  case 'for_new_accounts':
+    title = <FormattedMessage id='ignore_notifications_modal.new_accounts_title' defaultMessage='Ignore notifications from new accounts?' />;
+    break;
+  case 'for_private_mentions':
+    title = <FormattedMessage id='ignore_notifications_modal.private_mentions_title' defaultMessage='Ignore notifications from unsolicited Private Mentions?' />;
+    break;
+  case 'for_limited_accounts':
+    title = <FormattedMessage id='ignore_notifications_modal.limited_accounts_title' defaultMessage='Ignore notifications from moderated accounts?' />;
+    break;
+  }
+
+  return (
+    <div className='modal-root__modal safety-action-modal'>
+      <div className='safety-action-modal__top'>
+        <div className='safety-action-modal__header'>
+          <h1>{title}</h1>
+        </div>
+
+        <div className='safety-action-modal__bullet-points'>
+          <div>
+            <div className='safety-action-modal__bullet-points__icon'><Icon icon={InventoryIcon} /></div>
+            <div><FormattedMessage id='ignore_notifications_modal.filter_to_review_separately' defaultMessage='You can review filtered notifications speparately' /></div>
+          </div>
+
+          <div>
+            <div className='safety-action-modal__bullet-points__icon'><Icon icon={PersonAlertIcon} /></div>
+            <div><FormattedMessage id='ignore_notifications_modal.filter_to_act_users' defaultMessage="You'll still be able to accept, reject, or report users" /></div>
+          </div>
+
+          <div>
+            <div className='safety-action-modal__bullet-points__icon'><Icon icon={ShieldQuestionIcon} /></div>
+            <div><FormattedMessage id='ignore_notifications_modal.filter_to_avoid_confusion' defaultMessage='Filtering helps avoid potential confusion' /></div>
+          </div>
+        </div>
+
+        <div>
+          <FormattedMessage id='ignore_notifications_modal.disclaimer' defaultMessage="Mastodon cannot inform users that you've ignored their notifications. Ignoring notifications will not stop the messages themselves from being sent." />
+        </div>
+      </div>
+
+
+      <div className='safety-action-modal__bottom'>
+        <div className='safety-action-modal__actions'>
+          <Button onClick={handleSecondaryClick} secondary>
+            <FormattedMessage id='ignore_notifications_modal.filter_instead' defaultMessage='Filter instead' />
+          </Button>
+
+          <div className='spacer' />
+
+          <button onClick={handleCancel} className='link-button'>
+            <FormattedMessage id='confirmation_modal.cancel' defaultMessage='Cancel' />
+          </button>
+
+          <button onClick={handleClick} className='link-button'>
+            <FormattedMessage id='ignore_notifications_modal.ignore' defaultMessage='Ignore notifications' />
+          </button>
+        </div>
+      </div>
+    </div>
+  );
+};
+
+IgnoreNotificationsModal.propTypes = {
+  filterType: PropTypes.string.isRequired,
+};
+
+export default IgnoreNotificationsModal;
diff --git a/app/javascript/mastodon/features/ui/components/modal_root.jsx b/app/javascript/mastodon/features/ui/components/modal_root.jsx
index 3e900a06670a26..64933fd1ae560f 100644
--- a/app/javascript/mastodon/features/ui/components/modal_root.jsx
+++ b/app/javascript/mastodon/features/ui/components/modal_root.jsx
@@ -17,6 +17,7 @@ import {
   InteractionModal,
   SubscribedLanguagesModal,
   ClosedRegistrationsModal,
+  IgnoreNotificationsModal,
 } from 'mastodon/features/ui/util/async-components';
 import { getScrollbarWidth } from 'mastodon/utils/scrollbar';
 
@@ -70,6 +71,7 @@ export const MODAL_COMPONENTS = {
   'SUBSCRIBED_LANGUAGES': SubscribedLanguagesModal,
   'INTERACTION': InteractionModal,
   'CLOSED_REGISTRATIONS': ClosedRegistrationsModal,
+  'IGNORE_NOTIFICATIONS': IgnoreNotificationsModal,
 };
 
 export default class ModalRoot extends PureComponent {
diff --git a/app/javascript/mastodon/features/ui/util/async-components.js b/app/javascript/mastodon/features/ui/util/async-components.js
index 7c4372d5a6442b..7e9a7af00a405e 100644
--- a/app/javascript/mastodon/features/ui/util/async-components.js
+++ b/app/javascript/mastodon/features/ui/util/async-components.js
@@ -134,6 +134,10 @@ export function ReportModal () {
   return import(/* webpackChunkName: "modals/report_modal" */'../components/report_modal');
 }
 
+export function IgnoreNotificationsModal () {
+  return import(/* webpackChunkName: "modals/domain_block_modal" */'../components/ignore_notifications_modal');
+}
+
 export function MediaGallery () {
   return import(/* webpackChunkName: "status/media_gallery" */'../../../components/media_gallery');
 }
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index 86afa7cd0d7cbc..8df1eef8ca8832 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -356,6 +356,17 @@
   "home.pending_critical_update.link": "See updates",
   "home.pending_critical_update.title": "Critical security update available!",
   "home.show_announcements": "Show announcements",
+  "ignore_notifications_modal.disclaimer": "Mastodon cannot inform users that you've ignored their notifications. Ignoring notifications will not stop the messages themselves from being sent.",
+  "ignore_notifications_modal.filter_instead": "Filter instead",
+  "ignore_notifications_modal.filter_to_act_users": "Filtering helps avoid potential confusion",
+  "ignore_notifications_modal.filter_to_avoid_confusion": "Filtering helps avoid potential confusion",
+  "ignore_notifications_modal.filter_to_review_separately": "You can review filtered notifications speparately",
+  "ignore_notifications_modal.ignore": "Ignore notifications",
+  "ignore_notifications_modal.limited_accounts_title": "Ignore notifications from moderated accounts?",
+  "ignore_notifications_modal.new_accounts_title": "Ignore notifications from new accounts?",
+  "ignore_notifications_modal.not_followers_title": "Ignore notifications from people not following you?",
+  "ignore_notifications_modal.not_following_title": "Ignore notifications from people you don't follow?",
+  "ignore_notifications_modal.private_mentions_title": "Ignore notifications from unsolicited Private Mentions?",
   "interaction_modal.description.favourite": "With an account on Mastodon, you can favorite this post to let the author know you appreciate it and save it for later.",
   "interaction_modal.description.follow": "With an account on Mastodon, you can follow {name} to receive their posts in your home feed.",
   "interaction_modal.description.reblog": "With an account on Mastodon, you can boost this post to share it with your own followers.",
@@ -550,6 +561,12 @@
   "notifications.permission_denied": "Desktop notifications are unavailable due to previously denied browser permissions request",
   "notifications.permission_denied_alert": "Desktop notifications can't be enabled, as browser permission has been denied before",
   "notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
+  "notifications.policy.accept": "Accept",
+  "notifications.policy.accept_hint": "Show in notifications",
+  "notifications.policy.drop": "Ignore",
+  "notifications.policy.drop_hint": "Send to the void, never to be seen again",
+  "notifications.policy.filter": "Filter",
+  "notifications.policy.filter_hint": "Send to filtered notifications inbox",
   "notifications.policy.filter_limited_accounts_hint": "Limited by server moderators",
   "notifications.policy.filter_limited_accounts_title": "Moderated accounts",
   "notifications.policy.filter_new_accounts.hint": "Created within the past {days, plural, one {one day} other {# days}}",
@@ -560,7 +577,7 @@
   "notifications.policy.filter_not_following_title": "People you don't follow",
   "notifications.policy.filter_private_mentions_hint": "Filtered unless it's in reply to your own mention or if you follow the sender",
   "notifications.policy.filter_private_mentions_title": "Unsolicited private mentions",
-  "notifications.policy.title": "Filter out notifications from…",
+  "notifications.policy.title": "Manage notifications from…",
   "notifications_permission_banner.enable": "Enable desktop notifications",
   "notifications_permission_banner.how_to_control": "To receive notifications when Mastodon isn't open, enable desktop notifications. You can control precisely which types of interactions generate desktop notifications through the {icon} button above once they're enabled.",
   "notifications_permission_banner.title": "Never miss a thing",
diff --git a/app/javascript/material-icons/400-24px/person_alert-fill.svg b/app/javascript/material-icons/400-24px/person_alert-fill.svg
new file mode 100644
index 00000000000000..ddbecc60537fce
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/person_alert-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M800-520q-17 0-28.5-11.5T760-560q0-17 11.5-28.5T800-600q17 0 28.5 11.5T840-560q0 17-11.5 28.5T800-520Zm-40-120v-200h80v200h-80ZM360-480q-66 0-113-47t-47-113q0-66 47-113t113-47q66 0 113 47t47 113q0 66-47 113t-113 47ZM40-160v-112q0-34 17.5-62.5T104-378q62-31 126-46.5T360-440q66 0 130 15.5T616-378q29 15 46.5 43.5T680-272v112H40Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/person_alert.svg b/app/javascript/material-icons/400-24px/person_alert.svg
new file mode 100644
index 00000000000000..292ea32154768b
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/person_alert.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M800-520q-17 0-28.5-11.5T760-560q0-17 11.5-28.5T800-600q17 0 28.5 11.5T840-560q0 17-11.5 28.5T800-520Zm-40-120v-200h80v200h-80ZM360-480q-66 0-113-47t-47-113q0-66 47-113t113-47q66 0 113 47t47 113q0 66-47 113t-113 47ZM40-160v-112q0-34 17.5-62.5T104-378q62-31 126-46.5T360-440q66 0 130 15.5T616-378q29 15 46.5 43.5T680-272v112H40Zm80-80h480v-32q0-11-5.5-20T580-306q-54-27-109-40.5T360-360q-56 0-111 13.5T140-306q-9 5-14.5 14t-5.5 20v32Zm240-320q33 0 56.5-23.5T440-640q0-33-23.5-56.5T360-720q-33 0-56.5 23.5T280-640q0 33 23.5 56.5T360-560Zm0-80Zm0 400Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/shield_question-fill.svg b/app/javascript/material-icons/400-24px/shield_question-fill.svg
new file mode 100644
index 00000000000000..c647567a00d0f7
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/shield_question-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M480-80q-139-35-229.5-159.5T160-516v-244l320-120 320 120v244q0 152-90.5 276.5T480-80Zm0-200q17 0 29.5-12.5T522-322q0-17-12.5-29.5T480-364q-17 0-29.5 12.5T438-322q0 17 12.5 29.5T480-280Zm-29-128h60v-22q0-11 5-21 6-14 16-23.5t21-19.5q17-17 29.5-38t12.5-46q0-45-34.5-73.5T480-680q-40 0-71.5 23T366-596l54 22q6-20 22.5-34t37.5-14q22 0 38.5 13t16.5 33q0 17-10.5 31.5T501-518q-12 11-24 22.5T458-469q-7 14-7 29.5v31.5Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/shield_question.svg b/app/javascript/material-icons/400-24px/shield_question.svg
new file mode 100644
index 00000000000000..342ac0800e525b
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/shield_question.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M480-80q-139-35-229.5-159.5T160-516v-244l320-120 320 120v244q0 152-90.5 276.5T480-80Zm0-84q104-33 172-132t68-220v-189l-240-90-240 90v189q0 121 68 220t172 132Zm0-316Zm0 200q17 0 29.5-12.5T522-322q0-17-12.5-29.5T480-364q-17 0-29.5 12.5T438-322q0 17 12.5 29.5T480-280Zm-29-128h60v-22q0-11 5-21 6-14 16-23.5t21-19.5q17-17 29.5-38t12.5-46q0-45-34.5-73.5T480-680q-40 0-71.5 23T366-596l54 22q6-20 22.5-34t37.5-14q22 0 38.5 13t16.5 33q0 17-10.5 31.5T501-518q-12 11-24 22.5T458-469q-7 14-7 29.5v31.5Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 3c938ac4c59d87..0fec52f375395e 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -877,6 +877,13 @@ body > [data-popper-placement] {
   text-overflow: ellipsis;
   white-space: nowrap;
 
+  &[disabled] {
+    cursor: default;
+    color: $highlight-text-color;
+    border-color: $highlight-text-color;
+    opacity: 0.5;
+  }
+
   .icon {
     width: 15px;
     height: 15px;

From eaedd52def6bec787c48386f5e102f57de94403e Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 9 Aug 2024 16:48:05 +0200
Subject: [PATCH 1780/2191] Fix incorrect rate limit on PUT requests (#31356)

---
 config/initializers/rack_attack.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/initializers/rack_attack.rb b/config/initializers/rack_attack.rb
index 14fab7ecda170e..b4eaab1daa2390 100644
--- a/config/initializers/rack_attack.rb
+++ b/config/initializers/rack_attack.rb
@@ -142,7 +142,7 @@ def paging_request?
   end
 
   throttle('throttle_password_change/account', limit: 10, period: 10.minutes) do |req|
-    req.warden_user_id if req.put? || (req.patch? && req.path_matches?('/auth'))
+    req.warden_user_id if (req.put? || req.patch?) && (req.path_matches?('/auth') || req.path_matches?('/auth/password'))
   end
 
   self.throttled_responder = lambda do |request|

From 658addcbf783f6baa922d11c9524ebb9ddbcbc59 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 9 Aug 2024 16:56:39 +0200
Subject: [PATCH 1781/2191] Add ability to report, block and mute from
 notification requests list (#31309)

Co-authored-by: Renaud Chaput <renchap@gmail.com>
---
 .../mastodon/actions/notifications.js         |  64 ++++++++
 .../mastodon/components/check_box.tsx         |  13 +-
 .../components/notification_request.jsx       |  75 ++++++++-
 .../features/notifications/requests.jsx       | 144 +++++++++++++++++-
 app/javascript/mastodon/locales/en.json       |  13 ++
 .../reducers/notification_requests.js         |   5 +
 .../check_indeterminate_small-fill.svg        |   1 +
 .../400-24px/check_indeterminate_small.svg    |   1 +
 .../styles/mastodon/components.scss           | 111 +++++++++++---
 9 files changed, 395 insertions(+), 32 deletions(-)
 create mode 100644 app/javascript/material-icons/400-24px/check_indeterminate_small-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/check_indeterminate_small.svg

diff --git a/app/javascript/mastodon/actions/notifications.js b/app/javascript/mastodon/actions/notifications.js
index 48afb003ad32c8..7d6a9d5a3296fe 100644
--- a/app/javascript/mastodon/actions/notifications.js
+++ b/app/javascript/mastodon/actions/notifications.js
@@ -64,6 +64,14 @@ export const NOTIFICATION_REQUEST_DISMISS_REQUEST = 'NOTIFICATION_REQUEST_DISMIS
 export const NOTIFICATION_REQUEST_DISMISS_SUCCESS = 'NOTIFICATION_REQUEST_DISMISS_SUCCESS';
 export const NOTIFICATION_REQUEST_DISMISS_FAIL    = 'NOTIFICATION_REQUEST_DISMISS_FAIL';
 
+export const NOTIFICATION_REQUESTS_ACCEPT_REQUEST = 'NOTIFICATION_REQUESTS_ACCEPT_REQUEST';
+export const NOTIFICATION_REQUESTS_ACCEPT_SUCCESS = 'NOTIFICATION_REQUESTS_ACCEPT_SUCCESS';
+export const NOTIFICATION_REQUESTS_ACCEPT_FAIL    = 'NOTIFICATION_REQUESTS_ACCEPT_FAIL';
+
+export const NOTIFICATION_REQUESTS_DISMISS_REQUEST = 'NOTIFICATION_REQUESTS_DISMISS_REQUEST';
+export const NOTIFICATION_REQUESTS_DISMISS_SUCCESS = 'NOTIFICATION_REQUESTS_DISMISS_SUCCESS';
+export const NOTIFICATION_REQUESTS_DISMISS_FAIL    = 'NOTIFICATION_REQUESTS_DISMISS_FAIL';
+
 export const NOTIFICATIONS_FOR_REQUEST_FETCH_REQUEST = 'NOTIFICATIONS_FOR_REQUEST_FETCH_REQUEST';
 export const NOTIFICATIONS_FOR_REQUEST_FETCH_SUCCESS = 'NOTIFICATIONS_FOR_REQUEST_FETCH_SUCCESS';
 export const NOTIFICATIONS_FOR_REQUEST_FETCH_FAIL    = 'NOTIFICATIONS_FOR_REQUEST_FETCH_FAIL';
@@ -496,6 +504,62 @@ export const dismissNotificationRequestFail = (id, error) => ({
   error,
 });
 
+export const acceptNotificationRequests = (ids) => (dispatch, getState) => {
+  const count = ids.reduce((count, id) => count + selectNotificationCountForRequest(getState(), id), 0);
+  dispatch(acceptNotificationRequestsRequest(ids));
+
+  api().post(`/api/v1/notifications/requests/accept`, { id: ids }).then(() => {
+    dispatch(acceptNotificationRequestsSuccess(ids));
+    dispatch(decreasePendingNotificationsCount(count));
+  }).catch(err => {
+    dispatch(acceptNotificationRequestFail(ids, err));
+  });
+};
+
+export const acceptNotificationRequestsRequest = ids => ({
+  type: NOTIFICATION_REQUESTS_ACCEPT_REQUEST,
+  ids,
+});
+
+export const acceptNotificationRequestsSuccess = ids => ({
+  type: NOTIFICATION_REQUESTS_ACCEPT_SUCCESS,
+  ids,
+});
+
+export const acceptNotificationRequestsFail = (ids, error) => ({
+  type: NOTIFICATION_REQUESTS_ACCEPT_FAIL,
+  ids,
+  error,
+});
+
+export const dismissNotificationRequests = (ids) => (dispatch, getState) => {
+  const count = ids.reduce((count, id) => count + selectNotificationCountForRequest(getState(), id), 0);
+  dispatch(acceptNotificationRequestsRequest(ids));
+
+  api().post(`/api/v1/notifications/requests/dismiss`, { id: ids }).then(() => {
+    dispatch(dismissNotificationRequestsSuccess(ids));
+    dispatch(decreasePendingNotificationsCount(count));
+  }).catch(err => {
+    dispatch(dismissNotificationRequestFail(ids, err));
+  });
+};
+
+export const dismissNotificationRequestsRequest = ids => ({
+  type: NOTIFICATION_REQUESTS_DISMISS_REQUEST,
+  ids,
+});
+
+export const dismissNotificationRequestsSuccess = ids => ({
+  type: NOTIFICATION_REQUESTS_DISMISS_SUCCESS,
+  ids,
+});
+
+export const dismissNotificationRequestsFail = (ids, error) => ({
+  type: NOTIFICATION_REQUESTS_DISMISS_FAIL,
+  ids,
+  error,
+});
+
 export const fetchNotificationsForRequest = accountId => (dispatch, getState) => {
   const current = getState().getIn(['notificationRequests', 'current']);
   const params = { account_id: accountId };
diff --git a/app/javascript/mastodon/components/check_box.tsx b/app/javascript/mastodon/components/check_box.tsx
index 7da8ef0ac5602d..9bd137abf57cce 100644
--- a/app/javascript/mastodon/components/check_box.tsx
+++ b/app/javascript/mastodon/components/check_box.tsx
@@ -1,5 +1,6 @@
 import classNames from 'classnames';
 
+import CheckIndeterminateSmallIcon from '@/material-icons/400-24px/check_indeterminate_small.svg?react';
 import DoneIcon from '@/material-icons/400-24px/done.svg?react';
 
 import { Icon } from './icon';
@@ -7,6 +8,7 @@ import { Icon } from './icon';
 interface Props {
   value: string;
   checked: boolean;
+  indeterminate: boolean;
   name: string;
   onChange: (event: React.ChangeEvent<HTMLInputElement>) => void;
   label: React.ReactNode;
@@ -16,6 +18,7 @@ export const CheckBox: React.FC<Props> = ({
   name,
   value,
   checked,
+  indeterminate,
   onChange,
   label,
 }) => {
@@ -29,8 +32,14 @@ export const CheckBox: React.FC<Props> = ({
         onChange={onChange}
       />
 
-      <span className={classNames('check-box__input', { checked })}>
-        {checked && <Icon id='check' icon={DoneIcon} />}
+      <span
+        className={classNames('check-box__input', { checked, indeterminate })}
+      >
+        {indeterminate ? (
+          <Icon id='indeterminate' icon={CheckIndeterminateSmallIcon} />
+        ) : (
+          checked && <Icon id='check' icon={DoneIcon} />
+        )}
       </span>
 
       <span>{label}</span>
diff --git a/app/javascript/mastodon/features/notifications/components/notification_request.jsx b/app/javascript/mastodon/features/notifications/components/notification_request.jsx
index fc96bd2ee73c46..2f378942bc9aad 100644
--- a/app/javascript/mastodon/features/notifications/components/notification_request.jsx
+++ b/app/javascript/mastodon/features/notifications/components/notification_request.jsx
@@ -3,15 +3,21 @@ import { useCallback } from 'react';
 
 import { defineMessages, useIntl } from 'react-intl';
 
-import { Link } from 'react-router-dom';
+import classNames from 'classnames';
+import { Link, useHistory } from 'react-router-dom';
 
 import { useSelector, useDispatch } from 'react-redux';
 
 import DeleteIcon from '@/material-icons/400-24px/delete.svg?react';
-import DoneIcon from '@/material-icons/400-24px/done.svg?react';
+import MoreHorizIcon from '@/material-icons/400-24px/more_horiz.svg?react';
+import { initBlockModal } from 'mastodon/actions/blocks';
+import { initMuteModal } from 'mastodon/actions/mutes';
 import { acceptNotificationRequest, dismissNotificationRequest } from 'mastodon/actions/notifications';
+import { initReport } from 'mastodon/actions/reports';
 import { Avatar } from 'mastodon/components/avatar';
+import { CheckBox } from 'mastodon/components/check_box';
 import { IconButton } from 'mastodon/components/icon_button';
+import DropdownMenuContainer from 'mastodon/containers/dropdown_menu_container';
 import { makeGetAccount } from 'mastodon/selectors';
 import { toCappedNumber } from 'mastodon/utils/numbers';
 
@@ -20,12 +26,18 @@ const getAccount = makeGetAccount();
 const messages = defineMessages({
   accept: { id: 'notification_requests.accept', defaultMessage: 'Accept' },
   dismiss: { id: 'notification_requests.dismiss', defaultMessage: 'Dismiss' },
+  view: { id: 'notification_requests.view', defaultMessage: 'View notifications' },
+  mute: { id: 'account.mute', defaultMessage: 'Mute @{name}' },
+  block: { id: 'account.block', defaultMessage: 'Block @{name}' },
+  report: { id: 'status.report', defaultMessage: 'Report @{name}' },
+  more: { id: 'status.more', defaultMessage: 'More' },
 });
 
-export const NotificationRequest = ({ id, accountId, notificationsCount }) => {
+export const NotificationRequest = ({ id, accountId, notificationsCount, checked, showCheckbox, toggleCheck }) => {
   const dispatch = useDispatch();
   const account = useSelector(state => getAccount(state, accountId));
   const intl = useIntl();
+  const { push: historyPush } = useHistory();
 
   const handleDismiss = useCallback(() => {
     dispatch(dismissNotificationRequest(id));
@@ -35,9 +47,51 @@ export const NotificationRequest = ({ id, accountId, notificationsCount }) => {
     dispatch(acceptNotificationRequest(id));
   }, [dispatch, id]);
 
+  const handleMute = useCallback(() => {
+    dispatch(initMuteModal(account));
+  }, [dispatch, account]);
+
+  const handleBlock = useCallback(() => {
+    dispatch(initBlockModal(account));
+  }, [dispatch, account]);
+
+  const handleReport = useCallback(() => {
+    dispatch(initReport(account));
+  }, [dispatch, account]);
+
+  const handleView = useCallback(() => {
+    historyPush(`/notifications/requests/${id}`);
+  }, [historyPush, id]);
+
+  const menu = [
+    { text: intl.formatMessage(messages.view), action: handleView },
+    null,
+    { text: intl.formatMessage(messages.accept), action: handleAccept },
+    null,
+    { text: intl.formatMessage(messages.mute, { name: account.username }), action: handleMute, dangerous: true },
+    { text: intl.formatMessage(messages.block, { name: account.username }), action: handleBlock, dangerous: true },
+    { text: intl.formatMessage(messages.report, { name: account.username }), action: handleReport, dangerous: true },
+  ];
+
+  const handleCheck = useCallback(() => {
+    toggleCheck(id);
+  }, [toggleCheck, id]);
+
+  const handleClick = useCallback((e) => {
+    if (showCheckbox) {
+      toggleCheck(id);
+      e.preventDefault();
+      e.stopPropagation();
+    }
+  }, [toggleCheck, id, showCheckbox]);
+
   return (
-    <div className='notification-request'>
-      <Link to={`/notifications/requests/${id}`} className='notification-request__link'>
+    /* eslint-disable-next-line jsx-a11y/no-static-element-interactions -- this is just a minor affordance, but we will need a comprehensive accessibility pass */
+    <div className={classNames('notification-request', showCheckbox && 'notification-request--forced-checkbox')} onClick={handleClick}>
+      <div className='notification-request__checkbox' aria-hidden={!showCheckbox}>
+        <CheckBox checked={checked} onChange={handleCheck} />
+      </div>
+      <Link to={`/notifications/requests/${id}`} className='notification-request__link' onClick={handleClick} title={account?.acct}>
         <Avatar account={account} size={40} counter={toCappedNumber(notificationsCount)} />
 
         <div className='notification-request__name'>
@@ -51,7 +105,13 @@ export const NotificationRequest = ({ id, accountId, notificationsCount }) => {
 
       <div className='notification-request__actions'>
         <IconButton iconComponent={DeleteIcon} onClick={handleDismiss} title={intl.formatMessage(messages.dismiss)} />
-        <IconButton iconComponent={DoneIcon} onClick={handleAccept} title={intl.formatMessage(messages.accept)} />
+        <DropdownMenuContainer
+          items={menu}
+          icons='ellipsis-h'
+          iconComponent={MoreHorizIcon}
+          direction='right'
+          title={intl.formatMessage(messages.more)}
+        />
       </div>
     </div>
   );
@@ -61,4 +121,7 @@ NotificationRequest.propTypes = {
   id: PropTypes.string.isRequired,
   accountId: PropTypes.string.isRequired,
   notificationsCount: PropTypes.string.isRequired,
+  checked: PropTypes.bool,
+  showCheckbox: PropTypes.bool,
+  toggleCheck: PropTypes.func,
 };
diff --git a/app/javascript/mastodon/features/notifications/requests.jsx b/app/javascript/mastodon/features/notifications/requests.jsx
index 2fe8dc2b6c20c6..d5f191b734d8b2 100644
--- a/app/javascript/mastodon/features/notifications/requests.jsx
+++ b/app/javascript/mastodon/features/notifications/requests.jsx
@@ -1,5 +1,5 @@
 import PropTypes from 'prop-types';
-import { useRef, useCallback, useEffect } from 'react';
+import { useRef, useCallback, useEffect, useState } from 'react';
 
 import { defineMessages, useIntl, FormattedMessage } from 'react-intl';
 
@@ -8,11 +8,15 @@ import { Helmet } from 'react-helmet';
 import { useSelector, useDispatch } from 'react-redux';
 
 import InventoryIcon from '@/material-icons/400-24px/inventory_2.svg?react';
-import { fetchNotificationRequests, expandNotificationRequests } from 'mastodon/actions/notifications';
+import MoreHorizIcon from '@/material-icons/400-24px/more_horiz.svg?react';
+import { openModal } from 'mastodon/actions/modal';
+import { fetchNotificationRequests, expandNotificationRequests, acceptNotificationRequests, dismissNotificationRequests } from 'mastodon/actions/notifications';
 import { changeSetting } from 'mastodon/actions/settings';
+import { CheckBox } from 'mastodon/components/check_box';
 import Column from 'mastodon/components/column';
 import ColumnHeader from 'mastodon/components/column_header';
 import ScrollableList from 'mastodon/components/scrollable_list';
+import DropdownMenuContainer from 'mastodon/containers/dropdown_menu_container';
 
 import { NotificationRequest } from './components/notification_request';
 import { PolicyControls } from './components/policy_controls';
@@ -20,7 +24,18 @@ import SettingToggle from './components/setting_toggle';
 
 const messages = defineMessages({
   title: { id: 'notification_requests.title', defaultMessage: 'Filtered notifications' },
-  maximize: { id: 'notification_requests.maximize', defaultMessage: 'Maximize' }
+  maximize: { id: 'notification_requests.maximize', defaultMessage: 'Maximize' },
+  more: { id: 'status.more', defaultMessage: 'More' },
+  acceptAll: { id: 'notification_requests.accept_all', defaultMessage: 'Accept all' },
+  dismissAll: { id: 'notification_requests.dismiss_all', defaultMessage: 'Dismiss all' },
+  acceptMultiple: { id: 'notification_requests.accept_multiple', defaultMessage: '{count, plural, one {Accept # request} other {Accept # requests}}' },
+  dismissMultiple: { id: 'notification_requests.dismiss_multiple', defaultMessage: '{count, plural, one {Dismiss # request} other {Dismiss # requests}}' },
+  confirmAcceptAllTitle: { id: 'notification_requests.confirm_accept_all.title', defaultMessage: 'Accept notification requests?' },
+  confirmAcceptAllMessage: { id: 'notification_requests.confirm_accept_all.message', defaultMessage: 'You are about to accept {count, plural, one {one notification request} other {# notification requests}}. Are you sure you want to proceed?' },
+  confirmAcceptAllButton: { id: 'notification_requests.confirm_accept_all.button', defaultMessage: 'Accept all' },
+  confirmDismissAllTitle: { id: 'notification_requests.confirm_dismiss_all.title', defaultMessage: 'Dismiss notification requests?' },
+  confirmDismissAllMessage: { id: 'notification_requests.confirm_dismiss_all.message', defaultMessage: "You are about to dismiss {count, plural, one {one notification request} other {# notification requests}}. You won't be able to easily access {count, plural, one {it} other {them}} again. Are you sure you want to proceed?" },
+  confirmDismissAllButton: { id: 'notification_requests.confirm_dismiss_all.button', defaultMessage: 'Dismiss all' },
 });
 
 const ColumnSettings = () => {
@@ -55,6 +70,94 @@ const ColumnSettings = () => {
   );
 };
 
+const SelectRow = ({selectAllChecked, toggleSelectAll, selectedItems, selectionMode, setSelectionMode}) => {
+  const intl = useIntl();
+  const dispatch = useDispatch();
+
+  const selectedCount = selectedItems.length;
+
+  const handleAcceptAll = useCallback(() => {
+    dispatch(openModal({
+      modalType: 'CONFIRM',
+      modalProps: {
+        title: intl.formatMessage(messages.confirmAcceptAllTitle),
+        message: intl.formatMessage(messages.confirmAcceptAllMessage, { count: selectedItems.length }),
+        confirm: intl.formatMessage(messages.confirmAcceptAllButton),
+        onConfirm: () =>
+          dispatch(acceptNotificationRequests(selectedItems)),
+      },
+    }));
+  }, [dispatch, intl, selectedItems]);
+
+  const handleDismissAll = useCallback(() => {
+    dispatch(openModal({
+      modalType: 'CONFIRM',
+      modalProps: {
+        title: intl.formatMessage(messages.confirmDismissAllTitle),
+        message: intl.formatMessage(messages.confirmDismissAllMessage, { count: selectedItems.length }),
+        confirm: intl.formatMessage(messages.confirmDismissAllButton),
+        onConfirm: () =>
+          dispatch(dismissNotificationRequests(selectedItems)),
+      },
+    }));
+  }, [dispatch, intl, selectedItems]);
+
+  const handleToggleSelectionMode = useCallback(() => {
+    setSelectionMode((mode) => !mode);
+  }, [setSelectionMode]);
+
+  const menu = selectedCount === 0 ?
+    [
+      { text: intl.formatMessage(messages.acceptAll), action: handleAcceptAll },
+      { text: intl.formatMessage(messages.dismissAll), action: handleDismissAll },
+    ] : [
+      { text: intl.formatMessage(messages.acceptMultiple, { count: selectedCount }), action: handleAcceptAll },
+      { text: intl.formatMessage(messages.dismissMultiple, { count: selectedCount }), action: handleDismissAll },
+    ];
+
+  return (
+    <div className='column-header__select-row'>
+      {selectionMode && (
+        <div className='column-header__select-row__checkbox'>
+          <CheckBox checked={selectAllChecked} indeterminate={selectedCount > 0 && !selectAllChecked} onChange={toggleSelectAll} />
+        </div>
+      )}
+      <div className='column-header__select-row__selection-mode'>
+        <button className='text-btn' tabIndex={0} onClick={handleToggleSelectionMode}>
+          {selectionMode ? (
+            <FormattedMessage id='notification_requests.exit_selection_mode' defaultMessage='Cancel' />
+          ) :
+            (
+              <FormattedMessage id='notification_requests.enter_selection_mode' defaultMessage='Select' />
+            )}
+        </button>
+      </div>
+      {selectedCount > 0 &&
+        <div className='column-header__select-row__selected-count'>
+          {selectedCount} selected
+        </div>
+      }
+      <div className='column-header__select-row__actions'>
+        <DropdownMenuContainer
+          items={menu}
+          icons='ellipsis-h'
+          iconComponent={MoreHorizIcon}
+          direction='right'
+          title={intl.formatMessage(messages.more)}
+        />
+      </div>
+    </div>
+  );
+};
+
+SelectRow.propTypes = {
+  selectAllChecked: PropTypes.func.isRequired,
+  toggleSelectAll: PropTypes.func.isRequired,
+  selectedItems: PropTypes.arrayOf(PropTypes.string).isRequired,
+  selectionMode: PropTypes.bool,
+  setSelectionMode: PropTypes.func.isRequired,
+};
+
 export const NotificationRequests = ({ multiColumn }) => {
   const columnRef = useRef();
   const intl = useIntl();
@@ -63,10 +166,40 @@ export const NotificationRequests = ({ multiColumn }) => {
   const notificationRequests = useSelector(state => state.getIn(['notificationRequests', 'items']));
   const hasMore = useSelector(state => !!state.getIn(['notificationRequests', 'next']));
 
+  const [selectionMode, setSelectionMode] = useState(false);
+  const [checkedRequestIds, setCheckedRequestIds] = useState([]);
+  const [selectAllChecked, setSelectAllChecked] = useState(false);
+
   const handleHeaderClick = useCallback(() => {
     columnRef.current?.scrollTop();
   }, [columnRef]);
 
+  const handleCheck = useCallback(id => {
+    setCheckedRequestIds(ids => {
+      const position = ids.indexOf(id);
+
+      if(position > -1)
+        ids.splice(position, 1);
+      else
+        ids.push(id);
+
+      setSelectAllChecked(ids.length === notificationRequests.size);
+
+      return [...ids];
+    });
+  }, [setCheckedRequestIds, notificationRequests]);
+
+  const toggleSelectAll = useCallback(() => {
+    setSelectAllChecked(checked => {
+      if(checked)
+        setCheckedRequestIds([]);
+      else
+        setCheckedRequestIds(notificationRequests.map(request => request.get('id')).toArray());
+
+      return !checked;
+    });
+  }, [notificationRequests]);
+
   const handleLoadMore = useCallback(() => {
     dispatch(expandNotificationRequests());
   }, [dispatch]);
@@ -84,6 +217,8 @@ export const NotificationRequests = ({ multiColumn }) => {
         onClick={handleHeaderClick}
         multiColumn={multiColumn}
         showBackButton
+        appendContent={
+          <SelectRow selectionMode={selectionMode} setSelectionMode={setSelectionMode} selectAllChecked={selectAllChecked} toggleSelectAll={toggleSelectAll} selectedItems={checkedRequestIds} />}
       >
         <ColumnSettings />
       </ColumnHeader>
@@ -104,6 +239,9 @@ export const NotificationRequests = ({ multiColumn }) => {
             id={request.get('id')}
             accountId={request.get('account')}
             notificationsCount={request.get('notifications_count')}
+            showCheckbox={selectionMode}
+            checked={checkedRequestIds.includes(request.get('id'))}
+            toggleCheck={handleCheck}
           />
         ))}
       </ScrollableList>
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index 8df1eef8ca8832..388fb80de52817 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -518,13 +518,26 @@
   "notification.status": "{name} just posted",
   "notification.update": "{name} edited a post",
   "notification_requests.accept": "Accept",
+  "notification_requests.accept_all": "Accept all",
+  "notification_requests.accept_multiple": "{count, plural, one {Accept # request} other {Accept # requests}}",
+  "notification_requests.confirm_accept_all.button": "Accept all",
+  "notification_requests.confirm_accept_all.message": "You are about to accept {count, plural, one {one notification request} other {# notification requests}}. Are you sure you want to proceed?",
+  "notification_requests.confirm_accept_all.title": "Accept notification requests?",
+  "notification_requests.confirm_dismiss_all.button": "Dismiss all",
+  "notification_requests.confirm_dismiss_all.message": "You are about to dismiss {count, plural, one {one notification request} other {# notification requests}}. You won't be able to easily access {count, plural, one {it} other {them}} again. Are you sure you want to proceed?",
+  "notification_requests.confirm_dismiss_all.title": "Dismiss notification requests?",
   "notification_requests.dismiss": "Dismiss",
+  "notification_requests.dismiss_all": "Dismiss all",
+  "notification_requests.dismiss_multiple": "{count, plural, one {Dismiss # request} other {Dismiss # requests}}",
+  "notification_requests.enter_selection_mode": "Select",
+  "notification_requests.exit_selection_mode": "Cancel",
   "notification_requests.explainer_for_limited_account": "Notifications from this account have been filtered because the account has been limited by a moderator.",
   "notification_requests.explainer_for_limited_remote_account": "Notifications from this account have been filtered because the account or its server has been limited by a moderator.",
   "notification_requests.maximize": "Maximize",
   "notification_requests.minimize_banner": "Minimize filtered notifications banner",
   "notification_requests.notifications_from": "Notifications from {name}",
   "notification_requests.title": "Filtered notifications",
+  "notification_requests.view": "View notifications",
   "notifications.clear": "Clear notifications",
   "notifications.clear_confirmation": "Are you sure you want to permanently clear all your notifications?",
   "notifications.clear_title": "Clear notifications?",
diff --git a/app/javascript/mastodon/reducers/notification_requests.js b/app/javascript/mastodon/reducers/notification_requests.js
index 1aaf167fa67dcf..f73c641965a0c5 100644
--- a/app/javascript/mastodon/reducers/notification_requests.js
+++ b/app/javascript/mastodon/reducers/notification_requests.js
@@ -13,6 +13,8 @@ import {
   NOTIFICATION_REQUEST_FETCH_FAIL,
   NOTIFICATION_REQUEST_ACCEPT_REQUEST,
   NOTIFICATION_REQUEST_DISMISS_REQUEST,
+  NOTIFICATION_REQUESTS_ACCEPT_REQUEST,
+  NOTIFICATION_REQUESTS_DISMISS_REQUEST,
   NOTIFICATIONS_FOR_REQUEST_FETCH_REQUEST,
   NOTIFICATIONS_FOR_REQUEST_FETCH_SUCCESS,
   NOTIFICATIONS_FOR_REQUEST_FETCH_FAIL,
@@ -83,6 +85,9 @@ export const notificationRequestsReducer = (state = initialState, action) => {
   case NOTIFICATION_REQUEST_ACCEPT_REQUEST:
   case NOTIFICATION_REQUEST_DISMISS_REQUEST:
     return removeRequest(state, action.id);
+  case NOTIFICATION_REQUESTS_ACCEPT_REQUEST:
+  case NOTIFICATION_REQUESTS_DISMISS_REQUEST:
+    return action.ids.reduce((state, id) => removeRequest(state, id), state);
   case blockAccountSuccess.type:
     return removeRequestByAccount(state, action.payload.relationship.id);
   case muteAccountSuccess.type:
diff --git a/app/javascript/material-icons/400-24px/check_indeterminate_small-fill.svg b/app/javascript/material-icons/400-24px/check_indeterminate_small-fill.svg
new file mode 100644
index 00000000000000..d78d33e6567c1d
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/check_indeterminate_small-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M240-440v-80h480v80H240Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/check_indeterminate_small.svg b/app/javascript/material-icons/400-24px/check_indeterminate_small.svg
new file mode 100644
index 00000000000000..d78d33e6567c1d
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/check_indeterminate_small.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M240-440v-80h480v80H240Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 0fec52f375395e..fb615300b15adc 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -4320,6 +4320,36 @@ a.status-card {
   }
 }
 
+.column-header__select-row {
+  border-width: 0 1px 1px;
+  border-style: solid;
+  border-color: var(--background-border-color);
+  padding: 15px;
+  display: flex;
+  align-items: center;
+  gap: 8px;
+
+  &__checkbox .check-box {
+    display: flex;
+  }
+
+  &__selection-mode {
+    flex-grow: 1;
+
+    .text-btn:hover {
+      text-decoration: underline;
+    }
+  }
+
+  &__actions {
+    .icon-button {
+      border-radius: 4px;
+      border: 1px solid var(--background-border-color);
+      padding: 5px;
+    }
+  }
+}
+
 .column-header {
   display: flex;
   font-size: 16px;
@@ -7467,20 +7497,9 @@ a.status-card {
     flex: 0 0 auto;
     border-radius: 50%;
 
-    &.checked {
+    &.checked,
+    &.indeterminate {
       border-color: $ui-highlight-color;
-
-      &::before {
-        position: absolute;
-        left: 2px;
-        top: 2px;
-        content: '';
-        display: block;
-        border-radius: 50%;
-        width: 12px;
-        height: 12px;
-        background: $ui-highlight-color;
-      }
     }
 
     .icon {
@@ -7490,19 +7509,28 @@ a.status-card {
   }
 }
 
+.radio-button.checked::before {
+  position: absolute;
+  left: 2px;
+  top: 2px;
+  content: '';
+  display: block;
+  border-radius: 50%;
+  width: 12px;
+  height: 12px;
+  background: $ui-highlight-color;
+}
+
 .check-box {
   &__input {
     width: 18px;
     height: 18px;
     border-radius: 2px;
 
-    &.checked {
+    &.checked,
+    &.indeterminate {
       background: $ui-highlight-color;
       color: $white;
-
-      &::before {
-        display: none;
-      }
     }
   }
 }
@@ -10223,12 +10251,28 @@ noscript {
 }
 
 .notification-request {
+  $padding: 15px;
+
   display: flex;
-  align-items: center;
-  gap: 16px;
-  padding: 15px;
+  padding: $padding;
+  gap: 8px;
+  position: relative;
   border-bottom: 1px solid var(--background-border-color);
 
+  &__checkbox {
+    position: absolute;
+    inset-inline-start: $padding;
+    top: 50%;
+    transform: translateY(-50%);
+    width: 0;
+    overflow: hidden;
+    opacity: 0;
+
+    .check-box {
+      display: flex;
+    }
+  }
+
   &__link {
     display: flex;
     align-items: center;
@@ -10286,6 +10330,31 @@ noscript {
       padding: 5px;
     }
   }
+
+  .notification-request__link {
+    transition: padding-inline-start 0.1s ease-in-out;
+  }
+
+  &--forced-checkbox {
+    cursor: pointer;
+
+    &:hover {
+      background: lighten($ui-base-color, 1%);
+    }
+
+    .notification-request__checkbox {
+      opacity: 1;
+      width: 30px;
+    }
+
+    .notification-request__link {
+      padding-inline-start: 30px;
+    }
+
+    .notification-request__actions {
+      display: none;
+    }
+  }
 }
 
 .more-from-author {

From cc2949b797ca85b841d023bb54db27d70878356c Mon Sep 17 00:00:00 2001
From: Michael Stanclift <mx@vmstan.com>
Date: Thu, 8 Aug 2024 12:31:06 -0500
Subject: [PATCH 1782/2191] [Glitch] Fix styling issues with notification
 settings and mobile borders

Port 664bef35730542791c44c739b8f39e37d7baddd3 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/styles/components.scss    | 15 ++++++++
 .../flavours/glitch/styles/emoji_picker.scss  |  5 ---
 .../glitch/styles/mastodon-light/diff.scss    |  6 ---
 .../styles/mastodon-light/variables.scss      |  2 +-
 .../flavours/glitch/styles/reset.scss         | 37 -------------------
 5 files changed, 16 insertions(+), 49 deletions(-)

diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index cd1b04d2848053..c2bb1c320f3984 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -2961,6 +2961,11 @@ $ui-header-logo-wordmark-width: 99px;
     &.privacy-policy {
       border-top: 1px solid var(--background-border-color);
       border-radius: 4px;
+
+      @media screen and (max-width: $no-gap-breakpoint) {
+        border-top: 0;
+        border-bottom: 0;
+      }
     }
   }
 }
@@ -4726,6 +4731,11 @@ a.status-card {
 .column-header__collapsible-inner {
   border: 1px solid var(--background-border-color);
   border-top: 0;
+
+  @media screen and (max-width: $no-gap-breakpoint) {
+    border-left: 0;
+    border-right: 0;
+  }
 }
 
 .column-header__setting-btn {
@@ -8207,6 +8217,11 @@ noscript {
       width: 100%;
     }
   }
+
+  @media screen and (max-width: $no-gap-breakpoint) {
+    border-left: 0;
+    border-right: 0;
+  }
 }
 
 .drawer__backdrop {
diff --git a/app/javascript/flavours/glitch/styles/emoji_picker.scss b/app/javascript/flavours/glitch/styles/emoji_picker.scss
index 3652ad4abbbbaf..68e016d44b877a 100644
--- a/app/javascript/flavours/glitch/styles/emoji_picker.scss
+++ b/app/javascript/flavours/glitch/styles/emoji_picker.scss
@@ -83,11 +83,6 @@
   max-height: 35vh;
   padding: 0 6px 6px;
   will-change: transform;
-
-  &::-webkit-scrollbar-track:hover,
-  &::-webkit-scrollbar-track:active {
-    background-color: rgba($base-overlay-background, 0.3);
-  }
 }
 
 .emoji-mart-search {
diff --git a/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss b/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss
index 73ec36c1b68bf8..21156290682212 100644
--- a/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss
+++ b/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss
@@ -214,12 +214,6 @@ html {
   border-top-color: lighten($ui-base-color, 8%);
 }
 
-.column-header__collapsible-inner {
-  background: darken($ui-base-color, 4%);
-  border: 1px solid var(--background-border-color);
-  border-bottom: 0;
-}
-
 .column-settings__hashtags .column-select__option {
   color: $white;
 }
diff --git a/app/javascript/flavours/glitch/styles/mastodon-light/variables.scss b/app/javascript/flavours/glitch/styles/mastodon-light/variables.scss
index 9f571b3f2600b9..9d4fd60945a7d5 100644
--- a/app/javascript/flavours/glitch/styles/mastodon-light/variables.scss
+++ b/app/javascript/flavours/glitch/styles/mastodon-light/variables.scss
@@ -21,7 +21,7 @@ $valid-value-color: $success-green !default;
 
 $ui-base-color: $classic-secondary-color !default;
 $ui-base-lighter-color: #b0c0cf;
-$ui-primary-color: #9bcbed;
+$ui-primary-color: $classic-primary-color !default;
 $ui-secondary-color: $classic-base-color !default;
 $ui-highlight-color: $classic-highlight-color !default;
 
diff --git a/app/javascript/flavours/glitch/styles/reset.scss b/app/javascript/flavours/glitch/styles/reset.scss
index f54ed5bc79b1a7..903b6c804fcf50 100644
--- a/app/javascript/flavours/glitch/styles/reset.scss
+++ b/app/javascript/flavours/glitch/styles/reset.scss
@@ -56,40 +56,3 @@ table {
 html {
   scrollbar-color: lighten($ui-base-color, 4%) rgba($base-overlay-background, 0.1);
 }
-
-::-webkit-scrollbar {
-  width: 12px;
-  height: 12px;
-}
-
-::-webkit-scrollbar-thumb {
-  background: lighten($ui-base-color, 4%);
-  border: 0px none $base-border-color;
-  border-radius: 50px;
-}
-
-::-webkit-scrollbar-thumb:hover {
-  background: lighten($ui-base-color, 6%);
-}
-
-::-webkit-scrollbar-thumb:active {
-  background: lighten($ui-base-color, 4%);
-}
-
-::-webkit-scrollbar-track {
-  border: 0px none $base-border-color;
-  border-radius: 0;
-  background: rgba($base-overlay-background, 0.1);
-}
-
-::-webkit-scrollbar-track:hover {
-  background: $ui-base-color;
-}
-
-::-webkit-scrollbar-track:active {
-  background: $ui-base-color;
-}
-
-::-webkit-scrollbar-corner {
-  background: transparent;
-}

From e7be55fd737f9b6e1664561f034006fbdd187846 Mon Sep 17 00:00:00 2001
From: Michael Stanclift <mx@vmstan.com>
Date: Thu, 8 Aug 2024 14:23:15 -0500
Subject: [PATCH 1783/2191] [Glitch] Fix list creation textbox styling

Port 389549e7838291f09bc291c7559730fe3f2aad58 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/styles/components.scss      | 7 +++----
 .../flavours/glitch/styles/mastodon-light/diff.scss        | 4 ++++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index c2bb1c320f3984..ce94fac4100b37 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -4086,18 +4086,17 @@ input.glitch-setting-text {
   display: block;
   box-sizing: border-box;
   margin: 0;
-  color: $inverted-text-color;
-  background: $white;
+  color: $primary-text-color;
+  background: $ui-base-color;
   padding: 7px 10px;
   font-family: inherit;
   font-size: 14px;
   line-height: 22px;
   border-radius: 4px;
-  border: 1px solid $white;
+  border: 1px solid var(--background-border-color);
 
   &:focus {
     outline: 0;
-    border-color: lighten($ui-highlight-color, 12%);
   }
 
   &__wrapper {
diff --git a/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss b/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss
index 21156290682212..abf5d5ef3584fe 100644
--- a/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss
+++ b/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss
@@ -614,3 +614,7 @@ a.sparkline {
     background: darken($ui-base-color, 10%);
   }
 }
+
+.setting-text {
+  background: darken($ui-base-color, 10%);
+}

From 5a9f526a172b115eac3b6aa486ef4e613891b361 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Thu, 8 Aug 2024 22:20:35 +0200
Subject: [PATCH 1784/2191] [Glitch] Update notification labels for mentions

Port 2095d0f2b08c52a39380bb8b303851e475c6b3a7 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../components/notification_mention.tsx       | 54 +++++++++++--------
 1 file changed, 32 insertions(+), 22 deletions(-)

diff --git a/app/javascript/flavours/glitch/features/notifications_v2/components/notification_mention.tsx b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_mention.tsx
index 2868cddde01b30..91e7445cebf423 100644
--- a/app/javascript/flavours/glitch/features/notifications_v2/components/notification_mention.tsx
+++ b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_mention.tsx
@@ -2,26 +2,33 @@ import { FormattedMessage } from 'react-intl';
 
 import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
 import ReplyIcon from '@/material-icons/400-24px/reply-fill.svg?react';
-import type { StatusVisibility } from 'flavours/glitch/api_types/statuses';
+import { me } from 'flavours/glitch/initial_state';
 import type { NotificationGroupMention } from 'flavours/glitch/models/notification_group';
+import type { Status } from 'flavours/glitch/models/status';
 import { useAppSelector } from 'flavours/glitch/store';
 
 import type { LabelRenderer } from './notification_group_with_status';
 import { NotificationWithStatus } from './notification_with_status';
 
-const labelRenderer: LabelRenderer = (values) => (
+const mentionLabelRenderer: LabelRenderer = () => (
+  <FormattedMessage id='notification.label.mention' defaultMessage='Mention' />
+);
+
+const privateMentionLabelRenderer: LabelRenderer = () => (
   <FormattedMessage
-    id='notification.mention'
-    defaultMessage='{name} mentioned you'
-    values={values}
+    id='notification.label.private_mention'
+    defaultMessage='Private mention'
   />
 );
 
-const privateMentionLabelRenderer: LabelRenderer = (values) => (
+const replyLabelRenderer: LabelRenderer = () => (
+  <FormattedMessage id='notification.label.reply' defaultMessage='Reply' />
+);
+
+const privateReplyLabelRenderer: LabelRenderer = () => (
   <FormattedMessage
-    id='notification.private_mention'
-    defaultMessage='{name} privately mentioned you'
-    values={values}
+    id='notification.label.private_reply'
+    defaultMessage='Private reply'
   />
 );
 
@@ -29,27 +36,30 @@ export const NotificationMention: React.FC<{
   notification: NotificationGroupMention;
   unread: boolean;
 }> = ({ notification, unread }) => {
-  const statusVisibility = useAppSelector(
-    (state) =>
-      state.statuses.getIn([
-        notification.statusId,
-        'visibility',
-      ]) as StatusVisibility,
-  );
+  const [isDirect, isReply] = useAppSelector((state) => {
+    const status = state.statuses.get(notification.statusId) as Status;
+
+    return [
+      status.get('visibility') === 'direct',
+      status.get('in_reply_to_account_id') === me,
+    ] as const;
+  });
+
+  let labelRenderer = mentionLabelRenderer;
+
+  if (isReply && isDirect) labelRenderer = privateReplyLabelRenderer;
+  else if (isReply) labelRenderer = replyLabelRenderer;
+  else if (isDirect) labelRenderer = privateMentionLabelRenderer;
 
   return (
     <NotificationWithStatus
       type='mention'
-      icon={statusVisibility === 'direct' ? AlternateEmailIcon : ReplyIcon}
+      icon={isReply ? ReplyIcon : AlternateEmailIcon}
       iconId='reply'
       accountIds={notification.sampleAccountIds}
       count={notification.notifications_count}
       statusId={notification.statusId}
-      labelRenderer={
-        statusVisibility === 'direct'
-          ? privateMentionLabelRenderer
-          : labelRenderer
-      }
+      labelRenderer={labelRenderer}
       unread={unread}
     />
   );

From ce9715d6516b1aff66ed6135e571377e13c2e068 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 8 Aug 2024 22:20:52 +0200
Subject: [PATCH 1785/2191] [Glitch] Change unread notification count to only
 cover the selected notification type

Port 6ca731e9b69962a0023df2c5314562293bb4b6b6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../features/notifications_v2/index.tsx       | 31 +---------
 .../glitch/selectors/notifications.ts         | 57 +++++++++++++++++--
 2 files changed, 54 insertions(+), 34 deletions(-)

diff --git a/app/javascript/flavours/glitch/features/notifications_v2/index.tsx b/app/javascript/flavours/glitch/features/notifications_v2/index.tsx
index d58efc4b8fd2ec..84fde80008459d 100644
--- a/app/javascript/flavours/glitch/features/notifications_v2/index.tsx
+++ b/app/javascript/flavours/glitch/features/notifications_v2/index.tsx
@@ -4,8 +4,6 @@ import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
 
 import { Helmet } from 'react-helmet';
 
-import { createSelector } from '@reduxjs/toolkit';
-
 import { useDebouncedCallback } from 'use-debounce';
 
 import DoneAllIcon from '@/material-icons/400-24px/done_all.svg?react';
@@ -27,16 +25,13 @@ import {
   selectUnreadNotificationGroupsCount,
   selectPendingNotificationGroupsCount,
   selectAnyPendingNotification,
+  selectNotificationGroups,
 } from 'flavours/glitch/selectors/notifications';
 import {
   selectNeedsNotificationPermission,
-  selectSettingsNotificationsExcludedTypes,
-  selectSettingsNotificationsQuickFilterActive,
-  selectSettingsNotificationsQuickFilterShow,
   selectSettingsNotificationsShowUnread,
 } from 'flavours/glitch/selectors/settings';
 import { useAppDispatch, useAppSelector } from 'flavours/glitch/store';
-import type { RootState } from 'flavours/glitch/store';
 
 import { addColumn, removeColumn, moveColumn } from '../../actions/columns';
 import { submitMarkers } from '../../actions/markers';
@@ -62,34 +57,12 @@ const messages = defineMessages({
   },
 });
 
-const getNotifications = createSelector(
-  [
-    selectSettingsNotificationsQuickFilterShow,
-    selectSettingsNotificationsQuickFilterActive,
-    selectSettingsNotificationsExcludedTypes,
-    (state: RootState) => state.notificationGroups.groups,
-  ],
-  (showFilterBar, allowedType, excludedTypes, notifications) => {
-    if (!showFilterBar || allowedType === 'all') {
-      // used if user changed the notification settings after loading the notifications from the server
-      // otherwise a list of notifications will come pre-filtered from the backend
-      // we need to turn it off for FilterBar in order not to block ourselves from seeing a specific category
-      return notifications.filter(
-        (item) => item.type === 'gap' || !excludedTypes.includes(item.type),
-      );
-    }
-    return notifications.filter(
-      (item) => item.type === 'gap' || allowedType === item.type,
-    );
-  },
-);
-
 export const Notifications: React.FC<{
   columnId?: string;
   multiColumn?: boolean;
 }> = ({ columnId, multiColumn }) => {
   const intl = useIntl();
-  const notifications = useAppSelector(getNotifications);
+  const notifications = useAppSelector(selectNotificationGroups);
   const dispatch = useAppDispatch();
   const isLoading = useAppSelector((s) => s.notificationGroups.isLoading);
   const hasMore = notifications.at(-1)?.type === 'gap';
diff --git a/app/javascript/flavours/glitch/selectors/notifications.ts b/app/javascript/flavours/glitch/selectors/notifications.ts
index efc2dff68a0d4c..34983bd49aa7f8 100644
--- a/app/javascript/flavours/glitch/selectors/notifications.ts
+++ b/app/javascript/flavours/glitch/selectors/notifications.ts
@@ -1,15 +1,62 @@
 import { createSelector } from '@reduxjs/toolkit';
 
 import { compareId } from 'flavours/glitch/compare_id';
+import type { NotificationGroup } from 'flavours/glitch/models/notification_group';
+import type { NotificationGap } from 'flavours/glitch/reducers/notification_groups';
 import type { RootState } from 'flavours/glitch/store';
 
+import {
+  selectSettingsNotificationsExcludedTypes,
+  selectSettingsNotificationsQuickFilterActive,
+  selectSettingsNotificationsQuickFilterShow,
+} from './settings';
+
+const filterNotificationsByAllowedTypes = (
+  showFilterBar: boolean,
+  allowedType: string,
+  excludedTypes: string[],
+  notifications: (NotificationGroup | NotificationGap)[],
+) => {
+  if (!showFilterBar || allowedType === 'all') {
+    // used if user changed the notification settings after loading the notifications from the server
+    // otherwise a list of notifications will come pre-filtered from the backend
+    // we need to turn it off for FilterBar in order not to block ourselves from seeing a specific category
+    return notifications.filter(
+      (item) => item.type === 'gap' || !excludedTypes.includes(item.type),
+    );
+  }
+  return notifications.filter(
+    (item) => item.type === 'gap' || allowedType === item.type,
+  );
+};
+
+export const selectNotificationGroups = createSelector(
+  [
+    selectSettingsNotificationsQuickFilterShow,
+    selectSettingsNotificationsQuickFilterActive,
+    selectSettingsNotificationsExcludedTypes,
+    (state: RootState) => state.notificationGroups.groups,
+  ],
+  filterNotificationsByAllowedTypes,
+);
+
+const selectPendingNotificationGroups = createSelector(
+  [
+    selectSettingsNotificationsQuickFilterShow,
+    selectSettingsNotificationsQuickFilterActive,
+    selectSettingsNotificationsExcludedTypes,
+    (state: RootState) => state.notificationGroups.pendingGroups,
+  ],
+  filterNotificationsByAllowedTypes,
+);
+
 export const selectUnreadNotificationGroupsCount = createSelector(
   [
     (s: RootState) => s.notificationGroups.lastReadId,
-    (s: RootState) => s.notificationGroups.pendingGroups,
-    (s: RootState) => s.notificationGroups.groups,
+    selectNotificationGroups,
+    selectPendingNotificationGroups,
   ],
-  (notificationMarker, pendingGroups, groups) => {
+  (notificationMarker, groups, pendingGroups) => {
     return (
       groups.filter(
         (group) =>
@@ -31,7 +78,7 @@ export const selectUnreadNotificationGroupsCount = createSelector(
 export const selectAnyPendingNotification = createSelector(
   [
     (s: RootState) => s.notificationGroups.readMarkerId,
-    (s: RootState) => s.notificationGroups.groups,
+    selectNotificationGroups,
   ],
   (notificationMarker, groups) => {
     return groups.some(
@@ -44,7 +91,7 @@ export const selectAnyPendingNotification = createSelector(
 );
 
 export const selectPendingNotificationGroupsCount = createSelector(
-  [(s: RootState) => s.notificationGroups.pendingGroups],
+  [selectPendingNotificationGroups],
   (pendingGroups) =>
     pendingGroups.filter((group) => group.type !== 'gap').length,
 );

From 99d38167a3484b51b6d182aaa0792092213a688f Mon Sep 17 00:00:00 2001
From: Michael Stanclift <mx@vmstan.com>
Date: Fri, 9 Aug 2024 07:45:39 -0500
Subject: [PATCH 1786/2191] [Glitch] Fix post filter & report styling

Port 9538d9c298ed98127e3ba297a1933608976b1906 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/styles/components.scss    | 38 +++++++++----------
 .../flavours/glitch/styles/emoji_picker.scss  |  1 -
 .../glitch/styles/mastodon-light/diff.scss    |  4 ++
 3 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index ce94fac4100b37..aae93a3871b3f1 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -6724,9 +6724,10 @@ a.status-card {
   max-width: 90vw;
   width: 480px;
   height: 80vh;
-  background: lighten($ui-secondary-color, 8%);
-  color: $inverted-text-color;
-  border-radius: 8px;
+  background: var(--background-color);
+  color: $primary-text-color;
+  border-radius: 4px;
+  border: 1px solid var(--background-border-color);
   overflow: hidden;
   position: relative;
   flex-direction: column;
@@ -6734,7 +6735,7 @@ a.status-card {
 
   &__container {
     box-sizing: border-box;
-    border-top: 1px solid $ui-secondary-color;
+    border-top: 1px solid var(--background-border-color);
     padding: 20px;
     flex-grow: 1;
     display: flex;
@@ -6764,7 +6765,7 @@ a.status-card {
   &__lead {
     font-size: 17px;
     line-height: 22px;
-    color: lighten($inverted-text-color, 16%);
+    color: $secondary-text-color;
     margin-bottom: 30px;
 
     a {
@@ -6799,7 +6800,7 @@ a.status-card {
 
   .status__content,
   .status__content p {
-    color: $inverted-text-color;
+    color: $primary-text-color;
   }
 
   .status__content__spoiler-link {
@@ -6844,7 +6845,7 @@ a.status-card {
   .poll__option.dialog-option {
     padding: 15px 0;
     flex: 0 0 auto;
-    border-bottom: 1px solid $ui-secondary-color;
+    border-bottom: 1px solid var(--background-border-color);
 
     &:last-child {
       border-bottom: 0;
@@ -6852,13 +6853,13 @@ a.status-card {
 
     & > .poll__option__text {
       font-size: 13px;
-      color: lighten($inverted-text-color, 16%);
+      color: $secondary-text-color;
 
       strong {
         font-size: 17px;
         font-weight: 500;
         line-height: 22px;
-        color: $inverted-text-color;
+        color: $primary-text-color;
         display: block;
         margin-bottom: 4px;
 
@@ -6877,22 +6878,19 @@ a.status-card {
     display: block;
     box-sizing: border-box;
     width: 100%;
-    color: $inverted-text-color;
-    background: $simple-background-color;
+    color: $primary-text-color;
+    background: $ui-base-color;
     padding: 10px;
     font-family: inherit;
     font-size: 17px;
     line-height: 22px;
     resize: vertical;
     border: 0;
+    border: 1px solid var(--background-border-color);
     outline: 0;
     border-radius: 4px;
     margin: 20px 0;
 
-    &::placeholder {
-      color: $dark-text-color;
-    }
-
     &:focus {
       outline: 0;
     }
@@ -6913,16 +6911,16 @@ a.status-card {
   }
 
   .button.button-secondary {
-    border-color: $inverted-text-color;
-    color: $inverted-text-color;
+    border-color: $ui-button-destructive-background-color;
+    color: $ui-button-destructive-background-color;
     flex: 0 0 auto;
 
     &:hover,
     &:focus,
     &:active {
-      background: transparent;
-      border-color: $ui-button-background-color;
-      color: $ui-button-background-color;
+      background: $ui-button-destructive-background-color;
+      border-color: $ui-button-destructive-background-color;
+      color: $white;
     }
   }
 
diff --git a/app/javascript/flavours/glitch/styles/emoji_picker.scss b/app/javascript/flavours/glitch/styles/emoji_picker.scss
index 68e016d44b877a..31890005881c52 100644
--- a/app/javascript/flavours/glitch/styles/emoji_picker.scss
+++ b/app/javascript/flavours/glitch/styles/emoji_picker.scss
@@ -111,7 +111,6 @@
     &:focus {
       outline: none !important;
       border-width: 1px !important;
-      border-color: $ui-button-background-color;
     }
 
     &::-webkit-search-cancel-button {
diff --git a/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss b/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss
index abf5d5ef3584fe..4fccbe9867e7f1 100644
--- a/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss
+++ b/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss
@@ -618,3 +618,7 @@ a.sparkline {
 .setting-text {
   background: darken($ui-base-color, 10%);
 }
+
+.report-dialog-modal__textarea {
+  background: darken($ui-base-color, 10%);
+}

From 58b9b80be57e898ebeba81fd41038795539dfb28 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 9 Aug 2024 16:21:55 +0200
Subject: [PATCH 1787/2191] [Glitch] Add option to ignore filtered
 notifications to the web interface

Port 170157570447d30732445f6339b0c7b2fe7617d8 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../glitch/api/notification_policies.ts       |   4 +-
 .../glitch/api_types/notification_policies.ts |  11 +-
 .../glitch/components/dropdown_selector.tsx   |   2 +-
 .../components/policy_controls.tsx            | 133 ++++++++++-----
 .../components/select_with_label.tsx          | 153 ++++++++++++++++++
 .../components/ignore_notifications_modal.jsx | 108 +++++++++++++
 .../features/ui/components/modal_root.jsx     |   2 +
 .../features/ui/util/async-components.js      |   4 +
 .../flavours/glitch/styles/components.scss    |   7 +
 9 files changed, 381 insertions(+), 43 deletions(-)
 create mode 100644 app/javascript/flavours/glitch/features/notifications/components/select_with_label.tsx
 create mode 100644 app/javascript/flavours/glitch/features/ui/components/ignore_notifications_modal.jsx

diff --git a/app/javascript/flavours/glitch/api/notification_policies.ts b/app/javascript/flavours/glitch/api/notification_policies.ts
index e52ea64f4142d8..1db79a6e74b782 100644
--- a/app/javascript/flavours/glitch/api/notification_policies.ts
+++ b/app/javascript/flavours/glitch/api/notification_policies.ts
@@ -2,8 +2,8 @@ import { apiRequestGet, apiRequestPut } from 'flavours/glitch/api';
 import type { NotificationPolicyJSON } from 'flavours/glitch/api_types/notification_policies';
 
 export const apiGetNotificationPolicy = () =>
-  apiRequestGet<NotificationPolicyJSON>('/v1/notifications/policy');
+  apiRequestGet<NotificationPolicyJSON>('/v2/notifications/policy');
 
 export const apiUpdateNotificationsPolicy = (
   policy: Partial<NotificationPolicyJSON>,
-) => apiRequestPut<NotificationPolicyJSON>('/v1/notifications/policy', policy);
+) => apiRequestPut<NotificationPolicyJSON>('/v2/notifications/policy', policy);
diff --git a/app/javascript/flavours/glitch/api_types/notification_policies.ts b/app/javascript/flavours/glitch/api_types/notification_policies.ts
index 0f4a2d132e0e0e..1c3970782cb464 100644
--- a/app/javascript/flavours/glitch/api_types/notification_policies.ts
+++ b/app/javascript/flavours/glitch/api_types/notification_policies.ts
@@ -1,10 +1,13 @@
 // See app/serializers/rest/notification_policy_serializer.rb
 
+export type NotificationPolicyValue = 'accept' | 'filter' | 'drop';
+
 export interface NotificationPolicyJSON {
-  filter_not_following: boolean;
-  filter_not_followers: boolean;
-  filter_new_accounts: boolean;
-  filter_private_mentions: boolean;
+  for_not_following: NotificationPolicyValue;
+  for_not_followers: NotificationPolicyValue;
+  for_new_accounts: NotificationPolicyValue;
+  for_private_mentions: NotificationPolicyValue;
+  for_limited_accounts: NotificationPolicyValue;
   summary: {
     pending_requests_count: number;
     pending_notifications_count: number;
diff --git a/app/javascript/flavours/glitch/components/dropdown_selector.tsx b/app/javascript/flavours/glitch/components/dropdown_selector.tsx
index f8bf96c634294a..b86d2d0f808392 100644
--- a/app/javascript/flavours/glitch/components/dropdown_selector.tsx
+++ b/app/javascript/flavours/glitch/components/dropdown_selector.tsx
@@ -13,7 +13,7 @@ const listenerOptions = supportsPassiveEvents
   ? { passive: true, capture: true }
   : true;
 
-interface SelectItem {
+export interface SelectItem {
   value: string;
   icon?: string;
   iconComponent?: IconProp;
diff --git a/app/javascript/flavours/glitch/features/notifications/components/policy_controls.tsx b/app/javascript/flavours/glitch/features/notifications/components/policy_controls.tsx
index 5982db29239ba4..da5d3960b47fdb 100644
--- a/app/javascript/flavours/glitch/features/notifications/components/policy_controls.tsx
+++ b/app/javascript/flavours/glitch/features/notifications/components/policy_controls.tsx
@@ -1,16 +1,52 @@
 import { useCallback } from 'react';
 
-import { FormattedMessage } from 'react-intl';
+import { useIntl, defineMessages, FormattedMessage } from 'react-intl';
 
+import { openModal } from 'flavours/glitch/actions/modal';
 import { updateNotificationsPolicy } from 'flavours/glitch/actions/notification_policies';
+import type { AppDispatch } from 'flavours/glitch/store';
 import { useAppSelector, useAppDispatch } from 'flavours/glitch/store';
 
-import { CheckboxWithLabel } from './checkbox_with_label';
-
-// eslint-disable-next-line @typescript-eslint/no-empty-function
-const noop = () => {};
+import { SelectWithLabel } from './select_with_label';
+
+const messages = defineMessages({
+  accept: { id: 'notifications.policy.accept', defaultMessage: 'Accept' },
+  accept_hint: {
+    id: 'notifications.policy.accept_hint',
+    defaultMessage: 'Show in notifications',
+  },
+  filter: { id: 'notifications.policy.filter', defaultMessage: 'Filter' },
+  filter_hint: {
+    id: 'notifications.policy.filter_hint',
+    defaultMessage: 'Send to filtered notifications inbox',
+  },
+  drop: { id: 'notifications.policy.drop', defaultMessage: 'Ignore' },
+  drop_hint: {
+    id: 'notifications.policy.drop_hint',
+    defaultMessage: 'Send to the void, never to be seen again',
+  },
+});
+
+// TODO: change the following when we change the API
+const changeFilter = (
+  dispatch: AppDispatch,
+  filterType: string,
+  value: string,
+) => {
+  if (value === 'drop') {
+    dispatch(
+      openModal({
+        modalType: 'IGNORE_NOTIFICATIONS',
+        modalProps: { filterType },
+      }),
+    );
+  } else {
+    void dispatch(updateNotificationsPolicy({ [filterType]: value }));
+  }
+};
 
 export const PolicyControls: React.FC = () => {
+  const intl = useIntl();
   const dispatch = useAppDispatch();
 
   const notificationPolicy = useAppSelector(
@@ -18,56 +54,74 @@ export const PolicyControls: React.FC = () => {
   );
 
   const handleFilterNotFollowing = useCallback(
-    (checked: boolean) => {
-      void dispatch(
-        updateNotificationsPolicy({ filter_not_following: checked }),
-      );
+    (value: string) => {
+      changeFilter(dispatch, 'for_not_following', value);
     },
     [dispatch],
   );
 
   const handleFilterNotFollowers = useCallback(
-    (checked: boolean) => {
-      void dispatch(
-        updateNotificationsPolicy({ filter_not_followers: checked }),
-      );
+    (value: string) => {
+      changeFilter(dispatch, 'for_not_followers', value);
     },
     [dispatch],
   );
 
   const handleFilterNewAccounts = useCallback(
-    (checked: boolean) => {
-      void dispatch(
-        updateNotificationsPolicy({ filter_new_accounts: checked }),
-      );
+    (value: string) => {
+      changeFilter(dispatch, 'for_new_accounts', value);
     },
     [dispatch],
   );
 
   const handleFilterPrivateMentions = useCallback(
-    (checked: boolean) => {
-      void dispatch(
-        updateNotificationsPolicy({ filter_private_mentions: checked }),
-      );
+    (value: string) => {
+      changeFilter(dispatch, 'for_private_mentions', value);
+    },
+    [dispatch],
+  );
+
+  const handleFilterLimitedAccounts = useCallback(
+    (value: string) => {
+      changeFilter(dispatch, 'for_limited_accounts', value);
     },
     [dispatch],
   );
 
   if (!notificationPolicy) return null;
 
+  const options = [
+    {
+      value: 'accept',
+      text: intl.formatMessage(messages.accept),
+      meta: intl.formatMessage(messages.accept_hint),
+    },
+    {
+      value: 'filter',
+      text: intl.formatMessage(messages.filter),
+      meta: intl.formatMessage(messages.filter_hint),
+    },
+    {
+      value: 'drop',
+      text: intl.formatMessage(messages.drop),
+      meta: intl.formatMessage(messages.drop_hint),
+    },
+  ];
+
   return (
     <section>
       <h3>
         <FormattedMessage
           id='notifications.policy.title'
-          defaultMessage='Filter out notifications from…'
+          defaultMessage='Manage notifications from…'
         />
       </h3>
 
       <div className='column-settings__row'>
-        <CheckboxWithLabel
-          checked={notificationPolicy.filter_not_following}
+        <SelectWithLabel
+          value={notificationPolicy.for_not_following}
           onChange={handleFilterNotFollowing}
+          options={options}
         >
           <strong>
             <FormattedMessage
@@ -81,11 +135,12 @@ export const PolicyControls: React.FC = () => {
               defaultMessage='Until you manually approve them'
             />
           </span>
-        </CheckboxWithLabel>
+        </SelectWithLabel>
 
-        <CheckboxWithLabel
-          checked={notificationPolicy.filter_not_followers}
+        <SelectWithLabel
+          value={notificationPolicy.for_not_followers}
           onChange={handleFilterNotFollowers}
+          options={options}
         >
           <strong>
             <FormattedMessage
@@ -100,11 +155,12 @@ export const PolicyControls: React.FC = () => {
               values={{ days: 3 }}
             />
           </span>
-        </CheckboxWithLabel>
+        </SelectWithLabel>
 
-        <CheckboxWithLabel
-          checked={notificationPolicy.filter_new_accounts}
+        <SelectWithLabel
+          value={notificationPolicy.for_new_accounts}
           onChange={handleFilterNewAccounts}
+          options={options}
         >
           <strong>
             <FormattedMessage
@@ -119,11 +175,12 @@ export const PolicyControls: React.FC = () => {
               values={{ days: 30 }}
             />
           </span>
-        </CheckboxWithLabel>
+        </SelectWithLabel>
 
-        <CheckboxWithLabel
-          checked={notificationPolicy.filter_private_mentions}
+        <SelectWithLabel
+          value={notificationPolicy.for_private_mentions}
           onChange={handleFilterPrivateMentions}
+          options={options}
         >
           <strong>
             <FormattedMessage
@@ -137,9 +194,13 @@ export const PolicyControls: React.FC = () => {
               defaultMessage="Filtered unless it's in reply to your own mention or if you follow the sender"
             />
           </span>
-        </CheckboxWithLabel>
+        </SelectWithLabel>
 
-        <CheckboxWithLabel checked disabled onChange={noop}>
+        <SelectWithLabel
+          value={notificationPolicy.for_limited_accounts}
+          onChange={handleFilterLimitedAccounts}
+          options={options}
+        >
           <strong>
             <FormattedMessage
               id='notifications.policy.filter_limited_accounts_title'
@@ -152,7 +213,7 @@ export const PolicyControls: React.FC = () => {
               defaultMessage='Limited by server moderators'
             />
           </span>
-        </CheckboxWithLabel>
+        </SelectWithLabel>
       </div>
     </section>
   );
diff --git a/app/javascript/flavours/glitch/features/notifications/components/select_with_label.tsx b/app/javascript/flavours/glitch/features/notifications/components/select_with_label.tsx
new file mode 100644
index 00000000000000..dbdfbdffa671f0
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/notifications/components/select_with_label.tsx
@@ -0,0 +1,153 @@
+import type { PropsWithChildren } from 'react';
+import { useCallback, useState, useRef } from 'react';
+
+import classNames from 'classnames';
+
+import type { Placement, State as PopperState } from '@popperjs/core';
+import Overlay from 'react-overlays/Overlay';
+
+import ArrowDropDownIcon from '@/material-icons/400-24px/arrow_drop_down.svg?react';
+import type { SelectItem } from 'flavours/glitch/components/dropdown_selector';
+import { DropdownSelector } from 'flavours/glitch/components/dropdown_selector';
+import { Icon } from 'flavours/glitch/components/icon';
+
+interface DropdownProps {
+  value: string;
+  options: SelectItem[];
+  disabled?: boolean;
+  onChange: (value: string) => void;
+  placement?: Placement;
+}
+
+const Dropdown: React.FC<DropdownProps> = ({
+  value,
+  options,
+  disabled,
+  onChange,
+  placement: initialPlacement = 'bottom-end',
+}) => {
+  const activeElementRef = useRef<Element | null>(null);
+  const containerRef = useRef(null);
+  const [isOpen, setOpen] = useState<boolean>(false);
+  const [placement, setPlacement] = useState<Placement>(initialPlacement);
+
+  const handleToggle = useCallback(() => {
+    if (
+      isOpen &&
+      activeElementRef.current &&
+      activeElementRef.current instanceof HTMLElement
+    ) {
+      activeElementRef.current.focus({ preventScroll: true });
+    }
+
+    setOpen(!isOpen);
+  }, [isOpen, setOpen]);
+
+  const handleMouseDown = useCallback(() => {
+    if (!isOpen) activeElementRef.current = document.activeElement;
+  }, [isOpen]);
+
+  const handleKeyDown = useCallback(
+    (e: React.KeyboardEvent) => {
+      switch (e.key) {
+        case ' ':
+        case 'Enter':
+          if (!isOpen) activeElementRef.current = document.activeElement;
+          break;
+      }
+    },
+    [isOpen],
+  );
+
+  const handleClose = useCallback(() => {
+    if (
+      isOpen &&
+      activeElementRef.current &&
+      activeElementRef.current instanceof HTMLElement
+    )
+      activeElementRef.current.focus({ preventScroll: true });
+    setOpen(false);
+  }, [isOpen]);
+
+  const handleOverlayEnter = useCallback(
+    (state: Partial<PopperState>) => {
+      if (state.placement) setPlacement(state.placement);
+    },
+    [setPlacement],
+  );
+
+  const valueOption = options.find((item) => item.value === value);
+
+  return (
+    <div ref={containerRef}>
+      <button
+        type='button'
+        onClick={handleToggle}
+        onMouseDown={handleMouseDown}
+        onKeyDown={handleKeyDown}
+        disabled={disabled}
+        className={classNames('dropdown-button', { active: isOpen })}
+      >
+        <span className='dropdown-button__label'>{valueOption?.text}</span>
+        <Icon id='down' icon={ArrowDropDownIcon} />
+      </button>
+
+      <Overlay
+        show={isOpen}
+        offset={[5, 5]}
+        placement={placement}
+        flip
+        target={containerRef}
+        popperConfig={{ strategy: 'fixed', onFirstUpdate: handleOverlayEnter }}
+      >
+        {({ props, placement }) => (
+          <div {...props}>
+            <div
+              className={`dropdown-animation privacy-dropdown__dropdown ${placement}`}
+            >
+              <DropdownSelector
+                items={options}
+                value={value}
+                onClose={handleClose}
+                onChange={onChange}
+                classNamePrefix='privacy-dropdown'
+              />
+            </div>
+          </div>
+        )}
+      </Overlay>
+    </div>
+  );
+};
+
+interface Props {
+  value: string;
+  options: SelectItem[];
+  disabled?: boolean;
+  onChange: (value: string) => void;
+}
+
+export const SelectWithLabel: React.FC<PropsWithChildren<Props>> = ({
+  value,
+  options,
+  disabled,
+  children,
+  onChange,
+}) => {
+  return (
+    <label className='app-form__toggle'>
+      <div className='app-form__toggle__label'>{children}</div>
+
+      <div className='app-form__toggle__toggle'>
+        <div>
+          <Dropdown
+            value={value}
+            onChange={onChange}
+            disabled={disabled}
+            options={options}
+          />
+        </div>
+      </div>
+    </label>
+  );
+};
diff --git a/app/javascript/flavours/glitch/features/ui/components/ignore_notifications_modal.jsx b/app/javascript/flavours/glitch/features/ui/components/ignore_notifications_modal.jsx
new file mode 100644
index 00000000000000..4c7cb21d7d96b0
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/ui/components/ignore_notifications_modal.jsx
@@ -0,0 +1,108 @@
+import PropTypes from 'prop-types';
+import { useCallback } from 'react';
+
+import { FormattedMessage } from 'react-intl';
+
+import { useDispatch } from 'react-redux';
+
+import InventoryIcon from '@/material-icons/400-24px/inventory_2.svg?react';
+import PersonAlertIcon from '@/material-icons/400-24px/person_alert.svg?react';
+import ShieldQuestionIcon from '@/material-icons/400-24px/shield_question.svg?react';
+import { closeModal } from 'flavours/glitch/actions/modal';
+import { updateNotificationsPolicy } from 'flavours/glitch/actions/notification_policies';
+import { Button } from 'flavours/glitch/components/button';
+import { Icon } from 'flavours/glitch/components/icon';
+
+export const IgnoreNotificationsModal = ({ filterType }) => {
+  const dispatch = useDispatch();
+
+  const handleClick = useCallback(() => {
+    dispatch(closeModal({ modalType: undefined, ignoreFocus: false }));
+    void dispatch(updateNotificationsPolicy({ [filterType]: 'drop' }));
+  }, [dispatch, filterType]);
+
+  const handleSecondaryClick = useCallback(() => {
+    dispatch(closeModal({ modalType: undefined, ignoreFocus: false }));
+    void dispatch(updateNotificationsPolicy({ [filterType]: 'filter' }));
+  }, [dispatch, filterType]);
+
+  const handleCancel = useCallback(() => {
+    dispatch(closeModal({ modalType: undefined, ignoreFocus: false }));
+  }, [dispatch]);
+
+  let title = null;
+
+  switch(filterType) {
+  case 'for_not_following':
+    title = <FormattedMessage id='ignore_notifications_modal.not_following_title' defaultMessage="Ignore notifications from people you don't follow?" />;
+    break;
+  case 'for_not_followers':
+    title = <FormattedMessage id='ignore_notifications_modal.not_followers_title' defaultMessage='Ignore notifications from people not following you?' />;
+    break;
+  case 'for_new_accounts':
+    title = <FormattedMessage id='ignore_notifications_modal.new_accounts_title' defaultMessage='Ignore notifications from new accounts?' />;
+    break;
+  case 'for_private_mentions':
+    title = <FormattedMessage id='ignore_notifications_modal.private_mentions_title' defaultMessage='Ignore notifications from unsolicited Private Mentions?' />;
+    break;
+  case 'for_limited_accounts':
+    title = <FormattedMessage id='ignore_notifications_modal.limited_accounts_title' defaultMessage='Ignore notifications from moderated accounts?' />;
+    break;
+  }
+
+  return (
+    <div className='modal-root__modal safety-action-modal'>
+      <div className='safety-action-modal__top'>
+        <div className='safety-action-modal__header'>
+          <h1>{title}</h1>
+        </div>
+
+        <div className='safety-action-modal__bullet-points'>
+          <div>
+            <div className='safety-action-modal__bullet-points__icon'><Icon icon={InventoryIcon} /></div>
+            <div><FormattedMessage id='ignore_notifications_modal.filter_to_review_separately' defaultMessage='You can review filtered notifications speparately' /></div>
+          </div>
+
+          <div>
+            <div className='safety-action-modal__bullet-points__icon'><Icon icon={PersonAlertIcon} /></div>
+            <div><FormattedMessage id='ignore_notifications_modal.filter_to_act_users' defaultMessage="You'll still be able to accept, reject, or report users" /></div>
+          </div>
+
+          <div>
+            <div className='safety-action-modal__bullet-points__icon'><Icon icon={ShieldQuestionIcon} /></div>
+            <div><FormattedMessage id='ignore_notifications_modal.filter_to_avoid_confusion' defaultMessage='Filtering helps avoid potential confusion' /></div>
+          </div>
+        </div>
+
+        <div>
+          <FormattedMessage id='ignore_notifications_modal.disclaimer' defaultMessage="Mastodon cannot inform users that you've ignored their notifications. Ignoring notifications will not stop the messages themselves from being sent." />
+        </div>
+      </div>
+
+
+      <div className='safety-action-modal__bottom'>
+        <div className='safety-action-modal__actions'>
+          <Button onClick={handleSecondaryClick} secondary>
+            <FormattedMessage id='ignore_notifications_modal.filter_instead' defaultMessage='Filter instead' />
+          </Button>
+
+          <div className='spacer' />
+
+          <button onClick={handleCancel} className='link-button'>
+            <FormattedMessage id='confirmation_modal.cancel' defaultMessage='Cancel' />
+          </button>
+
+          <button onClick={handleClick} className='link-button'>
+            <FormattedMessage id='ignore_notifications_modal.ignore' defaultMessage='Ignore notifications' />
+          </button>
+        </div>
+      </div>
+    </div>
+  );
+};
+
+IgnoreNotificationsModal.propTypes = {
+  filterType: PropTypes.string.isRequired,
+};
+
+export default IgnoreNotificationsModal;
diff --git a/app/javascript/flavours/glitch/features/ui/components/modal_root.jsx b/app/javascript/flavours/glitch/features/ui/components/modal_root.jsx
index 0bc393f7e859f4..64c6b52c31ec3d 100644
--- a/app/javascript/flavours/glitch/features/ui/components/modal_root.jsx
+++ b/app/javascript/flavours/glitch/features/ui/components/modal_root.jsx
@@ -19,6 +19,7 @@ import {
   InteractionModal,
   SubscribedLanguagesModal,
   ClosedRegistrationsModal,
+  IgnoreNotificationsModal,
 } from 'flavours/glitch/features/ui/util/async-components';
 import { getScrollbarWidth } from 'flavours/glitch/utils/scrollbar';
 
@@ -80,6 +81,7 @@ export const MODAL_COMPONENTS = {
   'SUBSCRIBED_LANGUAGES': SubscribedLanguagesModal,
   'INTERACTION': InteractionModal,
   'CLOSED_REGISTRATIONS': ClosedRegistrationsModal,
+  'IGNORE_NOTIFICATIONS': IgnoreNotificationsModal,
 };
 
 export default class ModalRoot extends PureComponent {
diff --git a/app/javascript/flavours/glitch/features/ui/util/async-components.js b/app/javascript/flavours/glitch/features/ui/util/async-components.js
index e334e1a3b6ea38..c7f2e6cff9c813 100644
--- a/app/javascript/flavours/glitch/features/ui/util/async-components.js
+++ b/app/javascript/flavours/glitch/features/ui/util/async-components.js
@@ -146,6 +146,10 @@ export function SettingsModal () {
   return import(/* webpackChunkName: "flavours/glitch/async/settings_modal" */'../../local_settings');
 }
 
+export function IgnoreNotificationsModal () {
+  return import(/* webpackChunkName: "flavours/glitch/async/ignore_notifications_modal" */'../components/ignore_notifications_modal');
+}
+
 export function MediaGallery () {
   return import(/* webpackChunkName: "flavours/glitch/async/media_gallery" */'../../../components/media_gallery');
 }
diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index aae93a3871b3f1..ebae4e8bcc1a8d 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -926,6 +926,13 @@ body > [data-popper-placement] {
   text-overflow: ellipsis;
   white-space: nowrap;
 
+  &[disabled] {
+    cursor: default;
+    color: $highlight-text-color;
+    border-color: $highlight-text-color;
+    opacity: 0.5;
+  }
+
   .icon {
     width: 15px;
     height: 15px;

From b6961d08abafdee930040ec25265acfee7ae6019 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 9 Aug 2024 16:56:39 +0200
Subject: [PATCH 1788/2191] [Glitch] Add ability to report, block and mute from
 notification requests list

Port 658addcbf783f6baa922d11c9524ebb9ddbcbc59 to glitch-soc

Co-authored-by: Renaud Chaput <renchap@gmail.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/actions/notifications.js  |  64 ++++++++
 .../flavours/glitch/components/check_box.tsx  |  13 +-
 .../components/notification_request.jsx       |  75 ++++++++-
 .../features/notifications/requests.jsx       | 144 +++++++++++++++++-
 .../glitch/reducers/notification_requests.js  |   5 +
 .../flavours/glitch/styles/components.scss    | 111 +++++++++++---
 6 files changed, 380 insertions(+), 32 deletions(-)

diff --git a/app/javascript/flavours/glitch/actions/notifications.js b/app/javascript/flavours/glitch/actions/notifications.js
index fc879dce64ffff..86e2d6eb4eb20e 100644
--- a/app/javascript/flavours/glitch/actions/notifications.js
+++ b/app/javascript/flavours/glitch/actions/notifications.js
@@ -77,6 +77,14 @@ export const NOTIFICATION_REQUEST_DISMISS_REQUEST = 'NOTIFICATION_REQUEST_DISMIS
 export const NOTIFICATION_REQUEST_DISMISS_SUCCESS = 'NOTIFICATION_REQUEST_DISMISS_SUCCESS';
 export const NOTIFICATION_REQUEST_DISMISS_FAIL    = 'NOTIFICATION_REQUEST_DISMISS_FAIL';
 
+export const NOTIFICATION_REQUESTS_ACCEPT_REQUEST = 'NOTIFICATION_REQUESTS_ACCEPT_REQUEST';
+export const NOTIFICATION_REQUESTS_ACCEPT_SUCCESS = 'NOTIFICATION_REQUESTS_ACCEPT_SUCCESS';
+export const NOTIFICATION_REQUESTS_ACCEPT_FAIL    = 'NOTIFICATION_REQUESTS_ACCEPT_FAIL';
+
+export const NOTIFICATION_REQUESTS_DISMISS_REQUEST = 'NOTIFICATION_REQUESTS_DISMISS_REQUEST';
+export const NOTIFICATION_REQUESTS_DISMISS_SUCCESS = 'NOTIFICATION_REQUESTS_DISMISS_SUCCESS';
+export const NOTIFICATION_REQUESTS_DISMISS_FAIL    = 'NOTIFICATION_REQUESTS_DISMISS_FAIL';
+
 export const NOTIFICATIONS_FOR_REQUEST_FETCH_REQUEST = 'NOTIFICATIONS_FOR_REQUEST_FETCH_REQUEST';
 export const NOTIFICATIONS_FOR_REQUEST_FETCH_SUCCESS = 'NOTIFICATIONS_FOR_REQUEST_FETCH_SUCCESS';
 export const NOTIFICATIONS_FOR_REQUEST_FETCH_FAIL    = 'NOTIFICATIONS_FOR_REQUEST_FETCH_FAIL';
@@ -584,6 +592,62 @@ export const dismissNotificationRequestFail = (id, error) => ({
   error,
 });
 
+export const acceptNotificationRequests = (ids) => (dispatch, getState) => {
+  const count = ids.reduce((count, id) => count + selectNotificationCountForRequest(getState(), id), 0);
+  dispatch(acceptNotificationRequestsRequest(ids));
+
+  api().post(`/api/v1/notifications/requests/accept`, { id: ids }).then(() => {
+    dispatch(acceptNotificationRequestsSuccess(ids));
+    dispatch(decreasePendingNotificationsCount(count));
+  }).catch(err => {
+    dispatch(acceptNotificationRequestFail(ids, err));
+  });
+};
+
+export const acceptNotificationRequestsRequest = ids => ({
+  type: NOTIFICATION_REQUESTS_ACCEPT_REQUEST,
+  ids,
+});
+
+export const acceptNotificationRequestsSuccess = ids => ({
+  type: NOTIFICATION_REQUESTS_ACCEPT_SUCCESS,
+  ids,
+});
+
+export const acceptNotificationRequestsFail = (ids, error) => ({
+  type: NOTIFICATION_REQUESTS_ACCEPT_FAIL,
+  ids,
+  error,
+});
+
+export const dismissNotificationRequests = (ids) => (dispatch, getState) => {
+  const count = ids.reduce((count, id) => count + selectNotificationCountForRequest(getState(), id), 0);
+  dispatch(acceptNotificationRequestsRequest(ids));
+
+  api().post(`/api/v1/notifications/requests/dismiss`, { id: ids }).then(() => {
+    dispatch(dismissNotificationRequestsSuccess(ids));
+    dispatch(decreasePendingNotificationsCount(count));
+  }).catch(err => {
+    dispatch(dismissNotificationRequestFail(ids, err));
+  });
+};
+
+export const dismissNotificationRequestsRequest = ids => ({
+  type: NOTIFICATION_REQUESTS_DISMISS_REQUEST,
+  ids,
+});
+
+export const dismissNotificationRequestsSuccess = ids => ({
+  type: NOTIFICATION_REQUESTS_DISMISS_SUCCESS,
+  ids,
+});
+
+export const dismissNotificationRequestsFail = (ids, error) => ({
+  type: NOTIFICATION_REQUESTS_DISMISS_FAIL,
+  ids,
+  error,
+});
+
 export const fetchNotificationsForRequest = accountId => (dispatch, getState) => {
   const current = getState().getIn(['notificationRequests', 'current']);
   const params = { account_id: accountId };
diff --git a/app/javascript/flavours/glitch/components/check_box.tsx b/app/javascript/flavours/glitch/components/check_box.tsx
index 7da8ef0ac5602d..9bd137abf57cce 100644
--- a/app/javascript/flavours/glitch/components/check_box.tsx
+++ b/app/javascript/flavours/glitch/components/check_box.tsx
@@ -1,5 +1,6 @@
 import classNames from 'classnames';
 
+import CheckIndeterminateSmallIcon from '@/material-icons/400-24px/check_indeterminate_small.svg?react';
 import DoneIcon from '@/material-icons/400-24px/done.svg?react';
 
 import { Icon } from './icon';
@@ -7,6 +8,7 @@ import { Icon } from './icon';
 interface Props {
   value: string;
   checked: boolean;
+  indeterminate: boolean;
   name: string;
   onChange: (event: React.ChangeEvent<HTMLInputElement>) => void;
   label: React.ReactNode;
@@ -16,6 +18,7 @@ export const CheckBox: React.FC<Props> = ({
   name,
   value,
   checked,
+  indeterminate,
   onChange,
   label,
 }) => {
@@ -29,8 +32,14 @@ export const CheckBox: React.FC<Props> = ({
         onChange={onChange}
       />
 
-      <span className={classNames('check-box__input', { checked })}>
-        {checked && <Icon id='check' icon={DoneIcon} />}
+      <span
+        className={classNames('check-box__input', { checked, indeterminate })}
+      >
+        {indeterminate ? (
+          <Icon id='indeterminate' icon={CheckIndeterminateSmallIcon} />
+        ) : (
+          checked && <Icon id='check' icon={DoneIcon} />
+        )}
       </span>
 
       <span>{label}</span>
diff --git a/app/javascript/flavours/glitch/features/notifications/components/notification_request.jsx b/app/javascript/flavours/glitch/features/notifications/components/notification_request.jsx
index 3b32955348cf52..b0db186b72417c 100644
--- a/app/javascript/flavours/glitch/features/notifications/components/notification_request.jsx
+++ b/app/javascript/flavours/glitch/features/notifications/components/notification_request.jsx
@@ -3,15 +3,21 @@ import { useCallback } from 'react';
 
 import { defineMessages, useIntl } from 'react-intl';
 
-import { Link } from 'react-router-dom';
+import classNames from 'classnames';
+import { Link, useHistory } from 'react-router-dom';
 
 import { useSelector, useDispatch } from 'react-redux';
 
 import DeleteIcon from '@/material-icons/400-24px/delete.svg?react';
-import DoneIcon from '@/material-icons/400-24px/done.svg?react';
+import MoreHorizIcon from '@/material-icons/400-24px/more_horiz.svg?react';
+import { initBlockModal } from 'flavours/glitch/actions/blocks';
+import { initMuteModal } from 'flavours/glitch/actions/mutes';
 import { acceptNotificationRequest, dismissNotificationRequest } from 'flavours/glitch/actions/notifications';
+import { initReport } from 'flavours/glitch/actions/reports';
 import { Avatar } from 'flavours/glitch/components/avatar';
+import { CheckBox } from 'flavours/glitch/components/check_box';
 import { IconButton } from 'flavours/glitch/components/icon_button';
+import DropdownMenuContainer from 'flavours/glitch/containers/dropdown_menu_container';
 import { makeGetAccount } from 'flavours/glitch/selectors';
 import { toCappedNumber } from 'flavours/glitch/utils/numbers';
 
@@ -20,12 +26,18 @@ const getAccount = makeGetAccount();
 const messages = defineMessages({
   accept: { id: 'notification_requests.accept', defaultMessage: 'Accept' },
   dismiss: { id: 'notification_requests.dismiss', defaultMessage: 'Dismiss' },
+  view: { id: 'notification_requests.view', defaultMessage: 'View notifications' },
+  mute: { id: 'account.mute', defaultMessage: 'Mute @{name}' },
+  block: { id: 'account.block', defaultMessage: 'Block @{name}' },
+  report: { id: 'status.report', defaultMessage: 'Report @{name}' },
+  more: { id: 'status.more', defaultMessage: 'More' },
 });
 
-export const NotificationRequest = ({ id, accountId, notificationsCount }) => {
+export const NotificationRequest = ({ id, accountId, notificationsCount, checked, showCheckbox, toggleCheck }) => {
   const dispatch = useDispatch();
   const account = useSelector(state => getAccount(state, accountId));
   const intl = useIntl();
+  const { push: historyPush } = useHistory();
 
   const handleDismiss = useCallback(() => {
     dispatch(dismissNotificationRequest(id));
@@ -35,9 +47,51 @@ export const NotificationRequest = ({ id, accountId, notificationsCount }) => {
     dispatch(acceptNotificationRequest(id));
   }, [dispatch, id]);
 
+  const handleMute = useCallback(() => {
+    dispatch(initMuteModal(account));
+  }, [dispatch, account]);
+
+  const handleBlock = useCallback(() => {
+    dispatch(initBlockModal(account));
+  }, [dispatch, account]);
+
+  const handleReport = useCallback(() => {
+    dispatch(initReport(account));
+  }, [dispatch, account]);
+
+  const handleView = useCallback(() => {
+    historyPush(`/notifications/requests/${id}`);
+  }, [historyPush, id]);
+
+  const menu = [
+    { text: intl.formatMessage(messages.view), action: handleView },
+    null,
+    { text: intl.formatMessage(messages.accept), action: handleAccept },
+    null,
+    { text: intl.formatMessage(messages.mute, { name: account.username }), action: handleMute, dangerous: true },
+    { text: intl.formatMessage(messages.block, { name: account.username }), action: handleBlock, dangerous: true },
+    { text: intl.formatMessage(messages.report, { name: account.username }), action: handleReport, dangerous: true },
+  ];
+
+  const handleCheck = useCallback(() => {
+    toggleCheck(id);
+  }, [toggleCheck, id]);
+
+  const handleClick = useCallback((e) => {
+    if (showCheckbox) {
+      toggleCheck(id);
+      e.preventDefault();
+      e.stopPropagation();
+    }
+  }, [toggleCheck, id, showCheckbox]);
+
   return (
-    <div className='notification-request'>
-      <Link to={`/notifications/requests/${id}`} className='notification-request__link'>
+    /* eslint-disable-next-line jsx-a11y/no-static-element-interactions -- this is just a minor affordance, but we will need a comprehensive accessibility pass */
+    <div className={classNames('notification-request', showCheckbox && 'notification-request--forced-checkbox')} onClick={handleClick}>
+      <div className='notification-request__checkbox' aria-hidden={!showCheckbox}>
+        <CheckBox checked={checked} onChange={handleCheck} />
+      </div>
+      <Link to={`/notifications/requests/${id}`} className='notification-request__link' onClick={handleClick} title={account?.acct}>
         <Avatar account={account} size={40} counter={toCappedNumber(notificationsCount)} />
 
         <div className='notification-request__name'>
@@ -51,7 +105,13 @@ export const NotificationRequest = ({ id, accountId, notificationsCount }) => {
 
       <div className='notification-request__actions'>
         <IconButton iconComponent={DeleteIcon} onClick={handleDismiss} title={intl.formatMessage(messages.dismiss)} />
-        <IconButton iconComponent={DoneIcon} onClick={handleAccept} title={intl.formatMessage(messages.accept)} />
+        <DropdownMenuContainer
+          items={menu}
+          icons='ellipsis-h'
+          iconComponent={MoreHorizIcon}
+          direction='right'
+          title={intl.formatMessage(messages.more)}
+        />
       </div>
     </div>
   );
@@ -61,4 +121,7 @@ NotificationRequest.propTypes = {
   id: PropTypes.string.isRequired,
   accountId: PropTypes.string.isRequired,
   notificationsCount: PropTypes.string.isRequired,
+  checked: PropTypes.bool,
+  showCheckbox: PropTypes.bool,
+  toggleCheck: PropTypes.func,
 };
diff --git a/app/javascript/flavours/glitch/features/notifications/requests.jsx b/app/javascript/flavours/glitch/features/notifications/requests.jsx
index 82baffb90e4e1d..f8f75023ade0d5 100644
--- a/app/javascript/flavours/glitch/features/notifications/requests.jsx
+++ b/app/javascript/flavours/glitch/features/notifications/requests.jsx
@@ -1,5 +1,5 @@
 import PropTypes from 'prop-types';
-import { useRef, useCallback, useEffect } from 'react';
+import { useRef, useCallback, useEffect, useState } from 'react';
 
 import { defineMessages, useIntl, FormattedMessage } from 'react-intl';
 
@@ -8,11 +8,15 @@ import { Helmet } from 'react-helmet';
 import { useSelector, useDispatch } from 'react-redux';
 
 import InventoryIcon from '@/material-icons/400-24px/inventory_2.svg?react';
-import { fetchNotificationRequests, expandNotificationRequests } from 'flavours/glitch/actions/notifications';
+import MoreHorizIcon from '@/material-icons/400-24px/more_horiz.svg?react';
+import { openModal } from 'flavours/glitch/actions/modal';
+import { fetchNotificationRequests, expandNotificationRequests, acceptNotificationRequests, dismissNotificationRequests } from 'flavours/glitch/actions/notifications';
 import { changeSetting } from 'flavours/glitch/actions/settings';
+import { CheckBox } from 'flavours/glitch/components/check_box';
 import Column from 'flavours/glitch/components/column';
 import ColumnHeader from 'flavours/glitch/components/column_header';
 import ScrollableList from 'flavours/glitch/components/scrollable_list';
+import DropdownMenuContainer from 'flavours/glitch/containers/dropdown_menu_container';
 
 import { NotificationRequest } from './components/notification_request';
 import { PolicyControls } from './components/policy_controls';
@@ -20,7 +24,18 @@ import SettingToggle from './components/setting_toggle';
 
 const messages = defineMessages({
   title: { id: 'notification_requests.title', defaultMessage: 'Filtered notifications' },
-  maximize: { id: 'notification_requests.maximize', defaultMessage: 'Maximize' }
+  maximize: { id: 'notification_requests.maximize', defaultMessage: 'Maximize' },
+  more: { id: 'status.more', defaultMessage: 'More' },
+  acceptAll: { id: 'notification_requests.accept_all', defaultMessage: 'Accept all' },
+  dismissAll: { id: 'notification_requests.dismiss_all', defaultMessage: 'Dismiss all' },
+  acceptMultiple: { id: 'notification_requests.accept_multiple', defaultMessage: '{count, plural, one {Accept # request} other {Accept # requests}}' },
+  dismissMultiple: { id: 'notification_requests.dismiss_multiple', defaultMessage: '{count, plural, one {Dismiss # request} other {Dismiss # requests}}' },
+  confirmAcceptAllTitle: { id: 'notification_requests.confirm_accept_all.title', defaultMessage: 'Accept notification requests?' },
+  confirmAcceptAllMessage: { id: 'notification_requests.confirm_accept_all.message', defaultMessage: 'You are about to accept {count, plural, one {one notification request} other {# notification requests}}. Are you sure you want to proceed?' },
+  confirmAcceptAllButton: { id: 'notification_requests.confirm_accept_all.button', defaultMessage: 'Accept all' },
+  confirmDismissAllTitle: { id: 'notification_requests.confirm_dismiss_all.title', defaultMessage: 'Dismiss notification requests?' },
+  confirmDismissAllMessage: { id: 'notification_requests.confirm_dismiss_all.message', defaultMessage: "You are about to dismiss {count, plural, one {one notification request} other {# notification requests}}. You won't be able to easily access {count, plural, one {it} other {them}} again. Are you sure you want to proceed?" },
+  confirmDismissAllButton: { id: 'notification_requests.confirm_dismiss_all.button', defaultMessage: 'Dismiss all' },
 });
 
 const ColumnSettings = () => {
@@ -55,6 +70,94 @@ const ColumnSettings = () => {
   );
 };
 
+const SelectRow = ({selectAllChecked, toggleSelectAll, selectedItems, selectionMode, setSelectionMode}) => {
+  const intl = useIntl();
+  const dispatch = useDispatch();
+
+  const selectedCount = selectedItems.length;
+
+  const handleAcceptAll = useCallback(() => {
+    dispatch(openModal({
+      modalType: 'CONFIRM',
+      modalProps: {
+        title: intl.formatMessage(messages.confirmAcceptAllTitle),
+        message: intl.formatMessage(messages.confirmAcceptAllMessage, { count: selectedItems.length }),
+        confirm: intl.formatMessage(messages.confirmAcceptAllButton),
+        onConfirm: () =>
+          dispatch(acceptNotificationRequests(selectedItems)),
+      },
+    }));
+  }, [dispatch, intl, selectedItems]);
+
+  const handleDismissAll = useCallback(() => {
+    dispatch(openModal({
+      modalType: 'CONFIRM',
+      modalProps: {
+        title: intl.formatMessage(messages.confirmDismissAllTitle),
+        message: intl.formatMessage(messages.confirmDismissAllMessage, { count: selectedItems.length }),
+        confirm: intl.formatMessage(messages.confirmDismissAllButton),
+        onConfirm: () =>
+          dispatch(dismissNotificationRequests(selectedItems)),
+      },
+    }));
+  }, [dispatch, intl, selectedItems]);
+
+  const handleToggleSelectionMode = useCallback(() => {
+    setSelectionMode((mode) => !mode);
+  }, [setSelectionMode]);
+
+  const menu = selectedCount === 0 ?
+    [
+      { text: intl.formatMessage(messages.acceptAll), action: handleAcceptAll },
+      { text: intl.formatMessage(messages.dismissAll), action: handleDismissAll },
+    ] : [
+      { text: intl.formatMessage(messages.acceptMultiple, { count: selectedCount }), action: handleAcceptAll },
+      { text: intl.formatMessage(messages.dismissMultiple, { count: selectedCount }), action: handleDismissAll },
+    ];
+
+  return (
+    <div className='column-header__select-row'>
+      {selectionMode && (
+        <div className='column-header__select-row__checkbox'>
+          <CheckBox checked={selectAllChecked} indeterminate={selectedCount > 0 && !selectAllChecked} onChange={toggleSelectAll} />
+        </div>
+      )}
+      <div className='column-header__select-row__selection-mode'>
+        <button className='text-btn' tabIndex={0} onClick={handleToggleSelectionMode}>
+          {selectionMode ? (
+            <FormattedMessage id='notification_requests.exit_selection_mode' defaultMessage='Cancel' />
+          ) :
+            (
+              <FormattedMessage id='notification_requests.enter_selection_mode' defaultMessage='Select' />
+            )}
+        </button>
+      </div>
+      {selectedCount > 0 &&
+        <div className='column-header__select-row__selected-count'>
+          {selectedCount} selected
+        </div>
+      }
+      <div className='column-header__select-row__actions'>
+        <DropdownMenuContainer
+          items={menu}
+          icons='ellipsis-h'
+          iconComponent={MoreHorizIcon}
+          direction='right'
+          title={intl.formatMessage(messages.more)}
+        />
+      </div>
+    </div>
+  );
+};
+
+SelectRow.propTypes = {
+  selectAllChecked: PropTypes.func.isRequired,
+  toggleSelectAll: PropTypes.func.isRequired,
+  selectedItems: PropTypes.arrayOf(PropTypes.string).isRequired,
+  selectionMode: PropTypes.bool,
+  setSelectionMode: PropTypes.func.isRequired,
+};
+
 export const NotificationRequests = ({ multiColumn }) => {
   const columnRef = useRef();
   const intl = useIntl();
@@ -63,10 +166,40 @@ export const NotificationRequests = ({ multiColumn }) => {
   const notificationRequests = useSelector(state => state.getIn(['notificationRequests', 'items']));
   const hasMore = useSelector(state => !!state.getIn(['notificationRequests', 'next']));
 
+  const [selectionMode, setSelectionMode] = useState(false);
+  const [checkedRequestIds, setCheckedRequestIds] = useState([]);
+  const [selectAllChecked, setSelectAllChecked] = useState(false);
+
   const handleHeaderClick = useCallback(() => {
     columnRef.current?.scrollTop();
   }, [columnRef]);
 
+  const handleCheck = useCallback(id => {
+    setCheckedRequestIds(ids => {
+      const position = ids.indexOf(id);
+
+      if(position > -1)
+        ids.splice(position, 1);
+      else
+        ids.push(id);
+
+      setSelectAllChecked(ids.length === notificationRequests.size);
+
+      return [...ids];
+    });
+  }, [setCheckedRequestIds, notificationRequests]);
+
+  const toggleSelectAll = useCallback(() => {
+    setSelectAllChecked(checked => {
+      if(checked)
+        setCheckedRequestIds([]);
+      else
+        setCheckedRequestIds(notificationRequests.map(request => request.get('id')).toArray());
+
+      return !checked;
+    });
+  }, [notificationRequests]);
+
   const handleLoadMore = useCallback(() => {
     dispatch(expandNotificationRequests());
   }, [dispatch]);
@@ -84,6 +217,8 @@ export const NotificationRequests = ({ multiColumn }) => {
         onClick={handleHeaderClick}
         multiColumn={multiColumn}
         showBackButton
+        appendContent={
+          <SelectRow selectionMode={selectionMode} setSelectionMode={setSelectionMode} selectAllChecked={selectAllChecked} toggleSelectAll={toggleSelectAll} selectedItems={checkedRequestIds} />}
       >
         <ColumnSettings />
       </ColumnHeader>
@@ -104,6 +239,9 @@ export const NotificationRequests = ({ multiColumn }) => {
             id={request.get('id')}
             accountId={request.get('account')}
             notificationsCount={request.get('notifications_count')}
+            showCheckbox={selectionMode}
+            checked={checkedRequestIds.includes(request.get('id'))}
+            toggleCheck={handleCheck}
           />
         ))}
       </ScrollableList>
diff --git a/app/javascript/flavours/glitch/reducers/notification_requests.js b/app/javascript/flavours/glitch/reducers/notification_requests.js
index f10f982d2a9530..0a033682dad9bf 100644
--- a/app/javascript/flavours/glitch/reducers/notification_requests.js
+++ b/app/javascript/flavours/glitch/reducers/notification_requests.js
@@ -13,6 +13,8 @@ import {
   NOTIFICATION_REQUEST_FETCH_FAIL,
   NOTIFICATION_REQUEST_ACCEPT_REQUEST,
   NOTIFICATION_REQUEST_DISMISS_REQUEST,
+  NOTIFICATION_REQUESTS_ACCEPT_REQUEST,
+  NOTIFICATION_REQUESTS_DISMISS_REQUEST,
   NOTIFICATIONS_FOR_REQUEST_FETCH_REQUEST,
   NOTIFICATIONS_FOR_REQUEST_FETCH_SUCCESS,
   NOTIFICATIONS_FOR_REQUEST_FETCH_FAIL,
@@ -83,6 +85,9 @@ export const notificationRequestsReducer = (state = initialState, action) => {
   case NOTIFICATION_REQUEST_ACCEPT_REQUEST:
   case NOTIFICATION_REQUEST_DISMISS_REQUEST:
     return removeRequest(state, action.id);
+  case NOTIFICATION_REQUESTS_ACCEPT_REQUEST:
+  case NOTIFICATION_REQUESTS_DISMISS_REQUEST:
+    return action.ids.reduce((state, id) => removeRequest(state, id), state);
   case blockAccountSuccess.type:
     return removeRequestByAccount(state, action.payload.relationship.id);
   case muteAccountSuccess.type:
diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index ebae4e8bcc1a8d..4e178f576a22d2 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -4525,6 +4525,36 @@ a.status-card {
   }
 }
 
+.column-header__select-row {
+  border-width: 0 1px 1px;
+  border-style: solid;
+  border-color: var(--background-border-color);
+  padding: 15px;
+  display: flex;
+  align-items: center;
+  gap: 8px;
+
+  &__checkbox .check-box {
+    display: flex;
+  }
+
+  &__selection-mode {
+    flex-grow: 1;
+
+    .text-btn:hover {
+      text-decoration: underline;
+    }
+  }
+
+  &__actions {
+    .icon-button {
+      border-radius: 4px;
+      border: 1px solid var(--background-border-color);
+      padding: 5px;
+    }
+  }
+}
+
 .column-header {
   display: flex;
   font-size: 16px;
@@ -8017,20 +8047,9 @@ img.modal-warning {
     flex: 0 0 auto;
     border-radius: 50%;
 
-    &.checked {
+    &.checked,
+    &.indeterminate {
       border-color: $ui-highlight-color;
-
-      &::before {
-        position: absolute;
-        left: 2px;
-        top: 2px;
-        content: '';
-        display: block;
-        border-radius: 50%;
-        width: 12px;
-        height: 12px;
-        background: $ui-highlight-color;
-      }
     }
 
     .icon {
@@ -8040,19 +8059,28 @@ img.modal-warning {
   }
 }
 
+.radio-button.checked::before {
+  position: absolute;
+  left: 2px;
+  top: 2px;
+  content: '';
+  display: block;
+  border-radius: 50%;
+  width: 12px;
+  height: 12px;
+  background: $ui-highlight-color;
+}
+
 .check-box {
   &__input {
     width: 18px;
     height: 18px;
     border-radius: 2px;
 
-    &.checked {
+    &.checked,
+    &.indeterminate {
       background: $ui-highlight-color;
       color: $white;
-
-      &::before {
-        display: none;
-      }
     }
   }
 }
@@ -10780,12 +10808,28 @@ noscript {
 }
 
 .notification-request {
+  $padding: 15px;
+
   display: flex;
-  align-items: center;
-  gap: 16px;
-  padding: 15px;
+  padding: $padding;
+  gap: 8px;
+  position: relative;
   border-bottom: 1px solid var(--background-border-color);
 
+  &__checkbox {
+    position: absolute;
+    inset-inline-start: $padding;
+    top: 50%;
+    transform: translateY(-50%);
+    width: 0;
+    overflow: hidden;
+    opacity: 0;
+
+    .check-box {
+      display: flex;
+    }
+  }
+
   &__link {
     display: flex;
     align-items: center;
@@ -10843,6 +10887,31 @@ noscript {
       padding: 5px;
     }
   }
+
+  .notification-request__link {
+    transition: padding-inline-start 0.1s ease-in-out;
+  }
+
+  &--forced-checkbox {
+    cursor: pointer;
+
+    &:hover {
+      background: lighten($ui-base-color, 1%);
+    }
+
+    .notification-request__checkbox {
+      opacity: 1;
+      width: 30px;
+    }
+
+    .notification-request__link {
+      padding-inline-start: 30px;
+    }
+
+    .notification-request__actions {
+      display: none;
+    }
+  }
 }
 
 .more-from-author {

From bcec8f53a48cc3892bd646ca7960b30edc402dcf Mon Sep 17 00:00:00 2001
From: Travis Briggs <audiodude@gmail.com>
Date: Fri, 9 Aug 2024 09:12:51 -0700
Subject: [PATCH 1789/2191] Add hint to user that other remote statuses may not
 be displayed (#26910)

---
 app/javascript/mastodon/features/status/index.jsx | 10 ++++++++--
 app/javascript/mastodon/locales/en.json           |  1 +
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/javascript/mastodon/features/status/index.jsx b/app/javascript/mastodon/features/status/index.jsx
index 7f3044c5c9be0b..8f36c44271b05a 100644
--- a/app/javascript/mastodon/features/status/index.jsx
+++ b/app/javascript/mastodon/features/status/index.jsx
@@ -1,6 +1,6 @@
 import PropTypes from 'prop-types';
 
-import { defineMessages, injectIntl } from 'react-intl';
+import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
 
 import classNames from 'classnames';
 import { Helmet } from 'react-helmet';
@@ -18,6 +18,7 @@ import VisibilityIcon from '@/material-icons/400-24px/visibility.svg?react';
 import VisibilityOffIcon from '@/material-icons/400-24px/visibility_off.svg?react';
 import { Icon }  from 'mastodon/components/icon';
 import { LoadingIndicator } from 'mastodon/components/loading_indicator';
+import { TimelineHint } from 'mastodon/components/timeline_hint';
 import ScrollContainer from 'mastodon/containers/scroll_container';
 import BundleColumnError from 'mastodon/features/ui/components/bundle_column_error';
 import { identityContextPropShape, withIdentity } from 'mastodon/identity_context';
@@ -598,7 +599,7 @@ class Status extends ImmutablePureComponent {
   };
 
   render () {
-    let ancestors, descendants;
+    let ancestors, descendants, remoteHint;
     const { isLoading, status, ancestorsIds, descendantsIds, intl, domain, multiColumn, pictureInPicture } = this.props;
     const { fullscreen } = this.state;
 
@@ -627,6 +628,10 @@ class Status extends ImmutablePureComponent {
     const isLocal = status.getIn(['account', 'acct'], '').indexOf('@') === -1;
     const isIndexable = !status.getIn(['account', 'noindex']);
 
+    if (!isLocal) {
+      remoteHint = <TimelineHint url={status.get('url')} resource={<FormattedMessage id='timeline_hint.resources.replies' defaultMessage='Some replies' />} />;
+    }
+
     const handlers = {
       moveUp: this.handleHotkeyMoveUp,
       moveDown: this.handleHotkeyMoveDown,
@@ -695,6 +700,7 @@ class Status extends ImmutablePureComponent {
             </HotKeys>
 
             {descendants}
+            {remoteHint}
           </div>
         </ScrollContainer>
 
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index 388fb80de52817..fae630a27fce98 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -831,6 +831,7 @@
   "timeline_hint.remote_resource_not_displayed": "{resource} from other servers are not displayed.",
   "timeline_hint.resources.followers": "Followers",
   "timeline_hint.resources.follows": "Follows",
+  "timeline_hint.resources.replies": "Some replies",
   "timeline_hint.resources.statuses": "Older posts",
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "Trending now",

From 28411acebb5626acf43b44a7b6c33ac783156f72 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 9 Aug 2024 18:40:15 +0200
Subject: [PATCH 1790/2191] =?UTF-8?q?Fix=20=E2=80=9CAccept=20all=E2=80=9D/?=
 =?UTF-8?q?=E2=80=9CDismiss=20all=E2=80=9D=20notification=20requests=20not?=
 =?UTF-8?q?=20working=20(#31358)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../features/notifications/requests.jsx       | 36 +++++++++++++++++--
 1 file changed, 33 insertions(+), 3 deletions(-)

diff --git a/app/javascript/mastodon/features/notifications/requests.jsx b/app/javascript/mastodon/features/notifications/requests.jsx
index d5f191b734d8b2..f323bda4fbc1d7 100644
--- a/app/javascript/mastodon/features/notifications/requests.jsx
+++ b/app/javascript/mastodon/features/notifications/requests.jsx
@@ -74,9 +74,39 @@ const SelectRow = ({selectAllChecked, toggleSelectAll, selectedItems, selectionM
   const intl = useIntl();
   const dispatch = useDispatch();
 
+  const notificationRequests = useSelector(state => state.getIn(['notificationRequests', 'items']));
+
   const selectedCount = selectedItems.length;
 
   const handleAcceptAll = useCallback(() => {
+    const items = notificationRequests.map(request => request.get('id')).toArray();
+    dispatch(openModal({
+      modalType: 'CONFIRM',
+      modalProps: {
+        title: intl.formatMessage(messages.confirmAcceptAllTitle),
+        message: intl.formatMessage(messages.confirmAcceptAllMessage, { count: items.length }),
+        confirm: intl.formatMessage(messages.confirmAcceptAllButton),
+        onConfirm: () =>
+          dispatch(acceptNotificationRequests(items)),
+      },
+    }));
+  }, [dispatch, intl, notificationRequests]);
+
+  const handleDismissAll = useCallback(() => {
+    const items = notificationRequests.map(request => request.get('id')).toArray();
+    dispatch(openModal({
+      modalType: 'CONFIRM',
+      modalProps: {
+        title: intl.formatMessage(messages.confirmDismissAllTitle),
+        message: intl.formatMessage(messages.confirmDismissAllMessage, { count: items.length }),
+        confirm: intl.formatMessage(messages.confirmDismissAllButton),
+        onConfirm: () =>
+          dispatch(dismissNotificationRequests(items)),
+      },
+    }));
+  }, [dispatch, intl, notificationRequests]);
+
+  const handleAcceptMultiple = useCallback(() => {
     dispatch(openModal({
       modalType: 'CONFIRM',
       modalProps: {
@@ -89,7 +119,7 @@ const SelectRow = ({selectAllChecked, toggleSelectAll, selectedItems, selectionM
     }));
   }, [dispatch, intl, selectedItems]);
 
-  const handleDismissAll = useCallback(() => {
+  const handleDismissMultiple = useCallback(() => {
     dispatch(openModal({
       modalType: 'CONFIRM',
       modalProps: {
@@ -111,8 +141,8 @@ const SelectRow = ({selectAllChecked, toggleSelectAll, selectedItems, selectionM
       { text: intl.formatMessage(messages.acceptAll), action: handleAcceptAll },
       { text: intl.formatMessage(messages.dismissAll), action: handleDismissAll },
     ] : [
-      { text: intl.formatMessage(messages.acceptMultiple, { count: selectedCount }), action: handleAcceptAll },
-      { text: intl.formatMessage(messages.dismissMultiple, { count: selectedCount }), action: handleDismissAll },
+      { text: intl.formatMessage(messages.acceptMultiple, { count: selectedCount }), action: handleAcceptMultiple },
+      { text: intl.formatMessage(messages.dismissMultiple, { count: selectedCount }), action: handleDismissMultiple },
     ];
 
   return (

From 57a6307228040e55027ed2d48d01ad4fd0dbe3c9 Mon Sep 17 00:00:00 2001
From: Travis Briggs <audiodude@gmail.com>
Date: Fri, 9 Aug 2024 09:12:51 -0700
Subject: [PATCH 1791/2191] [Glitch] Add hint to user that other remote
 statuses may not be displayed

Port bcec8f53a48cc3892bd646ca7960b30edc402dcf to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/features/status/index.jsx          | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/javascript/flavours/glitch/features/status/index.jsx b/app/javascript/flavours/glitch/features/status/index.jsx
index 5bc99c661426df..cdc567d9c60a7f 100644
--- a/app/javascript/flavours/glitch/features/status/index.jsx
+++ b/app/javascript/flavours/glitch/features/status/index.jsx
@@ -1,6 +1,6 @@
 import PropTypes from 'prop-types';
 
-import { defineMessages, injectIntl } from 'react-intl';
+import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
 
 import classNames from 'classnames';
 import { Helmet } from 'react-helmet';
@@ -19,6 +19,7 @@ import VisibilityIcon from '@/material-icons/400-24px/visibility.svg?react';
 import VisibilityOffIcon from '@/material-icons/400-24px/visibility_off.svg?react';
 import { Icon }  from 'flavours/glitch/components/icon';
 import { LoadingIndicator } from 'flavours/glitch/components/loading_indicator';
+import { TimelineHint } from 'flavours/glitch/components/timeline_hint';
 import ScrollContainer from 'flavours/glitch/containers/scroll_container';
 import BundleColumnError from 'flavours/glitch/features/ui/components/bundle_column_error';
 import { identityContextPropShape, withIdentity } from 'flavours/glitch/identity_context';
@@ -622,7 +623,7 @@ class Status extends ImmutablePureComponent {
   };
 
   render () {
-    let ancestors, descendants;
+    let ancestors, descendants, remoteHint;
     const { isLoading, status, settings, ancestorsIds, descendantsIds, intl, domain, multiColumn, pictureInPicture } = this.props;
     const { fullscreen } = this.state;
 
@@ -653,6 +654,10 @@ class Status extends ImmutablePureComponent {
     const isLocal = status.getIn(['account', 'acct'], '').indexOf('@') === -1;
     const isIndexable = !status.getIn(['account', 'noindex']);
 
+    if (!isLocal) {
+      remoteHint = <TimelineHint url={status.get('url')} resource={<FormattedMessage id='timeline_hint.resources.replies' defaultMessage='Some replies' />} />;
+    }
+
     const handlers = {
       moveUp: this.handleHotkeyMoveUp,
       moveDown: this.handleHotkeyMoveDown,
@@ -724,6 +729,7 @@ class Status extends ImmutablePureComponent {
             </HotKeys>
 
             {descendants}
+            {remoteHint}
           </div>
         </ScrollContainer>
 

From 082c71f4eaf0db2aee0bf35f733bd36304925ba5 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 9 Aug 2024 18:40:15 +0200
Subject: [PATCH 1792/2191] =?UTF-8?q?[Glitch]=20Fix=20=E2=80=9CAccept=20al?=
 =?UTF-8?q?l=E2=80=9D/=E2=80=9CDismiss=20all=E2=80=9D=20notification=20req?=
 =?UTF-8?q?uests=20not=20working?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Port 28411acebb5626acf43b44a7b6c33ac783156f72 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../features/notifications/requests.jsx       | 36 +++++++++++++++++--
 1 file changed, 33 insertions(+), 3 deletions(-)

diff --git a/app/javascript/flavours/glitch/features/notifications/requests.jsx b/app/javascript/flavours/glitch/features/notifications/requests.jsx
index f8f75023ade0d5..6db16a42d11c9c 100644
--- a/app/javascript/flavours/glitch/features/notifications/requests.jsx
+++ b/app/javascript/flavours/glitch/features/notifications/requests.jsx
@@ -74,9 +74,39 @@ const SelectRow = ({selectAllChecked, toggleSelectAll, selectedItems, selectionM
   const intl = useIntl();
   const dispatch = useDispatch();
 
+  const notificationRequests = useSelector(state => state.getIn(['notificationRequests', 'items']));
+
   const selectedCount = selectedItems.length;
 
   const handleAcceptAll = useCallback(() => {
+    const items = notificationRequests.map(request => request.get('id')).toArray();
+    dispatch(openModal({
+      modalType: 'CONFIRM',
+      modalProps: {
+        title: intl.formatMessage(messages.confirmAcceptAllTitle),
+        message: intl.formatMessage(messages.confirmAcceptAllMessage, { count: items.length }),
+        confirm: intl.formatMessage(messages.confirmAcceptAllButton),
+        onConfirm: () =>
+          dispatch(acceptNotificationRequests(items)),
+      },
+    }));
+  }, [dispatch, intl, notificationRequests]);
+
+  const handleDismissAll = useCallback(() => {
+    const items = notificationRequests.map(request => request.get('id')).toArray();
+    dispatch(openModal({
+      modalType: 'CONFIRM',
+      modalProps: {
+        title: intl.formatMessage(messages.confirmDismissAllTitle),
+        message: intl.formatMessage(messages.confirmDismissAllMessage, { count: items.length }),
+        confirm: intl.formatMessage(messages.confirmDismissAllButton),
+        onConfirm: () =>
+          dispatch(dismissNotificationRequests(items)),
+      },
+    }));
+  }, [dispatch, intl, notificationRequests]);
+
+  const handleAcceptMultiple = useCallback(() => {
     dispatch(openModal({
       modalType: 'CONFIRM',
       modalProps: {
@@ -89,7 +119,7 @@ const SelectRow = ({selectAllChecked, toggleSelectAll, selectedItems, selectionM
     }));
   }, [dispatch, intl, selectedItems]);
 
-  const handleDismissAll = useCallback(() => {
+  const handleDismissMultiple = useCallback(() => {
     dispatch(openModal({
       modalType: 'CONFIRM',
       modalProps: {
@@ -111,8 +141,8 @@ const SelectRow = ({selectAllChecked, toggleSelectAll, selectedItems, selectionM
       { text: intl.formatMessage(messages.acceptAll), action: handleAcceptAll },
       { text: intl.formatMessage(messages.dismissAll), action: handleDismissAll },
     ] : [
-      { text: intl.formatMessage(messages.acceptMultiple, { count: selectedCount }), action: handleAcceptAll },
-      { text: intl.formatMessage(messages.dismissMultiple, { count: selectedCount }), action: handleDismissAll },
+      { text: intl.formatMessage(messages.acceptMultiple, { count: selectedCount }), action: handleAcceptMultiple },
+      { text: intl.formatMessage(messages.dismissMultiple, { count: selectedCount }), action: handleDismissMultiple },
     ];
 
   return (

From caf0164f00a35f892a945fcec352d865f479b447 Mon Sep 17 00:00:00 2001
From: Michael Stanclift <mx@vmstan.com>
Date: Sat, 10 Aug 2024 04:11:34 -0500
Subject: [PATCH 1793/2191] Improve legibility of account/hashtag autosuggest
 (#31361)

---
 app/javascript/styles/mastodon-light/diff.scss |  6 ++++++
 app/javascript/styles/mastodon/components.scss | 13 ++++++++++---
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/app/javascript/styles/mastodon-light/diff.scss b/app/javascript/styles/mastodon-light/diff.scss
index 1f282605edcbc9..89d3caeab5318a 100644
--- a/app/javascript/styles/mastodon-light/diff.scss
+++ b/app/javascript/styles/mastodon-light/diff.scss
@@ -559,3 +559,9 @@ a.sparkline {
 .report-dialog-modal__textarea {
   background: darken($ui-base-color, 10%);
 }
+
+.autosuggest-account {
+  .display-name__account {
+    color: $dark-text-color;
+  }
+}
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index fb615300b15adc..d8bcf6301cfba1 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -426,10 +426,17 @@ body > [data-popper-placement] {
 
       &:hover,
       &:focus,
-      &:active,
+      &:active {
+        background: var(--dropdown-border-color);
+
+        .autosuggest-account .display-name__account {
+          color: inherit;
+        }
+      }
+
       &.selected {
         background: $ui-highlight-color;
-        color: $primary-text-color;
+        color: $ui-button-color;
 
         .autosuggest-account .display-name__account {
           color: inherit;
@@ -465,7 +472,7 @@ body > [data-popper-placement] {
     display: block;
     line-height: 16px;
     font-size: 12px;
-    color: $dark-text-color;
+    color: $ui-primary-color;
   }
 }
 

From 7519ef2fa116bcc7577483900379e497d7878a9e Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Sat, 10 Aug 2024 05:12:47 -0400
Subject: [PATCH 1794/2191] Use material symbol for responsive menu toggle
 (#31362)

---
 app/javascript/styles/mastodon/admin.scss | 6 +++---
 app/views/layouts/admin.html.haml         | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/javascript/styles/mastodon/admin.scss b/app/javascript/styles/mastodon/admin.scss
index 045a435de273ec..61e949b27b744b 100644
--- a/app/javascript/styles/mastodon/admin.scss
+++ b/app/javascript/styles/mastodon/admin.scss
@@ -65,16 +65,16 @@ $content-width: 840px;
           background: $ui-base-color;
         }
 
-        .fa-times {
+        .material-close {
           display: none;
         }
 
         &.active {
-          .fa-times {
+          .material-close {
             display: block;
           }
 
-          .fa-bars {
+          .material-menu {
             display: none;
           }
         }
diff --git a/app/views/layouts/admin.html.haml b/app/views/layouts/admin.html.haml
index d725e65aa9f1ed..ebd236c62889b6 100644
--- a/app/views/layouts/admin.html.haml
+++ b/app/views/layouts/admin.html.haml
@@ -17,8 +17,8 @@
                 = logo_as_symbol(:wordmark)
 
             = link_to '#', class: 'sidebar__toggle__icon', 'aria-label': t('navigation.toggle_menu'), 'aria-expanded': 'false' do
-              = fa_icon 'bars'
-              = fa_icon 'times'
+              = material_symbol 'menu'
+              = material_symbol 'close'
 
           = render_navigation
 

From 885e67b2ed8672344007fd94fd1fd5f2e8aed613 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Sat, 10 Aug 2024 05:13:08 -0400
Subject: [PATCH 1795/2191] Use material symbol for modal layout sign out link
 (#31363)

---
 app/views/layouts/modal.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/layouts/modal.html.haml b/app/views/layouts/modal.html.haml
index bd2dcc1324c82d..bbc9185f5b3506 100644
--- a/app/views/layouts/modal.html.haml
+++ b/app/views/layouts/modal.html.haml
@@ -9,7 +9,7 @@
         = t 'users.signed_in_as'
         %span.username @#{current_account.local_username_and_domain}
       = link_to destroy_user_session_path(continue: true), method: :delete, class: 'logout-link icon-button', title: t('applications.logout'), 'aria-label': t('applications.logout') do
-        = fa_icon 'sign-out'
+        = material_symbol 'logout'
 
   .container-alt= yield
 

From d3089018d5508af2951401e8d7ba8c43dac1d909 Mon Sep 17 00:00:00 2001
From: Emelia Smith <ThisIsMissEm@users.noreply.github.com>
Date: Sat, 10 Aug 2024 11:17:10 +0200
Subject: [PATCH 1796/2191] Move Follow Recommendations to Trends menu, rename
 to Recommendations & Trends (#31292)

---
 app/javascript/styles/mastodon/forms.scss             | 4 ++++
 app/views/admin/follow_recommendations/show.html.haml | 2 +-
 app/views/admin/trends/statuses/index.html.haml       | 5 +++--
 config/locales/en.yml                                 | 2 +-
 config/navigation.rb                                  | 2 +-
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/javascript/styles/mastodon/forms.scss b/app/javascript/styles/mastodon/forms.scss
index 971e78f76f57c4..f3cf66237f5592 100644
--- a/app/javascript/styles/mastodon/forms.scss
+++ b/app/javascript/styles/mastodon/forms.scss
@@ -290,6 +290,10 @@ code {
     flex: 0;
   }
 
+  .input.select.select--languages {
+    min-width: 32ch;
+  }
+
   .required abbr {
     text-decoration: none;
     color: lighten($error-value-color, 12%);
diff --git a/app/views/admin/follow_recommendations/show.html.haml b/app/views/admin/follow_recommendations/show.html.haml
index 62cd3157252a68..6c2627743b46e9 100644
--- a/app/views/admin/follow_recommendations/show.html.haml
+++ b/app/views/admin/follow_recommendations/show.html.haml
@@ -12,7 +12,7 @@
   .filters
     .filter-subset.filter-subset--with-select
       %strong= t('admin.follow_recommendations.language')
-      .input.select.optional
+      .input.select.select--languages.optional
         = form.select :language,
                       options_for_select(Trends.available_locales.map { |key| [standard_locale_name(key), key] }, @language)
     .filter-subset
diff --git a/app/views/admin/trends/statuses/index.html.haml b/app/views/admin/trends/statuses/index.html.haml
index f9238dee461e6a..93d4177a671692 100644
--- a/app/views/admin/trends/statuses/index.html.haml
+++ b/app/views/admin/trends/statuses/index.html.haml
@@ -12,10 +12,11 @@
   .filters
     .filter-subset.filter-subset--with-select
       %strong= t('admin.follow_recommendations.language')
-      .input.select.optional
+      .input.select.select--languages.optional
         = form.select :locale,
                       options_for_select(@locales.map { |key| [standard_locale_name(key), key] }, params[:locale]),
-                      include_blank: true
+                      { include_blank: true },
+                      { disabled: @locales.empty? }
     .filter-subset
       %strong= t('admin.trends.trending')
       %ul
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 771bada5203c80..791cb5b18769a7 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -976,7 +976,7 @@ en:
         used_by_over_week:
           one: Used by one person over the last week
           other: Used by %{count} people over the last week
-      title: Trends
+      title: Recommendations & Trends
       trending: Trending
     warning_presets:
       add_new: Add new
diff --git a/config/navigation.rb b/config/navigation.rb
index ff71479180f633..77e60d13c00f06 100644
--- a/config/navigation.rb
+++ b/config/navigation.rb
@@ -42,6 +42,7 @@
       s.item :statuses, safe_join([material_symbol('chat_bubble'), t('admin.trends.statuses.title')]), admin_trends_statuses_path, highlights_on: %r{/admin/trends/statuses}
       s.item :tags, safe_join([material_symbol('tag'), t('admin.trends.tags.title')]), admin_trends_tags_path, highlights_on: %r{/admin/trends/tags}
       s.item :links, safe_join([material_symbol('breaking_news'), t('admin.trends.links.title')]), admin_trends_links_path, highlights_on: %r{/admin/trends/links}
+      s.item :follow_recommendations, safe_join([material_symbol('person_add'), t('admin.follow_recommendations.title')]), admin_follow_recommendations_path, highlights_on: %r{/admin/follow_recommendations}
     end
 
     n.item :moderation, safe_join([material_symbol('gavel'), t('moderation.title')]), nil, if: -> { current_user.can?(:manage_reports, :view_audit_log, :manage_users, :manage_invites, :manage_taxonomies, :manage_federation, :manage_blocks) && !self_destruct } do |s|
@@ -49,7 +50,6 @@
       s.item :accounts, safe_join([material_symbol('groups'), t('admin.accounts.title')]), admin_accounts_path(origin: 'local'), highlights_on: %r{/admin/accounts|admin/account_moderation_notes|/admin/pending_accounts|/admin/disputes|/admin/users}, if: -> { current_user.can?(:manage_users) }
       s.item :tags, safe_join([material_symbol('tag'), t('admin.tags.title')]), admin_tags_path, highlights_on: %r{/admin/tags}, if: -> { current_user.can?(:manage_taxonomies) }
       s.item :invites, safe_join([material_symbol('person_add'), t('admin.invites.title')]), admin_invites_path, if: -> { current_user.can?(:manage_invites) }
-      s.item :follow_recommendations, safe_join([material_symbol('person_add'), t('admin.follow_recommendations.title')]), admin_follow_recommendations_path, highlights_on: %r{/admin/follow_recommendations}, if: -> { current_user.can?(:manage_taxonomies) }
       s.item :instances, safe_join([material_symbol('cloud'), t('admin.instances.title')]), admin_instances_path(limited: limited_federation_mode? ? nil : '1'), highlights_on: %r{/admin/instances|/admin/domain_blocks|/admin/domain_allows}, if: -> { current_user.can?(:manage_federation) }
       s.item :email_domain_blocks, safe_join([material_symbol('mail'), t('admin.email_domain_blocks.title')]), admin_email_domain_blocks_path, highlights_on: %r{/admin/email_domain_blocks}, if: -> { current_user.can?(:manage_blocks) }
       s.item :ip_blocks, safe_join([material_symbol('hide_source'), t('admin.ip_blocks.title')]), admin_ip_blocks_path, highlights_on: %r{/admin/ip_blocks}, if: -> { current_user.can?(:manage_blocks) }

From c39a8e106144c3bb98a5815859ef5772c45f1a10 Mon Sep 17 00:00:00 2001
From: Robin <94416535+beanieyi@users.noreply.github.com>
Date: Sat, 10 Aug 2024 03:32:57 -0600
Subject: [PATCH 1797/2191] =?UTF-8?q?Change=20=E2=80=9Ce-mail=E2=80=9D=20t?=
 =?UTF-8?q?o=20=E2=80=9Cemail=E2=80=9D=20in=20en.yml=20(#31317)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/locales/en.yml | 110 +++++++++++++++++++++---------------------
 1 file changed, 55 insertions(+), 55 deletions(-)

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 791cb5b18769a7..1df9af88d95306 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -31,7 +31,7 @@ en:
       created_msg: Moderation note successfully created!
       destroyed_msg: Moderation note successfully destroyed!
     accounts:
-      add_email_domain_block: Block e-mail domain
+      add_email_domain_block: Block email domain
       approve: Approve
       approved_msg: Successfully approved %{username}'s sign-up application
       are_you_sure: Are you sure?
@@ -58,7 +58,7 @@ en:
       demote: Demote
       destroyed_msg: "%{username}'s data is now queued to be deleted imminently"
       disable: Freeze
-      disable_sign_in_token_auth: Disable e-mail token authentication
+      disable_sign_in_token_auth: Disable email token authentication
       disable_two_factor_authentication: Disable 2FA
       disabled: Frozen
       display_name: Display name
@@ -67,7 +67,7 @@ en:
       email: Email
       email_status: Email status
       enable: Unfreeze
-      enable_sign_in_token_auth: Enable e-mail token authentication
+      enable_sign_in_token_auth: Enable email token authentication
       enabled: Enabled
       enabled_msg: Successfully unfroze %{username}'s account
       followers: Followers
@@ -132,7 +132,7 @@ en:
       resubscribe: Resubscribe
       role: Role
       search: Search
-      search_same_email_domain: Other users with the same e-mail domain
+      search_same_email_domain: Other users with the same email domain
       search_same_ip: Other users with the same IP
       security: Security
       security_measures:
@@ -173,26 +173,26 @@ en:
         approve_appeal: Approve Appeal
         approve_user: Approve User
         assigned_to_self_report: Assign Report
-        change_email_user: Change E-mail for User
+        change_email_user: Change Email for User
         change_role_user: Change Role of User
         confirm_user: Confirm User
         create_account_warning: Create Warning
         create_announcement: Create Announcement
-        create_canonical_email_block: Create E-mail Block
+        create_canonical_email_block: Create Email Block
         create_custom_emoji: Create Custom Emoji
         create_domain_allow: Create Domain Allow
         create_domain_block: Create Domain Block
-        create_email_domain_block: Create E-mail Domain Block
+        create_email_domain_block: Create Email Domain Block
         create_ip_block: Create IP rule
         create_unavailable_domain: Create Unavailable Domain
         create_user_role: Create Role
         demote_user: Demote User
         destroy_announcement: Delete Announcement
-        destroy_canonical_email_block: Delete E-mail Block
+        destroy_canonical_email_block: Delete Email Block
         destroy_custom_emoji: Delete Custom Emoji
         destroy_domain_allow: Delete Domain Allow
         destroy_domain_block: Delete Domain Block
-        destroy_email_domain_block: Delete E-mail Domain Block
+        destroy_email_domain_block: Delete Email Domain Block
         destroy_instance: Purge Domain
         destroy_ip_block: Delete IP rule
         destroy_status: Delete Post
@@ -200,10 +200,10 @@ en:
         destroy_user_role: Destroy Role
         disable_2fa_user: Disable 2FA
         disable_custom_emoji: Disable Custom Emoji
-        disable_sign_in_token_auth_user: Disable E-mail Token Authentication for User
+        disable_sign_in_token_auth_user: Disable Email Token Authentication for User
         disable_user: Disable User
         enable_custom_emoji: Enable Custom Emoji
-        enable_sign_in_token_auth_user: Enable E-mail Token Authentication for User
+        enable_sign_in_token_auth_user: Enable Email Token Authentication for User
         enable_user: Enable User
         memorialize_account: Memorialize Account
         promote_user: Promote User
@@ -233,26 +233,26 @@ en:
         approve_appeal_html: "%{name} approved moderation decision appeal from %{target}"
         approve_user_html: "%{name} approved sign-up from %{target}"
         assigned_to_self_report_html: "%{name} assigned report %{target} to themselves"
-        change_email_user_html: "%{name} changed the e-mail address of user %{target}"
+        change_email_user_html: "%{name} changed the email address of user %{target}"
         change_role_user_html: "%{name} changed role of %{target}"
-        confirm_user_html: "%{name} confirmed e-mail address of user %{target}"
+        confirm_user_html: "%{name} confirmed email address of user %{target}"
         create_account_warning_html: "%{name} sent a warning to %{target}"
         create_announcement_html: "%{name} created new announcement %{target}"
-        create_canonical_email_block_html: "%{name} blocked e-mail with the hash %{target}"
+        create_canonical_email_block_html: "%{name} blocked email with the hash %{target}"
         create_custom_emoji_html: "%{name} uploaded new emoji %{target}"
         create_domain_allow_html: "%{name} allowed federation with domain %{target}"
         create_domain_block_html: "%{name} blocked domain %{target}"
-        create_email_domain_block_html: "%{name} blocked e-mail domain %{target}"
+        create_email_domain_block_html: "%{name} blocked email domain %{target}"
         create_ip_block_html: "%{name} created rule for IP %{target}"
         create_unavailable_domain_html: "%{name} stopped delivery to domain %{target}"
         create_user_role_html: "%{name} created %{target} role"
         demote_user_html: "%{name} demoted user %{target}"
         destroy_announcement_html: "%{name} deleted announcement %{target}"
-        destroy_canonical_email_block_html: "%{name} unblocked e-mail with the hash %{target}"
+        destroy_canonical_email_block_html: "%{name} unblocked email with the hash %{target}"
         destroy_custom_emoji_html: "%{name} deleted emoji %{target}"
         destroy_domain_allow_html: "%{name} disallowed federation with domain %{target}"
         destroy_domain_block_html: "%{name} unblocked domain %{target}"
-        destroy_email_domain_block_html: "%{name} unblocked e-mail domain %{target}"
+        destroy_email_domain_block_html: "%{name} unblocked email domain %{target}"
         destroy_instance_html: "%{name} purged domain %{target}"
         destroy_ip_block_html: "%{name} deleted rule for IP %{target}"
         destroy_status_html: "%{name} removed post by %{target}"
@@ -260,10 +260,10 @@ en:
         destroy_user_role_html: "%{name} deleted %{target} role"
         disable_2fa_user_html: "%{name} disabled two factor requirement for user %{target}"
         disable_custom_emoji_html: "%{name} disabled emoji %{target}"
-        disable_sign_in_token_auth_user_html: "%{name} disabled e-mail token authentication for %{target}"
+        disable_sign_in_token_auth_user_html: "%{name} disabled email token authentication for %{target}"
         disable_user_html: "%{name} disabled login for user %{target}"
         enable_custom_emoji_html: "%{name} enabled emoji %{target}"
-        enable_sign_in_token_auth_user_html: "%{name} enabled e-mail token authentication for %{target}"
+        enable_sign_in_token_auth_user_html: "%{name} enabled email token authentication for %{target}"
         enable_user_html: "%{name} enabled login for user %{target}"
         memorialize_account_html: "%{name} turned %{target}'s account into a memoriam page"
         promote_user_html: "%{name} promoted user %{target}"
@@ -271,7 +271,7 @@ en:
         reject_user_html: "%{name} rejected sign-up from %{target}"
         remove_avatar_user_html: "%{name} removed %{target}'s avatar"
         reopen_report_html: "%{name} reopened report %{target}"
-        resend_user_html: "%{name} resent confirmation e-mail for %{target}"
+        resend_user_html: "%{name} resent confirmation email for %{target}"
         reset_password_user_html: "%{name} reset password of user %{target}"
         resolve_report_html: "%{name} resolved report %{target}"
         sensitive_account_html: "%{name} marked %{target}'s media as sensitive"
@@ -432,7 +432,7 @@ en:
       attempts_over_week:
         one: "%{count} attempt over the last week"
         other: "%{count} sign-up attempts over the last week"
-      created_msg: Successfully blocked e-mail domain
+      created_msg: Successfully blocked email domain
       delete: Delete
       dns:
         types:
@@ -441,12 +441,12 @@ en:
       new:
         create: Add domain
         resolve: Resolve domain
-        title: Block new e-mail domain
-      no_email_domain_block_selected: No e-mail domain blocks were changed as none were selected
+        title: Block new email domain
+      no_email_domain_block_selected: No email domain blocks were changed as none were selected
       not_permitted: Not permitted
-      resolved_dns_records_hint_html: The domain name resolves to the following MX domains, which are ultimately responsible for accepting e-mail. Blocking an MX domain will block sign-ups from any e-mail address which uses the same MX domain, even if the visible domain name is different. <strong>Be careful not to block major e-mail providers.</strong>
+      resolved_dns_records_hint_html: The domain name resolves to the following MX domains, which are ultimately responsible for accepting email. Blocking an MX domain will block sign-ups from any email address which uses the same MX domain, even if the visible domain name is different. <strong>Be careful not to block major email providers.</strong>
       resolved_through_html: Resolved through %{domain}
-      title: Blocked e-mail domains
+      title: Blocked email domains
     export_domain_allows:
       new:
         title: Import domain allows
@@ -600,7 +600,7 @@ en:
         resolve_description_html: No action will be taken against the reported account, no strike recorded, and the report will be closed.
         silence_description_html: The account will be visible only to those who already follow it or manually look it up, severely limiting its reach. Can always be reverted. Closes all reports against this account.
         suspend_description_html: The account and all its contents will be inaccessible and eventually deleted, and interacting with it will be impossible. Reversible within 30 days. Closes all reports against this account.
-      actions_description_html: Decide which action to take to resolve this report. If you take a punitive action against the reported account, an e-mail notification will be sent to them, except when the <strong>Spam</strong> category is selected.
+      actions_description_html: Decide which action to take to resolve this report. If you take a punitive action against the reported account, an email notification will be sent to them, except when the <strong>Spam</strong> category is selected.
       actions_description_remote_html: Decide which action to take to resolve this report. This will only affect how <strong>your</strong> server communicates with this remote account and handle its content.
       add_to_report: Add more to report
       already_suspended_badges:
@@ -665,7 +665,7 @@ en:
         delete_data_html: Delete <strong>@%{acct}</strong>'s profile and contents 30 days from now unless they get unsuspended in the meantime
         preview_preamble_html: "<strong>@%{acct}</strong> will receive a warning with the following contents:"
         record_strike_html: Record a strike against <strong>@%{acct}</strong> to help you escalate on future violations from this account
-        send_email_html: Send <strong>@%{acct}</strong> a warning e-mail
+        send_email_html: Send <strong>@%{acct}</strong> a warning email
         warning_placeholder: Optional additional reasoning for the moderation action.
       target_origin: Origin of reported account
       title: Reports
@@ -705,7 +705,7 @@ en:
         manage_appeals: Manage Appeals
         manage_appeals_description: Allows users to review appeals against moderation actions
         manage_blocks: Manage Blocks
-        manage_blocks_description: Allows users to block e-mail providers and IP addresses
+        manage_blocks_description: Allows users to block email providers and IP addresses
         manage_custom_emojis: Manage Custom Emojis
         manage_custom_emojis_description: Allows users to manage custom emojis on the server
         manage_federation: Manage Federation
@@ -723,7 +723,7 @@ en:
         manage_taxonomies: Manage Taxonomies
         manage_taxonomies_description: Allows users to review trending content and update hashtag settings
         manage_user_access: Manage User Access
-        manage_user_access_description: Allows users to disable other users' two-factor authentication, change their e-mail address, and reset their password
+        manage_user_access_description: Allows users to disable other users' two-factor authentication, change their email address, and reset their password
         manage_users: Manage Users
         manage_users_description: Allows users to view other users' details and perform moderation actions against them
         manage_webhooks: Manage Webhooks
@@ -798,7 +798,7 @@ en:
       destroyed_msg: Site upload successfully deleted!
     software_updates:
       critical_update: Critical — please update quickly
-      description: It is recommended to keep your Mastodon installation up to date to benefit from the latest fixes and features. Moreover, it is sometimes critical to update Mastodon in a timely manner to avoid security issues. For these reasons, Mastodon checks for updates every 30 minutes, and will notify you according to your e-mail notification preferences.
+      description: It is recommended to keep your Mastodon installation up to date to benefit from the latest fixes and features. Moreover, it is sometimes critical to update Mastodon in a timely manner to avoid security issues. For these reasons, Mastodon checks for updates every 30 minutes, and will notify you according to your email notification preferences.
       documentation_link: Learn more
       release_notes: Release notes
       title: Available updates
@@ -1061,9 +1061,9 @@ en:
       guide_link_text: Everyone can contribute.
     sensitive_content: Sensitive content
   application_mailer:
-    notification_preferences: Change e-mail preferences
+    notification_preferences: Change email preferences
     salutation: "%{name},"
-    settings: 'Change e-mail preferences: %{link}'
+    settings: 'Change email preferences: %{link}'
     unsubscribe: Unsubscribe
     view: 'View:'
     view_profile: View profile
@@ -1083,7 +1083,7 @@ en:
       hint_html: Just one more thing! We need to confirm you're a human (this is so we can keep the spam out!). Solve the CAPTCHA below and click "Continue".
       title: Security check
     confirmations:
-      awaiting_review: Your e-mail address is confirmed! The %{domain} staff is now reviewing your registration. You will receive an e-mail if they approve your account!
+      awaiting_review: Your email address is confirmed! The %{domain} staff is now reviewing your registration. You will receive an email if they approve your account!
       awaiting_review_title: Your registration is being reviewed
       clicking_this_link: clicking this link
       login_link: log in
@@ -1091,7 +1091,7 @@ en:
       redirect_to_app_html: You should have been redirected to the <strong>%{app_name}</strong> app. If that did not happen, try %{clicking_this_link} or manually return to the app.
       registration_complete: Your registration on %{domain} is now complete!
       welcome_title: Welcome, %{name}!
-      wrong_email_hint: If that e-mail address is not correct, you can change it in account settings.
+      wrong_email_hint: If that email address is not correct, you can change it in account settings.
     delete_account: Delete account
     delete_account_html: If you wish to delete your account, you can <a href="%{path}">proceed here</a>. You will be asked for confirmation.
     description:
@@ -1112,7 +1112,7 @@ en:
     or_log_in_with: Or log in with
     privacy_policy_agreement_html: I have read and agree to the <a href="%{privacy_policy_path}" target="_blank">privacy policy</a>
     progress:
-      confirm: Confirm e-mail
+      confirm: Confirm email
       details: Your details
       review: Our review
       rules: Accept rules
@@ -1134,10 +1134,10 @@ en:
     security: Security
     set_new_password: Set new password
     setup:
-      email_below_hint_html: Check your spam folder, or request another one. You can correct your e-mail address if it's wrong.
+      email_below_hint_html: Check your spam folder, or request another one. You can correct your email address if it's wrong.
       email_settings_hint_html: Click the link we sent you to verify %{email}. We'll wait right here.
       link_not_received: Didn't get a link?
-      new_confirmation_instructions_sent: You will receive a new e-mail with the confirmation link in a few minutes!
+      new_confirmation_instructions_sent: You will receive a new email with the confirmation link in a few minutes!
       title: Check your inbox
     sign_in:
       preamble_html: Login with your <strong>%{domain}</strong> credentials. If your account is hosted on a different server, you will not be able to log in here.
@@ -1148,9 +1148,9 @@ en:
       title: Let's get you set up on %{domain}.
     status:
       account_status: Account status
-      confirming: Waiting for e-mail confirmation to be completed.
+      confirming: Waiting for email confirmation to be completed.
       functional: Your account is fully operational.
-      pending: Your application is pending review by our staff. This may take some time. You will receive an e-mail if your application is approved.
+      pending: Your application is pending review by our staff. This may take some time. You will receive an email if your application is approved.
       redirecting_to: Your account is inactive because it is currently redirecting to %{acct}.
       self_destruct: As %{domain} is closing down, you will only get limited access to your account.
       view_strikes: View past strikes against your account
@@ -1193,9 +1193,9 @@ en:
       before: 'Before proceeding, please read these notes carefully:'
       caches: Content that has been cached by other servers may persist
       data_removal: Your posts and other data will be permanently removed
-      email_change_html: You can <a href="%{path}">change your e-mail address</a> without deleting your account
-      email_contact_html: If it still doesn't arrive, you can e-mail <a href="mailto:%{email}">%{email}</a> for help
-      email_reconfirmation_html: If you are not receiving the confirmation e-mail, you can <a href="%{path}">request it again</a>
+      email_change_html: You can <a href="%{path}">change your email address</a> without deleting your account
+      email_contact_html: If it still doesn't arrive, you can email <a href="mailto:%{email}">%{email}</a> for help
+      email_reconfirmation_html: If you are not receiving the confirmation email, you can <a href="%{path}">request it again</a>
       irreversible: You will not be able to restore or reactivate your account
       more_details_html: For more details, see the <a href="%{terms_path}">privacy policy</a>.
       username_available: Your username will become available again
@@ -1428,7 +1428,7 @@ en:
     authentication_methods:
       otp: two-factor authentication app
       password: password
-      sign_in_token: e-mail security code
+      sign_in_token: email security code
       webauthn: security keys
     description_html: If you see activity that you don't recognize, consider changing your password and enabling two-factor authentication.
     empty: No authentication history available
@@ -1439,16 +1439,16 @@ en:
     unsubscribe:
       action: Yes, unsubscribe
       complete: Unsubscribed
-      confirmation_html: Are you sure you want to unsubscribe from receiving %{type} for Mastodon on %{domain} to your e-mail at %{email}? You can always re-subscribe from your <a href="%{settings_path}">e-mail notification settings</a>.
+      confirmation_html: Are you sure you want to unsubscribe from receiving %{type} for Mastodon on %{domain} to your email at %{email}? You can always re-subscribe from your <a href="%{settings_path}">email notification settings</a>.
       emails:
         notification_emails:
-          favourite: favorite notification e-mails
-          follow: follow notification e-mails
-          follow_request: follow request e-mails
-          mention: mention notification e-mails
-          reblog: boost notification e-mails
-      resubscribe_html: If you've unsubscribed by mistake, you can re-subscribe from your <a href="%{settings_path}">e-mail notification settings</a>.
-      success_html: You'll no longer receive %{type} for Mastodon on %{domain} to your e-mail at %{email}.
+          favourite: favorite notification emails
+          follow: follow notification emails
+          follow_request: follow request emails
+          mention: mention notification emails
+          reblog: boost notification emails
+      resubscribe_html: If you've unsubscribed by mistake, you can re-subscribe from your <a href="%{settings_path}">email notification settings</a>.
+      success_html: You'll no longer receive %{type} for Mastodon on %{domain} to your email at %{email}.
       title: Unsubscribe
   media_attachments:
     validations:
@@ -1529,8 +1529,8 @@ en:
     update:
       subject: "%{name} edited a post"
   notifications:
-    administration_emails: Admin e-mail notifications
-    email_events: Events for e-mail notifications
+    administration_emails: Admin email notifications
+    email_events: Events for email notifications
     email_events_hint: 'Select events that you want to receive notifications for:'
   number:
     human:
@@ -1690,7 +1690,7 @@ en:
     import: Import
     import_and_export: Import and export
     migrate: Account migration
-    notifications: E-mail notifications
+    notifications: Email notifications
     preferences: Preferences
     profile: Public profile
     relationships: Follows and followers
@@ -1937,7 +1937,7 @@ en:
     invalid_otp_token: Invalid two-factor code
     otp_lost_help_html: If you lost access to both, you may get in touch with %{email}
     rate_limited: Too many authentication attempts, try again later.
-    seamless_external_login: You are logged in via an external service, so password and e-mail settings are not available.
+    seamless_external_login: You are logged in via an external service, so password and email settings are not available.
     signed_in_as: 'Signed in as:'
   verification:
     extra_instructions_html: <strong>Tip:</strong> The link on your website can be invisible. The important part is <code>rel="me"</code> which prevents impersonation on websites with user-generated content. You can even use a <code>link</code> tag in the header of the page instead of <code>a</code>, but the HTML must be accessible without executing JavaScript.

From 19dbc74d827d382cadef0d5e77980ffc7fe4e633 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Sat, 10 Aug 2024 20:14:37 +0200
Subject: [PATCH 1798/2191] Fix typos in localisation from #31342 (#31369)

---
 .../features/ui/components/ignore_notifications_modal.jsx     | 2 +-
 app/javascript/mastodon/locales/en.json                       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/javascript/mastodon/features/ui/components/ignore_notifications_modal.jsx b/app/javascript/mastodon/features/ui/components/ignore_notifications_modal.jsx
index b163b8ce4703aa..dffaa04492c896 100644
--- a/app/javascript/mastodon/features/ui/components/ignore_notifications_modal.jsx
+++ b/app/javascript/mastodon/features/ui/components/ignore_notifications_modal.jsx
@@ -60,7 +60,7 @@ export const IgnoreNotificationsModal = ({ filterType }) => {
         <div className='safety-action-modal__bullet-points'>
           <div>
             <div className='safety-action-modal__bullet-points__icon'><Icon icon={InventoryIcon} /></div>
-            <div><FormattedMessage id='ignore_notifications_modal.filter_to_review_separately' defaultMessage='You can review filtered notifications speparately' /></div>
+            <div><FormattedMessage id='ignore_notifications_modal.filter_to_review_separately' defaultMessage='You can review filtered notifications separately' /></div>
           </div>
 
           <div>
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index fae630a27fce98..aeeaf8209c7d0c 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -358,9 +358,9 @@
   "home.show_announcements": "Show announcements",
   "ignore_notifications_modal.disclaimer": "Mastodon cannot inform users that you've ignored their notifications. Ignoring notifications will not stop the messages themselves from being sent.",
   "ignore_notifications_modal.filter_instead": "Filter instead",
-  "ignore_notifications_modal.filter_to_act_users": "Filtering helps avoid potential confusion",
+  "ignore_notifications_modal.filter_to_act_users": "You'll still be able to accept, reject, or report users",
   "ignore_notifications_modal.filter_to_avoid_confusion": "Filtering helps avoid potential confusion",
-  "ignore_notifications_modal.filter_to_review_separately": "You can review filtered notifications speparately",
+  "ignore_notifications_modal.filter_to_review_separately": "You can review filtered notifications separately",
   "ignore_notifications_modal.ignore": "Ignore notifications",
   "ignore_notifications_modal.limited_accounts_title": "Ignore notifications from moderated accounts?",
   "ignore_notifications_modal.new_accounts_title": "Ignore notifications from new accounts?",

From 7d8714db8135f5c3dfc81964887248d76a797788 Mon Sep 17 00:00:00 2001
From: Jeremy Kescher <jeremy@kescher.at>
Date: Sun, 11 Aug 2024 19:12:59 +0200
Subject: [PATCH 1799/2191] Bump Catstodon revision to 1.0.8

---
 CHANGELOG.md            | 4 ++++
 lib/mastodon/version.rb | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index be3d6796b75790..9e1f9701732f9b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@ All changes to Catstodon that aren't Mastodon or glitch-soc Mastodon changes wil
 
 All release dates, as well as most other dates, are intended to be read as "within the day, in UTC time."
 
+## [4.3.0-alpha.5+glitch+cat+1.0.8] - 2024-08-11
+
+- Upstream changes
+
 ## [4.3.0-alpha.5+glitch+cat+1.0.7] - 2024-08-05
 
 - Emoji reaction patch changes
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index 9230c1d52c4a2c..333cd3eaca64b4 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -25,7 +25,7 @@ def prerelease
     end
 
     def catstodon_revision
-      '1.0.7'
+      '1.0.8'
     end
 
     def build_metadata

From 634ab0bad087756a9fe98afc3eec77faf3625035 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 11 Aug 2024 20:13:10 +0200
Subject: [PATCH 1800/2191] New Crowdin Translations (automated) (#31351)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/an.json      |   1 -
 app/javascript/mastodon/locales/ar.json      |   2 -
 app/javascript/mastodon/locales/ast.json     |  13 +-
 app/javascript/mastodon/locales/be.json      |   3 -
 app/javascript/mastodon/locales/bg.json      |   7 +-
 app/javascript/mastodon/locales/bn.json      |   1 -
 app/javascript/mastodon/locales/br.json      |   1 -
 app/javascript/mastodon/locales/ca.json      |  20 ++-
 app/javascript/mastodon/locales/ckb.json     |   1 -
 app/javascript/mastodon/locales/co.json      |   1 -
 app/javascript/mastodon/locales/cs.json      |   3 -
 app/javascript/mastodon/locales/cy.json      |   3 -
 app/javascript/mastodon/locales/da.json      |  42 +++++-
 app/javascript/mastodon/locales/de.json      |  46 ++++++-
 app/javascript/mastodon/locales/el.json      |   3 -
 app/javascript/mastodon/locales/en-GB.json   |   3 -
 app/javascript/mastodon/locales/eo.json      |   1 -
 app/javascript/mastodon/locales/es-AR.json   |  42 +++++-
 app/javascript/mastodon/locales/es-MX.json   |  42 +++++-
 app/javascript/mastodon/locales/es.json      |  42 +++++-
 app/javascript/mastodon/locales/et.json      |   2 -
 app/javascript/mastodon/locales/eu.json      |   2 -
 app/javascript/mastodon/locales/fa.json      |   1 -
 app/javascript/mastodon/locales/fi.json      |  42 +++++-
 app/javascript/mastodon/locales/fil.json     |   1 -
 app/javascript/mastodon/locales/fo.json      |  51 +++++++-
 app/javascript/mastodon/locales/fr-CA.json   |   2 -
 app/javascript/mastodon/locales/fr.json      |   2 -
 app/javascript/mastodon/locales/fy.json      |   2 -
 app/javascript/mastodon/locales/ga.json      |   3 -
 app/javascript/mastodon/locales/gd.json      |   3 -
 app/javascript/mastodon/locales/gl.json      |  41 +++++-
 app/javascript/mastodon/locales/he.json      |  12 +-
 app/javascript/mastodon/locales/hr.json      |   1 -
 app/javascript/mastodon/locales/hu.json      |  42 +++++-
 app/javascript/mastodon/locales/hy.json      |   1 -
 app/javascript/mastodon/locales/ia.json      |   7 +-
 app/javascript/mastodon/locales/id.json      |   1 -
 app/javascript/mastodon/locales/ie.json      |   2 -
 app/javascript/mastodon/locales/io.json      |   1 -
 app/javascript/mastodon/locales/is.json      |  44 ++++++-
 app/javascript/mastodon/locales/it.json      |  40 +++++-
 app/javascript/mastodon/locales/ja.json      |  13 +-
 app/javascript/mastodon/locales/ka.json      |   1 -
 app/javascript/mastodon/locales/kab.json     |  15 +--
 app/javascript/mastodon/locales/kk.json      |   1 -
 app/javascript/mastodon/locales/ko.json      |   3 -
 app/javascript/mastodon/locales/ku.json      |   1 -
 app/javascript/mastodon/locales/kw.json      |   1 -
 app/javascript/mastodon/locales/la.json      |   1 -
 app/javascript/mastodon/locales/lad.json     |   2 -
 app/javascript/mastodon/locales/lt.json      |  31 ++++-
 app/javascript/mastodon/locales/lv.json      |   2 -
 app/javascript/mastodon/locales/ml.json      |   1 -
 app/javascript/mastodon/locales/ms.json      |   1 -
 app/javascript/mastodon/locales/my.json      |   1 -
 app/javascript/mastodon/locales/nl.json      |  48 ++++++-
 app/javascript/mastodon/locales/nn.json      |  71 +++++++++-
 app/javascript/mastodon/locales/no.json      |   1 -
 app/javascript/mastodon/locales/oc.json      |   1 -
 app/javascript/mastodon/locales/pl.json      |  44 ++++++-
 app/javascript/mastodon/locales/pt-BR.json   |  17 ++-
 app/javascript/mastodon/locales/pt-PT.json   |  12 +-
 app/javascript/mastodon/locales/ro.json      |   1 -
 app/javascript/mastodon/locales/ru.json      |   2 -
 app/javascript/mastodon/locales/sa.json      |   1 -
 app/javascript/mastodon/locales/sc.json      |   2 -
 app/javascript/mastodon/locales/sco.json     |   1 -
 app/javascript/mastodon/locales/si.json      |   1 -
 app/javascript/mastodon/locales/sk.json      |   2 -
 app/javascript/mastodon/locales/sl.json      |   3 -
 app/javascript/mastodon/locales/sq.json      |  42 +++++-
 app/javascript/mastodon/locales/sr-Latn.json |   2 -
 app/javascript/mastodon/locales/sr.json      |   2 -
 app/javascript/mastodon/locales/sv.json      |  13 +-
 app/javascript/mastodon/locales/ta.json      |   1 -
 app/javascript/mastodon/locales/te.json      |   1 -
 app/javascript/mastodon/locales/th.json      |  31 ++++-
 app/javascript/mastodon/locales/tok.json     |   1 -
 app/javascript/mastodon/locales/tr.json      |  42 +++++-
 app/javascript/mastodon/locales/uk.json      |  17 ++-
 app/javascript/mastodon/locales/ur.json      |   1 -
 app/javascript/mastodon/locales/vi.json      |  14 +-
 app/javascript/mastodon/locales/zh-CN.json   |  46 ++++++-
 app/javascript/mastodon/locales/zh-HK.json   |   2 -
 app/javascript/mastodon/locales/zh-TW.json   |  62 +++++++--
 config/locales/af.yml                        |   3 -
 config/locales/an.yml                        |  39 ------
 config/locales/ar.yml                        |  58 ---------
 config/locales/ast.yml                       |  21 ---
 config/locales/be.yml                        |  58 ---------
 config/locales/bg.yml                        |  57 +-------
 config/locales/bn.yml                        |   7 -
 config/locales/br.yml                        |   2 -
 config/locales/ca.yml                        |  68 ++--------
 config/locales/ckb.yml                       |  26 ----
 config/locales/co.yml                        |  26 ----
 config/locales/cs.yml                        |  58 ---------
 config/locales/cy.yml                        |  58 ---------
 config/locales/da.yml                        |  46 ++++---
 config/locales/de.yml                        |  56 ++++----
 config/locales/devise.kab.yml                |   4 +-
 config/locales/devise.zh-CN.yml              |  36 ++---
 config/locales/devise.zh-TW.yml              |  22 ++--
 config/locales/doorkeeper.nn.yml             |   1 +
 config/locales/doorkeeper.zh-CN.yml          |   8 +-
 config/locales/doorkeeper.zh-TW.yml          |   2 +-
 config/locales/el.yml                        | 115 +++++++++-------
 config/locales/en-GB.yml                     |  58 ---------
 config/locales/eo.yml                        |  55 --------
 config/locales/es-AR.yml                     |  14 +-
 config/locales/es-MX.yml                     |  70 +++++-----
 config/locales/es.yml                        |  46 ++++---
 config/locales/et.yml                        |  58 ---------
 config/locales/eu.yml                        |  60 ---------
 config/locales/fa.yml                        |  38 ------
 config/locales/fi.yml                        |  14 +-
 config/locales/fo.yml                        |  69 ++--------
 config/locales/fr-CA.yml                     |  58 ---------
 config/locales/fr.yml                        |  58 ---------
 config/locales/fy.yml                        |  58 ---------
 config/locales/ga.yml                        |  58 ---------
 config/locales/gd.yml                        |  58 ---------
 config/locales/gl.yml                        |  68 ++--------
 config/locales/he.yml                        |  58 ---------
 config/locales/hi.yml                        |   1 -
 config/locales/hr.yml                        |   1 -
 config/locales/hu.yml                        |  68 ++--------
 config/locales/hy.yml                        |  12 --
 config/locales/ia.yml                        |  58 +--------
 config/locales/id.yml                        |  39 ------
 config/locales/ie.yml                        |  58 ---------
 config/locales/io.yml                        |  57 --------
 config/locales/is.yml                        |  12 +-
 config/locales/it.yml                        | 106 ++++++++-------
 config/locales/ja.yml                        |  58 ---------
 config/locales/ka.yml                        |   6 -
 config/locales/kab.yml                       |  21 ---
 config/locales/kk.yml                        |  12 --
 config/locales/ko.yml                        |  58 ---------
 config/locales/ku.yml                        |  39 ------
 config/locales/lad.yml                       |  58 ---------
 config/locales/lt.yml                        |  47 ++-----
 config/locales/lv.yml                        |  58 ---------
 config/locales/ml.yml                        |   1 -
 config/locales/ms.yml                        |  57 --------
 config/locales/my.yml                        |  56 --------
 config/locales/nl.yml                        |  20 ++-
 config/locales/nn.yml                        | 102 +++++++++------
 config/locales/no.yml                        |  57 --------
 config/locales/oc.yml                        |  11 --
 config/locales/pl.yml                        |  30 +++--
 config/locales/pt-BR.yml                     |  57 --------
 config/locales/pt-PT.yml                     |  58 ---------
 config/locales/ro.yml                        |  16 ---
 config/locales/ru.yml                        |  58 ---------
 config/locales/sc.yml                        |  24 ----
 config/locales/sco.yml                       |  39 ------
 config/locales/si.yml                        |  31 -----
 config/locales/simple_form.nn.yml            |   5 +-
 config/locales/simple_form.th.yml            |   1 +
 config/locales/simple_form.tr.yml            |   2 +-
 config/locales/simple_form.zh-CN.yml         |  28 ++--
 config/locales/simple_form.zh-TW.yml         |   4 +-
 config/locales/sk.yml                        |  33 -----
 config/locales/sl.yml                        |  58 ---------
 config/locales/sq.yml                        |  69 ++--------
 config/locales/sr-Latn.yml                   |  58 ---------
 config/locales/sr.yml                        |  58 ---------
 config/locales/sv.yml                        |  58 +--------
 config/locales/ta.yml                        |   6 -
 config/locales/th.yml                        |  72 ++--------
 config/locales/tr.yml                        |  78 +++--------
 config/locales/tt.yml                        |   4 -
 config/locales/uk.yml                        |  59 +--------
 config/locales/vi.yml                        |  82 +++++++-----
 config/locales/zh-CN.yml                     | 130 ++++++++++---------
 config/locales/zh-HK.yml                     |  58 ---------
 config/locales/zh-TW.yml                     |  88 +++++++------
 179 files changed, 1639 insertions(+), 3505 deletions(-)

diff --git a/app/javascript/mastodon/locales/an.json b/app/javascript/mastodon/locales/an.json
index 959d3b81c42216..b44fa17cfcd031 100644
--- a/app/javascript/mastodon/locales/an.json
+++ b/app/javascript/mastodon/locales/an.json
@@ -336,7 +336,6 @@
   "notification.admin.sign_up": "{name} se rechistró",
   "notification.follow": "{name} t'empecipió a seguir",
   "notification.follow_request": "{name} ha solicitau seguir-te",
-  "notification.mention": "{name} t'ha mencionau",
   "notification.own_poll": "La tuya enqüesta ha rematau",
   "notification.reblog": "{name} ha retutau la tuya publicación",
   "notification.status": "{name} acaba de publicar",
diff --git a/app/javascript/mastodon/locales/ar.json b/app/javascript/mastodon/locales/ar.json
index 97526c40e6c38b..e7b3e7dacb9859 100644
--- a/app/javascript/mastodon/locales/ar.json
+++ b/app/javascript/mastodon/locales/ar.json
@@ -464,7 +464,6 @@
   "notification.favourite": "أضاف {name} منشورك إلى مفضلته",
   "notification.follow": "يتابعك {name}",
   "notification.follow_request": "لقد طلب {name} متابعتك",
-  "notification.mention": "{name} ذكرك",
   "notification.moderation-warning.learn_more": "اعرف المزيد",
   "notification.moderation_warning": "لقد تلقيت تحذيرًا بالإشراف",
   "notification.moderation_warning.action_delete_statuses": "تم إزالة بعض مشاركاتك.",
@@ -528,7 +527,6 @@
   "notifications.policy.filter_not_following_title": "أشخاص لا تتابعهم",
   "notifications.policy.filter_private_mentions_hint": "تمت تصفيته إلا إذا أن يكون ردًا على ذكرك أو إذا كنت تتابع الحساب",
   "notifications.policy.filter_private_mentions_title": "إشارات خاصة غير مرغوب فيها",
-  "notifications.policy.title": "تصفية الإشعارات من…",
   "notifications_permission_banner.enable": "تفعيل إشعارات سطح المكتب",
   "notifications_permission_banner.how_to_control": "لتلقي الإشعارات عندما لا يكون ماستدون مفتوح، قم بتفعيل إشعارات سطح المكتب، يمكنك التحكم بدقة في أنواع التفاعلات التي تولد إشعارات سطح المكتب من خلال زر الـ{icon} أعلاه بمجرد تفعيلها.",
   "notifications_permission_banner.title": "لا تفوت شيئاً أبداً",
diff --git a/app/javascript/mastodon/locales/ast.json b/app/javascript/mastodon/locales/ast.json
index fd673f1f855091..debfcd04a7d5dc 100644
--- a/app/javascript/mastodon/locales/ast.json
+++ b/app/javascript/mastodon/locales/ast.json
@@ -11,14 +11,13 @@
   "about.not_available": "Esta información nun ta disponible nesti sirvidor.",
   "about.powered_by": "Una rede social descentralizada que tien la teunoloxía de {mastodon}",
   "about.rules": "Normes del sirvidor",
+  "account.account_note_header": "Nota personal",
   "account.add_or_remove_from_list": "Amestar o quitar de les llistes",
   "account.badges.group": "Grupu",
   "account.block": "Bloquiar a @{name}",
   "account.block_domain": "Bloquiar el dominiu {domain}",
-  "account.block_short": "Bloquiar",
   "account.blocked": "Perfil bloquiáu",
   "account.browse_more_on_origin_server": "Restolar más nel perfil orixinal",
-  "account.copy": "Copiar I'enllaz al perfil",
   "account.direct": "Mentar a @{name} per privao",
   "account.disable_notifications": "Dexar d'avisame cuando @{name} espublice artículos",
   "account.domain_blocked": "Dominiu bloquiáu",
@@ -30,9 +29,7 @@
   "account.follow": "Siguir",
   "account.followers": "Siguidores",
   "account.followers.empty": "Naide sigue a esti perfil.",
-  "account.following": "Siguiendo",
   "account.follows.empty": "Esti perfil nun sigue a naide.",
-  "account.go_to_profile": "Dir al perfil",
   "account.hide_reblogs": "Anubrir los artículos compartíos de @{name}",
   "account.in_memoriam": "N'alcordanza.",
   "account.joined_short": "Data de xunión",
@@ -41,15 +38,16 @@
   "account.mention": "Mentar a @{name}",
   "account.moved_to": "{name} indicó qu'agora la so cuenta nueva ye:",
   "account.mute": "Desactivar los avisos de @{name}",
+  "account.no_bio": "Nun se fornió nenguna descripción.",
   "account.open_original_page": "Abrir la páxina orixinal",
   "account.posts": "Artículos",
   "account.posts_with_replies": "Artículos y rempuestes",
   "account.report": "Informar de @{name}",
   "account.requested_follow": "{name} solicitó siguite",
+  "account.share": "Compartir el perfil de @{name}",
   "account.show_reblogs": "Amosar los artículos compartíos de @{name}",
   "account.unblock": "Desbloquiar a @{name}",
   "account.unblock_domain": "Desbloquiar el dominiu «{domain}»",
-  "account.unblock_short": "Desbloquiar",
   "account.unendorse": "Dexar de destacar nel perfil",
   "account.unfollow": "Dexar de siguir",
   "account.unmute": "Activar los avisos de @{name}",
@@ -150,7 +148,6 @@
   "empty_column.account_timeline": "¡Equí nun hai nengún artículu!",
   "empty_column.blocks": "Nun bloquiesti a nengún perfil.",
   "empty_column.bookmarked_statuses": "Nun tienes nengún artículu en Marcadores. Cuando amiestes dalgún, apaez equí.",
-  "empty_column.community": "La llinia de tiempu llocal ta balera. ¡Espubliza daqué públicamente pa comenzar l'alderique!",
   "empty_column.direct": "Nun tienes nenguna mención privada. Cuando unvies o recibas dalguna, apaez equí.",
   "empty_column.domain_blocks": "Nun hai nengún dominiu bloquiáu.",
   "empty_column.explore_statuses": "Agora nun hai nada en tendencia. ¡Volvi equí dempués!",
@@ -186,6 +183,7 @@
   "filter_modal.select_filter.subtitle": "Usa una categoría esistente o créala",
   "filter_modal.select_filter.title": "Peñerar esti artículu",
   "filter_modal.title.status": "Peñera d'un artículu",
+  "firehose.all": "Tolos sirvidores",
   "firehose.local": "Esti sirvidor",
   "firehose.remote": "Otros sirvidores",
   "follow_request.authorize": "Autorizar",
@@ -195,6 +193,7 @@
   "follow_suggestions.friends_of_friends_longer": "Ye popular ente los perfiles que sigues",
   "follow_suggestions.personalized_suggestion": "Suxerencia personalizada",
   "follow_suggestions.popular_suggestion": "Suxerencia popular",
+  "follow_suggestions.popular_suggestion_longer": "Ye popular na instancia {domain}",
   "follow_suggestions.similar_to_recently_followed_longer": "Aseméyase a los perfiles que siguiesti apocayá",
   "follow_suggestions.view_all": "Ver too",
   "follow_suggestions.who_to_follow": "A quién siguir",
@@ -296,7 +295,6 @@
   "notification.admin.sign_up": "{name} rexistróse",
   "notification.follow": "{name} siguióte",
   "notification.follow_request": "{name} solicitó siguite",
-  "notification.mention": "{name} mentóte",
   "notification.reblog": "{name} compartió'l to artículu",
   "notification.status": "{name} ta acabante d'espublizar",
   "notification.update": "{name} editó un artículu",
@@ -354,7 +352,6 @@
   "relative_time.seconds": "{number} s",
   "relative_time.today": "güei",
   "reply_indicator.cancel": "Encaboxar",
-  "reply_indicator.poll": "Encuesta",
   "report.block": "Bloquiar",
   "report.categories.spam": "Spam",
   "report.categories.violation": "El conteníu incumple una o más normes del sirvidor",
diff --git a/app/javascript/mastodon/locales/be.json b/app/javascript/mastodon/locales/be.json
index 4a567582fce045..1ba69f27f3ae40 100644
--- a/app/javascript/mastodon/locales/be.json
+++ b/app/javascript/mastodon/locales/be.json
@@ -481,7 +481,6 @@
   "notification.favourite": "Ваш допіс упадабаны {name}",
   "notification.follow": "{name} падпісаўся на вас",
   "notification.follow_request": "{name} адправіў запыт на падпіску",
-  "notification.mention": "{name} згадаў вас",
   "notification.moderation-warning.learn_more": "Даведацца больш",
   "notification.moderation_warning": "Вы атрымалі папярэджанне аб мадэрацыі",
   "notification.moderation_warning.action_delete_statuses": "Некаторыя вашыя допісы былі выдаленыя.",
@@ -493,7 +492,6 @@
   "notification.moderation_warning.action_suspend": "Ваш уліковы запіс быў прыпынены.",
   "notification.own_poll": "Ваша апытанне скончылася",
   "notification.poll": "Апытанне, дзе вы прынялі ўдзел, скончылася",
-  "notification.private_mention": "{name} згадаў вас асабіста",
   "notification.reblog": "{name} пашырыў ваш допіс",
   "notification.relationships_severance_event": "Страціў сувязь з {name}",
   "notification.relationships_severance_event.account_suspension": "Адміністратар з {from} прыпыніў працу {target}, што азначае, што вы больш не можаце атрымліваць ад іх абнаўлення ці ўзаемадзейнічаць з імі.",
@@ -552,7 +550,6 @@
   "notifications.policy.filter_not_following_title": "Людзі, на якіх вы не падпісаны",
   "notifications.policy.filter_private_mentions_hint": "Фільтруецца за выключэннем адказу на вашае згадванне ці калі вы падпісаны на адпраўніка",
   "notifications.policy.filter_private_mentions_title": "Непажаданыя асаблівыя згадванні",
-  "notifications.policy.title": "Адфільтроўваць апавяшчэнні ад…",
   "notifications_permission_banner.enable": "Уключыць апавяшчэнні на працоўным стале",
   "notifications_permission_banner.how_to_control": "Каб атрымліваць апавяшчэнні, калі Mastodon не адкрыты, уключыце апавяшчэнні працоўнага стала. Вы зможаце дакладна кантраляваць, якія падзеі будуць ствараць апавяшчэнні з дапамогай {icon} кнопкі, як толькі яны будуць уключаны.",
   "notifications_permission_banner.title": "Не прапусціце нічога",
diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json
index dca64711fa1099..f60e330d1c3a33 100644
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@@ -482,7 +482,6 @@
   "notification.favourite": "{name} направи любима публикацията ви",
   "notification.follow": "{name} ви последва",
   "notification.follow_request": "{name} поиска да ви последва",
-  "notification.mention": "{name} ви спомена",
   "notification.moderation-warning.learn_more": "Научете повече",
   "notification.moderation_warning": "Получихте предупреждение за модериране",
   "notification.moderation_warning.action_delete_statuses": "Някои от публикациите ви са премахнати.",
@@ -494,7 +493,6 @@
   "notification.moderation_warning.action_suspend": "Вашият акаунт е спрян.",
   "notification.own_poll": "Анкетата ви приключи",
   "notification.poll": "Анкета, в която гласувахте, приключи",
-  "notification.private_mention": "{name} лично ви спомена",
   "notification.reblog": "{name} подсили ваша публикация",
   "notification.relationships_severance_event": "Изгуби се връзката с {name}",
   "notification.relationships_severance_event.account_suspension": "Администратор от {from} спря {target}, което значи че повече не може да получавате новости от тях или да взаимодействате с тях.",
@@ -505,6 +503,8 @@
   "notification.update": "{name} промени публикация",
   "notification_requests.accept": "Приемам",
   "notification_requests.dismiss": "Отхвърлям",
+  "notification_requests.explainer_for_limited_account": "Известията от този акаунт са прецедени, защото акаунтът е ограничен от модератор.",
+  "notification_requests.explainer_for_limited_remote_account": "Известията от този акаунт са прецедени, защото акаунтът или сървърът му е ограничен от модератор.",
   "notification_requests.maximize": "Максимизиране",
   "notification_requests.minimize_banner": "Минимизиране на банера за филтрирани известия",
   "notification_requests.notifications_from": "Известия от {name}",
@@ -545,6 +545,8 @@
   "notifications.permission_denied": "Известията на работния плот не са налични поради предварително отказана заявка за разрешение в браузъра",
   "notifications.permission_denied_alert": "Известията на работния плот не могат да се включат, тъй като разрешението на браузъра е отказвано преди",
   "notifications.permission_required": "Известията на работния плот ги няма, щото няма дадено нужното позволение.",
+  "notifications.policy.filter_limited_accounts_hint": "Ограничено от модераторите на сървъра",
+  "notifications.policy.filter_limited_accounts_title": "Модерирани акаунти",
   "notifications.policy.filter_new_accounts.hint": "Сътворено през {days, plural, one {последния ден} other {последните # дена}}",
   "notifications.policy.filter_new_accounts_title": "Нови акаунти",
   "notifications.policy.filter_not_followers_hint": "Включително хора, които са ви последвали по-малко от {days, plural, one {ден} other {# дни}}",
@@ -553,7 +555,6 @@
   "notifications.policy.filter_not_following_title": "Хора, които не следвате",
   "notifications.policy.filter_private_mentions_hint": "Филтрирано, освен ако е отговор към ваше собствено споменаване или ако следвате подателя",
   "notifications.policy.filter_private_mentions_title": "Непоискани частни споменавания",
-  "notifications.policy.title": "Да се филтрират известия от…",
   "notifications_permission_banner.enable": "Включване на известията на работния плот",
   "notifications_permission_banner.how_to_control": "За да получавате известия, когато Mastodon не е отворен, включете известията на работния плот. Може да управлявате точно кои видове взаимодействия пораждат известия на работния плот чрез бутона {icon} по-горе, след като бъдат включени.",
   "notifications_permission_banner.title": "Никога не пропускайте нищо",
diff --git a/app/javascript/mastodon/locales/bn.json b/app/javascript/mastodon/locales/bn.json
index bc5b5ae97d71b3..849be0eaf2550c 100644
--- a/app/javascript/mastodon/locales/bn.json
+++ b/app/javascript/mastodon/locales/bn.json
@@ -314,7 +314,6 @@
   "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
   "notification.follow": "{name} আপনাকে অনুসরণ করেছেন",
   "notification.follow_request": "{name} আপনাকে অনুসরণ করার জন্য অনুরধ করেছে",
-  "notification.mention": "{name} আপনাকে উল্লেখ করেছেন",
   "notification.own_poll": "আপনার পোল শেষ হয়েছে",
   "notification.reblog": "{name} আপনার কার্যক্রমে সমর্থন দেখিয়েছেন",
   "notifications.clear": "প্রজ্ঞাপনগুলো মুছে ফেলতে",
diff --git a/app/javascript/mastodon/locales/br.json b/app/javascript/mastodon/locales/br.json
index bf801d75339868..b5abb3762f24cc 100644
--- a/app/javascript/mastodon/locales/br.json
+++ b/app/javascript/mastodon/locales/br.json
@@ -390,7 +390,6 @@
   "notification.admin.sign_up": "{name} en·he deus lakaet e·hec'h anv",
   "notification.follow": "heuliañ a ra {name} ac'hanoc'h",
   "notification.follow_request": "Gant {name} eo bet goulennet ho heuliañ",
-  "notification.mention": "Gant {name} oc'h bet meneget",
   "notification.moderation-warning.learn_more": "Gouzout hiroc'h",
   "notification.own_poll": "Echu eo ho sontadeg",
   "notification.reblog": "Gant {name} eo bet skignet ho toud",
diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index c06fb1e3340383..d2651aeffa75d3 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -356,6 +356,8 @@
   "home.pending_critical_update.link": "Veure actualitzacions",
   "home.pending_critical_update.title": "Actualització de seguretat crítica disponible!",
   "home.show_announcements": "Mostra els anuncis",
+  "ignore_notifications_modal.filter_to_act_users": "Encara podreu acceptar, rebutjar o reportar usuaris",
+  "ignore_notifications_modal.filter_to_review_separately": "Podeu revisar separadament notificacions filtrades",
   "interaction_modal.description.favourite": "Amb un compte a Mastodon pots afavorir aquest tut perquè l'autor sàpiga que t'ha agradat i desar-lo per a més endavant.",
   "interaction_modal.description.follow": "Amb un compte a Mastodon, pots seguir a {name} per a rebre els seus tuts en la teva línia de temps d'Inici.",
   "interaction_modal.description.reblog": "Amb un compte a Mastodon, pots impulsar aquest tut per a compartir-lo amb els teus seguidors.",
@@ -482,7 +484,11 @@
   "notification.favourite": "{name} ha afavorit el teu tut",
   "notification.follow": "{name} et segueix",
   "notification.follow_request": "{name} ha sol·licitat de seguir-te",
-  "notification.mention": "{name} t'ha esmentat",
+  "notification.label.mention": "Menció",
+  "notification.label.private_mention": "Menció privada",
+  "notification.label.private_reply": "Resposta en privat",
+  "notification.label.reply": "Resposta",
+  "notification.mention": "Menció",
   "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.",
@@ -494,7 +500,6 @@
   "notification.moderation_warning.action_suspend": "S'ha suspès el vostre compte.",
   "notification.own_poll": "La teva enquesta ha finalitzat",
   "notification.poll": "Ha finalitzat una enquesta que heu respost",
-  "notification.private_mention": "{name} us ha esmentat en privat",
   "notification.reblog": "{name} t'ha impulsat",
   "notification.relationships_severance_event": "S'han perdut les connexions amb {name}",
   "notification.relationships_severance_event.account_suspension": "Un administrador de {from} ha suspès {target}; això vol dir que ja no en podreu rebre actualitzacions o interactuar-hi.",
@@ -504,7 +509,14 @@
   "notification.status": "{name} acaba de publicar",
   "notification.update": "{name} ha editat un tut",
   "notification_requests.accept": "Accepta",
+  "notification_requests.accept_all": "Accepta-ho tot",
+  "notification_requests.accept_multiple": "{count, plural, one {Accepta # petició} other {Accepta # peticions}}",
+  "notification_requests.confirm_accept_all.button": "Accepta-ho tot",
+  "notification_requests.confirm_accept_all.message": "Esteu a punt d'acceptar {count, plural, one {una petició de notificació} other {# peticions de notificació}}. N'esteu segurs de continuar?",
+  "notification_requests.confirm_accept_all.title": "Accepteu peticions de notificació?",
   "notification_requests.dismiss": "Ignora",
+  "notification_requests.explainer_for_limited_account": "S'han filtrat les notificacions d'aquest compte perquè un moderador l'ha limitat.",
+  "notification_requests.explainer_for_limited_remote_account": "S'han filtrat les notificacions d'aquest compte perquè un moderador ha limitat el compte o el seu servidor.",
   "notification_requests.maximize": "Maximitza",
   "notification_requests.minimize_banner": "Minimitza el bàner de notificacions filtrades",
   "notification_requests.notifications_from": "Notificacions de {name}",
@@ -545,6 +557,8 @@
   "notifications.permission_denied": "Les notificacions d’escriptori no estan disponibles perquè prèviament s’ha denegat el permís al navegador",
   "notifications.permission_denied_alert": "No es poden activar les notificacions de l'escriptori perquè abans s'ha denegat el permís del navegador",
   "notifications.permission_required": "Les notificacions d'escriptori no estan disponibles perquè el permís requerit no ha estat concedit.",
+  "notifications.policy.filter_limited_accounts_hint": "Limitat pels moderadors del servidor",
+  "notifications.policy.filter_limited_accounts_title": "Comptes moderats",
   "notifications.policy.filter_new_accounts.hint": "Creat {days, plural, one {ahir} other {durant els # dies passats}}",
   "notifications.policy.filter_new_accounts_title": "Comptes nous",
   "notifications.policy.filter_not_followers_hint": "Incloent les persones que us segueixen fa menys {days, plural, one {d'un dia} other {de # dies}}",
@@ -553,7 +567,6 @@
   "notifications.policy.filter_not_following_title": "Persones que no seguiu",
   "notifications.policy.filter_private_mentions_hint": "Filtrat si no és que és en resposta a una menció vostra o si seguiu el remitent",
   "notifications.policy.filter_private_mentions_title": "Mencions privades no sol·licitades",
-  "notifications.policy.title": "Filtra les notificacions de…",
   "notifications_permission_banner.enable": "Activa les notificacions d’escriptori",
   "notifications_permission_banner.how_to_control": "Per a rebre notificacions quan Mastodon no és obert cal activar les notificacions d’escriptori. Pots controlar amb precisió quins tipus d’interaccions generen notificacions d’escriptori després d’activar el botó {icon} de dalt.",
   "notifications_permission_banner.title": "No et perdis mai res",
@@ -794,6 +807,7 @@
   "timeline_hint.remote_resource_not_displayed": "No es mostren {resource} d'altres servidors.",
   "timeline_hint.resources.followers": "Seguidors",
   "timeline_hint.resources.follows": "Seguiments",
+  "timeline_hint.resources.replies": "Algunes respostes",
   "timeline_hint.resources.statuses": "Tuts més antics",
   "trends.counter_by_accounts": "{count, plural, one {{counter} persona} other {{counter} persones}} en {days, plural, one {el passat dia} other {els passats {days} dies}}",
   "trends.trending_now": "És tendència",
diff --git a/app/javascript/mastodon/locales/ckb.json b/app/javascript/mastodon/locales/ckb.json
index 237a49d8e77a30..ca6a363f4241ee 100644
--- a/app/javascript/mastodon/locales/ckb.json
+++ b/app/javascript/mastodon/locales/ckb.json
@@ -385,7 +385,6 @@
   "notification.admin.sign_up": "{name} تۆمارکرا",
   "notification.follow": "{name} دوای تۆ کەوت",
   "notification.follow_request": "{name} داوای کردووە کە شوێنت بکەوێت",
-  "notification.mention": "{name} باسی ئێوەی کرد",
   "notification.own_poll": "ڕاپرسیەکەت کۆتایی هات",
   "notification.reblog": "{name} نووسراوەکەتی دووبارە توتاند",
   "notification.status": "{name} تازە بڵاوکرایەوە",
diff --git a/app/javascript/mastodon/locales/co.json b/app/javascript/mastodon/locales/co.json
index a479c2fedcdd87..fcd89b39a5d619 100644
--- a/app/javascript/mastodon/locales/co.json
+++ b/app/javascript/mastodon/locales/co.json
@@ -236,7 +236,6 @@
   "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
   "notification.follow": "{name} v'hà seguitatu",
   "notification.follow_request": "{name} vole abbunassi à u vostru contu",
-  "notification.mention": "{name} v'hà mintuvatu",
   "notification.own_poll": "U vostru scandagliu hè compiu",
   "notification.reblog": "{name} hà spartutu u vostru statutu",
   "notification.status": "{name} hà appena pubblicatu",
diff --git a/app/javascript/mastodon/locales/cs.json b/app/javascript/mastodon/locales/cs.json
index abfbcbfa5e146d..a4a96f1e2160c0 100644
--- a/app/javascript/mastodon/locales/cs.json
+++ b/app/javascript/mastodon/locales/cs.json
@@ -477,7 +477,6 @@
   "notification.favourite": "Uživatel {name} si oblíbil váš příspěvek",
   "notification.follow": "Uživatel {name} vás začal sledovat",
   "notification.follow_request": "Uživatel {name} požádal o povolení vás sledovat",
-  "notification.mention": "Uživatel {name} vás zmínil",
   "notification.moderation-warning.learn_more": "Zjistit více",
   "notification.moderation_warning": "Obdrželi jste moderační varování",
   "notification.moderation_warning.action_delete_statuses": "Některé z vašich příspěvků byly odstraněny.",
@@ -489,7 +488,6 @@
   "notification.moderation_warning.action_suspend": "Váš účet byl pozastaven.",
   "notification.own_poll": "Vaše anketa skončila",
   "notification.poll": "Anketa, ve které jste hlasovali, skončila",
-  "notification.private_mention": "{name} vás soukromě zmínil",
   "notification.reblog": "Uživatel {name} boostnul váš příspěvek",
   "notification.relationships_severance_event": "Kontakt ztracen s {name}",
   "notification.relationships_severance_event.account_suspension": "Administrátor z {from} pozastavil {target}, což znamená, že již od nich nemůžete přijímat aktualizace nebo s nimi interagovat.",
@@ -548,7 +546,6 @@
   "notifications.policy.filter_not_following_title": "Lidé, které nesledujete",
   "notifications.policy.filter_private_mentions_hint": "Vyfiltrováno, pokud to není odpověď na vaši zmínku nebo pokud sledujete odesílatele",
   "notifications.policy.filter_private_mentions_title": "Nevyžádané soukromé zmínky",
-  "notifications.policy.title": "Vyfiltrovat oznámení od…",
   "notifications_permission_banner.enable": "Povolit oznámení na ploše",
   "notifications_permission_banner.how_to_control": "Chcete-li dostávat oznámení, i když nemáte Mastodon otevřený, povolte oznámení na ploše. Můžete si zvolit, o kterých druzích interakcí chcete být oznámením na ploše informování pod tlačítkem {icon} výše.",
   "notifications_permission_banner.title": "Nenechte si nic uniknout",
diff --git a/app/javascript/mastodon/locales/cy.json b/app/javascript/mastodon/locales/cy.json
index f769810d272897..9b9d341b14b6af 100644
--- a/app/javascript/mastodon/locales/cy.json
+++ b/app/javascript/mastodon/locales/cy.json
@@ -479,7 +479,6 @@
   "notification.favourite": "Hoffodd {name} eich postiad",
   "notification.follow": "Dilynodd {name} chi",
   "notification.follow_request": "Mae {name} wedi gwneud cais i'ch dilyn",
-  "notification.mention": "Crybwyllodd {name} amdanoch chi",
   "notification.moderation-warning.learn_more": "Dysgu mwy",
   "notification.moderation_warning": "Rydych wedi derbyn rhybudd gan gymedrolwr",
   "notification.moderation_warning.action_delete_statuses": "Mae rhai o'ch postiadau wedi'u dileu.",
@@ -491,7 +490,6 @@
   "notification.moderation_warning.action_suspend": "Mae eich cyfrif wedi'i hatal.",
   "notification.own_poll": "Mae eich pleidlais wedi dod i ben",
   "notification.poll": "Mae arolwg y gwnaethoch bleidleisio ynddo wedi dod i ben",
-  "notification.private_mention": "Mae {name} wedi eich crybwyll yn breifat",
   "notification.reblog": "Hybodd {name} eich post",
   "notification.relationships_severance_event": "Wedi colli cysylltiad â {name}",
   "notification.relationships_severance_event.account_suspension": "Mae gweinyddwr o {from} wedi atal {target}, sy'n golygu na allwch dderbyn diweddariadau ganddynt mwyach na rhyngweithio â nhw.",
@@ -549,7 +547,6 @@
   "notifications.policy.filter_not_following_title": "Pobl nad ydych yn eu dilyn",
   "notifications.policy.filter_private_mentions_hint": "Wedi'i hidlo oni bai ei fod mewn ymateb i'ch crybwylliad eich hun neu os ydych yn dilyn yr anfonwr",
   "notifications.policy.filter_private_mentions_title": "Crybwylliadau preifat digymell",
-  "notifications.policy.title": "Hidlo hysbysiadau gan…",
   "notifications_permission_banner.enable": "Galluogi hysbysiadau bwrdd gwaith",
   "notifications_permission_banner.how_to_control": "I dderbyn hysbysiadau pan nad yw Mastodon ar agor, galluogwch hysbysiadau bwrdd gwaith. Gallwch reoli'n union pa fathau o ryngweithiadau sy'n cynhyrchu hysbysiadau bwrdd gwaith trwy'r botwm {icon} uchod unwaith y byddan nhw wedi'u galluogi.",
   "notifications_permission_banner.title": "Peidiwch â cholli dim",
diff --git a/app/javascript/mastodon/locales/da.json b/app/javascript/mastodon/locales/da.json
index 981ecaa02ed43a..a9e549470c8cf9 100644
--- a/app/javascript/mastodon/locales/da.json
+++ b/app/javascript/mastodon/locales/da.json
@@ -356,6 +356,17 @@
   "home.pending_critical_update.link": "Se opdateringer",
   "home.pending_critical_update.title": "Kritisk sikkerhedsopdatering tilgængelig!",
   "home.show_announcements": "Vis bekendtgørelser",
+  "ignore_notifications_modal.disclaimer": "Mastodon kan ikke informere brugere om, at man har ignoreret deres notifikationer. Ignorerer man notifikationer, forhindrer det ikke selve beskedafsendelsen.",
+  "ignore_notifications_modal.filter_instead": "Filtrer i stedet",
+  "ignore_notifications_modal.filter_to_act_users": "Man vil stadig kunne acceptere, afvise eller anmelde brugere",
+  "ignore_notifications_modal.filter_to_avoid_confusion": "Filtrering medvirker til at undgå potentiel forvirring",
+  "ignore_notifications_modal.filter_to_review_separately": "Man kan gennemgå filtrerede notifikationer separat",
+  "ignore_notifications_modal.ignore": "Ignorér notifikationer",
+  "ignore_notifications_modal.limited_accounts_title": "Ignorér notifikationer fra modererede konti?",
+  "ignore_notifications_modal.new_accounts_title": "Ignorér notifikationer fra nye konti?",
+  "ignore_notifications_modal.not_followers_title": "Ignorér notifikationer fra folk, som ikke er følgere?",
+  "ignore_notifications_modal.not_following_title": "Ignorér notifikationer fra folk, man ikke følger?",
+  "ignore_notifications_modal.private_mentions_title": "Ignorér notifikationer fra uopfordrede Private omtaler?",
   "interaction_modal.description.favourite": "Med en konto på Mastodon kan dette indlæg gøres til favorit for at lade forfatteren vide, at det værdsættes og gemmes til senere.",
   "interaction_modal.description.follow": "Med en konto på Mastodon kan du følge {name} for at modtage vedkommendes indlæg i dit hjemmefeed.",
   "interaction_modal.description.reblog": "Med en konto på Mastodon kan dette indlæg fremhæves så det deles med egne følgere.",
@@ -482,7 +493,11 @@
   "notification.favourite": "{name} favoritmarkerede dit indlæg",
   "notification.follow": "{name} begyndte at følge dig",
   "notification.follow_request": "{name} har anmodet om at følge dig",
-  "notification.mention": "{name} nævnte dig",
+  "notification.label.mention": "Omtale",
+  "notification.label.private_mention": "Privat omtale",
+  "notification.label.private_reply": "Privat svar",
+  "notification.label.reply": "Besvar",
+  "notification.mention": "Omtale",
   "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.",
@@ -494,7 +509,6 @@
   "notification.moderation_warning.action_suspend": "Din konto er suspenderet.",
   "notification.own_poll": "Din afstemning er afsluttet",
   "notification.poll": "En afstemning, hvori du har stemt, er slut",
-  "notification.private_mention": "{name} nævnte dig privat",
   "notification.reblog": "{name} boostede dit indlæg",
   "notification.relationships_severance_event": "Mistede forbindelser med {name}",
   "notification.relationships_severance_event.account_suspension": "En admin fra {from} har suspenderet {target}, hvofor opdateringer herfra eller interaktion hermed ikke længer er mulig.",
@@ -504,11 +518,26 @@
   "notification.status": "{name} har netop postet",
   "notification.update": "{name} redigerede et indlæg",
   "notification_requests.accept": "Acceptér",
+  "notification_requests.accept_all": "Acceptér alle",
+  "notification_requests.accept_multiple": "{count, plural, one {Acceptér # anmodning} other {Acceptér # anmodninger}}",
+  "notification_requests.confirm_accept_all.button": "Acceptér alle",
+  "notification_requests.confirm_accept_all.message": "Man er ved at acceptere {count, plural, one {en notifikationsanmodning} other {# notifikationsanmodninger}}. Fortsæt, sikker?",
+  "notification_requests.confirm_accept_all.title": "Acceptér notifikationsanmodninger?",
+  "notification_requests.confirm_dismiss_all.button": "Afvis alle",
+  "notification_requests.confirm_dismiss_all.message": "Man er ved at afvise {count, plural, one {en notifikationsanmodning} other {# notifikationsanmodninger}}. Man vil derfor ikke nemt kunne tilgå {count, plural, one {den} other {dem}} igen. Fortsæt, sikker?",
+  "notification_requests.confirm_dismiss_all.title": "Afvis notifikationsanmodninger?",
   "notification_requests.dismiss": "Afvis",
+  "notification_requests.dismiss_all": "Afvis alle",
+  "notification_requests.dismiss_multiple": "{count, plural, one {Afvis # anmodning} other {Afvis # anmodninger}}",
+  "notification_requests.enter_selection_mode": "Vælg",
+  "notification_requests.exit_selection_mode": "Afbryd",
+  "notification_requests.explainer_for_limited_account": "Notifikationer fra denne konto er blevet filtreret, da kontoen er pålagt restriktioner af en moderator.",
+  "notification_requests.explainer_for_limited_remote_account": "Notifikationer fra denne konto er blevet filtreret, da kontoen eller dens server er pålagt restriktioner af en moderator.",
   "notification_requests.maximize": "Maksimér",
   "notification_requests.minimize_banner": "Minimér filtrerede notifikationsbanner",
   "notification_requests.notifications_from": "Notifikationer fra {name}",
   "notification_requests.title": "Filtrerede notifikationer",
+  "notification_requests.view": "Vis notifikationer",
   "notifications.clear": "Ryd notifikationer",
   "notifications.clear_confirmation": "Er du sikker på, at du vil rydde alle dine notifikationer permanent?",
   "notifications.clear_title": "Ryd notifikationer?",
@@ -545,6 +574,12 @@
   "notifications.permission_denied": "Computernotifikationer er utilgængelige grundet tidligere afvist browsertilladelsesanmodning",
   "notifications.permission_denied_alert": "Computernotifikationer kan ikke aktiveres, da browsertilladelse tidligere blev nægtet",
   "notifications.permission_required": "Computernotifikationer er utilgængelige, da den krævede tilladelse ikke er tildelt.",
+  "notifications.policy.accept": "Acceptér",
+  "notifications.policy.accept_hint": "Vis notifikationer",
+  "notifications.policy.drop": "Ignorér",
+  "notifications.policy.drop_hint": "Send til intetheden, for aldrig at blive set igen",
+  "notifications.policy.filter": "Filter",
+  "notifications.policy.filter_hint": "Send til filtrerede notifikationsindbakke",
   "notifications.policy.filter_limited_accounts_hint": "Begrænset af servermoderatorer",
   "notifications.policy.filter_limited_accounts_title": "Modererede konti",
   "notifications.policy.filter_new_accounts.hint": "Oprettet indenfor {days, plural, one {den seneste dag} other {de seneste # dage}}",
@@ -555,7 +590,7 @@
   "notifications.policy.filter_not_following_title": "Folk, du ikke følger",
   "notifications.policy.filter_private_mentions_hint": "Filtreret, medmindre det er i svar på egen omtale, eller hvis afsenderen følges",
   "notifications.policy.filter_private_mentions_title": "Uopfordrede private omtaler",
-  "notifications.policy.title": "Bortfiltrér notifikationer fra…",
+  "notifications.policy.title": "Håndtér notifikationer fra…",
   "notifications_permission_banner.enable": "Aktivér computernotifikationer",
   "notifications_permission_banner.how_to_control": "Aktivér computernotifikationer for at få besked, når Mastodon ikke er åben. Når de er aktiveret, kan man via knappen {icon} ovenfor præcist styre, hvilke typer af interaktioner, som genererer computernotifikationer.",
   "notifications_permission_banner.title": "Gå aldrig glip af noget",
@@ -796,6 +831,7 @@
   "timeline_hint.remote_resource_not_displayed": "{resource} fra andre servere vises ikke.",
   "timeline_hint.resources.followers": "Følgere",
   "timeline_hint.resources.follows": "Følger",
+  "timeline_hint.resources.replies": "Visse svar",
   "timeline_hint.resources.statuses": "Ældre indlæg",
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} personer}} {days, plural, one {den seneste dag} other {de seneste {days} dage}}",
   "trends.trending_now": "Hot lige nu",
diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json
index 49821da68e1cd4..620c5e190a08cb 100644
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@@ -356,6 +356,17 @@
   "home.pending_critical_update.link": "Updates ansehen",
   "home.pending_critical_update.title": "Kritisches Sicherheitsupdate verfügbar!",
   "home.show_announcements": "Ankündigungen anzeigen",
+  "ignore_notifications_modal.disclaimer": "Mastodon kann anderen Nutzer*innen nicht mitteilen, dass du deren Benachrichtigungen ignorierst. Das Ignorieren von Benachrichtigung wird das Absenden der Nachricht selbst nicht unterbinden.",
+  "ignore_notifications_modal.filter_instead": "Stattdessen filtern",
+  "ignore_notifications_modal.filter_to_act_users": "Du wirst weiterhin die Möglichkeit haben, andere Nutzer*innen zu genehmigen, abzulehnen oder zu melden",
+  "ignore_notifications_modal.filter_to_avoid_confusion": "Filtern hilft, mögliches Durcheinander zu vermeiden",
+  "ignore_notifications_modal.filter_to_review_separately": "Gefilterte Benachrichtigungen können separat überprüft werden",
+  "ignore_notifications_modal.ignore": "Benachrichtigungen ignorieren",
+  "ignore_notifications_modal.limited_accounts_title": "Benachrichtigungen von moderierten Konten ignorieren?",
+  "ignore_notifications_modal.new_accounts_title": "Benachrichtigungen von neuen Konten ignorieren?",
+  "ignore_notifications_modal.not_followers_title": "Benachrichtigungen von Profilen ignorieren, die dir nicht folgen?",
+  "ignore_notifications_modal.not_following_title": "Benachrichtigungen von Profilen ignorieren, denen du nicht folgst?",
+  "ignore_notifications_modal.private_mentions_title": "Benachrichtigungen von unerwünschten privaten Erwähnungen ignorieren?",
   "interaction_modal.description.favourite": "Mit einem Mastodon-Konto kannst du diesen Beitrag favorisieren, um deine Wertschätzung auszudrücken, und ihn für einen späteren Zeitpunkt speichern.",
   "interaction_modal.description.follow": "Mit einem Mastodon-Konto kannst du {name} folgen, um die Beiträge auf deiner Startseite zu sehen.",
   "interaction_modal.description.reblog": "Mit einem Mastodon-Konto kannst du die Reichweite dieses Beitrags erhöhen, indem du ihn mit deinen Followern teilst.",
@@ -482,7 +493,11 @@
   "notification.favourite": "{name} favorisierte deinen Beitrag",
   "notification.follow": "{name} folgt dir",
   "notification.follow_request": "{name} möchte dir folgen",
-  "notification.mention": "{name} erwähnte dich",
+  "notification.label.mention": "Erwähnung",
+  "notification.label.private_mention": "Private Erwähnung",
+  "notification.label.private_reply": "Private Antwort",
+  "notification.label.reply": "Antwort",
+  "notification.mention": "Erwähnung",
   "notification.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.",
@@ -494,7 +509,6 @@
   "notification.moderation_warning.action_suspend": "Dein Konto wurde gesperrt.",
   "notification.own_poll": "Deine Umfrage ist beendet",
   "notification.poll": "Eine Umfrage, an der du teilgenommen hast, ist beendet",
-  "notification.private_mention": "{name} hat dich privat erwähnt",
   "notification.reblog": "{name} teilte deinen Beitrag",
   "notification.relationships_severance_event": "Verbindungen mit {name} verloren",
   "notification.relationships_severance_event.account_suspension": "Ein Admin von {from} hat {target} gesperrt. Du wirst von diesem Profil keine Updates mehr erhalten und auch nicht mit ihm interagieren können.",
@@ -503,12 +517,27 @@
   "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.update": "{name} bearbeitete einen Beitrag",
-  "notification_requests.accept": "Akzeptieren",
+  "notification_requests.accept": "Genehmigen",
+  "notification_requests.accept_all": "Alle genehmigen",
+  "notification_requests.accept_multiple": "{count, plural, one {# Anfrage genehmigen} other {# Anfragen genehmigen}}",
+  "notification_requests.confirm_accept_all.button": "Alle genehmigen",
+  "notification_requests.confirm_accept_all.message": "Du bist dabei, {{count, plural, one {eine Benachrichtigungsanfrage} other {# Benachrichtigungsanfragen}} zu genehmigen. Möchtest du wirklich fortfahren?",
+  "notification_requests.confirm_accept_all.title": "Benachrichtigungsanfragen genehmigen?",
+  "notification_requests.confirm_dismiss_all.button": "Alle ablehnen",
+  "notification_requests.confirm_dismiss_all.message": "Du bist dabei, {count, plural, one {eine Benachrichtigungsanfrage} other {# Benachrichtigungsanfragen}} abzulehnen. Du wirst nicht mehr ohne Weiteres auf {count, plural, one {sie} other {sie}} zugreifen können. Möchtest du wirklich fortfahren?",
+  "notification_requests.confirm_dismiss_all.title": "Benachrichtigungsanfragen ablehnen?",
   "notification_requests.dismiss": "Ablehnen",
+  "notification_requests.dismiss_all": "Alle ablehnen",
+  "notification_requests.dismiss_multiple": "{count, plural, one {# Anfrage ablehnen} other {# Anfragen ablehnen}}",
+  "notification_requests.enter_selection_mode": "Auswählen",
+  "notification_requests.exit_selection_mode": "Abbrechen",
+  "notification_requests.explainer_for_limited_account": "Benachrichtigungen von diesem Konto wurden gefiltert, weil es durch Moderator*innen eingeschränkt wurde.",
+  "notification_requests.explainer_for_limited_remote_account": "Benachrichtigungen von diesem Konto wurden gefiltert, weil deren Konto oder Server durch Moderator*innen eingeschränkt wurde.",
   "notification_requests.maximize": "Maximieren",
   "notification_requests.minimize_banner": "Banner für gefilterte Benachrichtigungen minimieren",
   "notification_requests.notifications_from": "Benachrichtigungen von {name}",
   "notification_requests.title": "Gefilterte Benachrichtigungen",
+  "notification_requests.view": "Benachrichtigungen anzeigen",
   "notifications.clear": "Benachrichtigungen löschen",
   "notifications.clear_confirmation": "Möchtest du wirklich alle Benachrichtigungen für immer löschen?",
   "notifications.clear_title": "Benachrichtigungen löschen?",
@@ -545,6 +574,14 @@
   "notifications.permission_denied": "Desktop-Benachrichtigungen können aufgrund einer zuvor verweigerten Berechtigung nicht aktiviert werden",
   "notifications.permission_denied_alert": "Desktop-Benachrichtigungen können nicht aktiviert werden, da die Browser-Berechtigung zuvor verweigert wurde",
   "notifications.permission_required": "Desktop-Benachrichtigungen sind nicht verfügbar, da die erforderliche Berechtigung nicht erteilt wurde.",
+  "notifications.policy.accept": "Akzeptieren",
+  "notifications.policy.accept_hint": "In Benachrichtigungen anzeigen",
+  "notifications.policy.drop": "Ignorieren",
+  "notifications.policy.drop_hint": "In die Leere senden und nie wieder sehen",
+  "notifications.policy.filter": "Filter",
+  "notifications.policy.filter_hint": "An gefilterte Benachrichtigungen im Posteingang senden",
+  "notifications.policy.filter_limited_accounts_hint": "Durch Server-Moderator*innen eingeschränkt",
+  "notifications.policy.filter_limited_accounts_title": "Moderierte Konten",
   "notifications.policy.filter_new_accounts.hint": "Innerhalb {days, plural, one {des letzten Tages} other {der letzten # Tagen}} erstellt",
   "notifications.policy.filter_new_accounts_title": "Neuen Konten",
   "notifications.policy.filter_not_followers_hint": "Einschließlich Profilen, die dir seit weniger als {days, plural, one {einem Tag} other {# Tagen}} folgen",
@@ -553,7 +590,7 @@
   "notifications.policy.filter_not_following_title": "Profilen, denen ich nicht folge",
   "notifications.policy.filter_private_mentions_hint": "Solange sie keine Antwort auf deine Erwähnung ist oder du dem Profil nicht folgst",
   "notifications.policy.filter_private_mentions_title": "Unerwünschten privaten Erwähnungen",
-  "notifications.policy.title": "Benachrichtigungen herausfiltern von …",
+  "notifications.policy.title": "Benachrichtigungen verwalten von …",
   "notifications_permission_banner.enable": "Aktiviere Desktop-Benachrichtigungen",
   "notifications_permission_banner.how_to_control": "Um Benachrichtigungen zu erhalten, wenn Mastodon nicht geöffnet ist, aktiviere die Desktop-Benachrichtigungen. Du kannst genau bestimmen, welche Arten von Interaktionen Desktop-Benachrichtigungen über die {icon} -Taste erzeugen, sobald diese aktiviert sind.",
   "notifications_permission_banner.title": "Nichts verpassen",
@@ -794,6 +831,7 @@
   "timeline_hint.remote_resource_not_displayed": "{resource} von anderen Servern werden nicht angezeigt.",
   "timeline_hint.resources.followers": "Follower",
   "timeline_hint.resources.follows": "„Folge ich“",
+  "timeline_hint.resources.replies": "Einige Antworten",
   "timeline_hint.resources.statuses": "Ältere Beiträge",
   "trends.counter_by_accounts": "{count, plural, one {{counter} Profil} other {{counter} Profile}} {days, plural, one {seit gestern} other {in {days} Tagen}}",
   "trends.trending_now": "Aktuelle Trends",
diff --git a/app/javascript/mastodon/locales/el.json b/app/javascript/mastodon/locales/el.json
index f500bd352d4efa..1fd3c5a7cccff2 100644
--- a/app/javascript/mastodon/locales/el.json
+++ b/app/javascript/mastodon/locales/el.json
@@ -482,7 +482,6 @@
   "notification.favourite": "{name} favorited your post\n{name} προτίμησε την ανάρτηση σου",
   "notification.follow": "Ο/Η {name} σε ακολούθησε",
   "notification.follow_request": "Ο/H {name} ζήτησε να σε ακολουθήσει",
-  "notification.mention": "Ο/Η {name} σε επισήμανε",
   "notification.moderation-warning.learn_more": "Μάθε περισσότερα",
   "notification.moderation_warning": "Έχετε λάβει μία προειδοποίηση συντονισμού",
   "notification.moderation_warning.action_delete_statuses": "Ορισμένες από τις αναρτήσεις σου έχουν αφαιρεθεί.",
@@ -494,7 +493,6 @@
   "notification.moderation_warning.action_suspend": "Ο λογαριασμός σου έχει ανασταλεί.",
   "notification.own_poll": "Η δημοσκόπησή σου έληξε",
   "notification.poll": "Μία ψηφοφορία στην οποία συμμετείχες έχει τελειώσει",
-  "notification.private_mention": "{name} σέ επισήμανε ιδιωτικά",
   "notification.reblog": "Ο/Η {name} ενίσχυσε τη δημοσίευσή σου",
   "notification.relationships_severance_event": "Χάθηκε η σύνδεση με το {name}",
   "notification.relationships_severance_event.account_suspension": "Ένας διαχειριστής από το {from} ανέστειλε το {target}, πράγμα που σημαίνει ότι δεν μπορείς πλέον να λαμβάνεις ενημερώσεις από αυτούς ή να αλληλεπιδράς μαζί τους.",
@@ -553,7 +551,6 @@
   "notifications.policy.filter_not_following_title": "Άτομα που δεν ακολουθείς",
   "notifications.policy.filter_private_mentions_hint": "Φιλτραρισμένο εκτός αν είναι απάντηση σε δική σου αναφορά ή αν ακολουθείς τον αποστολέα",
   "notifications.policy.filter_private_mentions_title": "Μη συναινετικές ιδιωτικές αναφορές",
-  "notifications.policy.title": "Φιλτράρισμα ειδοποιήσεων από…",
   "notifications_permission_banner.enable": "Ενεργοποίηση ειδοποιήσεων επιφάνειας εργασίας",
   "notifications_permission_banner.how_to_control": "Για να λαμβάνεις ειδοποιήσεις όταν το Mastodon δεν είναι ανοιχτό, ενεργοποίησε τις ειδοποιήσεις επιφάνειας εργασίας. Μπορείς να ελέγξεις με ακρίβεια ποιοι τύποι αλληλεπιδράσεων δημιουργούν ειδοποιήσεις επιφάνειας εργασίας μέσω του κουμπιού {icon} μόλις ενεργοποιηθούν.",
   "notifications_permission_banner.title": "Μη χάσεις στιγμή",
diff --git a/app/javascript/mastodon/locales/en-GB.json b/app/javascript/mastodon/locales/en-GB.json
index 1307184ddbcff3..64e22505b225f1 100644
--- a/app/javascript/mastodon/locales/en-GB.json
+++ b/app/javascript/mastodon/locales/en-GB.json
@@ -473,7 +473,6 @@
   "notification.favourite": "{name} favourited your post",
   "notification.follow": "{name} followed you",
   "notification.follow_request": "{name} has requested to follow you",
-  "notification.mention": "{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.",
@@ -485,7 +484,6 @@
   "notification.moderation_warning.action_suspend": "Your account has been suspended.",
   "notification.own_poll": "Your poll has ended",
   "notification.poll": "A poll you voted in has ended",
-  "notification.private_mention": "{name} privately mentioned you",
   "notification.reblog": "{name} boosted your status",
   "notification.relationships_severance_event": "Lost connections with {name}",
   "notification.relationships_severance_event.account_suspension": "An admin from {from} has suspended {target}, which means you can no longer receive updates from them or interact with them.",
@@ -541,7 +539,6 @@
   "notifications.policy.filter_not_following_title": "People you don't follow",
   "notifications.policy.filter_private_mentions_hint": "Filtered unless it's in reply to your own mention or if you follow the sender",
   "notifications.policy.filter_private_mentions_title": "Unsolicited private mentions",
-  "notifications.policy.title": "Filter out notifications from…",
   "notifications_permission_banner.enable": "Enable desktop notifications",
   "notifications_permission_banner.how_to_control": "To receive notifications when Mastodon isn't open, enable desktop notifications. You can control precisely which types of interactions generate desktop notifications through the {icon} button above once they're enabled.",
   "notifications_permission_banner.title": "Never miss a thing",
diff --git a/app/javascript/mastodon/locales/eo.json b/app/javascript/mastodon/locales/eo.json
index 851b3bfd1a8095..15fe9a5ea120f8 100644
--- a/app/javascript/mastodon/locales/eo.json
+++ b/app/javascript/mastodon/locales/eo.json
@@ -399,7 +399,6 @@
   "notification.favourite": "{name} stelumis vian afiŝon",
   "notification.follow": "{name} eksekvis vin",
   "notification.follow_request": "{name} petis sekvi vin",
-  "notification.mention": "{name} menciis vin",
   "notification.own_poll": "Via enketo finiĝis",
   "notification.reblog": "{name} diskonigis vian afiŝon",
   "notification.status": "{name} ĵus afiŝis",
diff --git a/app/javascript/mastodon/locales/es-AR.json b/app/javascript/mastodon/locales/es-AR.json
index 7dcc6eb4959340..0722a08ea63975 100644
--- a/app/javascript/mastodon/locales/es-AR.json
+++ b/app/javascript/mastodon/locales/es-AR.json
@@ -356,6 +356,17 @@
   "home.pending_critical_update.link": "Ver actualizaciones",
   "home.pending_critical_update.title": "¡Actualización de seguridad crítica disponible!",
   "home.show_announcements": "Mostrar anuncios",
+  "ignore_notifications_modal.disclaimer": "Mastodon no puede informar a los usuarios que ignoraste sus notificaciones. Ignorar notificaciones no impedirá que se sigan enviando los mensajes.",
+  "ignore_notifications_modal.filter_instead": "Filtrar en vez de ignorar",
+  "ignore_notifications_modal.filter_to_act_users": "Aún podrás aceptar, rechazar o denunciar a usuarios",
+  "ignore_notifications_modal.filter_to_avoid_confusion": "Filtrar ayuda a evitar confusiones potenciales",
+  "ignore_notifications_modal.filter_to_review_separately": "Podés revisar las notificaciones filtradas por separado",
+  "ignore_notifications_modal.ignore": "Ignorar notificaciones",
+  "ignore_notifications_modal.limited_accounts_title": "¿Ignorar notificaciones de cuentas moderadas?",
+  "ignore_notifications_modal.new_accounts_title": "¿Ignorar notificaciones de cuentas nuevas?",
+  "ignore_notifications_modal.not_followers_title": "¿Ignorar notificaciones de cuentas que no te siguen?",
+  "ignore_notifications_modal.not_following_title": "¿Ignorar notificaciones de cuentas a las que no seguís?",
+  "ignore_notifications_modal.private_mentions_title": "¿Ignorar notificaciones de menciones privadas no solicitadas?",
   "interaction_modal.description.favourite": "Con una cuenta en Mastodon, podés marcar este mensaje como favorito para que el autor sepa que lo apreciás y lo guardás para más adelante.",
   "interaction_modal.description.follow": "Con una cuenta en Mastodon, podés seguir a {name} para recibir sus mensajes en tu línea temporal principal.",
   "interaction_modal.description.reblog": "Con una cuenta en Mastodon, podés adherir a este mensaje para compartirlo con tus propios seguidores.",
@@ -482,7 +493,11 @@
   "notification.favourite": "{name} marcó tu mensaje como favorito",
   "notification.follow": "{name} te empezó a seguir",
   "notification.follow_request": "{name} solicitó seguirte",
-  "notification.mention": "{name} te mencionó",
+  "notification.label.mention": "Mención",
+  "notification.label.private_mention": "Mención privada",
+  "notification.label.private_reply": "Respuesta privada",
+  "notification.label.reply": "Respuesta",
+  "notification.mention": "Mención",
   "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.",
@@ -494,7 +509,6 @@
   "notification.moderation_warning.action_suspend": "Tu cuenta fue suspendida.",
   "notification.own_poll": "Tu encuesta finalizó",
   "notification.poll": "Finalizó una encuesta en la que votaste",
-  "notification.private_mention": "{name} te mencionó en privado",
   "notification.reblog": "{name} adhirió a tu mensaje",
   "notification.relationships_severance_event": "Conexiones perdidas con {name}",
   "notification.relationships_severance_event.account_suspension": "Un administrador de {from} suspendió a {target}, lo que significa que ya no podés recibir actualizaciones de esa cuenta o interactuar con la misma.",
@@ -504,11 +518,26 @@
   "notification.status": "{name} acaba de enviar un mensaje",
   "notification.update": "{name} editó un mensaje",
   "notification_requests.accept": "Aceptar",
+  "notification_requests.accept_all": "Aceptar todas",
+  "notification_requests.accept_multiple": "{count, plural, one {Aceptar # solicitud} other {Aceptar # solicitudes}}",
+  "notification_requests.confirm_accept_all.button": "Aceptar todas",
+  "notification_requests.confirm_accept_all.message": "Estás a punto de aceptar {count, plural, one {una solicitud} other {# solicitudes}}. ¿Estás seguro de que querés continuar?",
+  "notification_requests.confirm_accept_all.title": "¿Aceptar solicitudes de notificación?",
+  "notification_requests.confirm_dismiss_all.button": "Descartar todas",
+  "notification_requests.confirm_dismiss_all.message": "Estás a punto de descartar {count, plural, one {una solicitud} other {# solicitudes}}. No vas a poder acceder fácilmente a {count, plural, one {ella} other {ellas}} de nuevo. ¿Estás seguro de que querés continuar?",
+  "notification_requests.confirm_dismiss_all.title": "¿Descartar solicitudes de notificación?",
   "notification_requests.dismiss": "Descartar",
+  "notification_requests.dismiss_all": "Descartar todas",
+  "notification_requests.dismiss_multiple": "{count, plural, one {Descartar # solicitud} other {Descartar # solicitudes}}",
+  "notification_requests.enter_selection_mode": "Seleccionar",
+  "notification_requests.exit_selection_mode": "Cancelar",
+  "notification_requests.explainer_for_limited_account": "Las notificaciones de esta cuenta fueron filtradas porque la misma fue limitada por un moderador.",
+  "notification_requests.explainer_for_limited_remote_account": "Las notificaciones de esta cuenta fueron filtradas porque la cuenta o su servidor fueron limitados por un moderador.",
   "notification_requests.maximize": "Maximizar",
   "notification_requests.minimize_banner": "Minimizar la barra de notificaciones filtradas",
   "notification_requests.notifications_from": "Notificaciones de {name}",
   "notification_requests.title": "Notificaciones filtradas",
+  "notification_requests.view": "Ver notificaciones",
   "notifications.clear": "Limpiar notificaciones",
   "notifications.clear_confirmation": "¿Estás seguro que querés limpiar todas tus notificaciones permanentemente?",
   "notifications.clear_title": "¿Limpiar notificaciones?",
@@ -545,6 +574,12 @@
   "notifications.permission_denied": "Las notificaciones de escritorio no están disponibles, debido a una solicitud de permiso del navegador web previamente denegada",
   "notifications.permission_denied_alert": "No se pueden habilitar las notificaciones de escritorio, ya que el permiso del navegador fue denegado antes",
   "notifications.permission_required": "Las notificaciones de escritorio no están disponibles porque no se concedió el permiso requerido.",
+  "notifications.policy.accept": "Aceptar",
+  "notifications.policy.accept_hint": "Mostrar en notificaciones",
+  "notifications.policy.drop": "Ignorar",
+  "notifications.policy.drop_hint": "Enviar al vacío, no volver a mostrar nunca",
+  "notifications.policy.filter": "Filtrar",
+  "notifications.policy.filter_hint": "Enviar a la bandeja de entrada de notificaciones filtradas",
   "notifications.policy.filter_limited_accounts_hint": "Limitada por los moderadores del servidor",
   "notifications.policy.filter_limited_accounts_title": "Cuentas moderadas",
   "notifications.policy.filter_new_accounts.hint": "Creada hace {days, plural, one {un día} other {# días}}",
@@ -555,7 +590,7 @@
   "notifications.policy.filter_not_following_title": "Cuentas que no seguís",
   "notifications.policy.filter_private_mentions_hint": "Filtradas, a menos que sea en respuesta a tu propia mención o si seguís al remitente",
   "notifications.policy.filter_private_mentions_title": "Menciones privadas no solicitadas",
-  "notifications.policy.title": "Filtrar notificaciones de…",
+  "notifications.policy.title": "Administrar notificaciones de…",
   "notifications_permission_banner.enable": "Habilitar notificaciones de escritorio",
   "notifications_permission_banner.how_to_control": "Para recibir notificaciones cuando Mastodon no está abierto, habilitá las notificaciones de escritorio. Podés controlar con precisión qué tipos de interacciones generan notificaciones de escritorio a través del botón {icon} de arriba, una vez que estén habilitadas.",
   "notifications_permission_banner.title": "No te pierdas nada",
@@ -796,6 +831,7 @@
   "timeline_hint.remote_resource_not_displayed": "{resource} desde otros servidores no se muestran.",
   "timeline_hint.resources.followers": "Tus seguidores",
   "timeline_hint.resources.follows": "Las cuentas que seguís",
+  "timeline_hint.resources.replies": "Algunas respuestas",
   "timeline_hint.resources.statuses": "Mensajes más antiguos",
   "trends.counter_by_accounts": "{count, plural, one {{counter} persona} other {{counter} personas}} en {days, plural, one {el pasado día} other {los pasados {days} días}}",
   "trends.trending_now": "Tendencia ahora",
diff --git a/app/javascript/mastodon/locales/es-MX.json b/app/javascript/mastodon/locales/es-MX.json
index 71c9e3b7a1cf98..b5238e663ac700 100644
--- a/app/javascript/mastodon/locales/es-MX.json
+++ b/app/javascript/mastodon/locales/es-MX.json
@@ -356,6 +356,15 @@
   "home.pending_critical_update.link": "Ver actualizaciones",
   "home.pending_critical_update.title": "¡Actualización de seguridad crítica disponible!",
   "home.show_announcements": "Mostrar anuncios",
+  "ignore_notifications_modal.disclaimer": "Mastodon no puede informar a los usuarios que has ignorado sus notificaciones. Ignorar notificaciones no impedirá que se sigan enviando los mensajes.",
+  "ignore_notifications_modal.filter_instead": "Filtrar en vez de ignorar",
+  "ignore_notifications_modal.filter_to_avoid_confusion": "Filtrar ayuda a evitar confusiones potenciales",
+  "ignore_notifications_modal.ignore": "Ignorar notificaciones",
+  "ignore_notifications_modal.limited_accounts_title": "¿Ignorar notificaciones de cuentas moderadas?",
+  "ignore_notifications_modal.new_accounts_title": "¿Ignorar notificaciones de cuentas nuevas?",
+  "ignore_notifications_modal.not_followers_title": "¿Ignorar notificaciones de personas que no te sigue?",
+  "ignore_notifications_modal.not_following_title": "¿Ignorar notificaciones de personas a las que no sigues?",
+  "ignore_notifications_modal.private_mentions_title": "¿Ignorar notificaciones de menciones privadas no solicitadas?",
   "interaction_modal.description.favourite": "Con una cuenta en Mastodon, puedes marcar como favorita esta publicación para que el autor sepa que te gusta, y guardala para más adelante.",
   "interaction_modal.description.follow": "Con una cuenta en Mastodon, puedes seguir {name} para recibir sus publicaciones en tu fuente de inicio.",
   "interaction_modal.description.reblog": "Con una cuenta en Mastodon, puedes impulsar esta publicación para compartirla con tus propios seguidores.",
@@ -482,7 +491,11 @@
   "notification.favourite": "{name} marcó como favorita tu publicación",
   "notification.follow": "{name} te empezó a seguir",
   "notification.follow_request": "{name} ha solicitado seguirte",
-  "notification.mention": "{name} te ha mencionado",
+  "notification.label.mention": "Mención",
+  "notification.label.private_mention": "Mención privada",
+  "notification.label.private_reply": "Respuesta privada",
+  "notification.label.reply": "Respuesta",
+  "notification.mention": "Mención",
   "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.",
@@ -494,7 +507,6 @@
   "notification.moderation_warning.action_suspend": "Tu cuenta ha sido suspendida.",
   "notification.own_poll": "Tu encuesta ha terminado",
   "notification.poll": "Una encuesta ha terminado",
-  "notification.private_mention": "{name} te mencionó en privado",
   "notification.reblog": "{name} ha retooteado tu estado",
   "notification.relationships_severance_event": "Conexiones perdidas con {name}",
   "notification.relationships_severance_event.account_suspension": "Un administrador de {from} ha suspendido {target}, lo que significa que ya no puedes recibir actualizaciones de sus cuentas o interactuar con ellas.",
@@ -504,11 +516,26 @@
   "notification.status": "{name} acaba de publicar",
   "notification.update": "{name} editó una publicación",
   "notification_requests.accept": "Aceptar",
+  "notification_requests.accept_all": "Aceptar todas",
+  "notification_requests.accept_multiple": "{count, plural, one {Aceptar # solicitud} other {Aceptar # solicitudes}}",
+  "notification_requests.confirm_accept_all.button": "Aceptar todas",
+  "notification_requests.confirm_accept_all.message": "Vas a aceptar {count, plural, one {una solicitud} other {# solicitudes}}. ¿Estás seguro de que quieres continuar?",
+  "notification_requests.confirm_accept_all.title": "¿Aceptar todas las solicitudes?",
+  "notification_requests.confirm_dismiss_all.button": "Descartar todas",
+  "notification_requests.confirm_dismiss_all.message": "Vas a descartar {count, plural, one {una solicitud} other {# solicitudes}}. No vas a poder acceder fácilmente a {count, plural, one {ella} other {ellas}} de nuevo. ¿Estás seguro de que quieres continuar?",
+  "notification_requests.confirm_dismiss_all.title": "¿Descartar todas las solicitudes?",
   "notification_requests.dismiss": "Descartar",
+  "notification_requests.dismiss_all": "Descartar todas",
+  "notification_requests.dismiss_multiple": "{count, plural, one {Descartar # solicitud} other {Descartar # solicitudes}}",
+  "notification_requests.enter_selection_mode": "Seleccionar",
+  "notification_requests.exit_selection_mode": "Cancelar",
+  "notification_requests.explainer_for_limited_account": "Las notificaciones de esta cuenta han sido filtradas porque la cuenta ha sido limitada por un moderador.",
+  "notification_requests.explainer_for_limited_remote_account": "Las notificaciones de esta cuenta han sido filtradas porque la cuenta o su servidor ha sido limitada por un moderador.",
   "notification_requests.maximize": "Maximizar",
   "notification_requests.minimize_banner": "Minimizar banner de notificaciones filtradas",
   "notification_requests.notifications_from": "Notificaciones de {name}",
   "notification_requests.title": "Notificaciones filtradas",
+  "notification_requests.view": "Ver notificaciones",
   "notifications.clear": "Limpiar notificaciones",
   "notifications.clear_confirmation": "¿Seguro de querer borrar permanentemente todas tus notificaciones?",
   "notifications.clear_title": "¿Borrar notificaciones?",
@@ -545,6 +572,14 @@
   "notifications.permission_denied": "No se pueden habilitar las notificaciones de escritorio ya que se denegó el permiso.",
   "notifications.permission_denied_alert": "No se pueden habilitar las notificaciones de escritorio, ya que el permiso del navegador fue denegado anteriormente",
   "notifications.permission_required": "Las notificaciones de escritorio no están disponibles porque no se ha concedido el permiso requerido.",
+  "notifications.policy.accept": "Aceptar",
+  "notifications.policy.accept_hint": "Mostrar en notificaciones",
+  "notifications.policy.drop": "Ignorar",
+  "notifications.policy.drop_hint": "Enviar al vacío, no volver a mostrar nunca",
+  "notifications.policy.filter": "Filtrar",
+  "notifications.policy.filter_hint": "Enviar a la bandeja de entrada de notificaciones filtradas",
+  "notifications.policy.filter_limited_accounts_hint": "Limitadas por los moderadores del servidor",
+  "notifications.policy.filter_limited_accounts_title": "Cuentas moderadas",
   "notifications.policy.filter_new_accounts.hint": "Creadas durante {days, plural, one {el último día} other {los últimos # días}}",
   "notifications.policy.filter_new_accounts_title": "Cuentas nuevas",
   "notifications.policy.filter_not_followers_hint": "Incluyendo personas que te han estado siguiendo desde hace menos de {days, plural, one {un día} other {# días}}",
@@ -553,7 +588,7 @@
   "notifications.policy.filter_not_following_title": "Personas que no sigues",
   "notifications.policy.filter_private_mentions_hint": "Filtrada, a menos que sea en respuesta a tu propia mención, o si sigues al remitente",
   "notifications.policy.filter_private_mentions_title": "Menciones privadas no solicitadas",
-  "notifications.policy.title": "Filtrar notificaciones de…",
+  "notifications.policy.title": "Gestionar notificaciones de…",
   "notifications_permission_banner.enable": "Habilitar notificaciones de escritorio",
   "notifications_permission_banner.how_to_control": "Para recibir notificaciones cuando Mastodon no esté abierto, habilite las notificaciones de escritorio. Puedes controlar con precisión qué tipos de interacciones generan notificaciones de escritorio a través del botón {icon} de arriba una vez que estén habilitadas.",
   "notifications_permission_banner.title": "Nunca te pierdas nada",
@@ -794,6 +829,7 @@
   "timeline_hint.remote_resource_not_displayed": "{resource} de otros servidores no se muestran.",
   "timeline_hint.resources.followers": "Seguidores",
   "timeline_hint.resources.follows": "Seguidos",
+  "timeline_hint.resources.replies": "Algunas respuestas",
   "timeline_hint.resources.statuses": "Toots más antiguos",
   "trends.counter_by_accounts": "{count, plural, one {{counter} persona} other {{counter} personas}} en los últimos {days, plural, one {días} other {{days} días}}",
   "trends.trending_now": "Tendencia ahora",
diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json
index 29d5cfb3ace642..520066378799ff 100644
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@@ -356,6 +356,15 @@
   "home.pending_critical_update.link": "Ver actualizaciones",
   "home.pending_critical_update.title": "¡Actualización de seguridad crítica disponible!",
   "home.show_announcements": "Mostrar anuncios",
+  "ignore_notifications_modal.disclaimer": "Mastodon no puede informar a los usuarios que has ignorado sus notificaciones. Ignorar notificaciones no impedirá que se sigan enviando los mensajes.",
+  "ignore_notifications_modal.filter_instead": "Filtrar en vez de ignorar",
+  "ignore_notifications_modal.filter_to_avoid_confusion": "Filtrar ayuda a evitar confusiones potenciales",
+  "ignore_notifications_modal.ignore": "Ignorar notificaciones",
+  "ignore_notifications_modal.limited_accounts_title": "¿Ignorar notificaciones de cuentas moderadas?",
+  "ignore_notifications_modal.new_accounts_title": "¿Ignorar notificaciones de cuentas nuevas?",
+  "ignore_notifications_modal.not_followers_title": "¿Ignorar notificaciones de personas que no te sigue?",
+  "ignore_notifications_modal.not_following_title": "¿Ignorar notificaciones de personas a las que no sigues?",
+  "ignore_notifications_modal.private_mentions_title": "¿Ignorar notificaciones de menciones privadas no solicitadas?",
   "interaction_modal.description.favourite": "Con una cuenta en Mastodon, puedes marcar como favorita esta publicación para que el autor sepa que te gusta, y guardala para más adelante.",
   "interaction_modal.description.follow": "Con una cuenta en Mastodon, puedes seguir {name} para recibir sus publicaciones en tu línea temporal de inicio.",
   "interaction_modal.description.reblog": "Con una cuenta en Mastodon, puedes impulsar esta publicación para compartirla con tus propios seguidores.",
@@ -482,7 +491,11 @@
   "notification.favourite": "{name} marcó como favorita tu publicación",
   "notification.follow": "{name} te empezó a seguir",
   "notification.follow_request": "{name} ha solicitado seguirte",
-  "notification.mention": "{name} te ha mencionado",
+  "notification.label.mention": "Mención",
+  "notification.label.private_mention": "Mención privada",
+  "notification.label.private_reply": "Respuesta privada",
+  "notification.label.reply": "Respuesta",
+  "notification.mention": "Mención",
   "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.",
@@ -494,7 +507,6 @@
   "notification.moderation_warning.action_suspend": "Tu cuenta ha sido suspendida.",
   "notification.own_poll": "Tu encuesta ha terminado",
   "notification.poll": "Una encuesta ha terminado",
-  "notification.private_mention": "{name} te mencionó en privado",
   "notification.reblog": "{name} ha impulsado tu publicación",
   "notification.relationships_severance_event": "Conexiones perdidas con {name}",
   "notification.relationships_severance_event.account_suspension": "Un administrador de {from} ha suspendido {target}, lo que significa que ya no puedes recibir actualizaciones de sus cuentas o interactuar con ellas.",
@@ -504,11 +516,26 @@
   "notification.status": "{name} acaba de publicar",
   "notification.update": "{name} editó una publicación",
   "notification_requests.accept": "Aceptar",
+  "notification_requests.accept_all": "Aceptar todas",
+  "notification_requests.accept_multiple": "{count, plural, one {Aceptar # solicitud} other {Aceptar # solicitudes}}",
+  "notification_requests.confirm_accept_all.button": "Aceptar todas",
+  "notification_requests.confirm_accept_all.message": "Vas a aceptar {count, plural, one {una solicitud} other {# solicitudes}}. ¿Estás seguro de que quieres continuar?",
+  "notification_requests.confirm_accept_all.title": "¿Aceptar todas las solicitudes?",
+  "notification_requests.confirm_dismiss_all.button": "Descartar todas",
+  "notification_requests.confirm_dismiss_all.message": "Vas a descartar {count, plural, one {una solicitud} other {# solicitudes}}. No vas a poder acceder fácilmente a {count, plural, one {ella} other {ellas}} de nuevo. ¿Estás seguro de que quieres continuar?",
+  "notification_requests.confirm_dismiss_all.title": "¿Descartar todas las solicitudes?",
   "notification_requests.dismiss": "Descartar",
+  "notification_requests.dismiss_all": "Descartar todas",
+  "notification_requests.dismiss_multiple": "{count, plural, one {Descartar # solicitud} other {Descartar # solicitudes}}",
+  "notification_requests.enter_selection_mode": "Seleccionar",
+  "notification_requests.exit_selection_mode": "Cancelar",
+  "notification_requests.explainer_for_limited_account": "Las notificaciones de esta cuenta han sido filtradas porque la cuenta ha sido limitada por un moderador.",
+  "notification_requests.explainer_for_limited_remote_account": "Las notificaciones de esta cuenta han sido filtradas porque la cuenta o su servidor ha sido limitada por un moderador.",
   "notification_requests.maximize": "Maximizar",
   "notification_requests.minimize_banner": "Minimizar banner de notificaciones filtradas",
   "notification_requests.notifications_from": "Notificaciones de {name}",
   "notification_requests.title": "Notificaciones filtradas",
+  "notification_requests.view": "Ver notificaciones",
   "notifications.clear": "Limpiar notificaciones",
   "notifications.clear_confirmation": "¿Seguro que quieres limpiar permanentemente todas tus notificaciones?",
   "notifications.clear_title": "¿Borrar notificaciones?",
@@ -545,6 +572,14 @@
   "notifications.permission_denied": "No se pueden habilitar las notificaciones de escritorio ya que se denegó el permiso.",
   "notifications.permission_denied_alert": "No se pueden habilitar las notificaciones de escritorio, ya que el permiso del navegador fue denegado anteriormente",
   "notifications.permission_required": "Las notificaciones de escritorio no están disponibles porque no se ha concedido el permiso requerido.",
+  "notifications.policy.accept": "Aceptar",
+  "notifications.policy.accept_hint": "Mostrar en notificaciones",
+  "notifications.policy.drop": "Ignorar",
+  "notifications.policy.drop_hint": "Enviar al vacío, no volver a mostrar nunca",
+  "notifications.policy.filter": "Filtrar",
+  "notifications.policy.filter_hint": "Enviar a la bandeja de entrada de notificaciones filtradas",
+  "notifications.policy.filter_limited_accounts_hint": "Limitadas por los moderadores del servidor",
+  "notifications.policy.filter_limited_accounts_title": "Cuentas moderadas",
   "notifications.policy.filter_new_accounts.hint": "Creadas durante {days, plural, one {el último día} other {los últimos # días}}",
   "notifications.policy.filter_new_accounts_title": "Cuentas nuevas",
   "notifications.policy.filter_not_followers_hint": "Incluyendo personas que te han estado siguiendo desde hace menos de {days, plural, one {un día} other {# días}}",
@@ -553,7 +588,7 @@
   "notifications.policy.filter_not_following_title": "Personas que no sigues",
   "notifications.policy.filter_private_mentions_hint": "Filtradas a menos que sea en respuesta a tu propia mención, o si sigues al remitente",
   "notifications.policy.filter_private_mentions_title": "Menciones privadas no solicitadas",
-  "notifications.policy.title": "Filtrar notificaciones de…",
+  "notifications.policy.title": "Gestionar notificaciones de…",
   "notifications_permission_banner.enable": "Habilitar notificaciones de escritorio",
   "notifications_permission_banner.how_to_control": "Para recibir notificaciones cuando Mastodon no esté abierto, habilite las notificaciones de escritorio. Puedes controlar con precisión qué tipos de interacciones generan notificaciones de escritorio a través del botón {icon} de arriba una vez que estén habilitadas.",
   "notifications_permission_banner.title": "Nunca te pierdas nada",
@@ -794,6 +829,7 @@
   "timeline_hint.remote_resource_not_displayed": "{resource} de otros servidores no se muestran.",
   "timeline_hint.resources.followers": "Seguidores",
   "timeline_hint.resources.follows": "Seguidos",
+  "timeline_hint.resources.replies": "Algunas respuestas",
   "timeline_hint.resources.statuses": "Publicaciones más antiguas",
   "trends.counter_by_accounts": "{count, plural, one {{counter} persona} other {{counter} personas}} en los últimos {days, plural, one {días} other {{days} días}}",
   "trends.trending_now": "Tendencia ahora",
diff --git a/app/javascript/mastodon/locales/et.json b/app/javascript/mastodon/locales/et.json
index 031904d54a3acf..737ee1bad0d1e4 100644
--- a/app/javascript/mastodon/locales/et.json
+++ b/app/javascript/mastodon/locales/et.json
@@ -464,7 +464,6 @@
   "notification.favourite": "{name} märkis su postituse lemmikuks",
   "notification.follow": "{name} alustas su jälgimist",
   "notification.follow_request": "{name} soovib sind jälgida",
-  "notification.mention": "{name} mainis sind",
   "notification.moderation-warning.learn_more": "Vaata lisa",
   "notification.moderation_warning": "Said modereerimise hoiatuse",
   "notification.moderation_warning.action_delete_statuses": "Mõni su postitus on eemaldatud.",
@@ -528,7 +527,6 @@
   "notifications.policy.filter_not_following_title": "Inimesed, keda sa ei jälgi",
   "notifications.policy.filter_private_mentions_hint": "Filtreeritud, kui see pole vastus sinupoolt mainimisele või kui jälgid saatjat",
   "notifications.policy.filter_private_mentions_title": "Soovimatud privaatsed mainimised",
-  "notifications.policy.title": "Filtreeri välja teavitused kohast…",
   "notifications_permission_banner.enable": "Luba töölaua märguanded",
   "notifications_permission_banner.how_to_control": "Et saada teateid, ajal mil Mastodon pole avatud, luba töölauamärguanded. Saad täpselt määrata, mis tüüpi tegevused tekitavad märguandeid, kasutates peale teadaannete sisse lülitamist üleval olevat nuppu {icon}.",
   "notifications_permission_banner.title": "Ära jää millestki ilma",
diff --git a/app/javascript/mastodon/locales/eu.json b/app/javascript/mastodon/locales/eu.json
index 291f19002e40e3..34b62d949d3ca0 100644
--- a/app/javascript/mastodon/locales/eu.json
+++ b/app/javascript/mastodon/locales/eu.json
@@ -466,7 +466,6 @@
   "notification.favourite": "{name}(e)k zure bidalketa gogoko du",
   "notification.follow": "{name}(e)k jarraitzen dizu",
   "notification.follow_request": "{name}(e)k zu jarraitzeko eskaera egin du",
-  "notification.mention": "{name}(e)k aipatu zaitu",
   "notification.moderation-warning.learn_more": "Informazio gehiago",
   "notification.moderation_warning": "Moderazio-abisu bat jaso duzu",
   "notification.moderation_warning.action_delete_statuses": "Argitalpen batzuk kendu dira.",
@@ -531,7 +530,6 @@
   "notifications.policy.filter_not_following_title": "Jarraitzen ez duzun jendea",
   "notifications.policy.filter_private_mentions_hint": "Iragazita, baldin eta zure aipamenaren erantzuna bada edo bidaltzailea jarraitzen baduzu",
   "notifications.policy.filter_private_mentions_title": "Eskatu gabeko aipamen pribatuak",
-  "notifications.policy.title": "Ez iragazi hemengo jakinarazpenak…",
   "notifications_permission_banner.enable": "Gaitu mahaigaineko jakinarazpenak",
   "notifications_permission_banner.how_to_control": "Mastodon irekita ez dagoenean jakinarazpenak jasotzeko, gaitu mahaigaineko jakinarazpenak. Mahaigaineko jakinarazpenak ze elkarrekintzak eragingo dituzten zehazki kontrolatu dezakezu goiko {icon} botoia erabiliz, gaituta daudenean.",
   "notifications_permission_banner.title": "Ez galdu ezer inoiz",
diff --git a/app/javascript/mastodon/locales/fa.json b/app/javascript/mastodon/locales/fa.json
index 514ce5959a2892..a2d511c5a0ca01 100644
--- a/app/javascript/mastodon/locales/fa.json
+++ b/app/javascript/mastodon/locales/fa.json
@@ -435,7 +435,6 @@
   "notification.favourite": "{name} فرسته‌تان را برگزید",
   "notification.follow": "‫{name}‬ پی‌گیرتان شد",
   "notification.follow_request": "{name} درخواست پی‌گیریتان را داد",
-  "notification.mention": "‫{name}‬ به شما اشاره کرد",
   "notification.moderation-warning.learn_more": "بیشتر بدانید",
   "notification.own_poll": "نظرسنجیتان پایان یافت",
   "notification.reblog": "‫{name}‬ فرسته‌تان را تقویت کرد",
diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index 0f70d95e3e6108..b583f80fe1e1cb 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -356,6 +356,17 @@
   "home.pending_critical_update.link": "Tutustu päivityssisältöihin",
   "home.pending_critical_update.title": "Kriittinen tietoturvapäivitys saatavilla!",
   "home.show_announcements": "Näytä tiedotteet",
+  "ignore_notifications_modal.disclaimer": "Mastodon ei voi ilmoittaa käyttäjille, että olet sivuuttanut heidän ilmoituksensa. Ilmoitusten sivuuttaminen ei lopeta itse viestien lähetystä.",
+  "ignore_notifications_modal.filter_instead": "Suodata sen sijaan",
+  "ignore_notifications_modal.filter_to_act_users": "Voit silti hyväksyä, hylätä tai raportoida käyttäjiä",
+  "ignore_notifications_modal.filter_to_avoid_confusion": "Suodatus auttaa välttämään mahdollisia sekaannuksia",
+  "ignore_notifications_modal.filter_to_review_separately": "Voit käydä suodatettuja ilmoituksia läpi erikseen",
+  "ignore_notifications_modal.ignore": "Sivuuta ilmoitukset",
+  "ignore_notifications_modal.limited_accounts_title": "Sivuutetaanko ilmoitukset moderoiduilta tileiltä?",
+  "ignore_notifications_modal.new_accounts_title": "Sivuutetaanko ilmoitukset uusilta tileiltä?",
+  "ignore_notifications_modal.not_followers_title": "Sivuutetaanko ilmoitukset käyttäjiltä, jotka eivät seuraa sinua?",
+  "ignore_notifications_modal.not_following_title": "Sivuutetaanko ilmoitukset käyttäjiltä, joita et seuraa?",
+  "ignore_notifications_modal.private_mentions_title": "Sivuutetaanko ilmoitukset ei-toivotuista yksityismaininnoista?",
   "interaction_modal.description.favourite": "Mastodon-tilillä voit lisätä tämän julkaisun suosikkeihisi osoittaaksesi tekijälle arvostavasi sitä ja tallentaaksesi sen tulevaa käyttöä varten.",
   "interaction_modal.description.follow": "Mastodon-tilillä voit seurata käyttäjää {name} saadaksesi hänen julkaisunsa kotisyötteeseesi.",
   "interaction_modal.description.reblog": "Mastodon-tilillä voit tehostaa tätä julkaisua jakaaksesi sen seuraajiesi kanssa.",
@@ -482,7 +493,11 @@
   "notification.favourite": "{name} lisäsi julkaisusi suosikkeihinsa",
   "notification.follow": "{name} seurasi sinua",
   "notification.follow_request": "{name} on pyytänyt lupaa seurata sinua",
-  "notification.mention": "{name} mainitsi sinut",
+  "notification.label.mention": "Maininta",
+  "notification.label.private_mention": "Yksityismaininta",
+  "notification.label.private_reply": "Yksityinen vastaus",
+  "notification.label.reply": "Vastaus",
+  "notification.mention": "Maininta",
   "notification.moderation-warning.learn_more": "Lue lisää",
   "notification.moderation_warning": "Olet saanut moderointivaroituksen",
   "notification.moderation_warning.action_delete_statuses": "Julkaisujasi on poistettu.",
@@ -494,7 +509,6 @@
   "notification.moderation_warning.action_suspend": "Tilisi on jäädytetty.",
   "notification.own_poll": "Äänestyksesi on päättynyt",
   "notification.poll": "Äänestys, johon osallistuit, on päättynyt",
-  "notification.private_mention": "{name} mainitsi sinut yksityisesti",
   "notification.reblog": "{name} tehosti julkaisuasi",
   "notification.relationships_severance_event": "Menetettiin yhteydet palvelimeen {name}",
   "notification.relationships_severance_event.account_suspension": "Palvelimen {from} ylläpitäjä on jäädyttänyt palvelimen {target} vuorovaikutuksen. Enää et voi siis vastaanottaa päivityksiä heiltä tai olla yhteyksissä heidän kanssaan.",
@@ -504,11 +518,26 @@
   "notification.status": "{name} julkaisi juuri",
   "notification.update": "{name} muokkasi julkaisua",
   "notification_requests.accept": "Hyväksy",
+  "notification_requests.accept_all": "Hyväksy kaikki",
+  "notification_requests.accept_multiple": "{count, plural, one {Hyväksy # pyyntö} other {Hyväksy # pyyntöä}}",
+  "notification_requests.confirm_accept_all.button": "Hyväksy kaikki",
+  "notification_requests.confirm_accept_all.message": "Olet aikeissa hyväksyä {count, plural, one {ilmoituspyynnön} other {# ilmoituspyyntöä}}. Haluatko varmasti jatkaa?",
+  "notification_requests.confirm_accept_all.title": "Hyväksytäänkö ilmoituspyynnöt?",
+  "notification_requests.confirm_dismiss_all.button": "Hylkää kaikki",
+  "notification_requests.confirm_dismiss_all.message": "Olet aikeissa hylätä {count, plural, one {ilmoituspyynnön} other {# ilmoituspyyntöä}}. Et saa {count, plural, one {sitä} other {niitä}} enää helposti takaisin. Haluatko varmasti jatkaa?",
+  "notification_requests.confirm_dismiss_all.title": "Hylätäänkö ilmoituspyynnöt?",
   "notification_requests.dismiss": "Hylkää",
+  "notification_requests.dismiss_all": "Hylkää kaikki",
+  "notification_requests.dismiss_multiple": "{count, plural, one {Hylkää # pyyntö} other {Hylkää # pyyntöä}}",
+  "notification_requests.enter_selection_mode": "Valitse",
+  "notification_requests.exit_selection_mode": "Peruuta",
+  "notification_requests.explainer_for_limited_account": "Tähän tiliin liittyvät ilmoitukset on suodatettu, koska moderaattori on rajoittanut tiliä.",
+  "notification_requests.explainer_for_limited_remote_account": "Tähän tiliin liittyvät ilmoitukset on suodatettu, koska moderaattori on rajoittanut tiliä tai sen palvelinta.",
   "notification_requests.maximize": "Suurenna",
   "notification_requests.minimize_banner": "Pienennä suodatettujen ilmoitusten palkki",
   "notification_requests.notifications_from": "Ilmoitukset käyttäjältä {name}",
   "notification_requests.title": "Suodatetut ilmoitukset",
+  "notification_requests.view": "Näytä ilmoitukset",
   "notifications.clear": "Tyhjennä ilmoitukset",
   "notifications.clear_confirmation": "Haluatko varmasti poistaa kaikki ilmoitukset pysyvästi?",
   "notifications.clear_title": "Tyhjennetäänkö ilmoitukset?",
@@ -545,6 +574,12 @@
   "notifications.permission_denied": "Työpöytäilmoitukset eivät ole käytettävissä, koska selaimen käyttöoikeuspyyntö on aiemmin evätty",
   "notifications.permission_denied_alert": "Työpöytäilmoituksia ei voi ottaa käyttöön, koska selaimen käyttöoikeus on aiemmin evätty",
   "notifications.permission_required": "Työpöytäilmoitukset eivät ole käytettävissä, koska siihen tarvittavaa käyttöoikeutta ei ole myönnetty.",
+  "notifications.policy.accept": "Hyväksy",
+  "notifications.policy.accept_hint": "Näytä ilmoituksissa",
+  "notifications.policy.drop": "Sivuuta",
+  "notifications.policy.drop_hint": "Lähetä tyhjyyteen, jotta et näe niitä enää koskaan",
+  "notifications.policy.filter": "Suodata",
+  "notifications.policy.filter_hint": "Lähetä suodatettuihin ilmoituksiin",
   "notifications.policy.filter_limited_accounts_hint": "Palvelimen moderaattorien rajoittamat",
   "notifications.policy.filter_limited_accounts_title": "Moderoidut tilit",
   "notifications.policy.filter_new_accounts.hint": "Luotu {days, plural, one {viime päivän} other {viimeisen # päivän}} aikana",
@@ -555,7 +590,7 @@
   "notifications.policy.filter_not_following_title": "Käyttäjät, joita et seuraa",
   "notifications.policy.filter_private_mentions_hint": "Suodatetaan, ellei se ole vastaus omaan mainintaasi tai ellet seuraa lähettäjää",
   "notifications.policy.filter_private_mentions_title": "Ei-toivotut yksityismaininnat",
-  "notifications.policy.title": "Suodata ilmoitukset pois kohteesta…",
+  "notifications.policy.title": "Hallitse ilmoituksia kohteesta…",
   "notifications_permission_banner.enable": "Ota työpöytäilmoitukset käyttöön",
   "notifications_permission_banner.how_to_control": "Saadaksesi ilmoituksia, kun Mastodon ei ole auki, ota työpöytäilmoitukset käyttöön. Voit hallita tarkasti, mistä saat työpöytäilmoituksia kun ilmoitukset on otettu käyttöön yllä olevan {icon}-painikkeen kautta.",
   "notifications_permission_banner.title": "Älä anna minkään mennä ohi",
@@ -796,6 +831,7 @@
   "timeline_hint.remote_resource_not_displayed": "Muiden palvelinten {resource} eivät näy tässä.",
   "timeline_hint.resources.followers": "seuraajat",
   "timeline_hint.resources.follows": "seuratut",
+  "timeline_hint.resources.replies": "kaikki vastaukset",
   "timeline_hint.resources.statuses": "vanhemmat julkaisut",
   "trends.counter_by_accounts": "{count, plural, one {{counter} käyttäjä} other {{counter} käyttäjää}} {days, plural, one {viime päivänä} other {viimeisenä {days} päivänä}}",
   "trends.trending_now": "Suosittua nyt",
diff --git a/app/javascript/mastodon/locales/fil.json b/app/javascript/mastodon/locales/fil.json
index f5cc407eceb778..4aa45f3fc693d0 100644
--- a/app/javascript/mastodon/locales/fil.json
+++ b/app/javascript/mastodon/locales/fil.json
@@ -239,7 +239,6 @@
   "notification.admin.report": "Iniulat ni {name} si {target}",
   "notification.follow": "Sinundan ka ni {name}",
   "notification.follow_request": "Hinihiling ni {name} na sundan ka",
-  "notification.mention": "Binanggit ka ni {name}",
   "notification.moderation_warning": "Mayroong kang natanggap na babala sa pagtitimpi",
   "notification.relationships_severance_event.learn_more": "Matuto nang higit pa",
   "notification_requests.accept": "Tanggapin",
diff --git a/app/javascript/mastodon/locales/fo.json b/app/javascript/mastodon/locales/fo.json
index a0d2b347fc00c5..ec6b0e53575bc6 100644
--- a/app/javascript/mastodon/locales/fo.json
+++ b/app/javascript/mastodon/locales/fo.json
@@ -301,7 +301,7 @@
   "filter_modal.select_filter.title": "Filtrera hendan postin",
   "filter_modal.title.status": "Filtrera ein post",
   "filtered_notifications_banner.pending_requests": "Frá {count, plural, =0 {ongum} one {einum persóni} other {# persónum}}, sum tú kanska kennir",
-  "filtered_notifications_banner.title": "Sáldaðar fráboðanir",
+  "filtered_notifications_banner.title": "Filtreraðar fráboðanir",
   "firehose.all": "Allar",
   "firehose.local": "Hesin ambætarin",
   "firehose.remote": "Aðrir ambætarar",
@@ -356,6 +356,17 @@
   "home.pending_critical_update.link": "Sí dagføringar",
   "home.pending_critical_update.title": "Kritisk trygdardagføring er tøk!",
   "home.show_announcements": "Vís kunngerðir",
+  "ignore_notifications_modal.disclaimer": "Mastodon kann ikki upplýsa brúkarar um, at tú hevur latið sum um, at tú ikki hevur sæð teirra fráboðanir. At lata sum um, at tú ikki sær fráboðanir, forðar ikki, at boðini sjálv verða send.",
+  "ignore_notifications_modal.filter_instead": "Filtrera ístaðin",
+  "ignore_notifications_modal.filter_to_act_users": "Tú kann framvegis góðtaka, avvísa og melda brúkarar",
+  "ignore_notifications_modal.filter_to_avoid_confusion": "Filtrering ger tað lættari at sleppa undan møguligum misskiljingum",
+  "ignore_notifications_modal.filter_to_review_separately": "Tú kanst kanna filtreraðar fráboðanir fyri seg",
+  "ignore_notifications_modal.ignore": "Lat sum um tú ikki sær fráboðanir",
+  "ignore_notifications_modal.limited_accounts_title": "Lat sum um tú ikki sær fráboðanir frá avmarkaðum kontum?",
+  "ignore_notifications_modal.new_accounts_title": "Lat sum um tú ikki sær fráboðanir frá nýggjum kontum?",
+  "ignore_notifications_modal.not_followers_title": "Lat sum um tú ikki sær fráboðanir frá fólki, sum ikki fylgja tær?",
+  "ignore_notifications_modal.not_following_title": "Lat sum um tú ikki sær fráboðanir frá fólki, sum tú ikki fylgir?",
+  "ignore_notifications_modal.private_mentions_title": "Lat sum um tú ikki sær fráboðanir frá óbiðnum privatum umrøðum?",
   "interaction_modal.description.favourite": "Við einari kontu á Mastodon kanst tú dáma hendan postin fyri at vísa rithøvundanum at tú virðismetur hann og goymir hann til seinni.",
   "interaction_modal.description.follow": "Við eini kontu á Mastodon kanst tú fylgja {name} fyri at síggja teirra postar á tíni heimarás.",
   "interaction_modal.description.reblog": "Við eini kontu á Mastodon kanst tú stimbra hendan postin og soleiðis deila hann við tínar fylgjarar.",
@@ -482,7 +493,11 @@
   "notification.favourite": "{name} dámdi postin hjá tær",
   "notification.follow": "{name} fylgdi tær",
   "notification.follow_request": "{name} biður um at fylgja tær",
-  "notification.mention": "{name} nevndi teg",
+  "notification.label.mention": "Umrøða",
+  "notification.label.private_mention": "Privat umrøða",
+  "notification.label.private_reply": "Privat svar",
+  "notification.label.reply": "Svara",
+  "notification.mention": "Umrøð",
   "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.",
@@ -494,7 +509,6 @@
   "notification.moderation_warning.action_suspend": "Konta tín er ógildað.",
   "notification.own_poll": "Tín atkvøðugreiðsla er endað",
   "notification.poll": "Ein atkvøðugreiðsla, har tú atkvøddi, er endað",
-  "notification.private_mention": "{name} nevndi teg í privatum boðum",
   "notification.reblog": "{name} lyfti tín post",
   "notification.relationships_severance_event": "Mist sambond við {name}",
   "notification.relationships_severance_event.account_suspension": "Ein umsitari frá {from} hevur gjørt {target} óvirkna, sum merkir, at tú ikki kanst móttaka dagføringar ella virka saman við teimum longur.",
@@ -504,10 +518,26 @@
   "notification.status": "{name} hevur júst postað",
   "notification.update": "{name} rættaði ein post",
   "notification_requests.accept": "Góðtak",
+  "notification_requests.accept_all": "Góðtak alt",
+  "notification_requests.accept_multiple": "{count, plural, one {Góðtak # umbøn} other {Góðtak # umbønir}}",
+  "notification_requests.confirm_accept_all.button": "Góðtak alt",
+  "notification_requests.confirm_accept_all.message": "Tú er í ferð við at góðtaka {count, plural, one {eina fráboðanarumbøn} other {# fráboðanarumbønir}}. Er tú vís/ur í at tú vilt halda fram?",
+  "notification_requests.confirm_accept_all.title": "Góðtekur tú umbøn um fráboðan?",
+  "notification_requests.confirm_dismiss_all.button": "Vraka alt",
+  "notification_requests.confirm_dismiss_all.message": "Tú ert í ferð við at kveistra burtur {count, plural, one {eina fráboðanarumbøn} other {# fráboðanarumbønir}}. Tað verður ikki lætt hjá tær at fáa atgongd til {count, plural, one {hana} other {tær}} aftur. Er tú vís/ur í, at tú vil halda fram?",
+  "notification_requests.confirm_dismiss_all.title": "Kveistra burtur fráboðanarumbønir?",
   "notification_requests.dismiss": "Avvís",
+  "notification_requests.dismiss_all": "Vraka alt",
+  "notification_requests.dismiss_multiple": "{count, plural, one {Kveistra burtur # umbøn} other {Kveistra burtur # umbønir}}",
+  "notification_requests.enter_selection_mode": "Vel",
+  "notification_requests.exit_selection_mode": "Strika",
+  "notification_requests.explainer_for_limited_account": "Fráboðanir frá hesi kontuni eru filtreraðar burtur, tí kontan er avmarkað av einum umsjónarfólki.",
+  "notification_requests.explainer_for_limited_remote_account": "Fráboðanir frá hesi kontuni eru filtreraðar burtur, tí kontan ella ambætarin hjá kontuni eru avmarkaði av einum umsjónarfólki.",
   "notification_requests.maximize": "Mesta",
+  "notification_requests.minimize_banner": "Ger merkið við filtreraðum fráboðanum lítið",
   "notification_requests.notifications_from": "Fráboðanir frá {name}",
-  "notification_requests.title": "Sáldaðar fráboðanir",
+  "notification_requests.title": "Filtreraðar fráboðanir",
+  "notification_requests.view": "Vís fráboðanir",
   "notifications.clear": "Rudda fráboðanir",
   "notifications.clear_confirmation": "Ert tú vís/ur í, at tú vilt strika allar tínar fráboðanir?",
   "notifications.clear_title": "Rudda fráboðanir?",
@@ -544,15 +574,23 @@
   "notifications.permission_denied": "Skriviborðsfráboðanir eru ikki tøkar tí at ein kaga-umbøn áður bleiv noktað",
   "notifications.permission_denied_alert": "Tað ber ikki til at sláa skriviborðsfráboðanir til, tí at kagarættindi áður eru noktaði",
   "notifications.permission_required": "Skriviborðsfráboðanir eru ikki tøkar, tí at neyðugu rættindini eru ikki latin.",
+  "notifications.policy.accept": "Góðtak",
+  "notifications.policy.accept_hint": "Vís í fráboðanum",
+  "notifications.policy.drop": "Lat sum um tú ikki sær",
+  "notifications.policy.drop_hint": "Send út í tóman heim, soleiðis at tað aldrin sæst aftur",
+  "notifications.policy.filter": "Filtrera",
+  "notifications.policy.filter_hint": "Send til filtreraðan fráboðanar-innbakka",
+  "notifications.policy.filter_limited_accounts_hint": "Avmarkað av umsjónarfólkunum á ambætaranum",
+  "notifications.policy.filter_limited_accounts_title": "Avmarkaðar kontur",
   "notifications.policy.filter_new_accounts.hint": "Stovnaðar {days, plural, one {seinasta dagin} other {seinastu # dagarnar}}",
   "notifications.policy.filter_new_accounts_title": "Nýggjar kontur",
   "notifications.policy.filter_not_followers_hint": "Íroknað fólk, sum hava fylgt tær styttri enn {days, plural, one {ein dag} other {# dagar}}",
   "notifications.policy.filter_not_followers_title": "Fólk, sum ikki fylgja tær",
   "notifications.policy.filter_not_following_hint": "Til tú góðkennir tey manuelt",
   "notifications.policy.filter_not_following_title": "Fólk, sum tú ikki fylgir",
-  "notifications.policy.filter_private_mentions_hint": "Sáldaði, uttan so at tað er í svari til tínar egnu nevningar ella um tú fylgir sendaranum",
+  "notifications.policy.filter_private_mentions_hint": "Filtreraði, uttan so at tað er í svari til tínar egnu nevningar ella um tú fylgir sendaranum",
   "notifications.policy.filter_private_mentions_title": "Óbidnar privatar umrøður",
-  "notifications.policy.title": "Sálda burtur fráboðanir frá…",
+  "notifications.policy.title": "Stýr fráboðanir frá…",
   "notifications_permission_banner.enable": "Ger skriviborðsfráboðanir virknar",
   "notifications_permission_banner.how_to_control": "Ger skriviborðsfráboðanir virknar fyri at móttaka fráboðanir, tá Mastodon ikki er opið. Tá tær eru gjørdar virknar, kanst tú stýra, hvørji sløg av samvirkni geva skriviborðsfráboðanir. Hetta umvegis {icon} knøttin omanfyri.",
   "notifications_permission_banner.title": "Miss einki",
@@ -793,6 +831,7 @@
   "timeline_hint.remote_resource_not_displayed": "{resource} frá øðrum ambætarum verður ikki víst.",
   "timeline_hint.resources.followers": "Fylgjarar",
   "timeline_hint.resources.follows": "Fylgir",
+  "timeline_hint.resources.replies": "Nøkur svar",
   "timeline_hint.resources.statuses": "Gamlir postar",
   "trends.counter_by_accounts": "{count, plural, one {{counter} persónur} other {{counter} persónar}} {days, plural, one {seinasta dagin} other {{days} seinastu dagarnar}}",
   "trends.trending_now": "Rák beint nú",
diff --git a/app/javascript/mastodon/locales/fr-CA.json b/app/javascript/mastodon/locales/fr-CA.json
index 02e3396575c6a2..b0609e3e822b09 100644
--- a/app/javascript/mastodon/locales/fr-CA.json
+++ b/app/javascript/mastodon/locales/fr-CA.json
@@ -465,7 +465,6 @@
   "notification.favourite": "{name} a ajouté votre publication à ses favoris",
   "notification.follow": "{name} vous suit",
   "notification.follow_request": "{name} a demandé à vous suivre",
-  "notification.mention": "{name} vous a mentionné·e",
   "notification.own_poll": "Votre sondage est terminé",
   "notification.reblog": "{name} a boosté votre message",
   "notification.relationships_severance_event": "Connexions perdues avec {name}",
@@ -521,7 +520,6 @@
   "notifications.policy.filter_not_following_title": "Personnes que vous ne suivez pas",
   "notifications.policy.filter_private_mentions_hint": "Filtré sauf si c'est en réponse à une mention de vous ou si vous suivez l'expéditeur",
   "notifications.policy.filter_private_mentions_title": "Mentions privées non sollicitées",
-  "notifications.policy.title": "Filtrer les notifications de…",
   "notifications_permission_banner.enable": "Activer les notifications de bureau",
   "notifications_permission_banner.how_to_control": "Pour recevoir des notifications lorsque Mastodon n’est pas ouvert, activez les notifications de bureau. Vous pouvez contrôler précisément quels types d’interactions génèrent des notifications de bureau via le bouton {icon} ci-dessus une fois qu’elles sont activées.",
   "notifications_permission_banner.title": "Ne rien rater",
diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json
index d218148c257c43..9c983dd0e2866e 100644
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@@ -465,7 +465,6 @@
   "notification.favourite": "{name} a ajouté votre message à ses favoris",
   "notification.follow": "{name} vous suit",
   "notification.follow_request": "{name} a demandé à vous suivre",
-  "notification.mention": "{name} vous a mentionné·e :",
   "notification.own_poll": "Votre sondage est terminé",
   "notification.reblog": "{name} a partagé votre message",
   "notification.relationships_severance_event": "Connexions perdues avec {name}",
@@ -521,7 +520,6 @@
   "notifications.policy.filter_not_following_title": "Personnes que vous ne suivez pas",
   "notifications.policy.filter_private_mentions_hint": "Filtré sauf si c'est en réponse à une mention de vous ou si vous suivez l'expéditeur",
   "notifications.policy.filter_private_mentions_title": "Mentions privées non sollicitées",
-  "notifications.policy.title": "Filtrer les notifications de…",
   "notifications_permission_banner.enable": "Activer les notifications de bureau",
   "notifications_permission_banner.how_to_control": "Pour recevoir des notifications lorsque Mastodon n’est pas ouvert, activez les notifications du bureau. Vous pouvez contrôler précisément quels types d’interactions génèrent des notifications de bureau via le bouton {icon} ci-dessus une fois qu’elles sont activées.",
   "notifications_permission_banner.title": "Toujours au courant",
diff --git a/app/javascript/mastodon/locales/fy.json b/app/javascript/mastodon/locales/fy.json
index 1eceec08a06431..6f7da4409683b5 100644
--- a/app/javascript/mastodon/locales/fy.json
+++ b/app/javascript/mastodon/locales/fy.json
@@ -470,7 +470,6 @@
   "notification.favourite": "{name} hat jo berjocht as favoryt markearre",
   "notification.follow": "{name} folget dy",
   "notification.follow_request": "{name} hat dy in folchfersyk stjoerd",
-  "notification.mention": "{name} hat dy fermeld",
   "notification.moderation-warning.learn_more": "Mear ynfo",
   "notification.moderation_warning": "Jo hawwe in moderaasje-warskôging ûntfongen",
   "notification.moderation_warning.action_delete_statuses": "Guon fan jo berjochten binne fuortsmiten.",
@@ -482,7 +481,6 @@
   "notification.moderation_warning.action_suspend": "Jo account is útsteld.",
   "notification.own_poll": "Jo poll is beëinige",
   "notification.poll": "In enkête dêr’t jo oan meidien hawwe is beëinige",
-  "notification.private_mention": "{name} hat jo in priveeberjocht stjoerd",
   "notification.reblog": "{name} hat jo berjocht boost",
   "notification.relationships_severance_event": "Ferlerne ferbiningen mei {name}",
   "notification.relationships_severance_event.account_suspension": "In behearder fan {from} hat {target} útsteld, wat betsjut dat jo gjin updates mear fan harren ûntfange kinne of mei harren kommunisearje kinne.",
diff --git a/app/javascript/mastodon/locales/ga.json b/app/javascript/mastodon/locales/ga.json
index 04be6bc2fa11b7..c5cce2889446ff 100644
--- a/app/javascript/mastodon/locales/ga.json
+++ b/app/javascript/mastodon/locales/ga.json
@@ -481,7 +481,6 @@
   "notification.favourite": "Is fearr le {name} do phostáil",
   "notification.follow": "Lean {name} thú",
   "notification.follow_request": "D'iarr {name} ort do chuntas a leanúint",
-  "notification.mention": "Luaigh {name} tú",
   "notification.moderation-warning.learn_more": "Foghlaim níos mó",
   "notification.moderation_warning": "Tá rabhadh modhnóireachta faighte agat",
   "notification.moderation_warning.action_delete_statuses": "Baineadh cuid de do phostálacha.",
@@ -493,7 +492,6 @@
   "notification.moderation_warning.action_suspend": "Cuireadh do chuntas ar fionraí.",
   "notification.own_poll": "Tá do suirbhé críochnaithe",
   "notification.poll": "Tá deireadh le vótaíocht inar vótáil tú",
-  "notification.private_mention": "luaigh {name} tú go príobháideach",
   "notification.reblog": "Mhol {name} do phostáil",
   "notification.relationships_severance_event": "Cailleadh naisc le {name}",
   "notification.relationships_severance_event.account_suspension": "Chuir riarthóir ó {from} {target} ar fionraí, rud a chiallaíonn nach féidir leat nuashonruithe a fháil uathu a thuilleadh ná idirghníomhú leo.",
@@ -550,7 +548,6 @@
   "notifications.policy.filter_not_following_title": "Daoine nach leanann tú",
   "notifications.policy.filter_private_mentions_hint": "Scagtha mura bhfuil sé mar fhreagra ar do lua féin nó má leanann tú an seoltóir",
   "notifications.policy.filter_private_mentions_title": "Tagairtí príobháideacha gan iarraidh",
-  "notifications.policy.title": "Scag fógraí ó…",
   "notifications_permission_banner.enable": "Ceadaigh fógraí ar an deasc",
   "notifications_permission_banner.how_to_control": "Chun fógraí a fháil nuair nach bhfuil Mastodon oscailte, cumasaigh fógraí deisce. Is féidir leat a rialú go beacht cé na cineálacha idirghníomhaíochtaí a ghineann fógraí deisce tríd an gcnaipe {icon} thuas nuair a bhíonn siad cumasaithe.",
   "notifications_permission_banner.title": "Ná caill aon rud go deo",
diff --git a/app/javascript/mastodon/locales/gd.json b/app/javascript/mastodon/locales/gd.json
index 5b5009e853d548..c5af3e557ce4fc 100644
--- a/app/javascript/mastodon/locales/gd.json
+++ b/app/javascript/mastodon/locales/gd.json
@@ -482,7 +482,6 @@
   "notification.favourite": "Is annsa le {name} am post agad",
   "notification.follow": "Tha {name} ’gad leantainn a-nis",
   "notification.follow_request": "Dh’iarr {name} ’gad leantainn",
-  "notification.mention": "Thug {name} iomradh ort",
   "notification.moderation-warning.learn_more": "Barrachd fiosrachaidh",
   "notification.moderation_warning": "Fhuair thu rabhadh on mhaorsainneachd",
   "notification.moderation_warning.action_delete_statuses": "Chaidh cuid dhe na postaichean agad a thoirt air falbh.",
@@ -494,7 +493,6 @@
   "notification.moderation_warning.action_suspend": "Chaidh an cunntas agad a chur à rèim.",
   "notification.own_poll": "Thàinig an cunntas-bheachd agad gu crìoch",
   "notification.poll": "Thàinig cunntas-bheachd sa bhòt thu gu crìoch",
-  "notification.private_mention": "Thug {name} iomradh ort gu prìobhaideach",
   "notification.reblog": "Bhrosnaich {name} am post agad",
   "notification.relationships_severance_event": "Chaill thu dàimhean le {name}",
   "notification.relationships_severance_event.account_suspension": "Chuir rianaire aig {from} {target} à rèim agus is ciall dha sin nach fhaigh thu naidheachdan uapa ’s nach urrainn dhut conaltradh leotha.",
@@ -553,7 +551,6 @@
   "notifications.policy.filter_not_following_title": "Daoine nach eil thu a’ leantainn",
   "notifications.policy.filter_private_mentions_hint": "Criathraichte ach ma tha e a’ freagairt do dh’iomradh agad fhèin no ma tha thu a’ leantainn an t-seòladair",
   "notifications.policy.filter_private_mentions_title": "Iomraidhean prìobhaideach o choigrich",
-  "notifications.policy.title": "Falaich na brathan o…",
   "notifications_permission_banner.enable": "Cuir brathan deasga an comas",
   "notifications_permission_banner.how_to_control": "Airson brathan fhaighinn nuair nach eil Mastodon fosgailte, cuir na brathan deasga an comas. Tha an smachd agad fhèin air dè na seòrsaichean de chonaltradh a ghineas brathan deasga leis a’ phutan {icon} gu h-àrd nuair a bhios iad air an cur an comas.",
   "notifications_permission_banner.title": "Na caill dad gu bràth tuilleadh",
diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json
index 493b2fcb1757af..6ed70c00d925dd 100644
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@@ -356,6 +356,14 @@
   "home.pending_critical_update.link": "Mira as actualizacións",
   "home.pending_critical_update.title": "Hai una actualización crítica de seguridade!",
   "home.show_announcements": "Amosar anuncios",
+  "ignore_notifications_modal.disclaimer": "Mastodon non pode informar ás usuarias se ignoraches as súas notificacións. Ao ignorar as notificacións non evitarás que as mensaxes sexan enviadas igualmente.",
+  "ignore_notifications_modal.filter_to_avoid_confusion": "Ao filtrar axudas a evitar posibles confusións",
+  "ignore_notifications_modal.ignore": "Ignorar notificacións",
+  "ignore_notifications_modal.limited_accounts_title": "Ignorar notificacións desde contas moderadas?",
+  "ignore_notifications_modal.new_accounts_title": "Ignorar notificacións desde novas contas?",
+  "ignore_notifications_modal.not_followers_title": "Ignorar notificacións de persoas que non te seguen?",
+  "ignore_notifications_modal.not_following_title": "Ignorar notificacións de persoas que non segues?",
+  "ignore_notifications_modal.private_mentions_title": "Ignorar notificacións de Mencións Privadas non solicitadas?",
   "interaction_modal.description.favourite": "Cunha conta Mastodon podes favorecer esta publicación e facerlle saber á autora que che gustou e que a gardas para máis tarde.",
   "interaction_modal.description.follow": "Cunha conta en Mastodon, poderás seguir a {name} e recibir as súas publicacións na túa cronoloxía de inicio.",
   "interaction_modal.description.reblog": "Cunha conta en Mastodon, poderás promover esta publicación para compartila con quen te siga.",
@@ -482,7 +490,11 @@
   "notification.favourite": "{name} marcou como favorita a túa publicación",
   "notification.follow": "{name} comezou a seguirte",
   "notification.follow_request": "{name} solicitou seguirte",
-  "notification.mention": "{name} mencionoute",
+  "notification.label.mention": "Mención",
+  "notification.label.private_mention": "Mención privada",
+  "notification.label.private_reply": "Resposta privada",
+  "notification.label.reply": "Resposta",
+  "notification.mention": "Mención",
   "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.",
@@ -494,7 +506,6 @@
   "notification.moderation_warning.action_suspend": "A túa conta foi suspendida.",
   "notification.own_poll": "A túa enquisa rematou",
   "notification.poll": "Rematou a enquisa na que votaches",
-  "notification.private_mention": "{name} mencionoute de xeito privado",
   "notification.reblog": "{name} compartiu a túa publicación",
   "notification.relationships_severance_event": "Perdeuse a conexión con {name}",
   "notification.relationships_severance_event.account_suspension": "A administración de {from} suspendeu a {target}, o que significa que xa non vas recibir actualizacións de esa conta ou interactuar con ela.",
@@ -504,11 +515,26 @@
   "notification.status": "{name} publicou",
   "notification.update": "{name} editou unha publicación",
   "notification_requests.accept": "Aceptar",
+  "notification_requests.accept_all": "Aceptar todo",
+  "notification_requests.accept_multiple": "{count, plural, one {Aceptar # solicitude} other {Acceptar # solicitudes}}",
+  "notification_requests.confirm_accept_all.button": "Aceptar todo",
+  "notification_requests.confirm_accept_all.message": "Vas aceptar {count, plural, one {unha solicitude de notificación} other {# solicitudes de notificación}}. Tes certeza de querer aceptalas?",
+  "notification_requests.confirm_accept_all.title": "Aceptar solicitudes de notificación?",
+  "notification_requests.confirm_dismiss_all.button": "Rexeitar todo",
+  "notification_requests.confirm_dismiss_all.message": "Vas rexeitar {count, plural, one {unha solicitude de notificación} other {# solicitudes de notificacións}}. Será complicado volver a {count, plural, one {vela} other {velas}}. Tes certeza de rexeitar?",
+  "notification_requests.confirm_dismiss_all.title": "Rexeitar solicitudes de notificacións?",
   "notification_requests.dismiss": "Desbotar",
+  "notification_requests.dismiss_all": "Rexeitar todo",
+  "notification_requests.dismiss_multiple": "{count, plural, one {Rexeitar # solicitude} other {Rexeitar # solicitudes}}",
+  "notification_requests.enter_selection_mode": "Escoller",
+  "notification_requests.exit_selection_mode": "Desbotar",
+  "notification_requests.explainer_for_limited_account": "Filtráronse as notificacións desta conta porque a conta ten limitacións impostas pola moderación.",
+  "notification_requests.explainer_for_limited_remote_account": "Filtráronse as notificacións desta conta porque a conta ou o seu servidor teñen limitacións impostas pola moderación.",
   "notification_requests.maximize": "Maximizar",
   "notification_requests.minimize_banner": "Minimizar o anuncio de notificacións filtradas",
   "notification_requests.notifications_from": "Notificacións de {name}",
   "notification_requests.title": "Notificacións filtradas",
+  "notification_requests.view": "Ver notificacións",
   "notifications.clear": "Limpar notificacións",
   "notifications.clear_confirmation": "Tes a certeza de querer limpar de xeito permanente todas as túas notificacións?",
   "notifications.clear_title": "Limpar as notificacións?",
@@ -545,6 +571,14 @@
   "notifications.permission_denied": "Non se activaron as notificacións de escritorio porque se denegou o permiso",
   "notifications.permission_denied_alert": "Non se poden activar as notificacións de escritorio, xa que o permiso para o navegador foi denegado previamente",
   "notifications.permission_required": "As notificacións de escritorio non están dispoñibles porque non se concedeu o permiso necesario.",
+  "notifications.policy.accept": "Aceptar",
+  "notifications.policy.accept_hint": "Ver nas notificacións",
+  "notifications.policy.drop": "Ignorar",
+  "notifications.policy.drop_hint": "Esquecer isto, non volver a velo",
+  "notifications.policy.filter": "Filtrar",
+  "notifications.policy.filter_hint": "Enviar á caixa de notificacións filtradas",
+  "notifications.policy.filter_limited_accounts_hint": "Limitada pola moderación do servidor",
+  "notifications.policy.filter_limited_accounts_title": "Contas moderadas",
   "notifications.policy.filter_new_accounts.hint": "Creadas desde {days, plural, one {onte} other {fai # días}}",
   "notifications.policy.filter_new_accounts_title": "Novas contas",
   "notifications.policy.filter_not_followers_hint": "Inclúe a persoas que te seguen desde fai menos de {days, plural, one {1 día} other {# días}}",
@@ -553,7 +587,7 @@
   "notifications.policy.filter_not_following_title": "Persoas que ti non segues",
   "notifications.policy.filter_private_mentions_hint": "Filtradas a non ser que sexa unha resposta á túa propia mención ou se ti segues á remitente",
   "notifications.policy.filter_private_mentions_title": "Mencións privadas non solicitadas",
-  "notifications.policy.title": "Desbotar notificacións de…",
+  "notifications.policy.title": "Xestionar as notificacións de…",
   "notifications_permission_banner.enable": "Activar notificacións de escritorio",
   "notifications_permission_banner.how_to_control": "Activa as notificacións de escritorio para recibir notificacións mentras Mastodon non está aberto. Podes controlar de xeito preciso o tipo de interaccións que crean as notificacións de escritorio a través da {icon} superior unha vez están activadas.",
   "notifications_permission_banner.title": "Non perder nada",
@@ -794,6 +828,7 @@
   "timeline_hint.remote_resource_not_displayed": "Non se mostran {resource} desde outros servidores.",
   "timeline_hint.resources.followers": "Seguidoras",
   "timeline_hint.resources.follows": "Seguindo",
+  "timeline_hint.resources.replies": "Algunhas respostas",
   "timeline_hint.resources.statuses": "Publicacións antigas",
   "trends.counter_by_accounts": "{count, plural, one {{counter} persoa} other {{counter} persoas}} {days, plural, one {no último día} other {nos {days} últimos días}}",
   "trends.trending_now": "Tendencias actuais",
diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json
index 3505e14768cb6f..a373e8d44ee779 100644
--- a/app/javascript/mastodon/locales/he.json
+++ b/app/javascript/mastodon/locales/he.json
@@ -482,7 +482,11 @@
   "notification.favourite": "הודעתך חובבה על ידי {name}",
   "notification.follow": "{name} במעקב אחרייך",
   "notification.follow_request": "{name} ביקשו לעקוב אחריך",
-  "notification.mention": "אוזכרת על ידי {name}",
+  "notification.label.mention": "אזכור",
+  "notification.label.private_mention": "אזכור פרטי",
+  "notification.label.private_reply": "תשובה בפרטי",
+  "notification.label.reply": "תשובה",
+  "notification.mention": "אזכור",
   "notification.moderation-warning.learn_more": "למידע נוסף",
   "notification.moderation_warning": "קיבלת אזהרה מצוות ניהול התוכן",
   "notification.moderation_warning.action_delete_statuses": "חלק מהודעותיך הוסרו.",
@@ -494,7 +498,6 @@
   "notification.moderation_warning.action_suspend": "חשבונך הושעה.",
   "notification.own_poll": "הסקר שלך הסתיים",
   "notification.poll": "סקר שהצבעת בו הסתיים",
-  "notification.private_mention": "{name} פנה/פנתה אליך בפרטיות",
   "notification.reblog": "הודעתך הודהדה על ידי {name}",
   "notification.relationships_severance_event": "אבד הקשר עם {name}",
   "notification.relationships_severance_event.account_suspension": "מנהל.ת משרת {from} השע(ת)ה את {target}, ולפיכך לא תעודכנו יותר על ידם ולא תוכלו להיות איתם בקשר.",
@@ -505,6 +508,8 @@
   "notification.update": "{name} ערכו הודעה",
   "notification_requests.accept": "לקבל",
   "notification_requests.dismiss": "לבטל",
+  "notification_requests.explainer_for_limited_account": "התראות על פעולות חשבון זה סוננו כי חשבון זה הוגבל על ידי מנהלי הדיונים.",
+  "notification_requests.explainer_for_limited_remote_account": "התראות על פעולות חשבון זה סוננו כי חשבון זה או השרת שלו הוגבלו על ידי מנהלי הדיונים.",
   "notification_requests.maximize": "הגדלה למקסימום",
   "notification_requests.minimize_banner": "להקטין את כותרת ההודעות המפולטרות",
   "notification_requests.notifications_from": "התראות מ־ {name}",
@@ -545,6 +550,8 @@
   "notifications.permission_denied": "לא ניתן להציג התראות מסך כיוון כיוון שהרשאות דפדפן נשללו בעבר",
   "notifications.permission_denied_alert": "לא ניתן לאפשר נוטיפיקציות מסך שכן הדפדפן סורב הרשאה בעבר",
   "notifications.permission_required": "לא ניתן לאפשר נוטיפיקציות מסך כיוון שהרשאה דרושה לא ניתנה.",
+  "notifications.policy.filter_limited_accounts_hint": "הוגבל על ידי מנהלי הדיונים",
+  "notifications.policy.filter_limited_accounts_title": "חשבון מוגבל",
   "notifications.policy.filter_new_accounts.hint": "נוצר {days, plural,one {ביום האחרון} two {ביומיים האחרונים} other {ב־# הימים האחרונים}}",
   "notifications.policy.filter_new_accounts_title": "חשבונות חדשים",
   "notifications.policy.filter_not_followers_hint": "כולל משתמשים שעקבו אחריך פחות מ{days, plural,one {יום} two {יומיים} other {־# ימים}}",
@@ -553,7 +560,6 @@
   "notifications.policy.filter_not_following_title": "משתמשים שאינך עוקב(ת) אחריהםן",
   "notifications.policy.filter_private_mentions_hint": "מסונן אלא אם זו תשובה למינשון שלך או אם אתם עוקבים אחרי העונה",
   "notifications.policy.filter_private_mentions_title": "מינשונים בפרטי שלא הוזמנו",
-  "notifications.policy.title": "להסתיר התראות מ…",
   "notifications_permission_banner.enable": "לאפשר נוטיפיקציות מסך",
   "notifications_permission_banner.how_to_control": "כדי לקבל התראות גם כאשר מסטודון סגור יש לאפשר התראות מסך. ניתן לשלוט בדיוק איזה סוג של אינטראקציות יביא להתראות מסך דרך כפתור ה- {icon} מרגע שהן מאופשרות.",
   "notifications_permission_banner.title": "לעולם אל תחמיץ דבר",
diff --git a/app/javascript/mastodon/locales/hr.json b/app/javascript/mastodon/locales/hr.json
index da833079187bef..e20fb9b4dcd28f 100644
--- a/app/javascript/mastodon/locales/hr.json
+++ b/app/javascript/mastodon/locales/hr.json
@@ -337,7 +337,6 @@
   "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
   "notification.follow": "{name} Vas je počeo/la pratiti",
   "notification.follow_request": "{name} zatražio/la je da Vas prati",
-  "notification.mention": "{name} Vas je spomenuo",
   "notification.own_poll": "Vaša anketa je završila",
   "notification.reblog": "{name} je boostao/la Vaš status",
   "notifications.clear": "Očisti obavijesti",
diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json
index 4291954e202a93..5e6b42b3bb31e9 100644
--- a/app/javascript/mastodon/locales/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@@ -356,6 +356,15 @@
   "home.pending_critical_update.link": "Frissítések megtekintése",
   "home.pending_critical_update.title": "Kritikus biztonsági frissítés érhető el!",
   "home.show_announcements": "Közlemények megjelenítése",
+  "ignore_notifications_modal.disclaimer": "A Mastodon nem tudja értesíteni azokat a felhasználókat, akiknek figyelmen kívül hagytad az értesítéseit. Az értesítések figyelmen kívül hagyása nem állítja meg az üzenetek elküldését.",
+  "ignore_notifications_modal.filter_instead": "Inkább szűrés",
+  "ignore_notifications_modal.filter_to_avoid_confusion": "A szűrés segít elkerülni a lehetséges félreértéseket",
+  "ignore_notifications_modal.ignore": "Értesítések figyelmen kívül hagyása",
+  "ignore_notifications_modal.limited_accounts_title": "Moderált fiókok értesítéseinek figyelmen kívül hagyása?",
+  "ignore_notifications_modal.new_accounts_title": "Új fiókok értesítéseinek figyelmen kívül hagyása?",
+  "ignore_notifications_modal.not_followers_title": "Nem követőktől érkező értesítések figyelmen kívül hagyása?",
+  "ignore_notifications_modal.not_following_title": "Nem követettektől érkező értesítések figyelmen kívül hagyása?",
+  "ignore_notifications_modal.private_mentions_title": "Figyelmen kívül hagyod a kéretlen privát említéseket?",
   "interaction_modal.description.favourite": "Egy Mastodon fiókkal kedvencnek jelölheted ezt a bejegyzést, tudatva a szerzővel, hogy értékeled és elteszed későbbre.",
   "interaction_modal.description.follow": "Egy Mastodon-fiókkal követheted {name} fiókját, hogy lásd a bejegyzéseit a kezdőlapodon.",
   "interaction_modal.description.reblog": "Egy Mastodon fiókkal megtolhatod ezt a bejegyzést, hogy megoszd a saját követőiddel.",
@@ -482,7 +491,11 @@
   "notification.favourite": "{name} kedvencnek jelölte a bejegyzésedet",
   "notification.follow": "{name} követ téged",
   "notification.follow_request": "{name} követni szeretne téged",
-  "notification.mention": "{name} megemlített",
+  "notification.label.mention": "Említés",
+  "notification.label.private_mention": "Privát említés",
+  "notification.label.private_reply": "Privát válasz",
+  "notification.label.reply": "Válasz",
+  "notification.mention": "Említés",
   "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.",
@@ -494,7 +507,6 @@
   "notification.moderation_warning.action_suspend": "A fiókod felfüggesztésre került.",
   "notification.own_poll": "A szavazásod véget ért",
   "notification.poll": "Véget ért egy szavazás, melyben részt vettél",
-  "notification.private_mention": "{name} privátban megemlített",
   "notification.reblog": "{name} megtolta a bejegyzésedet",
   "notification.relationships_severance_event": "Elvesztek a kapcsolatok vele: {name}",
   "notification.relationships_severance_event.account_suspension": "Egy admin a(z) {from} kiszolgálóról felfüggesztette {target} fiókját, ami azt jelenti, hogy mostantól nem fogsz róla értesítést kapni, és nem fogsz tudni vele kapcsolatba lépni.",
@@ -504,11 +516,26 @@
   "notification.status": "{name} bejegyzést tett közzé",
   "notification.update": "{name} szerkesztett egy bejegyzést",
   "notification_requests.accept": "Elfogadás",
+  "notification_requests.accept_all": "Összes elfogadása",
+  "notification_requests.accept_multiple": "{count, plural, one {# kérés elfogadása} other {# kérés elfogadása}}",
+  "notification_requests.confirm_accept_all.button": "Összes elfogadása",
+  "notification_requests.confirm_accept_all.message": "Elfogadni készülsz {count, plural, one {egy értesítési kérést} other {# értesítési kérést}}. Biztosan folytatod?",
+  "notification_requests.confirm_accept_all.title": "Értesítési kérés elfogadása?",
+  "notification_requests.confirm_dismiss_all.button": "Összes elutasítása",
+  "notification_requests.confirm_dismiss_all.message": "{count, plural, one {Egy értesítési kérés} other {# értesítési kérés}} elvetésére készülsz. Többé nem fogsz {count, plural, one {hozzáférni} other {hozzájuk férni}}. Biztosan folytatod?",
+  "notification_requests.confirm_dismiss_all.title": "Értesítési kérések elvetése?",
   "notification_requests.dismiss": "Elvetés",
+  "notification_requests.dismiss_all": "Összes elutasítása",
+  "notification_requests.dismiss_multiple": "{count, plural, one {# kérés elvetése} other {# kérés elvetése}}",
+  "notification_requests.enter_selection_mode": "Kiválasztás",
+  "notification_requests.exit_selection_mode": "Mégse",
+  "notification_requests.explainer_for_limited_account": "Az ettől a fióktól származó értesítéseket kiszűrték, mert a fiókot egy moderátor korlátozta.",
+  "notification_requests.explainer_for_limited_remote_account": "Az ettől a fióktól származó értesítéseket kiszűrték, mert a fiókot vagy annak kiszolgálóját egy moderátor korlátozta.",
   "notification_requests.maximize": "Maximalizálás",
   "notification_requests.minimize_banner": "Szűrt értesítések sávjának minimalizálása",
   "notification_requests.notifications_from": "{name} értesítései",
   "notification_requests.title": "Szűrt értesítések",
+  "notification_requests.view": "Értesítések megtekintése",
   "notifications.clear": "Értesítések törlése",
   "notifications.clear_confirmation": "Biztos, hogy véglegesen törölni akarod az összes értesítésed?",
   "notifications.clear_title": "Törlöd az értesítéseket?",
@@ -545,6 +572,14 @@
   "notifications.permission_denied": "Az asztali értesítések nem érhetők el a korábban elutasított böngészőengedély-kérelem miatt",
   "notifications.permission_denied_alert": "Az asztali értesítések nem engedélyezhetők a korábban elutasított böngésző engedély miatt",
   "notifications.permission_required": "Az asztali értesítések nem érhetőek el, mivel a szükséges engedély nem lett megadva.",
+  "notifications.policy.accept": "Elfogadás",
+  "notifications.policy.accept_hint": "Megjelenítés az értesítések között",
+  "notifications.policy.drop": "Figyelmen kívül hagyás",
+  "notifications.policy.drop_hint": "Küldés a semmibe, többé ne jelenjen meg",
+  "notifications.policy.filter": "Szűrő",
+  "notifications.policy.filter_hint": "Küldés a szűrt értesítések közé",
+  "notifications.policy.filter_limited_accounts_hint": "A szerver moderátorai által korlátozott",
+  "notifications.policy.filter_limited_accounts_title": "Moderált fiókok",
   "notifications.policy.filter_new_accounts.hint": "Az elmúlt {days, plural, one {napban} other {# napban}} létrehozva",
   "notifications.policy.filter_new_accounts_title": "Új fiókok",
   "notifications.policy.filter_not_followers_hint": "Beleértve azokat, akik kevesebb mint {days, plural, one {egy napja} other {# napja}} követnek",
@@ -553,7 +588,7 @@
   "notifications.policy.filter_not_following_title": "Nem követett emberek",
   "notifications.policy.filter_private_mentions_hint": "Kiszűrve, hacsak nem a saját említésedre válaszol, vagy ha nem követed a feladót",
   "notifications.policy.filter_private_mentions_title": "Kéretlen személyes említések",
-  "notifications.policy.title": "Feladó értesítéseinek kiszűrése…",
+  "notifications.policy.title": "Értesítések kezelése…",
   "notifications_permission_banner.enable": "Asztali értesítések engedélyezése",
   "notifications_permission_banner.how_to_control": "Ahhoz, hogy értesítéseket kapj akkor, amikor a Mastodon nincs megnyitva, engedélyezd az asztali értesítéseket. Pontosan be tudod állítani, hogy milyen interakciókról értesülj a fenti {icon} gombon keresztül, ha egyszer már engedélyezted őket.",
   "notifications_permission_banner.title": "Soha ne mulassz el semmit",
@@ -794,6 +829,7 @@
   "timeline_hint.remote_resource_not_displayed": "a más kiszolgálókról származó {resource} tartalmak nem jelennek meg.",
   "timeline_hint.resources.followers": "Követő",
   "timeline_hint.resources.follows": "Követett",
+  "timeline_hint.resources.replies": "Néhány válasz",
   "timeline_hint.resources.statuses": "Régi bejegyzések",
   "trends.counter_by_accounts": "{count, plural, one {{counter} ember} other {{counter} ember}} az elmúlt {days, plural,one {napban} other {{days} napban}}",
   "trends.trending_now": "Most felkapott",
diff --git a/app/javascript/mastodon/locales/hy.json b/app/javascript/mastodon/locales/hy.json
index c926e7b4f38586..98a40f56e8c7d2 100644
--- a/app/javascript/mastodon/locales/hy.json
+++ b/app/javascript/mastodon/locales/hy.json
@@ -319,7 +319,6 @@
   "notification.favourite": "{name}-ը հաւանել է քո գրառումը",
   "notification.follow": "{name} սկսեց հետեւել քեզ",
   "notification.follow_request": "{name} քեզ հետեւելու հայց է ուղարկել",
-  "notification.mention": "{name} նշեց քեզ",
   "notification.own_poll": "Հարցումդ աւարտուեց",
   "notification.reblog": "{name} տարածեց գրառումդ",
   "notification.status": "{name} հենց նոր գրառում արեց",
diff --git a/app/javascript/mastodon/locales/ia.json b/app/javascript/mastodon/locales/ia.json
index d775408b173222..3750fc82a8655a 100644
--- a/app/javascript/mastodon/locales/ia.json
+++ b/app/javascript/mastodon/locales/ia.json
@@ -475,7 +475,11 @@
   "notification.favourite": "{name} ha marcate tu message como favorite",
   "notification.follow": "{name} te ha sequite",
   "notification.follow_request": "{name} ha requestate de sequer te",
-  "notification.mention": "{name} te ha mentionate",
+  "notification.label.mention": "Mention",
+  "notification.label.private_mention": "Mention private",
+  "notification.label.private_reply": "Responsa private",
+  "notification.label.reply": "Responder",
+  "notification.mention": "Mention",
   "notification.moderation-warning.learn_more": "Apprender plus",
   "notification.moderation_warning": "Tu ha recipite un advertimento de moderation",
   "notification.moderation_warning.action_delete_statuses": "Alcunes de tu messages ha essite removite.",
@@ -542,7 +546,6 @@
   "notifications.policy.filter_not_following_title": "Personas que tu non seque",
   "notifications.policy.filter_private_mentions_hint": "Filtrate, excepte si es in responsa a tu proprie mention o si tu seque le expeditor",
   "notifications.policy.filter_private_mentions_title": "Mentiones private indesirate",
-  "notifications.policy.title": "Filtrar notificationes de…",
   "notifications_permission_banner.enable": "Activar notificationes de scriptorio",
   "notifications_permission_banner.how_to_control": "Pro reciper notificationes quando Mastodon non es aperte, activa le notificationes de scriptorio. Post lor activation, es possibile controlar precisemente qual typos de interaction genera notificationes de scriptorio per medio del button {icon} hic supra.",
   "notifications_permission_banner.title": "Non mancar jammais a un cosa",
diff --git a/app/javascript/mastodon/locales/id.json b/app/javascript/mastodon/locales/id.json
index db6e3efe5f4107..5c296cf4fe56bb 100644
--- a/app/javascript/mastodon/locales/id.json
+++ b/app/javascript/mastodon/locales/id.json
@@ -419,7 +419,6 @@
   "notification.admin.sign_up": "{name} mendaftar",
   "notification.follow": "{name} mengikuti Anda",
   "notification.follow_request": "{name} ingin mengikuti Anda",
-  "notification.mention": "{name} menyebut Anda",
   "notification.own_poll": "Japat Anda telah berakhir",
   "notification.reblog": "{name} mem-boost kiriman Anda",
   "notification.status": "{name} baru saja mengirim",
diff --git a/app/javascript/mastodon/locales/ie.json b/app/javascript/mastodon/locales/ie.json
index c5290d18b829e5..61a93a3e50c613 100644
--- a/app/javascript/mastodon/locales/ie.json
+++ b/app/javascript/mastodon/locales/ie.json
@@ -462,7 +462,6 @@
   "notification.favourite": "{name} favoritisat tui posta",
   "notification.follow": "{name} sequet te",
   "notification.follow_request": "{name} ha petit sequer te",
-  "notification.mention": "{name} mentionat te",
   "notification.moderation-warning.learn_more": "Aprender plu",
   "notification.moderation_warning": "Tu ha recivet un moderatori advertiment",
   "notification.moderation_warning.action_delete_statuses": "Alcun de tui postas ha esset efaciat.",
@@ -526,7 +525,6 @@
   "notifications.policy.filter_not_following_title": "Persones queles tu ne seque",
   "notifications.policy.filter_private_mentions_hint": "Filtrat except si it es un response a tui propri mention o si tu seque li missor",
   "notifications.policy.filter_private_mentions_title": "Ínsolicitat privat mentiones",
-  "notifications.policy.title": "Filtrar notificationes de…",
   "notifications_permission_banner.enable": "Activisar notificationes sur li computator",
   "notifications_permission_banner.how_to_control": "Por reciver notificationes quande Mastodon ne es apert, activisa notificationes sur li computator. Tu posse decider precisimen quel species de interactiones genera notificationes per li buton {icon} in-supra quande ili es activisat.",
   "notifications_permission_banner.title": "Nequande preterlassa quocunc",
diff --git a/app/javascript/mastodon/locales/io.json b/app/javascript/mastodon/locales/io.json
index 38ece266e6bddf..fa083522c8c506 100644
--- a/app/javascript/mastodon/locales/io.json
+++ b/app/javascript/mastodon/locales/io.json
@@ -396,7 +396,6 @@
   "notification.favourite": "{name} favorizis tua mesajo",
   "notification.follow": "{name} sequeskis tu",
   "notification.follow_request": "{name} demandas sequar vu",
-  "notification.mention": "{name} mencionis tu",
   "notification.own_poll": "Vua votposto finigis",
   "notification.reblog": "{name} repetis tua mesajo",
   "notification.status": "{name} nove postigis",
diff --git a/app/javascript/mastodon/locales/is.json b/app/javascript/mastodon/locales/is.json
index 47daa30fc4bcb3..d5c791e1c5b2f0 100644
--- a/app/javascript/mastodon/locales/is.json
+++ b/app/javascript/mastodon/locales/is.json
@@ -356,6 +356,17 @@
   "home.pending_critical_update.link": "Skoða uppfærslur",
   "home.pending_critical_update.title": "Áríðandi öryggisuppfærsla er tiltæk!",
   "home.show_announcements": "Birta auglýsingar",
+  "ignore_notifications_modal.disclaimer": "Mastodon getur ekki upplýst notendur um að þú hunsir tilkynningar frá þeim. Hunsun tilkynninga kemur ekki í veg fyrir að sjálf skilaboðin verði send.",
+  "ignore_notifications_modal.filter_instead": "Sía frekar",
+  "ignore_notifications_modal.filter_to_act_users": "Þú munt áfram geta samþykkt, hafnað eða kært notendur",
+  "ignore_notifications_modal.filter_to_avoid_confusion": "Síun hjálpar við að komast hjá mögulegum ruglingi",
+  "ignore_notifications_modal.filter_to_review_separately": "Þú getur skoðað síaðar tilkynningar sérstaklega",
+  "ignore_notifications_modal.ignore": "Hunsa tilkynningar",
+  "ignore_notifications_modal.limited_accounts_title": "Hunsa tilkynningar frá aðgöngum sem umsjón er höfð með?",
+  "ignore_notifications_modal.new_accounts_title": "Hunsa tilkynningar frá nýjum aðgöngum?",
+  "ignore_notifications_modal.not_followers_title": "Hunsa tilkynningar frá fólki sem fylgist ekki með þér?",
+  "ignore_notifications_modal.not_following_title": "Hunsa tilkynningar frá fólki sem þú fylgist ekki með?",
+  "ignore_notifications_modal.private_mentions_title": "Hunsa tilkynningar frá óumbeðnum tilvísunum í einkaspjalli?",
   "interaction_modal.description.favourite": "Með notandaaðgangi á Mastodon geturðu sett þessa færslu í eftirlæti og þannig látið höfundinn vita að þú kunnir að meta hana og vistað hana til síðari tíma.",
   "interaction_modal.description.follow": "Með notandaaðgangi á Mastodon geturðu fylgst með {name} og fengið færslur frá viðkomandi í heimastreymið þitt.",
   "interaction_modal.description.reblog": "Með notandaaðgangi á Mastodon geturðu endurbirt þessa færslu til að deila henni með þeim sem fylgjast með þér.",
@@ -482,7 +493,11 @@
   "notification.favourite": "{name} setti færsluna þína í eftirlæti",
   "notification.follow": "{name} fylgist með þér",
   "notification.follow_request": "{name} hefur beðið um að fylgjast með þér",
-  "notification.mention": "{name} minntist á þig",
+  "notification.label.mention": "Minnst á",
+  "notification.label.private_mention": "Einkaspjall",
+  "notification.label.private_reply": "Einkasvar",
+  "notification.label.reply": "Svara",
+  "notification.mention": "Minnst á",
   "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.",
@@ -494,7 +509,6 @@
   "notification.moderation_warning.action_suspend": "Notandaaðgangurinn þinn hefur verið settur í frysti.",
   "notification.own_poll": "Könnuninni þinni er lokið",
   "notification.poll": "Könnun sem þú greiddir atkvæði í er lokið",
-  "notification.private_mention": "{name} minntist á þig í einrúmi",
   "notification.reblog": "{name} endurbirti færsluna þína",
   "notification.relationships_severance_event": "Missti tengingar við {name}",
   "notification.relationships_severance_event.account_suspension": "Stjórnandi á {from} hefur fryst {target}, sem þýðir að þú færð ekki lengur skilaboð frá viðkomandi né átt í samskiptum við viðkomandi.",
@@ -504,11 +518,26 @@
   "notification.status": "{name} sendi inn rétt í þessu",
   "notification.update": "{name} breytti færslu",
   "notification_requests.accept": "Samþykkja",
+  "notification_requests.accept_all": "Samþykkja alla",
+  "notification_requests.accept_multiple": "{count, plural, one {Samþykkja # beiðni} other {Samþykkja # beiðnir}}",
+  "notification_requests.confirm_accept_all.button": "Samþykkja alla",
+  "notification_requests.confirm_accept_all.message": "Þú ert að fara að samþykkja {count, plural, one {eina beiðni um tilkynningar} other {# beiðnir um tilkynningar}}. Ertu viss um að þú viljir halda áfram?",
+  "notification_requests.confirm_accept_all.title": "Samþykkja beiðnir um tilkynningar?",
+  "notification_requests.confirm_dismiss_all.button": "Hunsa allt",
+  "notification_requests.confirm_dismiss_all.message": "Þú ert að fara að hunsa {count, plural, one {eina beiðni um tilkynningar} other {# beiðnir um tilkynningar}}. Þú munt ekki eiga auðvelt með að skoða {count, plural, one {hana} other {þær}} aftur síðar. Ertu viss um að þú viljir halda áfram?",
+  "notification_requests.confirm_dismiss_all.title": "Hunsa beiðnir um tilkynningar?",
   "notification_requests.dismiss": "Afgreiða",
+  "notification_requests.dismiss_all": "Hunsa allt",
+  "notification_requests.dismiss_multiple": "{count, plural, one {Afgreiða # beiðni} other {Afgreiða # beiðnir}}",
+  "notification_requests.enter_selection_mode": "Velja",
+  "notification_requests.exit_selection_mode": "Hætta við",
+  "notification_requests.explainer_for_limited_account": "Tilkynningar frá þessum notanda hafa verið síaðar þar sem aðgangur hans hefur verið takmarkaður af umsjónarmanni.",
+  "notification_requests.explainer_for_limited_remote_account": "Tilkynningar frá þessum notanda hafa verið síaðar þar sem aðgangurinn eða netþjónn hans hefur verið takmarkaður af umsjónarmanni.",
   "notification_requests.maximize": "Hámarka",
   "notification_requests.minimize_banner": "Minnka borða með síuðum tilkynningum",
   "notification_requests.notifications_from": "Tilkynningar frá {name}",
   "notification_requests.title": "Síaðar tilkynningar",
+  "notification_requests.view": "Skoða tilkynningar",
   "notifications.clear": "Hreinsa tilkynningar",
   "notifications.clear_confirmation": "Ertu viss um að þú viljir endanlega eyða öllum tilkynningunum þínum?",
   "notifications.clear_title": "Hreinsa tilkynningar?",
@@ -545,6 +574,14 @@
   "notifications.permission_denied": "Tilkynningar á skjáborði eru ekki aðgengilegar megna áður hafnaðra beiðna fyrir vafra",
   "notifications.permission_denied_alert": "Ekki var hægt að virkja tilkynningar á skjáborði, þar sem heimildum fyrir vafra var áður hafnað",
   "notifications.permission_required": "Tilkynningar á skjáborði eru ekki aðgengilegar þar sem nauðsynlegar heimildir hafa ekki verið veittar.",
+  "notifications.policy.accept": "Samþykkja",
+  "notifications.policy.accept_hint": "Birta í tilkynningum",
+  "notifications.policy.drop": "Hunsa",
+  "notifications.policy.drop_hint": "Senda út í tómið, svo það sjáist aldrei framar",
+  "notifications.policy.filter": "Sía",
+  "notifications.policy.filter_hint": "Senda í pósthólf fyrir síaðar tilkynningar",
+  "notifications.policy.filter_limited_accounts_hint": "Takmarkað af umsjónarmönnum netþjóns",
+  "notifications.policy.filter_limited_accounts_title": "Aðgangar í umsjón",
   "notifications.policy.filter_new_accounts.hint": "Útbúið {days, plural, one {síðasta daginn} other {síðustu # daga}}",
   "notifications.policy.filter_new_accounts_title": "Nýir notendur",
   "notifications.policy.filter_not_followers_hint": "Þar með talið fólk sem hefur fylgst með þér í minna en {days, plural, one {einn dag} other {# daga}}",
@@ -553,7 +590,7 @@
   "notifications.policy.filter_not_following_title": "Fólk sem þú fylgist ekki með",
   "notifications.policy.filter_private_mentions_hint": "Síað nema það sé í svari við einhverju þar sem þú minntist á viðkomandi eða ef þú fylgist með sendandanum",
   "notifications.policy.filter_private_mentions_title": "Óumbeðið einkaspjall",
-  "notifications.policy.title": "Sía út tilkynningar frá…",
+  "notifications.policy.title": "Sýsla með tilkynningar frá…",
   "notifications_permission_banner.enable": "Virkja tilkynningar á skjáborði",
   "notifications_permission_banner.how_to_control": "Til að taka á móti tilkynningum þegar Mastodon er ekki opið, skaltu virkja tilkynningar á skjáborði. Þegar þær eru orðnar virkar geturðu stýrt nákvæmlega hverskonar atvik framleiða tilkynningar með því að nota {icon}-hnappinn hér fyrir ofan.",
   "notifications_permission_banner.title": "Aldrei missa af neinu",
@@ -794,6 +831,7 @@
   "timeline_hint.remote_resource_not_displayed": "{resource} frá öðrum netþjónum er ekki birt.",
   "timeline_hint.resources.followers": "Fylgjendur",
   "timeline_hint.resources.follows": "Fylgist með",
+  "timeline_hint.resources.replies": "Sum svör",
   "timeline_hint.resources.statuses": "Eldri færslur",
   "trends.counter_by_accounts": "{count, plural, one {{counter} aðili} other {{counter} manns}} {days, plural, one {síðasta sólarhringinn} other {síðustu {days} daga}}",
   "trends.trending_now": "Vinsælt núna",
diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json
index 3d9df8a234e3db..c3cbbb9cf04789 100644
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@@ -356,6 +356,15 @@
   "home.pending_critical_update.link": "Visualizza aggiornamenti",
   "home.pending_critical_update.title": "Aggiornamento critico di sicurezza disponibile!",
   "home.show_announcements": "Mostra annunci",
+  "ignore_notifications_modal.disclaimer": "Mastodon non può informare gli utenti che hai ignorato le loro notifiche. Ignorare le notifiche non impedirà l'invio dei messaggi stessi.",
+  "ignore_notifications_modal.filter_instead": "Filtra invece",
+  "ignore_notifications_modal.filter_to_avoid_confusion": "Il filtraggio aiuta a evitare potenziali confusioni",
+  "ignore_notifications_modal.ignore": "Ignora le notifiche",
+  "ignore_notifications_modal.limited_accounts_title": "Ignorare le notifiche dagli account moderati?",
+  "ignore_notifications_modal.new_accounts_title": "Ignorare le notifiche dai nuovi account?",
+  "ignore_notifications_modal.not_followers_title": "Ignorare le notifiche delle persone che non ti seguono?",
+  "ignore_notifications_modal.not_following_title": "Ignorare le notifiche delle persone che non segui?",
+  "ignore_notifications_modal.private_mentions_title": "Ignorare le notifiche provenienti da menzioni private indesiderate?",
   "interaction_modal.description.favourite": "Con un account su Mastodon, puoi aggiungere questo post ai preferiti per far sapere all'autore che lo apprezzi e salvarlo per dopo.",
   "interaction_modal.description.follow": "Con un profilo di Mastodon, puoi seguire {name} per ricevere i suoi post nel feed della tua home.",
   "interaction_modal.description.reblog": "Con un profilo di Mastodon, puoi rebloggare questo post per condividerlo con i tuoi seguaci.",
@@ -482,7 +491,11 @@
   "notification.favourite": "{name} ha aggiunto il tuo post ai preferiti",
   "notification.follow": "{name} ha iniziato a seguirti",
   "notification.follow_request": "{name} ha richiesto di seguirti",
-  "notification.mention": "{name} ti ha menzionato",
+  "notification.label.mention": "Menziona",
+  "notification.label.private_mention": "Menzione privata",
+  "notification.label.private_reply": "Rispondi in privato",
+  "notification.label.reply": "Rispondi",
+  "notification.mention": "Menziona",
   "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.",
@@ -494,7 +507,6 @@
   "notification.moderation_warning.action_suspend": "Il tuo account è stato sospeso.",
   "notification.own_poll": "Il tuo sondaggio è terminato",
   "notification.poll": "Un sondaggio in cui hai votato è terminato",
-  "notification.private_mention": "{name} ti ha citato privatamente",
   "notification.reblog": "{name} ha rebloggato il tuo post",
   "notification.relationships_severance_event": "Connessioni perse con {name}",
   "notification.relationships_severance_event.account_suspension": "Un amministratore da {from} ha sospeso {target}, il che significa che non puoi più ricevere aggiornamenti da loro o interagire con loro.",
@@ -504,11 +516,26 @@
   "notification.status": "{name} ha appena pubblicato un post",
   "notification.update": "{name} ha modificato un post",
   "notification_requests.accept": "Accetta",
+  "notification_requests.accept_all": "Accetta tutte",
+  "notification_requests.accept_multiple": "{count, plural,one {Accetta # richiesta} other {Accetta # richieste}}",
+  "notification_requests.confirm_accept_all.button": "Accetta tutte",
+  "notification_requests.confirm_accept_all.message": "Stai per accettare {count, plural, one {una richiesta di notifica} other {# richieste di notifica}}. Si è sicuri di voler procedere?",
+  "notification_requests.confirm_accept_all.title": "Accettare le richieste di notifica?",
+  "notification_requests.confirm_dismiss_all.button": "Ignora tutte",
+  "notification_requests.confirm_dismiss_all.message": "Stai per ignorare {count, plural, one {una richiesta di notifica} other {# richieste di notifica}}. Non sarai più in grado di accedere facilmente {count, plural, one {ad essa} other {ad esse}} nuovamente. Si è sicuri di voler procedere?",
+  "notification_requests.confirm_dismiss_all.title": "Ignorare le richieste di notifica?",
   "notification_requests.dismiss": "Ignora",
+  "notification_requests.dismiss_all": "Ignora tutte",
+  "notification_requests.dismiss_multiple": "{count, plural, one {Ignora # richiesta} other {Ignora # richieste}}",
+  "notification_requests.enter_selection_mode": "Seleziona",
+  "notification_requests.exit_selection_mode": "Annulla",
+  "notification_requests.explainer_for_limited_account": "Le notifiche provenienti da questo account sono state filtrate perché l'account è stato limitato da un moderatore.",
+  "notification_requests.explainer_for_limited_remote_account": "Le notifiche provenienti da questo account sono state filtrate perché l'account o il suo server sono stati limitati da un moderatore.",
   "notification_requests.maximize": "Ingrandisci",
   "notification_requests.minimize_banner": "Minimizza il banner delle notifiche filtrate",
   "notification_requests.notifications_from": "Notifiche da {name}",
   "notification_requests.title": "Notifiche filtrate",
+  "notification_requests.view": "Visualizza le notifiche",
   "notifications.clear": "Cancella le notifiche",
   "notifications.clear_confirmation": "Sei sicuro di voler cancellare permanentemente tutte le tue notifiche?",
   "notifications.clear_title": "Cancellare le notifiche?",
@@ -545,6 +572,12 @@
   "notifications.permission_denied": "Notifiche desktop non disponibili a causa della precedentemente negata richiesta di autorizzazioni del browser",
   "notifications.permission_denied_alert": "Impossibile abilitare le notifiche desktop, poiché l'autorizzazione del browser è stata precedentemente negata",
   "notifications.permission_required": "Notifiche destkop non disponibili poiché l'autorizzazione richiesta non è stata concessa.",
+  "notifications.policy.accept": "Accetta",
+  "notifications.policy.accept_hint": "Mostra nelle notifiche",
+  "notifications.policy.drop": "Ignora",
+  "notifications.policy.filter_hint": "Invia alla casella in arrivo delle notifiche filtrate",
+  "notifications.policy.filter_limited_accounts_hint": "Limitato dai moderatori del server",
+  "notifications.policy.filter_limited_accounts_title": "Account moderati",
   "notifications.policy.filter_new_accounts.hint": "Creato {days, plural, one {un giorno} other {# giorni}} fa",
   "notifications.policy.filter_new_accounts_title": "Nuovi account",
   "notifications.policy.filter_not_followers_hint": "Incluse le persone che ti seguono da meno di {days, plural, one {un giorno} other {# giorni}}",
@@ -553,7 +586,7 @@
   "notifications.policy.filter_not_following_title": "Persone che non segui",
   "notifications.policy.filter_private_mentions_hint": "Filtrate, a meno che non sia in risposta alla tua menzione o se segui il mittente",
   "notifications.policy.filter_private_mentions_title": "Menzioni private indesiderate",
-  "notifications.policy.title": "Filtra le notifiche da…",
+  "notifications.policy.title": "Gestisci le notifiche da…",
   "notifications_permission_banner.enable": "Abilita le notifiche desktop",
   "notifications_permission_banner.how_to_control": "Per ricevere le notifiche quando Mastodon non è aperto, abilita le notifiche desktop. Puoi controllare precisamente quali tipi di interazioni generano le notifiche destkop, tramite il pulsante {icon} sopra, una volta abilitate.",
   "notifications_permission_banner.title": "Non perderti mai nulla",
@@ -794,6 +827,7 @@
   "timeline_hint.remote_resource_not_displayed": "{resource} da altri server non sono mostrati.",
   "timeline_hint.resources.followers": "Seguaci",
   "timeline_hint.resources.follows": "Segue",
+  "timeline_hint.resources.replies": "Alcune risposte",
   "timeline_hint.resources.statuses": "Post meno recenti",
   "trends.counter_by_accounts": "{count, plural, one {{count} persona} other {{count} persone}} {days, plural, one {nell'ultimo giorno} other {negli ultimi {days} giorni}}",
   "trends.trending_now": "Ora in tendenza",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index 97f64b179e4fd0..610a71ef563b52 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -437,6 +437,8 @@
   "mute_modal.title": "ユーザーをミュートしますか？",
   "mute_modal.you_wont_see_mentions": "宛先に相手が入っている投稿も閲覧できなくなります。",
   "mute_modal.you_wont_see_posts": "相手はあなたの投稿を今までどおり閲覧できますが、あなたは相手の投稿を閲覧できなくなります。",
+  "name_and_others": "{count, plural, other {#人のユーザー}}と{name}",
+  "name_and_others_with_link": "<a>{count, plural, other {#人のユーザー}}</a>と{name}",
   "navigation_bar.about": "概要",
   "navigation_bar.advanced_interface": "上級者向けUIに戻る",
   "navigation_bar.blocks": "ブロックしたユーザー",
@@ -464,11 +466,14 @@
   "navigation_bar.security": "セキュリティ",
   "not_signed_in_indicator.not_signed_in": "この機能を使うにはログインする必要があります。",
   "notification.admin.report": "{name}さんが{target}さんを通報しました",
+  "notification.admin.report_account": "{name}さんが{target}さんの投稿{count, plural, other {#件}}を「{category}」として通報しました",
+  "notification.admin.report_account_other": "{name}さんが{target}さんの投稿{count, plural, other {#件}}を通報しました",
+  "notification.admin.report_statuses": "{name}さんが{target}さんを「{category}」として通報しました",
+  "notification.admin.report_statuses_other": "{name}さんが{target}さんを通報しました",
   "notification.admin.sign_up": "{name}さんがサインアップしました",
   "notification.favourite": "{name}さんがお気に入りしました",
   "notification.follow": "{name}さんにフォローされました",
   "notification.follow_request": "{name}さんがあなたにフォローリクエストしました",
-  "notification.mention": "{name}さんがあなたに返信しました",
   "notification.moderation-warning.learn_more": "さらに詳しく",
   "notification.moderation_warning": "管理者から警告が来ています",
   "notification.moderation_warning.action_delete_statuses": "あなたによるいくつかの投稿が削除されました。",
@@ -479,6 +484,7 @@
   "notification.moderation_warning.action_silence": "あなたのアカウントは制限されています。",
   "notification.moderation_warning.action_suspend": "あなたのアカウントは停止されました。",
   "notification.own_poll": "アンケートが終了しました",
+  "notification.poll": "投票したアンケートが終了しました",
   "notification.reblog": "{name}さんがあなたの投稿をブーストしました",
   "notification.relationships_severance_event": "{name} との関係が失われました",
   "notification.relationships_severance_event.account_suspension": "{from} の管理者が {target} さんを停止したため、今後このユーザーとの交流や新しい投稿の受け取りができなくなりました。",
@@ -535,7 +541,6 @@
   "notifications.policy.filter_not_following_title": "フォローしていないアカウントからの通知をブロックする",
   "notifications.policy.filter_private_mentions_hint": "あなたがメンションした相手からの返信、およびフォローしているアカウントからの返信以外がブロックされます",
   "notifications.policy.filter_private_mentions_title": "外部からの非公開の返信をブロックする",
-  "notifications.policy.title": "通知のフィルタリング",
   "notifications_permission_banner.enable": "デスクトップ通知を有効にする",
   "notifications_permission_banner.how_to_control": "Mastodonを閉じている間でも通知を受信するにはデスクトップ通知を有効にしてください。有効にすると上の {icon} ボタンから通知の内容を細かくカスタマイズできます。",
   "notifications_permission_banner.title": "お見逃しなく",
@@ -662,9 +667,13 @@
   "report.unfollow_explanation": "このアカウントをフォローしています。ホームフィードに彼らの投稿を表示しないようにするには、彼らのフォローを外してください。",
   "report_notification.attached_statuses": "{count, plural, one {{count}件の投稿} other {{count}件の投稿}}が添付されました。",
   "report_notification.categories.legal": "法令違反",
+  "report_notification.categories.legal_sentence": "法令違反",
   "report_notification.categories.other": "その他",
+  "report_notification.categories.other_sentence": "その他",
   "report_notification.categories.spam": "スパム",
+  "report_notification.categories.spam_sentence": "スパム",
   "report_notification.categories.violation": "ルール違反",
+  "report_notification.categories.violation_sentence": "ルール違反",
   "report_notification.open": "通報を開く",
   "search.no_recent_searches": "検索履歴はありません",
   "search.placeholder": "検索",
diff --git a/app/javascript/mastodon/locales/ka.json b/app/javascript/mastodon/locales/ka.json
index a54998e92ba83e..edb19c1d3a912f 100644
--- a/app/javascript/mastodon/locales/ka.json
+++ b/app/javascript/mastodon/locales/ka.json
@@ -171,7 +171,6 @@
   "navigation_bar.security": "უსაფრთხოება",
   "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
   "notification.follow": "{name} გამოგყვათ",
-  "notification.mention": "{name}-მა გასახელათ",
   "notification.reblog": "{name}-მა დაბუსტა თქვენი სტატუსი",
   "notifications.clear": "შეტყობინებების გასუფთავება",
   "notifications.clear_confirmation": "დარწმუნებული ხართ, გსურთ სამუდამოდ წაშალოთ ყველა თქვენი შეტყობინება?",
diff --git a/app/javascript/mastodon/locales/kab.json b/app/javascript/mastodon/locales/kab.json
index 0cf2fbcdb49ed7..8d4f128e9a400e 100644
--- a/app/javascript/mastodon/locales/kab.json
+++ b/app/javascript/mastodon/locales/kab.json
@@ -289,8 +289,8 @@
   "interaction_modal.sign_in_hint": "Ihi : Wa d asmel ideg tjerdeḍ. Ma ur tecfiḍ ara, nadi imayl n ummager deg tenkult-ik·im. Tzemreḍ daɣen ad d-tefkeḍ isem-ik·im n useqdac ummid ! (amedya @Mastodon@mastodon.social)",
   "interaction_modal.title.follow": "Ḍfer {name}",
   "interaction_modal.title.reply": "Tiririt i tsuffeɣt n {name}",
-  "intervals.full.days": "{number, plural, one {# n wass} other {# n wussan}}",
-  "intervals.full.hours": "{number, plural, one {# n usarag} other {# n yesragen}}",
+  "intervals.full.days": "{number, plural, one {# wass} other {# wussan}}",
+  "intervals.full.hours": "{number, plural, one {# usarag} other {# yisragen}}",
   "intervals.full.minutes": "{number, plural, one {# n tesdat} other {# n tesdatin}}",
   "keyboard_shortcuts.back": "i tuɣalin ɣer deffir",
   "keyboard_shortcuts.blocked": "akken ad teldiḍ umuɣ n yimseqdacen yettwasḥebsen",
@@ -391,7 +391,6 @@
   "notification.favourite": "{name} yesmenyaf addad-ik·im",
   "notification.follow": "iṭṭafar-ik·em-id {name}",
   "notification.follow_request": "{name} yessuter-d ad k·m-yeḍfeṛ",
-  "notification.mention": "{name} yebder-ik-id",
   "notification.moderation-warning.learn_more": "Issin ugar",
   "notification.moderation_warning.action_suspend": "Yettwaseḥbes umiḍan-ik.",
   "notification.own_poll": "Tafrant-ik·im tfuk",
@@ -433,12 +432,11 @@
   "notifications.permission_denied": "D awezɣi ad yili wermad n walɣuten n tnarit axateṛ turagt tettwagdel",
   "notifications.policy.filter_new_accounts.hint": "Imiḍanen imaynuten i d-yennulfan deg {days, plural, one {yiwen n wass} other {# n wussan}} yezrin",
   "notifications.policy.filter_new_accounts_title": "Imiḍan imaynuten",
-  "notifications.policy.filter_not_followers_hint": "Ula d wid akked tid i k·m-id-iḍefren, ur wwiḍen ara {days, plural, one {yiwen n wass} other {# n wussan}}",
+  "notifications.policy.filter_not_followers_hint": "Ula d wid akked tid i k·m-id-iḍefren, ur wwiḍen ara {days, plural, one {yiwen wass} other {# wussan}}",
   "notifications.policy.filter_not_followers_title": "Wid akked tid ur k·m-id-yeṭṭafaren ara",
   "notifications.policy.filter_not_following_hint": "Alamma tqebleḍ-ten s ufus",
   "notifications.policy.filter_not_following_title": "Wid akked tid ur tettḍafareḍ ara",
   "notifications.policy.filter_private_mentions_title": "Abdar uslig ur yettwasferken ara",
-  "notifications.policy.title": "Sizdeg alɣuten sɣur …",
   "notifications_permission_banner.enable": "Rmed alɣuten n tnarit",
   "notifications_permission_banner.title": "Ur zeggel acemma",
   "onboarding.action.back": "Tuɣalin ɣer deffir",
@@ -509,6 +507,7 @@
   "report.categories.other": "Tiyyaḍ",
   "report.categories.spam": "Aspam",
   "report.category.subtitle": "Fren amṣada akk ufrin",
+  "report.category.title": "Ini-aɣ-d d acu i yuɣen {type}-a",
   "report.category.title_account": "ameɣnu",
   "report.category.title_status": "tasuffeɣt",
   "report.close": "Immed",
@@ -622,8 +621,8 @@
   "subscribed_languages.save": "Sekles ibeddilen",
   "tabs_bar.home": "Agejdan",
   "tabs_bar.notifications": "Alɣuten",
-  "time_remaining.days": "Mazal {number, plural, one {# n wass} other {# n wussan}}",
-  "time_remaining.hours": "Mazal {number, plural, one {# n usrag} other {# n yesragen}}",
+  "time_remaining.days": "Mazal {number, plural, one {# wass} other {# wussan}}",
+  "time_remaining.hours": "Mazal {number, plural, one {# usarag} other {# yisragen}}",
   "time_remaining.minutes": "Mazal {number, plural, one {# n tesdat} other {# n tesdatin}}",
   "time_remaining.moments": "Akuden i d-yeqqimen",
   "time_remaining.seconds": "Mazal {number, plural, one {# n tasint} other {# n tsinin}} id yugran",
@@ -631,7 +630,7 @@
   "timeline_hint.resources.followers": "Imeḍfaṛen",
   "timeline_hint.resources.follows": "T·Yeṭafaṛ",
   "timeline_hint.resources.statuses": "Tisuffaɣ tiqdimin",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} n wemdan} other {{counter} n medden}} deg {days, plural, one {ass} other {{days} n wussan}} iɛeddan",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} wemdan} other {{counter} medden}} deg {days, plural, one {ass} other {{days} wussan}} iɛeddan",
   "trends.trending_now": "Ayen mucaɛen tura",
   "ui.beforeunload": "Arewway-ik·im ad iruḥ ma yella tefeɣ-d deg Maṣṭudun.",
   "units.short.billion": "{count}B",
diff --git a/app/javascript/mastodon/locales/kk.json b/app/javascript/mastodon/locales/kk.json
index c530ce8f6a6fa5..2eed22e0edf6ec 100644
--- a/app/javascript/mastodon/locales/kk.json
+++ b/app/javascript/mastodon/locales/kk.json
@@ -244,7 +244,6 @@
   "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
   "notification.follow": "{name} сізге жазылды",
   "notification.follow_request": "{name} сізге жазылғысы келеді",
-  "notification.mention": "{name} сізді атап өтті",
   "notification.own_poll": "Сауалнама аяқталды",
   "notification.reblog": "{name} жазбаңызды бөлісті",
   "notifications.clear": "Ескертпелерді тазарт",
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index 56d0dda7ec9c16..6cf8f67d3e776c 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -482,7 +482,6 @@
   "notification.favourite": "{name} 님이 내 게시물을 좋아합니다",
   "notification.follow": "{name} 님이 나를 팔로우했습니다",
   "notification.follow_request": "{name} 님이 팔로우 요청을 보냈습니다",
-  "notification.mention": "{name} 님의 멘션",
   "notification.moderation-warning.learn_more": "더 알아보기",
   "notification.moderation_warning": "중재 경고를 받았습니다",
   "notification.moderation_warning.action_delete_statuses": "게시물 몇 개가 삭제되었습니다.",
@@ -494,7 +493,6 @@
   "notification.moderation_warning.action_suspend": "계정이 정지되었습니다.",
   "notification.own_poll": "설문을 마침",
   "notification.poll": "참여한 투표가 끝났습니다",
-  "notification.private_mention": "{name} 님이 나를 개인적으로 멘션했습니다",
   "notification.reblog": "{name} 님이 부스트했습니다",
   "notification.relationships_severance_event": "{name} 님과의 연결이 끊어졌습니다",
   "notification.relationships_severance_event.account_suspension": "{from}의 관리자가 {target}를 정지시켰기 때문에 그들과 더이상 상호작용 할 수 없고 정보를 받아볼 수 없습니다.",
@@ -555,7 +553,6 @@
   "notifications.policy.filter_not_following_title": "내가 팔로우하지 않는 사람들",
   "notifications.policy.filter_private_mentions_hint": "내가 한 멘션에 단 답글이거나 내가 발신자를 팔로우 한 것이 아닌 이상 걸러집니다",
   "notifications.policy.filter_private_mentions_title": "청하지 않은 개인적인 멘션",
-  "notifications.policy.title": "알림을 제외할 조건들…",
   "notifications_permission_banner.enable": "데스크탑 알림 활성화",
   "notifications_permission_banner.how_to_control": "마스토돈이 열려 있지 않을 때에도 알림을 받으려면, 데스크탑 알림을 활성화 하세요. 당신은 어떤 종류의 반응이 데스크탑 알림을 발생할 지를 {icon} 버튼을 통해 세세하게 설정할 수 있습니다.",
   "notifications_permission_banner.title": "아무것도 놓치지 마세요",
diff --git a/app/javascript/mastodon/locales/ku.json b/app/javascript/mastodon/locales/ku.json
index a4a6bfc58c333e..c8188743897931 100644
--- a/app/javascript/mastodon/locales/ku.json
+++ b/app/javascript/mastodon/locales/ku.json
@@ -343,7 +343,6 @@
   "notification.admin.sign_up": "{name} tomar bû",
   "notification.follow": "{name} te şopand",
   "notification.follow_request": "{name} dixwazê te bişopîne",
-  "notification.mention": "{name} qale te kir",
   "notification.own_poll": "Rapirsîya te qediya",
   "notification.reblog": "{name} şandiya te bilind kir",
   "notification.status": "{name} niha şand",
diff --git a/app/javascript/mastodon/locales/kw.json b/app/javascript/mastodon/locales/kw.json
index 657688a0bbc3c4..ae1d1047bf132f 100644
--- a/app/javascript/mastodon/locales/kw.json
+++ b/app/javascript/mastodon/locales/kw.json
@@ -235,7 +235,6 @@
   "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
   "notification.follow": "{name} a wrug agas holya",
   "notification.follow_request": "{name} a bysis agas holya",
-  "notification.mention": "{name} a wrug agas meneges",
   "notification.own_poll": "Agas sondyans a worfennas",
   "notification.reblog": "{name} a generthas agas post",
   "notification.status": "{name} a wrug nowydh postya",
diff --git a/app/javascript/mastodon/locales/la.json b/app/javascript/mastodon/locales/la.json
index 81cc9cd99838eb..8a2512722e1921 100644
--- a/app/javascript/mastodon/locales/la.json
+++ b/app/javascript/mastodon/locales/la.json
@@ -140,7 +140,6 @@
   "notification.favourite": "{name} nuntium tuum favit",
   "notification.follow": "{name} te secutus est",
   "notification.follow_request": "{name} postulavit ut te sequeretur",
-  "notification.mention": "{name} memoravi",
   "notification.moderation_warning": "Accepistī monitionem moderationis.",
   "notification.moderation_warning.action_disable": "Ratio tua debilitata est.",
   "notification.moderation_warning.action_none": "Tua ratiō monitum moderātiōnis accēpit.",
diff --git a/app/javascript/mastodon/locales/lad.json b/app/javascript/mastodon/locales/lad.json
index 8da6cdecea065b..f4954ed3a9f275 100644
--- a/app/javascript/mastodon/locales/lad.json
+++ b/app/javascript/mastodon/locales/lad.json
@@ -449,7 +449,6 @@
   "notification.favourite": "A {name} le plaze tu publikasyon",
   "notification.follow": "{name} te ampeso a segir",
   "notification.follow_request": "{name} tiene solisitado segirte",
-  "notification.mention": "{name} te enmento",
   "notification.moderation-warning.learn_more": "Ambezate mas",
   "notification.moderation_warning.action_disable": "Tu kuento tiene sido inkapasitado.",
   "notification.moderation_warning.action_mark_statuses_as_sensitive": "Algunas de tus publikasyones tienen sido markadas komo sensivles.",
@@ -506,7 +505,6 @@
   "notifications.policy.filter_not_following_hint": "Asta ke las aproves manualmente",
   "notifications.policy.filter_not_following_title": "Personas ke no siges",
   "notifications.policy.filter_private_mentions_title": "Enmentaduras privadas no solisitadas",
-  "notifications.policy.title": "Filtra avizos de…",
   "notifications_permission_banner.enable": "Kapasita avizos de ensimameza",
   "notifications_permission_banner.how_to_control": "Para risivir avizos kuando Mastodon no esta avierto, kapasita avizos de ensimameza. Puedes kontrolar presizamente kualos tipos de enteraksiones djeneren avizos de ensimameza kon el boton {icon} arriva kuando esten kapasitadas.",
   "notifications_permission_banner.title": "Nunkua te piedres niente",
diff --git a/app/javascript/mastodon/locales/lt.json b/app/javascript/mastodon/locales/lt.json
index e2a7e947eb6388..45359a40a707ee 100644
--- a/app/javascript/mastodon/locales/lt.json
+++ b/app/javascript/mastodon/locales/lt.json
@@ -300,6 +300,7 @@
   "filter_modal.select_filter.subtitle": "Naudok esamą kategoriją arba sukurk naują.",
   "filter_modal.select_filter.title": "Filtruoti šį įrašą",
   "filter_modal.title.status": "Filtruoti įrašą",
+  "filtered_notifications_banner.pending_requests": "Iš {count, plural, =0 {nė vieno} one {žmogaus} few {# žmonių} many {# žmonių} other {# žmonių}}, kuriuos galbūt pažįsti",
   "filtered_notifications_banner.title": "Filtruojami pranešimai",
   "firehose.all": "Visi",
   "firehose.local": "Šis serveris",
@@ -355,6 +356,15 @@
   "home.pending_critical_update.link": "Žiūrėti naujinimus",
   "home.pending_critical_update.title": "Galimas kritinis saugumo naujinimas.",
   "home.show_announcements": "Rodyti skelbimus",
+  "ignore_notifications_modal.disclaimer": "„Mastodon“ negali informuoti naudotojų, kad ignoravai jų pranešimus. Ignoravus pranešimus, pačių pranešimų siuntimas nebus sustabdytas.",
+  "ignore_notifications_modal.filter_instead": "Filtruoti vietoj to",
+  "ignore_notifications_modal.filter_to_avoid_confusion": "Filtravimas padeda išvengti galimos painiavos.",
+  "ignore_notifications_modal.ignore": "Ignoruoti pranešimus",
+  "ignore_notifications_modal.limited_accounts_title": "Ignoruoti pranešimus iš prižiūrėmų paskyrų?",
+  "ignore_notifications_modal.new_accounts_title": "Ignoruoti pranešimus iš naujų paskyrų?",
+  "ignore_notifications_modal.not_followers_title": "Ignoruoti pranešimus iš žmonių, kurie tave neseka?",
+  "ignore_notifications_modal.not_following_title": "Ignoruoti pranešimus iš žmonių, kuriuos neseki?",
+  "ignore_notifications_modal.private_mentions_title": "Ignoruoti pranešimus iš neprašytų privačių paminėjimų?",
   "interaction_modal.description.favourite": "Su Mastodon paskyra gali pamėgti šį įrašą, kad autorius (-ė) žinotų, jog vertinti tai ir išsaugoti jį vėliau.",
   "interaction_modal.description.follow": "Su Mastodon paskyra gali sekti {name}, kad gautum jų įrašus į pagrindinį srautą.",
   "interaction_modal.description.reblog": "Su Mastodon paskyra gali pakelti šią įrašą ir pasidalyti juo su savo sekėjais.",
@@ -481,7 +491,11 @@
   "notification.favourite": "{name} pamėgo tavo įrašą",
   "notification.follow": "{name} seka tave",
   "notification.follow_request": "{name} paprašė tave sekti",
-  "notification.mention": "{name} paminėjo tave",
+  "notification.label.mention": "Paminėjimas",
+  "notification.label.private_mention": "Privatus paminėjimas",
+  "notification.label.private_reply": "Privatus atsakymas",
+  "notification.label.reply": "Atsakymas",
+  "notification.mention": "Paminėjimas",
   "notification.moderation-warning.learn_more": "Sužinoti daugiau",
   "notification.moderation_warning": "Gavai prižiūrėjimo įspėjimą",
   "notification.moderation_warning.action_delete_statuses": "Kai kurie tavo įrašai buvo pašalintos.",
@@ -493,7 +507,6 @@
   "notification.moderation_warning.action_suspend": "Tavo paskyra buvo sustabdyta.",
   "notification.own_poll": "Tavo apklausa baigėsi",
   "notification.poll": "Baigėsi apklausa, kurioje balsavai",
-  "notification.private_mention": "{name} privačiai paminėjo tave",
   "notification.reblog": "{name} pakėlė tavo įrašą",
   "notification.relationships_severance_event": "Prarasti sąryšiai su {name}",
   "notification.relationships_severance_event.learn_more": "Sužinoti daugiau",
@@ -502,6 +515,10 @@
   "notification.update": "{name} redagavo įrašą",
   "notification_requests.accept": "Priimti",
   "notification_requests.dismiss": "Atmesti",
+  "notification_requests.explainer_for_limited_account": "Pranešimai iš šios paskyros buvo filtruojami, nes prižiūrėtojas (-a) apribojo paskyrą.",
+  "notification_requests.explainer_for_limited_remote_account": "Pranešimai iš šios paskyros buvo filtruojami, nes prižiūrėtojas (-a) apribojo paskyrą arba serverį.",
+  "notification_requests.maximize": "Padidinti",
+  "notification_requests.minimize_banner": "Mažinti filtruotų pranešimų reklamjuostę",
   "notification_requests.notifications_from": "Pranešimai iš {name}",
   "notification_requests.title": "Filtruojami pranešimai",
   "notifications.clear": "Išvalyti pranešimus",
@@ -540,12 +557,20 @@
   "notifications.permission_denied": "Darbalaukio pranešimai nepasiekiami dėl anksčiau atmestos naršyklės leidimų užklausos.",
   "notifications.permission_denied_alert": "Negalima įjungti darbalaukio pranešimų, nes prieš tai naršyklės leidimas buvo atmestas.",
   "notifications.permission_required": "Darbalaukio pranešimai nepasiekiami, nes nebuvo suteiktas reikiamas leidimas.",
+  "notifications.policy.accept": "Priimti",
+  "notifications.policy.accept_hint": "Rodyti pranešimuose",
+  "notifications.policy.drop": "Ignoruoti",
+  "notifications.policy.drop_hint": "Siųsti į tuštumą, kad daugiau niekada nebepasirodytų",
+  "notifications.policy.filter": "Filtruoti",
+  "notifications.policy.filter_hint": "Siųsti į filtruotų pranešimų gautiejus",
+  "notifications.policy.filter_limited_accounts_hint": "Apribota serverio prižiūrėtojų",
+  "notifications.policy.filter_limited_accounts_title": "Prižiūrėmi paskyrai",
   "notifications.policy.filter_new_accounts.hint": "Sukurta per {days, plural, one {vieną dieną} few {# dienas} many {# dienos} other {# dienų}}",
   "notifications.policy.filter_new_accounts_title": "Naujos paskyros",
   "notifications.policy.filter_not_following_hint": "Kol jų nepatvirtinsi rankiniu būdu",
   "notifications.policy.filter_not_following_title": "Žmonių, kuriuos neseki",
   "notifications.policy.filter_private_mentions_title": "Nepageidaujami privatūs paminėjimai",
-  "notifications.policy.title": "Filtruoti pranešimus iš…",
+  "notifications.policy.title": "Tvarkyti pranešimus iš…",
   "notifications_permission_banner.enable": "Įjungti darbalaukio pranešimus",
   "notifications_permission_banner.how_to_control": "Jei nori gauti pranešimus, kai Mastodon nėra atidarytas, įjunk darbalaukio pranešimus. Įjungęs (-usi) darbalaukio pranešimus, gali tiksliai valdyti, kokių tipų sąveikos generuoja darbalaukio pranešimus, naudojant pirmiau esančiu mygtuku {icon}.",
   "notifications_permission_banner.title": "Niekada nieko nepraleisk",
diff --git a/app/javascript/mastodon/locales/lv.json b/app/javascript/mastodon/locales/lv.json
index f1c065b92a0ba3..02b709301c20b8 100644
--- a/app/javascript/mastodon/locales/lv.json
+++ b/app/javascript/mastodon/locales/lv.json
@@ -426,7 +426,6 @@
   "notification.favourite": "{name} pievienoja tavu ziņu izlasei",
   "notification.follow": "{name} uzsāka Tev sekot",
   "notification.follow_request": "{name} nosūtīja Tev sekošanas pieprasījumu",
-  "notification.mention": "{name} pieminēja Tevi",
   "notification.moderation-warning.learn_more": "Uzzināt vairāk",
   "notification.moderation_warning.action_delete_statuses": "Daži no Taviem ierakstiem tika noņemti.",
   "notification.moderation_warning.action_disable": "Tavs konts tika atspējots.",
@@ -481,7 +480,6 @@
   "notifications.policy.filter_not_followers_title": "Cilvēki, kuri Tev neseko",
   "notifications.policy.filter_not_following_hint": "Līdz tos pašrocīgi apstiprināsi",
   "notifications.policy.filter_not_following_title": "Cilvēki, kuriem Tu neseko",
-  "notifications.policy.title": "Atlasīt paziņojumus no…",
   "notifications_permission_banner.enable": "Iespējot darbvirsmas paziņojumus",
   "notifications_permission_banner.how_to_control": "Lai saņemtu paziņojumus, kad Mastodon nav atvērts, iespējo darbvirsmas paziņojumus. Vari precīzi kontrolēt, kāda veida mijiedarbības rada darbvirsmas paziņojumus, izmantojot augstāk redzamo pogu {icon}, kad tie būs iespējoti.",
   "notifications_permission_banner.title": "Nekad nepalaid neko garām",
diff --git a/app/javascript/mastodon/locales/ml.json b/app/javascript/mastodon/locales/ml.json
index d929b1f461c301..65a11750758c80 100644
--- a/app/javascript/mastodon/locales/ml.json
+++ b/app/javascript/mastodon/locales/ml.json
@@ -238,7 +238,6 @@
   "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
   "notification.follow": "{name} നിങ്ങളെ പിന്തുടർന്നു",
   "notification.follow_request": "{name} നിങ്ങളെ പിന്തുടരാൻ അഭ്യർത്ഥിച്ചു",
-  "notification.mention": "{name} നിങ്ങളെ സൂചിപ്പിച്ചു",
   "notification.own_poll": "നിങ്ങളുടെ പോൾ അവസാനിച്ചു",
   "notification.reblog": "{name} നിങ്ങളുടെ പോസ്റ്റ് ബൂസ്റ്റ് ചെയ്തു",
   "notification.status": "{name} ഇപ്പോൾ പോസ്റ്റുചെയ്‌തു",
diff --git a/app/javascript/mastodon/locales/ms.json b/app/javascript/mastodon/locales/ms.json
index b4ee161edff625..d782f363e8885f 100644
--- a/app/javascript/mastodon/locales/ms.json
+++ b/app/javascript/mastodon/locales/ms.json
@@ -415,7 +415,6 @@
   "notification.favourite": "{name} menggemari pos anda",
   "notification.follow": "{name} mengikuti anda",
   "notification.follow_request": "{name} meminta untuk mengikuti anda",
-  "notification.mention": "{name} menyebut anda",
   "notification.own_poll": "Undian anda telah tamat",
   "notification.reblog": "{name} menggalak hantaran anda",
   "notification.status": "{name} baru sahaja mengirim hantaran",
diff --git a/app/javascript/mastodon/locales/my.json b/app/javascript/mastodon/locales/my.json
index 6a462b1c7c960d..310a944060d379 100644
--- a/app/javascript/mastodon/locales/my.json
+++ b/app/javascript/mastodon/locales/my.json
@@ -396,7 +396,6 @@
   "notification.favourite": "{name} က သင့်ပို့စ်ကို နှစ်သက်ခဲ့သည်",
   "notification.follow": "{name} က သင့်ကို စောင့်ကြည့်ခဲ့သည်",
   "notification.follow_request": "{name} က သင့်ကို စောင့်ကြည့်ရန် တောင်းဆိုထားသည်",
-  "notification.mention": "{name} က သင့်ကို ဖော်ပြခဲ့သည်",
   "notification.own_poll": "စစ်တမ်းကောက်မှု ပြီးဆုံးပါပြီ",
   "notification.reblog": "{name} boosted your status",
   "notification.status": "{name} က အခုလေးတင် ပို့စ်တင်လိုက်ပါပြီ",
diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json
index c9be1a2735b403..9293cfb09214a4 100644
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@@ -1,5 +1,5 @@
 {
-  "about.blocks": "Gelimiteerde en opgeschorte servers",
+  "about.blocks": "Beperkte en opgeschorte servers",
   "about.contact": "Contact:",
   "about.disclaimer": "Mastodon is vrije, opensourcesoftware en een handelsmerk van Mastodon gGmbH.",
   "about.domain_blocks.no_reason_available": "Reden niet beschikbaar",
@@ -356,6 +356,17 @@
   "home.pending_critical_update.link": "Bekijk updates",
   "home.pending_critical_update.title": "Kritieke beveiligingsupdate beschikbaar!",
   "home.show_announcements": "Mededelingen tonen",
+  "ignore_notifications_modal.disclaimer": "Mastodon kan gebruikers niet informeren dat je hun meldingen hebt genegeerd. Meldingen negeren zal niet voorkomen dat de berichten zelf worden verzonden.",
+  "ignore_notifications_modal.filter_instead": "In plaats daarvan filteren",
+  "ignore_notifications_modal.filter_to_act_users": "Je bent nog steeds in staat om volgverzoeken goed- of af te keuren, en om gebruikers te rapporteren",
+  "ignore_notifications_modal.filter_to_avoid_confusion": "Filteren voorkomt potentiële verwarring",
+  "ignore_notifications_modal.filter_to_review_separately": "Je kunt gefilterde meldingen afzonderlijk beoordelen",
+  "ignore_notifications_modal.ignore": "Meldingen negeren",
+  "ignore_notifications_modal.limited_accounts_title": "Meldingen van beperkte accounts negeren?",
+  "ignore_notifications_modal.new_accounts_title": "Meldingen van nieuwe accounts negeren?",
+  "ignore_notifications_modal.not_followers_title": "Meldingen negeren van mensen die jou niet volgen?",
+  "ignore_notifications_modal.not_following_title": "Meldingen negeren van mensen die je niet volgt?",
+  "ignore_notifications_modal.private_mentions_title": "Meldingen negeren van ongevraagde privéberichten?",
   "interaction_modal.description.favourite": "Je kunt met een Mastodon-account dit bericht als favoriet markeren, om die gebruiker te laten weten dat je het bericht waardeert en om het op te slaan.",
   "interaction_modal.description.follow": "Je kunt met een Mastodon-account {name} volgen, om zo diens berichten op jouw starttijdlijn te ontvangen.",
   "interaction_modal.description.reblog": "Je kunt met een Mastodon-account dit bericht boosten, om het zo met jouw volgers te delen.",
@@ -482,7 +493,11 @@
   "notification.favourite": "{name} markeerde jouw bericht als favoriet",
   "notification.follow": "{name} volgt jou nu",
   "notification.follow_request": "{name} wil jou graag volgen",
-  "notification.mention": "{name} vermeldde jou",
+  "notification.label.mention": "Vermelding",
+  "notification.label.private_mention": "Privébericht",
+  "notification.label.private_reply": "Privéreactie",
+  "notification.label.reply": "Reactie",
+  "notification.mention": "Vermelding",
   "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.",
@@ -494,7 +509,6 @@
   "notification.moderation_warning.action_suspend": "Jouw account is opgeschort.",
   "notification.own_poll": "Jouw peiling is beëindigd",
   "notification.poll": "Een peiling waaraan jij hebt meegedaan is beëindigd",
-  "notification.private_mention": "{name} heeft je een privébericht gestuurd",
   "notification.reblog": "{name} boostte jouw bericht",
   "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.",
@@ -504,11 +518,26 @@
   "notification.status": "{name} heeft zojuist een bericht geplaatst",
   "notification.update": "{name} heeft een bericht bewerkt",
   "notification_requests.accept": "Accepteren",
+  "notification_requests.accept_all": "Alles accepteren",
+  "notification_requests.accept_multiple": "{count, plural, one {# verzoek accepteren} other {# verzoeken accepteren}}",
+  "notification_requests.confirm_accept_all.button": "Alles accepteren",
+  "notification_requests.confirm_accept_all.message": "Je staat op het punt om {count, plural, one {een meldingsverzoek} other {# meldingsverzoeken}} te accepteren. Wil je doorgaan?",
+  "notification_requests.confirm_accept_all.title": "Meldingsverzoeken accepteren?",
+  "notification_requests.confirm_dismiss_all.button": "Alles afwijzen",
+  "notification_requests.confirm_dismiss_all.message": "Je staat op het punt om {count, plural, one {een meldingsverzoek} other {# meldingsverzoeken}} af te wijzen. Je zult niet in staat zijn om {count, plural, one {hier} other {hier}} weer gemakkelijk toegang toe te krijgen. Wil je doorgaan?",
+  "notification_requests.confirm_dismiss_all.title": "Meldingsverzoeken afwijzen?",
   "notification_requests.dismiss": "Afwijzen",
-  "notification_requests.maximize": "Maximaliseer",
+  "notification_requests.dismiss_all": "Alles afwijzen",
+  "notification_requests.dismiss_multiple": "{count, plural, one {# verzoek afwijzen} other {# verzoeken afwijzen}}",
+  "notification_requests.enter_selection_mode": "Selecteren",
+  "notification_requests.exit_selection_mode": "Annuleren",
+  "notification_requests.explainer_for_limited_account": "Meldingen van dit account zijn gefilterd omdat dit account door een moderator is beperkt.",
+  "notification_requests.explainer_for_limited_remote_account": "Meldingen van dit account zijn gefilterd omdat dit account of diens server door een moderator is beperkt.",
+  "notification_requests.maximize": "Maximaliseren",
   "notification_requests.minimize_banner": "Banner met gefilterde meldingen minimaliseren",
   "notification_requests.notifications_from": "Meldingen van {name}",
   "notification_requests.title": "Gefilterde meldingen",
+  "notification_requests.view": "Meldingen bekijken",
   "notifications.clear": "Meldingen verwijderen",
   "notifications.clear_confirmation": "Weet je het zeker dat je al jouw meldingen wilt verwijderen?",
   "notifications.clear_title": "Meldingen verwijderen?",
@@ -545,6 +574,14 @@
   "notifications.permission_denied": "Desktopmeldingen zijn niet beschikbaar omdat een eerdere browsertoestemming werd geweigerd",
   "notifications.permission_denied_alert": "Desktopmeldingen kunnen niet worden ingeschakeld, omdat een eerdere browsertoestemming werd geweigerd",
   "notifications.permission_required": "Desktopmeldingen zijn niet beschikbaar omdat de benodigde toestemming niet is verleend.",
+  "notifications.policy.accept": "Accepteren",
+  "notifications.policy.accept_hint": "In meldingen weergeven",
+  "notifications.policy.drop": "Negeren",
+  "notifications.policy.drop_hint": "Permanent verwijderen",
+  "notifications.policy.filter": "Filter",
+  "notifications.policy.filter_hint": "Naar gefilterde inbox voor meldingen verzenden",
+  "notifications.policy.filter_limited_accounts_hint": "Beperkt door servermoderatoren",
+  "notifications.policy.filter_limited_accounts_title": "Gemodereerde accounts",
   "notifications.policy.filter_new_accounts.hint": "In de afgelopen {days, plural, one {24 uur} other {# dagen}} geregistreerd",
   "notifications.policy.filter_new_accounts_title": "Nieuwe accounts",
   "notifications.policy.filter_not_followers_hint": "Inclusief mensen die jou korter dan {days, plural, one {24 uur} other {# dagen}} volgen",
@@ -553,7 +590,7 @@
   "notifications.policy.filter_not_following_title": "Mensen die jij niet volgt",
   "notifications.policy.filter_private_mentions_hint": "Onzichtbaar tenzij het een antwoord is op een privébericht van jou of wanneer je de afzender volgt",
   "notifications.policy.filter_private_mentions_title": "Ongevraagde privéberichten",
-  "notifications.policy.title": "Meldingen verbergen van…",
+  "notifications.policy.title": "Meldingen beheren van…",
   "notifications_permission_banner.enable": "Desktopmeldingen inschakelen",
   "notifications_permission_banner.how_to_control": "Om meldingen te ontvangen wanneer Mastodon niet open staat. Je kunt precies bepalen welke soort interacties wel of geen desktopmeldingen geven via de bovenstaande {icon} knop.",
   "notifications_permission_banner.title": "Mis nooit meer iets",
@@ -794,6 +831,7 @@
   "timeline_hint.remote_resource_not_displayed": "{resource} van andere servers worden niet getoond.",
   "timeline_hint.resources.followers": "Volgers",
   "timeline_hint.resources.follows": "Volgend",
+  "timeline_hint.resources.replies": "Enkele reacties",
   "timeline_hint.resources.statuses": "Oudere berichten",
   "trends.counter_by_accounts": "{count, plural, one {{counter} persoon} other {{counter} mensen}} {days, plural, one {in het afgelopen etmaal} other {in de afgelopen {days} dagen}}",
   "trends.trending_now": "Huidige trends",
diff --git a/app/javascript/mastodon/locales/nn.json b/app/javascript/mastodon/locales/nn.json
index c408f59d0d3e2a..23d7a287727369 100644
--- a/app/javascript/mastodon/locales/nn.json
+++ b/app/javascript/mastodon/locales/nn.json
@@ -11,6 +11,7 @@
   "about.not_available": "Denne informasjonen er ikkje gjort tilgjengeleg på denne tenaren.",
   "about.powered_by": "Desentraliserte sosiale medium drive av {mastodon}",
   "about.rules": "Tenarreglar",
+  "account.account_note_header": "Personleg notat",
   "account.add_or_remove_from_list": "Legg til eller fjern frå lister",
   "account.badges.bot": "Robot",
   "account.badges.group": "Gruppe",
@@ -170,21 +171,28 @@
   "confirmations.block.confirm": "Blokker",
   "confirmations.delete.confirm": "Slett",
   "confirmations.delete.message": "Er du sikker på at du vil sletta denne statusen?",
+  "confirmations.delete.title": "Slett innlegget?",
   "confirmations.delete_list.confirm": "Slett",
   "confirmations.delete_list.message": "Er du sikker på at du vil sletta denne lista for alltid?",
+  "confirmations.delete_list.title": "Slett lista?",
   "confirmations.discard_edit_media.confirm": "Forkast",
   "confirmations.discard_edit_media.message": "Du har ulagra endringar i mediaskildringa eller førehandsvisinga. Vil du forkasta dei likevel?",
   "confirmations.edit.confirm": "Rediger",
   "confirmations.edit.message": "Å redigera no vil overskriva den meldinga du er i ferd med å skriva. Er du sikker på at du vil halda fram?",
+  "confirmations.edit.title": "Overskriv innlegget?",
   "confirmations.logout.confirm": "Logg ut",
   "confirmations.logout.message": "Er du sikker på at du vil logga ut?",
+  "confirmations.logout.title": "Logg ut?",
   "confirmations.mute.confirm": "Demp",
   "confirmations.redraft.confirm": "Slett & skriv på nytt",
   "confirmations.redraft.message": "Er du sikker på at du vil sletta denne statusen og skriva han på nytt? Då misser du favorittar og framhevingar, og svar til det opprinnelege innlegget vert foreldrelause.",
+  "confirmations.redraft.title": "Slett og skriv på nytt?",
   "confirmations.reply.confirm": "Svar",
   "confirmations.reply.message": "Å svara no vil overskriva den meldinga du er i ferd med å skriva. Er du sikker på at du vil halda fram?",
+  "confirmations.reply.title": "Overskriv innlegget?",
   "confirmations.unfollow.confirm": "Slutt å fylgja",
   "confirmations.unfollow.message": "Er du sikker på at du vil slutta å fylgja {name}?",
+  "confirmations.unfollow.title": "Slutt å fylgja brukaren?",
   "conversation.delete": "Slett samtale",
   "conversation.mark_as_read": "Marker som lesen",
   "conversation.open": "Sjå samtale",
@@ -348,6 +356,15 @@
   "home.pending_critical_update.link": "Sjå oppdateringar",
   "home.pending_critical_update.title": "Kritisk sikkerheitsoppdatering er tilgjengeleg!",
   "home.show_announcements": "Vis kunngjeringar",
+  "ignore_notifications_modal.disclaimer": "Mastodon kan ikkje informera brukarane at du overser varsla deira. Å oversjå varsel vil ikkje hindra at meldingane blir sende.",
+  "ignore_notifications_modal.filter_instead": "Filtrer i staden",
+  "ignore_notifications_modal.filter_to_avoid_confusion": "Å filtrera hjelper til å unngå mogleg forvirring",
+  "ignore_notifications_modal.ignore": "Oversjå varsel",
+  "ignore_notifications_modal.limited_accounts_title": "Oversjå varsel frå modererte kontoar?",
+  "ignore_notifications_modal.new_accounts_title": "Oversjå varsel frå nye kontoar?",
+  "ignore_notifications_modal.not_followers_title": "Oversjå varsel frå folk som ikkje fylgjer deg?",
+  "ignore_notifications_modal.not_following_title": "Oversjå varsel frå folk du ikkje fylgjer?",
+  "ignore_notifications_modal.private_mentions_title": "Oversjå varsel frå masseutsende private omtaler?",
   "interaction_modal.description.favourite": "Med ein konto på Mastodon kan du favorittmerka dette innlegget for å visa forfattaren at du set pris på det, og for å lagra det til seinare.",
   "interaction_modal.description.follow": "Med ein konto på Mastodon kan du fylgja {name} for å sjå innlegga deira i din heimestraum.",
   "interaction_modal.description.reblog": "Med ein konto på Mastodon kan du framheva dette innlegget for å dela det med dine eigne fylgjarar.",
@@ -437,6 +454,8 @@
   "mute_modal.title": "Demp brukaren?",
   "mute_modal.you_wont_see_mentions": "Du vil ikkje sjå innlegg som nemner dei.",
   "mute_modal.you_wont_see_posts": "Dei kan framleis sjå innlegga dine, men du vil ikkje sjå deira.",
+  "name_and_others": "{name} og {count, plural, one {# annan} other {# andre}}",
+  "name_and_others_with_link": "{name} og <a>{count, plural, one {# annan} other {# andre}}</a>",
   "navigation_bar.about": "Om",
   "navigation_bar.advanced_interface": "Opne i avansert nettgrensesnitt",
   "navigation_bar.blocks": "Blokkerte brukarar",
@@ -464,11 +483,19 @@
   "navigation_bar.security": "Tryggleik",
   "not_signed_in_indicator.not_signed_in": "Du må logga inn for å få tilgang til denne ressursen.",
   "notification.admin.report": "{name} rapporterte {target}",
+  "notification.admin.report_account": "{name} rapporterte {count, plural, one {eitt innlegg} other {# innlegg}} frå {target} for {category}",
+  "notification.admin.report_account_other": "{name} rapporterte {count, plural, one {eitt innlegg} other {# innlegg}} frå {target}",
+  "notification.admin.report_statuses": "{name} rapporterte {target} for {category}",
+  "notification.admin.report_statuses_other": "{name} rapporterte {target}",
   "notification.admin.sign_up": "{name} er registrert",
   "notification.favourite": "{name} markerte innlegget ditt som favoritt",
   "notification.follow": "{name} fylgde deg",
   "notification.follow_request": "{name} har bedt om å fylgja deg",
-  "notification.mention": "{name} nemnde deg",
+  "notification.label.mention": "Omtale",
+  "notification.label.private_mention": "Privat omtale",
+  "notification.label.private_reply": "Privat svar",
+  "notification.label.reply": "Svar",
+  "notification.mention": "Omtale",
   "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.",
@@ -479,6 +506,7 @@
   "notification.moderation_warning.action_silence": "Kontoen din har blitt avgrensa.",
   "notification.moderation_warning.action_suspend": "Kontoen din har blitt suspendert.",
   "notification.own_poll": "Rundspørjinga di er ferdig",
+  "notification.poll": "Ei rundspørjing du røysta i er ferdig",
   "notification.reblog": "{name} framheva innlegget ditt",
   "notification.relationships_severance_event": "Tapte samband med {name}",
   "notification.relationships_severance_event.account_suspension": "Ein administrator på {from} har utvist {target}, som tyder at du ikkje lenger får oppdateringar frå dei eller kan samhandla med dei.",
@@ -488,20 +516,40 @@
   "notification.status": "{name} la nettopp ut",
   "notification.update": "{name} redigerte eit innlegg",
   "notification_requests.accept": "Godkjenn",
+  "notification_requests.accept_all": "Godta alle",
+  "notification_requests.accept_multiple": "{count, plural, one {Godta # førespurnad} other {Godta # førespurnader}}",
+  "notification_requests.confirm_accept_all.button": "Godta alle",
+  "notification_requests.confirm_accept_all.message": "Du er i ferd med å godta {count, plural, one {ein førespurnad om å fylgja deg} other {# førespurnader om å fylgja deg}}. Er du sikker på at du vil halda fram?",
+  "notification_requests.confirm_accept_all.title": "Godta førespurnad om varsel?",
+  "notification_requests.confirm_dismiss_all.button": "Avvis alle",
+  "notification_requests.confirm_dismiss_all.message": "Du er i ferd med å avvisa {count, plural, one {ein førespurnad om varsel} other {# førespurnader om varsel}}. Det blir ikkje lett å få tilgang til {count, plural, one {han} other {dei}} att. Er du sikker på at du vil halda fram?",
+  "notification_requests.confirm_dismiss_all.title": "Avvis førespurnader om varsel?",
   "notification_requests.dismiss": "Avvis",
+  "notification_requests.dismiss_all": "Avvis alle",
+  "notification_requests.dismiss_multiple": "{count, plural, one {Avvis # førespurnad} other {Avvis # førespurnader}}",
+  "notification_requests.enter_selection_mode": "Vel",
+  "notification_requests.exit_selection_mode": "Avbryt",
+  "notification_requests.explainer_for_limited_account": "Varsla frå denne kontoen er filtrerte ut fordi ein moderator har avgrensa kontoen.",
+  "notification_requests.explainer_for_limited_remote_account": "Varla frå denne kontoen er filtrerte ut fordi ein moderator har avgrensa kontoen eller tenaren.",
+  "notification_requests.maximize": "Maksimer",
+  "notification_requests.minimize_banner": "Minimer banneret for filtrerte varsel",
   "notification_requests.notifications_from": "Varslingar frå {name}",
   "notification_requests.title": "Filtrerte varslingar",
+  "notification_requests.view": "Sjå varsel",
   "notifications.clear": "Tøm varsel",
   "notifications.clear_confirmation": "Er du sikker på at du vil fjerna alle varsla dine for alltid?",
+  "notifications.clear_title": "Tøm varsel?",
   "notifications.column_settings.admin.report": "Nye rapportar:",
   "notifications.column_settings.admin.sign_up": "Nyleg registrerte:",
   "notifications.column_settings.alert": "Skrivebordsvarsel",
+  "notifications.column_settings.beta.category": "Eksperimentelle funksjonar",
+  "notifications.column_settings.beta.grouping": "Grupper varslingar",
   "notifications.column_settings.favourite": "Favorittar:",
   "notifications.column_settings.filter_bar.advanced": "Vis alle kategoriar",
   "notifications.column_settings.filter_bar.category": "Snøggfilterline",
   "notifications.column_settings.follow": "Nye fylgjarar:",
   "notifications.column_settings.follow_request": "Ny fylgjarførespurnader:",
-  "notifications.column_settings.mention": "Omtalar:",
+  "notifications.column_settings.mention": "Omtaler:",
   "notifications.column_settings.poll": "Røysteresultat:",
   "notifications.column_settings.push": "Pushvarsel",
   "notifications.column_settings.reblog": "Framhevingar:",
@@ -524,15 +572,23 @@
   "notifications.permission_denied": "Skrivebordsvarsel er ikkje tilgjengelege på grunn av at nettlesaren tidlegare ikkje har fått naudsynte rettar til å vise dei",
   "notifications.permission_denied_alert": "Sidan nettlesaren tidlegare har blitt nekta naudsynte rettar, kan ikkje skrivebordsvarsel aktiverast",
   "notifications.permission_required": "Skrivebordsvarsel er utilgjengelege fordi naudsynte rettar ikkje er gitt.",
+  "notifications.policy.accept": "Godta",
+  "notifications.policy.accept_hint": "Vis i varsla",
+  "notifications.policy.drop": "Oversjå",
+  "notifications.policy.drop_hint": "Send ut i endeløysa så det aldri kjem att",
+  "notifications.policy.filter": "Filtrer",
+  "notifications.policy.filter_hint": "Send til innboksen for filtrerte varsel",
+  "notifications.policy.filter_limited_accounts_hint": "Avgrensa av moderatorar på tenaren",
+  "notifications.policy.filter_limited_accounts_title": "Modererte kontoar",
   "notifications.policy.filter_new_accounts.hint": "Skrive siste {days, plural, one {dag} other {# dagar}}",
   "notifications.policy.filter_new_accounts_title": "Nye brukarkontoar",
   "notifications.policy.filter_not_followers_hint": "Inkludert folk som har fylgt deg mindre enn {days, plural, one {ein dag} other {# dagar}}",
   "notifications.policy.filter_not_followers_title": "Folk som ikkje fylgjer deg",
   "notifications.policy.filter_not_following_hint": "Til du godkjenner dei manuelt",
   "notifications.policy.filter_not_following_title": "Folk du ikkje fylgjer",
-  "notifications.policy.filter_private_mentions_hint": "Filtrert viss det ikkje er eit svar på dine eigne nemningar eller viss du fylgjer avsendaren",
-  "notifications.policy.filter_private_mentions_title": "Masseutsende private nemningar",
-  "notifications.policy.title": "Filtrer ut varslingar frå…",
+  "notifications.policy.filter_private_mentions_hint": "Filtrert viss det ikkje er eit svar på dine eigne omtaler eller viss du fylgjer avsendaren",
+  "notifications.policy.filter_private_mentions_title": "Masseutsende private omtaler",
+  "notifications.policy.title": "Handter varsel frå…",
   "notifications_permission_banner.enable": "Skru på skrivebordsvarsel",
   "notifications_permission_banner.how_to_control": "Aktiver skrivebordsvarsel for å få varsel når Mastodon ikkje er open. Du kan nøye bestemme kva samhandlingar som skal føre til skrivebordsvarsel gjennom {icon}-knappen ovanfor etter at varsel er aktivert.",
   "notifications_permission_banner.title": "Gå aldri glipp av noko",
@@ -659,9 +715,13 @@
   "report.unfollow_explanation": "Du fylgjer denne kontoen. Slutt å fylgje dei for ikkje lenger å sjå innlegga deira i heimestraumen din.",
   "report_notification.attached_statuses": "{count, plural, one {{count} innlegg} other {{count} innlegg}} lagt ved",
   "report_notification.categories.legal": "Juridisk",
+  "report_notification.categories.legal_sentence": "ulovleg innhald",
   "report_notification.categories.other": "Anna",
+  "report_notification.categories.other_sentence": "anna",
   "report_notification.categories.spam": "Søppelpost",
+  "report_notification.categories.spam_sentence": "søppel",
   "report_notification.categories.violation": "Regelbrot",
+  "report_notification.categories.violation_sentence": "regelbrot",
   "report_notification.open": "Opne rapport",
   "search.no_recent_searches": "Ingen søk nylig",
   "search.placeholder": "Søk",
@@ -769,6 +829,7 @@
   "timeline_hint.remote_resource_not_displayed": "{resource} frå andre tenarar blir ikkje vist.",
   "timeline_hint.resources.followers": "Fylgjarar",
   "timeline_hint.resources.follows": "Fylgjer",
+  "timeline_hint.resources.replies": "Nokre svar",
   "timeline_hint.resources.statuses": "Eldre tut",
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} folk}} siste {days, plural, one {døgnet} other {{days} dagane}}",
   "trends.trending_now": "Populært no",
diff --git a/app/javascript/mastodon/locales/no.json b/app/javascript/mastodon/locales/no.json
index 9aeb6be9c2b04d..4657a1ac42c985 100644
--- a/app/javascript/mastodon/locales/no.json
+++ b/app/javascript/mastodon/locales/no.json
@@ -408,7 +408,6 @@
   "notification.favourite": "{name} favorittmarkerte innlegget ditt",
   "notification.follow": "{name} fulgte deg",
   "notification.follow_request": "{name} har bedt om å få følge deg",
-  "notification.mention": "{name} nevnte deg",
   "notification.own_poll": "Avstemningen din er ferdig",
   "notification.reblog": "{name} fremhevet ditt innlegg",
   "notification.status": "{name} la nettopp ut",
diff --git a/app/javascript/mastodon/locales/oc.json b/app/javascript/mastodon/locales/oc.json
index 382b7b127d16cd..56814f6f85b655 100644
--- a/app/javascript/mastodon/locales/oc.json
+++ b/app/javascript/mastodon/locales/oc.json
@@ -351,7 +351,6 @@
   "notification.favourite": "{name} a mes vòstre estatut en favorit",
   "notification.follow": "{name} vos sèc",
   "notification.follow_request": "{name} a demandat a vos sègre",
-  "notification.mention": "{name} vos a mencionat",
   "notification.own_poll": "Vòstre sondatge es acabat",
   "notification.reblog": "{name} a partejat vòstre estatut",
   "notification.status": "{name} ven de publicar",
diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json
index 05f4511b57ff2a..c46c891d1bb49a 100644
--- a/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@@ -356,6 +356,17 @@
   "home.pending_critical_update.link": "Pokaż aktualizacje",
   "home.pending_critical_update.title": "Dostępna krytyczna aktualizacja bezpieczeństwa!",
   "home.show_announcements": "Pokaż ogłoszenia",
+  "ignore_notifications_modal.disclaimer": "Mastodon nie może poinformować innych użytkowników że ignorujesz ich powiadomienia. Ignorowanie powiadomień nie zapobieże wysyłaniu wpisów per se. ",
+  "ignore_notifications_modal.filter_instead": "Filtruj zamiast tego",
+  "ignore_notifications_modal.filter_to_act_users": "Dalej będziesz mieć możliwość przyjmować, odrzucać, i raportować użytkowników",
+  "ignore_notifications_modal.filter_to_avoid_confusion": "Filtrowanie może ograniczyć pomyłki",
+  "ignore_notifications_modal.filter_to_review_separately": "Możesz osobno przejrzeć powiadomienia odfiltrowane",
+  "ignore_notifications_modal.ignore": "Ignoruj powiadomienia",
+  "ignore_notifications_modal.limited_accounts_title": "Ignoruj powiadomienia od kont moderowanych?",
+  "ignore_notifications_modal.new_accounts_title": "Ignoruj powiadomienia od nowych kont?",
+  "ignore_notifications_modal.not_followers_title": "Ignoruj powiadomienia od użytkowników którzy cię nie obserwują?",
+  "ignore_notifications_modal.not_following_title": "Ignoruj powiadomienia od użytkowników których nie obserwujesz?",
+  "ignore_notifications_modal.private_mentions_title": "Ignoruj powiadomienia o nieproszonych wzmiankach prywatnych?",
   "interaction_modal.description.favourite": "Mając konto na Mastodonie, możesz dodawać wpisy do ulubionych by dać znać jego autorowi, że podoba Ci się ten wpis i zachować go na później.",
   "interaction_modal.description.follow": "Mając konto na Mastodonie, możesz śledzić {name} by widzieć jego wpisy na swojej głównej osi czasu.",
   "interaction_modal.description.reblog": "Mając konto na Mastodonie, możesz podbić ten wpis i udostępnić go Twoim obserwującym.",
@@ -482,7 +493,11 @@
   "notification.favourite": "{name} dodaje Twój wpis do ulubionych",
   "notification.follow": "{name} obserwuje Cię",
   "notification.follow_request": "{name} chce cię zaobserwować",
-  "notification.mention": "Wspomniało o Tobie przez {name}",
+  "notification.label.mention": "Wzmianka",
+  "notification.label.private_mention": "Prywatna wzmianka",
+  "notification.label.private_reply": "Odpowiedź prywatna",
+  "notification.label.reply": "Odpowiedź",
+  "notification.mention": "Wzmianka",
   "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.",
@@ -494,7 +509,6 @@
   "notification.moderation_warning.action_suspend": "Twoje konto zostało zawieszone.",
   "notification.own_poll": "Twoje głosowanie zakończyło się",
   "notification.poll": "Głosowanie, w którym brałeś(-aś) udział, zostało zakończone",
-  "notification.private_mention": "{name} prywatnie o tobie wspomniał(a)",
   "notification.reblog": "Twój post został podbity przez {name}",
   "notification.relationships_severance_event": "Utracone związki z {name}",
   "notification.relationships_severance_event.account_suspension": "Administrator z {from} zawiesił {target}, więc nie dostaniesz wieści ani nie wejdziesz w interakcje z użytkownikami z tego serwera.",
@@ -503,11 +517,26 @@
   "notification.status": "{name} opublikował(a) nowy wpis",
   "notification.update": "{name} edytował(a) post",
   "notification_requests.accept": "Akceptuj",
+  "notification_requests.accept_all": "Przyjmij wszystkie",
+  "notification_requests.accept_multiple": "Przyjmij {count, plural, one {# wniosek} few {# wnioski} other {# wniosków}} o powiadomienia",
+  "notification_requests.confirm_accept_all.button": "Przyjmij wszystkie",
+  "notification_requests.confirm_accept_all.message": "Na pewno przyjąć {count, plural, one {# wniosek o powiadomienie} few {# wnioski o powiadomienia} other {# wniosków o powiadomienia}}?",
+  "notification_requests.confirm_accept_all.title": "Przyjąć wnioski o powiadomienia?",
+  "notification_requests.confirm_dismiss_all.button": "Odrzuć wszystkie",
+  "notification_requests.confirm_dismiss_all.message": "Na pewno odrzucić {count, plural, one {# wniosek o powiadomienie} few {# wnioski o powiadomienia} other {# wniosków o powiadomienia}}? Stracisz do {count, plural, one {niego}  other {nich}} łatwy dostęp.",
+  "notification_requests.confirm_dismiss_all.title": "Odrzuć żądania powiadomień?",
   "notification_requests.dismiss": "Odrzuć",
+  "notification_requests.dismiss_all": "Odrzuć wszystkie",
+  "notification_requests.dismiss_multiple": "Odrzuć {count, plural, one {# wniosek} few {# wnioski} other {# wniosków}} o powiadomienia",
+  "notification_requests.enter_selection_mode": "Wybierz",
+  "notification_requests.exit_selection_mode": "Anuluj",
+  "notification_requests.explainer_for_limited_account": "Powiadomienia od tego konta zostały odfiltrowane bo to konto zostało ograniczone przez moderatora.",
+  "notification_requests.explainer_for_limited_remote_account": "Powiadomienia od tego konta zostały odfiltrowane bo to konto, albo serwer na którym się znajduje, zostało ograniczone przez moderatora.",
   "notification_requests.maximize": "Zmaksymalizuj",
   "notification_requests.minimize_banner": "Zminimalizuj baner powiadomień filtrowanych",
   "notification_requests.notifications_from": "Powiadomienia od {name}",
   "notification_requests.title": "Powiadomienia filtrowane",
+  "notification_requests.view": "Wyświetl powiadomienia",
   "notifications.clear": "Wyczyść powiadomienia",
   "notifications.clear_confirmation": "Czy na pewno chcesz bezpowrotnie usunąć wszystkie powiadomienia?",
   "notifications.clear_title": "Wyczyścić powiadomienia?",
@@ -544,6 +573,14 @@
   "notifications.permission_denied": "Powiadomienia na pulpicie nie są dostępne, ponieważ wcześniej nie udzielono uprawnień w przeglądarce",
   "notifications.permission_denied_alert": "Powiadomienia na pulpicie nie mogą zostać włączone, ponieważ wcześniej odmówiono uprawnień",
   "notifications.permission_required": "Powiadomienia na pulpicie nie są dostępne, ponieważ nie przyznano wymaganego uprawnienia.",
+  "notifications.policy.accept": "Zaakceptuj",
+  "notifications.policy.accept_hint": "Wyświetlaj w powiadomieniach",
+  "notifications.policy.drop": "Zignoruj",
+  "notifications.policy.drop_hint": "Usuń nieodzyskiwalnie.",
+  "notifications.policy.filter": "Odfiltruj",
+  "notifications.policy.filter_hint": "Wyślij do skrzynki powiadomień odfiltrowanych",
+  "notifications.policy.filter_limited_accounts_hint": "Ograniczonych przez moderatorów serwera",
+  "notifications.policy.filter_limited_accounts_title": "Kont zmoderowanych",
   "notifications.policy.filter_new_accounts.hint": "Utworzone w ciągu {days, plural, one {ostatniego dnia} other {ostatnich # dni}}",
   "notifications.policy.filter_new_accounts_title": "Nowe konta",
   "notifications.policy.filter_not_followers_hint": "Zawierające osoby które obserwują cię krócej niż {days, plural, one {dzień} other {# dni}}",
@@ -552,7 +589,7 @@
   "notifications.policy.filter_not_following_title": "Ludzie, których nie obserwujesz",
   "notifications.policy.filter_private_mentions_hint": "Odfiltrowane, chyba że są odpowiedzią na twoją własną wzmiankę, lub obserwujesz wysyłającego",
   "notifications.policy.filter_private_mentions_title": "Nieproszone prywatne wzmianki",
-  "notifications.policy.title": "Odfiltruj powiadomienia od…",
+  "notifications.policy.title": "Zarządzaj powiadomieniami od…",
   "notifications_permission_banner.enable": "Włącz powiadomienia na pulpicie",
   "notifications_permission_banner.how_to_control": "Aby otrzymywać powiadomienia, gdy Mastodon nie jest otwarty, włącz powiadomienia pulpitu. Możesz dokładnie kontrolować, októrych działaniach będziesz powiadomienia na pulpicie za pomocą przycisku {icon} powyżej, jeżeli tylko zostaną włączone.",
   "notifications_permission_banner.title": "Nie przegap niczego",
@@ -793,6 +830,7 @@
   "timeline_hint.remote_resource_not_displayed": "{resource} z innych serwerów nie są wyświetlane.",
   "timeline_hint.resources.followers": "Obserwujący",
   "timeline_hint.resources.follows": "Obserwowani",
+  "timeline_hint.resources.replies": "Niektóre odpowiedzi",
   "timeline_hint.resources.statuses": "Starsze wpisy",
   "trends.counter_by_accounts": "{count, plural, one {jedna osoba} few {{count} osoby} many {{count} osób} other {{counter} ludzie}} w ciągu {days, plural, one {ostatniego dnia} other {ostatnich {days} dni}}",
   "trends.trending_now": "Popularne teraz",
diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json
index 6ebb771002343f..613b1d454430e9 100644
--- a/app/javascript/mastodon/locales/pt-BR.json
+++ b/app/javascript/mastodon/locales/pt-BR.json
@@ -34,7 +34,9 @@
   "account.follow_back": "Seguir de volta",
   "account.followers": "Seguidores",
   "account.followers.empty": "Nada aqui.",
+  "account.followers_counter": "{count, plural, one {{counter} seguidor} other {{counter} seguidores}}",
   "account.following": "Seguindo",
+  "account.following_counter": "{count, plural, one {{counter} seguindo} other {{counter} seguindo}}",
   "account.follows.empty": "Nada aqui.",
   "account.go_to_profile": "Ir ao perfil",
   "account.hide_reblogs": "Ocultar boosts de @{name}",
@@ -351,6 +353,10 @@
   "home.pending_critical_update.link": "Ver atualizações",
   "home.pending_critical_update.title": "Atualização de segurança crítica disponível!",
   "home.show_announcements": "Mostrar comunicados",
+  "ignore_notifications_modal.new_accounts_title": "Ignorar notificações de novas contas?",
+  "ignore_notifications_modal.not_followers_title": "Ignorar notificações de pessoas que não seguem você?",
+  "ignore_notifications_modal.not_following_title": "Ignorar notificações de pessoas que você não segue?",
+  "ignore_notifications_modal.private_mentions_title": "Ignorar notificações de menções privadas não solicitadas?",
   "interaction_modal.description.favourite": "Com uma conta no Mastodon, você pode marcar esta publicação como favorita para que o autor saiba que você gostou e salvá-la para mais tarde.",
   "interaction_modal.description.follow": "Com uma conta no Mastodon, você pode seguir {name} para receber publicações na sua página inicial.",
   "interaction_modal.description.reblog": "Com uma conta no Mastodon, você pode impulsionar esta publicação para compartilhá-lo com seus próprios seguidores.",
@@ -440,6 +446,8 @@
   "mute_modal.title": "Silenciar usuário?",
   "mute_modal.you_wont_see_mentions": "Você não verá publicações que os mencionem.",
   "mute_modal.you_wont_see_posts": "Eles ainda poderão ver suas publicações, mas você não verá as deles.",
+  "name_and_others": "{name} e {count, plural, one {# outro} other {# outros}}",
+  "name_and_others_with_link": "{name} e <a>{count, plural, one {# outro} other {# outros}}</a>",
   "navigation_bar.about": "Sobre",
   "navigation_bar.advanced_interface": "Ativar na interface web avançada",
   "navigation_bar.blocks": "Usuários bloqueados",
@@ -471,7 +479,6 @@
   "notification.favourite": "{name} favoritou sua publicação",
   "notification.follow": "{name} te seguiu",
   "notification.follow_request": "{name} quer te seguir",
-  "notification.mention": "{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.",
@@ -491,7 +498,11 @@
   "notification.status": "{name} acabou de tootar",
   "notification.update": "{name} editou uma publicação",
   "notification_requests.accept": "Aceitar",
+  "notification_requests.accept_all": "Aceitar tudo",
+  "notification_requests.confirm_accept_all.button": "Aceitar tudo",
   "notification_requests.dismiss": "Rejeitar",
+  "notification_requests.exit_selection_mode": "Cancelar",
+  "notification_requests.maximize": "Maximizar",
   "notification_requests.notifications_from": "Notificações de {name}",
   "notification_requests.title": "Notificações filtradas",
   "notifications.clear": "Limpar notificações",
@@ -528,6 +539,9 @@
   "notifications.permission_denied": "Navegador não tem permissão para ativar notificações no computador.",
   "notifications.permission_denied_alert": "Verifique a permissão do navegador para ativar notificações no computador.",
   "notifications.permission_required": "Ativar notificações no computador exige permissão do navegador.",
+  "notifications.policy.accept": "Aceitar",
+  "notifications.policy.accept_hint": "Mostrar nas notificações",
+  "notifications.policy.drop": "Ignorar",
   "notifications.policy.filter_new_accounts.hint": "Created within the past {days, plural, one {one day} other {# days}}",
   "notifications.policy.filter_new_accounts_title": "Novas contas",
   "notifications.policy.filter_not_followers_hint": "Including people who have been following you fewer than {days, plural, one {one day} other {# days}}",
@@ -536,7 +550,6 @@
   "notifications.policy.filter_not_following_title": "Pessoas que você não segue",
   "notifications.policy.filter_private_mentions_hint": "Filtrado, a menos que respondido em sua própria menção ou se você segue o remetente",
   "notifications.policy.filter_private_mentions_title": "Menções privadas não solicitadas",
-  "notifications.policy.title": "Filtrar notificações de…",
   "notifications_permission_banner.enable": "Ativar notificações no computador",
   "notifications_permission_banner.how_to_control": "Para receber notificações quando o Mastodon não estiver aberto, ative as notificações no computador. Você pode controlar precisamente quais tipos de interações geram notificações no computador através do botão {icon}.",
   "notifications_permission_banner.title": "Nunca perca nada",
diff --git a/app/javascript/mastodon/locales/pt-PT.json b/app/javascript/mastodon/locales/pt-PT.json
index 8e67900ae01c76..8736f53baa4e66 100644
--- a/app/javascript/mastodon/locales/pt-PT.json
+++ b/app/javascript/mastodon/locales/pt-PT.json
@@ -482,7 +482,11 @@
   "notification.favourite": "{name} assinalou a sua publicação como favorita",
   "notification.follow": "{name} começou a seguir-te",
   "notification.follow_request": "{name} pediu para segui-lo",
-  "notification.mention": "{name} mencionou-te",
+  "notification.label.mention": "Menção",
+  "notification.label.private_mention": "Menção privada",
+  "notification.label.private_reply": "Resposta privada",
+  "notification.label.reply": "Resposta",
+  "notification.mention": "Menção",
   "notification.moderation-warning.learn_more": "Saber mais",
   "notification.moderation_warning": "Recebeu um aviso de moderação",
   "notification.moderation_warning.action_delete_statuses": "Algumas das suas publicações foram removidas.",
@@ -494,7 +498,6 @@
   "notification.moderation_warning.action_suspend": "A sua conta foi suspensa.",
   "notification.own_poll": "A sua votação terminou",
   "notification.poll": "Uma votação em que participaste chegou ao fim",
-  "notification.private_mention": "{name} mencionou-o em privado",
   "notification.reblog": "{name} reforçou a tua publicação",
   "notification.relationships_severance_event": "Perdeu as ligações com {name}",
   "notification.relationships_severance_event.account_suspension": "Um administrador de {from} suspendeu {target}, o que significa que já não pode receber atualizações dele ou interagir com ele.",
@@ -505,6 +508,8 @@
   "notification.update": "{name} editou uma publicação",
   "notification_requests.accept": "Aceitar",
   "notification_requests.dismiss": "Descartar",
+  "notification_requests.explainer_for_limited_account": "As notificações desta conta foram filtradas porque a conta foi limitada por um moderador.",
+  "notification_requests.explainer_for_limited_remote_account": "As notificações desta conta foram filtradas porque a conta ou o seu servidor foram limitados por um moderador.",
   "notification_requests.maximize": "Maximizar",
   "notification_requests.minimize_banner": "Minimizar o cabeçalho das notificações filtradas",
   "notification_requests.notifications_from": "Notificações de {name}",
@@ -545,6 +550,8 @@
   "notifications.permission_denied": "Notificações no ambiente de trabalho não estão disponíveis porque a permissão, solicitada pelo navegador, foi recusada anteriormente",
   "notifications.permission_denied_alert": "Notificações no ambiente de trabalho não podem ser ativadas, pois a permissão do navegador foi recusada anteriormente",
   "notifications.permission_required": "Notificações no ambiente de trabalho não estão disponíveis porque a permissão necessária não foi concedida.",
+  "notifications.policy.filter_limited_accounts_hint": "Limitado pelos moderadores do servidor",
+  "notifications.policy.filter_limited_accounts_title": "Contas moderadas",
   "notifications.policy.filter_new_accounts.hint": "Criada nos últimos {days, plural, one {um dia} other {# dias}}",
   "notifications.policy.filter_new_accounts_title": "Novas contas",
   "notifications.policy.filter_not_followers_hint": "Incluindo pessoas que o seguem há menos de {days, plural, one {um dia} other {# dias}}",
@@ -553,7 +560,6 @@
   "notifications.policy.filter_not_following_title": "Pessoas que você não segue",
   "notifications.policy.filter_private_mentions_hint": "Filtrado, a menos que seja em resposta à sua própria menção ou se você seguir o remetente",
   "notifications.policy.filter_private_mentions_title": "Menções privadas não solicitadas",
-  "notifications.policy.title": "Filtrar notificações de…",
   "notifications_permission_banner.enable": "Ativar notificações no ambiente de trabalho",
   "notifications_permission_banner.how_to_control": "Para receber notificações quando o Mastodon não estiver aberto, ative as notificações no ambiente de trabalho. Depois da sua ativação, pode controlar precisamente quais tipos de interações geram notificações, através do botão {icon} acima.",
   "notifications_permission_banner.title": "Nunca perca nada",
diff --git a/app/javascript/mastodon/locales/ro.json b/app/javascript/mastodon/locales/ro.json
index 36e5565fdf4f7a..6bb90dcd2354e2 100644
--- a/app/javascript/mastodon/locales/ro.json
+++ b/app/javascript/mastodon/locales/ro.json
@@ -387,7 +387,6 @@
   "notification.favourite": "{name} a adăugat postarea ta la favorite",
   "notification.follow": "{name} s-a abonat la tine",
   "notification.follow_request": "{name} a trimis o cerere de abonare",
-  "notification.mention": "{name} te-a menționat",
   "notification.own_poll": "Sondajul tău s-a încheiat",
   "notification.reblog": "{name} ți-a distribuit postarea",
   "notification.status": "{name} tocmai a postat",
diff --git a/app/javascript/mastodon/locales/ru.json b/app/javascript/mastodon/locales/ru.json
index bff2fe4e7b0fc8..b55bb890e66a25 100644
--- a/app/javascript/mastodon/locales/ru.json
+++ b/app/javascript/mastodon/locales/ru.json
@@ -464,7 +464,6 @@
   "notification.favourite": "{name} добавил(а) ваш пост в избранное",
   "notification.follow": "{name} подписался (-лась) на вас",
   "notification.follow_request": "{name} отправил запрос на подписку",
-  "notification.mention": "{name} упомянул(а) вас",
   "notification.moderation-warning.learn_more": "Узнать больше",
   "notification.moderation_warning": "Вы получили предупреждение от модерации",
   "notification.moderation_warning.action_delete_statuses": "Некоторые из ваших публикаций были удалены.",
@@ -527,7 +526,6 @@
   "notifications.policy.filter_not_following_title": "Люди, на которых вы не подписаны",
   "notifications.policy.filter_private_mentions_hint": "Фильтруется, если только это не ответ на ваше собственное упоминание или если вы подписаны на отправителя",
   "notifications.policy.filter_private_mentions_title": "Нежелательные личные упоминания",
-  "notifications.policy.title": "Фильтровать уведомления от…",
   "notifications_permission_banner.enable": "Включить уведомления",
   "notifications_permission_banner.how_to_control": "Получайте уведомления даже когда Mastodon закрыт, включив уведомления на рабочем столе. А чтобы лишний шум не отвлекал, вы можете настроить какие уведомления вы хотите получать, нажав на кнопку {icon} выше.",
   "notifications_permission_banner.title": "Будьте в курсе происходящего",
diff --git a/app/javascript/mastodon/locales/sa.json b/app/javascript/mastodon/locales/sa.json
index e230156615d783..5e0b3e2b7a5de4 100644
--- a/app/javascript/mastodon/locales/sa.json
+++ b/app/javascript/mastodon/locales/sa.json
@@ -349,7 +349,6 @@
   "notification.admin.sign_up": "{name} संविवेश",
   "notification.follow": "{name} त्वामनुससार",
   "notification.follow_request": "{name} त्वामनुसर्तुमयाचीत्",
-  "notification.mention": "{name} त्वामुल्लिलेख",
   "notification.own_poll": "तव निर्वाचनं समाप्तम्",
   "notification.reblog": "{name} तव पत्रं बुस्तिमिति अकार्षीत्",
   "notification.status": "{name} अधुना अस्थापयिष्ट",
diff --git a/app/javascript/mastodon/locales/sc.json b/app/javascript/mastodon/locales/sc.json
index 6be1cd41fa5f62..cc23b3b1d86b4e 100644
--- a/app/javascript/mastodon/locales/sc.json
+++ b/app/javascript/mastodon/locales/sc.json
@@ -373,7 +373,6 @@
   "notification.favourite": "{name} at marcadu comente a preferidu s'istadu tuo",
   "notification.follow": "{name} ti sighit",
   "notification.follow_request": "{name} at dimandadu de ti sighire",
-  "notification.mention": "{name} t'at mentovadu",
   "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.",
@@ -385,7 +384,6 @@
   "notification.moderation_warning.action_suspend": "Su contu tuo est istadu suspèndidu.",
   "notification.own_poll": "Sondàgiu acabbadu",
   "notification.poll": "Unu sondàgiu in su chi as votadu est acabbadu",
-  "notification.private_mention": "{name} t'at mentovadu in privadu",
   "notification.reblog": "{name} at cumpartzidu sa publicatzione tua",
   "notification.relationships_severance_event": "Connessiones pèrdidas cun {name}",
   "notification.relationships_severance_event.learn_more": "Àteras informatziones",
diff --git a/app/javascript/mastodon/locales/sco.json b/app/javascript/mastodon/locales/sco.json
index 54f1d9fe15f133..5aa5cd418559b7 100644
--- a/app/javascript/mastodon/locales/sco.json
+++ b/app/javascript/mastodon/locales/sco.json
@@ -332,7 +332,6 @@
   "notification.admin.sign_up": "{name} signed up",
   "notification.follow": "{name} follaed ye",
   "notification.follow_request": "{name} is wantin tae follae ye",
-  "notification.mention": "{name} menshied ye",
   "notification.own_poll": "Yer poll is duin",
   "notification.reblog": "{name} heezed yer post",
   "notification.status": "{name} juist postit",
diff --git a/app/javascript/mastodon/locales/si.json b/app/javascript/mastodon/locales/si.json
index 432b2dff8f9fbd..bb5fcc5e9b09d6 100644
--- a/app/javascript/mastodon/locales/si.json
+++ b/app/javascript/mastodon/locales/si.json
@@ -286,7 +286,6 @@
   "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
   "notification.favourite": "{name} ඔබගේ ලිපියට ප්‍රිය කළා",
   "notification.follow": "{name} ඔබව අනුගමනය කළා",
-  "notification.mention": "{name} ඔබව සඳහන් කර ඇත",
   "notification.own_poll": "ඔබගේ මත විමසුම නිමයි",
   "notification.status": "{name} දැන් පළ කළා",
   "notification.update": "{name} ලිපියක් සංස්කරණය කළා",
diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json
index 9abeea62dcb645..ca3f78bc87f56c 100644
--- a/app/javascript/mastodon/locales/sk.json
+++ b/app/javascript/mastodon/locales/sk.json
@@ -454,7 +454,6 @@
   "notification.favourite": "{name} hviezdičkuje váš príspevok",
   "notification.follow": "{name} vás sleduje",
   "notification.follow_request": "{name} vás žiada sledovať",
-  "notification.mention": "{name} vás spomína",
   "notification.moderation-warning.learn_more": "Zisti viac",
   "notification.moderation_warning.action_delete_statuses": "Niektoré z tvojich príspevkov boli odstránené.",
   "notification.moderation_warning.action_disable": "Tvoj účet bol vypnutý.",
@@ -508,7 +507,6 @@
   "notifications.policy.filter_not_followers_title": "Ľudia, ktorí ťa nenasledujú",
   "notifications.policy.filter_not_following_title": "Ľudia, ktorých nenasleduješ",
   "notifications.policy.filter_private_mentions_title": "Nevyžiadané priame spomenutia",
-  "notifications.policy.title": "Filtrovať oznámenia od…",
   "notifications_permission_banner.enable": "Povoliť upozornenia na ploche",
   "notifications_permission_banner.how_to_control": "Ak chcete dostávať upozornenia, keď Mastodon nie je otvorený, povoľte upozornenia na ploche. Po ich zapnutí môžete presne kontrolovať, ktoré typy interakcií generujú upozornenia na ploche, a to prostredníctvom tlačidla {icon} vyššie.",
   "notifications_permission_banner.title": "Nenechajte si nič ujsť",
diff --git a/app/javascript/mastodon/locales/sl.json b/app/javascript/mastodon/locales/sl.json
index ad282fd60fac19..51fb72f65dfeea 100644
--- a/app/javascript/mastodon/locales/sl.json
+++ b/app/javascript/mastodon/locales/sl.json
@@ -481,7 +481,6 @@
   "notification.favourite": "{name} je vzljubil/a vašo objavo",
   "notification.follow": "{name} vam sledi",
   "notification.follow_request": "{name} vam želi slediti",
-  "notification.mention": "{name} vas je omenil/a",
   "notification.moderation-warning.learn_more": "Več o tem",
   "notification.moderation_warning": "Prejeli ste opozorilo moderatorjev",
   "notification.moderation_warning.action_delete_statuses": "Nekatere vaše objave so odstranjene.",
@@ -493,7 +492,6 @@
   "notification.moderation_warning.action_suspend": "Vaš račun je bil suspendiran.",
   "notification.own_poll": "Vaša anketa je zaključena",
   "notification.poll": "Anketa, v kateri ste sodelovali, je zaključena",
-  "notification.private_mention": "{name} vas je zasebno omenil/a",
   "notification.reblog": "{name} je izpostavila/a vašo objavo",
   "notification.relationships_severance_event": "Povezave z {name} prekinjene",
   "notification.relationships_severance_event.account_suspension": "Skrbnik na {from} je suspendiral račun {target}, kar pomeni, da od računa ne morete več prejemati posodobitev ali imeti z njim interakcij.",
@@ -551,7 +549,6 @@
   "notifications.policy.filter_not_following_title": "Ljudje, ki jim ne sledite",
   "notifications.policy.filter_private_mentions_hint": "Filtrirano, razen če je odgovor na vašo lastno omembo ali če sledite pošiljatelju",
   "notifications.policy.filter_private_mentions_title": "Neželene zasebne omembe",
-  "notifications.policy.title": "Filtriraj obvestila od …",
   "notifications_permission_banner.enable": "Omogoči obvestila na namizju",
   "notifications_permission_banner.how_to_control": "Če želite prejemati obvestila, ko Mastodon ni odprt, omogočite namizna obvestila. Natančno lahko nadzirate, katere vrste interakcij naj tvorijo namizna obvestila; ko so omogočena, za to uporabite gumb {icon} zgoraj.",
   "notifications_permission_banner.title": "Nikoli ne zamudite ničesar",
diff --git a/app/javascript/mastodon/locales/sq.json b/app/javascript/mastodon/locales/sq.json
index af44c702471884..42730c4a9f6026 100644
--- a/app/javascript/mastodon/locales/sq.json
+++ b/app/javascript/mastodon/locales/sq.json
@@ -356,6 +356,15 @@
   "home.pending_critical_update.link": "Shihni përditësime",
   "home.pending_critical_update.title": "Ka përditësim kritik të lidhur me sigurinë!",
   "home.show_announcements": "Shfaqi lajmërimet",
+  "ignore_notifications_modal.disclaimer": "Mastodon-i s’mund të njoftojë përdoruesit se po shpërfillni njoftimet e tyre. Shpërfillja e njoftimeve s’do të ndalë dërgimin e vetë mesazheve.",
+  "ignore_notifications_modal.filter_instead": "Në vend të kësaj, filtroji",
+  "ignore_notifications_modal.filter_to_avoid_confusion": "Filtrimi ndihmon të shmanget konfuzion potencial",
+  "ignore_notifications_modal.ignore": "Shpërfilli njoftimet",
+  "ignore_notifications_modal.limited_accounts_title": "Të shpërfillen njoftime nga llogari të moderuara?",
+  "ignore_notifications_modal.new_accounts_title": "Të shpërfillen njoftime nga llogari të reja?",
+  "ignore_notifications_modal.not_followers_title": "Të shpërfillen njoftime nga persona që s’ju ndjekin?",
+  "ignore_notifications_modal.not_following_title": "Të shpërfillen njoftime nga persona që s’i ndiqni?",
+  "ignore_notifications_modal.private_mentions_title": "Të shpërfillen njoftime nga Përmendje Private të pakërkuara?",
   "interaction_modal.description.favourite": "Me një llogari në Mastodon, mund ta tregoni këtë postim si të parapëlqyer, për t’i bërë të ditur autorit se e çmoni dhe e ruani për më vonë.",
   "interaction_modal.description.follow": "Me një llogari në Mastodon, mund ta ndiqni {name} për të marrë postimet e tyre në prurjen tuaj të kreut.",
   "interaction_modal.description.reblog": "Me një llogari në Mastodon, mund ta përforconi këtë postim për ta ndarë me ndjekësit tuaj.",
@@ -482,7 +491,11 @@
   "notification.favourite": "{name} i vuri shenjë postimit tuaj si të parapëlqyer",
   "notification.follow": "{name} zuri t’ju ndjekë",
   "notification.follow_request": "{name} ka kërkuar t’ju ndjekë",
-  "notification.mention": "{name} ju ka përmendur",
+  "notification.label.mention": "Përmendje",
+  "notification.label.private_mention": "Përmendje private",
+  "notification.label.private_reply": "Përgjigje private",
+  "notification.label.reply": "Përgjigje",
+  "notification.mention": "Përmendje",
   "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.",
@@ -494,7 +507,6 @@
   "notification.moderation_warning.action_suspend": "Llogaria juaj është pezulluar.",
   "notification.own_poll": "Pyetësori juaj ka përfunduar",
   "notification.poll": "Ka përfunduar një pyetësor në të cilin keni marrë pjesë",
-  "notification.private_mention": "{name} ju përmendi privatisht",
   "notification.reblog": "{name} përforcoi mesazhin tuaj",
   "notification.relationships_severance_event": "Lidhje të humbura me {name}",
   "notification.relationships_severance_event.account_suspension": "Një përgjegjës nga {from} ka pezulluar {target}, që do të thotë se s’mund të merrni më përditësime prej tij, apo të ndërveproni me të.",
@@ -504,11 +516,26 @@
   "notification.status": "{name} sapo postoi",
   "notification.update": "{name} përpunoi një postim",
   "notification_requests.accept": "Pranoje",
+  "notification_requests.accept_all": "Pranoji krejt",
+  "notification_requests.accept_multiple": "{count, plural, one {Prano # kërkesë} other {Prano # kërkesa}}",
+  "notification_requests.confirm_accept_all.button": "Pranoji krejt",
+  "notification_requests.confirm_accept_all.message": "Ju ndan një hap nga pranimi i {count, plural, one {një kërkese njoftimi} other {# kërkesash njoftimi}}. Jeni i sigurt se doni të vazhdohet?",
+  "notification_requests.confirm_accept_all.title": "Të pranohen kërkesa njoftimesh?",
+  "notification_requests.confirm_dismiss_all.button": "Hidhi tej krejt",
+  "notification_requests.confirm_dismiss_all.message": "Ju ndan një hap nga hedhja tej e {count, plural, one {një kërkese njoftimesh} other {# kërkesash njoftimesh}}. S’do të jeni në gjendje të shihni sërish {count, plural, one {atë} other {ato}}. Jeni i sigurt se doni të bëhet kjo?",
+  "notification_requests.confirm_dismiss_all.title": "Të hidhen tej kërkesa njoftimesh?",
   "notification_requests.dismiss": "Hidhe tej",
+  "notification_requests.dismiss_all": "Hidhi tej krejt",
+  "notification_requests.dismiss_multiple": "{count, plural, one {Hidhni tej # kërkesë} other {Hidhni tej # kërkesa}}",
+  "notification_requests.enter_selection_mode": "Përzgjidhni",
+  "notification_requests.exit_selection_mode": "Anuloje",
+  "notification_requests.explainer_for_limited_account": "Njoftimet prej kësaj llogarie janë filtruar, ngaqë llogaria është kufizuar nga një moderator.",
+  "notification_requests.explainer_for_limited_remote_account": "Njoftimet prej kësaj llogarie janë filtruar, ngaqë llogaria, ose shërbyesi është kufizuar nga një moderator.",
   "notification_requests.maximize": "Maksimizoje",
   "notification_requests.minimize_banner": "Minimizo banderolë njoftimesh të filtruara",
   "notification_requests.notifications_from": "Njoftime prej {name}",
   "notification_requests.title": "Njoftime të filtruar",
+  "notification_requests.view": "Shihni njoftime",
   "notifications.clear": "Spastroji njoftimet",
   "notifications.clear_confirmation": "Jeni i sigurt se doni të spastrohen përgjithmonë krejt njoftimet tuaja?",
   "notifications.clear_title": "Të spastrohen njoftimet?",
@@ -545,6 +572,14 @@
   "notifications.permission_denied": "S’merren dot njoftime në desktop, ngaqë më herët shfletuesit i janë mohuar lejet për këtë",
   "notifications.permission_denied_alert": "S’mund të aktivizohen njoftimet në desktop, ngaqë lejet e shfletuesit për këtë janë mohuar më herët",
   "notifications.permission_required": "S’merren dot njoftime desktop, ngaqë s’është akorduar leja përkatëse.",
+  "notifications.policy.accept": "Pranoji",
+  "notifications.policy.accept_hint": "Shfaq njoftime",
+  "notifications.policy.drop": "Shpërfille",
+  "notifications.policy.drop_hint": "Dërgoje në hiç, mos e pafshim më kurrë",
+  "notifications.policy.filter": "Filtrim",
+  "notifications.policy.filter_hint": "Dërgoje te kutia e njoftimeve të filtruara",
+  "notifications.policy.filter_limited_accounts_hint": "Kufizuar nga moderatorë shërbyesi",
+  "notifications.policy.filter_limited_accounts_title": "Llogari të moderuara",
   "notifications.policy.filter_new_accounts.hint": "Krijuar brenda {days, plural, one {një dite} other {# ditësh}} të shkuara",
   "notifications.policy.filter_new_accounts_title": "Llogari të reja",
   "notifications.policy.filter_not_followers_hint": "Përfshi persona që ju kanë ndjekur brenda më pak se {days, plural, one {një dite} other {# ditësh}}",
@@ -553,7 +588,7 @@
   "notifications.policy.filter_not_following_title": "Persona që s’i ndiqni",
   "notifications.policy.filter_private_mentions_hint": "Filtruar, hiq rastin nëse gjendet te përgjigje ndaj përmendjes tuaj, ose nëse dërguesin e ndiqni",
   "notifications.policy.filter_private_mentions_title": "Përmendje private të pakërkuara",
-  "notifications.policy.title": "Filtroni njoftime nga…",
+  "notifications.policy.title": "Administroni njoftime nga…",
   "notifications_permission_banner.enable": "Aktivizo njoftime në desktop",
   "notifications_permission_banner.how_to_control": "Për të marrë njoftime, kur Mastodon-i s’është i hapur, aktivizoni njoftime në desktop. Përmes butoni {icon} më sipër, mund të kontrolloni me përpikëri cilat lloje ndërveprimesh prodhojnë njoftime në desktop, pasi të jenë aktivizuar.",
   "notifications_permission_banner.title": "Mos t’ju shpëtojë gjë",
@@ -794,6 +829,7 @@
   "timeline_hint.remote_resource_not_displayed": "S’janë shfaqur {resource} nga shërbyes të tjerë.",
   "timeline_hint.resources.followers": "Ndjekës",
   "timeline_hint.resources.follows": "Ndjekje",
+  "timeline_hint.resources.replies": "Disa përgjigje",
   "timeline_hint.resources.statuses": "Mesazhe të vjetër",
   "trends.counter_by_accounts": "{count, plural, një {{counter} person} other {{counter} vetë}} në {days, plural, një {day} other {{days} ditë}} të kaluar",
   "trends.trending_now": "Prirjet e tashme",
diff --git a/app/javascript/mastodon/locales/sr-Latn.json b/app/javascript/mastodon/locales/sr-Latn.json
index d0636614e844e5..5d890242cfc187 100644
--- a/app/javascript/mastodon/locales/sr-Latn.json
+++ b/app/javascript/mastodon/locales/sr-Latn.json
@@ -467,7 +467,6 @@
   "notification.favourite": "{name} je označio vašu objavu kao omiljenu",
   "notification.follow": "{name} vas je zapratio",
   "notification.follow_request": "{name} je zatražio da vas prati",
-  "notification.mention": "{name} vas je pomenuo",
   "notification.moderation-warning.learn_more": "Saznajte više",
   "notification.moderation_warning": "Dobili ste moderatorsko upozorenje",
   "notification.moderation_warning.action_delete_statuses": "Neke od vaših objava su uklonjene.",
@@ -531,7 +530,6 @@
   "notifications.policy.filter_not_following_title": "Ljudi koje ne pratite",
   "notifications.policy.filter_private_mentions_hint": "Filtrirano osim ako je odgovor na vaše pominjanje ili ako pratite pošiljaoca",
   "notifications.policy.filter_private_mentions_title": "Neželjena privatna pominjanja",
-  "notifications.policy.title": "Filtriraj obaveštenja od…",
   "notifications_permission_banner.enable": "Omogućiti obaveštenja na radnoj površini",
   "notifications_permission_banner.how_to_control": "Da biste primali obaveštenja kada Mastodon nije otvoren, omogućite obaveštenja na radnoj površini. Kada su obaveštenja na radnoj površini omogućena vrste interakcija koje ona generišu mogu se podešavati pomoću dugmeta {icon}.",
   "notifications_permission_banner.title": "Nikada ništa ne propustite",
diff --git a/app/javascript/mastodon/locales/sr.json b/app/javascript/mastodon/locales/sr.json
index c41cda123a0cea..25c3a37b229a04 100644
--- a/app/javascript/mastodon/locales/sr.json
+++ b/app/javascript/mastodon/locales/sr.json
@@ -467,7 +467,6 @@
   "notification.favourite": "{name} је означио вашу објаву као омиљену",
   "notification.follow": "{name} вас је запратио",
   "notification.follow_request": "{name} је затражио да вас прати",
-  "notification.mention": "{name} вас је поменуо",
   "notification.moderation-warning.learn_more": "Сазнајте више",
   "notification.moderation_warning": "Добили сте модераторско упозорење",
   "notification.moderation_warning.action_delete_statuses": "Неке од ваших објава су уклоњене.",
@@ -531,7 +530,6 @@
   "notifications.policy.filter_not_following_title": "Људи које не пратите",
   "notifications.policy.filter_private_mentions_hint": "Филтрирано осим ако је одговор на ваше помињање или ако пратите пошиљаоца",
   "notifications.policy.filter_private_mentions_title": "Нежељена приватна помињања",
-  "notifications.policy.title": "Филтрирај обавештења од…",
   "notifications_permission_banner.enable": "Омогућити обавештења на радној површини",
   "notifications_permission_banner.how_to_control": "Да бисте примали обавештења када Mastodon није отворен, омогућите обавештења на радној површини. Kада су обавештења на радној површини омогућена врсте интеракција које она генеришу могу се подешавати помоћу дугмета {icon}.",
   "notifications_permission_banner.title": "Никада ништа не пропустите",
diff --git a/app/javascript/mastodon/locales/sv.json b/app/javascript/mastodon/locales/sv.json
index a88502500db9e1..b27b3633eefe32 100644
--- a/app/javascript/mastodon/locales/sv.json
+++ b/app/javascript/mastodon/locales/sv.json
@@ -300,6 +300,7 @@
   "filter_modal.select_filter.subtitle": "Använd en befintlig kategori eller skapa en ny",
   "filter_modal.select_filter.title": "Filtrera detta inlägg",
   "filter_modal.title.status": "Filtrera ett inlägg",
+  "filtered_notifications_banner.pending_requests": "Från {count, plural, =0 {ingen} one {en person} other {# personer}} du kanske känner",
   "filtered_notifications_banner.title": "Filtrerade aviseringar",
   "firehose.all": "Allt",
   "firehose.local": "Denna server",
@@ -481,7 +482,6 @@
   "notification.favourite": "{name} favoritmarkerade ditt inlägg",
   "notification.follow": "{name} följer dig",
   "notification.follow_request": "{name} har begärt att följa dig",
-  "notification.mention": "{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.",
@@ -493,7 +493,6 @@
   "notification.moderation_warning.action_suspend": "Ditt konto har stängts av.",
   "notification.own_poll": "Din röstning har avslutats",
   "notification.poll": "En enkät som du röstat i har avslutats",
-  "notification.private_mention": "{name} nämnde dig privat",
   "notification.reblog": "{name} boostade ditt inlägg",
   "notification.relationships_severance_event": "Förlorade kontakter med {name}",
   "notification.relationships_severance_event.account_suspension": "En administratör från {from} har stängt av {target}, vilket innebär att du inte längre kan ta emot uppdateringar från dem eller interagera med dem.",
@@ -503,7 +502,14 @@
   "notification.status": "{name} publicerade just ett inlägg",
   "notification.update": "{name} redigerade ett inlägg",
   "notification_requests.accept": "Godkänn",
+  "notification_requests.accept_all": "Acceptera alla",
+  "notification_requests.accept_multiple": "{count, plural, one {Acceptera # förfrågan} other {Acceptera # förfrågningar}}",
+  "notification_requests.confirm_accept_all.button": "Acceptera alla",
+  "notification_requests.confirm_dismiss_all.button": "Avvisa alla",
   "notification_requests.dismiss": "Avfärda",
+  "notification_requests.dismiss_all": "Avvisa alla",
+  "notification_requests.dismiss_multiple": "{count, plural, one {Avvisa # förfrågan} other {Avvisa # förfrågningar}}",
+  "notification_requests.exit_selection_mode": "Avbryt",
   "notification_requests.notifications_from": "Aviseringar från {name}",
   "notification_requests.title": "Filtrerade meddelanden",
   "notifications.clear": "Rensa aviseringar",
@@ -542,6 +548,8 @@
   "notifications.permission_denied": "Skrivbordsaviseringar är otillgängliga på grund av tidigare nekade förfrågningar om behörighet i webbläsaren",
   "notifications.permission_denied_alert": "Skrivbordsaviseringar kan inte aktiveras, eftersom att webbläsarens behörighet har nekats innan",
   "notifications.permission_required": "Skrivbordsaviseringar är otillgängliga eftersom att rättigheten som krävs inte har godkänts.",
+  "notifications.policy.accept": "Acceptera",
+  "notifications.policy.drop": "Ignorera",
   "notifications.policy.filter_new_accounts.hint": "Skapad inom de senaste {days, plural, one {dagen} other {# dagarna}}",
   "notifications.policy.filter_new_accounts_title": "Nya konton",
   "notifications.policy.filter_not_followers_hint": "Inklusive personer som har följt dig kortare än {days, plural, one {en dag} other {# dagar}}",
@@ -550,7 +558,6 @@
   "notifications.policy.filter_not_following_title": "Personer du inte följer",
   "notifications.policy.filter_private_mentions_hint": "Filtrerat om det inte är som svar på ditt eget omnämnande eller om du följer avsändaren",
   "notifications.policy.filter_private_mentions_title": "Oombedda privata omnämnanden",
-  "notifications.policy.title": "Filtrera ut aviseringar från…",
   "notifications_permission_banner.enable": "Aktivera skrivbordsaviseringar",
   "notifications_permission_banner.how_to_control": "För att ta emot aviseringar när Mastodon inte är öppet, aktivera skrivbordsaviseringar. När de är aktiverade kan du styra exakt vilka typer av interaktioner som aviseras via {icon} -knappen ovan.",
   "notifications_permission_banner.title": "Missa aldrig något",
diff --git a/app/javascript/mastodon/locales/ta.json b/app/javascript/mastodon/locales/ta.json
index 402d34b9fdd249..daa4edd978b826 100644
--- a/app/javascript/mastodon/locales/ta.json
+++ b/app/javascript/mastodon/locales/ta.json
@@ -274,7 +274,6 @@
   "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
   "notification.follow": "{name} உங்களைப் பின்தொடர்கிறார்",
   "notification.follow_request": "{name} உங்களைப் பின்தொடரக் கோருகிறார்",
-  "notification.mention": "{name} நீங்கள் குறிப்பிட்டுள்ளீர்கள்",
   "notification.own_poll": "கருத்துக்கணிப்பு நிறைவடைந்தது",
   "notification.reblog": "{name} உங்கள் நிலை அதிகரித்தது",
   "notifications.clear": "அறிவிப்புகளை அழிக்கவும்",
diff --git a/app/javascript/mastodon/locales/te.json b/app/javascript/mastodon/locales/te.json
index d3e1026889fb3e..2cebb719724d93 100644
--- a/app/javascript/mastodon/locales/te.json
+++ b/app/javascript/mastodon/locales/te.json
@@ -185,7 +185,6 @@
   "navigation_bar.security": "భద్రత",
   "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
   "notification.follow": "{name} మిమ్మల్ని అనుసరిస్తున్నారు",
-  "notification.mention": "{name} మిమ్మల్ని ప్రస్తావించారు",
   "notification.reblog": "{name} మీ స్టేటస్ ను బూస్ట్ చేసారు",
   "notifications.clear": "ప్రకటనలను తుడిచివేయు",
   "notifications.clear_confirmation": "మీరు మీ అన్ని నోటిఫికేషన్లను శాశ్వతంగా తొలగించాలనుకుంటున్నారా?",
diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json
index a6df1cc976fb54..164fc987fea948 100644
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@@ -11,6 +11,7 @@
   "about.not_available": "ไม่ได้ทำให้ข้อมูลนี้พร้อมใช้งานในเซิร์ฟเวอร์นี้",
   "about.powered_by": "สื่อสังคมแบบกระจายศูนย์ที่ขับเคลื่อนโดย {mastodon}",
   "about.rules": "กฎของเซิร์ฟเวอร์",
+  "account.account_note_header": "หมายเหตุส่วนบุคคล",
   "account.add_or_remove_from_list": "เพิ่มหรือเอาออกจากรายการ",
   "account.badges.bot": "อัตโนมัติ",
   "account.badges.group": "กลุ่ม",
@@ -299,6 +300,7 @@
   "filter_modal.select_filter.subtitle": "ใช้หมวดหมู่ที่มีอยู่หรือสร้างหมวดหมู่ใหม่",
   "filter_modal.select_filter.title": "กรองโพสต์นี้",
   "filter_modal.title.status": "กรองโพสต์",
+  "filtered_notifications_banner.pending_requests": "จาก {count, plural, =0 {ไม่มีใคร} other {# คน}} ที่คุณอาจรู้จัก",
   "filtered_notifications_banner.title": "การแจ้งเตือนที่กรองอยู่",
   "firehose.all": "ทั้งหมด",
   "firehose.local": "เซิร์ฟเวอร์นี้",
@@ -354,6 +356,11 @@
   "home.pending_critical_update.link": "ดูการอัปเดต",
   "home.pending_critical_update.title": "มีการอัปเดตความปลอดภัยสำคัญพร้อมใช้งาน!",
   "home.show_announcements": "แสดงประกาศ",
+  "ignore_notifications_modal.filter_instead": "กรองแทน",
+  "ignore_notifications_modal.ignore": "เพิกเฉยการแจ้งเตือน",
+  "ignore_notifications_modal.new_accounts_title": "เพิกเฉยการแจ้งเตือนจากบัญชีใหม่?",
+  "ignore_notifications_modal.not_followers_title": "เพิกเฉยการแจ้งเตือนจากผู้คนที่ไม่ได้ติดตามคุณ?",
+  "ignore_notifications_modal.not_following_title": "เพิกเฉยการแจ้งเตือนจากผู้คนที่คุณไม่ได้ติดตาม?",
   "interaction_modal.description.favourite": "ด้วยบัญชีใน Mastodon คุณสามารถชื่นชอบโพสต์นี้เพื่อแจ้งให้ผู้สร้างทราบว่าคุณชื่นชมโพสต์และบันทึกโพสต์ไว้สำหรับภายหลัง",
   "interaction_modal.description.follow": "ด้วยบัญชีใน Mastodon คุณสามารถติดตาม {name} เพื่อรับโพสต์ของเขาในฟีดหน้าแรกของคุณ",
   "interaction_modal.description.reblog": "ด้วยบัญชีใน Mastodon คุณสามารถดันโพสต์นี้เพื่อแชร์โพสต์กับผู้ติดตามของคุณเอง",
@@ -480,7 +487,10 @@
   "notification.favourite": "{name} ได้ชื่นชอบโพสต์ของคุณ",
   "notification.follow": "{name} ได้ติดตามคุณ",
   "notification.follow_request": "{name} ได้ขอติดตามคุณ",
-  "notification.mention": "{name} ได้กล่าวถึงคุณ",
+  "notification.label.mention": "การกล่าวถึง",
+  "notification.label.private_mention": "การกล่าวถึงแบบส่วนตัว",
+  "notification.label.private_reply": "การตอบกลับแบบส่วนตัว",
+  "notification.label.reply": "การตอบกลับ",
   "notification.moderation-warning.learn_more": "เรียนรู้เพิ่มเติม",
   "notification.moderation_warning": "คุณได้รับคำเตือนการกลั่นกรอง",
   "notification.moderation_warning.action_delete_statuses": "เอาโพสต์บางส่วนของคุณออกแล้ว",
@@ -492,7 +502,6 @@
   "notification.moderation_warning.action_suspend": "ระงับบัญชีของคุณแล้ว",
   "notification.own_poll": "การสำรวจความคิดเห็นของคุณได้สิ้นสุดแล้ว",
   "notification.poll": "การสำรวจความคิดเห็นที่คุณได้ลงคะแนนได้สิ้นสุดแล้ว",
-  "notification.private_mention": "{name} ได้กล่าวถึงคุณแบบส่วนตัว",
   "notification.reblog": "{name} ได้ดันโพสต์ของคุณ",
   "notification.relationships_severance_event": "สูญเสียการเชื่อมต่อกับ {name}",
   "notification.relationships_severance_event.account_suspension": "ผู้ดูแลจาก {from} ได้ระงับ {target} ซึ่งหมายความว่าคุณจะไม่สามารถรับการอัปเดตจากเขาหรือโต้ตอบกับเขาได้อีกต่อไป",
@@ -502,9 +511,20 @@
   "notification.status": "{name} เพิ่งโพสต์",
   "notification.update": "{name} ได้แก้ไขโพสต์",
   "notification_requests.accept": "ยอมรับ",
+  "notification_requests.accept_all": "ยอมรับทั้งหมด",
+  "notification_requests.accept_multiple": "{count, plural, other {ยอมรับ # คำขอ}}",
+  "notification_requests.confirm_accept_all.button": "ยอมรับทั้งหมด",
+  "notification_requests.confirm_accept_all.title": "ยอมรับคำขอการแจ้งเตือน?",
+  "notification_requests.confirm_dismiss_all.button": "ปิดทั้งหมด",
+  "notification_requests.confirm_dismiss_all.title": "ปิดคำขอการแจ้งเตือน?",
   "notification_requests.dismiss": "ปิด",
+  "notification_requests.dismiss_all": "ปิดทั้งหมด",
+  "notification_requests.dismiss_multiple": "{count, plural, other {ปิด # คำขอ}}",
+  "notification_requests.enter_selection_mode": "เลือก",
+  "notification_requests.exit_selection_mode": "ยกเลิก",
   "notification_requests.notifications_from": "การแจ้งเตือนจาก {name}",
   "notification_requests.title": "การแจ้งเตือนที่กรองอยู่",
+  "notification_requests.view": "ดูการแจ้งเตือน",
   "notifications.clear": "ล้างการแจ้งเตือน",
   "notifications.clear_confirmation": "คุณแน่ใจหรือไม่ว่าต้องการล้างการแจ้งเตือนทั้งหมดของคุณอย่างถาวร?",
   "notifications.clear_title": "ล้างการแจ้งเตือน?",
@@ -541,6 +561,10 @@
   "notifications.permission_denied": "การแจ้งเตือนบนเดสก์ท็อปไม่พร้อมใช้งานเนื่องจากมีการปฏิเสธคำขอสิทธิอนุญาตเบราว์เซอร์ก่อนหน้านี้",
   "notifications.permission_denied_alert": "ไม่สามารถเปิดใช้งานการแจ้งเตือนบนเดสก์ท็อป เนื่องจากมีการปฏิเสธสิทธิอนุญาตเบราว์เซอร์ก่อนหน้านี้",
   "notifications.permission_required": "การแจ้งเตือนบนเดสก์ท็อปไม่พร้อมใช้งานเนื่องจากไม่ได้ให้สิทธิอนุญาตที่จำเป็น",
+  "notifications.policy.accept": "ยอมรับ",
+  "notifications.policy.accept_hint": "แสดงในการแจ้งเตือน",
+  "notifications.policy.drop": "เพิกเฉย",
+  "notifications.policy.filter_hint": "ส่งไปยังกล่องขาเข้าการแจ้งเตือนที่กรองอยู่",
   "notifications.policy.filter_new_accounts.hint": "สร้างขึ้นภายใน {days, plural, other {# วัน}}ที่ผ่านมา",
   "notifications.policy.filter_new_accounts_title": "บัญชีใหม่",
   "notifications.policy.filter_not_followers_hint": "รวมถึงผู้คนที่ได้ติดตามคุณน้อยกว่า {days, plural, other {# วัน}}",
@@ -549,7 +573,7 @@
   "notifications.policy.filter_not_following_title": "ผู้คนที่คุณไม่ได้ติดตาม",
   "notifications.policy.filter_private_mentions_hint": "กรองไว้เว้นแต่การกล่าวถึงแบบส่วนตัวอยู่ในการตอบกลับการกล่าวถึงของคุณเองหรือหากคุณติดตามผู้ส่ง",
   "notifications.policy.filter_private_mentions_title": "การกล่าวถึงแบบส่วนตัวที่ไม่พึงประสงค์",
-  "notifications.policy.title": "กรองการแจ้งเตือนจาก…",
+  "notifications.policy.title": "จัดการการแจ้งเตือนจาก…",
   "notifications_permission_banner.enable": "เปิดใช้งานการแจ้งเตือนบนเดสก์ท็อป",
   "notifications_permission_banner.how_to_control": "เพื่อรับการแจ้งเตือนเมื่อ Mastodon ไม่ได้เปิด เปิดใช้งานการแจ้งเตือนบนเดสก์ท็อป คุณสามารถควบคุมชนิดของการโต้ตอบที่สร้างการแจ้งเตือนบนเดสก์ท็อปได้อย่างแม่นยำผ่านปุ่ม {icon} ด้านบนเมื่อเปิดใช้งานการแจ้งเตือน",
   "notifications_permission_banner.title": "ไม่พลาดสิ่งใด",
@@ -790,6 +814,7 @@
   "timeline_hint.remote_resource_not_displayed": "ไม่ได้แสดง {resource} จากเซิร์ฟเวอร์อื่น ๆ",
   "timeline_hint.resources.followers": "ผู้ติดตาม",
   "timeline_hint.resources.follows": "การติดตาม",
+  "timeline_hint.resources.replies": "การตอบกลับบางส่วน",
   "timeline_hint.resources.statuses": "โพสต์ที่เก่ากว่า",
   "trends.counter_by_accounts": "{count, plural, other {{counter} คน}}ใน {days, plural, other {{days} วัน}}ที่ผ่านมา",
   "trends.trending_now": "กำลังนิยม",
diff --git a/app/javascript/mastodon/locales/tok.json b/app/javascript/mastodon/locales/tok.json
index 03ad31a7284bd8..5518cc3697f554 100644
--- a/app/javascript/mastodon/locales/tok.json
+++ b/app/javascript/mastodon/locales/tok.json
@@ -288,7 +288,6 @@
   "notification.favourite": "toki sina li pona tawa {name}",
   "notification.follow": " {name} li kute e sina",
   "notification.follow_request": "{name} li wile kute e sina",
-  "notification.mention": "jan {name} li toki e sina",
   "notification.moderation-warning.learn_more": "o kama sona e ijo ante",
   "notification.reblog": "{name} li wawa e toki sina",
   "notification.status": "{name} li toki",
diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json
index cc9fd78c0a77c8..c6438fca7e77da 100644
--- a/app/javascript/mastodon/locales/tr.json
+++ b/app/javascript/mastodon/locales/tr.json
@@ -356,6 +356,15 @@
   "home.pending_critical_update.link": "Güncellemelerini görün",
   "home.pending_critical_update.title": "Kritik güvenlik güncellemesi mevcut!",
   "home.show_announcements": "Duyuruları göster",
+  "ignore_notifications_modal.disclaimer": "Mastodon bildirimlerini yok saydığınız kullanıcıları bilgilendiremez. Bildirimleri yok saymak iletilerin gönderilmesini durdurmayacaktır.",
+  "ignore_notifications_modal.filter_instead": "Onun yerine filtrele",
+  "ignore_notifications_modal.filter_to_avoid_confusion": "Filtreleme olası kafa karışıklığını önlemeye yardımcı olur",
+  "ignore_notifications_modal.ignore": "Bildirimleri yoksay",
+  "ignore_notifications_modal.limited_accounts_title": "Modere edilen hesapların bildirimlerini yoksay?",
+  "ignore_notifications_modal.new_accounts_title": "Yeni hesapların bildirimlerini yoksay?",
+  "ignore_notifications_modal.not_followers_title": "Takip etmeyen kişilerin bildirimlerini yoksay?",
+  "ignore_notifications_modal.not_following_title": "Takip etmediğin kişilerin bildirimlerini yoksay?",
+  "ignore_notifications_modal.private_mentions_title": "İstenmeyen özel bahsetmelerden gelen bildirimleri yoksay?",
   "interaction_modal.description.favourite": "Bir Mastodon hesabıyla bu gönderiyi favorilerinize ekleyerek yazara gönderiyi beğendiğinizi bildirebilir ve daha sonrası için kaydedebilirsiniz.",
   "interaction_modal.description.follow": "Mastodon'daki bir hesapla, {name} kişisini, ana akışınızdaki gönderilerini görmek üzere takip edebilirsiniz.",
   "interaction_modal.description.reblog": "Mastodon'daki bir hesapla, bu gönderiyi takipçilerinizle paylaşmak için tuşlayabilirsiniz.",
@@ -482,7 +491,11 @@
   "notification.favourite": "{name} gönderinizi beğendi",
   "notification.follow": "{name} seni takip etti",
   "notification.follow_request": "{name} size takip isteği gönderdi",
-  "notification.mention": "{name} senden bahsetti",
+  "notification.label.mention": "Bahsetme",
+  "notification.label.private_mention": "Özel bahsetme",
+  "notification.label.private_reply": "Özel yanıt",
+  "notification.label.reply": "Yanıt",
+  "notification.mention": "Bahsetme",
   "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ı.",
@@ -494,7 +507,6 @@
   "notification.moderation_warning.action_suspend": "Hesabınız askıya alındı.",
   "notification.own_poll": "Anketiniz sona erdi",
   "notification.poll": "Oy verdiğiniz bir anket sona erdi",
-  "notification.private_mention": "{name} gizlice sizden bahsetti",
   "notification.reblog": "{name} gönderini yeniden paylaştı",
   "notification.relationships_severance_event": "{name} ile bağlantılar koptu",
   "notification.relationships_severance_event.account_suspension": "{from} yöneticisi, {target} askıya aldı, bunun anlamı onlardan artık güncelleme alamayacak veya etkileşemeyeceksiniz demektir.",
@@ -504,11 +516,26 @@
   "notification.status": "{name} az önce gönderdi",
   "notification.update": "{name} bir gönderiyi düzenledi",
   "notification_requests.accept": "Onayla",
+  "notification_requests.accept_all": "Tümünü kabul et",
+  "notification_requests.accept_multiple": "{count, plural, one {# isteği kabul et} other {# isteği kabul et}}",
+  "notification_requests.confirm_accept_all.button": "Tümünü kabul et",
+  "notification_requests.confirm_accept_all.message": "{count, plural, one {Bir bildirim isteğini} other {# bildirim isteğini}} kabul etmek üzeresiniz. Devam etmek istediğinizden emin misiniz?",
+  "notification_requests.confirm_accept_all.title": "Bildirim taleplerini kabul et?",
+  "notification_requests.confirm_dismiss_all.button": "Tümünü reddet",
+  "notification_requests.confirm_dismiss_all.message": "{count, plural, one {Bir bildirim isteğini} other {# bildirim isteğini}} reddetmek üzeresiniz. {count, plural, one {Ona} other {Onlara}} tekrar kolayca ulaşamayacaksınz. Devam etmek istediğinizden emin misiniz?",
+  "notification_requests.confirm_dismiss_all.title": "Bildirim taleplerini reddet?",
   "notification_requests.dismiss": "Yoksay",
+  "notification_requests.dismiss_all": "Tümünü reddet",
+  "notification_requests.dismiss_multiple": "{count, plural, one {# isteği reddet} other {# isteği reddet}}",
+  "notification_requests.enter_selection_mode": "Seç",
+  "notification_requests.exit_selection_mode": "İptal",
+  "notification_requests.explainer_for_limited_account": "Hesap bir moderatör tarafından sınırlandığı için, bu hesaptan gönderilen bildirimler filtrelendi.",
+  "notification_requests.explainer_for_limited_remote_account": "Hesap veya sunucusu bir moderatör tarafından sınırlandığı için, bu hesaptan gönderilen bildirimler filtrelendi.",
   "notification_requests.maximize": "Büyüt",
   "notification_requests.minimize_banner": "Filtrelenmiş bildirimler başlığını küçült",
   "notification_requests.notifications_from": "{name} bildirimleri",
   "notification_requests.title": "Filtrelenmiş bildirimler",
+  "notification_requests.view": "Bildirimleri görüntüle",
   "notifications.clear": "Bildirimleri temizle",
   "notifications.clear_confirmation": "Tüm bildirimlerinizi kalıcı olarak temizlemek ister misiniz?",
   "notifications.clear_title": "Bildirimleri temizle?",
@@ -545,6 +572,14 @@
   "notifications.permission_denied": "Daha önce reddedilen tarayıcı izinleri isteği nedeniyle masaüstü bildirimleri kullanılamıyor",
   "notifications.permission_denied_alert": "Tarayıcı izni daha önce reddedildiğinden, masaüstü bildirimleri etkinleştirilemez",
   "notifications.permission_required": "Masaüstü bildirimleri, gereksinim duyulan izin verilmediği için mevcut değil.",
+  "notifications.policy.accept": "Kabul Et",
+  "notifications.policy.accept_hint": "Bildirimlerde göster",
+  "notifications.policy.drop": "Yoksay",
+  "notifications.policy.drop_hint": "Boşluğa gönder, tekrar hiç görünmesin",
+  "notifications.policy.filter": "Filtrele",
+  "notifications.policy.filter_hint": "Filtreli bildirimleri kutusuna gönder",
+  "notifications.policy.filter_limited_accounts_hint": "Sunucu moderatörleri tarafından kısıtlanmış",
+  "notifications.policy.filter_limited_accounts_title": "Denetlenen hesaplar",
   "notifications.policy.filter_new_accounts.hint": "Son {days, plural, one {bir gün} other {# gün}}de oluşturuldu",
   "notifications.policy.filter_new_accounts_title": "Yeni hesaplar",
   "notifications.policy.filter_not_followers_hint": "Sizi {days, plural, one {bir gün} other {# gün}}den azdır takip eden kişileri de içeriyor",
@@ -553,7 +588,7 @@
   "notifications.policy.filter_not_following_title": "Takip etmediğin kullanıcılar",
   "notifications.policy.filter_private_mentions_hint": "Kendi değinmenize yanıt veya takip ettiğiniz kullanıcıdan değilse filtrelenir",
   "notifications.policy.filter_private_mentions_title": "İstenmeyen özel değinmeler",
-  "notifications.policy.title": "Şundan bildirimleri filtrele…",
+  "notifications.policy.title": "Şundan bildirimleri yönet…",
   "notifications_permission_banner.enable": "Masaüstü bildirimlerini etkinleştir",
   "notifications_permission_banner.how_to_control": "Mastodon açık olmadığında bildirim almak için masaüstü bildirimlerini etkinleştirin. Etkinleştirildikten sonra yukarıdaki {icon} düğmesini kullanarak hangi etkileşim türlerinin masaüstü bildirimleri oluşturduğunu tam olarak kontrol edebilirsiniz.",
   "notifications_permission_banner.title": "Hiçbir şeyi kaçırmayın",
@@ -794,6 +829,7 @@
   "timeline_hint.remote_resource_not_displayed": "diğer sunucudaki {resource} gösterilemiyor.",
   "timeline_hint.resources.followers": "Takipçiler",
   "timeline_hint.resources.follows": "Takip Edilenler",
+  "timeline_hint.resources.replies": "Bazı yanıtlar",
   "timeline_hint.resources.statuses": "Eski gönderiler",
   "trends.counter_by_accounts": "Son {days, plural, one {gündeki} other {{days} gündeki}} {count, plural, one {{counter} kişi} other {{counter} kişi}}",
   "trends.trending_now": "Şu an gündemde",
diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json
index 9e9d59f08706c5..52dbb3e27c6277 100644
--- a/app/javascript/mastodon/locales/uk.json
+++ b/app/javascript/mastodon/locales/uk.json
@@ -356,6 +356,8 @@
   "home.pending_critical_update.link": "Переглянути оновлення",
   "home.pending_critical_update.title": "Доступне критичне оновлення безпеки!",
   "home.show_announcements": "Показати оголошення",
+  "ignore_notifications_modal.filter_to_review_separately": "Ви можете відслідковувати відфільтровані сповіщення окремо",
+  "ignore_notifications_modal.ignore": "Ігнорувати сповіщення",
   "interaction_modal.description.favourite": "Маючи обліковий запис на Mastodon, ви можете вподобати цей допис, щоб дати автору знати, що ви його цінуєте, і зберегти його на потім.",
   "interaction_modal.description.follow": "Маючи обліковий запис на Mastodon, ви можете підписатися на {name}, щоб отримувати дописи цього користувача у свою стрічку.",
   "interaction_modal.description.reblog": "Маючи обліковий запис на Mastodon, ви можете поширити цей допис, щоб поділитися ним зі своїми підписниками.",
@@ -482,7 +484,8 @@
   "notification.favourite": "Ваш допис сподобався {name}",
   "notification.follow": "{name} підписалися на вас",
   "notification.follow_request": "{name} відправили запит на підписку",
-  "notification.mention": "{name} згадали вас",
+  "notification.label.private_reply": "Приватна відповідь",
+  "notification.label.reply": "Відповісти",
   "notification.moderation-warning.learn_more": "Дізнатися більше",
   "notification.moderation_warning": "Ви отримали попередження модерації",
   "notification.moderation_warning.action_delete_statuses": "Деякі з ваших дописів було видалено.",
@@ -494,7 +497,6 @@
   "notification.moderation_warning.action_suspend": "Ваш обліковий запис було заблоковано.",
   "notification.own_poll": "Ваше опитування завершилося",
   "notification.poll": "Опитування, в якому ви проголосували, завершено",
-  "notification.private_mention": "{name} приватно згадує вас",
   "notification.reblog": "{name} поширює ваш допис",
   "notification.relationships_severance_event": "Втрачено з'єднання з {name}",
   "notification.relationships_severance_event.account_suspension": "Адміністратор з {from} призупинив {target}, що означає, що ви більше не можете отримувати оновлення від них або взаємодіяти з ними.",
@@ -504,7 +506,13 @@
   "notification.status": "{name} щойно дописує",
   "notification.update": "{name} змінює допис",
   "notification_requests.accept": "Прийняти",
+  "notification_requests.accept_all": "Прийняти все",
+  "notification_requests.confirm_accept_all.button": "Прийняти все",
+  "notification_requests.confirm_dismiss_all.button": "Відхили все",
   "notification_requests.dismiss": "Відхилити",
+  "notification_requests.dismiss_all": "Відхили все",
+  "notification_requests.explainer_for_limited_account": "Сповіщення від цього облікового запису фільтровані, оскільки обліковий запис обмежений модератором.",
+  "notification_requests.explainer_for_limited_remote_account": "Сповіщення від цього облікового запису фільтровані, оскільки обліковий запис або його сервер обмежений модератором.",
   "notification_requests.maximize": "Розгорнути",
   "notification_requests.minimize_banner": "Мінімізувати відфільтрований банер сповіщень",
   "notification_requests.notifications_from": "Сповіщення від {name}",
@@ -545,6 +553,10 @@
   "notifications.permission_denied": "Сповіщення стільниці недоступні через раніше відхилений запит дозволів для браузера",
   "notifications.permission_denied_alert": "Сповіщення не можна ввімкнути оскільки у дозволі вже було відмовлено раніше",
   "notifications.permission_required": "Сповіщення на стільниці не доступні, оскільки необхідний дозвіл не надано.",
+  "notifications.policy.accept": "Прийняти",
+  "notifications.policy.drop": "Ігнорувати",
+  "notifications.policy.filter_limited_accounts_hint": "Обмежено модераторами сервера",
+  "notifications.policy.filter_limited_accounts_title": "Модеровані облікові записи",
   "notifications.policy.filter_new_accounts.hint": "Створено впродовж {days, plural, one {одного} few {# днів} many {# днів} other {# дня}}",
   "notifications.policy.filter_new_accounts_title": "Нові облікові записи",
   "notifications.policy.filter_not_followers_hint": "Включаючи людей, які стежать за вами менше {days, plural, one {one day} other {# days}}",
@@ -553,7 +565,6 @@
   "notifications.policy.filter_not_following_title": "Люди, на яких ви не підписані",
   "notifications.policy.filter_private_mentions_hint": "Відфільтровується, якщо це не відповідь на вашу власну згадку або якщо ви відстежуєте відправника",
   "notifications.policy.filter_private_mentions_title": "Небажані приватні згадки",
-  "notifications.policy.title": "Відфільтрувати сповіщення від…",
   "notifications_permission_banner.enable": "Увімкнути сповіщення стільниці",
   "notifications_permission_banner.how_to_control": "Щоб отримувати сповіщення, коли Mastodon не відкрито, увімкніть сповіщення стільниці. Ви можете контролювати, які типи взаємодій створюють сповіщення через кнопку {icon} вгорі після їхнього увімкнення.",
   "notifications_permission_banner.title": "Не проґавте нічого",
diff --git a/app/javascript/mastodon/locales/ur.json b/app/javascript/mastodon/locales/ur.json
index 8b387839534788..303e37da39fdc8 100644
--- a/app/javascript/mastodon/locales/ur.json
+++ b/app/javascript/mastodon/locales/ur.json
@@ -236,7 +236,6 @@
   "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
   "notification.follow": "{name} آپ کی پیروی کی",
   "notification.follow_request": "{name} نے آپ کی پیروی کی درخواست کی",
-  "notification.mention": "{name} نے آپ کا تذکرہ کیا",
   "notification.own_poll": "آپ کا پول ختم ہو گیا ہے",
   "notification.reblog": "{name} boosted your status",
   "notification.status": "{name} نے ابھی ابھی پوسٹ کیا",
diff --git a/app/javascript/mastodon/locales/vi.json b/app/javascript/mastodon/locales/vi.json
index 197969aa6ab4d6..688adc213716f4 100644
--- a/app/javascript/mastodon/locales/vi.json
+++ b/app/javascript/mastodon/locales/vi.json
@@ -356,6 +356,8 @@
   "home.pending_critical_update.link": "Xem bản cập nhật",
   "home.pending_critical_update.title": "Có bản cập nhật bảo mật quan trọng!",
   "home.show_announcements": "Xem thông báo máy chủ",
+  "ignore_notifications_modal.filter_to_act_users": "Bạn vẫn có thể chấp nhận, từ chối hoặc báo cáo người khác",
+  "ignore_notifications_modal.filter_to_review_separately": "Bạn có thể xem lại các thông báo đã lọc riêng biệt",
   "interaction_modal.description.favourite": "Với tài khoản Mastodon, bạn có thể cho người đăng biết bạn thích tút này và lưu lại tút.",
   "interaction_modal.description.follow": "Với tài khoản Mastodon, bạn có thể theo dõi {name} để tút của họ hiện trên bảng tin của mình.",
   "interaction_modal.description.reblog": "Với tài khoản Mastodon, bạn có thể đăng lại tút này để chia sẻ nó với những người đang theo dõi bạn.",
@@ -482,7 +484,11 @@
   "notification.favourite": "{name} thích tút của bạn",
   "notification.follow": "{name} theo dõi bạn",
   "notification.follow_request": "{name} yêu cầu theo dõi bạn",
-  "notification.mention": "{name} nhắc đến bạn",
+  "notification.label.mention": "Lượt nhắc",
+  "notification.label.private_mention": "Nhắn riêng",
+  "notification.label.private_reply": "Trả lời riêng",
+  "notification.label.reply": "Trả lời",
+  "notification.mention": "Lượt nhắc",
   "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ỡ.",
@@ -494,7 +500,6 @@
   "notification.moderation_warning.action_suspend": "Tài khoản của bạn đã bị vô hiệu hóa.",
   "notification.own_poll": "Cuộc bình chọn của bạn đã kết thúc",
   "notification.poll": "Cuộc bình chọn có bạn tham gia đã kết thúc",
-  "notification.private_mention": "{name} nhắn riêng đến bạn",
   "notification.reblog": "{name} đăng lại tút của bạn",
   "notification.relationships_severance_event": "Mất kết nối với {name}",
   "notification.relationships_severance_event.account_suspension": "Quản trị viên {from} đã vô hiệu hóa {target}, điều này có nghĩa là bạn không còn có thể nhận được cập nhật từ họ hoặc tương tác với họ nữa.",
@@ -505,6 +510,8 @@
   "notification.update": "{name} đã sửa tút",
   "notification_requests.accept": "Chấp nhận",
   "notification_requests.dismiss": "Bỏ qua",
+  "notification_requests.explainer_for_limited_account": "Thông báo từ tài khoản này đã được lọc vì tài khoản đã bị giới hạn bởi kiểm duyệt viên.",
+  "notification_requests.explainer_for_limited_remote_account": "Thông báo từ tài khoản này đã được lọc vì tài khoản hoặc máy chủ của tài khoản đã bị giới hạn bởi kiểm duyệt viên.",
   "notification_requests.maximize": "Tối đa",
   "notification_requests.minimize_banner": "Tinh giản banner lọc thông báo",
   "notification_requests.notifications_from": "Thông báo từ {name}",
@@ -545,6 +552,8 @@
   "notifications.permission_denied": "Trình duyệt không cho phép hiển thị thông báo trên màn hình.",
   "notifications.permission_denied_alert": "Không thể bật thông báo trên màn hình bởi vì trình duyệt đã cấm trước đó",
   "notifications.permission_required": "Không hiện thông báo trên màn hình bởi vì chưa cho phép.",
+  "notifications.policy.filter_limited_accounts_hint": "Chỉ dành cho kiểm duyệt viên",
+  "notifications.policy.filter_limited_accounts_title": "Kiểm duyệt tài khoản",
   "notifications.policy.filter_new_accounts.hint": "Đã tạo trong vòng {days, plural, other {# ngày}}",
   "notifications.policy.filter_new_accounts_title": "Tài khoản mới",
   "notifications.policy.filter_not_followers_hint": "Bao gồm những người đã theo dõi bạn ít hơn {days, plural, other {# ngày}}",
@@ -553,7 +562,6 @@
   "notifications.policy.filter_not_following_title": "Những người bạn không theo dõi",
   "notifications.policy.filter_private_mentions_hint": "Được lọc trừ khi nó trả lời lượt nhắc từ bạn hoặc nếu bạn theo dõi người gửi",
   "notifications.policy.filter_private_mentions_title": "Lượt nhắc riêng tư không được yêu cầu",
-  "notifications.policy.title": "Lọc ra thông báo từ…",
   "notifications_permission_banner.enable": "Cho phép thông báo trên màn hình",
   "notifications_permission_banner.how_to_control": "Hãy bật thông báo trên màn hình để không bỏ lỡ những thông báo từ Mastodon. Một khi đã bật, bạn có thể lựa chọn từng loại thông báo khác nhau thông qua {icon} nút bên dưới.",
   "notifications_permission_banner.title": "Không bỏ lỡ điều thú vị nào",
diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json
index 5b7116a2b668ba..91d1365485c856 100644
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@@ -259,7 +259,7 @@
   "empty_column.community": "本站时间轴暂时没有内容，快写点什么让它动起来吧！",
   "empty_column.direct": "你还未使用过私下提及。当你发出或者收到私下提及时，它将显示在此。",
   "empty_column.domain_blocks": "暂且没有被屏蔽的站点。",
-  "empty_column.explore_statuses": "目前没有热门话题，稍后再来看看吧！",
+  "empty_column.explore_statuses": "目前没有热门内容，稍后再来看看吧！",
   "empty_column.favourited_statuses": "你没有喜欢过任何嘟文。喜欢过的嘟文会显示在这里。",
   "empty_column.favourites": "没有人喜欢过这条嘟文。如果有人喜欢了，就会显示在这里。",
   "empty_column.follow_requests": "你还没有收到任何关注请求。当你收到一个关注请求时，它会出现在这里。",
@@ -356,6 +356,15 @@
   "home.pending_critical_update.link": "查看更新",
   "home.pending_critical_update.title": "紧急安全更新可用！",
   "home.show_announcements": "显示公告",
+  "ignore_notifications_modal.disclaimer": "Mastodon无法通知对方用户你忽略了他们的通知。忽略通知不会阻止消息本身的发送。",
+  "ignore_notifications_modal.filter_instead": "改为过滤",
+  "ignore_notifications_modal.filter_to_avoid_confusion": "选择过滤有助于避免潜在的混淆",
+  "ignore_notifications_modal.ignore": "忽略通知",
+  "ignore_notifications_modal.limited_accounts_title": "是否忽略来自受限账号的通知？",
+  "ignore_notifications_modal.new_accounts_title": "是否忽略来自新账户的通知？",
+  "ignore_notifications_modal.not_followers_title": "是否忽略未关注你的人的通知？",
+  "ignore_notifications_modal.not_following_title": "是否忽略你未关注的人的通知？",
+  "ignore_notifications_modal.private_mentions_title": "是否忽略不请自来的私下提及？",
   "interaction_modal.description.favourite": "只需一个 Mastodon 账号，即可喜欢这条嘟文，对嘟文的作者展示您欣赏的态度，并保存嘟文以供日后使用。",
   "interaction_modal.description.follow": "拥有一个 Mastodon 账号，你可以关注 {name} 并在自己的主页上接收对方的新嘟文。",
   "interaction_modal.description.reblog": "拥有一个 Mastodon 账号，你可以向自己的关注者们转发此嘟文。",
@@ -482,7 +491,11 @@
   "notification.favourite": "{name} 喜欢了你的嘟文",
   "notification.follow": "{name} 开始关注你",
   "notification.follow_request": "{name} 向你发送了关注请求",
-  "notification.mention": "{name} 提及了你",
+  "notification.label.mention": "提及",
+  "notification.label.private_mention": "私下提及",
+  "notification.label.private_reply": "私人回复",
+  "notification.label.reply": "回复",
+  "notification.mention": "提及",
   "notification.moderation-warning.learn_more": "了解更多",
   "notification.moderation_warning": "你收到了一条管理警告",
   "notification.moderation_warning.action_delete_statuses": "你的一些嘟文已被移除。",
@@ -494,7 +507,6 @@
   "notification.moderation_warning.action_suspend": "你的账号已被封禁.",
   "notification.own_poll": "你的投票已经结束",
   "notification.poll": "你参与的一项投票已结束",
-  "notification.private_mention": "{name} 私下提及了你",
   "notification.reblog": "{name} 转发了你的嘟文",
   "notification.relationships_severance_event": "与 {name} 的联系已断开",
   "notification.relationships_severance_event.account_suspension": "一名来自 {from} 的管理员已经封禁了{target}，这意味着你将无法再收到他们的更新或与他们互动。",
@@ -504,11 +516,26 @@
   "notification.status": "{name} 刚刚发布嘟文",
   "notification.update": "{name} 编辑了嘟文",
   "notification_requests.accept": "接受",
+  "notification_requests.accept_all": "全部接受",
+  "notification_requests.accept_multiple": "{count, plural, other {接受 # 个请求}}",
+  "notification_requests.confirm_accept_all.button": "全部接受",
+  "notification_requests.confirm_accept_all.message": "你将要接受 {count, plural, other {# 个通知请求}}。是否继续？",
+  "notification_requests.confirm_accept_all.title": "是否接受通知请求？",
+  "notification_requests.confirm_dismiss_all.button": "全部拒绝",
+  "notification_requests.confirm_dismiss_all.message": "你将要拒绝 {count, plural, other {# 个通知请求}}。你将无法再轻易访问{count, plural, other {它们}}。是否继续？",
+  "notification_requests.confirm_dismiss_all.title": "是否拒绝通知请求?",
   "notification_requests.dismiss": "拒绝",
+  "notification_requests.dismiss_all": "全部拒绝",
+  "notification_requests.dismiss_multiple": "{count, plural, other {拒绝 # 个请求}}",
+  "notification_requests.enter_selection_mode": "选择",
+  "notification_requests.exit_selection_mode": "取消",
+  "notification_requests.explainer_for_limited_account": "来自该账户的通知已被过滤，因为该账户已被管理员限制。",
+  "notification_requests.explainer_for_limited_remote_account": "来自该账户的通知已被过滤，因为该账户或其所在的实例已被管理员限制。",
   "notification_requests.maximize": "最大化",
   "notification_requests.minimize_banner": "最小化被过滤通知的横幅",
   "notification_requests.notifications_from": "来自 {name} 的通知",
   "notification_requests.title": "通知（已过滤）",
+  "notification_requests.view": "查看通知",
   "notifications.clear": "清空通知列表",
   "notifications.clear_confirmation": "你确定要永久清空通知列表吗？",
   "notifications.clear_title": "是否清空通知？",
@@ -545,6 +572,14 @@
   "notifications.permission_denied": "由于权限被拒绝，无法启用桌面通知。",
   "notifications.permission_denied_alert": "由于在此之前浏览器权限请求就已被拒绝，所以启用桌面通知失败",
   "notifications.permission_required": "所需权限未被授予，所以桌面通知不可用",
+  "notifications.policy.accept": "接受",
+  "notifications.policy.accept_hint": "在通知中显示",
+  "notifications.policy.drop": "忽略",
+  "notifications.policy.drop_hint": "送入虚空，再也不查看",
+  "notifications.policy.filter": "过滤",
+  "notifications.policy.filter_hint": "发送到被过滤通知收件箱",
+  "notifications.policy.filter_limited_accounts_hint": "被实例管理员限制",
+  "notifications.policy.filter_limited_accounts_title": "受限账号",
   "notifications.policy.filter_new_accounts.hint": "在 {days, plural, other {# 天}}内创建的账户",
   "notifications.policy.filter_new_accounts_title": "新账户",
   "notifications.policy.filter_not_followers_hint": "包括关注你少于 {days, plural, other {# 天}}的人",
@@ -553,7 +588,7 @@
   "notifications.policy.filter_not_following_title": "你没有关注的人",
   "notifications.policy.filter_private_mentions_hint": "过滤通知，除非通知是在回复提及你自己的内容，或发送者是你关注的人",
   "notifications.policy.filter_private_mentions_title": "不请自来的提及",
-  "notifications.policy.title": "通知过滤范围",
+  "notifications.policy.title": "管理来自 … 的通知",
   "notifications_permission_banner.enable": "启用桌面通知",
   "notifications_permission_banner.how_to_control": "启用桌面通知以在 Mastodon 未打开时接收通知。你可以通过交互通过上面的 {icon} 按钮来精细控制可以发送桌面通知的交互类型。",
   "notifications_permission_banner.title": "精彩不容错过",
@@ -794,9 +829,10 @@
   "timeline_hint.remote_resource_not_displayed": "不会显示来自其它服务器的{resource}",
   "timeline_hint.resources.followers": "粉丝",
   "timeline_hint.resources.follows": "关注",
+  "timeline_hint.resources.replies": "某些回复",
   "timeline_hint.resources.statuses": "更早的嘟文",
   "trends.counter_by_accounts": "过去 {days, plural, other {{days} 天}}有{count, plural, other { {counter} 人}}讨论",
-  "trends.trending_now": "现在流行",
+  "trends.trending_now": "当前热门",
   "ui.beforeunload": "如果你现在离开 Mastodon，你的草稿内容将会丢失。",
   "units.short.billion": "{count} B",
   "units.short.million": "{count} M",
diff --git a/app/javascript/mastodon/locales/zh-HK.json b/app/javascript/mastodon/locales/zh-HK.json
index 97feb9120d91a0..9fb50c6cff9c2f 100644
--- a/app/javascript/mastodon/locales/zh-HK.json
+++ b/app/javascript/mastodon/locales/zh-HK.json
@@ -464,7 +464,6 @@
   "notification.favourite": "{name} 喜歡你的文章",
   "notification.follow": "{name} 開始追蹤你",
   "notification.follow_request": "{name} 要求追蹤你",
-  "notification.mention": "{name} 提及你",
   "notification.moderation-warning.learn_more": "了解更多",
   "notification.moderation_warning.action_delete_statuses": "你的部份帖文已被刪除。",
   "notification.moderation_warning.action_disable": "你的帳號已被停用。",
@@ -527,7 +526,6 @@
   "notifications.policy.filter_not_following_title": "你未追蹤的人",
   "notifications.policy.filter_private_mentions_hint": "除非回覆你的提及或來自你追蹤的人，否則將被過濾",
   "notifications.policy.filter_private_mentions_title": "未經請求的私人提及",
-  "notifications.policy.title": "過濾來自以下的通知…",
   "notifications_permission_banner.enable": "啟用桌面通知",
   "notifications_permission_banner.how_to_control": "只要啟用桌面通知，便可在 Mastodon 網站沒有打開時收到通知。在已經啟用桌面通知的時候，你可以透過上面的 {icon} 按鈕準確控制哪些類型的互動會產生桌面通知。",
   "notifications_permission_banner.title": "不放過任何事情",
diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json
index 9e2f783e6b9b4a..16e506a181beb8 100644
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@@ -128,7 +128,7 @@
   "column.home": "首頁",
   "column.lists": "列表",
   "column.mutes": "已靜音的使用者",
-  "column.notifications": "通知",
+  "column.notifications": "推播通知",
   "column.pins": "釘選的嘟文",
   "column.public": "聯邦時間軸",
   "column_back_button.label": "上一頁",
@@ -219,7 +219,7 @@
   "domain_block_modal.they_wont_know": "他們不會知道他們已被封鎖。",
   "domain_block_modal.title": "是否封鎖該網域？",
   "domain_block_modal.you_will_lose_followers": "所有您來自此伺服器之跟隨者將被移除。",
-  "domain_block_modal.you_wont_see_posts": "您不會見到來自此伺服器使用者之任何嘟文或通知。",
+  "domain_block_modal.you_wont_see_posts": "您不會見到來自此伺服器使用者之任何嘟文或推播通知。",
   "domain_pill.activitypub_lets_connect": "它使您能於 Mastodon 及其他不同的社群應用程式與人連結及互動。",
   "domain_pill.activitypub_like_language": "ActivityPub 像是 Mastodon 與其他社群網路溝通時所用的語言。",
   "domain_pill.server": "伺服器",
@@ -269,8 +269,8 @@
   "empty_column.list": "這份列表下什麼也沒有。當此列表的成員嘟出新的嘟文時，它們將顯示於此。",
   "empty_column.lists": "您還沒有新增任何列表。當您新增列表時，它將於此顯示。",
   "empty_column.mutes": "您尚未靜音任何使用者。",
-  "empty_column.notification_requests": "清空啦！已經沒有任何通知。當您收到新通知時，它們將依照您的設定於此顯示。",
-  "empty_column.notifications": "您還沒有收到任何通知，當您與別人開始互動時，它將於此顯示。",
+  "empty_column.notification_requests": "清空啦！已經沒有任何推播通知。當您收到新推播通知時，它們將依照您的設定於此顯示。",
+  "empty_column.notifications": "您還沒有收到任何推播通知，當您與別人開始互動時，它將於此顯示。",
   "empty_column.public": "這裡什麼都沒有！嘗試寫些公開的嘟文，或者跟隨其他伺服器的使用者後，就會有嘟文出現了",
   "error.unexpected_crash.explanation": "由於發生系統故障或瀏覽器相容性問題，無法正常顯示此頁面。",
   "error.unexpected_crash.explanation_addons": "此頁面無法被正常顯示，這可能是由瀏覽器附加元件或網頁自動翻譯工具造成的。",
@@ -301,7 +301,7 @@
   "filter_modal.select_filter.title": "過濾此嘟文",
   "filter_modal.title.status": "過濾一則嘟文",
   "filtered_notifications_banner.pending_requests": "來自您可能認識的 {count, plural, =0 {0 人} other {# 人}}",
-  "filtered_notifications_banner.title": "已過濾之通知",
+  "filtered_notifications_banner.title": "已過濾之推播通知",
   "firehose.all": "全部",
   "firehose.local": "本站",
   "firehose.remote": "聯邦宇宙",
@@ -356,6 +356,17 @@
   "home.pending_critical_update.link": "檢視更新內容",
   "home.pending_critical_update.title": "有可取得的重要安全性更新！",
   "home.show_announcements": "顯示公告",
+  "ignore_notifications_modal.disclaimer": "Mastodon 無法通知您已忽略推播通知之使用者。忽略通知不會阻止訊息本身的發送。",
+  "ignore_notifications_modal.filter_instead": "改為過濾",
+  "ignore_notifications_modal.filter_to_act_users": "您仍能接受、拒絕、或檢舉使用者",
+  "ignore_notifications_modal.filter_to_avoid_confusion": "過濾器有助於避免潛在的混淆",
+  "ignore_notifications_modal.filter_to_review_separately": "您能單獨檢視已過濾推播通知",
+  "ignore_notifications_modal.ignore": "忽略推播通知",
+  "ignore_notifications_modal.limited_accounts_title": "忽略來自受管制帳號之推播通知？",
+  "ignore_notifications_modal.new_accounts_title": "忽略來自新帳號之推播通知？",
+  "ignore_notifications_modal.not_followers_title": "忽略來自未跟隨您帳號之推播通知？",
+  "ignore_notifications_modal.not_following_title": "忽略來自您未跟隨帳號之推播通知？",
+  "ignore_notifications_modal.private_mentions_title": "忽略來自不請自來私訊之推播通知？",
   "interaction_modal.description.favourite": "若於 Mastodon 上有個帳號，您可以將此嘟文加入最愛使作者知道您欣賞它且將它儲存下來。",
   "interaction_modal.description.follow": "若於 Mastodon 上有個帳號，您可以跟隨 {name} 以於首頁時間軸接收他們的嘟文。",
   "interaction_modal.description.reblog": "若於 Mastodon 上有個帳號，您可以轉嘟此嘟文以向您的跟隨者們分享。",
@@ -436,7 +447,7 @@
   "loading_indicator.label": "正在載入...",
   "media_gallery.toggle_visible": "切換可見性",
   "moved_to_account_banner.text": "您的帳號 {disabledAccount} 目前已停用，因為您已搬家至 {movedToAccount}。",
-  "mute_modal.hide_from_notifications": "於通知中隱藏",
+  "mute_modal.hide_from_notifications": "於推播通知中隱藏",
   "mute_modal.hide_options": "隱藏選項",
   "mute_modal.indefinite": "直到我解除靜音他們",
   "mute_modal.show_options": "顯示選項",
@@ -482,7 +493,11 @@
   "notification.favourite": "{name} 已將您的嘟文加入最愛",
   "notification.follow": "{name} 已跟隨您",
   "notification.follow_request": "{name} 要求跟隨您",
-  "notification.mention": "{name} 已提到您",
+  "notification.label.mention": "提及",
+  "notification.label.private_mention": "私訊",
+  "notification.label.private_reply": "私訊回嘟",
+  "notification.label.reply": "回嘟",
+  "notification.mention": "提及",
   "notification.moderation-warning.learn_more": "了解更多",
   "notification.moderation_warning": "您已收到管理員警告",
   "notification.moderation_warning.action_delete_statuses": "某些您的嘟文已被刪除。",
@@ -494,7 +509,6 @@
   "notification.moderation_warning.action_suspend": "您的帳號已被停權。",
   "notification.own_poll": "您的投票已結束",
   "notification.poll": "您曾投過的投票已經結束",
-  "notification.private_mention": "{name} 私訊您",
   "notification.reblog": "{name} 已轉嘟您的嘟文",
   "notification.relationships_severance_event": "與 {name} 失去連結",
   "notification.relationships_severance_event.account_suspension": "{from} 之管理員已將 {target} 停權，意味著您將不再收到來自他們的更新或與之互動。",
@@ -504,11 +518,26 @@
   "notification.status": "{name} 剛剛嘟文",
   "notification.update": "{name} 已編輯嘟文",
   "notification_requests.accept": "接受",
+  "notification_requests.accept_all": "全部接受",
+  "notification_requests.accept_multiple": "{count, plural, other {接受 # 則請求}}",
+  "notification_requests.confirm_accept_all.button": "全部接受",
+  "notification_requests.confirm_accept_all.message": "您將接受 {count, plural, other {# 則推播通知請求}}。您確定要繼續？",
+  "notification_requests.confirm_accept_all.title": "接受推播通知請求？",
+  "notification_requests.confirm_dismiss_all.button": "全部忽略",
+  "notification_requests.confirm_dismiss_all.message": "您將忽略 {count, plural, other {# 則推播通知請求}}。您將不再能輕易存取{count, plural, other {這些}}推播通知。您確定要繼續？",
+  "notification_requests.confirm_dismiss_all.title": "忽略推播通知請求？",
   "notification_requests.dismiss": "關閉",
+  "notification_requests.dismiss_all": "全部忽略",
+  "notification_requests.dismiss_multiple": "{count, plural, other {忽略 # 則請求}}",
+  "notification_requests.enter_selection_mode": "選擇",
+  "notification_requests.exit_selection_mode": "取消",
+  "notification_requests.explainer_for_limited_account": "由於此帳號已被管理員限制，來自此帳號之通知已被過濾。",
+  "notification_requests.explainer_for_limited_remote_account": "由於此帳號或其伺服器已被管理員限制，來自此帳號之通知已被過濾。",
   "notification_requests.maximize": "最大化",
   "notification_requests.minimize_banner": "最小化已過濾通知橫幅",
   "notification_requests.notifications_from": "來自 {name} 之通知",
-  "notification_requests.title": "已過濾之通知",
+  "notification_requests.title": "已過濾之推播通知",
+  "notification_requests.view": "檢視推播通知",
   "notifications.clear": "清除通知",
   "notifications.clear_confirmation": "您確定要永久清除您的通知嗎？",
   "notifications.clear_title": "是否清除推播通知？",
@@ -545,6 +574,14 @@
   "notifications.permission_denied": "由於之前已拒絕瀏覽器請求，因此無法使用桌面通知",
   "notifications.permission_denied_alert": "由於之前瀏覽器權限被拒絕，無法啟用桌面通知",
   "notifications.permission_required": "由於尚未授予所需的權限，因此無法使用桌面通知。",
+  "notifications.policy.accept": "接受",
+  "notifications.policy.accept_hint": "顯示於推播通知",
+  "notifications.policy.drop": "忽略",
+  "notifications.policy.drop_hint": "送至黑洞，永不相見",
+  "notifications.policy.filter": "過濾器",
+  "notifications.policy.filter_hint": "送至已過濾推播通知收件夾",
+  "notifications.policy.filter_limited_accounts_hint": "已被伺服器管理員限制",
+  "notifications.policy.filter_limited_accounts_title": "受管制帳號",
   "notifications.policy.filter_new_accounts.hint": "新增於過去 {days, plural, other {# 日}}",
   "notifications.policy.filter_new_accounts_title": "新帳號",
   "notifications.policy.filter_not_followers_hint": "包含最近 {days, plural, other {# 日}} 內跟隨您之使用者",
@@ -553,7 +590,7 @@
   "notifications.policy.filter_not_following_title": "您未跟隨之使用者",
   "notifications.policy.filter_private_mentions_hint": "過濾通知，除非嘟文包含於您的提及，或您跟隨該發嘟帳號",
   "notifications.policy.filter_private_mentions_title": "不請自來的私訊",
-  "notifications.policy.title": "過濾通知來自...",
+  "notifications.policy.title": "管理推播通知來自...",
   "notifications_permission_banner.enable": "啟用桌面通知",
   "notifications_permission_banner.how_to_control": "啟用桌面通知以於 Mastodon 沒有開啟的時候接收通知。啟用桌面通知後，您可以透過上面的 {icon} 按鈕準確的控制哪些類型的互動會產生桌面通知。",
   "notifications_permission_banner.title": "不要錯過任何東西！",
@@ -595,8 +632,8 @@
   "onboarding.tips.accounts_from_other_servers": "<strong>您知道嗎？</strong> 由於 Mastodon 是去中心化的，有些您巧遇過的個人檔案託管於這邊以外的其他伺服器。即便如此，您也能無縫地與他們互動！他們的伺服器位址是他們帳號的後半部分！",
   "onboarding.tips.migration": "<strong>您知道嗎？</strong> 若您認為 {domain} 已不再對您的未來使用是好的伺服器選擇，您可以遷移至另一個 Mastodon 伺服器而不流失您現有的跟隨者。您甚至可以運行您自己的伺服器！",
   "onboarding.tips.verification": "<strong>您知道嗎？</strong> 您可以藉由於您自己的網站上設定 Mastodon 個人檔案連結並於個人檔案中連結該網站的方式以驗證您的帳號。不需要任何費用或是文件！",
-  "password_confirmation.exceeds_maxlength": "密碼確認欄超過最長密碼長度限制",
-  "password_confirmation.mismatching": "密碼確認欄與密碼不一致",
+  "password_confirmation.exceeds_maxlength": "密碼驗證欄超過最長密碼長度限制",
+  "password_confirmation.mismatching": "密碼驗證欄與密碼不一致",
   "picture_in_picture.restore": "還原",
   "poll.closed": "已關閉",
   "poll.refresh": "重新整理",
@@ -794,6 +831,7 @@
   "timeline_hint.remote_resource_not_displayed": "不會顯示來自其他伺服器的 {resource}",
   "timeline_hint.resources.followers": "跟隨者",
   "timeline_hint.resources.follows": "正在跟隨",
+  "timeline_hint.resources.replies": "某些回覆",
   "timeline_hint.resources.statuses": "更早的嘟文",
   "trends.counter_by_accounts": "{count, plural, one {{counter} 人} other {{counter} 人}}於過去 {days, plural, one {日} other {{days} 日}} 之間",
   "trends.trending_now": "現正熱門趨勢",
diff --git a/config/locales/af.yml b/config/locales/af.yml
index adc9d5dbd5d0f9..648ec6091d495f 100644
--- a/config/locales/af.yml
+++ b/config/locales/af.yml
@@ -96,9 +96,6 @@ af:
       webhook: Web-hoek
   appearance:
     advanced_web_interface_hint: As jy die volle wydte van jou skerm gebruik, laat die gevorderde webkoppelvlak jou toe om kolomme met verskillende soorte inligting langs mekaar te rangskik. So kan jy, byvoorbeeld, tegelyk jou tuistoevoer, kennisgewings, gefedereerde tydlyn en nog ander lyste of hutsetikette dophou.
-  application_mailer:
-    notification_preferences: Verander e-posvoorkeure
-    settings: 'Verander e-posvoorkeure: %{link}'
   auth:
     apply_for_account: Doen aansoek om ’n rekening
     logout: Teken uit
diff --git a/config/locales/an.yml b/config/locales/an.yml
index 637aa8c8b37cdc..9afc9e881d3bcd 100644
--- a/config/locales/an.yml
+++ b/config/locales/an.yml
@@ -31,7 +31,6 @@ an:
       created_msg: Nota de moderación creyada con exito!
       destroyed_msg: Nota de moderación destruyida con exito!
     accounts:
-      add_email_domain_block: Meter en lista negra lo dominio d'o correu
       approve: Aprebar
       approved_msg: La solicitut de rechistro de %{username} ha estau aprebada correctament
       are_you_sure: Yes seguro?
@@ -58,7 +57,6 @@ an:
       demote: Degradar
       destroyed_msg: Los datos de %{username} son ya en coda pa estar eliminaus de camín
       disable: Deshabilitar
-      disable_sign_in_token_auth: Deshabilitar l'autenticación per token de correu electronico
       disable_two_factor_authentication: Desactivar autenticación de dos factors
       disabled: Deshabilitada
       display_name: Nombre
@@ -67,7 +65,6 @@ an:
       email: Adreza de correu-e
       email_status: Status de correu-e
       enable: Habilitar
-      enable_sign_in_token_auth: Habilitar l'autenticación per token de correu electronico
       enabled: Habilitada
       enabled_msg: S'ha descongelado correctament la cuenta de %{username}
       followers: Seguidores
@@ -129,7 +126,6 @@ an:
       resubscribe: Re-suscribir
       role: Rol
       search: Buscar
-      search_same_email_domain: Atros usuarios con o mesmo dominio de correu
       search_same_ip: Atros usuarios con a mesma IP
       security_measures:
         only_password: Nomás clau
@@ -169,26 +165,21 @@ an:
         approve_appeal: Aprebar Apelación
         approve_user: Aprebar Usuario
         assigned_to_self_report: Asignar Reporte
-        change_email_user: Cambiar Correu Electronico de l'Usuario
         change_role_user: Cambiar Rol d'Usuario
         confirm_user: Confirmar Usuario
         create_account_warning: Creyar Alvertencia
         create_announcement: Creyar Anuncio
-        create_canonical_email_block: Creyar Bloqueyo de Correu Electronico
         create_custom_emoji: Creyar Emoji Personalizau
         create_domain_allow: Creyar Permiso de Dominio
         create_domain_block: Creyar Bloqueyo de Dominio
-        create_email_domain_block: Creyar Bloqueyo de Dominio de Correu Electronico
         create_ip_block: Creyar regla IP
         create_unavailable_domain: Creyar Dominio No Disponible
         create_user_role: Creyar Rol
         demote_user: Degradar Usuario
         destroy_announcement: Eliminar Anuncio
-        destroy_canonical_email_block: Eliminar Bloqueyo de Correu Electronico
         destroy_custom_emoji: Eliminar Emoji Personalizau
         destroy_domain_allow: Eliminar Permiso de Dominio
         destroy_domain_block: Eliminar Bloqueyo de Dominio
-        destroy_email_domain_block: Eliminar Bloqueyo de Dominio de Correu Electronico
         destroy_instance: Purgar Dominio
         destroy_ip_block: Eliminar regla IP
         destroy_status: Eliminar Estau
@@ -196,10 +187,8 @@ an:
         destroy_user_role: Destruyir Rol
         disable_2fa_user: Deshabilitar 2FA
         disable_custom_emoji: Deshabilitar Emoji Personalizau
-        disable_sign_in_token_auth_user: Deshabilitar l'Autenticación per Token de Correu Electronico pa l'Usuario
         disable_user: Deshabilitar Usuario
         enable_custom_emoji: Habilitar Emoji Personalizau
-        enable_sign_in_token_auth_user: Habilitar l'Autenticación per Token de Correu Electronico pa l'Usuario
         enable_user: Habilitar Usuario
         memorialize_account: Transformar en Cuenta Commemorativa
         promote_user: Promover Usuario
@@ -228,26 +217,20 @@ an:
         approve_appeal_html: "%{name} aprebó la solicitut de moderación de %{target}"
         approve_user_html: "%{name} aprebó lo rechistro de %{target}"
         assigned_to_self_report_html: "%{name} asignó l'informe %{target} a ell mesmo"
-        change_email_user_html: "%{name} cambió l'adreza de correu electronico de l'usuario %{target}"
         change_role_user_html: "%{name} cambió lo rol de %{target}"
-        confirm_user_html: "%{name} confirmó l'adreza de correu electronico de l'usuario %{target}"
         create_account_warning_html: "%{name} ninvió una alvertencia a %{target}"
         create_announcement_html: "%{name} ha creyau un nuevo anuncio %{target}"
-        create_canonical_email_block_html: "%{name} blocó lo correu electronico con o hash %{target}"
         create_custom_emoji_html: "%{name} puyó un nuevo emoji %{target}"
         create_domain_allow_html: "%{name} permitió la federación con o dominio %{target}"
         create_domain_block_html: "%{name} blocó lo dominio %{target}"
-        create_email_domain_block_html: "%{name} blocó lo dominio de correu electronico %{target}"
         create_ip_block_html: "%{name} creyó una regla pa la IP %{target}"
         create_unavailable_domain_html: "%{name} aturó las entregas a lo dominio %{target}"
         create_user_role_html: "%{name} creyó lo rol %{target}"
         demote_user_html: "%{name} degradó a l'usuario %{target}"
         destroy_announcement_html: "%{name} eliminó l'anuncio %{target}"
-        destroy_canonical_email_block_html: "%{name} desblocó lo correu electronico con o hash %{target}"
         destroy_custom_emoji_html: "%{name} eliminó lo emoji %{target}"
         destroy_domain_allow_html: "%{name} blocó la federación con o dominio %{target}"
         destroy_domain_block_html: "%{name} desblocó lo dominio %{target}"
-        destroy_email_domain_block_html: "%{name} desblocó lo dominio de correu electronico %{target}"
         destroy_instance_html: "%{name} purgó lo dominio %{target}"
         destroy_ip_block_html: "%{name} eliminó una regla pa la IP %{target}"
         destroy_status_html: "%{name} eliminó lo estau per %{target}"
@@ -255,10 +238,8 @@ an:
         destroy_user_role_html: "%{name} eliminó lo rol %{target}"
         disable_2fa_user_html: "%{name} desactivó lo requisito de dos factors pa l'usuario %{target}"
         disable_custom_emoji_html: "%{name} desactivó lo emoji %{target}"
-        disable_sign_in_token_auth_user_html: "%{name} ha deshabilitau l'autenticación per token de correu electronico pa %{target}"
         disable_user_html: "%{name} deshabilitó l'inicio de sesión pa l'usuario %{target}"
         enable_custom_emoji_html: "%{name} activó lo emoji %{target}"
-        enable_sign_in_token_auth_user_html: "%{name} ha habilitau l'autenticación per token de correu electronico pa %{target}"
         enable_user_html: "%{name} habilitó l'inicio de sesión pa l'usuario %{target}"
         memorialize_account_html: "%{name} convirtió la cuenta de %{target} en una pachina in memoriam"
         promote_user_html: "%{name} promoción a l'usuario %{target}"
@@ -266,7 +247,6 @@ an:
         reject_user_html: "%{name} refusó lo rechistro de %{target}"
         remove_avatar_user_html: "%{name} eliminó lo avatar de %{target}"
         reopen_report_html: "%{name} reubrió l'informe %{target}"
-        resend_user_html: "%{name} ha reninviau lo correu de confirmación pa %{target}"
         reset_password_user_html: "%{name} reinició la clau de l'usuario %{target}"
         resolve_report_html: "%{name} resolvió l'informe %{target}"
         sensitive_account_html: "%{name} marcó los fichers multimedia de %{target} como sensibles"
@@ -414,7 +394,6 @@ an:
       attempts_over_week:
         one: "%{count} intento entre la zaguera semana"
         other: "%{count} intentos de rechistro entre la zaguera semana"
-      created_msg: Dominio de correu anyadiu a la lista negra con exito
       delete: Borrar
       dns:
         types:
@@ -423,11 +402,7 @@ an:
       new:
         create: Anyadir dominio
         resolve: Resolver dominio
-        title: Nueva dentrada en a lista negra de correu
-      no_email_domain_block_selected: No s'ha cambiau bloqueyos de dominio ya que garra ha estau triau
-      resolved_dns_records_hint_html: Lo nombre de dominio resuelte los siguients dominios MX, los quals son responsables en zaguera instancia d'acceptar lo correu electronico. Blocar un dominio MX blocará los rechistros de qualsequier adreza de correu electronico que utilice lo mesmo dominio MX, mesmo si lo nombre de dominio visible ye diferent. <strong>Tienga cudiau de no blocar los prencipals furnidors de correu electronico.</strong>
       resolved_through_html: Resuelto a traviés de %{domain}
-      title: Lista negra de correu
     export_domain_allows:
       new:
         title: Importar dominios permitius
@@ -575,7 +550,6 @@ an:
         resolve_description_html: No se prendrán medidas contra la cuenta denunciada, no se rechistrará l'amonestación, y se zarrará l'informe.
         silence_description_html: La cuenta será visible nomás pa aquells que ya en sigan u lo busquen manualment, limitando seriosament lo suyo alcance. Siempre puede estar revertiu. Se zarrarán totz los informes contre esta cuenta.
         suspend_description_html: Esta cuenta y totz los suyos contenius serán inaccesibles y finalment eliminaus, y interaccionar con ella no será posible. Reversible en 30 días. Zarra totz los informes contra eta cuenta.
-      actions_description_html: Decide qué medidas prener pa resolver esta denuncia. Si prenes una acción punitiva contra la cuenta denunciada, se le ninviará a dita cuenta una notificación per correu electronico, fueras de quan se tríe la categoría <strong>Spam</strong>.
       actions_description_remote_html: Decide qué acción prener pa resolver este reporte. Ixo afectará nomás a como <strong>lo tuyo</strong> servidor se comunica con estea cuenta remota y a cómo chestiona lo suyo conteniu.
       add_to_report: Anyadir mas a lo reporte
       are_you_sure: Yes seguro?
@@ -652,7 +626,6 @@ an:
         manage_appeals: Administrar Apelacions
         manage_appeals_description: Permite a los usuarios revisar apelacions contra accions de moderación
         manage_blocks: Administrar Bloqueyos
-        manage_blocks_description: Permite a los usuarios blocar los furnidors de e-mail y las adrezas IP
         manage_custom_emojis: Administrar Emojis Personalizaus
         manage_custom_emojis_description: Permite a los usuarios chestionar emojis personalizaus en o servidor
         manage_federation: Administrar Federación
@@ -670,7 +643,6 @@ an:
         manage_taxonomies: Administrar Taxonomías
         manage_taxonomies_description: Permite a los usuarios revisar lo conteniu en tendencia y actualizar la configuración d'as etiquetas
         manage_user_access: Administrar Acceso d'Usuarios
-        manage_user_access_description: Permite a los usuarios desactivar l'autenticación de dos factors d'atros usuarios, cambiar la suya adreza de correu electronico y restablir la suya clau
         manage_users: Administrar Usuarios
         manage_users_description: Permite a los usuarios veyer los detalles d'atros usuarios y realizar accions de moderación contra ells
         manage_webhooks: Administrar Webhooks
@@ -845,7 +817,6 @@ an:
         used_by_over_week:
           one: Usada per una persona entre la zaguera semana
           other: Usada per %{count} personas entre la zaguera semana
-      title: Tendencias
       trending: En tendencia
     warning_presets:
       add_new: Anyadir nuevo
@@ -920,9 +891,7 @@ an:
       guide_link_text: Totz pueden contribuyir.
     sensitive_content: Conteniu sensible
   application_mailer:
-    notification_preferences: Cambiar preferencias de correu electronico
     salutation: "%{name}:"
-    settings: 'Cambiar preferencias de correu: %{link}'
     view: 'Vista:'
     view_profile: Veyer perfil
     view_status: Veyer estau
@@ -972,9 +941,7 @@ an:
       title: Creyar cuenta de Mastodon en %{domain}.
     status:
       account_status: Estau d'a cuenta
-      confirming: Asperando confirmación de correu electronico.
       functional: La tuya cuenta ye completament operativa.
-      pending: La suya solicitut ye pendient de revisión per los nuestros administradors. Ixo puede tardar bell tiempo. Vusté recibirá un correu electronico si lo solicitut sía aprebada.
       redirecting_to: La tuya cuenta se troba inactiva perque ye estando reendrezada a %{acct}.
       view_strikes: Veyer amonestacions pasadas contra la tuya cuenta
     too_fast: Formulario ninviau masiau rapido, lo intente de nuevo.
@@ -1016,9 +983,6 @@ an:
       before: 'Antes de continar, per favor leye con atención las siguients notas:'
       caches: Lo conteniu que ha estau almagazenau en caché per atros servidors puede persistir
       data_removal: Las tuyas publicacions y la resta de datos s'eliminarán definitivament
-      email_change_html: Puetz <a href="%{path}"> cambiar la tuya adreza de correu electronico</a> sin eliminar la tuya cuenta
-      email_contact_html: Si encara no t'ha plegau, puetz escribir a <a href="mailto:%{email}">%{email}</a> pa pedir aduya
-      email_reconfirmation_html: Si no t'ha plegau lo correu de confirmación, puetz <a href="%{path}"> tornar a demandar-lo</a>
       irreversible: No podrás restaurar ni reactivar la tuya cuenta
       more_details_html: Pa mas detalles, veyer <a href="%{terms_path}"> la politica de privacidat</a>.
       username_available: Lo tuyo nombre d'usuario tornará a estar disponible
@@ -1199,7 +1163,6 @@ an:
     authentication_methods:
       otp: aplicación d'autenticación en dos pasos
       password: clau
-      sign_in_token: codigo de seguranza per correu electronico
       webauthn: claus de seguranza
     description_html: Si veye una actividat que no reconoixe, considere cambiar la suya clau y habilitar l'autenticación de dos factors.
     empty: No i hai historial d'autenticación disponible
@@ -1285,7 +1248,6 @@ an:
     update:
       subject: "%{name} editó una publicación"
   notifications:
-    email_events: Eventos pa notificacions per correu electronico
     email_events_hint: 'Tría los eventos pa los quals deseyas recibir notificacions:'
   number:
     human:
@@ -1599,7 +1561,6 @@ an:
     follow_limit_reached: No puetz seguir a mas de %{limit} personas
     invalid_otp_token: Codigo de dos factors incorrecto
     otp_lost_help_html: Si perdiés a l'acceso a totz dos, puetz meter-te en contancto con %{email}
-    seamless_external_login: Has iniciau sesión dende un servicio externo, asinas que los achustes de clau y correu no son disponibles.
     signed_in_as: 'Sesión iniciada como:'
   verification:
     verification: Verificación
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 4df24c984c0ed0..1a2d9a290657ee 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -39,7 +39,6 @@ ar:
       created_msg: تم إنشاء ملاحظة الإشراف بنجاح!
       destroyed_msg: تم تدمير ملاحظة الإشراف بنجاح!
     accounts:
-      add_email_domain_block: حظر نطاق البريد الإلكتروني هذا
       approve: صادِق عليه
       approved_msg: تمت الموافقة على تسجيل %{username}
       are_you_sure: هل أنت متأكد؟
@@ -66,7 +65,6 @@ ar:
       demote: إنزال الدور الوظيفي
       destroyed_msg: بيانات حساب %{username} الآن في قائمة الانتظار ليتم حذفها قريباً
       disable: تجميد
-      disable_sign_in_token_auth: تعطيل مصادقة رمز البريد الإلكتروني
       disable_two_factor_authentication: تعطيل المصادقة بخطوتين
       disabled: معطَّل
       display_name: عرض الاسم
@@ -75,7 +73,6 @@ ar:
       email: البريد الإلكتروني
       email_status: حالة البريد الإلكتروني
       enable: تفعيل
-      enable_sign_in_token_auth: تمكين مصادقة رمز البريد الإلكتروني
       enabled: مفعَّل
       enabled_msg: تم إلغاء تجميد حساب %{username}
       followers: المتابِعون
@@ -144,7 +141,6 @@ ar:
       resubscribe: إعادة الاشتراك
       role: الدور
       search: البحث
-      search_same_email_domain: مستخدمون آخرون لديهم نفس نطاق البريد الإلكتروني
       search_same_ip: مستخدِمون آخرون بنفس الـ IP
       security: الأمان
       security_measures:
@@ -185,26 +181,21 @@ ar:
         approve_appeal: الموافقة على الطعن
         approve_user: الموافقة على المستخدم
         assigned_to_self_report: أسند التقرير
-        change_email_user: تغيير عنوان البريد الإلكتروني الخاص بالمستخدم
         change_role_user: تم تغيير الرتبه للمستخدم
         confirm_user: تأكيد المستخدم
         create_account_warning: إنشاء تحذير
         create_announcement: إنشاء إعلان
-        create_canonical_email_block: إنشاء حظر للبريد
         create_custom_emoji: إنشاء إيموجي مخصص
         create_domain_allow: إنشاء نطاق المسموح به
         create_domain_block: إنشاء حظر لنطاق
-        create_email_domain_block: إنشاء كتلة نطاق بريد إلكتروني
         create_ip_block: إنشاء قاعدة IP جديدة
         create_unavailable_domain: إنشاء نطاق غير متوفر
         create_user_role: انشاء دور
         demote_user: إنزال رتبة المستخدم
         destroy_announcement: احذف الإعلان
-        destroy_canonical_email_block: حذف نطاق للبريد
         destroy_custom_emoji: احذف الإيموجي المخصص
         destroy_domain_allow: حذف النطاق المسموح به
         destroy_domain_block: إزالة حظر النطاق
-        destroy_email_domain_block: حذف حظر نطاق بريد إلكتروني
         destroy_instance: تنظيف النطاق
         destroy_ip_block: حذف قاعدة IP
         destroy_status: حذف المنشور
@@ -212,10 +203,8 @@ ar:
         destroy_user_role: حذف الدور
         disable_2fa_user: تعطيل 2FA
         disable_custom_emoji: تعطيل الإيموجي المخصص
-        disable_sign_in_token_auth_user: تعطيل مصادقة رمز البريد الإلكتروني للمستخدم
         disable_user: تعطيل المستخدم
         enable_custom_emoji: تفعيل الإيموجي المخصص
-        enable_sign_in_token_auth_user: تمكين مصادقة رمز البريد الإلكتروني للمستخدم
         enable_user: تفعيل المستخدم
         memorialize_account: جعل الحساب تذكاريا
         promote_user: ترقية المستخدم
@@ -244,26 +233,20 @@ ar:
         approve_appeal_html: وافق %{name} على استئناف الطعن بشأن قرار الإشراف من %{target}
         approve_user_html: وافق %{name} على تسجيل %{target}
         assigned_to_self_report_html: قام %{name} بإسناد التقرير %{target} لأنفسهم
-        change_email_user_html: غيّر %{name} عنوان البريد الإلكتروني للمستخدم %{target}
         change_role_user_html: قام %{name} بإنشاء قاعدة للـIP %{target}
-        confirm_user_html: "%{name} قد قام بتأكيد عنوان البريد الإلكتروني لـ %{target}"
         create_account_warning_html: قام %{name} بإرسال تحذير إلى %{target}
         create_announcement_html: قام %{name} بإنشاء إعلان جديد %{target}
-        create_canonical_email_block_html: قام %{name} بحظر نطاق البريد الإلكتروني %{target}
         create_custom_emoji_html: "%{name} قام برفع إيموجي جديد %{target}"
         create_domain_allow_html: قام %{name} بإضافة النطاق %{target} إلى القائمة البيضاء
         create_domain_block_html: "%{name} قام بحجب نطاق %{target}"
-        create_email_domain_block_html: قام %{name} بحظر نطاق البريد الإلكتروني %{target}
         create_ip_block_html: قام %{name} بإنشاء قاعدة للـIP %{target}
         create_unavailable_domain_html: قام %{name} بتوقيف التوصيل للنطاق %{target}
         create_user_role_html: "%{name} أنشأ رتبه %{target}"
         demote_user_html: قام %{name} بخفض الرتبة الوظيفية لـ%{target}
         destroy_announcement_html: قام %{name} بحذف الإعلان %{target}
-        destroy_canonical_email_block_html: قام %{name} برفع الحظر عن نطاق البريد الإلكتروني %{target}
         destroy_custom_emoji_html: قام %{name} بتحديث الإيموجي %{target}
         destroy_domain_allow_html: قام %{name} بمنع الاتحاد مع النطاق %{target}
         destroy_domain_block_html: قام %{name} برفع الحظر عن النطاق %{target}
-        destroy_email_domain_block_html: قام %{name} برفع الحظر عن نطاق البريد الإلكتروني %{target}
         destroy_instance_html: "%{name} قام بحجب نطاق %{target}"
         destroy_ip_block_html: قام %{name} بحذف قاعدة للـIP %{target}
         destroy_status_html: قام %{name} بحذف منشور من %{target}
@@ -271,10 +254,8 @@ ar:
         destroy_user_role_html: "%{name} أنشأ رتبه %{target}"
         disable_2fa_user_html: قام %{name} بتعطيل المصادقة بخطوتين للمستخدم %{target}
         disable_custom_emoji_html: قام %{name} بتعطيل الإيموجي %{target}
-        disable_sign_in_token_auth_user_html: "%{name} تعطيل مصادقة رمز البريد الإلكتروني لـ %{target}"
         disable_user_html: قام %{name} بتعطيل تسجيل الدخول للمستخدم %{target}
         enable_custom_emoji_html: قام %{name} بتنشيط الإيموجي %{target}
-        enable_sign_in_token_auth_user_html: "%{name} تمكين مصادقة رمز البريد الإلكتروني لـ %{target}"
         enable_user_html: قام %{name} بتنشيط تسجيل الدخول للمستخدم %{target}
         memorialize_account_html: قام %{name} بتحويل حساب %{target} إلى صفحة تذكارية
         promote_user_html: قام %{name} بترويج المستخدم %{target}
@@ -282,7 +263,6 @@ ar:
         reject_user_html: رفض %{name} تسجيل %{target}
         remove_avatar_user_html: قام %{name} بإزالة صورة %{target} الرمزية
         reopen_report_html: قام %{name} بإعادة فتح الشكوى %{target}
-        resend_user_html: "%{name} إعادة إرسال البريد الإلكتروني للتأكيد لـ %{target}"
         reset_password_user_html: قام %{name} بإعادة تعيين كلمة مرور المستخدم %{target}
         resolve_report_html: قام %{name} بمعالجة الشكوى %{target}
         sensitive_account_html: قام %{name} بوضع علامة حساس على محتوى %{target}
@@ -461,7 +441,6 @@ ar:
         other: "%{count} محاولات تسجيل في آخر أسبوع"
         two: "%{count} محاولتا تسجيل في آخر أسبوع"
         zero: "%{count} محاولة تسجيل في آخر أسبوع"
-      created_msg: لقد دخل حظر نطاق البريد الإلكتروني حيّز الخدمة
       delete: حذف
       dns:
         types:
@@ -470,12 +449,8 @@ ar:
       new:
         create: إضافة نطاق
         resolve: العثور على عنوان النطاق
-        title: إضافة نطاق بريد جديد إلى اللائحة السوداء
-      no_email_domain_block_selected: لم يطرأ أي تغيير على أي نطاق بريد بما أنه لم يتم اختيار أي نطاق
       not_permitted: غير مسموح به
-      resolved_dns_records_hint_html: عنوان النطاق يعود لخوادم البريد (MX) التالية وهو ما يسمح للنطاق باستقبال البريد. حظر خوادم البريد هذه سوف يتسبب في منع أي تسجيل خلال أي نطاق يستخدم هذه الخوادم حتى لو كان اسم النطاق مختلف عن اسماء خوادم البريد.<strong>احذر من حظر مزودي البريد العالميين.</strong>
       resolved_through_html: الحصول على العنوان من خلال %{domain}
-      title: القائمة السوداء للبريد الإلكتروني
     export_domain_allows:
       new:
         title: استيراد قامة النطاقات المسموحة
@@ -642,7 +617,6 @@ ar:
         resolve_description_html: ولن يُتخذ أي إجراء ضد الحساب المبلّغ عنه، ولن تسلَّط عليه أية عقوبة، وسوف يُغلق التقرير.
         silence_description_html: الحساب سيظهر فقط لمن يتابعه أو قام بالبحث عنه بشكل مباشر مما يخفض إمكانية رؤيته بشكل شبه كامل. يمكنك دائما التراجع عن هذا الإجراء. تُغلَق كافة الإبلاغات عن هذا الحساب.
         suspend_description_html: سيُمنع الوصول إلى الحساب وجميع محتوياته وتُحذف تدريجياً، وسيكون التفاعل معه مستحيلاً. بالإمكان عكس مفعول ذلك في غضون 30 يوماً. يغلق جميع التبليغات ضد الحساب.
-      actions_description_html: تحديد الإجراءات التي يتعين اتخاذها لحل هذا التبليغ. إذا اتخذت إجراء عقابيا ضد الحساب المبلغ عنه، فسيتم إرسال إشعار بالبريد الإلكتروني إليهم، إلا عندما يتم تحديد فئة <strong>البريد المزعج.</strong>
       actions_description_remote_html: حدّد الإجراءات التي يتعين اتخاذها لحل هذا التقرير. هذا سيؤثر فقط على كيفية اتصال <strong>خادمك</strong> بهذا الحساب البعيد والتعامل مع محتوياته.
       add_to_report: أضف المزيد إلى التقرير
       are_you_sure: هل أنت متأكد ؟
@@ -703,7 +677,6 @@ ar:
         delete_data_html: حذف ملف <strong>@%{acct}</strong> الشخصي بمحتواه بعد 30 يوماً من الآن ما لم يُلغَ تعليق الحساب
         preview_preamble_html: 'سوف يتلقى <strong>@%{acct}</strong> تحذيرا يحتوي على ما يلي:'
         record_strike_html: تسجيل عقوبة ضد <strong>@%{acct}</strong> لمساعدتك في أخذ إجراءات إضافية في حال انتهاكات مستقبلية من طرف هذا الحساب
-        send_email_html: إرسال بريد إلكتروني تحذيري إلى <strong>@%{acct}</strong>
         warning_placeholder: مبررات إضافية اختيارية لإجراء الإشراف.
       target_origin: مصدر الحساب المبلغ عنه
       title: الشكاوى
@@ -751,7 +724,6 @@ ar:
         manage_appeals: إدارة الاستئنافات
         manage_appeals_description: يسمح للمستخدمين بمراجعة الطعن ضد إجراءات الإشراف
         manage_blocks: إدارة الحظر
-        manage_blocks_description: يسمح للمستخدمين بحظر مزودي خدمات البريد الإلكتروني وعناوين IP
         manage_custom_emojis: إدارة الرموز التعبيريّة المخصصة
         manage_custom_emojis_description: السماح للمستخدمين بإدارة الرموز التعبيريّة المخصصة على الخادم
         manage_federation: إدارة الفديرالية
@@ -769,7 +741,6 @@ ar:
         manage_taxonomies: إدارة التصنيفات
         manage_taxonomies_description: السماح للمستخدمين بمراجعة المحتوى المتداول وتحديث إعدادات الوسم
         manage_user_access: إدارة وصول المستخدم
-        manage_user_access_description: يسمح للمستخدمين بتعطيل المصادقة الثنائية المستخدمين الآخرين، تغيير عنوان البريد الإلكتروني الخاص بهم، وإعادة تعيين كلمة المرور الخاصة بهم
         manage_users: إدارة المستخدمين
         manage_users_description: يسمح للمستخدمين بعرض تفاصيل المستخدمين الآخرين وتنفيذ إجراءات الإشراف ضدهم
         manage_webhooks: إدارة الـWebhooks
@@ -842,7 +813,6 @@ ar:
       destroyed_msg: تم حذف التحميل مِن الموقع بنجاح!
     software_updates:
       critical_update: حَرِج - يرجى التحديث في أقرب وقت ممكن
-      description: من المستحسَن إبقاء تثبيت ماستدون الخاص بك محدثا للاستفادة من أحدث التصحيحات والميزات. إضافةً إلى ذلك، فهو مهمّ جدا تحديث ماستدون أحيانًا في الوقت المناسب لتجنب المسائل الأمنية. لهذه الأسباب، يقوم ماستدون بالتحقق من التحديثات كل 30 دقيقة، وسيتم إعلامك وفقا لتفضيلات إشعارات البريد الإلكتروني الخاصة بك.
       documentation_link: معرفة المزيد
       release_notes: ملخصات الإصدار
       title: التحديثات المتوفرة
@@ -1006,7 +976,6 @@ ar:
           other: مستخدَم من قِبل %{count} شخص خلال الأسبوع الماضي
           two: مستخدَم من قِبل %{count} شخصين خلال الأسبوع الماضي
           zero: مستخدَم من قِبل %{count} شخص خلال الأسبوع الماضي
-      title: المتداوَلة
       trending: المتداولة
     warning_presets:
       add_new: إضافة واحد جديد
@@ -1091,9 +1060,7 @@ ar:
       guide_link_text: يمكن للجميع المساهمة.
     sensitive_content: المحتوى الحساس
   application_mailer:
-    notification_preferences: تعديل تفضيلات البريد الإلكتروني
     salutation: "%{name}،"
-    settings: 'تغيير تفضيلات البريد الإلكتروني: %{link}'
     unsubscribe: إلغاء الاشتراك
     view: 'اعرض:'
     view_profile: اعرض الصفحة التعريفية
@@ -1113,7 +1080,6 @@ ar:
       hint_html: شيء واحد آخر! نحن بحاجة إلى التأكّد من أنك إنسان (حتى نتمكن من تتفادي البريد المزعج!). حل رمز CAPTCHA أدناه وانقر فوق "متابعة".
       title: التحقق من الأمان
     confirmations:
-      awaiting_review: تمّ تأكيد عنوان بريدك الإلكتروني! موظفو %{domain} يعاينونَ تسجيلكَ حاليًا. ستتلقى بريدًا إلكترونيًا إن تَمّ قُبولك!
       awaiting_review_title: التسجيل الخاص بك قيد المُعاينة
       clicking_this_link: اضغط على هذا الرابط
       login_link: تسجيل الدخول
@@ -1121,7 +1087,6 @@ ar:
       redirect_to_app_html: كان من المفترض إعادة توجيهك إلى تطبيق <strong>%{app_name}</strong>. إن لم يحدث ذلك، حاول %{clicking_this_link} أو العودة يدويًا إلى التطبيق.
       registration_complete: اكتمل تسجيل حسابك على %{domain} الآن!
       welcome_title: أهلاً بك، %{name}!
-      wrong_email_hint: إذا كان عنوان البريد الإلكتروني هذا غير صحيح، يمكنك تغييره في إعدادات الحساب.
     delete_account: احذف الحساب
     delete_account_html: إن كنت ترغب في حذف حسابك يُمكنك <a href="%{path}">المواصلة هنا</a>. سوف يُطلَبُ منك التأكيد قبل الحذف.
     description:
@@ -1142,7 +1107,6 @@ ar:
     or_log_in_with: أو قم بتسجيل الدخول بواسطة
     privacy_policy_agreement_html: لقد قرأتُ وأوافق على سياسة الخصوصية <a href="%{privacy_policy_path}" target="_blank"></a>
     progress:
-      confirm: تأكيد عنوان البريد الإلكتروني
       details: تفاصيلك
       review: رأيُنا
       rules: قبول القواعد
@@ -1164,10 +1128,8 @@ ar:
     security: الأمان
     set_new_password: إدخال كلمة مرور جديدة
     setup:
-      email_below_hint_html: قم بفحص مجلد البريد المزعج الخاص بك، أو قم بطلب آخر. يمكنك تصحيح عنوان بريدك الإلكتروني إن كان خاطئا.
       email_settings_hint_html: انقر على الرابط الذي أرسلناه لك للتحقق من %{email}. سننتظر هنا.
       link_not_received: ألم تحصل على رابط؟
-      new_confirmation_instructions_sent: سوف تتلقى رسالة بريد إلكتروني جديدة مع رابط التأكيد في غضون بضع دقائق!
       title: تحقَّق من بريدك الوارِد
     sign_in:
       preamble_html: قم بتسجيل الدخول باستخدام بيانات الاعتماد الخاصة بك على <strong>%{domain}</strong>. إن استُضيف حسابك على خادم مختلف عن هذا الخادم، لن تتمكن من الولوج هنا.
@@ -1178,9 +1140,7 @@ ar:
       title: دعنا نجهّز %{domain}.
     status:
       account_status: حالة الحساب
-      confirming: في انتظار اكتمال تأكيد البريد الإلكتروني.
       functional: حسابك يعمل بشكل كامل.
-      pending: إن طلبك قيد المراجعة من قبل فريقنا. قد يستغرق هذا بعض الوقت. سوف تتلقى بريدا إلكترونيا إذا تمت الموافقة على طلبك.
       redirecting_to: حسابك غير نشط لأنه تم تحويله حاليا إلى %{acct}.
       self_destruct: نظرًا لإغلاق %{domain}، ستحصل فقط على وصول محدود إلى حسابك.
       view_strikes: عرض العقوبات السابقة المُطَبَّقة ضد حسابك
@@ -1223,9 +1183,6 @@ ar:
       before: 'يرجى قراءة هذه الملاحظات بتأنّي قبل المواصلة:'
       caches: قد يبقى المحتوى الذي تم تخزينه مؤقتًا مِن طرف الخوادم الأخرى
       data_removal: سوف تُحذَف منشوراتك والبيانات الأخرى نهائيا
-      email_change_html: بإمكانك <a href="%{path}">تغيير عنوان بريدك الإلكتروني</a> دون أن يُحذف حسابك
-      email_contact_html: إن لم تتلقّ أي شيء ، يمكنك مراسلة <a href="mailto:%{email}">%{email}</a> لطلب المساعدة
-      email_reconfirmation_html: إن لم تتلقّ الرسالة الإلكترونية للتأكيد ، بإمكانك <a href="%{path}">إعادة طلبها ثانيةً</a>
       irreversible: لن يكون بإمكانك استرجاع أو إعادة تنشيط حسابك
       more_details_html: للمزيد مِن التفاصيل ، يرجى الإطلاع على <a href="%{terms_path}">سياسة الخصوصية</a>.
       username_available: سيصبح اسم مستخدمك متوفرا ثانية
@@ -1490,7 +1447,6 @@ ar:
     authentication_methods:
       otp: تطبيق المصادقة الثنائية
       password: كلمة المرور
-      sign_in_token: رمز الأمان للبريد الإلكتروني
       webauthn: مفاتيح الأمان
     description_html: إذا رأيت النشاط الذي لا تتعرف عليه، فكر في تغيير كلمة المرور الخاصة بك وتفعيل المصادقة ذات العاملين.
     empty: لا يوجد سجل مصادقة متاح
@@ -1501,16 +1457,6 @@ ar:
     unsubscribe:
       action: نعم، ألغِ الاشتراك
       complete: غير مشترك
-      confirmation_html: هل أنت متأكد أنك تريد إلغاء الاشتراك في تلقي %{type} لـ Mastodon على %{domain} إلى بريدك الإلكتروني على %{email}؟ يمكنك دائمًا إعادة الاشتراك من <a href="%{settings_path}">إعدادات إشعارات البريد الإلكتروني</a>.
-      emails:
-        notification_emails:
-          favourite: إشعارات رسائل البريد الخاصة بالمفضلة
-          follow: إشعارات رسائل البريد الخاصة بالمتابعة
-          follow_request: رسائل البريد الإلكترونية الخاصة بطلبات المتابعة
-          mention: إشعارات رسائل البريد عندما يَذكُرك أحدهم
-          reblog: رسائل البريد الخاصة بالمنشورات المعاد نشرها
-      resubscribe_html: إذا قمت بإلغاء الاشتراك عن طريق الخطأ، يمكنك إعادة الاشتراك من <a href="%{settings_path}">إعدادات الإشعارات في بريدك الإلكتروني</a>.
-      success_html: لن تتلقّ بعد الآن %{type} لماستدون مِن %{domain} على بريدك الإلكتروني %{email}.
       title: إلغاء الاشتراك
   media_attachments:
     validations:
@@ -1591,8 +1537,6 @@ ar:
     update:
       subject: قام %{name} بتحرير منشور
   notifications:
-    administration_emails: إشعارات البريد الإلكتروني الإدارية
-    email_events: الأحداث للإشعارات عبر البريد الإلكتروني
     email_events_hint: 'اختر الأحداث التي تريد أن تصِلَك اشعارات عنها:'
   number:
     human:
@@ -1751,7 +1695,6 @@ ar:
     import: استيراد
     import_and_export: استيراد وتصدير
     migrate: تهجير الحساب
-    notifications: إشعارات البريد الإلكتروني
     preferences: التفضيلات
     profile: الملف التعريفي
     relationships: المتابِعون والمتابَعون
@@ -2013,7 +1956,6 @@ ar:
     invalid_otp_token: رمز المصادقة بخطوتين غير صالح
     otp_lost_help_html: إن فقدتَهُما ، يمكنك الاتصال بـ %{email}
     rate_limited: عدد محاولات المصادقة كثير جداً، حاول مرة أخرى لاحقاً.
-    seamless_external_login: لقد قمت بتسجيل الدخول عبر خدمة خارجية، إنّ إعدادات الكلمة السرية و البريد الإلكتروني غير متوفرة.
     signed_in_as: 'تم تسجيل دخولك بصفة:'
   verification:
     extra_instructions_html: <strong>نصيحة:</strong> يمكن أن يكون الرابط الموجود على موقع الويب الخاص بك غير مرئي. الجزء المهم هو <code>rel="me"</code> الذي يمنع انتحال الهوية على مواقع الويب ذات المحتوى الذي ينشئه المستخدم. يمكنك أيضًا استخدام علامة <code>link</code> في رأس الصفحة بدلاً من <code>a</code>، ولكن يجب أن يكون HTML قابلاً للوصول دون تنفيذ JavaScript.
diff --git a/config/locales/ast.yml b/config/locales/ast.yml
index 567e5357ebcfb7..70a0ad3bddeee1 100644
--- a/config/locales/ast.yml
+++ b/config/locales/ast.yml
@@ -18,7 +18,6 @@ ast:
     account_moderation_notes:
       create: Dexar la nota
     accounts:
-      add_email_domain_block: Bloquiar el dominiu de corréu electrónicu
       approved_msg: Aprobóse correutamente la solicitú de rexistru de «%{username}»
       are_you_sure: "¿De xuru que quies facer esta aición?"
       avatar: Avatar
@@ -53,7 +52,6 @@ ast:
         already_confirmed: Esti perfil yá ta confirmáu
       role: Rol
       search: Buscar
-      search_same_email_domain: Otros perfiles col mesmu dominiu de corréu electrónicu
       search_same_ip: Otros perfiles cola mesma IP
       security: Seguranza
       show:
@@ -67,9 +65,7 @@ ast:
     action_logs:
       actions:
         approve_user_html: "%{name} aprobó'l rexistru de: %{target}"
-        change_email_user_html: "%{name} camudó la direición de corréu electrónicu del perfil %{target}"
         change_role_user_html: "%{name} camudó'l rol de: %{target}"
-        confirm_user_html: "%{name} confirmó la direición de corréu electrónicu del perfil %{target}"
         create_account_warning_html: "%{name} unvió una alvertencia a %{target}"
         create_announcement_html: "%{name} creó l'anunciu «%{target}»"
         create_custom_emoji_html: "%{name} xubió un fustaxe nuevu «%{target}»"
@@ -87,7 +83,6 @@ ast:
         reject_user_html: "%{name} refugó'l rexistru de: %{target}"
         remove_avatar_user_html: "%{name} quitó l'avatar de: %{target}"
         reopen_report_html: "%{name} volvió abrir l'informe «%{target}»"
-        resend_user_html: "%{name} volvió unviar el mensaxe de confirmación pa: %{target}"
         resolve_report_html: "%{name} resolvió l'informe «%{target}»"
         unblock_email_account_html: "%{name} desbloquió la direición de corréu electrónicu de: %{target}"
         update_announcement_html: "%{name} anovó l'anunciu «%{target}»"
@@ -242,7 +237,6 @@ ast:
           other: "%{count} notes"
       actions:
         silence_description_html: La cuenta va ser visible namás pa quien yá la siguiere o la buscare manualmente, lo que llenda'l so algame. Esta decisión pue desfacese en cualesquier momentu. Si escueyes esta opción, zárrense tolos informes escontra esta cuenta.
-      actions_description_html: Decidi qué aición tomar pa resolver esti informe. Si tomes una aición punitiva escontra la cuenta de la que s'informó, va unviase un avisu per corréu electrónicu a esa cuenta, esceuto cuando se seleiciona la categoría <strong>Puxarra</strong>.
       add_to_report: Amestar más al informe
       are_you_sure: "¿De xuru que quies facer esta aición?"
       category: Categoría
@@ -345,7 +339,6 @@ ast:
       delete: Desaniciar el ficheru xubíu
     software_updates:
       documentation_link: Saber más
-      type: Tipu
       types:
         major: Versión mayor
         minor: Versión menor
@@ -399,7 +392,6 @@ ast:
         not_usable: Nun se pue usar
         title: Etiquetes en tendencia
         usable: Pue usase
-      title: Tendencies
       trending: En tendencia
     webhooks:
       add_new: Amestar un estremu
@@ -448,8 +440,6 @@ ast:
       guide_link: https://crowdin.com/project/mastodon
       guide_link_text: tol mundu pue collaborar.
     sensitive_content: Conteníu sensible
-  application_mailer:
-    notification_preferences: Camudar les preferencies de los mensaxes de corréu electrónicu
   applications:
     created: L'aplicación creóse correutamente
     destroyed: L'aplicación desanicióse correutamente
@@ -458,8 +448,6 @@ ast:
     warning: Ten munchu curiáu con estos datos, ¡enxamás nun los compartas con naide!
     your_token: El pase d'accesu
   auth:
-    confirmations:
-      wrong_email_hint: Si la direición de corréu electrónicu nun ye correuta, pues camudala na configuración de la cuenta.
     delete_account: Desaniciu de la cuenta
     delete_account_html: Si quies desaniciar la cuenta, pues facelo <a href="%{path}">equí</a>. Va pidísete que confirmes l'aición.
     description:
@@ -483,16 +471,12 @@ ast:
     security: Seguranza
     setup:
       link_not_received: "¿Nun consiguiesti l'enllaz?"
-    sign_in:
-      preamble_html: Anicia la sesión colos tos datos d'accesu en <strong>%{domain}</strong>. Si la cuenta ta agospiada n'otru sirvidor, nun vas ser a aniciar la sesión equí.
-      title: Aniciu de la sesión en «%{domain}»
     sign_up:
       preamble: Con una cuenta nesti sirvidor de Mastodon vas ser a siguir a cualesquier perfil de la rede, independientemente del sirvidor onde s'agospie la so cuenta.
       title: 'Creación d''una cuenta en: %{domain}.'
     status:
       account_status: Estáu de la cuenta
       functional: La cuenta ta completamente operativa.
-      pending: La to solicitú ta pendiente de que la revise'l nuesu personal y ye posible que tarde tiempu. Vas recibir un mensaxe si s'aprueba.
     too_fast: El formulariu xubióse mui rápido, volvi tentalo.
   challenge:
     confirm: Siguir
@@ -519,8 +503,6 @@ ast:
     challenge_not_passed: La información qu'introduxesti nun yera correuta
     confirm_password: Introduz la contraseña pa verificar la to identidá
     warning:
-      email_contact_html: Si nun aportó, pues unviar un mensaxe a <a href="mailto:%{email}">%{email}</a> pa consiguir más ayuda
-      email_reconfirmation_html: Si nun recibiesti'l mensaxe de confirmación, pues <a href="%{path}">volver solicitalu</a>
       more_details_html: Pa consiguir más detalles, mira la <a href="%{terms_path}">política de privacidá</a>.
   disputes:
     strikes:
@@ -674,7 +656,6 @@ ast:
       sign_up:
         subject: "%{name} rexistróse"
     favourite:
-      body: "%{name} marcó como favoritu'l to artículu:"
       subject: "%{name} marcó'l to artículu como favoritu"
     follow:
       body: "¡Agora %{name} siguete!"
@@ -692,7 +673,6 @@ ast:
     update:
       subject: "%{name} editó un artículu"
   notifications:
-    email_events: Unviu d'avisos per corréu electrónicu
     email_events_hint: 'Seleiciona los eventos de los que quies recibir avisos:'
   number:
     human:
@@ -917,7 +897,6 @@ ast:
     follow_limit_reached: Nun pues siguir a más de %{limit} persones
     invalid_otp_token: El códigu de l'autenticación en dos pasos nun ye válidu
     rate_limited: Fixéronse milenta intentos d'autenticación. Volvi tentalo dempués.
-    seamless_external_login: Aniciesti la sesión pente un serviciu esternu, polo que la configuración de la contraseña y de la direición de corréu electrónicu nun tán disponibles.
     signed_in_as: 'Aniciesti la sesión como:'
   verification:
     verification: Verificación
diff --git a/config/locales/be.yml b/config/locales/be.yml
index 2e3d6558dcd010..81804ffc32d42a 100644
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -35,7 +35,6 @@ be:
       created_msg: Нататка мадэратара паспяхова створана!
       destroyed_msg: Нататка мадэратара паспяхова выдалена!
     accounts:
-      add_email_domain_block: Заблакіраваць дамен эл. пошты
       approve: Пацвердзіць
       approved_msg: Заяўка на рэгістрацыю %{username} ухваленая
       are_you_sure: Вы ўпэўнены?
@@ -62,7 +61,6 @@ be:
       demote: Панізіць у правах
       destroyed_msg: Даныя %{username} цяпер у чарзе на прымусовае выдаленне
       disable: Замарозіць
-      disable_sign_in_token_auth: Выключыць аўтэнтыфікацыю па e-mail токену
       disable_two_factor_authentication: Адключыць 2FA
       disabled: Замарожаны
       display_name: Бачнае імя
@@ -71,7 +69,6 @@ be:
       email: Электронная пошта
       email_status: Статус электроннай пошты
       enable: Размарозіць
-      enable_sign_in_token_auth: Уключыць аўтэнтыфікацыю па e-mail токену
       enabled: Уключана
       enabled_msg: Уліковы запіс %{username} размарожаны
       followers: Падпісчыкі
@@ -138,7 +135,6 @@ be:
       resubscribe: Аднавіць падпіску
       role: Роля
       search: Пошук
-      search_same_email_domain: Іншыя карыстальнікі з такім жа даменам эл. пошты
       search_same_ip: Іншыя карыстальнікі з гэтым IP
       security: Бяспека
       security_measures:
@@ -179,26 +175,21 @@ be:
         approve_appeal: Ухваліць абскарджанне
         approve_user: Зацвердзіць карыстальніка
         assigned_to_self_report: Прызначыць скаргу
-        change_email_user: Змяніць E-mail карыстальніка
         change_role_user: Змяніць ролю карыстальніка
         confirm_user: Пацвердзіць карыстальніка
         create_account_warning: Стварыць папярэджанне
         create_announcement: Стварыць аб'яву
-        create_canonical_email_block: Стварыць блакіроўку электроннай пошты
         create_custom_emoji: Стварыць адвольны эмодзі
         create_domain_allow: Стварыць даменны дазвол
         create_domain_block: Стварыць даменны блок
-        create_email_domain_block: Стварыць даменны блок электроннай пошты
         create_ip_block: Стварыць IP правіла
         create_unavailable_domain: Стварыць недаступны Дамен
         create_user_role: Стварыць ролю
         demote_user: Панізіць карыстальніка
         destroy_announcement: Выдаліць аб'яву
-        destroy_canonical_email_block: Выдаліць блакіроўку электроннай пошты
         destroy_custom_emoji: Выдаліць адвольны эмодзі
         destroy_domain_allow: Выдаліць дамены дазвол
         destroy_domain_block: Выдаліць даменны блок
-        destroy_email_domain_block: Выдаліць даменны блок электроннай пошты
         destroy_instance: Вычысціць дамен
         destroy_ip_block: Выдаліць IP правіла
         destroy_status: Выдаліць допіс
@@ -206,10 +197,8 @@ be:
         destroy_user_role: Выдаліць ролю
         disable_2fa_user: Адключыць двухэтапнае спраўджанне
         disable_custom_emoji: Адключыць адвольныя эмодзі
-        disable_sign_in_token_auth_user: Адключыць аўтарызацыю праз электронную пошту для Карыстальніка
         disable_user: Адключыць карыстальніка
         enable_custom_emoji: Уключыць адвольныя эмодзі
-        enable_sign_in_token_auth_user: Адключыць аўтарызацыю праз электронную пошту для Карыстальніка
         enable_user: Уключыць карыстальніка
         memorialize_account: Запомніць уліковы запіс
         promote_user: Павысіць правы Карыстальніка
@@ -239,26 +228,20 @@ be:
         approve_appeal_html: Карыстальнік %{name} ухваліў запыт на мадэрацыю %{target}
         approve_user_html: "%{name} пацвердзіў рэгістрацыю ад %{target}"
         assigned_to_self_report_html: "%{name} прызначыў справаздачу %{target} на сябе\n"
-        change_email_user_html: "%{name} змяніў паштовы адрас карыстальніка %{target}"
         change_role_user_html: "%{name} змяніў ролю %{target}"
-        confirm_user_html: "%{name} пацвердзіў паштовы адрас %{target}"
         create_account_warning_html: "%{name} накіраваў папярэджанне %{target}"
         create_announcement_html: "%{name} зрабіў новую аб'яву %{target}"
-        create_canonical_email_block_html: "%{name} заблакаваў імэйл з хэшам %{target}"
         create_custom_emoji_html: "%{name} загрузіў новы смайлік %{target}\n\n"
         create_domain_allow_html: "%{name} дазволіў федэрацыю з даменам %{target}"
         create_domain_block_html: "%{name} заблакіраваў дамен %{target}"
-        create_email_domain_block_html: "%{name} заблакіраваў дамен эл. пошты %{target}"
         create_ip_block_html: "%{name} стварыў правіла для IP %{target}"
         create_unavailable_domain_html: "%{name} прыпыніў дастаўку да дамена %{target}"
         create_user_role_html: "%{name} зрабіў ролю %{target}"
         demote_user_html: "%{name} прыбраў карыстальніка %{target}"
         destroy_announcement_html: "%{name} выдаліў аб'яву %{target}"
-        destroy_canonical_email_block_html: "%{name} разблакаваў імэйл з хэшам %{target}"
         destroy_custom_emoji_html: "%{name} выдаліў(а) эмоджі %{target}"
         destroy_domain_allow_html: "%{name} зняў дазвол на аб'яднанне з даменам %{target}\n"
         destroy_domain_block_html: "%{name} разблакаваў дамен %{target}"
-        destroy_email_domain_block_html: "%{name} зняў блакіроўку імэйла дамена %{target}\n"
         destroy_instance_html: "%{name} цалкам прыбраў дамен %{target}"
         destroy_ip_block_html: "%{name} выдаліў правіла для IP %{target}"
         destroy_status_html: "%{name} выдаліў допіс %{target}"
@@ -266,10 +249,8 @@ be:
         destroy_user_role_html: "%{name} выдаліў ролю %{target}"
         disable_2fa_user_html: "%{name} амяніў абавязковую двухфактарную верыфікацыю для карыстальніка %{target}"
         disable_custom_emoji_html: "%{name} заблакіраваў эмодзі %{target}"
-        disable_sign_in_token_auth_user_html: "%{name} выключыў токен аўэнтыфікацыі e-mail для %{target}"
         disable_user_html: "%{name} адключыў уваход для карыстальніка %{target}"
         enable_custom_emoji_html: "%{name} уключыў эмодзі %{target}"
-        enable_sign_in_token_auth_user_html: "%{name} уключыў(ла) такенную e-mail праверку для %{target}"
         enable_user_html: "%{name} уключыў уваход для карыстальніка %{target}"
         memorialize_account_html: Карыстальнік %{name} пераключыў уліковы запіс %{target} у старонку памяці
         promote_user_html: "%{name} павысіў карыстальніка %{target}"
@@ -277,7 +258,6 @@ be:
         reject_user_html: "%{name} адхіліў рэгістрацыю з %{target}"
         remove_avatar_user_html: "%{name} выдаліў аватар %{target}"
         reopen_report_html: "%{name} зноў адкрыў скаргу %{target}"
-        resend_user_html: "%{name} зноў адправіў ліст з пацвярджэннем для %{target}"
         reset_password_user_html: "%{name} скінул(а) пароль для %{target}"
         resolve_report_html: "%{name} вырашыў скаргу %{target}"
         sensitive_account_html: "%{name} адзначыў медыя %{target} як далікатнае"
@@ -448,7 +428,6 @@ be:
         many: "%{count} спроб рэгіістрацыі за апошні тыдзень"
         one: "%{count} спроба рэгістрацыі за апошні тыдзень"
         other: "%{count} спроб рэгіістрацыі за апошні тыдзень"
-      created_msg: Дамен эл. пошты паспяхова заблакіраваны
       delete: Выдаліць
       dns:
         types:
@@ -457,12 +436,8 @@ be:
       new:
         create: Дадаць дамен
         resolve: Вызначыць дамен
-        title: Заблакіраваць новы дамен эл. пошты
-      no_email_domain_block_selected: Блакіроўкі даменаў эл. пошты не былі змененыя, таму што ні адзін з іх не быў выбраны
       not_permitted: Забаронена
-      resolved_dns_records_hint_html: Даменнае імя ператвараецца ў наступныя дамены MX, якія ў канчатковым выніку адказваюць за прыём электроннай пошты. Блакаванне дамена MX заблакуе рэгістрацыю з любога адраса электроннай пошты, які выкарыстоўвае той жа дамен MX, нават калі бачнае імя дамена адрозніваецца. <strong>Будзьце асцярожныя, каб не заблакіраваць асноўных пастаўшчыкоў электроннай пошты.</strong>
       resolved_through_html: Вызначына каля %{domain}
-      title: Заблакаваныя паштовыя дамены
     export_domain_allows:
       new:
         title: Імпарт дазволаў дамена
@@ -624,7 +599,6 @@ be:
         resolve_description_html: Ніякіх дзеянняў супраць уліковага запісу, пра які паведамляецца, не будзе, папярэджэнне не зафіксавана, і скарга будзе закрыта.
         silence_description_html: Уліковы запіс будзе бачны толькі тым, хто ўжо сочыць за ім або шукае яго ўручную, што значна абмяжоўвае яго ахоп. Заўсёды можна вярнуць. Закрывае ўсе скаргі на гэты ўліковы запіс.
         suspend_description_html: Уліковы запіс і ўсё яго змесціва будзе недаступна і ў далейшым выдалены, узаемадзеянне з ім будзе немагчыма. Магчыма адмяніць на працягу 30 дзён. Закрывае ўсе скаргі на гэты ўліковы запіс.
-      actions_description_html: Вырашыце, якія дзеянні распачаць, каб вырашыць гэтую скаргу. Калі вы прымеце меры пакарання ў дачыненні да ўліковага запісу, пра які паведамляецца, ім будзе адпраўлена апавяшчэнне па электроннай пошце, за выключэннем выпадкаў, калі выбрана катэгорыя <strong>Спам</strong>.
       actions_description_remote_html: Вырашыце як паступіць з гэтай скаргай. Гэта паўплывае толькі на тое як <strong>ваш</strong> сервер звязваецца з аддалёным уліковым запісам і апрацоўвае яго кантэнт.
       add_to_report: Дадаць яшчэ дэталяў да скаргі
       already_suspended_badges:
@@ -689,7 +663,6 @@ be:
         delete_data_html: Выдаліць профіль <strong>@%{acct}</strong> і змесціва праз 30 дзён, калі тым часам гэтае дзеянне не будзе адменена
         preview_preamble_html: "<strong>@%{acct}</strong> атрымае папярэджанне наступнага зместу:"
         record_strike_html: Зарэгістраваць папярэджанне <strong>@%{acct}</strong>, каб дапамагчы вам эскаліраваць наступныя парушэнні з боку таго ж уліковага запісу
-        send_email_html: Адправіць <strong>@%{acct}</strong> папярэджанне па электроннай пошце
         warning_placeholder: Неабавязковае дадатковае абгрунтаванне мадэрацыі.
       target_origin: Крыніца уліковага запісу на які пададзена скарга
       title: Скаргі
@@ -733,7 +706,6 @@ be:
         manage_appeals: Кіраванне апеляцыямі
         manage_appeals_description: Дазваляе карыстальнікам разглядаць апеляцыі на дзеянні мадэратара
         manage_blocks: Кіраванне блакіроўкамі
-        manage_blocks_description: Дазваляе блакаваць пэўныя паштовыя правайдэры і IP адрасы
         manage_custom_emojis: Кіраванне адвольнымі эмодзі
         manage_custom_emojis_description: Дазваляе кіраваць адвольнымі эмодзі на серверы
         manage_federation: Кіраваць федэрацыяй
@@ -751,7 +723,6 @@ be:
         manage_taxonomies: Кіраванне катэгорыямі
         manage_taxonomies_description: Дазваляе карыстальнікам праглядаць папулярны кантэнт і абнаўляць налады хэштэгаў
         manage_user_access: Кіраванне наладамі доступу карыстальнікаў
-        manage_user_access_description: Дазваляе адключаць двухфактарную аўтэнтыфікацыю іншым карыстальнікам, змяняць іх паштовы адрас і скідваць пароль
         manage_users: Кіраванне карыстальнікамі
         manage_users_description: Дазваляе праглядаць звесткі іншых карыстальнікаў і іх мадэрацыю
         manage_webhooks: Кіраванне вэбхукамі
@@ -826,7 +797,6 @@ be:
       destroyed_msg: Загрузка сайту паспяхова выдалена!
     software_updates:
       critical_update: Крытычна - зрабіце абнаўленне як мага хутчэй
-      description: Рэкамендуецца падтрымліваць усталёўку Mastodon у актуальным стане, каб карыстацца апошнімі выпраўленнямі і магчымасцямі. Акрамя таго, часам вельмі важна своечасова абнаўляць Mastodon, каб пазбегнуць праблем з бяспекай. Па гэтых прычынах Mastodon правярае наяўнасць абнаўленняў кожныя 30 хвілін і паведамляе вам пра гэта ў адпаведнасці з вашымі наладамі апавяшчэнняў па электроннай пошце.
       documentation_link: Даведацца больш
       release_notes: Журнал змен
       title: Даступныя абнаўленні
@@ -1000,7 +970,6 @@ be:
           many: Выкарысталі %{count} чалавек за апошні тыдзень
           one: Выкарыстаў адзін чалавек за апошні тыдзень
           other: Выкарысталі %{count} чалавек за апошні тыдзень
-      title: Актуальныя
       trending: Папулярныя
     warning_presets:
       add_new: Дадаць новы
@@ -1087,9 +1056,7 @@ be:
       guide_link_text: Кожны і кожная можа зрабіць унёсак.
     sensitive_content: Далікатны змест
   application_mailer:
-    notification_preferences: Змяніць налады эл. пошты
     salutation: "%{name},"
-    settings: 'Змяніць налады эл. пошты: %{link}'
     unsubscribe: Адпісацца
     view: 'Паглядзець:'
     view_profile: Паглядзець профіль
@@ -1109,7 +1076,6 @@ be:
       hint_html: Засталася яшчэ адна рэч! Каб не дапусціць спаму, нам трэба пацвердзіць, што вы чалавек. Разгадайце CAPTCHA ніжэй і націсніце «Працягнуць».
       title: Праверка бяспекі
     confirmations:
-      awaiting_review: Ваш электронны адрас пацверджаны! Адміністрацыя %{domain} зараз разглядае вашу рэгістрацыю. Вы атрымаеце паведамленне па электроннай пошце, калі ваш уліковы запіс будзе ўхвалены!
       awaiting_review_title: Ваша рэгістрацыя разглядаецца
       clicking_this_link: націснуць на гэту спасылку
       login_link: увайсці
@@ -1117,7 +1083,6 @@ be:
       redirect_to_app_html: Вы павінны былі быць перанакіраваны ў праграму <strong>%{app_name}</strong>. Калі гэтага не адбылося, паспрабуйце %{clicking_this_link} або вярніцеся да праграмы ўручную.
       registration_complete: Ваша рэгістрацыя на %{domain} завершана!
       welcome_title: Вітаем, %{name}!
-      wrong_email_hint: Калі гэты адрас электроннай пошты памылковы, вы можаце змяніць яго ў наладах уліковага запісу.
     delete_account: Выдаліць уліковы запіс
     delete_account_html: Калі вы жадаеце выдаліць ваш уліковы запіс, можаце <a href="%{path}">працягнуць тут</a>. Ад вас будзе запатрабавана пацвярджэнне.
     description:
@@ -1138,7 +1103,6 @@ be:
     or_log_in_with: Або ўвайсці з дапамогай
     privacy_policy_agreement_html: Я азнаёміўся і пагаджаюся з <a href="%{privacy_policy_path}" target="_blank">палітыкай канфідэнцыйнасці</a>
     progress:
-      confirm: Пацвердзіць email
       details: Вашы дадзеныя
       review: Наш водгук
       rules: Прыняць правілы
@@ -1160,10 +1124,8 @@ be:
     security: Бяспека
     set_new_password: Прызначыць новы пароль
     setup:
-      email_below_hint_html: Праверце папку са спамам або зрабіце новы запыт. Вы можаце выправіць свой email, калі ён няправільны.
       email_settings_hint_html: Націсніце на спасылку, якую мы адправілі, каб спраўдзіць %{email}. Мы вас пачакаем тут.
       link_not_received: Не атрымалі спасылку?
-      new_confirmation_instructions_sent: Праз некалькі хвілін вы атрымаеце новы ліст на email са спасылкай для пацверджання!
       title: Праверце вашу пошту
     sign_in:
       preamble_html: Уваход з уліковымі дадзенымі <strong>%{domain}</strong>. Калі ваш уліковы запіс знаходзіцца на іншым серверы, у вас не атрымаецца ўвайсці тут.
@@ -1174,9 +1136,7 @@ be:
       title: Наладзьма вас на %{domain}.
     status:
       account_status: Стан уліковага запісу
-      confirming: Чакаецца пацвярджэнне з электроннай пошты.
       functional: Ваш уліковы запіс поўнасцю працуе.
-      pending: Ваша заяўка разглядаецца нашым супрацоўнікам. Гэта можа заняць некаторы час. Вы атрымаеце электронны ліст, калі заяўка будзе ўхвалена.
       redirecting_to: Ваш уліковы запіс неактыўны, бо ў цяперашні час ён перанакіроўваецца на %{acct}.
       self_destruct: Паколькі %{domain} зачыняецца, вы атрымаеце толькі абмежаваны доступ да свайго уліковага запісу.
       view_strikes: Праглядзець мінулыя папярэджанні для вашага ўліковага запісу
@@ -1219,9 +1179,6 @@ be:
       before: 'Перш чым працягнуць, уважліва прачытайце гэтыя заўвагі:'
       caches: Змесціва, кэшаванае іншымі серверамі, можа захавацца
       data_removal: Вашы допісы і іншыя даныя будуць выдалены назаўсёды
-      email_change_html: Вы можаце <a href="%{path}">змяніць свой адрас электроннай пошты</a>, не выдаляючы ўліковы запіс
-      email_contact_html: Калі ліст усё яшчэ не дайшоў, вы можаце звярнуцца па дапамогу на эл. пошту <a href="mailto:%{email}">%{email}</a>
-      email_reconfirmation_html: Калі вы не атрымалі пацвярджэнне па электроннай пошце, вы можаце <a href="%{path}">запытаць яго зноў</a>
       irreversible: Вы не зможаце аднавіць або паўторна актываваць свой уліковы запіс
       more_details_html: Падрабязнасці глядзіце ў <a href="%{terms_path}">палітыцы прыватнасці</a>.
       username_available: Ваша імя карыстальніка зноў стане даступным
@@ -1470,7 +1427,6 @@ be:
     authentication_methods:
       otp: праграма двухфактарнай аўтэнтыфікацыі
       password: пароль
-      sign_in_token: код з электроннай пошты
       webauthn: ключы бяспекі
     description_html: Калі вы бачыце невядомую вам актыўнасць, падумайце пра змену пароля і ўключэнне двухфактарнай аўтэнтыфікацыі.
     empty: Няма гісторыі ўваходаў
@@ -1481,16 +1437,6 @@ be:
     unsubscribe:
       action: Так, адпісацца
       complete: Адпісаны
-      confirmation_html: Вы ўпэўнены, што жадаеце адмовіцца ад %{type} з Mastodon на дамене %{domain} на вашу электронную пошту %{email}? Вы заўсёды можаце паўторна падпісацца у <a href="%{settings_path}">наладах апавяшчэнняў па электроннай пошце</a>.
-      emails:
-        notification_emails:
-          favourite: апавяшчэнні на пошту пра упадабанае
-          follow: апавяшчэнні на пошту пра падпіскі
-          follow_request: апавяшчэнні на пошту пра запыты на падпіску
-          mention: апавяшчэнні на пошту пра згадванні
-          reblog: апавяшчэнні на пошту пра пашырэнні
-      resubscribe_html: Калі вы адмовіліся ад падпіскі памылкова, вы можаце зноў падпісацца ў <a href="%{settings_path}">наладах апавяшчэнняў па электроннай пошце</a>.
-      success_html: Вы больш не будзеце атрымліваць %{type} на сваю электронную пошту %{email} ад Mastodon на дамене %{domain}.
       title: Адпісацца
   media_attachments:
     validations:
@@ -1571,8 +1517,6 @@ be:
     update:
       subject: "%{name} адрэдагаваў допіс"
   notifications:
-    administration_emails: Апавяшчэнні эл. пошты для адміністратара
-    email_events: Падзеі для апавяшчэнняў эл. пошты
     email_events_hint: 'Выберыце падзеі, аб якіх вы хочаце атрымліваць апавяшчэнні:'
   number:
     human:
@@ -1731,7 +1675,6 @@ be:
     import: Імпарт
     import_and_export: Імпарт і экспарт
     migrate: Перамяшчэнне ўліковага запісу
-    notifications: Email апавяшчэнні
     preferences: Налады
     profile: Профіль
     relationships: Падпіскі і падпісчыкі
@@ -1992,7 +1935,6 @@ be:
     invalid_otp_token: Няправільны код двухфактарнай аўтэнтыфікацыі
     otp_lost_help_html: Калі вы страцілі доступ да абодвух, вы можаце скарыстацца %{email}
     rate_limited: Занадта шмат спробаў аўтэнтыфікацыі, паспрабуйце пазней.
-    seamless_external_login: Вы ўвайшлі праз знешні сэрвіс, таму налады пароля і эл. пошты недаступныя.
     signed_in_as: 'Увайшлі як:'
   verification:
     extra_instructions_html: <strong>Парада:</strong> спасылка на вашым сайце можа быць нябачнай. Важнай часткай з'яўляецца <code>rel="me"</code>, якая прадухіляе імперсанацыю на сайтах з карыстальніцкім кантэнтам. Вы нават можаце выкарыстоўваць тэг <code>link</code> у загалоўку старонкі замест <code>a</code>, але HTML павінен быць даступны без выканання JavaScript.
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index c71fab2177eb8c..56ab7591745e8e 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -58,7 +58,6 @@ bg:
       demote: Понижаване
       destroyed_msg: Данните на %{username} вече са на опашка за незабавно изтриване
       disable: Замразяване
-      disable_sign_in_token_auth: Изключване на удостоверяването с маркер по имейл
       disable_two_factor_authentication: Изключване на 2факт. удостов.
       disabled: Замразено
       display_name: Име на показ
@@ -67,7 +66,6 @@ bg:
       email: Имейл
       email_status: Състояние на имейл
       enable: Размразяване
-      enable_sign_in_token_auth: Включване на удостоверяването с маркер по имейл
       enabled: Включено
       enabled_msg: Успешно размразяване на акаунта на %{username}
       followers: Последователи
@@ -132,7 +130,6 @@ bg:
       resubscribe: Абониране пак
       role: Роля
       search: Търсене
-      search_same_email_domain: Други потребители със същия домейн за имейл
       search_same_ip: Други потребители със същия IP
       security: Сигурност
       security_measures:
@@ -173,26 +170,21 @@ bg:
         approve_appeal: Одобряване на обжалването
         approve_user: Одобряване на потребител
         assigned_to_self_report: Назначете доклад
-        change_email_user: Промяна на имейл за потребител
         change_role_user: Промяна на роля за потребител
         confirm_user: Потвърждаване на потребител
         create_account_warning: Създаване на предупреждение
         create_announcement: Създаване на оповестяване
-        create_canonical_email_block: Създаване на блокировка на имейл
         create_custom_emoji: Създаване на персонализирано емоджи
         create_domain_allow: Създаване на позволение за домейна
         create_domain_block: Създаване на блокиране за домейна
-        create_email_domain_block: Създаване за блокиране на имейл домейна
         create_ip_block: Създаване на правило за IP
         create_unavailable_domain: Създаване на недостъпен домейн
         create_user_role: Създаване на роля
         demote_user: Понижаване на потребител
         destroy_announcement: Изтриване на оповестяване
-        destroy_canonical_email_block: Изтриване на блокировка за имейл
         destroy_custom_emoji: Изтриване на персонализирано емоджи
         destroy_domain_allow: Изтриване на позволението за домейн
         destroy_domain_block: Изтриване на блокирането за домейна
-        destroy_email_domain_block: Изтриване на блокирането за домейн на имейла
         destroy_instance: Чистка на домейна
         destroy_ip_block: Изтриване на правило за IP
         destroy_status: Изтриване на публикация
@@ -200,10 +192,8 @@ bg:
         destroy_user_role: Унищожаване на роля
         disable_2fa_user: Изкл. на 2факт.удостов.
         disable_custom_emoji: Деактивиране на персонализирано емоджи
-        disable_sign_in_token_auth_user: Изключване на удостоверяването с код по имейл за потребителя
         disable_user: Изключване на потребител
         enable_custom_emoji: Включване на персонализирано емоджи
-        enable_sign_in_token_auth_user: Включване на удостоверяването с код по имейл за потребителя
         enable_user: Активиране на потребител
         memorialize_account: Възпоменаване на акаунта
         promote_user: Повишаване на потребител
@@ -233,26 +223,20 @@ bg:
         approve_appeal_html: "%{name} одобри обжалването на решение за модериране от %{target}"
         approve_user_html: "%{name} одобри регистрирането от %{target}"
         assigned_to_self_report_html: "%{name} възложи на себе си доклад %{target}"
-        change_email_user_html: "%{name} промени адреса на имейла на потребителя %{target}"
         change_role_user_html: "%{name} промени ролята на %{target}"
-        confirm_user_html: "%{name} потвърди адреса на имейла на потребителя %{target}"
         create_account_warning_html: "%{name} изпрати предупреждение до %{target}"
         create_announcement_html: "%{name} създаде ново оповестяване %{target}"
-        create_canonical_email_block_html: "%{name} блокира имейл с хеш %{target}"
         create_custom_emoji_html: "%{name} качи ново емоджи %{target}"
         create_domain_allow_html: "%{name} позволи федерирането с домейн %{target}"
         create_domain_block_html: "%{name} блокира домейн %{target}"
-        create_email_domain_block_html: "%{name} блокира домейн на имейл %{target}"
         create_ip_block_html: "%{name} създаде правило за IP %{target}"
         create_unavailable_domain_html: "%{name} спря доставянето до домейн %{target}"
         create_user_role_html: "%{name} създаде роля %{target}"
         demote_user_html: "%{name} понижи потребителя %{target}"
         destroy_announcement_html: "%{name} изтри оповестяване %{target}"
-        destroy_canonical_email_block_html: "%{name} отблокира имейла с хеш %{target}"
         destroy_custom_emoji_html: "%{name} изтри емоджито %{target}"
         destroy_domain_allow_html: "%{name} забрани федерирация с домейн %{target}"
         destroy_domain_block_html: "%{name} отблокира домейн %{target}"
-        destroy_email_domain_block_html: "%{name} отблокира домейн на имейл %{target}"
         destroy_instance_html: "%{name} прочисти домейн %{target}"
         destroy_ip_block_html: "%{name} изтри правило за IP %{target}"
         destroy_status_html: "%{name} премахна публикация от %{target}"
@@ -260,10 +244,8 @@ bg:
         destroy_user_role_html: "%{name} изтри роля %{target}"
         disable_2fa_user_html: "%{name} изключи двуфакторното изискване за потребител %{target}"
         disable_custom_emoji_html: "%{name} изключи емоджито %{target}"
-        disable_sign_in_token_auth_user_html: "%{name} деактивира удостоверението с код по имейл за %{target}"
         disable_user_html: "%{name} изключи влизането за потребител %{target}"
         enable_custom_emoji_html: "%{name} включи емоджито %{target}"
-        enable_sign_in_token_auth_user_html: "%{name} активира удостоверението с код по имейл за %{target}"
         enable_user_html: "%{name} включи влизането за потребител %{target}"
         memorialize_account_html: "%{name} превърна акаунта на %{target} във възпоменателна страница"
         promote_user_html: "%{name} повиши потребителя %{target}"
@@ -271,7 +253,6 @@ bg:
         reject_user_html: "%{name} отхвърли регистрирането от %{target}"
         remove_avatar_user_html: "%{name} премахна аватара на %{target}"
         reopen_report_html: "%{name} отвори пак доклада на %{target}"
-        resend_user_html: "%{name} изпрати пак е-писмо за потвърждение за %{target}"
         reset_password_user_html: "%{name} нулира паролата на потребител %{target}"
         resolve_report_html: "%{name} разреши случая с доклада от %{target}"
         sensitive_account_html: "%{name} означи мултимедия на %{target} като деликатна"
@@ -432,7 +413,6 @@ bg:
       attempts_over_week:
         one: "%{count} опит за изминалата седмица"
         other: "%{count} опита за регистрация през изминалата седмица"
-      created_msg: Успешно блокиран домейн на е-поща
       delete: Изтриване
       dns:
         types:
@@ -441,12 +421,8 @@ bg:
       new:
         create: Добавяне на домейн
         resolve: Преобразуване на домейна
-        title: Блокиране на нов домейн на имейл
-      no_email_domain_block_selected: Няма промяна, тъй като няма избрани блокирания на имейл домейн
       not_permitted: Няма позволение
-      resolved_dns_records_hint_html: Името на домейна се преобразува към следните MX домейни, които са основно отговорни за получаване на имейл. Блокирането на MX домейн блокира записването от всеки имейл, използващ същия MX домейн, дори видимото име на домейна да е различно. <strong>Бъдете внимателни и не блокирайте често-срещани доставчици на имейл</strong>
       resolved_through_html: Преобразувано чрез %{domain}
-      title: Блокирани домейни на имейл
     export_domain_allows:
       new:
         title: Внасяне на позволенията на домейни
@@ -600,7 +576,6 @@ bg:
         resolve_description_html: Няма да се предприеме действие срещу докладвания акаунт, няма да се записва нарушение и докладът ще се затвори.
         silence_description_html: Профилът ще е видим само за последователите му или търсещите го ръчно, което драстично ограничава обсега му. Настройката може да бъде отменена по всяко време. Затваря всички доклади срещу акаунта.
         suspend_description_html: Акаунтът и неговото съдържание ще бъдат недостъпни и евентуално изтрити и взаимодействието с него ще е невъзможно. Обрамотимо до 30 дни. Затваря всички доклади срещу този акаунт.
-      actions_description_html: Решете какво действие може да се предприеме, за да бъде отхвърлен докладът. Ако предприемете наказателно действие срещу докладвания акаунт, към него ще бъде изпратено известие по имейл, освен ако <strong>Спам</strong> категорията не е била избрана.
       actions_description_remote_html: Преценете с какво действие да решите този доклад. Това ще има ефекет върху това как <strong>вашият</strong> сървър комуникира с този отдалечен акаунт и се справя с неговото съдържание.
       add_to_report: Добавяне на още към доклада
       already_suspended_badges:
@@ -665,7 +640,6 @@ bg:
         delete_data_html: Изтриване на профила и съдържанието на <strong>@%{acct}</strong> за 30 дни от сега, освен ако междувременно не получи спиране
         preview_preamble_html: "<strong>@%{acct}</strong> ще получи предупреждение със следното съдържание:"
         record_strike_html: Запис на предупреждение против <strong>@%{acct}</strong>, за да ви помогне при изострянето на бъдещи нарушения от този акаунт
-        send_email_html: Изпращане на предупредително е-писмо на <strong>@%{acct}</strong>
         warning_placeholder: Незадължителни допълнителни причини за модераторско действие.
       target_origin: Произход на докладвания акаунт
       title: Доклади
@@ -705,7 +679,6 @@ bg:
         manage_appeals: Управление на жалбите
         manage_appeals_description: Позволява на потребителите да разглеждат обжалвания срещу модераторски действия
         manage_blocks: Управляване на блокиранията
-        manage_blocks_description: Позволява на потребителите да блокират доставчици на е-поща и IP адреси
         manage_custom_emojis: Управляване на персонализирани емоджита
         manage_custom_emojis_description: Позволява на потребителите да управляват персонализирани емоджита в сървъра
         manage_federation: Управление на Федерацията
@@ -723,7 +696,6 @@ bg:
         manage_taxonomies: Управление на класификации
         manage_taxonomies_description: Позволяване на потребителите да преглеждат нашумяло съдържание и да обновяват настройките за хаштагове
         manage_user_access: Управление на потребителския достъп
-        manage_user_access_description: Позволяване на потребителите да изключват двуфакторното удостоверяване, да променят имейл адресите и да подновяват паролите на други потребители
         manage_users: Управление на потребителите
         manage_users_description: Позволяване на потребителите да виждат подробностите за други потребители и да извършват модераторски действия срещу тях
         manage_webhooks: Управление на уебкуките
@@ -798,7 +770,6 @@ bg:
       destroyed_msg: Успешно изтриване на качването на сайта!
     software_updates:
       critical_update: Критично важно - обновете бързо
-      description: Препоръчва се да държите осъвременена своята инсталация на Mastodon, за да се възползвате от най-новите поправки и функции. Освен това, понякога е много важно да се осъвременява навреме Mastodon, за да се избегне проблем с безопасността. Заради тези причини Mastodon проверява за обновление на всеки 30 минути и ви известява за това в съответствие с предпочитанията ви за известяване по имейла.
       documentation_link: Научете повече
       release_notes: Бележки към изданието
       title: Налични обновявания
@@ -911,6 +882,7 @@ bg:
       links:
         allow: Позволяване на връзка
         allow_provider: Позволяване на публикуващия
+        confirm_allow_provider: Наистина ли искате да позволите избраните доставчици?
         description_html: Това са връзки, които в момента са много пъти споделяни от акаунти, чиито публикации сървърът ви вижда. Може да помогне на потребителите ви да разберат какво се случва по света. Никоя връзка няма да се показва публично, докато не одобрите публикуващия. Може още и да одобрявате или отхвърляте отделни връзки.
         disallow: Забранявам връзката
         disallow_provider: Забраняване на публикуващия
@@ -966,7 +938,6 @@ bg:
         used_by_over_week:
           one: Употребено от един човек през последната седмица
           other: Използвано от %{count} души през последната седмица
-      title: Изгряващи
       trending: Изгряващи
     warning_presets:
       add_new: Добавяне на ново
@@ -1051,9 +1022,7 @@ bg:
       guide_link_text: Всеки може да участва.
     sensitive_content: Деликатно съдържание
   application_mailer:
-    notification_preferences: Промяна на предпочитанията за имейл
     salutation: "%{name},"
-    settings: 'Промяна на предпочитанията за имейл: %{link}'
     unsubscribe: Стоп на абонамента
     view: 'Преглед:'
     view_profile: Преглед на профила
@@ -1073,7 +1042,6 @@ bg:
       hint_html: Просто още едно нещо! Трябва да потвърдим, че сте човек (това е с цел предпазване на нежелани съобщения!). Разгадайте капчата долу и щракнете на "Продължаване".
       title: Проверка за сигурност
     confirmations:
-      awaiting_review: Вашият адрес на е-поща е потвърден! Служителите на %{domain} сега преглеждат регистрацията ви. Ще получите е-писмо, ако одобрят акаунта ви!
       awaiting_review_title: Вашата регистрация се преглежда
       clicking_this_link: щракване на тази връзка
       login_link: влизане
@@ -1081,7 +1049,6 @@ bg:
       redirect_to_app_html: Трябва да сте пренасочени към приложението <strong>%{app_name}</strong>. Ако не се случи това, то опитайте %{clicking_this_link} или ръчно се върнете към приложението.
       registration_complete: Вашата регистрация на %{domain} вече завърши!
       welcome_title: Добре дошли, %{name}!
-      wrong_email_hint: Ако този адрес на е-поща не е правилен, то може да го промените в настройки на акаунта.
     delete_account: Изтриване на акаунта
     delete_account_html: Ако желаете да изтриете акаунта си, може <a href="%{path}">да сторите това тук</a>. Ще ви се поиска потвърждение.
     description:
@@ -1102,7 +1069,6 @@ bg:
     or_log_in_with: Или влизане с помощта на
     privacy_policy_agreement_html: Прочетох и има съгласието ми за <a href="%{privacy_policy_path}" target="_blank">политиката за поверителност</a>
     progress:
-      confirm: Потвърждаване на имейл
       details: Вашите подробности
       review: Нашият преглед
       rules: Приемане на правилата
@@ -1124,10 +1090,8 @@ bg:
     security: Сигурност
     set_new_password: Задаване на нова парола
     setup:
-      email_below_hint_html: Проверете папката си за спам или поискайте друго. Може да поправите адреса на имейла си, ако е грешен.
       email_settings_hint_html: Щракнете на връзката за потвърждаване, която ви изпратихме до %{email}. Ще ви почакаме тук.
       link_not_received: Не получихте ли връзка?
-      new_confirmation_instructions_sent: За няколко минути ще получите ново е-писмо с връзка за потвърждение!
       title: Проверете входящата си поща
     sign_in:
       preamble_html: Влезте с идентификационните данни за <strong>%{domain}</strong>. Ако вашият акаунт е хостван на различен сървър, няма да можете да влезете в този.
@@ -1138,9 +1102,7 @@ bg:
       title: Първоначални настройки за %{domain}.
     status:
       account_status: Състояние на акаунта
-      confirming: Чакане завършването на потвърждение на имейла.
       functional: Вашият акаунт е в изправност.
-      pending: Вашето приложение чака преглед от нашия екип. Това може да отнеме време. Ще получите имейл, ако приложението е одобрено.
       redirecting_to: Вашият акаунт е бездеен, защото сега се пренасочва към %{acct}.
       self_destruct: Затваряйки %{domain}, ще получите само ограничен достъп до акаунта си.
       view_strikes: Преглед на предишните предупреждения против акаунта ви
@@ -1183,9 +1145,6 @@ bg:
       before: 'Прочетете внимателно тези бележки преди да продължите:'
       caches: Съдържание, което може да е кеширано от други сървъри, може да се задържи
       data_removal: Ваши публикации и други данни ще бъдат завинаги премахнати
-      email_change_html: Може да <a href="%{path}">промените адреса на имейла си</a>, без да изтривате акаунта си
-      email_contact_html: Ако все още не сте го получили, обърнете се за помощ към <a href="mailto:%{email}">%{email}</a>
-      email_reconfirmation_html: Ако не сте получили имейл за потвърждение, можете да го <a href="%{path}">заявите отново</a>
       irreversible: Няма да може да възстановите или да задействате пак акаунта си
       more_details_html: За повече детайли прегледайте <a href="%{terms_path}">декларацията за поверителност</a>.
       username_available: Вашето потребителско име ще стане налично отново
@@ -1429,16 +1388,6 @@ bg:
     unsubscribe:
       action: Да, да се спре абонамента
       complete: Спрян абонамент
-      confirmation_html: Наистина ли искате да спрете абонамента от получаването на %{type} за Mastodon в %{domain} към имейла си при %{email}? Може винаги пак да се абонирате от своите <a href="%{settings_path}">настройки за известяване по е-поща</a>.
-      emails:
-        notification_emails:
-          favourite: е-писма за харесани известия
-          follow: е-писма с известия за последване
-          follow_request: е-писма със заявки за следване
-          mention: е-писма с известия за споменаване
-          reblog: е-писма с известия за раздуване
-      resubscribe_html: Ако погрешка сте спрели абонамента, то може пак да се абонирате от своите <a href="%{settings_path}">настройки за известия по е-поща</a>.
-      success_html: Повече няма да получавате %{type} за Mastodon в %{domain} към имейла си при %{email}.
       title: Спиране на абонамента
   media_attachments:
     validations:
@@ -1519,8 +1468,6 @@ bg:
     update:
       subject: "%{name} промени публикация"
   notifications:
-    administration_emails: Администраторски известия по имейла
-    email_events: Събития за известия по имейл
     email_events_hint: 'Изберете събития, за които искате да получавате известия:'
   number:
     human:
@@ -1679,7 +1626,6 @@ bg:
     import: Импортиране
     import_and_export: Импортиране и експортиране
     migrate: Миграция на акаунта
-    notifications: Известия по имейла
     preferences: Предпочитания
     profile: Профил
     relationships: Последвания и последователи
@@ -1926,7 +1872,6 @@ bg:
     invalid_otp_token: Невалиден код
     otp_lost_help_html: Ако загубите достъп до двете, то може да се свържете с %{email}
     rate_limited: Премного опити за удостоверяване. Опитайте пак по-късно.
-    seamless_external_login: Влезли сте чрез външна услуга, така че настройките за парола и имейл не са налични.
     signed_in_as: 'Влезли като:'
   verification:
     extra_instructions_html: <strong>Съвет:</strong>Връзката в уебсайта ви може да е невидима. Важна част е <code>rel="me"</code>, която предотврятява имитирането на уебсайтове с породено от потребителите съдържание. Може дори да употребите етикет за <code>връзката</code> в заглавката на странице вместо <code>а</code>, но HTML трябва да достъпен без изпълнение на JavaScript.
diff --git a/config/locales/bn.yml b/config/locales/bn.yml
index 411339e9a11952..edbef73ae257e3 100644
--- a/config/locales/bn.yml
+++ b/config/locales/bn.yml
@@ -31,7 +31,6 @@ bn:
       created_msg: প্রশাসনবস্তুত লেখাটি সঠিকভাবে তৈরী হয়েছে!
       destroyed_msg: প্রশাসনবস্তুত লেখাটি সঠিকভাবে মুছে ফেলা হয়েছে!
     accounts:
-      add_email_domain_block: নিষিদ্ধ করা ই-মেইল ডোমেইন
       approve: অনুমোদন দিন
       approved_msg: "%{username}-এর অ্যাকাউন্ট সৃষ্টি আবেদন সফলভাবে অনুমোদিত হয়েছে"
       are_you_sure: আপনি কি নিশ্চিত ?
@@ -58,7 +57,6 @@ bn:
       demote: নিচের পদে দিন
       destroyed_msg: "%{username}-এর ডেটা এখন সারিবদ্ধভাবে মুছে ফেলা হবে"
       disable: বন্ধ করুন
-      disable_sign_in_token_auth: ই-মেইল টোকেন প্রমাণীকরণ অক্ষম করুন
       disable_two_factor_authentication: দুই পদ্ধতির প্রমাণীকরণ(2FA) বন্ধ করুন
       disabled: বন্ধ করা হয়েছে
       display_name: দেখানোর জন্য নাম
@@ -67,7 +65,6 @@ bn:
       email: ইমেইল
       email_status: ইমেইলের অবস্থা
       enable: চালু করুন
-      enable_sign_in_token_auth: ই-মেইল টোকেন প্রমাণীকরণ সক্ষম করুন
       enabled: চালু করুন
       enabled_msg: "%{username}-এর অ্যাকাউন্ট সফলভাবে আনফ্রোজ করা হয়েছে"
       followers: অনুসরকারীরা
@@ -114,7 +111,6 @@ bn:
       reset_password: পাসওয়ার্ড পুনঃস্থাপন করুন
       resubscribe: পুনরায় সদস্যতা নিন
       search: অনুসন্ধান
-      search_same_email_domain: একই ইমেল ডোমেন সহ অন্যান্য ব্যবহারকারীরা
       search_same_ip: একই IP সহ অন্যান্য ব্যবহারকারীরা
       shared_inbox_url: ভাগ করা ইনবক্স URL
       show:
@@ -137,20 +133,17 @@ bn:
     action_logs:
       action_types:
         assigned_to_self_report: রিপোর্ট বরাদ্দ করুন
-        change_email_user: ব্যবহারকারী জন্য ইমেইল পরিবর্তন করুন
         confirm_user: ব্যবহারকারী নিশ্চিত করুন
         create_account_warning: সতর্কতা তৈরি করুন
         create_announcement: ঘোষণা তৈরি করুন
         create_custom_emoji: স্বনির্ধারিত ইমোজি তৈরি করুন
         create_domain_allow: ডোমেন অনুমোদন তৈরি করুন
         create_domain_block: ডোমেন ব্লক তৈরি করুন
-        create_email_domain_block: ইমেইল ডোমেন ব্লক তৈরি করুন
         demote_user: ব্যবহারকারী কে হীনপদস্থ করুন
         destroy_announcement: ঘোষণা মুছুন
         destroy_custom_emoji: স্বনির্ধারিত ইমোজি মুছুন
         destroy_domain_allow: ডোমেন অনুমোদন মুছুন
         destroy_domain_block: ডোমেন ব্লক মুছুন
-        destroy_email_domain_block: ইমেইল ডোমেন ব্লক মুছুন
         destroy_status: স্ট্যাটাস মুছুন
         disable_2fa_user: 2FA নিষ্ক্রিয় করুন
         disable_custom_emoji: স্বনির্ধারিত ইমোজি নিষ্ক্রিয় করুন
diff --git a/config/locales/br.yml b/config/locales/br.yml
index 03537a5b806912..4ef8fa1a18cfdb 100644
--- a/config/locales/br.yml
+++ b/config/locales/br.yml
@@ -27,7 +27,6 @@ br:
     account_moderation_notes:
       create: Leuskel un notenn
     accounts:
-      add_email_domain_block: Stankañ an domani postel
       approve: Aprouiñ
       are_you_sure: Ha sur oc'h?
       avatar: Avatar
@@ -286,7 +285,6 @@ br:
           tag_uses_measure: implijoù hollek
         not_usable: N'haller ket en implijout
         title: Hashtagoù diouzh ar c'hiz
-      title: Luskadoù
     warning_presets:
       add_new: Ouzhpenniñ unan nevez
       delete: Dilemel
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index f3fd91d11f62fa..ae2ea3cd7b63a0 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -58,7 +58,6 @@ ca:
       demote: Degrada
       destroyed_msg: Les dades de %{username} son a la cua per a ser esborrades en breu
       disable: Inhabilita
-      disable_sign_in_token_auth: Desactivar l'autenticació de token per correu
       disable_two_factor_authentication: Desactiva 2FA
       disabled: Inhabilitat
       display_name: Nom visible
@@ -67,7 +66,6 @@ ca:
       email: Adreça electrònica
       email_status: Estat de l'adreça electrònica
       enable: Habilita
-      enable_sign_in_token_auth: Activar l'autenticació de token per correu
       enabled: Habilitat
       enabled_msg: El compte de %{username} s’ha descongelat amb èxit
       followers: Seguidors
@@ -132,7 +130,6 @@ ca:
       resubscribe: Torna a subscriure
       role: Rol
       search: Cerca
-      search_same_email_domain: Altres usuaris amb el mateix domini de correu
       search_same_ip: Altres usuaris amb la mateixa IP
       security: Seguretat
       security_measures:
@@ -173,26 +170,21 @@ ca:
         approve_appeal: Aprova l'apel·lació
         approve_user: Aprova l'usuari
         assigned_to_self_report: Assigna un informe
-        change_email_user: Canvia l'adreça electrònica per l'usuari
         change_role_user: Canvia el Rol del Usuari
         confirm_user: Confirma l'usuari
         create_account_warning: Crea un avís
         create_announcement: Crea un anunci
-        create_canonical_email_block: Crea un bloqueig de correu electrònic
         create_custom_emoji: Crea un emoji personalitzat
         create_domain_allow: Crea un domini permès
         create_domain_block: Crea un bloqueig de domini
-        create_email_domain_block: Crea un bloqueig de domini de correu
         create_ip_block: Crear regla IP
         create_unavailable_domain: Crea un domini no disponible
         create_user_role: Crea Rol
         demote_user: Degrada l'usuari
         destroy_announcement: Esborra l'anunci
-        destroy_canonical_email_block: Esborra el bloqueig de correu electrònic
         destroy_custom_emoji: Esborra l'emoji personalitzat
         destroy_domain_allow: Esborra el permís del domini
         destroy_domain_block: Esborra el bloqueig de domini
-        destroy_email_domain_block: Esborra el bloqueig de domini de correu
         destroy_instance: Purga Domini
         destroy_ip_block: Eliminar regla IP
         destroy_status: Elimina la publicació
@@ -200,10 +192,8 @@ ca:
         destroy_user_role: Destrueix Rol
         disable_2fa_user: Desactiva 2FA
         disable_custom_emoji: Desactiva l'emoji personalitzat
-        disable_sign_in_token_auth_user: Desactivr l'autenticació de token per correu per a l'usuari
         disable_user: Deshabilita l'usuari
         enable_custom_emoji: Activa l'emoji personalitzat
-        enable_sign_in_token_auth_user: Activa l'autenticació de token per correu per a l'usuari
         enable_user: Activa l'usuari
         memorialize_account: Memoritza el compte
         promote_user: Promou l'usuari
@@ -233,26 +223,20 @@ ca:
         approve_appeal_html: "%{name} ha aprovat l'apel·lació a la decisió de moderació de %{target}"
         approve_user_html: "%{name} ha aprovat el registre de %{target}"
         assigned_to_self_report_html: "%{name} s'han assignat l'informe %{target} a ells mateixos"
-        change_email_user_html: "%{name} ha canviat l'adreça de correu electrònic del usuari %{target}"
         change_role_user_html: "%{name} ha canviat el rol de %{target}"
-        confirm_user_html: "%{name} ha confirmat l'adreça de correu electrònic de l'usuari %{target}"
         create_account_warning_html: "%{name} ha enviat un avís a %{target}"
         create_announcement_html: "%{name} ha creat un nou anunci %{target}"
-        create_canonical_email_block_html: "%{name} ha bloquejat l'adreça de correu electrònic amb el hash %{target}"
         create_custom_emoji_html: "%{name} ha pujat un emoji nou %{target}"
         create_domain_allow_html: "%{name} ha permès la federació amb el domini %{target}"
         create_domain_block_html: "%{name} ha bloquejat el domini %{target}"
-        create_email_domain_block_html: "%{name} ha bloquejat el domini de correu electrònic %{target}"
         create_ip_block_html: "%{name} ha creat una regla per a l'IP %{target}"
         create_unavailable_domain_html: "%{name} ha aturat el lliurament al domini %{target}"
         create_user_role_html: "%{name} ha creat el rol %{target}"
         demote_user_html: "%{name} ha degradat l'usuari %{target}"
         destroy_announcement_html: "%{name} ha eliminat l'anunci %{target}"
-        destroy_canonical_email_block_html: "%{name} ha desbloquejat el correu electrònic amb el hash %{target}"
         destroy_custom_emoji_html: "%{name} ha esborrat l'emoji %{target}"
         destroy_domain_allow_html: "%{name} no permet la federació amb el domini %{target}"
         destroy_domain_block_html: "%{name} ha desbloquejat el domini %{target}"
-        destroy_email_domain_block_html: "%{name} ha desbloquejat el domini de correu electrònic %{target}"
         destroy_instance_html: "%{name} ha purgat el domini %{target}"
         destroy_ip_block_html: "%{name} ha esborrat la regla per a l'IP %{target}"
         destroy_status_html: "%{name} ha eliminat el tut de %{target}"
@@ -260,10 +244,8 @@ ca:
         destroy_user_role_html: "%{name} ha esborrat el rol %{target}"
         disable_2fa_user_html: "%{name} ha desactivat el requisit de dos factors per a l'usuari %{target}"
         disable_custom_emoji_html: "%{name} ha desactivat l'emoji %{target}"
-        disable_sign_in_token_auth_user_html: "%{name} ha desactivat l'autenticació de token per correu per a %{target}"
         disable_user_html: "%{name} ha desactivat l'accés del usuari %{target}"
         enable_custom_emoji_html: "%{name} ha activat l'emoji %{target}"
-        enable_sign_in_token_auth_user_html: "%{name} ha activat l'autenticació de token per correu per a %{target}"
         enable_user_html: "%{name} ha activat l'accés del usuari %{target}"
         memorialize_account_html: "%{name} ha convertit el compte %{target} en una pàgina de memorial"
         promote_user_html: "%{name} ha promogut l'usuari %{target}"
@@ -271,7 +253,6 @@ ca:
         reject_user_html: "%{name} ha rebutjat el registre de %{target}"
         remove_avatar_user_html: "%{name} ha eliminat l'avatar de %{target}"
         reopen_report_html: "%{name} ha reobert l'informe %{target}"
-        resend_user_html: "%{name} ha renviat el correu de confirmació per %{target}"
         reset_password_user_html: "%{name} ha restablert la contrasenya de l'usuari %{target}"
         resolve_report_html: "%{name} ha resolt l'informe %{target}"
         sensitive_account_html: "%{name} ha marcat els mèdia de %{target} com a sensibles"
@@ -432,7 +413,6 @@ ca:
       attempts_over_week:
         one: "%{count} intent en la darrera setmana"
         other: "%{count} intents de registre en la darrera setmana"
-      created_msg: S'ha creat el bloc de domini de correu electrònic
       delete: Elimina
       dns:
         types:
@@ -441,12 +421,8 @@ ca:
       new:
         create: Afegir un domini
         resolve: Resol domini
-        title: Nova adreça de correu en la llista negra
-      no_email_domain_block_selected: No s'han canviat els bloquejos de domini perquè cap s'ha seleccionat
       not_permitted: No permés
-      resolved_dns_records_hint_html: El nom del domini resol als següents dominis MX, els quals 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 del domini sigui diferent. <strong>Ves amb compte no bloquegis els grans proveïdors de correu electrònic.</strong>
       resolved_through_html: Resolt mitjançant %{domain}
-      title: Llista negra de correus electrònics
     export_domain_allows:
       new:
         title: Importa dominis permesos
@@ -600,7 +576,6 @@ ca:
         resolve_description_html: No serà presa cap acció contra el compte denunciat, no se'n registrarà res i l'informe es tancarà.
         silence_description_html: El compte només serà visible a qui ja el seguia o l'ha cercat manualment, limitant-ne fortament l'abast. Sempre es pot revertir. Es tancaran tots els informes contra aquest compte.
         suspend_description_html: Aquest compte i tots els seus continguts seran inaccessibles i finalment eliminats, i interaccionar amb ell no serà possible. Reversible en 30 dies. Tanca tots els informes contra aquest compte.
-      actions_description_html: Decideix quina acció a prendre per a resoldre aquest informe. Si prens un acció punitiva contra el compte denunciat, se li enviarà una notificació per correu electrònic, excepte quan se selecciona la categoria <strong>Spam</strong>.
       actions_description_remote_html: Decideix quina acció prendre per a resoldre aquest informe. Això només afectarà com <strong>el teu</strong> servidor es comunica amb aquest compte remot i en gestiona el contingut.
       add_to_report: Afegir més al informe
       already_suspended_badges:
@@ -665,7 +640,6 @@ ca:
         delete_data_html: Esborra el perfil de <strong>@%{acct}</strong> i els seus continguts dins de 30 dies des d'ara a no ser que es desactivi la suspensió abans
         preview_preamble_html: "<strong>@%{acct}</strong> rebrà un avís amb el contingut següent:"
         record_strike_html: Registra una acció contra <strong>@%{acct}</strong> per ajudar a escalar-ho en futures violacions des d'aquest compte
-        send_email_html: Envia un avís per correu electrònic a <strong>@%{acct}</strong>
         warning_placeholder: Opcional raó adicional d'aquesta acció de moderació.
       target_origin: Origen del compte denunciat
       title: Informes
@@ -705,7 +679,6 @@ ca:
         manage_appeals: Gestiona apel·lacions
         manage_appeals_description: Permet als usuaris revisar les apel·lacions contra les accions de moderació
         manage_blocks: Gestiona blocs
-        manage_blocks_description: Permet als usuaris bloquejar proveïdors de correu electrònic i adreces IP
         manage_custom_emojis: Gestiona emojis personalitzats
         manage_custom_emojis_description: Permet als usuaris gestionar emojis personalitzats al servidor
         manage_federation: Gestiona federació
@@ -723,7 +696,6 @@ ca:
         manage_taxonomies: Gestionar taxonomies
         manage_taxonomies_description: Permet als usuaris revisar el contingut actual i actualitzar la configuració de l'etiqueta
         manage_user_access: Gestionar l'accés dels usuaris
-        manage_user_access_description: Permet als usuaris desactivar l'autenticació de dos factors d'altres usuaris, canviar la seva adreça de correu electrònic i restablir la seva contrasenya
         manage_users: Gestionar usuaris
         manage_users_description: Permet als usuaris veure els detalls d'altres usuaris i realitzar accions de moderació contra ells
         manage_webhooks: Gestionar Webhooks
@@ -798,7 +770,6 @@ 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 mantenir actualizada la teva instal·lació de Mastodon per a beneficiar-se de les darreres correccions i característiques. A més, de vegades és fonamental actualitzar Mastodon periòdicament per evitar problemes de seguretat. Per aquestes raons, Mastodon comprova si hi ha actualitzacions cada 30 minuts i et notificarà d'acord amb les teves preferències de notificacions per correu electrònic.
       documentation_link: Més informació
       release_notes: Notes de llançament
       title: Actualitzacions disponibles
@@ -907,10 +878,16 @@ ca:
     trends:
       allow: Permet
       approved: Aprovat
+      confirm_allow: Segur que voleu permetre les etiquetes seleccionades?
+      confirm_disallow: Segur que voleu deixar de permetre les etiquetes seleccionades?
       disallow: No permès
       links:
         allow: Permet enllaç
         allow_provider: Permet mitjà
+        confirm_allow: Segur que voleu permetre els enllaços seleccionats?
+        confirm_allow_provider: Segur que voleu permetre els proveïdors seleccionats?
+        confirm_disallow: Segur que voleu deixar de permetre els enllaços seleccionats?
+        confirm_disallow_provider: Segur que voleu deixar de permetre els proveïdors seleccionats?
         description_html: Aquests són enllaços que ara mateix estan compartint molt els comptes dels quals el teu servidor veu els tuts. Poden ajudar els teus usuaris a trobar què està passant en el món. Cap dels enllaços es mostra públicament fins que no aprovis el mitjà. També pots acceptar o rebutjar enllaços individuals.
         disallow: No permetre l'enllaç
         disallow_provider: No permetre el mitjà
@@ -934,6 +911,10 @@ ca:
       statuses:
         allow: Permet publicació
         allow_account: Permet autor
+        confirm_allow: Segur que voleu permetre els estatus seleccionats?
+        confirm_allow_account: Segur que voleu permetre els comptes seleccionats?
+        confirm_disallow: Segur que voleu deixar de permetre els estatus seleccionats?
+        confirm_disallow_account: Segur que voleu deixar de permetre els comptes seleccionats?
         description_html: Aquests són tuts que el teu servidor veu i que ara mateix s'estan compartint i afavorint molt. Poden ajudar als teus nous usuaris i als que retornen a trobar més gent a qui seguir. Cap tut es mostra públicament fins que no aprovis l'autor i l'autor permeti que el seu compte sigui suggerit a altres. També pots acceptar o rebutjar tuts individualment.
         disallow: Rebutja tut
         disallow_account: Rebutja autor
@@ -966,7 +947,7 @@ ca:
         used_by_over_week:
           one: Emprat per una persona en la darrera setmana
           other: Emprat per %{count} persones en la darrera setmana
-      title: Tendència
+      title: Recomanacions i tendències
       trending: Tendència
     warning_presets:
       add_new: Afegir-ne un de nou
@@ -1051,9 +1032,7 @@ ca:
       guide_link_text: Tothom hi pot contribuir.
     sensitive_content: Contingut sensible
   application_mailer:
-    notification_preferences: Canvia les preferències de correu
     salutation: "%{name},"
-    settings: 'Canvia les preferències de correu: %{link}'
     unsubscribe: Cancel·la la subscripció
     view: 'Visualització:'
     view_profile: Mostra el perfil
@@ -1073,7 +1052,6 @@ ca:
       hint_html: Una cosa més! Necessitem confirmar que ets una persona humana (és així com mantenim a ratlla l'spam). Resolt el CAPTCHA inferior i clica a "Segueix".
       title: Revisió de seguretat
     confirmations:
-      awaiting_review: S'ha confirmat la teva adreça-e. El personal de %{domain} revisa ara el registre. Rebràs un correu si t'aproven el compte.
       awaiting_review_title: S'està revisant la teva inscripció
       clicking_this_link: en clicar aquest enllaç
       login_link: inici de sessió
@@ -1081,7 +1059,6 @@ ca:
       redirect_to_app_html: Se us hauria d'haver redirigit a l'app <strong>%{app_name}</strong>. Si això no ha passat, intenteu %{clicking_this_link} o torneu manualment a l'app.
       registration_complete: La teva inscripció a %{domain} ja és completa.
       welcome_title: Hola, %{name}!
-      wrong_email_hint: Si aquesta adreça de correu electrònic no és correcte, pots canviar-la en els ajustos del compte.
     delete_account: Elimina el compte
     delete_account_html: Si vols suprimir el compte pots <a href="%{path}">fer-ho aquí</a>. Se't demanarà confirmació.
     description:
@@ -1102,7 +1079,6 @@ ca:
     or_log_in_with: O inicia sessió amb
     privacy_policy_agreement_html: He llegit i estic d'acord amb la <a href="%{privacy_policy_path}" target="_blank">política de privacitat</a>
     progress:
-      confirm: Confirma correu electrònic
       details: Els teus detalls
       review: La nostra revisió
       rules: Accepta les normes
@@ -1124,10 +1100,8 @@ ca:
     security: Seguretat
     set_new_password: Estableix una contrasenya nova
     setup:
-      email_below_hint_html: Verifica la carpeta fe correu brossa o demana'n un altre. Pots corregir la teva adreça de correu electrònic si no és correcte.
       email_settings_hint_html: Toca l'enllaç que t'hem enviat per a verificar %{email}. Esperarem aquí mateix.
       link_not_received: No has rebut l'enllaç?
-      new_confirmation_instructions_sent: Rebràs un nou correu electrònic amb l'enllaç de confirmació en pocs minuts!
       title: Comprova la teva safata d'entrada
     sign_in:
       preamble_html: Inicia la sessió amb les teves credencials de <strong>%{domain}</strong>. Si el teu compte es troba a un servidor diferent, no podràs iniciar sessió aquí.
@@ -1138,9 +1112,7 @@ ca:
       title: Configurem-te a %{domain}.
     status:
       account_status: Estat del compte
-      confirming: Esperant que es completi la confirmació del correu electrònic.
       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 sigui aprovada.
       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
@@ -1183,9 +1155,6 @@ 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: Pots <a href="%{path}">canviar la teva adreça de correu electrònic</a> sense eliminar el teu compte
-      email_contact_html: Si encara no arriba pots enviar un correu electrònic a <a href="mailto:%{email}">%{email}</a> per a demanar ajuda
-      email_reconfirmation_html: Si no estàs rebent el correu electrònic de confirmació <a href="%{path}">pots demanar-lo un altre cop</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
@@ -1418,7 +1387,6 @@ ca:
     authentication_methods:
       otp: aplicació d'autenticació de dos factors
       password: contrasenya
-      sign_in_token: codi de seguretat per correu electrònic
       webauthn: claus de seguretat
     description_html: Si veus activitat que no reconeixes, considera canviar la teva contrasenya i activar l'autenticació de dos factors.
     empty: Historial d'autenticació no disponible
@@ -1429,16 +1397,6 @@ ca:
     unsubscribe:
       action: Sí, canceŀla la subscripció
       complete: Subscripció cancel·lada
-      confirmation_html: Estàs segur que vols donar-te de baixa de rebre %{type} de Mastodon a %{domain} en el teu correu electrònic a %{email}? Sempre pots subscriure't de nou des de la <a href="%{settings_path}">configuració de les notificacions per correu electrònic</a>.
-      emails:
-        notification_emails:
-          favourite: notificacions dels favorits per correu electrònic
-          follow: notificacions dels seguiments per correu electrònic
-          follow_request: correus electrònics de peticions de seguiment
-          mention: correus electrònics de notificacions de mencions
-          reblog: correus electrònics de notificacions d'impulsos
-      resubscribe_html: Si ets dones de baixa per error, pots donar-te d'alta des de la <a href="%{settings_path}">configuració de les notificacions per correu electrònic</a>.
-      success_html: Ja no rebràs %{type} de Mastodon a %{domain} en la teva safata a %{email}.
       title: Cancel·la la subscripció
   media_attachments:
     validations:
@@ -1519,8 +1477,6 @@ ca:
     update:
       subject: "%{name} ha editat una publicació"
   notifications:
-    administration_emails: Notificacions per correu-e de l'Admin
-    email_events: Esdeveniments per a notificacions de correu electrònic
     email_events_hint: 'Selecciona els esdeveniments per als quals vols rebre notificacions:'
   number:
     human:
@@ -1679,7 +1635,6 @@ ca:
     import: Importació
     import_and_export: Importació i exportació
     migrate: Migració del compte
-    notifications: Notificacions per correu electrònic
     preferences: Preferències
     profile: Perfil
     relationships: Seguits i seguidors
@@ -1926,7 +1881,6 @@ ca:
     invalid_otp_token: El codi de dos factors no és correcte
     otp_lost_help_html: Si has perdut l'accés a tots dos pots contactar per %{email}
     rate_limited: Excessius intents d'autenticació, torneu-hi més tard.
-    seamless_external_login: Has iniciat sessió via un servei extern per tant els ajustos de contrasenya i correu electrònic no estan disponibles.
     signed_in_as: 'Sessió iniciada com a:'
   verification:
     extra_instructions_html: <strong>Consell:</strong> l'enllaç al vostre lloc web pot ser invisible. La part important és <code>rel="me"</code> que evita que us suplantin la identitat a llocs web amb contingut generat pels usuaris. Fins i tot podeu generar una etiqueta <code>link</code> a la capçalera de la pàgina en comptes d'una <code>a</code>, però el codi HTML ha de ser accessible sense requerir executar JavaScript.
diff --git a/config/locales/ckb.yml b/config/locales/ckb.yml
index 93eea8273f514b..15c5690cdd6726 100644
--- a/config/locales/ckb.yml
+++ b/config/locales/ckb.yml
@@ -31,7 +31,6 @@ ckb:
       created_msg: تێبینی بەڕێوەبەر بە سەرکەوتوویی دروست کرا!
       destroyed_msg: تێبینی بەڕێوەبەر بە سەرکەوتوویی لەناوچوو!
     accounts:
-      add_email_domain_block: بلۆککردنی هەموو دۆمەینەکە
       approve: پەسەند کردن
       approved_msg: بەرنامەی تۆمارکردنی %{username} بۆ چوونەناوی پەسەند کرا
       are_you_sure: دڵنیای?
@@ -58,7 +57,6 @@ ckb:
       demote: پلە نزمکرایەوە
       destroyed_msg: دراوەکانی %{username} لە ڕیزی سڕینەوەن
       disable: بەستن
-      disable_sign_in_token_auth: ڕەسەنایەتی نیشانەی ئیمەیڵ لەکاربخە
       disable_two_factor_authentication: لەکارخستنی 2FA
       disabled: بەستوو
       display_name: ناوی پیشاندان
@@ -67,7 +65,6 @@ ckb:
       email: پۆستی ئەلکترۆنی
       email_status: دۆخی ئیمەیڵ
       enable: چالاک کردن
-      enable_sign_in_token_auth: ڕەسەنایەتی نیشانەی ئیمەیڵ چالاک بکە
       enabled: چالاککراوە
       enabled_msg: هەژمارە %{username} بە سەرکەوتوویی سنووردار کرا
       followers: شوێنکەوتوان
@@ -124,7 +121,6 @@ ckb:
       resubscribe: دووبارە ئابونەبوون
       role: ڕۆڵ
       search: گەڕان
-      search_same_email_domain: بەکارهێنەرانی دیکە بە ئیمەیلی یەکسان
       search_same_ip: بەکارهێنەرانی تر بەهەمان ئای پی
       security_measures:
         only_password: تەنها وشەی نهێنی
@@ -163,26 +159,21 @@ ckb:
         approve_appeal: پەسەندکردنی تانەدان
         approve_user: پەسەندکردنی بەکارهێنەر
         assigned_to_self_report: تەرخانکردنی گوزارشت
-        change_email_user: گۆڕینی ئیمەیڵ بۆ بەکارهێنەر
         change_role_user: گۆڕینی ڕۆڵی بەکارهێنەر
         confirm_user: دڵنیابوون لە بەکارهێنەر
         create_account_warning: دروستکردنی ئاگاداری
         create_announcement: دروستکردنی راگەیەندراو
-        create_canonical_email_block: دروستکردنی بلۆککردنی ئیمەیڵ
         create_custom_emoji: دروستکردنی ئێمۆمۆجی دڵخواز
         create_domain_allow: دروستکردنی ڕێپێدان بە دۆمەین
         create_domain_block: دروستکردنی بلۆکی دۆمەین
-        create_email_domain_block: دروستکردنی بلۆکی دۆمەینی ئیمەیڵ
         create_ip_block: دروستکردنی یاسای IP
         create_unavailable_domain: دروستکردنی دۆمەینی بەردەست نییە
         create_user_role: دروستکردنی پلە
         demote_user: دابەزاندنی ئاستی بەکارهێنەر
         destroy_announcement: سڕینەوەی راگەیەندراو
-        destroy_canonical_email_block: سڕینەوەی بلۆکی ئیمەیڵ
         destroy_custom_emoji: سڕینەوەی ئێمۆمۆجی تایبەتمەند
         destroy_domain_allow: سڕینەوەی ڕێپێدان بە دۆمەین
         destroy_domain_block: سڕینەوەی بلۆکی دۆمەین
-        destroy_email_domain_block: سڕینەوەی بلۆکی دۆمەینی ئیمەیڵ
         destroy_instance: پاککردنەوەی دۆمەین
         destroy_ip_block: سڕینەوەی یاسای IP
         destroy_status: دۆخ بسڕەوە
@@ -190,10 +181,8 @@ ckb:
         destroy_user_role: لەناوبردنی پلە
         disable_2fa_user: لەکارخستنی 2FA
         disable_custom_emoji: سڕینەوەی ئێمۆمۆجی تایبەتمەند
-        disable_sign_in_token_auth_user: ڕەسەنایەتی نیشانەی ئیمەیڵ بۆ بەکارهێنەر لەکاربخە
         disable_user: بەکارهێنەر لە کاربخە
         enable_custom_emoji: ئیمۆمۆجی تایبەتمەند چالاک بکە
-        enable_sign_in_token_auth_user: ڕەسەنایەتی نیشانەی ئیمەیڵ بۆ بەکارهێنەر چالاک بکە
         enable_user: چالاککردنی بەکارهێنەر
         memorialize_account: هەژماری بیرکەوتنەوە
         promote_user: بەرزکردنەوەی بەکارهێنەر
@@ -325,7 +314,6 @@ ckb:
       view: دیتنی بلۆکی دۆمەینی
     email_domain_blocks:
       add_new: زیادکردنی نوێ
-      created_msg: بە سەرکەوتوویی دۆمەینی ئیمەیڵ بلۆک کرا
       delete: سڕینەوە
       dns:
         types:
@@ -334,11 +322,7 @@ ckb:
       new:
         create: زیادکردنی دۆمەین
         resolve: چارەسەرکردنی دۆمەین
-        title: بلۆککردنی دۆمەینی ئیمەیڵی نوێ
-      no_email_domain_block_selected: هیچ بلۆکێکی دۆمەینی ئیمەیڵ نەگۆڕدرا چونکە هیچیان هەڵنەبژێردرابوون
-      resolved_dns_records_hint_html: ناوی دۆمەینەکە چارەسەر دەبێت بۆ ئەم دۆمەینانەی خوارەوەی MX، کە لە کۆتاییدا بەرپرسیارن لە وەرگرتنی ئیمەیڵ. ڕێگریکردن لە دۆمەینی MX ڕێگری دەکات لە ناو تۆمارکردن لە هەر ناونیشانێکی ئیمەیڵەوە کە هەمان دۆمەینی MX بەکاردەهێنێت، تەنانەت ئەگەر ناوی دۆمەینی بینراو جیاواز بێت. <strong>ئاگاداربە کە دابینکەرانی ئیمەیڵی سەرەکی بلۆک نەکەیت.</strong>
       resolved_through_html: لە ڕێگەی %{domain} چارەسەر دەکرێت
-      title: دۆمەینە بلۆککراوەکانی ئیمەیڵ
     follow_recommendations:
       description_html: "<strong>پەیڕەوکردنی پێشنیارەکان یارمەتی بەکارهێنەرانی نوێ دەدەن بە خێرایی ناوەڕۆکی سەرنجڕاکێش بدۆزنەوە</strong>. کاتێک بەکارهێنەرێک ئەوەندە کارلێکی لەگەڵ کەسانی دیکە نەکردووە کە پێشنیاری بەدواداچوونی کەسی پێکبهێنێت، لەبری ئەوە ئەم ئەکاونتانە پێشنیار دەکرێن. ئەوان ڕۆژانە لە تێکەڵەیەک لە ئەکاونتەکانەوە دووبارە حیساب دەکرێنەوە کە بەرزترین پەیوەندییەکانی ئەم دواییە و بەرزترین ژمارەی فۆڵۆوەری ناوخۆیی بۆ زمانێکی دیاریکراویان هەیە."
       language: بۆ زمان
@@ -464,7 +448,6 @@ ckb:
         mark_as_sensitive_description_html: میدیاکان لە پۆستە ڕاپۆرتکراوەکاندا وەک هەستیار نیشانە دەکرێن و مانگرتنێک تۆمار دەکرێت بۆ ئەوەی یارمەتیت بدات لەسەر پێشێلکارییەکانی داهاتوو لەلایەن هەمان ئەکاونتەوە زیاد بکەیت.
         other_description_html: بژاردەی زیاتر ببینە بۆ کۆنترۆڵکردنی هەڵسوکەوتی ئەکاونتەکە و خۆکارکردنی پەیوەندی بۆ ئەژمێری ڕاپۆرتکراو.
         resolve_description_html: هیچ ئیجرائاتێک لە دژی ئەو حسابە ڕاپۆرت کراوە ناگیرێتەبەر، هیچ مانگرتنێک تۆمار ناکرێت، ڕاپۆرتەکەش دادەخرێت.
-      actions_description_html: بڕیار بدە کام رێوشوێن بگیرێتەبەر بۆ چارەسەرکردنی ئەم راپۆرتە. ئەگەر تۆ ڕێوشوێنی سزادان لە دژی ئەژمێری ڕاپۆرتکراو بگریتەبەر، ئاگادارکردنەوەیەکی ئیمەیڵیان بۆ دەنێردرێت، تەنها کاتێک نەبێت کە پۆلی <strong>سپام</strong> هەڵبژێردرابێت.
       add_to_report: زیاتر زیاد بکە بۆ ڕاپۆرت
       are_you_sure: دڵنیای?
       assign_to_self: دیاریکردن بۆ من
@@ -574,9 +557,7 @@ ckb:
       guide_link_text: هەموو کەسێک دەتوانێت بەشداری بکات.
     sensitive_content: ناوەڕۆکی هەستیار
   application_mailer:
-    notification_preferences: گۆڕینی پەسەندکراوەکانی ئیمەیڵ
     salutation: "%{name},"
-    settings: 'گۆڕینی پەسەندکراوەکانی ئیمەیڵ: %{link}'
     view: 'نیشاندان:'
     view_profile: پرۆفایل نیشان بدە
     view_status: پیشاندانی دۆخ
@@ -615,9 +596,7 @@ ckb:
     set_new_password: سازدانی تێپەڕوشەی نوێ
     status:
       account_status: دۆخی هەژمارە
-      confirming: چاوەڕوانی دڵنیاکردنەوەی ئیمەیڵ بۆ تەواوکردن.
       functional: هەژمارەکەت بەتەواوی کاردەکات.
-      pending: ئەپلیکەیشەنەکەت چاوەڕوانی پێداچوونەوەیە لەلایەن ستافەکەمانەوە. لەوانەیە ئەمە هەندێک کاتی بخایەنێت ئەگەر ئەۆپەکەت پەسەند کرا، ئیمەیڵت پێدەگات.
       redirecting_to: هەژمارەکەت ناچالاکە لەبەرئەوەی ئێستا دووبارە ئاڕاستەدەکرێتەوە بۆ %{acct}.
       view_strikes: بینینی لێدانەکانی ڕابردوو لە دژی ئەکاونتەکەت
     too_fast: فۆڕم زۆر خێرا پێشکەش کراوە، دووبارە هەوڵبدەرەوە.
@@ -659,9 +638,6 @@ ckb:
       before: 'پێش بەردەوام بوون، تکایە ئەم تێبینیانە بە وردی بخوێننەوە:'
       caches: وادیارە ئەو ناوەرۆکە کە ڕاژەکانی دیکە پاشکەوتیان کردووە بمینێتەوە
       data_removal: بابەتەکانت و داتاکانی تر بە هەمیشەیی لادەبرێن
-      email_change_html: دەتوانی <a href="%{path}"> ناونیشانی ئیمەیڵەکەت بگۆڕیت</a> بەبێ سڕینەوەی هەژمارەکەت
-      email_contact_html: گەر ئیمەیل نەگەیشتووە بۆ داوای یارمەتی پەیامێک بنێرە بۆ <a href="mailto:%{email}">%{email}</a> پیغام دهید
-      email_reconfirmation_html: ئەگەر ئیمەیڵی پشتڕاستکردنەوەت پێنەگەشتووە، دەتوانیت <a href="%{path}"> دووبارە داوای لێبکە</a>
       irreversible: ناتوانیت هەژمارەکەت بگەڕێنیتەوە یان کارا بکەیتەوە
       more_details_html: بۆ زانیاری زیاتر، <a href="%{terms_path}"> پاراستنی نهێنیەکان</a> ببینە.
       username_available: ناوی تێپەڕبوونت دووبارە بەردەست دەبێت
@@ -837,7 +813,6 @@ ckb:
       subject: "%{name} نووسراوەکەتی دووبارە توتاند"
       title: توتاندنەوەی نوێ
   notifications:
-    email_events: رووداوەکان بۆ ئاگاداری ئیمەیلی
     email_events_hint: 'ئەو ڕووداوانە دیاریبکە کە دەتەوێت ئاگانامەکان وەربگری بۆ:'
   otp_authentication:
     code_hint: کۆدێک داخڵ بکە کە دروست کراوە لەلایەن ئەپی ڕەسەنایەتیەوە بۆ دڵنیابوون
@@ -1035,7 +1010,6 @@ ckb:
     follow_limit_reached: ناتوانیت زیاتر لە %{limit} خەڵک پەیڕەو کەیت
     invalid_otp_token: کۆدی دوو-فاکتەر نادروستە
     otp_lost_help_html: گەر بەو دووڕێگا نەتوانی بچیتە ژوورەوە، لەوانەیە پەیوەندی بگری بە %{email} بۆ یارمەتی
-    seamless_external_login: تۆ لە ڕێگەی خزمەتگوزاری دەرەکیەوە داخڵ بووی، بۆیە ڕێکبەندەکانی نهێنوشە و ئیمەیل بەردەست نین.
     signed_in_as: 'چوونە ژوورەوە وەک:'
   verification:
     verification: ساغ کردنەوە
diff --git a/config/locales/co.yml b/config/locales/co.yml
index 6edbbc95ffb31f..5ee69ff8ad219d 100644
--- a/config/locales/co.yml
+++ b/config/locales/co.yml
@@ -30,7 +30,6 @@ co:
       created_msg: Nota di muderazione creata!
       destroyed_msg: Nota di muderazione sguassata!
     accounts:
-      add_email_domain_block: Mette u duminiu e-mail in lista nera
       approve: Appruvà
       approved_msg: A dumanda d'arregistramente di %{username} hè stata appruvata
       are_you_sure: Site sicuru·a?
@@ -50,7 +49,6 @@ co:
       demote: Ritrugradà
       destroyed_msg: I dati di %{username} sò avà in fila d'attesa per esse tolti da quì à pocu
       disable: Disattivà
-      disable_sign_in_token_auth: Disattivà l'autentificazione à codice e-mail
       disable_two_factor_authentication: Disattivà l’identificazione à 2 fattori
       disabled: Ghjacciatu
       display_name: Nome pubblicu
@@ -59,7 +57,6 @@ co:
       email: E-mail
       email_status: Statutu di l’e-mail
       enable: Riattivà
-      enable_sign_in_token_auth: Attivà l'autentificazione à codice e-mail
       enabled: Attivatu
       enabled_msg: U contu di %{username} hè statu riattivatu
       followers: Abbunati
@@ -112,7 +109,6 @@ co:
       reset_password: Riinizializà a chjave d’accessu
       resubscribe: Riabbunassi
       search: Cercà
-      search_same_email_domain: Altri utilizatori cù listessu duminiu d'e-mail
       search_same_ip: Altri utilizatori cù listessa IP
       security_measures:
         only_password: Solu a chjave d'accessu
@@ -147,14 +143,12 @@ co:
       action_types:
         approve_user: Appruvà l'utilizatore
         assigned_to_self_report: Assignà signalamentu
-        change_email_user: Mudificà l'E-mail di l'Utilizatore
         confirm_user: Cunfirmà Utilizatore
         create_account_warning: Creà avertimentu
         create_announcement: Creà Annunziu
         create_custom_emoji: Creà Emoji Persunalizata
         create_domain_allow: Creà Auturizazione di Duminiu
         create_domain_block: Creà Blucchime di Duminiu
-        create_email_domain_block: Creà Blucchime di Duminiu E-mail
         create_ip_block: Creà regula IP
         create_unavailable_domain: Creà duminiu micca dispunibule
         demote_user: Ritrugadà Utilizatore
@@ -162,16 +156,13 @@ co:
         destroy_custom_emoji: Toglie Emoji Persunalizata
         destroy_domain_allow: Toglie Auturizazione di Duminiu
         destroy_domain_block: Toglie Blucchime di Duminiu
-        destroy_email_domain_block: Toglie blucchime di duminiu e-mail
         destroy_ip_block: Toglie regula IP
         destroy_status: Toglie u statutu
         destroy_unavailable_domain: Toglie duminiu micca dispunibule
         disable_2fa_user: Disattivà l’identificazione à 2 fattori
         disable_custom_emoji: Disattivà Emoji Persunalizata
-        disable_sign_in_token_auth_user: Disattivà l'Autentificazione à Codice E-Mail
         disable_user: Disattivà Utilizatore
         enable_custom_emoji: Attivà Emoji Persunalizata
-        enable_sign_in_token_auth_user: Attivà l'Autentificazione à Codice E-Mail
         enable_user: Attivà utilizatore
         memorialize_account: Trasfurmà contu in mimuriale
         promote_user: Prumove Utilizatore
@@ -193,21 +184,17 @@ co:
         update_status: Cambià Statutu
       actions:
         assigned_to_self_report_html: "%{name} s’hè assignatu u signalamentu %{target}"
-        change_email_user_html: "%{name} hà cambiatu l’indirizzu e-mail di %{target}"
-        confirm_user_html: "%{name} hà cunfirmatu l’indirizzu e-mail di %{target}"
         create_account_warning_html: "%{name} hà mandatu un'avertimentu à %{target}"
         create_announcement_html: "%{name} hà creatu u novu annunziu %{target}"
         create_custom_emoji_html: "%{name} hà caricatu una nov’emoji %{target}"
         create_domain_allow_html: "%{name} hà messu u duminiu %{target} nant’a lista bianca"
         create_domain_block_html: "%{name} hà bluccatu u duminiu %{target}"
-        create_email_domain_block_html: "%{name} hà messu u duminiu e-mail %{target} nant’a lista nera"
         create_ip_block_html: "%{name} hà creatu a regula IP %{target}"
         create_unavailable_domain_html: "%{name} hà firmatu a distribuzione à u duminiu %{target}"
         demote_user_html: "%{name} hà ritrugradatu l’utilizatore %{target}"
         destroy_announcement_html: "%{name} hà sguassatu u novu annunziu %{target}"
         destroy_domain_allow_html: "%{name} hà sguassatu u duminiu %{target} da a lista bianca"
         destroy_domain_block_html: "%{name} hà sbluccatu u duminiu %{target}"
-        destroy_email_domain_block_html: "%{name} hà messu u duminiu e-mail %{target} nant’a lista bianca"
         destroy_ip_block_html: "%{name} hà toltu a regula IP %{target}"
         destroy_status_html: "%{name} hà toltu u statutu di %{target}"
         destroy_unavailable_domain_html: "%{name} hà riprincipiatu a distribuzione à u duminiu %{target}"
@@ -332,13 +319,10 @@ co:
       view: Vede blucchime di duminiu
     email_domain_blocks:
       add_new: Aghjunghje
-      created_msg: U blucchime di u duminiu d’e-mail hè attivu
       delete: Toglie
       domain: Duminiu
       new:
         create: Creà un blucchime
-        title: Nova iscrizzione nant’a lista nera e-mail
-      title: Lista nera e-mail
     follow_recommendations:
       language: Per a lingua
       status: Statutu
@@ -537,9 +521,7 @@ co:
       guide_link_text: Tuttu u mondu pò participà.
     sensitive_content: Cuntinutu sensibile
   application_mailer:
-    notification_preferences: Cambià e priferenze e-mail
     salutation: "%{name},"
-    settings: 'Cambià e priferenze e-mail: %{link}'
     view: 'Vede:'
     view_profile: Vede u prufile
     view_status: Vede u statutu
@@ -577,8 +559,6 @@ co:
     set_new_password: Creà una nova chjave d’accessu
     status:
       account_status: Statutu di u contu
-      confirming: In attesa di a cumplezzione di a cunfirmazione di l'e-mail.
-      pending: A vostra dumanda hè in attesa di rivista da a squadra di muderazione. Quessa pò piglià un certu tempu. Avete da riceve un'e-mail s'ella hè appruvata.
       redirecting_to: U vostru contu hè inattivu perchè riindirizza versu %{acct}.
     too_fast: Furmulariu mandatu troppu prestu, ripruvate.
     use_security_key: Utilizà a chjave di sicurità
@@ -619,9 +599,6 @@ co:
       before: 'Nanz''à cuntinuà, leghjete ste note attentamente:'
       caches: U cuntinutu indè u cache di l'altri servori sarà forse cunservatu
       data_removal: I vostri posti è dati saranu sguassati di manera permanente
-      email_change_html: Pudete <a href="%{path}">cambià u vostr'indirizzu e-mail</a> senza toglie u vostru contu
-      email_contact_html: S'ellu ùn hè sempre micca rimettu, pudete dumandà aiutu à <a href="mailto:%{email}">%{email}</a>
-      email_reconfirmation_html: S'e voi ùn ricevete micca l'e-mail di cunfirmazione, pudete <a href="%{path}">richiestà un'altru</a>
       irreversible: Ùn puderete micca ricuperà o riattivà u vostru contu
       more_details_html: Per più di ditagli, videte a <a href="%{terms_path}">pulitica di vita privata</a>.
       username_available: U vostru cugnome riduvinterà dispunibule
@@ -734,7 +711,6 @@ co:
     authentication_methods:
       otp: app d'identificazione à dui fattori
       password: chjave d’accessu
-      sign_in_token: codice di sicurità d'un e-mail
       webauthn: chjave di sicurità
   media_attachments:
     validations:
@@ -806,7 +782,6 @@ co:
     status:
       subject: "%{name} hà appena pubblicatu"
   notifications:
-    email_events: Avvenimenti da nutificà cù l'e-mail
     email_events_hint: 'Selezziunate l''avvenimenti per quelli vulete riceve nutificazione:'
   number:
     human:
@@ -1050,7 +1025,6 @@ co:
     follow_limit_reached: Ùn pidete seguità più di %{limit} conti
     invalid_otp_token: U codice d’identificazione ùn hè currettu
     otp_lost_help_html: S’è voi avete persu i dui, pudete cuntattà %{email}
-    seamless_external_login: Site cunnettatu·a dapoi un serviziu esternu, allora i parametri di chjave d’accessu è d’indirizzu e-mail ùn so micca dispunibili.
     signed_in_as: 'Cunnettatu·a cum’è:'
   verification:
     verification: Verificazione
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 9046769a213f89..98e2c30526258d 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -35,7 +35,6 @@ cs:
       created_msg: Moderátorská poznámka byla úspěšně vytvořena!
       destroyed_msg: Moderátorská poznámka byla úspěšně zničena!
     accounts:
-      add_email_domain_block: Blokovat e-mailovou doménu
       approve: Schválit
       approved_msg: Žádost o registraci uživatele %{username} úspěšně schválena
       are_you_sure: Opravdu?
@@ -62,7 +61,6 @@ cs:
       demote: Degradovat
       destroyed_msg: Data účtu %{username} jsou nyní ve frontě k okamžitému smazání
       disable: Zmrazit
-      disable_sign_in_token_auth: Zrušit ověřování e-mailovým tokenem
       disable_two_factor_authentication: Vypnout 2FA
       disabled: Zmrazen
       display_name: Zobrazované jméno
@@ -71,7 +69,6 @@ cs:
       email: E-mail
       email_status: Stav e-mailu
       enable: Rozmrazit
-      enable_sign_in_token_auth: Povolit ověřování e-mailovým tokenem
       enabled: Povoleno
       enabled_msg: Účet %{username} byl úspěšně rozmrazen
       followers: Sledující
@@ -138,7 +135,6 @@ cs:
       resubscribe: Znovu odebírat
       role: Role
       search: Hledat
-      search_same_email_domain: Ostatní uživatelé se stejnou e-mailovou doménou
       search_same_ip: Další uživatelé se stejnou IP adresou
       security: Zabezpečení
       security_measures:
@@ -179,26 +175,21 @@ cs:
         approve_appeal: Schválit odvolání
         approve_user: Schválit uživatele
         assigned_to_self_report: Přiřadit hlášení
-        change_email_user: Změnit uživateli e-mailovou adresu
         change_role_user: Změnit roli uživatele
         confirm_user: Potvrdit uživatele
         create_account_warning: Vytvořit varování
         create_announcement: Nové oznámení
-        create_canonical_email_block: Zablokovat email
         create_custom_emoji: Vytvořit vlastní emoji
         create_domain_allow: Vytvořit povolení domény
         create_domain_block: Vytvořit blokaci domény
-        create_email_domain_block: Zablokovat e-mailovou doménu
         create_ip_block: Vytvořit IP pravidlo
         create_unavailable_domain: Vytvořit nedostupnou doménu
         create_user_role: Vytvořit roli
         demote_user: Snížit roli uživatele
         destroy_announcement: Odstranit oznámení
-        destroy_canonical_email_block: Odblokovat email
         destroy_custom_emoji: Odstranit vlastní emoji
         destroy_domain_allow: Odstranit povolení domény
         destroy_domain_block: Odstranit blokaci domény
-        destroy_email_domain_block: Smazat blokaci e-mailové domény
         destroy_instance: Odmazat doménu
         destroy_ip_block: Smazat IP pravidlo
         destroy_status: Odstranit Příspěvek
@@ -206,10 +197,8 @@ cs:
         destroy_user_role: Zničit roli
         disable_2fa_user: Vypnout 2FA
         disable_custom_emoji: Zakázat vlastní emoji
-        disable_sign_in_token_auth_user: Zrušit uživatelovo ověřování e-mailovým tokenem
         disable_user: Deaktivovat uživatele
         enable_custom_emoji: Povolit vlastní emoji
-        enable_sign_in_token_auth_user: Povolit uživatelovo ověřování e-mailovým tokenem
         enable_user: Povolit uživatele
         memorialize_account: Změna na „in memoriam“
         promote_user: Povýšit uživatele
@@ -239,26 +228,20 @@ cs:
         approve_appeal_html: Uživatel %{name} schválil odvolání proti rozhodnutí moderátora %{target}
         approve_user_html: "%{name} schválil registraci od %{target}"
         assigned_to_self_report_html: Uživatel %{name} si přidělil hlášení %{target}
-        change_email_user_html: Uživatel %{name} změnil e-mailovou adresu uživatele %{target}
         change_role_user_html: "%{name} změnil roli %{target}"
-        confirm_user_html: Uživatel %{name} potvrdil e-mailovou adresu uživatele %{target}
         create_account_warning_html: Uživatel %{name} poslal %{target} varování
         create_announcement_html: Uživatel %{name} vytvořil nové oznámení %{target}
-        create_canonical_email_block_html: "%{name} zablokoval e-mail s hash %{target}"
         create_custom_emoji_html: Uživatel %{name} nahrál nové emoji %{target}
         create_domain_allow_html: Uživatel %{name} povolil federaci s doménou %{target}
         create_domain_block_html: Uživatel %{name} zablokoval doménu %{target}
-        create_email_domain_block_html: Uživatel %{name} zablokoval e-mailovou doménu %{target}
         create_ip_block_html: Uživatel %{name} vytvořil pravidlo pro IP %{target}
         create_unavailable_domain_html: "%{name} zastavil doručování na doménu %{target}"
         create_user_role_html: "%{name} vytvořil %{target} roli"
         demote_user_html: Uživatel %{name} degradoval uživatele %{target}
         destroy_announcement_html: Uživatel %{name} odstranil oznámení %{target}
-        destroy_canonical_email_block_html: "%{name} odblokoval e-mail s hashem %{target}"
         destroy_custom_emoji_html: "%{name} odstranil emoji %{target}"
         destroy_domain_allow_html: Uživatel %{name} zakázal federaci s doménou %{target}
         destroy_domain_block_html: Uživatel %{name} odblokoval doménu %{target}
-        destroy_email_domain_block_html: Uživatel %{name} odblokoval e-mailovou doménu %{target}
         destroy_instance_html: Uživatel %{name} odmazal doménu %{target}
         destroy_ip_block_html: Uživatel %{name} odstranil pravidlo pro IP %{target}
         destroy_status_html: Uživatel %{name} odstranil příspěvek uživatele %{target}
@@ -266,10 +249,8 @@ cs:
         destroy_user_role_html: "%{name} odstranil %{target} roli"
         disable_2fa_user_html: Uživatel %{name} vypnul dvoufázové ověřování pro uživatele %{target}
         disable_custom_emoji_html: Uživatel %{name} zakázal emoji %{target}
-        disable_sign_in_token_auth_user_html: Uživatel %{name} zrušil ověřování e-mailovým tokenem pro %{target}
         disable_user_html: Uživatel %{name} zakázal přihlašování pro uživatele %{target}
         enable_custom_emoji_html: Uživatel %{name} povolil emoji %{target}
-        enable_sign_in_token_auth_user_html: Uživatel %{name} povolil ověřování e-mailovým tokenem pro %{target}
         enable_user_html: Uživatel %{name} povolil přihlašování pro uživatele %{target}
         memorialize_account_html: Uživatel %{name} změnil účet %{target} na „in memoriam“ stránku
         promote_user_html: Uživatel %{name} povýšil uživatele %{target}
@@ -277,7 +258,6 @@ cs:
         reject_user_html: "%{name} odmítl registraci od %{target}"
         remove_avatar_user_html: Uživatel %{name} odstranil avatar uživatele %{target}
         reopen_report_html: Uživatel %{name} znovu otevřel hlášení %{target}
-        resend_user_html: "%{name} znovu odeslal potvrzovací e-mail pro %{target}"
         reset_password_user_html: Uživatel %{name} obnovil heslo uživatele %{target}
         resolve_report_html: Uživatel %{name} vyřešil hlášení %{target}
         sensitive_account_html: "%{name} označil média účtu %{target} jako citlivá"
@@ -448,7 +428,6 @@ cs:
         many: "%{count} pokusů o registraci za poslední týden"
         one: "%{count} pokus o registraci za poslední týden"
         other: "%{count} pokusů o registraci za poslední týden"
-      created_msg: E-mailová doména úspěšně zablokována
       delete: Smazat
       dns:
         types:
@@ -457,12 +436,8 @@ cs:
       new:
         create: Přidat doménu
         resolve: Přeložit doménu
-        title: Blokovat novou e-mailovou doménu
-      no_email_domain_block_selected: Žádné blokace e-mailové domény nebyly změněny, protože nebyly žádné vybrány
       not_permitted: Nepovoleno
-      resolved_dns_records_hint_html: Doménové jméno vede na následující MX domény, které mají nakonec na starost přijímání e-mailů. Blokování MX domény zablokuje registrace z jakékoliv e-mailové adresy, která používá stejnou MX doménu, i když je viditelné doménové jméno jiné. <strong>Dejte si pozor, abyste nezablokovali velké e-mailové poskytovatele.</strong>
       resolved_through_html: Přeložena přes %{domain}
-      title: Blokované e-mailové domény
     export_domain_allows:
       new:
         title: Importovat povolené domény
@@ -624,7 +599,6 @@ cs:
         resolve_description_html: Nebudou učiněny žádné kroky proti nahlášenému účtu, žádný prohřešek zaznamenán a hlášení bude uzavřeno.
         silence_description_html: Účet bude viditelný pouze těm, kdo jej již sledují nebo si jej ručně vyhledají, což výrazně omezí jeho dosah. Vždy lze vrátit zpět. Uzavře všechna hlášení proti tomuto účtu.
         suspend_description_html: Účet a veškerý jeho obsah se znepřístupní a bude nakonec smazán, interakce s ním nebude možná. Lze vrátit zpět do 30 dnů. Uzavře všechna hlášení proti tomuto účtu.
-      actions_description_html: Rozhodněte, který krok učinit pro vyřešení tohoto hlášení. Pokud podniknete kárný krok proti nahlášenému účtu, bude mu zasláno e-mailové oznámení, s výjimkou případu, kdy je zvolena kategorie <strong>Spam</strong>.
       actions_description_remote_html: Rozhodněte, co podniknout pro vyřešení tohoto hlášení. Toto ovlivní pouze to, jak <strong>váš</strong> server komunikuje s tímto vzdáleným účtem, a zpracuje jeho obsah.
       add_to_report: Přidat do hlášení další
       already_suspended_badges:
@@ -689,7 +663,6 @@ cs:
         delete_data_html: Odstranit profil a obsah <strong>@%{acct}</strong> ode dneška po 30 dní, pokud mezitím nebude zrušeno jeho pozastavení
         preview_preamble_html: "<strong>@%{acct}</strong> obdrží varování s následujícím obsahem:"
         record_strike_html: Zaznamenat prohřešek <strong>@%{acct}</strong> pro pomoc s řešením budoucích přestupků z tohoto účtu
-        send_email_html: Poslat varovný e-mail pro <strong>@%{acct}</strong>
         warning_placeholder: Volitelné další odůvodnění moderační akce.
       target_origin: Původ nahlášeného účtu
       title: Hlášení
@@ -733,7 +706,6 @@ cs:
         manage_appeals: Spravovat odvolání
         manage_appeals_description: Umožňuje uživatelům posuzovat odvolání proti moderátorským zásahům
         manage_blocks: Spravovat blokace
-        manage_blocks_description: Umožňuje uživatelům blokovat poskytovatele e-mailů a IP adresy
         manage_custom_emojis: Spravovat vlastní emoji
         manage_custom_emojis_description: Umožňuje uživatelům spravovat vlastní emoji na serveru
         manage_federation: Spravovat federaci
@@ -751,7 +723,6 @@ cs:
         manage_taxonomies: Správa taxonomií
         manage_taxonomies_description: Umožňuje uživatelům zkontrolovat populární obsah a aktualizovat nastavení hashtag
         manage_user_access: Spravovat uživatelské přístupy
-        manage_user_access_description: Umožňuje uživatelům rušit jiným uživatelům dvoufázové ověřování, měnit jejich e-mailovou adresu a obnovovat jim hesla
         manage_users: Spravovat uživatele
         manage_users_description: Umožňuje uživatelům zobrazit podrobnosti ostatních uživatelů a provádět moderování proti nim
         manage_webhooks: Spravovat webhooky
@@ -826,7 +797,6 @@ cs:
       destroyed_msg: Upload stránky byl úspěšně smazán!
     software_updates:
       critical_update: Kritické — aktualizujte, prosím, co nejdříve
-      description: Doporučujeme udržovat vaši instalaci Mastodonu aktuální, aby se využily nejnovější opravy a funkce. Kromě toho je někdy velmi důležité včas aktualizovat Mastodon, aby se předešlo bezpečnostním problémům. Z těchto důvodů Mastodon kontroluje aktualizace každých 30 minut a bude vás informovat podle nastavení e-mailových oznámení.
       documentation_link: Zjistit více
       release_notes: Poznámky k vydání
       title: Dostupné aktualizace
@@ -1000,7 +970,6 @@ cs:
           many: Použit %{count} lidmi za poslední týden
           one: Použit jedním člověkem za poslední týden
           other: Použit %{count} lidmi za poslední týden
-      title: Trendy
       trending: Populární
     warning_presets:
       add_new: Přidat nové
@@ -1087,9 +1056,7 @@ cs:
       guide_link_text: Zapojit se může každý.
     sensitive_content: Citlivý obsah
   application_mailer:
-    notification_preferences: Změnit předvolby e-mailů
     salutation: "%{name},"
-    settings: 'Změnit předvolby e-mailů: %{link}'
     unsubscribe: Přestat odebírat
     view: 'Zobrazit:'
     view_profile: Zobrazit profil
@@ -1109,7 +1076,6 @@ cs:
       hint_html: Ještě jedna věc! Musíme potvrdit, že jste člověk (to proto, abychom drželi stranou spam!). Vyřešte CAPTCHA níže a klikněte na "Pokračovat".
       title: Bezpečnostní kontrola
     confirmations:
-      awaiting_review: Vaše e-mailová adresa je potvrzena! Personál %{domain} nyní kontrolují vaši registraci. Pokud váš účet schválí, obdržíte e-mail!
       awaiting_review_title: Vaše registrace se ověřuje
       clicking_this_link: kliknutím na tento odkaz
       login_link: přihlásit se
@@ -1117,7 +1083,6 @@ cs:
       redirect_to_app_html: Měli byste být přesměrováni do aplikace <strong>%{app_name}</strong>. Pokud se tak nestalo, zkuste %{clicking_this_link} nebo ručně se vrátit do aplikace.
       registration_complete: Vaše registrace na %{domain} je hotová!
       welcome_title: Vítám uživatele %{name}!
-      wrong_email_hint: Pokud není e-mail správný, můžete si ho změnit v nastavení účtu.
     delete_account: Odstranit účet
     delete_account_html: Chcete-li odstranit svůj účet, <a href="%{path}">pokračujte zde</a>. Budete požádáni o potvrzení.
     description:
@@ -1138,7 +1103,6 @@ cs:
     or_log_in_with: Nebo se přihlaste pomocí
     privacy_policy_agreement_html: Četl jsem a souhlasím se zásadami <a href="%{privacy_policy_path}" target="_blank">ochrany osobních údajů</a>
     progress:
-      confirm: Confirm e-mail
       details: Vaše údaje
       review: Naše hodnocení
       rules: Přijmout pravidla
@@ -1160,10 +1124,8 @@ cs:
     security: Zabezpečení
     set_new_password: Nastavit nové heslo
     setup:
-      email_below_hint_html: Zkontrolujte složku se spamem, nebo požádejte o jinou. Pokud je to špatné, můžete opravit svou e-mailovou adresu.
       email_settings_hint_html: Klikněte na odkaz, který jsme Vám poslali k ověření %{email}. Budeme zde čekat.
       link_not_received: Nedostali jste odkaz?
-      new_confirmation_instructions_sent: Za několik minut obdržíte nový e-mail s potvrzovacím odkazem!
       title: Zkontrolujte doručenou poštu
     sign_in:
       preamble_html: Přihlaste se se svýma <strong>%{domain}</strong> údajema. Pokud je váš účet hostován na jiném serveru, nemůžete se zde přihlásit.
@@ -1174,9 +1136,7 @@ cs:
       title: Pojďme vás nastavit na %{domain}.
     status:
       account_status: Stav účtu
-      confirming: Čeká na dokončení potvrzení e-mailu.
       functional: Váš účet je plně funkční.
-      pending: Vaše žádost čeká na posouzení naším personálem. To může nějakou dobu trvat. Pokud bude váš požadavek schválen, obdržíte e-mail.
       redirecting_to: Váš účet je neaktivní, protože je právě přesměrován na účet %{acct}.
       self_destruct: Protože %{domain} končí, budete mít k účtu jen omezený přístup.
       view_strikes: Zobrazit minulé prohřešky vašeho účtu
@@ -1219,9 +1179,6 @@ cs:
       before: 'Před pokračováním si prosím pečlivě přečtěte tyto poznámky:'
       caches: Obsah, který byl uložen do cache jiných serverů, nemusí být smazán
       data_removal: Vaše příspěvky a další data budou trvale smazána
-      email_change_html: Svou e-mailovou adresu můžete <a href="%{path}">změnit</a> i bez mazání účtu
-      email_contact_html: Pokud stále nepřijde, můžete požádat o pomoc zasláním e-mailu na <a href="mailto:%{email}">%{email}</a>
-      email_reconfirmation_html: Pokud neobdržíte potvrzovací e-mail, můžete si ho <a href="%{path}">vyžádat znovu</a>
       irreversible: Váš účet nebude možné obnovit ani znovu aktivovat
       more_details_html: Podrobnosti najdete v <a href="%{terms_path}">zásadách ochrany osobních údajů</a>.
       username_available: Vaše uživatelské jméno bude opět dostupné
@@ -1470,7 +1427,6 @@ cs:
     authentication_methods:
       otp: aplikací pro dvoufaktorové ověření
       password: heslem
-      sign_in_token: e-mailovým bezpečnostním kódem
       webauthn: bezpečnostními klíči
     description_html: Pokud vidíte aktivitu, kterou nepoznáváte, zvažte změnu hesla a zapnutí dvoufaktorového ověřování.
     empty: Není k dispozici žádná historie přihlášení
@@ -1481,16 +1437,6 @@ cs:
     unsubscribe:
       action: Ano, odeberte odběr
       complete: Odběr byl odhlášen
-      confirmation_html: Opravdu nechcete dostávat %{type} pro Mastodon na %{domain} na váš e-mail %{email}? Vždy se můžete opět přihlásit do <a href="%{settings_path}">nastavení e-mailových oznámení</a>.
-      emails:
-        notification_emails:
-          favourite: e-mailové oznámení při oblíbení
-          follow: e-mailové oznámení při sledování
-          follow_request: e-mail při žádost o sledování
-          mention: e-mailové oznámení při zmínění
-          reblog: e-mailové oznámení při boostu
-      resubscribe_html: Při omylu se můžete znovu přihlásit do vaších <a href="%{settings_path}">nastavení e-mailových oznámení</a>.
-      success_html: Již nebudete dostávat %{type} pro Mastodon na %{domain} na vaší e-mailové adrese %{email}.
       title: Odhlásit odběr
   media_attachments:
     validations:
@@ -1571,8 +1517,6 @@ cs:
     update:
       subject: Uživatel %{name} upravil příspěvek
   notifications:
-    administration_emails: E-mailová oznámení administrátora
-    email_events: Události pro e-mailová oznámení
     email_events_hint: 'Vyberte události, pro které chcete dostávat oznámení:'
   number:
     human:
@@ -1731,7 +1675,6 @@ cs:
     import: Import
     import_and_export: Import a export
     migrate: Přesun účtu
-    notifications: E-mailová upozornění
     preferences: Předvolby
     profile: Profil
     relationships: Sledovaní a sledující
@@ -1992,7 +1935,6 @@ cs:
     invalid_otp_token: Neplatný kód pro dvoufázové ověřování
     otp_lost_help_html: Pokud jste ztratili přístup k oběma, spojte se s %{email}
     rate_limited: Příliš mnoho pokusů o ověření, zkuste to znovu později.
-    seamless_external_login: Jste přihlášeni přes externí službu, nastavení hesla a e-mailu proto nejsou dostupná.
     signed_in_as: 'Přihlášeni jako:'
   verification:
     extra_instructions_html: <strong>Tip:</strong> Odkaz na vaší webové stránce může být neviditelný. Důležitou součástí je <code>rel="me"</code>, která brání proti napodování vás na webových stránkách s obsahem vytvořeným uživatelem. Můžete dokonce použít <code>odkaz</code> v záhlaví stránky místo <code>a</code>, ale HTML musí být přístupné bez spuštění JavaScript.
diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index 5b26322be3347e..2fa312969da537 100644
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@@ -39,7 +39,6 @@ cy:
       created_msg: Crëwyd nodyn cymedroli'n llwyddiannus!
       destroyed_msg: Dinistriwyd nodyn cymedroli yn llwyddiannus!
     accounts:
-      add_email_domain_block: Rhwystro parth e-bost
       approve: Cymeradwyo
       approved_msg: Wedi llwyddo i gymeradwyo cais cofrestru %{username}
       are_you_sure: Ydych chi'n siŵr?
@@ -66,7 +65,6 @@ cy:
       demote: Diraddio
       destroyed_msg: Mae data %{username} bellach mewn ciw i gael ei ddileu yn fuan
       disable: Rhewi
-      disable_sign_in_token_auth: Analluogi dilysu tocynnau e-bost
       disable_two_factor_authentication: Diffodd 2FA
       disabled: Wedi rhewi
       display_name: Enw sgrin
@@ -75,7 +73,6 @@ cy:
       email: E-bost
       email_status: Statws e-bost
       enable: Dadrewi
-      enable_sign_in_token_auth: Galluogi dilysu tocynnau e-bost
       enabled: Wedi ei alluogi
       enabled_msg: Wedi dadrewi cyfrif %{username} yn llwyddiannus
       followers: Dilynwyr
@@ -144,7 +141,6 @@ cy:
       resubscribe: Ail danysgrifio
       role: Rôl
       search: Chwilio
-      search_same_email_domain: Defnyddwyr eraill gyda'r un parth e-bost
       search_same_ip: Defnyddwyr eraill gyda'r un IP
       security: Diogelwch
       security_measures:
@@ -185,26 +181,21 @@ cy:
         approve_appeal: Cymeradwyo'r Apêl
         approve_user: Cymeradwyo Defnyddiwr
         assigned_to_self_report: Neilltuo Adroddiad
-        change_email_user: Newid E-bost ar gyfer Defnyddiwr
         change_role_user: Newid Rôl y Defnyddiwr
         confirm_user: Cadarnhau Defnyddiwr
         create_account_warning: Creu Rhybydd
         create_announcement: Creu Cyhoeddiad
-        create_canonical_email_block: Creu Bloc E-bost
         create_custom_emoji: Creu Emoji Addasedig
         create_domain_allow: Creu Caniatáu Parth
         create_domain_block: Creu Gwaharddiad Parth
-        create_email_domain_block: Creu Gwaharddiad Parth E-bost
         create_ip_block: Creu rheol IP
         create_unavailable_domain: Creu Parth Ddim ar Gael
         create_user_role: Creu Rôl
         demote_user: Diraddio Defnyddiwr
         destroy_announcement: Dileu Cyhoeddiad
-        destroy_canonical_email_block: Dileu Bloc E-bost
         destroy_custom_emoji: Dileu Emoji Addasedig
         destroy_domain_allow: Dileu Caniatáu Parth
         destroy_domain_block: Dileu Gwaharddiad Parth
-        destroy_email_domain_block: Dileu gwaharddiad parth e-bost
         destroy_instance: Clirio Parth
         destroy_ip_block: Dileu rheol IP
         destroy_status: Dileu Postiad
@@ -212,10 +203,8 @@ cy:
         destroy_user_role: Dileu Rôl
         disable_2fa_user: Diffodd 2FA
         disable_custom_emoji: Analluogi Emoji Addasedig
-        disable_sign_in_token_auth_user: Analluogi Dilysu Tocyn E-bost ar gyfer Defnyddiwr
         disable_user: Analluogi Defnyddiwr
         enable_custom_emoji: Galluogi Emoji Addasedig
-        enable_sign_in_token_auth_user: Galluogi Dilysu Tocyn E-bost ar gyfer Defnyddiwr
         enable_user: Galluogi Defnyddiwr
         memorialize_account: Cofadeilio Cyfrif
         promote_user: Dyrchafu Defnyddiwr
@@ -245,26 +234,20 @@ cy:
         approve_appeal_html: Mae %{name} wedi cymeradwyo penderfyniad cymedroli gan %{target}
         approve_user_html: Mae %{name} wedi cymeradwyo cofrestru gan %{target}
         assigned_to_self_report_html: Mae %{name} wedi neilltuo adroddiad %{target} iddyn nhw eu hunain
-        change_email_user_html: Mae %{name} wedi newid cyfeiriad e-bost defnyddiwr %{target}
         change_role_user_html: Mae %{name} wedi newid rôl %{target}
-        confirm_user_html: Mae %{name}  wedi cadarnhau cyfeiriad e-bost defnyddiwr %{target}
         create_account_warning_html: Mae %{name} wedi anfon rhybudd at %{target}
         create_announcement_html: Mae %{name} wedi creu cyhoeddiad newydd %{target}
-        create_canonical_email_block_html: Mae %{name} wedi rhwystro e-bost gyda'r hash %{target}
         create_custom_emoji_html: Mae %{name} wedi llwytho emoji newydd %{target}
         create_domain_allow_html: Mae %{name} wedi caniatáu ffedereiddio â pharth %{target}
         create_domain_block_html: Mae %{name} wedi rhwystro parth %{target}
-        create_email_domain_block_html: Mae %{name}  wedi rhwystro parth e-bost %{target}
         create_ip_block_html: Mae %{name} wedi creu rheol ar gyfer IP %{target}
         create_unavailable_domain_html: Mae %{name} wedi stopio danfon i barth %{target}
         create_user_role_html: Mae %{name} wedi creu rôl %{target}
         demote_user_html: Mae %{name} wedi israddio defnyddiwr %{target}
         destroy_announcement_html: Mae %{name} wedi dileu cyhoeddiad %{target}
-        destroy_canonical_email_block_html: Mae %{name} wedi dadrwystro e-bost gyda'r hash %{target}
         destroy_custom_emoji_html: Mae %{name} wedi dileu emoji %{target}
         destroy_domain_allow_html: Mae %{name} wedi gwrthod ffederasiwn gyda pharth %{target}
         destroy_domain_block_html: Mae %{name} wedi dad rwystro parth %{target}
-        destroy_email_domain_block_html: Mae %{name} wedi dad rwystro parth e-bost %{target}
         destroy_instance_html: Mae %{name} wedi dileu parth %{target}
         destroy_ip_block_html: Mae %{name} dileu rheol ar gyfer IP %{target}
         destroy_status_html: Mae %{name} wedi tynnu postiad gan %{target}
@@ -272,10 +255,8 @@ cy:
         destroy_user_role_html: Mae %{name} wedi dileu rôl %{target}
         disable_2fa_user_html: Mae %{name} wedi analluogi gofyniad dau ffactor ar gyfer defnyddiwr %{target}
         disable_custom_emoji_html: Mae %{name} wedi analluogi emoji %{target}
-        disable_sign_in_token_auth_user_html: Mae %{name} wedi analluogi dilysiad tocyn e-bost ar gyfer %{target}
         disable_user_html: Mae %{name} wedi analluogi mewngofnodi defnyddiwr %{target}
         enable_custom_emoji_html: Mae %{name} wedi analluogi emoji %{target}
-        enable_sign_in_token_auth_user_html: Mae %{name} wedi galluogi dilysu tocyn e-bost %{target}
         enable_user_html: Mae %{name} wedi galluogi mewngofnodi defnyddiwr %{target}
         memorialize_account_html: Newidiodd %{name} gyfrif %{target} i dudalen memoriam
         promote_user_html: Mae %{name} wedi hyrwyddo defnyddiwr %{target}
@@ -283,7 +264,6 @@ cy:
         reject_user_html: Mae %{name} wedi gwrthod cofrestriad gan %{target}
         remove_avatar_user_html: Mae %{name} wedi tynnu afatar %{target}
         reopen_report_html: Mae %{name} wedi ailagor adroddiad %{target}
-        resend_user_html: Mae %{name} wedi ail anfon e-bost cadarnhau %{target}
         reset_password_user_html: Mae %{name} wedi ailosod cyfrinair defnyddiwr %{target}
         resolve_report_html: Mae %{name} wedi datrys adroddiad %{target}
         sensitive_account_html: Mae %{name} wedi marcio cyfrwng %{target} fel un sensitif
@@ -464,7 +444,6 @@ cy:
         other: "%{count} ymgais i gofrestru dros yr wythnos ddiwethaf"
         two: "%{count} ymgais i gofrestru dros yr wythnos ddiwethaf"
         zero: "%{count} o ymgeisiadau i gofrestru dros yr wythnos ddiwethaf"
-      created_msg: Wedi blocio parth e-bost yn llwyddiannus
       delete: Dileu
       dns:
         types:
@@ -473,12 +452,8 @@ cy:
       new:
         create: Ychwanegu parth
         resolve: Datrys parth
-        title: Rhwystro parth e-bost newydd
-      no_email_domain_block_selected: Heb newid unrhyw flociau parth e-bost gan nad oes un wedi'i ddewis
       not_permitted: Dim caniatâd
-      resolved_dns_records_hint_html: Mae'r enw parth yn cyd-fynd â'r parthau MX canlynol, sy'n gyfrifol yn y pen draw am dderbyn e-bost. Bydd rhwystro parth MX yn rhwystro cofrestriadau o unrhyw gyfeiriad e-bost sy'n defnyddio'r un parth MX, hyd yn oed os yw'r enw parth gweladwy yn wahanol. <strong>Byddwch yn ofalus i beidio â rhwystro darparwyr e-bost mawr.</strong>
       resolved_through_html: Wedi'i ddatrys trwy %{domain}
-      title: Parthau e-bost wedi'u rhwystro
     export_domain_allows:
       new:
         title: Mewnforio parth yn caniatáu
@@ -648,7 +623,6 @@ cy:
         resolve_description_html: Ni fydd unrhyw gamau yn cael eu cymryd yn erbyn y cyfrif a adroddwyd, ni chofnodwyd rhybudd, a bydd yr adroddiad yn cael ei gau.
         silence_description_html: Bydd y cyfrif yn weladwy i'r rhai sydd eisoes yn ei ddilyn neu'n edrych arno â llaw, gan gyfyngu'n ddifrifol ar ei gyrhaeddiad. Mae modd ei ddychwelyd bob amser. Yn cau pob adroddiad yn erbyn y cyfrif hwn.
         suspend_description_html: Bydd y cyfrif a'i holl gynnwys yn anhygyrch ac yn cael ei ddileu yn y pen draw, a bydd rhyngweithio ag ef yn amhosibl. Yn gildroadwy o fewn 30 diwrnod. Yn cau pob adroddiad yn erbyn y cyfrif hwn.
-      actions_description_html: Penderfynwch pa gamau i'w cymryd i ddatrys yr adroddiad hwn. Os byddwch yn cymryd camau cosbol yn erbyn y cyfrif a adroddwyd, bydd hysbysiad e-bost yn cael ei anfon atyn nhw, ac eithrio pan fydd y categori <strong>Sbam</strong> yn cael ei ddewis.
       actions_description_remote_html: Penderfynwch pa gamau i'w cymryd i ddatrys yr adroddiad hwn. Bydd hyn ond yn effeithio ar sut <strong>mae'ch</strong> gweinydd yn cyfathrebu â'r cyfrif hwn o bell ac yn trin ei gynnwys.
       add_to_report: Ychwanegu rhagor i adroddiad
       already_suspended_badges:
@@ -713,7 +687,6 @@ cy:
         delete_data_html: Dileu proffil a chynnwys <strong>@%{acct}</strong> 30 diwrnod o nawr oni bai ei b/fod heb ei h/atal yn y cyfamser
         preview_preamble_html: 'Bydd <strong>@%{acct}</strong> yn derbyn rhybudd gyda''r cynnwys canlynol:'
         record_strike_html: Recordio rhybudd yn erbyn <strong>@%{acct}</strong> i'ch helpu i ddwysáu ar achosion o dorri rheolau yn y dyfodol o'r cyfrif hwn
-        send_email_html: Anfon e-bost rhybudd at <strong>@%{acct}</strong>
         warning_placeholder: Rhesymeg ychwanegol dewisol ar gyfer y cam cymedroli.
       target_origin: Tarddiad y cyfrif a adroddwyd
       title: Adroddiadau
@@ -761,7 +734,6 @@ cy:
         manage_appeals: Rheoli Apeliadau
         manage_appeals_description: Yn caniatáu i ddefnyddwyr adolygu apeliadau yn erbyn camau cymedroli
         manage_blocks: Rheoli Blociau
-        manage_blocks_description: Yn caniatáu i ddefnyddwyr rwystro darparwyr e-bost a chyfeiriadau IP
         manage_custom_emojis: Rheoli Emojis Cyfaddas
         manage_custom_emojis_description: Yn caniatáu i ddefnyddwyr reoli emojis cyfaddas ar y gweinydd
         manage_federation: Rheoli Ffederasiwn
@@ -779,7 +751,6 @@ cy:
         manage_taxonomies: Rheoli Tacsonomeg
         manage_taxonomies_description: Yn caniatáu i ddefnyddwyr adolygu cynnwys sy'n trendio a diweddaru gosodiadau hashnodau
         manage_user_access: Rheoli Mynediad Defnyddwyr
-        manage_user_access_description: Yn caniatáu i ddefnyddwyr analluogi dilysu dau ffactor defnyddwyr eraill, newid eu cyfeiriad e-bost, ac ailosod eu cyfrinair
         manage_users: Rheoli Defnyddwyr
         manage_users_description: Yn caniatáu i ddefnyddwyr weld manylion defnyddwyr eraill a chyflawni camau cymedroli yn eu herbyn
         manage_webhooks: Rheoli Bachau Gwe
@@ -854,7 +825,6 @@ cy:
       destroyed_msg: Llwytho i fyny i'r wefan wedi'i dileu yn llwyddiannus!
     software_updates:
       critical_update: Hanfodol - diweddarwch yn fuan
-      description: Rydym yn argymell eich bod yn cadw'ch gosodiad Mastodon yn gyfredol i elwa o'r atgyweiriadau a'r nodweddion diweddaraf. Hefyd, weithiau mae'n hanfodol diweddaru Mastodon yn amserol er mwyn osgoi materion diogelwch. Am y rhesymau hyn, mae Mastodon yn gwirio am ddiweddariadau bob 30 munud, a bydd yn eich hysbysu yn unol â'ch dewisiadau hysbysu e-bost.
       documentation_link: Dysgu rhagor
       release_notes: Nodiadau ryddhau
       title: Diweddariadau ar gael
@@ -1034,7 +1004,6 @@ cy:
           other: Wedi'i ddefnyddio gan %{count} o bobl dros yr wythnos ddiwethaf
           two: Wedi'i ddefnyddio gan %{count} o bobl dros yr wythnos ddiwethaf
           zero: Wedi'i ddefnyddio gan %{count} o bobl dros yr wythnos ddiwethaf
-      title: Trendiau
       trending: Trendio
     warning_presets:
       add_new: Ychwanegu newydd
@@ -1123,9 +1092,7 @@ cy:
       guide_link_text: Gall pawb gyfrannu.
     sensitive_content: Cynnwys sensitif
   application_mailer:
-    notification_preferences: Newid gosodiadau e-bost
     salutation: "%{name},"
-    settings: 'Newid gosodiadau e-bost: %{link}'
     unsubscribe: Dad-danysgrifio
     view: 'Gweld:'
     view_profile: Gweld proffil
@@ -1145,7 +1112,6 @@ cy:
       hint_html: Un peth arall! Mae angen i ni gadarnhau eich bod yn ddynol (mae hyn er mwyn i ni allu cadw'r sbam allan!). Datryswch y CAPTCHA isod a chliciwch "Parhau".
       title: Gwiriad diogelwch
     confirmations:
-      awaiting_review: Mae eich cyfeiriad e-bost wedi'i gadarnhau! Mae aelod o staff %{domain} wrthi'n adolygu'ch cofrestriad. Byddwch yn derbyn e-bost os ydyn nhw'n cymeradwyo eich cyfrif!
       awaiting_review_title: Mae eich cofrestriad yn cael ei adolygu
       clicking_this_link: clicio ar y ddolen hon
       login_link: mewngofnodi
@@ -1153,7 +1119,6 @@ cy:
       redirect_to_app_html: Dylech fod wedi cael eich ailgyfeirio i ap <strong>%{app_name}</strong>. Os na ddigwyddodd hynny, rhowch gynnig ar %{clicking_this_link} neu ewch eich hun i'r ap.
       registration_complete: Mae eich cofrestriad ar %{domain} bellach wedi'i gwblhau!
       welcome_title: Croeso, %{name}!
-      wrong_email_hint: Os nad yw'r cyfeiriad e-bost hwnnw'n gywir, gallwch ei newid yng ngosodiadau'r cyfrif.
     delete_account: Dileu cyfrif
     delete_account_html: Os hoffech chi ddileu eich cyfrif, mae modd <a href="%{path}">parhau yma</a>. Bydd gofyn i chi gadarnhau.
     description:
@@ -1174,7 +1139,6 @@ cy:
     or_log_in_with: Neu mewngofnodwch gyda
     privacy_policy_agreement_html: Rwyf wedi darllen ac yn cytuno i'r <a href="%{privacy_policy_path}" target="_blank">polisi preifatrwydd</a>
     progress:
-      confirm: Cadarnhau'r e-bost
       details: Eich manylion
       review: Ein hadolygiad
       rules: Derbyn rheolau
@@ -1196,10 +1160,8 @@ cy:
     security: Diogelwch
     set_new_password: Gosod cyfrinair newydd
     setup:
-      email_below_hint_html: Gwiriwch eich ffolder sbam, neu gofynnwch am un arall. Gallwch gywiro eich cyfeiriad e-bost os yw'n anghywir.
       email_settings_hint_html: Cliciwch ar y ddolen a anfonwyd atoch i wirio %{email}. Byddwn yn aros yma amdanoch.
       link_not_received: Heb gael dolen?
-      new_confirmation_instructions_sent: Byddwch yn derbyn e-bost newydd gyda'r ddolen cadarnhau ymhen ychydig funudau!
       title: Gwiriwch eich blwch derbyn
     sign_in:
       preamble_html: Mewngofnodwch gyda'ch manylion <strong>%{domain}</strong>. Os yw eich cyfrif yn cael ei gynnal ar weinydd gwahanol, ni fydd modd i chi fewngofnodi yma.
@@ -1210,9 +1172,7 @@ cy:
       title: Gadewch i ni eich gosod ar %{domain}.
     status:
       account_status: Statws cyfrif
-      confirming: Yn aros i gadarnhad yr e-bost gael ei gwblhau.
       functional: Mae eich cyfrif nawr yn weithredol.
-      pending: Mae'ch cais yn aros i gael ei adolygu gan ein staff. Gall hyn gymryd cryn amser. Byddwch yn derbyn e-bost os caiff eich cais ei gymeradwyo.
       redirecting_to: Mae eich cyfrif yn anweithredol oherwydd ei fod ar hyn o bryd yn ailgyfeirio i %{acct}.
       self_destruct: Gab fod parth %{domain} yn cau, dim ond mynediad cyfyngedig fyddwch yn ei gael i'ch cyfrif.
       view_strikes: Gweld rybuddion y gorffennol yn erbyn eich cyfrif
@@ -1255,9 +1215,6 @@ cy:
       before: 'Cyn bwrw ymlaen, darllenwch y nodiadau hyn yn ofalus:'
       caches: Efallai bydd cynnwys sydd wedi'i storio dros dro gan weinyddion eraill yn parhau
       data_removal: Bydd eich postiadau a data arall yn cael eu dileu'n barhaol
-      email_change_html: Gallwch <a href="%{path}">newid eich cyfeiriad e-bost</a> heb ddileu eich cyfrif
-      email_contact_html: Os nad yw'n cyrraedd o hyd, gallwch anfon e-bost at <a href="mailto:%{email}">%{email}</a> am help
-      email_reconfirmation_html: Os nad ydych yn derbyn yr e-bost cadarnhau, gallwch <a href="%{path}">ofyn amdano eto</a>
       irreversible: Fyddwch chi ddim yn gallu adfer nac ail-greu eich cyfrif
       more_details_html: Am fwy o fanylion, darllenwch y <a href="%{terms_path}">polisi preifatrwydd</a>.
       username_available: Bydd eich enw defnyddiwr ar gael eto
@@ -1522,7 +1479,6 @@ cy:
     authentication_methods:
       otp: ap dilysu dau ffactor
       password: cyfrinair
-      sign_in_token: cod diogelwch e-bost
       webauthn: allweddi diogelwch
     description_html: Os ydych yn gweld gweithgaredd nad ydych yn ei adnabod, ystyriwch newid eich cyfrinair a galluogi dilysu dau ffactor.
     empty: Dim hanes dilysu ar gael
@@ -1533,16 +1489,6 @@ cy:
     unsubscribe:
       action: Iawn, dad-danysgrifio
       complete: Dad-danysgrifiwyd
-      confirmation_html: Ydych chi'n siŵr eich bod am ddad-danysgrifo rhag derbyn %{type} Mastodon ar %{domain} i'ch e-bost %{email}? Gallwch bob amser ail-danysgrifio o'ch <a href="%{settings_path}">gosodiadau hysbysiadau e-byst</a>.
-      emails:
-        notification_emails:
-          favourite: hoff e-byst negeseuon hysbysu
-          follow: dilyn e-byst hysbysu
-          follow_request: dilyn e-byst ceisiadau
-          mention: e-byst negeseuon crybwyll
-          reblog: e-bost hysbysu hybu
-      resubscribe_html: Os ydych wedi dad-danysgrifio trwy gamgymeriad, gallwch ail-danysgrifio o'ch <a href="%{settings_path}">gosodiadau hysbysiadau e-bost</a> .
-      success_html: Os nad ydych bellach yn derbyn %{type} Mastodon %{domain} i'ch e-bost %{email}.
       title: Dad-danysgrifio
   media_attachments:
     validations:
@@ -1623,8 +1569,6 @@ cy:
     update:
       subject: Golygodd %{name} bostiad
   notifications:
-    administration_emails: Hysbysiadau e-bost gweinyddol
-    email_events: Digwyddiadau ar gyfer hysbysiadau e-bost
     email_events_hint: 'Dewiswch ddigwyddiadau yr ydych am dderbyn hysbysiadau ar eu cyfer:'
   number:
     human:
@@ -1783,7 +1727,6 @@ cy:
     import: Mewnforio
     import_and_export: Mewnforio ac allforio
     migrate: Mudo cyfrif
-    notifications: Hysbysiadau e-bost
     preferences: Dewisiadau
     profile: Proffil cyhoeddus
     relationships: Yn dilyn a dilynwyr
@@ -2058,7 +2001,6 @@ cy:
     invalid_otp_token: Côd dau-ffactor annilys
     otp_lost_help_html: Os colloch chi fynediad i'r ddau, mae modd i chi gysylltu a %{email}
     rate_limited: Gormod o geisiadau dilysu, ceisiwch eto yn nes ymlaen.
-    seamless_external_login: Yr ydych wedi'ch mewngofnodi drwy wasanaeth allanol, felly nid yw gosodiadau cyfrinair ac e-bost ar gael.
     signed_in_as: 'Wedi mewngofnodi fel:'
   verification:
     extra_instructions_html: <strong>Awgrym:</strong> Gall y ddolen ar eich gwefan fod yn anweledig. Y rhan bwysig yw <code>rel="me"</code> sy'n atal dynwarediad ar wefannau gyda chynnwys sy'n cael ei gynyrchu gan ddefnyddwyr. Gallwch hyd yn oed ddefnyddio tag <code>link</code> ym mhennyn y dudalen yn lle <code>a</code>, ond rhaid i'r HTML fod yn hygyrch heb weithredu JavaScript.
diff --git a/config/locales/da.yml b/config/locales/da.yml
index f2329ea9b3942e..5b5d6cb184db72 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -58,7 +58,7 @@ da:
       demote: Degradér
       destroyed_msg: "%{username}s data er nu sat i kø mhp. snarlig sletning"
       disable: Frys
-      disable_sign_in_token_auth: Deaktivér e-mailtokengodkendelse
+      disable_sign_in_token_auth: Deaktivér e-mailtoken godkendelse
       disable_two_factor_authentication: Deaktivér 2FA
       disabled: Frosset
       display_name: Visningsnavn
@@ -233,7 +233,7 @@ da:
         approve_appeal_html: "%{name} godkendte moderationsafgørelsesappellen fra %{target}"
         approve_user_html: "%{name} godkendte tilmeldingen fra %{target}"
         assigned_to_self_report_html: "%{name} tildelte sig selv anmeldelsen %{target}"
-        change_email_user_html: "%{name} ændrede e-mailadressen for bruger %{target}"
+        change_email_user_html: "%{name} skiftede e-mailadressen for bruger %{target}"
         change_role_user_html: "%{name} ændrede rollen for %{target}"
         confirm_user_html: "%{name} bekræftede e-mailadressen for bruger %{target}"
         create_account_warning_html: "%{name} sendte en advarsel til %{target}"
@@ -432,7 +432,7 @@ da:
       attempts_over_week:
         one: "%{count} tilmeldingsforsøg over den seneste uge"
         other: "%{count} tilmeldingsforsøg over den seneste uge"
-      created_msg: E-maildomæne blokeret
+      created_msg: E-maildomæne hermed blokeret
       delete: Slet
       dns:
         types:
@@ -442,9 +442,9 @@ da:
         create: Tilføj domæne
         resolve: Opløs domæne
         title: Blokér nyt e-maildomæne
-      no_email_domain_block_selected: Ingen e-mailblokeringer ændret (ingen var valgt)
+      no_email_domain_block_selected: Ingen e-maildomæneblokeringer ændret (ingen var valgt)
       not_permitted: Ikke tilladt
-      resolved_dns_records_hint_html: Domænenavnet opløses til flg. MX-domæner, som i sidste ende er ansvarlige for e-mailmodtagelse. Blokering af et MX-domæne blokerer også tilmeldinger fra enhver e-mailadresse på det pågældende MX-domæne, selv hvis det synlige domænenavn er et andet. <strong>Pas på ikke ikke at blokere større e-mailudbydere.</strong>
+      resolved_dns_records_hint_html: Domænenavnet opløses til flg. MX-domæner, som i sidste ende er ansvarlige for e-mailmodtagelse. Blokering af et MX-domæne blokerer også tilmeldinger fra enhver e-mailadresse på det pågældende MX-domæne, selv hvis det synlige domænenavn er et andet. <strong>Pas på ikke at blokere større e-mailudbydere.</strong>
       resolved_through_html: Opløst via %{domain}
       title: Blokerede e-maildomæner
     export_domain_allows:
@@ -600,7 +600,7 @@ da:
         resolve_description_html: Ingen foranstaltninger træffes mod den anmeldte konto, ingen advarsel (strike) registreres og anmeldelsen lukkes.
         silence_description_html: Kontoen vil kun være synlig for følgerene eller dem, som manuelt slå den op, hvilket markant begrænser dens udbredelse. Kan altid omgøres. Lukker alle indrapporteringer af kontoen.
         suspend_description_html: Kontoen inkl. alt indhold utilgængeliggøres og interaktion umuliggøres, og den slettes på et tidspunkt. Kan omgøres inden for 30 dage. Lukker alle indrapporteringer af kontoen.
-      actions_description_html: Afgør, hvilke foranstaltning, der skal træffes for at løse denne anmeldelse. Træffes en straffende foranstaltning mod den anmeldte konto, fremsendes en e-mailnotifikation, undtagen når kategorien <strong>Spam</strong> er valgt.
+      actions_description_html: Afgør, hvilke foranstaltning, der skal træffes for at løse denne anmeldelse. Ved en straffende foranstaltning mod den anmeldte konto, fremsendes en e-mailnotifikation, undtagen når kategorien <strong>Spam</strong> er valgt.
       actions_description_remote_html: Fastslå en nødvendig handling mhp. at løse denne anmeldelse. Dette vil kun påvirke <strong>din</strong> servers kommunikation med, og indholdshåndtering for, fjernkontoen.
       add_to_report: Føj mere til anmeldelse
       already_suspended_badges:
@@ -798,7 +798,7 @@ da:
       destroyed_msg: Websteds-upload blev slettet!
     software_updates:
       critical_update: Kritisk – opdatér hurtigst muligt
-      description: Det anbefales at holde Mastodon-installationen opdateret for at drage fordel af de seneste fejlrettelser og funktioner. Undertiden kan det desuden være kritisk at opdatere Mastodon rettidigt for at undgå sikkerhedsproblemer. Mastodon tjekker derfor for opdateringer hvert 30. minut og notificerer dig jf. dine e-mailnotifikationsindstillinger.
+      description: Det anbefales at holde Mastodon-installationen opdateret for at drage fordel af de seneste fejlrettelser og funktioner. Undertiden kan det desuden være kritisk at opdatere Mastodon rettidigt for at undgå sikkerhedsproblemer. Mastodon tjekker derfor for opdateringer hvert 30. minut og notificerer brugeren jf. dennes e-mailnotifikationsindstillinger.
       documentation_link: Læs mere
       release_notes: Udgivelsesnoter
       title: Tilgængelige opdateringer
@@ -907,10 +907,16 @@ da:
     trends:
       allow: Tillad
       approved: Godkendt
+      confirm_allow: Sikker på, at de valgte tags skal tillades?
+      confirm_disallow: Sikker på, at de valgte tags ikke skal tillades?
       disallow: Tillad ikke
       links:
         allow: Tillad link
         allow_provider: Tillad udgiver
+        confirm_allow: Sikker på, at de valgte links skal tillades?
+        confirm_allow_provider: Sikker på, at de valgte udbydere skal tillades?
+        confirm_disallow: Sikker på, at de valgte links ikke skal tillades?
+        confirm_disallow_provider: Sikker på, at de valgte udbydere ikke skal tillades?
         description_html: Disse er links, som pt. deles meget af konti, som serveren ser indlæg fra. Det kan hjælpe ens brugere med at finde ud af, hvad der sker i verden. Ingen links vises offentligt, før man godkender udgiveren. Man kan også tillade/afvise individuelle links.
         disallow: Tillad ikke link
         disallow_provider: Tillad ikke udgiver
@@ -934,6 +940,10 @@ da:
       statuses:
         allow: Tillad indlæg
         allow_account: Tillad forfatter
+        confirm_allow: Sikker på, at de valgte statusser skal tillades?
+        confirm_allow_account: Sikker på, at de valgte konti skal tillades?
+        confirm_disallow: Sikker på, at de valgte statusser ikke skal tillades?
+        confirm_disallow_account: Sikker på, at de valgte konti ikke skal tillades?
         description_html: Disse er indlæg, serveren kender til, som pt. deles og favoritmarkeres meget. Det kan hjælpe nye og tilbagevendende brugere til at finde flere personer at følge. Ingen indlæg vises offentligt, før man godkender forfatteren, samt denne tillader sin konto at blive foreslået andre. Man kan også tillade/afvise individuelle indlæg.
         disallow: Tillad ikke indlæg
         disallow_account: Tillad ikke forfatter
@@ -966,7 +976,7 @@ da:
         used_by_over_week:
           one: Brugt af én person den seneste uge
           other: Brugt af %{count} personer den seneste uge
-      title: Trends
+      title: Anbefalinger og Tendenser
       trending: Populære
     warning_presets:
       add_new: Tilføj ny
@@ -1073,7 +1083,7 @@ da:
       hint_html: Bare en ting mere! Vi er nødt til at bekræfte, at du er et menneske (dette er for at vi kan holde spam ude!). Løs CAPTCHA'en nedenfor og klik på "Fortsæt".
       title: Sikkerhedstjek
     confirmations:
-      awaiting_review: E-mailadressen er bekræftet! %{domain}-personalet gennemgår nu registreringen. En e-mail fremsendes, såfremt din konto godkendes!
+      awaiting_review: E-mailadressen er bekræftet! %{domain}-personalet gennemgår nu registreringen. En e-mail fremsendes, såfremt kontoen godkendes!
       awaiting_review_title: Registreringen er ved at blive gennemgået
       clicking_this_link: klikke på dette link
       login_link: log ind
@@ -1081,7 +1091,7 @@ da:
       redirect_to_app_html: En omdirigering til <strong>%{app_name}</strong>-appen burde være sket. Er det ikke tilfældet, prøv da %{clicking_this_link} eller returnér manuelt til appen.
       registration_complete: Registreringen på %{domain} er nu fuldført!
       welcome_title: Velkommen %{name}!
-      wrong_email_hint: Er denne e-mailadresse ikke korrekt, kan den ændres i kontoindstillinger.
+      wrong_email_hint: Er denne e-mailadresse ikke korrekt, kan den ændres via Kontoindstillinger.
     delete_account: Slet konto
     delete_account_html: Ønsker du at slette din konto, kan du <a href="%{path}">gøre dette hér</a>. Du vil blive bedt om bekræftelse.
     description:
@@ -1140,7 +1150,7 @@ da:
       account_status: Kontostatus
       confirming: Afventer færdiggørelse af e-mailbekræftelse.
       functional: Din konto er fuldt funktionel.
-      pending: Din ansøgning afventer gennemgang af vores medarbejdere. Dette kan tage noget tid. Du modtager en e-mail, hvis din ansøgning godkendes.
+      pending: Ansøgningen afventer gennemgang af vores personale. Dette kan tage noget tid. Man bør modtage en e-mail, såfremt ansøgningen godkendes.
       redirecting_to: Din konto er inaktiv, da den pt. er omdirigerer til %{acct}.
       self_destruct: Da %{domain} er under nedlukning, vil kontoadgangen være begrænset.
       view_strikes: Se tidligere anmeldelser af din konto
@@ -1183,9 +1193,9 @@ da:
       before: 'Inder der fortsættes, læs venligst disse notater omhyggeligt:'
       caches: Indhold, cachelagret af andre servere, kan fortsat eksistere
       data_removal: Dine indlæg og andre data fjernes permanent
-      email_change_html: Du kan <a href="%{path}">skifte e-mailadresse</a> uden at slette din konto
-      email_contact_html: Hvis det stadig ikke ankommer, kan du sende en e-mail til <a href="mailto:%{email}">%{email}</a> for hjælp
-      email_reconfirmation_html: Modtager du ikke bekræftelses-e-mailen, kan du <a href="%{path}">anmode om en ny</a>
+      email_change_html: Man kan <a href="%{path}">skifte e-mailadresse</a> uden at slette sin konto
+      email_contact_html: Hvis den stadig ikke modtages, send en e-mail til <a href="mailto:%{email}">%{email}</a> for hjælp
+      email_reconfirmation_html: Modtages bekræftelsesmailen ikke, kan man <a href="%{path}">anmode om en ny</a>
       irreversible: Du vil ikke kunne gendanne/genaktivere din konto
       more_details_html: For yderligere oplysningerer, tjek <a href="%{terms_path}">privatlivspolitikken</a>.
       username_available: Dit brugernavn vil blive tilgængeligt igen
@@ -1429,7 +1439,7 @@ da:
     unsubscribe:
       action: Ja, afmeld
       complete: Afmeldt
-      confirmation_html: Er du sikker på, at du vil afmelde dig fra at modtage %{type} for Mastodon på %{domain} til din e-mail på %{email}? Du kan altid gentilmelde dig dine <a href="%{settings_path}">e-mail-notifikationsindstillinger</a>.
+      confirmation_html: Sikker på, at %{type} for Mastodon skal afmeldes på %{domain} til e-mailen %{email}? Man kan altid gentilmelde sig via <a href="%{settings_path}">indstillingerne E-mailnotifikationer</a>.
       emails:
         notification_emails:
           favourite: e-mailnotifikationer om favoritmarkeringer
@@ -1437,8 +1447,8 @@ da:
           follow_request: e-mailnotifikationer om følgeanmodninger
           mention: e-mailnotifikationer om omtaler
           reblog: e-mailnotifikationer om boosts
-      resubscribe_html: Hvis du har afmeldt dig ved en fejl, kan du gentilmelde dig under dine <a href="%{settings_path}">e-mail-notifikationsindstillinger</a>.
-      success_html: Du vil ikke længere modtage %{type} for Mastodon på %{domain} til din e-mail på %{email}.
+      resubscribe_html: Har man afmeldt sig ved en fejl, kan man gentilmelde sig via <a href="%{settings_path}">indstillingerne E-mailnotifikationer</a>.
+      success_html: Man vil ikke længere modtage %{type} for Mastodon på %{domain} til e-mailen %{email}.
       title: Opsig abonnement
   media_attachments:
     validations:
@@ -1926,7 +1936,7 @@ da:
     invalid_otp_token: Ugyldig tofaktorkode
     otp_lost_help_html: Har du mistet adgang til begge, kan du kontakte %{email}
     rate_limited: For mange godkendelsesforsøg. Prøv igen senere.
-    seamless_external_login: Du er logget ind via en ekstern tjeneste, så adgangskode- og e-mailindstillinger er utilgængelige.
+    seamless_external_login: Adgangskode- og e-mailindstillinger er utilgængelige, da der er logget ind via en ekstern tjeneste.
     signed_in_as: 'Logget ind som:'
   verification:
     extra_instructions_html: <strong>Tip:</strong> Linket på din hjemmeside kan være usynligt. Den vigtige del er <code>rel="me"</code> , som forhindrer impersonation på websteder med brugergenereret indhold. Du kan endda bruge et <code>link</code> tag i overskriften på siden i stedet for <code>a</code>, men HTML skal være tilgængelig uden at udføre JavaScript.
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 1e6d29106849ac..fe47c153706a2d 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -173,7 +173,7 @@ de:
         approve_appeal: Einspruch zulassen
         approve_user: Benutzer*in genehmigen
         assigned_to_self_report: Meldung zuweisen
-        change_email_user: E-Mail-Adresse des Kontos ändern
+        change_email_user: E-Mail des Profils ändern
         change_role_user: Rolle des Profils ändern
         confirm_user: Benutzer*in bestätigen
         create_account_warning: Warnung erstellen
@@ -192,7 +192,7 @@ de:
         destroy_custom_emoji: Eigenes Emojis löschen
         destroy_domain_allow: Erlaube das Löschen von Domains
         destroy_domain_block: Domain-Sperre entfernen
-        destroy_email_domain_block: E-Mail-Domain-Sperre löschen
+        destroy_email_domain_block: E-Mail-Domain-Sperre entfernen
         destroy_instance: Domain-Daten entfernen
         destroy_ip_block: IP-Regel löschen
         destroy_status: Beitrag entfernen
@@ -238,21 +238,21 @@ de:
         confirm_user_html: "%{name} bestätigte die E-Mail-Adresse von %{target}"
         create_account_warning_html: "%{name} sendete eine Warnung an %{target}"
         create_announcement_html: "%{name} erstellte die neue Ankündigung: %{target}"
-        create_canonical_email_block_html: "%{name} hat die E-Mail mit dem Hash %{target} gesperrt"
+        create_canonical_email_block_html: "%{name} sperrte die E-Mail mit dem Hash %{target}"
         create_custom_emoji_html: "%{name} lud das neue Emoji %{target} hoch"
         create_domain_allow_html: "%{name} erlaubte die Föderation mit der Domain %{target}"
         create_domain_block_html: "%{name} sperrte die Domain %{target}"
-        create_email_domain_block_html: "%{name} hat die E-Mail-Domain %{target} gesperrt"
+        create_email_domain_block_html: "%{name} sperrte die E-Mail-Domain %{target}"
         create_ip_block_html: "%{name} erstellte eine IP-Regel für %{target}"
         create_unavailable_domain_html: "%{name} beendete die Zustellung an die Domain %{target}"
         create_user_role_html: "%{name} erstellte die Rolle %{target}"
         demote_user_html: "%{name} stufte %{target} herunter"
         destroy_announcement_html: "%{name} löschte die Ankündigung %{target}"
-        destroy_canonical_email_block_html: "%{name} hat die E-Mail mit dem Hash %{target} entsperrt"
+        destroy_canonical_email_block_html: "%{name} entsperrte die E-Mail mit dem Hash %{target}"
         destroy_custom_emoji_html: "%{name} löschte das Emoji %{target}"
         destroy_domain_allow_html: "%{name} verwehrte die Föderation mit der Domain %{target}"
         destroy_domain_block_html: "%{name} entsperrte die Domain %{target}"
-        destroy_email_domain_block_html: "%{name} hat die E-Mail-Domain %{target} entsperrt"
+        destroy_email_domain_block_html: "%{name} entsperrte die E-Mail-Domain %{target}"
         destroy_instance_html: "%{name} entfernte die Daten der Domain %{target} von diesem Server"
         destroy_ip_block_html: "%{name} entfernte eine IP-Regel für %{target}"
         destroy_status_html: "%{name} entfernte einen Beitrag von %{target}"
@@ -263,7 +263,7 @@ de:
         disable_sign_in_token_auth_user_html: "%{name} deaktivierte die E-Mail-Token-Authentisierung für %{target}"
         disable_user_html: "%{name} deaktivierte den Zugang für %{target}"
         enable_custom_emoji_html: "%{name} aktivierte das Emoji %{target}"
-        enable_sign_in_token_auth_user_html: "%{name} hat die E-Mail-Token-Authentisierung für %{target} aktiviert"
+        enable_sign_in_token_auth_user_html: "%{name} aktivierte die E-Mail-Token-Authentisierung für %{target}"
         enable_user_html: "%{name} aktivierte den Zugang für %{target}"
         memorialize_account_html: "%{name} wandelte das Konto von %{target} in eine Gedenkseite um"
         promote_user_html: "%{name} beförderte %{target}"
@@ -271,7 +271,7 @@ de:
         reject_user_html: "%{name} hat die Registrierung von %{target} abgelehnt"
         remove_avatar_user_html: "%{name} entfernte das Profilbild von %{target}"
         reopen_report_html: "%{name} öffnete die Meldung %{target} wieder"
-        resend_user_html: "%{name} hat erneut eine Bestätigungs-E-Mail für %{target} gesendet"
+        resend_user_html: "%{name} versendete erneut die E-Mail-Bestätigung für %{target}"
         reset_password_user_html: "%{name} setzte das Passwort von %{target} zurück"
         resolve_report_html: "%{name} klärte die Meldung %{target}"
         sensitive_account_html: "%{name} versah die Medien von %{target} mit einer Inhaltswarnung"
@@ -442,9 +442,9 @@ de:
         create: E-Mail-Domain hinzufügen
         resolve: Domain auflösen
         title: Neue E-Mail-Domain sperren
-      no_email_domain_block_selected: Keine E-Mail-Domain-Sperren wurden geändert, da keine ausgewählt wurden
+      no_email_domain_block_selected: Es wurden keine E-Mail-Domain-Sperren geändert, da keine ausgewählt wurden
       not_permitted: Nicht gestattet
-      resolved_dns_records_hint_html: Der Domain-Name wird an die folgenden MX-Domains aufgelöst, die letztendlich für die Annahme von E-Mails zuständig sind. Das Sperren einer MX-Domain sperrt Anmeldungen aller E-Mail-Adressen, die dieselbe MX-Domain verwenden, auch wenn die sichtbare Domain anders lautet. <strong>Achte daher darauf, große E-Mail-Anbieter versehentlich nicht auszusperren.</strong>
+      resolved_dns_records_hint_html: Die Domain wird zu den folgenden MX-Domains aufgelöst, die für die Annahme von E-Mails zuständig sind. Das Sperren einer MX-Domain sperrt Anmeldungen aller E-Mail-Adressen, die dieselbe MX-Domain verwenden, auch wenn die sichtbare Domain anders lautet. <strong>Achte daher darauf, keine großen E-Mail-Anbieter versehentlich zu sperren.</strong>
       resolved_through_html: Durch %{domain} aufgelöst
       title: Gesperrte E-Mail-Domains
     export_domain_allows:
@@ -705,7 +705,7 @@ de:
         manage_appeals: Einsprüche verwalten
         manage_appeals_description: Erlaubt es Benutzer*innen, Entscheidungen der Moderator*innen zu widersprechen
         manage_blocks: Sperrungen verwalten
-        manage_blocks_description: Erlaubt Benutzer*innen das Sperren von E-Mail-Providern und IP-Adressen
+        manage_blocks_description: Erlaubt Nutzer*innen das Sperren von E-Mail-Providern und IP-Adressen
         manage_custom_emojis: Eigene Emojis verwalten
         manage_custom_emojis_description: Erlaubt es Benutzer*innen, eigene Emojis auf dem Server zu verwalten
         manage_federation: Föderation verwalten
@@ -723,7 +723,7 @@ de:
         manage_taxonomies: Hashtags verwalten
         manage_taxonomies_description: Ermöglicht Benutzer*innen, die Trends zu überprüfen und die Hashtag-Einstellungen zu aktualisieren
         manage_user_access: Kontozugriff verwalten
-        manage_user_access_description: Erlaubt es Benutzer*innen, die Zwei-Faktor-Authentisierung (2FA) anderer zu deaktivieren, ihre E-Mail-Adresse zu ändern und ihr Passwort zurückzusetzen
+        manage_user_access_description: Erlaubt Nutzer*innen, die Zwei-Faktor-Authentisierung (2FA) anderer zu deaktivieren, ihre E-Mail-Adresse zu ändern und ihr Passwort zurückzusetzen
         manage_users: Konten verwalten
         manage_users_description: Erlaubt es Benutzer*innen, die Details anderer Profile einzusehen und diese Accounts zu moderieren
         manage_webhooks: Webhooks verwalten
@@ -907,10 +907,16 @@ de:
     trends:
       allow: Erlauben
       approved: Freigegeben
+      confirm_allow: Möchtest du die ausgewählten Tags wirklich erlauben?
+      confirm_disallow: Möchtest du die ausgewählten Tags wirklich verbieten?
       disallow: Verbieten
       links:
         allow: Link erlauben
         allow_provider: Herausgeber*in erlauben
+        confirm_allow: Möchtest du die ausgewählten Links wirklich erlauben?
+        confirm_allow_provider: Möchtest du die ausgewählten Provider wirklich erlauben?
+        confirm_disallow: Möchtest du die ausgewählten Links wirklich verbieten?
+        confirm_disallow_provider: Möchtest du die ausgewählten Provider wirklich verbieten?
         description_html: Dies sind Links, die derzeit von zahlreichen Konten geteilt werden und die deinem Server aufgefallen sind. Die Benutzer*innen können darüber herausfinden, was in der Welt vor sich geht. Die Links werden allerdings erst dann öffentlich vorgeschlagen, wenn du die Herausgeber*innen genehmigt hast. Du kannst alternativ aber auch nur einzelne URLs zulassen oder ablehnen.
         disallow: Link verbieten
         disallow_provider: Herausgeber*in verbieten
@@ -934,6 +940,10 @@ de:
       statuses:
         allow: Beitrag erlauben
         allow_account: Profil erlauben
+        confirm_allow: Möchtest du die ausgewählten Status wirklich erlauben?
+        confirm_allow_account: Möchtest du die ausgewählten Konten wirklich erlauben?
+        confirm_disallow: Möchtest du die ausgewählten Status wirklich verbieten?
+        confirm_disallow_account: Möchtest du die ausgewählten Konten wirklich verbieten?
         description_html: Dies sind Beiträge, von denen dein Server weiß, dass sie derzeit viel geteilt und favorisiert werden. Dies kann neuen und wiederkehrenden Personen helfen, weitere Profile zu finden, denen sie folgen können. Die Beiträge werden erst dann öffentlich angezeigt, wenn du die Person genehmigst und sie es zulässt, dass ihr Profil anderen vorgeschlagen wird. Du kannst auch einzelne Beiträge zulassen oder ablehnen.
         disallow: Beitrag verbieten
         disallow_account: Profil verweigern
@@ -966,7 +976,7 @@ de:
         used_by_over_week:
           one: In den vergangenen 7 Tagen von einem Profil verwendet
           other: In den vergangenen 7 Tagen von %{count} Profilen verwendet
-      title: Trends
+      title: Empfehlungen & Trends
       trending: Angesagt
     warning_presets:
       add_new: Neu hinzufügen
@@ -1073,7 +1083,7 @@ de:
       hint_html: Fast geschafft! Wir müssen uns vergewissern, dass du ein Mensch bist (damit wir Spam verhindern können!). Bitte löse das CAPTCHA und klicke auf „Fortfahren“.
       title: Sicherheitsüberprüfung
     confirmations:
-      awaiting_review: Deine E-Mail-Adresse wurde bestätigt und das Team von %{domain} überprüft nun deine Registrierung. Sobald es dein Konto genehmigt, wirst du eine E-Mail erhalten.
+      awaiting_review: Deine E-Mail-Adresse wurde bestätigt und das Team von %{domain} überprüft nun deine Registrierung. Sobald es dein Konto genehmigt, wirst du eine E-Mail erhalten!
       awaiting_review_title: Deine Registrierung wird überprüft
       clicking_this_link: Klick auf diesen Link
       login_link: anmelden
@@ -1081,7 +1091,7 @@ de:
       redirect_to_app_html: Du hättest zur <strong>%{app_name}</strong>-App weitergeleitet werden sollen. Wenn das nicht geschehen ist, versuche es mit einem %{clicking_this_link} oder kehre manuell zur App zurück.
       registration_complete: Deine Registrierung auf %{domain} ist nun abgeschlossen!
       welcome_title: Willkommen, %{name}!
-      wrong_email_hint: Sollte diese E-Mail-Adresse nicht korrekt sein, kannst du sie in den Kontoeinstellungen ändern.
+      wrong_email_hint: Wenn diese E-Mail-Adresse nicht korrekt ist, kann sie in den Kontoeinstellungen geändert werden.
     delete_account: Konto löschen
     delete_account_html: Falls du dein Konto endgültig löschen möchtest, kannst du das <a href="%{path}">hier vornehmen</a>. Du musst dies zusätzlich bestätigen.
     description:
@@ -1102,7 +1112,7 @@ de:
     or_log_in_with: Oder anmelden mit
     privacy_policy_agreement_html: Ich habe die <a href="%{privacy_policy_path}" target="_blank">Datenschutzerklärung</a> gelesen und stimme ihr zu
     progress:
-      confirm: E-Mail-Adresse bestätigen
+      confirm: E-Mail bestätigen
       details: Deine Daten
       review: Unsere Überprüfung
       rules: Regeln akzeptieren
@@ -1140,7 +1150,7 @@ de:
       account_status: Kontostatus
       confirming: Auf die Bestätigung deiner E-Mail-Adresse wird gewartet.
       functional: Dein Konto ist voll funktionsfähig.
-      pending: Die Prüfung deiner Bewerbung steht noch aus. Dies kann einige Zeit in Anspruch nehmen. Sobald deine Bewerbung genehmigt wurde, erhältst du eine E-Mail.
+      pending: Die Prüfung deiner Bewerbung steht noch aus und kann einige Zeit in Anspruch nehmen. Sobald deine Bewerbung genehmigt wurde, erhältst du eine E-Mail.
       redirecting_to: Dein Konto ist inaktiv, weil es zu %{acct} umgezogen ist.
       self_destruct: Da %{domain} den Betrieb einstellen wird, wirst du nur begrenzten Zugriff auf dein Konto haben.
       view_strikes: Vorherige Verstöße deines Kontos ansehen
@@ -1184,7 +1194,7 @@ de:
       caches: Inhalte, die von anderen Servern zwischengespeichert wurden, können fortbestehen
       data_removal: Deine Beiträge und alle anderen Daten werden für immer entfernt
       email_change_html: Du kannst <a href="%{path}">deine E-Mail-Adresse ändern</a>, ohne dein Konto zu löschen
-      email_contact_html: Sollte sie noch immer nicht angekommen sein, kannst du eine E-Mail an <a href="mailto:%{email}">%{email}</a> senden, um weitere Hilfe zu erhalten
+      email_contact_html: Wenn die Bestätigungs-E-Mail immer noch nicht ankam, kannst du eine E-Mail an <a href="mailto:%{email}">%{email}</a> senden, um weitere Hilfe zu erhalten
       email_reconfirmation_html: Wenn du die Bestätigungs-E-Mail nicht erhalten hast, kannst du sie <a href="%{path}">erneut anfordern</a>
       irreversible: Du wirst dein Konto nicht mehr wiederherstellen oder reaktivieren können
       more_details_html: Weitere Details findest du in der <a href="%{terms_path}">Datenschutzerklärung</a>.
@@ -1432,11 +1442,11 @@ de:
       confirmation_html: Möchtest du %{type} für Mastodon auf %{domain} an deine E-Mail-Adresse %{email} wirklich abbestellen? Du kannst dies später in den Einstellungen <a href="%{settings_path}">Benachrichtigungen per E-Mail</a> rückgängig machen.
       emails:
         notification_emails:
-          favourite: E-Mail-Benachrichtigungen für Favoriten
-          follow: E-Mail-Benachrichtigungen für Follower
-          follow_request: E-Mail-Benachrichtigungen für Follower-Anfragen
-          mention: E-Mail-Benachrichtigungen für Erwähnungen
-          reblog: E-Mail-Benachrichtigungen für geteilte Beiträge
+          favourite: E-Mail-Benachrichtigungen bei Favoriten
+          follow: E-Mail-Benachrichtigungen bei Followern
+          follow_request: E-Mail-Benachrichtigungen bei Follower-Anfragen
+          mention: E-Mail-Benachrichtigungen bei Erwähnungen
+          reblog: E-Mail-Benachrichtigungen bei geteilten Beiträgen
       resubscribe_html: Falls du etwas irrtümlich abbestellt hast, kannst du das in den Einstellungen <a href="%{settings_path}">Benachrichtigungen per E-Mail</a> rückgängig machen.
       success_html: Du wirst nicht länger %{type} für Mastodon auf %{domain} an deine E-Mail-Adresse %{email} erhalten.
       title: Abbestellen
diff --git a/config/locales/devise.kab.yml b/config/locales/devise.kab.yml
index 8f9e63c21412d8..20249aae9431ce 100644
--- a/config/locales/devise.kab.yml
+++ b/config/locales/devise.kab.yml
@@ -15,8 +15,8 @@ kab:
       omniauth_user_creation_failure: Tuccḍa lawan n tmerna n umiḍan i timagit-a.
       pending: Amiḍan-inek mazal-it deg ɛiwed n tmuγli.
       timeout: Tiɣimit n tuqqna tezri. Ma ulac aɣilif ɛiwed tuqqna akken ad tkemmleḍ.
-      unauthenticated: Ilaq ad teqqneḍ neɣ ad tjerrḍeḍ akken ad tkemmelḍ.
-      unconfirmed: Ilaq ad wekdeḍ tansa-inek imayl akken ad tkemmelḍ.
+      unauthenticated: Ilaq ad teqqneḍ neɣ ad tjerrḍeḍ send ad tkemmelḍ.
+      unconfirmed: Ilaq ad wekdeḍ tansa-inek·inem imayl send ad tkemmelḍ.
     mailer:
       confirmation_instructions:
         action: Senqed tansa-inek imayl
diff --git a/config/locales/devise.zh-CN.yml b/config/locales/devise.zh-CN.yml
index 3eb722b96187be..2a50c131d5d63f 100644
--- a/config/locales/devise.zh-CN.yml
+++ b/config/locales/devise.zh-CN.yml
@@ -3,8 +3,8 @@ zh-CN:
   devise:
     confirmations:
       confirmed: 已成功确认你的邮箱地址。
-      send_instructions: 你将在几分钟内收到一封电子邮件，指导你如何验证电子邮箱地址。如果你没有收到这封邮件，请检查你的垃圾邮件文件夹。
-      send_paranoid_instructions: 如果你的电子邮箱地址存在于我们的数据库中，你将在几分钟内收到一封邮件，指导你如何验证电子邮箱地址。如果你没有收到这封邮件，请检查你的垃圾邮件文件夹。
+      send_instructions: 你将在几分钟内收到一封邮件，内含如何验证邮箱地址的指引。如果你没有收到这封邮件，请检查你的垃圾邮件文件夹。
+      send_paranoid_instructions: 如果你的邮箱地址存在于我们的数据库中，你将在几分钟内收到一封邮件，内含如何验证邮箱地址的指引。如果你没有收到这封邮件，请检查你的垃圾邮件文件夹。
     failure:
       already_authenticated: 你已登录。
       inactive: 你还没有激活账户。
@@ -19,28 +19,28 @@ zh-CN:
       unconfirmed: 你必须先确认你的电子邮件地址才能继续。
     mailer:
       confirmation_instructions:
-        action: 验证电子邮件地址
+        action: 验证邮箱地址
         action_with_app: 确认并返回%{app}
         explanation: 你在 %{host} 上使用此电子邮箱地址创建了一个账号。点击下面的链接即可激活账号。如果你没有创建账号，请忽略此邮件。
-        explanation_when_pending: 你用这个电子邮件申请了在 %{host} 注册。在确认电子邮件地址之后，我们会审核你的申请。在此之前，你不能登录。如果你的申请被驳回，你的数据会被移除，因此你无需再采取任何行动。如果申请人不是你，请忽略这封邮件。
+        explanation_when_pending: 你用这个邮箱申请了在 %{host} 注册。在确认邮箱地址之后，我们会审核你的申请。在此之前，你不能登录。如果你的申请被驳回，你的数据会被移除，因此你无需再采取任何行动。如果申请人不是你，请忽略这封邮件。
         extra_html: 请记得阅读<a href="%{terms_path}">本实例的相关规定</a>和<a href="%{policy_path}">我们的使用条款</a>。
         subject: Mastodon：来自 %{instance} 的确认指引
-        title: 验证电子邮件地址
+        title: 验证邮箱地址
       email_changed:
-        explanation: 你的账号的电子邮箱地址将变更为：
-        extra: 如果你并没有请求更改你的电子邮件地址，则他人很有可能已经入侵你的账户。请立即更改你的密码，或者，如果你已经无法访问你的账户，请联系服务器管理员请求协助。
-        subject: Mastodon：电子邮件地址已被更改
-        title: 新电子邮件地址
+        explanation: 你的账号的邮箱地址将变更为：
+        extra: 如果你并没有请求更改你的邮箱地址，则他人很有可能已经入侵你的账户。请立即更改你的密码，或者，如果你已经无法访问你的账户，请联系服务器管理员请求协助。
+        subject: Mastodon：邮箱地址已被更改
+        title: 新邮箱地址
       password_change:
         explanation: 你的账户密码已更改。
         extra: 如果你并没有申请更改密码，那似乎有人已经入侵你的帐户。请立即更改你的密码；如果你已经无法访问你的帐户，请联系服务器的管理员获取帮助。
         subject: Mastodon：密码已被更改
         title: 密码已被重置
       reconfirmation_instructions:
-        explanation: 点击下面的链接来确认你的新电子邮件地址。
-        extra: 如果你并没有请求本次更改，请忽略此邮件。Mastodon 账户的电子邮件地址只有在你点击上面的链接后才会更改。
-        subject: Mastodon：确认 %{instance} 电子邮件地址
-        title: 验证电子邮件地址
+        explanation: 点击下面的链接来确认你的新邮箱地址。
+        extra: 如果你并没有请求本次更改，请忽略此邮件。Mastodon 账户的邮箱地址只有在你点击上面的链接后才会更改。
+        subject: Mastodon：确认 %{instance} 电子邮箱地址
+        title: 验证邮箱地址
       reset_password_instructions:
         action: 更改密码
         explanation: 点击下面的链接来更改账户的密码。
@@ -48,7 +48,7 @@ zh-CN:
         subject: Mastodon：重置密码说明
         title: 重置密码
       two_factor_disabled:
-        explanation: 目前只能通过电子邮件地址和密码登录。
+        explanation: 目前只能通过邮箱地址和密码登录。
         subject: Mastodon：双因素认证已禁用
         subtitle: 您账户的双因素认证已被停用。
         title: 双因素认证已停用
@@ -88,8 +88,8 @@ zh-CN:
       success: 成功地从 %{kind} 获得授权。
     passwords:
       no_token: 如果你不是来自于密码重置邮件，你就不能访问这个页面。如果你确实来自密码重置邮件，请确保你使用了所提供的完整 URL 。
-      send_instructions: 如果你的电子邮件地址存在于我们的数据库中，你将在几分钟后收到一个密码恢复链接。如果你没有收到这封邮件，请检查你邮箱的垃圾箱。
-      send_paranoid_instructions: 如果你的电子邮件地址存在于我们的数据库中，你将在几分钟后收到一个密码恢复链接。如果你没有收到这封邮件，请检查你邮箱的垃圾箱。
+      send_instructions: 如果你的邮箱地址存在于我们的数据库中，你将在几分钟后收到一个密码恢复链接。如果你没有收到这封邮件，请检查你的垃圾邮件文件夹。
+      send_paranoid_instructions: 如果你的邮箱地址存在于我们的数据库中，你将在几分钟后收到一个密码恢复链接。如果你没有收到这封邮件，请检查你的垃圾邮件文件夹。
       updated: 你的密码已成功修改，现在你已登录。
       updated_not_active: 你的密码已修改成功。
     registrations:
@@ -97,9 +97,9 @@ zh-CN:
       signed_up: 欢迎！你已成功注册。
       signed_up_but_inactive: 你已成功注册，但我们无法让你登录，因为你的账户还没有激活。
       signed_up_but_locked: 你已成功注册，但我们无法让你登录，因为你的账户已被锁定。
-      signed_up_but_pending: 一条带有确认链接的邮件已经发送到你的电子邮件地址。在你点击该链接后，我们将会审查你的申请。如果申请被批准，你将收到通知。
+      signed_up_but_pending: 一条带有确认链接的邮件已经发送到你的邮箱地址。在你点击该链接后，我们将会审核你的申请。如果申请被批准，你将收到通知。
       signed_up_but_unconfirmed: 一封带有确认链接的邮件已经发送至你的邮箱，请点击邮件中的链接以激活你的账户。如果没有，请检查你的垃圾邮件。
-      update_needs_confirmation: 账号信息更新成功，但我们需要验证你的新电子邮件地址，请点击邮件中的链接以确认。如果没有收到邮件，请检查你的垃圾邮箱。
+      update_needs_confirmation: 账号信息更新成功，但我们需要验证你的新邮箱地址，请点击邮件中的链接以确认。如果没有收到邮件，请检查你的垃圾邮件文件夹。
       updated: 账户资料更新成功。
     sessions:
       already_signed_out: 已成功退出登录。
diff --git a/config/locales/devise.zh-TW.yml b/config/locales/devise.zh-TW.yml
index 3e3af9f323997c..fdbde86995721a 100644
--- a/config/locales/devise.zh-TW.yml
+++ b/config/locales/devise.zh-TW.yml
@@ -2,9 +2,9 @@
 zh-TW:
   devise:
     confirmations:
-      confirmed: 您的電子郵件地址已確認成功。
-      send_instructions: 幾分鐘後您將收到確認信件。若未收到此信件，請檢查垃圾郵件資料夾。
-      send_paranoid_instructions: 如果您的電子郵件存在於我們的資料庫，您將於幾分鐘內收到確認信。若未收到請檢查垃圾郵件資料夾。
+      confirmed: 您的電子郵件地址已成功驗證。
+      send_instructions: 幾分鐘後您將收到驗證信。若未收到此信件，請檢查垃圾郵件資料夾。
+      send_paranoid_instructions: 如果您的電子郵件存在於我們的資料庫，您將於幾分鐘內收到驗證信。若未收到請檢查垃圾郵件資料夾。
     failure:
       already_authenticated: 您已登入。
       inactive: 您的帳號尚未啟用。
@@ -16,13 +16,13 @@ zh-TW:
       pending: 您的帳號仍在審核中。
       timeout: 登入階段逾時。請重新登入以繼續。
       unauthenticated: 您必須先登入或註冊才能繼續使用。
-      unconfirmed: 您必須先確認電子郵件才能繼續使用。
+      unconfirmed: 您必須先驗證電子郵件才能繼續使用。
     mailer:
       confirmation_instructions:
         action: 驗證電子郵件地址
         action_with_app: 確認並返回 %{app}
         explanation: 您已於 %{host} 上以此電子郵件地址建立了一支帳號。您距離啟用它只剩一點之遙了。若這不是您，請忽略此信件。
-        explanation_when_pending: 您使用此電子郵件地址申請了 %{host} 的邀請。當您確認電子郵件地址後我們將審核您的申請。您能於登入後變更詳細資訊或刪除您的帳號，但直到您的帳號被核准之前，您無法操作大部分的功能。若您的申請遭拒絕，您的資料將被移除而不必做後續動作。如果這不是您本人，請忽略此郵件。
+        explanation_when_pending: 您使用此電子郵件地址申請了 %{host} 的邀請。當您驗證電子郵件地址後我們將審核您的申請。您能於登入後變更詳細資訊或刪除您的帳號，但直到您的帳號被核准之前，您無法操作大部分的功能。若您的申請遭拒絕，您的資料將被移除而不必做後續動作。如果這不是您本人，請忽略此郵件。
         extra_html: 同時也請看看<a href="%{terms_path}">伺服器規則</a>與<a href="%{policy_path}">服務條款</a>。
         subject: Mastodon：%{instance} 確認說明
         title: 驗證電子郵件地址
@@ -37,9 +37,9 @@ zh-TW:
         subject: Mastodon：已變更密碼
         title: 密碼已變更
       reconfirmation_instructions:
-        explanation: 請確認新的電子郵件地址以變更。
+        explanation: 請驗證新的電子郵件地址以變更。
         extra: 若此次變更不是由您起始的，請忽略此信件。Mastodon 帳號的電子郵件地址於您存取上面的連結前不會變更。
-        subject: Mastodon：確認 %{instance} 的電子郵件地址
+        subject: Mastodon：驗證 %{instance} 之電子郵件地址
         title: 驗證電子郵件地址
       reset_password_instructions:
         action: 變更密碼
@@ -97,9 +97,9 @@ zh-TW:
       signed_up: 歡迎！您已成功註冊。
       signed_up_but_inactive: 您已註冊成功，但由於您的帳號尚未啟用，我們暫時無法讓您登入。
       signed_up_but_locked: 您已註冊成功，但由於您的帳號已被鎖定，我們無法讓您登入。
-      signed_up_but_pending: 包含確認連結的訊息已寄到您的電子郵件信箱。按下此連結後我們將審核您的申請。核准後將通知您。
-      signed_up_but_unconfirmed: 包含確認連結的訊息已寄到您的電子信箱。請前往連結以啟用帳號。若未收到請檢查垃圾郵件資料夾。
-      update_needs_confirmation: 已成功更新您的帳號，但仍需驗證您的新信箱。請檢查電子信箱並前往確認連結來確認新信箱位址。若未收到請檢查垃圾郵件資料夾。
+      signed_up_but_pending: 包含驗證連結的訊息已寄到您的電子郵件信箱。按下此連結後我們將審核您的申請。核准後將通知您。
+      signed_up_but_unconfirmed: 包含驗證連結的訊息已寄至您的電子郵件信箱。請前往連結以啟用帳號。若未收到請檢查垃圾郵件資料夾。
+      update_needs_confirmation: 已成功更新您的帳號，但仍需驗證您的新電子郵件地址。請檢查電子郵件信箱並前往確認連結來確認新電子郵件地址。若未收到請檢查垃圾郵件資料夾。
       updated: 您的帳號已成功更新。
     sessions:
       already_signed_out: 已成功登出。
@@ -111,7 +111,7 @@ zh-TW:
       unlocked: 已解鎖您的帳號，請登入以繼續。
   errors:
     messages:
-      already_confirmed: 已經確認，請嘗試登入
+      already_confirmed: 已驗證，請嘗試登入
       confirmation_period_expired: 您需要於 %{period} 內完成驗證。請重新申請
       expired: 已經過期，請重新請求
       not_found: 找不到
diff --git a/config/locales/doorkeeper.nn.yml b/config/locales/doorkeeper.nn.yml
index 0779a0a1355804..975ceb43c712be 100644
--- a/config/locales/doorkeeper.nn.yml
+++ b/config/locales/doorkeeper.nn.yml
@@ -83,6 +83,7 @@ nn:
         access_denied: Ressurseigaren eller autorisasjonstenaren avviste førespurnaden.
         credential_flow_not_configured: Flyten «Resource Owner Password Credentials» kunne ikkje fullførast sidan «Doorkeeper.configure.resource_owner_from_credentials» ikkje er konfigurert.
         invalid_client: Klientautentisering feila på grunn av ukjent klient, ingen inkludert autentisering, eller ikkje støtta autentiseringsmetode.
+        invalid_code_challenge_method: Kodeutfordringsmetoden må vera S256, klartekst er ikkje støtta.
         invalid_grant: Autoriseringa er ugyldig, utløpt, oppheva, stemmer ikkje med omdirigerings-URIen eller var tildelt ein annan klient.
         invalid_redirect_uri: Omdirigerings-URLen er ikkje gyldig.
         invalid_request:
diff --git a/config/locales/doorkeeper.zh-CN.yml b/config/locales/doorkeeper.zh-CN.yml
index 36bbe2b8745274..ee8c0cf13aa098 100644
--- a/config/locales/doorkeeper.zh-CN.yml
+++ b/config/locales/doorkeeper.zh-CN.yml
@@ -151,18 +151,18 @@ zh-CN:
     scopes:
       admin:read: 读取服务器上的所有数据
       admin:read:accounts: 读取所有账号的敏感信息
-      admin:read:canonical_email_blocks: 读取所有标准电子邮件块的敏感信息
+      admin:read:canonical_email_blocks: 读取所有已屏蔽邮箱的敏感信息
       admin:read:domain_allows: 读取所有域的敏感信息
       admin:read:domain_blocks: 读取所有域块的敏感信息
-      admin:read:email_domain_blocks: 读取所有电子邮件域块的敏感信息
+      admin:read:email_domain_blocks: 读取所有已屏蔽邮箱域名的敏感信息
       admin:read:ip_blocks: 读取所有IP块的敏感信息
       admin:read:reports: 读取所有举报和被举报账号的敏感信息
       admin:write: 修改服务器上的所有数据
       admin:write:accounts: 对账号执行管理操作
-      admin:write:canonical_email_blocks: 在标准电子邮件块上执行管理操作
+      admin:write:canonical_email_blocks: 对已屏蔽邮箱执行管理操作
       admin:write:domain_allows: 在域上执行管理操作
       admin:write:domain_blocks: 在域块上执行管理操作
-      admin:write:email_domain_blocks: 在电子邮件域块上执行管理操作
+      admin:write:email_domain_blocks: 对已屏蔽邮箱域名执行管理操作
       admin:write:ip_blocks: 在 IP 块上执行管理操作
       admin:write:reports: 对举报执行管理操作
       crypto: 使用端到端加密
diff --git a/config/locales/doorkeeper.zh-TW.yml b/config/locales/doorkeeper.zh-TW.yml
index 1a4c62fdbf6fc9..2759f0a3d26d02 100644
--- a/config/locales/doorkeeper.zh-TW.yml
+++ b/config/locales/doorkeeper.zh-TW.yml
@@ -145,7 +145,7 @@ zh-TW:
       admin:
         nav:
           applications: 應用程式
-          oauth2_provider: OAuth2 提供者
+          oauth2_provider: OAuth2 提供商
       application:
         title: 需要 OAuth 授權
     scopes:
diff --git a/config/locales/el.yml b/config/locales/el.yml
index 009e1f82edffc9..a314bb9a9efa70 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -31,7 +31,6 @@ el:
       created_msg: Επιτυχής δημιουργία σημειώματος συντονισμού!
       destroyed_msg: Η σημείωση συντονισμού καταστράφηκε επιτυχώς!
     accounts:
-      add_email_domain_block: Αποκλεισμός τομέα email
       approve: Έγκριση
       approved_msg: Επιτυχής έγκριση αίτησης εγγραφής του/της %{username}
       are_you_sure: Σίγουρα;
@@ -58,7 +57,6 @@ el:
       demote: Υποβιβασμός
       destroyed_msg: Τα δεδομένα του/της %{username} εκκρεμούν για άμεση διαγραφή
       disable: Πάγωμα
-      disable_sign_in_token_auth: Απενεργοποίηση επαλήθευσης μέσω email
       disable_two_factor_authentication: Απενεργοποίηση 2FA
       disabled: Παγωμένος
       display_name: Εμφανιζόμενο όνομα
@@ -67,7 +65,6 @@ el:
       email: Email
       email_status: Κατάσταση email
       enable: Ξεπάγωμα
-      enable_sign_in_token_auth: Ενεργοποίηση ελέγχου ταυτότητας μέσω e-mail
       enabled: Ενεργοποιημένο
       enabled_msg: Επιτυχές ξεπάγωμα λογαριασμού του/της %{username}
       followers: Ακόλουθοι
@@ -132,7 +129,6 @@ el:
       resubscribe: Επανεγγραφή
       role: Ρόλος
       search: Αναζήτηση
-      search_same_email_domain: Άλλοι χρήστες με τον ίδιο τομέα e-mail
       search_same_ip: Υπόλοιποι χρήστες με την ίδια διεύθυνση IP
       security: Ασφάλεια
       security_measures:
@@ -173,26 +169,21 @@ el:
         approve_appeal: Έγκριση Έφεσης
         approve_user: Έγκριση Χρήστη
         assigned_to_self_report: Ανάθεση Αναφοράς
-        change_email_user: Αλλαγή email για χρήστη
         change_role_user: Αλλαγή του ρόλου του χρήστη
         confirm_user: Επιβεβαίωση Χρήστη
         create_account_warning: Δημιουργία Προειδοποίησης
         create_announcement: Δημιουργία Ανακοίνωσης
-        create_canonical_email_block: Δημιουργία αποκλεισμού e-mail
         create_custom_emoji: Δημιουργία Προσαρμοσμένου Emoji
         create_domain_allow: Δημιουργία Αποδεκτού Τομέα
         create_domain_block: Δημιουργία Αποκλεισμού Τομέα
-        create_email_domain_block: Δημουργία Αποκλεισμού Τομέα email
         create_ip_block: Δημιουργία κανόνα IP
         create_unavailable_domain: Δημιουργία Μη Διαθέσιμου Τομέα
         create_user_role: Δημιουργία Ρόλου
         demote_user: Υποβιβασμός Χρήστη
         destroy_announcement: Διαγραφή Ανακοίνωσης
-        destroy_canonical_email_block: Διαγραφή Αποκλεισμού email
         destroy_custom_emoji: Διαγραφή Προσαρμοσμένου Emoji
         destroy_domain_allow: Διαγραφή Αποδεκτού Τομέα
         destroy_domain_block: Διαγραφή Αποκλεισμού Τομέα
-        destroy_email_domain_block: Διαγραφή Αποκλεισμένου Τομέα email
         destroy_instance: Εκκαθάριση Τομέα
         destroy_ip_block: Διαγραφή κανόνα IP
         destroy_status: Διαγραφή Ανάρτησης
@@ -200,10 +191,8 @@ el:
         destroy_user_role: Καταστροφή Ρόλου
         disable_2fa_user: Απενεργοποίηση 2FA
         disable_custom_emoji: Απενεργοποίηση Προσαρμοσμένων Emoji
-        disable_sign_in_token_auth_user: Απενεργοποίηση Ελέγχου Ταυτότητας Μέσω E-mail για το Χρήστη
         disable_user: Απενεργοποίηση Χρήστη
         enable_custom_emoji: Ενεργοποίηση Προσαρμοσμένων Emoji
-        enable_sign_in_token_auth_user: Ενεργοποίηση Ελέγχου Ταυτότητας Μέσω E-mail για το Χρήστη
         enable_user: Ενεργοποίηση Χρήστη
         memorialize_account: Μετατροπή Λογαριασμού σε Εις Μνήμην
         promote_user: Προαγωγή Χρήστη
@@ -233,26 +222,20 @@ el:
         approve_appeal_html: Ο/Η %{name} ενέκρινε την ένσταση της απόφασης των συντονιστών από %{target}
         approve_user_html: ο/η %{name} ενέκρινε την εγγραφή του %{target}
         assigned_to_self_report_html: Ο/Η %{name} ανάθεσε την αναφορά %{target} στον εαυτό του/της
-        change_email_user_html: Ο/Η %{name} άλλαξε τη διεύθυνση email του χρήστη %{target}
         change_role_user_html: Ο/Η %{name} άλλαξε ρόλο του/της %{target}
-        confirm_user_html: Ο/Η %{name} επιβεβαίωσε τη διεύθυνση email του χρήστη %{target}
         create_account_warning_html: Ο/Η %{name} έστειλε προειδοποίηση προς %{target}
         create_announcement_html: Ο/Η %{name} δημιούργησε νέα ανακοίνωση %{target}
-        create_canonical_email_block_html: Ο/Η %{name} απέκλεισε e-mail με το hash %{target}
         create_custom_emoji_html: Ο/Η %{name} ανέβασε νέο emoji %{target}
         create_domain_allow_html: Ο/Η %{name} επέτρεψε την συναλλαγή με τον τομέα %{target}
         create_domain_block_html: Ο/Η %{name} απέκλεισε τον τομέα %{target}
-        create_email_domain_block_html: Ο/Η %{name} απέκλεισε τον τομέα email %{target}
         create_ip_block_html: Ο/Η %{name} δημιούργησε κανόνα για την IP %{target}
         create_unavailable_domain_html: Ο/Η %{name} σταμάτησε να τροφοδοτεί τον τομέα %{target}
         create_user_role_html: Ο/Η %{name} δημιούργησε ρόλο %{target}
         demote_user_html: Ο/Η %{name} υποβίβασε τον χρήστη %{target}
         destroy_announcement_html: Ο/Η %{name} διέγραψε την ανακοίνωση %{target}
-        destroy_canonical_email_block_html: Ο/Η %{name} επέτρεψε email με το hash %{target}
         destroy_custom_emoji_html: Ο/Η %{name} διέγραψε το emoji %{target}
         destroy_domain_allow_html: Ο/Η %{name} αφαίρεσε τον τομέα %{target} από τη λίστα εγκρίσεων
         destroy_domain_block_html: Ο/Η %{name} επέτρεψε τον τομέα %{target}
-        destroy_email_domain_block_html: Ο/Η %{name} ξεμπλόκαρε το email domain %{target}
         destroy_instance_html: Ο/Η %{name} εκκαθάρισε τον τομέα %{target}
         destroy_ip_block_html: Ο/Η %{name} διέγραψε τον κανόνα για την IP %{target}
         destroy_status_html: Ο/Η %{name} αφαίρεσε την ανάρτηση του/της %{target}
@@ -260,10 +243,8 @@ el:
         destroy_user_role_html: Ο/Η %{name} διέγραψε τον ρόλο του %{target}
         disable_2fa_user_html: Ο/Η %{name} απενεργοποίησε την απαίτηση για ταυτοποίηση δύο παραγόντων για τον χρήστη %{target}
         disable_custom_emoji_html: Ο/Η %{name} απενεργοποίησε το emoji %{target}
-        disable_sign_in_token_auth_user_html: Ο/Η %{name} απενεργοποίησε την ταυτοποίηση χαρακτηριστικού μέσω e-mail του %{target}
         disable_user_html: Ο/Η %{name} απενεργοποίησε τη σύνδεση για τον χρήστη %{target}
         enable_custom_emoji_html: Ο/Η %{name} ενεργοποίησε το emoji %{target}
-        enable_sign_in_token_auth_user_html: Ο/Η %{name} ενεργοποίησε την ταυτοποίηση χαρακτηριστικού μέσω e-mail του %{target}
         enable_user_html: Ο/Η %{name} ενεργοποίησε τη σύνδεση για τον χρήστη %{target}
         memorialize_account_html: O/H %{name} μετέτρεψε τον λογαριασμό του %{target} σε σελίδα εις μνήμην
         promote_user_html: Ο/Η %{name} προβίβασε το χρήστη %{target}
@@ -271,7 +252,6 @@ el:
         reject_user_html: ο/η %{name} απέρριψε την εγγραφή από %{target}
         remove_avatar_user_html: ο/η %{name} αφαίρεσε το άβαταρ του/της %{target}
         reopen_report_html: Ο/Η %{name} ξανάνοιξε την αναφορά %{target}
-        resend_user_html: Ο/Η %{name} έστειλε ξανά e-mail επιβεβαίωσης για τον/την %{target}
         reset_password_user_html: Ο/Η %{name} επανέφερε το συνθηματικό του χρήστη %{target}
         resolve_report_html: Ο/Η %{name} επέλυσε την αναφορά %{target}
         sensitive_account_html: Ο/Η %{name} επισήμανε τα πολυμέσα του/της %{target} ως ευαίσθητα
@@ -432,7 +412,6 @@ el:
       attempts_over_week:
         one: "%{count} προσπάθεια την τελευταία εβδομάδα"
         other: "%{count} προσπάθειες εγγραφής την τελευταία εβδομάδα"
-      created_msg: Επιτυχής αποκλεισμού email τομέα
       delete: Διαγραφή
       dns:
         types:
@@ -441,12 +420,8 @@ el:
       new:
         create: Προσθήκη τομέα
         resolve: Επίλυση τομέα
-        title: Αποκλεισμός νέου τομέα email
-      no_email_domain_block_selected: Δεν άλλαξαν οι αποκλεισμοί τομέα καθώς δεν επιλέχθηκε κανένας
       not_permitted: Δεν επιτρέπεται
-      resolved_dns_records_hint_html: Το όνομα τομέα επιλύεται στους ακόλουθους τομείς MX, οι οποίοι είναι τελικά υπεύθυνοι για την αποδοχή των e-mail. Αποκλείοντας έναν τομέα MX θα μπλοκάρει τις εγγραφές από οποιαδήποτε διεύθυνση email που χρησιμοποιεί τον ίδιο τομέα MX, ακόμη και αν το ορατό όνομα τομέα είναι διαφορετικό. <strong>Προσέξτε να μην αποκλείσετε τους μεγάλους παρόχους ηλεκτρονικού ταχυδρομείου.</strong>
       resolved_through_html: Επιλύθηκε μέσω %{domain}
-      title: Αποκλεισμένοι τομείς email
     export_domain_allows:
       new:
         title: Εισαγωγή επιτρεπόμενων τομέων
@@ -600,7 +575,6 @@ el:
         resolve_description_html: Δεν θα ληφθούν μέτρα κατά του αναφερόμενου λογαριασμού, δεν θα καταγραφεί κανένα παράπτωμα, και η αναφορά θα κλείσει.
         silence_description_html: Ο λογαριασμός θα είναι ορατός μόνο σε εκείνους που ήδη τον ακολουθούν ή τον αναζητούν χειροκίνητα, περιορίζοντας κατά πολύ την εμβέλειά του. Η ενέργεια αυτή είναι αναστρέψιμη. Κλείνει όλες τις αναφορές εναντίον αυτού του λογαριασμού.
         suspend_description_html: Ο λογαριασμός και όλο το περιεχόμενό του θα είναι απρόσιτα και τελικά θα διαγραφούν και η αλληλεπίδραση με αυτόν θα είναι αδύνατη. Αναστρέψιμη εντός 30 ημερών. Κλείνει όλες τις αναφορές εναντίον αυτού του λογαριασμού.
-      actions_description_html: Αποφάσισε ποια μέτρα θα ληφθούν για την επίλυση αυτής της αναφοράς. Εάν προβείς σε τιμωρητική ενέργεια κατά του αναφερόμενου λογαριασμού, θα αποσταλεί ειδοποίηση μέσω ηλεκτρονικού ταχυδρομείου σε αυτόν, εκτός όταν η κατηγορία <strong>Σπαμ</strong> είναι επιλεγμένη.
       actions_description_remote_html: Αποφάσισε ποια μέτρα θα ληφθούν για την επίλυση αυτής της αναφοράς. Αυτό θα επηρεάσει μόνο το πώς <strong>ο δικός σας</strong> διακομιστής επικοινωνεί με αυτόν τον απομακρυσμένο λογαριασμό και χειρίζεται το περιεχόμενό του.
       add_to_report: Πρόσθεσε περισσότερα στην αναφορά
       already_suspended_badges:
@@ -665,7 +639,6 @@ el:
         delete_data_html: Διάγραψε το προφίλ και το περιεχόμενο του <strong>@%{acct}</strong> σε 30 ημέρες από τώρα εκτός αν, εν τω μεταξύ, ανακληθεί η αναστολή
         preview_preamble_html: 'Ο <strong>@%{acct}</strong> θα λάβει μια προειδοποίηση με τα ακόλουθο περιεχόμενο:'
         record_strike_html: Κατάγραψε ένα παράπτωμα εναντίον του <strong>@%{acct}</strong> για να σε βοηθήσει να αποφασίσεις σε μελλοντικές παραβιάσεις από αυτόν τον λογαριασμό
-        send_email_html: Στείλε στον <strong>@%{acct}</strong> ένα προειδοποιητικό e-mail
         warning_placeholder: Προαιρετικές επιπλέον εξηγήσεις για αυτή την ενέργεια από την ομάδα συντονισμού.
       target_origin: Προέλευση του αναφερόμενου λογαριασμού
       title: Αναφορές
@@ -705,7 +678,6 @@ el:
         manage_appeals: Διαχείριση Εφέσεων
         manage_appeals_description: Επιτρέπει στους χρήστες να εξετάζουν τις εφέσεις κατά των ενεργειών της ομάδας συντονισμού
         manage_blocks: Διαχείριση Αποκλεισμών
-        manage_blocks_description: Επιτρέπει στους χρήστες να αποκλείουν παρόχους e-mail και διευθύνσεις IP
         manage_custom_emojis: Διαχείριση Προσαρμοσμένων Emojis
         manage_custom_emojis_description: Επιτρέπει στους χρήστες να διαχειρίζονται προσαρμοσμένα emojis στον διακομιστή
         manage_federation: Διαχείριση Συναλλαγών
@@ -723,7 +695,6 @@ el:
         manage_taxonomies: Διαχείριση Ταξινομιών
         manage_taxonomies_description: Επιτρέπει στους χρήστες να εξετάζουν το δημοφιλές περιεχόμενο και να ενημερώνουν τις ρυθμίσεις ετικέτας
         manage_user_access: Διαχείριση Πρόσβασης Χρήστη
-        manage_user_access_description: Επιτρέπει στους χρήστες να απενεργοποιούν την ταυτοποίηση δύο παραγόντων άλλων χρηστών, να αλλάξουν τη διεύθυνση ηλεκτρονικού ταχυδρομείου τους και να επαναφέρουν τον κωδικό πρόσβασής τους
         manage_users: Διαχείριση Χρηστών
         manage_users_description: Επιτρέπει στους χρήστες να βλέπουν τις λεπτομέρειες άλλων χρηστών και να εκτελούν ενέργειες συντονισμού εναντίον τους
         manage_webhooks: Διαχείριση Webhooks
@@ -798,7 +769,6 @@ el:
       destroyed_msg: Η μεταφόρτωση ιστότοπου διαγράφηκε επιτυχώς!
     software_updates:
       critical_update: Κρίσιμο - παρακαλώ ενημέρωσε γρήγορα
-      description: Συνιστάται να διατηρείς την εγκατάσταση του Mastodon ενημερωμένη για να επωφεληθείς από τις πιο πρόσφατες διορθώσεις και δυνατότητες. Επιπλέον, μερικές φορές είναι κρίσιμο να ενημερώσεις το Mastodon εγκαίρως για να αποφύγεις προβλήματα ασφαλείας. Για αυτούς τους λόγους, το Mastodon ελέγχει για ενημερώσεις κάθε 30 λεπτά και θα σας ειδοποιεί σύμφωνα με τις προτιμήσεις ειδοποίησης μέσω email.
       documentation_link: Μάθε περισσότερα
       release_notes: Σημειώσεις έκδοσης
       title: Διαθέσιμες ενημερώσεις
@@ -892,7 +862,16 @@ el:
         review_requested: Αιτήθηκε αξιολόγηση
         reviewed: Αξιολογήθηκε
         title: Κατάσταση
+        trendable: Πιθανό για τάσεις
+        unreviewed: Μη ελεγμένη
+        usable: Χρησιμοποιήσιμο
+      name: Όνομα
+      newest: Νεότερη όλων
+      oldest: Παλαιότερη όλων
+      reset: Επαναφορά
       review: Κατάσταση αξιολόγησης
+      search: Αναζήτηση
+      title: Ετικέτες
       updated_msg: Οι ρυθμίσεις των ετικετών ενημερώθηκαν επιτυχώς
     title: Διαχείριση
     trends:
@@ -957,13 +936,13 @@ el:
         used_by_over_week:
           one: Χρησιμοποιήθηκε από ένα άτομο την τελευταία εβδομάδα
           other: Χρησιμοποιήθηκε από %{count} άτομα την τελευταία εβδομάδα
-      title: Τάσεις
       trending: Τάσεις
     warning_presets:
       add_new: Πρόσθεση νέου
       delete: Διαγραφή
       edit_preset: Ενημέρωση προκαθορισμένης προειδοποίησης
       empty: Δεν έχετε ακόμη ορίσει κάποια προκαθορισμένη προειδοποίηση.
+      title: Προεπιλογές προειδοποίησης
     webhooks:
       add_new: Προσθήκη σημείου τερματισμού
       delete: Διαγραφή
@@ -985,6 +964,9 @@ el:
       title: Webhooks
       webhook: Webhook
   admin_mailer:
+    auto_close_registrations:
+      body: Λόγω έλλειψης πρόσφατης δραστηριότητας συντονιστών, οι εγγραφές στο %{instance} έχουν αλλάξει αυτόματα στην απαίτηση χειροκίνητης αξιολόγησης, για να αποτρέψει το %{instance} από το να χρησιμοποιηθεί ως πλατφόρμα για πιθανούς κακούς ηθοποιούς. Μπορείς να το αλλάξεις ξανά για να ανοίξετε εγγραφές ανά πάσα στιγμή.
+      subject: Οι εγγραφές για το %{instance} έχουν αλλάξει αυτόματα σε απαίτηση έγκρισης
     new_appeal:
       actions:
         delete_statuses: διαγραφή των αναρτήσεών του
@@ -997,6 +979,9 @@ el:
       body: 'Ο/Η %{target} κάνει έφεση στην απόφαση συντονισμού που έγινε από τον/την %{action_taken_by} στις %{date}, η οποία ήταν %{type}. Έγραψαν:'
       next_steps: Μπορείς να εγκρίνεις την έφεση για να αναιρέσεις την απόφαση της ομάδας συντονισμού ή να την αγνοήσεις.
       subject: Ο/Η %{username} κάνει έφεση σε μια απόφαση της ομάδας συντονισμού στον %{instance}
+    new_critical_software_updates:
+      body: Έχουν κυκλοφορήσει νέες κρίσιμες εκδόσεις του Mastodon, καλύτερα να ενημερώσεις το συντομότερο δυνατόν!
+      subject: Κρίσιμες ενημερώσεις Mastodon είναι διαθέσιμες για το %{instance}!
     new_pending_account:
       body: Τα στοιχεία του νέου λογαριασμού είναι παρακάτω. Μπορείς να εγκρίνεις ή να απορρίψεις αυτή την αίτηση.
       subject: Νέος λογαριασμός προς έγκριση στο %{instance} (%{username})
@@ -1004,6 +989,9 @@ el:
       body: Ο/Η %{reporter} ανέφερε τον/την %{target}
       body_remote: Κάποιος/α από τον τομέα %{domain} ανέφερε τον/την %{target}
       subject: Νέα αναφορά για %{instance} (#%{id})
+    new_software_updates:
+      body: Έχουν κυκλοφορήσει νέες εκδόσεις Mastodon, ίσως θέλεις να ενημερώσεις!
+      subject: Νέες εκδόσεις Mastodon είναι διαθέσιμες για το %{instance}!
     new_trends:
       body: 'Τα ακόλουθα στοιχεία χρειάζονται αξιολόγηση για να μπορούν να προβληθούν δημόσια:'
       new_trending_links:
@@ -1032,9 +1020,7 @@ el:
       guide_link_text: Μπορεί να συνεισφέρει ο οποιοσδήποτε.
     sensitive_content: Ευαίσθητο περιεχόμενο
   application_mailer:
-    notification_preferences: Αλλαγή προτιμήσεων email
     salutation: "%{name},"
-    settings: 'Άλλαξε τις προτιμήσεις email: %{link}'
     unsubscribe: Κατάργηση εγγραφής
     view: 'Προβολή:'
     view_profile: Προβολή προφίλ
@@ -1050,9 +1036,17 @@ el:
   auth:
     apply_for_account: Ζήτα έναν λογαριασμό
     captcha_confirmation:
+      help_html: Εάν αντιμετωπίζεις προβλήματα με την επίλυση του CAPTCHA, μπορείς να επικοινωνήσεις μαζί μας μέσω %{email} και μπορούμε να σε βοηθήσουμε.
+      hint_html: Και κάτι ακόμα! Πρέπει να επιβεβαιώσουμε ότι είσαι άνθρωπος (αυτό γίνεται για να κρατήσουμε μακριά το σπαμ!). Λύσε το CAPTCHA παρακάτω και κάνε κλικ "Συνέχεια".
       title: Ελεγχος ασφαλείας
     confirmations:
-      wrong_email_hint: Εάν αυτή η διεύθυνση email δεν είναι σωστή, μπορείς να την αλλάξεις στις ρυθμίσεις λογαριασμού.
+      awaiting_review_title: Η εγγραφή σου εξετάζεται
+      clicking_this_link: κάνοντας κλικ σε αυτόν τον σύνδεσμο
+      login_link: σύνδεση
+      proceed_to_login_html: Τώρα μπορείς να προχωρήσεις στο %{login_link}.
+      redirect_to_app_html: Θα πρέπει να μεταφέρθηκες στην εφαρμογή <strong>%{app_name}</strong>. Αν αυτό δεν συμβεί, δοκιμάσε το %{clicking_this_link} ή επέστρεψε χειροκίνητα στην εφαρμογή.
+      registration_complete: Η εγγραφή σου στο %{domain} έχει πλέον ολοκληρωθεί!
+      welcome_title: Καλώς ήρθες, %{name}!
     delete_account: Διαγραφή λογαριασμού
     delete_account_html: Αν θέλεις να διαγράψεις το λογαριασμό σου, μπορείς <a href="%{path}">να συνεχίσεις εδώ</a>. Θα σου ζητηθεί επιβεβαίωση.
     description:
@@ -1073,7 +1067,6 @@ el:
     or_log_in_with: Ή συνδέσου με
     privacy_policy_agreement_html: Έχω διαβάσει και συμφωνώ με την <a href="%{privacy_policy_path}" target="_blank">πολιτική απορρήτου</a>
     progress:
-      confirm: Επιβεβαίωση email
       details: Τα στοιχεία σας
       review: Η αξιολόγησή μας
       rules: Αποδοχή κανόνων
@@ -1087,15 +1080,16 @@ el:
     rules:
       accept: Αποδοχή
       back: Πίσω
+      invited_by: 'Μπορείτε να συμμετάσχεις στο %{domain} χάρη στην πρόσκληση που έλαβες από:'
       preamble: Αυτά ορίζονται και επιβάλλονται από τους συντονιστές του%{domain}.
+      preamble_invited: Πριν συνεχίσεις, παρακαλώ δώσε προσοχή στους βασικούς κανόνες που έχουν οριστεί από τους συντονιστές του %{domain}.
       title: Ορισμένοι βασικοί κανόνες.
+      title_invited: Έχεις προσκληθεί.
     security: Ασφάλεια
     set_new_password: Ορισμός νέου συνθηματικού
     setup:
-      email_below_hint_html: Έλεγξε τον φάκελο ανεπιθύμητης αλληλογραφίας ή ζήτα καινούργιο. Μπορείς να διορθώσεις τη διεύθυνση email σου αν είναι λάθος.
       email_settings_hint_html: Πάτησε το σύνδεσμο που σου στείλαμε για να επαληθεύσεις το %{email}. Θα σε περιμένουμε εδώ.
       link_not_received: Δεν έλαβες τον σύνδεσμο;
-      new_confirmation_instructions_sent: Θα λάβεις ένα νέο e-mail με το σύνδεσμο επιβεβαίωσης σε λίγα λεπτά!
       title: Ελέγξτε τα εισερχόμενά σας
     sign_in:
       preamble_html: Συνδεθείτε με τα διαπιστευτήριά σας στον <strong>%{domain}</strong>. Αν ο λογαριασμός σας φιλοξενείται σε διαφορετικό διακομιστή, δε θα μπορείτε να συνδεθείτε εδώ.
@@ -1106,10 +1100,9 @@ el:
       title: Ας ξεκινήσουμε τις ρυθμίσεις στο %{domain}.
     status:
       account_status: Κατάσταση λογαριασμού
-      confirming: Αναμονή για ολοκλήρωση επιβεβαίωσης του email.
       functional: Ο λογαριασμός σας είναι πλήρως λειτουργικός.
-      pending: Η εφαρμογή σας εκκρεμεί έγκρισης, πιθανόν θα διαρκέσει κάποιο χρόνο. Θα λάβετε email αν εγκριθεί.
       redirecting_to: Ο λογαριασμός σου είναι ανενεργός γιατί επί του παρόντος ανακατευθύνει στον %{acct}.
+      self_destruct: Καθώς το %{domain} κλείνει, θα έχεις μόνο περιορισμένη πρόσβαση στον λογαριασμό σου.
       view_strikes: Προβολή προηγούμενων ποινών εναντίον του λογαριασμού σας
     too_fast: Η φόρμα υποβλήθηκε πολύ γρήγορα, προσπαθήστε ξανά.
     use_security_key: Χρήση κλειδιού ασφαλείας
@@ -1150,9 +1143,6 @@ el:
       before: 'Πριν συνεχίσεις, παρακαλούμε να διαβάσεις τις παρακάτω σημειώσεις προσεκτικά:'
       caches: Περιεχόμενο που έχει αποθηκευτεί προσωρινά σε άλλους διακομιστές ίσως παραμείνει
       data_removal: Οι αναρτήσεις σου και άλλα δεδομένα θα διαγραφούν οριστικά
-      email_change_html: Μπορείς να <a href="%{path}">αλλάξεις τη διεύθυνση email σου</a> χωρίς να διαγράψεις τον λογαριασμό σου
-      email_contact_html: Αν και πάλι δεν έρθει, μπορείς να στείλεις email προς <a href="mailto:%{email}">%{email}</a> για βοήθεια
-      email_reconfirmation_html: Αν δεν έχεις λάβει το email επιβεβαίωσης, μπορείς να το <a href="%{path}">ζητήσεις ξανά</a>
       irreversible: Δεν θα μπορείς να ανακτήσεις ή ενεργοποιήσεις ξανά το λογαριασμό σου
       more_details_html: Για περισσότερες πληροφορίες, δες την <a href="%{terms_path}">πολιτική απορρήτου</a>.
       username_available: Το όνομα χρήστη σου θα γίνει ξανά διαθέσιμο
@@ -1189,6 +1179,10 @@ el:
       your_appeal_rejected: Η έφεση σου απορρίφθηκε
   domain_validator:
     invalid_domain: δεν είναι έγκυρο όνομα τομέα
+  edit_profile:
+    basic_information: Βασικές πληροφορίες
+    hint_html: "<strong>Τροποποίησε τί βλέπουν άτομα στο δημόσιο προφίλ σου και δίπλα στις αναρτήσεις σου.</strong> Είναι πιο πιθανό κάποιος να σε ακολουθήσει πίσω και να αλληλεπιδράσουν μαζί σου αν έχεις ολοκληρωμένο προφίλ και εικόνα προφίλ."
+    other: Άλλο
   errors:
     '400': Το αίτημα ήταν άκυρο ή με λάθος μορφή.
     '403': Δεν έχεις δικαίωμα πρόσβασης σε αυτή τη σελίδα.
@@ -1296,25 +1290,44 @@ el:
   imports:
     errors:
       empty: Κενό αρχείο CSV
+      incompatible_type: Μη συμβατό με τον επιλεγμένο τύπο εισαγωγής
       invalid_csv_file: 'Μη έγκυρο αρχείο CSV. Σφάλμα: %{error}'
       over_rows_processing_limit: περιέχει περισσότερες από %{count} γραμμές
       too_large: Το αρχείο είναι πολύ μεγάλο
     failures: Αποτυχίες
+    imported: Εισήχθη
+    mismatched_types_warning: Φαίνεται ότι έχεις επιλέξει λάθος τύπο για αυτήν την εισαγωγή, παρακαλώ έλεγξε ξανά.
     modes:
       merge: Συγχώνευση
       merge_long: Διατήρηση των εγγράφων που υπάρχουν και προσθήκη των νέων
       overwrite: Αντικατάσταση
       overwrite_long: Αντικατάσταση των υπαρχόντων εγγράφων με τις καινούργιες
+    overwrite_preambles:
+      blocking_html: Πρόκειται να <strong>αντικαταστήσεις τη λίστα αποκλεισμών</strong> με έως και <strong>%{total_items} λογαριασμούς</strong> από το <strong>%{filename}</strong>.
+      bookmarks_html: Πρόκειται να <strong>αντικαταστήσεις τους σελιδοδείκτες σου</strong> με έως και <strong>%{total_items} αναρτήσεις</strong> από το <strong>%{filename}</strong>.
+      domain_blocking_html: Πρόκειται να <strong>αντικαταστήσεις τη λίστα αποκλεισμών τομέων</strong> με έως και <strong>%{total_items} τομείς</strong> από το <strong>%{filename}</strong>.
+      following_html: Πρόκειται να <strong>ακολουθήσεις</strong> μέχρι <strong>%{total_items} λογαριασμούς</strong> από το <strong>%{filename}</strong> και <strong>να σταματήσεις να ακολουθείς οποιονδήποτε άλλο</strong>.
+      lists_html: Πρόκειται να <strong>αντικαταστήσεις τις λίστες σου</strong> με περιεχόμενο του <strong>%{filename}</strong>. Μέχρι <strong>%{total_items} λογαριασμοί</strong> θα προστεθούν σε νέες λίστες.
+      muting_html: Πρόκειται να <strong>αντικαταστήσεις τη λίστα λογαριασμών σε σίγαση</strong> με έως και <strong>%{total_items} λογαριασμούς</strong> από το <strong>%{filename}</strong>.
+    preambles:
+      blocking_html: Πρόκειται να <strong>αποκλείσεις</strong> έως και <strong>%{total_items} λογαριασμούς</strong> από το <strong>%{filename}</strong>.
+      bookmarks_html: Πρόκειται να προσθέσεις μέχρι και <strong>%{total_items} αναρτήσεις</strong> από το <strong>%{filename}</strong> στους <strong>σελιδοδείκτες</strong> σου.
+      domain_blocking_html: Πρόκειται να <strong>αποκλείσεις</strong> έως και <strong>%{total_items} τομείς</strong> από το <strong>%{filename}</strong>.
+      following_html: Πρόκειται να <strong>ακολουθήσεις</strong> έως και <strong>%{total_items} λογαριασμούς</strong> από το <strong>%{filename}</strong>.
+      lists_html: Πρόκειται να προσθέσεις μέχρι και <strong>%{total_items} λογαριασμούς</strong> από το <strong>%{filename}</strong> στις <strong>λίστες</strong> σου. Θα δημιουργηθούν νέες λίστες αν δεν υπάρχει λίστα για προσθήκη.
+      muting_html: Πρόκειται να <strong>κάνεις σίγαση</strong> σε έως και <strong>%{total_items} λογαριασμούς</strong> από το <strong>%{filename}</strong>.
     preface: Μπορείς να εισάγεις τα δεδομένα που έχεις εξάγει από άλλο διακομιστή, όπως τη λίστα των ατόμων που ακολουθείς ή έχεις αποκλείσει.
     recent_imports: Πρόσφατες Εισαγωγές
     states:
       finished: Ολοκληρώθηκε
       in_progress: Σε εξέλιξη
       scheduled: Προγραμματισμένη
+      unconfirmed: Μη επιβεβαιωμένη
     status: Κατάσταση
     success: Τα δεδομένα σου μεταφορτώθηκαν επιτυχώς και θα επεξεργαστούν σύντομα
     time_started: Ξεκίνησε στις
     titles:
+      blocking: Εισαγωγή αποκλεισμένων λογαριασμών
       following: Εισαγωγή λογαριασμών που ακολουθείτε
     type: Τύπος εισαγωγής
     type_groups:
@@ -1355,7 +1368,6 @@ el:
     authentication_methods:
       otp: εφαρμογή ταυτοποίησης δύο παραγόντων
       password: συνθηματικό
-      sign_in_token: κωδικός ασφαλείας e-mail
       webauthn: κλειδιά ασφαλείας
     description_html: Αν δεις δραστηριότητα που δεν αναγνωρίζεις, σκεφτείς να αλλάξεις τον κωδικό πρόσβασής σου και να ενεργοποιήσεις τον έλεγχο ταυτότητας δύο παραγόντων.
     empty: Δεν υπάρχει διαθέσιμο ιστορικό ελέγχου ταυτότητας
@@ -1441,7 +1453,6 @@ el:
     update:
       subject: "%{name} επεξεργάστηκε μια ανάρτηση"
   notifications:
-    email_events: Συμβάντα για ειδοποιήσεις μέσω email
     email_events_hint: 'Επέλεξε συμβάντα για τα οποία θέλεις να λαμβάνεις ειδοποιήσεις μέσω email:'
   number:
     human:
@@ -1721,6 +1732,9 @@ el:
       extra: Είναι τώρα έτοιμο για λήψη!
       subject: Το αρχείο σου είναι έτοιμο για λήψη
       title: Λήψη εφεδρικού αρχείου
+    failed_2fa:
+      subject: Αποτυχία ταυτοποίησης δεύτερου παράγοντα
+      title: Αποτυχία ελέγχου ταυτότητας δεύτερου παράγοντα
     suspicious_sign_in:
       change_password: άλλαξε τον κωδικό πρόσβασής σου
       details: 'Εδώ είναι οι λεπτομέρειες της σύνδεσης:'
@@ -1760,7 +1774,19 @@ el:
         silence: Περιορισμένος λογαριασμός
         suspend: Λογαριασμός σε αναστολή
     welcome:
+      apps_android_action: Απόκτησέ το στο Google Play
+      apps_ios_action: Λήψη από το AppStore
+      apps_step: Κατεβάστε τις επίσημες εφαρμογές μας.
+      apps_title: Εφαρμογές Mastodon
+      checklist_subtitle: 'Ας ξεκινήσουμε σε αυτό το νέο κοινωνικό σύνορο:'
+      checklist_title: Λίστα Καλωσορίσματος
+      edit_profile_action: Εξατομίκευση
+      edit_profile_step: Ενίσχυσε τις αλληλεπιδράσεις σου έχοντας ένα ολοκληρωμένο προφίλ.
+      edit_profile_title: Εξατομίκευση του προφίλ σου
       explanation: Μερικές συμβουλές για να ξεκινήσεις
+      feature_action: Μάθε περισσότερα
+      feature_audience: Το Mastodon σού παρέχει μια μοναδική δυνατότητα διαχείρισης του κοινού σου χωρίς μεσάζοντες. Το Mastodon όταν αναπτύσσεται στη δική σου υποδομή σού επιτρέπει να ακολουθείς και να ακολουθείσαι από οποιονδήποτε άλλο συνδεδεμένο διακομιστή Mastodon και κανείς δεν τον ελέγχει, εκτός από σένα.
+      feature_audience_title: Χτίσε το κοινό σου με σιγουριά
       subject: Καλώς ήρθες στο Mastodon
       title: Καλώς όρισες, %{name}!
   users:
@@ -1768,7 +1794,6 @@ el:
     go_to_sso_account_settings: Πήγαινε στις ρυθμίσεις λογαριασμού του παρόχου ταυτότητας σου
     invalid_otp_token: Άκυρος κωδικός πιστοποίησης 2 παραγόντων
     otp_lost_help_html: Αν χάσεις πρόσβαση και στα δύο, μπορείς να επικοινωνήσεις με %{email}
-    seamless_external_login: Επειδή έχεις συνδεθεί μέσω τρίτης υπηρεσίας, οι ρυθμίσεις συνθηματικού και email δεν είναι διαθέσιμες.
     signed_in_as: 'Έχεις συνδεθεί ως:'
   verification:
     verification: Πιστοποίηση
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index a7e6ed7a665e61..61dd5d9b38f685 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -31,7 +31,6 @@ en-GB:
       created_msg: Moderation note successfully created!
       destroyed_msg: Moderation note successfully destroyed!
     accounts:
-      add_email_domain_block: Block e-mail domain
       approve: Approve
       approved_msg: Successfully approved %{username}'s sign-up application
       are_you_sure: Are you sure?
@@ -58,7 +57,6 @@ en-GB:
       demote: Demote
       destroyed_msg: "%{username}'s data is now queued to be deleted imminently"
       disable: Freeze
-      disable_sign_in_token_auth: Disable e-mail token authentication
       disable_two_factor_authentication: Disable 2FA
       disabled: Frozen
       display_name: Display name
@@ -67,7 +65,6 @@ en-GB:
       email: Email
       email_status: Email status
       enable: Unfreeze
-      enable_sign_in_token_auth: Enable e-mail token authentication
       enabled: Enabled
       enabled_msg: Successfully unfroze %{username}'s account
       followers: Followers
@@ -132,7 +129,6 @@ en-GB:
       resubscribe: Resubscribe
       role: Role
       search: Search
-      search_same_email_domain: Other users with the same e-mail domain
       search_same_ip: Other users with the same IP
       security: Security
       security_measures:
@@ -173,26 +169,21 @@ en-GB:
         approve_appeal: Approve Appeal
         approve_user: Approve User
         assigned_to_self_report: Assign Report
-        change_email_user: Change E-mail for User
         change_role_user: Change Role of User
         confirm_user: Confirm User
         create_account_warning: Create Warning
         create_announcement: Create Announcement
-        create_canonical_email_block: Create E-mail Block
         create_custom_emoji: Create Custom Emoji
         create_domain_allow: Create Domain Allow
         create_domain_block: Create Domain Block
-        create_email_domain_block: Create E-mail Domain Block
         create_ip_block: Create IP rule
         create_unavailable_domain: Create Unavailable Domain
         create_user_role: Create Role
         demote_user: Demote User
         destroy_announcement: Delete Announcement
-        destroy_canonical_email_block: Delete E-mail Block
         destroy_custom_emoji: Delete Custom Emoji
         destroy_domain_allow: Delete Domain Allow
         destroy_domain_block: Delete Domain Block
-        destroy_email_domain_block: Delete E-mail Domain Block
         destroy_instance: Purge Domain
         destroy_ip_block: Delete IP rule
         destroy_status: Delete Post
@@ -200,10 +191,8 @@ en-GB:
         destroy_user_role: Destroy Role
         disable_2fa_user: Disable 2FA
         disable_custom_emoji: Disable Custom Emoji
-        disable_sign_in_token_auth_user: Disable E-mail Token Authentication for User
         disable_user: Disable User
         enable_custom_emoji: Enable Custom Emoji
-        enable_sign_in_token_auth_user: Enable E-mail Token Authentication for User
         enable_user: Enable User
         memorialize_account: Memorialise Account
         promote_user: Promote User
@@ -233,26 +222,20 @@ en-GB:
         approve_appeal_html: "%{name} approved moderation decision appeal from %{target}"
         approve_user_html: "%{name} approved sign-up from %{target}"
         assigned_to_self_report_html: "%{name} assigned report %{target} to themselves"
-        change_email_user_html: "%{name} changed the e-mail address of user %{target}"
         change_role_user_html: "%{name} changed role of %{target}"
-        confirm_user_html: "%{name} confirmed e-mail address of user %{target}"
         create_account_warning_html: "%{name} sent a warning to %{target}"
         create_announcement_html: "%{name} created new announcement %{target}"
-        create_canonical_email_block_html: "%{name} blocked e-mail with the hash %{target}"
         create_custom_emoji_html: "%{name} uploaded new emoji %{target}"
         create_domain_allow_html: "%{name} allowed federation with domain %{target}"
         create_domain_block_html: "%{name} blocked domain %{target}"
-        create_email_domain_block_html: "%{name} blocked e-mail domain %{target}"
         create_ip_block_html: "%{name} created rule for IP %{target}"
         create_unavailable_domain_html: "%{name} stopped delivery to domain %{target}"
         create_user_role_html: "%{name} created %{target} role"
         demote_user_html: "%{name} demoted user %{target}"
         destroy_announcement_html: "%{name} deleted announcement %{target}"
-        destroy_canonical_email_block_html: "%{name} unblocked e-mail with the hash %{target}"
         destroy_custom_emoji_html: "%{name} deleted emoji %{target}"
         destroy_domain_allow_html: "%{name} disallowed federation with domain %{target}"
         destroy_domain_block_html: "%{name} unblocked domain %{target}"
-        destroy_email_domain_block_html: "%{name} unblocked e-mail domain %{target}"
         destroy_instance_html: "%{name} purged domain %{target}"
         destroy_ip_block_html: "%{name} deleted rule for IP %{target}"
         destroy_status_html: "%{name} removed post by %{target}"
@@ -260,10 +243,8 @@ en-GB:
         destroy_user_role_html: "%{name} deleted %{target} role"
         disable_2fa_user_html: "%{name} disabled two factor requirement for user %{target}"
         disable_custom_emoji_html: "%{name} disabled emoji %{target}"
-        disable_sign_in_token_auth_user_html: "%{name} disabled e-mail token authentication for %{target}"
         disable_user_html: "%{name} disabled login for user %{target}"
         enable_custom_emoji_html: "%{name} enabled emoji %{target}"
-        enable_sign_in_token_auth_user_html: "%{name} enabled e-mail token authentication for %{target}"
         enable_user_html: "%{name} enabled login for user %{target}"
         memorialize_account_html: "%{name} turned %{target}'s account into a memoriam page"
         promote_user_html: "%{name} promoted user %{target}"
@@ -271,7 +252,6 @@ en-GB:
         reject_user_html: "%{name} rejected sign-up from %{target}"
         remove_avatar_user_html: "%{name} removed %{target}'s avatar"
         reopen_report_html: "%{name} reopened report %{target}"
-        resend_user_html: "%{name} resent confirmation e-mail for %{target}"
         reset_password_user_html: "%{name} reset password of user %{target}"
         resolve_report_html: "%{name} resolved report %{target}"
         sensitive_account_html: "%{name} marked %{target}'s media as sensitive"
@@ -432,7 +412,6 @@ en-GB:
       attempts_over_week:
         one: "%{count} attempt over the last week"
         other: "%{count} sign-up attempts over the last week"
-      created_msg: Successfully blocked e-mail domain
       delete: Delete
       dns:
         types:
@@ -441,12 +420,8 @@ en-GB:
       new:
         create: Add domain
         resolve: Resolve domain
-        title: Block new e-mail domain
-      no_email_domain_block_selected: No e-mail domain blocks were changed as none were selected
       not_permitted: Not permitted
-      resolved_dns_records_hint_html: The domain name resolves to the following MX domains, which are ultimately responsible for accepting e-mail. Blocking an MX domain will block sign-ups from any e-mail address which uses the same MX domain, even if the visible domain name is different. <strong>Be careful not to block major e-mail providers.</strong>
       resolved_through_html: Resolved through %{domain}
-      title: Blocked e-mail domains
     export_domain_allows:
       new:
         title: Import domain allows
@@ -600,7 +575,6 @@ en-GB:
         resolve_description_html: No action will be taken against the reported account, no strike recorded, and the report will be closed.
         silence_description_html: The account will be visible only to those who already follow it or manually look it up, severely limiting its reach. Can always be reverted. Closes all reports against this account.
         suspend_description_html: The account and all its contents will be inaccessible and eventually deleted, and interacting with it will be impossible. Reversible within 30 days. Closes all reports against this account.
-      actions_description_html: Decide which action to take to resolve this report. If you take a punitive action against the reported account, an e-mail notification will be sent to them, except when the <strong>Spam</strong> category is selected.
       actions_description_remote_html: Decide which action to take to resolve this report. This will only affect how <strong>your</strong> server communicates with this remote account and handle its content.
       add_to_report: Add more to report
       already_suspended_badges:
@@ -665,7 +639,6 @@ en-GB:
         delete_data_html: Delete <strong>@%{acct}</strong>'s profile and contents 30 days from now unless they get unsuspended in the meantime
         preview_preamble_html: "<strong>@%{acct}</strong> will receive a warning with the following contents:"
         record_strike_html: Record a strike against <strong>@%{acct}</strong> to help you escalate on future violations from this account
-        send_email_html: Send <strong>@%{acct}</strong> a warning e-mail
         warning_placeholder: Optional additional reasoning for the moderation action.
       target_origin: Origin of reported account
       title: Reports
@@ -705,7 +678,6 @@ en-GB:
         manage_appeals: Manage Appeals
         manage_appeals_description: Allows users to review appeals against moderation actions
         manage_blocks: Manage Blocks
-        manage_blocks_description: Allows users to block e-mail providers and IP addresses
         manage_custom_emojis: Manage Custom Emojis
         manage_custom_emojis_description: Allows users to manage custom emojis on the server
         manage_federation: Manage Federation
@@ -723,7 +695,6 @@ en-GB:
         manage_taxonomies: Manage Taxonomies
         manage_taxonomies_description: Allows users to review trending content and update hashtag settings
         manage_user_access: Manage User Access
-        manage_user_access_description: Allows users to disable other users' two-factor authentication, change their e-mail address, and reset their password
         manage_users: Manage Users
         manage_users_description: Allows users to view other users' details and perform moderation actions against them
         manage_webhooks: Manage Webhooks
@@ -798,7 +769,6 @@ en-GB:
       destroyed_msg: Site upload successfully deleted!
     software_updates:
       critical_update: Critical — please update quickly
-      description: It is recommended to keep your Mastodon installation up to date to benefit from the latest fixes and features. Moreover, it is sometimes critical to update Mastodon in a timely manner to avoid security issues. For these reasons, Mastodon checks for updates every 30 minutes, and will notify you according to your e-mail notification preferences.
       documentation_link: Learn more
       release_notes: Release notes
       title: Available updates
@@ -950,7 +920,6 @@ en-GB:
         used_by_over_week:
           one: Used by one person over the last week
           other: Used by %{count} people over the last week
-      title: Trends
       trending: Trending
     warning_presets:
       add_new: Add new
@@ -1035,9 +1004,7 @@ en-GB:
       guide_link_text: Everyone can contribute.
     sensitive_content: Sensitive content
   application_mailer:
-    notification_preferences: Change e-mail preferences
     salutation: "%{name},"
-    settings: 'Change e-mail preferences: %{link}'
     unsubscribe: Unsubscribe
     view: 'View:'
     view_profile: View profile
@@ -1057,7 +1024,6 @@ en-GB:
       hint_html: Just one more thing! We need to confirm you're a human (this is so we can keep the spam out!). Solve the CAPTCHA below and click "Continue".
       title: Security check
     confirmations:
-      awaiting_review: Your e-mail address is confirmed! The %{domain} staff is now reviewing your registration. You will receive an e-mail if they approve your account!
       awaiting_review_title: Your registration is being reviewed
       clicking_this_link: clicking this link
       login_link: log in
@@ -1065,7 +1031,6 @@ en-GB:
       redirect_to_app_html: You should have been redirected to the <strong>%{app_name}</strong> app. If that did not happen, try %{clicking_this_link} or manually return to the app.
       registration_complete: Your registration on %{domain} is now complete!
       welcome_title: Welcome, %{name}!
-      wrong_email_hint: If that e-mail address is not correct, you can change it in account settings.
     delete_account: Delete account
     delete_account_html: If you wish to delete your account, you can <a href="%{path}">proceed here</a>. You will be asked for confirmation.
     description:
@@ -1086,7 +1051,6 @@ en-GB:
     or_log_in_with: Or log in with
     privacy_policy_agreement_html: I have read and agree to the <a href="%{privacy_policy_path}" target="_blank">privacy policy</a>
     progress:
-      confirm: Confirm e-mail
       details: Your details
       review: Our review
       rules: Accept rules
@@ -1108,10 +1072,8 @@ en-GB:
     security: Security
     set_new_password: Set new password
     setup:
-      email_below_hint_html: Check your spam folder, or request another one. You can correct your e-mail address if it's wrong.
       email_settings_hint_html: Click the link we sent you to verify %{email}. We'll wait right here.
       link_not_received: Didn't get a link?
-      new_confirmation_instructions_sent: You will receive a new e-mail with the confirmation link in a few minutes!
       title: Check your inbox
     sign_in:
       preamble_html: Log in with your <strong>%{domain}</strong> credentials. If your account is hosted on a different server, you will not be able to log in here.
@@ -1122,9 +1084,7 @@ en-GB:
       title: Let's get you set up on %{domain}.
     status:
       account_status: Account status
-      confirming: Waiting for e-mail confirmation to be completed.
       functional: Your account is fully operational.
-      pending: Your application is pending review by our staff. This may take some time. You will receive an e-mail if your application is approved.
       redirecting_to: Your account is inactive because it is currently redirecting to %{acct}.
       self_destruct: As %{domain} is closing down, you will only get limited access to your account.
       view_strikes: View past strikes against your account
@@ -1167,9 +1127,6 @@ en-GB:
       before: 'Before proceeding, please read these notes carefully:'
       caches: Content that has been cached by other servers may persist
       data_removal: Your posts and other data will be permanently removed
-      email_change_html: You can <a href="%{path}">change your e-mail address</a> without deleting your account
-      email_contact_html: If it still doesn't arrive, you can e-mail <a href="mailto:%{email}">%{email}</a> for help
-      email_reconfirmation_html: If you are not receiving the confirmation e-mail, you can <a href="%{path}">request it again</a>
       irreversible: You will not be able to restore or reactivate your account
       more_details_html: For more details, see the <a href="%{terms_path}">privacy policy</a>.
       username_available: Your username will become available again
@@ -1402,7 +1359,6 @@ en-GB:
     authentication_methods:
       otp: two-factor authentication app
       password: password
-      sign_in_token: e-mail security code
       webauthn: security keys
     description_html: If you see activity that you don't recognise, consider changing your password and enabling two-factor authentication.
     empty: No authentication history available
@@ -1413,16 +1369,6 @@ en-GB:
     unsubscribe:
       action: Yes, unsubscribe
       complete: Unsubscribed
-      confirmation_html: Are you sure you want to unsubscribe from receiving %{type} for Mastodon on %{domain} to your e-mail at %{email}? You can always re-subscribe from your <a href="%{settings_path}">e-mail notification settings</a>.
-      emails:
-        notification_emails:
-          favourite: favourite notification e-mails
-          follow: follow notification e-mails
-          follow_request: follow request e-mails
-          mention: mention notification e-mails
-          reblog: boost notification e-mails
-      resubscribe_html: If you've unsubscribed by mistake, you can re-subscribe from your <a href="%{settings_path}">e-mail notification settings</a>.
-      success_html: You'll no longer receive %{type} for Mastodon on %{domain} to your e-mail at %{email}.
       title: Unsubscribe
   media_attachments:
     validations:
@@ -1503,8 +1449,6 @@ en-GB:
     update:
       subject: "%{name} edited a post"
   notifications:
-    administration_emails: Admin e-mail notifications
-    email_events: Events for e-mail notifications
     email_events_hint: 'Select events that you want to receive notifications for:'
   number:
     human:
@@ -1663,7 +1607,6 @@ en-GB:
     import: Import
     import_and_export: Import and export
     migrate: Account migration
-    notifications: E-mail notifications
     preferences: Preferences
     profile: Profile
     relationships: Follows and followers
@@ -1910,7 +1853,6 @@ en-GB:
     invalid_otp_token: Invalid two-factor code
     otp_lost_help_html: If you lost access to both, you may get in touch with %{email}
     rate_limited: Too many authentication attempts, try again later.
-    seamless_external_login: You are logged in via an external service, so password and e-mail settings are not available.
     signed_in_as: 'Logged in as:'
   verification:
     extra_instructions_html: <strong>Tip:</strong> The link on your website can be invisible. The important part is <code>rel="me"</code> which prevents impersonation on websites with user-generated content. You can even use a <code>link</code> tag in the header of the page instead of <code>a</code>, but the HTML must be accessible without executing JavaScript.
diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index 95e3dd5a8d9e03..85aa3a1f31af23 100644
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -31,7 +31,6 @@ eo:
       created_msg: Noto de moderigado sukcese kreita!
       destroyed_msg: Noto de moderigado sukcese detruita!
     accounts:
-      add_email_domain_block: Bloki retadresan domajnon
       approve: Aprobi
       approved_msg: Sukcese aprobis aliĝ-peton de %{username}
       are_you_sure: Ĉu vi certas?
@@ -58,7 +57,6 @@ eo:
       demote: Degradi
       destroyed_msg: Datumoj de %{username} nun enviciĝis por esti forigita baldaǔ
       disable: Frostigi
-      disable_sign_in_token_auth: Malŝalti aŭtentigon per retpoŝta ĵetono
       disable_two_factor_authentication: Malŝalti 2FA-n
       disabled: Frostigita
       display_name: Montrata nomo
@@ -67,7 +65,6 @@ eo:
       email: Retpoŝto
       email_status: Stato de retpoŝto
       enable: Malfrostigi
-      enable_sign_in_token_auth: Ŝalti aŭtentigon per retpoŝta ĵetono
       enabled: Ebligita
       enabled_msg: Sukcese malfrostigis konton de %{username}
       followers: Sekvantoj
@@ -132,7 +129,6 @@ eo:
       resubscribe: Reaboni
       role: Rolo
       search: Serĉi
-      search_same_email_domain: Aliaj uzantoj kun la sama domajno de retpoŝto
       search_same_ip: Aliaj uzantoj kun la sama IP
       security: Sekureco
       security_measures:
@@ -173,26 +169,21 @@ eo:
         approve_appeal: Aprobis Apelacion
         approve_user: Aprobi Uzanton
         assigned_to_self_report: Atribui Raporton
-        change_email_user: Ŝanĝi retpoŝton de uzanto
         change_role_user: Ŝanĝi Rolon de Uzanton
         confirm_user: Konfirmi uzanton
         create_account_warning: Krei averton
         create_announcement: Krei Anoncon
-        create_canonical_email_block: Krei Blokadon de Retpoŝto
         create_custom_emoji: Krei Propran Emoĝion
         create_domain_allow: Krei Domajnan Permeson
         create_domain_block: Krei Blokadon De Domajno
-        create_email_domain_block: Krei Blokadon De Retpoŝta Domajno
         create_ip_block: Krei IP-regulon
         create_unavailable_domain: Krei Nehaveblan Domajnon
         create_user_role: Krei Rolon
         demote_user: Malpromocii Uzanton
         destroy_announcement: Forigi Anoncon
-        destroy_canonical_email_block: Forigi blokadon de retpoŝta adreso
         destroy_custom_emoji: Forigi Propran Emoĝion
         destroy_domain_allow: Forigi Domajnan Permeson
         destroy_domain_block: Forigi blokadon de domajno
-        destroy_email_domain_block: Forigi blokadon de retpoŝta domajno
         destroy_instance: Forigi Domajnon
         destroy_ip_block: Forigi IP-regulon
         destroy_status: Forigi Afiŝon
@@ -200,10 +191,8 @@ eo:
         destroy_user_role: Detrui Rolon
         disable_2fa_user: Malebligi 2FA
         disable_custom_emoji: Malebligi proprajn emoĝiojn
-        disable_sign_in_token_auth_user: Malŝalti aŭtentigon per retpoŝta ĵetono por la uzanto
         disable_user: Neebligi la uzanton
         enable_custom_emoji: Ebligi Propran Emoĝion
-        enable_sign_in_token_auth_user: Ŝalti aŭtentigon per retpoŝta ĵetono por la uzanto
         enable_user: Ebligi uzanton
         memorialize_account: Memorigu Konton
         promote_user: Promocii Uzanton
@@ -232,26 +221,20 @@ eo:
         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_canonical_email_block_html: "%{name} blokis retpoŝtadreson per krado %{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}"
         demote_user_html: "%{name} degradis uzanton %{target}"
         destroy_announcement_html: "%{name} forigis anoncon %{target}"
-        destroy_canonical_email_block_html: "%{name} malblokis retpoŝtadreson per krado %{target}"
         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}"
@@ -259,10 +242,8 @@ eo:
         destroy_user_role_html: "%{name} forigis rolon de %{target}"
         disable_2fa_user_html: "%{name} malebligis dufaktoran aŭtentigon por uzanto %{target}"
         disable_custom_emoji_html: "%{name} malebligis la emoĝion %{target}"
-        disable_sign_in_token_auth_user_html: "%{name} malŝaltis la aŭtentigon de retpoŝta ĵetono por %{target}"
         disable_user_html: "%{name} malebligis ensaluton por uzanto %{target}"
         enable_custom_emoji_html: "%{name} ebligis la emoĝion %{target}"
-        enable_sign_in_token_auth_user_html: "%{name} ŝaltis la aŭtentigon de retpoŝta ĵetono por %{target}"
         enable_user_html: "%{name} ebligis ensaluton por uzanto %{target}"
         memorialize_account_html: "%{name} ŝanĝis la konton de %{target} al memora paĝo"
         promote_user_html: "%{name} plirangigis uzanton %{target}"
@@ -270,7 +251,6 @@ eo:
         reject_user_html: "%{name} malakceptis registriĝon de %{target}"
         remove_avatar_user_html: "%{name} forigis la profilbildon de %{target}"
         reopen_report_html: "%{name} remalfermis signalon %{target}"
-        resend_user_html: "%{name} resendis konfirman retmesaĝon por %{target}"
         reset_password_user_html: "%{name} restarigis la pasvorton de la uzanto %{target}"
         resolve_report_html: "%{name} solvis raporton %{target}"
         sensitive_account_html: "%{name} markis audovidaĵon de %{target} kiel tiklan"
@@ -429,7 +409,6 @@ eo:
       attempts_over_week:
         one: "%{count} provo ekde lasta semajno"
         other: "%{count} registroprovoj ekde lasta semajno"
-      created_msg: Retadreso sukcese aldonita al la nigra listo
       delete: Forigi
       dns:
         types:
@@ -438,12 +417,8 @@ eo:
       new:
         create: Aldoni domajnon
         resolve: Solvi domajnon
-        title: Nova blokado de retadresa domajno
-      no_email_domain_block_selected: Neniuj retpoŝtoadresodomajnblokoj ŝanĝitas ĉar nenio elektitas
       not_permitted: Ne permesita
-      resolved_dns_records_hint_html: La domajnnomo referencas al la MX-domajnoj kiuj akceptas retpoŝton. <strong>Ne bloku grandajn retpoŝtoservilojn.</strong>
       resolved_through_html: Solvis tra %{domain}
-      title: Nigra listo de retadresaj domajnoj
     export_domain_allows:
       new:
         title: Importi domajnpermesojn
@@ -593,7 +568,6 @@ eo:
         resolve_description_html: Nenio okazotas al la raportita konto kaj la raporto fermotas.
         silence_description_html: La konto estos videbla al nur personoj kiu jam sekvis ĝin au permane serĉo ĝin, ege limigante ĝian atingon. Malfermi ciujn raportojn kontra ĉi tiun konton.
         suspend_description_html: La konto kaj ciuj ĝiaj enhavoj estos neatingebla kaj poŝte forigitas, kaj interagi per ĝi estos neebla. Malfermi ciujn raportojn kontra ĉi tiu konto.
-      actions_description_html: Decidu kiu ago por solvi ĉi tiuj raporto. <strong>Spamo</strong> kategorio elektitas.
       actions_description_remote_html: Decidu kiun klopodon por solvi ĉi tiun raporton. Ĉi tiu efikas kiel nur <strong>via</strong> servilo komuniki per ĉi tiu fora konto kaj trakti ĝian enhavon.
       add_to_report: Aldoni pli al raporto
       are_you_sure: Ĉu vi certas?
@@ -653,7 +627,6 @@ eo:
         delete_data_html: Forigi profilon kaj enhavojn de <strong>@%{acct}</strong> post 30 tagoj se ili ne malsuspenditas dum la dauro
         preview_preamble_html: "<strong>@%{acct}</strong> akiros averton kun ĉi tiuj enhavoj:"
         record_strike_html: Rekordu admonon kontra <strong>@%{acct}</strong> por helpi vi plikontroli estontajn malobservojn de ĉi tiu konto
-        send_email_html: Sendi al <strong>@%{acct}</strong> retpoŝtaĵon de averto
         warning_placeholder: Nedeviga aldona kialo por la moderigadago.
       target_origin: Origino de raportita konto
       title: Signaloj
@@ -693,7 +666,6 @@ eo:
         manage_appeals: Administri Apelaciojn
         manage_appeals_description: Rajtigas al uzantoj kontroli apelaciojn kontraǔ kontrolaj agoj
         manage_blocks: Administri Blokojn
-        manage_blocks_description: Permesi uzantojn bloki retpoŝtoservilojn kaj IP-adresojn
         manage_custom_emojis: Administri propajn emoĝiojn
         manage_custom_emojis_description: Permesi uzantojn administri propajn emoĝiojn ĉe la servilo
         manage_federation: Administri Federacion
@@ -711,7 +683,6 @@ eo:
         manage_taxonomies: Administri kategoriarojn
         manage_taxonomies_description: Permesi uzantojn kontroli popularan enhavon kaj ĝisdatigi kradvortopciojn
         manage_user_access: Administri uzantoaliron
-        manage_user_access_description: Permesi uzantojn malebligi autentiko kaj retpoŝtodetalo de aliaj uzantoj
         manage_users: Administri uzantojn
         manage_users_description: Permesi uzantaojn vidi detalojn de aliaj uzantoj kaj administri ilin
         manage_webhooks: Administri rethokojn
@@ -912,7 +883,6 @@ eo:
         used_by_over_week:
           one: Uzita de 1 persono ekde lasta semajno
           other: Uzita de %{count} personoj ekde lasta semajno
-      title: Tendencoj
       trending: Popularaĵoj
     warning_presets:
       add_new: Aldoni novan
@@ -987,9 +957,7 @@ eo:
       guide_link_text: Ĉiu povas kontribui.
     sensitive_content: Tikla enhavo
   application_mailer:
-    notification_preferences: Ŝanĝi retmesaĝajn preferojn
     salutation: "%{name},"
-    settings: 'Ŝanĝi retmesaĝajn preferojn: %{link}'
     unsubscribe: Malabonu
     view: 'Vidi:'
     view_profile: Vidi profilon
@@ -1010,7 +978,6 @@ eo:
     confirmations:
       login_link: ensaluti
       welcome_title: Bonvenon, %{name}!
-      wrong_email_hint: Se tiu retpoŝtadreso ne estas ĝusta, vi povas ŝanĝi ĝin en la agordoj pri la konto.
     delete_account: Forigi konton
     delete_account_html: Se vi deziras forigi vian konton, vi povas <a href="%{path}">fari tion ĉi tie</a>. Vi bezonos konfirmi vian peton.
     description:
@@ -1031,7 +998,6 @@ eo:
     or_log_in_with: Aŭ saluti per
     privacy_policy_agreement_html: Mi legis kaj konsentis pri <a href="%{privacy_policy_path}" target="_blank">privatpolitiko</a>
     progress:
-      confirm: Konfirmi retpoŝtadreson
       details: Viaj detaloj
       review: Niaj recenzoj
       rules: Akcepti regulojn
@@ -1053,9 +1019,7 @@ eo:
     security: Sekureco
     set_new_password: Elekti novan pasvorton
     setup:
-      email_below_hint_html: Kontrolu vian spam-dosierujon aŭ petu novan ligon. Se necese, vi povas korekti vian retadreson.
       link_not_received: Ĉu vi ne ricevis ligilon?
-      new_confirmation_instructions_sent: Vi devus ricevi novan retpoŝton kun la konfirma ligilo post kelkaj minutoj!
       title: Kontrolu vian retpoŝta enirkesto
     sign_in:
       preamble_html: Ensalutu per via detaloj de <strong>%{domain}</strong>. Se via konto gastigantigas sur malsama servilo, vi ne povas ensaluti ĉi tie.
@@ -1065,9 +1029,7 @@ eo:
       title: Ni pretigu vin ĉe %{domain}.
     status:
       account_status: Statuso de la konto
-      confirming: Retpoŝtokonfirmo bezonas kompletigitis.
       functional: Via konto estas tute funkcia.
-      pending: Via aliĝo estos kontrolita de nia teamo. Tio povas bezoni iom da tempo. Vi ricevos retpoŝtmesaĝon se via aliĝo estas aprobita.
       redirecting_to: Via konto estas neaktiva ĉar ĝi nun alidirektas al %{acct}.
       view_strikes: Vidi antauaj admonoj kontra via konto
     too_fast: Formularo sendita tro rapide, klopodu denove.
@@ -1109,9 +1071,6 @@ eo:
       before: 'Antau ol dauri, legu ĉi tiujn notojn zorgeme:'
       caches: Enhavo kiu kaŝmemorigitas de aliaj serviloj eble restas
       data_removal: Viaj afiŝoj kaj aliaj informoj estos forigita por eterne
-      email_change_html: Vi povas <a href="%{path}">ŝanĝi vian retadreson</a> sen forigi vian konton
-      email_contact_html: Se ĝi ankorau ne venas, vi povas retpoŝti al <a href="mailto:%{email}">%{email}</a> por ricevi helpon
-      email_reconfirmation_html: Se vi ne ricevas la konfirmretpoŝton, vi povas <a href="%{path}">denove peti</a>
       irreversible: Vi ne povas regajni au reaktivigi vian konton
       more_details_html: Por pli da detaloj, vidi la <a href="%{terms_path}">privatecan politikon</a>.
       username_available: Via uzantnomo iĝos denove disponebla
@@ -1323,7 +1282,6 @@ eo:
     authentication_methods:
       otp: 2-faktora autentigprogramaro
       password: pasvorto
-      sign_in_token: retpoŝta sekureca kodo
       webauthn: sekurecaj ŝlosiloj
     description_html: Se vi vidas nerekonitan agon, eble ŝanĝu vian pasvorton.
     empty: Neniu autentighistorio disponebla
@@ -1334,16 +1292,6 @@ eo:
     unsubscribe:
       action: Jes, malabonu
       complete: Malabonita
-      confirmation_html: Ĉu vi certas, ke vi volas malaboni por ricevi %{type} por Mastodon ĉe %{domain} al via retpoŝto ĉe %{email}? Vi ĉiam povas reaboni de viaj <a href="%{settings_path}">retpoŝtaj sciigaj agordoj</a>.
-      emails:
-        notification_emails:
-          favourite: plej ŝatataj sciigaj retpoŝtoj
-          follow: sekvu sciigajn retmesaĝojn
-          follow_request: sekvu petajn retpoŝtojn
-          mention: menciu sciigajn retmesaĝojn
-          reblog: plifortigi sciigajn retpoŝtojn
-      resubscribe_html: Se vi malabonis erare, vi povas reaboni de viaj <a href="%{settings_path}">retpoŝtaj sciigaj agordoj</a>.
-      success_html: Vi ne plu ricevos %{type} por Mastodon sur %{domain} al via retpoŝto ĉe %{email}.
       title: Malaboni
   media_attachments:
     validations:
@@ -1424,8 +1372,6 @@ eo:
     update:
       subject: "%{name} redaktis afiŝon"
   notifications:
-    administration_emails: Admin retpoŝtaj sciigoj
-    email_events: Eventoj por retpoŝtaj sciigoj
     email_events_hint: 'Elekti la eventojn pri kioj vi volas ricevi sciigojn:'
   number:
     human:
@@ -1767,7 +1713,6 @@ eo:
     invalid_otp_token: Nevalida kodo de dufaktora aŭtentigo
     otp_lost_help_html: Se vi perdas aliron al ambaŭ, vi povas kontakti %{email}
     rate_limited: Estas tro multaj aŭtentigaj provoj, reprovu poste.
-    seamless_external_login: Vi estas ensalutinta per ekstera servo, do pasvortaj kaj retadresaj agordoj ne estas disponeblaj.
     signed_in_as: 'Salutinta kiel:'
   verification:
     extra_instructions_html: <strong>Konsilo:</strong> La ligilo en via retejo povas esti nevidebla. La grava parto estas <code>rel="me"</code>, kiu evitas identoŝtelon en retejoj kun enhavo generita de uzantoj. Vi povas eĉ uzi <code>link</code>-etikedon en la <code>header</code> de la paĝo anstataŭ <code>a</code>, sed la HTML devas esti atingebla sen plenumado de JavaScript.
diff --git a/config/locales/es-AR.yml b/config/locales/es-AR.yml
index 8ebe203560a0ad..21836e79f1cb71 100644
--- a/config/locales/es-AR.yml
+++ b/config/locales/es-AR.yml
@@ -442,7 +442,7 @@ es-AR:
         create: Agregar dominio
         resolve: Resolver dominio
         title: Bloquear nuevo dominio de correo electrónico
-      no_email_domain_block_selected: No se cambiaron bloques de dominio ya que no se seleccionó ninguno
+      no_email_domain_block_selected: No se cambiaron bloqueos de dominio de correo electrónico, ya que no se seleccionó ninguno
       not_permitted: No permitidos
       resolved_dns_records_hint_html: El nombre de dominio resuelve los siguientes dominios MX, los cuales son responsables en última instancia de aceptar el correo electrónico. Bloquear un dominio MX bloqueará los registros de cualquier dirección de correo electrónico que utilice el mismo dominio MX, incluso si el nombre de dominio visible es diferente. <strong>Tené cuidado de no bloquear los principales proveedores de correo electrónico.</strong>
       resolved_through_html: Resuelto a través de %{domain}
@@ -907,10 +907,16 @@ es-AR:
     trends:
       allow: Permitir
       approved: Aprobadas
+      confirm_allow: "¿Estás seguro de que querés permitir las etiquetas seleccionadas?"
+      confirm_disallow: "¿Estás seguro de que no querés permitir las etiquetas seleccionadas?"
       disallow: Rechazar
       links:
         allow: Permitir enlace
         allow_provider: Permitir medio
+        confirm_allow: "¿Estás seguro de que querés permitir los enlaces seleccionados?"
+        confirm_allow_provider: "¿Estás seguro de que querés permitir los proveedores seleccionados?"
+        confirm_disallow: "¿Estás seguro de que no querés permitir los enlaces seleccionados?"
+        confirm_disallow_provider: "¿Estás seguro de que no querés permitir los proveedores seleccionados?"
         description_html: Estos son enlaces que actualmente están siendo muy compartidos por cuentas desde las que tu servidor ve los mensajes. Esto puede ayudar a tus usuarios a averiguar qué está pasando en el mundo. No hay enlaces que se muestren públicamente hasta que autoricés al publicador. También podés permitir o rechazar enlaces individuales.
         disallow: Rechazar enlace
         disallow_provider: Rechazar medio
@@ -934,6 +940,10 @@ es-AR:
       statuses:
         allow: Permitir mensaje
         allow_account: Permitir autor
+        confirm_allow: "¿Estás seguro de que querés permitir los estados seleccionados?"
+        confirm_allow_account: "¿Estás seguro de que querés permitir las cuentas seleccionadas?"
+        confirm_disallow: "¿Estás seguro de que no querés permitir los estados seleccionados?"
+        confirm_disallow_account: "¿Estás seguro de que no querés permitir las cuentas seleccionadas?"
         description_html: Estos son mensajes que tu servidor detecta que están siendo compartidos y marcados como favoritos muchas veces en este momento. Esto puede ayudar a tus usuarios nuevos y retornantes a encontrar más cuentas para seguir. No hay mensajes que se muestren públicamente hasta que aprobés al autor, y el autor permita que su cuenta sea sugerida a otros. También podés permitir o rechazar mensajes individuales.
         disallow: Rechazar mensaje
         disallow_account: Rechazar autor
@@ -966,7 +976,7 @@ es-AR:
         used_by_over_week:
           one: Usada por una persona durante la última semana
           other: Usada por %{count} personas durante la última semana
-      title: Tendencias
+      title: Recomendaciones y tendencias
       trending: En tendencia
     warning_presets:
       add_new: Agregar nuevo
diff --git a/config/locales/es-MX.yml b/config/locales/es-MX.yml
index 1623d110267590..61f4a6c16711f3 100644
--- a/config/locales/es-MX.yml
+++ b/config/locales/es-MX.yml
@@ -31,7 +31,7 @@ es-MX:
       created_msg: "¡Nota de moderación creada con éxito!"
       destroyed_msg: "¡Nota de moderación destruida con éxito!"
     accounts:
-      add_email_domain_block: Poner en lista negra el dominio del correo
+      add_email_domain_block: Bloquear el dominio del correo
       approve: Aprobar
       approved_msg: La solicitud de registro de %{username} ha sido aprobada correctamente
       are_you_sure: "¿Estás seguro?"
@@ -58,7 +58,7 @@ es-MX:
       demote: Degradar
       destroyed_msg: Los datos de %{username} están ahora en cola para ser eliminados inminentemente
       disable: Deshabilitar
-      disable_sign_in_token_auth: Desactivar la autenticación de doble factor
+      disable_sign_in_token_auth: Deshabilitar la autenticación por token de correo electrónico
       disable_two_factor_authentication: Desactivar autenticación de dos factores
       disabled: Deshabilitada
       display_name: Nombre
@@ -67,7 +67,7 @@ es-MX:
       email: E-mail
       email_status: E-mail Status
       enable: Habilitar
-      enable_sign_in_token_auth: Habilitar autenticación por token de correo electrónico
+      enable_sign_in_token_auth: Habilitar la autenticación por token de correo electrónico
       enabled: Habilitada
       enabled_msg: Se ha descongelado correctamente la cuenta de %{username}
       followers: Seguidores
@@ -178,7 +178,7 @@ es-MX:
         confirm_user: Confirmar Usuario
         create_account_warning: Crear Advertencia
         create_announcement: Crear Anuncio
-        create_canonical_email_block: Crear Bloque de E-mail
+        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
@@ -188,7 +188,7 @@ es-MX:
         create_user_role: Crear rol
         demote_user: Degradar Usuario
         destroy_announcement: Eliminar Anuncio
-        destroy_canonical_email_block: Eliminar Bloque de E-mail
+        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
@@ -200,7 +200,7 @@ es-MX:
         destroy_user_role: Destruir Rol
         disable_2fa_user: Deshabilitar 2FA
         disable_custom_emoji: Deshabilitar Emoji Personalizado
-        disable_sign_in_token_auth_user: Desactivar la autenticación de token de correo electrónico para el usuario
+        disable_sign_in_token_auth_user: Deshabilitar la Autenticación por Token de Correo Electrónico para el Usuario
         disable_user: Deshabilitar Usuario
         enable_custom_emoji: Habilitar Emoji Personalizado
         enable_sign_in_token_auth_user: Habilitar la Autenticación por Token de Correo Electrónico para el Usuario
@@ -432,7 +432,7 @@ es-MX:
       attempts_over_week:
         one: "%{count} intentos durante la última semana"
         other: "%{count} intentos de registro en la última semana"
-      created_msg: Dominio de correo añadido a la lista negra con éxito
+      created_msg: Dominio de correo bloqueado con éxito
       delete: Borrar
       dns:
         types:
@@ -441,12 +441,12 @@ es-MX:
       new:
         create: Añadir dominio
         resolve: Resolver dominio
-        title: Nueva entrada en la lista negra de correo
-      no_email_domain_block_selected: No se han cambiado bloqueos de dominio ya que ninguno ha sido seleccionado
+        title: Bloquear nuevo dominio de correo
+      no_email_domain_block_selected: No se han cambiado bloqueos de dominio de correo, ya que ninguno ha sido seleccionado
       not_permitted: No permitido
-      resolved_dns_records_hint_html: El nombre de dominio resuelve los siguientes dominios MX, los cuales son responsables en última instancia de aceptar el correo electrónico. Bloquear un dominio MX bloqueará los registros de cualquier dirección de correo electrónico que utilice el mismo dominio MX, incluso si el nombre de dominio visible es diferente. <strong>Tenga cuidado de no bloquear los principales proveedores de correo electrónico.</strong>
+      resolved_dns_records_hint_html: El nombre de dominio resuelve los siguientes dominios MX, los cuales son responsables en última instancia de aceptar el correo electrónico. Bloquear un dominio MX bloqueará los registros de cualquier dirección de correo electrónico que utilice el mismo dominio MX, incluso si el nombre de dominio visible es diferente. <strong>Ten cuidado de no bloquear los principales proveedores de correo electrónico.</strong>
       resolved_through_html: Resuelto a través de %{domain}
-      title: Lista negra de correo
+      title: Dominios de correo bloqueados
     export_domain_allows:
       new:
         title: Importar dominios permitidos
@@ -705,7 +705,7 @@ es-MX:
         manage_appeals: Administrar Apelaciones
         manage_appeals_description: Permite a los usuarios revisar apelaciones contra acciones de moderación
         manage_blocks: Administrar Bloqueos
-        manage_blocks_description: Permite a los usuarios bloquear los proveedores de e-mail y las direcciones IP
+        manage_blocks_description: Permite a los usuarios bloquear proveedores de correo electrónico y direcciones IP
         manage_custom_emojis: Administrar Emojis Personalizados
         manage_custom_emojis_description: Permite a los usuarios gestionar emojis personalizados en el servidor
         manage_federation: Administrar Federación
@@ -798,7 +798,7 @@ es-MX:
       destroyed_msg: "¡Carga del sitio eliminada con éxito!"
     software_updates:
       critical_update: Crítico — por favor actualiza rápidamente
-      description: Se recomienda mantener actualizada su instalación de Mastodon para beneficiarse de las últimas correcciones y características. Además, a veces es crítico actualizar Mastodon de manera oportuna para evitar problemas de seguridad. Por estas razones, Mastodon comprueba si hay actualizaciones cada 30 minutos, y le notificará de acuerdo a sus preferencias de notificación por correo electrónico.
+      description: Se recomienda mantener actualizada tu instalación de Mastodon para beneficiarte de las últimas correcciones y características. Además, a veces es crítico actualizar Mastodon de manera oportuna para evitar problemas de seguridad. Por estas razones, Mastodon comprueba si hay actualizaciones cada 30 minutos, y te notificará de acuerdo a tus preferencias de notificación por correo electrónico.
       documentation_link: Saber más
       release_notes: Notas de la versión
       title: Actualizaciones disponibles
@@ -907,10 +907,16 @@ es-MX:
     trends:
       allow: Permitir
       approved: Aprobado
+      confirm_allow: "¿Estás seguro de que deseas permitir la etiqueta seleccionada?"
+      confirm_disallow: "¿Estás seguro de que deseas restringir la etiqueta seleccionada?"
       disallow: Rechazar
       links:
         allow: Permitir enlace
         allow_provider: Permitir editor
+        confirm_allow: "¿Estás seguro de que deseas permitir los enlaces seleccionados?"
+        confirm_allow_provider: "¿Estás seguro de que deseas permitir los proveedores seleccionados?"
+        confirm_disallow: "¿Estás seguro de que deseas restringir los enlaces seleccionados?"
+        confirm_disallow_provider: "¿Estás seguro de que deseas restringir los proveedores seleccionados?"
         description_html: Estos son enlaces que actualmente están siendo compartidos mucho por las cuentas desde las que tu servidor ve los mensajes. Pueden ayudar a tus usuarios a averiguar qué está pasando en el mundo. Ningún enlace se muestren públicamente hasta que autorice al dominio. También puede permitir o rechazar enlaces individuales.
         disallow: Rechazar enlace
         disallow_provider: Rechazar editor
@@ -934,6 +940,10 @@ es-MX:
       statuses:
         allow: Permitir publicación
         allow_account: Permitir autor
+        confirm_allow: "¿Estás seguro de que deseas permitir los estados seleccionados?"
+        confirm_allow_account: "¿Estás seguro de que deseas permitir las cuentas seleccionadas?"
+        confirm_disallow: "¿Estás seguro de que deseas restringir los estados seleccionados?"
+        confirm_disallow_account: "¿Estás seguro de que deseas restringir las cuentas seleccionadas?"
         description_html: Estos son publicaciones que su servidor conoce que están siendo compartidas y marcadas como favoritas mucho en este momento. Pueden ayudar a tus usuarios nuevos y retornantes a encontrar más gente a la que seguir. No hay mensajes que se muestren públicamente hasta que apruebes el autor y el autor permita que su cuenta sea sugerida a otros. También puedes permitir o rechazar mensajes individuales.
         disallow: Rechazar publicación
         disallow_account: No permitir autor
@@ -966,7 +976,7 @@ es-MX:
         used_by_over_week:
           one: Usada por una persona durante la última semana
           other: Usada por %{count} personas durante la última semana
-      title: Tendencias
+      title: Recomendaciones y tendencias
       trending: En tendencia
     warning_presets:
       add_new: Añadir nuevo
@@ -1073,7 +1083,7 @@ es-MX:
       hint_html: ¡Una última cosita! Necesitamos confirmar que eres humano (¡así podemos evitar el spam!). Resuelve este CAPTCHA de debajo y pulsa en "Continuar".
       title: Comprobación de seguridad
     confirmations:
-      awaiting_review: "¡Tu dirección de correo electrónico ha sido confirmada! El personal de %{domain} está revisando tu registro. ¡Recibirás un correo electrónico si aprueban tu cuenta!"
+      awaiting_review: "¡Tu dirección de correo electrónico ha sido confirmada! El personal de %{domain} está revisando tu registro. ¡Recibirás un correo electrónico cuando aprueben tu cuenta!"
       awaiting_review_title: Su registro está siendo revisado
       clicking_this_link: presionando este enlace
       login_link: iniciar sesión
@@ -1102,7 +1112,7 @@ es-MX:
     or_log_in_with: O inicia sesión con
     privacy_policy_agreement_html: He leído y acepto la <a href="%{privacy_policy_path}" target="_blank">política de privacidad</a>
     progress:
-      confirm: Confirmar correo
+      confirm: Confirmar dirección de correo
       details: Tus detalles
       review: Nuestra revisión
       rules: Aceptar reglas
@@ -1124,7 +1134,7 @@ es-MX:
     security: Cambiar contraseña
     set_new_password: Establecer nueva contraseña
     setup:
-      email_below_hint_html: Comprueba tu carpeta de correo no deseado o solicita otro enlace de confirmación. Puedes corregir tu correo electrónico si está mal.
+      email_below_hint_html: Comprueba tu carpeta de correo no deseado o solicita otro enlace de confirmación. Puedes corregir tu dirección de correo electrónico si está mal.
       email_settings_hint_html: Pulsa el enlace que te hemos enviado para verificar %{email}. Esperaremos aquí mismo.
       link_not_received: "¿No recibiste un enlace?"
       new_confirmation_instructions_sent: "¡Recibirás un nuevo correo electrónico con el enlace de confirmación en unos minutos!"
@@ -1140,7 +1150,7 @@ es-MX:
       account_status: Estado de la cuenta
       confirming: Esperando confirmación de correo electrónico.
       functional: Tu cuenta está completamente operativa.
-      pending: Su solicitud está pendiente de revisión por nuestros administradores. Eso puede tardar algún tiempo. Usted recibirá un correo electrónico si el solicitud sea aprobada.
+      pending: Tu solicitud está pendiente de revisión por nuestro personal. Eso puede tardar un tiempo. Recibirás un correo electrónico cuando tu solicitud sea aprobada.
       redirecting_to: Tu cuenta se encuentra inactiva porque está siendo redirigida a %{acct}.
       self_destruct: Como %{domain} está cerrando, solo tendrás acceso limitado a tu cuenta.
       view_strikes: Ver amonestaciones pasadas contra tu cuenta
@@ -1183,9 +1193,9 @@ es-MX:
       before: 'Antes de continuar, por favor lee con atención las siguientes notas:'
       caches: El contenido que ha sido almacenado en caché por otros servidores puede persistir
       data_removal: Tus publicaciones y el resto de datos se eliminarán definitivamente
-      email_change_html: Puedes <a href="%{path}"> cambiar tu dirección de correo electrónico</a> sin eliminar tu cuenta
+      email_change_html: Puedes <a href="%{path}">cambiar tu dirección de correo electrónico</a> sin eliminar tu cuenta
       email_contact_html: Si aún no te ha llegado, puedes escribir a <a href="mailto:%{email}">%{email}</a> para pedir ayuda
-      email_reconfirmation_html: Si no te ha llegado el correo de confirmación, puedes <a href="%{path}"> volver a solicitarlo</a>
+      email_reconfirmation_html: Si no te ha llegado el correo de confirmación, puedes <a href="%{path}">volver a solicitarlo</a>
       irreversible: No podrás restaurar ni reactivar tu cuenta
       more_details_html: Para más detalles, ver <a href="%{terms_path}"> la política de privacidad</a>.
       username_available: Tu nombre de usuario volverá a estar disponible
@@ -1429,16 +1439,16 @@ es-MX:
     unsubscribe:
       action: Sí, darse de baja
       complete: Has cancelado tu suscripción
-      confirmation_html: ¿Estás seguro de que quieres dejar de recibir %{type} de Mastodon en %{domain} a tu email %{email}? Siempre podrás volver a suscribirte desde los <a href="%{settings_path}"> ajustes de notificación por correo.</a>.
+      confirmation_html: ¿Estás seguro de que quieres dejar de recibir %{type} de Mastodon en %{domain} a tu correo %{email}? Siempre podrás volver a suscribirte de nuevo desde los <a href="%{settings_path}">ajustes de notificación por correo</a>.
       emails:
         notification_emails:
-          favourite: notificaciones de me gusta por correo
-          follow: notificaciones de seguidores por correo
-          follow_request: notificaciones de peticiones de seguimiento por correo
-          mention: notificaciones de menciones por correo
-          reblog: notificaciones de boost por correo
-      resubscribe_html: Si te has dado de baja por error, puedes volver a suscribirte desde tus <a href="%{settings_path}">ajustes de notificaciones por correo</a>.
-      success_html: Ya no recibirás %{type} de mastodon en %{domain} a tu correo %{email}.
+          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
+          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>.
+      success_html: Ya no recibirás %{type} de Mastodon en %{domain} a tu correo %{email}.
       title: Cancelar suscripción
   media_attachments:
     validations:
@@ -1519,7 +1529,7 @@ es-MX:
     update:
       subject: "%{name} editó una publicación"
   notifications:
-    administration_emails: Notificaciones de administración por correo electrónico
+    administration_emails: Notificaciones administrativas por correo
     email_events: Eventos para notificaciones por correo electrónico
     email_events_hint: 'Selecciona los eventos para los que deseas recibir notificaciones:'
   number:
@@ -1926,7 +1936,7 @@ es-MX:
     invalid_otp_token: Código de dos factores incorrecto
     otp_lost_help_html: Si perdiste al acceso a ambos, puedes ponerte en contancto con %{email}
     rate_limited: Demasiados intentos de autenticación, inténtalo de nuevo más tarde.
-    seamless_external_login: Has iniciado sesión desde un servicio externo, así que los ajustes de contraseña y correo no están disponibles.
+    seamless_external_login: Has iniciado sesión desde un servicio externo, por lo que los ajustes de contraseña y correo electrónico no están disponibles.
     signed_in_as: 'Sesión iniciada como:'
   verification:
     extra_instructions_html: <strong>Consejo:</strong> El enlace en tu web puede ser invisible. La parte importante es <code>rel="me"</code>, que evita la suplantación de identidad en sitios con contenido generado por el usuario. Puedes incluso usar un tag <code>link</code> en el encabezado de la página en vez de <code>a</code>, pero el HTML debe ser accesible sin ejecutar JavaScript.
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 9e3689557ac97f..883a95371721e8 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -432,7 +432,7 @@ es:
       attempts_over_week:
         one: "%{count} intento durante la última semana"
         other: "%{count} intentos de registro durante la última semana"
-      created_msg: Dominio de correo añadido a la lista negra con éxito
+      created_msg: Dominio de correo bloqueado con éxito
       delete: Borrar
       dns:
         types:
@@ -441,12 +441,12 @@ es:
       new:
         create: Añadir dominio
         resolve: Resolver dominio
-        title: Nueva entrada en la lista negra de correo
-      no_email_domain_block_selected: No se han cambiado bloqueos de dominio ya que ninguno ha sido seleccionado
+        title: Bloquear nuevo dominio de correo
+      no_email_domain_block_selected: No se han cambiado bloqueos de dominio de correo, ya que ninguno ha sido seleccionado
       not_permitted: No permitido
-      resolved_dns_records_hint_html: El nombre de dominio resuelve los siguientes dominios MX, los cuales son responsables en última instancia de aceptar el correo electrónico. Bloquear un dominio MX bloqueará los registros de cualquier dirección de correo electrónico que utilice el mismo dominio MX, incluso si el nombre de dominio visible es diferente. <strong>Tenga cuidado de no bloquear los principales proveedores de correo electrónico.</strong>
+      resolved_dns_records_hint_html: El nombre de dominio resuelve los siguientes dominios MX, los cuales son responsables en última instancia de aceptar el correo electrónico. Bloquear un dominio MX bloqueará los registros de cualquier dirección de correo electrónico que utilice el mismo dominio MX, incluso si el nombre de dominio visible es diferente. <strong>Ten cuidado de no bloquear los principales proveedores de correo electrónico.</strong>
       resolved_through_html: Resuelto a través de %{domain}
-      title: Lista negra de correo
+      title: Dominios de correo bloqueados
     export_domain_allows:
       new:
         title: Importar dominios permitidos
@@ -705,7 +705,7 @@ es:
         manage_appeals: Administrar Apelaciones
         manage_appeals_description: Permite a los usuarios revisar apelaciones contra acciones de moderación
         manage_blocks: Administrar Bloqueos
-        manage_blocks_description: Permite a los usuarios bloquear los proveedores de e-mail y las direcciones IP
+        manage_blocks_description: Permite a los usuarios bloquear proveedores de correo electrónico y direcciones IP
         manage_custom_emojis: Administrar Emojis Personalizados
         manage_custom_emojis_description: Permite a los usuarios gestionar emojis personalizados en el servidor
         manage_federation: Administrar Federación
@@ -907,10 +907,16 @@ es:
     trends:
       allow: Permitir
       approved: Aprobadas
+      confirm_allow: "¿Estás seguro de que deseas permitir la etiqueta seleccionada?"
+      confirm_disallow: "¿Estás seguro de que deseas restringir la etiqueta seleccionada?"
       disallow: No permitir
       links:
         allow: Permitir enlace
         allow_provider: Permitir medio
+        confirm_allow: "¿Estás seguro de que deseas permitir los enlaces seleccionados?"
+        confirm_allow_provider: "¿Estás seguro de que deseas permitir los proveedores seleccionados?"
+        confirm_disallow: "¿Estás seguro de que deseas restringir los enlaces seleccionados?"
+        confirm_disallow_provider: "¿Estás seguro de que deseas restringir los proveedores seleccionados?"
         description_html: Estos son enlaces que actualmente están siendo compartidos mucho por las cuentas desde las que tu servidor ve los mensajes. Pueden ayudar a tus usuarios a averiguar qué está pasando en el mundo. Ningún enlace se muestren públicamente hasta que autorice al dominio. También puede permitir o rechazar enlaces individuales.
         disallow: Rechazar enlace
         disallow_provider: Rechazar medio
@@ -934,6 +940,10 @@ es:
       statuses:
         allow: Permitir publicación
         allow_account: Permitir autor
+        confirm_allow: "¿Estás seguro de que deseas permitir los estados seleccionados?"
+        confirm_allow_account: "¿Estás seguro de que deseas permitir las cuentas seleccionadas?"
+        confirm_disallow: "¿Estás seguro de que deseas restringir los estados seleccionados?"
+        confirm_disallow_account: "¿Estás seguro de que deseas restringir las cuentas seleccionadas?"
         description_html: Estos son publicaciones que tu servidor conoce que están siendo compartidas y marcadas como favoritas mucho en este momento. Pueden ayudar a tus usuarios nuevos y retornantes a encontrar más personas a las que seguir. No hay mensajes que se muestren públicamente hasta que apruebes el autor y el autor permita que su cuenta sea sugerida a otros. También puedes permitir o rechazar mensajes individuales.
         disallow: No permitir publicación
         disallow_account: No permitir autor
@@ -966,7 +976,7 @@ es:
         used_by_over_week:
           one: Usada por una persona durante la última semana
           other: Usada por %{count} personas durante la última semana
-      title: Tendencias
+      title: Recomendaciones y tendencias
       trending: En tendencia
     warning_presets:
       add_new: Añadir nuevo
@@ -1183,9 +1193,9 @@ es:
       before: 'Antes de continuar, por favor lee con atención las siguientes notas:'
       caches: El contenido que ha sido almacenado en caché por otros servidores puede persistir
       data_removal: Tus publicaciones y el resto de datos se eliminarán definitivamente
-      email_change_html: Puedes <a href="%{path}"> cambiar tu dirección de correo electrónico</a> sin eliminar tu cuenta
+      email_change_html: Puedes <a href="%{path}">cambiar tu dirección de correo electrónico</a> sin eliminar tu cuenta
       email_contact_html: Si aún no te ha llegado, puedes escribir a <a href="mailto:%{email}">%{email}</a> para pedir ayuda
-      email_reconfirmation_html: Si no te ha llegado el correo de confirmación, puedes <a href="%{path}"> volver a solicitarlo</a>
+      email_reconfirmation_html: Si no te ha llegado el correo de confirmación, puedes <a href="%{path}">volver a solicitarlo</a>
       irreversible: No podrás restaurar ni reactivar tu cuenta
       more_details_html: Para más detalles, ver <a href="%{terms_path}"> la política de privacidad</a>.
       username_available: Tu nombre de usuario volverá a estar disponible
@@ -1429,16 +1439,16 @@ es:
     unsubscribe:
       action: Sí, cancelar suscripción
       complete: Has cancelado tu suscripción
-      confirmation_html: ¿Estás seguro de que quieres dejar de recibir %{type} de Mastodon en %{domain} a tu email %{email}? Siempre podrás volver a suscribirte desde los <a href="%{settings_path}"> ajustes de notificación por correo.</a>.
+      confirmation_html: ¿Estás seguro de que quieres dejar de recibir %{type} de Mastodon en %{domain} a tu correo %{email}? Siempre podrás volver a suscribirte de nuevo desde los <a href="%{settings_path}">ajustes de notificación por correo</a>.
       emails:
         notification_emails:
-          favourite: notificaciones de me gusta por correo
-          follow: notificaciones de seguidores por correo
-          follow_request: notificaciones de peticiones de seguimiento por correo
-          mention: notificaciones de menciones por correo
-          reblog: notificaciones de impulsos por correo
+          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
+          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>.
-      success_html: Ya no recibirás %{type} de mastodon en %{domain} a tu correo %{email}.
+      success_html: Ya no recibirás %{type} de Mastodon en %{domain} a tu correo %{email}.
       title: Cancelar suscripición
   media_attachments:
     validations:
@@ -1519,7 +1529,7 @@ es:
     update:
       subject: "%{name} editó una publicación"
   notifications:
-    administration_emails: Notificaciones de administración por correo electrónico
+    administration_emails: Notificaciones administrativas por correo
     email_events: Eventos para notificaciones por correo electrónico
     email_events_hint: 'Selecciona los eventos para los que deseas recibir notificaciones:'
   number:
@@ -1926,7 +1936,7 @@ es:
     invalid_otp_token: Código de dos factores incorrecto
     otp_lost_help_html: Si perdiste al acceso a ambos, puedes ponerte en contancto con %{email}
     rate_limited: Demasiados intentos de autenticación, inténtalo de nuevo más tarde.
-    seamless_external_login: Has iniciado sesión desde un servicio externo, así que los ajustes de contraseña y correo no están disponibles.
+    seamless_external_login: Has iniciado sesión desde un servicio externo, por lo que los ajustes de contraseña y correo electrónico no están disponibles.
     signed_in_as: 'Sesión iniciada como:'
   verification:
     extra_instructions_html: <strong>Consejo:</strong> El enlace en tu web puede ser invisible. La parte importante es <code>rel="me"</code>, que evita la suplantación de identidad en sitios con contenido generado por el usuario. Puedes incluso usar una etiqueta <code>enlace</code> en el encabezado de la página en vez de <code>a</code>, pero el HTML debe ser accesible sin ejecutar JavaScript.
diff --git a/config/locales/et.yml b/config/locales/et.yml
index 30d75d25ee4944..547cc8a64318ed 100644
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -31,7 +31,6 @@ et:
       created_msg: Modereerimisteade edukalt koostatud!
       destroyed_msg: Modereerimisteade edukalt kustutatud!
     accounts:
-      add_email_domain_block: Keela e-posti domeen
       approve: Võta vastu
       approved_msg: Kasutaja %{username} liitumisavaldus rahuldatud
       are_you_sure: Oled kindel?
@@ -58,7 +57,6 @@ et:
       demote: Alanda
       destroyed_msg: "%{username} andmed on nüüd lõpliku kustutamise ootel"
       disable: Lukusta
-      disable_sign_in_token_auth: Keela e-posti võtmetega autentimine
       disable_two_factor_authentication: Keela 2FA
       disabled: Keelatud
       display_name: Kuvanimi
@@ -67,7 +65,6 @@ et:
       email: E-post
       email_status: E-posti olek
       enable: Luba
-      enable_sign_in_token_auth: Luba e-posti võtmetega autentimine
       enabled: Lubatud
       enabled_msg: Kasutaja %{username} konto taastatud
       followers: Jälgijad
@@ -132,7 +129,6 @@ et:
       resubscribe: Telli taas
       role: Roll
       search: Otsi
-      search_same_email_domain: Muud kasutajad sama e-posti domeeniga
       search_same_ip: Teised kasutajad, kellel on sama IP
       security: Turvalisus
       security_measures:
@@ -173,26 +169,21 @@ et:
         approve_appeal: Rahulda vaidlustus
         approve_user: Kinnita kasutaja
         assigned_to_self_report: Määras Teavituse
-        change_email_user: Kasutaja muutis e-postiaadressi
         change_role_user: Muuda kasutaja rolli
         confirm_user: Kasutaja kinnitatud
         create_account_warning: Lisas hoiatuse
         create_announcement: Lisas teadaande
-        create_canonical_email_block: E-posti blokeeringu lisamine
         create_custom_emoji: Lisas kohandatud emotikoni
         create_domain_allow: Lisas lubatud domeeni
         create_domain_block: Domeeni blokeerimine
-        create_email_domain_block: E-postidomeeni blokeerimine
         create_ip_block: IP-reegli lisamine
         create_unavailable_domain: Kättesaamatu domeeni lisamine
         create_user_role: Loo roll
         demote_user: Alandas kasutaja
         destroy_announcement: Eemaldas teadaande
-        destroy_canonical_email_block: E-posti blokeeringu kustutamine
         destroy_custom_emoji: Eemaldas kohandatud emotikoni
         destroy_domain_allow: Eemaldas lubatud domeeni
         destroy_domain_block: Domeeniblokeeringu eemaldamine
-        destroy_email_domain_block: E-postidomeeni blokeeringu eemaldamine
         destroy_instance: Domeeni kustutamine
         destroy_ip_block: IP-reegli kustutamine
         destroy_status: Kustuta postitus
@@ -200,10 +191,8 @@ et:
         destroy_user_role: Rolli kustutamine
         disable_2fa_user: Keela 2FA
         disable_custom_emoji: Keelas kohandatud emotikoni
-        disable_sign_in_token_auth_user: E-posti võtmega autentimise keelamine
         disable_user: Keelas kasutaja
         enable_custom_emoji: Lubas kohandatud emotikoni
-        enable_sign_in_token_auth_user: E-posti võtmega autentimise lubamine
         enable_user: Lubas kasutaja
         memorialize_account: Igaveselt lahkunuks märkimine
         promote_user: Edendas kasutaja
@@ -232,26 +221,20 @@ et:
         approve_appeal_html: "%{name} kiitis heaks modereerimise otsuse vaidlustuse %{target} poolt"
         approve_user_html: "%{name} kiitis heaks registreerimise %{target} poolt"
         assigned_to_self_report_html: "%{name} määras raporti %{target} endale"
-        change_email_user_html: "%{name} muutis %{target} e-postiaadressi"
         change_role_user_html: "%{name} muutis %{target} rolli"
-        confirm_user_html: "%{name} on %{target} e-postiaadressi kinnitanud"
         create_account_warning_html: "%{name} saatis %{target} hoiatuse"
         create_announcement_html: "%{name} lõi uue teate %{target}"
-        create_canonical_email_block_html: "%{name} keelas e-postiaadressi räsiga %{target}"
         create_custom_emoji_html: "%{name} laadis üles uue emotikoni %{target}"
         create_domain_allow_html: "%{name} lubas föderatsiooni domeeniga %{target}"
         create_domain_block_html: "%{name} keelas domeeni %{target}"
-        create_email_domain_block_html: "%{name} keelas e-posti domeeni %{target}"
         create_ip_block_html: "%{name} lõi IP-aadressile %{target} reegli"
         create_unavailable_domain_html: "%{name} lõpetas edastamise domeeni %{target}"
         create_user_role_html: "%{name} lõi rolli %{target}"
         demote_user_html: "%{name} alandas kasutajat %{target}"
         destroy_announcement_html: "%{name} kustutas teadaande %{target}"
-        destroy_canonical_email_block_html: "%{name} lubas e-postiaaadressi räsiga %{target}"
         destroy_custom_emoji_html: "%{name} kustutas emotikoni %{target}"
         destroy_domain_allow_html: "%{name} keelas föderatsiooni domeeniga %{target}"
         destroy_domain_block_html: "%{name} lubas domeeni %{target}"
-        destroy_email_domain_block_html: "%{name} lubas e-posti domeeni %{target}"
         destroy_instance_html: "%{name} kustutas domeeni %{target}"
         destroy_ip_block_html: "%{name} kustutas IP-aadressi %{target} reegli"
         destroy_status_html: "%{name} kustutas %{target} postituse"
@@ -259,10 +242,8 @@ et:
         destroy_user_role_html: "%{name} kustutas %{target} rolli"
         disable_2fa_user_html: "%{name} eemaldas kasutaja %{target} kahe etapise nõude"
         disable_custom_emoji_html: "%{name} keelas emotikooni %{target}"
-        disable_sign_in_token_auth_user_html: "%{name} keelas kasutajal %{target} e-posti võtmega autentida"
         disable_user_html: "%{name} keelas %{target} sisenemise"
         enable_custom_emoji_html: "%{name} lubas emotikooni %{target}"
-        enable_sign_in_token_auth_user_html: "%{name} lubas kasutajal %{target} e-posti võtmega autentida"
         enable_user_html: "%{name} lubas %{target} sisenemise"
         memorialize_account_html: "%{name} märkis %{target} igaveselt lahkunuks"
         promote_user_html: "%{name} ülendas kasutajat %{target}"
@@ -270,7 +251,6 @@ et:
         reject_user_html: "%{name} lükkas %{target} liitumissoovi tagasi"
         remove_avatar_user_html: "%{name} eemaldas %{target} avatari"
         reopen_report_html: "%{name} taasavas raporti %{target}"
-        resend_user_html: "%{name} saatis %{target} e-postiaadressi kinnituskirja"
         reset_password_user_html: "%{name} lähtestas %{target} salasõna"
         resolve_report_html: "%{name} lahendas raporti %{target}"
         sensitive_account_html: "%{name} märkis %{target} meedia kui tundlik sisu"
@@ -431,7 +411,6 @@ et:
       attempts_over_week:
         one: "%{count} katse viimase nädala kestel"
         other: "%{count} liitumiskatset viimase nädala kestel"
-      created_msg: Edukalt blokeeritud e-posti domeen
       delete: Kustuta
       dns:
         types:
@@ -440,12 +419,8 @@ et:
       new:
         create: Lisa domeen
         resolve: Domeeni lahendamine
-        title: Blokeeri uus e-posti domeen
-      no_email_domain_block_selected: Ühtegi e-posti domeeni keeldu ei muudetud, kuna midagi polnud valitud
       not_permitted: Ei ole lubatud
-      resolved_dns_records_hint_html: Domeeninimi lahendub järgnevateks MX-domeenideks, mis vastutavad e-kirjade vastuvõtmise eest. MX-domeeni blokeerimine blokeerib liitumistaotlused kõigilt e-postiaadressidelt, mis kasutavad sama MX-domeeni, kuigi kasutatav domeeninimi on erinev. <strong>Ole tähelepanelik, et mitte blokeerida suuremaid e-postiteenuse pakkujaid.</strong>
       resolved_through_html: Lahendatud %{domain} kaudu
-      title: E-posti keelunimekiri
     export_domain_allows:
       new:
         title: Lubatud domeenide import
@@ -596,7 +571,6 @@ et:
         resolve_description_html: Raporteeritud konto suhtes ei võeta midagi ette, juhtumit ei registreerita ja raport suletakse.
         silence_description_html: Konto saab olema nähtav ainult senistele jälgijatele või otsestele pöördujatele, mõjutates avalikku levi. On tagasipööratav. Sulgeb kõik konto suhtes esitatud raportid.
         suspend_description_html: See konto ja kogu selle sisu muutub kättesaamatuks ning kustub lõpuks ja igasugune suhtlus sellega muutub võimatuks. Tagasipööratav 30 päeva jooksul. Lõpetab kõik selle konto kohta esitatud kaebused.
-      actions_description_html: Otsustus, mida raporti lahendamiseks ette võtta. Karistava tegevuse korral saadetakse e-postiga teade, välja arvatud kategooria <strong>rämpspost</strong> puhul.
       actions_description_remote_html: Otsusta, mida teha selle raporti lahendamiseks. See mõjutab ainult seda, kuidas <strong>Sinu</strong> server selle kaugkontoga suhtleb ning selle sisu käsitleb.
       add_to_report: Lisa raportile juurde
       already_suspended_badges:
@@ -660,7 +634,6 @@ et:
         delete_data_html: Kustuta tänasest 30 päeva pärast kasutaja <strong>@%{acct}</strong> profiil ja sisu, kui vahepeal tema kontot ei taastata
         preview_preamble_html: "<strong>@%{acct}</strong> saab järgmise sisuga hoiatuse:"
         record_strike_html: Salvesta <strong>@%{acct}</strong> kohta juhtum, et aidata selle konto tulevaste rikkumiste puhul reageerida
-        send_email_html: Saada kasutajale <strong>@%{acct}</strong> hoiatus-e-kiri
         warning_placeholder: Valikuline täiendav põhjendus modereerimisele.
       target_origin: Raporteeritud konto päritolu
       title: Teavitused
@@ -700,7 +673,6 @@ et:
         manage_appeals: Vaidlustuste haldamine
         manage_appeals_description: Lubab kasutajail läbi vaadata modereerimisotsuste vaidlustusi
         manage_blocks: Keeldude haldamine
-        manage_blocks_description: Lubab kasutajatel keelata e-postiteenuse pakkujaid ja IP-aadresse
         manage_custom_emojis: Halda isetehtud emotikone
         manage_custom_emojis_description: Lubab kasutajatel hallata serveris isetehtud emotikone
         manage_federation: Halda födereerumist
@@ -718,7 +690,6 @@ et:
         manage_taxonomies: Halda taksonoomiaid
         manage_taxonomies_description: Luba kasutajatel populaarset sisu üle vaadata ning uuendada siltide sätteid
         manage_user_access: Halda kasutajate ligipääsu
-        manage_user_access_description: Lubab kasutajail keelata teiste kaheastmelise autentimise, muuta nende e-postiaadresse ja lähtestada salasõnu
         manage_users: Kasutajate haldamine
         manage_users_description: Lubab kasutajail näha teiste kasutajate üksikasju ja teha nende suhtes modereerimisotsuseid
         manage_webhooks: Halda webhook'e
@@ -793,7 +764,6 @@ et:
       destroyed_msg: Üleslaetud fail edukalt kustutatud!
     software_updates:
       critical_update: Kriitiline — uuenda kiiresti
-      description: On soovitav hoida oma Mastodoni paigaldus kõige uuemal kujul, et saada kasu kõige värskematest parandustest ja oskustest. Lisaks, vahel on Mastodoni kiire uuendamine kriitiline, et vältida turvaprobleeme. Neil põhjustel kontrollib Mastodon uuendusi iga 30 minuti tagant ja teavitab sind vastavalt su e-posti teavituste eelistustele.
       documentation_link: Vaata lisa
       release_notes: Väljalaskemärkused
       title: Saadaval uuendused
@@ -945,7 +915,6 @@ et:
         used_by_over_week:
           one: Kasutatud ühe kasutaja pool viimase nädala jooksul
           other: Kasutatud %{count} kasutaja poolt viimase nädala jooksul
-      title: Trendid
       trending: Trendid
     warning_presets:
       add_new: Lisa uus
@@ -1030,9 +999,7 @@ et:
       guide_link_text: Panustada võib igaüks!
     sensitive_content: Tundlik sisu
   application_mailer:
-    notification_preferences: Muuda e-kirjade eelistusi
     salutation: "%{name}!"
-    settings: 'Muuda e-kirjade eelistusi: %{link}'
     unsubscribe: Loobu tellimisest
     view: 'Vaade:'
     view_profile: Vaata profiili
@@ -1052,7 +1019,6 @@ et:
       hint_html: Üks asi veel! Me peame veenduma, et oled inimene (et me saaksime spämmi väljaspoole jätta!). Lahenda allpool olev CAPTCHA ja klõpsa "Jätka".
       title: Turvalisuse kontroll
     confirmations:
-      awaiting_review: E-posti aadress on kinnitatud! %{domain} töötajad vaatavad praegu registreeringut läbi. Saad e-kirja, kui nad kiidavad konto heaks!
       awaiting_review_title: Su registreeringut vaadatakse läbi
       clicking_this_link: klõpsates seda linki
       login_link: logi sisse
@@ -1060,7 +1026,6 @@ et:
       redirect_to_app_html: Sind oleks pidanud suunatama rakendusse <strong>%{app_name}</strong>. Kui seda ei juhtunud, proovi %{clicking_this_link} või naase käsitsi rakendusse.
       registration_complete: Sinu registreering domeenil %{domain} on nüüd valmis!
       welcome_title: Tere tulemast, %{name}!
-      wrong_email_hint: Kui see e-postiaadress pole korrektne, saad seda kontosätetes muuta.
     delete_account: Konto kustutamine
     delete_account_html: Kui soovid oma konto kustutada, siis <a href="%{path}">jätka siit</a>. Pead kustutamise eraldi kinnitama.
     description:
@@ -1081,7 +1046,6 @@ et:
     or_log_in_with: Või logi sisse koos
     privacy_policy_agreement_html: Olen tutvunud <a href="%{privacy_policy_path}" target="_blank">isikuandmete kaitse põhimõtetega</a> ja nõustun nendega
     progress:
-      confirm: Kinnita e-post
       details: Sinu üksikasjad
       review: Meie ülevaatamine
       rules: Nõustu reeglitega
@@ -1103,10 +1067,8 @@ et:
     security: Turvalisus
     set_new_password: Uue salasõna määramine
     setup:
-      email_below_hint_html: Kontrolli rämpspostikausta või taotle uut. Saad parandada e-postiaadressi, kui see on vale.
       email_settings_hint_html: Klõpsa linki, mis saadeti sulle, et kinnitada %{email}. Seni me ootame.
       link_not_received: Kas ei saanud linki?
-      new_confirmation_instructions_sent: Saad mõne minutiga uue kinnituslingiga e-kirja!
       title: Kontrolli sisendkasti
     sign_in:
       preamble_html: Logi sisse oma <strong>%{domain}</strong> volitustega. Kui konto asub teises serveris, ei saa siin sisse logida.
@@ -1117,9 +1079,7 @@ et:
       title: Loo konto serverisse  %{domain}.
     status:
       account_status: Konto olek
-      confirming: Ootan e-posti kinnitust.
       functional: Konto on täies mahus kasutatav.
-      pending: Taotlus ootab ülevaatamist meie personali poolt. See võib võtta mõne aja. Kui taotlus on vastu võetud, saadetakse sulle e-kiri.
       redirecting_to: See konto pole aktiivne, sest on suunatud aadressile %{acct}.
       self_destruct: Kuna %{domain} on sulgemisel, saad oma kontole vaid piiratud ligipääsu.
       view_strikes: Vaata enda eelnevaid juhtumeid
@@ -1162,9 +1122,6 @@ et:
       before: 'Veendu, et saad aru, mida toob plaanitav muudatus kaasa:'
       caches: Teiste serverite poolt talletatud sisu võib jääda kättesaadavaks
       data_removal: Sinu postitused ning kontoandmed kustutatakse jäädavalt
-      email_change_html: Saad <a href="%{path}">muuta oma e-postiaadressi</a> kontot kustutamata
-      email_contact_html: Kui see ikkagi ei saabu, saada abi saamiseks kiri aadressile <a href="mailto:%{email}">%{email}</a>
-      email_reconfirmation_html: Kui kinnituskiri ei saabunud, saab selle <a href="%{path}">uuesti küsida</a>
       irreversible: Kustutatud kontot ei saa taastada ega uuesti aktiveerida
       more_details_html: Konto kustutamise kohta loe täpsemalt <a href="%{terms_path}">isikuandmete kaitse põhimõtetest</a>.
       username_available: Kasutajanimi muutub uuesti kasutatavaks
@@ -1397,7 +1354,6 @@ et:
     authentication_methods:
       otp: kaheastmelise autentimise rakendus
       password: salasõna
-      sign_in_token: e-posti turvakood
       webauthn: turvavõtmed
     description_html: Kui paistab tundmatuid tegevusi, tuleks vahetada salasõna ja aktiveerida kaheastmeline autentimine.
     empty: Autentimisajalugu pole saadaval
@@ -1408,16 +1364,6 @@ et:
     unsubscribe:
       action: Jah, lõpeta tellimine
       complete: Tellimine lõpetatud
-      confirmation_html: Oled kindel, et soovid lõpetada domeenilt %{domain} Mastodoni %{type} teadete tellimise oma e-postile %{email}? Saad alati neid teavitusi uuesti tellida oma <a href="%{settings_path}">e-posti teavituste seadetest</a>.
-      emails:
-        notification_emails:
-          favourite: lemmikuks märkimise e-kirjad
-          follow: jälgimisest teatamise e-kirjad
-          follow_request: jälgimise taotluse e-kirjad
-          mention: mainimistest teatamise e-kirjad
-          reblog: jagamise teavitamise e-kirjad
-      resubscribe_html: Kui loobusid tellimisest ekslikult, saad uuesti tellida oma <a href="%{settings_path}">e-posti teavituste seadetest</a>.
-      success_html: Sa ei saa rohkem %{domain} Mastodoni jaoks %{type} teavitusi e-postiaadressile %{email}.
       title: Loobu tellimisest
   media_attachments:
     validations:
@@ -1498,8 +1444,6 @@ et:
     update:
       subject: "%{name} muutis postitust"
   notifications:
-    administration_emails: Admini e-postiteavitused
-    email_events: E-posti teadete sündmused
     email_events_hint: 'Vali sündmused, mille kohta soovid teavitusi:'
   number:
     human:
@@ -1658,7 +1602,6 @@ et:
     import: Impordi
     import_and_export: Import / eksport
     migrate: Konto kolimine
-    notifications: E-postiteavitused
     preferences: Eelistused
     profile: Profiil
     relationships: Jälgitud ja jälgijad
@@ -1907,7 +1850,6 @@ et:
     invalid_otp_token: Vale kaheastmeline võti
     otp_lost_help_html: Kui kaotasid ligipääsu mõlemale, saad võtta ühendust %{email}-iga
     rate_limited: Liiga palju autentimise katseid, proovi hiljem uuesti.
-    seamless_external_login: Välise teenuse kaudu sisse logides pole salasõna ja e-posti sätted saadaval.
     signed_in_as: 'Sisse logitud kasutajana:'
   verification:
     extra_instructions_html: <strong>Soovitus:</strong> Sinu kodulehel olev link võib olla nähtamatu. Oluline osa on <code>rel="me"</code>, mis väldib kasutaja loodud sisuga lehtedel libaisikustamist. Sa saad isegi kasutada lehe HEADER osas silti <code>link</code> sildi <code>a</code> asemel, kuid HTML peab olema kättesaadav ilma JavaScripti käivitamata.
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index 67da357e1de98d..5e7d4a7f05aa25 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -31,7 +31,6 @@ eu:
       created_msg: Moderazio oharra ongi sortu da!
       destroyed_msg: Moderazio ohara ongi suntsitu da!
     accounts:
-      add_email_domain_block: Sartu domeinua zerrenda beltzean
       approve: Onartu
       approved_msg: "%{username} erabiltzailearen erregistratzeko eskaera behar bezala onartu da"
       are_you_sure: Ziur zaude?
@@ -58,7 +57,6 @@ eu:
       demote: Jaitsi mailaz
       destroyed_msg: "%{username} erabiltzailearen datuak behin betiko ezabatzeko ilaran daude"
       disable: Desgaitu
-      disable_sign_in_token_auth: Desgaitu e-posta token autentifikazioa
       disable_two_factor_authentication: Desgaitu 2FA
       disabled: Desgaituta
       display_name: Pantaila-izena
@@ -67,7 +65,6 @@ eu:
       email: Eposta
       email_status: Epostaren egoera
       enable: Gaitu
-      enable_sign_in_token_auth: Gaitu e-posta token autentifikazioa
       enabled: Gaituta
       enabled_msg: "%{username} kontua behar bezala desblokeatu da"
       followers: Jarraitzaileak
@@ -132,7 +129,6 @@ eu:
       resubscribe: Berriro harpidetu
       role: Rola
       search: Bilatu
-      search_same_email_domain: E-mail domeinu bera duten beste erabiltzailean
       search_same_ip: IP bera duten beste erabiltzaileak
       security: Segurtasuna
       security_measures:
@@ -173,26 +169,21 @@ eu:
         approve_appeal: Onartu apelazioa
         approve_user: Onartu erabiltzailea
         assigned_to_self_report: Esleitu salaketa
-        change_email_user: Aldatu erabiltzailearen e-maila
         change_role_user: Aldatu erabiltzailearen rola
         confirm_user: Berretsi erabiltzailea
         create_account_warning: Sortu abisua
         create_announcement: Sortu iragarpena
-        create_canonical_email_block: Sortu eposta blokeoa
         create_custom_emoji: Sortu emoji pertsonalizatua
         create_domain_allow: Sortu domeinu baimena
         create_domain_block: Sortu domeinu blokeoa
-        create_email_domain_block: Sortu e-mail domeinu blokeoa
         create_ip_block: Sortu IP araua
         create_unavailable_domain: Sortu eskuragarri ez dagoen domeinua
         create_user_role: Sortu rola
         demote_user: Jaitsi erabiltzailearen maila
         destroy_announcement: Ezabatu iragarpena
-        destroy_canonical_email_block: Ezabatu eposta blokeoa
         destroy_custom_emoji: Ezabatu emoji pertsonalizatua
         destroy_domain_allow: Ezabatu domeinu baimena
         destroy_domain_block: Ezabatu domeinu blokeoa
-        destroy_email_domain_block: Ezabatu e-mail domeinu blokeoa
         destroy_instance: Ezabatu betiko domeinua
         destroy_ip_block: Ezabatu IP araua
         destroy_status: Ezabatu bidalketa
@@ -200,10 +191,8 @@ eu:
         destroy_user_role: Ezabatu rola
         disable_2fa_user: Desgaitu 2FA
         disable_custom_emoji: Desgaitu emoji pertsonalizatua
-        disable_sign_in_token_auth_user: Desgaitu e-posta token autentifikazioa erabiltzailearentzat
         disable_user: Desgaitu erabiltzailea
         enable_custom_emoji: Gaitu emoji pertsonalizatua
-        enable_sign_in_token_auth_user: Gaitu e-posta token autentifikazioa erabiltzailearentzat
         enable_user: Gaitu erabiltzailea
         memorialize_account: Bihurtu kontua oroigarri
         promote_user: Igo erabiltzailea mailaz
@@ -232,26 +221,20 @@ eu:
         approve_appeal_html: "%{name} erabiltzaileak %{target} erabiltzailearen moderazio erabakiaren apelazioa onartu du"
         approve_user_html: "%{name} erabiltzaileak %{target} erabiltzailearen izen-ematea onartu du"
         assigned_to_self_report_html: "%{name} erabiltzaileak %{target} salaketa bere buruari esleitu dio"
-        change_email_user_html: "%{name} erabiltzaileak %{target} erabiltzailearen e-posta helbidea aldatu du"
         change_role_user_html: "%{name} erabiltzaileak %{target} kontuaren rola aldatu du"
-        confirm_user_html: "%{name} erabiltzaileak %{target} erabiltzailearen e-posta helbidea berretsi du"
         create_account_warning_html: "%{name} erabiltzaileak abisua bidali dio %{target} erabiltzaileari"
         create_announcement_html: "%{name} erabiltzaileak %{target} iragarpen berria sortu du"
-        create_canonical_email_block_html: "%{name} erabiltzaileak %{target} hash-a duen helbide elektronikoa blokeatu du"
         create_custom_emoji_html: "%{name} erabiltzaileak %{target} emoji berria kargatu du"
         create_domain_allow_html: "%{name} erabiltzaileak %{target} domeinuarekin federazioa onartu du"
         create_domain_block_html: "%{name} erabiltzaileak %{target} domeinua blokeatu du"
-        create_email_domain_block_html: "%{name} erabiltzaileak %{target} e-posta helbideen domeinua blokeatu du"
         create_ip_block_html: "%{name} kontuak %{target} IParen araua sortu du"
         create_unavailable_domain_html: "%{name}(e)k %{target} domeinurako banaketa gelditu du"
         create_user_role_html: "%{name} erabiltzaileak %{target} rola sortu du"
         demote_user_html: "%{name} erabiltzaileak %{target} erabiltzailea mailaz jaitsi du"
         destroy_announcement_html: "%{name} erabiltzaileak %{target} iragarpena ezabatu du"
-        destroy_canonical_email_block_html: "%{name} erabiltzaileak %{target} hash-a duen helbide elektronikoa desblokeatu du"
         destroy_custom_emoji_html: "%{name} erabiltzaileak %{target} emoji-a ezabatu du"
         destroy_domain_allow_html: "%{name} erabiltzaileak %{target} domeinuarekin federatzea debekatu du"
         destroy_domain_block_html: "%{name} erabiltzaileak %{target} domeinua desblokeatu du"
-        destroy_email_domain_block_html: "%{name} erabiltzaileak %{target} e-posta helbideen domeinua desblokeatu du"
         destroy_instance_html: "%{name} erabiltzaileak %{target} domeinua betiko ezabatu du"
         destroy_ip_block_html: "%{name} erabiltzaileak %{target} IParen araua ezabatu du"
         destroy_status_html: "%{name} erabiltzaileak %{target} erabiltzailearen bidalketa kendu du"
@@ -259,10 +242,8 @@ eu:
         destroy_user_role_html: "%{name} erabiltzaileak %{target} rola ezabatu du"
         disable_2fa_user_html: "%{name} erabiltzaileak %{target} erabiltzailearen bi faktoreko autentifikazioa desgaitu du"
         disable_custom_emoji_html: "%{name} erabiltzaileak %{target} emoji-a desgaitu du"
-        disable_sign_in_token_auth_user_html: "%{name} erabiltzaileak e-posta token autentifikazioa desgaitu du %{target} helburuan"
         disable_user_html: "%{name} erabiltzaileak %{target} erabiltzailearen saioa desgaitu du"
         enable_custom_emoji_html: "%{name} erabiltzaileak %{target} emoji-a gaitu du"
-        enable_sign_in_token_auth_user_html: "%{name} erabiltzaileak e-posta token autentifikazioa gaitu du %{target} helburuan"
         enable_user_html: "%{name} erabiltzaileak %{target} erabiltzailearen saioa gaitu du"
         memorialize_account_html: "%{name} erabiltzaileak %{target} kontua memoriala bihurtu du"
         promote_user_html: "%{name} erabiltzaileak %{target} erabiltzailea mailaz igo du"
@@ -270,7 +251,6 @@ eu:
         reject_user_html: "%{name} erabiltzaileak %{target} erabiltzailearen izen-ematea baztertu du"
         remove_avatar_user_html: "%{name} erabiltzaileak %{target} erabiltzailearen abatarra kendu du"
         reopen_report_html: "%{name} erabiltzaileak %{target} txostena berrireki du"
-        resend_user_html: "%{name} kontuak berrespen eposta bidali du %{target} kontuarentzat"
         reset_password_user_html: "%{name} erabiltzaileak %{target} erabiltzailearen pasahitza berrezarri du"
         resolve_report_html: "%{name} erabiltzaileak %{target} txostena konpondu du"
         sensitive_account_html: "%{name} erabiltzaileak %{target} erabiltzailearen multimedia hunkigarri bezala markatu du"
@@ -431,7 +411,6 @@ eu:
       attempts_over_week:
         one: Izen-emateko saiakera %{count} azken astean
         other: Izen-emateko %{count} saiakera azken astean
-      created_msg: Ongi gehitu da e-mail helbidea domeinuen zerrenda beltzera
       delete: Ezabatu
       dns:
         types:
@@ -440,12 +419,8 @@ eu:
       new:
         create: Gehitu domeinua
         resolve: Ebatzi domeinua
-        title: Sarrera berria e-mail zerrenda beltzean
-      no_email_domain_block_selected: Ez da eposta domeinu blokeorik aldatu ez delako bat ere hautatu
       not_permitted: Baimendu gabea
-      resolved_dns_records_hint_html: Domeinu-izena ondorengo MX domeinuetara ebazten da, zeinek eposta onartzeko ardura duten. MX domeinu bat blokeatzeak MX domeinu hori erabiltzen duen edozein helbide elektronikotatik izena-ematea blokeatzen du, baita ikusgai dagoen domeinu-izena beste bat bada ere. <strong>Kontuz ibili eposta hornitzaile nagusiak blokeatu gabe.</strong>
       resolved_through_html: "%{domain} domeinuaren bidez ebatzia"
-      title: E-mail zerrenda beltza
     export_domain_allows:
       new:
         title: Baimendutako domeinuak inportatu
@@ -596,7 +571,6 @@ eu:
         resolve_description_html: Ez da ekintzarik hartuko salatutako kontuaren aurka, ez da neurria gordeko eta salaketa itxiko da.
         silence_description_html: Kontua soilik honen jarraitzaile edo espresuki bilatzen dutenentzat izango da ikusgarri, kontuaren irisgarritasuna gogorki mugatzen delarik.
         suspend_description_html: Kontua bera eta honen edukiak eskuraezinak izango dira, eta azkenean, ezabatuak. Kontu honekin erlazionatzea ezinezkoa izango da. Prozesua 30 egunez itzulgarria izango da. Kontu honen aurkako txosten guztiak baztertuko lirateke.
-      actions_description_html: Erabaki txosten hau konpontzeko ze ekintza hartu. Salatutako kontuaren aurka zigor ekintza bat hartzen baduzu, eposta jakinarazpen bat bidaliko zaie, <strong>Spam</strong> kategoria hautatzean ezik.
       actions_description_remote_html: Hautatu txosten honi konponbidea aurkitzeko zein neurri hartu. Hau soilik <strong>zure</strong> zerbitzaria urruneko kontu honekin nola komunikatu eta bere edukia nola maneiatzeko da.
       add_to_report: Gehitu gehiago txostenera
       already_suspended_badges:
@@ -660,7 +634,6 @@ eu:
         delete_data_html: "<strong>@%{acct}</strong> kontuaren profila eta edukia, gaurtik hasita, 30 egunez ezabatu, ez bada bitartean kontua berraktibatzen"
         preview_preamble_html: "<strong>@%{acct}</strong> kontuak ondorengo edukia duen abisu bat jasoko du:"
         record_strike_html: "<strong>@%{acct}</strong> kontuak eginiko eraso bat erregistratu, kontu honek etorkizunean egin ditzakeen erasoen aurrean erabakiak hartzen laguntzeko"
-        send_email_html: "<strong>@%{acct}</strong> kontuari abisu bat posta-elektronikoz bidali"
         warning_placeholder: Moderazio-ekintzarako aukerazkoak diren arrazoiketa gehigarriak.
       target_origin: Salatutako kontuaren jatorria
       title: Salaketak
@@ -700,7 +673,6 @@ eu:
         manage_appeals: Kudeatu apelazioak
         manage_appeals_description: Baimendu erabiltzaileek moderazio ekintzen aurkako apelazioak berrikustea
         manage_blocks: Kudeatu blokeatzeak
-        manage_blocks_description: Baimendu erabiltzaileek eposta hornitzaile eta IP helbideak blokeatzea
         manage_custom_emojis: Kudeatu emoji pertsonalizatuak
         manage_custom_emojis_description: Baimendu erabiltzaileek zerbitzariko emoji pertsonalizatuak kudeatzea
         manage_federation: Kudeatu federazioa
@@ -718,7 +690,6 @@ eu:
         manage_taxonomies: Kudeatu taxonomiak
         manage_taxonomies_description: Baimendu erabiltzaileek joerak berrikustea eta traolen ezarpenak eguneratzea
         manage_user_access: Kudeatu erabiltzaileen sarbidea
-        manage_user_access_description: Baimendu erabiltzaileek beste erabiltzaileen bi faktoreko autentifikazioa desaktibatzea, eposta helbideak aldatzea eta pasahitzak berrezartzea
         manage_users: Kudeatu erabiltzaileak
         manage_users_description: Baimendu erabiltzaileek beste erabiltzaileen xehetasunak ikusi eta moderazio ekintzak burutzea
         manage_webhooks: Kudeatu webhook-ak
@@ -793,7 +764,6 @@ eu:
       destroyed_msg: Guneko igoera ongi ezabatu da!
     software_updates:
       critical_update: Kritikoa — mesedez, eguneratu azkar
-      description: Zure Mastodon instalazioa eguneratuta mantentzea gomendatzen da azken konponketa eta hobekuntzak edukitzeko. Gainera, batzuetan funtsezkoa da Mastodon garaiz eguneratzea segurtasun-arazoak saihesteko. Arrazoi horiengatik, Mastodonek eguneratzeak egiaztatzen ditu 30 minuturo, eta zure posta elektronikoko jakinarazpen-hobespenen arabera jakinaraziko dizu.
       documentation_link: Informazio gehiago
       release_notes: Bertsio oharrak
       title: Eguneraketak eskuragarri
@@ -945,7 +915,6 @@ eu:
         used_by_over_week:
           one: Pertsona batek erabilia azken astean
           other: "%{count} pertsonak erabilia azken astean"
-      title: Joerak
       trending: Joerak
     warning_presets:
       add_new: Gehitu berria
@@ -1029,9 +998,7 @@ eu:
       guide_link_text: Edonork lagundu dezake.
     sensitive_content: Eduki hunkigarria
   application_mailer:
-    notification_preferences: Aldatu e-mail hobespenak
     salutation: "%{name},"
-    settings: 'Aldatu e-mail hobespenak: %{link}'
     unsubscribe: Kendu harpidetza
     view: 'Ikusi:'
     view_profile: Ikusi profila
@@ -1051,7 +1018,6 @@ eu:
       hint_html: Azken kontu bat! Gizakia zarela berretsi behar dugu (zabor-kontuak kanpoan mantentzeko baino ez da!) Ebatzi azpiko CAPTCHA eta sakatu "Jarraitu".
       title: Segurtasun txekeoa
     confirmations:
-      awaiting_review: Zure helbide elektronikoa baieztatu da! %{domain} lan taldea zure erregistroa berrikusten ari da. Mezu elektroniko bat jasoko duzu zure kontua onartzen badute!
       awaiting_review_title: Zure izen-ematea berrikusten ari da
       clicking_this_link: lotura hau klikatzen
       login_link: hasi saioa
@@ -1059,7 +1025,6 @@ eu:
       redirect_to_app_html: "<strong>%{app_name}</strong> aplikaziora berbideratua izan beharko zenuke. Hori gertatu ez bada, saiatu %{clicking_this_link} edo eskuz itzuli."
       registration_complete: Osatuta dago orain zure izen-ematea %{domain} -en!
       welcome_title: Ongi etorri, %{name}!
-      wrong_email_hint: Helbide-elektroniko hori zuzena ez bada, kontuaren ezarpenetan alda dezakezu.
     delete_account: Ezabatu kontua
     delete_account_html: Kontua ezabatu nahi baduzu, <a href="%{path}">jarraitu hemen</a>. Berrestea eskatuko zaizu.
     description:
@@ -1080,7 +1045,6 @@ eu:
     or_log_in_with: Edo hasi saioa honekin
     privacy_policy_agreement_html: <a href="%{privacy_policy_path}" target="_blank">Pribatutasun politika</a> irakurri dut eta ados nago
     progress:
-      confirm: Berretsi eposta
       details: Zure xehetasunak
       review: Gure berrikuspena
       rules: Onartu arauak
@@ -1102,10 +1066,8 @@ eu:
     security: Segurtasuna
     set_new_password: Ezarri pasahitza berria
     setup:
-      email_below_hint_html: Begiratu zure spameko karpetan, edo eskatu beste bat. Zure helbide elektronikoa zuzen dezakezu oker badago.
       email_settings_hint_html: Egin klik bidali dizugun estekan %{email} helbidea egiaztatzeko. Hementxe itxarongo zaitugu.
       link_not_received: Ez duzu estekarik jaso?
-      new_confirmation_instructions_sent: Berrespen-esteka duen mezu berri bat jasoko duzu minutu gutxi barru!
       title: Begiratu zure sarrera-ontzia
     sign_in:
       preamble_html: Zure <strong>%{domain}-(e)ko</strong> egiaztagiriekin saioa hasi. Zure kontua beste zerbitzari batean badago, ezin izango duzu hemen saioa hasi.
@@ -1116,9 +1078,7 @@ eu:
       title: "%{domain} zerbitzariko kontua prestatuko dizugu."
     status:
       account_status: Kontuaren egoera
-      confirming: E-mail baieztapena osatu bitartean zain.
       functional: Zure kontua guztiz erabilgarri dago.
-      pending: Zure eskaera gainbegiratzeko dago oraindik. Honek denbora behar lezake. Zure eskaera onartzen bada e-mail bat jasoko duzu.
       redirecting_to: Zure kontua ez dago aktibo orain %{acct} kontura birbideratzen duelako.
       self_destruct: "%{domain} domeinua itxiko denez, konturako sarbide mugatua soilik izango duzu."
       view_strikes: Ikusi zure kontuaren aurkako neurriak
@@ -1161,9 +1121,6 @@ eu:
       before: 'Jarraitu aurretik, irakurri adi ohar hauek:'
       caches: Beste zerbitzariek cachean duten edukia mantentzea gerta daiteke
       data_removal: Zure bidalketak eta beste datuak behin betiko ezabatuko dira
-      email_change_html: <a href="%{path}">Zure e-mail helbidea aldatu dezakezu</a> kontua ezabatu gabe
-      email_contact_html: Oraindik heltzen ez bada, eposta bai bidali dezakezu <a href="mailto:%{email}">%{email}</a> helbidera laguntza eskatzeko
-      email_reconfirmation_html: Ez baduzu baieztamen e-maila jasotzen, <a href="%{path}">berriro eskatu</a> dezakezu
       irreversible: Ezin izango duzu kontua berreskuratu edo berraktibatu
       more_details_html: Xehetasun gehiagorako, ikusi <a href="%{terms_path}">pribatutasun politika</a>.
       username_available: Zure erabiltzaile-izena berriro eskuragarri egongo da
@@ -1396,7 +1353,6 @@ eu:
     authentication_methods:
       otp: bi faktoreko autentifikazio aplikazioa
       password: pasahitza
-      sign_in_token: e-posta segurtasun kodea
       webauthn: segurtasun gakoak
     description_html: Ezagutzen ez duzun aktibitatea ikusten baduzu, pasahitza aldatu eta bi faktoreko autentifikazioa gaitzea gomendatzen dizugu.
     empty: Ez dago autentifikazio historiarik eskuragarri
@@ -1407,18 +1363,6 @@ eu:
     unsubscribe:
       action: Bai, kendu harpidetza
       complete: Harpidetza kenduta
-      confirmation_html: |-
-        Ziur Mastodonen %{domain} zerbitzariko %{type} %{email} helbide elektronikoan jasotzeari utzi nahi diozula?
-        Beti harpidetu zaitezke berriro <a href="%{settings_path}">eposta jakinarazpenen hobespenetan</a>.
-      emails:
-        notification_emails:
-          favourite: zure argitalpena gogoko egin dutenaren jakinarazpen e-mailak
-          follow: jarraitu dizutenaren jakinarazpen e-mailak
-          follow_request: jarraipen-eskaeren jakinarazpen e-mailak
-          mention: aipamenen jakinarazpen e-mailak
-          reblog: bultzaden jakinarazpen e-mailak
-      resubscribe_html: Nahi gabe utzi badiozu jakinarazpenak jasotzeari, berriro harpidetu zaitezke <a href="%{settings_path}">e-mail jakinarazpenen hobespenetan</a>.
-      success_html: Ez duzu Mastodonen %{domain} zerbitzariko %{type} jasoko %{email} helbide elektronikoan.
       title: Kendu harpidetza
   media_attachments:
     validations:
@@ -1499,8 +1443,6 @@ eu:
     update:
       subject: "%{name} erabiltzaileak bidalketa bat editatu du"
   notifications:
-    administration_emails: Administratzailearen posta elektroniko bidezko jakinarazpenak
-    email_events: E-mail jakinarazpenentzako gertaerak
     email_events_hint: 'Hautatu jaso nahi dituzun gertaeren jakinarazpenak:'
   number:
     human:
@@ -1659,7 +1601,6 @@ eu:
     import: Inportazioa
     import_and_export: Inportatu eta esportatu
     migrate: Kontuaren migrazioa
-    notifications: Posta bidezko jakinarazpenak
     preferences: Hobespenak
     profile: Profila
     relationships: Jarraitutakoak eta jarraitzaileak
@@ -1906,7 +1847,6 @@ eu:
     invalid_otp_token: Bi faktoreetako kode baliogabea
     otp_lost_help_html: 'Bietara sarbidea galdu baduzu, jarri kontaktuan hemen: %{email}'
     rate_limited: Autentifikazio saiakera gehiegi, saiatu berriro geroago.
-    seamless_external_login: Kanpo zerbitzu baten bidez hasi duzu saioa, beraz pasahitza eta e-mail ezarpenak ez daude eskuragarri.
     signed_in_as: 'Saioa honela hasita:'
   verification:
     extra_instructions_html: <strong>Aholkua:</strong> webguneko esteka ikusezina izan daiteke. Muina <code>rel="me"</code> da, erabiltzaileak sortutako edukia duten webguneetan beste inor zure burutzat aurkeztea eragozten duena. <code>a</code> beharrean <code>esteka</code> motako etiketa bat ere erabil dezakezu orriaren goiburuan, baina HTMLak erabilgarri egon behar du JavaScript exekutatu gabe.
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 509d69fcba71c8..42782da2045999 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -31,7 +31,6 @@ fa:
       created_msg: یادداشت مدیر با موفقیت ساخته شد!
       destroyed_msg: یادداشت نظارتی با موفقیت نابود شد!
     accounts:
-      add_email_domain_block: انسداد دامنهٔ رایانامه
       approve: پذیرفتن
       approved_msg: کارهٔ ثبت‌نام %{username} با موفقیت تأیید شد
       are_you_sure: مطمئنید؟
@@ -58,7 +57,6 @@ fa:
       demote: تنزل‌دادن
       destroyed_msg: داده‌های %{username} در صف حدف قرار گرفتند
       disable: از کار انداختن
-      disable_sign_in_token_auth: از کار انداختن تأیید هویت ژتون رایانامه‌ای
       disable_two_factor_authentication: از کار انداختن ورود دومرحله‌ای
       disabled: از کار افتاده
       display_name: نام نمایشی
@@ -67,7 +65,6 @@ fa:
       email: رایانامه
       email_status: وضعیت رایانامه
       enable: به کار انداختن
-      enable_sign_in_token_auth: به کار انداختن تأیید هویت ژتون رایانامه‌ای
       enabled: به کار افتاده
       enabled_msg: حساب %{username} با موفقیت به کار انداخته شد
       followers: پیگیران
@@ -132,7 +129,6 @@ fa:
       resubscribe: اشتراک دوباره
       role: نقش
       search: جست‌وجو
-      search_same_email_domain: دیگر کاربران با دامنهٔ رایانامهٔ یکسان
       search_same_ip: دیگر کاربران با IP یکسان
       security: امنیت
       security_measures:
@@ -173,26 +169,21 @@ fa:
         approve_appeal: پذیرش درخواست تجدیدنظر
         approve_user: تایید کاربر
         assigned_to_self_report: واگذاری گزارش
-        change_email_user: تغییر رایانامه برای کاربر
         change_role_user: تغیر نقش کاربر
         confirm_user: تأیید کاربر
         create_account_warning: ایجاد هشدار
         create_announcement: ایجاد اعلامیه
-        create_canonical_email_block: ایجاد انسداد ایمیل
         create_custom_emoji: ایجاد اموجی سفارشی
         create_domain_allow: ایجاد اجازهٔ دامنه
         create_domain_block: ایجاد انسداد دامنه
-        create_email_domain_block: ایجاد انسداد دامنهٔ رایانامه
         create_ip_block: ایجاد قاعدهٔ آی‌پی
         create_unavailable_domain: ایجاد دامنهٔ ناموجود
         create_user_role: ایجاد نقش
         demote_user: تنزل کاربر
         destroy_announcement: حذف اعلامیه
-        destroy_canonical_email_block: پاک کردن انسداد ایمیل
         destroy_custom_emoji: حذف اموجی سفارشی
         destroy_domain_allow: حذف اجازهٔ دامنه
         destroy_domain_block: حذف انسداد دامنه
-        destroy_email_domain_block: حذف انسداد دامنهٔ رایانامه
         destroy_instance: پاکسازی دامنه
         destroy_ip_block: حذف قاعدهٔ آی‌پی
         destroy_status: حذف وضعیت
@@ -200,10 +191,8 @@ fa:
         destroy_user_role: نابودی نقش
         disable_2fa_user: از کار انداختن ورود دومرحله‌ای
         disable_custom_emoji: از کار انداختن اموجی سفارشی
-        disable_sign_in_token_auth_user: از کار انداختن تأیید هویت ژتون رایانامه‌ای برای کاربر
         disable_user: از کار انداختن کاربر
         enable_custom_emoji: به کار انداختن اموجی سفارشی
-        enable_sign_in_token_auth_user: به کار انداختن تأیید هویت ژتون رایانامه‌ای برای کاربر
         enable_user: به کار انداختن کاربر
         memorialize_account: یادسپاری حساب
         promote_user: ترفیع کاربر
@@ -232,26 +221,20 @@ fa:
         approve_appeal_html: "%{name} درخواست تجدیدنظر تصمیم مدیر را از %{target} پذیرفت"
         approve_user_html: "%{name} ثبت نام %{target} را تایید کرد"
         assigned_to_self_report_html: "%{name} رسیدگی به گزارش %{target} را به عهده گرفت"
-        change_email_user_html: "%{name} نشانی رایانامهٔ کاربر %{target} را عوض کرد"
         change_role_user_html: "%{name} نقش %{target} را تغییر داد"
-        confirm_user_html: "%{name} نشانی رایانامهٔ کاربر %{target} را تأیید کرد"
         create_account_warning_html: "%{name} هشداری برای %{target} فرستاد"
         create_announcement_html: "%{name} اعلامیه‌ای جدید ایجاد کرد %{target}"
-        create_canonical_email_block_html: "%{name} رایانامه با درهم‌ریزی %{target} را مسدود کرد"
         create_custom_emoji_html: "%{name} اموجی تازهٔ %{target} را بارگذاشت"
         create_domain_allow_html: "%{name} دامنهٔ %{target} را مجاز کرد"
         create_domain_block_html: "%{name} دامنهٔ %{target} را مسدود کرد"
-        create_email_domain_block_html: "%{name} دامنهٔ رایانامهٔ %{target} را مسدود کرد"
         create_ip_block_html: "%{name} برای آی‌پی %{target} قانونی ایجاد کرد"
         create_unavailable_domain_html: "%{name} تحویل محتوا به دامنه %{target} را متوقف کرد"
         create_user_role_html: "%{name} نقش %{target} را ایجاد کرد"
         demote_user_html: "%{name} کاربر %{target} را تنزل داد"
         destroy_announcement_html: "%{name} اعلامیهٔ %{target} را حذف کرد"
-        destroy_canonical_email_block_html: "%{name} رایانامه با درهم‌ریزی %{target} را نامسدود کرد"
         destroy_custom_emoji_html: "%{name} شکلک %{target} را حذف کرد"
         destroy_domain_allow_html: "%{name} دامنهٔ %{target} را از فهرست مجاز برداشت"
         destroy_domain_block_html: "%{name} انسداد دامنهٔ %{target} را رفع کرد"
-        destroy_email_domain_block_html: "%{name} انسداد دامنهٔ رایانامهٔ %{target} را برداشت"
         destroy_instance_html: "%{name} دامنه %{target} را پاکسازی کرد"
         destroy_ip_block_html: "%{name} قاعدهٔ آی‌پی %{target} را حذف کرد"
         destroy_status_html: "%{name} وضعیت %{target} را برداشت"
@@ -259,10 +242,8 @@ fa:
         destroy_user_role_html: "%{name} نقش %{target} را حذف کرد"
         disable_2fa_user_html: "%{name} ضرورت ورود دو مرحله‌ای را برای کاربر %{target} غیر فعال کرد"
         disable_custom_emoji_html: "%{name} شکلک %{target} را غیرفعال کرد"
-        disable_sign_in_token_auth_user_html: "%{name}، احراز هویت با توکن رایانامه را برای %{target} غیرفعال کرد"
         disable_user_html: "%{name} ورود را برای کاربر %{target} غیرفعال کرد"
         enable_custom_emoji_html: "%{name} شکلک %{target} را فعال کرد"
-        enable_sign_in_token_auth_user_html: "%{name}، احراز هویت با توکن رایانامه را برای %{target} فعال کرد"
         enable_user_html: "%{name} ورود را برای کاربر %{target} فعال کرد"
         memorialize_account_html: "%{name} حساب %{target} را تبدیل به صفحهٔ یادمان کرد"
         promote_user_html: "%{name} کاربر %{target} را ترفیع داد"
@@ -270,7 +251,6 @@ fa:
         reject_user_html: "%{name} ثبت نام %{target} را رد کرد"
         remove_avatar_user_html: "%{name} تصویر نمایهٔ %{target} را حذف کرد"
         reopen_report_html: "%{name} گزارش %{target} را دوباره به جریان انداخت"
-        resend_user_html: "%{name} رایانامهٔ تأیید برای %{target} را دوباره فرستاد"
         reset_password_user_html: "%{name} گذرواژه کاربر %{target} را بازنشاند"
         resolve_report_html: "%{name} گزارش %{target} را رفع کرد"
         sensitive_account_html: "%{name} رسانهٔ %{target} را به عنوان حساس علامت‌گذاری کرد"
@@ -426,7 +406,6 @@ fa:
       attempts_over_week:
         one: "%{count} تلاش در هفتهٔ گذشته"
         other: "%{count} تلاش ورود در هفتهٔ گذشته"
-      created_msg: دامنهٔ رایانامه با موفقیت مسدود شد
       delete: پاک‌کردن
       dns:
         types:
@@ -435,9 +414,7 @@ fa:
       new:
         create: ساختن مسدودسازی
         resolve: حل و فصل دامنه
-        title: مسدودسازی دامنهٔ رایانامهٔ جدید
       not_permitted: مجاز نیست
-      title: دامنه‌های رایانامهٔ مسدود شده
     export_domain_allows:
       new:
         title: درون‌ریزی اجازه‌های دامنه
@@ -801,7 +778,6 @@ fa:
         title: برچسب‌های پرطرفدار
         trending_rank: 'پرطرفدار #%{rank}'
         usable: قابل استفاده
-      title: پرطرفدار
       trending: پرطرفدار
     warning_presets:
       add_new: افزودن تازه
@@ -870,9 +846,7 @@ fa:
       guide_link_text: همه می‌توانند کمک کنند.
     sensitive_content: محتوای حساس
   application_mailer:
-    notification_preferences: تغییر ترجیحات ایمیل
     salutation: "%{name}،"
-    settings: 'تغییر تنظیمات ایمیل: %{link}'
     unsubscribe: لغو اشتراک
     view: 'نمایش:'
     view_profile: دیدن نمایه
@@ -912,7 +886,6 @@ fa:
     or_log_in_with: یا ورود به وسیلهٔ
     privacy_policy_agreement_html: <a href="%{privacy_policy_path}" target="_blank">سیاست محرمانگی</a> را خوانده و پذیرفته‌ام
     progress:
-      confirm: تأیید رایانامه
       details: جزئیات شما
       review: بررسی ما
       rules: پذیرش قوانین
@@ -937,9 +910,7 @@ fa:
       title: ورود به %{domain}
     status:
       account_status: وضعیت حساب
-      confirming: در حال انتظار برای کامل شدن تأیید ایمیل.
       functional: حسابتان کاملاً قابل استفاده است.
-      pending: درخواست شما منتظر تأیید مسئولان سایت است و این فرایند ممکن است کمی طول بکشد. اگر درخواست شما پذیرفته شود به شما ایمیلی فرستاده خواهد شد.
       redirecting_to: حساب شما غیرفعال است زیرا هم‌اکنون به %{acct} منتقل شده است.
       view_strikes: دیدن شکایت‌های گذشته از حسابتان
     too_fast: فرم با سرعت بسیار زیادی فرستاده شد، دوباره تلاش کنید.
@@ -981,9 +952,6 @@ fa:
       before: 'پیش از ادامه،‌ لطفاً نکته‌های زیر را به دقت بخوانید:'
       caches: ممکن است محتواهایی که دیگر کارسازها ذخیره کرده‌اند، همچنان باقی بماند
       data_removal: نوشته‌ها و داده‌های شما برای همیشه پاک خواهند شد
-      email_change_html: شما می‌توانید بدون پاک کردن حساب <a href="%{path}">نشانی ایمیل خود را تغییر دهید</a>
-      email_contact_html: اگر ایمیل همچنان نرسیده، برای درخواست کمک به <a href="mailto:%{email}">%{email}</a> پیغام دهید
-      email_reconfirmation_html: اگر ایمیل تأیید به دستتان نرسیده، می‌توانید <a href="%{path}">یک بار دیگر برایش درخواست بدهید</a>
       irreversible: شما نخواهید توانست حساب خود را بازیابی یا فعال‌سازی کنید
       more_details_html: برای اطلاعات بیشتر <a href="%{terms_path}">سیاست رازداری</a> را ببینید.
       username_available: نام کاربری شما دوباره در دسترس خواهد بود
@@ -1175,7 +1143,6 @@ fa:
     authentication_methods:
       otp: کارهٔ تأیید هویت دوعاملی
       password: گذرواژه
-      sign_in_token: کد امنیتی رایانامه‌ای
       webauthn: کلیدهای امنیتی
     description_html: اگر فعالیتی می‌بینید که تشخیصش نمی‌دهید، تغییر گذرواژه و به کار انداختن تأیید هویت دوعاملی را در نظر داشته باشید.
     empty: هیچ تاریخچه‌ای از تأییدهویت موجود نیست
@@ -1185,9 +1152,6 @@ fa:
   mail_subscriptions:
     unsubscribe:
       complete: لغو اشتراک شد
-      emails:
-        notification_emails:
-          mention: رایانامه‌های آگاهی اشاره
       title: لغو اشتراک
   media_attachments:
     validations:
@@ -1268,7 +1232,6 @@ fa:
     update:
       subject: "%{name} فرسته‌ای را ویرایست"
   notifications:
-    email_events: رویدادها برای آگاهی‌های رایانامه‌ای
     email_events_hint: 'گزینش رویدادهایی که می‌خواهید برایشان آگاهی دریافت کنید:'
   number:
     human:
@@ -1579,7 +1542,6 @@ fa:
     go_to_sso_account_settings: به تنظیمات حساب فراهمگر هوبتتان بروید
     invalid_otp_token: کد ورود دومرحله‌ای نامعتبر است
     otp_lost_help_html: اگر شما دسترسی به هیچ‌کدامشان ندارید، باید با ایمیل %{email} تماس بگیرید
-    seamless_external_login: شما با یک سرویس خارج از مجموعه وارد شده‌اید، به همین دلیل تنظیمات ایمیل و گذرواژه برای شما در دسترس نیست.
     signed_in_as: 'واردشده به نام:'
   verification:
     extra_instructions_html: <strong>نکته:</strong> پیوند روی پایگاه وبتان می‌تواند نامرئی باشد. بخش مهم <code>rel="me"</code> است که از جعل هویت روی پایگاه‌هایی با محتوای تولید شده به دست کاربر جلوگیری می‌کند. حتا می‌توانید به جای برچسب <code>a</code> از برچسب <code>link</code> در سرایند صفحه استفاده کنید؛ ولی HTML باید بدون اجرای جاوااسکریپت در دسترس باشد.
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 9c20c1c14fb88a..0ec9ae7fe70280 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -203,7 +203,7 @@ fi:
         disable_sign_in_token_auth_user: Poista sähköpostitunnuksella todennus käytöstä käyttäjältä
         disable_user: Poista tili käytöstä
         enable_custom_emoji: Ota mukautettu emoji käyttöön
-        enable_sign_in_token_auth_user: Salli käyttäjälle sähköpostitunnuksella todennus
+        enable_sign_in_token_auth_user: Ota sähköpostitunnuksella todennus käyttöön käyttäjälle
         enable_user: Ota tili käyttöön
         memorialize_account: Muuta muistotiliksi
         promote_user: Ylennä käyttäjä
@@ -907,10 +907,16 @@ fi:
     trends:
       allow: Salli
       approved: Hyväksytty
+      confirm_allow: Haluatko varmasti sallia valitut tunnisteet?
+      confirm_disallow: Haluatko varmasti kieltää valitut tunnisteet?
       disallow: Kiellä
       links:
         allow: Salli linkki
         allow_provider: Salli julkaisija
+        confirm_allow: Haluatko varmasti sallia valitut linkit?
+        confirm_allow_provider: Haluatko varmasti sallia valitut palveluntarjoajat?
+        confirm_disallow: Haluatko varmasti kieltää valitut linkit?
+        confirm_disallow_provider: Haluatko varmasti kieltää valitut palveluntarjoajat?
         description_html: Näitä linkkejä jaetaan parhaillaan paljon tileillä, joiden julkaisuja palvelimesi näkee. Luettelo voi auttaa käyttäjiäsi saamaan selville, mitä maailmassa tapahtuu. Linkit eivät näy julkisesti ennen kuin hyväksyt julkaisijan. Voit myös sallia tai hylätä yksittäisiä linkkejä.
         disallow: Kiellä linkki
         disallow_provider: Kiellä julkaisija
@@ -934,6 +940,10 @@ fi:
       statuses:
         allow: Salli julkaisu
         allow_account: Salli tekijä
+        confirm_allow: Haluatko varmasti sallia valitut julkaisut?
+        confirm_allow_account: Haluatko varmasti sallia valitut tilit?
+        confirm_disallow: Haluatko varmasti kieltää valitut julkaisut?
+        confirm_disallow_account: Haluatko varmasti kieltää valitut tilit?
         description_html: Näitä julkaisuja palvelimesi tietää parhaillaan jaettavan ja lisättävän suosikkeihin paljon. Luettelo voi auttaa uusia ja palaavia käyttäjiäsi löytämään lisää seurattavia. Julkaisut eivät näy julkisesti ennen kuin hyväksyt niiden tekijän ja tekijä sallii tilinsä ehdottamisen. Voit myös sallia tai hylätä yksittäisiä julkaisuja.
         disallow: Kiellä julkaisu
         disallow_account: Kiellä tekijä
@@ -966,7 +976,7 @@ fi:
         used_by_over_week:
           one: Käyttänyt yksi käyttäjä viimeisen viikon aikana
           other: Käyttänyt %{count} käyttäjää viimeisen viikon aikana
-      title: Trendit
+      title: Suositukset ja trendit
       trending: Trendaus
     warning_presets:
       add_new: Lisää uusi
diff --git a/config/locales/fo.yml b/config/locales/fo.yml
index 74b37c759efd4e..3d7221deb7cc22 100644
--- a/config/locales/fo.yml
+++ b/config/locales/fo.yml
@@ -31,7 +31,6 @@ fo:
       created_msg: Umsjónarviðmerking stovnað!
       destroyed_msg: Umsjónarviðmerking strikað!
     accounts:
-      add_email_domain_block: Blokera teldupostanavnaøki
       approve: Vátta
       approved_msg: Góðkent tilmeldingarumbøn hjá %{username}
       are_you_sure: Ert tú vís/ur?
@@ -58,7 +57,6 @@ fo:
       demote: Lækka í tign
       destroyed_msg: Dáturnar hjá %{username} eru nú settar í bíðirøð at blíva strikaðar sum skjótast
       disable: Fryst
-      disable_sign_in_token_auth: Ger váttan við teldupostateknum óvirkna
       disable_two_factor_authentication: Ger 2FA óvirkið
       disabled: Fryst
       display_name: Vís navn
@@ -67,7 +65,6 @@ fo:
       email: Teldupostur
       email_status: Teldupostastøða
       enable: Tiðna
-      enable_sign_in_token_auth: Ger váttan við teldupostateknum virkna
       enabled: Í gildi
       enabled_msg: Tiðnaði kontuna hjá %{username}
       followers: Fylgjarar
@@ -132,7 +129,6 @@ fo:
       resubscribe: Tegna teg umaftur
       role: Leiklutur
       search: Leita
-      search_same_email_domain: Aðrir brúkarir eru við sama teldupost domaini
       search_same_ip: Aðrir brúkarar við somu IP
       security: Trygd
       security_measures:
@@ -173,26 +169,21 @@ fo:
         approve_appeal: Góðkenn kæru
         approve_user: Góðkenn brúkara
         assigned_to_self_report: Tilluta melding
-        change_email_user: Broyt teldupost fyri brúkara
         change_role_user: Broyt leiklut hjá brúkara
         confirm_user: Vátta brúkara
         create_account_warning: Stovna ávaring
         create_announcement: Stovna kunngerð
-        create_canonical_email_block: Stovna teldupostblokering
         create_custom_emoji: Stovna serligt kenslutekn
         create_domain_allow: Stovna navnaøkjaloyvi
         create_domain_block: Stovna navnaøkjablokering
-        create_email_domain_block: Stovna teldupostanavnaøkjablokering
         create_ip_block: Stovna IP reglu
         create_unavailable_domain: Stovna navnaøki, sum ikki er tøkt
         create_user_role: Stovna leiklut
         demote_user: Lækka brúkara í tign
         destroy_announcement: Strika kunngerð
-        destroy_canonical_email_block: Strika teldupostblokering
         destroy_custom_emoji: Strika serligt kenslutekn
         destroy_domain_allow: Strika navnaøkjaloyvi
         destroy_domain_block: Strika navnaøkjablokering
-        destroy_email_domain_block: Strika teldupostanavnaøkjablokering
         destroy_instance: Reinsa navnaøki
         destroy_ip_block: Strika IP reglu
         destroy_status: Strika post
@@ -200,10 +191,8 @@ fo:
         destroy_user_role: Bein burtur leiklut
         disable_2fa_user: Ger 2FA óvirkið
         disable_custom_emoji: Ger serligt kenslutekn óvirkið
-        disable_sign_in_token_auth_user: Ger váttan við teldupostateknum óvirkna fyri brúkara
         disable_user: Ger brúkara óvirknan
         enable_custom_emoji: Ger serligt kenslutekn virkið
-        enable_sign_in_token_auth_user: Ger váttan við teldupostateknum virkna fyri brúkara
         enable_user: Ger brúkara virknan
         memorialize_account: Minnst til Konto
         promote_user: Vís fram Brúkara
@@ -233,26 +222,20 @@ fo:
         approve_appeal_html: "%{name} góðkendi umsjónaráheitan frá %{target}"
         approve_user_html: "%{name} góðtók umsókn frá %{target}"
         assigned_to_self_report_html: "%{name} tillutaði frágreiðing %{target} til sín sjálvs"
-        change_email_user_html: "%{name} broytti teldupost addressuna hjá %{target}"
         change_role_user_html: "%{name} broytti leiklutin hjá %{target}"
-        confirm_user_html: "%{name} góðtók teldupost addressuna hjá %{target}"
         create_account_warning_html: "%{name} sendi eina ávaring til %{target}"
         create_announcement_html: "%{name} stovnaði eina fráboðan %{target}"
-        create_canonical_email_block_html: "%{name} forðaði telduposti við hash'inum %{target}"
         create_custom_emoji_html: "%{name} legði upp nýtt kenslutekn %{target}"
         create_domain_allow_html: "%{name} loyv sameining við domainið %{target}"
         create_domain_block_html: "%{name} blokeraði navnaøkið %{target}"
-        create_email_domain_block_html: "%{name} blokeraði teldupostanavnaøkið %{target}"
         create_ip_block_html: "%{name} gjørdi reglu fyri IP %{target}"
         create_unavailable_domain_html: "%{name} steðgaði veiting til navnaøkið %{target}"
         create_user_role_html: "%{name} stovnaði %{target} leiklutin"
         demote_user_html: "%{name} lækkaði tignina hjá brúkaranum %{target}"
         destroy_announcement_html: "%{name} strikaðar fráboðanir %{target}"
-        destroy_canonical_email_block_html: "%{name} strikaði blokeringina av teldupostin við hashkodu %{target}"
         destroy_custom_emoji_html: "%{name} strikaði kensluteknið %{target}"
         destroy_domain_allow_html: "%{name} havnaði sameining við navnaøkið %{target}"
         destroy_domain_block_html: "%{name} strikaði blokering av navnaøkinum %{target}"
-        destroy_email_domain_block_html: "%{name} leysgivi teldupostanavnaøkið %{target}"
         destroy_instance_html: "%{name} reinsaði navnaøkið %{target}"
         destroy_ip_block_html: "%{name} slettaðar reglur fyri IP %{target}"
         destroy_status_html: "%{name} slettaði upplegg hjá %{target}"
@@ -260,10 +243,8 @@ fo:
         destroy_user_role_html: "%{name} slettaði leiklutin hjá %{target}"
         disable_2fa_user_html: "%{name} slepti kravið um váttan í tveimum stigum fyri brúkaran %{target}"
         disable_custom_emoji_html: "%{name} gjørdi kensluteknið %{target} óvirkið"
-        disable_sign_in_token_auth_user_html: "%{name} gjørdi váttan við teldupostteknum óvirkna fyri %{target}"
         disable_user_html: "%{name} gjørdi innritan hjá brúkaranum %{target} óvirkna"
         enable_custom_emoji_html: "%{name} gjørdi kensluteknið %{target} virkið"
-        enable_sign_in_token_auth_user_html: "%{name} gjørdi váttan við teldupostteknum virkna fyri %{target}"
         enable_user_html: "%{name} gjørdi innritan virkna fyri brúkaran %{target}"
         memorialize_account_html: "%{name} broytti kontuna hjá %{target} til eina minnissíðu"
         promote_user_html: "%{name} flutti brúkaran %{target} fram"
@@ -271,7 +252,6 @@ fo:
         reject_user_html: "%{name} avvísti skráseting hjá %{target}"
         remove_avatar_user_html: "%{name} strikaði eftirgjørda skapningin hjá %{target}"
         reopen_report_html: "%{name} lat uppaftur meldingina %{target}"
-        resend_user_html: "%{name} endursendi váttanarteldubrævið fyri %{target}"
         reset_password_user_html: "%{name} setti loyniorðið hjá brúkaranum %{target} av nýggjum"
         resolve_report_html: "%{name} avgreiddi meldingina %{target}"
         sensitive_account_html: "%{name} hevur merkt media hjá %{target} sum viðkvæmt"
@@ -432,7 +412,6 @@ fo:
       attempts_over_week:
         one: "%{count} roynd seinastu vikuna"
         other: "%{count} tilmeldingarroyndir seinastu vikuna"
-      created_msg: Teldupostanavnaøkið blokerað
       delete: Strika
       dns:
         types:
@@ -441,12 +420,8 @@ fo:
       new:
         create: Stovna nýtt økisnavn
         resolve: Loys navnaøki
-        title: Blokera nýtt teldupostanavnaøki
-      no_email_domain_block_selected: Ongar teldupostanavnaøkisblokeringar vóru broyttar, tí ongar vóru valdar
       not_permitted: Ikki loyvt
-      resolved_dns_records_hint_html: Navnaøkið verður loyst til hesi MX navnaøki, sum í síðsta enda hava ábyrgdina av at móttaka teldupost. At blokera eitt MX navnaøki fer at blokera tilmeldingar frá einum og hvørjum teldupoststaði, sum brúkar sama MX navnaøki, sjálvt um sjónliga navnaøkið er eitt annað. <strong>Ansa eftir ikki at blokera stórar veitarar av telduposti</strong>
       resolved_through_html: Loyst gjøgnum %{domain}
-      title: Blokeraði teldupostanavnaøki
     export_domain_allows:
       new:
         title: Innflyt navnaøkjaloyvi
@@ -600,7 +575,6 @@ fo:
         resolve_description_html: Eingin atgerð verður tikin móti meldaðu kontuni, eingin atsókn verður skrásett og meldingin verður lukkað.
         silence_description_html: Kontan verður einans sjónlig hjá teimum, sum longu fylgja henni ella leita eftir henni við hond, og tað minkar nógv um, hvussu langt hon røkkur. Kann altíð angrast. Lukkar allar rapporteringar um hesa kontuna.
         suspend_description_html: Kontan og alt innihald hjá kontuni gerast óatkomulig og við tíðini strikaði, og tað verður ógjørligt at samvirka við henni. Kann angrast innan 30 dagar. Lukkar allar rapporteringar av hesi kontuni.
-      actions_description_html: Ger av hvør atgerð skal takast fyri at avgreiða hesa meldingina. Revsitiltøk móti meldaðu kontuni føra við sær, at ein teldupostfráboðan verður send teimum, undantikið tá <strong>Ruskpostur</strong> verður valdur.
       actions_description_remote_html: Tak avgerð um hvat skal gerast fyri at avgreiða hesa rapporteringina. Hetta fer einans at ávirka, hvussu <strong>tín</strong> ambætari samskiftir við hesa fjarkontuna og hvussu hann handfer tilfar frá henni.
       add_to_report: Legg meira afturat meldingini
       already_suspended_badges:
@@ -665,7 +639,6 @@ fo:
         delete_data_html: Strika vangan og innihaldið hjá <strong>@%{acct}</strong> um 30 dagar uttan so at kontan verður gjørd virkin aftur áðrenn tað
         preview_preamble_html: "<strong>@%{acct}</strong> ger at móttaka eina ávaring við hesum innihaldi:"
         record_strike_html: Skráset eitt brot á <strong>@%{acct}</strong>, soleiðis at tað kann havast í huga í samband við møgulig framtíðar mishald
-        send_email_html: Send <strong>@%{acct}</strong> eitt teldubræv við eini ávaring
         warning_placeholder: Møguligar eyka grundgevingar fyri umsjónaratgerð.
       target_origin: Uppruni hjá meldaðu kontuni
       title: Meldingar
@@ -705,7 +678,6 @@ fo:
         manage_appeals: Umsit kærur
         manage_appeals_description: Loyvir brúkarum at eftirkanna kærur um umsjónaratgerðir
         manage_blocks: Stýra blokeringum
-        manage_blocks_description: Loyvir brúkarum at blokera teldupostveitarum og IP adressum
         manage_custom_emojis: Stýra sergjørd kenslutekn
         manage_custom_emojis_description: Loyvir brúkarum at stýra sergjørdum kensluteknum á ambætaranum
         manage_federation: Stýra sameindum
@@ -723,7 +695,6 @@ fo:
         manage_taxonomies: Stýra flokkingum
         manage_taxonomies_description: Loyvir brúkarum at eftirkanna vælumtókt tilfar og at dagføra stillingar viðvíkjandi frámerkjum
         manage_user_access: Stýr brúkaraatgongd
-        manage_user_access_description: Loyvir brúkarum at gera 'váttan í tveimum stigum' (2FA) hjá øðrum brúkarum óvirkna, at broyta teirra teldupost og at nullstilla teirra loyniorð
         manage_users: Stýr brúkarum
         manage_users_description: Loyvir brúkarum at vísa smálutir um aðrar brúkarar og at gjøgnumføra umsjónaratgerðir móti teimum
         manage_webhooks: Stýr webhooks
@@ -798,7 +769,6 @@ fo:
       destroyed_msg: Vevstaðs-uppsending strikað!
     software_updates:
       critical_update: Kritiskt - vinarliga dagfør beinan vegin
-      description: Mælt verður til, at Mastodon-innleggingin hjá tær altíð er dagførd, soleiðis at hon fær gagn av nýggjastu ábótunum og hentleikunum. Harumframt er tað summatíðir kritiskt, at Mastodon umgangandi verður dagført fyri at mótvirka trygdartrupulleikum. Tí kekkar Mastodon hvørjar 30 minuttir, um dagføringar eru neyðugar, og letur teg frætta samsvarandi teldubrævafráboðanarstillingunum hjá tær.
       documentation_link: Lær meira
       release_notes: Útgávuviðmerkingar
       title: Tøkar dagføringar
@@ -907,10 +877,16 @@ fo:
     trends:
       allow: Loyv
       approved: Váttað
+      confirm_allow: Vil tú veruliga loyva valdu frámerkini?
+      confirm_disallow: Vil tú veruliga frávelja valdu frámerkini?
       disallow: Tak loyvi aftur
       links:
         allow: Loyv leinki
         allow_provider: Loyv útgevara
+        confirm_allow: Vil tú veruliga loyva valdu leinkini?
+        confirm_allow_provider: Vil tú veruliga loyva valdu veitararnar?
+        confirm_disallow: Vil tú veruliga frávelja valdu leinkini?
+        confirm_disallow_provider: Vil tú veruliga frávelja valdu veitararnar?
         description_html: Hesi leinkini verða í løtuni deild nógv av kontum, sum ambætarin sær postar hjá. At síggja leinkini kann hjálpa brúkarum at finna útav, hvat hendir í verðini. Eingi leinki verða víst alment, áðrenn tú góðkennir útgevaran. Tú kanst eisini loyva ella vraka einstøk leinki.
         disallow: Loyv ikki leinki
         disallow_provider: Loyv ikki útgevara
@@ -934,6 +910,10 @@ fo:
       statuses:
         allow: Loyv posti
         allow_account: Loyv høvundi
+        confirm_allow: Vil tú veruliga loyva valdu støðurnar?
+        confirm_allow_account: Vil tú veruliga loyva valdu konturnar?
+        confirm_disallow: Vil tú veruliga vraka valdu støðurnar?
+        confirm_disallow_account: Vil tú veruliga vraka valdu konturnar?
         description_html: Hetta eru postar, sum tín ambætari veit um og sum í løtuni vera deildir og dámaðir ofta. At vísa teir kann hjálpa nýggjum og afturvendandi brúkarum at finna fleiri fólk, sum tey vilja fylgja. Eingir postar verða vístir almenninginum, áðrenn tú góðkennir høvundin, og høvundurin loyvir teirra kontu at vera skotin upp fyri øðrum. Tú kanst eisini góðkenna ella vraka einstakar postar.
         disallow: Vraka post
         disallow_account: Vraka høvund
@@ -966,7 +946,7 @@ fo:
         used_by_over_week:
           one: Brúkt av einum brúkara seinastu vikuna
           other: Brúkt av %{count} brúkarum seinastu vikuna
-      title: Rák
+      title: Tilmæli & rák
       trending: Vælumtókt
     warning_presets:
       add_new: Legg afturat
@@ -1051,9 +1031,7 @@ fo:
       guide_link_text: Øll kunnu geva íkast.
     sensitive_content: Viðkvæmt innihald
   application_mailer:
-    notification_preferences: Broyt teldupostastillingar
     salutation: "%{name}"
-    settings: 'Broyt teldupostastillingar: %{link}'
     unsubscribe: Strika hald
     view: 'Vís:'
     view_profile: Vís vanga
@@ -1073,7 +1051,6 @@ fo:
       hint_html: Bara eitt afturat! Tað er neyðugt hjá okkum at vátta, at tú ert eitt menniskja (fyri at sleppa undan ruskposti!). Loys CAPTCHA niðanfyri og trýst á "Halt fram".
       title: Trygdarkanning
     confirmations:
-      awaiting_review: Teldupostadressan hjá góðkend! Nú kanna %{domain} ábyrgdarfólk skrásetingina hjá tær. Góðkenna tey kontu tína, so senda tey tær eitt teldubræv!
       awaiting_review_title: Skrásetingin hjá tær verður viðgjørd
       clicking_this_link: við at klikkja á hetta leinki
       login_link: rita inn
@@ -1081,7 +1058,6 @@ fo:
       redirect_to_app_html: Tú skuldi verið send/ur víðari til <strong>%{app_name}</strong> appina. Hendi tað ikki, so kanst tú royna %{clicking_this_link} ella fara manuelt aftur til appina.
       registration_complete: Skráseting tín á %{domain} er nú avgreidd!
       welcome_title: Vælkomin, %{name}!
-      wrong_email_hint: Um hesin teldupoststaðurin ikki er rættur, so kanst tú broyta hann í kontustillingunum.
     delete_account: Strika kontu
     delete_account_html: Ynskir tú at strika kontuna, so kanst tú <a href="%{path}">halda fram her</a>. Tú verður spurd/ur um váttan.
     description:
@@ -1102,7 +1078,6 @@ fo:
     or_log_in_with: Ella innrita við
     privacy_policy_agreement_html: Eg havi lisið og taki undir við <a href="%{privacy_policy_path}" target="_blank">privatlívspolitikkinum</a>
     progress:
-      confirm: Vátta teldupost
       details: Tínir smálutir
       review: Okkara kanning
       rules: Góðtak reglur
@@ -1124,10 +1099,8 @@ fo:
     security: Trygd
     set_new_password: Áset nýtt loyniorð
     setup:
-      email_below_hint_html: Kekka mappuna við ruskposti ella bið um ein annan. Tú kanst rætta teldupostadressuna, um hon er skeiv.
       email_settings_hint_html: Kekka leinkið, sum vit sendu tær at eftirkanna %{email}. Vit bíða beint her.
       link_not_received: Fekk tú einki leinki?
-      new_confirmation_instructions_sent: Tú fer at móttaka eitt nýtt teldubræv við váttanarleinkinum um nakrar fáar minuttir!
       title: Kekka innbakkan hjá tær
     sign_in:
       preamble_html: Rita inn við tínum <strong>%{domain}</strong> heimildum. Er konta tín á einum øðrum ambætara, so er ikki gjørligt hjá tær at rita inn her.
@@ -1138,9 +1111,7 @@ fo:
       title: Latum okkum fáa teg settan upp á %{domain}.
     status:
       account_status: Kontustøða
-      confirming: Bíði eftir at teldupostváttanin er gjøgnumførd.
       functional: Konta tín er fult virkin.
-      pending: Umsókn tín verður eftirkannað av okkara starvsfeløgum. Tað kann taka eina løtu. Tú móttekur eitt teldubræv, um umsóknin er góðkend.
       redirecting_to: Konta tín er óvirkin, tí í løtuni verður hon víðaribeind til %{acct}.
       self_destruct: Av tí at %{domain} er í ferð við at lukka, fært tú einans avmarkaða atgongd til tína kontu.
       view_strikes: Vís eldri atsóknir móti tíni kontu
@@ -1183,9 +1154,6 @@ fo:
       before: 'Áðrenn tú heldur fram, vinarliga les hesar notur nágreiniliga:'
       caches: Innihald, sum er lagt í goymslu á øðrum ambætarum, kann vera varandi har
       data_removal: Postar tínir og aðrar dátur verða burturbeind varandi
-      email_change_html: Tú kann <a href="%{path}">broyta tín teldupost</a> uttan at strika tína kontu
-      email_contact_html: Um tað framvegis ikki kemur vegin fram, so kanst tú senda teldubræv til <a href="mailto:%{email}">%{email}</a> og biðja um hjálp
-      email_reconfirmation_html: Móttekur tú ikki váttanarteldupostin, so kanst tú <a href="%{path}">biðja um hann aftur</a>
       irreversible: Tað verður ikki møguligt hjá tær at endurskapa ella gera kontu tína virkna aftur
       more_details_html: Fyri fleiri smálutir, sí <a href="%{terms_path}">privatlívpolitikkin</a>.
       username_available: Brúkaranavnið hjá tær verður tøkt aftur
@@ -1418,7 +1386,6 @@ fo:
     authentication_methods:
       otp: app til váttan í tveimum stigum
       password: loyniorð
-      sign_in_token: teldupostatrygdarkoda
       webauthn: trygdarlyklar
     description_html: Sært tú virksemi, sum tú ikki kennir aftur, so eigur tú at umhugsa at broyta loyniorðið ella at gera váttan í tveimum stigum virkna.
     empty: Eingin samgildissøga tøk
@@ -1429,16 +1396,6 @@ fo:
     unsubscribe:
       action: Ja, strika hald
       complete: Hald strikað
-      confirmation_html: Ert tú vís/ur í, at tú vil gevast at móttaka %{type} fyri Mastodon á %{domain} til tína teldupostadressu á %{email}? Tú kanst altíð gera haldið virkið aftur frá tínum <a href="%{settings_path}">teldupostfráboðanarstillingum</a>.
-      emails:
-        notification_emails:
-          favourite: yndisfráboðanarteldupostar
-          follow: fylg fráboðanarteldupostar
-          follow_request: fylg umbønir um teldupost
-          mention: nevn fráboðanarteldupostar
-          reblog: stimbra fráboðanarpostar
-      resubscribe_html: Um tú hevur strikað haldið av misgávum, so kanst tú tekna haldið av nýggjum í tínum <a href="%{settings_path}">teldupostfráboðarstillingum</a>.
-      success_html: Tú fer ikki longur at móttaka %{type} fyri Mastodon á %{domain} til tín teldupost á %{email}.
       title: Strika hald
   media_attachments:
     validations:
@@ -1519,8 +1476,6 @@ fo:
     update:
       subject: "%{name} rættaði ein post"
   notifications:
-    administration_emails: Fráboðanir um teldupost til umsitarar
-    email_events: Hendingar fyri teldupostfráboðanir
     email_events_hint: 'Vel hendingar, sum tú vil hava fráboðanir um:'
   number:
     human:
@@ -1679,7 +1634,6 @@ fo:
     import: Innflyt
     import_and_export: Innflyt og útflyt
     migrate: Flyting av kontu
-    notifications: Teldupostfráboðanir
     preferences: Stillingar
     profile: Vangi
     relationships: Fylging og fylgjarar
@@ -1923,7 +1877,6 @@ fo:
     invalid_otp_token: Ógyldug tvey-stigs koda
     otp_lost_help_html: Hevur tú mist atgongd til bæði, so kanst tú koma í samband við %{email}
     rate_limited: Ov nógvar samgildisroyndir, royn aftur seinni.
-    seamless_external_login: Tú er ritað/ur inn umvegis eina uttanhýsis tænastu, so loyniorð og teldupoststillingar eru ikki tøkar.
     signed_in_as: 'Ritað/ur inn sum:'
   verification:
     extra_instructions_html: <strong>Góð ráð:</strong> Leinkið á heimasíðuni hjá tær kann vera ósjónligt. Tann týdningarmikli parturin er <code>rel="me"</code> sum forðar tí, at onkur kann látast at vera ein annar á heimasíðuni við brúkara-gjørdum tilfari. Tú kanst enntá brúka eitt <code>link</code> frámerki í høvdinum á síðuni heldur enn <code>a</code>, men HTML kodan má vera atkomulig uttan at JavaScript skal koyra.
diff --git a/config/locales/fr-CA.yml b/config/locales/fr-CA.yml
index f297e8bfdea780..6ad27bc62d354d 100644
--- a/config/locales/fr-CA.yml
+++ b/config/locales/fr-CA.yml
@@ -31,7 +31,6 @@ fr-CA:
       created_msg: Note de modération créée avec succès !
       destroyed_msg: Note de modération supprimée avec succès !
     accounts:
-      add_email_domain_block: Bloquer ce domaine de courriel
       approve: Approuver
       approved_msg: La demande d’inscription de %{username} a été approuvée avec succès
       are_you_sure: Voulez-vous vraiment faire ça ?
@@ -58,7 +57,6 @@ fr-CA:
       demote: Rétrograder
       destroyed_msg: Les données de %{username} sont maintenant en file d’attente pour être supprimées imminemment
       disable: Geler
-      disable_sign_in_token_auth: Désactiver l'authentification basée sur les jetons envoyés par courriel
       disable_two_factor_authentication: Désactiver l’authentification à deux facteurs
       disabled: Gelé
       display_name: Nom affiché
@@ -67,7 +65,6 @@ fr-CA:
       email: Courriel
       email_status: État du courriel
       enable: Dégeler
-      enable_sign_in_token_auth: Activer l'authentification basée sur les jetons envoyés par courriel
       enabled: Activé
       enabled_msg: Le compte de %{username} a été dégelé avec succès
       followers: Abonné·e·s
@@ -132,7 +129,6 @@ fr-CA:
       resubscribe: Se réabonner
       role: Rôle
       search: Rechercher
-      search_same_email_domain: Autres utilisateurs·trices avec le même domaine de courriel
       search_same_ip: Autres utilisateur·rice·s avec la même IP
       security: Sécurité
       security_measures:
@@ -173,26 +169,21 @@ fr-CA:
         approve_appeal: Approuver l'appel
         approve_user: Approuver l’utilisateur
         assigned_to_self_report: Affecter le signalement
-        change_email_user: Modifier le courriel pour ce compte
         change_role_user: Changer le rôle de l’utilisateur·rice
         confirm_user: Confirmer l’utilisateur
         create_account_warning: Créer une alerte
         create_announcement: Créer une annonce
-        create_canonical_email_block: Créer un blocage de domaine de courriel
         create_custom_emoji: Créer des émojis personnalisés
         create_domain_allow: Créer un domaine autorisé
         create_domain_block: Créer un blocage de domaine
-        create_email_domain_block: Créer un blocage de domaine de courriel
         create_ip_block: Créer une règle IP
         create_unavailable_domain: Créer un domaine indisponible
         create_user_role: Créer le rôle
         demote_user: Rétrograder l’utilisateur·ice
         destroy_announcement: Supprimer l’annonce
-        destroy_canonical_email_block: Supprimer le blocage de domaine de courriel
         destroy_custom_emoji: Supprimer des émojis personnalisés
         destroy_domain_allow: Supprimer le domaine autorisé
         destroy_domain_block: Supprimer le blocage de domaine
-        destroy_email_domain_block: Supprimer le blocage de domaine de courriel
         destroy_instance: Purge du domaine
         destroy_ip_block: Supprimer la règle IP
         destroy_status: Supprimer le message
@@ -200,10 +191,8 @@ fr-CA:
         destroy_user_role: Détruire le rôle
         disable_2fa_user: Désactiver l’A2F
         disable_custom_emoji: Désactiver les émojis personnalisés
-        disable_sign_in_token_auth_user: Désactiver l'authentification basée sur les jetons envoyés par courriel pour l'utilisateur·rice
         disable_user: Désactiver le compte
         enable_custom_emoji: Activer les émojis personnalisées
-        enable_sign_in_token_auth_user: Activer l'authentification basée sur les jetons envoyés par courriel pour l'utilisateur·rice
         enable_user: Activer l’utilisateur
         memorialize_account: Ériger en mémorial
         promote_user: Promouvoir l’utilisateur
@@ -232,26 +221,20 @@ fr-CA:
         approve_appeal_html: "%{name} a approuvé l'appel de la décision de modération émis par %{target}"
         approve_user_html: "%{name} a approuvé l’inscription de %{target}"
         assigned_to_self_report_html: "%{name} s’est assigné·e le signalement de %{target}"
-        change_email_user_html: "%{name} a modifié l'adresse de courriel de l'utilisateur·rice %{target}"
         change_role_user_html: "%{name} a changé le rôle de %{target}"
-        confirm_user_html: "%{name} a confirmé l'adresse courriel de l'utilisateur %{target}"
         create_account_warning_html: "%{name} a envoyé un avertissement à %{target}"
         create_announcement_html: "%{name} a créé une nouvelle annonce %{target}"
-        create_canonical_email_block_html: "%{name} a bloqué l’e-mail avec le hachage %{target}"
         create_custom_emoji_html: "%{name} a téléversé un nouvel émoji %{target}"
         create_domain_allow_html: "%{name} a autorisé la fédération avec le domaine %{target}"
         create_domain_block_html: "%{name} a bloqué le domaine %{target}"
-        create_email_domain_block_html: "%{name} a bloqué de domaine de courriel %{target}"
         create_ip_block_html: "%{name} a créé une règle pour l'IP %{target}"
         create_unavailable_domain_html: "%{name} a arrêté la livraison vers le domaine %{target}"
         create_user_role_html: "%{name} a créé le rôle %{target}"
         demote_user_html: "%{name} a rétrogradé l'utilisateur·rice %{target}"
         destroy_announcement_html: "%{name} a supprimé l'annonce %{target}"
-        destroy_canonical_email_block_html: "%{name} a débloqué l'email avec le hash %{target}"
         destroy_custom_emoji_html: "%{name} a supprimé l'émoji %{target}"
         destroy_domain_allow_html: "%{name} a rejeté la fédération avec le domaine %{target}"
         destroy_domain_block_html: "%{name} a débloqué le domaine %{target}"
-        destroy_email_domain_block_html: "%{name} a débloqué le domaine de courriel %{target}"
         destroy_instance_html: "%{name} a purgé le domaine %{target}"
         destroy_ip_block_html: "%{name} a supprimé la règle pour l'IP %{target}"
         destroy_status_html: "%{name} a supprimé le message de %{target}"
@@ -259,10 +242,8 @@ fr-CA:
         destroy_user_role_html: "%{name} a supprimé le rôle %{target}"
         disable_2fa_user_html: "%{name} a désactivé l'authentification à deux facteurs pour l'utilisateur·rice %{target}"
         disable_custom_emoji_html: "%{name} a désactivé l'émoji %{target}"
-        disable_sign_in_token_auth_user_html: "%{name} a désactivé l'authentification basée sur les jetons envoyés par courriel pour %{target}"
         disable_user_html: "%{name} a désactivé la connexion de l'utilisateur·rice %{target}"
         enable_custom_emoji_html: "%{name} a activé l'émoji %{target}"
-        enable_sign_in_token_auth_user_html: "%{name} a activé l'authentification basée sur les jetons envoyés par courriel pour %{target}"
         enable_user_html: "%{name} a activé la connexion de l'utilisateur·rice %{target}"
         memorialize_account_html: "%{name} a converti le compte de %{target} en un mémorial"
         promote_user_html: "%{name} a promu l'utilisateur·rice %{target}"
@@ -270,7 +251,6 @@ fr-CA:
         reject_user_html: "%{name} a rejeté l’inscription de %{target}"
         remove_avatar_user_html: "%{name} a supprimé l'avatar de %{target}"
         reopen_report_html: "%{name} a rouvert le signalement %{target}"
-        resend_user_html: "%{name} a renvoyé l'e-mail de confirmation pour %{target}"
         reset_password_user_html: "%{name} a réinitialisé le mot de passe de l'utilisateur·rice %{target}"
         resolve_report_html: "%{name} a résolu le signalement %{target}"
         sensitive_account_html: "%{name} a marqué le média de %{target} comme sensible"
@@ -429,7 +409,6 @@ fr-CA:
       attempts_over_week:
         one: "%{count} tentative au cours de la dernière semaine"
         other: "%{count} tentatives au cours de la dernière semaine"
-      created_msg: Le blocage de domaine de courriel est désormais activé
       delete: Supprimer
       dns:
         types:
@@ -438,12 +417,8 @@ fr-CA:
       new:
         create: Créer le blocage
         resolve: Résoudre le domaine
-        title: Nouveau blocage de domaine de courriel
-      no_email_domain_block_selected: Aucun blocage de domaine de courriel n'a été modifié car aucun n'a été sélectionné
       not_permitted: Non autorisé
-      resolved_dns_records_hint_html: Le nom de domaine est relié aux domaines MX suivants, qui ont la responsabilité ultime d'accepter les courriels. Bloquer un domaine MX empêchera les inscriptions à partir de toute adresse courriel utilisant le même domaine MX, même si le nom de domaine affiché est différent. <strong> Veillez à ne pas bloquer les fournisseurs de messagerie d'envergure.</strong>
       resolved_through_html: Résolu par %{domain}
-      title: Blocage de domaines de courriel
     export_domain_allows:
       new:
         title: Importer les autorisations de domaine
@@ -594,7 +569,6 @@ fr-CA:
         resolve_description_html: Aucune mesure ne sera prise contre le compte signalé, aucune sanction ne sera enregistrée et le sigalement sera clôturé.
         silence_description_html: Le compte ne sera visible que par ceux qui le suivent déjà ou qui le recherchent manuellement, ce qui limite fortement sa portée. Cette action peut toujours être annulée. Cloture tous les signalements concernant ce compte.
         suspend_description_html: Le compte et tous ses contenus seront inaccessibles et finalement supprimés, et il sera impossible d'interagir avec lui. Réversible dans les 30 jours. Cloture tous les signalements concernant ce compte.
-      actions_description_html: Décidez des mesures à prendre pour résoudre ce signalement. Si vous prenez des mesures punitives contre le compte signalé, une notification sera envoyée par e-mail, sauf si la catégorie <strong>Spam</strong> est sélectionnée.
       actions_description_remote_html: Décidez des mesures à prendre pour résoudre ce signalement. Cela n'affectera que la manière dont <strong>votre</strong> serveur communique avec ce compte distant et traite son contenu.
       add_to_report: Ajouter davantage au rapport
       already_suspended_badges:
@@ -658,7 +632,6 @@ fr-CA:
         delete_data_html: effacer le profil de <strong>@%{acct}</strong> et ses contenus dans 30 jours, à moins que la suspension du compte ne soit annulée entre temps
         preview_preamble_html: "<strong>@%{acct}</strong> recevra un avertissement contenant les éléments suivants :"
         record_strike_html: enregistrer une sanction contre <strong>@%{acct}</strong> pour vous aider à prendre des mesures supplémentaires en cas d'infractions futures de ce compte
-        send_email_html: envoyer un courriel d'avertissement à <strong>@%{acct}</strong>
         warning_placeholder: Arguments supplémentaires pour l'action de modération (facultatif).
       target_origin: Origine du compte signalé
       title: Signalements
@@ -698,7 +671,6 @@ fr-CA:
         manage_appeals: Gérer les contestations
         manage_appeals_description: Permet aux utilisateur⋅rice⋅s d'examiner les appels contre les actions de modération
         manage_blocks: Gérer les blocages
-        manage_blocks_description: Permet aux utilisateur⋅rice⋅s de bloquer des fournisseurs de courriel et des adresses IP
         manage_custom_emojis: Gérer les émojis personnalisés
         manage_custom_emojis_description: Permet aux utilisateur⋅rice⋅s de gérer les émoticônes personnalisées sur le serveur
         manage_federation: Gérer de la féderation
@@ -716,7 +688,6 @@ fr-CA:
         manage_taxonomies: Gérer les taxonomies
         manage_taxonomies_description: Permet aux utilisateur⋅rice⋅s d'examiner les contenus tendance et de mettre à jour les paramètres des hashtags
         manage_user_access: Gérer l'accès utilisateur
-        manage_user_access_description: Permet aux utilisateur⋅rice⋅s de désactiver l'authentification à deux facteurs, de modifier l'adresse courriel et de réinitialiser le mot de passe des autres utilisateur⋅rice⋅s
         manage_users: Gérer les utilisateur·rice·s
         manage_users_description: Permet aux utilisateur⋅rice⋅s de voir les détails des autres utilisateur⋅rice⋅s et d'effectuer des actions de modération en conséquence
         manage_webhooks: Gérer les points d’ancrage web
@@ -790,7 +761,6 @@ fr-CA:
       destroyed_msg: Téléversement sur le site supprimé avec succès !
     software_updates:
       critical_update: Critique — veuillez mettre à jour au plus vite
-      description: Il est recommandé de maintenir votre installation de Mastodon à jour afin de bénéficier des derniers correctifs et des dernières fonctionnalités. Il est également essentiel de mettre à jour Mastodon rapidement dans certains cas afin d’éviter des problèmes de sécurité. Pour ces raisons, Mastodon vérifie les mises à jour toutes les 30 minutes, et vous en informera selon vos préférences de notification par e-mail.
       documentation_link: En savoir plus
       release_notes: Notes de mises à jour
       title: Mises à jour disponibles
@@ -942,7 +912,6 @@ fr-CA:
         used_by_over_week:
           one: Utilisé par %{count} personne au cours de la dernière semaine
           other: Utilisé par %{count} personnes au cours de la dernière semaine
-      title: Tendances
       trending: Tendances
     warning_presets:
       add_new: Ajouter un nouveau
@@ -1026,9 +995,7 @@ fr-CA:
       guide_link_text: Tout le monde peut y contribuer.
     sensitive_content: Contenu sensible
   application_mailer:
-    notification_preferences: Modifier les préférences de courriel
     salutation: "%{name},"
-    settings: 'Changer les préférences courriel : %{link}'
     unsubscribe: Se désabonner
     view: 'Voir :'
     view_profile: Voir le profil
@@ -1048,7 +1015,6 @@ fr-CA:
       hint_html: Juste une autre chose! Nous avons besoin de confirmer que vous êtes un humain (pour que nous puissions empêcher les spams!). Résolvez le CAPTCHA ci-dessous et cliquez sur "Continuer".
       title: Vérification de sécurité
     confirmations:
-      awaiting_review: Votre adresse e-mail est confirmée ! L’équipe de %{domain} vérifie désormais votre inscription. Vous recevrez un e-mail si votre compte est approuvé !
       awaiting_review_title: Votre inscription est en cours de validation
       clicking_this_link: cliquer sur ce lien
       login_link: vous connecter
@@ -1056,7 +1022,6 @@ fr-CA:
       redirect_to_app_html: Vous auriez dû être redirigé vers l’application <strong>%{app_name}</strong>. Si cela ne s’est pas produit, essayez de %{clicking_this_link} ou de revenir manuellement à l’application.
       registration_complete: Votre inscription sur %{domain} est désormais terminée !
       welcome_title: Bienvenue, %{name} !
-      wrong_email_hint: Si cette adresse de courriel est incorrecte, vous pouvez la modifier dans vos paramètres de compte.
     delete_account: Supprimer le compte
     delete_account_html: Si vous désirez supprimer votre compte, vous pouvez <a href="%{path}">cliquer ici</a>. Il vous sera demandé de confirmer cette action.
     description:
@@ -1077,7 +1042,6 @@ fr-CA:
     or_log_in_with: Ou authentifiez-vous avec
     privacy_policy_agreement_html: J’ai lu et j’accepte la <a href="%{privacy_policy_path}" target="_blank">politique de confidentialité</a>
     progress:
-      confirm: Confirmez l'adresse courriel
       details: Vos infos
       review: Notre avis
       rules: Accepter les règles
@@ -1099,10 +1063,8 @@ fr-CA:
     security: Sécurité
     set_new_password: Définir le nouveau mot de passe
     setup:
-      email_below_hint_html: Vérifiez votre dossier de spam ou demandez qu’on vous le renvoie. Vous pouvez corriger votre adresse courriel si elle est incorrecte.
       email_settings_hint_html: Cliquez sur le lien que nous vous avons envoyé pour vérifier %{email}. Nous vous attendrons ici.
       link_not_received: Vous n'avez pas reçu de lien?
-      new_confirmation_instructions_sent: Vous recevrez un nouveau courriel avec votre lien de confirmation dans quelques minutes!
       title: Vérifiez votre boîte de réception
     sign_in:
       preamble_html: Connectez-vous avec vos identifiants sur <strong>%{domain}</strong>. Si votre compte est hébergé sur un autre serveur, vous ne pourrez pas vous connecter ici.
@@ -1113,9 +1075,7 @@ fr-CA:
       title: Mettons les choses en place pour %{domain}.
     status:
       account_status: État du compte
-      confirming: En attente de la confirmation par courriel à compléter.
       functional: Votre compte est entièrement opérationnel.
-      pending: Votre demande est en attente d'examen par notre personnel. Cela peut prendre un certain temps. Vous recevrez un courriel si votre demande est approuvée.
       redirecting_to: Votre compte est inactif car il est actuellement redirigé vers %{acct}.
       self_destruct: Comme %{domain} est en train de fermer, vous n’aurez qu’un accès limité à votre compte.
       view_strikes: Voir les sanctions précédemment appliquées à votre compte
@@ -1158,9 +1118,6 @@ fr-CA:
       before: 'Veuillez lire attentivement ces notes avant de continuer :'
       caches: Le contenu mis en cache par d'autres serveurs peut persister
       data_removal: Vos messages et autres données seront définitivement supprimés
-      email_change_html: Vous pouvez <a href="%{path}">modifier votre adresse courriel</a> sans supprimer votre compte
-      email_contact_html: S'il n'arrive toujours pas, vous pouvez envoyer un courriel à <a href="mailto:%{email}">%{email}</a> pour demander de l'aide
-      email_reconfirmation_html: Si vous ne recevez pas le courriel de confirmation, vous pouvez le <a href="%{path}">demander à nouveau</a>
       irreversible: Vous ne pourrez pas restaurer ou réactiver votre compte
       more_details_html: Pour plus de détails, voir la <a href="%{terms_path}">politique de confidentialité</a>.
       username_available: Votre nom d’utilisateur·rice sera à nouveau disponible
@@ -1393,7 +1350,6 @@ fr-CA:
     authentication_methods:
       otp: application d'authentification à deux facteurs
       password: mot de passe
-      sign_in_token: code de sécurité par courriel
       webauthn: clés de sécurité
     description_html: Si vous voyez une activité que vous ne reconnaissez pas, envisagez de changer votre mot de passe et d'activer l'authentification à deux facteurs.
     empty: Aucun historique d'authentification disponible
@@ -1404,16 +1360,6 @@ fr-CA:
     unsubscribe:
       action: Oui, me désabonner
       complete: Désabonné·e
-      confirmation_html: Voulez-vous vraiment vous désabonner des %{type} de la part de Mastodon installés sur %{domain} vers votre adresse %{email}? Vous pouvez toujours vous réabonner à partir de vos <a href="%{settings_path}">paramètres de notification par courriel</a>.
-      emails:
-        notification_emails:
-          favourite: courriels de notifications de favoris
-          follow: courriels de notifications d’abonnements
-          follow_request: courriels de demandes d’abonnements
-          mention: courriels de notifications de mentions
-          reblog: courriels de notifications de boost
-      resubscribe_html: Si vous vous êtes désabonné·e par erreur, vous pouvez vous réinscrire à partir de vos <a href="%{settings_path}">paramètres de notification par courriel</a>.
-      success_html: Vous ne serez plus inscrits aux %{type} de Mastodon installés sur %{domain} à votre adresse %{email}.
       title: Se désabonner
   media_attachments:
     validations:
@@ -1494,8 +1440,6 @@ fr-CA:
     update:
       subject: "%{name} a modifié un message"
   notifications:
-    administration_emails: Notifications par e-mail de l’admin
-    email_events: Événements pour les notifications par courriel
     email_events_hint: 'Sélectionnez les événements pour lesquels vous souhaitez recevoir des notifications :'
   number:
     human:
@@ -1654,7 +1598,6 @@ fr-CA:
     import: Import de données
     import_and_export: Import et export
     migrate: Migration de compte
-    notifications: Notifications par mail
     preferences: Préférences
     profile: Profil
     relationships: Abonnements et abonné·e·s
@@ -1901,7 +1844,6 @@ fr-CA:
     invalid_otp_token: Le code d’authentification à deux facteurs est invalide
     otp_lost_help_html: Si vous perdez accès aux deux, vous pouvez contacter %{email}
     rate_limited: Trop de tentatives d'authentification, réessayez plus tard.
-    seamless_external_login: Vous êtes connecté via un service externe, donc les paramètres concernant le mot de passe et le courriel ne sont pas disponibles.
     signed_in_as: 'Connecté·e en tant que :'
   verification:
     extra_instructions_html: <strong>Astuce:</strong> Le lien sur votre site Web peut être invisible. La partie importante est <code>rel="me"</code> qui évite d’autres liens provenant de contenu générés par des utilisateurs tiers d'être pris en compte. Vous pouvez même utiliser une balise <code>link</code> dans l’en-tête de la page au lieu de <code>a</code>, mais le HTML doit être accessible sans avoir besoin d’exécuter du JavaScript.
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 33cdcd44cc5477..0a2b0f860d630a 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -31,7 +31,6 @@ fr:
       created_msg: Note de modération créée avec succès !
       destroyed_msg: Note de modération supprimée avec succès !
     accounts:
-      add_email_domain_block: Bloquer ce domaine de courriel
       approve: Approuver
       approved_msg: La demande d’inscription de %{username} a été approuvée avec succès
       are_you_sure: Voulez-vous vraiment faire ça ?
@@ -58,7 +57,6 @@ fr:
       demote: Rétrograder
       destroyed_msg: Les données de %{username} sont maintenant en file d’attente pour être supprimées imminemment
       disable: Geler
-      disable_sign_in_token_auth: Désactiver l'authentification basée sur les jetons envoyés par courriel
       disable_two_factor_authentication: Désactiver l’authentification à deux facteurs
       disabled: Gelé
       display_name: Nom affiché
@@ -67,7 +65,6 @@ fr:
       email: Adresse de courriel
       email_status: État du courriel
       enable: Dégeler
-      enable_sign_in_token_auth: Activer l'authentification basée sur les jetons envoyés par courriel
       enabled: Activé
       enabled_msg: Le compte de %{username} a été dégelé avec succès
       followers: Abonné·e·s
@@ -132,7 +129,6 @@ fr:
       resubscribe: Se réabonner
       role: Rôle
       search: Rechercher
-      search_same_email_domain: Autres utilisateurs·trices avec le même domaine de courriel
       search_same_ip: Autres utilisateur·rice·s avec la même IP
       security: Sécurité
       security_measures:
@@ -173,26 +169,21 @@ fr:
         approve_appeal: Approuver l'appel
         approve_user: Approuver le compte
         assigned_to_self_report: Affecter le signalement
-        change_email_user: Modifier l’adresse de courriel pour ce compte
         change_role_user: Changer le rôle du compte
         confirm_user: Confirmer le compte
         create_account_warning: Créer une alerte
         create_announcement: Créer une annonce
-        create_canonical_email_block: Créer un blocage de domaine de courriel
         create_custom_emoji: Créer des émojis personnalisés
         create_domain_allow: Créer un domaine autorisé
         create_domain_block: Créer un blocage de domaine
-        create_email_domain_block: Créer un blocage de domaine de courriel
         create_ip_block: Créer une règle IP
         create_unavailable_domain: Créer un domaine indisponible
         create_user_role: Créer le rôle
         demote_user: Rétrograder l’utilisateur·ice
         destroy_announcement: Supprimer l’annonce
-        destroy_canonical_email_block: Supprimer le blocage de domaine de courriel
         destroy_custom_emoji: Supprimer des émojis personnalisés
         destroy_domain_allow: Supprimer le domaine autorisé
         destroy_domain_block: Supprimer le blocage de domaine
-        destroy_email_domain_block: Supprimer le blocage de domaine de courriel
         destroy_instance: Purge du domaine
         destroy_ip_block: Supprimer la règle IP
         destroy_status: Supprimer le message
@@ -200,10 +191,8 @@ fr:
         destroy_user_role: Détruire le rôle
         disable_2fa_user: Désactiver l’A2F
         disable_custom_emoji: Désactiver les émojis personnalisés
-        disable_sign_in_token_auth_user: Désactiver l'authentification basée sur les jetons envoyés par courriel pour l'utilisateur·rice
         disable_user: Désactiver le compte
         enable_custom_emoji: Activer les émojis personnalisées
-        enable_sign_in_token_auth_user: Activer l'authentification basée sur les jetons envoyés par courriel pour l'utilisateur·rice
         enable_user: Activer le compte
         memorialize_account: Ériger en mémorial
         promote_user: Promouvoir le compte
@@ -232,26 +221,20 @@ fr:
         approve_appeal_html: "%{name} a approuvé l'appel de la décision de modération émis par %{target}"
         approve_user_html: "%{name} a approuvé l’inscription de %{target}"
         assigned_to_self_report_html: "%{name} s’est assigné·e le signalement de %{target}"
-        change_email_user_html: "%{name} a modifié l'adresse de courriel de l'utilisateur·rice %{target}"
         change_role_user_html: "%{name} a changé le rôle de %{target}"
-        confirm_user_html: "%{name} a confirmé l'adresse courriel de l'utilisateur %{target}"
         create_account_warning_html: "%{name} a envoyé un avertissement à %{target}"
         create_announcement_html: "%{name} a créé une nouvelle annonce %{target}"
-        create_canonical_email_block_html: "%{name} a bloqué le courriel avec le hachage %{target}"
         create_custom_emoji_html: "%{name} a téléversé un nouvel émoji %{target}"
         create_domain_allow_html: "%{name} a autorisé la fédération avec le domaine %{target}"
         create_domain_block_html: "%{name} a bloqué le domaine %{target}"
-        create_email_domain_block_html: "%{name} a bloqué de domaine de courriel %{target}"
         create_ip_block_html: "%{name} a créé une règle pour l'IP %{target}"
         create_unavailable_domain_html: "%{name} a arrêté la livraison vers le domaine %{target}"
         create_user_role_html: "%{name} a créé le rôle %{target}"
         demote_user_html: "%{name} a rétrogradé l'utilisateur·rice %{target}"
         destroy_announcement_html: "%{name} a supprimé l'annonce %{target}"
-        destroy_canonical_email_block_html: "%{name} a débloqué le courriel avec le hachage %{target}"
         destroy_custom_emoji_html: "%{name} a supprimé l'émoji %{target}"
         destroy_domain_allow_html: "%{name} a rejeté la fédération avec le domaine %{target}"
         destroy_domain_block_html: "%{name} a débloqué le domaine %{target}"
-        destroy_email_domain_block_html: "%{name} a débloqué le domaine de courriel %{target}"
         destroy_instance_html: "%{name} a purgé le domaine %{target}"
         destroy_ip_block_html: "%{name} a supprimé la règle pour l'IP %{target}"
         destroy_status_html: "%{name} a supprimé le message de %{target}"
@@ -259,10 +242,8 @@ fr:
         destroy_user_role_html: "%{name} a supprimé le rôle %{target}"
         disable_2fa_user_html: "%{name} a désactivé l'authentification à deux facteurs pour l'utilisateur·rice %{target}"
         disable_custom_emoji_html: "%{name} a désactivé l'émoji %{target}"
-        disable_sign_in_token_auth_user_html: "%{name} a désactivé l'authentification basée sur les jetons envoyés par courriel pour %{target}"
         disable_user_html: "%{name} a désactivé la connexion de l'utilisateur·rice %{target}"
         enable_custom_emoji_html: "%{name} a activé l'émoji %{target}"
-        enable_sign_in_token_auth_user_html: "%{name} a activé l'authentification basée sur les jetons envoyés par courriel pour %{target}"
         enable_user_html: "%{name} a activé la connexion de l'utilisateur·rice %{target}"
         memorialize_account_html: "%{name} a converti le compte de %{target} en un mémorial"
         promote_user_html: "%{name} a promu l'utilisateur·rice %{target}"
@@ -270,7 +251,6 @@ fr:
         reject_user_html: "%{name} a rejeté l’inscription de %{target}"
         remove_avatar_user_html: "%{name} a supprimé l'avatar de %{target}"
         reopen_report_html: "%{name} a rouvert le signalement %{target}"
-        resend_user_html: "%{name} a renvoyé l'e-mail de confirmation pour %{target}"
         reset_password_user_html: "%{name} a réinitialisé le mot de passe de l'utilisateur·rice %{target}"
         resolve_report_html: "%{name} a résolu le signalement %{target}"
         sensitive_account_html: "%{name} a marqué le média de %{target} comme sensible"
@@ -429,7 +409,6 @@ fr:
       attempts_over_week:
         one: "%{count} tentative au cours de la dernière semaine"
         other: "%{count} tentatives au cours de la dernière semaine"
-      created_msg: Le blocage de domaine de courriel est désormais activé
       delete: Supprimer
       dns:
         types:
@@ -438,12 +417,8 @@ fr:
       new:
         create: Créer le blocage
         resolve: Résoudre le domaine
-        title: Nouveau blocage de domaine de courriel
-      no_email_domain_block_selected: Aucun blocage de domaine de courriel n'a été modifié car aucun n'a été sélectionné
       not_permitted: Non autorisé
-      resolved_dns_records_hint_html: Le nom de domaine est relié aux domaines MX suivants, qui ont la responsabilité ultime d'accepter les courriels. Bloquer un domaine MX empêchera les inscriptions à partir de toute adresse courriel utilisant le même domaine MX, même si le nom de domaine affiché est différent. <strong> Veillez à ne pas bloquer les fournisseurs de messagerie d'envergure.</strong>
       resolved_through_html: Résolu par %{domain}
-      title: Blocage de domaines de courriel
     export_domain_allows:
       new:
         title: Importer les autorisations de domaine
@@ -594,7 +569,6 @@ fr:
         resolve_description_html: Aucune mesure ne sera prise contre le compte signalé, aucune sanction ne sera enregistrée et le sigalement sera clôturé.
         silence_description_html: Le compte ne sera visible que par ceux qui le suivent déjà ou qui le recherchent manuellement, ce qui limite fortement sa portée. Cette action peut toujours être annulée. Cloture tous les signalements concernant ce compte.
         suspend_description_html: Le compte et tous ses contenus seront inaccessibles et finalement supprimés, et il sera impossible d'interagir avec lui. Réversible dans les 30 jours. Cloture tous les signalements concernant ce compte.
-      actions_description_html: Décidez des mesures à prendre pour résoudre ce signalement. Si vous prenez des mesures punitives contre le compte signalé, une notification sera envoyée par e-mail, sauf si la catégorie <strong>Spam</strong> est sélectionnée.
       actions_description_remote_html: Décidez des mesures à prendre pour résoudre ce signalement. Cela n'affectera que la manière dont <strong>votre</strong> serveur communique avec ce compte distant et traite son contenu.
       add_to_report: Ajouter davantage au rapport
       already_suspended_badges:
@@ -658,7 +632,6 @@ fr:
         delete_data_html: effacer le profil de <strong>@%{acct}</strong> et ses contenus dans 30 jours, à moins que la suspension du compte ne soit annulée entre temps
         preview_preamble_html: "<strong>@%{acct}</strong> recevra un avertissement contenant les éléments suivants :"
         record_strike_html: enregistrer une sanction contre <strong>@%{acct}</strong> pour vous aider à prendre des mesures supplémentaires en cas d'infractions futures de ce compte
-        send_email_html: envoyer un courriel d'avertissement à <strong>@%{acct}</strong>
         warning_placeholder: Arguments supplémentaires pour l'action de modération (facultatif).
       target_origin: Origine du compte signalé
       title: Signalements
@@ -698,7 +671,6 @@ fr:
         manage_appeals: Gérer les contestations
         manage_appeals_description: Permet aux utilisateur⋅rice⋅s d'examiner les appels contre les actions de modération
         manage_blocks: Gérer les blocages
-        manage_blocks_description: Permet aux utilisateur⋅rice⋅s de bloquer des fournisseurs de courriel et des adresses IP
         manage_custom_emojis: Gérer les émojis personnalisés
         manage_custom_emojis_description: Permet aux utilisateur⋅rice⋅s de gérer les émoticônes personnalisées sur le serveur
         manage_federation: Gérer de la féderation
@@ -716,7 +688,6 @@ fr:
         manage_taxonomies: Gérer les taxonomies
         manage_taxonomies_description: Permet aux utilisateur⋅rice⋅s d'examiner les contenus tendance et de mettre à jour les paramètres des hashtags
         manage_user_access: Gérer l'accès utilisateur
-        manage_user_access_description: Permet aux utilisateur⋅rice⋅s de désactiver l'authentification à deux facteurs, de modifier l'adresse courriel et de réinitialiser le mot de passe des autres utilisateur⋅rice⋅s
         manage_users: Gérer les utilisateur·rice·s
         manage_users_description: Permet aux utilisateur⋅rice⋅s de voir les détails des autres utilisateur⋅rice⋅s et d'effectuer des actions de modération en conséquence
         manage_webhooks: Gérer les points d’ancrage web
@@ -790,7 +761,6 @@ fr:
       destroyed_msg: Téléversement sur le site supprimé avec succès !
     software_updates:
       critical_update: Critique — veuillez mettre à jour au plus vite
-      description: Il est recommandé de maintenir votre installation de Mastodon à jour afin de bénéficier des derniers correctifs et des dernières fonctionnalités. Il est également essentiel de mettre à jour Mastodon rapidement dans certains cas afin d’éviter des problèmes de sécurité. Pour ces raisons, Mastodon vérifie les mises à jour toutes les 30 minutes, et vous en informera selon vos préférences de notification par e-mail.
       documentation_link: En savoir plus
       release_notes: Notes de mises à jour
       title: Mises à jour disponibles
@@ -942,7 +912,6 @@ fr:
         used_by_over_week:
           one: Utilisé par %{count} personne au cours de la dernière semaine
           other: Utilisé par %{count} personnes au cours de la dernière semaine
-      title: Tendances
       trending: Tendances
     warning_presets:
       add_new: Ajouter un nouveau
@@ -1026,9 +995,7 @@ fr:
       guide_link_text: Tout le monde peut y contribuer.
     sensitive_content: Contenu sensible
   application_mailer:
-    notification_preferences: Modifier les préférences de courriel
     salutation: "%{name},"
-    settings: 'Changer les préférences courriel : %{link}'
     unsubscribe: Se désabonner
     view: 'Voir :'
     view_profile: Voir le profil
@@ -1048,7 +1015,6 @@ fr:
       hint_html: Encore une chose ! Nous avons besoin de confirmer que vous êtes un humain (c'est pour que nous puissions empêcher les spams !). Résolvez le CAPTCHA ci-dessous et cliquez sur "Continuer".
       title: Vérification de sécurité
     confirmations:
-      awaiting_review: Votre adresse e-mail est confirmée ! L’équipe de %{domain} vérifie désormais votre inscription. Vous recevrez un e-mail si votre compte est approuvé !
       awaiting_review_title: Votre inscription est en cours de validation
       clicking_this_link: cliquer sur ce lien
       login_link: vous connecter
@@ -1056,7 +1022,6 @@ fr:
       redirect_to_app_html: Vous auriez dû être redirigé vers l’application <strong>%{app_name}</strong>. Si cela ne s’est pas produit, essayez de %{clicking_this_link} ou de revenir manuellement à l’application.
       registration_complete: Votre inscription sur %{domain} est désormais terminée !
       welcome_title: Bienvenue, %{name} !
-      wrong_email_hint: Si cette adresse de courriel est incorrecte, vous pouvez la modifier dans vos paramètres de compte.
     delete_account: Supprimer le compte
     delete_account_html: Si vous désirez supprimer votre compte, vous pouvez <a href="%{path}">cliquer ici</a>. Il vous sera demandé de confirmer cette action.
     description:
@@ -1077,7 +1042,6 @@ fr:
     or_log_in_with: Ou authentifiez-vous avec
     privacy_policy_agreement_html: J’ai lu et j’accepte la <a href="%{privacy_policy_path}" target="_blank">politique de confidentialité</a>
     progress:
-      confirm: Confirmez l'e-mail
       details: Vos infos
       review: Notre avis
       rules: Accepter les règles
@@ -1099,10 +1063,8 @@ fr:
     security: Sécurité
     set_new_password: Définir le nouveau mot de passe
     setup:
-      email_below_hint_html: Vérifiez votre dossier de spam ou demandez qu’on vous le renvoie. Vous pouvez corriger votre adresse e-mail si elle est incorrecte.
       email_settings_hint_html: Cliquez sur le lien que nous vous avons envoyé pour vérifier l’adresse %{email}. Nous vous attendons ici.
       link_not_received: Vous n'avez pas reçu de lien ?
-      new_confirmation_instructions_sent: Vous allez recevoir un nouvel e-mail de confirmation dans quelques minutes !
       title: Vérifiez votre boîte de réception
     sign_in:
       preamble_html: Connectez-vous avec vos identifiants sur <strong>%{domain}</strong>. Si votre compte est hébergé sur un autre serveur, vous ne pourrez pas vous connecter ici.
@@ -1113,9 +1075,7 @@ fr:
       title: Mettons les choses en place pour %{domain}.
     status:
       account_status: État du compte
-      confirming: En attente de la confirmation par courriel à compléter.
       functional: Votre compte est entièrement opérationnel.
-      pending: Votre demande est en attente d'examen par notre personnel. Cela peut prendre un certain temps. Vous recevrez un courriel si votre demande est approuvée.
       redirecting_to: Votre compte est inactif car il est actuellement redirigé vers %{acct}.
       self_destruct: Comme %{domain} est en train de fermer, vous n’aurez qu’un accès limité à votre compte.
       view_strikes: Voir les sanctions précédemment appliquées à votre compte
@@ -1158,9 +1118,6 @@ fr:
       before: 'Veuillez lire attentivement ces notes avant de continuer :'
       caches: Le contenu mis en cache par d'autres serveurs peut persister
       data_removal: Vos messages et autres données seront définitivement supprimés
-      email_change_html: Vous pouvez <a href="%{path}">modifier votre adresse courriel</a> sans supprimer votre compte
-      email_contact_html: S'il n'arrive toujours pas, vous pouvez envoyer un courriel à <a href="mailto:%{email}">%{email}</a> pour demander de l'aide
-      email_reconfirmation_html: Si vous ne recevez pas le courriel de confirmation, vous pouvez le <a href="%{path}">demander à nouveau</a>
       irreversible: Vous ne pourrez pas restaurer ou réactiver votre compte
       more_details_html: Pour plus de détails, voir la <a href="%{terms_path}">politique de confidentialité</a>.
       username_available: Votre nom d’utilisateur·rice sera à nouveau disponible
@@ -1393,7 +1350,6 @@ fr:
     authentication_methods:
       otp: application d'authentification à deux facteurs
       password: mot de passe
-      sign_in_token: code de sécurité par courriel
       webauthn: clés de sécurité
     description_html: Si vous voyez une activité que vous ne reconnaissez pas, envisagez de changer votre mot de passe et d'activer l'authentification à deux facteurs.
     empty: Aucun historique d'authentification disponible
@@ -1404,16 +1360,6 @@ fr:
     unsubscribe:
       action: Oui, se désinscrire
       complete: Désinscrit
-      confirmation_html: Êtes-vous sûr de vouloir vous désinscrire des %{type} de la part du Mastodon installé sur %{domain} vers votre adresse %{email}? Vous pouvez toujours vous réabonner à partir de vos <a href="%{settings_path}">paramètres de notification par e-mail</a>.
-      emails:
-        notification_emails:
-          favourite: e-mails de notifications de signets
-          follow: e-mails de notifications d’abonnements
-          follow_request: e-mails de demandes d’abonnements
-          mention: e-mails de notifications de mentions
-          reblog: e-mails de notifications de boost
-      resubscribe_html: Si vous vous êtes désabonné par erreur, vous pouvez vous réinscrire à partir de vos <a href="%{settings_path}">paramètres de notification par e-mail</a>.
-      success_html: Vous ne serez plus inscrits aux %{type} du Mastodon installé sur %{domain} à votre adresse %{email}.
       title: Se désinscrire
   media_attachments:
     validations:
@@ -1494,8 +1440,6 @@ fr:
     update:
       subject: "%{name} a modifié un message"
   notifications:
-    administration_emails: Notifications par e-mail de l’admin
-    email_events: Événements pour les notifications par courriel
     email_events_hint: 'Sélectionnez les événements pour lesquels vous souhaitez recevoir des notifications :'
   number:
     human:
@@ -1654,7 +1598,6 @@ fr:
     import: Import de données
     import_and_export: Import et export
     migrate: Migration de compte
-    notifications: Notifications par mail
     preferences: Préférences
     profile: Profil
     relationships: Abonnements et abonné·e·s
@@ -1901,7 +1844,6 @@ fr:
     invalid_otp_token: Le code d’authentification à deux facteurs est invalide
     otp_lost_help_html: Si vous perdez accès aux deux, vous pouvez contacter %{email}
     rate_limited: Trop de tentatives d'authentification, réessayez plus tard.
-    seamless_external_login: Vous êtes connecté via un service externe, donc les paramètres concernant le mot de passe et le courriel ne sont pas disponibles.
     signed_in_as: 'Connecté·e en tant que :'
   verification:
     extra_instructions_html: <strong>Astuce :</strong> Le lien sur votre site Web peut être invisible. La partie importante est <code>rel="me"</code> qui évite que soient pris en compte d’autres liens provenant de contenu générés par des utilisateurs tiers. Vous pouvez même utiliser une balise <code>link</code> dans l’en-tête de la page au lieu de <code>a</code>, mais le HTML doit être accessible sans avoir besoin d’exécuter du JavaScript.
diff --git a/config/locales/fy.yml b/config/locales/fy.yml
index 054ae2fab2ac63..62889c0b28657c 100644
--- a/config/locales/fy.yml
+++ b/config/locales/fy.yml
@@ -31,7 +31,6 @@ fy:
       created_msg: Oanmeitsjen fan opmerking foar moderatoaren slagge!
       destroyed_msg: Fuortsmiten fan opmerking foar moderatoaren slagge!
     accounts:
-      add_email_domain_block: E-maildomein blokkearje
       approve: Goedkarre
       approved_msg: It goedkarren fan de account fan %{username} is slagge
       are_you_sure: Binne jo wis?
@@ -58,7 +57,6 @@ fy:
       demote: Degradearje
       destroyed_msg: It fuortsmiten fan de gegevens fan %{username} stiet no yn de wachtrige
       disable: Befrieze
-      disable_sign_in_token_auth: Ferifikaasje mei in tagongskoade fia e-mailberjocht útskeakelje
       disable_two_factor_authentication: 2FA útskeakelje
       disabled: Beferzen
       display_name: Werjeftenamme
@@ -67,7 +65,6 @@ fy:
       email: E-mailadres
       email_status: E-mailsteat
       enable: Untteie
-      enable_sign_in_token_auth: Ferifikaasje mei in tagongskoade fia e-mailberjocht ynskeakelje
       enabled: Ynskeakele
       enabled_msg: It ûntteie fan de account fan %{username} is slagge
       followers: Folgers
@@ -132,7 +129,6 @@ fy:
       resubscribe: Opnij abonnearje
       role: Rol
       search: Sykje
-      search_same_email_domain: Oare brûkers mei itselde e-maildomein
       search_same_ip: Oare brûkers mei itselde IP-adres
       security: Befeiliging
       security_measures:
@@ -173,26 +169,21 @@ fy:
         approve_appeal: Beswier goedkarre
         approve_user: Brûker goedkarre
         assigned_to_self_report: Rapportaazje tawize
-        change_email_user: E-mailadres fan brûker wizigje
         change_role_user: Brûkersrol wizigje
         confirm_user: Brûker befêstigje
         create_account_warning: Warskôging oanmeitsje
         create_announcement: Meidieling oanmeitsje
-        create_canonical_email_block: E-mailblokkade oanmeitsje
         create_custom_emoji: Lokale emoji oanmeitsje
         create_domain_allow: Domeingoedkarring oanmeitsje
         create_domain_block: Domeinblokkade oanmeitsje
-        create_email_domain_block: E-maildomeinblokkade oanmeitsje
         create_ip_block: IP-rigel oanmeitsje
         create_unavailable_domain: Net beskikber domein oanmeitsje
         create_user_role: Rol oanmeitsje
         demote_user: Brûker degradearje
         destroy_announcement: Meidieling fuortsmite
-        destroy_canonical_email_block: E-mailblokkade fuortsmite
         destroy_custom_emoji: Lokale emoji fuortsmite
         destroy_domain_allow: Domeingoedkarring fuortsmite
         destroy_domain_block: Domeinblokkade fuortsmite
-        destroy_email_domain_block: E-maildomeinblokkade fuortsmite
         destroy_instance: Domein folslein fuortsmite
         destroy_ip_block: IP-rigel fuortsmite
         destroy_status: Toot fuortsmite
@@ -200,10 +191,8 @@ fy:
         destroy_user_role: Rol permanint fuortsmite
         disable_2fa_user: Twa-stapsferifikaasje útskeakelje
         disable_custom_emoji: Lokale emoji útskeakelje
-        disable_sign_in_token_auth_user: Ferifikaasje mei in tagongskoade fia e-mailberjocht foar de brûker útskeakelje
         disable_user: Brûker útskeakelje
         enable_custom_emoji: Lokale emoji ynskeakelje
-        enable_sign_in_token_auth_user: Ferifikaasje mei in tagongskoade fia e-mailberjocht foar de brûker ynskeakelje
         enable_user: Brûker ynskeakelje
         memorialize_account: De account yn in Yn memoriam wizigje
         promote_user: Brûker promovearje
@@ -233,26 +222,20 @@ fy:
         approve_appeal_html: "%{name} hat it beswier tsjin de moderaasjemaatregel fan %{target} goedkard"
         approve_user_html: "%{name} hat de registraasje fan %{target} goedkard"
         assigned_to_self_report_html: "%{name} hat rapportaazje %{target} oan harrensels tawiisd"
-        change_email_user_html: "%{name} hat it e-mailadres fan brûker %{target} wizige"
         change_role_user_html: "%{name} hat de rol fan %{target} wizige"
-        confirm_user_html: E-mailadres fan brûker %{target} is troch %{name} befêstige
         create_account_warning_html: "%{name} hat in warskôging nei %{target} ferstjoerd"
         create_announcement_html: "%{name} hat de nije meidieling %{target} oanmakke"
-        create_canonical_email_block_html: "%{name} hat it e-mailberjocht mei de hash %{target} blokkearre"
         create_custom_emoji_html: Nije emoji %{target} is troch %{name} opladen
         create_domain_allow_html: "%{name} hat de federaasje mei it domein %{target} goedkard"
         create_domain_block_html: Domein %{target} is troch %{name} blokkearre
-        create_email_domain_block_html: "%{name} hat it e-maildomein %{target} blokkearre"
         create_ip_block_html: "%{name} hat de rigel foar IP %{target} oanmakke"
         create_unavailable_domain_html: "%{name} hat de besoarging foar domein %{target} beëinige"
         create_user_role_html: "%{name} hat de rol %{target} oanmakke"
         demote_user_html: Brûker %{target} is troch %{name} degradearre
         destroy_announcement_html: "%{name} hat de meidieling %{target} fuortsmiten"
-        destroy_canonical_email_block_html: "%{name} hat it e-mailberjocht mei de hash %{target} deblokkearre"
         destroy_custom_emoji_html: Emoji %{target} is troch %{name} fuortsmiten
         destroy_domain_allow_html: "%{name} hat de federaasje mei it domein %{target} ôfkard"
         destroy_domain_block_html: Domein %{target} is troch %{name} deblokkearre
-        destroy_email_domain_block_html: Domein %{target} is troch %{name} deblokkearre
         destroy_instance_html: "%{name} hat it domein %{target} folslein fuortsmiten"
         destroy_ip_block_html: "%{name} hat de rigel foar IP %{target} fuortsmiten"
         destroy_status_html: Berjocht fan %{target} is troch %{name} fuortsmiten
@@ -260,10 +243,8 @@ fy:
         destroy_user_role_html: "%{name} hat de rol %{target} fuortsmiten"
         disable_2fa_user_html: De fereaske twa-stapsferifikaasje foar %{target} is troch %{name} útskeakele
         disable_custom_emoji_html: Emoji %{target} is troch %{name} útskeakele
-        disable_sign_in_token_auth_user_html: "%{name} hat ferifikaasje mei in tagongskoade fia e-mailberjocht útskeakele foar %{target}"
         disable_user_html: Oanmelden foar %{target} is troch %{name} útskeakele
         enable_custom_emoji_html: Emoji %{target} is troch %{name} ynskeakele
-        enable_sign_in_token_auth_user_html: "%{name} hat ferifikaasje mei in tagongskoade fia e-mailberjocht ynskeakele foar %{target}"
         enable_user_html: Oanmelden foar %{target} is troch %{name} ynskeakele
         memorialize_account_html: De account %{target} is troch %{name} yn in Yn memoriam wizige
         promote_user_html: Brûker %{target} is troch %{name} promovearre
@@ -271,7 +252,6 @@ fy:
         reject_user_html: "%{name} hat de registraasje fan %{target} ôfwêzen"
         remove_avatar_user_html: "%{name} hat de profylfoto fan %{target} fuortsmiten"
         reopen_report_html: "%{name} hat rapportaazje %{target} opnij iepene"
-        resend_user_html: "%{name} hat it befêstigings-e-mailberjocht foar %{target} opnij ferstjoerd"
         reset_password_user_html: Wachtwurd fan brûker %{target} is troch %{name} opnij ynsteld
         resolve_report_html: "%{name} hat rapportaazje %{target} oplost"
         sensitive_account_html: "%{name} markearre de media fan %{target} as gefoelich"
@@ -432,7 +412,6 @@ fy:
       attempts_over_week:
         one: "%{count} registraasjebesykjen yn de ôfrûne wike"
         other: "%{count} registraasjebesykjen yn de ôfrûne wike"
-      created_msg: E-maildomein blokkearjen slagge
       delete: Fuortsmite
       dns:
         types:
@@ -441,12 +420,8 @@ fy:
       new:
         create: Domein tafoegje
         resolve: Domein opsykje
-        title: Nije e-maildomein blokkearje
-      no_email_domain_block_selected: Der binne gjin e-maildomeinblokkaden wizige, omdat der gjin ien selektearre waard
       not_permitted: Net tastien
-      resolved_dns_records_hint_html: De domeinnamme slacht op de folgjende MX-domeinen dy’t úteinlik ferantwurdlik binne foar it akseptearjen fan e-mail. It blokkearjen fan in MX-domein blokkearret oanmeldingen fan elk e-mailadres dat itselde MX-domein brûkt, sels as de sichtbere domeinnamme oars is. <strong>Pas op dat jo gjin grutte e-mailproviders blokkearje.</strong>
       resolved_through_html: Blokkearre fia %{domain}
-      title: Blokkearre e-maildomeinen
     export_domain_allows:
       new:
         title: Tastiene domeinen ymportearje
@@ -600,7 +575,6 @@ fy:
         resolve_description_html: Der wurdt tsjin it rapportearre account gjin maatregel nommen, gjin oertrêding registrearre en de rapportaazje wurdt markearre as oplost.
         silence_description_html: De account sil allinnich sichtber wêze foar dyjinge dy’t it al folgje of it hânmjittich opsykje, wêrtroch it berik earnstich beheind wurdt. Kin altyd weromdraaid wurde. Dit slút alle rapportaazjes oer dizze account.
         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.
       add_to_report: Mear oan de rapportaazje tafoegje
       already_suspended_badges:
@@ -665,7 +639,6 @@ fy:
         delete_data_html: It profyl en de ynhâld fan <strong>@%{acct}</strong> wurde nei 30 dagen fan no ôf fuortsmiten, útsein as de account yn de tuskentiid net mear blokkearre wurdt
         preview_preamble_html: "<strong>@%{acct}</strong> sil in warskôging ûntfange mei de folgjende ynhâld:"
         record_strike_html: In ban tsjin <strong>@%{acct}</strong> ynstelle, om jo te helpen by takomstige skeiningen fan dizze acount te eskalearjen
-        send_email_html: Stjoer <strong>@%{acct}</strong> in warskôgings-e-mailberjocht
         warning_placeholder: Ekstra opsjonele reden foar de moderaasje-aksje.
       target_origin: Orizjineel fan rapportearre account
       title: Rapportaazjes
@@ -705,7 +678,6 @@ fy:
         manage_appeals: Beswieren beheare
         manage_appeals_description: Stiet brûkers ta om beswieren tsjin moderaasjemaatregelen te beoardielen
         manage_blocks: Blokkaden beheare
-        manage_blocks_description: Stiet brûkers ta om e-mailproviders en IP-adressen te blokkearjen
         manage_custom_emojis: Lokale emoji’s beheare
         manage_custom_emojis_description: Stiet brûkers ta om lokale emoji’s op de server te behearen
         manage_federation: Federaasje beheare
@@ -723,7 +695,6 @@ fy:
         manage_taxonomies: Trends en hashtags beheare
         manage_taxonomies_description: Stiet brûkers ta om trending ynhâld te besjen en om hashtagynstellingen by te wurkjen
         manage_user_access: Brûkerstagong beheare
-        manage_user_access_description: Stiet brûkers ta om twa-stapsferifikaasje fan oare brûkers út te skeakeljen, om harren e-mailadres te wizigjen en om harren wachtwurd opnij yn te stellen
         manage_users: Brûkers beheare
         manage_users_description: Stiet brûkers ta om brûkersdetails fan oaren te besjen en moderaasjemaatregelen tsjin harren te nimmen
         manage_webhooks: Webhooks beheare
@@ -798,7 +769,6 @@ fy:
       destroyed_msg: Fuortsmiten website-oplaad slagge!
     software_updates:
       critical_update: Krityk — fernij sa gau as mooglik
-      description: It wurdt oanrekommandearre om jo Mastodon-ynstallaasje by-de-tiid te hâlden om gebrûk meitsje te kinnen fan de nijste oplossingen en funksjes. Boppe dat is it somtiden krúsjaal om Mastodon tidich by te wurkjen om feiligheidsproblemen foar te kommen. Om dizze redenen kontrolearret Mastodon elke 30 minuten fernijingen en bringt jo hjirfan op de hichte neffens jo foarkarren foar e-mailmeldingen.
       documentation_link: Mear ynfo
       release_notes: Utjefte-opmerkingen
       title: Beskikbere fernijingen
@@ -950,7 +920,6 @@ fy:
         used_by_over_week:
           one: Dizze wike troch ien persoan brûkt
           other: Dizze wike troch %{count} persoanen brûkt
-      title: Trends
       trending: Trending
     warning_presets:
       add_new: Nije tafoegje
@@ -1035,9 +1004,7 @@ fy:
       guide_link_text: Elkenien kin bydrage.
     sensitive_content: Gefoelige ynhâld
   application_mailer:
-    notification_preferences: E-mailynstellingen wizigje
     salutation: "%{name},"
-    settings: 'E-mailynstellingen wizigje: %{link}'
     unsubscribe: Ofmelde
     view: 'Besjoch:'
     view_profile: Profyl besjen
@@ -1057,7 +1024,6 @@ fy:
       hint_html: Noch ien ding! Jo moatte befêstigje dat jo in minske binne (dit is om de spam bûten de doar te hâlden!). Los de ûndersteande CAPTCHA op en klik op ‘Trochgean’.
       title: Befeiligingskontrôle
     confirmations:
-      awaiting_review: Jo e-mailadres is befêstige! De %{domain}-meiwurkers binne no dwaande mei it besjen fan jo registraasje. Jo ûntfange in e-mailberjocht as de jo account goedkarre!
       awaiting_review_title: Jo registraasje wurdt beoardield
       clicking_this_link: klik op dizze keppeling
       login_link: oanmelde
@@ -1065,7 +1031,6 @@ fy:
       redirect_to_app_html: Jo soene omlaad wêze moatte nei de <strong>%{app_name}</strong> app. As dat net bard is, probearje dan %{clicking_this_link} of kear hânmjittich werom nei de app.
       registration_complete: Jo registraasje op %{domain} is no foltôge!
       welcome_title: Wolkom, %{name}!
-      wrong_email_hint: As it e-mailadres net korrekt is, kinne jo dat wizigje yn de accountynstellingen.
     delete_account: Account fuortsmite
     delete_account_html: Wannear’t jo jo account graach fuortsmite wolle, kinne jo dat <a href="%{path}">hjir dwaan</a>. Wy freegje jo dêr om in befêstiging.
     description:
@@ -1086,7 +1051,6 @@ fy:
     or_log_in_with: Of oanmelde mei
     privacy_policy_agreement_html: Ik haw it <a href="%{privacy_policy_path}" target="_blank">privacybelied</a> lêzen en gean dêrmei akkoard
     progress:
-      confirm: E-mailadres werhelje
       details: Jo gegevens
       review: Us beoardieling
       rules: Regels akseptearje
@@ -1108,10 +1072,8 @@ fy:
     security: Befeiliging
     set_new_password: Nij wachtwurd ynstelle
     setup:
-      email_below_hint_html: Kontrolearje jo map Net-winske, of freegje in nije befêstigingskeppeling oan. Jo kinne jo e-mailadres wizigje as it ferkeard is.
       email_settings_hint_html: Klik op de keppeling dy’t wy jo stjoerd hawwe om %{email} te ferifiearjen. Wy wachtsje wol even.
       link_not_received: Gjin keppeling krigen?
-      new_confirmation_instructions_sent: Jo ûntfange binnen inkelde minuten in nij e-mailberjocht mei de befêstigingskeppeling!
       title: Kontrolearje jo Postfek YN
     sign_in:
       preamble_html: Meld jo oan mei de oanmeldgegevens fan <strong>%{domain}</strong>. As jo account op in oare server stiet, kinne jo hjir net oanmelde.
@@ -1122,9 +1084,7 @@ fy:
       title: Litte wy jo account op %{domain} ynstelle.
     status:
       account_status: Accountsteat
-      confirming: Oan it wachtsjen oant it e-mailadres befêstige is.
       functional: Jo account kin folslein brûkt wurde.
-      pending: Jo oanfraach moat noch beoardiele wurde troch ien fan ús meiwurkers. Dit kin miskien efkes duorje. Jo ûntfangt in e-mailberjocht wannear’t jo oanfraach goedkard is.
       redirecting_to: Jo account is ynaktyf, omdat it op dit stuit trochferwezen wurdt nei %{acct}.
       self_destruct: Omdat %{domain} sluten sil, krije jo mar beheind tagong ta jo account.
       view_strikes: Besjoch de earder troch moderatoaren fêststelde skeiningen dy’t jo makke hawwe
@@ -1167,9 +1127,6 @@ fy:
       before: 'Lês dizze tekst soarchfâldich eardat jo troch gean:'
       caches: Berjochten en media dy’t op oare servers bewarre binne kinne dêr efterbliuwe
       data_removal: Jo berjochten en oare gegevens wurde permanint fuortmiten
-      email_change_html: Jo kinne <a href="%{path}">jo e-mailadres wizigje</a> sûnder dat jo jo account fuort hoege te smiten
-      email_contact_html: Wannear’t it noch hieltyd net oankomt, kinne jo foar help in e-mailberjocht stjoere nei <a href="mailto:%{email}">%{email}</a>
-      email_reconfirmation_html: Wannear’t jo it befêstigings-e-mailberjocht net ûntfongen hawwe, kinne jo dizze <a href="%{path}">opnij oanfreegje</a>
       irreversible: Jo sille net yn steat wêze om jo account te werstellen of te de-aktivearjen
       more_details_html: Sjoch it <a href="%{terms_path}">privacybelied</a> foar mear ynformaasje.
       username_available: Jo brûkersnamme sil wer beskikber komme
@@ -1402,7 +1359,6 @@ fy:
     authentication_methods:
       otp: twa-stapsferifikaasje-app
       password: wachtwurd
-      sign_in_token: befeiligingskoade fia e-mailberjocht
       webauthn: befeiligingskaaien
     description_html: Wannear’t jo aktiviteit sjogge dy’t jo net werkenne, tink dan nei om jo wachtwurd te wizigjen en twa-stapsferifikaasje yn te skeakeljen.
     empty: Gjin oanmeldskiednis beskikber
@@ -1413,16 +1369,6 @@ fy:
     unsubscribe:
       action: Ja, ôfmelde
       complete: Ofmelden
-      confirmation_html: Binne jo wis dat jo jo ôfmelde wolle foar it ûntfangen fan %{type} fan Mastodon op %{domain} op jo e-mailadres %{email}? Jo kinne jo altyd opnij abonnearje yn jo <a href="%{settings_path}">ynstellingen foar e-mailmeldingen</a>.
-      emails:
-        notification_emails:
-          favourite: e-mailmeldingen foar favoriten
-          follow: e-mailmeldingen foar nije folgers
-          follow_request: e-mailmeldingen foar folchfersiken
-          mention: e-mailmeldingen foar fermeldingen
-          reblog: e-mailmeldingen foar boosts
-      resubscribe_html: As jo jo mei fersin ôfmeld hawwe, kinne jo jo opnij abonnearje yn jo <a href="%{settings_path}">ynstellingen foar e-mailmeldingen</a>.
-      success_html: Jo ûntfange net langer %{type} fan Mastodon op %{domain} op jo e-mailadres %{email}.
       title: Ofmelde
   media_attachments:
     validations:
@@ -1503,8 +1449,6 @@ fy:
     update:
       subject: "%{name} hat in berjocht bewurke"
   notifications:
-    administration_emails: E-mailmeldingen behearder
-    email_events: E-mailmeldingen foar eveneminten
     email_events_hint: 'Selektearje eveneminten wêrfoar’t jo meldingen ûntfange wolle:'
   number:
     human:
@@ -1663,7 +1607,6 @@ fy:
     import: Ymportearje
     import_and_export: Ymportearje en eksportearje
     migrate: Accountmigraasje
-    notifications: E-mailmeldingen
     preferences: Ynstellingen
     profile: Profyl
     relationships: Folgers en folgjenden
@@ -1910,7 +1853,6 @@ fy:
     invalid_otp_token: Unjildige twa-stapstagongskoade
     otp_lost_help_html: As jo tagong ta beide kwytrekke binne, nim dan kontakt op fia %{email}
     rate_limited: Te folle autentikaasjebesykjen, probearje it letter opnij.
-    seamless_external_login: Jo binne oanmeld fia in eksterne tsjinst, dêrom binne wachtwurden en e-mailynstellingen net beskikber.
     signed_in_as: 'Oanmeld as:'
   verification:
     extra_instructions_html: <strong>Tip:</strong> De keppeling op jo website kin ûnsichtber wêze. It wichtige part is <code>rel="me"</code> dat ympersonaasje op websites mei user-generated ynhâld foarkomt. Jo kinne sels in <code>link</code>-label brûke yn de header fan de side yn stee fan <code>a</code>, mar de HTML moat ek sûnder JavaScript tagonklik wêze.
diff --git a/config/locales/ga.yml b/config/locales/ga.yml
index 0de8a2fede8426..d8bdbde01d1e04 100644
--- a/config/locales/ga.yml
+++ b/config/locales/ga.yml
@@ -37,7 +37,6 @@ ga:
       created_msg: Cruthaíodh nóta modhnóireachta go rathúil!
       destroyed_msg: Nóta measarthachta scriosta go rathúil!
     accounts:
-      add_email_domain_block: Cuir bac ar fhearann ​​​​ríomhphoist
       approve: Faomh
       approved_msg: D'éirigh le feidhmchlár sínithe %{username} a cheadú
       are_you_sure: An bhfuil tú cinnte?
@@ -64,7 +63,6 @@ ga:
       demote: Ísligh
       destroyed_msg: Tá sonraí %{username} ciúáilte anois le scriosadh gan mhoill
       disable: Reoigh
-      disable_sign_in_token_auth: Díchumasaigh fíordheimhniú comhartha r-phoist
       disable_two_factor_authentication: Díchumasaigh 2FA
       disabled: Reoite
       display_name: Ainm taispeána
@@ -73,7 +71,6 @@ ga:
       email: Ríomhphost
       email_status: Stádas ríomhphoist
       enable: Dí-reoigh
-      enable_sign_in_token_auth: Cumasaigh fíordheimhniú comhartha ríomhphoist
       enabled: Ar chumas
       enabled_msg: D'éirigh le dí-reoite cuntas %{username}
       followers: Leantóirí
@@ -141,7 +138,6 @@ ga:
       resubscribe: Athchláraigh
       role: Ról
       search: Cuardaigh
-      search_same_email_domain: Úsáideoirí eile a bhfuil an fearann ​​ríomhphoist céanna acu
       search_same_ip: Úsáideoirí eile a bhfuil an IP céanna acu
       security: Slándáil
       security_measures:
@@ -182,26 +178,21 @@ ga:
         approve_appeal: Achomharc a cheadú
         approve_user: Úsáideoir a cheadú
         assigned_to_self_report: Sann Tuairisc
-        change_email_user: Athraigh Ríomhphost don Úsáideoir
         change_role_user: Athrú Ról an Úsáideora
         confirm_user: Deimhnigh Úsáideoir
         create_account_warning: Cruthaigh Rabhadh
         create_announcement: Cruthaigh Fógra
-        create_canonical_email_block: Cruthaigh Bloc Ríomhphoist
         create_custom_emoji: Cruthaigh Emoji Saincheaptha
         create_domain_allow: Cruthaigh Ceadaigh Fearainn
         create_domain_block: Cruthaigh Bloc Fearainn
-        create_email_domain_block: Cruthaigh Bloc Fearainn Ríomhphoist
         create_ip_block: Cruthaigh riail IP
         create_unavailable_domain: Cruthaigh Fearann ​​Gan Fáil
         create_user_role: Cruthaigh Ról
         demote_user: Ísligh úsáideoir
         destroy_announcement: Scrios Fógra
-        destroy_canonical_email_block: Scrios Bloc Ríomhphoist
         destroy_custom_emoji: Scrios Saincheaptha Emoji
         destroy_domain_allow: Scrios Ceadaigh Fearainn
         destroy_domain_block: Scrios Bloc Fearainn
-        destroy_email_domain_block: Scrios Bloc Fearainn R-phoist
         destroy_instance: Fearann ​​Purge
         destroy_ip_block: Scrios riail IP
         destroy_status: Scrios Postáil
@@ -209,10 +200,8 @@ ga:
         destroy_user_role: Scrios ról
         disable_2fa_user: Díchumasaigh 2FA
         disable_custom_emoji: Díchumasaigh Emoji Saincheaptha
-        disable_sign_in_token_auth_user: Díchumasaigh Fíordheimhniú Comhartha R-phoist don Úsáideoir
         disable_user: Díchumasaigh Úsáideoir
         enable_custom_emoji: Cumasaigh Emoji Saincheaptha
-        enable_sign_in_token_auth_user: Cumasaigh Fíordheimhniú Comhartha R-phoist don Úsáideoir
         enable_user: Cumasaigh Úsáideoir
         memorialize_account: Cuntas Cuimhneacháin
         promote_user: Úsáideoir a chur chun cinn
@@ -242,26 +231,20 @@ ga:
         approve_appeal_html: Cheadaigh %{name} achomharc ar chinneadh modhnóireachta ó %{target}
         approve_user_html: Cheadaigh %{name} clárú ó %{target}
         assigned_to_self_report_html: Shann %{name} tuairisc %{target} dóibh féin
-        change_email_user_html: D'athraigh %{name} seoladh ríomhphoist úsáideora %{target}
         change_role_user_html: D'athraigh %{name} ról %{target}
-        confirm_user_html: Dhearbhaigh %{name} seoladh ríomhphoist úsáideora %{target}
         create_account_warning_html: Sheol %{name} rabhadh chuig %{target}
         create_announcement_html: Chruthaigh %{name} fógra nua %{target}
-        create_canonical_email_block_html: Chuir %{name} bac ar ríomhphost leis an hash %{target}
         create_custom_emoji_html: D'uaslódáil %{name} emoji nua %{target}
         create_domain_allow_html: Cheadaigh %{name} cónaidhm le fearann ​​%{target}
         create_domain_block_html: "%{name} fearann ​​bactha %{target}"
-        create_email_domain_block_html: Chuir %{name} bac ar fhearann ​​ríomhphoist %{target}
         create_ip_block_html: Chruthaigh %{name} riail don IP %{target}
         create_unavailable_domain_html: Chuir %{name} deireadh leis an seachadadh chuig fearann ​​%{target}
         create_user_role_html: Chruthaigh %{name} %{target} ról
         demote_user_html: "%{name} úsáideoir scriosta %{target}"
         destroy_announcement_html: "%{name} fógra scriosta %{target}"
-        destroy_canonical_email_block_html: "%{name} ríomhphost díchoiscthe leis an hash %{target}"
         destroy_custom_emoji_html: Scriosadh %{name} emoji %{target}
         destroy_domain_allow_html: Dhiúltaigh %{name} cónaidhm le fearann ​​%{target}
         destroy_domain_block_html: "%{name} fearann ​​%{target} bainte de"
-        destroy_email_domain_block_html: "%{name} bain an bac den fhearann ​​ríomhphoist %{target}"
         destroy_instance_html: Glanadh %{name} fearann ​​%{target}
         destroy_ip_block_html: "%{name} scriosta riail le haghaidh IP %{target}"
         destroy_status_html: Bhain %{name} postáil le %{target}
@@ -269,10 +252,8 @@ ga:
         destroy_user_role_html: Scrios %{name} ról %{target}
         disable_2fa_user_html: Dhíchumasaigh %{name} riachtanas dhá fhachtóir don úsáideoir %{target}
         disable_custom_emoji_html: Dhíchumasaigh %{name} emoji %{target}
-        disable_sign_in_token_auth_user_html: Dhíchumasaigh %{name} fíordheimhniú comhartha ríomhphoist le haghaidh %{target}
         disable_user_html: "%{name} logáil isteach díchumasaithe d'úsáideoir %{target}"
         enable_custom_emoji_html: "%{name} emoji cumasaithe %{target}"
-        enable_sign_in_token_auth_user_html: Chuir %{name} fíordheimhniú comhartha ríomhphoist ar chumas %{target}
         enable_user_html: "%{name} logáil isteach cumasaithe don úsáideoir %{target}"
         memorialize_account_html: Rinne %{name} cuntas %{target} a iompú ina leathanach cuimhneacháin
         promote_user_html: Chuir %{name} úsáideoir %{target} chun cinn
@@ -280,7 +261,6 @@ ga:
         reject_user_html: Dhiúltaigh %{name} síniú suas ó %{target}
         remove_avatar_user_html: Bhain %{name} avatar %{target}
         reopen_report_html: D'athoscail %{name} tuairisc %{target}
-        resend_user_html: "%{name} athsheoladh ríomhphost deimhnithe le haghaidh %{target}"
         reset_password_user_html: Athshocraigh %{name} pasfhocal úsáideora %{target}
         resolve_report_html: Réitigh %{name} tuairisc %{target}
         sensitive_account_html: Mharcáil %{name} meán %{target} mar íogair
@@ -456,7 +436,6 @@ ga:
         one: "%{count} iarracht le seachtain anuas"
         other: "%{count} iarracht chun síniú suas le seachtain anuas"
         two: "%{count} iarracht chun síniú suas le seachtain anuas"
-      created_msg: D'éirigh leis an bhfearann ​​ríomhphoist a bhlocáil
       delete: Scrios
       dns:
         types:
@@ -465,12 +444,8 @@ ga:
       new:
         create: Cuir fearann ​​leis
         resolve: Réitigh fearann
-        title: Cuir bac ar fhearann ​​​​r-phoist nua
-      no_email_domain_block_selected: Níor athraíodh aon bhloc fearainn ríomhphoist mar níor roghnaíodh ceann ar bith
       not_permitted: Níl sé ceadaithe
-      resolved_dns_records_hint_html: Réitíonn an t-ainm fearainn chuig na fearainn MX seo a leanas, atá freagrach sa deireadh as glacadh le ríomhphost. Má dhéantar fearann ​​MX a bhlocáil, cuirfear bac ar chlárúcháin ó aon seoladh ríomhphoist a úsáideann an fearann ​​MX céanna, fiú má tá an t-ainm fearainn infheicthe difriúil. <strong>Bí cúramach gan bac a chur ar phríomhsholáthraithe ríomhphoist.</strong>
       resolved_through_html: Réitithe trí %{domain}
-      title: Fearainn ríomhphoist bactha
     export_domain_allows:
       new:
         title: Ceadaíonn fearann ​​​​iomportála
@@ -636,7 +611,6 @@ ga:
         resolve_description_html: Ní dhéanfar aon ghníomhaíocht i gcoinne an chuntais thuairiscithe, ní dhéanfar aon stailc a thaifeadadh, agus dúnfar an tuarascáil.
         silence_description_html: Ní bheidh an cuntas le feiceáil ach amháin dóibh siúd a leanann é cheana féin nó a bhreathnaíonn suas de láimh air, rud a chuirfidh srian mór ar a rochtain. Is féidir é a chur ar ais i gcónaí. Dúnann sé gach tuairisc i gcoinne an chuntais seo.
         suspend_description_html: Beidh an cuntas agus a bhfuil ann go léir dorochtana agus scriosfar iad ar deireadh, agus beidh sé dodhéanta idirghníomhú leis. Inchúlaithe laistigh de 30 lá. Dúnann sé gach tuairisc i gcoinne an chuntais seo.
-      actions_description_html: Déan cinneadh ar an ngníomh atá le déanamh chun an tuarascáil seo a réiteach. Má dhéanann tú beart pionósach in aghaidh an chuntais tuairiscithe, seolfar fógra ríomhphoist chucu, ach amháin nuair a roghnaítear an chatagóir <strong>Turscar</strong>.
       actions_description_remote_html: Déan cinneadh ar an ngníomh atá le déanamh chun an tuarascáil seo a réiteach. Ní bheidh tionchar aige seo ach ar an gcaoi a ndéanann <strong>do fhreastalaí</strong> cumarsáid leis an gcianchuntas seo agus a láimhseálann sé a ábhar.
       add_to_report: Cuir tuilleadh leis an tuairisc
       already_suspended_badges:
@@ -701,7 +675,6 @@ ga:
         delete_data_html: Scrios próifíl agus inneachar <strong>@%{acct}</strong> 30 lá ó anois mura mbeidh siad curtha ar fionraí idir an dá linn
         preview_preamble_html: 'Gheobhaidh <strong>@%{acct}</strong> rabhadh leis an ábhar seo a leanas:'
         record_strike_html: Taifead stailc in aghaidh <strong>@%{acct}</strong> chun cabhrú leat dul i ngleic le sáruithe amach anseo ón gcuntas seo
-        send_email_html: Seol ríomhphost rabhaidh chuig <strong>@%{acct}</strong>
         warning_placeholder: Réasúnaíocht bhreise roghnach don ghníomh modhnóireachta.
       target_origin: Bunús an chuntais tuairiscithe
       title: Tuairiscí
@@ -747,7 +720,6 @@ ga:
         manage_appeals: Achomharc a bhainistiú
         manage_appeals_description: Ligeann sé d'úsáideoirí athbhreithniú a dhéanamh ar achomhairc i gcoinne gníomhartha modhnóireachta
         manage_blocks: Bainistigh Bloic
-        manage_blocks_description: Ligeann sé d'úsáideoirí bac a chur ar sholáthraithe ríomhphoist agus seoltaí IP
         manage_custom_emojis: Bainistigh Emojis Saincheaptha
         manage_custom_emojis_description: Ligeann sé d'úsáideoirí emojis saincheaptha a bhainistiú ar an bhfreastalaí
         manage_federation: Cónaidhm a bhainistiú
@@ -765,7 +737,6 @@ ga:
         manage_taxonomies: Tacsanomaíochtaí a bhainistiú
         manage_taxonomies_description: Ligeann sé d'úsáideoirí athbhreithniú a dhéanamh ar inneachar treochta agus socruithe hashtag a nuashonrú
         manage_user_access: Bainistigh Rochtain Úsáideoir
-        manage_user_access_description: Ligeann sé d'úsáideoirí fíordheimhniú dhá fhachtóir úsáideoirí eile a dhíchumasú, a seoladh r-phoist a athrú, agus a bpasfhocal a athshocrú
         manage_users: Bainistigh Úsáideoirí
         manage_users_description: Ligeann sé d'úsáideoirí sonraí úsáideoirí eile a fheiceáil agus gníomhartha modhnóireachta a dhéanamh ina gcoinne
         manage_webhooks: Bainistigh cuacha Gréasáin
@@ -840,7 +811,6 @@ ga:
       destroyed_msg: D'éirigh le huaslódáil an tsuímh a scriosadh!
     software_updates:
       critical_update: Criticiúil - nuashonraigh go tapa le do thoil
-      description: Moltar do shuiteáil Mastodon a choinneáil cothrom le dáta chun leas a bhaint as na socruithe agus na gnéithe is déanaí. Ina theannta sin, tá sé ríthábhachtach uaireanta Mastodon a nuashonrú go tráthúil chun saincheisteanna slándála a sheachaint. Ar na cúiseanna seo, seiceálann Mastodon nuashonruithe gach 30 nóiméad, agus tabharfaidh sé fógra duit de réir do shainroghanna fógra ríomhphoist.
       documentation_link: Foghlaim níos mó
       release_notes: Nótaí scaoilte
       title: Nuashonruithe ar fáil
@@ -1017,7 +987,6 @@ ga:
           one: Úsáidte ag duine amháin le seachtain anuas
           other: Úsáidte ag %{count} duine le seachtain anuas
           two: Úsáidte ag %{count} duine le seachtain anuas
-      title: Treochtaí
       trending: Treocht
     warning_presets:
       add_new: Cuir nua leis
@@ -1105,9 +1074,7 @@ ga:
       guide_link_text: Is féidir le gach duine rannchuidiú.
     sensitive_content: Ábhar íogair
   application_mailer:
-    notification_preferences: Athraigh roghanna ríomhphoist
     salutation: "%{name},"
-    settings: 'Athraigh sainroghanna ríomhphoist: %{link}'
     unsubscribe: Díliostáil
     view: 'Amharc:'
     view_profile: Féach ar phróifíl
@@ -1127,7 +1094,6 @@ ga:
       hint_html: Ach rud amháin eile! Ní mór dúinn a dhearbhú gur duine daonna thú (tá sé seo ionas gur féidir linn an turscar a choinneáil amach!). Réitigh an CAPTCHA thíos agus cliceáil "Ar aghaidh".
       title: Seiceáil slándála
     confirmations:
-      awaiting_review: Tá do sheoladh r-phoist deimhnithe! Tá do chlárúchán á athbhreithniú ag foireann %{domain} anois. Gheobhaidh tú r-phost má fhaomhann siad do chuntas!
       awaiting_review_title: Tá do chlárú á athbhreithniú
       clicking_this_link: ag cliceáil ar an nasc seo
       login_link: logáil isteach
@@ -1135,7 +1101,6 @@ ga:
       redirect_to_app_html: Ba cheart go ndearnadh tú a atreorú chuig an aip <strong>%{app_name}</strong>. Murar tharla sin, bain triail as %{clicking_this_link} nó fill ar an aip de láimh.
       registration_complete: Tá do chlárú ar %{domain} críochnaithe anois!
       welcome_title: Fáilte, %{name}!
-      wrong_email_hint: Mura bhfuil an seoladh ríomhphoist sin ceart, is féidir leat é a athrú i socruithe cuntais.
     delete_account: Scrios cuntas
     delete_account_html: Más mian leat do chuntas a scriosadh, is féidir leat <a href="%{path}">leanúint ar aghaidh anseo</a>. Iarrfar ort deimhniú.
     description:
@@ -1156,7 +1121,6 @@ ga:
     or_log_in_with: Nó logáil isteach le
     privacy_policy_agreement_html: Léigh mé agus aontaím leis an <a href="%{privacy_policy_path}" target="_blank">polasaí príobháideachais</a>
     progress:
-      confirm: Deimhnigh Ríomhphost
       details: Do chuid sonraí
       review: Ár léirmheas
       rules: Glac le rialacha
@@ -1178,10 +1142,8 @@ ga:
     security: Slándáil
     set_new_password: Socraigh pasfhocal nua
     setup:
-      email_below_hint_html: Seiceáil d'fhillteán turscair, nó iarr ceann eile. Is féidir leat do sheoladh r-phoist a cheartú má tá sé mícheart.
       email_settings_hint_html: Cliceáil ar an nasc a sheol muid chugat chun %{email} a fhíorú. Beidh muid ag fanacht ar dheis anseo.
       link_not_received: Nach bhfuair tú nasc?
-      new_confirmation_instructions_sent: Gheobhaidh tú r-phost nua leis an nasc deimhnithe i gceann cúpla bomaite!
       title: Seiceáil do bhosca isteach
     sign_in:
       preamble_html: Logáil isteach le do dhintiúir <strong>%{domain}</strong>. Má tá do chuntas á óstáil ar fhreastalaí eile, ní bheidh tú in ann logáil isteach anseo.
@@ -1192,9 +1154,7 @@ ga:
       title: Déanaimis tú a shocrú ar %{domain}.
     status:
       account_status: Stádas cuntais
-      confirming: Ag fanacht le deimhniú r-phoist a bheith críochnaithe.
       functional: Tá do chuntas ag feidhmiú go hiomlán.
-      pending: Tá d’iarratas ar feitheamh athbhreithnithe ag ár bhfoireann. Seans go dtógfaidh sé seo roinnt ama. Gheobhaidh tú ríomhphost má cheadaítear d’iarratas.
       redirecting_to: Tá do chuntas neamhghníomhach toisc go bhfuil sé á atreorú chuig %{acct} faoi láthair.
       self_destruct: Toisc go bhfuil %{domain} ag dúnadh síos, ní bhfaighidh tú ach rochtain theoranta ar do chuntas.
       view_strikes: Féach ar stailceanna san am atá caite i gcoinne do chuntais
@@ -1237,9 +1197,6 @@ ga:
       before: 'Sula dtéann tú ar aghaidh, léigh na nótaí seo go cúramach le do thoil:'
       caches: Seans go seasfaidh inneachar atá i dtaisce ag freastalaithe eile
       data_removal: Bainfear do phostálacha agus sonraí eile go buan
-      email_change_html: Is féidir leat <a href="%{path}">do sheoladh ríomhphoist a athrú</a> gan do chuntas a scriosadh
-      email_contact_html: Mura dtagann sé fós, is féidir leat ríomhphost a chur chuig <a href="mailto:%{email}">%{email}</a> chun cabhair a fháil
-      email_reconfirmation_html: Mura bhfuil an ríomhphost deimhnithe á fháil agat, is féidir <a href="%{path}">é a iarraidh arís</a>
       irreversible: Ní bheidh tú in ann do chuntas a aischur nó a athghníomhachtú
       more_details_html: Le haghaidh tuilleadh sonraí, féach an <a href="%{terms_path}">polasaí príobháideachais</a>.
       username_available: Cuirfear d'ainm úsáideora ar fáil arís
@@ -1496,7 +1453,6 @@ ga:
     authentication_methods:
       otp: app fíordheimhnithe dhá-fachtóir
       password: pasfhocal
-      sign_in_token: cód slándála ríomhphoist
       webauthn: eochracha slándála
     description_html: Má fheiceann tú gníomhaíocht nach n-aithníonn tú, smaoinigh ar do phasfhocal a athrú agus fíordheimhniú dhá fhachtóir a chumasú.
     empty: Níl aon stair fíordheimhnithe ar fáil
@@ -1507,16 +1463,6 @@ ga:
     unsubscribe:
       action: Sea, díliostáil
       complete: Gan liostáil
-      confirmation_html: An bhfuil tú cinnte gur mhaith leat díliostáil ó %{type} a fháil do Mastodon ar %{domain} chuig do ríomhphost ag %{email}? Is féidir leat liostáil arís i gcónaí ó do <a href="%{settings_path}">socruithe fógra ríomhphoist</a>.
-      emails:
-        notification_emails:
-          favourite: r-phoist fógra is fearr leat
-          follow: r-phoist fógra a leanúint
-          follow_request: r-phoist iarratais a leanúint
-          mention: trácht ar r-phoist fógra
-          reblog: r-phoist fógra a threisiú
-      resubscribe_html: Má dhíliostáil tú de dhearmad, is féidir leat liostáil arís ó do <a href="%{settings_path}">socruithe fógra ríomhphoist</a>.
-      success_html: Ní bhfaighidh tú %{type} le haghaidh Mastodon ar %{domain} chuig do ríomhphost ag %{email} a thuilleadh.
       title: Díliostáil
   media_attachments:
     validations:
@@ -1597,8 +1543,6 @@ ga:
     update:
       subject: Chuir %{name} postáil in eagar
   notifications:
-    administration_emails: Fógraí r-phoist admin
-    email_events: Imeachtaí le haghaidh fógraí ríomhphoist
     email_events_hint: 'Roghnaigh imeachtaí ar mhaith leat fógraí a fháil ina leith:'
   number:
     human:
@@ -1757,7 +1701,6 @@ ga:
     import: Iompórtáil
     import_and_export: Iompórtáil agus easpórtáil
     migrate: Imirce cuntais
-    notifications: Fógraí ríomhphoist
     preferences: Sainroghanna pearsanta
     profile: Próifíl
     relationships: Leantóirí agus leanúna
@@ -2025,7 +1968,6 @@ ga:
     invalid_otp_token: Cód dhá-fhachtóir neamhbhailí
     otp_lost_help_html: Má chaill tú rochtain ar an dá cheann, is féidir leat dul i dteagmháil le %{email}
     rate_limited: An iomarca iarrachtaí fíordheimhnithe, bain triail eile as ar ball.
-    seamless_external_login: Tá tú logáilte isteach trí sheirbhís sheachtrach, mar sin níl socruithe pasfhocail agus ríomhphoist ar fáil.
     signed_in_as: 'Sínithe isteach mar:'
   verification:
     extra_instructions_html: <strong>Leid:</strong> Is féidir an nasc ar do shuíomh Gréasáin a bheith dofheicthe. Is í an chuid thábhachtach ná <code>rel="me"</code> a chuireann cosc ​​ar phearsanú ar shuímh Ghréasáin a bhfuil inneachar a ghintear leis an úsáideoir. Is féidir leat fiú clib <code>nasc</code> a úsáid i gceanntásc an leathanaigh in ionad <code>a</code>, ach caithfidh an HTML a bheith inrochtana gan JavaScript a chur i gcrích.
diff --git a/config/locales/gd.yml b/config/locales/gd.yml
index 017cc660e097a6..9490590bd48c3e 100644
--- a/config/locales/gd.yml
+++ b/config/locales/gd.yml
@@ -35,7 +35,6 @@ gd:
       created_msg: Chaidh nòta na maorsainneachd a chruthachadh!
       destroyed_msg: Chaidh nòta na maorsainneachd a mhilleadh!
     accounts:
-      add_email_domain_block: Bac àrainn a’ phuist-d
       approve: Aontaich ris
       approved_msg: Chaidh aontachadh ris an iarrtas clàraidh aig %{username}
       are_you_sure: A bheil thu cinnteach?
@@ -62,7 +61,6 @@ gd:
       demote: Ìslich
       destroyed_msg: Chaidh an dàta aig %{username} a chur air a’ chiutha ach an dèid a sguabadh às an ceann greis bheag
       disable: Reòth
-      disable_sign_in_token_auth: Cuir à comas dearbhadh le tòcan puist-d
       disable_two_factor_authentication: Cuir an dearbhadh dà-cheumnach à comas
       disabled: Reòthte
       display_name: Ainm-taisbeanaidh
@@ -71,7 +69,6 @@ gd:
       email: Post-d
       email_status: Staid a’ phuist-d
       enable: Dì-reòth
-      enable_sign_in_token_auth: Cuir an comas dearbhadh le tòcan puist-d
       enabled: An comas
       enabled_msg: Chaidh an cunntas aig %{username} a dhì-reòthadh
       followers: Luchd-leantainn
@@ -138,7 +135,6 @@ gd:
       resubscribe: Fo-sgrìobh a-rithist
       role: Dreuchd
       search: Lorg
-      search_same_email_domain: Cleachdaichean eile aig a bheil an aon àrainn puist-d
       search_same_ip: Cleachdaichean eile aig a bheil an t-aon IP
       security: Tèarainteachd
       security_measures:
@@ -179,26 +175,21 @@ gd:
         approve_appeal: Thoir aonta ris an ath-thagradh
         approve_user: Aontaich ris a’ chleachdaiche
         assigned_to_self_report: Iomruin an gearan
-        change_email_user: Atharraich post-d a’ chleachdaiche
         change_role_user: Atharraich dreuchd a’ chleachdaiche
         confirm_user: Dearbh an cleachdaiche
         create_account_warning: Cruthaich rabhadh
         create_announcement: Cruthaich brath-fios
-        create_canonical_email_block: Cruthaich bacadh puist-d
         create_custom_emoji: Cruthaich Emoji gnàthaichte
         create_domain_allow: Cruthaich ceadachadh àrainne
         create_domain_block: Cruthaich bacadh àrainne
-        create_email_domain_block: Cruthaich bacadh àrainne puist-d
         create_ip_block: Cruthaich riaghailt IP
         create_unavailable_domain: Cruthaich àrainn nach eil ri fhaighinn
         create_user_role: Cruthaich dreuchd
         demote_user: Ìslich an cleachdaiche
         destroy_announcement: Sguab às am brath-fios
-        destroy_canonical_email_block: Sguab às dhan bhacadh puist-d
         destroy_custom_emoji: Sguab às an t-Emoji gnàthaichte
         destroy_domain_allow: Sguab às ceadachadh na h-àrainne
         destroy_domain_block: Sguab às bacadh na h-àrainne
-        destroy_email_domain_block: Sguab às bacadh na h-àrainne puist-d
         destroy_instance: Purgaidich an àrainn
         destroy_ip_block: Sguab às an riaghailt IP
         destroy_status: Sguab às am post
@@ -206,10 +197,8 @@ gd:
         destroy_user_role: Mill an dreuchd
         disable_2fa_user: Cuir an dearbhadh dà-cheumnach à comas
         disable_custom_emoji: Cuir an t-Emoji gnàthaichte à comas
-        disable_sign_in_token_auth_user: Cuir à comas dearbhadh le tòcan puist-d dhan chleachdaiche
         disable_user: Cuir an cleachdaiche à comas
         enable_custom_emoji: Cuir an t-Emoji gnàthaichte an comas
-        enable_sign_in_token_auth_user: Cuir an comas dearbhadh le tòcan puist-d dhan chleachdaiche
         enable_user: Cuir an cleachdaiche an comas
         memorialize_account: Dèan cuimhneachan dhen chunntas
         promote_user: Àrdaich an cleachdaiche
@@ -239,26 +228,20 @@ gd:
         approve_appeal_html: Dh’aontaich %{name} ri ath-thagradh air co-dhùnadh na maorsainneachd o %{target}
         approve_user_html: Dh’aontaich %{name} ri clàradh o %{target}
         assigned_to_self_report_html: Dh’iomruin %{name} an gearan %{target} dhaibh fhèin
-        change_email_user_html: Dh’atharraich %{name} seòladh puist-d a’ chleachdaiche %{target}
         change_role_user_html: Atharraich %{name} an dreuchd aig %{target}
-        confirm_user_html: Dhearbh %{name} seòladh puist-d a’ chleachdaiche %{target}
         create_account_warning_html: Chuir %{name} rabhadh gu %{target}
         create_announcement_html: Chruthaich %{name} brath-fios %{target} ùr
-        create_canonical_email_block_html: Bhac %{name} am post-d air a bheil an hais %{target}
         create_custom_emoji_html: Luchdaich %{name} suas Emoji %{target} ùr
         create_domain_allow_html: Cheadaich %{name} co-nasgadh leis an àrainn %{target}
         create_domain_block_html: Bhac %{name} an àrainn %{target}
-        create_email_domain_block_html: Bhac %{name} an àrainn puist-d %{target}
         create_ip_block_html: Chruthaich %{name} riaghailt dhan IP %{target}
         create_unavailable_domain_html: Sguir %{name} ris an lìbhrigeadh dhan àrainn %{target}
         create_user_role_html: Chruthaich %{name} an dreuchd %{target}
         demote_user_html: Dh’ìslich %{name} an cleachdaiche %{target}
         destroy_announcement_html: Sguab %{name} às am brath-fios %{target}
-        destroy_canonical_email_block_html: Dhì-bhac %{name} am post-d air a bheil an hais %{target}
         destroy_custom_emoji_html: Sguab %{name} às an Emoji %{target}
         destroy_domain_allow_html: Dì-cheadaich %{name} co-nasgadh leis an àrainn %{target}
         destroy_domain_block_html: Dì-bhac %{name} an àrainn %{target}
-        destroy_email_domain_block_html: Dì-bhac %{name} an àrainn puist-d %{target}
         destroy_instance_html: Purgaidich %{name} an àrainn %{target}
         destroy_ip_block_html: Sguab %{name} às riaghailt dhan IP %{target}
         destroy_status_html: Thug %{name} post aig %{target} air falbh
@@ -266,10 +249,8 @@ gd:
         destroy_user_role_html: Sguab %{name} às an dreuchd %{target}
         disable_2fa_user_html: Chuir %{name} riatanas an dearbhaidh dà-cheumnaich à comas dhan chleachdaiche %{target}
         disable_custom_emoji_html: Chuir %{name} an Emoji %{target} à comas
-        disable_sign_in_token_auth_user_html: Chuir %{name} à comas dearbhadh le tòcan puist-d dha %{target}
         disable_user_html: Chuir %{name} an clàradh a-steach à comas dhan chleachdaiche %{target}
         enable_custom_emoji_html: Chuir %{name} an Emoji %{target} an comas
-        enable_sign_in_token_auth_user_html: Chuir %{name} an comas dearbhadh le tòcan puist-d dha %{target}
         enable_user_html: Chuir %{name} an clàradh a-steach an comas dhan chleachdaiche %{target}
         memorialize_account_html: Rinn %{name} duilleag cuimhneachain dhen chunntas aig %{target}
         promote_user_html: Dh’àrdaich %{name} an cleachdaiche %{target}
@@ -277,7 +258,6 @@ gd:
         reject_user_html: Dhiùlt %{name} an clàradh o %{target}
         remove_avatar_user_html: Thug %{name} avatar aig %{target} air falbh
         reopen_report_html: Dh’fhosgail %{name} an gearan %{target} a-rithist
-        resend_user_html: Chuir %{name} am post-d dearbhaidh airson %{target} a-rithist
         reset_password_user_html: Dh’ath-shuidhich %{name} am facal-faire aig a’ chleachdaiche %{target}
         resolve_report_html: Dh’fhuasgail %{name} an gearan %{target}
         sensitive_account_html: Chuir %{name} comharra gu bheil e frionasach ri meadhan aig %{target}
@@ -448,7 +428,6 @@ gd:
         one: "%{count} oidhirp clàraidh rè na seachdain seo chaidh"
         other: "%{count} oidhirp clàraidh rè na seachdain seo chaidh"
         two: "%{count} oidhirp clàraidh rè na seachdain seo chaidh"
-      created_msg: Chaidh àrainn a’ phuist-d a bhacadh
       delete: Sguab às
       dns:
         types:
@@ -457,12 +436,8 @@ gd:
       new:
         create: Cuir àrainn ris
         resolve: Fuasgail an àrainn
-        title: Bac àrainn puist-d ùr
-      no_email_domain_block_selected: Cha deach bacadh àrainn puist-d sam bith atharrachadh o nach deach gin dhiubh a thaghadh
       not_permitted: Chan eil seo ceadaichte
-      resolved_dns_records_hint_html: Thèid ainm na h-àrainne fhuasgladh nan àrainnean MX a leanas agus an urra riutha-san gun gabh iad ri post-d. Ma bhacas tu àrainn MX, bacaidh seo an clàradh o sheòladh puist-d sam bith a chleachdas an aon àrainn MX fiù ’s ma bhios ainm àrainne eadar-dhealaichte ’ga sealltainn. <strong>Thoir an aire nach bac thu solaraichean puist-d mòra.</strong>
       resolved_through_html: Chaidh fuasgladh slighe %{domain}
-      title: Bacadh àrainnean puist-d
     export_domain_allows:
       new:
         title: Ion-phortaich àrainnean ceadaichte
@@ -624,7 +599,6 @@ gd:
         resolve_description_html: Cha dèid gnìomh sam bith a ghabhail an aghaidh a’ chunntais le gearan air agus thèid an gearan a dhùnadh gun rabhadh a chlàradh.
         silence_description_html: Chan fhaic ach an fheadhainn a tha ’ga leantainn mu thràth no a lorgas a làimh e an cunntas seo agus cuingichidh seo uiread nan daoine a ruigeas e gu mòr. Gabhaidh seo a neo-dhèanamh uair sam bith. Dùinidh seo gach gearan mun chunntas seo.
         suspend_description_html: Cha ghabh an cunntas seo agus an t-susbaint gu leòr aige inntrigeadh gus an dèid a sguabadh às air deireadh na sgeòil agus cha ghabh eadar-ghabhail a dhèanamh leis. Gabhaidh seo a neo-dhèanamh am broinn 30 latha. Dùinidh seo gach gearan mun chunntas seo.
-      actions_description_html: Socraich dè a nì thu airson an gearan seo fhuasgladh. Ma chuireas tu peanas air a’ chunntas le gearan air, gheibh iad brath air a’ phost-d mura tagh thu an roinn-seòrsa <strong>Spama</strong>.
       actions_description_remote_html: Cuir romhad dè an gnìomh a ghabhas tu airson an gearan seo fhuasgladh. Cha bheir seo buaidh ach air mar a làimhsicheas am frithealaiche <strong>agadsa</strong> an cunntas cèin seo is mar a nì e conaltradh leis.
       add_to_report: Cuir barrachd ris a’ ghearan
       already_suspended_badges:
@@ -689,7 +663,6 @@ gd:
         delete_data_html: Sguab às a’ phròifil ’s an t-susbaint aig <strong>@%{acct}</strong> an ceann 30 latha mura dèid an cur an gnìomh a-rithist roimhe sin
         preview_preamble_html: 'Gheibh <strong>@%{acct}</strong> rabhadh leis an t-susbaint seo:'
         record_strike_html: Clàraich rabhadh an aghaidh <strong>@%{acct}</strong> airson do chuideachadh ach am bi thu nas teinne le droch-ghiùlan on chunntas seo san àm ri teachd
-        send_email_html: Cuir post-d rabhaidh gu <strong>@%{acct}</strong>
         warning_placeholder: Adhbharan roghainneil eile air gnìomh na maorsainneachd.
       target_origin: Tùs cunntas a’ ghearain
       title: Gearanan
@@ -733,7 +706,6 @@ gd:
         manage_appeals: Stiùireadh ath-thagraidhean
         manage_appeals_description: Leigidh seo le cleachdaichean lèirmheas a dhèanamh air ath-thagraidhean an aghaidh gnìomhan mhaor
         manage_blocks: Stiùireadh nam bacaidhean
-        manage_blocks_description: Leigidh seo le cleachdaichean solaraichean puist-d is seòlaidhean IP a bhacadh
         manage_custom_emojis: Stiùireadh nan Emojis gnàthaichte
         manage_custom_emojis_description: Leigidh seo le cleachdaichean Emojis gnàthaichte a stiùireadh air an fhrithealaiche
         manage_federation: Stiùireadh a’ cho-nasgaidh
@@ -751,7 +723,6 @@ gd:
         manage_taxonomies: Stiùireadh thacsonamaidhean
         manage_taxonomies_description: Leigidh seo le cleachdaichean lèirmheas a dhèanamh air an t-susbaint a tha a’ treandadh agus roghainnean nan tagaichean hais ùrachadh
         manage_user_access: Stiùireadh inntrigeadh chleachdaichean
-        manage_user_access_description: Leigidh seo le cleachdaichean gun cuir iad à comas dearbhadh dà-cheumnach càich, gun atharraich iad an seòladh puist-d aca is gun ath-shuidhich iad am facal-faire aca
         manage_users: Stiùireadh chleachdaichean
         manage_users_description: Leigidh seo le cleachdaichean mion-fhiosrachadh càich a shealltainn agus gnìomhan maoir a ghabhail ’nan aghaidh
         manage_webhooks: Stiùireadh nan webhooks
@@ -826,7 +797,6 @@ gd:
       destroyed_msg: Chaidh an luchdadh suas dhan làrach a sguabadh às!
     software_updates:
       critical_update: Èiginneach – ùraich cho luath ’s a ghabhas
-      description: Mholamaid gun cùm thu an stàladh agad de Mhastodon ùraichte ach am faigh thu buannachd às na càraidhean ’s gleusan as ùire. A bharrachd air sin, bidh e èiginneach aig amannan gun ùraich thu Mastodon gun dàil airson duilgheadasan tèarainteachd a sheachnadh. Seo as adhbhar gun doir Mastodon sùil airson ùrachaidhean gach leth-uair a thìde ’s gun cuir e brath thugad a-rèir nan roghainnean puist-d agad.
       documentation_link: Barrachd fiosrachaidh
       release_notes: Nòtaichean sgaoilidh
       title: Ùrachaidhean a tha ri fhaighinn
@@ -1000,7 +970,6 @@ gd:
           one: Chaidh a chleachdadh le %{count} rè na seachdain seo chaidh
           other: Chaidh a chleachdadh le %{count} rè na seachdain seo chaidh
           two: Chaidh a chleachdadh le %{count} rè na seachdain seo chaidh
-      title: Treandaichean
       trending: A’ treandadh
     warning_presets:
       add_new: Cuir fear ùr ris
@@ -1087,9 +1056,7 @@ gd:
       guide_link_text: "’S urrainn do neach sam bith cuideachadh."
     sensitive_content: Susbaint fhrionasach
   application_mailer:
-    notification_preferences: Atharraich roghainnean a’ phuist-d
     salutation: "%{name},"
-    settings: 'Atharraich roghainnean a’ phuist-d: %{link}'
     unsubscribe: Cuir crìoch air an fho-sgrìobhadh
     view: 'Faic:'
     view_profile: Seall a’ phròifil
@@ -1109,7 +1076,6 @@ gd:
       hint_html: Dìreach aon rud eile! Feumaidh sinn dearbhadh gu bheil thu daonna (ach am fàg sinn an spama aig an doras!). Fuasgail an CAPTCHA gu h-ìosal is briog air “Lean air adhart”.
       title: Deuchainn tèarainteachd
     confirmations:
-      awaiting_review: Chaidh am post-d agad a dhearbhadh! Nì an sgioba aig %{domain} lèirmheas air a’ chlàradh agad a-nis. Gheibh thu post-d nuair a bhios iad air aontachadh ris a’ chunntas agad!
       awaiting_review_title: Tha an cunntas agad ’ga sgrùdadh
       clicking_this_link: briogadh air a’ cheangal seo
       login_link: clàradh a-steach
@@ -1117,7 +1083,6 @@ gd:
       redirect_to_app_html: Bu chòir dhuinn d’ ath-stiùireadh gu aplacaid <strong>%{app_name}</strong>. Mur an do dh’obraich sin, feuch %{clicking_this_link} no till dhan aplacaid a làimh.
       registration_complete: Tha an clàradh agad air %{domain} deiseil a-nis!
       welcome_title: Fàilte ort, %{name}!
-      wrong_email_hint: Mur eil an seòladh puist-d seo mar bu chòir, ’s urrainn dhut atharrachadh ann an roghainnean a’ chunntais.
     delete_account: Sguab às an cunntas
     delete_account_html: Nam bu mhiann leat an cunntas agad a sguabadh às, <a href="%{path}">nì thu an-seo e</a>. Thèid dearbhadh iarraidh ort.
     description:
@@ -1138,7 +1103,6 @@ gd:
     or_log_in_with: No clàraich a-steach le
     privacy_policy_agreement_html: Leugh mi is tha mi ag aontachadh ris a’ <a href="%{privacy_policy_path}" target="_blank">phoileasaidh prìobhaideachd</a>
     progress:
-      confirm: Post-d an dearbhaidh
       details: Am fiosrachadh agad
       review: An lèirmheas againn
       rules: Gabh ris na riaghailtean
@@ -1160,10 +1124,8 @@ gd:
     security: Tèarainteachd
     set_new_password: Suidhich facal-faire ùr
     setup:
-      email_below_hint_html: Thoir sùil air pasgan an spama agad no iarr fear eile. ’S urrainn dhut an seòladh puist-d agad a chur ceart ma tha e ceàrr.
       email_settings_hint_html: Briog air a’ cheangal a chuir sinn thugad a dhearbhadh %{email}. Fuirichidh sinn ort an-seo.
       link_not_received: Nach d’fhuair thu ceangal?
-      new_confirmation_instructions_sent: Gheibh thu post-d ùr le ceangal dearbhaidh an ceann corra mionaid!
       title: Thoir sùil air a’ bhogsa a-steach agad
     sign_in:
       preamble_html: Clàraich a-steach le do theisteas <strong>%{domain}</strong>. Ma tha an cunntas agad ’ga òstadh air frithealaiche eile, chan urrainn dhut clàradh a-steach an-seo.
@@ -1174,9 +1136,7 @@ gd:
       title: Suidhicheamaid %{domain} dhut.
     status:
       account_status: Staid a’ chunntais
-      confirming: A’ feitheamh air coileanadh an dearbhaidh on phost-d.
       functional: Tha an cunntas agad ag obair gu slàn.
-      pending: Feumaidh an sgioba againn lèirmheas a dhèanamh air d’ iarrtas. Dh’fhaoidte gun doir seo greis. Gheibh thu post-d nuair a bhios sinn air aontachadh ri d’ iarrtas.
       redirecting_to: Chan eil an cunntas gad gnìomhach on a tha e ’ga ath-stiùireadh gu %{acct}.
       self_destruct: On a tha %{domain} gu bhith dùnadh, chan fhaigh thu ach inntrigeadh cuingichte dhan chunntas agad.
       view_strikes: Seall na rabhaidhean a fhuair an cunntas agad roimhe
@@ -1219,9 +1179,6 @@ gd:
       before: 'Mus lean thu air adhart, leugh na nòtaichean seo gu cùramach:'
       caches: Dh’fhaoidte gum mair susbaint ann an tasgadain fhrithealaichean eile
       data_removal: Thèid na postaichean agad ’s dàta eile a thoirt air falbh gu buan
-      email_change_html: ’S urrainn dhut <a href="%{path}">an seòladh puist-d agad atharrachadh</a> gun a bhith a’ sguabadh às a’ chunntais agad
-      email_contact_html: Mura faigh thu fhathast e, ’s urrainn dhut post-d a chur gu <a href="mailto:%{email}">%{email}</a> airson cuideachaidh
-      email_reconfirmation_html: Mur an d’ fhuair thu am post-d dearbhaidh, ’s urrainn dhut <a href="%{path}">iarraidh a-rithist</a>
       irreversible: Chan urrainn dhut an cunntas agad aiseag no ath-ghnìomhachadh
       more_details_html: Airson barrachd fiosrachaidh faic am <a href="%{terms_path}">poileasaidh prìobhaideachd</a>.
       username_available: Bidh an t-ainm-cleachdaiche agad ri fhaighinn a-rithist
@@ -1470,7 +1427,6 @@ gd:
     authentication_methods:
       otp: aplacaid dearbhaidh dhà-cheumnaich
       password: facal-faire
-      sign_in_token: cuir còd tèarainteachd air a’ phost-d
       webauthn: iuchraichean tèarainteachd
     description_html: Ma chì thu gnìomhachd nach aithnich thu, mholamaid gun atharraich thu am facal-faire agad ’s gun cuir thu an dearbhadh dà-cheumnach an comas.
     empty: Chan eil eachdraidh an dearbhaidh ri fhaighinn
@@ -1481,16 +1437,6 @@ gd:
     unsubscribe:
       action: Tha, cuir crìoch air an fho-sgrìobhadh
       complete: Chaidh crìoch a chur air an fho-sgrìobhadh
-      confirmation_html: A bheil thu cinnteach nach eil thu airson %{type} fhaighinn tuilleadh o Mhastodon air %{domain} dhan post-d agad aig %{email}? ’S urrainn dhut fo-sgrìobhadh a-rithist uair sam bith o <a href="%{settings_path}">roghainnean a’ puist-d agad</a>.
-      emails:
-        notification_emails:
-          favourite: puist-d le brathan mu annsachdan
-          follow: puist-d le brathan mu leantainn
-          follow_request: puist-d le brathan mu iarrtasan leantainn
-          mention: puist-d le brathan mu iomraidhean
-          reblog: puist-d le brathan mu bhrosnachaidhean
-      resubscribe_html: Ma chuir thu crìoch air an fho-sgrìobhadh le mearachd, ’s urrainn dhut fo-sgrìobhadh a-rithist o <a href="%{settings_path}">roghainnean a’ puist-d agad</a>.
-      success_html: Chan fhaigh thu %{type} o Mhastodon air %{domain} dhan phost-d agad aig %{email} tuilleadh.
       title: Cuir crìoch air an fho-sgrìobhadh
   media_attachments:
     validations:
@@ -1571,8 +1517,6 @@ gd:
     update:
       subject: Dheasaich %{name} post
   notifications:
-    administration_emails: Brathan puist-d na rianachd
-    email_events: Tachartasan nam brathan puist-d
     email_events_hint: 'Tagh na tachartasan dhan a bheil thu airson brathan fhaighinn:'
   number:
     human:
@@ -1731,7 +1675,6 @@ gd:
     import: Ion-phortadh
     import_and_export: Ion-phortadh ⁊ às-phortadh
     migrate: Imrich cunntais
-    notifications: Brathan puist-d
     preferences: Roghainnean
     profile: Pròifil phoblach
     relationships: Dàimhean leantainn
@@ -1992,7 +1935,6 @@ gd:
     invalid_otp_token: Còd dà-cheumnach mì-dhligheach
     otp_lost_help_html: Ma chaill thu an t-inntrigeadh dhan dà chuid diubh, ’s urrainn dhut fios a chur gu %{email}
     rate_limited: Cus oidhirpean dearbhaidh, feuch ris a-rithist an ceann greis.
-    seamless_external_login: Rinn thu clàradh a-steach le seirbheis on taobh a-muigh, mar sin chan eil roghainnean an fhacail-fhaire ’s a’ phuist-d ri làimh dhut.
     signed_in_as: 'Chlàraich thu a-steach mar:'
   verification:
     extra_instructions_html: <strong>Gliocas:</strong>Faodaidh an ceangal air an làrach-lìn agad a bhith do-fhaicsinneach. ’S e <code>rel="me"</code> a tha sa phàirt chudromach a bhacas riochd cuideigin eile air làraichean-lìn le susbaint air a gintinn o chleachdaiche. ’S urrainn dhut fiù taga <code>link</code> a chleachdadh ann am bann-cinn na duilleige seach <code>a</code> ach feumaidh sinn an HTML ruigsinn gun a bhith a’ ruith JavaScript.
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index d6c00d205ca5b1..1db7f79986b321 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -31,7 +31,6 @@ gl:
       created_msg: Nota de moderación creada correctamente!
       destroyed_msg: Nota de moderación eliminada de xeito correcto!
     accounts:
-      add_email_domain_block: Bloquear o dominio do enderezo
       approve: Aprobar
       approved_msg: Aprobada a solicitude de rexistro de %{username}
       are_you_sure: Está segura?
@@ -58,7 +57,6 @@ gl:
       demote: Rebaixar
       destroyed_msg: Os datos de %{username} están na cola para ser eliminados axiña
       disable: Desactivar
-      disable_sign_in_token_auth: Desactivar a autenticación por token nun email
       disable_two_factor_authentication: Desactivar 2FA
       disabled: Desactivado
       display_name: Nome a amosar
@@ -67,7 +65,6 @@ gl:
       email: Enderezo de correo
       email_status: Estado do correo
       enable: Activar
-      enable_sign_in_token_auth: Activar autenticación cun token no correo
       enabled: Activado
       enabled_msg: Desbloqueada a conta de %{username}
       followers: Seguidoras
@@ -132,7 +129,6 @@ gl:
       resubscribe: Resubscribir
       role: Rol
       search: Procurar
-      search_same_email_domain: Outras usuarias co mesmo dominio de correo
       search_same_ip: Outras usuarias co mesmo IP
       security: Seguridade
       security_measures:
@@ -173,26 +169,21 @@ gl:
         approve_appeal: Aprobar apelación
         approve_user: Aprobar Usuaria
         assigned_to_self_report: Asignar denuncia
-        change_email_user: Editar correo electrónico da usuaria
         change_role_user: Cambiar Rol da Usuaria
         confirm_user: Confirmar usuaria
         create_account_warning: Crear aviso
         create_announcement: Crear anuncio
-        create_canonical_email_block: Crear Bloqueo de correo electrónico
         create_custom_emoji: Crear emoticonas personalizadas
         create_domain_allow: Crear Dominio Permitido
         create_domain_block: Crear bloquedo do Dominio
-        create_email_domain_block: Crear bloqueo de dominio de correo electrónico
         create_ip_block: Crear regra IP
         create_unavailable_domain: Crear dominio Non dispoñible
         create_user_role: Crear Rol
         demote_user: Degradar usuaria
         destroy_announcement: Eliminar anuncio
-        destroy_canonical_email_block: Eliminar Bloqueo de correo electrónico
         destroy_custom_emoji: Eliminar emoticona personalizada
         destroy_domain_allow: Eliminar Dominio permitido
         destroy_domain_block: Eliminar bloqueo do Dominio
-        destroy_email_domain_block: Eliminar bloqueo de dominio de correo electrónico
         destroy_instance: Purgar Dominio
         destroy_ip_block: Eliminar regra IP
         destroy_status: Eliminar publicación
@@ -200,10 +191,8 @@ gl:
         destroy_user_role: Eliminar Rol
         disable_2fa_user: Desactivar 2FA
         disable_custom_emoji: Desactivar emoticona personalizada
-        disable_sign_in_token_auth_user: Desactivar Autenticación con token no correo para Usuaria
         disable_user: Desactivar usuaria
         enable_custom_emoji: Activar emoticona personalizada
-        enable_sign_in_token_auth_user: Activar Autenticación con token no email para Usuaria
         enable_user: Activar usuaria
         memorialize_account: Transformar en conta conmemorativa
         promote_user: Promover usuaria
@@ -233,26 +222,20 @@ gl:
         approve_appeal_html: "%{name} aprobou a apelación da decisión da moderación de %{target}"
         approve_user_html: "%{name} aprobou o rexistro de %{target}"
         assigned_to_self_report_html: "%{name} asignou a denuncia %{target} para si mesma"
-        change_email_user_html: "%{name} cambiou o enderezo de email da usuaria %{target}"
         change_role_user_html: "%{name} cambiou o rol de %{target}"
-        confirm_user_html: "%{name} confirmou o enderezo de email da usuaria %{target}"
         create_account_warning_html: "%{name} envioulle unha advertencia a %{target}"
         create_announcement_html: "%{name} creou un novo anuncio %{target}"
-        create_canonical_email_block_html: "%{name} bloqueou o email con hash %{target}"
         create_custom_emoji_html: "%{name} subiu un novo emoji %{target}"
         create_domain_allow_html: "%{name} permitiu a federación co dominio %{target}"
         create_domain_block_html: "%{name} bloqueou o dominio %{target}"
-        create_email_domain_block_html: "%{name} bloqueou o dominio de email %{target}"
         create_ip_block_html: "%{name} creou regra para o IP %{target}"
         create_unavailable_domain_html: "%{name} deixou de interactuar co dominio %{target}"
         create_user_role_html: "%{name} creou o rol %{target}"
         demote_user_html: "%{name} degradou a usuaria %{target}"
         destroy_announcement_html: "%{name} eliminou o anuncio %{target}"
-        destroy_canonical_email_block_html: "%{name} desbloqueou o email con hash %{target}"
         destroy_custom_emoji_html: "%{name} eliminou o emoji %{target}"
         destroy_domain_allow_html: "%{name} retirou a federación co dominio %{target}"
         destroy_domain_block_html: "%{name} desbloqueou o dominio %{target}"
-        destroy_email_domain_block_html: "%{name} desbloqueou o dominio de email %{target}"
         destroy_instance_html: "%{name} purgou o dominio %{target}"
         destroy_ip_block_html: "%{name} eliminou a regra para o IP %{target}"
         destroy_status_html: "%{name} eliminou a publicación de %{target}"
@@ -260,10 +243,8 @@ gl:
         destroy_user_role_html: "%{name} eliminou o rol %{target}"
         disable_2fa_user_html: "%{name} desactivou o requerimento do segundo factor para a usuaria %{target}"
         disable_custom_emoji_html: "%{name} desactivou o emoji %{target}"
-        disable_sign_in_token_auth_user_html: "%{name} desactivou a autenticación por token no email para %{target}"
         disable_user_html: "%{name} desactivou as credenciais para a usuaria %{target}"
         enable_custom_emoji_html: "%{name} activou o emoji %{target}"
-        enable_sign_in_token_auth_user_html: "%{name} activou a autenticación con token no email para %{target}"
         enable_user_html: "%{name} activou as credenciais para a usuaria %{target}"
         memorialize_account_html: "%{name} convertiu a conta de %{target} nunha páxina para o recordo"
         promote_user_html: "%{name} promocionou a usuaria %{target}"
@@ -271,7 +252,6 @@ gl:
         reject_user_html: "%{name} rexeitou o rexistro de %{target}"
         remove_avatar_user_html: "%{name} eliminou o avatar de %{target}"
         reopen_report_html: "%{name} reabriu a denuncia %{target}"
-        resend_user_html: "%{name} reenviou o email de confirmación para %{target}"
         reset_password_user_html: "%{name} restableceu o contrasinal da usuaria %{target}"
         resolve_report_html: "%{name} resolveu a denuncia %{target}"
         sensitive_account_html: "%{name} marcou o multimedia de %{target} como sensible"
@@ -432,7 +412,6 @@ gl:
       attempts_over_week:
         one: "%{count} intento na última semana"
         other: "%{count} intentos de conexión na última semana"
-      created_msg: Engadiuse de xeito correcto o dominio de email á listaxe negra
       delete: Eliminar
       dns:
         types:
@@ -441,12 +420,8 @@ gl:
       new:
         create: Engadir dominio
         resolve: Resolver dominio
-        title: Nova entrada na listaxe negra de email
-      no_email_domain_block_selected: Non se cambiou ningún bloqueo de dominio de email porque non se seleccionou ningún
       not_permitted: Non permitido
-      resolved_dns_records_hint_html: O nome de dominio resolve os seguintes rexistros MX, que son os últimos responsables da aceptación de emails. Bloqueando un dominio MX rexeitarás calquera enderezo de email que use este dominio MX, incluso se o nome de dominio visible é outro. <strong>Ten coidado de non bloquear os principais provedores.</strong>
       resolved_through_html: Resolto a través de %{domain}
-      title: Listaxe negra de email
     export_domain_allows:
       new:
         title: Importar dominios permitidos
@@ -600,7 +575,6 @@ gl:
         resolve_description_html: Non se van tomar accións contra a conta denunciada, nin se gardarán avisos, e pecharase a denuncia.
         silence_description_html: A conta será visible só para quen xa a está a seguir ou quen a buscou manualmente, limitando moito o seu alcance. Pódese cambiar. Isto pecha tódalas denuncias acerca desta conta.
         suspend_description_html: A conta e todo o seu contido non serán accesible e finalmente eliminaranse, será imposible interactuar con ela. A decisión é reversible durante 30 días. Isto pecha tódalas denuncias sobre esta conta.
-      actions_description_html: Decide que acción tomar respecto desta denuncia. Se tomas accións punitivas contra a conta denunciada, enviaráselles un email coa notificación, excepto se está seleccionada a categoría <strong>Spam</strong>.
       actions_description_remote_html: Decide a acción a tomar para resolver a denuncia. Isto só lle afecta ao xeito en que o <strong>teu</strong> servidor se comunica con esta conta remota e xestiona o seu contido.
       add_to_report: Engadir máis á denuncia
       already_suspended_badges:
@@ -665,7 +639,6 @@ gl:
         delete_data_html: Eliminar o perfil e contidos de <strong>@%{acct}</strong> para os próximos 30 días a non ser que sexa suspendida nese período
         preview_preamble_html: "<strong>@%{acct}</strong> vai recibir un aviso co seguinte contido:"
         record_strike_html: Anotar un aviso contra <strong>@%{acct}</strong> para axudarche a xestionar futuros problemas con esta conta
-        send_email_html: Enviar un correo de aviso a <strong>@%{acct}</strong>
         warning_placeholder: Razóns adicionais optativas para a acción de moderación.
       target_origin: Orixe da conta denunciada
       title: Denuncias
@@ -705,7 +678,6 @@ gl:
         manage_appeals: Xestionar recursos
         manage_appeals_description: Permite revisar as apelacións contra as accións de moderación
         manage_blocks: Xestionar bloqueos
-        manage_blocks_description: Permite bloquear provedores de email e enderezos IP
         manage_custom_emojis: Xestionar Emojis personalizados
         manage_custom_emojis_description: Permite xestionar os emojis personalizados do servidor
         manage_federation: Xestionar a federación
@@ -723,7 +695,6 @@ gl:
         manage_taxonomies: Xestionar Taxonomías
         manage_taxonomies_description: Permite revisar o contido en voga e actualizar os axustes dos cancelos
         manage_user_access: Xestionar Acceso das usuarias
-        manage_user_access_description: Permite desactivar o segundo factor de autenticación doutras usuarias, cambiar o enderezo de email e restablecer o contrasinal
         manage_users: Xestionar Usuarias
         manage_users_description: Permite ver os detalles doutras usuarias e realizar accións de moderación sobre elas
         manage_webhooks: Xestionar Webhooks
@@ -798,7 +769,6 @@ gl:
       destroyed_msg: Eliminado correctamente o subido!
     software_updates:
       critical_update: Crítica - actualiza axiña
-      description: Aconsellamos manter actualizado o teu servidor Mastodon para beneficiarte dos últimos arranxos e características. A maiores, de cando en vez hai actualizacións para evitar problemas importantes de seguridade. Debido a isto, Mastodon comproba cada 30 minutos se hai actualizacións e avisarate seguindo as túas preferencias de notificación por correo electrónico.
       documentation_link: Saber máis
       release_notes: Notas da versión
       title: Actualizacións dispoñibles
@@ -907,10 +877,16 @@ gl:
     trends:
       allow: Permitir
       approved: Aprobadas
+      confirm_allow: Tes certeza de querer permitir os cancelos seleccionados?
+      confirm_disallow: Tes certeza de non querer permitir os cancelos seleccionados?
       disallow: Denegar
       links:
         allow: Permitir ligazón
         allow_provider: Permitir orixe
+        confirm_allow: Tes certeza de querer permitir as ligazóns seleccionadas?
+        confirm_allow_provider: Tes certeza de querer permitir os provedores seleccionados?
+        confirm_disallow: Tes certeza de non querer permitir as ligazóns seleccionadas?
+        confirm_disallow_provider: Tes certeza de non querer permitir os provedores seleccionados?
         description_html: Estas son ligazóns que actualmente están sendo compartidas por moitas contas das que o teu servidor recibe publicación. Pode ser de utilidade para as túas usuarias para saber o que acontece polo mundo. Non se mostran ligazóns de xeito público a non ser que autorices a quen as publica. Tamén podes permitir ou rexeitar ligazóns de xeito individual.
         disallow: Denegar ligazón
         disallow_provider: Denegar orixe
@@ -934,6 +910,10 @@ gl:
       statuses:
         allow: Permitir publicación
         allow_account: Permitir autora
+        confirm_allow: Tes certeza de querer permitir os estados seleccionados?
+        confirm_allow_account: Tes certeza de querer permitir as contas seleccionadas?
+        confirm_disallow: Tes certeza de non querer permitir os estados seleccionados?
+        confirm_disallow_account: Tes certeza de non querer permitir as contas seleccionadas?
         description_html: Estas son publicacións que o teu servidor coñece que están sendo compartidas e favorecidas en gran número neste intre. Pode ser útil para as persoas recén chegadas e para as que retornan para que atopen persoas a quen seguir. Non se mostran publicamente a menos que aprobes a autora, e a autora permita que a súa conta sexa suxerida a outras. Tamén podes rexeitar ou aprobar publicacións individuais.
         disallow: Rexeitar publicación
         disallow_account: Rexeitar autora
@@ -966,7 +946,6 @@ gl:
         used_by_over_week:
           one: Utilizado por unha persoa na última semana
           other: Utilizado por %{count} persoas na última semana
-      title: Tendencias
       trending: Tendencias
     warning_presets:
       add_new: Engadir novo
@@ -1051,9 +1030,7 @@ gl:
       guide_link_text: Todas podemos contribuír.
     sensitive_content: Contido sensible
   application_mailer:
-    notification_preferences: Cambiar os axustes de email
     salutation: "%{name},"
-    settings: 'Mudar as preferencias de e-mail: %{link}'
     unsubscribe: Anular subscrición
     view: 'Vista:'
     view_profile: Ver perfil
@@ -1073,7 +1050,6 @@ gl:
       hint_html: Unha cousa máis! Temos que confirmar que es un ser humano (para poder evitar contas de spam!). Resolve o CAPTCHA de aquí embaixo e preme en "Continuar".
       title: Comprobación de seguridade
     confirmations:
-      awaiting_review: O teu correo está verificado! A administración de %{domain} está revisando a túa solicitude. Recibirás outro correo se aproban a túa conta!
       awaiting_review_title: Estamos revisando a solicitude de rexistro
       clicking_this_link: premendo nesta ligazón
       login_link: acceder
@@ -1081,7 +1057,6 @@ gl:
       redirect_to_app_html: Ímoste redirixir á app <strong>%{app_name}</strong>. Se iso non acontece, proba %{clicking_this_link} ou volve ti manualmente á app.
       registration_complete: Completouse a creación da conta en %{domain}!
       welcome_title: Benvida, %{name}!
-      wrong_email_hint: Se o enderezo de correo non é correcto, podes cambialo nos axustes da conta.
     delete_account: Eliminar conta
     delete_account_html: Se queres eliminar a túa conta, podes <a href="%{path}">facelo aquí</a>. Deberás confirmar a acción.
     description:
@@ -1102,7 +1077,6 @@ gl:
     or_log_in_with: Ou accede con
     privacy_policy_agreement_html: Lin e acepto a <a href="%{privacy_policy_path}" target="_blank">política de privacidade</a>
     progress:
-      confirm: Confirmar email
       details: Detalles
       review: A nosa revisión
       rules: Aceptar regras
@@ -1124,10 +1098,8 @@ gl:
     security: Seguranza
     set_new_password: Estabelecer novo contrasinal
     setup:
-      email_below_hint_html: Mira no cartafol do spam, ou solicita outra. Podes cambiar o enderzo de correo se non é correcto.
       email_settings_hint_html: Preme na ligazón que che enviamos para verificar %{email}. Agardamos por ti.
       link_not_received: Non recibiches a ligazón?
-      new_confirmation_instructions_sent: Nuns minutos recibirás un novo correo electrónico coa ligazón de confirmación!
       title: Mira a caixa de entrada
     sign_in:
       preamble_html: Accede coas credenciais en <strong>%{domain}</strong>. Se a túa conta está noutro servidor non poderás acceder desde aquí.
@@ -1138,9 +1110,7 @@ gl:
       title: Imos crear a túa conta en %{domain}.
     status:
       account_status: Estado da conta
-      confirming: Agardando a confirmación do correo enviado.
       functional: A túa conta está completamente operativa.
-      pending: A túa solicitude está pendente de revisión. Poderíanos levar algún tempo. Recibirás un correo se a solicitude está aprobada.
       redirecting_to: A túa conta está inactiva porque está redirixida a %{acct}.
       self_destruct: Como %{domain} vai fechar, tes acceso restrinxido á túa conta.
       view_strikes: Ver avisos anteriores respecto da túa conta
@@ -1183,9 +1153,6 @@ gl:
       before: 'Antes de continuar, por favor le estas notas con atención:'
       caches: O contido almacenado noutros servidores podería persistir
       data_removal: As túas publicacións e outros datos serán permanentemente borrados
-      email_change_html: Podes <a href="%{path}">cambiar o enderezo de correo</a> sen eliminar a conta
-      email_contact_html: Se non o recibes, podes escribir a <a href="mailto:%{email}">%{email}</a> pedindo axuda
-      email_reconfirmation_html: Se non recibes o correo de confirmación, podes <a href="%{path}">solicitalo de novo</a>
       irreversible: Non poderás restaurar ou reactivar a conta
       more_details_html: Para máis detalles, mira a <a href="%{terms_path}">política de privacidade</a>.
       username_available: O nome de usuaria estará dispoñible novamente
@@ -1418,7 +1385,6 @@ gl:
     authentication_methods:
       otp: app para autenticación con dous factores
       password: contrasinal
-      sign_in_token: código de seguridade por email
       webauthn: chaves de seguridade
     description_html: Se ves actividade que non recoñeces, considera cambiar o contrasinal e activar o segundo factor de autenticación.
     empty: Non hai historial de autenticación
@@ -1429,16 +1395,6 @@ gl:
     unsubscribe:
       action: Si, retirar subscrición
       complete: Subscrición anulada
-      confirmation_html: Tes a certeza de querer retirar a subscrición a Mastodon en %{domain} para recibir %{type} no teu correo electrónico en %{email}? Poderás volver a subscribirte desde os <a href="%{settings_path}">axustes de notificacións por correo</a>.
-      emails:
-        notification_emails:
-          favourite: notificacións de favorecidas
-          follow: notificacións de seguimentos
-          follow_request: notificacións de solicitudes de seguimento
-          mention: notificacións de mencións
-          reblog: notificacións de promocións
-      resubscribe_html: Se por un erro eliminaches a subscrición, podes volver a subscribirte desde os <a href="%{settings_path}">axustes de notificacións por correo electrónico</a>.
-      success_html: Non vas recibir %{type} de Mastodon en %{domain} no teu enderezo %{email}.
       title: Anular subscrición
   media_attachments:
     validations:
@@ -1519,8 +1475,6 @@ gl:
     update:
       subject: "%{name} editou unha publicación"
   notifications:
-    administration_emails: Notificacións de Admin por correo electrónico
-    email_events: Eventos para os correos de notificación
     email_events_hint: 'Escolle os eventos sobre os que queres recibir notificacións:'
   number:
     human:
@@ -1679,7 +1633,6 @@ gl:
     import: Importar
     import_and_export: Importar e exportar
     migrate: Migrar conta
-    notifications: Notificacións por correo
     preferences: Preferencias
     profile: Perfil
     relationships: Seguindo e seguidoras
@@ -1926,7 +1879,6 @@ gl:
     invalid_otp_token: O código do segundo factor non é válido
     otp_lost_help_html: Se perdes o acceso a ambos, podes contactar con %{email}
     rate_limited: Demasiados intentos de autenticación, inténtao máis tarde.
-    seamless_external_login: Accedeches a través dun servizo externo, polo que os axustes de contrasinal e email non están dispoñibles.
     signed_in_as: 'Rexistrada como:'
   verification:
     extra_instructions_html: <strong>Truco:</strong> A ligazón pode estar agochada na túa páxina web. A parte importante é <code>rel="me"</code> que impide a suplantación en sitios web con contido creado polas usuarias. Incluso podes usar a etiqueta <code>link</code> na cabeceira da páxina en lugar de <code>a</code>, pero o HTML debe ser accesible sen precisar usar JavaScript.
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 8e09bed939cfd4..85632c7c53cd42 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -35,7 +35,6 @@ he:
       created_msg: הודעת מנחה נוצרה בהצלחה!
       destroyed_msg: הודעת מנחה נמחקה בהצלחה!
     accounts:
-      add_email_domain_block: חסמו לגמרי את שם המתחם (דומיין) של הדוא"ל
       approve: אשר
       approved_msg: בקשת %{username} להירשם אושרה בהצלחה
       are_you_sure: בטוח?
@@ -62,7 +61,6 @@ he:
       demote: הורדה בדרגה
       destroyed_msg: הנתונים של %{username} נכנסו לתור המחיקה וצפויים להימחק באופן מיידי
       disable: הקפאה
-      disable_sign_in_token_auth: ביטול הזדהות באמצעות אסימון דוא״ל
       disable_two_factor_authentication: ביטול הזדהות דו־שלבית
       disabled: מוקפא
       display_name: שם תצוגה
@@ -71,7 +69,6 @@ he:
       email: דוא״ל
       email_status: מצב דוא״ל
       enable: ביטול הקפאה
-      enable_sign_in_token_auth: הפעלת אסימון הזדהות בדוא״ל
       enabled: מופעל
       enabled_msg: ביטול השעית החשבון של %{username} בוצע בהצלחה
       followers: עוקבים
@@ -138,7 +135,6 @@ he:
       resubscribe: להרשם מחדש
       role: תפקיד
       search: חיפוש
-      search_same_email_domain: משתמשים אחרים מאותו דומיין דוא"ל
       search_same_ip: משתמשים אחרים מאותה כתובת IP
       security: אבטחה
       security_measures:
@@ -179,26 +175,21 @@ he:
         approve_appeal: אישור ערעור
         approve_user: אישור משתמש
         assigned_to_self_report: הקצאת דו"ח
-        change_email_user: שינוי כתובת דוא"ל למשתמש
         change_role_user: שינוי תפקיד למשתמש
         confirm_user: אשר משתמש
         create_account_warning: יצירת אזהרה
         create_announcement: יצירת הכרזה
-        create_canonical_email_block: יצירת חסימת דואל
         create_custom_emoji: יצירת אמוג'י מיוחד
         create_domain_allow: יצירת דומיין מותר
         create_domain_block: יצירת דומיין חסום
-        create_email_domain_block: יצירת חסימת דומיין דוא"ל
         create_ip_block: יצירת כלל IP
         create_unavailable_domain: יצירת דומיין בלתי זמין
         create_user_role: יצירת תפקיד
         demote_user: הורדת משתמש בדרגה
         destroy_announcement: מחיקת הכרזה
-        destroy_canonical_email_block: מחיקת חסימת דואל
         destroy_custom_emoji: מחיקת אמוג'י יחודי
         destroy_domain_allow: מחיקת דומיין מותר
         destroy_domain_block: מחיקת דומיין חסום
-        destroy_email_domain_block: מחיקת חסימת דומיין דוא"ל
         destroy_instance: טיהור דומיין
         destroy_ip_block: מחיקת כלל IP
         destroy_status: מחיקת הודעה
@@ -206,10 +197,8 @@ he:
         destroy_user_role: מחיקת תפקיד
         disable_2fa_user: השעיית זיהוי דו-גורמי
         disable_custom_emoji: השעיית אמוג'י מיוחד
-        disable_sign_in_token_auth_user: השעיית אסימון הזדהות בדוא"ל של משתמש
         disable_user: השעיית משתמש
         enable_custom_emoji: הפעלת אמוג'י מיוחד
-        enable_sign_in_token_auth_user: הפעלת אסימון הזדהות בדוא"ל של משתמש
         enable_user: אפשור משתמש
         memorialize_account: הנצחת חשבון
         promote_user: קידום משתמש
@@ -239,26 +228,20 @@ he:
         approve_appeal_html: "%{name} אישר/ה ערעור על החלטת מנהלי הקהילה מ-%{target}"
         approve_user_html: "%{name} אישר/ה הרשמה מ-%{target}"
         assigned_to_self_report_html: '%{name} הקצה/תה דו"ח %{target} לעצמם'
-        change_email_user_html: '%{name} שינה/תה את כתובת הדוא"ל של המשתמש %{target}'
         change_role_user_html: "%{name} שינה את התפקיד של %{target}"
-        confirm_user_html: '%{name} אישר/ה את כותבת הדו"אל של המשתמש %{target}'
         create_account_warning_html: "%{name} שלח/ה אזהרה ל %{target}"
         create_announcement_html: "%{name} יצר/ה הכרזה חדשה %{target}"
-        create_canonical_email_block_html: "%{name} חסם/ה את הדואל %{target}"
         create_custom_emoji_html: "%{name} העלו אמוג'י חדש %{target}"
         create_domain_allow_html: "%{name} אישר/ה פדרציה עם הדומיין %{target}"
         create_domain_block_html: "%{name} חסם/ה את הדומיין %{target}"
-        create_email_domain_block_html: '%{name} חסם/ה את דומיין הדוא"ל %{target}'
         create_ip_block_html: "%{name} יצר/ה כלל עבור IP %{target}"
         create_unavailable_domain_html: "%{name} הפסיק/ה משלוח לדומיין %{target}"
         create_user_role_html: "%{name} יצר את התפקיד של %{target}"
         demote_user_html: "%{name} הוריד/ה בדרגה את המשתמש %{target}"
         destroy_announcement_html: "%{name} מחק/ה את ההכרזה %{target}"
-        destroy_canonical_email_block_html: "%{name} הסיר/ה חסימה מדואל %{target}"
         destroy_custom_emoji_html: "%{name} מחק אמוג'י של %{target}"
         destroy_domain_allow_html: "%{name} לא התיר/ה פדרציה עם הדומיין %{target}"
         destroy_domain_block_html: "%{name} הסיר/ה חסימה מהדומיין %{target}"
-        destroy_email_domain_block_html: '%{name} הסיר/ה חסימה מדומיין הדוא"ל %{target}'
         destroy_instance_html: "%{name} טיהר/ה את הדומיין %{target}"
         destroy_ip_block_html: "%{name} מחק/ה את הכלל עבור IP %{target}"
         destroy_status_html: ההודעה של %{target} הוסרה ע"י %{name}
@@ -266,10 +249,8 @@ he:
         destroy_user_role_html: "%{name} ביטל את התפקיד של %{target}"
         disable_2fa_user_html: "%{name} ביטל/ה את הדרישה לאימות דו-גורמי למשתמש %{target}"
         disable_custom_emoji_html: "%{name} השבית/ה את האמוג'י %{target}"
-        disable_sign_in_token_auth_user_html: '%{name} השבית/ה את האימות בעזרת אסימון דוא"ל עבור %{target}'
         disable_user_html: "%{name} חסם/ה כניסה מהמשתמש/ת %{target}"
         enable_custom_emoji_html: "%{name} אפשר/ה את האמוג'י %{target}"
-        enable_sign_in_token_auth_user_html: '%{name} אפשר/ה אימות בעזרת אסימון דוא"ל עבור %{target}'
         enable_user_html: "%{name} אפשר/ה כניסה עבור המשתמש %{target}"
         memorialize_account_html: "%{name} הפך/ה את חשבונו של %{target} לדף הנצחה"
         promote_user_html: "%{name} העלה בדרגה את המשתמש %{target}"
@@ -277,7 +258,6 @@ he:
         reject_user_html: "%{name} דחו הרשמה מ-%{target}"
         remove_avatar_user_html: "%{name} הסירו את תמונת הפרופיל של %{target}"
         reopen_report_html: '%{name} פתח מחדש דו"ח %{target}'
-        resend_user_html: "%{name} הפעיל.ה שליחה מחדש של דואל אימות עבור %{target}"
         reset_password_user_html: הסיסמה עבור המשתמש %{target} התאפסה על־ידי %{name}
         resolve_report_html: '%{name} פתר/ה דו"ח %{target}'
         sensitive_account_html: "%{name} סימן/ה את המדיה של %{target} כרגיש"
@@ -448,7 +428,6 @@ he:
         one: "%{count} נסיון במשך השבוע שעבר"
         other: "%{count} נסיונות הרשמה במשך השבוע שעבר"
         two: "%{count} נסיונות הרשמה במשך השבוע שעבר"
-      created_msg: כתובת מייל נחסמה בהצלחה
       delete: מחיקה
       dns:
         types:
@@ -457,12 +436,8 @@ he:
       new:
         create: הוספת דומיין
         resolve: פתור דומיין
-        title: חסימת דומיין דוא"ל
-      no_email_domain_block_selected: לא בוצעו שינויים לחסימת דומייני דוא"ל שכן לא נבחרו דומיינים
       not_permitted: נאסר
-      resolved_dns_records_hint_html: שם הדומיין מוביל לדומייניי ה-MX הבאים, שהם בסופו של דבר אחראיים לקבלת דוא"ל. חסימת דומיין MX תוביל לחסימת הרשמות מכל כתובת דוא"ל שעושה שימוש בדומיין MX זה, אפילו אם הדומיין הגלוי שונה. <strong>יש להמנע מלחסום ספקי דוא"ל מובילים.</strong>
       resolved_through_html: נמצא דרך %{domain}
-      title: דומייניי דוא"ל חסומים
     export_domain_allows:
       new:
         title: יבוא רשימת שרתים מאושרים
@@ -624,7 +599,6 @@ he:
         resolve_description_html: אף פעולה לא תבוצע נגד החשבון עליו דווח, לא תירשם עבירה, והדיווח ייסגר.
         silence_description_html: הפרופיל יהיה גלוי אך ורק לאלה שכבר עוקבים אחריו או לאלה שיחפשו אותו ידנית, מה שיגביל מאד את תפוצתו. ניתן תמיד להחזיר את המצב לקדמותו. פעולה זו תסגור את כל הדיווחים נגד הפרופיל.
         suspend_description_html: חשבון זה על כל תכניו יחסמו וברבות הימים ימחקו, כל פעילות מולו לא תתאפשר. הפעולה ניתנת לביטול תוך 30 ימים, והיא תסגור כל דיווח התלוי ועומד נגד החשבון.
-      actions_description_html: בחר/י איזו פעולה לבצע על מנת לפתור את הדו"ח. אם תופעל פעולת ענישה כנגד החשבון המדווח, הודעת דוא"ל תשלח אליהם, אלא אם נבחרה קטגוריית ה<strong>ספאם</strong>.
       actions_description_remote_html: בחרו איזו פעולה לבצע כדי לפתור את הדיווח שהוגש. פעולה זו תשפיע רק על התקשורת מול השרת <strong>שלך</strong> עם החשבון המרוחק ותוכנו.
       add_to_report: הוספת פרטים לדיווח
       already_suspended_badges:
@@ -689,7 +663,6 @@ he:
         delete_data_html: למחוק את הפרופיל והתוכן של <strong>@%{acct}</strong> בעוד 30 יום אלא אם תוסר ההגבלה עליהם לפני כן
         preview_preamble_html: 'שליחת אזהרה אל <strong>@%{acct}</strong> בזו הלשון:'
         record_strike_html: ציין נקודה שחורה נגד <strong>@%{acct}</strong> כדי לסייע בשיפוטו בדיווחים עתידיים על חריגות
-        send_email_html: שליחת דואל אזהרה אל <strong>@%{acct}</strong>
         warning_placeholder: צידוקים אפשריים נוספים לפעולה המשמעתית.
       target_origin: מקור החשבון המדווח
       title: דיווחים
@@ -733,7 +706,6 @@ he:
         manage_appeals: ניהול ערעורים
         manage_appeals_description: מאפשר למשתמשים לסקור ערעורים כנגד פעולות מודרציה
         manage_blocks: ניהול חסימות
-        manage_blocks_description: מאפשר למשתמשים לחסום ספקי דוא"ל וכתובות IP
         manage_custom_emojis: ניהול סמלונים בהתאמה אישית
         manage_custom_emojis_description: מאפשר למשתמשים לנהל סמלונים בהתאמה אישית של השרת
         manage_federation: ניהול פדרציה
@@ -751,7 +723,6 @@ he:
         manage_taxonomies: ניהול טקסונומיות
         manage_taxonomies_description: מאפשר למשתמשים לסקור תוכן אופנתי (טרנדי) ולעדכן אפשרויות של תגיות.
         manage_user_access: ניהול גישת משתמשים
-        manage_user_access_description: מאפשר למשתמשים לבטל אימות דו-שלבי של משתמשים אחרים, לשנות את כתובות הדוא"ל שלהם, ולאפס את סיסמתם
         manage_users: ניהול משתמשים
         manage_users_description: מאפשר למשתמשים לצפות בפרטים של משתמשים אחרים ולבצע פעולות מודרציה לפיהם
         manage_webhooks: ניהול Webhooks
@@ -826,7 +797,6 @@ he:
       destroyed_msg: העלאת אתר נמחקה בהצלחה!
     software_updates:
       critical_update: חשוב -- יש לעדכן במהירות
-      description: מומלץ לשמור את התקנת המסטודון שלך עדכנית כדי להרוויח מהיכולות והתיקונים האחרונים. למעלה מכך, לעיתים קריטי לעדכן את מסטודון בהקדם כדי להמנע מפרצות אבטחה. מסיבות אלו, השרת יבדוק כל 30 דקות, ויודיע לך לפי העדפות הדואל שלך.
       documentation_link: למידע נוסף
       release_notes: פרטי הגרסה
       title: עדכונים זמינים
@@ -1000,7 +970,6 @@ he:
           one: הוצגה על ידי משתמש בודד במשך השבוע שעבר
           other: הוצגה על ידי %{count} משתמשים במשך השבוע שעבר
           two: הוצגה על ידי %{count} משתמשים במשך השבוע שעבר
-      title: נושאים חמים
       trending: נושאים חמים
     warning_presets:
       add_new: הוספת חדש
@@ -1087,9 +1056,7 @@ he:
       guide_link_text: כולם יכולים לתרום.
     sensitive_content: תוכן רגיש
   application_mailer:
-    notification_preferences: שינוי העדפות דוא"ל
     salutation: "%{name},"
-    settings: 'שינוי הגדרות דוא"ל: %{link}'
     unsubscribe: בטל מנוי
     view: 'תצוגה:'
     view_profile: צפיה בפרופיל
@@ -1109,7 +1076,6 @@ he:
       hint_html: עוד דבר אחד, עלינו לאשרר שאת(ה) אנושיים (לצורך סינון ספאם). נא לפתור את הקאפצ'ה להלן וללחוץ "המשך".
       title: בדיקות אבטחה
     confirmations:
-      awaiting_review: כתובת הדואל שלך אושרה! צוות %{domain} עכשיו יבדוק את הרשמתך. תשלח אליך הודעת דואל אם הצוות יאשר את החשבון!
       awaiting_review_title: הרשמתך עוברת בדיקה
       clicking_this_link: לחיצה על קישור זה
       login_link: כניסה
@@ -1117,7 +1083,6 @@ he:
       redirect_to_app_html: כאן אמורה היתה להיות הפניה אוטמטית ליישומון <strong>%{app_name}</strong>. אם זה לא קרה, ניתן לנסות שוב על ידי %{clicking_this_link} או חזרה ידנית אל היישומון.
       registration_complete: הרשמתך לשרת %{domain} הושלמה כעת!
       welcome_title: ברוך/ה הבא/ה, %{name}!
-      wrong_email_hint: אם כתובת הדואל הזו איננה נכונה, ניתן לשנות אותה בעמוד ההגדרות.
     delete_account: מחיקת חשבון
     delete_account_html: אם ברצונך למחוק את החשבון, ניתן <a href="%{path}">להמשיך כאן</a>. תתבקש/י לספק אישור נוסף.
     description:
@@ -1138,7 +1103,6 @@ he:
     or_log_in_with: או התחבר באמצעות
     privacy_policy_agreement_html: קראתי והסכמתי ל<a href="%{privacy_policy_path}" target="_blank">מדיניות הפרטיות</a>
     progress:
-      confirm: אימות כתובת הדואל
       details: הפרטים שלך
       review: הבדיקה שלנו
       rules: הסכמה לתקנות
@@ -1160,10 +1124,8 @@ he:
     security: אבטחה
     set_new_password: סיסמה חדשה
     setup:
-      email_below_hint_html: אנא בדקו בתיקיית הספאם, או בקשו קוד חדש. ניתן לתקן את הכתובת אם נפלה תקלדה.
       email_settings_hint_html: לחצו על הקישור שנשלח כדי לאשר את הכתובת %{email}. אנו ממתינים פה.
       link_not_received: לא קיבלת קישור?
-      new_confirmation_instructions_sent: אתם עומדים לקבל הודעת דואל חדשה עם קיש/ור אימות בדקות הקרובות!
       title: בדוק/בדקי את תיבת הדואר הנכנס שלך
     sign_in:
       preamble_html: הכנס.י עם שם וסיסמה מאתר <strong>%{domain}</strong>. אם חשבונך מתארח בשרת אחר, לא ניתן להתחבר איתו פה.
@@ -1174,9 +1136,7 @@ he:
       title: הבה ניצור לך חשבון בשרת %{domain}.
     status:
       account_status: מצב חשבון
-      confirming: ממתין שדוא"ל האישור יושלם.
       functional: החשבון שלכם פעיל לגמרי.
-      pending: בקשתך ממתינה לאישור על ידי הצוות שלנו. זה עשוי לקחת זמן מה. דוא"ל יישלח אליך אם בקשתך התקבלה.
       redirecting_to: חשבונכם לא פעיל כעת מכיוון שמפנה ל%{acct}.
       self_destruct: מכיוון שהשרת %{domain} בתהליכי סגירה, תהיה לך גישה מוגבלת בלבד לחשבונך.
       view_strikes: צפיה בעברות קודמות שנרשמו נגד חשבונך
@@ -1219,9 +1179,6 @@ he:
       before: 'לפני שנמשיך, נא לקרוא בזהירות את ההערות הבאות:'
       caches: מידע שהוטמן על ידי שרתים אחרים עשוי להתמיד
       data_removal: הודעותיך וכל מידע אחר יוסרו לתמיד
-      email_change_html: ניתן <a href="%{path}">לשנות את כתובת הדוא"ל שלך</a> מבלי למחוק את החשבון
-      email_contact_html: אם הוא עדיין לא הגיע, ניתן לקבל עזרה על ידי משלוח דואל ל-<a href="mailto:%{email}">%{email}</a>
-      email_reconfirmation_html: אם לא מתקבל דוא"ל האישור, ניתן <a href="%{path}">לבקש אותו שוב</a>
       irreversible: לא ניתן יהיה לשחזר או להפעיל מחדש את חשבונך
       more_details_html: לפרטים נוספים, ראו את <a href="%{terms_path}">מדיניות הפרטיות</a>.
       username_available: שם המשתמש שלך שוב יהיה זמין
@@ -1470,7 +1427,6 @@ he:
     authentication_methods:
       otp: יישומון אימות דו-שלבי
       password: סיסמה
-      sign_in_token: קוד אימות בדוא"ל
       webauthn: מפתחות אבטחה
     description_html: אם את/ה רואה פעילות שאינך מזהה, אנא שנה/י את סיסמתך והפעל/י אימות דו-גורמי.
     empty: הסטוריית אימותים אינה זמינה
@@ -1481,16 +1437,6 @@ he:
     unsubscribe:
       action: כן, לבטל הרשמה
       complete: הפסקת הרשמה
-      confirmation_html: יש לאשר את ביטול ההרשמה להודעות %{type} ממסטודון בשרת %{domain} לכתובת הדואל %{email}. תמיד אפשר להרשם מחדש ב<a href="%{settings_path}">כיוונוני הודעות דואל</a>.
-      emails:
-        notification_emails:
-          favourite: הודעות דואל לגבי חיבובים
-          follow: הודעות דואל לגבי עוקבים חדשים
-          follow_request: הודעות דואל לגבי בקשות מעקב
-          mention: הודעות דואל לגבי איזכורים
-          reblog: הודעות דואל לגבי הידהודים
-      resubscribe_html: אם ביטול ההרשמה היה בטעות, ניתן להרשם מחדש מתוך <a href="%{settings_path}">מסך הגדרות ההרשמה</a> שלך.
-      success_html: לא יגיעו אליך יותר הודעות %{type} משרת מסטודון %{domain} לכתובת הדואל %{email}.
       title: הפסקת הרשמה
   media_attachments:
     validations:
@@ -1571,8 +1517,6 @@ he:
     update:
       subject: "%{name} ערכו הודעה"
   notifications:
-    administration_emails: התראות לדוא"ל חשבון מנהל
-    email_events: ארועים להתראות דוא"ל
     email_events_hint: 'בחר/י ארועים עבורים תרצה/י לקבל התראות:'
   number:
     human:
@@ -1731,7 +1675,6 @@ he:
     import: יבוא
     import_and_export: יבוא ויצוא
     migrate: הגירת חשבון
-    notifications: התראות בדואל
     preferences: העדפות
     profile: פרופיל
     relationships: נעקבים ועוקבים
@@ -1992,7 +1935,6 @@ he:
     invalid_otp_token: קוד דו-שלבי שגוי
     otp_lost_help_html: אם איבדת גישה לשניהם, ניתן ליצור קשר ב-%{email}
     rate_limited: יותר מדי ניסיונות אימות, נסו שוב מאוחר יותר.
-    seamless_external_login: את.ה מחובר דרך שירות חיצוני, לכן אפשרויות הסיסמא והדוא"ל לא מאופשרות.
     signed_in_as: 'מחובר בתור:'
   verification:
     extra_instructions_html: <strong>טיפ:</strong> הלינק באתר שלך יכול להיות מוסתר. החלק החשוב הוא <code>rel="me"</code> שמונע התחזות על אתרים עם תוכן משתמשים. ניתן גם ליצור תגית <code>link</code> בכותרת העמוד במקום קישור <code>a</code> אבל קוד ה־HTML חייב להופיע שם ללא הרצה של ג'אווהסקריפט.
diff --git a/config/locales/hi.yml b/config/locales/hi.yml
index d6a8e3cc355bcb..60b500c7ec318b 100644
--- a/config/locales/hi.yml
+++ b/config/locales/hi.yml
@@ -28,7 +28,6 @@ hi:
         all: सभी
         silenced: सीमित
       search: खोजें
-      search_same_email_domain: यहि इ-मेइल डोमैन वाले अन्य सदस्य
       silence: सीमा
       silenced: सीमित
       title: खाते
diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index 4ea818b301024e..6a67ea0129f709 100644
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -85,7 +85,6 @@ hr:
       body: Mastodon prevode dobrovoljci.
       guide_link_text: Svi mogu doprinjeti.
   application_mailer:
-    settings: 'Promijeni postavke e-pošte: %{link}'
     view: 'Vidi:'
   auth:
     forgot_password: Zaboravljena lozinka?
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index e4f5c1b847b07f..95441d8a3399c1 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -31,7 +31,6 @@ hu:
       created_msg: A moderációs megjegyzés sikeresen létrehozva!
       destroyed_msg: A moderációs megjegyzés sikeresen törölve!
     accounts:
-      add_email_domain_block: E-mail-domain tiltólistára vétele
       approve: Jóváhagyás
       approved_msg: "%{username} regisztrációja sikeresen elfogadva"
       are_you_sure: Biztos vagy benne?
@@ -58,7 +57,6 @@ hu:
       demote: Lefokozás
       destroyed_msg: A %{username} fiók adatai bekerültek a végleges törlése váró sorba
       disable: Befagyasztás
-      disable_sign_in_token_auth: Tokenes e-mail-hitelesítés letiltása
       disable_two_factor_authentication: Kétlépcsős hitelesítés kikapcsolása
       disabled: Befagyasztva
       display_name: Megjelenítendő név
@@ -67,7 +65,6 @@ hu:
       email: E-mail-cím
       email_status: E-mail állapot
       enable: Kiolvasztás
-      enable_sign_in_token_auth: Tokenes e-mail-hitelesítés engedélyezése
       enabled: Bekapcsolva
       enabled_msg: "%{username} fiókja befagyasztása sikeresen visszavonva"
       followers: Követő
@@ -132,7 +129,6 @@ hu:
       resubscribe: Feliratkozás ismét
       role: Szerep
       search: Keresés
-      search_same_email_domain: Felhasználók ugyanezzel az email domainnel
       search_same_ip: Más felhasználók ugyanezzel az IP-vel
       security: Biztonság
       security_measures:
@@ -173,26 +169,21 @@ hu:
         approve_appeal: Fellebbezés jóváhagyása
         approve_user: Felhasználó Jóváhagyása
         assigned_to_self_report: Jelentés hozzárendelése
-        change_email_user: Felhasználó e-mail címének módosítása
         change_role_user: Felhasználó szerepkörének módosítása
         confirm_user: Felhasználó megerősítése
         create_account_warning: Figyelmeztetés létrehozása
         create_announcement: Közlemény létrehozása
-        create_canonical_email_block: E-mail tiltás létrehozása
         create_custom_emoji: Egyéni emodzsi létrehozása
         create_domain_allow: Domain engedélyezés létrehozása
         create_domain_block: Domain tiltás létrehozása
-        create_email_domain_block: E-mail domain tiltás létrehozása
         create_ip_block: IP szabály létrehozása
         create_unavailable_domain: Elérhetetlen domain létrehozása
         create_user_role: Szerepkör létrehozása
         demote_user: Felhasználó lefokozása
         destroy_announcement: Közlemény törlése
-        destroy_canonical_email_block: E-mail tiltás törlése
         destroy_custom_emoji: Egyéni emodzsi törlése
         destroy_domain_allow: Domain engedélyezés törlése
         destroy_domain_block: Domain tiltás törlése
-        destroy_email_domain_block: E-mail domain tiltás törlése
         destroy_instance: Domain végleges törlése
         destroy_ip_block: IP szabály törlése
         destroy_status: Bejegyzés törlése
@@ -200,10 +191,8 @@ hu:
         destroy_user_role: Szerepkör eltávolítása
         disable_2fa_user: Kétlépcsős hitelesítés letiltása
         disable_custom_emoji: Egyéni emodzsi letiltása
-        disable_sign_in_token_auth_user: A felhasználó tokenes e-mail hitelesítésének letiltása
         disable_user: Felhasználói letiltása
         enable_custom_emoji: Egyéni emodzsi engedélyezése
-        enable_sign_in_token_auth_user: A felhasználó tokenes e-mail hitelesítésének engedélyezése
         enable_user: Felhasználó engedélyezése
         memorialize_account: Fiók emlékké nyilvánítása
         promote_user: Felhasználó előléptetése
@@ -233,26 +222,20 @@ hu:
         approve_appeal_html: "%{name} jóváhagyott egy fellebbezést %{target} moderátori döntéséről"
         approve_user_html: "%{name} jóváhagyta %{target} regisztrációját"
         assigned_to_self_report_html: "%{name} a %{target} bejelentést magához rendelte"
-        change_email_user_html: "%{name} megváltoztatta %{target} felhasználó e-mail címét"
         change_role_user_html: "%{name} módosította %{target} szerepkörét"
-        confirm_user_html: "%{name} megerősítette %{target} e-mail-címét"
         create_account_warning_html: "%{name} figyelmeztetést küldött %{target} számára"
         create_announcement_html: "%{name} új közleményt hozott létre: %{target}"
-        create_canonical_email_block_html: "%{name} letiltotta a(z) %{target} hashű e-mailt"
         create_custom_emoji_html: "%{name} új emodzsit töltött fel: %{target}"
         create_domain_allow_html: "%{name} engedélyezte a föderációt %{target} domainnel"
         create_domain_block_html: "%{name} letiltotta a %{target} domaint"
-        create_email_domain_block_html: "%{name} letiltotta a %{target} e-mail domaint"
         create_ip_block_html: "%{name} létrehozta a(z) %{target} IP-címre vonatkozó szabályt"
         create_unavailable_domain_html: "%{name} leállította a kézbesítést a %{target} domainbe"
         create_user_role_html: "%{name} létrehozta a(z) %{target} szerepkört"
         demote_user_html: "%{name} lefokozta %{target} felhasználót"
         destroy_announcement_html: "%{name} törölte a %{target} közleményt"
-        destroy_canonical_email_block_html: "%{name} engedélyezte a(z) %{target} hashű e-mailt"
         destroy_custom_emoji_html: "%{name} törölte a(z) %{target} emodzsit"
         destroy_domain_allow_html: "%{name} letiltotta a föderációt a %{target} domainnel"
         destroy_domain_block_html: "%{name} engedélyezte a %{target} domaint"
-        destroy_email_domain_block_html: "%{name} engedélyezte a %{target} e-mail domaint"
         destroy_instance_html: "%{name} véglegesen törölte a(z) %{target} domaint"
         destroy_ip_block_html: "%{name} törölte a(z) %{target} IP-címre vonatkozó szabályt"
         destroy_status_html: "%{name} eltávolította %{target} felhasználó bejegyzését"
@@ -260,10 +243,8 @@ hu:
         destroy_user_role_html: "%{name} törölte a(z) %{target} szerepkört"
         disable_2fa_user_html: "%{name} kikapcsolta a kétlépcsős hitelesítést %{target} felhasználó fiókján"
         disable_custom_emoji_html: "%{name} letiltotta az emodzsit: %{target}"
-        disable_sign_in_token_auth_user_html: "%{name} letiltotta a tokenes e-mail hitelesítést %{target} felhasználóra"
         disable_user_html: "%{name} letiltotta %{target} felhasználó bejelentkezését"
         enable_custom_emoji_html: "%{name} engedélyezte az emodzsit: %{target}"
-        enable_sign_in_token_auth_user_html: "%{name} engedélyezte a tokenes e-mail hitelesítést %{target} felhasználóra"
         enable_user_html: "%{name} engedélyezte %{target} felhasználó bejelentkezését"
         memorialize_account_html: "%{name} emléket állított %{target} felhasználónak"
         promote_user_html: "%{name} előléptette %{target} felhasználót"
@@ -271,7 +252,6 @@ hu:
         reject_user_html: "%{name} elutasította %{target} regisztrációját"
         remove_avatar_user_html: "%{name} törölte %{target} profilképét"
         reopen_report_html: "%{name} újranyitotta a %{target} bejelentést"
-        resend_user_html: "%{name} újraküldte %{target} megerősítő e-mailjét"
         reset_password_user_html: "%{name} visszaállította %{target} felhasználó jelszavát"
         resolve_report_html: "%{name} megoldotta a %{target} bejelentést"
         sensitive_account_html: "%{name} kényesnek jelölte %{target} médiatartalmát"
@@ -432,7 +412,6 @@ hu:
       attempts_over_week:
         one: "%{count} próbálkozás a múlt héten"
         other: "%{count} próbálkozás feliratkozásra a múlt héten"
-      created_msg: E-mail domain sikeresen letiltva
       delete: Törlés
       dns:
         types:
@@ -441,12 +420,8 @@ hu:
       new:
         create: Domain hozzáadása
         resolve: Domain feloldása
-        title: Új e-mail domain tiltása
-      no_email_domain_block_selected: Nem változott meg egy domain tiltás sem, mert semmi sem volt kiválasztva
       not_permitted: Nem engedélyezett
-      resolved_dns_records_hint_html: A domain név a következő MX domain-ekre oldódik fel, melyek valójában fogadják az e-mailt. Az MX domain letiltása minden olyan feliratkozást tiltani fog, melyben az e-mailcím ugyanazt az MX domaint használja, még akkor is, ha a látható domain név más. <strong>Légy óvatos, hogy ne tilts le nagy e-mail szolgáltatókat.</strong>
       resolved_through_html: Feloldva %{domain}-n keresztül
-      title: Tiltott e-mail domainek
     export_domain_allows:
       new:
         title: Domain engedélyezések importálása
@@ -600,7 +575,6 @@ hu:
         resolve_description_html: Nem csinálunk semmit a bejelentett fiókkal, nem jegyzünk fel vétséget, és bezárjuk a bejelentést.
         silence_description_html: A profil csak azok számára lesz látható, akik már követik, vagy kézzel rákeresnek, jelentősen korlátozva annak elérését. Ez a művelet bármikor visszafordítható. A fiókkal szemben indított minden bejelentést lezárunk.
         suspend_description_html: A fiók és minden tartalma elérhetetlenné válik és végül törlésre kerül. A fiókkal kapcsolatbalépni lehetetlen lesz. Ez a művelet 30 napig visszafordítható. A fiók ellen indított minden bejelentést lezárunk.
-      actions_description_html: Döntsd el, mit csináljunk, hogy megoldjuk ezt a bejelentést. Ha valamilyen büntető intézkedést hozol a bejelentett fiók ellen, küldünk neki egy figyelmeztetést e-mail-ben, kivéve ha a <strong>Spam</strong> kategóriát választod.
       actions_description_remote_html: Döntsd el, mit tegyünk a bejelentés lezárásának érdekében. Ez csak azt befolyásolja, hogy a <strong>saját</strong> kiszolgálód hogyan kommunikál ezzel a távoli fiókkal és hogyan kezeli annak tartalmait.
       add_to_report: Továbbiak hozzáadása a bejelentéshez
       already_suspended_badges:
@@ -665,7 +639,6 @@ hu:
         delete_data_html: "<strong>@%{acct}</strong> profiljának és tartalmainak törlése 30 nap múlva, hacsak addig nem oldják fel a felfüggesztést"
         preview_preamble_html: "<strong>@%{acct}</strong> a következő tartalommal fog figyelmeztetést kapni:"
         record_strike_html: Vétség felrovása a <strong>@%{acct}</strong> fiók ellen, hogy segítsük az eszkalációt a fiók jövőbeni kihágásai esetén
-        send_email_html: Figyelmeztető email küldése <strong>@%{acct}</strong> fiók részére
         warning_placeholder: Opcionális kiegészítő indoklás a moderációs művelethez.
       target_origin: A jelentett fiók eredete
       title: Bejelentések
@@ -705,7 +678,6 @@ hu:
         manage_appeals: Fellebbezések kezelése
         manage_appeals_description: Lehetővé teszi, hogy a felhasználó átnézze a moderációval kapcsolatos fellebbezéseket
         manage_blocks: Letiltások kezelése
-        manage_blocks_description: Lehetővé teszi, hogy a felhasználó letiltson email szolgáltatókat és IP címeket
         manage_custom_emojis: Egyedi emodzsik kezelése
         manage_custom_emojis_description: Lehetővé teszi a felhasználó számára, hogy a kiszolgáló egyéni emodzsiait kezelje
         manage_federation: Föderáció kezelése
@@ -723,7 +695,6 @@ hu:
         manage_taxonomies: Taxonómiák kezelése
         manage_taxonomies_description: Lehetővé teszi, hogy a felhasználó átnézze a felkapott tartalmakat és frissítse a hashtagek beállításait
         manage_user_access: Felhasználói hozzáférések kezelése
-        manage_user_access_description: Lehetővé teszi, hogy a felhasználó letiltsa mások kétlépcsős hitelesítését, megváltoztassa az e-mail-címüket, és alaphelyzetbe állítsa a jelszavukat
         manage_users: Felhasználók kezelése
         manage_users_description: Lehetővé teszi, hogy a felhasználó megtekintse mások részletes adatait és moderálja őket
         manage_webhooks: Webhookok kezelése
@@ -798,7 +769,6 @@ hu:
       destroyed_msg: Sikeresen töröltük a site feltöltését!
     software_updates:
       critical_update: Kritikus - frissíts gyorsan
-      description: Javasolt, hogy a Mastodon telepítésed naprakész legyen, hogy kihasználhasd a legújabb javításokat és funkciókat. Ezenkívül néha különösen fontos a Mastodon időben történő frissítése a biztonsági problémák elkerülése érdekében. Ezen okok miatt a Mastodon 30 percenként ellenőrzi a frissítéseket és az email értesítési preferenciáknak megfelelően értesítést küld.
       documentation_link: További információ
       release_notes: Kiadási megjegyzések
       title: Elérhető frissítések
@@ -907,10 +877,16 @@ hu:
     trends:
       allow: Engedélyezés
       approved: Jóváhagyott
+      confirm_allow: Biztos, hogy engedélyezni szeretnéd a kiválasztott címkéket?
+      confirm_disallow: Biztos, hogy tiltani szeretnéd a kiválasztott címkéket?
       disallow: Letiltás
       links:
         allow: Hivatkozás engedélyezése
         allow_provider: Közzétevő engedélyezése
+        confirm_allow: Biztos, hogy engedélyezni szeretnéd a kiválasztott hivatkozásokat?
+        confirm_allow_provider: Biztos, hogy engedélyezni szeretnéd a kiválasztott szolgáltatókat?
+        confirm_disallow: Biztos, hogy tiltani szeretnéd a kiválasztott hivatkozásokat?
+        confirm_disallow_provider: Biztos, hogy tiltani szeretnéd a kiválasztott szolgáltatókat?
         description_html: Ezek olyan hivatkozások, melyeket a kiszolgálód által látott fiókok mostanában sokat osztanak meg. Ez segíthet a felhasználóidnak rátalálni arra, hogy mi történik a világban. Egy hivatkozást sem jelenik meg nyilvánosan, amíg a közzétevőt jóvá nem hagytad. A hivatkozásokat külön is engedélyezheted vagy elutasíthatod.
         disallow: Hivatkozás letiltása
         disallow_provider: Közzétevő letiltása
@@ -934,6 +910,10 @@ hu:
       statuses:
         allow: Bejegyzés engedélyezése
         allow_account: Szerző engedélyezése
+        confirm_allow: Biztos, hogy engedélyezni szeretnéd a kiválasztott állapotokat?
+        confirm_allow_account: Biztos, hogy engedélyezni szeretnéd a kiválasztott fiókokat?
+        confirm_disallow: Biztos, hogy engedélyezni szeretnéd a kiválasztott állapotokat?
+        confirm_disallow_account: Biztos, hogy tiltani szeretnéd a kiválasztott fiókokat?
         description_html: Ezek olyan, a szervered által ismert bejegyzések, melyeket mostanság gyakran osztanak meg vagy jelölnek kedvencnek. Ez segíthet az új vagy visszatérő felhasználóidnak, hogy több követhető személyt találjanak. Egyetlen bejegyzés sem jelenik meg nyilvánosan, amíg ennek szerzőjét nem hagytad jóvá és ő nem járult hozzá, hogy őt másoknak ajánlják. Bejegyzéseket egyenként is engedélyezhetsz vagy visszautasíthatsz.
         disallow: Bejegyzés tiltása
         disallow_account: Szerző tiltása
@@ -966,7 +946,6 @@ hu:
         used_by_over_week:
           one: Egy ember használta a múlt héten
           other: "%{count} ember használta a múlt héten"
-      title: Trendek
       trending: Felkapott
     warning_presets:
       add_new: Új hozzáadása
@@ -1051,9 +1030,7 @@ hu:
       guide_link_text: Bárki közreműködhet.
     sensitive_content: Kényes tartalom
   application_mailer:
-    notification_preferences: E-mail beállítások módosítása
     salutation: "%{name}!"
-    settings: 'E-mail beállítások módosítása: %{link}'
     unsubscribe: Leiratkozás
     view: 'Megtekintés:'
     view_profile: Profil megtekintése
@@ -1073,7 +1050,6 @@ hu:
       hint_html: Még egy dolog! Meg kell győződnünk róla, hogy tényleg valós személy vagy (így távol tarthatjuk a spam-et). Oldd meg az alábbi CAPTCHA-t és kattints a "Folytatás"-ra.
       title: Biztonsági ellenőrzés
     confirmations:
-      awaiting_review: Az email címed megerősítésre került. %{domain} stábja jelenleg áttekinti a regisztrációdat. Ha jóváhagyásra került a fiókod, egy emailt küldenek majd!
       awaiting_review_title: A regisztrációd áttekintés alatt áll
       clicking_this_link: kattintás erre a hivatkozásra
       login_link: bejelentkezés
@@ -1081,7 +1057,6 @@ hu:
       redirect_to_app_html: Át kellett volna irányítsunk a <strong>%{app_name}</strong> alkalmazáshoz. Ha ez nem történt meg, próbálkozz a %{clicking_this_link} lehetőséggel vagy térj vissza manuálisan az alkalmazáshoz.
       registration_complete: A regisztrációd %{domain} domainen befejeződött!
       welcome_title: Üdvözlet, %{name}!
-      wrong_email_hint: Ha az e-mail-cím nem helyes, a fiókbeállításokban megváltoztathatod.
     delete_account: Felhasználói fiók törlése
     delete_account_html: Felhasználói fiókod törléséhez <a href="%{path}">kattints ide</a>. A rendszer újbóli megerősítést fog kérni.
     description:
@@ -1102,7 +1077,6 @@ hu:
     or_log_in_with: Vagy jelentkezz be ezzel
     privacy_policy_agreement_html: Elolvastam és egyetértek az <a href="%{privacy_policy_path}" target="_blank">adatvédemi nyilatkozattal</a>
     progress:
-      confirm: E-mail-cím megerősítése
       details: Saját adatok
       review: A felülvizsgálatunk
       rules: Szabályok elfogadása
@@ -1124,10 +1098,8 @@ hu:
     security: Biztonság
     set_new_password: Új jelszó beállítása
     setup:
-      email_below_hint_html: Nézd meg a levélszemét mappát, vagy kérj egy újat. Módosíthatod az e-mail-címet, ha az hibás.
       email_settings_hint_html: Kattints a hivatkozásra, melyet a(z) %{email} megerősítése céljából küldtünk. Addig várni fogunk.
       link_not_received: Nem kaptad meg a hivatkozást?
-      new_confirmation_instructions_sent: Néhány perc múlva új e-mailt fogsz kapni a megerősítési hivatkozással.
       title: Bejövő postaláda ellenőrzése
     sign_in:
       preamble_html: Jelentkezz be a <strong>%{domain}</strong> hitelesítéső adataiddal. Ha másik kiszolgálón található a fiókod, akkor itt nem fogsz tudni belépni.
@@ -1138,9 +1110,7 @@ hu:
       title: Állítsuk be a fiókod a %{domain} kiszolgálón.
     status:
       account_status: Fiók állapota
-      confirming: Várakozás az e-mailes visszaigazolásra.
       functional: A fiókod teljesen működőképes.
-      pending: A jelentkezésed engedélyezésre vár. Ez eltarthat egy ideig. Kapsz egy e-mailt, ha a kérelmedet jóváhagyták.
       redirecting_to: A fiókod inaktív, mert jelenleg ide %{acct} van átirányítva.
       self_destruct: Mivel a %{domain} bezár, csak korlátozott elérésed lesz a fiókodhoz.
       view_strikes: Fiókod ellen felrótt korábbi vétségek megtekintése
@@ -1183,9 +1153,6 @@ hu:
       before: 'Mielőtt továbbmész, kérlek olvasd el ezt alaposan:'
       caches: Más szerverek által cache-elt tartalmak még megmaradhatnak
       data_removal: Bejegyzéseid és minden más adatod véglegesen törlődni fog
-      email_change_html: <a href="%{path}">Megváltoztathatod az email címed</a> a fiókod törlése nélkül
-      email_contact_html: Ha még mindig nem érkezik meg, emailezhetsz ide <a href="mailto:%{email}">%{email}</a> segítségért
-      email_reconfirmation_html: Ha nem kaptad meg a megerősítő emailt, <a href="%{path}">itt újrakérheted</a>
       irreversible: Nem fogod tudni visszaállítani vagy újraaktiválni a fiókodat
       more_details_html: A részletekért nézd meg az <a href="%{terms_path}">adatvédelmi szabályzatot</a>.
       username_available: A fiókod ismét elérhetővé válik
@@ -1418,7 +1385,6 @@ hu:
     authentication_methods:
       otp: kétlépcsős azonosító alkalmazás
       password: jelszó
-      sign_in_token: e-mail biztonsági kód
       webauthn: biztonsági kulcsok
     description_html: Ha olyan aktivitást látsz, melyet nem ismersz fel, fontold meg, hogy megváltoztatod a jelszavad és engedélyezed a kétlépcsős hitelesítést.
     empty: Nem érhető el hitelesítési történet
@@ -1429,16 +1395,6 @@ hu:
     unsubscribe:
       action: Igen, leiratkozás
       complete: Leiratkozva
-      confirmation_html: 'Biztos, hogy leiratkozol arról, hogy %{type} típusú üzeneteket kapj a %{domain} Mastodon-kiszolgálótól erre a címedre: %{email}? Bármikor újra feliratkozhatsz az <a href="%{settings_path}">e-mail-értesítések beállításánál</a>.'
-      emails:
-        notification_emails:
-          favourite: kedvencnek jelölésről email értesítő
-          follow: követésről email értesítő
-          follow_request: követési kérelemről email értesítő
-          mention: megemlítésről email értesítő
-          reblog: megtolásról email értesítő
-      resubscribe_html: Ha tévedésből iratkoztál le, újra feliratkozhatsz az <a href="%{settings_path}">e-mail-értesítések beállításainál</a>.
-      success_html: 'Mostantól nem kapsz %{type} típusú üzeneket a(z) %{domain} Mastodon-kiszolgálón erre a címedre: %{email}.'
       title: Leiratkozás
   media_attachments:
     validations:
@@ -1519,8 +1475,6 @@ hu:
     update:
       subject: "%{name} szerkesztett egy bejegyzést"
   notifications:
-    administration_emails: Adminisztrátori e-mail-értesítések
-    email_events: Az e-mail-értesítések eseményei
     email_events_hint: 'Válaszd ki azokat az eseményeket, melyekről értesítést szeretnél:'
   number:
     human:
@@ -1679,7 +1633,6 @@ hu:
     import: Importálás
     import_and_export: Import és export
     migrate: Fiók átirányítása
-    notifications: E-mail-értesítések
     preferences: Beállítások
     profile: Profil
     relationships: Követések és követők
@@ -1926,7 +1879,6 @@ hu:
     invalid_otp_token: Érvénytelen ellenőrző kód
     otp_lost_help_html: Ha mindkettőt elvesztetted, kérhetsz segítséget itt %{email}
     rate_limited: Túl sok hiteleítési kísérlet történt. Próbáld újra később.
-    seamless_external_login: Külső szolgáltatáson keresztül jelentkeztél be, így a jelszó és e-mail beállítások nem elérhetőek.
     signed_in_as: Bejelentkezve mint
   verification:
     extra_instructions_html: <strong>Tipp:</strong> A hivatkozás a weboldaladon lehet láthatatlan. A fontos rész a <code>rel="me"</code>, mely megakadályozza, hogy mások a nevedben lépjenek fel olyan oldalakon, ahol van felhasználók által előállított tartalom. A <code>link</code> tag-et az oldal fejlécében is használhatod az <code>a</code> tag helyett, de a HTML-nek elérhetőnek kell lennie JavaScript futtatása nélkül is.
diff --git a/config/locales/hy.yml b/config/locales/hy.yml
index 5042e3f7f06c9c..dfb280ac486a48 100644
--- a/config/locales/hy.yml
+++ b/config/locales/hy.yml
@@ -31,7 +31,6 @@ hy:
       created_msg: Մոդերացիոն նոթը բարեյաջող ստեղծուեց
       destroyed_msg: Մոդերացիոն նոթը բարեյաջող վերացուեց
     accounts:
-      add_email_domain_block: Արգելափակել էլ․ փոստի տիրոյթը
       approve: Ընդունել
       approved_msg: Յաջողութեամբ հաստատուեց %{username}֊ի գրանցման յայտը
       are_you_sure: Վստա՞հ ես
@@ -113,7 +112,6 @@ hy:
       reset_password: Վերականգնել գաղտանաբառը
       resubscribe: Կրկին բաժանորդագրուել
       search: Որոնել
-      search_same_email_domain: Այլ օգտատէրեր նոյն էլ․ փոստի դոմէյնով
       search_same_ip: Այլ օգտատէրեր նոյն IP֊ով
       security_measures:
         only_password: Միայն ծածկագիր
@@ -147,21 +145,18 @@ hy:
     action_logs:
       action_types:
         assigned_to_self_report: Բողոքել
-        change_email_user: Փոխել օգտատիրոջ էլ․ հասցէն
         confirm_user: Հաստատել օգտատիրոջը
         create_account_warning: Ստեղծել զգուշացում
         create_announcement: Ստեղծել յայտարարութիւն
         create_custom_emoji: Ստեղծել սեփական էմոջիները
         create_domain_allow: Ստեղծել տիրոյթի թոյլտուութիւն
         create_domain_block: Ստեղծել տիրոյթի արգելափակում
-        create_email_domain_block: Ստեղծել էլ․ հասցէի դոմէյնի արգելափակում
         create_ip_block: Ստեղծել IP կանոն
         demote_user: Աստիճանազրկել օգտատիրոջը
         destroy_announcement: Ջնջել յայտարարութիւնը
         destroy_custom_emoji: Ջնջել էմոջին
         destroy_domain_allow: Ջնջել դոմէնի թոյլտուութիւնը
         destroy_domain_block: Ապաարգելափակել դոմէնը
-        destroy_email_domain_block: Ապաարգելափակել էլ․ հասցէի դոմէնը
         destroy_ip_block: Ջնջել IP կանոնը
         destroy_status: Ջնջել գրառումը
         disable_2fa_user: Անջատել 2FA
@@ -274,13 +269,10 @@ hy:
       view: Տեսնել տիրոյթի արգելափակումը
     email_domain_blocks:
       add_new: Ավելացնել նորը
-      created_msg: Բարեյաջող արգելափակուեց էլ․ փոստի տիրոյթ
       delete: Ջնջել
       domain: Դոմեն
       new:
         create: Ավելացնել դոմեն
-        title: Արգելափակել էլ․ փոստի նոր տիրոյթ
-      title: էլ․ փոստի արգելափակուած տիրոյթներ
     follow_recommendations:
       language: Լեզուի համար
       status: Կարգավիճակ
@@ -433,7 +425,6 @@ hy:
         not_usable: Չի կարող օգտագործուել
         title: Թրենդային պիտակներ
         usable: Կարող է օգտագործուել
-      title: Թրենդներ
     warning_presets:
       add_new: Ավելացնել նորը
       delete: Ջնջել
@@ -454,7 +445,6 @@ hy:
       guide_link_text: Աջակցել կարող են բոլորը։
     sensitive_content: Զգայուն բովանդակութիւն
   application_mailer:
-    notification_preferences: Փոխել փոստային կարգաւորումները
     salutation: "%{name}"
     view: Նայել․
     view_profile: Նայել անձնական էջը
@@ -476,7 +466,6 @@ hy:
     or_log_in_with: Կամ մուտք գործել օգտագործելով՝
     privacy_policy_agreement_html: Ես կարդացել եւ ընդունել եմ <a href="%{privacy_policy_path}" target="_blank">գաղնիութեան քաղաքականութիւնը</a>
     progress:
-      confirm: Փոստի հաստատում
       details: Ձեր տուեալները
       review: Վաւերացում
       rules: Ընդունել կանոները
@@ -499,7 +488,6 @@ hy:
       title: Ստեղծի՜ր հաշիւ %{domain}-ում
     status:
       account_status: Հաշուի կարգավիճակ
-      pending: Դիմումը պէտք է քննուի մեր անձնակազմի կողմից, ինչը կարող է մի փոքր ժամանակ խլել։ Դիմումի հաստատուելու դէպքում, կտեղեկացնենք նամակով։
     use_security_key: Օգտագործել անվտանգութեան բանալի
   challenge:
     confirm: Շարունակել
diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index 28a078bb3eae18..698c7c49e1a1d5 100644
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -31,7 +31,6 @@ ia:
       created_msg: Nota de moderation create con successo!
       destroyed_msg: Nota de moderation destruite con successo!
     accounts:
-      add_email_domain_block: Blocar dominio de e-mail
       approve: Approbar
       approved_msg: Demanda de inscription de %{username} approbate con successo
       are_you_sure: Es tu secur?
@@ -58,7 +57,6 @@ ia:
       demote: Degradar
       destroyed_msg: Le datos de %{username} es ora in cauda pro lor imminente deletion
       disable: Gelar
-      disable_sign_in_token_auth: Disactivar le authentication per token in e-mail
       disable_two_factor_authentication: Disactivar A2F
       disabled: Gelate
       display_name: Nomine a monstrar
@@ -67,7 +65,6 @@ ia:
       email: E-mail
       email_status: Stato de e-mail
       enable: Disgelar
-      enable_sign_in_token_auth: Activar le authentication per token in e-mail
       enabled: Activate
       enabled_msg: Conto de %{username} disgelate con successo
       followers: Sequitores
@@ -132,7 +129,6 @@ ia:
       resubscribe: Resubscriber
       role: Rolo
       search: Cercar
-      search_same_email_domain: Altere usatores con le mesme dominio de e-mail
       search_same_ip: Altere usatores con le mesme IP
       security: Securitate
       security_measures:
@@ -173,26 +169,21 @@ ia:
         approve_appeal: Approbar appello
         approve_user: Approbar usator
         assigned_to_self_report: Assignar reporto
-        change_email_user: Cambiar e-mail pro le usator
         change_role_user: Cambiar le rolo del usator
         confirm_user: Confirmar le usator
         create_account_warning: Crear un advertimento
         create_announcement: Crear annuncio
-        create_canonical_email_block: Crear blocada de e-mail
         create_custom_emoji: Crear emoji personalisate
         create_domain_allow: Crear permisso de dominio
         create_domain_block: Crear blocada de dominio
-        create_email_domain_block: Crear blocada de dominio de e-mail
         create_ip_block: Crear un regula IP
         create_unavailable_domain: Crear dominio indisponibile
         create_user_role: Crear un rolo
         demote_user: Degradar usator
         destroy_announcement: Deler annuncio
-        destroy_canonical_email_block: Deler blocada de e-mail
         destroy_custom_emoji: Deler emoji personalisate
         destroy_domain_allow: Deler permisso de dominio
         destroy_domain_block: Deler blocada de dominio
-        destroy_email_domain_block: Crear blocada de dominio de e-mail
         destroy_instance: Purgar dominio
         destroy_ip_block: Deler le regula IP
         destroy_status: Deler message
@@ -200,10 +191,8 @@ ia:
         destroy_user_role: Destruer rolo
         disable_2fa_user: Disactivar A2F
         disable_custom_emoji: Disactivar emoji personalisate
-        disable_sign_in_token_auth_user: Disactivar le authentication per token de e-mail pro le usator
         disable_user: Disactivar le usator
         enable_custom_emoji: Activar emoji personalisate
-        enable_sign_in_token_auth_user: Activar le authentication per token de e-mail pro le usator
         enable_user: Activar le usator
         memorialize_account: Converter conto in memorial
         promote_user: Promover usator
@@ -233,26 +222,20 @@ ia:
         approve_appeal_html: "%{name} approbava appello del decision de moderation de %{target}"
         approve_user_html: "%{name} approbava inscription de %{target}"
         assigned_to_self_report_html: "%{name} assignava reporto %{target} a se mesme"
-        change_email_user_html: "%{name} cambiava le adresse de e-mail address del usator %{target}"
         change_role_user_html: "%{name} cambiava rolo de %{target}"
-        confirm_user_html: "%{name} confirmava le adresse de e-mail del usator %{target}"
         create_account_warning_html: "%{name} inviava un advertimento a %{target}"
         create_announcement_html: "%{name} creava un nove annuncio %{target}"
-        create_canonical_email_block_html: "%{name} blocava e-mail con le hash %{target}"
         create_custom_emoji_html: "%{name} incargava le nove emoji %{target}"
         create_domain_allow_html: "%{name} permitteva federation con dominio %{target}"
         create_domain_block_html: "%{name} blocava dominio %{target}"
-        create_email_domain_block_html: "%{name} blocava dominio de e-mail %{target}"
         create_ip_block_html: "%{name} creava regula pro IP %{target}"
         create_unavailable_domain_html: "%{name} stoppava livration al dominio %{target}"
         create_user_role_html: "%{name} creava rolo de %{target}"
         demote_user_html: "%{name} degradava usator %{target}"
         destroy_announcement_html: "%{name} deleva annuncio %{target}"
-        destroy_canonical_email_block_html: "%{name} disblocava e-mail con le hash %{target}"
         destroy_custom_emoji_html: "%{name} deleva emoji %{target}"
         destroy_domain_allow_html: "%{name} impediva le federation con dominio %{target}"
         destroy_domain_block_html: "%{name} disblocava dominio %{target}"
-        destroy_email_domain_block_html: "%{name} disblocava dominio de e-mail %{target}"
         destroy_instance_html: "%{name} purgava le dominio %{target}"
         destroy_ip_block_html: "%{name} deleva le regula pro IP %{target}"
         destroy_status_html: "%{name} removeva un message de %{target}"
@@ -260,10 +243,8 @@ ia:
         destroy_user_role_html: "%{name} deleva le rolo %{target}"
         disable_2fa_user_html: "%{name} disactivava le authentication a duo factores pro le usator %{target}"
         disable_custom_emoji_html: "%{name} disactivava le emoji %{target}"
-        disable_sign_in_token_auth_user_html: "%{name} disactivava le authentication per token de e-mail pro %{target}"
         disable_user_html: "%{name} disactivava le apertura de session pro le usator %{target}"
         enable_custom_emoji_html: "%{name} activava le emoji %{target}"
-        enable_sign_in_token_auth_user_html: "%{name} activava le authentication per token de e-mail pro %{target}"
         enable_user_html: "%{name} activava le apertura de session pro le usator %{target}"
         memorialize_account_html: "%{name} converteva le conto de %{target} in un pagina commemorative"
         promote_user_html: "%{name} promoveva le usator %{target}"
@@ -271,7 +252,6 @@ ia:
         reject_user_html: "%{name} refusava le inscription de %{target}"
         remove_avatar_user_html: "%{name} removeva le avatar de %{target}"
         reopen_report_html: "%{name} reaperiva le reporto %{target}"
-        resend_user_html: "%{name} reinviava le e-mail de confirmation pro %{target}"
         reset_password_user_html: "%{name} reinitialisava le contrasigno del usator %{target}"
         resolve_report_html: "%{name} resolveva le reporto %{target}"
         sensitive_account_html: "%{name} marcava le multimedia de %{target} como sensibile"
@@ -432,7 +412,6 @@ ia:
       attempts_over_week:
         one: "%{count} tentativa de inscription in le ultime septimana"
         other: "%{count} tentativas de inscription in le ultime septimana"
-      created_msg: Le dominio de e-mail ha essite blocate
       delete: Deler
       dns:
         types:
@@ -441,12 +420,8 @@ ia:
       new:
         create: Adder un dominio
         resolve: Resolver dominio
-        title: Blocar un nove dominio de e-mail
-      no_email_domain_block_selected: Necun blocadas de dominio de e-mail ha essite cambiate perque necun ha essite seligite
       not_permitted: Non permittite
-      resolved_dns_records_hint_html: Le nomine de dominio se resolve al sequente dominios MX, le quales ha le ultime responsibilitate pro le reception de e-mail. Blocar un dominio MX blocara le inscriptiones de qualcunque adresse de e-mail que usa le mesme dominio MX, mesmo si le nomine de dominio visibile es differente. <strong>Presta attention a evitar de blocar le grande fornitores de e-mail.</strong>
       resolved_through_html: Resolvite per %{domain}
-      title: Dominios de e-mail blocate
     export_domain_allows:
       new:
         title: Importar permissiones de dominio
@@ -597,7 +572,6 @@ ia:
         resolve_description_html: Necun mesura essera prendite contra le conto denunciate, necun sanction registrate, e le reporto essera claudite.
         silence_description_html: Iste conto essera visibile solmente a qui ja lo seque o manualmente lo cerca, limitante gravemente su portata. Pote sempre esser revertite. Claude tote le reportos contra iste conto.
         suspend_description_html: Le conto e tote su contento essera inaccessibile e finalmente delite, e interager con illo essera impossibile. Reversibile intra 30 dies. Claude tote le reportos contra iste conto.
-      actions_description_html: Decide qual mesura prender pro resolver iste reporto. Si tu prende un mesura punitive contra le conto reportate, le persona recipera un notification in e-mail, excepte si le categoria <strong>Spam</strong> es seligite.
       actions_description_remote_html: Decide qual mesura prender pro resolver iste reporto. Isto affectara solmente le maniera in que <strong>tu</strong> servitor communica con iste conto remote e gere su contento.
       add_to_report: Adder plus al reporto
       already_suspended_badges:
@@ -662,7 +636,6 @@ ia:
         delete_data_html: Deler le profilo e contento de <strong>@%{acct}</strong> in 30 dies excepte si le suspension es disfacite intertanto
         preview_preamble_html: "<strong>@%{acct}</strong> recipera un advertimento con le sequente contento:"
         record_strike_html: Registra un sanction contra <strong>@%{acct}</strong> pro adjutar te a prender mesuras adequate in caso de futur violationes committite desde iste conto
-        send_email_html: Inviar un e-mail de advertimento a <strong>@%{acct}</strong>
         warning_placeholder: Motivation supplementari facultative pro le action de moderation.
       target_origin: Origine del conto reportate
       title: Reportos
@@ -702,7 +675,6 @@ ia:
         manage_appeals: Gerer appellos
         manage_appeals_description: Permitte que usatores revide appellos contra actiones de moderation
         manage_blocks: Gerer blocadas
-        manage_blocks_description: Permitter que usatores bloca le fornitores de e-mail e le adresses IP
         manage_custom_emojis: Gerer emojis personalisate
         manage_custom_emojis_description: Permitte que usatores gere emojis personalisate sur le servitor
         manage_federation: Gerer federation
@@ -720,7 +692,6 @@ ia:
         manage_taxonomies: Gerer taxonomias
         manage_taxonomies_description: Permitte que usatores revide contento in tendentias e actualisa le parametros de hashtag
         manage_user_access: Gerer le accesso de usatores
-        manage_user_access_description: Permitte que usatores disactiva le authentication bifactorial de altere usatores, cambia lor adresses de e-mail, e reinitialisa lor contrasigno
         manage_users: Gerer usatores
         manage_users_description: Permitte que usatores vide le detalios de altere usatores e exeque actiones de moderation contra illes
         manage_webhooks: Gerer Webhooks
@@ -795,7 +766,6 @@ ia:
       destroyed_msg: Le file incargate al sito ha essite delite!
     software_updates:
       critical_update: Critic – per favor, actualisa rapidemente
-      description: Il es recommendate mantener tu installation de Mastodon actualisate pro beneficiar del ultime reparationes e functiones. In ultra, de tempore a tempore, il es de importantia critic actualisar Mastodon in tempore utile pro evitar problemas de securitate. Pro iste rationes, Mastodon verifica le presentia de actualisationes cata 30 minutas, e te notificara secundo tu preferentias de notification in e-mail.
       documentation_link: Pro saper plus
       release_notes: Notas de version
       title: Actualisationes disponibile
@@ -897,6 +867,7 @@ ia:
     trends:
       allow: Permitter
       approved: Approbate
+      confirm_allow: Es tu secur que tu vole permitter le etiquettas seligite?
       disallow: Refusar
       links:
         allow: Permitter ligamine
@@ -956,7 +927,6 @@ ia:
         used_by_over_week:
           one: Usate per un persona in le ultime septimana
           other: Usate per %{count} personas in le ultime septimana
-      title: Tendentias
       trending: In tendentia
     warning_presets:
       add_new: Adder nove
@@ -1041,9 +1011,7 @@ ia:
       guide_link_text: Totes pote contribuer.
     sensitive_content: Contento sensibile
   application_mailer:
-    notification_preferences: Cambiar preferentias de e-mail
     salutation: "%{name},"
-    settings: 'Cambiar preferentias de e-mail: %{link}'
     unsubscribe: Desubscriber
     view: 'Visita:'
     view_profile: Vider profilo
@@ -1063,7 +1031,6 @@ ia:
       hint_html: Solo un altere cosa! Nos debe confirmar que tu es un humano (de sorta que nos pote mantener le spam foras!). Solve le CAPTCHA infra e clicca sur "Continuar".
       title: Controlo de securitate
     confirmations:
-      awaiting_review: Tu adresse de e-mail es confirmate! Le personal de %{domain} ora revide tu registration. Tu recipera un e-mail si illes approba tu conto!
       awaiting_review_title: Tu inscription es in curso de revision
       clicking_this_link: cliccar sur iste ligamine
       login_link: aperir session
@@ -1071,7 +1038,6 @@ ia:
       redirect_to_app_html: Tu deberea haber essite redirigite al app <strong>%{app_name}</strong>. Si isto non ha evenite, tenta %{clicking_this_link} o retornar manualmente al app.
       registration_complete: Tu inscription sur %{domain} es ora concludite!
       welcome_title: Benvenite, %{name}!
-      wrong_email_hint: Si ille adresse de e-mail non es correcte, tu pote cambiar lo in le parametros del conto.
     delete_account: Deler le conto
     delete_account_html: Si tu vole deler tu conto, tu pote <a href="%{path}">facer lo hic</a>. Te essera demandate un confirmation.
     description:
@@ -1092,7 +1058,6 @@ ia:
     or_log_in_with: O aperi session con
     privacy_policy_agreement_html: Io ha legite e accepta le <a href="<a href="%{privacy_policy_path}" target="_blank">politica de confidentialitate</a>
     progress:
-      confirm: Confirmar e-mail
       details: Tu detalios
       review: Nostre revision
       rules: Accepta le regulas
@@ -1114,10 +1079,8 @@ ia:
     security: Securitate
     set_new_password: Definir un nove contrasigno
     setup:
-      email_below_hint_html: Consulta tu dossier de spam, o requesta un altere ligamine de confirmation. Tu pote corriger tu adresse de e-mail si illo es errate.
       email_settings_hint_html: Clicca sur le ligamine que nos te ha inviate pro verificar %{email}. Nos te attendera hic.
       link_not_received: Necun ligamine recipite?
-      new_confirmation_instructions_sent: Tu recipera un nove e-mail con le ligamine de confirmation in poc minutas!
       title: Consulta tu cassa de entrata
     sign_in:
       preamble_html: Aperi session con tu credentiales de <strong>%{domain}</strong>. Si tu conto es albergate sur un altere servitor, tu non potera aperir session hic.
@@ -1128,9 +1091,7 @@ ia:
       title: Lassa nos installar tu conto sur %{domain}.
     status:
       account_status: Stato del conto
-      confirming: Attendente le termination del confirmation del adresse de e-mail.
       functional: Tu conto es completemente operative.
-      pending: Tu demanda attende le revision per nostre personal. Isto pote prender alcun tempore. Tu recipera un e-mail si tu demanda es approbate.
       redirecting_to: Tu conto es inactive perque illo actualmente redirige a %{acct}.
       self_destruct: Perque %{domain} va clauder, tu solo habera accesso limitate a tu conto.
       view_strikes: Examinar le sanctiones passate contra tu conto
@@ -1173,9 +1134,6 @@ ia:
       before: 'Ante de continuar, per favor lege attentemente iste notas:'
       caches: Le contento que altere servitores ha immagazinate in cache pote persister
       data_removal: Tu messages e altere datos essera removite permanentemente
-      email_change_html: Tu pote <a href="%{path}">cambiar tu adresse de e-mail</a> sin deler tu conto
-      email_contact_html: Si illo ancora non arriva, tu pote inviar e-mail a <a href="mailto:%{email}">%{email}</a> pro peter adjuta
-      email_reconfirmation_html: Si tu non recipe le e-mail de confirmation, tu pote <a href="%{path}>requestar lo de novo</a>
       irreversible: Tu non potera restaurar o reactivar tu conto
       more_details_html: Pro plus detalios, vide le <a href="%{terms_path}">politica de confidentialitate</a>.
       username_available: Tu nomine de usator essera disponibile novemente
@@ -1419,16 +1377,6 @@ ia:
     unsubscribe:
       action: Si, desubscriber
       complete: Desubscribite
-      confirmation_html: Es tu secur de voler cancellar le subscription al %{type} de Mastodon sur %{domain} pro tu adresse de e-mail %{email}? Tu pote sempre resubscriber te a partir del <a href="%{settings_path}">parametros de notification in e-mail</a>.
-      emails:
-        notification_emails:
-          favourite: notificationes de favorites in e-mail
-          follow: notificationes de sequimento in e-mail
-          follow_request: requestas de sequimento in e-mail
-          mention: notificationes de mentiones in e-mail
-          reblog: notificationes de impulsos in e-mail
-      resubscribe_html: Si tu ha cancellate le subscription in error, tu pote resubscriber te a partir del <a href="%{settings_path}">parametros de notification in e-mail</a>.
-      success_html: Tu non recipera plus %{type} pro Mastodon sur %{domain} a tu adresse de e-mail %{email}.
       title: Desubcriber
   media_attachments:
     validations:
@@ -1509,8 +1457,6 @@ ia:
     update:
       subject: "%{name} ha modificate un message"
   notifications:
-    administration_emails: Notificationes per e-mail pro administratores
-    email_events: Eventos pro notificationes per e-mail
     email_events_hint: 'Selige eventos pro le quales tu vole reciper notificationes:'
   number:
     human:
@@ -1669,7 +1615,6 @@ ia:
     import: Importar
     import_and_export: Importar e exportar
     migrate: Migration de conto
-    notifications: Notificationes per e-mail
     preferences: Preferentias
     profile: Profilo public
     relationships: Sequites e sequitores
@@ -1916,7 +1861,6 @@ ia:
     invalid_otp_token: Codice de duo factores non valide
     otp_lost_help_html: Si tu ha perdite le accesso a ambes, tu pote contactar %{email}
     rate_limited: Troppo de tentativas de authentication. Per favor reessaya plus tarde.
-    seamless_external_login: Tu ha aperite session per medio de un servicio externe. Le parametros de contrasigno e de e-mail es dunque indisponibile.
     signed_in_as: 'Session aperite como:'
   verification:
     extra_instructions_html: <strong>Consilio:</strong> Le ligamine sur tu sito web pote esser invisibile. Le parte importante es <code>rel="me"</code> que impedi le usurpation de identitate sur sitos web con contento generate per usatores. Tu pote mesmo usar un etiquetta <code>link</code> in le capite del pagina in vice de <code>a</code>, ma le codice HTML debe esser accessibile sin executar JavaScript.
diff --git a/config/locales/id.yml b/config/locales/id.yml
index ac42afdb4f7892..73b42183972f85 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -29,7 +29,6 @@ id:
       created_msg: Catatan moderasi berhasil dibuat!
       destroyed_msg: Catatan moderasi berhasil dihapus!
     accounts:
-      add_email_domain_block: Masukkan domain email ke daftar hitam
       approve: Terima
       approved_msg: Berhasil menerima pendaftaran %{username}
       are_you_sure: Anda yakin?
@@ -56,7 +55,6 @@ id:
       demote: Turunkan
       destroyed_msg: Data %{username} masuk antrean untuk dihapus segera
       disable: Nonaktifkan
-      disable_sign_in_token_auth: Nonaktifkan otentikasi token email
       disable_two_factor_authentication: Nonaktifkan 2FA
       disabled: Dinonaktifkan
       display_name: Nama
@@ -65,7 +63,6 @@ id:
       email: Email
       email_status: Status Email
       enable: Aktifkan
-      enable_sign_in_token_auth: Aktifkan otentikasi token email
       enabled: Diaktifkan
       enabled_msg: Berhasil mencairkan akun %{username}
       followers: Pengikut
@@ -129,7 +126,6 @@ id:
       resubscribe: Langganan ulang
       role: Peran
       search: Cari
-      search_same_email_domain: Pengguna lain dengan domain email yang sama
       search_same_ip: Pengguna lain dengan IP yang sama
       security: Keamanan
       security_measures:
@@ -170,26 +166,21 @@ id:
         approve_appeal: Setujui Banding
         approve_user: Setujui Pengguna
         assigned_to_self_report: Berikan laporan
-        change_email_user: Ubah Email untuk Pengguna
         change_role_user: Ubah Peran Pengguna
         confirm_user: Konfirmasi Pengguna
         create_account_warning: Buat Peringatan
         create_announcement: Buat Pengumuman
-        create_canonical_email_block: Buat Pemblokiran Surel
         create_custom_emoji: Buat Emoji Khusus
         create_domain_allow: Buat Izin Domain
         create_domain_block: Buat Blokir Domain
-        create_email_domain_block: Buat Email Blokir Domain
         create_ip_block: Buat aturan IP
         create_unavailable_domain: Buat Domain yang Tidak Tersedia
         create_user_role: Buah Peran
         demote_user: Turunkan Pengguna
         destroy_announcement: Hapus Pengumuman
-        destroy_canonical_email_block: Hapus Pemblokiran Surel
         destroy_custom_emoji: Hapus Emoji Khusus
         destroy_domain_allow: Hapus Izin Domain
         destroy_domain_block: Hapus Blokir Domain
-        destroy_email_domain_block: Hapus email blokir domain
         destroy_instance: Hapus Domain
         destroy_ip_block: Hapus aturan IP
         destroy_status: Hapus Status
@@ -197,10 +188,8 @@ id:
         destroy_user_role: Hapus Peran
         disable_2fa_user: Nonaktifkan 2FA
         disable_custom_emoji: Nonaktifkan Emoji Khusus
-        disable_sign_in_token_auth_user: Nonaktifkan Otentikasi Token Email untuk Pengguna
         disable_user: Nonaktifkan Pengguna
         enable_custom_emoji: Aktifkan Emoji Khusus
-        enable_sign_in_token_auth_user: Aktifkan Otentikasi Token Email untuk Pengguna
         enable_user: Aktifkan Pengguna
         memorialize_account: Kenang Akun
         promote_user: Promosikan Pengguna
@@ -229,26 +218,20 @@ id:
         approve_appeal_html: "%{name} menyetujui moderasi keputusan banding dari %{target}"
         approve_user_html: "%{name} menyetujui pendaftaran dari %{target}"
         assigned_to_self_report_html: "%{name} menugaskan laporan %{target} ke dirinya sendiri"
-        change_email_user_html: "%{name} mengubah alamat email pengguna %{target}"
         change_role_user_html: "%{name} mengubah peran %{target}"
-        confirm_user_html: "%{name} mengonfirmasi alamat email pengguna %{target}"
         create_account_warning_html: "%{name} mengirim peringatan untuk %{target}"
         create_announcement_html: "%{name} membuat pengumuman baru %{target}"
-        create_canonical_email_block_html: "%{name} memblokir surel dengan hash %{target}"
         create_custom_emoji_html: "%{name} mengunggah emoji baru %{target}"
         create_domain_allow_html: "%{name} mengizinkan penggabungan dengan domain %{target}"
         create_domain_block_html: "%{name} memblokir domain %{target}"
-        create_email_domain_block_html: "%{name} memblokir domain email %{target}"
         create_ip_block_html: "%{name} membuat aturan untuk IP %{target}"
         create_unavailable_domain_html: "%{name} menghentikan pengiriman ke domain %{target}"
         create_user_role_html: "%{name} membuat peran %{target}"
         demote_user_html: "%{name} menurunkan pengguna %{target}"
         destroy_announcement_html: "%{name} menghapus pengumuman %{target}"
-        destroy_canonical_email_block_html: "%{name} menghapus pemblokiran surel dengan hash %{target}"
         destroy_custom_emoji_html: "%{name} menghapus emoji %{target}"
         destroy_domain_allow_html: "%{name} membatalkan izin penggabungan dengan domain %{target}"
         destroy_domain_block_html: "%{name} membuka blokir domain %{target}"
-        destroy_email_domain_block_html: "%{name} membuka blokir domain email %{target}"
         destroy_instance_html: "%{name} menghapus domain %{target}"
         destroy_ip_block_html: "%{name} menghapus aturan untuk IP %{target}"
         destroy_status_html: "%{name} menghapus status %{target}"
@@ -256,10 +239,8 @@ id:
         destroy_user_role_html: "%{name} menghapus peran %{target}"
         disable_2fa_user_html: "%{name} mematikan syarat dua faktor untuk pengguna %{target}"
         disable_custom_emoji_html: "%{name} mematikan emoji %{target}"
-        disable_sign_in_token_auth_user_html: "%{name} menonaktifkan otentikasi token email untuk %{target}"
         disable_user_html: "%{name} mematikan login untuk pengguna %{target}"
         enable_custom_emoji_html: "%{name} mengaktifkan emoji %{target}"
-        enable_sign_in_token_auth_user_html: "%{name} mengaktifkan otentikasi token email untuk %{target}"
         enable_user_html: "%{name} mengaktifkan login untuk pengguna %{target}"
         memorialize_account_html: "%{name} mengubah akun %{target} jadi halaman memorial"
         promote_user_html: "%{name} mempromosikan pengguna %{target}"
@@ -267,7 +248,6 @@ id:
         reject_user_html: "%{name} menolak pendaftaran dari %{target}"
         remove_avatar_user_html: "%{name} menghapus avatar %{target}"
         reopen_report_html: "%{name} membuka ulang laporan %{target}"
-        resend_user_html: "%{name} mengirim ulang konfirmasi email untuk %{target}"
         reset_password_user_html: "%{name} mereset kata sandi pengguna %{target}"
         resolve_report_html: "%{name} menyelesaikan laporan %{target}"
         sensitive_account_html: "%{name} menandai media %{target} sebagai sensitif"
@@ -412,7 +392,6 @@ id:
       add_new: Tambah baru
       attempts_over_week:
         other: "%{count} upaya mendaftar selama seminggu terakhir"
-      created_msg: Berhasil memblokir domain email
       delete: Hapus
       dns:
         types:
@@ -421,11 +400,7 @@ id:
       new:
         create: Tambah domain
         resolve: Pembaruan domain
-        title: Blokir domain email baru
-      no_email_domain_block_selected: Tidak ada blokir domain email yang diubah sebab tidak ada yang dipilih
-      resolved_dns_records_hint_html: Pembaruan nama domain mengikuti domain MX, yang bertanggung jawab menerima email. Memblokir domain MX akan memblokir pendaftaran dari alamat email apapun yang menggunakan domain MX sama, meskipun nama domainnya beda. <strong>Hati-hati untuk tidak memblokir layanan email besar.</strong>
       resolved_through_html: Diperbarui melalui %{domain}
-      title: Domain email terblokir
     export_domain_allows:
       new:
         title: Impor izin domain
@@ -568,7 +543,6 @@ id:
         mark_as_sensitive_description_html: Media di dalam kiriman terlapor akan ditandai sebagai sensitif dan hukuman akan direkam untuk membantu menangani pelanggaran dari akun yang sama di masa mendatang.
         other_description_html: Lihat opsi lain untuk mengendalikan perilaku akun dan menyesuaikan komunikasi ke akun yang dilaporkan.
         resolve_description_html: Tidak ada tindakan untuk akun yang dilaporkan, tidak ada peringatan yang direkam, dan laporan akan ditutup.
-      actions_description_html: Memutuskan tindakan yang tepat untuk menyelesaikan laporan ini. Jika Anda memutuskan tindakan hukuman kepada akun terlapor, notifikasi email akan dikirim ke mereka, kecuali saat kategori <strong>Spam</strong> dipilih.
       add_to_report: Tambahkan lebih banyak untuk lapor
       are_you_sure: Apakah Anda yakin?
       assign_to_self: Tugaskan kpd saya
@@ -642,7 +616,6 @@ id:
         manage_appeals: Kelola Permintaan
         manage_appeals_description: Memungkinkan pengguna untuk meninjau permintaan terhadap tindakan moderasi
         manage_blocks: Kelola Pemblokiran
-        manage_blocks_description: Memungkinkan pengguna untuk memblokir penyedia surel dan alamat IP
         manage_custom_emojis: Kelola Emoji Kustom
         manage_custom_emojis_description: Memungkinkan pengguna untuk mengelola emoji kustom di server
         manage_federation: Kelola Federasi
@@ -660,7 +633,6 @@ id:
         manage_taxonomies: Kelola Taksonomi
         manage_taxonomies_description: Memungkinkan pengguna untuk meninjau konten tren dan memperbarui pengaturan tagar
         manage_user_access: Kelola Akses Pengguna
-        manage_user_access_description: Memungkinkan pengguna untuk menonaktifkan otentikasi dua faktor, mengubah alamat surel, dan mengatur ulang kata sandi pengguna lain
         manage_users: Kelola Pengguna
         manage_users_description: Memungkinkan pengguna untuk melihat detail pengguna lain dan melakukan tindakan moderasi terhadap mereka
         manage_webhooks: Kelola Webhook
@@ -830,7 +802,6 @@ id:
         usage_comparison: Digunakan %{today} kali hari ini, dibandingkan %{yesterday} kemarin
         used_by_over_week:
           other: Digunakan oleh %{count} orang selama seminggu terakhir
-      title: Tren
       trending: Sedang tren
     warning_presets:
       add_new: Tambah baru
@@ -904,9 +875,7 @@ id:
       guide_link_text: Siapa saja bisa berkontribusi.
     sensitive_content: Konten sensitif
   application_mailer:
-    notification_preferences: Ubah pilihan email
     salutation: "%{name},"
-    settings: 'Ubah pilihan email: %{link}'
     view: 'Tampilan:'
     view_profile: Lihat profil
     view_status: Lihat status
@@ -955,9 +924,7 @@ id:
       title: Mari kita siapkan Anda di %{domain}.
     status:
       account_status: Status akun
-      confirming: Menunggu konfirmasi email diselesaikan.
       functional: Akun Anda kini beroperasi penuh.
-      pending: Permintaan Anda sedang ditinjau oleh staf kami. Ini mungkin butuh beberapa waktu. Anda akan menerima email jika permintaan Anda diterima.
       redirecting_to: Akun Anda tidak aktif karena sekarang dialihkan ke %{acct}.
       view_strikes: Lihat hukuman lalu yang pernah terjadi kepada akun Anda
     too_fast: Formulir dikirim terlalu cepat, coba lagi.
@@ -999,9 +966,6 @@ id:
       before: 'Sebelum melanjutkan, silakan baca catatan ini dengan hati-hati:'
       caches: Konten yang telah tersimpan di server lain mungkin akan tetap di sana
       data_removal: Kiriman Anda dan data lainnya akan dihapus secara permanen
-      email_change_html: Anda dapat <a href="%{path}">mengubah alamat email Anda</a> tanpa perlu menghapus akun
-      email_contact_html: Jika pesan belum diterima, Anda dapat mengirim email ke <a href="mailto:%{email}">%{email}</a> untuk mencari bantuan
-      email_reconfirmation_html: Jika Anda tidak menerima email konfirmasi, <a href="%{path}">Anda dapat memintanya lagi</a>
       irreversible: Anda tidak akan bisa lagi mengembalikan atau mengaktifkan kembali akun Anda
       more_details_html: Lebih detailnya, lihat <a href="%{terms_path}">kebijakan privasi</a>.
       username_available: Nama pengguna Anda akan tersedia lagi
@@ -1174,7 +1138,6 @@ id:
     authentication_methods:
       otp: aplikasi otentikasi dua-faktor
       password: kata sandi
-      sign_in_token: kode keamanan email
       webauthn: kunci keamanan
     description_html: Jika Anda melihat aktivitas tidak dikenal, pertimbangkan untuk mengubah kata sandi dan mengaktifkan otentikasi dua-faktor.
     empty: Riwayat otentikasi tidak tersedia
@@ -1260,7 +1223,6 @@ id:
     update:
       subject: "%{name} mengedit kiriman"
   notifications:
-    email_events: Event untuk notifikasi email
     email_events_hint: 'Pilih event yang ingin Anda terima notifikasinya:'
   number:
     human:
@@ -1565,7 +1527,6 @@ id:
     follow_limit_reached: Anda tidak dapat mengikuti lebih dari %{limit} orang
     invalid_otp_token: Kode dua faktor tidak cocok
     otp_lost_help_html: Jika Anda kehilangan akses keduanya, Anda dapat menghubungi %{email}
-    seamless_external_login: Anda masuk via layanan eksternal, sehingga pengaturan kata sandi dan email tidak tersedia.
     signed_in_as: 'Masuk sebagai:'
   verification:
     verification: Verifikasi
diff --git a/config/locales/ie.yml b/config/locales/ie.yml
index 432e7d031b0331..4ee869d92f790c 100644
--- a/config/locales/ie.yml
+++ b/config/locales/ie.yml
@@ -31,7 +31,6 @@ ie:
       created_msg: Moderatori nota creat successosimen!
       destroyed_msg: Moderatori nota destructet successosimen!
     accounts:
-      add_email_domain_block: Bloccar email-dominia {domain}
       approve: Aprobar
       approved_msg: Successosimen aprobat li aplication de registration de %{username}
       are_you_sure: Es tu cert?
@@ -58,7 +57,6 @@ ie:
       demote: Demoer
       destroyed_msg: Li data de %{username} es nu in li linea por esser deletet iminentmen
       disable: Gelar
-      disable_sign_in_token_auth: Desactivisar autentication per email-claves
       disable_two_factor_authentication: Desactivisar 2FA
       disabled: Gelat
       display_name: Visibil nómine
@@ -67,7 +65,6 @@ ie:
       email: E-post
       email_status: Statu del e-post
       enable: Desgelar
-      enable_sign_in_token_auth: Activisar autentication per email-claves
       enabled: Activ
       enabled_msg: Successosimen desgelat li conto de %{username}
       followers: Sequitores
@@ -132,7 +129,6 @@ ie:
       resubscribe: Reabonnar
       role: Rol
       search: Serchar
-      search_same_email_domain: Altri usatores con li sam email-dominia
       search_same_ip: Altri usatores con li sam IP
       security: Securitá
       security_measures:
@@ -173,26 +169,21 @@ ie:
         approve_appeal: Aprobar Apelle
         approve_user: Aprobar usator
         assigned_to_self_report: Assignar Raporte
-        change_email_user: Changear li email-adresse del usator
         change_role_user: Changear li rol del usator
         confirm_user: Confirmar usator
         create_account_warning: Crear admonimentes
         create_announcement: Crear un proclamation
-        create_canonical_email_block: Crear Email-Blocca
         create_custom_emoji: Crear Customisat Emoji
         create_domain_allow: Crear Dominia-Permisse
         create_domain_block: Crear Dominia-Blocca
-        create_email_domain_block: Crear Email-Dominia-Blocca
         create_ip_block: Crear regules por IP
         create_unavailable_domain: Crear Dominia Índisponibil
         create_user_role: Crear roles
         demote_user: Demoer Usator
         destroy_announcement: Deleter proclamation
-        destroy_canonical_email_block: Deleter Email-Blocca
         destroy_custom_emoji: Deleter Customisat Emoji
         destroy_domain_allow: Deleter Dominia-Permisse
         destroy_domain_block: Deleter Dominia-Blocca
-        destroy_email_domain_block: Deleter Email-Dominia-Blocca
         destroy_instance: Purgar Dominia
         destroy_ip_block: Deleter regul por IP
         destroy_status: Deleter Posta
@@ -200,10 +191,8 @@ ie:
         destroy_user_role: Destructer Rol
         disable_2fa_user: Desactivisar 2FA
         disable_custom_emoji: Desactivisar Customisat Emoji
-        disable_sign_in_token_auth_user: Desactivisar autentication per email-claves por usator
         disable_user: Desactivisar Usator
         enable_custom_emoji: Activisar Customisat Emoji
-        enable_sign_in_token_auth_user: Activisar autentication per email-claves por usator
         enable_user: Activisar Usator
         memorialize_account: Memorialisar Conto
         promote_user: Promoer Usator
@@ -232,26 +221,20 @@ ie:
         approve_appeal_html: "%{name} aprobat li apelle de %{target} contra un decision de moderation"
         approve_user_html: "%{name} aprobat li registration de %{target}"
         assigned_to_self_report_html: "%{name} assignat raporte %{target} a su self"
-        change_email_user_html: "%{name} changeat li email-adresse de usator %{target}"
         change_role_user_html: "%{name} changeat li rol de %{target}"
-        confirm_user_html: "%{name} confirmat li email-adresse de usator %{target}"
         create_account_warning_html: "%{name} dat un admoniment a %{target}"
         create_announcement_html: "%{name} creat li nov proclamation %{target}"
-        create_canonical_email_block_html: "%{name} bloccat email con li hash %{target}"
         create_custom_emoji_html: "%{name} cargat nov emoji %{target}"
         create_domain_allow_html: "%{name} permisset federation con dominia %{target}"
         create_domain_block_html: "%{name} bloccat dominia %{target}"
-        create_email_domain_block_html: "%{name} bloccat email-dominia %{target}"
         create_ip_block_html: "%{name} creat regul por IP %{target}"
         create_unavailable_domain_html: "%{name} haltat liveration a dominia %{target}"
         create_user_role_html: "%{name} creat li rol %{target}"
         demote_user_html: "%{name} demoet li usator %{target}"
         destroy_announcement_html: "%{name} deletet li proclamation %{target}"
-        destroy_canonical_email_block_html: "%{name} desbloccat email con li hash %{target}"
         destroy_custom_emoji_html: "%{name} deletet emoji %{target}"
         destroy_domain_allow_html: "%{name} interdictet federation con dominia %{target}"
         destroy_domain_block_html: "%{name} desbloccat dominia %{target}"
-        destroy_email_domain_block_html: "%{name} desbloccat email-dominia %{target}"
         destroy_instance_html: "%{name} purgat dominia %{target}"
         destroy_ip_block_html: "%{name} deletet regul por IP %{target}"
         destroy_status_html: "%{name} removet posta de %{target}"
@@ -259,10 +242,8 @@ ie:
         destroy_user_role_html: "%{name} deletet li rol %{target}"
         disable_2fa_user_html: "%{name} desactivisat 2-factor postulation por li usator %{target}"
         disable_custom_emoji_html: "%{name} desactivisat emoji %{target}"
-        disable_sign_in_token_auth_user_html: "%{name} desactivisat autentication per email-clave por %{target}"
         disable_user_html: "%{name} desactivisat li abilitá de %{target} a intrar"
         enable_custom_emoji_html: "%{name} activisat emoji %{target}"
-        enable_sign_in_token_auth_user_html: "%{name} activisat autentication per email-clave por %{target}"
         enable_user_html: "%{name} activisat li abilitá de %{target} a intrar"
         memorialize_account_html: "%{name} fat li conto de %{target} un págine de memorial"
         promote_user_html: "%{name} promoet li usator %{target}"
@@ -270,7 +251,6 @@ ie:
         reject_user_html: "%{name} rejectet li registration de %{target}"
         remove_avatar_user_html: "%{name} removet li avatar de %{target}"
         reopen_report_html: "%{name} reapertet raporte %{target}"
-        resend_user_html: "%{name} remisset un confirmation-email a %{target}"
         reset_password_user_html: "%{name} reiniciat li passa-parol del usator %{target}"
         resolve_report_html: "%{name} soluet raporte %{target}"
         sensitive_account_html: "%{name} marcat li medie de %{target} quam sensitiv"
@@ -429,7 +409,6 @@ ie:
       attempts_over_week:
         one: "%{count} registration-prova durant li ultim semane"
         other: "%{count} registration-prova durant li ultim semane"
-      created_msg: Successosimen bloccat email-dominia
       delete: Deleter
       dns:
         types:
@@ -438,12 +417,8 @@ ie:
       new:
         create: Adjunter dominia
         resolve: Resolver un dominia
-        title: Bloccar nov email-dominia
-      no_email_domain_block_selected: Null email-dominia-bloccas esset changeat pro que null esset selectet
       not_permitted: Ne permisset
-      resolved_dns_records_hint_html: Li dominia-nómine resolue se al seque dominias MX, queles es in fine responsabil por acceptar e-posta. Bloccar un dominia MX va bloccar inscriptiones de quelcunc e-posta quel usa li sam dominia MX, mem si li visibil dominia-nómine es diferent. <strong>Esse caut e ne blocca majori provisores de e-posta.</strong>
       resolved_through_html: Resoluet per %{domain}
-      title: Bloccat email-dominias
     export_domain_allows:
       new:
         title: Importar permisset dominias
@@ -594,7 +569,6 @@ ie:
         resolve_description_html: Null action va esser fat contra li raportat conto, null admoniment registrat, e li raporte va esser cludet.
         silence_description_html: Li conto va esser visibil nur a tis qui ja seque it o qui sercha it manualmen, limitante severimen su atingement. Ti sempre posse esser revertet. Ti clude omni raportes contra ti conto.
         suspend_description_html: Ti-ci conto e omni contenete va esser ínaccessibil e finalmen deletet, e interacter con it va esser ínpossibil. Reversibil til que 30 dies ha passat. Clude omni raportes contra ti conto.
-      actions_description_html: Decider quel action a far por soluer ti raporte. Si tu fa un punitiv action contra li raportat conto, li usator va reciver un notification per email, except in li casu que li <strong>Spam</strong> categorie es selectet.
       actions_description_remote_html: Decider quel action a far por soluer ti raporte. It va afecter solmen qualmen <strong>vor</strong> servitor comunica con ti lontan conto e tractar su contenete.
       add_to_report: Adjunter plu al raporte
       already_suspended_badges:
@@ -658,7 +632,6 @@ ie:
         delete_data_html: Deleter li profil e contenete de <strong>@%{acct}</strong> 30 dies pos nu, except si ilu es dessuspendet ante tande
         preview_preamble_html: "<strong>@%{acct}</strong> va reciver un admoniment con li sequent contenete:"
         record_strike_html: Registrar un admoniment contra <strong>@%{acct}</strong> por auxiliar vos tractar futur violationes de ti-ci conto
-        send_email_html: Misser un admoniment-email a <strong>@%{acct}</strong>
         warning_placeholder: Ínobligatori additional rason por li moderatori action.
       target_origin: Orígine del conto raportat
       title: Raportes
@@ -698,7 +671,6 @@ ie:
         manage_appeals: Gerer Apelles
         manage_appeals_description: Permisse que usatores inspecte apelles contra actiones de moderatores
         manage_blocks: Gerer Bloccas
-        manage_blocks_description: Permisse que usatores blocca provisores de e-posta e IP-adresses
         manage_custom_emojis: Gerer Customisat Emojis
         manage_custom_emojis_description: Permisse que usatores gere customisat emojis sur li servitor
         manage_federation: Gerer Federation
@@ -716,7 +688,6 @@ ie:
         manage_taxonomies: Gerer Taxonomies
         manage_taxonomies_description: Permisse que usatores inspecte contenete de tendentie e actualisar parametres de hashtags
         manage_user_access: Gerer Usator-Accesse
-        manage_user_access_description: Permisse usatores desactivisar li 2-factor autentication de altri usatores, changear lor email-adresses, e reiniciar lor passa-paroles
         manage_users: Gerer usatores
         manage_users_description: Permisse que usatores vide detallies de altri usatores e fa actiones de moderation contra les
         manage_webhooks: Gerer Webcrocs
@@ -791,7 +762,6 @@ ie:
       destroyed_msg: Cargat file successosimen deletet!
     software_updates:
       critical_update: Critic — ples actualisar rapidmen
-      description: On recomanda que vu actualisa vor Mastodon-servitor regularimen por profiter del max recent fixes e facultates. In plu, quelcvez it es critic actualisar Mastodon promptmen por evitar problemas de securitá. Pro ti rasones, Mastodon questiona chascun 30 minutes ca hay actualisationes, e va notificar vos secun vor parametres pri email-notificationes.
       documentation_link: Aprender plu
       release_notes: Version-notas
       title: Actualisationes disponibil
@@ -943,7 +913,6 @@ ie:
         used_by_over_week:
           one: Usat de un person durant li ultim semane
           other: Usat de %{count} persones durant li ultim semane
-      title: Tendenties
       trending: Populari
     warning_presets:
       add_new: Adjunter un nov
@@ -1027,9 +996,7 @@ ie:
       guide_link_text: Omnes posse contribuer.
     sensitive_content: Sensitiv contenete
   application_mailer:
-    notification_preferences: Changear parametres pri email
     salutation: "%{name},"
-    settings: 'Changear parametres pri email: %{link}'
     unsubscribe: Desabonnar
     view: 'Vider:'
     view_profile: Vider profil
@@ -1049,7 +1016,6 @@ ie:
       hint_html: Just un cose plu! Noi deve confirmar que tu es homan (por que noi posse impedir li spam!). Solue li CAPTCHA in-infra e clicca "Avansar".
       title: Control de securitá
     confirmations:
-      awaiting_review: Tui email-adresse es confirmat! Li personale de %{domain} nu va tractar tui registration. Tu va reciver un email si ili aproba tui conto!
       awaiting_review_title: On tracta tui registration
       clicking_this_link: cliccar ti-ci ligament
       login_link: intrar
@@ -1057,7 +1023,6 @@ ie:
       redirect_to_app_html: Tu deve har esset redirectet al aplication <strong>%{app_name}</strong>. Si to ne evenit, prova %{clicking_this_link} o retornar manualmen al aplication.
       registration_complete: Tu ha completat tui registration che %{domain}!
       welcome_title: Benevenit, %{name}!
-      wrong_email_hint: Si ti email-adresse ne es corect, tu posse changear it in li parametres de conto.
     delete_account: Deleter li conto
     delete_account_html: Si tu vole deleter tui conto, tu posse <a href="%{path}">proceder ci</a>. On va petir confirmation de te.
     description:
@@ -1078,7 +1043,6 @@ ie:
     or_log_in_with: O intrar med
     privacy_policy_agreement_html: Yo leet e consenti li <a href="%{privacy_policy_path}" target="_blank">politica pri privatie</a>
     progress:
-      confirm: Confirmar email
       details: Tui detallies
       review: Nor revise
       rules: Acceptar regules
@@ -1100,10 +1064,8 @@ ie:
     security: Securitá
     set_new_password: Establisser nov passa-parol
     setup:
-      email_below_hint_html: Vider tui spam-emails, o petir un altre. Tu posse corectar tui email-adresse si it es íncorect.
       email_settings_hint_html: Clicca li ligament quel noi inviat a te por verificar %{email}. Noi va atender ci.
       link_not_received: Recivet null ligament?
-      new_confirmation_instructions_sent: Tu va reciver un nov email con li ligament de confirmation in quelc minutes!
       title: Vider tui inbuxe
     sign_in:
       preamble_html: Aperter session med tui <strong>%{domain}</strong> detallies. Si tui conto logia che un diferent servitor, tu ne va posser intrar ci.
@@ -1114,9 +1076,7 @@ ie:
       title: Crear un conto che %{domain}.
     status:
       account_status: Statu del conto
-      confirming: Atendent li confirmation del email-adresse.
       functional: Tui conto es completmen functional.
-      pending: Tu conto atende tractation de nor personale. Ti fórsan va durar quelc témpor. Tu va reciver un email si tui aplication es aprobat.
       redirecting_to: Tui conto es ínactiv pro que it actualmen redirecte a %{acct}.
       self_destruct: Pro que %{domain} va cluder bentost, tu have solmen limitat accesse a tui conto.
       view_strikes: Vide anteyan admonimentes contra tui conto
@@ -1159,9 +1119,6 @@ ie:
       before: 'Ante proceder, ples leer ti notas cuidosimen:'
       caches: Contenete quel ha esset inmagasinat de altri servitores fórsan va persister
       data_removal: Tui postas e altri data va esser permanentmen removet
-      email_change_html: Tui posse <a href="%{path}">changear tui email-adresse</a> sin deleter tui conto
-      email_contact_html: Si ancor it ne ariva, tu posse inviar un email a <a href="mailto:%{email}">%{email}</a> por auxilie
-      email_reconfirmation_html: Si tu ne recive li confirmation-email, tu posse <a href="%{path}">solicita it denov</a>
       irreversible: Tu ne va posser restaurar o reactivisar tui conto
       more_details_html: Por plu mult detallies, vide li <a href="%{terms_path}">politica pri privatie</a>.
       username_available: Tui usator-nómine va retornar a esser disponibil
@@ -1394,7 +1351,6 @@ ie:
     authentication_methods:
       otp: aplication de 2-factor autentication
       password: passa-parol
-      sign_in_token: code de securitá per email
       webauthn: claves de securitá
     description_html: Si tu vide activitá quel tu ne conosse, considera changear tui passa-parol e activisar 2-factor autentication.
     empty: Null historie de autentication disponibil
@@ -1405,16 +1361,6 @@ ie:
     unsubscribe:
       action: Yes, desabonnar
       complete: Desabonnat
-      confirmation_html: Esque tu vermen vole desabonnar de reciver %{type} por Mastodon che %{domain} a tui email-adresse %{email}? Tu sempre posse reabonnar per tui <a href="%{settings_path}">parametres pri email-notificationes</a>.
-      emails:
-        notification_emails:
-          favourite: email-notificationes pri favoritisationes
-          follow: email-notificationes pri seques
-          follow_request: email-notificationes pri seque-petitiones
-          mention: email-notificationes pri mentiones
-          reblog: email-notificationes pri boosts
-      resubscribe_html: Si tu ha desabonnat errarimen, tu posse reabonnar per tui <a href="%{settings_path}">parametres pri email-notificationes</a>.
-      success_html: Tu ne plu va reciver %{type} por Mastodon che %{domain} a tui email-adresse %{email}.
       title: Desabonnar
   media_attachments:
     validations:
@@ -1495,8 +1441,6 @@ ie:
     update:
       subject: "%{name} modificat un posta"
   notifications:
-    administration_emails: Email-notificationes pri administration
-    email_events: Evenimentes por email-notificationes
     email_events_hint: 'Selecte li evenimentes pri queles tu vole reciver notificationes:'
   number:
     human:
@@ -1655,7 +1599,6 @@ ie:
     import: Importar
     import_and_export: Importation e exportation
     migrate: Migration de conto
-    notifications: E-postal notificationes
     preferences: Preferenties
     profile: Public profil
     relationships: Sequetes e sequitores
@@ -1902,7 +1845,6 @@ ie:
     invalid_otp_token: Ínvalid 2-factor code
     otp_lost_help_html: Si tu perdit accesse a ambis, tu posse contacter %{email}
     rate_limited: Tro mult de provas de autentication, ples provar denov plu tard.
-    seamless_external_login: Tu ha intrat per un servicie external, dunc parametres pri tui passa-parol e email-adresse ne es disponibil.
     signed_in_as: 'Session apertet quam:'
   verification:
     extra_instructions_html: '<strong>Nota</strong>: Li ligament in tui websitu posse esser ínvisibil. Li important parte es <code>rel="me"</code> quel prevente fals self-identification in websitus con contenete generat de usatores. Tu posse mem usar un <code>link</code> element in li cap-section del págine vice <code>a</code>, ma li HTML code deve esser accessibil sin executer JavaScript.'
diff --git a/config/locales/io.yml b/config/locales/io.yml
index bccdcb3cc5c33b..a1d268b9fa6643 100644
--- a/config/locales/io.yml
+++ b/config/locales/io.yml
@@ -31,7 +31,6 @@ io:
       created_msg: Jernoto sucesoze kreesis!
       destroyed_msg: Jernoto sucesoze efacesis!
     accounts:
-      add_email_domain_block: Obstruktez retpostodomeno
       approve: Aprobez
       approved_msg: Sucesoze aprobis registroapliko di %{username}
       are_you_sure: Ka tu esas certa?
@@ -58,7 +57,6 @@ io:
       demote: Despromocez
       destroyed_msg: Informi di %{username} nun aranjesis por efacesar aparante
       disable: Frostigez
-      disable_sign_in_token_auth: Desaktivigez retpostofichyurizeso
       disable_two_factor_authentication: Desaktivigez 2FA
       disabled: Desinterdiktita
       display_name: Profilnomo
@@ -67,7 +65,6 @@ io:
       email: E-mail
       email_status: Retpostostando
       enable: Defrostigez
-      enable_sign_in_token_auth: Aktivigez retpostofichyurizeso
       enabled: Aktivigita
       enabled_msg: Sucesoze desfrostigas konto di %{username}
       followers: Uzanti
@@ -132,7 +129,6 @@ io:
       resubscribe: Riabonez
       role: Rolo
       search: Trovez
-      search_same_email_domain: Altra uzanti kun sama retpostodomeno
       search_same_ip: Altra uzanti kun sama IP
       security: Sekureso
       security_measures:
@@ -173,26 +169,21 @@ io:
         approve_appeal: Aprobez apelo
         approve_user: Aprobez uzanto
         assigned_to_self_report: Taskigez raporto
-        change_email_user: Chanjez retposto por uzanto
         change_role_user: Chanjez rolo di uzanto
         confirm_user: Konfirmez uzanto
         create_account_warning: Kreez averto
         create_announcement: Kreez anunco
-        create_canonical_email_block: Kreez domenobstrukto
         create_custom_emoji: Kreez kustumizita emocimajo
         create_domain_allow: Kreez domenpermiso
         create_domain_block: Kreez domenobstrukto
-        create_email_domain_block: Kreez retpostodomenobstrukto
         create_ip_block: Kreez IP-regulo
         create_unavailable_domain: Kreez nedisponebla domeno
         create_user_role: Kreez rolo
         demote_user: Despromocez uzanto
         destroy_announcement: Efacez anunco
-        destroy_canonical_email_block: Efacez domenobstrukto
         destroy_custom_emoji: Efacez kustumizita emocimajo
         destroy_domain_allow: Efacez domenpermiso
         destroy_domain_block: Efacez domenobstrukto
-        destroy_email_domain_block: Efacez retpostodomenobstrukto
         destroy_instance: Efacez domeno
         destroy_ip_block: Efacez IP-regulo
         destroy_status: Efacez posto
@@ -200,10 +191,8 @@ io:
         destroy_user_role: Destruktez rolo
         disable_2fa_user: Desaktivigez 2FA
         disable_custom_emoji: Desaktivigez kustumizita emocimajo
-        disable_sign_in_token_auth_user: Desaktivigez retpostofichyurizo por uzanto
         disable_user: Desaktivigez uzanto
         enable_custom_emoji: Aktivigez kustumizita emocimajo
-        enable_sign_in_token_auth_user: Aktivigez retpostofichyurizo por uzanto
         enable_user: Aktivigez uzanto
         memorialize_account: Memorializez konto
         promote_user: Promocez uzanto
@@ -232,26 +221,20 @@ io:
         approve_appeal_html: "%{name} aprobis jerdecidapelo de %{target}"
         approve_user_html: "%{name} aprobis registro de %{target}"
         assigned_to_self_report_html: "%{name} taskigis raporto %{target} a su"
-        change_email_user_html: "%{name} chanjis retpostoadreso di uzanto %{target}"
         change_role_user_html: "%{name} chanjis rolo di %{target}"
-        confirm_user_html: "%{name} konfirmis retpostoadreso di uzanto %{target}"
         create_account_warning_html: "%{name} sendis averto a %{target}"
         create_announcement_html: "%{name} kreis nova anunco %{target}"
-        create_canonical_email_block_html: "%{name} obstruktis retpostodomeno %{target}"
         create_custom_emoji_html: "%{name} adchargis nova emocimajo %{target}"
         create_domain_allow_html: "%{name} permisis federato kun domeno %{target}"
         create_domain_block_html: "%{name} obstruktis domeno %{target}"
-        create_email_domain_block_html: "%{name} obstruktis retpostodomeno %{target}"
         create_ip_block_html: "%{name} kreis regulo por IP %{target}"
         create_unavailable_domain_html: "%{name} cesis sendo a domeno %{target}"
         create_user_role_html: "%{name} kreis rolo di %{target}"
         demote_user_html: "%{name} despromocis uzanto %{target}"
         destroy_announcement_html: "%{name} efacis anunco %{target}"
-        destroy_canonical_email_block_html: "%{name} obstruktis retpostodomeno %{target}"
         destroy_custom_emoji_html: "%{name} efacis emocimajo %{target}"
         destroy_domain_allow_html: "%{name} despermisis federato kun domeno %{target}"
         destroy_domain_block_html: "%{name} deobstruktis domeno %{target}"
-        destroy_email_domain_block_html: "%{name} deobstruktis retpostodomeno %{target}"
         destroy_instance_html: "%{name} efacis domeno %{target}"
         destroy_ip_block_html: "%{name} efacis regulo por IP %{target}"
         destroy_status_html: "%{name} efacis posto da %{target}"
@@ -259,10 +242,8 @@ io:
         destroy_user_role_html: "%{name} efacis rolo di %{target}"
         disable_2fa_user_html: "%{name} desaktivigis 2-faktorbezono por uzanto %{target}"
         disable_custom_emoji_html: "%{name} desaktivigis emocimajo %{target}"
-        disable_sign_in_token_auth_user_html: "%{name} desaktivigis retpostofichyurizo por %{target}"
         disable_user_html: "%{name} desaktivigis eniro por uzanto %{target}"
         enable_custom_emoji_html: "%{name} aktivigis emocimajo %{target}"
-        enable_sign_in_token_auth_user_html: "%{name} aktivigis retpostofichyurizo por %{target}"
         enable_user_html: "%{name} aktivigis eniro por uzanto %{target}"
         memorialize_account_html: "%{name} kauzigis konto di %{target} divenar memorialpagino"
         promote_user_html: "%{name} promocis uzanto %{target}"
@@ -270,7 +251,6 @@ io:
         reject_user_html: "%{name} refuzis registro de %{target}"
         remove_avatar_user_html: "%{name} efacis profilimajo de %{target}"
         reopen_report_html: "%{name} riapertis raporto %{target}"
-        resend_user_html: "%{name} risendis konfirmretposto por %{target}"
         reset_password_user_html: "%{name} richanjis pasvorto de uzanto %{target}"
         resolve_report_html: "%{name} rezolvis raporto %{target}"
         sensitive_account_html: "%{name} markizis medii di %{target} quale sentoza"
@@ -428,7 +408,6 @@ io:
       attempts_over_week:
         one: "%{count} probo de pos 1 week"
         other: "%{count} registroprobi de pos 1 week"
-      created_msg: Sucesoze obstruktis retpostodomeno
       delete: Efacez
       dns:
         types:
@@ -437,12 +416,8 @@ io:
       new:
         create: Insertez domeno
         resolve: Rezolvez domeno
-        title: Obstruktez nova retpostodomeno
-      no_email_domain_block_selected: Retpostodomenobstrukti ne chanjesis por ke nulo selektesis
       not_permitted: Ne permisata
-      resolved_dns_records_hint_html: Ca domennomo rezolvesas a ca MX-domeni, quale esas ultime responsanta por ganar retposto. Obstruktar MX-domeno obstruktos registri de irga retpostoadreso quo uzas sama MX-domeni, mem se la videbla domennomo esas diferanta. <strong>Sorgemez e ne obstruktez majora retpostositi.</strong>
       resolved_through_html: Rezolvesis tra %{domain}
-      title: Obstruktita retpostodomeni
     export_domain_allows:
       no_file: Nula dosiero selektesas
     export_domain_blocks:
@@ -591,7 +566,6 @@ io:
         resolve_description_html: Nulo agesos kontre raportizita konto, streko ne rekordizesos e raporto klozesos.
         silence_description_html: Konto esos videbla nur por personi qui ja sequas lo o manuale serchas lo, severe limitizante lua atingo. On sempre povas desfacar co. Klozas omna raporti kontra ca konto.
         suspend_description_html: Ca konto e omna kontenaji esos neacesebla e efacota, e interagar kun ol esos neposibla. Desfacebla dum 30 dii. Klozas omna raporti kontra ca konto.
-      actions_description_html: Decidez ago por rezolvar ca raporto. Se vu decidar puniso kontre raportizesis konto, retpostoavizo sendesos a ol, ecepte kande <strong>Spam</strong> kategorio selektesis.
       actions_description_remote_html: Selektez quo vu agos por solvar ca raporto. Co nur efektigos quale <strong>vua</strong> servilo komunikas kun ca fora konto e traktas lua kontenaji.
       add_to_report: Insertez pluse a raporto
       are_you_sure: Ka vu esas certa?
@@ -652,7 +626,6 @@ io:
         delete_data_html: Efacor la profilo e kontenaji di <strong>@%{acct}</strong> ye 30 dii de nun ecepte ke lu esus desrestrikita ante ta tempe
         preview_preamble_html: "<strong>@%{acct}</strong> recevos averto kun la sequanta kontenajo:"
         record_strike_html: Registrar punto kontra <strong>@%{acct}</strong> por helpar vu traktar futura reguloviolaci di ca konto
-        send_email_html: Sendez a <strong>@%{acct}</strong> avertala retposto
         warning_placeholder: Neobligata plusa expliko por la jero-ago.
       target_origin: Fonto di raportizita konto
       title: Raporti
@@ -691,7 +664,6 @@ io:
         manage_appeals: Jerez apeli
         manage_appeals_description: Permisez uzanti kontrolar apeli kontra jero
         manage_blocks: Jerez obstrukti
-        manage_blocks_description: Permisez uzanti obstruktar retpostoservilo e adresi di IP
         manage_custom_emojis: Jerez kustumizita emocimaji
         manage_custom_emojis_description: Permisez uzanti jerar kustumizita emocimaji en la servilo
         manage_federation: Jerez federo
@@ -709,7 +681,6 @@ io:
         manage_taxonomies: Jerez nomkategorii
         manage_taxonomies_description: Permisez uzanti kontrolar tendencoza kontenajo e novigar hashtagopcioni
         manage_user_access: Jerez uzantoeniro
-        manage_user_access_description: Permisez uzanti desaktivigar 2-faktoryurizeso di altra uzanti, chanjar olia retpostoadreso e richanjar olia pasvorto
         manage_users: Jerez uzanti
         manage_users_description: Permisez uzanti vidar detali di altra uzanti e jerar kontra oli
         manage_webhooks: Jerez interrethoki
@@ -779,7 +750,6 @@ io:
       destroyed_msg: Sitadchargito sucesoze efacesis!
     software_updates:
       critical_update: Urjanta — voluntez aktualigar rapide
-      description: On rekomendas ke vu sempre aktualigas vua Mastodon-instaluro por profitar la maxim nova solvuri e novaji. Pluse, kelkafoye es importantega aktualigar Mastodon rapide por evitar sekuresoproblemi. Pro ca motivi, Mastodon serchas aktualigi mihorale, e notifikos vu segun vua opcioni pri retposto-notifiki.
       documentation_link: Lernez pluse
       release_notes: Emiso-noti
       title: Aktualigi disponebla
@@ -921,7 +891,6 @@ io:
         used_by_over_week:
           one: Uzesis da 1 persono de pos 1 semano
           other: Uzesis da %{count} personi de pos 1 semano
-      title: Tendenci
       trending: Tendenco
     warning_presets:
       add_new: Insertez novo
@@ -1002,9 +971,7 @@ io:
       guide_link_text: Omnu povas kontributar.
     sensitive_content: Sentoza kontenajo
   application_mailer:
-    notification_preferences: Chanjez retpostopreferaji
     salutation: "%{name},"
-    settings: 'Chanjar la retpost-mesajala preferi: %{link}'
     unsubscribe: Desabonez
     view: 'Vidar:'
     view_profile: Videz profilo
@@ -1024,7 +991,6 @@ io:
       hint_html: Nur un plusa kozo! Ni postulas ke vu konfirmez ke vu esas homo (co es por ke ni povas preventar mesajachi!). Solvez la suba CAPTCHA e pulsez "Avancez".
       title: Sekuresokontrolo
     confirmations:
-      awaiting_review: Vua retpostadreso es konfirmita! La jeraro che %{domain} revuos vua apliko. Vu recevos retposto se li aprobas vua konto!
       awaiting_review_title: Vua apliko vartas revuo
       clicking_this_link: pulsante ca ligilo
       login_link: enirar
@@ -1032,7 +998,6 @@ io:
       redirect_to_app_html: Vu devas sendesir al apliko <strong>%{app_name}</strong>. Se to ne evenis, probez %{clicking_this_link} o retroirez manuale al apliko.
       registration_complete: Vua registrago che %{domain} nun es kompleta!
       welcome_title: Bonvenez, %{name}!
-      wrong_email_hint: Se ta retpostadreso ne es korekta, vu povas chanjar lo en la konto-opcioni.
     delete_account: Efacez konto
     delete_account_html: Se vu volas efacar vua konto, vu povas <a href="%{path}">irar hike</a>. Vu demandesos konfirmar.
     description:
@@ -1053,7 +1018,6 @@ io:
     or_log_in_with: O eniras per
     privacy_policy_agreement_html: Me lektis e konsentis <a href="%{privacy_policy_path}" target="_blank">privatesguidilo</a>
     progress:
-      confirm: Konfirmar retpostoadreso
       details: Vua detali
       review: Nia revuo
       rules: Aceptar reguli
@@ -1075,10 +1039,8 @@ io:
     security: Chanjar pasvorto
     set_new_password: Selektar nova pasvorto
     setup:
-      email_below_hint_html: Kontrolez vua spam-dosieruro, o demandez altra ligilo. Vu povas korektigar vua retpostadreso se esas nekorekta.
       email_settings_hint_html: Uzez la ligilo quan ni sendis a vu por verifikar %{email}. Ni vartos hike.
       link_not_received: Ka vu ne recevis ligilo?
-      new_confirmation_instructions_sent: Vu recevos nova retposto kun la konfirmligilo pos kelka minuti!
       title: Kontrolez vua retposti
     sign_in:
       preamble_html: Enirez per vua <strong>%{domain}</strong> detali. Se vua konto esas che altra servilo, vu ne povos enirar hike.
@@ -1089,9 +1051,7 @@ io:
       title: Ni komencigez vu en %{domain}.
     status:
       account_status: Kontostando
-      confirming: Vartas retpostokonfirmo finar.
       functional: Vua konto esas tote funcionoza.
-      pending: Vua apliko bezonas kontrolo da nia laborero. Co forsan esas nekurta. Vu ganos retposto se vua apliko aprobesas.
       redirecting_to: Vua konto esas neaktiva pro ke ol nun ridirektesos a %{acct}.
       self_destruct: Pro ke %{domain} balde klozos, vu havas nur aceso limitizata a vua konto.
       view_strikes: Videz antea streki kontre vua konto
@@ -1134,9 +1094,6 @@ io:
       before: 'Ante durar, lektez ca noti sorgeme:'
       caches: Kontenajo quo memoresis da altra servilo forsan restas
       data_removal: Vua posti e altra informi netempale efacesis
-      email_change_html: Vu povas <a href="%{path}">chanjar vua retpostoadreso</a> sen efacar vua konto
-      email_contact_html: Se ol ankore ne venas, vu povas retpostigar a <a href="mailto:%{email}">%{email}</a> por ganar helpo
-      email_reconfirmation_html: Se vu ne ganas konfirmretposto, vu povas <a href="%{path}">demandar itere</a>
       irreversible: Vu ne povos riganar o riaktivigar vua konto
       more_details_html: Por plu multa detali, videz <a href="%{terms_path}">privatesguidilo</a>.
       username_available: Vua uzantonomo divenos disponebla itere
@@ -1367,7 +1324,6 @@ io:
     authentication_methods:
       otp: 2-faktoryurizessoftwaro
       password: pasvorto
-      sign_in_token: retpostosekureskodexo
       webauthn: sekuresklefi
     description_html: Se vu vidas aktiveso quon vu ne rikonocas, konsiderez chanjar vua pasvorto e aktivigez 2-faktoryurizo.
     empty: Yurizeshistorio esas nedisponebla
@@ -1378,16 +1334,6 @@ io:
     unsubscribe:
       action: Yes, desabonez
       complete: Desabonita
-      confirmation_html: Ka vu esas certa ke vu volas desabonar de recevar %{type} por Mastodon che %{domain} a vua retpostoadreso %{email}? Vu sempre povas riabonar che vua <a href="%{settings_path}">opcioni pri restposto-notifiki</a>.
-      emails:
-        notification_emails:
-          favourite: notifiko-retposti pri favoriziti
-          follow: retposti pri sequo-notifiki
-          follow_request: retposti pri sequo-demandi
-          mention: retposti pri menciono-notifiki
-          reblog: retposti pri repeto-notifiki
-      resubscribe_html: Se vu desabonis eroroze, vu povas riabonar en vua <a href="%{settings_path}">opcioni pri retposto-notifiki</a>.
-      success_html: Vu ne plus recevos %{type} por Mastodon che %{domain} a vua retpostadreso %{email}.
       title: Desabonez
   media_attachments:
     validations:
@@ -1468,8 +1414,6 @@ io:
     update:
       subject: "%{name} modifikis posto"
   notifications:
-    administration_emails: Jerala retpostonotifiki
-    email_events: Eventi por retpostoavizi
     email_events_hint: 'Selektez eventi quon vu volas ganar avizi:'
   number:
     human:
@@ -1798,7 +1742,6 @@ io:
     follow_limit_reached: Vu ne povas sequar plu kam %{limit} personi
     invalid_otp_token: La dufaktora autentikigila kodexo ne esas valida
     otp_lost_help_html: Se vu perdas aceso de 2 konto, vu povas kontaktar kun %{email}
-    seamless_external_login: Vu enirar tra externa serveso, do pasvorto e retpostoopcioni ne esas disponebla.
     signed_in_as: 'Eniris quale:'
   verification:
     here_is_how: Yen quale
diff --git a/config/locales/is.yml b/config/locales/is.yml
index 4aa05fb10cde85..4da16a1ce93264 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -909,10 +909,16 @@ is:
     trends:
       allow: Leyfa
       approved: Samþykkt
+      confirm_allow: Ertu viss um að þú viljir leyfa valin merki?
+      confirm_disallow: Ertu viss um að þú viljir ekki leyfa valin merki?
       disallow: Ekki leyfa
       links:
         allow: Leyfa tengil
         allow_provider: Leyfa útgefanda
+        confirm_allow: Ertu viss um að þú viljir leyfa valda tengla?
+        confirm_allow_provider: Ertu viss um að þú viljir leyfa valdar þjónustur?
+        confirm_disallow: Ertu viss um að þú viljir ekki leyfa valda tengla?
+        confirm_disallow_provider: Ertu viss um að þú viljir ekki leyfa valdar þjónustur?
         description_html: Þetta eru tenglar/slóðir sem mikið er deilt af notendum sem netþjónninn þinn sér færslur frá. Þeir geta hjálpað notendunum þínu við að finna út hvað sé í gangi í heiminum. Engir tenglar birtast opinberlega fyrr en þú hefur samþykkt útgefanda þeirra. Þú getur líka leyft eða hafnað eintökum tenglum.
         disallow: Ekki leyfa tengil
         disallow_provider: Ekki leyfa útgefanda
@@ -936,6 +942,10 @@ is:
       statuses:
         allow: Leyfa færslu
         allow_account: Leyfa höfund
+        confirm_allow: Ertu viss um að þú viljir leyfa valdar stöður?
+        confirm_allow_account: Ertu viss um að þú viljir leyfa valda notendaaðganga?
+        confirm_disallow: Ertu viss um að þú viljir ekki leyfa valdar stöður?
+        confirm_disallow_account: Ertu viss um að þú viljir ekki leyfa valda notendaaðganga?
         description_html: Þetta eru færslur sem netþjónninn þinn veit að er víða deilt eða eru mikið sett í eftirlæti þessa stundina. Þær geta hjálpað nýjum sem eldri notendum þínum við að finna fleira fólk til að fylgjast með. Engar færslur birtast opinberlega fyrr en þú hefur samþykkt höfund þeirra og að viðkomandi höfundur leyfi að efni frá þeim sé notað í tillögur til annarra. Þú getur líka leyft eða hafnað eintökum færslum.
         disallow: Ekki leyfa færslu
         disallow_account: Ekki leyfa höfund
@@ -968,7 +978,7 @@ is:
         used_by_over_week:
           one: Notað af einum aðila síðustu vikuna
           other: Notað af %{count} aðilum síðustu vikuna
-      title: Tilhneiging
+      title: Meðmæli og vinsælt
       trending: Vinsælt
     warning_presets:
       add_new: Bæta við nýju
diff --git a/config/locales/it.yml b/config/locales/it.yml
index d552d08a45cab4..52fca95c394d81 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -31,7 +31,7 @@ it:
       created_msg: Nota di moderazione creata correttamente!
       destroyed_msg: Nota di moderazione distrutta correttamente!
     accounts:
-      add_email_domain_block: Blocca il dominio dell'email
+      add_email_domain_block: Blocca il dominio dell'e-mail
       approve: Approva
       approved_msg: Richiesta d'iscrizione di %{username} approvata correttamente
       are_you_sure: Sei sicuro?
@@ -58,7 +58,7 @@ it:
       demote: Retrocedi
       destroyed_msg: I dati di %{username} sono ora accodati per l'imminente eliminazione
       disable: Congela
-      disable_sign_in_token_auth: Disabilita l'autenticazione con token via email
+      disable_sign_in_token_auth: Disabilitare l'autenticazione del token e-mail
       disable_two_factor_authentication: Disabilita A2F
       disabled: Congelato
       display_name: Nome mostrato
@@ -67,7 +67,7 @@ it:
       email: Email
       email_status: Stato dell'email
       enable: Scongela
-      enable_sign_in_token_auth: Abilita l'autenticazione con token via email
+      enable_sign_in_token_auth: Abilitare l'autenticazione del token e-mail
       enabled: Abilitato
       enabled_msg: Il profilo di %{username} è stato scongelato correttamente
       followers: Seguaci
@@ -173,26 +173,26 @@ it:
         approve_appeal: Approva Ricorso
         approve_user: Approva Utente
         assigned_to_self_report: Assegna Segnalazione
-        change_email_user: Cambia l'Email per l'Utente
+        change_email_user: Cambia e-mail per l'utente
         change_role_user: Cambia il Ruolo per l'Utente
         confirm_user: Conferma l'Utente
         create_account_warning: Crea Avviso
         create_announcement: Crea Annuncio
-        create_canonical_email_block: Crea Blocco Email
+        create_canonical_email_block: Crea blocco e-mail
         create_custom_emoji: Crea Emoji Personalizzata
         create_domain_allow: Crea Dominio Consentito
         create_domain_block: Crea Blocco del Dominio
-        create_email_domain_block: Crea Blocco del Dominio Email
+        create_email_domain_block: Crea blocco del dominio e-mail
         create_ip_block: Crea regola IP
         create_unavailable_domain: Crea Dominio Non Disponibile
         create_user_role: Crea Ruolo
         demote_user: Retrocedi Utente
         destroy_announcement: Elimina Annuncio
-        destroy_canonical_email_block: Elimina Blocco Email
+        destroy_canonical_email_block: Elimina il blocco dell'e-mail
         destroy_custom_emoji: Elimina Emoji Personalizzata
         destroy_domain_allow: Elimina Dominio Consentito
         destroy_domain_block: Elimina Blocco del Dominio
-        destroy_email_domain_block: Elimina Blocco del Dominio Email
+        destroy_email_domain_block: Elimina il blocco del dominio e-mail
         destroy_instance: Elimina Dominio
         destroy_ip_block: Elimina regola IP
         destroy_status: Elimina Toot
@@ -200,10 +200,10 @@ it:
         destroy_user_role: Distruggi Ruolo
         disable_2fa_user: Disabilita A2F
         disable_custom_emoji: Disabilita Emoji Personalizzata
-        disable_sign_in_token_auth_user: Disabilita l'Autenticazione con Token via Email per l'Utente
+        disable_sign_in_token_auth_user: Disabilita l'autenticazione del token e-mail per l'utente
         disable_user: Disabilita l'Utente
         enable_custom_emoji: Abilita Emoji Personalizzata
-        enable_sign_in_token_auth_user: Abilita l'Autenticazione con Token via Email per l'Utente
+        enable_sign_in_token_auth_user: Abilita l'autenticazione del token e-mail per l'utente
         enable_user: Abilita l'Utente
         memorialize_account: Commemora Profilo
         promote_user: Promuovi Utente
@@ -233,26 +233,26 @@ it:
         approve_appeal_html: "%{name} ha approvato il ricorso sulla decisione di moderazione da %{target}"
         approve_user_html: "%{name} ha approvato l'iscrizione da %{target}"
         assigned_to_self_report_html: "%{name} ha assegnato a se stesso la segnalazione %{target}"
-        change_email_user_html: "%{name} ha modificato l'indirizzo email dell'utente %{target}"
+        change_email_user_html: "%{name} ha cambiato l'indirizzo e-mail dell'utente %{target}"
         change_role_user_html: "%{name} ha cambiato il ruolo di %{target}"
-        confirm_user_html: "%{name} ha confermato l'indirizzo email dell'utente %{target}"
+        confirm_user_html: "%{name} ha confermato l'indirizzo e-mail dell'utente %{target}"
         create_account_warning_html: "%{name} ha inviato un avviso a %{target}"
         create_announcement_html: "%{name} ha creato un nuovo annuncio %{target}"
-        create_canonical_email_block_html: "%{name} ha bloccato l'email con l'hash %{target}"
+        create_canonical_email_block_html: "%{name} ha bloccato l'e-mail con l'hash %{target}"
         create_custom_emoji_html: "%{name} ha caricato una nuova emoji %{target}"
         create_domain_allow_html: "%{name} ha consentito la federazione con il dominio %{target}"
         create_domain_block_html: "%{name} ha bloccato il dominio %{target}"
-        create_email_domain_block_html: "%{name} ha bloccato il dominio email %{target}"
+        create_email_domain_block_html: "%{name} ha bloccato il dominio e-mail %{target}"
         create_ip_block_html: "%{name} ha creato una regola per l'IP %{target}"
         create_unavailable_domain_html: "%{name} ha interrotto la consegna al dominio %{target}"
         create_user_role_html: "%{name} ha creato il ruolo %{target}"
         demote_user_html: "%{name} ha retrocesso l'utente %{target}"
         destroy_announcement_html: "%{name} ha eliminato l'annuncio %{target}"
-        destroy_canonical_email_block_html: "%{name} ha sbloccato l'email con l'hash %{target}"
+        destroy_canonical_email_block_html: "%{name} ha sbloccato l'e-mail con l'hash %{target}"
         destroy_custom_emoji_html: "%{name} ha eliminato l'emoji %{target}"
         destroy_domain_allow_html: "%{name} non ha consentito la federazione con il dominio %{target}"
         destroy_domain_block_html: "%{name} ha sbloccato il dominio %{target}"
-        destroy_email_domain_block_html: "%{name} ha sbloccato il dominio email %{target}"
+        destroy_email_domain_block_html: "%{name} ha sbloccato il dominio e-mail %{target}"
         destroy_instance_html: "%{name} ha eliminato il dominio %{target}"
         destroy_ip_block_html: "%{name} ha eliminato la regola per l'IP %{target}"
         destroy_status_html: "%{name} ha rimosso il toot di %{target}"
@@ -260,10 +260,10 @@ it:
         destroy_user_role_html: "%{name} ha eliminato il ruolo %{target}"
         disable_2fa_user_html: "%{name} ha disabilitato l'autenticazione a due fattori per l'utente %{target}"
         disable_custom_emoji_html: "%{name} ha disabilitato emoji %{target}"
-        disable_sign_in_token_auth_user_html: "%{name} ha disabilitato l'autenticazione con codice via email per %{target}"
+        disable_sign_in_token_auth_user_html: "%{name} ha disabilitato l'autenticazione del token e-mail per %{target}"
         disable_user_html: "%{name} ha disabilitato l'accesso per l'utente %{target}"
         enable_custom_emoji_html: "%{name} ha abilitato l'emoji %{target}"
-        enable_sign_in_token_auth_user_html: "%{name} ha abilitato l'autenticazione con codice via email per %{target}"
+        enable_sign_in_token_auth_user_html: "%{name} ha abilitato l'autenticazione del token e-mail per %{target}"
         enable_user_html: "%{name} ha abilitato l'accesso per l'utente %{target}"
         memorialize_account_html: "%{name} ha trasformato il profilo di %{target} in una pagina commemorativa"
         promote_user_html: "%{name} ha promosso l'utente %{target}"
@@ -271,7 +271,7 @@ it:
         reject_user_html: "%{name} ha rifiutato l'iscrizione da %{target}"
         remove_avatar_user_html: "%{name} ha rimosso l'avatar di %{target}"
         reopen_report_html: "%{name} ha riaperto la segnalazione %{target}"
-        resend_user_html: "%{name} ha reinviato l'email di conferma per %{target}"
+        resend_user_html: "%{name} ha inviato nuovamente l'e-mail di conferma per %{target}"
         reset_password_user_html: "%{name} ha ripristinato la password dell'utente %{target}"
         resolve_report_html: "%{name} ha risolto la segnalazione %{target}"
         sensitive_account_html: "%{name} ha contrassegnato il media di %{target} come sensibile"
@@ -432,7 +432,7 @@ it:
       attempts_over_week:
         one: "%{count} tentativo nell'ultima settimana"
         other: "%{count} tentativi di registrazione nell'ultima settimana"
-      created_msg: Dominio email aggiunto con successo alla lista nera
+      created_msg: Dominio e-mail bloccato con successo
       delete: Elimina
       dns:
         types:
@@ -441,12 +441,12 @@ it:
       new:
         create: Aggiungi dominio
         resolve: Risolvi dominio
-        title: Nuova voce della lista nera delle email
-      no_email_domain_block_selected: Nessun blocco di dominio di posta elettronica è stato modificato in quanto nessuno è stato selezionato
+        title: Blocca nuovo dominio e-mail
+      no_email_domain_block_selected: Nessun blocco di dominio e-mail è stato modificato poiché nessuno è stato selezionato
       not_permitted: Non consentito
-      resolved_dns_records_hint_html: Il nome di dominio si risolve ai seguenti domini MX, che sono in ultima analisi responsabili per l'accettazione di e-mail. Il blocco di un dominio MX bloccherà le iscrizioni da qualsiasi indirizzo e-mail che utilizza lo stesso dominio MX, anche se il nome di dominio visibile è diverso. <strong>Fai attenzione a non bloccare i principali provider di posta elettronica.</strong>
+      resolved_dns_records_hint_html: Il nome di dominio si risolve nei seguenti domini MX, che sono in ultima analisi responsabili dell'accettazione delle e-mail. Il blocco di un dominio MX bloccherà le registrazioni da qualsiasi indirizzo e-mail che utilizzi lo stesso dominio MX, anche se il nome di dominio visibile è diverso. <strong>Fai attenzione a non bloccare i principali provider di posta elettronica.</strong>
       resolved_through_html: Risolto attraverso %{domain}
-      title: Lista nera email
+      title: Domini e-mail bloccati
     export_domain_allows:
       new:
         title: Importare i permessi di dominio
@@ -600,7 +600,7 @@ it:
         resolve_description_html: Nessuna azione sarà intrapresa contro l'account segnalato, nessuna sanzione registrata, e la segnalazione sarà chiusa.
         silence_description_html: L'account sarà visibile solo a coloro che lo seguono o lo cercano manualmente, limitandone fortemente la raggiungibilità. Può sempre essere annullato. Chiude tutte le segnalazioni contro questo account.
         suspend_description_html: L'account e tutti i suoi contenuti saranno inaccessibili ed eventualmente cancellati, e interagire con esso sarà impossibile. Reversibile entro 30 giorni. Chiude tutte le segnalazioni contro questo account.
-      actions_description_html: Decidete quali azioni intraprendere per risolvere la segnalazione. Se si intraprende un'azione punitiva contro l'account segnalato, gli sarà inviata una notifica via e-mail, tranne quando è selezionata la categoria <strong>Spam</strong>.
+      actions_description_html: Decidi quale azione intraprendere per risolvere questa segnalazione. Se intraprendi un'azione punitiva nei confronti dell'account segnalato, gli verrà inviata una notifica via e-mail, tranne quando è selezionata la categoria <strong>Spam</strong>.
       actions_description_remote_html: Decide quali azioni intraprendere per risolvere la relazione. Questo influenzerà solo come <strong>il tuo</strong> server comunica con questo account remoto e ne gestisce il contenuto.
       add_to_report: Aggiungi altro al report
       already_suspended_badges:
@@ -705,7 +705,7 @@ it:
         manage_appeals: Gestisci appelli
         manage_appeals_description: Consente agli utenti di esaminare i ricorsi contro le azioni di moderazione
         manage_blocks: Gestisci Blocchi
-        manage_blocks_description: Consente agli utenti di bloccare provider e-mail e indirizzi IP
+        manage_blocks_description: Consente agli utenti di bloccare i provider di posta elettronica e gli indirizzi IP
         manage_custom_emojis: Gestisci emoji personalizzate
         manage_custom_emojis_description: Consente agli utenti di gestire emoji personalizzate sul server
         manage_federation: Gestisci Federazione
@@ -723,7 +723,7 @@ it:
         manage_taxonomies: Gestisci Tassonomie
         manage_taxonomies_description: Consente agli utenti di esaminare i contenuti di tendenza e aggiornare le impostazioni degli hashtag
         manage_user_access: Gestisci accesso utenti
-        manage_user_access_description: Consente agli utenti di disabilitare l'autenticazione a due fattori degli altri utenti, modificare il loro indirizzo e-mail e reimpostare la password
+        manage_user_access_description: Consente agli utenti di disattivare l'autenticazione a due fattori di altri utenti, modificare il loro indirizzo e-mail e reimpostare la loro password
         manage_users: Gestisci utenti
         manage_users_description: Consente agli utenti di visualizzare le informazioni sugli altri utenti ed eseguire azioni di moderazione contro di loro
         manage_webhooks: Gestisci Webhook
@@ -798,7 +798,7 @@ it:
       destroyed_msg: Caricamento sito eliminato!
     software_updates:
       critical_update: 'Critico: ti preghiamo di aggiornare rapidamente'
-      description: Si consiglia di mantenere aggiornata la tua installazione di Mastodon, per beneficiare delle ultime correzioni e funzionalità. Inoltre, talvolta, è cruciale aggiornare Mastodon tempestivamente, per evitare i problemi di sicurezza. Per questo, Mastodon verifica la presenza di aggiornamenti ogni 30 minuti e ti notificherà a seconda delle tue preferenze di notifica via email.
+      description: Si consiglia di mantenere aggiornata l'installazione di Mastodon per beneficiare delle ultime correzioni e funzionalità. Inoltre, a volte è fondamentale aggiornare Mastodon in modo tempestivo per evitare problemi di sicurezza. Per queste ragioni, Mastodon verifica la presenza di aggiornamenti ogni 30 minuti e ti avviserà in base alle tue preferenze di notifica e-mail.
       documentation_link: Scopri di più
       release_notes: Note di rilascio
       title: Aggiornamenti disponibili
@@ -907,10 +907,16 @@ it:
     trends:
       allow: Consenti
       approved: Approvato
+      confirm_allow: Si è sicuri di voler consentire i tag selezionati?
+      confirm_disallow: Si è sicuri di non voler consentire i tag selezionati?
       disallow: Non consentire
       links:
         allow: Consenti link
         allow_provider: Consenti editore
+        confirm_allow: Si è sicuri di voler consentire i link selezionati?
+        confirm_allow_provider: Si è sicuri di voler consentire i provider selezionati?
+        confirm_disallow: Si è sicuri di non voler consentire i link selezionati?
+        confirm_disallow_provider: Si è sicuri di non voler consentire i provider selezionati?
         description_html: Questi sono collegamenti che attualmente vengono molto condivisi dagli account di cui il server vede i post. Può aiutare i tuoi utenti a scoprire cosa sta succedendo nel mondo. Nessun link viene visualizzato pubblicamente finché non si approva chi lo pubblica. È anche possibile permettere o rifiutare i singoli collegamenti.
         disallow: Non consentire link
         disallow_provider: Non consentire editore
@@ -934,6 +940,10 @@ it:
       statuses:
         allow: Consenti post
         allow_account: Consenti autore
+        confirm_allow: Si è sicuri di voler consentire gli stati selezionati?
+        confirm_allow_account: Si è sicuri di voler consentire gli account selezionati?
+        confirm_disallow: Si è sicuri di non voler consentire gli stati selezionati?
+        confirm_disallow_account: Si è sicuri di non voler consentire gli account selezionati?
         description_html: Questi sono post noti al tuo server che sono attualmente molto condivisi e preferiti. Può aiutare i tuoi utenti (nuovi e non) a trovare più persone da seguire. Nessun post viene visualizzato pubblicamente fino a quando si approva l'autore, e l'autore permette che il suo account sia suggerito ad altri. È anche possibile permettere o rifiutare singoli post.
         disallow: Non consentire post
         disallow_account: Non consentire autore
@@ -966,7 +976,7 @@ it:
         used_by_over_week:
           one: Usato da una persona nell'ultima settimana
           other: Usato da %{count} persone nell'ultima settimana
-      title: Tendenze
+      title: Raccomandazioni e Tendenze
       trending: Di tendenza
     warning_presets:
       add_new: Aggiungi nuovo
@@ -1053,9 +1063,9 @@ it:
       guide_link_text: Tutti possono contribuire.
     sensitive_content: Contenuto sensibile
   application_mailer:
-    notification_preferences: Cambia preferenze email
+    notification_preferences: Modifica le preferenze e-mail
     salutation: "%{name},"
-    settings: 'Cambia le impostazioni per le email: %{link}'
+    settings: 'Modifica le preferenze e-mail: %{link}'
     unsubscribe: Disiscriviti
     view: 'Guarda:'
     view_profile: Mostra profilo
@@ -1075,7 +1085,7 @@ it:
       hint_html: Solamente un'altra cosa! Dobbiamo confermare che tu sia un essere umano (così possiamo tenere fuori lo spam!). Risolvi il CAPTCHA sottostante e fai clic su "Continua".
       title: Controllo di sicurezza
     confirmations:
-      awaiting_review: Il tuo indirizzo e-mail è confermato! Lo staff di %{domain} sta esaminando la tua registrazione. Riceverai una e-mail se il tuo account sarà approvato!
+      awaiting_review: Il tuo indirizzo e-mail è confermato! Lo staff di %{domain} ora sta esaminando la tua registrazione. Riceverai un'e-mail se dovessero approvare il tuo account!
       awaiting_review_title: La tua registrazione è in corso di revisione
       clicking_this_link: cliccando su questo link
       login_link: accedi
@@ -1126,7 +1136,7 @@ it:
     security: Credenziali
     set_new_password: Imposta una nuova password
     setup:
-      email_below_hint_html: Controlla la tua cartella spam o richiedine un altro. Puoi correggere il tuo indirizzo e-mail, se fosse sbagliato.
+      email_below_hint_html: Controlla la tua cartella spam o richiedine un'altra. Puoi correggere il tuo indirizzo e-mail, se è sbagliato.
       email_settings_hint_html: Fai clic sul link che ti abbiamo inviato per verificare %{email}. Aspetteremo proprio qui.
       link_not_received: Non hai ricevuto un link?
       new_confirmation_instructions_sent: Riceverai una nuova e-mail con il link di conferma entro pochi minuti!
@@ -1140,9 +1150,9 @@ it:
       title: Lascia che ti configuriamo su %{domain}.
     status:
       account_status: Stato dell'account
-      confirming: In attesa che la conferma e-mail sia completata.
+      confirming: In attesa del completamento dell'e-mail di conferma.
       functional: Il tuo profilo è completamente operativo.
-      pending: La tua richiesta è in attesa di esame da parte del nostro staff. Potrebbe richiedere un po' di tempo. Riceverai una e-mail se la richiesta è approvata.
+      pending: La tua richiesta è in attesa di revisione da parte del nostro staff. Potrebbe volerci del tempo. Riceverai un'e-mail se la tua richiesta verrà approvata.
       redirecting_to: Il tuo account è inattivo perché attualmente reindirizza a %{acct}.
       self_destruct: Poiché %{domain} sta chiudendo, otterrai solo un accesso limitato al tuo account.
       view_strikes: Visualizza le sanzioni precedenti prese nei confronti del tuo account
@@ -1186,8 +1196,8 @@ it:
       caches: Il contenuto che è stato memorizzato in cache da altri server può continuare ad esistere
       data_removal: I tuoi post e altri dati saranno eliminati definitivamente
       email_change_html: Puoi <a href="%{path}">cambiare il tuo indirizzo e-mail</a> senza cancellare il tuo account
-      email_contact_html: Se ancora non arriva, puoi mandare una mail a <a href="mailto:%{email}">%{email}</a> per chiedere aiuto
-      email_reconfirmation_html: Se non ricevi l'email di conferma, puoi <a href="%{path}">richiederla nuovamente</a>
+      email_contact_html: Se ancora non arriva, puoi inviare un'e-mail a <a href="mailto:%{email}">%{email}</a> per assistenza
+      email_reconfirmation_html: Se non ricevi l'e-mail di conferma, puoi <a href="%{path}">richiederla nuovamente</a>
       irreversible: Non potrai ripristinare o riattivare il tuo account
       more_details_html: Per maggiori dettagli, vedi la <a href="%{terms_path}">politica di privacy</a>.
       username_available: Il tuo nome utente sarà nuovamente disponibile
@@ -1420,7 +1430,7 @@ it:
     authentication_methods:
       otp: app per autenticazione a due fattori
       password: password
-      sign_in_token: codice di sicurezza via e-mail
+      sign_in_token: codice di sicurezza e-mail
       webauthn: chiavi di sicurezza
     description_html: Se vedi attività non riconosciuta, considera di cambiare la tua password e di abilitare l'autenticazione a due fattori.
     empty: Cronologia di autenticazione non disponibile
@@ -1431,16 +1441,16 @@ it:
     unsubscribe:
       action: Sì, annulla l'iscrizione
       complete: Iscrizione annullata
-      confirmation_html: Sei sicuro di voler annullare l'iscrizione alla ricezione di %{type} per Mastodon su %{domain} alla tua e-mail a %{email}? Puoi sempre iscriverti di nuovo dalle tue <a href="%{settings_path}">impostazioni di notifica via email</a>.
+      confirmation_html: Si è sicuri di voler annullare l'iscrizione per non ricevere %{type} per Mastodon su %{domain} sulla tua e-mail %{email}? Puoi sempre reiscriverti dalle tue <a href="%{settings_path}">impostazioni di notifica e-mail</a>.
       emails:
         notification_emails:
-          favourite: e-mai di notifica per i post apprezzati
-          follow: e-mail di notifica per chi inizia a seguirti
-          follow_request: e-mail di notifica per la richiesta di seguirti
-          mention: e-mail di notifica per le menzioni
+          favourite: e-mail di notifica preferite
+          follow: segui le e-mail di notifica
+          follow_request: segui le e-mail di richiesta
+          mention: menziona le e-mail di notifica
           reblog: e-mail di notifica per le condivisioni
-      resubscribe_html: Se hai annullato l'iscrizione per errore, puoi iscriverti di nuovo dalle tue <a href="%{settings_path}">impostazioni di notifica via email</a>.
-      success_html: Non riceverai più %{type} per Mastodon su %{domain} alla tua e-mail a %{email}.
+      resubscribe_html: Se hai annullato l'iscrizione per errore, puoi reiscriverti tramite le <a href="%{settings_path}">impostazioni di notifica e-mail</a>.
+      success_html: Non riceverai più %{type} per Mastodon su %{domain} al tuo indirizzo e-mail %{email}.
       title: Disiscriviti
   media_attachments:
     validations:
@@ -1521,8 +1531,8 @@ it:
     update:
       subject: "%{name} ha modificato un post"
   notifications:
-    administration_emails: Notifiche email amministratore
-    email_events: Eventi per notifiche via email
+    administration_emails: Notifiche e-mail dell'amministrazione
+    email_events: Eventi per notifiche e-mail
     email_events_hint: 'Seleziona gli eventi per i quali vuoi ricevere le notifiche:'
   number:
     human:
@@ -1928,7 +1938,7 @@ it:
     invalid_otp_token: Codice d'accesso non valido
     otp_lost_help_html: Se perdessi l'accesso ad entrambi, puoi entrare in contatto con %{email}
     rate_limited: Troppi tentativi di autenticazione, per favore riprova più tardi.
-    seamless_external_login: Hai effettuato l'accesso tramite un servizio esterno, quindi le impostazioni di password e e-mail non sono disponibili.
+    seamless_external_login: Hai effettuato l'accesso tramite un servizio esterno, pertanto le impostazioni relative alla password e all'e-mail non sono disponibili.
     signed_in_as: 'Hai effettuato l''accesso come:'
   verification:
     extra_instructions_html: <strong>Suggerimento:</strong> il collegamento sul tuo sito web può essere invisibile. La parte importante è <code>rel="me"</code> che impedisce l'impersonificazione su siti web con contenuti generati dagli utenti. Puoi anche usare un tag <code>link</code> nell'intestazione della pagina invece di <code>a</code>, ma l'HTML deve essere accessibile senza eseguire JavaScript.
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 0eeb055170ad3d..a6b4822c58623c 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -29,7 +29,6 @@ ja:
       created_msg: モデレーションメモを書き込みました！
       destroyed_msg: モデレーションメモを削除しました！
     accounts:
-      add_email_domain_block: メールドメインブロックに追加
       approve: 承認
       approved_msg: "%{username}さんの登録申請を承認しました"
       are_you_sure: 本当に実行しますか？
@@ -56,7 +55,6 @@ ja:
       demote: 降格
       destroyed_msg: "%{username}さんのデータは完全に削除されるよう登録されました"
       disable: 無効化
-      disable_sign_in_token_auth: メールトークン認証を無効にする
       disable_two_factor_authentication: 二要素認証を無効にする
       disabled: 無効
       display_name: 表示名
@@ -65,7 +63,6 @@ ja:
       email: メールアドレス
       email_status: メールアドレスの状態
       enable: 有効化
-      enable_sign_in_token_auth: メールトークン認証を有効にする
       enabled: 有効
       enabled_msg: "%{username}の無効化を解除しました"
       followers: フォロワー数
@@ -129,7 +126,6 @@ ja:
       resubscribe: 再講読
       role: ロール
       search: 検索
-      search_same_email_domain: 同じドメインのメールアドレスを使用しているユーザー
       search_same_ip: 同じIPのユーザーを検索
       security: 認証方法
       security_measures:
@@ -170,26 +166,21 @@ ja:
         approve_appeal: 抗議を承認
         approve_user: ユーザーの承認
         assigned_to_self_report: 通報の担当者に設定
-        change_email_user: ユーザーのメールアドレスを変更
         change_role_user: ユーザーのロールを変更
         confirm_user: ユーザーの確認
         create_account_warning: 警告を作成
         create_announcement: お知らせを作成
-        create_canonical_email_block: メールブロックを作成
         create_custom_emoji: カスタム絵文字を作成
         create_domain_allow: 連合を許可
         create_domain_block: ドメインブロックを作成
-        create_email_domain_block: メールドメインブロックを作成
         create_ip_block: IPルールを作成
         create_unavailable_domain: 配送できないドメインを作成
         create_user_role: ロールを作成
         demote_user: ユーザーを降格
         destroy_announcement: お知らせを削除
-        destroy_canonical_email_block: メールブロックを削除
         destroy_custom_emoji: カスタム絵文字を削除
         destroy_domain_allow: 連合許可を外す
         destroy_domain_block: ドメインブロックを削除
-        destroy_email_domain_block: メールドメインブロックを削除
         destroy_instance: ドメインをブロックする
         destroy_ip_block: IPルールを削除
         destroy_status: 投稿を削除
@@ -197,10 +188,8 @@ ja:
         destroy_user_role: ロールを削除
         disable_2fa_user: 二要素認証を無効化
         disable_custom_emoji: カスタム絵文字を無効化
-        disable_sign_in_token_auth_user: ユーザーのメールトークン認証を無効にする
         disable_user: ユーザーを無効化
         enable_custom_emoji: カスタム絵文字を有効化
-        enable_sign_in_token_auth_user: メールトークンのユーザー認証を有効にする
         enable_user: ユーザーを有効化
         memorialize_account: 追悼アカウント化
         promote_user: ユーザーを昇格
@@ -230,26 +219,20 @@ ja:
         approve_appeal_html: "%{name}さんが%{target}さんからの抗議を承認しました"
         approve_user_html: "%{name}さんが%{target}さんからの登録を承認しました"
         assigned_to_self_report_html: "%{name}さんが通報 %{target}を自身の担当に割り当てました"
-        change_email_user_html: "%{name}さんが%{target}さんのメールアドレスを変更しました"
         change_role_user_html: "%{name}さんが%{target}さんのロールを変更しました"
-        confirm_user_html: "%{name}さんが%{target}さんのメールアドレスを確認済みにしました"
         create_account_warning_html: "%{name}さんが%{target}さんに警告メールを送信しました"
         create_announcement_html: "%{name}さんが新しいお知らせ %{target}を作成しました"
-        create_canonical_email_block_html: "%{name} さんがハッシュ %{target} を持つメールをブロックしました。"
         create_custom_emoji_html: "%{name}さんがカスタム絵文字 %{target}を追加しました"
         create_domain_allow_html: "%{name}さんが%{target}の連合を許可しました"
         create_domain_block_html: "%{name}さんがドメイン %{target}をブロックしました"
-        create_email_domain_block_html: "%{name}さんが%{target}をメールドメインブロックに追加しました"
         create_ip_block_html: "%{name}さんがIP %{target}のルールを作成しました"
         create_unavailable_domain_html: "%{name}がドメイン %{target}への配送を停止しました"
         create_user_role_html: "%{name}さんがロール『%{target}』を作成しました"
         demote_user_html: "%{name}さんが%{target}さんを降格しました"
         destroy_announcement_html: "%{name}さんがお知らせ %{target}を削除しました"
-        destroy_canonical_email_block_html: "%{name} さんがハッシュ %{target} を持つメールのブロックを解除しました。"
         destroy_custom_emoji_html: "%{name}さんがカスタム絵文字『%{target}』を削除しました"
         destroy_domain_allow_html: "%{name}さんが%{target}の連合許可を外しました"
         destroy_domain_block_html: "%{name}さんがドメイン %{target}のブロックを外しました"
-        destroy_email_domain_block_html: "%{name}さんが%{target}をメールドメインブロックから外しました"
         destroy_instance_html: "%{name}さんがドメイン %{target}をブロックしました"
         destroy_ip_block_html: "%{name}さんが IP %{target}のルールを削除しました"
         destroy_status_html: "%{name}さんが%{target}さんの投稿を削除しました"
@@ -257,10 +240,8 @@ ja:
         destroy_user_role_html: "%{name}さんがロール『%{target}』を削除しました"
         disable_2fa_user_html: "%{name}さんが%{target}さんの二要素認証を無効化しました"
         disable_custom_emoji_html: "%{name}さんがカスタム絵文字 %{target}を無効化しました"
-        disable_sign_in_token_auth_user_html: "%{name}さんが%{target}さんのメールトークン認証を無効にしました"
         disable_user_html: "%{name}さんが%{target}さんのログインを無効化しました"
         enable_custom_emoji_html: "%{name}さんがカスタム絵文字 %{target}を有効化しました"
-        enable_sign_in_token_auth_user_html: "%{name}さんが%{target}さんのメールトークン認証を有効にしました"
         enable_user_html: "%{name}さんが%{target}さんのログインを有効化しました"
         memorialize_account_html: "%{name}さんが%{target}さんを追悼アカウントページに登録しました"
         promote_user_html: "%{name}さんが%{target}さんを昇格しました"
@@ -268,7 +249,6 @@ ja:
         reject_user_html: "%{name}さんが%{target}さんからの登録を拒否しました"
         remove_avatar_user_html: "%{name}さんが%{target}さんのアイコンを削除しました"
         reopen_report_html: "%{name}さんが通報 %{target}を未解決に戻しました"
-        resend_user_html: "%{name}さんが%{target}の確認メールを再送信しました"
         reset_password_user_html: "%{name}さんが%{target}さんのパスワードをリセットしました"
         resolve_report_html: "%{name}さんが通報 %{target}を解決済みにしました"
         sensitive_account_html: "%{name}さんが%{target}さんのメディアを閲覧注意にマークしました"
@@ -424,7 +404,6 @@ ja:
       allow_registrations_with_approval: 承認制での新規登録を可能にする
       attempts_over_week:
         other: 先週は%{count}回サインアップが試みられました
-      created_msg: メールドメインブロックに追加しました
       delete: 消去
       dns:
         types:
@@ -433,12 +412,8 @@ ja:
       new:
         create: ドメインを追加
         resolve: ドメイン解決
-        title: 新規メールドメインブロック
-      no_email_domain_block_selected: 何も選択されていないためメールドメインブロックを変更しませんでした
       not_permitted: 権限がありません
-      resolved_dns_records_hint_html: ドメイン名はDNSでMXドメインに名前解決され、最終的にメールを受け付ける役割を担います。目に見えるドメイン名が異なっていても、同じMXドメインを使用するメールアドレスからのアカウント登録がブロックされます。<strong>主要なメールプロバイダーをブロックしないように注意して下さい。</strong>
       resolved_through_html: "%{domain}を通して解決しました"
-      title: メールドメインブロック
     export_domain_allows:
       new:
         title: ドメイン許可をインポート
@@ -585,7 +560,6 @@ ja:
         resolve_description_html: 報告されたアカウントに対していかなる措置も取られず、ストライクも記録されず、報告は終了します。
         silence_description_html: このアカウントは、すでにフォローしている人、または手動で検索した人にしか見えないため、リーチが極端に制限されます。いつでも元に戻すことができます。このアカウントに対するすべての通報をクローズします。
         suspend_description_html: アカウントとそのすべての内容にアクセスできなくなり、最終的に削除され、やり取りは不可能になります。 30日以内であれば元に戻すことができます。このアカウントに対するすべての通報をクローズします。
-      actions_description_html: このレポートを解決するために取るアクションを決定します。 報告されたアカウントに対して懲罰的な措置を取った場合、メール通知が送信されますが<strong>スパム</strong>カテゴリが選択されている場合を除きます。
       actions_description_remote_html: この通報を解決するためのアクションを選択してください。これは<strong>あなたの</strong>サーバーがこのリモートアカウントと通信し、そのコンテンツを処理する時のみ影響します。
       add_to_report: 通報にさらに追加
       already_suspended_badges:
@@ -650,7 +624,6 @@ ja:
         delete_data_html: 停止が解除されないまま30日経過すると、<strong>@%{acct}</strong>さんのプロフィールとコンテンツは削除されます
         preview_preamble_html: "<strong>@%{acct}</strong>さんに次の内容の警告を通知します:"
         record_strike_html: 今後、<strong>@%{acct}</strong>さんが違反行為をしたときにエスカレーションできるように、このアカウントに対するストライクを記録します
-        send_email_html: "<strong>@%{acct}</strong>さんに警告メールを送信します"
         warning_placeholder: アクションを行使する追加の理由（オプション）
       target_origin: 報告されたアカウントの起源
       title: 通報
@@ -688,7 +661,6 @@ ja:
         manage_appeals: 抗議の管理
         manage_appeals_description: ユーザーはモデレーションアクションに対する抗議を確認できます
         manage_blocks: ブロックの管理
-        manage_blocks_description: ユーザーがメールプロバイダとIPアドレスをブロックできるようにします
         manage_custom_emojis: カスタム絵文字を管理
         manage_custom_emojis_description: ユーザーがサーバー上のカスタム絵文字を管理できるようにします
         manage_federation: 連合の管理
@@ -706,7 +678,6 @@ ja:
         manage_taxonomies: 分類の管理
         manage_taxonomies_description: トレンドコンテンツの確認とハッシュタグの設定の更新
         manage_user_access: アクセス権を管理
-        manage_user_access_description: 他のユーザーの2段階認証を無効にしたり、メールアドレスを変更したり、パスワードをリセットしたりすることができます。
         manage_users: ユーザーの管理
         manage_users_description: 他のユーザーの詳細情報を閲覧し、モデレーションを行うことができます。
         manage_webhooks: Webhookの管理
@@ -781,7 +752,6 @@ ja:
       destroyed_msg: ファイルを削除しました！
     software_updates:
       critical_update: "※緊急 (速やかに適用してください)"
-      description: Mastodonサーバーはいつでも最新の状態を保ち、新しい機能や修正を利用できるようにしておくことをおすすめします。またセキュリティの問題が発生した場合は、速やかにMastodonをアップデートすることが大切です。Mastodonは30分おきにアップデートを確認し、通知設定に応じて新しいアップデートをメールで通知します。
       documentation_link: もっと見る
       release_notes: リリースノート
       title: 利用可能なアップデート
@@ -930,7 +900,6 @@ ja:
         usage_comparison: 今日は%{today}回、昨日は%{yesterday}回使用されました。
         used_by_over_week:
           other: 週間%{count}人に使用されました
-      title: トレンド
       trending: トレンド
     warning_presets:
       add_new: 追加
@@ -1014,9 +983,7 @@ ja:
       guide_link_text: 誰でも参加することができます。
     sensitive_content: 閲覧注意コンテンツ
   application_mailer:
-    notification_preferences: メール設定の変更
     salutation: "%{name}さん"
-    settings: 'メール設定の変更: %{link}'
     unsubscribe: 購読解除
     view: 'リンク:'
     view_profile: プロフィールを表示
@@ -1036,7 +1003,6 @@ ja:
       hint_html: もう一つだけ！あなたが人間であることを確認する必要があります(スパムを防ぐためです！)。 以下のCAPTCHAを解き、「続ける」をクリックします。
       title: セキュリティチェック
     confirmations:
-      awaiting_review: メールアドレスが確認できました。%{domain} のスタッフが登録審査を行います。承認されたらメールでお知らせします！
       awaiting_review_title: 登録の審査待ちです
       clicking_this_link: このリンクを押す
       login_link: ログイン
@@ -1044,7 +1010,6 @@ ja:
       redirect_to_app_html: 自動的に<strong>%{app_name}</strong>に戻らなかった場合、%{clicking_this_link}か、手動でアプリを切り替えてください。
       registration_complete: "%{domain} へのアカウント登録が完了しました。"
       welcome_title: ようこそ、%{name}さん！
-      wrong_email_hint: メールアドレスが正しくない場合は、アカウント設定で変更できます。
     delete_account: アカウントの削除
     delete_account_html: アカウントを削除したい場合、<a href="%{path}">こちら</a>から手続きが行えます。削除する前に、確認画面があります。
     description:
@@ -1065,7 +1030,6 @@ ja:
     or_log_in_with: または次のサービスでログイン
     privacy_policy_agreement_html: <a href="%{privacy_policy_path}" target="_blank">プライバシーポリシー</a>を読み、同意します
     progress:
-      confirm: メールアドレスの確認
       details: ユーザー情報
       review: 承認
       rules: ルール
@@ -1087,10 +1051,8 @@ ja:
     security: セキュリティ
     set_new_password: 新しいパスワード
     setup:
-      email_below_hint_html: 確認メールが迷惑メールフォルダに振り分けられていないか確認してください。メールアドレスを間違えた場合は、ここでメールアドレスの変更と確認メールの再送ができます。
       email_settings_hint_html: メールに記載のリンクを開いて %{email} を確認してください。
       link_not_received: 確認メールを受信できない場合は
-      new_confirmation_instructions_sent: 確認用のリンクを記載した新しいメールを送信しました
       title: 確認メールを送信しました
     sign_in:
       preamble_html: "<strong>%{domain}</strong> の資格情報でサインインします。 あなたのアカウントが別のサーバーでホストされている場合は、ここでログインすることはできません。"
@@ -1101,9 +1063,7 @@ ja:
       title: さあ %{domain} でセットアップしましょう.
     status:
       account_status: アカウントの状態
-      confirming: メールアドレスの確認が完了するのを待っています。
       functional: アカウントは完全に機能しています。
-      pending: あなたの申請は現在サーバー管理者による審査待ちです。これにはしばらくかかります。申請が承認されるとメールが届きます。
       redirecting_to: アカウントは%{acct}に引っ越し設定されているため非アクティブになっています。
       self_destruct: "%{domain} は閉鎖されるため、今後このアカウントでは限られた操作しかできません。"
       view_strikes: 過去のストライクを表示
@@ -1146,9 +1106,6 @@ ja:
       before: '続行する前に、次の点を再度確認してください:'
       caches: 他のサーバーにコンテンツのキャッシュがずっと残る場合があります
       data_removal: あなたの投稿やその他のデータはこのサーバーから完全に削除されます
-      email_change_html: アカウントを削除しなくても<a href="%{path}">メールアドレスを変更</a>できます
-      email_contact_html: それでも届かない場合、<a href="mailto:%{email}">%{email}</a>までメールで問い合わせてください
-      email_reconfirmation_html: 確認のメールが届かない場合、<a href="%{path}">もう一度申請</a>できます。
       irreversible: 削除操作の撤回やアカウントの復活はできません
       more_details_html: 詳しくは<a href="%{terms_path}">プライバシーポリシー</a>をご覧ください。
       username_available: あなたのユーザー名は再利用できるようになります
@@ -1373,7 +1330,6 @@ ja:
     authentication_methods:
       otp: 二要素認証アプリ
       password: パスワード
-      sign_in_token: メールセキュリティコード
       webauthn: セキュリティキー
     description_html: 認識できないアクティビティが表示された場合は、パスワードの変更と二要素認証の有効化を検討してください。
     empty: 利用可能な認証履歴がありません
@@ -1384,16 +1340,6 @@ ja:
     unsubscribe:
       action: 購読を解除する
       complete: 購読を解除しました
-      confirmation_html: '%{domain} の Mastodon による %{email} への%{type}を購読解除しますか？ 再購読が必要になった場合は<a href="%{settings_path}">メール通知の設定</a>からいつでも再開できます。'
-      emails:
-        notification_emails:
-          favourite: お気に入り登録の通知メール
-          follow: フォロー通知メール
-          follow_request: フォローリクエスト通知メール
-          mention: 返信の通知メール
-          reblog: ブーストの通知メール
-      resubscribe_html: 間違って配信を停止した場合は、 <a href="%{settings_path}">メール通知設定</a>から再登録できます。
-      success_html: "%{domain} の Mastodon から %{email} への%{type}の配信が停止されました。"
       title: 購読の解除
   media_attachments:
     validations:
@@ -1474,8 +1420,6 @@ ja:
     update:
       subject: "%{name}さんが投稿を更新しました"
   notifications:
-    administration_emails: 管理にかかわるメール通知
-    email_events: メールによる通知
     email_events_hint: '受信する通知を選択:'
   number:
     human:
@@ -1634,7 +1578,6 @@ ja:
     import: データのインポート
     import_and_export: インポート・エクスポート
     migrate: アカウントの引っ越し
-    notifications: メール通知
     preferences: ユーザー設定
     profile: プロフィール
     relationships: フォロー・フォロワー
@@ -1874,7 +1817,6 @@ ja:
     invalid_otp_token: 二要素認証コードが間違っています
     otp_lost_help_html: どちらも使用できない場合、%{email}に連絡を取ると解決できるかもしれません
     rate_limited: 認証に失敗した回数が多すぎます。時間をおいてからログインしてください。
-    seamless_external_login: あなたは外部サービスを介してログインしているため、パスワードとメールアドレスの設定は利用できません。
     signed_in_as: '下記でログイン中:'
   verification:
     extra_instructions_html: <strong>ワンポイント:</strong> webサイト上のプロフィールへのリンクは表示上見えなくてもかまいません。重要な部分は <code>rel="me"</code> で、これはユーザーが自由にリンクを作成可能なサイトを悪用してなりすまされるのを防ぐための情報です。<code>a</code> タグを配置する代わりに <code>link</code> タグをHTMLヘッダーに挿入することでも認証が可能です。ただし、HTMLにはJavaScriptを使わなくてもアクセスできるようにしてください。
diff --git a/config/locales/ka.yml b/config/locales/ka.yml
index c92fd98a7cb4a4..97b56ea35cd5aa 100644
--- a/config/locales/ka.yml
+++ b/config/locales/ka.yml
@@ -134,13 +134,10 @@ ka:
       undo: უკუქცევა
     email_domain_blocks:
       add_new: ახლის დამატება
-      created_msg: ელ-ფოსტის დომენი წარმატებით დაემატა შავ სიას
       delete: გაუქმება
       domain: დომენი
       new:
         create: დომენის დამატება
-        title: ელ-ფოსტის ახალი შენატანი შავ სიაში
-      title: ელ-ფოსტის შავი სია
     instances:
       title: ცნობილი ინსტანციები
     invites:
@@ -203,8 +200,6 @@ ka:
       body_remote: ვიღაცამ %{domain}-იდან დაარეპორტა %{target}
       subject: ახალი რეპორტი %{instance} (#%{id})-ზე
   application_mailer:
-    notification_preferences: შეცვალეთ ელ-ფოსტის პრეფერნსიები
-    settings: 'შეცვალეთ ელ-ფოსტის პრეფერენსიები: %{link}'
     view: 'ჩვენება:'
     view_profile: პროფილის ჩვენება
     view_status: სტატუსის ჩვენება
@@ -475,5 +470,4 @@ ka:
   users:
     invalid_otp_token: არასწორი მეორე ფაქტორის კოდი
     otp_lost_help_html: თუ დაკარგეთ წვდომა ორივეზე, შესაძლოა დაუკავშირდეთ %{email}-ს
-    seamless_external_login: შესული ხართ გარე სერვისით, აქედან გამომდინარე პაროლი და ელ-ფოსტის მისამართი არაა ხელმისაწვდომი.
     signed_in_as: 'შესული ხართ როგორც:'
diff --git a/config/locales/kab.yml b/config/locales/kab.yml
index 28f2368dd94f42..b45450de046bb0 100644
--- a/config/locales/kab.yml
+++ b/config/locales/kab.yml
@@ -24,7 +24,6 @@ kab:
     account_moderation_notes:
       create: Eǧǧ tazmilt
     accounts:
-      add_email_domain_block: Sewḥel taɣult n yimayl
       approve: Qbel
       are_you_sure: Tetḥeqqeḍ?
       avatar: Tugna n umaɣnu
@@ -43,7 +42,6 @@ kab:
       deleted: Yettwakkes
       demote: Sider s weswir
       disable: Gdel
-      disable_sign_in_token_auth: Sens asesteb yebnan ɣef ujiṭun s yimayl
       disable_two_factor_authentication: Gdel 2FA
       disabled: Yensa
       display_name: Isem ara d-yettwaskanen
@@ -52,7 +50,6 @@ kab:
       email: Imayl
       email_status: Addad n imayl
       enable: Rmed
-      enable_sign_in_token_auth: Rmed asesteb yebnan ɣef ujiṭun s yimayl
       enabled: Yermed
       followers: Imeḍfaṛen
       follows: Yeṭafaṛ
@@ -100,7 +97,6 @@ kab:
       reset_password: Beddel awal uffir
       resubscribe: Ales ajerred
       search: Nadi
-      search_same_email_domain: Iseqdacen-nniḍen s yiwet n taɣult n yimayl
       search_same_ip: Imseqdacen-nniḍen s tansa IP am tinn-ik
       security: Taɣellist
       security_measures:
@@ -126,29 +122,24 @@ kab:
       whitelisted: Deg tebdert tamellalt
     action_logs:
       action_types:
-        change_email_user: Beddel imayl i useqdac
         confirm_user: Sentem aseqdac
         create_announcement: Rnu-d ulɣu
         create_custom_emoji: Rnu imujit udmawan
         create_domain_allow: Rnu-d taɣult yettusirgen
         create_domain_block: Rnu-d asewḥel n taɣult
-        create_email_domain_block: Rnu-d asewḥel n taɣult n yimayl
         create_ip_block: Rnu alugen n IP
         create_unavailable_domain: Rnu-d taɣult ur nelli ara
         destroy_announcement: Kkes ulɣu
         destroy_custom_emoji: Kkes imujit udmawan
         destroy_domain_allow: Kkes taɣult yettusirgen
         destroy_domain_block: Kkes asewḥel n taɣult
-        destroy_email_domain_block: Kkes asewḥel n taɣult n yimayl
         destroy_ip_block: Kkes alugen n IP
         destroy_status: Kkes tasufeɣt
         destroy_unavailable_domain: Kkes taɣult ur nelli ara
         disable_2fa_user: Gdel 2FA
         disable_custom_emoji: Sens imujit udmawan
-        disable_sign_in_token_auth_user: Sens asesteb yebnan ɣef ujiṭun s yimayl i useqdac
         disable_user: Sens aseqdac
         enable_custom_emoji: Rmed imujit udmawan
-        enable_sign_in_token_auth_user: Rmed asesteb yebnan ɣef ujiṭun s yimayl i useqdac
         enable_user: Rmed aseqdac
         promote_user: Aseqdac anmeggag
         remove_avatar_user: Kkes avaṭar
@@ -162,30 +153,24 @@ kab:
         update_status: Leqqem tasufeɣt
       actions:
         assigned_to_self_report_html: "%{name} imudd aneqqis %{target} i yiman-nsen"
-        change_email_user_html: "%{name} ibeddel tansa imayl n useqdac %{target}"
-        confirm_user_html: "%{name} isentem tansa imayl n useqdac %{target}"
         create_account_warning_html: "%{name} yuzen alɣu i %{target}"
         create_announcement_html: "%{name} yerna taselɣut tamaynut %{target}"
         create_custom_emoji_html: "%{name} yessuli-d imujiten imaynuten %{target}"
         create_domain_allow_html: "%{name} yerna taɣult %{target} ɣer tebdart tamellalt"
         create_domain_block_html: "%{name} yessewḥel taɣult %{target}"
-        create_email_domain_block_html: "%{name} yessewḥel taɣult n yimayl %{target}"
         create_ip_block_html: "%{name} yerna alugen i IP %{target}"
         create_unavailable_domain_html: "%{name} iseḥbes asiweḍ ɣer taɣult %{target}"
         demote_user_html: "%{name} iṣubb-d deg usellun aseqdac %{target}"
         destroy_announcement_html: "%{name} yekkes taselɣut %{target}"
         destroy_domain_allow_html: "%{name} yekkes taɣult %{target} seg tebdart tamellalt"
         destroy_domain_block_html: "%{name} yekkes aseḥbes n taɣult %{target}"
-        destroy_email_domain_block_html: "%{name} yekkes asewḥel i taɣult n imayl %{target}"
         destroy_ip_block_html: "%{name} yekkes alugen i IP %{target}"
         destroy_status_html: "%{name} yekkes tasufeɣt n %{target}"
         destroy_unavailable_domain_html: "%{name} yerra-d asiweḍ ɣer taɣult %{target}"
         disable_2fa_user_html: "%{name} yssens asesteb s snat n tarrayin i useqdac %{target}"
         disable_custom_emoji_html: "%{name} yessens imuji %{target}"
-        disable_sign_in_token_auth_user_html: "%{name} yessens asesteb yebnan ɣef ujiṭun s yimayl i %{target}"
         disable_user_html: "%{name} yessens tuqqna i useqdac %{target}"
         enable_custom_emoji_html: "%{name} yermed imuji %{target}"
-        enable_sign_in_token_auth_user_html: "%{name} yermed asesteb yebnan ɣef ujiṭun s yimayl i %{target}"
         enable_user_html: "%{name} yermed tuqqna i useqdac %{target}"
         memorialize_account_html: "%{name} yerra amiḍan n %{target} d asebter n usmekti"
         promote_user_html: "%{name} yerna deg usellun n useqdac %{target}"
@@ -280,8 +265,6 @@ kab:
       domain: Taɣult
       new:
         create: Rnu taɣult
-        title: Timerna n taɣult tamaynut n imayl ɣer tebdart taberkant
-      title: Tabdart taberkant n imayl
     export_domain_blocks:
       no_file: Ulac afaylu yettwafernen
     follow_recommendations:
@@ -510,7 +493,6 @@ kab:
     or_log_in_with: Neɣ eqqen s
     privacy_policy_agreement_html: Ɣriɣ yerna qebleɣ <a href="%{privacy_policy_path}" target="_blank">tasertit n tbaḍnit</a>
     progress:
-      confirm: Sentem imayl
       details: Isalli-inek
       review: Tamuɣli-nneɣ
       rules: Qbel ilugan
@@ -531,10 +513,8 @@ kab:
     security: Taɣellist
     set_new_password: Egr-d awal uffir amaynut
     setup:
-      email_below_hint_html: Ssefqed akaram-inek·inem n uspam neɣ ssuter wayeḍ. Tzemreḍ ad tesseɣtiḍ tansa-inek·inem imayl ma yella ur tṣeḥḥa ara.
       email_settings_hint_html: Sit ɣef useɣwen i ak-d-nceyyeε akken ad tesfeqdeḍ %{email}. Ad nerǧu da kan.
       link_not_received: Ur k-id-iṣaḥ ara wassaɣ ?
-      new_confirmation_instructions_sent: Ad d-teṭṭfeḍ imayl amaynut s useɣwen n usentem ssya ɣef kra n ddqayeq!
     sign_in:
       preamble_html: Kcem ar <strong>%{domain}</strong> s inekcam-inek n tuqqna. Ma yella yezga-d umiḍan-ik deg uqeddac-nniḍen, ur tezmireḍ ara ad tkecmeḍ sya.
       title: Akeččum ɣer %{domain}
@@ -677,7 +657,6 @@ kab:
   login_activities:
     authentication_methods:
       password: awal uffir
-      sign_in_token: tangalt n tɣellist n tansa imayl
       webauthn: tisura n tɣellist
   migrations:
     acct: Ibeddel ɣer
diff --git a/config/locales/kk.yml b/config/locales/kk.yml
index 2695127f0a782f..065cd801f70e20 100644
--- a/config/locales/kk.yml
+++ b/config/locales/kk.yml
@@ -191,13 +191,10 @@ kk:
       view: Домен блокын көрсету
     email_domain_blocks:
       add_new: Жаңасын қосу
-      created_msg: Қаратізімге email домені қосылды
       delete: Өшіру
       domain: Домен
       new:
         create: Add dоmain
-        title: New e-mail blаcklist entry
-      title: E-mail қаратізімі
     instances:
       by_domain: Domаin
       delivery_available: Жеткізу қол жетімді
@@ -320,8 +317,6 @@ kk:
     discovery: Пікірталас
     sensitive_content: Нәзік контент
   application_mailer:
-    notification_preferences: Change e-mail prеferences
-    settings: 'Change e-mail preferеnces: %{link}'
     view: 'Viеw:'
     view_profile: Viеw Profile
     view_status: Viеw status
@@ -356,8 +351,6 @@ kk:
     set_new_password: Жаңа құпиясөз қою
     status:
       account_status: Аккаунт статусы
-      confirming: Электрондық поштаны растау аяқталуын күтуде.
-      pending: Сіздің өтінішіңіз біздің қызметкерлеріміздің қарауында. Бұл біраз уақыт алуы мүмкін. Өтінішіңіз мақұлданса, сізге электрондық пошта хабарламасы келеді.
       redirecting_to: Сіздің есептік жазбаңыз белсенді емес, себебі ол %{acct} жүйесіне қайта бағытталуда.
   challenge:
     confirm: Жалғастыру
@@ -388,9 +381,6 @@ kk:
       before: 'Жұмысты бастамас бұрын, осы жазбаларды мұқият оқып шығыңыз:'
       caches: Басқа серверлер кэштеген мазмұн сақталуы мүмкін
       data_removal: Сіздің жазбаларыңыз және басқа деректеріңіз толығымен жойылады
-      email_change_html: Аккаунтыңызды жоймай-ақ <a href="%{path}"> электрондық пошта мекенжайын өзгертуге болады </a>
-      email_contact_html: Егер әлі келмесе, көмек үшін <a href="mailto:%{email}">%{email} </a> мекен-жайына хат жібере аласыз
-      email_reconfirmation_html: Егер сіз растау электрондық хатын алмасаңыз, сіз <a href="%{path}"> оны қайтадан сұрай аласыз </a>
       irreversible: Аккаунтты қалпына келтіре немесе қайта белсендіре алмайсыз
       more_details_html: Қосымша мәліметтер алу үшін <a href="%{terms_path}"> құпиялылық саясатын </a> қараңыз.
       username_available: Аккаунтыңыз қайтадан қолжетімді болады
@@ -536,7 +526,6 @@ kk:
       subject: "%{name} жазбаңызды бөлісті"
       title: Жаңа бөлісім
   notifications:
-    email_events: E-mail ескертпелеріне шаралар
     email_events_hint: 'Ескертпе болып келетін шараларды таңда:'
   number:
     human:
@@ -723,7 +712,6 @@ kk:
     follow_limit_reached: Сіз %{limit} лимитінен көп адамға жазыла алмайсыз
     invalid_otp_token: Қате екі-факторлы код
     otp_lost_help_html: Егер кіру жолдарын жоғалтып алсаңыз, сізге %{email} арқылы жіберіледі
-    seamless_external_login: Сыртқы сервис арқылы кіріпсіз, сондықтан құпиясөз және электрондық пошта параметрлері қол жетімді емес.
     signed_in_as: 'Былай кірдіңіз:'
   verification:
     verification: Растау
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 4d21a7dd3d092c..1cfcdcc0e61b5a 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -29,7 +29,6 @@ ko:
       created_msg: 중재 참고사항을 만들었습니다!
       destroyed_msg: 중재 참고사항을 지웠습니다!
     accounts:
-      add_email_domain_block: 이 이메일 도메인을 차단하기
       approve: 허가
       approved_msg: 성공적으로 %{username}의 가입 신청서를 승인했습니다
       are_you_sure: 확실합니까?
@@ -56,7 +55,6 @@ ko:
       demote: 강등
       destroyed_msg: "%{username}의 데이터는 곧 삭제되도록 대기열에 들어갔습니다"
       disable: 동결
-      disable_sign_in_token_auth: 이메일 토큰 인증 비활성화
       disable_two_factor_authentication: 2단계 인증을 비활성화
       disabled: 동결됨
       display_name: 표시되는 이름
@@ -65,7 +63,6 @@ ko:
       email: 이메일
       email_status: 이메일 상태
       enable: 동결 해제
-      enable_sign_in_token_auth: 이메일 토큰 인증 활성화
       enabled: 활성
       enabled_msg: "%{username}의 동결을 성공적으로 해제 했습니다."
       followers: 팔로워
@@ -129,7 +126,6 @@ ko:
       resubscribe: 다시 구독
       role: 역할
       search: 검색
-      search_same_email_domain: 같은 이메일 도메인을 가진 다른 사용자들
       search_same_ip: 같은 IP의 다른 사용자들
       security: 보안
       security_measures:
@@ -170,26 +166,21 @@ ko:
         approve_appeal: 이의제기 승인
         approve_user: 사용자 승인
         assigned_to_self_report: 신고 맡기
-        change_email_user: 사용자의 이메일 변경
         change_role_user: 사용자 역할 변경
         confirm_user: 사용자 확인
         create_account_warning: 경고 생성
         create_announcement: 공지사항 생성
-        create_canonical_email_block: 이메일 차단 생성
         create_custom_emoji: 커스텀 에모지 생성
         create_domain_allow: 도메인 허용 생성
         create_domain_block: 도메인 차단 추가
-        create_email_domain_block: 이메일 도메인 차단 생성
         create_ip_block: IP 규칙 만들기
         create_unavailable_domain: 사용 불가능한 도메인 생성
         create_user_role: 역할 생성
         demote_user: 사용자 강등
         destroy_announcement: 공지사항 삭제
-        destroy_canonical_email_block: 이메일 차단 삭제
         destroy_custom_emoji: 커스텀 에모지 삭제
         destroy_domain_allow: 도메인 허용 삭제
         destroy_domain_block: 도메인 차단 삭제
-        destroy_email_domain_block: 이메일 도메인 차단 삭제
         destroy_instance: 도메인 제거
         destroy_ip_block: IP 규칙 삭제
         destroy_status: 게시물 삭제
@@ -197,10 +188,8 @@ ko:
         destroy_user_role: 역할 삭제
         disable_2fa_user: 2단계 인증 비활성화
         disable_custom_emoji: 커스텀 에모지 비활성화
-        disable_sign_in_token_auth_user: 사용자에 대한 이메일 토큰 인증 비활성화
         disable_user: 사용자 비활성화
         enable_custom_emoji: 커스텀 에모지 활성화
-        enable_sign_in_token_auth_user: 사용자에 대한 이메일 토큰 인증 활성화
         enable_user: 사용자 활성화
         memorialize_account: 고인의 계정으로 전환
         promote_user: 사용자 승급
@@ -230,26 +219,20 @@ ko:
         approve_appeal_html: "%{name} 님이 %{target}의 중재 결정에 대한 이의 제기를 승인했습니다"
         approve_user_html: "%{name} 님이 %{target} 님의 가입을 승인했습니다"
         assigned_to_self_report_html: "%{name} 님이 신고 %{target}을 자신에게 할당했습니다"
-        change_email_user_html: "%{name} 님이 사용자 %{target} 님의 이메일 주소를 변경했습니다"
         change_role_user_html: "%{name} 님이 %{target} 님의 역할을 수정했습니다"
-        confirm_user_html: "%{name} 님이 사용자 %{target} 님의 이메일 주소를 승인했습니다"
         create_account_warning_html: "%{name} 님이 %{target}에게 경고를 보냈습니다"
         create_announcement_html: "%{name} 님이 새 공지 %{target}을 만들었습니다"
-        create_canonical_email_block_html: "%{name} 님이 %{target} 해시를 가진 이메일을 차단했습니다"
         create_custom_emoji_html: "%{name} 님이 새로운 에모지 %{target}를 업로드 했습니다"
         create_domain_allow_html: "%{name} 님이 %{target} 도메인을 허용리스트에 넣었습니다"
         create_domain_block_html: "%{name} 님이 도메인 %{target}를 차단했습니다"
-        create_email_domain_block_html: "%{name} 님이 이메일 도메인 %{target}를 차단했습니다"
         create_ip_block_html: "%{name} 님이 IP 규칙 %{target}을 만들었습니다"
         create_unavailable_domain_html: "%{name} 님이 도메인 %{target}에 대한 전달을 중지했습니다"
         create_user_role_html: "%{name} 님이 %{target} 역할을 생성했습니다"
         demote_user_html: "%{name} 님이 사용자 %{target} 님을 강등했습니다"
         destroy_announcement_html: "%{name} 님이 공지 %{target}을 삭제했습니다"
-        destroy_canonical_email_block_html: "%{name} 님이 %{target} 해시를 가진 이메일을 차단 해제했습니다"
         destroy_custom_emoji_html: "%{name} 님이 에모지 %{target}를 삭제했습니다"
         destroy_domain_allow_html: "%{name} 님이 %{target} 도메인과의 연합을 금지했습니다"
         destroy_domain_block_html: "%{name} 님이 도메인 %{target}의 차단을 해제했습니다"
-        destroy_email_domain_block_html: "%{name} 님이 이메일 도메인 %{target}을 차단 해제하였습니다"
         destroy_instance_html: "%{name} 님이 도메인 %{target}를 제거했습니다"
         destroy_ip_block_html: "%{name} 님이 IP 규칙 %{target}을 삭제하였습니다"
         destroy_status_html: "%{name} 님이 %{target} 님의 게시물을 삭제했습니다"
@@ -257,10 +240,8 @@ ko:
         destroy_user_role_html: "%{name} 님이 %{target} 역할을 삭제했습니다"
         disable_2fa_user_html: "%{name} 님이 사용자 %{target} 님의 2단계 인증을 비활성화 했습니다"
         disable_custom_emoji_html: "%{name} 님이 에모지 %{target}를 비활성화했습니다"
-        disable_sign_in_token_auth_user_html: "%{name} 님이 %{target} 님의 이메일 토큰 인증을 비활성화했습니다"
         disable_user_html: "%{name} 님이 사용자 %{target}의 로그인을 비활성화했습니다"
         enable_custom_emoji_html: "%{name} 님이 에모지 %{target}를 활성화했습니다"
-        enable_sign_in_token_auth_user_html: "%{name} 님이 %{target} 님의 이메일 토큰 인증을 활성화했습니다"
         enable_user_html: "%{name} 님이 사용자 %{target}의 로그인을 활성화했습니다"
         memorialize_account_html: "%{name} 님이 %{target}의 계정을 고인의 계정 페이지로 전환했습니다"
         promote_user_html: "%{name} 님이 사용자 %{target}를 승급시켰습니다"
@@ -268,7 +249,6 @@ ko:
         reject_user_html: "%{name} 님이 %{target} 님의 가입을 거부했습니다"
         remove_avatar_user_html: "%{name} 님이 %{target} 님의 아바타를 지웠습니다"
         reopen_report_html: "%{name} 님이 신고 %{target}을 다시 열었습니다"
-        resend_user_html: "%{name} 님이 %{target} 님에 대한 확인 메일을 다시 보냈습니다"
         reset_password_user_html: "%{name} 님이 사용자 %{target}의 암호를 초기화했습니다"
         resolve_report_html: "%{name} 님이 %{target}번 신고를 해결로 변경하였습니다"
         sensitive_account_html: "%{name} 님이 %{target}의 미디어를 민감함으로 표시했습니다"
@@ -426,7 +406,6 @@ ko:
       allow_registrations_with_approval: 승인을 통한 가입 허용
       attempts_over_week:
         other: 지난 주 동안 %{count}건의 가입 시도가 있었습니다
-      created_msg: 이메일 도메인 차단 규칙을 생성했습니다
       delete: 삭제하기
       dns:
         types:
@@ -435,12 +414,8 @@ ko:
       new:
         create: 도메인 추가하기
         resolve: 도메인 검사
-        title: 새 이메일 도메인 차단
-      no_email_domain_block_selected: 아무 것도 선택 되지 않아 어떤 이메일 도메인 차단도 변경되지 않았습니다
       not_permitted: 허용하지 않음
-      resolved_dns_records_hint_html: 도메인 네임은 다음의 MX 도메인으로 연결되어 있으며, 이메일을 받는데 필수적입니다. MX 도메인을 차단하면 같은 MX 도메인을 사용하는 어떤 이메일이라도 가입할 수 없게 되며, 보여지는 도메인이 다르더라도 적용됩니다. <strong>주요 이메일 제공자를 차단하지 않도록 조심하세요.</strong>
       resolved_through_html: "%{domain}을 통해 리졸빙됨"
-      title: Email 도메인 차단
     export_domain_allows:
       new:
         title: 도메인 허용 목록 불러오기
@@ -590,7 +565,6 @@ ko:
         resolve_description_html: 신고된 계정에 대해 아무런 동작도 취하지 않으며, 처벌기록이 남지 않으며, 신고는 처리됨으로 변경됩니다.
         silence_description_html: 이 계정을 이미 팔로우 하고 있는 사람이나 수동으로 찾아보는 사람에게만 프로필이 보여지고, 도달 범위를 엄격하게 제한합니다. 언제든지 되돌릴 수 있습니다. 이 계정에 대한 모든 신고를 닫습니다.
         suspend_description_html: 이 계정과 이 계정의 콘텐츠들은 접근 불가능해지고 삭제될 것이며, 상호작용은 불가능해집니다. 30일 이내에 되돌릴 수 있습니다. 이 계정에 대한 모든 신고를 닫습니다.
-      actions_description_html: 이 신고를 해결하기 위해 취해야 할 조치를 지정해주세요. 신고된 계정에 대해 처벌 조치를 취하면, <strong>스팸</strong> 카테고리가 선택된 경우를 제외하고 해당 계정으로 이메일 알림이 전송됩니다.
       actions_description_remote_html: 이 신고를 해결하기 위해 실행할 행동을 결정하세요. 이 결정은 이 원격 계정과 그 콘텐츠를 다루는 방식에 대해 <strong>이 서버</strong>에서만 영향을 끼칩니다
       add_to_report: 신고에 더 추가하기
       already_suspended_badges:
@@ -655,7 +629,6 @@ ko:
         delete_data_html: "<strong>@%{acct}</strong>의 프로필과 콘텐츠를 30일의 유예기간 이후에 삭제합니다"
         preview_preamble_html: "<strong>@%{acct}</strong>는 다음 내용의 경고를 받게 됩니다:"
         record_strike_html: 향후 규칙위반에 대한 참고사항이 될 수 있도록 <strong>@%{acct}</strong>에 대한 처벌기록을 남깁니다
-        send_email_html: "<strong>@%{acct}</strong>에게 경고 메일을 보냅니다"
         warning_placeholder: 중재 결정에 대한 추가적인 이유.
       target_origin: 신고된 계정의 소속
       title: 신고
@@ -693,7 +666,6 @@ ko:
         manage_appeals: 이의제기 관리
         manage_appeals_description: 사용자가 중재에 대한 이의제기를 리뷰할 수 있도록 허용
         manage_blocks: 차단 관리
-        manage_blocks_description: 사용자가 이메일 제공자와 IP 주소를 차단할 수 있도록 허용
         manage_custom_emojis: 커스텀 에모지 관리
         manage_custom_emojis_description: 사용자가 서버의 커스텀 에모지를 관리할 수 있도록 허용
         manage_federation: 연합 관리
@@ -711,7 +683,6 @@ ko:
         manage_taxonomies: 분류 관리
         manage_taxonomies_description: 사용자가 트렌드를 리뷰하고 해시태그 설정을 수정할 수 있도록 허용합니다
         manage_user_access: 사용자 접근 관리
-        manage_user_access_description: 사용자가 다른 사용자의 2차 인증을 비활성화 하거나, 이메일 주소를 바꾸거나, 암호를 초기화 할 수 있도록 허용
         manage_users: 사용자 관리
         manage_users_description: 사용자가 다른 사용자의 상세정보를 보고 해당 사용자에 대한 중재활동을 할 수 있도록 허용
         manage_webhooks: 웹훅 관리
@@ -786,7 +757,6 @@ ko:
       destroyed_msg: 사이트 업로드를 성공적으로 삭제했습니다!
     software_updates:
       critical_update: 긴급 — 빠른 업데이트 요망
-      description: 최신 수정 사항과 기능을 활용하기 위해 Mastodon 설치를 최신 상태로 유지하기를 권장합니다. 더욱이, 때로는 보안 문제를 피하기 위해 Mastodon을 적절한 시점에 긴급 업데이트해야 하는 경우도 있습니다. 따라서 Mastodon은 30분마다 업데이트를 확인하며, 이메일 알림 환경설정에 따라 사용자에게 알려드립니다.
       documentation_link: 더 알아보기
       release_notes: 릴리스 노트
       title: 사용 가능한 업데이트
@@ -951,7 +921,6 @@ ko:
         usage_comparison: 오늘은 %{today}회 쓰였고, 어제는 %{yesterday}회 쓰임
         used_by_over_week:
           other: 지난 주 동안 %{count} 명의 사람들이 사용했습니다
-      title: 유행
       trending: 유행 중
     warning_presets:
       add_new: 새로 추가
@@ -1035,9 +1004,7 @@ ko:
       guide_link_text: 누구나 기여할 수 있습니다.
     sensitive_content: 민감한 내용
   application_mailer:
-    notification_preferences: 메일 설정 변경
     salutation: "%{name} 님,"
-    settings: '메일 설정을 변경: %{link}'
     unsubscribe: 구독 해제
     view: '보기:'
     view_profile: 프로필 보기
@@ -1057,7 +1024,6 @@ ko:
       hint_html: 하나만 더! 당신이 사람인지 확인이 필요합니다 (스팸 계정을 거르기 위해서 필요한 과정입니다). 아래에 있는 CAPTCHA를 풀고 "계속"을 누르세요
       title: 보안 체크
     confirmations:
-      awaiting_review: 이메일 주소가 확인되었습니다! 이제 %{domain} 스태프가 가입을 검토할 것입니다. 계정이 승인되면 이메일을 받게 됩니다!
       awaiting_review_title: 가입 신청을 검토 중입니다
       clicking_this_link: 이 링크를 클릭
       login_link: 로그인
@@ -1065,7 +1031,6 @@ ko:
       redirect_to_app_html: 곧 <strong>%{app_name}</strong>으로 리디렉션 됩니다. 안 된다면, %{clicking_this_link}하거나 직접 앱으로 돌아가세요.
       registration_complete: 지금 막 %{domain} 가입이 완료되었습니다!
       welcome_title: "%{name} 님 반갑습니다!"
-      wrong_email_hint: 만약 이메일 주소가 올바르지 않다면, 계정 설정에서 수정할 수 있습니다.
     delete_account: 계정 삭제
     delete_account_html: 계정을 삭제하고 싶은 경우, <a href="%{path}">여기서</a> 삭제할 수 있습니다. 삭제 전 확인 화면이 표시됩니다.
     description:
@@ -1086,7 +1051,6 @@ ko:
     or_log_in_with: 다른 방법으로 로그인 하려면
     privacy_policy_agreement_html: <a href="%{privacy_policy_path}" target="_blank">개인정보처리방침</a>을 읽고 동의합니다
     progress:
-      confirm: 이메일 확인하기
       details: 세부사항
       review: 심사 결과
       rules: 규정을 수락합니다.
@@ -1108,10 +1072,8 @@ ko:
     security: 보안
     set_new_password: 새 암호 설정
     setup:
-      email_below_hint_html: 스팸 폴더를 체크해보거나, 이메일 주소를 틀렸을 수 있으니 새 확인 링크를 요청해보세요.
       email_settings_hint_html: "%{email}을 인증하기 위해 우리가 보낸 링크를 누르세요. 여기서 기다리겠습니다."
       link_not_received: 링크를 못 받으셨나요?
-      new_confirmation_instructions_sent: 확인 링크가 담긴 이메일이 몇 분 안에 도착할것입니다!
       title: 수신함 확인하기
     sign_in:
       preamble_html: "<strong>%{domain}</strong>의 계정 정보를 이용해 로그인 하세요. 만약 내 계정이 다른 서버에 존재한다면, 여기서는 로그인 할 수 없습니다."
@@ -1122,9 +1084,7 @@ ko:
       title: "%{domain}에 가입하기 위한 정보들을 입력하세요."
     status:
       account_status: 계정 상태
-      confirming: 이메일 확인 과정이 완료되기를 기다리는 중.
       functional: 계정이 완벽히 작동합니다.
-      pending: 당신의 가입 신청은 스태프의 검사를 위해 대기 중입니다. 시간이 조금 걸릴 수 있습니다. 가입 신청이 승인되면 이메일을 받게 됩니다.
       redirecting_to: 계정이 %{acct}로 리다이렉트 중이기 때문에 비활성 상태입니다.
       self_destruct: "%{domain} 도메인 폐쇄가 진행중이기 때문에, 계정에는 제한된 접근만 할 수 있습니다."
       view_strikes: 내 계정에 대한 과거 중재 기록 보기
@@ -1167,9 +1127,6 @@ ko:
       before: '진행하기 전, 주의사항을 꼼꼼히 읽어보세요:'
       caches: 다른 서버에 캐싱된 정보들은 남아있을 수 있습니다
       data_removal: 당신의 게시물과 다른 정보들은 영구적으로 삭제 됩니다
-      email_change_html: 계정을 지우지 않고도 <a href="%{path}">이메일 주소를 수정할 수 있습니다</a>
-      email_contact_html: 아직 도착하지 않았다면, <a href="mailto:%{email}">%{email}</a>에 메일을 보내 도움을 요청할 수 있습니다
-      email_reconfirmation_html: 아직 확인 메일이 도착하지 않은 경우, <a href="%{path}">다시 요청할 수 있습니다</a>
       irreversible: 계정을 복구하거나 다시 사용할 수 없게 됩니다
       more_details_html: 더 자세한 정보는, <a href="%{terms_path}">개인정보처리방침</a>을 참고하세요.
       username_available: 당신의 계정명은 다시 사용할 수 있게 됩니다
@@ -1394,7 +1351,6 @@ ko:
     authentication_methods:
       otp: 2단계 인증 앱
       password: 암호
-      sign_in_token: 이메일 보안 코드
       webauthn: 보안 키
     description_html: 확인되지 않은 활동이 보인다면, 암호를 바꾸거나 2단계 인증을 활성화 하는 것을 고려해 보세요.
     empty: 인증 이력이 존재하지 않습니다
@@ -1405,16 +1361,6 @@ ko:
     unsubscribe:
       action: 네, 구독 취소합니다
       complete: 구독 취소됨
-      confirmation_html: 정말로 %{domain}에서 %{email}로 보내는 마스토돈의 %{type}에 대한 구독을 취소하시겠습니까? 언제든지 <a href="%{settings_path}">이메일 알림 설정</a>에서 다시 구독할 수 있습니다.
-      emails:
-        notification_emails:
-          favourite: 좋아요 알림 이메일
-          follow: 팔로우 알림 이메일
-          follow_request: 팔로우 요청 알림 이메일
-          mention: 멘션 알림 이메일
-          reblog: 부스트 알림 이메일
-      resubscribe_html: 만약 실수로 구독 취소를 했다면 <a href="%{settings_path}">이메일 알림 설정</a>에서 다시 구독할 수 있습니다.
-      success_html: 이제 더이상 %{domain}에서 %{email}로 마스토돈의 %{type} 알림을 보내지 않습니다.
       title: 구독 취소
   media_attachments:
     validations:
@@ -1495,8 +1441,6 @@ ko:
     update:
       subject: "%{name} 님이 게시물을 수정했습니다"
   notifications:
-    administration_emails: 관리자 이메일 알림
-    email_events: 이메일 알림에 대한 이벤트
     email_events_hint: '알림 받을 이벤트를 선택해주세요:'
   number:
     human:
@@ -1655,7 +1599,6 @@ ko:
     import: 데이터 가져오기
     import_and_export: 가져오기 & 내보내기
     migrate: 계정 이동
-    notifications: 이메일 알림
     preferences: 환경설정
     profile: 공개 프로필
     relationships: 팔로잉과 팔로워
@@ -1895,7 +1838,6 @@ ko:
     invalid_otp_token: 2단계 인증 코드가 올바르지 않습니다
     otp_lost_help_html: 만약 양쪽 모두를 잃어버렸다면 %{email}을 통해 복구할 수 있습니다
     rate_limited: 너무 많은 인증 시도가 있었습니다, 잠시 후에 시도하세요.
-    seamless_external_login: 외부 서비스를 이용해 로그인했으므로 이메일과 암호는 설정할 수 없습니다.
     signed_in_as: '다음과 같이 로그인 중:'
   verification:
     extra_instructions_html: <strong>팁:</strong> 웹사이트에 안 보이는 링크로 삽입할 수 있습니다. 중요한 것은 나를 도용하는 것을 방지하는 <code>rel="me"</code> 부분입니다. 심지어 <code>a</code> 대신 <code>link</code>태그를 페이지 헤더에 넣는 것으로 대체할 수도 있습니다. 하지만 HTML 코드는 자바스크립트 실행 없이 접근이 가능해야 합니다.
diff --git a/config/locales/ku.yml b/config/locales/ku.yml
index c24337dd7c05ef..cbb6b76406c8d2 100644
--- a/config/locales/ku.yml
+++ b/config/locales/ku.yml
@@ -31,7 +31,6 @@ ku:
       created_msg: Nîşeyê moderator bi awayekî serkeftî hate afirandin!
       destroyed_msg: Nîşeyê moderator bi awayekî serkeftî hate tinne kirin!
     accounts:
-      add_email_domain_block: Navperê e-nameyê asteng bike
       approve: Bipejirîne
       approved_msg: Tomarkirina %{username} bi awayekî serkeftî hate pejirandin
       are_you_sure: Ma tu bawerî?
@@ -58,7 +57,6 @@ ku:
       demote: Ast daxistin
       destroyed_msg: Daneyên %{username} niha ket rêzê da yê demek nêz da were jêbirin
       disable: Qerisî ye
-      disable_sign_in_token_auth: E-name ya rastandina token neçalak bike
       disable_two_factor_authentication: 2FA ne çalak bike
       disabled: Qerisî ye
       display_name: Navê xuyangê
@@ -67,7 +65,6 @@ ku:
       email: E-name
       email_status: Rewşa E-nameyê
       enable: Çalak bike
-      enable_sign_in_token_auth: E-name ya rastandina token çalak bike
       enabled: Çalakkirî
       enabled_msg: Ajimêrê %{username} bi serkeftî hat çalakkirin
       followers: Şopîner
@@ -129,7 +126,6 @@ ku:
       resubscribe: Dîsa beşdar bibe
       role: Rol
       search: Bigere
-      search_same_email_domain: Bikarhênerên din ên bi heman navpera e-nameyê
       search_same_ip: Bikarhênerên din ên xwedî heman IP
       security_measures:
         only_password: Têne borînpeyv
@@ -169,26 +165,21 @@ ku:
         approve_appeal: Îtîrazê bipejirîne
         approve_user: Bikarhêner bipejirîne
         assigned_to_self_report: Ragihandinê diyar bike
-        change_email_user: E-nameya bikarhêner biguherîne
         change_role_user: Rola bikarhêner biguherîne
         confirm_user: Bikarhêner bipejirîne
         create_account_warning: Hişyariyekê çê bike
         create_announcement: Daxûyaniyekê çê bike
-        create_canonical_email_block: Astengkirina e-nameyê biafirîne
         create_custom_emoji: Emojiyên kesanekirî çê bike
         create_domain_allow: Navpera ku destûr standiye peyda bike
         create_domain_block: Astengkirina navperê biafirîne
-        create_email_domain_block: Astengkirina navpera e-nameyê biafirîne
         create_ip_block: Rêziknameya IPyê saz bike
         create_unavailable_domain: Navpera ku nayê bikaranîn pêk bîne
         create_user_role: Rolê biafirîne
         demote_user: Bikarhênerê kaşê jêr bike
         destroy_announcement: Daxûyanîyê jê bibe
-        destroy_canonical_email_block: Astengkirina e-nameyê jê bibe
         destroy_custom_emoji: Emojîya kesanekirî jê bibe
         destroy_domain_allow: Navperên mafdayî jê bibe
         destroy_domain_block: Navperên astengkirî jê bibe
-        destroy_email_domain_block: Navperên e-nameyê yên astengkirî jê bibe
         destroy_instance: Pakirina navperê
         destroy_ip_block: Tomara IPyê jêbibe
         destroy_status: Şandiyê jê bibe
@@ -196,10 +187,8 @@ ku:
         destroy_user_role: Rolê hilweşîne
         disable_2fa_user: 2FA neçalak bike
         disable_custom_emoji: Emojîya kesanekirî neçalak bike
-        disable_sign_in_token_auth_user: Ji bo bikarhênerê piştrastkirina navnîşana e-name yê ya token neçalak bike
         disable_user: Bikarhêner neçalak bike
         enable_custom_emoji: Emojîya kesanekirî çalak bike
-        enable_sign_in_token_auth_user: Ji bo bikarhênerê piştrastkirina navnîşana e-name yê ya token çalak bike
         enable_user: Bikarhêner çalak bike
         memorialize_account: Ajimêrê bike bîranînek
         promote_user: Bikarhêner pêş bixe
@@ -228,26 +217,20 @@ ku:
         approve_appeal_html: "%{name} îtiraza biryara çavdêriyê ji %{target} pejirand"
         approve_user_html: "%{name} tomarkirina ji %{target} pejirand"
         assigned_to_self_report_html: "%{name} ji xwe re ragihandinek %{target} hilda"
-        change_email_user_html: "%{name} navnîşana e-nameya bikarhêner %{target} guherand"
         change_role_user_html: "%{name} rolê %{target} guhert"
-        confirm_user_html: "%{name} navnîşana e-nameya bikarhêner %{target} piştrast kir"
         create_account_warning_html: "%{name} ji bo %{target} hişyariyek şand"
         create_announcement_html: "%{name} agahdarkirineke nû çêkir %{target}"
-        create_canonical_email_block_html: "%{name} bi riya dabeşkirinê e-nameya %{target} asteng kir"
         create_custom_emoji_html: "%{name} emojîyeke nû ya %{target} bar kir"
         create_domain_allow_html: "%{name} bi navperê %{target} re maf da demnameya giştî"
         create_domain_block_html: "%{name} navpera %{target} asteng kir"
-        create_email_domain_block_html: "%{name} e-nameya navperê %{target} asteng kir"
         create_ip_block_html: "%{name} ji bo IPya %{target} rêzikname saz kir"
         create_unavailable_domain_html: "%{name} bi navperê %{target} re gihandinê rawestand"
         create_user_role_html: "%{name} rola %{target} afirand"
         demote_user_html: "%{name} bikarhênerê %{target} kaşê jêr kir"
         destroy_announcement_html: "%{name} daxûyaniyeke %{target} jê bir"
-        destroy_canonical_email_block_html: "%{name} bi riya dabeşkirinê astengiya li ser e-nameya %{target} rakir"
         destroy_custom_emoji_html: "%{name} emojiya %{target} jê bir"
         destroy_domain_allow_html: "%{name} bi navperê %{target} re maf neda demnameya giştî"
         destroy_domain_block_html: "%{name} navpera %{target} asteng kir"
-        destroy_email_domain_block_html: "%{name} astengiya li ser navpera e-nameyê %{target} rakir"
         destroy_instance_html: "%{name} navpera %{target} asteng kir"
         destroy_ip_block_html: "%{name}, ji bo IPya %{target} rêziknameyê jêbir"
         destroy_status_html: "%{name} ji alîyê %{target} ve şandiyê rakir"
@@ -255,10 +238,8 @@ ku:
         destroy_user_role_html: "%{name} rola %{target} jê bir"
         disable_2fa_user_html: "%{name} ji bo bikarhênerê %{target} du faktorî neçalak kir"
         disable_custom_emoji_html: "%{name} emojiya %{target} neçalak kir"
-        disable_sign_in_token_auth_user_html: "%{name} ji bo %{target} nîşana mafdayîna e-nameya ne çalak kir"
         disable_user_html: "%{name} ji bo bikarhêner %{target} têketin neçalak kir"
         enable_custom_emoji_html: "%{name} emojiya %{target} çalak kir"
-        enable_sign_in_token_auth_user_html: "%{name} ji bo %{target} nîşana mafdayîna e-nameyê çalak kir"
         enable_user_html: "%{name} ji bo bikarhêner %{target} têketin çalak kir"
         memorialize_account_html: "%{name} ajimêra %{target} veguherand rûpeleke bîranînê"
         promote_user_html: "%{name} bikarhêner %{target} bilind kir"
@@ -266,7 +247,6 @@ ku:
         reject_user_html: "%{name} tomarkirina ji %{target} nepejirand"
         remove_avatar_user_html: "%{name} avatara bikarhêner %{target} rakir"
         reopen_report_html: "%{name} ragihandina %{target} ji nû ve vekir"
-        resend_user_html: "%{name} e-nameya pejirandinê dîsa bişîne ji bo %{target}"
         reset_password_user_html: "%{name} borînpeyva bikarhêner %{target} ji nû ve saz kir"
         resolve_report_html: "%{name} ragihandina %{target} çareser kir"
         sensitive_account_html: "%{name} medyayê %{target} wekî hestiyarî nîşan kir"
@@ -416,7 +396,6 @@ ku:
       attempts_over_week:
         one: "%{count} hewldana tomarkirinê di hefteya borî de"
         other: "%{count} hewldanên tomarkirinê di hefteya borî de"
-      created_msg: Bi serkeftî navpera e-name hate astengkirin
       delete: Jê bibe
       dns:
         types:
@@ -425,11 +404,7 @@ ku:
       new:
         create: Navper tevlî bike
         resolve: Navperê çareser bike
-        title: Navperê e-nameyê nû asteng bike
-      no_email_domain_block_selected: Tu astengkirnên navperê e-nameyê nehatin guhertin ji ber ku tu yek nehatine hilbijartin
-      resolved_dns_records_hint_html: Navê navperê ji MX ên jêrîn re çareser dike, ên ku di dawiyê de berpirsiyarin ji pejirandina e-nameyê. Astengkirina navperek MX wê tomarkirina ji her navnîşana e-nameyê ya ku heman navpera MX bi kar tîne asteng bike, tevlî ku navê navperê xuya cûda be. <strong>Hişyar be ku peydekarên sereke yên e-nameyê asteng nekî.</strong>
       resolved_through_html: Bi riya %{domain} ve hate çareserkirin
-      title: Navperên e-nameyê astengkirî
     export_domain_allows:
       new:
         title: Astengkirnên navperê têne
@@ -575,7 +550,6 @@ ku:
         mark_as_sensitive_description_html: Şandiyên hatine ragihandin wê werin nîşandan wekî hestyar û were tomarkirin da ku ji te re bibe alîkar ku tu ji hêla heman ajimêrê ve binpêkirinên pêşerojê bêtir bikî.
         other_description_html: Bêtir vebijêrkên ji bo kontrolkirina tevgera ajimêrê bibîne û pêwendiyê li ser ajimêra ragihandî kesane bike.
         resolve_description_html: Li hemberî ajimêra hatiye ragihandin wê tiştek pêk neyê, binpêkirin nayên tomarkirin û ragihandin wê were girtin.
-      actions_description_html: Ji bo çareserkirina vê ragihandinê biryar bide ka tê kîjan gav bavêjî. Ku tu li dijî ajimêrê ragihandî çalakiyeke cezakirinê bikî, ji bilî dema ku kategoriya <strong>Spam</strong> were hilbijartin, wê agahdariyek e-nameyê ji wan re were şandin.
       add_to_report: Bo ragihandinê bêtir tevlî bike
       are_you_sure: Gelo tu bawerî?
       assign_to_self: Bo min diyar bike
@@ -651,7 +625,6 @@ ku:
         manage_appeals: Îtîrazan bi rê ve bibe
         manage_appeals_description: Mafê dide bikarhêneran ku îtîrazan binirxînin li dijî çalakiyên çavdêriyê
         manage_blocks: Astengkirinan bi rê ve bibe
-        manage_blocks_description: Mafê dide bikarhêneran ku peydakarê e-nameyê û navnîşanên IP asteng bike
         manage_custom_emojis: Emojiyên kesane bi rêve bibe
         manage_custom_emojis_description: Mafê dide bikarhêneran ku îmojî kesane bikin li ser vê rajekarê
         manage_federation: Demnameya giştî bi rê ve bibe
@@ -669,7 +642,6 @@ ku:
         manage_taxonomies: Beşan bi rê ve bibe
         manage_taxonomies_description: Mafê dide bikarhêneran ku naveroka rojevê binirxînin û sazkariyên hashtagê rojane bikin
         manage_user_access: Gihiştinê bikarhêner bi rê ve bibe
-        manage_user_access_description: Mafê dide bikarhêneran ku piştrastkirina du-gavî ya bikarhênerên din neçalak bikin, navnîşana e-nameya xwe biguherînin û borînpeyva xwe ji nû ve bikin
         manage_users: Bikarhêneran bi rêve bibe
         manage_users_description: Mafê dide bikarhêneran ku hûrguliyên bikarhênerên din bibînin û li dijî wan kiryarên çavdêriyê çalakiyan pêk bînin
         manage_webhooks: Webhook bi rê ve bibe
@@ -842,7 +814,6 @@ ku:
         used_by_over_week:
           one: Di nava hefteya dawî de ji aliyê kesekî ve hatiye bikaranîn
           other: Di nava hefteya dawî de ji %{count} kes ve hatiye bikaranîn
-      title: Rojev
       trending: Rojev
     warning_presets:
       add_new: Yeka nû tevlî bike
@@ -917,9 +888,7 @@ ku:
       guide_link_text: Herkes dikare beşdar bibe.
     sensitive_content: Naveroka hestiyarî
   application_mailer:
-    notification_preferences: Sazkariyên e-nameyê biguherîne
     salutation: "%{name},"
-    settings: 'Sazkariyên e-nameyê biguherîne: %{link}'
     view: 'Nîşan bide:'
     view_profile: Profîlê nîşan bide
     view_status: Şandiyê nîşan bide
@@ -969,9 +938,7 @@ ku:
       title: Ka em te bi rê bixin li ser %{domain}.
     status:
       account_status: Rewşa ajimêr
-      confirming: Li benda pejirandina e-nameyê ne da ku biqede.
       functional: Ajimêra te êdî amade ye.
-      pending: Daxwaza te li benda vekolînê ji hêla xebatkarên me ye. Ev dibe ku hinek dem bigire. Ku daxwaza te were pejirandin tu yê e-nameyekê bistîne.
       redirecting_to: Ajimêra te neçalak e ji ber ku niha ber bi %{acct} ve tê beralîkirin.
       view_strikes: Binpêkirinên berê yên dijî ajimêrê xwe bibîne
     too_fast: Form pir zû hat şandin, dîsa biceribîne.
@@ -1013,9 +980,6 @@ ku:
       before: 'Berî ku tu pêşve biçî, jkx nvan nîşeyan bi baldarî bixwîne:'
       caches: Naveroka ku ji hêla rajekarên din ve hatiye pêşbîrkirin dibe ku bimîne
       data_removal: Şandiyên te û daneyên din wê bi awayekî dawî bêne rakirin
-      email_change_html: Tu dikarî navnîşana <a href="%{path}"> e-nameya xwe biguherînî </a> bêyî ku tu ajimêra xwe jê bibî
-      email_contact_html: Ku ew hîn jî negihîştiye, tu dikarî ji bo alîkariyê <a href="mailto:%{email}">%{email}</a> e-nameyê bişînî
-      email_reconfirmation_html: Ku te e-nameya pejirandinê nesitand, tu dikarî <a href="%{path}">dîsa daxwaz bike</a>
       irreversible: Tu yê nikaribe ajimêra xwe serrast bike an ji nû ve çalak bike
       more_details_html: Bo bêtir zanyarî, <a href="%{terms_path}">polîtika taybetiyê</a> binêre.
       username_available: Navê bikarhêneriyê te wê dîsa peyda bibe
@@ -1196,7 +1160,6 @@ ku:
     authentication_methods:
       otp: sepandina rastandina du-gavî
       password: borînpeyv
-      sign_in_token: koda ewlehiyê bo e-nameyê
       webauthn: kilîtên ewlehiyê
     description_html: Çalakiya ku nas nakî dibînî, çêtir dibe ku borînpeyva xwe biguherînî û rastandina du-gavî çalak bikî.
     empty: Dîroka piştrastkirinê tune ye
@@ -1282,7 +1245,6 @@ ku:
     update:
       subject: "%{name} şandiyek guhert"
   notifications:
-    email_events: Bûyer bo agahdariyên e-nameyê
     email_events_hint: 'Bûyera ku tu dixwazî agahdariyan jê wergerî hilbijêre:'
   number:
     human:
@@ -1593,7 +1555,6 @@ ku:
     follow_limit_reached: Tu nikarî zêdetirî %{limit} kesan bişopînî
     invalid_otp_token: Koda du-gavî ya nelê
     otp_lost_help_html: Ku te gihîştina herduyan ji dest da, dibe ku tu bi %{email} re têkilî deyne
-    seamless_external_login: Te bi rajekarke biyanî re têketina xwe kir, ji ber vê yekê borînpeyv û e-name nayê bikaranîn.
     signed_in_as: 'Têketin wekî:'
   verification:
     verification: Piştrastkirin
diff --git a/config/locales/lad.yml b/config/locales/lad.yml
index d0657e73f99efd..0267892fc804c6 100644
--- a/config/locales/lad.yml
+++ b/config/locales/lad.yml
@@ -31,7 +31,6 @@ lad:
       created_msg: Nota de moderasyon kriyada kon sukseso!
       destroyed_msg: Nota de moderasyon destruida kon sukseso!
     accounts:
-      add_email_domain_block: Bloka domeno de posta
       approve: Achetar
       approved_msg: La solisitasyon de enrejistrasyon de %{username} achetada djustamente
       are_you_sure: Estas siguro?
@@ -58,7 +57,6 @@ lad:
       demote: Degrada
       destroyed_msg: Los datos de %{username} estan agora en kola para ser supremir pishin
       disable: Inkapasita
-      disable_sign_in_token_auth: Inkapasita la autentifikasyon por token de posta elektronika
       disable_two_factor_authentication: Inkapasita autentifikasyon en dos pasos
       disabled: Inkapasitada
       display_name: Nombre amostrado
@@ -67,7 +65,6 @@ lad:
       email: Posta elektronika
       email_status: Estatus de posta
       enable: Kapasita
-      enable_sign_in_token_auth: Kapasita la autentifikasyon por token de posta elektronika
       enabled: Kapasitada
       enabled_msg: El kuento de %{username} fue kapasitado djustamente
       followers: Suivantes
@@ -132,7 +129,6 @@ lad:
       resubscribe: Reabona
       role: Rolo
       search: Bushka
-      search_same_email_domain: Otros utilizadores kon el mezmo domeno de posta
       search_same_ip: Otros utilizadores kon el mezmo adreso IP
       security: Sigurita
       security_measures:
@@ -173,26 +169,21 @@ lad:
         approve_appeal: Acheta apelasyon
         approve_user: Acheta utilizador
         assigned_to_self_report: Asinya raporto
-        change_email_user: Troka posta elektronika del utilizador
         change_role_user: Troka rolo de utilizador
         confirm_user: Konfirma utilizador
         create_account_warning: Kriya avertensya
         create_announcement: Kriya pregon
-        create_canonical_email_block: Kriya bloko de posta elektronika
         create_custom_emoji: Kriya emoji personalizado
         create_domain_allow: Kriya permiso de domeno
         create_domain_block: Kriya bloko de domeno
-        create_email_domain_block: Kriya bloko de domeno de posta
         create_ip_block: Kriya regla de IP
         create_unavailable_domain: Kriya domeno no desponivle
         create_user_role: Kriya rolo
         demote_user: Degrada utilizador
         destroy_announcement: Efasa pregon
-        destroy_canonical_email_block: Efasa bloko de posta elektronika
         destroy_custom_emoji: Efasa emoji personalizado
         destroy_domain_allow: Efasa permiso de domeno
         destroy_domain_block: Efasa bloko de domeno
-        destroy_email_domain_block: Efasa bloko de domeno de posta
         destroy_instance: Efasa domeno
         destroy_ip_block: Efasa regla de IP
         destroy_status: Efasa publikasyon
@@ -200,10 +191,8 @@ lad:
         destroy_user_role: Efasa rolo
         disable_2fa_user: Inkapasita autentifikasyon en dos pasos
         disable_custom_emoji: Inkapasita emoji personalizados
-        disable_sign_in_token_auth_user: Inkapasita la autentifikasyon por token de posta elektronika para el utilizador
         disable_user: Inkapasita utilizador
         enable_custom_emoji: Kapasita emoji personalizados
-        enable_sign_in_token_auth_user: Kapasita la autentifikasyon por token de posta para el utilizador
         enable_user: Kapasita utilizador
         memorialize_account: Transforma en kuento komemorativo
         promote_user: Promove utilizador
@@ -232,26 +221,20 @@ lad:
         approve_appeal_html: "%{name} acheto la solisitasyon de moderasyon de %{target}"
         approve_user_html: "%{name} acheto el enrejistramiento de %{target}"
         assigned_to_self_report_html: "%{name} asinyo el raporto %{target} a si mezmo"
-        change_email_user_html: "%{name} troko el adreso de posta elektronika del utilizador %{target}"
         change_role_user_html: "%{name} troko el rolo de %{target}"
-        confirm_user_html: "%{name} konfirmo el adreso de posta elektronika del utilizador %{target}"
         create_account_warning_html: "%{name} embio una avertensya a %{target}"
         create_announcement_html: "%{name} kriyo un muevo pregon %{target}"
-        create_canonical_email_block_html: "%{name} bloko la posta elektronika kon el hash %{target}"
         create_custom_emoji_html: "%{name} kargo el muevo emoji %{target}"
         create_domain_allow_html: "%{name} perimitio la federasyon kon el domeno %{target}"
         create_domain_block_html: "%{name} bloko el domeno %{target}"
-        create_email_domain_block_html: "%{name} bloko el domeno de posta elektronika %{target}"
         create_ip_block_html: "%{name} kriyo una regla para IP %{target}"
         create_unavailable_domain_html: "%{name} detuvo las entregas al domeno %{target}"
         create_user_role_html: "%{name} kriyo el rolo %{target}"
         demote_user_html: "%{name} degrado a %{target}"
         destroy_announcement_html: "%{name} supremio el pregon %{target}"
-        destroy_canonical_email_block_html: "%{name} dezbloko la posta elektronika kon el hash %{target}"
         destroy_custom_emoji_html: "%{name} supremio el emoji %{target}"
         destroy_domain_allow_html: "%{name} bloko la federasyon kon el domeno %{target}"
         destroy_domain_block_html: "%{name} dezbloko el domeno %{target}"
-        destroy_email_domain_block_html: "%{name} dezbloko el domeno de posta elektronika %{target}"
         destroy_instance_html: "\"%{name} purgo el domeno %{target}"
         destroy_ip_block_html: "%{name} supremio una regla para la IP %{target}"
         destroy_status_html: "%{name} supremio una publikasyon de %{target}"
@@ -259,10 +242,8 @@ lad:
         destroy_user_role_html: "%{name} supremio el rolo %{target}"
         disable_2fa_user_html: "%{name} dezaktivo el rekerimiento en dos pasos para el utilizador %{target}"
         disable_custom_emoji_html: "%{name} dezaktivo el emoji %{target}"
-        disable_sign_in_token_auth_user_html: "%{name} inkapasito la autentifikasyon por token de posta elektronika para %{target}"
         disable_user_html: "%{name} inkapasito la koneksion kon el kuento para el utilizador %{target}"
         enable_custom_emoji_html: "%{name} aktivo el emoji %{target}"
-        enable_sign_in_token_auth_user_html: "%{name} tiene kapasitado la autentifikasyon por token de posta elektronika para %{target}"
         enable_user_html: "%{name} kapasito koneksion kon kuento para el utilizador %{target}"
         memorialize_account_html: "%{name} konvirtio el kuento de %{target} en una pajina de bendicha memoria"
         promote_user_html: "%{name} promosyon al utilizador %{target}"
@@ -270,7 +251,6 @@ lad:
         reject_user_html: "%{name} refuzo el enrejistramiento de %{target}"
         remove_avatar_user_html: "%{name} supremio la imaje de profil de %{target}"
         reopen_report_html: "%{name} reavrio el raporto %{target}"
-        resend_user_html: "%{name} tiene reembiado la posta de konfirmasyon para %{target}"
         reset_password_user_html: "%{name} reinisyo el kod del utilizador %{target}"
         resolve_report_html: "%{name} rezolvio el raporto %{target}"
         sensitive_account_html: "%{name} marko la multimedia de %{target} komo sensivle"
@@ -430,7 +410,6 @@ lad:
       attempts_over_week:
         one: "\"%{count} prova durante la ultima semana"
         other: "%{count} provas de enrejistrarse durante la ultima semana"
-      created_msg: Domeno de posta blokado kon sukseso
       delete: Efasa
       dns:
         types:
@@ -439,12 +418,8 @@ lad:
       new:
         create: Adjusta domeno
         resolve: Rezolve domeno
-        title: Bloka muevo domeno de posta
-      no_email_domain_block_selected: No se tienen trokado blokos de domeno porke dinguno a sido eskojido
       not_permitted: Sin permiso
-      resolved_dns_records_hint_html: El nombre de domeno rezolve los sigientes domenos MX, los kualos son responsavles en ultima instansya de achetar la posta elektronika. Blokar un domeno MX blokara los rejistros de kualkier adreso de posta elektronika ke utilize el mezmo domeno MX, inkluzo si el nombre de domeno vizivle es desferente. <strong>Tenga kudiado de no blokar los prinsipales domenos de posta elektronika.</strong>
       resolved_through_html: Rezolvido por %{domain}
-      title: Domenos de posta blokados
     export_domain_allows:
       new:
         title: Importa permisos de domeno
@@ -595,7 +570,6 @@ lad:
         resolve_description_html: No se tomaran aksyones kontra el kuento denunsiado, no se enrejistrara el amonestamiento, i se serrara el raporto.
         silence_description_html: El profil sera vizivle solo para akeyos ke ya lo sigan o lo bushken manualmente, limitando seriamente su alkanse. Siempre puede ser revertido.
         suspend_description_html: El profil i todos sus kontenidos seran inaksesivles asta ke sean enfin supremidos. La enteraksion kon el kuento sera emposivle. Reversivle durante un tiempo de 30 diyas.
-      actions_description_html: Dechide kualas mizuras tomar para rezolver esta denunsia. Si tomas una aksion punitiva kontra el kuento denunsiada, se le embiara a dicho kuento un avizo por posta elektronika, ekseptado kuando se eskoja la kategoria <strong>Spam</strong>.
       actions_description_remote_html: Dechide ke fazer para rezolver este raporto. Esto solo va afektar komo <strong>tu</strong> sirvidor komunike kon este kuento remoto i ke faze kon su kontenido.
       add_to_report: Adjusta mas al raporto
       already_suspended_badges:
@@ -659,7 +633,6 @@ lad:
         delete_data_html: Efasa el profil i kontenido de <strong>@%{acct}</strong> en 30 dias si no sea desuspendido en akel tiempo
         preview_preamble_html: "<strong>@%{acct}</strong> resivira una avertensya komo esta:"
         record_strike_html: Enrejistra un amonestamiento kontra <strong>@%{acct}</strong> para ke te ayude eskalar las violasyones de reglas de este kuento en el avenir
-        send_email_html: Embia un mesaj de avertensia a la posta elektronika de <strong>@%{acct}</strong>
         warning_placeholder: Adisionalas, opsionalas razones la aksyon de moderasyon.
       target_origin: Orijin del kuento raportado
       title: Raportos
@@ -699,7 +672,6 @@ lad:
         manage_appeals: Administra apelasiones
         manage_appeals_description: Permete a los utilizadores revizar apelasiones kontra aksyones de moderasyon
         manage_blocks: Administra blokos
-        manage_blocks_description: Permete a los utilizadores blokar los prokuradores de posta elektronika i los adresos IP
         manage_custom_emojis: Administra emojis personalizados
         manage_custom_emojis_description: Permete a los utilizadores editar emojis personalizados en el sirvidor
         manage_federation: Administra federasyon
@@ -717,7 +689,6 @@ lad:
         manage_taxonomies: Administra etiketas
         manage_taxonomies_description: Permete a los utilizadores revizar el kontenido en trend i aktualizar la konfigurasyon de las etiketas
         manage_user_access: Administra akseso de utilizadores
-        manage_user_access_description: Permete a los utilizadores dezaktivar la autentifikasyon en dos pasos de otros utilizadores, trokar sus adreso de posta elektronika i restableser sus kod
         manage_users: Administra utilizadores
         manage_users_description: Permete a los utilizadores ver los peratim de otros utilizadores i realizar aksyones de moderasyon kontra eyos
         manage_webhooks: Administrar webhooks
@@ -791,7 +762,6 @@ lad:
       destroyed_msg: Dosya supremida kon sukseso!
     software_updates:
       critical_update: Kritiko – por favor aktualiza pishin
-      description: Rekomendamos ke mantengas aktualizada tu enstalasyon de Mastodon para benefisyar de las muevas koreksyones y funksyones. Ademas, a vezes es kritiko aktualizar Mastodon punktualmente para evitar problemas de sigurita. Por estas razones, Mastodon komprova si ay aktualizasyones kada 30 minutos, i te avizara de akodro a tus preferensyas de avizos por posta elektronika.
       documentation_link: Ambezate mas
       release_notes: Notas sovre la versyon
       title: Aktualizasyones desponivles
@@ -943,7 +913,6 @@ lad:
         used_by_over_week:
           one: Uzada por una persona durante la ultima semana
           other: Uzada por %{count} personas durante la ultima semana
-      title: Trendes
       trending: En trend
     warning_presets:
       add_new: Adjusta muevo
@@ -1027,9 +996,7 @@ lad:
       guide_link_text: Todos pueden kontribuir.
     sensitive_content: Kontenido sensivle
   application_mailer:
-    notification_preferences: Troka preferensyas de posta
     salutation: "%{name},"
-    settings: 'Troka preferensyas de posta: %{link}'
     unsubscribe: Dezabona
     view: 'Mira:'
     view_profile: Ve profil
@@ -1049,7 +1016,6 @@ lad:
       hint_html: Una koza mas! Tenemos ke konfirmar ke eres umano (para evitar spam!). Rezolve el CAPTCHA abasho i klika "Kontinua".
       title: Kontrolo de sigurita
     confirmations:
-      awaiting_review: Tu adreso de posta tiene sido konfirmado! La taifa de %{domain} esta revizando tu enrejistrasyon. Risiviras un meil si acheten tu kuento!
       awaiting_review_title: Estamos revizando tu enrejistramiento
       clicking_this_link: klikando en este atadijo
       login_link: konektate kon kuento
@@ -1057,7 +1023,6 @@ lad:
       redirect_to_app_html: Seras readresado a la aplikasyon <strong>%{app_name}</strong>. Si esto no afita, aprova %{clicking_this_link} o regresa manualmente a la aplikasyon.
       registration_complete: Tu enrejistrasyon en %{domain} ya esta kompletada!
       welcome_title: Bienvenido, %{name}!
-      wrong_email_hint: Si este adreso de posta es inkorekto, puedes trokarlo en las preferensyas del kuento.
     delete_account: Efasa kuento
     delete_account_html: Si keres supremir tu kuento, puedes <a href="%{path}">ir aki</a>. Seras pedido de una konfirmasyon.
     description:
@@ -1078,7 +1043,6 @@ lad:
     or_log_in_with: O konektate kon tu kuento kon
     privacy_policy_agreement_html: Tengo meldado i acheto la <a href="%{privacy_policy_path}" target="_blank">politika de privasita</a>
     progress:
-      confirm: Konfirma posta
       details: Tus detalyos
       review: Muestra revizyon
       rules: Acheta reglas
@@ -1100,10 +1064,8 @@ lad:
     security: Sigurita
     set_new_password: Establese muevo kod
     setup:
-      email_below_hint_html: Mira en tu kuti de spam o solisita de muevo. Si el adreso de posta elektronika ke aparese aki es yerrado, puedes trokarlo aki.
       email_settings_hint_html: Klika el atadjiko ke te embimos para verifikar %{email}. Asperaremos aki.
       link_not_received: No risivites un atadijo?
-      new_confirmation_instructions_sent: Resiviras un muevo mesaj de posta elektronika kon el atadjio de konfirmasyon en unos minutos!
       title: Reviza tu kuti de arivo
     sign_in:
       preamble_html: Konektate kon tus kredensiales de <strong>%{domain}</strong>. Si tu kuento esta balabayado en otruno servidor, no puedras konektarte aki.
@@ -1114,9 +1076,7 @@ lad:
       title: Kriya kuento de Mastodon en %{domain}.
     status:
       account_status: Estado del kuento
-      confirming: Bekleando konfirmasyon de posta elektronika.
       functional: Tu kuento esta kompletamente funksyonal.
-      pending: Tu solisitasyon esta asperando la revizion por muestros administradores. Esto puede tadrar algun tiempo. Arisiviras una posta elektronika si la solisitasyon sea achetada.
       redirecting_to: Tu kuento se topa inaktivo porke esta siendo readresado a %{acct}.
       self_destruct: Deke %{domain} va a serrarse, solo tendras akseso limitado a tu kuento.
       view_strikes: Ve amonestamientos pasados kontra tu kuento
@@ -1159,9 +1119,6 @@ lad:
       before: 'Antes de kontinuar, por favor melda kon atensyon las sigientes notas:'
       caches: El kontenido ke tiene sido magazinado en kashe por otros sirvidores puede persistir
       data_removal: Tus publikasyones i el resto de datos se supremiran definitivamente
-      email_change_html: Puedes <a href="%{path}"> trokar tu adreso de posta elektronika</a> sin supremir tu kuento
-      email_contact_html: Si ainda no te tiene parvenido, puedes eskrivir a <a href="mailto:%{email}">%{email}</a> para pider ayuda
-      email_reconfirmation_html: Si no te tiene parvenido la posta de konfirmasyon, puedes <a href="%{path}"> retornar a solisitarlo</a>
       irreversible: No podras restaurar ni reaktivar tu kuento
       more_details_html: Para mas detalyos, ver <a href="%{terms_path}"> la politika de privasita</a>.
       username_available: Tu nombre de utilizador retornara a estar desponivle
@@ -1394,7 +1351,6 @@ lad:
     authentication_methods:
       otp: aplikasyon de autentifikasyon en dos pasos
       password: kod
-      sign_in_token: kodiche de sigurita por posta elektronika
       webauthn: yaves de sigurita
     description_html: Si ves una aktivita ke no rekoneses, konsidera trokar tu kod i kapasitar la autentifikasyon en dos pasos.
     empty: No ay estoria de autentifikasyon desponivle
@@ -1405,16 +1361,6 @@ lad:
     unsubscribe:
       action: Si, dezabona
       complete: Dezabonado
-      confirmation_html: Estas siguro de ke ya no keres risivir %{type} de Mastodon en %{domain} a tu posta elektronika %{email}? Syempre podras reabonarte dizde las <a href="%{settings_path}"> opsyones de avizos por posta.</a>.
-      emails:
-        notification_emails:
-          favourite: avizos de favoritos por posta
-          follow: avizos de segidores por posta
-          follow_request: avizos de solisitasyones de segimyento por posta
-          mention: avizos de enmentaduras por posta
-          reblog: avizos de repartajasyones por posta
-      resubscribe_html: Si tyenes deabonado por yerro, puedes reabonar en tus <a href="%{settings_path}">opsyones de avizos por posta elektronika</a>.
-      success_html: Ya no risiviras %{type} de Mastodon en %{domain} a tu posta en %{email}.
       title: Dezabona
   media_attachments:
     validations:
@@ -1495,8 +1441,6 @@ lad:
     update:
       subject: "%{name} edito una publikasyon"
   notifications:
-    administration_emails: Avizos de administrasyon por posta
-    email_events: Evenimyentos para avizos por posta
     email_events_hint: 'Eskoje los evenimientos para los kualos keres risivir avizos:'
   number:
     human:
@@ -1655,7 +1599,6 @@ lad:
     import: Importo
     import_and_export: Importo i eksporto
     migrate: Migrasyon de kuento
-    notifications: Avizos por posta elektronika
     preferences: Preferensyas
     profile: Profil publiko
     relationships: Segidos i suivantes
@@ -1891,7 +1834,6 @@ lad:
     invalid_otp_token: Kodiche de dos pasos no valido
     otp_lost_help_html: Si pedriste akseso a los dos, puedes kontaktarte kon %{email}
     rate_limited: Demaziadas provas de autentifikasyon, aprova de muevo dempues.
-    seamless_external_login: Estas konektado por un servisyo eksterno i estonses la konfigurasyon de kod i konto de posta no estan disponivles.
     signed_in_as: 'Konektado komo:'
   verification:
     extra_instructions_html: <strong>Konsejo:</strong> El atadijo en tu web puede ser invizivle. La parte importante es <code>rel="me"</code>, ke evita la suplantasyon de identita en sitios kon kontenido jenerado por el utilizador. Puedes inkluzo uzar una etiketa <code>atadijo</code> en la kavesera de la pajina en vez de <code>a</code>, ama el HTML deve ser aksesivle sin exekutar JavaScript.
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index ad9730aca7a2c3..44f7c7ddfc1d99 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -35,7 +35,6 @@ lt:
       created_msg: Prižiūrėjimo pastaba sėkmingai sukurta!
       destroyed_msg: Prižiūrėjimo pastaba sėkmingai sunaikinta!
     accounts:
-      add_email_domain_block: Blokuoti el. pašto domeną
       approve: Patvirtinti
       approved_msg: Sėkmingai patvirtinta %{username} registracijos paraiška.
       are_you_sure: Ar esi įsitikinęs (-usi)?
@@ -62,7 +61,6 @@ lt:
       demote: Pažeminti
       destroyed_msg: "%{username} duomenys dabar laukia eilėje, kad būtų netrukus ištrinti."
       disable: Sustabdyti
-      disable_sign_in_token_auth: Išjungti el. pašto prieigos rakto tapatybės nustatymą
       disable_two_factor_authentication: Išjungti 2FA
       disabled: Pristabdyta
       display_name: Rodomas vardas
@@ -71,7 +69,6 @@ lt:
       email: El. paštas
       email_status: El. pašto būsena
       enable: Panaikinti sustabdymą
-      enable_sign_in_token_auth: Įjungti el. pašto prieigos rakto tapatybės nustatymą
       enabled: Įjungta
       enabled_msg: Sėkmingai panaikintas %{username} paskyros sustabdymas.
       followers: Sekėjai
@@ -138,7 +135,6 @@ lt:
       resubscribe: Prenumeruoti iš naujo
       role: Vaidmuo
       search: Ieškoti
-      search_same_email_domain: Kiti naudotojai su tuo pačiu el. pašto domenu
       search_same_ip: Kiti naudotojai su tuo pačiu IP
       security: Saugumas
       security_measures:
@@ -179,26 +175,21 @@ lt:
         approve_appeal: Patvirtinti apeliaciją
         approve_user: Patvirtinti naudotoją
         assigned_to_self_report: Priskirti ataskaitą
-        change_email_user: Keisti el. paštą naudotojui
         change_role_user: Keisti naudotojo vaidmenį
         confirm_user: Patvirtinti naudotoją
         create_account_warning: Kurti įspėjimą
         create_announcement: Kurti skelbimą
-        create_canonical_email_block: Kurti el. pašto bloką
         create_custom_emoji: Kurti pasirinktinį jaustuką
         create_domain_allow: Kurti domeno leidimą
         create_domain_block: Kurti domeno bloką
-        create_email_domain_block: Kurti el. pašto domeno bloką
         create_ip_block: Kurti IP taisyklę
         create_unavailable_domain: Kurti nepasiekiamą domeną
         create_user_role: Kurti vaidmenį
         demote_user: Pažeminti naudotoją
         destroy_announcement: Ištrinti skelbimą
-        destroy_canonical_email_block: Ištrinti el. pašto bloką
         destroy_custom_emoji: Ištrinti pasirinktinį jaustuką
         destroy_domain_allow: Ištrinti domeno leidimą
         destroy_domain_block: Ištrinti domeno bloką
-        destroy_email_domain_block: Ištrinti el. pašto domeno bloką
         destroy_instance: Išvalyti domeną
         destroy_ip_block: Ištrinti IP taisyklę
         destroy_status: Ištrinti įrašą
@@ -206,10 +197,8 @@ lt:
         destroy_user_role: Sunaikinti vaidmenį
         disable_2fa_user: Išjungti 2FA
         disable_custom_emoji: Išjungti pasirinktinį jaustuką
-        disable_sign_in_token_auth_user: Išjungti el. pašto prieigos rakto tapatybės nustatymą naudotojui
         disable_user: Išjungti naudotoją
         enable_custom_emoji: Įjungti pasirinktinį jaustuką
-        enable_sign_in_token_auth_user: Įjungti el. pašto prieigos rakto tapatybės nustatymą naudotojui
         enable_user: Įjungti naudotoją
         memorialize_account: Memorializuoti paskyrą
         promote_user: Paaukštinti naudotoją
@@ -239,26 +228,20 @@ lt:
         approve_appeal_html: "%{name} patvirtino prižiūjimo veiksmo apeliaciją iš %{target}"
         approve_user_html: "%{name} patvirtino registraciją iš %{target}"
         assigned_to_self_report_html: "%{name} paskyrė ataskaitą %{target} saviems"
-        change_email_user_html: "%{name} pakeitė el. paštą naudotojui %{target}"
         change_role_user_html: "%{name} pakeitė vaidmenį %{target}"
-        confirm_user_html: "%{name} patvirtino el. paštą naudotojui %{target}"
         create_account_warning_html: "%{name} išsiuntė įspėjimą %{target}"
         create_announcement_html: "%{name} sukūrė naują skelbimą %{target}"
-        create_canonical_email_block_html: "%{name} užblokavo el. paštą su maišu %{target}"
         create_custom_emoji_html: "%{name} įkėlė naują jaustuką %{target}"
         create_domain_allow_html: "%{name} leido federaciją su domenu %{target}"
         create_domain_block_html: "%{name} užblokavo domeną %{target}"
-        create_email_domain_block_html: "%{name} užblokavo el. pašto domeną %{target}"
         create_ip_block_html: "%{name} sukūrė taisyklę IP %{target}"
         create_unavailable_domain_html: "%{name} sustabdė tiekimą į domeną %{target}"
         create_user_role_html: "%{name} sukūrė %{target} vaidmenį"
         demote_user_html: "%{name} pažemino naudotoją %{target}"
         destroy_announcement_html: "%{name} ištrynė skelbimą %{target}"
-        destroy_canonical_email_block_html: "%{name} atblokavo el. paštą su maišu %{target}"
         destroy_custom_emoji_html: "%{name} ištrynė jaustuką %{target}"
         destroy_domain_allow_html: "%{name} neleido federacijos su domenu %{target}"
         destroy_domain_block_html: "%{name} atblokavo domeną %{target}"
-        destroy_email_domain_block_html: "%{name} atblokavo el. pašto domeną %{target}"
         destroy_instance_html: "%{name} išvalė domeną %{target}"
         destroy_ip_block_html: "%{name} ištrynė taisyklę IP %{target}"
         destroy_status_html: "%{name} pašalino įrašą %{target}"
@@ -266,10 +249,8 @@ lt:
         destroy_user_role_html: "%{name} ištrynė %{target} vaidmenį"
         disable_2fa_user_html: "%{name} išjungė dviejų veiksnių reikalavimą naudotojui %{target}"
         disable_custom_emoji_html: "%{name} išjungė jaustuką %{target}"
-        disable_sign_in_token_auth_user_html: "%{name} išjungė el. pašto prieigos tapatybės nustatymą naudotojui %{target}"
         disable_user_html: "%{name} išjungė prisijungimą naudotojui %{target}"
         enable_custom_emoji_html: "%{name} įjungė jaustuką %{target}"
-        enable_sign_in_token_auth_user_html: "%{name} įjungė el. pašto prieigos tapatybės nustatymą naudotojui %{target}"
         enable_user_html: "%{name} įjungė prisijungimą naudotojui %{target}"
         memorialize_account_html: "%{name} pavertė %{target} paskyrą į atminimo puslapį"
         promote_user_html: "%{name} paaukštino naudotoją %{target}"
@@ -277,7 +258,6 @@ lt:
         reject_user_html: "%{name} atmetė registraciją iš %{target}"
         remove_avatar_user_html: "%{name} pašalino %{target} avatarą"
         reopen_report_html: "%{name} atidarė ataskaitą %{target}"
-        resend_user_html: "%{name} iš naujo išsiuntė patvirtinimo el. laišką %{target}"
         reset_password_user_html: "%{name} iš naujo nustatė naudotojo slaptažodį %{target}"
         resolve_report_html: "%{name} išsprendė ataskaitą %{target}"
         sensitive_account_html: "%{name} pažymėjo %{target} mediją kaip jautrią"
@@ -435,13 +415,10 @@ lt:
     email_domain_blocks:
       add_new: Pridėti naują
       allow_registrations_with_approval: Leisti registracijas su patvirtinimu
-      created_msg: El pašto domenas sėkmingai pridėtas į juodąjį sąrašą
       delete: Ištrinti
       domain: Domenas
       new:
         create: Pridėto domeną
-        title: Naujas el pašto juodojo sąrašo įtraukimas
-      title: El pašto juodasis sąrašas
     export_domain_blocks:
       import:
         description_html: Netrukus importuosi domenų blokavimų sąrašą. Labai atidžiai peržiūrėk šį sąrašą, ypač jei ne tu jį sudarei.
@@ -508,7 +485,6 @@ lt:
       destroyed_msg: Skundo žinutė sekmingai ištrinta!
     reports:
       action_taken_by: Veiksmo ėmėsi
-      actions_description_html: Nuspręsk, kokių veiksmų imtis, kad išspręstum šią ataskaitą. Jei imsis baudžiamųjų veiksmų prieš paskyrą, apie kurią pranešta, jiems bus išsiųstas el. laiško pranešimas, išskyrus atvejus, kai pasirinkta kategorija <strong>Šlamštas</strong>.
       already_suspended_badges:
         local: Jau sustabdytas šiame serveryje
         remote: Jau sustabdytas jų serveryje
@@ -551,7 +527,6 @@ lt:
         manage_invites: Tvarkyti kvietimus
         manage_invites_description: Leidžia naudotojams naršyti ir deaktyvuoti kvietimų nuorodas.
         manage_taxonomies_description: Leidžia naudotojams peržiūrėti tendencingą turinį ir atnaujinti saitažodžių nustatymus
-        manage_user_access_description: Leidžia naudotojams išjungti kitų naudotojų dvigubo tapatybės nustatymą, pakeisti el. pašto adresą ir iš naujo nustatyti slaptažodį.
     settings:
       branding:
         title: Firminio ženklo kūrimas
@@ -576,7 +551,6 @@ lt:
         authorized_fetch_overridden_hint: Šiuo metu negali pakeisti šio nustatymo, nes jį pakeičia aplinkos kintamasis.
         federation_authentication: Federacijos tapatybės nustatymo vykdymas
     software_updates:
-      description: Rekomenduojama nuolat atnaujinti Mastodon diegyklę, kad galėtum naudotis naujausiais pataisymais ir funkcijomis. Be to, kartais labai svarbu laiku atnaujinti Mastodon, kad būtų išvengta saugumo problemų. Dėl šių priežasčių Mastodon kas 30 minučių tikrina, ar yra naujinimų, ir praneša tau apie tai pagal tavo el. pašto pranešimų parinktis.
       documentation_link: Sužinoti daugiau
       release_notes: Leidimo informacija
       title: Galimi naujinimai
@@ -638,10 +612,16 @@ lt:
     trends:
       allow: Leisti
       approved: Patvirtinta
+      confirm_allow: Ar tikrai nori leisti pasirinktas žymes?
+      confirm_disallow: Ar tikrai nori neleisti pasirinktas žymes?
       disallow: Neleisti
       links:
         allow: Leisti nuorodą
         allow_provider: Leisti leidėją
+        confirm_allow: Ar tikrai nori leisti pasirinktas nuorodas?
+        confirm_allow_provider: Ar tikrai nori leisti pasirinktus teikėjus?
+        confirm_disallow: Ar tikrai nori neleisti pasirinktas nuorodas?
+        confirm_disallow_provider: Ar tikrai nori neleisti pasirinktus teikėjus?
         description_html: Tai – nuorodos, kuriomis šiuo metu daug bendrinasi paskyros, iš kurių tavo serveris mato įrašus. Tai gali padėti naudotojams sužinoti, kas vyksta pasaulyje. Jokios nuorodos nerodomos viešai, kol nepatvirtinai leidėjo. Taip pat gali leisti arba atmesti atskiras nuorodas.
         disallow: Neleisti nuorodą
         disallow_provider: Neleisti leidėją
@@ -662,6 +642,10 @@ lt:
       statuses:
         allow: Leisti įrašą
         allow_account: Leisti autorių (-ę)
+        confirm_allow: Ar tikrai nori leisti pasirinktas būsenas?
+        confirm_allow_account: Ar tikrai nori leisti pasirinktas paskyras?
+        confirm_disallow: Ar tikrai nori neleisti pasirinktas būsenas?
+        confirm_disallow_account: Ar tikrai nori neleisti pasirinktas paskyras?
         description_html: Tai – įrašai, apie kuriuos žino tavo serveris ir kuriais šiuo metu daug bendrinamasi ir kurie yra mėgstami. Tai gali padėti naujiems ir grįžtantiems naudotojams rasti daugiau žmonių, kuriuos galima sekti. Jokie įrašai nerodomi viešai, kol nepatvirtinai autoriaus (-ės), o autorius (-ė) leidžia savo paskyrą siūlyti kitiems. Taip pat gali leisti arba atmesti atskirus įrašus.
         disallow: Neleisti įrašą
         disallow_account: Neleisti autorių (-ę)
@@ -685,7 +669,6 @@ lt:
         title: Tendencingos saitažodžiai
         trendable: Gali pasirodyti tendencijose
         trending_rank: 'Tendencinga #%{rank}'
-      title: Tendencijos
       trending: Tendencinga
     warning_presets:
       add_new: Pridėti naują
@@ -734,8 +717,6 @@ lt:
       guide_link_text: Visi gali prisidėti.
     sensitive_content: Jautrus turinys
   application_mailer:
-    notification_preferences: Keisti el. pašto nuostatas
-    settings: 'Keisti el. pašto nuostatas: %{link}'
     view: 'Peržiūra:'
     view_profile: Peržiurėti profilį
     view_status: Peržiūrėti įrašą
@@ -753,7 +734,6 @@ lt:
       hint_html: Dar vienas dalykas! Turime patvirtinti, kad esi žmogus (kad galėtume išvengti šlamšto). Išspręsk toliau pateiktą CAPTCHA ir spausk Tęsti.
       title: Saugumo patikrinimas
     confirmations:
-      awaiting_review: Tavo el. pašto adresas yra patvirtintas! Domeno %{domain} personalas dabar tikrina tavo registraciją. Jei jie patvirtins tavo paskyrą, gausi el. laišką.
       awaiting_review_title: Peržiūrima tavo registracija
       clicking_this_link: paspausti šį nuorodą
       login_link: prisijungti
@@ -761,7 +741,6 @@ lt:
       redirect_to_app_html: Turėjei būti nukreiptas (-a) į <strong>%{app_name}</strong> programėlę. Jei taip neatsitiko, pabandyk %{clicking_this_link} arba rankiniu būdu grįžk į programėlę.
       registration_complete: Tavo registracija domene %{domain} baigta!
       welcome_title: Sveiki, %{name}!
-      wrong_email_hint: Jei šis el. pašto adresas neteisingas, gali jį pakeisti paskyros nustatymuose.
     delete_account: Ištrinti paskyrą
     delete_account_html: Jei nori ištrinti savo paskyrą, gali <a href="%{path}">tęsti čia</a>. Tavęs bus paprašyta patvirtinimo.
     description:
@@ -782,7 +761,6 @@ lt:
     or_log_in_with: Arba prisijungti su
     privacy_policy_agreement_html: Perskaičiau ir sutinku su <a href="%{privacy_policy_path}" target="_blank">privatumo politika</a>
     progress:
-      confirm: Patvirtinti el. paštą
       details: Tavo duomenys
       review: Mūsų peržiūra
       rules: Priimti taisykles
@@ -804,10 +782,8 @@ lt:
     security: Apsauga
     set_new_password: Nustatyti naują slaptažodį
     setup:
-      email_below_hint_html: Patikrink šlamšto aplanką arba paprašyk kito. Gali ištaisyti savo el. pašto adresą, jei jis neteisingas.
       email_settings_hint_html: Spustelėk mūsų atsiųstą nuorodą, kad patikrintum %{email}. Mes lauksime čia.
       link_not_received: Negavai nuorodos?
-      new_confirmation_instructions_sent: Po kelių minučių gausi naują el. laišką su patvirtinimo nuoroda!
       title: Patikrinti pašto dėžutę
     sign_in:
       preamble_html: Prisijunk su savo <strong>%{domain}</strong> kredencialais. Jei tavo yra kitame serveryje, čia prisijungti negalėsi.
@@ -988,7 +964,6 @@ lt:
       subject: "%{name} pakėlė tavo įrašą"
       title: Naujas pakėlimas
   notifications:
-    email_events: Įvykiai, skirti el. laiško pranešimams
     email_events_hint: 'Pasirink įvykius, apie kuriuos nori gauti pranešimus:'
   number:
     human:
@@ -1086,7 +1061,6 @@ lt:
     featured_tags: Rodomi saitažodžiai
     import: Importuoti
     migrate: Paskyros migracija
-    notifications: El. laiško pranešimai
     preferences: Nuostatos
     profile: Viešas profilis
     relationships: Sekimai ir sekėjai
@@ -1231,7 +1205,6 @@ lt:
     invalid_otp_token: Netinkamas dviejų veiksnių kodas
     otp_lost_help_html: Jei praradai prieigą prie abiejų, gali susisiek su %{email}
     rate_limited: Per daug tapatybės nustatymo bandymų. Bandyk dar kartą vėliau.
-    seamless_external_login: Esi prisijungęs (-usi) per išorinę paslaugą, todėl slaptažodžio ir el. pašto nustatymai nepasiekiami.
     signed_in_as: 'Prisijungta kaip:'
   verification:
     extra_instructions_html: <strong>Patarimas:</strong> nuoroda tavo svetainėje gali būti nematoma. Svarbi dalis – tai, kad <code>rel="me"</code> neleidžia apsimesti interneto svetainėse, kuriose yra naudotojų sukurto turinio. Vietoj to gali naudoti net <code>nuorodą</code> puslapio antraštėje esančią žymę <code>a</code>, tačiau HTML turi būti pasiekiamas nevykdant JavaScript.
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index 5a071eba863e84..43b6995e2856e5 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -33,7 +33,6 @@ 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: Bloķēt 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?
@@ -60,7 +59,6 @@ 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 autentifikāciju ar e-pasta marķieri
       disable_two_factor_authentication: Atspējot 2FA
       disabled: Iesaldēts
       display_name: Parādāmais vārds
@@ -69,7 +67,6 @@ lv:
       email: E-pasts
       email_status: E-pasta statuss
       enable: Atsaldēt
-      enable_sign_in_token_auth: Iespējot autentifikāciju ar e-pasta marķieri
       enabled: Iespējots
       enabled_msg: Veiksmīgi atsaldēts %{username} konts
       followers: Sekotāji
@@ -135,7 +132,6 @@ lv:
       resubscribe: Pieteikties vēlreiz
       role: Loma
       search: Meklēt
-      search_same_email_domain: Citi lietotāji ar tādu pašu e-pasta domēnu
       search_same_ip: Citi lietotāji ar tādu pašu IP
       security: Drošība
       security_measures:
@@ -176,26 +172,21 @@ lv:
         approve_appeal: Apstiprināt Apelāciju
         approve_user: Apstiprināt lietotāju
         assigned_to_self_report: Piešķirt Pārskatu
-        change_email_user: Mainīt e-pastu lietotājam
         change_role_user: Mainīt lietotāja lomu
         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 Bloku
         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 Bloku
         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: Dzēst E-pasta Bloku
         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: Dzēst E-pasta Domēna Bloku
         destroy_instance: Attīrīt domēnu
         destroy_ip_block: Dzēst IP noteikumu
         destroy_status: Izdzēst Rakstu
@@ -203,10 +194,8 @@ lv:
         destroy_user_role: Iznīcināt lomu
         disable_2fa_user: Atspējot 2FA
         disable_custom_emoji: Atspējot pielāgotu emocijzīmi
-        disable_sign_in_token_auth_user: Atspējoja e-pasta marķiera autentifikāciju lietotājam
         disable_user: Atspējot Lietotāju
         enable_custom_emoji: Iespējot pielāgotu emocijzīmi
-        enable_sign_in_token_auth_user: Iespējot e-pasta marķiera autentifikāciju lietotājam
         enable_user: Ieslēgt Lietotāju
         memorialize_account: Saglabāt Kontu Piemiņai
         promote_user: Izceltt Lietotāju
@@ -235,26 +224,20 @@ lv:
         approve_appeal_html: "%{name} apstiprināja moderācijas lēmuma apelāciju no %{target}"
         approve_user_html: "%{name} apstiprināja reģistrēšanos no %{target}"
         assigned_to_self_report_html: "%{name} piešķīra pārskatu %{target} sev"
-        change_email_user_html: "%{name} nomainīja e-pasta adresi lietotājam %{target}"
         change_role_user_html: "%{name} nomainīja lomu uz %{target}"
-        confirm_user_html: "%{name} apstiprināja e-pasta adresi lietotājam %{target}"
         create_account_warning_html: "%{name} nosūtīja brīdinājumu %{target}"
         create_announcement_html: "%{name} izveidoja jaunu paziņojumu %{target}"
-        create_canonical_email_block_html: "%{name} bloķēja e-pastu ar hešu %{target}"
         create_custom_emoji_html: "%{name} augšupielādēja jaunu emocijzīmi %{target}"
         create_domain_allow_html: "%{name} atļāva federāciju ar domēnu %{target}"
         create_domain_block_html: "%{name} bloķēja domēnu %{target}"
-        create_email_domain_block_html: "%{name} bloķēja e-pasta domēnu %{target}"
         create_ip_block_html: "%{name} izveidoja nosacījumu priekš IP %{target}"
         create_unavailable_domain_html: "%{name} apturēja piegādi uz domēnu %{target}"
         create_user_role_html: "%{name} nomainīja %{target} lomu"
         demote_user_html: "%{name} pazemināja lietotāju %{target}"
         destroy_announcement_html: "%{name} izdzēsa paziņojumu %{target}"
-        destroy_canonical_email_block_html: "%{name} atbloķēja e-pastu ar hešu %{target}"
         destroy_custom_emoji_html: "%{name} izdzēsa emocijzīmi %{target}"
         destroy_domain_allow_html: "%{name} neatļāva federāciju ar domēnu %{target}"
         destroy_domain_block_html: "%{name} atbloķēja domēnu %{target}"
-        destroy_email_domain_block_html: "%{name} atbloķēja e-pasta domēnu %{target}"
         destroy_instance_html: "%{name} attīrija domēnu %{target}"
         destroy_ip_block_html: "%{name} izdzēsa nosacījumu priekš IP %{target}"
         destroy_status_html: "%{name} noņēma ziņu %{target}"
@@ -262,10 +245,8 @@ lv:
         destroy_user_role_html: "%{name} izdzēsa %{target} lomu"
         disable_2fa_user_html: "%{name} atspējoja divpakāpju prasības lietotājam %{target}"
         disable_custom_emoji_html: "%{name} atspējoja emocijzīmi %{target}"
-        disable_sign_in_token_auth_user_html: "%{name} atspējoja e-pasta marķiera autentifikāciju %{target}"
         disable_user_html: "%{name} atspējoja pieteikšanos lietotājam %{target}"
         enable_custom_emoji_html: "%{name} iespējoja emocijzīmi %{target}"
-        enable_sign_in_token_auth_user_html: "%{name} iespējoja e-pasta marķiera autentifikāciju %{target}"
         enable_user_html: "%{name} iespējoja pieteikšanos lietotājam %{target}"
         memorialize_account_html: "%{name} pārvērta %{target} kontu par atmiņas lapu"
         promote_user_html: "%{name} paaugstināja lietotāju %{target}"
@@ -273,7 +254,6 @@ lv:
         reject_user_html: "%{name} noraidīja reģistrēšanos no %{target}"
         remove_avatar_user_html: "%{name} noņēma %{target} profila attēlu"
         reopen_report_html: "%{name} atkārtoti atvēra ziņojumu %{target}"
-        resend_user_html: "%{name} atkārtoti nosūtīja apstiprinājuma e-pastu %{target}"
         reset_password_user_html: "%{name} atiestatīja paroli lietotājam %{target}"
         resolve_report_html: "%{name} atrisināja ziņojumu %{target}"
         sensitive_account_html: "%{name} atzīmēja %{target} multividi kā sensitīvu"
@@ -437,7 +417,6 @@ lv:
         one: "%{count} mēģinājums pagājušajā nedēļā"
         other: "%{count} reģistrēšanās mēģinājumi pagājušajā nedēļā"
         zero: "%{count} mēģinājumu pagājušajā nedēļā"
-      created_msg: E-pasta domēns ir veiksmīgi bloķēts
       delete: Dzēst
       dns:
         types:
@@ -446,12 +425,8 @@ lv:
       new:
         create: Pievienot domēnu
         resolve: Atrisināt domēnu
-        title: Bloķēt jaunu e-pasta domēnu
-      no_email_domain_block_selected: Neviens e-pasta domēna bloks netika mainīts, jo neviens netika atlasīts
       not_permitted: Nav atļauta
-      resolved_dns_records_hint_html: Domēna nosaukums tiek izmantots tālāk norādītajos MX domēnos, kas galu galā ir atbildīgi par e-pasta pieņemšanu. Bloķējot MX domēnu, tiks bloķēta reģistrēšanās no jebkuras e-pasta adreses, kas izmanto vienu un to pašu MX domēnu, pat ja redzamais domēna nosaukums atšķiras. <strong>Esi uzmanīgs, lai nebloķētu lielākos e-pasta pakalpojumu sniedzējus.</strong>
       resolved_through_html: Atrisināts, izmantojot %{domain}
-      title: Bloķētie e-pasta domēni
     export_domain_allows:
       new:
         title: Importēt domēnu atļaujas
@@ -606,7 +581,6 @@ lv:
         resolve_description_html: Pret norādīto kontu netiks veiktas nekādas darbības, netiks reģistrēts brīdinājums, un ziņojums tiks slēgts.
         silence_description_html: Konts būs redzams tikai tiem, kas tam jau seko vai meklē to manuāli, ievērojami ierobežojot tā sasniedzamību. To vienmēr var atgriezt. Tiek aizvērti visi šī konta pārskati.
         suspend_description_html: Konts un viss tā saturs nebūs pieejams un galu galā tiks izdzēsts, un mijiedarbība ar to nebūs iespējama. Atgriežams 30 dienu laikā. Tiek aizvērti visi šī konta pārskati.
-      actions_description_html: Izlem, kādas darbības jāveic, lai atrisinātu šo ziņojumu. Ja veiksi sodīšanas darbību pret kontu, par kuru ziņots, tam tiks nosūtīts e-pasta paziņojums, izņemot gadījumus, kad ir atlasīta kategorija <strong>Spam</strong>.
       actions_description_remote_html: Izlem, kādas darbības jāveic, lai atrisinātu šo ziņojumu. Tas ietekmēs tikai to, kā <strong>tavs</strong> serveris sazinās ar šo attālo kontu un apstrādā tā saturu.
       add_to_report: Pievienot varāk paziņošanai
       are_you_sure: Vai esi pārliecināts?
@@ -666,7 +640,6 @@ lv:
         delete_data_html: Dzēsiet lietotāja <strong>@%{acct}</strong> profilu un saturu pēc 30 dienām, ja vien to darbība pa šo laiku netiks atcelta
         preview_preamble_html: "<strong>@%{acct}</strong> saņems brīdinājumu ar šādu saturu:"
         record_strike_html: Ierakstiet brīdinājumu pret <strong>@%{acct}</strong>, lai palīdzētu jums izvērst turpmākus pārkāpumus no šī konta
-        send_email_html: Nosūtiet <strong>@%{acct}</strong> brīdinājuma e-pastu
         warning_placeholder: Izvēles papildu pamatojums regulēšanas darbībai.
       target_origin: Ziņotā konta izcelsme
       title: Ziņojumi
@@ -708,7 +681,6 @@ lv:
         manage_appeals: Pārvaldīt Pārsūdzības
         manage_appeals_description: Ļauj lietotājiem izskatīt apelācijas pret regulēšanas darbībām
         manage_blocks: Pārvaldīt Bloķus
-        manage_blocks_description: Ļauj lietotājiem bloķēt e-pasta pakalpojumu sniedzējus un IP adreses
         manage_custom_emojis: Pārvaldīt Pielāgotās Emocijzīmes
         manage_custom_emojis_description: Ļauj lietotājiem pārvaldīt pielāgotās emocijzīmes serverī
         manage_federation: Pārvaldīt Federāciju
@@ -726,7 +698,6 @@ lv:
         manage_taxonomies: Pārvaldīt Taksonomijas
         manage_taxonomies_description: Ļauj lietotājiem pārskatīt aktuālāko saturu un atjaunināt atsauces iestatījumus
         manage_user_access: Pārvaldīt Lietotāju Piekļuves
-        manage_user_access_description: Ļauj lietotājiem atspējot citu lietotāju divu faktoru autentifikāciju, mainīt savu e-pasta adresi un atiestatīt paroli
         manage_users: Pārvaldīt Lietotājus
         manage_users_description: Ļauj lietotājiem skatīt citu lietotāju informāciju un veikt pret viņiem regulēšanas darbības
         manage_webhooks: Pārvaldīt Tīmekļa Aizķeres
@@ -799,7 +770,6 @@ lv:
       destroyed_msg: Vietnes augšupielāde ir veiksmīgi izdzēsta!
     software_updates:
       critical_update: Kritiski - lūdzu, ātri atjaunini
-      description: Ieteicams uzturēt savu Mastodon instalāciju atjauninātu, lai gūtu labumu no jaunākajiem labojumiem un funkcijām. Turklāt dažreiz ir ļoti svarīgi atjaunināt Mastodon savlaicīgi, lai izvairītos no drošības problēmām. Šo iemeslu dēļ Mastodon pārbauda atjauninājumus ik pēc 30 minūtēm un informēs tevi atbilstoši tavu e-pasta paziņojumu iestatījumiem.
       documentation_link: Uzzināt vairāk
       release_notes: Laidiena piezīmes
       title: Pieejamie atjauninājumi
@@ -954,7 +924,6 @@ lv:
           one: Pēdējās nedēļas laikā izmantoja viens cilvēks
           other: Pēdējās nedēļas laikā izmantoja %{count} cilvēki
           zero: Pēdējās nedēļas laikā izmantoja %{count} cilvēku
-      title: Tendences
       trending: Populārākie
     warning_presets:
       add_new: Pievienot jaunu
@@ -1036,9 +1005,7 @@ lv:
       guide_link_text: Ikviens var piedalīties.
     sensitive_content: Sensitīvs saturs
   application_mailer:
-    notification_preferences: Mainīt e-pasta uztādījumus
     salutation: "%{name},"
-    settings: 'Mainīt e-pasta uztādījumus: %{link}'
     unsubscribe: Atcelt abonēšanu
     view: 'Skatīt:'
     view_profile: Skatīt profilu
@@ -1058,7 +1025,6 @@ lv:
       hint_html: Vēl tikai viena lieta! Mums ir jāapstiprina, ka tu esi cilvēks (tas ir tāpēc, lai mēs varētu nepieļaut surogātpasta izsūtīšanu!). Atrisini tālāk norādīto CAPTCHA un noklikšķini uz "Turpināt".
       title: Drošības pārbaude
     confirmations:
-      awaiting_review: Tava e-pasta adrese ir apstiprināta! %{domain} darbinieki tagad pārskata tavu reģistrāciju. Tu saņemsi e-pastu, ja viņi apstiprinās tavu kontu!
       awaiting_review_title: Tava reģistrācija tiek izskatīta
       clicking_this_link: klikšķinot šo saiti
       login_link: pieteikties
@@ -1066,7 +1032,6 @@ lv:
       redirect_to_app_html: Tev vajadzētu būt novirzītam uz lietotni <strong>%{app_name}</strong>. Ja tas nenotika, mēģini %{clicking_this_link} vai manuāli atgriezieties lietotnē.
       registration_complete: Tava reģistrācija domēnā %{domain} tagad ir pabeigta!
       welcome_title: Laipni lūdzam, %{name}!
-      wrong_email_hint: Ja šī e-pasta adrese nav pareiza, to var mainīt konta iestatījumos.
     delete_account: Dzēst kontu
     delete_account_html: Ja vēlies dzēst savu kontu, tu vari <a href="%{path}">turpināt šeit</a>. Tev tiks lūgts apstiprinājums.
     description:
@@ -1087,7 +1052,6 @@ lv:
     or_log_in_with: Vai piesakies ar
     privacy_policy_agreement_html: Esmu izlasījis un piekrītu <a href="%{privacy_policy_path}" target="_blank">privātuma politikai</a>
     progress:
-      confirm: Apstiprināt e-pastu
       details: Tavi dati
       review: Mūsu apskats
       rules: Pieņemt noteikumus
@@ -1109,10 +1073,8 @@ lv:
     security: Drošība
     set_new_password: Iestatīt jaunu paroli
     setup:
-      email_below_hint_html: Pārbaudi savu surogātpasta mapi vai pieprasi vēl vienu! Tu vari labot savu e-pasta adresi, ja tā ir nepareiza.
       email_settings_hint_html: Noklikšķini uz saites, kuru mēs tev nosūtījām, lai apstiprinātu %{email}. Mēs tepat pagaidīsim.
       link_not_received: Vai nesaņēmi sati?
-      new_confirmation_instructions_sent: Pēc dažām minūtēm saņemsi jaunu e-pastu ar apstiprinājuma saiti!
       title: Pārbaudi savu iesūtni
     sign_in:
       preamble_html: Jāpiesakās ar saviem <strong>%{domain}</strong> piekļuves datiem. Ja Tavs konts tiek mitināts citā serverī, Tu nevarēsi šeit pieteikties.
@@ -1123,9 +1085,7 @@ lv:
       title: Atļauj tevi iestatīt %{domain}.
     status:
       account_status: Konta statuss
-      confirming: Gaida e-pasta apstiprinājuma pabeigšanu.
       functional: Tavs konts ir pilnā darba kārtībā.
-      pending: Tavu pieteikumu gaida mūsu darbinieku izskatīšana. Tas var aizņemt kādu laiku. Ja tavs pieteikums tiks apstiprināts, tu saņemsi e-pastu.
       redirecting_to: Tavs konts ir neaktīvs, jo pašlaik tas tiek novirzīts uz %{acct}.
       self_destruct: Tā kā %{domain} tiek slēgts, tu iegūsi tikai ierobežotu piekļuvi savam kontam.
       view_strikes: Skati iepriekšējos brīdinājumus par savu kontu
@@ -1168,9 +1128,6 @@ lv:
       before: 'Pirms turpināšanas lūgums uzmanīgi izlasīt šīs piezīmes:'
       caches: Citu serveru kešatmiņā saglabātais saturs var saglabāties
       data_removal: Tavas ziņas un citi dati tiks neatgriezeniski noņemti
-      email_change_html: Tu vari <a href="%{path}">mainīt savu e-pasta adresi</a>, neizdzēšot savu kontu
-      email_contact_html: Ja tas joprojām nav saņemts, tu vari nosūtīt e-pastu <a href="mailto:%{email}">%{email}</a> lai saņemtu palīdzību
-      email_reconfirmation_html: Ja tu nesaņem apstiprinājuma e-pastu, tu vari <a href="%{path}">pieprsīt to vēlreiz</a>
       irreversible: Tu nevarēsi atjaunot vai atkārtoti aktivizēt savu kontu
       more_details_html: Plašāku informāciju skatīt <a href="%{terms_path}">privātuma politika</a>.
       username_available: Tavs lietotājvārds atkal būs pieejams
@@ -1410,7 +1367,6 @@ lv:
     authentication_methods:
       otp: divpakāpju autentifikācijas lietotne
       password: parole
-      sign_in_token: e-pasta drošības kods
       webauthn: drošības atslēgas
     description_html: Ja pamani darbības, kuras neatpazīsti, jāapsver iespēja nomainīt savu paroli un iespējot divpakāpju autentifikāciju.
     empty: Nav pieejama autentifikācijas vēsture
@@ -1421,16 +1377,6 @@ lv:
     unsubscribe:
       action: Jā, atcelt abonēšanu
       complete: Anulēts
-      confirmation_html: Vai tiešām vēlies atteikties no %{type} saņemšanas Mastodon vietnē %{domain} uz savu e-pastu %{email}? Tu vienmēr vari atkārtot abonēšanu, izmantojot <a href="%{settings_path}">e-pasta paziņojumu iestatījumus</a>.
-      emails:
-        notification_emails:
-          favourite: iecienītākie paziņojuma e-pasti
-          follow: sekot paziņojuma e-pastiem
-          follow_request: sekot pieprasījuma e-pastiem
-          mention: pieminēt paziņojumu e-pastus
-          reblog: izcelt paziņojumu e-pastus
-      resubscribe_html: Ja anulē abonementu kļūdas dēļ, tu vari atkārtoti abonēt, izmantojot <a href="%{settings_path}">e-pasta paziņojumu iestatījumus</a>.
-      success_html: Tu vairs nesaņemsi %{type} par Mastodon %{domain} uz tavu e-pastu %{email}.
       title: Atcelt abonēšanu
   media_attachments:
     validations:
@@ -1511,8 +1457,6 @@ lv:
     update:
       subject: "%{name} laboja ierakstu"
   notifications:
-    administration_emails: Administrators e-pasta paziņojumi
-    email_events: E-pasta paziņojumu notikumi
     email_events_hint: 'Atlasi notikumus, par kuriem vēlies saņemt paziņojumus:'
   number:
     human:
@@ -1668,7 +1612,6 @@ lv:
     import: Imports
     import_and_export: Imports un eksports
     migrate: Konta migrācija
-    notifications: E-pasta paziņojumi
     preferences: Iestatījumi
     profile: Profils
     relationships: Sekojamie un sekotāji
@@ -1885,7 +1828,6 @@ lv:
     invalid_otp_token: Nederīgs divfaktora kods
     otp_lost_help_html: Ja esi zaudējis piekļuvi abiem, tu vari sazināties ar %{email}
     rate_limited: Pārāk daudz autentifikācijas mēģinājumu, vēlāk jāmēģina vēlreiz.
-    seamless_external_login: Tu esi pieteicies, izmantojot ārēju pakalpojumu, tāpēc paroles un e-pasta iestatījumi nav pieejami.
     signed_in_as: 'Pieteicies kā:'
   verification:
     extra_instructions_html: <strong>Padoms:</strong> saite Tavā vietnē var būt neredzama. Svarīga daļa ir <code>rel="me"</code>, kas novērš uzdošanos vietnēs ar lietotāju izveidotu saturu. Tu pat vari lapas galvenē izmantot tagu <code>link</code>, nevis <code>a</code>, taču HTML ir jābūt pieejamam bez JavaScript izpildīšanas.
diff --git a/config/locales/ml.yml b/config/locales/ml.yml
index 883a400318a1da..a4b9391c0068a7 100644
--- a/config/locales/ml.yml
+++ b/config/locales/ml.yml
@@ -12,7 +12,6 @@ ml:
     posts_tab_heading: ടൂട്ടുകൾ
   admin:
     accounts:
-      add_email_domain_block: ഇ-മെയിൽ ഡൊമെയ്ൻ തടയുക
       approve: അംഗീകരിക്കുക
       are_you_sure: നിങ്ങൾക്ക് ഉറപ്പാണോ?
       avatar: അവതാർ
diff --git a/config/locales/ms.yml b/config/locales/ms.yml
index a778d0c28f1491..28a2993d361a9f 100644
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@@ -29,7 +29,6 @@ ms:
       created_msg: Catatan penyederhanaan telah berjaya dicipta!
       destroyed_msg: Catatan penyederhanaan telah berjaya dipadam!
     accounts:
-      add_email_domain_block: Sekat domain e-mel
       approve: Luluskan
       approved_msg: Berjaya meluluskan permohonan pendaftaran %{username}
       are_you_sure: Adakah anda pasti?
@@ -56,7 +55,6 @@ ms:
       demote: Turunkan taraf
       destroyed_msg: Data %{username} kini menunggu giliran untuk dipadam sebentar lagi
       disable: Bekukan
-      disable_sign_in_token_auth: Nyahdaya pengesahan token e-mel
       disable_two_factor_authentication: Lumpuhkan 2FA
       disabled: Dibekukan
       display_name: Nama paparan
@@ -65,7 +63,6 @@ ms:
       email: E-mel
       email_status: Status e-mel
       enable: Nyahbekukan
-      enable_sign_in_token_auth: Dayakan pengesahan token e-mel
       enabled: Didayakan
       enabled_msg: Berjaya menyahbekukan akaun %{username}
       followers: Pengikut
@@ -129,7 +126,6 @@ ms:
       resubscribe: Langgan semula
       role: Peranan
       search: Cari
-      search_same_email_domain: Pengguna lain dengan domain e-mel yang sama
       search_same_ip: Pengguna lain dengan alamat IP yang sama
       security: Keselamatan
       security_measures:
@@ -170,26 +166,21 @@ ms:
         approve_appeal: Meluluskan Rayuan
         approve_user: Luluskan Pengguna
         assigned_to_self_report: Buat Laporan
-        change_email_user: Ubah E-mel untuk Pengguna
         change_role_user: Tukar Peranan Pengguna
         confirm_user: Sahkan Pengguna
         create_account_warning: Cipta Amaran
         create_announcement: Cipta Pengumuman
-        create_canonical_email_block: Cipta Penyekatan E-mel
         create_custom_emoji: Cipta Emoji Tersendiri
         create_domain_allow: Cipta Pelepasan Domain
         create_domain_block: Cipta Penyekatan Domain
-        create_email_domain_block: Cipta Penyekatan Domain E-mel
         create_ip_block: Cipta peraturan alamat IP
         create_unavailable_domain: Cipta Domain Tidak Tersedia
         create_user_role: Cipta Peranan
         demote_user: Turunkan Taraf Pengguna
         destroy_announcement: Padam Pengumuman
-        destroy_canonical_email_block: Padam Penyekatan E-mel
         destroy_custom_emoji: Padam Emoji Tersendiri
         destroy_domain_allow: Padam Pelepasan Domain
         destroy_domain_block: Padam Penyekatan Domain
-        destroy_email_domain_block: Padam penyekatan domain e-mel
         destroy_instance: Padamkan Domain
         destroy_ip_block: Padam peraturan alamat IP
         destroy_status: Padam Hantaran
@@ -197,10 +188,8 @@ ms:
         destroy_user_role: Padamkan Peranan
         disable_2fa_user: Nyahdayakan 2FA
         disable_custom_emoji: Nyahdayakan Emoji Tersendiri
-        disable_sign_in_token_auth_user: Melumpuhkan pengesahan token e-mel untuk pengguna
         disable_user: Nyahdayakan Pengguna
         enable_custom_emoji: Dayakan Emoji Tersendiri
-        enable_sign_in_token_auth_user: Mendayakan pengesahan token e-mel untuk pengguna
         enable_user: Dayakan Pengguna
         memorialize_account: Jadikan Akaun Kenangan
         promote_user: Naikkan Taraf Pengguna
@@ -229,26 +218,20 @@ ms:
         approve_appeal_html: "%{name} meluluskan rayuan keputusan penyederhanaan daripada %{target}"
         approve_user_html: "%{name} meluluskan pendaftaran daripada %{target}"
         assigned_to_self_report_html: "%{name} menugaskan laporan %{target} kepada dirinya sendiri"
-        change_email_user_html: "%{name} telah mengubah alamat e-mel pengguna %{target}"
         change_role_user_html: "%{name} mengubah peranan %{target}"
-        confirm_user_html: "%{name} telah mengesahkan alamat e-mel pengguna %{target}"
         create_account_warning_html: "%{name} telah memberi amaran kepada %{target}"
         create_announcement_html: "%{name} telah mencipta pengumuman baharu %{target}"
-        create_canonical_email_block_html: "%{name} menyekat e-mel dengan cincangan %{target}"
         create_custom_emoji_html: "%{name} telah memuat naik emoji baharu %{target}"
         create_domain_allow_html: "%{name} membenarkan persekutuan dengan domain %{target}"
         create_domain_block_html: "%{name} telah menyekat domain %{target}"
-        create_email_domain_block_html: "%{name} telah menyekat domain e-mel %{target}"
         create_ip_block_html: "%{name} telah mencipta peraturan alamat IP %{target}"
         create_unavailable_domain_html: "%{name} telah menghentikan penghantaran ke domain %{target}"
         create_user_role_html: "%{name} mewujudkan peranan %{target}"
         demote_user_html: "%{name} telah menurunkan taraf pengguna %{target}"
         destroy_announcement_html: "%{name} telah memadamkan pengumuman %{target}"
-        destroy_canonical_email_block_html: "%{name} telah menyahsekat e-mel dengan hash %{target}"
         destroy_custom_emoji_html: "%{name} telah memadam emoji %{target}"
         destroy_domain_allow_html: "%{name} telah membuang kebenaran persekutuan dengan domain %{target}"
         destroy_domain_block_html: "%{name} telah menyahsekat domain %{target}"
-        destroy_email_domain_block_html: "%{name} telah menyahsekat domain e-mel %{target}"
         destroy_instance_html: "%{name} telah memadam domain %{target}"
         destroy_ip_block_html: "%{name} telah memadamkan peraturan untuk alamat IP %{target}"
         destroy_status_html: "%{name} telah membuang hantaran oleh %{target}"
@@ -256,10 +239,8 @@ ms:
         destroy_user_role_html: "%{name} telah memadam peranan %{target}"
         disable_2fa_user_html: "%{name} menyahdayakan keperluan dua faktor bagi pengguna %{target}"
         disable_custom_emoji_html: "%{name} telah menyahdayakan emoji %{target}"
-        disable_sign_in_token_auth_user_html: "%{name} melumpuhkan pengesahan token e-mel untuk %{target}"
         disable_user_html: "%{name} telah menyahdayakan log masuk bagi pengguna %{target}"
         enable_custom_emoji_html: "%{name} telah mendayakan emoji %{target}"
-        enable_sign_in_token_auth_user_html: "%{name} mendayakan pengesahan token e-mel untuk %{target}"
         enable_user_html: "%{name} telah mendayakan log masuk untuk pengguna %{target}"
         memorialize_account_html: "%{name} telah mengubah akaun %{target} menjadi halaman kenangan"
         promote_user_html: "%{name} telah menaikkan taraf pengguna %{target}"
@@ -267,7 +248,6 @@ ms:
         reject_user_html: "%{name} menolak pendaftaran daripada %{target}"
         remove_avatar_user_html: "%{name} telah membuang avatar %{target}"
         reopen_report_html: "%{name} telah membuka semula laporan %{target}"
-        resend_user_html: "%{name} menghantar semula e-mel pengesahan untuk %{target}"
         reset_password_user_html: "%{name} telah menetapkan semula kata laluan pengguna %{target}"
         resolve_report_html: "%{name} telah menyelesaikan laporan %{target}"
         sensitive_account_html: "%{name} telah menanda media %{target} sebagai sensitif"
@@ -420,7 +400,6 @@ ms:
       add_new: Tambah baharu
       attempts_over_week:
         other: "%{count} cubaan pendaftaran sepanjang minggu lepas"
-      created_msg: Telah berjaya menyekat domain e-mel
       delete: Padam
       dns:
         types:
@@ -429,12 +408,8 @@ ms:
       new:
         create: Tambah domain
         resolve: Menyelesaikan domain
-        title: Sekat domain e-mel baharu
-      no_email_domain_block_selected: Tiada sekatan domain e-mel diubah kerana tiada yang dipilih
       not_permitted: Tidak dibenarkan
-      resolved_dns_records_hint_html: Nama domain diselesaikan kepada domain MX berikut, yang akhirnya bertanggungjawab untuk menerima e-mel. Menyekat domain MX akan menyekat pendaftaran daripada mana-mana alamat e-mel yang menggunakan domain MX yang sama, walaupun nama domain yang kelihatan berbeza. <strong>Berhati-hati untuk tidak menyekat penyedia e-mel utama.</strong>
       resolved_through_html: Diselesaikan melalui %{domain}
-      title: Domain e-mel disekat
     export_domain_allows:
       new:
         title: Import kebenaran domain
@@ -581,7 +556,6 @@ ms:
         resolve_description_html: Tiada tindakan akan diambil terhadap akaun yang dilaporkan, tiada pelanggaran direkodkan dan laporan akan ditutup.
         silence_description_html: Akaun itu akan kelihatan hanya kepada mereka yang telah mengikutinya atau mencarinya secara manual, mengehadkan capaiannya dengan teruk. Sentiasa boleh dikembalikan. Menutup semua laporan terhadap akaun ini.
         suspend_description_html: Akaun dan semua kandungannya akan tidak boleh diakses dan akhirnya dipadamkan, dan berinteraksi dengannya adalah mustahil. Boleh diterbalikkan dalam masa 30 hari. Menutup semua laporan terhadap akaun ini.
-      actions_description_html: Tentukan tindakan yang perlu diambil untuk menyelesaikan laporan ini. Jika anda mengambil tindakan menghukum terhadap akaun yang dilaporkan, pemberitahuan e-mel akan dihantar kepada mereka, kecuali apabila kategori <strong>Spam</strong> dipilih.
       actions_description_remote_html: Tentukan tindakan yang perlu diambil untuk menyelesaikan laporan ini. Ini hanya akan menjejaskan cara server<strong>anda</strong> berkomunikasi dengan akaun jauh ini dan mengendalikan kandungannya.
       add_to_report: Tambahkan lebih banyak pada laporan
       are_you_sure: Adakah anda pasti?
@@ -641,7 +615,6 @@ ms:
         delete_data_html: Padamkan profil dan kandungan <strong>@%{acct}</strong> 30 hari dari sekarang melainkan mereka dibatalkan penggantungan buat sementara waktu
         preview_preamble_html: "<strong>@%{acct}</strong> akan menerima amaran dengan kandungan berikut:"
         record_strike_html: Rakam bantahan terhadap <strong>@%{acct}</strong> untuk membantu anda mempertingkatkan tentang pelanggaran akaun ini pada masa hadapan
-        send_email_html: Hantar <strong>@%{acct}</strong> e-mel amaran
         warning_placeholder: Penaakulan tambahan pilihan untuk tindakan penyederhanaan.
       target_origin: Asalan akaun yang dilaporkan
       title: Laporan
@@ -679,7 +652,6 @@ ms:
         manage_appeals: Menguruskan rayuan
         manage_appeals_description: Membenarkan pengguna menyemak rayuan terhadap tindakan penyederhanaan
         manage_blocks: Menguruskan sekatan
-        manage_blocks_description: Membenarkan pengguna menyekat pembekal e-mel dan alamat IP
         manage_custom_emojis: Menguruskan emoji tersuai
         manage_custom_emojis_description: Membenarkan pengguna menguruskan emoji tersuai pada pelayan
         manage_federation: Menguruskan persekutuan
@@ -697,7 +669,6 @@ ms:
         manage_taxonomies: Uruskan Taksonomi
         manage_taxonomies_description: Membenarkan pengguna menyemak kandungan sohor kini dan mengemas kini tetapan tanda pagar
         manage_user_access: Uruskan Akses Pengguna
-        manage_user_access_description: Membenarkan pengguna melumpuhkan pengesahan dwifaktor pengguna lain, mengubah alamat e-mel dan menetapkan semula kata laluan mereka
         manage_users: Uruskan Pengguna
         manage_users_description: Membenarkan pengguna melihat butiran pengguna lain dan melaksanakan tindakan penyederhanaan terhadapnya
         manage_webhooks: Menguruskan webhook
@@ -768,7 +739,6 @@ ms:
       destroyed_msg: Muat naik tapak berjaya dihapuskan!
     software_updates:
       critical_update: Penting — sila kemas kini dengan segera
-      description: Disarankan untuk memastikan pemasangan Mastodon anda dikemas kini bagi mendapat manfaat daripada pembaikan dan ciri terkini. Selain itu, kadangkala penting untuk mengemas kini Mastodon tepat pada masanya untuk mengelakkan isu keselamatan. Atas sebab ini, Mastodon menyemak kemas kini setiap 30 minit dan akan memberitahu anda mengikut keutamaan pemberitahuan e-mel anda.
       documentation_link: Ketahui lebih lanjut
       release_notes: Catatan keluaran
       title: Kemas kini tersedia
@@ -917,7 +887,6 @@ ms:
         usage_comparison: Digunakan %{today} kali hari ini, berbanding %{yesterday} semalam
         used_by_over_week:
           other: Digunakan oleh %{count} orang sepanjang minggu lepas
-      title: Sohor kini
       trending: Sohor kini
     warning_presets:
       add_new: Tambah baharu
@@ -997,9 +966,7 @@ ms:
       guide_link_text: Sesiapa sahaja boleh memberi sumbangan.
     sensitive_content: Kandungan sensitif
   application_mailer:
-    notification_preferences: Tukar keutamaan e-mel
     salutation: "%{name},"
-    settings: 'Tukar pilihan e-mel: %{link}'
     unsubscribe: Nyahlanggan
     view: 'Lihat:'
     view_profile: Lihat profil
@@ -1018,8 +985,6 @@ ms:
       help_html: Jika anda menghadapi masalah menyelesaikan CAPTCHA, anda boleh menghubungi kami melalui %{email} dan kami boleh membantu anda.
       hint_html: Hanya satu perkara lagi! Kami perlu mengesahkan anda seorang manusia (ini supaya kami dapat mengelakkan spam!). Selesaikan CAPTCHA di bawah dan klik "Teruskan".
       title: Pemeriksaan keselamatan
-    confirmations:
-      wrong_email_hint: Jika alamat e-mel itu tidak betul, anda boleh menukarnya dalam tetapan akaun.
     delete_account: Padam akaun
     delete_account_html: Jika anda ingin memadamkan akaun anda, anda boleh <a href="%{path}">teruskan ke sini</a>. Anda akan diminta untuk pengesahan.
     description:
@@ -1040,7 +1005,6 @@ ms:
     or_log_in_with: Atau daftar masuk dengan
     privacy_policy_agreement_html: Saya telah membaca dan bersetuju menerima <a href="%{privacy_policy_path}" target="_blank">dasar privasi</a>
     progress:
-      confirm: Sahkan E-mel
       details: Maklumat anda
       review: Ulasan kami
       rules: Terima peraturan
@@ -1062,10 +1026,8 @@ ms:
     security: Keselamatan
     set_new_password: Tetapkan kata laluan baharu
     setup:
-      email_below_hint_html: Semak folder spam anda atau minta folder lain. Anda boleh membetulkan alamat e-mel anda jika ia salah.
       email_settings_hint_html: Klik pautan yang kami hantar kepada anda untuk mengesahkan %{email}. Kami akan tunggu di sini.
       link_not_received: Tidak mendapat pautan?
-      new_confirmation_instructions_sent: Anda akan menerima e-mel baharu dengan pautan pengesahan dalam beberapa minit!
       title: Semak peti masuk anda
     sign_in:
       preamble_html: Log masuk dengan bukti kelayakan <strong>%{domain}</strong> anda. Jika akaun anda dihoskan pada server lain, anda tidak akan dapat log masuk di sini.
@@ -1076,9 +1038,7 @@ ms:
       title: Mari sediakan anda pada %{domain}.
     status:
       account_status: Status akaun
-      confirming: Menunggu pengesahan e-mel untuk diselesaikan.
       functional: Akaun anda beroperasi sepenuhnya.
-      pending: Permohonan anda sedang menunggu semakan oleh kakitangan kami. Ini mungkin mengambil sedikit masa. Anda akan menerima e-mel sekiranya permohonan anda diluluskan.
       redirecting_to: Akaun anda tidak aktif kerana ia sedang mengubah hala ke %{acct}.
       self_destruct: Memandangkan %{domain} akan ditutup, anda hanya akan mendapat capaian terhad kepada akaun anda.
       view_strikes: Lihat pelanggaran yang lepas terhadap akaun anda
@@ -1121,9 +1081,6 @@ ms:
       before: 'Sebelum meneruskan, sila baca nota ini dengan teliti:'
       caches: Kandungan yang telah dicache oleh server lain mungkin berterusan
       data_removal: Pos anda dan data lain akan dialih keluar secara kekal
-      email_change_html: Anda boleh <a href="%{path}">menukar alamat e-mel anda</a> tanpa memadamkan akaun anda
-      email_contact_html: Jika ia masih tidak sampai, anda boleh menghantar e-mel kepada <a href="mailto:%{email}">%{email}</a> untuk mendapatkan bantuan
-      email_reconfirmation_html: Jika anda tidak menerima e-mel pengesahan, anda boleh <a href="%{path}">memintanya semula</a>
       irreversible: Anda tidak akan dapat memulihkan atau mengaktifkan semula akaun anda
       more_details_html: Untuk butiran lanjut, lihat <a href="%{terms_path}">dasar privasi</a>.
       username_available: Nama pengguna anda akan tersedia semula
@@ -1338,7 +1295,6 @@ ms:
     authentication_methods:
       otp: aplikasi pengesahan dua faktor
       password: kata laluan
-      sign_in_token: e-mel kod keselamatan
       webauthn: kunci keselamatan
     description_html: Jika anda melihat aktiviti yang anda tidak kenali, pertimbangkan untuk menukar kata laluan anda dan dayakan pengesahan dua faktor.
     empty: Tiada sejarah pengesahan tersedia
@@ -1349,16 +1305,6 @@ ms:
     unsubscribe:
       action: Ya, nyahlanggan
       complete: Menyahlanggan
-      confirmation_html: Adakah anda pasti mahu berhenti melanggan daripada menerima %{type} untuk Mastodon pada %{domain} ke e-mel anda di %{email}? Anda sentiasa boleh melanggan semula daripada <a href="%{settings_path}">tetapan pemberitahuan e-mel</a> anda.
-      emails:
-        notification_emails:
-          favourite: e-mel pemberitahuan kegemaran
-          follow: ikuti e-mel notifikasi
-          follow_request: ikuti e-mel permintaan
-          mention: menyebut e-mel pemberitahuan
-          reblog: meningkatkan e-mel notifikasi
-      resubscribe_html: Jika anda tersilap menyahlanggan, anda boleh melanggan semula daripada <a href="%{settings_path}">tetapan pemberitahuan e-mel</a> anda.
-      success_html: Anda tidak lagi akan menerima %{type} untuk Mastodon pada %{domain} ke e-mel anda di %{email}.
       title: Hentikan langganan
   media_attachments:
     validations:
@@ -1438,8 +1384,6 @@ ms:
     update:
       subject: "%{name} telah menyunting satu hantaran"
   notifications:
-    administration_emails: Notifikasi e-mel pentadbir
-    email_events: Acara untuk pemberitahuan e-mel
     email_events_hint: 'Pilih acara yang ingin anda terima pemberitahuan:'
   number:
     human:
@@ -1772,7 +1716,6 @@ ms:
     go_to_sso_account_settings: Pergi ke tetapan akaun pembekal identiti anda
     invalid_otp_token: Kod dua faktor tidak sah
     otp_lost_help_html: Jika anda kehilangan akses kepada kedua-duanya, anda boleh menghubungi %{email}
-    seamless_external_login: Anda telah log masuk melalui perkhidmatan luaran, jadi kata laluan dan tetapan e-mel tidak tersedia.
     signed_in_as: 'Didaftar masuk sebagai:'
   verification:
     extra_instructions_html: <strong>Petua:</strong> Pautan di tapak web anda mungkin tidak kelihatan. Bahagian penting ialah <code>rel="me"</code> yang menghalang penyamaran pada tapak web dengan kandungan yang dijana pengguna. Anda juga boleh menggunakan tag <code>link</code> dalam pengepala halaman dan bukannya <code>a</code>, tetapi HTML mesti boleh diakses tanpa melaksanakan JavaScript.
diff --git a/config/locales/my.yml b/config/locales/my.yml
index f28458360b5b3b..76372ba174fa01 100644
--- a/config/locales/my.yml
+++ b/config/locales/my.yml
@@ -29,7 +29,6 @@ my:
       created_msg: စိစစ်ခြင်းမှတ်စုကို ဖန်တီးပြီးပါပြီ။
       destroyed_msg: စိစစ်ခြင်းမှတ်စုကို ဖျက်ပစ်လိုက်ပါပြီ။
     accounts:
-      add_email_domain_block: ဒိုမိန်းကိုပိတ်မည်
       approve: အတည်ပြုပါ
       approved_msg: "%{username} ၏ စာရင်းသွင်းခြင်းကို အတည်ပြုပြီးပါပြီ"
       are_you_sure: သေချာပါသလား။
@@ -56,7 +55,6 @@ my:
       demote: အဆင့်လျော့မည်
       destroyed_msg: "%{username} ၏ အချက်အလက်ကို မကြာမီ ဖျက်ပါမည်"
       disable: ရပ်တန့်
-      disable_sign_in_token_auth: အီးမေးတိုကင် အထောက်အထားပြခြင်းကို ပိတ်ပါ
       disable_two_factor_authentication: 2FA ကို ပိတ်ပါ
       disabled: အကောင့်ပိတ်သိမ်းထားသည်
       display_name: ဖော်ပြမည့်အမည်
@@ -65,7 +63,6 @@ my:
       email: အီးမေးလ်
       email_status: အီးမေးလ်အခြေအနေ
       enable: မပိတ်သိမ်းထားသော
-      enable_sign_in_token_auth: အီးမေးတိုကင် စစ်မှန်ကြောင်းအတည်ပြုချက်ကို ဖွင့်ပါ
       enabled: ဖွင့်ထားသည်
       enabled_msg: "%{username} ၏ အကောင့်ကို ပိတ်သိမ်းထားသည်"
       followers: စောင့်ကြည့်သူများ
@@ -129,7 +126,6 @@ my:
       resubscribe: ပြန်လည်စာရင်းသွင်းပါ
       role: အခန်းကဏ္ဍ
       search: ရှာရန်
-      search_same_email_domain: အီးမေးလ်ဒိုမိန်းတူညီသည့် အခြားအသုံးပြုသူများ
       search_same_ip: IP တူတူ အသုံးပြုသော အခြားသူများ
       security: လုံခြုံရေး
       security_measures:
@@ -170,26 +166,21 @@ my:
         approve_appeal: အယူခံကို အတည်ပြုပါ
         approve_user: အသုံးပြုသူကို အတည်ပြုရန်
         assigned_to_self_report: မှတ်တမ်းကိုတစ်ယောက်ယောက်အားလုပ်ခိုင်းမည်
-        change_email_user: အသုံးပြုသူအတွက် အီးမေးလ်ပြောင်းရန်
         change_role_user: အသုံးပြုသူ၏ အခန်းကဏ္ဍကို ပြောင်းလဲရန်
         confirm_user: အသုံးပြုသူကို လက်ခံရန်
         create_account_warning: သတိပေးချက်ဖန်တီးပါ
         create_announcement: ကြေညာချက်ဖန်တီးပါ
-        create_canonical_email_block: အီးမေးလ်ပိတ်ပင်ခြင်းအား ဖန်တီးရန်
         create_custom_emoji: စိတ်ကြိုက်အီမိုဂျီ ဖန်တီးပါ
         create_domain_allow: ဒိုမိန်းခွင့်ပြုခြင်းကို ဖန်တီးရန်
         create_domain_block: ဒိုမိန်းပိတ်ပင်ခြင်းအား ဖန်တီးရန်
-        create_email_domain_block: အီးမေးလ်ဒိုမိန်းပိတ်ပင်ခြင်းအား ဖန်တီးရန်
         create_ip_block: IP စည်းမျဉ်း ဖန်တီးရန်
         create_unavailable_domain: အသုံးမပြုနိုင်သောဒိုမိန်းကို ဖန်တီးပါ
         create_user_role: အခန်းကဏ္ဍဖန်တီးပါ
         demote_user: အသုံးပြုသူကိုအဆင့်လျော့ချမည်
         destroy_announcement: ကြေညာချက်ကို ဖျက်ပါ
-        destroy_canonical_email_block: အီးမေးလ်ပိတ်ပင်ခြင်းအား ဖျက်ရန်
         destroy_custom_emoji: စိတ်ကြိုက်အီမိုဂျီကို ဖျက်ရန်
         destroy_domain_allow: ဒိုမိန်းခွင့်ပြုခြင်းကို ဖျက်ရန်
         destroy_domain_block: ဒိုမိန်းပိတ်ပင်ခြင်းအား ဖျက်ရန်
-        destroy_email_domain_block: အီးမေးလ်ဒိုမိန်းပိတ်ပင်ခြင်းအား ဖျက်ရန်
         destroy_instance: ဒိုမိန်းကို ဖယ်ရှားပါ
         destroy_ip_block: IP စည်းမျဉ်းကို ဖျက်ပါ
         destroy_status: Post ကို ဖျက်ပါ
@@ -197,10 +188,8 @@ my:
         destroy_user_role: အခန်းကဏ္ဍကို ဖျက်ပါ
         disable_2fa_user: 2FA ကို ပိတ်ပါ
         disable_custom_emoji: စိတ်ကြိုက်အီမိုဂျီကို ပိတ်ပါ
-        disable_sign_in_token_auth_user: အသုံးပြုသူအတွက် အီးမေးလ်တိုကင် အထောက်အထားပြခြင်းကို ပိတ်ထားသည်
         disable_user: အသုံးပြုသူကို ပိတ်ပါ
         enable_custom_emoji: စိတ်ကြိုက်အီမိုဂျီကို ဖွင့်ပါ
-        enable_sign_in_token_auth_user: အသုံးပြုသူအတွက် အီးမေးလ်တိုကင် အထောက်အထားပြခြင်းကို ဖွင့်ထားသည်
         enable_user: အသုံးပြုသူကို ဖွင့်ပါ
         memorialize_account: အမှတ်တရအကောင့်
         promote_user: အသုံးပြုသူ မြှင့်တင်ရန်
@@ -229,26 +218,20 @@ my:
         approve_appeal_html: "%{name} က %{target} မှ စိစစ်ဆုံးဖြတ်ချက်အယူခံဝင်ခြင်းကို အတည်ပြုခဲ့သည်"
         approve_user_html: " %{name} က %{target} မှ အကောင့်ဖွင့်ခြင်းကို အတည်ပြုထားသည်"
         assigned_to_self_report_html: "%{name} က အစီရင်ခံစာ %{target} များကို ၎င်းတို့ထံ ပေးအပ်ခဲ့သည်"
-        change_email_user_html: "%{name} က အသုံးပြုသူ %{target} ၏ အီးမေးလ်လိပ်စာကို ပြောင်းခဲ့သည်"
         change_role_user_html: "%{name} က %{target} ၏ အခန်းကဏ္ဍကို ပြောင်းခဲ့သည်"
-        confirm_user_html: "%{name} က အသုံးပြုသူ %{target} ၏ အီးမေးလ်လိပ်စာကို အတည်ပြုခဲ့သည်"
         create_account_warning_html: "%{name} က %{target} သို့ သတိပေးချက်တစ်ခု ပေးပို့ခဲ့သည်"
         create_announcement_html: "%{name} က ကြေညာချက်အသစ် %{target} ကို ဖန်တီးခဲ့သည်"
-        create_canonical_email_block_html: "%{name} က ဟက်ရှ် %{target} ဖြင့် အီးမေးလ်ကို ပိတ်ပင်ထားသည်"
         create_custom_emoji_html: "%{name} က အီမိုဂျီ %{target} အသစ်ကို ပြင်ဆင်ခဲ့သည်"
         create_domain_allow_html: "%{name} က ဒိုမိန်း %{target} ဖြင့် ဖက်ဒီကို ခွင့်ပြုခဲ့သည်"
         create_domain_block_html: "%{name} က ဒိုမိန်း %{target} ကို ပိတ်ပင်ထားသည်"
-        create_email_domain_block_html: "%{name} က အီးမေးလ်ဒိုမိန်း %{target} ကို ပိတ်ပင်ထားသည်"
         create_ip_block_html: "%{name} က IP %{target} အတွက် စည်းမျဉ်းကို ဖန်တီးထားသည်"
         create_unavailable_domain_html: "%{name} က ဒိုမိန်း %{target} သို့ ပေးပို့မှုကို ရပ်လိုက်သည်"
         create_user_role_html: "%{name} က %{target} အခန်းကဏ္ဍကို ဖန်တီးပြီးပါပြီ"
         demote_user_html: "%{name} က အသုံးပြုသူ %{target} ကို ဖြုတ်ပြီးပါပြီ"
         destroy_announcement_html: "%{name} က ကြေညာချက် %{target} ကို ဖျက်လိုက်သည်"
-        destroy_canonical_email_block_html: ဟက်ရှ် %{target} ဖြင့် %{name} အီးမေးလ်ပိတ်သိမ်းထားခြင်းကို ဖယ်ရှားပြီးပါပြီ
         destroy_custom_emoji_html: "%{name} ဖျက်လိုက်သော အီမိုဂျီ %{target}"
         destroy_domain_allow_html: "%{name} က ဒိုမိန်း %{target} ဖြင့် ဖက်ဒီကို ခွင့်မပြုခဲ့ပါ"
         destroy_domain_block_html: "%{name} မှ ပြန်ဖွင့်လိုက်သော ဒိုမိန်း %{target}"
-        destroy_email_domain_block_html: "%{name} က အီးမေးလ်ဒိုမိန်း %{target} ကို ပြန်ဖွင့်ထားသည်"
         destroy_instance_html: "%{name} က ဒိုမိန်း %{target} ကို ဖယ်ရှားခဲ့သည်"
         destroy_ip_block_html: "%{name} က IP %{target} အတွက် စည်းမျဉ်းကို ဖျက်ထားသည်"
         destroy_status_html: "%{name} က %{target} မှ တင်ထားသောပို့စ်ကို  ဖယ်ရှားခဲ့သည်"
@@ -256,10 +239,8 @@ my:
         destroy_user_role_html: "%{name} ဖျက်ထားသော အခန်းကဏ္ဍ %{target} "
         disable_2fa_user_html: "%{name} က အသုံးပြုသူ %{target} အတွက် နှစ်ဆင့်ခံလုံခြုံရေးလိုအပ်ချက်ကို ပိတ်ထားသည်"
         disable_custom_emoji_html: "%{name} ပိတ်ထားသောအီမိုဂျီ %{target}"
-        disable_sign_in_token_auth_user_html: "%{name}  က %{target} အတွက် အီးမေးလ်တိုကင် အထောက်အထားပြခြင်းကို ပိတ်ထားသည်"
         disable_user_html: "%{name} က အသုံးပြုသူ %{target} အတွက် အကောင့်ဝင်ခြင်းကို ပိတ်ထားသည်"
         enable_custom_emoji_html: "%{name} ဖွင့်ထားသည့် အီမိုဂျီ %{target}"
-        enable_sign_in_token_auth_user_html: "%{name} က %{target} အတွက် အီးမေးလ်တိုကင် အထောက်အထားပြခြင်းကို ဖွင့်ထားသည်"
         enable_user_html: "%{name} က အသုံးပြုသူ %{target} အတွက် အကောင့်ဝင်ခြင်းကို ဖွင့်ထားသည်"
         memorialize_account_html: "%{name} က %{target} ၏ အကောင့်ကို အမှတ်တရ စာမျက်နှာအဖြစ် ပြောင်းလဲခဲ့သည်"
         promote_user_html: "%{name} က အသုံးပြုသူ %{target} ကို ထောက်ခံခဲ့သည်"
@@ -267,7 +248,6 @@ my:
         reject_user_html: "%{name} က %{target} မှတစ်ဆင့် အကောင့်ဖွင့်ခြင်းကို ပယ်ချခဲ့သည်"
         remove_avatar_user_html: "%{name} က %{target} ၏ ကိုယ်စားပြုရုပ်ပုံကို ဖယ်ရှားခဲ့သည်"
         reopen_report_html: "%{name} က အစီရင်ခံစာ %{target} ကို ပြန်ဖွင့်ခဲ့သည်"
-        resend_user_html: "%{name} က %{target} အတွက် အတည်ပြုချက်အီးမေးလ်ကို  ပြန်ပို့ခဲ့သည်"
         reset_password_user_html: "%{name} က အသုံးပြုသူ %{target} ၏ စကားဝှက်ကို ပြန်လည်သတ်မှတ်ခဲ့သည်"
         resolve_report_html: "%{name} က အစီရင်ခံစာ %{target} ကို ဖြေရှင်းထားသည်"
         sensitive_account_html: "%{name} က %{target} ၏ မီဒီယာကို သတိထားရသောမီဒီယာအဖြစ် အမှတ်အသားပြုထားသည်"
@@ -420,7 +400,6 @@ my:
       add_new: အသစ် ထည့်ပါ
       attempts_over_week:
         other: ပြီးခဲ့သည့် ရက်သတ္တပတ်အတွင်း %{count} ကြိုးပမ်းမှု
-      created_msg: အီးမေးလ်ဒိုမိန်းကို ပိတ်ပင်နိုင်ခဲ့ပါသည်
       delete: ဖျက်ပါ
       dns:
         types:
@@ -429,12 +408,8 @@ my:
       new:
         create: ဒိုမိန်းထည့်ပါ
         resolve: ဒိုမိန်းကို ဖြေရှင်းရန်
-        title: အီးမေးလ်ဒိုမိန်းအသစ်ကို ပိတ်ရန်
-      no_email_domain_block_selected: မည်သည့်အီးမေးလ်ဒိုမိန်းပိတ်ပင်ခြင်းကိုမျှ ရွေးချယ်ထားခြင်းမရှိသောကြောင့် ပြောင်းလဲခြင်းမရှိပါ
       not_permitted: ခွင့်ပြုထားခြင်းမရှိပါ
-      resolved_dns_records_hint_html: ဒိုမိန်းအမည်သည် အီးမေးလ်လက်ခံခြင်းအတွက် နောက်ဆုံးတွင် တာဝန်ရှိသည့် အောက်ပါ MX ဒိုမိန်းများသို့ ဖြေရှင်းပေးသည်။ MX ဒိုမိန်းကို ပိတ်ဆို့ခြင်းသည် တူညီသော MX ဒိုမိန်းကို အသုံးပြုသည့် မည်သည့်အီးမေးလ်လိပ်စာမှ အကောင့်ဖွင့်ခြင်းများကို ပိတ်ဆို့စေမည်၊ မြင်နိုင်သောဒိုမိန်းအမည်သည် ကွဲပြားသော်လည်း၊ <strong>အဓိက အီးမေးလ်ဝန်ဆောင်မှုပေးသူများကို မပိတ်ဆို့ရန် သတိထားပါ။</strong>
       resolved_through_html: "%{domain} မှတစ်ဆင့် ဖြေရှင်းခဲ့သည်"
-      title: ပိတ်ပင်ထားသော အီးမေးလ်ဒိုမိန်းများ
     export_domain_allows:
       new:
         title: ဒိုမိန်းတင်သွင်းခွင့်ပြုသည်
@@ -581,7 +556,6 @@ my:
         resolve_description_html: တိုင်ကြားထားသည့်အကောင့်ကို အရေးယူမည်မဟုတ်ပါ၊ လုပ်ဆောင်ချက်ကို မှတ်တမ်းတင်ထားခြင်းမရှိသည့်အပြင် တိုင်ကြားထားမှုကိုလည်း ရုပ်သိမ်းပါမည်။
         silence_description_html: အကောင့်ကို စောင့်ကြည့်ထားသူများ သို့မဟုတ် ရှာဖွေသူများသာ မြင်နိုင်မည်ဖြစ်ပါသည်။ အကောင့်တွေ့ရှိမှုအား ကန့်သတ်ထားသော်လည်း ပြန်ပြောင်းဆောင်ရွက်နိုင်ပါသည်။ ဤအကောင့်နှင့်ပတ်သက်သည့် မှတ်တမ်းအားလုံးကို ပိတ်ပါမည်။
         suspend_description_html: အကောင့်နှင့် ၎င်း၏အကြောင်းအရာအားလုံးမှာ သုံးခွင့်မရတော့သဖြင့် နောက်ဆုံးတွင် ဖျက်ပစ်မည်ဖြစ်ပါသည်။ ၎င်းနှင့် အပြန်အလှန်မတုံ့ပြန်နိုင်တော့သော်လည်း ရက် ၃၀ အတွင်း ပြန်ယူ၍ရနိုင်ပါသည်။ ဤအကောင့်နှင့်ပတ်သက်သည့် မှတ်တမ်းအားလုံးကို ပိတ်ပါမည်။
-      actions_description_html: ဤမှတ်တမ်းဖြေရှင်းရန်အတွက် မည်သည့်လုပ်ဆောင်ချက် ဆောင်ရွက်မည်ကို ဆုံးဖြတ်ပါ။ တိုင်ကြားထားသောအကောင့်ကို ဆောင်ရွက်လိုပါက <strong>Spam</strong> မရွေးချယ်ဘဲ အီးမေးလ်အကြောင်းကြားစာ ပေးပို့ရပါမည်။
       actions_description_remote_html: ဤမှတ်တမ်းဖြေရှင်းရန်အတွက် မည်သည့်လုပ်ဆောင်ချက် ဆောင်ရွက်မည်ကို ဆုံးဖြတ်ပါ။ <strong>သင်၏</strong> ဆာဗာသည် အဝေးမှထိန်းချုပ်ထားသောအကောင့်နှင့် ဆက်သွယ်ပြီး အကြောင်းအရာကိုင်တွယ်ပုံပေါ်မှာသာ သက်ရောက်မှုရှိမည်ဖြစ်သည်။
       add_to_report: အစီရင်ခံစာထပ်ထည့်ရန်
       are_you_sure: သေချာပါသလား။
@@ -641,7 +615,6 @@ my:
         delete_data_html: "<strong>@%{acct}</strong> ၏ ပရိုဖိုင်နှင့် အကြောင်းအရာများကို ဆိုင်းငံ့ထားခြင်းမရှိပါက ယခုမှ ရက်ပေါင်း ၃၀ အတွင်း ဖျက်ရန်"
         preview_preamble_html: "<strong>@%{acct}</strong> သည် အောက်ပါအကြောင်းအရာများကြောင့် သတိပေးချက်ကို လက်ခံရရှိပါမည် -"
         record_strike_html: ဤအကောင့်မှ နောင်လာမည့် ချိုးဖောက်မှုများအတွက် အရေးယူနိုင်ရန်  <strong>@%{acct}</strong> သတိပေးချက်တစ်ခု မှတ်တမ်းယူထားပါ
-        send_email_html: သတိပေးချက် အီးမေးလ်တစ်စောင် <strong>@%{acct}</strong> ပေးပို့ပါ
         warning_placeholder: စိစစ်ခြင်းအတွက် ရွေးချယ်နိုင်သော ထပ်လောင်းအကြောင်းပြချက်။
       target_origin: တိုင်ကြားထားသောအကောင့်၏ မူလအစ
       title: မှတ်တမ်းများ
@@ -679,7 +652,6 @@ my:
         manage_appeals: အယူခံဝင်ထားခြင်းများကို စီမံပါ
         manage_appeals_description: စိစစ်အရေးယူမှုများအပေါ် အယူခံဝင်မှုများ ပြန်လည်သုံးသပ်ရန်အတွက် အသုံးပြုသူများအား ခွင့်ပြုရန်
         manage_blocks: ပိတ်ပင်ထားမှုများကို စီမံပါ
-        manage_blocks_description: အသုံးပြုသူများအား အီးမေးလ်ဝန်ဆောင်မှုပေးသူများနှင့် IP လိပ်စာများကို ပိတ်ဆို့ရန် ခွင့်ပြုသည်
         manage_custom_emojis: စိတ်ကြိုက်အီမိုဂျီများကို ပြင်ဆင်ရန်
         manage_custom_emojis_description: အသုံးပြုသူများအား ဆာဗာပေါ်တွင် စိတ်ကြိုက်အီမိုဂျီများကို စီမံခန့်ခွဲရန် ခွင့်ပြုသည်။
         manage_federation: ဖက်ဒီကို စီမံပါ
@@ -697,7 +669,6 @@ my:
         manage_taxonomies: အမျိုးအစားခွဲခြားပါ
         manage_taxonomies_description: ခေတ်စားနေသော အကြောင်းအရာများကို ပြန်လည်သုံးသပ်ရန်နှင့် hashtag သတ်မှတ်ချက်များကို ပြင်ဆင်ရန်အတွက် အသုံးပြုသူများကို ခွင့်ပြုသည်
         manage_user_access: အသုံးပြုသူဝင်ရောက်မှုကို စီမံပါ
-        manage_user_access_description: အသုံးပြုသူများကို အခြားအသုံးပြုသူများ၏ နှစ်ဆင့်ခံလုံခြုံရေးစနစ်ကို ပိတ်ရန်၊ ၎င်းတို့၏ အီးမေးလ်လိပ်စာကို ပြောင်းလဲရန်နှင့် စကားဝှက်ကို ပြန်လည်သတ်မှတ်ရန် ခွင့်ပြုသည်
         manage_users: အသုံးပြုသူများကို စီမံပါ
         manage_users_description: အသုံးပြုသူများအား အခြားအသုံးပြုသူများ၏ အသေးစိတ်အချက်အလက်များကို ကြည့်ရှုနိုင်ပြီး ၎င်းတို့နှင့် ဆန့်ကျင်သည့် စိစစ်အရေးယူမှုများကို လုပ်ဆောင်ခွင့်ပြုသည်
         manage_webhooks: Webhooks ကို စီမံပါ
@@ -902,7 +873,6 @@ my:
         usage_comparison: မနေ့က %{yesterday} နှင့် နှိုင်းယှဉ်လျှင် ယနေ့ %{today} ကြိမ် အသုံးပြုခဲ့သည်
         used_by_over_week:
           other: ပြီးခဲ့သည့် ရက်သတ္တပတ်အတွင်း လူ %{count} ဦး အသုံးပြုခဲ့သည်။
-      title: လက်ရှိခေတ်စားမှုများ
       trending: လက်ရှိခေတ်စားနေခြင်း
     warning_presets:
       add_new: အသစ်ထည့်ပါ
@@ -982,9 +952,7 @@ my:
       guide_link_text: လူတိုင်းပါဝင်ကူညီနိုင်ပါတယ်။
     sensitive_content: သတိထားရသော အကြောင်းအရာ
   application_mailer:
-    notification_preferences: အီးမေးလ် သတ်မှတ်ချက်များကို ပြောင်းပါ
     salutation: "%{name}"
-    settings: အီးမေးလ် သတ်မှတ်ချက်များကို ပြောင်းပါ - %{link}
     unsubscribe: စာရင်းမှထွက်ရန်
     view: ကြည့်ရှုရန် -
     view_profile: ပရိုဖိုင်ကိုကြည့်ရန်
@@ -1004,14 +972,12 @@ my:
       hint_html: နောက်ထပ်တစ်ခုသာ။ သင်သည် လူသားဖြစ်ကြောင်း ကျွန်ုပ်တို့ အတည်ပြုရန် လိုအပ်ပါသည် (စပမ်းများကို ရှောင်ရှားနိုင်စေရန် အတွက်ဖြစ်ပါသည်။) အောက်ပါ CAPTCHA ကိုဖြေရှင်းပြီး "Continue" ကို နှိပ်ပါ။
       title: လုံခြုံရေးစစ်ဆေးမှု
     confirmations:
-      awaiting_review: သင့်အီးမေးလ်လိပ်စာကို အတည်ပြုပြီးပါပြီ။ %{domain} စီမံသူများမှ ယခု သင်စာရင်းသွင်းခြင်းကို ပြန်လည်သုံးသပ်နေပါသည်။ သင့်အကောင့်ကို အတည်ပြုပါက အီးမေးလ်တစ်စောင် လက်ခံရရှိမည်ဖြစ်သည်။
       awaiting_review_title: သင် စာရင်သွင်းထားခြင်းကို စစ်ဆေးနေပါသည်
       clicking_this_link: ဤလင့်ခ်ကို နှိပ်ပါ
       login_link: အကောင့်ဝင်ရန်
       proceed_to_login_html: သင် ယခု %{login_link} သို့ ဆက်သွားနိုင်ပါပြီ။
       registration_complete: "%{domain} တွင် သင် စာရင်းသွင်းခြင်းမှာ မှန်ကန်ပါပြီ။"
       welcome_title: ကြိုဆိုပါတယ် %{name}။
-      wrong_email_hint: ထိုအီးမေးလ်လိပ်စာ မမှန်ပါက အကောင့်သတ်မှတ်ချက်များတွင် ပြောင်းလဲနိုင်သည်။
     delete_account: အကောင့်ဖျက်ပါ
     delete_account_html: သင့်အကောင့်ဖျက်လိုပါက<a href="%{path}">ဤနေရာတွင် ဆက်လက်လုပ်ဆောင်နိုင်သည်</a>။ အတည်ပြုချက်တောင်းပါမည်။
     description:
@@ -1032,7 +998,6 @@ my:
     or_log_in_with: သို့မဟုတ် အကောင့်ဖြင့် ဝင်ရောက်ပါ
     privacy_policy_agreement_html: <a href="%{privacy_policy_path}" target="_blank">ကိုယ်ရေးအချက်အလက်မူဝါဒ</a> ကို ဖတ်ပြီး သဘောတူလိုက်ပါပြီ
     progress:
-      confirm: အီးမေးလ် အတည်ပြုရန်
       details: သင့်အသေးစိတ်အချက်အလက်များ
       review: ကျွန်ုပ်တို့၏သုံးသပ်ချက်
       rules: စည်းကမ်းများကို လက်ခံပါ
@@ -1054,10 +1019,8 @@ my:
     security: လုံခြုံရေး
     set_new_password: စကားဝှက်အသစ် သတ်မှတ်ပါ။
     setup:
-      email_below_hint_html: သင်၏ Spam ဖိုင်တွဲကို စစ်ဆေးပါ၊ သို့မဟုတ် အခြားတစ်ခုကို တောင်းဆိုပါ။ သင့်အီးမေးလ်လိပ်စာမှားနေပါက သင်ပြင်ပေးနိုင်ပါသည်။
       email_settings_hint_html: "%{email} အတည်ပြုရန် သင့်ထံပေးပို့သော လင့်ခ်ကို နှိပ်ပါ။ စောင့်နေပါမည်။"
       link_not_received: လင့်ခ် မရခဲ့ဘူးလား။
-      new_confirmation_instructions_sent: မိနစ်အနည်းငယ်အတွင်း အတည်ပြုချက်လင့်ခ်ပါရှိသော အီးမေးလ်အသစ်ကို သင်ရရှိမည်ဖြစ်သည်။
       title: သင့်ဝင်စာပုံးကို စစ်ဆေးပါ
     sign_in:
       preamble_html: သင်၏ <strong>%{domain}</strong> အထောက်အထားများဖြင့် ဝင်ရောက်ပါ။ သင့်အကောင့်ကို အခြားဆာဗာတစ်ခုတွင် ဖွင့်ထားပါက ဤနေရာ၌ အကောင့်ဝင်ရောက်နိုင်မည်မဟုတ်ပါ။
@@ -1068,9 +1031,7 @@ my:
       title: "%{domain} တွင် ထည့်သွင်းရန်။"
     status:
       account_status: အကောင့်အခြေအနေ
-      confirming: အီးမေးလ်အတည်ပြုချက် အပြီးသတ်ရန် စောင့်ဆိုင်းခြင်း
       functional: သင့်အကောင့်မှာ အပြည့်အဝလုပ်ဆောင်နေပါပြီ။
-      pending: သင့်အက်ပလီကေးရှင်းကို ကျွန်ုပ်တို့၏ဝန်ထမ်းများမှ ပြန်လည်သုံးသပ်နေပါသည်။ အချိန်အနည်းငယ်ကြာနိုင်ပါသည်။ သင့်အက်ပလီကေးရှင်းကို အတည်ပြုပြီးပါက အီးမေးလ်တစ်စောင် သင် လက်ခံရရှိမည်ဖြစ်သည်။
       redirecting_to: သင့်အကောင့်မှာ လက်ရှိတွင် %{acct} သို့ ပြန်ညွှန်းနေသောကြောင့် သုံးစွဲ၍မရပါ။
       self_destruct: "%{domain} ပိတ်သွားသောကြောင့် သင့်အကောင့်သို့ အကန့်အသတ်ဖြင့်သာ ဝင်ရောက်နိုင်မည်ဖြစ်သည်။"
       view_strikes: သင့်အကောင့်ကို ဆန့်ကျင်သည့် ယခင်ကလုပ်ဆောင်ချက်များကို ကြည့်ပါ
@@ -1113,9 +1074,6 @@ my:
       before: ရှေ့မဆက်မီ ဤမှတ်စုများကို သေချာဖတ်ပါ -
       caches: အခြားဆာဗာများမှ ကက်ရှ်လုပ်ထားသော အကြောင်းအရာမှာ ဆက်ရှိနေနိုင်သည်
       data_removal: သင့်ပို့စ်များနှင့် အခြားအချက်အလက်များကို အပြီးတိုင် ဖယ်ရှားပါမည်
-      email_change_html: သင့်အကောင့်မဖျက်ဘဲ <a href="%{path}">သင့်အီးမေးလ်လိပ်စာကို ပြောင်းလဲနိုင်သည်</a>
-      email_contact_html: မရောက်သေးပါက အကူအညီအတွက် <a href="mailto:%{email}">%{email}</a> သို့ အီးမေးလ်ပို့နိုင်ပါသည်
-      email_reconfirmation_html: အတည်ပြုချက်အီးမေးလ် လက်ခံမရရှိပါက <a href="%{path}">ထပ်မံတောင်းဆိုနိုင်သည်</a>
       irreversible: အကောင့်ကို ပြန်လည်ရယူရန် သို့မဟုတ် ပြန်လည်အသုံးပြုရန် မဖြစ်နိုင်တော့ပါ
       more_details_html: အသေးစိတ်အချက်အလက်များအတွက်၊ <a href="%{terms_path}">ကိုယ်ရေးကိုယ်တာမူဝါဒ</a> ကို ကြည့်ပါ။
       username_available: သင့်အသုံးပြုသူအမည်ကို ပြန်လည်ရရှိနိုင်ပါမည်
@@ -1340,7 +1298,6 @@ my:
     authentication_methods:
       otp: နှစ်ဆင့်ခံလုံခြုံရေးစနစ်အက်ပ်
       password: စကားဝှက်
-      sign_in_token: အီးမေးလ်လုံခြုံရေးကုဒ်
       webauthn: လုံခြုံရေးကီးများ
     description_html: သင်မပြုလုပ်သည့် လုပ်ဆောင်ချက်တွေ့ရှိပါက သင့်စကားဝှက်ကို ပြောင်းလဲပြီး နှစ်ဆင့်ခံလုံခြုံရေးစနစ်ကို အသုံးပြုသင့်ပါသည်။
     empty: စစ်မှန်ကြောင်းအထောက်အထားမရရှိနိုင်ပါ
@@ -1351,16 +1308,6 @@ my:
     unsubscribe:
       action: ဟုတ်ကဲ့၊ စာရင်းမှ ဖြုတ်လိုက်ပါပြီ
       complete: စာရင်းမှထွက်ရန်
-      confirmation_html: Mastodon %{domain} ရှိ သင့်အီးမေးလ် %{email} တွင် %{type} ကို လက်ခံရယူခြင်းမှ ရပ်ဆိုင်းလိုသည်မှာ သေချာပါသလား။ သင်၏ <a href="%{settings_path}"> အီးမေးလ် အကြောင်းကြားခြင်းသတ်မှတ်ချက်များ</a> မှ အမြဲတမ်း ပြန်လည်စာရင်းသွင်းနိုင်ပါသည်။
-      emails:
-        notification_emails:
-          favourite: favorite အသိပေးချက် အီးမေးလ်များ
-          follow: စောင့်ကြည့်ရန်အတွက် အသိပေးချက်အီးမေးလ်များ
-          follow_request: စောင့်ကြည့်တောင်းဆိုမှု အီးမေးလ်များ
-          mention: ဖော်ပြအသိပေးချက်အီးမေးလ်များ
-          reblog: boost အသိပေးချက်အီးမေးလ်များ
-      resubscribe_html: အကယ်၍ သင်သည် မှားယွင်းစွာဖြင့် စာရင်းသွင်းမှုမှ ပယ်ဖျက်ခဲ့လျှင် သင်၏ <a href="%{settings_path}"> အီးမေးလ် အကြောင်းကြားခြင်းသတ်မှတ်ချက်များ </a> မှ ပြန်လည်စာရင်းသွင်းနိုင်သည်။
-      success_html: Mastodon %{domain} ရှိ သင့်အီးမေးလ် %{email} တွင် %{type} ကို ရရှိတော့မည်မဟုတ်ပါ။
       title: စာရင်းမှထွက်ရန်
   media_attachments:
     validations:
@@ -1441,8 +1388,6 @@ my:
     update:
       subject: "%{name} က ပို့စ်တစ်ခုကို ပြင်ဆင်ခဲ့သည်"
   notifications:
-    administration_emails: စီမံခန့်ခွဲသူ အီးမေးလ် အသိပေးချက်များ
-    email_events: အီးမေးလ်သတိပေးချက်များအတွက်အကြောင်းအရာများ
     email_events_hint: အသိပေးချက်များရယူမည့် အစီအစဉ်များကို ရွေးပါ -
   number:
     human:
@@ -1771,7 +1716,6 @@ my:
     go_to_sso_account_settings: အထောက်အထားပေးသူ၏အကောင့်သတ်မှတ်ချက်များသို့ သွားပါ
     invalid_otp_token: မမှန်ကန်သော နှစ်ဆင့်ခံလုံခြုံရေးကုဒ်
     otp_lost_help_html: နှစ်ခုစလုံးကို ဝင်ရောက်ခွင့် ဆုံးရှုံးသွားပါက %{email} နှင့် ဆက်သွယ်နိုင်ပါသည်
-    seamless_external_login: ပြင်ပဝန်ဆောင်မှုမှတစ်ဆင့် အကောင့်ဝင်ထားသောကြောင့် စကားဝှက်နှင့် အီးမေးလ်သတ်မှတ်ချက်များကို မရနိုင်ပါ။
     signed_in_as: အဖြစ် အကောင့်ဝင်ခဲ့သည် -
   verification:
     extra_instructions_html: <strong>အကြံပြုချက်-</strong> သင့်ဝဘ်ဆိုက်ရှိ လင့်ခ်ကို မမြင်နိုင်ပါ။ အရေးကြီးသော အပိုင်းမှာ <code>rel="me"</code> သည် အသုံးပြုသူဖန်တီးထားသော အကြောင်းအရာများဖြင့် ဝဘ်ဆိုက်များတွင် အယောင်ဆောင်ခြင်းကို တားဆီးပေးသည်။ <code>a</code> အစား စာမျက်နှာ၏ ခေါင်းစီးတွင် <code>link</code> တဂ်ကိုပင် သုံးနိုင်သော်လည်း HTML ကို JavaScript မလုပ်ဆောင်ဘဲ အသုံးပြုနိုင်ရပါမည်။
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index da1684e8a9b1cc..c782a41b7d6ff1 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -432,7 +432,7 @@ nl:
       attempts_over_week:
         one: "%{count} registratiepoging tijdens de afgelopen week"
         other: "%{count} registratiepogingen tijdens de afgelopen week"
-      created_msg: Blokkeren e-maildomein geslaagd
+      created_msg: Blokkering e-maildomein geslaagd
       delete: Verwijderen
       dns:
         types:
@@ -907,10 +907,16 @@ nl:
     trends:
       allow: Goedkeuren
       approved: Goedgekeurde
+      confirm_allow: Weet je zeker dat je de geselecteerde hashtags wil toestaan?
+      confirm_disallow: Weet je zeker dat je de geselecteerde hashtags wil afkeuren?
       disallow: Afkeuren
       links:
         allow: Link goedkeuren
         allow_provider: Website goedkeuren
+        confirm_allow: Weet je zeker dat je de geselecteerde links wil toestaan?
+        confirm_allow_provider: Weet je zeker dat je de geselecteerde websites wil toestaan?
+        confirm_disallow: Weet je zeker dat je de geselecteerde links wil afkeuren?
+        confirm_disallow_provider: Weet je zeker dat je de geselecteerde websites wil afkeuren?
         description_html: Dit zijn links die momenteel veel worden gedeeld door accounts waar jouw server berichten van ontvangt. Hierdoor kunnen jouw gebruikers zien wat er in de wereld aan de hand is. Er worden geen links weergeven totdat je de website hebt goedgekeurd. Je kunt ook individuele links goed- of afkeuren.
         disallow: Link afkeuren
         disallow_provider: Website afkeuren
@@ -934,6 +940,10 @@ nl:
       statuses:
         allow: Bericht goedkeuren
         allow_account: Account goedkeuren
+        confirm_allow: Weet je zeker dat je de geselecteerde berichten wil toestaan?
+        confirm_allow_account: Weet je zeker dat je de geselecteerde accounts wil toestaan?
+        confirm_disallow: Weet je zeker dat je de geselecteerde berichten wil afkeuren?
+        confirm_disallow_account: Weet je zeker dat je de geselecteerde accounts wil afkeuren?
         description_html: Dit zijn berichten die op jouw server bekend zijn en die momenteel veel worden gedeeld en als favoriet worden gemarkeerd. Hiermee kunnen nieuwe en terugkerende gebruikers meer mensen vinden om te volgen. Er worden geen berichten in het openbaar weergegeven totdat het account door jou is goedgekeurd en de gebruiker toestaat dat diens account aan anderen wordt aanbevolen. Je kunt ook individuele berichten goed- of afkeuren.
         disallow: Bericht afkeuren
         disallow_account: Account afkeuren
@@ -966,7 +976,7 @@ nl:
         used_by_over_week:
           one: Door één persoon tijdens de afgelopen week gebruikt
           other: Door %{count} mensen tijdens de afgelopen week gebruikt
-      title: Trends
+      title: Aanbevelingen & trends
       trending: Trending
     warning_presets:
       add_new: Nieuwe toevoegen
@@ -1102,7 +1112,7 @@ nl:
     or_log_in_with: Of inloggen met
     privacy_policy_agreement_html: Ik heb het <a href="%{privacy_policy_path}" target="_blank">privacybeleid</a> gelezen en ga daarmee akkoord
     progress:
-      confirm: E-mail bevestigen
+      confirm: E-mailadres bevestigen
       details: Jouw gegevens
       review: Onze beoordeling
       rules: Regels accepteren
@@ -1138,7 +1148,7 @@ nl:
       title: Laten we je account op %{domain} instellen.
     status:
       account_status: Accountstatus
-      confirming: Aan het wachten totdat de e-mail is bevestigd.
+      confirming: Wachten tot e-mailbevestiging is voltooid.
       functional: Jouw account kan in diens geheel gebruikt worden.
       pending: Jouw aanvraag moet nog worden beoordeeld door een van onze medewerkers. Dit kan misschien eventjes duren. Je ontvangt een e-mail wanneer jouw aanvraag is goedgekeurd.
       redirecting_to: Jouw account is inactief omdat het momenteel wordt doorverwezen naar %{acct}.
@@ -1184,7 +1194,7 @@ nl:
       caches: Berichten en media die op andere servers zijn opgeslagen kunnen daar achterblijven
       data_removal: Jouw berichten en andere gegevens worden permanent verwijderd
       email_change_html: Je kunt <a href="%{path}">je e-mailadres wijzigen</a> zonder dat je jouw account hoeft te verwijderen
-      email_contact_html: Wanneer het nog steeds niet aankomt, kun je voor hulp e-mailen naar <a href="mailto:%{email}">%{email}</a>
+      email_contact_html: Als het nog steeds niet aankomt, kun je een e-mail sturen <a href="mailto:%{email}">%{email}</a> voor hulp
       email_reconfirmation_html: Wanneer je de bevestigingsmail niet hebt ontvangen, kun je deze <a href="%{path}">opnieuw aanvragen</a>
       irreversible: Je bent niet meer in staat om jouw account te herstellen of te deactiveren
       more_details_html: Zie het <a href="%{terms_path}">privacybeleid</a> voor meer informatie.
diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index ec77a2edf8792d..e5af5c1c64ecd2 100644
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -58,7 +58,7 @@ nn:
       demote: Degrader
       destroyed_msg: "%{username} sine data er no i slettekøa"
       disable: Slå av
-      disable_sign_in_token_auth: Slå av innlogging med epost-nykel
+      disable_sign_in_token_auth: Slå av e-post-token-autentisering
       disable_two_factor_authentication: Slå av 2FA
       disabled: Slege av
       display_name: Synleg namn
@@ -67,7 +67,7 @@ nn:
       email: E-post
       email_status: E-poststatus
       enable: Slå på
-      enable_sign_in_token_auth: Slå på innlogging med epost-nykel
+      enable_sign_in_token_auth: Slå på e-post-token-autentisering
       enabled: Aktivert
       enabled_msg: Gjenaktiverte %{username} sin konto
       followers: Fylgjarar
@@ -132,7 +132,7 @@ nn:
       resubscribe: Ting på nytt
       role: Rolle
       search: Søk
-      search_same_email_domain: Andre brukarar med same e-postdomene
+      search_same_email_domain: Andre brukarar med det same e-postdomenet
       search_same_ip: Andre brukarar med same IP
       security: Tryggleik
       security_measures:
@@ -178,21 +178,21 @@ nn:
         confirm_user: Stadfest brukar
         create_account_warning: Opprett åtvaring
         create_announcement: Opprett lysing
-        create_canonical_email_block: Opprett e-post-blokkering
+        create_canonical_email_block: Opprett e-postblokkering
         create_custom_emoji: Opprett tilpassa emoji
         create_domain_allow: Opprett domene tillatt
         create_domain_block: Opprett domene-blokk
-        create_email_domain_block: Opprett e-post domeneblokk
+        create_email_domain_block: Opprett blokkering av e-postdomene
         create_ip_block: Opprett IP-regel
         create_unavailable_domain: Opprett utilgjengeleg domene
         create_user_role: Opprett rolle
         demote_user: Degrader brukar
         destroy_announcement: Slett lysinga
-        destroy_canonical_email_block: Slett e-post-blokkering
+        destroy_canonical_email_block: Fjern e-postblokkering
         destroy_custom_emoji: Slett tilpassa emoji
         destroy_domain_allow: Slett domenegodkjenning
         destroy_domain_block: Slett domenesperring
-        destroy_email_domain_block: Slett e-postdomenesperring
+        destroy_email_domain_block: Fjern blokkering av e-postdomene
         destroy_instance: Slett domene
         destroy_ip_block: Slett IP-regel
         destroy_status: Slett status
@@ -200,10 +200,10 @@ nn:
         destroy_user_role: Øydelegg rolle
         disable_2fa_user: Skruv av 2FA
         disable_custom_emoji: Skruv av tilpassa emoji
-        disable_sign_in_token_auth_user: Slå av innlogging med epost-nykel for brukaren
+        disable_sign_in_token_auth_user: Slå av e-post-token-autentisering for brukar
         disable_user: Skruv av brukar
         enable_custom_emoji: Skruv på tilpassa emoji
-        enable_sign_in_token_auth_user: Slå på innlogging med epost-nykel for brukaren
+        enable_sign_in_token_auth_user: Slå på e-post-token-autentisering for brukar
         enable_user: Skruv på brukar
         memorialize_account: Opprett minnekonto
         promote_user: Forfrem brukar
@@ -260,10 +260,10 @@ nn:
         destroy_user_role_html: "%{name} sletta rolla %{target}"
         disable_2fa_user_html: "%{name} tok vekk krav om tofaktorautentisering for brukaren %{target}"
         disable_custom_emoji_html: "%{name} deaktiverte emojien %{target}"
-        disable_sign_in_token_auth_user_html: "%{name} skrudde av innlogging med epost-nykel for %{target}"
+        disable_sign_in_token_auth_user_html: "%{name} deaktiverte e-post-token-autentisering for %{target}"
         disable_user_html: "%{name} slo av innlogging for brukaren %{target}"
         enable_custom_emoji_html: "%{name} aktiverte emojien %{target}"
-        enable_sign_in_token_auth_user_html: "%{name} skrudde på innlogging med epost-nykel for %{target}"
+        enable_sign_in_token_auth_user_html: "%{name} aktiverte e-post-token-autentisering for %{target}"
         enable_user_html: "%{name} aktiverte innlogging for brukaren %{target}"
         memorialize_account_html: "%{name} endret %{target}s konto til en minneside"
         promote_user_html: "%{name} fremja brukaren %{target}"
@@ -271,7 +271,7 @@ nn:
         reject_user_html: "%{name} avslo registrering fra %{target}"
         remove_avatar_user_html: "%{name} fjerna %{target} sitt profilbilete"
         reopen_report_html: "%{name} opna rapporten %{target} på nytt"
-        resend_user_html: "%{name} sendte bekreftelsesepost for %{target} på nytt"
+        resend_user_html: "%{name} sende stadfestings-e-post for %{target} på nytt"
         reset_password_user_html: "%{name} tilbakestilte passordet for brukaren %{target}"
         resolve_report_html: "%{name} løyste ein rapport %{target}"
         sensitive_account_html: "%{name} markerte %{target} sitt media som ømtolig"
@@ -432,7 +432,7 @@ nn:
       attempts_over_week:
         one: "%{count} forsøk i løpet av den siste uken"
         other: "%{count} forsøk på å opprette konto i løpet av den siste uken"
-      created_msg: E-postdomenet ble lagt til i blokkeringslisten uten problemer
+      created_msg: Blokkeringa av e-postdomenet var vellukka
       delete: Slett
       dns:
         types:
@@ -441,12 +441,12 @@ nn:
       new:
         create: Legg til domene
         resolve: Løs domene
-        title: Ny blokkeringsoppføring av e-postdomene
-      no_email_domain_block_selected: Blokkering av e-post-domener vart ikkje endra sidan ingen var valde
+        title: Blokker nytt e-postdomene
+      no_email_domain_block_selected: Blokkering av e-post-domene vart ikkje endra sidan ingen var valde
       not_permitted: Ikkje tillate
-      resolved_dns_records_hint_html: Domenenamnet gjer oppslag til desse MX-domenene som til sist er ansvarlige for å motta e-post. Blokkering av eit MX-domene vil blokkere registreringar frå alle e-postadresser som bruker same MX-domene, sjølv om det synlige domenenavnet skulle vera noko anna. <strong>Pass på så du ikkje blokkerer dei store e-postleverandørane.</strong>
+      resolved_dns_records_hint_html: Domenenamnet gjer oppslag til desse MX-domena som til sist er ansvarlege for å motta e-post. Blokkering av eit MX-domene vil blokkere registreringar frå alle e-postadresser som bruker same MX-domene, sjølv om det synlege domenenamnet skulle vera noko anna. <strong>Pass på så du ikkje blokkerer dei store e-postleverandørane.</strong>
       resolved_through_html: Løyst gjennom %{domain}
-      title: Blokkerte e-postadresser
+      title: Blokkerte e-postdomene
     export_domain_allows:
       new:
         title: Importer domenetillatingar
@@ -471,6 +471,9 @@ nn:
       title: Fylgjeforslag
       unsuppress: Nullstill fylgjeforslag
     instances:
+      audit_log:
+        title: Nye gjennomsynsloggar
+        view_all: Sjå heile gjennomsynsloggen
       availability:
         description_html:
           one: Om leveransar til domenet feilar <strong>%{count} dag</strong>, vil det ikkje bli gjort fleire forsøk før det eventuelt kjem ein leveranse <em>frå</em> domenet.
@@ -662,7 +665,7 @@ nn:
         delete_data_html: Slett brukarprofilen og innhaldet til<strong>@%{acct}</strong> om 30 dagar frå no med mindre brukarkontoen blir opna att
         preview_preamble_html: "<strong>@%{acct}</strong> vil få ei åtvaring med dette innhaldet:"
         record_strike_html: Noter at ei handling er gjort mot <strong>@%{acct}</strong> for å hjelpa deg å handtera framtidige overtramp frå denne brukarkontoen
-        send_email_html: Send ein åtvaringsepost til <strong>@%{acct}</strong>
+        send_email_html: Send ein åtvarings-e-post til <strong>@%{acct}</strong>
         warning_placeholder: Eventuelle fleire grunnar for å modereringshandlinga.
       target_origin: Opprinnelse for innrapportert konto
       title: Rapportar
@@ -720,7 +723,7 @@ nn:
         manage_taxonomies: Handtere taksonomiar
         manage_taxonomies_description: Let brukarar gjennomgå populært innhald og oppdatera innstillingar for emneknaggar
         manage_user_access: Administrer brukartilgang
-        manage_user_access_description: Let brukarar deaktivera 2-trinnsautentisering, endra e-postadressa og tilbakestille passordet til andre brukarar
+        manage_user_access_description: Let brukarar deaktivere 2-trinnsautentisering, endre e-postadressa og tilbakestille passordet til andre brukarar
         manage_users: Handtere brukarar
         manage_users_description: Let brukarar sjå detaljar om andre brukarar og utføre moderasjonshandlingar mot dei
         manage_webhooks: Handtere webhooks
@@ -882,16 +885,38 @@ nn:
         action: Sjekk her for meir informasjon
         message_html: "<strong>Objektlagringa di er sett opp feil. Personvernet til brukarane dine er i fare.</strong>"
     tags:
+      moderation:
+        not_trendable: Kan ikkje bli populær
+        not_usable: Ikkje brukbar
+        pending_review: Ventar på gjennomgang
+        review_requested: Gjennomgang førespurt
+        reviewed: Gjennomgått
+        title: Status
+        trendable: Kan bli populær
+        unreviewed: Ikkje gått gjennom
+        usable: Brukbar
+      name: Namn
+      newest: Nyaste
+      oldest: Eldste
+      reset: Nullstill
       review: Sjå gjennom status
+      search: Søk
+      title: Emneknaggar
       updated_msg: Emneknagginnstillingane er oppdaterte
     title: Leiing
     trends:
       allow: Tillat
       approved: Godkjent
+      confirm_allow: Er du sikker på at du vil godta dei valde emneknaggane?
+      confirm_disallow: Er du sikker på at du vil avvisa dei valde emneknaggane?
       disallow: Ikke tillat
       links:
         allow: Tillat lenke
         allow_provider: Tillat utgjevar
+        confirm_allow: Er du sikker på at du vil godta dei valde lenkene?
+        confirm_allow_provider: Er du sikker på at du vil godta dei valde tilbydarane?
+        confirm_disallow: Er du sikker på at du vil avvis dei valde lenkene?
+        confirm_disallow_provider: Er du sikker på at du vil avvisa dei valde tilbydarane?
         description_html: Dette er lenkjer som for tida blir mykje delt av kontoar som tenaren din ser innlegg frå. Dei kan hjelpa brukarane dine med å finna ut kva som skjer i verda. Ingen lenkjer vert offentleg tilgjengelege før du godkjenner utgjevaren. Du kan også tillata eller forby individuelle lenkjer.
         disallow: Ikke tillat lenke
         disallow_provider: Forby utgjevaren
@@ -915,6 +940,10 @@ nn:
       statuses:
         allow: Tillat innlegg
         allow_account: Tillat forfatter
+        confirm_allow: Er du sikker på at du vil godta dei valde statusane?
+        confirm_allow_account: Er du sikker på at du vil godta dei valde kontoane?
+        confirm_disallow: Er du sikker på at du vil avvisa dei valde statusane?
+        confirm_disallow_account: Er du sikker på at du vil avvisa dei valde kontoane?
         description_html: Dette er innlegg som tenaren din veit om og som blir mykje delt og markerte som favorittar no for tida. Dei kan hjelpa nye og gamle brukarar å finna folk dei vil fylgja. Ingen innlegg vert vist offentleg utan at du tillet forfattaren, og utan at forfattaren tillet kontoen deira å bli foreslått for andre. Du kan også tillata eller avvisa individuelle innlegg.
         disallow: Ikke tillat innlegg
         disallow_account: Forby forfattar
@@ -947,7 +976,7 @@ nn:
         used_by_over_week:
           one: Brukt av én person i løpet av den seneste uken
           other: Brukt av %{count} personer i løpet av den seneste uken
-      title: Trender
+      title: Anbefalingar og trendar
       trending: Trender
     warning_presets:
       add_new: Legg til ny
@@ -1032,9 +1061,9 @@ nn:
       guide_link_text: Alle kan bidra.
     sensitive_content: Ømtolig innhald
   application_mailer:
-    notification_preferences: Endr e-post-innstillingane
+    notification_preferences: Endre e-post-innstillingane
     salutation: Hei %{name},
-    settings: 'Endr e-post-innstillingar: %{link}'
+    settings: 'Endre e-post-innstillingar: %{link}'
     unsubscribe: Meld av
     view: 'Sjå:'
     view_profile: Sjå profil
@@ -1054,7 +1083,7 @@ nn:
       hint_html: Berre ein ting til! Vi må bekrefte at du er et menneske (så vi kan halde spam ute!). Løys CAPTCHA-en nedanfor og klikk "Fortsett".
       title: Sikkerheitssjekk
     confirmations:
-      awaiting_review: Epostadressa di er stadfesta! Styrarane på %{domain} ser gjennom registreringa di. Du får ein epost frå dei om dei godkjenner brukarkontoen din.
+      awaiting_review: E-postadressa di er stadfesta! Styrarane på %{domain} ser gjennom registreringa di. Du får ein e-post frå dei om dei godkjenner brukarkontoen din!
       awaiting_review_title: Me går gjennom registreringa di
       clicking_this_link: klikka på denne lenka
       login_link: logga inn
@@ -1062,7 +1091,7 @@ nn:
       redirect_to_app_html: Du skulle vorte vidaresend til <strong>%{app_name}</strong>-appen. Viss det ikkje skjedde, kan du prøva å %{clicking_this_link} eller manuelt gå tilbake til appen.
       registration_complete: Du har registrert deg som brukar på %{domain}.
       welcome_title: Velkomen, %{name}!
-      wrong_email_hint: Viss epostadressa er feil, kan du endra ho i kontoinnstillingane.
+      wrong_email_hint: Viss e-postadressa er feil, kan du endra ho i kontoinnstillingane.
     delete_account: Slett konto
     delete_account_html: Om du vil sletta kontoen din, kan du <a href="%{path}">gå hit</a>. Du vert spurd etter stadfesting.
     description:
@@ -1083,7 +1112,7 @@ nn:
     or_log_in_with: Eller logg inn med
     privacy_policy_agreement_html: Jeg har lest og godtar <a href="%{privacy_policy_path}" target="_blank">retningslinjer for personvern</a>
     progress:
-      confirm: Stadfest e-postadressa
+      confirm: Stadfest e-post
       details: Opplysingane dine
       review: Vår gjennomgang
       rules: Godta reglane
@@ -1105,10 +1134,10 @@ nn:
     security: Tryggleik
     set_new_password: Lag nytt passord
     setup:
-      email_below_hint_html: Sjekk søppelpostmappa di, eller be om ein ny. Du kan endra epostadressa di dersom ho er feil.
+      email_below_hint_html: Sjekk søppelpostmappa di, eller be om ein ny. Du kan endra e-postadressa di dersom ho er feil.
       email_settings_hint_html: Klikk lenka me sende deg for å stadfesta %{email}. Me sit her og ventar.
       link_not_received: Fekk du ikkje lenka?
-      new_confirmation_instructions_sent: Du burde få ein ny epost med stadfestingslenke innan nokre minutt!
+      new_confirmation_instructions_sent: Du vil få ein ny e-post med stadfestingslenke innan nokre minutt!
       title: Sjekk innboksen din
     sign_in:
       preamble_html: Logg inn med brukaropplysningar for <strong>%{domain}</strong>. Dersom kontoen din er registrert på ein annan tenar vil du ikkje kunne logga inn her.
@@ -1121,7 +1150,7 @@ nn:
       account_status: Kontostatus
       confirming: Ventar på stadfesting av e-post.
       functional: Kontoen din er fullt operativt.
-      pending: Søknaden din ventar på gjennomgang frå personalet vårt. Dette kan taka litt tid. Du får ein e-post om søknaden din vert godkjend.
+      pending: Søknaden din ventar på gjennomgang frå personalet vårt. Dette kan ta litt tid. Du får ein e-post om søknaden din vert godkjend.
       redirecting_to: Kontoen din er inaktiv fordi den for øyeblikket omdirigerer til %{acct}.
       self_destruct: Av di %{domain} er i ferd med å stenga, vil du berre få avgrensa tilgang til brukarkontoen din.
       view_strikes: Vis tidligere advarsler mot kontoen din
@@ -1165,8 +1194,8 @@ nn:
       caches: Innhold som har blitt mellomlagret av andre tjenere kan kanskje fortsette å eksistere
       data_removal: Innlegga dine og andre data vert fjerna for alltid
       email_change_html: Du kan <a href="%{path}">byta e-postadressa di</a> utan å sletta kontoen din
-      email_contact_html: Dersom det fortsatt ikke kommer, kan du sende en E-post til <a href="mailto:%{email}">%{email}</a> og be om hjelp
-      email_reconfirmation_html: Dersom du ikke mottar bekreftelses-E-posten, kan du <a href="%{path}">be om den igjen</a>
+      email_contact_html: Dersom den framleis ikkje kjem, kan du sende ein e-post til <a href="mailto:%{email}">%{email}</a> og be om hjelp
+      email_reconfirmation_html: Dersom du ikke mottar stadfestings-e-posten, kan du <a href="%{path}">be om den igjen</a>
       irreversible: Du kjem ikkje til å kunna gjenoppretta eller aktivera kontoen din på nytt
       more_details_html: For fleire detaljar, sjå <a href="%{terms_path}">personvernsvilkåra</a>.
       username_available: Brukarnamnet ditt vert tilgjengeleg igjen
@@ -1399,7 +1428,7 @@ nn:
     authentication_methods:
       otp: to-faktor autentiseringsapp
       password: passord
-      sign_in_token: tryggingskode på epost
+      sign_in_token: sikkerheitskode på e-post
       webauthn: sikkerhetsnøkler
     description_html: Hvis du ser aktivitet som du ikke gjenkjenner, bør du vurdere å endre passordet ditt og aktivere to-trinnsinnlogging.
     empty: Ingen innloggingshistorikk er tilgjengelig
@@ -1416,10 +1445,9 @@ nn:
           favourite: e-postar om favorittmarkeringar
           follow: e-postar om nye fylgjarar
           follow_request: e-postar om fylgjeførespurnadar
-          mention: e-postar om nemningar
+          mention: e-postar om omtaler
           reblog: e-postar om framhevingar
-      resubscribe_html: Om du har avslutta avslutta abonnementet ved ein feil, kan du abonnera på nytt i <a href="%{settings_path}">innstillingar for e-postvarsling</a>.
-      success_html: Du vil ikkje lenger motta %{type} frå Mastodon på %{domain} til din e-post %{email}.
+      resubscribe_html: Om du har avslutta abonnementet ved ein feil, kan du abonnera på nytt i <a href="%{settings_path}">innstillingar for e-postvarsling</a>.
       title: Meld av
   media_attachments:
     validations:
@@ -1488,7 +1516,7 @@ nn:
       action: Svar
       body: 'Du vart nemnd av %{name} i:'
       subject: Du vart nemnd av %{name}
-      title: Ny nemning
+      title: Ny omtale
     poll:
       subject: Meiningsmålinga frå %{name} er avslutta
     reblog:
@@ -1500,8 +1528,6 @@ nn:
     update:
       subject: "%{name} redigerte et innlegg"
   notifications:
-    administration_emails: Administrator sine epost-varsler
-    email_events: E-postvarslinger for hendelser
     email_events_hint: 'Velg hendelser som du vil motta varslinger for:'
   number:
     human:
@@ -1660,7 +1686,6 @@ nn:
     import: Hent inn
     import_and_export: Importer og eksporter
     migrate: Kontoflytting
-    notifications: E-postvarslingar
     preferences: Innstillingar
     profile: Profil
     relationships: Fylgjar og fylgjarar
@@ -1907,7 +1932,6 @@ nn:
     invalid_otp_token: Ugyldig tostegskode
     otp_lost_help_html: Hvis du mistet tilgangen til begge deler, kan du komme i kontakt med %{email}
     rate_limited: For mange autentiseringsforsøk, prøv igjen seinare.
-    seamless_external_login: Du er logga inn gjennom eit eksternt reiskap, so passord og e-postinstillingar er ikkje tilgjengelege.
     signed_in_as: 'Logga inn som:'
   verification:
     extra_instructions_html: <strong>Tips:</strong> Linken på nettsida di kan vera usynleg. Den viktige delen er <code>rel="me"</code>, som på nettstader med brukargenerert innhald vil hindra at andre kan låst som dei er deg. Du kan til og med bruka <code>link</code> i staden for <code>a</code> i toppteksten til sida, men HTML-koden må vera tilgjengeleg utan å måtte køyra JavaScript.
diff --git a/config/locales/no.yml b/config/locales/no.yml
index 537552ea98662d..1087e6485e02f4 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -31,7 +31,6 @@
       created_msg: Moderasjonsnotat laget uten problem!
       destroyed_msg: Moderasjonsnotat slettet uten problem!
     accounts:
-      add_email_domain_block: Svartelist E-postdomenet
       approve: Godkjenn
       approved_msg: Godkjent %{username} sin registreringsapplikasjon
       are_you_sure: Er du sikker?
@@ -58,7 +57,6 @@
       demote: Degrader
       destroyed_msg: "%{username} sine data er nå i kø for å bli slettet minimum"
       disable: Deaktiver
-      disable_sign_in_token_auth: Deaktiver e-post token autentisering
       disable_two_factor_authentication: Skru av 2FA
       disabled: Deaktivert
       display_name: Visningsnavn
@@ -67,7 +65,6 @@
       email: E-post
       email_status: E-poststatus
       enable: Aktiver
-      enable_sign_in_token_auth: Aktiver godkjenning av e-post token
       enabled: Aktivert
       enabled_msg: Frossent %{username} sin konto
       followers: Følgere
@@ -132,7 +129,6 @@
       resubscribe: Abonner på nytt
       role: Rolle
       search: Søk
-      search_same_email_domain: Andre brukere med samme E-postdomene
       search_same_ip: Andre brukere med den samme IP-en
       security: Sikkerhet
       security_measures:
@@ -173,26 +169,21 @@
         approve_appeal: Godkjenn anke
         approve_user: Godkjenn bruker
         assigned_to_self_report: Tilordne rapport
-        change_email_user: Endre brukerens E-postadresse
         change_role_user: Endre rolle for brukeren
         confirm_user: Bekreft brukeren
         create_account_warning: Opprett en advarsel
         create_announcement: Opprett en kunngjøring
-        create_canonical_email_block: Opprett e-post-blokkering
         create_custom_emoji: Opprett en tilpasset emoji
         create_domain_allow: Opprett domene tillatt
         create_domain_block: Opprett domene-blokk
-        create_email_domain_block: Opprett e-post domeneblokk
         create_ip_block: Opprett IP-regel
         create_unavailable_domain: Opprett utilgjengelig domene
         create_user_role: Opprett rolle
         demote_user: Degrader bruker
         destroy_announcement: Slett kunngjøringen
-        destroy_canonical_email_block: Slett blokkering av e-post
         destroy_custom_emoji: Slett den tilpassede emojien
         destroy_domain_allow: Slett domenegodkjenning
         destroy_domain_block: Slett blokkering av domene
-        destroy_email_domain_block: Slett blokkering av e-postdomene
         destroy_instance: Slett domene
         destroy_ip_block: Slett IP-regel
         destroy_status: Slett statusen
@@ -200,10 +191,8 @@
         destroy_user_role: Slett rolle
         disable_2fa_user: Skru av 2-trinnsinnlogging
         disable_custom_emoji: Skru av tilpassede emojier
-        disable_sign_in_token_auth_user: Skru av e-post-tokenautentisering for bruker
         disable_user: Deaktiver bruker
         enable_custom_emoji: Skru på tilpassede emojier
-        enable_sign_in_token_auth_user: Skru på e-post-tokenautentisering for bruker
         enable_user: Aktiver bruker
         memorialize_account: Opprett minnekonto
         promote_user: Promoter bruker
@@ -232,26 +221,20 @@
         approve_appeal_html: "%{name} godkjente anken på moderering fra %{target}"
         approve_user_html: "%{name} godkjente registrering fra %{target}"
         assigned_to_self_report_html: "%{name} tildelte rapport %{target} til seg selv"
-        change_email_user_html: "%{name} endret e-postadressen til brukeren %{target}"
         change_role_user_html: "%{name} endret rolle for %{target}"
-        confirm_user_html: "%{name} bekreftet e-postadressen til brukeren %{target}"
         create_account_warning_html: "%{name} sendte en advarsel til %{target}"
         create_announcement_html: "%{name} opprettet ny kunngjøring %{target}"
-        create_canonical_email_block_html: "%{name} blokkerte e-post med hash %{target}"
         create_custom_emoji_html: "%{name} lastet opp ny emoji %{target}"
         create_domain_allow_html: "%{name} tillatt føderasjon med domenet %{target}"
         create_domain_block_html: "%{name} blokkert domene %{target}"
-        create_email_domain_block_html: "%{name} blokkert e-post domene %{target}"
         create_ip_block_html: "%{name} opprettet regel for IP %{target}"
         create_unavailable_domain_html: "%{name} stoppet levering til domenet %{target}"
         create_user_role_html: "%{name} opprettet rollen %{target}"
         demote_user_html: "%{name} degraderte bruker %{target}"
         destroy_announcement_html: "%{name} slettet kunngjøring %{target}"
-        destroy_canonical_email_block_html: "%{name} fjernet blokkering av e-post med hash %{target}"
         destroy_custom_emoji_html: "%{name} slettet emoji %{target}"
         destroy_domain_allow_html: "%{name} ikke tillatt føderasjon med domenet %{target}"
         destroy_domain_block_html: "%{name} fjernet blokkeringen av domenet %{target}"
-        destroy_email_domain_block_html: "%{name} fjernet blokkeringen av e-post-domenet %{target}"
         destroy_instance_html: "%{name} blokkert domene %{target}"
         destroy_ip_block_html: "%{name} slettet regel for IP %{target}"
         destroy_status_html: "%{name} fjernet innlegget av %{target}"
@@ -259,10 +242,8 @@
         destroy_user_role_html: "%{name} slettet %{target} -rolle"
         disable_2fa_user_html: "%{name} deaktiverte tofaktor-autentiseringskravet for bruker %{target}"
         disable_custom_emoji_html: "%{name} deaktiverte emoji %{target}"
-        disable_sign_in_token_auth_user_html: "%{name} deaktiverte autentisering med e-post-token for %{target}"
         disable_user_html: "%{name} deaktiverte innlogging for bruker %{target}"
         enable_custom_emoji_html: "%{name} aktiverte emoji %{target}"
-        enable_sign_in_token_auth_user_html: "%{name} aktiverte autentisering med e-post-token for %{target}"
         enable_user_html: "%{name} aktiverte innlogging for bruker %{target}"
         memorialize_account_html: "%{name} endret %{target}s konto til en minneside"
         promote_user_html: "%{name} forfremmet bruker %{target}"
@@ -270,7 +251,6 @@
         reject_user_html: "%{name} avslo registrering fra %{target}"
         remove_avatar_user_html: "%{name} fjernet %{target} sitt profilbilde"
         reopen_report_html: "%{name} gjenåpnet rapporten %{target}"
-        resend_user_html: "%{name} sendte e-postbekreftelse på nytt for %{target}"
         reset_password_user_html: "%{name} tilbakestille passordet for brukeren %{target}"
         resolve_report_html: "%{name} løst rapport %{target}"
         sensitive_account_html: "%{name} merket %{target}s innlegg som følsomt"
@@ -429,7 +409,6 @@
       attempts_over_week:
         one: "%{count} forsøk i løpet av den siste uken"
         other: "%{count} forsøk på å opprette konto i løpet av den siste uken"
-      created_msg: E-postdomenet ble lagt til i blokkeringslisten uten problemer
       delete: Fjern
       dns:
         types:
@@ -438,12 +417,8 @@
       new:
         create: Legg til domene
         resolve: Løs domene
-        title: Ny blokkeringsoppføring av e-postdomene
-      no_email_domain_block_selected: Ingen e-postdomeneblokker ble endret da ingen ble valgt
       not_permitted: Ikke tillatt
-      resolved_dns_records_hint_html: Domenenavnet løser seg til følgende MX-domener som er til slutt ansvarlige for å motta e-post. Blokkering av et MX-domene vil blokkere signaler fra en hvilken som helst e-postadresse som bruker samme MX-domene, selv om det synlige domenenavnet er annerledes. <strong>Vær forsiktig så du ikke blokkerer store e-posttilbydere.</strong>
       resolved_through_html: Løst gjennom %{domain}
-      title: Blokkering av e-postdomene
     export_domain_allows:
       new:
         title: Importer domenetillatelser
@@ -594,7 +569,6 @@
         resolve_description_html: Ingen handling utføres mot den rapporterte kontoen, ingen advarsel gis, og rapporten lukkes.
         silence_description_html: Profilen vil kun være synlig for dem som allerede følger den eller manuelt slår den opp, noe som sterkt begrenser dens rekkevidde. Kan alltid tilbakestilles. Lukker alle rapporter mot denne kontoen.
         suspend_description_html: Kontoen og alt dens innhold vil være utilgjengelig og til slutt slettet, og det vil ikke være mulig å bruke den. Reversibel innen 30 dager. Lukker alle rapporter mot denne kontoen.
-      actions_description_html: Velg hvilke tiltak som skal treffes for å løse denne rapporten. Dersom du tar noen entydige tiltak mot den oppgitte kontoen, blir det sendt en e-post til dem, unntatt når <strong>Søppelpost</strong> -kategorien er valgt.
       actions_description_remote_html: Velg hvilke tiltak som skal treffes for å løse denne rapporten. Dette påvirker bare hvordan <strong>din</strong> server kommuniserer med denne eksterne kontoen og håndterer innholdet.
       add_to_report: Legg til mer i rapporten
       are_you_sure: Er du sikker?
@@ -655,7 +629,6 @@
         delete_data_html: Slett <strong>@%{acct}</strong> sin profil og innhold 30 dager fra nå med mindre de blir suspendert i mellomtiden
         preview_preamble_html: "<strong>@%{acct}</strong> vil motta en advarsel med følgende innhold:"
         record_strike_html: Ta opp en streik mot <strong>@%{acct}</strong> for å hjelpe deg med å eskalere fremtidige brudd fra denne kontoen
-        send_email_html: Send <strong>@%{acct}</strong> en advarsels e-post
         warning_placeholder: Valgfritt ytterligere resonnement for moderasjonstiltaket.
       target_origin: Opprinnelse for innrapportert konto
       title: Rapporter
@@ -695,7 +668,6 @@
         manage_appeals: Behandle anker
         manage_appeals_description: Lar brukere gjennomgå anker mot modereringsaktiviteter
         manage_blocks: Behandle Blokker
-        manage_blocks_description: Lar brukere blokkere e-postleverandører og IP-adresser
         manage_custom_emojis: Administrer egendefinerte Emojier
         manage_custom_emojis_description: Lar brukere endre egendefinert emojis på serveren
         manage_federation: Administrer Føderasjon
@@ -713,7 +685,6 @@
         manage_taxonomies: Administrer taksonomier
         manage_taxonomies_description: Lar brukere gjennomgå populære innhold og oppdatere emneknagg innstillinger
         manage_user_access: Administrer Brukertilgang
-        manage_user_access_description: Lar brukere deaktivere andre brukeres 2-trinnsinnlogging, endre sin e-postadresse, og tilbakestille passordet deres
         manage_users: Behandle Brukere
         manage_users_description: Lar brukere se detaljer om andre brukere og utføre moderasjonshandlinger mot dem
         manage_webhooks: Administrer Webhooks
@@ -785,7 +756,6 @@
       destroyed_msg: Vellykket sletting av sideopplasting!
     software_updates:
       critical_update: Kritisk — vennligst oppdater raskt
-      description: "Det anbefales å holde Mastodon-installasjonen oppdatert for å dra nytte av nye rettelser og funksjoner. Dessuten er det av og til viktig å oppdatere Mastodon raskt for å unngå sikkerhetsproblemer. Derfor sjekker Mastodon om det finnes oppdateringer \nhvert 30. minutt, og varsler deg i henhold til dine valg for e-postvarsling."
       documentation_link: Finn ut mer
       release_notes: Informasjon om utgivelsen
       title: Tilgjengelige oppdateringer
@@ -937,7 +907,6 @@
         used_by_over_week:
           one: Brukt av en person i løpet av siste uke
           other: Brukes av %{count} personer i løpet av den siste uken
-      title: Trend
       trending: Trender
     warning_presets:
       add_new: Legg til ny
@@ -1020,9 +989,7 @@
       guide_link_text: Alle kan bidra.
     sensitive_content: Følsomt innhold
   application_mailer:
-    notification_preferences: Endre E-postinnstillingene
     salutation: "%{name},"
-    settings: 'Endre foretrukne e-postinnstillinger: %{link}'
     unsubscribe: Avslutt abonnement
     view: 'Se:'
     view_profile: Vis Profil
@@ -1042,7 +1009,6 @@
       hint_html: Bare en ting til! Vi må bekrefte at du er et menneske (dette er slik at vi kan holde spam ute!). Løs CAPTCHA nedenfor og klikk "Fortsett".
       title: Sikkerhetskontroll
     confirmations:
-      awaiting_review: Din e-post adresse er bekreftet! %{domain} ansatte gjennomgår nå registreringen din. Du vil motta en e-post hvis de godkjenner din konto!
       awaiting_review_title: Din registrering blir vurdert
       clicking_this_link: klikke på denne lenken
       login_link: logg inn
@@ -1050,7 +1016,6 @@
       redirect_to_app_html: Du burde bli omdirigert til <strong>%{app_name}</strong> -appen. Hvis det ikke skjedde, kan du prøve %{clicking_this_link} eller manuelt gå tilbake til appen.
       registration_complete: Registreringen på %{domain} er nå fullført!
       welcome_title: Velkommen, %{name}!
-      wrong_email_hint: Hvis e-postadressen ikke er riktig, kan du endre den i kontoinnstillingene.
     delete_account: Slett konto
     delete_account_html: Hvis du ønsker å slette kontoen din, kan du <a href="%{path}">gå hit</a>. Du vil bli spurt om bekreftelse.
     description:
@@ -1071,7 +1036,6 @@
     or_log_in_with: Eller logg inn med
     privacy_policy_agreement_html: Jeg har lest og godtar <a href="%{privacy_policy_path}" target="_blank">retningslinjer for personvern</a>
     progress:
-      confirm: Bekreft e-postadresse
       details: Dine opplysninger
       review: Vår gjennomgang
       rules: Godta regler
@@ -1093,10 +1057,8 @@
     security: Sikkerhet
     set_new_password: Angi nytt passord
     setup:
-      email_below_hint_html: Sjekk søppelpostmappen din, eller be om en ny. Du kan korrigere e-postadressen din hvis den er feil.
       email_settings_hint_html: Klikk på lenken vi sendte deg for å bekrefte %{email}. Vi venter her.
       link_not_received: Fikk du ikke lenken?
-      new_confirmation_instructions_sent: Du vil motta en ny e-post med bekreftelseslenken om noen minutter!
       title: Sjekk innboksen din
     sign_in:
       preamble_html: Logg inn med ditt <strong>%{domain}</strong> brukeropplysninger. Hvis kontoen din er plassert på en annen server, vil du ikke kunne logge inn her.
@@ -1107,9 +1069,7 @@
       title: La oss få deg satt i gang på %{domain}.
     status:
       account_status: Kontostatus
-      confirming: Venter på at e-postbekreftelsen er fullført.
       functional: Kontoen din er fullt operativt.
-      pending: Søknaden din avventer gjennomgang av våre medarbeidere. Dette kan ta litt tid. Du vil motta en e-post dersom søknaden din blir godkjent.
       redirecting_to: Kontoen din er inaktiv fordi den for øyeblikket omdirigerer til %{acct}.
       self_destruct: Siden %{domain} stenger, vil du kun ha begrenset tilgang til kontoen din.
       view_strikes: Vis tidligere advarsler mot kontoen din
@@ -1152,9 +1112,6 @@
       before: 'Før du fortsetter, vennligst les disse notisene nøye:'
       caches: Innhold som har blitt mellomlagret av andre tjenere kan kanskje fortsette å eksistere
       data_removal: Dine innlegg og andre data vil bli permanent fjernet
-      email_change_html: Du kan <a href="%{path}">endre E-postadressen din</a> uten å måtte slette kontoen din
-      email_contact_html: Dersom det fortsatt ikke kommer, kan du sende en E-post til <a href="mailto:%{email}">%{email}</a> og be om hjelp
-      email_reconfirmation_html: Dersom du ikke mottar bekreftelses-E-posten, kan du <a href="%{path}">be om den igjen</a>
       irreversible: Du vil ikke kunne gjenopprette eller reaktivere kontoen din
       more_details_html: For mere detaljer, se <a href="%{terms_path}">privatlivsretningslinjene</a>.
       username_available: Brukernavnet ditt vil bli gjort tilgjengelig igjen
@@ -1387,7 +1344,6 @@
     authentication_methods:
       otp: to-faktor autentiseringsapp
       password: passord
-      sign_in_token: e-post sikkerhetskode
       webauthn: sikkerhetsnøkler
     description_html: Hvis du ser aktivitet som du ikke gjenkjenner, bør du vurdere å endre passordet ditt og aktivere to-trinnsinnlogging.
     empty: Ingen innloggingshistorikk er tilgjengelig
@@ -1398,16 +1354,6 @@
     unsubscribe:
       action: Ja, avslutt abonnement
       complete: Abonnement avsluttet
-      confirmation_html: Er du sikker på at du vil slutte å motta %{type} fra Mastodon %{domain} i e-posten din på %{email}? Du kan når som helst gjenoppta i <a href="%{settings_path}">innstillinger for e-postvarsling</a>.
-      emails:
-        notification_emails:
-          favourite: e-poster om favorittmarkeringer
-          follow: e-poster om følgere
-          follow_request: e-poster om følgeforespørsler
-          mention: e-poster om nevninger
-          reblog: e-poster om fremhevinger
-      resubscribe_html: Hvis du har avsluttet abonnementet ved en feiltakelse, kan du abonnere på nytt i <a href="%{settings_path}">innstillinger for e-postvarsling</a>.
-      success_html: Du vil ikke lenger motta %{type} fra Mastodon på %{domain} i e-posten din på %{email}.
       title: Avslutt abonnement
   media_attachments:
     validations:
@@ -1488,8 +1434,6 @@
     update:
       subject: "%{name} redigerte et innlegg"
   notifications:
-    administration_emails: Administrators e-postvarslinger
-    email_events: E-postvarslinger for hendelser
     email_events_hint: 'Velg hendelser som du vil motta varslinger for:'
   number:
     human:
@@ -1866,7 +1810,6 @@
     invalid_otp_token: Ugyldig to-faktorkode
     otp_lost_help_html: Hvis du mistet tilgangen til begge deler, kan du komme i kontakt med %{email}
     rate_limited: For mange autentiseringsforsøk, prøv igjen senere.
-    seamless_external_login: Du er logget inn via en ekstern tjeneste, så passord og e-post innstillinger er ikke tilgjengelige.
     signed_in_as: 'Innlogget som:'
   verification:
     extra_instructions_html: <strong>Tips:</strong> Lenken på din nettside kan være usynlig. Den viktige delen er <code>rel="me"</code> som sikrer at nettsteder med brukergenerert innhold ikke kan utgi seg for å være deg. Du kan til og med bruke en <code>link</code> lenke i sidens topptekst i stedet for <code>a</code>, men HTML-koden må være tilgjengelig uten å kjøre JavaScript.
diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index d2bea55bd37c7b..8373513c9b9d72 100644
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -30,7 +30,6 @@ oc:
       created_msg: Nòta de moderacion ben creada !
       destroyed_msg: Nòta de moderacion ben suprimida !
     accounts:
-      add_email_domain_block: Metre lo domeni del corrièl en lista negra
       approve: Aprovar
       are_you_sure: Sètz segur ?
       avatar: Avatar
@@ -141,7 +140,6 @@ oc:
       action_types:
         approve_user: Aprobar l’utilizaire
         assigned_to_self_report: Assignar lo rapòrt
-        change_email_user: Cambiar l’adreça de l’utilizaire
         confirm_user: Confirmar l’utilizaire
         create_account_warning: Crear un avertiment
         create_announcement: Crear una anóncia
@@ -269,13 +267,10 @@ oc:
       view: Veire lo blocatge de domeni
     email_domain_blocks:
       add_new: Ajustar
-      created_msg: Blocatge del domeni de corrièl ben plaçat
       delete: Suprimir
       domain: Domeni
       new:
         create: Crear un blocatge
-        title: Nòu blocatge de domeni de corrièl
-      title: Blocatge de domeni de corrièl
     follow_recommendations:
       language: Per lenga
       status: Estat
@@ -459,9 +454,7 @@ oc:
       guide_link_text: Tot lo monde pòt contribuïr.
     sensitive_content: Contengut sensible
   application_mailer:
-    notification_preferences: Cambiar las preferéncias de corrièl
     salutation: "%{name},"
-    settings: 'Cambiar las preferéncias de corrièl : %{link}'
     view: 'Veire :'
     view_profile: Veire lo perfil
     view_status: Veire los estatuts
@@ -537,7 +530,6 @@ oc:
       before: 'Abans de contunhar, volgatz legir aquestas nòtas amb atencion :'
       caches: Lo contengut en cache suls autres servidors pòt demorar
       data_removal: Vòstras publicacions e las autras donadas seràn suprimidas per totjorn
-      email_change_html: Podètz <a href="%{path}">cambiar vòstra adreça electronia</a>sens suprimir vòstre compte
       irreversible: Poiretz pas restaurar o reactivar vòstre compte
       more_details_html: Per mai d’informacion, vejatz la <a href="%{terms_path}">politica de confidencialitat</a>.
       username_available: Vòstre nom d’utilizaire serà disponible de nòu
@@ -659,7 +651,6 @@ oc:
   login_activities:
     authentication_methods:
       password: senhal
-      sign_in_token: còdi de seguretat mail
       webauthn: claus de seguretat
   media_attachments:
     validations:
@@ -721,7 +712,6 @@ oc:
     update:
       subject: "%{name} modifiquèt sa publicacion"
   notifications:
-    email_events: Eveniments per las notificacions per corrièl
     email_events_hint: 'Seleccionatz los eveniments que volètz recebre :'
   number:
     human:
@@ -968,7 +958,6 @@ oc:
     follow_limit_reached: Podètz pas sègre mai de %{limit} personas
     invalid_otp_token: Còdi d’autentificacion en dos temps invalid
     otp_lost_help_html: Se perdatz l’accès al dos, podètz benlèu contactar %{email}
-    seamless_external_login: Sètz connectat via un servici extèrn, los paramètres de senhal e de corrièl son doncas pas disponibles.
     signed_in_as: 'Session a :'
   verification:
     verification: Verificacion
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 1477396999f5cc..2201a2695a4698 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -206,10 +206,10 @@ pl:
         destroy_user_role: Zlikwiduj rolę
         disable_2fa_user: Wyłącz 2FA
         disable_custom_emoji: Wyłącz niestandardowe emoji
-        disable_sign_in_token_auth_user: Wyłącz uwierzytelnianie tokenu e-mail dla użytkownika
+        disable_sign_in_token_auth_user: Wyłącz uwierzytelnianie tokenem przez e-mail dla użytkownika
         disable_user: Wyłącz użytkownika
         enable_custom_emoji: Włącz niestandardowe emoji
-        enable_sign_in_token_auth_user: Włącz uwierzytelnianie tokenu e-mail dla użytkownika
+        enable_sign_in_token_auth_user: Włącz uwierzytelnianie tokenem przez e-mail dla użytkownika
         enable_user: Włącz użytkownika
         memorialize_account: Upamiętnij konto
         promote_user: Podnieś uprawnienia
@@ -244,7 +244,7 @@ pl:
         confirm_user_html: "%{name} potwierdził(a) adres e-mail użytkownika %{target}"
         create_account_warning_html: "%{name} wysłał(a) ostrzeżenie do %{target}"
         create_announcement_html: "%{name} utworzył(a) nowe ogłoszenie %{target}"
-        create_canonical_email_block_html: "%{name} zablokował e-mail z hasłem %{target}"
+        create_canonical_email_block_html: "%{name} zablokował(a) e-mail z hashem %{target}"
         create_custom_emoji_html: "%{name} dodał(a) nowe emoji %{target}"
         create_domain_allow_html: "%{name} dodał(a) na białą listę domenę %{target}"
         create_domain_block_html: "%{name} zablokował(a) domenę %{target}"
@@ -254,7 +254,7 @@ pl:
         create_user_role_html: "%{name} utworzył rolę %{target}"
         demote_user_html: "%{name} zdegradował(a) użytkownika %{target}"
         destroy_announcement_html: "%{name} usunął(-ęła) ogłoszenie %{target}"
-        destroy_canonical_email_block_html: "%{name} odblokował(a) e-mail z hasłem %{target}"
+        destroy_canonical_email_block_html: "%{name} odblokował(a) e-mail z hashem %{target}"
         destroy_custom_emoji_html: "%{name} usunął emoji %{target}"
         destroy_domain_allow_html: "%{name} usunął(-ęła) domenę %{target} z białej listy"
         destroy_domain_block_html: "%{name} odblokował(a) domenę %{target}"
@@ -266,10 +266,10 @@ pl:
         destroy_user_role_html: "%{name} usunął rolę %{target}"
         disable_2fa_user_html: "%{name} wyłączył(a) uwierzytelnianie dwuskładnikowe użytkownikowi %{target}"
         disable_custom_emoji_html: "%{name} wyłączył(a) emoji %{target}"
-        disable_sign_in_token_auth_user_html: "%{name} wyłączył/a uwierzytelnianie tokenem e-mail dla %{target}"
+        disable_sign_in_token_auth_user_html: "%{name} wyłączył/a uwierzytelnianie tokenem przez e-mail dla %{target}"
         disable_user_html: "%{name} zablokował(a) możliwość logowania użytkownikowi %{target}"
         enable_custom_emoji_html: "%{name} włączył(a) emoji %{target}"
-        enable_sign_in_token_auth_user_html: "%{name} włączył/a uwierzytelnianie tokenem e-mail dla %{target}"
+        enable_sign_in_token_auth_user_html: "%{name} włączył/a uwierzytelnianie tokenem przez e-mail dla %{target}"
         enable_user_html: "%{name} przywrócił(a) możliwość logowania użytkownikowi %{target}"
         memorialize_account_html: "%{name} nadał(a) kontu %{target} status in memoriam"
         promote_user_html: "%{name} podniósł(a) uprawnienia użytkownikowi %{target}"
@@ -462,7 +462,7 @@ pl:
       not_permitted: Brak uprawnień
       resolved_dns_records_hint_html: Nazwa domeny rozwiązuje się do następujących domen MX, które są ostatecznie odpowiedzialne za przyjmowanie wiadomości e-mail. Blokowanie domeny MX spowoduje zablokowanie rejestracji z dowolnego adresu e-mail, który używa tej samej domeny MX, nawet jeśli widoczna nazwa domeny jest inna. <strong>Uważaj, aby nie blokować głównych dostawców poczty elektronicznej.</strong>
       resolved_through_html: Rozwiązano przez %{domain}
-      title: Blokowanie domen e-mail
+      title: Zablokowane domeny e-mail
     export_domain_allows:
       new:
         title: Zaimportuj zezwolenia domen
@@ -935,10 +935,16 @@ pl:
     trends:
       allow: Zezwól
       approved: Zaakceptowano
+      confirm_allow: Czy na pewno chcesz zezwolić na zaznaczone tagi?
+      confirm_disallow: Czy na pewno chcesz zabronić zaznaczonych tagów?
       disallow: Niedozwolone
       links:
         allow: Zezwól na link
         allow_provider: Zezwalaj na wydawcę
+        confirm_allow: Czy na pewno chcesz zezwolić na zaznaczone linki?
+        confirm_allow_provider: Czy na pewno chcesz zezwolić na zaznaczonych dostawców?
+        confirm_disallow: Czy na pewno chcesz zabronić zaznaczonych linków?
+        confirm_disallow_provider: Czy na pewno chcesz zabronić zaznaczonych dostawców?
         description_html: Są to linki, które są obecnie często udostępniane przez konta, z których Twój serwer widzi posty. Może to pomóc Twoim użytkownikom dowiedzieć się, co dzieje się na świecie. Żadne linki nie są wyświetlane publicznie dopóki nie zaakceptujesz wydawcy. Możesz również zezwolić lub odrzucić indywidualne linki.
         disallow: Nie zezwalaj na link
         disallow_provider: Nie zezwalaj na wydawcę
@@ -964,6 +970,10 @@ pl:
       statuses:
         allow: Zezwól na post
         allow_account: Zezwól na autora
+        confirm_allow: Czy na pewno chcesz zezwolić na zaznaczone statusy?
+        confirm_allow_account: Czy na pewno chcesz zezwolić na zaznaczone konta?
+        confirm_disallow: Czy na pewno chcesz zabronić zaznaczonych statusów?
+        confirm_disallow_account: Czy na pewno chcesz zabronić zaznaczonych kont?
         description_html: Są to wpisy, o których Twój serwer wie i które są obecnie często udostępniane i dodawane do ulubionych. Może to pomóc nowym i powracającym użytkownikom znaleźć więcej osób do obserwacji. Żadne posty nie są wyświetlane publicznie, dopóki nie zatwierdzisz autora, a autor ustawi zezwolenie na wyświetlanie się w katalogu. Możesz również zezwolić lub odrzucić poszczególne posty.
         disallow: Nie zezwalaj na post
         disallow_account: Nie zezwalaj na autora
@@ -1000,7 +1010,7 @@ pl:
           many: Użyte przez %{count} osób w ciągu ostatniego tygodnia
           one: Użyte przez jedną osobę w ciągu ostatniego tygodnia
           other: Użyte przez %{count} osób w ciągu ostatniego tygodnia
-      title: Na czasie
+      title: Rekomendacje i Trendy
       trending: Popularne
     warning_presets:
       add_new: Dodaj nowy
@@ -1089,7 +1099,7 @@ pl:
   application_mailer:
     notification_preferences: Zmień ustawienia e-maili
     salutation: "%{name},"
-    settings: 'Zmień ustawienia powiadamiania: %{link}'
+    settings: 'Zmień ustawienia e-maili: %{link}'
     unsubscribe: Anuluj subskrypcję
     view: 'Zobacz:'
     view_profile: Wyświetl profil
@@ -1138,7 +1148,7 @@ pl:
     or_log_in_with: Lub zaloguj się z użyciem
     privacy_policy_agreement_html: Przeczytałem/am i akceptuję <a href="%{privacy_policy_path}" target="_blank">politykę prywatności</a>
     progress:
-      confirm: Potwierdź e-mail
+      confirm: Potwierdź adres e-mail
       details: Twoje dane
       review: Nasza opinia
       rules: Akceptuj zasady
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 584a9253b81a46..418d3d059e0e44 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -31,7 +31,6 @@ pt-BR:
       created_msg: Nota de moderação criada!
       destroyed_msg: Nota de moderação excluída!
     accounts:
-      add_email_domain_block: Bloquear domínio de e-mail
       approve: Aprovar
       approved_msg: O registro de %{username} foi aprovado
       are_you_sure: Você tem certeza?
@@ -58,7 +57,6 @@ pt-BR:
       demote: Rebaixar
       destroyed_msg: Os dados de %{username} estão na fila para serem excluídos em breve
       disable: Congelar
-      disable_sign_in_token_auth: Desativar autenticação via token por email
       disable_two_factor_authentication: Desativar autenticação de dois fatores
       disabled: Congelada
       display_name: Nome de exibição
@@ -67,7 +65,6 @@ pt-BR:
       email: E-mail
       email_status: Estado do e-mail
       enable: Descongelar
-      enable_sign_in_token_auth: Ativar autenticação via token por email
       enabled: Ativada
       enabled_msg: A conta de %{username} foi descongelada
       followers: Seguidores
@@ -132,7 +129,6 @@ pt-BR:
       resubscribe: Reinscrever-se
       role: Cargo
       search: Buscar
-      search_same_email_domain: Outros usuários com o mesmo domínio de e-mail
       search_same_ip: Outros usuários com o mesmo IP
       security: Segurança
       security_measures:
@@ -173,26 +169,21 @@ pt-BR:
         approve_appeal: Aprovar revisão
         approve_user: Aprovar usuário
         assigned_to_self_report: Atribuir denúncia
-        change_email_user: Alterar e-mail do usuário
         change_role_user: Alterar cargo do usuário
         confirm_user: Confirmar usuário
         create_account_warning: Criar aviso
         create_announcement: Criar anúncio
-        create_canonical_email_block: Criar bloqueio de e-mail
         create_custom_emoji: Criar emoji personalizado
         create_domain_allow: Permitir domínio
         create_domain_block: Bloquear domínio
-        create_email_domain_block: Bloquear domínio de e-mail
         create_ip_block: Criar regra de IP
         create_unavailable_domain: Criar domínio indisponível
         create_user_role: Criar cargo
         demote_user: Rebaixar usuário
         destroy_announcement: Excluir anúncio
-        destroy_canonical_email_block: Desbloquear domínio de e-mail
         destroy_custom_emoji: Excluir emoji personalizado
         destroy_domain_allow: Excluir domínio permitido
         destroy_domain_block: Desbloquear domínio
-        destroy_email_domain_block: Desbloquear domínio de e-mail
         destroy_instance: Limpar domínio
         destroy_ip_block: Excluir regra de IP
         destroy_status: Excluir publicação
@@ -200,10 +191,8 @@ pt-BR:
         destroy_user_role: Destruir cargo
         disable_2fa_user: Desativar autenticação de dois fatores
         disable_custom_emoji: Desativar emoji personalizado
-        disable_sign_in_token_auth_user: Desativar autenticação via token por email para Usuário
         disable_user: Desativar usuário
         enable_custom_emoji: Ativar emoji personalizado
-        enable_sign_in_token_auth_user: Ativar autenticação via token por email para Usuário
         enable_user: Ativar usuário
         memorialize_account: Converter conta em memorial
         promote_user: Promover usuário
@@ -234,24 +223,19 @@ pt-BR:
         assigned_to_self_report_html: "%{name} atribuiu a denúncia %{target} para si"
         change_email_user_html: "%{name} alterou o endereço de e-mail do usuário %{target}"
         change_role_user_html: "%{name} alterou o cargo de %{target}"
-        confirm_user_html: "%{name} confirmou o endereço de e-mail do usuário %{target}"
         create_account_warning_html: "%{name} enviou um aviso para %{target}"
         create_announcement_html: "%{name} criou o novo anúncio %{target}"
-        create_canonical_email_block_html: "%{name} bloqueou o e-mail com o marcador %{target}"
         create_custom_emoji_html: "%{name} enviou o novo emoji %{target}"
         create_domain_allow_html: "%{name} permitiu federação com domínio %{target}"
         create_domain_block_html: "%{name} bloqueou o domínio %{target}"
-        create_email_domain_block_html: "%{name} bloqueou o domínio de e-mail %{target}"
         create_ip_block_html: "%{name} criou a regra para o IP %{target}"
         create_unavailable_domain_html: "%{name} parou a entrega ao domínio %{target}"
         create_user_role_html: "%{name} criou o cargo %{target}"
         demote_user_html: "%{name} rebaixou o usuário %{target}"
         destroy_announcement_html: "%{name} excluiu o anúncio %{target}"
-        destroy_canonical_email_block_html: "%{name} desbloqueou o e-mail com o marcador %{target}"
         destroy_custom_emoji_html: "%{name} apagou o emoji %{target}"
         destroy_domain_allow_html: "%{name} bloqueou federação com domínio %{target}"
         destroy_domain_block_html: "%{name} desbloqueou o domínio %{target}"
-        destroy_email_domain_block_html: "%{name} desbloqueou o domínio de e-mail %{target}"
         destroy_instance_html: "%{name} limpou o domínio %{target}"
         destroy_ip_block_html: "%{name} excluiu a regra para o IP %{target}"
         destroy_status_html: "%{name} removeu a publicação de %{target}"
@@ -259,10 +243,8 @@ pt-BR:
         destroy_user_role_html: "%{name} excluiu o cargo %{target}"
         disable_2fa_user_html: "%{name} desativou a exigência da autenticação de dois fatores para o usuário %{target}"
         disable_custom_emoji_html: "%{name} desativou o emoji %{target}"
-        disable_sign_in_token_auth_user_html: "%{name} desativou a autenticação via token por email para %{target}"
         disable_user_html: "%{name} desativou o login para %{target}"
         enable_custom_emoji_html: "%{name} ativou o emoji %{target}"
-        enable_sign_in_token_auth_user_html: "%{name} ativou a autenticação via token por email para %{target}"
         enable_user_html: "%{name} ativou o login para %{target}"
         memorialize_account_html: "%{name} transformou a conta de %{target} em um memorial"
         promote_user_html: "%{name} promoveu o usuário %{target}"
@@ -270,7 +252,6 @@ pt-BR:
         reject_user_html: "%{name} rejeitou a inscrição de %{target}"
         remove_avatar_user_html: "%{name} removeu a imagem de perfil de %{target}"
         reopen_report_html: "%{name} reabriu a denúncia %{target}"
-        resend_user_html: "%{name} reenviou um e-mail de confirmação para %{target}"
         reset_password_user_html: "%{name} redefiniu a senha de %{target}"
         resolve_report_html: "%{name} resolveu a denúncia %{target}"
         sensitive_account_html: "%{name} marcou a mídia de %{target} como sensível"
@@ -431,7 +412,6 @@ pt-BR:
       attempts_over_week:
         one: "%{count} tentativa na última semana"
         other: "%{count} tentativas de inscrição na última semana"
-      created_msg: O domínio de e-mail foi adicionado à lista negra
       delete: Excluir
       dns:
         types:
@@ -440,12 +420,8 @@ pt-BR:
       new:
         create: Adicionar domínio
         resolve: Resolver domínio
-        title: Nova entrada de lista negra de e-mail
-      no_email_domain_block_selected: Nenhum bloco de domínio de e-mail foi alterado, pois nenhum foi selecionado
       not_permitted: Não permitido
-      resolved_dns_records_hint_html: O nome de domínio resolve os seguintes domínios MX, que são responsáveis finais por aceitar o e-mail. Bloquear um domínio MX bloqueará inscrições de qualquer endereço de e-mail que use o mesmo domínio MX, mesmo que o nome de domínio visível seja diferente. <strong>Cuidado para não bloquear os principais provedores de e-mail.</strong>
       resolved_through_html: Resolvido através de %{domain}
-      title: Lista de negra de e-mail
     export_domain_allows:
       new:
         title: Importar domínios permitidos
@@ -596,7 +572,6 @@ pt-BR:
         resolve_description_html: Nenhuma ação será tomada contra a conta denunciada, nenhuma violação será guardada e a denúncia será encerrada.
         silence_description_html: A conta ficará visível apenas para aqueles que já a seguem ou que a procuram manualmente, limitando severamente seu alcance. Pode ser revertido a qualquer momento. Fecha todas as denúncias desta conta.
         suspend_description_html: A conta e todo o seu conteúdo ficará inacessível e, eventualmente, excluído e interagir com ela será impossível. Reversível dentro de 30 dias. Encerra todas as denúncias contra esta conta.
-      actions_description_html: Decida que medidas tomar para resolver esta denúncia. Se você decidir punir a conta denunciada, ela receberá uma notificação por e-mail, exceto quando for selecionada a categoria <strong>spam</strong> for selecionada.
       actions_description_remote_html: Decida quais medidas tomará para resolver esta denúncia. Isso só afetará como <strong>seu servidor</strong> se comunica com esta conta remota e manipula seu conteúdo.
       add_to_report: Adicionar mais à denúncia
       already_suspended_badges:
@@ -660,7 +635,6 @@ pt-BR:
         delete_data_html: Exclua o perfil e o conteúdo de <strong>@%{acct}</strong> daqui a 30 dias, a menos que a suspensão seja desfeita nesse meio tempo
         preview_preamble_html: "<strong>@%{acct}</strong> receberá um aviso com o seguinte conteúdo:"
         record_strike_html: Registre uma ação contra <strong>@%{acct}</strong> para te ajudar em futuras violações desta conta
-        send_email_html: Enviar <strong>@%{acct}</strong> um e-mail de aviso
         warning_placeholder: Argumentos adicionais para a ação de moderação.
       target_origin: Origem da conta denunciada
       title: Denúncias
@@ -700,7 +674,6 @@ pt-BR:
         manage_appeals: Gerenciar revisões
         manage_appeals_description: Permite aos usuários visualizar as revisões das decisões da moderação
         manage_blocks: Gerenciar Bloqueios
-        manage_blocks_description: Permite aos usuários bloquear provedores de e-mail e endereços IP
         manage_custom_emojis: Gerenciar Emojis Personalizados
         manage_custom_emojis_description: Permite aos usuários gerenciar emojis personalizados no servidor
         manage_federation: Gerenciar Federação
@@ -718,7 +691,6 @@ pt-BR:
         manage_taxonomies: Gerenciar taxonomias
         manage_taxonomies_description: Permite aos usuários rever o conteúdo em alta e atualizar as configurações de hashtag
         manage_user_access: Gerenciar Acesso de Usuário
-        manage_user_access_description: Permite aos usuários desativar a autenticação de dois fatores de outros usuários, alterar seu endereço de e-mail e redefinir sua senha
         manage_users: Gerenciar usuários
         manage_users_description: Permite aos usuários ver os detalhes de outros usuários e executar ações de moderação contra eles
         manage_webhooks: Gerenciar Webhooks
@@ -793,7 +765,6 @@ pt-BR:
       destroyed_msg: Upload do site excluído com sucesso!
     software_updates:
       critical_update: Crítico — por favor, atualize rapidamente
-      description: Recomenda-se manter a instalação do Mastodon atualizada para se beneficiar das funcionalidades e correções mais recentes. Além disso, por vezes é fundamental atualizar Mastodon em tempo hábil para evitar problemas de segurança. Por estes motivos, o Mastodon verifica atualizações a cada 30 minutos e lhe notificará de acordo com suas preferências de notificação por e-mail.
       documentation_link: Saiba mais
       release_notes: Notas de lançamento
       title: Atualizações disponíveis
@@ -945,7 +916,6 @@ pt-BR:
         used_by_over_week:
           one: Usado por uma pessoa na última semana
           other: Usado por %{count} pessoas na última semana
-      title: Em alta
       trending: Em alta
     warning_presets:
       add_new: Adicionar novo
@@ -1030,9 +1000,7 @@ pt-BR:
       guide_link_text: Todos podem contribuir.
     sensitive_content: Conteúdo sensível
   application_mailer:
-    notification_preferences: Alterar preferências de e-mail
     salutation: "%{name},"
-    settings: 'Alterar e-mail de preferência: %{link}'
     unsubscribe: Desinscrever
     view: 'Ver:'
     view_profile: Ver perfil
@@ -1052,7 +1020,6 @@ pt-BR:
       hint_html: Só mais uma coisa! Precisamos confirmar que você é um humano (isso é para que possamos evitar o spam!). Resolva o CAPTCHA abaixo e clique em "Continuar".
       title: Verificação de segurança
     confirmations:
-      awaiting_review: Seu endereço de e-mail foi confirmado! A equipe de %{domain} está agora revisando o seu cadastro. Eles lhe enviarão um e-mail se aprovarem a sua conta!
       awaiting_review_title: Seu cadastro está sendo analisado
       clicking_this_link: clicar este link
       login_link: entrar
@@ -1060,7 +1027,6 @@ pt-BR:
       redirect_to_app_html: Você deveria ter sido redirecionado para o aplicativo <strong>%{app_name}</strong>. Se isso não aconteceu, tente %{clicking_this_link} ou volte manualmente para o aplicativo.
       registration_complete: Seu cadastro no %{domain} foi concluído!
       welcome_title: Boas vindas, %{name}!
-      wrong_email_hint: Se esse endereço de e-mail não estiver correto, você pode alterá-lo nas configurações da conta.
     delete_account: Excluir conta
     delete_account_html: Se você deseja excluir sua conta, você pode <a href="%{path}">fazer isso aqui</a>. Uma confirmação será solicitada.
     description:
@@ -1081,7 +1047,6 @@ pt-BR:
     or_log_in_with: Ou entre com
     privacy_policy_agreement_html: Eu li e concordo com a <a href="%{privacy_policy_path}" target="_blank">política de privacidade</a>
     progress:
-      confirm: Confirmar e-mail
       details: Suas informações
       review: Nossa avaliação
       rules: Aceitar regras
@@ -1103,10 +1068,8 @@ pt-BR:
     security: Segurança
     set_new_password: Definir uma nova senha
     setup:
-      email_below_hint_html: Verifique a sua pasta de spam, ou solicite outro link de confirmação. Você pode corrigir seu endereço de e-mail se estiver errado.
       email_settings_hint_html: Clique no link que te enviamos para verificar %{email}. Esperaremos aqui.
       link_not_received: Não recebeu um link?
-      new_confirmation_instructions_sent: Você receberá um novo e-mail com o link de confirmação em alguns minutos!
       title: Verifique sua caixa de entrada
     sign_in:
       preamble_html: Entre com suas credenciais de domínios ( <strong>%{domain}</strong> ) . Se sua conta estiver hospedada em um servidor diferente, você não deve conseguir acessar este conteúdo.
@@ -1117,9 +1080,7 @@ pt-BR:
       title: Então vamos lá criar uma conta em %{domain}.
     status:
       account_status: Status da conta
-      confirming: Confirmação por e-mail pendente.
       functional: Sua conta está totalmente operacional.
-      pending: Sua solicitação está com revisão pendente por parte de nossa equipe. Você receberá um e-mail se ela for aprovada.
       redirecting_to: Sua conta está inativa porque atualmente está redirecionando para %{acct}.
       self_destruct: Como %{domain} está se encerrando, você só terá acesso limitado à sua conta.
       view_strikes: Veja os avisos anteriores em relação à sua conta
@@ -1162,9 +1123,6 @@ pt-BR:
       before: 'Antes de prosseguir, leia com cuidado:'
       caches: Conteúdo que foi armazenado em cache por outros servidores pode continuar a existir
       data_removal: Suas publicações e outros dados serão removidos permanentemente
-      email_change_html: Você pode <a href="%{path}">alterar seu endereço de e-mail</a> sem excluir sua conta
-      email_contact_html: Se você ainda não recebeu, você pode enviar um e-mail pedindo ajuda para <a href="mailto:%{email}">%{email}</a>
-      email_reconfirmation_html: Se você não está recebendo o e-mail de confirmação, você pode <a href="%{path}">solicitá-lo novamente</a>
       irreversible: Você não conseguirá restaurar ou reativar a sua conta
       more_details_html: Para mais detalhes, consulte a <a href="%{terms_path}">Política de Privacidade</a>.
       username_available: Seu nome de usuário ficará disponível novamente
@@ -1397,7 +1355,6 @@ pt-BR:
     authentication_methods:
       otp: autenticação de dois fatores
       password: senha
-      sign_in_token: código de segurança do e-mail
       webauthn: chaves de segurança
     description_html: Se você vir atividades suspeitas ou não reconhecidas, considere alterar sua senha e ativar a autenticação de dois fatores.
     empty: Sem histórico de autenticação disponível
@@ -1408,16 +1365,6 @@ pt-BR:
     unsubscribe:
       action: Sim, cancelar subscrição
       complete: Desinscrito
-      confirmation_html: Tem certeza que deseja cancelar a inscrição de receber %{type} para Mastodon em %{domain} para o seu e-mail em %{email}? Você sempre pode se inscrever novamente de suas <a href="%{settings_path}">configurações de notificação de e-mail</a>.
-      emails:
-        notification_emails:
-          favourite: e-mails de notificações de favoritos
-          follow: e-mails de novos seguidores
-          follow_request: e-mails de seguidores pendentes
-          mention: e-mails de notificação de menções
-          reblog: e-mails de notificação de impulsos
-      resubscribe_html: Se você cancelou sua inscrição por engano, você pode se inscrever novamente em suas <a href="%{settings_path}"> configurações de notificações por e-mail</a>.
-      success_html: Você não receberá mais %{type} do Mastodon em %{domain} para o seu e-mail %{email}.
       title: Cancelar inscrição
   media_attachments:
     validations:
@@ -1498,8 +1445,6 @@ pt-BR:
     update:
       subject: "%{name} editou uma publicação"
   notifications:
-    administration_emails: Notificações por e-mail sobre administração
-    email_events: Eventos para notificações por e-mail
     email_events_hint: 'Selecione os eventos que deseja receber notificações:'
   number:
     human:
@@ -1658,7 +1603,6 @@ pt-BR:
     import: Importar
     import_and_export: Importar e exportar
     migrate: Migração de conta
-    notifications: Notificações por e-mail
     preferences: Preferências
     profile: Perfil
     relationships: Seguindo e seguidores
@@ -1905,7 +1849,6 @@ pt-BR:
     invalid_otp_token: Código de dois fatores inválido
     otp_lost_help_html: Se você perder o acesso à ambos, você pode entrar em contato com %{email}
     rate_limited: Muitas tentativas de autenticação; tente novamente mais tarde.
-    seamless_external_login: Você entrou usando um serviço externo, então configurações de e-mail e senha não estão disponíveis.
     signed_in_as: 'Entrou como:'
   verification:
     extra_instructions_html: <strong>Dica:</strong> O link do seu site não precisa ser visível. O importante é a parte <code>rel="me"</code>, que impede a personificação em sites com conteúdo gerado pelo usuário. Você pode até usar uma tag <code>link</code> no cabeçalho da página ao invés de uma tag <code>a</code>, mas é importante que o HTML esteja acessível sem executar JavaScript.
diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index ed6a8a4028caf9..262063698b5370 100644
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -31,7 +31,6 @@ pt-PT:
       created_msg: Nota de moderação correctamente criada!
       destroyed_msg: Nota de moderação destruída!
     accounts:
-      add_email_domain_block: Bloquear este domínio de correio electrónico
       approve: Aprovar
       approved_msg: Inscrição de %{username} aprovada correctamente
       are_you_sure: Tens a certeza?
@@ -58,7 +57,6 @@ pt-PT:
       demote: Despromoveu
       destroyed_msg: Os dados de %{username} estão agora em fila de espera para serem eliminados de imediato
       disable: Congelar
-      disable_sign_in_token_auth: Desativar token de autenticação por e-mail
       disable_two_factor_authentication: Desactivar autenticação por dois factores (2FA)
       disabled: Congelada
       display_name: Nome a mostrar
@@ -67,7 +65,6 @@ pt-PT:
       email: Correio electrónico
       email_status: Estado do e-mail
       enable: Descongelar
-      enable_sign_in_token_auth: Ativar token de autenticação por e-mail
       enabled: Ativado
       enabled_msg: Descongelou a conta %{username}
       followers: Seguidores
@@ -132,7 +129,6 @@ pt-PT:
       resubscribe: Reinscrever
       role: Função
       search: Pesquisar
-      search_same_email_domain: Outros utilizadores com o mesmo domínio de correio electrónico
       search_same_ip: Outros utilizadores com o mesmo IP
       security: Segurança
       security_measures:
@@ -173,26 +169,21 @@ pt-PT:
         approve_appeal: Aprovar recurso
         approve_user: Aprovar utilizador
         assigned_to_self_report: Atribuir Denúncia
-        change_email_user: Alterar correio electrónico do utilizador
         change_role_user: Alterar Função do Utilizador
         confirm_user: Confirmar Utilizador
         create_account_warning: Criar Aviso
         create_announcement: Criar comunicado
-        create_canonical_email_block: Criar Bloqueio de E-mail
         create_custom_emoji: Criar Emoji Personalizado
         create_domain_allow: Criar Permissão de Domínio
         create_domain_block: Criar Bloqueio de Domínio
-        create_email_domain_block: Criar Bloqueio de Domínio de E-mail
         create_ip_block: Criar regra de IP
         create_unavailable_domain: Criar Domínio Indisponível
         create_user_role: Criar Função
         demote_user: Despromover Utilizador
         destroy_announcement: Apagar comunicado
-        destroy_canonical_email_block: Eliminar Bloqueio de E-mail
         destroy_custom_emoji: Eliminar Emoji Personalizado
         destroy_domain_allow: Eliminar Permissão de Domínio
         destroy_domain_block: Eliminar Bloqueio de Domínio
-        destroy_email_domain_block: Eliminar Bloqueio de Domínio de E-mail
         destroy_instance: Purgar Domínio
         destroy_ip_block: Eliminar regra de IP
         destroy_status: Eliminar Publicação
@@ -200,10 +191,8 @@ pt-PT:
         destroy_user_role: Eliminar Função
         disable_2fa_user: Desativar 2FA
         disable_custom_emoji: Desativar Emoji Personalizado
-        disable_sign_in_token_auth_user: Desativar token de autenticação por e-mail para Utilizador
         disable_user: Desativar Utilizador
         enable_custom_emoji: Ativar Emoji Personalizado
-        enable_sign_in_token_auth_user: Ativar token de autenticação por e-mail para Utilizador
         enable_user: Ativar Utilizador
         memorialize_account: Tornar conta num memorial
         promote_user: Promover Utilizador
@@ -233,26 +222,20 @@ pt-PT:
         approve_appeal_html: "%{name} aprovou recurso da decisão de moderação de %{target}"
         approve_user_html: "%{name} aprovou a inscrição de %{target}"
         assigned_to_self_report_html: "%{name} atribuiu a denúncia %{target} a si próprio"
-        change_email_user_html: "%{name} alterou o endereço de e-mail do utilizador %{target}"
         change_role_user_html: "%{name} alterou a função de %{target}"
-        confirm_user_html: "%{name} confirmou o endereço de e-mail do utilizador %{target}"
         create_account_warning_html: "%{name} enviou um aviso para %{target}"
         create_announcement_html: "%{name} criou o novo anúncio %{target}"
-        create_canonical_email_block_html: "%{name} bloqueou o e-mail com a hash %{target}"
         create_custom_emoji_html: "%{name} carregou o novo emoji %{target}"
         create_domain_allow_html: "%{name} habilitou a federação com o domínio %{target}"
         create_domain_block_html: "%{name} bloqueou o domínio %{target}"
-        create_email_domain_block_html: "%{name} bloqueou o domínio de e-mail %{target}"
         create_ip_block_html: "%{name} criou regra para o IP %{target}"
         create_unavailable_domain_html: "%{name} parou a entrega ao domínio %{target}"
         create_user_role_html: "%{name} criou a função %{target}"
         demote_user_html: "%{name} despromoveu o utilizador %{target}"
         destroy_announcement_html: "%{name} eliminou o anúncio %{target}"
-        destroy_canonical_email_block_html: "%{name} desbloqueou o e-mail com a hash %{target}"
         destroy_custom_emoji_html: "%{name} eliminou o emoji %{target}"
         destroy_domain_allow_html: "%{name} desabilitou a federação com o domínio %{target}"
         destroy_domain_block_html: "%{name} desbloqueou o domínio %{target}"
-        destroy_email_domain_block_html: "%{name} desbloqueou o domínio de e-mail %{target}"
         destroy_instance_html: "%{name} purgou o domínio %{target}"
         destroy_ip_block_html: "%{name} eliminou regra para o IP %{target}"
         destroy_status_html: "%{name} removeu a publicação de %{target}"
@@ -260,10 +243,8 @@ pt-PT:
         destroy_user_role_html: "%{name} eliminou a função %{target}"
         disable_2fa_user_html: "%{name} desativou o requerimento de autenticação em dois passos para o utilizador %{target}"
         disable_custom_emoji_html: "%{name} desabilitou o emoji %{target}"
-        disable_sign_in_token_auth_user_html: "%{name} desativou token de autenticação por e-mail para %{target}"
         disable_user_html: "%{name} desativou o acesso para o utilizador %{target}"
         enable_custom_emoji_html: "%{name} habilitou o emoji %{target}"
-        enable_sign_in_token_auth_user_html: "%{name} ativou token de autenticação por e-mail para %{target}"
         enable_user_html: "%{name} ativou o acesso para o utilizador %{target}"
         memorialize_account_html: "%{name} transformou a conta de %{target} em um memorial"
         promote_user_html: "%{name} promoveu o utilizador %{target}"
@@ -271,7 +252,6 @@ pt-PT:
         reject_user_html: "%{name} rejeitou a inscrição de %{target}"
         remove_avatar_user_html: "%{name} removeu a imagem de perfil de %{target}"
         reopen_report_html: "%{name} reabriu a denúncia %{target}"
-        resend_user_html: "%{name} reenviou e-mail de confirmação para %{target}"
         reset_password_user_html: "%{name} restabeleceu a palavra-passe do utilizador %{target}"
         resolve_report_html: "%{name} resolveu a denúncia %{target}"
         sensitive_account_html: "%{name} marcou a media de %{target} como sensível"
@@ -432,7 +412,6 @@ pt-PT:
       attempts_over_week:
         one: "%{count} tentativa na última semana"
         other: "%{count} tentativas de inscrição na última semana"
-      created_msg: Bloqueio de domínio de e-mail criado com sucesso
       delete: Eliminar
       dns:
         types:
@@ -441,12 +420,8 @@ pt-PT:
       new:
         create: Adicionar domínio
         resolve: Domínio de resolução
-        title: Novo bloqueio de domínio de e-mail
-      no_email_domain_block_selected: Nenhum bloqueio de domínio de e-mail foi alterado pois nenhum foi selecionado
       not_permitted: Não permitido
-      resolved_dns_records_hint_html: O nome de domínio resolve para os seguintes domínios MX, que são, em última análise, responsáveis por aceitar o e-mail. Bloquear um domínio MX irá bloquear as inscrições de qualquer endereço de e-mail que use o mesmo domínio MX, mesmo quando o nome de domínio visível é diferente. <strong>Cuidado para não bloquear os principais provedores de e-mail.</strong>
       resolved_through_html: Resolvido através de %{domain}
-      title: Domínios de e-mail bloqueados
     export_domain_allows:
       new:
         title: Importar permissões de domínio
@@ -600,7 +575,6 @@ pt-PT:
         resolve_description_html: Nenhuma ação será tomada contra a conta denunciada, não será registada nenhuma reprimenda, e a denúncia será fechada.
         silence_description_html: O perfil será visível apenas para aqueles que já o seguem ou o procurem manualmente, limitando fortemente o seu alcance. Pode sempre ser revertido. Encerrar todas as denúncias contra esta conta.
         suspend_description_html: A conta e todo o seu conteúdo ficará inacessível e, eventualmente apagado, pelo que interagir com ela será impossível. Reversível durante 30 dias. Encerra todas as denúncias contra esta conta.
-      actions_description_html: Decida a ação a tomar para resolver esta denúncia. Se decidir por uma ação punitiva contra a conta denunciada, um e-mail de notificação será enviado, excetuando quando selecionada a categoria <strong>Spam</strong>.
       actions_description_remote_html: Decida quais as medidas a tomar para resolver esta denúncia. Isso apenas afetará como <strong>o seu</strong> servido comunica com esta conta remota e gere o seu conteúdo.
       add_to_report: Adicionar mais à denúncia
       already_suspended_badges:
@@ -665,7 +639,6 @@ pt-PT:
         delete_data_html: Excluir <strong>@%{acct}</strong>perfil e conteúdo 30 dias a menos que sejam dessuspensos
         preview_preamble_html: "<strong>@%{acct}</strong> receberá um aviso com o seguinte conteúdo:"
         record_strike_html: Registre um ataque contra <strong>@%{acct}</strong> para ajudá-lo a escalar futuras violações desta conta
-        send_email_html: Enviar <strong>@%{acct}</strong> um e-mail de aviso
         warning_placeholder: Argumentos adicionais opcionais para a acção de moderação.
       target_origin: Origem da conta denunciada
       title: Denúncias
@@ -705,7 +678,6 @@ pt-PT:
         manage_appeals: Gerir apelos
         manage_appeals_description: Permite aos utilizadores rever recursos de moderação
         manage_blocks: Gerir Bloqueios
-        manage_blocks_description: Permite aos utilizadores bloquear fornecedores de e-mail e endereços IP
         manage_custom_emojis: Gerir Emojis Personalizados
         manage_custom_emojis_description: Permite aos utilizadores gerirem os emojis personalizados do servidor
         manage_federation: Gerir Federação
@@ -723,7 +695,6 @@ pt-PT:
         manage_taxonomies: Gerir Taxonomias
         manage_taxonomies_description: 'Permite aos utilizadores avaliar o conteúdo em alta e atualizar as configurações de #etiquetas'
         manage_user_access: Gerir Acesso de Utilizador
-        manage_user_access_description: Permite aos utilizadores desativar a autenticação em duas etapas de outros utilizadores, alterar o seu endereço de e-mail e redefinir a sua palavra-passe
         manage_users: Gerir Utilizadores
         manage_users_description: Permite aos utilizadores ver os detalhes de outros utilizadores e executar ações de moderação contra eles
         manage_webhooks: Gerir Webhooks
@@ -798,7 +769,6 @@ pt-PT:
       destroyed_msg: Envio de sítio na teia correctamente eliminado!
     software_updates:
       critical_update: Crítico — por favor, atualize rapidamente
-      description: Recomenda-se manter a instalação do Mastodon atualizada para beneficiar das funcionalidades e correções mais recentes. Além disso, por vezes é fundamental actualizar o Mastodon de forma atempada para evitar problemas de segurança. Por estes motivos, o Mastodon procura por atualizações a cada 30 minutos e envia-lhe uma notificação de acordo com suas preferências de notificação por e-mail.
       documentation_link: Saber mais
       release_notes: Notas de lançamento
       title: Atualizações disponíveis
@@ -966,7 +936,6 @@ pt-PT:
         used_by_over_week:
           one: Utilizada por uma pessoa na última semana
           other: Utilizada por %{count} pessoas na última semana
-      title: Em alta
       trending: Em alta
     warning_presets:
       add_new: Adicionar novo
@@ -1051,9 +1020,7 @@ pt-PT:
       guide_link_text: Todos podem contribuir.
     sensitive_content: Conteúdo problemático
   application_mailer:
-    notification_preferences: Alterar preferências de e-mail
     salutation: "%{name},"
-    settings: 'Alterar preferências de e-mail: %{link}'
     unsubscribe: Cancelar subscrição
     view: 'Ver:'
     view_profile: Ver perfil
@@ -1073,7 +1040,6 @@ pt-PT:
       hint_html: Só mais uma coisa! Precisamos confirmar que você é um humano (isto para que possamos evitar spam!). Resolva o CAPTCHA abaixo e clique em "Continuar".
       title: Verificação de segurança
     confirmations:
-      awaiting_review: O seu endereço de correio eletrónico foi confirmado! A equipa %{domain} está agora a rever a sua inscrição. Receberá uma mensagem de correio eletrónico se aprovarem a sua conta!
       awaiting_review_title: A sua inscrição está a ser revista
       clicking_this_link: clicar nesta hiperligação
       login_link: iniciar sessão
@@ -1081,7 +1047,6 @@ pt-PT:
       redirect_to_app_html: Devia ter sido reencaminhado para a aplicação <strong>%{app_name}</strong>. Se isso não aconteceu, tente %{clicking_this_link} ou volte manualmente para a aplicação.
       registration_complete: O seu registo sem %{domain} está agora concluído!
       welcome_title: Bem-vindo(a), %{name}!
-      wrong_email_hint: Se esse endereço de e-mail não estiver correto, você pode alterá-lo nas configurações da conta.
     delete_account: Eliminar conta
     delete_account_html: Se deseja eliminar a sua conta, pode <a href="%{path}">continuar aqui</a>. Uma confirmação será solicitada.
     description:
@@ -1102,7 +1067,6 @@ pt-PT:
     or_log_in_with: Ou iniciar sessão com
     privacy_policy_agreement_html: Eu li e concordo com a <a href="%{privacy_policy_path}" target="_blank">política de privacidade</a>
     progress:
-      confirm: Confirmar e-mail
       details: Os seus dados
       review: A nossa avaliação
       rules: Aceitar regras
@@ -1124,10 +1088,8 @@ pt-PT:
     security: Alterar palavra-passe
     set_new_password: Editar palavra-passe
     setup:
-      email_below_hint_html: Verifique a sua pasta de spam, ou solicite outra. Pode corrigir o seu endereço de e-mail se este estiver errado.
       email_settings_hint_html: Clique no link que enviamos para verificar %{email}. Esperaremos aqui.
       link_not_received: Não recebeu um link?
-      new_confirmation_instructions_sent: Receberá um novo e-mail com o link de confirmação daqui a poucos minutos!
       title: Verifique a caixa de entrada do seu e-mail
     sign_in:
       preamble_html: Iniciar sessão com as suas credenciais de <strong>%{domain}</strong>. Se a sua conta estiver hospedada noutro servidor, não poderá iniciar sessão aqui.
@@ -1138,9 +1100,7 @@ pt-PT:
       title: Vamos lá inscrevê-lo em %{domain}.
     status:
       account_status: Estado da conta
-      confirming: A aguardar que conclua a confirmação do e-mail.
       functional: A sua conta está totalmente operacional.
-      pending: A sua inscrição está pendente de revisão pela nossa equipa. Isso pode demorar algum tempo. Receberá um e-mail se a sua conta for aprovada.
       redirecting_to: A sua conta está inativa porque está atualmente a ser redirecionada para %{acct}.
       self_destruct: Como %{domain} vai fechar, só terá acesso limitado à sua conta.
       view_strikes: Veja as reprimendas anteriores sobre a sua conta
@@ -1183,9 +1143,6 @@ pt-PT:
       before: 'Antes de continuar, por favor leia cuidadosamente estas notas:'
       caches: O conteúdo que foi armazenado em cache por outras instâncias pode perdurar
       data_removal: As suas publicações e outros dados serão eliminados permanentemente
-      email_change_html: Pode <a href="%{path}">alterar o seu endereço de e-mail</a> sem eliminar a sua conta
-      email_contact_html: Se ainda não chegou, pode enviar um e-mail a <a href="mailto:%{email}">%{email}</a> para obter ajuda
-      email_reconfirmation_html: Se não recebeu o e-mail de confirmação, pode <a href="%{path}">pedi-lo novamente</a>
       irreversible: Não será possível restaurar ou reativar sua conta
       more_details_html: Para mais pormenores, leia a <a href="%{terms_path}">política de privacidade</a>.
       username_available: O seu nome de utilizador ficará novamente disponível
@@ -1418,7 +1375,6 @@ pt-PT:
     authentication_methods:
       otp: aplicação de autenticação em duas etapas
       password: palavra-passe
-      sign_in_token: código de segurança por correio electrónico
       webauthn: chaves de segurança
     description_html: Se vê atividade que não reconhece, considere alterar a sua palavra-passe e ativar a autenticação em duas etapas.
     empty: Sem histórico de autenticação disponível
@@ -1429,16 +1385,6 @@ pt-PT:
     unsubscribe:
       action: Sim, cancelar subscrição
       complete: Subscrição Cancelada
-      confirmation_html: Tem a certeza que deseja cancelar a subscrição para receber %{type} pelo Mastodon em %{domain} no seu e-mail em %{email}? Pode sempre subcrever novamente nas suas <a href="%{settings_path}">configurações de notificação de e-mail</a>.
-      emails:
-        notification_emails:
-          favourite: e-mails de notificação de favorito
-          follow: e-mails de notificação de seguidor
-          follow_request: e-mails de notificação de pedido de seguidor
-          mention: e-mails de notificação de menção
-          reblog: e-mails de notificação de partilha
-      resubscribe_html: Se cancelou a subscrição por engano, pode subscrever novamente nas suas <a href="%{settings_path}">configurações de notificação de e-mail</a>.
-      success_html: Não receberá novamente %{type} pelo Mastodon em %{domain} para o seu e-mail em %{email}.
       title: Cancelar subscrição
   media_attachments:
     validations:
@@ -1519,8 +1465,6 @@ pt-PT:
     update:
       subject: "%{name} editou uma publicação"
   notifications:
-    administration_emails: Notificções administrativas por e-mail
-    email_events: Eventos para notificações por e-mail
     email_events_hint: 'Selecione os casos para os quais deseja receber notificações:'
   number:
     human:
@@ -1679,7 +1623,6 @@ pt-PT:
     import: Importar
     import_and_export: Importar e exportar
     migrate: Migração de conta
-    notifications: Notificações por e-mail
     preferences: Preferências
     profile: Perfil
     relationships: Seguindo e seguidores
@@ -1926,7 +1869,6 @@ pt-PT:
     invalid_otp_token: Código de autenticação inválido
     otp_lost_help_html: Se perdeu o acesso a ambos, pode entrar em contacto com %{email}
     rate_limited: Demasiadas tentativas de autenticação, tente novamente mais tarde.
-    seamless_external_login: Tu estás ligado via um serviço externo. Por isso, as configurações da palavra-passe e do e-mail não estão disponíveis.
     signed_in_as: 'Registado como:'
   verification:
     extra_instructions_html: <strong>Dica:</strong> A ligação no seu site pode ser invisível. A parte importante é <code>rel="me"</code> que impede a personificação em sites com conteúdo gerado pelo utilizador. Pode até utilizar uma etiqueta <code>link</code> no cabeçalho da página ao invés de <code>a</code>, mas o HTML deve ser acessível sem executar JavaScript.
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index 79bc2a275f4045..52982ead2d8c22 100644
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -33,7 +33,6 @@ ro:
       created_msg: Notă de moderare creată cu succes!
       destroyed_msg: Notă de moderare distrusă cu succes!
     accounts:
-      add_email_domain_block: Domeniu de e-mail în lista neagră
       approve: Aprobă
       approved_msg: Cererea de înregistrare de către %{username} a fost aprobată cu succes
       are_you_sure: Ești sigur?
@@ -60,7 +59,6 @@ ro:
       demote: Retrogradează
       destroyed_msg: Datele utilizatorului %{username} sunt acum în așteptare pentru a fi șterse iminent
       disable: Dezactivează
-      disable_sign_in_token_auth: Dezactivează autentificarea prin token e-mail
       disable_two_factor_authentication: Dezactivează 2FA
       disabled: Dezactivat
       display_name: Nume afișat
@@ -69,7 +67,6 @@ ro:
       email: E-mail
       email_status: Stare e-mail
       enable: Activează
-      enable_sign_in_token_auth: Activează autentificarea prin token e-mail
       enabled: Activat
       enabled_msg: Am dezghețat cu succes contul %{username}
       followers: Urmăritori
@@ -131,7 +128,6 @@ ro:
       resubscribe: Resubscrie-te
       role: Rol
       search: Caută
-      search_same_email_domain: Alţi utilizatori cu acelaşi domeniu de e-mail
       search_same_ip: Alţi utilizatori cu acelaşi IP
       security: Securitate
       security_measures:
@@ -172,7 +168,6 @@ ro:
         approve_appeal: Aprobare apel
         approve_user: Aprobă Utilizatorul
         assigned_to_self_report: Atribuie raportul
-        change_email_user: Schimbă e-mailul pentru utilizator
         change_role_user: Schimbă rolul utilizatorului
         confirm_user: Confirmare Utilizator
         create_account_warning: Crează avertisment
@@ -180,7 +175,6 @@ ro:
         create_custom_emoji: Creează Zâmbet Personalizat
         create_domain_allow: Creează permis domeniu
         create_domain_block: Crează blocare de domenii
-        create_email_domain_block: Creați blocare de domeniu e-mail
         create_ip_block: Creează regulă IP
         create_unavailable_domain: Crează domeniu indisponibil
         create_user_role: Creează Rol
@@ -189,7 +183,6 @@ ro:
         destroy_custom_emoji: Ștergere Zâmbet Personalizat
         destroy_domain_allow: Ștergere Permitere Domeniu
         destroy_domain_block: Ștergere Blocare Domeniu
-        destroy_email_domain_block: Șterge Blocarea Domeniului de Email
         destroy_instance: Curăță Domeniul
         destroy_ip_block: Șterge regula IP
         destroy_status: Șterge starea
@@ -197,10 +190,8 @@ ro:
         destroy_user_role: Distruge Rolul
         disable_2fa_user: Dezactivează 2FA
         disable_custom_emoji: Dezactivează Emoji-urile Personalizate
-        disable_sign_in_token_auth_user: Dezactivează Autentificarea prin Token E-mail pentru Utilizator
         disable_user: Dezactivează Utilizator
         enable_custom_emoji: Activează Emoji Personalizat
-        enable_sign_in_token_auth_user: Activează Autentificarea prin Token e-mail pentru Utilizator
         enable_user: Activează Utilizator
         memorialize_account: Comemoreză Contul
         promote_user: Promovează utilizator
@@ -451,8 +442,6 @@ ro:
       guide_link_text: Toată lumea poate contribui.
     sensitive_content: Conținut sensibil
   application_mailer:
-    notification_preferences: Modifică preferințe e-mail
-    settings: 'Modifică preferințe e-mail: %{link}'
     view: 'Vizualizare:'
     view_profile: Vizualizați profilul
     view_status: Vezi starea
@@ -484,8 +473,6 @@ ro:
     set_new_password: Setează o nouă parolă
     status:
       account_status: Starea contului
-      confirming: Se așteaptă finalizarea confirmării prin e-mail.
-      pending: Cererea dvs. este în curs de revizuire de către personalul nostru. Este posibil să dureze ceva timp. Veți primi un e-mail dacă cererea dvs. este aprobată.
       redirecting_to: Contul dvs. este inactiv deoarece în prezent se redirecționează către %{acct}.
   challenge:
     confirm: Continuă
@@ -517,8 +504,6 @@ ro:
       before: 'Înainte de a continua, vă rugăm să citiţi aceste note cu atenţie:'
       caches: Conținutul care a fost memorat de alte servere poate persista
       data_removal: Postările tale și alte date vor fi șterse permanent
-      email_change_html: Puteți <a href="%{path}">schimba adresa de e-mail</a> fără a șterge contul dvs
-      email_contact_html: Dacă tot nu ajunge, puteți trimite e-mail la <a href="mailto:%{email}">%{email}</a> pentru ajutor
   errors:
     '403': Nu ai permisiunea să vizitezi această pagină.
     '404': Pagina pe care o cauți nu există.
@@ -764,7 +749,6 @@ ro:
     follow_limit_reached: Nu poți urmări mai mult de %{limit} persoane
     invalid_otp_token: Cod doi pași nevalid
     otp_lost_help_html: Dacă ai pierdut accesul la ambele, poți lua legătura cu %{email}
-    seamless_external_login: Sunteți autentificat prin intermediul unui serviciu extern, astfel încât parola și setările de e-mail nu sunt disponibile.
     signed_in_as: 'Conectat ca:'
   verification:
     verification: Verificare
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 5f5b3676fb6623..324a22500d23fe 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -35,7 +35,6 @@ ru:
       created_msg: Заметка модератора успешно создана!
       destroyed_msg: Заметка модератора успешно удалена!
     accounts:
-      add_email_domain_block: Заблокировать e-mail домен
       approve: Подтвердить
       approved_msg: Успешно одобрена заявка на регистрацию %{username}
       are_you_sure: Вы уверены?
@@ -62,7 +61,6 @@ ru:
       demote: Разжаловать
       destroyed_msg: Данные %{username} поставлены в очередь на удаление
       disable: Заморозка
-      disable_sign_in_token_auth: Отключить аутентификацию по e-mail кодам
       disable_two_factor_authentication: Отключить 2FA
       disabled: Отключено
       display_name: Отображаемое имя
@@ -71,7 +69,6 @@ ru:
       email: E-mail
       email_status: Статус e-mail
       enable: Включить
-      enable_sign_in_token_auth: Включить аутентификацию по e-mail кодам
       enabled: Включен
       enabled_msg: Учётная запись %{username} успешно разморожена
       followers: Подписчики
@@ -138,7 +135,6 @@ ru:
       resubscribe: Переподписаться
       role: Роль
       search: Поиск
-      search_same_email_domain: Другие пользователи с тем же доменом электронной почты
       search_same_ip: Другие пользователи с таким же IP
       security: Безопасность
       security_measures:
@@ -179,26 +175,21 @@ ru:
         approve_appeal: Одобрить обжалование
         approve_user: Утвердить
         assigned_to_self_report: Присвоение жалоб
-        change_email_user: Изменение эл. почты пользователя
         change_role_user: Изменить роль пользователя
         confirm_user: Подтверждение пользователей
         create_account_warning: Выдача предупреждения
         create_announcement: Создание объявлений
-        create_canonical_email_block: Создать блокировку эл. почты
         create_custom_emoji: Добавление эмодзи
         create_domain_allow: Разрешение доменов
         create_domain_block: Блокировка доменов
-        create_email_domain_block: Блокировка e-mail доменов
         create_ip_block: Создание правил для IP-адресов
         create_unavailable_domain: Добавление домена в список недоступных
         create_user_role: Создать роль
         demote_user: Разжалование пользователей
         destroy_announcement: Удаление объявлений
-        destroy_canonical_email_block: Удалить блокировку эл. почты
         destroy_custom_emoji: Удаление эмодзи
         destroy_domain_allow: Отзыв разрешений для доменов
         destroy_domain_block: Разблокировка доменов
-        destroy_email_domain_block: Разблокировка e-mail доменов
         destroy_instance: Очистить домен
         destroy_ip_block: Удаление правил для IP-адресов
         destroy_status: Удаление постов
@@ -206,10 +197,8 @@ ru:
         destroy_user_role: Удалить роль
         disable_2fa_user: Отключение 2FA
         disable_custom_emoji: Отключение эмодзи
-        disable_sign_in_token_auth_user: Отключение аутентификации по e-mail кодам у пользователей
         disable_user: Заморозка пользователей
         enable_custom_emoji: Включение эмодзи
-        enable_sign_in_token_auth_user: Включение аутентификации по e-mail кодам у пользователей
         enable_user: Разморозка пользователей
         memorialize_account: Присвоение пользователям статуса «мемориала»
         promote_user: Повышение пользователей
@@ -238,26 +227,20 @@ ru:
         approve_appeal_html: "%{name} одобрил апелляцию на умеренное решение от %{target}"
         approve_user_html: "%{name} утвердил(а) регистрацию %{target}"
         assigned_to_self_report_html: "%{name} назначил(а) себя для решения жалобы %{target}"
-        change_email_user_html: "%{name} сменил(а) e-mail пользователя %{target}"
         change_role_user_html: "%{name} изменил(а) роль %{target}"
-        confirm_user_html: "%{name} подтвердил(а) e-mail адрес пользователя %{target}"
         create_account_warning_html: "%{name} выдал(а) предупреждение %{target}"
         create_announcement_html: "%{name} создал(а) новое объявление %{target}"
-        create_canonical_email_block_html: "%{name} заблокировал(а) эл. почту с хешем %{target}"
         create_custom_emoji_html: "%{name} загрузил(а) новый эмодзи %{target}"
         create_domain_allow_html: "%{name} разрешил(а) федерацию с доменом %{target}"
         create_domain_block_html: "%{name} заблокировал(а) домен %{target}"
-        create_email_domain_block_html: "%{name} заблокировал(а) e-mail домен %{target}"
         create_ip_block_html: "%{name} создал(а) правило для IP %{target}"
         create_unavailable_domain_html: "%{name} приостановил доставку на узел %{target}"
         create_user_role_html: "%{name} создал(а) роль %{target}"
         demote_user_html: "%{name} разжаловал(а) пользователя %{target}"
         destroy_announcement_html: "%{name} удалил(а) объявление %{target}"
-        destroy_canonical_email_block_html: "%{name} снял(а) блокировку e-mail с хэшем %{target}"
         destroy_custom_emoji_html: "%{name} удалил(а) эмодзи %{target}"
         destroy_domain_allow_html: "%{name} запретил(а) федерацию с доменом %{target}"
         destroy_domain_block_html: "%{name} снял(а) блокировку с домена %{target}"
-        destroy_email_domain_block_html: "%{name} снял(а) блокировку с e-mail домена %{target}"
         destroy_instance_html: "%{name} очистил(а) данные для домена %{target}"
         destroy_ip_block_html: "%{name} удалил(а) правило для IP %{target}"
         destroy_status_html: "%{name} удалил(а) пост пользователя %{target}"
@@ -265,10 +248,8 @@ ru:
         destroy_user_role_html: "%{name} удалил(а) роль %{target}"
         disable_2fa_user_html: "%{name} отключил(а) требование двухэтапной авторизации для пользователя %{target}"
         disable_custom_emoji_html: "%{name} отключил(а) эмодзи %{target}"
-        disable_sign_in_token_auth_user_html: "%{name} отключил(а) аутентификацию по e-mail кодам для %{target}"
         disable_user_html: "%{name} заморозил(а) пользователя %{target}"
         enable_custom_emoji_html: "%{name} включил(а) эмодзи %{target}"
-        enable_sign_in_token_auth_user_html: "%{name} включил(а) аутентификацию по e-mail кодам для %{target}"
         enable_user_html: "%{name} разморозил(а) пользователя %{target}"
         memorialize_account_html: "%{name} перевел(а) учётную запись пользователя %{target} в статус памятника"
         promote_user_html: "%{name} повысил(а) пользователя %{target}"
@@ -276,7 +257,6 @@ ru:
         reject_user_html: "%{name} отклонил(а) регистрацию %{target}"
         remove_avatar_user_html: "%{name} убрал(а) аватарку пользователя %{target}"
         reopen_report_html: "%{name} повторно открыл(а) жалобу %{target}"
-        resend_user_html: "%{name} переслал письмо с подтверждением для %{target}"
         reset_password_user_html: "%{name} сбросил(а) пароль пользователя %{target}"
         resolve_report_html: "%{name} решил(а) жалобу %{target}"
         sensitive_account_html: "%{name} установил(а) отметку файлов %{target} как «деликатного характера»"
@@ -446,7 +426,6 @@ ru:
         many: "%{count} попыток за последнюю неделю"
         one: "%{count} попытка за последнюю неделю"
         other: "%{count} попыток регистрации за последнюю неделю"
-      created_msg: E-mail домен внесён в список блокировки
       delete: Удалить
       dns:
         types:
@@ -455,12 +434,8 @@ ru:
       new:
         create: Создать блокировку
         resolve: Проверить домен
-        title: Новая блокировка по домену
-      no_email_domain_block_selected: Блоки домена электронной почты не были изменены, так как не были выбраны
       not_permitted: Не разрешено
-      resolved_dns_records_hint_html: Доменное имя устраняется на следующие MX-домены, которые в конечном итоге отвечают за прием электронной почты. Блокировка MX-домена будет блокировать регистрации с любого адреса электронной почты, который использует тот же MX-домен, даже если видимое доменное имя отличается от него. <strong>Будьте осторожны, чтобы не блокировать основных поставщиков электронной почты</strong>
       resolved_through_html: Разрешено через %{domain}
-      title: Блокировка e-mail доменов
     export_domain_allows:
       new:
         title: Импорт домена разрешён
@@ -619,7 +594,6 @@ ru:
         resolve_description_html: Никаких действий не будет выполнено относительно доложенного содержимого. Жалоба будет закрыта.
         silence_description_html: Учетная запись будет видна только тем пользователям, которые уже подписаны на неё, либо открыли его вручную. Это действие можно отменить в любой момент, и отменяет все жалобы против аккаунта.
         suspend_description_html: Аккаунт и все его содержимое будут недоступны и в конечном итоге удалены, и взаимодействие с ним будет невозможно. Это действие можно отменить в течение 30 дней. Отменяет все жалобы против этого аккаунта.
-      actions_description_html: Выберите действие, чтобы решить данную жалобу. Если вы выберите наказание против аккаунта, вы получите уведомление по E-Mail, проверяйте папку <strong>Спам</strong>.
       actions_description_remote_html: Решите вопрос о том, какие меры необходимо принять для урегулирования этой жалобы. Это повлияет только на то, как <strong>ваш</strong> сервер взаимодействует с этим удаленным аккаунтом и обрабатывает его содержимое.
       add_to_report: Прикрепить ещё
       are_you_sure: Вы уверены?
@@ -680,7 +654,6 @@ ru:
         delete_data_html: Удалить профиль и контент <strong>@%{acct}</strong> через 30 дней, если за это время они не будут разблокированы
         preview_preamble_html: "<strong>@%{acct}</strong> получит предупреждение со следующим содержанием:"
         record_strike_html: Запишите замечание против <strong>@%{acct}</strong>, чтобы помочь вам в решении будущих нарушений с этого аккаунта
-        send_email_html: Отправить <strong>@%{acct}</strong> предупреждение на почту
         warning_placeholder: Необязательное дополнительное обоснование действия модерации.
       target_origin: Происхождение объекта жалобы
       title: Жалобы
@@ -724,7 +697,6 @@ ru:
         manage_appeals: Управление апелляциями
         manage_appeals_description: Позволяет пользователям просматривать апелляции на действия модерации
         manage_blocks: Управление блоками
-        manage_blocks_description: Позволяет пользователям блокировать домены электронной почты и IP адреса
         manage_custom_emojis: Управление смайлами
         manage_custom_emojis_description: Позволяет пользователям управлять пользовательскими эмодзи на сервере
         manage_federation: Управление Федерацией
@@ -742,7 +714,6 @@ ru:
         manage_taxonomies: Управление трендами
         manage_taxonomies_description: Позволяет пользователям модерировать список популярного контента и менять настройки хэштегов
         manage_user_access: Управление правами пользователей
-        manage_user_access_description: Разрешает пользователям отключать двухэтапную аутентификацию другим пользователям, изменять их адрес электронной почты и сбрасывать их пароль
         manage_users: Управление пользователями
         manage_users_description: Разрешает пользователям просматривать информацию о других пользователях и применять против них модерацию
         manage_webhooks: Управление веб-хуками
@@ -814,7 +785,6 @@ ru:
       destroyed_msg: Файл успешно удалён.
     software_updates:
       critical_update: Критично — пожалуйста, обновите как можно скорее
-      description: Рекомендуется поддерживать установку Mastodon в актуальном состоянии, чтобы воспользоваться последними исправлениями и возможностями. Кроме того, иногда очень важно своевременно обновлять Mastodon, чтобы избежать проблем с безопасностью. По этим причинам Mastodon проверяет наличие обновлений каждые 30 минут и уведомляет вас об этом в соответствии с вашими предпочтениями в отношении уведомлений по электронной почте.
       documentation_link: Узнать больше
       release_notes: Примечания к выпуску
       title: Доступные обновления
@@ -972,7 +942,6 @@ ru:
           many: За последнюю неделю использовало %{count} человек
           one: За последнюю неделю использовал один человек
           other: За последнюю неделю использовал %{count} человек
-      title: Популярное
       trending: Популярное
     warning_presets:
       add_new: Добавить
@@ -1055,9 +1024,7 @@ ru:
       guide_link_text: Каждый может внести свой вклад.
     sensitive_content: Содержимое деликатного характера
   application_mailer:
-    notification_preferences: Настроить уведомления можно здесь
     salutation: "%{name},"
-    settings: 'Настроить уведомления можно здесь: %{link}'
     unsubscribe: Отписаться
     view: 'Просмотр:'
     view_profile: Просмотреть профиль
@@ -1077,7 +1044,6 @@ ru:
       hint_html: Еще одна вещь! Нам нужно подтвердить, что вы человек (так что мы можем держать спам!). Решите капчу ниже и нажмите кнопку «Продолжить».
       title: Проверка безопасности
     confirmations:
-      awaiting_review: Ваш адрес электронной почты подтвержден! Сотрудники %{domain} проверяют вашу регистрацию. Вы получите письмо, если они подтвердят вашу учетную запись!
       awaiting_review_title: Ваша регистрация проверяется
       clicking_this_link: нажатие на эту ссылку
       login_link: войти
@@ -1085,7 +1051,6 @@ ru:
       redirect_to_app_html: Вы должны были перенаправлены на приложение <strong>%{app_name}</strong>. Если этого не произошло, попробуйте %{clicking_this_link} или вернитесь к приложению вручную.
       registration_complete: Ваша регистрация на %{domain} завершена!
       welcome_title: Добро пожаловать, %{name}!
-      wrong_email_hint: Если этот адрес электронной почты неверен, вы можете изменить его в настройках аккаунта.
     delete_account: Удалить учётную запись
     delete_account_html: Удалить свою учётную запись <a href="%{path}">можно в два счёта здесь</a>, но прежде у вас будет спрошено подтверждение.
     description:
@@ -1106,7 +1071,6 @@ ru:
     or_log_in_with: Или войти с помощью
     privacy_policy_agreement_html: Мной прочитана и принята <a href="%{privacy_policy_path}" target="_blank">политика конфиденциальности</a>
     progress:
-      confirm: Подтвердите e-mail
       details: Ваши данные
       review: Наш обзор
       rules: Принять правила
@@ -1128,10 +1092,8 @@ ru:
     security: Безопасность
     set_new_password: Задать новый пароль
     setup:
-      email_below_hint_html: Проверьте папку "Спам" или запросите другую. Вы можете исправить свой адрес электронной почты, если он неправильный.
       email_settings_hint_html: Нажмите на ссылку, которую мы отправили вам для проверки %{email}. Мы будем ждать прямо здесь.
       link_not_received: Не получили ссылку?
-      new_confirmation_instructions_sent: Через несколько минут вы получите новое письмо со ссылкой для подтверждения!
       title: Проверьте свой почтовый ящик
     sign_in:
       preamble_html: Войдите, используя ваши учётные данные <strong>%{domain}</strong>. Если ваша учётная запись размещена на другом сервере, вы не сможете здесь войти.
@@ -1142,9 +1104,7 @@ ru:
       title: Зарегистрируйтесь в %{domain}.
     status:
       account_status: Статус учётной записи
-      confirming: Ожидание подтверждения e-mail.
       functional: Ваша учётная запись в полном порядке.
-      pending: Ваша заявка ожидает одобрения администраторами, это может занять немного времени. Вы получите письмо, как только заявку одобрят.
       redirecting_to: Ваша учётная запись деактивированна, потому что вы настроили перенаправление на %{acct}.
       self_destruct: Поскольку %{domain} закрывается, вы получите ограниченный доступ к вашей учетной записи.
       view_strikes: Просмотр предыдущих замечаний в адрес вашей учетной записи
@@ -1187,9 +1147,6 @@ ru:
       before: 'Внимательно прочитайте следующую информацию перед началом:'
       caches: Некоторые данные, обработанные другими узлами, однако, могут храниться ещё какое-то время
       data_removal: Все ваши золотые посты, шикарный профиль и прочие данные будут безвозвратно уничтожены
-      email_change_html: <a href="%{path}">Поменять свой e-mail</a> можно не удаляя учётную запись
-      email_contact_html: Если письмо не приходит, обратитесь за помощю на <a href="mailto:%{email}">%{email}</a>
-      email_reconfirmation_html: Если вы не получили письмо с подтверждением, его можно <a href="%{path}">запросить ещё раз</a>
       irreversible: После удаления восстановить или повторно активировать учётную запись не получится
       more_details_html: За всеми подробностями, изучите <a href="%{terms_path}">политику конфиденциальности</a>.
       username_available: Ваше имя пользователя снова станет доступным
@@ -1438,7 +1395,6 @@ ru:
     authentication_methods:
       otp: приложение двухфакторной аутентификации
       password: пароль
-      sign_in_token: код безопасности из e-mail
       webauthn: ключи безопасности
     description_html: Если вы видите неопознанное действие, смените пароль и/или включите двухфакторную авторизацию.
     empty: Нет доступной истории входов
@@ -1449,16 +1405,6 @@ ru:
     unsubscribe:
       action: Да, отписаться
       complete: Подписка отменена
-      confirmation_html: Вы уверены, что хотите отписаться от получения на ваш адрес электронной почты %{email} %{type} от Сообщества Mastodon %{domain}?  Вы всегда можете заново подписаться на уведомления по электронной почте в разделе настройки <a href="%{settings_path}"></a>.
-      emails:
-        notification_emails:
-          favourite: Избранные уведомления по электронной почте
-          follow: подписаться на уведомления по электронной почте
-          follow_request: Уведомлять по электронной почте о новых запросах
-          mention: получать уведомления с упоминаниями
-          reblog: подписаться на уведомления по электронной почте
-      resubscribe_html: Если вы отказались от подписки по ошибке, вы всегда можете заново подписаться на уведомления по электронной почте по этой ссылке <a href="%{settings_path}"></a>.
-      success_html: Вы больше не будете получать %{type} для Mastodon на %{domain} к себе на почту %{email}.
       title: Отписаться
   media_attachments:
     validations:
@@ -1539,8 +1485,6 @@ ru:
     update:
       subject: "%{name} изменил(а) пост"
   notifications:
-    administration_emails: Уведомления администратора по электронной почте
-    email_events: События для e-mail уведомлений
     email_events_hint: 'Выберите события, для которых вы хотели бы получать уведомления:'
   number:
     human:
@@ -1699,7 +1643,6 @@ ru:
     import: Импорт
     import_and_export: Импорт и экспорт
     migrate: Миграция учётной записи
-    notifications: Уведомления по электронной почте
     preferences: Настройки
     profile: Профиль
     relationships: Подписки и подписчики
@@ -1912,7 +1855,6 @@ ru:
     invalid_otp_token: Введен неверный код двухфакторной аутентификации
     otp_lost_help_html: Если Вы потеряли доступ к обоим, свяжитесь с %{email}
     rate_limited: Слишком много попыток аутентификации, повторите попытку позже.
-    seamless_external_login: Вы залогинены через сторонний сервис, поэтому настройки e-mail и пароля недоступны.
     signed_in_as: 'Выполнен вход под именем:'
   verification:
     extra_instructions_html: <strong>Подсказка:</strong> Ссылка на вашем сайте может быть невидимой. Важной частью является <code>rel="me"</code>, который предотвращает выдачу себя за другое лицо на сайтах с пользовательским контентом. Вы даже можете использовать тег <code>link</code> в заголовке страницы вместо <code>a</code>, но HTML должен быть доступен без выполнения JavaScript.
diff --git a/config/locales/sc.yml b/config/locales/sc.yml
index 6f4fd6eb30da66..ee66cef834a215 100644
--- a/config/locales/sc.yml
+++ b/config/locales/sc.yml
@@ -31,7 +31,6 @@ 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?
@@ -114,7 +113,6 @@ sc:
       reset_password: Reseta sa crae
       resubscribe: Torra a sutascrìere
       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
       sensitive: Sensìbile
@@ -147,21 +145,18 @@ sc:
     action_logs:
       action_types:
         assigned_to_self_report: Assigna s'informe
-        change_email_user: Muda s'indiritzu eletrònicu pro s'utente
         confirm_user: Cunfirma s'utente
         create_account_warning: Crea un'avisu
         create_announcement: Crea un'annùntziu
         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 indiritzu de posta
         create_ip_block: Crea una règula IP
         demote_user: Degrada s'utente
         destroy_announcement: Cantzella s'annùntziu
         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 s'indiritzu de posta
         destroy_ip_block: Cantzella sa règula IP
         destroy_status: Cantzella s'istadu
         disable_2fa_user: Disativa 2FA
@@ -188,20 +183,16 @@ sc:
         update_status: Atualiza s'istadu
       actions:
         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}"
-        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}"
         create_domain_allow_html: "%{name} at permìtidu sa federatzione cun su domìniu %{target}"
         create_domain_block_html: "%{name} at blocadu su domìniu %{target}"
-        create_email_domain_block_html: "%{name} at blocadu su domìniu de posta eletrònica %{target}"
         create_ip_block_html: "%{name} at creadu una règula pro s'IP %{target}"
         demote_user_html: "%{name} at degradadu s'utente %{target}"
         destroy_announcement_html: "%{name} at cantzelladu s'annùntziu %{target}"
         destroy_domain_allow_html: "%{name} no at permìtidu sa federatzione cun su domìniu %{target}"
         destroy_domain_block_html: "%{name} at isblocadu su domìniu %{target}"
-        destroy_email_domain_block_html: "%{name} at isblocadu su domìniu de posta eletrònica %{target}"
         destroy_ip_block_html: "%{name} at cantzelladu sa règula pro s'IP %{target}"
         destroy_status_html: "%{name} at eliminadu sa publicatzione de %{target}"
         disable_2fa_user_html: "%{name} at disativadu su rechisitu de duos fatores pro s'utente %{target}"
@@ -332,14 +323,11 @@ sc:
       view: Bide su blocu de domìniu
     email_domain_blocks:
       add_new: Agiunghe nou
-      created_msg: Domìniu de posta eletrònica blocadu
       delete: Cantzella
       domain: Domìniu
       new:
         create: Agiunghe unu domìniu
-        title: Bloca su domìniu de posta eletrònica nou
       not_permitted: Non permìtidu
-      title: Domìnios de posta eletrònica blocados
     export_domain_allows:
       no_file: Perunu archìviu seletzionadu
     export_domain_blocks:
@@ -582,7 +570,6 @@ sc:
         disallow_account: Non permitas a s'autore
       tags:
         title: Etichetas de tendèntzia
-      title: Tendèntzias
     warning_presets:
       add_new: Agiunghe noa
       delete: Cantzella
@@ -638,9 +625,7 @@ sc:
       guide_link_text: Chie si siat podet contribuire.
     sensitive_content: Cuntenutu sensìbile
   application_mailer:
-    notification_preferences: Muda is preferèntzias de posta
     salutation: "%{name},"
-    settings: 'Muda is preferèntzias de posta: %{link}'
     unsubscribe: Annulla sa sutiscritzione
     view: 'Visualizatzione:'
     view_profile: Visualiza profilu
@@ -677,7 +662,6 @@ sc:
     migrate_account_html: Si boles torrare a indiritzare custu contu a un'àteru, ddu as a pòdere <a href="%{path}">fàghere inoghe</a>.
     or_log_in_with: O intra cun
     progress:
-      confirm: Cunfirma s'indiritzu de posta eletrònica
       details: Is detàllios tuos
       review: Sa revisione nostra
       rules: Atzeta is règulas
@@ -698,9 +682,7 @@ sc:
       link_not_received: No as retzidu su ligòngiu?
     status:
       account_status: Istadu de su contu
-      confirming: Isetende chi sa posta eletrònica siat cumpletada.
       functional: Su contu tuo est operativu.
-      pending: Sa dimanda tua est in protzessu de revisione dae su personale nostru. Podet serbire unu pagu de tempus. As a retzire unu messàgiu eletrònicu si sa dimanda est aprovada.
       redirecting_to: Su contu tuo est inativu pro ite in die de oe est torrende a indiritzare a %{acct}.
     too_fast: Formulàriu imbiadu tropu a lestru, torra a proare.
     use_security_key: Imprea una crae de seguresa
@@ -741,9 +723,6 @@ sc:
       before: 'In antis de sighire, leghe custu cun atentzione:'
       caches: Su cuntenutu chi siat istadu sarvadu in sa memòria temporànea de àteros serbidores podet sighire a esìstere
       data_removal: Is publicatziones tuas e àteros datos ant a èssere cantzellados in manera permanente
-      email_change_html: Podes <a href="%{path}">mudare s'indiritzu tuo de posta eletrònica</a> sena cantzellare su contu
-      email_contact_html: Si no est ancora arribada, podes imbiare unu messàgiu a <a href="mailto:%{email}">%{email}</a> e dimandare agiudu
-      email_reconfirmation_html: Si no ses retzende su messàgiu de cunfirmatzione, ddu podes <a href="%{path}">torrare a dimandare</a>
       irreversible: No as a pòdere ripristinare o torrare a ativare su contu tuo
       more_details_html: Pro àteros detàllios, bide sa <a href="%{terms_path}">normativa de riservadesa</a>.
       username_available: Su nòmine de utente tuo at a torrare a èssere a disponimentu
@@ -973,7 +952,6 @@ sc:
     status:
       subject: "%{name} at publicadu cosa"
   notifications:
-    email_events: Eventos pro notìficas cun posta eletrònica
     email_events_hint: 'Seletziona eventos pro is chi boles retzire notìficas:'
   number:
     human:
@@ -1111,7 +1089,6 @@ sc:
     import: Importatzione
     import_and_export: Importatzione e esportatzione
     migrate: Tràmuda de contu
-    notifications: Notìficas tràmite posta eletrònica
     preferences: Preferèntzias
     profile: Profilu pùblicu
     relationships: Gente chi sighis e sighiduras
@@ -1249,7 +1226,6 @@ sc:
     follow_limit_reached: Non podes sighire prus de %{limit} persones
     invalid_otp_token: Còdighe a duas fases non vàlidu
     otp_lost_help_html: Si as pèrdidu s'atzessu a ambos, podes cuntatare a %{email}
-    seamless_external_login: As abertu sa sessione pro mèdiu de unu servìtziu esternu, e pro custa resone is cunfiguratziones de sa crae de intrada e de posta eletrònica non sunt a disponimentu.
     signed_in_as: 'Sessione aberta comente:'
   verification:
     verification: Verìfica
diff --git a/config/locales/sco.yml b/config/locales/sco.yml
index 7c733b71b50d89..4b7b9e56d713e0 100644
--- a/config/locales/sco.yml
+++ b/config/locales/sco.yml
@@ -31,7 +31,6 @@ sco:
       created_msg: Moderation note successfully makkit!
       destroyed_msg: Moderation note successfully destroyed!
     accounts:
-      add_email_domain_block: Dingie email domain
       approve: Approve
       approved_msg: Successfully approvit %{username}'s sign-up application
       are_you_sure: Ye shuir?
@@ -58,7 +57,6 @@ sco:
       demote: Demote
       destroyed_msg: "%{username}'s data is noo queued fir tae be deletit the noo"
       disable: Freeze
-      disable_sign_in_token_auth: Turn aff email token authentication
       disable_two_factor_authentication: Turn aff 2FA
       disabled: Froze
       display_name: Display nemm
@@ -67,7 +65,6 @@ sco:
       email: Email
       email_status: Email status
       enable: Unfreeze
-      enable_sign_in_token_auth: Turn on email token authentication
       enabled: Turnt on
       enabled_msg: Successfully unfroze %{username}'s accoont
       followers: Follaers
@@ -127,7 +124,6 @@ sco:
       resubscribe: Resubscribe
       role: Role
       search: Seirch
-      search_same_email_domain: Ither uisers wi the same email domain
       search_same_ip: Ither uisers wi the same IP
       security_measures:
         only_password: Ainly passwird
@@ -167,26 +163,21 @@ sco:
         approve_appeal: Approve Appeal
         approve_user: Approve Uiser
         assigned_to_self_report: Assign Clype
-        change_email_user: Chynge Email fir Uiser
         change_role_user: Chynge Role o Uiser
         confirm_user: Confirm Uiser
         create_account_warning: Mak Warnin
         create_announcement: Mak Annooncement
-        create_canonical_email_block: Mak a Email Dingie
         create_custom_emoji: Mak Custom Emoji
         create_domain_allow: Mak Domain Alloo
         create_domain_block: Mak Domain Dingie
-        create_email_domain_block: Mak Email Domain Dingie
         create_ip_block: Mak IP rule
         create_unavailable_domain: Mak Unavailable Domain
         create_user_role: Mak Role
         demote_user: Demote Uiser
         destroy_announcement: Delete Annooncement
-        destroy_canonical_email_block: Delete Email Dingie
         destroy_custom_emoji: Delete Custom Emoji
         destroy_domain_allow: Delete Domain Alloo
         destroy_domain_block: Delete Domain Dingie
-        destroy_email_domain_block: Delete Email Domain Dingie
         destroy_instance: Purge Domain
         destroy_ip_block: Delete IP rule
         destroy_status: Delete Post
@@ -194,10 +185,8 @@ sco:
         destroy_user_role: Destroy Role
         disable_2fa_user: Disable 2FA
         disable_custom_emoji: Disable Custom Emoji
-        disable_sign_in_token_auth_user: Disable Email Token Authentication fir Uiser
         disable_user: Turn aff Uiser
         enable_custom_emoji: Turn on Custom Emoji
-        enable_sign_in_token_auth_user: Turn on Email Token Authentication fir Uiser
         enable_user: Turn on Uiser
         memorialize_account: Memorialize Accoont
         promote_user: Promote Uiser
@@ -226,26 +215,20 @@ sco:
         approve_appeal_html: "%{name} approved moderation decision appeal fae %{target}"
         approve_user_html: "%{name} approved sign-up fae %{target}"
         assigned_to_self_report_html: "%{name} assigned clype %{target} tae theirsels"
-        change_email_user_html: "%{name} chynged the email address o uiser %{target}"
         change_role_user_html: "%{name} chynged the role o %{target}"
-        confirm_user_html: "%{name} confirmt email address o uiser %{target}"
         create_account_warning_html: "%{name} sent a warnin tae %{target}"
         create_announcement_html: "%{name} creatit new annooncement %{target}"
-        create_canonical_email_block_html: "%{name} dingied email wi the hash %{target}"
         create_custom_emoji_html: "%{name} uploadit new emoji %{target}"
         create_domain_allow_html: "%{name} allooed federation wi domain %{target}"
         create_domain_block_html: "%{name} dingied domain %{target}"
-        create_email_domain_block_html: "%{name} dingied email domain %{target}"
         create_ip_block_html: "%{name} creatit rule fir IP %{target}"
         create_unavailable_domain_html: "%{name} stapt delivery tae domain %{target}"
         create_user_role_html: "%{name} creatit %{target} role"
         demote_user_html: "%{name} demotit uiser %{target}"
         destroy_announcement_html: "%{name} deletit annooncement %{target}"
-        destroy_canonical_email_block_html: "%{name} undingied email wi the hash %{target}"
         destroy_custom_emoji_html: "%{name} deletit emoji %{target}"
         destroy_domain_allow_html: "%{name} disallooed federation wi domain %{target}"
         destroy_domain_block_html: "%{name} undingied domain %{target}"
-        destroy_email_domain_block_html: "%{name} undingied email domain %{target}"
         destroy_instance_html: "%{name} purged domain %{target}"
         destroy_ip_block_html: "%{name} deletit rule fir IP %{target}"
         destroy_status_html: "%{name} taen doon post bi %{target}"
@@ -253,10 +236,8 @@ sco:
         destroy_user_role_html: "%{name} deletit %{target} role"
         disable_2fa_user_html: "%{name} turnt aff twa factor requirement fir uiser %{target}"
         disable_custom_emoji_html: "%{name} turnt aff emoji %{target}"
-        disable_sign_in_token_auth_user_html: "%{name} turnt aff email token authentication fir %{target}"
         disable_user_html: "%{name} turnt aff login fir uiser %{target}"
         enable_custom_emoji_html: "%{name} turnt on emoji %{target}"
-        enable_sign_in_token_auth_user_html: "%{name} turnt on email token authentication fir %{target}"
         enable_user_html: "%{name} turnt on login fir uiser %{target}"
         memorialize_account_html: "%{name} pit %{target}'s accoont ower intae a memorial page"
         promote_user_html: "%{name} promotit uiser %{target}"
@@ -264,7 +245,6 @@ sco:
         reject_user_html: "%{name} rejectit sign-up fae %{target}"
         remove_avatar_user_html: "%{name} taen doon %{target}'s avatar"
         reopen_report_html: "%{name} reopent clype %{target}"
-        resend_user_html: "%{name} resent confirmation email fir %{target}"
         reset_password_user_html: "%{name} reset passwird fir uiser %{target}"
         resolve_report_html: "%{name} resolved clype %{target}"
         sensitive_account_html: "%{name} mairked %{target}'s media as sensitive"
@@ -412,7 +392,6 @@ sco:
       attempts_over_week:
         one: "%{count} attempt ower the last week"
         other: "%{count} sign-up attempts ower the last week"
-      created_msg: Successfully dingied email domain
       delete: Delete
       dns:
         types:
@@ -421,11 +400,7 @@ sco:
       new:
         create: Add domain
         resolve: Resolve domain
-        title: Dingie new email domain
-      no_email_domain_block_selected: Nae email domain dingies got chynged as naen wis selectit
-      resolved_dns_records_hint_html: The domain nemm resolves tae the follaein MX domains, thit ur ultimately responsible fir acceptin email. Dingiein a MX domain wull dingie sign-ups fae onie email address thit uises the same MX domain, even if the visible domain name is different. <strong>Caw canny no tae dingie major email providers.</strong>
       resolved_through_html: Resolvit throu %{domain}
-      title: Dingied email domains
     export_domain_allows:
       new:
         title: Import domain alloos
@@ -571,7 +546,6 @@ sco:
         mark_as_sensitive_description_html: The media in the clyped on posts will be mairked as sensitive an a strike wull be recordit fir tae help ye escalate on future infractions bi the same accoont.
         other_description_html: See mair options fir controllin the accoont's behaviour an customize communication tae the clyped on accoont.
         resolve_description_html: Nae action wull be taen aginst the clyped on accoont, nae strike recordit, an the clype wull be shut.
-      actions_description_html: Decide whit action fir tae tak fir tae resolve this clype. If ye tak a punitive action agin the accoont thit wis clyped on, a email note wull be sent tae them, except whan the <strong>Mince</strong> caitegory is selectit.
       add_to_report: Add mair tae yer clype
       are_you_sure: Ye sure?
       assign_to_self: Assign tae me
@@ -647,7 +621,6 @@ sco:
         manage_appeals: Manage Appeals
         manage_appeals_description: Alloos uisers fir tae luik ower appeals aginst moderation actions
         manage_blocks: Manage Dingies
-        manage_blocks_description: Alloos uisers fir tae dingie email providers an IP addresses
         manage_custom_emojis: Manage Custom Emoji
         manage_custom_emojis_description: Alloos uisers fir tae manage custom emoji on the server
         manage_federation: Manage Federation
@@ -665,7 +638,6 @@ sco:
         manage_taxonomies: Manage Taxonomies
         manage_taxonomies_description: Alloos uisers fir tae luik ower trendin content an update hashtag settins
         manage_user_access: Manage Uiser Access
-        manage_user_access_description: Alloos uisers fir tae turn aff ither uisers' twa-factor authentication, chynge their email address, an reset their passwird
         manage_users: Manage Uisers
         manage_users_description: Alloos uisers fir tae luik at ither uisers' details an cairry oot moderation actions agin them
         manage_webhooks: Manage Webhooks
@@ -835,7 +807,6 @@ sco:
         used_by_over_week:
           one: Uised bi ae person ower the last week
           other: Uised bi %{count} fowk ower the last week
-      title: Trends
       trending: Trendin
     warning_presets:
       add_new: Add new
@@ -910,9 +881,7 @@ sco:
       guide_link_text: Awbody kin contribute.
     sensitive_content: Sensitive content
   application_mailer:
-    notification_preferences: Chynge email preferences
     salutation: "%{name},"
-    settings: 'Chynge email preferences: %{link}'
     view: 'View:'
     view_profile: View profile
     view_status: View post
@@ -959,9 +928,7 @@ sco:
       title: Let's get ye set up on %{domain}.
     status:
       account_status: Accoont status
-      confirming: Waitin fir email confirmation fir tae be completit.
       functional: Yer accoont is fully operational.
-      pending: Yer application is pendin review bi oor staff. This'll mibbie tak some time. Ye'll get a email if yer application is approved.
       redirecting_to: Yer accoont isnae active acause it is redirectin tae %{acct} the noo.
       view_strikes: Luik at past strikes aginst yer accoont
     too_fast: Form submittit ower fast, try again.
@@ -1003,9 +970,6 @@ sco:
       before: 'Afore proceedin, please read thir notes careful:'
       caches: Content thit haes been cached bi ither servers eull mibbie persist
       data_removal: Yer posts an ither data wull get permanently removed
-      email_change_html: Ye kin <a href="%{path}">chynge yer email address</a> athoot deletin yer accoont
-      email_contact_html: Gin it stull disnae arrive, ye kin email <a href="mailto:%{email}">%{email}</a> fir help
-      email_reconfirmation_html: Gin ye urnae gettin the confirmation email, ye kin <a href="%{path}">request it again</a>
       irreversible: Ye wullnae be able tae restore or reactivate yer accoont
       more_details_html: Fir mair details, see the <a href="%{terms_path}">privacy policy</a>.
       username_available: Yer uisernemm wull become available again
@@ -1186,7 +1150,6 @@ sco:
     authentication_methods:
       otp: twa-factor authentication app
       password: passwird
-      sign_in_token: email security code
       webauthn: security keys
     description_html: If ye see activity on yer accoont thit ye dinnae recognize, consider chyngin yer passwird an turnin on twa-factor authentication.
     empty: Nae authentication history available
@@ -1272,7 +1235,6 @@ sco:
     update:
       subject: "%{name} editit a post"
   notifications:
-    email_events: Events fir email notes
     email_events_hint: 'Pick events thit ye''r wantin tae get notes fir:'
   number:
     human:
@@ -1583,7 +1545,6 @@ sco:
     follow_limit_reached: Ye cannae follae mair than %{limit} fowk
     invalid_otp_token: Invalid twa-factor code
     otp_lost_help_html: If ye lost access tae baith, ye kin get in touch wi %{email}
-    seamless_external_login: Ye'r logged in via a external service, sae passwird an email settins urnae available.
     signed_in_as: 'Signt in as:'
   verification:
     verification: Verification
diff --git a/config/locales/si.yml b/config/locales/si.yml
index 85e242b630fe6c..e68da4321add08 100644
--- a/config/locales/si.yml
+++ b/config/locales/si.yml
@@ -26,7 +26,6 @@ si:
     account_moderation_notes:
       create: සටහනක් තබන්න
     accounts:
-      add_email_domain_block: වි-තැපැල් වසම අවහිර කරන්න
       approve: අනුමැතිය
       approved_msg: "%{username}හි ලියාපදිංචි වීමේ යෙදුම සාර්ථකව අනුමත කරන ලදී"
       are_you_sure: ඔබට විශ්වාසද?
@@ -51,14 +50,12 @@ si:
       delete: දත්ත මකන්න
       deleted: මකා ඇත
       destroyed_msg: "%{username}හි දත්ත ඉක්මනින් මකා දැමීමට පෝලිම් කර ඇත"
-      disable_sign_in_token_auth: ඊමේල් ටෝකන් සත්‍යාපනය අක්‍රීය කරන්න
       disable_two_factor_authentication: 2FA අබල කරන්න
       display_name: ප්රදර්ශන නාමය
       domain: වසම
       edit: සංස්කරණය
       email: විද්‍යුත් තැපෑල
       email_status: වි-තැපෑලෙහි තත්වය
-      enable_sign_in_token_auth: විද්‍යුත් තැපෑල ටෝකන් සත්‍යාපනය සබල කරන්න
       enabled: සබල කර ඇත
       enabled_msg: "%{username}ගේ ගිණුම සාර්ථකව අත්හිටුවා ඇත"
       followers: අනුගාමිකයින්
@@ -115,7 +112,6 @@ si:
       resubscribe: නැවත දායක වන්න
       role: භූමිකාව
       search: සොයන්න
-      search_same_email_domain: එකම විද්‍යුත් තැපැල් වසම සහිත වෙනත් පරිශීලකයන්
       search_same_ip: එකම IP සහිත වෙනත් පරිශීලකයන්
       security: ආරක්‍ෂාව
       security_measures:
@@ -159,7 +155,6 @@ si:
         create_announcement: නිවේදනය සාදන්න
         create_custom_emoji: අභිරුචි ඉමොජි සාදන්න
         create_domain_allow: වසමකට ඉඩදීම සාදන්න
-        create_email_domain_block: ඊමේල් ඩොමේන් බ්ලොක් එකක් සාදන්න
         create_ip_block: අ.ජා.කෙ. නීතියක් සාදන්න
         create_unavailable_domain: ලබා ගත නොහැකි වසම සාදන්න
         create_user_role: භූමිකාව සාදන්න
@@ -168,16 +163,13 @@ si:
         destroy_custom_emoji: අභිරුචි ඉමොජි මකන්න
         destroy_domain_allow: වසම මකන්න ඉඩ දෙන්න
         destroy_domain_block: වසම් වාරණය මකන්න
-        destroy_email_domain_block: ඊමේල් ඩොමේන් බ්ලොක් එක මකන්න
         destroy_instance: වසම පිරිසිදු කරන්න
         destroy_ip_block: IP රීතිය මකන්න
         destroy_status: ලිපිය මකන්න
         destroy_unavailable_domain: ලබා ගත නොහැකි වසම මකන්න
         disable_2fa_user: 2FA අබල කරන්න
         disable_custom_emoji: අභිරුචි ඉමෝජි අබල කරන්න
-        disable_sign_in_token_auth_user: පරිශීලකයා සඳහා ඊමේල් ටෝකන් සත්‍යාපනය අක්‍රීය කරන්න
         enable_custom_emoji: අභිරුචි ඉමෝජි සබල කරන්න
-        enable_sign_in_token_auth_user: පරිශීලකයා සඳහා විද්‍යුත් තැපෑල ටෝකන් සත්‍යාපනය සක්‍රීය කරන්න
         enable_user: පරිශීලක සබල කරන්න
         memorialize_account: ගිණුම අනුස්මරණ කරන්න
         reject_appeal: අභියාචනය ප්‍රතික්ෂේප කරන්න
@@ -201,30 +193,24 @@ si:
       actions:
         approve_user_html: "%{name} අනුමත ලියාපදිංචිය %{target}සිට"
         assigned_to_self_report_html: "%{name} වාර්තාව %{target} තමන්ටම පවරා ඇත"
-        change_email_user_html: "%{name} පරිශීලක %{target}ගේ ඊමේල් ලිපිනය වෙනස් කළේය"
-        confirm_user_html: "%{name} පරිශීලකයාගේ තහවුරු කරන ලද විද්‍යුත් තැපැල් ලිපිනය %{target}"
         create_account_warning_html: "%{name} %{target}අනතුරු ඇඟවීමක් යවා ඇත"
         create_announcement_html: "%{name} නව නිවේදනයක් තනන %{target}"
         create_custom_emoji_html: "%{name} නව ඉමොජි %{target}උඩුගත කරන ලදී"
         create_domain_allow_html: "%{name} වසම %{target}සමඟ ෆෙඩරේෂණයට අවසර දී ඇත"
         create_domain_block_html: "%{name} අවහිර කළ වසම %{target}"
-        create_email_domain_block_html: "%{name} අවහිර කරන ලද විද්‍යුත් තැපැල් වසම %{target}"
         create_ip_block_html: "%{name} IP %{target}සඳහා රීතිය සාදන ලදී"
         create_unavailable_domain_html: "%{name} වසම %{target}වෙත බෙදා හැරීම නැවැත්වීය"
         demote_user_html: "%{name} පහත හෙලන ලද පරිශීලක %{target}"
         destroy_announcement_html: "%{name} මකා දැමූ නිවේදනය %{target}"
         destroy_domain_allow_html: වසම %{target}සමඟ %{name} අවසර නොදුන් සම්මේලනය
         destroy_domain_block_html: "%{name} අවහිර නොකළ වසම %{target}"
-        destroy_email_domain_block_html: "%{name} අවහිර නොකළ විද්‍යුත් තැපැල් වසම %{target}"
         destroy_instance_html: "%{name} පිරිසිදු කරන ලද වසම %{target}"
         destroy_ip_block_html: IP %{target}සඳහා %{name} මකා දැමූ රීතිය
         destroy_unavailable_domain_html: "%{name} වසම %{target}වෙත බෙදා හැරීම නැවත ආරම්භ විය"
         disable_2fa_user_html: "%{name} පරිශීලක %{target}සඳහා සාධක දෙකක අවශ්‍යතාවය අක්‍රීය කර ඇත"
         disable_custom_emoji_html: "%{name} ආබාධිත ඉමොජි %{target}"
-        disable_sign_in_token_auth_user_html: "%{name} අක්‍රීය කරන ලද විද්‍යුත් තැපෑල ටෝකන් සත්‍යාපනය සඳහා %{target}"
         disable_user_html: "%{name} පරිශීලක %{target}සඳහා අබල කළ පිවිසුම"
         enable_custom_emoji_html: "%{name} සක්‍රීය ඉමොජි %{target}"
-        enable_sign_in_token_auth_user_html: "%{name} %{target}විද්‍යුත් තැපෑල ටෝකන් සත්‍යාපනය සක්‍රීය කර ඇත"
         enable_user_html: පරිශීලක %{target}සඳහා %{name} සක්‍රීය පුරනය වීම
         memorialize_account_html: "%{name} %{target}ගේ ගිණුම සිහිවටන පිටුවක් බවට පත් කළේය"
         promote_user_html: "%{name} උසස් පරිශීලක %{target}"
@@ -363,7 +349,6 @@ si:
       attempts_over_week:
         one: පසුගිය සතිය පුරා %{count} උත්සාහයක්
         other: පසුගිය සතියේ ලියාපදිංචි වීමේ උත්සාහයන් %{count} ක්
-      created_msg: විද්‍යුත් තැපැල් වසම සාර්ථකව අවහිර කරන ලදී
       delete: මකන්න
       dns:
         types:
@@ -372,11 +357,7 @@ si:
       new:
         create: වසම එකතු කරන්න
         resolve: වසම විසඳන්න
-        title: නව විද්‍යුත් තැපැල් වසම අවහිර කරන්න
-      no_email_domain_block_selected: කිසිවක් තෝරා නොගත් බැවින් විද්‍යුත් තැපැල් වසම් වාරණ කිසිවක් වෙනස් කර නැත
-      resolved_dns_records_hint_html: ඩොමේන් නාමය පහත දැක්වෙන MX වසම් වලට විසඳයි, ඒවා අවසානයේ ඊමේල් පිළිගැනීම සඳහා වගකිව යුතුය. MX වසමක් අවහිර කිරීම දෘශ්‍ය වසම් නාමය වෙනස් වුවද, එකම MX වසම භාවිතා කරන ඕනෑම විද්‍යුත් තැපැල් ලිපිනයකින් ලියාපදිංචි වීම අවහිර කරයි. <strong>ප්‍රධාන විද්‍යුත් තැපැල් සපයන්නන් අවහිර නොකිරීමට ප්‍රවේශම් වන්න.</strong>
       resolved_through_html: "%{domain}හරහා විසඳා ඇත"
-      title: අවහිර කළ වි-තැපැල් වසම්
     follow_recommendations:
       description_html: "<strong>නව පරිශීලකයින්ට රසවත් අන්තර්ගතයන් ඉක්මනින් සොයා ගැනීමට උපකාර වන නිර්දේශ අනුගමනය කරන්න</strong>. පෞද්ගලීකරණය කළ පසු විපරම් නිර්දේශ සැකසීමට තරම් පරිශීලකයෙකු අන් අය සමඟ අන්තර් ක්‍රියා කර නොමැති විට, ඒ වෙනුවට මෙම ගිණුම් නිර්දේශ කෙරේ. දී ඇති භාෂාවක් සඳහා ඉහළම මෑත කාලීන නියැලීම් සහ ඉහළම දේශීය අනුගාමික සංඛ්‍යාව සහිත ගිණුම් මිශ්‍රණයකින් ඒවා දෛනික පදනමින් නැවත ගණනය කෙරේ."
       language: භාෂාව සඳහා
@@ -503,7 +484,6 @@ si:
       actions:
         other_description_html: ගිණුමේ හැසිරීම පාලනය කිරීම සහ වාර්තා කළ ගිණුමට සන්නිවේදනය අභිරුචිකරණය කිරීම සඳහා තවත් විකල්ප බලන්න.
         resolve_description_html: වාර්තා කරන ලද ගිණුමට එරෙහිව කිසිදු ක්‍රියාමාර්ගයක් නොගනු ඇත, වැඩ වර්ජනයක් වාර්තා නොකෙරේ, වාර්තාව වසා දමනු ඇත.
-      actions_description_html: මෙම වාර්තාව විසඳීමට ගත යුතු ක්‍රියාමාර්ගය තීරණය කරන්න. ඔබ වාර්තා කරන ලද ගිණුමට එරෙහිව දණ්ඩනීය ක්‍රියාමාර්ගයක් ගන්නේ නම්, <strong>Spam</strong> කාණ්ඩය තෝරාගත් විට හැර, ඔවුන්ට විද්‍යුත් තැපෑලෙන් දැනුම්දීමක් යවනු ලැබේ.
       add_to_report: වාර්තා කිරීමට තවත් එක් කරන්න
       are_you_sure: ඔබට විශ්වාසද?
       assign_to_self: මට පවරන්න
@@ -719,7 +699,6 @@ si:
         used_by_over_week:
           one: පසුගිය සතිය පුරා එක් පුද්ගලයෙකු විසින් භාවිතා කරන ලදී
           other: පසුගිය සතිය පුරා පුද්ගලයින් %{count} දෙනෙකු විසින් භාවිතා කරන ලදී
-      title: ප්රවණතා
       trending: ප්රවණතා
     warning_presets:
       add_new: අලුතින් එකතු කරන්න
@@ -788,9 +767,7 @@ si:
       guide_link_text: පරිවර්තකයින්ට දායක වීමට හැකිය.
     sensitive_content: සංවේදී අන්තර්ගත
   application_mailer:
-    notification_preferences: වි-තැපැල් අභිප්‍රේත වෙනස් කරන්න
     salutation: "%{name},"
-    settings: 'වි-තැපැල් අභිප්‍රේත වෙනස් කරන්න: %{link}'
     view: 'දැක්ම:'
     view_profile: පැතිකඩ බලන්න
     view_status: ලිපිය බලන්න
@@ -840,9 +817,7 @@ si:
       title: "%{domain} වෙත පිවිසෙන්න"
     status:
       account_status: ගිණුමේ තත්වය
-      confirming: විද්‍යුත් තැපෑල තහවුරු කිරීම සම්පූර්ණ කිරීම සඳහා රැඳී සිටිමින්.
       functional: ඔබගේ ගිණුම සම්පුර්ණයෙන්ම ක්‍රියාත්මකයි.
-      pending: ඔබගේ අයදුම්පත අපගේ කාර්ය මණ්ඩලය විසින් සමාලෝචනය කිරීමට බලාපොරොත්තු වේ. මෙය යම් කාලයක් ගත විය හැක. ඔබගේ අයදුම්පත අනුමත වුවහොත් ඔබට විද්‍යුත් තැපෑලක් ලැබෙනු ඇත.
       redirecting_to: එය දැනට %{acct}වෙත හරවා යවන බැවින් ඔබගේ ගිණුම අක්‍රියයි.
       view_strikes: ඔබගේ ගිණුමට එරෙහිව පසුගිය වර්ජන බලන්න
     too_fast: පෝරමය ඉතා වේගයෙන් ඉදිරිපත් කර ඇත, නැවත උත්සාහ කරන්න.
@@ -884,9 +859,6 @@ si:
       before: 'ඉදිරියට යාමට පෙර, කරුණාකර මෙම සටහන් හොඳින් කියවන්න:'
       caches: වෙනත් සේවාදායකයන් විසින් හැඹිලිගත කර ඇති අන්තර්ගතය දිගටම පැවතිය හැක
       data_removal: ඔබගේ ලිපි සහ අනෙකුත් දත්ත සදහටම ඉවත් කෙරෙනු ඇත
-      email_change_html: ඔබට ඔබගේ ගිණුම මකා</a> <a href="%{path}">කළ හැක
-      email_contact_html: එය තවමත් නොපැමිණියේ නම්, ඔබට උදව් සඳහා <a href="mailto:%{email}">%{email}</a> විද්‍යුත් තැපෑලෙන් යැවිය හැක
-      email_reconfirmation_html: ඔබට තහවුරු කිරීමේ විද්‍යුත් තැපෑල නොලැබුනේ නම්, ඔබට එය <a href="%{path}">නැවත ඉල්ලා සිටිය හැක</a>
       irreversible: ඔබට ඔබගේ ගිණුම ප්‍රතිසාධනය කිරීමට හෝ නැවත සක්‍රිය කිරීමට නොහැකි වනු ඇත
       more_details_html: වැඩි විස්තර සඳහා, <a href="%{terms_path}">පෞද්ගලිකත්ව ප්‍රතිපත්තිය</a>බලන්න.
       username_available: ඔබගේ පරිශීලක නාමය නැවත ලබා ගත හැකි වනු ඇත
@@ -1063,7 +1035,6 @@ si:
     authentication_methods:
       otp: ද්වි-සාධක සත්‍යාපන යෙදුම
       password: මුරපදය
-      sign_in_token: ඊමේල් ආරක්ෂක කේතය
       webauthn: ආරක්ෂක යතුරු
     description_html: ඔබ හඳුනා නොගත් ක්‍රියාකාරකම් ඔබ දුටුවහොත්, ඔබේ මුරපදය වෙනස් කිරීම සහ ද්වි-සාධක සත්‍යාපනය සක්‍රීය කිරීම සලකා බලන්න.
     empty: සත්‍යාපන ඉතිහාසයක් නොමැත
@@ -1141,7 +1112,6 @@ si:
     update:
       subject: "%{name} ලිපිය සංශෝධනය කළා"
   notifications:
-    email_events: ඊමේල් දැනුම්දීම් සඳහා සිදුවීම්
     email_events_hint: 'ඔබට දැනුම්දීම් ලැබීමට අවශ්‍ය සිදුවීම් තෝරන්න:'
   number:
     human:
@@ -1436,7 +1406,6 @@ si:
     follow_limit_reached: ඔබට පුද්ගලයින් %{limit} කට වඩා අනුගමනය කළ නොහැක
     invalid_otp_token: වලංගු නොවන ද්වි-සාධක කේතය
     otp_lost_help_html: ඔබට දෙකටම ප්‍රවේශය අහිමි වුවහොත්, ඔබට %{email}සමඟ සම්බන්ධ විය හැක
-    seamless_external_login: ඔබ බාහිර සේවාවක් හරහා ලොග් වී ඇත, එබැවින් මුරපදය සහ ඊමේල් සැකසුම් නොමැත.
     signed_in_as: 'මෙසේ පුරනය වී ඇත:'
   verification:
     here_is_how: කෙසේදැයි මෙන්න
diff --git a/config/locales/simple_form.nn.yml b/config/locales/simple_form.nn.yml
index f7551cc313e5bf..c4d4438b94e31c 100644
--- a/config/locales/simple_form.nn.yml
+++ b/config/locales/simple_form.nn.yml
@@ -15,7 +15,7 @@ nn:
       account_migration:
         acct: Angi brukarnamn@domene til brukaren du ynskjer å flytta til
       account_warning_preset:
-        text: Du kan bruka tut-syntaks, som t. d. URL-ar, emneknaggar og nemningar
+        text: Du kan bruka tut-syntaks, som t. d. URL-ar, emneknaggar og omtaler
         title: Valfritt. Ikkje synleg for mottakar
       admin_account_action:
         include_statuses: Brukaren får sjå kva tut som førte til moderatorhandlinga eller -åtvaringa
@@ -81,7 +81,7 @@ nn:
         backups_retention_period: Brukarar har moglegheit til å generere arkiv av sine innlegg for å laste ned seinare. Når sett til ein positiv verdi, blir desse arkiva automatisk sletta frå lagringa etter eit gitt antal dagar.
         bootstrap_timeline_accounts: Desse kontoane vil bli festa øverst på fylgjaranbefalingane til nye brukarar.
         closed_registrations_message: Vist når det er stengt for registrering
-        content_cache_retention_period: Alle innlegg frå andre serverar (inkludert boostar og svar) vil bli sletta etter dei gitte antal dagar, uten hensyn til lokale brukarinteraksjonar med desse innlegga. Dette inkluderer innlegg der ein lokal brukar har merka det som bokmerker eller som favorittar. Òg private nemningar mellom brukarar frå ulike førekomstar vil gå tapt og vere umogleg å gjenskape. Bruk av denne innstillinga er rekna på spesielle førekomstar og bryt mange brukarforventingar når dette blir tatt i generell bruk.
+        content_cache_retention_period: Alle innlegg frå andre tenarar (inkludert framhevingar og svar) vil bli sletta etter talet på dagar du skriv inn, uansett om nokon har samhandla med desse innlegga. Dette inkluderer innlegg der ein lokal brukar har merka det som bokmerke eller som favoritt. Private omtaler mellom brukarar frå ulike nettstader vil gå tapt og vera umogleg å gjenskapa. Bruk av denne innstillinga er meint for spesielle nettstader og bryt med det mange forventar av ein vanleg nettstad.
         custom_css: Du kan bruka eigendefinerte stilar på nettversjonen av Mastodon.
         favicon: WEBP, PNG, GIF eller JPG. Overstyrer det standarde Mastodon-favikonet med eit eigendefinert ikon.
         mascot: Overstyrer illustrasjonen i det avanserte webgrensesnittet.
@@ -314,6 +314,7 @@ nn:
         listable: Tillat denne emneknaggen å synast i søk og i profilmappa
         name: Emneknagg
         trendable: Tillat denne emneknaggen til å synast under trendar
+        usable: Godta at innlegga kan bruka denne emneknaggen lokalt
       user:
         role: Rolle
         time_zone: Tidssone
diff --git a/config/locales/simple_form.th.yml b/config/locales/simple_form.th.yml
index 387f74e74202ae..8bd782c1405d32 100644
--- a/config/locales/simple_form.th.yml
+++ b/config/locales/simple_form.th.yml
@@ -314,6 +314,7 @@ th:
         listable: อนุญาตให้แฮชแท็กนี้ปรากฏในการค้นหาและข้อเสนอแนะ
         name: แฮชแท็ก
         trendable: อนุญาตให้แฮชแท็กนี้ปรากฏภายใต้แนวโน้ม
+        usable: อนุญาตให้โพสต์ใช้แฮชแท็กนี้ในเซิร์ฟเวอร์
       user:
         role: บทบาท
         time_zone: โซนเวลา
diff --git a/config/locales/simple_form.tr.yml b/config/locales/simple_form.tr.yml
index b07a79d3ebc816..c62be89b283f79 100644
--- a/config/locales/simple_form.tr.yml
+++ b/config/locales/simple_form.tr.yml
@@ -288,7 +288,7 @@ tr:
           sign_up_requires_approval: Kayıtları sınırla
         severity: Kural
       notification_emails:
-        appeal: Birisi, bir yönetim kararına itiraz ediyor
+        appeal: Birisi, bir moderatör kararına itiraz ediyor
         digest: Özet e-postaları gönder
         favourite: Birisi gönderinizi beğendi
         follow: Biri seni takip etti
diff --git a/config/locales/simple_form.zh-CN.yml b/config/locales/simple_form.zh-CN.yml
index d059adf0e6bcf1..3f7b8782ee247d 100644
--- a/config/locales/simple_form.zh-CN.yml
+++ b/config/locales/simple_form.zh-CN.yml
@@ -49,12 +49,12 @@ zh-CN:
         header: 支持WEBP、PNG、GIF 或 JPG。最大 %{size}。将缩小到 %{dimensions}px
         inbox_url: 从你想要使用的中继站的主页上复制 URL
         irreversible: 已过滤的嘟文会不可逆转地消失，即便移除过滤器之后也一样
-        locale: 用户界面、电子邮件和推送通知中使用的语言
+        locale: 在用户界面、电子邮件和推送通知中使用的语言
         password: 至少需要8个字符
         phrase: 匹配将忽略嘟文或内容警告里的字母大小写
         scopes: 哪些 API 被允许使用。如果你勾选了更高一级的范围，就不用单独选中子项目了。
         setting_aggregate_reblogs: 不显示最近已经被转嘟过的嘟文(只会影响新收到的转嘟)
-        setting_always_send_emails: 一般情况下，如果您活跃使用 Mastodon，我们不会给您发送电子邮件通知
+        setting_always_send_emails: 一般情况下，如果你活跃使用 Mastodon，我们不会向你发送电子邮件通知
         setting_default_sensitive: 敏感内容默认隐藏，并在点击后显示
         setting_display_media_default: 隐藏被标记为敏感内容的媒体
         setting_display_media_hide_all: 始终隐藏媒体
@@ -66,7 +66,7 @@ zh-CN:
       domain_allow:
         domain: 该站点将能够从该服务器上拉取数据，并处理和存储收到的数据。
       email_domain_block:
-        domain: 这可以是电子邮件地址的域名或它使用的 MX 记录所指向的域名。用户注册时，系统会对此检查。
+        domain: 这可以是邮箱地址的域名或它使用的 MX 记录所指向的域名。用户注册时，系统会对此执行检查。
         with_dns_records: Mastodon 会尝试解析所给域名的 DNS 记录，然后把解析结果一并封禁
       featured_tag:
         name: 以下是你最近使用过的标签：
@@ -100,8 +100,8 @@ zh-CN:
         thumbnail: 与服务器信息一并展示的约 2:1 比例的图像。
         timeline_preview: 未登录访客将能够浏览服务器上最新的公共嘟文。
         trendable_by_default: 跳过对热门内容的手工审核。个别项目仍可在之后从趋势中删除。
-        trends: 趋势中会显示正在你服务器上受到关注的嘟文、标签和新闻故事。
-        trends_as_landing_page: 向注销的用户和访问者显示趋势内容，而不是对该服务器的描述，需要启用趋势。
+        trends: 热门页中会显示正在你服务器上受到关注的嘟文、标签和新闻故事。
+        trends_as_landing_page: 向注销的用户和访问者显示热门内容，而不是对该服务器的描述，需要启用热门。
       form_challenge:
         current_password: 你正在进入安全区域
       imports:
@@ -188,7 +188,7 @@ zh-CN:
         current_password: 当前密码
         data: 数据文件
         display_name: 昵称
-        email: 电子邮件地址
+        email: 邮箱地址
         expires_in: 失效时间
         fields: 个人资料附加信息
         header: 个人资料页横幅图片
@@ -231,7 +231,7 @@ zh-CN:
         title: 标题
         type: 导入数据类型
         username: 用户名
-        username_or_email: 用户名或电子邮件地址
+        username_or_email: 用户名或邮箱地址
         whole_word: 整个词条
       email_domain_block:
         with_dns_records: 包括该域名的 MX 记录和 IP 地址
@@ -269,8 +269,8 @@ zh-CN:
         thumbnail: 本站缩略图
         timeline_preview: 时间轴预览
         trendable_by_default: 允许在未审核的情况下将话题置为热门
-        trends: 启用趋势
-        trends_as_landing_page: 使用趋势作为登陆页面
+        trends: 启用热门
+        trends_as_landing_page: 使用热门页作为登陆页面
       interactions:
         must_be_follower: 屏蔽来自未关注我的用户的通知
         must_be_following: 屏蔽来自我未关注的用户的通知
@@ -291,11 +291,11 @@ zh-CN:
         appeal: 有人对审核结果提出申诉
         digest: 发送摘要邮件
         favourite: 当有用户喜欢了我的嘟文时，发送电子邮件提醒我
-        follow: 当有用户关注我时，发送电子邮件提醒我
-        follow_request: 当有用户向我发送关注请求时，发送电子邮件提醒我
-        mention: 当有用户在嘟文中提及我时，发送电子邮件提醒我
-        pending_account: 在有账号需要审核时，发送电子邮件提醒我
-        reblog: 当有用户转嘟了我的嘟文时，发送电子邮件提醒我
+        follow: 有用户关注我时
+        follow_request: 有用户向我发送关注请求时
+        mention: 有用户提及我时
+        pending_account: 有账号需要审核时
+        reblog: 有用户转嘟我的嘟文时
         report: 新举报已提交
         software_updates:
           all: 通知所有更新
diff --git a/config/locales/simple_form.zh-TW.yml b/config/locales/simple_form.zh-TW.yml
index 15ccaf8a17782d..05692243adecf1 100644
--- a/config/locales/simple_form.zh-TW.yml
+++ b/config/locales/simple_form.zh-TW.yml
@@ -45,10 +45,10 @@ zh-TW:
         current_password: 因安全因素，請輸入目前帳號的密碼
         current_username: 請輸入目前帳號的使用者名稱以確認
         digest: 僅於您長時間未登入且於未登入期間收到私訊時傳送
-        email: 您將收到一封確認電子郵件
+        email: 您將收到一封驗證電子郵件
         header: 支援 WEBP、PNG、GIF 或 JPG 圖片格式，檔案最大為 %{size}。將等比例縮減至 %{dimensions} 像素
         inbox_url: 自您想要使用的中繼首頁複製網址
-        irreversible: 已過濾的嘟文將會不可逆地消失，即便之後移除過濾器也一樣
+        irreversible: 已過濾之嘟文將不可逆地消失，即便之後移除過濾器也一樣
         locale: 使用者介面、電子郵件與推播通知的語言
         password: 使用至少 8 個字元
         phrase: 無論是嘟文的本文或是內容警告都會被過濾
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index cedb5d614a5362..ac6134caa784b8 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -35,7 +35,6 @@ sk:
       created_msg: Poznámka moderátora bola úspešne vytvorená!
       destroyed_msg: Moderátorska poznámka bola úspešne zmazaná!
     accounts:
-      add_email_domain_block: Pridaj e-mailovú doménu na zoznam zakázaných
       approve: Schváľ
       approved_msg: Úspešne schválená prihláška %{username}
       are_you_sure: Si si istý/á?
@@ -62,7 +61,6 @@ sk:
       demote: Degraduj
       destroyed_msg: "%{username} je teraz zaradený do fronty na okamžité vymazanie"
       disable: Zablokuj
-      disable_sign_in_token_auth: Zakázanie overovania e-mailovým tokenom
       disable_two_factor_authentication: Vypni dvoj-faktorové overovanie
       disabled: Blokovaný
       display_name: Ukáž meno
@@ -71,7 +69,6 @@ sk:
       email: Email
       email_status: Stav emailu
       enable: Povoľ
-      enable_sign_in_token_auth: Povolenie overovania e-mailovým tokenom
       enabled: Povolený
       enabled_msg: Úspešne rozmrazené konto %{username}
       followers: Sledujúci
@@ -133,7 +130,6 @@ sk:
       resubscribe: Znovu odoberaj
       role: Postavenie
       search: Hľadaj
-      search_same_email_domain: Iní užívatelia s tou istou emailovou doménou
       search_same_ip: Ostatní užívatelia s rovnakou IP adresou
       security: Zabezpečenie
       security_measures:
@@ -174,26 +170,21 @@ sk:
         approve_appeal: Schváľ námietku
         approve_user: Odobri užívateľa
         assigned_to_self_report: Priraď hlásenie
-        change_email_user: Zmeň email pre užívateľa
         change_role_user: Zmeň užívateľskú rolu
         confirm_user: Potvrď užívateľa
         create_account_warning: Vytvor výstrahu
         create_announcement: Vytvor oboznámenie
-        create_canonical_email_block: Vytvor blokovanie emailu
         create_custom_emoji: Vytvor vlastné emotikony
         create_domain_allow: Vytvor povolenie pre doménu
         create_domain_block: Vytvor zákaz domény
-        create_email_domain_block: Vytvor zákaz emailovej domény
         create_ip_block: Vytvor IP pravidlo
         create_unavailable_domain: Vytvor nedostupnú doménu
         create_user_role: Vytvoriť rolu
         demote_user: Zniž užívateľskú rolu
         destroy_announcement: Vymaž oboznámenie
-        destroy_canonical_email_block: Zruš blokovanie emailu
         destroy_custom_emoji: Vymaž vlastné emotikony
         destroy_domain_allow: Zmaž povolenie pre doménu
         destroy_domain_block: Zruš blokovanie domény
-        destroy_email_domain_block: Zmazať zákaz emailovej domény
         destroy_instance: Vyčistiť doménu
         destroy_ip_block: Vymaž IP pravidlo
         destroy_status: Vymaž príspevok
@@ -201,7 +192,6 @@ sk:
         destroy_user_role: Zničiť rolu
         disable_2fa_user: Vypni dvoj-faktorové overovanie
         disable_custom_emoji: Vypni vlastné emotikony
-        disable_sign_in_token_auth_user: Zakázať používateľom overovanie e-mailovým tokenom
         disable_user: Deaktivuj užívateľa
         enable_custom_emoji: Povoľ vlastné emotikony
         enable_user: Povoľ užívateľa
@@ -231,25 +221,19 @@ sk:
         approve_appeal_html: "%{name} odsúhlasil/a námietku na moderátorské rozhodnutie od %{target}"
         approve_user_html: "%{name} odsúhlasil/a registráciu od %{target}"
         assigned_to_self_report_html: "%{name} pridelil/a hlásenie užívateľa %{target} sebe"
-        change_email_user_html: "%{name} zmenil/a emailovú adresu užívateľa %{target}"
         change_role_user_html: "%{name} zmenil/a rolu pre %{target}"
-        confirm_user_html: "%{name} potvrdil/a emailovú adresu používateľa %{target}"
         create_account_warning_html: "%{name} poslal/a upozornenie užívateľovi %{target}"
         create_announcement_html: "%{name} vytvoril/a nové oboznámenie %{target}"
-        create_canonical_email_block_html: "%{name} zablokoval/a email s hašom %{target}"
         create_custom_emoji_html: "%{name} nahral/a novú emotikonu %{target}"
         create_domain_allow_html: "%{name} povolil/a federáciu s doménou %{target}"
         create_domain_block_html: "%{name} zablokoval/a doménu %{target}"
-        create_email_domain_block_html: "%{name} zablokoval/a e-mailovú doménu %{target}"
         create_ip_block_html: "%{name} vytvoril/a pravidlo pre IP %{target}"
         create_user_role_html: "%{name} vytvoril/a rolu pre %{target}"
         demote_user_html: "%{name} degradoval/a užívateľa %{target}"
         destroy_announcement_html: "%{name} vymazal/a oboznámenie %{target}"
-        destroy_canonical_email_block_html: "%{name} odblokoval/i email z hašom %{target}"
         destroy_custom_emoji_html: "%{name} vymazal/a emotikonu %{target}"
         destroy_domain_allow_html: "%{name} zakázal/a federáciu s doménou %{target}"
         destroy_domain_block_html: "%{name} odblokoval/i doménu %{target}"
-        destroy_email_domain_block_html: "%{name} odblokoval/a e-mailovú doménu %{target}"
         destroy_ip_block_html: "%{name} vymazal/a pravidlo pre IP %{target}"
         destroy_status_html: "%{name} zmazal/a príspevok od %{target}"
         destroy_unavailable_domain_html: "%{name} znova spustil/a doručovanie pre doménu %{target}"
@@ -262,7 +246,6 @@ sk:
         reject_user_html: "%{name} odmietol/la registráciu od %{target}"
         remove_avatar_user_html: "%{name} vymazal/a %{target}/ov/in avatar"
         reopen_report_html: "%{name} znovu otvoril/a nahlásenie %{target}"
-        resend_user_html: "%{name} znovu odoslal/a potvrdzovací email pre %{target}"
         reset_password_user_html: "%{name} resetoval/a heslo používateľa %{target}"
         resolve_report_html: "%{name} vyriešil/a nahlásenie %{target}"
         sensitive_account_html: "%{name} označil/a médium od %{target} za chúlostivé"
@@ -396,7 +379,6 @@ sk:
     email_domain_blocks:
       add_new: Pridaj nový
       allow_registrations_with_approval: Povoľ registrovanie so schválením
-      created_msg: Emailová doména bola úspešne pridaná do zoznamu zakázaných
       delete: Vymaž
       dns:
         types:
@@ -405,10 +387,8 @@ sk:
       new:
         create: Pridaj doménu
         resolve: Preveď doménu
-        title: Nový email na zablokovanie
       not_permitted: Nepovolená
       resolved_through_html: Prevedená cez %{domain}
-      title: Blokované emailové adresy
     export_domain_allows:
       new:
         title: Nahraj povolené domény
@@ -757,7 +737,6 @@ sk:
         trendable: Môže sa objaviť medzi trendmi
         trending_rank: 'Populárne #%{rank}'
         usable: Môže byť použitý
-      title: Trendy
       trending: Populárne
     warning_presets:
       add_new: Pridaj nové
@@ -809,8 +788,6 @@ sk:
       guide_link_text: Prispievať môže každý.
     sensitive_content: Chúlostivý obsah
   application_mailer:
-    notification_preferences: Zmeň emailové voľby
-    settings: 'Zmeň emailové voľby: %{link}'
     unsubscribe: Prestaň odoberať
     view: 'Zobraziť:'
     view_profile: Zobraz profil
@@ -848,7 +825,6 @@ sk:
     migrate_account_html: Ak si želáš presmerovať tento účet na nejaký iný, môžeš si to <a href="%{path}">nastaviť tu</a>.
     or_log_in_with: Alebo prihlás s
     progress:
-      confirm: Potvrď email
       details: Tvoje údaje
       rules: Súhlas s pravidlami
     register: Zaregistruj sa
@@ -869,8 +845,6 @@ sk:
       title: Prihlás sa na %{domain}
     status:
       account_status: Stav účtu
-      confirming: Čaká sa na dokončenie potvrdenia emailom.
-      pending: Tvoja žiadosť čaká na schvílenie od nášho týmu. Môže to chviľu potrvať. Ak bude tvoja žiadosť schválená, dostaneš o tom email.
       redirecting_to: Tvoj účet je neaktívny, lebo v súčasnosti presmerováva na %{acct}.
     use_security_key: Použi bezpečnostný kľúč
   challenge:
@@ -902,9 +876,6 @@ sk:
       before: 'Než budeš pokračovať, prosím pozorne si prečítaj tieto poznámky:'
       caches: Obsah, ktorý bol predčítaný inými servermi môže zanechať pozostatky
       data_removal: Tvoje príspevky a iné dáta budú natrvalo odstránené
-      email_change_html: Môžeš si <a href="%{path}">zmeniť svoju emailovú adresu</a> bez mazania účtu
-      email_contact_html: Ak stále neprichádza, môžeš poslať email na <a href="mailto:%{email}">%{email}</a> so žiadosťou o pomoc
-      email_reconfirmation_html: Ak ti potvrdzovací email neprichádza, môžeš si ho <a href="%{path}">vyžiadať znovu</a>
       irreversible: Nebudeš môcť navrátiť, alebo znova aktivovať svoj účet
       more_details_html: Pre viac podrobností, pozri <a href="%{terms_path}">zásady súkromia</a>.
       username_available: Tvoje užívateľské meno bude znova dostupné
@@ -1072,7 +1043,6 @@ sk:
   login_activities:
     authentication_methods:
       password: heslom
-      sign_in_token: emailovým bezpečtnostným kódom
       webauthn: bezpečnostnými kľúčmi
     title: História overení
   mail_subscriptions:
@@ -1148,7 +1118,6 @@ sk:
     update:
       subject: "%{name} upravil/a príspevok"
   notifications:
-    email_events: Udalosti oznamované emailom
     email_events_hint: 'Vyber si udalosti, pre ktoré chceš dostávať oboznámenia:'
   otp_authentication:
     enable: Povoľ
@@ -1259,7 +1228,6 @@ sk:
     import: Importuj
     import_and_export: Import a export
     migrate: Presuň účet
-    notifications: Emailové upozornenia
     preferences: Voľby
     profile: Profil
     relationships: Sledovania a následovatelia
@@ -1412,7 +1380,6 @@ sk:
     invalid_otp_token: Neplatný kód pre dvojfaktorovú autentikáciu
     otp_lost_help_html: Pokiaľ si stratil/a prístup k obom, môžeš dať vedieť %{email}
     rate_limited: Príliš veľa pokusov o overenie, skús to znova neskôr.
-    seamless_external_login: Si prihlásená/ý cez externú službu, takže nastavenia hesla a emailu ti niesú prístupné.
     signed_in_as: 'Prihlásená/ý ako:'
   verification:
     verification: Overenie
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 2915960554d36a..cb0aff8a3eb75d 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -35,7 +35,6 @@ sl:
       created_msg: Opomba moderiranja je uspešno ustvarjena!
       destroyed_msg: Opomba moderiranja je uspešno uničena!
     accounts:
-      add_email_domain_block: Blokiraj domeno e-pošte
       approve: Odobri
       approved_msg: Uspešno odobrena vloga prijave uporabnika %{username}
       are_you_sure: Ali ste prepričani?
@@ -62,7 +61,6 @@ sl:
       demote: Ponižaj
       destroyed_msg: Podatki uporabnika %{username} so zdaj v vrsti za trajen izbris
       disable: Zamrzni
-      disable_sign_in_token_auth: Onemogoči overjanje z žetonom po e-pošti
       disable_two_factor_authentication: Onemogoči 2FA
       disabled: Zamrznjeno
       display_name: Pojavno ime
@@ -71,7 +69,6 @@ sl:
       email: E-naslov
       email_status: Stanje e-naslova
       enable: Odmrzni
-      enable_sign_in_token_auth: Omogoči overjanje z žetonom po e-pošti
       enabled: Omogočeno
       enabled_msg: Uspešno odmrznjen račun uporabnika %{username}
       followers: Sledilci
@@ -138,7 +135,6 @@ sl:
       resubscribe: Ponovno se naroči
       role: Vloga
       search: Iskanje
-      search_same_email_domain: Drugi uporabniki z isto e-poštno domeno
       search_same_ip: Drugi uporabniki z istim IP
       security: Varnost
       security_measures:
@@ -179,26 +175,21 @@ sl:
         approve_appeal: Odobri pritožbo
         approve_user: Odobri uporabnika
         assigned_to_self_report: Dodeli prijavo
-        change_email_user: Spremeni e-naslov uporabnika
         change_role_user: Spremeni vlogo uporabnika
         confirm_user: Potrdi uporabnika
         create_account_warning: Ustvari opozorilo
         create_announcement: Ustvari obvestilo
-        create_canonical_email_block: Ustvari blokado e-naslova
         create_custom_emoji: Ustvari emotikon po meri
         create_domain_allow: Ustvari odobritev domene
         create_domain_block: Ustvari blokado domene
-        create_email_domain_block: Ustvari blokado domene e-pošte
         create_ip_block: Ustvari pravilo IP
         create_unavailable_domain: Ustvari domeno, ki ni na voljo
         create_user_role: Ustvari vlogo
         demote_user: Ponižaj uporabnika
         destroy_announcement: Izbriši obvestilo
-        destroy_canonical_email_block: Izbriši blokado e-naslova
         destroy_custom_emoji: Izbriši emotikon po meri
         destroy_domain_allow: Izbriši odobritev domene
         destroy_domain_block: Izbriši blokado domene
-        destroy_email_domain_block: Izbriši blokado domene e-pošte
         destroy_instance: Očisti domeno
         destroy_ip_block: Izbriši pravilo IP
         destroy_status: Izbriši objavo
@@ -206,10 +197,8 @@ sl:
         destroy_user_role: Uniči vlogo
         disable_2fa_user: Onemogoči
         disable_custom_emoji: Onemogoči emotikon po meri
-        disable_sign_in_token_auth_user: Onemogoči overjanje z žetonom po e-pošti za uporabnika
         disable_user: Onemogoči uporabnika
         enable_custom_emoji: Omogoči emotikon po meri
-        enable_sign_in_token_auth_user: Omogoči overjanje z žetonom po e-pošti za uporabnika
         enable_user: Omogoči uporabnika
         memorialize_account: Spomenificiraj račun
         promote_user: Povišaj uporabnika
@@ -239,26 +228,20 @@ sl:
         approve_appeal_html: "%{name} je ugodil pritožbi uporabnika %{target} na moderatorsko odločitev"
         approve_user_html: "%{name} je odobril/a registracijo iz %{target}"
         assigned_to_self_report_html: "%{name} je dodelil/a prijavo %{target} sebi"
-        change_email_user_html: "%{name} je spremenil/a naslov e-pošte uporabnika %{target}"
         change_role_user_html: "%{name} je spremenil/a vlogo %{target}"
-        confirm_user_html: "%{name} je potrdil/a naslov e-pošte uporabnika %{target}"
         create_account_warning_html: "%{name} je poslal/a opozorilo %{target}"
         create_announcement_html: "%{name} je ustvarila/a novo obvestilo %{target}"
-        create_canonical_email_block_html: "%{name} je dal/a na črni seznam e-pošto s ključnikom %{target}"
         create_custom_emoji_html: "%{name} je posodobil/a emotikone %{target}"
         create_domain_allow_html: "%{name} je dovolil/a federacijo z domeno %{target}"
         create_domain_block_html: "%{name} je blokiral/a domeno %{target}"
-        create_email_domain_block_html: "%{name} je dal/a na črni seznam e-pošto domene %{target}"
         create_ip_block_html: "%{name} je ustvaril/a pravilo za IP %{target}"
         create_unavailable_domain_html: "%{name} je prekinil/a dostavo v domeno %{target}"
         create_user_role_html: "%{name} je ustvaril/a vlogo %{target}"
         demote_user_html: "%{name} je ponižal/a uporabnika %{target}"
         destroy_announcement_html: "%{name} je izbrisal/a obvestilo %{target}"
-        destroy_canonical_email_block_html: "%{name} je odstranil/a s črnega seznama e-pošto s ključnikom %{target}"
         destroy_custom_emoji_html: "%{name} je izbrisal/a emotikon %{target}"
         destroy_domain_allow_html: "%{name} ni dovolil/a federacije z domeno %{target}"
         destroy_domain_block_html: "%{name} je odblokiral/a domeno %{target}"
-        destroy_email_domain_block_html: "%{name} je odblokiral/a e-pošto domene %{target}"
         destroy_instance_html: "%{name} je očistil/a domeno %{target}"
         destroy_ip_block_html: "%{name} je izbrisal/a pravilo za IP %{target}"
         destroy_status_html: "%{name} je odstranil/a objavo uporabnika %{target}"
@@ -266,10 +249,8 @@ sl:
         destroy_user_role_html: "%{name} je izbrisal/a vlogo %{target}"
         disable_2fa_user_html: "%{name} je onemogočil/a dvofaktorsko zahtevo za uporabnika %{target}"
         disable_custom_emoji_html: "%{name} je onemogočil/a emotikone %{target}"
-        disable_sign_in_token_auth_user_html: "%{name} je onemogočil/a overjanje z žetonom po e-pošti za uporabnika %{target}"
         disable_user_html: "%{name} je onemogočil/a prijavo za uporabnika %{target}"
         enable_custom_emoji_html: "%{name} je omogočil/a emotikone %{target}"
-        enable_sign_in_token_auth_user_html: "%{name} je omogočil/a overjanje z žetonom po e-pošti za uporabnika %{target}"
         enable_user_html: "%{name} je omogočil/a prijavo za uporabnika %{target}"
         memorialize_account_html: "%{name} je spremenil/a račun uporabnika %{target} v spominsko stran"
         promote_user_html: "%{name} je povišal/a uporabnika %{target}"
@@ -277,7 +258,6 @@ sl:
         reject_user_html: "%{name} je zavrnil/a registracijo iz %{target}"
         remove_avatar_user_html: "%{name} je odstranil podobo (avatar) uporabnika %{target}"
         reopen_report_html: "%{name} je ponovno odprl/a prijavo %{target}"
-        resend_user_html: "%{name} je ponovno poslal_a potrditveno e-sporočilo za %{target}"
         reset_password_user_html: "%{name} je ponastavil/a geslo uporabnika %{target}"
         resolve_report_html: "%{name} je razrešil/a prijavo %{target}"
         sensitive_account_html: "%{name} je označil/a medije računa %{target}'s kot občutljive"
@@ -448,7 +428,6 @@ sl:
         one: "%{count} poskus prijave zadnji teden"
         other: "%{count} poskusov prijave zadnji teden"
         two: "%{count} poskusa prijave zadnji teden"
-      created_msg: Domena e-pošte je bila uspešno dodana na črni seznam
       delete: Izbriši
       dns:
         types:
@@ -457,12 +436,8 @@ sl:
       new:
         create: Dodaj domeno
         resolve: Razreši domeno
-        title: Nov vnos e-pošte na črni seznam
-      no_email_domain_block_selected: Nobena domena e-računa ni bila spremenjena, ker nobena ni bila izbrana
       not_permitted: Ni dovoljeno
-      resolved_dns_records_hint_html: Ime domene se razreši na naslednje domene MX, ki so končno odgovorne za sprejemanje e-pošte. Blokiranje domene MX bo blokiralo prijave s poljubnega e-poštnega naslova, ki uporablja isto domeno MX, tudi če je vidno ime domene drugačno. <strong>Pazite, da ne blokirate večjih ponudnikov e-pošte.</strong>
       resolved_through_html: Razrešeno prek %{domain}
-      title: Črni seznam e-pošt
     export_domain_allows:
       new:
         title: Uvozi prepustnice domen
@@ -621,7 +596,6 @@ sl:
         resolve_description_html: Proti prijavljenemu računu ne bo izvedeno nobeno dejanje, noben ukrep ne bo zabeležen in prijava bo zaprta.
         silence_description_html: Račun bo viden samo tistim, ki mu že sled ijo ali ga ročno poiščejo, s čimer bo resno omejen njegov doseg. To je vedno možno povrniti. Zaključi vse prijave zoper ta račun.
         suspend_description_html: Račun in vsa njegova vsebina ne bo dostopna in bo postopoma izbrisana, interakcija z njim pa ne bo več možna. Dejanje je moč povrniti v roku 30 dni. Zaključi vse prijave zoper ta račun.
-      actions_description_html: Odločite se, katere ukrepe boste sprejeli za rešitev te prijave. Če sprejmete kazenski ukrep proti prijavljenemu računu, mu bo poslano e-poštno obvestilo, razen če je izbrana kategorija <strong>Neželena pošta</strong>.
       actions_description_remote_html: Odločite se za dejanje, ki bo odločilo o tej prijavi. To bo vplivalo le na to, kako <strong>vaš</strong> strežnik komunicira s tem oddaljenim računom in obravnava njegovo vsebino.
       add_to_report: Dodaj več v prijavo
       already_suspended_badges:
@@ -686,7 +660,6 @@ sl:
         delete_data_html: Izbriši profil in vsebine <strong>@%{acct}</strong> čez 30 dni, razen če suspenz v tem času ni preklican
         preview_preamble_html: 'Oseba <strong>@%{acct}</strong> bo prejela opozorilo z naslednjo vsebino:'
         record_strike_html: Izdajte opomin računu <strong>@%{acct}</strong>, da boste lažje stopnjevali svoj odziv ob prihodnjih kršitvah s tega računa
-        send_email_html: Pošlji <strong>@%{acct}</strong> opozorilno e-sporočilo
         warning_placeholder: Neobvezna dodatna utemeljitev dejanja moderiranja.
       target_origin: Izvor prijavljenega računa
       title: Prijave
@@ -730,7 +703,6 @@ sl:
         manage_appeals: Upravljaj pritožbe
         manage_appeals_description: Omogoča uporabnikom, da pregledajo pritožbe glede dejanj moderiranja
         manage_blocks: Upravljaj blokirano
-        manage_blocks_description: Omogoča uporabnikom, da blokirajo ponudnike e-pošte in naslove IP
         manage_custom_emojis: Upravljaj emotikone po meri
         manage_custom_emojis_description: Omogoča uporabnikom, da upravljajo emotikone po meri na strežniku
         manage_federation: Upravljaj beli seznam
@@ -748,7 +720,6 @@ sl:
         manage_taxonomies: Upravljaj taksonomije
         manage_taxonomies_description: Omogoča uporabnikom, da preverijo vsebino v trendu in posodobijo nastavitve ključnikov
         manage_user_access: Upravljaj dostop uporabnikov
-        manage_user_access_description: Omogoča uporabnikom, da onemogočijo drugim uporabnikom dvofazno overjanje, spremenijo njihov e-naslov ter ponastavijo njihovo geslo
         manage_users: Upravljaj uporabnike
         manage_users_description: Omogoča uporabnikom, da vidijo podrobnosti drugih uporabnikov in nad njimi izvedejo dejanja moderiranja
         manage_webhooks: Upravljaj spletne zanke
@@ -823,7 +794,6 @@ sl:
       destroyed_msg: Prenos na strežnik uspešno izbrisan!
     software_updates:
       critical_update: Kritično — čim prej posodobite
-      description: Vašo namestitev Mastodona je priporočeno vedno imeti posodobljeno in tako koristiti najnovejše popravke ter zmožnosti. Poleg tega je včasih nujno čim prej posodobiti Mastodon in se s tem izogniti varnostnim težavam. Zato Mastodon vsakih 30 minut preverja razpoložljivost posodobitev in vas o njih obvešča glede na vaše nastavitve obveščanja po e-pošti.
       documentation_link: Več o tem
       release_notes: Opombe ob izdaji
       title: Razpoložljive posodobitve
@@ -995,7 +965,6 @@ sl:
           one: Uporabila %{count} oseba v zadnjem tednu
           other: Uporabilo %{count} oseb v zadnjem tednu
           two: Uporabili %{count} osebi v zadnjem tednu
-      title: Trendi
       trending: V porastu
     warning_presets:
       add_new: Dodaj novo
@@ -1082,9 +1051,7 @@ sl:
       guide_link_text: Vsakdo lahko prispeva.
     sensitive_content: Občutljiva vsebina
   application_mailer:
-    notification_preferences: Spremenite e-poštne nastavitve
     salutation: "%{name},"
-    settings: 'Spremenite e-poštne nastavitve: %{link}'
     unsubscribe: Odjavi od naročnine
     view: 'Pogled:'
     view_profile: Ogled profila
@@ -1104,7 +1071,6 @@ sl:
       hint_html: Samo še nekaj. Moramo se prepričati, da ste človek (to nam pomaga pri preprečevanju neželenih vsebin). Rešite spodnji CAPTCHA in kliknite »Nadaljuj«.
       title: Varnostno preverjanje
     confirmations:
-      awaiting_review: Vaš e-poštni naslov je potrjen. Skrbniki %{domain} bodo pregledali vašo prijavo. Če odobrijo vaš račun, boste o tem prejeli e-pošto.
       awaiting_review_title: Vaša prijava se pregleduje
       clicking_this_link: s klikom na to povezavo
       login_link: prijavo
@@ -1112,7 +1078,6 @@ sl:
       redirect_to_app_html: Morali bi biti preusmerjeni na aplikacijo <strong>%{app_name}</strong>. Če se to ni zgodilo, poskusite %{clicking_this_link} ali pa se ročno vrnite na aplikacijo.
       registration_complete: Vaša prijava na %{domain} je sedaj zaključena.
       welcome_title: Pozdravljeni, %{name}!
-      wrong_email_hint: Če ta e-poštni naslov ni pravilen, ga lahko spremenite v nastavitvah računa.
     delete_account: Izbriši račun
     delete_account_html: Če želite izbrisati svoj račun, lahko nadaljujete <a href="%{path}">tukaj</a>. Prosili vas bomo za potrditev.
     description:
@@ -1133,7 +1098,6 @@ sl:
     or_log_in_with: Ali se prijavite z
     privacy_policy_agreement_html: Prebral_a sem in se strinjam s <a href="%{privacy_policy_path}" target="_blank">pravilnikom o zasebnosti</a>.
     progress:
-      confirm: Potrdi e-pošto
       details: Vaši podatki
       review: Naš pregled
       rules: Sprejmi pravila
@@ -1155,10 +1119,8 @@ sl:
     security: Varnost
     set_new_password: Nastavi novo geslo
     setup:
-      email_below_hint_html: Poglejte v mapo neželene pošte ali zaprosite za novega. Če ste podali napačen e-naslov, ga lahko popravite.
       email_settings_hint_html: Kliknite povezavo, ki smo vam jo poslali, da overite %{email}. Počakali bomo.
       link_not_received: Ali ste prejeli povezavo?
-      new_confirmation_instructions_sent: Čez nekaj minut boste prejeli novo e-sporočilo s potrditveno povezavo!
       title: Preverite svojo dohodno e-pošto
     sign_in:
       preamble_html: Prijavite se s svojimi poverilnicami <strong>%{domain}</strong>. Če vaš račun gostuje na drugem strežniku, se tukaj ne boste mogli prijaviti.
@@ -1169,9 +1131,7 @@ sl:
       title: Naj vas namestimo na %{domain}.
     status:
       account_status: Stanje računa
-      confirming: Čakanje na potrditev e-pošte.
       functional: Vaš račun je polno opravilen.
-      pending: Naše osebje preverja vašo prijavo. To lahko traja nekaj časa. Če bo vaša prijava odobrena, boste prejeli e-pošto.
       redirecting_to: Vaš račun ni dejaven, ker trenutno preusmerja na račun %{acct}.
       self_destruct: Ker se %{domain} zapira, boste imeli omejen dostop da svojega računa.
       view_strikes: Pokaži pretekle ukrepe proti mojemu računu
@@ -1214,9 +1174,6 @@ sl:
       before: 'Pred nadaljevanjem previdno preberite naslednje opombe:'
       caches: Vsebina, ki jo medpomnijo drugi strežniki, lahko vztraja
       data_removal: Vaše objave in drugi podatki bodo trajno odstranjeni
-      email_change_html: <a href="%{path}">Svoj e-naslov lahko spremenite</a> brez izbrisa svojega računa
-      email_contact_html: Če še vedno ni dostavljeno, lahko za pomoč pošljete e-sporočilo na naslov <a href="mailto:%{email}">%{email}</a>
-      email_reconfirmation_html: Če niste prejeli potrditvenega e-sporočila, lahko <a href="%{path}">znova zaprosite zanj</a>
       irreversible: Vašega računa ne boste mogli obnoviti ali ponovno aktivirati
       more_details_html: Za podrobnosti glejte <a href="%{terms_path}">politiko zasebnosti</a>.
       username_available: Vaše uporabniško ime bo znova na voljo
@@ -1465,7 +1422,6 @@ sl:
     authentication_methods:
       otp: aplikacija za dvoravenjsko overjanje
       password: geslo
-      sign_in_token: varnostna koda po e-pošti
       webauthn: varnostni ključi
     description_html: Če opazite dejavnost, ki je ne prepoznate kot svoje, razmislite o spremembi svojega gesla in omogočanju dvoravenskega overjanja.
     empty: Zgodovina overjanja ni na voljo
@@ -1476,16 +1432,6 @@ sl:
     unsubscribe:
       action: Da, odjavi me
       complete: Odjavljeni
-      confirmation_html: Ali se res želite odjaviti od prejemanja %{type} za Mastodon na %{domain} na svojo e-pošto %{email}? Kadarkoli se lahko znova prijavite iz svojih <a href="%{settings_path}">nastavitev e-poštnih obvestil</a>.
-      emails:
-        notification_emails:
-          favourite: e-sporočil z obvestili o priljubljenosti
-          follow: e-sporočil z obvestili o sledenju
-          follow_request: e-sporočil o zahtevah za sledenje
-          mention: e-sporočil z obvestili o omembah
-          reblog: e-sporočil z obvestili o izpostavljanju
-      resubscribe_html: Če ste se odjavili po pomoti, se lahko znova prijavite iz svojih <a href="%{settings_path}">nastavitev e-poštnih obvestil</a>.
-      success_html: Nič več ne boste prejemali %{type} za Mastodon na %{domain} na svoj e-naslov %{email}.
       title: Odjavi od naročnine
   media_attachments:
     validations:
@@ -1566,8 +1512,6 @@ sl:
     update:
       subject: "%{name} je uredil(a) objavo"
   notifications:
-    administration_emails: E-poštna obvestila skrbnika
-    email_events: Dogodki za e-obvestila
     email_events_hint: 'Izberite dogodke, za katere želite prejmati obvestila:'
   number:
     human:
@@ -1726,7 +1670,6 @@ sl:
     import: Uvozi
     import_and_export: Uvoz in izvoz
     migrate: Selitev računa
-    notifications: Obvestila po e-pošti
     preferences: Nastavitve
     profile: Profil
     relationships: Sledenja in sledilci
@@ -1987,7 +1930,6 @@ sl:
     invalid_otp_token: Neveljavna dvofaktorska koda
     otp_lost_help_html: Če ste izgubili dostop do obeh, stopite v stik z %{email}
     rate_limited: Preveč poskusov preverjanja pristnosti, poskusite kasneje.
-    seamless_external_login: Prijavljeni ste prek zunanje storitve, tako da nastavitve gesla in e-pošte niso na voljo.
     signed_in_as: 'Vpisani kot:'
   verification:
     extra_instructions_html: <strong>Nasvet:</strong> Povezava na vaši spletni strani je lahko nevidna. Pomembni del je atribut <code>rel="me"</code>, ki preprečuje lažno predstavljanje na spletnih straneh z uporabniško ustvarjeno vsebino. Namesto oznake <code>a</code> lahko uporabite tudi oznako <code>link</code> znotraj glave (<code>head</code>) spletne strani, vendar mora biti HTML dosegljiv brez izvajanja skript JavaScript.
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index 92e182cfda31af..51ef4aa6709c9e 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -31,7 +31,6 @@ sq:
       created_msg: Shënimi i moderimit u krijua me sukses!
       destroyed_msg: Shënimi i moderimit u asgjësua me sukses!
     accounts:
-      add_email_domain_block: Blloko përkatësi email
       approve: Miratojeni
       approved_msg: U miratua me sukses aplikimi për regjistrim të %{username}
       are_you_sure: Jeni i sigurt?
@@ -58,7 +57,6 @@ sq:
       demote: Zhgradoje
       destroyed_msg: Të dhënat e %{username} tani janë vënë në radhë për fshirje të menjëhershme
       disable: Çaktivizoje
-      disable_sign_in_token_auth: Çaktivizo mirëfilltësim me token email-i
       disable_two_factor_authentication: Çaktivizoni 2FA-në
       disabled: E çaktivizuar
       display_name: Emër në ekran
@@ -67,7 +65,6 @@ sq:
       email: Email
       email_status: Gjendje email-i
       enable: Shkrije
-      enable_sign_in_token_auth: Aktivizo mirëfilltësim me token email-i
       enabled: E aktivizuar
       enabled_msg: U hoq me sukses ngrirja për llogarinë e %{username}
       followers: Ndjekës
@@ -132,7 +129,6 @@ sq:
       resubscribe: Ripajtohuni
       role: Rol
       search: Kërkoni
-      search_same_email_domain: Të tjerë përdorues me të njëjtën përkatësi email-i
       search_same_ip: Të tjerë përdorues me të njëjtën IP
       security: Siguri
       security_measures:
@@ -173,26 +169,21 @@ sq:
         approve_appeal: Miratojeni Apelimin
         approve_user: Miratoje Përdoruesin
         assigned_to_self_report: Caktoji Raportim
-        change_email_user: Ndrysho Email për Përdoruesin
         change_role_user: Ndryshoni Rol Përdoruesi
         confirm_user: Ripohoje Përdoruesin
         create_account_warning: Krijo Sinjalizim
         create_announcement: Krijoni Lajmërim
-        create_canonical_email_block: Krijoni Bllokim Email-esh
         create_custom_emoji: Krijo Emotikon Vetjak
         create_domain_allow: Krijo Lejim Përkatësie
         create_domain_block: Krijo Bllokim Përkatësie
-        create_email_domain_block: Krijo Bllokim Përkatësie Email-esh
         create_ip_block: Krijoni Rregull IP
         create_unavailable_domain: Krijo Përkatësi të Papërdorshme
         create_user_role: Krijoni Rol
         demote_user: Zhgradoje Përdoruesin
         destroy_announcement: Fshije Lajmërimin
-        destroy_canonical_email_block: Fshi Bllokim Email-esh
         destroy_custom_emoji: Fshi Emotikon Vetjak
         destroy_domain_allow: Fshi Lejim Përkatësie
         destroy_domain_block: Fshi Bllokim Përkatësie
-        destroy_email_domain_block: Fshi bllokim përkatësie email-esh
         destroy_instance: Spastroje Përkatësinë
         destroy_ip_block: Fshini Rregull IP
         destroy_status: Fshi Gjendje
@@ -200,10 +191,8 @@ sq:
         destroy_user_role: Asgjësoje Rolin
         disable_2fa_user: Çaktivizo 2FA-në
         disable_custom_emoji: Çaktivizo Emotikon Vetjak
-        disable_sign_in_token_auth_user: Çaktivizo Mirëfilltësim me Token Email-i për Përdoruesin
         disable_user: Çaktivizo Përdorues
         enable_custom_emoji: Aktivizo Emotikon Vetjak
-        enable_sign_in_token_auth_user: Aktivizo Mirëfilltësim me Token Email-i për Përdoruesin
         enable_user: Aktivizo Përdorues
         memorialize_account: Bëje Llogari Përkujtimore
         promote_user: Promovojeni Përdoruesin
@@ -233,26 +222,20 @@ sq:
         approve_appeal_html: "%{name} miratoi apelim vendimi moderimi nga %{target}"
         approve_user_html: "%{name} miratoi regjistrim nga %{target}"
         assigned_to_self_report_html: "%{name} ia kaloi raportimin %{target} në ngarkim vetvetes"
-        change_email_user_html: "%{name} ndryshoi adresën email të përdoruesit %{target}"
         change_role_user_html: "%{name} ndryshoi rolin e %{target}"
-        confirm_user_html: "%{name} ripohoi adresën email të përdoruesit %{target}"
         create_account_warning_html: "%{name} dërgoi një sinjalizim për %{target}"
         create_announcement_html: "%{name} krijoi lajmërim të ri për %{target}"
-        create_canonical_email_block_html: "%{name} bllokoi email-in me hashin %{target}"
         create_custom_emoji_html: "%{name} ngarkoi emoxhi të ri %{target}"
         create_domain_allow_html: "%{name} lejoi federim me përkatësinë %{target}"
         create_domain_block_html: "%{name} bllokoi përkatësinë %{target}"
-        create_email_domain_block_html: "%{name} bllokoi përkatësinë email %{target}"
         create_ip_block_html: "%{name} krijoi rregull për IP-në %{target}"
         create_unavailable_domain_html: "%{name} ndali dërgimin drejt përkatësisë %{target}"
         create_user_role_html: "%{name} krijoi rolin %{target}"
         demote_user_html: "%{name} zhgradoi përdoruesin %{target}"
         destroy_announcement_html: "%{name} fshiu lajmërimin për %{target}"
-        destroy_canonical_email_block_html: "%{name} zhbllokoi email-n me hashin %{target}"
         destroy_custom_emoji_html: "%{name} fshiu emoji-n %{target}"
         destroy_domain_allow_html: "%{name} hoqi lejimin për federim me %{target}"
         destroy_domain_block_html: "%{name} zhbllokoi përkatësinë %{target}"
-        destroy_email_domain_block_html: "%{name} hoqi bllokimin për përkatësinë email %{target}"
         destroy_instance_html: "%{name} spastroi përkatësinë %{target}"
         destroy_ip_block_html: "%{name} fshiu rregull për IP-në %{target}"
         destroy_status_html: "%{name} hoqi gjendje nga %{target}"
@@ -260,10 +243,8 @@ sq:
         destroy_user_role_html: "%{name} fshiu rolin %{target}"
         disable_2fa_user_html: "%{name} çaktivizoi domosdoshmërinë për dyfaktorësh për përdoruesin %{target}"
         disable_custom_emoji_html: "%{name} çaktivizoi emoxhin %{target}"
-        disable_sign_in_token_auth_user_html: "%{name} çaktivizo mirëfilltësim me token email-i për %{target}"
         disable_user_html: "%{name} çaktivizoi hyrje për përdoruesin %{target}"
         enable_custom_emoji_html: "%{name} aktivizoi emoxhin %{target}"
-        enable_sign_in_token_auth_user_html: "%{name} aktivizo mirëfilltësim me token email-i përdoruesi për %{target}"
         enable_user_html: "%{name} aktivizoi hyrje për përdoruesin %{target}"
         memorialize_account_html: "%{name} e shndërroi llogarinë e %{target} në një faqe përkujtimore"
         promote_user_html: "%{name} gradoi përdoruesin %{target}"
@@ -271,7 +252,6 @@ sq:
         reject_user_html: "%{name} hodhi poshtë regjistrimin nga %{target}"
         remove_avatar_user_html: "%{name} hoqi avatarin e %{target}"
         reopen_report_html: "%{name} rihapi raportimin %{target}"
-        resend_user_html: "%{name} ridërgoi email ripohimi për %{target}"
         reset_password_user_html: "%{name} ricaktoi fjalëkalimi për përdoruesin %{target}"
         resolve_report_html: "%{name} zgjidhi raportimin %{target}"
         sensitive_account_html: "%{name} i vuri shenjë si rezervat medias në %{target}"
@@ -431,7 +411,6 @@ sq:
       attempts_over_week:
         one: "%{count} përpjekje gjatë javës së shkuar"
         other: "%{count} përpjekje regjistrimi gjatë javës së kaluar"
-      created_msg: Përkatësia email u shtua me sukses te lista e bllokimeve
       delete: Fshije
       dns:
         types:
@@ -440,12 +419,8 @@ sq:
       new:
         create: Shtoni përkatësi
         resolve: Ftilloje përkatësinë
-        title: Zë i ri email në listë bllokimesh
-      no_email_domain_block_selected: S’u ndryshuan blloqe përkatësish email, ngaqë s’qe përzgjedhur ndonjë
       not_permitted: Jo i lejuar
-      resolved_dns_records_hint_html: Emri i përkatësisë jep u përket përkatësive vijuese MX, që janë përgjegjëset për pranim email-esh. Bllokimi i një përkatësie MX do të bllokojë regjistrime nga çfarëdo adrese email që përdor të njëjtën përkatësi MX, edhe nëse emri i dukshëm i përkatësisë është i ndryshëm. <strong>Jini i kujdesshëm të mos bllokoni shërbime të njohur email-esh.</strong>
       resolved_through_html: Zgjidhur përmes %{domain}
-      title: Listë bllokimesh email-esh
     export_domain_allows:
       new:
         title: Importoni lejime përkatësish
@@ -598,7 +573,6 @@ sq:
         resolve_description_html: Ndaj llogarisë së raportuar nuk do të ndërmerret ndonjë veprim, s’do të regjistrohet ndonjë paralajmërim dhe raporti do të mbyllet.
         silence_description_html: Llogaria do të jetë e dukshme vetëm për ata që e ndjekin tashmë, ose e kërkojnë atë dorazi, duke kufizuar rëndë shtrirjen e saj. Kjo mundet përherë të prapakthehet. Mbyll krejt raportimet kundër kësaj llogarie.
         suspend_description_html: Llogaria dhe krejt lënda e saj s’do të jenë të përdorshme dhe, së fundi, do të fshihen dhe ndërveprimi me te do të jetë i pamundur. E prapakthyeshme brenda 30 ditësh. Mbyll krejt raportimet kundër kësaj llogarie.
-      actions_description_html: Vendosni cili veprim të kryhet për të zgjidhur këtë raportim. Nëse ndërmerrni një veprim ndëshkues kundër llogarisë së raportuar, atyre do t’u dërgohet një njoftim me email, hiq rastin kur përzgjidhet kategoria <strong>I padëshiruar</strong>.
       actions_description_remote_html: Vendosni cili veprim të ndërmerret për zgjidhjen e këtij raportimi. Kjo do të prekë vetëm mënyrën se si shërbyesi <strong>juaj</strong> komunikon me këtë llogari të largët dhe se si e trajtojnë lëndën e saj.
       add_to_report: Shtoni më tepër te raportimi
       already_suspended_badges:
@@ -662,7 +636,6 @@ sq:
         delete_data_html: Fshije profilin e <strong>@%{acct}</strong> dhe lëndën e 30 ditëve nga sot, veç në u pezulloftë ndërkohë
         preview_preamble_html: "<strong>@%{acct}</strong> do të marrë një sinjalizim me lëndën vijuese:"
         record_strike_html: Regjistroni një vërejtje kundër <strong>@%{acct}</strong> për t’ju ndihmuar të përshkallëzoni qëndrim në ras cenimesh të ardhshme nga kjo llogari
-        send_email_html: Dërgojini <strong>@%{acct}</strong> një vërejtje me email
         warning_placeholder: Arsye shtesë, në daçi, për veprimin e moderimit.
       target_origin: Origjinë e llogarisë së raportuar
       title: Raportime
@@ -701,7 +674,6 @@ sq:
         manage_appeals: Të Administrojë Apelime
         manage_appeals_description: U lejon përdoruesve të shqyrtojnë apelime kundër veprimesh moderimi
         manage_blocks: Të Administrojë Bllokim
-        manage_blocks_description: U lejon përdoruesve të bllokojnë shërbime email dhe adresa IP
         manage_custom_emojis: Të Administrojë Emoxhi Vetjake
         manage_custom_emojis_description: U lejon përdoruesve të administrojnë te shërbyesi emoxhi vetjake
         manage_federation: Të Administrojë Federim
@@ -719,7 +691,6 @@ sq:
         manage_taxonomies: Të Administrojë Klasifikime
         manage_taxonomies_description: U lejon përdoruesve të shqyrtojnë lëndë në modë dhe të përditësojnë rregullime hashtag-ësh
         manage_user_access: Të Administrojë Hyrje Përdoruesi
-        manage_user_access_description: U lejon përdoruesve të çaktivizojnë mirëfilltësim dyfaktorësh për përdorues të tjerë, të ndryshojnë adresa të tyret email dhe të ricaktojnë fjalëkalimet e tyre
         manage_users: Të Administrojë Përdorues
         manage_users_description: U lejon përdoruesve të shohin hollësi përdoruesish të tjerë dhe të kryejnë veprime moderimi mbi ta
         manage_webhooks: Të Administrojë Webhook-e
@@ -793,7 +764,6 @@ sq:
       destroyed_msg: Ngarkimi në sajt u fshi me sukses!
     software_updates:
       critical_update: Kritik — ju lutemi, përditësojeni pa humbur kohë
-      description: Rekomandohet ta mbani të përditësuar instalimin tuaj të Mastodon-it, që të përfitoni nga ndreqjet dhe veçoritë më të reja. Për më tej, ndonjëherë është kritike të përditësohet Mastodon-i në kohën e duhur, për të shmangur probleme sigurie. Për këto arsye, Mastodon-i kontrollon për përditësime çdo 30 minuta dhe do t’ju njoftojë, sipas parapëlqimeve tuaja për njoftime me email.
       documentation_link: Mësoni më tepër
       release_notes: Shënime hedhjeje në qarkullim
       title: Përditësime të gatshme
@@ -900,10 +870,16 @@ sq:
     trends:
       allow: Lejojeni
       approved: Miratuar
+      confirm_allow: Jeni i sigurt se doni të lejohen etiketat e përzgjedhura?
+      confirm_disallow: Jeni i sigurt se doni të mos lejohen etiketat e përzgjedhura?
       disallow: Mos e lejo
       links:
         allow: Lejoje lidhjen
         allow_provider: Lejoje botuesin
+        confirm_allow: Jeni i sigurt se doni të lejohen lidhjet e përzgjedhura?
+        confirm_allow_provider: Jeni i sigurt se doni të lejohen shërbimet e përzgjedhura?
+        confirm_disallow: Jeni i sigurt se doni të mos lejohen lidhjet e përzgjedhura?
+        confirm_disallow_provider: Jeni i sigurt se doni të mos lejohen shërbimet e përzgjedhura?
         description_html: Këto janë lidhje që ndahen aktualisht shumë me llogari prej të cilave shërbyesi juaj sheh postime. Mund të ndihmojë përdoruesit tuaj të gjejnë se ç’po ndodh në botë. S’shfaqen lidhje publikisht, deri sa të miratoni botuesin. Mundeni edhe të lejoni ose hidhni poshtë lidhje individuale.
         disallow: Hiq lejimin e lidhjes
         disallow_provider: Mos e lejo botuesin
@@ -926,6 +902,10 @@ sq:
       statuses:
         allow: Lejo postim
         allow_account: Lejo autor
+        confirm_allow: Jeni i sigurt se doni të lejohen gjendjet e përzgjedhura?
+        confirm_allow_account: Jeni i sigurt se doni të lejohen llogaritë e përzgjedhura?
+        confirm_disallow: Jeni i sigurt se doni të mos lejohen gjendjet e përzgjedhura?
+        confirm_disallow_account: Jeni i sigurt se doni të mos lejohen llogaritë e përzgjedhura?
         description_html: Këto janë postime të cilat shërbyesi juaj di se po ndahen shumë dhe po zgjidhen si të parapëlqyera për çastin. Mund të ndihmojnë përdoruesit tuaj të rinj dhe të riardhur të gjejnë më tepër vetë për të ndjekur. S’shfaqen postime publikisht, pa miratuar ju autorin dhe autori lejon që llogaria e tij t’u sugjerohet të tjerëve. Mundeni edhe të lejoni, ose hidhni, poshtë postime individuale.
         disallow: Mos lejo postim
         disallow_account: Mos lejo autor
@@ -958,7 +938,7 @@ sq:
         used_by_over_week:
           one: Përdorur nga një person gjatë javës së kaluar
           other: Përdorur nga %{count} vetë gjatë javës së kaluar
-      title: Në modë
+      title: Rekomandime & Prirje
       trending: Në modë
     warning_presets:
       add_new: Shtoni të ri
@@ -1043,9 +1023,7 @@ sq:
       guide_link_text: Çdokush mund të kontribuojë.
     sensitive_content: Lëndë rezervat
   application_mailer:
-    notification_preferences: Ndryshoni parapëlqime email-i
     salutation: "%{name},"
-    settings: 'Ndryshoni parapëlqime email-i: %{link}'
     unsubscribe: Shpajtohuni
     view: 'Parje:'
     view_profile: Shihni profilin
@@ -1065,7 +1043,6 @@ sq:
       hint_html: Edhe një gjë tjetër! Na duhet të ripohoni se jeni qenie njerëzore (që të mbajmë larg mesazhe të padëshiruar!). Zgjidhni CAPTCHA-n më poshtë dhe klikoni mbi “Vazhdo”.
       title: Kontroll sigurie
     confirmations:
-      awaiting_review: Adresa juaj email u ripohua! Ekipi i %{domain} stani po bën regjistrimin tuaj. Nëse e miratojnë llogarinë tuaj, do të merrni një email!
       awaiting_review_title: Regjistrimi juaj po merret në shqyrtim
       clicking_this_link: duke klikuar këtë lidhje
       login_link: hyni
@@ -1073,7 +1050,6 @@ sq:
       redirect_to_app_html: Duhet të ishit ridrejtuar te aplikacioni <strong>%{app_name}</strong>. Nëse s’ndodhi, provoni %{clicking_this_link}, ose të ktheheni dorazi te aplikacioni.
       registration_complete: Tanimë është plotësuar regjistrimi juaj në %{domain}!
       welcome_title: Mirë se vini, %{name}!
-      wrong_email_hint: Nëse ajo adresë email s’është e saktë, mund ta ndryshoni te rregullimet e llogarisë.
     delete_account: Fshije llogarinë
     delete_account_html: Nëse dëshironi të fshihni llogarinë tuaj, mund <a href="%{path}">ta bëni që këtu</a>. Do t’ju kërkohet ta ripohoni.
     description:
@@ -1094,7 +1070,6 @@ sq:
     or_log_in_with: Ose bëni hyrjen me
     privacy_policy_agreement_html: I kam lexuar dhe pajtohem me <a href="%{privacy_policy_path}" target="_blank">rregullat e privatësisë</a>
     progress:
-      confirm: Email ripohimi
       details: Hollësitë tuaja
       review: Shqyrtimi ynë
       rules: Pranoni rregulla
@@ -1116,10 +1091,8 @@ sq:
     security: Siguri
     set_new_password: Caktoni fjalëkalim të ri
     setup:
-      email_below_hint_html: Shihni te dosja juaj e të padëshiruara, ose kërkoni një tjetër. Mund të ndreqni adresën tuaj email, nëse është e gabuar.
       email_settings_hint_html: Që të verifikoni %{email}, klikoni lidhjen që ju dërguam. Do të presim këtu.
       link_not_received: S’morët lidhje?
-      new_confirmation_instructions_sent: Pas pak minutash do të merrni një email të ri me lidhjen e ripohimit!
       title: Shihni te email-et tuaj
     sign_in:
       preamble_html: Hyni me kredencialet tuaja për te <strong>%{domain}</strong>. Nëse llogaria juaj strehohet në një tjetër shërbyes, s’do të jeni në gjendje të bëni hyrjen këtu.
@@ -1130,9 +1103,7 @@ sq:
       title: Le të ujdisim llogarinë tuaj në %{domain}.
     status:
       account_status: Gjendje llogarie
-      confirming: Po pritet që të plotësohet ripohimi i email-it.
       functional: Llogaria juaj është tërësisht funksionale.
-      pending: Aplikimi juaj është në pritje të shqyrtimit nga stafi ynë. Kjo mund të dojë ca kohë. Nëse aplikimi juaj miratohet, do të merrni një email.
       redirecting_to: Llogaria juaj është joaktive, ngaqë aktualisht ridrejton te %{acct}.
       self_destruct: Ngaqë %{domain} po mbyllet, do të keni vetëm hyrje të kufizuar te llogaria juaj.
       view_strikes: Shihni paralajmërime të dikurshme kundër llogarisë tuaj
@@ -1175,9 +1146,6 @@ sq:
       before: 'Përpara se të vazhdoni, ju lutemi, lexoni me kujdes këto shënime:'
       caches: Lënda e ruajtur në fshehtinë nga shërbyes të tjerë mund të vazhdojë të gjendet në ta
       data_removal: Postimet dhe të tjera të dhëna tuajat do të hiqen përgjithmonë
-      email_change_html: Mundeni të <a href="%{path}">ndryshoni adresën tuaj email</a> pa fshirë llogarinë tuaj
-      email_contact_html: Nëse prapë s’arrin, mund të dërgoni një email te <a href="mailto:%{email}">%{email}</a> për ndihmë
-      email_reconfirmation_html: Nëse s’e merrni email-in e ripohimit, mund të <a href="%{path}">rikërkoni</a>
       irreversible: S’do të jeni në gjendje të riktheni ose riaktivizoni llogarinë tuaj
       more_details_html: Për më tepër hollësi, shihni <a href="%{terms_path}">rregulla privatësie</a>.
       username_available: Emri juaj i përdoruesit do të jetë sërish i passhëm
@@ -1410,7 +1378,6 @@ sq:
     authentication_methods:
       otp: aplikacion mirëfilltësimi dyfaktorësh
       password: fjalëkalim
-      sign_in_token: kod sigurie përmes email-i
       webauthn: kyçe sigurie
     description_html: Nëse shihni veprimtari që nuk e njihni, shihni mundësinë e ndryshimit të fjalëkalimit tuaj dhe të aktivizimit të mirëfilltësimit dyfaktorësh.
     empty: S’ka historik mirëfilltësimesh
@@ -1421,16 +1388,6 @@ sq:
     unsubscribe:
       action: Po, shpajtomëni
       complete: U shpajtuat
-      confirmation_html: Jeni i sigurt se doni të shpajtoheni prej marrjes së %{type} për Mastodon në %{domain} te email-i juaj në %{email}? Mundeni përherë të ripajtoheni, që prej <a href="%{settings_path}">rregullimeve tuaja për njoftime me email</a>.
-      emails:
-        notification_emails:
-          favourite: email-e njoftimesh për të parapëlqyer
-          follow: email-e njoftimi ndjekjesh
-          follow_request: email-e kërkesash për ndjekje
-          mention: email-e njoftimi përmendjesh
-          reblog: email-e njoftimi përforcimesh
-      resubscribe_html: Nëse u shpajtuat gabimisht, mund të ripajtoheni që nga <a href="%{settings_path}">rregullimet tuaja për njoftime me email</a>.
-      success_html: S’do të merrni më %{type} për Mastodon në %{domain} te email juaj %{email}.
       title: Shpajtohuni
   media_attachments:
     validations:
@@ -1511,8 +1468,6 @@ sq:
     update:
       subject: "%{name} përpunoi një postim"
   notifications:
-    administration_emails: Njoftime email për përgjegjësin
-    email_events: Akte për njoftim me email
     email_events_hint: 'Përzgjidhni akte për të cilët doni të merrni njoftime:'
   number:
     human:
@@ -1671,7 +1626,6 @@ sq:
     import: Importo
     import_and_export: Importim dhe eksportim
     migrate: Migrim llogarie
-    notifications: Njoftime me email
     preferences: Parapëlqime
     profile: Profil
     relationships: Ndjekje dhe ndjekës
@@ -1918,7 +1872,6 @@ sq:
     invalid_otp_token: Kod dyfaktorësh i pavlefshëm
     otp_lost_help_html: Nëse humbët hyrjen te të dy, mund të lidheni me %{email}
     rate_limited: Shumë përpjekje mirëfilltësimi, riprovoni më vonë.
-    seamless_external_login: Jeni futur përmes një shërbimi të jashtëm, ndaj s’ka rregullime fjalëkalimi dhe email.
     signed_in_as: 'I futur si:'
   verification:
     extra_instructions_html: <strong>Ndihmëz:</strong> Lidhja te sajti juaj mund të jetë e padukshme. Pjesa e rëndësishme është <code>rel="me"</code>, e cila pengon të hiqen gjoja në sajte me lëndë të prodhuar nga përdorues. Mundeni edhe të përdorni një etiketë <code>link</code> te kryet e faqes, në vend se <code>a</code>, por HTML-ja duhet të jetë e përdorshme pa ekzekutim JavaScript-i.
diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml
index f6e6d4d2a68f03..11e4decd4ca4e8 100644
--- a/config/locales/sr-Latn.yml
+++ b/config/locales/sr-Latn.yml
@@ -33,7 +33,6 @@ sr-Latn:
       created_msg: Moderatorska beleška uspešno napravljena!
       destroyed_msg: Moderatorska beleška uspešno obrisana!
     accounts:
-      add_email_domain_block: Blokiraj domen e-pošte
       approve: Odobri
       approved_msg: Zahtev za registraciju korisnika %{username} je uspešno odobren
       are_you_sure: Da li ste sigurni?
@@ -60,7 +59,6 @@ sr-Latn:
       demote: Ražaluj
       destroyed_msg: Podaci korisnika %{username} su nepovratno stavljeni u red za brisanje
       disable: Zamrzni
-      disable_sign_in_token_auth: Onemogući imejl autentifikaciju
       disable_two_factor_authentication: Isključi 2FA
       disabled: Zamrznut
       display_name: Ime za prikaz
@@ -69,7 +67,6 @@ sr-Latn:
       email: E-pošta
       email_status: Status e-pošte
       enable: Omogući
-      enable_sign_in_token_auth: Omogući imejl autentifikaciju
       enabled: Omogućen
       enabled_msg: Uspešno odleđen nalog korisnika %{username}
       followers: Pratioci
@@ -135,7 +132,6 @@ sr-Latn:
       resubscribe: Ponovo se pretplati
       role: Uloga
       search: Pretraga
-      search_same_email_domain: Ostali korisnici sa istim domenom e-pošte
       search_same_ip: Ostali korisnici sa istom IP adresom
       security: Bezbednost
       security_measures:
@@ -176,26 +172,21 @@ sr-Latn:
         approve_appeal: Uvaži žalbu
         approve_user: Odobri korisnika
         assigned_to_self_report: Dodeli prijavu
-        change_email_user: Promeni e-adresu korisnika
         change_role_user: Promeni ulogu korisnika
         confirm_user: Potvrdi korisnika
         create_account_warning: Kreiraj upozorenje
         create_announcement: Kreiraj najavu
-        create_canonical_email_block: Kreiraj blok e-pošte
         create_custom_emoji: Napravi prilagođeni emodži
         create_domain_allow: Dodaj dozvoljeni domen
         create_domain_block: Dodaj blokirani domen
-        create_email_domain_block: Blokiraj imejl domen
         create_ip_block: Napravi IP uslov
         create_unavailable_domain: Dodaj domen kao nedostupan
         create_user_role: Kreiraj ulogu
         demote_user: Smanji ovlašćenja korisnika
         destroy_announcement: Izbriši najavu
-        destroy_canonical_email_block: Izbriši blok e-pošte
         destroy_custom_emoji: Obriši prilagođeni emodži
         destroy_domain_allow: Obriši dozvoljeni domen
         destroy_domain_block: Obriši blokirani domen
-        destroy_email_domain_block: Izbriši blok e-pošte
         destroy_instance: Očisti domen
         destroy_ip_block: Obriši IP uslov
         destroy_status: Izbriši post
@@ -203,10 +194,8 @@ sr-Latn:
         destroy_user_role: Uništi poziciju
         disable_2fa_user: Onemogući dvofaktorsku autentifikaciju
         disable_custom_emoji: Onemogući prilagođene emodžije
-        disable_sign_in_token_auth_user: Onemogući imejl autentifikaciju za korisnika
         disable_user: Onemogući korisnika
         enable_custom_emoji: Omogući prilagođene emodžije
-        enable_sign_in_token_auth_user: Omogući imejl autentifikaciju za korisnika
         enable_user: Omogući korisnika
         memorialize_account: Pretvori u memorijalni nalog
         promote_user: Unapredi korisnika
@@ -235,26 +224,20 @@ sr-Latn:
         approve_appeal_html: "%{name} je uvažio žalbu korisnika %{target} na odluku moderatora"
         approve_user_html: "%{name} je odobrio/-la registraciju korisnika %{target}"
         assigned_to_self_report_html: "%{name} je sebi dodelio/-la prijavu %{target}"
-        change_email_user_html: "%{name} je promenio/-la imejl adresu korisnika %{target}"
         change_role_user_html: "%{name} je promenio/-la ovlašćenja korisnika %{target}"
-        confirm_user_html: "%{name} je potvrdio/-la imejl adresu korisnika %{target}"
         create_account_warning_html: "%{name} je poslao/-la upozorenje korisniku %{target}"
         create_announcement_html: "%{name} je napravio/-la novo saopštenje %{target}"
-        create_canonical_email_block_html: "%{name} je blokirao/-la imejl adresu sa hešom %{target}"
         create_custom_emoji_html: "%{name} je otpremio/-la nove emodžije %{target}"
         create_domain_allow_html: "%{name} je dozvolio/-la federaciju sa domenom %{target}"
         create_domain_block_html: "%{name} je blokirao/-la domen %{target}"
-        create_email_domain_block_html: "%{name} je blokirao/-la imejl domen %{target}"
         create_ip_block_html: "%{name} je napravio/-la uslov za IP adrese %{target}"
         create_unavailable_domain_html: "%{name} je obustavio/-la isporučivanje domenu %{target}"
         create_user_role_html: "%{name} je napravio/-la %{target} poziciju"
         demote_user_html: "%{name} je smanjio ovlašćenja korisnika %{target}"
         destroy_announcement_html: "%{name} je obrisao/-la saopštenje %{target}"
-        destroy_canonical_email_block_html: "%{name} je odblokirao/-la imejl adresu sa hešom %{target}"
         destroy_custom_emoji_html: "%{name} je obrisao/-la emodži %{target}"
         destroy_domain_allow_html: "%{name} je zabranio/-la federaciju sa domenom %{target}"
         destroy_domain_block_html: "%{name} je odblokirao/-la domen %{target}"
-        destroy_email_domain_block_html: "%{name} je odblokirao/-la imejl domen %{target}"
         destroy_instance_html: "%{name} je očistio/-la domen %{target}"
         destroy_ip_block_html: "%{name} je obrisao/-la uslov za IP adrese %{target}"
         destroy_status_html: "%{name} je izbrisao/-la objavu korisnika %{target}"
@@ -262,10 +245,8 @@ sr-Latn:
         destroy_user_role_html: "%{name} je izbrisao/-la %{target} poziciju"
         disable_2fa_user_html: "%{name} je onemogućio/-la dvofaktorsku autentifikaciju za korisnika %{target}"
         disable_custom_emoji_html: "%{name} je onemogućio/-la emodži %{target}"
-        disable_sign_in_token_auth_user_html: "%{name} je onemogućio/-la imejl autentifikaciju za korisnika %{target}"
         disable_user_html: "%{name} je onemogućio/-la prijavljivanje za korisnika %{target}"
         enable_custom_emoji_html: "%{name} je omogućio/-la emodži %{target}"
-        enable_sign_in_token_auth_user_html: "%{name} je omogućio/-la imejl autentifikaciju za %{target}"
         enable_user_html: "%{name} je omogućio/-la prijavljivanje korisniku %{target}"
         memorialize_account_html: "%{name} je pretvorio/-la nalog korisnika %{target} u memorijalnu stranicu"
         promote_user_html: "%{name} je unapredio/-la korisnika %{target}"
@@ -273,7 +254,6 @@ sr-Latn:
         reject_user_html: "%{name} je odbio/-la registraciju korisnika %{target}"
         remove_avatar_user_html: "%{name} je uklonio avatar korisnika %{target}"
         reopen_report_html: "%{name} je ponovo otvorio/-la prijavu %{target}"
-        resend_user_html: "%{name} je ponovo poslao/-la imejl za potvrdu korisniku %{target}"
         reset_password_user_html: "%{name} je resetovao/-la lozinku korisnika %{target}"
         resolve_report_html: "%{name} je rešio/-la prijavu %{target}"
         sensitive_account_html: "%{name} je označio/-la medije naloga %{target} kao osetljive"
@@ -439,7 +419,6 @@ sr-Latn:
         few: "%{count} pokušaja tokom prethodne nedelje"
         one: "%{count} pokušaj tokom prethodne nedelje"
         other: "%{count} pokušaja registracije tokom prethodne nedelje"
-      created_msg: Uspešno dodao domen E-pošte na crnu listu
       delete: Obriši
       dns:
         types:
@@ -448,12 +427,8 @@ sr-Latn:
       new:
         create: Dodaj domen
         resolve: Pretvori domen
-        title: Nova stavka e-pošte u crnoj listi
-      no_email_domain_block_selected: Nijedan blok imejl domena nije promenjen jer nijedan nije izabran
       not_permitted: Nije dozvoljeno
-      resolved_dns_records_hint_html: Ime domena se pretvara u sledeće MX domene, koji su naposletku odgovorni za prihvatanje elektronske pošte. Blokiranje MX domena će blokirati registracije sa svake imejl adrese koja koristi taj MX domen, čak i u slučaju kada se vidljivo ime domena razlikuje. <strong>Vodite računa o tome da ne blokirate velike imejl provajdere.</strong>
       resolved_through_html: Preusmereno kroz %{domain}
-      title: Crna lista E-pošte
     export_domain_allows:
       new:
         title: Uvezi dozvoljene domene
@@ -608,7 +583,6 @@ sr-Latn:
         resolve_description_html: Nijedna radnja neće biti preduzeta protiv prijavljenog naloga, nijedan prestup nije upisan i prijava će biti zatvorena.
         silence_description_html: Nalog će biti vidljiv samo onima koji ga već prate ili koji ga ručno potraže, što će značajno ograničiti njegov domet. Ograničenje se može povući u svakom trenutku. Zatvara sve prijave podnete protiv ovog naloga.
         suspend_description_html: Nalog i svi njegovi sadržaji će postati nedostupni i u jednom trenutku izbrisani, a interakcija sa nalogom više neće biti moguća. Suspenzija se može povući u roku od 30 dana. Zatvara sve prijave podnete protiv ovog naloga.
-      actions_description_html: Odlučite koju radnju da sprovedete radi rešavanja ove prijave. Ukoliko sprovedete kaznenu radnju protiv prijavljenog naloga, vlasnik naloga će biti obavešten putem i-mejla, osim ukoliko oznaka <strong>„Nepoželjne poruke”</strong> nije odabrana.
       actions_description_remote_html: Odlučite koju radnju da preduzmete radi rešavanja ove prijave. Ovo će uticati samo na to kako <strong>Vaš</strong> server komunicira sa ovim udaljenim nalogom i obrađuje njegov sadržaj.
       add_to_report: Dodaj još u prijavu
       already_suspended_badges:
@@ -672,7 +646,6 @@ sr-Latn:
         delete_data_html: Obriši profil i sadržaje korisnika <strong>@%{acct}</strong> za 30 dana osim ukoliko suspenzija bude povučena u međuvremenu
         preview_preamble_html: "<strong>@%{acct}</strong> će primiti upozorenje sledeće sadržine:"
         record_strike_html: Upišite prekršaj na ime <strong>@%{acct}</strong> da bi Vam bilo lakše da u budućnosti intervenišete prilikom daljih prestupa sa ovog naloga
-        send_email_html: Pošalji imejl upozorenja korisniku <strong>@%{acct}</strong>
         warning_placeholder: Opciono dodatno obrazloženje za moderacijsku radnju.
       target_origin: Poreklo prijavljenog naloga
       title: Prijave
@@ -714,7 +687,6 @@ sr-Latn:
         manage_appeals: Nadgledanje žalbi
         manage_appeals_description: Dopušta korisnicima da pregledaju žalbe na moderacijske radnje
         manage_blocks: Nadgledanje blokova
-        manage_blocks_description: Dopušta korisnicima da blokiraju imejl provajdere i IP adrese
         manage_custom_emojis: Nadležnost nad prilagođenim emodžijima
         manage_custom_emojis_description: Daje korisnicima kontrolu nad prilagođenim emodžijima na serveru
         manage_federation: Nadgledanje federacije
@@ -732,7 +704,6 @@ sr-Latn:
         manage_taxonomies: Nadgledanje taksonomija
         manage_taxonomies_description: Dopušta korisnicima da pregledaju sadržaj u trendu i ažuriraju postavke heš oznaka
         manage_user_access: Nadležnost nad korisničkim pristupom
-        manage_user_access_description: Dopušta korisnicima da onemoguće dvofaktorsku autentifikaciju drugih korisnika, menjaju im imejl adrese i resetuju im lozinke
         manage_users: Nadležnost nad korisnicima
         manage_users_description: Dopušta korisnicima da pročitaju detalje drugih korisnika i izvršavaju moderacijske radnje nad njima
         manage_webhooks: Nadležnost nad webhook elementima
@@ -807,7 +778,6 @@ sr-Latn:
       destroyed_msg: Otpremanje uspešno obrisano!
     software_updates:
       critical_update: Kritično — ažurirajte brzo
-      description: Preporučuje se da svoju Mastodon instalaciju održavate ažurnom kako biste imali koristi od najnovijih ispravki i funkcija. Štaviše, ponekad je ključno ažurirati Mastodon na vreme kako bi se izbegli bezbednosni problemi. Iz ovih razloga, Mastodon proverava da li postoje ažuriranja svakih 30 minuta, i obavestiće vas u skladu sa vašim podešavanjima obaveštenja putem e-pošte.
       documentation_link: Saznajte više
       release_notes: Beleške o izdanju
       title: Dostupna ažuriranja
@@ -962,7 +932,6 @@ sr-Latn:
           few: Korišćeno od strane %{count} osobe tokom prethodne nedelje
           one: Korišćeno od strane jedne osobe tokom prethodne nedelje
           other: Korišćeno od strane %{count} ljudi tokom prethodne nedelje
-      title: Trendovi
       trending: U trendu
     warning_presets:
       add_new: Dodaj novi
@@ -1048,9 +1017,7 @@ sr-Latn:
       guide_link_text: Svako može doprineti.
     sensitive_content: Osetljiv sadržaj
   application_mailer:
-    notification_preferences: Promeni preference E-pošte
     salutation: Poštovani %{name},
-    settings: 'Promeni podešavanja e-pošte: %{link}'
     unsubscribe: Odjavi se
     view: 'Pogledaj:'
     view_profile: Pogledaj nalog
@@ -1070,7 +1037,6 @@ sr-Latn:
       hint_html: Samo još jedna stvar! Moramo da potvrdimo da ste ljudsko biće (ovo je da bismo sprečili neželjenu poštu!). Rešite CAPTCHA ispod i kliknite na „Nastavi”.
       title: Bezbedonosna provera
     confirmations:
-      awaiting_review: Vaša adresa e-pošte je potvrđena! Osoblje %{domain} sada pregleda vašu registraciju. Dobićete e-poštu ako odobre vaš nalog!
       awaiting_review_title: Vaša registracija se pregleda
       clicking_this_link: klikom na ovu vezu
       login_link: prijavi se
@@ -1078,7 +1044,6 @@ sr-Latn:
       redirect_to_app_html: Trebalo je da budete preusmereni na aplikaciju <strong>%{app_name}</strong>. Ako se to nije desilo, pokušajte sa %{clicking_this_link} ili se ručno vratite u aplikaciju.
       registration_complete: Vaša registracija na %{domain} je sada kompletirana!
       welcome_title: Dobro došli, %{name}!
-      wrong_email_hint: Ako ta imejl adresa nije ispravna, možete je promeniti u podešavanjima naloga.
     delete_account: Brisanje naloga
     delete_account_html: Ako želite da izbrišete vaš nalog, možete <a href="%{path}">nastaviti ovde</a>. Od vas će se tražiti potvrda.
     description:
@@ -1099,7 +1064,6 @@ sr-Latn:
     or_log_in_with: Ili se prijavite sa
     privacy_policy_agreement_html: Pročitao/-la sam i saglasan/-a sam sa <a href="%{privacy_policy_path}" target="_blank">politikom privatnosti</a>
     progress:
-      confirm: Potvrdite e-poštu
       details: Vaši detalji
       review: Naš pregled
       rules: Prihvatite pravila
@@ -1121,10 +1085,8 @@ sr-Latn:
     security: Bezbednost
     set_new_password: Postavi novu lozinku
     setup:
-      email_below_hint_html: Proverite svoju fasciklu neželjene pošte ili zatražite drugu. Možete da ispravite svoju adresu e-pošte ako je pogrešna.
       email_settings_hint_html: Kliknite na vezu koji smo vam poslali da verifikujete %{email}. Čekaćemo ovde.
       link_not_received: Niste dobili vezu?
-      new_confirmation_instructions_sent: Za nekoliko minuta primićete novu e-poruku sa vezom za potvrdu!
       title: Proverite svoje prijemno sanduče
     sign_in:
       preamble_html: Prijavite se sa svojim podacima za <strong>%{domain}</strong>. Ako se Vaš nalog nalazi na drugom serveru, nećete moći da se prijavite ovde.
@@ -1135,9 +1097,7 @@ sr-Latn:
       title: Hajde da Vam namestimo nalog na %{domain}.
     status:
       account_status: Status naloga
-      confirming: Čekanje na potvrdu putem imejla.
       functional: Vaš nalog je potpuno operativan.
-      pending: Vaš zahtev je na čekanju za pregled od strane našeg osoblja. Ovo može potrajati neko vreme. Primićete imejl poruku ukoliko Vam zahtev bude odobren.
       redirecting_to: Vaš nalog je neaktivan jer preusmerava na %{acct}.
       self_destruct: Pošto se %{domain} zatvara, dobićete samo ograničen pristup svom nalogu.
       view_strikes: Pogledajte prethodne prestupe upisane na Vaše ime
@@ -1180,9 +1140,6 @@ sr-Latn:
       before: 'Pre nego što nastavite, molimo Vas pažljivo pročitajte sledeće napomene:'
       caches: Sadržaj koji je keširan na drugim serverima može da ostane netaknut
       data_removal: Vaše objave i drugi podaci će biti trajno izbrisani
-      email_change_html: Možete <a href="%{path}">promeniti svoju imejl adresu</a> bez brisanja svog naloga
-      email_contact_html: Ako poruka i dalje ne stiže, možete poslati mejl na <a href="mailto:%{email}">%{email}</a> za pomoć
-      email_reconfirmation_html: Ukoliko Vam imejl za potvrdu ne stiže, možete ga <a href="%{path}">ponovo zatražiti</a>
       irreversible: Nećete biti u mogućnosti da vratite ili reaktivirate svoj nalog
       more_details_html: Za više detalja, pogledajte <a href="%{terms_path}">politiku privatnosti</a>.
       username_available: Vaše korisničko ime će ponovo postati dostupno
@@ -1423,7 +1380,6 @@ sr-Latn:
     authentication_methods:
       otp: aplikacija za dvofaktorsku autentifikaciju
       password: lozinka
-      sign_in_token: imejl sigurnosni kod
       webauthn: sigurnosni ključevi
     description_html: Ukoliko primetite aktivnost koju ne prepoznajete, razmislite o tome da promenite svoju lozinku i uključite dvofaktorsku autentifikaciju.
     empty: Istorija autentifikacije nije dostupna
@@ -1434,16 +1390,6 @@ sr-Latn:
     unsubscribe:
       action: Da, odjavi me
       complete: Odjavljen
-      confirmation_html: Da li ste sigurni da želite da se odjavite od primanja %{type} za Mastodon na %{domain} na svoju e-poštu na %{email}? Uvek možete ponovo da se prijavite u svojim <a href="%{settings_path}">podešavanjima obaveštenja putem e-pošte</a>.
-      emails:
-        notification_emails:
-          favourite: omiljene e-pošte za obaveštenja
-          follow: omiljene e-pošte za praćenja
-          follow_request: e-pošte za zahteve za praćenja
-          mention: e-pošte za obaveštenje pominjanja
-          reblog: e-pošte za obaveštenje podržavanja
-      resubscribe_html: Ako ste se greškom odjavili, možete ponovo da se prijavite u svojim <a href="%{settings_path}">podešavanjima obaveštenja putem e-pošte</a>.
-      success_html: Više nećete dobijati %{type} za Mastodon na %{domain} na svoju e-poštu na %{email}.
       title: Odjavi se
   media_attachments:
     validations:
@@ -1524,8 +1470,6 @@ sr-Latn:
     update:
       subject: "%{name} je izmenio/-la objavu"
   notifications:
-    administration_emails: Obaveštenja e-poštom od administratora
-    email_events: Događaji za obaveštenja e-poštom
     email_events_hint: 'Izaberite dešavanja za koja želite da primate obaveštenja:'
   number:
     human:
@@ -1684,7 +1628,6 @@ sr-Latn:
     import: Uvoz
     import_and_export: Uvoz i izvoz
     migrate: Prebacivanje naloga
-    notifications: Obaveštenja e-poštom
     preferences: Podešavanja
     profile: Javni profil
     relationships: Praćenja i pratioci
@@ -1938,7 +1881,6 @@ sr-Latn:
     invalid_otp_token: Neispravni dvofaktorski kod
     otp_lost_help_html: Ako izgubite pristup za oba, možete stupiti u kontakt sa %{email}
     rate_limited: Previše pokušaja autentifikacije, pokušajte ponovo kasnije.
-    seamless_external_login: Prijavljeni ste putem spoljašnje usluge, tako da lozinka i podešavanja E-pošte nisu dostupni.
     signed_in_as: 'Prijavljen/a kao:'
   verification:
     extra_instructions_html: <strong>Savet:</strong>Veza na vašem veb sajtu može da bude nevidljiva. Važan deo je <code>rel="me"</code> koji sprečava lažno predstavljanje na veb sajtovima sa sadržajem koji generiše korisnik. Možete čak da koristite oznaku <code>veze</code> u zaglavlju stranice umesto <code>a</code>, ali HTML mora biti dostupan bez izvršavanja JavaScript-a.
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 9bfefde83c0db0..90e25eaf983aa8 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -33,7 +33,6 @@ sr:
       created_msg: Модераторска белешка успешно направљена!
       destroyed_msg: Модераторска белешка успешно обрисана!
     accounts:
-      add_email_domain_block: Блокирај домен е-поште
       approve: Одобри
       approved_msg: Захтев за регистрацију корисника %{username} је успешно одобрен
       are_you_sure: Да ли сте сигурни?
@@ -60,7 +59,6 @@ sr:
       demote: Ражалуј
       destroyed_msg: Подаци корисника %{username} су неповратно стављени у ред за брисање
       disable: Замрзни
-      disable_sign_in_token_auth: Онемогући имејл аутентификацију
       disable_two_factor_authentication: Искључи 2FA
       disabled: Замрзнут
       display_name: Име за приказ
@@ -69,7 +67,6 @@ sr:
       email: Е-пошта
       email_status: Статус е-поште
       enable: Омогући
-      enable_sign_in_token_auth: Омогући имејл аутентификацију
       enabled: Омогућен
       enabled_msg: Успешно одлеђен налог корисника %{username}
       followers: Пратиоци
@@ -135,7 +132,6 @@ sr:
       resubscribe: Поново се претплати
       role: Улога
       search: Претрага
-      search_same_email_domain: Остали корисници са истим доменом е-поште
       search_same_ip: Остали корисници са истом IP адресом
       security: Безбедност
       security_measures:
@@ -176,26 +172,21 @@ sr:
         approve_appeal: Уважи жалбу
         approve_user: Одобри корисника
         assigned_to_self_report: Додели пријаву
-        change_email_user: Промени e-адресу корисника
         change_role_user: Промени улогу корисника
         confirm_user: Потврди корисника
         create_account_warning: Креирај упозорење
         create_announcement: Креирај најаву
-        create_canonical_email_block: Креирај блок е-поште
         create_custom_emoji: Направи прилагођени емоџи
         create_domain_allow: Додај дозвољени домен
         create_domain_block: Додај блокирани домен
-        create_email_domain_block: Блокирај имејл домен
         create_ip_block: Направи IP услов
         create_unavailable_domain: Додај домен као недоступан
         create_user_role: Креирај улогу
         demote_user: Смањи овлашћења корисника
         destroy_announcement: Избриши најаву
-        destroy_canonical_email_block: Избриши блок е-поште
         destroy_custom_emoji: Обриши прилагођени емоџи
         destroy_domain_allow: Обриши дозвољени домен
         destroy_domain_block: Обриши блокирани домен
-        destroy_email_domain_block: Избриши блок е-поште
         destroy_instance: Очисти домен
         destroy_ip_block: Обриши IP услов
         destroy_status: Избриши пост
@@ -203,10 +194,8 @@ sr:
         destroy_user_role: Уништи позицију
         disable_2fa_user: Онемогући двофакторску аутентификацију
         disable_custom_emoji: Онемогући прилагођене емоџије
-        disable_sign_in_token_auth_user: Онемогући имејл аутентификацију за корисника
         disable_user: Онемогући корисника
         enable_custom_emoji: Омогући прилагођене емоџије
-        enable_sign_in_token_auth_user: Омогући имејл аутентификацију за корисника
         enable_user: Омогући корисника
         memorialize_account: Претвори у меморијални налог
         promote_user: Унапреди корисника
@@ -235,26 +224,20 @@ sr:
         approve_appeal_html: "%{name} је уважио жалбу корисника %{target} на одлуку модератора"
         approve_user_html: "%{name} је одобрио/-ла регистрацију корисника %{target}"
         assigned_to_self_report_html: "%{name} је себи доделио/-ла пријаву %{target}"
-        change_email_user_html: "%{name} је променио/-ла имејл адресу корисника %{target}"
         change_role_user_html: "%{name} је променио/-ла овлашћења корисника %{target}"
-        confirm_user_html: "%{name} је потврдио/-ла имејл адресу корисника %{target}"
         create_account_warning_html: "%{name} је послао/-ла упозорење кориснику %{target}"
         create_announcement_html: "%{name} је направио/-ла ново саопштење %{target}"
-        create_canonical_email_block_html: "%{name} је блокирао/-ла имејл адресу са хешом %{target}"
         create_custom_emoji_html: "%{name} је отпремио/-ла нове емоџије %{target}"
         create_domain_allow_html: "%{name} је дозволио/-ла федерацију са доменом %{target}"
         create_domain_block_html: "%{name} је блокирао/-ла домен %{target}"
-        create_email_domain_block_html: "%{name} је блокирао/-ла имејл домен %{target}"
         create_ip_block_html: "%{name} је направио/-ла услов за IP адресе %{target}"
         create_unavailable_domain_html: "%{name} је обуставио/-ла испоручивање домену %{target}"
         create_user_role_html: "%{name} је направио/-ла %{target} позицију"
         demote_user_html: "%{name} је смањио овлашћења корисника %{target}"
         destroy_announcement_html: "%{name} је обрисао/-ла саопштење %{target}"
-        destroy_canonical_email_block_html: "%{name} је одблокирао/-ла имејл адресу са хешом %{target}"
         destroy_custom_emoji_html: "%{name} је обрисао/-ла емоџи %{target}"
         destroy_domain_allow_html: "%{name} је забранио/-ла федерацију са доменом %{target}"
         destroy_domain_block_html: "%{name} је одблокирао/-ла домен %{target}"
-        destroy_email_domain_block_html: "%{name} је одблокирао/-ла имејл домен %{target}"
         destroy_instance_html: "%{name} је очистио/-ла домен %{target}"
         destroy_ip_block_html: "%{name} је обрисао/-ла услов за IP адресе %{target}"
         destroy_status_html: "%{name} је избрисао/-ла објаву корисника %{target}"
@@ -262,10 +245,8 @@ sr:
         destroy_user_role_html: "%{name} је избрисао/-ла %{target} позицију"
         disable_2fa_user_html: "%{name} је онемогућио/-ла двофакторску аутентификацију за корисника %{target}"
         disable_custom_emoji_html: "%{name} је онемогућио/-ла емоџи %{target}"
-        disable_sign_in_token_auth_user_html: "%{name} је онемогућио/-ла имејл аутентификацију за корисника %{target}"
         disable_user_html: "%{name} је онемогућио/-ла пријављивање за корисника %{target}"
         enable_custom_emoji_html: "%{name} је омогућио/-ла емоџи %{target}"
-        enable_sign_in_token_auth_user_html: "%{name} је омогућио/-ла имејл аутентификацију за %{target}"
         enable_user_html: "%{name} је омогућио/-ла пријављивање кориснику %{target}"
         memorialize_account_html: "%{name} је претворио/-ла налог корисника %{target} у меморијалну страницу"
         promote_user_html: "%{name} је унапредио/-ла корисника %{target}"
@@ -273,7 +254,6 @@ sr:
         reject_user_html: "%{name} је одбио/-ла регистрацију корисника %{target}"
         remove_avatar_user_html: "%{name} је уклонио аватар корисника %{target}"
         reopen_report_html: "%{name} је поново отворио/-ла пријаву %{target}"
-        resend_user_html: "%{name} је поново послао/-ла имејл за потврду кориснику %{target}"
         reset_password_user_html: "%{name} је ресетовао/-ла лозинку корисника %{target}"
         resolve_report_html: "%{name} је решио/-ла пријаву %{target}"
         sensitive_account_html: "%{name} је означио/-ла медије налога %{target} као осетљиве"
@@ -439,7 +419,6 @@ sr:
         few: "%{count} покушаја током претходне недеље"
         one: "%{count} покушај током претходне недеље"
         other: "%{count} покушаја регистрације током претходне недеље"
-      created_msg: Успешно додао домен Е-поште на црну листу
       delete: Обриши
       dns:
         types:
@@ -448,12 +427,8 @@ sr:
       new:
         create: Додај домен
         resolve: Претвори домен
-        title: Нова ставка е-поштe у црној листи
-      no_email_domain_block_selected: Ниједан блок имејл домена није промењен јер ниједан није изабран
       not_permitted: Није дозвољено
-      resolved_dns_records_hint_html: Име домена се претвара у следеће MX домене, који су напослетку одговорни за прихватање електронске поште. Блокирање MX домена ће блокирати регистрације са сваке имејл адресе која користи тај MX домен, чак и у случају када се видљиво име домена разликује. <strong>Водите рачуна о томе да не блокирате велике имејл провајдере.</strong>
       resolved_through_html: Преусмерено кроз %{domain}
-      title: Црна листа E-поште
     export_domain_allows:
       new:
         title: Увези дозвољене домене
@@ -608,7 +583,6 @@ sr:
         resolve_description_html: Ниједна радња неће бити предузета против пријављеног налога, ниједан преступ није уписан и пријава ће бити затворена.
         silence_description_html: Налог ће бити видљив само онима који га већ прате или који га ручно потраже, што ће значајно ограничити његов домет. Ограничење се може повући у сваком тренутку. Затвара све пријаве поднете против овог налога.
         suspend_description_html: Налог и сви његови садржаји ће постати недоступни и у једном тренутку избрисани, а интеракција са налогом више неће бити могућа. Суспензија се може повући у року од 30 дана. Затвара све пријаве поднете против овог налога.
-      actions_description_html: Одлучите коју радњу да спроведете ради решавања ове пријаве. Уколико спроведете казнену радњу против пријављеног налога, власник налога ће бити обавештен путем и-мејла, осим уколико ознака <strong>„Непожељне поруке”</strong> није одабрана.
       actions_description_remote_html: Одлучите коју радњу да предузмете ради решавања ове пријаве. Ово ће утицати само на то како <strong>Ваш</strong> сервер комуницира са овим удаљеним налогом и обрађује његов садржај.
       add_to_report: Додај још у пријаву
       already_suspended_badges:
@@ -672,7 +646,6 @@ sr:
         delete_data_html: Обриши профил и садржаје корисника <strong>@%{acct}</strong> за 30 дана осим уколико суспензија буде повучена у међувремену
         preview_preamble_html: "<strong>@%{acct}</strong> ће примити упозорење следеће садржине:"
         record_strike_html: Упишите прекршај на име <strong>@%{acct}</strong> да би Вам било лакше да у будућности интервенишете приликом даљих преступа са овог налога
-        send_email_html: Пошаљи имејл упозорења кориснику <strong>@%{acct}</strong>
         warning_placeholder: Опционо додатно образложење за модерацијску радњу.
       target_origin: Порекло пријављеног налога
       title: Пријаве
@@ -714,7 +687,6 @@ sr:
         manage_appeals: Надгледање жалби
         manage_appeals_description: Допушта корисницима да прегледају жалбе на модерацијске радње
         manage_blocks: Надгледање блокова
-        manage_blocks_description: Допушта корисницима да блокирају имејл провајдере и IP адресе
         manage_custom_emojis: Надлежност над прилагођеним емоџијима
         manage_custom_emojis_description: Даје корисницима контролу над прилагођеним емоџијима на серверу
         manage_federation: Надгледање федерације
@@ -732,7 +704,6 @@ sr:
         manage_taxonomies: Надгледање таксономија
         manage_taxonomies_description: Допушта корисницима да прегледају садржај у тренду и ажурирају поставке хеш ознака
         manage_user_access: Надлежност над корисничким приступом
-        manage_user_access_description: Допушта корисницима да онемогуће двофакторску аутентификацију других корисника, мењају им имејл адресе и ресетују им лозинке
         manage_users: Надлежност над корисницима
         manage_users_description: Допушта корисницима да прочитају детаље других корисника и извршавају модерацијске радње над њима
         manage_webhooks: Надлежност над webhook елементима
@@ -807,7 +778,6 @@ sr:
       destroyed_msg: Отпремање успешно обрисано!
     software_updates:
       critical_update: Критично — ажурирајте брзо
-      description: Препоручује се да своју Mastodon инсталацију одржавате ажурном како бисте имали користи од најновијих исправки и функција. Штавише, понекад је кључно ажурирати Mastodon на време како би се избегли безбедносни проблеми. Из ових разлога, Mastodon проверава да ли постоје ажурирања сваких 30 минута, и обавестиће вас у складу са вашим подешавањима обавештења путем е-поште.
       documentation_link: Сазнајте више
       release_notes: Белешке о издању
       title: Доступна ажурирања
@@ -962,7 +932,6 @@ sr:
           few: Коришћено од стране %{count} особе током претходне недеље
           one: Коришћено од стране једне особе током претходне недеље
           other: Коришћено од стране %{count} људи током претходне недеље
-      title: Трендови
       trending: У тренду
     warning_presets:
       add_new: Додај нови
@@ -1048,9 +1017,7 @@ sr:
       guide_link_text: Свако може допринети.
     sensitive_content: Осетљив садржај
   application_mailer:
-    notification_preferences: Промени преференце Е-поште
     salutation: Поштовани %{name},
-    settings: 'Промени подешавања е-поште: %{link}'
     unsubscribe: Одјави се
     view: 'Погледај:'
     view_profile: Погледај налог
@@ -1070,7 +1037,6 @@ sr:
       hint_html: Само још једна ствар! Морамо да потврдимо да сте људско биће (ово је да бисмо спречили нежељену пошту!). Решите CAPTCHA испод и кликните на „Настави”.
       title: Безбедоносна провера
     confirmations:
-      awaiting_review: Ваша адреса е-поште је потврђена! Особље %{domain} сада прегледа вашу регистрацију. Добићете е-пошту ако одобре ваш налог!
       awaiting_review_title: Ваша регистрација се прегледа
       clicking_this_link: кликом на ову везу
       login_link: пријави се
@@ -1078,7 +1044,6 @@ sr:
       redirect_to_app_html: Требало је да будете преусмерени на апликацију <strong>%{app_name}</strong>. Ако се то није десило, покушајте са %{clicking_this_link} или се ручно вратите у апликацију.
       registration_complete: Ваша регистрација на %{domain} је сада комплетирана!
       welcome_title: Добро дошли, %{name}!
-      wrong_email_hint: Ако та имејл адреса није исправна, можете је променити у подешавањима налога.
     delete_account: Брисање налога
     delete_account_html: Ако желите да избришете ваш налог, можете <a href="%{path}">наставити овде</a>. Од вас ће се тражити потврда.
     description:
@@ -1099,7 +1064,6 @@ sr:
     or_log_in_with: Или се пријавите са
     privacy_policy_agreement_html: Прочитао/-ла сам и сагласан/-а сам са <a href="%{privacy_policy_path}" target="_blank">политиком приватности</a>
     progress:
-      confirm: Потврдите е-пошту
       details: Ваши детаљи
       review: Наш преглед
       rules: Прихватите правила
@@ -1121,10 +1085,8 @@ sr:
     security: Безбедност
     set_new_password: Постави нову лозинку
     setup:
-      email_below_hint_html: Проверите своју фасциклу нежељене поште или затражите другу. Можете да исправите своју адресу е-поште ако је погрешна.
       email_settings_hint_html: Кликните на везу који смо вам послали да верификујете %{email}. Чекаћемо овде.
       link_not_received: Нисте добили везу?
-      new_confirmation_instructions_sent: За неколико минута примићете нову е-поруку са везом за потврду!
       title: Проверите своје пријемно сандуче
     sign_in:
       preamble_html: Пријавите се са својим подацима за <strong>%{domain}</strong>. Ако је ваш налог хостован на другом серверу, нећете моћи да се пријавите овде.
@@ -1135,9 +1097,7 @@ sr:
       title: Хајде да Вам наместимо налог на %{domain}.
     status:
       account_status: Статус налога
-      confirming: Чекање на потврду путем имејла.
       functional: Ваш налог је потпуно оперативан.
-      pending: Ваш захтев је на чекању за преглед од стране нашег особља. Ово може потрајати неко време. Примићете имејл поруку уколико Вам захтев буде одобрен.
       redirecting_to: Ваш налог је неактиван јер преусмерава на %{acct}.
       self_destruct: Пошто се %{domain} затвара, добићете само ограничен приступ свом налогу.
       view_strikes: Погледајте претходне преступе уписане на Ваше име
@@ -1180,9 +1140,6 @@ sr:
       before: 'Пре него што наставите, молимо Вас пажљиво прочитајте следеће напомене:'
       caches: Садржај који је кеширан на другим серверима може да остане нетакнут
       data_removal: Ваше објаве и други подаци ће бити трајно избрисани
-      email_change_html: Можете <a href="%{path}">променити своју имејл адресу</a> без брисања свог налога
-      email_contact_html: Ако порука и даље не стиже, можете послати мејл на <a href="mailto:%{email}">%{email}</a> за помоћ
-      email_reconfirmation_html: Уколико Вам имејл за потврду не стиже, можете га <a href="%{path}">поново затражити</a>
       irreversible: Нећете бити у могућности да вратите или реактивирате свој налог
       more_details_html: За више детаља, погледајте <a href="%{terms_path}">политику приватности</a>.
       username_available: Ваше корисничко име ће поново постати доступно
@@ -1423,7 +1380,6 @@ sr:
     authentication_methods:
       otp: апликација за двофакторску аутентификацију
       password: лозинка
-      sign_in_token: имејл сигурносни код
       webauthn: сигурносни кључеви
     description_html: Уколико приметите активност коју не препознајете, размислите о томе да промените своју лозинку и укључите двофакторску аутентификацију.
     empty: Историја аутентификације није доступна
@@ -1434,16 +1390,6 @@ sr:
     unsubscribe:
       action: Да, одјави ме
       complete: Одјављен
-      confirmation_html: Да ли сте сигурни да желите да се одјавите од примања %{type} за Mastodon на %{domain} на своју е-пошту на %{email}? Увек можете поново да се пријавите у својим <a href="%{settings_path}">подешавањима обавештења путем е-поште</a>.
-      emails:
-        notification_emails:
-          favourite: омиљене е-поште за обавештења
-          follow: омиљене е-поште за праћења
-          follow_request: е-поште за захтеве за праћења
-          mention: е-поште за обавештење помињања
-          reblog: е-поште за обавештење подржавања
-      resubscribe_html: Ако сте се грешком одјавили, можете поново да се пријавите у својим <a href="%{settings_path}">подешавањима обавештења путем е-поште</a>.
-      success_html: Више нећете добијати %{type} за Mastodon на %{domain} на своју е-пошту на %{email}.
       title: Одјави се
   media_attachments:
     validations:
@@ -1524,8 +1470,6 @@ sr:
     update:
       subject: "%{name} је уредио/-ла објаву"
   notifications:
-    administration_emails: Обавештења е-поштом од администратора
-    email_events: Догађаји за обавештења е-поштом
     email_events_hint: 'Изаберите дешавања за која желите да примате обавештења:'
   number:
     human:
@@ -1684,7 +1628,6 @@ sr:
     import: Увоз
     import_and_export: Увоз и извоз
     migrate: Пребацивање налога
-    notifications: Обавештења е-поштом
     preferences: Подешавања
     profile: Јавни профил
     relationships: Праћења и пратиоци
@@ -1938,7 +1881,6 @@ sr:
     invalid_otp_token: Неисправни двофакторски код
     otp_lost_help_html: Ако изгубите приступ за оба, можете ступити у контакт са %{email}
     rate_limited: Превише покушаја аутентификације, покушајте поново касније.
-    seamless_external_login: Пријављени сте путем спољашње услуге, тако да лозинка и подешавања Е-поште нису доступни.
     signed_in_as: 'Пријављен/а као:'
   verification:
     extra_instructions_html: <strong>Савет:</strong>Веза на вашем веб сајту може да буде невидљива. Важан део је <code>rel="me"</code> који спречава лажно представљање на веб сајтовима са садржајем који генерише корисник. Можете чак да користите ознаку <code>везе</code> у заглављу странице уместо <code>а</code>, али HTML мора бити доступан без извршавања JavaScript-а.
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 8054c113558a05..1a54451716e710 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -58,7 +58,6 @@ sv:
       demote: Degradera
       destroyed_msg: "%{username}'s data har nu lagts till kön för att raderas omedelbart"
       disable: inaktivera
-      disable_sign_in_token_auth: Inaktivera autentisering med e-post-token
       disable_two_factor_authentication: Inaktivera 2FA
       disabled: inaktiverad
       display_name: Visningsnamn
@@ -67,7 +66,6 @@ sv:
       email: E-post
       email_status: E-poststatus
       enable: Aktivera
-      enable_sign_in_token_auth: Aktivera autentisering med e-post-token
       enabled: Aktiverad
       enabled_msg: Uppfrysningen av %{username}'s konto lyckades
       followers: Följare
@@ -132,7 +130,6 @@ sv:
       resubscribe: Starta en ny prenumeration
       role: Roll
       search: Sök
-      search_same_email_domain: Andra användare med samma e-postdomän
       search_same_ip: Annan användare med samma IP-adress
       security: Säkerhet
       security_measures:
@@ -173,26 +170,21 @@ sv:
         approve_appeal: Godkänn överklagande
         approve_user: Godkänn användare
         assigned_to_self_report: Tilldela anmälan
-        change_email_user: Ändra e-post för användare
         change_role_user: Ändra roll för användaren
         confirm_user: Bekräfta användare
         create_account_warning: Skapa varning
         create_announcement: Skapa kungörelse
-        create_canonical_email_block: Skapa e-postblockering
         create_custom_emoji: Skapa egen emoji
         create_domain_allow: Skapa tillåten domän
         create_domain_block: Skapa blockerad domän
-        create_email_domain_block: Skapa blockering av e-postdomän
         create_ip_block: Skapa IP-regel
         create_unavailable_domain: Skapa otillgänglig domän
         create_user_role: Skapa roll
         demote_user: Degradera användare
         destroy_announcement: Radera kungörelse
-        destroy_canonical_email_block: Radera e-postblockering
         destroy_custom_emoji: Radera egen emoji
         destroy_domain_allow: Ta bort tillåten domän
         destroy_domain_block: Ta bort blockerad domän
-        destroy_email_domain_block: Radera blockering av e-postdomän
         destroy_instance: Rensa domänen
         destroy_ip_block: Radera IP-regel
         destroy_status: Radera inlägg
@@ -200,10 +192,8 @@ sv:
         destroy_user_role: Förstör roll
         disable_2fa_user: Inaktivera 2FA
         disable_custom_emoji: Inaktivera egna emojis
-        disable_sign_in_token_auth_user: Inaktivera autentisering med e-post-token för användare
         disable_user: Inaktivera användare
         enable_custom_emoji: Aktivera egna emojis
-        enable_sign_in_token_auth_user: Aktivera autentisering med e-post-token för användare
         enable_user: Aktivera användare
         memorialize_account: Minnesmärk konto
         promote_user: Befordra användare
@@ -233,26 +223,20 @@ sv:
         approve_appeal_html: "%{name} godkände överklagande av modereringsbeslut från %{target}"
         approve_user_html: "%{name} godkände registrering från %{target}"
         assigned_to_self_report_html: "%{name} tilldelade rapporten %{target} till sig själva"
-        change_email_user_html: "%{name} bytte e-postadress för användare %{target}"
         change_role_user_html: "%{name} ändrade roll för %{target}"
-        confirm_user_html: "%{name} bekräftade e-postadress för användare %{target}"
         create_account_warning_html: "%{name} skickade en varning till %{target}"
         create_announcement_html: "%{name} skapade kungörelsen %{target}"
-        create_canonical_email_block_html: "%{name} blockerade e-post med hashen %{target}"
         create_custom_emoji_html: "%{name} laddade upp ny emoji %{target}"
         create_domain_allow_html: "%{name} vitlistade domän %{target}"
         create_domain_block_html: "%{name} blockerade domänen %{target}"
-        create_email_domain_block_html: "%{name} blockerade e-postdomänen %{target}"
         create_ip_block_html: "%{name} skapade regel för IP %{target}"
         create_unavailable_domain_html: "%{name} stoppade leverans till domänen %{target}"
         create_user_role_html: "%{name} skapade rollen %{target}"
         demote_user_html: "%{name} nedgraderade användare %{target}"
         destroy_announcement_html: "%{name} raderade kungörelsen %{target}"
-        destroy_canonical_email_block_html: "%{name} avblockerade e-post med hashen %{target}"
         destroy_custom_emoji_html: "%{name} raderade emoji %{target}"
         destroy_domain_allow_html: "%{name} raderade domän %{target} från vitlistan"
         destroy_domain_block_html: "%{name} avblockerade domänen %{target}"
-        destroy_email_domain_block_html: "%{name} avblockerade e-postdomänen %{target}"
         destroy_instance_html: "%{name} rensade domän %{target}"
         destroy_ip_block_html: "%{name} tog bort regel för IP %{target}"
         destroy_status_html: "%{name} tog bort inlägget av %{target}"
@@ -260,10 +244,8 @@ sv:
         destroy_user_role_html: "%{name} raderade rollen %{target}"
         disable_2fa_user_html: "%{name} inaktiverade tvåfaktorsautentiseringskrav för användaren %{target}"
         disable_custom_emoji_html: "%{name} inaktiverade emoji %{target}"
-        disable_sign_in_token_auth_user_html: "%{name} inaktiverade e-posttokenautentisering för %{target}"
         disable_user_html: "%{name} stängde av inloggning för användaren %{target}"
         enable_custom_emoji_html: "%{name} aktiverade emoji %{target}"
-        enable_sign_in_token_auth_user_html: "%{name} aktiverade e-posttokenautentisering för %{target}"
         enable_user_html: "%{name} aktiverade inloggning för användaren %{target}"
         memorialize_account_html: "%{name} gjorde %{target}'s konto till en minnessida"
         promote_user_html: "%{name} befordrade användaren %{target}"
@@ -271,7 +253,6 @@ sv:
         reject_user_html: "%{name} avvisade registrering från %{target}"
         remove_avatar_user_html: "%{name} tog bort %{target}'s avatar"
         reopen_report_html: "%{name} öppnade rapporten igen %{target}"
-        resend_user_html: "%{name} skickade bekräftelsemail för %{target} på nytt"
         reset_password_user_html: "%{name} återställ användarens lösenord %{target}"
         resolve_report_html: "%{name} löste rapporten %{target}"
         sensitive_account_html: "%{name} markerade %{target}'s media som känsligt"
@@ -432,7 +413,6 @@ sv:
       attempts_over_week:
         one: "%{count} försök under den senaste veckan"
         other: "%{count} registreringsförsök under den senaste veckan"
-      created_msg: Blockerade e-postdomänen
       delete: Radera
       dns:
         types:
@@ -441,12 +421,8 @@ sv:
       new:
         create: Skapa domän
         resolve: Slå upp domän
-        title: Blockera ny e-postdomän
-      no_email_domain_block_selected: Inga blockeringar av e-postdomäner ändrades eftersom inga valdes
       not_permitted: Ej tillåtet
-      resolved_dns_records_hint_html: Domännamnet ger uppslag till följande MX-domäner, vilka är ytterst ansvariga för att e-post tas emot. Att blockera en MX-domän blockerar även registreringar från alla e-postadresser som använder samma MX-domän, även om det synliga domännamnet är annorlunda. <strong>Var noga med att inte blockera stora e-postleverantörer.</strong>
       resolved_through_html: Uppslagen genom %{domain}
-      title: Blockerade e-postdomäner
     export_domain_allows:
       new:
         title: Importera domäntillåtelser
@@ -600,7 +576,6 @@ sv:
         resolve_description_html: Ingen åtgärd vidtas mot det rapporterade kontot, ingen prick registreras och rapporten stängs.
         silence_description_html: Kontot kommer endast synas för de som redan följer den eller manuellt söker på den, vilket dramatiskt minskar dess räckvidd. Kan alltid ångras. Stänger alla anmälningar mot detta konto.
         suspend_description_html: Kontot och allt dess innehåll kommer att vara oåtkomligt och så småningom tas bort, det kommer inte gå att interagera med kontot. Kan ångras inom 30 dagar. Stänger alla anmälningar mot detta konto.
-      actions_description_html: Välj vilken åtgärd som skall vidtas för att lösa denna rapport. Om du vidtar en bestraffningsåtgärd mot det rapporterade kontot kommer en e-postnotis att skickas till dem, förutom om du valt kategorin <strong>Skräppost</strong>.
       actions_description_remote_html: Bestäm vilka åtgärder som ska vidtas för att lösa denna rapport. Detta kommer bara att påverka hur <strong>din</strong> server kommunicerar med detta fjärrkonto och hanterar dess innehåll.
       add_to_report: Lägg till mer i rapporten
       already_suspended_badges:
@@ -665,7 +640,6 @@ sv:
         delete_data_html: Ta bort <strong>@%{acct}</strong>s profil och innehåll om 30 dagar ifall deras avstängning inte tagits bort under tiden
         preview_preamble_html: "<strong>@%{acct}</strong> kommer få en varning med följande innehåll:"
         record_strike_html: Registrera en varning mot <strong>@%{acct}</strong> för att hjälpa dig eskalera vid framtida överträdelser från detta konto
-        send_email_html: Skicka <strong>@%{acct}</strong> ett varningsmejl
         warning_placeholder: Valfri ytterligare resonemang för modereringsåtgärd.
       target_origin: Ursprung för anmält konto
       title: Anmälningar
@@ -705,7 +679,6 @@ sv:
         manage_appeals: Hantera överklaganden
         manage_appeals_description: Tillåter användare att granska överklaganden av modereringsåtgärder
         manage_blocks: Hantera blockeringar
-        manage_blocks_description: Tillåter användare att blockera e-postleverantörer och IP-adresser
         manage_custom_emojis: Hantera egna emojier
         manage_custom_emojis_description: Tillåter användare att hantera egna emojier på servern
         manage_federation: Hantera federering
@@ -723,7 +696,6 @@ sv:
         manage_taxonomies: Hantera taxonomier
         manage_taxonomies_description: Tillåter användare att granska trendande innehåll och uppdatera inställningar för hashtaggar
         manage_user_access: Hantera användaråtkomst
-        manage_user_access_description: Tillåter användare att inaktivera andra användares tvåfaktorsautentisering, ändra deras e-postadress samt återställa deras lösenord
         manage_users: Hantera användare
         manage_users_description: Tillåter användare att granska användares data och utföra modereringsåtgärder på dessa
         manage_webhooks: Hantera webhooks
@@ -798,7 +770,6 @@ sv:
       destroyed_msg: Webbplatsuppladdningen har raderats!
     software_updates:
       critical_update: Kritiskt — vänligen uppdatera omgående
-      description: Det rekommenderas att hålla din Mastodon-installation uppdaterad för att ta nytta av de senaste fixarna och funktionerna. Dessutom är det ibland viktigt att uppdatera Mastodon i tid för att undvika säkerhetsproblem. Av dessa skäl kontrollerar Mastodon efter uppdateringar var 30:e minut och meddelar dig i enlighet med dina e-postaviseringsinställningar.
       documentation_link: Läs mer
       release_notes: Ändringslogg
       title: Tillgängliga uppdateringar
@@ -955,7 +926,7 @@ sv:
         used_by_over_week:
           one: Använd av en person under den senaste veckan
           other: Använd av %{count} personer under den senaste veckan
-      title: Trender
+      title: Rekommendationer & Trender
       trending: Trendande
     warning_presets:
       add_new: Lägg till ny
@@ -1040,9 +1011,8 @@ sv:
       guide_link_text: Alla kan bidra.
     sensitive_content: Känsligt innehåll
   application_mailer:
-    notification_preferences: Ändra e-postinställningar
+    notification_preferences: Ändra e-postpreferenser
     salutation: "%{name},"
-    settings: 'Ändra e-postinställningar: %{link}'
     unsubscribe: Avprenumerera
     view: 'Granska:'
     view_profile: Visa profil
@@ -1062,7 +1032,6 @@ sv:
       hint_html: En sista sak till! Vi måste bekräfta att du är en människa (för att hålla borta skräpinlägg!). Lös CAPTCHA nedan och klicka på "Fortsätt".
       title: Säkerhetskontroll
     confirmations:
-      awaiting_review: Din e-postadress är bekräftad! %{domain} personalen granskar nu din registrering. Du kommer att få ett e-postmeddelande om de godkänner ditt konto!
       awaiting_review_title: Din registrering är under granskning
       clicking_this_link: klicka på denna länk
       login_link: logga in
@@ -1070,7 +1039,6 @@ sv:
       redirect_to_app_html: Du borde ha omdirigerats till appen <strong>%{app_name}</strong>. Om det inte hände, försök att %{clicking_this_link} eller återgå manuellt till appen.
       registration_complete: Din registrering på %{domain} är nu slutförd!
       welcome_title: Välkommen %{name}!
-      wrong_email_hint: Om e-postadressen inte är rätt, kan du ändra den i kontoinställningarna.
     delete_account: Radera konto
     delete_account_html: Om du vill radera ditt konto kan du <a href="%{path}">fortsätta här</a>. Du kommer att bli ombedd att bekräfta.
     description:
@@ -1091,7 +1059,6 @@ sv:
     or_log_in_with: Eller logga in med
     privacy_policy_agreement_html: Jag har läst och godkänner <a href="%{privacy_policy_path}" target="_blank">integritetspolicyn</a>
     progress:
-      confirm: Bekräfta e-postadress
       details: Dina uppgifter
       review: Vår recension
       rules: Acceptera regler
@@ -1113,10 +1080,8 @@ sv:
     security: Säkerhet
     set_new_password: Skriv in nytt lösenord
     setup:
-      email_below_hint_html: Kolla din skräppost-mapp eller begär en annan. Du kan korrigera din e-postadress om den är fel.
       email_settings_hint_html: Klicka på länken som vi har skickat till dig för att bekräfta %{email}. Vi väntar här.
       link_not_received: Fick du ingen länk?
-      new_confirmation_instructions_sent: Du får e-post med bekräftelselänk om några minuter!
       title: Kolla din inkorg
     sign_in:
       preamble_html: Logga in med dina användaruppgifter på <strong>%{domain}</strong>. Om ditt konto finns på en annan server kommer du inte att kunna logga in här.
@@ -1127,9 +1092,7 @@ sv:
       title: Låt oss få igång dig på %{domain}.
     status:
       account_status: Kontostatus
-      confirming: Väntar på att e-postbekräftelsen ska slutföras.
       functional: Ditt konto fungerar som det ska.
-      pending: Din ansökan inväntar granskning. Detta kan ta tid. Du kommer att få ett e-postmeddelande om din ansökan godkänns.
       redirecting_to: Ditt konto är inaktivt eftersom det för närvarande dirigeras om till %{acct}.
       self_destruct: Eftersom %{domain} håller på att stängas ned, kommer du endast att ha begränsad tillgång till ditt konto.
       view_strikes: Visa tidigare prickar på ditt konto
@@ -1173,8 +1136,6 @@ sv:
       caches: Innehåll som har cachats av andra servrar kan bibehållas
       data_removal: Dina inlägg och annan data kommer permanent raderas
       email_change_html: Du kan <a href="%{path}">ändra din e-postadress</a> utan att radera ditt konto
-      email_contact_html: Om det fortfarande inte kommer kan du e-posta <a href="mailto:%{email}">%{email}</a> för support
-      email_reconfirmation_html: Om du inte får bekräftelsemeddelandet kan du <a href="%{path}">begära ett nytt</a>
       irreversible: Du kan inte återställa eller återaktivera ditt konto
       more_details_html: För mer information, se <a href="%{terms_path}">integritetspolicyn</a>.
       username_available: Ditt användarnamn kommer att bli tillgängligt igen
@@ -1407,7 +1368,6 @@ sv:
     authentication_methods:
       otp: tvåfaktorsautentiseringsapp
       password: lösenord
-      sign_in_token: e-postsäkerhetskod
       webauthn: säkerhetsnycklar
     description_html: Om du ser aktivitet som du inte känner igen, överväg att byta ditt lösenord och aktivera tvåfaktor-autentisering.
     empty: Ingen autentiseringshistorik tillgänglig
@@ -1418,16 +1378,6 @@ sv:
     unsubscribe:
       action: Ja, avsluta prenumerationen
       complete: Prenumeration avslutad
-      confirmation_html: Är du säker på att du vill avregistrera dig från att ta emot %{type} för Mastodon på %{domain} till din e-post på %{email}? Du kan alltid återprenumerera på dina <a href="%{settings_path}">e-postmeddelandeinställningar</a>.
-      emails:
-        notification_emails:
-          favourite: favoritaviseringsmejl
-          follow: följaviseringsmejl
-          follow_request: följbegärningsmejl
-          mention: aviseringsmejl för inlägg där du nämns
-          reblog: aviseringsmejl för boostade inlägg
-      resubscribe_html: Om du slutat prenumerera av misstag kan du återprenumerera i dina <a href="%{settings_path}">e-postaviseringsinställningar</a>.
-      success_html: Du får inte längre %{type} för Mastodon på %{domain} till din e-post på %{email}.
       title: Avsluta prenumeration
   media_attachments:
     validations:
@@ -1508,8 +1458,6 @@ sv:
     update:
       subject: "%{name} redigerade ett inlägg"
   notifications:
-    administration_emails: Admin e-postaviseringar
-    email_events: Händelser för e-postnotiser
     email_events_hint: 'Välj händelser som du vill ta emot aviseringar för:'
   number:
     human:
@@ -1668,7 +1616,6 @@ sv:
     import: Importera
     import_and_export: Import och export
     migrate: Kontoflytt
-    notifications: E-postaviseringar
     preferences: Inställningar
     profile: Profil
     relationships: Följer och följare
@@ -1915,7 +1862,6 @@ sv:
     invalid_otp_token: Ogiltig tvåfaktorskod
     otp_lost_help_html: Om du förlorat åtkomst till båda kan du komma i kontakt med %{email}
     rate_limited: För många autentiseringsförsök, försök igen senare.
-    seamless_external_login: Du är inloggad via en extern tjänst, inställningar för lösenord och e-post är därför inte tillgängliga.
     signed_in_as: 'Inloggad som:'
   verification:
     extra_instructions_html: <strong>Tips:</strong> Länken på din webbplats kan vara osynlig. Den viktiga delen är <code>rel="me"</code> som förhindrar personifiering på webbplatser med användargenererat innehåll. Du kan även använda en <code>länk</code> tagg i huvudet på sidan istället för <code>en</code>, men HTML:en måste vara tillgänglig utan att exekvera JavaScript.
diff --git a/config/locales/ta.yml b/config/locales/ta.yml
index 3a22b572b11d46..c73148eacac66b 100644
--- a/config/locales/ta.yml
+++ b/config/locales/ta.yml
@@ -25,7 +25,6 @@ ta:
       created_msg: நடுநிலை குறிப்பு வெற்றிகரமாக பதிவு செய்யப்பட்டது!
       destroyed_msg: நடுநிலை குறிப்பு வெற்றிகரமாக அகற்றப்பட்டது!
     accounts:
-      add_email_domain_block: இம்மின்னஞ்சல் களத்தைத் தடுப்புப்பட்டியலில் சேர்
       approve: அங்கீகரி
       are_you_sure: நிச்சயமா?
       avatar: அவதாரம்
@@ -87,7 +86,6 @@ ta:
       reset: மீட்டமைக்கவும்
       reset_password: கடவுச்சொல்லை மீளமைத்திடுக
       search: தேடு
-      search_same_email_domain: இம்மின்னஞ்சல் களத்தில் உள்ள மற்ற பயனர்கள்
       shared_inbox_url: குழு மின்னஞ்சல் முகவரி
       show:
         created_reports: உறுவாக்கிய அறிக்கைகள்
@@ -102,20 +100,17 @@ ta:
       whitelisted: அனுமதிப்பட்டியல்
     action_logs:
       action_types:
-        change_email_user: பயனரின் மின்னஞ்சலை மாற்று
         confirm_user: பயனரை உறுதி செய்
         create_account_warning: எச்சரிக்கையை உருவாக்கு
         create_announcement: அறிவிப்பை உருவாக்கு
         create_custom_emoji: தனிப்பயனான எமோஜியை உருவாக்கு
         create_domain_allow: கள அனுமதியை உருவாக்கு
         create_domain_block: கள முடக்கத்தை உருவாக்கு
-        create_email_domain_block: மின்னஞ்சல் கள முடக்கத்தை உருவாக்கு
         demote_user: பயனரைப் படியிறக்கு
         destroy_announcement: அறிவிப்பை நீக்கு
         destroy_custom_emoji: தனிப்பயனான எமோஜியை நீக்கு
         destroy_domain_allow: கள அனுமதியை நீக்கு
         destroy_domain_block: கள முடக்கத்தை நீக்கு
-        destroy_email_domain_block: மின்னஞ்சல் கள முடக்கத்தை நீக்கு
         destroy_status: பதிவை நீக்கு
         disable_2fa_user: 2FA-வை முடக்கு
         disable_custom_emoji: தனிப்பயனான எமோஜியை முடக்கு
@@ -210,7 +205,6 @@ ta:
     carry_mutes_over_text: இப்பயனர் %{acct}-இலிருந்து நகர்ந்துவிட்டார், அக்கணக்கை நீங்கள் முடக்கியிருந்தீர்கள்.
     copy_account_note_text: 'இப்பயனர் %{acct}-லிருந்து நகர்ந்துவிட்டார், இவரைப் பற்றிய உங்கள் முந்தைய குறிப்புகள் இங்கே:'
   notifications:
-    email_events: மின்னஞ்சல் அறிவிப்புகளுக்கான நிகழ்வுகள்
     email_events_hint: 'எந்த நிகழ்வுகளுக்கு அறிவிப்புகளைப் பெற வேண்டும் என்று தேர்வு செய்க:'
   polls:
     errors:
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 678b5ab638fd2d..735a7bd514b443 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -29,7 +29,6 @@ th:
       created_msg: สร้างหมายเหตุการกลั่นกรองสำเร็จ!
       destroyed_msg: ทำลายหมายเหตุการกลั่นกรองสำเร็จ!
     accounts:
-      add_email_domain_block: ปิดกั้นโดเมนอีเมล
       approve: อนุมัติ
       approved_msg: อนุมัติใบสมัครลงทะเบียนของ %{username} สำเร็จ
       are_you_sure: คุณแน่ใจหรือไม่?
@@ -56,7 +55,6 @@ th:
       demote: ลดขั้น
       destroyed_msg: ตอนนี้จัดคิวเพื่อลบข้อมูลของ %{username} ในเร็ว ๆ นี้แล้ว
       disable: อายัด
-      disable_sign_in_token_auth: ปิดใช้งานการรับรองความถูกต้องด้วยโทเคนอีเมล
       disable_two_factor_authentication: ปิดใช้งาน 2FA
       disabled: อายัดอยู่
       display_name: ชื่อที่แสดง
@@ -65,7 +63,6 @@ th:
       email: อีเมล
       email_status: สถานะอีเมล
       enable: เลิกอายัด
-      enable_sign_in_token_auth: เปิดใช้งานการรับรองความถูกต้องด้วยโทเคนอีเมล
       enabled: เปิดใช้งานอยู่
       enabled_msg: เลิกอายัดบัญชีของ %{username} สำเร็จ
       followers: ผู้ติดตาม
@@ -129,7 +126,6 @@ th:
       resubscribe: บอกรับใหม่
       role: บทบาท
       search: ค้นหา
-      search_same_email_domain: ผู้ใช้อื่น ๆ ที่มีโดเมนอีเมลเดียวกัน
       search_same_ip: ผู้ใช้อื่น ๆ ที่มี IP เดียวกัน
       security: ความปลอดภัย
       security_measures:
@@ -170,26 +166,21 @@ th:
         approve_appeal: อนุมัติการอุทธรณ์
         approve_user: อนุมัติผู้ใช้
         assigned_to_self_report: มอบหมายรายงาน
-        change_email_user: เปลี่ยนอีเมลสำหรับผู้ใช้
         change_role_user: เปลี่ยนบทบาทของผู้ใช้
         confirm_user: ยืนยันผู้ใช้
         create_account_warning: สร้างคำเตือน
         create_announcement: สร้างประกาศ
-        create_canonical_email_block: สร้างการปิดกั้นอีเมล
         create_custom_emoji: สร้างอีโมจิที่กำหนดเอง
         create_domain_allow: สร้างการอนุญาตโดเมน
         create_domain_block: สร้างการปิดกั้นโดเมน
-        create_email_domain_block: สร้างการปิดกั้นโดเมนอีเมล
         create_ip_block: สร้างกฎ IP
         create_unavailable_domain: สร้างโดเมนที่ไม่พร้อมใช้งาน
         create_user_role: สร้างบทบาท
         demote_user: ลดขั้นผู้ใช้
         destroy_announcement: ลบประกาศ
-        destroy_canonical_email_block: ลบการปิดกั้นอีเมล
         destroy_custom_emoji: ลบอีโมจิที่กำหนดเอง
         destroy_domain_allow: ลบการอนุญาตโดเมน
         destroy_domain_block: ลบการปิดกั้นโดเมน
-        destroy_email_domain_block: ลบการปิดกั้นโดเมนอีเมล
         destroy_instance: ล้างข้อมูลโดเมน
         destroy_ip_block: ลบกฎ IP
         destroy_status: ลบโพสต์
@@ -197,10 +188,8 @@ th:
         destroy_user_role: ทำลายบทบาท
         disable_2fa_user: ปิดใช้งาน 2FA
         disable_custom_emoji: ปิดใช้งานอีโมจิที่กำหนดเอง
-        disable_sign_in_token_auth_user: ปิดใช้งานการรับรองความถูกต้องด้วยโทเคนอีเมลสำหรับผู้ใช้
         disable_user: ปิดใช้งานผู้ใช้
         enable_custom_emoji: เปิดใช้งานอีโมจิที่กำหนดเอง
-        enable_sign_in_token_auth_user: เปิดใช้งานการรับรองความถูกต้องด้วยโทเคนอีเมลสำหรับผู้ใช้
         enable_user: เปิดใช้งานผู้ใช้
         memorialize_account: ทำให้บัญชีเป็นอนุสรณ์
         promote_user: เลื่อนขั้นผู้ใช้
@@ -230,26 +219,20 @@ th:
         approve_appeal_html: "%{name} ได้อนุมัติการอุทธรณ์การตัดสินใจในการกลั่นกรองจาก %{target}"
         approve_user_html: "%{name} ได้อนุมัติการลงทะเบียนจาก %{target}"
         assigned_to_self_report_html: "%{name} ได้มอบหมายรายงาน %{target} ให้กับตนเอง"
-        change_email_user_html: "%{name} ได้เปลี่ยนที่อยู่อีเมลของผู้ใช้ %{target}"
         change_role_user_html: "%{name} ได้เปลี่ยนบทบาทของ %{target}"
-        confirm_user_html: "%{name} ได้ยืนยันที่อยู่อีเมลของผู้ใช้ %{target}"
         create_account_warning_html: "%{name} ได้ส่งคำเตือนไปยัง %{target}"
         create_announcement_html: "%{name} ได้สร้างประกาศใหม่ %{target}"
-        create_canonical_email_block_html: "%{name} ได้ปิดกั้นอีเมลที่มีแฮช %{target}"
         create_custom_emoji_html: "%{name} ได้อัปโหลดอีโมจิใหม่ %{target}"
         create_domain_allow_html: "%{name} ได้อนุญาตการติดต่อกับภายนอกกับโดเมน %{target}"
         create_domain_block_html: "%{name} ได้ปิดกั้นโดเมน %{target}"
-        create_email_domain_block_html: "%{name} ได้ปิดกั้นโดเมนอีเมล %{target}"
         create_ip_block_html: "%{name} ได้สร้างกฎสำหรับ IP %{target}"
         create_unavailable_domain_html: "%{name} ได้หยุดการจัดส่งไปยังโดเมน %{target}"
         create_user_role_html: "%{name} ได้สร้างบทบาท %{target}"
         demote_user_html: "%{name} ได้ลดขั้นผู้ใช้ %{target}"
         destroy_announcement_html: "%{name} ได้ลบประกาศ %{target}"
-        destroy_canonical_email_block_html: "%{name} ได้เลิกปิดกั้นอีเมลที่มีแฮช %{target}"
         destroy_custom_emoji_html: "%{name} ได้ลบอีโมจิ %{target}"
         destroy_domain_allow_html: "%{name} ได้ไม่อนุญาตการติดต่อกับภายนอกกับโดเมน %{target}"
         destroy_domain_block_html: "%{name} ได้เลิกปิดกั้นโดเมน %{target}"
-        destroy_email_domain_block_html: "%{name} ได้เลิกปิดกั้นโดเมนอีเมล %{target}"
         destroy_instance_html: "%{name} ได้ล้างข้อมูลโดเมน %{target}"
         destroy_ip_block_html: "%{name} ได้ลบกฎสำหรับ IP %{target}"
         destroy_status_html: "%{name} ได้เอาโพสต์โดย %{target} ออก"
@@ -257,10 +240,8 @@ th:
         destroy_user_role_html: "%{name} ได้ลบบทบาท %{target}"
         disable_2fa_user_html: "%{name} ได้ปิดใช้งานความต้องการสองปัจจัยสำหรับผู้ใช้ %{target}"
         disable_custom_emoji_html: "%{name} ได้ปิดใช้งานอีโมจิ %{target}"
-        disable_sign_in_token_auth_user_html: "%{name} ได้ปิดใช้งานการรับรองความถูกต้องด้วยโทเคนอีเมลสำหรับ %{target}"
         disable_user_html: "%{name} ได้ปิดใช้งานการเข้าสู่ระบบสำหรับผู้ใช้ %{target}"
         enable_custom_emoji_html: "%{name} ได้เปิดใช้งานอีโมจิ %{target}"
-        enable_sign_in_token_auth_user_html: "%{name} ได้เปิดใช้งานการรับรองความถูกต้องด้วยโทเคนอีเมลสำหรับ %{target}"
         enable_user_html: "%{name} ได้เปิดใช้งานการเข้าสู่ระบบสำหรับผู้ใช้ %{target}"
         memorialize_account_html: "%{name} ได้เปลี่ยนบัญชีของ %{target} เป็นหน้าอนุสรณ์"
         promote_user_html: "%{name} ได้เลื่อนขั้นผู้ใช้ %{target}"
@@ -268,7 +249,6 @@ th:
         reject_user_html: "%{name} ได้ปฏิเสธการลงทะเบียนจาก %{target}"
         remove_avatar_user_html: "%{name} ได้เอาภาพประจำตัวของ %{target} ออก"
         reopen_report_html: "%{name} ได้เปิดรายงาน %{target} ใหม่"
-        resend_user_html: "%{name} ได้ส่งอีเมลการยืนยันสำหรับ %{target} ใหม่"
         reset_password_user_html: "%{name} ได้ตั้งรหัสผ่านของผู้ใช้ %{target} ใหม่"
         resolve_report_html: "%{name} ได้แก้ปัญหารายงาน %{target}"
         sensitive_account_html: "%{name} ได้ทำเครื่องหมายสื่อของ %{target} ว่าละเอียดอ่อน"
@@ -424,7 +404,6 @@ th:
       allow_registrations_with_approval: อนุญาตการลงทะเบียนด้วยการอนุมัติ
       attempts_over_week:
         other: "%{count} ความพยายามในการลงทะเบียนในช่วงสัปดาห์ที่ผ่านมา"
-      created_msg: ปิดกั้นโดเมนอีเมลสำเร็จ
       delete: ลบ
       dns:
         types:
@@ -433,12 +412,8 @@ th:
       new:
         create: เพิ่มโดเมน
         resolve: แปลงที่อยู่โดเมน
-        title: ปิดกั้นโดเมนอีเมลใหม่
-      no_email_domain_block_selected: ไม่มีการเปลี่ยนแปลงการปิดกั้นโดเมนอีเมลเนื่องจากไม่มีการเลือก
       not_permitted: ไม่ได้รับอนุญาต
-      resolved_dns_records_hint_html: ชื่อโดเมนแปลงที่อยู่เป็นโดเมน MX ดังต่อไปนี้ ซึ่งท้ายที่สุดแล้วจะรับผิดชอบสำหรับการยอมรับอีเมล การปิดกั้นโดเมน MX จะปิดกั้นการลงทะเบียนจากที่อยู่อีเมลใด ๆ ซึ่งใช้โดเมน MX เดียวกัน แม้ว่าชื่อโดเมนที่ปรากฏจะแตกต่างกันก็ตาม <strong>ระวังอย่าปิดกั้นผู้ให้บริการอีเมลรายใหญ่</strong>
       resolved_through_html: แปลงที่อยู่ผ่าน %{domain}
-      title: โดเมนอีเมลที่ปิดกั้นอยู่
     export_domain_allows:
       new:
         title: นำเข้าการอนุญาตโดเมน
@@ -588,7 +563,6 @@ th:
         resolve_description_html: จะไม่ใช้การกระทำต่อบัญชีที่รายงาน ไม่มีการบันทึกการดำเนินการ และจะปิดรายงาน
         silence_description_html: บัญชีจะปรากฏแก่เฉพาะผู้ที่ติดตามโปรไฟล์อยู่แล้วหรือค้นหาโปรไฟล์ด้วยตนเองเท่านั้น จำกัดการเข้าถึงของโปรไฟล์อย่างมาก สามารถแปลงกลับได้เสมอ ปิดรายงานต่อบัญชีนี้ทั้งหมด
         suspend_description_html: บัญชีและเนื้อหาของบัญชีทั้งหมดจะเข้าถึงไม่ได้และได้รับการลบในที่สุด และการโต้ตอบกับบัญชีจะเป็นไปไม่ได้ แปลงกลับได้ภายใน 30 วัน ปิดรายงานต่อบัญชีนี้ทั้งหมด
-      actions_description_html: ตัดสินใจว่าการกระทำใดที่จะใช้เพื่อแก้ปัญหารายงานนี้ หากคุณใช้การกระทำที่เป็นการลงโทษต่อบัญชีที่รายงาน จะส่งการแจ้งเตือนอีเมลถึงเขา ยกเว้นเมื่อมีการเลือกหมวดหมู่ <strong>สแปม</strong>
       actions_description_remote_html: ตัดสินใจว่าการกระทำใดที่จะใช้เพื่อแก้ปัญหารายงานนี้ นี่จะมีผลต่อวิธีที่เซิร์ฟเวอร์ <strong>ของคุณ</strong> สื่อสารกับบัญชีระยะไกลนี้และจัดการเนื้อหาของบัญชีเท่านั้น
       add_to_report: เพิ่มข้อมูลเพิ่มเติมไปยังรายงาน
       already_suspended_badges:
@@ -653,7 +627,6 @@ th:
         delete_data_html: ลบโปรไฟล์และเนื้อหาของ <strong>@%{acct}</strong> ในอีก 30 วันนับจากนี้เว้นแต่มีการเลิกระงับเขาในระหว่างนี้
         preview_preamble_html: "<strong>@%{acct}</strong> จะได้รับคำเตือนโดยมีเนื้อหาดังต่อไปนี้:"
         record_strike_html: บันทึกการดำเนินการต่อ <strong>@%{acct}</strong> เพื่อช่วยให้คุณเลื่อนระดับการละเมิดในอนาคตจากบัญชีนี้
-        send_email_html: ส่งอีเมลคำเตือนถึง <strong>@%{acct}</strong>
         warning_placeholder: การให้เหตุผลเพิ่มเติมที่ไม่จำเป็นสำหรับการกระทำการกลั่นกรอง
       target_origin: จุดเริ่มต้นของบัญชีที่ได้รับการรายงาน
       title: รายงาน
@@ -691,7 +664,6 @@ th:
         manage_appeals: จัดการการอุทธรณ์
         manage_appeals_description: อนุญาตให้ผู้ใช้ตรวจทานการอุทธรณ์ต่อการกระทำการกลั่นกรอง
         manage_blocks: จัดการการปิดกั้น
-        manage_blocks_description: อนุญาตให้ผู้ใช้ปิดกั้นผู้ให้บริการอีเมลและที่อยู่ IP
         manage_custom_emojis: จัดการอีโมจิที่กำหนดเอง
         manage_custom_emojis_description: อนุญาตให้ผู้ใช้จัดการอีโมจิที่กำหนดเองในเซิร์ฟเวอร์
         manage_federation: จัดการการติดต่อกับภายนอก
@@ -709,7 +681,6 @@ th:
         manage_taxonomies: จัดการอนุกรมวิธาน
         manage_taxonomies_description: อนุญาตให้ผู้ใช้ตรวจทานเนื้อหาที่กำลังนิยมและอัปเดตการตั้งค่าแฮชแท็ก
         manage_user_access: จัดการการเข้าถึงของผู้ใช้
-        manage_user_access_description: อนุญาตให้ผู้ใช้ปิดใช้งานการรับรองความถูกต้องด้วยสองปัจจัยของผู้ใช้อื่น เปลี่ยนที่อยู่อีเมลของเขา และตั้งรหัสผ่านของเขาใหม่
         manage_users: จัดการผู้ใช้
         manage_users_description: อนุญาตให้ผู้ใช้ดูรายละเอียดของผู้ใช้อื่น ๆ และทำการกระทำการกลั่นกรองต่อผู้ใช้เหล่านั้น
         manage_webhooks: จัดการเว็บฮุค
@@ -784,7 +755,6 @@ th:
       destroyed_msg: ลบการอัปโหลดไซต์สำเร็จ!
     software_updates:
       critical_update: สำคัญ — โปรดอัปเดตอย่างรวดเร็ว
-      description: ขอแนะนำให้ทำให้การติดตั้ง Mastodon ของคุณทันสมัยอยู่เสมอเพื่อรับประโยชน์จากการแก้ไขและคุณลักษณะล่าสุด ยิ่งไปกว่านั้น บางครั้งก็เป็นสิ่งสำคัญที่จะอัปเดต Mastodon อย่างทันท่วงทีเพื่อหลีกเลี่ยงปัญหาความปลอดภัย ด้วยเหตุผลเหล่านี้ Mastodon จึงตรวจสอบการอัปเดตทุก 30 นาที และจะแจ้งเตือนคุณตามการกำหนดลักษณะการแจ้งเตือนอีเมลของคุณ
       documentation_link: เรียนรู้เพิ่มเติม
       release_notes: บันทึกประจำรุ่น
       title: การอัปเดตที่พร้อมใช้งาน
@@ -871,7 +841,21 @@ th:
         action: ตรวจสอบที่นี่สำหรับข้อมูลเพิ่มเติม
         message_html: "<strong>ที่เก็บข้อมูลวัตถุของคุณกำหนดค่าไม่ถูกต้อง ความเป็นส่วนตัวของผู้ใช้ของคุณตกอยู่ในความเสี่ยง</strong>"
     tags:
+      moderation:
+        not_usable: ไม่สามารถใช้งานได้
+        pending_review: การตรวจทานที่รอดำเนินการ
+        review_requested: ต้องการการตรวจทาน
+        reviewed: ตรวจทานแล้ว
+        title: สถานะ
+        unreviewed: ไม่ได้รับการตรวจทาน
+        usable: ใช้งานได้
+      name: ชื่อ
+      newest: ใหม่ที่สุด
+      oldest: เก่าที่สุด
+      reset: รีเซ็ต
       review: สถานะการตรวจทาน
+      search: ค้นหา
+      title: แฮชแท็ก
       updated_msg: อัปเดตการตั้งค่าแฮชแท็กสำเร็จ
     title: การดูแล
     trends:
@@ -933,7 +917,6 @@ th:
         usage_comparison: ใช้ %{today} ครั้งวันนี้ เทียบกับ %{yesterday} เมื่อวานนี้
         used_by_over_week:
           other: ใช้โดย %{count} คนในช่วงสัปดาห์ที่ผ่านมา
-      title: แนวโน้ม
       trending: กำลังนิยม
     warning_presets:
       add_new: เพิ่มใหม่
@@ -1017,9 +1000,7 @@ th:
       guide_link_text: ทุกคนสามารถมีส่วนร่วม
     sensitive_content: เนื้อหาที่ละเอียดอ่อน
   application_mailer:
-    notification_preferences: เปลี่ยนการกำหนดลักษณะอีเมล
     salutation: "%{name},"
-    settings: 'เปลี่ยนการกำหนดลักษณะอีเมล: %{link}'
     unsubscribe: เลิกบอกรับ
     view: 'มุมมอง:'
     view_profile: ดูโปรไฟล์
@@ -1039,7 +1020,6 @@ th:
       hint_html: อีกเพียงหนึ่งสิ่งเพิ่มเติม! เราจำเป็นต้องยืนยันว่าคุณเป็นมนุษย์ (นี่ก็เพื่อให้เราสามารถกันสแปมออกไป!) แก้ CAPTCHA ด้านล่างและคลิก "ดำเนินการต่อ"
       title: การตรวจสอบความปลอดภัย
     confirmations:
-      awaiting_review: ยืนยันที่อยู่อีเมลของคุณแล้ว! ตอนนี้พนักงานของ %{domain} กำลังตรวจทานการลงทะเบียนของคุณ คุณจะได้รับอีเมลหากพนักงานอนุมัติบัญชีของคุณ!
       awaiting_review_title: กำลังตรวจทานการลงทะเบียนของคุณ
       clicking_this_link: คลิกลิงก์นี้
       login_link: เข้าสู่ระบบ
@@ -1047,7 +1027,6 @@ th:
       redirect_to_app_html: คุณควรได้รับการเปลี่ยนเส้นทางไปยังแอป <strong>%{app_name}</strong> หากนั่นไม่เกิดขึ้น ลอง %{clicking_this_link} หรือกลับไปยังแอปด้วยตนเอง
       registration_complete: ตอนนี้การลงทะเบียนของคุณใน %{domain} เสร็จสมบูรณ์แล้ว!
       welcome_title: ยินดีต้อนรับ %{name}!
-      wrong_email_hint: หากที่อยู่อีเมลนั้นไม่ถูกต้อง คุณสามารถเปลี่ยนที่อยู่อีเมลได้ในการตั้งค่าบัญชี
     delete_account: ลบบัญชี
     delete_account_html: หากคุณต้องการลบบัญชีของคุณ คุณสามารถ <a href="%{path}">ดำเนินการต่อที่นี่</a> คุณจะได้รับการถามเพื่อการยืนยัน
     description:
@@ -1068,7 +1047,6 @@ th:
     or_log_in_with: หรือเข้าสู่ระบบด้วย
     privacy_policy_agreement_html: ฉันได้อ่านและเห็นด้วยกับ <a href="%{privacy_policy_path}" target="_blank">นโยบายความเป็นส่วนตัว</a>
     progress:
-      confirm: ยืนยันอีเมล
       details: รายละเอียดของคุณ
       review: การตรวจทานของเรา
       rules: ยอมรับกฎ
@@ -1090,10 +1068,8 @@ th:
     security: ความปลอดภัย
     set_new_password: ตั้งรหัสผ่านใหม่
     setup:
-      email_below_hint_html: ตรวจสอบโฟลเดอร์สแปมของคุณ หรือขออีเมลอื่น คุณสามารถแก้ไขที่อยู่อีเมลของคุณหากที่อยู่อีเมลผิด
       email_settings_hint_html: คลิกลิงก์ที่เราส่งถึงคุณเพื่อยืนยัน %{email} เราจะรออยู่ตรงนี้
       link_not_received: ไม่ได้รับลิงก์?
-      new_confirmation_instructions_sent: คุณจะได้รับอีเมลใหม่พร้อมลิงก์การยืนยันในไม่กี่นาที!
       title: ตรวจสอบกล่องขาเข้าของคุณ
     sign_in:
       preamble_html: เข้าสู่ระบบด้วยข้อมูลประจำตัว <strong>%{domain}</strong> ของคุณ หากบัญชีของคุณได้รับการโฮสต์ในเซิร์ฟเวอร์อื่น คุณจะไม่สามารถเข้าสู่ระบบได้ที่นี่
@@ -1104,9 +1080,7 @@ th:
       title: มาตั้งค่าของคุณใน %{domain} กันเลย
     status:
       account_status: สถานะบัญชี
-      confirming: กำลังรอการยืนยันอีเมลให้เสร็จสมบูรณ์
       functional: บัญชีของคุณทำงานได้อย่างเต็มที่
-      pending: ใบสมัครของคุณกำลังรอดำเนินการตรวจทานโดยพนักงานของเรา นี่อาจใช้เวลาสักครู่ คุณจะได้รับอีเมลหากมีการอนุมัติใบสมัครของคุณ
       redirecting_to: บัญชีของคุณไม่ได้ใช้งานเนื่องจากบัญชีกำลังเปลี่ยนเส้นทางไปยัง %{acct} ในปัจจุบัน
       self_destruct: เนื่องจาก %{domain} กำลังปิดตัวลง คุณจะได้รับการเข้าถึงบัญชีของคุณแบบจำกัดเท่านั้น
       view_strikes: ดูการดำเนินการที่ผ่านมาต่อบัญชีของคุณ
@@ -1149,9 +1123,6 @@ th:
       before: 'ก่อนดำเนินการต่อ โปรดอ่านหมายเหตุเหล่านี้อย่างระมัดระวัง:'
       caches: เนื้อหาที่ได้รับการแคชโดยเซิร์ฟเวอร์อื่น ๆ อาจยังคงอยู่
       data_removal: จะเอาโพสต์และข้อมูลอื่น ๆ ของคุณออกโดยถาวร
-      email_change_html: คุณสามารถ <a href="%{path}">เปลี่ยนที่อยู่อีเมลของคุณ</a> ได้โดยไม่ต้องลบบัญชีของคุณ
-      email_contact_html: หากอีเมลยังคงมาไม่ถึง คุณสามารถส่งอีเมลถึง <a href="mailto:%{email}">%{email}</a> สำหรับความช่วยเหลือ
-      email_reconfirmation_html: หากคุณไม่ได้รับอีเมลการยืนยัน คุณสามารถ <a href="%{path}">ขออีเมลอีกครั้ง</a>
       irreversible: คุณจะไม่สามารถคืนค่าหรือเปิดใช้งานบัญชีของคุณใหม่
       more_details_html: สำหรับรายละเอียดเพิ่มเติม ดู <a href="%{terms_path}">นโยบายความเป็นส่วนตัว</a>
       username_available: ชื่อผู้ใช้ของคุณจะพร้อมใช้งานอีกครั้ง
@@ -1376,7 +1347,6 @@ th:
     authentication_methods:
       otp: แอปการรับรองความถูกต้องด้วยสองปัจจัย
       password: รหัสผ่าน
-      sign_in_token: รหัสความปลอดภัยอีเมล
       webauthn: กุญแจความปลอดภัย
     description_html: หากคุณเห็นกิจกรรมที่คุณไม่รู้จัก พิจารณาเปลี่ยนรหัสผ่านของคุณและเปิดใช้งานการรับรองความถูกต้องด้วยสองปัจจัย
     empty: ไม่มีประวัติการรับรองความถูกต้อง
@@ -1387,16 +1357,6 @@ th:
     unsubscribe:
       action: ใช่ เลิกบอกรับ
       complete: เลิกบอกรับแล้ว
-      confirmation_html: คุณแน่ใจหรือไม่ว่าต้องการเลิกบอกรับจากการรับ %{type} สำหรับ Mastodon ใน %{domain} ไปยังอีเมลของคุณที่ %{email}? คุณสามารถบอกรับใหม่ได้เสมอจาก <a href="%{settings_path}">การตั้งค่าการแจ้งเตือนอีเมล</a> ของคุณ
-      emails:
-        notification_emails:
-          favourite: อีเมลการแจ้งเตือนการชื่นชอบ
-          follow: อีเมลการแจ้งเตือนการติดตาม
-          follow_request: อีเมลคำขอติดตาม
-          mention: อีเมลการแจ้งเตือนการกล่าวถึง
-          reblog: อีเมลการแจ้งเตือนการดัน
-      resubscribe_html: หากคุณได้เลิกบอกรับโดยไม่ได้ตั้งใจ คุณสามารถบอกรับใหม่ได้จาก <a href="%{settings_path}">การตั้งค่าการแจ้งเตือนอีเมล</a> ของคุณ
-      success_html: คุณจะไม่ได้รับ %{type} สำหรับ Mastodon ใน %{domain} ไปยังอีเมลของคุณที่ %{email} อีกต่อไป
       title: เลิกบอกรับ
   media_attachments:
     validations:
@@ -1477,8 +1437,6 @@ th:
     update:
       subject: "%{name} ได้แก้ไขโพสต์"
   notifications:
-    administration_emails: การแจ้งเตือนอีเมลผู้ดูแล
-    email_events: เหตุการณ์สำหรับการแจ้งเตือนอีเมล
     email_events_hint: 'เลือกเหตุการณ์ที่คุณต้องการรับการแจ้งเตือน:'
   number:
     human:
@@ -1637,7 +1595,6 @@ th:
     import: การนำเข้า
     import_and_export: การนำเข้าและการส่งออก
     migrate: การโยกย้ายบัญชี
-    notifications: การแจ้งเตือนทางอีเมล
     preferences: การกำหนดลักษณะ
     profile: โปรไฟล์สาธารณะ
     relationships: การติดตามและผู้ติดตาม
@@ -1877,7 +1834,6 @@ th:
     invalid_otp_token: รหัสสองปัจจัยไม่ถูกต้อง
     otp_lost_help_html: หากคุณสูญเสียการเข้าถึงทั้งสองอย่าง คุณสามารถติดต่อ %{email}
     rate_limited: มีความพยายามในการรับรองความถูกต้องมากเกินไป ลองอีกครั้งในภายหลัง
-    seamless_external_login: คุณได้เข้าสู่ระบบผ่านบริการภายนอก ดังนั้นจึงไม่มีการตั้งค่ารหัสผ่านและอีเมล
     signed_in_as: 'ลงชื่อเข้าเป็น:'
   verification:
     extra_instructions_html: <strong>เคล็ดลับ:</strong> ลิงก์ในเว็บไซต์ของคุณสามารถเป็นแบบมองไม่เห็น ส่วนที่สำคัญคือ <code>rel="me"</code> ซึ่งป้องกันการแอบอ้างในเว็บไซต์ที่มีเนื้อหาที่ผู้ใช้สร้างขึ้น คุณยังสามารถใช้แท็ก <code>link</code> ในส่วนหัวของหน้าแทนที่จะเป็น <code>a</code> แต่ HTML ต้องเข้าถึงได้โดยไม่มีการประมวลผล JavaScript
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index dac16917f5b05d..7530b12a92eb8d 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -31,7 +31,6 @@ tr:
       created_msg: Denetim notu başarıyla oluşturuldu!
       destroyed_msg: Denetim notu başarıyla yok edildi!
     accounts:
-      add_email_domain_block: E-posta alan adını engelle
       approve: Onayla
       approved_msg: "%{username} adlı kullanıcının kayıt başvurusu başarıyla onaylandı"
       are_you_sure: Emin misin?
@@ -58,7 +57,6 @@ tr:
       demote: Düşür
       destroyed_msg: "%{username} adlı kullanıcının verilerinin silinmesi sıraya alındı"
       disable: Dondur
-      disable_sign_in_token_auth: E-posta token doğrulamayı devre dışı bırak
       disable_two_factor_authentication: 2 aşamalı doğrulamayı kapat
       disabled: Kapalı
       display_name: Görünen isim
@@ -67,7 +65,6 @@ tr:
       email: E-posta
       email_status: E-posta durumu
       enable: Etkinleştir
-      enable_sign_in_token_auth: E-posta token doğrulamayı etkinleştir
       enabled: Etkin
       enabled_msg: "%{username} hesabı başarıyla çözüldü"
       followers: Takipçi
@@ -132,7 +129,6 @@ tr:
       resubscribe: Yeniden abone ol
       role: Rol
       search: Ara
-      search_same_email_domain: Aynı e-posta alan adına sahip diğer kullanıcılar
       search_same_ip: Aynı IP adresine sahip diğer kullanıcılar
       security: Güvenlik
       security_measures:
@@ -173,26 +169,21 @@ tr:
         approve_appeal: İtirazı Onayla
         approve_user: Kullanıcıyı Onayla
         assigned_to_self_report: Raporu Ata
-        change_email_user: Kullanıcı E-postasını Değiştir
         change_role_user: Kullanıcının Rolünü Değiştir
         confirm_user: Kullanıcıyı Onayla
         create_account_warning: Uyarı Oluştur
         create_announcement: Duyuru Oluştur
-        create_canonical_email_block: E-posta Engeli Oluştur
         create_custom_emoji: Özel İfade Oluştur
         create_domain_allow: İzin Verilen Alan Adı Oluştur
         create_domain_block: Engellenen Alan Adı Oluştur
-        create_email_domain_block: E-Posta Alan Adı Engeli Oluştur
         create_ip_block: IP kuralı oluştur
         create_unavailable_domain: Mevcut Olmayan Alan Adı Oluştur
         create_user_role: Rol Oluştur
         demote_user: Kullanıcıyı Düşür
         destroy_announcement: Duyuru Sil
-        destroy_canonical_email_block: E-Posta Engelini Sil
         destroy_custom_emoji: Özel İfadeyi Sil
         destroy_domain_allow: İzin Verilen Alan Adını Sil
         destroy_domain_block: Engellenen Alan Adını Sil
-        destroy_email_domain_block: E-posta alan adı engelini sil
         destroy_instance: Alan adını temizle
         destroy_ip_block: IP kuralını sil
         destroy_status: Durumu Sil
@@ -200,10 +191,8 @@ tr:
         destroy_user_role: Rolü Kaldır
         disable_2fa_user: 2AD Kapat
         disable_custom_emoji: Özel İfadeyi Devre Dışı Bırak
-        disable_sign_in_token_auth_user: Kullanıcı için E-posta Token Doğrulamayı devre dışı bırak
         disable_user: Kullanıcıyı Devre Dışı Bırak
         enable_custom_emoji: Özel İfadeyi Etkinleştir
-        enable_sign_in_token_auth_user: Kullanıcı için E-posta Token Doğrulamayı etkinleştir
         enable_user: Kullanıcıyı Etkinleştir
         memorialize_account: Hesabı Anıtlaştır
         promote_user: Kullanıcıyı Yükselt
@@ -233,26 +222,20 @@ tr:
         approve_appeal_html: "%{name}, %{target} kullanıcısının yönetim kararına itirazını kabul etti"
         approve_user_html: "%{name}, %{target} konumundan kaydı onayladı"
         assigned_to_self_report_html: "%{name} kendilerine %{target} adlı raporu verdi"
-        change_email_user_html: "%{name}, %{target} kullanıcısının e-posta adresini değiştirdi"
         change_role_user_html: "%{name}, %{target} kişisinin rolünü değiştirdi"
-        confirm_user_html: "%{name} %{target} kullanıcısının e-posta adresini onayladı"
         create_account_warning_html: "%{name} %{target} 'a bir uyarı gönderdi"
         create_announcement_html: "%{name}, yeni %{target} duyurusunu oluşturdu"
-        create_canonical_email_block_html: "%{name}, %{target} karmasıyla e-posta engelledi"
         create_custom_emoji_html: "%{name} yeni %{target} ifadesini yükledi"
         create_domain_allow_html: "%{name}, %{target} alan adıyla birliğe izin verdi"
         create_domain_block_html: "%{name}, %{target} alan adını engelledi"
-        create_email_domain_block_html: "%{name}, %{target} e-posta alan adını engelledi"
         create_ip_block_html: "%{name}, %{target} IP adresi için kural oluşturdu"
         create_unavailable_domain_html: "%{name}, %{target} alan adına teslimatı durdurdu"
         create_user_role_html: "%{name}, %{target} rolünü oluşturdu"
         demote_user_html: "%{name}, %{target} kullanıcısını düşürdü"
         destroy_announcement_html: "%{name}, %{target} duyurusunu sildi"
-        destroy_canonical_email_block_html: "%{name}, %{target} karmasıyla e-posta engelini kaldırdı"
         destroy_custom_emoji_html: "%{name}, %{target} ifadesini sildi"
         destroy_domain_allow_html: "%{name}, %{target} alan adıyla birlik iznini kaldırdı"
         destroy_domain_block_html: "%{name}, %{target} alan adı engelini kaldırdı"
-        destroy_email_domain_block_html: "%{name}, %{target} e-posta alan adı engelini kaldırdı"
         destroy_instance_html: "%{name}, %{target} alan adını temizledi"
         destroy_ip_block_html: "%{name}, %{target} IP adresi kuralını sildi"
         destroy_status_html: "%{name}, %{target} kullanıcısının gönderisini kaldırdı"
@@ -260,10 +243,8 @@ tr:
         destroy_user_role_html: "%{name}, %{target} rolünü sildi"
         disable_2fa_user_html: "%{name}, %{target} kullanıcısının iki aşamalı doğrulama gereksinimini kapattı"
         disable_custom_emoji_html: "%{name}, %{target} emojisini devre dışı bıraktı"
-        disable_sign_in_token_auth_user_html: "%{name}, %{target} için e-posta token doğrulamayı devre dışı bıraktı"
         disable_user_html: "%{name}, %{target} kullanıcısı için oturum açmayı devre dışı bıraktı"
         enable_custom_emoji_html: "%{name}, %{target} emojisini etkinleştirdi"
-        enable_sign_in_token_auth_user_html: "%{name}, %{target} için e-posta token doğrulamayı etkinleştirdi"
         enable_user_html: "%{name}, %{target} kullanıcısı için oturum açmayı etkinleştirdi"
         memorialize_account_html: "%{name}, %{target} kullanıcısının hesabını bir anıt sayfaya dönüştürdü"
         promote_user_html: "%{name}, %{target} kullanıcısını yükseltti"
@@ -271,7 +252,6 @@ tr:
         reject_user_html: "%{name}, %{target} konumundan kaydı reddetti"
         remove_avatar_user_html: "%{name}, %{target} kullanıcısının avatarını kaldırdı"
         reopen_report_html: "%{name}, %{target} şikayetini yeniden açtı"
-        resend_user_html: "%{name}, %{target} için doğrulama e-postasını tekrar gönderdi"
         reset_password_user_html: "%{name}, %{target} kullanıcısının parolasını sıfırladı"
         resolve_report_html: "%{name}, %{target} şikayetini çözdü"
         sensitive_account_html: "%{name}, %{target} kullanıcısının medyasını hassas olarak işaretledi"
@@ -417,7 +397,7 @@ tr:
       obfuscate: Alan adını gizle
       obfuscate_hint: Alan adı kısıtlamaları listelerinin duyurulması etkinleştirilmişse alan adını listede kısmen gizle
       private_comment: Özel yorum
-      private_comment_hint: Denetleyiciler tarafından dahili kullanım için bu alan adı sınırlaması hakkında yorum.
+      private_comment_hint: Moderatörler tarafından dahili kullanım için bu alan adı sınırlaması hakkında yorum.
       public_comment: Genel yorum
       public_comment_hint: Eğer alan adı sınırlamaları listesinin tanıtılması etkinleştirilmişse, genel kullanım için bu alan adı sınırlaması hakkında yorum.
       reject_media: Medya dosyalarını reddet
@@ -432,7 +412,6 @@ tr:
       attempts_over_week:
         one: Son haftada %{count} deneme
         other: Son haftada %{count} kayıt denemesi
-      created_msg: E-posta alan adı kara listeye başarıyla eklendi
       delete: Sil
       dns:
         types:
@@ -441,12 +420,8 @@ tr:
       new:
         create: Alan adı ekle
         resolve: Alan adı çözümleme
-        title: Yeni e-posta kara liste girişi
-      no_email_domain_block_selected: Seçim yapılmadığından hiç bir e-posta alan adı engeli değiştirilmedi
       not_permitted: İzin verilmedi
-      resolved_dns_records_hint_html: Alan adı aşağıdaki MX alan adlarına çözümleniyor, ancak hiç biri nihayetinde e-posta kabulünden sorum değil. Bir MX alan adını engellemek, görünen alan adı farklı osa bile aynı MX alan adını kullanan e-posta adreslerinden gelen kayıtları engelleyecektir. <strong>Başlıca e-posta sağlayıcıları engellememek için dikkatli olun.</strong>
       resolved_through_html: "%{domain} aracılığıyla çözümlendi"
-      title: E-posta kara listesi
     export_domain_allows:
       new:
         title: Alan adı engellerini içe aktar
@@ -600,7 +575,6 @@ tr:
         resolve_description_html: Bildirilen hesap için bir şey yapılmayacak, eylem kaydedilmeyecek ve bildirim kapatılacak.
         silence_description_html: Bu hesap sadece halihazırda takip edenler ve elle bakanlarca görünecek, böylece erişimi ciddi bir şekilde kısıtlanacak. Her zaman geri alınabilir. Bu hesaba yönelik tüm bildirimleri kapatır.
         suspend_description_html: Bu hesap ve tüm içeriği erişilmez olacak ve nihayetinde silinecek ve bu hesapla etkileşim mümkün olmayacaktır. 30 gün içinde geri alınabilir. Bu hesaba yönelik tüm bildiriimleri kapatır.
-      actions_description_html: Bu bildirimi çözmek için ne yapılması gerektiğine karar verin. Bildirilen hesap için ceza işlemi yaparsanız, <strong>İstenmeyen</strong> kategorisi seçilmemişse, onlara bir e-posta duyurusu gönderilecektir.
       actions_description_remote_html: Bu bildirimi çözmek için hangi eylemi yapmak istediğinize karar verin. Bu yalnızca <strong>sizin</strong> sunucunuzun bu uzak hesapla nasıl etkileşeğini ve içeriğiyle ne yapacağını etkiler.
       add_to_report: Bildirime daha fazlasını ekle
       already_suspended_badges:
@@ -608,7 +582,7 @@ tr:
         remote: Sunucularında zaten askıya alınmış
       are_you_sure: Emin misiniz?
       assign_to_self: Bana ata
-      assigned: Denetleyici atandı
+      assigned: Atanan moderatör
       by_target_domain: Şikayet edilen hesabın alan adı
       cancel: İptal et
       category: Kategori
@@ -665,7 +639,6 @@ tr:
         delete_data_html: İlgili sürede askıdan alınması kaldırılmazsa <strong>@%{acct}</strong> hesabının profilini ve içeriğini şu andan itibaren 30 gün içinde sil
         preview_preamble_html: "<strong>@%{acct}</strong> aşağıdaki içerikle bir uyarı alacaktır:"
         record_strike_html: "<strong>@%{acct}</strong> hesabına karşı bir eylem kaydet, böylece bu hesabın gelecekteki ihlallerini üst makama taşımanıza yardımcı olacaktır"
-        send_email_html: "<strong>@%{acct}</strong> adlı kullanıcıya uyarı e-maili gönder"
         warning_placeholder: İsteğe bağlı ek nedenden denetim eylemi.
       target_origin: Şikayet edilen hesabın kökeni
       title: Şikayetler
@@ -705,7 +678,6 @@ tr:
         manage_appeals: İtirazları Yönetme
         manage_appeals_description: Kullanıcıların denetleme eylemlerine itirazları gözden geçirmesine izin verir
         manage_blocks: Engelleri Yönetme
-        manage_blocks_description: Kullanıcıların e-posta sağlayıcıları ve IP adreslerini engellemesine izin verir
         manage_custom_emojis: Özel İfadeleri Yönetme
         manage_custom_emojis_description: Kullanıcıların sunucudaki özel ifadeleri yönetmesine izin verir
         manage_federation: Birleştirme Yönetme
@@ -723,7 +695,6 @@ tr:
         manage_taxonomies: Kategorileri Yönetme
         manage_taxonomies_description: Kullanıcıların öne çıkan içeriği incelemesine ve etiket ayarlarını güncellemesine izin verir
         manage_user_access: Kullanıcı Erişimini Yönetme
-        manage_user_access_description: Kullanıcıların, diğer kullanıcıların işi aşamalı yetkilendirme, e-posta adreslerini değiştirme ve parolalarını sıfırlama eylemlerini etkisizleştirmesine izin verir
         manage_users: Kullanıcıları Yönetme
         manage_users_description: Kullanıcıların, diğer kullanıcıların ayrıntılarını görüntülemesine ve onlara karşı denetim eylemleri gerçekleştirmesine izin verir
         manage_webhooks: Webhookları Yönetme
@@ -798,7 +769,6 @@ tr:
       destroyed_msg: Site yüklemesi başarıyla silindi!
     software_updates:
       critical_update: Kritik — lütfen hemen güncelleyin
-      description: Son düzeltme ve özelliklerden yararlanmak için Mastodon kurulumunu güncel tutmanızı öneriyoruz. Üstelik güvenlik sorunlarından kaçınmak için Mastodon'u zamanında güncellemek kritiktir. Bu nedenlerle Mastodon her 30 dakikada bir güncellemeleri denetler ve e-posta bildirim seçeneğinize göre size haber verir.
       documentation_link: Daha fazlası
       release_notes: Sürüm notları
       title: Mevcut güncellemeler
@@ -907,10 +877,16 @@ tr:
     trends:
       allow: İzin ver
       approved: Onaylandı
+      confirm_allow: Seçili etiketlere izin vermek istediğinizden emin misiniz?
+      confirm_disallow: Seçili etiketlerin iznini kaldırmak istediğinizden emin misiniz?
       disallow: İzin verme
       links:
         allow: Bağlantıya izin ver
         allow_provider: Yayıncıya izin ver
+        confirm_allow: Seçili bağlantılara izin vermek istediğinizden emin misiniz?
+        confirm_allow_provider: Seçili sağlayıcılara izin vermek istediğinizden emin misiniz?
+        confirm_disallow: Seçili bağlantıların iznini kaldırmak istediğinizden emin misiniz?
+        confirm_disallow_provider: Seçili sağlayıcıların iznini kaldırmak istediğinizden emin misiniz?
         description_html: Bu bağlantılar şu anda sunucunuzun gönderilerini gördüğü hesaplarca bolca paylaşılıyor. Kullanıcılarınızın dünyada neler olduğunu görmesine yardımcı olabilir. Yayıncıyı onaylamadığınız sürece hiçbir bağlantı herkese açık yayınlanmaz. Tekil bağlantıları onaylayabilir veya reddedebilirsiniz.
         disallow: Bağlantıya izin verme
         disallow_provider: Yayıncıya izin verme
@@ -934,6 +910,10 @@ tr:
       statuses:
         allow: Gönderiye izin ver
         allow_account: Yazara izin ver
+        confirm_allow: Seçili durumlara izin vermek istediğinizden emin misiniz?
+        confirm_allow_account: Seçili hesaplara izin vermek istediğinizden emin misiniz?
+        confirm_disallow: Seçili durumların iznini kaldırmak istediğinizden emin misiniz?
+        confirm_disallow_account: Seçili hesapların iznini kaldırmak istediğinizden emin misiniz?
         description_html: Bunlar, sunucunuzca bilinen, şu an sıklıkla paylaşılan ve favorilere eklenen gönderilerdir. Yeni ve geri dönen kullanıcılarınızın takip etmesi için daha fazla kullanıcı bulmasına yararlar. Siz yazarı onaylamadığınız ve yazar hesabının başkalarına önerilmesine izin vermediği sürece gönderileri herkese açık olarak gösterilmez. Tekil gönderileri de onaylayabilir veya reddedebilirsiniz.
         disallow: Gönderi iznini kaldır
         disallow_account: Yazar iznini kaldır
@@ -966,7 +946,6 @@ tr:
         used_by_over_week:
           one: Geçen hafta bir kişi tarafından kullanıldı
           other: Geçen hafta %{count} kişi tarafından kullanıldı
-      title: Öne çıkanlar
       trending: Öne çıkanlar
     warning_presets:
       add_new: Yeni ekle
@@ -996,7 +975,7 @@ tr:
       webhook: Web kancası
   admin_mailer:
     auto_close_registrations:
-      body: Son zamanlardaki denetleyi faaliyeti eksikliğinden dolayı, %{instance} üzerindeki kayıtlar, %{instance} sunucusunun olası kötü aktörler tarafından bir platform olarak kullanımını engellemek için otomatik olarak elle onay gerektirecek şekilde değiştirilmiştir. İstediğiniz zaman açık kayıtlara çevirebilirsiniz.
+      body: Son zamanlardaki moderatör faaliyeti eksikliğinden dolayı, %{instance} üzerindeki kayıtlar, %{instance} sunucusunun olası kötü aktörler tarafından bir platform olarak kullanımını engellemek için otomatik olarak elle onay gerektirecek şekilde değiştirilmiştir. İstediğiniz zaman açık kayıtlara çevirebilirsiniz.
       subject: "%{instance} üzerindeki kayıtlar otomatik olarak onay gerektirecek şekilde değiştirilmiştir"
     new_appeal:
       actions:
@@ -1051,9 +1030,7 @@ tr:
       guide_link_text: Herkes katkıda bulunabilir.
     sensitive_content: Hassas içerik
   application_mailer:
-    notification_preferences: E-posta tercihlerini değiştir
     salutation: "%{name},"
-    settings: 'E-posta tercihlerini değiştir: %{link}'
     unsubscribe: Abonelikten çık
     view: 'Görüntüle:'
     view_profile: Profili görüntüle
@@ -1073,7 +1050,6 @@ tr:
       hint_html: Sadece bir şey daha! Sizin bir insan olduğunuzu doğrulamamız gerekiyor (bu, spam'i dışarıda tutabilmemiz içindir!). Aşağıdaki CAPTCHA'yı çözün ve "Devam Et" düğmesini tıklayın.
       title: Güvenlik denetimi
     confirmations:
-      awaiting_review: E-posta adresiniz doğrulandı! %{domain} çalışanları şimdi kaydınızı inceliyorlar. Hesabınızı onayladıklarında bir e-posta alacaksınız!
       awaiting_review_title: Kaydınız inceleniyor
       clicking_this_link: bu bağlantıyı tıklamayı
       login_link: oturum aç
@@ -1081,7 +1057,6 @@ tr:
       redirect_to_app_html: "<strong>%{app_name}</strong> uygulamasına yönlendirileceksiniz. Eğer yönlendirme olmazsa, %{clicking_this_link} veya uygulamaya geri dönmeyi deneyin."
       registration_complete: "%{domain} sunucusunda kaydınız şimdi tamamlandı!"
       welcome_title: Hoşgeldin %{name}!
-      wrong_email_hint: Eğer bu e-posta adresi doğru değilse, hesap ayarlarında değiştirebilirsiniz.
     delete_account: Hesabı sil
     delete_account_html: Hesabını silmek istersen, <a href="%{path}">buradan devam edebilirsin</a>. Onay istenir.
     description:
@@ -1102,7 +1077,6 @@ tr:
     or_log_in_with: 'Veya şununla oturum açın:'
     privacy_policy_agreement_html: <a href="%{privacy_policy_path}" target="_blank">Gizlilik politikasını</a> okudum ve kabul ettim
     progress:
-      confirm: E-postayı Onayla
       details: Ayrıntılarınız
       review: İncelememiz
       rules: Kabul kuralları
@@ -1118,16 +1092,14 @@ tr:
       back: Geri
       invited_by: 'Aşağıdakinden aldığınız davet sayesinde %{domain} sunucusuna katılabilirsiniz:'
       preamble: Bunlar, %{domain} moderatörleri tarafından ayarlanmış ve uygulanmıştır.
-      preamble_invited: Devam etmeden önce, %{domain} yöneticileri tarafından belirlenmiş temel kuralları gözden geçirin.
+      preamble_invited: Devam etmeden önce, %{domain} moderatörleri tarafından belirlenmiş temel kuralları gözden geçirin.
       title: Bazı temel kurallar.
       title_invited: Davet edildiniz.
     security: Güvenlik
     set_new_password: Yeni parola belirle
     setup:
-      email_below_hint_html: İstenmeyenler dizininize bakın veya başka bir onay bağlantısı isteyin. Eğer yanlışsa e-posta adresinizi de düzeltebilirsiniz.
       email_settings_hint_html: "%{email} adresinizi doğrulamak için size gönderdiğimiz bağlantıya tıklayın. Biz burada bekliyoruz."
       link_not_received: Bağlantı gelmedi mi?
-      new_confirmation_instructions_sent: Birkaç dakika içerisinde onaylama bağlantısını içeren yeni bir e-posta alacaksınız!
       title: Gelen kutunuzu kontrol edin
     sign_in:
       preamble_html: "<strong>%{domain}</strong> kimlik bilgilerinizi kullanarak giriş yapın. Eğer hesabınız başka bir sunucuda barındırılıyorsa, burada giriş yapamazsınız."
@@ -1138,9 +1110,7 @@ tr:
       title: "%{domain} için kurulumunuzu yapalım."
     status:
       account_status: Hesap durumu
-      confirming: E-posta doğrulamasının tamamlanması bekleniyor.
       functional: Hesabınız tamamen kullanıma hazır.
-      pending: Başvurunuz personelimiz tarafından gözden geçirilmeyi beklemektedir. Bu biraz zaman alabilir. Başvurunuz onaylanırsa bir e-posta alacaksınız.
       redirecting_to: Hesabınız aktif değil çünkü şu anda %{acct} adresine yönlendirilmektedir.
       self_destruct: "%{domain} kapandığı için, hesabınıza sadece kısıtlı erişiminiz olacak."
       view_strikes: Hesabınıza yönelik eski eylemleri görüntüleyin
@@ -1183,9 +1153,6 @@ tr:
       before: 'Devam etmeden önce, lütfen bu notları dikkatlice okuyun:'
       caches: Diğer sunucular tarafından ön belleğe alınan içerik kalabilir
       data_removal: Gönderileriniz ve diğer verileriniz kalıcı olarak silinecektir
-      email_change_html: Hesabınızı silmeden <a href="%{path}">e-posta adresinizi değiştirebilirsiniz</a>
-      email_contact_html: Eğer hala ulaşmazsa, yardım için <a href="mailto:%{email}">%{email}</a> adresine e-posta gönderebilirsiniz
-      email_reconfirmation_html: Eğer doğrulama e-postası almıyorsanız, <a href="%{path}">tekrar talep edebilirsiniz</a>
       irreversible: Hesabınızı geri yükleyemeyecek ya da yeniden etkinleştiremeyeceksiniz
       more_details_html: Daha fazla ayrıntı için, <a href="%{terms_path}">gizlilik politikası</a>na göz atın.
       username_available: Kullanıcı adınız tekrar kullanılabilir olacaktır
@@ -1418,7 +1385,6 @@ tr:
     authentication_methods:
       otp: iki aşamalı kimlik doğrulama uygulaması
       password: parola
-      sign_in_token: e-posta güvenlik kodu
       webauthn: güvenlik anahtarları
     description_html: Eğer tanımadığınız bir faaliyet görüyorsanız, parolanızı değiştirmeyi ve iki aşamalı kimlik doğrulamayı etkinleştirmeyi düşünün.
     empty: Kimlik doğrulama geçmişi yok
@@ -1429,16 +1395,6 @@ tr:
     unsubscribe:
       action: Evet, abonelikten çık
       complete: Abonelikten çık
-      confirmation_html: '%{domain} üzerindeki Mastodon için %{type} almayı durdurarak %{email} adresindeki aboneliğinizi iptal etmek istediğinizden emin misiniz? <a href="%{settings_path}">e-posta bildirim ayarlarınızdan</a> her zaman yeniden abone olabilirsiniz.'
-      emails:
-        notification_emails:
-          favourite: bildirim e-postalarını favorile
-          follow: bildirim e-postalarını takip et
-          follow_request: istek e-postalarını takip et
-          mention: bildirim e-postalarına değin
-          reblog: bildirim e-postalarını yükselt
-      resubscribe_html: Abonelikten yanlışlıkla çıktıysanız, <a href="%{settings_path}">e-posta bildirim ayarlarınızdan</a> yeniden abone olabilirsiniz.
-      success_html: Artık %{email} adresindeki e-postanıza %{domain} üzerindeki Mastodon için %{type} almayacaksınız.
       title: Abonelikten çık
   media_attachments:
     validations:
@@ -1519,8 +1475,6 @@ tr:
     update:
       subject: "%{name} bir gönderiyi düzenledi"
   notifications:
-    administration_emails: Yönetici e-posta bildirimleri
-    email_events: E-posta bildirimi gönderilecek etkinlikler
     email_events_hint: 'Bildirim almak istediğiniz olayları seçin:'
   number:
     human:
@@ -1679,7 +1633,6 @@ tr:
     import: İçe aktar
     import_and_export: İçe ve dışa aktar
     migrate: Hesap taşıma
-    notifications: E-posta bildirimleri
     preferences: Tercihler
     profile: Profil
     relationships: Takip edilenler ve takipçiler
@@ -1696,7 +1649,7 @@ tr:
       user_domain_block: 'Engellediniz: %{target_name}'
     lost_followers: Kaybedilen takipçiler
     lost_follows: Kaybedilen takipler
-    preamble: Bir alan adını engellediğinizde veya denetleyicileriniz uzak bir sunucuyu askıya almaya karar verdiğinde takipçilerinizi ve takiplerinizi kaybedebilirsiniz. Bu olduğunda, kopan ilişkilerin bir listesini, incelemek ve başka bir sunucuya aktarmak için indirebileceksiniz.
+    preamble: Bir alan adını engellediğinizde veya moderatörleriniz uzak bir sunucuyu askıya almaya karar verdiğinde takipçilerinizi ve takiplerinizi kaybedebilirsiniz. Bu olduğunda, kopan ilişkilerin bir listesini, incelemek ve başka bir sunucuya aktarmak için indirebileceksiniz.
     purged: Bu sunucu hakkındaki bilgiler, sunucunun yöneticileri tarafından temizlenmiş.
     type: Olay
   statuses:
@@ -1926,7 +1879,6 @@ tr:
     invalid_otp_token: Geçersiz iki adımlı doğrulama kodu
     otp_lost_help_html: Her ikisine de erişiminizi kaybettiyseniz, %{email} ile irtibata geçebilirsiniz
     rate_limited: Çok fazla kimlik doğrulama denemesi. Daha sonra tekrar deneyin.
-    seamless_external_login: Harici bir servis aracılığıyla oturum açtınız, bu nedenle parola ve e-posta ayarları mevcut değildir.
     signed_in_as: 'Oturum açtı:'
   verification:
     extra_instructions_html: <strong>İpucu:</strong> Web sitenizdeki bağlantı görünmez olabilir. Önemli olan, kullanıcı tarafından oluşturulan içeriğe sahip web sitelerinde kimliğe bürünmeyi önleyen <code>rel="me"</code>'dir. Sayfa başlığında <code>a</code> yerine bir <code>bağlantı</code> etiketi de kullanabilirsiniz, ancak HTML'ye JavaScript çalıştırılmadan erişilebilir olmalıdır.
diff --git a/config/locales/tt.yml b/config/locales/tt.yml
index 82bb18c9ae6052..3a0d9d9ce86255 100644
--- a/config/locales/tt.yml
+++ b/config/locales/tt.yml
@@ -151,7 +151,6 @@ tt:
           silence: Чикләү
           suspend: Искә алмау
     email_domain_blocks:
-      created_msg: Эл. почта домены уңышлы блокланды
       delete: Бетерү
       dns:
         types:
@@ -295,7 +294,6 @@ tt:
           tag_languages_dimension: Иң популяр телләр
           tag_servers_dimension: Иң популяр серверлар
         usable: Кулланырга мөмкин
-      title: Мөһим вакыйгалар
     warning_presets:
       delete: Бетерү
     webhooks:
@@ -326,8 +324,6 @@ tt:
     login: Керү
     logout: Чыгу
     or_log_in_with: Яки аның белән керү
-    progress:
-      confirm: Эл. почтаны раслагыз
     providers:
       cas: САS
       saml: SАML
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index e7aa5e40846a0e..4add810bc60d21 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -35,7 +35,6 @@ uk:
       created_msg: Нотатку модератора успішно створено!
       destroyed_msg: Нотатку модератора успішно видалено!
     accounts:
-      add_email_domain_block: Додати поштовий домен до чорного списку
       approve: Схвалити
       approved_msg: Заявку на реєстрацію %{username} затверджено
       are_you_sure: Ви впевнені?
@@ -62,7 +61,6 @@ uk:
       demote: Усунути
       destroyed_msg: Дані %{username} тепер в черзі на негайне видалення
       disable: Заморозити
-      disable_sign_in_token_auth: Вимкнути автентифікацію за допомогою е-пошти
       disable_two_factor_authentication: Вимкнути двофакторну авторизацію
       disabled: Вимкнено
       display_name: Відображуване ім'я
@@ -71,7 +69,6 @@ uk:
       email: Електронна пошта
       email_status: Стан електронної пошти
       enable: Розморозити
-      enable_sign_in_token_auth: Увімкнути автентифікацію за допомогою е-пошти
       enabled: Увімкнено
       enabled_msg: Обліковий запис %{username} успішно розморожено
       followers: Підписники
@@ -138,7 +135,6 @@ uk:
       resubscribe: Перепідписатися
       role: Роль
       search: Пошук
-      search_same_email_domain: Інші користувачі з тим самим поштовим доменом
       search_same_ip: Інші користувачі з тим самим IP
       security: Безпека
       security_measures:
@@ -179,26 +175,21 @@ uk:
         approve_appeal: Затвердити апеляцію
         approve_user: Затвердити користувачів
         assigned_to_self_report: Призначити звіт
-        change_email_user: Змінити електронну пошту для користувача
         change_role_user: Змінити роль користувача
         confirm_user: Підтвердити користувача
         create_account_warning: Створити попередження
         create_announcement: Створити оголошення
-        create_canonical_email_block: Створити блок електронної пошти
         create_custom_emoji: Створити користувацьке емодзі
         create_domain_allow: Створити дозвіл на домен
         create_domain_block: Створити блокування домену
-        create_email_domain_block: Створити блокування поштового домену
         create_ip_block: Створити правило IP
         create_unavailable_domain: Створити недоступний домен
         create_user_role: Створити роль
         demote_user: Понизити користувача
         destroy_announcement: Видалити оголошення
-        destroy_canonical_email_block: Видалити блок електронної пошти
         destroy_custom_emoji: Видалити користувацьке емодзі
         destroy_domain_allow: Видалити дозвіл на домен
         destroy_domain_block: Видалити блокування домену
-        destroy_email_domain_block: Видалити блокування поштового домену
         destroy_instance: Очистити домен
         destroy_ip_block: Видалити правило IP
         destroy_status: Видалити допис
@@ -206,10 +197,8 @@ uk:
         destroy_user_role: Знищити роль
         disable_2fa_user: Вимкнути 2FA
         disable_custom_emoji: Вимкнути користувацькі емодзі
-        disable_sign_in_token_auth_user: Вимкнути автентифікацію за допомогою е-пошти для користувача
         disable_user: Відключити користувача
         enable_custom_emoji: Увімкнути користувацькі емодзі
-        enable_sign_in_token_auth_user: Увімкнути автентифікацію за допомогою е-пошти для користувача
         enable_user: Активувати користувача
         memorialize_account: Меморіалізувати акаунт
         promote_user: Підвищити користувача
@@ -239,26 +228,20 @@ uk:
         approve_appeal_html: "%{name} затвердили звернення на оскарження рішення від %{target}"
         approve_user_html: "%{name} схвалює реєстрацію від %{target}"
         assigned_to_self_report_html: "%{name} створює скаргу %{target} на себе"
-        change_email_user_html: "%{name} змінює поштову адресу користувача %{target}"
         change_role_user_html: "%{name} змінює роль %{target}"
-        confirm_user_html: "%{name} підтверджує стан поштової адреси користувача %{target}"
         create_account_warning_html: "%{name} надсилає попередження до %{target}"
         create_announcement_html: "%{name} створює нове оголошення %{target}"
-        create_canonical_email_block_html: "%{name} блокує електронну пошту з хешем %{target}"
         create_custom_emoji_html: "%{name} завантажує нові емодзі %{target}"
         create_domain_allow_html: "%{name} дозволяє федерацію з доменом %{target}"
         create_domain_block_html: "%{name} блокує домен %{target}"
-        create_email_domain_block_html: "%{name} блокує домен електронної пошти %{target}"
         create_ip_block_html: "%{name} створює правило для IP %{target}"
         create_unavailable_domain_html: "%{name} зупиняє доставляння на домен %{target}"
         create_user_role_html: "%{name} створює роль %{target}"
         demote_user_html: "%{name} понижує користувача %{target}"
         destroy_announcement_html: "%{name} видаляє оголошення %{target}"
-        destroy_canonical_email_block_html: "%{name} розблоковує електронну пошту з хешем %{target}"
         destroy_custom_emoji_html: "%{name} видаляє емоджі %{target}"
         destroy_domain_allow_html: "%{name} скасовує федерацію з доменом %{target}"
         destroy_domain_block_html: "%{name} розблокує домен %{target}"
-        destroy_email_domain_block_html: "%{name} розблоковує домен електронної пошти %{target}"
         destroy_instance_html: "%{name} очищує домен %{target}"
         destroy_ip_block_html: "%{name} видаляє правило для IP %{target}"
         destroy_status_html: "%{name} вилучає допис %{target}"
@@ -266,10 +249,8 @@ uk:
         destroy_user_role_html: "%{name} видаляє роль %{target}"
         disable_2fa_user_html: "%{name} вимикає двоетапну перевірку для користувача %{target}"
         disable_custom_emoji_html: "%{name} вимикає емодзі %{target}"
-        disable_sign_in_token_auth_user_html: "%{name} вимикає автентифікацію через е-пошту для %{target}"
         disable_user_html: "%{name} вимикає вхід для користувача %{target}"
         enable_custom_emoji_html: "%{name} вмикає емодзі %{target}"
-        enable_sign_in_token_auth_user_html: "%{name} вмикає автентифікацію через е-пошту для %{target}"
         enable_user_html: "%{name} вмикає вхід для користувача %{target}"
         memorialize_account_html: "%{name} перетворює обліковий запис %{target} на сторінку пам'яті"
         promote_user_html: "%{name} підвищує користувача %{target}"
@@ -277,7 +258,6 @@ uk:
         reject_user_html: "%{name} відхиляє реєстрацію від %{target}"
         remove_avatar_user_html: "%{name} прибирає аватар %{target}"
         reopen_report_html: "%{name} знову відкриває звіт %{target}"
-        resend_user_html: "%{name} було надіслано листа з підтвердженням для %{target}"
         reset_password_user_html: "%{name} скидає пароль користувача %{target}"
         resolve_report_html: "%{name} розв'язує скаргу %{target}"
         sensitive_account_html: "%{name} позначає медіа від %{target} делікатним"
@@ -448,7 +428,6 @@ uk:
         many: "%{count} спроб входу за останній тиждень"
         one: "%{count} спроба за останній тиждень"
         other: "%{count} спроби входу за останній тиждень"
-      created_msg: Успішно додано поштовий домен до чорного списку
       delete: Видалити
       dns:
         types:
@@ -457,12 +436,8 @@ uk:
       new:
         create: Додати домен
         resolve: Розв'язати домен
-        title: Нове блокування поштового домену
-      no_email_domain_block_selected: Жодні налаштування блокування доменів електронної пошти не було змінено, оскільки жоден з них не було обрано
       not_permitted: Не дозволено
-      resolved_dns_records_hint_html: Ім'я домену резолвиться в наступні домени MX, які в кінцевому рахунку відповідають за прийняття електронної пошти. Блокування домену MX заблокує реєстрацію з будь-якої e-mail адреси, яка використовує однаковий домен MX, навіть якщо доменне ім'я буде інакше. <strong>Будьте обережні, щоб не блокувати великих поштових провайдерів.</strong>
       resolved_through_html: Розв'язано через %{domain}
-      title: Чорний список поштових доменів
     export_domain_allows:
       new:
         title: Імпорт дозволів домену
@@ -624,7 +599,6 @@ uk:
         resolve_description_html: Не буде застосовано жодних дій проти облікового запису, на який скаржилися, не буде записано попередження, а скаргу буде закрито.
         silence_description_html: Обліковий запис буде видно лише тим, хто вже за ним слідкує, або знайде його вручну, що значно обмежує його охоплення. Може завжди бути повернуто. Закриває всі скарги на цей обліковий запис.
         suspend_description_html: Обліковий запис і весь його вміст будуть недоступними й врешті-решт видалені, і взаємодіяти з ним буде неможливо. Відновлення можливе протягом 30 днів. Закриває всі скарги на цей обліковий запис.
-      actions_description_html: Визначте, які дії слід вжити для розв'язання цієї скарги. Якщо ви оберете каральні дії проти зареєстрованого облікового запису, про них буде надіслано сповіщення електронним листом, крім випадків, коли вибрано категорію <strong>Спам</strong>.
       actions_description_remote_html: Визначте, які дії слід вжити для розв'язання цього звіту. Це вплине тільки на те, як <strong>ваш</strong> сервер з'єднується з цим віддаленим обліковим записом і обробляє його вміст.
       add_to_report: Додати ще подробиць до скарги
       already_suspended_badges:
@@ -689,7 +663,6 @@ uk:
         delete_data_html: Видаліть профіль <strong>@%{acct}</strong> і вміст за останні 30 днів, якщо вони не дія не скасується тим часом
         preview_preamble_html: "<strong>@%{acct}</strong> отримає попередження з таким вмістом:"
         record_strike_html: Запис попередження проти <strong>@%{acct}</strong>, що допоможе вам посилити ваші майбутні санкції проти цього облікового запису
-        send_email_html: Надіслати <strong>@%{acct}</strong> попереджувального електронного листа
         warning_placeholder: Додаткові причини дії модерації.
       target_origin: Походження облікового запису, на який скаржаться
       title: Скарги
@@ -733,7 +706,6 @@ uk:
         manage_appeals: Керувати оскарженнями
         manage_appeals_description: Дозволяє користувачам розглядати оскарження дій модерації
         manage_blocks: Керувати блокуваннями
-        manage_blocks_description: Дозволяє користувачам блокувати постачальників е-пошти та IP-адреси
         manage_custom_emojis: Керувати користувацькими емоджі
         manage_custom_emojis_description: Дозволяє користувачам керувати користувацькими емоджі на сервері
         manage_federation: Керувати федерацією
@@ -751,7 +723,6 @@ uk:
         manage_taxonomies: Керувати таксономіями
         manage_taxonomies_description: Дозволяє користувачам переглядати актуальні налаштування вмісту й оновити хештеґ
         manage_user_access: Керувати доступом користувачів
-        manage_user_access_description: Дозволяє користувачам вимкнути двоетапну перевірку інших користувачів, змінити їхню адресу електронної пошти та відновити пароль
         manage_users: Керувати користувачами
         manage_users_description: Дозволяє користувачам переглядати подробиці інших користувачів і виконувати їхню модерацію
         manage_webhooks: Керувати Webhooks
@@ -826,7 +797,6 @@ uk:
       destroyed_msg: Завантаження сайту успішно видалено!
     software_updates:
       critical_update: Критично — оновіться якнайшвидше
-      description: Радимо постійно оновлювати інсталяцію Mastodon, щоб мати змогу користуватися найновішими виправленнями та функціями. На додаток, іноді дуже важливо вчасно оновлювати Mastodon, щоб уникнути проблем з безпекою. З цих причин Mastodon перевіряє наявність оновлень що 30 хвилин і сповіщає вас про це відповідно до ваших налаштувань сповіщень на електронну пошту.
       documentation_link: Докладніше
       release_notes: Примітки до випуску
       title: Доступні оновлення
@@ -984,7 +954,7 @@ uk:
           many: Використали %{count} людей за минулий тиждень
           one: Використала одна людина за минулий тиждень
           other: Використали %{count} людей за минулий тиждень
-      title: Популярні
+      title: Рекомендації та тренди
       trending: Популярне
     warning_presets:
       add_new: Додати новий
@@ -1071,9 +1041,7 @@ uk:
       guide_link_text: Кожен може взяти участь.
     sensitive_content: Дражливий зміст
   application_mailer:
-    notification_preferences: Змінити налаштування електронної пошти
     salutation: "%{name},"
-    settings: 'Змінити налаштування електронної пошти: %{link}'
     unsubscribe: Відписатися
     view: 'Перегляд:'
     view_profile: Показати профіль
@@ -1093,7 +1061,6 @@ uk:
       hint_html: Ще одне! Ми повинні пересвідчитись, що ви людина (щоб ми могли уникнути спаму!). Розв'яжіть CAPTCHA внизу і натисніть кнопку "Продовжити".
       title: Перевірка безпеки
     confirmations:
-      awaiting_review: Ваша електронна адреса підтверджена! Наразі співробітники %{domain} розглядають вашу реєстрацію. Ви отримаєте електронний лист, якщо вони затвердять ваш обліковий запис!
       awaiting_review_title: Ваша реєстрація розглядається
       clicking_this_link: натисніть це посилання
       login_link: увійти
@@ -1101,7 +1068,6 @@ uk:
       redirect_to_app_html: Вас мало переспрямувати до програми <strong>%{app_name}</strong>. Якщо цього не сталося, спробуйте %{clicking_this_link} або вручну поверніться до програми.
       registration_complete: Ваша реєстрація на %{domain} завершена!
       welcome_title: Ласкаво просимо, %{name}!
-      wrong_email_hint: Якщо ця адреса електронної пошти неправильна, можна змінити її в налаштуваннях облікового запису.
     delete_account: Видалити обліковий запис
     delete_account_html: Якщо ви хочете видалити свій обліковий запис, ви можете <a href="%{path}">перейти сюди</a>. Вас попросять підтвердити дію.
     description:
@@ -1122,7 +1088,6 @@ uk:
     or_log_in_with: Або увійдіть з
     privacy_policy_agreement_html: Мною прочитано і я погоджуюся з <a href="%{privacy_policy_path}" target="_blank">політикою приватності</a>
     progress:
-      confirm: Підтвердити електронну адресу
       details: Ваші дані
       review: Наш відгук
       rules: Погодитися з правилами
@@ -1144,10 +1109,8 @@ uk:
     security: Зміна паролю
     set_new_password: Встановити новий пароль
     setup:
-      email_below_hint_html: Перевірте теку "Спам", або зробіть ще один запит. Ви можете виправити свою електронну адресу, якщо вона неправильна.
       email_settings_hint_html: Натисніть на посилання, яке ми надіслали вам, щоб підтвердити %{email}. Ми чекатимемо прямо тут.
       link_not_received: Не отримали посилання?
-      new_confirmation_instructions_sent: Ви отримаєте новий лист із посиланням на підтвердження протягом декількох хвилин!
       title: Перевірте вашу поштову скриньку
     sign_in:
       preamble_html: Увійдіть за допомогою облікових даних <strong>%{domain}</strong>. Якщо ваш обліковий запис розміщений на іншому сервері, ви не зможете увійти тут.
@@ -1158,9 +1121,7 @@ uk:
       title: Налаштуймо вас на %{domain}.
     status:
       account_status: Стан облікового запису
-      confirming: Очікуємо на завершення підтвердження за допомогою електронної пошти.
       functional: Ваш обліковий запис повністю робочий.
-      pending: Ваша заява очікує на розгляд нашим персоналом. Це може зайняти деякий час. Ви отримаєте електронний лист, якщо ваша заява буде схвалена.
       redirecting_to: Ваш обліковий запис наразі неактивний, тому що він перенаправлений до %{acct}.
       self_destruct: Оскільки %{domain} закривається, ви отримаєте тільки обмежений доступ до вашого облікового запису.
       view_strikes: Переглянути попередні попередження вашому обліковому запису
@@ -1203,9 +1164,6 @@ uk:
       before: 'До того як продовжити, будь ласка уважно прочитайте це:'
       caches: Інформація, кешована іншими серверами, може залишитися
       data_removal: Ваші дописи й інші дані будуть вилучені назавжди
-      email_change_html: Ви можете <a href="%{path}">змінити вашу електронну адресу</a>, не видаляючи ваш обліковий запис
-      email_contact_html: Якщо його все ще немає, ви можете написали до <a href="mailto:%{email}">%{email}</a> для допомоги
-      email_reconfirmation_html: Якщо ви не отримали електронного листа з підтвердженням, ви можете <a href="%{path}">запросити його знову</a>
       irreversible: Буде неможливо відновити ваш обліковий запис
       more_details_html: Подробиці за посиланням <a href="%{terms_path}">політика конфіденційності</a>.
       username_available: Ваше ім'я користувача стане доступним для використання
@@ -1454,7 +1412,6 @@ uk:
     authentication_methods:
       otp: застосунок двофакторної автентифікації
       password: пароль
-      sign_in_token: код безпеки е-поштою
       webauthn: ключі безпеки
     description_html: Якщо ви помітили невідомі вам дії, тоді подумайте про зміну свого пароля та можливість увімкнення двофакторної автентифікації.
     empty: Немає історії входів
@@ -1465,16 +1422,6 @@ uk:
     unsubscribe:
       action: Так, відписатися
       complete: Відписалися
-      confirmation_html: Ви впевнені, що хочете відписатися від отримання %{type} для Mastodon на %{domain} до своєї скриньки %{email}? Ви можете повторно підписатися у <a href="%{settings_path}">налаштуваннях сповіщень електронною поштою</a>.
-      emails:
-        notification_emails:
-          favourite: отримувати сповіщення про вподобання електронною поштою
-          follow: отримувати сповіщення про підписки електронною поштою
-          follow_request: отримувати сповіщення про запити на стеження електронною поштою
-          mention: отримувати сповіщення про згадки електронною поштою
-          reblog: отримувати сповіщення про поширення електронною поштою
-      resubscribe_html: Якщо ви відписалися помилково, ви можете повторно підписатися в <a href="%{settings_path}">налаштуваннях сповіщень електронною поштою</a>.
-      success_html: Ви більше не отримуватимете %{type} для Mastodon %{domain} на адресу %{email}.
       title: Відписатися
   media_attachments:
     validations:
@@ -1555,8 +1502,6 @@ uk:
     update:
       subject: "%{name} змінює допис"
   notifications:
-    administration_emails: Сповіщення е-пошти адміністратора
-    email_events: Події, про які сповіщати електронною поштою
     email_events_hint: 'Оберіть події, про які ви хочете отримувати сповіщення:'
   number:
     human:
@@ -1715,7 +1660,6 @@ uk:
     import: Імпорт
     import_and_export: Імпорт та експорт
     migrate: Міграція облікового запису
-    notifications: E-mail сповіщення
     preferences: Налаштування
     profile: Загальнодоступний профіль
     relationships: Підписки та підписники
@@ -1976,7 +1920,6 @@ uk:
     invalid_otp_token: Введено неправильний код
     otp_lost_help_html: Якщо ви втратили доступ до обох, ви можете отримати доступ з %{email}
     rate_limited: Забагато спроб з'єднання. Спробуйте ще раз пізніше.
-    seamless_external_login: Ви увійшли за допомогою зовнішнього сервісу, тому налаштування паролю та електронної пошти недоступні.
     signed_in_as: 'Ви увійшли як:'
   verification:
     extra_instructions_html: <strong>Порада:</strong> Посилання на ваш сайт може бути невидимим. Важлива частина — це <code>rel="me"</code>, яка не запобігає видаванню себе за іншу особу на вебсайтах з користувацьким наповненням. Ви навіть можете використовувати тег <code>link</code> у заголовку сторінки замість <code>a</code>, але HTML має бути доступним без виконання JavaScript.
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index dacaafd7681c18..35b55583a06aac 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -56,7 +56,7 @@ vi:
       demote: Xóa vai trò
       destroyed_msg: Dữ liệu %{username} sẽ được lên lịch xóa ngay bây giờ
       disable: Khóa
-      disable_sign_in_token_auth: Vô hiệu hóa xác minh bằng email
+      disable_sign_in_token_auth: Tắt xác minh bằng email
       disable_two_factor_authentication: Vô hiệu hóa xác minh 2 bước
       disabled: Tạm khóa
       display_name: Biệt danh
@@ -129,7 +129,7 @@ vi:
       resubscribe: Đăng ký lại
       role: Vai trò
       search: Tìm kiếm
-      search_same_email_domain: Tra cứu email
+      search_same_email_domain: Những người khác với cùng tên miền email
       search_same_ip: Tra cứu IP
       security: Bảo mật
       security_measures:
@@ -170,22 +170,22 @@ vi:
         approve_appeal: Chấp nhận kháng cáo
         approve_user: Chấp nhận đăng ký
         assigned_to_self_report: Tự xử lý báo cáo
-        change_email_user: Đổi email
+        change_email_user: Đổi email người dùng
         change_role_user: Đổi vai trò
         confirm_user: Xác minh
         create_account_warning: Cảnh cáo
         create_announcement: Tạo thông báo mới
-        create_canonical_email_block: Tạo chặn tên miền email
+        create_canonical_email_block: Tạo chặn email
         create_custom_emoji: Tạo emoji
         create_domain_allow: Cho phép máy chủ
         create_domain_block: Chặn máy chủ
-        create_email_domain_block: Chặn tên miền email
+        create_email_domain_block: Tạo chặn tên miền email
         create_ip_block: Tạo chặn IP mới
         create_unavailable_domain: Máy chủ không khả dụng
         create_user_role: Tạo vai trò
         demote_user: Xóa vai trò
         destroy_announcement: Xóa thông báo
-        destroy_canonical_email_block: Bỏ chặn tên miền email
+        destroy_canonical_email_block: Bỏ chặn email
         destroy_custom_emoji: Xóa emoji
         destroy_domain_allow: Bỏ thanh trừng máy chủ
         destroy_domain_block: Bỏ chặn máy chủ
@@ -197,10 +197,10 @@ vi:
         destroy_user_role: Xóa vai trò
         disable_2fa_user: Vô hiệu hóa 2FA
         disable_custom_emoji: Vô hiệu hóa emoji
-        disable_sign_in_token_auth_user: Vô hiệu hóa xác minh bằng email
+        disable_sign_in_token_auth_user: Tắt xác minh bằng email cho người dùng
         disable_user: Vô hiệu hóa đăng nhập
         enable_custom_emoji: Cho phép emoji
-        enable_sign_in_token_auth_user: Bật xác minh bằng email
+        enable_sign_in_token_auth_user: Bật xác minh bằng email cho người dùng
         enable_user: Bỏ vô hiệu hóa đăng nhập
         memorialize_account: Đánh dấu tưởng niệm
         promote_user: Chỉ định vai trò
@@ -235,21 +235,21 @@ vi:
         confirm_user_html: "%{name} đã xác minh địa chỉ email của %{target}"
         create_account_warning_html: "%{name} đã cảnh cáo %{target}"
         create_announcement_html: "%{name} tạo thông báo mới %{target}"
-        create_canonical_email_block_html: "%{name} chặn email với hàm băm %{target}"
+        create_canonical_email_block_html: "%{name} đã chặn email với hash %{target}"
         create_custom_emoji_html: "%{name} đã tải lên biểu tượng cảm xúc mới %{target}"
         create_domain_allow_html: "%{name} kích hoạt liên hợp với %{target}"
         create_domain_block_html: "%{name} chặn máy chủ %{target}"
-        create_email_domain_block_html: "%{name} chặn tên miền email %{target}"
+        create_email_domain_block_html: "%{name} đã chặn tên miền email %{target}"
         create_ip_block_html: "%{name} đã chặn IP %{target}"
         create_unavailable_domain_html: "%{name} ngưng phân phối với máy chủ %{target}"
         create_user_role_html: "%{name} đã tạo vai trò %{target}"
         demote_user_html: "%{name} đã xóa vai trò của %{target}"
         destroy_announcement_html: "%{name} xóa thông báo %{target}"
-        destroy_canonical_email_block_html: "%{name} bỏ chặn email với hàm băm %{target}"
+        destroy_canonical_email_block_html: "%{name} đã bỏ chặn email với hash %{target}"
         destroy_custom_emoji_html: "%{name} đã xóa emoji %{target}"
         destroy_domain_allow_html: "%{name} đã ngừng liên hợp với %{target}"
         destroy_domain_block_html: "%{name} bỏ chặn máy chủ %{target}"
-        destroy_email_domain_block_html: "%{name} bỏ chặn tên miền email %{target}"
+        destroy_email_domain_block_html: "%{name} đã bỏ chặn email %{target}"
         destroy_instance_html: "%{name} thanh trừng máy chủ %{target}"
         destroy_ip_block_html: "%{name} bỏ chặn IP %{target}"
         destroy_status_html: "%{name} đã xóa tút của %{target}"
@@ -257,10 +257,10 @@ vi:
         destroy_user_role_html: "%{name} đã xóa vai trò %{target}"
         disable_2fa_user_html: "%{name} đã vô hiệu hóa xác minh hai bước của %{target}"
         disable_custom_emoji_html: "%{name} đã ẩn emoji %{target}"
-        disable_sign_in_token_auth_user_html: "%{name} vô hiệu hóa xác minh email của %{target}"
+        disable_sign_in_token_auth_user_html: "%{name} đã tắt xác minh email của %{target}"
         disable_user_html: "%{name} vô hiệu hóa đăng nhập %{target}"
         enable_custom_emoji_html: "%{name} cho phép Emoji %{target}"
-        enable_sign_in_token_auth_user_html: "%{name} bật xác minh email của %{target}"
+        enable_sign_in_token_auth_user_html: "%{name} đã bật xác minh email của %{target}"
         enable_user_html: "%{name} bỏ vô hiệu hóa đăng nhập %{target}"
         memorialize_account_html: "%{name} đã biến tài khoản %{target} thành một trang tưởng niệm"
         promote_user_html: "%{name} chỉ định vai trò cho %{target}"
@@ -268,7 +268,7 @@ vi:
         reject_user_html: "%{name} đã từ chối đăng ký từ %{target}"
         remove_avatar_user_html: "%{name} đã xóa ảnh đại diện của %{target}"
         reopen_report_html: "%{name} mở lại báo cáo %{target}"
-        resend_user_html: "%{name} gửi lại email xác minh cho %{target}"
+        resend_user_html: "%{name} đã gửi lại email xác minh cho %{target}"
         reset_password_user_html: "%{name} đã đặt lại mật khẩu của %{target}"
         resolve_report_html: "%{name} đã xử lý báo cáo %{target}"
         sensitive_account_html: "%{name} đánh dấu nội dung của %{target} là nhạy cảm"
@@ -424,7 +424,7 @@ vi:
       allow_registrations_with_approval: Cho đăng ký nhưng duyệt thủ công
       attempts_over_week:
         other: "%{count} lần thử đăng ký vào tuần trước"
-      created_msg: Đã chặn tên miền email này
+      created_msg: Đã chặn tên miền email thành công
       delete: Xóa bỏ
       dns:
         types:
@@ -434,7 +434,7 @@ vi:
         create: Thêm địa chỉ
         resolve: Xử lý tên miền
         title: Chặn tên miền email mới
-      no_email_domain_block_selected: Không có chặn e-mail nào thay đổi vì không có mục nào được chọn
+      no_email_domain_block_selected: Không có thay đổi vì không có mục nào được chọn
       not_permitted: Không cho phép
       resolved_dns_records_hint_html: Tên miền phân giải thành các tên miền MX sau, các tên miền này chịu trách nhiệm cuối cùng trong việc chấp nhận email. Chặn tên miền MX sẽ chặn đăng ký từ bất kỳ địa chỉ email nào sử dụng cùng một tên miền MX, ngay cả khi tên miền hiển thị là khác. <strong>Cẩn thận đừng chặn những dịch vụ email lớn.</strong>
       resolved_through_html: Đã xử lý thông qua %{domain}
@@ -588,7 +588,7 @@ vi:
         resolve_description_html: Không áp dụng trừng phạt nào và đóng báo cáo.
         silence_description_html: Chỉ hiển thị trang với những người đã theo dõi hoặc tìm kiếm thủ công.
         suspend_description_html: Tài khoản và tất cả nội dung của nó sẽ không thể truy cập được và cuối cùng sẽ bị xóa, đồng thời không thể tương tác với tài khoản đó. Có thể đảo ngược trong vòng 30 ngày. Đóng tất cả các báo cáo đối với tài khoản này.
-      actions_description_html: Nếu áp đặt trừng phạt, một email thông báo sẽ được gửi cho người này, ngoại trừ <strong>Spam</strong>.
+      actions_description_html: Nếu áp đặt kiểm duyệt, một email thông báo sẽ được gửi cho người này, ngoại trừ <strong>Spam</strong>.
       actions_description_remote_html: Chọn hành động cần thực hiện để xử lý báo cáo này. Điều này sẽ chỉ ảnh hưởng đến cách máy chủ <strong>của bạn</strong> giao tiếp với tài khoản này và xử lý nội dung của nó.
       add_to_report: Bổ sung báo cáo
       already_suspended_badges:
@@ -691,7 +691,7 @@ vi:
         manage_appeals: Quản lý kháng cáo
         manage_appeals_description: Cho phép xem xét kháng cáo đối với các hành động kiểm duyệt
         manage_blocks: Quản lý chặn
-        manage_blocks_description: Cho phép chặn các nhà cung cấp e-mail và địa chỉ IP
+        manage_blocks_description: Cho phép người dùng tự chặn các nhà cung cấp email và địa chỉ IP
         manage_custom_emojis: Quản lý emoji
         manage_custom_emojis_description: Cho phép quản lý các emoji tùy chỉnh trên máy chủ
         manage_federation: Quản lý liên hợp
@@ -709,7 +709,7 @@ vi:
         manage_taxonomies: Quản lý phân loại
         manage_taxonomies_description: Cho phép đánh giá nội dung xu hướng và cập nhật cài đặt hashtag
         manage_user_access: Quản lý người truy cập
-        manage_user_access_description: Cho phép vô hiệu hóa xác thực hai bước của người khác, thay đổi địa chỉ email và đặt lại mật khẩu của họ
+        manage_user_access_description: Cho phép người dùng tắt xác minh hai bước của người khác, đổi địa chỉ email và đặt lại mật khẩu của họ
         manage_users: Quản lý người
         manage_users_description: Cho phép xem thông tin chi tiết của người khác và thực hiện các hành động kiểm duyệt
         manage_webhooks: Quản lý Webhook
@@ -784,7 +784,7 @@ vi:
       destroyed_msg: Đã xóa tập tin tải lên thành công!
     software_updates:
       critical_update: Quan trọng — vui lòng cập nhật sớm
-      description: Bạn nên cập nhật Mastodon phiên bản mới nhất để được hưởng lợi từ các bản sửa lỗi và thêm tính năng mới. Hơn nữa, quan trọng là phải cập nhật Mastodon kịp thời để tránh các vấn đề bảo mật. Vì những lý do này, Mastodon sẽ kiểm tra các bản cập nhật 30 phút một lần và sẽ thông báo cho bạn theo tùy chọn thông báo qua email của bạn.
+      description: Bạn nên cập nhật Mastodon phiên bản mới nhất để được hưởng lợi từ các bản sửa lỗi và thêm tính năng mới. Nhất là để tránh các vấn đề bảo mật. Vì những lý do này, Mastodon sẽ kiểm tra các bản cập nhật 30 phút một lần và sẽ thông báo cho bạn theo tùy chọn thông báo qua email của bạn.
       documentation_link: Tìm hiểu thêm
       release_notes: Có gì mới?
       title: Bản cập nhật mới
@@ -893,10 +893,16 @@ vi:
     trends:
       allow: Cho phép
       approved: Đã cho phép
+      confirm_allow: Bạn có chắc muốn cho phép những hashtag đã chọn?
+      confirm_disallow: Bạn có chắc muốn cấm những hashtag đã chọn?
       disallow: Cấm
       links:
         allow: Cho phép liên kết
         allow_provider: Cho phép nguồn đăng
+        confirm_allow: Bạn có chắc muốn cho phép những liên kết đã chọn?
+        confirm_allow_provider: Bạn có chắc muốn cho phép những tên miền email đã chọn?
+        confirm_disallow: Bạn có chắc muốn cấm những liên kết đã chọn?
+        confirm_disallow_provider: Bạn có chắc muốn cấm những tên miền email đã chọn?
         description_html: Đây là những liên kết được chia sẻ nhiều trên máy chủ của bạn. Nó có thể giúp người dùng tìm hiểu những gì đang xảy ra trên thế giới. Không có liên kết nào được hiển thị công khai cho đến khi bạn duyệt nguồn đăng. Bạn cũng có thể cho phép hoặc từ chối từng liên kết riêng.
         disallow: Cấm liên kết
         disallow_provider: Cấm nguồn đăng
@@ -919,6 +925,10 @@ vi:
       statuses:
         allow: Cho phép tút
         allow_account: Cho phép người đăng
+        confirm_allow: Bạn có chắc muốn cho phép những tút đã chọn?
+        confirm_allow_account: Bạn có chắc muốn cho phép những người đã chọn?
+        confirm_disallow: Bạn có chắc muốn cấm những tút đã chọn?
+        confirm_disallow_account: Bạn có chắc muốn cấm những người đã chọn?
         description_html: Đây là những tút đang được chia sẻ và yêu thích rất nhiều trên máy chủ của bạn. Nó có thể giúp người mới và người cũ tìm thấy nhiều người hơn để theo dõi. Không có tút nào được hiển thị công khai cho đến khi bạn cho phép người đăng và người cho phép đề xuất tài khoản của họ cho người khác. Bạn cũng có thể cho phép hoặc từ chối từng tút riêng.
         disallow: Cấm tút
         disallow_account: Cấm người đăng
@@ -949,7 +959,7 @@ vi:
         usage_comparison: Dùng %{today} lần hôm nay, so với %{yesterday} hôm qua
         used_by_over_week:
           other: "%{count} người dùng tuần rồi"
-      title: Xu hướng
+      title: Đề xuất & Xu hướng
       trending: Xu hướng
     warning_presets:
       add_new: Thêm mới
@@ -1033,9 +1043,9 @@ vi:
       guide_link_text: Ai cũng có thể đóng góp.
     sensitive_content: Nội dung nhạy cảm
   application_mailer:
-    notification_preferences: Thay đổi tùy chọn email
+    notification_preferences: Thay đổi thiết lập email
     salutation: "%{name},"
-    settings: 'Thay đổi tùy chọn email: %{link}'
+    settings: 'Thay đổi thiết lập email: %{link}'
     unsubscribe: Hủy đăng ký
     view: 'Chi tiết:'
     view_profile: Xem trang hồ sơ
@@ -1055,7 +1065,7 @@ vi:
       hint_html: Còn một xíu nữa! Chúng tôi cần xác minh bạn là con người (để chúng tôi có thể ngăn chặn thư rác!). Nhập CAPTCHA bên dưới và nhấn "Tiếp tục".
       title: Kiểm tra an toàn
     confirmations:
-      awaiting_review: Đã xác minh email của bạn! Kiểm duyệt viên %{domain} đang xem xét đăng ký của bạn. Bạn sẽ nhận được một email nếu tài khoản của bạn được duyệt!
+      awaiting_review: Đã nhận yêu cầu! Kiểm duyệt viên %{domain} đang xem xét đăng ký của bạn. Bạn sẽ nhận được một email nếu tài khoản của bạn được duyệt!
       awaiting_review_title: Đăng ký của bạn đang chờ duyệt
       clicking_this_link: nhấn vào link này
       login_link: đăng nhập
@@ -1063,7 +1073,7 @@ vi:
       redirect_to_app_html: Bạn đã có thể chuyển tiếp tới <strong>%{app_name}</strong>. Nếu không có gì xảy ra, thử %{clicking_this_link} hoặc tự quay lại app.
       registration_complete: Hoàn tất đăng ký trên %{domain}!
       welcome_title: Chào mừng, %{name}!
-      wrong_email_hint: Nếu địa chỉ email đó không chính xác, bạn có thể thay đổi nó trong cài đặt tài khoản.
+      wrong_email_hint: Nếu địa chỉ email đó không chính xác, bạn có thể đổi lại trong cài đặt tài khoản.
     delete_account: Xóa tài khoản
     delete_account_html: Nếu bạn muốn xóa tài khoản của mình, hãy <a href="%{path}">yêu cầu tại đây</a>. Bạn sẽ được yêu cầu xác nhận.
     description:
@@ -1084,7 +1094,7 @@ vi:
     or_log_in_with: Hoặc đăng nhập bằng
     privacy_policy_agreement_html: Tôi đã đọc và đồng ý <a href="%{privacy_policy_path}" target="_blank">chính sách bảo mật</a>
     progress:
-      confirm: Xác minh email
+      confirm: Xác nhận email
       details: Điền thông tin
       review: Đợi duyệt
       rules: Đọc nội quy
@@ -1165,9 +1175,9 @@ vi:
       before: 'Trước khi tiếp tục, xin vui lòng xem xét cẩn thận:'
       caches: Nội dung đã lưu trữ trên các máy chủ khác có thể vẫn tồn tại
       data_removal: Bài viết của bạn và dữ liệu khác sẽ bị xóa vĩnh viễn
-      email_change_html: Bạn có thể <a href="%{path}">thay đổi địa chỉ email</a> mà không cần phải xóa tài khoản
-      email_contact_html: Nếu vẫn không nhận được, bạn có thể liên hệ <a href="mailto:%{email}">%{email}</a> để được giúp đỡ
-      email_reconfirmation_html: Nếu bạn không nhận được email xác minh, hãy thử <a href="%{path}">yêu cầu lại</a>
+      email_change_html: Bạn có thể <a href="%{path}">đổi địa chỉ email</a> mà không cần phải xóa tài khoản
+      email_contact_html: Nếu vẫn không nhận được, hãy liên hệ <a href="mailto:%{email}">%{email}</a> để được giúp đỡ
+      email_reconfirmation_html: Nếu bạn không nhận được email xác nhận, hãy thử <a href="%{path}">yêu cầu lại</a>
       irreversible: Bạn sẽ không thể khôi phục hoặc kích hoạt lại tài khoản của mình
       more_details_html: Đọc <a href="%{terms_path}">chính sách bảo mật</a> để biết thêm chi tiết.
       username_available: Tên người dùng của bạn sẽ có thể đăng ký lại
@@ -1403,16 +1413,16 @@ vi:
     unsubscribe:
       action: Đúng, hủy đăng ký
       complete: Đã hủy đăng ký
-      confirmation_html: Bạn có có chắc muốn hủy đăng ký %{type} Mastodon trên %{domain} cho %{email}? Bạn có thể đăng ký lại từ <a href="%{settings_path}">cài đặt thông báo email</a>.
+      confirmation_html: Bạn có chắc muốn hủy đăng ký %{type} Mastodon trên %{domain} tới %{email}? Bạn có thể đăng ký lại từ <a href="%{settings_path}">cài đặt thông báo email</a>.
       emails:
         notification_emails:
           favourite: email thông báo lượt thích
-          follow: email thông báo theo dõi
+          follow: email thông báo người theo dõi mới
           follow_request: email thông báo yêu cầu theo dõi
           mention: email thông báo lượt nhắc đến
           reblog: email thông báo lượt đăng lại
       resubscribe_html: Nếu đổi ý, bạn có thể đăng ký lại từ <a href="%{settings_path}">cài đặt thông báo email</a>.
-      success_html: Bạn sẽ không còn nhận %{type} Mastodon trên %{domain} cho %{email}.
+      success_html: Bạn sẽ không còn nhận %{type} Mastodon trên %{domain} tới %{email}.
       title: Hủy đăng ký
   media_attachments:
     validations:
@@ -1493,8 +1503,8 @@ vi:
     update:
       subject: "%{name} đã sửa một tút"
   notifications:
-    administration_emails: Email thông báo admin
-    email_events: Email
+    administration_emails: Thông báo email admin
+    email_events: Những sự kiện thông báo email
     email_events_hint: 'Chọn những hoạt động sẽ gửi thông báo qua email:'
   number:
     human:
@@ -1653,7 +1663,7 @@ vi:
     import: Nhập dữ liệu
     import_and_export: Dữ liệu
     migrate: Chuyển tài khoản sang máy chủ khác
-    notifications: Thông báo email
+    notifications: Thông báo qua email
     preferences: Chung
     profile: Hồ sơ
     relationships: Quan hệ
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index f08142719aac46..36b62e535d9fda 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -29,18 +29,18 @@ zh-CN:
       created_msg: 管理记录创建成功！
       destroyed_msg: 管理记录删除成功！
     accounts:
-      add_email_domain_block: 封禁电子邮箱域名
+      add_email_domain_block: 封禁邮箱域名
       approve: 批准
       approved_msg: 已批准 %{username} 的注册申请
       are_you_sure: 你确定吗？
       avatar: 头像
       by_domain: 域名
       change_email:
-        changed_msg: 已成功更改电子邮件地址！
+        changed_msg: 已成功更改邮箱地址！
         current_email: 当前的电子邮箱
         label: 更改电子邮箱
         new_email: 新的电子邮箱
-        submit: 更改电子邮箱
+        submit: 更改邮箱
         title: 更改 %{username} 的电子邮箱
       change_role:
         changed_msg: 已成功更改角色！
@@ -56,16 +56,16 @@ zh-CN:
       demote: 降任
       destroyed_msg: "%{username} 的数据已被安排至删除队列"
       disable: 冻结
-      disable_sign_in_token_auth: 禁用电子邮件令牌认证
+      disable_sign_in_token_auth: 禁用邮件令牌身份验证
       disable_two_factor_authentication: 停用双因素认证
       disabled: 已冻结
       display_name: 昵称
       domain: 域名
       edit: 编辑
       email: 电子邮箱地址
-      email_status: 电子邮件地址状态
+      email_status: 邮箱地址状态
       enable: 解冻
-      enable_sign_in_token_auth: 启用电子邮件令牌认证
+      enable_sign_in_token_auth: 启用邮件令牌身份验证
       enabled: 已启用
       enabled_msg: 成功解冻 %{username} 的账号
       followers: 粉丝
@@ -129,7 +129,7 @@ zh-CN:
       resubscribe: 重新订阅
       role: 角色
       search: 搜索
-      search_same_email_domain: 其他具有相同电子邮箱域名的用户
+      search_same_email_domain: 其他使用相同邮箱域名的用户
       search_same_ip: 具有相同IP的其他用户
       security: 安全性
       security_measures:
@@ -153,7 +153,7 @@ zh-CN:
       title: 用户
       unblock_email: 取消屏蔽邮件地址
       unblocked_email_msg: 成功取消屏蔽了 %{username} 的邮件地址
-      unconfirmed_email: 待验证的电子邮件地址
+      unconfirmed_email: 待验证的邮箱地址
       undo_sensitized: 去除敏感内容标记
       undo_silenced: 解除隐藏
       undo_suspension: 解除封禁
@@ -170,26 +170,26 @@ zh-CN:
         approve_appeal: 批准申诉
         approve_user: 批准用户
         assigned_to_self_report: 指派举报
-        change_email_user: 为用户修改邮箱地址
+        change_email_user: 为用户修改邮箱
         change_role_user: 更改用户角色
         confirm_user: 确认用户
         create_account_warning: 创建警告
         create_announcement: 创建公告
-        create_canonical_email_block: 新增 E-mail 屏蔽
+        create_canonical_email_block: 封禁新的邮箱
         create_custom_emoji: 创建自定义表情符号
         create_domain_allow: 允许新域名
         create_domain_block: 封禁新域名
-        create_email_domain_block: 封禁电子邮箱域名
+        create_email_domain_block: 封禁新的邮箱域名
         create_ip_block: 新建 IP 规则
         create_unavailable_domain: 创建不可用域名
         create_user_role: 创建角色
         demote_user: 给用户降职
         destroy_announcement: 删除公告
-        destroy_canonical_email_block: 删除 E-mail 封禁
+        destroy_canonical_email_block: 解除邮箱封禁
         destroy_custom_emoji: 删除自定义表情符号
         destroy_domain_allow: 解除域名允许
         destroy_domain_block: 解除域名封禁
-        destroy_email_domain_block: 解除电子邮箱域名封禁
+        destroy_email_domain_block: 解除邮箱域名封禁
         destroy_instance: 删除实例
         destroy_ip_block: 删除 IP 规则
         destroy_status: 删除嘟文
@@ -197,10 +197,10 @@ zh-CN:
         destroy_user_role: 销毁角色
         disable_2fa_user: 停用双因素认证
         disable_custom_emoji: 禁用自定义表情符号
-        disable_sign_in_token_auth_user: 为用户禁用电子邮件令牌认证
+        disable_sign_in_token_auth_user: 为用户禁用邮件令牌身份验证
         disable_user: 禁用用户
         enable_custom_emoji: 启用自定义表情符号
-        enable_sign_in_token_auth_user: 为用户启用电子邮件令牌认证
+        enable_sign_in_token_auth_user: 为用户启用邮件令牌身份验证
         enable_user: 启用用户
         memorialize_account: 将账户设为追悼模式
         promote_user: 给用户升任
@@ -208,7 +208,7 @@ zh-CN:
         reject_user: 拒绝用户
         remove_avatar_user: 移除头像
         reopen_report: 重开举报
-        resend_user: 重新发送确认电子邮件
+        resend_user: 重新发送确认邮件
         reset_password_user: 重置密码
         resolve_report: 处理举报
         sensitive_account: 将你账号中的媒体标记为敏感内容
@@ -230,26 +230,26 @@ zh-CN:
         approve_appeal_html: "%{name} 批准了 %{target} 对审核结果的申诉"
         approve_user_html: "%{name} 批准了用户 %{target} 的注册"
         assigned_to_self_report_html: "%{name} 接管了举报 %{target}"
-        change_email_user_html: "%{name} 更改了用户 %{target} 的电子邮件地址"
+        change_email_user_html: "%{name} 修改了用户 %{target} 的邮箱地址"
         change_role_user_html: "%{name} 更改了 %{target} 的角色"
-        confirm_user_html: "%{name} 确认了用户 %{target} 的电子邮件地址"
+        confirm_user_html: "%{name} 确认了用户 %{target} 的邮箱地址"
         create_account_warning_html: "%{name} 向 %{target} 发送了警告"
         create_announcement_html: "%{name} 创建了新公告 %{target}"
-        create_canonical_email_block_html: "%{name} 屏蔽了 hash 为 %{target} 的电子邮箱"
+        create_canonical_email_block_html: "%{name} 封禁了 hash 为 %{target} 的邮箱地址"
         create_custom_emoji_html: "%{name} 添加了新的自定义表情 %{target}"
         create_domain_allow_html: "%{name} 允许了和域名 %{target} 的跨站交互"
         create_domain_block_html: "%{name} 屏蔽了域名 %{target}"
-        create_email_domain_block_html: "%{name} 屏蔽了电子邮件域名 %{target}"
+        create_email_domain_block_html: "%{name} 封禁了邮箱域名 %{target}"
         create_ip_block_html: "%{name} 为 IP %{target} 创建了规则"
         create_unavailable_domain_html: "%{name} 停止了向域名 %{target} 的投递"
         create_user_role_html: "%{name} 创建了 %{target} 角色"
         demote_user_html: "%{name} 对用户 %{target} 进行了降任操作"
         destroy_announcement_html: "%{name} 删除了公告 %{target}"
-        destroy_canonical_email_block_html: "%{name} 解除屏蔽了 hash 为 %{target} 的电子邮箱"
+        destroy_canonical_email_block_html: "%{name} 解封了 hash 为 %{target} 的邮箱地址"
         destroy_custom_emoji_html: "%{name} 删除了自定义表情 %{target}"
         destroy_domain_allow_html: "%{name} 拒绝了和 %{target} 跨站交互"
         destroy_domain_block_html: "%{name} 解除了对域名 %{target} 的屏蔽"
-        destroy_email_domain_block_html: "%{name} 解除了对电子邮件域名 %{target} 的屏蔽"
+        destroy_email_domain_block_html: "%{name} 解封了邮箱域名 %{target}"
         destroy_instance_html: "%{name} 删除了实例 %{target}"
         destroy_ip_block_html: "%{name} 删除了 IP %{target} 的规则"
         destroy_status_html: "%{name} 删除了 %{target} 的嘟文"
@@ -257,10 +257,10 @@ zh-CN:
         destroy_user_role_html: "%{name} 删除了 %{target} 角色"
         disable_2fa_user_html: "%{name} 停用了用户 %{target} 的双因素认证"
         disable_custom_emoji_html: "%{name} 停用了自定义表情 %{target}"
-        disable_sign_in_token_auth_user_html: "%{name} 已为 %{target} 禁用电子邮件令牌认证"
+        disable_sign_in_token_auth_user_html: "%{name} 为 %{target} 禁用了邮件令牌身份验证"
         disable_user_html: "%{name} 将用户 %{target} 设置为禁止登录"
         enable_custom_emoji_html: "%{name} 启用了自定义表情 %{target}"
-        enable_sign_in_token_auth_user_html: "%{name} 已为 %{target} 启用电子邮件令牌认证"
+        enable_sign_in_token_auth_user_html: "%{name} 为 %{target} 启用了邮件令牌身份验证"
         enable_user_html: "%{name} 将用户 %{target} 设置为允许登录"
         memorialize_account_html: "%{name} 将 %{target} 设置为追悼账户"
         promote_user_html: "%{name} 对用户 %{target} 进行了升任操作"
@@ -268,7 +268,7 @@ zh-CN:
         reject_user_html: "%{name} 拒绝了用户 %{target} 的注册"
         remove_avatar_user_html: "%{name} 删除了 %{target} 的头像"
         reopen_report_html: "%{name} 重开了举报 %{target}"
-        resend_user_html: "%{name} 给 %{target} 重新发送了确认电子邮件"
+        resend_user_html: "%{name} 向 %{target} 重新发送了确认邮件"
         reset_password_user_html: "%{name} 重置了用户 %{target} 的密码"
         resolve_report_html: "%{name} 处理了举报 %{target}"
         sensitive_account_html: "%{name} 将 %{target} 的媒体标记为敏感内容"
@@ -424,7 +424,7 @@ zh-CN:
       allow_registrations_with_approval: 注册时需要批准
       attempts_over_week:
         other: 上周有 %{count} 次注册尝试
-      created_msg: 成功屏蔽电子邮件域名
+      created_msg: 成功封禁邮箱域名
       delete: 删除
       dns:
         types:
@@ -433,12 +433,12 @@ zh-CN:
       new:
         create: 添加域名
         resolve: 解析域名
-        title: 添加电子邮件域名屏蔽
-      no_email_domain_block_selected: 没有任何项目被选中，因此未能更改电子邮件域名屏蔽列表
+        title: 封禁新的邮箱域名
+      no_email_domain_block_selected: 没有任何项目被选中，因此未更改邮箱域名屏蔽列表
       not_permitted: 未允许
-      resolved_dns_records_hint_html: 该域名解析的 MX 记录所指向的域名如下，这些域名被用于接收电子邮件。 即使电子邮件地址域名与 MX 域名不同，屏蔽一个 MX 域名意味着阻止任何使用相同 MX 域名的电子邮件地址注册本站账户。 <strong>请小心不要误屏蔽主要的电子邮件提供商。</strong>
+      resolved_dns_records_hint_html: 该域名解析的 MX 记录所指向的域名如下，这些域名被用于接收电子邮件。 即使电子邮件地址域名与 MX 域名不同，屏蔽一个 MX 域名意味着阻止任何使用相同 MX 域名的邮箱地址注册本站账户。 <strong>请谨慎操作，不要误屏蔽主要的邮箱提供商。</strong>
       resolved_through_html: 通过 %{domain} 解析
-      title: 电子邮件域名屏蔽
+      title: 被封禁的邮箱域名
     export_domain_allows:
       new:
         title: 导入域名允许列表
@@ -653,7 +653,7 @@ zh-CN:
         delete_data_html: 从现在起 30 天后删除 <strong>@%{acct}</strong> 的个人资料和内容，除非他们同时解除暂停。
         preview_preamble_html: "<strong>@%{acct}</strong> 将收到包含以下内容的警告："
         record_strike_html: 记录一次针对 <strong>@%{acct}</strong> 的警示，以帮助您在这个帐户上的未来违规事件中得到重视。
-        send_email_html: 向 <strong>@%{acct}</strong> 发送警告电子邮件
+        send_email_html: 向 <strong>@%{acct}</strong> 发送警告邮件
         warning_placeholder: 可选的补充理由，以说明调整的情况。
       target_origin: 被举报账号的来源
       title: 举报
@@ -691,7 +691,7 @@ zh-CN:
         manage_appeals: 管理申诉
         manage_appeals_description: 允许用户审阅针对管理操作的申诉
         manage_blocks: 管理地址段
-        manage_blocks_description: 允许用户屏蔽电子邮件提供商和IP地址
+        manage_blocks_description: 允许用户屏蔽邮箱提供商和IP地址
         manage_custom_emojis: 管理自定义表情
         manage_custom_emojis_description: 允许用户管理服务器上的自定义表情
         manage_federation: 管理邦联
@@ -709,7 +709,7 @@ zh-CN:
         manage_taxonomies: 管理分类
         manage_taxonomies_description: 允许用户查看热门内容并更新标签设置
         manage_user_access: 管理访问
-        manage_user_access_description: 允许用户禁用其他用户的双因素认证、更改他们的电子邮件地址，以及重置他们的密码
+        manage_user_access_description: 允许用户禁用其它用户的双因素身份验证，更改他们的邮箱地址，以及重置他们的密码。
         manage_users: 管理用户
         manage_users_description: 允许用户查看其他用户的信息并执行管理操作
         manage_webhooks: 管理 Webhooks
@@ -758,7 +758,7 @@ zh-CN:
         publish_discovered_servers: 已公开实例的服务器
         publish_statistics: 发布统计数据
         title: 发现
-        trends: 流行趋势
+        trends: 热门
       domain_blocks:
         all: 对所有人
         disabled: 不对任何人
@@ -784,7 +784,7 @@ zh-CN:
       destroyed_msg: 站点上传的文件已经成功删除！
     software_updates:
       critical_update: 紧急 — 请尽快更新
-      description: 建议您及时更新Mastodon实例，以便获得最新修复和功能。此外，为避免安全问题，有时候及时更新Mastodon是至关重要的。出于这些原因，Mastodon每30分钟检查一次更新，并根据您的电子邮件通知偏好向您发送通知。
+      description: 建议你及时更新Mastodon实例，以便获得最新修复和功能。此外，为避免安全问题，有时及时更新Mastodon是至关重要的。出于这些原因，Mastodon每30分钟检查一次更新，并根据您的邮件通知偏好向您发送通知。
       documentation_link: 详细了解
       release_notes: 发行说明
       title: 可用的更新
@@ -872,13 +872,13 @@ zh-CN:
         message_html: "<strong>您的对象存储空间配置错误，您用户的隐私处于危险中。</strong>"
     tags:
       moderation:
-        not_trendable: 不在趋势中显示
+        not_trendable: 不在热门中显示
         not_usable: 不可用
         pending_review: 待审核
         review_requested: 已请求审核
         reviewed: 已审核
         title: 状态
-        trendable: 可在趋势中显示
+        trendable: 可在热门中显示
         unreviewed: 未审核
         usable: 可用
       name: 名称
@@ -893,10 +893,16 @@ zh-CN:
     trends:
       allow: 允许
       approved: 已批准
+      confirm_allow: 你确定要允许选中的标签吗？
+      confirm_disallow: 你确定要禁止选中的标签吗？
       disallow: 不允许
       links:
         allow: 允许链接
         allow_provider: 允许发布者
+        confirm_allow: 你确定要允许选中的链接吗？
+        confirm_allow_provider: 你确定要允许选中的内容提供者吗？
+        confirm_disallow: 你确定要禁止选中的链接吗？
+        confirm_disallow_provider: 你确定要禁止选中的内容提供者吗？
         description_html: 这些是当前此服务器可见账号的嘟文中被大量分享的链接。它可以帮助用户了解正在发生的事情。发布者获得批准前不会公开显示任何链接。你也可以批准或拒绝个别链接。
         disallow: 不允许链接
         disallow_provider: 不允许发布者
@@ -907,7 +913,7 @@ zh-CN:
           other: 过去一周内被 %{count} 个人分享过
         title: 热门链接
         usage_comparison: 今日被分享 %{today} 次，前一日为 %{yesterday} 次
-      not_allowed_to_trend: 不允许的趋势
+      not_allowed_to_trend: 不允许进入热门
       only_allowed: 仅显示已允许的内容
       pending_review: 待审核
       preview_card_providers:
@@ -919,6 +925,10 @@ zh-CN:
       statuses:
         allow: 允许嘟文
         allow_account: 允许发布者
+        confirm_allow: 你确定要允许选中的嘟文吗？
+        confirm_allow_account: 你确定要允许选中的账户吗？
+        confirm_disallow: 你确定要禁止选中的嘟文吗？
+        confirm_disallow_account: 你确定要禁止选中的账户吗？
         description_html: 这些是当前此服务器可见的被大量分享和喜欢的嘟文。这些嘟文可以帮助新老用户找到更多可关注的账号。批准发布者且发布者允许将其账号推荐给其他用户前，不会公开显示任何嘟文。你也可以批准或拒绝个别嘟文。
         disallow: 禁止嘟文
         disallow_account: 禁止发布者
@@ -949,7 +959,7 @@ zh-CN:
         usage_comparison: 今日被使用 %{today} 次，前一日为 %{yesterday} 次
         used_by_over_week:
           other: 过去一周内被 %{count} 个人使用过
-      title: 流行趋势
+      title: 建议与热门
       trending: 当前热门
     warning_presets:
       add_new: 添加新条目
@@ -1033,9 +1043,9 @@ zh-CN:
       guide_link_text: 每个人都可以参与翻译。
     sensitive_content: 敏感内容
   application_mailer:
-    notification_preferences: 更改电子邮件首选项
+    notification_preferences: 更改邮件偏好
     salutation: "%{name}："
-    settings: 使用此链接更改你的电子邮件首选项：%{link}
+    settings: 更改邮件偏好： %{link}
     unsubscribe: 取消订阅
     view: 点此链接查看详情：
     view_profile: 查看个人资料页
@@ -1055,7 +1065,7 @@ zh-CN:
       hint_html: 只剩最后一件事了！我们需要确认您是一个人类（这样我们才能阻止恶意访问！）。请输入下面的验证码，然后点击“继续”。
       title: 安全检查
     confirmations:
-      awaiting_review: 您的电子邮件地址已确认！%{domain} 的工作人员正在审核您的注册信息。如果他们批准了您的账户，您将收到一封邮件通知！
+      awaiting_review: 你的邮箱地址已确认！%{domain} 的工作人员正在审核你的注册信息。如果他们批准了你的账户，你将收到一封邮件通知！
       awaiting_review_title: 您的注册申请正在审核中
       clicking_this_link: 点击此链接
       login_link: 登录
@@ -1063,7 +1073,7 @@ zh-CN:
       redirect_to_app_html: 您应该已被重定向到 <strong>%{app_name}</strong> 应用程序。如果没有，请尝试 %{clicking_this_link} 或手动返回应用程序。
       registration_complete: 您在 %{domain} 上的注册现已完成！
       welcome_title: 欢迎您，%{name}！
-      wrong_email_hint: 如果该电子邮件地址不正确，您可以在帐户设置中进行更改。
+      wrong_email_hint: 如果该邮箱地址不正确，你可以在账户设置中进行更改。
     delete_account: 删除帐户
     delete_account_html: 如果你想删除你的帐户，请<a href="%{path}">点击这里继续</a>。你需要确认你的操作。
     description:
@@ -1084,7 +1094,7 @@ zh-CN:
     or_log_in_with: 或通过外部服务登录
     privacy_policy_agreement_html: 我已阅读并同意 <a href="%{privacy_policy_path}" target="_blank">隐私政策</a>
     progress:
-      confirm: 确认电子邮件地址
+      confirm: 确认邮箱
       details: 您的详情
       review: 我们的复审
       rules: 接受规则
@@ -1106,11 +1116,11 @@ zh-CN:
     security: 账户安全
     set_new_password: 设置新密码
     setup:
-      email_below_hint_html: 请检查的垃圾邮件文件夹，或请求再次发送一次。如果您的电子邮件地址不对，您可以更正您的电子邮件地址。
+      email_below_hint_html: 请检查你的垃圾邮件文件夹，或请求再发送一次。如果你的邮箱地址不正确，你可以更正它。
       email_settings_hint_html: 请点击我们发送给 %{email} 地址中的确认链接。我在这儿等着您。
       link_not_received: 没有收到链接？
-      new_confirmation_instructions_sent: 您将在几分钟内收到一封带有确认链接的新邮件！
-      title: 请检查你的电子邮件收件箱
+      new_confirmation_instructions_sent: 你将在几分钟内收到一封带有确认链接的新邮件！
+      title: 请检查你的收件箱
     sign_in:
       preamble_html: 使用您在 <strong>%{domain}</strong> 的账户和密码登录。如果您的账户托管在其他的服务器上，您将无法在此登录。
       title: 登录到 %{domain}
@@ -1120,9 +1130,9 @@ zh-CN:
       title: 让我们在 %{domain} 上开始。
     status:
       account_status: 账户状态
-      confirming: 等待电子邮件确认完成。
+      confirming: 等待完成邮箱地址确认
       functional: 你的账号可以正常使用了。
-      pending: 工作人员正在审核你的申请。这需要花点时间。在申请被批准后，你将收到一封电子邮件。
+      pending: 站务人员正在审核你的申请。这需要花点时间。在申请被批准后，你将收到一封邮件。
       redirecting_to: 你的账户无效，因为它已被设置为跳转到 %{acct}
       self_destruct: 由于 %{domain} 即将关闭，你只能获得对你本人账号的有限访问权限。
       view_strikes: 查看针对你账号的记录
@@ -1165,8 +1175,8 @@ zh-CN:
       before: 在删除前，请仔细阅读下列说明：
       caches: 已被其他服务器缓存的内容可能还会保留
       data_removal: 你的嘟文和其他数据将被永久删除
-      email_change_html: 你可以 <a href="%{path}">更换邮箱地址</a> 无需删除账号
-      email_contact_html: 如果它还没送到，你可以发邮件给 <a href="mailto:%{email}">%{email}</a> 寻求帮助。
+      email_change_html: 你可以 <a href="%{path}">更改邮箱地址</a>，而无需删除账号
+      email_contact_html: 如果它还未送达，你可以发邮件给 <a href="mailto:%{email}">%{email}</a> 寻求帮助。
       email_reconfirmation_html: 如果你没有收到确认邮件，请点击 <a href="%{path}">重新发送</a> 。
       irreversible: 你将无法恢复或重新激活你的账户
       more_details_html: 更多细节，请查看 <a href="%{terms_path}">隐私政策</a> 。
@@ -1392,7 +1402,7 @@ zh-CN:
     authentication_methods:
       otp: 双因素认证应用
       password: 密码
-      sign_in_token: 电子邮件安全代码
+      sign_in_token: 邮件安全码
       webauthn: 安全密钥
     description_html: 如有您无法识别的活动，请考虑更改密码并启用双因素认证。
     empty: 没有可用的认证记录
@@ -1403,16 +1413,16 @@ zh-CN:
     unsubscribe:
       action: 是，取消订阅
       complete: 已取消订阅
-      confirmation_html: 您确定要取消订阅来自 %{domain} 上的 Mastodon 的 %{type} 到您的邮箱 %{email} 吗？您可以随时在<a href="%{settings_path}">电子邮件通知设置</a>重新订阅。
+      confirmation_html: 你确定要退订来自 %{domain} 上的 Mastodon 的 %{type} 到您的邮箱 %{email} 吗？您可以随时在<a href="%{settings_path}">邮件通知设置</a>中重新订阅。
       emails:
         notification_emails:
-          favourite: 嘟文被点赞邮件通知
+          favourite: 嘟文被喜欢邮件通知
           follow: 账户被关注邮件通知
           follow_request: 关注请求邮件通知
           mention: 账户被提及邮件通知
-          reblog: 被转嘟邮件通知
-      resubscribe_html: 如果您不小心取消订阅，可以从您的<a href="%{settings_path}">电子邮件通知设置</a>重新订阅。
-      success_html: 您将不会在您的邮箱 %{email} 中收到 %{domain} 上的 Mastodon的 %{type}
+          reblog: 嘟文被转嘟邮件通知
+      resubscribe_html: 如果你不小心取消了订阅，可以在你的<a href="%{settings_path}">邮件通知设置</a>中重新订阅。
+      success_html: 你将不会在你的邮箱 %{email} 中收到 %{domain} 上的 Mastodon的 %{type}
       title: 取消订阅
   media_attachments:
     validations:
@@ -1494,7 +1504,7 @@ zh-CN:
       subject: "%{name} 编辑了嘟文"
   notifications:
     administration_emails: 管理员电子邮件通知
-    email_events: 电子邮件通知事件
+    email_events: 邮件通知事件
     email_events_hint: 选择你想要收到通知的事件：
   number:
     human:
@@ -1653,7 +1663,7 @@ zh-CN:
     import: 导入
     import_and_export: 导入和导出
     migrate: 账户迁移
-    notifications: 电子邮件通知
+    notifications: 邮件通知
     preferences: 首选项
     profile: 个人资料
     relationships: 关注管理
@@ -1893,7 +1903,7 @@ zh-CN:
     invalid_otp_token: 输入的双因素认证代码无效
     otp_lost_help_html: 如果你不慎丢失了所有的代码，请联系 %{email} 寻求帮助
     rate_limited: 验证尝试次数过多，请稍后再试。
-    seamless_external_login: 因为你是通过外部服务登录的，所以密码和电子邮件地址设置都不可用。
+    seamless_external_login: 你通过外部服务登录，因此密码和邮件设置不可用。
     signed_in_as: 当前登录的账户：
   verification:
     extra_instructions_html: <strong>提示：</strong>您网站上的链接可能是不可见的。重要的部分是 <code>rel="me"</code>，它可以防止在具有用户生成内容的网站上冒充身份。您甚至可以在页面头部使用 <code>link</code> 标签而不是 <code>a</code>，但 HTML 必须能够在不执行 JavaScript 的情况下访问。
diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml
index 6ec0b098349e56..26743d2cb12e9e 100644
--- a/config/locales/zh-HK.yml
+++ b/config/locales/zh-HK.yml
@@ -29,7 +29,6 @@ zh-HK:
       created_msg: 已新增管理紀錄
       destroyed_msg: 管理紀錄已被刪除
     accounts:
-      add_email_domain_block: 封鎖電郵網域
       approve: 核准
       approved_msg: 成功審核了%{username} 的新帳號申請
       are_you_sure: 你確定嗎？
@@ -56,7 +55,6 @@ zh-HK:
       demote: 降權
       destroyed_msg: 即將刪除 %{username} 的數據
       disable: 停用
-      disable_sign_in_token_auth: 停用 e-mail 驗證碼
       disable_two_factor_authentication: 關閉雙重認證
       disabled: 已凍結
       display_name: 顯示名稱
@@ -65,7 +63,6 @@ zh-HK:
       email: 電郵地址
       email_status: 電郵狀態
       enable: 解除凍結
-      enable_sign_in_token_auth: 啟用 e-mail 驗證碼
       enabled: 已啟用
       enabled_msg: 成功解除 %{username} 帳號的凍結
       followers: 關注者
@@ -129,7 +126,6 @@ zh-HK:
       resubscribe: 重新訂閱
       role: 身份
       search: 搜尋
-      search_same_email_domain: 其他有相同電郵網域的使用者
       search_same_ip: 其他有相同 IP 位址的使用者
       security: 安全性
       security_measures:
@@ -170,26 +166,21 @@ zh-HK:
         approve_appeal: 批准申訴
         approve_user: 批准使用者
         assigned_to_self_report: 指派舉報
-        change_email_user: 更改使用者的電郵
         change_role_user: 更改使用者身份
         confirm_user: 確認使用者
         create_account_warning: 新增警告
         create_announcement: 建立公告
-        create_canonical_email_block: 建立電郵封鎖
         create_custom_emoji: 新增自訂的 Emoji
         create_domain_allow: 新增允許的域名
         create_domain_block: 封鎖域名
-        create_email_domain_block: 封鎖電郵域名
         create_ip_block: 新增IP規則
         create_unavailable_domain: 創建無效域名
         create_user_role: 新增身份
         demote_user: 將帳號降級
         destroy_announcement: 刪除公告
-        destroy_canonical_email_block: 刪除電郵封鎖
         destroy_custom_emoji: 刪除自定的 Emoji 表情符號
         destroy_domain_allow: 刪除允許的域名
         destroy_domain_block: 刪除已封鎖的域名
-        destroy_email_domain_block: 刪除已封鎖的電郵城名
         destroy_instance: 清除網域
         destroy_ip_block: 刪除 IP 規則
         destroy_status: 刪除文章
@@ -197,10 +188,8 @@ zh-HK:
         destroy_user_role: 刪除身份
         disable_2fa_user: 停用兩步驟驗證
         disable_custom_emoji: 停用自定的 Emoji 表情符號
-        disable_sign_in_token_auth_user: 停用該使用者之 e-mail 驗證碼
         disable_user: 停用帳號
         enable_custom_emoji: 啟用自定的 Emoji 表情符號
-        enable_sign_in_token_auth_user: 啟用該使用者之 e-mail 驗證碼
         enable_user: 啟用帳號
         memorialize_account: 把帳號設定為悼念帳號
         promote_user: 提升帳號權限
@@ -229,26 +218,20 @@ zh-HK:
         approve_appeal_html: "%{name} 批准了 %{target} 的審核裁決申訴"
         approve_user_html: "%{name} 批准了 %{target} 的註冊"
         assigned_to_self_report_html: "%{name} 指派了 %{target} 的檢舉給自己"
-        change_email_user_html: "%{name} 更改了使用者 %{target} 的 e-mail 地址"
         change_role_user_html: "%{name} 更改了 %{target} 的身份"
-        confirm_user_html: "%{name} 已確認使用者 %{target} 的 e-mail 地址"
         create_account_warning_html: "%{name} 已警告了 %{target}"
         create_announcement_html: "%{name} 新增了公告 %{target}"
-        create_canonical_email_block_html: "%{name} 封鎖了 hash 為 %{target} 的電郵"
         create_custom_emoji_html: "%{name} 加入了新的 Emoji %{target}"
         create_domain_allow_html: "%{name} 允許網域 %{target} 加入聯邦宇宙"
         create_domain_block_html: "%{name} 封鎖了網域 %{target}"
-        create_email_domain_block_html: "%{name} 封鎖了 e-mail 網域 %{target}"
         create_ip_block_html: "%{name} 已經設定了針對 IP %{target} 的規則"
         create_unavailable_domain_html: "%{name} 停止了對網域 %{target} 的更新通知"
         create_user_role_html: "%{name} 建立了 %{target} 身份"
         demote_user_html: "%{name} 降權了 %{target}"
         destroy_announcement_html: "%{name} 刪除了公告 %{target}"
-        destroy_canonical_email_block_html: "%{name} 解除封鎖了 hash 為 %{target} 的電郵"
         destroy_custom_emoji_html: "%{name} 刪除了 %{target} emoji"
         destroy_domain_allow_html: "%{name} 禁止網域 %{target} 加入聯邦宇宙"
         destroy_domain_block_html: "%{name} 封鎖了網域 %{target}"
-        destroy_email_domain_block_html: "%{name} 解除封鎖 e-mail 網域 %{target}"
         destroy_instance_html: "%{name} 清除了網域 %{target}"
         destroy_ip_block_html: "%{name} 已經刪除了 IP %{target} 的規則"
         destroy_status_html: "%{name} 刪除了 %{target} 的嘟文"
@@ -256,10 +239,8 @@ zh-HK:
         destroy_user_role_html: "%{name} 刪除了 %{target} 身份"
         disable_2fa_user_html: "%{name} 停用了使用者 %{target} 的雙重認證"
         disable_custom_emoji_html: "%{name} 停用了 Emoji %{target}"
-        disable_sign_in_token_auth_user_html: "%{name} 停用了使用者 %{target} 的 e-mail 驗證碼"
         disable_user_html: "%{name} 把使用者 %{target} 設定為禁止登入"
         enable_custom_emoji_html: "%{name} 啟用了 Emoji %{target}"
-        enable_sign_in_token_auth_user_html: "%{name} 啟用了使用者 %{target} 的 e-mail 驗證碼"
         enable_user_html: "%{name} 把使用者 %{target} 設定為允許登入"
         memorialize_account_html: "%{name} 把 %{target} 設定為追悼帳號"
         promote_user_html: "%{name} 提升了使用者 %{target} 的權限"
@@ -267,7 +248,6 @@ zh-HK:
         reject_user_html: "%{name} 拒絕了 %{target} 的註冊"
         remove_avatar_user_html: "%{name} 移除了 %{target} 的大頭貼"
         reopen_report_html: "%{name} 重新開啟 %{target} 的檢舉案例"
-        resend_user_html: "%{name} 重發確認電郵給 %{target}"
         reset_password_user_html: "%{name} 重設了使用者 %{target} 的密碼"
         resolve_report_html: "%{name} 處理了 %{target} 的檢舉案例"
         sensitive_account_html: "%{name} 將 %{target} 的媒體標記為敏感內容"
@@ -421,7 +401,6 @@ zh-HK:
       allow_registrations_with_approval: 允許經批准的註冊
       attempts_over_week:
         other: 上週嘗試了註冊 %{count} 次
-      created_msg: 已新增電郵網域阻隔
       delete: 刪除
       dns:
         types:
@@ -430,12 +409,8 @@ zh-HK:
       new:
         create: 新增網域
         resolve: 解析網域
-        title: 新增電郵網域阻隔
-      no_email_domain_block_selected: 未選取任何電郵網域限制，因此並未變更
       not_permitted: 無權限
-      resolved_dns_records_hint_html: 域名解析為以下 MX 網域，這些網域主要用來接收電子郵件。封鎖一個 MX 網域，即使域名看起來不同，也會阻止任何用相同 MX 網域的電郵地址進行註冊。<strong>注意不要封鎖主要的電子郵件供應商。</strong>
       resolved_through_html: 透過 %{domain} 解析
-      title: 電郵網域阻隔
     export_domain_allows:
       new:
         title: 匯入允許的網域
@@ -582,7 +557,6 @@ zh-HK:
         resolve_description_html: 不會對被檢舉的帳號採取任何動作，也不會記錄警告，檢舉報告將會結案。
         silence_description_html: 此帳號將會只有追蹤者或手動搜尋它的人才可以看見，大幅限制了它的曝光。你可隨時恢復它。關閉所有對此帳號的檢舉報告。
         suspend_description_html: 此帳號及其所有內容將不可再被存取，並且最終會被刪除，無法再進行互動。可於 30 天內撤銷此動作。關閉所有對此帳號的檢舉報告。
-      actions_description_html: 決定對此檢舉採取哪種措施。如果對被檢舉帳號採取懲罰措施，除非選取了<strong>垃圾訊息</strong>分類，否則將向他們發送一封電郵通知。
       actions_description_remote_html: 決定對此檢舉採取哪種動作。這只會影響<strong>你的伺服器</strong>與此遠端帳號的通訊和處理其內容的方式。
       add_to_report: 加入更多到檢舉
       already_suspended_badges:
@@ -646,7 +620,6 @@ zh-HK:
         delete_data_html: 從現在起 30 天後移除 <strong>@%{acct}</strong> 的個人檔案和內容，除非在此期間撤銷對他們的停權。
         preview_preamble_html: "<strong>@%{acct}</strong> 將收到警告，內容如下："
         record_strike_html: 記錄對 <strong>@%{acct}</strong> 的警告，有助你加快處理此帳號日後的違規行為
-        send_email_html: 向 <strong>@%{acct}</strong> 發送警告郵件
         warning_placeholder: 選填審核動作的補充理由。
       target_origin: 被檢舉帳號來源
       title: 舉報
@@ -684,7 +657,6 @@ zh-HK:
         manage_appeals: 管理申訴
         manage_appeals_description: 允許使用者查看針對審核的申訴
         manage_blocks: 管理封鎖
-        manage_blocks_description: 允許使用者封鎖電郵供應商和 IP 地址
         manage_custom_emojis: 管理自訂表情符號
         manage_custom_emojis_description: 允許使用者管理伺服器上的自訂表情符號
         manage_federation: 管理跨站
@@ -702,7 +674,6 @@ zh-HK:
         manage_taxonomies: 管理分類
         manage_taxonomies_description: 允許使用者審查熱門內容和更新標籤設定
         manage_user_access: 管理使用者存取權
-        manage_user_access_description: 允許使用者禁用其他人的雙重認證，變更他們的電郵地址和重設密碼
         manage_users: 管理使用者
         manage_users_description: 允許使用者查看其他使用者的詳細資料，並對其進行審核動作
         manage_webhooks: 管理 Webhooks
@@ -777,7 +748,6 @@ zh-HK:
       destroyed_msg: 成功刪除站台的上傳項目！
     software_updates:
       critical_update: 重要 — 請盡快更新
-      description: 建議保持安裝最新的 Mastodon，以獲取最新的修正和功能。此外，及時更新 Mastodon 對於保安至關重要。有鑑於此，Mastodon 每 30 分鐘會檢查更新，並根據你的電郵通知偏好通知你。
       documentation_link: 了解更多
       release_notes: 版本資訊
       title: 可用的更新
@@ -926,7 +896,6 @@ zh-HK:
         usage_comparison: 今天被使用了 %{today} 次，相較於昨天 %{yesterday} 次
         used_by_over_week:
           other: 上週有 %{count} 人使用
-      title: 熱門
       trending: 熱門
     warning_presets:
       add_new: 新增
@@ -1009,9 +978,7 @@ zh-HK:
       guide_link_text: 每個人都能貢獻。
     sensitive_content: 敏感內容
   application_mailer:
-    notification_preferences: 更改電郵設定
     salutation: "%{name}："
-    settings: 修改電郵設定︰%{link}
     unsubscribe: 取消訂閱
     view: 進入瀏覽︰
     view_profile: 檢視個人資料頁
@@ -1031,7 +998,6 @@ zh-HK:
       hint_html: 還有最後一步！我們需要確認你是人類（這樣我們才能杜絕垃圾郵件！）。解答下方的 CAPTCHA，然後點擊「繼續」。
       title: 安全檢查
     confirmations:
-      awaiting_review: 已確認你的電郵地址！%{domain} 的工作人員正在審核你的註冊資料。如果他們批准你的帳號，你將會收到電郵通知。
       awaiting_review_title: 正在審核你的註冊
       clicking_this_link: 點擊此連結
       login_link: 登入
@@ -1039,7 +1005,6 @@ zh-HK:
       redirect_to_app_html: 你應該已被重新導向<strong>%{app_name}</strong>應用程式。如果尚未被導向，請嘗試%{clicking_this_link}或自行回到應用程式。
       registration_complete: 你在%{domain}已完成註冊！
       welcome_title: 歡迎，%{name}！
-      wrong_email_hint: 如果該電郵地址不正確，你可以在帳號設定中修改。
     delete_account: 刪除帳號
     delete_account_html: 如果你想刪除你的帳號，請<a href="%{path}">點擊這裡繼續</a>。你需要確認你的操作。
     description:
@@ -1060,7 +1025,6 @@ zh-HK:
     or_log_in_with: 或登入於
     privacy_policy_agreement_html: 我已閱讀且同意<a href="%{privacy_policy_path}" target="_blank">私隱政策</a>
     progress:
-      confirm: 確認電郵
       details: 你的資料
       review: 我們的審核
       rules: 接受規則
@@ -1082,10 +1046,8 @@ zh-HK:
     security: 登入資訊
     set_new_password: 設定新密碼
     setup:
-      email_below_hint_html: 請檢查你的垃圾郵件資料夾，或請求發送另一封郵件。如果你的電郵地址有誤，你可以更正它。
       email_settings_hint_html: 請點擊我們發送給你的連結來驗證 %{email}。我們會等着你。
       link_not_received: 收不到連結嗎？
-      new_confirmation_instructions_sent: 你將在幾分鐘內收到附有確認連結的新電郵！
       title: 檢查你的信箱
     sign_in:
       preamble_html: 請使用 <strong>%{domain}</strong> 的資料登入。如果您的帳戶託管在其他的伺服器，您將無法在此登入。
@@ -1096,9 +1058,7 @@ zh-HK:
       title: 讓我為你在 %{domain} 上設定好。
     status:
       account_status: 帳戶文章
-      confirming: 正在等待確認電郵地址。
       functional: 你的帳號已完全投入使用。
-      pending: 管理員正在處理你的申請。可能會需要一點時間處理。我們將會在申請被批準的時候馬上寄電郵給你。
       redirecting_to: 你的帳戶因為正在重新定向到 %{acct}，所以暫時被停用。
       self_destruct: 由於 %{domain} 即將停止服務，你只能有限存取你的帳號。
       view_strikes: 查看針對你的帳戶的過往警告
@@ -1141,9 +1101,6 @@ zh-HK:
       before: 在繼續之前，請仔細閱讀以下說明：
       caches: 已被其他服務器緩存的內容可能不會消失
       data_removal: 你的文章和其他資料將被永久刪除
-      email_change_html: 你可以在不刪除帳戶的情況下<a href="%{path}">更改電子郵件地址</a>
-      email_contact_html: 如果仍然沒有送達，你可以通過電子郵件發送到<a href="mailto:%{email}">%{email}</a>以獲得協助
-      email_reconfirmation_html: 如果你沒有收到確認電郵，你可以<a href="%{path}">要求再次發送它</a>
       irreversible: 你將無法重啟你的帳戶
       more_details_html: 請參見<a href="%{terms_path}">私隱政策</a>以瀏覽細節。
       username_available: 你的登入名稱將可被其他人使用
@@ -1368,7 +1325,6 @@ zh-HK:
     authentication_methods:
       otp: 兩步認證軟體
       password: 密碼
-      sign_in_token: 電子郵件安全碼
       webauthn: 安全密鑰
     description_html: 若發現有無法辨識的帳號動態，請考慮更改密碼以及啟用雙重階段驗證。
     empty: 沒有驗證歷史
@@ -1379,16 +1335,6 @@ zh-HK:
     unsubscribe:
       action: 沒錯，取消訂閱
       complete: 已取消訂閱
-      confirmation_html: 你確定要取消接收 Mastodon 在%{domain}上的%{type}到你的電郵 %{email} 嗎？你隨時可以從 <a href="%{settings_path}">電郵通知設定</a>重新訂閱。
-      emails:
-        notification_emails:
-          favourite: 最愛電郵通知
-          follow: 追蹤電郵通知
-          follow_request: 追蹤請求電郵
-          mention: 提及電郵通知
-          reblog: 轉推電郵通知
-      resubscribe_html: 如果你不小心取消訂閱，你可以從<a href="%{settings_path}">電郵通知設定</a>重新訂閱。
-      success_html: 你將不再收到 Mastodon 在%{domain}上的%{type}到你的電郵 %{email}。
       title: 取消訂閱
   media_attachments:
     validations:
@@ -1469,8 +1415,6 @@ zh-HK:
     update:
       subject: "%{name} 編輯了帖文"
   notifications:
-    administration_emails: 管理員電郵通知
-    email_events: 電郵通知活動
     email_events_hint: 選擇你想接收通知的活動：
   number:
     human:
@@ -1629,7 +1573,6 @@ zh-HK:
     import: 匯入
     import_and_export: 匯入及匯出
     migrate: 帳戶遷移
-    notifications: 電郵通知
     preferences: 偏好設定
     profile: 個人資料
     relationships: 關注及追隨者
@@ -1869,7 +1812,6 @@ zh-HK:
     invalid_otp_token: 雙重認證碼不正確
     otp_lost_help_html: 如果這兩者你均無法登入，你可以聯繫 %{email}
     rate_limited: 嘗試認證次數太多，請稍後再試。
-    seamless_external_login: 因為你正在使用第三方服務登入，所以不能設定密碼和電郵。
     signed_in_as: 目前登入的帳戶：
   verification:
     extra_instructions_html: <strong>提示：</strong>你是可以隱藏網站上的連結的。重點是<code>rel="me"</code>，它可以防止有用戶生成內容的網站假冒身份。你甚至可以在頁面標頭 (header) 使用 <code>link</code> 標籤，而非 <code>a</code>，但你必須確保沒有執行 Javascript 下也可存取 HTML。
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index ef2da39f30b533..c0403a0169693a 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -29,7 +29,7 @@ zh-TW:
       created_msg: 已成功新增管理備註！
       destroyed_msg: 已成功刪除管理備註！
     accounts:
-      add_email_domain_block: 將電子郵件網域加入黑名單
+      add_email_domain_block: 封鎖電子郵件網域
       approve: 批准
       approved_msg: 已成功審核 %{username} 的新帳號申請
       are_you_sure: 您確定嗎？
@@ -121,15 +121,15 @@ zh-TW:
       removed_avatar_msg: 已成功刪除 %{username} 的大頭貼
       removed_header_msg: 已成功刪除 %{username} 的封面圖片
       resend_confirmation:
-        already_confirmed: 此使用者已被確認
-        send: 重新傳送確認連結
-        success: 已成功傳送確認連結！
+        already_confirmed: 此使用者已被驗證
+        send: 重新傳送驗證連結
+        success: 已成功傳送驗證連結！
       reset: 重設
       reset_password: 重設密碼
       resubscribe: 重新訂閱
       role: 角色
       search: 搜尋
-      search_same_email_domain: 其他有同個電子郵件網域的使用者
+      search_same_email_domain: 其他相同電子郵件網域之使用者
       search_same_ip: 其他有同個 IP 的使用者
       security: 安全性
       security_measures:
@@ -153,7 +153,7 @@ zh-TW:
       title: 帳號
       unblock_email: 解除封鎖電子郵件地址
       unblocked_email_msg: 成功解除封鎖 %{username} 的電子郵件地址
-      unconfirmed_email: 未確認的電子郵件地址
+      unconfirmed_email: 未驗證的電子郵件地址
       undo_sensitized: 取消強制標記為敏感內容
       undo_silenced: 取消靜音
       undo_suspension: 取消停權
@@ -170,12 +170,12 @@ zh-TW:
         approve_appeal: 批准申訴
         approve_user: 批准使用者
         assigned_to_self_report: 指派回報
-        change_email_user: 變更使用者的電子郵件地址
+        change_email_user: 變更使用者電子郵件地址
         change_role_user: 變更使用者角色
-        confirm_user: 確認使用者
+        confirm_user: 驗證使用者
         create_account_warning: 新增警告
         create_announcement: 新增公告
-        create_canonical_email_block: 新增 E-mail 封鎖
+        create_canonical_email_block: 新增電子郵件封鎖
         create_custom_emoji: 新增自訂 emoji 表情符號
         create_domain_allow: 新增允許網域
         create_domain_block: 新增網域封鎖
@@ -185,7 +185,7 @@ zh-TW:
         create_user_role: 新增角色
         demote_user: 將用戶降級
         destroy_announcement: 刪除公告
-        destroy_canonical_email_block: 刪除 E-mail 封鎖
+        destroy_canonical_email_block: 刪除電子郵件封鎖
         destroy_custom_emoji: 刪除自訂 emoji 表情符號
         destroy_domain_allow: 刪除允許網域
         destroy_domain_block: 刪除網域封鎖
@@ -230,12 +230,12 @@ zh-TW:
         approve_appeal_html: "%{name} 已批准來自 %{target} 的審核決定申訴"
         approve_user_html: "%{name} 已批准自 %{target} 而來的註冊"
         assigned_to_self_report_html: "%{name} 將報告 %{target} 指派給自己"
-        change_email_user_html: "%{name} 已變更使用者 %{target} 的電子郵件地址"
+        change_email_user_html: "%{name} 已變更使用者 %{target} 之電子郵件地址"
         change_role_user_html: "%{name} 已變更 %{target} 的角色"
-        confirm_user_html: "%{name} 已確認使用者 %{target} 的電子郵件位址"
+        confirm_user_html: "%{name} 已驗證使用者 %{target} 之電子郵件位址"
         create_account_warning_html: "%{name} 已對 %{target} 送出警告"
         create_announcement_html: "%{name} 已新增公告 %{target}"
-        create_canonical_email_block_html: "%{name} 已封鎖 hash 為 %{target} 的 e-mail"
+        create_canonical_email_block_html: "%{name} 已封鎖 hash 為 %{target} 之電子郵件"
         create_custom_emoji_html: "%{name} 已上傳新自訂 emoji 表情符號 %{target}"
         create_domain_allow_html: "%{name} 允許 %{target} 網域加入聯邦宇宙"
         create_domain_block_html: "%{name} 已封鎖網域 %{target}"
@@ -245,7 +245,7 @@ zh-TW:
         create_user_role_html: "%{name} 已新增 %{target} 角色"
         demote_user_html: "%{name} 將使用者 %{target} 降級"
         destroy_announcement_html: "%{name} 已刪除公告 %{target}"
-        destroy_canonical_email_block_html: "%{name} 已解除封鎖 hash 為 %{target} 的電子郵件"
+        destroy_canonical_email_block_html: "%{name} 已解除封鎖 hash 為 %{target} 之電子郵件"
         destroy_custom_emoji_html: "%{name} 已刪除 emoji 表情符號 %{target}"
         destroy_domain_allow_html: "%{name} 不允許與網域 %{target} 加入聯邦宇宙"
         destroy_domain_block_html: "%{name} 已解除封鎖網域 %{target}"
@@ -424,7 +424,7 @@ zh-TW:
       allow_registrations_with_approval: 經審核後可註冊
       attempts_over_week:
         other: 上週共有 %{count} 次註冊嘗試
-      created_msg: 已成功將電子郵件網域加入黑名單
+      created_msg: 已成功封鎖電子郵件網域
       delete: 刪除
       dns:
         types:
@@ -433,12 +433,12 @@ zh-TW:
       new:
         create: 新增網域
         resolve: 解析網域
-        title: 新增電子郵件黑名單項目
-      no_email_domain_block_selected: 因未選取電子郵件網域黑名單，所以什麼事都沒發生
+        title: 新增電子郵件網域封鎖
+      no_email_domain_block_selected: 因未選取任何電子郵件網域，所以什麼事都沒發生
       not_permitted: 無權限
       resolved_dns_records_hint_html: 網域名稱解析為以下 MX 網域，這些網域最終負責接收電子郵件。封鎖 MX 網域將會封鎖任何來自使用相同 MX 網域的電子郵件註冊，即便可見的域名是不同的也一樣。<strong>請注意，不要封鎖主要的電子郵件服務提供商。</strong>
       resolved_through_html: 透過 %{domain} 解析
-      title: 電子郵件黑名單
+      title: 已封鎖電子郵件網域
     export_domain_allows:
       new:
         title: 匯入網域白名單
@@ -588,7 +588,7 @@ zh-TW:
         resolve_description_html: 被檢舉的帳號將不被採取任何行動，不會加以刪除線標記，並且此份報告將被關閉。
         silence_description_html: 此帳號僅對已跟隨帳號之使用者或手動查詢可見，將大幅度限制觸及範圍。此設定可隨時被還原。關閉所有對此帳號之檢舉報告。
         suspend_description_html: 此帳號及其所有內容將不可被存取並且最終被移除，並且無法與之進行互動。三十天內可以撤銷此動作。關閉所有對此帳號之檢舉報告。
-      actions_description_html: 決定應對此報告採取何種行動。若您對檢舉之帳號採取懲罰措施，則將對他們發送 e-mail 通知，如非選擇了 <strong>垃圾郵件</strong> 類別。
+      actions_description_html: 決定應對此報告採取何種行動。若您對檢舉之帳號採取懲罰措施，則將對他們發送 e-mail 通知，除非選擇了 <strong>垃圾郵件</strong> 類別。
       actions_description_remote_html: 決定將對此檢舉報告採取何種動作。這將僅作用於<strong>您的伺服器</strong>與此遠端帳號及其內容之通訊行為。
       add_to_report: 加入更多至報告
       already_suspended_badges:
@@ -653,7 +653,7 @@ zh-TW:
         delete_data_html: 於即日起 30 天後刪除 <strong>@%{acct}</strong>之個人檔案與內容，除非他們於期限前被解除停權
         preview_preamble_html: "<strong>@%{acct}</strong> 將收到關於以下內容之警告："
         record_strike_html: 紀錄關於 <strong>@%{acct}</strong>之警示有助於您升級對此帳號未來違規處理
-        send_email_html: 寄一封警告 e-mail 至 <strong>@%{acct}</strong>
+        send_email_html: 寄一封警告信至 <strong>@%{acct}</strong>
         warning_placeholder: 選填之其他站務動作理由。
       target_origin: 檢舉帳號之來源
       title: 檢舉
@@ -691,7 +691,7 @@ zh-TW:
         manage_appeals: 管理解封申訴系統
         manage_appeals_description: 允許使用者審閱針對站務動作之申訴
         manage_blocks: 管理封鎖
-        manage_blocks_description: 允許使用者封鎖電子郵件提供者與 IP 位置
+        manage_blocks_description: 允許使用者封鎖電子郵件提供商與 IP 位址
         manage_custom_emojis: 管理自訂 emoji 表情符號
         manage_custom_emojis_description: 允許使用者管理伺服器上之自訂 emoji 表情符號
         manage_federation: 管理聯邦宇宙
@@ -895,13 +895,19 @@ zh-TW:
     trends:
       allow: 允許
       approved: 已通過審核
+      confirm_allow: 您確定要允許選取的主題標籤嗎？
+      confirm_disallow: 您確定要禁止選取的主題標籤嗎？
       disallow: 不允許
       links:
         allow: 允許連結
-        allow_provider: 允許發行者
+        allow_provider: 允許提供商
+        confirm_allow: 您確定要允許選取的連結嗎？
+        confirm_allow_provider: 您確定要允許選取的提供商嗎？
+        confirm_disallow: 您確定要禁止選取的連結嗎？
+        confirm_disallow_provider: 您確定要禁止選取的提供商嗎？
         description_html: 這些連結是正在被您伺服器上看到該嘟文之帳號大量分享。這些連結可以幫助您的使用者探索目前世界上正在發生的事情。除非您核准該發行者，連結將不被公開展示。您也可以核准或駁回個別連結。
         disallow: 不允許連結
-        disallow_provider: 不允許發行者
+        disallow_provider: 不允許提供商
         no_link_selected: 因未選取任何連結，所以什麼事都沒發生
         publishers:
           no_publisher_selected: 因未選取任何發行者，所以什麼事都沒發生
@@ -913,14 +919,18 @@ zh-TW:
       only_allowed: 僅允許
       pending_review: 等待審核中
       preview_card_providers:
-        allowed: 此發行者之連結能登上熱門
+        allowed: 此提供商之連結能登上熱門
         description_html: 這些網域來自被您伺服器常被分享的連結。除非您核准該連結，則這些連結將不會成為公開熱門標籤。您的核准或駁回將對子網域仍有效。
-        rejected: 此發行者之連結不會登上熱門
-        title: 發行者
+        rejected: 此提供商之連結不會登上熱門
+        title: 網域提供商
       rejected: 被拒絕
       statuses:
         allow: 允許嘟文
         allow_account: 允許作者
+        confirm_allow: 您確定要允許選取的嘟文嗎？
+        confirm_allow_account: 您確定要允許選取的帳號嗎？
+        confirm_disallow: 您確定要禁止選取的嘟文嗎？
+        confirm_disallow_account: 您確定要禁止選取的帳號嗎？
         description_html: 這些是您伺服器上已知被正在大量分享及加入最愛之嘟文。這些嘟文能幫助您伺服器上舊雨新知發現更多帳號來跟隨。除非您核准該作者且作者允許他們的帳號被推薦至其他人，嘟文將不被公開展示。您可以核准或駁回個別嘟文。
         disallow: 不允許嘟文
         disallow_account: 不允許作者
@@ -951,7 +961,7 @@ zh-TW:
         usage_comparison: 於今日被使用 %{today} 次，相較於昨日 %{yesterday} 次
         used_by_over_week:
           other: 上週被 %{count} 個人使用
-      title: 熱門榜
+      title: 推薦內容與熱門趨勢
       trending: 熱門
     warning_presets:
       add_new: 新增
@@ -1057,7 +1067,7 @@ zh-TW:
       hint_html: 僅再一步！我們必須確認您是位人類（這是防止垃圾訊息濫用）。請完成以下 CAPTCHA 挑戰並點擊「繼續」。
       title: 安全性檢查
     confirmations:
-      awaiting_review: 已驗證您的電子郵件！%{domain} 的管理員正在審核您的註冊申請。若您的帳號通過審核，您將收到電子郵件通知。
+      awaiting_review: 已驗證您的電子郵件地址！%{domain} 的管理員正在審核您的註冊申請。若您的帳號通過審核，您將收到電子郵件通知。
       awaiting_review_title: 我們正在審核您的註冊申請
       clicking_this_link: 點擊此連結
       login_link: 登入
@@ -1072,7 +1082,7 @@ zh-TW:
       prefix_invited_by_user: "@%{name} 邀請您加入這個 Mastodon 伺服器！"
       prefix_sign_up: 馬上註冊 Mastodon 帳號吧！
       suffix: 有了帳號，就可以自任何 Mastodon 伺服器跟隨任何人、發發廢嘟，並且與任何 Mastodon 伺服器的使用者交流，以及更多！
-    didnt_get_confirmation: 沒有收到確認連結嗎？
+    didnt_get_confirmation: 沒有收到驗證連結嗎？
     dont_have_your_security_key: 找不到您的安全金鑰？
     forgot_password: 忘記密碼？
     invalid_reset_password_token: 密碼重設 token 無效或已過期。請重新設定密碼。
@@ -1086,7 +1096,7 @@ zh-TW:
     or_log_in_with: 或透過其他方式登入
     privacy_policy_agreement_html: 我已閱讀且同意 <a href="%{privacy_policy_path}" target="_blank">隱私權政策</a>
     progress:
-      confirm: 確認電子郵件
+      confirm: 驗證電子郵件地址
       details: 您的個人資料
       review: 我們的審核
       rules: 接受規則
@@ -1095,7 +1105,7 @@ zh-TW:
       saml: SAML
     register: 註冊
     registration_closed: "%{instance} 目前不開放新成員"
-    resend_confirmation: 重新傳送確認連結
+    resend_confirmation: 重新傳送驗證連結
     reset_password: 重設密碼
     rules:
       accept: 接受
@@ -1108,10 +1118,10 @@ zh-TW:
     security: 登入資訊
     set_new_password: 設定新密碼
     setup:
-      email_below_hint_html: 請檢查您的垃圾郵件資料夾，或是請求另一個。如果是錯的，您可以更正您的電子郵件地址。
+      email_below_hint_html: 請檢查您的垃圾郵件資料夾，或是請求另一封驗證信。若不正確，您可以更正您的電子郵件地址。
       email_settings_hint_html: 請點擊我們寄給您連結以驗證 %{email}。我們將於此稍候。
       link_not_received: 無法取得連結嗎？
-      new_confirmation_instructions_sent: 您將於幾分鐘之內收到新的包含確認連結的電子郵件！
+      new_confirmation_instructions_sent: 您將於幾分鐘之內收到新的包含驗證連結之電子郵件！
       title: 請檢查您的收件匣
     sign_in:
       preamble_html: 請使用您於 <strong>%{domain}</strong> 的帳號密碼登入。若您的帳號託管於其他伺服器，您將無法於此登入。
@@ -1122,7 +1132,7 @@ zh-TW:
       title: 讓我們一起設定 %{domain} 吧！
     status:
       account_status: 帳號狀態
-      confirming: 等待電子郵件確認完成。
+      confirming: 等待電子郵件驗證完成。
       functional: "您的帳號可以正常使用了。🎉"
       pending: 管管們正在處理您的申請，這可能需要一點時間處理。我們將於申請通過後以電子郵件方式通知您。
       redirecting_to: 您的帳號因目前重定向至 %{acct} 而被停用。
@@ -1160,7 +1170,7 @@ zh-TW:
   deletes:
     challenge_not_passed: 您所輸入的資料不正確
     confirm_password: 輸入您目前的密碼以驗證身份
-    confirm_username: 請輸入您的使用者名稱以作確認
+    confirm_username: 請輸入您的使用者名稱以確認
     proceed: 刪除帳號
     success_msg: 您的帳號已經成功刪除
     warning:
@@ -1169,7 +1179,7 @@ zh-TW:
       data_removal: 您的嘟文與其他資料將被永久刪除
       email_change_html: 您能於不刪除帳號的情況下<a href="%{path}">變更您的電子郵件地址</a>
       email_contact_html: 如果您仍然沒有收到郵件，請寄信至 <a href="mailto:%{email}">%{email}</a> 以獲得協助
-      email_reconfirmation_html: 如果您沒有收到確認郵件，可以<a href="%{path}">請求再次發送</a>
+      email_reconfirmation_html: 如果您沒有收到驗證信，可以於<a href="%{path}">請求再次發送</a>
       irreversible: 您將無法復原或重新啟用您的帳號
       more_details_html: 更多詳細資訊，請參閲<a href="%{terms_path}">隱私政策</a>。
       username_available: 您的使用者名稱將會釋出供他人使用
@@ -1814,9 +1824,9 @@ zh-TW:
     suspicious_sign_in:
       change_password: 變更密碼
       details: 以下是該登入之詳細資訊：
-      explanation: 我們偵測到有新 IP 地址登入您的帳號
+      explanation: 我們偵測到有新 IP 位址登入您的帳號
       further_actions_html: 如果這個不是您，我們建議您立即 %{action} ，並且啟用二階段驗證 (2FA) 以確保帳號安全。
-      subject: 您的帳號已被新 IP 地址存取
+      subject: 您的帳號已被新 IP 位址存取
       title: 新登入
     warning:
       appeal: 遞交申訴
@@ -1895,7 +1905,7 @@ zh-TW:
     invalid_otp_token: 兩階段驗證碼不正確
     otp_lost_help_html: 如果您無法存取這兩者，您可以透過 %{email} 與我們聯繫
     rate_limited: 過多次身份驗證嘗試，請稍後再試。
-    seamless_external_login: 由於您是由外部系統登入，所以不能設定密碼與電子郵件。
+    seamless_external_login: 由於您是透過外部服務登入，所以不能設定密碼與電子郵件。
     signed_in_as: 目前登入的帳號：
   verification:
     extra_instructions_html: <strong>小撇步：</strong>您網站上之此連結可以是不可見的。其重要的部分是 <code>rel="me"</code> ，防止透過使用者產生內容模擬。您甚至能使用頁面標頭之 <code>link</code> 標籤取代頁面中的 <code>a</code> 標籤，但 HTML 必須能於不執行 JavaScript 情況下所存取。

From 85152af95f51642bcef0ba781a1e7213d79e8f03 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 11 Aug 2024 18:51:39 +0000
Subject: [PATCH 1801/2191] New Crowdin Translations (automated) (#31377)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/el.json    | 41 +++++++++++++
 app/javascript/mastodon/locales/es-MX.json |  2 +
 app/javascript/mastodon/locales/es.json    |  2 +
 app/javascript/mastodon/locales/ga.json    | 44 ++++++++++++++
 app/javascript/mastodon/locales/gl.json    |  3 +
 app/javascript/mastodon/locales/he.json    |  2 +
 app/javascript/mastodon/locales/hu.json    |  2 +
 app/javascript/mastodon/locales/sq.json    |  2 +
 app/javascript/mastodon/locales/th.json    |  1 +
 app/javascript/mastodon/locales/tr.json    |  2 +
 app/javascript/mastodon/locales/zh-CN.json |  2 +
 config/locales/el.yml                      |  1 +
 config/locales/ga.yml                      | 68 ++++++++++++++++++++++
 config/locales/gl.yml                      | 58 ++++++++++++++++++
 config/locales/hu.yml                      | 58 ++++++++++++++++++
 config/locales/sq.yml                      | 46 +++++++++++++++
 config/locales/th.yml                      | 34 +++++++++++
 config/locales/tr.yml                      |  1 +
 18 files changed, 369 insertions(+)

diff --git a/app/javascript/mastodon/locales/el.json b/app/javascript/mastodon/locales/el.json
index 1fd3c5a7cccff2..c220f3a4e0c581 100644
--- a/app/javascript/mastodon/locales/el.json
+++ b/app/javascript/mastodon/locales/el.json
@@ -356,6 +356,17 @@
   "home.pending_critical_update.link": "Δείτε ενημερώσεις",
   "home.pending_critical_update.title": "Κρίσιμη ενημέρωση ασφαλείας διαθέσιμη!",
   "home.show_announcements": "Εμφάνιση ανακοινώσεων",
+  "ignore_notifications_modal.disclaimer": "Το Mastodon δε μπορεί να ενημερώσει τους χρήστες ότι αγνόησες τις ειδοποιήσεις του. Η αγνόηση ειδοποιήσεων δεν θα εμποδίσει την αποστολή των ίδιων των μηνυμάτων.",
+  "ignore_notifications_modal.filter_instead": "Φίλτρο αντ' αυτού",
+  "ignore_notifications_modal.filter_to_act_users": "Θα μπορείς ακόμα να αποδεχθείς, να απορρίψεις ή να αναφέρεις χρήστες",
+  "ignore_notifications_modal.filter_to_avoid_confusion": "Το φιλτράρισμα βοηθά στην αποφυγή πιθανής σύγχυσης",
+  "ignore_notifications_modal.filter_to_review_separately": "Μπορείς να δεις τις φιλτραρισμένες ειδοποιήσεις ξεχωριστά",
+  "ignore_notifications_modal.ignore": "Αγνόηση ειδοποιήσεων",
+  "ignore_notifications_modal.limited_accounts_title": "Αγνόηση ειδοποιήσεων από συντονισμένους λογαριασμούς;",
+  "ignore_notifications_modal.new_accounts_title": "Αγνόηση ειδοποιήσεων από νέους λογαριασμούς;",
+  "ignore_notifications_modal.not_followers_title": "Αγνόηση ειδοποιήσεων από άτομα που δε σας ακολουθούν;",
+  "ignore_notifications_modal.not_following_title": "Αγνόηση ειδοποιήσεων από άτομα που δεν ακολουθείς;",
+  "ignore_notifications_modal.private_mentions_title": "Αγνόηση ειδοποιήσεων από μη ζητηθείσες ιδιωτικές αναφορές;",
   "interaction_modal.description.favourite": "Με ένα συντάκτη στο Mastodon μπορείς να αγαπήσεις αυτή την ανάρτηση, για να ενημερώσεις τον συγγραφέα ότι την εκτιμάς και να την αποθηκεύσεις για αργότερα.",
   "interaction_modal.description.follow": "Με έναν λογαριασμό Mastodon, μπορείς να ακολουθήσεις τον/την {name} ώστε να λαμβάνεις τις αναρτήσεις του/της στη δική σου ροή.",
   "interaction_modal.description.reblog": "Με ένα λογαριασμό Mastodon, μπορείς να ενισχύσεις αυτή την ανάρτηση για να τη μοιραστείς με τους δικούς σου ακολούθους.",
@@ -482,6 +493,11 @@
   "notification.favourite": "{name} favorited your post\n{name} προτίμησε την ανάρτηση σου",
   "notification.follow": "Ο/Η {name} σε ακολούθησε",
   "notification.follow_request": "Ο/H {name} ζήτησε να σε ακολουθήσει",
+  "notification.label.mention": "Επισήμανση",
+  "notification.label.private_mention": "Ιδιωτική επισήμανση",
+  "notification.label.private_reply": "Ιδιωτική απάντηση",
+  "notification.label.reply": "Απάντηση",
+  "notification.mention": "Επισήμανση",
   "notification.moderation-warning.learn_more": "Μάθε περισσότερα",
   "notification.moderation_warning": "Έχετε λάβει μία προειδοποίηση συντονισμού",
   "notification.moderation_warning.action_delete_statuses": "Ορισμένες από τις αναρτήσεις σου έχουν αφαιρεθεί.",
@@ -502,11 +518,26 @@
   "notification.status": "Ο/Η {name} μόλις ανέρτησε κάτι",
   "notification.update": "ο/η {name} επεξεργάστηκε μια ανάρτηση",
   "notification_requests.accept": "Αποδοχή",
+  "notification_requests.accept_all": "Αποδοχή όλων",
+  "notification_requests.accept_multiple": "{count, plural, one {Αποδοχή # αιτήματος} other {Αποδοχή # αιτημάτων}}",
+  "notification_requests.confirm_accept_all.button": "Αποδοχή όλων",
+  "notification_requests.confirm_accept_all.message": "Πρόκειται να αποδεχτείς {count, plural, one {ένα αίτημα ειδοποίησης} other {# αιτήματα ειδοποίησης}}. Σίγουρα θες να συνεχίσεις;",
+  "notification_requests.confirm_accept_all.title": "Αποδοχή αιτήσεων ειδοποίησης;",
+  "notification_requests.confirm_dismiss_all.button": "Παράβλεψη όλων",
+  "notification_requests.confirm_dismiss_all.message": "Πρόκειται να απορρίψεις {count, plural, one {ένα αίτημα ειδοποίησης} other {# αιτήματα ειδοποίησης}}. Δεν θα μπορείς να έχεις πρόσβαση εύκολα {count, plural, one {σε αυτή} other {σε αυτές}} ξανά. Σίγουρα θες να συνεχίσεις;",
+  "notification_requests.confirm_dismiss_all.title": "Απόρριψη αιτημάτων ειδοποίησης;",
   "notification_requests.dismiss": "Απόρριψη",
+  "notification_requests.dismiss_all": "Παράβλεψη όλων",
+  "notification_requests.dismiss_multiple": "{count, plural, one {Παράβλεψη # αιτήματος} other {Παράβλεψη # αιτημάτων}}",
+  "notification_requests.enter_selection_mode": "Επιλογή",
+  "notification_requests.exit_selection_mode": "Άκυρο",
+  "notification_requests.explainer_for_limited_account": "Οι ειδοποιήσεις από αυτόν τον λογαριασμό έχουν φιλτραριστεί επειδή ο λογαριασμός έχει περιοριστεί από έναν συντονιστή.",
+  "notification_requests.explainer_for_limited_remote_account": "Οι ειδοποιήσεις από αυτόν τον λογαριασμό έχουν φιλτραριστεί επειδή ο λογαριασμός ή ο διακομιστής του έχει περιοριστεί από έναν συντονιστή.",
   "notification_requests.maximize": "Μεγιστοποίηση",
   "notification_requests.minimize_banner": "Ελαχιστοποίηση μπάνερ φιλτραρισμένων ειδοποιήσεων",
   "notification_requests.notifications_from": "Ειδοποιήσεις από {name}",
   "notification_requests.title": "Φιλτραρισμένες ειδοποιήσεις",
+  "notification_requests.view": "Προβολή ειδοποιήσεων",
   "notifications.clear": "Καθαρισμός ειδοποιήσεων",
   "notifications.clear_confirmation": "Σίγουρα θέλεις να καθαρίσεις μόνιμα όλες τις ειδοποιήσεις σου;",
   "notifications.clear_title": "Εκκαθάριση ειδοποιήσεων;",
@@ -543,6 +574,14 @@
   "notifications.permission_denied": "Οι ειδοποιήσεις στην επιφάνεια εργασίας δεν είναι διαθέσιμες διότι έχει απορριφθεί κάποιο προηγούμενο αίτημα άδειας",
   "notifications.permission_denied_alert": "Δεν είναι δυνατή η ενεργοποίηση των ειδοποιήσεων της επιφάνειας εργασίας, καθώς η άδεια του προγράμματος περιήγησης έχει απορριφθεί νωρίτερα",
   "notifications.permission_required": "Οι ειδοποιήσεις δεν είναι διαθέσιμες επειδή δεν έχει δοθεί η απαιτούμενη άδεια.",
+  "notifications.policy.accept": "Αποδοχή",
+  "notifications.policy.accept_hint": "Εμφάνιση στις ειδοποιήσεις",
+  "notifications.policy.drop": "Αγνόηση",
+  "notifications.policy.drop_hint": "Στείλε τες στο υπερπέραν, να μην ξαναδούν το φως του ήλιου",
+  "notifications.policy.filter": "Φίλτρο",
+  "notifications.policy.filter_hint": "Αποστολή στα εισερχόμενα φιλτραρισμένων ειδοποιήσεων",
+  "notifications.policy.filter_limited_accounts_hint": "Περιορισμένη από συντονιστές διακομιστή",
+  "notifications.policy.filter_limited_accounts_title": "Συντονισμένοι λογαριασμοί",
   "notifications.policy.filter_new_accounts.hint": "Δημιουργήθηκε εντός {days, plural, one {της τελευταίας ημέρας} other {των τελευταίων # ημερών}}",
   "notifications.policy.filter_new_accounts_title": "Νέοι λογαριασμοί",
   "notifications.policy.filter_not_followers_hint": "Συμπεριλαμβανομένων των ατόμων που σας έχουν ακολουθήσει λιγότερο από {days, plural, one {μια ημέρα} other {# ημέρες}} πριν",
@@ -551,6 +590,7 @@
   "notifications.policy.filter_not_following_title": "Άτομα που δεν ακολουθείς",
   "notifications.policy.filter_private_mentions_hint": "Φιλτραρισμένο εκτός αν είναι απάντηση σε δική σου αναφορά ή αν ακολουθείς τον αποστολέα",
   "notifications.policy.filter_private_mentions_title": "Μη συναινετικές ιδιωτικές αναφορές",
+  "notifications.policy.title": "Διαχείριση ειδοποιήσεων από…",
   "notifications_permission_banner.enable": "Ενεργοποίηση ειδοποιήσεων επιφάνειας εργασίας",
   "notifications_permission_banner.how_to_control": "Για να λαμβάνεις ειδοποιήσεις όταν το Mastodon δεν είναι ανοιχτό, ενεργοποίησε τις ειδοποιήσεις επιφάνειας εργασίας. Μπορείς να ελέγξεις με ακρίβεια ποιοι τύποι αλληλεπιδράσεων δημιουργούν ειδοποιήσεις επιφάνειας εργασίας μέσω του κουμπιού {icon} μόλις ενεργοποιηθούν.",
   "notifications_permission_banner.title": "Μη χάσεις στιγμή",
@@ -791,6 +831,7 @@
   "timeline_hint.remote_resource_not_displayed": "{resource} από άλλους διακομιστές δεν εμφανίζονται.",
   "timeline_hint.resources.followers": "Ακόλουθοι",
   "timeline_hint.resources.follows": "Ακολουθείς",
+  "timeline_hint.resources.replies": "Κάποιες απαντήσεις",
   "timeline_hint.resources.statuses": "Παλαιότερες αναρτήσεις",
   "trends.counter_by_accounts": "{count, plural, one {{counter} άτομο} other {{counter} άτομα} }{days, plural, one { την τελευταία ημέρα} other { τις τελευταίες {days} ημέρες}}",
   "trends.trending_now": "Δημοφιλή τώρα",
diff --git a/app/javascript/mastodon/locales/es-MX.json b/app/javascript/mastodon/locales/es-MX.json
index b5238e663ac700..0ff6c25328fda1 100644
--- a/app/javascript/mastodon/locales/es-MX.json
+++ b/app/javascript/mastodon/locales/es-MX.json
@@ -358,7 +358,9 @@
   "home.show_announcements": "Mostrar anuncios",
   "ignore_notifications_modal.disclaimer": "Mastodon no puede informar a los usuarios que has ignorado sus notificaciones. Ignorar notificaciones no impedirá que se sigan enviando los mensajes.",
   "ignore_notifications_modal.filter_instead": "Filtrar en vez de ignorar",
+  "ignore_notifications_modal.filter_to_act_users": "Aún podrás aceptar, rechazar o reportar usuarios",
   "ignore_notifications_modal.filter_to_avoid_confusion": "Filtrar ayuda a evitar confusiones potenciales",
+  "ignore_notifications_modal.filter_to_review_separately": "Puedes revisar las notificaciones filtradas por separado",
   "ignore_notifications_modal.ignore": "Ignorar notificaciones",
   "ignore_notifications_modal.limited_accounts_title": "¿Ignorar notificaciones de cuentas moderadas?",
   "ignore_notifications_modal.new_accounts_title": "¿Ignorar notificaciones de cuentas nuevas?",
diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json
index 520066378799ff..b8f5de997a24c4 100644
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@@ -358,7 +358,9 @@
   "home.show_announcements": "Mostrar anuncios",
   "ignore_notifications_modal.disclaimer": "Mastodon no puede informar a los usuarios que has ignorado sus notificaciones. Ignorar notificaciones no impedirá que se sigan enviando los mensajes.",
   "ignore_notifications_modal.filter_instead": "Filtrar en vez de ignorar",
+  "ignore_notifications_modal.filter_to_act_users": "Aún podrás aceptar, rechazar o reportar usuarios",
   "ignore_notifications_modal.filter_to_avoid_confusion": "Filtrar ayuda a evitar confusiones potenciales",
+  "ignore_notifications_modal.filter_to_review_separately": "Puedes revisar las notificaciones filtradas por separado",
   "ignore_notifications_modal.ignore": "Ignorar notificaciones",
   "ignore_notifications_modal.limited_accounts_title": "¿Ignorar notificaciones de cuentas moderadas?",
   "ignore_notifications_modal.new_accounts_title": "¿Ignorar notificaciones de cuentas nuevas?",
diff --git a/app/javascript/mastodon/locales/ga.json b/app/javascript/mastodon/locales/ga.json
index c5cce2889446ff..db36db17aa0e0c 100644
--- a/app/javascript/mastodon/locales/ga.json
+++ b/app/javascript/mastodon/locales/ga.json
@@ -11,6 +11,7 @@
   "about.not_available": "Níor cuireadh an t-eolas seo ar fáil ar an bhfreastalaí seo.",
   "about.powered_by": "Meáin shóisialta díláraithe faoi chumhacht {mastodon}",
   "about.rules": "Rialacha an fhreastalaí",
+  "account.account_note_header": "Nóta pearsanta",
   "account.add_or_remove_from_list": "Cuir Le nó Bain De na liostaí",
   "account.badges.bot": "Bota",
   "account.badges.group": "Grúpa",
@@ -355,6 +356,17 @@
   "home.pending_critical_update.link": "Féach nuashonruithe",
   "home.pending_critical_update.title": "Nuashonrú slándála ríthábhachtach ar fáil!",
   "home.show_announcements": "Taispeáin fógraí",
+  "ignore_notifications_modal.disclaimer": "Ní féidir le Mastodon úsáideoirí a chur ar an eolas gur thug tú neamhaird dá bhfógraí. Má dhéantar neamhaird de fhógraí, ní stopfar na teachtaireachtaí iad féin a sheoladh.",
+  "ignore_notifications_modal.filter_instead": "Scag ina ionad sin",
+  "ignore_notifications_modal.filter_to_act_users": "Beidh tú fós in ann glacadh le húsáideoirí, iad a dhiúltú nó a thuairisciú",
+  "ignore_notifications_modal.filter_to_avoid_confusion": "Cuidíonn scagadh le mearbhall a sheachaint",
+  "ignore_notifications_modal.filter_to_review_separately": "Is féidir leat fógraí scagtha a athbhreithniú ar leithligh",
+  "ignore_notifications_modal.ignore": "Déan neamhaird de fhógraí",
+  "ignore_notifications_modal.limited_accounts_title": "An dtugann tú neamhaird d'fhógraí ó chuntais mhodhnaithe?",
+  "ignore_notifications_modal.new_accounts_title": "An bhfuil fonn ort neamhaird a dhéanamh d'fhógraí ó chuntais nua?",
+  "ignore_notifications_modal.not_followers_title": "An dtugann tú aird ar fhógraí ó dhaoine nach leanann tú?",
+  "ignore_notifications_modal.not_following_title": "An ndéanann tú neamhaird de fhógraí ó dhaoine nach leanann tú?",
+  "ignore_notifications_modal.private_mentions_title": "An dtugann tú aird ar fhógraí ó Luaintí Príobháideacha gan iarraidh?",
   "interaction_modal.description.favourite": "Le cuntas ar Mastodon, is fearr leat an postáil seo chun a chur in iúl don údar go bhfuil meas agat air agus é a shábháil ar feadh níos déanaí.",
   "interaction_modal.description.follow": "Le cuntas ar Mastodon, is féidir leat {name} a leanúint chun a gcuid postálacha a fháil i do fhotha baile.",
   "interaction_modal.description.reblog": "Le cuntas ar Mastodon, is féidir leat an postáil seo a threisiú chun é a roinnt le do leantóirí féin.",
@@ -481,6 +493,11 @@
   "notification.favourite": "Is fearr le {name} do phostáil",
   "notification.follow": "Lean {name} thú",
   "notification.follow_request": "D'iarr {name} ort do chuntas a leanúint",
+  "notification.label.mention": "Luaigh",
+  "notification.label.private_mention": "Lua príobháideach",
+  "notification.label.private_reply": "Freagra príobháideach",
+  "notification.label.reply": "Freagra",
+  "notification.mention": "Luaigh",
   "notification.moderation-warning.learn_more": "Foghlaim níos mó",
   "notification.moderation_warning": "Tá rabhadh modhnóireachta faighte agat",
   "notification.moderation_warning.action_delete_statuses": "Baineadh cuid de do phostálacha.",
@@ -501,9 +518,26 @@
   "notification.status": "Phostáil {name} díreach",
   "notification.update": "Chuir {name} postáil in eagar",
   "notification_requests.accept": "Glac",
+  "notification_requests.accept_all": "Glac le gach",
+  "notification_requests.accept_multiple": "{count, plural, one {Glac le # iarratas} two {Glac le # iarratas} few {Glac le # iarratas} many {Glac le # iarratas} other {Glac le # iarratais}}",
+  "notification_requests.confirm_accept_all.button": "Glac le gach",
+  "notification_requests.confirm_accept_all.message": "Tá tú ar tí glacadh le {count, plural, one {iarratas fógra amháin} two {# iarratas fógra} few {# iarratas fógra} many {# iarratas fógra} other {# iarratais fógra}}. An bhfuil tú cinnte gur mian leat leanúint ar aghaidh?",
+  "notification_requests.confirm_accept_all.title": "Glac le hiarratais ar fhógra?",
+  "notification_requests.confirm_dismiss_all.button": "Ruaig gach",
+  "notification_requests.confirm_dismiss_all.message": "Tá tú ar tí neamhaird a dhéanamh ar {count, plural, one {iarratas fógra amháin} two {# iarratas fógra} few {# iarratas fógra} many {# iarratas fógra} other {# iarratais fógra}}. Ní bheidh tú in ann {count, plural, one {é} two {iad} few {iad} many {iad} other {iad}} a rochtain go héasca arís. An bhfuil tú cinnte gur mian leat leanúint ar aghaidh?",
+  "notification_requests.confirm_dismiss_all.title": "An bhfuil fonn ort iarratais ar fhógra a dhíbhe?",
   "notification_requests.dismiss": "Díbhe",
+  "notification_requests.dismiss_all": "Ruaig gach",
+  "notification_requests.dismiss_multiple": "{count, plural, one {Neamhaird a dhéanamh ar # iarratas} two {Neamhaird a dhéanamh ar # iarratas} few {Neamhaird a dhéanamh ar # iarratas} many {Neamhaird a dhéanamh ar # iarratas} other {Neamhaird a dhéanamh ar # iarratais}}",
+  "notification_requests.enter_selection_mode": "Roghnaigh",
+  "notification_requests.exit_selection_mode": "Cealaigh",
+  "notification_requests.explainer_for_limited_account": "Scagadh fógraí ón gcuntas seo toisc go bhfuil an cuntas teoranta ag modhnóir.",
+  "notification_requests.explainer_for_limited_remote_account": "Scagadh fógraí ón gcuntas seo toisc go bhfuil an cuntas nó a fhreastalaí teoranta ag modhnóir.",
+  "notification_requests.maximize": "Uasmhéadaigh",
+  "notification_requests.minimize_banner": "Íoslaghdaigh bratach na bhfógraí scagtha",
   "notification_requests.notifications_from": "Fógraí ó {name}",
   "notification_requests.title": "Fógraí scagtha",
+  "notification_requests.view": "Féach ar fhógraí",
   "notifications.clear": "Glan fógraí",
   "notifications.clear_confirmation": "An bhfuil tú cinnte gur mhaith leat d'fhógraí go léir a ghlanadh go buan?",
   "notifications.clear_title": "Glan fógraí?",
@@ -540,6 +574,14 @@
   "notifications.permission_denied": "Níl fógraí deisce ar fáil mar gheall ar iarratas ar chead brabhsálaí a diúltaíodh roimhe seo",
   "notifications.permission_denied_alert": "Ní féidir fógraí deisce a chumasú, mar gur diúltaíodh cead brabhsálaí roimhe seo",
   "notifications.permission_required": "Níl fógraí deisce ar fáil toisc nár tugadh an cead riachtanach.",
+  "notifications.policy.accept": "Glac",
+  "notifications.policy.accept_hint": "Taispeáin i bhfógraí",
+  "notifications.policy.drop": "Déan neamhaird de",
+  "notifications.policy.drop_hint": "Seol chuig an neamhní, gan a bheith le feiceáil arís",
+  "notifications.policy.filter": "Scagaire",
+  "notifications.policy.filter_hint": "Seol chuig an mbosca isteach fógraí scagtha",
+  "notifications.policy.filter_limited_accounts_hint": "Teoranta ag modhnóirí freastalaí",
+  "notifications.policy.filter_limited_accounts_title": "Cuntais mhodhnaithe",
   "notifications.policy.filter_new_accounts.hint": "Cruthaithe laistigh den {days, plural, one {lae amháin} two {# lá} few {# lá} many {# lá} other {# lá}}",
   "notifications.policy.filter_new_accounts_title": "Cuntais nua",
   "notifications.policy.filter_not_followers_hint": "Agus daoine a bhfuil siad ag leanúint ort le níos lú ná {days, plural, one {lae amháin} two {# lá} few {# lá} many {# lá} other {# lá}}",
@@ -548,6 +590,7 @@
   "notifications.policy.filter_not_following_title": "Daoine nach leanann tú",
   "notifications.policy.filter_private_mentions_hint": "Scagtha mura bhfuil sé mar fhreagra ar do lua féin nó má leanann tú an seoltóir",
   "notifications.policy.filter_private_mentions_title": "Tagairtí príobháideacha gan iarraidh",
+  "notifications.policy.title": "Bainistigh fógraí ó…",
   "notifications_permission_banner.enable": "Ceadaigh fógraí ar an deasc",
   "notifications_permission_banner.how_to_control": "Chun fógraí a fháil nuair nach bhfuil Mastodon oscailte, cumasaigh fógraí deisce. Is féidir leat a rialú go beacht cé na cineálacha idirghníomhaíochtaí a ghineann fógraí deisce tríd an gcnaipe {icon} thuas nuair a bhíonn siad cumasaithe.",
   "notifications_permission_banner.title": "Ná caill aon rud go deo",
@@ -788,6 +831,7 @@
   "timeline_hint.remote_resource_not_displayed": "Níl {resource} ó fhreastalaithe eile ar taispeáint.",
   "timeline_hint.resources.followers": "Leantóirí",
   "timeline_hint.resources.follows": "Cuntais leanta",
+  "timeline_hint.resources.replies": "Roinnt freagraí",
   "timeline_hint.resources.statuses": "Postáilí níos sine",
   "trends.counter_by_accounts": "{count, plural, one {{counter} duine} other {{counter} duine}} le {days, plural, one {lá} other {{days} lá}} anuas",
   "trends.trending_now": "Ag treochtáil anois",
diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json
index 6ed70c00d925dd..7d71400206e831 100644
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@@ -357,7 +357,10 @@
   "home.pending_critical_update.title": "Hai una actualización crítica de seguridade!",
   "home.show_announcements": "Amosar anuncios",
   "ignore_notifications_modal.disclaimer": "Mastodon non pode informar ás usuarias se ignoraches as súas notificacións. Ao ignorar as notificacións non evitarás que as mensaxes sexan enviadas igualmente.",
+  "ignore_notifications_modal.filter_instead": "Filtrar igualmente",
+  "ignore_notifications_modal.filter_to_act_users": "Poderás seguir aceptando, rexeitando e denunciando usuarias",
   "ignore_notifications_modal.filter_to_avoid_confusion": "Ao filtrar axudas a evitar posibles confusións",
+  "ignore_notifications_modal.filter_to_review_separately": "Podes revisar as notificacións filtradas por separado",
   "ignore_notifications_modal.ignore": "Ignorar notificacións",
   "ignore_notifications_modal.limited_accounts_title": "Ignorar notificacións desde contas moderadas?",
   "ignore_notifications_modal.new_accounts_title": "Ignorar notificacións desde novas contas?",
diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json
index a373e8d44ee779..4af37bce856525 100644
--- a/app/javascript/mastodon/locales/he.json
+++ b/app/javascript/mastodon/locales/he.json
@@ -356,6 +356,8 @@
   "home.pending_critical_update.link": "צפיה בעדכונים",
   "home.pending_critical_update.title": "יצא עדכון אבטחה חשוב!",
   "home.show_announcements": "הצג הכרזות",
+  "ignore_notifications_modal.filter_to_act_users": "עדיין ביכולתך לקבל, לדחות ולדווח על משתמשים אחרים",
+  "ignore_notifications_modal.filter_to_review_separately": "ניתן לסקור התראות מפולטרות בנפרד",
   "interaction_modal.description.favourite": "עם חשבון מסטודון, ניתן לחבב את ההודעה כדי לומר למחבר/ת שהערכת את תוכנו או כדי לשמור אותו לקריאה בעתיד.",
   "interaction_modal.description.follow": "עם חשבון מסטודון, ניתן לעקוב אחרי {name} כדי לקבל את הפוסטים שלו/ה בפיד הבית.",
   "interaction_modal.description.reblog": "עם חשבון מסטודון, ניתן להדהד את החצרוץ ולשתף עם עוקבים.",
diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json
index 5e6b42b3bb31e9..08a79e50c2acc3 100644
--- a/app/javascript/mastodon/locales/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@@ -358,7 +358,9 @@
   "home.show_announcements": "Közlemények megjelenítése",
   "ignore_notifications_modal.disclaimer": "A Mastodon nem tudja értesíteni azokat a felhasználókat, akiknek figyelmen kívül hagytad az értesítéseit. Az értesítések figyelmen kívül hagyása nem állítja meg az üzenetek elküldését.",
   "ignore_notifications_modal.filter_instead": "Inkább szűrés",
+  "ignore_notifications_modal.filter_to_act_users": "Továbbra is el tudja fogadni, el tudja utasítani vagy jelenteni tudja a felhasználókat",
   "ignore_notifications_modal.filter_to_avoid_confusion": "A szűrés segít elkerülni a lehetséges félreértéseket",
+  "ignore_notifications_modal.filter_to_review_separately": "A szűrt értesítések külön tekinthetők át",
   "ignore_notifications_modal.ignore": "Értesítések figyelmen kívül hagyása",
   "ignore_notifications_modal.limited_accounts_title": "Moderált fiókok értesítéseinek figyelmen kívül hagyása?",
   "ignore_notifications_modal.new_accounts_title": "Új fiókok értesítéseinek figyelmen kívül hagyása?",
diff --git a/app/javascript/mastodon/locales/sq.json b/app/javascript/mastodon/locales/sq.json
index 42730c4a9f6026..78b90e2788af29 100644
--- a/app/javascript/mastodon/locales/sq.json
+++ b/app/javascript/mastodon/locales/sq.json
@@ -358,7 +358,9 @@
   "home.show_announcements": "Shfaqi lajmërimet",
   "ignore_notifications_modal.disclaimer": "Mastodon-i s’mund të njoftojë përdoruesit se po shpërfillni njoftimet e tyre. Shpërfillja e njoftimeve s’do të ndalë dërgimin e vetë mesazheve.",
   "ignore_notifications_modal.filter_instead": "Në vend të kësaj, filtroji",
+  "ignore_notifications_modal.filter_to_act_users": "Do të jeni prapë në gjendje të pranoni, hidhni poshtë, ose raportoni përdorues",
   "ignore_notifications_modal.filter_to_avoid_confusion": "Filtrimi ndihmon të shmanget konfuzion potencial",
+  "ignore_notifications_modal.filter_to_review_separately": "Njoftimet e filtruara mund t’i shqyrtoni ndarazi",
   "ignore_notifications_modal.ignore": "Shpërfilli njoftimet",
   "ignore_notifications_modal.limited_accounts_title": "Të shpërfillen njoftime nga llogari të moderuara?",
   "ignore_notifications_modal.new_accounts_title": "Të shpërfillen njoftime nga llogari të reja?",
diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json
index 164fc987fea948..47b6a89225477b 100644
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@@ -491,6 +491,7 @@
   "notification.label.private_mention": "การกล่าวถึงแบบส่วนตัว",
   "notification.label.private_reply": "การตอบกลับแบบส่วนตัว",
   "notification.label.reply": "การตอบกลับ",
+  "notification.mention": "การกล่าวถึง",
   "notification.moderation-warning.learn_more": "เรียนรู้เพิ่มเติม",
   "notification.moderation_warning": "คุณได้รับคำเตือนการกลั่นกรอง",
   "notification.moderation_warning.action_delete_statuses": "เอาโพสต์บางส่วนของคุณออกแล้ว",
diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json
index c6438fca7e77da..ba84b722128100 100644
--- a/app/javascript/mastodon/locales/tr.json
+++ b/app/javascript/mastodon/locales/tr.json
@@ -358,7 +358,9 @@
   "home.show_announcements": "Duyuruları göster",
   "ignore_notifications_modal.disclaimer": "Mastodon bildirimlerini yok saydığınız kullanıcıları bilgilendiremez. Bildirimleri yok saymak iletilerin gönderilmesini durdurmayacaktır.",
   "ignore_notifications_modal.filter_instead": "Onun yerine filtrele",
+  "ignore_notifications_modal.filter_to_act_users": "Kullanıcıları kabul etmeye, red etmeye veya bildirmeye devam edebileceksiniz",
   "ignore_notifications_modal.filter_to_avoid_confusion": "Filtreleme olası kafa karışıklığını önlemeye yardımcı olur",
+  "ignore_notifications_modal.filter_to_review_separately": "Filtrelenmiş bildirimleri ayrıca inceleyebilirsiniz",
   "ignore_notifications_modal.ignore": "Bildirimleri yoksay",
   "ignore_notifications_modal.limited_accounts_title": "Modere edilen hesapların bildirimlerini yoksay?",
   "ignore_notifications_modal.new_accounts_title": "Yeni hesapların bildirimlerini yoksay?",
diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json
index 91d1365485c856..517390f823c575 100644
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@@ -358,7 +358,9 @@
   "home.show_announcements": "显示公告",
   "ignore_notifications_modal.disclaimer": "Mastodon无法通知对方用户你忽略了他们的通知。忽略通知不会阻止消息本身的发送。",
   "ignore_notifications_modal.filter_instead": "改为过滤",
+  "ignore_notifications_modal.filter_to_act_users": "你仍然可以接受、拒绝或举报用户",
   "ignore_notifications_modal.filter_to_avoid_confusion": "选择过滤有助于避免潜在的混淆",
+  "ignore_notifications_modal.filter_to_review_separately": "你可以单独查看被过滤的通知",
   "ignore_notifications_modal.ignore": "忽略通知",
   "ignore_notifications_modal.limited_accounts_title": "是否忽略来自受限账号的通知？",
   "ignore_notifications_modal.new_accounts_title": "是否忽略来自新账户的通知？",
diff --git a/config/locales/el.yml b/config/locales/el.yml
index a314bb9a9efa70..bd90d8f7abb28a 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -31,6 +31,7 @@ el:
       created_msg: Επιτυχής δημιουργία σημειώματος συντονισμού!
       destroyed_msg: Η σημείωση συντονισμού καταστράφηκε επιτυχώς!
     accounts:
+      add_email_domain_block: Αποκλεισμός τομέα email
       approve: Έγκριση
       approved_msg: Επιτυχής έγκριση αίτησης εγγραφής του/της %{username}
       are_you_sure: Σίγουρα;
diff --git a/config/locales/ga.yml b/config/locales/ga.yml
index d8bdbde01d1e04..9d4d281f4fa646 100644
--- a/config/locales/ga.yml
+++ b/config/locales/ga.yml
@@ -37,6 +37,7 @@ ga:
       created_msg: Cruthaíodh nóta modhnóireachta go rathúil!
       destroyed_msg: Nóta measarthachta scriosta go rathúil!
     accounts:
+      add_email_domain_block: Cuir bac ar fhearann ​​​​ríomhphoist
       approve: Faomh
       approved_msg: D'éirigh le feidhmchlár sínithe %{username} a cheadú
       are_you_sure: An bhfuil tú cinnte?
@@ -63,6 +64,7 @@ ga:
       demote: Ísligh
       destroyed_msg: Tá sonraí %{username} ciúáilte anois le scriosadh gan mhoill
       disable: Reoigh
+      disable_sign_in_token_auth: Díchumasaigh fíordheimhniú comhartha ríomhphoist
       disable_two_factor_authentication: Díchumasaigh 2FA
       disabled: Reoite
       display_name: Ainm taispeána
@@ -71,6 +73,7 @@ ga:
       email: Ríomhphost
       email_status: Stádas ríomhphoist
       enable: Dí-reoigh
+      enable_sign_in_token_auth: Cumasaigh fíordheimhniú comhartha ríomhphoist
       enabled: Ar chumas
       enabled_msg: D'éirigh le dí-reoite cuntas %{username}
       followers: Leantóirí
@@ -138,6 +141,7 @@ ga:
       resubscribe: Athchláraigh
       role: Ról
       search: Cuardaigh
+      search_same_email_domain: Úsáideoirí eile a bhfuil an fearann ​​ríomhphoist céanna acu
       search_same_ip: Úsáideoirí eile a bhfuil an IP céanna acu
       security: Slándáil
       security_measures:
@@ -178,21 +182,26 @@ ga:
         approve_appeal: Achomharc a cheadú
         approve_user: Úsáideoir a cheadú
         assigned_to_self_report: Sann Tuairisc
+        change_email_user: Athraigh Ríomhphost don Úsáideoir
         change_role_user: Athrú Ról an Úsáideora
         confirm_user: Deimhnigh Úsáideoir
         create_account_warning: Cruthaigh Rabhadh
         create_announcement: Cruthaigh Fógra
+        create_canonical_email_block: Cruthaigh Bloc Ríomhphoist
         create_custom_emoji: Cruthaigh Emoji Saincheaptha
         create_domain_allow: Cruthaigh Ceadaigh Fearainn
         create_domain_block: Cruthaigh Bloc Fearainn
+        create_email_domain_block: Cruthaigh Bloc Fearainn Ríomhphoist
         create_ip_block: Cruthaigh riail IP
         create_unavailable_domain: Cruthaigh Fearann ​​Gan Fáil
         create_user_role: Cruthaigh Ról
         demote_user: Ísligh úsáideoir
         destroy_announcement: Scrios Fógra
+        destroy_canonical_email_block: Scrios Bloc Ríomhphoist
         destroy_custom_emoji: Scrios Saincheaptha Emoji
         destroy_domain_allow: Scrios Ceadaigh Fearainn
         destroy_domain_block: Scrios Bloc Fearainn
+        destroy_email_domain_block: Scrios Bloc Fearainn Ríomhphoist
         destroy_instance: Fearann ​​Purge
         destroy_ip_block: Scrios riail IP
         destroy_status: Scrios Postáil
@@ -200,8 +209,10 @@ ga:
         destroy_user_role: Scrios ról
         disable_2fa_user: Díchumasaigh 2FA
         disable_custom_emoji: Díchumasaigh Emoji Saincheaptha
+        disable_sign_in_token_auth_user: Díchumasaigh Fíordheimhniú Comhartha Ríomhphoist don Úsáideoir
         disable_user: Díchumasaigh Úsáideoir
         enable_custom_emoji: Cumasaigh Emoji Saincheaptha
+        enable_sign_in_token_auth_user: Cumasaigh Fíordheimhniú Comhartha Ríomhphoist don Úsáideoir
         enable_user: Cumasaigh Úsáideoir
         memorialize_account: Cuntas Cuimhneacháin
         promote_user: Úsáideoir a chur chun cinn
@@ -231,20 +242,26 @@ ga:
         approve_appeal_html: Cheadaigh %{name} achomharc ar chinneadh modhnóireachta ó %{target}
         approve_user_html: Cheadaigh %{name} clárú ó %{target}
         assigned_to_self_report_html: Shann %{name} tuairisc %{target} dóibh féin
+        change_email_user_html: D'athraigh %{name} seoladh ríomhphoist úsáideora %{target}
         change_role_user_html: D'athraigh %{name} ról %{target}
+        confirm_user_html: Dhearbhaigh %{name} seoladh ríomhphoist úsáideora %{target}
         create_account_warning_html: Sheol %{name} rabhadh chuig %{target}
         create_announcement_html: Chruthaigh %{name} fógra nua %{target}
+        create_canonical_email_block_html: "%{name} ríomhphost bactha leis an hash %{target}"
         create_custom_emoji_html: D'uaslódáil %{name} emoji nua %{target}
         create_domain_allow_html: Cheadaigh %{name} cónaidhm le fearann ​​%{target}
         create_domain_block_html: "%{name} fearann ​​bactha %{target}"
+        create_email_domain_block_html: Chuir %{name} fearann ​​ríomhphoist bactha %{target}
         create_ip_block_html: Chruthaigh %{name} riail don IP %{target}
         create_unavailable_domain_html: Chuir %{name} deireadh leis an seachadadh chuig fearann ​​%{target}
         create_user_role_html: Chruthaigh %{name} %{target} ról
         demote_user_html: "%{name} úsáideoir scriosta %{target}"
         destroy_announcement_html: "%{name} fógra scriosta %{target}"
+        destroy_canonical_email_block_html: "%{name} ríomhphost díchoiscthe leis an hash %{target}"
         destroy_custom_emoji_html: Scriosadh %{name} emoji %{target}
         destroy_domain_allow_html: Dhiúltaigh %{name} cónaidhm le fearann ​​%{target}
         destroy_domain_block_html: "%{name} fearann ​​%{target} bainte de"
+        destroy_email_domain_block_html: "%{name} fearann ​​ríomhphoist díchoiscthe %{target}"
         destroy_instance_html: Glanadh %{name} fearann ​​%{target}
         destroy_ip_block_html: "%{name} scriosta riail le haghaidh IP %{target}"
         destroy_status_html: Bhain %{name} postáil le %{target}
@@ -252,8 +269,10 @@ ga:
         destroy_user_role_html: Scrios %{name} ról %{target}
         disable_2fa_user_html: Dhíchumasaigh %{name} riachtanas dhá fhachtóir don úsáideoir %{target}
         disable_custom_emoji_html: Dhíchumasaigh %{name} emoji %{target}
+        disable_sign_in_token_auth_user_html: Dhíchumasaigh %{name} fíordheimhniú comhartha ríomhphoist le haghaidh %{target}
         disable_user_html: "%{name} logáil isteach díchumasaithe d'úsáideoir %{target}"
         enable_custom_emoji_html: "%{name} emoji cumasaithe %{target}"
+        enable_sign_in_token_auth_user_html: Chuir %{name} fíordheimhniú comhartha ríomhphoist ar chumas %{target}
         enable_user_html: "%{name} logáil isteach cumasaithe don úsáideoir %{target}"
         memorialize_account_html: Rinne %{name} cuntas %{target} a iompú ina leathanach cuimhneacháin
         promote_user_html: Chuir %{name} úsáideoir %{target} chun cinn
@@ -261,6 +280,7 @@ ga:
         reject_user_html: Dhiúltaigh %{name} síniú suas ó %{target}
         remove_avatar_user_html: Bhain %{name} avatar %{target}
         reopen_report_html: D'athoscail %{name} tuairisc %{target}
+        resend_user_html: D'fheidhmigh %{name} ríomhphost deimhnithe do %{target}
         reset_password_user_html: Athshocraigh %{name} pasfhocal úsáideora %{target}
         resolve_report_html: Réitigh %{name} tuairisc %{target}
         sensitive_account_html: Mharcáil %{name} meán %{target} mar íogair
@@ -436,6 +456,7 @@ ga:
         one: "%{count} iarracht le seachtain anuas"
         other: "%{count} iarracht chun síniú suas le seachtain anuas"
         two: "%{count} iarracht chun síniú suas le seachtain anuas"
+      created_msg: D'éirigh leis an bhfearann ​​ríomhphoist a bhlocáil
       delete: Scrios
       dns:
         types:
@@ -444,8 +465,12 @@ ga:
       new:
         create: Cuir fearann ​​leis
         resolve: Réitigh fearann
+        title: Cuir bac ar fhearann ​​​​ríomhphoist nua
+      no_email_domain_block_selected: Níor athraíodh aon bhloc fearainn ríomhphoist mar níor roghnaíodh ceann ar bith
       not_permitted: Níl sé ceadaithe
+      resolved_dns_records_hint_html: Réitíonn an t-ainm fearainn chuig na fearainn MX seo a leanas, atá freagrach sa deireadh as glacadh le ríomhphost. Má dhéantar fearann ​​MX a bhlocáil, cuirfear bac ar chlárúcháin ó aon seoladh ríomhphoist a úsáideann an fearann ​​MX céanna, fiú má tá an t-ainm fearainn infheicthe difriúil. <strong>Bí cúramach gan bac a chur ar phríomhsholáthraithe ríomhphoist.</strong>
       resolved_through_html: Réitithe trí %{domain}
+      title: Fearainn ríomhphoist bactha
     export_domain_allows:
       new:
         title: Ceadaíonn fearann ​​​​iomportála
@@ -611,6 +636,7 @@ ga:
         resolve_description_html: Ní dhéanfar aon ghníomhaíocht i gcoinne an chuntais thuairiscithe, ní dhéanfar aon stailc a thaifeadadh, agus dúnfar an tuarascáil.
         silence_description_html: Ní bheidh an cuntas le feiceáil ach amháin dóibh siúd a leanann é cheana féin nó a bhreathnaíonn suas de láimh air, rud a chuirfidh srian mór ar a rochtain. Is féidir é a chur ar ais i gcónaí. Dúnann sé gach tuairisc i gcoinne an chuntais seo.
         suspend_description_html: Beidh an cuntas agus a bhfuil ann go léir dorochtana agus scriosfar iad ar deireadh, agus beidh sé dodhéanta idirghníomhú leis. Inchúlaithe laistigh de 30 lá. Dúnann sé gach tuairisc i gcoinne an chuntais seo.
+      actions_description_html: Déan cinneadh ar an ngníomh atá le déanamh chun an tuarascáil seo a réiteach. Má dhéanann tú beart pionósach in aghaidh an chuntais tuairiscithe, seolfar fógra ríomhphoist chucu, ach amháin nuair a roghnaítear an chatagóir <strong>Turscar</strong>.
       actions_description_remote_html: Déan cinneadh ar an ngníomh atá le déanamh chun an tuarascáil seo a réiteach. Ní bheidh tionchar aige seo ach ar an gcaoi a ndéanann <strong>do fhreastalaí</strong> cumarsáid leis an gcianchuntas seo agus a láimhseálann sé a ábhar.
       add_to_report: Cuir tuilleadh leis an tuairisc
       already_suspended_badges:
@@ -675,6 +701,7 @@ ga:
         delete_data_html: Scrios próifíl agus inneachar <strong>@%{acct}</strong> 30 lá ó anois mura mbeidh siad curtha ar fionraí idir an dá linn
         preview_preamble_html: 'Gheobhaidh <strong>@%{acct}</strong> rabhadh leis an ábhar seo a leanas:'
         record_strike_html: Taifead stailc in aghaidh <strong>@%{acct}</strong> chun cabhrú leat dul i ngleic le sáruithe amach anseo ón gcuntas seo
+        send_email_html: Seol ríomhphost rabhaidh chuig <strong>@%{acct}</strong>
         warning_placeholder: Réasúnaíocht bhreise roghnach don ghníomh modhnóireachta.
       target_origin: Bunús an chuntais tuairiscithe
       title: Tuairiscí
@@ -720,6 +747,7 @@ ga:
         manage_appeals: Achomharc a bhainistiú
         manage_appeals_description: Ligeann sé d'úsáideoirí athbhreithniú a dhéanamh ar achomhairc i gcoinne gníomhartha modhnóireachta
         manage_blocks: Bainistigh Bloic
+        manage_blocks_description: Ligeann sé d'úsáideoirí bac a chur ar sholáthraithe ríomhphoist agus seoltaí IP
         manage_custom_emojis: Bainistigh Emojis Saincheaptha
         manage_custom_emojis_description: Ligeann sé d'úsáideoirí emojis saincheaptha a bhainistiú ar an bhfreastalaí
         manage_federation: Cónaidhm a bhainistiú
@@ -737,6 +765,7 @@ ga:
         manage_taxonomies: Tacsanomaíochtaí a bhainistiú
         manage_taxonomies_description: Ligeann sé d'úsáideoirí athbhreithniú a dhéanamh ar inneachar treochta agus socruithe hashtag a nuashonrú
         manage_user_access: Bainistigh Rochtain Úsáideoir
+        manage_user_access_description: Ligeann sé d'úsáideoirí fíordheimhniú dhá fhachtóir úsáideoirí eile a dhíchumasú, a seoladh ríomhphoist a athrú, agus a bpasfhocal a athshocrú
         manage_users: Bainistigh Úsáideoirí
         manage_users_description: Ligeann sé d'úsáideoirí sonraí úsáideoirí eile a fheiceáil agus gníomhartha modhnóireachta a dhéanamh ina gcoinne
         manage_webhooks: Bainistigh cuacha Gréasáin
@@ -811,6 +840,7 @@ ga:
       destroyed_msg: D'éirigh le huaslódáil an tsuímh a scriosadh!
     software_updates:
       critical_update: Criticiúil - nuashonraigh go tapa le do thoil
+      description: Moltar do shuiteáil Mastodon a choinneáil cothrom le dáta chun leas a bhaint as na socruithe agus na gnéithe is déanaí. Ina theannta sin, tá sé ríthábhachtach uaireanta Mastodon a nuashonrú go tráthúil chun saincheisteanna slándála a sheachaint. Ar na cúiseanna seo, seiceálann Mastodon nuashonruithe gach 30 nóiméad, agus tabharfaidh sé fógra duit de réir do shainroghanna fógra ríomhphoist.
       documentation_link: Foghlaim níos mó
       release_notes: Nótaí scaoilte
       title: Nuashonruithe ar fáil
@@ -919,10 +949,16 @@ ga:
     trends:
       allow: Ceadaigh
       approved: Ceadaithe
+      confirm_allow: An bhfuil tú cinnte gur mhaith leat clibeanna roghnaithe a cheadú?
+      confirm_disallow: An bhfuil tú cinnte gur mhaith leat clibeanna roghnaithe a dhícheadú?
       disallow: Dícheadaigh
       links:
         allow: Ceadaigh nasc
         allow_provider: Ceadaigh foilsitheoir
+        confirm_allow: An bhfuil tú cinnte gur mhaith leat naisc roghnaithe a cheadú?
+        confirm_allow_provider: An bhfuil tú cinnte gur mhaith leat soláthraithe roghnaithe a cheadú?
+        confirm_disallow: An bhfuil tú cinnte gur mhaith leat naisc roghnaithe a dhícheadú?
+        confirm_disallow_provider: An bhfuil tú cinnte gur mhaith leat soláthraithe roghnaithe a dhícheadú?
         description_html: Is naisc iad seo atá á roinnt go mór faoi láthair ag cuntais a bhfeiceann do fhreastalaí postálacha uathu. Is féidir leis cabhrú le d’úsáideoirí a fháil amach cad atá ar siúl ar fud an domhain. Ní thaispeánfar naisc ar bith go poiblí go dtí go gceadaíonn tú an foilsitheoir. Is féidir leat naisc aonair a cheadú nó a dhiúltú freisin.
         disallow: Nasc a dhícheadú
         disallow_provider: Dícheadaigh foilsitheoir
@@ -949,6 +985,10 @@ ga:
       statuses:
         allow: Ceadaigh postáil
         allow_account: Ceadaigh údar
+        confirm_allow: An bhfuil tú cinnte gur mhaith leat stádas roghnaithe a cheadú?
+        confirm_allow_account: An bhfuil tú cinnte gur mhaith leat cuntais roghnaithe a cheadú?
+        confirm_disallow: An bhfuil tú cinnte gur mhaith leat stádais roghnaithe a dhícheadú?
+        confirm_disallow_account: An bhfuil tú cinnte gur mhaith leat cuntais roghnaithe a dhícheadú?
         description_html: Is postálacha iad seo a bhfuil do fhreastalaí ar an eolas fúthu agus atá á roinnt faoi láthair agus is fearr leat go mór faoi láthair. Is féidir leis cabhrú le d’úsáideoirí nua agus úsáideoirí atá ag filleadh níos mó daoine a aimsiú le leanúint. Ní thaispeánfar postálacha ar bith go poiblí go dtí go gceadaíonn tú an t-údar, agus ceadaíonn an t-údar a gcuntas a mholadh do dhaoine eile. Is féidir leat postálacha aonair a cheadú nó a dhiúltú freisin.
         disallow: Dícheadaigh postáil
         disallow_account: Údar a dhícheadú
@@ -987,6 +1027,7 @@ ga:
           one: Úsáidte ag duine amháin le seachtain anuas
           other: Úsáidte ag %{count} duine le seachtain anuas
           two: Úsáidte ag %{count} duine le seachtain anuas
+      title: Moltaí & Treochtaí
       trending: Treocht
     warning_presets:
       add_new: Cuir nua leis
@@ -1074,7 +1115,9 @@ ga:
       guide_link_text: Is féidir le gach duine rannchuidiú.
     sensitive_content: Ábhar íogair
   application_mailer:
+    notification_preferences: Athraigh roghanna ríomhphoist
     salutation: "%{name},"
+    settings: 'Athraigh sainroghanna ríomhphoist: %{link}'
     unsubscribe: Díliostáil
     view: 'Amharc:'
     view_profile: Féach ar phróifíl
@@ -1094,6 +1137,7 @@ ga:
       hint_html: Ach rud amháin eile! Ní mór dúinn a dhearbhú gur duine daonna thú (tá sé seo ionas gur féidir linn an turscar a choinneáil amach!). Réitigh an CAPTCHA thíos agus cliceáil "Ar aghaidh".
       title: Seiceáil slándála
     confirmations:
+      awaiting_review: Tá do sheoladh ríomhphoist deimhnithe! Tá do chlárúchán á athbhreithniú ag foireann %{domain} anois. Gheobhaidh tú ríomhphost má cheadaíonn siad do chuntas!
       awaiting_review_title: Tá do chlárú á athbhreithniú
       clicking_this_link: ag cliceáil ar an nasc seo
       login_link: logáil isteach
@@ -1101,6 +1145,7 @@ ga:
       redirect_to_app_html: Ba cheart go ndearnadh tú a atreorú chuig an aip <strong>%{app_name}</strong>. Murar tharla sin, bain triail as %{clicking_this_link} nó fill ar an aip de láimh.
       registration_complete: Tá do chlárú ar %{domain} críochnaithe anois!
       welcome_title: Fáilte, %{name}!
+      wrong_email_hint: Mura bhfuil an seoladh ríomhphoist sin ceart, is féidir leat é a athrú i socruithe cuntais.
     delete_account: Scrios cuntas
     delete_account_html: Más mian leat do chuntas a scriosadh, is féidir leat <a href="%{path}">leanúint ar aghaidh anseo</a>. Iarrfar ort deimhniú.
     description:
@@ -1121,6 +1166,7 @@ ga:
     or_log_in_with: Nó logáil isteach le
     privacy_policy_agreement_html: Léigh mé agus aontaím leis an <a href="%{privacy_policy_path}" target="_blank">polasaí príobháideachais</a>
     progress:
+      confirm: Deimhnigh ríomhphost
       details: Do chuid sonraí
       review: Ár léirmheas
       rules: Glac le rialacha
@@ -1142,8 +1188,10 @@ ga:
     security: Slándáil
     set_new_password: Socraigh pasfhocal nua
     setup:
+      email_below_hint_html: Seiceáil d'fhillteán turscair, nó iarr ceann eile. Is féidir leat do sheoladh ríomhphoist a cheartú má tá sé mícheart.
       email_settings_hint_html: Cliceáil ar an nasc a sheol muid chugat chun %{email} a fhíorú. Beidh muid ag fanacht ar dheis anseo.
       link_not_received: Nach bhfuair tú nasc?
+      new_confirmation_instructions_sent: Gheobhaidh tú ríomhphost nua leis an nasc deimhnithe i gceann cúpla bomaite!
       title: Seiceáil do bhosca isteach
     sign_in:
       preamble_html: Logáil isteach le do dhintiúir <strong>%{domain}</strong>. Má tá do chuntas á óstáil ar fhreastalaí eile, ní bheidh tú in ann logáil isteach anseo.
@@ -1154,7 +1202,9 @@ ga:
       title: Déanaimis tú a shocrú ar %{domain}.
     status:
       account_status: Stádas cuntais
+      confirming: Waiting for email confirmation to be completed.
       functional: Tá do chuntas ag feidhmiú go hiomlán.
+      pending: Tá d’iarratas ar feitheamh athbhreithnithe ag ár bhfoireann. Seans go dtógfaidh sé seo roinnt ama. Gheobhaidh tú ríomhphost má cheadaítear d’iarratas.
       redirecting_to: Tá do chuntas neamhghníomhach toisc go bhfuil sé á atreorú chuig %{acct} faoi láthair.
       self_destruct: Toisc go bhfuil %{domain} ag dúnadh síos, ní bhfaighidh tú ach rochtain theoranta ar do chuntas.
       view_strikes: Féach ar stailceanna san am atá caite i gcoinne do chuntais
@@ -1197,6 +1247,9 @@ ga:
       before: 'Sula dtéann tú ar aghaidh, léigh na nótaí seo go cúramach le do thoil:'
       caches: Seans go seasfaidh inneachar atá i dtaisce ag freastalaithe eile
       data_removal: Bainfear do phostálacha agus sonraí eile go buan
+      email_change_html: Is féidir leat <a href="%{path}">do sheoladh ríomhphoist a athrú</a> gan do chuntas a scriosadh
+      email_contact_html: Mura sroicheann sé fós, is féidir leat ríomhphost a chur chuig <a href="mailto:%{email}">%{email}</a> le haghaidh cabhrach
+      email_reconfirmation_html: Mura bhfuil an ríomhphost deimhnithe á fháil agat, is féidir <a href="%{path}">é a iarraidh arís</a>
       irreversible: Ní bheidh tú in ann do chuntas a aischur nó a athghníomhachtú
       more_details_html: Le haghaidh tuilleadh sonraí, féach an <a href="%{terms_path}">polasaí príobháideachais</a>.
       username_available: Cuirfear d'ainm úsáideora ar fáil arís
@@ -1453,6 +1506,7 @@ ga:
     authentication_methods:
       otp: app fíordheimhnithe dhá-fachtóir
       password: pasfhocal
+      sign_in_token: cód slándála ríomhphoist
       webauthn: eochracha slándála
     description_html: Má fheiceann tú gníomhaíocht nach n-aithníonn tú, smaoinigh ar do phasfhocal a athrú agus fíordheimhniú dhá fhachtóir a chumasú.
     empty: Níl aon stair fíordheimhnithe ar fáil
@@ -1463,6 +1517,16 @@ ga:
     unsubscribe:
       action: Sea, díliostáil
       complete: Gan liostáil
+      confirmation_html: An bhfuil tú cinnte gur mhaith leat díliostáil ó %{type} a fháil do Mastodon ar %{domain} chuig do ríomhphost ag %{email}? Is féidir leat liostáil arís i gcónaí ó do <a href="%{settings_path}">socruithe fógra ríomhphoist</a>.
+      emails:
+        notification_emails:
+          favourite: ríomhphoist fógra is fearr leat
+          follow: leanúint ríomhphoist fógra
+          follow_request: lean ríomhphoist iarratais
+          mention: trácht ar ríomhphoist fógra
+          reblog: ríomhphoist fógraí a threisiú
+      resubscribe_html: Má dhíliostáil tú de dhearmad, is féidir leat liostáil arís ó do <a href="%{settings_path}">socruithe fógra ríomhphoist</a>.
+      success_html: Ní bhfaighidh tú %{type} le haghaidh Mastodon ar %{domain} chuig do ríomhphost ag %{email} a thuilleadh.
       title: Díliostáil
   media_attachments:
     validations:
@@ -1543,6 +1607,8 @@ ga:
     update:
       subject: Chuir %{name} postáil in eagar
   notifications:
+    administration_emails: Fógraí ríomhphoist admin
+    email_events: Imeachtaí le haghaidh fógraí ríomhphoist
     email_events_hint: 'Roghnaigh imeachtaí ar mhaith leat fógraí a fháil ina leith:'
   number:
     human:
@@ -1701,6 +1767,7 @@ ga:
     import: Iompórtáil
     import_and_export: Iompórtáil agus easpórtáil
     migrate: Imirce cuntais
+    notifications: Fógraí ríomhphoist
     preferences: Sainroghanna pearsanta
     profile: Próifíl
     relationships: Leantóirí agus leanúna
@@ -1968,6 +2035,7 @@ ga:
     invalid_otp_token: Cód dhá-fhachtóir neamhbhailí
     otp_lost_help_html: Má chaill tú rochtain ar an dá cheann, is féidir leat dul i dteagmháil le %{email}
     rate_limited: An iomarca iarrachtaí fíordheimhnithe, bain triail eile as ar ball.
+    seamless_external_login: Tá tú logáilte isteach trí sheirbhís sheachtrach, mar sin níl socruithe pasfhocail agus ríomhphoist ar fáil.
     signed_in_as: 'Sínithe isteach mar:'
   verification:
     extra_instructions_html: <strong>Leid:</strong> Is féidir an nasc ar do shuíomh Gréasáin a bheith dofheicthe. Is í an chuid thábhachtach ná <code>rel="me"</code> a chuireann cosc ​​ar phearsanú ar shuímh Ghréasáin a bhfuil inneachar a ghintear leis an úsáideoir. Is féidir leat fiú clib <code>nasc</code> a úsáid i gceanntásc an leathanaigh in ionad <code>a</code>, ach caithfidh an HTML a bheith inrochtana gan JavaScript a chur i gcrích.
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 1db7f79986b321..27c71182b6bb4c 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -31,6 +31,7 @@ gl:
       created_msg: Nota de moderación creada correctamente!
       destroyed_msg: Nota de moderación eliminada de xeito correcto!
     accounts:
+      add_email_domain_block: Bloquear dominio de correo
       approve: Aprobar
       approved_msg: Aprobada a solicitude de rexistro de %{username}
       are_you_sure: Está segura?
@@ -57,6 +58,7 @@ gl:
       demote: Rebaixar
       destroyed_msg: Os datos de %{username} están na cola para ser eliminados axiña
       disable: Desactivar
+      disable_sign_in_token_auth: Desactivar a autenticación con token por correo
       disable_two_factor_authentication: Desactivar 2FA
       disabled: Desactivado
       display_name: Nome a amosar
@@ -65,6 +67,7 @@ gl:
       email: Enderezo de correo
       email_status: Estado do correo
       enable: Activar
+      enable_sign_in_token_auth: Activar autenticación con token por correo
       enabled: Activado
       enabled_msg: Desbloqueada a conta de %{username}
       followers: Seguidoras
@@ -129,6 +132,7 @@ gl:
       resubscribe: Resubscribir
       role: Rol
       search: Procurar
+      search_same_email_domain: Outras usuarias co mesmo dominio de correo
       search_same_ip: Outras usuarias co mesmo IP
       security: Seguridade
       security_measures:
@@ -169,21 +173,26 @@ gl:
         approve_appeal: Aprobar apelación
         approve_user: Aprobar Usuaria
         assigned_to_self_report: Asignar denuncia
+        change_email_user: Cambiar o correo da Usuaria
         change_role_user: Cambiar Rol da Usuaria
         confirm_user: Confirmar usuaria
         create_account_warning: Crear aviso
         create_announcement: Crear anuncio
+        create_canonical_email_block: Crear Bloqueo de Correo
         create_custom_emoji: Crear emoticonas personalizadas
         create_domain_allow: Crear Dominio Permitido
         create_domain_block: Crear bloquedo do Dominio
+        create_email_domain_block: Crear Bloqueo de Dominio do correo
         create_ip_block: Crear regra IP
         create_unavailable_domain: Crear dominio Non dispoñible
         create_user_role: Crear Rol
         demote_user: Degradar usuaria
         destroy_announcement: Eliminar anuncio
+        destroy_canonical_email_block: Eliminar bloqueo do correo
         destroy_custom_emoji: Eliminar emoticona personalizada
         destroy_domain_allow: Eliminar Dominio permitido
         destroy_domain_block: Eliminar bloqueo do Dominio
+        destroy_email_domain_block: Eliminar bloqueo do dominio do correo
         destroy_instance: Purgar Dominio
         destroy_ip_block: Eliminar regra IP
         destroy_status: Eliminar publicación
@@ -191,8 +200,10 @@ gl:
         destroy_user_role: Eliminar Rol
         disable_2fa_user: Desactivar 2FA
         disable_custom_emoji: Desactivar emoticona personalizada
+        disable_sign_in_token_auth_user: Desactivar Autenticación por Token no Correo para a Usuaria
         disable_user: Desactivar usuaria
         enable_custom_emoji: Activar emoticona personalizada
+        enable_sign_in_token_auth_user: Activar Autenticación con Token no Correo para a Usuaria
         enable_user: Activar usuaria
         memorialize_account: Transformar en conta conmemorativa
         promote_user: Promover usuaria
@@ -222,20 +233,26 @@ gl:
         approve_appeal_html: "%{name} aprobou a apelación da decisión da moderación de %{target}"
         approve_user_html: "%{name} aprobou o rexistro de %{target}"
         assigned_to_self_report_html: "%{name} asignou a denuncia %{target} para si mesma"
+        change_email_user_html: "%{name} cambiou o enderezo de correo da usuaria %{target}"
         change_role_user_html: "%{name} cambiou o rol de %{target}"
+        confirm_user_html: "%{name} confirmou o enderezo de correo da usuaria %{target}"
         create_account_warning_html: "%{name} envioulle unha advertencia a %{target}"
         create_announcement_html: "%{name} creou un novo anuncio %{target}"
+        create_canonical_email_block_html: "%{name} bloqueou os correo con suma de comprobación %{target}"
         create_custom_emoji_html: "%{name} subiu un novo emoji %{target}"
         create_domain_allow_html: "%{name} permitiu a federación co dominio %{target}"
         create_domain_block_html: "%{name} bloqueou o dominio %{target}"
+        create_email_domain_block_html: "%{name} bloqueou o dominio de correo %{target}"
         create_ip_block_html: "%{name} creou regra para o IP %{target}"
         create_unavailable_domain_html: "%{name} deixou de interactuar co dominio %{target}"
         create_user_role_html: "%{name} creou o rol %{target}"
         demote_user_html: "%{name} degradou a usuaria %{target}"
         destroy_announcement_html: "%{name} eliminou o anuncio %{target}"
+        destroy_canonical_email_block_html: "%{name} desbloqueou o correo con suma de comprobación %{target}"
         destroy_custom_emoji_html: "%{name} eliminou o emoji %{target}"
         destroy_domain_allow_html: "%{name} retirou a federación co dominio %{target}"
         destroy_domain_block_html: "%{name} desbloqueou o dominio %{target}"
+        destroy_email_domain_block_html: "%{name} desbloqueou o dominio de correo %{target}"
         destroy_instance_html: "%{name} purgou o dominio %{target}"
         destroy_ip_block_html: "%{name} eliminou a regra para o IP %{target}"
         destroy_status_html: "%{name} eliminou a publicación de %{target}"
@@ -243,8 +260,10 @@ gl:
         destroy_user_role_html: "%{name} eliminou o rol %{target}"
         disable_2fa_user_html: "%{name} desactivou o requerimento do segundo factor para a usuaria %{target}"
         disable_custom_emoji_html: "%{name} desactivou o emoji %{target}"
+        disable_sign_in_token_auth_user_html: "%{name} desactivou a autenticación por token no email para %{target}"
         disable_user_html: "%{name} desactivou as credenciais para a usuaria %{target}"
         enable_custom_emoji_html: "%{name} activou o emoji %{target}"
+        enable_sign_in_token_auth_user_html: "%{name} activou a autenticación con token no email para %{target}"
         enable_user_html: "%{name} activou as credenciais para a usuaria %{target}"
         memorialize_account_html: "%{name} convertiu a conta de %{target} nunha páxina para o recordo"
         promote_user_html: "%{name} promocionou a usuaria %{target}"
@@ -252,6 +271,7 @@ gl:
         reject_user_html: "%{name} rexeitou o rexistro de %{target}"
         remove_avatar_user_html: "%{name} eliminou o avatar de %{target}"
         reopen_report_html: "%{name} reabriu a denuncia %{target}"
+        resend_user_html: "%{name} volveu a enviar o correo de confirmación para %{target}"
         reset_password_user_html: "%{name} restableceu o contrasinal da usuaria %{target}"
         resolve_report_html: "%{name} resolveu a denuncia %{target}"
         sensitive_account_html: "%{name} marcou o multimedia de %{target} como sensible"
@@ -412,6 +432,7 @@ gl:
       attempts_over_week:
         one: "%{count} intento na última semana"
         other: "%{count} intentos de conexión na última semana"
+      created_msg: Bloqueouse correctamente o dominio de correo
       delete: Eliminar
       dns:
         types:
@@ -420,8 +441,12 @@ gl:
       new:
         create: Engadir dominio
         resolve: Resolver dominio
+        title: Bloquear novo dominio de correo
+      no_email_domain_block_selected: Non se cambiou ningún bloqueo de dominio porque non había ningún seleccionado
       not_permitted: Non permitido
+      resolved_dns_records_hint_html: O nome de dominio corresponde cos seguintes dominios MX, que son os responsables últimos de aceptar o correo. Ao bloquear un dominio MX bloquerás a creación de contas para todo enderezo de correo que use o mesmo dominio MX, incluso se o nome de dominio visible é diferente. <strong>Ten coidado xa que podes bloquear os principais provedores de correo.</strong>
       resolved_through_html: Resolto a través de %{domain}
+      title: Dominios de correo bloqueados
     export_domain_allows:
       new:
         title: Importar dominios permitidos
@@ -575,6 +600,7 @@ gl:
         resolve_description_html: Non se van tomar accións contra a conta denunciada, nin se gardarán avisos, e pecharase a denuncia.
         silence_description_html: A conta será visible só para quen xa a está a seguir ou quen a buscou manualmente, limitando moito o seu alcance. Pódese cambiar. Isto pecha tódalas denuncias acerca desta conta.
         suspend_description_html: A conta e todo o seu contido non serán accesible e finalmente eliminaranse, será imposible interactuar con ela. A decisión é reversible durante 30 días. Isto pecha tódalas denuncias sobre esta conta.
+      actions_description_html: Decide a acción a tomar para resolver esta denuncia. Se tomas accións punitivas contra a conta denunciada enviaraselle un correo, excepto se está indicada a categoría <strong>Spam</strong>.
       actions_description_remote_html: Decide a acción a tomar para resolver a denuncia. Isto só lle afecta ao xeito en que o <strong>teu</strong> servidor se comunica con esta conta remota e xestiona o seu contido.
       add_to_report: Engadir máis á denuncia
       already_suspended_badges:
@@ -639,6 +665,7 @@ gl:
         delete_data_html: Eliminar o perfil e contidos de <strong>@%{acct}</strong> para os próximos 30 días a non ser que sexa suspendida nese período
         preview_preamble_html: "<strong>@%{acct}</strong> vai recibir un aviso co seguinte contido:"
         record_strike_html: Anotar un aviso contra <strong>@%{acct}</strong> para axudarche a xestionar futuros problemas con esta conta
+        send_email_html: Enviarlle a <strong>@%{acct}</strong> un correo de advertencia
         warning_placeholder: Razóns adicionais optativas para a acción de moderación.
       target_origin: Orixe da conta denunciada
       title: Denuncias
@@ -678,6 +705,7 @@ gl:
         manage_appeals: Xestionar recursos
         manage_appeals_description: Permite revisar as apelacións contra as accións de moderación
         manage_blocks: Xestionar bloqueos
+        manage_blocks_description: Permite que as usuarias bloqueen provedoras de correo e enderezos IP
         manage_custom_emojis: Xestionar Emojis personalizados
         manage_custom_emojis_description: Permite xestionar os emojis personalizados do servidor
         manage_federation: Xestionar a federación
@@ -695,6 +723,7 @@ gl:
         manage_taxonomies: Xestionar Taxonomías
         manage_taxonomies_description: Permite revisar o contido en voga e actualizar os axustes dos cancelos
         manage_user_access: Xestionar Acceso das usuarias
+        manage_user_access_description: Permite desactivar o segundo factor de autenticación doutras usuarias, cambiar o enderezo de correo e restablecer o contrasinal
         manage_users: Xestionar Usuarias
         manage_users_description: Permite ver os detalles doutras usuarias e realizar accións de moderación sobre elas
         manage_webhooks: Xestionar Webhooks
@@ -769,6 +798,7 @@ gl:
       destroyed_msg: Eliminado correctamente o subido!
     software_updates:
       critical_update: Crítica - actualiza axiña
+      description: Aconsellamos manter actualizado o teu servidor Mastodon para beneficiarte dos últimos arranxos e características. A maiores, de cando en vez hai actualizacións para evitar problemas importantes de seguridade. Debido a isto, Mastodon comproba cada 30 minutos se hai actualizacións e avisarate seguindo as túas preferencias de notificación por correo electrónico.
       documentation_link: Saber máis
       release_notes: Notas da versión
       title: Actualizacións dispoñibles
@@ -946,6 +976,7 @@ gl:
         used_by_over_week:
           one: Utilizado por unha persoa na última semana
           other: Utilizado por %{count} persoas na última semana
+      title: Recomendacións e Suxestións
       trending: Tendencias
     warning_presets:
       add_new: Engadir novo
@@ -1030,7 +1061,9 @@ gl:
       guide_link_text: Todas podemos contribuír.
     sensitive_content: Contido sensible
   application_mailer:
+    notification_preferences: Cambiar preferencias de correo
     salutation: "%{name},"
+    settings: 'Cambiar preferencias de correo: %{link}'
     unsubscribe: Anular subscrición
     view: 'Vista:'
     view_profile: Ver perfil
@@ -1050,6 +1083,7 @@ gl:
       hint_html: Unha cousa máis! Temos que confirmar que es un ser humano (para poder evitar contas de spam!). Resolve o CAPTCHA de aquí embaixo e preme en "Continuar".
       title: Comprobación de seguridade
     confirmations:
+      awaiting_review: O teu correo foi confirmado! A administración de %{domain} está revisando agora a túa solicitude. Recibirás un correo cando autoricen a conta!
       awaiting_review_title: Estamos revisando a solicitude de rexistro
       clicking_this_link: premendo nesta ligazón
       login_link: acceder
@@ -1057,6 +1091,7 @@ gl:
       redirect_to_app_html: Ímoste redirixir á app <strong>%{app_name}</strong>. Se iso non acontece, proba %{clicking_this_link} ou volve ti manualmente á app.
       registration_complete: Completouse a creación da conta en %{domain}!
       welcome_title: Benvida, %{name}!
+      wrong_email_hint: Se o enderezo de correo non é correcto, podes cambialo nos axustes da conta.
     delete_account: Eliminar conta
     delete_account_html: Se queres eliminar a túa conta, podes <a href="%{path}">facelo aquí</a>. Deberás confirmar a acción.
     description:
@@ -1077,6 +1112,7 @@ gl:
     or_log_in_with: Ou accede con
     privacy_policy_agreement_html: Lin e acepto a <a href="%{privacy_policy_path}" target="_blank">política de privacidade</a>
     progress:
+      confirm: Confirmar correo
       details: Detalles
       review: A nosa revisión
       rules: Aceptar regras
@@ -1098,8 +1134,10 @@ gl:
     security: Seguranza
     set_new_password: Estabelecer novo contrasinal
     setup:
+      email_below_hint_html: Mira no cartafol do spam, ou solicita outra. Podes cambiar o enderzo de correo se non é correcto.
       email_settings_hint_html: Preme na ligazón que che enviamos para verificar %{email}. Agardamos por ti.
       link_not_received: Non recibiches a ligazón?
+      new_confirmation_instructions_sent: Nuns minutos recibirás un novo correo electrónico coa ligazón de confirmación!
       title: Mira a caixa de entrada
     sign_in:
       preamble_html: Accede coas credenciais en <strong>%{domain}</strong>. Se a túa conta está noutro servidor non poderás acceder desde aquí.
@@ -1110,7 +1148,9 @@ gl:
       title: Imos crear a túa conta en %{domain}.
     status:
       account_status: Estado da conta
+      confirming: Agardando a confirmación do correo enviado.
       functional: A túa conta está completamente operativa.
+      pending: A túa solicitude está pendente de revisión. Poderíanos levar algún tempo. Recibirás un correo se a solicitude foi aprobada.
       redirecting_to: A túa conta está inactiva porque está redirixida a %{acct}.
       self_destruct: Como %{domain} vai fechar, tes acceso restrinxido á túa conta.
       view_strikes: Ver avisos anteriores respecto da túa conta
@@ -1153,6 +1193,9 @@ gl:
       before: 'Antes de continuar, por favor le estas notas con atención:'
       caches: O contido almacenado noutros servidores podería persistir
       data_removal: As túas publicacións e outros datos serán permanentemente borrados
+      email_change_html: Podes <a href="%{path}">cambiar o enderezo de correo</a> sen eliminar a conta
+      email_contact_html: Se non o recibes, podes escribir a <a href="mailto:%{email}">%{email}</a> pedindo axuda
+      email_reconfirmation_html: Se non recibes o correo de confirmación, podes <a href="%{path}">solicitalo de novo</a>
       irreversible: Non poderás restaurar ou reactivar a conta
       more_details_html: Para máis detalles, mira a <a href="%{terms_path}">política de privacidade</a>.
       username_available: O nome de usuaria estará dispoñible novamente
@@ -1385,6 +1428,7 @@ gl:
     authentication_methods:
       otp: app para autenticación con dous factores
       password: contrasinal
+      sign_in_token: código de seguridade por correo
       webauthn: chaves de seguridade
     description_html: Se ves actividade que non recoñeces, considera cambiar o contrasinal e activar o segundo factor de autenticación.
     empty: Non hai historial de autenticación
@@ -1395,6 +1439,16 @@ gl:
     unsubscribe:
       action: Si, retirar subscrición
       complete: Subscrición anulada
+      confirmation_html: Tes a certeza de querer retirar a subscrición a Mastodon en %{domain} para recibir %{type} no teu correo electrónico en %{email}? Poderás volver a subscribirte desde os <a href="%{settings_path}">axustes de notificacións por correo</a>.
+      emails:
+        notification_emails:
+          favourite: notificacións de favorecidas
+          follow: notificacións de seguimentos
+          follow_request: notificacións de solicitudes de seguimento
+          mention: notificacións de mencións
+          reblog: notificacións de promocións
+      resubscribe_html: Se por un erro eliminaches a subscrición, podes volver a subscribirte desde os <a href="%{settings_path}">axustes de notificacións por correo electrónico</a>.
+      success_html: Non vas recibir %{type} de Mastodon en %{domain} no enderezo %{email}.
       title: Anular subscrición
   media_attachments:
     validations:
@@ -1475,6 +1529,8 @@ gl:
     update:
       subject: "%{name} editou unha publicación"
   notifications:
+    administration_emails: Administrar notificacións por correo
+    email_events: Eventos para as notificación por correo
     email_events_hint: 'Escolle os eventos sobre os que queres recibir notificacións:'
   number:
     human:
@@ -1633,6 +1689,7 @@ gl:
     import: Importar
     import_and_export: Importar e exportar
     migrate: Migrar conta
+    notifications: Notificacións por correo
     preferences: Preferencias
     profile: Perfil
     relationships: Seguindo e seguidoras
@@ -1879,6 +1936,7 @@ gl:
     invalid_otp_token: O código do segundo factor non é válido
     otp_lost_help_html: Se perdes o acceso a ambos, podes contactar con %{email}
     rate_limited: Demasiados intentos de autenticación, inténtao máis tarde.
+    seamless_external_login: Accedeches a través dun servizo externo, polo que os axustes de contrasinal e correo non están dispoñibles.
     signed_in_as: 'Rexistrada como:'
   verification:
     extra_instructions_html: <strong>Truco:</strong> A ligazón pode estar agochada na túa páxina web. A parte importante é <code>rel="me"</code> que impide a suplantación en sitios web con contido creado polas usuarias. Incluso podes usar a etiqueta <code>link</code> na cabeceira da páxina en lugar de <code>a</code>, pero o HTML debe ser accesible sen precisar usar JavaScript.
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 95441d8a3399c1..8775ed543ce934 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -31,6 +31,7 @@ hu:
       created_msg: A moderációs megjegyzés sikeresen létrehozva!
       destroyed_msg: A moderációs megjegyzés sikeresen törölve!
     accounts:
+      add_email_domain_block: E-mail-domain tiltólistára vétele
       approve: Jóváhagyás
       approved_msg: "%{username} regisztrációja sikeresen elfogadva"
       are_you_sure: Biztos vagy benne?
@@ -57,6 +58,7 @@ hu:
       demote: Lefokozás
       destroyed_msg: A %{username} fiók adatai bekerültek a végleges törlése váró sorba
       disable: Befagyasztás
+      disable_sign_in_token_auth: Tokenes e-mail-hitelesítés letiltása
       disable_two_factor_authentication: Kétlépcsős hitelesítés kikapcsolása
       disabled: Befagyasztva
       display_name: Megjelenítendő név
@@ -65,6 +67,7 @@ hu:
       email: E-mail-cím
       email_status: E-mail állapot
       enable: Kiolvasztás
+      enable_sign_in_token_auth: Tokenes e-mail-hitelesítés engedélyezése
       enabled: Bekapcsolva
       enabled_msg: "%{username} fiókja befagyasztása sikeresen visszavonva"
       followers: Követő
@@ -129,6 +132,7 @@ hu:
       resubscribe: Feliratkozás ismét
       role: Szerep
       search: Keresés
+      search_same_email_domain: Felhasználók ugyanezzel az e-mail-domainnel
       search_same_ip: Más felhasználók ugyanezzel az IP-vel
       security: Biztonság
       security_measures:
@@ -169,21 +173,26 @@ hu:
         approve_appeal: Fellebbezés jóváhagyása
         approve_user: Felhasználó Jóváhagyása
         assigned_to_self_report: Jelentés hozzárendelése
+        change_email_user: Felhasználó e-mail-címének módosítása
         change_role_user: Felhasználó szerepkörének módosítása
         confirm_user: Felhasználó megerősítése
         create_account_warning: Figyelmeztetés létrehozása
         create_announcement: Közlemény létrehozása
+        create_canonical_email_block: E-mail tiltás létrehozása
         create_custom_emoji: Egyéni emodzsi létrehozása
         create_domain_allow: Domain engedélyezés létrehozása
         create_domain_block: Domain tiltás létrehozása
+        create_email_domain_block: E-mail-domain-tiltás létrehozása
         create_ip_block: IP szabály létrehozása
         create_unavailable_domain: Elérhetetlen domain létrehozása
         create_user_role: Szerepkör létrehozása
         demote_user: Felhasználó lefokozása
         destroy_announcement: Közlemény törlése
+        destroy_canonical_email_block: E-mail-tiltás törlése
         destroy_custom_emoji: Egyéni emodzsi törlése
         destroy_domain_allow: Domain engedélyezés törlése
         destroy_domain_block: Domain tiltás törlése
+        destroy_email_domain_block: E-mail-domain-tiltás törlése
         destroy_instance: Domain végleges törlése
         destroy_ip_block: IP szabály törlése
         destroy_status: Bejegyzés törlése
@@ -191,8 +200,10 @@ hu:
         destroy_user_role: Szerepkör eltávolítása
         disable_2fa_user: Kétlépcsős hitelesítés letiltása
         disable_custom_emoji: Egyéni emodzsi letiltása
+        disable_sign_in_token_auth_user: A felhasználó tokenes e-mail-hitelesítésének letiltása
         disable_user: Felhasználói letiltása
         enable_custom_emoji: Egyéni emodzsi engedélyezése
+        enable_sign_in_token_auth_user: A felhasználó tokenes e-mail-hitelesítésének engedélyezése
         enable_user: Felhasználó engedélyezése
         memorialize_account: Fiók emlékké nyilvánítása
         promote_user: Felhasználó előléptetése
@@ -222,20 +233,26 @@ hu:
         approve_appeal_html: "%{name} jóváhagyott egy fellebbezést %{target} moderátori döntéséről"
         approve_user_html: "%{name} jóváhagyta %{target} regisztrációját"
         assigned_to_self_report_html: "%{name} a %{target} bejelentést magához rendelte"
+        change_email_user_html: "%{name} megváltoztatta %{target} felhasználó e-mail-címét"
         change_role_user_html: "%{name} módosította %{target} szerepkörét"
+        confirm_user_html: "%{name} megerősítette %{target} e-mail-címét"
         create_account_warning_html: "%{name} figyelmeztetést küldött %{target} számára"
         create_announcement_html: "%{name} új közleményt hozott létre: %{target}"
+        create_canonical_email_block_html: "%{name} letiltotta a(z) %{target} hashű e-mailt"
         create_custom_emoji_html: "%{name} új emodzsit töltött fel: %{target}"
         create_domain_allow_html: "%{name} engedélyezte a föderációt %{target} domainnel"
         create_domain_block_html: "%{name} letiltotta a %{target} domaint"
+        create_email_domain_block_html: "%{name} letiltotta a(z) %{target} e-mail-domaint"
         create_ip_block_html: "%{name} létrehozta a(z) %{target} IP-címre vonatkozó szabályt"
         create_unavailable_domain_html: "%{name} leállította a kézbesítést a %{target} domainbe"
         create_user_role_html: "%{name} létrehozta a(z) %{target} szerepkört"
         demote_user_html: "%{name} lefokozta %{target} felhasználót"
         destroy_announcement_html: "%{name} törölte a %{target} közleményt"
+        destroy_canonical_email_block_html: "%{name} engedélyezte a(z) %{target} hashű e-mailt"
         destroy_custom_emoji_html: "%{name} törölte a(z) %{target} emodzsit"
         destroy_domain_allow_html: "%{name} letiltotta a föderációt a %{target} domainnel"
         destroy_domain_block_html: "%{name} engedélyezte a %{target} domaint"
+        destroy_email_domain_block_html: "%{name} engedélyezte a(z) %{target} e-mail-domaint"
         destroy_instance_html: "%{name} véglegesen törölte a(z) %{target} domaint"
         destroy_ip_block_html: "%{name} törölte a(z) %{target} IP-címre vonatkozó szabályt"
         destroy_status_html: "%{name} eltávolította %{target} felhasználó bejegyzését"
@@ -243,8 +260,10 @@ hu:
         destroy_user_role_html: "%{name} törölte a(z) %{target} szerepkört"
         disable_2fa_user_html: "%{name} kikapcsolta a kétlépcsős hitelesítést %{target} felhasználó fiókján"
         disable_custom_emoji_html: "%{name} letiltotta az emodzsit: %{target}"
+        disable_sign_in_token_auth_user_html: "%{name} letiltotta a tokenes e-mail-hitelesítést %{target} felhasználóra"
         disable_user_html: "%{name} letiltotta %{target} felhasználó bejelentkezését"
         enable_custom_emoji_html: "%{name} engedélyezte az emodzsit: %{target}"
+        enable_sign_in_token_auth_user_html: "%{name} engedélyezte a tokenes e-mail-hitelesítést %{target} felhasználóra"
         enable_user_html: "%{name} engedélyezte %{target} felhasználó bejelentkezését"
         memorialize_account_html: "%{name} emléket állított %{target} felhasználónak"
         promote_user_html: "%{name} előléptette %{target} felhasználót"
@@ -252,6 +271,7 @@ hu:
         reject_user_html: "%{name} elutasította %{target} regisztrációját"
         remove_avatar_user_html: "%{name} törölte %{target} profilképét"
         reopen_report_html: "%{name} újranyitotta a %{target} bejelentést"
+        resend_user_html: "%{name} újraküldte %{target} megerősítő e-mailjét"
         reset_password_user_html: "%{name} visszaállította %{target} felhasználó jelszavát"
         resolve_report_html: "%{name} megoldotta a %{target} bejelentést"
         sensitive_account_html: "%{name} kényesnek jelölte %{target} médiatartalmát"
@@ -412,6 +432,7 @@ hu:
       attempts_over_week:
         one: "%{count} próbálkozás a múlt héten"
         other: "%{count} próbálkozás feliratkozásra a múlt héten"
+      created_msg: E-mail-domain sikeresen letiltva
       delete: Törlés
       dns:
         types:
@@ -420,8 +441,12 @@ hu:
       new:
         create: Domain hozzáadása
         resolve: Domain feloldása
+        title: Új e-mail-domain tiltása
+      no_email_domain_block_selected: Nem változott meg egy domaintiltás sem, mert semmi sem volt kiválasztva
       not_permitted: Nem engedélyezett
+      resolved_dns_records_hint_html: A domain név a következő MX domain-ekre oldódik fel, melyek valójában fogadják az e-mailt. Az MX domain letiltása minden olyan feliratkozást tiltani fog, melyben az e-mailcím ugyanazt az MX domaint használja, még akkor is, ha a látható domain név más. <strong>Légy óvatos, hogy ne tilts le nagy e-mail szolgáltatókat.</strong>
       resolved_through_html: Feloldva %{domain}-n keresztül
+      title: Tiltott e-mail-domainek
     export_domain_allows:
       new:
         title: Domain engedélyezések importálása
@@ -575,6 +600,7 @@ hu:
         resolve_description_html: Nem csinálunk semmit a bejelentett fiókkal, nem jegyzünk fel vétséget, és bezárjuk a bejelentést.
         silence_description_html: A profil csak azok számára lesz látható, akik már követik, vagy kézzel rákeresnek, jelentősen korlátozva annak elérését. Ez a művelet bármikor visszafordítható. A fiókkal szemben indított minden bejelentést lezárunk.
         suspend_description_html: A fiók és minden tartalma elérhetetlenné válik és végül törlésre kerül. A fiókkal kapcsolatbalépni lehetetlen lesz. Ez a művelet 30 napig visszafordítható. A fiók ellen indított minden bejelentést lezárunk.
+      actions_description_html: Döntsd el, mit csináljunk, hogy megoldjuk ezt a bejelentést. Ha valamilyen büntető intézkedést hozol a bejelentett fiók ellen, küldünk neki egy figyelmeztetést e-mailben, kivéve ha a <strong>Spam</strong> kategóriát választod.
       actions_description_remote_html: Döntsd el, mit tegyünk a bejelentés lezárásának érdekében. Ez csak azt befolyásolja, hogy a <strong>saját</strong> kiszolgálód hogyan kommunikál ezzel a távoli fiókkal és hogyan kezeli annak tartalmait.
       add_to_report: Továbbiak hozzáadása a bejelentéshez
       already_suspended_badges:
@@ -639,6 +665,7 @@ hu:
         delete_data_html: "<strong>@%{acct}</strong> profiljának és tartalmainak törlése 30 nap múlva, hacsak addig nem oldják fel a felfüggesztést"
         preview_preamble_html: "<strong>@%{acct}</strong> a következő tartalommal fog figyelmeztetést kapni:"
         record_strike_html: Vétség felrovása a <strong>@%{acct}</strong> fiók ellen, hogy segítsük az eszkalációt a fiók jövőbeni kihágásai esetén
+        send_email_html: Figyelmeztető e-mail küldése <strong>@%{acct}</strong> részére
         warning_placeholder: Opcionális kiegészítő indoklás a moderációs művelethez.
       target_origin: A jelentett fiók eredete
       title: Bejelentések
@@ -678,6 +705,7 @@ hu:
         manage_appeals: Fellebbezések kezelése
         manage_appeals_description: Lehetővé teszi, hogy a felhasználó átnézze a moderációval kapcsolatos fellebbezéseket
         manage_blocks: Letiltások kezelése
+        manage_blocks_description: Lehetővé teszi, hogy a felhasználók e-mail-szolgáltatókat és IP-címeket tiltsanak le
         manage_custom_emojis: Egyedi emodzsik kezelése
         manage_custom_emojis_description: Lehetővé teszi a felhasználó számára, hogy a kiszolgáló egyéni emodzsiait kezelje
         manage_federation: Föderáció kezelése
@@ -695,6 +723,7 @@ hu:
         manage_taxonomies: Taxonómiák kezelése
         manage_taxonomies_description: Lehetővé teszi, hogy a felhasználó átnézze a felkapott tartalmakat és frissítse a hashtagek beállításait
         manage_user_access: Felhasználói hozzáférések kezelése
+        manage_user_access_description: Lehetővé teszi, hogy a felhasználók letiltsák mások kétlépcsős hitelesítését, megváltoztassák az e-mail-címüket, és alaphelyzetbe állítsák a jelszavukat
         manage_users: Felhasználók kezelése
         manage_users_description: Lehetővé teszi, hogy a felhasználó megtekintse mások részletes adatait és moderálja őket
         manage_webhooks: Webhookok kezelése
@@ -769,6 +798,7 @@ hu:
       destroyed_msg: Sikeresen töröltük a site feltöltését!
     software_updates:
       critical_update: Kritikus - frissíts gyorsan
+      description: Javasolt, hogy a Mastodon telepítésed naprakész legyen, hogy kihasználhasd a legújabb javításokat és funkciókat. Ezenkívül néha különösen fontos a Mastodon időben történő frissítése a biztonsági problémák elkerülése érdekében. Ezen okok miatt a Mastodon 30 percenként ellenőrzi a frissítéseket és az e-mail-értesítési beállításoknak megfelelően értesítést küld.
       documentation_link: További információ
       release_notes: Kiadási megjegyzések
       title: Elérhető frissítések
@@ -946,6 +976,7 @@ hu:
         used_by_over_week:
           one: Egy ember használta a múlt héten
           other: "%{count} ember használta a múlt héten"
+      title: Ajánlások és trendek
       trending: Felkapott
     warning_presets:
       add_new: Új hozzáadása
@@ -1030,7 +1061,9 @@ hu:
       guide_link_text: Bárki közreműködhet.
     sensitive_content: Kényes tartalom
   application_mailer:
+    notification_preferences: E-mail-beállítások módosítása
     salutation: "%{name}!"
+    settings: 'E-mail-beállítások módosítása: %{link}'
     unsubscribe: Leiratkozás
     view: 'Megtekintés:'
     view_profile: Profil megtekintése
@@ -1050,6 +1083,7 @@ hu:
       hint_html: Még egy dolog! Meg kell győződnünk róla, hogy tényleg valós személy vagy (így távol tarthatjuk a spam-et). Oldd meg az alábbi CAPTCHA-t és kattints a "Folytatás"-ra.
       title: Biztonsági ellenőrzés
     confirmations:
+      awaiting_review: Az e-mail-címed megerősítésre került. A(z) %{domain} stábja jelenleg áttekinti a regisztrációdat. Ha jóváhagyásra került a fiókod, egy e-mailt küldenek majd!
       awaiting_review_title: A regisztrációd áttekintés alatt áll
       clicking_this_link: kattintás erre a hivatkozásra
       login_link: bejelentkezés
@@ -1057,6 +1091,7 @@ hu:
       redirect_to_app_html: Át kellett volna irányítsunk a <strong>%{app_name}</strong> alkalmazáshoz. Ha ez nem történt meg, próbálkozz a %{clicking_this_link} lehetőséggel vagy térj vissza manuálisan az alkalmazáshoz.
       registration_complete: A regisztrációd %{domain} domainen befejeződött!
       welcome_title: Üdvözlet, %{name}!
+      wrong_email_hint: Ha az e-mail-cím nem helyes, a fiókbeállításokban megváltoztathatod.
     delete_account: Felhasználói fiók törlése
     delete_account_html: Felhasználói fiókod törléséhez <a href="%{path}">kattints ide</a>. A rendszer újbóli megerősítést fog kérni.
     description:
@@ -1077,6 +1112,7 @@ hu:
     or_log_in_with: Vagy jelentkezz be ezzel
     privacy_policy_agreement_html: Elolvastam és egyetértek az <a href="%{privacy_policy_path}" target="_blank">adatvédemi nyilatkozattal</a>
     progress:
+      confirm: E-mail megerősítése
       details: Saját adatok
       review: A felülvizsgálatunk
       rules: Szabályok elfogadása
@@ -1098,8 +1134,10 @@ hu:
     security: Biztonság
     set_new_password: Új jelszó beállítása
     setup:
+      email_below_hint_html: Nézd meg a levélszemét mappát, vagy kérj egy újat. Módosíthatod az e-mail-címet, ha az hibás.
       email_settings_hint_html: Kattints a hivatkozásra, melyet a(z) %{email} megerősítése céljából küldtünk. Addig várni fogunk.
       link_not_received: Nem kaptad meg a hivatkozást?
+      new_confirmation_instructions_sent: Néhány perc múlva új e-mailt fogsz kapni a megerősítési hivatkozással.
       title: Bejövő postaláda ellenőrzése
     sign_in:
       preamble_html: Jelentkezz be a <strong>%{domain}</strong> hitelesítéső adataiddal. Ha másik kiszolgálón található a fiókod, akkor itt nem fogsz tudni belépni.
@@ -1110,7 +1148,9 @@ hu:
       title: Állítsuk be a fiókod a %{domain} kiszolgálón.
     status:
       account_status: Fiók állapota
+      confirming: Várakozás az e-mailes visszaigazolásra.
       functional: A fiókod teljesen működőképes.
+      pending: A jelentkezésed engedélyezésre vár. Ez eltarthat egy ideig. Kapsz egy e-mailt, ha a kérelmedet jóváhagyták.
       redirecting_to: A fiókod inaktív, mert jelenleg ide %{acct} van átirányítva.
       self_destruct: Mivel a %{domain} bezár, csak korlátozott elérésed lesz a fiókodhoz.
       view_strikes: Fiókod ellen felrótt korábbi vétségek megtekintése
@@ -1153,6 +1193,9 @@ hu:
       before: 'Mielőtt továbbmész, kérlek olvasd el ezt alaposan:'
       caches: Más szerverek által cache-elt tartalmak még megmaradhatnak
       data_removal: Bejegyzéseid és minden más adatod véglegesen törlődni fog
+      email_change_html: <a href="%{path}">Megváltoztathatod az e-mail-címed</a> a fiókod törlése nélkül
+      email_contact_html: Ha még mindig nem érkezik meg, akkor segítségért írjon a(z) <a href="mailto:%{email}">%{email}</a> e-mail-címre
+      email_reconfirmation_html: Ha nem kaptad meg a megerősítő e-mailt, <a href="%{path}">itt újrakérheted</a>
       irreversible: Nem fogod tudni visszaállítani vagy újraaktiválni a fiókodat
       more_details_html: A részletekért nézd meg az <a href="%{terms_path}">adatvédelmi szabályzatot</a>.
       username_available: A fiókod ismét elérhetővé válik
@@ -1385,6 +1428,7 @@ hu:
     authentication_methods:
       otp: kétlépcsős azonosító alkalmazás
       password: jelszó
+      sign_in_token: e-mailben küldött biztonsági kód
       webauthn: biztonsági kulcsok
     description_html: Ha olyan aktivitást látsz, melyet nem ismersz fel, fontold meg, hogy megváltoztatod a jelszavad és engedélyezed a kétlépcsős hitelesítést.
     empty: Nem érhető el hitelesítési történet
@@ -1395,6 +1439,16 @@ hu:
     unsubscribe:
       action: Igen, leiratkozás
       complete: Leiratkozva
+      confirmation_html: 'Biztos, hogy leiratkozol arról, hogy %{type} típusú üzeneteket kapj a(z) %{domain} Mastodon-kiszolgálótól erre a címedre: %{email}? Bármikor újra feliratkozhatsz az <a href="%{settings_path}">e-mail-értesítési beállításokban</a>.'
+      emails:
+        notification_emails:
+          favourite: kedvencnek jelölés értesítő e-mailjei
+          follow: követés értesítő e-mailjei
+          follow_request: követési kérések e-mailjei
+          mention: megemlítés értesítő e-mailjei
+          reblog: megtolás értesítő e-mailjei
+      resubscribe_html: Ha tévedésből iratkoztál le, újra feliratkozhatsz az <a href="%{settings_path}">e-mail-értesítési beállításoknál</a>.
+      success_html: 'Mostantól nem kapsz %{type} típusú üzeneket a(z) %{domain} Mastodon-kiszolgálón erre a címedre: %{email}.'
       title: Leiratkozás
   media_attachments:
     validations:
@@ -1475,6 +1529,8 @@ hu:
     update:
       subject: "%{name} szerkesztett egy bejegyzést"
   notifications:
+    administration_emails: Adminisztrátori e-mail-értesítések
+    email_events: Az e-mail-értesítések eseményei
     email_events_hint: 'Válaszd ki azokat az eseményeket, melyekről értesítést szeretnél:'
   number:
     human:
@@ -1633,6 +1689,7 @@ hu:
     import: Importálás
     import_and_export: Import és export
     migrate: Fiók átirányítása
+    notifications: E-mail-értesítések
     preferences: Beállítások
     profile: Profil
     relationships: Követések és követők
@@ -1879,6 +1936,7 @@ hu:
     invalid_otp_token: Érvénytelen ellenőrző kód
     otp_lost_help_html: Ha mindkettőt elvesztetted, kérhetsz segítséget itt %{email}
     rate_limited: Túl sok hiteleítési kísérlet történt. Próbáld újra később.
+    seamless_external_login: Külső szolgáltatáson keresztül jelentkeztél be, így a jelszó és e-mail-beállítások nem érhetők el.
     signed_in_as: Bejelentkezve mint
   verification:
     extra_instructions_html: <strong>Tipp:</strong> A hivatkozás a weboldaladon lehet láthatatlan. A fontos rész a <code>rel="me"</code>, mely megakadályozza, hogy mások a nevedben lépjenek fel olyan oldalakon, ahol van felhasználók által előállított tartalom. A <code>link</code> tag-et az oldal fejlécében is használhatod az <code>a</code> tag helyett, de a HTML-nek elérhetőnek kell lennie JavaScript futtatása nélkül is.
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index 51ef4aa6709c9e..538400efb8bbc5 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -31,6 +31,7 @@ sq:
       created_msg: Shënimi i moderimit u krijua me sukses!
       destroyed_msg: Shënimi i moderimit u asgjësua me sukses!
     accounts:
+      add_email_domain_block: Blloko përkratësi email-esh
       approve: Miratojeni
       approved_msg: U miratua me sukses aplikimi për regjistrim të %{username}
       are_you_sure: Jeni i sigurt?
@@ -57,6 +58,7 @@ sq:
       demote: Zhgradoje
       destroyed_msg: Të dhënat e %{username} tani janë vënë në radhë për fshirje të menjëhershme
       disable: Çaktivizoje
+      disable_sign_in_token_auth: Çaktivizo mirëfilltësim me token email-i
       disable_two_factor_authentication: Çaktivizoni 2FA-në
       disabled: E çaktivizuar
       display_name: Emër në ekran
@@ -65,6 +67,7 @@ sq:
       email: Email
       email_status: Gjendje email-i
       enable: Shkrije
+      enable_sign_in_token_auth: Aktivizo mirëfilltësim me token email-i
       enabled: E aktivizuar
       enabled_msg: U hoq me sukses ngrirja për llogarinë e %{username}
       followers: Ndjekës
@@ -129,6 +132,7 @@ sq:
       resubscribe: Ripajtohuni
       role: Rol
       search: Kërkoni
+      search_same_email_domain: Përdorues të tjerë me të njëjtën përkatësi email
       search_same_ip: Të tjerë përdorues me të njëjtën IP
       security: Siguri
       security_measures:
@@ -169,21 +173,26 @@ sq:
         approve_appeal: Miratojeni Apelimin
         approve_user: Miratoje Përdoruesin
         assigned_to_self_report: Caktoji Raportim
+        change_email_user: Ndryshoni Email për Përdoruesin
         change_role_user: Ndryshoni Rol Përdoruesi
         confirm_user: Ripohoje Përdoruesin
         create_account_warning: Krijo Sinjalizim
         create_announcement: Krijoni Lajmërim
+        create_canonical_email_block: Krijoni Bllokim Email-esh
         create_custom_emoji: Krijo Emotikon Vetjak
         create_domain_allow: Krijo Lejim Përkatësie
         create_domain_block: Krijo Bllokim Përkatësie
+        create_email_domain_block: Krijoni Bllokim Përkatësie Email-esh
         create_ip_block: Krijoni Rregull IP
         create_unavailable_domain: Krijo Përkatësi të Papërdorshme
         create_user_role: Krijoni Rol
         demote_user: Zhgradoje Përdoruesin
         destroy_announcement: Fshije Lajmërimin
+        destroy_canonical_email_block: Fshini Bllokim Email-esh
         destroy_custom_emoji: Fshi Emotikon Vetjak
         destroy_domain_allow: Fshi Lejim Përkatësie
         destroy_domain_block: Fshi Bllokim Përkatësie
+        destroy_email_domain_block: Fshini Bllokim Përkatësie Email-esh
         destroy_instance: Spastroje Përkatësinë
         destroy_ip_block: Fshini Rregull IP
         destroy_status: Fshi Gjendje
@@ -191,8 +200,10 @@ sq:
         destroy_user_role: Asgjësoje Rolin
         disable_2fa_user: Çaktivizo 2FA-në
         disable_custom_emoji: Çaktivizo Emotikon Vetjak
+        disable_sign_in_token_auth_user: Çaktivizoni për Përdoruesin Mirëfilltësim Me Token Email-i
         disable_user: Çaktivizo Përdorues
         enable_custom_emoji: Aktivizo Emotikon Vetjak
+        enable_sign_in_token_auth_user: Aktivizoni për Përdoruesin Mirëfilltësim Me Token Email-i
         enable_user: Aktivizo Përdorues
         memorialize_account: Bëje Llogari Përkujtimore
         promote_user: Promovojeni Përdoruesin
@@ -222,20 +233,26 @@ sq:
         approve_appeal_html: "%{name} miratoi apelim vendimi moderimi nga %{target}"
         approve_user_html: "%{name} miratoi regjistrim nga %{target}"
         assigned_to_self_report_html: "%{name} ia kaloi raportimin %{target} në ngarkim vetvetes"
+        change_email_user_html: "%{name} ndryshoi adresën email të përdoruesit %{target}"
         change_role_user_html: "%{name} ndryshoi rolin e %{target}"
+        confirm_user_html: "%{name} ripohoi adresën email të përdoruesit %{target}"
         create_account_warning_html: "%{name} dërgoi një sinjalizim për %{target}"
         create_announcement_html: "%{name} krijoi lajmërim të ri për %{target}"
+        create_canonical_email_block_html: "%{name} bllokoi email me hashin %{target}"
         create_custom_emoji_html: "%{name} ngarkoi emoxhi të ri %{target}"
         create_domain_allow_html: "%{name} lejoi federim me përkatësinë %{target}"
         create_domain_block_html: "%{name} bllokoi përkatësinë %{target}"
+        create_email_domain_block_html: "%{name} bllokoi përkatësinë email %{target}"
         create_ip_block_html: "%{name} krijoi rregull për IP-në %{target}"
         create_unavailable_domain_html: "%{name} ndali dërgimin drejt përkatësisë %{target}"
         create_user_role_html: "%{name} krijoi rolin %{target}"
         demote_user_html: "%{name} zhgradoi përdoruesin %{target}"
         destroy_announcement_html: "%{name} fshiu lajmërimin për %{target}"
+        destroy_canonical_email_block_html: "%{name} zhbllokoi email me hashin %{target}"
         destroy_custom_emoji_html: "%{name} fshiu emoji-n %{target}"
         destroy_domain_allow_html: "%{name} hoqi lejimin për federim me %{target}"
         destroy_domain_block_html: "%{name} zhbllokoi përkatësinë %{target}"
+        destroy_email_domain_block_html: "%{name} zhbllokoi përkatësi email %{target}"
         destroy_instance_html: "%{name} spastroi përkatësinë %{target}"
         destroy_ip_block_html: "%{name} fshiu rregull për IP-në %{target}"
         destroy_status_html: "%{name} hoqi gjendje nga %{target}"
@@ -243,8 +260,10 @@ sq:
         destroy_user_role_html: "%{name} fshiu rolin %{target}"
         disable_2fa_user_html: "%{name} çaktivizoi domosdoshmërinë për dyfaktorësh për përdoruesin %{target}"
         disable_custom_emoji_html: "%{name} çaktivizoi emoxhin %{target}"
+        disable_sign_in_token_auth_user_html: "%{name} çaktivizoi mirëfilltësim me token email për %{target}"
         disable_user_html: "%{name} çaktivizoi hyrje për përdoruesin %{target}"
         enable_custom_emoji_html: "%{name} aktivizoi emoxhin %{target}"
+        enable_sign_in_token_auth_user_html: "%{name} aktivizoi mirëfilltësim me token email për %{target}"
         enable_user_html: "%{name} aktivizoi hyrje për përdoruesin %{target}"
         memorialize_account_html: "%{name} e shndërroi llogarinë e %{target} në një faqe përkujtimore"
         promote_user_html: "%{name} gradoi përdoruesin %{target}"
@@ -252,6 +271,7 @@ sq:
         reject_user_html: "%{name} hodhi poshtë regjistrimin nga %{target}"
         remove_avatar_user_html: "%{name} hoqi avatarin e %{target}"
         reopen_report_html: "%{name} rihapi raportimin %{target}"
+        resend_user_html: "%{name} ridërgoi email ripohimi për %{target}"
         reset_password_user_html: "%{name} ricaktoi fjalëkalimi për përdoruesin %{target}"
         resolve_report_html: "%{name} zgjidhi raportimin %{target}"
         sensitive_account_html: "%{name} i vuri shenjë si rezervat medias në %{target}"
@@ -411,6 +431,7 @@ sq:
       attempts_over_week:
         one: "%{count} përpjekje gjatë javës së shkuar"
         other: "%{count} përpjekje regjistrimi gjatë javës së kaluar"
+      created_msg: U bllokua me sukses përkatësi email
       delete: Fshije
       dns:
         types:
@@ -419,8 +440,12 @@ sq:
       new:
         create: Shtoni përkatësi
         resolve: Ftilloje përkatësinë
+        title: Blloko përkatësi të re email
+      no_email_domain_block_selected: S’u ndryshuan bllokime përkatësish email, ngaqë s’qe përzgjedhur ndonjë
       not_permitted: Jo i lejuar
+      resolved_dns_records_hint_html: Emri i përkatësisë u përket përkatësive vijuese MX, që janë përgjegjëset përfundimtare për pranim email-esh. Bllokimi i një përkatësie MX do të bllokojë regjistrime nga çfarëdo adrese email që përdor të njëjtën përkatësi MX, edhe nëse emri i dukshëm i përkatësisë është i ndryshëm. <strong>Hapni sytë të mos bllokoni shërbime të njohur email-esh.</strong>
       resolved_through_html: Zgjidhur përmes %{domain}
+      title: Përkatësi email të bllokuara
     export_domain_allows:
       new:
         title: Importoni lejime përkatësish
@@ -573,6 +598,7 @@ sq:
         resolve_description_html: Ndaj llogarisë së raportuar nuk do të ndërmerret ndonjë veprim, s’do të regjistrohet ndonjë paralajmërim dhe raporti do të mbyllet.
         silence_description_html: Llogaria do të jetë e dukshme vetëm për ata që e ndjekin tashmë, ose e kërkojnë atë dorazi, duke kufizuar rëndë shtrirjen e saj. Kjo mundet përherë të prapakthehet. Mbyll krejt raportimet kundër kësaj llogarie.
         suspend_description_html: Llogaria dhe krejt lënda e saj s’do të jenë të përdorshme dhe, së fundi, do të fshihen dhe ndërveprimi me te do të jetë i pamundur. E prapakthyeshme brenda 30 ditësh. Mbyll krejt raportimet kundër kësaj llogarie.
+      actions_description_html: Vendosni cili veprim të kryhet për të zgjidhur këtë raportim. Nëse ndërmerrni një veprim ndëshkues kundër llogarisë së raportuar, atyre do t’u dërgohet një njoftim me email, hiq rastin kur përzgjidhet kategoria <strong>I padëshiruar</strong>.
       actions_description_remote_html: Vendosni cili veprim të ndërmerret për zgjidhjen e këtij raportimi. Kjo do të prekë vetëm mënyrën se si shërbyesi <strong>juaj</strong> komunikon me këtë llogari të largët dhe se si e trajtojnë lëndën e saj.
       add_to_report: Shtoni më tepër te raportimi
       already_suspended_badges:
@@ -636,6 +662,7 @@ sq:
         delete_data_html: Fshije profilin e <strong>@%{acct}</strong> dhe lëndën e 30 ditëve nga sot, veç në u pezulloftë ndërkohë
         preview_preamble_html: "<strong>@%{acct}</strong> do të marrë një sinjalizim me lëndën vijuese:"
         record_strike_html: Regjistroni një vërejtje kundër <strong>@%{acct}</strong> për t’ju ndihmuar të përshkallëzoni qëndrim në ras cenimesh të ardhshme nga kjo llogari
+        send_email_html: Dërgojini <strong>@%{acct}</strong> një email sinjalizues
         warning_placeholder: Arsye shtesë, në daçi, për veprimin e moderimit.
       target_origin: Origjinë e llogarisë së raportuar
       title: Raportime
@@ -674,6 +701,7 @@ sq:
         manage_appeals: Të Administrojë Apelime
         manage_appeals_description: U lejon përdoruesve të shqyrtojnë apelime kundër veprimesh moderimi
         manage_blocks: Të Administrojë Bllokim
+        manage_blocks_description: U lejon përdoruesve të bllkojnë shërbime email dhe adresa IP
         manage_custom_emojis: Të Administrojë Emoxhi Vetjake
         manage_custom_emojis_description: U lejon përdoruesve të administrojnë te shërbyesi emoxhi vetjake
         manage_federation: Të Administrojë Federim
@@ -691,6 +719,7 @@ sq:
         manage_taxonomies: Të Administrojë Klasifikime
         manage_taxonomies_description: U lejon përdoruesve të shqyrtojnë lëndë në modë dhe të përditësojnë rregullime hashtag-ësh
         manage_user_access: Të Administrojë Hyrje Përdoruesi
+        manage_user_access_description: U lejon përdoruesve të çaktivizojnë mirëfilltësim dyfaktorësh për përdorues të tjerë, të ndryshojnë adresa të tyret email dhe të ricaktojnë fjalëkalimet e tyre
         manage_users: Të Administrojë Përdorues
         manage_users_description: U lejon përdoruesve të shohin hollësi përdoruesish të tjerë dhe të kryejnë veprime moderimi mbi ta
         manage_webhooks: Të Administrojë Webhook-e
@@ -764,6 +793,7 @@ sq:
       destroyed_msg: Ngarkimi në sajt u fshi me sukses!
     software_updates:
       critical_update: Kritik — ju lutemi, përditësojeni pa humbur kohë
+      description: Rekomandohet ta mbani të përditësuar instalimin tuaj të Mastodon-it, që të përfitoni nga ndreqjet dhe veçoritë më të reja. Për më tej, ndonjëherë është kritike të përditësohet Mastodon-i në kohën e duhur, për të shmangur probleme sigurie. Për këto arsye, Mastodon-i kontrollon për përditësime çdo 30 minuta dhe do t’ju njoftojë, sipas parapëlqimeve tuaja për njoftime me email.
       documentation_link: Mësoni më tepër
       release_notes: Shënime hedhjeje në qarkullim
       title: Përditësime të gatshme
@@ -1023,7 +1053,9 @@ sq:
       guide_link_text: Çdokush mund të kontribuojë.
     sensitive_content: Lëndë rezervat
   application_mailer:
+    notification_preferences: Ndryshoni parapëlqime rreth email-esh
     salutation: "%{name},"
+    settings: 'Ndryshoni parapëlqime rreth email-esh: %{link}'
     unsubscribe: Shpajtohuni
     view: 'Parje:'
     view_profile: Shihni profilin
@@ -1043,6 +1075,7 @@ sq:
       hint_html: Edhe një gjë tjetër! Na duhet të ripohoni se jeni qenie njerëzore (që të mbajmë larg mesazhe të padëshiruar!). Zgjidhni CAPTCHA-n më poshtë dhe klikoni mbi “Vazhdo”.
       title: Kontroll sigurie
     confirmations:
+      awaiting_review: Adresa juaj email është vërtetuar! Ekipi i %{domain} tani po shqyrton regjistrimin tuaj. Nëse e miratojnë llogarinë tuaj, do të merrni një email!
       awaiting_review_title: Regjistrimi juaj po merret në shqyrtim
       clicking_this_link: duke klikuar këtë lidhje
       login_link: hyni
@@ -1050,6 +1083,7 @@ sq:
       redirect_to_app_html: Duhet të ishit ridrejtuar te aplikacioni <strong>%{app_name}</strong>. Nëse s’ndodhi, provoni %{clicking_this_link}, ose të ktheheni dorazi te aplikacioni.
       registration_complete: Tanimë është plotësuar regjistrimi juaj në %{domain}!
       welcome_title: Mirë se vini, %{name}!
+      wrong_email_hint: Nëse ajo adresë email s’është e saktë, mund ta ndryshoni që nga rregullimet e llogarisë.
     delete_account: Fshije llogarinë
     delete_account_html: Nëse dëshironi të fshihni llogarinë tuaj, mund <a href="%{path}">ta bëni që këtu</a>. Do t’ju kërkohet ta ripohoni.
     description:
@@ -1070,6 +1104,7 @@ sq:
     or_log_in_with: Ose bëni hyrjen me
     privacy_policy_agreement_html: I kam lexuar dhe pajtohem me <a href="%{privacy_policy_path}" target="_blank">rregullat e privatësisë</a>
     progress:
+      confirm: Ripohoni email-in
       details: Hollësitë tuaja
       review: Shqyrtimi ynë
       rules: Pranoni rregulla
@@ -1091,8 +1126,10 @@ sq:
     security: Siguri
     set_new_password: Caktoni fjalëkalim të ri
     setup:
+      email_below_hint_html: Shihni te dosja juaj e të padëshiruarve, ose kërkoni një tjetër. Mundeni të saktësoni adresën tuaj email, nëse është gabim.
       email_settings_hint_html: Që të verifikoni %{email}, klikoni lidhjen që ju dërguam. Do të presim këtu.
       link_not_received: S’morët lidhje?
+      new_confirmation_instructions_sent: Brenda pak mintuash do të merrni një email të ri me lidhjen e ripohimit!
       title: Shihni te email-et tuaj
     sign_in:
       preamble_html: Hyni me kredencialet tuaja për te <strong>%{domain}</strong>. Nëse llogaria juaj strehohet në një tjetër shërbyes, s’do të jeni në gjendje të bëni hyrjen këtu.
@@ -1103,7 +1140,9 @@ sq:
       title: Le të ujdisim llogarinë tuaj në %{domain}.
     status:
       account_status: Gjendje llogarie
+      confirming: Po pritet të plotësohet ripohimi i email-it.
       functional: Llogaria juaj është tërësisht funksionale.
+      pending: Aplikimi juaj është në pritje të shqyrtimit nga stafi ynë. Kjo mund të dojë ca kohë. Nëse aplikimi juaj miratohet, do të merrni një email.
       redirecting_to: Llogaria juaj është joaktive, ngaqë aktualisht ridrejton te %{acct}.
       self_destruct: Ngaqë %{domain} po mbyllet, do të keni vetëm hyrje të kufizuar te llogaria juaj.
       view_strikes: Shihni paralajmërime të dikurshme kundër llogarisë tuaj
@@ -1146,6 +1185,9 @@ sq:
       before: 'Përpara se të vazhdoni, ju lutemi, lexoni me kujdes këto shënime:'
       caches: Lënda e ruajtur në fshehtinë nga shërbyes të tjerë mund të vazhdojë të gjendet në ta
       data_removal: Postimet dhe të tjera të dhëna tuajat do të hiqen përgjithmonë
+      email_change_html: Mundeni të <a href="%{path}">ndryshoni adresën tuaj email</a> pa fshirë llogarinë tuaj
+      email_contact_html: Nëse s’mbërrin ende, mund të dërgoni një email <a href="mailto:%{email}">%{email}</a> për të kërkuar ndihmë
+      email_reconfirmation_html: Nëse s’ju vjen email-i i ripohimit, mund ta <a href="%{path}">rikërkoni</a>
       irreversible: S’do të jeni në gjendje të riktheni ose riaktivizoni llogarinë tuaj
       more_details_html: Për më tepër hollësi, shihni <a href="%{terms_path}">rregulla privatësie</a>.
       username_available: Emri juaj i përdoruesit do të jetë sërish i passhëm
@@ -1378,6 +1420,7 @@ sq:
     authentication_methods:
       otp: aplikacion mirëfilltësimi dyfaktorësh
       password: fjalëkalim
+      sign_in_token: kod sigurie email-i
       webauthn: kyçe sigurie
     description_html: Nëse shihni veprimtari që nuk e njihni, shihni mundësinë e ndryshimit të fjalëkalimit tuaj dhe të aktivizimit të mirëfilltësimit dyfaktorësh.
     empty: S’ka historik mirëfilltësimesh
@@ -1388,6 +1431,8 @@ sq:
     unsubscribe:
       action: Po, shpajtomëni
       complete: U shpajtuat
+      resubscribe_html: Nëse u shpajtuat gabimisht, mund të ripajtoheni që nga <a href="%{settings_path}">rregullimet tuaja për njoftime me email</a>.
+      success_html: S’do të merrni më %{type} për Mastodon te %{domain} në email-in tuaj te %{email}.
       title: Shpajtohuni
   media_attachments:
     validations:
@@ -1872,6 +1917,7 @@ sq:
     invalid_otp_token: Kod dyfaktorësh i pavlefshëm
     otp_lost_help_html: Nëse humbët hyrjen te të dy, mund të lidheni me %{email}
     rate_limited: Shumë përpjekje mirëfilltësimi, riprovoni më vonë.
+    seamless_external_login: Keni bërë hyrjen përmes një shërbimi të jashtëm, ndaj rregullimet për fjalëkalimin dhe email-in s’janë të përdorshme këtu.
     signed_in_as: 'I futur si:'
   verification:
     extra_instructions_html: <strong>Ndihmëz:</strong> Lidhja te sajti juaj mund të jetë e padukshme. Pjesa e rëndësishme është <code>rel="me"</code>, e cila pengon të hiqen gjoja në sajte me lëndë të prodhuar nga përdorues. Mundeni edhe të përdorni një etiketë <code>link</code> te kryet e faqes, në vend se <code>a</code>, por HTML-ja duhet të jetë e përdorshme pa ekzekutim JavaScript-i.
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 735a7bd514b443..e3e985f683f67c 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -29,6 +29,7 @@ th:
       created_msg: สร้างหมายเหตุการกลั่นกรองสำเร็จ!
       destroyed_msg: ทำลายหมายเหตุการกลั่นกรองสำเร็จ!
     accounts:
+      add_email_domain_block: ปิดกั้นโดเมนอีเมล
       approve: อนุมัติ
       approved_msg: อนุมัติใบสมัครลงทะเบียนของ %{username} สำเร็จ
       are_you_sure: คุณแน่ใจหรือไม่?
@@ -166,21 +167,26 @@ th:
         approve_appeal: อนุมัติการอุทธรณ์
         approve_user: อนุมัติผู้ใช้
         assigned_to_self_report: มอบหมายรายงาน
+        change_email_user: เปลี่ยนอีเมลสำหรับผู้ใช้
         change_role_user: เปลี่ยนบทบาทของผู้ใช้
         confirm_user: ยืนยันผู้ใช้
         create_account_warning: สร้างคำเตือน
         create_announcement: สร้างประกาศ
+        create_canonical_email_block: สร้างการปิดกั้นอีเมล
         create_custom_emoji: สร้างอีโมจิที่กำหนดเอง
         create_domain_allow: สร้างการอนุญาตโดเมน
         create_domain_block: สร้างการปิดกั้นโดเมน
+        create_email_domain_block: สร้างการปิดกั้นโดเมนอีเมล
         create_ip_block: สร้างกฎ IP
         create_unavailable_domain: สร้างโดเมนที่ไม่พร้อมใช้งาน
         create_user_role: สร้างบทบาท
         demote_user: ลดขั้นผู้ใช้
         destroy_announcement: ลบประกาศ
+        destroy_canonical_email_block: ลบการปิดกั้นอีเมล
         destroy_custom_emoji: ลบอีโมจิที่กำหนดเอง
         destroy_domain_allow: ลบการอนุญาตโดเมน
         destroy_domain_block: ลบการปิดกั้นโดเมน
+        destroy_email_domain_block: ลบการปิดกั้นโดเมนอีเมล
         destroy_instance: ล้างข้อมูลโดเมน
         destroy_ip_block: ลบกฎ IP
         destroy_status: ลบโพสต์
@@ -917,6 +923,7 @@ th:
         usage_comparison: ใช้ %{today} ครั้งวันนี้ เทียบกับ %{yesterday} เมื่อวานนี้
         used_by_over_week:
           other: ใช้โดย %{count} คนในช่วงสัปดาห์ที่ผ่านมา
+      title: คำแนะนำและแนวโน้ม
       trending: กำลังนิยม
     warning_presets:
       add_new: เพิ่มใหม่
@@ -1000,7 +1007,9 @@ th:
       guide_link_text: ทุกคนสามารถมีส่วนร่วม
     sensitive_content: เนื้อหาที่ละเอียดอ่อน
   application_mailer:
+    notification_preferences: เปลี่ยนการกำหนดลักษณะอีเมล
     salutation: "%{name},"
+    settings: 'เปลี่ยนการกำหนดลักษณะอีเมล: %{link}'
     unsubscribe: เลิกบอกรับ
     view: 'มุมมอง:'
     view_profile: ดูโปรไฟล์
@@ -1020,6 +1029,7 @@ th:
       hint_html: อีกเพียงหนึ่งสิ่งเพิ่มเติม! เราจำเป็นต้องยืนยันว่าคุณเป็นมนุษย์ (นี่ก็เพื่อให้เราสามารถกันสแปมออกไป!) แก้ CAPTCHA ด้านล่างและคลิก "ดำเนินการต่อ"
       title: การตรวจสอบความปลอดภัย
     confirmations:
+      awaiting_review: ยืนยันที่อยู่อีเมลของคุณแล้ว! ตอนนี้พนักงานของ %{domain} กำลังตรวจทานการลงทะเบียนของคุณ คุณจะได้รับอีเมลหากพนักงานอนุมัติบัญชีของคุณ!
       awaiting_review_title: กำลังตรวจทานการลงทะเบียนของคุณ
       clicking_this_link: คลิกลิงก์นี้
       login_link: เข้าสู่ระบบ
@@ -1027,6 +1037,7 @@ th:
       redirect_to_app_html: คุณควรได้รับการเปลี่ยนเส้นทางไปยังแอป <strong>%{app_name}</strong> หากนั่นไม่เกิดขึ้น ลอง %{clicking_this_link} หรือกลับไปยังแอปด้วยตนเอง
       registration_complete: ตอนนี้การลงทะเบียนของคุณใน %{domain} เสร็จสมบูรณ์แล้ว!
       welcome_title: ยินดีต้อนรับ %{name}!
+      wrong_email_hint: หากที่อยู่อีเมลนั้นไม่ถูกต้อง คุณสามารถเปลี่ยนที่อยู่อีเมลได้ในการตั้งค่าบัญชี
     delete_account: ลบบัญชี
     delete_account_html: หากคุณต้องการลบบัญชีของคุณ คุณสามารถ <a href="%{path}">ดำเนินการต่อที่นี่</a> คุณจะได้รับการถามเพื่อการยืนยัน
     description:
@@ -1047,6 +1058,7 @@ th:
     or_log_in_with: หรือเข้าสู่ระบบด้วย
     privacy_policy_agreement_html: ฉันได้อ่านและเห็นด้วยกับ <a href="%{privacy_policy_path}" target="_blank">นโยบายความเป็นส่วนตัว</a>
     progress:
+      confirm: ยืนยันอีเมล
       details: รายละเอียดของคุณ
       review: การตรวจทานของเรา
       rules: ยอมรับกฎ
@@ -1068,8 +1080,10 @@ th:
     security: ความปลอดภัย
     set_new_password: ตั้งรหัสผ่านใหม่
     setup:
+      email_below_hint_html: ตรวจสอบโฟลเดอร์สแปมของคุณ หรือขออีเมลอื่น คุณสามารถแก้ไขที่อยู่อีเมลของคุณหากที่อยู่อีเมลผิด
       email_settings_hint_html: คลิกลิงก์ที่เราส่งถึงคุณเพื่อยืนยัน %{email} เราจะรออยู่ตรงนี้
       link_not_received: ไม่ได้รับลิงก์?
+      new_confirmation_instructions_sent: คุณจะได้รับอีเมลใหม่พร้อมลิงก์การยืนยันในไม่กี่นาที!
       title: ตรวจสอบกล่องขาเข้าของคุณ
     sign_in:
       preamble_html: เข้าสู่ระบบด้วยข้อมูลประจำตัว <strong>%{domain}</strong> ของคุณ หากบัญชีของคุณได้รับการโฮสต์ในเซิร์ฟเวอร์อื่น คุณจะไม่สามารถเข้าสู่ระบบได้ที่นี่
@@ -1080,7 +1094,9 @@ th:
       title: มาตั้งค่าของคุณใน %{domain} กันเลย
     status:
       account_status: สถานะบัญชี
+      confirming: กำลังรอการยืนยันอีเมลให้เสร็จสมบูรณ์
       functional: บัญชีของคุณทำงานได้อย่างเต็มที่
+      pending: ใบสมัครของคุณกำลังรอดำเนินการตรวจทานโดยพนักงานของเรา นี่อาจใช้เวลาสักครู่ คุณจะได้รับอีเมลหากมีการอนุมัติใบสมัครของคุณ
       redirecting_to: บัญชีของคุณไม่ได้ใช้งานเนื่องจากบัญชีกำลังเปลี่ยนเส้นทางไปยัง %{acct} ในปัจจุบัน
       self_destruct: เนื่องจาก %{domain} กำลังปิดตัวลง คุณจะได้รับการเข้าถึงบัญชีของคุณแบบจำกัดเท่านั้น
       view_strikes: ดูการดำเนินการที่ผ่านมาต่อบัญชีของคุณ
@@ -1123,6 +1139,9 @@ th:
       before: 'ก่อนดำเนินการต่อ โปรดอ่านหมายเหตุเหล่านี้อย่างระมัดระวัง:'
       caches: เนื้อหาที่ได้รับการแคชโดยเซิร์ฟเวอร์อื่น ๆ อาจยังคงอยู่
       data_removal: จะเอาโพสต์และข้อมูลอื่น ๆ ของคุณออกโดยถาวร
+      email_change_html: คุณสามารถ <a href="%{path}">เปลี่ยนที่อยู่อีเมลของคุณ</a> ได้โดยไม่ต้องลบบัญชีของคุณ
+      email_contact_html: หากอีเมลยังคงมาไม่ถึง คุณสามารถส่งอีเมลถึง <a href="mailto:%{email}">%{email}</a> สำหรับความช่วยเหลือ
+      email_reconfirmation_html: หากคุณไม่ได้รับอีเมลการยืนยัน คุณสามารถ <a href="%{path}">ขออีเมลอีกครั้ง</a>
       irreversible: คุณจะไม่สามารถคืนค่าหรือเปิดใช้งานบัญชีของคุณใหม่
       more_details_html: สำหรับรายละเอียดเพิ่มเติม ดู <a href="%{terms_path}">นโยบายความเป็นส่วนตัว</a>
       username_available: ชื่อผู้ใช้ของคุณจะพร้อมใช้งานอีกครั้ง
@@ -1347,6 +1366,7 @@ th:
     authentication_methods:
       otp: แอปการรับรองความถูกต้องด้วยสองปัจจัย
       password: รหัสผ่าน
+      sign_in_token: รหัสความปลอดภัยอีเมล
       webauthn: กุญแจความปลอดภัย
     description_html: หากคุณเห็นกิจกรรมที่คุณไม่รู้จัก พิจารณาเปลี่ยนรหัสผ่านของคุณและเปิดใช้งานการรับรองความถูกต้องด้วยสองปัจจัย
     empty: ไม่มีประวัติการรับรองความถูกต้อง
@@ -1357,6 +1377,16 @@ th:
     unsubscribe:
       action: ใช่ เลิกบอกรับ
       complete: เลิกบอกรับแล้ว
+      confirmation_html: คุณแน่ใจหรือไม่ว่าต้องการเลิกบอกรับจากการรับ %{type} สำหรับ Mastodon ใน %{domain} ไปยังอีเมลของคุณที่ %{email}? คุณสามารถบอกรับใหม่ได้เสมอจาก <a href="%{settings_path}">การตั้งค่าการแจ้งเตือนอีเมล</a> ของคุณ
+      emails:
+        notification_emails:
+          favourite: อีเมลการแจ้งเตือนการชื่นชอบ
+          follow: อีเมลการแจ้งเตือนการติดตาม
+          follow_request: อีเมลคำขอติดตาม
+          mention: อีเมลการแจ้งเตือนการกล่าวถึง
+          reblog: อีเมลการแจ้งเตือนการดัน
+      resubscribe_html: หากคุณได้เลิกบอกรับโดยไม่ได้ตั้งใจ คุณสามารถบอกรับใหม่ได้จาก <a href="%{settings_path}">การตั้งค่าการแจ้งเตือนอีเมล</a> ของคุณ
+      success_html: คุณจะไม่ได้รับ %{type} สำหรับ Mastodon ใน %{domain} ไปยังอีเมลของคุณที่ %{email} อีกต่อไป
       title: เลิกบอกรับ
   media_attachments:
     validations:
@@ -1437,6 +1467,8 @@ th:
     update:
       subject: "%{name} ได้แก้ไขโพสต์"
   notifications:
+    administration_emails: การแจ้งเตือนอีเมลผู้ดูแล
+    email_events: เหตุการณ์สำหรับการแจ้งเตือนอีเมล
     email_events_hint: 'เลือกเหตุการณ์ที่คุณต้องการรับการแจ้งเตือน:'
   number:
     human:
@@ -1595,6 +1627,7 @@ th:
     import: การนำเข้า
     import_and_export: การนำเข้าและการส่งออก
     migrate: การโยกย้ายบัญชี
+    notifications: การแจ้งเตือนอีเมล
     preferences: การกำหนดลักษณะ
     profile: โปรไฟล์สาธารณะ
     relationships: การติดตามและผู้ติดตาม
@@ -1834,6 +1867,7 @@ th:
     invalid_otp_token: รหัสสองปัจจัยไม่ถูกต้อง
     otp_lost_help_html: หากคุณสูญเสียการเข้าถึงทั้งสองอย่าง คุณสามารถติดต่อ %{email}
     rate_limited: มีความพยายามในการรับรองความถูกต้องมากเกินไป ลองอีกครั้งในภายหลัง
+    seamless_external_login: คุณได้เข้าสู่ระบบผ่านบริการภายนอก ดังนั้นการตั้งค่ารหัสผ่านและอีเมลจึงไม่พร้อมใช้งาน
     signed_in_as: 'ลงชื่อเข้าเป็น:'
   verification:
     extra_instructions_html: <strong>เคล็ดลับ:</strong> ลิงก์ในเว็บไซต์ของคุณสามารถเป็นแบบมองไม่เห็น ส่วนที่สำคัญคือ <code>rel="me"</code> ซึ่งป้องกันการแอบอ้างในเว็บไซต์ที่มีเนื้อหาที่ผู้ใช้สร้างขึ้น คุณยังสามารถใช้แท็ก <code>link</code> ในส่วนหัวของหน้าแทนที่จะเป็น <code>a</code> แต่ HTML ต้องเข้าถึงได้โดยไม่มีการประมวลผล JavaScript
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 7530b12a92eb8d..6782551f13f4b8 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -946,6 +946,7 @@ tr:
         used_by_over_week:
           one: Geçen hafta bir kişi tarafından kullanıldı
           other: Geçen hafta %{count} kişi tarafından kullanıldı
+      title: Öneriler ve Öne Çıkanlar
       trending: Öne çıkanlar
     warning_presets:
       add_new: Yeni ekle

From d6e340b4dd5a8d26f4d45406c08215e130055a5e Mon Sep 17 00:00:00 2001
From: Michael Stanclift <mx@vmstan.com>
Date: Sat, 10 Aug 2024 04:11:34 -0500
Subject: [PATCH 1802/2191] [Glitch] Improve legibility of account/hashtag
 autosuggest

Port caf0164f00a35f892a945fcec352d865f479b447 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/styles/components.scss          | 13 ++++++++++---
 .../flavours/glitch/styles/mastodon-light/diff.scss |  6 ++++++
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index 4e178f576a22d2..713126b44f7eae 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -426,10 +426,17 @@ body > [data-popper-placement] {
 
       &:hover,
       &:focus,
-      &:active,
+      &:active {
+        background: var(--dropdown-border-color);
+
+        .autosuggest-account .display-name__account {
+          color: inherit;
+        }
+      }
+
       &.selected {
         background: $ui-highlight-color;
-        color: $primary-text-color;
+        color: $ui-button-color;
 
         .autosuggest-account .display-name__account {
           color: inherit;
@@ -465,7 +472,7 @@ body > [data-popper-placement] {
     display: block;
     line-height: 16px;
     font-size: 12px;
-    color: $dark-text-color;
+    color: $ui-primary-color;
   }
 }
 
diff --git a/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss b/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss
index 4fccbe9867e7f1..021877d435ca15 100644
--- a/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss
+++ b/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss
@@ -622,3 +622,9 @@ a.sparkline {
 .report-dialog-modal__textarea {
   background: darken($ui-base-color, 10%);
 }
+
+.autosuggest-account {
+  .display-name__account {
+    color: $dark-text-color;
+  }
+}

From f299f8bac10f37acf1dc09681f1ac16833ba431a Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Sat, 10 Aug 2024 05:12:47 -0400
Subject: [PATCH 1803/2191] [Glitch] Use material symbol for responsive menu
 toggle

Port SCSS changes from 7519ef2fa116bcc7577483900379e497d7878a9e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/styles/admin.scss | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/javascript/flavours/glitch/styles/admin.scss b/app/javascript/flavours/glitch/styles/admin.scss
index 08c0a08be368d5..f8cc9ae5cc2f6b 100644
--- a/app/javascript/flavours/glitch/styles/admin.scss
+++ b/app/javascript/flavours/glitch/styles/admin.scss
@@ -65,16 +65,16 @@ $content-width: 840px;
           background: $ui-base-color;
         }
 
-        .fa-times {
+        .material-close {
           display: none;
         }
 
         &.active {
-          .fa-times {
+          .material-close {
             display: block;
           }
 
-          .fa-bars {
+          .material-menu {
             display: none;
           }
         }

From 4515bf9d45339850bf7b42518f968d11809ac007 Mon Sep 17 00:00:00 2001
From: Emelia Smith <ThisIsMissEm@users.noreply.github.com>
Date: Sat, 10 Aug 2024 11:17:10 +0200
Subject: [PATCH 1804/2191] [Glitch] Move Follow Recommendations to Trends
 menu, rename to Recommendations & Trends

Port SCSS changes from d3089018d5508af2951401e8d7ba8c43dac1d909 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/styles/forms.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/javascript/flavours/glitch/styles/forms.scss b/app/javascript/flavours/glitch/styles/forms.scss
index d206af1f189e3a..9e3bd11c34b6ab 100644
--- a/app/javascript/flavours/glitch/styles/forms.scss
+++ b/app/javascript/flavours/glitch/styles/forms.scss
@@ -291,6 +291,10 @@ code {
     flex: 0;
   }
 
+  .input.select.select--languages {
+    min-width: 32ch;
+  }
+
   .required abbr {
     text-decoration: none;
     color: lighten($error-value-color, 12%);

From dff29c83c54ae9acee96e28854065156844e2348 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Sat, 10 Aug 2024 20:14:37 +0200
Subject: [PATCH 1805/2191] [Glitch] Fix typos in localisation from #31342

Port 19dbc74d827d382cadef0d5e77980ffc7fe4e633 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../features/ui/components/ignore_notifications_modal.jsx       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/flavours/glitch/features/ui/components/ignore_notifications_modal.jsx b/app/javascript/flavours/glitch/features/ui/components/ignore_notifications_modal.jsx
index 4c7cb21d7d96b0..3affc76aa24d02 100644
--- a/app/javascript/flavours/glitch/features/ui/components/ignore_notifications_modal.jsx
+++ b/app/javascript/flavours/glitch/features/ui/components/ignore_notifications_modal.jsx
@@ -60,7 +60,7 @@ export const IgnoreNotificationsModal = ({ filterType }) => {
         <div className='safety-action-modal__bullet-points'>
           <div>
             <div className='safety-action-modal__bullet-points__icon'><Icon icon={InventoryIcon} /></div>
-            <div><FormattedMessage id='ignore_notifications_modal.filter_to_review_separately' defaultMessage='You can review filtered notifications speparately' /></div>
+            <div><FormattedMessage id='ignore_notifications_modal.filter_to_review_separately' defaultMessage='You can review filtered notifications separately' /></div>
           </div>
 
           <div>

From 2e03dc9fbf932cd4ea42b7dd7a20dd48b21c73b9 Mon Sep 17 00:00:00 2001
From: Essem <smswessem@gmail.com>
Date: Sun, 11 Aug 2024 16:28:43 -0500
Subject: [PATCH 1806/2191] Fix extra slash on notification policy request
 (#31378)

---
 app/javascript/mastodon/api/notification_policies.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/javascript/mastodon/api/notification_policies.ts b/app/javascript/mastodon/api/notification_policies.ts
index 7747397556832f..3bc8174139dd10 100644
--- a/app/javascript/mastodon/api/notification_policies.ts
+++ b/app/javascript/mastodon/api/notification_policies.ts
@@ -2,8 +2,8 @@ import { apiRequestGet, apiRequestPut } from 'mastodon/api';
 import type { NotificationPolicyJSON } from 'mastodon/api_types/notification_policies';
 
 export const apiGetNotificationPolicy = () =>
-  apiRequestGet<NotificationPolicyJSON>('/v2/notifications/policy');
+  apiRequestGet<NotificationPolicyJSON>('v2/notifications/policy');
 
 export const apiUpdateNotificationsPolicy = (
   policy: Partial<NotificationPolicyJSON>,
-) => apiRequestPut<NotificationPolicyJSON>('/v2/notifications/policy', policy);
+) => apiRequestPut<NotificationPolicyJSON>('v2/notifications/policy', policy);

From 7365a13ee7743b774c7490cb1ce6977b0c3d7b7b Mon Sep 17 00:00:00 2001
From: Michael Stanclift <mx@vmstan.com>
Date: Sun, 11 Aug 2024 16:30:52 -0500
Subject: [PATCH 1807/2191] Revert Safari scrollbar changes (#31372)

---
 app/javascript/styles/mastodon/reset.scss | 37 +++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/app/javascript/styles/mastodon/reset.scss b/app/javascript/styles/mastodon/reset.scss
index 903b6c804fcf50..f54ed5bc79b1a7 100644
--- a/app/javascript/styles/mastodon/reset.scss
+++ b/app/javascript/styles/mastodon/reset.scss
@@ -56,3 +56,40 @@ table {
 html {
   scrollbar-color: lighten($ui-base-color, 4%) rgba($base-overlay-background, 0.1);
 }
+
+::-webkit-scrollbar {
+  width: 12px;
+  height: 12px;
+}
+
+::-webkit-scrollbar-thumb {
+  background: lighten($ui-base-color, 4%);
+  border: 0px none $base-border-color;
+  border-radius: 50px;
+}
+
+::-webkit-scrollbar-thumb:hover {
+  background: lighten($ui-base-color, 6%);
+}
+
+::-webkit-scrollbar-thumb:active {
+  background: lighten($ui-base-color, 4%);
+}
+
+::-webkit-scrollbar-track {
+  border: 0px none $base-border-color;
+  border-radius: 0;
+  background: rgba($base-overlay-background, 0.1);
+}
+
+::-webkit-scrollbar-track:hover {
+  background: $ui-base-color;
+}
+
+::-webkit-scrollbar-track:active {
+  background: $ui-base-color;
+}
+
+::-webkit-scrollbar-corner {
+  background: transparent;
+}

From fbdda9f6c18fbd282fe7f3a2dba90ed8ec65e0b6 Mon Sep 17 00:00:00 2001
From: Michael Stanclift <mx@vmstan.com>
Date: Sun, 11 Aug 2024 16:32:22 -0500
Subject: [PATCH 1808/2191] Fix account header avatar border (#31373)

---
 app/javascript/styles/mastodon-light/diff.scss | 4 ----
 app/javascript/styles/mastodon/components.scss | 3 ++-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/app/javascript/styles/mastodon-light/diff.scss b/app/javascript/styles/mastodon-light/diff.scss
index 89d3caeab5318a..55eb88dae1e851 100644
--- a/app/javascript/styles/mastodon-light/diff.scss
+++ b/app/javascript/styles/mastodon-light/diff.scss
@@ -52,10 +52,6 @@ html {
   color: darken($action-button-color, 25%);
 }
 
-.account__header__bar .avatar .account__avatar {
-  border-color: $white;
-}
-
 .getting-started__footer a {
   color: $ui-secondary-color;
   text-decoration: underline;
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index d8bcf6301cfba1..90881b0f19a36f 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -7970,7 +7970,8 @@ noscript {
 
       .account__avatar {
         background: var(--background-color);
-        border: 2px solid var(--background-border-color);
+        border: 1px solid var(--background-border-color);
+        border-radius: 4px;
       }
     }
   }

From 3abb5c0eaabb408337bcd2b9a36cf1d8527f467e Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 12 Aug 2024 09:22:50 +0200
Subject: [PATCH 1809/2191] New Crowdin Translations (automated) (#31382)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/ca.json |  9 +++++++++
 app/javascript/mastodon/locales/ru.json | 13 +++++++++++++
 config/locales/devise.ru.yml            |  3 ++-
 config/locales/doorkeeper.ru.yml        |  5 ++++-
 config/locales/el.yml                   | 14 ++++++++++++++
 config/locales/ru.yml                   |  6 ++++++
 config/locales/simple_form.ru.yml       |  5 +++++
 7 files changed, 53 insertions(+), 2 deletions(-)

diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index d2651aeffa75d3..9d2553e7df5ce9 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -356,8 +356,16 @@
   "home.pending_critical_update.link": "Veure actualitzacions",
   "home.pending_critical_update.title": "Actualització de seguretat crítica disponible!",
   "home.show_announcements": "Mostra els anuncis",
+  "ignore_notifications_modal.disclaimer": "Mastodon no pot informar als usuaris de que heu ignorat notificacions seves.\nIgnorar notificacions no evitarà que se segueixin enviant els missatges.",
   "ignore_notifications_modal.filter_to_act_users": "Encara podreu acceptar, rebutjar o reportar usuaris",
+  "ignore_notifications_modal.filter_to_avoid_confusion": "Filtrar ajuda a evitar potencials confusions",
   "ignore_notifications_modal.filter_to_review_separately": "Podeu revisar separadament notificacions filtrades",
+  "ignore_notifications_modal.ignore": "Ignora les notificacions",
+  "ignore_notifications_modal.limited_accounts_title": "Voleu ignorar les notificacions dels comptes moderats?",
+  "ignore_notifications_modal.new_accounts_title": "Voleu ignorar les notificacions dels comptes nous?",
+  "ignore_notifications_modal.not_followers_title": "Voleu ignorar les notificacions de qui no us segueix?",
+  "ignore_notifications_modal.not_following_title": "Voleu ignorar les notificacions de qui no seguiu?",
+  "ignore_notifications_modal.private_mentions_title": "Voleu ignorar les notificacions de mencions privades no sol·licitades?",
   "interaction_modal.description.favourite": "Amb un compte a Mastodon pots afavorir aquest tut perquè l'autor sàpiga que t'ha agradat i desar-lo per a més endavant.",
   "interaction_modal.description.follow": "Amb un compte a Mastodon, pots seguir a {name} per a rebre els seus tuts en la teva línia de temps d'Inici.",
   "interaction_modal.description.reblog": "Amb un compte a Mastodon, pots impulsar aquest tut per a compartir-lo amb els teus seguidors.",
@@ -514,6 +522,7 @@
   "notification_requests.confirm_accept_all.button": "Accepta-ho tot",
   "notification_requests.confirm_accept_all.message": "Esteu a punt d'acceptar {count, plural, one {una petició de notificació} other {# peticions de notificació}}. N'esteu segurs de continuar?",
   "notification_requests.confirm_accept_all.title": "Accepteu peticions de notificació?",
+  "notification_requests.confirm_dismiss_all.button": "Descarta-les totes",
   "notification_requests.dismiss": "Ignora",
   "notification_requests.explainer_for_limited_account": "S'han filtrat les notificacions d'aquest compte perquè un moderador l'ha limitat.",
   "notification_requests.explainer_for_limited_remote_account": "S'han filtrat les notificacions d'aquest compte perquè un moderador ha limitat el compte o el seu servidor.",
diff --git a/app/javascript/mastodon/locales/ru.json b/app/javascript/mastodon/locales/ru.json
index b55bb890e66a25..288575286bc55d 100644
--- a/app/javascript/mastodon/locales/ru.json
+++ b/app/javascript/mastodon/locales/ru.json
@@ -11,6 +11,7 @@
   "about.not_available": "Эта информация не указана на данном сервере.",
   "about.powered_by": "Децентрализованная социальная сеть на базе {mastodon}",
   "about.rules": "Правила сервера",
+  "account.account_note_header": "Личная заметка",
   "account.add_or_remove_from_list": "Управление списками",
   "account.badges.bot": "Бот",
   "account.badges.group": "Группа",
@@ -167,19 +168,25 @@
   "confirmations.block.confirm": "Заблокировать",
   "confirmations.delete.confirm": "Удалить",
   "confirmations.delete.message": "Вы уверены, что хотите удалить этот пост?",
+  "confirmations.delete.title": "Удалить пост?",
   "confirmations.delete_list.confirm": "Удалить",
   "confirmations.delete_list.message": "Вы действительно хотите навсегда удалить этот список?",
+  "confirmations.delete_list.title": "Удалить список?",
   "confirmations.discard_edit_media.confirm": "Отменить",
   "confirmations.discard_edit_media.message": "У вас есть несохранённые изменения описания мультимедиа или предпросмотра, отменить их?",
   "confirmations.edit.confirm": "Редактировать",
   "confirmations.edit.message": "В данный момент, редактирование перезапишет составляемое вами сообщение. Вы уверены, что хотите продолжить?",
+  "confirmations.edit.title": "Переписать сообщение?",
   "confirmations.logout.confirm": "Выйти",
   "confirmations.logout.message": "Вы уверены, что хотите выйти?",
+  "confirmations.logout.title": "Выйти?",
   "confirmations.mute.confirm": "Игнорировать",
   "confirmations.redraft.confirm": "Удалить и исправить",
   "confirmations.redraft.message": "Вы уверены, что хотите удалить и переписать этот пост? Отметки «избранного», продвижения и ответы к оригинальному посту будут удалены.",
+  "confirmations.redraft.title": "Удалим и исправим пост?",
   "confirmations.reply.confirm": "Ответить",
   "confirmations.reply.message": "При ответе, текст набираемого поста будет очищен. Продолжить?",
+  "confirmations.reply.title": "Перепишем пост?",
   "confirmations.unfollow.confirm": "Отписаться",
   "confirmations.unfollow.message": "Вы уверены, что хотите отписаться от {name}?",
   "conversation.delete": "Удалить беседу",
@@ -484,13 +491,16 @@
   "notification.update": "{name} изменил(а) пост",
   "notification_requests.accept": "Принять",
   "notification_requests.dismiss": "Отклонить",
+  "notification_requests.maximize": "Развернуть",
   "notification_requests.notifications_from": "Уведомления от {name}",
   "notification_requests.title": "Отфильтрованные уведомления",
   "notifications.clear": "Очистить уведомления",
   "notifications.clear_confirmation": "Вы уверены, что хотите очистить все уведомления?",
+  "notifications.clear_title": "Сбросить уведомления?",
   "notifications.column_settings.admin.report": "Новые жалобы:",
   "notifications.column_settings.admin.sign_up": "Новые регистрации:",
   "notifications.column_settings.alert": "Уведомления на рабочем столе",
+  "notifications.column_settings.beta.category": "Экспериментальные функции",
   "notifications.column_settings.favourite": "Избранные:",
   "notifications.column_settings.filter_bar.advanced": "Отображать все категории",
   "notifications.column_settings.filter_bar.category": "Панель сортировки",
@@ -519,6 +529,7 @@
   "notifications.permission_denied": "Уведомления на рабочем столе недоступны, так как вы запретили их отправку в браузере. Проверьте настройки для сайта, чтобы включить их обратно.",
   "notifications.permission_denied_alert": "Уведомления на рабочем столе недоступны, так как вы ранее отклонили запрос на их отправку.",
   "notifications.permission_required": "Чтобы включить уведомления на рабочем столе, необходимо разрешить их в браузере.",
+  "notifications.policy.drop": "Игнорируем",
   "notifications.policy.filter_new_accounts.hint": "Создано в течение последних {days, plural, one {один день} few {# дней} many {# дней} other {# дня}}",
   "notifications.policy.filter_new_accounts_title": "Новые учётные записи",
   "notifications.policy.filter_not_followers_title": "Люди, не подписанные на вас",
@@ -652,8 +663,10 @@
   "report.unfollow_explanation": "Вы подписаны на этого пользователя. Чтобы не видеть его/её посты в своей домашней ленте, отпишитесь от него/неё.",
   "report_notification.attached_statuses": "{count, plural, one {{count} сообщение} few {{count} сообщения} many {{count} сообщений} other {{count} сообщений}} вложено",
   "report_notification.categories.legal": "Правовая информация",
+  "report_notification.categories.legal_sentence": "срамной контент",
   "report_notification.categories.other": "Прочее",
   "report_notification.categories.spam": "Спам",
+  "report_notification.categories.spam_sentence": "спам",
   "report_notification.categories.violation": "Нарушение правил",
   "report_notification.open": "Открыть жалобу",
   "search.no_recent_searches": "Недавние запросы отсутствуют",
diff --git a/config/locales/devise.ru.yml b/config/locales/devise.ru.yml
index 9dd418f2cdba4c..9e7ace6433a5c4 100644
--- a/config/locales/devise.ru.yml
+++ b/config/locales/devise.ru.yml
@@ -6,12 +6,13 @@ ru:
       send_instructions: Вы получите e-mail с инструкцией по подтверждению вашего адреса e-mail в течение нескольких минут.
       send_paranoid_instructions: Если Ваш адрес e-mail есть в нашей базе данных, вы получите e-mail с инструкцией по подтверждению вашего адреса в течение нескольких минут.
     failure:
-      already_authenticated: Вы уже авторизованы.
+      already_authenticated: Вы уже вошли.
       inactive: Ваша учётная запись ещё не активирована.
       invalid: Неверно введены %{authentication_keys} или пароль.
       last_attempt: У Вас есть последняя попытка, после чего вход будет заблокирован.
       locked: Ваша учётная запись заблокирована.
       not_found_in_database: Неверно введены %{authentication_keys} или пароль.
+      omniauth_user_creation_failure: Ошибка создания учетной записи с этим идентификатором.
       pending: Ваша заявка на вступление всё ещё рассматривается.
       timeout: Ваша сессия истекла. Пожалуйста, войдите снова, чтобы продолжить.
       unauthenticated: Вам необходимо войти или зарегистрироваться.
diff --git a/config/locales/doorkeeper.ru.yml b/config/locales/doorkeeper.ru.yml
index ce8392cb11a466..12b7e7e87e0b45 100644
--- a/config/locales/doorkeeper.ru.yml
+++ b/config/locales/doorkeeper.ru.yml
@@ -15,7 +15,7 @@ ru:
               fragment_present: не может содержать фрагмент.
               invalid_uri: должен быть правильным URI.
               relative_uri: должен быть абсолютным URI.
-              secured_uri: должен быть HTTPS/SSL URI.
+              secured_uri: нужен HTTPS/SSL URI.
   doorkeeper:
     applications:
       buttons:
@@ -83,6 +83,7 @@ ru:
         access_denied: Владелец ресурса или сервер авторизации ответил отказом на Ваш запрос.
         credential_flow_not_configured: Поток с предоставлением клиенту пароля завершился неудачей, поскольку параметр Doorkeeper.configure.resource_owner_from_credentials не был сконфигурирован.
         invalid_client: Клиентская аутентификация завершилась неудачей (неизвестный клиент, не включена клиентская аутентификация, или метод аутентификации не поддерживается.
+        invalid_code_challenge_method: Метод проверки кода должен быть S256, простой не годится.
         invalid_grant: Предоставленный доступ некорректен, истек, отозван, не совпадает с URI перенаправления, использованным в запросе авторизации, или был выпущен для другого клиента.
         invalid_redirect_uri: Включенный URI перенаправления некорректен.
         invalid_request:
@@ -135,6 +136,7 @@ ru:
         media: Медиафайлы
         mutes: Игнорирует
         notifications: Уведомления
+        profile: Ваш профиль Mastodon
         push: Push-уведомления
         reports: Обращения
         search: Поиск
@@ -165,6 +167,7 @@ ru:
       admin:write:reports: производить модерацию жалоб
       crypto: использ. сквозное шифрование
       follow: управлять подписками и списком блокировок
+      profile: данные вашего профиля только для чтения
       push: получать push-уведомления
       read: просматривать данные вашей учётной записи
       read:accounts: видеть информацию об учётных записях
diff --git a/config/locales/el.yml b/config/locales/el.yml
index bd90d8f7abb28a..6b1d8bc0e52b47 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -58,6 +58,7 @@ el:
       demote: Υποβιβασμός
       destroyed_msg: Τα δεδομένα του/της %{username} εκκρεμούν για άμεση διαγραφή
       disable: Πάγωμα
+      disable_sign_in_token_auth: Απενεργοποίηση επαλήθευσης διακριτικού email
       disable_two_factor_authentication: Απενεργοποίηση 2FA
       disabled: Παγωμένος
       display_name: Εμφανιζόμενο όνομα
@@ -66,6 +67,7 @@ el:
       email: Email
       email_status: Κατάσταση email
       enable: Ξεπάγωμα
+      enable_sign_in_token_auth: Ενεργοποίηση ελέγχου ταυτότητας διακριτικού e-mail
       enabled: Ενεργοποιημένο
       enabled_msg: Επιτυχές ξεπάγωμα λογαριασμού του/της %{username}
       followers: Ακόλουθοι
@@ -130,6 +132,7 @@ el:
       resubscribe: Επανεγγραφή
       role: Ρόλος
       search: Αναζήτηση
+      search_same_email_domain: Άλλοι χρήστες με τον ίδιο τομέα email
       search_same_ip: Υπόλοιποι χρήστες με την ίδια διεύθυνση IP
       security: Ασφάλεια
       security_measures:
@@ -170,21 +173,26 @@ el:
         approve_appeal: Έγκριση Έφεσης
         approve_user: Έγκριση Χρήστη
         assigned_to_self_report: Ανάθεση Αναφοράς
+        change_email_user: Αλλαγή email για Χρήστη
         change_role_user: Αλλαγή του ρόλου του χρήστη
         confirm_user: Επιβεβαίωση Χρήστη
         create_account_warning: Δημιουργία Προειδοποίησης
         create_announcement: Δημιουργία Ανακοίνωσης
+        create_canonical_email_block: Δημιουργία Αποκλεισμού Email
         create_custom_emoji: Δημιουργία Προσαρμοσμένου Emoji
         create_domain_allow: Δημιουργία Αποδεκτού Τομέα
         create_domain_block: Δημιουργία Αποκλεισμού Τομέα
+        create_email_domain_block: Δημιουργία Αποκλεισμού Τομέα Email
         create_ip_block: Δημιουργία κανόνα IP
         create_unavailable_domain: Δημιουργία Μη Διαθέσιμου Τομέα
         create_user_role: Δημιουργία Ρόλου
         demote_user: Υποβιβασμός Χρήστη
         destroy_announcement: Διαγραφή Ανακοίνωσης
+        destroy_canonical_email_block: Διαγραφή Αποκλεισμού Email
         destroy_custom_emoji: Διαγραφή Προσαρμοσμένου Emoji
         destroy_domain_allow: Διαγραφή Αποδεκτού Τομέα
         destroy_domain_block: Διαγραφή Αποκλεισμού Τομέα
+        destroy_email_domain_block: Διαγραφή Αποκλεισμού Τομέα Email
         destroy_instance: Εκκαθάριση Τομέα
         destroy_ip_block: Διαγραφή κανόνα IP
         destroy_status: Διαγραφή Ανάρτησης
@@ -192,8 +200,10 @@ el:
         destroy_user_role: Καταστροφή Ρόλου
         disable_2fa_user: Απενεργοποίηση 2FA
         disable_custom_emoji: Απενεργοποίηση Προσαρμοσμένων Emoji
+        disable_sign_in_token_auth_user: Απενεργοποίηση Ελέγχου Ταυτότητας Διακριτικού Email για Χρήστη
         disable_user: Απενεργοποίηση Χρήστη
         enable_custom_emoji: Ενεργοποίηση Προσαρμοσμένων Emoji
+        enable_sign_in_token_auth_user: Ενεργοποίηση Ελέγχου Ταυτότητας Διακριτικού Email για Χρήστη
         enable_user: Ενεργοποίηση Χρήστη
         memorialize_account: Μετατροπή Λογαριασμού σε Εις Μνήμην
         promote_user: Προαγωγή Χρήστη
@@ -223,12 +233,16 @@ el:
         approve_appeal_html: Ο/Η %{name} ενέκρινε την ένσταση της απόφασης των συντονιστών από %{target}
         approve_user_html: ο/η %{name} ενέκρινε την εγγραφή του %{target}
         assigned_to_self_report_html: Ο/Η %{name} ανάθεσε την αναφορά %{target} στον εαυτό του/της
+        change_email_user_html: Ο χρήστης %{name} άλλαξε τη διεύθυνση email του χρήστη %{target}
         change_role_user_html: Ο/Η %{name} άλλαξε ρόλο του/της %{target}
+        confirm_user_html: Ο χρήστης %{name} επιβεβαίωσε τη διεύθυνση email του χρήστη %{target}
         create_account_warning_html: Ο/Η %{name} έστειλε προειδοποίηση προς %{target}
         create_announcement_html: Ο/Η %{name} δημιούργησε νέα ανακοίνωση %{target}
+        create_canonical_email_block_html: Ο χρήστης %{name} απέκλεισε email με το hash %{target}
         create_custom_emoji_html: Ο/Η %{name} ανέβασε νέο emoji %{target}
         create_domain_allow_html: Ο/Η %{name} επέτρεψε την συναλλαγή με τον τομέα %{target}
         create_domain_block_html: Ο/Η %{name} απέκλεισε τον τομέα %{target}
+        create_email_domain_block_html: Ο χρήστης %{name} απέκλεισε τον τομέα email %{target}
         create_ip_block_html: Ο/Η %{name} δημιούργησε κανόνα για την IP %{target}
         create_unavailable_domain_html: Ο/Η %{name} σταμάτησε να τροφοδοτεί τον τομέα %{target}
         create_user_role_html: Ο/Η %{name} δημιούργησε ρόλο %{target}
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 324a22500d23fe..9a92879cc52851 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -175,6 +175,7 @@ ru:
         approve_appeal: Одобрить обжалование
         approve_user: Утвердить
         assigned_to_self_report: Присвоение жалоб
+        change_email_user: Сменить e-mail для пользователя
         change_role_user: Изменить роль пользователя
         confirm_user: Подтверждение пользователей
         create_account_warning: Выдача предупреждения
@@ -221,6 +222,7 @@ ru:
         update_custom_emoji: Обновление эмодзи
         update_domain_block: Изменение блокировки домена
         update_ip_block: Обновить правило для IP-адреса
+        update_report: Обновить рапорт
         update_status: Изменение постов
         update_user_role: Обновить роль
       actions:
@@ -436,6 +438,7 @@ ru:
         resolve: Проверить домен
       not_permitted: Не разрешено
       resolved_through_html: Разрешено через %{domain}
+      title: Заблокированные e-mail домены
     export_domain_allows:
       new:
         title: Импорт домена разрешён
@@ -714,6 +717,7 @@ ru:
         manage_taxonomies: Управление трендами
         manage_taxonomies_description: Позволяет пользователям модерировать список популярного контента и менять настройки хэштегов
         manage_user_access: Управление правами пользователей
+        manage_user_access_description: Разрешает пользователям отключать двухэтапную аутентификацию другим пользователям, менять их e-mail и сбрасывать их пароль
         manage_users: Управление пользователями
         manage_users_description: Разрешает пользователям просматривать информацию о других пользователях и применять против них модерацию
         manage_webhooks: Управление веб-хуками
@@ -871,6 +875,8 @@ ru:
         action: Нажмите сюда, чтобы узнать подробности
         message_html: "<strong>Ваше хранилище объектов неправильно настроено. Безопасность ваших пользователей находится под угрозой</strong>"
     tags:
+      moderation:
+        title: Статус
       review: Состояние проверки
       updated_msg: Настройки хэштега обновлены
     title: Администрирование
diff --git a/config/locales/simple_form.ru.yml b/config/locales/simple_form.ru.yml
index c2effdcb883fd6..e7a29fdad19da4 100644
--- a/config/locales/simple_form.ru.yml
+++ b/config/locales/simple_form.ru.yml
@@ -39,12 +39,14 @@ ru:
         text: Вы можете обжаловать замечание только один раз
       defaults:
         autofollow: Люди, пришедшие по этому приглашению, автоматически будут подписаны на вас.
+        avatar: WEBP PNG, GIF и JPG. Не более %{size}. Будет уменьшен до %{dimensions}px
         bot: Отметьте, если с этой учётной записи выполняются автоматизированные действия и она может не просматриваться владельцем.
         context: Один или несколько контекстов, к которым должны быть применены фильтры
         current_password: В целях безопасности введите пароль текущей учётной записи
         current_username: Для подтверждения, пожалуйста, введите имя пользователя текущей учётной записи
         digest: Если вы долго не заглядывали, отправим вам дайджест событий, которые происходили в период вашего отсутствия.
         email: Вам будет отправлено электронное письмо с подтверждением.
+        header: WEBP PNG, GIF и JPG. Не более %{size}. Будет уменьшен до %{dimensions}px
         inbox_url: Копировать URL с главной страницы ретранслятора, который вы хотите использовать
         irreversible: Отфильтрованные посты будут утеряны навсегда, даже если в будущем фильтр будет убран
         locale: Язык интерфейса, e-mail писем и push-уведомлений
@@ -75,6 +77,7 @@ ru:
           warn: Скрыть отфильтрованный контент за предупреждением с указанием названия фильтра
       form_admin_settings:
         activity_api_enabled: Подсчёт количества локальных постов, активных пользователей и новых регистраций на еженедельной основе
+        backups_retention_period: Пользователи могут создавать архивы своих постов, чтобы потом их забрать. Если задать положительное значение, эти архивы автоматически удалятся с вашего хранилища через указанное число дней.
         bootstrap_timeline_accounts: Эти аккаунты будут рекомендованы для подписки новым пользователям.
         closed_registrations_message: Отображается, когда регистрация закрыта
         custom_css: Вы можете применять пользовательские стили в веб-версии Mastodon.
@@ -239,6 +242,7 @@ ru:
         bootstrap_timeline_accounts: Всегда рекомендовать эти учетные записи новым пользователям
         closed_registrations_message: Сообщение, когда регистрация недоступна
         custom_css: Пользовательский CSS
+        favicon: Favicon
         mascot: Пользовательский маскот (устаревшее)
         media_cache_retention_period: Период хранения кэша медиафайлов
         peers_api_enabled: Публикация списка обнаруженных узлов в API
@@ -294,6 +298,7 @@ ru:
           patch: Уведомлять об обновлении исправлений
         trending_tag: Новый тренд требует рассмотрения
       rule:
+        hint: Больше информации
         text: Правило
       settings:
         indexable: Включить страницу профиля в поисковые системы

From 709dcd07f24d65d0bacb57db2a461410f28bff12 Mon Sep 17 00:00:00 2001
From: Django <mediaformat.ux@gmail.com>
Date: Mon, 12 Aug 2024 05:10:05 -0600
Subject: [PATCH 1810/2191] Add support for incoming <s> tag (#31375)

---
 lib/sanitize_ext/sanitize_config.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/sanitize_ext/sanitize_config.rb b/lib/sanitize_ext/sanitize_config.rb
index 3379823cb786d8..ad310b393a0d39 100644
--- a/lib/sanitize_ext/sanitize_config.rb
+++ b/lib/sanitize_ext/sanitize_config.rb
@@ -65,7 +65,7 @@ module Config
     end
 
     MASTODON_STRICT = freeze_config(
-      elements: %w(p br span a del pre blockquote code b strong u i em ul ol li ruby rt rp),
+      elements: %w(p br span a del s pre blockquote code b strong u i em ul ol li ruby rt rp),
 
       attributes: {
         'a' => %w(href rel class translate),

From a7b718c31adbfee9015c84bc2379129df612a5f2 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 12 Aug 2024 15:40:29 +0200
Subject: [PATCH 1811/2191] Fix all streamed notification types being stored
 without filtering (#31384)

---
 .../mastodon/actions/notification_groups.ts   | 27 ++++++++++++++++++-
 app/javascript/mastodon/actions/streaming.js  |  2 +-
 app/javascript/mastodon/api_types/statuses.ts | 26 ++++++++++++++++--
 .../mastodon/reducers/notification_groups.ts  | 14 +++++-----
 4 files changed, 59 insertions(+), 10 deletions(-)

diff --git a/app/javascript/mastodon/actions/notification_groups.ts b/app/javascript/mastodon/actions/notification_groups.ts
index fc5807c8c081df..ab62f8715c4355 100644
--- a/app/javascript/mastodon/actions/notification_groups.ts
+++ b/app/javascript/mastodon/actions/notification_groups.ts
@@ -15,6 +15,7 @@ import type { NotificationGap } from 'mastodon/reducers/notification_groups';
 import {
   selectSettingsNotificationsExcludedTypes,
   selectSettingsNotificationsQuickFilterActive,
+  selectSettingsNotificationsShows,
 } from 'mastodon/selectors/settings';
 import type { AppDispatch } from 'mastodon/store';
 import {
@@ -104,7 +105,31 @@ export const fetchNotificationsGap = createDataLoadingThunk(
 
 export const processNewNotificationForGroups = createAppAsyncThunk(
   'notificationGroups/processNew',
-  (notification: ApiNotificationJSON, { dispatch }) => {
+  (notification: ApiNotificationJSON, { dispatch, getState }) => {
+    const state = getState();
+    const activeFilter = selectSettingsNotificationsQuickFilterActive(state);
+    const notificationShows = selectSettingsNotificationsShows(state);
+
+    const showInColumn =
+      activeFilter === 'all'
+        ? notificationShows[notification.type]
+        : activeFilter === notification.type;
+
+    if (!showInColumn) return;
+
+    if (
+      (notification.type === 'mention' || notification.type === 'update') &&
+      notification.status.filtered
+    ) {
+      const filters = notification.status.filtered.filter((result) =>
+        result.filter.context.includes('notifications'),
+      );
+
+      if (filters.some((result) => result.filter.filter_action === 'hide')) {
+        return;
+      }
+    }
+
     dispatchAssociatedRecords(dispatch, [notification]);
 
     return notification;
diff --git a/app/javascript/mastodon/actions/streaming.js b/app/javascript/mastodon/actions/streaming.js
index f50f41b0d9cd4b..44025bd59638f8 100644
--- a/app/javascript/mastodon/actions/streaming.js
+++ b/app/javascript/mastodon/actions/streaming.js
@@ -104,7 +104,7 @@ export const connectTimelineStream = (timelineId, channelName, params = {}, opti
           const notificationJSON = JSON.parse(data.payload);
           dispatch(updateNotifications(notificationJSON, messages, locale));
           // TODO: remove this once the groups feature replaces the previous one
-          if(getState().notificationGroups.groups.length > 0) {
+          if(getState().settings.getIn(['notifications', 'groupingBeta'], false)) {
             dispatch(processNewNotificationForGroups(notificationJSON));
           }
           break;
diff --git a/app/javascript/mastodon/api_types/statuses.ts b/app/javascript/mastodon/api_types/statuses.ts
index a934faeb7a7001..2c59645ea785ff 100644
--- a/app/javascript/mastodon/api_types/statuses.ts
+++ b/app/javascript/mastodon/api_types/statuses.ts
@@ -58,6 +58,29 @@ export interface ApiPreviewCardJSON {
   authors: ApiPreviewCardAuthorJSON[];
 }
 
+export type FilterContext =
+  | 'home'
+  | 'notifications'
+  | 'public'
+  | 'thread'
+  | 'account';
+
+export interface ApiFilterJSON {
+  id: string;
+  title: string;
+  context: FilterContext;
+  expires_at: string;
+  filter_action: 'warn' | 'hide';
+  keywords?: unknown[]; // TODO: FilterKeywordSerializer
+  statuses?: unknown[]; // TODO: FilterStatusSerializer
+}
+
+export interface ApiFilterResultJSON {
+  filter: ApiFilterJSON;
+  keyword_matches: string[];
+  status_matches: string[];
+}
+
 export interface ApiStatusJSON {
   id: string;
   created_at: string;
@@ -80,8 +103,7 @@ export interface ApiStatusJSON {
   bookmarked?: boolean;
   pinned?: boolean;
 
-  // filtered: FilterResult[]
-  filtered: unknown; // TODO
+  filtered?: ApiFilterResultJSON[];
   content?: string;
   text?: string;
 
diff --git a/app/javascript/mastodon/reducers/notification_groups.ts b/app/javascript/mastodon/reducers/notification_groups.ts
index 871f50364b3b00..0d3f34d2fbe159 100644
--- a/app/javascript/mastodon/reducers/notification_groups.ts
+++ b/app/javascript/mastodon/reducers/notification_groups.ts
@@ -387,12 +387,14 @@ export const notificationGroupsReducer = createReducer<NotificationGroupsState>(
       })
       .addCase(processNewNotificationForGroups.fulfilled, (state, action) => {
         const notification = action.payload;
-        processNewNotification(
-          usePendingItems ? state.pendingGroups : state.groups,
-          notification,
-        );
-        updateLastReadId(state);
-        trimNotifications(state);
+        if (notification) {
+          processNewNotification(
+            usePendingItems ? state.pendingGroups : state.groups,
+            notification,
+          );
+          updateLastReadId(state);
+          trimNotifications(state);
+        }
       })
       .addCase(disconnectTimeline, (state, action) => {
         if (action.payload.timeline === 'home') {

From a1f723a6a4063b001a01886dc4e0f61a85100c6b Mon Sep 17 00:00:00 2001
From: Emelia Smith <ThisIsMissEm@users.noreply.github.com>
Date: Mon, 12 Aug 2024 16:32:52 +0200
Subject: [PATCH 1812/2191] Add support for PKCE Extension in OmniAuth OIDC
 (#31131)

---
 config/initializers/3_omniauth.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/initializers/3_omniauth.rb b/config/initializers/3_omniauth.rb
index aa8ba1a056ed10..0f8378ee14504b 100644
--- a/config/initializers/3_omniauth.rb
+++ b/config/initializers/3_omniauth.rb
@@ -84,6 +84,7 @@
     oidc_options[:response_mode] = ENV['OIDC_RESPONSE_MODE'] if ENV['OIDC_RESPONSE_MODE'] # OPTIONAL (default: query)
     oidc_options[:display] = ENV['OIDC_DISPLAY'] if ENV['OIDC_DISPLAY'] # OPTIONAL (default: page)
     oidc_options[:prompt] = ENV['OIDC_PROMPT'] if ENV['OIDC_PROMPT'] # OPTIONAL
+    oidc_options[:pkce] = ENV['OIDC_USE_PKCE'] == 'true' if ENV['OIDC_USE_PKCE'] # OPTIONAL (default: false)
     oidc_options[:send_nonce] = ENV['OIDC_SEND_NONCE'] == 'true' if ENV['OIDC_SEND_NONCE'] # OPTIONAL (default: true)
     oidc_options[:send_scope_to_token_endpoint] = ENV['OIDC_SEND_SCOPE_TO_TOKEN_ENDPOINT'] == 'true' if ENV['OIDC_SEND_SCOPE_TO_TOKEN_ENDPOINT'] # OPTIONAL (default: true)
     oidc_options[:post_logout_redirect_uri] = ENV['OIDC_IDP_LOGOUT_REDIRECT_URI'] if ENV['OIDC_IDP_LOGOUT_REDIRECT_URI'] # OPTIONAL

From b42661ba95b7872ba278fca9b0fee8faffd89e52 Mon Sep 17 00:00:00 2001
From: Emelia Smith <ThisIsMissEm@users.noreply.github.com>
Date: Mon, 12 Aug 2024 16:45:30 +0200
Subject: [PATCH 1813/2191] Add missing Appeals link under Moderation in
 navigiation (#31071)

---
 app/javascript/material-icons/400-24px/feedback-fill.svg | 1 +
 app/javascript/material-icons/400-24px/feedback.svg      | 1 +
 config/navigation.rb                                     | 3 ++-
 3 files changed, 4 insertions(+), 1 deletion(-)
 create mode 100644 app/javascript/material-icons/400-24px/feedback-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/feedback.svg

diff --git a/app/javascript/material-icons/400-24px/feedback-fill.svg b/app/javascript/material-icons/400-24px/feedback-fill.svg
new file mode 100644
index 00000000000000..7edf5667b0af05
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/feedback-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M80-80v-720q0-33 23.5-56.5T160-880h640q33 0 56.5 23.5T880-800v480q0 33-23.5 56.5T800-240H240L80-80Zm400-280q17 0 28.5-11.5T520-400q0-17-11.5-28.5T480-440q-17 0-28.5 11.5T440-400q0 17 11.5 28.5T480-360Zm-40-160h80v-240h-80v240Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/feedback.svg b/app/javascript/material-icons/400-24px/feedback.svg
new file mode 100644
index 00000000000000..b001b512c5351b
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/feedback.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M480-360q17 0 28.5-11.5T520-400q0-17-11.5-28.5T480-440q-17 0-28.5 11.5T440-400q0 17 11.5 28.5T480-360Zm-40-160h80v-240h-80v240ZM80-80v-720q0-33 23.5-56.5T160-880h640q33 0 56.5 23.5T880-800v480q0 33-23.5 56.5T800-240H240L80-80Zm126-240h594v-480H160v525l46-45Zm-46 0v-480 480Z"/></svg>
\ No newline at end of file
diff --git a/config/navigation.rb b/config/navigation.rb
index 77e60d13c00f06..33efb78b1eee5f 100644
--- a/config/navigation.rb
+++ b/config/navigation.rb
@@ -47,7 +47,8 @@
 
     n.item :moderation, safe_join([material_symbol('gavel'), t('moderation.title')]), nil, if: -> { current_user.can?(:manage_reports, :view_audit_log, :manage_users, :manage_invites, :manage_taxonomies, :manage_federation, :manage_blocks) && !self_destruct } do |s|
       s.item :reports, safe_join([material_symbol('flag'), t('admin.reports.title')]), admin_reports_path, highlights_on: %r{/admin/reports|admin/report_notes}, if: -> { current_user.can?(:manage_reports) }
-      s.item :accounts, safe_join([material_symbol('groups'), t('admin.accounts.title')]), admin_accounts_path(origin: 'local'), highlights_on: %r{/admin/accounts|admin/account_moderation_notes|/admin/pending_accounts|/admin/disputes|/admin/users}, if: -> { current_user.can?(:manage_users) }
+      s.item :appeals, safe_join([material_symbol('feedback'), t('admin.disputes.appeals.title')]), admin_disputes_appeals_path, highlights_on: %r{/admin/disputes/appeals}, if: -> { current_user.can?(:manage_appeals) }
+      s.item :accounts, safe_join([material_symbol('groups'), t('admin.accounts.title')]), admin_accounts_path(origin: 'local'), highlights_on: %r{/admin/accounts|admin/account_moderation_notes|/admin/pending_accounts|/admin/users}, if: -> { current_user.can?(:manage_users) }
       s.item :tags, safe_join([material_symbol('tag'), t('admin.tags.title')]), admin_tags_path, highlights_on: %r{/admin/tags}, if: -> { current_user.can?(:manage_taxonomies) }
       s.item :invites, safe_join([material_symbol('person_add'), t('admin.invites.title')]), admin_invites_path, if: -> { current_user.can?(:manage_invites) }
       s.item :instances, safe_join([material_symbol('cloud'), t('admin.instances.title')]), admin_instances_path(limited: limited_federation_mode? ? nil : '1'), highlights_on: %r{/admin/instances|/admin/domain_blocks|/admin/domain_allows}, if: -> { current_user.can?(:manage_federation) }

From 939af853e65675076d78b7cc63b2c9343e5bcd3b Mon Sep 17 00:00:00 2001
From: Essem <smswessem@gmail.com>
Date: Sun, 11 Aug 2024 16:28:43 -0500
Subject: [PATCH 1814/2191] [Glitch] Fix extra slash on notification policy
 request

Port 2e03dc9fbf932cd4ea42b7dd7a20dd48b21c73b9 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/api/notification_policies.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/javascript/flavours/glitch/api/notification_policies.ts b/app/javascript/flavours/glitch/api/notification_policies.ts
index 1db79a6e74b782..48b78f96fc8333 100644
--- a/app/javascript/flavours/glitch/api/notification_policies.ts
+++ b/app/javascript/flavours/glitch/api/notification_policies.ts
@@ -2,8 +2,8 @@ import { apiRequestGet, apiRequestPut } from 'flavours/glitch/api';
 import type { NotificationPolicyJSON } from 'flavours/glitch/api_types/notification_policies';
 
 export const apiGetNotificationPolicy = () =>
-  apiRequestGet<NotificationPolicyJSON>('/v2/notifications/policy');
+  apiRequestGet<NotificationPolicyJSON>('v2/notifications/policy');
 
 export const apiUpdateNotificationsPolicy = (
   policy: Partial<NotificationPolicyJSON>,
-) => apiRequestPut<NotificationPolicyJSON>('/v2/notifications/policy', policy);
+) => apiRequestPut<NotificationPolicyJSON>('v2/notifications/policy', policy);

From 47df10e9ed838d40999f03eac13c49afd1ef5cb7 Mon Sep 17 00:00:00 2001
From: Michael Stanclift <mx@vmstan.com>
Date: Sun, 11 Aug 2024 16:30:52 -0500
Subject: [PATCH 1815/2191] [Glitch] Revert Safari scrollbar changes

Port 7365a13ee7743b774c7490cb1ce6977b0c3d7b7b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/styles/reset.scss         | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/app/javascript/flavours/glitch/styles/reset.scss b/app/javascript/flavours/glitch/styles/reset.scss
index 903b6c804fcf50..f54ed5bc79b1a7 100644
--- a/app/javascript/flavours/glitch/styles/reset.scss
+++ b/app/javascript/flavours/glitch/styles/reset.scss
@@ -56,3 +56,40 @@ table {
 html {
   scrollbar-color: lighten($ui-base-color, 4%) rgba($base-overlay-background, 0.1);
 }
+
+::-webkit-scrollbar {
+  width: 12px;
+  height: 12px;
+}
+
+::-webkit-scrollbar-thumb {
+  background: lighten($ui-base-color, 4%);
+  border: 0px none $base-border-color;
+  border-radius: 50px;
+}
+
+::-webkit-scrollbar-thumb:hover {
+  background: lighten($ui-base-color, 6%);
+}
+
+::-webkit-scrollbar-thumb:active {
+  background: lighten($ui-base-color, 4%);
+}
+
+::-webkit-scrollbar-track {
+  border: 0px none $base-border-color;
+  border-radius: 0;
+  background: rgba($base-overlay-background, 0.1);
+}
+
+::-webkit-scrollbar-track:hover {
+  background: $ui-base-color;
+}
+
+::-webkit-scrollbar-track:active {
+  background: $ui-base-color;
+}
+
+::-webkit-scrollbar-corner {
+  background: transparent;
+}

From 61b2139267249e73596fd5991115125c3d2650e5 Mon Sep 17 00:00:00 2001
From: Michael Stanclift <mx@vmstan.com>
Date: Sun, 11 Aug 2024 16:32:22 -0500
Subject: [PATCH 1816/2191] [Glitch] Fix account header avatar border

Port fbdda9f6c18fbd282fe7f3a2dba90ed8ec65e0b6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/styles/components.scss         | 3 ++-
 .../flavours/glitch/styles/mastodon-light/diff.scss           | 4 ----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index 713126b44f7eae..601666ac053fbb 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -8521,7 +8521,8 @@ noscript {
 
       .account__avatar {
         background: var(--background-color);
-        border: 2px solid var(--background-border-color);
+        border: 1px solid var(--background-border-color);
+        border-radius: 4px;
       }
     }
   }
diff --git a/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss b/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss
index 021877d435ca15..d41577cf0592f8 100644
--- a/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss
+++ b/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss
@@ -52,10 +52,6 @@ html {
   color: darken($action-button-color, 25%);
 }
 
-.account__header__bar .avatar .account__avatar {
-  border-color: $white;
-}
-
 .getting-started__footer a {
   color: $ui-secondary-color;
   text-decoration: underline;

From 8426c20d344424f435b934125aab5a04c44d98b9 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 12 Aug 2024 15:40:29 +0200
Subject: [PATCH 1817/2191] [Glitch] Fix all streamed notification types being
 stored without filtering

Port a7b718c31adbfee9015c84bc2379129df612a5f2 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../glitch/actions/notification_groups.ts     | 27 ++++++++++++++++++-
 .../flavours/glitch/actions/streaming.js      |  2 +-
 .../flavours/glitch/api_types/statuses.ts     | 26 ++++++++++++++++--
 .../glitch/reducers/notification_groups.ts    | 14 +++++-----
 4 files changed, 59 insertions(+), 10 deletions(-)

diff --git a/app/javascript/flavours/glitch/actions/notification_groups.ts b/app/javascript/flavours/glitch/actions/notification_groups.ts
index e034792275271f..2f0174d117b62d 100644
--- a/app/javascript/flavours/glitch/actions/notification_groups.ts
+++ b/app/javascript/flavours/glitch/actions/notification_groups.ts
@@ -15,6 +15,7 @@ import type { NotificationGap } from 'flavours/glitch/reducers/notification_grou
 import {
   selectSettingsNotificationsExcludedTypes,
   selectSettingsNotificationsQuickFilterActive,
+  selectSettingsNotificationsShows,
 } from 'flavours/glitch/selectors/settings';
 import type { AppDispatch } from 'flavours/glitch/store';
 import {
@@ -104,7 +105,31 @@ export const fetchNotificationsGap = createDataLoadingThunk(
 
 export const processNewNotificationForGroups = createAppAsyncThunk(
   'notificationGroups/processNew',
-  (notification: ApiNotificationJSON, { dispatch }) => {
+  (notification: ApiNotificationJSON, { dispatch, getState }) => {
+    const state = getState();
+    const activeFilter = selectSettingsNotificationsQuickFilterActive(state);
+    const notificationShows = selectSettingsNotificationsShows(state);
+
+    const showInColumn =
+      activeFilter === 'all'
+        ? notificationShows[notification.type]
+        : activeFilter === notification.type;
+
+    if (!showInColumn) return;
+
+    if (
+      (notification.type === 'mention' || notification.type === 'update') &&
+      notification.status.filtered
+    ) {
+      const filters = notification.status.filtered.filter((result) =>
+        result.filter.context.includes('notifications'),
+      );
+
+      if (filters.some((result) => result.filter.filter_action === 'hide')) {
+        return;
+      }
+    }
+
     dispatchAssociatedRecords(dispatch, [notification]);
 
     return notification;
diff --git a/app/javascript/flavours/glitch/actions/streaming.js b/app/javascript/flavours/glitch/actions/streaming.js
index 7b006c1be7c019..2d69542fc70333 100644
--- a/app/javascript/flavours/glitch/actions/streaming.js
+++ b/app/javascript/flavours/glitch/actions/streaming.js
@@ -104,7 +104,7 @@ export const connectTimelineStream = (timelineId, channelName, params = {}, opti
           const notificationJSON = JSON.parse(data.payload);
           dispatch(updateNotifications(notificationJSON, messages, locale));
           // TODO: remove this once the groups feature replaces the previous one
-          if(getState().notificationGroups.groups.length > 0) {
+          if(getState().settings.getIn(['notifications', 'groupingBeta'], false)) {
             dispatch(processNewNotificationForGroups(notificationJSON));
           }
           break;
diff --git a/app/javascript/flavours/glitch/api_types/statuses.ts b/app/javascript/flavours/glitch/api_types/statuses.ts
index 9de86e7fa686fe..c84ecc7afc4266 100644
--- a/app/javascript/flavours/glitch/api_types/statuses.ts
+++ b/app/javascript/flavours/glitch/api_types/statuses.ts
@@ -58,6 +58,29 @@ export interface ApiPreviewCardJSON {
   authors: ApiPreviewCardAuthorJSON[];
 }
 
+export type FilterContext =
+  | 'home'
+  | 'notifications'
+  | 'public'
+  | 'thread'
+  | 'account';
+
+export interface ApiFilterJSON {
+  id: string;
+  title: string;
+  context: FilterContext;
+  expires_at: string;
+  filter_action: 'warn' | 'hide';
+  keywords?: unknown[]; // TODO: FilterKeywordSerializer
+  statuses?: unknown[]; // TODO: FilterStatusSerializer
+}
+
+export interface ApiFilterResultJSON {
+  filter: ApiFilterJSON;
+  keyword_matches: string[];
+  status_matches: string[];
+}
+
 export interface ApiStatusJSON {
   id: string;
   created_at: string;
@@ -80,8 +103,7 @@ export interface ApiStatusJSON {
   bookmarked?: boolean;
   pinned?: boolean;
 
-  // filtered: FilterResult[]
-  filtered: unknown; // TODO
+  filtered?: ApiFilterResultJSON[];
   content?: string;
   text?: string;
 
diff --git a/app/javascript/flavours/glitch/reducers/notification_groups.ts b/app/javascript/flavours/glitch/reducers/notification_groups.ts
index 4dedfe27a89851..a721e4008d129b 100644
--- a/app/javascript/flavours/glitch/reducers/notification_groups.ts
+++ b/app/javascript/flavours/glitch/reducers/notification_groups.ts
@@ -387,12 +387,14 @@ export const notificationGroupsReducer = createReducer<NotificationGroupsState>(
       })
       .addCase(processNewNotificationForGroups.fulfilled, (state, action) => {
         const notification = action.payload;
-        processNewNotification(
-          usePendingItems ? state.pendingGroups : state.groups,
-          notification,
-        );
-        updateLastReadId(state);
-        trimNotifications(state);
+        if (notification) {
+          processNewNotification(
+            usePendingItems ? state.pendingGroups : state.groups,
+            notification,
+          );
+          updateLastReadId(state);
+          trimNotifications(state);
+        }
       })
       .addCase(disconnectTimeline, (state, action) => {
         if (action.payload.timeline === 'home') {

From 7e501c59c2acc0bba7fb5b3d1b6ca43171c89f02 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Tue, 13 Aug 2024 09:14:41 +0200
Subject: [PATCH 1818/2191] Add a border above the timeline hint for statuses
 with replies (#31387)

---
 app/javascript/mastodon/components/timeline_hint.tsx | 7 +++++--
 app/javascript/mastodon/features/status/index.jsx    | 2 +-
 app/javascript/styles/mastodon/components.scss       | 4 ++++
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/javascript/mastodon/components/timeline_hint.tsx b/app/javascript/mastodon/components/timeline_hint.tsx
index bf2a2d8bbaeda7..6faad2fbb875eb 100644
--- a/app/javascript/mastodon/components/timeline_hint.tsx
+++ b/app/javascript/mastodon/components/timeline_hint.tsx
@@ -1,12 +1,15 @@
 import { FormattedMessage } from 'react-intl';
 
+import classNames from 'classnames';
+
 interface Props {
   resource: JSX.Element;
   url: string;
+  className?: string;
 }
 
-export const TimelineHint: React.FC<Props> = ({ resource, url }) => (
-  <div className='timeline-hint'>
+export const TimelineHint: React.FC<Props> = ({ className, resource, url }) => (
+  <div className={classNames('timeline-hint', className)}>
     <strong>
       <FormattedMessage
         id='timeline_hint.remote_resource_not_displayed'
diff --git a/app/javascript/mastodon/features/status/index.jsx b/app/javascript/mastodon/features/status/index.jsx
index 8f36c44271b05a..1d15b13bd451d9 100644
--- a/app/javascript/mastodon/features/status/index.jsx
+++ b/app/javascript/mastodon/features/status/index.jsx
@@ -629,7 +629,7 @@ class Status extends ImmutablePureComponent {
     const isIndexable = !status.getIn(['account', 'noindex']);
 
     if (!isLocal) {
-      remoteHint = <TimelineHint url={status.get('url')} resource={<FormattedMessage id='timeline_hint.resources.replies' defaultMessage='Some replies' />} />;
+      remoteHint = <TimelineHint className={classNames(!!descendants && 'timeline-hint--with-descendants')} url={status.get('url')} resource={<FormattedMessage id='timeline_hint.resources.replies' defaultMessage='Some replies' />} />;
     }
 
     const handlers = {
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 90881b0f19a36f..7ffbf482c2a51b 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -4248,6 +4248,10 @@ a.status-card {
   }
 }
 
+.timeline-hint--with-descendants {
+  border-top: 1px solid var(--background-border-color);
+}
+
 .regeneration-indicator {
   text-align: center;
   font-size: 16px;

From f6d090fdf5912f390c3d1fe5b43f15c1f0704bd3 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Tue, 13 Aug 2024 09:26:23 +0200
Subject: [PATCH 1819/2191] Change avatars border radius (#31390)

---
 app/javascript/styles/mastodon/admin.scss      | 6 +++---
 app/javascript/styles/mastodon/components.scss | 5 +++--
 app/javascript/styles/mastodon/containers.scss | 2 +-
 app/javascript/styles/mastodon/forms.scss      | 2 +-
 app/javascript/styles/mastodon/variables.scss  | 1 +
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/javascript/styles/mastodon/admin.scss b/app/javascript/styles/mastodon/admin.scss
index 61e949b27b744b..a1b4e74e0df776 100644
--- a/app/javascript/styles/mastodon/admin.scss
+++ b/app/javascript/styles/mastodon/admin.scss
@@ -697,7 +697,7 @@ body,
     top: 15px;
 
     .avatar {
-      border-radius: 4px;
+      border-radius: var(--avatar-border-radius);
       width: 40px;
       height: 40px;
     }
@@ -748,7 +748,7 @@ body,
     top: 15px;
 
     .avatar {
-      border-radius: 4px;
+      border-radius: var(--avatar-border-radius);
       width: 40px;
       height: 40px;
     }
@@ -1595,7 +1595,7 @@ a.sparkline {
       position: absolute;
       inset-inline-start: 15px;
       top: 15px;
-      border-radius: 4px;
+      border-radius: var(--avatar-border-radius);
       width: 40px;
       height: 40px;
     }
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 7ffbf482c2a51b..995568e14757a3 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -1996,13 +1996,14 @@ body > [data-popper-placement] {
 .account__avatar {
   display: block;
   position: relative;
+  border-radius: var(--avatar-border-radius);
 
   img {
     display: block;
     width: 100%;
     height: 100%;
     object-fit: cover;
-    border-radius: 4px;
+    border-radius: var(--avatar-border-radius);
   }
 
   &-inline {
@@ -7975,7 +7976,7 @@ noscript {
       .account__avatar {
         background: var(--background-color);
         border: 1px solid var(--background-border-color);
-        border-radius: 4px;
+        border-radius: var(--avatar-border-radius);
       }
     }
   }
diff --git a/app/javascript/styles/mastodon/containers.scss b/app/javascript/styles/mastodon/containers.scss
index 9363e428b3809b..ac1f862a099e06 100644
--- a/app/javascript/styles/mastodon/containers.scss
+++ b/app/javascript/styles/mastodon/containers.scss
@@ -81,7 +81,7 @@
       height: 100%;
       display: block;
       margin: 0;
-      border-radius: 4px;
+      border-radius: var(--avatar-border-radius);
     }
   }
 
diff --git a/app/javascript/styles/mastodon/forms.scss b/app/javascript/styles/mastodon/forms.scss
index f3cf66237f5592..cf8c1327dc51be 100644
--- a/app/javascript/styles/mastodon/forms.scss
+++ b/app/javascript/styles/mastodon/forms.scss
@@ -312,7 +312,7 @@ code {
       margin-bottom: 10px;
       max-width: 100%;
       height: auto;
-      border-radius: 4px;
+      border-radius: var(--avatar-border-radius);
       background: url('images/void.png');
 
       &[src$='missing.png'] {
diff --git a/app/javascript/styles/mastodon/variables.scss b/app/javascript/styles/mastodon/variables.scss
index 2848a42b3fec7e..2ba3dfb49d67bf 100644
--- a/app/javascript/styles/mastodon/variables.scss
+++ b/app/javascript/styles/mastodon/variables.scss
@@ -108,4 +108,5 @@ $font-monospace: 'mastodon-font-monospace' !default;
   --surface-background-color: #{darken($ui-base-color, 4%)};
   --surface-variant-background-color: #{$ui-base-color};
   --surface-variant-active-background-color: #{lighten($ui-base-color, 4%)};
+  --avatar-border-radius: 8px;
 }

From 02df1b4e4a1690c934b0e4fb9aa32b832d6bc2a1 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 13 Aug 2024 03:37:32 -0400
Subject: [PATCH 1820/2191] Finish email allow/deny list naming migration
 (#30530)

---
 .rubocop_todo.yml                             |  1 -
 app/models/user.rb                            |  2 +-
 app/validators/email_mx_validator.rb          |  8 ++--
 ...l_validator.rb => user_email_validator.rb} | 10 ++---
 .../auto_close_registrations_scheduler.rb     |  2 +-
 config/initializers/blacklists.rb             |  6 ---
 config/initializers/doorkeeper.rb             |  2 +-
 config/initializers/email_domains_lists.rb    |  6 +++
 spec/models/user_spec.rb                      | 40 +++++++++----------
 spec/validators/email_mx_validator_spec.rb    |  8 ++--
 ...r_spec.rb => user_email_validator_spec.rb} |  2 +-
 11 files changed, 43 insertions(+), 44 deletions(-)
 rename app/validators/{blacklisted_email_validator.rb => user_email_validator.rb} (74%)
 delete mode 100644 config/initializers/blacklists.rb
 create mode 100644 config/initializers/email_domains_lists.rb
 rename spec/validators/{blacklisted_email_validator_spec.rb => user_email_validator_spec.rb} (96%)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 357ed99545028a..09acb795bf26cb 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -40,7 +40,6 @@ Style/FetchEnvVar:
     - 'config/environments/production.rb'
     - 'config/initializers/2_limited_federation_mode.rb'
     - 'config/initializers/3_omniauth.rb'
-    - 'config/initializers/blacklists.rb'
     - 'config/initializers/cache_buster.rb'
     - 'config/initializers/devise.rb'
     - 'config/initializers/paperclip.rb'
diff --git a/app/models/user.rb b/app/models/user.rb
index 72854569260e80..f22b7ec684cc62 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -100,7 +100,7 @@ class User < ApplicationRecord
 
   validates :email, presence: true, email_address: true
 
-  validates_with BlacklistedEmailValidator, if: -> { ENV['EMAIL_DOMAIN_LISTS_APPLY_AFTER_CONFIRMATION'] == 'true' || !confirmed? }
+  validates_with UserEmailValidator, if: -> { ENV['EMAIL_DOMAIN_LISTS_APPLY_AFTER_CONFIRMATION'] == 'true' || !confirmed? }
   validates_with EmailMxValidator, if: :validate_email_dns?
   validates :agreement, acceptance: { allow_nil: false, accept: [true, 'true', '1'] }, on: :create
 
diff --git a/app/validators/email_mx_validator.rb b/app/validators/email_mx_validator.rb
index 794377894354c8..f78b98d7dd71b2 100644
--- a/app/validators/email_mx_validator.rb
+++ b/app/validators/email_mx_validator.rb
@@ -15,7 +15,7 @@ def validate(user)
 
       if resolved_ips.empty?
         user.errors.add(:email, :unreachable)
-      elsif on_blacklist?(resolved_domains, user.sign_up_ip)
+      elsif email_domain_blocked?(resolved_domains, user.sign_up_ip)
         user.errors.add(:email, :blocked)
       end
     end
@@ -34,9 +34,9 @@ def get_domain(value)
   end
 
   def on_allowlist?(domain)
-    return false if Rails.configuration.x.email_domains_whitelist.blank?
+    return false if Rails.configuration.x.email_domains_allowlist.blank?
 
-    Rails.configuration.x.email_domains_whitelist.include?(domain)
+    Rails.configuration.x.email_domains_allowlist.include?(domain)
   end
 
   def resolve_mx(domain)
@@ -58,7 +58,7 @@ def resolve_mx(domain)
     [ips, records]
   end
 
-  def on_blacklist?(domains, attempt_ip)
+  def email_domain_blocked?(domains, attempt_ip)
     EmailDomainBlock.block?(domains, attempt_ip: attempt_ip)
   end
 end
diff --git a/app/validators/blacklisted_email_validator.rb b/app/validators/user_email_validator.rb
similarity index 74%
rename from app/validators/blacklisted_email_validator.rb
rename to app/validators/user_email_validator.rb
index 9b3f2e33e55a6f..21b22794ef61fc 100644
--- a/app/validators/blacklisted_email_validator.rb
+++ b/app/validators/user_email_validator.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class BlacklistedEmailValidator < ActiveModel::Validator
+class UserEmailValidator < ActiveModel::Validator
   def validate(user)
     return if user.valid_invitation? || user.email.blank?
 
@@ -23,18 +23,18 @@ def disallowed_through_email_domain_block?(email, ip)
   end
 
   def not_allowed_through_configuration?(email)
-    return false if Rails.configuration.x.email_domains_whitelist.blank?
+    return false if Rails.configuration.x.email_domains_allowlist.blank?
 
-    domains = Rails.configuration.x.email_domains_whitelist.gsub('.', '\.')
+    domains = Rails.configuration.x.email_domains_allowlist.gsub('.', '\.')
     regexp  = Regexp.new("@(.+\\.)?(#{domains})$", true)
 
     email !~ regexp
   end
 
   def disallowed_through_configuration?(email)
-    return false if Rails.configuration.x.email_domains_blacklist.blank?
+    return false if Rails.configuration.x.email_domains_denylist.blank?
 
-    domains = Rails.configuration.x.email_domains_blacklist.gsub('.', '\.')
+    domains = Rails.configuration.x.email_domains_denylist.gsub('.', '\.')
     regexp  = Regexp.new("@(.+\\.)?(#{domains})", true)
 
     regexp.match?(email)
diff --git a/app/workers/scheduler/auto_close_registrations_scheduler.rb b/app/workers/scheduler/auto_close_registrations_scheduler.rb
index 68745029150c49..6226e6ea1fe74e 100644
--- a/app/workers/scheduler/auto_close_registrations_scheduler.rb
+++ b/app/workers/scheduler/auto_close_registrations_scheduler.rb
@@ -11,7 +11,7 @@ class Scheduler::AutoCloseRegistrationsScheduler
   OPEN_REGISTRATIONS_MODERATOR_THRESHOLD = 1.week + UserTrackingConcern::SIGN_IN_UPDATE_FREQUENCY
 
   def perform
-    return if Rails.configuration.x.email_domains_whitelist.present? || ENV['DISABLE_AUTOMATIC_SWITCHING_TO_APPROVED_REGISTRATIONS'] == 'true'
+    return if Rails.configuration.x.email_domains_allowlist.present? || ENV['DISABLE_AUTOMATIC_SWITCHING_TO_APPROVED_REGISTRATIONS'] == 'true'
     return unless Setting.registrations_mode == 'open'
 
     switch_to_approval_mode! unless active_moderators?
diff --git a/config/initializers/blacklists.rb b/config/initializers/blacklists.rb
deleted file mode 100644
index 0e3339c98e61b9..00000000000000
--- a/config/initializers/blacklists.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-
-Rails.application.configure do
-  config.x.email_domains_blacklist = (ENV['EMAIL_DOMAIN_DENYLIST']  || ENV['EMAIL_DOMAIN_BLACKLIST']) || ''
-  config.x.email_domains_whitelist = (ENV['EMAIL_DOMAIN_ALLOWLIST'] || ENV['EMAIL_DOMAIN_WHITELIST']) || ''
-end
diff --git a/config/initializers/doorkeeper.rb b/config/initializers/doorkeeper.rb
index 83100b1cf5f78e..86fde3cacf74dc 100644
--- a/config/initializers/doorkeeper.rb
+++ b/config/initializers/doorkeeper.rb
@@ -147,7 +147,7 @@
   force_ssl_in_redirect_uri false
 
   # Specify what redirect URI's you want to block during Application creation.
-  # Any redirect URI is whitelisted by default.
+  # Any redirect URI is allowed by default.
   #
   # You can use this option in order to forbid URI's with 'javascript' scheme
   # for example.
diff --git a/config/initializers/email_domains_lists.rb b/config/initializers/email_domains_lists.rb
new file mode 100644
index 00000000000000..1361b1935adb82
--- /dev/null
+++ b/config/initializers/email_domains_lists.rb
@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+Rails.application.configure do
+  config.x.email_domains_denylist = ENV.fetch('EMAIL_DOMAIN_DENYLIST', nil) || ENV.fetch('EMAIL_DOMAIN_BLACKLIST', '')
+  config.x.email_domains_allowlist = ENV.fetch('EMAIL_DOMAIN_ALLOWLIST', nil) || ENV.fetch('EMAIL_DOMAIN_WHITELIST', '')
+end
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 4755500fc4e356..0f3e25576ee688 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -182,30 +182,30 @@ def within_duration_window_days
     end
   end
 
-  describe 'blacklist' do
+  describe 'email domains denylist integration' do
     around do |example|
-      old_blacklist = Rails.configuration.x.email_blacklist
+      original = Rails.configuration.x.email_domains_denylist
 
-      Rails.configuration.x.email_domains_blacklist = 'mvrht.com'
+      Rails.configuration.x.email_domains_denylist = 'mvrht.com'
 
       example.run
 
-      Rails.configuration.x.email_domains_blacklist = old_blacklist
+      Rails.configuration.x.email_domains_denylist = original
     end
 
-    it 'allows a non-blacklisted user to be created' do
+    it 'allows a user with an email domain that is not on the denylist to be created' do
       user = described_class.new(email: 'foo@example.com', account: account, password: password, agreement: true)
 
       expect(user).to be_valid
     end
 
-    it 'does not allow a blacklisted user to be created' do
+    it 'does not allow a user with an email domain on the deylist to be created' do
       user = described_class.new(email: 'foo@mvrht.com', account: account, password: password, agreement: true)
 
       expect(user).to_not be_valid
     end
 
-    it 'does not allow a subdomain blacklisted user to be created' do
+    it 'does not allow a user with an email where the subdomain is on the denylist to be created' do
       user = described_class.new(email: 'foo@mvrht.com.topdomain.tld', account: account, password: password, agreement: true)
 
       expect(user).to_not be_valid
@@ -374,43 +374,43 @@ def within_duration_window_days
     end
   end
 
-  describe 'whitelist' do
+  describe 'allowlist integration' do
     around do |example|
-      old_whitelist = Rails.configuration.x.email_domains_whitelist
+      original = Rails.configuration.x.email_domains_allowlist
 
-      Rails.configuration.x.email_domains_whitelist = 'mastodon.space'
+      Rails.configuration.x.email_domains_allowlist = 'mastodon.space'
 
       example.run
 
-      Rails.configuration.x.email_domains_whitelist = old_whitelist
+      Rails.configuration.x.email_domains_allowlist = original
     end
 
-    it 'does not allow a user to be created unless they are whitelisted' do
+    it 'does not allow a user to be created when their email is not on the allowlist' do
       user = described_class.new(email: 'foo@example.com', account: account, password: password, agreement: true)
       expect(user).to_not be_valid
     end
 
-    it 'allows a user to be created if they are whitelisted' do
+    it 'allows a user to be created when their email is on the allowlist' do
       user = described_class.new(email: 'foo@mastodon.space', account: account, password: password, agreement: true)
       expect(user).to be_valid
     end
 
-    it 'does not allow a user with a whitelisted top domain as subdomain in their email address to be created' do
+    it 'does not allow a user with an email subdomain included on the top level domain allowlist to be created' do
       user = described_class.new(email: 'foo@mastodon.space.userdomain.com', account: account, password: password, agreement: true)
       expect(user).to_not be_valid
     end
 
-    context 'with a blacklisted subdomain' do
+    context 'with a subdomain on the denylist' do
       around do |example|
-        old_blacklist = Rails.configuration.x.email_blacklist
+        original = Rails.configuration.x.email_domains_denylist
         example.run
-        Rails.configuration.x.email_domains_blacklist = old_blacklist
+        Rails.configuration.x.email_domains_denylist = original
       end
 
-      it 'does not allow a user to be created with a specific blacklisted subdomain even if the top domain is whitelisted' do
-        Rails.configuration.x.email_domains_blacklist = 'blacklisted.mastodon.space'
+      it 'does not allow a user to be created with an email subdomain on the denylist even if the top domain is on the allowlist' do
+        Rails.configuration.x.email_domains_denylist = 'denylisted.mastodon.space'
 
-        user = described_class.new(email: 'foo@blacklisted.mastodon.space', account: account, password: password)
+        user = described_class.new(email: 'foo@denylisted.mastodon.space', account: account, password: password)
         expect(user).to_not be_valid
       end
     end
diff --git a/spec/validators/email_mx_validator_spec.rb b/spec/validators/email_mx_validator_spec.rb
index bc26be8729551e..23a5f768efc8b6 100644
--- a/spec/validators/email_mx_validator_spec.rb
+++ b/spec/validators/email_mx_validator_spec.rb
@@ -9,10 +9,10 @@
 
     context 'with an e-mail domain that is explicitly allowed' do
       around do |block|
-        tmp = Rails.configuration.x.email_domains_whitelist
-        Rails.configuration.x.email_domains_whitelist = 'example.com'
+        tmp = Rails.configuration.x.email_domains_allowlist
+        Rails.configuration.x.email_domains_allowlist = 'example.com'
         block.call
-        Rails.configuration.x.email_domains_whitelist = tmp
+        Rails.configuration.x.email_domains_allowlist = tmp
       end
 
       it 'does not add errors if there are no DNS records' do
@@ -69,7 +69,7 @@
       expect(user.errors).to have_received(:add)
     end
 
-    it 'adds an error if the MX record is blacklisted' do
+    it 'adds an error if the MX record has an email domain block' do
       EmailDomainBlock.create!(domain: 'mail.example.com')
 
       configure_resolver(
diff --git a/spec/validators/blacklisted_email_validator_spec.rb b/spec/validators/user_email_validator_spec.rb
similarity index 96%
rename from spec/validators/blacklisted_email_validator_spec.rb
rename to spec/validators/user_email_validator_spec.rb
index 86760df2e7f4b0..92da04ea39561e 100644
--- a/spec/validators/blacklisted_email_validator_spec.rb
+++ b/spec/validators/user_email_validator_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe BlacklistedEmailValidator do
+RSpec.describe UserEmailValidator do
   describe '#validate' do
     subject { described_class.new.validate(user) }
 

From 862e793b455dc7f44b8ecd39a6ba32b9c4abd628 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 13 Aug 2024 07:42:08 +0000
Subject: [PATCH 1821/2191] New Crowdin Translations (automated) (#31394)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/cy.json  | 11 +++++
 app/javascript/mastodon/locales/eu.json  | 36 +++++++++++++++
 app/javascript/mastodon/locales/fo.json  |  2 +-
 app/javascript/mastodon/locales/it.json  |  4 ++
 app/javascript/mastodon/locales/kab.json |  3 +-
 app/javascript/mastodon/locales/ko.json  |  6 +++
 app/javascript/mastodon/locales/la.json  |  7 +--
 app/javascript/mastodon/locales/lt.json  | 16 +++++++
 config/locales/da.yml                    |  2 +-
 config/locales/fo.yml                    |  9 ++++
 config/locales/it.yml                    | 22 ++++-----
 config/locales/ko.yml                    |  8 ++++
 config/locales/lt.yml                    | 10 ++++-
 config/locales/tr.yml                    | 57 ++++++++++++++++++++++++
 14 files changed, 175 insertions(+), 18 deletions(-)

diff --git a/app/javascript/mastodon/locales/cy.json b/app/javascript/mastodon/locales/cy.json
index 9b9d341b14b6af..33cad6a2ab5e81 100644
--- a/app/javascript/mastodon/locales/cy.json
+++ b/app/javascript/mastodon/locales/cy.json
@@ -11,6 +11,7 @@
   "about.not_available": "Nid yw'r wybodaeth hon ar gael ar y gweinydd hwn.",
   "about.powered_by": "Cyfrwng cymdeithasol datganoledig wedi ei yrru gan {mastodon}",
   "about.rules": "Rheolau'r gweinydd",
+  "account.account_note_header": "Nodyn personol",
   "account.add_or_remove_from_list": "Ychwanegu neu Ddileu o'r rhestrau",
   "account.badges.bot": "Bot",
   "account.badges.group": "Grŵp",
@@ -299,6 +300,7 @@
   "filter_modal.select_filter.subtitle": "Defnyddiwch gategori sy'n bodoli eisoes neu crëu un newydd",
   "filter_modal.select_filter.title": "Hidlo'r postiad hwn",
   "filter_modal.title.status": "Hidlo postiad",
+  "filtered_notifications_banner.pending_requests": "Gan {count, plural, =0 {no one} one {un person} two {# berson} few {# pherson} other {# person}} efallai eich bod yn eu hadnabod",
   "filtered_notifications_banner.title": "Hysbysiadau wedi'u hidlo",
   "firehose.all": "Popeth",
   "firehose.local": "Gweinydd hwn",
@@ -354,6 +356,7 @@
   "home.pending_critical_update.link": "Gweld y diweddariadau",
   "home.pending_critical_update.title": "Mae diweddariad diogelwch hanfodol ar gael!",
   "home.show_announcements": "Dangos cyhoeddiadau",
+  "ignore_notifications_modal.ignore": "Anwybyddu hysbysiadau",
   "interaction_modal.description.favourite": "Gyda chyfrif ar Mastodon, gallwch chi hoffi'r postiad hwn er mwyn roi gwybod i'r awdur eich bod chi'n ei werthfawrogi ac yn ei gadw ar gyfer nes ymlaen.",
   "interaction_modal.description.follow": "Gyda chyfrif ar Mastodon, gallwch ddilyn {name} i dderbyn eu postiadau yn eich llif cartref.",
   "interaction_modal.description.reblog": "Gyda chyfrif ar Mastodon, gallwch hybu'r postiad hwn i'w rannu â'ch dilynwyr.",
@@ -479,6 +482,10 @@
   "notification.favourite": "Hoffodd {name} eich postiad",
   "notification.follow": "Dilynodd {name} chi",
   "notification.follow_request": "Mae {name} wedi gwneud cais i'ch dilyn",
+  "notification.label.mention": "Crybwyll",
+  "notification.label.private_mention": "Crybwyll preifat",
+  "notification.label.reply": "Ateb",
+  "notification.mention": "Crybwyll",
   "notification.moderation-warning.learn_more": "Dysgu mwy",
   "notification.moderation_warning": "Rydych wedi derbyn rhybudd gan gymedrolwr",
   "notification.moderation_warning.action_delete_statuses": "Mae rhai o'ch postiadau wedi'u dileu.",
@@ -500,6 +507,7 @@
   "notification.update": "Golygodd {name} bostiad",
   "notification_requests.accept": "Derbyn",
   "notification_requests.dismiss": "Cau",
+  "notification_requests.exit_selection_mode": "Canslo",
   "notification_requests.maximize": "Mwyhau",
   "notification_requests.notifications_from": "Hysbysiadau gan {name}",
   "notification_requests.title": "Hysbysiadau wedi'u hidlo",
@@ -539,6 +547,9 @@
   "notifications.permission_denied": "Nid oes hysbysiadau bwrdd gwaith ar gael oherwydd cais am ganiatâd porwr a wrthodwyd yn flaenorol",
   "notifications.permission_denied_alert": "Nid oes modd galluogi hysbysiadau bwrdd gwaith, gan fod caniatâd porwr wedi'i wrthod o'r blaen",
   "notifications.permission_required": "Nid oes hysbysiadau bwrdd gwaith ar gael oherwydd na roddwyd y caniatâd gofynnol.",
+  "notifications.policy.accept": "Derbyn",
+  "notifications.policy.drop": "Anwybyddu",
+  "notifications.policy.filter": "Hidlo",
   "notifications.policy.filter_new_accounts.hint": "Crëwyd o fewn {days, lluosog, un {yr un diwrnod} arall {y # diwrnod}} diwethaf",
   "notifications.policy.filter_new_accounts_title": "Cyfrifon newydd",
   "notifications.policy.filter_not_followers_hint": "Gan gynnwys pobl sydd wedi bod yn eich dilyn am llai  {days, plural, un {nag un diwrnod} arall {na # diwrnod}}",
diff --git a/app/javascript/mastodon/locales/eu.json b/app/javascript/mastodon/locales/eu.json
index 34b62d949d3ca0..fdde3389794372 100644
--- a/app/javascript/mastodon/locales/eu.json
+++ b/app/javascript/mastodon/locales/eu.json
@@ -11,6 +11,7 @@
   "about.not_available": "Zerbitzari honek ez du informazio hau eskuragarri jarri.",
   "about.powered_by": "{mastodon} erabiltzen duen sare sozial deszentralizatua",
   "about.rules": "Zerbitzariaren arauak",
+  "account.account_note_header": "Ohar pertsonala",
   "account.add_or_remove_from_list": "Gehitu edo kendu zerrendetatik",
   "account.badges.bot": "Bot-a",
   "account.badges.group": "Taldea",
@@ -175,6 +176,7 @@
   "confirmations.discard_edit_media.message": "Multimediaren deskribapen edo aurrebistan gorde gabeko aldaketak daude, baztertu nahi dituzu?",
   "confirmations.edit.confirm": "Editatu",
   "confirmations.edit.message": "Orain editatzen baduzu, une honetan idazten ari zaren mezua gainidatziko da. Ziur jarraitu nahi duzula?",
+  "confirmations.edit.title": "Gainidatzi bidalketa?",
   "confirmations.logout.confirm": "Amaitu saioa",
   "confirmations.logout.message": "Ziur saioa amaitu nahi duzula?",
   "confirmations.logout.title": "Itxi saioa?",
@@ -184,8 +186,10 @@
   "confirmations.redraft.title": "Ezabatu eta berridatzi bidalketa?",
   "confirmations.reply.confirm": "Erantzun",
   "confirmations.reply.message": "Orain erantzuteak idazten ari zaren mezua gainidatziko du. Ziur jarraitu nahi duzula?",
+  "confirmations.reply.title": "Gainidatzi bidalketa?",
   "confirmations.unfollow.confirm": "Utzi jarraitzeari",
   "confirmations.unfollow.message": "Ziur {name} jarraitzeari utzi nahi diozula?",
+  "confirmations.unfollow.title": "Erabiltzailea jarraitzeari utzi?",
   "conversation.delete": "Ezabatu elkarrizketa",
   "conversation.mark_as_read": "Markatu irakurrita bezala",
   "conversation.open": "Ikusi elkarrizketa",
@@ -348,6 +352,11 @@
   "home.pending_critical_update.link": "Ikusi eguneraketak",
   "home.pending_critical_update.title": "Segurtasun eguneraketa kritikoa eskuragarri!",
   "home.show_announcements": "Erakutsi iragarpenak",
+  "ignore_notifications_modal.ignore": "Ezikusi jakinarazpenak",
+  "ignore_notifications_modal.limited_accounts_title": "Moderatutako kontuen jakinarazpenei ez ikusiarena egin?",
+  "ignore_notifications_modal.new_accounts_title": "Kontu berrien jakinarazpenei ez ikusiarena egin?",
+  "ignore_notifications_modal.not_followers_title": "Jarraitzen ez zaituzten pertsonen jakinarazpenei ez ikusiarena egin?",
+  "ignore_notifications_modal.not_following_title": "Jarraitzen ez dituzun pertsonen jakinarazpenei ez ikusiarena egin?",
   "interaction_modal.description.favourite": "Mastodon kontu batekin bidalketa hau gogoko egin dezakezu, egileari eskertzeko eta gerorako gordetzeko.",
   "interaction_modal.description.follow": "Mastodon kontu batekin {name} jarraitu dezakezu bere bidalketak zure hasierako denbora lerroan jasotzeko.",
   "interaction_modal.description.reblog": "Mastodon kontu batekin bidalketa hau bultzatu dezakezu, zure jarraitzaileekin partekatzeko.",
@@ -466,6 +475,11 @@
   "notification.favourite": "{name}(e)k zure bidalketa gogoko du",
   "notification.follow": "{name}(e)k jarraitzen dizu",
   "notification.follow_request": "{name}(e)k zu jarraitzeko eskaera egin du",
+  "notification.label.mention": "Aipamena",
+  "notification.label.private_mention": "Aipamen pribatua",
+  "notification.label.private_reply": "Erantzun pribatua",
+  "notification.label.reply": "Erantzuna",
+  "notification.mention": "Aipamena",
   "notification.moderation-warning.learn_more": "Informazio gehiago",
   "notification.moderation_warning": "Moderazio-abisu bat jaso duzu",
   "notification.moderation_warning.action_delete_statuses": "Argitalpen batzuk kendu dira.",
@@ -476,6 +490,7 @@
   "notification.moderation_warning.action_silence": "Kontua murriztu egin da.",
   "notification.moderation_warning.action_suspend": "Kontua itxi da.",
   "notification.own_poll": "Zure inkesta amaitu da",
+  "notification.poll": "Zuk erantzun duzun inkesta bat bukatu da",
   "notification.reblog": "{name}(e)k bultzada eman dio zure bidalketari",
   "notification.relationships_severance_event": "{name} erabiltzailearekin galdutako konexioak",
   "notification.relationships_severance_event.account_suspension": "{from} zerbitzariko administratzaile batek {target} bertan behera utzi du, hau da, ezin izango dituzu jaso hango eguneratzerik edo hangoekin elkarreragin.",
@@ -483,9 +498,19 @@
   "notification.status": "{name} erabiltzaileak bidalketa egin berri du",
   "notification.update": "{name} erabiltzaileak bidalketa bat editatu du",
   "notification_requests.accept": "Onartu",
+  "notification_requests.accept_all": "Onartu dena",
+  "notification_requests.confirm_accept_all.button": "Onartu dena",
+  "notification_requests.confirm_accept_all.title": "Onartu jakinarazpen-eskaerak?",
+  "notification_requests.confirm_dismiss_all.button": "Baztertu guztiak",
+  "notification_requests.confirm_dismiss_all.title": "Baztertu jakinarazpen-eskaerak?",
   "notification_requests.dismiss": "Baztertu",
+  "notification_requests.dismiss_all": "Baztertu guztiak",
+  "notification_requests.enter_selection_mode": "Hautatu",
+  "notification_requests.exit_selection_mode": "Utzi",
+  "notification_requests.maximize": "Maximizatu",
   "notification_requests.notifications_from": "{name} erabiltzailearen jakinarazpenak",
   "notification_requests.title": "Iragazitako jakinarazpenak",
+  "notification_requests.view": "Ikusi jakinarazpenak",
   "notifications.clear": "Garbitu jakinarazpenak",
   "notifications.clear_confirmation": "Ziur zure jakinarazpen guztiak behin betirako garbitu nahi dituzula?",
   "notifications.clear_title": "Garbitu jakinarazpenak?",
@@ -522,6 +547,14 @@
   "notifications.permission_denied": "Mahaigaineko jakinarazpenak ez daude erabilgarri, nabigatzaileari baimen eskaera ukatu zitzaiolako",
   "notifications.permission_denied_alert": "Mahaigaineko jakinarazpenak ezin dira gaitu, nabigatzaileari baimena ukatu zitzaiolako",
   "notifications.permission_required": "Mahaigaineko jakinarazpenak ez daude erabilgarri, horretarako behar den baimena ez delako eman.",
+  "notifications.policy.accept": "Onartu",
+  "notifications.policy.accept_hint": "Erakutsi jakinarazpenetan",
+  "notifications.policy.drop": "Ezikusi",
+  "notifications.policy.drop_hint": "Hutsera bidali, ez erakutsi inoiz gehiago",
+  "notifications.policy.filter": "Iragazi",
+  "notifications.policy.filter_hint": "Bidali filtratutako jakinarazpenen sarrerako ontzira",
+  "notifications.policy.filter_limited_accounts_hint": "Zerbitzariaren moderatzaileek mugatuta",
+  "notifications.policy.filter_limited_accounts_title": "Moderatutako kontuak",
   "notifications.policy.filter_new_accounts.hint": "Azken {days, plural, one {egunean} other {# egunetan}} sortua",
   "notifications.policy.filter_new_accounts_title": "Kontu berriak",
   "notifications.policy.filter_not_followers_hint": "{days, plural, one {Egun batez} other {# egunez}} baino gutxiago jarraitu zaituen jendea barne",
@@ -656,6 +689,7 @@
   "report.unfollow_explanation": "Kontu hau jarraitzen ari zara. Zure denbora-lerro nagusian bere bidalketak ez ikusteko, jarraitzeari utzi.",
   "report_notification.attached_statuses": "{count, plural, one {Bidalketa {count}} other {{count} bidalketa}} erantsita",
   "report_notification.categories.legal": "Legala",
+  "report_notification.categories.legal_sentence": "eduki ilegala",
   "report_notification.categories.other": "Bestelakoak",
   "report_notification.categories.other_sentence": "bestelakoak",
   "report_notification.categories.spam": "Spam",
@@ -691,6 +725,7 @@
   "server_banner.administered_by": "Administratzailea(k):",
   "server_banner.server_stats": "Zerbitzariaren estatistikak:",
   "sign_in_banner.create_account": "Sortu kontua",
+  "sign_in_banner.mastodon_is": "Mastodon gertatzen ari denari buruz egunean egoteko modurik onena da.",
   "sign_in_banner.sign_in": "Hasi saioa",
   "sign_in_banner.sso_redirect": "Hasi saioa edo izena eman",
   "status.admin_account": "Ireki @{name} erabiltzailearen moderazio interfazea",
@@ -766,6 +801,7 @@
   "timeline_hint.remote_resource_not_displayed": "Beste zerbitzarietako {resource} ez da bistaratzen.",
   "timeline_hint.resources.followers": "Jarraitzaileak",
   "timeline_hint.resources.follows": "Jarraitzen",
+  "timeline_hint.resources.replies": "Erantzun batzuk",
   "timeline_hint.resources.statuses": "Bidalketa zaharragoak",
   "trends.counter_by_accounts": "{count, plural, one {Pertsona {counter}} other {{counter} pertsona}} azken {days, plural, one {egunean} other {{days} egunetan}}",
   "trends.trending_now": "Joera orain",
diff --git a/app/javascript/mastodon/locales/fo.json b/app/javascript/mastodon/locales/fo.json
index ec6b0e53575bc6..36198e9e591f25 100644
--- a/app/javascript/mastodon/locales/fo.json
+++ b/app/javascript/mastodon/locales/fo.json
@@ -358,7 +358,7 @@
   "home.show_announcements": "Vís kunngerðir",
   "ignore_notifications_modal.disclaimer": "Mastodon kann ikki upplýsa brúkarar um, at tú hevur latið sum um, at tú ikki hevur sæð teirra fráboðanir. At lata sum um, at tú ikki sær fráboðanir, forðar ikki, at boðini sjálv verða send.",
   "ignore_notifications_modal.filter_instead": "Filtrera ístaðin",
-  "ignore_notifications_modal.filter_to_act_users": "Tú kann framvegis góðtaka, avvísa og melda brúkarar",
+  "ignore_notifications_modal.filter_to_act_users": "Tú kanst framvegis góðtaka, avvísa og melda brúkarar",
   "ignore_notifications_modal.filter_to_avoid_confusion": "Filtrering ger tað lættari at sleppa undan møguligum misskiljingum",
   "ignore_notifications_modal.filter_to_review_separately": "Tú kanst kanna filtreraðar fráboðanir fyri seg",
   "ignore_notifications_modal.ignore": "Lat sum um tú ikki sær fráboðanir",
diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json
index c3cbbb9cf04789..20f5f0aa0816cd 100644
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@@ -358,7 +358,9 @@
   "home.show_announcements": "Mostra annunci",
   "ignore_notifications_modal.disclaimer": "Mastodon non può informare gli utenti che hai ignorato le loro notifiche. Ignorare le notifiche non impedirà l'invio dei messaggi stessi.",
   "ignore_notifications_modal.filter_instead": "Filtra invece",
+  "ignore_notifications_modal.filter_to_act_users": "Potrai comunque accettare, rifiutare o segnalare gli utenti",
   "ignore_notifications_modal.filter_to_avoid_confusion": "Il filtraggio aiuta a evitare potenziali confusioni",
+  "ignore_notifications_modal.filter_to_review_separately": "Puoi rivedere le notifiche filtrate separatamente",
   "ignore_notifications_modal.ignore": "Ignora le notifiche",
   "ignore_notifications_modal.limited_accounts_title": "Ignorare le notifiche dagli account moderati?",
   "ignore_notifications_modal.new_accounts_title": "Ignorare le notifiche dai nuovi account?",
@@ -575,6 +577,8 @@
   "notifications.policy.accept": "Accetta",
   "notifications.policy.accept_hint": "Mostra nelle notifiche",
   "notifications.policy.drop": "Ignora",
+  "notifications.policy.drop_hint": "Scarta definitivamente, per non essere mai più visto",
+  "notifications.policy.filter": "Filtrare",
   "notifications.policy.filter_hint": "Invia alla casella in arrivo delle notifiche filtrate",
   "notifications.policy.filter_limited_accounts_hint": "Limitato dai moderatori del server",
   "notifications.policy.filter_limited_accounts_title": "Account moderati",
diff --git a/app/javascript/mastodon/locales/kab.json b/app/javascript/mastodon/locales/kab.json
index 8d4f128e9a400e..7b7ee85066b04e 100644
--- a/app/javascript/mastodon/locales/kab.json
+++ b/app/javascript/mastodon/locales/kab.json
@@ -486,7 +486,7 @@
   "privacy.private.short": "Imeḍfaren",
   "privacy.public.long": "Kra n win yellan deg Masṭudun neɣ berra-s",
   "privacy.public.short": "Azayez",
-  "privacy.unlisted.long": "Kra kan n ilguritmen",
+  "privacy.unlisted.long": "Kra kan yiwarzimen",
   "privacy_policy.last_updated": "Aleqqem aneggaru {date}",
   "privacy_policy.title": "Tasertit tabaḍnit",
   "recommended": "Yettuwelleh",
@@ -629,6 +629,7 @@
   "timeline_hint.remote_resource_not_displayed": "{resource} seg yiqeddacen-nniḍen ur d-ttwaskanent ara.",
   "timeline_hint.resources.followers": "Imeḍfaṛen",
   "timeline_hint.resources.follows": "T·Yeṭafaṛ",
+  "timeline_hint.resources.replies": "Kra tririyin",
   "timeline_hint.resources.statuses": "Tisuffaɣ tiqdimin",
   "trends.counter_by_accounts": "{count, plural, one {{counter} wemdan} other {{counter} medden}} deg {days, plural, one {ass} other {{days} wussan}} iɛeddan",
   "trends.trending_now": "Ayen mucaɛen tura",
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index 6cf8f67d3e776c..5954edc655204d 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -503,6 +503,8 @@
   "notification.update": "{name} 님이 게시물을 수정했습니다",
   "notification_requests.accept": "수락",
   "notification_requests.dismiss": "지우기",
+  "notification_requests.enter_selection_mode": "선택",
+  "notification_requests.exit_selection_mode": "취소",
   "notification_requests.maximize": "최대화",
   "notification_requests.minimize_banner": "걸러진 알림 배너 최소화",
   "notification_requests.notifications_from": "{name} 님으로부터의 알림",
@@ -543,6 +545,9 @@
   "notifications.permission_denied": "권한이 거부되었기 때문에 데스크탑 알림을 활성화할 수 없음",
   "notifications.permission_denied_alert": "이전에 브라우저 권한이 거부되었기 때문에, 데스크탑 알림이 활성화 될 수 없습니다.",
   "notifications.permission_required": "필요한 권한이 승인되지 않아 데스크탑 알림을 사용할 수 없습니다.",
+  "notifications.policy.accept": "허용",
+  "notifications.policy.drop": "무시",
+  "notifications.policy.filter": "필터",
   "notifications.policy.filter_limited_accounts_hint": "서버 중재자에 의해 제한됨",
   "notifications.policy.filter_limited_accounts_title": "중재된 계정",
   "notifications.policy.filter_new_accounts.hint": "{days, plural, one {하루} other {#일}} 안에 만들어진",
@@ -793,6 +798,7 @@
   "timeline_hint.remote_resource_not_displayed": "다른 서버의 {resource} 표시는 할 수 없습니다.",
   "timeline_hint.resources.followers": "팔로워",
   "timeline_hint.resources.follows": "팔로우",
+  "timeline_hint.resources.replies": "몇몇 답글",
   "timeline_hint.resources.statuses": "이전 게시물",
   "trends.counter_by_accounts": "이전 {days}일 동안 {counter} 명의 사용자",
   "trends.trending_now": "지금 유행 중",
diff --git a/app/javascript/mastodon/locales/la.json b/app/javascript/mastodon/locales/la.json
index 8a2512722e1921..4237f885a7734d 100644
--- a/app/javascript/mastodon/locales/la.json
+++ b/app/javascript/mastodon/locales/la.json
@@ -40,7 +40,7 @@
   "compose_form.direct_message_warning_learn_more": "Discere plura",
   "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
   "compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.",
-  "compose_form.lock_disclaimer": "Tua ratio non est {clausa}. Quisquis te sequi potest ut visum accipiat nuntios tuos tantum pro sectatoribus.",
+  "compose_form.lock_disclaimer": "Tua ratio non est {locked}. Quisquis te sequi potest ut visum accipiat nuntios tuos tantum pro sectatoribus.",
   "compose_form.lock_disclaimer.lock": "clausum",
   "compose_form.placeholder": "What is on your mind?",
   "compose_form.publish_form": "Barrire",
@@ -128,6 +128,7 @@
   "lightbox.next": "Secundum",
   "lists.account.add": "Adde ad tabellās",
   "lists.new.create": "Addere tabella",
+  "lists.subheading": "Tuae tabulae",
   "load_pending": "{count, plural, one {# novum item} other {# nova itema}}",
   "media_gallery.toggle_visible": "{number, plural, one {Cēla imaginem} other {Cēla imagines}}",
   "moved_to_account_banner.text": "Tua ratione {disabledAccount} interdum reposita est, quod ad {movedToAccount} migrāvisti.",
@@ -146,7 +147,7 @@
   "notification.moderation_warning.action_sensitive": "Tua nuntia hinc sensibiliter notabuntur.",
   "notification.moderation_warning.action_silence": "Ratio tua est limitata.",
   "notification.moderation_warning.action_suspend": "Ratio tua suspensus est.",
-  "notification.own_poll": "Suffragium tuum terminatum est.",
+  "notification.own_poll": "Suffragium tuum terminatum est",
   "notification.reblog": "{name} tuum nuntium amplificavit.",
   "notification.relationships_severance_event.account_suspension": "Admin ab {from} {target} suspendit, quod significat nōn iam posse tē novitātēs ab eīs accipere aut cum eīs interagere.",
   "notification.relationships_severance_event.domain_block": "Admin ab {from} {target} obsēcāvit, includēns {followersCount} ex tuīs sectātōribus et {followingCount, plural, one {# ratione} other {# rationibus}} quās sequeris.",
@@ -161,7 +162,7 @@
   "onboarding.actions.go_to_home": "Go to your home feed",
   "onboarding.follows.lead": "Tua domus feed est principalis via Mastodon experīrī. Quō plūrēs persōnas sequeris, eō actīvior et interessantior erit. Ad tē incipiendum, ecce quaedam suāsiones:",
   "onboarding.follows.title": "Popular on Mastodon",
-  "onboarding.profile.display_name_hint": "Tuum nomen completum aut tuum nomen ludens...",
+  "onboarding.profile.display_name_hint": "Tuum nomen completum aut tuum nomen ludens…",
   "onboarding.start.lead": "Nunc pars es Mastodonis, singularis, socialis medii platformae decentralis ubi—non algorismus—tuam ipsius experientiam curas. Incipiāmus in nova hac socialis regione:",
   "onboarding.start.skip": "Want to skip right ahead?",
   "onboarding.start.title": "Perfecisti eam!",
diff --git a/app/javascript/mastodon/locales/lt.json b/app/javascript/mastodon/locales/lt.json
index 45359a40a707ee..038ec8a7b30e2a 100644
--- a/app/javascript/mastodon/locales/lt.json
+++ b/app/javascript/mastodon/locales/lt.json
@@ -358,7 +358,9 @@
   "home.show_announcements": "Rodyti skelbimus",
   "ignore_notifications_modal.disclaimer": "„Mastodon“ negali informuoti naudotojų, kad ignoravai jų pranešimus. Ignoravus pranešimus, pačių pranešimų siuntimas nebus sustabdytas.",
   "ignore_notifications_modal.filter_instead": "Filtruoti vietoj to",
+  "ignore_notifications_modal.filter_to_act_users": "Vis dar galėsi priimti, atmesti arba pranešti naudotojus.",
   "ignore_notifications_modal.filter_to_avoid_confusion": "Filtravimas padeda išvengti galimos painiavos.",
+  "ignore_notifications_modal.filter_to_review_separately": "Filtruotus pranešimus gali peržiūrėti atskirai.",
   "ignore_notifications_modal.ignore": "Ignoruoti pranešimus",
   "ignore_notifications_modal.limited_accounts_title": "Ignoruoti pranešimus iš prižiūrėmų paskyrų?",
   "ignore_notifications_modal.new_accounts_title": "Ignoruoti pranešimus iš naujų paskyrų?",
@@ -514,13 +516,26 @@
   "notification.status": "{name} ką tik paskelbė",
   "notification.update": "{name} redagavo įrašą",
   "notification_requests.accept": "Priimti",
+  "notification_requests.accept_all": "Priimti visus",
+  "notification_requests.accept_multiple": "{count, plural, one {Priimti # prašymą} few {Priimti # prašymus} many {Priimti # prašymo} other {Priimti # prašymų}}",
+  "notification_requests.confirm_accept_all.button": "Priimti visus",
+  "notification_requests.confirm_accept_all.message": "Ketini priimti {count, plural, one {# pranešimo prašymą} few {# pranešimų prašymus} many {# pranešimo prašymo} other {# pranešimų prašymų}}. Ar tikrai nori tęsti?",
+  "notification_requests.confirm_accept_all.title": "Priimti pranešimų prašymus?",
+  "notification_requests.confirm_dismiss_all.button": "Atmesti visus",
+  "notification_requests.confirm_dismiss_all.message": "Ketini atmesti {count, plural, one {# pranešimo prašymą} few {# pranešimų prašymus} many {# pranešimo prašymo} other {# pranešimų prašymų}}. Daugiau negalėsi lengvai pasiekti {count, plural, one {jo} few {jų} many {juos} other {jų}}. Ar tikrai nori tęsti?",
+  "notification_requests.confirm_dismiss_all.title": "Atmesti pranešimų prašymus?",
   "notification_requests.dismiss": "Atmesti",
+  "notification_requests.dismiss_all": "Atmesti visus",
+  "notification_requests.dismiss_multiple": "{count, plural, one {Atmesti # prašymą} few {Atmesti # prašymus} many {Atmesti # prašymo} other {Atmesti # prašymų}}",
+  "notification_requests.enter_selection_mode": "Pasirinkti",
+  "notification_requests.exit_selection_mode": "Atšaukti",
   "notification_requests.explainer_for_limited_account": "Pranešimai iš šios paskyros buvo filtruojami, nes prižiūrėtojas (-a) apribojo paskyrą.",
   "notification_requests.explainer_for_limited_remote_account": "Pranešimai iš šios paskyros buvo filtruojami, nes prižiūrėtojas (-a) apribojo paskyrą arba serverį.",
   "notification_requests.maximize": "Padidinti",
   "notification_requests.minimize_banner": "Mažinti filtruotų pranešimų reklamjuostę",
   "notification_requests.notifications_from": "Pranešimai iš {name}",
   "notification_requests.title": "Filtruojami pranešimai",
+  "notification_requests.view": "Peržiūrėti pranešimus",
   "notifications.clear": "Išvalyti pranešimus",
   "notifications.clear_confirmation": "Ar tikrai nori visam laikui išvalyti visus pranešimus?",
   "notifications.clear_title": "Valyti pranešimus?",
@@ -810,6 +825,7 @@
   "timeline_hint.remote_resource_not_displayed": "{resource} iš kitų serverių nerodomi.",
   "timeline_hint.resources.followers": "Sekėjai",
   "timeline_hint.resources.follows": "Seka",
+  "timeline_hint.resources.replies": "Kai kurie atsakymai",
   "timeline_hint.resources.statuses": "Senesni įrašai",
   "trends.counter_by_accounts": "{count, plural, one {{counter} žmogus} few {{counter} žmonės} many {{counter} žmogus} other {{counter} žmonių}} per {days, plural, one {dieną} few {{days} dienas} many {{days} dienas} other {{days} dienų}}",
   "trends.trending_now": "Tendencinga dabar",
diff --git a/config/locales/da.yml b/config/locales/da.yml
index 5b5d6cb184db72..416618ec99f389 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -686,7 +686,7 @@ da:
         moderation: Moderering
         special: Speciel
       delete: Slet
-      description_html: Med <strong>brugerroller</strong>kan man tilpasse sine brugeres adgang til Mastodon-funktioner og -områder.
+      description_html: Med <strong>brugerroller</strong> kan man tilpasse sine brugeres adgang til Mastodon-funktioner og -områder.
       edit: Redigér rolle for '%{name}
       everyone: Standardtilladelser
       everyone_full_description_html: Dette er <strong>basisrollen</strong> med indvirkning på <strong>alle brugere</strong>, selv dem uden rolletildeling. Alle øvrige rolletilladelser nedarves herfra.
diff --git a/config/locales/fo.yml b/config/locales/fo.yml
index 3d7221deb7cc22..7b1e11c264a4ef 100644
--- a/config/locales/fo.yml
+++ b/config/locales/fo.yml
@@ -31,6 +31,7 @@ fo:
       created_msg: Umsjónarviðmerking stovnað!
       destroyed_msg: Umsjónarviðmerking strikað!
     accounts:
+      add_email_domain_block: Forða t-post økisnavni
       approve: Vátta
       approved_msg: Góðkent tilmeldingarumbøn hjá %{username}
       are_you_sure: Ert tú vís/ur?
@@ -129,6 +130,7 @@ fo:
       resubscribe: Tegna teg umaftur
       role: Leiklutur
       search: Leita
+      search_same_email_domain: Aðrir brúkarar við sama t-post-økisnavni
       search_same_ip: Aðrir brúkarar við somu IP
       security: Trygd
       security_measures:
@@ -169,21 +171,26 @@ fo:
         approve_appeal: Góðkenn kæru
         approve_user: Góðkenn brúkara
         assigned_to_self_report: Tilluta melding
+        change_email_user: Broyt t-post hjá brúkara
         change_role_user: Broyt leiklut hjá brúkara
         confirm_user: Vátta brúkara
         create_account_warning: Stovna ávaring
         create_announcement: Stovna kunngerð
+        create_canonical_email_block: Stovna t-post-blokk
         create_custom_emoji: Stovna serligt kenslutekn
         create_domain_allow: Stovna navnaøkjaloyvi
         create_domain_block: Stovna navnaøkjablokering
+        create_email_domain_block: Stovna t-post-økisnavnablokk
         create_ip_block: Stovna IP reglu
         create_unavailable_domain: Stovna navnaøki, sum ikki er tøkt
         create_user_role: Stovna leiklut
         demote_user: Lækka brúkara í tign
         destroy_announcement: Strika kunngerð
+        destroy_canonical_email_block: Strika t-postablokk
         destroy_custom_emoji: Strika serligt kenslutekn
         destroy_domain_allow: Strika navnaøkjaloyvi
         destroy_domain_block: Strika navnaøkjablokering
+        destroy_email_domain_block: Strika t-posta-økisnavnablokk
         destroy_instance: Reinsa navnaøki
         destroy_ip_block: Strika IP reglu
         destroy_status: Strika post
@@ -222,7 +229,9 @@ fo:
         approve_appeal_html: "%{name} góðkendi umsjónaráheitan frá %{target}"
         approve_user_html: "%{name} góðtók umsókn frá %{target}"
         assigned_to_self_report_html: "%{name} tillutaði frágreiðing %{target} til sín sjálvs"
+        change_email_user_html: "%{name} broytti t-postin hjá brúkara %{target}"
         change_role_user_html: "%{name} broytti leiklutin hjá %{target}"
+        confirm_user_html: "%{name} váttaði t-post hjá brúkara %{target}"
         create_account_warning_html: "%{name} sendi eina ávaring til %{target}"
         create_announcement_html: "%{name} stovnaði eina fráboðan %{target}"
         create_custom_emoji_html: "%{name} legði upp nýtt kenslutekn %{target}"
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 52fca95c394d81..16641001015608 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -907,16 +907,16 @@ it:
     trends:
       allow: Consenti
       approved: Approvato
-      confirm_allow: Si è sicuri di voler consentire i tag selezionati?
-      confirm_disallow: Si è sicuri di non voler consentire i tag selezionati?
+      confirm_allow: Sei sicuro di voler consentire i tag selezionati?
+      confirm_disallow: Sei sicuro di non voler consentire i tag selezionati?
       disallow: Non consentire
       links:
         allow: Consenti link
         allow_provider: Consenti editore
-        confirm_allow: Si è sicuri di voler consentire i link selezionati?
-        confirm_allow_provider: Si è sicuri di voler consentire i provider selezionati?
-        confirm_disallow: Si è sicuri di non voler consentire i link selezionati?
-        confirm_disallow_provider: Si è sicuri di non voler consentire i provider selezionati?
+        confirm_allow: Sei sicuro di voler consentire i link selezionati?
+        confirm_allow_provider: Sei sicuro di voler consentire i provider selezionati?
+        confirm_disallow: Sei sicuro di non voler consentire i link selezionati?
+        confirm_disallow_provider: Sei sicuro di non voler consentire i provider selezionati?
         description_html: Questi sono collegamenti che attualmente vengono molto condivisi dagli account di cui il server vede i post. Può aiutare i tuoi utenti a scoprire cosa sta succedendo nel mondo. Nessun link viene visualizzato pubblicamente finché non si approva chi lo pubblica. È anche possibile permettere o rifiutare i singoli collegamenti.
         disallow: Non consentire link
         disallow_provider: Non consentire editore
@@ -940,10 +940,10 @@ it:
       statuses:
         allow: Consenti post
         allow_account: Consenti autore
-        confirm_allow: Si è sicuri di voler consentire gli stati selezionati?
-        confirm_allow_account: Si è sicuri di voler consentire gli account selezionati?
-        confirm_disallow: Si è sicuri di non voler consentire gli stati selezionati?
-        confirm_disallow_account: Si è sicuri di non voler consentire gli account selezionati?
+        confirm_allow: Sei sicuro di voler consentire gli stati selezionati?
+        confirm_allow_account: Sei sicuro di voler consentire gli account selezionati?
+        confirm_disallow: Sei sicuro di non voler consentire gli stati selezionati?
+        confirm_disallow_account: Sei sicuro di non voler consentire gli account selezionati?
         description_html: Questi sono post noti al tuo server che sono attualmente molto condivisi e preferiti. Può aiutare i tuoi utenti (nuovi e non) a trovare più persone da seguire. Nessun post viene visualizzato pubblicamente fino a quando si approva l'autore, e l'autore permette che il suo account sia suggerito ad altri. È anche possibile permettere o rifiutare singoli post.
         disallow: Non consentire post
         disallow_account: Non consentire autore
@@ -976,7 +976,7 @@ it:
         used_by_over_week:
           one: Usato da una persona nell'ultima settimana
           other: Usato da %{count} persone nell'ultima settimana
-      title: Raccomandazioni e Tendenze
+      title: Raccomandazioni & Tendenze
       trending: Di tendenza
     warning_presets:
       add_new: Aggiungi nuovo
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 1cfcdcc0e61b5a..03bfa646bab4bb 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -414,8 +414,10 @@ ko:
       new:
         create: 도메인 추가하기
         resolve: 도메인 검사
+        title: 새 이메일 도메인 차단
       not_permitted: 허용하지 않음
       resolved_through_html: "%{domain}을 통해 리졸빙됨"
+      title: 차단된 이메일 도메인
     export_domain_allows:
       new:
         title: 도메인 허용 목록 불러오기
@@ -1004,7 +1006,9 @@ ko:
       guide_link_text: 누구나 기여할 수 있습니다.
     sensitive_content: 민감한 내용
   application_mailer:
+    notification_preferences: 이메일 설정 변경
     salutation: "%{name} 님,"
+    settings: '이메일 설정 변경: %{link}'
     unsubscribe: 구독 해제
     view: '보기:'
     view_profile: 프로필 보기
@@ -1024,6 +1028,7 @@ ko:
       hint_html: 하나만 더! 당신이 사람인지 확인이 필요합니다 (스팸 계정을 거르기 위해서 필요한 과정입니다). 아래에 있는 CAPTCHA를 풀고 "계속"을 누르세요
       title: 보안 체크
     confirmations:
+      awaiting_review: 이메일 주소가 확인되었습니다! 이제 %{domain} 스태프가 가입을 검토할 것입니다. 계정이 승인되면 이메일을 받게 됩니다!
       awaiting_review_title: 가입 신청을 검토 중입니다
       clicking_this_link: 이 링크를 클릭
       login_link: 로그인
@@ -1051,6 +1056,7 @@ ko:
     or_log_in_with: 다른 방법으로 로그인 하려면
     privacy_policy_agreement_html: <a href="%{privacy_policy_path}" target="_blank">개인정보처리방침</a>을 읽고 동의합니다
     progress:
+      confirm: 이메일 확인
       details: 세부사항
       review: 심사 결과
       rules: 규정을 수락합니다.
@@ -1072,6 +1078,7 @@ ko:
     security: 보안
     set_new_password: 새 암호 설정
     setup:
+      email_below_hint_html: 스팸 폴더를 체크해보거나, 새로 요청할 수 있습니다. 이메일을 잘못 입력한 경우 수정할 수 있습니다.
       email_settings_hint_html: "%{email}을 인증하기 위해 우리가 보낸 링크를 누르세요. 여기서 기다리겠습니다."
       link_not_received: 링크를 못 받으셨나요?
       title: 수신함 확인하기
@@ -1351,6 +1358,7 @@ ko:
     authentication_methods:
       otp: 2단계 인증 앱
       password: 암호
+      sign_in_token: 이메일 보안 코드
       webauthn: 보안 키
     description_html: 확인되지 않은 활동이 보인다면, 암호를 바꾸거나 2단계 인증을 활성화 하는 것을 고려해 보세요.
     empty: 인증 이력이 존재하지 않습니다
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 44f7c7ddfc1d99..dfcfcf12711648 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -669,6 +669,7 @@ lt:
         title: Tendencingos saitažodžiai
         trendable: Gali pasirodyti tendencijose
         trending_rank: 'Tendencinga #%{rank}'
+      title: Rekomendacijos ir tendencijos
       trending: Tendencinga
     warning_presets:
       add_new: Pridėti naują
@@ -887,7 +888,7 @@ lt:
     errors:
       too_large: Failas per didelis.
     modes:
-      merge: Sulieti
+      merge: Sujungti
       merge_long: Išsaugoti esančius įrašus ir pridėti naujus
       overwrite: Perrašyti
       overwrite_long: Pakeisti senus įrašus naujais
@@ -931,6 +932,9 @@ lt:
     description_html: Jei pastebėjei neatpažįstamą veiklą, apsvarstyk galimybę pakeisti slaptažodį ir įjungti dvigubą tapatybės nustatymą.
     empty: Tapatybės nustatymas istorijos nėra
     title: Tapatybės nustatymo istorija
+  mail_subscriptions:
+    unsubscribe:
+      success_html: Daugiau negausi %{type} „Mastodon“ domene %{domain} į savo el. paštą %{email}.
   media_attachments:
     validations:
       images_and_video: Negalima pridėti video prie statuso, kuris jau turi nuotrauką
@@ -964,6 +968,8 @@ lt:
       subject: "%{name} pakėlė tavo įrašą"
       title: Naujas pakėlimas
   notifications:
+    administration_emails: Administratoriaus el. laiško pranešimai
+    email_events: Įvykiai, skirti el. laiško pranešimams
     email_events_hint: 'Pasirink įvykius, apie kuriuos nori gauti pranešimus:'
   number:
     human:
@@ -1061,6 +1067,7 @@ lt:
     featured_tags: Rodomi saitažodžiai
     import: Importuoti
     migrate: Paskyros migracija
+    notifications: El. laiško pranešimai
     preferences: Nuostatos
     profile: Viešas profilis
     relationships: Sekimai ir sekėjai
@@ -1205,6 +1212,7 @@ lt:
     invalid_otp_token: Netinkamas dviejų veiksnių kodas
     otp_lost_help_html: Jei praradai prieigą prie abiejų, gali susisiek su %{email}
     rate_limited: Per daug tapatybės nustatymo bandymų. Bandyk dar kartą vėliau.
+    seamless_external_login: Esi prisijungęs (-usi) per išorinę paslaugą, todėl slaptažodžio ir el. pašto nustatymai nepasiekiami.
     signed_in_as: 'Prisijungta kaip:'
   verification:
     extra_instructions_html: <strong>Patarimas:</strong> nuoroda tavo svetainėje gali būti nematoma. Svarbi dalis – tai, kad <code>rel="me"</code> neleidžia apsimesti interneto svetainėse, kuriose yra naudotojų sukurto turinio. Vietoj to gali naudoti net <code>nuorodą</code> puslapio antraštėje esančią žymę <code>a</code>, tačiau HTML turi būti pasiekiamas nevykdant JavaScript.
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 6782551f13f4b8..52d81df60c5a47 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -31,6 +31,7 @@ tr:
       created_msg: Denetim notu başarıyla oluşturuldu!
       destroyed_msg: Denetim notu başarıyla yok edildi!
     accounts:
+      add_email_domain_block: E-posta alan adını engelle
       approve: Onayla
       approved_msg: "%{username} adlı kullanıcının kayıt başvurusu başarıyla onaylandı"
       are_you_sure: Emin misin?
@@ -57,6 +58,7 @@ tr:
       demote: Düşür
       destroyed_msg: "%{username} adlı kullanıcının verilerinin silinmesi sıraya alındı"
       disable: Dondur
+      disable_sign_in_token_auth: E-posta token doğrulamayı devre dışı bırak
       disable_two_factor_authentication: 2 aşamalı doğrulamayı kapat
       disabled: Kapalı
       display_name: Görünen isim
@@ -65,6 +67,7 @@ tr:
       email: E-posta
       email_status: E-posta durumu
       enable: Etkinleştir
+      enable_sign_in_token_auth: E-posta token doğrulamayı etkinleştir
       enabled: Etkin
       enabled_msg: "%{username} hesabı başarıyla çözüldü"
       followers: Takipçi
@@ -129,6 +132,7 @@ tr:
       resubscribe: Yeniden abone ol
       role: Rol
       search: Ara
+      search_same_email_domain: Aynı e-posta alan adına sahip diğer kullanıcılar
       search_same_ip: Aynı IP adresine sahip diğer kullanıcılar
       security: Güvenlik
       security_measures:
@@ -169,21 +173,26 @@ tr:
         approve_appeal: İtirazı Onayla
         approve_user: Kullanıcıyı Onayla
         assigned_to_self_report: Raporu Ata
+        change_email_user: Kullanıcı E-postasını Değiştir
         change_role_user: Kullanıcının Rolünü Değiştir
         confirm_user: Kullanıcıyı Onayla
         create_account_warning: Uyarı Oluştur
         create_announcement: Duyuru Oluştur
+        create_canonical_email_block: E-posta Engeli Oluştur
         create_custom_emoji: Özel İfade Oluştur
         create_domain_allow: İzin Verilen Alan Adı Oluştur
         create_domain_block: Engellenen Alan Adı Oluştur
+        create_email_domain_block: E-Posta Alan Adı Engeli Oluştur
         create_ip_block: IP kuralı oluştur
         create_unavailable_domain: Mevcut Olmayan Alan Adı Oluştur
         create_user_role: Rol Oluştur
         demote_user: Kullanıcıyı Düşür
         destroy_announcement: Duyuru Sil
+        destroy_canonical_email_block: E-Posta Engelini Sil
         destroy_custom_emoji: Özel İfadeyi Sil
         destroy_domain_allow: İzin Verilen Alan Adını Sil
         destroy_domain_block: Engellenen Alan Adını Sil
+        destroy_email_domain_block: E-posta Alan Adı Engelini Sil
         destroy_instance: Alan adını temizle
         destroy_ip_block: IP kuralını sil
         destroy_status: Durumu Sil
@@ -191,8 +200,10 @@ tr:
         destroy_user_role: Rolü Kaldır
         disable_2fa_user: 2AD Kapat
         disable_custom_emoji: Özel İfadeyi Devre Dışı Bırak
+        disable_sign_in_token_auth_user: Kullanıcı için E-posta Token Doğrulamayı Devre Dışı Bırak
         disable_user: Kullanıcıyı Devre Dışı Bırak
         enable_custom_emoji: Özel İfadeyi Etkinleştir
+        enable_sign_in_token_auth_user: Kullanıcı için E-posta Token Doğrulamayı Etkinleştir
         enable_user: Kullanıcıyı Etkinleştir
         memorialize_account: Hesabı Anıtlaştır
         promote_user: Kullanıcıyı Yükselt
@@ -222,20 +233,26 @@ tr:
         approve_appeal_html: "%{name}, %{target} kullanıcısının yönetim kararına itirazını kabul etti"
         approve_user_html: "%{name}, %{target} konumundan kaydı onayladı"
         assigned_to_self_report_html: "%{name} kendilerine %{target} adlı raporu verdi"
+        change_email_user_html: "%{name}, %{target} kullanıcısının e-posta adresini değiştirdi"
         change_role_user_html: "%{name}, %{target} kişisinin rolünü değiştirdi"
+        confirm_user_html: "%{name} %{target} kullanıcısının e-posta adresini onayladı"
         create_account_warning_html: "%{name} %{target} 'a bir uyarı gönderdi"
         create_announcement_html: "%{name}, yeni %{target} duyurusunu oluşturdu"
+        create_canonical_email_block_html: "%{name}, %{target} karmasıyla e-posta engelledi"
         create_custom_emoji_html: "%{name} yeni %{target} ifadesini yükledi"
         create_domain_allow_html: "%{name}, %{target} alan adıyla birliğe izin verdi"
         create_domain_block_html: "%{name}, %{target} alan adını engelledi"
+        create_email_domain_block_html: "%{name}, %{target} e-posta alan adını engelledi"
         create_ip_block_html: "%{name}, %{target} IP adresi için kural oluşturdu"
         create_unavailable_domain_html: "%{name}, %{target} alan adına teslimatı durdurdu"
         create_user_role_html: "%{name}, %{target} rolünü oluşturdu"
         demote_user_html: "%{name}, %{target} kullanıcısını düşürdü"
         destroy_announcement_html: "%{name}, %{target} duyurusunu sildi"
+        destroy_canonical_email_block_html: "%{name}, %{target} karmasıyla e-posta engelini kaldırdı"
         destroy_custom_emoji_html: "%{name}, %{target} ifadesini sildi"
         destroy_domain_allow_html: "%{name}, %{target} alan adıyla birlik iznini kaldırdı"
         destroy_domain_block_html: "%{name}, %{target} alan adı engelini kaldırdı"
+        destroy_email_domain_block_html: "%{name}, %{target} e-posta alan adı engelini kaldırdı"
         destroy_instance_html: "%{name}, %{target} alan adını temizledi"
         destroy_ip_block_html: "%{name}, %{target} IP adresi kuralını sildi"
         destroy_status_html: "%{name}, %{target} kullanıcısının gönderisini kaldırdı"
@@ -243,8 +260,10 @@ tr:
         destroy_user_role_html: "%{name}, %{target} rolünü sildi"
         disable_2fa_user_html: "%{name}, %{target} kullanıcısının iki aşamalı doğrulama gereksinimini kapattı"
         disable_custom_emoji_html: "%{name}, %{target} emojisini devre dışı bıraktı"
+        disable_sign_in_token_auth_user_html: "%{name}, %{target} için e-posta token doğrulamayı devre dışı bıraktı"
         disable_user_html: "%{name}, %{target} kullanıcısı için oturum açmayı devre dışı bıraktı"
         enable_custom_emoji_html: "%{name}, %{target} emojisini etkinleştirdi"
+        enable_sign_in_token_auth_user_html: "%{name}, %{target} için e-posta token doğrulamayı etkinleştirdi"
         enable_user_html: "%{name}, %{target} kullanıcısı için oturum açmayı etkinleştirdi"
         memorialize_account_html: "%{name}, %{target} kullanıcısının hesabını bir anıt sayfaya dönüştürdü"
         promote_user_html: "%{name}, %{target} kullanıcısını yükseltti"
@@ -252,6 +271,7 @@ tr:
         reject_user_html: "%{name}, %{target} konumundan kaydı reddetti"
         remove_avatar_user_html: "%{name}, %{target} kullanıcısının avatarını kaldırdı"
         reopen_report_html: "%{name}, %{target} şikayetini yeniden açtı"
+        resend_user_html: "%{name}, %{target} için doğrulama e-postasını tekrar gönderdi"
         reset_password_user_html: "%{name}, %{target} kullanıcısının parolasını sıfırladı"
         resolve_report_html: "%{name}, %{target} şikayetini çözdü"
         sensitive_account_html: "%{name}, %{target} kullanıcısının medyasını hassas olarak işaretledi"
@@ -412,6 +432,7 @@ tr:
       attempts_over_week:
         one: Son haftada %{count} deneme
         other: Son haftada %{count} kayıt denemesi
+      created_msg: E-posta alan adı kara listeye başarıyla eklendi
       delete: Sil
       dns:
         types:
@@ -420,8 +441,12 @@ tr:
       new:
         create: Alan adı ekle
         resolve: Alan adı çözümleme
+        title: Yeni e-posta kara liste girişi
+      no_email_domain_block_selected: Seçim yapılmadığından hiç bir e-posta alan adı engeli değiştirilmedi
       not_permitted: İzin verilmedi
+      resolved_dns_records_hint_html: Alan adı aşağıdaki MX alan adlarına çözümleniyor, ancak hiç biri nihayetinde e-posta kabulünden sorum değil. Bir MX alan adını engellemek, görünen alan adı farklı osa bile aynı MX alan adını kullanan e-posta adreslerinden gelen kayıtları engelleyecektir. <strong>Başlıca e-posta sağlayıcıları engellememek için dikkatli olun.</strong>
       resolved_through_html: "%{domain} aracılığıyla çözümlendi"
+      title: Engelli e-posta alan adları
     export_domain_allows:
       new:
         title: Alan adı engellerini içe aktar
@@ -575,6 +600,7 @@ tr:
         resolve_description_html: Bildirilen hesap için bir şey yapılmayacak, eylem kaydedilmeyecek ve bildirim kapatılacak.
         silence_description_html: Bu hesap sadece halihazırda takip edenler ve elle bakanlarca görünecek, böylece erişimi ciddi bir şekilde kısıtlanacak. Her zaman geri alınabilir. Bu hesaba yönelik tüm bildirimleri kapatır.
         suspend_description_html: Bu hesap ve tüm içeriği erişilmez olacak ve nihayetinde silinecek ve bu hesapla etkileşim mümkün olmayacaktır. 30 gün içinde geri alınabilir. Bu hesaba yönelik tüm bildiriimleri kapatır.
+      actions_description_html: Bu bildirimi çözmek için ne yapılması gerektiğine karar verin. Bildirilen hesap için ceza işlemi yaparsanız, <strong>İstenmeyen</strong> kategorisi seçilmemişse, onlara bir e-posta duyurusu gönderilecektir.
       actions_description_remote_html: Bu bildirimi çözmek için hangi eylemi yapmak istediğinize karar verin. Bu yalnızca <strong>sizin</strong> sunucunuzun bu uzak hesapla nasıl etkileşeğini ve içeriğiyle ne yapacağını etkiler.
       add_to_report: Bildirime daha fazlasını ekle
       already_suspended_badges:
@@ -639,6 +665,7 @@ tr:
         delete_data_html: İlgili sürede askıdan alınması kaldırılmazsa <strong>@%{acct}</strong> hesabının profilini ve içeriğini şu andan itibaren 30 gün içinde sil
         preview_preamble_html: "<strong>@%{acct}</strong> aşağıdaki içerikle bir uyarı alacaktır:"
         record_strike_html: "<strong>@%{acct}</strong> hesabına karşı bir eylem kaydet, böylece bu hesabın gelecekteki ihlallerini üst makama taşımanıza yardımcı olacaktır"
+        send_email_html: "<strong>@%{acct}</strong> adlı kullanıcıya uyarı e-maili gönder"
         warning_placeholder: İsteğe bağlı ek nedenden denetim eylemi.
       target_origin: Şikayet edilen hesabın kökeni
       title: Şikayetler
@@ -678,6 +705,7 @@ tr:
         manage_appeals: İtirazları Yönetme
         manage_appeals_description: Kullanıcıların denetleme eylemlerine itirazları gözden geçirmesine izin verir
         manage_blocks: Engelleri Yönetme
+        manage_blocks_description: Kullanıcıların e-posta sağlayıcıları ve IP adreslerini engellemesine izin verir
         manage_custom_emojis: Özel İfadeleri Yönetme
         manage_custom_emojis_description: Kullanıcıların sunucudaki özel ifadeleri yönetmesine izin verir
         manage_federation: Birleştirme Yönetme
@@ -695,6 +723,7 @@ tr:
         manage_taxonomies: Kategorileri Yönetme
         manage_taxonomies_description: Kullanıcıların öne çıkan içeriği incelemesine ve etiket ayarlarını güncellemesine izin verir
         manage_user_access: Kullanıcı Erişimini Yönetme
+        manage_user_access_description: Kullanıcıların, diğer kullanıcıların iki aşamalı yetkilendirme, e-posta adreslerini değiştirme ve parolalarını sıfırlama eylemlerini etkisizleştirmesine izin verir
         manage_users: Kullanıcıları Yönetme
         manage_users_description: Kullanıcıların, diğer kullanıcıların ayrıntılarını görüntülemesine ve onlara karşı denetim eylemleri gerçekleştirmesine izin verir
         manage_webhooks: Webhookları Yönetme
@@ -769,6 +798,7 @@ tr:
       destroyed_msg: Site yüklemesi başarıyla silindi!
     software_updates:
       critical_update: Kritik — lütfen hemen güncelleyin
+      description: Son düzeltme ve özelliklerden yararlanmak için Mastodon kurulumunu güncel tutmanızı öneriyoruz. Üstelik güvenlik sorunlarından kaçınmak için Mastodon'u zamanında güncellemek kritiktir. Bu nedenlerle Mastodon her 30 dakikada bir güncellemeleri denetler ve e-posta bildirim seçeneğinize göre size haber verir.
       documentation_link: Daha fazlası
       release_notes: Sürüm notları
       title: Mevcut güncellemeler
@@ -1031,7 +1061,9 @@ tr:
       guide_link_text: Herkes katkıda bulunabilir.
     sensitive_content: Hassas içerik
   application_mailer:
+    notification_preferences: E-posta tercihlerini değiştir
     salutation: "%{name},"
+    settings: 'E-posta tercihlerini değiştir: %{link}'
     unsubscribe: Abonelikten çık
     view: 'Görüntüle:'
     view_profile: Profili görüntüle
@@ -1051,6 +1083,7 @@ tr:
       hint_html: Sadece bir şey daha! Sizin bir insan olduğunuzu doğrulamamız gerekiyor (bu, spam'i dışarıda tutabilmemiz içindir!). Aşağıdaki CAPTCHA'yı çözün ve "Devam Et" düğmesini tıklayın.
       title: Güvenlik denetimi
     confirmations:
+      awaiting_review: E-posta adresiniz doğrulandı! %{domain} çalışanları şimdi kaydınızı inceliyorlar. Hesabınızı onayladıklarında bir e-posta alacaksınız!
       awaiting_review_title: Kaydınız inceleniyor
       clicking_this_link: bu bağlantıyı tıklamayı
       login_link: oturum aç
@@ -1058,6 +1091,7 @@ tr:
       redirect_to_app_html: "<strong>%{app_name}</strong> uygulamasına yönlendirileceksiniz. Eğer yönlendirme olmazsa, %{clicking_this_link} veya uygulamaya geri dönmeyi deneyin."
       registration_complete: "%{domain} sunucusunda kaydınız şimdi tamamlandı!"
       welcome_title: Hoşgeldin %{name}!
+      wrong_email_hint: Eğer bu e-posta adresi doğru değilse, hesap ayarlarında değiştirebilirsiniz.
     delete_account: Hesabı sil
     delete_account_html: Hesabını silmek istersen, <a href="%{path}">buradan devam edebilirsin</a>. Onay istenir.
     description:
@@ -1078,6 +1112,7 @@ tr:
     or_log_in_with: 'Veya şununla oturum açın:'
     privacy_policy_agreement_html: <a href="%{privacy_policy_path}" target="_blank">Gizlilik politikasını</a> okudum ve kabul ettim
     progress:
+      confirm: E-postanızı onaylayın
       details: Ayrıntılarınız
       review: İncelememiz
       rules: Kabul kuralları
@@ -1099,8 +1134,10 @@ tr:
     security: Güvenlik
     set_new_password: Yeni parola belirle
     setup:
+      email_below_hint_html: İstenmeyenler dizininize bakın veya başka bir onay bağlantısı isteyin. Eğer yanlışsa e-posta adresinizi de düzeltebilirsiniz.
       email_settings_hint_html: "%{email} adresinizi doğrulamak için size gönderdiğimiz bağlantıya tıklayın. Biz burada bekliyoruz."
       link_not_received: Bağlantı gelmedi mi?
+      new_confirmation_instructions_sent: Birkaç dakika içerisinde onaylama bağlantısını içeren yeni bir e-posta alacaksınız!
       title: Gelen kutunuzu kontrol edin
     sign_in:
       preamble_html: "<strong>%{domain}</strong> kimlik bilgilerinizi kullanarak giriş yapın. Eğer hesabınız başka bir sunucuda barındırılıyorsa, burada giriş yapamazsınız."
@@ -1111,7 +1148,9 @@ tr:
       title: "%{domain} için kurulumunuzu yapalım."
     status:
       account_status: Hesap durumu
+      confirming: E-posta onaylamanın tamamlanması bekleniyor.
       functional: Hesabınız tamamen kullanıma hazır.
+      pending: Başvurunuz personelimiz tarafından gözden geçirilmeyi beklemektedir. Bu biraz zaman alabilir. Başvurunuz onaylanırsa bir e-posta alacaksınız.
       redirecting_to: Hesabınız aktif değil çünkü şu anda %{acct} adresine yönlendirilmektedir.
       self_destruct: "%{domain} kapandığı için, hesabınıza sadece kısıtlı erişiminiz olacak."
       view_strikes: Hesabınıza yönelik eski eylemleri görüntüleyin
@@ -1154,6 +1193,9 @@ tr:
       before: 'Devam etmeden önce, lütfen bu notları dikkatlice okuyun:'
       caches: Diğer sunucular tarafından ön belleğe alınan içerik kalabilir
       data_removal: Gönderileriniz ve diğer verileriniz kalıcı olarak silinecektir
+      email_change_html: Hesabınızı silmeden <a href="%{path}">e-posta adresinizi değiştirebilirsiniz</a>
+      email_contact_html: Eğer hala ulaşmazsa, yardım almak için <a href="mailto:%{email}">%{email}</a> adresine e-posta gönderebilirsiniz
+      email_reconfirmation_html: Eğer onaylama e-postası ulaşmıyorsa, <a href="%{path}">tekrar talep edebilirsiniz</a>
       irreversible: Hesabınızı geri yükleyemeyecek ya da yeniden etkinleştiremeyeceksiniz
       more_details_html: Daha fazla ayrıntı için, <a href="%{terms_path}">gizlilik politikası</a>na göz atın.
       username_available: Kullanıcı adınız tekrar kullanılabilir olacaktır
@@ -1386,6 +1428,7 @@ tr:
     authentication_methods:
       otp: iki aşamalı kimlik doğrulama uygulaması
       password: parola
+      sign_in_token: e-posta güvenlik kodu
       webauthn: güvenlik anahtarları
     description_html: Eğer tanımadığınız bir faaliyet görüyorsanız, parolanızı değiştirmeyi ve iki aşamalı kimlik doğrulamayı etkinleştirmeyi düşünün.
     empty: Kimlik doğrulama geçmişi yok
@@ -1396,6 +1439,16 @@ tr:
     unsubscribe:
       action: Evet, abonelikten çık
       complete: Abonelikten çık
+      confirmation_html: '%{domain} üzerindeki Mastodon için %{type} almayı durdurarak %{email} adresinize aboneliğinizi iptal etmek istediğinizden emin misiniz? <a href="%{settings_path}">e-posta bildirim ayarlarınızdan</a> her zaman yeniden abone olabilirsiniz.'
+      emails:
+        notification_emails:
+          favourite: favori bildirim e-postaları
+          follow: takip bildirim e-postaları
+          follow_request: takip isteği bildirim e-postaları
+          mention: bahsetme bildirim e-postaları
+          reblog: öne çıkanlar bildirim e-postaları
+      resubscribe_html: Abonelikten yanlışlıkla çıktıysanız, <a href="%{settings_path}">e-posta bildirim ayarlarınızdan</a> yeniden abone olabilirsiniz.
+      success_html: Artık %{email} adresindeki e-postanıza %{domain} üzerindeki Mastodon için %{type} almayacaksınız.
       title: Abonelikten çık
   media_attachments:
     validations:
@@ -1476,6 +1529,8 @@ tr:
     update:
       subject: "%{name} bir gönderiyi düzenledi"
   notifications:
+    administration_emails: Yönetici e-posta bildirimleri
+    email_events: E-posta bildirimi etkinlikleri
     email_events_hint: 'Bildirim almak istediğiniz olayları seçin:'
   number:
     human:
@@ -1634,6 +1689,7 @@ tr:
     import: İçe aktar
     import_and_export: İçe ve dışa aktar
     migrate: Hesap taşıma
+    notifications: E-posta bildirimleri
     preferences: Tercihler
     profile: Profil
     relationships: Takip edilenler ve takipçiler
@@ -1880,6 +1936,7 @@ tr:
     invalid_otp_token: Geçersiz iki adımlı doğrulama kodu
     otp_lost_help_html: Her ikisine de erişiminizi kaybettiyseniz, %{email} ile irtibata geçebilirsiniz
     rate_limited: Çok fazla kimlik doğrulama denemesi. Daha sonra tekrar deneyin.
+    seamless_external_login: Harici bir servis aracılığıyla oturum açtınız, bu nedenle parola ve e-posta ayarları mevcut değildir.
     signed_in_as: 'Oturum açtı:'
   verification:
     extra_instructions_html: <strong>İpucu:</strong> Web sitenizdeki bağlantı görünmez olabilir. Önemli olan, kullanıcı tarafından oluşturulan içeriğe sahip web sitelerinde kimliğe bürünmeyi önleyen <code>rel="me"</code>'dir. Sayfa başlığında <code>a</code> yerine bir <code>bağlantı</code> etiketi de kullanabilirsiniz, ancak HTML'ye JavaScript çalıştırılmadan erişilebilir olmalıdır.

From 2ed13071ef110f3d7d11938e760fde7cabf58388 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 13 Aug 2024 10:48:10 +0200
Subject: [PATCH 1822/2191] Fix what was intended as a comment being
 interpreted as strings (#31398)

---
 app/services/notify_service.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/services/notify_service.rb b/app/services/notify_service.rb
index 788381fe6b10e8..695f4153c6c1a1 100644
--- a/app/services/notify_service.rb
+++ b/app/services/notify_service.rb
@@ -5,6 +5,7 @@ class NotifyService < BaseService
 
   MAXIMUM_GROUP_SPAN_HOURS = 12
 
+  # TODO: the severed_relationships type probably warrants email notifications
   NON_EMAIL_TYPES = %i(
     admin.report
     admin.sign_up
@@ -12,7 +13,6 @@ class NotifyService < BaseService
     poll
     status
     moderation_warning
-    # TODO: this probably warrants an email notification
     severed_relationships
   ).freeze
 

From 2b1670da48ea532300db79a82f0e6e4202f5b337 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 13 Aug 2024 19:48:28 +0200
Subject: [PATCH 1823/2191] Fix modal border and padding inconsistencies
 (#31399)

---
 app/javascript/styles/mastodon/components.scss | 9 +++++----
 app/javascript/styles/mastodon/variables.scss  | 1 +
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 995568e14757a3..6ef498c79be455 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -2837,7 +2837,7 @@ $ui-header-logo-wordmark-width: 99px;
   overflow: hidden;
 }
 
-@media screen and (width >= 631px) {
+@media screen and (width > $mobile-breakpoint) {
   .columns-area {
     padding: 0;
   }
@@ -5736,7 +5736,7 @@ a.status-card {
   user-select: text;
   display: flex;
 
-  @media screen and (width <= 630px) {
+  @media screen and (width <= $mobile-breakpoint) {
     margin-top: auto;
   }
 }
@@ -6095,7 +6095,7 @@ a.status-card {
     border-radius: 0 0 16px 16px;
     border-top: 0;
 
-    @media screen and (max-width: $no-gap-breakpoint) {
+    @media screen and (max-width: $mobile-breakpoint) {
       border-radius: 0;
       border-bottom: 0;
       padding-bottom: 32px;
@@ -9097,8 +9097,9 @@ noscript {
   backdrop-filter: var(--background-filter);
   border: 1px solid var(--modal-border-color);
   padding: 24px;
+  box-sizing: border-box;
 
-  @media screen and (max-width: $no-gap-breakpoint) {
+  @media screen and (max-width: $mobile-breakpoint) {
     border-radius: 16px 16px 0 0;
     border-bottom: 0;
     padding-bottom: 32px;
diff --git a/app/javascript/styles/mastodon/variables.scss b/app/javascript/styles/mastodon/variables.scss
index 2ba3dfb49d67bf..92b4770fe3804d 100644
--- a/app/javascript/styles/mastodon/variables.scss
+++ b/app/javascript/styles/mastodon/variables.scss
@@ -88,6 +88,7 @@ $media-modal-media-max-width: 100%;
 $media-modal-media-max-height: 80%;
 
 $no-gap-breakpoint: 1175px;
+$mobile-breakpoint: 630px;
 
 $font-sans-serif: 'mastodon-font-sans-serif' !default;
 $font-display: 'mastodon-font-display' !default;

From c3e1d86d589d4f54df6d5b2752822aa7b577bf29 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Tue, 13 Aug 2024 19:49:23 +0200
Subject: [PATCH 1824/2191] Fix log out from user menu not working on Safari
 (#31402)

---
 app/controllers/auth/sessions_controller.rb   | 11 ++++
 .../confirmation_modals/log_out.tsx           |  2 +-
 app/javascript/mastodon/utils/log_out.ts      | 50 +++++++------------
 spec/requests/log_out_spec.rb                 | 30 +++++++++++
 spec/system/log_out_spec.rb                   | 43 ++++++++++++++++
 5 files changed, 102 insertions(+), 34 deletions(-)
 create mode 100644 spec/requests/log_out_spec.rb
 create mode 100644 spec/system/log_out_spec.rb

diff --git a/app/controllers/auth/sessions_controller.rb b/app/controllers/auth/sessions_controller.rb
index 6210e4dbf9a721..a2fed644fe7f10 100644
--- a/app/controllers/auth/sessions_controller.rb
+++ b/app/controllers/auth/sessions_controller.rb
@@ -187,4 +187,15 @@ def on_authentication_failure(user, security_measure, failure_reason)
   def second_factor_attempts_key(user)
     "2fa_auth_attempts:#{user.id}:#{Time.now.utc.hour}"
   end
+
+  def respond_to_on_destroy
+    respond_to do |format|
+      format.json do
+        render json: {
+          redirect_to: after_sign_out_path_for(resource_name),
+        }, status: 200
+      end
+      format.all { super }
+    end
+  end
 end
diff --git a/app/javascript/mastodon/features/ui/components/confirmation_modals/log_out.tsx b/app/javascript/mastodon/features/ui/components/confirmation_modals/log_out.tsx
index 48d24182ed6d45..ec61146877e2f3 100644
--- a/app/javascript/mastodon/features/ui/components/confirmation_modals/log_out.tsx
+++ b/app/javascript/mastodon/features/ui/components/confirmation_modals/log_out.tsx
@@ -25,7 +25,7 @@ export const ConfirmLogOutModal: React.FC<BaseConfirmationModalProps> = ({
   const intl = useIntl();
 
   const onConfirm = useCallback(() => {
-    logOut();
+    void logOut();
   }, []);
 
   return (
diff --git a/app/javascript/mastodon/utils/log_out.ts b/app/javascript/mastodon/utils/log_out.ts
index b08a61a6a28162..f8e98f1be968c5 100644
--- a/app/javascript/mastodon/utils/log_out.ts
+++ b/app/javascript/mastodon/utils/log_out.ts
@@ -1,36 +1,20 @@
-export const logOut = () => {
-  const form = document.createElement('form');
+import api from 'mastodon/api';
 
-  const methodInput = document.createElement('input');
-  methodInput.setAttribute('name', '_method');
-  methodInput.setAttribute('value', 'delete');
-  methodInput.setAttribute('type', 'hidden');
-  form.appendChild(methodInput);
+export async function logOut() {
+  try {
+    const response = await api(false).delete<{ redirect_to?: string }>(
+      '/auth/sign_out',
+      { headers: { Accept: 'application/json' }, withCredentials: true },
+    );
 
-  const csrfToken = document.querySelector<HTMLMetaElement>(
-    'meta[name=csrf-token]',
-  );
-
-  const csrfParam = document.querySelector<HTMLMetaElement>(
-    'meta[name=csrf-param]',
-  );
-
-  if (csrfParam && csrfToken) {
-    const csrfInput = document.createElement('input');
-    csrfInput.setAttribute('name', csrfParam.content);
-    csrfInput.setAttribute('value', csrfToken.content);
-    csrfInput.setAttribute('type', 'hidden');
-    form.appendChild(csrfInput);
+    if (response.status === 200 && response.data.redirect_to)
+      window.location.href = response.data.redirect_to;
+    else
+      console.error(
+        'Failed to log out, got an unexpected non-redirect response from the server',
+        response,
+      );
+  } catch (error) {
+    console.error('Failed to log out, response was an error', error);
   }
-
-  const submitButton = document.createElement('input');
-  submitButton.setAttribute('type', 'submit');
-  form.appendChild(submitButton);
-
-  form.method = 'post';
-  form.action = '/auth/sign_out';
-  form.style.display = 'none';
-
-  document.body.appendChild(form);
-  submitButton.click();
-};
+}
diff --git a/spec/requests/log_out_spec.rb b/spec/requests/log_out_spec.rb
new file mode 100644
index 00000000000000..62ca1ac54728b3
--- /dev/null
+++ b/spec/requests/log_out_spec.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'Log Out' do
+  include RoutingHelper
+
+  describe 'DELETE /auth/sign_out' do
+    let(:user) { Fabricate(:user) }
+
+    before do
+      sign_in user
+    end
+
+    it 'Logs out the user and redirect' do
+      delete '/auth/sign_out'
+
+      expect(response).to redirect_to('/auth/sign_in')
+    end
+
+    it 'Logs out the user and return a page to redirect to with a JSON request' do
+      delete '/auth/sign_out', headers: { 'HTTP_ACCEPT' => 'application/json' }
+
+      expect(response).to have_http_status(200)
+      expect(response.media_type).to eq 'application/json'
+
+      expect(body_as_json[:redirect_to]).to eq '/auth/sign_in'
+    end
+  end
+end
diff --git a/spec/system/log_out_spec.rb b/spec/system/log_out_spec.rb
new file mode 100644
index 00000000000000..376f19712e140e
--- /dev/null
+++ b/spec/system/log_out_spec.rb
@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'Log out' do
+  include ProfileStories
+
+  before do
+    as_a_logged_in_user
+  end
+
+  describe 'Logging out from the preferences' do
+    it 'logs the user out' do
+      visit settings_path
+
+      within '.sidebar' do
+        click_on 'Logout'
+      end
+
+      expect(page).to have_title(I18n.t('auth.login'))
+      expect(page).to have_current_path('/auth/sign_in')
+    end
+  end
+
+  describe 'Logging out from the JS app', :js, :streaming do
+    it 'logs the user out' do
+      visit root_path
+
+      within '.navigation-bar' do
+        click_on 'Menu'
+      end
+
+      within '.dropdown-menu' do
+        click_on 'Logout'
+      end
+
+      click_on 'Log out'
+
+      expect(page).to have_title(I18n.t('auth.login'))
+      expect(page).to have_current_path('/auth/sign_in')
+    end
+  end
+end

From 12582d095ed7f4a40bb95d94560b9bc9928b813e Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 13 Aug 2024 21:32:27 +0200
Subject: [PATCH 1825/2191] Fix styling of notification browser permission
 denied banner (#31406)

---
 .../notifications/components/column_settings.jsx     | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/javascript/mastodon/features/notifications/components/column_settings.jsx b/app/javascript/mastodon/features/notifications/components/column_settings.jsx
index d511c5365fcc96..359f0fb1266d54 100644
--- a/app/javascript/mastodon/features/notifications/components/column_settings.jsx
+++ b/app/javascript/mastodon/features/notifications/components/column_settings.jsx
@@ -45,14 +45,18 @@ class ColumnSettings extends PureComponent {
 
     return (
       <div className='column-settings'>
-        {alertsEnabled && browserSupport && browserPermission === 'denied' && (
-          <span className='warning-hint'><FormattedMessage id='notifications.permission_denied' defaultMessage='Desktop notifications are unavailable due to previously denied browser permissions request' /></span>
-        )}
-
         <section>
           <ClearColumnButton onClick={onClear} />
         </section>
 
+        {alertsEnabled && browserSupport && browserPermission === 'denied' && (
+          <section>
+            <span className='warning-hint'>
+              <FormattedMessage id='notifications.permission_denied' defaultMessage='Desktop notifications are unavailable due to previously denied browser permissions request' />
+            </span>
+          </section>
+        )}
+
         {alertsEnabled && browserSupport && browserPermission === 'default' && (
           <section>
             <span className='warning-hint'>

From 3a787d785c1bac120304e0e5a0c6353f93acd92c Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 13 Aug 2024 20:09:38 +0000
Subject: [PATCH 1826/2191] Update docker/build-push-action action to v6
 (#31381)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .github/workflows/build-container-image.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-container-image.yml b/.github/workflows/build-container-image.yml
index dbb32af9bf5487..03a0f5bf37b81b 100644
--- a/.github/workflows/build-container-image.yml
+++ b/.github/workflows/build-container-image.yml
@@ -85,7 +85,7 @@ jobs:
           tags: ${{ inputs.tags }}
           labels: ${{ inputs.labels }}
 
-      - uses: docker/build-push-action@v5
+      - uses: docker/build-push-action@v6
         with:
           context: .
           file: ${{ inputs.file_to_build }}

From 2e85167188bcded572c5839bcabdf1c920fbd927 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 13 Aug 2024 17:37:26 -0400
Subject: [PATCH 1827/2191] Only run PR rebase needed check on non-fork repos
 (#31401)

---
 .github/workflows/rebase-needed.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/rebase-needed.yml b/.github/workflows/rebase-needed.yml
index 8784397a8fb03d..f0fc8b0db729e3 100644
--- a/.github/workflows/rebase-needed.yml
+++ b/.github/workflows/rebase-needed.yml
@@ -10,6 +10,7 @@ permissions:
 jobs:
   label-rebase-needed:
     runs-on: ubuntu-latest
+    if: github.repository == 'mastodon/mastodon'
 
     concurrency:
       group: ${{ github.workflow }}-${{ github.ref }}

From d7674392059f8a3939fdfa8d835b1d31f883c094 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 13 Aug 2024 21:53:36 +0000
Subject: [PATCH 1828/2191] Update dependency axios to v1.7.4 [SECURITY]
 (#31409)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 08379101ba31fe..1df8452b461a23 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5188,13 +5188,13 @@ __metadata:
   linkType: hard
 
 "axios@npm:^1.4.0":
-  version: 1.7.3
-  resolution: "axios@npm:1.7.3"
+  version: 1.7.4
+  resolution: "axios@npm:1.7.4"
   dependencies:
     follow-redirects: "npm:^1.15.6"
     form-data: "npm:^4.0.0"
     proxy-from-env: "npm:^1.1.0"
-  checksum: 10c0/a18cbe559203efa05fb1fec2d1898e23bf6329bd2575784ee32aa11b5bbe1d54b9f472c49a261294125519cf62aa4fe5ef6e647bb7482eafc15bffe15ab314ce
+  checksum: 10c0/5ea1a93140ca1d49db25ef8e1bd8cfc59da6f9220159a944168860ad15a2743ea21c5df2967795acb15cbe81362f5b157fdebbea39d53117ca27658bab9f7f17
   languageName: node
   linkType: hard
 

From 7d4b602cb28675da01df6ae27faacff8d70c1711 Mon Sep 17 00:00:00 2001
From: Michael Stanclift <mx@vmstan.com>
Date: Tue, 13 Aug 2024 16:54:03 -0500
Subject: [PATCH 1829/2191] Fix collapsable column borders in Safari and
 improve Safari scrollbars (#31389)

---
 .../styles/mastodon/components.scss           | 15 +++++----
 app/javascript/styles/mastodon/reset.scss     | 31 ++++---------------
 2 files changed, 15 insertions(+), 31 deletions(-)

diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 6ef498c79be455..b049635d163a8d 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -4503,10 +4503,19 @@ a.status-card {
   opacity: 1;
   z-index: 1;
   position: relative;
+  border-left: 1px solid var(--background-border-color);
+  border-right: 1px solid var(--background-border-color);
+  border-bottom: 1px solid var(--background-border-color);
+
+  @media screen and (max-width: $no-gap-breakpoint) {
+    border-left: 0;
+    border-right: 0;
+  }
 
   &.collapsed {
     max-height: 0;
     opacity: 0.5;
+    border-bottom: 0;
   }
 
   &.animating {
@@ -4523,13 +4532,7 @@ a.status-card {
 }
 
 .column-header__collapsible-inner {
-  border: 1px solid var(--background-border-color);
   border-top: 0;
-
-  @media screen and (max-width: $no-gap-breakpoint) {
-    border-left: 0;
-    border-right: 0;
-  }
 }
 
 .column-header__setting-btn {
diff --git a/app/javascript/styles/mastodon/reset.scss b/app/javascript/styles/mastodon/reset.scss
index f54ed5bc79b1a7..f8a4a08ced6d3a 100644
--- a/app/javascript/styles/mastodon/reset.scss
+++ b/app/javascript/styles/mastodon/reset.scss
@@ -54,40 +54,21 @@ table {
 }
 
 html {
-  scrollbar-color: lighten($ui-base-color, 4%) rgba($base-overlay-background, 0.1);
+  scrollbar-color: var(--background-border-color);
 }
 
 ::-webkit-scrollbar {
-  width: 12px;
-  height: 12px;
+  width: 4px;
+  height: 4px;
 }
 
 ::-webkit-scrollbar-thumb {
-  background: lighten($ui-base-color, 4%);
-  border: 0px none $base-border-color;
-  border-radius: 50px;
-}
-
-::-webkit-scrollbar-thumb:hover {
-  background: lighten($ui-base-color, 6%);
-}
-
-::-webkit-scrollbar-thumb:active {
-  background: lighten($ui-base-color, 4%);
+  background-color: $ui-highlight-color;
+  opacity: .25;
 }
 
 ::-webkit-scrollbar-track {
-  border: 0px none $base-border-color;
-  border-radius: 0;
-  background: rgba($base-overlay-background, 0.1);
-}
-
-::-webkit-scrollbar-track:hover {
-  background: $ui-base-color;
-}
-
-::-webkit-scrollbar-track:active {
-  background: $ui-base-color;
+  background-color: var(--background-border-color);
 }
 
 ::-webkit-scrollbar-corner {

From 6bd7da72e9394eca4a8ee1addaad1a5118d50881 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 13 Aug 2024 22:28:13 +0000
Subject: [PATCH 1830/2191] Update crowdin/github-action action to v2 (#31380)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .github/workflows/crowdin-download.yml | 2 +-
 .github/workflows/crowdin-upload.yml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/crowdin-download.yml b/.github/workflows/crowdin-download.yml
index e9da7cb26f94cc..0faa7e4939fa7f 100644
--- a/.github/workflows/crowdin-download.yml
+++ b/.github/workflows/crowdin-download.yml
@@ -26,7 +26,7 @@ jobs:
 
       # Download the translation files from Crowdin
       - name: crowdin action
-        uses: crowdin/github-action@v1
+        uses: crowdin/github-action@v2
         with:
           upload_sources: false
           upload_translations: false
diff --git a/.github/workflows/crowdin-upload.yml b/.github/workflows/crowdin-upload.yml
index c1da4088e931ce..b7a0a2b8199e06 100644
--- a/.github/workflows/crowdin-upload.yml
+++ b/.github/workflows/crowdin-upload.yml
@@ -26,7 +26,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: crowdin action
-        uses: crowdin/github-action@v1
+        uses: crowdin/github-action@v2
         with:
           upload_sources: true
           upload_translations: false

From 0d85a79f19fef0c604e8fecfd5dfa9654adc4b95 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Wed, 14 Aug 2024 08:47:15 +0200
Subject: [PATCH 1831/2191] Fix notification screen crashing in rare cases
 where the status no longer exists (#31403)

---
 app/javascript/mastodon/actions/notification_groups.ts      | 4 ++--
 app/javascript/mastodon/api_types/notifications.ts          | 4 ++--
 .../notifications_v2/components/notification_mention.tsx    | 6 +++++-
 .../components/notification_with_status.tsx                 | 4 +++-
 app/javascript/mastodon/models/notification_group.ts        | 6 +++---
 5 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/app/javascript/mastodon/actions/notification_groups.ts b/app/javascript/mastodon/actions/notification_groups.ts
index ab62f8715c4355..fd6a48e9f37727 100644
--- a/app/javascript/mastodon/actions/notification_groups.ts
+++ b/app/javascript/mastodon/actions/notification_groups.ts
@@ -47,7 +47,7 @@ function dispatchAssociatedRecords(
       fetchedAccounts.push(notification.moderation_warning.target_account);
     }
 
-    if ('status' in notification) {
+    if ('status' in notification && notification.status) {
       fetchedStatuses.push(notification.status);
     }
   });
@@ -119,7 +119,7 @@ export const processNewNotificationForGroups = createAppAsyncThunk(
 
     if (
       (notification.type === 'mention' || notification.type === 'update') &&
-      notification.status.filtered
+      notification.status?.filtered
     ) {
       const filters = notification.status.filtered.filter((result) =>
         result.filter.context.includes('notifications'),
diff --git a/app/javascript/mastodon/api_types/notifications.ts b/app/javascript/mastodon/api_types/notifications.ts
index ed73ceda6b332d..4ab9a4c90a7388 100644
--- a/app/javascript/mastodon/api_types/notifications.ts
+++ b/app/javascript/mastodon/api_types/notifications.ts
@@ -60,12 +60,12 @@ export interface BaseNotificationGroupJSON {
 
 interface NotificationGroupWithStatusJSON extends BaseNotificationGroupJSON {
   type: NotificationWithStatusType;
-  status_id: string;
+  status_id: string | null;
 }
 
 interface NotificationWithStatusJSON extends BaseNotificationJSON {
   type: NotificationWithStatusType;
-  status: ApiStatusJSON;
+  status: ApiStatusJSON | null;
 }
 
 interface ReportNotificationGroupJSON extends BaseNotificationGroupJSON {
diff --git a/app/javascript/mastodon/features/notifications_v2/components/notification_mention.tsx b/app/javascript/mastodon/features/notifications_v2/components/notification_mention.tsx
index b7cd995118a688..1929446bb22f94 100644
--- a/app/javascript/mastodon/features/notifications_v2/components/notification_mention.tsx
+++ b/app/javascript/mastodon/features/notifications_v2/components/notification_mention.tsx
@@ -37,7 +37,11 @@ export const NotificationMention: React.FC<{
   unread: boolean;
 }> = ({ notification, unread }) => {
   const [isDirect, isReply] = useAppSelector((state) => {
-    const status = state.statuses.get(notification.statusId) as Status;
+    const status = state.statuses.get(notification.statusId) as
+      | Status
+      | undefined;
+
+    if (!status) return [false, false] as const;
 
     return [
       status.get('visibility') === 'direct',
diff --git a/app/javascript/mastodon/features/notifications_v2/components/notification_with_status.tsx b/app/javascript/mastodon/features/notifications_v2/components/notification_with_status.tsx
index c7dd9f6be2e320..5d5cb98185bdf2 100644
--- a/app/javascript/mastodon/features/notifications_v2/components/notification_with_status.tsx
+++ b/app/javascript/mastodon/features/notifications_v2/components/notification_with_status.tsx
@@ -23,7 +23,7 @@ export const NotificationWithStatus: React.FC<{
   icon: IconProp;
   iconId: string;
   accountIds: string[];
-  statusId: string;
+  statusId: string | undefined;
   count: number;
   labelRenderer: LabelRenderer;
   unread: boolean;
@@ -76,6 +76,8 @@ export const NotificationWithStatus: React.FC<{
     [dispatch, statusId],
   );
 
+  if (!statusId) return null;
+
   return (
     <HotKeys handlers={handlers}>
       <div
diff --git a/app/javascript/mastodon/models/notification_group.ts b/app/javascript/mastodon/models/notification_group.ts
index 76034e644e9d8d..09d407d44954a3 100644
--- a/app/javascript/mastodon/models/notification_group.ts
+++ b/app/javascript/mastodon/models/notification_group.ts
@@ -21,7 +21,7 @@ interface BaseNotificationGroup
 interface BaseNotificationWithStatus<Type extends NotificationWithStatusType>
   extends BaseNotificationGroup {
   type: Type;
-  statusId: string;
+  statusId: string | undefined;
 }
 
 interface BaseNotification<Type extends NotificationType>
@@ -126,7 +126,7 @@ export function createNotificationGroupFromJSON(
     case 'update': {
       const { status_id: statusId, ...groupWithoutStatus } = group;
       return {
-        statusId,
+        statusId: statusId ?? undefined,
         sampleAccountIds,
         ...groupWithoutStatus,
       };
@@ -183,7 +183,7 @@ export function createNotificationGroupFromNotificationJSON(
     case 'mention':
     case 'poll':
     case 'update':
-      return { ...group, statusId: notification.status.id };
+      return { ...group, statusId: notification.status?.id };
     case 'admin.report':
       return { ...group, report: createReportFromJSON(notification.report) };
     case 'severed_relationships':

From feaf2f24377f01eef1929becc8270a979149bc40 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Wed, 14 Aug 2024 08:53:12 +0200
Subject: [PATCH 1832/2191] Update renovate config to fix #31379 (#31408)

---
 .github/renovate.json5 | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/.github/renovate.json5 b/.github/renovate.json5
index 2cf7bec8eebd21..968c77cac27108 100644
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -87,6 +87,7 @@
     },
     {
       // Update devDependencies every week, with one grouped PR
+      matchManagers: ['npm'],
       matchDepTypes: 'devDependencies',
       matchUpdateTypes: ['patch', 'minor'],
       groupName: 'devDependencies (non-major)',
@@ -95,8 +96,7 @@
     {
       // Group all eslint-related packages with `eslint` in the same PR
       matchManagers: ['npm'],
-      matchPackageNames: ['eslint'],
-      matchPackagePrefixes: ['eslint-', '@typescript-eslint/'],
+      matchPackageNames: ['eslint', 'eslint-*', '@typescript-eslint/*'],
       matchUpdateTypes: ['patch', 'minor'],
       groupName: 'eslint (non-major)',
     },
@@ -112,7 +112,8 @@
     },
     {
       // Update @types/* packages every week, with one grouped PR
-      matchPackagePrefixes: '@types/',
+      matchManagers: ['npm'],
+      matchPackageNames: '@types/*',
       matchUpdateTypes: ['patch', 'minor'],
       groupName: 'DefinitelyTyped types (non-major)',
       extends: ['schedule:weekly'],
@@ -129,23 +130,21 @@
     {
       // Group all RuboCop packages with `rubocop` in the same PR
       matchManagers: ['bundler'],
-      matchPackageNames: ['rubocop'],
-      matchPackagePrefixes: ['rubocop-'],
+      matchPackageNames: ['rubocop', 'rubocop-*'],
       matchUpdateTypes: ['patch', 'minor'],
       groupName: 'RuboCop (non-major)',
     },
     {
       // Group all RSpec packages with `rspec` in the same PR
       matchManagers: ['bundler'],
-      matchPackageNames: ['rspec'],
-      matchPackagePrefixes: ['rspec-'],
+      matchPackageNames: ['rspec', 'rspec-*'],
       matchUpdateTypes: ['patch', 'minor'],
       groupName: 'RSpec (non-major)',
     },
     {
       // Group all opentelemetry-ruby packages in the same PR
       matchManagers: ['bundler'],
-      matchPackagePrefixes: ['opentelemetry-'],
+      matchPackageNames: ['opentelemetry-*'],
       matchUpdateTypes: ['patch', 'minor'],
       groupName: 'opentelemetry-ruby (non-major)',
     },

From 202f43ccc658237bff7c8a072510e4bc20c980d1 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 14 Aug 2024 09:04:01 +0200
Subject: [PATCH 1833/2191] New Crowdin Translations (automated) (#31411)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/bg.json    |  8 ++
 app/javascript/mastodon/locales/cy.json    | 42 ++++++++++-
 app/javascript/mastodon/locales/eu.json    |  5 ++
 app/javascript/mastodon/locales/fr-CA.json |  1 +
 app/javascript/mastodon/locales/fr.json    |  1 +
 app/javascript/mastodon/locales/he.json    | 37 +++++++++-
 app/javascript/mastodon/locales/hu.json    |  2 +-
 app/javascript/mastodon/locales/nn.json    |  2 +
 config/locales/cy.yml                      | 86 +++++++++++++++++++---
 config/locales/he.yml                      | 13 +++-
 config/locales/nn.yml                      |  5 ++
 config/locales/simple_form.he.yml          |  4 +-
 12 files changed, 185 insertions(+), 21 deletions(-)

diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json
index f60e330d1c3a33..6687c64a6d1482 100644
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@@ -482,6 +482,8 @@
   "notification.favourite": "{name} направи любима публикацията ви",
   "notification.follow": "{name} ви последва",
   "notification.follow_request": "{name} поиска да ви последва",
+  "notification.label.mention": "Споменаване",
+  "notification.mention": "Споменаване",
   "notification.moderation-warning.learn_more": "Научете повече",
   "notification.moderation_warning": "Получихте предупреждение за модериране",
   "notification.moderation_warning.action_delete_statuses": "Някои от публикациите ви са премахнати.",
@@ -503,12 +505,15 @@
   "notification.update": "{name} промени публикация",
   "notification_requests.accept": "Приемам",
   "notification_requests.dismiss": "Отхвърлям",
+  "notification_requests.enter_selection_mode": "Изберете",
+  "notification_requests.exit_selection_mode": "Отказ",
   "notification_requests.explainer_for_limited_account": "Известията от този акаунт са прецедени, защото акаунтът е ограничен от модератор.",
   "notification_requests.explainer_for_limited_remote_account": "Известията от този акаунт са прецедени, защото акаунтът или сървърът му е ограничен от модератор.",
   "notification_requests.maximize": "Максимизиране",
   "notification_requests.minimize_banner": "Минимизиране на банера за филтрирани известия",
   "notification_requests.notifications_from": "Известия от {name}",
   "notification_requests.title": "Филтрирани известия",
+  "notification_requests.view": "Преглед на известията",
   "notifications.clear": "Изчистване на известията",
   "notifications.clear_confirmation": "Наистина ли искате да изчистите завинаги всичките си известия?",
   "notifications.clear_title": "Изчиствате ли известията?",
@@ -545,6 +550,9 @@
   "notifications.permission_denied": "Известията на работния плот не са налични поради предварително отказана заявка за разрешение в браузъра",
   "notifications.permission_denied_alert": "Известията на работния плот не могат да се включат, тъй като разрешението на браузъра е отказвано преди",
   "notifications.permission_required": "Известията на работния плот ги няма, щото няма дадено нужното позволение.",
+  "notifications.policy.accept": "Приемам",
+  "notifications.policy.accept_hint": "Показване в известия",
+  "notifications.policy.filter": "Филтър",
   "notifications.policy.filter_limited_accounts_hint": "Ограничено от модераторите на сървъра",
   "notifications.policy.filter_limited_accounts_title": "Модерирани акаунти",
   "notifications.policy.filter_new_accounts.hint": "Сътворено през {days, plural, one {последния ден} other {последните # дена}}",
diff --git a/app/javascript/mastodon/locales/cy.json b/app/javascript/mastodon/locales/cy.json
index 33cad6a2ab5e81..8b86b49e06f5ee 100644
--- a/app/javascript/mastodon/locales/cy.json
+++ b/app/javascript/mastodon/locales/cy.json
@@ -356,7 +356,17 @@
   "home.pending_critical_update.link": "Gweld y diweddariadau",
   "home.pending_critical_update.title": "Mae diweddariad diogelwch hanfodol ar gael!",
   "home.show_announcements": "Dangos cyhoeddiadau",
+  "ignore_notifications_modal.disclaimer": "Ni all Mastodon hysbysu defnyddwyr eich bod wedi anwybyddu eu hysbysiadau. Ni fydd anwybyddu hysbysiadau yn atal y negeseuon eu hunain rhag cael eu hanfon.",
+  "ignore_notifications_modal.filter_instead": "Hidlo yn lle hynny",
+  "ignore_notifications_modal.filter_to_act_users": "Byddwch yn dal i allu derbyn, gwrthod neu adrodd ar ddefnyddwyr",
+  "ignore_notifications_modal.filter_to_avoid_confusion": "Mae hidlo yn helpu i osgoi dryswch posibl",
+  "ignore_notifications_modal.filter_to_review_separately": "Gallwch adolygu hysbysiadau wedi'u hidlo ar wahân",
   "ignore_notifications_modal.ignore": "Anwybyddu hysbysiadau",
+  "ignore_notifications_modal.limited_accounts_title": "Anwybyddu hysbysiadau o gyfrifon wedi'u cymedroli?",
+  "ignore_notifications_modal.new_accounts_title": "Anwybyddu hysbysiadau o gyfrifon newydd?",
+  "ignore_notifications_modal.not_followers_title": "Anwybyddu hysbysiadau gan bobl nad ydynt yn eich dilyn?",
+  "ignore_notifications_modal.not_following_title": "Anwybyddu hysbysiadau gan bobl nad ydych yn eu dilyn?",
+  "ignore_notifications_modal.private_mentions_title": "Anwybyddu hysbysiadau o Grybwylliadau Preifat digymell?",
   "interaction_modal.description.favourite": "Gyda chyfrif ar Mastodon, gallwch chi hoffi'r postiad hwn er mwyn roi gwybod i'r awdur eich bod chi'n ei werthfawrogi ac yn ei gadw ar gyfer nes ymlaen.",
   "interaction_modal.description.follow": "Gyda chyfrif ar Mastodon, gallwch ddilyn {name} i dderbyn eu postiadau yn eich llif cartref.",
   "interaction_modal.description.reblog": "Gyda chyfrif ar Mastodon, gallwch hybu'r postiad hwn i'w rannu â'ch dilynwyr.",
@@ -475,6 +485,7 @@
   "navigation_bar.security": "Diogelwch",
   "not_signed_in_indicator.not_signed_in": "Rhaid i chi fewngofnodi i weld yr adnodd hwn.",
   "notification.admin.report": "Adroddwyd ar {name} {target}",
+  "notification.admin.report_account": "{name} reported {count, plural, one {un post} other {# postsiadau}} from {target} for {category}",
   "notification.admin.report_account_other": "Adroddodd {name} {count, plural, one {un post} two {# bost} few {# phost} other {# post}} gan {target}",
   "notification.admin.report_statuses": "Adroddodd {name} {target} ar gyfer {category}",
   "notification.admin.report_statuses_other": "Adroddodd {name} {target}",
@@ -484,6 +495,7 @@
   "notification.follow_request": "Mae {name} wedi gwneud cais i'ch dilyn",
   "notification.label.mention": "Crybwyll",
   "notification.label.private_mention": "Crybwyll preifat",
+  "notification.label.private_reply": "Ateb preifat",
   "notification.label.reply": "Ateb",
   "notification.mention": "Crybwyll",
   "notification.moderation-warning.learn_more": "Dysgu mwy",
@@ -506,11 +518,26 @@
   "notification.status": "{name} newydd ei bostio",
   "notification.update": "Golygodd {name} bostiad",
   "notification_requests.accept": "Derbyn",
+  "notification_requests.accept_all": "Derbyn y cyfan",
+  "notification_requests.accept_multiple": "{count, plural, one {Derbyn # cais} other {Derbyn # cais}}",
+  "notification_requests.confirm_accept_all.button": "Derbyn y cyfan",
+  "notification_requests.confirm_accept_all.message": "Rydych ar fin derbyn {count, plural, one {un cais hysbysu} other {# cais hysbysiad}}. A ydych yn siŵr eich bod am fwrw ymlaen?",
+  "notification_requests.confirm_accept_all.title": "Derbyn ceisiadau hysbysu?",
+  "notification_requests.confirm_dismiss_all.button": "Diystyru pob un",
+  "notification_requests.confirm_dismiss_all.message": "Rydych ar fin diystyru {count, plural, one {un cais hysbysu} other {# cais hysbysiad}}. Ni fyddwch yn gallu cyrchu {count, plural, one {it} other {them}} yn hawdd eto. A ydych yn siŵr eich bod am fwrw ymlaen?",
+  "notification_requests.confirm_dismiss_all.title": "Diystyru ceisiadau hysbysu?",
   "notification_requests.dismiss": "Cau",
+  "notification_requests.dismiss_all": "Diystyru pob un",
+  "notification_requests.dismiss_multiple": "{count, plural, one {Diystyru # cais} other {Diystyru # cais}}",
+  "notification_requests.enter_selection_mode": "Dewis",
   "notification_requests.exit_selection_mode": "Canslo",
+  "notification_requests.explainer_for_limited_account": "Mae hysbysiadau o'r cyfrif hwn wedi'u hidlo oherwydd bod y cyfrif wedi'i gyfyngu gan gymedrolwr.",
+  "notification_requests.explainer_for_limited_remote_account": "Mae hysbysiadau o'r cyfrif hwn wedi'u hidlo oherwydd bod y cyfrif neu ei weinydd wedi'i gyfyngu gan gymedrolwr.",
   "notification_requests.maximize": "Mwyhau",
+  "notification_requests.minimize_banner": "Lleihau baner hysbysiadau wedi'u hidlo",
   "notification_requests.notifications_from": "Hysbysiadau gan {name}",
   "notification_requests.title": "Hysbysiadau wedi'u hidlo",
+  "notification_requests.view": "Gweld hysbysiadau",
   "notifications.clear": "Clirio hysbysiadau",
   "notifications.clear_confirmation": "Ydych chi'n siŵr eich bod am glirio'ch holl hysbysiadau am byth?",
   "notifications.clear_title": "Clirio hysbysiadau?",
@@ -548,8 +575,13 @@
   "notifications.permission_denied_alert": "Nid oes modd galluogi hysbysiadau bwrdd gwaith, gan fod caniatâd porwr wedi'i wrthod o'r blaen",
   "notifications.permission_required": "Nid oes hysbysiadau bwrdd gwaith ar gael oherwydd na roddwyd y caniatâd gofynnol.",
   "notifications.policy.accept": "Derbyn",
+  "notifications.policy.accept_hint": "Dangos mewn hysbysiadau",
   "notifications.policy.drop": "Anwybyddu",
+  "notifications.policy.drop_hint": "Anfon i'r gwagle, byth i'w gweld eto",
   "notifications.policy.filter": "Hidlo",
+  "notifications.policy.filter_hint": "Anfon i flwch derbyn hysbysiadau wedi'u hidlo",
+  "notifications.policy.filter_limited_accounts_hint": "Cyfyngedig gan gymedrolwyr gweinydd",
+  "notifications.policy.filter_limited_accounts_title": "Cyfrifon wedi'u cymedroli",
   "notifications.policy.filter_new_accounts.hint": "Crëwyd o fewn {days, lluosog, un {yr un diwrnod} arall {y # diwrnod}} diwethaf",
   "notifications.policy.filter_new_accounts_title": "Cyfrifon newydd",
   "notifications.policy.filter_not_followers_hint": "Gan gynnwys pobl sydd wedi bod yn eich dilyn am llai  {days, plural, un {nag un diwrnod} arall {na # diwrnod}}",
@@ -558,19 +590,20 @@
   "notifications.policy.filter_not_following_title": "Pobl nad ydych yn eu dilyn",
   "notifications.policy.filter_private_mentions_hint": "Wedi'i hidlo oni bai ei fod mewn ymateb i'ch crybwylliad eich hun neu os ydych yn dilyn yr anfonwr",
   "notifications.policy.filter_private_mentions_title": "Crybwylliadau preifat digymell",
+  "notifications.policy.title": "Rheoli hysbysiadau gan…",
   "notifications_permission_banner.enable": "Galluogi hysbysiadau bwrdd gwaith",
   "notifications_permission_banner.how_to_control": "I dderbyn hysbysiadau pan nad yw Mastodon ar agor, galluogwch hysbysiadau bwrdd gwaith. Gallwch reoli'n union pa fathau o ryngweithiadau sy'n cynhyrchu hysbysiadau bwrdd gwaith trwy'r botwm {icon} uchod unwaith y byddan nhw wedi'u galluogi.",
   "notifications_permission_banner.title": "Peidiwch â cholli dim",
-  "onboarding.action.back": "Ewch â fi yn ôl",
-  "onboarding.actions.back": "Ewch â fi yn ôl",
-  "onboarding.actions.go_to_explore": "Gweld beth yw'r tuedd",
+  "onboarding.action.back": "Ewch â fi nôl",
+  "onboarding.actions.back": "Ewch â fi nôl",
+  "onboarding.actions.go_to_explore": "Gweld beth sy'n trendio",
   "onboarding.actions.go_to_home": "Ewch i'ch ffrwd gartref",
   "onboarding.compose.template": "Helo, #Mastodon!",
   "onboarding.follows.empty": "Yn anffodus, nid oes modd dangos unrhyw ganlyniadau ar hyn o bryd. Gallwch geisio defnyddio chwilio neu bori'r dudalen archwilio i ddod o hyd i bobl i'w dilyn, neu ceisio eto yn nes ymlaen.",
   "onboarding.follows.lead": "Rydych chi'n curadu eich ffrwd gartref eich hun. Po fwyaf o bobl y byddwch chi'n eu dilyn, y mwyaf egnïol a diddorol fydd hi. Gall y proffiliau hyn fod yn fan cychwyn da - gallwch chi bob amser eu dad-ddilyn yn nes ymlaen:",
   "onboarding.follows.title": "Yn boblogaidd ar Mastodon",
   "onboarding.profile.discoverable": "Gwnewch fy mhroffil yn un y gellir ei ddarganfod",
-  "onboarding.profile.discoverable_hint": "Pan fyddwch yn optio i mewn i ddarganfodadwyedd ar Mastodon, gall eich postiadau ymddangos mewn canlyniadau chwilio a thueddiadau, ac efallai y bydd eich proffil yn cael ei awgrymu i bobl sydd â diddordebau tebyg i chi.",
+  "onboarding.profile.discoverable_hint": "Pan fyddwch yn optio i mewn i ddarganfodadwyedd ar Mastodon, gall eich postiadau ymddangos mewn canlyniadau chwilio a threndiau, ac efallai y bydd eich proffil yn cael ei awgrymu i bobl sydd â diddordebau tebyg i chi.",
   "onboarding.profile.display_name": "Enw dangos",
   "onboarding.profile.display_name_hint": "Eich enw llawn neu'ch enw hwyl…",
   "onboarding.profile.lead": "Gallwch chi bob amser gwblhau hyn yn ddiweddarach yn y gosodiadau, lle mae hyd yn oed mwy o ddewisiadau cyfaddasu ar gael.",
@@ -798,6 +831,7 @@
   "timeline_hint.remote_resource_not_displayed": "Nid yw {resource} o weinyddion eraill yn cael ei ddangos.",
   "timeline_hint.resources.followers": "Dilynwyr",
   "timeline_hint.resources.follows": "Yn dilyn",
+  "timeline_hint.resources.replies": "Rhai atebion",
   "timeline_hint.resources.statuses": "Postiadau hŷn",
   "trends.counter_by_accounts": "{count, plural, zero {neb} one {{counter} person} two {{counter} berson} few {{counter} pherson} other {{counter} o bobl}} yn y {days, plural, one {diwrnod diwethaf} two {ddeuddydd diwethaf} other {{days} diwrnod diwethaf}}",
   "trends.trending_now": "Yn trendio nawr",
diff --git a/app/javascript/mastodon/locales/eu.json b/app/javascript/mastodon/locales/eu.json
index fdde3389794372..b2a8fe0da3e5f1 100644
--- a/app/javascript/mastodon/locales/eu.json
+++ b/app/javascript/mastodon/locales/eu.json
@@ -35,7 +35,9 @@
   "account.follow_back": "Jarraitu bueltan",
   "account.followers": "Jarraitzaileak",
   "account.followers.empty": "Ez du inork erabiltzaile hau jarraitzen oraindik.",
+  "account.followers_counter": "{count, plural, one {{counter} jarraitzaile} other {{counter} jarraitzaile}}",
   "account.following": "Jarraitzen",
+  "account.following_counter": "{count, plural, one {{counter} jarraitzen} other {{counter} jarraitzen}}",
   "account.follows.empty": "Erabiltzaile honek ez du inor jarraitzen oraindik.",
   "account.go_to_profile": "Joan profilera",
   "account.hide_reblogs": "Ezkutatu @{name} erabiltzailearen bultzadak",
@@ -61,6 +63,7 @@
   "account.requested_follow": "{name}-(e)k zu jarraitzeko eskaera egin du",
   "account.share": "Partekatu @{name} erabiltzailearen profila",
   "account.show_reblogs": "Erakutsi @{name} erabiltzailearen bultzadak",
+  "account.statuses_counter": "{count, plural, one {{counter} bidalketa} other {{counter} bidalketa}}",
   "account.unblock": "Desblokeatu @{name}",
   "account.unblock_domain": "Berriz erakutsi {domain}",
   "account.unblock_short": "Desblokeatu",
@@ -352,6 +355,7 @@
   "home.pending_critical_update.link": "Ikusi eguneraketak",
   "home.pending_critical_update.title": "Segurtasun eguneraketa kritikoa eskuragarri!",
   "home.show_announcements": "Erakutsi iragarpenak",
+  "ignore_notifications_modal.filter_instead": "Iragazi ez ikusiarena egin beharrean",
   "ignore_notifications_modal.ignore": "Ezikusi jakinarazpenak",
   "ignore_notifications_modal.limited_accounts_title": "Moderatutako kontuen jakinarazpenei ez ikusiarena egin?",
   "ignore_notifications_modal.new_accounts_title": "Kontu berrien jakinarazpenei ez ikusiarena egin?",
@@ -563,6 +567,7 @@
   "notifications.policy.filter_not_following_title": "Jarraitzen ez duzun jendea",
   "notifications.policy.filter_private_mentions_hint": "Iragazita, baldin eta zure aipamenaren erantzuna bada edo bidaltzailea jarraitzen baduzu",
   "notifications.policy.filter_private_mentions_title": "Eskatu gabeko aipamen pribatuak",
+  "notifications.policy.title": "Kudeatu honen jakinarazpaenak…",
   "notifications_permission_banner.enable": "Gaitu mahaigaineko jakinarazpenak",
   "notifications_permission_banner.how_to_control": "Mastodon irekita ez dagoenean jakinarazpenak jasotzeko, gaitu mahaigaineko jakinarazpenak. Mahaigaineko jakinarazpenak ze elkarrekintzak eragingo dituzten zehazki kontrolatu dezakezu goiko {icon} botoia erabiliz, gaituta daudenean.",
   "notifications_permission_banner.title": "Ez galdu ezer inoiz",
diff --git a/app/javascript/mastodon/locales/fr-CA.json b/app/javascript/mastodon/locales/fr-CA.json
index b0609e3e822b09..1ad821ee072540 100644
--- a/app/javascript/mastodon/locales/fr-CA.json
+++ b/app/javascript/mastodon/locales/fr-CA.json
@@ -11,6 +11,7 @@
   "about.not_available": "Cette information n'a pas été rendue disponible sur ce serveur.",
   "about.powered_by": "Réseau social décentralisé propulsé par {mastodon}",
   "about.rules": "Règles du serveur",
+  "account.account_note_header": "Note personnelle",
   "account.add_or_remove_from_list": "Ajouter ou enlever de listes",
   "account.badges.bot": "Bot",
   "account.badges.group": "Groupe",
diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json
index 9c983dd0e2866e..141a856e316cfc 100644
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@@ -11,6 +11,7 @@
   "about.not_available": "Cette information n'a pas été rendue disponible sur ce serveur.",
   "about.powered_by": "Réseau social décentralisé propulsé par {mastodon}",
   "about.rules": "Règles du serveur",
+  "account.account_note_header": "Note personnelle",
   "account.add_or_remove_from_list": "Ajouter ou retirer des listes",
   "account.badges.bot": "Bot",
   "account.badges.group": "Groupe",
diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json
index 4af37bce856525..e90826ded16ceb 100644
--- a/app/javascript/mastodon/locales/he.json
+++ b/app/javascript/mastodon/locales/he.json
@@ -284,15 +284,15 @@
   "explore.trending_links": "חדשות",
   "explore.trending_statuses": "הודעות",
   "explore.trending_tags": "תגיות",
-  "filter_modal.added.context_mismatch_explanation": "קטגוריית הסנן הזאת לא חלה על ההקשר שממנו הגעת אל ההודעה הזו. אם תרצה/י שההודעה תסונן גם בהקשר זה, תצטרך/י לערוך את הסנן.",
+  "filter_modal.added.context_mismatch_explanation": "קטגוריית המסנן הזאת לא חלה על ההקשר שממנו הגעת אל ההודעה הזו. אם תרצה/י שההודעה תסונן גם בהקשר זה, תצטרך/י לערוך את הסנן.",
   "filter_modal.added.context_mismatch_title": "אין התאמה להקשר!",
   "filter_modal.added.expired_explanation": "פג תוקפה של קטגוריית הסינון הזו, יש צורך לשנות את תאריך התפוגה כדי שהסינון יוחל.",
-  "filter_modal.added.expired_title": "פג תוקף הפילטר!",
+  "filter_modal.added.expired_title": "פג תוקף המסנן!",
   "filter_modal.added.review_and_configure": "לסקירה והתאמה מתקדמת של קטגוריית הסינון הזו, לכו ל{settings_link}.",
   "filter_modal.added.review_and_configure_title": "אפשרויות סינון",
   "filter_modal.added.settings_link": "דף הגדרות",
   "filter_modal.added.short_explanation": "ההודעה הזו הוספה לקטגוריית הסינון הזו: {title}.",
-  "filter_modal.added.title": "הפילטר הוסף!",
+  "filter_modal.added.title": "המסנן הוסף!",
   "filter_modal.select_filter.context_mismatch": "לא חל בהקשר זה",
   "filter_modal.select_filter.expired": "פג התוקף",
   "filter_modal.select_filter.prompt_new": "קטגוריה חדשה {name}",
@@ -356,8 +356,16 @@
   "home.pending_critical_update.link": "צפיה בעדכונים",
   "home.pending_critical_update.title": "יצא עדכון אבטחה חשוב!",
   "home.show_announcements": "הצג הכרזות",
+  "ignore_notifications_modal.filter_instead": "לסנן במקום",
   "ignore_notifications_modal.filter_to_act_users": "עדיין ביכולתך לקבל, לדחות ולדווח על משתמשים אחרים",
+  "ignore_notifications_modal.filter_to_avoid_confusion": "סינון מסייע למניעת בלבולים אפשריים",
   "ignore_notifications_modal.filter_to_review_separately": "ניתן לסקור התראות מפולטרות בנפרד",
+  "ignore_notifications_modal.ignore": "להתעלם מהתראות",
+  "ignore_notifications_modal.limited_accounts_title": "להתעלם מהתראות מחשבונות תחת פיקוח?",
+  "ignore_notifications_modal.new_accounts_title": "להתעלם מהתראות מחשבונות חדשים?",
+  "ignore_notifications_modal.not_followers_title": "להתעלם מהתראות מא.נשים שאינם עוקביך?",
+  "ignore_notifications_modal.not_following_title": "להתעלם מהתראות מא.נשים שאינם נעקביך?",
+  "ignore_notifications_modal.private_mentions_title": "להתעלם מהתראות מאיזכורים פרטיים?",
   "interaction_modal.description.favourite": "עם חשבון מסטודון, ניתן לחבב את ההודעה כדי לומר למחבר/ת שהערכת את תוכנו או כדי לשמור אותו לקריאה בעתיד.",
   "interaction_modal.description.follow": "עם חשבון מסטודון, ניתן לעקוב אחרי {name} כדי לקבל את הפוסטים שלו/ה בפיד הבית.",
   "interaction_modal.description.reblog": "עם חשבון מסטודון, ניתן להדהד את החצרוץ ולשתף עם עוקבים.",
@@ -509,13 +517,26 @@
   "notification.status": "{name} הרגע פרסמו",
   "notification.update": "{name} ערכו הודעה",
   "notification_requests.accept": "לקבל",
+  "notification_requests.accept_all": "לקבל את כל הבקשות",
+  "notification_requests.accept_multiple": "{count, plural,one {לאשר קבלת בקשה}other {לאשר קבלת # בקשות}}",
+  "notification_requests.confirm_accept_all.button": "לקבל את כל הבקשות",
+  "notification_requests.confirm_accept_all.message": "אתם עומדים לאשר {count, plural,one {בקשת התראה אחת}other {# בקשות התראה}}. להמשיך?",
+  "notification_requests.confirm_accept_all.title": "לקבל בקשות התראה?",
+  "notification_requests.confirm_dismiss_all.button": "דחיית כל הבקשות",
+  "notification_requests.confirm_dismiss_all.message": "אתם עומדים לדחות {count, plural,one {בקשת התראה}other {# בקשות התראה}}. לא תוכלו למצוא {count, plural,one {אותה}other {אותן}} בקלות אחר כך. להמשיך?",
+  "notification_requests.confirm_dismiss_all.title": "לדחות בקשות התראה?",
   "notification_requests.dismiss": "לבטל",
+  "notification_requests.dismiss_all": "דחיית כל הבקשות",
+  "notification_requests.dismiss_multiple": "{count, plural,one {לדחות בקשה}other {לדחות # בקשות}} לקבלת התראה",
+  "notification_requests.enter_selection_mode": "בחירה",
+  "notification_requests.exit_selection_mode": "ביטול",
   "notification_requests.explainer_for_limited_account": "התראות על פעולות חשבון זה סוננו כי חשבון זה הוגבל על ידי מנהלי הדיונים.",
   "notification_requests.explainer_for_limited_remote_account": "התראות על פעולות חשבון זה סוננו כי חשבון זה או השרת שלו הוגבלו על ידי מנהלי הדיונים.",
   "notification_requests.maximize": "הגדלה למקסימום",
-  "notification_requests.minimize_banner": "להקטין את כותרת ההודעות המפולטרות",
+  "notification_requests.minimize_banner": "להקטין את כותרת ההודעות המסוננות",
   "notification_requests.notifications_from": "התראות מ־ {name}",
   "notification_requests.title": "התראות מסוננות",
+  "notification_requests.view": "הצגת ההתראות",
   "notifications.clear": "הסרת התראות",
   "notifications.clear_confirmation": "להסיר את כל ההתראות לצמיתות ? ",
   "notifications.clear_title": "לנקות התראות?",
@@ -552,6 +573,12 @@
   "notifications.permission_denied": "לא ניתן להציג התראות מסך כיוון כיוון שהרשאות דפדפן נשללו בעבר",
   "notifications.permission_denied_alert": "לא ניתן לאפשר נוטיפיקציות מסך שכן הדפדפן סורב הרשאה בעבר",
   "notifications.permission_required": "לא ניתן לאפשר נוטיפיקציות מסך כיוון שהרשאה דרושה לא ניתנה.",
+  "notifications.policy.accept": "אישור",
+  "notifications.policy.accept_hint": "הצגה בהתראות",
+  "notifications.policy.drop": "להתעלם",
+  "notifications.policy.drop_hint": "שליחה אל מצולות הנשיה, ולא יוודעו אודותיה לעולם",
+  "notifications.policy.filter": "מסנן",
+  "notifications.policy.filter_hint": "שליחה לתיבה נכנסת מסוננת",
   "notifications.policy.filter_limited_accounts_hint": "הוגבל על ידי מנהלי הדיונים",
   "notifications.policy.filter_limited_accounts_title": "חשבון מוגבל",
   "notifications.policy.filter_new_accounts.hint": "נוצר {days, plural,one {ביום האחרון} two {ביומיים האחרונים} other {ב־# הימים האחרונים}}",
@@ -562,6 +589,7 @@
   "notifications.policy.filter_not_following_title": "משתמשים שאינך עוקב(ת) אחריהםן",
   "notifications.policy.filter_private_mentions_hint": "מסונן אלא אם זו תשובה למינשון שלך או אם אתם עוקבים אחרי העונה",
   "notifications.policy.filter_private_mentions_title": "מינשונים בפרטי שלא הוזמנו",
+  "notifications.policy.title": "ניהול התראות מ…",
   "notifications_permission_banner.enable": "לאפשר נוטיפיקציות מסך",
   "notifications_permission_banner.how_to_control": "כדי לקבל התראות גם כאשר מסטודון סגור יש לאפשר התראות מסך. ניתן לשלוט בדיוק איזה סוג של אינטראקציות יביא להתראות מסך דרך כפתור ה- {icon} מרגע שהן מאופשרות.",
   "notifications_permission_banner.title": "לעולם אל תחמיץ דבר",
@@ -802,6 +830,7 @@
   "timeline_hint.remote_resource_not_displayed": "{resource} משרתים אחרים לא מוצגים.",
   "timeline_hint.resources.followers": "עוקבים",
   "timeline_hint.resources.follows": "נעקבים",
+  "timeline_hint.resources.replies": "מספר תשובות",
   "timeline_hint.resources.statuses": "הודעות ישנות יותר",
   "trends.counter_by_accounts": "{count, plural, one {אדם אחד} other {{count} א.נשים}} {days, plural, one {מאז אתמול} two {ביומיים האחרונים} other {במשך {days} הימים האחרונים}}",
   "trends.trending_now": "נושאים חמים",
diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json
index 08a79e50c2acc3..eb618c4666dfa4 100644
--- a/app/javascript/mastodon/locales/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@@ -358,7 +358,7 @@
   "home.show_announcements": "Közlemények megjelenítése",
   "ignore_notifications_modal.disclaimer": "A Mastodon nem tudja értesíteni azokat a felhasználókat, akiknek figyelmen kívül hagytad az értesítéseit. Az értesítések figyelmen kívül hagyása nem állítja meg az üzenetek elküldését.",
   "ignore_notifications_modal.filter_instead": "Inkább szűrés",
-  "ignore_notifications_modal.filter_to_act_users": "Továbbra is el tudja fogadni, el tudja utasítani vagy jelenteni tudja a felhasználókat",
+  "ignore_notifications_modal.filter_to_act_users": "Továbbra is el tudod fogadni, el tudod utasítani vagy tudod jelenteni a felhasználókat",
   "ignore_notifications_modal.filter_to_avoid_confusion": "A szűrés segít elkerülni a lehetséges félreértéseket",
   "ignore_notifications_modal.filter_to_review_separately": "A szűrt értesítések külön tekinthetők át",
   "ignore_notifications_modal.ignore": "Értesítések figyelmen kívül hagyása",
diff --git a/app/javascript/mastodon/locales/nn.json b/app/javascript/mastodon/locales/nn.json
index 23d7a287727369..1b0e490e60edfa 100644
--- a/app/javascript/mastodon/locales/nn.json
+++ b/app/javascript/mastodon/locales/nn.json
@@ -358,7 +358,9 @@
   "home.show_announcements": "Vis kunngjeringar",
   "ignore_notifications_modal.disclaimer": "Mastodon kan ikkje informera brukarane at du overser varsla deira. Å oversjå varsel vil ikkje hindra at meldingane blir sende.",
   "ignore_notifications_modal.filter_instead": "Filtrer i staden",
+  "ignore_notifications_modal.filter_to_act_users": "Du kan framleis godta, avvisa eller rapportera brukarar",
   "ignore_notifications_modal.filter_to_avoid_confusion": "Å filtrera hjelper til å unngå mogleg forvirring",
+  "ignore_notifications_modal.filter_to_review_separately": "Du kan gå gjennom filtrerte varslingar for seg",
   "ignore_notifications_modal.ignore": "Oversjå varsel",
   "ignore_notifications_modal.limited_accounts_title": "Oversjå varsel frå modererte kontoar?",
   "ignore_notifications_modal.new_accounts_title": "Oversjå varsel frå nye kontoar?",
diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index 2fa312969da537..73b35bf8bf045d 100644
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@@ -21,7 +21,7 @@ cy:
     link_verified_on: Gwiriwyd perchnogaeth y ddolen yma ar %{date}
     nothing_here: Does dim byd yma!
     pin_errors:
-      following: Rhaid i chi fod yn dilyn y person rydych am ei gymeradwyo, yn barod.
+      following: Rhaid i chi fod yn dilyn y person rydych am ei gymeradwyo, yn barod
     posts:
       few: Postiadau
       many: Postiadau
@@ -39,6 +39,7 @@ cy:
       created_msg: Crëwyd nodyn cymedroli'n llwyddiannus!
       destroyed_msg: Dinistriwyd nodyn cymedroli yn llwyddiannus!
     accounts:
+      add_email_domain_block: Rhwystro parth e-bost
       approve: Cymeradwyo
       approved_msg: Wedi llwyddo i gymeradwyo cais cofrestru %{username}
       are_you_sure: Ydych chi'n siŵr?
@@ -65,6 +66,7 @@ cy:
       demote: Diraddio
       destroyed_msg: Mae data %{username} bellach mewn ciw i gael ei ddileu yn fuan
       disable: Rhewi
+      disable_sign_in_token_auth: Analluogi dilysu tocyn e-bost
       disable_two_factor_authentication: Diffodd 2FA
       disabled: Wedi rhewi
       display_name: Enw sgrin
@@ -73,6 +75,7 @@ cy:
       email: E-bost
       email_status: Statws e-bost
       enable: Dadrewi
+      enable_sign_in_token_auth: Galluogi dilysu tocyn e-bost
       enabled: Wedi ei alluogi
       enabled_msg: Wedi dadrewi cyfrif %{username} yn llwyddiannus
       followers: Dilynwyr
@@ -141,6 +144,7 @@ cy:
       resubscribe: Ail danysgrifio
       role: Rôl
       search: Chwilio
+      search_same_email_domain: Defnyddwyr eraill gyda'r un parth e-bost
       search_same_ip: Defnyddwyr eraill gyda'r un IP
       security: Diogelwch
       security_measures:
@@ -181,21 +185,26 @@ cy:
         approve_appeal: Cymeradwyo'r Apêl
         approve_user: Cymeradwyo Defnyddiwr
         assigned_to_self_report: Neilltuo Adroddiad
+        change_email_user: Newid E-bost ar gyfer Defnyddiwr
         change_role_user: Newid Rôl y Defnyddiwr
         confirm_user: Cadarnhau Defnyddiwr
         create_account_warning: Creu Rhybydd
         create_announcement: Creu Cyhoeddiad
+        create_canonical_email_block: Creu Rhwystr E-bost
         create_custom_emoji: Creu Emoji Addasedig
         create_domain_allow: Creu Caniatáu Parth
         create_domain_block: Creu Gwaharddiad Parth
+        create_email_domain_block: Creu Rhwystr Parth E-bost
         create_ip_block: Creu rheol IP
         create_unavailable_domain: Creu Parth Ddim ar Gael
         create_user_role: Creu Rôl
         demote_user: Diraddio Defnyddiwr
         destroy_announcement: Dileu Cyhoeddiad
+        destroy_canonical_email_block: Dileu Rhwystr E-bost
         destroy_custom_emoji: Dileu Emoji Addasedig
         destroy_domain_allow: Dileu Caniatáu Parth
         destroy_domain_block: Dileu Gwaharddiad Parth
+        destroy_email_domain_block: Dileu Rhwystr Parth E-bost
         destroy_instance: Clirio Parth
         destroy_ip_block: Dileu rheol IP
         destroy_status: Dileu Postiad
@@ -203,8 +212,10 @@ cy:
         destroy_user_role: Dileu Rôl
         disable_2fa_user: Diffodd 2FA
         disable_custom_emoji: Analluogi Emoji Addasedig
+        disable_sign_in_token_auth_user: Analluogi Dilysu Tocyn E-bost Defnyddiwr
         disable_user: Analluogi Defnyddiwr
         enable_custom_emoji: Galluogi Emoji Addasedig
+        enable_sign_in_token_auth_user: Galluogi Dilysu Tocyn E-bost Defnyddiwr
         enable_user: Galluogi Defnyddiwr
         memorialize_account: Cofadeilio Cyfrif
         promote_user: Dyrchafu Defnyddiwr
@@ -234,20 +245,26 @@ cy:
         approve_appeal_html: Mae %{name} wedi cymeradwyo penderfyniad cymedroli gan %{target}
         approve_user_html: Mae %{name} wedi cymeradwyo cofrestru gan %{target}
         assigned_to_self_report_html: Mae %{name} wedi neilltuo adroddiad %{target} iddyn nhw eu hunain
+        change_email_user_html: Mae %{name} wedi newid cyfeiriad e-bost defnyddiwr %{target}
         change_role_user_html: Mae %{name} wedi newid rôl %{target}
+        confirm_user_html: Mae %{name} wedi cadarnhau cyfeiriad e-bost defnyddiwr %{target}
         create_account_warning_html: Mae %{name} wedi anfon rhybudd at %{target}
         create_announcement_html: Mae %{name} wedi creu cyhoeddiad newydd %{target}
+        create_canonical_email_block_html: Mae %{name} wedi'i rwystro e-bost gyda'r hash %{target}
         create_custom_emoji_html: Mae %{name} wedi llwytho emoji newydd %{target}
         create_domain_allow_html: Mae %{name} wedi caniatáu ffedereiddio â pharth %{target}
         create_domain_block_html: Mae %{name} wedi rhwystro parth %{target}
+        create_email_domain_block_html: Mae %{name} wedi rhwystro parth e-bost %{target}
         create_ip_block_html: Mae %{name} wedi creu rheol ar gyfer IP %{target}
         create_unavailable_domain_html: Mae %{name} wedi stopio danfon i barth %{target}
         create_user_role_html: Mae %{name} wedi creu rôl %{target}
         demote_user_html: Mae %{name} wedi israddio defnyddiwr %{target}
         destroy_announcement_html: Mae %{name} wedi dileu cyhoeddiad %{target}
+        destroy_canonical_email_block_html: Mae %{name} wedi dad-rwystro parth e-bost %{target}
         destroy_custom_emoji_html: Mae %{name} wedi dileu emoji %{target}
         destroy_domain_allow_html: Mae %{name} wedi gwrthod ffederasiwn gyda pharth %{target}
         destroy_domain_block_html: Mae %{name} wedi dad rwystro parth %{target}
+        destroy_email_domain_block_html: Mae %{name} wedi dad-rwystro parth e-bost %{target}
         destroy_instance_html: Mae %{name} wedi dileu parth %{target}
         destroy_ip_block_html: Mae %{name} dileu rheol ar gyfer IP %{target}
         destroy_status_html: Mae %{name} wedi tynnu postiad gan %{target}
@@ -255,8 +272,10 @@ cy:
         destroy_user_role_html: Mae %{name} wedi dileu rôl %{target}
         disable_2fa_user_html: Mae %{name} wedi analluogi gofyniad dau ffactor ar gyfer defnyddiwr %{target}
         disable_custom_emoji_html: Mae %{name} wedi analluogi emoji %{target}
+        disable_sign_in_token_auth_user_html: Mae %{name} wedi analluogi dilysiad tocyn e-bost %{target}
         disable_user_html: Mae %{name} wedi analluogi mewngofnodi defnyddiwr %{target}
         enable_custom_emoji_html: Mae %{name} wedi analluogi emoji %{target}
+        enable_sign_in_token_auth_user_html: Mae %{name} wedi galluogi dilysiad tocyn e-bost %{target}
         enable_user_html: Mae %{name} wedi galluogi mewngofnodi defnyddiwr %{target}
         memorialize_account_html: Newidiodd %{name} gyfrif %{target} i dudalen memoriam
         promote_user_html: Mae %{name} wedi hyrwyddo defnyddiwr %{target}
@@ -264,6 +283,7 @@ cy:
         reject_user_html: Mae %{name} wedi gwrthod cofrestriad gan %{target}
         remove_avatar_user_html: Mae %{name} wedi tynnu afatar %{target}
         reopen_report_html: Mae %{name} wedi ailagor adroddiad %{target}
+        resend_user_html: Mae %{name} wedi ail anfon e-bost cadarnhau i%{target}
         reset_password_user_html: Mae %{name} wedi ailosod cyfrinair defnyddiwr %{target}
         resolve_report_html: Mae %{name} wedi datrys adroddiad %{target}
         sensitive_account_html: Mae %{name} wedi marcio cyfrwng %{target} fel un sensitif
@@ -444,6 +464,7 @@ cy:
         other: "%{count} ymgais i gofrestru dros yr wythnos ddiwethaf"
         two: "%{count} ymgais i gofrestru dros yr wythnos ddiwethaf"
         zero: "%{count} o ymgeisiadau i gofrestru dros yr wythnos ddiwethaf"
+      created_msg: Parth e-bost wedi'i rwystro'n llwyddiannus
       delete: Dileu
       dns:
         types:
@@ -452,8 +473,12 @@ cy:
       new:
         create: Ychwanegu parth
         resolve: Datrys parth
+        title: Rhwystro parth e-bost newydd
+      no_email_domain_block_selected: Ni newidiwyd unrhyw rwystro parth e-bost gan na ddewiswyd yr un ohonyn nhw
       not_permitted: Dim caniatâd
+      resolved_dns_records_hint_html: Mae'r enw parth yn cyd-fynd â'r parthau MX canlynol, sy'n gyfrifol yn y pen draw am dderbyn e-bost. Bydd rhwystro parth MX yn rhwystro cofrestriadau o unrhyw gyfeiriad e-bost sy'n defnyddio'r un parth MX, hyd yn oed os yw'r enw parth gweladwy yn wahanol. <strong>Byddwch yn ofalus i beidio â rhwystro'r prif ddarparwyr e-bost.</strong>
       resolved_through_html: Wedi'i ddatrys trwy %{domain}
+      title: Parthau e-bost wedi'u rhwystro
     export_domain_allows:
       new:
         title: Mewnforio parth yn caniatáu
@@ -623,6 +648,7 @@ cy:
         resolve_description_html: Ni fydd unrhyw gamau yn cael eu cymryd yn erbyn y cyfrif a adroddwyd, ni chofnodwyd rhybudd, a bydd yr adroddiad yn cael ei gau.
         silence_description_html: Bydd y cyfrif yn weladwy i'r rhai sydd eisoes yn ei ddilyn neu'n edrych arno â llaw, gan gyfyngu'n ddifrifol ar ei gyrhaeddiad. Mae modd ei ddychwelyd bob amser. Yn cau pob adroddiad yn erbyn y cyfrif hwn.
         suspend_description_html: Bydd y cyfrif a'i holl gynnwys yn anhygyrch ac yn cael ei ddileu yn y pen draw, a bydd rhyngweithio ag ef yn amhosibl. Yn gildroadwy o fewn 30 diwrnod. Yn cau pob adroddiad yn erbyn y cyfrif hwn.
+      actions_description_html: Penderfynwch pa gamau i'w cymryd i delio gyda'r adroddiad hwn. Os cymerwch gamau cosbi yn erbyn y cyfrif a adroddwyd, bydd hysbysiad e-bost yn cael ei anfon atyn nhw, ac eithrio pan fydd y categori <strong>Sbam</strong> yn cael ei ddewis.
       actions_description_remote_html: Penderfynwch pa gamau i'w cymryd i ddatrys yr adroddiad hwn. Bydd hyn ond yn effeithio ar sut <strong>mae'ch</strong> gweinydd yn cyfathrebu â'r cyfrif hwn o bell ac yn trin ei gynnwys.
       add_to_report: Ychwanegu rhagor i adroddiad
       already_suspended_badges:
@@ -687,6 +713,7 @@ cy:
         delete_data_html: Dileu proffil a chynnwys <strong>@%{acct}</strong> 30 diwrnod o nawr oni bai ei b/fod heb ei h/atal yn y cyfamser
         preview_preamble_html: 'Bydd <strong>@%{acct}</strong> yn derbyn rhybudd gyda''r cynnwys canlynol:'
         record_strike_html: Recordio rhybudd yn erbyn <strong>@%{acct}</strong> i'ch helpu i ddwysáu ar achosion o dorri rheolau yn y dyfodol o'r cyfrif hwn
+        send_email_html: Anfon e-bost rhybuddio <strong>at @%{acct}</strong>
         warning_placeholder: Rhesymeg ychwanegol dewisol ar gyfer y cam cymedroli.
       target_origin: Tarddiad y cyfrif a adroddwyd
       title: Adroddiadau
@@ -734,6 +761,7 @@ cy:
         manage_appeals: Rheoli Apeliadau
         manage_appeals_description: Yn caniatáu i ddefnyddwyr adolygu apeliadau yn erbyn camau cymedroli
         manage_blocks: Rheoli Blociau
+        manage_blocks_description: Yn caniatáu i ddefnyddwyr rwystro darparwyr e-bost a chyfeiriadau IP
         manage_custom_emojis: Rheoli Emojis Cyfaddas
         manage_custom_emojis_description: Yn caniatáu i ddefnyddwyr reoli emojis cyfaddas ar y gweinydd
         manage_federation: Rheoli Ffederasiwn
@@ -751,6 +779,7 @@ cy:
         manage_taxonomies: Rheoli Tacsonomeg
         manage_taxonomies_description: Yn caniatáu i ddefnyddwyr adolygu cynnwys sy'n trendio a diweddaru gosodiadau hashnodau
         manage_user_access: Rheoli Mynediad Defnyddwyr
+        manage_user_access_description: Yn caniatáu i ddefnyddwyr analluogi dilysiad dau ffactor defnyddwyr eraill, newid eu cyfeiriad e-bost, ac ailosod eu cyfrinair
         manage_users: Rheoli Defnyddwyr
         manage_users_description: Yn caniatáu i ddefnyddwyr weld manylion defnyddwyr eraill a chyflawni camau cymedroli yn eu herbyn
         manage_webhooks: Rheoli Bachau Gwe
@@ -825,6 +854,7 @@ cy:
       destroyed_msg: Llwytho i fyny i'r wefan wedi'i dileu yn llwyddiannus!
     software_updates:
       critical_update: Hanfodol - diweddarwch yn fuan
+      description: Argymhellir cadw'ch gosodiad Mastodon yn gyfredol i elwa o'r atgyweiriadau a'r nodweddion diweddaraf. Hefyd, weithiau mae'n hanfodol diweddaru Mastodon mewn modd amserol er mwyn osgoi materion diogelwch. Am y rhesymau hyn, mae Mastodon yn gwirio am ddiweddariadau bob 30 munud, a bydd yn eich hysbysu yn unol â'ch dewisiadau hysbysu e-bost.
       documentation_link: Dysgu rhagor
       release_notes: Nodiadau ryddhau
       title: Diweddariadau ar gael
@@ -912,13 +942,13 @@ cy:
         message_html: "<strong>Mae eich storfa gwrthrychau wedi'i cham ffurfweddu. Mae preifatrwydd eich defnyddwyr mewn perygl.</strong>"
     tags:
       moderation:
-        not_trendable: Ddim yn dueddol
+        not_trendable: Ddim yn trendio
         not_usable: Ddim yn ddefnyddiadwy
         pending_review: O dan ystyriaeth
         review_requested: Gofynnwyd am adolygiad
         reviewed: Adolygwyd
         title: Statws
-        trendable: Tueddadwy
+        trendable: Trendadwy
         unreviewed: Heb ei adolygu
         usable: Defnyddiadwy
       name: Enw
@@ -933,10 +963,16 @@ cy:
     trends:
       allow: Caniatáu
       approved: Cymeradwywyd
+      confirm_allow: Ydych chi'n siŵr eich bod am ganiatáu'r tagiau a ddewiswyd?
+      confirm_disallow: Ydych chi'n siŵr eich bod am wrthod y tagiau hyn?
       disallow: Gwrthod
       links:
         allow: Caniatáu dolen
         allow_provider: Caniatáu cyhoeddwr
+        confirm_allow: Ydych chi'n siŵr eich bod am ganiatáu'r dolenni hyn?
+        confirm_allow_provider: Ydych chi'n siŵr eich bod am ganiatáu'r darparwyr hyn?
+        confirm_disallow: Ydych chi'n siŵr eich bod am wrthod y dolenni hyn?
+        confirm_disallow_provider: A ydych yn siŵr eich bod am wrthod y darparwyr hyn?
         description_html: Mae'r rhain yn ddolenni sy'n cael eu rhannu llawer ar hyn o bryd gan gyfrifon y mae eich gweinydd yn gweld postiadau ohonyn nhw. Gall helpu eich defnyddwyr i ddarganfod beth sy'n digwydd yn y byd. Ni chaiff unrhyw ddolenni eu dangos yn gyhoeddus nes i chi gymeradwyo'r cyhoeddwr. Gallwch hefyd ganiatáu neu wrthod dolenni unigol.
         disallow: Gwrthod dolen
         disallow_provider: Gwrthod y cyhoeddwr
@@ -952,18 +988,22 @@ cy:
           zero: Wedi'i rannu gan %{count} o bobl dros yr wythnos ddiwethaf
         title: Dolenni sy'n trendio
         usage_comparison: Wedi'i rannu %{today} gwaith heddiw, o'i gymharu â %{yesterday} ddoe
-      not_allowed_to_trend: Dim caniatâd i dueddu
+      not_allowed_to_trend: Dim caniatâd i trendio
       only_allowed: Derbyniwyd yn unig
       pending_review: Yn aros am adolygiad
       preview_card_providers:
-        allowed: Gall dolenni gan y cyhoeddwr hwn greu tuedd
+        allowed: Gall dolenni gan y cyhoeddwr hwn greu trend
         description_html: Mae'r rhain yn barthau lle mae dolenni'n cael eu rhannu'n aml ar eich gweinydd. Ni fydd dolenni'n trendio'n gyhoeddus oni bai bod parth y ddolen yn cael ei gymeradwyo. Mae eich cymeradwyaeth (neu eich gwrthodiad) yn ymestyn i is-barthau.
-        rejected: Ni fydd dolenni gan y cyhoeddwr hwn yn creu tuedd
+        rejected: Ni fydd dolenni gan y cyhoeddwr hwn yn creu trend
         title: Cyhoeddwyr
       rejected: Gwrthodwyd
       statuses:
         allow: Caniatáu postiad
         allow_account: Caniatáu awdur
+        confirm_allow: Ydych chi'n siŵr eich bod am ganiatáu'r statws hyn?
+        confirm_allow_account: Ydych chi'n siŵr eich bod am ganiatáu'r cyfrifon hyn?
+        confirm_disallow: A ydych yn siŵr eich bod am wrthod y statws hyn?
+        confirm_disallow_account: A ydych yn siŵr eich bod am wrthod y cyfrifon hyn?
         description_html: Mae'r rhain yn bostiadau y mae eich gweinydd yn gwybod amdanyn nhw sy'n cael eu rhannu a'u ffafrio llawer ar hyn o bryd. Gall helpu eich defnyddwyr newydd a'ch defnyddwyr sy'n dychwelyd i ddod o hyd i fwy o bobl i'w dilyn. Ni chaiff unrhyw bostiadau eu dangos yn gyhoeddus nes i chi gymeradwyo'r awdur, ac mae'r awdur yn caniatáu i'w cyfrif gael ei awgrymu i eraill. Gallwch hefyd ganiatáu neu wrthod postiadau unigol.
         disallow: Gwrthod postiad
         disallow_account: Gwrthod awdur
@@ -1004,6 +1044,7 @@ cy:
           other: Wedi'i ddefnyddio gan %{count} o bobl dros yr wythnos ddiwethaf
           two: Wedi'i ddefnyddio gan %{count} o bobl dros yr wythnos ddiwethaf
           zero: Wedi'i ddefnyddio gan %{count} o bobl dros yr wythnos ddiwethaf
+      title: Argymhellion a Threndiau
       trending: Trendio
     warning_presets:
       add_new: Ychwanegu newydd
@@ -1092,7 +1133,9 @@ cy:
       guide_link_text: Gall pawb gyfrannu.
     sensitive_content: Cynnwys sensitif
   application_mailer:
+    notification_preferences: Newid dewisiadau e-bost
     salutation: "%{name},"
+    settings: 'Newid dewisiadau e-bost: %{link}'
     unsubscribe: Dad-danysgrifio
     view: 'Gweld:'
     view_profile: Gweld proffil
@@ -1112,6 +1155,7 @@ cy:
       hint_html: Un peth arall! Mae angen i ni gadarnhau eich bod yn ddynol (mae hyn er mwyn i ni allu cadw'r sbam allan!). Datryswch y CAPTCHA isod a chliciwch "Parhau".
       title: Gwiriad diogelwch
     confirmations:
+      awaiting_review: Mae eich cyfeiriad e-bost wedi'i gadarnhau! Mae aelod o staff %{domain} bellach yn adolygu'ch cofrestriad. Byddwch yn derbyn e-bost os ydyn nhw'n cymeradwyo eich cyfrif!
       awaiting_review_title: Mae eich cofrestriad yn cael ei adolygu
       clicking_this_link: clicio ar y ddolen hon
       login_link: mewngofnodi
@@ -1119,6 +1163,7 @@ cy:
       redirect_to_app_html: Dylech fod wedi cael eich ailgyfeirio i ap <strong>%{app_name}</strong>. Os na ddigwyddodd hynny, rhowch gynnig ar %{clicking_this_link} neu ewch eich hun i'r ap.
       registration_complete: Mae eich cofrestriad ar %{domain} bellach wedi'i gwblhau!
       welcome_title: Croeso, %{name}!
+      wrong_email_hint: Os nad yw'r cyfeiriad e-bost hwnnw'n gywir, gallwch ei newid yng ngosodiadau'r cyfrif.
     delete_account: Dileu cyfrif
     delete_account_html: Os hoffech chi ddileu eich cyfrif, mae modd <a href="%{path}">parhau yma</a>. Bydd gofyn i chi gadarnhau.
     description:
@@ -1139,6 +1184,7 @@ cy:
     or_log_in_with: Neu mewngofnodwch gyda
     privacy_policy_agreement_html: Rwyf wedi darllen ac yn cytuno i'r <a href="%{privacy_policy_path}" target="_blank">polisi preifatrwydd</a>
     progress:
+      confirm: Cadarnhau'r e-bost
       details: Eich manylion
       review: Ein hadolygiad
       rules: Derbyn rheolau
@@ -1160,8 +1206,10 @@ cy:
     security: Diogelwch
     set_new_password: Gosod cyfrinair newydd
     setup:
+      email_below_hint_html: Gwiriwch eich ffolder sbam, neu gofynnwch am un arall. Gallwch gywiro eich cyfeiriad e-bost os yw'n anghywir.
       email_settings_hint_html: Cliciwch ar y ddolen a anfonwyd atoch i wirio %{email}. Byddwn yn aros yma amdanoch.
       link_not_received: Heb gael dolen?
+      new_confirmation_instructions_sent: Byddwch yn derbyn e-bost newydd gyda'r ddolen gadarnhau ymhen ychydig funudau!
       title: Gwiriwch eich blwch derbyn
     sign_in:
       preamble_html: Mewngofnodwch gyda'ch manylion <strong>%{domain}</strong>. Os yw eich cyfrif yn cael ei gynnal ar weinydd gwahanol, ni fydd modd i chi fewngofnodi yma.
@@ -1172,7 +1220,9 @@ cy:
       title: Gadewch i ni eich gosod ar %{domain}.
     status:
       account_status: Statws cyfrif
+      confirming: Wrthi'n aros i gadarnhad e-bost gael ei gwblhau.
       functional: Mae eich cyfrif nawr yn weithredol.
+      pending: Mae eich cais yn aros i gael ei adolygu gan ein staff. Gall hyn gymryd peth amser. Byddwch yn derbyn e-bost os caiff eich cais ei gymeradwyo.
       redirecting_to: Mae eich cyfrif yn anweithredol oherwydd ei fod ar hyn o bryd yn ailgyfeirio i %{acct}.
       self_destruct: Gab fod parth %{domain} yn cau, dim ond mynediad cyfyngedig fyddwch yn ei gael i'ch cyfrif.
       view_strikes: Gweld rybuddion y gorffennol yn erbyn eich cyfrif
@@ -1215,6 +1265,9 @@ cy:
       before: 'Cyn bwrw ymlaen, darllenwch y nodiadau hyn yn ofalus:'
       caches: Efallai bydd cynnwys sydd wedi'i storio dros dro gan weinyddion eraill yn parhau
       data_removal: Bydd eich postiadau a data arall yn cael eu dileu'n barhaol
+      email_change_html: Gallwch <a href="%{path}">newid eich cyfeiriad e-bost</a> heb ddileu eich cyfrif
+      email_contact_html: Os nad yw byth wedi cyrraedd, gallwch anfon e-bost at <a href="mailto:%{email}">%{email}</a> am help
+      email_reconfirmation_html: Os nad ydych yn derbyn yr e-bost cadarnhau, gallwch <a href="%{path}">ofyn amdano eto</a>
       irreversible: Fyddwch chi ddim yn gallu adfer nac ail-greu eich cyfrif
       more_details_html: Am fwy o fanylion, darllenwch y <a href="%{terms_path}">polisi preifatrwydd</a>.
       username_available: Bydd eich enw defnyddiwr ar gael eto
@@ -1479,6 +1532,7 @@ cy:
     authentication_methods:
       otp: ap dilysu dau ffactor
       password: cyfrinair
+      sign_in_token: cod diogelwch e-bost
       webauthn: allweddi diogelwch
     description_html: Os ydych yn gweld gweithgaredd nad ydych yn ei adnabod, ystyriwch newid eich cyfrinair a galluogi dilysu dau ffactor.
     empty: Dim hanes dilysu ar gael
@@ -1489,6 +1543,16 @@ cy:
     unsubscribe:
       action: Iawn, dad-danysgrifio
       complete: Dad-danysgrifiwyd
+      confirmation_html: Ydych chi'n siŵr eich bod am ddad-danysgrifio rhag derbyn %{type} Mastodon ar %{domain} i'ch e-bost yn %{email}? Gallwch ail-danysgrifio o'ch <a href="%{settings_path}">gosodiadau hysbysu e-bost</a> rhywbryd eto .
+      emails:
+        notification_emails:
+          favourite: e-bost hysbysu hoffi
+          follow: e-byst hysbysu dilyn
+          follow_request: e-byst ceisiadau dilyn
+          mention: e-byst hysbysu crybwylliadau
+          reblog: e-byst hysbysiadau hybu
+      resubscribe_html: Os ydych wedi dad-danysgrifio trwy gamgymeriad, gallwch ail-danysgrifio drwy'ch <a href="%{settings_path}">gosodiadau hysbysu e-bost</a> .
+      success_html: Ni fyddwch bellach yn derbyn %{type} ar gyfer Mastodon ar %{domain} i'ch e-bost am %{email}.
       title: Dad-danysgrifio
   media_attachments:
     validations:
@@ -1569,6 +1633,8 @@ cy:
     update:
       subject: Golygodd %{name} bostiad
   notifications:
+    administration_emails: E-byst hysbysiadau gweinyddol
+    email_events: Digwyddiadau ar gyfer hysbysiadau e-bost
     email_events_hint: 'Dewiswch ddigwyddiadau yr ydych am dderbyn hysbysiadau ar eu cyfer:'
   number:
     human:
@@ -1727,6 +1793,7 @@ cy:
     import: Mewnforio
     import_and_export: Mewnforio ac allforio
     migrate: Mudo cyfrif
+    notifications: Hysbysiadau e-bost
     preferences: Dewisiadau
     profile: Proffil cyhoeddus
     relationships: Yn dilyn a dilynwyr
@@ -1983,9 +2050,9 @@ cy:
         other: "%{people} o bobl yn y 2 ddiwrnod diwethaf"
         two: "%{people} o bobl yn y 2 ddiwrnod diwethaf"
         zero: "%{people} o bobl yn y 2 ddiwrnod diwethaf"
-      hashtags_subtitle: Gweld beth sy'n tueddu dros y 2 ddiwrnod diwethaf
-      hashtags_title: Hashnodau tuedd
-      hashtags_view_more: Gweld mwy o hashnodau tuedd
+      hashtags_subtitle: Gweld beth sy'n trendio dros y 2 ddiwrnod diwethaf
+      hashtags_title: Hashnodau trendio
+      hashtags_view_more: Gweld mwy o hashnodau trendio
       post_action: Creu
       post_step: Dywedwch helo wrth y byd gyda thestun, lluniau, fideos neu arolygon barn.
       post_title: Creu'ch postiad cyntaf
@@ -2001,6 +2068,7 @@ cy:
     invalid_otp_token: Côd dau-ffactor annilys
     otp_lost_help_html: Os colloch chi fynediad i'r ddau, mae modd i chi gysylltu a %{email}
     rate_limited: Gormod o geisiadau dilysu, ceisiwch eto yn nes ymlaen.
+    seamless_external_login: Rydych chi wedi mewngofnodi trwy wasanaeth allanol, felly nid yw gosodiadau cyfrinair ac e-bost ar gael.
     signed_in_as: 'Wedi mewngofnodi fel:'
   verification:
     extra_instructions_html: <strong>Awgrym:</strong> Gall y ddolen ar eich gwefan fod yn anweledig. Y rhan bwysig yw <code>rel="me"</code> sy'n atal dynwarediad ar wefannau gyda chynnwys sy'n cael ei gynyrchu gan ddefnyddwyr. Gallwch hyd yn oed ddefnyddio tag <code>link</code> ym mhennyn y dudalen yn lle <code>a</code>, ond rhaid i'r HTML fod yn hygyrch heb weithredu JavaScript.
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 85632c7c53cd42..6c02e12b95f6dc 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -35,6 +35,7 @@ he:
       created_msg: הודעת מנחה נוצרה בהצלחה!
       destroyed_msg: הודעת מנחה נמחקה בהצלחה!
     accounts:
+      add_email_domain_block: חסימת מתחם דוא"ל
       approve: אשר
       approved_msg: בקשת %{username} להירשם אושרה בהצלחה
       are_you_sure: בטוח?
@@ -905,10 +906,16 @@ he:
     trends:
       allow: לאפשר
       approved: אישור
+      confirm_allow: 'וידוא: האם לאשר את התגיות שנבחרו?'
+      confirm_disallow: 'וידוא: האם לאסור את התגיות שנבחרו?'
       disallow: לא לאשר
       links:
         allow: אישור קישורית
         allow_provider: אישור מפרסם
+        confirm_allow: 'וידוא: האם לאשר את הקישורים שנבחרו?'
+        confirm_allow_provider: 'וידוא: האם לאשר את הספקים שנבחרו?'
+        confirm_disallow: 'וידוא: האם לאסור את הקישורים שנבחרו?'
+        confirm_disallow_provider: 'וידוא: האם לאסור את הספקים שנבחרו?'
         description_html: בקישוריות אלה נעשה כרגע שימוש על ידי חשבונות רבים שהשרת שלך רואה הודעות מהם. זה עשוי לסייע למשתמשיך לברר מה קורה בעולם. שום קישוריות לא יוצגו עד שתאשרו את המפרסם. ניתן גם לאפשר או לדחות קישוריות ספציפיות.
         disallow: לא לאשר קישורית
         disallow_provider: לא לאשר מפרסם
@@ -934,6 +941,10 @@ he:
       statuses:
         allow: הרשאת הודעה
         allow_account: הרשאת מחבר/ת
+        confirm_allow: 'וידוא: האם לאשר את הסטטוסים שנבחרו?'
+        confirm_allow_account: 'וידוא: האם לאשר את החשבונות שנבחרו?'
+        confirm_disallow: 'וידוא: האם לאסור את הסטטוסים שנבחרו?'
+        confirm_disallow_account: 'וידוא: האם לאסור את החשבונות שנבחרו?'
         description_html: אלו הן הודעות שהשרת שלך מכיר וזוכות להדהודים וחיבובים רבים כרגע. זה עשוי למשתמשיך החדשים והחוזרים למצוא עוד נעקבים. ההודעות לא מוצגות עד שיאושר המחבר/ת, והמחבר/ת יאשרו שחשבונים יומלץ לאחרים. ניתן לאשר או לדחות הודעות ספציפיות.
         disallow: לדחות הודעה
         disallow_account: לא לאשר מחבר/ת
@@ -1301,7 +1312,7 @@ he:
     statuses:
       back_to_filter: חזרה לפילטר
       batch:
-        remove: הסרה מפילטר
+        remove: הסרה ממסנן
       index:
         hint: סנן זה חל באופן של בחירת הודעות בודדות ללא תלות בקריטריונים אחרים. תוכלו להוסיף עוד הודעות לסנן זה ממנשק הווב.
         title: הודעות שסוננו
diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index e5af5c1c64ecd2..a845c1fbb64998 100644
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -1448,6 +1448,7 @@ nn:
           mention: e-postar om omtaler
           reblog: e-postar om framhevingar
       resubscribe_html: Om du har avslutta abonnementet ved ein feil, kan du abonnera på nytt i <a href="%{settings_path}">innstillingar for e-postvarsling</a>.
+      success_html: Du vil ikkje lenger få %{type} frå Mastodon på %{domain} til e-posten på %{email}.
       title: Meld av
   media_attachments:
     validations:
@@ -1528,6 +1529,8 @@ nn:
     update:
       subject: "%{name} redigerte et innlegg"
   notifications:
+    administration_emails: Epostvarsel for administrator
+    email_events: Hendingar for epostvarsel
     email_events_hint: 'Velg hendelser som du vil motta varslinger for:'
   number:
     human:
@@ -1686,6 +1689,7 @@ nn:
     import: Hent inn
     import_and_export: Importer og eksporter
     migrate: Kontoflytting
+    notifications: Epostvarsel
     preferences: Innstillingar
     profile: Profil
     relationships: Fylgjar og fylgjarar
@@ -1932,6 +1936,7 @@ nn:
     invalid_otp_token: Ugyldig tostegskode
     otp_lost_help_html: Hvis du mistet tilgangen til begge deler, kan du komme i kontakt med %{email}
     rate_limited: For mange autentiseringsforsøk, prøv igjen seinare.
+    seamless_external_login: Du er logga inn gjennom ei ekstern tenest, så passord- og epostinnstillingar er ikkje tilgjengelege.
     signed_in_as: 'Logga inn som:'
   verification:
     extra_instructions_html: <strong>Tips:</strong> Linken på nettsida di kan vera usynleg. Den viktige delen er <code>rel="me"</code>, som på nettstader med brukargenerert innhald vil hindra at andre kan låst som dei er deg. Du kan til og med bruka <code>link</code> i staden for <code>a</code> i toppteksten til sida, men HTML-koden må vera tilgjengeleg utan å måtte køyra JavaScript.
diff --git a/config/locales/simple_form.he.yml b/config/locales/simple_form.he.yml
index 95a334bb3a538f..9e2becc52f2bea 100644
--- a/config/locales/simple_form.he.yml
+++ b/config/locales/simple_form.he.yml
@@ -73,8 +73,8 @@ he:
       filters:
         action: בחרו איזו פעולה לבצע כאשר הודעה מתאימה למסנן
         actions:
-          hide: הסתר את התוכן המסונן, כאילו לא היה קיים
-          warn: הסתר את התוכן המסונן מאחורי אזהרה עם כותרת המסנן
+          hide: הסתרת התוכן המסונן, כאילו לא היה קיים
+          warn: הסתרת התוכן המסונן מאחורי אזהרה עם כותרת המסנן
       form_admin_settings:
         activity_api_enabled: מספר ההודעות שפורסמו מקומית, משתמשים פעילים, והרשמות חדשות בדליים שבועיים
         app_icon: WEBP, PNG, GIF או JPG. גובר על אייקון ברירת המחדל ביישומון על מכשירים ניידים ומחליף אותו באייקון נבחר.

From ee6d3a83f125a4f5eac604c5ee32856aa2c68b70 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 14 Aug 2024 09:32:19 +0200
Subject: [PATCH 1834/2191] Update dependency concurrent-ruby to v1.3.4
 (#31412)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index e4d787eb6463d6..f71b71ee4a7cf5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -168,7 +168,7 @@ GEM
     climate_control (1.2.0)
     cocoon (1.2.15)
     color_diff (0.1)
-    concurrent-ruby (1.3.3)
+    concurrent-ruby (1.3.4)
     connection_pool (2.4.1)
     cose (1.3.0)
       cbor (~> 0.5.9)

From 3e3450be3613afd522db99e230ec5f47528ba509 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 14 Aug 2024 07:33:32 +0000
Subject: [PATCH 1835/2191] Update dependency cssnano to v7.0.5 (#31413)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 226 +++++++++++++++++++++++++++---------------------------
 1 file changed, 113 insertions(+), 113 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 1df8452b461a23..fb8b6252aa0145 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5691,17 +5691,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"browserslist@npm:^4.0.0, browserslist@npm:^4.23.0, browserslist@npm:^4.23.1":
-  version: 4.23.1
-  resolution: "browserslist@npm:4.23.1"
-  dependencies:
-    caniuse-lite: "npm:^1.0.30001629"
-    electron-to-chromium: "npm:^1.4.796"
-    node-releases: "npm:^2.0.14"
-    update-browserslist-db: "npm:^1.0.16"
+"browserslist@npm:^4.0.0, browserslist@npm:^4.23.0, browserslist@npm:^4.23.1, browserslist@npm:^4.23.3":
+  version: 4.23.3
+  resolution: "browserslist@npm:4.23.3"
+  dependencies:
+    caniuse-lite: "npm:^1.0.30001646"
+    electron-to-chromium: "npm:^1.5.4"
+    node-releases: "npm:^2.0.18"
+    update-browserslist-db: "npm:^1.1.0"
   bin:
     browserslist: cli.js
-  checksum: 10c0/eb47c7ab9d60db25ce2faca70efeb278faa7282a2f62b7f2fa2f92e5f5251cf65144244566c86559419ff4f6d78f59ea50e39911321ad91f3b27788901f1f5e9
+  checksum: 10c0/3063bfdf812815346447f4796c8f04601bf5d62003374305fd323c2a463e42776475bcc5309264e39bcf9a8605851e53560695991a623be988138b3ff8c66642
   languageName: node
   linkType: hard
 
@@ -5903,10 +5903,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001599, caniuse-lite@npm:^1.0.30001629":
-  version: 1.0.30001636
-  resolution: "caniuse-lite@npm:1.0.30001636"
-  checksum: 10c0/e5f965b4da7bae1531fd9f93477d015729ff9e3fa12670ead39a9e6cdc4c43e62c272d47857c5cc332e7b02d697cb3f2f965a1030870ac7476da60c2fc81ee94
+"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001599, caniuse-lite@npm:^1.0.30001646":
+  version: 1.0.30001651
+  resolution: "caniuse-lite@npm:1.0.30001651"
+  checksum: 10c0/7821278952a6dbd17358e5d08083d258f092e2a530f5bc1840657cb140fbbc5ec44293bc888258c44a18a9570cde149ed05819ac8320b9710cf22f699891e6ad
   languageName: node
   linkType: hard
 
@@ -6771,43 +6771,43 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cssnano-preset-default@npm:^7.0.4":
-  version: 7.0.4
-  resolution: "cssnano-preset-default@npm:7.0.4"
+"cssnano-preset-default@npm:^7.0.5":
+  version: 7.0.5
+  resolution: "cssnano-preset-default@npm:7.0.5"
   dependencies:
-    browserslist: "npm:^4.23.1"
+    browserslist: "npm:^4.23.3"
     css-declaration-sorter: "npm:^7.2.0"
     cssnano-utils: "npm:^5.0.0"
-    postcss-calc: "npm:^10.0.0"
-    postcss-colormin: "npm:^7.0.1"
-    postcss-convert-values: "npm:^7.0.2"
-    postcss-discard-comments: "npm:^7.0.1"
-    postcss-discard-duplicates: "npm:^7.0.0"
+    postcss-calc: "npm:^10.0.1"
+    postcss-colormin: "npm:^7.0.2"
+    postcss-convert-values: "npm:^7.0.3"
+    postcss-discard-comments: "npm:^7.0.2"
+    postcss-discard-duplicates: "npm:^7.0.1"
     postcss-discard-empty: "npm:^7.0.0"
     postcss-discard-overridden: "npm:^7.0.0"
-    postcss-merge-longhand: "npm:^7.0.2"
-    postcss-merge-rules: "npm:^7.0.2"
+    postcss-merge-longhand: "npm:^7.0.3"
+    postcss-merge-rules: "npm:^7.0.3"
     postcss-minify-font-values: "npm:^7.0.0"
     postcss-minify-gradients: "npm:^7.0.0"
-    postcss-minify-params: "npm:^7.0.1"
-    postcss-minify-selectors: "npm:^7.0.2"
+    postcss-minify-params: "npm:^7.0.2"
+    postcss-minify-selectors: "npm:^7.0.3"
     postcss-normalize-charset: "npm:^7.0.0"
     postcss-normalize-display-values: "npm:^7.0.0"
     postcss-normalize-positions: "npm:^7.0.0"
     postcss-normalize-repeat-style: "npm:^7.0.0"
     postcss-normalize-string: "npm:^7.0.0"
     postcss-normalize-timing-functions: "npm:^7.0.0"
-    postcss-normalize-unicode: "npm:^7.0.1"
+    postcss-normalize-unicode: "npm:^7.0.2"
     postcss-normalize-url: "npm:^7.0.0"
     postcss-normalize-whitespace: "npm:^7.0.0"
     postcss-ordered-values: "npm:^7.0.1"
-    postcss-reduce-initial: "npm:^7.0.1"
+    postcss-reduce-initial: "npm:^7.0.2"
     postcss-reduce-transforms: "npm:^7.0.0"
     postcss-svgo: "npm:^7.0.1"
-    postcss-unique-selectors: "npm:^7.0.1"
+    postcss-unique-selectors: "npm:^7.0.2"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/0083821e778bdf7b8aa9589408a01a717be730f73584e7b81756a6fcf87af05b8f17342025e666572a8d573cc30783f2d817b0f7ad63670398bc3135b017ccad
+  checksum: 10c0/ffa7c6fa16c6ad98b7732fc563de74d492e6ad6d243a9f00431c0cbdbc576bcd49226d2695d881465d32dea0a2916add40ac10e7560dd7b5de9fd0fa25ee081b
   languageName: node
   linkType: hard
 
@@ -6821,14 +6821,14 @@ __metadata:
   linkType: hard
 
 "cssnano@npm:^7.0.0":
-  version: 7.0.4
-  resolution: "cssnano@npm:7.0.4"
+  version: 7.0.5
+  resolution: "cssnano@npm:7.0.5"
   dependencies:
-    cssnano-preset-default: "npm:^7.0.4"
+    cssnano-preset-default: "npm:^7.0.5"
     lilconfig: "npm:^3.1.2"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/3939a0b37b11cb4bae92f7916517c7ba21257551f92517b49a640d5df32e855fb7e73321f4be44d2c2de578309c05d711cdcb1976e95607b1b7f92bd4cbd1350
+  checksum: 10c0/cb43ed964787dca33efb44d8f4fea8a49c495db44d1d12940493f0dd5d63db78e01c5b140fe42b480b332733602a25f4c85186d00977eb3070b29f7422761985
   languageName: node
   linkType: hard
 
@@ -7469,10 +7469,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"electron-to-chromium@npm:^1.4.796":
-  version: 1.4.806
-  resolution: "electron-to-chromium@npm:1.4.806"
-  checksum: 10c0/44f925ba64bb623d0482cd2f14fcfb27017cec1f11ee642e0d49cb128cd714ba5e074c2cd8756dfc18010aa66d3c64039cdea891905f7c17160a8963db574fab
+"electron-to-chromium@npm:^1.5.4":
+  version: 1.5.7
+  resolution: "electron-to-chromium@npm:1.5.7"
+  checksum: 10c0/be4460bbe3d2186a16d53a03da67fde6fd06ad41943553ce517a45d52e03424732a982f75528e8a2d5fb042d6afde64186aa482caec0fb925daa5a74cf5ef060
   languageName: node
   linkType: hard
 
@@ -12378,10 +12378,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"node-releases@npm:^2.0.14":
-  version: 2.0.14
-  resolution: "node-releases@npm:2.0.14"
-  checksum: 10c0/199fc93773ae70ec9969bc6d5ac5b2bbd6eb986ed1907d751f411fef3ede0e4bfdb45ceb43711f8078bea237b6036db8b1bf208f6ff2b70c7d615afd157f3ab9
+"node-releases@npm:^2.0.18":
+  version: 2.0.18
+  resolution: "node-releases@npm:2.0.18"
+  checksum: 10c0/786ac9db9d7226339e1dc84bbb42007cb054a346bd9257e6aa154d294f01bc6a6cddb1348fa099f079be6580acbb470e3c048effd5f719325abd0179e566fd27
   languageName: node
   linkType: hard
 
@@ -13323,15 +13323,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-calc@npm:^10.0.0":
-  version: 10.0.0
-  resolution: "postcss-calc@npm:10.0.0"
+"postcss-calc@npm:^10.0.1":
+  version: 10.0.1
+  resolution: "postcss-calc@npm:10.0.1"
   dependencies:
-    postcss-selector-parser: "npm:^6.0.16"
+    postcss-selector-parser: "npm:^6.1.1"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.38
-  checksum: 10c0/d4d529f2f71b49f17441eed74a7564ccd2779c72ed8648d4bb2530261a27c0ca01fe6a07260e7bf57e55f46dd68dea07e52fd1a6b538db7bc13015124be258a5
+  checksum: 10c0/5e38cc6f082f87e82067497b41684410784223ecd3701bf52242ea9f2f467f1fad6b5a561f8aa3be307d89435b4060f58aeb27c4064003586daf653cc4d91fef
   languageName: node
   linkType: hard
 
@@ -13385,29 +13385,29 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-colormin@npm:^7.0.1":
-  version: 7.0.1
-  resolution: "postcss-colormin@npm:7.0.1"
+"postcss-colormin@npm:^7.0.2":
+  version: 7.0.2
+  resolution: "postcss-colormin@npm:7.0.2"
   dependencies:
-    browserslist: "npm:^4.23.1"
+    browserslist: "npm:^4.23.3"
     caniuse-api: "npm:^3.0.0"
     colord: "npm:^2.9.3"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/e01e9e129ce39320cf10bb09ee2a3ab5b44b77805d3f7827eea07297644838b85c33b78996eeae0a1aba327ffd72a6ab1d24949ebc831523e310e916d5500371
+  checksum: 10c0/76d09fb7e0218698e622a7c2cfc9087985f48f3a7e44f2655d5eefac4ae9c04198ae9d408dc7ace15d3aa5bde80e7031e462b0cb9b5bd50cfa76bbb1503c755b
   languageName: node
   linkType: hard
 
-"postcss-convert-values@npm:^7.0.2":
-  version: 7.0.2
-  resolution: "postcss-convert-values@npm:7.0.2"
+"postcss-convert-values@npm:^7.0.3":
+  version: 7.0.3
+  resolution: "postcss-convert-values@npm:7.0.3"
   dependencies:
-    browserslist: "npm:^4.23.1"
+    browserslist: "npm:^4.23.3"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/beb59faf6aae97e6d3c233c5e6ed06cc60d65c49eec576036e3d0da1a831a1e827e3d41f5e81d016440b4f0bdf1406268ae069c4d5b38a6667b310c3da079d22
+  checksum: 10c0/dbb6278bd8d8b11e448933d823426c883bff3f6abeaa23c7530cc4668b9da6f714e073840f280273f8a14022c3a99eb461ec732f7539e062b32f5281e1be6526
   languageName: node
   linkType: hard
 
@@ -13465,23 +13465,23 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-discard-comments@npm:^7.0.1":
-  version: 7.0.1
-  resolution: "postcss-discard-comments@npm:7.0.1"
+"postcss-discard-comments@npm:^7.0.2":
+  version: 7.0.2
+  resolution: "postcss-discard-comments@npm:7.0.2"
   dependencies:
-    postcss-selector-parser: "npm:^6.1.0"
+    postcss-selector-parser: "npm:^6.1.1"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/64de3fced7e0e49dfea6aede8a5ca495b81dcd01c3c47734a5fbc86a3cb2b1ae39e1958e34e9bea64ecabd5fb4d8c287ec1d6189cf175c2434c6b6582da79948
+  checksum: 10c0/c01632e643b6ec1f61ad59efe06a9e8dfc7fcedeb1551ae48fc33fa801353f6222e31954286cd97171c694f34c2b4c7f7a2213fd0f913e37c34d0353258ed234
   languageName: node
   linkType: hard
 
-"postcss-discard-duplicates@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "postcss-discard-duplicates@npm:7.0.0"
+"postcss-discard-duplicates@npm:^7.0.1":
+  version: 7.0.1
+  resolution: "postcss-discard-duplicates@npm:7.0.1"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/37d568dc18d47b8b9f0fd6d5115b1faf96c2bf429fc4586508a773533479e18627d6260cad6a3ca7d3bfc2f220fd9448410aee40e07f2ec6c6f96bbe3595dbc8
+  checksum: 10c0/5cc2cac249f68004864865ea2ec38b7d5e28184f33e904e531ff57b533aacb73ec49e4a7d83219184001b8d167e5bcabc1673248134468d7ebaa0bfb9ff78f0a
   languageName: node
   linkType: hard
 
@@ -13617,29 +13617,29 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-merge-longhand@npm:^7.0.2":
-  version: 7.0.2
-  resolution: "postcss-merge-longhand@npm:7.0.2"
+"postcss-merge-longhand@npm:^7.0.3":
+  version: 7.0.3
+  resolution: "postcss-merge-longhand@npm:7.0.3"
   dependencies:
     postcss-value-parser: "npm:^4.2.0"
-    stylehacks: "npm:^7.0.2"
+    stylehacks: "npm:^7.0.3"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/71d22418e5850e134bfcf2038acb1c91eeb48d9b6f9e4c0252fee757e11dc4ae351097a855c327fbc38dc7658fa6edc7cc7f458c08bb4044b82c6005dc565fcb
+  checksum: 10c0/b968c3d16f3edc6075b20219a1165c089dc454a6a42951dcdfc94adb932fb96ef7bcd465c6cd21b0e5b55ac08921355ddbbbc7cdcf87a345e4bef8b3cdd2e7e9
   languageName: node
   linkType: hard
 
-"postcss-merge-rules@npm:^7.0.2":
-  version: 7.0.2
-  resolution: "postcss-merge-rules@npm:7.0.2"
+"postcss-merge-rules@npm:^7.0.3":
+  version: 7.0.3
+  resolution: "postcss-merge-rules@npm:7.0.3"
   dependencies:
-    browserslist: "npm:^4.23.1"
+    browserslist: "npm:^4.23.3"
     caniuse-api: "npm:^3.0.0"
     cssnano-utils: "npm:^5.0.0"
-    postcss-selector-parser: "npm:^6.1.0"
+    postcss-selector-parser: "npm:^6.1.1"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/fbad20382ca45f1b3b5ff704c075f899cc9ba8418ae6effbdeb9e7c1f9b5c24996d1941ad36cd0936d60cbf127a72f235b2cbb0c44d9239a8a61042406d95b4a
+  checksum: 10c0/3cd20484ab6d15c62eded408248d5eeaba52a573935943f933865680e070a0e75b3a7447802c575bc86e1fae667cf51d9d5766537835d9b8c090337b5adf928e
   languageName: node
   linkType: hard
 
@@ -13667,28 +13667,28 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-minify-params@npm:^7.0.1":
-  version: 7.0.1
-  resolution: "postcss-minify-params@npm:7.0.1"
+"postcss-minify-params@npm:^7.0.2":
+  version: 7.0.2
+  resolution: "postcss-minify-params@npm:7.0.2"
   dependencies:
-    browserslist: "npm:^4.23.1"
+    browserslist: "npm:^4.23.3"
     cssnano-utils: "npm:^5.0.0"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/84e1c4de5af47178c1f48e10ce16341560f32bb2becf5ec9b014103f6c706174bc70885e2e13ced4de9b4f1959fb970193261cbd4751c8b87d5159e859e8c5ec
+  checksum: 10c0/0e041f70554bae9d4a66c8ab2f2f3ed8bf73862c9d5ff9972ac7f1a596badd1544f093fa2362dd33e96c038af9e10287cdbfec9f480c49bffdcbaca9fdcb1e4e
   languageName: node
   linkType: hard
 
-"postcss-minify-selectors@npm:^7.0.2":
-  version: 7.0.2
-  resolution: "postcss-minify-selectors@npm:7.0.2"
+"postcss-minify-selectors@npm:^7.0.3":
+  version: 7.0.3
+  resolution: "postcss-minify-selectors@npm:7.0.3"
   dependencies:
     cssesc: "npm:^3.0.0"
-    postcss-selector-parser: "npm:^6.1.0"
+    postcss-selector-parser: "npm:^6.1.1"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/87e0c21a0135b6c61b58d62c4c1e0cbd3cfb516ff8105db714c6a33a5edc477846ae220399d368e4ef6518529c711aa2dee9ff49e9befd93e83d5c939f3084a1
+  checksum: 10c0/5211f63a1672f646a1bab57bd8eac0816d42adacb5e286ad5e6e342a795bb0d086bd6044a1b338311ca28f33f2c1833165ee611eaa671287379821ba3c5d68ad
   languageName: node
   linkType: hard
 
@@ -13813,15 +13813,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-normalize-unicode@npm:^7.0.1":
-  version: 7.0.1
-  resolution: "postcss-normalize-unicode@npm:7.0.1"
+"postcss-normalize-unicode@npm:^7.0.2":
+  version: 7.0.2
+  resolution: "postcss-normalize-unicode@npm:7.0.2"
   dependencies:
-    browserslist: "npm:^4.23.1"
+    browserslist: "npm:^4.23.3"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/fcabac738765f608cb211ac01a19f9a7d784f99d223ef6f31352f37b9bcf008e0ca7849414c9e77116be8660d78b01dba6fc4a87cee7c9a977d3c2741d6a222d
+  checksum: 10c0/0df1aac932cc2340715178fd024e0f6d872ea5a4bee1bc8357317a75a7b2c904d885f754cc162af001aa2a9ded7c54fac7cbcd701e21e995c1ace92dc08f2b9d
   languageName: node
   linkType: hard
 
@@ -13981,15 +13981,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-reduce-initial@npm:^7.0.1":
-  version: 7.0.1
-  resolution: "postcss-reduce-initial@npm:7.0.1"
+"postcss-reduce-initial@npm:^7.0.2":
+  version: 7.0.2
+  resolution: "postcss-reduce-initial@npm:7.0.2"
   dependencies:
-    browserslist: "npm:^4.23.1"
+    browserslist: "npm:^4.23.3"
     caniuse-api: "npm:^3.0.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/3e7c6c1d0cc4ace38f44971f02d0dd98131af678cf114aa05cfa0c066420019d5329c221ef8507644b8a79d0e76534303f747c97860ac777fe17f57110edefe1
+  checksum: 10c0/1e6fafaf5fac52b351c8de156ed62e4e1f48da7eb07f9ce90da54b45dca61da9af1e954b8a343271cb3e4ec99e0c5f18d7f9f96da0ca144511fca04498fac78c
   languageName: node
   linkType: hard
 
@@ -14049,7 +14049,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-selector-parser@npm:^6.0.13, postcss-selector-parser@npm:^6.0.16, postcss-selector-parser@npm:^6.0.2, postcss-selector-parser@npm:^6.0.4, postcss-selector-parser@npm:^6.1.0, postcss-selector-parser@npm:^6.1.1":
+"postcss-selector-parser@npm:^6.0.13, postcss-selector-parser@npm:^6.0.2, postcss-selector-parser@npm:^6.0.4, postcss-selector-parser@npm:^6.1.0, postcss-selector-parser@npm:^6.1.1":
   version: 6.1.1
   resolution: "postcss-selector-parser@npm:6.1.1"
   dependencies:
@@ -14071,14 +14071,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-unique-selectors@npm:^7.0.1":
-  version: 7.0.1
-  resolution: "postcss-unique-selectors@npm:7.0.1"
+"postcss-unique-selectors@npm:^7.0.2":
+  version: 7.0.2
+  resolution: "postcss-unique-selectors@npm:7.0.2"
   dependencies:
-    postcss-selector-parser: "npm:^6.1.0"
+    postcss-selector-parser: "npm:^6.1.1"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/6352d71ce2f65265f545831c2ce3686bd71961d08a2247c545d717d93d23b1eb08bb986efc11194d31970eea4cb42207b9aa9a3f4666d75492a6cbf1493cf466
+  checksum: 10c0/cc54c57cd1c5a6e3e166ec63cc036d9e2df80b05e508d9ce754ca4193bf8c1bfcc16b3c6f0d81b8352a3282201d249b90bb87abacfcfb9065c9e3705ea5d110e
   languageName: node
   linkType: hard
 
@@ -16603,15 +16603,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"stylehacks@npm:^7.0.2":
-  version: 7.0.2
-  resolution: "stylehacks@npm:7.0.2"
+"stylehacks@npm:^7.0.3":
+  version: 7.0.3
+  resolution: "stylehacks@npm:7.0.3"
   dependencies:
-    browserslist: "npm:^4.23.1"
-    postcss-selector-parser: "npm:^6.1.0"
+    browserslist: "npm:^4.23.3"
+    postcss-selector-parser: "npm:^6.1.1"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/552299e869ac430e1076c025ace6c80bdfd5b672632435625eb1bd45ff5611aad7f3ee810e72edc04dc0fc3761e08dec40d27b72c50b95690eea2de43238b8d8
+  checksum: 10c0/5030334b06ef705b5700444dab120b540b09159e935e75b60f25bd56db1d85f0d11755f0b0f64ce3f12c5a72ff1b6f57fea49c26d18eb0de2334d6a143b94f8d
   languageName: node
   linkType: hard
 
@@ -17552,9 +17552,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"update-browserslist-db@npm:^1.0.16":
-  version: 1.0.16
-  resolution: "update-browserslist-db@npm:1.0.16"
+"update-browserslist-db@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "update-browserslist-db@npm:1.1.0"
   dependencies:
     escalade: "npm:^3.1.2"
     picocolors: "npm:^1.0.1"
@@ -17562,7 +17562,7 @@ __metadata:
     browserslist: ">= 4.21.0"
   bin:
     update-browserslist-db: cli.js
-  checksum: 10c0/5995399fc202adbb51567e4810e146cdf7af630a92cc969365a099150cb00597e425cc14987ca7080b09a4d0cfd2a3de53fbe72eebff171aed7f9bb81f9bf405
+  checksum: 10c0/a7452de47785842736fb71547651c5bbe5b4dc1e3722ccf48a704b7b34e4dcf633991eaa8e4a6a517ffb738b3252eede3773bef673ef9021baa26b056d63a5b9
   languageName: node
   linkType: hard
 

From 7996a9543dd893c772355f41a9ac41b3854fee18 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 14 Aug 2024 09:34:30 +0200
Subject: [PATCH 1836/2191] Change notification request acceptance to
 immediately delete the request (#31256)

---
 .../accept_notification_request_service.rb    |  3 +-
 app/workers/unfilter_notifications_worker.rb  | 21 +++++++--
 ...ccept_notification_request_service_spec.rb | 19 ++++++++
 .../unfilter_notifications_worker_spec.rb     | 46 +++++++++++++++++++
 4 files changed, 83 insertions(+), 6 deletions(-)
 create mode 100644 spec/services/accept_notification_request_service_spec.rb
 create mode 100644 spec/workers/unfilter_notifications_worker_spec.rb

diff --git a/app/services/accept_notification_request_service.rb b/app/services/accept_notification_request_service.rb
index e49eae6fd300e2..ad27ae330074f6 100644
--- a/app/services/accept_notification_request_service.rb
+++ b/app/services/accept_notification_request_service.rb
@@ -3,6 +3,7 @@
 class AcceptNotificationRequestService < BaseService
   def call(request)
     NotificationPermission.create!(account: request.account, from_account: request.from_account)
-    UnfilterNotificationsWorker.perform_async(request.id)
+    UnfilterNotificationsWorker.perform_async(request.account_id, request.from_account_id)
+    request.destroy!
   end
 end
diff --git a/app/workers/unfilter_notifications_worker.rb b/app/workers/unfilter_notifications_worker.rb
index 223654aa165b01..5939a691fb6611 100644
--- a/app/workers/unfilter_notifications_worker.rb
+++ b/app/workers/unfilter_notifications_worker.rb
@@ -3,8 +3,19 @@
 class UnfilterNotificationsWorker
   include Sidekiq::Worker
 
-  def perform(notification_request_id)
-    @notification_request = NotificationRequest.find(notification_request_id)
+  # Earlier versions of the feature passed a `notification_request` ID
+  # If `to_account_id` is passed, the first argument is an account ID
+  # TODO for after 4.3.0: drop the single-argument case
+  def perform(notification_request_or_account_id, from_account_id = nil)
+    if from_account_id.present?
+      @notification_request = nil
+      @from_account = Account.find(from_account_id)
+      @recipient    = Account.find(notification_request_or_account_id)
+    else
+      @notification_request = NotificationRequest.find(notification_request_or_account_id)
+      @from_account = @notification_request.from_account
+      @recipient    = @notification_request.account
+    end
 
     push_to_conversations!
     unfilter_notifications!
@@ -16,7 +27,7 @@ def perform(notification_request_id)
   private
 
   def push_to_conversations!
-    notifications_with_private_mentions.find_each { |notification| AccountConversation.add_status(@notification_request.account, notification.target_status) }
+    notifications_with_private_mentions.reorder(nil).find_each(order: :desc) { |notification| AccountConversation.add_status(@recipient, notification.target_status) }
   end
 
   def unfilter_notifications!
@@ -24,11 +35,11 @@ def unfilter_notifications!
   end
 
   def remove_request!
-    @notification_request.destroy!
+    @notification_request&.destroy!
   end
 
   def filtered_notifications
-    Notification.where(account: @notification_request.account, from_account: @notification_request.from_account, filtered: true)
+    Notification.where(account: @recipient, from_account: @from_account, filtered: true)
   end
 
   def notifications_with_private_mentions
diff --git a/spec/services/accept_notification_request_service_spec.rb b/spec/services/accept_notification_request_service_spec.rb
new file mode 100644
index 00000000000000..bf67a52225f1d8
--- /dev/null
+++ b/spec/services/accept_notification_request_service_spec.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe AcceptNotificationRequestService do
+  subject { described_class.new }
+
+  let(:notification_request) { Fabricate(:notification_request) }
+
+  describe '#call' do
+    it 'destroys the notification request, creates a permission, and queues a worker' do
+      expect { subject.call(notification_request) }
+        .to change { NotificationRequest.exists?(notification_request.id) }.to(false)
+        .and change { NotificationPermission.exists?(account_id: notification_request.account_id, from_account_id: notification_request.from_account_id) }.to(true)
+
+      expect(UnfilterNotificationsWorker).to have_enqueued_sidekiq_job(notification_request.account_id, notification_request.from_account_id)
+    end
+  end
+end
diff --git a/spec/workers/unfilter_notifications_worker_spec.rb b/spec/workers/unfilter_notifications_worker_spec.rb
new file mode 100644
index 00000000000000..3f43b298a50049
--- /dev/null
+++ b/spec/workers/unfilter_notifications_worker_spec.rb
@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe UnfilterNotificationsWorker do
+  let(:recipient) { Fabricate(:account) }
+  let(:sender) { Fabricate(:account) }
+
+  before do
+    # Populate multiple kinds of filtered notifications
+    private_message = Fabricate(:status, account: sender, visibility: :direct)
+    mention = Fabricate(:mention, account: recipient, status: private_message)
+    Fabricate(:notification, filtered: true, from_account: sender, account: recipient, type: :mention, activity: mention)
+    follow_request = sender.request_follow!(recipient)
+    Fabricate(:notification, filtered: true, from_account: sender, account: recipient, type: :follow_request, activity: follow_request)
+  end
+
+  shared_examples 'shared behavior' do
+    it 'unfilters notifications and adds private messages to conversations' do
+      expect { subject }
+        .to change { recipient.notifications.where(from_account_id: sender.id).pluck(:filtered) }.from([true, true]).to([false, false])
+        .and change { recipient.conversations.exists?(last_status_id: sender.statuses.first.id) }.to(true)
+    end
+  end
+
+  describe '#perform' do
+    context 'with single argument (prerelease behavior)' do
+      subject { described_class.new.perform(notification_request.id) }
+
+      let(:notification_request) { Fabricate(:notification_request, from_account: sender, account: recipient) }
+
+      it_behaves_like 'shared behavior'
+
+      it 'destroys the notification request' do
+        expect { subject }
+          .to change { NotificationRequest.exists?(notification_request.id) }.to(false)
+      end
+    end
+
+    context 'with two arguments' do
+      subject { described_class.new.perform(recipient.id, sender.id) }
+
+      it_behaves_like 'shared behavior'
+    end
+  end
+end

From 8d969079334afc8b5abf04e4791fd404096214b4 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 14 Aug 2024 07:35:33 +0000
Subject: [PATCH 1837/2191] Update dependency @types/webpack to v4.41.39
 (#31379)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index fb8b6252aa0145..0b93feb012339f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4129,8 +4129,8 @@ __metadata:
   linkType: hard
 
 "@types/webpack@npm:^4.41.33":
-  version: 4.41.38
-  resolution: "@types/webpack@npm:4.41.38"
+  version: 4.41.39
+  resolution: "@types/webpack@npm:4.41.39"
   dependencies:
     "@types/node": "npm:*"
     "@types/tapable": "npm:^1"
@@ -4138,7 +4138,7 @@ __metadata:
     "@types/webpack-sources": "npm:*"
     anymatch: "npm:^3.0.0"
     source-map: "npm:^0.6.0"
-  checksum: 10c0/5a0a7465d45a0e7701a8c863e88c6cba7660b37e4aeab851c71baf505dbab2e178be1cac82488c2e7d0ea11fb703ceddb53476daec3ec9a004e2fc1554233483
+  checksum: 10c0/740420d092abb80b70263b02609bde209801b060d8e6f3a399a129945cb09182c2ce63dc816908bfbcdb123b35dc4c4fb51367aac2b5974537694cac2631db21
   languageName: node
   linkType: hard
 

From 95c11d365d9f3e4581fbafda0e3e47be39ee23a2 Mon Sep 17 00:00:00 2001
From: Jeong Arm <kjwonmail@gmail.com>
Date: Wed, 14 Aug 2024 17:57:42 +0900
Subject: [PATCH 1838/2191] Don't push to cache buster if attachment path is
 nil (#31414)

---
 app/models/media_attachment.rb       | 2 +-
 spec/models/media_attachment_spec.rb | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/models/media_attachment.rb b/app/models/media_attachment.rb
index a9470e1ad2085e..6708cd7793d321 100644
--- a/app/models/media_attachment.rb
+++ b/app/models/media_attachment.rb
@@ -422,7 +422,7 @@ def prepare_cache_bust!
       attachment = public_send(attachment_name)
       styles = DEFAULT_STYLES | attachment.styles.keys
       styles.map { |style| attachment.path(style) }
-    end
+    end.compact
   rescue => e
     # We really don't want any error here preventing media deletion
     Rails.logger.warn "Error #{e.class} busting cache: #{e.message}"
diff --git a/spec/models/media_attachment_spec.rb b/spec/models/media_attachment_spec.rb
index 3297387ff72730..50f8d00a5439c4 100644
--- a/spec/models/media_attachment_spec.rb
+++ b/spec/models/media_attachment_spec.rb
@@ -302,12 +302,10 @@
     it 'queues CacheBusterWorker jobs' do
       original_path = media.file.path(:original)
       small_path = media.file.path(:small)
-      thumbnail_path = media.thumbnail.path(:original)
 
       expect { media.destroy }
         .to enqueue_sidekiq_job(CacheBusterWorker).with(original_path)
         .and enqueue_sidekiq_job(CacheBusterWorker).with(small_path)
-        .and enqueue_sidekiq_job(CacheBusterWorker).with(thumbnail_path)
     end
   end
 

From 4fdaf4513dbfb53a57b9a30857ef62b47a375757 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 14 Aug 2024 11:21:51 +0200
Subject: [PATCH 1839/2191] Update dependency oj to v3.16.5 (#31417)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index f71b71ee4a7cf5..33d38284042f24 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -460,8 +460,9 @@ GEM
       concurrent-ruby (~> 1.0, >= 1.0.2)
       sidekiq (>= 3.5)
       statsd-ruby (~> 1.4, >= 1.4.0)
-    oj (3.16.4)
+    oj (3.16.5)
       bigdecimal (>= 3.0)
+      ostruct (>= 0.2)
     omniauth (2.1.2)
       hashie (>= 3.4.6)
       rack (>= 2.2.3)
@@ -582,6 +583,7 @@ GEM
     opentelemetry-semantic_conventions (1.10.1)
       opentelemetry-api (~> 1.0)
     orm_adapter (0.5.0)
+    ostruct (0.6.0)
     ox (2.14.18)
     parallel (1.25.1)
     parser (3.3.4.0)

From 5b2750e384539a68c31a538bdc0a0842095cc902 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 14 Aug 2024 11:45:14 +0200
Subject: [PATCH 1840/2191] Update dependency libvips to v8.15.3 (#31416)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index a0af1eda6b65fa..65440bb28117ac 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -191,7 +191,7 @@ FROM build AS libvips
 
 # libvips version to compile, change with [--build-arg VIPS_VERSION="8.15.2"]
 # renovate: datasource=github-releases depName=libvips packageName=libvips/libvips
-ARG VIPS_VERSION=8.15.2
+ARG VIPS_VERSION=8.15.3
 # libvips download URL, change with [--build-arg VIPS_URL="https://github.com/libvips/libvips/releases/download"]
 ARG VIPS_URL=https://github.com/libvips/libvips/releases/download
 

From b5ad4aae238d6beded6afd69132ff3770efe4ac6 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 14 Aug 2024 14:48:01 +0200
Subject: [PATCH 1841/2191] Update dependency propshaft to v0.9.1 (#31421)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 33d38284042f24..2a3a2b3893e0d2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -603,7 +603,7 @@ GEM
       actionmailer (>= 3)
       net-smtp
       premailer (~> 1.7, >= 1.7.9)
-    propshaft (0.9.0)
+    propshaft (0.9.1)
       actionpack (>= 7.0.0)
       activesupport (>= 7.0.0)
       rack
@@ -906,7 +906,7 @@ GEM
     xorcist (1.1.3)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.16)
+    zeitwerk (2.6.17)
 
 PLATFORMS
   ruby

From b5e799d165386525bebbd7ae7dde68a163332307 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 14 Aug 2024 13:12:16 +0000
Subject: [PATCH 1842/2191] Update dependency postcss to v8.4.41 (#31420)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 0b93feb012339f..597d0735676fa7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -14090,13 +14090,13 @@ __metadata:
   linkType: hard
 
 "postcss@npm:^8.2.15, postcss@npm:^8.4.24, postcss@npm:^8.4.40":
-  version: 8.4.40
-  resolution: "postcss@npm:8.4.40"
+  version: 8.4.41
+  resolution: "postcss@npm:8.4.41"
   dependencies:
     nanoid: "npm:^3.3.7"
     picocolors: "npm:^1.0.1"
     source-map-js: "npm:^1.2.0"
-  checksum: 10c0/65ed67573e5443beaeb582282ff27a6be7c7fe3b4d9fa15761157616f2b97510cb1c335023c26220b005909f007337026d6e3ff092f25010b484ad484e80ea7f
+  checksum: 10c0/c1828fc59e7ec1a3bf52b3a42f615dba53c67960ed82a81df6441b485fe43c20aba7f4e7c55425762fd99c594ecabbaaba8cf5b30fd79dfec5b52a9f63a2d690
   languageName: node
   linkType: hard
 

From 5c91610e5391b888d2e25f1c2c52cb395944fd70 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 14 Aug 2024 14:23:17 +0000
Subject: [PATCH 1843/2191] Update dependency postcss-preset-env to v10.0.1
 (#31422)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 154 +++++++++++++++++++++++++++---------------------------
 1 file changed, 77 insertions(+), 77 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 597d0735676fa7..f0d64d73bf9795 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1579,10 +1579,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/color-helpers@npm:^4.2.1":
-  version: 4.2.1
-  resolution: "@csstools/color-helpers@npm:4.2.1"
-  checksum: 10c0/72e11b186ad0f6019a9b4b3752e620fa798c2a40cf47e8cad565dff46e572c9342eb8cf804542d7886344a1e540555d77f20119ace6b2d8a45b6e5ef8a41685c
+"@csstools/color-helpers@npm:^5.0.1":
+  version: 5.0.1
+  resolution: "@csstools/color-helpers@npm:5.0.1"
+  checksum: 10c0/77fa3b7236eaa3f36dea24708ac0d5e53168903624ac5aed54615752a0730cd20773fda50e742ce868012eca8c000cc39688e05869e79f34714230ab6968d1e6
   languageName: node
   linkType: hard
 
@@ -1596,16 +1596,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/css-color-parser@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "@csstools/css-color-parser@npm:3.0.0"
+"@csstools/css-color-parser@npm:^3.0.1":
+  version: 3.0.1
+  resolution: "@csstools/css-color-parser@npm:3.0.1"
   dependencies:
-    "@csstools/color-helpers": "npm:^4.2.1"
+    "@csstools/color-helpers": "npm:^5.0.1"
     "@csstools/css-calc": "npm:^2.0.0"
   peerDependencies:
     "@csstools/css-parser-algorithms": ^3.0.0
     "@csstools/css-tokenizer": ^3.0.0
-  checksum: 10c0/9b56ba3b56691d2133f1d9b881131bfd9745024a79f825284109adac05578e15ae3eed0e99c98db162932d69770fc970b5b005996c32cdf7167af3418da263c3
+  checksum: 10c0/8890a621f916cbbf49e749d4e85e934ce55c9f9c339abcc5f4a64bc165605a6e8dd3cad9d3bbc994d2419a3b38981dca84b93ae50aa91d492fb5f0f4c9d95969
   languageName: node
   linkType: hard
 
@@ -1673,33 +1673,33 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-color-function@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "@csstools/postcss-color-function@npm:4.0.0"
+"@csstools/postcss-color-function@npm:^4.0.1":
+  version: 4.0.1
+  resolution: "@csstools/postcss-color-function@npm:4.0.1"
   dependencies:
-    "@csstools/css-color-parser": "npm:^3.0.0"
+    "@csstools/css-color-parser": "npm:^3.0.1"
     "@csstools/css-parser-algorithms": "npm:^3.0.0"
     "@csstools/css-tokenizer": "npm:^3.0.0"
     "@csstools/postcss-progressive-custom-properties": "npm:^4.0.0"
     "@csstools/utilities": "npm:^2.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/ff0c0c44f5d17bc5e7ea287eff9c10ca334a84d086998a6b243a209f1795d32ba872357935f4176e5206b88dc8d2a204f452c13bc940540b7122e9e807511ac6
+  checksum: 10c0/f0d3dd0677d381df54987d13ea63a59e911816d98a22eda7a5e55ca2908f52afc42fbffb73a8d25a18632b936dc38f6ada9f3e2dd7911cf775ce3718657420f4
   languageName: node
   linkType: hard
 
-"@csstools/postcss-color-mix-function@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "@csstools/postcss-color-mix-function@npm:3.0.0"
+"@csstools/postcss-color-mix-function@npm:^3.0.1":
+  version: 3.0.1
+  resolution: "@csstools/postcss-color-mix-function@npm:3.0.1"
   dependencies:
-    "@csstools/css-color-parser": "npm:^3.0.0"
+    "@csstools/css-color-parser": "npm:^3.0.1"
     "@csstools/css-parser-algorithms": "npm:^3.0.0"
     "@csstools/css-tokenizer": "npm:^3.0.0"
     "@csstools/postcss-progressive-custom-properties": "npm:^4.0.0"
     "@csstools/utilities": "npm:^2.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/120e96581834b2363df1fb653959dc243d93c01bcd70bf2e34418c20cd418a75f8b4e2e81da6955345619dcbb246e7d023f395521522bacb455583c15f61c677
+  checksum: 10c0/ff76400d132c42d70f58b0908ab602b550b43720320288eb4ca1f185e7340c6f232b2a789ac94be255fc7bedc3c6125314d564297d23606fb2c91a1e2d79c40b
   languageName: node
   linkType: hard
 
@@ -1742,46 +1742,46 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-gamut-mapping@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "@csstools/postcss-gamut-mapping@npm:2.0.0"
+"@csstools/postcss-gamut-mapping@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "@csstools/postcss-gamut-mapping@npm:2.0.1"
   dependencies:
-    "@csstools/css-color-parser": "npm:^3.0.0"
+    "@csstools/css-color-parser": "npm:^3.0.1"
     "@csstools/css-parser-algorithms": "npm:^3.0.0"
     "@csstools/css-tokenizer": "npm:^3.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/be1d7f4c96f3bbcb69ed4ccc2ff406a884ae7129e6542ab6800782fbfe4e077159352409961f2da8054ec9fabbf6ed211288f1004c96632a1f6b10bef332d880
+  checksum: 10c0/3415c420463dd481a3ddf5b104f15661492d9aa3613c109f9b7354b2664965a92036045e157945348cf2c06e075b89a0c0c4f49c8a00d41c827c5b61de297cd0
   languageName: node
   linkType: hard
 
-"@csstools/postcss-gradients-interpolation-method@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "@csstools/postcss-gradients-interpolation-method@npm:5.0.0"
+"@csstools/postcss-gradients-interpolation-method@npm:^5.0.1":
+  version: 5.0.1
+  resolution: "@csstools/postcss-gradients-interpolation-method@npm:5.0.1"
   dependencies:
-    "@csstools/css-color-parser": "npm:^3.0.0"
+    "@csstools/css-color-parser": "npm:^3.0.1"
     "@csstools/css-parser-algorithms": "npm:^3.0.0"
     "@csstools/css-tokenizer": "npm:^3.0.0"
     "@csstools/postcss-progressive-custom-properties": "npm:^4.0.0"
     "@csstools/utilities": "npm:^2.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/04e29fd877a499b9570665aea5b23cd70635b538dd903b9f9706ddd85a2d9c93445aea4b6b7dbcf8986ab58b45bb502ec5060044d945096d0af2eb6cebadb88e
+  checksum: 10c0/a1c5d6bf308ff9e1972cb39030859cd135246f8f697e5d1278ddd8ed27ce53eb76b3e628acc64145290006f45140d0a4a65e5df71f131d3e6447f0e5d3301088
   languageName: node
   linkType: hard
 
-"@csstools/postcss-hwb-function@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "@csstools/postcss-hwb-function@npm:4.0.0"
+"@csstools/postcss-hwb-function@npm:^4.0.1":
+  version: 4.0.1
+  resolution: "@csstools/postcss-hwb-function@npm:4.0.1"
   dependencies:
-    "@csstools/css-color-parser": "npm:^3.0.0"
+    "@csstools/css-color-parser": "npm:^3.0.1"
     "@csstools/css-parser-algorithms": "npm:^3.0.0"
     "@csstools/css-tokenizer": "npm:^3.0.0"
     "@csstools/postcss-progressive-custom-properties": "npm:^4.0.0"
     "@csstools/utilities": "npm:^2.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/1aff69ca364417ac2b7ef1c737f88567f441bfd54d93d7b635e0ad605c61edcc2282bc0e2df73c83d1c6a24487e0acec34a4585d27d5f6027402aaea71696190
+  checksum: 10c0/3247c3ab75d3cdb0ca80f7bb63d944ce933694ee9d7ee68aea11e727e883e0d35936b4a29e28700bda5eea2be26917a6c95c22a6b244e945cc558669f88b8a6e
   languageName: node
   linkType: hard
 
@@ -1819,9 +1819,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-light-dark-function@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "@csstools/postcss-light-dark-function@npm:2.0.0"
+"@csstools/postcss-light-dark-function@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "@csstools/postcss-light-dark-function@npm:2.0.1"
   dependencies:
     "@csstools/css-parser-algorithms": "npm:^3.0.0"
     "@csstools/css-tokenizer": "npm:^3.0.0"
@@ -1829,7 +1829,7 @@ __metadata:
     "@csstools/utilities": "npm:^2.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/d0eb1e04854c4ae425c6aff51ce9d0db90e9457aea3307d3ed916f500d2b5a3314a25d3487ea893e7b006a34c0d155462566d6066c8c54baec33eb104891c6db
+  checksum: 10c0/4caf23781daa72f036a830b7fc2c07cde1122afd7bc7c6a291992b5264ea92c1fb22ec2ed684c5ce50e6e848f6d0ea39ef34a5679ea37a546b8db6eb555e3f80
   languageName: node
   linkType: hard
 
@@ -1933,18 +1933,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-oklab-function@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "@csstools/postcss-oklab-function@npm:4.0.0"
+"@csstools/postcss-oklab-function@npm:^4.0.1":
+  version: 4.0.1
+  resolution: "@csstools/postcss-oklab-function@npm:4.0.1"
   dependencies:
-    "@csstools/css-color-parser": "npm:^3.0.0"
+    "@csstools/css-color-parser": "npm:^3.0.1"
     "@csstools/css-parser-algorithms": "npm:^3.0.0"
     "@csstools/css-tokenizer": "npm:^3.0.0"
     "@csstools/postcss-progressive-custom-properties": "npm:^4.0.0"
     "@csstools/utilities": "npm:^2.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/9e228049645e6a6baa77d6e7e35b3862f3e2e4836fbf2de43fa246d91f0efa36e7f18eae3f2b224c61e72628aaf14d4bff86c555fb06378d5e05e71dca92f9ec
+  checksum: 10c0/b4450fb792c505936e1f9290e8df5420e98ccba78fa1badc9261ff99bebff8cc3b1f050e518728de791acadba08b5e8c213d97b479f551b72b4f8a5793625998
   languageName: node
   linkType: hard
 
@@ -1959,18 +1959,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-relative-color-syntax@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "@csstools/postcss-relative-color-syntax@npm:3.0.0"
+"@csstools/postcss-relative-color-syntax@npm:^3.0.1":
+  version: 3.0.1
+  resolution: "@csstools/postcss-relative-color-syntax@npm:3.0.1"
   dependencies:
-    "@csstools/css-color-parser": "npm:^3.0.0"
+    "@csstools/css-color-parser": "npm:^3.0.1"
     "@csstools/css-parser-algorithms": "npm:^3.0.0"
     "@csstools/css-tokenizer": "npm:^3.0.0"
     "@csstools/postcss-progressive-custom-properties": "npm:^4.0.0"
     "@csstools/utilities": "npm:^2.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/d7ae180d746bd9778d8b9f74f8d644f4c6a98b29659423d4ee2b48f461e90a3e30b44dcf44a181ade083b6c6d1b0346b7b3e62fe67fdeaba59a13f050a19c7d1
+  checksum: 10c0/95a0001549b0fcae6add7db6264d16183734a9dd94e54e9b606b0dcefbd96540d8917707eef2525a5024e4078ef039acfa05c2c1b309fe444a7fc1f1c05d6594
   languageName: node
   linkType: hard
 
@@ -1998,15 +1998,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-text-decoration-shorthand@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "@csstools/postcss-text-decoration-shorthand@npm:4.0.0"
+"@csstools/postcss-text-decoration-shorthand@npm:^4.0.1":
+  version: 4.0.1
+  resolution: "@csstools/postcss-text-decoration-shorthand@npm:4.0.1"
   dependencies:
-    "@csstools/color-helpers": "npm:^4.2.1"
+    "@csstools/color-helpers": "npm:^5.0.1"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/dedc98134648d5306e795e4176b2c39a578a237669562e7d934d0b0ac7411d37bab4065c8b0adfc075b57250daba62f045b86c79286b5f9be55502acef0d88c6
+  checksum: 10c0/81950e248d6019c0066353895e0fa2a5c684b754c9af349218cb919534f5ebf79e5e9c7a10b3af1e9c56de2f246968de3b87a00d8c4102e5f88e0f05c04f9889
   languageName: node
   linkType: hard
 
@@ -13346,18 +13346,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-color-functional-notation@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "postcss-color-functional-notation@npm:7.0.0"
+"postcss-color-functional-notation@npm:^7.0.1":
+  version: 7.0.1
+  resolution: "postcss-color-functional-notation@npm:7.0.1"
   dependencies:
-    "@csstools/css-color-parser": "npm:^3.0.0"
+    "@csstools/css-color-parser": "npm:^3.0.1"
     "@csstools/css-parser-algorithms": "npm:^3.0.0"
     "@csstools/css-tokenizer": "npm:^3.0.0"
     "@csstools/postcss-progressive-custom-properties": "npm:^4.0.0"
     "@csstools/utilities": "npm:^2.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/6afe7b681a16783a27fa9600db348f995dfdbc9c945f6cdcec94ee2419e09cfd1c6e533264b830207f130e19ae18ff689ad9b48bced338f27f898eaecd61f844
+  checksum: 10c0/0cdfae4d85cb34425c8363b699b5da6f0c8cc43e7ce3b7fdd1fd39429ee81a4af75f973cd5c8293b1072688064da17a0a633827f23667e8cc0ff16217f0004eb
   languageName: node
   linkType: hard
 
@@ -13568,18 +13568,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-lab-function@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "postcss-lab-function@npm:7.0.0"
+"postcss-lab-function@npm:^7.0.1":
+  version: 7.0.1
+  resolution: "postcss-lab-function@npm:7.0.1"
   dependencies:
-    "@csstools/css-color-parser": "npm:^3.0.0"
+    "@csstools/css-color-parser": "npm:^3.0.1"
     "@csstools/css-parser-algorithms": "npm:^3.0.0"
     "@csstools/css-tokenizer": "npm:^3.0.0"
     "@csstools/postcss-progressive-custom-properties": "npm:^4.0.0"
     "@csstools/utilities": "npm:^2.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/f3647bcdd8d6140631b97276ecf51f40df2c7564610262a20c608c37c8ab79bf6e02888419dc657afc4720a7378e3ad19f4fdf811a69363424160d548ac68daf
+  checksum: 10c0/8a6f3f465911c5c608650e3ebec01097d274109eea0fceb925f1ca52213c67a6496570ff2ba9af0a6c2153e208ef1d10cc43ad81f38405f5d39639680f7150a9
   languageName: node
   linkType: hard
 
@@ -13900,22 +13900,22 @@ __metadata:
   linkType: hard
 
 "postcss-preset-env@npm:^10.0.0":
-  version: 10.0.0
-  resolution: "postcss-preset-env@npm:10.0.0"
+  version: 10.0.1
+  resolution: "postcss-preset-env@npm:10.0.1"
   dependencies:
     "@csstools/postcss-cascade-layers": "npm:^5.0.0"
-    "@csstools/postcss-color-function": "npm:^4.0.0"
-    "@csstools/postcss-color-mix-function": "npm:^3.0.0"
+    "@csstools/postcss-color-function": "npm:^4.0.1"
+    "@csstools/postcss-color-mix-function": "npm:^3.0.1"
     "@csstools/postcss-content-alt-text": "npm:^2.0.0"
     "@csstools/postcss-exponential-functions": "npm:^2.0.0"
     "@csstools/postcss-font-format-keywords": "npm:^4.0.0"
-    "@csstools/postcss-gamut-mapping": "npm:^2.0.0"
-    "@csstools/postcss-gradients-interpolation-method": "npm:^5.0.0"
-    "@csstools/postcss-hwb-function": "npm:^4.0.0"
+    "@csstools/postcss-gamut-mapping": "npm:^2.0.1"
+    "@csstools/postcss-gradients-interpolation-method": "npm:^5.0.1"
+    "@csstools/postcss-hwb-function": "npm:^4.0.1"
     "@csstools/postcss-ic-unit": "npm:^4.0.0"
     "@csstools/postcss-initial": "npm:^2.0.0"
     "@csstools/postcss-is-pseudo-class": "npm:^5.0.0"
-    "@csstools/postcss-light-dark-function": "npm:^2.0.0"
+    "@csstools/postcss-light-dark-function": "npm:^2.0.1"
     "@csstools/postcss-logical-float-and-clear": "npm:^3.0.0"
     "@csstools/postcss-logical-overflow": "npm:^2.0.0"
     "@csstools/postcss-logical-overscroll-behavior": "npm:^2.0.0"
@@ -13925,12 +13925,12 @@ __metadata:
     "@csstools/postcss-media-queries-aspect-ratio-number-values": "npm:^3.0.0"
     "@csstools/postcss-nested-calc": "npm:^4.0.0"
     "@csstools/postcss-normalize-display-values": "npm:^4.0.0"
-    "@csstools/postcss-oklab-function": "npm:^4.0.0"
+    "@csstools/postcss-oklab-function": "npm:^4.0.1"
     "@csstools/postcss-progressive-custom-properties": "npm:^4.0.0"
-    "@csstools/postcss-relative-color-syntax": "npm:^3.0.0"
+    "@csstools/postcss-relative-color-syntax": "npm:^3.0.1"
     "@csstools/postcss-scope-pseudo-class": "npm:^4.0.0"
     "@csstools/postcss-stepped-value-functions": "npm:^4.0.0"
-    "@csstools/postcss-text-decoration-shorthand": "npm:^4.0.0"
+    "@csstools/postcss-text-decoration-shorthand": "npm:^4.0.1"
     "@csstools/postcss-trigonometric-functions": "npm:^4.0.0"
     "@csstools/postcss-unset-value": "npm:^4.0.0"
     autoprefixer: "npm:^10.4.19"
@@ -13941,7 +13941,7 @@ __metadata:
     cssdb: "npm:^8.1.0"
     postcss-attribute-case-insensitive: "npm:^7.0.0"
     postcss-clamp: "npm:^4.1.0"
-    postcss-color-functional-notation: "npm:^7.0.0"
+    postcss-color-functional-notation: "npm:^7.0.1"
     postcss-color-hex-alpha: "npm:^10.0.0"
     postcss-color-rebeccapurple: "npm:^10.0.0"
     postcss-custom-media: "npm:^11.0.0"
@@ -13954,7 +13954,7 @@ __metadata:
     postcss-font-variant: "npm:^5.0.0"
     postcss-gap-properties: "npm:^6.0.0"
     postcss-image-set-function: "npm:^7.0.0"
-    postcss-lab-function: "npm:^7.0.0"
+    postcss-lab-function: "npm:^7.0.1"
     postcss-logical: "npm:^8.0.0"
     postcss-nesting: "npm:^13.0.0"
     postcss-opacity-percentage: "npm:^2.0.0"
@@ -13966,7 +13966,7 @@ __metadata:
     postcss-selector-not: "npm:^8.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/0b61c44233ee7fd17e32912ce028edc19998f30183f1ff2186523c4f9eac4a2a36513af31670e13ceb05f2146c4549a0b870ba0de0e3a08e77a9d57d8de72654
+  checksum: 10c0/5849915d040413f68ab71b3489daaa5b6687b4d4710da47a0d1420df0890858f0b53c9ec6755d872dbe38a2695ab12584be654456e3d6ce311b88927209c02b2
   languageName: node
   linkType: hard
 

From 3cc2968344b204449fa6808df2333ce8d5a73d10 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 14 Aug 2024 14:55:01 +0000
Subject: [PATCH 1844/2191] Update dependency wicg-inert to v3.1.3 (#31423)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index f0d64d73bf9795..2de7428b663065 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -18269,9 +18269,9 @@ __metadata:
   linkType: hard
 
 "wicg-inert@npm:^3.1.2":
-  version: 3.1.2
-  resolution: "wicg-inert@npm:3.1.2"
-  checksum: 10c0/5b20eaedcb30f1093fb6afd0480a059e40814da56c6052469c6fe95dd2d288b89c55ed1bdbfae4db70fd5ec8148dda8dd3b671a27a26870c8f77626b13cedd1b
+  version: 3.1.3
+  resolution: "wicg-inert@npm:3.1.3"
+  checksum: 10c0/160b981584e40d3a568af16a93b70dca847d9fce6d6704b40c60a9a1435f77406cc1abc56aa1bb5a63669c6cb819f09d51d7f27c16f3829cb86052e3fd27f2b0
   languageName: node
   linkType: hard
 

From a1ddaa9ee96ab1d05f4e37f3472b0418e0d5628e Mon Sep 17 00:00:00 2001
From: Michael Stanclift <mx@vmstan.com>
Date: Wed, 14 Aug 2024 12:09:23 -0500
Subject: [PATCH 1845/2191] Fix removal of border from account listing (#31432)

---
 app/javascript/styles/mastodon/admin.scss      | 1 +
 app/javascript/styles/mastodon/components.scss | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/javascript/styles/mastodon/admin.scss b/app/javascript/styles/mastodon/admin.scss
index a1b4e74e0df776..0df8d7a271cb01 100644
--- a/app/javascript/styles/mastodon/admin.scss
+++ b/app/javascript/styles/mastodon/admin.scss
@@ -872,6 +872,7 @@ a.name-tag,
 
     .account {
       padding: 0;
+      border: none;
 
       &__avatar-wrapper {
         margin-inline-start: 0;
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index b049635d163a8d..8373cad0ce3e8e 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -1808,6 +1808,7 @@ body > [data-popper-placement] {
 
 .account {
   padding: 16px;
+  border-bottom: 1px solid var(--background-border-color);
 
   .account__display-name {
     flex: 1 1 auto;

From d3db2d04adfd14561b77006e9e0c99817475874f Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Tue, 13 Aug 2024 09:14:41 +0200
Subject: [PATCH 1846/2191] [Glitch] Add a border above the timeline hint for
 statuses with replies

Port 7e501c59c2acc0bba7fb5b3d1b6ca43171c89f02 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/components/timeline_hint.tsx           | 7 +++++--
 app/javascript/flavours/glitch/features/status/index.jsx   | 2 +-
 app/javascript/flavours/glitch/styles/components.scss      | 4 ++++
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/javascript/flavours/glitch/components/timeline_hint.tsx b/app/javascript/flavours/glitch/components/timeline_hint.tsx
index bf2a2d8bbaeda7..6faad2fbb875eb 100644
--- a/app/javascript/flavours/glitch/components/timeline_hint.tsx
+++ b/app/javascript/flavours/glitch/components/timeline_hint.tsx
@@ -1,12 +1,15 @@
 import { FormattedMessage } from 'react-intl';
 
+import classNames from 'classnames';
+
 interface Props {
   resource: JSX.Element;
   url: string;
+  className?: string;
 }
 
-export const TimelineHint: React.FC<Props> = ({ resource, url }) => (
-  <div className='timeline-hint'>
+export const TimelineHint: React.FC<Props> = ({ className, resource, url }) => (
+  <div className={classNames('timeline-hint', className)}>
     <strong>
       <FormattedMessage
         id='timeline_hint.remote_resource_not_displayed'
diff --git a/app/javascript/flavours/glitch/features/status/index.jsx b/app/javascript/flavours/glitch/features/status/index.jsx
index cdc567d9c60a7f..382f0ae03740c6 100644
--- a/app/javascript/flavours/glitch/features/status/index.jsx
+++ b/app/javascript/flavours/glitch/features/status/index.jsx
@@ -655,7 +655,7 @@ class Status extends ImmutablePureComponent {
     const isIndexable = !status.getIn(['account', 'noindex']);
 
     if (!isLocal) {
-      remoteHint = <TimelineHint url={status.get('url')} resource={<FormattedMessage id='timeline_hint.resources.replies' defaultMessage='Some replies' />} />;
+      remoteHint = <TimelineHint className={classNames(!!descendants && 'timeline-hint--with-descendants')} url={status.get('url')} resource={<FormattedMessage id='timeline_hint.resources.replies' defaultMessage='Some replies' />} />;
     }
 
     const handlers = {
diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index 601666ac053fbb..0dac18b07e622f 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -4453,6 +4453,10 @@ a.status-card {
   }
 }
 
+.timeline-hint--with-descendants {
+  border-top: 1px solid var(--background-border-color);
+}
+
 .regeneration-indicator {
   text-align: center;
   font-size: 16px;

From 072f560174958571636ff5e01b7363bb632d3c6b Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Tue, 13 Aug 2024 09:26:23 +0200
Subject: [PATCH 1847/2191] [Glitch] Change avatars border radius

Port f6d090fdf5912f390c3d1fe5b43f15c1f0704bd3 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/styles/admin.scss      | 6 +++---
 app/javascript/flavours/glitch/styles/components.scss | 5 +++--
 app/javascript/flavours/glitch/styles/containers.scss | 2 +-
 app/javascript/flavours/glitch/styles/forms.scss      | 2 +-
 app/javascript/flavours/glitch/styles/variables.scss  | 1 +
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/javascript/flavours/glitch/styles/admin.scss b/app/javascript/flavours/glitch/styles/admin.scss
index f8cc9ae5cc2f6b..2b704cfaac37b7 100644
--- a/app/javascript/flavours/glitch/styles/admin.scss
+++ b/app/javascript/flavours/glitch/styles/admin.scss
@@ -718,7 +718,7 @@ body,
     top: 15px;
 
     .avatar {
-      border-radius: 4px;
+      border-radius: var(--avatar-border-radius);
       width: 40px;
       height: 40px;
     }
@@ -769,7 +769,7 @@ body,
     top: 15px;
 
     .avatar {
-      border-radius: 4px;
+      border-radius: var(--avatar-border-radius);
       width: 40px;
       height: 40px;
     }
@@ -1616,7 +1616,7 @@ a.sparkline {
       position: absolute;
       inset-inline-start: 15px;
       top: 15px;
-      border-radius: 4px;
+      border-radius: var(--avatar-border-radius);
       width: 40px;
       height: 40px;
     }
diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index 0dac18b07e622f..fba67c566f2d14 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -2178,13 +2178,14 @@ body > [data-popper-placement] {
 .account__avatar {
   display: block;
   position: relative;
+  border-radius: var(--avatar-border-radius);
 
   img {
     display: block;
     width: 100%;
     height: 100%;
     object-fit: cover;
-    border-radius: 4px;
+    border-radius: var(--avatar-border-radius);
   }
 
   &-inline {
@@ -8526,7 +8527,7 @@ noscript {
       .account__avatar {
         background: var(--background-color);
         border: 1px solid var(--background-border-color);
-        border-radius: 4px;
+        border-radius: var(--avatar-border-radius);
       }
     }
   }
diff --git a/app/javascript/flavours/glitch/styles/containers.scss b/app/javascript/flavours/glitch/styles/containers.scss
index 9363e428b3809b..ac1f862a099e06 100644
--- a/app/javascript/flavours/glitch/styles/containers.scss
+++ b/app/javascript/flavours/glitch/styles/containers.scss
@@ -81,7 +81,7 @@
       height: 100%;
       display: block;
       margin: 0;
-      border-radius: 4px;
+      border-radius: var(--avatar-border-radius);
     }
   }
 
diff --git a/app/javascript/flavours/glitch/styles/forms.scss b/app/javascript/flavours/glitch/styles/forms.scss
index 9e3bd11c34b6ab..8a056694f90404 100644
--- a/app/javascript/flavours/glitch/styles/forms.scss
+++ b/app/javascript/flavours/glitch/styles/forms.scss
@@ -313,7 +313,7 @@ code {
       margin-bottom: 10px;
       max-width: 100%;
       height: auto;
-      border-radius: 4px;
+      border-radius: var(--avatar-border-radius);
       background: url('images/void.png');
 
       &[src$='missing.png'] {
diff --git a/app/javascript/flavours/glitch/styles/variables.scss b/app/javascript/flavours/glitch/styles/variables.scss
index 3a1280948351df..5b8ffbb4d7828e 100644
--- a/app/javascript/flavours/glitch/styles/variables.scss
+++ b/app/javascript/flavours/glitch/styles/variables.scss
@@ -114,4 +114,5 @@ $dismiss-overlay-width: 4rem;
   --surface-background-color: #{darken($ui-base-color, 4%)};
   --surface-variant-background-color: #{$ui-base-color};
   --surface-variant-active-background-color: #{lighten($ui-base-color, 4%)};
+  --avatar-border-radius: 8px;
 }

From a190efcd6d76d7e3c1e2455881a93ad60562bb5a Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 13 Aug 2024 19:48:28 +0200
Subject: [PATCH 1848/2191] [Glitch] Fix modal border and padding
 inconsistencies

Port 2b1670da48ea532300db79a82f0e6e4202f5b337 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/styles/components.scss | 9 +++++----
 app/javascript/flavours/glitch/styles/variables.scss  | 1 +
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index fba67c566f2d14..249d18ae353780 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -3019,7 +3019,7 @@ $ui-header-logo-wordmark-width: 99px;
   overflow: hidden;
 }
 
-@media screen and (width >= 631px) {
+@media screen and (width > $mobile-breakpoint) {
   .columns-area {
     padding: 0;
   }
@@ -6202,7 +6202,7 @@ a.status-card {
   user-select: text;
   display: flex;
 
-  @media screen and (width <= 630px) {
+  @media screen and (width <= $mobile-breakpoint) {
     margin-top: auto;
   }
 }
@@ -6561,7 +6561,7 @@ a.status-card {
     border-radius: 0 0 16px 16px;
     border-top: 0;
 
-    @media screen and (max-width: $no-gap-breakpoint) {
+    @media screen and (max-width: $mobile-breakpoint) {
       border-radius: 0;
       border-bottom: 0;
       padding-bottom: 32px;
@@ -9654,8 +9654,9 @@ noscript {
   backdrop-filter: var(--background-filter);
   border: 1px solid var(--modal-border-color);
   padding: 24px;
+  box-sizing: border-box;
 
-  @media screen and (max-width: $no-gap-breakpoint) {
+  @media screen and (max-width: $mobile-breakpoint) {
     border-radius: 16px 16px 0 0;
     border-bottom: 0;
     padding-bottom: 32px;
diff --git a/app/javascript/flavours/glitch/styles/variables.scss b/app/javascript/flavours/glitch/styles/variables.scss
index 5b8ffbb4d7828e..9405335336e3e6 100644
--- a/app/javascript/flavours/glitch/styles/variables.scss
+++ b/app/javascript/flavours/glitch/styles/variables.scss
@@ -88,6 +88,7 @@ $media-modal-media-max-width: 100%;
 $media-modal-media-max-height: 80%;
 
 $no-gap-breakpoint: 1175px;
+$mobile-breakpoint: 630px;
 
 $font-sans-serif: 'mastodon-font-sans-serif' !default;
 $font-display: 'mastodon-font-display' !default;

From 9194197de580242e7572aa00b7c07bff6170cf7e Mon Sep 17 00:00:00 2001
From: Michael Stanclift <mx@vmstan.com>
Date: Wed, 14 Aug 2024 14:23:45 -0500
Subject: [PATCH 1849/2191] Modify profile directory page image borders
 (#31391)

---
 app/javascript/styles/mastodon/components.scss | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 8373cad0ce3e8e..08f43c59cbbb8f 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -7372,9 +7372,18 @@ a.status-card {
 }
 
 .scrollable .account-card__title__avatar {
-  img,
+  img {
+    border: 2px solid var(--background-color);
+  }
+
   .account__avatar {
-    border-color: lighten($ui-base-color, 8%);
+    border: none;
+  }
+}
+
+.scrollable .account-card__header {
+  img {
+    border-radius: 4px;
   }
 }
 

From 09929a42f7963cfac825e833dfa9ffe4b70c7d9a Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Tue, 13 Aug 2024 19:49:23 +0200
Subject: [PATCH 1850/2191] [Glitch] Fix log out from user menu not working on
 Safari

Port c3e1d86d589d4f54df6d5b2752822aa7b577bf29 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../confirmation_modals/log_out.tsx           |  2 +-
 .../flavours/glitch/utils/log_out.ts          | 56 +++++++------------
 2 files changed, 20 insertions(+), 38 deletions(-)

diff --git a/app/javascript/flavours/glitch/features/ui/components/confirmation_modals/log_out.tsx b/app/javascript/flavours/glitch/features/ui/components/confirmation_modals/log_out.tsx
index ac9439461f3360..9c90e0f8b92801 100644
--- a/app/javascript/flavours/glitch/features/ui/components/confirmation_modals/log_out.tsx
+++ b/app/javascript/flavours/glitch/features/ui/components/confirmation_modals/log_out.tsx
@@ -25,7 +25,7 @@ export const ConfirmLogOutModal: React.FC<BaseConfirmationModalProps> = ({
   const intl = useIntl();
 
   const onConfirm = useCallback(() => {
-    logOut();
+    void logOut();
   }, []);
 
   return (
diff --git a/app/javascript/flavours/glitch/utils/log_out.ts b/app/javascript/flavours/glitch/utils/log_out.ts
index d4db471a6e7417..a399fa4d0ab2ab 100644
--- a/app/javascript/flavours/glitch/utils/log_out.ts
+++ b/app/javascript/flavours/glitch/utils/log_out.ts
@@ -1,38 +1,20 @@
-import { signOutLink } from 'flavours/glitch/utils/backend_links';
-
-export const logOut = () => {
-  const form = document.createElement('form');
-
-  const methodInput = document.createElement('input');
-  methodInput.setAttribute('name', '_method');
-  methodInput.setAttribute('value', 'delete');
-  methodInput.setAttribute('type', 'hidden');
-  form.appendChild(methodInput);
-
-  const csrfToken = document.querySelector<HTMLMetaElement>(
-    'meta[name=csrf-token]',
-  );
-
-  const csrfParam = document.querySelector<HTMLMetaElement>(
-    'meta[name=csrf-param]',
-  );
-
-  if (csrfParam && csrfToken) {
-    const csrfInput = document.createElement('input');
-    csrfInput.setAttribute('name', csrfParam.content);
-    csrfInput.setAttribute('value', csrfToken.content);
-    csrfInput.setAttribute('type', 'hidden');
-    form.appendChild(csrfInput);
+import api from 'flavours/glitch/api';
+
+export async function logOut() {
+  try {
+    const response = await api(false).delete<{ redirect_to?: string }>(
+      '/auth/sign_out',
+      { headers: { Accept: 'application/json' }, withCredentials: true },
+    );
+
+    if (response.status === 200 && response.data.redirect_to)
+      window.location.href = response.data.redirect_to;
+    else
+      console.error(
+        'Failed to log out, got an unexpected non-redirect response from the server',
+        response,
+      );
+  } catch (error) {
+    console.error('Failed to log out, response was an error', error);
   }
-
-  const submitButton = document.createElement('input');
-  submitButton.setAttribute('type', 'submit');
-  form.appendChild(submitButton);
-
-  form.method = 'post';
-  form.action = signOutLink;
-  form.style.display = 'none';
-
-  document.body.appendChild(form);
-  submitButton.click();
-};
+}

From bf0129968eb2251fda13d8b652b29728025624b4 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 13 Aug 2024 21:32:27 +0200
Subject: [PATCH 1851/2191] [Glitch] Fix styling of notification browser
 permission denied banner

Port 12582d095ed7f4a40bb95d94560b9bc9928b813e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../notifications/components/column_settings.jsx     | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/javascript/flavours/glitch/features/notifications/components/column_settings.jsx b/app/javascript/flavours/glitch/features/notifications/components/column_settings.jsx
index e38a24884a80c2..f98d09b5000042 100644
--- a/app/javascript/flavours/glitch/features/notifications/components/column_settings.jsx
+++ b/app/javascript/flavours/glitch/features/notifications/components/column_settings.jsx
@@ -47,14 +47,18 @@ class ColumnSettings extends PureComponent {
 
     return (
       <div className='column-settings'>
-        {alertsEnabled && browserSupport && browserPermission === 'denied' && (
-          <span className='warning-hint'><FormattedMessage id='notifications.permission_denied' defaultMessage='Desktop notifications are unavailable due to previously denied browser permissions request' /></span>
-        )}
-
         <section>
           <ClearColumnButton onClick={onClear} />
         </section>
 
+        {alertsEnabled && browserSupport && browserPermission === 'denied' && (
+          <section>
+            <span className='warning-hint'>
+              <FormattedMessage id='notifications.permission_denied' defaultMessage='Desktop notifications are unavailable due to previously denied browser permissions request' />
+            </span>
+          </section>
+        )}
+
         {alertsEnabled && browserSupport && browserPermission === 'default' && (
           <section>
             <span className='warning-hint'>

From cf96857038e792bf8d8fe5067fd18dcd68ac54ad Mon Sep 17 00:00:00 2001
From: Michael Stanclift <mx@vmstan.com>
Date: Tue, 13 Aug 2024 16:54:03 -0500
Subject: [PATCH 1852/2191] [Glitch] Fix collapsable column borders in Safari
 and improve Safari scrollbars

Port 7d4b602cb28675da01df6ae27faacff8d70c1711 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/styles/components.scss    | 15 +++++----
 .../flavours/glitch/styles/reset.scss         | 31 ++++---------------
 2 files changed, 15 insertions(+), 31 deletions(-)

diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index 249d18ae353780..65e082eadf8950 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -4747,10 +4747,19 @@ a.status-card {
   opacity: 1;
   z-index: 1;
   position: relative;
+  border-left: 1px solid var(--background-border-color);
+  border-right: 1px solid var(--background-border-color);
+  border-bottom: 1px solid var(--background-border-color);
+
+  @media screen and (max-width: $no-gap-breakpoint) {
+    border-left: 0;
+    border-right: 0;
+  }
 
   &.collapsed {
     max-height: 0;
     opacity: 0.5;
+    border-bottom: 0;
   }
 
   &.animating {
@@ -4777,13 +4786,7 @@ a.status-card {
 }
 
 .column-header__collapsible-inner {
-  border: 1px solid var(--background-border-color);
   border-top: 0;
-
-  @media screen and (max-width: $no-gap-breakpoint) {
-    border-left: 0;
-    border-right: 0;
-  }
 }
 
 .column-header__setting-btn {
diff --git a/app/javascript/flavours/glitch/styles/reset.scss b/app/javascript/flavours/glitch/styles/reset.scss
index f54ed5bc79b1a7..f8a4a08ced6d3a 100644
--- a/app/javascript/flavours/glitch/styles/reset.scss
+++ b/app/javascript/flavours/glitch/styles/reset.scss
@@ -54,40 +54,21 @@ table {
 }
 
 html {
-  scrollbar-color: lighten($ui-base-color, 4%) rgba($base-overlay-background, 0.1);
+  scrollbar-color: var(--background-border-color);
 }
 
 ::-webkit-scrollbar {
-  width: 12px;
-  height: 12px;
+  width: 4px;
+  height: 4px;
 }
 
 ::-webkit-scrollbar-thumb {
-  background: lighten($ui-base-color, 4%);
-  border: 0px none $base-border-color;
-  border-radius: 50px;
-}
-
-::-webkit-scrollbar-thumb:hover {
-  background: lighten($ui-base-color, 6%);
-}
-
-::-webkit-scrollbar-thumb:active {
-  background: lighten($ui-base-color, 4%);
+  background-color: $ui-highlight-color;
+  opacity: .25;
 }
 
 ::-webkit-scrollbar-track {
-  border: 0px none $base-border-color;
-  border-radius: 0;
-  background: rgba($base-overlay-background, 0.1);
-}
-
-::-webkit-scrollbar-track:hover {
-  background: $ui-base-color;
-}
-
-::-webkit-scrollbar-track:active {
-  background: $ui-base-color;
+  background-color: var(--background-border-color);
 }
 
 ::-webkit-scrollbar-corner {

From 524fc8563b1304c2d736e70b41fbae3d15b44c2a Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Wed, 14 Aug 2024 08:47:15 +0200
Subject: [PATCH 1853/2191] [Glitch] Fix notification screen crashing in rare
 cases where the status no longer exists

Port 0d85a79f19fef0c604e8fecfd5dfa9654adc4b95 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/actions/notification_groups.ts          | 4 ++--
 app/javascript/flavours/glitch/api_types/notifications.ts   | 4 ++--
 .../notifications_v2/components/notification_mention.tsx    | 6 +++++-
 .../components/notification_with_status.tsx                 | 4 +++-
 app/javascript/flavours/glitch/models/notification_group.ts | 6 +++---
 5 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/app/javascript/flavours/glitch/actions/notification_groups.ts b/app/javascript/flavours/glitch/actions/notification_groups.ts
index 2f0174d117b62d..49a1a1362f1169 100644
--- a/app/javascript/flavours/glitch/actions/notification_groups.ts
+++ b/app/javascript/flavours/glitch/actions/notification_groups.ts
@@ -47,7 +47,7 @@ function dispatchAssociatedRecords(
       fetchedAccounts.push(notification.moderation_warning.target_account);
     }
 
-    if ('status' in notification) {
+    if ('status' in notification && notification.status) {
       fetchedStatuses.push(notification.status);
     }
   });
@@ -119,7 +119,7 @@ export const processNewNotificationForGroups = createAppAsyncThunk(
 
     if (
       (notification.type === 'mention' || notification.type === 'update') &&
-      notification.status.filtered
+      notification.status?.filtered
     ) {
       const filters = notification.status.filtered.filter((result) =>
         result.filter.context.includes('notifications'),
diff --git a/app/javascript/flavours/glitch/api_types/notifications.ts b/app/javascript/flavours/glitch/api_types/notifications.ts
index 09dc8efe3123ad..758840a5810a6f 100644
--- a/app/javascript/flavours/glitch/api_types/notifications.ts
+++ b/app/javascript/flavours/glitch/api_types/notifications.ts
@@ -60,12 +60,12 @@ export interface BaseNotificationGroupJSON {
 
 interface NotificationGroupWithStatusJSON extends BaseNotificationGroupJSON {
   type: NotificationWithStatusType;
-  status_id: string;
+  status_id: string | null;
 }
 
 interface NotificationWithStatusJSON extends BaseNotificationJSON {
   type: NotificationWithStatusType;
-  status: ApiStatusJSON;
+  status: ApiStatusJSON | null;
 }
 
 interface ReportNotificationGroupJSON extends BaseNotificationGroupJSON {
diff --git a/app/javascript/flavours/glitch/features/notifications_v2/components/notification_mention.tsx b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_mention.tsx
index 91e7445cebf423..7c7d949374d245 100644
--- a/app/javascript/flavours/glitch/features/notifications_v2/components/notification_mention.tsx
+++ b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_mention.tsx
@@ -37,7 +37,11 @@ export const NotificationMention: React.FC<{
   unread: boolean;
 }> = ({ notification, unread }) => {
   const [isDirect, isReply] = useAppSelector((state) => {
-    const status = state.statuses.get(notification.statusId) as Status;
+    const status = state.statuses.get(notification.statusId) as
+      | Status
+      | undefined;
+
+    if (!status) return [false, false] as const;
 
     return [
       status.get('visibility') === 'direct',
diff --git a/app/javascript/flavours/glitch/features/notifications_v2/components/notification_with_status.tsx b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_with_status.tsx
index 23e56ce3a50c82..8543baa537b798 100644
--- a/app/javascript/flavours/glitch/features/notifications_v2/components/notification_with_status.tsx
+++ b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_with_status.tsx
@@ -26,7 +26,7 @@ export const NotificationWithStatus: React.FC<{
   icon: IconProp;
   iconId: string;
   accountIds: string[];
-  statusId: string;
+  statusId: string | undefined;
   count: number;
   labelRenderer: LabelRenderer;
   unread: boolean;
@@ -80,6 +80,8 @@ export const NotificationWithStatus: React.FC<{
     [dispatch, statusId],
   );
 
+  if (!statusId) return null;
+
   return (
     <HotKeys handlers={handlers}>
       <div
diff --git a/app/javascript/flavours/glitch/models/notification_group.ts b/app/javascript/flavours/glitch/models/notification_group.ts
index b29ad35249c2b1..26a4d6be844687 100644
--- a/app/javascript/flavours/glitch/models/notification_group.ts
+++ b/app/javascript/flavours/glitch/models/notification_group.ts
@@ -21,7 +21,7 @@ interface BaseNotificationGroup
 interface BaseNotificationWithStatus<Type extends NotificationWithStatusType>
   extends BaseNotificationGroup {
   type: Type;
-  statusId: string;
+  statusId: string | undefined;
 }
 
 interface BaseNotification<Type extends NotificationType>
@@ -126,7 +126,7 @@ export function createNotificationGroupFromJSON(
     case 'update': {
       const { status_id: statusId, ...groupWithoutStatus } = group;
       return {
-        statusId,
+        statusId: statusId ?? undefined,
         sampleAccountIds,
         ...groupWithoutStatus,
       };
@@ -183,7 +183,7 @@ export function createNotificationGroupFromNotificationJSON(
     case 'mention':
     case 'poll':
     case 'update':
-      return { ...group, statusId: notification.status.id };
+      return { ...group, statusId: notification.status?.id };
     case 'admin.report':
       return { ...group, report: createReportFromJSON(notification.report) };
     case 'severed_relationships':

From 0dbdf6a7f3f05a451bf299b75a56a288e73431a7 Mon Sep 17 00:00:00 2001
From: Michael Stanclift <mx@vmstan.com>
Date: Wed, 14 Aug 2024 12:09:23 -0500
Subject: [PATCH 1854/2191] [Glitch] Fix removal of border from account listing

Port a1ddaa9ee96ab1d05f4e37f3472b0418e0d5628e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/styles/admin.scss      | 1 +
 app/javascript/flavours/glitch/styles/components.scss | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/javascript/flavours/glitch/styles/admin.scss b/app/javascript/flavours/glitch/styles/admin.scss
index 2b704cfaac37b7..5bcf1323d81f76 100644
--- a/app/javascript/flavours/glitch/styles/admin.scss
+++ b/app/javascript/flavours/glitch/styles/admin.scss
@@ -893,6 +893,7 @@ a.name-tag,
 
     .account {
       padding: 0;
+      border: none;
 
       &__avatar-wrapper {
         margin-inline-start: 0;
diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index 65e082eadf8950..ce0db097efbacf 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -1990,6 +1990,7 @@ body > [data-popper-placement] {
 
 .account {
   padding: 10px; // glitch: reduced padding
+  border-bottom: 1px solid var(--background-border-color);
 
   .account__display-name {
     flex: 1 1 auto;

From 4545b8d6cbab59591135ce8d0dfc75ad84c46e73 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Thu, 15 Aug 2024 08:44:13 +0200
Subject: [PATCH 1855/2191] Add the ability to ignore specific browser errors
 for a spec (#31436)

---
 ...javascript_errors.rb => browser_errors.rb} | 19 ++++++++++++++++---
 spec/system/log_out_spec.rb                   |  3 +++
 2 files changed, 19 insertions(+), 3 deletions(-)
 rename spec/support/{javascript_errors.rb => browser_errors.rb} (66%)

diff --git a/spec/support/javascript_errors.rb b/spec/support/browser_errors.rb
similarity index 66%
rename from spec/support/javascript_errors.rb
rename to spec/support/browser_errors.rb
index ef5945f37dcb79..8a31ba3ab6a724 100644
--- a/spec/support/javascript_errors.rb
+++ b/spec/support/browser_errors.rb
@@ -1,23 +1,36 @@
 # frozen_string_literal: true
 
+module BrowserErrorsHelpers
+  def ignore_js_error(error)
+    @ignored_js_errors_for_spec << error
+  end
+end
+
 RSpec.configure do |config|
+  config.include BrowserErrorsHelpers, :js, type: :system
+
+  config.before(:each, :js, type: :system) do
+    @ignored_js_errors_for_spec = []
+  end
+
   config.after(:each, :js, type: :system) do
     # Classes of intermittent ignorable errors
     ignored_errors = [
       /Error while trying to use the following icon from the Manifest/, # https://github.com/mastodon/mastodon/pull/30793
       /Manifest: Line: 1, column: 1, Syntax error/, # Similar parsing/interruption issue as above
-    ]
+    ].concat(@ignored_js_errors_for_spec)
+
     errors = page.driver.browser.logs.get(:browser).reject do |error|
       ignored_errors.any? { |pattern| pattern.match(error.message) }
     end
 
     if errors.present?
-      aggregate_failures 'javascript errrors' do
+      aggregate_failures 'browser errrors' do
         errors.each do |error|
           expect(error.level).to_not eq('SEVERE'), error.message
           next unless error.level == 'WARNING'
 
-          warn 'WARN: javascript warning'
+          warn 'WARN: browser warning'
           warn error.message
         end
       end
diff --git a/spec/system/log_out_spec.rb b/spec/system/log_out_spec.rb
index 376f19712e140e..f50f7c2d18d91f 100644
--- a/spec/system/log_out_spec.rb
+++ b/spec/system/log_out_spec.rb
@@ -24,6 +24,9 @@
 
   describe 'Logging out from the JS app', :js, :streaming do
     it 'logs the user out' do
+      # The frontend tries to load announcements after a short delay, but the session might be expired by then, and the browser will output an error.
+      ignore_js_error(/Failed to load resource: the server responded with a status of 422/)
+
       visit root_path
 
       within '.navigation-bar' do

From 5d04e297755c4a8b4e908f706d272520521341d4 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Thu, 15 Aug 2024 08:45:00 +0200
Subject: [PATCH 1856/2191] Disable Chrome's search engine selection screen
 when running system specs (#31437)

---
 spec/support/capybara.rb | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/spec/support/capybara.rb b/spec/support/capybara.rb
index be1378ffac73b2..4357d51382a62a 100644
--- a/spec/support/capybara.rb
+++ b/spec/support/capybara.rb
@@ -6,14 +6,20 @@
 
 require 'selenium/webdriver'
 
+def common_chrome_options
+  options = Selenium::WebDriver::Chrome::Options.new
+  options.add_argument '--window-size=1680,1050'
+  options.add_argument '--disable-search-engine-choice-screen'
+  options
+end
+
 Capybara.register_driver :chrome do |app|
-  Capybara::Selenium::Driver.new(app, browser: :chrome)
+  Capybara::Selenium::Driver.new(app, browser: :chrome, options: common_chrome_options)
 end
 
 Capybara.register_driver :headless_chrome do |app|
-  options = Selenium::WebDriver::Chrome::Options.new
+  options = common_chrome_options
   options.add_argument '--headless=new'
-  options.add_argument '--window-size=1680,1050'
 
   Capybara::Selenium::Driver.new(
     app,

From 104c378cb4f2f885c34c4478aed5c7a63843c04f Mon Sep 17 00:00:00 2001
From: Michael Stanclift <mx@vmstan.com>
Date: Wed, 14 Aug 2024 14:23:45 -0500
Subject: [PATCH 1857/2191] [Glitch] Modify profile directory page image
 borders

Port 9194197de580242e7572aa00b7c07bff6170cf7e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/styles/components.scss          | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index ce0db097efbacf..7873d83257081f 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -7924,9 +7924,18 @@ img.modal-warning {
 }
 
 .scrollable .account-card__title__avatar {
-  img,
+  img {
+    border: 2px solid var(--background-color);
+  }
+
   .account__avatar {
-    border-color: lighten($ui-base-color, 8%);
+    border: none;
+  }
+}
+
+.scrollable .account-card__header {
+  img {
+    border-radius: 4px;
   }
 }
 

From 9a245527329b8fac8019945a8831991dca0bdd82 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 16 Aug 2024 11:11:33 +0200
Subject: [PATCH 1858/2191] New Crowdin Translations (automated) (#31440)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/ar.json    | 19 ++++++++
 app/javascript/mastodon/locales/de.json    |  6 +--
 app/javascript/mastodon/locales/en-GB.json | 50 +++++++++++++++++++
 app/javascript/mastodon/locales/fi.json    |  4 +-
 app/javascript/mastodon/locales/fr-CA.json | 18 +++++++
 app/javascript/mastodon/locales/fr.json    | 18 +++++++
 app/javascript/mastodon/locales/gl.json    |  2 +-
 app/javascript/mastodon/locales/he.json    |  1 +
 app/javascript/mastodon/locales/kab.json   |  7 +++
 app/javascript/mastodon/locales/lad.json   | 26 +++++++++-
 app/javascript/mastodon/locales/sc.json    | 26 ++++++++++
 app/javascript/mastodon/locales/uk.json    |  3 +-
 config/locales/ar.yml                      |  4 ++
 config/locales/de.yml                      | 22 ++++-----
 config/locales/devise.de.yml               |  4 +-
 config/locales/doorkeeper.ar.yml           |  1 +
 config/locales/fi.yml                      |  4 +-
 config/locales/gl.yml                      |  4 +-
 config/locales/he.yml                      | 57 ++++++++++++++++++++++
 config/locales/hu.yml                      |  2 +-
 config/locales/kab.yml                     |  6 +++
 config/locales/lad.yml                     | 41 ++++++++++++++++
 config/locales/simple_form.ar.yml          |  3 ++
 config/locales/simple_form.fr-CA.yml       |  2 +
 config/locales/simple_form.fr.yml          |  2 +
 config/locales/simple_form.gl.yml          |  6 +--
 config/locales/uk.yml                      | 37 ++++++++++++++
 config/locales/zh-TW.yml                   |  2 +-
 28 files changed, 347 insertions(+), 30 deletions(-)

diff --git a/app/javascript/mastodon/locales/ar.json b/app/javascript/mastodon/locales/ar.json
index e7b3e7dacb9859..48448196be845a 100644
--- a/app/javascript/mastodon/locales/ar.json
+++ b/app/javascript/mastodon/locales/ar.json
@@ -11,6 +11,7 @@
   "about.not_available": "لم يتم توفير هذه المعلومات على هذا الخادم.",
   "about.powered_by": "شبكة اجتماعية لامركزية مدعومة من {mastodon}",
   "about.rules": "قواعد الخادم",
+  "account.account_note_header": "ملاحظة شخصية",
   "account.add_or_remove_from_list": "الإضافة أو الإزالة من القائمة",
   "account.badges.bot": "آلي",
   "account.badges.group": "فريق",
@@ -176,9 +177,11 @@
   "confirmations.edit.message": "التعديل في الحين سوف يُعيد كتابة الرسالة التي أنت بصدد تحريرها. متأكد من أنك تريد المواصلة؟",
   "confirmations.logout.confirm": "خروج",
   "confirmations.logout.message": "متأكد من أنك تريد الخروج؟",
+  "confirmations.logout.title": "أتريد المغادرة؟",
   "confirmations.mute.confirm": "أكتم",
   "confirmations.redraft.confirm": "إزالة وإعادة الصياغة",
   "confirmations.redraft.message": "هل أنت متأكد من أنك تريد حذف هذا المنشور و إعادة صياغته؟ سوف تفقد جميع الإعجابات و الترقيات أما الردود المتصلة به فستُصبِح يتيمة.",
+  "confirmations.redraft.title": "أتريد حذف وإعادة صياغة المنشور؟",
   "confirmations.reply.confirm": "رد",
   "confirmations.reply.message": "الرد في الحين سوف يُعيد كتابة الرسالة التي أنت بصدد كتابتها. متأكد من أنك تريد المواصلة؟",
   "confirmations.unfollow.confirm": "إلغاء المتابعة",
@@ -464,6 +467,11 @@
   "notification.favourite": "أضاف {name} منشورك إلى مفضلته",
   "notification.follow": "يتابعك {name}",
   "notification.follow_request": "لقد طلب {name} متابعتك",
+  "notification.label.mention": "إشارة",
+  "notification.label.private_mention": "إشارة خاصة",
+  "notification.label.private_reply": "رد خاص",
+  "notification.label.reply": "ردّ",
+  "notification.mention": "إشارة",
   "notification.moderation-warning.learn_more": "اعرف المزيد",
   "notification.moderation_warning": "لقد تلقيت تحذيرًا بالإشراف",
   "notification.moderation_warning.action_delete_statuses": "تم إزالة بعض مشاركاتك.",
@@ -474,6 +482,7 @@
   "notification.moderation_warning.action_silence": "لقد تم تقييد حسابك.",
   "notification.moderation_warning.action_suspend": "لقد تم تعليق حسابك.",
   "notification.own_poll": "انتهى استطلاعك للرأي",
+  "notification.poll": "لقد انتهى استطلاع رأي صوتت فيه",
   "notification.reblog": "قام {name} بمشاركة منشورك",
   "notification.relationships_severance_event": "فقدت الاتصالات مع {name}",
   "notification.relationships_severance_event.account_suspension": "قام مشرف من {from} بتعليق {target}، مما يعني أنك لم يعد بإمكانك تلقي التحديثات منهم أو التفاعل معهم.",
@@ -483,7 +492,13 @@
   "notification.status": "{name} نشر للتو",
   "notification.update": "عدّلَ {name} منشورًا",
   "notification_requests.accept": "موافقة",
+  "notification_requests.accept_all": "قبول الكل",
+  "notification_requests.confirm_accept_all.button": "قبول الكل",
+  "notification_requests.confirm_dismiss_all.button": "تجاهل الكل",
   "notification_requests.dismiss": "تخطي",
+  "notification_requests.dismiss_all": "تجاهل الكل",
+  "notification_requests.enter_selection_mode": "اختر",
+  "notification_requests.exit_selection_mode": "إلغاء",
   "notification_requests.notifications_from": "إشعارات من {name}",
   "notification_requests.title": "الإشعارات المصفاة",
   "notifications.clear": "مسح الإشعارات",
@@ -654,8 +669,11 @@
   "report_notification.attached_statuses": "{count, plural, one {{count} منشور} other {{count} منشورات}} مرفقة",
   "report_notification.categories.legal": "أمور قانونية",
   "report_notification.categories.other": "آخر",
+  "report_notification.categories.other_sentence": "آخر",
   "report_notification.categories.spam": "مزعج",
+  "report_notification.categories.spam_sentence": "مزعج",
   "report_notification.categories.violation": "القاعدة المنتهَكة",
+  "report_notification.categories.violation_sentence": "انتهاك لقاعدة",
   "report_notification.open": "فتح التقرير",
   "search.no_recent_searches": "ما من عمليات بحث تمت مؤخرًا",
   "search.placeholder": "ابحث",
@@ -760,6 +778,7 @@
   "timeline_hint.remote_resource_not_displayed": "{resource} من الخوادم الأخرى لا يتم عرضها.",
   "timeline_hint.resources.followers": "المتابِعون",
   "timeline_hint.resources.follows": "المتابَعون",
+  "timeline_hint.resources.replies": "بعض الردود",
   "timeline_hint.resources.statuses": "المنشورات القديمة",
   "trends.counter_by_accounts": "{count, plural, one {شخص واحد} two {شخصان} few {{counter} أشخاصٍ} many {{counter} شخصًا} other {{counter} شخصًا}} {days, plural, one {خلال اليوم الماضي} two {خلال اليومَيْنِ الماضيَيْنِ} few {خلال {days} أيام الماضية} many {خلال {days} يومًا الماضية} other {خلال {days} يومٍ الماضية}}",
   "trends.trending_now": "المتداولة الآن",
diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json
index 620c5e190a08cb..2d49f172e6bb4b 100644
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@@ -356,7 +356,7 @@
   "home.pending_critical_update.link": "Updates ansehen",
   "home.pending_critical_update.title": "Kritisches Sicherheitsupdate verfügbar!",
   "home.show_announcements": "Ankündigungen anzeigen",
-  "ignore_notifications_modal.disclaimer": "Mastodon kann anderen Nutzer*innen nicht mitteilen, dass du deren Benachrichtigungen ignorierst. Das Ignorieren von Benachrichtigung wird das Absenden der Nachricht selbst nicht unterbinden.",
+  "ignore_notifications_modal.disclaimer": "Mastodon kann anderen Nutzer*innen nicht mitteilen, dass du deren Benachrichtigungen ignorierst. Das Ignorieren von Benachrichtigungen wird nicht das Absenden der Nachricht selbst unterbinden.",
   "ignore_notifications_modal.filter_instead": "Stattdessen filtern",
   "ignore_notifications_modal.filter_to_act_users": "Du wirst weiterhin die Möglichkeit haben, andere Nutzer*innen zu genehmigen, abzulehnen oder zu melden",
   "ignore_notifications_modal.filter_to_avoid_confusion": "Filtern hilft, mögliches Durcheinander zu vermeiden",
@@ -578,7 +578,7 @@
   "notifications.policy.accept_hint": "In Benachrichtigungen anzeigen",
   "notifications.policy.drop": "Ignorieren",
   "notifications.policy.drop_hint": "In die Leere senden und nie wieder sehen",
-  "notifications.policy.filter": "Filter",
+  "notifications.policy.filter": "Filtern",
   "notifications.policy.filter_hint": "An gefilterte Benachrichtigungen im Posteingang senden",
   "notifications.policy.filter_limited_accounts_hint": "Durch Server-Moderator*innen eingeschränkt",
   "notifications.policy.filter_limited_accounts_title": "Moderierte Konten",
@@ -586,7 +586,7 @@
   "notifications.policy.filter_new_accounts_title": "Neuen Konten",
   "notifications.policy.filter_not_followers_hint": "Einschließlich Profilen, die dir seit weniger als {days, plural, one {einem Tag} other {# Tagen}} folgen",
   "notifications.policy.filter_not_followers_title": "Profilen, die mir nicht folgen",
-  "notifications.policy.filter_not_following_hint": "Solange du sie nicht manuell akzeptierst",
+  "notifications.policy.filter_not_following_hint": "Bis du sie manuell genehmigst",
   "notifications.policy.filter_not_following_title": "Profilen, denen ich nicht folge",
   "notifications.policy.filter_private_mentions_hint": "Solange sie keine Antwort auf deine Erwähnung ist oder du dem Profil nicht folgst",
   "notifications.policy.filter_private_mentions_title": "Unerwünschten privaten Erwähnungen",
diff --git a/app/javascript/mastodon/locales/en-GB.json b/app/javascript/mastodon/locales/en-GB.json
index 64e22505b225f1..8315333994194a 100644
--- a/app/javascript/mastodon/locales/en-GB.json
+++ b/app/javascript/mastodon/locales/en-GB.json
@@ -11,6 +11,7 @@
   "about.not_available": "This information has not been made available on this server.",
   "about.powered_by": "Decentralised social media powered by {mastodon}",
   "about.rules": "Server rules",
+  "account.account_note_header": "Personal note",
   "account.add_or_remove_from_list": "Add or Remove from lists",
   "account.badges.bot": "Automated",
   "account.badges.group": "Group",
@@ -170,21 +171,28 @@
   "confirmations.block.confirm": "Block",
   "confirmations.delete.confirm": "Delete",
   "confirmations.delete.message": "Are you sure you want to delete this post?",
+  "confirmations.delete.title": "Delete post?",
   "confirmations.delete_list.confirm": "Delete",
   "confirmations.delete_list.message": "Are you sure you want to permanently delete this list?",
+  "confirmations.delete_list.title": "Delete list?",
   "confirmations.discard_edit_media.confirm": "Discard",
   "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
   "confirmations.edit.confirm": "Edit",
   "confirmations.edit.message": "Editing now will overwrite the message you are currently composing. Are you sure you want to proceed?",
+  "confirmations.edit.title": "Overwrite post?",
   "confirmations.logout.confirm": "Log out",
   "confirmations.logout.message": "Are you sure you want to log out?",
+  "confirmations.logout.title": "Log out?",
   "confirmations.mute.confirm": "Mute",
   "confirmations.redraft.confirm": "Delete & redraft",
   "confirmations.redraft.message": "Are you sure you want to delete this post and re-draft it? Favourites and boosts will be lost, and replies to the original post will be orphaned.",
+  "confirmations.redraft.title": "Delete & redraft post?",
   "confirmations.reply.confirm": "Reply",
   "confirmations.reply.message": "Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?",
+  "confirmations.reply.title": "Overwrite post?",
   "confirmations.unfollow.confirm": "Unfollow",
   "confirmations.unfollow.message": "Are you sure you want to unfollow {name}?",
+  "confirmations.unfollow.title": "Unfollow user?",
   "conversation.delete": "Delete conversation",
   "conversation.mark_as_read": "Mark as read",
   "conversation.open": "View conversation",
@@ -292,6 +300,7 @@
   "filter_modal.select_filter.subtitle": "Use an existing category or create a new one",
   "filter_modal.select_filter.title": "Filter this post",
   "filter_modal.title.status": "Filter a post",
+  "filtered_notifications_banner.pending_requests": "From {count, plural, =0 {no one} one {one person} other {# people}} you may know",
   "filtered_notifications_banner.title": "Filtered notifications",
   "firehose.all": "All",
   "firehose.local": "This server",
@@ -347,6 +356,16 @@
   "home.pending_critical_update.link": "See updates",
   "home.pending_critical_update.title": "Critical security update available!",
   "home.show_announcements": "Show announcements",
+  "ignore_notifications_modal.disclaimer": "Mastodon cannot inform users that you've ignored their notifications. Ignoring notifications will not stop the messages themselves from being sent.",
+  "ignore_notifications_modal.filter_instead": "Filter instead",
+  "ignore_notifications_modal.filter_to_act_users": "You'll still be able to accept, reject, or report users",
+  "ignore_notifications_modal.filter_to_avoid_confusion": "Filtering helps avoid potential confusion",
+  "ignore_notifications_modal.filter_to_review_separately": "You can review filtered notifications separately",
+  "ignore_notifications_modal.ignore": "Ignore notifications",
+  "ignore_notifications_modal.limited_accounts_title": "Ignore notifications from restricted accounts?",
+  "ignore_notifications_modal.new_accounts_title": "Ignore notifications from new accounts?",
+  "ignore_notifications_modal.not_followers_title": "Ignore notifications from people not following you?",
+  "ignore_notifications_modal.not_following_title": "Ignore notifications from people you don't follow?",
   "interaction_modal.description.favourite": "With an account on Mastodon, you can favourite this post to let the author know you appreciate it and save it for later.",
   "interaction_modal.description.follow": "With an account on Mastodon, you can follow {name} to receive their posts in your home feed.",
   "interaction_modal.description.reblog": "With an account on Mastodon, you can boost this post to share it with your own followers.",
@@ -473,6 +492,11 @@
   "notification.favourite": "{name} favourited your post",
   "notification.follow": "{name} followed you",
   "notification.follow_request": "{name} has requested to follow you",
+  "notification.label.mention": "Mention",
+  "notification.label.private_mention": "Private mention",
+  "notification.label.private_reply": "Private reply",
+  "notification.label.reply": "Reply",
+  "notification.mention": "Mention",
   "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.",
@@ -493,11 +517,28 @@
   "notification.status": "{name} just posted",
   "notification.update": "{name} edited a post",
   "notification_requests.accept": "Accept",
+  "notification_requests.accept_all": "Accept all",
+  "notification_requests.accept_multiple": "{count, plural, one {Accept 1 request} other {Accept # requests}}",
+  "notification_requests.confirm_accept_all.button": "Accept all",
+  "notification_requests.confirm_accept_all.message": "You are about to accept {count, plural, one {one notification request} other {# notification requests}}. Are you sure you want to proceed?",
+  "notification_requests.confirm_accept_all.title": "Accept notification requests?",
+  "notification_requests.confirm_dismiss_all.button": "Dismiss all",
+  "notification_requests.confirm_dismiss_all.message": "You are about to dismiss {count, plural, one {one notification request} other {# notification requests}}. You won't be able to easily access {count, plural, one {it} other {them}} again. Are you sure you want to proceed?",
+  "notification_requests.confirm_dismiss_all.title": "Dismiss notification requests?",
   "notification_requests.dismiss": "Dismiss",
+  "notification_requests.dismiss_all": "Dismiss all",
+  "notification_requests.dismiss_multiple": "{count, plural, one {Dismiss one request} other {Dismiss # requests}}",
+  "notification_requests.enter_selection_mode": "Select",
+  "notification_requests.exit_selection_mode": "Cancel",
+  "notification_requests.explainer_for_limited_account": "Notifications from this account have been filtered because the account has been limited by a moderator.",
+  "notification_requests.explainer_for_limited_remote_account": "Notifications from this account have been filtered because the account or its server has been limited by a moderator.",
+  "notification_requests.minimize_banner": "Minimize filtered notifications banner",
   "notification_requests.notifications_from": "Notifications from {name}",
   "notification_requests.title": "Filtered notifications",
+  "notification_requests.view": "View notifications",
   "notifications.clear": "Clear notifications",
   "notifications.clear_confirmation": "Are you sure you want to permanently clear all your notifications?",
+  "notifications.clear_title": "Clear notifications?",
   "notifications.column_settings.admin.report": "New reports:",
   "notifications.column_settings.admin.sign_up": "New sign-ups:",
   "notifications.column_settings.alert": "Desktop notifications",
@@ -531,6 +572,13 @@
   "notifications.permission_denied": "Desktop notifications are unavailable due to previously denied browser permissions request",
   "notifications.permission_denied_alert": "Desktop notifications can't be enabled, as browser permission has been denied before",
   "notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
+  "notifications.policy.accept": "Accept",
+  "notifications.policy.drop": "Ignore",
+  "notifications.policy.drop_hint": "Send to the void, never to be seen again",
+  "notifications.policy.filter": "Filter",
+  "notifications.policy.filter_hint": "Send to filtered notifications inbox",
+  "notifications.policy.filter_limited_accounts_hint": "Limited by server moderators",
+  "notifications.policy.filter_limited_accounts_title": "Moderated accounts",
   "notifications.policy.filter_new_accounts.hint": "Created within the past {days, plural, one {one day} other {# days}}",
   "notifications.policy.filter_new_accounts_title": "New accounts",
   "notifications.policy.filter_not_followers_hint": "Including people who have been following you fewer than {days, plural, one {one day} other {# days}}",
@@ -539,6 +587,7 @@
   "notifications.policy.filter_not_following_title": "People you don't follow",
   "notifications.policy.filter_private_mentions_hint": "Filtered unless it's in reply to your own mention or if you follow the sender",
   "notifications.policy.filter_private_mentions_title": "Unsolicited private mentions",
+  "notifications.policy.title": "Manage notifications from…",
   "notifications_permission_banner.enable": "Enable desktop notifications",
   "notifications_permission_banner.how_to_control": "To receive notifications when Mastodon isn't open, enable desktop notifications. You can control precisely which types of interactions generate desktop notifications through the {icon} button above once they're enabled.",
   "notifications_permission_banner.title": "Never miss a thing",
@@ -779,6 +828,7 @@
   "timeline_hint.remote_resource_not_displayed": "{resource} from other servers are not displayed.",
   "timeline_hint.resources.followers": "Followers",
   "timeline_hint.resources.follows": "Follows",
+  "timeline_hint.resources.replies": "Some replies",
   "timeline_hint.resources.statuses": "Older posts",
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "Trending now",
diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index b583f80fe1e1cb..9b48f1bf37d630 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -327,7 +327,7 @@
   "footer.about": "Tietoja",
   "footer.directory": "Profiilihakemisto",
   "footer.get_app": "Hanki sovellus",
-  "footer.invite": "Kutsu ihmisiä",
+  "footer.invite": "Kutsu käyttäjiä",
   "footer.keyboard_shortcuts": "Pikanäppäimet",
   "footer.privacy_policy": "Tietosuojakäytäntö",
   "footer.source_code": "Näytä lähdekoodi",
@@ -366,7 +366,7 @@
   "ignore_notifications_modal.new_accounts_title": "Sivuutetaanko ilmoitukset uusilta tileiltä?",
   "ignore_notifications_modal.not_followers_title": "Sivuutetaanko ilmoitukset käyttäjiltä, jotka eivät seuraa sinua?",
   "ignore_notifications_modal.not_following_title": "Sivuutetaanko ilmoitukset käyttäjiltä, joita et seuraa?",
-  "ignore_notifications_modal.private_mentions_title": "Sivuutetaanko ilmoitukset ei-toivotuista yksityismaininnoista?",
+  "ignore_notifications_modal.private_mentions_title": "Sivuutetaanko ilmoitukset pyytämättömistä yksityismaininnoista?",
   "interaction_modal.description.favourite": "Mastodon-tilillä voit lisätä tämän julkaisun suosikkeihisi osoittaaksesi tekijälle arvostavasi sitä ja tallentaaksesi sen tulevaa käyttöä varten.",
   "interaction_modal.description.follow": "Mastodon-tilillä voit seurata käyttäjää {name} saadaksesi hänen julkaisunsa kotisyötteeseesi.",
   "interaction_modal.description.reblog": "Mastodon-tilillä voit tehostaa tätä julkaisua jakaaksesi sen seuraajiesi kanssa.",
diff --git a/app/javascript/mastodon/locales/fr-CA.json b/app/javascript/mastodon/locales/fr-CA.json
index 1ad821ee072540..9cf1d8a69ba2b7 100644
--- a/app/javascript/mastodon/locales/fr-CA.json
+++ b/app/javascript/mastodon/locales/fr-CA.json
@@ -35,6 +35,7 @@
   "account.follow_back": "S'abonner en retour",
   "account.followers": "abonné·e·s",
   "account.followers.empty": "Personne ne suit ce compte pour l'instant.",
+  "account.followers_counter": "{count, plural, one {{counter} abonné·e} other {{counter} abonné·e·s}}",
   "account.following": "Abonné·e",
   "account.follows.empty": "Ce compte ne suit personne présentement.",
   "account.go_to_profile": "Voir ce profil",
@@ -313,6 +314,7 @@
   "follow_suggestions.hints.similar_to_recently_followed": "Ce profil est similaire aux profils que vous avez suivis le plus récemment.",
   "follow_suggestions.personalized_suggestion": "Suggestion personnalisée",
   "follow_suggestions.popular_suggestion": "Suggestion populaire",
+  "follow_suggestions.popular_suggestion_longer": "Populaire sur {domain}",
   "follow_suggestions.view_all": "Tout afficher",
   "follow_suggestions.who_to_follow": "Qui suivre",
   "followed_tags": "Hashtags suivis",
@@ -466,7 +468,19 @@
   "notification.favourite": "{name} a ajouté votre publication à ses favoris",
   "notification.follow": "{name} vous suit",
   "notification.follow_request": "{name} a demandé à vous suivre",
+  "notification.label.private_mention": "Mention privée",
+  "notification.label.private_reply": "Répondre en privé",
+  "notification.moderation-warning.learn_more": "En savoir plus",
+  "notification.moderation_warning": "Vous avez reçu un avertissement de modération",
+  "notification.moderation_warning.action_delete_statuses": "Certains de vos messages ont été supprimés.",
+  "notification.moderation_warning.action_disable": "Votre compte a été désactivé.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Certains de vos messages ont été marqués comme sensibles.",
+  "notification.moderation_warning.action_none": "Votre compte a reçu un avertissement de modération.",
+  "notification.moderation_warning.action_sensitive": "Vos messages seront désormais marqués comme sensibles.",
+  "notification.moderation_warning.action_silence": "Votre compte a été limité.",
+  "notification.moderation_warning.action_suspend": "Votre compte a été suspendu.",
   "notification.own_poll": "Votre sondage est terminé",
+  "notification.poll": "Un sondage auquel vous avez participé vient de se terminer",
   "notification.reblog": "{name} a boosté votre message",
   "notification.relationships_severance_event": "Connexions perdues avec {name}",
   "notification.relationships_severance_event.account_suspension": "Un·e administrateur·rice de {from} a suspendu {target}, ce qui signifie que vous ne pourrez plus recevoir de mises à jour ou interagir avec lui.",
@@ -476,6 +490,9 @@
   "notification.status": "{name} vient de publier",
   "notification.update": "{name} a modifié une publication",
   "notification_requests.accept": "Accepter",
+  "notification_requests.accept_all": "Tout accepter",
+  "notification_requests.confirm_accept_all.button": "Tout accepter",
+  "notification_requests.confirm_dismiss_all.button": "Tout rejeter",
   "notification_requests.dismiss": "Rejeter",
   "notification_requests.notifications_from": "Notifications de {name}",
   "notification_requests.title": "Notifications filtrées",
@@ -649,6 +666,7 @@
   "report_notification.categories.legal": "Mentions légales",
   "report_notification.categories.other": "Autre",
   "report_notification.categories.spam": "Spam",
+  "report_notification.categories.spam_sentence": "indésirable",
   "report_notification.categories.violation": "Infraction aux règles du serveur",
   "report_notification.open": "Ouvrir le signalement",
   "search.no_recent_searches": "Aucune recherche récente",
diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json
index 141a856e316cfc..6546cbb1e9f369 100644
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@@ -35,6 +35,7 @@
   "account.follow_back": "S'abonner en retour",
   "account.followers": "Abonné·e·s",
   "account.followers.empty": "Personne ne suit cet·te utilisateur·rice pour l’instant.",
+  "account.followers_counter": "{count, plural, one {{counter} abonné·e} other {{counter} abonné·e·s}}",
   "account.following": "Abonnements",
   "account.follows.empty": "Cet·te utilisateur·rice ne suit personne pour l’instant.",
   "account.go_to_profile": "Aller au profil",
@@ -313,6 +314,7 @@
   "follow_suggestions.hints.similar_to_recently_followed": "Ce profil est similaire aux profils que vous avez suivis le plus récemment.",
   "follow_suggestions.personalized_suggestion": "Suggestion personnalisée",
   "follow_suggestions.popular_suggestion": "Suggestion populaire",
+  "follow_suggestions.popular_suggestion_longer": "Populaire sur {domain}",
   "follow_suggestions.view_all": "Tout afficher",
   "follow_suggestions.who_to_follow": "Qui suivre",
   "followed_tags": "Hashtags suivis",
@@ -466,7 +468,19 @@
   "notification.favourite": "{name} a ajouté votre message à ses favoris",
   "notification.follow": "{name} vous suit",
   "notification.follow_request": "{name} a demandé à vous suivre",
+  "notification.label.private_mention": "Mention privée",
+  "notification.label.private_reply": "Répondre en privé",
+  "notification.moderation-warning.learn_more": "En savoir plus",
+  "notification.moderation_warning": "Vous avez reçu un avertissement de modération",
+  "notification.moderation_warning.action_delete_statuses": "Certains de vos messages ont été supprimés.",
+  "notification.moderation_warning.action_disable": "Votre compte a été désactivé.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Certains de vos messages ont été marqués comme sensibles.",
+  "notification.moderation_warning.action_none": "Votre compte a reçu un avertissement de modération.",
+  "notification.moderation_warning.action_sensitive": "Vos messages seront désormais marqués comme sensibles.",
+  "notification.moderation_warning.action_silence": "Votre compte a été limité.",
+  "notification.moderation_warning.action_suspend": "Votre compte a été suspendu.",
   "notification.own_poll": "Votre sondage est terminé",
+  "notification.poll": "Un sondage auquel vous avez participé vient de se terminer",
   "notification.reblog": "{name} a partagé votre message",
   "notification.relationships_severance_event": "Connexions perdues avec {name}",
   "notification.relationships_severance_event.account_suspension": "Un·e administrateur·rice de {from} a suspendu {target}, ce qui signifie que vous ne pourrez plus recevoir de mises à jour ou interagir avec lui.",
@@ -476,6 +490,9 @@
   "notification.status": "{name} vient de publier",
   "notification.update": "{name} a modifié un message",
   "notification_requests.accept": "Accepter",
+  "notification_requests.accept_all": "Tout accepter",
+  "notification_requests.confirm_accept_all.button": "Tout accepter",
+  "notification_requests.confirm_dismiss_all.button": "Tout rejeter",
   "notification_requests.dismiss": "Rejeter",
   "notification_requests.notifications_from": "Notifications de {name}",
   "notification_requests.title": "Notifications filtrées",
@@ -649,6 +666,7 @@
   "report_notification.categories.legal": "Légal",
   "report_notification.categories.other": "Autre",
   "report_notification.categories.spam": "Spam",
+  "report_notification.categories.spam_sentence": "indésirable",
   "report_notification.categories.violation": "Infraction aux règles du serveur",
   "report_notification.open": "Ouvrir le signalement",
   "search.no_recent_searches": "Aucune recherche récente",
diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json
index 7d71400206e831..c344c19b7e98cd 100644
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@@ -834,7 +834,7 @@
   "timeline_hint.resources.replies": "Algunhas respostas",
   "timeline_hint.resources.statuses": "Publicacións antigas",
   "trends.counter_by_accounts": "{count, plural, one {{counter} persoa} other {{counter} persoas}} {days, plural, one {no último día} other {nos {days} últimos días}}",
-  "trends.trending_now": "Tendencias actuais",
+  "trends.trending_now": "Temas populares",
   "ui.beforeunload": "O borrador perderase se saes de Mastodon.",
   "units.short.billion": "{count}B",
   "units.short.million": "{count}M",
diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json
index e90826ded16ceb..e9cbfcbcc3367b 100644
--- a/app/javascript/mastodon/locales/he.json
+++ b/app/javascript/mastodon/locales/he.json
@@ -356,6 +356,7 @@
   "home.pending_critical_update.link": "צפיה בעדכונים",
   "home.pending_critical_update.title": "יצא עדכון אבטחה חשוב!",
   "home.show_announcements": "הצג הכרזות",
+  "ignore_notifications_modal.disclaimer": "מסטודון אינו יכול ליידע משתמשים שהתעלמתם מהתראותיהם. התעלמות מהתראות לא תחסום את ההודעות עצמן מלהשלח.",
   "ignore_notifications_modal.filter_instead": "לסנן במקום",
   "ignore_notifications_modal.filter_to_act_users": "עדיין ביכולתך לקבל, לדחות ולדווח על משתמשים אחרים",
   "ignore_notifications_modal.filter_to_avoid_confusion": "סינון מסייע למניעת בלבולים אפשריים",
diff --git a/app/javascript/mastodon/locales/kab.json b/app/javascript/mastodon/locales/kab.json
index 7b7ee85066b04e..420ba495f05268 100644
--- a/app/javascript/mastodon/locales/kab.json
+++ b/app/javascript/mastodon/locales/kab.json
@@ -391,6 +391,10 @@
   "notification.favourite": "{name} yesmenyaf addad-ik·im",
   "notification.follow": "iṭṭafar-ik·em-id {name}",
   "notification.follow_request": "{name} yessuter-d ad k·m-yeḍfeṛ",
+  "notification.label.private_mention": "Abdar uslig",
+  "notification.label.private_reply": "Tiririt tusligt",
+  "notification.label.reply": "Tiririt",
+  "notification.mention": "Abdar",
   "notification.moderation-warning.learn_more": "Issin ugar",
   "notification.moderation_warning.action_suspend": "Yettwaseḥbes umiḍan-ik.",
   "notification.own_poll": "Tafrant-ik·im tfuk",
@@ -399,6 +403,7 @@
   "notification.status": "{name} akken i d-yessufeɣ",
   "notification_requests.accept": "Qbel",
   "notification_requests.dismiss": "Agi",
+  "notification_requests.exit_selection_mode": "Sefsex",
   "notification_requests.notifications_from": "Alɣuten sɣur {name}",
   "notifications.clear": "Sfeḍ alɣuten",
   "notifications.clear_confirmation": "Tebɣiḍ s tidet ad tekkseḍ akk alɣuten-inek·em i lebda?",
@@ -430,6 +435,7 @@
   "notifications.group": "{count} n walɣuten",
   "notifications.mark_as_read": "Creḍ meṛṛa alɣuten am wakken ttwaɣran",
   "notifications.permission_denied": "D awezɣi ad yili wermad n walɣuten n tnarit axateṛ turagt tettwagdel",
+  "notifications.policy.drop": "Anef-as",
   "notifications.policy.filter_new_accounts.hint": "Imiḍanen imaynuten i d-yennulfan deg {days, plural, one {yiwen n wass} other {# n wussan}} yezrin",
   "notifications.policy.filter_new_accounts_title": "Imiḍan imaynuten",
   "notifications.policy.filter_not_followers_hint": "Ula d wid akked tid i k·m-id-iḍefren, ur wwiḍen ara {days, plural, one {yiwen wass} other {# wussan}}",
@@ -537,6 +543,7 @@
   "report_notification.categories.legal": "Azerfan",
   "report_notification.categories.other": "Ayen nniḍen",
   "report_notification.categories.spam": "Aspam",
+  "report_notification.categories.spam_sentence": "aspam",
   "report_notification.open": "Ldi aneqqis",
   "search.no_recent_searches": "Ulac inadiyen ineggura",
   "search.placeholder": "Nadi",
diff --git a/app/javascript/mastodon/locales/lad.json b/app/javascript/mastodon/locales/lad.json
index f4954ed3a9f275..0b0449c96aa134 100644
--- a/app/javascript/mastodon/locales/lad.json
+++ b/app/javascript/mastodon/locales/lad.json
@@ -11,6 +11,7 @@
   "about.not_available": "Esta enformasyon no esta desponivle en este sirvidor.",
   "about.powered_by": "Redes sosyalas desentralizadas kon uzo de {mastodon}",
   "about.rules": "Reglas del sirvidor",
+  "account.account_note_header": "Nota personala",
   "account.add_or_remove_from_list": "Adjusta a o kita de listas",
   "account.badges.bot": "Otomatizado",
   "account.badges.group": "Grupo",
@@ -165,21 +166,26 @@
   "confirmations.block.confirm": "Bloka",
   "confirmations.delete.confirm": "Efasa",
   "confirmations.delete.message": "Estas siguro ke keres efasar esta publikasyon?",
+  "confirmations.delete.title": "Efasar publikasyon?",
   "confirmations.delete_list.confirm": "Efasa",
   "confirmations.delete_list.message": "Estas siguro ke keres permanentemente efasar esta lista?",
+  "confirmations.delete_list.title": "Efasa lista?",
   "confirmations.discard_edit_media.confirm": "Anula",
   "confirmations.discard_edit_media.message": "Tienes trokamientos no guadrados en la deskripsion o vista previa. Keres efasarlos entanto?",
   "confirmations.edit.confirm": "Edita",
   "confirmations.edit.message": "Si edites agora, kitaras el mesaj kualo estas eskriviendo aktualmente. Estas siguro ke keres fazerlo?",
   "confirmations.logout.confirm": "Sal",
   "confirmations.logout.message": "Estas siguro ke keres salir de tu kuento?",
+  "confirmations.logout.title": "Salir?",
   "confirmations.mute.confirm": "Silensia",
   "confirmations.redraft.confirm": "Efasa i reeskrive",
   "confirmations.redraft.message": "Estas siguro ke keres efasar esta publikasyon i reeskrivirla? Pedreras todos los favoritos i repartajasyones asosiados kon esta publikasyon i repuestas a eya seran guerfanadas.",
+  "confirmations.redraft.title": "Efasar i reeskrivir?",
   "confirmations.reply.confirm": "Arisponde",
   "confirmations.reply.message": "Si arispondas agora, kitaras el mesaj kualo estas eskriviendo aktualmente. Estas siguro ke keres fazerlo?",
   "confirmations.unfollow.confirm": "Desige",
   "confirmations.unfollow.message": "Estas siguro ke keres deshar de segir a {name}?",
+  "confirmations.unfollow.title": "Desige utilizador?",
   "conversation.delete": "Efasa konversasyon",
   "conversation.mark_as_read": "Marka komo meldado",
   "conversation.open": "Ve konversasyon",
@@ -277,6 +283,7 @@
   "filter_modal.select_filter.subtitle": "Kulanea una kategoria egzistente o kriya mueva",
   "filter_modal.select_filter.title": "Filtra esta publikasyon",
   "filter_modal.title.status": "Filtra una publikasyon",
+  "filtered_notifications_banner.pending_requests": "De {count, plural, =0 {dingun} one {una persona} other {# personas}} ke puedes koneser",
   "filtered_notifications_banner.title": "Avizos filtrados",
   "firehose.all": "Todo",
   "firehose.local": "Este sirvidor",
@@ -330,6 +337,7 @@
   "home.pending_critical_update.link": "Ve aktualizasyones",
   "home.pending_critical_update.title": "Aktualizasyon de seguridad kritika esta desponivle!",
   "home.show_announcements": "Amostra pregones",
+  "ignore_notifications_modal.ignore": "Inyora avizos",
   "interaction_modal.description.favourite": "Kon un kuento en Mastodon, puedes markar esta publikasyon komo favorita para ke el autor sepa ke te plaze i para guadrarla para dempues.",
   "interaction_modal.description.follow": "Kon un kuento en Mastodon, puedes segir a {name} para risivir sus publikasyones en tu linya temporal prinsipala.",
   "interaction_modal.description.reblog": "Kon un kuento en Mastodon, puedes repartajar esta publikasyon para amostrarla a tus suivantes.",
@@ -400,7 +408,7 @@
   "lists.exclusive": "Eskonder estas publikasyones de linya prinsipala",
   "lists.new.create": "Adjusta lista",
   "lists.new.title_placeholder": "Titolo de mueva lista",
-  "lists.replies_policy.followed": "Kualseker utilizardo segido",
+  "lists.replies_policy.followed": "Kualseker utilizador segido",
   "lists.replies_policy.list": "Miembros de la lista",
   "lists.replies_policy.none": "Dinguno",
   "lists.replies_policy.title": "Amostra repuestas a:",
@@ -449,6 +457,10 @@
   "notification.favourite": "A {name} le plaze tu publikasyon",
   "notification.follow": "{name} te ampeso a segir",
   "notification.follow_request": "{name} tiene solisitado segirte",
+  "notification.label.mention": "Enmenta",
+  "notification.label.private_mention": "Enmentadura privada",
+  "notification.label.reply": "Arisponde",
+  "notification.mention": "Enmenta",
   "notification.moderation-warning.learn_more": "Ambezate mas",
   "notification.moderation_warning.action_disable": "Tu kuento tiene sido inkapasitado.",
   "notification.moderation_warning.action_mark_statuses_as_sensitive": "Algunas de tus publikasyones tienen sido markadas komo sensivles.",
@@ -463,14 +475,21 @@
   "notification.status": "{name} publiko algo",
   "notification.update": "{name} edito una publikasyon",
   "notification_requests.accept": "Acheta",
+  "notification_requests.accept_all": "Acheta todos",
+  "notification_requests.confirm_accept_all.button": "Acheta todos",
   "notification_requests.dismiss": "Kita",
+  "notification_requests.enter_selection_mode": "Eskoje",
+  "notification_requests.exit_selection_mode": "Anula",
   "notification_requests.notifications_from": "Avizos de {name}",
   "notification_requests.title": "Avizos filtrados",
+  "notification_requests.view": "Amostra avizos",
   "notifications.clear": "Efasa avizos",
   "notifications.clear_confirmation": "Estas siguro ke keres permanentemente efasar todos tus avizos?",
+  "notifications.clear_title": "Efasar avizos?",
   "notifications.column_settings.admin.report": "Muveos raportos:",
   "notifications.column_settings.admin.sign_up": "Muevas enrejistrasyones:",
   "notifications.column_settings.alert": "Avizos de ensimameza",
+  "notifications.column_settings.beta.category": "Funksyones eksperimentalas",
   "notifications.column_settings.favourite": "Te plazen:",
   "notifications.column_settings.filter_bar.advanced": "Amostra todas las kategorias",
   "notifications.column_settings.filter_bar.category": "Vara de filtrado rapido",
@@ -499,6 +518,10 @@
   "notifications.permission_denied": "Avizos de ensimameza no estan desponivles porke ya se tiene refuzado el permiso",
   "notifications.permission_denied_alert": "\"No se pueden kapasitar los avizos de ensimameza, porke ya se tiene refuzado el permiso de navigador",
   "notifications.permission_required": "Avizos de ensimameza no estan desponivles porke los nesesarios permisos no tienen sido risividos.",
+  "notifications.policy.accept": "Acheta",
+  "notifications.policy.accept_hint": "Amostra en avizos",
+  "notifications.policy.drop": "Inyora",
+  "notifications.policy.filter": "Filtra",
   "notifications.policy.filter_new_accounts.hint": "Kriyadas durante {days, plural, one {el ultimo diya} other {los ultimos # diyas}}",
   "notifications.policy.filter_new_accounts_title": "Muevos kuentos",
   "notifications.policy.filter_not_followers_title": "Personas ke te no sigen",
@@ -739,6 +762,7 @@
   "timeline_hint.remote_resource_not_displayed": "{resource} de otros sirvidores no se amostran.",
   "timeline_hint.resources.followers": "Suivantes",
   "timeline_hint.resources.follows": "Segidos",
+  "timeline_hint.resources.replies": "Algunas repuestas",
   "timeline_hint.resources.statuses": "Publikasyones mas viejas",
   "trends.counter_by_accounts": "{count, plural, one {{counter} kuento} other {{counter} kuentos}} en los ultimos {days, plural, one {diyas} other {{days} diyas}}",
   "trends.trending_now": "Trendes",
diff --git a/app/javascript/mastodon/locales/sc.json b/app/javascript/mastodon/locales/sc.json
index cc23b3b1d86b4e..8c08d4e54e2440 100644
--- a/app/javascript/mastodon/locales/sc.json
+++ b/app/javascript/mastodon/locales/sc.json
@@ -11,6 +11,7 @@
   "about.not_available": "Custa informatzione no est istada posta a disponimentu in custu serbidore.",
   "about.powered_by": "Rete sotziale detzentralizada impulsada dae {mastodon}",
   "about.rules": "Règulas de su serbidore",
+  "account.account_note_header": "Nota personale",
   "account.add_or_remove_from_list": "Agiunghe o boga dae is listas",
   "account.badges.bot": "Automatizadu",
   "account.badges.group": "Grupu",
@@ -27,6 +28,7 @@
   "account.edit_profile": "Modìfica profilu",
   "account.enable_notifications": "Notìfica·mi cando @{name} pùblicat messàgios",
   "account.endorse": "Cussìgia in su profilu tuo",
+  "account.featured_tags.last_status_at": "Ùrtima publicatzione in su {date}",
   "account.featured_tags.last_status_never": "Peruna publicatzione",
   "account.featured_tags.title": "Etichetas de {name} in evidèntzia",
   "account.follow": "Sighi",
@@ -71,10 +73,15 @@
   "account.unmute_notifications_short": "Ativa is notìficas",
   "account.unmute_short": "Ativa su sonu",
   "account_note.placeholder": "Incarca pro agiùnghere una nota",
+  "admin.dashboard.daily_retention": "Tassu de ritentzione de is utentes a pustis de sa registratzione",
+  "admin.dashboard.monthly_retention": "Tassu de ritentzione de utentes pro mese a pustis de sa registratzione",
+  "admin.dashboard.retention.average": "Mèdiu",
+  "admin.dashboard.retention.cohort": "Mese de registratzione",
   "admin.dashboard.retention.cohort_size": "Utentes noos",
   "admin.impact_report.instance_accounts": "Contos de profilu chi custu diat cantzellare",
   "admin.impact_report.instance_followers": "Sighiduras chi is utentes nostros diant pèrdere",
   "admin.impact_report.instance_follows": "Sighiduras chi is utentes issoro diant pèrdere",
+  "admin.impact_report.title": "Resumu de s'impatu",
   "alert.rate_limited.message": "Torra·bi a proare a pustis de {retry_time, time, medium}.",
   "alert.rate_limited.title": "Màssimu de rechestas barigadu",
   "alert.unexpected.message": "Ddoe est istada una faddina.",
@@ -82,6 +89,7 @@
   "announcement.announcement": "Annùntziu",
   "attachments_list.unprocessed": "(non protzessadu)",
   "audio.hide": "Cua s'àudio",
+  "block_modal.remote_users_caveat": "Amus a pedire a su serbidore {domain} de rispetare sa detzisione tua. Nointames custu, su rispetu no est garantidu ca unos cantos serbidores diant pòdere gestire is blocos de manera diferente. Is publicatzione pùblicas diant pòdere ancora èssere visìbiles a is utentes chi no ant fatu s'atzessu.",
   "block_modal.show_less": "Ammustra·nde prus pagu",
   "block_modal.show_more": "Ammustra·nde prus",
   "block_modal.they_cant_mention": "Non ti podent mentovare nen sighire.",
@@ -91,7 +99,9 @@
   "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",
   "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!",
+  "bundle_column_error.network.body": "Ddoe est àpidu un'errore proende a carrigare custa pàgina. Custu diat pòdere derivare dae unu problema temporàneu cun sa connessione ìnternet tua a su serbidore.",
   "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",
@@ -138,6 +148,7 @@
   "compose_form.lock_disclaimer.lock": "blocadu",
   "compose_form.placeholder": "A ite ses pensende?",
   "compose_form.poll.duration": "Longària de su sondàgiu",
+  "compose_form.poll.multiple": "Sèberu mùltiplu",
   "compose_form.poll.option_placeholder": "Optzione {number}",
   "compose_form.poll.single": "Sèbera·nde una",
   "compose_form.poll.switch_to_multiple": "Muda su sondàgiu pro permìtere multi-optziones",
@@ -154,9 +165,12 @@
   "confirmations.block.confirm": "Bloca",
   "confirmations.delete.confirm": "Cantzella",
   "confirmations.delete.message": "Seguru chi boles cantzellare custa publicatzione?",
+  "confirmations.delete.title": "Cantzellare sa publicatzione?",
   "confirmations.delete_list.confirm": "Cantzella",
   "confirmations.delete_list.message": "Seguru chi boles cantzellare custa lista in manera permanente?",
+  "confirmations.delete_list.title": "Cantzellare sa lista?",
   "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.logout.confirm": "Essi·nche",
   "confirmations.logout.message": "Seguru chi boles essire?",
@@ -182,9 +196,21 @@
   "disabled_account_banner.text": "Su contu tuo {disabledAccount} no est ativu.",
   "dismissable_banner.dismiss": "Iscarta",
   "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.",
+  "domain_block_modal.they_cant_follow": "Perunu dae custu serbidore ti podet sighire.",
+  "domain_block_modal.they_wont_know": "No ant a ischire chi t'ant blocadu.",
   "domain_block_modal.title": "Boles blocare su domìniu?",
+  "domain_block_modal.you_wont_see_posts": "No as a bìdere publicatziones o notìficas dae utentes in custu serbidore.",
+  "domain_pill.activitypub_lets_connect": "Ti permitit de ti collegare e de interagire cun persones no isceti in Mastodon, ma in aplicatziones sotziales diferentes puru.",
+  "domain_pill.activitypub_like_language": "ActivityPub est a tipu sa limba chi Mastodon chistionat cun àteras retes sotziales.",
   "domain_pill.server": "Serbidore",
+  "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.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.",
   "embed.instructions": "Inserta custa publicatzione in su situ web tuo copiende su còdighe de suta.",
   "embed.preview": "At a aparèssere aici:",
   "emoji_button.activity": "Atividade",
diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json
index 52dbb3e27c6277..1466ff0524c499 100644
--- a/app/javascript/mastodon/locales/uk.json
+++ b/app/javascript/mastodon/locales/uk.json
@@ -356,7 +356,8 @@
   "home.pending_critical_update.link": "Переглянути оновлення",
   "home.pending_critical_update.title": "Доступне критичне оновлення безпеки!",
   "home.show_announcements": "Показати оголошення",
-  "ignore_notifications_modal.filter_to_review_separately": "Ви можете відслідковувати відфільтровані сповіщення окремо",
+  "ignore_notifications_modal.filter_to_act_users": "Ви все ще зможете прийняти, відхилити або поскаржитися на користувачів",
+  "ignore_notifications_modal.filter_to_review_separately": "Ви можете переглянути відфільтровані сповіщення окремо",
   "ignore_notifications_modal.ignore": "Ігнорувати сповіщення",
   "interaction_modal.description.favourite": "Маючи обліковий запис на Mastodon, ви можете вподобати цей допис, щоб дати автору знати, що ви його цінуєте, і зберегти його на потім.",
   "interaction_modal.description.follow": "Маючи обліковий запис на Mastodon, ви можете підписатися на {name}, щоб отримувати дописи цього користувача у свою стрічку.",
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 1a2d9a290657ee..8a142d0bd5e9c0 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -900,6 +900,8 @@ ar:
         message_html: "<strong>تم تكوين مخزن الكائنات الخاص بك بشكل خاطئ. خصوصية المستخدمين في خطر.</strong>"
     tags:
       review: حالة المراجعة
+      search: البحث
+      title: الوسوم
       updated_msg: تم تحديث إعدادات الوسوم بنجاح
     title: الإدارة
     trends:
@@ -1107,6 +1109,7 @@ ar:
     or_log_in_with: أو قم بتسجيل الدخول بواسطة
     privacy_policy_agreement_html: لقد قرأتُ وأوافق على سياسة الخصوصية <a href="%{privacy_policy_path}" target="_blank"></a>
     progress:
+      confirm: تأكيد عنوان البريد الإلكتروني
       details: تفاصيلك
       review: رأيُنا
       rules: قبول القواعد
@@ -1695,6 +1698,7 @@ ar:
     import: استيراد
     import_and_export: استيراد وتصدير
     migrate: تهجير الحساب
+    notifications: إشعارات البريد الإلكتروني
     preferences: التفضيلات
     profile: الملف التعريفي
     relationships: المتابِعون والمتابَعون
diff --git a/config/locales/de.yml b/config/locales/de.yml
index fe47c153706a2d..9bb070caf3bbfc 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -59,7 +59,7 @@ de:
       destroyed_msg: Daten von %{username} wurden zum Löschen in die Warteschlange eingereiht
       disable: Einfrieren
       disable_sign_in_token_auth: E-Mail-Token-Authentisierung deaktivieren
-      disable_two_factor_authentication: Zwei-Faktor-Authentisierung (2FA) deaktivieren
+      disable_two_factor_authentication: Zwei-Faktor-Authentisierung deaktivieren
       disabled: Eingefroren
       display_name: Anzeigename
       domain: Domain
@@ -723,7 +723,7 @@ de:
         manage_taxonomies: Hashtags verwalten
         manage_taxonomies_description: Ermöglicht Benutzer*innen, die Trends zu überprüfen und die Hashtag-Einstellungen zu aktualisieren
         manage_user_access: Kontozugriff verwalten
-        manage_user_access_description: Erlaubt Nutzer*innen, die Zwei-Faktor-Authentisierung (2FA) anderer zu deaktivieren, ihre E-Mail-Adresse zu ändern und ihr Passwort zurückzusetzen
+        manage_user_access_description: Erlaubt Nutzer*innen, die Zwei-Faktor-Authentisierung anderer zu deaktivieren, ihre E-Mail-Adresse zu ändern und ihr Passwort zurückzusetzen
         manage_users: Konten verwalten
         manage_users_description: Erlaubt es Benutzer*innen, die Details anderer Profile einzusehen und diese Accounts zu moderieren
         manage_webhooks: Webhooks verwalten
@@ -1430,7 +1430,7 @@ de:
       password: Passwort
       sign_in_token: E-Mail-Sicherheitscode
       webauthn: Sicherheitsschlüssel
-    description_html: Wenn du verdächtige Aktivitäten bemerkst, die du nicht verstehst oder zuordnen kannst, solltest du dringend dein Passwort ändern und ungeachtet dessen die Zwei-Faktor-Authentisierung (2FA) aktivieren.
+    description_html: Wenn du verdächtige Aktivitäten bemerkst, die du nicht verstehst oder zuordnen kannst, solltest du dringend dein Passwort ändern und ungeachtet dessen die Zwei-Faktor-Authentisierung aktivieren.
     empty: Kein Anmeldeverlauf verfügbar
     failed_sign_in_html: Fehlgeschlagener Anmeldeversuch mit %{method} von %{ip} (%{browser})
     successful_sign_in_html: Erfolgreiches Anmelden mit %{method} von %{ip} (%{browser})
@@ -1696,7 +1696,7 @@ de:
     severed_relationships: Getrennte Beziehungen
     statuses_cleanup: Automatische Löschung
     strikes: Maßnahmen
-    two_factor_authentication: Zwei-Faktor-Authentisierung (2FA)
+    two_factor_authentication: Zwei-Faktor-Authentisierung
     webauthn_authentication: Sicherheitsschlüssel
   severed_relationships:
     download: Herunterladen (%{count})
@@ -1815,14 +1815,14 @@ de:
       too_many_requests: Der Übersetzungsdienst hat kürzlich zu viele Anfragen erhalten.
   two_factor_authentication:
     add: Hinzufügen
-    disable: Zwei-Faktor-Authentisierung (2FA) deaktivieren
-    disabled_success: Zwei-Faktor-Authentisierung (2FA) erfolgreich deaktiviert
+    disable: Zwei-Faktor-Authentisierung deaktivieren
+    disabled_success: Zwei-Faktor-Authentisierung erfolgreich deaktiviert
     edit: Bearbeiten
     enabled: Zwei-Faktor-Authentisierung (2FA) ist aktiviert
     enabled_success: Zwei-Faktor-Authentisierung (2FA) erfolgreich aktiviert
     generate_recovery_codes: Wiederherstellungscodes erstellen
-    lost_recovery_codes: Wiederherstellungscodes ermöglichen es dir, wieder Zugang zu deinem Konto zu erlangen, falls du keinen Zugriff mehr auf die Zwei-Faktor-Authentisierung (2FA) oder den Sicherheitsschlüssel hast. Solltest du diese Wiederherstellungscodes verloren haben, kannst du sie hier neu generieren. Deine alten, bereits erstellten Wiederherstellungscodes werden dadurch ungültig.
-    methods: Methoden der Zwei-Faktor-Authentisierung (2FA)
+    lost_recovery_codes: Wiederherstellungscodes ermöglichen es dir, wieder Zugang zu deinem Konto zu erlangen, falls du keinen Zugriff mehr auf die Zwei-Faktor-Authentisierung oder den Sicherheitsschlüssel hast. Solltest du diese Wiederherstellungscodes verloren haben, kannst du sie hier neu generieren. Deine alten, bereits erstellten Wiederherstellungscodes werden dadurch ungültig.
+    methods: Methoden der Zwei-Faktor-Authentisierung
     otp: Authentisierungs-App
     recovery_codes: Wiederherstellungscodes sichern
     recovery_codes_regenerated: Wiederherstellungscodes erfolgreich neu erstellt
@@ -1855,7 +1855,7 @@ de:
       change_password: dein Passwort zu ändern
       details: 'Hier sind die Details zu den Anmeldeversuchen:'
       explanation: Wir haben eine Anmeldung zu deinem Konto von einer neuen IP-Adresse festgestellt.
-      further_actions_html: Wenn du das nicht warst, empfehlen wir dir schnellstmöglich, %{action} und die Zwei-Faktor-Authentisierung (2FA) für dein Konto zu aktivieren, um es abzusichern.
+      further_actions_html: Wenn du das nicht warst, empfehlen wir dir schnellstmöglich, %{action} und die Zwei-Faktor-Authentisierung für dein Konto zu aktivieren, um es abzusichern.
       subject: Es wurde auf dein Konto von einer neuen IP-Adresse zugegriffen
       title: Eine neue Anmeldung
     warning:
@@ -1933,7 +1933,7 @@ de:
   users:
     follow_limit_reached: Du kannst nicht mehr als %{limit} Profilen folgen
     go_to_sso_account_settings: Kontoeinstellungen des Identitätsanbieters aufrufen
-    invalid_otp_token: Ungültiger Code der Zwei-Faktor-Authentisierung (2FA)
+    invalid_otp_token: Ungültiger Code der Zwei-Faktor-Authentisierung
     otp_lost_help_html: Wenn du beides nicht mehr weißt, melde dich bitte bei uns unter der E-Mail-Adresse %{email}
     rate_limited: Zu viele Authentisierungsversuche. Bitte versuche es später noch einmal.
     seamless_external_login: Du bist über einen externen Dienst angemeldet, daher sind Passwort- und E-Mail-Einstellungen nicht verfügbar.
@@ -1960,5 +1960,5 @@ de:
     nickname_hint: Gib den Spitznamen deines neuen Sicherheitsschlüssels ein
     not_enabled: Du hast WebAuthn noch nicht aktiviert
     not_supported: Dieser Browser unterstützt keine Sicherheitsschlüssel
-    otp_required: Um Sicherheitsschlüssel zu verwenden, aktiviere zunächst die Zwei-Faktor-Authentisierung (2FA).
+    otp_required: Um Sicherheitsschlüssel zu verwenden, aktiviere zunächst die Zwei-Faktor-Authentisierung.
     registered_on: Registriert am %{date}
diff --git a/config/locales/devise.de.yml b/config/locales/devise.de.yml
index 032132cf5cb16b..f22f834e61a970 100644
--- a/config/locales/devise.de.yml
+++ b/config/locales/devise.de.yml
@@ -49,12 +49,12 @@ de:
         title: Passwort zurücksetzen
       two_factor_disabled:
         explanation: Das Anmelden ist jetzt nur noch mit einer E-Mail-Adresse und einem Passwort möglich.
-        subject: 'Mastodon: Zwei‐Faktor‐Authentisierung (2FA) deaktiviert'
+        subject: 'Mastodon: Zwei‐Faktor‐Authentisierung deaktiviert'
         subtitle: Zwei-Faktor-Authentisierung wurde für dein Konto deaktiviert.
         title: 2FA deaktiviert
       two_factor_enabled:
         explanation: Für das Anmelden wird ein Token benötigt, das von der hinterlegten TOTP-App generiert wird.
-        subject: 'Mastodon: Zwei‐Faktor‐Authentisierung (2FA) aktiviert'
+        subject: 'Mastodon: Zwei‐Faktor‐Authentisierung aktiviert'
         subtitle: Zwei-Faktor-Authentisierung wurde für dein Konto aktiviert.
         title: 2FA aktiviert
       two_factor_recovery_codes_changed:
diff --git a/config/locales/doorkeeper.ar.yml b/config/locales/doorkeeper.ar.yml
index 889c182a3f4dbe..3cecbd495a6f57 100644
--- a/config/locales/doorkeeper.ar.yml
+++ b/config/locales/doorkeeper.ar.yml
@@ -135,6 +135,7 @@ ar:
         media: الوسائط المرفقة
         mutes: تم كتمها
         notifications: الإشعارات
+        profile: مِلَفّ مَستُدون التعريفي الخاص بك
         push: الإشعارات
         reports: الشكاوى
         search: البحث
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 0ec9ae7fe70280..aaf30fa760a4d6 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -699,7 +699,7 @@ fi:
         delete_user_data: Poistaa käyttäjän tiedot
         delete_user_data_description: Sallii käyttäjien poistaa muiden käyttäjien tiedot viipymättä
         invite_users: Kutsua käyttäjiä
-        invite_users_description: Sallii käyttäjien kutsua uusia ihmisiä palvelimelle
+        invite_users_description: Sallii käyttäjien kutsua uusia käyttäjiä palvelimelle
         manage_announcements: Hallita tiedotteita
         manage_announcements_description: Sallii käyttäjien hallita palvelimen tiedotteita
         manage_appeals: Hallita valituksia
@@ -1420,7 +1420,7 @@ fi:
     table:
       expires_at: Vanhenee
       uses: Käyttökertoja
-    title: Kutsu ihmisiä
+    title: Kutsu käyttäjiä
   lists:
     errors:
       limit: Sinulla on enimmäismäärä listoja
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 27c71182b6bb4c..431bc1f915007a 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -830,7 +830,7 @@ gl:
       reblogs: Promocións
       status_changed: Publicación editada
       title: Publicacións da conta
-      trending: Tendencia
+      trending: Popular
       visibility: Visibilidade
       with_media: con medios
     strikes:
@@ -977,7 +977,7 @@ gl:
           one: Utilizado por unha persoa na última semana
           other: Utilizado por %{count} persoas na última semana
       title: Recomendacións e Suxestións
-      trending: Tendencias
+      trending: Popularidade
     warning_presets:
       add_new: Engadir novo
       delete: Eliminar
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 6c02e12b95f6dc..d090302311b6ab 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -62,6 +62,7 @@ he:
       demote: הורדה בדרגה
       destroyed_msg: הנתונים של %{username} נכנסו לתור המחיקה וצפויים להימחק באופן מיידי
       disable: הקפאה
+      disable_sign_in_token_auth: ביטול הזדהות באמצעות אסימון דוא״ל
       disable_two_factor_authentication: ביטול הזדהות דו־שלבית
       disabled: מוקפא
       display_name: שם תצוגה
@@ -70,6 +71,7 @@ he:
       email: דוא״ל
       email_status: מצב דוא״ל
       enable: ביטול הקפאה
+      enable_sign_in_token_auth: הפעלת אסימון הזדהות בדוא״ל
       enabled: מופעל
       enabled_msg: ביטול השעית החשבון של %{username} בוצע בהצלחה
       followers: עוקבים
@@ -136,6 +138,7 @@ he:
       resubscribe: להרשם מחדש
       role: תפקיד
       search: חיפוש
+      search_same_email_domain: משתמשים אחרים מאותו דומיין דוא"ל
       search_same_ip: משתמשים אחרים מאותה כתובת IP
       security: אבטחה
       security_measures:
@@ -176,21 +179,26 @@ he:
         approve_appeal: אישור ערעור
         approve_user: אישור משתמש
         assigned_to_self_report: הקצאת דו"ח
+        change_email_user: שינוי כתובת דוא"ל למשתמש
         change_role_user: שינוי תפקיד למשתמש
         confirm_user: אשר משתמש
         create_account_warning: יצירת אזהרה
         create_announcement: יצירת הכרזה
+        create_canonical_email_block: יצירת חסימת דואל
         create_custom_emoji: יצירת אמוג'י מיוחד
         create_domain_allow: יצירת דומיין מותר
         create_domain_block: יצירת דומיין חסום
+        create_email_domain_block: יצירת חסימת דומיין דוא"ל
         create_ip_block: יצירת כלל IP
         create_unavailable_domain: יצירת דומיין בלתי זמין
         create_user_role: יצירת תפקיד
         demote_user: הורדת משתמש בדרגה
         destroy_announcement: מחיקת הכרזה
+        destroy_canonical_email_block: מחיקת חסימת דואל
         destroy_custom_emoji: מחיקת אמוג'י יחודי
         destroy_domain_allow: מחיקת דומיין מותר
         destroy_domain_block: מחיקת דומיין חסום
+        destroy_email_domain_block: מחיקת חסימת דומיין דוא"ל
         destroy_instance: טיהור דומיין
         destroy_ip_block: מחיקת כלל IP
         destroy_status: מחיקת הודעה
@@ -198,8 +206,10 @@ he:
         destroy_user_role: מחיקת תפקיד
         disable_2fa_user: השעיית זיהוי דו-גורמי
         disable_custom_emoji: השעיית אמוג'י מיוחד
+        disable_sign_in_token_auth_user: השעיית אסימון הזדהות בדוא"ל של משתמש
         disable_user: השעיית משתמש
         enable_custom_emoji: הפעלת אמוג'י מיוחד
+        enable_sign_in_token_auth_user: הפעלת אסימון הזדהות בדוא"ל של משתמש
         enable_user: אפשור משתמש
         memorialize_account: הנצחת חשבון
         promote_user: קידום משתמש
@@ -229,20 +239,26 @@ he:
         approve_appeal_html: "%{name} אישר/ה ערעור על החלטת מנהלי הקהילה מ-%{target}"
         approve_user_html: "%{name} אישר/ה הרשמה מ-%{target}"
         assigned_to_self_report_html: '%{name} הקצה/תה דו"ח %{target} לעצמם'
+        change_email_user_html: '%{name} שינה\שינתה את כתובת הדוא"ל של המשתמש %{target}'
         change_role_user_html: "%{name} שינה את התפקיד של %{target}"
+        confirm_user_html: '%{name} אישר/ה את כותבת הדו"אל של המשתמש %{target}'
         create_account_warning_html: "%{name} שלח/ה אזהרה ל %{target}"
         create_announcement_html: "%{name} יצר/ה הכרזה חדשה %{target}"
+        create_canonical_email_block_html: "%{name} חסם/ה את הדואל %{target}"
         create_custom_emoji_html: "%{name} העלו אמוג'י חדש %{target}"
         create_domain_allow_html: "%{name} אישר/ה פדרציה עם הדומיין %{target}"
         create_domain_block_html: "%{name} חסם/ה את הדומיין %{target}"
+        create_email_domain_block_html: '%{name} חסם/ה את דומיין הדוא"ל %{target}'
         create_ip_block_html: "%{name} יצר/ה כלל עבור IP %{target}"
         create_unavailable_domain_html: "%{name} הפסיק/ה משלוח לדומיין %{target}"
         create_user_role_html: "%{name} יצר את התפקיד של %{target}"
         demote_user_html: "%{name} הוריד/ה בדרגה את המשתמש %{target}"
         destroy_announcement_html: "%{name} מחק/ה את ההכרזה %{target}"
+        destroy_canonical_email_block_html: "%{name} הסיר/ה חסימה מדואל %{target}"
         destroy_custom_emoji_html: "%{name} מחק אמוג'י של %{target}"
         destroy_domain_allow_html: "%{name} לא התיר/ה פדרציה עם הדומיין %{target}"
         destroy_domain_block_html: "%{name} הסיר/ה חסימה מהדומיין %{target}"
+        destroy_email_domain_block_html: '%{name} הסיר/ה חסימה מדומיין הדוא"ל %{target}'
         destroy_instance_html: "%{name} טיהר/ה את הדומיין %{target}"
         destroy_ip_block_html: "%{name} מחק/ה את הכלל עבור IP %{target}"
         destroy_status_html: ההודעה של %{target} הוסרה ע"י %{name}
@@ -250,8 +266,10 @@ he:
         destroy_user_role_html: "%{name} ביטל את התפקיד של %{target}"
         disable_2fa_user_html: "%{name} ביטל/ה את הדרישה לאימות דו-גורמי למשתמש %{target}"
         disable_custom_emoji_html: "%{name} השבית/ה את האמוג'י %{target}"
+        disable_sign_in_token_auth_user_html: '%{name} השבית/ה את האימות בעזרת אסימון דוא"ל עבור %{target}'
         disable_user_html: "%{name} חסם/ה כניסה מהמשתמש/ת %{target}"
         enable_custom_emoji_html: "%{name} אפשר/ה את האמוג'י %{target}"
+        enable_sign_in_token_auth_user_html: '%{name} אפשר/ה אימות בעזרת אסימון דוא"ל עבור %{target}'
         enable_user_html: "%{name} אפשר/ה כניסה עבור המשתמש %{target}"
         memorialize_account_html: "%{name} הפך/ה את חשבונו של %{target} לדף הנצחה"
         promote_user_html: "%{name} העלה בדרגה את המשתמש %{target}"
@@ -259,6 +277,7 @@ he:
         reject_user_html: "%{name} דחו הרשמה מ-%{target}"
         remove_avatar_user_html: "%{name} הסירו את תמונת הפרופיל של %{target}"
         reopen_report_html: '%{name} פתח מחדש דו"ח %{target}'
+        resend_user_html: "%{name} הפעיל.ה שליחה מחדש של דואל אימות עבור %{target}"
         reset_password_user_html: הסיסמה עבור המשתמש %{target} התאפסה על־ידי %{name}
         resolve_report_html: '%{name} פתר/ה דו"ח %{target}'
         sensitive_account_html: "%{name} סימן/ה את המדיה של %{target} כרגיש"
@@ -429,6 +448,7 @@ he:
         one: "%{count} נסיון במשך השבוע שעבר"
         other: "%{count} נסיונות הרשמה במשך השבוע שעבר"
         two: "%{count} נסיונות הרשמה במשך השבוע שעבר"
+      created_msg: מתחם כתובות דואל נחסם בהצלחה
       delete: מחיקה
       dns:
         types:
@@ -437,8 +457,12 @@ he:
       new:
         create: הוספת דומיין
         resolve: פתור דומיין
+        title: חסימת מתחם כתובות דואל חדש
+      no_email_domain_block_selected: לא בוצעו שינויים לחסימת מתחמי דוא"ל שכן לא נבחרו מתחמים
       not_permitted: נאסר
+      resolved_dns_records_hint_html: שם הדומיין מוביל למתחמי ה-MX הבאים, שהם בסופו של דבר אחראיים לקבלת דוא"ל. חסימת שם MX תוביל לחסימת הרשמות מכל כתובת דוא"ל שעושה שימוש בכתובת MX זו, אפילו אם הדומיין הגלוי שונה. <strong>יש להמנע מלחסום ספקי דוא"ל מובילים.</strong>
       resolved_through_html: נמצא דרך %{domain}
+      title: מתחמי כתובות דוא"ל חסומים
     export_domain_allows:
       new:
         title: יבוא רשימת שרתים מאושרים
@@ -600,6 +624,7 @@ he:
         resolve_description_html: אף פעולה לא תבוצע נגד החשבון עליו דווח, לא תירשם עבירה, והדיווח ייסגר.
         silence_description_html: הפרופיל יהיה גלוי אך ורק לאלה שכבר עוקבים אחריו או לאלה שיחפשו אותו ידנית, מה שיגביל מאד את תפוצתו. ניתן תמיד להחזיר את המצב לקדמותו. פעולה זו תסגור את כל הדיווחים נגד הפרופיל.
         suspend_description_html: חשבון זה על כל תכניו יחסמו וברבות הימים ימחקו, כל פעילות מולו לא תתאפשר. הפעולה ניתנת לביטול תוך 30 ימים, והיא תסגור כל דיווח התלוי ועומד נגד החשבון.
+      actions_description_html: בחר/י איזו פעולה לבצע על מנת לפתור את הדו"ח. אם תופעל פעולת ענישה כנגד החשבון המדווח, הודעת דוא"ל תשלח אליהם, אלא אם נבחרה קטגוריית ה<strong>ספאם</strong>.
       actions_description_remote_html: בחרו איזו פעולה לבצע כדי לפתור את הדיווח שהוגש. פעולה זו תשפיע רק על התקשורת מול השרת <strong>שלך</strong> עם החשבון המרוחק ותוכנו.
       add_to_report: הוספת פרטים לדיווח
       already_suspended_badges:
@@ -664,6 +689,7 @@ he:
         delete_data_html: למחוק את הפרופיל והתוכן של <strong>@%{acct}</strong> בעוד 30 יום אלא אם תוסר ההגבלה עליהם לפני כן
         preview_preamble_html: 'שליחת אזהרה אל <strong>@%{acct}</strong> בזו הלשון:'
         record_strike_html: ציין נקודה שחורה נגד <strong>@%{acct}</strong> כדי לסייע בשיפוטו בדיווחים עתידיים על חריגות
+        send_email_html: שליחת דואל אזהרה אל <strong>@%{acct}</strong>
         warning_placeholder: צידוקים אפשריים נוספים לפעולה המשמעתית.
       target_origin: מקור החשבון המדווח
       title: דיווחים
@@ -707,6 +733,7 @@ he:
         manage_appeals: ניהול ערעורים
         manage_appeals_description: מאפשר למשתמשים לסקור ערעורים כנגד פעולות מודרציה
         manage_blocks: ניהול חסימות
+        manage_blocks_description: מאפשר למשתמשים לחסום ספקי דוא"ל וכתובות IP
         manage_custom_emojis: ניהול סמלונים בהתאמה אישית
         manage_custom_emojis_description: מאפשר למשתמשים לנהל סמלונים בהתאמה אישית של השרת
         manage_federation: ניהול פדרציה
@@ -724,6 +751,7 @@ he:
         manage_taxonomies: ניהול טקסונומיות
         manage_taxonomies_description: מאפשר למשתמשים לסקור תוכן אופנתי (טרנדי) ולעדכן אפשרויות של תגיות.
         manage_user_access: ניהול גישת משתמשים
+        manage_user_access_description: מאפשר למשתמשים לבטל אימות דו-שלבי של משתמשים אחרים, לשנות את כתובות הדוא"ל שלהם, ולאפס את סיסמתם
         manage_users: ניהול משתמשים
         manage_users_description: מאפשר למשתמשים לצפות בפרטים של משתמשים אחרים ולבצע פעולות מודרציה לפיהם
         manage_webhooks: ניהול Webhooks
@@ -798,6 +826,7 @@ he:
       destroyed_msg: העלאת אתר נמחקה בהצלחה!
     software_updates:
       critical_update: חשוב -- יש לעדכן במהירות
+      description: מומלץ לשמור את התקנת המסטודון שלך עדכנית כדי להרוויח מהיכולות והתיקונים האחרונים. למעלה מכך, לעיתים קריטי לעדכן את מסטודון בהקדם כדי להמנע מפרצות אבטחה. מסיבות אלו, השרת יבדוק כל 30 דקות, ויודיע לך לפי העדפות הדואל שלך.
       documentation_link: למידע נוסף
       release_notes: פרטי הגרסה
       title: עדכונים זמינים
@@ -981,6 +1010,7 @@ he:
           one: הוצגה על ידי משתמש בודד במשך השבוע שעבר
           other: הוצגה על ידי %{count} משתמשים במשך השבוע שעבר
           two: הוצגה על ידי %{count} משתמשים במשך השבוע שעבר
+      title: המלצות ונושאים חמים
       trending: נושאים חמים
     warning_presets:
       add_new: הוספת חדש
@@ -1067,7 +1097,9 @@ he:
       guide_link_text: כולם יכולים לתרום.
     sensitive_content: תוכן רגיש
   application_mailer:
+    notification_preferences: שינוי העדפות דוא"ל
     salutation: "%{name},"
+    settings: 'שינוי הגדרות דוא"ל: %{link}'
     unsubscribe: בטל מנוי
     view: 'תצוגה:'
     view_profile: צפיה בפרופיל
@@ -1087,6 +1119,7 @@ he:
       hint_html: עוד דבר אחד, עלינו לאשרר שאת(ה) אנושיים (לצורך סינון ספאם). נא לפתור את הקאפצ'ה להלן וללחוץ "המשך".
       title: בדיקות אבטחה
     confirmations:
+      awaiting_review: כתובת הדואל שלך אושרה! צוות %{domain} עכשיו יבדוק את הרשמתך. תשלח אליך הודעת דואל אם הצוות יאשר את החשבון!
       awaiting_review_title: הרשמתך עוברת בדיקה
       clicking_this_link: לחיצה על קישור זה
       login_link: כניסה
@@ -1094,6 +1127,7 @@ he:
       redirect_to_app_html: כאן אמורה היתה להיות הפניה אוטמטית ליישומון <strong>%{app_name}</strong>. אם זה לא קרה, ניתן לנסות שוב על ידי %{clicking_this_link} או חזרה ידנית אל היישומון.
       registration_complete: הרשמתך לשרת %{domain} הושלמה כעת!
       welcome_title: ברוך/ה הבא/ה, %{name}!
+      wrong_email_hint: אם כתובת הדואל הזו איננה נכונה, ניתן לשנות אותה בעמוד ההגדרות.
     delete_account: מחיקת חשבון
     delete_account_html: אם ברצונך למחוק את החשבון, ניתן <a href="%{path}">להמשיך כאן</a>. תתבקש/י לספק אישור נוסף.
     description:
@@ -1114,6 +1148,7 @@ he:
     or_log_in_with: או התחבר באמצעות
     privacy_policy_agreement_html: קראתי והסכמתי ל<a href="%{privacy_policy_path}" target="_blank">מדיניות הפרטיות</a>
     progress:
+      confirm: אימות כתובת הדואל
       details: הפרטים שלך
       review: הבדיקה שלנו
       rules: הסכמה לתקנות
@@ -1135,8 +1170,10 @@ he:
     security: אבטחה
     set_new_password: סיסמה חדשה
     setup:
+      email_below_hint_html: אנא בדקו בתיקיית הספאם, או בקשו קוד חדש. ניתן לתקן את הכתובת אם נפלה תקלדה.
       email_settings_hint_html: לחצו על הקישור שנשלח כדי לאשר את הכתובת %{email}. אנו ממתינים פה.
       link_not_received: לא קיבלת קישור?
+      new_confirmation_instructions_sent: אתם עומדים לקבל הודעת דואל חדשה עם קיש/ור אימות בדקות הקרובות!
       title: בדוק/בדקי את תיבת הדואר הנכנס שלך
     sign_in:
       preamble_html: הכנס.י עם שם וסיסמה מאתר <strong>%{domain}</strong>. אם חשבונך מתארח בשרת אחר, לא ניתן להתחבר איתו פה.
@@ -1147,7 +1184,9 @@ he:
       title: הבה ניצור לך חשבון בשרת %{domain}.
     status:
       account_status: מצב חשבון
+      confirming: ממתין שדוא"ל האישור יושלם.
       functional: החשבון שלכם פעיל לגמרי.
+      pending: בקשתך ממתינה לאישור על ידי הצוות שלנו. זה עשוי לקחת זמן מה. דוא"ל יישלח אליך אם בקשתך התקבלה.
       redirecting_to: חשבונכם לא פעיל כעת מכיוון שמפנה ל%{acct}.
       self_destruct: מכיוון שהשרת %{domain} בתהליכי סגירה, תהיה לך גישה מוגבלת בלבד לחשבונך.
       view_strikes: צפיה בעברות קודמות שנרשמו נגד חשבונך
@@ -1190,6 +1229,9 @@ he:
       before: 'לפני שנמשיך, נא לקרוא בזהירות את ההערות הבאות:'
       caches: מידע שהוטמן על ידי שרתים אחרים עשוי להתמיד
       data_removal: הודעותיך וכל מידע אחר יוסרו לתמיד
+      email_change_html: ניתן <a href="%{path}">לשנות את כתובת הדוא"ל שלך</a> מבלי למחוק את החשבון
+      email_contact_html: אם הוא עדיין לא הגיע, ניתן לקבל עזרה על ידי משלוח דואל ל-<a href="mailto:%{email}">%{email}</a>
+      email_reconfirmation_html: אם לא מתקבל דוא"ל האישור, ניתן <a href="%{path}">לבקש אותו שוב</a>
       irreversible: לא ניתן יהיה לשחזר או להפעיל מחדש את חשבונך
       more_details_html: לפרטים נוספים, ראו את <a href="%{terms_path}">מדיניות הפרטיות</a>.
       username_available: שם המשתמש שלך שוב יהיה זמין
@@ -1438,6 +1480,7 @@ he:
     authentication_methods:
       otp: יישומון אימות דו-שלבי
       password: סיסמה
+      sign_in_token: קוד אימות בדוא"ל
       webauthn: מפתחות אבטחה
     description_html: אם את/ה רואה פעילות שאינך מזהה, אנא שנה/י את סיסמתך והפעל/י אימות דו-גורמי.
     empty: הסטוריית אימותים אינה זמינה
@@ -1448,6 +1491,16 @@ he:
     unsubscribe:
       action: כן, לבטל הרשמה
       complete: הפסקת הרשמה
+      confirmation_html: יש לאשר את ביטול ההרשמה להודעות %{type} ממסטודון בשרת %{domain} לכתובת הדואל %{email}. תמיד אפשר להרשם מחדש ב<a href="%{settings_path}">כיוונוני הודעות דואל</a>.
+      emails:
+        notification_emails:
+          favourite: הודעות דואל לגבי חיבובים
+          follow: הודעות דואל לגבי עוקבים חדשים
+          follow_request: הודעות דואל לגבי בקשות מעקב
+          mention: הודעות דואל לגבי איזכורים
+          reblog: הודעות דואל לגבי הידהודים
+      resubscribe_html: אם ביטול ההרשמה היה בטעות, ניתן להרשם מחדש מתוך <a href="%{settings_path}">מסך הגדרות ההרשמה</a> שלך.
+      success_html: לא יגיעו אליך יותר הודעות %{type} משרת מסטודון %{domain} לכתובת הדואל %{email}.
       title: הפסקת הרשמה
   media_attachments:
     validations:
@@ -1528,6 +1581,8 @@ he:
     update:
       subject: "%{name} ערכו הודעה"
   notifications:
+    administration_emails: התראות לדוא"ל חשבון מנהל
+    email_events: ארועים להתראות דוא"ל
     email_events_hint: 'בחר/י ארועים עבורים תרצה/י לקבל התראות:'
   number:
     human:
@@ -1686,6 +1741,7 @@ he:
     import: יבוא
     import_and_export: יבוא ויצוא
     migrate: הגירת חשבון
+    notifications: התראות בדואל
     preferences: העדפות
     profile: פרופיל
     relationships: נעקבים ועוקבים
@@ -1946,6 +2002,7 @@ he:
     invalid_otp_token: קוד דו-שלבי שגוי
     otp_lost_help_html: אם איבדת גישה לשניהם, ניתן ליצור קשר ב-%{email}
     rate_limited: יותר מדי ניסיונות אימות, נסו שוב מאוחר יותר.
+    seamless_external_login: את.ה מחובר דרך שירות חיצוני, לכן אפשרויות הסיסמא והדוא"ל לא מאופשרות.
     signed_in_as: 'מחובר בתור:'
   verification:
     extra_instructions_html: <strong>טיפ:</strong> הלינק באתר שלך יכול להיות מוסתר. החלק החשוב הוא <code>rel="me"</code> שמונע התחזות על אתרים עם תוכן משתמשים. ניתן גם ליצור תגית <code>link</code> בכותרת העמוד במקום קישור <code>a</code> אבל קוד ה־HTML חייב להופיע שם ללא הרצה של ג'אווהסקריפט.
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 8775ed543ce934..5eb4d048816b5a 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -1194,7 +1194,7 @@ hu:
       caches: Más szerverek által cache-elt tartalmak még megmaradhatnak
       data_removal: Bejegyzéseid és minden más adatod véglegesen törlődni fog
       email_change_html: <a href="%{path}">Megváltoztathatod az e-mail-címed</a> a fiókod törlése nélkül
-      email_contact_html: Ha még mindig nem érkezik meg, akkor segítségért írjon a(z) <a href="mailto:%{email}">%{email}</a> e-mail-címre
+      email_contact_html: Ha még mindig nem érkezik meg, akkor segítségért írj a(z) <a href="mailto:%{email}">%{email}</a> e-mail-címre
       email_reconfirmation_html: Ha nem kaptad meg a megerősítő e-mailt, <a href="%{path}">itt újrakérheted</a>
       irreversible: Nem fogod tudni visszaállítani vagy újraaktiválni a fiókodat
       more_details_html: A részletekért nézd meg az <a href="%{terms_path}">adatvédelmi szabályzatot</a>.
diff --git a/config/locales/kab.yml b/config/locales/kab.yml
index b45450de046bb0..3aed6c55e799b5 100644
--- a/config/locales/kab.yml
+++ b/config/locales/kab.yml
@@ -429,6 +429,9 @@ kab:
         action: Wali ileqqman yellan
       software_version_patch_check:
         action: Wali ileqqman yellan
+    tags:
+      search: Anadi
+      title: Ihacṭagen
     title: Tadbelt
     trends:
       allow: Sireg
@@ -476,6 +479,7 @@ kab:
       title: Asefqed n tɣellist
     confirmations:
       clicking_this_link: tekki ɣef wassaɣ-a
+      login_link: qqen
       proceed_to_login_html: Tzemreḍ tura ad tkemmleḍ ɣer %{login_link}.
       welcome_title: Ansuf yessek·em, %{name}!
     delete_account: Kkes amiḍan
@@ -493,6 +497,7 @@ kab:
     or_log_in_with: Neɣ eqqen s
     privacy_policy_agreement_html: Ɣriɣ yerna qebleɣ <a href="%{privacy_policy_path}" target="_blank">tasertit n tbaḍnit</a>
     progress:
+      confirm: Sentem imayl
       details: Isalli-inek
       review: Tamuɣli-nneɣ
       rules: Qbel ilugan
@@ -566,6 +571,7 @@ kab:
   edit_profile:
     basic_information: Talɣut tamatut
     hint_html: "<strong>Mudd udem i wayen ttwalin medden deg umaɣnu-inek azayez ɣer yidis n yiznan-ik.</strong> Imdanen niḍen zemren ad k-ḍefren yernu ad gen assaɣ yid-k mi ara tesɛuḍ amaɣnu yeccuṛen ed tugna n umaɣnu."
+    other: Ayen nniḍen
   errors:
     '404': Asebter i tettnadiḍ ulac-it da.
     '500':
diff --git a/config/locales/lad.yml b/config/locales/lad.yml
index 0267892fc804c6..40be2627dabd58 100644
--- a/config/locales/lad.yml
+++ b/config/locales/lad.yml
@@ -31,6 +31,7 @@ lad:
       created_msg: Nota de moderasyon kriyada kon sukseso!
       destroyed_msg: Nota de moderasyon destruida kon sukseso!
     accounts:
+      add_email_domain_block: Bloka domeno de posta
       approve: Achetar
       approved_msg: La solisitasyon de enrejistrasyon de %{username} achetada djustamente
       are_you_sure: Estas siguro?
@@ -57,6 +58,7 @@ lad:
       demote: Degrada
       destroyed_msg: Los datos de %{username} estan agora en kola para ser supremir pishin
       disable: Inkapasita
+      disable_sign_in_token_auth: Inkapasita la autentifikasyon por token de posta elektronika
       disable_two_factor_authentication: Inkapasita autentifikasyon en dos pasos
       disabled: Inkapasitada
       display_name: Nombre amostrado
@@ -65,6 +67,7 @@ lad:
       email: Posta elektronika
       email_status: Estatus de posta
       enable: Kapasita
+      enable_sign_in_token_auth: Kapasita la autentifikasyon por token de posta elektronika
       enabled: Kapasitada
       enabled_msg: El kuento de %{username} fue kapasitado djustamente
       followers: Suivantes
@@ -129,6 +132,7 @@ lad:
       resubscribe: Reabona
       role: Rolo
       search: Bushka
+      search_same_email_domain: Otros utilizadores kon el mezmo domeno de posta
       search_same_ip: Otros utilizadores kon el mezmo adreso IP
       security: Sigurita
       security_measures:
@@ -169,21 +173,26 @@ lad:
         approve_appeal: Acheta apelasyon
         approve_user: Acheta utilizador
         assigned_to_self_report: Asinya raporto
+        change_email_user: Troka posta elektronika del utilizador
         change_role_user: Troka rolo de utilizador
         confirm_user: Konfirma utilizador
         create_account_warning: Kriya avertensya
         create_announcement: Kriya pregon
+        create_canonical_email_block: Kriya bloko de posta elektronika
         create_custom_emoji: Kriya emoji personalizado
         create_domain_allow: Kriya permiso de domeno
         create_domain_block: Kriya bloko de domeno
+        create_email_domain_block: Kriya bloko de domeno de posta
         create_ip_block: Kriya regla de IP
         create_unavailable_domain: Kriya domeno no desponivle
         create_user_role: Kriya rolo
         demote_user: Degrada utilizador
         destroy_announcement: Efasa pregon
+        destroy_canonical_email_block: Efasa bloko de posta elektronika
         destroy_custom_emoji: Efasa emoji personalizado
         destroy_domain_allow: Efasa permiso de domeno
         destroy_domain_block: Efasa bloko de domeno
+        destroy_email_domain_block: Efasa bloko de domeno de posta
         destroy_instance: Efasa domeno
         destroy_ip_block: Efasa regla de IP
         destroy_status: Efasa publikasyon
@@ -191,8 +200,10 @@ lad:
         destroy_user_role: Efasa rolo
         disable_2fa_user: Inkapasita autentifikasyon en dos pasos
         disable_custom_emoji: Inkapasita emoji personalizados
+        disable_sign_in_token_auth_user: Inkapasita la autentifikasyon por token de posta elektronika para el utilizador
         disable_user: Inkapasita utilizador
         enable_custom_emoji: Kapasita emoji personalizados
+        enable_sign_in_token_auth_user: Kapasita la autentifikasyon por token de posta para el utilizador
         enable_user: Kapasita utilizador
         memorialize_account: Transforma en kuento komemorativo
         promote_user: Promove utilizador
@@ -221,20 +232,26 @@ lad:
         approve_appeal_html: "%{name} acheto la solisitasyon de moderasyon de %{target}"
         approve_user_html: "%{name} acheto el enrejistramiento de %{target}"
         assigned_to_self_report_html: "%{name} asinyo el raporto %{target} a si mezmo"
+        change_email_user_html: "%{name} troko el adreso de posta elektronika del utilizador %{target}"
         change_role_user_html: "%{name} troko el rolo de %{target}"
+        confirm_user_html: "%{name} konfirmo el adreso de posta elektronika del utilizador %{target}"
         create_account_warning_html: "%{name} embio una avertensya a %{target}"
         create_announcement_html: "%{name} kriyo un muevo pregon %{target}"
+        create_canonical_email_block_html: "%{name} bloko la posta elektronika kon el hash %{target}"
         create_custom_emoji_html: "%{name} kargo el muevo emoji %{target}"
         create_domain_allow_html: "%{name} perimitio la federasyon kon el domeno %{target}"
         create_domain_block_html: "%{name} bloko el domeno %{target}"
+        create_email_domain_block_html: "%{name} bloko el domeno de posta elektronika %{target}"
         create_ip_block_html: "%{name} kriyo una regla para IP %{target}"
         create_unavailable_domain_html: "%{name} detuvo las entregas al domeno %{target}"
         create_user_role_html: "%{name} kriyo el rolo %{target}"
         demote_user_html: "%{name} degrado a %{target}"
         destroy_announcement_html: "%{name} supremio el pregon %{target}"
+        destroy_canonical_email_block_html: "%{name} dezbloko la posta elektronika kon el hash %{target}"
         destroy_custom_emoji_html: "%{name} supremio el emoji %{target}"
         destroy_domain_allow_html: "%{name} bloko la federasyon kon el domeno %{target}"
         destroy_domain_block_html: "%{name} dezbloko el domeno %{target}"
+        destroy_email_domain_block_html: "%{name} dezbloko el domeno de posta elektronika %{target}"
         destroy_instance_html: "\"%{name} purgo el domeno %{target}"
         destroy_ip_block_html: "%{name} supremio una regla para la IP %{target}"
         destroy_status_html: "%{name} supremio una publikasyon de %{target}"
@@ -242,8 +259,10 @@ lad:
         destroy_user_role_html: "%{name} supremio el rolo %{target}"
         disable_2fa_user_html: "%{name} dezaktivo el rekerimiento en dos pasos para el utilizador %{target}"
         disable_custom_emoji_html: "%{name} dezaktivo el emoji %{target}"
+        disable_sign_in_token_auth_user_html: "%{name} inkapasito la autentifikasyon por token de posta elektronika para %{target}"
         disable_user_html: "%{name} inkapasito la koneksion kon el kuento para el utilizador %{target}"
         enable_custom_emoji_html: "%{name} aktivo el emoji %{target}"
+        enable_sign_in_token_auth_user_html: "%{name} tiene kapasitado la autentifikasyon por token de posta elektronika para %{target}"
         enable_user_html: "%{name} kapasito koneksion kon kuento para el utilizador %{target}"
         memorialize_account_html: "%{name} konvirtio el kuento de %{target} en una pajina de bendicha memoria"
         promote_user_html: "%{name} promosyon al utilizador %{target}"
@@ -251,6 +270,7 @@ lad:
         reject_user_html: "%{name} refuzo el enrejistramiento de %{target}"
         remove_avatar_user_html: "%{name} supremio la imaje de profil de %{target}"
         reopen_report_html: "%{name} reavrio el raporto %{target}"
+        resend_user_html: "%{name} tiene reembiado la posta de konfirmasyon para %{target}"
         reset_password_user_html: "%{name} reinisyo el kod del utilizador %{target}"
         resolve_report_html: "%{name} rezolvio el raporto %{target}"
         sensitive_account_html: "%{name} marko la multimedia de %{target} komo sensivle"
@@ -410,6 +430,7 @@ lad:
       attempts_over_week:
         one: "\"%{count} prova durante la ultima semana"
         other: "%{count} provas de enrejistrarse durante la ultima semana"
+      created_msg: Domeno de posta blokado kon sukseso
       delete: Efasa
       dns:
         types:
@@ -418,6 +439,7 @@ lad:
       new:
         create: Adjusta domeno
         resolve: Rezolve domeno
+        title: Bloka muevo domeno de posta
       not_permitted: Sin permiso
       resolved_through_html: Rezolvido por %{domain}
     export_domain_allows:
@@ -848,7 +870,13 @@ lad:
         action: Ve aki para mas enformasyon
         message_html: "<strong>Tu magazinaje de objektos es mal konfigurado. La privasita de tus utilizadores esta en riziko.</strong>"
     tags:
+      moderation:
+        title: Estado
+      name: Nombre
+      reset: Reinisya
       review: Estado de revizion
+      search: Bushka
+      title: Etiketas
       updated_msg: Konfigurasyon de etiketas aktualizada kon sukseso
     title: Administrasyon
     trends:
@@ -1043,6 +1071,7 @@ lad:
     or_log_in_with: O konektate kon tu kuento kon
     privacy_policy_agreement_html: Tengo meldado i acheto la <a href="%{privacy_policy_path}" target="_blank">politika de privasita</a>
     progress:
+      confirm: Konfirma posta
       details: Tus detalyos
       review: Muestra revizyon
       rules: Acheta reglas
@@ -1361,6 +1390,15 @@ lad:
     unsubscribe:
       action: Si, dezabona
       complete: Dezabonado
+      emails:
+        notification_emails:
+          favourite: avizos de favoritos por posta
+          follow: avizos de segidores por posta
+          follow_request: avizos de solisitasyones de segimyento por posta
+          mention: avizos de enmentaduras por posta
+          reblog: avizos de repartajasyones por posta
+      resubscribe_html: Si tyenes deabonado por yerro, puedes reabonar en tus <a href="%{settings_path}">opsyones de avizos por posta elektronika</a>.
+      success_html: Ya no risiviras %{type} de Mastodon en %{domain} a tu posta en %{email}.
       title: Dezabona
   media_attachments:
     validations:
@@ -1441,6 +1479,8 @@ lad:
     update:
       subject: "%{name} edito una publikasyon"
   notifications:
+    administration_emails: Avizos de administrasyon por posta
+    email_events: Evenimyentos para avizos por posta
     email_events_hint: 'Eskoje los evenimientos para los kualos keres risivir avizos:'
   number:
     human:
@@ -1599,6 +1639,7 @@ lad:
     import: Importo
     import_and_export: Importo i eksporto
     migrate: Migrasyon de kuento
+    notifications: Avizos por posta elektronika
     preferences: Preferensyas
     profile: Profil publiko
     relationships: Segidos i suivantes
diff --git a/config/locales/simple_form.ar.yml b/config/locales/simple_form.ar.yml
index 744da9d0554477..f6d177badfd650 100644
--- a/config/locales/simple_form.ar.yml
+++ b/config/locales/simple_form.ar.yml
@@ -242,11 +242,13 @@ ar:
           warn: إخفاء بتحذير
       form_admin_settings:
         activity_api_enabled: نشر مُجمل الإحصائيات عن نشاط المستخدمين في واجهة برمجة التطبيقات API
+        app_icon: أيقونة التطبيق
         backups_retention_period: فترة الاحتفاظ بأرشيف المستخدم
         bootstrap_timeline_accounts: أوصي دائما بهذه الحسابات للمستخدمين الجدد
         closed_registrations_message: رسالة مخصصة عندما يكون التسجيل غير متاح
         content_cache_retention_period: مدة الاحتفاظ بالمحتوى البعيد
         custom_css: سي أس أس CSS مخصص
+        favicon: أيقونة المفضلة
         mascot: جالب حظ مخصص (قديم)
         media_cache_retention_period: مدة الاحتفاظ بالتخزين المؤقت للوسائط
         peers_api_enabled: نشر قائمة للخوادم المكتشَفة في واجهة برمجة التطبيقات API
@@ -311,6 +313,7 @@ ar:
         listable: اسمح لهذا الوسم بالظهور في البحث وفي دليل الصفحات التعريفية
         name: الوسم
         trendable: السماح لهذه الكلمة المفتاحية بالظهور تحت المتداوَلة
+        usable: السماح للمنشورات باستخدام هذا الوسم محليا
       user:
         role: الدور
         time_zone: النطاق الزمني
diff --git a/config/locales/simple_form.fr-CA.yml b/config/locales/simple_form.fr-CA.yml
index 5edffb49d4bf18..b9582fab74938b 100644
--- a/config/locales/simple_form.fr-CA.yml
+++ b/config/locales/simple_form.fr-CA.yml
@@ -237,10 +237,12 @@ fr-CA:
           warn: Cacher derrière un avertissement
       form_admin_settings:
         activity_api_enabled: Publie des statistiques agrégées sur l'activité des utilisateur⋅rice⋅s dans l'API
+        app_icon: Icône de l'appli
         backups_retention_period: Période d'archivage utilisateur
         bootstrap_timeline_accounts: Toujours recommander ces comptes aux nouveaux utilisateurs
         closed_registrations_message: Message personnalisé lorsque les inscriptions ne sont pas disponibles
         custom_css: CSS personnalisé
+        favicon: Favicon
         mascot: Mascotte personnalisée (héritée)
         media_cache_retention_period: Durée de rétention des médias dans le cache
         peers_api_enabled: Publie la liste des serveurs découverts dans l'API
diff --git a/config/locales/simple_form.fr.yml b/config/locales/simple_form.fr.yml
index 9694b00b48cfda..99e0e1f210aa64 100644
--- a/config/locales/simple_form.fr.yml
+++ b/config/locales/simple_form.fr.yml
@@ -237,10 +237,12 @@ fr:
           warn: Cacher derrière un avertissement
       form_admin_settings:
         activity_api_enabled: Publie des statistiques agrégées sur l'activité des utilisateur⋅rice⋅s dans l'API
+        app_icon: Icône de l'appli
         backups_retention_period: Durée de rétention des archives utilisateur
         bootstrap_timeline_accounts: Toujours recommander ces comptes aux nouveaux⋅elles utilisateur⋅rice⋅s
         closed_registrations_message: Message personnalisé lorsque les inscriptions ne sont pas disponibles
         custom_css: CSS personnalisé
+        favicon: Favicon
         mascot: Mascotte personnalisée (héritée)
         media_cache_retention_period: Durée de rétention des médias dans le cache
         peers_api_enabled: Publie la liste des serveurs découverts dans l'API
diff --git a/config/locales/simple_form.gl.yml b/config/locales/simple_form.gl.yml
index a7074af0f9bb69..9adaa31efc2856 100644
--- a/config/locales/simple_form.gl.yml
+++ b/config/locales/simple_form.gl.yml
@@ -99,9 +99,9 @@ gl:
         theme: Decorado que verán visitantes e novas usuarias.
         thumbnail: Imaxe con proporcións 2:1 mostrada xunto á información sobre o servidor.
         timeline_preview: Visitantes e usuarias non conectadas poderán ver as publicacións públicas máis recentes do servidor.
-        trendable_by_default: Omitir a revisión manual das tendencias. Poderás igualmente eliminar manualmente os elementos que vaian aparecendo.
+        trendable_by_default: Omitir a revisión manual dos contidos populares. Poderás igualmente eliminar manualmente os elementos que vaian aparecendo.
         trends: As tendencias mostran publicacións, cancelos e novas historias que teñen popularidade no teu servidor.
-        trends_as_landing_page: Mostrar contidos en voga para as persoas sen sesión iniciada e visitantes no lugar dunha descrición deste servidor. Require ter activado Tendencias.
+        trends_as_landing_page: Mostrar contidos en voga para as persoas sen sesión iniciada e visitantes no lugar dunha descrición deste servidor. Require ter activado Popularidade.
       form_challenge:
         current_password: Estás entrando nun área segura
       imports:
@@ -303,7 +303,7 @@ gl:
           label: Hai unha nova versión de Mastodon dispoñible
           none: Non notificar nunca as actualizacións (non se aconsella)
           patch: Notificar as actualizacións de arranxos
-        trending_tag: Hai que revisar unha nova tendencia
+        trending_tag: Hai que revisar un novo tema popular
       rule:
         hint: Información adicional
         text: Regra
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 4add810bc60d21..eeeb117d6caa5b 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -35,6 +35,7 @@ uk:
       created_msg: Нотатку модератора успішно створено!
       destroyed_msg: Нотатку модератора успішно видалено!
     accounts:
+      add_email_domain_block: Заблокувати домен до е-пошти
       approve: Схвалити
       approved_msg: Заявку на реєстрацію %{username} затверджено
       are_you_sure: Ви впевнені?
@@ -61,6 +62,7 @@ uk:
       demote: Усунути
       destroyed_msg: Дані %{username} тепер в черзі на негайне видалення
       disable: Заморозити
+      disable_sign_in_token_auth: Вимкнути автентифікацію за допомогою токена е-пошти
       disable_two_factor_authentication: Вимкнути двофакторну авторизацію
       disabled: Вимкнено
       display_name: Відображуване ім'я
@@ -69,6 +71,7 @@ uk:
       email: Електронна пошта
       email_status: Стан електронної пошти
       enable: Розморозити
+      enable_sign_in_token_auth: Увімкнути автентифікацію за допомогою токена е-пошти
       enabled: Увімкнено
       enabled_msg: Обліковий запис %{username} успішно розморожено
       followers: Підписники
@@ -135,6 +138,7 @@ uk:
       resubscribe: Перепідписатися
       role: Роль
       search: Пошук
+      search_same_email_domain: Інші користувачі з тим самим доменом е-пошти
       search_same_ip: Інші користувачі з тим самим IP
       security: Безпека
       security_measures:
@@ -175,21 +179,26 @@ uk:
         approve_appeal: Затвердити апеляцію
         approve_user: Затвердити користувачів
         assigned_to_self_report: Призначити звіт
+        change_email_user: Змінити електронну пошту для користувача
         change_role_user: Змінити роль користувача
         confirm_user: Підтвердити користувача
         create_account_warning: Створити попередження
         create_announcement: Створити оголошення
+        create_canonical_email_block: Створити блокування електронної пошти
         create_custom_emoji: Створити користувацьке емодзі
         create_domain_allow: Створити дозвіл на домен
         create_domain_block: Створити блокування домену
+        create_email_domain_block: Створити блокування домену е-пошти
         create_ip_block: Створити правило IP
         create_unavailable_domain: Створити недоступний домен
         create_user_role: Створити роль
         demote_user: Понизити користувача
         destroy_announcement: Видалити оголошення
+        destroy_canonical_email_block: Видалити блокування електронної пошти
         destroy_custom_emoji: Видалити користувацьке емодзі
         destroy_domain_allow: Видалити дозвіл на домен
         destroy_domain_block: Видалити блокування домену
+        destroy_email_domain_block: Видалити блокування домену е-пошти
         destroy_instance: Очистити домен
         destroy_ip_block: Видалити правило IP
         destroy_status: Видалити допис
@@ -197,8 +206,10 @@ uk:
         destroy_user_role: Знищити роль
         disable_2fa_user: Вимкнути 2FA
         disable_custom_emoji: Вимкнути користувацькі емодзі
+        disable_sign_in_token_auth_user: Вимкнути автентифікацію за допомогою токена е-пошти для користувача
         disable_user: Відключити користувача
         enable_custom_emoji: Увімкнути користувацькі емодзі
+        enable_sign_in_token_auth_user: Увімкнути автентифікацію за допомогою токена е-пошти для користувача
         enable_user: Активувати користувача
         memorialize_account: Меморіалізувати акаунт
         promote_user: Підвищити користувача
@@ -228,20 +239,26 @@ uk:
         approve_appeal_html: "%{name} затвердили звернення на оскарження рішення від %{target}"
         approve_user_html: "%{name} схвалює реєстрацію від %{target}"
         assigned_to_self_report_html: "%{name} створює скаргу %{target} на себе"
+        change_email_user_html: "%{name} змінює адресу е-пошти користувача %{target}"
         change_role_user_html: "%{name} змінює роль %{target}"
+        confirm_user_html: "%{name} підтверджує стан адреси е-пошти користувача %{target}"
         create_account_warning_html: "%{name} надсилає попередження до %{target}"
         create_announcement_html: "%{name} створює нове оголошення %{target}"
+        create_canonical_email_block_html: "%{name} блокує адресу е-пошти з хешем %{target}"
         create_custom_emoji_html: "%{name} завантажує нові емодзі %{target}"
         create_domain_allow_html: "%{name} дозволяє федерацію з доменом %{target}"
         create_domain_block_html: "%{name} блокує домен %{target}"
+        create_email_domain_block_html: "%{name} блокує домен електронної пошти %{target}"
         create_ip_block_html: "%{name} створює правило для IP %{target}"
         create_unavailable_domain_html: "%{name} зупиняє доставляння на домен %{target}"
         create_user_role_html: "%{name} створює роль %{target}"
         demote_user_html: "%{name} понижує користувача %{target}"
         destroy_announcement_html: "%{name} видаляє оголошення %{target}"
+        destroy_canonical_email_block_html: "%{name} розблоковує електронну пошту з хешем %{target}"
         destroy_custom_emoji_html: "%{name} видаляє емоджі %{target}"
         destroy_domain_allow_html: "%{name} скасовує федерацію з доменом %{target}"
         destroy_domain_block_html: "%{name} розблокує домен %{target}"
+        destroy_email_domain_block_html: "%{name} розблоковує домен електронної пошти %{target}"
         destroy_instance_html: "%{name} очищує домен %{target}"
         destroy_ip_block_html: "%{name} видаляє правило для IP %{target}"
         destroy_status_html: "%{name} вилучає допис %{target}"
@@ -249,8 +266,10 @@ uk:
         destroy_user_role_html: "%{name} видаляє роль %{target}"
         disable_2fa_user_html: "%{name} вимикає двоетапну перевірку для користувача %{target}"
         disable_custom_emoji_html: "%{name} вимикає емодзі %{target}"
+        disable_sign_in_token_auth_user_html: "%{name} вимикає автентифікацію через токен е-пошти для %{target}"
         disable_user_html: "%{name} вимикає вхід для користувача %{target}"
         enable_custom_emoji_html: "%{name} вмикає емодзі %{target}"
+        enable_sign_in_token_auth_user_html: "%{name} вмикає автентифікацію через токен е-пошти для %{target}"
         enable_user_html: "%{name} вмикає вхід для користувача %{target}"
         memorialize_account_html: "%{name} перетворює обліковий запис %{target} на сторінку пам'яті"
         promote_user_html: "%{name} підвищує користувача %{target}"
@@ -258,6 +277,7 @@ uk:
         reject_user_html: "%{name} відхиляє реєстрацію від %{target}"
         remove_avatar_user_html: "%{name} прибирає аватар %{target}"
         reopen_report_html: "%{name} знову відкриває звіт %{target}"
+        resend_user_html: "%{name} надсилає підтверджувальний лист для %{target}"
         reset_password_user_html: "%{name} скидає пароль користувача %{target}"
         resolve_report_html: "%{name} розв'язує скаргу %{target}"
         sensitive_account_html: "%{name} позначає медіа від %{target} делікатним"
@@ -428,6 +448,7 @@ uk:
         many: "%{count} спроб входу за останній тиждень"
         one: "%{count} спроба за останній тиждень"
         other: "%{count} спроби входу за останній тиждень"
+      created_msg: Домен е-пошти заблоковано
       delete: Видалити
       dns:
         types:
@@ -436,6 +457,8 @@ uk:
       new:
         create: Додати домен
         resolve: Розв'язати домен
+        title: Заблокувати новий домен е-пошти
+      no_email_domain_block_selected: Налаштування блокування доменів електронної пошти не змінено, оскільки жоден домен вибрано
       not_permitted: Не дозволено
       resolved_through_html: Розв'язано через %{domain}
     export_domain_allows:
@@ -1412,6 +1435,7 @@ uk:
     authentication_methods:
       otp: застосунок двофакторної автентифікації
       password: пароль
+      sign_in_token: код безпеки е-поштою
       webauthn: ключі безпеки
     description_html: Якщо ви помітили невідомі вам дії, тоді подумайте про зміну свого пароля та можливість увімкнення двофакторної автентифікації.
     empty: Немає історії входів
@@ -1422,6 +1446,15 @@ uk:
     unsubscribe:
       action: Так, відписатися
       complete: Відписалися
+      emails:
+        notification_emails:
+          favourite: отримувати сповіщення про вподобання електронною поштою
+          follow: отримувати сповіщення про підписки електронною поштою
+          follow_request: отримувати сповіщення про запити на стеження електронною поштою
+          mention: отримувати сповіщення про згадки електронною поштою
+          reblog: отримувати сповіщення про поширення електронною поштою
+      resubscribe_html: Якщо ви відписалися помилково, ви можете повторно підписатися в <a href="%{settings_path}">налаштуваннях сповіщень електронною поштою</a>.
+      success_html: Ви більше не отримуватимете %{type} для Mastodon %{domain} на адресу %{email}.
       title: Відписатися
   media_attachments:
     validations:
@@ -1502,6 +1535,8 @@ uk:
     update:
       subject: "%{name} змінює допис"
   notifications:
+    administration_emails: Сповіщення е-пошти адміністратора
+    email_events: Події, про які сповіщати електронною поштою
     email_events_hint: 'Оберіть події, про які ви хочете отримувати сповіщення:'
   number:
     human:
@@ -1660,6 +1695,7 @@ uk:
     import: Імпорт
     import_and_export: Імпорт та експорт
     migrate: Міграція облікового запису
+    notifications: Сповіщення е-поштою
     preferences: Налаштування
     profile: Загальнодоступний профіль
     relationships: Підписки та підписники
@@ -1920,6 +1956,7 @@ uk:
     invalid_otp_token: Введено неправильний код
     otp_lost_help_html: Якщо ви втратили доступ до обох, ви можете отримати доступ з %{email}
     rate_limited: Забагато спроб з'єднання. Спробуйте ще раз пізніше.
+    seamless_external_login: Ви увійшли за допомогою зовнішньої служби, тому налаштування пароля та електронної пошти недоступні.
     signed_in_as: 'Ви увійшли як:'
   verification:
     extra_instructions_html: <strong>Порада:</strong> Посилання на ваш сайт може бути невидимим. Важлива частина — це <code>rel="me"</code>, яка не запобігає видаванню себе за іншу особу на вебсайтах з користувацьким наповненням. Ви навіть можете використовувати тег <code>link</code> у заголовку сторінки замість <code>a</code>, але HTML має бути доступним без виконання JavaScript.
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index c0403a0169693a..df1d1cc810ed41 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -1218,7 +1218,7 @@ zh-TW:
     invalid_domain: 並非一個有效網域
   edit_profile:
     basic_information: 基本資訊
-    hint_html: "<strong>自訂人們能於您個人檔案及嘟文旁所見之內容。</strong>當您完成填寫個人檔案以及設定大頭貼後，其他人們比較願意跟隨您並與您互動。"
+    hint_html: "<strong>自訂人們能於您個人檔案及嘟文旁所見之內容。</strong>當您完成填寫個人檔案及設定大頭貼後，其他人們比較願意跟隨您並與您互動。"
     other: 其他
   errors:
     '400': 您所送出的請求無效或格式不正確。

From 78d08da1fb52caa3408bba7c46733c85b9bdf194 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 16 Aug 2024 11:53:33 +0200
Subject: [PATCH 1859/2191] Update opentelemetry-ruby (non-major) (#31446)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index cf930dadb6eb7f..5b82fa98dd8865 100644
--- a/Gemfile
+++ b/Gemfile
@@ -112,7 +112,7 @@ group :opentelemetry do
   gem 'opentelemetry-instrumentation-http', '~> 0.23.2', require: false
   gem 'opentelemetry-instrumentation-http_client', '~> 0.22.3', require: false
   gem 'opentelemetry-instrumentation-net_http', '~> 0.22.4', require: false
-  gem 'opentelemetry-instrumentation-pg', '~> 0.27.1', require: false
+  gem 'opentelemetry-instrumentation-pg', '~> 0.28.0', require: false
   gem 'opentelemetry-instrumentation-rack', '~> 0.24.1', require: false
   gem 'opentelemetry-instrumentation-rails', '~> 0.31.0', require: false
   gem 'opentelemetry-instrumentation-redis', '~> 0.25.3', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 2a3a2b3893e0d2..dacb03426512dc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -551,7 +551,7 @@ GEM
     opentelemetry-instrumentation-net_http (0.22.7)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-pg (0.27.4)
+    opentelemetry-instrumentation-pg (0.28.0)
       opentelemetry-api (~> 1.0)
       opentelemetry-helpers-sql-obfuscation
       opentelemetry-instrumentation-base (~> 0.22.1)
@@ -997,7 +997,7 @@ DEPENDENCIES
   opentelemetry-instrumentation-http (~> 0.23.2)
   opentelemetry-instrumentation-http_client (~> 0.22.3)
   opentelemetry-instrumentation-net_http (~> 0.22.4)
-  opentelemetry-instrumentation-pg (~> 0.27.1)
+  opentelemetry-instrumentation-pg (~> 0.28.0)
   opentelemetry-instrumentation-rack (~> 0.24.1)
   opentelemetry-instrumentation-rails (~> 0.31.0)
   opentelemetry-instrumentation-redis (~> 0.25.3)

From a0afbba54d272a0b1c2068b05ec95fc21701e8f5 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 16 Aug 2024 11:54:27 +0200
Subject: [PATCH 1860/2191] Update dependency sanitize to v6.1.3 (#31434)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index dacb03426512dc..fdd5231ad2b3b2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -779,7 +779,7 @@ GEM
       fugit (~> 1.1, >= 1.1.6)
     safety_net_attestation (0.4.0)
       jwt (~> 2.0)
-    sanitize (6.1.2)
+    sanitize (6.1.3)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     scenic (1.8.0)

From 622628a199d42a43adc57b8f42faf1fb4500dd91 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 16 Aug 2024 10:00:15 +0000
Subject: [PATCH 1861/2191] Update dependency rspec-rails to v6.1.4 (#31442)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index fdd5231ad2b3b2..a34b56a882db6e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -723,7 +723,7 @@ GEM
     rspec-mocks (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-rails (6.1.3)
+    rspec-rails (6.1.4)
       actionpack (>= 6.1)
       activesupport (>= 6.1)
       railties (>= 6.1)

From 32a78e56e0a9934f65b89a455f2d118642b998de Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Fri, 16 Aug 2024 12:00:59 +0200
Subject: [PATCH 1862/2191] Add a follow button & follower count on follow
 notifications (#31433)

---
 .../components/notification_follow.tsx        | 55 +++++++++++++++----
 .../notification_follow_request.tsx           |  4 +-
 .../notification_group_with_status.tsx        | 12 +++-
 .../styles/mastodon/components.scss           | 12 ++++
 4 files changed, 68 insertions(+), 15 deletions(-)

diff --git a/app/javascript/mastodon/features/notifications_v2/components/notification_follow.tsx b/app/javascript/mastodon/features/notifications_v2/components/notification_follow.tsx
index 0ed96ae636c662..3760096d4427e9 100644
--- a/app/javascript/mastodon/features/notifications_v2/components/notification_follow.tsx
+++ b/app/javascript/mastodon/features/notifications_v2/components/notification_follow.tsx
@@ -1,7 +1,11 @@
 import { FormattedMessage } from 'react-intl';
 
 import PersonAddIcon from '@/material-icons/400-24px/person_add-fill.svg?react';
+import { FollowersCounter } from 'mastodon/components/counters';
+import { FollowButton } from 'mastodon/components/follow_button';
+import { ShortNumber } from 'mastodon/components/short_number';
 import type { NotificationGroupFollow } from 'mastodon/models/notification_group';
+import { useAppSelector } from 'mastodon/store';
 
 import type { LabelRenderer } from './notification_group_with_status';
 import { NotificationGroupWithStatus } from './notification_group_with_status';
@@ -14,18 +18,45 @@ const labelRenderer: LabelRenderer = (values) => (
   />
 );
 
+const FollowerCount: React.FC<{ accountId: string }> = ({ accountId }) => {
+  const account = useAppSelector((s) => s.accounts.get(accountId));
+
+  if (!account) return null;
+
+  return (
+    <ShortNumber value={account.followers_count} renderer={FollowersCounter} />
+  );
+};
+
 export const NotificationFollow: React.FC<{
   notification: NotificationGroupFollow;
   unread: boolean;
-}> = ({ notification, unread }) => (
-  <NotificationGroupWithStatus
-    type='follow'
-    icon={PersonAddIcon}
-    iconId='person-add'
-    accountIds={notification.sampleAccountIds}
-    timestamp={notification.latest_page_notification_at}
-    count={notification.notifications_count}
-    labelRenderer={labelRenderer}
-    unread={unread}
-  />
-);
+}> = ({ notification, unread }) => {
+  let actions: JSX.Element | undefined;
+  let additionalContent: JSX.Element | undefined;
+
+  if (notification.sampleAccountIds.length === 1) {
+    // only display those if the group contains 1 account, otherwise it does not makes sense
+    const account = notification.sampleAccountIds[0];
+
+    if (account) {
+      actions = <FollowButton accountId={notification.sampleAccountIds[0]} />;
+      additionalContent = <FollowerCount accountId={account} />;
+    }
+  }
+
+  return (
+    <NotificationGroupWithStatus
+      type='follow'
+      icon={PersonAddIcon}
+      iconId='person-add'
+      accountIds={notification.sampleAccountIds}
+      timestamp={notification.latest_page_notification_at}
+      count={notification.notifications_count}
+      labelRenderer={labelRenderer}
+      unread={unread}
+      actions={actions}
+      additionalContent={additionalContent}
+    />
+  );
+};
diff --git a/app/javascript/mastodon/features/notifications_v2/components/notification_follow_request.tsx b/app/javascript/mastodon/features/notifications_v2/components/notification_follow_request.tsx
index 8c9837efa34da8..281bfd94af67b9 100644
--- a/app/javascript/mastodon/features/notifications_v2/components/notification_follow_request.tsx
+++ b/app/javascript/mastodon/features/notifications_v2/components/notification_follow_request.tsx
@@ -46,7 +46,7 @@ export const NotificationFollowRequest: React.FC<{
   }, [dispatch, notification.sampleAccountIds]);
 
   const actions = (
-    <div className='notification-group__actions'>
+    <>
       <IconButton
         title={intl.formatMessage(messages.reject)}
         icon='times'
@@ -59,7 +59,7 @@ export const NotificationFollowRequest: React.FC<{
         iconComponent={CheckIcon}
         onClick={onAuthorize}
       />
-    </div>
+    </>
   );
 
   return (
diff --git a/app/javascript/mastodon/features/notifications_v2/components/notification_group_with_status.tsx b/app/javascript/mastodon/features/notifications_v2/components/notification_group_with_status.tsx
index 2af73c8362a7b7..8f555956e0e771 100644
--- a/app/javascript/mastodon/features/notifications_v2/components/notification_group_with_status.tsx
+++ b/app/javascript/mastodon/features/notifications_v2/components/notification_group_with_status.tsx
@@ -31,6 +31,7 @@ export const NotificationGroupWithStatus: React.FC<{
   labelSeeMoreHref?: string;
   type: string;
   unread: boolean;
+  additionalContent?: JSX.Element;
 }> = ({
   icon,
   iconId,
@@ -43,6 +44,7 @@ export const NotificationGroupWithStatus: React.FC<{
   labelSeeMoreHref,
   type,
   unread,
+  additionalContent,
 }) => {
   const dispatch = useAppDispatch();
 
@@ -92,7 +94,9 @@ export const NotificationGroupWithStatus: React.FC<{
             <div className='notification-group__main__header__wrapper'>
               <AvatarGroup accountIds={accountIds} />
 
-              {actions}
+              {actions && (
+                <div className='notification-group__actions'>{actions}</div>
+              )}
             </div>
 
             <div className='notification-group__main__header__label'>
@@ -106,6 +110,12 @@ export const NotificationGroupWithStatus: React.FC<{
               <EmbeddedStatus statusId={statusId} />
             </div>
           )}
+
+          {additionalContent && (
+            <div className='notification-group__main__additional-content'>
+              {additionalContent}
+            </div>
+          )}
         </div>
       </div>
     </HotKeys>
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 08f43c59cbbb8f..895762b8036a35 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -10486,6 +10486,13 @@ noscript {
     gap: 8px;
     flex: 1 1 auto;
     overflow: hidden;
+    container-type: inline-size;
+
+    @container (width < 350px) {
+      &__header time {
+        display: none;
+      }
+    }
 
     &__header {
       display: flex;
@@ -10525,6 +10532,11 @@ noscript {
       border-radius: 8px;
       padding: 8px;
     }
+
+    &__additional-content {
+      color: $darker-text-color;
+      margin-top: -8px; // to offset the parent's `gap` property
+    }
   }
 
   &__avatar-group {

From a2dfe5a7797ca6e265f3f91cbfdbedf50bb03c1e Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 16 Aug 2024 10:33:24 +0000
Subject: [PATCH 1863/2191] Update dependency test-prof to v1.4.0 (#31431)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index a34b56a882db6e..3d5a3123996a2d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -838,7 +838,7 @@ GEM
       unicode-display_width (>= 1.1.1, < 3)
     terrapin (1.0.1)
       climate_control
-    test-prof (1.3.3.1)
+    test-prof (1.4.0)
     thor (1.3.1)
     tilt (2.3.0)
     timeout (0.4.1)

From 367d3841af5c358848b84efac49f63a93ff1e2e1 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 16 Aug 2024 10:34:40 +0000
Subject: [PATCH 1864/2191] Update dependency aws-sdk-s3 to v1.158.0 (#31447)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 3d5a3123996a2d..61bdb1d39c4eda 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -100,16 +100,16 @@ GEM
     attr_required (1.0.2)
     awrence (1.2.1)
     aws-eventstream (1.3.0)
-    aws-partitions (1.961.0)
-    aws-sdk-core (3.201.3)
+    aws-partitions (1.964.0)
+    aws-sdk-core (3.201.5)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
-      aws-sigv4 (~> 1.8)
+      aws-sigv4 (~> 1.9)
       jmespath (~> 1, >= 1.6.1)
     aws-sdk-kms (1.88.0)
       aws-sdk-core (~> 3, >= 3.201.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.157.0)
+    aws-sdk-s3 (1.158.0)
       aws-sdk-core (~> 3, >= 3.201.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)

From 1acbb628b93f0304c4f77ec74cd18fc7d860a9e2 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 16 Aug 2024 14:52:57 +0200
Subject: [PATCH 1865/2191] Update changelog for v4.2.11 (#31452)

---
 CHANGELOG.md       | 33 +++++++++++++++++++++++++++++++++
 docker-compose.yml |  6 +++---
 2 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7c3d96ba4a4832..d47c9bc1681117 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,39 @@
 
 All notable changes to this project will be documented in this file.
 
+## |4.2.11] - 2024-08-16
+
+### Added
+
+- Add support for incoming `<s>` tag ([mediaformat](https://github.com/mastodon/mastodon/pull/31375))
+
+### Changed
+
+- Change logic of block/mute bypass for mentions from moderators to only apply to visible roles with moderation powers ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/31271))
+
+### Fixed
+
+- Fix incorrect rate limit on PUT requests ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/31356))
+- Fix presence of `ß` in adjacent word preventing mention and hashtag matching ([adamniedzielski](https://github.com/mastodon/mastodon/pull/31122))
+- Fix processing of webfinger responses with multiple `self` links ([adamniedzielski](https://github.com/mastodon/mastodon/pull/31110))
+- Fix duplicate `orderedItems` in user archive's `outbox.json` ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/31099))
+- Fix click event handling when clicking outside of an open dropdown menu ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/31251))
+- Fix status processing failing halfway when a remote post has a malformed `replies` attribute ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/31246))
+- Fix `--verbose` option of `tootctl media remove`, which was previously erroneously removed ([mjankowski](https://github.com/mastodon/mastodon/pull/30536))
+- Fix division by zero on some video/GIF files ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/30600))
+- Fix Web UI trying to save user settings despite being logged out ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/30324))
+- Fix hashtag regexp matching some link anchors ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/30190))
+- Fix local account search on LDAP login being case-sensitive ([raucao](https://github.com/mastodon/mastodon/pull/30113))
+- Fix development environment admin account not being auto-approved ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/29958))
+- Fix report reason selector in moderation interface not unselecting rules when changing category ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/29026))
+- Fix already-invalid reports failing to resolve ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/29027))
+- Fix OCR when using S3/CDN for assets ([vmstan](https://github.com/mastodon/mastodon/pull/28551))
+- Fix error when encountering malformed `Tag` objects from Kbin ([ShadowJonathan](https://github.com/mastodon/mastodon/pull/28235))
+- Fix not all allowed image formats showing in file picker when uploading custom emoji ([june128](https://github.com/mastodon/mastodon/pull/28076))
+- Fix search popout listing unusable search options when logged out ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/27918))
+- Fix processing of featured collections lacking an `items` attribute ([tribela](https://github.com/mastodon/mastodon/pull/27581))
+- Fix `mastodon:stats` decoration of stats rake task ([mjankowski](https://github.com/mastodon/mastodon/pull/31104))
+
 ## [4.2.10] - 2024-07-04
 
 ### Security
diff --git a/docker-compose.yml b/docker-compose.yml
index 7a6f9be50997de..1c4ab536a84eab 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -58,7 +58,7 @@ services:
 
   web:
     build: .
-    image: ghcr.io/mastodon/mastodon:v4.2.10
+    image: ghcr.io/mastodon/mastodon:v4.2.11
     restart: always
     env_file: .env.production
     command: bundle exec puma -C config/puma.rb
@@ -79,7 +79,7 @@ services:
 
   streaming:
     build: .
-    image: ghcr.io/mastodon/mastodon:v4.2.10
+    image: ghcr.io/mastodon/mastodon:v4.2.11
     restart: always
     env_file: .env.production
     command: node ./streaming
@@ -97,7 +97,7 @@ services:
 
   sidekiq:
     build: .
-    image: ghcr.io/mastodon/mastodon:v4.2.10
+    image: ghcr.io/mastodon/mastodon:v4.2.11
     restart: always
     env_file: .env.production
     command: bundle exec sidekiq

From 909a3b41a179e28c061195b53c526e97c6f18536 Mon Sep 17 00:00:00 2001
From: Jeremy Kescher <jeremy@kescher.at>
Date: Fri, 16 Aug 2024 16:08:01 +0200
Subject: [PATCH 1866/2191] Bump Catstodon revision to 1.0.9

---
 CHANGELOG.md            | 4 ++++
 lib/mastodon/version.rb | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9e1f9701732f9b..a9973052c74225 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@ All changes to Catstodon that aren't Mastodon or glitch-soc Mastodon changes wil
 
 All release dates, as well as most other dates, are intended to be read as "within the day, in UTC time."
 
+## [4.3.0-alpha.5+glitch+cat+1.0.9] - 2024-08-16
+
+- Upstream changes
+
 ## [4.3.0-alpha.5+glitch+cat+1.0.8] - 2024-08-11
 
 - Upstream changes
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index 333cd3eaca64b4..39488fddd2d76f 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -25,7 +25,7 @@ def prerelease
     end
 
     def catstodon_revision
-      '1.0.8'
+      '1.0.9'
     end
 
     def build_metadata

From 2d589a5ed445b474ab7cec27b0db2a331ed7bd49 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 16 Aug 2024 19:11:23 +0200
Subject: [PATCH 1867/2191] Fix incorrect activity matching in notification
 unfiltering worker (#31456)

---
 app/workers/unfilter_notifications_worker.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/workers/unfilter_notifications_worker.rb b/app/workers/unfilter_notifications_worker.rb
index 5939a691fb6611..4351758907637f 100644
--- a/app/workers/unfilter_notifications_worker.rb
+++ b/app/workers/unfilter_notifications_worker.rb
@@ -43,6 +43,6 @@ def filtered_notifications
   end
 
   def notifications_with_private_mentions
-    filtered_notifications.joins(mention: :status).merge(Status.where(visibility: :direct)).includes(mention: :status)
+    filtered_notifications.where(type: :mention).joins(mention: :status).merge(Status.where(visibility: :direct)).includes(mention: :status)
   end
 end

From ceeabffee547e165158b80b786f4688b5002c4be Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Fri, 16 Aug 2024 12:00:59 +0200
Subject: [PATCH 1868/2191] [Glitch] Add a follow button & follower count on
 follow notifications

Port 32a78e56e0a9934f65b89a455f2d118642b998de to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../components/notification_follow.tsx        | 55 +++++++++++++++----
 .../notification_follow_request.tsx           |  4 +-
 .../notification_group_with_status.tsx        | 12 +++-
 .../flavours/glitch/styles/components.scss    | 12 ++++
 4 files changed, 68 insertions(+), 15 deletions(-)

diff --git a/app/javascript/flavours/glitch/features/notifications_v2/components/notification_follow.tsx b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_follow.tsx
index 92d28dccbde33c..3bb37082551f45 100644
--- a/app/javascript/flavours/glitch/features/notifications_v2/components/notification_follow.tsx
+++ b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_follow.tsx
@@ -1,7 +1,11 @@
 import { FormattedMessage } from 'react-intl';
 
 import PersonAddIcon from '@/material-icons/400-24px/person_add-fill.svg?react';
+import { FollowersCounter } from 'flavours/glitch/components/counters';
+import { FollowButton } from 'flavours/glitch/components/follow_button';
+import { ShortNumber } from 'flavours/glitch/components/short_number';
 import type { NotificationGroupFollow } from 'flavours/glitch/models/notification_group';
+import { useAppSelector } from 'flavours/glitch/store';
 
 import type { LabelRenderer } from './notification_group_with_status';
 import { NotificationGroupWithStatus } from './notification_group_with_status';
@@ -14,18 +18,45 @@ const labelRenderer: LabelRenderer = (values) => (
   />
 );
 
+const FollowerCount: React.FC<{ accountId: string }> = ({ accountId }) => {
+  const account = useAppSelector((s) => s.accounts.get(accountId));
+
+  if (!account) return null;
+
+  return (
+    <ShortNumber value={account.followers_count} renderer={FollowersCounter} />
+  );
+};
+
 export const NotificationFollow: React.FC<{
   notification: NotificationGroupFollow;
   unread: boolean;
-}> = ({ notification, unread }) => (
-  <NotificationGroupWithStatus
-    type='follow'
-    icon={PersonAddIcon}
-    iconId='person-add'
-    accountIds={notification.sampleAccountIds}
-    timestamp={notification.latest_page_notification_at}
-    count={notification.notifications_count}
-    labelRenderer={labelRenderer}
-    unread={unread}
-  />
-);
+}> = ({ notification, unread }) => {
+  let actions: JSX.Element | undefined;
+  let additionalContent: JSX.Element | undefined;
+
+  if (notification.sampleAccountIds.length === 1) {
+    // only display those if the group contains 1 account, otherwise it does not makes sense
+    const account = notification.sampleAccountIds[0];
+
+    if (account) {
+      actions = <FollowButton accountId={notification.sampleAccountIds[0]} />;
+      additionalContent = <FollowerCount accountId={account} />;
+    }
+  }
+
+  return (
+    <NotificationGroupWithStatus
+      type='follow'
+      icon={PersonAddIcon}
+      iconId='person-add'
+      accountIds={notification.sampleAccountIds}
+      timestamp={notification.latest_page_notification_at}
+      count={notification.notifications_count}
+      labelRenderer={labelRenderer}
+      unread={unread}
+      actions={actions}
+      additionalContent={additionalContent}
+    />
+  );
+};
diff --git a/app/javascript/flavours/glitch/features/notifications_v2/components/notification_follow_request.tsx b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_follow_request.tsx
index eff233152d1a24..02fe1329e690e7 100644
--- a/app/javascript/flavours/glitch/features/notifications_v2/components/notification_follow_request.tsx
+++ b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_follow_request.tsx
@@ -46,7 +46,7 @@ export const NotificationFollowRequest: React.FC<{
   }, [dispatch, notification.sampleAccountIds]);
 
   const actions = (
-    <div className='notification-group__actions'>
+    <>
       <IconButton
         title={intl.formatMessage(messages.reject)}
         icon='times'
@@ -59,7 +59,7 @@ export const NotificationFollowRequest: React.FC<{
         iconComponent={CheckIcon}
         onClick={onAuthorize}
       />
-    </div>
+    </>
   );
 
   return (
diff --git a/app/javascript/flavours/glitch/features/notifications_v2/components/notification_group_with_status.tsx b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_group_with_status.tsx
index a7c1170d854d06..7dc498f24473a0 100644
--- a/app/javascript/flavours/glitch/features/notifications_v2/components/notification_group_with_status.tsx
+++ b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_group_with_status.tsx
@@ -31,6 +31,7 @@ export const NotificationGroupWithStatus: React.FC<{
   labelSeeMoreHref?: string;
   type: string;
   unread: boolean;
+  additionalContent?: JSX.Element;
 }> = ({
   icon,
   iconId,
@@ -43,6 +44,7 @@ export const NotificationGroupWithStatus: React.FC<{
   labelSeeMoreHref,
   type,
   unread,
+  additionalContent,
 }) => {
   const dispatch = useAppDispatch();
 
@@ -92,7 +94,9 @@ export const NotificationGroupWithStatus: React.FC<{
             <div className='notification-group__main__header__wrapper'>
               <AvatarGroup accountIds={accountIds} />
 
-              {actions}
+              {actions && (
+                <div className='notification-group__actions'>{actions}</div>
+              )}
             </div>
 
             <div className='notification-group__main__header__label'>
@@ -106,6 +110,12 @@ export const NotificationGroupWithStatus: React.FC<{
               <EmbeddedStatus statusId={statusId} />
             </div>
           )}
+
+          {additionalContent && (
+            <div className='notification-group__main__additional-content'>
+              {additionalContent}
+            </div>
+          )}
         </div>
       </div>
     </HotKeys>
diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index 7873d83257081f..ed5e1b319daf75 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -11043,6 +11043,13 @@ noscript {
     gap: 8px;
     flex: 1 1 auto;
     overflow: hidden;
+    container-type: inline-size;
+
+    @container (width < 350px) {
+      &__header time {
+        display: none;
+      }
+    }
 
     &__header {
       display: flex;
@@ -11082,6 +11089,11 @@ noscript {
       border-radius: 8px;
       padding: 8px;
     }
+
+    &__additional-content {
+      color: $darker-text-color;
+      margin-top: -8px; // to offset the parent's `gap` property
+    }
   }
 
   &__avatar-group {

From 1c0c393a19debb017060dba3049ee12e0408325a Mon Sep 17 00:00:00 2001
From: Jeremy Kescher <jeremy@kescher.at>
Date: Sun, 18 Aug 2024 18:10:19 +0200
Subject: [PATCH 1869/2191] Bump Catstodon revision to 1.0.10

---
 CHANGELOG.md            | 4 ++++
 lib/mastodon/version.rb | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a9973052c74225..46652abf1b1852 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@ All changes to Catstodon that aren't Mastodon or glitch-soc Mastodon changes wil
 
 All release dates, as well as most other dates, are intended to be read as "within the day, in UTC time."
 
+## [4.3.0-alpha.5+glitch+cat+1.0.10] - 2024-08-16
+
+- Upstream changes. See [CHANGELOG_glitch.md](CHANGELOG_glitch.md), version 4.2.11.
+
 ## [4.3.0-alpha.5+glitch+cat+1.0.9] - 2024-08-16
 
 - Upstream changes
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index 39488fddd2d76f..fd9a64a62a1bd8 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -25,7 +25,7 @@ def prerelease
     end
 
     def catstodon_revision
-      '1.0.9'
+      '1.0.10'
     end
 
     def build_metadata

From d6404714b60b646dfc94dff107fe6a264f232040 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 19 Aug 2024 10:10:13 +0200
Subject: [PATCH 1870/2191] Update eslint (non-major) (#31490)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 126 +++++++++++++++++++++++++++---------------------------
 1 file changed, 63 insertions(+), 63 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 2de7428b663065..7e393e8ad122af 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2199,14 +2199,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@es-joy/jsdoccomment@npm:~0.46.0":
-  version: 0.46.0
-  resolution: "@es-joy/jsdoccomment@npm:0.46.0"
+"@es-joy/jsdoccomment@npm:~0.48.0":
+  version: 0.48.0
+  resolution: "@es-joy/jsdoccomment@npm:0.48.0"
   dependencies:
     comment-parser: "npm:1.4.1"
     esquery: "npm:^1.6.0"
-    jsdoc-type-pratt-parser: "npm:~4.0.0"
-  checksum: 10c0/a7a67936ebf6d9aaf74af018c3ac744769af3552b05ad9b88fca96b2ffdca16e724b0ff497f53634ec4cca81e98d8c471b6b6bde0fa5b725af4222ad9a0707f0
+    jsdoc-type-pratt-parser: "npm:~4.1.0"
+  checksum: 10c0/8d87c7c0426fade009c30ab429d4ede53fd253d40b55079c02bdacdaa4c0fe904aaea5e3084cd98052f2bed6b3030c381d84f4a3251b343a71fee6f681a08bee
   languageName: node
   linkType: hard
 
@@ -4168,14 +4168,14 @@ __metadata:
   linkType: hard
 
 "@typescript-eslint/eslint-plugin@npm:^7.0.0":
-  version: 7.17.0
-  resolution: "@typescript-eslint/eslint-plugin@npm:7.17.0"
+  version: 7.18.0
+  resolution: "@typescript-eslint/eslint-plugin@npm:7.18.0"
   dependencies:
     "@eslint-community/regexpp": "npm:^4.10.0"
-    "@typescript-eslint/scope-manager": "npm:7.17.0"
-    "@typescript-eslint/type-utils": "npm:7.17.0"
-    "@typescript-eslint/utils": "npm:7.17.0"
-    "@typescript-eslint/visitor-keys": "npm:7.17.0"
+    "@typescript-eslint/scope-manager": "npm:7.18.0"
+    "@typescript-eslint/type-utils": "npm:7.18.0"
+    "@typescript-eslint/utils": "npm:7.18.0"
+    "@typescript-eslint/visitor-keys": "npm:7.18.0"
     graphemer: "npm:^1.4.0"
     ignore: "npm:^5.3.1"
     natural-compare: "npm:^1.4.0"
@@ -4186,25 +4186,25 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 10c0/654d589531ae45b8ca8f3969e785926b2544100a985968d86c828e2a1ff50331250e19c8b4af83a4ba17847a0047479662eb317e4ad94f6279cac03acd5cda5a
+  checksum: 10c0/2b37948fa1b0dab77138909dabef242a4d49ab93e4019d4ef930626f0a7d96b03e696cd027fa0087881c20e73be7be77c942606b4a76fa599e6b37f6985304c3
   languageName: node
   linkType: hard
 
 "@typescript-eslint/parser@npm:^7.0.0":
-  version: 7.17.0
-  resolution: "@typescript-eslint/parser@npm:7.17.0"
+  version: 7.18.0
+  resolution: "@typescript-eslint/parser@npm:7.18.0"
   dependencies:
-    "@typescript-eslint/scope-manager": "npm:7.17.0"
-    "@typescript-eslint/types": "npm:7.17.0"
-    "@typescript-eslint/typescript-estree": "npm:7.17.0"
-    "@typescript-eslint/visitor-keys": "npm:7.17.0"
+    "@typescript-eslint/scope-manager": "npm:7.18.0"
+    "@typescript-eslint/types": "npm:7.18.0"
+    "@typescript-eslint/typescript-estree": "npm:7.18.0"
+    "@typescript-eslint/visitor-keys": "npm:7.18.0"
     debug: "npm:^4.3.4"
   peerDependencies:
     eslint: ^8.56.0
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 10c0/0cf6922412517b4c005609b035119ddd2798e1b6e74e1bccd487aa53119d27067cfd89311f00b8e96b2b044a0fb7373418a16552be86079879158b260c397418
+  checksum: 10c0/370e73fca4278091bc1b657f85e7d74cd52b24257ea20c927a8e17546107ce04fbf313fec99aed0cc2a145ddbae1d3b12e9cc2c1320117636dc1281bcfd08059
   languageName: node
   linkType: hard
 
@@ -4218,22 +4218,22 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/scope-manager@npm:7.17.0":
-  version: 7.17.0
-  resolution: "@typescript-eslint/scope-manager@npm:7.17.0"
+"@typescript-eslint/scope-manager@npm:7.18.0":
+  version: 7.18.0
+  resolution: "@typescript-eslint/scope-manager@npm:7.18.0"
   dependencies:
-    "@typescript-eslint/types": "npm:7.17.0"
-    "@typescript-eslint/visitor-keys": "npm:7.17.0"
-  checksum: 10c0/e1a693e19dc855fe6d04b46c6c205019bfc937eda5f8b255393f8267ebddd282165568336e37b04aab544b155a807784b9c4a92129dfc7c1eef5a9e9fe052685
+    "@typescript-eslint/types": "npm:7.18.0"
+    "@typescript-eslint/visitor-keys": "npm:7.18.0"
+  checksum: 10c0/038cd58c2271de146b3a594afe2c99290034033326d57ff1f902976022c8b0138ffd3cb893ae439ae41003b5e4bcc00cabf6b244ce40e8668f9412cc96d97b8e
   languageName: node
   linkType: hard
 
-"@typescript-eslint/type-utils@npm:7.17.0":
-  version: 7.17.0
-  resolution: "@typescript-eslint/type-utils@npm:7.17.0"
+"@typescript-eslint/type-utils@npm:7.18.0":
+  version: 7.18.0
+  resolution: "@typescript-eslint/type-utils@npm:7.18.0"
   dependencies:
-    "@typescript-eslint/typescript-estree": "npm:7.17.0"
-    "@typescript-eslint/utils": "npm:7.17.0"
+    "@typescript-eslint/typescript-estree": "npm:7.18.0"
+    "@typescript-eslint/utils": "npm:7.18.0"
     debug: "npm:^4.3.4"
     ts-api-utils: "npm:^1.3.0"
   peerDependencies:
@@ -4241,7 +4241,7 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 10c0/b415cf37c0922cded78735c5049cb5a5b0065e1c0ce4a81ca2a26422763ccacca8945efa45480f40530f2ec414a14d35a88a6798258aa889f7a9cf4ca4a240cd
+  checksum: 10c0/ad92a38007be620f3f7036f10e234abdc2fdc518787b5a7227e55fd12896dacf56e8b34578723fbf9bea8128df2510ba8eb6739439a3879eda9519476d5783fd
   languageName: node
   linkType: hard
 
@@ -4252,10 +4252,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/types@npm:7.17.0":
-  version: 7.17.0
-  resolution: "@typescript-eslint/types@npm:7.17.0"
-  checksum: 10c0/8f734294d432b37c534f17eb2befdfe43b76874d09118d6adf7e308e5a586e9e11b7021abe4f6692a6e6226de58a15b3cfe1300939556ce1c908d9af627b7400
+"@typescript-eslint/types@npm:7.18.0":
+  version: 7.18.0
+  resolution: "@typescript-eslint/types@npm:7.18.0"
+  checksum: 10c0/eb7371ac55ca77db8e59ba0310b41a74523f17e06f485a0ef819491bc3dd8909bb930120ff7d30aaf54e888167e0005aa1337011f3663dc90fb19203ce478054
   languageName: node
   linkType: hard
 
@@ -4278,12 +4278,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/typescript-estree@npm:7.17.0":
-  version: 7.17.0
-  resolution: "@typescript-eslint/typescript-estree@npm:7.17.0"
+"@typescript-eslint/typescript-estree@npm:7.18.0":
+  version: 7.18.0
+  resolution: "@typescript-eslint/typescript-estree@npm:7.18.0"
   dependencies:
-    "@typescript-eslint/types": "npm:7.17.0"
-    "@typescript-eslint/visitor-keys": "npm:7.17.0"
+    "@typescript-eslint/types": "npm:7.18.0"
+    "@typescript-eslint/visitor-keys": "npm:7.18.0"
     debug: "npm:^4.3.4"
     globby: "npm:^11.1.0"
     is-glob: "npm:^4.0.3"
@@ -4293,21 +4293,21 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 10c0/10967823ce00c9f8cd4a8b56bed3524c098e38cc0e27aaa49ffd8fad4e671c00226bf0330ba858948750b88dc55527ebeb62c74be8a30bac18a106d6c033ab59
+  checksum: 10c0/0c7f109a2e460ec8a1524339479cf78ff17814d23c83aa5112c77fb345e87b3642616291908dcddea1e671da63686403dfb712e4a4435104f92abdfddf9aba81
   languageName: node
   linkType: hard
 
-"@typescript-eslint/utils@npm:7.17.0":
-  version: 7.17.0
-  resolution: "@typescript-eslint/utils@npm:7.17.0"
+"@typescript-eslint/utils@npm:7.18.0":
+  version: 7.18.0
+  resolution: "@typescript-eslint/utils@npm:7.18.0"
   dependencies:
     "@eslint-community/eslint-utils": "npm:^4.4.0"
-    "@typescript-eslint/scope-manager": "npm:7.17.0"
-    "@typescript-eslint/types": "npm:7.17.0"
-    "@typescript-eslint/typescript-estree": "npm:7.17.0"
+    "@typescript-eslint/scope-manager": "npm:7.18.0"
+    "@typescript-eslint/types": "npm:7.18.0"
+    "@typescript-eslint/typescript-estree": "npm:7.18.0"
   peerDependencies:
     eslint: ^8.56.0
-  checksum: 10c0/1f3e22820b3ab3e47809c45e576614ad4a965f5c8634856eca5c70981386b9351a77fb172ba32345e7c5667479cf9526c673699dd38dccd0616ad6db21704e72
+  checksum: 10c0/a25a6d50eb45c514469a01ff01f215115a4725fb18401055a847ddf20d1b681409c4027f349033a95c4ff7138d28c3b0a70253dfe8262eb732df4b87c547bd1e
   languageName: node
   linkType: hard
 
@@ -4338,13 +4338,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/visitor-keys@npm:7.17.0":
-  version: 7.17.0
-  resolution: "@typescript-eslint/visitor-keys@npm:7.17.0"
+"@typescript-eslint/visitor-keys@npm:7.18.0":
+  version: 7.18.0
+  resolution: "@typescript-eslint/visitor-keys@npm:7.18.0"
   dependencies:
-    "@typescript-eslint/types": "npm:7.17.0"
+    "@typescript-eslint/types": "npm:7.18.0"
     eslint-visitor-keys: "npm:^3.4.3"
-  checksum: 10c0/fa6b339d51fc3710288bb2ffaa46d639551d77965cc42c36f96c4f43aed663ff12972e8a28652a280f6ce20b7a92dc2aea14b2b4049012799be2fc2d3cbb2c60
+  checksum: 10c0/538b645f8ff1d9debf264865c69a317074eaff0255e63d7407046176b0f6a6beba34a6c51d511f12444bae12a98c69891eb6f403c9f54c6c2e2849d1c1cb73c0
   languageName: node
   linkType: hard
 
@@ -6973,7 +6973,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"debug@npm:4, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.4, debug@npm:^4.3.5, debug@npm:^4.3.6, debug@npm:~4.3.6":
+"debug@npm:4, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.4, debug@npm:^4.3.6, debug@npm:~4.3.6":
   version: 4.3.6
   resolution: "debug@npm:4.3.6"
   dependencies:
@@ -7969,13 +7969,13 @@ __metadata:
   linkType: hard
 
 "eslint-plugin-jsdoc@npm:^50.0.0":
-  version: 50.0.0
-  resolution: "eslint-plugin-jsdoc@npm:50.0.0"
+  version: 50.2.2
+  resolution: "eslint-plugin-jsdoc@npm:50.2.2"
   dependencies:
-    "@es-joy/jsdoccomment": "npm:~0.46.0"
+    "@es-joy/jsdoccomment": "npm:~0.48.0"
     are-docs-informative: "npm:^0.0.2"
     comment-parser: "npm:1.4.1"
-    debug: "npm:^4.3.5"
+    debug: "npm:^4.3.6"
     escape-string-regexp: "npm:^4.0.0"
     espree: "npm:^10.1.0"
     esquery: "npm:^1.6.0"
@@ -7985,7 +7985,7 @@ __metadata:
     synckit: "npm:^0.9.1"
   peerDependencies:
     eslint: ^7.0.0 || ^8.0.0 || ^9.0.0
-  checksum: 10c0/1d476eabdf604f4a07ef9a22fb7b13ba898d0aed81b2c428d4b6aea766b908ebdc7e6e82a16bac3f83e1013c6edba6d9a15a4015cab9a94c584ebccbd7255b70
+  checksum: 10c0/f41d30246f6a4b6acb55e8cd75cf4fc256315e141ab25f7740fa6fa58cdd24e08cb672b4a350da93aeb126d210bd25981310a50f97cfb108f6a7ce8668b6b90a
   languageName: node
   linkType: hard
 
@@ -11088,10 +11088,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jsdoc-type-pratt-parser@npm:~4.0.0":
-  version: 4.0.0
-  resolution: "jsdoc-type-pratt-parser@npm:4.0.0"
-  checksum: 10c0/b23ef7bbbe2f56d72630d1c5a233dc9fecaff399063d373c57bef136908c1b05e723dac107177303c03ccf8d75aa51507510b282aa567600477479c5ea0c36d1
+"jsdoc-type-pratt-parser@npm:~4.1.0":
+  version: 4.1.0
+  resolution: "jsdoc-type-pratt-parser@npm:4.1.0"
+  checksum: 10c0/7700372d2e733a32f7ea0a1df9cec6752321a5345c11a91b2ab478a031a426e934f16d5c1f15c8566c7b2c10af9f27892a29c2c789039f595470e929a4aa60ea
   languageName: node
   linkType: hard
 

From d57ee3141353720aa530892f2d7b724295941774 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 19 Aug 2024 10:10:15 +0200
Subject: [PATCH 1871/2191] Update devDependencies (non-major) (#31489)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 89 +++++++++++++++++--------------------------------------
 1 file changed, 27 insertions(+), 62 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 7e393e8ad122af..a9d57c16ad26ef 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1609,15 +1609,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/css-parser-algorithms@npm:^2.7.1":
-  version: 2.7.1
-  resolution: "@csstools/css-parser-algorithms@npm:2.7.1"
-  peerDependencies:
-    "@csstools/css-tokenizer": ^2.4.1
-  checksum: 10c0/7d29bef6f5790ddb67d922ad232253bf910e4fa5293f5e4a5ed8b920ae9bd4e8171942df7d8943af23b42fd4e9fb460181394d20c97da9562e6ce98a875e8c47
-  languageName: node
-  linkType: hard
-
 "@csstools/css-parser-algorithms@npm:^3.0.0":
   version: 3.0.0
   resolution: "@csstools/css-parser-algorithms@npm:3.0.0"
@@ -1627,13 +1618,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/css-tokenizer@npm:^2.4.1":
-  version: 2.4.1
-  resolution: "@csstools/css-tokenizer@npm:2.4.1"
-  checksum: 10c0/fe71cee85ec7372da07083d088b6a704f43e5d3d2d8071c4b8a86fae60408b559a218a43f8625bf2f0be5c7f90c8f3ad20a1aae1921119a1c02b51c310cc2b6b
-  languageName: node
-  linkType: hard
-
 "@csstools/css-tokenizer@npm:^3.0.0":
   version: 3.0.0
   resolution: "@csstools/css-tokenizer@npm:3.0.0"
@@ -1641,16 +1625,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/media-query-list-parser@npm:^2.1.13":
-  version: 2.1.13
-  resolution: "@csstools/media-query-list-parser@npm:2.1.13"
-  peerDependencies:
-    "@csstools/css-parser-algorithms": ^2.7.1
-    "@csstools/css-tokenizer": ^2.4.1
-  checksum: 10c0/8bf72342c15581b8f658633436d83c26a214056f6b960ff121b940271f4b1b5b07e9cc3990a73e684fb72319592f0c392408b4f0e08bbe242b2065aa456e2733
-  languageName: node
-  linkType: hard
-
 "@csstools/media-query-list-parser@npm:^3.0.0":
   version: 3.0.0
   resolution: "@csstools/media-query-list-parser@npm:3.0.0"
@@ -2041,15 +2015,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/selector-specificity@npm:^3.1.1":
-  version: 3.1.1
-  resolution: "@csstools/selector-specificity@npm:3.1.1"
-  peerDependencies:
-    postcss-selector-parser: ^6.0.13
-  checksum: 10c0/1d4a3f8015904d6aeb3203afe0e1f6db09b191d9c1557520e3e960c9204ad852df9db4cbde848643f78a26f6ea09101b4e528dbb9193052db28258dbcc8a6e1d
-  languageName: node
-  linkType: hard
-
 "@csstools/selector-specificity@npm:^4.0.0":
   version: 4.0.0
   resolution: "@csstools/selector-specificity@npm:4.0.0"
@@ -9639,10 +9604,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ignore@npm:^5.2.0, ignore@npm:^5.3.1":
-  version: 5.3.1
-  resolution: "ignore@npm:5.3.1"
-  checksum: 10c0/703f7f45ffb2a27fb2c5a8db0c32e7dee66b33a225d28e8db4e1be6474795f606686a6e3bcc50e1aa12f2042db4c9d4a7d60af3250511de74620fbed052ea4cd
+"ignore@npm:^5.2.0, ignore@npm:^5.3.1, ignore@npm:^5.3.2":
+  version: 5.3.2
+  resolution: "ignore@npm:5.3.2"
+  checksum: 10c0/f9f652c957983634ded1e7f02da3b559a0d4cc210fca3792cb67f1b153623c9c42efdc1c4121af171e295444459fc4a9201101fb041b1104a3c000bccb188337
   languageName: node
   linkType: hard
 
@@ -11409,8 +11374,8 @@ __metadata:
   linkType: hard
 
 "lint-staged@npm:^15.0.0":
-  version: 15.2.8
-  resolution: "lint-staged@npm:15.2.8"
+  version: 15.2.9
+  resolution: "lint-staged@npm:15.2.9"
   dependencies:
     chalk: "npm:~5.3.0"
     commander: "npm:~12.1.0"
@@ -11424,7 +11389,7 @@ __metadata:
     yaml: "npm:~2.5.0"
   bin:
     lint-staged: bin/lint-staged.js
-  checksum: 10c0/7d43f11f493d27951c746b4c077fed16ba954c0517cf2fd999034e9e7bf86fde506a797b23531a56a1fde4c24846e0f6583ce6db3bdfd42e92335b1aab367737
+  checksum: 10c0/820c622378b62b826974af17f1747e2a4b0556e4fb99d101af89ad298d392ff079f580fdc576f16a27e975d726b95d73495fd524139402ff654c4649ef2f1a6a
   languageName: node
   linkType: hard
 
@@ -14013,10 +13978,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-resolve-nested-selector@npm:^0.1.1, postcss-resolve-nested-selector@npm:^0.1.4":
-  version: 0.1.4
-  resolution: "postcss-resolve-nested-selector@npm:0.1.4"
-  checksum: 10c0/c265c35ddd474968bc4efbe4027e33f28910ef3931ffae9c448878d7c02735aeeea6d33aa6f89902e4c111e6fe87f2cc2aa72dcb3ac242d58809f1f932baa2b6
+"postcss-resolve-nested-selector@npm:^0.1.1, postcss-resolve-nested-selector@npm:^0.1.6":
+  version: 0.1.6
+  resolution: "postcss-resolve-nested-selector@npm:0.1.6"
+  checksum: 10c0/84213a2bccce481b1569c595a3c547b25c6ef1cca839fbd6c82c12ab407559966e968613c7454b573aa54f38cfd7e900c1fd603f0efc9f51939ab9f93f115455
   languageName: node
   linkType: hard
 
@@ -14049,13 +14014,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-selector-parser@npm:^6.0.13, postcss-selector-parser@npm:^6.0.2, postcss-selector-parser@npm:^6.0.4, postcss-selector-parser@npm:^6.1.0, postcss-selector-parser@npm:^6.1.1":
-  version: 6.1.1
-  resolution: "postcss-selector-parser@npm:6.1.1"
+"postcss-selector-parser@npm:^6.0.13, postcss-selector-parser@npm:^6.0.2, postcss-selector-parser@npm:^6.0.4, postcss-selector-parser@npm:^6.1.0, postcss-selector-parser@npm:^6.1.1, postcss-selector-parser@npm:^6.1.2":
+  version: 6.1.2
+  resolution: "postcss-selector-parser@npm:6.1.2"
   dependencies:
     cssesc: "npm:^3.0.0"
     util-deprecate: "npm:^1.0.2"
-  checksum: 10c0/5608765e033fee35d448e1f607ffbaa750eb86901824a8bc4a911ea8bc137cb82f29239330787427c5d3695afd90d8721e190f211dbbf733e25033d8b3100763
+  checksum: 10c0/523196a6bd8cf660bdf537ad95abd79e546d54180f9afb165a4ab3e651ac705d0f8b8ce6b3164fb9e3279ce482c5f751a69eb2d3a1e8eb0fd5e82294fb3ef13e
   languageName: node
   linkType: hard
 
@@ -14089,7 +14054,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss@npm:^8.2.15, postcss@npm:^8.4.24, postcss@npm:^8.4.40":
+"postcss@npm:^8.2.15, postcss@npm:^8.4.24, postcss@npm:^8.4.41":
   version: 8.4.41
   resolution: "postcss@npm:8.4.41"
   dependencies:
@@ -16696,13 +16661,13 @@ __metadata:
   linkType: hard
 
 "stylelint@npm:^16.0.2":
-  version: 16.8.1
-  resolution: "stylelint@npm:16.8.1"
+  version: 16.8.2
+  resolution: "stylelint@npm:16.8.2"
   dependencies:
-    "@csstools/css-parser-algorithms": "npm:^2.7.1"
-    "@csstools/css-tokenizer": "npm:^2.4.1"
-    "@csstools/media-query-list-parser": "npm:^2.1.13"
-    "@csstools/selector-specificity": "npm:^3.1.1"
+    "@csstools/css-parser-algorithms": "npm:^3.0.0"
+    "@csstools/css-tokenizer": "npm:^3.0.0"
+    "@csstools/media-query-list-parser": "npm:^3.0.0"
+    "@csstools/selector-specificity": "npm:^4.0.0"
     "@dual-bundle/import-meta-resolve": "npm:^4.1.0"
     balanced-match: "npm:^2.0.0"
     colord: "npm:^2.9.3"
@@ -16717,7 +16682,7 @@ __metadata:
     globby: "npm:^11.1.0"
     globjoin: "npm:^0.1.4"
     html-tags: "npm:^3.3.1"
-    ignore: "npm:^5.3.1"
+    ignore: "npm:^5.3.2"
     imurmurhash: "npm:^0.1.4"
     is-plain-object: "npm:^5.0.0"
     known-css-properties: "npm:^0.34.0"
@@ -16726,10 +16691,10 @@ __metadata:
     micromatch: "npm:^4.0.7"
     normalize-path: "npm:^3.0.0"
     picocolors: "npm:^1.0.1"
-    postcss: "npm:^8.4.40"
-    postcss-resolve-nested-selector: "npm:^0.1.4"
+    postcss: "npm:^8.4.41"
+    postcss-resolve-nested-selector: "npm:^0.1.6"
     postcss-safe-parser: "npm:^7.0.0"
-    postcss-selector-parser: "npm:^6.1.1"
+    postcss-selector-parser: "npm:^6.1.2"
     postcss-value-parser: "npm:^4.2.0"
     resolve-from: "npm:^5.0.0"
     string-width: "npm:^4.2.3"
@@ -16740,7 +16705,7 @@ __metadata:
     write-file-atomic: "npm:^5.0.1"
   bin:
     stylelint: bin/stylelint.mjs
-  checksum: 10c0/7bc6b0193f83420b2170026078b427d7fb22a07d3345fc99a16241625a572f2fc3e1fa1999e54c01cc2b15bd59d135715c2b140b089c17aa7f4e377ded1fc1b5
+  checksum: 10c0/898cde9b5d981f249133df709458eebf2af0a525e72410ddfafd76a7308f7da493578b6a909c593cc70061556b9eda1fed4f477385ee615435f0996d9e18d8df
   languageName: node
   linkType: hard
 

From 9cda8c0197799cd6980457bbdfa4f18db783fd42 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 19 Aug 2024 08:12:01 +0000
Subject: [PATCH 1872/2191] Update dependency use-debounce to v10.0.3 (#31468)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index a9d57c16ad26ef..fcbb1a160f3c80 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -17577,11 +17577,11 @@ __metadata:
   linkType: hard
 
 "use-debounce@npm:^10.0.0":
-  version: 10.0.2
-  resolution: "use-debounce@npm:10.0.2"
+  version: 10.0.3
+  resolution: "use-debounce@npm:10.0.3"
   peerDependencies:
-    react: ">=16.8.0"
-  checksum: 10c0/2d992108557a0ad3e59bc35028c0dbc6ad12088a08d992fd52aad3881dd24663606fe71f7fd925327fb98599c6252bfa4c143649351d48e6243d7a3332594fd6
+    react: "*"
+  checksum: 10c0/351b62c565d6dce5a21ecc21fe3e1f8db74f70c81c8f7d9dbdfc2da1cb82d883578589f6146e684d91dac534bc3c8b145ab1a36fbf4d44cbb4113827508b39aa
   languageName: node
   linkType: hard
 

From c4e0a7dcede811f7be8165938fcf104031b059de Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 19 Aug 2024 10:29:48 +0200
Subject: [PATCH 1873/2191] New Crowdin Translations (automated) (#31463)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/ar.json | 38 ++++++++++----
 app/javascript/mastodon/locales/ca.json | 12 +++++
 app/javascript/mastodon/locales/eo.json | 10 ++++
 app/javascript/mastodon/locales/gd.json | 41 +++++++++++++++
 app/javascript/mastodon/locales/ig.json | 10 ++++
 app/javascript/mastodon/locales/ko.json | 43 ++++++++++++---
 app/javascript/mastodon/locales/sk.json |  1 +
 app/javascript/mastodon/locales/sl.json | 18 +++++++
 app/javascript/mastodon/locales/th.json |  7 ++-
 app/javascript/mastodon/locales/uk.json | 37 ++++++++++---
 config/locales/ar.yml                   | 20 +++++--
 config/locales/ca.yml                   | 10 ++++
 config/locales/doorkeeper.ar.yml        |  2 +-
 config/locales/doorkeeper.sr-Latn.yml   |  1 +
 config/locales/doorkeeper.sr.yml        |  1 +
 config/locales/gd.yml                   | 68 ++++++++++++++++++++++++
 config/locales/ko.yml                   | 17 ++++++
 config/locales/lt.yml                   |  3 +-
 config/locales/simple_form.ar.yml       |  3 +-
 config/locales/simple_form.sr-Latn.yml  |  1 +
 config/locales/simple_form.sr.yml       |  1 +
 config/locales/simple_form.uk.yml       |  1 +
 config/locales/sl.yml                   | 70 +++++++++++++++++++++++++
 config/locales/sq.yml                   | 11 ++++
 config/locales/sr-Latn.yml              |  2 +-
 config/locales/sr.yml                   | 32 ++++++++++-
 config/locales/th.yml                   | 34 ++++++++++++
 config/locales/uk.yml                   | 46 ++++++++++++++++
 28 files changed, 509 insertions(+), 31 deletions(-)

diff --git a/app/javascript/mastodon/locales/ar.json b/app/javascript/mastodon/locales/ar.json
index 48448196be845a..02692743970290 100644
--- a/app/javascript/mastodon/locales/ar.json
+++ b/app/javascript/mastodon/locales/ar.json
@@ -32,7 +32,7 @@
   "account.featured_tags.last_status_never": "لا توجد رسائل",
   "account.featured_tags.title": "وسوم {name} المميَّزة",
   "account.follow": "متابعة",
-  "account.follow_back": "تابعهم بالمثل",
+  "account.follow_back": "تابعه بالمثل",
   "account.followers": "مُتابِعون",
   "account.followers.empty": "لا أحدَ يُتابع هذا المُستخدم إلى حد الآن.",
   "account.followers_counter": "{count, plural, zero {}one {{counter} متابع} two {{counter} متابعين} few {{counter} متابعين} many {{counter} متابعين} other {{counter} متابعين}}",
@@ -169,12 +169,15 @@
   "confirmations.block.confirm": "حظر",
   "confirmations.delete.confirm": "حذف",
   "confirmations.delete.message": "هل أنتَ مُتأكدٌ أنك تُريدُ حَذفَ هذا المنشور؟",
+  "confirmations.delete.title": "أتريد حذف المنشور؟",
   "confirmations.delete_list.confirm": "حذف",
   "confirmations.delete_list.message": "هل أنتَ مُتأكدٌ أنكَ تُريدُ حَذفَ هذِهِ القائمة بشكلٍ دائم؟",
+  "confirmations.delete_list.title": "أتريد حذف القائمة؟",
   "confirmations.discard_edit_media.confirm": "تجاهل",
   "confirmations.discard_edit_media.message": "لديك تغييرات غير محفوظة لوصف الوسائط أو معاينتها، أتريد تجاهلها على أي حال؟",
   "confirmations.edit.confirm": "تعديل",
   "confirmations.edit.message": "التعديل في الحين سوف يُعيد كتابة الرسالة التي أنت بصدد تحريرها. متأكد من أنك تريد المواصلة؟",
+  "confirmations.edit.title": "هل تريد استبدال المنشور؟",
   "confirmations.logout.confirm": "خروج",
   "confirmations.logout.message": "متأكد من أنك تريد الخروج؟",
   "confirmations.logout.title": "أتريد المغادرة؟",
@@ -184,8 +187,10 @@
   "confirmations.redraft.title": "أتريد حذف وإعادة صياغة المنشور؟",
   "confirmations.reply.confirm": "رد",
   "confirmations.reply.message": "الرد في الحين سوف يُعيد كتابة الرسالة التي أنت بصدد كتابتها. متأكد من أنك تريد المواصلة؟",
+  "confirmations.reply.title": "هل تريد استبدال المنشور؟",
   "confirmations.unfollow.confirm": "إلغاء المتابعة",
   "confirmations.unfollow.message": "متأكد من أنك تريد إلغاء متابعة {name} ؟",
+  "confirmations.unfollow.title": "إلغاء متابعة المستخدم؟",
   "conversation.delete": "احذف المحادثة",
   "conversation.mark_as_read": "اعتبرها كمقروءة",
   "conversation.open": "اعرض المحادثة",
@@ -221,8 +226,8 @@
   "domain_pill.their_username": "مُعرّفُهم الفريد على الخادم. من الممكن العثور على مستخدمين بنفس اسم المستخدم على خوادم مختلفة.",
   "domain_pill.username": "اسم المستخدم",
   "domain_pill.whats_in_a_handle": "ما المقصود بالمُعرِّف؟",
-  "domain_pill.who_they_are": "بما أن المعالجات تقول من هو الشخص ومكان وجوده، يمكنك التفاعل مع الناس عبر الشبكة الاجتماعية لـ <button>ActivityPub-Power منصات</button>.",
-  "domain_pill.who_you_are": "لأن معالجتك تقول من أنت ومكان وجودك، يمكن الناس التفاعل معك عبر الشبكة الاجتماعية لـ <button>ActivityPub-Power منصات</button>.",
+  "domain_pill.who_they_are": "بما أن المعرفات تقول من هو الشخص ومكان وجوده، يمكنك التفاعل مع الناس عبر الويب الاجتماعي لل <button>منصات التي تعمل ب ActivityPub</button>.",
+  "domain_pill.who_you_are": "بما أن معرفك يقول من أنت ومكان وجوده، يمكن للناس التفاعل معك عبر الويب الاجتماعي لل <button>منصات التي تعمل ب ActivityPub</button>.",
   "domain_pill.your_handle": "عنوانك الكامل:",
   "domain_pill.your_server": "منزلك الرقمي، حيث تعيش جميع مشاركاتك. لا تحب هذا؟ إنقل الخوادم في أي وقت واخضر متابعينك أيضًا.",
   "domain_pill.your_username": "معرفك الفريد على هذا الخادم. من الممكن العثور على مستخدمين بنفس إسم المستخدم على خوادم مختلفة.",
@@ -348,6 +353,9 @@
   "home.pending_critical_update.link": "اطّلع على التحديثات",
   "home.pending_critical_update.title": "تحديث أمان حرج متوفر!",
   "home.show_announcements": "إظهار الإعلانات",
+  "ignore_notifications_modal.disclaimer": "لا يمكن لـ Mastodon إبلاغ المستخدمين بأنك قد تجاهلت إشعاراتهم. تجاهل الإشعارات لن يمنع إرسال الرسائل نفسها.",
+  "ignore_notifications_modal.ignore": "تجاهل الإشعارات",
+  "ignore_notifications_modal.limited_accounts_title": "تجاهل الإشعارات من الحسابات التي هي تحت الإشراف؟",
   "interaction_modal.description.favourite": "بفضل حساب على ماستدون، يمكنك إضافة هذا المنشور إلى مفضلتك لإبلاغ الناشر عن تقديرك وكذا للاحتفاظ بالمنشور إلى وقت لاحق.",
   "interaction_modal.description.follow": "بفضل حساب في ماستدون، يمكنك متابعة {name} وتلقي منشوراته في موجزات خيطك الرئيس.",
   "interaction_modal.description.reblog": "مع حساب في ماستدون، يمكنك تعزيز هذا المنشور ومشاركته مع مُتابِعيك.",
@@ -434,7 +442,7 @@
   "mute_modal.they_can_mention_and_follow": "سيكون بإمكانه الإشارة إليك ومتابعتك، لكنك لن تره.",
   "mute_modal.they_wont_know": "لن يَعرف أنه قد تم كتمه.",
   "mute_modal.title": "أتريد كتم المُستخدم؟",
-  "mute_modal.you_wont_see_mentions": "سوف لن تر المنشورات التي يُشار إليه.",
+  "mute_modal.you_wont_see_mentions": "لن تر المنشورات التي يُشار فيها إليه.",
   "mute_modal.you_wont_see_posts": "سيكون بإمكانه رؤية منشوراتك، لكنك لن ترى منشوراته.",
   "navigation_bar.about": "عن",
   "navigation_bar.advanced_interface": "افتحه في واجهة الويب المتقدمة",
@@ -494,11 +502,13 @@
   "notification_requests.accept": "موافقة",
   "notification_requests.accept_all": "قبول الكل",
   "notification_requests.confirm_accept_all.button": "قبول الكل",
+  "notification_requests.confirm_accept_all.title": "أتريد قبول طلبات الإشعار؟",
   "notification_requests.confirm_dismiss_all.button": "تجاهل الكل",
   "notification_requests.dismiss": "تخطي",
   "notification_requests.dismiss_all": "تجاهل الكل",
   "notification_requests.enter_selection_mode": "اختر",
   "notification_requests.exit_selection_mode": "إلغاء",
+  "notification_requests.explainer_for_limited_account": "تم تصفية الإشعارات من هذا الحساب لأن الحساب تم تقييده من قبل مشرف.",
   "notification_requests.notifications_from": "إشعارات من {name}",
   "notification_requests.title": "الإشعارات المصفاة",
   "notifications.clear": "مسح الإشعارات",
@@ -506,6 +516,8 @@
   "notifications.column_settings.admin.report": "التبليغات الجديدة:",
   "notifications.column_settings.admin.sign_up": "التسجيلات الجديدة:",
   "notifications.column_settings.alert": "إشعارات سطح المكتب",
+  "notifications.column_settings.beta.category": "ميزات تجريبية",
+  "notifications.column_settings.beta.grouping": "جمّع الإشعارات",
   "notifications.column_settings.favourite": "المفضلة:",
   "notifications.column_settings.filter_bar.advanced": "عرض جميع الفئات",
   "notifications.column_settings.filter_bar.category": "شريط التصفية السريعة",
@@ -534,14 +546,21 @@
   "notifications.permission_denied": "تنبيهات سطح المكتب غير متوفرة بسبب رفض أذونات المتصفح مسبقاً",
   "notifications.permission_denied_alert": "لا يمكن تفعيل إشعارات سطح المكتب، لأن إذن المتصفح قد تم رفضه سابقاً",
   "notifications.permission_required": "إشعارات سطح المكتب غير متوفرة لأنه لم يتم منح الإذن المطلوب.",
+  "notifications.policy.accept": "قبول",
+  "notifications.policy.accept_hint": "إظهار في الإشعارات",
+  "notifications.policy.drop": "تجاهل",
+  "notifications.policy.filter": "تصفية",
+  "notifications.policy.filter_limited_accounts_hint": "المحدودة من قبل مشرفي الخادم",
+  "notifications.policy.filter_limited_accounts_title": "حسابات تحت الإشراف",
   "notifications.policy.filter_new_accounts.hint": "تم إنشاؤها منذ {days, plural, zero {}one {يوم واحد} two {يومان} few {# أيام} many {# أيام} other {# أيام}}",
   "notifications.policy.filter_new_accounts_title": "حسابات جديدة",
-  "notifications.policy.filter_not_followers_hint": "بما في ذلك الأشخاص الذين يتابعونك أقل من {days, plural, zero {}one {يوم واحد} two {يومان} few {# أيام} many {# أيام} other {# أيام}}",
+  "notifications.policy.filter_not_followers_hint": "بما في ذلك الأشخاص الذين يتابعونك منذ أقل من {days, plural, zero {}one {يوم واحد} two {يومين} few {# أيام} many {# يوما} other {# أيام}}",
   "notifications.policy.filter_not_followers_title": "أشخاص لا يتابعونك",
   "notifications.policy.filter_not_following_hint": "حتى توافق عليهم يدويا",
   "notifications.policy.filter_not_following_title": "أشخاص لا تتابعهم",
-  "notifications.policy.filter_private_mentions_hint": "تمت تصفيته إلا إذا أن يكون ردًا على ذكرك أو إذا كنت تتابع الحساب",
-  "notifications.policy.filter_private_mentions_title": "إشارات خاصة غير مرغوب فيها",
+  "notifications.policy.filter_private_mentions_hint": "يتم تصفيتها إلا إن كانت ردًا على أحد ردودك أو إذا كنت متابعا للمرسل",
+  "notifications.policy.filter_private_mentions_title": "الإشارات الخاصة غير المرغوب فيها",
+  "notifications.policy.title": "إدارة الإشعارات الواردة من…",
   "notifications_permission_banner.enable": "تفعيل إشعارات سطح المكتب",
   "notifications_permission_banner.how_to_control": "لتلقي الإشعارات عندما لا يكون ماستدون مفتوح، قم بتفعيل إشعارات سطح المكتب، يمكنك التحكم بدقة في أنواع التفاعلات التي تولد إشعارات سطح المكتب من خلال زر الـ{icon} أعلاه بمجرد تفعيلها.",
   "notifications_permission_banner.title": "لا تفوت شيئاً أبداً",
@@ -650,7 +669,7 @@
   "report.reasons.legal_description": "أنت تعتقد أنه ينتهك قانون بلدك أو دولة الخادم",
   "report.reasons.other": "شيء آخر",
   "report.reasons.other_description": "لا تندرج هذه المشكلة ضمن فئات أخرى",
-  "report.reasons.spam": "إنها رسالة مزعجة",
+  "report.reasons.spam": "إنه منشور غير مرغوب فيه",
   "report.reasons.spam_description": "روابط خبيثة أو تفاعل كاذب أو ردود متكررة",
   "report.reasons.violation": "ينتهك قواعد الخادم",
   "report.reasons.violation_description": "تعلم أنه ينتهك قواعد محددة",
@@ -668,6 +687,7 @@
   "report.unfollow_explanation": "أنت تتابع هذا الحساب، لإزالة مَنشوراته من موجزات خيطك الرئيس، ألغ متابعته.",
   "report_notification.attached_statuses": "{count, plural, one {{count} منشور} other {{count} منشورات}} مرفقة",
   "report_notification.categories.legal": "أمور قانونية",
+  "report_notification.categories.legal_sentence": "محتوى غير قانوني",
   "report_notification.categories.other": "آخر",
   "report_notification.categories.other_sentence": "آخر",
   "report_notification.categories.spam": "مزعج",
@@ -723,7 +743,7 @@
   "status.embed": "إدماج",
   "status.favourite": "فضّل",
   "status.favourites": "{count, plural, zero {}one {مفضلة واحدة} two {مفضلتان} few {# مفضلات} many {# مفضلات} other {# مفضلات}}",
-  "status.filter": "تصفية هذه الرسالة",
+  "status.filter": "تصفية هذا المنشور",
   "status.filtered": "مُصفّى",
   "status.hide": "إخفاء المنشور",
   "status.history.created": "أنشأه {name} {date}",
diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index 9d2553e7df5ce9..a41e7ba4dd6972 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -523,13 +523,18 @@
   "notification_requests.confirm_accept_all.message": "Esteu a punt d'acceptar {count, plural, one {una petició de notificació} other {# peticions de notificació}}. N'esteu segurs de continuar?",
   "notification_requests.confirm_accept_all.title": "Accepteu peticions de notificació?",
   "notification_requests.confirm_dismiss_all.button": "Descarta-les totes",
+  "notification_requests.confirm_dismiss_all.title": "Descarta la sol·licitud de notificació?",
   "notification_requests.dismiss": "Ignora",
+  "notification_requests.dismiss_all": "Descarta-ho tot",
+  "notification_requests.enter_selection_mode": "Selecciona",
+  "notification_requests.exit_selection_mode": "Cancel·la",
   "notification_requests.explainer_for_limited_account": "S'han filtrat les notificacions d'aquest compte perquè un moderador l'ha limitat.",
   "notification_requests.explainer_for_limited_remote_account": "S'han filtrat les notificacions d'aquest compte perquè un moderador ha limitat el compte o el seu servidor.",
   "notification_requests.maximize": "Maximitza",
   "notification_requests.minimize_banner": "Minimitza el bàner de notificacions filtrades",
   "notification_requests.notifications_from": "Notificacions de {name}",
   "notification_requests.title": "Notificacions filtrades",
+  "notification_requests.view": "Mostra les notificacions",
   "notifications.clear": "Esborra les notificacions",
   "notifications.clear_confirmation": "Segur que vols esborrar permanentment totes les teves notificacions?",
   "notifications.clear_title": "Esborrar les notificacions?",
@@ -566,6 +571,12 @@
   "notifications.permission_denied": "Les notificacions d’escriptori no estan disponibles perquè prèviament s’ha denegat el permís al navegador",
   "notifications.permission_denied_alert": "No es poden activar les notificacions de l'escriptori perquè abans s'ha denegat el permís del navegador",
   "notifications.permission_required": "Les notificacions d'escriptori no estan disponibles perquè el permís requerit no ha estat concedit.",
+  "notifications.policy.accept": "Acceptar",
+  "notifications.policy.accept_hint": "Mostra a notificacions",
+  "notifications.policy.drop": "Ignorar",
+  "notifications.policy.drop_hint": "Envia al buit, no es tornarà a veure mai més",
+  "notifications.policy.filter": "Filtrar",
+  "notifications.policy.filter_hint": "Filtrar",
   "notifications.policy.filter_limited_accounts_hint": "Limitat pels moderadors del servidor",
   "notifications.policy.filter_limited_accounts_title": "Comptes moderats",
   "notifications.policy.filter_new_accounts.hint": "Creat {days, plural, one {ahir} other {durant els # dies passats}}",
@@ -576,6 +587,7 @@
   "notifications.policy.filter_not_following_title": "Persones que no seguiu",
   "notifications.policy.filter_private_mentions_hint": "Filtrat si no és que és en resposta a una menció vostra o si seguiu el remitent",
   "notifications.policy.filter_private_mentions_title": "Mencions privades no sol·licitades",
+  "notifications.policy.title": "Gestiona les notificacions des de…",
   "notifications_permission_banner.enable": "Activa les notificacions d’escriptori",
   "notifications_permission_banner.how_to_control": "Per a rebre notificacions quan Mastodon no és obert cal activar les notificacions d’escriptori. Pots controlar amb precisió quins tipus d’interaccions generen notificacions d’escriptori després d’activar el botó {icon} de dalt.",
   "notifications_permission_banner.title": "No et perdis mai res",
diff --git a/app/javascript/mastodon/locales/eo.json b/app/javascript/mastodon/locales/eo.json
index 15fe9a5ea120f8..0b1ffa2bc4c36c 100644
--- a/app/javascript/mastodon/locales/eo.json
+++ b/app/javascript/mastodon/locales/eo.json
@@ -11,6 +11,7 @@
   "about.not_available": "Ĉi tiu informo ne estas disponebla ĉe ĉi tiu servilo.",
   "about.powered_by": "Malcentrigita socia retejo pere de {mastodon}",
   "about.rules": "Regularo de la servilo",
+  "account.account_note_header": "Personaj notoj",
   "account.add_or_remove_from_list": "Aldoni al aŭ forigi el listoj",
   "account.badges.bot": "Roboto",
   "account.badges.group": "Grupo",
@@ -34,7 +35,9 @@
   "account.follow_back": "Sekvu reen",
   "account.followers": "Sekvantoj",
   "account.followers.empty": "Ankoraŭ neniu sekvas ĉi tiun uzanton.",
+  "account.followers_counter": "{count, plural, one{{counter} sekvanto} other {{counter} sekvantoj}}",
   "account.following": "Sekvatoj",
+  "account.following_counter": "{count, plural, one {{counter} sekvato} other {{counter} sekvatoj}}",
   "account.follows.empty": "La uzanto ankoraŭ ne sekvas iun ajn.",
   "account.go_to_profile": "Iri al profilo",
   "account.hide_reblogs": "Kaŝi diskonigojn de @{name}",
@@ -60,6 +63,7 @@
   "account.requested_follow": "{name} petis sekvi vin",
   "account.share": "Diskonigi la profilon de @{name}",
   "account.show_reblogs": "Montri diskonigojn de @{name}",
+  "account.statuses_counter": "{count, plural,one {{counter} afiŝo} other {{counter} afiŝoj}}",
   "account.unblock": "Malbloki @{name}",
   "account.unblock_domain": "Malbloki la domajnon {domain}",
   "account.unblock_short": "Malbloki",
@@ -85,6 +89,9 @@
   "announcement.announcement": "Anoncoj",
   "attachments_list.unprocessed": "(neprilaborita)",
   "audio.hide": "Kaŝi aŭdion",
+  "block_modal.show_less": "Montri malpli",
+  "block_modal.show_more": "Montri pli",
+  "block_modal.title": "Ĉu bloki uzanton?",
   "boost_modal.combo": "Vi povas premi {combo} por preterpasi sekvafoje",
   "bundle_column_error.copy_stacktrace": "Kopii la eraran raporton",
   "bundle_column_error.error.body": "La petita paĝo ne povas redonitis. Eble estas eraro.",
@@ -144,7 +151,10 @@
   "compose_form.poll.duration": "Daŭro de la balotenketo",
   "compose_form.poll.switch_to_multiple": "Ŝanĝi la balotenketon por permesi multajn elektojn",
   "compose_form.poll.switch_to_single": "Ŝanĝi la balotenketon por permesi unu solan elekton",
+  "compose_form.publish": "Afiŝo",
   "compose_form.publish_form": "Afiŝi",
+  "compose_form.reply": "Respondi",
+  "compose_form.save_changes": "Ĝisdatigi",
   "compose_form.spoiler.marked": "Forigi la averton de enhavo",
   "compose_form.spoiler.unmarked": "Aldoni averton de enhavo",
   "confirmation_modal.cancel": "Nuligi",
diff --git a/app/javascript/mastodon/locales/gd.json b/app/javascript/mastodon/locales/gd.json
index c5af3e557ce4fc..6cbf1e7a03d1b9 100644
--- a/app/javascript/mastodon/locales/gd.json
+++ b/app/javascript/mastodon/locales/gd.json
@@ -356,6 +356,17 @@
   "home.pending_critical_update.link": "Faic na h-ùrachaidhean",
   "home.pending_critical_update.title": "Tha ùrachadh tèarainteachd èiginneach ri fhaighinn!",
   "home.show_announcements": "Seall na brathan-fios",
+  "ignore_notifications_modal.disclaimer": "Chan urrainn do Mhastodon innse do cheachdaichean gun do leig thu seachad na brathan uapa. Cha bhac leigeil seachad nam brathan gun dèid na teachdaireachdan fhèin a chur.",
+  "ignore_notifications_modal.filter_instead": "Criathraich ’na àite",
+  "ignore_notifications_modal.filter_to_act_users": "’S urrainn dhut gabhail ri cleachdaichean, an diùltadh no gearan a dhèanamh mun dèidhinn fhathast",
+  "ignore_notifications_modal.filter_to_avoid_confusion": "Cuidichidh criathradh le rù-rà ma dh’fhaoidte",
+  "ignore_notifications_modal.filter_to_review_separately": "’S urrainn dhut sùil fa leth a thoirt air na brathran criathraichte",
+  "ignore_notifications_modal.ignore": "Leig seachad na brathan",
+  "ignore_notifications_modal.limited_accounts_title": "A bheil thu airson na brathan o chunntasan fo mhaorsainneachd a leigeil seachad?",
+  "ignore_notifications_modal.new_accounts_title": "A bheil thu airson na brathan o chunntasan ùra a leigeil seachad?",
+  "ignore_notifications_modal.not_followers_title": "A bheil thu airson na brathan o dhaoine nach eil ’gad leantainn a leigeil seachad?",
+  "ignore_notifications_modal.not_following_title": "A bheil thu airson na brathan o dhaoine nach eil thu a’ leantainn a leigeil seachad?",
+  "ignore_notifications_modal.private_mentions_title": "A bheil thu airson na brathan o iomraidhean phrìobhaideach gun iarraidh a leigeil seachad?",
   "interaction_modal.description.favourite": "Le cunntas air Mastodon, ’s urrainn dhut am post seo a chur ris na h-annsachdan airson innse dhan ùghdar gu bheil e a’ còrdadh dhut ’s a shàbhaladh do uaireigin eile.",
   "interaction_modal.description.follow": "Le cunntas air Mastodon, ’s urrainn dhut {name} a leantainn ach am faigh thu na postaichean aca nad dhachaigh.",
   "interaction_modal.description.reblog": "Le cunntas air Mastodon, ’s urrainn dhut am post seo a bhrosnachadh gus a cho-roinneadh leis an luchd-leantainn agad fhèin.",
@@ -482,6 +493,11 @@
   "notification.favourite": "Is annsa le {name} am post agad",
   "notification.follow": "Tha {name} ’gad leantainn a-nis",
   "notification.follow_request": "Dh’iarr {name} ’gad leantainn",
+  "notification.label.mention": "Iomradh",
+  "notification.label.private_mention": "Iomradh prìobhaideach",
+  "notification.label.private_reply": "Freagairt phrìobhaideach",
+  "notification.label.reply": "Freagairt",
+  "notification.mention": "Iomradh",
   "notification.moderation-warning.learn_more": "Barrachd fiosrachaidh",
   "notification.moderation_warning": "Fhuair thu rabhadh on mhaorsainneachd",
   "notification.moderation_warning.action_delete_statuses": "Chaidh cuid dhe na postaichean agad a thoirt air falbh.",
@@ -502,11 +518,26 @@
   "notification.status": "Phostaich {name} rud",
   "notification.update": "Dheasaich {name} post",
   "notification_requests.accept": "Gabh ris",
+  "notification_requests.accept_all": "Gabh ris na h-uile",
+  "notification_requests.accept_multiple": "{count, plural, one {Gabh ri # iarrtas} two {Gabh ri # iarrtas} few {Gabh ri # iarrtasan} other {Gabh ri # iarrtas}}",
+  "notification_requests.confirm_accept_all.button": "Gabh ris na h-uile",
+  "notification_requests.confirm_accept_all.message": "Tha thu gu bhith gabhail ri {count, plural, one {# iarrtas bratha} two {# iarrtas bratha} few {# iarrtasan bratha} other {# iarrtas bratha}} a leigeil seachad. A bheil thu cinnteach gu bheil thu airson leantainn air adhart?",
+  "notification_requests.confirm_accept_all.title": "A bheil thu airson gabhail ri iarrtasan bratha?",
+  "notification_requests.confirm_dismiss_all.button": "Leig seachad na h-uile",
+  "notification_requests.confirm_dismiss_all.message": "Tha thu gu bhith {count, plural, one {# iarrtas bratha} two {# iarrtas bratha} few {# iarrtasan bratha} other {# iarrtas bratha}} a leigeil seachad. Chan fhaigh thu grèim {count, plural, one {air} two {orra} few {orra} other {orra}} a-rithist gun duilgheadas. A bheil thu cinnteach gu bheil thu airson leantainn air adhart?",
+  "notification_requests.confirm_dismiss_all.title": "A bheil thu airson iarrtasan bratha a leigeil seachad?",
   "notification_requests.dismiss": "Leig seachad",
+  "notification_requests.dismiss_all": "Leig seachad na h-uile",
+  "notification_requests.dismiss_multiple": "{count, plural, one {Leig seachad # iarrtas} two {Leig seachad # iarrtas} few {Leig seachad # iarrtasan} other {Leig seachad # iarrtas}}",
+  "notification_requests.enter_selection_mode": "Tagh",
+  "notification_requests.exit_selection_mode": "Sguir dheth",
+  "notification_requests.explainer_for_limited_account": "Chaidh na brathan on chunntas seo a chriathradh on a chaidh an cunntas a chuingeachadh le maor.",
+  "notification_requests.explainer_for_limited_remote_account": "Chaidh na brathan on chunntas seo a chriathradh on a chaidh an cunntas no am frithealaiche aige a chuingeachadh le maor.",
   "notification_requests.maximize": "Làn-mheudaich",
   "notification_requests.minimize_banner": "Fìor-lùghdaich bratach nam brathan criathraichte",
   "notification_requests.notifications_from": "Brathan o {name}",
   "notification_requests.title": "Brathan criathraichte",
+  "notification_requests.view": "Seall na brathan",
   "notifications.clear": "Falamhaich na brathan",
   "notifications.clear_confirmation": "A bheil thu cinnteach gu bheil thu airson na brathan uile agad fhalamhachadh gu buan?",
   "notifications.clear_title": "A bheil thu airson na brathan fhalamhachadh?",
@@ -543,6 +574,14 @@
   "notifications.permission_denied": "Chan eil brathan deasga ri fhaighinn on a chaidh iarrtas ceadan a’ bhrabhsair a dhiùltadh cheana",
   "notifications.permission_denied_alert": "Cha ghabh brathan deasga a chur an comas on a chaidh iarrtas ceadan a’ bhrabhsair a dhiùltadh cheana",
   "notifications.permission_required": "Chan eil brathan deasga ri fhaighinn on nach deach an cead riatanach a thoirt seachad.",
+  "notifications.policy.accept": "Gabh ris",
+  "notifications.policy.accept_hint": "Seall sna brathan",
+  "notifications.policy.drop": "Leig seachad",
+  "notifications.policy.drop_hint": "Cuir a-mach à sealladh gu buan",
+  "notifications.policy.filter": "Criathraich",
+  "notifications.policy.filter_hint": "Cuir gu bogsa a-steach nam brathan criathraichte",
+  "notifications.policy.filter_limited_accounts_hint": "Cuingichte le maoir an fhrithealaiche",
+  "notifications.policy.filter_limited_accounts_title": "Cunntasan fo mhaorsainneachd",
   "notifications.policy.filter_new_accounts.hint": "A chaidh a chruthachadh o chionn {days, plural, one {# latha} two {# latha} few {# làithean} other {# latha}}",
   "notifications.policy.filter_new_accounts_title": "Cunntasan ùra",
   "notifications.policy.filter_not_followers_hint": "A’ gabhail a-staigh an fheadhainn a lean ort nas lugha na {days, plural, one {# latha} two {# latha} few {# làithean} other {# latha}} seo chaidh",
@@ -551,6 +590,7 @@
   "notifications.policy.filter_not_following_title": "Daoine nach eil thu a’ leantainn",
   "notifications.policy.filter_private_mentions_hint": "Criathraichte ach ma tha e a’ freagairt do dh’iomradh agad fhèin no ma tha thu a’ leantainn an t-seòladair",
   "notifications.policy.filter_private_mentions_title": "Iomraidhean prìobhaideach o choigrich",
+  "notifications.policy.title": "Stiùirich na brathan o…",
   "notifications_permission_banner.enable": "Cuir brathan deasga an comas",
   "notifications_permission_banner.how_to_control": "Airson brathan fhaighinn nuair nach eil Mastodon fosgailte, cuir na brathan deasga an comas. Tha an smachd agad fhèin air dè na seòrsaichean de chonaltradh a ghineas brathan deasga leis a’ phutan {icon} gu h-àrd nuair a bhios iad air an cur an comas.",
   "notifications_permission_banner.title": "Na caill dad gu bràth tuilleadh",
@@ -791,6 +831,7 @@
   "timeline_hint.remote_resource_not_displayed": "Cha dèid {resource} o fhrithealaichean eile a shealltainn.",
   "timeline_hint.resources.followers": "luchd-leantainn",
   "timeline_hint.resources.follows": "an fheadhainn gan leantainn",
+  "timeline_hint.resources.replies": "Cuid de na freagairtean",
   "timeline_hint.resources.statuses": "postaichean nas sine",
   "trends.counter_by_accounts": "{count, plural, one {{counter} neach} two {{counter} neach} few {{counter} daoine} other {{counter} duine}} {days, plural, one {san {days} latha} two {san {days} latha} few {sna {days} làithean} other {sna {days} latha}} seo chaidh",
   "trends.trending_now": "A’ treandadh an-dràsta",
diff --git a/app/javascript/mastodon/locales/ig.json b/app/javascript/mastodon/locales/ig.json
index 4e3e3997da145c..0f4731ebaac444 100644
--- a/app/javascript/mastodon/locales/ig.json
+++ b/app/javascript/mastodon/locales/ig.json
@@ -23,15 +23,19 @@
   "column.notifications": "Nziọkwà",
   "column.pins": "Pinned post",
   "column_header.pin": "Gbado na profaịlụ gị",
+  "column_header.show_settings": "Gosi mwube",
   "column_subheading.settings": "Mwube",
   "community.column_settings.media_only": "Media only",
   "compose.language.change": "Gbanwee asụsụ",
   "compose.language.search": "Chọọ asụsụ...",
   "compose.published.open": "Mepe",
+  "compose_form.direct_message_warning_learn_more": "Mụtakwuo",
   "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
   "compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.",
   "compose_form.placeholder": "What is on your mind?",
+  "compose_form.poll.single": "Họrọ otu",
   "compose_form.publish_form": "Publish",
+  "compose_form.reply": "Zaa",
   "compose_form.spoiler.marked": "Text is hidden behind warning",
   "compose_form.spoiler.unmarked": "Text is not hidden",
   "confirmation_modal.cancel": "Kagbuo",
@@ -49,7 +53,9 @@
   "domain_pill.username": "Ahaojiaru",
   "embed.instructions": "Embed this status on your website by copying the code below.",
   "emoji_button.activity": "Mmemme",
+  "emoji_button.food": "Oriri & Ọṅụṅụ",
   "emoji_button.label": "Tibanye emoji",
+  "emoji_button.people": "Mmadụ",
   "emoji_button.search": "Chọọ...",
   "emoji_button.symbols": "Ọdịmara",
   "empty_column.account_timeline": "No posts found",
@@ -95,15 +101,19 @@
   "keyboard_shortcuts.toot": "to start a brand new post",
   "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
   "keyboard_shortcuts.up": "to move up in the list",
+  "lightbox.close": "Mechie",
   "lists.delete": "Hichapụ ndepụta",
   "lists.edit": "Dezie ndepụta",
   "lists.subheading": "Ndepụta gị",
   "navigation_bar.about": "Maka",
   "navigation_bar.bookmarks": "Ebenrụtụakā",
+  "navigation_bar.discover": "Chọpụta",
   "navigation_bar.domain_blocks": "Hidden domains",
+  "navigation_bar.favourites": "Mmasị",
   "navigation_bar.lists": "Ndepụta",
   "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
   "notification.reblog": "{name} boosted your status",
+  "notification_requests.enter_selection_mode": "Họrọ",
   "onboarding.actions.go_to_explore": "See what's trending",
   "onboarding.actions.go_to_home": "Go to your home feed",
   "onboarding.follows.lead": "You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!",
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index 5954edc655204d..a309a502636514 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -356,6 +356,15 @@
   "home.pending_critical_update.link": "업데이트 보기",
   "home.pending_critical_update.title": "긴급 보안 업데이트가 있습니다!",
   "home.show_announcements": "공지사항 보기",
+  "ignore_notifications_modal.disclaimer": "마스토돈은 당신이 그들의 알림을 무시했다는 걸 알려줄 수 없습니다. 알림을 무시한다고 해서 메시지가 오지 않는 것은 아닙니다.",
+  "ignore_notifications_modal.filter_instead": "대신 필터로 거르기",
+  "ignore_notifications_modal.filter_to_act_users": "여전히 사용자를 수락, 거절, 신고할 수 있습니다",
+  "ignore_notifications_modal.ignore": "알림 무시",
+  "ignore_notifications_modal.limited_accounts_title": "중재된 계정의 알림을 무시할까요?",
+  "ignore_notifications_modal.new_accounts_title": "새 계정의 알림을 무시할까요?",
+  "ignore_notifications_modal.not_followers_title": "나를 팔로우하지 않는 사람들의 알림을 무시할까요?",
+  "ignore_notifications_modal.not_following_title": "내가 팔로우하지 않는 사람들의 알림을 무시할까요?",
+  "ignore_notifications_modal.private_mentions_title": "요청하지 않은 개인 멘션 알림을 무시할까요?",
   "interaction_modal.description.favourite": "마스토돈 계정을 통해, 게시물을 좋아하는 것으로 작성자에게 호의를 표하고 나중에 보기 위해 저장할 수 있습니다.",
   "interaction_modal.description.follow": "마스토돈 계정을 통해, {name} 님을 팔로우 하고 그의 게시물을 홈 피드에서 받아 볼 수 있습니다.",
   "interaction_modal.description.reblog": "마스토돈 계정을 통해, 이 게시물을 부스트 하고 자신의 팔로워들에게 공유할 수 있습니다.",
@@ -441,7 +450,7 @@
   "mute_modal.indefinite": "내가 뮤트를 해제하기 전까지",
   "mute_modal.show_options": "옵션 표시",
   "mute_modal.they_can_mention_and_follow": "나를 멘션하거나 팔로우 할 수 있습니다, 다만 나에게 안 보일 것입니다.",
-  "mute_modal.they_wont_know": "내가 차단했다는 사실을 모를 것입니다.",
+  "mute_modal.they_wont_know": "내가 뮤트했다는 사실을 모를 것입니다.",
   "mute_modal.title": "사용자를 뮤트할까요?",
   "mute_modal.you_wont_see_mentions": "그를 멘션하는 게시물을 더는 보지 않게 됩니다.",
   "mute_modal.you_wont_see_posts": "내가 작성한 게시물을 볼 수는 있지만, 나는 그가 작성한 것을 보지 않게 됩니다.",
@@ -482,6 +491,11 @@
   "notification.favourite": "{name} 님이 내 게시물을 좋아합니다",
   "notification.follow": "{name} 님이 나를 팔로우했습니다",
   "notification.follow_request": "{name} 님이 팔로우 요청을 보냈습니다",
+  "notification.label.mention": "멘션",
+  "notification.label.private_mention": "개인 멘션",
+  "notification.label.private_reply": "개인 답글",
+  "notification.label.reply": "답글",
+  "notification.mention": "멘션",
   "notification.moderation-warning.learn_more": "더 알아보기",
   "notification.moderation_warning": "중재 경고를 받았습니다",
   "notification.moderation_warning.action_delete_statuses": "게시물 몇 개가 삭제되었습니다.",
@@ -502,13 +516,26 @@
   "notification.status": "{name} 님이 방금 게시물을 올렸습니다",
   "notification.update": "{name} 님이 게시물을 수정했습니다",
   "notification_requests.accept": "수락",
+  "notification_requests.accept_all": "모두 수락",
+  "notification_requests.accept_multiple": "{count, plural, other {#개의 요청 수락하기}}",
+  "notification_requests.confirm_accept_all.button": "모두 수락",
+  "notification_requests.confirm_accept_all.message": "{count, plural, other {#개의 요청}}을 수락하려 합니다. 계속 진행할까요?",
+  "notification_requests.confirm_accept_all.title": "알림 요청을 수락할까요?",
+  "notification_requests.confirm_dismiss_all.button": "모두 지우기",
+  "notification_requests.confirm_dismiss_all.message": "{count, plural, other {#개의 요청}}을 지우려고 합니다. {count, plural, other {}}다시 접근하기 어렵습니다. 계속할까요?",
+  "notification_requests.confirm_dismiss_all.title": "알림 요청을 지울까요?",
   "notification_requests.dismiss": "지우기",
+  "notification_requests.dismiss_all": "모두 지우기",
+  "notification_requests.dismiss_multiple": "{count, plural, other {#개의 요청 지우기}}",
   "notification_requests.enter_selection_mode": "선택",
   "notification_requests.exit_selection_mode": "취소",
+  "notification_requests.explainer_for_limited_account": "이 계정은 중재자에 의해 제한되었기 때문에 이 계정의 알림은 걸러졌습니다.",
+  "notification_requests.explainer_for_limited_remote_account": "이 계정 혹은 그가 속한 서버는 중재자에 의해 제한되었기 때문에 이 계정의 알림은 걸러졌습니다.",
   "notification_requests.maximize": "최대화",
   "notification_requests.minimize_banner": "걸러진 알림 배너 최소화",
   "notification_requests.notifications_from": "{name} 님으로부터의 알림",
   "notification_requests.title": "걸러진 알림",
+  "notification_requests.view": "알림 보기",
   "notifications.clear": "알림 비우기",
   "notifications.clear_confirmation": "정말로 알림을 삭제하시겠습니까?",
   "notifications.clear_title": "알림을 모두 지울까요?",
@@ -546,8 +573,11 @@
   "notifications.permission_denied_alert": "이전에 브라우저 권한이 거부되었기 때문에, 데스크탑 알림이 활성화 될 수 없습니다.",
   "notifications.permission_required": "필요한 권한이 승인되지 않아 데스크탑 알림을 사용할 수 없습니다.",
   "notifications.policy.accept": "허용",
+  "notifications.policy.accept_hint": "알림 목록에 표시",
   "notifications.policy.drop": "무시",
+  "notifications.policy.drop_hint": "공허로 보내고, 다시는 보지 않습니다",
   "notifications.policy.filter": "필터",
+  "notifications.policy.filter_hint": "걸러진 알림 목록으로 보내기",
   "notifications.policy.filter_limited_accounts_hint": "서버 중재자에 의해 제한됨",
   "notifications.policy.filter_limited_accounts_title": "중재된 계정",
   "notifications.policy.filter_new_accounts.hint": "{days, plural, one {하루} other {#일}} 안에 만들어진",
@@ -558,6 +588,7 @@
   "notifications.policy.filter_not_following_title": "내가 팔로우하지 않는 사람들",
   "notifications.policy.filter_private_mentions_hint": "내가 한 멘션에 단 답글이거나 내가 발신자를 팔로우 한 것이 아닌 이상 걸러집니다",
   "notifications.policy.filter_private_mentions_title": "청하지 않은 개인적인 멘션",
+  "notifications.policy.title": "…의 알림 설정",
   "notifications_permission_banner.enable": "데스크탑 알림 활성화",
   "notifications_permission_banner.how_to_control": "마스토돈이 열려 있지 않을 때에도 알림을 받으려면, 데스크탑 알림을 활성화 하세요. 당신은 어떤 종류의 반응이 데스크탑 알림을 발생할 지를 {icon} 버튼을 통해 세세하게 설정할 수 있습니다.",
   "notifications_permission_banner.title": "아무것도 놓치지 마세요",
@@ -795,11 +826,11 @@
   "time_remaining.minutes": "{number} 분 남음",
   "time_remaining.moments": "남은 시간",
   "time_remaining.seconds": "{number} 초 남음",
-  "timeline_hint.remote_resource_not_displayed": "다른 서버의 {resource} 표시는 할 수 없습니다.",
-  "timeline_hint.resources.followers": "팔로워",
-  "timeline_hint.resources.follows": "팔로우",
-  "timeline_hint.resources.replies": "몇몇 답글",
-  "timeline_hint.resources.statuses": "이전 게시물",
+  "timeline_hint.remote_resource_not_displayed": "다른 서버의 {resource} 표시할 수 없습니다.",
+  "timeline_hint.resources.followers": "팔로워는",
+  "timeline_hint.resources.follows": "팔로우는",
+  "timeline_hint.resources.replies": "몇몇 답글은",
+  "timeline_hint.resources.statuses": "이전 게시물은",
   "trends.counter_by_accounts": "이전 {days}일 동안 {counter} 명의 사용자",
   "trends.trending_now": "지금 유행 중",
   "ui.beforeunload": "지금 나가면 저장되지 않은 항목을 잃게 됩니다.",
diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json
index ca3f78bc87f56c..108b83f0b0e816 100644
--- a/app/javascript/mastodon/locales/sk.json
+++ b/app/javascript/mastodon/locales/sk.json
@@ -11,6 +11,7 @@
   "about.not_available": "Tieto informácie neboli sprístupnené na tomto serveri.",
   "about.powered_by": "Decentralizovaná sociálna sieť na základe technológie {mastodon}",
   "about.rules": "Pravidlá servera",
+  "account.account_note_header": "Osobná poznámka",
   "account.add_or_remove_from_list": "Pridať alebo odobrať zo zoznamov",
   "account.badges.bot": "Bot",
   "account.badges.group": "Skupina",
diff --git a/app/javascript/mastodon/locales/sl.json b/app/javascript/mastodon/locales/sl.json
index 51fb72f65dfeea..353b521a1c9fa4 100644
--- a/app/javascript/mastodon/locales/sl.json
+++ b/app/javascript/mastodon/locales/sl.json
@@ -355,6 +355,9 @@
   "home.pending_critical_update.link": "Glejte posodobitve",
   "home.pending_critical_update.title": "Na voljo je kritična varnostna posodobbitev!",
   "home.show_announcements": "Pokaži obvestila",
+  "ignore_notifications_modal.filter_to_avoid_confusion": "Filtriranje pomaga pri izogibanju morebitni zmedi",
+  "ignore_notifications_modal.filter_to_review_separately": "Filtrirana obvestila lahko pregledate ločeno",
+  "ignore_notifications_modal.ignore": "Prezri obvestila",
   "interaction_modal.description.favourite": "Z računom na Mastodonu lahko to objavo postavite med priljubljene in tako avtorju nakažete, da jo cenite, in jo shranite za kasneje.",
   "interaction_modal.description.follow": "Z računom na Mastodonu lahko sledite {name}, da prejemate njihove objave v svoj domači vir.",
   "interaction_modal.description.reblog": "Z računom na Mastodonu lahko izpostavite to objavo, tako da jo delite s svojimi sledilci.",
@@ -481,6 +484,9 @@
   "notification.favourite": "{name} je vzljubil/a vašo objavo",
   "notification.follow": "{name} vam sledi",
   "notification.follow_request": "{name} vam želi slediti",
+  "notification.label.private_mention": "Zasebna omemba",
+  "notification.label.private_reply": "Zasebni odgovor",
+  "notification.label.reply": "Odgovori",
   "notification.moderation-warning.learn_more": "Več o tem",
   "notification.moderation_warning": "Prejeli ste opozorilo moderatorjev",
   "notification.moderation_warning.action_delete_statuses": "Nekatere vaše objave so odstranjene.",
@@ -501,10 +507,17 @@
   "notification.status": "{name} je pravkar objavil/a",
   "notification.update": "{name} je uredil(a) objavo",
   "notification_requests.accept": "Sprejmi",
+  "notification_requests.accept_all": "Sprejmi vse",
+  "notification_requests.confirm_accept_all.button": "Sprejmi vse",
+  "notification_requests.confirm_dismiss_all.button": "Opusti vse",
   "notification_requests.dismiss": "Zavrni",
+  "notification_requests.dismiss_all": "Opusti vse",
+  "notification_requests.enter_selection_mode": "Izberi",
+  "notification_requests.exit_selection_mode": "Prekliči",
   "notification_requests.maximize": "Maksimiraj",
   "notification_requests.notifications_from": "Obvestila od {name}",
   "notification_requests.title": "Filtrirana obvestila",
+  "notification_requests.view": "Pokaži obvestila",
   "notifications.clear": "Počisti obvestila",
   "notifications.clear_confirmation": "Ali ste prepričani, da želite trajno izbrisati vsa svoja obvestila?",
   "notifications.clear_title": "Želite počistiti obvestila?",
@@ -541,6 +554,9 @@
   "notifications.permission_denied": "Namizna obvestila niso na voljo zaradi poprej zavrnjene zahteve dovoljenja brskalnika.",
   "notifications.permission_denied_alert": "Namiznih obvestil ni mogoče omogočiti, ker je bilo dovoljenje brskalnika že prej zavrnjeno",
   "notifications.permission_required": "Namizna obvestila niso na voljo, ker zahtevano dovoljenje ni bilo podeljeno.",
+  "notifications.policy.accept": "Sprejmi",
+  "notifications.policy.accept_hint": "Pokaži med obvestili",
+  "notifications.policy.drop": "Prezri",
   "notifications.policy.filter_new_accounts.hint": "Ustvarjen v {days, plural, one {zadnjem # dnevu} two {zadnjih # dnevih} few {zadnjih # dnevih} other {zadnjih # dnevih}}",
   "notifications.policy.filter_new_accounts_title": "Novi računi",
   "notifications.policy.filter_not_followers_hint": "Vključujoč ljudi, ki vam sledijo manj kot {days, plural, one {# dan} two {# dneva} few {# dni} other {# dni}}",
@@ -549,6 +565,7 @@
   "notifications.policy.filter_not_following_title": "Ljudje, ki jim ne sledite",
   "notifications.policy.filter_private_mentions_hint": "Filtrirano, razen če je odgovor na vašo lastno omembo ali če sledite pošiljatelju",
   "notifications.policy.filter_private_mentions_title": "Neželene zasebne omembe",
+  "notifications.policy.title": "Upravljaj obvestila od ...",
   "notifications_permission_banner.enable": "Omogoči obvestila na namizju",
   "notifications_permission_banner.how_to_control": "Če želite prejemati obvestila, ko Mastodon ni odprt, omogočite namizna obvestila. Natančno lahko nadzirate, katere vrste interakcij naj tvorijo namizna obvestila; ko so omogočena, za to uporabite gumb {icon} zgoraj.",
   "notifications_permission_banner.title": "Nikoli ne zamudite ničesar",
@@ -789,6 +806,7 @@
   "timeline_hint.remote_resource_not_displayed": "{resource} z drugih strežnikov ni prikazano.",
   "timeline_hint.resources.followers": "sledilcev",
   "timeline_hint.resources.follows": "Sledi",
+  "timeline_hint.resources.replies": "Nekaj odgovorov",
   "timeline_hint.resources.statuses": "Starejše objave",
   "trends.counter_by_accounts": "{count, plural, one {{count} oseba} two {{count} osebi} few {{count} osebe} other {{count} oseb}} v {days, plural, one {zadnjem {day} dnevu} two {zadnjih {days} dneh} few {zadnjih {days} dneh} other {zadnjih {days} dneh}}",
   "trends.trending_now": "Zdaj v trendu",
diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json
index 47b6a89225477b..9d378a67a2b8d9 100644
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@@ -1,5 +1,5 @@
 {
-  "about.blocks": "เซิร์ฟเวอร์ที่มีการกลั่นกรอง",
+  "about.blocks": "เซิร์ฟเวอร์ที่ได้รับการกลั่นกรอง",
   "about.contact": "ติดต่อ:",
   "about.disclaimer": "Mastodon เป็นซอฟต์แวร์เสรี โอเพนซอร์ส และเครื่องหมายการค้าของ Mastodon gGmbH",
   "about.domain_blocks.no_reason_available": "เหตุผลไม่พร้อมใช้งาน",
@@ -357,10 +357,13 @@
   "home.pending_critical_update.title": "มีการอัปเดตความปลอดภัยสำคัญพร้อมใช้งาน!",
   "home.show_announcements": "แสดงประกาศ",
   "ignore_notifications_modal.filter_instead": "กรองแทน",
+  "ignore_notifications_modal.filter_to_act_users": "คุณจะยังสามารถยอมรับ ปฏิเสธ หรือรายงานผู้ใช้",
   "ignore_notifications_modal.ignore": "เพิกเฉยการแจ้งเตือน",
+  "ignore_notifications_modal.limited_accounts_title": "เพิกเฉยการแจ้งเตือนจากบัญชีที่ได้รับการกลั่นกรอง?",
   "ignore_notifications_modal.new_accounts_title": "เพิกเฉยการแจ้งเตือนจากบัญชีใหม่?",
   "ignore_notifications_modal.not_followers_title": "เพิกเฉยการแจ้งเตือนจากผู้คนที่ไม่ได้ติดตามคุณ?",
   "ignore_notifications_modal.not_following_title": "เพิกเฉยการแจ้งเตือนจากผู้คนที่คุณไม่ได้ติดตาม?",
+  "ignore_notifications_modal.private_mentions_title": "เพิกเฉยการแจ้งเตือนจากการกล่าวถึงแบบส่วนตัวที่ไม่พึงประสงค์?",
   "interaction_modal.description.favourite": "ด้วยบัญชีใน Mastodon คุณสามารถชื่นชอบโพสต์นี้เพื่อแจ้งให้ผู้สร้างทราบว่าคุณชื่นชมโพสต์และบันทึกโพสต์ไว้สำหรับภายหลัง",
   "interaction_modal.description.follow": "ด้วยบัญชีใน Mastodon คุณสามารถติดตาม {name} เพื่อรับโพสต์ของเขาในฟีดหน้าแรกของคุณ",
   "interaction_modal.description.reblog": "ด้วยบัญชีใน Mastodon คุณสามารถดันโพสต์นี้เพื่อแชร์โพสต์กับผู้ติดตามของคุณเอง",
@@ -565,7 +568,9 @@
   "notifications.policy.accept": "ยอมรับ",
   "notifications.policy.accept_hint": "แสดงในการแจ้งเตือน",
   "notifications.policy.drop": "เพิกเฉย",
+  "notifications.policy.filter": "กรอง",
   "notifications.policy.filter_hint": "ส่งไปยังกล่องขาเข้าการแจ้งเตือนที่กรองอยู่",
+  "notifications.policy.filter_limited_accounts_title": "บัญชีที่ได้รับการกลั่นกรอง",
   "notifications.policy.filter_new_accounts.hint": "สร้างขึ้นภายใน {days, plural, other {# วัน}}ที่ผ่านมา",
   "notifications.policy.filter_new_accounts_title": "บัญชีใหม่",
   "notifications.policy.filter_not_followers_hint": "รวมถึงผู้คนที่ได้ติดตามคุณน้อยกว่า {days, plural, other {# วัน}}",
diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json
index 1466ff0524c499..83b3be003ec63a 100644
--- a/app/javascript/mastodon/locales/uk.json
+++ b/app/javascript/mastodon/locales/uk.json
@@ -35,9 +35,9 @@
   "account.follow_back": "Стежити також",
   "account.followers": "Підписники",
   "account.followers.empty": "Ніхто ще не підписаний на цього користувача.",
-  "account.followers_counter": "{count, plural, one {{counter} підписник} few {{counter} підписники} many {{counter} підписників} other {{counter} підписники}}",
+  "account.followers_counter": "{count, plural, one {{counter} підписник} few {{counter} підписники} many {{counter} підписників} other {{counter} підписник}}",
   "account.following": "Ви стежите",
-  "account.following_counter": "{count, plural, one {{counter} підписка} few {{counter} підписки} many {{counter} підписок} other {{counter} підписки}}",
+  "account.following_counter": "{count, plural, one {{counter} підписка} few {{counter} підписки} many {{counter} підписок} other {{counter} підписка}}",
   "account.follows.empty": "Цей користувач ще ні на кого не підписався.",
   "account.go_to_profile": "Перейти до профілю",
   "account.hide_reblogs": "Сховати поширення від @{name}",
@@ -356,9 +356,17 @@
   "home.pending_critical_update.link": "Переглянути оновлення",
   "home.pending_critical_update.title": "Доступне критичне оновлення безпеки!",
   "home.show_announcements": "Показати оголошення",
+  "ignore_notifications_modal.disclaimer": "Mastodon не може повідомити користувачів, що ви проігнорували їх повідомлення. Ігнорування сповіщень не зупинить надсилання повідомлень.",
+  "ignore_notifications_modal.filter_instead": "Натомість фільтрувати",
   "ignore_notifications_modal.filter_to_act_users": "Ви все ще зможете прийняти, відхилити або поскаржитися на користувачів",
+  "ignore_notifications_modal.filter_to_avoid_confusion": "Фільтрування допомагає уникнути потенційної плутанини",
   "ignore_notifications_modal.filter_to_review_separately": "Ви можете переглянути відфільтровані сповіщення окремо",
   "ignore_notifications_modal.ignore": "Ігнорувати сповіщення",
+  "ignore_notifications_modal.limited_accounts_title": "Ігнорувати сповіщення від модерованих облікових записів?",
+  "ignore_notifications_modal.new_accounts_title": "Ігнорувати сповіщення від нових облікових записів?",
+  "ignore_notifications_modal.not_followers_title": "Ігнорувати сповіщення від людей, які не підписані на вас?",
+  "ignore_notifications_modal.not_following_title": "Ігнорувати сповіщення від людей, на яких ви не підписалися?",
+  "ignore_notifications_modal.private_mentions_title": "Ігнорувати сповіщення від небажаних приватних згадок?",
   "interaction_modal.description.favourite": "Маючи обліковий запис на Mastodon, ви можете вподобати цей допис, щоб дати автору знати, що ви його цінуєте, і зберегти його на потім.",
   "interaction_modal.description.follow": "Маючи обліковий запис на Mastodon, ви можете підписатися на {name}, щоб отримувати дописи цього користувача у свою стрічку.",
   "interaction_modal.description.reblog": "Маючи обліковий запис на Mastodon, ви можете поширити цей допис, щоб поділитися ним зі своїми підписниками.",
@@ -485,8 +493,11 @@
   "notification.favourite": "Ваш допис сподобався {name}",
   "notification.follow": "{name} підписалися на вас",
   "notification.follow_request": "{name} відправили запит на підписку",
+  "notification.label.mention": "Згадка",
+  "notification.label.private_mention": "Особиста згадка",
   "notification.label.private_reply": "Приватна відповідь",
-  "notification.label.reply": "Відповісти",
+  "notification.label.reply": "Відповідь",
+  "notification.mention": "Згадка",
   "notification.moderation-warning.learn_more": "Дізнатися більше",
   "notification.moderation_warning": "Ви отримали попередження модерації",
   "notification.moderation_warning.action_delete_statuses": "Деякі з ваших дописів було видалено.",
@@ -508,16 +519,25 @@
   "notification.update": "{name} змінює допис",
   "notification_requests.accept": "Прийняти",
   "notification_requests.accept_all": "Прийняти все",
+  "notification_requests.accept_multiple": "{count, plural, one {Прийняти # запит} few {Прийняти # запити} many {Прийняти # запитів} other {Прийняти # запит}}",
   "notification_requests.confirm_accept_all.button": "Прийняти все",
+  "notification_requests.confirm_accept_all.message": "Ви збираєтеся прийняти {count, plural, one {запит на сповіщення} few {# запити на сповіщення} many {# запитів на сповіщення} other {# запит на сповіщення}}. Ви впевнені, що хочете продовжити?",
+  "notification_requests.confirm_accept_all.title": "Прийняти запит на сповіщення?",
   "notification_requests.confirm_dismiss_all.button": "Відхили все",
+  "notification_requests.confirm_dismiss_all.message": "Ви збираєтеся відхилити {count, plural, one {запит на сповіщення} few {# запити на сповіщення} many {# запитів на сповіщення} other {# запит на сповіщення}}. Ви не зможете легко отримати доступ до {count, plural, one {нього} other {них}} again. Ви впевнені, що хочете продовжити?",
+  "notification_requests.confirm_dismiss_all.title": "Відхилити запити на сповіщення?",
   "notification_requests.dismiss": "Відхилити",
   "notification_requests.dismiss_all": "Відхили все",
+  "notification_requests.dismiss_multiple": "{count, plural, one {Відхилити # запит} other {Відхилити # запити}}",
+  "notification_requests.enter_selection_mode": "Вибрати",
+  "notification_requests.exit_selection_mode": "Скасувати",
   "notification_requests.explainer_for_limited_account": "Сповіщення від цього облікового запису фільтровані, оскільки обліковий запис обмежений модератором.",
   "notification_requests.explainer_for_limited_remote_account": "Сповіщення від цього облікового запису фільтровані, оскільки обліковий запис або його сервер обмежений модератором.",
   "notification_requests.maximize": "Розгорнути",
   "notification_requests.minimize_banner": "Мінімізувати відфільтрований банер сповіщень",
   "notification_requests.notifications_from": "Сповіщення від {name}",
   "notification_requests.title": "Відфільтровані сповіщення",
+  "notification_requests.view": "Переглянути сповіщення",
   "notifications.clear": "Очистити сповіщення",
   "notifications.clear_confirmation": "Ви впевнені, що хочете назавжди видалити всі сповіщення?",
   "notifications.clear_title": "Очистити сповіщення?",
@@ -555,7 +575,11 @@
   "notifications.permission_denied_alert": "Сповіщення не можна ввімкнути оскільки у дозволі вже було відмовлено раніше",
   "notifications.permission_required": "Сповіщення на стільниці не доступні, оскільки необхідний дозвіл не надано.",
   "notifications.policy.accept": "Прийняти",
+  "notifications.policy.accept_hint": "Показувати в сповіщеннях",
   "notifications.policy.drop": "Ігнорувати",
+  "notifications.policy.drop_hint": "Відправити в нікуди, щоб більше не бачити",
+  "notifications.policy.filter": "Фільтрувати",
+  "notifications.policy.filter_hint": "Надіслати до відфільтрованих вхідних",
   "notifications.policy.filter_limited_accounts_hint": "Обмежено модераторами сервера",
   "notifications.policy.filter_limited_accounts_title": "Модеровані облікові записи",
   "notifications.policy.filter_new_accounts.hint": "Створено впродовж {days, plural, one {одного} few {# днів} many {# днів} other {# дня}}",
@@ -566,6 +590,7 @@
   "notifications.policy.filter_not_following_title": "Люди, на яких ви не підписані",
   "notifications.policy.filter_private_mentions_hint": "Відфільтровується, якщо це не відповідь на вашу власну згадку або якщо ви відстежуєте відправника",
   "notifications.policy.filter_private_mentions_title": "Небажані приватні згадки",
+  "notifications.policy.title": "Керувати сповіщеннями від…",
   "notifications_permission_banner.enable": "Увімкнути сповіщення стільниці",
   "notifications_permission_banner.how_to_control": "Щоб отримувати сповіщення, коли Mastodon не відкрито, увімкніть сповіщення стільниці. Ви можете контролювати, які типи взаємодій створюють сповіщення через кнопку {icon} вгорі після їхнього увімкнення.",
   "notifications_permission_banner.title": "Не проґавте нічого",
@@ -726,11 +751,11 @@
   "server_banner.about_active_users": "Люди, які використовують цей сервер протягом останніх 30 днів (Щомісячні Активні Користувачі)",
   "server_banner.active_users": "активні користувачі",
   "server_banner.administered_by": "Адміністратор:",
-  "server_banner.is_one_of_many": "{domain} - один з багатьох незалежних серверів Mastodon, які ви можете використати, щоб брати участь у федівері.",
+  "server_banner.is_one_of_many": "{domain} - один з багатьох незалежних серверів Mastodon, які ви можете використати, щоб брати участь у федіверсі.",
   "server_banner.server_stats": "Статистика сервера:",
   "sign_in_banner.create_account": "Створити обліковий запис",
-  "sign_in_banner.follow_anyone": "Слідкуйте за ким завгодно у всьому fediverse і дивіться все це в хронологічному порядку. Немає алгоритмів, реклами чи наживок для натискань при перегляді.",
-  "sign_in_banner.mastodon_is": "Мастодон - найкращий спосіб продовжувати свою справу.",
+  "sign_in_banner.follow_anyone": "Слідкуйте за ким завгодно у всьому fediverse і дивіться все це в хронологічному порядку. Немає алгоритмів, реклами чи клікбейту.",
+  "sign_in_banner.mastodon_is": "Mastodon — найкращий спосіб бути в курсі подій.",
   "sign_in_banner.sign_in": "Увійти",
   "sign_in_banner.sso_redirect": "Увійдіть або зареєструйтесь",
   "status.admin_account": "Відкрити інтерфейс модерації для @{name}",
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 8a142d0bd5e9c0..18dede8fbf453c 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -39,6 +39,7 @@ ar:
       created_msg: تم إنشاء ملاحظة الإشراف بنجاح!
       destroyed_msg: تم تدمير ملاحظة الإشراف بنجاح!
     accounts:
+      add_email_domain_block: حظر نطاق البريد الإلكتروني
       approve: صادِق عليه
       approved_msg: تمت الموافقة على تسجيل %{username}
       are_you_sure: هل أنت متأكد؟
@@ -227,6 +228,7 @@ ar:
         update_custom_emoji: تحديث الإيموجي المخصص
         update_domain_block: تحديث حظر النطاق
         update_ip_block: تحديث قاعدة IP
+        update_report: تحديث التقرير
         update_status: تحديث المنشور
         update_user_role: تحديث الدور
       actions:
@@ -559,7 +561,7 @@ ar:
       deactivate_all: تعطيلها كافة
       filter:
         all: الكل
-        available: المتوفرة
+        available: متاح
         expired: المنتهي صلاحيتها
         title: التصفية
       title: الدعوات
@@ -617,6 +619,7 @@ ar:
         resolve_description_html: ولن يُتخذ أي إجراء ضد الحساب المبلّغ عنه، ولن تسلَّط عليه أية عقوبة، وسوف يُغلق التقرير.
         silence_description_html: الحساب سيظهر فقط لمن يتابعه أو قام بالبحث عنه بشكل مباشر مما يخفض إمكانية رؤيته بشكل شبه كامل. يمكنك دائما التراجع عن هذا الإجراء. تُغلَق كافة الإبلاغات عن هذا الحساب.
         suspend_description_html: سيُمنع الوصول إلى الحساب وجميع محتوياته وتُحذف تدريجياً، وسيكون التفاعل معه مستحيلاً. بالإمكان عكس مفعول ذلك في غضون 30 يوماً. يغلق جميع التبليغات ضد الحساب.
+      actions_description_html: حدد الإجراء الذي يجب عليك اتخاذه لحل هذا التقرير. إذا اتخذت إجراء عقابيا ضد الحساب المبلغ عنه، فسيتم إرسال إشعار عبر البريد الإلكتروني إليهم، باستثناء عند اختيار فئة <strong>spam</strong>.
       actions_description_remote_html: حدّد الإجراءات التي يتعين اتخاذها لحل هذا التقرير. هذا سيؤثر فقط على كيفية اتصال <strong>خادمك</strong> بهذا الحساب البعيد والتعامل مع محتوياته.
       add_to_report: أضف المزيد إلى التقرير
       are_you_sure: هل أنت متأكد ؟
@@ -721,8 +724,8 @@ ar:
         invite_users_description: يسمح للمستخدمين بدعوة أشخاص جدد إلى الخادم
         manage_announcements: ادارة الاعلانات
         manage_announcements_description: يسمح للمستخدمين بإدارة الإعلانات على الخادم
-        manage_appeals: إدارة الاستئنافات
-        manage_appeals_description: يسمح للمستخدمين بمراجعة الطعن ضد إجراءات الإشراف
+        manage_appeals: إدارة الطعون
+        manage_appeals_description: يسمح للمستخدمين بمراجعة الطعون المقدمة ضد إجراءات الإشراف
         manage_blocks: إدارة الحظر
         manage_custom_emojis: إدارة الرموز التعبيريّة المخصصة
         manage_custom_emojis_description: السماح للمستخدمين بإدارة الرموز التعبيريّة المخصصة على الخادم
@@ -899,6 +902,9 @@ ar:
         action: تحقق هنا للمزيد من المعلومات
         message_html: "<strong>تم تكوين مخزن الكائنات الخاص بك بشكل خاطئ. خصوصية المستخدمين في خطر.</strong>"
     tags:
+      moderation:
+        title: الحالة
+      newest: الأحدث
       review: حالة المراجعة
       search: البحث
       title: الوسوم
@@ -1062,7 +1068,9 @@ ar:
       guide_link_text: يمكن للجميع المساهمة.
     sensitive_content: المحتوى الحساس
   application_mailer:
+    notification_preferences: تغيير تفضيلات البريد الإلكتروني
     salutation: "%{name}،"
+    settings: 'تغيير تفضيلات البريد الإلكتروني: %{link}'
     unsubscribe: إلغاء الاشتراك
     view: 'اعرض:'
     view_profile: اعرض الصفحة التعريفية
@@ -1460,6 +1468,9 @@ ar:
     unsubscribe:
       action: نعم، ألغِ الاشتراك
       complete: غير مشترك
+      emails:
+        notification_emails:
+          reblog: رسائل البريد الخاصة بالمنشورات المعاد نشرها
       title: إلغاء الاشتراك
   media_attachments:
     validations:
@@ -1817,7 +1828,7 @@ ar:
     min_age_label: عتبة العمر
     min_favs: إبقاء المشاركات المفضلة أكثر من
     min_favs_hint: لن تُحذف أي من منشوراتك التي تلقّت على الأقل هذا العدد من المفضلات. اتركه فارغاً لحذف المنشورات مهما كان عدد المفضلات التي تلقتها
-    min_reblogs: إبقاء المشاركات المعززة أكثر من
+    min_reblogs: إبقاء المنشورات المعاد نشرها أكثر من
     min_reblogs_hint: لن تُحذف أي من منشوراتك التي أعيد مشاركتها أكثر من هذا العدد من المرات. اتركه فارغاً لحذف المنشورات بغض النظر عن عدد إعادات النشر
   stream_entries:
     sensitive_content: محتوى حساس
@@ -1960,6 +1971,7 @@ ar:
     invalid_otp_token: رمز المصادقة بخطوتين غير صالح
     otp_lost_help_html: إن فقدتَهُما ، يمكنك الاتصال بـ %{email}
     rate_limited: عدد محاولات المصادقة كثير جداً، حاول مرة أخرى لاحقاً.
+    seamless_external_login: لقد تم تسجيل دخولك عبر خدمة خارجية، لذا فإن إعدادات كلمة المرور والبريد الإلكتروني غير متاحة.
     signed_in_as: 'تم تسجيل دخولك بصفة:'
   verification:
     extra_instructions_html: <strong>نصيحة:</strong> يمكن أن يكون الرابط الموجود على موقع الويب الخاص بك غير مرئي. الجزء المهم هو <code>rel="me"</code> الذي يمنع انتحال الهوية على مواقع الويب ذات المحتوى الذي ينشئه المستخدم. يمكنك أيضًا استخدام علامة <code>link</code> في رأس الصفحة بدلاً من <code>a</code>، ولكن يجب أن يكون HTML قابلاً للوصول دون تنفيذ JavaScript.
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index ae2ea3cd7b63a0..7cf675559d2840 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -130,6 +130,7 @@ ca:
       resubscribe: Torna a subscriure
       role: Rol
       search: Cerca
+      search_same_email_domain: Altres usuaris amb el mateix domini del correu electrònic
       search_same_ip: Altres usuaris amb la mateixa IP
       security: Seguretat
       security_measures:
@@ -170,21 +171,26 @@ ca:
         approve_appeal: Aprova l'apel·lació
         approve_user: Aprova l'usuari
         assigned_to_self_report: Assigna un informe
+        change_email_user: Canvia el correu electrònic per l'usuari
         change_role_user: Canvia el Rol del Usuari
         confirm_user: Confirma l'usuari
         create_account_warning: Crea un avís
         create_announcement: Crea un anunci
+        create_canonical_email_block: Crea un blocatge del correu electrònic
         create_custom_emoji: Crea un emoji personalitzat
         create_domain_allow: Crea un domini permès
         create_domain_block: Crea un bloqueig de domini
+        create_email_domain_block: Crea un blocatge del domini del correu electrònic
         create_ip_block: Crear regla IP
         create_unavailable_domain: Crea un domini no disponible
         create_user_role: Crea Rol
         demote_user: Degrada l'usuari
         destroy_announcement: Esborra l'anunci
+        destroy_canonical_email_block: Elimina el blocatge del correu electrònic
         destroy_custom_emoji: Esborra l'emoji personalitzat
         destroy_domain_allow: Esborra el permís del domini
         destroy_domain_block: Esborra el bloqueig de domini
+        destroy_email_domain_block: Elimina el blocatge del domini del correu electrònic
         destroy_instance: Purga Domini
         destroy_ip_block: Eliminar regla IP
         destroy_status: Elimina la publicació
@@ -223,7 +229,9 @@ ca:
         approve_appeal_html: "%{name} ha aprovat l'apel·lació a la decisió de moderació de %{target}"
         approve_user_html: "%{name} ha aprovat el registre de %{target}"
         assigned_to_self_report_html: "%{name} s'han assignat l'informe %{target} a ells mateixos"
+        change_email_user_html: "%{name} ha canviat l'adreça del correu electrònic de l'usuari %{target}"
         change_role_user_html: "%{name} ha canviat el rol de %{target}"
+        confirm_user_html: "%{name} ha confirmat l'adreça del correu electrònic de l'usuari %{target}"
         create_account_warning_html: "%{name} ha enviat un avís a %{target}"
         create_announcement_html: "%{name} ha creat un nou anunci %{target}"
         create_custom_emoji_html: "%{name} ha pujat un emoji nou %{target}"
@@ -1079,6 +1087,7 @@ ca:
     or_log_in_with: O inicia sessió amb
     privacy_policy_agreement_html: He llegit i estic d'acord amb la <a href="%{privacy_policy_path}" target="_blank">política de privacitat</a>
     progress:
+      confirm: Confirmar email
       details: Els teus detalls
       review: La nostra revisió
       rules: Accepta les normes
@@ -1102,6 +1111,7 @@ ca:
     setup:
       email_settings_hint_html: Toca l'enllaç que t'hem enviat per a verificar %{email}. Esperarem aquí mateix.
       link_not_received: No has rebut l'enllaç?
+      new_confirmation_instructions_sent: Rebràs un nou correu amb l'enllaç de confirmació en pocs minuts!
       title: Comprova la teva safata d'entrada
     sign_in:
       preamble_html: Inicia la sessió amb les teves credencials de <strong>%{domain}</strong>. Si el teu compte es troba a un servidor diferent, no podràs iniciar sessió aquí.
diff --git a/config/locales/doorkeeper.ar.yml b/config/locales/doorkeeper.ar.yml
index 3cecbd495a6f57..79e6c60152235b 100644
--- a/config/locales/doorkeeper.ar.yml
+++ b/config/locales/doorkeeper.ar.yml
@@ -136,7 +136,7 @@ ar:
         mutes: تم كتمها
         notifications: الإشعارات
         profile: مِلَفّ مَستُدون التعريفي الخاص بك
-        push: الإشعارات
+        push: الإشعارات المدفوعة
         reports: الشكاوى
         search: البحث
         statuses: المنشورات
diff --git a/config/locales/doorkeeper.sr-Latn.yml b/config/locales/doorkeeper.sr-Latn.yml
index 6445353c1ae4e1..89e84344fd43fa 100644
--- a/config/locales/doorkeeper.sr-Latn.yml
+++ b/config/locales/doorkeeper.sr-Latn.yml
@@ -83,6 +83,7 @@ sr-Latn:
         access_denied: Vlasnik resursa ili autorizacioni server su odbili zahtev.
         credential_flow_not_configured: Tok Resource Owner Password Credentials nije uspeo pošto je Doorkeeper.configure.resource_owner_from_credentials neiskonfigurisan.
         invalid_client: Klijentska identifikacija nije uspela zbog nepoznatog klijenta, zato što klijent nije uključio identifikaciju ili zato što je iskorišćen nepodržani identifikacioni metod.
+        invalid_code_challenge_method: Metod izazova koda mora biti S256, običan nije podržan.
         invalid_grant: Zadata identifikaciona dozvola je neispravna, istekla, opozvana, ne poklapa se sa adresom preusmeravanja ili je izdata nekog drugom klijentu.
         invalid_redirect_uri: Uključena adresa preusmeravanja nije ispravna.
         invalid_request:
diff --git a/config/locales/doorkeeper.sr.yml b/config/locales/doorkeeper.sr.yml
index feb0fec3e5e6c6..63b940478495d2 100644
--- a/config/locales/doorkeeper.sr.yml
+++ b/config/locales/doorkeeper.sr.yml
@@ -83,6 +83,7 @@ sr:
         access_denied: Власник ресурса или ауторизациони сервер су одбили захтев.
         credential_flow_not_configured: Ток Resource Owner Password Credentials није успео пошто је Doorkeeper.configure.resource_owner_from_credentials неисконфигурисан.
         invalid_client: Клијентска идентификација није успела због непознатог клијента, зато што клијент није укључио идентификацију или зато што је искоришћен неподржани идентификациони метод.
+        invalid_code_challenge_method: Метод изазова кода мора бити S256, обичан није подржан.
         invalid_grant: Задата идентификациона дозвола је неисправна, истекла, опозвана, не поклапа се са адресом преусмеравања или је издата неког другом клијенту.
         invalid_redirect_uri: Укључена адреса преусмеравања није исправна.
         invalid_request:
diff --git a/config/locales/gd.yml b/config/locales/gd.yml
index 9490590bd48c3e..9592a86c6572a5 100644
--- a/config/locales/gd.yml
+++ b/config/locales/gd.yml
@@ -35,6 +35,7 @@ gd:
       created_msg: Chaidh nòta na maorsainneachd a chruthachadh!
       destroyed_msg: Chaidh nòta na maorsainneachd a mhilleadh!
     accounts:
+      add_email_domain_block: Bac àrainn a’ phuist-d
       approve: Aontaich ris
       approved_msg: Chaidh aontachadh ris an iarrtas clàraidh aig %{username}
       are_you_sure: A bheil thu cinnteach?
@@ -61,6 +62,7 @@ gd:
       demote: Ìslich
       destroyed_msg: Chaidh an dàta aig %{username} a chur air a’ chiutha ach an dèid a sguabadh às an ceann greis bheag
       disable: Reòth
+      disable_sign_in_token_auth: Cuir à comas dearbhadh le tòcan puist-d
       disable_two_factor_authentication: Cuir an dearbhadh dà-cheumnach à comas
       disabled: Reòthte
       display_name: Ainm-taisbeanaidh
@@ -69,6 +71,7 @@ gd:
       email: Post-d
       email_status: Staid a’ phuist-d
       enable: Dì-reòth
+      enable_sign_in_token_auth: Cuir an comas dearbhadh le tòcan puist-d
       enabled: An comas
       enabled_msg: Chaidh an cunntas aig %{username} a dhì-reòthadh
       followers: Luchd-leantainn
@@ -135,6 +138,7 @@ gd:
       resubscribe: Fo-sgrìobh a-rithist
       role: Dreuchd
       search: Lorg
+      search_same_email_domain: Cleachdaichean eile aig a bheil an aon àrainn puist-d
       search_same_ip: Cleachdaichean eile aig a bheil an t-aon IP
       security: Tèarainteachd
       security_measures:
@@ -175,21 +179,26 @@ gd:
         approve_appeal: Thoir aonta ris an ath-thagradh
         approve_user: Aontaich ris a’ chleachdaiche
         assigned_to_self_report: Iomruin an gearan
+        change_email_user: Atharraich post-d a’ chleachdaiche
         change_role_user: Atharraich dreuchd a’ chleachdaiche
         confirm_user: Dearbh an cleachdaiche
         create_account_warning: Cruthaich rabhadh
         create_announcement: Cruthaich brath-fios
+        create_canonical_email_block: Cruthaich bacadh puist-d
         create_custom_emoji: Cruthaich Emoji gnàthaichte
         create_domain_allow: Cruthaich ceadachadh àrainne
         create_domain_block: Cruthaich bacadh àrainne
+        create_email_domain_block: Cruthaich bacadh àrainne puist-d
         create_ip_block: Cruthaich riaghailt IP
         create_unavailable_domain: Cruthaich àrainn nach eil ri fhaighinn
         create_user_role: Cruthaich dreuchd
         demote_user: Ìslich an cleachdaiche
         destroy_announcement: Sguab às am brath-fios
+        destroy_canonical_email_block: Sguab às bacadh a’ phuist-d
         destroy_custom_emoji: Sguab às an t-Emoji gnàthaichte
         destroy_domain_allow: Sguab às ceadachadh na h-àrainne
         destroy_domain_block: Sguab às bacadh na h-àrainne
+        destroy_email_domain_block: Sguab às bacadh na h-àrainne puist-d
         destroy_instance: Purgaidich an àrainn
         destroy_ip_block: Sguab às an riaghailt IP
         destroy_status: Sguab às am post
@@ -197,8 +206,10 @@ gd:
         destroy_user_role: Mill an dreuchd
         disable_2fa_user: Cuir an dearbhadh dà-cheumnach à comas
         disable_custom_emoji: Cuir an t-Emoji gnàthaichte à comas
+        disable_sign_in_token_auth_user: Cuir à comas dearbhadh le tòcan puist-d dhan chleachdaiche
         disable_user: Cuir an cleachdaiche à comas
         enable_custom_emoji: Cuir an t-Emoji gnàthaichte an comas
+        enable_sign_in_token_auth_user: Cuir an comas dearbhadh le tòcan puist-d dhan chleachdaiche
         enable_user: Cuir an cleachdaiche an comas
         memorialize_account: Dèan cuimhneachan dhen chunntas
         promote_user: Àrdaich an cleachdaiche
@@ -228,20 +239,26 @@ gd:
         approve_appeal_html: Dh’aontaich %{name} ri ath-thagradh air co-dhùnadh na maorsainneachd o %{target}
         approve_user_html: Dh’aontaich %{name} ri clàradh o %{target}
         assigned_to_self_report_html: Dh’iomruin %{name} an gearan %{target} dhaibh fhèin
+        change_email_user_html: Dh’atharraich %{name} seòladh puist-d a’ chleachdaiche %{target}
         change_role_user_html: Atharraich %{name} an dreuchd aig %{target}
+        confirm_user_html: Dhearbh %{name} seòladh puist-d a’ chleachdaiche %{target}
         create_account_warning_html: Chuir %{name} rabhadh gu %{target}
         create_announcement_html: Chruthaich %{name} brath-fios %{target} ùr
+        create_canonical_email_block_html: Bhac %{name} am post-d air a bheil an hais %{target}
         create_custom_emoji_html: Luchdaich %{name} suas Emoji %{target} ùr
         create_domain_allow_html: Cheadaich %{name} co-nasgadh leis an àrainn %{target}
         create_domain_block_html: Bhac %{name} an àrainn %{target}
+        create_email_domain_block_html: Bhac %{name} an àrainn puist-d %{target}
         create_ip_block_html: Chruthaich %{name} riaghailt dhan IP %{target}
         create_unavailable_domain_html: Sguir %{name} ris an lìbhrigeadh dhan àrainn %{target}
         create_user_role_html: Chruthaich %{name} an dreuchd %{target}
         demote_user_html: Dh’ìslich %{name} an cleachdaiche %{target}
         destroy_announcement_html: Sguab %{name} às am brath-fios %{target}
+        destroy_canonical_email_block_html: Dhì-bhac %{name} am post-d air a bheil an hais %{target}
         destroy_custom_emoji_html: Sguab %{name} às an Emoji %{target}
         destroy_domain_allow_html: Dì-cheadaich %{name} co-nasgadh leis an àrainn %{target}
         destroy_domain_block_html: Dì-bhac %{name} an àrainn %{target}
+        destroy_email_domain_block_html: Dì-bhac %{name} an àrainn puist-d %{target}
         destroy_instance_html: Purgaidich %{name} an àrainn %{target}
         destroy_ip_block_html: Sguab %{name} às riaghailt dhan IP %{target}
         destroy_status_html: Thug %{name} post aig %{target} air falbh
@@ -249,8 +266,10 @@ gd:
         destroy_user_role_html: Sguab %{name} às an dreuchd %{target}
         disable_2fa_user_html: Chuir %{name} riatanas an dearbhaidh dà-cheumnaich à comas dhan chleachdaiche %{target}
         disable_custom_emoji_html: Chuir %{name} an Emoji %{target} à comas
+        disable_sign_in_token_auth_user_html: Chuir %{name} à comas dearbhadh le tòcan puist-d dha %{target}
         disable_user_html: Chuir %{name} an clàradh a-steach à comas dhan chleachdaiche %{target}
         enable_custom_emoji_html: Chuir %{name} an Emoji %{target} an comas
+        enable_sign_in_token_auth_user_html: Chuir %{name} an comas dearbhadh le tòcan puist-d dha %{target}
         enable_user_html: Chuir %{name} an clàradh a-steach an comas dhan chleachdaiche %{target}
         memorialize_account_html: Rinn %{name} duilleag cuimhneachain dhen chunntas aig %{target}
         promote_user_html: Dh’àrdaich %{name} an cleachdaiche %{target}
@@ -258,6 +277,7 @@ gd:
         reject_user_html: Dhiùlt %{name} an clàradh o %{target}
         remove_avatar_user_html: Thug %{name} avatar aig %{target} air falbh
         reopen_report_html: Dh’fhosgail %{name} an gearan %{target} a-rithist
+        resend_user_html: Chuir %{name} am post-d dearbhaidh airson %{target} a-rithist
         reset_password_user_html: Dh’ath-shuidhich %{name} am facal-faire aig a’ chleachdaiche %{target}
         resolve_report_html: Dh’fhuasgail %{name} an gearan %{target}
         sensitive_account_html: Chuir %{name} comharra gu bheil e frionasach ri meadhan aig %{target}
@@ -428,6 +448,7 @@ gd:
         one: "%{count} oidhirp clàraidh rè na seachdain seo chaidh"
         other: "%{count} oidhirp clàraidh rè na seachdain seo chaidh"
         two: "%{count} oidhirp clàraidh rè na seachdain seo chaidh"
+      created_msg: Chaidh àrainn a’ phuist-d a bhacadh
       delete: Sguab às
       dns:
         types:
@@ -436,8 +457,12 @@ gd:
       new:
         create: Cuir àrainn ris
         resolve: Fuasgail an àrainn
+        title: Bac àrainn puist-d ùr
+      no_email_domain_block_selected: Cha deach bacadh àrainn puist-d sam bith atharrachadh o nach deach gin dhiubh a thaghadh
       not_permitted: Chan eil seo ceadaichte
+      resolved_dns_records_hint_html: Thèid ainm na h-àrainne fhuasgladh nan àrainnean MX a leanas agus an urra riutha-san gun gabh iad ri post-d. Ma bhacas tu àrainn MX, bacaidh seo an clàradh o sheòladh puist-d sam bith a chleachdas an aon àrainn MX fiù ’s ma bhios ainm àrainne eadar-dhealaichte ’ga sealltainn. <strong>Thoir an aire nach bac thu solaraichean puist-d mòra.</strong>
       resolved_through_html: Chaidh fuasgladh slighe %{domain}
+      title: Bacadh àrainnean puist-d
     export_domain_allows:
       new:
         title: Ion-phortaich àrainnean ceadaichte
@@ -599,6 +624,7 @@ gd:
         resolve_description_html: Cha dèid gnìomh sam bith a ghabhail an aghaidh a’ chunntais le gearan air agus thèid an gearan a dhùnadh gun rabhadh a chlàradh.
         silence_description_html: Chan fhaic ach an fheadhainn a tha ’ga leantainn mu thràth no a lorgas a làimh e an cunntas seo agus cuingichidh seo uiread nan daoine a ruigeas e gu mòr. Gabhaidh seo a neo-dhèanamh uair sam bith. Dùinidh seo gach gearan mun chunntas seo.
         suspend_description_html: Cha ghabh an cunntas seo agus an t-susbaint gu leòr aige inntrigeadh gus an dèid a sguabadh às air deireadh na sgeòil agus cha ghabh eadar-ghabhail a dhèanamh leis. Gabhaidh seo a neo-dhèanamh am broinn 30 latha. Dùinidh seo gach gearan mun chunntas seo.
+      actions_description_html: Cuir romhad dè nì thu airson an gearan seo fhuasgladh. Ma chuireas tu peanas air a’ chunntas le gearan air, gheibh iad brath air a’ phost-d mura tagh thu an roinn-seòrsa <strong>Spama</strong>.
       actions_description_remote_html: Cuir romhad dè an gnìomh a ghabhas tu airson an gearan seo fhuasgladh. Cha bheir seo buaidh ach air mar a làimhsicheas am frithealaiche <strong>agadsa</strong> an cunntas cèin seo is mar a nì e conaltradh leis.
       add_to_report: Cuir barrachd ris a’ ghearan
       already_suspended_badges:
@@ -663,6 +689,7 @@ gd:
         delete_data_html: Sguab às a’ phròifil ’s an t-susbaint aig <strong>@%{acct}</strong> an ceann 30 latha mura dèid an cur an gnìomh a-rithist roimhe sin
         preview_preamble_html: 'Gheibh <strong>@%{acct}</strong> rabhadh leis an t-susbaint seo:'
         record_strike_html: Clàraich rabhadh an aghaidh <strong>@%{acct}</strong> airson do chuideachadh ach am bi thu nas teinne le droch-ghiùlan on chunntas seo san àm ri teachd
+        send_email_html: Cuir post-d rabhaidh gu <strong>@%{acct}</strong>
         warning_placeholder: Adhbharan roghainneil eile air gnìomh na maorsainneachd.
       target_origin: Tùs cunntas a’ ghearain
       title: Gearanan
@@ -706,6 +733,7 @@ gd:
         manage_appeals: Stiùireadh ath-thagraidhean
         manage_appeals_description: Leigidh seo le cleachdaichean lèirmheas a dhèanamh air ath-thagraidhean an aghaidh gnìomhan mhaor
         manage_blocks: Stiùireadh nam bacaidhean
+        manage_blocks_description: Leigidh seo le cleachdaichean solaraichean puist-d is seòlaidhean IP a bhacadh
         manage_custom_emojis: Stiùireadh nan Emojis gnàthaichte
         manage_custom_emojis_description: Leigidh seo le cleachdaichean Emojis gnàthaichte a stiùireadh air an fhrithealaiche
         manage_federation: Stiùireadh a’ cho-nasgaidh
@@ -723,6 +751,7 @@ gd:
         manage_taxonomies: Stiùireadh thacsonamaidhean
         manage_taxonomies_description: Leigidh seo le cleachdaichean lèirmheas a dhèanamh air an t-susbaint a tha a’ treandadh agus roghainnean nan tagaichean hais ùrachadh
         manage_user_access: Stiùireadh inntrigeadh chleachdaichean
+        manage_user_access_description: Leigidh seo le cleachdaichean gun cuir iad à comas dearbhadh dà-cheumnach càich, gun atharraich iad an seòladh puist-d aca is gun ath-shuidhich iad am facal-faire aca
         manage_users: Stiùireadh chleachdaichean
         manage_users_description: Leigidh seo le cleachdaichean mion-fhiosrachadh càich a shealltainn agus gnìomhan maoir a ghabhail ’nan aghaidh
         manage_webhooks: Stiùireadh nan webhooks
@@ -797,6 +826,7 @@ gd:
       destroyed_msg: Chaidh an luchdadh suas dhan làrach a sguabadh às!
     software_updates:
       critical_update: Èiginneach – ùraich cho luath ’s a ghabhas
+      description: Mholamaid gun cùm thu an stàladh agad de Mhastodon ùraichte ach am faigh thu buannachd às na càraidhean ’s gleusan as ùire. A bharrachd air sin, bidh e èiginneach aig amannan gun ùraich thu Mastodon gun dàil airson duilgheadasan tèarainteachd a sheachnadh. Seo as adhbhar gun doir Mastodon sùil airson ùrachaidhean gach leth-uair a thìde ’s gun cuir e brath thugad a-rèir nan roghainnean puist-d agad.
       documentation_link: Barrachd fiosrachaidh
       release_notes: Nòtaichean sgaoilidh
       title: Ùrachaidhean a tha ri fhaighinn
@@ -905,10 +935,16 @@ gd:
     trends:
       allow: Ceadaich
       approved: Aontaichte
+      confirm_allow: A bheil thu cinnteach gu bheil thu airson na tagaichean a thagh thu a cheadachadh?
+      confirm_disallow: A bheil thu cinnteach gu bheil thu airson na tagaichean a thagh thu a dhì-cheadachadh?
       disallow: Na ceadaich
       links:
         allow: Ceadaich an ceangal
         allow_provider: Ceadaich am foillsichear
+        confirm_allow: A bheil thu cinnteach gu bheil thu airson na ceanglaichean a thagh thu a cheadachadh?
+        confirm_allow_provider: A bheil thu cinnteach gu bheil thu airson na solaraichean a thagh thu a cheadachadh?
+        confirm_disallow: A bheil thu cinnteach gu bheil thu airson na ceanglaichean a thagh thu a dhì-cheadachadh?
+        confirm_disallow_provider: A bheil thu cinnteach gu bheil thu airson na solaraichean a thagh thu a dhì-cheadachadh?
         description_html: Seo na ceanglaichean a tha ’gan co-roinneadh le iomadh cunntas on a chì am frithealaiche agad na postaichean. Faodaidh iad a bhith ’nan cuideachadh dhan luchd-cleachdaidh ach am faigh iad a-mach dè tha tachairt air an t-saoghal. Cha dèid ceanglaichean a shealltainn gu poblach gus an aontaich thu ris an fhoillsichear. ’S urrainn dhut ceanglaichean àraidh a cheadachadh no a dhiùltadh cuideachd.
         disallow: Na ceadaich an ceangal
         disallow_provider: Na ceadaich am foillsichear
@@ -934,6 +970,10 @@ gd:
       statuses:
         allow: Ceadaich am post
         allow_account: Ceadaich an t-ùghdar
+        confirm_allow: A bheil thu cinnteach gu bheil thu airson na puist a thagh thu a cheadachadh?
+        confirm_allow_account: A bheil thu cinnteach gu bheil thu airson na cunntasan a thagh thu a cheadachadh?
+        confirm_disallow: A bheil thu cinnteach gu bheil thu airson na puist a thagh thu a dhì-cheadachadh?
+        confirm_disallow_account: A bheil thu cinnteach gu bheil thu airson na cunntasan a thagh thu a dhì-cheadachadh?
         description_html: Seo na postaichean air a bheil am frithealaiche agad eòlach ’s a tha ’gan co-roinneadh is ’nan annsachd gu tric aig an àm seo. Faodaidh iad a bhith ’nan cuideachadh dhan luchd-cleachdaidh ùr no a thill ach an lorg iad daoine airson an leantainn. Cha dèid postaichean a shealltainn gu poblach gus an gabh thu ris an ùghdar agus gus an aontaich an t-ùghdar gun dèid an cunntas aca a mholadh do dhaoine eile. ’S urrainn dhut postaichean àraidh a cheadachadh no a dhiùltadh cuideachd.
         disallow: Na ceadaich am post
         disallow_account: Na ceadaich an t-ùghdar
@@ -970,6 +1010,7 @@ gd:
           one: Chaidh a chleachdadh le %{count} rè na seachdain seo chaidh
           other: Chaidh a chleachdadh le %{count} rè na seachdain seo chaidh
           two: Chaidh a chleachdadh le %{count} rè na seachdain seo chaidh
+      title: Molaidhean ⁊ treandaichean
       trending: A’ treandadh
     warning_presets:
       add_new: Cuir fear ùr ris
@@ -1056,7 +1097,9 @@ gd:
       guide_link_text: "’S urrainn do neach sam bith cuideachadh."
     sensitive_content: Susbaint fhrionasach
   application_mailer:
+    notification_preferences: Atharraich roghainnean a’ phuist-d
     salutation: "%{name},"
+    settings: 'Atharraich roghainnean a’ phuist-d: %{link}'
     unsubscribe: Cuir crìoch air an fho-sgrìobhadh
     view: 'Faic:'
     view_profile: Seall a’ phròifil
@@ -1076,6 +1119,7 @@ gd:
       hint_html: Dìreach aon rud eile! Feumaidh sinn dearbhadh gu bheil thu daonna (ach am fàg sinn an spama aig an doras!). Fuasgail an CAPTCHA gu h-ìosal is briog air “Lean air adhart”.
       title: Deuchainn tèarainteachd
     confirmations:
+      awaiting_review: Chaidh am post-d agad a dhearbhadh! Nì an sgioba aig %{domain} lèirmheas air a’ chlàradh agad a-nis. Gheibh thu post-d nuair a bhios iad air aontachadh ris a’ chunntas agad!
       awaiting_review_title: Tha an cunntas agad ’ga sgrùdadh
       clicking_this_link: briogadh air a’ cheangal seo
       login_link: clàradh a-steach
@@ -1083,6 +1127,7 @@ gd:
       redirect_to_app_html: Bu chòir dhuinn d’ ath-stiùireadh gu aplacaid <strong>%{app_name}</strong>. Mur an do dh’obraich sin, feuch %{clicking_this_link} no till dhan aplacaid a làimh.
       registration_complete: Tha an clàradh agad air %{domain} deiseil a-nis!
       welcome_title: Fàilte ort, %{name}!
+      wrong_email_hint: Mur eil an seòladh puist-d seo mar bu chòir, ’s urrainn dhut atharrachadh ann an roghainnean a’ chunntais.
     delete_account: Sguab às an cunntas
     delete_account_html: Nam bu mhiann leat an cunntas agad a sguabadh às, <a href="%{path}">nì thu an-seo e</a>. Thèid dearbhadh iarraidh ort.
     description:
@@ -1103,6 +1148,7 @@ gd:
     or_log_in_with: No clàraich a-steach le
     privacy_policy_agreement_html: Leugh mi is tha mi ag aontachadh ris a’ <a href="%{privacy_policy_path}" target="_blank">phoileasaidh prìobhaideachd</a>
     progress:
+      confirm: Dearbh am post-d
       details: Am fiosrachadh agad
       review: An lèirmheas againn
       rules: Gabh ris na riaghailtean
@@ -1124,8 +1170,10 @@ gd:
     security: Tèarainteachd
     set_new_password: Suidhich facal-faire ùr
     setup:
+      email_below_hint_html: Thoir sùil air pasgan an spama agad no iarr fear eile. ’S urrainn dhut an seòladh puist-d agad a chur ceart ma tha e ceàrr.
       email_settings_hint_html: Briog air a’ cheangal a chuir sinn thugad a dhearbhadh %{email}. Fuirichidh sinn ort an-seo.
       link_not_received: Nach d’fhuair thu ceangal?
+      new_confirmation_instructions_sent: Gheibh thu post-d ùr le ceangal dearbhaidh an ceann corra mionaid!
       title: Thoir sùil air a’ bhogsa a-steach agad
     sign_in:
       preamble_html: Clàraich a-steach le do theisteas <strong>%{domain}</strong>. Ma tha an cunntas agad ’ga òstadh air frithealaiche eile, chan urrainn dhut clàradh a-steach an-seo.
@@ -1136,7 +1184,9 @@ gd:
       title: Suidhicheamaid %{domain} dhut.
     status:
       account_status: Staid a’ chunntais
+      confirming: A’ feitheamh air coileanadh an dearbhaidh on phost-d.
       functional: Tha an cunntas agad ag obair gu slàn.
+      pending: Feumaidh an sgioba againn lèirmheas a dhèanamh air d’ iarrtas. Dh’fhaoidte gun doir seo greis. Gheibh thu post-d nuair a bhios sinn air aontachadh ri d’ iarrtas.
       redirecting_to: Chan eil an cunntas gad gnìomhach on a tha e ’ga ath-stiùireadh gu %{acct}.
       self_destruct: On a tha %{domain} gu bhith dùnadh, chan fhaigh thu ach inntrigeadh cuingichte dhan chunntas agad.
       view_strikes: Seall na rabhaidhean a fhuair an cunntas agad roimhe
@@ -1179,6 +1229,9 @@ gd:
       before: 'Mus lean thu air adhart, leugh na nòtaichean seo gu cùramach:'
       caches: Dh’fhaoidte gum mair susbaint ann an tasgadain fhrithealaichean eile
       data_removal: Thèid na postaichean agad ’s dàta eile a thoirt air falbh gu buan
+      email_change_html: ’S urrainn dhut <a href="%{path}">an seòladh puist-d agad atharrachadh</a> gun a bhith a’ sguabadh às a’ chunntais agad
+      email_contact_html: Mura faigh thu fhathast e, ’s urrainn dhut post-d a chur gu <a href="mailto:%{email}">%{email}</a> airson cuideachaidh
+      email_reconfirmation_html: Mur an d’ fhuair thu am post-d dearbhaidh, ’s urrainn dhut <a href="%{path}">iarraidh a-rithist</a>
       irreversible: Chan urrainn dhut an cunntas agad aiseag no ath-ghnìomhachadh
       more_details_html: Airson barrachd fiosrachaidh faic am <a href="%{terms_path}">poileasaidh prìobhaideachd</a>.
       username_available: Bidh an t-ainm-cleachdaiche agad ri fhaighinn a-rithist
@@ -1427,6 +1480,7 @@ gd:
     authentication_methods:
       otp: aplacaid dearbhaidh dhà-cheumnaich
       password: facal-faire
+      sign_in_token: cuir còd tèarainteachd air a’ phost-d
       webauthn: iuchraichean tèarainteachd
     description_html: Ma chì thu gnìomhachd nach aithnich thu, mholamaid gun atharraich thu am facal-faire agad ’s gun cuir thu an dearbhadh dà-cheumnach an comas.
     empty: Chan eil eachdraidh an dearbhaidh ri fhaighinn
@@ -1437,6 +1491,16 @@ gd:
     unsubscribe:
       action: Tha, cuir crìoch air an fho-sgrìobhadh
       complete: Chaidh crìoch a chur air an fho-sgrìobhadh
+      confirmation_html: A bheil thu cinnteach nach eil thu airson %{type} fhaighinn tuilleadh o Mhastodon air %{domain} dhan post-d agad aig %{email}? ’S urrainn dhut fo-sgrìobhadh a-rithist uair sam bith o <a href="%{settings_path}">roghainnean a’ puist-d agad</a>.
+      emails:
+        notification_emails:
+          favourite: puist-d le brathan mu annsachdan
+          follow: puist-d le brathan mu leantainn
+          follow_request: puist-d le brathan mu iarrtasan leantainn
+          mention: puist-d le brathan mu iomraidhean
+          reblog: puist-d le brathan mu bhrosnachaidhean
+      resubscribe_html: Ma chuir thu crìoch air an fho-sgrìobhadh le mearachd, ’s urrainn dhut fo-sgrìobhadh a-rithist o <a href="%{settings_path}">roghainnean a’ puist-d agad</a>.
+      success_html: Chan fhaigh thu %{type} o Mhastodon air %{domain} dhan phost-d agad aig %{email} tuilleadh.
       title: Cuir crìoch air an fho-sgrìobhadh
   media_attachments:
     validations:
@@ -1517,6 +1581,8 @@ gd:
     update:
       subject: Dheasaich %{name} post
   notifications:
+    administration_emails: Brathan puist-d na rianachd
+    email_events: Tachartasan nam brathan puist-d
     email_events_hint: 'Tagh na tachartasan dhan a bheil thu airson brathan fhaighinn:'
   number:
     human:
@@ -1675,6 +1741,7 @@ gd:
     import: Ion-phortadh
     import_and_export: Ion-phortadh ⁊ às-phortadh
     migrate: Imrich cunntais
+    notifications: Brathan puist-d
     preferences: Roghainnean
     profile: Pròifil phoblach
     relationships: Dàimhean leantainn
@@ -1935,6 +2002,7 @@ gd:
     invalid_otp_token: Còd dà-cheumnach mì-dhligheach
     otp_lost_help_html: Ma chaill thu an t-inntrigeadh dhan dà chuid diubh, ’s urrainn dhut fios a chur gu %{email}
     rate_limited: Cus oidhirpean dearbhaidh, feuch ris a-rithist an ceann greis.
+    seamless_external_login: Rinn thu clàradh a-steach le seirbheis on taobh a-muigh, mar sin chan eil roghainnean an fhacail-fhaire ’s a’ phuist-d ri làimh dhut.
     signed_in_as: 'Chlàraich thu a-steach mar:'
   verification:
     extra_instructions_html: <strong>Gliocas:</strong>Faodaidh an ceangal air an làrach-lìn agad a bhith do-fhaicsinneach. ’S e <code>rel="me"</code> a tha sa phàirt chudromach a bhacas riochd cuideigin eile air làraichean-lìn le susbaint air a gintinn o chleachdaiche. ’S urrainn dhut fiù taga <code>link</code> a chleachdadh ann am bann-cinn na duilleige seach <code>a</code> ach feumaidh sinn an HTML ruigsinn gun a bhith a’ ruith JavaScript.
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 03bfa646bab4bb..dc548c0f36bf82 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -29,6 +29,7 @@ ko:
       created_msg: 중재 참고사항을 만들었습니다!
       destroyed_msg: 중재 참고사항을 지웠습니다!
     accounts:
+      add_email_domain_block: 이메일 도메인 차단
       approve: 허가
       approved_msg: 성공적으로 %{username}의 가입 신청서를 승인했습니다
       are_you_sure: 확실합니까?
@@ -55,6 +56,7 @@ ko:
       demote: 강등
       destroyed_msg: "%{username}의 데이터는 곧 삭제되도록 대기열에 들어갔습니다"
       disable: 동결
+      disable_sign_in_token_auth: 이메일 토큰 인증 비활성화
       disable_two_factor_authentication: 2단계 인증을 비활성화
       disabled: 동결됨
       display_name: 표시되는 이름
@@ -63,6 +65,7 @@ ko:
       email: 이메일
       email_status: 이메일 상태
       enable: 동결 해제
+      enable_sign_in_token_auth: 이메일 토큰 인증 활성화
       enabled: 활성
       enabled_msg: "%{username}의 동결을 성공적으로 해제 했습니다."
       followers: 팔로워
@@ -126,6 +129,7 @@ ko:
       resubscribe: 다시 구독
       role: 역할
       search: 검색
+      search_same_email_domain: 같은 이메일 도메인을 가진 다른 사용자들
       search_same_ip: 같은 IP의 다른 사용자들
       security: 보안
       security_measures:
@@ -166,21 +170,26 @@ ko:
         approve_appeal: 이의제기 승인
         approve_user: 사용자 승인
         assigned_to_self_report: 신고 맡기
+        change_email_user: 사용자 이메일 변경
         change_role_user: 사용자 역할 변경
         confirm_user: 사용자 확인
         create_account_warning: 경고 생성
         create_announcement: 공지사항 생성
+        create_canonical_email_block: 이메일 차단 생성
         create_custom_emoji: 커스텀 에모지 생성
         create_domain_allow: 도메인 허용 생성
         create_domain_block: 도메인 차단 추가
+        create_email_domain_block: 이메일 도메인 차단 생성
         create_ip_block: IP 규칙 만들기
         create_unavailable_domain: 사용 불가능한 도메인 생성
         create_user_role: 역할 생성
         demote_user: 사용자 강등
         destroy_announcement: 공지사항 삭제
+        destroy_canonical_email_block: 이메일 차단 삭제
         destroy_custom_emoji: 커스텀 에모지 삭제
         destroy_domain_allow: 도메인 허용 삭제
         destroy_domain_block: 도메인 차단 삭제
+        destroy_email_domain_block: 이메일 도메인 차단 삭제
         destroy_instance: 도메인 제거
         destroy_ip_block: IP 규칙 삭제
         destroy_status: 게시물 삭제
@@ -188,8 +197,10 @@ ko:
         destroy_user_role: 역할 삭제
         disable_2fa_user: 2단계 인증 비활성화
         disable_custom_emoji: 커스텀 에모지 비활성화
+        disable_sign_in_token_auth_user: 사용자의 이메일 토큰 인증 비활성화
         disable_user: 사용자 비활성화
         enable_custom_emoji: 커스텀 에모지 활성화
+        enable_sign_in_token_auth_user: 사용자의 이메일 토큰 인증 활성화
         enable_user: 사용자 활성화
         memorialize_account: 고인의 계정으로 전환
         promote_user: 사용자 승급
@@ -219,20 +230,26 @@ ko:
         approve_appeal_html: "%{name} 님이 %{target}의 중재 결정에 대한 이의 제기를 승인했습니다"
         approve_user_html: "%{name} 님이 %{target} 님의 가입을 승인했습니다"
         assigned_to_self_report_html: "%{name} 님이 신고 %{target}을 자신에게 할당했습니다"
+        change_email_user_html: "%{name} 님이 %{target} 님의 이메일 주소를 변경했습니다"
         change_role_user_html: "%{name} 님이 %{target} 님의 역할을 수정했습니다"
+        confirm_user_html: "%{name} 님이 %{target} 님의 이메일 주소를 승인했습니다"
         create_account_warning_html: "%{name} 님이 %{target}에게 경고를 보냈습니다"
         create_announcement_html: "%{name} 님이 새 공지 %{target}을 만들었습니다"
+        create_canonical_email_block_html: "%{name} 님이 %{target} 해시를 가진 이메일을 차단했습니다"
         create_custom_emoji_html: "%{name} 님이 새로운 에모지 %{target}를 업로드 했습니다"
         create_domain_allow_html: "%{name} 님이 %{target} 도메인을 허용리스트에 넣었습니다"
         create_domain_block_html: "%{name} 님이 도메인 %{target}를 차단했습니다"
+        create_email_domain_block_html: "%{name} 님이 이메일 도메인 %{target}를 차단했습니다"
         create_ip_block_html: "%{name} 님이 IP 규칙 %{target}을 만들었습니다"
         create_unavailable_domain_html: "%{name} 님이 도메인 %{target}에 대한 전달을 중지했습니다"
         create_user_role_html: "%{name} 님이 %{target} 역할을 생성했습니다"
         demote_user_html: "%{name} 님이 사용자 %{target} 님을 강등했습니다"
         destroy_announcement_html: "%{name} 님이 공지 %{target}을 삭제했습니다"
+        destroy_canonical_email_block_html: "%{name} 님이 %{target} 해시를 가진 이메일을 차단 해제했습니다"
         destroy_custom_emoji_html: "%{name} 님이 에모지 %{target}를 삭제했습니다"
         destroy_domain_allow_html: "%{name} 님이 %{target} 도메인과의 연합을 금지했습니다"
         destroy_domain_block_html: "%{name} 님이 도메인 %{target}의 차단을 해제했습니다"
+        destroy_email_domain_block_html: "%{name} 님이 이메일 도메인 %{target}을 차단 해제하였습니다"
         destroy_instance_html: "%{name} 님이 도메인 %{target}를 제거했습니다"
         destroy_ip_block_html: "%{name} 님이 IP 규칙 %{target}을 삭제하였습니다"
         destroy_status_html: "%{name} 님이 %{target} 님의 게시물을 삭제했습니다"
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index dfcfcf12711648..6cd647e7404161 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -449,7 +449,7 @@ lt:
       moderation:
         all: Visi
         limited: Limituotas
-        title: Moderacija
+        title: Prižiūrėjimas
       public_comment: Viešas komentaras
       title: Federacija
       total_blocked_by_us: Mes užblokavome
@@ -1116,6 +1116,7 @@ lt:
     keep_self_bookmark: Laikyti įrašus, kuriuos pažymėjai
     keep_self_bookmark_hint: Neištrina tavo pačių įrašų, jei esi juos pažymėjęs (-usi)
     keep_self_fav_hint: Neištrina tavo pačių įrašų, jei esi juos pamėgęs (-usi)
+    min_age_label: Amžiaus riba
   stream_entries:
     sensitive_content: Jautrus turinys
   themes:
diff --git a/config/locales/simple_form.ar.yml b/config/locales/simple_form.ar.yml
index f6d177badfd650..e552b42b187080 100644
--- a/config/locales/simple_form.ar.yml
+++ b/config/locales/simple_form.ar.yml
@@ -211,6 +211,7 @@ ar:
         setting_default_privacy: خصوصية المنشور
         setting_default_sensitive: اعتبر الوسائط دائما كمحتوى حساس
         setting_delete_modal: إظهار مربع حوار التأكيد قبل حذف أي منشور
+        setting_disable_hover_cards: تعطيل معاينة الملف الشخصي عند التمرير
         setting_disable_swiping: تعطيل حركات التمرير
         setting_display_media: عرض الوسائط
         setting_display_media_default: افتراضي
@@ -294,7 +295,7 @@ ar:
         follow_request: ابعث بريدا إلكترونيا عندما يقوم أحدهم بإرسال طلب بالمتابعة
         mention: ابعث بريداً إلكترونيًا عندما يُشير إليك أو يذكُرك أحدهم
         pending_account: ابعث رسالة إلكترونية إن كان هناك حساب جديد بحاجة إلى مراجعة
-        reblog: ابعث بريداً إلكترونيًا عندما يقوم أحدهم بترقية منشورك
+        reblog: عندما يقوم أحدهم بإعادة نشر منشورك
         report: هناك إبلاغ جديد تم إرساله
         software_updates:
           all: إشعاري عند توفّر كافة التحديثات
diff --git a/config/locales/simple_form.sr-Latn.yml b/config/locales/simple_form.sr-Latn.yml
index e163de2f80a764..527c5e0a1fd496 100644
--- a/config/locales/simple_form.sr-Latn.yml
+++ b/config/locales/simple_form.sr-Latn.yml
@@ -314,6 +314,7 @@ sr-Latn:
         listable: Dozvoli da se ova heš oznaka pojavljuje u pretragama i predlozima
         name: Heš oznaka
         trendable: Dozvoli da se ova heš oznaka pojavi u okviru trendova
+        usable: Dozvoli objavama da lokalno koriste ovu heš oznaku
       user:
         role: Uloga
         time_zone: Vremenska zona
diff --git a/config/locales/simple_form.sr.yml b/config/locales/simple_form.sr.yml
index d7142390c91db0..d541c0b49c9986 100644
--- a/config/locales/simple_form.sr.yml
+++ b/config/locales/simple_form.sr.yml
@@ -314,6 +314,7 @@ sr:
         listable: Дозволи да се ова хеш ознака појављује у претрагама и предлозима
         name: Хеш ознака
         trendable: Дозволи да се ова хеш ознака појави у оквиру трендова
+        usable: Дозволи објавама да локално користе ову хеш ознаку
       user:
         role: Улога
         time_zone: Временска зона
diff --git a/config/locales/simple_form.uk.yml b/config/locales/simple_form.uk.yml
index 7d7f0fc7657ddf..12067148690350 100644
--- a/config/locales/simple_form.uk.yml
+++ b/config/locales/simple_form.uk.yml
@@ -314,6 +314,7 @@ uk:
         listable: Дозволити появу цього хештеґа у каталозі пошуку і пропозицій
         name: Хештеґ
         trendable: Дозволити появу цього хештеґа у списку популярних хештеґів
+        usable: Дозволити дописам використовувати цей хештег локально
       user:
         role: Роль
         time_zone: Часовий пояс
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index cb0aff8a3eb75d..3384049a11a676 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -35,6 +35,7 @@ sl:
       created_msg: Opomba moderiranja je uspešno ustvarjena!
       destroyed_msg: Opomba moderiranja je uspešno uničena!
     accounts:
+      add_email_domain_block: Blokiraj domeno e-pošte
       approve: Odobri
       approved_msg: Uspešno odobrena vloga prijave uporabnika %{username}
       are_you_sure: Ali ste prepričani?
@@ -61,6 +62,7 @@ sl:
       demote: Ponižaj
       destroyed_msg: Podatki uporabnika %{username} so zdaj v vrsti za trajen izbris
       disable: Zamrzni
+      disable_sign_in_token_auth: Onemogoči overjanje z žetonom po e-pošti
       disable_two_factor_authentication: Onemogoči 2FA
       disabled: Zamrznjeno
       display_name: Pojavno ime
@@ -69,6 +71,7 @@ sl:
       email: E-naslov
       email_status: Stanje e-naslova
       enable: Odmrzni
+      enable_sign_in_token_auth: Omogoči overjanje z žetonom po e-pošti
       enabled: Omogočeno
       enabled_msg: Uspešno odmrznjen račun uporabnika %{username}
       followers: Sledilci
@@ -135,6 +138,7 @@ sl:
       resubscribe: Ponovno se naroči
       role: Vloga
       search: Iskanje
+      search_same_email_domain: Drugi uporabniki z isto e-poštno domeno
       search_same_ip: Drugi uporabniki z istim IP
       security: Varnost
       security_measures:
@@ -175,21 +179,26 @@ sl:
         approve_appeal: Odobri pritožbo
         approve_user: Odobri uporabnika
         assigned_to_self_report: Dodeli prijavo
+        change_email_user: Spremeni e-naslov uporabnika
         change_role_user: Spremeni vlogo uporabnika
         confirm_user: Potrdi uporabnika
         create_account_warning: Ustvari opozorilo
         create_announcement: Ustvari obvestilo
+        create_canonical_email_block: Ustvari blokado e-naslova
         create_custom_emoji: Ustvari emotikon po meri
         create_domain_allow: Ustvari odobritev domene
         create_domain_block: Ustvari blokado domene
+        create_email_domain_block: Ustvari blokado domene e-pošte
         create_ip_block: Ustvari pravilo IP
         create_unavailable_domain: Ustvari domeno, ki ni na voljo
         create_user_role: Ustvari vlogo
         demote_user: Ponižaj uporabnika
         destroy_announcement: Izbriši obvestilo
+        destroy_canonical_email_block: Izbriši blokado e-naslova
         destroy_custom_emoji: Izbriši emotikon po meri
         destroy_domain_allow: Izbriši odobritev domene
         destroy_domain_block: Izbriši blokado domene
+        destroy_email_domain_block: Izbriši blokado domene e-pošte
         destroy_instance: Očisti domeno
         destroy_ip_block: Izbriši pravilo IP
         destroy_status: Izbriši objavo
@@ -197,8 +206,10 @@ sl:
         destroy_user_role: Uniči vlogo
         disable_2fa_user: Onemogoči
         disable_custom_emoji: Onemogoči emotikon po meri
+        disable_sign_in_token_auth_user: Onemogoči overjanje z žetonom po e-pošti za uporabnika
         disable_user: Onemogoči uporabnika
         enable_custom_emoji: Omogoči emotikon po meri
+        enable_sign_in_token_auth_user: Omogoči overjanje z žetonom po e-pošti za uporabnika
         enable_user: Omogoči uporabnika
         memorialize_account: Spomenificiraj račun
         promote_user: Povišaj uporabnika
@@ -228,20 +239,26 @@ sl:
         approve_appeal_html: "%{name} je ugodil pritožbi uporabnika %{target} na moderatorsko odločitev"
         approve_user_html: "%{name} je odobril/a registracijo iz %{target}"
         assigned_to_self_report_html: "%{name} je dodelil/a prijavo %{target} sebi"
+        change_email_user_html: "%{name} je spremenil/a naslov e-pošte uporabnika %{target}"
         change_role_user_html: "%{name} je spremenil/a vlogo %{target}"
+        confirm_user_html: "%{name} je potrdil/a naslov e-pošte uporabnika %{target}"
         create_account_warning_html: "%{name} je poslal/a opozorilo %{target}"
         create_announcement_html: "%{name} je ustvarila/a novo obvestilo %{target}"
+        create_canonical_email_block_html: "%{name} je dal/a na črni seznam e-pošto s ključnikom %{target}"
         create_custom_emoji_html: "%{name} je posodobil/a emotikone %{target}"
         create_domain_allow_html: "%{name} je dovolil/a federacijo z domeno %{target}"
         create_domain_block_html: "%{name} je blokiral/a domeno %{target}"
+        create_email_domain_block_html: "%{name} je dal/a na črni seznam e-pošto domene %{target}"
         create_ip_block_html: "%{name} je ustvaril/a pravilo za IP %{target}"
         create_unavailable_domain_html: "%{name} je prekinil/a dostavo v domeno %{target}"
         create_user_role_html: "%{name} je ustvaril/a vlogo %{target}"
         demote_user_html: "%{name} je ponižal/a uporabnika %{target}"
         destroy_announcement_html: "%{name} je izbrisal/a obvestilo %{target}"
+        destroy_canonical_email_block_html: "%{name} je odstranil/a s črnega seznama e-pošto s ključnikom %{target}"
         destroy_custom_emoji_html: "%{name} je izbrisal/a emotikon %{target}"
         destroy_domain_allow_html: "%{name} ni dovolil/a federacije z domeno %{target}"
         destroy_domain_block_html: "%{name} je odblokiral/a domeno %{target}"
+        destroy_email_domain_block_html: "%{name} je odblokiral/a e-pošto domene %{target}"
         destroy_instance_html: "%{name} je očistil/a domeno %{target}"
         destroy_ip_block_html: "%{name} je izbrisal/a pravilo za IP %{target}"
         destroy_status_html: "%{name} je odstranil/a objavo uporabnika %{target}"
@@ -249,8 +266,10 @@ sl:
         destroy_user_role_html: "%{name} je izbrisal/a vlogo %{target}"
         disable_2fa_user_html: "%{name} je onemogočil/a dvofaktorsko zahtevo za uporabnika %{target}"
         disable_custom_emoji_html: "%{name} je onemogočil/a emotikone %{target}"
+        disable_sign_in_token_auth_user_html: "%{name} je onemogočil/a overjanje z žetonom po e-pošti za uporabnika %{target}"
         disable_user_html: "%{name} je onemogočil/a prijavo za uporabnika %{target}"
         enable_custom_emoji_html: "%{name} je omogočil/a emotikone %{target}"
+        enable_sign_in_token_auth_user_html: "%{name} je omogočil/a overjanje z žetonom po e-pošti za uporabnika %{target}"
         enable_user_html: "%{name} je omogočil/a prijavo za uporabnika %{target}"
         memorialize_account_html: "%{name} je spremenil/a račun uporabnika %{target} v spominsko stran"
         promote_user_html: "%{name} je povišal/a uporabnika %{target}"
@@ -258,6 +277,7 @@ sl:
         reject_user_html: "%{name} je zavrnil/a registracijo iz %{target}"
         remove_avatar_user_html: "%{name} je odstranil podobo (avatar) uporabnika %{target}"
         reopen_report_html: "%{name} je ponovno odprl/a prijavo %{target}"
+        resend_user_html: "%{name} je ponovno poslal_a potrditveno e-sporočilo za %{target}"
         reset_password_user_html: "%{name} je ponastavil/a geslo uporabnika %{target}"
         resolve_report_html: "%{name} je razrešil/a prijavo %{target}"
         sensitive_account_html: "%{name} je označil/a medije računa %{target}'s kot občutljive"
@@ -428,6 +448,7 @@ sl:
         one: "%{count} poskus prijave zadnji teden"
         other: "%{count} poskusov prijave zadnji teden"
         two: "%{count} poskusa prijave zadnji teden"
+      created_msg: Domena e-pošte je bila uspešno dodana na črni seznam
       delete: Izbriši
       dns:
         types:
@@ -436,8 +457,12 @@ sl:
       new:
         create: Dodaj domeno
         resolve: Razreši domeno
+        title: Nov vnos e-pošte na črni seznam
+      no_email_domain_block_selected: Nobena domena e-računa ni bila spremenjena, ker nobena ni bila izbrana
       not_permitted: Ni dovoljeno
+      resolved_dns_records_hint_html: Ime domene se razreši na naslednje domene MX, ki so končno odgovorne za sprejemanje e-pošte. Blokiranje domene MX bo blokiralo prijave s poljubnega e-poštnega naslova, ki uporablja isto domeno MX, tudi če je vidno ime domene drugačno. <strong>Pazite, da ne blokirate večjih ponudnikov e-pošte.</strong>
       resolved_through_html: Razrešeno prek %{domain}
+      title: Črni seznam e-pošt
     export_domain_allows:
       new:
         title: Uvozi prepustnice domen
@@ -596,6 +621,7 @@ sl:
         resolve_description_html: Proti prijavljenemu računu ne bo izvedeno nobeno dejanje, noben ukrep ne bo zabeležen in prijava bo zaprta.
         silence_description_html: Račun bo viden samo tistim, ki mu že sled ijo ali ga ročno poiščejo, s čimer bo resno omejen njegov doseg. To je vedno možno povrniti. Zaključi vse prijave zoper ta račun.
         suspend_description_html: Račun in vsa njegova vsebina ne bo dostopna in bo postopoma izbrisana, interakcija z njim pa ne bo več možna. Dejanje je moč povrniti v roku 30 dni. Zaključi vse prijave zoper ta račun.
+      actions_description_html: Odločite se, katere ukrepe boste sprejeli za rešitev te prijave. Če sprejmete kazenski ukrep proti prijavljenemu računu, mu bo poslano e-poštno obvestilo, razen če je izbrana kategorija <strong>Neželena pošta</strong>.
       actions_description_remote_html: Odločite se za dejanje, ki bo odločilo o tej prijavi. To bo vplivalo le na to, kako <strong>vaš</strong> strežnik komunicira s tem oddaljenim računom in obravnava njegovo vsebino.
       add_to_report: Dodaj več v prijavo
       already_suspended_badges:
@@ -660,6 +686,7 @@ sl:
         delete_data_html: Izbriši profil in vsebine <strong>@%{acct}</strong> čez 30 dni, razen če suspenz v tem času ni preklican
         preview_preamble_html: 'Oseba <strong>@%{acct}</strong> bo prejela opozorilo z naslednjo vsebino:'
         record_strike_html: Izdajte opomin računu <strong>@%{acct}</strong>, da boste lažje stopnjevali svoj odziv ob prihodnjih kršitvah s tega računa
+        send_email_html: Pošlji <strong>@%{acct}</strong> opozorilno e-sporočilo
         warning_placeholder: Neobvezna dodatna utemeljitev dejanja moderiranja.
       target_origin: Izvor prijavljenega računa
       title: Prijave
@@ -703,6 +730,7 @@ sl:
         manage_appeals: Upravljaj pritožbe
         manage_appeals_description: Omogoča uporabnikom, da pregledajo pritožbe glede dejanj moderiranja
         manage_blocks: Upravljaj blokirano
+        manage_blocks_description: Omogoča uporabnikom, da blokirajo ponudnike e-pošte in naslove IP
         manage_custom_emojis: Upravljaj emotikone po meri
         manage_custom_emojis_description: Omogoča uporabnikom, da upravljajo emotikone po meri na strežniku
         manage_federation: Upravljaj beli seznam
@@ -720,6 +748,7 @@ sl:
         manage_taxonomies: Upravljaj taksonomije
         manage_taxonomies_description: Omogoča uporabnikom, da preverijo vsebino v trendu in posodobijo nastavitve ključnikov
         manage_user_access: Upravljaj dostop uporabnikov
+        manage_user_access_description: Omogoča uporabnikom, da onemogočijo drugim uporabnikom dvofazno overjanje, spremenijo njihov e-naslov ter ponastavijo njihovo geslo
         manage_users: Upravljaj uporabnike
         manage_users_description: Omogoča uporabnikom, da vidijo podrobnosti drugih uporabnikov in nad njimi izvedejo dejanja moderiranja
         manage_webhooks: Upravljaj spletne zanke
@@ -794,6 +823,7 @@ sl:
       destroyed_msg: Prenos na strežnik uspešno izbrisan!
     software_updates:
       critical_update: Kritično — čim prej posodobite
+      description: Vašo namestitev Mastodona je priporočeno vedno imeti posodobljeno in tako koristiti najnovejše popravke ter zmožnosti. Poleg tega je včasih nujno čim prej posodobiti Mastodon in se s tem izogniti varnostnim težavam. Zato Mastodon vsakih 30 minut preverja razpoložljivost posodobitev in vas o njih obvešča glede na vaše nastavitve obveščanja po e-pošti.
       documentation_link: Več o tem
       release_notes: Opombe ob izdaji
       title: Razpoložljive posodobitve
@@ -881,11 +911,13 @@ sl:
         message_html: "<strong>Vaša predmetna shramba je napačno nastavljena. Zasebnost vaših uporabnikov je izpostavljena tveganjem.</strong>"
     tags:
       moderation:
+        not_trendable: Ni v trendu
         not_usable: Ni uporabno
         pending_review: Čakajoče na pregled
         review_requested: Zahtevan pregled
         reviewed: Pregledano
         title: Stanje
+        trendable: V trendu
         unreviewed: Nepregledano
         usable: Uporabno
       name: Ime
@@ -900,10 +932,16 @@ sl:
     trends:
       allow: Dovoli
       approved: Odobren
+      confirm_allow: Ali ste prepričani, da želite dopustiti izbrane oznake?
+      confirm_disallow: Ali ste prepričani, da želite prepovedati izbrane oznake?
       disallow: Ne dovoli
       links:
         allow: Dovoli povezavo
         allow_provider: Dovoli izdajatelja
+        confirm_allow: Ali ste prepričani, da želite dopustiti izbrane povezave?
+        confirm_allow_provider: Ali ste prepričani, da želite dopustiti izbrane ponudnike?
+        confirm_disallow: Ali ste prepričani, da želite prepovedati izbrane povezave?
+        confirm_disallow_provider: Ali ste prepričani, da želite prepovedati izbrane ponudnike?
         description_html: To so povezave, ki jih trenutno veliko delijo računi, iz katerih vaš strežnik vidi objave. Vašim uporabnikom lahko pomaga izvedeti, kaj se dogaja po svetu. Nobene povezave niso javno prikazane, dokler ne odobrite izdajatelja. Posamezne povezave lahko tudi dovolite ali zavrnete.
         disallow: Ne dovoli povezave
         disallow_provider: Ne dovoli izdajatelja
@@ -929,6 +967,10 @@ sl:
       statuses:
         allow: Dovoli objavo
         allow_account: Dovoli avtorja
+        confirm_allow: Ali ste prepričani, da želite dopustiti izbrana stanja?
+        confirm_allow_account: Ali ste prepričani, da želite dopustiti izbrane račune?
+        confirm_disallow: Ali ste prepričani, da želite prepovedati izbrana stanja?
+        confirm_disallow_account: Ali ste prepričani, da želite prepovedati izbrane račune?
         description_html: To so objave, za katere vaš strežnik ve, da so trenutno v skupni rabi in med priljubljenimi. Vašim novim uporabnikom in uporabnikom, ki se vračajo, lahko pomaga najti več oseb, ki jim bodo sledili. Nobena objava ni javno prikazana, dokler avtorja ne odobrite in avtor ne dovoli, da se njegov račun predlaga drugim. Posamezne objave lahko tudi dovolite ali zavrnete.
         disallow: Ne dovoli objave
         disallow_account: Ne dovoli avtorja
@@ -965,6 +1007,7 @@ sl:
           one: Uporabila %{count} oseba v zadnjem tednu
           other: Uporabilo %{count} oseb v zadnjem tednu
           two: Uporabili %{count} osebi v zadnjem tednu
+      title: Priporočila in trendi
       trending: V porastu
     warning_presets:
       add_new: Dodaj novo
@@ -1051,7 +1094,9 @@ sl:
       guide_link_text: Vsakdo lahko prispeva.
     sensitive_content: Občutljiva vsebina
   application_mailer:
+    notification_preferences: Spremenite e-poštne nastavitve
     salutation: "%{name},"
+    settings: 'Spremenite e-poštne nastavitve: %{link}'
     unsubscribe: Odjavi od naročnine
     view: 'Pogled:'
     view_profile: Ogled profila
@@ -1071,6 +1116,7 @@ sl:
       hint_html: Samo še nekaj. Moramo se prepričati, da ste človek (to nam pomaga pri preprečevanju neželenih vsebin). Rešite spodnji CAPTCHA in kliknite »Nadaljuj«.
       title: Varnostno preverjanje
     confirmations:
+      awaiting_review: Vaš e-poštni naslov je potrjen. Skrbniki %{domain} bodo pregledali vašo prijavo. Če odobrijo vaš račun, boste o tem prejeli e-pošto.
       awaiting_review_title: Vaša prijava se pregleduje
       clicking_this_link: s klikom na to povezavo
       login_link: prijavo
@@ -1078,6 +1124,7 @@ sl:
       redirect_to_app_html: Morali bi biti preusmerjeni na aplikacijo <strong>%{app_name}</strong>. Če se to ni zgodilo, poskusite %{clicking_this_link} ali pa se ročno vrnite na aplikacijo.
       registration_complete: Vaša prijava na %{domain} je sedaj zaključena.
       welcome_title: Pozdravljeni, %{name}!
+      wrong_email_hint: Če ta e-poštni naslov ni pravilen, ga lahko spremenite v nastavitvah računa.
     delete_account: Izbriši račun
     delete_account_html: Če želite izbrisati svoj račun, lahko nadaljujete <a href="%{path}">tukaj</a>. Prosili vas bomo za potrditev.
     description:
@@ -1098,6 +1145,7 @@ sl:
     or_log_in_with: Ali se prijavite z
     privacy_policy_agreement_html: Prebral_a sem in se strinjam s <a href="%{privacy_policy_path}" target="_blank">pravilnikom o zasebnosti</a>.
     progress:
+      confirm: Potrdi e-pošto
       details: Vaši podatki
       review: Naš pregled
       rules: Sprejmi pravila
@@ -1119,8 +1167,10 @@ sl:
     security: Varnost
     set_new_password: Nastavi novo geslo
     setup:
+      email_below_hint_html: Poglejte v mapo neželene pošte ali zaprosite za novega. Če ste podali napačen e-naslov, ga lahko popravite.
       email_settings_hint_html: Kliknite povezavo, ki smo vam jo poslali, da overite %{email}. Počakali bomo.
       link_not_received: Ali ste prejeli povezavo?
+      new_confirmation_instructions_sent: Čez nekaj minut boste prejeli novo e-sporočilo s potrditveno povezavo!
       title: Preverite svojo dohodno e-pošto
     sign_in:
       preamble_html: Prijavite se s svojimi poverilnicami <strong>%{domain}</strong>. Če vaš račun gostuje na drugem strežniku, se tukaj ne boste mogli prijaviti.
@@ -1131,7 +1181,9 @@ sl:
       title: Naj vas namestimo na %{domain}.
     status:
       account_status: Stanje računa
+      confirming: Čakanje na potrditev e-pošte.
       functional: Vaš račun je polno opravilen.
+      pending: Naše osebje preverja vašo prijavo. To lahko traja nekaj časa. Če bo vaša prijava odobrena, boste prejeli e-pošto.
       redirecting_to: Vaš račun ni dejaven, ker trenutno preusmerja na račun %{acct}.
       self_destruct: Ker se %{domain} zapira, boste imeli omejen dostop da svojega računa.
       view_strikes: Pokaži pretekle ukrepe proti mojemu računu
@@ -1174,6 +1226,9 @@ sl:
       before: 'Pred nadaljevanjem previdno preberite naslednje opombe:'
       caches: Vsebina, ki jo medpomnijo drugi strežniki, lahko vztraja
       data_removal: Vaše objave in drugi podatki bodo trajno odstranjeni
+      email_change_html: <a href="%{path}">Svoj e-naslov lahko spremenite</a> brez izbrisa svojega računa
+      email_contact_html: Če še vedno ni dostavljeno, lahko za pomoč pošljete e-sporočilo na naslov <a href="mailto:%{email}">%{email}</a>
+      email_reconfirmation_html: Če niste prejeli potrditvenega e-sporočila, lahko <a href="%{path}">znova zaprosite zanj</a>
       irreversible: Vašega računa ne boste mogli obnoviti ali ponovno aktivirati
       more_details_html: Za podrobnosti glejte <a href="%{terms_path}">politiko zasebnosti</a>.
       username_available: Vaše uporabniško ime bo znova na voljo
@@ -1422,6 +1477,7 @@ sl:
     authentication_methods:
       otp: aplikacija za dvoravenjsko overjanje
       password: geslo
+      sign_in_token: varnostna koda po e-pošti
       webauthn: varnostni ključi
     description_html: Če opazite dejavnost, ki je ne prepoznate kot svoje, razmislite o spremembi svojega gesla in omogočanju dvoravenskega overjanja.
     empty: Zgodovina overjanja ni na voljo
@@ -1432,6 +1488,16 @@ sl:
     unsubscribe:
       action: Da, odjavi me
       complete: Odjavljeni
+      confirmation_html: Ali se res želite odjaviti od prejemanja %{type} za Mastodon na %{domain} na svojo e-pošto %{email}? Kadarkoli se lahko znova prijavite iz svojih <a href="%{settings_path}">nastavitev e-poštnih obvestil</a>.
+      emails:
+        notification_emails:
+          favourite: e-sporočil z obvestili o priljubljenosti
+          follow: e-sporočil z obvestili o sledenju
+          follow_request: e-sporočil o zahtevah za sledenje
+          mention: e-sporočil z obvestili o omembah
+          reblog: e-sporočil z obvestili o izpostavljanju
+      resubscribe_html: Če ste se odjavili po pomoti, se lahko znova prijavite iz svojih <a href="%{settings_path}">nastavitev e-poštnih obvestil</a>.
+      success_html: Nič več ne boste prejemali %{type} za Mastodon na %{domain} na svoj e-naslov %{email}.
       title: Odjavi od naročnine
   media_attachments:
     validations:
@@ -1512,6 +1578,8 @@ sl:
     update:
       subject: "%{name} je uredil(a) objavo"
   notifications:
+    administration_emails: E-poštna obvestila skrbnika
+    email_events: Dogodki za e-obvestila
     email_events_hint: 'Izberite dogodke, za katere želite prejmati obvestila:'
   number:
     human:
@@ -1670,6 +1738,7 @@ sl:
     import: Uvozi
     import_and_export: Uvoz in izvoz
     migrate: Selitev računa
+    notifications: E-poštna obvestila
     preferences: Nastavitve
     profile: Profil
     relationships: Sledenja in sledilci
@@ -1930,6 +1999,7 @@ sl:
     invalid_otp_token: Neveljavna dvofaktorska koda
     otp_lost_help_html: Če ste izgubili dostop do obeh, stopite v stik z %{email}
     rate_limited: Preveč poskusov preverjanja pristnosti, poskusite kasneje.
+    seamless_external_login: Prijavljeni ste prek zunanje storitve, tako da nastavitve gesla in e-pošte niso na voljo.
     signed_in_as: 'Vpisani kot:'
   verification:
     extra_instructions_html: <strong>Nasvet:</strong> Povezava na vaši spletni strani je lahko nevidna. Pomembni del je atribut <code>rel="me"</code>, ki preprečuje lažno predstavljanje na spletnih straneh z uporabniško ustvarjeno vsebino. Namesto oznake <code>a</code> lahko uporabite tudi oznako <code>link</code> znotraj glave (<code>head</code>) spletne strani, vendar mora biti HTML dosegljiv brez izvajanja skript JavaScript.
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index 538400efb8bbc5..d13c42e2630be6 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -1431,6 +1431,14 @@ sq:
     unsubscribe:
       action: Po, shpajtomëni
       complete: U shpajtuat
+      confirmation_html: Jeni i sigurt se doni të shpajtoheni nga marrje %{type} për Mastodon te %{domain} në email-in tuaj %{email}? Mundeni përherë të ripajtoheni që nga <a href="%{settings_path}">rregullimet tuaja për njoftime me email</a>.
+      emails:
+        notification_emails:
+          favourite: email-e njoftimesh parapëlqimesh
+          follow: email-e njoftimesh ndjekjeje
+          follow_request: email-e kërkesash ndjekjeje
+          mention: email-e njoftimesh përmendjesh
+          reblog: email-e njoftimesh përforcimesh
       resubscribe_html: Nëse u shpajtuat gabimisht, mund të ripajtoheni që nga <a href="%{settings_path}">rregullimet tuaja për njoftime me email</a>.
       success_html: S’do të merrni më %{type} për Mastodon te %{domain} në email-in tuaj te %{email}.
       title: Shpajtohuni
@@ -1513,6 +1521,8 @@ sq:
     update:
       subject: "%{name} përpunoi një postim"
   notifications:
+    administration_emails: Njoftime email përgjegjësi
+    email_events: Akte për njoftime email
     email_events_hint: 'Përzgjidhni akte për të cilët doni të merrni njoftime:'
   number:
     human:
@@ -1671,6 +1681,7 @@ sq:
     import: Importo
     import_and_export: Importim dhe eksportim
     migrate: Migrim llogarie
+    notifications: Njoftime me email
     preferences: Parapëlqime
     profile: Profil
     relationships: Ndjekje dhe ndjekës
diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml
index 11e4decd4ca4e8..dfc8a635c8973a 100644
--- a/config/locales/sr-Latn.yml
+++ b/config/locales/sr-Latn.yml
@@ -1885,7 +1885,7 @@ sr-Latn:
   verification:
     extra_instructions_html: <strong>Savet:</strong>Veza na vašem veb sajtu može da bude nevidljiva. Važan deo je <code>rel="me"</code> koji sprečava lažno predstavljanje na veb sajtovima sa sadržajem koji generiše korisnik. Možete čak da koristite oznaku <code>veze</code> u zaglavlju stranice umesto <code>a</code>, ali HTML mora biti dostupan bez izvršavanja JavaScript-a.
     here_is_how: Evo kako
-    hint_html: "<strong>Verifikacija vašeg identiteta na Mastodon-u je za svakoga.</strong> Zasnovano na otvorenim veb standardima, sada i zauvek besplatno. Sve što vam treba je lični veb sajt po kome vas ljudi prepoznaju. Kada se povežete sa ovim veb sajtom sa svog profila, proverićemo da li je veb sajt povezan sa vašim profilom i na njemu ćemo prikazati vizuelni indikator."
+    hint_html: "<strong>Svako može da verifikuje svoj identitet na Mastodon-u.</strong> Zasnovano na otvorenim veb standardima, sada i zauvek besplatno. Sve što vam treba je lični veb sajt po kome vas ljudi prepoznaju. Kada se povežete sa ovim veb sajtom sa svog profila, proverićemo da li je veb sajt povezan sa vašim profilom i na njemu ćemo prikazati vizuelni indikator."
     instructions_html: Kopirajte i nalepite kod ispod u HTML svog veb sajta. Zatim dodajte adresu svog veb sajta u jedno od dodatnih polja na svom profilu sa kartice „Uredi profil” i sačuvajte promene.
     verification: Verifikacija
     verified_links: Vaše verifikovane veze
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 90e25eaf983aa8..2bbc4ef131717a 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -33,6 +33,7 @@ sr:
       created_msg: Модераторска белешка успешно направљена!
       destroyed_msg: Модераторска белешка успешно обрисана!
     accounts:
+      add_email_domain_block: Блокирај домен е-поште
       approve: Одобри
       approved_msg: Захтев за регистрацију корисника %{username} је успешно одобрен
       are_you_sure: Да ли сте сигурни?
@@ -59,6 +60,7 @@ sr:
       demote: Ражалуј
       destroyed_msg: Подаци корисника %{username} су неповратно стављени у ред за брисање
       disable: Замрзни
+      disable_sign_in_token_auth: Онемогући аутентификацију токена е-поште
       disable_two_factor_authentication: Искључи 2FA
       disabled: Замрзнут
       display_name: Име за приказ
@@ -67,6 +69,7 @@ sr:
       email: Е-пошта
       email_status: Статус е-поште
       enable: Омогући
+      enable_sign_in_token_auth: Омогући аутентификацију токена е-поште
       enabled: Омогућен
       enabled_msg: Успешно одлеђен налог корисника %{username}
       followers: Пратиоци
@@ -132,6 +135,7 @@ sr:
       resubscribe: Поново се претплати
       role: Улога
       search: Претрага
+      search_same_email_domain: Остали корисници са истим доменом е-поште
       search_same_ip: Остали корисници са истом IP адресом
       security: Безбедност
       security_measures:
@@ -172,21 +176,26 @@ sr:
         approve_appeal: Уважи жалбу
         approve_user: Одобри корисника
         assigned_to_self_report: Додели пријаву
+        change_email_user: Промени e-адресу за корисника
         change_role_user: Промени улогу корисника
         confirm_user: Потврди корисника
         create_account_warning: Креирај упозорење
         create_announcement: Креирај најаву
+        create_canonical_email_block: Креирај блок е-поште
         create_custom_emoji: Направи прилагођени емоџи
         create_domain_allow: Додај дозвољени домен
         create_domain_block: Додај блокирани домен
+        create_email_domain_block: Креирај блок домена е-поште
         create_ip_block: Направи IP услов
         create_unavailable_domain: Додај домен као недоступан
         create_user_role: Креирај улогу
         demote_user: Смањи овлашћења корисника
         destroy_announcement: Избриши најаву
+        destroy_canonical_email_block: Избриши блок е-поште
         destroy_custom_emoji: Обриши прилагођени емоџи
         destroy_domain_allow: Обриши дозвољени домен
         destroy_domain_block: Обриши блокирани домен
+        destroy_email_domain_block: Избриши блок домена е-поште
         destroy_instance: Очисти домен
         destroy_ip_block: Обриши IP услов
         destroy_status: Избриши пост
@@ -194,8 +203,10 @@ sr:
         destroy_user_role: Уништи позицију
         disable_2fa_user: Онемогући двофакторску аутентификацију
         disable_custom_emoji: Онемогући прилагођене емоџије
+        disable_sign_in_token_auth_user: Онемогући аутентификацију токена е-поште за корисника
         disable_user: Онемогући корисника
         enable_custom_emoji: Омогући прилагођене емоџије
+        enable_sign_in_token_auth_user: Омогући аутентификацију токена е-поште за корисника
         enable_user: Омогући корисника
         memorialize_account: Претвори у меморијални налог
         promote_user: Унапреди корисника
@@ -218,26 +229,33 @@ sr:
         update_custom_emoji: Ажурирај прилагођене емоџије
         update_domain_block: Ажурирај домен блок
         update_ip_block: Ажурирај IP услов
+        update_report: Ажурирај извештај
         update_status: Уреди објаву
         update_user_role: Уреди улогу
       actions:
         approve_appeal_html: "%{name} је уважио жалбу корисника %{target} на одлуку модератора"
         approve_user_html: "%{name} је одобрио/-ла регистрацију корисника %{target}"
         assigned_to_self_report_html: "%{name} је себи доделио/-ла пријаву %{target}"
+        change_email_user_html: "%{name} је променио/ла адресу е-поште за корисника %{target}"
         change_role_user_html: "%{name} је променио/-ла овлашћења корисника %{target}"
+        confirm_user_html: "%{name} је потврдио/ла адресу е-поште за корисника %{target}"
         create_account_warning_html: "%{name} је послао/-ла упозорење кориснику %{target}"
         create_announcement_html: "%{name} је направио/-ла ново саопштење %{target}"
+        create_canonical_email_block_html: "%{name} је блокирао/ла адресу е-поште са хешом %{target}"
         create_custom_emoji_html: "%{name} је отпремио/-ла нове емоџије %{target}"
         create_domain_allow_html: "%{name} је дозволио/-ла федерацију са доменом %{target}"
         create_domain_block_html: "%{name} је блокирао/-ла домен %{target}"
+        create_email_domain_block_html: "%{name} је блокирао/ла домен е-поште %{target}"
         create_ip_block_html: "%{name} је направио/-ла услов за IP адресе %{target}"
         create_unavailable_domain_html: "%{name} је обуставио/-ла испоручивање домену %{target}"
         create_user_role_html: "%{name} је направио/-ла %{target} позицију"
         demote_user_html: "%{name} је смањио овлашћења корисника %{target}"
         destroy_announcement_html: "%{name} је обрисао/-ла саопштење %{target}"
+        destroy_canonical_email_block_html: "%{name} је одблокирао/ла адресу е-поште са хешом %{target}"
         destroy_custom_emoji_html: "%{name} је обрисао/-ла емоџи %{target}"
         destroy_domain_allow_html: "%{name} је забранио/-ла федерацију са доменом %{target}"
         destroy_domain_block_html: "%{name} је одблокирао/-ла домен %{target}"
+        destroy_email_domain_block_html: "%{name} је одблокирао/ла домен е-поште %{target}"
         destroy_instance_html: "%{name} је очистио/-ла домен %{target}"
         destroy_ip_block_html: "%{name} је обрисао/-ла услов за IP адресе %{target}"
         destroy_status_html: "%{name} је избрисао/-ла објаву корисника %{target}"
@@ -245,8 +263,10 @@ sr:
         destroy_user_role_html: "%{name} је избрисао/-ла %{target} позицију"
         disable_2fa_user_html: "%{name} је онемогућио/-ла двофакторску аутентификацију за корисника %{target}"
         disable_custom_emoji_html: "%{name} је онемогућио/-ла емоџи %{target}"
+        disable_sign_in_token_auth_user_html: "%{name} је онемогућио/ла аутентификацију токена е-поште за %{target}"
         disable_user_html: "%{name} је онемогућио/-ла пријављивање за корисника %{target}"
         enable_custom_emoji_html: "%{name} је омогућио/-ла емоџи %{target}"
+        enable_sign_in_token_auth_user_html: "%{name} је омогућио/ла аутентификацију токена е-поште за %{target}"
         enable_user_html: "%{name} је омогућио/-ла пријављивање кориснику %{target}"
         memorialize_account_html: "%{name} је претворио/-ла налог корисника %{target} у меморијалну страницу"
         promote_user_html: "%{name} је унапредио/-ла корисника %{target}"
@@ -254,6 +274,7 @@ sr:
         reject_user_html: "%{name} је одбио/-ла регистрацију корисника %{target}"
         remove_avatar_user_html: "%{name} је уклонио аватар корисника %{target}"
         reopen_report_html: "%{name} је поново отворио/-ла пријаву %{target}"
+        resend_user_html: "%{name} је поништио/ла е-пошту за потврду за %{target}"
         reset_password_user_html: "%{name} је ресетовао/-ла лозинку корисника %{target}"
         resolve_report_html: "%{name} је решио/-ла пријаву %{target}"
         sensitive_account_html: "%{name} је означио/-ла медије налога %{target} као осетљиве"
@@ -419,6 +440,7 @@ sr:
         few: "%{count} покушаја током претходне недеље"
         one: "%{count} покушај током претходне недеље"
         other: "%{count} покушаја регистрације током претходне недеље"
+      created_msg: Успешно блокиран домен е-поште
       delete: Обриши
       dns:
         types:
@@ -427,8 +449,12 @@ sr:
       new:
         create: Додај домен
         resolve: Претвори домен
+        title: Блокирај нови домен е-поште
+      no_email_domain_block_selected: Ниједан блок домена е-поште није промењен јер ниједан није изабран
       not_permitted: Није дозвољено
+      resolved_dns_records_hint_html: Име домена се претвара у следеће MX домене, који су напослетку одговорни за прихватање е-поште. Блокирање MX домена ће блокирати регистрације са сваке адресе е-поште која користи тај MX домен, чак и у случају када се видљиво име домена разликује. <strong>Водите рачуна о томе да не блокирате главне добављаче е-поште.</strong>
       resolved_through_html: Преусмерено кроз %{domain}
+      title: Блокирани домени е-поште
     export_domain_allows:
       new:
         title: Увези дозвољене домене
@@ -453,6 +479,9 @@ sr:
       title: Препоруке за праћење
       unsuppress: Врати препоруку за праћење
     instances:
+      audit_log:
+        title: Недавни записници
+        view_all: Погледај пуне записнике
       availability:
         description_html:
           few: Уколико испорука домену не успе ниједном током <strong>%{count} различитих дана</strong>, даљи покушаји испоруке неће бити иницирани осим уколико се не прими испорука <em>са</em> домена.
@@ -583,6 +612,7 @@ sr:
         resolve_description_html: Ниједна радња неће бити предузета против пријављеног налога, ниједан преступ није уписан и пријава ће бити затворена.
         silence_description_html: Налог ће бити видљив само онима који га већ прате или који га ручно потраже, што ће значајно ограничити његов домет. Ограничење се може повући у сваком тренутку. Затвара све пријаве поднете против овог налога.
         suspend_description_html: Налог и сви његови садржаји ће постати недоступни и у једном тренутку избрисани, а интеракција са налогом више неће бити могућа. Суспензија се може повући у року од 30 дана. Затвара све пријаве поднете против овог налога.
+      actions_description_html: Одлучите коју радњу да спроведете ради решавања ове пријаве. Уколико спроведете казнену радњу против пријављеног налога, власник налога ће бити обавештен путем е-поште, осим уколико ознака <strong>„Нежељене поруке”</strong> није одабрана.
       actions_description_remote_html: Одлучите коју радњу да предузмете ради решавања ове пријаве. Ово ће утицати само на то како <strong>Ваш</strong> сервер комуницира са овим удаљеним налогом и обрађује његов садржај.
       add_to_report: Додај још у пријаву
       already_suspended_badges:
@@ -1885,7 +1915,7 @@ sr:
   verification:
     extra_instructions_html: <strong>Савет:</strong>Веза на вашем веб сајту може да буде невидљива. Важан део је <code>rel="me"</code> који спречава лажно представљање на веб сајтовима са садржајем који генерише корисник. Можете чак да користите ознаку <code>везе</code> у заглављу странице уместо <code>а</code>, али HTML мора бити доступан без извршавања JavaScript-а.
     here_is_how: Ево како
-    hint_html: "<strong>Верификација вашег идентитета на Mastodon-у је за свакога.</strong> Засновано на отвореним веб стандардима, сада и заувек бесплатно. Све што вам треба је лични веб сајт по коме вас људи препознају. Када се повежете са овим веб сајтом са свог профила, проверићемо да ли је веб сајт повезан са вашим профилом и на њему ћемо приказати визуелни индикатор."
+    hint_html: "<strong>Свако може да верификује свој идентитет на Mastodon-у.</strong> Засновано на отвореним веб стандардима, сада и заувек бесплатно. Све што вам треба је лични веб сајт по коме вас људи препознају. Када се повежете са овим веб сајтом са свог профила, проверићемо да ли је веб сајт повезан са вашим профилом и на њему ћемо приказати визуелни индикатор."
     instructions_html: Копирајте и налепите код испод у HTML свог веб сајта. Затим додајте адресу свог веб сајта у једно од додатних поља на свом профилу са картице „Уреди профил” и сачувајте промене.
     verification: Верификација
     verified_links: Ваше верификоване везе
diff --git a/config/locales/th.yml b/config/locales/th.yml
index e3e985f683f67c..efa142fed3ce20 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -56,6 +56,7 @@ th:
       demote: ลดขั้น
       destroyed_msg: ตอนนี้จัดคิวเพื่อลบข้อมูลของ %{username} ในเร็ว ๆ นี้แล้ว
       disable: อายัด
+      disable_sign_in_token_auth: ปิดใช้งานการรับรองความถูกต้องด้วยโทเคนอีเมล
       disable_two_factor_authentication: ปิดใช้งาน 2FA
       disabled: อายัดอยู่
       display_name: ชื่อที่แสดง
@@ -64,6 +65,7 @@ th:
       email: อีเมล
       email_status: สถานะอีเมล
       enable: เลิกอายัด
+      enable_sign_in_token_auth: เปิดใช้งานการรับรองความถูกต้องด้วยโทเคนอีเมล
       enabled: เปิดใช้งานอยู่
       enabled_msg: เลิกอายัดบัญชีของ %{username} สำเร็จ
       followers: ผู้ติดตาม
@@ -127,6 +129,7 @@ th:
       resubscribe: บอกรับใหม่
       role: บทบาท
       search: ค้นหา
+      search_same_email_domain: ผู้ใช้อื่น ๆ ที่มีโดเมนอีเมลเดียวกัน
       search_same_ip: ผู้ใช้อื่น ๆ ที่มี IP เดียวกัน
       security: ความปลอดภัย
       security_measures:
@@ -194,8 +197,10 @@ th:
         destroy_user_role: ทำลายบทบาท
         disable_2fa_user: ปิดใช้งาน 2FA
         disable_custom_emoji: ปิดใช้งานอีโมจิที่กำหนดเอง
+        disable_sign_in_token_auth_user: ปิดใช้งานการรับรองความถูกต้องด้วยโทเคนอีเมลสำหรับผู้ใช้
         disable_user: ปิดใช้งานผู้ใช้
         enable_custom_emoji: เปิดใช้งานอีโมจิที่กำหนดเอง
+        enable_sign_in_token_auth_user: เปิดใช้งานการรับรองความถูกต้องด้วยโทเคนอีเมลสำหรับผู้ใช้
         enable_user: เปิดใช้งานผู้ใช้
         memorialize_account: ทำให้บัญชีเป็นอนุสรณ์
         promote_user: เลื่อนขั้นผู้ใช้
@@ -225,20 +230,26 @@ th:
         approve_appeal_html: "%{name} ได้อนุมัติการอุทธรณ์การตัดสินใจในการกลั่นกรองจาก %{target}"
         approve_user_html: "%{name} ได้อนุมัติการลงทะเบียนจาก %{target}"
         assigned_to_self_report_html: "%{name} ได้มอบหมายรายงาน %{target} ให้กับตนเอง"
+        change_email_user_html: "%{name} ได้เปลี่ยนที่อยู่อีเมลของผู้ใช้ %{target}"
         change_role_user_html: "%{name} ได้เปลี่ยนบทบาทของ %{target}"
+        confirm_user_html: "%{name} ได้ยืนยันที่อยู่อีเมลของผู้ใช้ %{target}"
         create_account_warning_html: "%{name} ได้ส่งคำเตือนไปยัง %{target}"
         create_announcement_html: "%{name} ได้สร้างประกาศใหม่ %{target}"
+        create_canonical_email_block_html: "%{name} ได้ปิดกั้นอีเมลที่มีแฮช %{target}"
         create_custom_emoji_html: "%{name} ได้อัปโหลดอีโมจิใหม่ %{target}"
         create_domain_allow_html: "%{name} ได้อนุญาตการติดต่อกับภายนอกกับโดเมน %{target}"
         create_domain_block_html: "%{name} ได้ปิดกั้นโดเมน %{target}"
+        create_email_domain_block_html: "%{name} ได้ปิดกั้นโดเมนอีเมล %{target}"
         create_ip_block_html: "%{name} ได้สร้างกฎสำหรับ IP %{target}"
         create_unavailable_domain_html: "%{name} ได้หยุดการจัดส่งไปยังโดเมน %{target}"
         create_user_role_html: "%{name} ได้สร้างบทบาท %{target}"
         demote_user_html: "%{name} ได้ลดขั้นผู้ใช้ %{target}"
         destroy_announcement_html: "%{name} ได้ลบประกาศ %{target}"
+        destroy_canonical_email_block_html: "%{name} ได้เลิกปิดกั้นอีเมลที่มีแฮช %{target}"
         destroy_custom_emoji_html: "%{name} ได้ลบอีโมจิ %{target}"
         destroy_domain_allow_html: "%{name} ได้ไม่อนุญาตการติดต่อกับภายนอกกับโดเมน %{target}"
         destroy_domain_block_html: "%{name} ได้เลิกปิดกั้นโดเมน %{target}"
+        destroy_email_domain_block_html: "%{name} ได้เลิกปิดกั้นโดเมนอีเมล %{target}"
         destroy_instance_html: "%{name} ได้ล้างข้อมูลโดเมน %{target}"
         destroy_ip_block_html: "%{name} ได้ลบกฎสำหรับ IP %{target}"
         destroy_status_html: "%{name} ได้เอาโพสต์โดย %{target} ออก"
@@ -246,8 +257,10 @@ th:
         destroy_user_role_html: "%{name} ได้ลบบทบาท %{target}"
         disable_2fa_user_html: "%{name} ได้ปิดใช้งานความต้องการสองปัจจัยสำหรับผู้ใช้ %{target}"
         disable_custom_emoji_html: "%{name} ได้ปิดใช้งานอีโมจิ %{target}"
+        disable_sign_in_token_auth_user_html: "%{name} ได้ปิดใช้งานการรับรองความถูกต้องด้วยโทเคนอีเมลสำหรับ %{target}"
         disable_user_html: "%{name} ได้ปิดใช้งานการเข้าสู่ระบบสำหรับผู้ใช้ %{target}"
         enable_custom_emoji_html: "%{name} ได้เปิดใช้งานอีโมจิ %{target}"
+        enable_sign_in_token_auth_user_html: "%{name} ได้เปิดใช้งานการรับรองความถูกต้องด้วยโทเคนอีเมลสำหรับ %{target}"
         enable_user_html: "%{name} ได้เปิดใช้งานการเข้าสู่ระบบสำหรับผู้ใช้ %{target}"
         memorialize_account_html: "%{name} ได้เปลี่ยนบัญชีของ %{target} เป็นหน้าอนุสรณ์"
         promote_user_html: "%{name} ได้เลื่อนขั้นผู้ใช้ %{target}"
@@ -255,6 +268,7 @@ th:
         reject_user_html: "%{name} ได้ปฏิเสธการลงทะเบียนจาก %{target}"
         remove_avatar_user_html: "%{name} ได้เอาภาพประจำตัวของ %{target} ออก"
         reopen_report_html: "%{name} ได้เปิดรายงาน %{target} ใหม่"
+        resend_user_html: "%{name} ได้ส่งอีเมลการยืนยันสำหรับ %{target} ใหม่"
         reset_password_user_html: "%{name} ได้ตั้งรหัสผ่านของผู้ใช้ %{target} ใหม่"
         resolve_report_html: "%{name} ได้แก้ปัญหารายงาน %{target}"
         sensitive_account_html: "%{name} ได้ทำเครื่องหมายสื่อของ %{target} ว่าละเอียดอ่อน"
@@ -410,6 +424,7 @@ th:
       allow_registrations_with_approval: อนุญาตการลงทะเบียนด้วยการอนุมัติ
       attempts_over_week:
         other: "%{count} ความพยายามในการลงทะเบียนในช่วงสัปดาห์ที่ผ่านมา"
+      created_msg: ปิดกั้นโดเมนอีเมลสำเร็จ
       delete: ลบ
       dns:
         types:
@@ -418,8 +433,12 @@ th:
       new:
         create: เพิ่มโดเมน
         resolve: แปลงที่อยู่โดเมน
+        title: ปิดกั้นโดเมนอีเมลใหม่
+      no_email_domain_block_selected: ไม่มีการเปลี่ยนแปลงการปิดกั้นโดเมนอีเมลเนื่องจากไม่มีการเลือก
       not_permitted: ไม่ได้รับอนุญาต
+      resolved_dns_records_hint_html: ชื่อโดเมนแปลงที่อยู่เป็นโดเมน MX ดังต่อไปนี้ ซึ่งท้ายที่สุดแล้วจะรับผิดชอบสำหรับการยอมรับอีเมล การปิดกั้นโดเมน MX จะปิดกั้นการลงทะเบียนจากที่อยู่อีเมลใด ๆ ซึ่งใช้โดเมน MX เดียวกัน แม้ว่าชื่อโดเมนที่ปรากฏจะแตกต่างกันก็ตาม <strong>ระวังอย่าปิดกั้นผู้ให้บริการอีเมลรายใหญ่</strong>
       resolved_through_html: แปลงที่อยู่ผ่าน %{domain}
+      title: โดเมนอีเมลที่ปิดกั้นอยู่
     export_domain_allows:
       new:
         title: นำเข้าการอนุญาตโดเมน
@@ -569,6 +588,7 @@ th:
         resolve_description_html: จะไม่ใช้การกระทำต่อบัญชีที่รายงาน ไม่มีการบันทึกการดำเนินการ และจะปิดรายงาน
         silence_description_html: บัญชีจะปรากฏแก่เฉพาะผู้ที่ติดตามโปรไฟล์อยู่แล้วหรือค้นหาโปรไฟล์ด้วยตนเองเท่านั้น จำกัดการเข้าถึงของโปรไฟล์อย่างมาก สามารถแปลงกลับได้เสมอ ปิดรายงานต่อบัญชีนี้ทั้งหมด
         suspend_description_html: บัญชีและเนื้อหาของบัญชีทั้งหมดจะเข้าถึงไม่ได้และได้รับการลบในที่สุด และการโต้ตอบกับบัญชีจะเป็นไปไม่ได้ แปลงกลับได้ภายใน 30 วัน ปิดรายงานต่อบัญชีนี้ทั้งหมด
+      actions_description_html: ตัดสินใจว่าการกระทำใดที่จะใช้เพื่อแก้ปัญหารายงานนี้ หากคุณใช้การกระทำที่เป็นการลงโทษต่อบัญชีที่รายงาน จะส่งการแจ้งเตือนอีเมลถึงเขา ยกเว้นเมื่อมีการเลือกหมวดหมู่ <strong>สแปม</strong>
       actions_description_remote_html: ตัดสินใจว่าการกระทำใดที่จะใช้เพื่อแก้ปัญหารายงานนี้ นี่จะมีผลต่อวิธีที่เซิร์ฟเวอร์ <strong>ของคุณ</strong> สื่อสารกับบัญชีระยะไกลนี้และจัดการเนื้อหาของบัญชีเท่านั้น
       add_to_report: เพิ่มข้อมูลเพิ่มเติมไปยังรายงาน
       already_suspended_badges:
@@ -633,6 +653,7 @@ th:
         delete_data_html: ลบโปรไฟล์และเนื้อหาของ <strong>@%{acct}</strong> ในอีก 30 วันนับจากนี้เว้นแต่มีการเลิกระงับเขาในระหว่างนี้
         preview_preamble_html: "<strong>@%{acct}</strong> จะได้รับคำเตือนโดยมีเนื้อหาดังต่อไปนี้:"
         record_strike_html: บันทึกการดำเนินการต่อ <strong>@%{acct}</strong> เพื่อช่วยให้คุณเลื่อนระดับการละเมิดในอนาคตจากบัญชีนี้
+        send_email_html: ส่งอีเมลคำเตือนถึง <strong>@%{acct}</strong>
         warning_placeholder: การให้เหตุผลเพิ่มเติมที่ไม่จำเป็นสำหรับการกระทำการกลั่นกรอง
       target_origin: จุดเริ่มต้นของบัญชีที่ได้รับการรายงาน
       title: รายงาน
@@ -670,6 +691,7 @@ th:
         manage_appeals: จัดการการอุทธรณ์
         manage_appeals_description: อนุญาตให้ผู้ใช้ตรวจทานการอุทธรณ์ต่อการกระทำการกลั่นกรอง
         manage_blocks: จัดการการปิดกั้น
+        manage_blocks_description: อนุญาตให้ผู้ใช้ปิดกั้นผู้ให้บริการอีเมลและที่อยู่ IP
         manage_custom_emojis: จัดการอีโมจิที่กำหนดเอง
         manage_custom_emojis_description: อนุญาตให้ผู้ใช้จัดการอีโมจิที่กำหนดเองในเซิร์ฟเวอร์
         manage_federation: จัดการการติดต่อกับภายนอก
@@ -687,6 +709,7 @@ th:
         manage_taxonomies: จัดการอนุกรมวิธาน
         manage_taxonomies_description: อนุญาตให้ผู้ใช้ตรวจทานเนื้อหาที่กำลังนิยมและอัปเดตการตั้งค่าแฮชแท็ก
         manage_user_access: จัดการการเข้าถึงของผู้ใช้
+        manage_user_access_description: อนุญาตให้ผู้ใช้ปิดใช้งานการรับรองความถูกต้องด้วยสองปัจจัยของผู้ใช้อื่น ๆ เปลี่ยนที่อยู่อีเมลของเขา และตั้งรหัสผ่านของเขาใหม่
         manage_users: จัดการผู้ใช้
         manage_users_description: อนุญาตให้ผู้ใช้ดูรายละเอียดของผู้ใช้อื่น ๆ และทำการกระทำการกลั่นกรองต่อผู้ใช้เหล่านั้น
         manage_webhooks: จัดการเว็บฮุค
@@ -761,6 +784,7 @@ th:
       destroyed_msg: ลบการอัปโหลดไซต์สำเร็จ!
     software_updates:
       critical_update: สำคัญ — โปรดอัปเดตอย่างรวดเร็ว
+      description: ขอแนะนำให้ทำให้การติดตั้ง Mastodon ของคุณทันสมัยอยู่เสมอเพื่อรับประโยชน์จากการแก้ไขและคุณลักษณะล่าสุด ยิ่งไปกว่านั้น บางครั้งก็เป็นสิ่งสำคัญที่จะอัปเดต Mastodon อย่างทันท่วงทีเพื่อหลีกเลี่ยงปัญหาความปลอดภัย ด้วยเหตุผลเหล่านี้ Mastodon จึงตรวจสอบการอัปเดตทุก 30 นาที และจะแจ้งเตือนคุณตามการกำหนดลักษณะการแจ้งเตือนอีเมลของคุณ
       documentation_link: เรียนรู้เพิ่มเติม
       release_notes: บันทึกประจำรุ่น
       title: การอัปเดตที่พร้อมใช้งาน
@@ -867,10 +891,16 @@ th:
     trends:
       allow: อนุญาต
       approved: อนุมัติแล้ว
+      confirm_allow: คุณแน่ใจหรือไม่ว่าต้องการอนุญาตแท็กที่เลือก?
+      confirm_disallow: คุณแน่ใจหรือไม่ว่าต้องการไม่อนุญาตแท็กที่เลือก?
       disallow: ไม่อนุญาต
       links:
         allow: อนุญาตลิงก์
         allow_provider: อนุญาตผู้เผยแพร่
+        confirm_allow: คุณแน่ใจหรือไม่ว่าต้องการอนุญาตลิงก์ที่เลือก?
+        confirm_allow_provider: คุณแน่ใจหรือไม่ว่าต้องการอนุญาตผู้ให้บริการที่เลือก?
+        confirm_disallow: คุณแน่ใจหรือไม่ว่าต้องการไม่อนุญาตลิงก์ที่เลือก?
+        confirm_disallow_provider: คุณแน่ใจหรือไม่ว่าต้องการไม่อนุญาตผู้ให้บริการที่เลือก?
         description_html: นี่คือลิงก์ที่กำลังได้รับการแบ่งปันเป็นจำนวนมากโดยบัญชีที่เซิร์ฟเวอร์ของคุณเห็นโพสต์จากในปัจจุบัน ลิงก์สามารถช่วยให้ผู้ใช้ของคุณค้นหาสิ่งที่กำลังเกิดขึ้นในโลก จะไม่แสดงลิงก์เป็นสาธารณะจนกว่าคุณจะอนุมัติผู้เผยแพร่ คุณยังสามารถอนุญาตหรือปฏิเสธลิงก์แต่ละรายการ
         disallow: ไม่อนุญาตลิงก์
         disallow_provider: ไม่อนุญาตผู้เผยแพร่
@@ -893,6 +923,10 @@ th:
       statuses:
         allow: อนุญาตโพสต์
         allow_account: อนุญาตผู้สร้าง
+        confirm_allow: คุณแน่ใจหรือไม่ว่าต้องการอนุญาตสถานะที่เลือก?
+        confirm_allow_account: คุณแน่ใจหรือไม่ว่าต้องการอนุญาตบัญชีที่เลือก?
+        confirm_disallow: คุณแน่ใจหรือไม่ว่าต้องการไม่อนุญาตสถานะที่เลือก?
+        confirm_disallow_account: คุณแน่ใจหรือไม่ว่าต้องการไม่อนุญาตบัญชีที่เลือก?
         description_html: นี่คือโพสต์ที่เซิร์ฟเวอร์ของคุณทราบเกี่ยวกับที่กำลังได้รับการแบ่งปันและชื่นชอบเป็นจำนวนมากในปัจจุบันในขณะนี้ โพสต์สามารถช่วยให้ผู้ใช้ใหม่และที่กลับมาของคุณค้นหาผู้คนเพิ่มเติมที่จะติดตาม จะไม่แสดงโพสต์เป็นสาธารณะจนกว่าคุณจะอนุมัติผู้สร้าง และผู้สร้างอนุญาตให้เสนอแนะบัญชีของเขาแก่ผู้อื่น คุณยังสามารถอนุญาตหรือปฏิเสธโพสต์แต่ละรายการ
         disallow: ไม่อนุญาตโพสต์
         disallow_account: ไม่อนุญาตผู้สร้าง
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index eeeb117d6caa5b..a7b48dc3204661 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -460,7 +460,9 @@ uk:
         title: Заблокувати новий домен е-пошти
       no_email_domain_block_selected: Налаштування блокування доменів електронної пошти не змінено, оскільки жоден домен вибрано
       not_permitted: Не дозволено
+      resolved_dns_records_hint_html: Доменне ім'я розпізнається на наступних MX-доменах, які в результаті відповідають за приймання електронної пошти. Блокування MX-домену заблокує реєстрацію з будь-якої адреси електронної пошти, яка використовує той самий MX-домен, навіть якщо видиме ім'я домену відрізняється. <strong>Будьте обережні, щоб не заблокувати основних постачальників послуг електронної пошти.</strong>
       resolved_through_html: Розв'язано через %{domain}
+      title: Заблоковані домени електронної пошти
     export_domain_allows:
       new:
         title: Імпорт дозволів домену
@@ -622,6 +624,7 @@ uk:
         resolve_description_html: Не буде застосовано жодних дій проти облікового запису, на який скаржилися, не буде записано попередження, а скаргу буде закрито.
         silence_description_html: Обліковий запис буде видно лише тим, хто вже за ним слідкує, або знайде його вручну, що значно обмежує його охоплення. Може завжди бути повернуто. Закриває всі скарги на цей обліковий запис.
         suspend_description_html: Обліковий запис і весь його вміст будуть недоступними й врешті-решт видалені, і взаємодіяти з ним буде неможливо. Відновлення можливе протягом 30 днів. Закриває всі скарги на цей обліковий запис.
+      actions_description_html: Визначте, які дії слід вжити для розв'язання цієї скарги. Якщо ви оберете каральні дії проти зареєстрованого облікового запису, про них буде надіслано сповіщення електронним листом, крім випадків, коли вибрано категорію <strong>Спам</strong>.
       actions_description_remote_html: Визначте, які дії слід вжити для розв'язання цього звіту. Це вплине тільки на те, як <strong>ваш</strong> сервер з'єднується з цим віддаленим обліковим записом і обробляє його вміст.
       add_to_report: Додати ще подробиць до скарги
       already_suspended_badges:
@@ -686,6 +689,7 @@ uk:
         delete_data_html: Видаліть профіль <strong>@%{acct}</strong> і вміст за останні 30 днів, якщо вони не дія не скасується тим часом
         preview_preamble_html: "<strong>@%{acct}</strong> отримає попередження з таким вмістом:"
         record_strike_html: Запис попередження проти <strong>@%{acct}</strong>, що допоможе вам посилити ваші майбутні санкції проти цього облікового запису
+        send_email_html: Надіслати <strong>"%{acct}</strong> попереджувального електронного листа
         warning_placeholder: Додаткові причини дії модерації.
       target_origin: Походження облікового запису, на який скаржаться
       title: Скарги
@@ -729,6 +733,7 @@ uk:
         manage_appeals: Керувати оскарженнями
         manage_appeals_description: Дозволяє користувачам розглядати оскарження дій модерації
         manage_blocks: Керувати блокуваннями
+        manage_blocks_description: Дозволяє користувачам блокувати постачальників е-пошти та IP-адреси
         manage_custom_emojis: Керувати користувацькими емоджі
         manage_custom_emojis_description: Дозволяє користувачам керувати користувацькими емоджі на сервері
         manage_federation: Керувати федерацією
@@ -746,6 +751,7 @@ uk:
         manage_taxonomies: Керувати таксономіями
         manage_taxonomies_description: Дозволяє користувачам переглядати актуальні налаштування вмісту й оновити хештеґ
         manage_user_access: Керувати доступом користувачів
+        manage_user_access_description: Дозволяє користувачам вимкнути двоетапну перевірку інших користувачів, змінити їхню адресу електронної пошти та відновити пароль
         manage_users: Керувати користувачами
         manage_users_description: Дозволяє користувачам переглядати подробиці інших користувачів і виконувати їхню модерацію
         manage_webhooks: Керувати Webhooks
@@ -820,6 +826,7 @@ uk:
       destroyed_msg: Завантаження сайту успішно видалено!
     software_updates:
       critical_update: Критично — оновіться якнайшвидше
+      description: Радимо постійно оновлювати інсталяцію Mastodon, щоб мати змогу користуватися найновішими виправленнями та функціями. На додаток, іноді дуже важливо вчасно оновлювати Mastodon, щоб уникнути проблем з безпекою. З цих причин Mastodon перевіряє наявність оновлень що 30 хвилин і сповіщає вас про це відповідно до ваших налаштувань сповіщень на електронну пошту.
       documentation_link: Докладніше
       release_notes: Примітки до випуску
       title: Доступні оновлення
@@ -906,16 +913,38 @@ uk:
         action: Перегляньте подробиці тут
         message_html: "<strong>Ваше сховище об'єктів неправильно налаштоване. Приватність ваших користувачів піддається ризику</strong>"
     tags:
+      moderation:
+        not_trendable: Не трендові
+        not_usable: Невикористовувані
+        pending_review: Очікує розгляду
+        review_requested: Запит на розгляд
+        reviewed: Розглянуто
+        title: Статус
+        trendable: У тренді
+        unreviewed: Не розглянуто
+        usable: Можна використати
+      name: Назва
+      newest: Найновіші
+      oldest: Найдавніші
+      reset: Скинути
       review: Переглянути допис
+      search: Пошук
+      title: Хештеги
       updated_msg: Параметри хештеґів успішно оновлені
     title: Адміністрування
     trends:
       allow: Дозволити
       approved: Схвалено
+      confirm_allow: Ви впевнені, що хочете дозволити вибрані теги?
+      confirm_disallow: Ви впевнені, що хочете скасувати дозвіл для вибраних тегів?
       disallow: Заборонити
       links:
         allow: Дозволити посилання
         allow_provider: Дозволити публікатора
+        confirm_allow: Ви впевнені, що хочете дозволити вибрані посилання?
+        confirm_allow_provider: Ви впевнені, що хочете дозволити вибраних постачальників?
+        confirm_disallow: Ви впевнені, що хочете скасувати дозвіл вибраним посиланням?
+        confirm_disallow_provider: Ви впевнені, що хочете скасувати дозвіл вибраним постачальникам?
         description_html: Це посилання, з яких наразі багаторазово поширюються записи, з яких ваш сервер бачить дописи. Це може допомогти вашим користувачам дізнатися, що відбувається у світі. Посилання не показується публічно, поки ви не затверджуєте його публікацію. Ви також можете дозволити або відхилити окремі посилання.
         disallow: Заборонити посилання
         disallow_provider: Заборонити публікатора
@@ -941,6 +970,10 @@ uk:
       statuses:
         allow: Дозволити оприлюднення
         allow_account: Дозволити автора
+        confirm_allow: Ви впевнені, що хочете дозволити вибрані статуси?
+        confirm_allow_account: Впевнені, що хочете дозволити вибрані облікові записи?
+        confirm_disallow: Ви впевнені, що хочете скасувати дозвіл на вибрані статуси?
+        confirm_disallow_account: Впевнені, що хочете скасувати дозвіл вибраним обліковим записам?
         description_html: Це дописи, про які ваш сервер знає як такі, що в даний час є спільні і навіть ті, які зараз є дуже популярними. Це може допомогти вашим новим та старим користувачам, щоб знайти більше людей для слідування. Жоден запис не відображається публічно, поки ви не затверджуєте автора, і автор дозволяє іншим користувачам підписатися на це. Ви також можете дозволити або відхилити окремі повідомлення.
         disallow: Заборонити допис
         disallow_account: Заборонити автора
@@ -1064,7 +1097,9 @@ uk:
       guide_link_text: Кожен може взяти участь.
     sensitive_content: Дражливий зміст
   application_mailer:
+    notification_preferences: Змінити налаштування електронної пошти
     salutation: "%{name},"
+    settings: 'Змінити налаштування електронної пошти: %{link}'
     unsubscribe: Відписатися
     view: 'Перегляд:'
     view_profile: Показати профіль
@@ -1084,6 +1119,7 @@ uk:
       hint_html: Ще одне! Ми повинні пересвідчитись, що ви людина (щоб ми могли уникнути спаму!). Розв'яжіть CAPTCHA внизу і натисніть кнопку "Продовжити".
       title: Перевірка безпеки
     confirmations:
+      awaiting_review: Ваша електронна адреса підтверджена! Наразі співробітники %{domain} розглядають вашу реєстрацію. Ви отримаєте електронний лист, якщо вони затвердять ваш обліковий запис!
       awaiting_review_title: Ваша реєстрація розглядається
       clicking_this_link: натисніть це посилання
       login_link: увійти
@@ -1091,6 +1127,7 @@ uk:
       redirect_to_app_html: Вас мало переспрямувати до програми <strong>%{app_name}</strong>. Якщо цього не сталося, спробуйте %{clicking_this_link} або вручну поверніться до програми.
       registration_complete: Ваша реєстрація на %{domain} завершена!
       welcome_title: Ласкаво просимо, %{name}!
+      wrong_email_hint: Якщо ця адреса електронної пошти неправильна, можна змінити її в налаштуваннях облікового запису.
     delete_account: Видалити обліковий запис
     delete_account_html: Якщо ви хочете видалити свій обліковий запис, ви можете <a href="%{path}">перейти сюди</a>. Вас попросять підтвердити дію.
     description:
@@ -1111,6 +1148,7 @@ uk:
     or_log_in_with: Або увійдіть з
     privacy_policy_agreement_html: Мною прочитано і я погоджуюся з <a href="%{privacy_policy_path}" target="_blank">політикою приватності</a>
     progress:
+      confirm: Підтвердити електронну адресу
       details: Ваші дані
       review: Наш відгук
       rules: Погодитися з правилами
@@ -1132,8 +1170,10 @@ uk:
     security: Зміна паролю
     set_new_password: Встановити новий пароль
     setup:
+      email_below_hint_html: Перевірте теку "Спам", або зробіть ще один запит. Ви можете виправити свою електронну адресу, якщо вона неправильна.
       email_settings_hint_html: Натисніть на посилання, яке ми надіслали вам, щоб підтвердити %{email}. Ми чекатимемо прямо тут.
       link_not_received: Не отримали посилання?
+      new_confirmation_instructions_sent: Ви отримаєте новий лист із посиланням для підтвердження протягом кількох хвилин!
       title: Перевірте вашу поштову скриньку
     sign_in:
       preamble_html: Увійдіть за допомогою облікових даних <strong>%{domain}</strong>. Якщо ваш обліковий запис розміщений на іншому сервері, ви не зможете увійти тут.
@@ -1144,7 +1184,9 @@ uk:
       title: Налаштуймо вас на %{domain}.
     status:
       account_status: Стан облікового запису
+      confirming: Очікуємо завершення підтвердження за допомогою електронної пошти.
       functional: Ваш обліковий запис повністю робочий.
+      pending: Ваша заява очікує розгляду нашим персоналом. Це може тривати деякий час. Ви отримаєте електронний лист, якщо ваша заява буде схвалена.
       redirecting_to: Ваш обліковий запис наразі неактивний, тому що він перенаправлений до %{acct}.
       self_destruct: Оскільки %{domain} закривається, ви отримаєте тільки обмежений доступ до вашого облікового запису.
       view_strikes: Переглянути попередні попередження вашому обліковому запису
@@ -1187,6 +1229,9 @@ uk:
       before: 'До того як продовжити, будь ласка уважно прочитайте це:'
       caches: Інформація, кешована іншими серверами, може залишитися
       data_removal: Ваші дописи й інші дані будуть вилучені назавжди
+      email_change_html: Ви можете <a href="%{path}">змінити вашу електронну адресу</a>, не видаляючи ваш обліковий запис
+      email_contact_html: Якщо його все ще немає, ви можете написати до <a href="mailto:%{email}">%{email}</a> для допомоги
+      email_reconfirmation_html: Якщо ви не отримали електронного листа з підтвердженням, ви можете <a href="%{path}">попросити його знову</a>
       irreversible: Буде неможливо відновити ваш обліковий запис
       more_details_html: Подробиці за посиланням <a href="%{terms_path}">політика конфіденційності</a>.
       username_available: Ваше ім'я користувача стане доступним для використання
@@ -1446,6 +1491,7 @@ uk:
     unsubscribe:
       action: Так, відписатися
       complete: Відписалися
+      confirmation_html: Ви впевнені, що хочете відписатися від отримання %{type} для Mastodon на %{domain} до своєї скриньки %{email}? Ви можете повторно підписатися у <a href="%{settings_path}">налаштуваннях сповіщень електронною поштою</a>.
       emails:
         notification_emails:
           favourite: отримувати сповіщення про вподобання електронною поштою

From 3db3e3dae58ac691fa525ce68b6eed5c1d45998e Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 19 Aug 2024 10:56:08 +0200
Subject: [PATCH 1874/2191] Update dependency postcss-preset-env to v10.0.2
 (#31488)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 390 +++++++++++++++++++++++++++---------------------------
 1 file changed, 195 insertions(+), 195 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index fcbb1a160f3c80..47cd777f4391c5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1569,13 +1569,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/cascade-layer-name-parser@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "@csstools/cascade-layer-name-parser@npm:2.0.0"
+"@csstools/cascade-layer-name-parser@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "@csstools/cascade-layer-name-parser@npm:2.0.1"
   peerDependencies:
-    "@csstools/css-parser-algorithms": ^3.0.0
-    "@csstools/css-tokenizer": ^3.0.0
-  checksum: 10c0/11de0c4abad1316a6b29a2c4f7966fc39af5cbcd0a542d92cbcca8a8173d472f3d577175fc097bebf793158936193a74829a035e1cb2abccbe056473a3076d89
+    "@csstools/css-parser-algorithms": ^3.0.1
+    "@csstools/css-tokenizer": ^3.0.1
+  checksum: 10c0/e1f9030285d1a16ca0424018289e5288e58dee2d6f6cc392e27d9e8eca0deeea4ced9b749eef09a8322746cb15b6304bc7e2d04bb9dc7405c29b3717ec80e736
   languageName: node
   linkType: hard
 
@@ -1586,52 +1586,52 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/css-calc@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "@csstools/css-calc@npm:2.0.0"
+"@csstools/css-calc@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "@csstools/css-calc@npm:2.0.1"
   peerDependencies:
-    "@csstools/css-parser-algorithms": ^3.0.0
-    "@csstools/css-tokenizer": ^3.0.0
-  checksum: 10c0/441f8fafaa4f87302b85e2c46bc8a3efb388e0357f0db5c45438fe99c5660afeb524332a0a3339574fdd26392e65f8db9c7ab6db3361726f1702987e8522c531
+    "@csstools/css-parser-algorithms": ^3.0.1
+    "@csstools/css-tokenizer": ^3.0.1
+  checksum: 10c0/84c0ba3dac51466c9ac22c3540360f6058cf351a3676d71d4412584b165a91abc7c69a4ddf5a5dacc6e6082806d2317cf50ddbc0a0562275b2aedaee41cb87a9
   languageName: node
   linkType: hard
 
-"@csstools/css-color-parser@npm:^3.0.1":
-  version: 3.0.1
-  resolution: "@csstools/css-color-parser@npm:3.0.1"
+"@csstools/css-color-parser@npm:^3.0.2":
+  version: 3.0.2
+  resolution: "@csstools/css-color-parser@npm:3.0.2"
   dependencies:
     "@csstools/color-helpers": "npm:^5.0.1"
-    "@csstools/css-calc": "npm:^2.0.0"
+    "@csstools/css-calc": "npm:^2.0.1"
   peerDependencies:
-    "@csstools/css-parser-algorithms": ^3.0.0
-    "@csstools/css-tokenizer": ^3.0.0
-  checksum: 10c0/8890a621f916cbbf49e749d4e85e934ce55c9f9c339abcc5f4a64bc165605a6e8dd3cad9d3bbc994d2419a3b38981dca84b93ae50aa91d492fb5f0f4c9d95969
+    "@csstools/css-parser-algorithms": ^3.0.1
+    "@csstools/css-tokenizer": ^3.0.1
+  checksum: 10c0/31f42cc22426c937f5c6999889f72b40aec8504189a6badf3319552f27a5af73dd5f46be9ebc54eb87e526468eb2546ffbd60a6879fe599efa6c98e51d6cfa3d
   languageName: node
   linkType: hard
 
-"@csstools/css-parser-algorithms@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "@csstools/css-parser-algorithms@npm:3.0.0"
+"@csstools/css-parser-algorithms@npm:^3.0.0, @csstools/css-parser-algorithms@npm:^3.0.1":
+  version: 3.0.1
+  resolution: "@csstools/css-parser-algorithms@npm:3.0.1"
   peerDependencies:
-    "@csstools/css-tokenizer": ^3.0.0
-  checksum: 10c0/ffa06c9d883e6bbb6198c98b5a395abe9847ff63ae41db54d75812e52764f550b36625fdb427c9a4ea6dfd71362aa98194ccd63afad0e521f6f3470c7515d241
+    "@csstools/css-tokenizer": ^3.0.1
+  checksum: 10c0/064c6d519197b5af43bbf5efe8f4cdbd361b006113aa82160d637e925b50c643a52d33d512ca01c63042d952d723a2a10798231a714668356b76668fb11294e3
   languageName: node
   linkType: hard
 
-"@csstools/css-tokenizer@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "@csstools/css-tokenizer@npm:3.0.0"
-  checksum: 10c0/6d0f3e44bfb4b309bc4e260e6399163653f5715b16ebf1f2907ec98a2b31e9b2de94c09012b6d291c6f4229cc2a521e4f66594cac1b6276a4eb205e8e23e446b
+"@csstools/css-tokenizer@npm:^3.0.0, @csstools/css-tokenizer@npm:^3.0.1":
+  version: 3.0.1
+  resolution: "@csstools/css-tokenizer@npm:3.0.1"
+  checksum: 10c0/c9ed4373e5731b5375ea9791590081019c04e95f08b46b272977e5e7b8c3d560affc62e82263cb8def1df1e57f0673140e7e16a14a5e7be04e6a234be088d1d3
   languageName: node
   linkType: hard
 
-"@csstools/media-query-list-parser@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "@csstools/media-query-list-parser@npm:3.0.0"
+"@csstools/media-query-list-parser@npm:^3.0.0, @csstools/media-query-list-parser@npm:^3.0.1":
+  version: 3.0.1
+  resolution: "@csstools/media-query-list-parser@npm:3.0.1"
   peerDependencies:
-    "@csstools/css-parser-algorithms": ^3.0.0
-    "@csstools/css-tokenizer": ^3.0.0
-  checksum: 10c0/0a83ab7cba4fec5543c5abf3f7145ab5742c44e0ed3349d41787739a1bd897a8cf27f35f3bc714d1d02a44b2a34f28b3b82ce6d0cb6b9c4fbb679dc034f8a152
+    "@csstools/css-parser-algorithms": ^3.0.1
+    "@csstools/css-tokenizer": ^3.0.1
+  checksum: 10c0/fca1935cabf9fb94128da87f72c34aa2cfce8eb0beba4c78d685c7b42aaba3521067710afc6905b7347fc41fe53947536ce15a7ef3387b48763d8f7d71778d5e
   languageName: node
   linkType: hard
 
@@ -1647,60 +1647,60 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-color-function@npm:^4.0.1":
-  version: 4.0.1
-  resolution: "@csstools/postcss-color-function@npm:4.0.1"
+"@csstools/postcss-color-function@npm:^4.0.2":
+  version: 4.0.2
+  resolution: "@csstools/postcss-color-function@npm:4.0.2"
   dependencies:
-    "@csstools/css-color-parser": "npm:^3.0.1"
-    "@csstools/css-parser-algorithms": "npm:^3.0.0"
-    "@csstools/css-tokenizer": "npm:^3.0.0"
+    "@csstools/css-color-parser": "npm:^3.0.2"
+    "@csstools/css-parser-algorithms": "npm:^3.0.1"
+    "@csstools/css-tokenizer": "npm:^3.0.1"
     "@csstools/postcss-progressive-custom-properties": "npm:^4.0.0"
     "@csstools/utilities": "npm:^2.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/f0d3dd0677d381df54987d13ea63a59e911816d98a22eda7a5e55ca2908f52afc42fbffb73a8d25a18632b936dc38f6ada9f3e2dd7911cf775ce3718657420f4
+  checksum: 10c0/c987ccc7ab326668895396d3fe69c05087cf6e245be6f70e8c33da0cdeb56f8ac3d117cfad984191ec57be9691ab56d427aaa28c61c4a7446521972993dd5039
   languageName: node
   linkType: hard
 
-"@csstools/postcss-color-mix-function@npm:^3.0.1":
-  version: 3.0.1
-  resolution: "@csstools/postcss-color-mix-function@npm:3.0.1"
+"@csstools/postcss-color-mix-function@npm:^3.0.2":
+  version: 3.0.2
+  resolution: "@csstools/postcss-color-mix-function@npm:3.0.2"
   dependencies:
-    "@csstools/css-color-parser": "npm:^3.0.1"
-    "@csstools/css-parser-algorithms": "npm:^3.0.0"
-    "@csstools/css-tokenizer": "npm:^3.0.0"
+    "@csstools/css-color-parser": "npm:^3.0.2"
+    "@csstools/css-parser-algorithms": "npm:^3.0.1"
+    "@csstools/css-tokenizer": "npm:^3.0.1"
     "@csstools/postcss-progressive-custom-properties": "npm:^4.0.0"
     "@csstools/utilities": "npm:^2.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/ff76400d132c42d70f58b0908ab602b550b43720320288eb4ca1f185e7340c6f232b2a789ac94be255fc7bedc3c6125314d564297d23606fb2c91a1e2d79c40b
+  checksum: 10c0/cfdc641f504f9d02b9a7b53d6bd933d4e767ecaee5f3d2df45d897f69b8a38b5b79b538d307b16fb56dcb7c19dc7e107518c356772e89771e28e04fd846d9035
   languageName: node
   linkType: hard
 
-"@csstools/postcss-content-alt-text@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "@csstools/postcss-content-alt-text@npm:2.0.0"
+"@csstools/postcss-content-alt-text@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "@csstools/postcss-content-alt-text@npm:2.0.1"
   dependencies:
-    "@csstools/css-parser-algorithms": "npm:^3.0.0"
-    "@csstools/css-tokenizer": "npm:^3.0.0"
+    "@csstools/css-parser-algorithms": "npm:^3.0.1"
+    "@csstools/css-tokenizer": "npm:^3.0.1"
     "@csstools/postcss-progressive-custom-properties": "npm:^4.0.0"
     "@csstools/utilities": "npm:^2.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/978e99425f1b5420c55282f51de65646b910f9d60621f5ad7adb7a2dace26c68dc384cd4798604e2c5d8bcd1e635a20474a6ea044a7e9b449d068d6db77a2738
+  checksum: 10c0/693e4cfa9a30a9c384120bd24846a7cd5ba1e1ebf975eb81b0e0131a21ac28a0301c7dcfa13706bc7d8b5343536fb43a46de636c3257d0fd05041c7255366e87
   languageName: node
   linkType: hard
 
-"@csstools/postcss-exponential-functions@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "@csstools/postcss-exponential-functions@npm:2.0.0"
+"@csstools/postcss-exponential-functions@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "@csstools/postcss-exponential-functions@npm:2.0.1"
   dependencies:
-    "@csstools/css-calc": "npm:^2.0.0"
-    "@csstools/css-parser-algorithms": "npm:^3.0.0"
-    "@csstools/css-tokenizer": "npm:^3.0.0"
+    "@csstools/css-calc": "npm:^2.0.1"
+    "@csstools/css-parser-algorithms": "npm:^3.0.1"
+    "@csstools/css-tokenizer": "npm:^3.0.1"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/a5ccd4fb5b6f6f370bf07ef8f918658ef4d9865a92d9866f57edfe7479c6a486701520cbe0efb8f39af9b78eda0819d8663554e9797b8bdcadc2291733bf6b3f
+  checksum: 10c0/ddcaedfa48cc0cf93611c8d2ed5a75d56c1d196a97015db644b45881adabb47f3255242acaef6ea869a1e5ba66328725d254bf6d29eb5e988cde8b040bc5f55d
   languageName: node
   linkType: hard
 
@@ -1716,46 +1716,46 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-gamut-mapping@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "@csstools/postcss-gamut-mapping@npm:2.0.1"
+"@csstools/postcss-gamut-mapping@npm:^2.0.2":
+  version: 2.0.2
+  resolution: "@csstools/postcss-gamut-mapping@npm:2.0.2"
   dependencies:
-    "@csstools/css-color-parser": "npm:^3.0.1"
-    "@csstools/css-parser-algorithms": "npm:^3.0.0"
-    "@csstools/css-tokenizer": "npm:^3.0.0"
+    "@csstools/css-color-parser": "npm:^3.0.2"
+    "@csstools/css-parser-algorithms": "npm:^3.0.1"
+    "@csstools/css-tokenizer": "npm:^3.0.1"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/3415c420463dd481a3ddf5b104f15661492d9aa3613c109f9b7354b2664965a92036045e157945348cf2c06e075b89a0c0c4f49c8a00d41c827c5b61de297cd0
+  checksum: 10c0/8b6504f81c5036e3c2a9f9516c371f48a283112469b746546c8c7f6f0da2467c915d4dac6dfe8bb05d7dab3a7503911391eb9e666cb7632e09a032e801c029f5
   languageName: node
   linkType: hard
 
-"@csstools/postcss-gradients-interpolation-method@npm:^5.0.1":
-  version: 5.0.1
-  resolution: "@csstools/postcss-gradients-interpolation-method@npm:5.0.1"
+"@csstools/postcss-gradients-interpolation-method@npm:^5.0.2":
+  version: 5.0.2
+  resolution: "@csstools/postcss-gradients-interpolation-method@npm:5.0.2"
   dependencies:
-    "@csstools/css-color-parser": "npm:^3.0.1"
-    "@csstools/css-parser-algorithms": "npm:^3.0.0"
-    "@csstools/css-tokenizer": "npm:^3.0.0"
+    "@csstools/css-color-parser": "npm:^3.0.2"
+    "@csstools/css-parser-algorithms": "npm:^3.0.1"
+    "@csstools/css-tokenizer": "npm:^3.0.1"
     "@csstools/postcss-progressive-custom-properties": "npm:^4.0.0"
     "@csstools/utilities": "npm:^2.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/a1c5d6bf308ff9e1972cb39030859cd135246f8f697e5d1278ddd8ed27ce53eb76b3e628acc64145290006f45140d0a4a65e5df71f131d3e6447f0e5d3301088
+  checksum: 10c0/4fa27437ad9861b1457c28228f2503c17bcc2f77dcb38da1314a4a5d38fd010e7e5d11b5f9d69e0a2cb2999bbfeca1e99ce2f59422bda5b382658dcb03f7326e
   languageName: node
   linkType: hard
 
-"@csstools/postcss-hwb-function@npm:^4.0.1":
-  version: 4.0.1
-  resolution: "@csstools/postcss-hwb-function@npm:4.0.1"
+"@csstools/postcss-hwb-function@npm:^4.0.2":
+  version: 4.0.2
+  resolution: "@csstools/postcss-hwb-function@npm:4.0.2"
   dependencies:
-    "@csstools/css-color-parser": "npm:^3.0.1"
-    "@csstools/css-parser-algorithms": "npm:^3.0.0"
-    "@csstools/css-tokenizer": "npm:^3.0.0"
+    "@csstools/css-color-parser": "npm:^3.0.2"
+    "@csstools/css-parser-algorithms": "npm:^3.0.1"
+    "@csstools/css-tokenizer": "npm:^3.0.1"
     "@csstools/postcss-progressive-custom-properties": "npm:^4.0.0"
     "@csstools/utilities": "npm:^2.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/3247c3ab75d3cdb0ca80f7bb63d944ce933694ee9d7ee68aea11e727e883e0d35936b4a29e28700bda5eea2be26917a6c95c22a6b244e945cc558669f88b8a6e
+  checksum: 10c0/46dc9596e37830de4c38f70764d6da9f2fc7bc339217b4291eced75daa8998c4e05fb743c271701e44818df4ac111c285019b7bb3a728e8b61d86899bbeb74eb
   languageName: node
   linkType: hard
 
@@ -1793,17 +1793,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-light-dark-function@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "@csstools/postcss-light-dark-function@npm:2.0.1"
+"@csstools/postcss-light-dark-function@npm:^2.0.2":
+  version: 2.0.2
+  resolution: "@csstools/postcss-light-dark-function@npm:2.0.2"
   dependencies:
-    "@csstools/css-parser-algorithms": "npm:^3.0.0"
-    "@csstools/css-tokenizer": "npm:^3.0.0"
+    "@csstools/css-parser-algorithms": "npm:^3.0.1"
+    "@csstools/css-tokenizer": "npm:^3.0.1"
     "@csstools/postcss-progressive-custom-properties": "npm:^4.0.0"
     "@csstools/utilities": "npm:^2.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/4caf23781daa72f036a830b7fc2c07cde1122afd7bc7c6a291992b5264ea92c1fb22ec2ed684c5ce50e6e848f6d0ea39ef34a5679ea37a546b8db6eb555e3f80
+  checksum: 10c0/f8973c435868998e5d6af1fc0c35b27bbf65fa9d0c35f5055c689b8ee2807a16802044e296f7def39a7253ae544fb49559e8273ee22eb4e21845aa980a1bc82b
   languageName: node
   linkType: hard
 
@@ -1845,42 +1845,42 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-logical-viewport-units@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "@csstools/postcss-logical-viewport-units@npm:3.0.0"
+"@csstools/postcss-logical-viewport-units@npm:^3.0.1":
+  version: 3.0.1
+  resolution: "@csstools/postcss-logical-viewport-units@npm:3.0.1"
   dependencies:
-    "@csstools/css-tokenizer": "npm:^3.0.0"
+    "@csstools/css-tokenizer": "npm:^3.0.1"
     "@csstools/utilities": "npm:^2.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/d474f3b8b3949516ad431c8297eb26ad7ba8829dc323c1a99c25be79af0fa16eef43ddd4d980ea97a676599c5587b4b2afd44c9a1055cf3573bfb2090ecbbd5c
+  checksum: 10c0/f54f91ec4d308562371576e82131c3cc1ff461a951c9a38f0b42b783c26f37a93cc846fcd025d3c4a8437b55a4fff1192ebfac8ccf84abb6478b2c515d232552
   languageName: node
   linkType: hard
 
-"@csstools/postcss-media-minmax@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "@csstools/postcss-media-minmax@npm:2.0.0"
+"@csstools/postcss-media-minmax@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "@csstools/postcss-media-minmax@npm:2.0.1"
   dependencies:
-    "@csstools/css-calc": "npm:^2.0.0"
-    "@csstools/css-parser-algorithms": "npm:^3.0.0"
-    "@csstools/css-tokenizer": "npm:^3.0.0"
-    "@csstools/media-query-list-parser": "npm:^3.0.0"
+    "@csstools/css-calc": "npm:^2.0.1"
+    "@csstools/css-parser-algorithms": "npm:^3.0.1"
+    "@csstools/css-tokenizer": "npm:^3.0.1"
+    "@csstools/media-query-list-parser": "npm:^3.0.1"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/30f8cde005ae5d3750f8d2d62a26570381e306a2a4c3fdeef2ad48febbefd389c65ea471914b69ae8772a4abbd11cd52a78ecdb5d8929ed553ca1d5731f212a2
+  checksum: 10c0/23c1fb0c3ed8bf82f3223f161d0d65ba62045b917bc19624581f64aaa5d678485d22c23af2591a3f634ba02030ccb419c2b30209aa22f9fd2baa1a6474af810a
   languageName: node
   linkType: hard
 
-"@csstools/postcss-media-queries-aspect-ratio-number-values@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "@csstools/postcss-media-queries-aspect-ratio-number-values@npm:3.0.0"
+"@csstools/postcss-media-queries-aspect-ratio-number-values@npm:^3.0.1":
+  version: 3.0.1
+  resolution: "@csstools/postcss-media-queries-aspect-ratio-number-values@npm:3.0.1"
   dependencies:
-    "@csstools/css-parser-algorithms": "npm:^3.0.0"
-    "@csstools/css-tokenizer": "npm:^3.0.0"
-    "@csstools/media-query-list-parser": "npm:^3.0.0"
+    "@csstools/css-parser-algorithms": "npm:^3.0.1"
+    "@csstools/css-tokenizer": "npm:^3.0.1"
+    "@csstools/media-query-list-parser": "npm:^3.0.1"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/c7af426e44c4ca2c7cb48c2f54bd8b5e4531d4d7a568011c367038956789bf47bab996fa062f767e255229de3598fb89abdb85011872158c885a4d3ace142509
+  checksum: 10c0/e491cb149fb4fff85b2f03191511e43654ae00716e3c1ea9f1dc22ec4e7042c35f034d372082a69d3621c86cafbe46e8f419872fa36f4a534f145f584d655768
   languageName: node
   linkType: hard
 
@@ -1907,18 +1907,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-oklab-function@npm:^4.0.1":
-  version: 4.0.1
-  resolution: "@csstools/postcss-oklab-function@npm:4.0.1"
+"@csstools/postcss-oklab-function@npm:^4.0.2":
+  version: 4.0.2
+  resolution: "@csstools/postcss-oklab-function@npm:4.0.2"
   dependencies:
-    "@csstools/css-color-parser": "npm:^3.0.1"
-    "@csstools/css-parser-algorithms": "npm:^3.0.0"
-    "@csstools/css-tokenizer": "npm:^3.0.0"
+    "@csstools/css-color-parser": "npm:^3.0.2"
+    "@csstools/css-parser-algorithms": "npm:^3.0.1"
+    "@csstools/css-tokenizer": "npm:^3.0.1"
     "@csstools/postcss-progressive-custom-properties": "npm:^4.0.0"
     "@csstools/utilities": "npm:^2.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/b4450fb792c505936e1f9290e8df5420e98ccba78fa1badc9261ff99bebff8cc3b1f050e518728de791acadba08b5e8c213d97b479f551b72b4f8a5793625998
+  checksum: 10c0/3209a7cec6d3577544a7ef41f2d5cca25f77891d4ec0d7f39d32f9a79a6c9a9b0ee6b54b2937a2d995548ad11c39966b07d4b9f58e907ffbe1a4b454f2d277f3
   languageName: node
   linkType: hard
 
@@ -1933,18 +1933,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-relative-color-syntax@npm:^3.0.1":
-  version: 3.0.1
-  resolution: "@csstools/postcss-relative-color-syntax@npm:3.0.1"
+"@csstools/postcss-relative-color-syntax@npm:^3.0.2":
+  version: 3.0.2
+  resolution: "@csstools/postcss-relative-color-syntax@npm:3.0.2"
   dependencies:
-    "@csstools/css-color-parser": "npm:^3.0.1"
-    "@csstools/css-parser-algorithms": "npm:^3.0.0"
-    "@csstools/css-tokenizer": "npm:^3.0.0"
+    "@csstools/css-color-parser": "npm:^3.0.2"
+    "@csstools/css-parser-algorithms": "npm:^3.0.1"
+    "@csstools/css-tokenizer": "npm:^3.0.1"
     "@csstools/postcss-progressive-custom-properties": "npm:^4.0.0"
     "@csstools/utilities": "npm:^2.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/95a0001549b0fcae6add7db6264d16183734a9dd94e54e9b606b0dcefbd96540d8917707eef2525a5024e4078ef039acfa05c2c1b309fe444a7fc1f1c05d6594
+  checksum: 10c0/34a8c999e08c6e7833484ee2fb91e7fcc25235d6c361712fed581e44a5a29f1ceb95415b6f4260de53809ac13f5da5415d1905c2971477cf5d45e5196081c663
   languageName: node
   linkType: hard
 
@@ -1959,16 +1959,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-stepped-value-functions@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "@csstools/postcss-stepped-value-functions@npm:4.0.0"
+"@csstools/postcss-stepped-value-functions@npm:^4.0.1":
+  version: 4.0.1
+  resolution: "@csstools/postcss-stepped-value-functions@npm:4.0.1"
   dependencies:
-    "@csstools/css-calc": "npm:^2.0.0"
-    "@csstools/css-parser-algorithms": "npm:^3.0.0"
-    "@csstools/css-tokenizer": "npm:^3.0.0"
+    "@csstools/css-calc": "npm:^2.0.1"
+    "@csstools/css-parser-algorithms": "npm:^3.0.1"
+    "@csstools/css-tokenizer": "npm:^3.0.1"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/02d9b99921a69838d5df7cc2703f381e8e18d14ac5a4bd8b8b24ff80bc9657ff70b1997cdbfd9c2f1985a5d07478a0e97d1617760519450c5475cc1d8159e788
+  checksum: 10c0/7e65969b124fce603675ca17c2ffa2bb456677866e54bc9fbdc4da0945be1593fde2abb0730d3d03190776ad2022b394a1f9d4834c5b1f4c7ec497929fd35f8f
   languageName: node
   linkType: hard
 
@@ -1984,16 +1984,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-trigonometric-functions@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "@csstools/postcss-trigonometric-functions@npm:4.0.0"
+"@csstools/postcss-trigonometric-functions@npm:^4.0.1":
+  version: 4.0.1
+  resolution: "@csstools/postcss-trigonometric-functions@npm:4.0.1"
   dependencies:
-    "@csstools/css-calc": "npm:^2.0.0"
-    "@csstools/css-parser-algorithms": "npm:^3.0.0"
-    "@csstools/css-tokenizer": "npm:^3.0.0"
+    "@csstools/css-calc": "npm:^2.0.1"
+    "@csstools/css-parser-algorithms": "npm:^3.0.1"
+    "@csstools/css-tokenizer": "npm:^3.0.1"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/3a53d6724f068511d02a2de3b39e76bf99d622614e1c79b3d2c2eace2f0d36d865288dc2c4a1368fee8db38be7973803504400b2752cd5a1200f825ddc27b253
+  checksum: 10c0/59e017ebb9f4f8f027e134024e3322b5e202cc96073e0bb0d45733a829c8eadc7f4f7ce57ce8360a748a677595af9ea95da1779684699b48b911b73b4017ac8b
   languageName: node
   linkType: hard
 
@@ -13311,18 +13311,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-color-functional-notation@npm:^7.0.1":
-  version: 7.0.1
-  resolution: "postcss-color-functional-notation@npm:7.0.1"
+"postcss-color-functional-notation@npm:^7.0.2":
+  version: 7.0.2
+  resolution: "postcss-color-functional-notation@npm:7.0.2"
   dependencies:
-    "@csstools/css-color-parser": "npm:^3.0.1"
-    "@csstools/css-parser-algorithms": "npm:^3.0.0"
-    "@csstools/css-tokenizer": "npm:^3.0.0"
+    "@csstools/css-color-parser": "npm:^3.0.2"
+    "@csstools/css-parser-algorithms": "npm:^3.0.1"
+    "@csstools/css-tokenizer": "npm:^3.0.1"
     "@csstools/postcss-progressive-custom-properties": "npm:^4.0.0"
     "@csstools/utilities": "npm:^2.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/0cdfae4d85cb34425c8363b699b5da6f0c8cc43e7ce3b7fdd1fd39429ee81a4af75f973cd5c8293b1072688064da17a0a633827f23667e8cc0ff16217f0004eb
+  checksum: 10c0/e89c0bff94558b0c978ac36f7e02f7f516291f90fd43169d39c63ad2bb0415e3b1c4b3c2469280d578727e850fdf15a557230cb28275f3f0676f0f73187f2867
   languageName: node
   linkType: hard
 
@@ -13376,46 +13376,46 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-custom-media@npm:^11.0.0":
-  version: 11.0.0
-  resolution: "postcss-custom-media@npm:11.0.0"
+"postcss-custom-media@npm:^11.0.1":
+  version: 11.0.1
+  resolution: "postcss-custom-media@npm:11.0.1"
   dependencies:
-    "@csstools/cascade-layer-name-parser": "npm:^2.0.0"
-    "@csstools/css-parser-algorithms": "npm:^3.0.0"
-    "@csstools/css-tokenizer": "npm:^3.0.0"
-    "@csstools/media-query-list-parser": "npm:^3.0.0"
+    "@csstools/cascade-layer-name-parser": "npm:^2.0.1"
+    "@csstools/css-parser-algorithms": "npm:^3.0.1"
+    "@csstools/css-tokenizer": "npm:^3.0.1"
+    "@csstools/media-query-list-parser": "npm:^3.0.1"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/99e58454453581a1a4f5b7eae5cf6504c445e45d48035f09857603437fe80de06a216d0dad6036d32d14108b490e82a0845e1b4e0ec5114f752b325e388f0f1c
+  checksum: 10c0/771b281a28f105370ede7c4a86f9e3dd8d9ec3bf2d2883d4f2cfe9c42b5ec1bf88f713458b356870315d0ba3a285fbeb7bb514a1203d1c4fb113bd9044369bf2
   languageName: node
   linkType: hard
 
-"postcss-custom-properties@npm:^14.0.0":
-  version: 14.0.0
-  resolution: "postcss-custom-properties@npm:14.0.0"
+"postcss-custom-properties@npm:^14.0.1":
+  version: 14.0.1
+  resolution: "postcss-custom-properties@npm:14.0.1"
   dependencies:
-    "@csstools/cascade-layer-name-parser": "npm:^2.0.0"
-    "@csstools/css-parser-algorithms": "npm:^3.0.0"
-    "@csstools/css-tokenizer": "npm:^3.0.0"
+    "@csstools/cascade-layer-name-parser": "npm:^2.0.1"
+    "@csstools/css-parser-algorithms": "npm:^3.0.1"
+    "@csstools/css-tokenizer": "npm:^3.0.1"
     "@csstools/utilities": "npm:^2.0.0"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/f587e2f3026fa7ceb63dd111674848b97dc452f9e75a6480b4b87611a4705dd97e5ae5247e7d34888aecd95b4e50706170c93f57f14f05fb352135d2decdc00f
+  checksum: 10c0/12180a7f4a4fe2d528387346a1810b82ed870081756dcf6be226c839716ab3f6f4d6ca4c7208a07d7d84bf2c986beef6473e29964e7c2572066fca5d3b000ed5
   languageName: node
   linkType: hard
 
-"postcss-custom-selectors@npm:^8.0.0":
-  version: 8.0.0
-  resolution: "postcss-custom-selectors@npm:8.0.0"
+"postcss-custom-selectors@npm:^8.0.1":
+  version: 8.0.1
+  resolution: "postcss-custom-selectors@npm:8.0.1"
   dependencies:
-    "@csstools/cascade-layer-name-parser": "npm:^2.0.0"
-    "@csstools/css-parser-algorithms": "npm:^3.0.0"
-    "@csstools/css-tokenizer": "npm:^3.0.0"
+    "@csstools/cascade-layer-name-parser": "npm:^2.0.1"
+    "@csstools/css-parser-algorithms": "npm:^3.0.1"
+    "@csstools/css-tokenizer": "npm:^3.0.1"
     postcss-selector-parser: "npm:^6.1.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/efc9ce0e9c92f298b9196e1cf240ef0e15f88bb3f90f441beecd05756e31628b27a56dcb176f696d3d34c8d4d879c0eb70d1cb62b44c55e01ebd2a653b8a9e94
+  checksum: 10c0/b867233b3d68fbab90afca8a776eb74196ebc3fac8988175d95118a47993c793138fec6cc580272bb35d9bd31086acbdd33ff86da0cab83ef2f08bfc1c23ecd6
   languageName: node
   linkType: hard
 
@@ -13533,18 +13533,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-lab-function@npm:^7.0.1":
-  version: 7.0.1
-  resolution: "postcss-lab-function@npm:7.0.1"
+"postcss-lab-function@npm:^7.0.2":
+  version: 7.0.2
+  resolution: "postcss-lab-function@npm:7.0.2"
   dependencies:
-    "@csstools/css-color-parser": "npm:^3.0.1"
-    "@csstools/css-parser-algorithms": "npm:^3.0.0"
-    "@csstools/css-tokenizer": "npm:^3.0.0"
+    "@csstools/css-color-parser": "npm:^3.0.2"
+    "@csstools/css-parser-algorithms": "npm:^3.0.1"
+    "@csstools/css-tokenizer": "npm:^3.0.1"
     "@csstools/postcss-progressive-custom-properties": "npm:^4.0.0"
     "@csstools/utilities": "npm:^2.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/8a6f3f465911c5c608650e3ebec01097d274109eea0fceb925f1ca52213c67a6496570ff2ba9af0a6c2153e208ef1d10cc43ad81f38405f5d39639680f7150a9
+  checksum: 10c0/6b2be7e762b4ccb58ea9051723d390f6732ad78bb30bfef9499139cf5e2ac160c3de31b2b005fcc30e9fced4abe1685df6cb76c99d548896bae6746105ac8520
   languageName: node
   linkType: hard
 
@@ -13865,38 +13865,38 @@ __metadata:
   linkType: hard
 
 "postcss-preset-env@npm:^10.0.0":
-  version: 10.0.1
-  resolution: "postcss-preset-env@npm:10.0.1"
+  version: 10.0.2
+  resolution: "postcss-preset-env@npm:10.0.2"
   dependencies:
     "@csstools/postcss-cascade-layers": "npm:^5.0.0"
-    "@csstools/postcss-color-function": "npm:^4.0.1"
-    "@csstools/postcss-color-mix-function": "npm:^3.0.1"
-    "@csstools/postcss-content-alt-text": "npm:^2.0.0"
-    "@csstools/postcss-exponential-functions": "npm:^2.0.0"
+    "@csstools/postcss-color-function": "npm:^4.0.2"
+    "@csstools/postcss-color-mix-function": "npm:^3.0.2"
+    "@csstools/postcss-content-alt-text": "npm:^2.0.1"
+    "@csstools/postcss-exponential-functions": "npm:^2.0.1"
     "@csstools/postcss-font-format-keywords": "npm:^4.0.0"
-    "@csstools/postcss-gamut-mapping": "npm:^2.0.1"
-    "@csstools/postcss-gradients-interpolation-method": "npm:^5.0.1"
-    "@csstools/postcss-hwb-function": "npm:^4.0.1"
+    "@csstools/postcss-gamut-mapping": "npm:^2.0.2"
+    "@csstools/postcss-gradients-interpolation-method": "npm:^5.0.2"
+    "@csstools/postcss-hwb-function": "npm:^4.0.2"
     "@csstools/postcss-ic-unit": "npm:^4.0.0"
     "@csstools/postcss-initial": "npm:^2.0.0"
     "@csstools/postcss-is-pseudo-class": "npm:^5.0.0"
-    "@csstools/postcss-light-dark-function": "npm:^2.0.1"
+    "@csstools/postcss-light-dark-function": "npm:^2.0.2"
     "@csstools/postcss-logical-float-and-clear": "npm:^3.0.0"
     "@csstools/postcss-logical-overflow": "npm:^2.0.0"
     "@csstools/postcss-logical-overscroll-behavior": "npm:^2.0.0"
     "@csstools/postcss-logical-resize": "npm:^3.0.0"
-    "@csstools/postcss-logical-viewport-units": "npm:^3.0.0"
-    "@csstools/postcss-media-minmax": "npm:^2.0.0"
-    "@csstools/postcss-media-queries-aspect-ratio-number-values": "npm:^3.0.0"
+    "@csstools/postcss-logical-viewport-units": "npm:^3.0.1"
+    "@csstools/postcss-media-minmax": "npm:^2.0.1"
+    "@csstools/postcss-media-queries-aspect-ratio-number-values": "npm:^3.0.1"
     "@csstools/postcss-nested-calc": "npm:^4.0.0"
     "@csstools/postcss-normalize-display-values": "npm:^4.0.0"
-    "@csstools/postcss-oklab-function": "npm:^4.0.1"
+    "@csstools/postcss-oklab-function": "npm:^4.0.2"
     "@csstools/postcss-progressive-custom-properties": "npm:^4.0.0"
-    "@csstools/postcss-relative-color-syntax": "npm:^3.0.1"
+    "@csstools/postcss-relative-color-syntax": "npm:^3.0.2"
     "@csstools/postcss-scope-pseudo-class": "npm:^4.0.0"
-    "@csstools/postcss-stepped-value-functions": "npm:^4.0.0"
+    "@csstools/postcss-stepped-value-functions": "npm:^4.0.1"
     "@csstools/postcss-text-decoration-shorthand": "npm:^4.0.1"
-    "@csstools/postcss-trigonometric-functions": "npm:^4.0.0"
+    "@csstools/postcss-trigonometric-functions": "npm:^4.0.1"
     "@csstools/postcss-unset-value": "npm:^4.0.0"
     autoprefixer: "npm:^10.4.19"
     browserslist: "npm:^4.23.1"
@@ -13906,12 +13906,12 @@ __metadata:
     cssdb: "npm:^8.1.0"
     postcss-attribute-case-insensitive: "npm:^7.0.0"
     postcss-clamp: "npm:^4.1.0"
-    postcss-color-functional-notation: "npm:^7.0.1"
+    postcss-color-functional-notation: "npm:^7.0.2"
     postcss-color-hex-alpha: "npm:^10.0.0"
     postcss-color-rebeccapurple: "npm:^10.0.0"
-    postcss-custom-media: "npm:^11.0.0"
-    postcss-custom-properties: "npm:^14.0.0"
-    postcss-custom-selectors: "npm:^8.0.0"
+    postcss-custom-media: "npm:^11.0.1"
+    postcss-custom-properties: "npm:^14.0.1"
+    postcss-custom-selectors: "npm:^8.0.1"
     postcss-dir-pseudo-class: "npm:^9.0.0"
     postcss-double-position-gradients: "npm:^6.0.0"
     postcss-focus-visible: "npm:^10.0.0"
@@ -13919,7 +13919,7 @@ __metadata:
     postcss-font-variant: "npm:^5.0.0"
     postcss-gap-properties: "npm:^6.0.0"
     postcss-image-set-function: "npm:^7.0.0"
-    postcss-lab-function: "npm:^7.0.1"
+    postcss-lab-function: "npm:^7.0.2"
     postcss-logical: "npm:^8.0.0"
     postcss-nesting: "npm:^13.0.0"
     postcss-opacity-percentage: "npm:^2.0.0"
@@ -13931,7 +13931,7 @@ __metadata:
     postcss-selector-not: "npm:^8.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/5849915d040413f68ab71b3489daaa5b6687b4d4710da47a0d1420df0890858f0b53c9ec6755d872dbe38a2695ab12584be654456e3d6ce311b88927209c02b2
+  checksum: 10c0/51eb19994dfdbb041e87082833bedf8976053c182ae8dafab6b3ee1bf2cfd309ab9c186644ed032518011e44fbcc9f0552083bc431535779a80a919bbe78d10d
   languageName: node
   linkType: hard
 

From 31d374e5f57c797e4d4e5bd40ed4c4bb12bfd5fc Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 19 Aug 2024 13:42:33 +0200
Subject: [PATCH 1875/2191] Update opentelemetry-ruby (non-major) (#31451)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 61bdb1d39c4eda..dada7c86c71710 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -514,17 +514,17 @@ GEM
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
       opentelemetry-instrumentation-rack (~> 0.21)
-    opentelemetry-instrumentation-action_view (0.7.1)
+    opentelemetry-instrumentation-action_view (0.7.2)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-active_support (~> 0.1)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-active_job (0.7.4)
+    opentelemetry-instrumentation-active_job (0.7.6)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
     opentelemetry-instrumentation-active_model_serializers (0.20.2)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-active_record (0.7.2)
+    opentelemetry-instrumentation-active_record (0.7.3)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
     opentelemetry-instrumentation-active_support (0.6.0)
@@ -558,7 +558,7 @@ GEM
     opentelemetry-instrumentation-rack (0.24.6)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-rails (0.31.1)
+    opentelemetry-instrumentation-rails (0.31.2)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-action_mailer (~> 0.1.0)
       opentelemetry-instrumentation-action_pack (~> 0.9.0)

From 71f257d5291a091cfb005d28221d4ab38698ef42 Mon Sep 17 00:00:00 2001
From: Emelia Smith <ThisIsMissEm@users.noreply.github.com>
Date: Mon, 19 Aug 2024 14:28:06 +0200
Subject: [PATCH 1876/2191] Disable rule selector in ReportReasonSelector if
 instance has no rules (#31458)

---
 .../mastodon/components/admin/ReportReasonSelector.jsx          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/components/admin/ReportReasonSelector.jsx b/app/javascript/mastodon/components/admin/ReportReasonSelector.jsx
index cc05e5c163c320..351f1c949edc6d 100644
--- a/app/javascript/mastodon/components/admin/ReportReasonSelector.jsx
+++ b/app/javascript/mastodon/components/admin/ReportReasonSelector.jsx
@@ -153,7 +153,7 @@ class ReportReasonSelector extends PureComponent {
         <Category id='other' text={intl.formatMessage(messages.other)} selected={category === 'other'} onSelect={this.handleSelect} disabled={disabled} />
         <Category id='legal' text={intl.formatMessage(messages.legal)} selected={category === 'legal'} onSelect={this.handleSelect} disabled={disabled} />
         <Category id='spam' text={intl.formatMessage(messages.spam)} selected={category === 'spam'} onSelect={this.handleSelect} disabled={disabled} />
-        <Category id='violation' text={intl.formatMessage(messages.violation)} selected={category === 'violation'} onSelect={this.handleSelect} disabled={disabled}>
+        <Category id='violation' text={intl.formatMessage(messages.violation)} selected={category === 'violation'} onSelect={this.handleSelect} disabled={disabled || rules.length === 0}>
           {rules.map(rule => <Rule key={rule.id} id={rule.id} text={rule.text} selected={rule_ids.includes(rule.id)} onToggle={this.handleToggle} disabled={disabled} />)}
         </Category>
       </div>

From 99051479c137b04367266992514914c8b4e016db Mon Sep 17 00:00:00 2001
From: Emelia Smith <ThisIsMissEm@users.noreply.github.com>
Date: Mon, 19 Aug 2024 15:25:40 +0200
Subject: [PATCH 1877/2191] Fix Trending Tags pending review having an unstable
 sort order (#31473)

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
---
 app/models/trends/tag_filter.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/trends/tag_filter.rb b/app/models/trends/tag_filter.rb
index 46b747819e150b..d6f88a9486e710 100644
--- a/app/models/trends/tag_filter.rb
+++ b/app/models/trends/tag_filter.rb
@@ -14,7 +14,7 @@ def initialize(params)
 
   def results
     scope = if params[:status] == 'pending_review'
-              Tag.unscoped
+              Tag.unscoped.order(id: :desc)
             else
               trending_scope
             end

From 40f6631ac9474e2c78c15b9d6d360c8c45e26dd9 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Mon, 19 Aug 2024 15:55:18 +0200
Subject: [PATCH 1878/2191] Fix Husky git hooks not being installed anymore
 (#31435)

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 371b7cbf3d1ef6..321a78598df773 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
     "lint:css": "stylelint \"**/*.{css,scss}\"",
     "lint": "yarn lint:js && yarn lint:css",
     "postversion": "git push --tags",
-    "prepare": "husky",
+    "postinstall": "test -d node_modules/husky && husky || echo \"husky is not installed\"",
     "start": "node ./streaming/index.js",
     "test": "yarn lint && yarn run typecheck && yarn jest",
     "typecheck": "tsc --noEmit"

From 1e612c5a09097ef62f26bb9882125dc2d53c92df Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 19 Aug 2024 16:41:32 +0200
Subject: [PATCH 1879/2191] Refactor some actions to be proper async actions
 instead of passing a continuation (#31453)

---
 .../mastodon/actions/notifications.js         | 14 +++---
 .../actions/notifications_migration.tsx       |  2 +-
 app/javascript/mastodon/actions/streaming.js  | 27 ++++------
 app/javascript/mastodon/actions/timelines.js  | 50 ++++++++-----------
 .../mastodon/features/link_timeline/index.tsx |  4 +-
 5 files changed, 42 insertions(+), 55 deletions(-)

diff --git a/app/javascript/mastodon/actions/notifications.js b/app/javascript/mastodon/actions/notifications.js
index 7d6a9d5a3296fe..f5105d460f7642 100644
--- a/app/javascript/mastodon/actions/notifications.js
+++ b/app/javascript/mastodon/actions/notifications.js
@@ -188,8 +188,8 @@ const noOp = () => {};
 
 let expandNotificationsController = new AbortController();
 
-export function expandNotifications({ maxId, forceLoad = false } = {}, done = noOp) {
-  return (dispatch, getState) => {
+export function expandNotifications({ maxId = undefined, forceLoad = false }) {
+  return async (dispatch, getState) => {
     const activeFilter = getState().getIn(['settings', 'notifications', 'quickFilter', 'active']);
     const notifications = getState().get('notifications');
     const isLoadingMore = !!maxId;
@@ -199,7 +199,6 @@ export function expandNotifications({ maxId, forceLoad = false } = {}, done = no
         expandNotificationsController.abort();
         expandNotificationsController = new AbortController();
       } else {
-        done();
         return;
       }
     }
@@ -226,7 +225,8 @@ export function expandNotifications({ maxId, forceLoad = false } = {}, done = no
 
     dispatch(expandNotificationsRequest(isLoadingMore));
 
-    api().get('/api/v1/notifications', { params, signal: expandNotificationsController.signal }).then(response => {
+    try {
+      const response = await api().get('/api/v1/notifications', { params, signal: expandNotificationsController.signal });
       const next = getLinks(response).refs.find(link => link.rel === 'next');
 
       dispatch(importFetchedAccounts(response.data.map(item => item.account)));
@@ -236,11 +236,9 @@ export function expandNotifications({ maxId, forceLoad = false } = {}, done = no
       dispatch(expandNotificationsSuccess(response.data, next ? next.uri : null, isLoadingMore, isLoadingRecent, isLoadingRecent && preferPendingItems));
       fetchRelatedRelationships(dispatch, response.data);
       dispatch(submitMarkers());
-    }).catch(error => {
+    } catch(error) {
       dispatch(expandNotificationsFail(error, isLoadingMore));
-    }).finally(() => {
-      done();
-    });
+    }
   };
 }
 
diff --git a/app/javascript/mastodon/actions/notifications_migration.tsx b/app/javascript/mastodon/actions/notifications_migration.tsx
index f856e56828f11f..b453aed6ef72a9 100644
--- a/app/javascript/mastodon/actions/notifications_migration.tsx
+++ b/app/javascript/mastodon/actions/notifications_migration.tsx
@@ -13,6 +13,6 @@ export const initializeNotifications = createAppAsyncThunk(
     ) as boolean;
 
     if (enableBeta) void dispatch(fetchNotifications());
-    else dispatch(expandNotifications());
+    else void dispatch(expandNotifications());
   },
 );
diff --git a/app/javascript/mastodon/actions/streaming.js b/app/javascript/mastodon/actions/streaming.js
index 44025bd59638f8..630da3ef6e6132 100644
--- a/app/javascript/mastodon/actions/streaming.js
+++ b/app/javascript/mastodon/actions/streaming.js
@@ -37,7 +37,7 @@ const randomUpTo = max =>
  * @param {string} channelName
  * @param {Object.<string, string>} params
  * @param {Object} options
- * @param {function(Function, Function): void} [options.fallback]
+ * @param {function(Function): Promise<void>} [options.fallback]
  * @param {function(): void} [options.fillGaps]
  * @param {function(object): boolean} [options.accept]
  * @returns {function(): void}
@@ -52,14 +52,13 @@ export const connectTimelineStream = (timelineId, channelName, params = {}, opti
     let pollingId;
 
     /**
-     * @param {function(Function, Function): void} fallback
+     * @param {function(Function): Promise<void>} fallback
      */
 
-    const useFallback = fallback => {
-      fallback(dispatch, () => {
-        // eslint-disable-next-line react-hooks/rules-of-hooks -- this is not a react hook
-        pollingId = setTimeout(() => useFallback(fallback), 20000 + randomUpTo(20000));
-      });
+    const useFallback = async fallback => {
+      await fallback(dispatch);
+      // eslint-disable-next-line react-hooks/rules-of-hooks -- this is not a react hook
+      pollingId = setTimeout(() => useFallback(fallback), 20000 + randomUpTo(20000));
     };
 
     return {
@@ -132,21 +131,17 @@ export const connectTimelineStream = (timelineId, channelName, params = {}, opti
 
 /**
  * @param {Function} dispatch
- * @param {function(): void} done
  */
-const refreshHomeTimelineAndNotification = (dispatch, done) => {
-  // @ts-expect-error
-  dispatch(expandHomeTimeline({}, () =>
-    // @ts-expect-error
-    dispatch(expandNotifications({}, () =>
-      dispatch(fetchAnnouncements(done))))));
-};
+async function refreshHomeTimelineAndNotification(dispatch) {
+  await dispatch(expandHomeTimeline({ maxId: undefined }));
+  await dispatch(expandNotifications({}));
+  await dispatch(fetchAnnouncements());
+}
 
 /**
  * @returns {function(): void}
  */
 export const connectUserStream = () =>
-  // @ts-expect-error
   connectTimelineStream('home', 'user', {}, { fallback: refreshHomeTimelineAndNotification, fillGaps: fillHomeTimelineGaps });
 
 /**
diff --git a/app/javascript/mastodon/actions/timelines.js b/app/javascript/mastodon/actions/timelines.js
index f0ea46118e01a6..65b6d8045112d4 100644
--- a/app/javascript/mastodon/actions/timelines.js
+++ b/app/javascript/mastodon/actions/timelines.js
@@ -76,21 +76,18 @@ export function clearTimeline(timeline) {
   };
 }
 
-const noOp = () => {};
-
 const parseTags = (tags = {}, mode) => {
   return (tags[mode] || []).map((tag) => {
     return tag.value;
   });
 };
 
-export function expandTimeline(timelineId, path, params = {}, done = noOp) {
-  return (dispatch, getState) => {
+export function expandTimeline(timelineId, path, params = {}) {
+  return async (dispatch, getState) => {
     const timeline = getState().getIn(['timelines', timelineId], ImmutableMap());
     const isLoadingMore = !!params.max_id;
 
     if (timeline.get('isLoading')) {
-      done();
       return;
     }
 
@@ -109,7 +106,8 @@ export function expandTimeline(timelineId, path, params = {}, done = noOp) {
 
     dispatch(expandTimelineRequest(timelineId, isLoadingMore));
 
-    api().get(path, { params }).then(response => {
+    try {
+      const response = await api().get(path, { params });
       const next = getLinks(response).refs.find(link => link.rel === 'next');
 
       dispatch(importFetchedStatuses(response.data));
@@ -127,52 +125,48 @@ export function expandTimeline(timelineId, path, params = {}, done = noOp) {
       if (timelineId === 'home') {
         dispatch(submitMarkers());
       }
-    }).catch(error => {
+    } catch(error) {
       dispatch(expandTimelineFail(timelineId, error, isLoadingMore));
-    }).finally(() => {
-      done();
-    });
+    }
   };
 }
 
-export function fillTimelineGaps(timelineId, path, params = {}, done = noOp) {
-  return (dispatch, getState) => {
+export function fillTimelineGaps(timelineId, path, params = {}) {
+  return async (dispatch, getState) => {
     const timeline = getState().getIn(['timelines', timelineId], ImmutableMap());
     const items = timeline.get('items');
     const nullIndexes = items.map((statusId, index) => statusId === null ? index : null);
     const gaps = nullIndexes.map(index => index > 0 ? items.get(index - 1) : null);
 
     // Only expand at most two gaps to avoid doing too many requests
-    done = gaps.take(2).reduce((done, maxId) => {
-      return (() => dispatch(expandTimeline(timelineId, path, { ...params, maxId }, done)));
-    }, done);
-
-    done();
+    for (const maxId of gaps.take(2)) {
+      await dispatch(expandTimeline(timelineId, path, { ...params, maxId }));
+    }
   };
 }
 
-export const expandHomeTimeline            = ({ maxId } = {}, done = noOp) => expandTimeline('home', '/api/v1/timelines/home', { max_id: maxId }, done);
-export const expandPublicTimeline          = ({ maxId, onlyMedia, onlyRemote } = {}, done = noOp) => expandTimeline(`public${onlyRemote ? ':remote' : ''}${onlyMedia ? ':media' : ''}`, '/api/v1/timelines/public', { remote: !!onlyRemote, max_id: maxId, only_media: !!onlyMedia }, done);
-export const expandCommunityTimeline       = ({ maxId, onlyMedia } = {}, done = noOp) => expandTimeline(`community${onlyMedia ? ':media' : ''}`, '/api/v1/timelines/public', { local: true, max_id: maxId, only_media: !!onlyMedia }, done);
+export const expandHomeTimeline            = ({ maxId } = {}) => expandTimeline('home', '/api/v1/timelines/home', { max_id: maxId });
+export const expandPublicTimeline          = ({ maxId, onlyMedia, onlyRemote } = {}) => expandTimeline(`public${onlyRemote ? ':remote' : ''}${onlyMedia ? ':media' : ''}`, '/api/v1/timelines/public', { remote: !!onlyRemote, max_id: maxId, only_media: !!onlyMedia });
+export const expandCommunityTimeline       = ({ maxId, onlyMedia } = {}) => expandTimeline(`community${onlyMedia ? ':media' : ''}`, '/api/v1/timelines/public', { local: true, max_id: maxId, only_media: !!onlyMedia });
 export const expandAccountTimeline         = (accountId, { maxId, withReplies, tagged } = {}) => expandTimeline(`account:${accountId}${withReplies ? ':with_replies' : ''}${tagged ? `:${tagged}` : ''}`, `/api/v1/accounts/${accountId}/statuses`, { exclude_replies: !withReplies, exclude_reblogs: withReplies, tagged, max_id: maxId });
 export const expandAccountFeaturedTimeline = (accountId, { tagged } = {}) => expandTimeline(`account:${accountId}:pinned${tagged ? `:${tagged}` : ''}`, `/api/v1/accounts/${accountId}/statuses`, { pinned: true, tagged });
 export const expandAccountMediaTimeline    = (accountId, { maxId } = {}) => expandTimeline(`account:${accountId}:media`, `/api/v1/accounts/${accountId}/statuses`, { max_id: maxId, only_media: true, limit: 40 });
-export const expandListTimeline            = (id, { maxId } = {}, done = noOp) => expandTimeline(`list:${id}`, `/api/v1/timelines/list/${id}`, { max_id: maxId }, done);
-export const expandLinkTimeline            = (url, { maxId } = {}, done = noOp) => expandTimeline(`link:${url}`, `/api/v1/timelines/link`, { url, max_id: maxId }, done);
-export const expandHashtagTimeline         = (hashtag, { maxId, tags, local } = {}, done = noOp) => {
+export const expandListTimeline            = (id, { maxId } = {}) => expandTimeline(`list:${id}`, `/api/v1/timelines/list/${id}`, { max_id: maxId });
+export const expandLinkTimeline            = (url, { maxId } = {}) => expandTimeline(`link:${url}`, `/api/v1/timelines/link`, { url, max_id: maxId });
+export const expandHashtagTimeline         = (hashtag, { maxId, tags, local } = {}) => {
   return expandTimeline(`hashtag:${hashtag}${local ? ':local' : ''}`, `/api/v1/timelines/tag/${hashtag}`, {
     max_id: maxId,
     any:    parseTags(tags, 'any'),
     all:    parseTags(tags, 'all'),
     none:   parseTags(tags, 'none'),
     local:  local,
-  }, done);
+  });
 };
 
-export const fillHomeTimelineGaps      = (done = noOp) => fillTimelineGaps('home', '/api/v1/timelines/home', {}, done);
-export const fillPublicTimelineGaps    = ({ onlyMedia, onlyRemote } = {}, done = noOp) => fillTimelineGaps(`public${onlyRemote ? ':remote' : ''}${onlyMedia ? ':media' : ''}`, '/api/v1/timelines/public', { remote: !!onlyRemote, only_media: !!onlyMedia }, done);
-export const fillCommunityTimelineGaps = ({ onlyMedia } = {}, done = noOp) => fillTimelineGaps(`community${onlyMedia ? ':media' : ''}`, '/api/v1/timelines/public', { local: true, only_media: !!onlyMedia }, done);
-export const fillListTimelineGaps      = (id, done = noOp) => fillTimelineGaps(`list:${id}`, `/api/v1/timelines/list/${id}`, {}, done);
+export const fillHomeTimelineGaps      = () => fillTimelineGaps('home', '/api/v1/timelines/home', {});
+export const fillPublicTimelineGaps    = ({ onlyMedia, onlyRemote } = {}) => fillTimelineGaps(`public${onlyRemote ? ':remote' : ''}${onlyMedia ? ':media' : ''}`, '/api/v1/timelines/public', { remote: !!onlyRemote, only_media: !!onlyMedia });
+export const fillCommunityTimelineGaps = ({ onlyMedia } = {}) => fillTimelineGaps(`community${onlyMedia ? ':media' : ''}`, '/api/v1/timelines/public', { local: true, only_media: !!onlyMedia });
+export const fillListTimelineGaps      = (id) => fillTimelineGaps(`list:${id}`, `/api/v1/timelines/list/${id}`, {});
 
 export function expandTimelineRequest(timeline, isLoadingMore) {
   return {
diff --git a/app/javascript/mastodon/features/link_timeline/index.tsx b/app/javascript/mastodon/features/link_timeline/index.tsx
index dd726dac1ace2c..262a21afccfa79 100644
--- a/app/javascript/mastodon/features/link_timeline/index.tsx
+++ b/app/javascript/mastodon/features/link_timeline/index.tsx
@@ -36,13 +36,13 @@ export const LinkTimeline: React.FC<{
 
   const handleLoadMore = useCallback(
     (maxId: string) => {
-      dispatch(expandLinkTimeline(decodedUrl, { maxId }));
+      void dispatch(expandLinkTimeline(decodedUrl, { maxId }));
     },
     [dispatch, decodedUrl],
   );
 
   useEffect(() => {
-    dispatch(expandLinkTimeline(decodedUrl));
+    void dispatch(expandLinkTimeline(decodedUrl));
   }, [dispatch, decodedUrl]);
 
   return (

From d2e4be045655816fb0c512c3a953cfe9b062240d Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 19 Aug 2024 16:53:54 +0200
Subject: [PATCH 1880/2191] Hopefully fix notifications pagination flaky test
 (#31494)

---
 spec/requests/api/v1/notifications_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/requests/api/v1/notifications_spec.rb b/spec/requests/api/v1/notifications_spec.rb
index 3d1e8a4787bb6a..84e6db1e5163ce 100644
--- a/spec/requests/api/v1/notifications_spec.rb
+++ b/spec/requests/api/v1/notifications_spec.rb
@@ -185,7 +185,7 @@ def body_json_account_ids
       it 'returns the requested number of notifications paginated', :aggregate_failures do
         subject
 
-        notifications = user.account.notifications.browserable
+        notifications = user.account.notifications.browserable.order(id: :asc)
 
         expect(body_as_json.size)
           .to eq(params[:limit])

From d4f135bc6d280f834a7b3365fe0ef644cfe606b6 Mon Sep 17 00:00:00 2001
From: Edward Moulsdale <161692702+wheatear-dev@users.noreply.github.com>
Date: Mon, 19 Aug 2024 16:55:42 +0100
Subject: [PATCH 1881/2191] Fix in memoriam accounts appearing in follow
 recommendations (#31474)

Co-authored-by: Utkarsh Wankar <46633523+kernal053@users.noreply.github.com>
---
 app/models/account.rb                                     | 1 +
 .../account_suggestions/friends_of_friends_source.rb      | 1 +
 app/models/account_suggestions/source.rb                  | 1 +
 .../account_suggestions/friends_of_friends_source_spec.rb | 8 ++++++--
 spec/models/account_suggestions/source_spec.rb            | 2 ++
 5 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/models/account.rb b/app/models/account.rb
index 23ff07c76967eb..482eaa4aba9826 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -144,6 +144,7 @@ class Account < ApplicationRecord
   scope :dormant, -> { joins(:account_stat).merge(AccountStat.without_recent_activity) }
   scope :with_username, ->(value) { where arel_table[:username].lower.eq(value.to_s.downcase) }
   scope :with_domain, ->(value) { where arel_table[:domain].lower.eq(value&.to_s&.downcase) }
+  scope :without_memorial, -> { where(memorial: false) }
 
   after_update_commit :trigger_update_webhooks
 
diff --git a/app/models/account_suggestions/friends_of_friends_source.rb b/app/models/account_suggestions/friends_of_friends_source.rb
index 825b24f41981ed..707c6ccaec283d 100644
--- a/app/models/account_suggestions/friends_of_friends_source.rb
+++ b/app/models/account_suggestions/friends_of_friends_source.rb
@@ -31,6 +31,7 @@ def source_query(account, limit: DEFAULT_LIMIT)
         AND accounts.suspended_at IS NULL
         AND accounts.silenced_at IS NULL
         AND accounts.moved_to_account_id IS NULL
+        AND accounts.memorial = FALSE
         AND follow_recommendation_mutes.target_account_id IS NULL
       GROUP BY accounts.id, account_stats.id
       ORDER BY frequency DESC, account_stats.followers_count ASC
diff --git a/app/models/account_suggestions/source.rb b/app/models/account_suggestions/source.rb
index 7afc4c80edd3ba..9ae6bbbcc9587b 100644
--- a/app/models/account_suggestions/source.rb
+++ b/app/models/account_suggestions/source.rb
@@ -14,6 +14,7 @@ def base_account_scope(account)
       .searchable
       .where(discoverable: true)
       .without_silenced
+      .without_memorial
       .where.not(follows_sql, id: account.id)
       .where.not(follow_requests_sql, id: account.id)
       .not_excluded_by_account(account)
diff --git a/spec/models/account_suggestions/friends_of_friends_source_spec.rb b/spec/models/account_suggestions/friends_of_friends_source_spec.rb
index c2f8d0f86c3326..9daaa233bfd0c4 100644
--- a/spec/models/account_suggestions/friends_of_friends_source_spec.rb
+++ b/spec/models/account_suggestions/friends_of_friends_source_spec.rb
@@ -15,6 +15,7 @@
     let!(:john) { Fabricate(:account, discoverable: true, hide_collections: false) }
     let!(:jerk) { Fabricate(:account, discoverable: true, hide_collections: false) }
     let!(:larry) { Fabricate(:account, discoverable: true, hide_collections: false) }
+    let!(:morty) { Fabricate(:account, discoverable: true, hide_collections: false, memorial: true) }
 
     context 'with follows and blocks' do
       before do
@@ -27,8 +28,8 @@
         # alice follows eve and mallory
         [john, mallory].each { |account| alice.follow!(account) }
 
-        # eugen follows eve, john, jerk, larry and neil
-        [eve, mallory, jerk, larry, neil].each { |account| eugen.follow!(account) }
+        # eugen follows eve, john, jerk, larry, neil and morty
+        [eve, mallory, jerk, larry, neil, morty].each { |account| eugen.follow!(account) }
       end
 
       it 'returns eligible accounts', :aggregate_failures do
@@ -51,6 +52,9 @@
 
         # the suggestion for neil has already been rejected
         expect(results).to_not include([neil.id, :friends_of_friends])
+
+        # morty is not included because his account is in memoriam
+        expect(results).to_not include([morty.id, :friends_of_friends])
       end
     end
 
diff --git a/spec/models/account_suggestions/source_spec.rb b/spec/models/account_suggestions/source_spec.rb
index 16660940825a2e..ae0747413e6ecf 100644
--- a/spec/models/account_suggestions/source_spec.rb
+++ b/spec/models/account_suggestions/source_spec.rb
@@ -21,6 +21,7 @@
       let!(:moved_account) { Fabricate(:account, moved_to_account: Fabricate(:account), discoverable: true) }
       let!(:silenced_account) { Fabricate(:account, silenced: true, discoverable: true) }
       let!(:undiscoverable_account) { Fabricate(:account, discoverable: false) }
+      let!(:memorial_account) { Fabricate(:account, memorial: true, discoverable: true) }
 
       before do
         Fabricate :account_domain_block, account: account, domain: account_domain_blocked_account.domain
@@ -44,6 +45,7 @@
           .and not_include(moved_account)
           .and not_include(silenced_account)
           .and not_include(undiscoverable_account)
+          .and not_include(memorial_account)
       end
     end
   end

From 53c183f899b5382f1eebd72e34a090c30f8eba6a Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 19 Aug 2024 17:59:06 +0200
Subject: [PATCH 1882/2191] Reload notifications when accepted notifications
 are merged (streaming only) (#31419)

---
 .../v1/notifications/requests_controller.rb   | 10 +++-
 .../mastodon/actions/notification_groups.ts   | 43 +++++++++++++++-
 app/javascript/mastodon/actions/streaming.js  | 10 +++-
 .../features/notifications_v2/index.tsx       | 14 +++--
 .../mastodon/reducers/notification_groups.ts  | 13 ++++-
 .../accept_notification_request_service.rb    | 12 +++++
 app/workers/unfilter_notifications_worker.rb  | 29 ++++++++---
 config/routes/api.rb                          |  1 +
 .../api/v1/notifications/requests_spec.rb     | 30 +++++++++++
 ...ccept_notification_request_service_spec.rb |  3 +-
 .../unfilter_notifications_worker_spec.rb     | 51 +++++++++++++++++--
 11 files changed, 192 insertions(+), 24 deletions(-)

diff --git a/app/controllers/api/v1/notifications/requests_controller.rb b/app/controllers/api/v1/notifications/requests_controller.rb
index 0710166d05b89c..b820a2ed2e98cf 100644
--- a/app/controllers/api/v1/notifications/requests_controller.rb
+++ b/app/controllers/api/v1/notifications/requests_controller.rb
@@ -1,8 +1,10 @@
 # frozen_string_literal: true
 
 class Api::V1::Notifications::RequestsController < Api::BaseController
-  before_action -> { doorkeeper_authorize! :read, :'read:notifications' }, only: :index
-  before_action -> { doorkeeper_authorize! :write, :'write:notifications' }, except: :index
+  include Redisable
+
+  before_action -> { doorkeeper_authorize! :read, :'read:notifications' }, only: [:index, :show, :merged?]
+  before_action -> { doorkeeper_authorize! :write, :'write:notifications' }, except: [:index, :show, :merged?]
 
   before_action :require_user!
   before_action :set_request, only: [:show, :accept, :dismiss]
@@ -19,6 +21,10 @@ def index
     render json: @requests, each_serializer: REST::NotificationRequestSerializer, relationships: @relationships
   end
 
+  def merged?
+    render json: { merged: redis.get("notification_unfilter_jobs:#{current_account.id}").to_i <= 0 }
+  end
+
   def show
     render json: @request, serializer: REST::NotificationRequestSerializer
   end
diff --git a/app/javascript/mastodon/actions/notification_groups.ts b/app/javascript/mastodon/actions/notification_groups.ts
index fd6a48e9f37727..6b699706e2536a 100644
--- a/app/javascript/mastodon/actions/notification_groups.ts
+++ b/app/javascript/mastodon/actions/notification_groups.ts
@@ -138,8 +138,18 @@ export const processNewNotificationForGroups = createAppAsyncThunk(
 
 export const loadPending = createAction('notificationGroups/loadPending');
 
-export const updateScrollPosition = createAction<{ top: boolean }>(
+export const updateScrollPosition = createAppAsyncThunk(
   'notificationGroups/updateScrollPosition',
+  ({ top }: { top: boolean }, { dispatch, getState }) => {
+    if (
+      top &&
+      getState().notificationGroups.mergedNotifications === 'needs-reload'
+    ) {
+      void dispatch(fetchNotifications());
+    }
+
+    return { top };
+  },
 );
 
 export const setNotificationsFilter = createAppAsyncThunk(
@@ -165,5 +175,34 @@ export const markNotificationsAsRead = createAction(
   'notificationGroups/markAsRead',
 );
 
-export const mountNotifications = createAction('notificationGroups/mount');
+export const mountNotifications = createAppAsyncThunk(
+  'notificationGroups/mount',
+  (_, { dispatch, getState }) => {
+    const state = getState();
+
+    if (
+      state.notificationGroups.mounted === 0 &&
+      state.notificationGroups.mergedNotifications === 'needs-reload'
+    ) {
+      void dispatch(fetchNotifications());
+    }
+  },
+);
+
 export const unmountNotifications = createAction('notificationGroups/unmount');
+
+export const refreshStaleNotificationGroups = createAppAsyncThunk<{
+  deferredRefresh: boolean;
+}>('notificationGroups/refreshStale', (_, { dispatch, getState }) => {
+  const state = getState();
+
+  if (
+    state.notificationGroups.scrolledToTop ||
+    !state.notificationGroups.mounted
+  ) {
+    void dispatch(fetchNotifications());
+    return { deferredRefresh: false };
+  }
+
+  return { deferredRefresh: true };
+});
diff --git a/app/javascript/mastodon/actions/streaming.js b/app/javascript/mastodon/actions/streaming.js
index 630da3ef6e6132..e082aea43d9116 100644
--- a/app/javascript/mastodon/actions/streaming.js
+++ b/app/javascript/mastodon/actions/streaming.js
@@ -10,7 +10,7 @@ import {
   deleteAnnouncement,
 } from './announcements';
 import { updateConversations } from './conversations';
-import { processNewNotificationForGroups } from './notification_groups';
+import { processNewNotificationForGroups, refreshStaleNotificationGroups } from './notification_groups';
 import { updateNotifications, expandNotifications } from './notifications';
 import { updateStatus } from './statuses';
 import {
@@ -108,6 +108,14 @@ export const connectTimelineStream = (timelineId, channelName, params = {}, opti
           }
           break;
         }
+        case 'notifications_merged':
+          const state = getState();
+          if (state.notifications.top || !state.notifications.mounted)
+            dispatch(expandNotifications({ forceLoad: true, maxId: undefined }));
+          if(state.settings.getIn(['notifications', 'groupingBeta'], false)) {
+            dispatch(refreshStaleNotificationGroups());
+          }
+          break;
         case 'conversation':
           // @ts-expect-error
           dispatch(updateConversations(JSON.parse(data.payload)));
diff --git a/app/javascript/mastodon/features/notifications_v2/index.tsx b/app/javascript/mastodon/features/notifications_v2/index.tsx
index 63e602bdcc133d..29c49e05c814a2 100644
--- a/app/javascript/mastodon/features/notifications_v2/index.tsx
+++ b/app/javascript/mastodon/features/notifications_v2/index.tsx
@@ -81,7 +81,11 @@ export const Notifications: React.FC<{
 
   const anyPendingNotification = useAppSelector(selectAnyPendingNotification);
 
-  const isUnread = unreadNotificationsCount > 0;
+  const needsReload = useAppSelector(
+    (state) => state.notificationGroups.mergedNotifications === 'needs-reload',
+  );
+
+  const isUnread = unreadNotificationsCount > 0 || needsReload;
 
   const canMarkAsRead =
     useAppSelector(selectSettingsNotificationsShowUnread) &&
@@ -118,11 +122,11 @@ export const Notifications: React.FC<{
 
   // Keep track of mounted components for unread notification handling
   useEffect(() => {
-    dispatch(mountNotifications());
+    void dispatch(mountNotifications());
 
     return () => {
       dispatch(unmountNotifications());
-      dispatch(updateScrollPosition({ top: false }));
+      void dispatch(updateScrollPosition({ top: false }));
     };
   }, [dispatch]);
 
@@ -147,11 +151,11 @@ export const Notifications: React.FC<{
   }, [dispatch]);
 
   const handleScrollToTop = useDebouncedCallback(() => {
-    dispatch(updateScrollPosition({ top: true }));
+    void dispatch(updateScrollPosition({ top: true }));
   }, 100);
 
   const handleScroll = useDebouncedCallback(() => {
-    dispatch(updateScrollPosition({ top: false }));
+    void dispatch(updateScrollPosition({ top: false }));
   }, 100);
 
   useEffect(() => {
diff --git a/app/javascript/mastodon/reducers/notification_groups.ts b/app/javascript/mastodon/reducers/notification_groups.ts
index 0d3f34d2fbe159..0348f080ff2e76 100644
--- a/app/javascript/mastodon/reducers/notification_groups.ts
+++ b/app/javascript/mastodon/reducers/notification_groups.ts
@@ -19,6 +19,7 @@ import {
   markNotificationsAsRead,
   mountNotifications,
   unmountNotifications,
+  refreshStaleNotificationGroups,
 } from 'mastodon/actions/notification_groups';
 import {
   disconnectTimeline,
@@ -51,6 +52,7 @@ interface NotificationGroupsState {
   readMarkerId: string;
   mounted: number;
   isTabVisible: boolean;
+  mergedNotifications: 'ok' | 'pending' | 'needs-reload';
 }
 
 const initialState: NotificationGroupsState = {
@@ -58,6 +60,8 @@ const initialState: NotificationGroupsState = {
   pendingGroups: [], // holds pending groups in slow mode
   scrolledToTop: false,
   isLoading: false,
+  // this is used to track whether we need to refresh notifications after accepting requests
+  mergedNotifications: 'ok',
   // The following properties are used to track unread notifications
   lastReadId: '0', // used internally for unread notifications
   readMarkerId: '0', // user-facing and updated when focus changes
@@ -301,6 +305,7 @@ export const notificationGroupsReducer = createReducer<NotificationGroupsState>(
           json.type === 'gap' ? json : createNotificationGroupFromJSON(json),
         );
         state.isLoading = false;
+        state.mergedNotifications = 'ok';
         updateLastReadId(state);
       })
       .addCase(fetchNotificationsGap.fulfilled, (state, action) => {
@@ -455,7 +460,7 @@ export const notificationGroupsReducer = createReducer<NotificationGroupsState>(
         state.groups = state.pendingGroups.concat(state.groups);
         state.pendingGroups = [];
       })
-      .addCase(updateScrollPosition, (state, action) => {
+      .addCase(updateScrollPosition.fulfilled, (state, action) => {
         state.scrolledToTop = action.payload.top;
         updateLastReadId(state);
         trimNotifications(state);
@@ -482,7 +487,7 @@ export const notificationGroupsReducer = createReducer<NotificationGroupsState>(
             action.payload.markers.notifications.last_read_id;
         }
       })
-      .addCase(mountNotifications, (state) => {
+      .addCase(mountNotifications.fulfilled, (state) => {
         state.mounted += 1;
         commitLastReadId(state);
         updateLastReadId(state);
@@ -498,6 +503,10 @@ export const notificationGroupsReducer = createReducer<NotificationGroupsState>(
       .addCase(unfocusApp, (state) => {
         state.isTabVisible = false;
       })
+      .addCase(refreshStaleNotificationGroups.fulfilled, (state, action) => {
+        if (action.payload.deferredRefresh)
+          state.mergedNotifications = 'needs-reload';
+      })
       .addMatcher(
         isAnyOf(authorizeFollowRequestSuccess, rejectFollowRequestSuccess),
         (state, action) => {
diff --git a/app/services/accept_notification_request_service.rb b/app/services/accept_notification_request_service.rb
index ad27ae330074f6..60ec6bb3b6334a 100644
--- a/app/services/accept_notification_request_service.rb
+++ b/app/services/accept_notification_request_service.rb
@@ -1,9 +1,21 @@
 # frozen_string_literal: true
 
 class AcceptNotificationRequestService < BaseService
+  include Redisable
+
   def call(request)
     NotificationPermission.create!(account: request.account, from_account: request.from_account)
+    increment_worker_count!(request)
     UnfilterNotificationsWorker.perform_async(request.account_id, request.from_account_id)
     request.destroy!
   end
+
+  private
+
+  def increment_worker_count!(request)
+    with_redis do |redis|
+      redis.incr("notification_unfilter_jobs:#{request.account_id}")
+      redis.expire("notification_unfilter_jobs:#{request.account_id}", 30.minutes.to_i)
+    end
+  end
 end
diff --git a/app/workers/unfilter_notifications_worker.rb b/app/workers/unfilter_notifications_worker.rb
index 4351758907637f..53a35ce12ccabb 100644
--- a/app/workers/unfilter_notifications_worker.rb
+++ b/app/workers/unfilter_notifications_worker.rb
@@ -2,6 +2,7 @@
 
 class UnfilterNotificationsWorker
   include Sidekiq::Worker
+  include Redisable
 
   # Earlier versions of the feature passed a `notification_request` ID
   # If `to_account_id` is passed, the first argument is an account ID
@@ -9,19 +10,20 @@ class UnfilterNotificationsWorker
   def perform(notification_request_or_account_id, from_account_id = nil)
     if from_account_id.present?
       @notification_request = nil
-      @from_account = Account.find(from_account_id)
-      @recipient    = Account.find(notification_request_or_account_id)
+      @from_account = Account.find_by(id: from_account_id)
+      @recipient    = Account.find_by(id: notification_request_or_account_id)
     else
-      @notification_request = NotificationRequest.find(notification_request_or_account_id)
-      @from_account = @notification_request.from_account
-      @recipient    = @notification_request.account
+      @notification_request = NotificationRequest.find_by(id: notification_request_or_account_id)
+      @from_account = @notification_request&.from_account
+      @recipient    = @notification_request&.account
     end
 
+    return if @from_account.nil? || @recipient.nil?
+
     push_to_conversations!
     unfilter_notifications!
     remove_request!
-  rescue ActiveRecord::RecordNotFound
-    true
+    decrement_worker_count!
   end
 
   private
@@ -45,4 +47,17 @@ def filtered_notifications
   def notifications_with_private_mentions
     filtered_notifications.where(type: :mention).joins(mention: :status).merge(Status.where(visibility: :direct)).includes(mention: :status)
   end
+
+  def decrement_worker_count!
+    value = redis.decr("notification_unfilter_jobs:#{@recipient.id}")
+    push_streaming_event! if value <= 0 && subscribed_to_streaming_api?
+  end
+
+  def push_streaming_event!
+    redis.publish("timeline:#{@recipient.id}:notifications", Oj.dump(event: :notifications_merged, payload: '1'))
+  end
+
+  def subscribed_to_streaming_api?
+    redis.exists?("subscribed:timeline:#{@recipient.id}") || redis.exists?("subscribed:timeline:#{@recipient.id}:notifications")
+  end
 end
diff --git a/config/routes/api.rb b/config/routes/api.rb
index 488bdb7453eb8e..c5addd33854992 100644
--- a/config/routes/api.rb
+++ b/config/routes/api.rb
@@ -158,6 +158,7 @@
         collection do
           post :accept, to: 'requests#accept_bulk'
           post :dismiss, to: 'requests#dismiss_bulk'
+          get :merged, to: 'requests#merged?'
         end
 
         member do
diff --git a/spec/requests/api/v1/notifications/requests_spec.rb b/spec/requests/api/v1/notifications/requests_spec.rb
index e1fe17426a28a5..c385fb34995f38 100644
--- a/spec/requests/api/v1/notifications/requests_spec.rb
+++ b/spec/requests/api/v1/notifications/requests_spec.rb
@@ -120,4 +120,34 @@
       expect(response).to have_http_status(200)
     end
   end
+
+  describe 'GET /api/v1/notifications/requests/merged' do
+    subject do
+      get '/api/v1/notifications/requests/merged', headers: headers
+    end
+
+    it_behaves_like 'forbidden for wrong scope', 'write write:notifications'
+
+    context 'when the user has no accepted request pending merge' do
+      it 'returns http success and returns merged: true' do
+        subject
+
+        expect(response).to have_http_status(200)
+        expect(body_as_json).to eq({ merged: true })
+      end
+    end
+
+    context 'when the user has an accepted request pending merge' do
+      before do
+        redis.set("notification_unfilter_jobs:#{user.account_id}", 1)
+      end
+
+      it 'returns http success and returns merged: false' do
+        subject
+
+        expect(response).to have_http_status(200)
+        expect(body_as_json).to eq({ merged: false })
+      end
+    end
+  end
 end
diff --git a/spec/services/accept_notification_request_service_spec.rb b/spec/services/accept_notification_request_service_spec.rb
index bf67a52225f1d8..3c12c285a44c33 100644
--- a/spec/services/accept_notification_request_service_spec.rb
+++ b/spec/services/accept_notification_request_service_spec.rb
@@ -8,10 +8,11 @@
   let(:notification_request) { Fabricate(:notification_request) }
 
   describe '#call' do
-    it 'destroys the notification request, creates a permission, and queues a worker' do
+    it 'destroys the notification request, creates a permission, increases the jobs count and queues a worker' do
       expect { subject.call(notification_request) }
         .to change { NotificationRequest.exists?(notification_request.id) }.to(false)
         .and change { NotificationPermission.exists?(account_id: notification_request.account_id, from_account_id: notification_request.from_account_id) }.to(true)
+        .and change { redis.get("notification_unfilter_jobs:#{notification_request.account_id}").to_i }.by(1)
 
       expect(UnfilterNotificationsWorker).to have_enqueued_sidekiq_job(notification_request.account_id, notification_request.from_account_id)
     end
diff --git a/spec/workers/unfilter_notifications_worker_spec.rb b/spec/workers/unfilter_notifications_worker_spec.rb
index 3f43b298a50049..629eb644e4f2bb 100644
--- a/spec/workers/unfilter_notifications_worker_spec.rb
+++ b/spec/workers/unfilter_notifications_worker_spec.rb
@@ -13,13 +13,56 @@
     Fabricate(:notification, filtered: true, from_account: sender, account: recipient, type: :mention, activity: mention)
     follow_request = sender.request_follow!(recipient)
     Fabricate(:notification, filtered: true, from_account: sender, account: recipient, type: :follow_request, activity: follow_request)
+    allow(redis).to receive(:publish)
+    allow(redis).to receive(:exists?).and_return(false)
   end
 
   shared_examples 'shared behavior' do
-    it 'unfilters notifications and adds private messages to conversations' do
-      expect { subject }
-        .to change { recipient.notifications.where(from_account_id: sender.id).pluck(:filtered) }.from([true, true]).to([false, false])
-        .and change { recipient.conversations.exists?(last_status_id: sender.statuses.first.id) }.to(true)
+    context 'when this is the last pending merge job and the user is subscribed to streaming' do
+      before do
+        redis.set("notification_unfilter_jobs:#{recipient.id}", 1)
+        allow(redis).to receive(:exists?).with("subscribed:timeline:#{recipient.id}").and_return(true)
+      end
+
+      it 'unfilters notifications, adds private messages to conversations, and pushes to redis' do
+        expect { subject }
+          .to change { recipient.notifications.where(from_account_id: sender.id).pluck(:filtered) }.from([true, true]).to([false, false])
+          .and change { recipient.conversations.exists?(last_status_id: sender.statuses.first.id) }.to(true)
+          .and change { redis.get("notification_unfilter_jobs:#{recipient.id}").to_i }.by(-1)
+
+        expect(redis).to have_received(:publish).with("timeline:#{recipient.id}:notifications", '{"event":"notifications_merged","payload":"1"}')
+      end
+    end
+
+    context 'when this is not last pending merge job and the user is subscribed to streaming' do
+      before do
+        redis.set("notification_unfilter_jobs:#{recipient.id}", 2)
+        allow(redis).to receive(:exists?).with("subscribed:timeline:#{recipient.id}").and_return(true)
+      end
+
+      it 'unfilters notifications, adds private messages to conversations, and does not push to redis' do
+        expect { subject }
+          .to change { recipient.notifications.where(from_account_id: sender.id).pluck(:filtered) }.from([true, true]).to([false, false])
+          .and change { recipient.conversations.exists?(last_status_id: sender.statuses.first.id) }.to(true)
+          .and change { redis.get("notification_unfilter_jobs:#{recipient.id}").to_i }.by(-1)
+
+        expect(redis).to_not have_received(:publish).with("timeline:#{recipient.id}:notifications", '{"event":"notifications_merged","payload":"1"}')
+      end
+    end
+
+    context 'when this is the last pending merge job and the user is not subscribed to streaming' do
+      before do
+        redis.set("notification_unfilter_jobs:#{recipient.id}", 1)
+      end
+
+      it 'unfilters notifications, adds private messages to conversations, and does not push to redis' do
+        expect { subject }
+          .to change { recipient.notifications.where(from_account_id: sender.id).pluck(:filtered) }.from([true, true]).to([false, false])
+          .and change { recipient.conversations.exists?(last_status_id: sender.statuses.first.id) }.to(true)
+          .and change { redis.get("notification_unfilter_jobs:#{recipient.id}").to_i }.by(-1)
+
+        expect(redis).to_not have_received(:publish).with("timeline:#{recipient.id}:notifications", '{"event":"notifications_merged","payload":"1"}')
+      end
     end
   end
 

From a7751d26e7293a7d93bdc2270ebd22a79e647d1e Mon Sep 17 00:00:00 2001
From: Emelia Smith <ThisIsMissEm@users.noreply.github.com>
Date: Mon, 19 Aug 2024 14:28:06 +0200
Subject: [PATCH 1883/2191] [Glitch] Disable rule selector in
 ReportReasonSelector if instance has no rules

Port 71f257d5291a091cfb005d28221d4ab38698ef42 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/components/admin/ReportReasonSelector.jsx   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/flavours/glitch/components/admin/ReportReasonSelector.jsx b/app/javascript/flavours/glitch/components/admin/ReportReasonSelector.jsx
index 323e0b0d394347..60e7f39e168427 100644
--- a/app/javascript/flavours/glitch/components/admin/ReportReasonSelector.jsx
+++ b/app/javascript/flavours/glitch/components/admin/ReportReasonSelector.jsx
@@ -153,7 +153,7 @@ class ReportReasonSelector extends PureComponent {
         <Category id='other' text={intl.formatMessage(messages.other)} selected={category === 'other'} onSelect={this.handleSelect} disabled={disabled} />
         <Category id='legal' text={intl.formatMessage(messages.legal)} selected={category === 'legal'} onSelect={this.handleSelect} disabled={disabled} />
         <Category id='spam' text={intl.formatMessage(messages.spam)} selected={category === 'spam'} onSelect={this.handleSelect} disabled={disabled} />
-        <Category id='violation' text={intl.formatMessage(messages.violation)} selected={category === 'violation'} onSelect={this.handleSelect} disabled={disabled}>
+        <Category id='violation' text={intl.formatMessage(messages.violation)} selected={category === 'violation'} onSelect={this.handleSelect} disabled={disabled || rules.length === 0}>
           {rules.map(rule => <Rule key={rule.id} id={rule.id} text={rule.text} selected={rule_ids.includes(rule.id)} onToggle={this.handleToggle} disabled={disabled} />)}
         </Category>
       </div>

From 99ffae7d4486059496033b93fde486539a3e60b0 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 19 Aug 2024 16:41:32 +0200
Subject: [PATCH 1884/2191] [Glitch] Refactor some actions to be proper async
 actions instead of passing a continuation

Port 1e612c5a09097ef62f26bb9882125dc2d53c92df to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/actions/notifications.js  | 14 +++--
 .../actions/notifications_migration.tsx       |  2 +-
 .../flavours/glitch/actions/streaming.js      | 27 ++++------
 .../flavours/glitch/actions/timelines.js      | 52 ++++++++-----------
 .../glitch/features/link_timeline/index.tsx   |  4 +-
 5 files changed, 43 insertions(+), 56 deletions(-)

diff --git a/app/javascript/flavours/glitch/actions/notifications.js b/app/javascript/flavours/glitch/actions/notifications.js
index 86e2d6eb4eb20e..e1bf4ffb60f72a 100644
--- a/app/javascript/flavours/glitch/actions/notifications.js
+++ b/app/javascript/flavours/glitch/actions/notifications.js
@@ -200,8 +200,8 @@ const noOp = () => {};
 
 let expandNotificationsController = new AbortController();
 
-export function expandNotifications({ maxId, forceLoad = false } = {}, done = noOp) {
-  return (dispatch, getState) => {
+export function expandNotifications({ maxId = undefined, forceLoad = false }) {
+  return async (dispatch, getState) => {
     const activeFilter = getState().getIn(['settings', 'notifications', 'quickFilter', 'active']);
     const notifications = getState().get('notifications');
     const isLoadingMore = !!maxId;
@@ -211,7 +211,6 @@ export function expandNotifications({ maxId, forceLoad = false } = {}, done = no
         expandNotificationsController.abort();
         expandNotificationsController = new AbortController();
       } else {
-        done();
         return;
       }
     }
@@ -238,7 +237,8 @@ export function expandNotifications({ maxId, forceLoad = false } = {}, done = no
 
     dispatch(expandNotificationsRequest(isLoadingMore));
 
-    api().get('/api/v1/notifications', { params, signal: expandNotificationsController.signal }).then(response => {
+    try {
+      const response = await api().get('/api/v1/notifications', { params, signal: expandNotificationsController.signal });
       const next = getLinks(response).refs.find(link => link.rel === 'next');
 
       dispatch(importFetchedAccounts(response.data.map(item => item.account)));
@@ -248,11 +248,9 @@ export function expandNotifications({ maxId, forceLoad = false } = {}, done = no
       dispatch(expandNotificationsSuccess(response.data, next ? next.uri : null, isLoadingMore, isLoadingRecent, isLoadingRecent && preferPendingItems));
       fetchRelatedRelationships(dispatch, response.data);
       dispatch(submitMarkers());
-    }).catch(error => {
+    } catch(error) {
       dispatch(expandNotificationsFail(error, isLoadingMore));
-    }).finally(() => {
-      done();
-    });
+    }
   };
 }
 
diff --git a/app/javascript/flavours/glitch/actions/notifications_migration.tsx b/app/javascript/flavours/glitch/actions/notifications_migration.tsx
index 32844d4b42e2d6..3acceef0f8a07a 100644
--- a/app/javascript/flavours/glitch/actions/notifications_migration.tsx
+++ b/app/javascript/flavours/glitch/actions/notifications_migration.tsx
@@ -13,6 +13,6 @@ export const initializeNotifications = createAppAsyncThunk(
     ) as boolean;
 
     if (enableBeta) void dispatch(fetchNotifications());
-    else dispatch(expandNotifications());
+    else void dispatch(expandNotifications());
   },
 );
diff --git a/app/javascript/flavours/glitch/actions/streaming.js b/app/javascript/flavours/glitch/actions/streaming.js
index 2d69542fc70333..f7f7755acd9770 100644
--- a/app/javascript/flavours/glitch/actions/streaming.js
+++ b/app/javascript/flavours/glitch/actions/streaming.js
@@ -37,7 +37,7 @@ const randomUpTo = max =>
  * @param {string} channelName
  * @param {Object.<string, string>} params
  * @param {Object} options
- * @param {function(Function, Function): void} [options.fallback]
+ * @param {function(Function): Promise<void>} [options.fallback]
  * @param {function(): void} [options.fillGaps]
  * @param {function(object): boolean} [options.accept]
  * @returns {function(): void}
@@ -52,14 +52,13 @@ export const connectTimelineStream = (timelineId, channelName, params = {}, opti
     let pollingId;
 
     /**
-     * @param {function(Function, Function): void} fallback
+     * @param {function(Function): Promise<void>} fallback
      */
 
-    const useFallback = fallback => {
-      fallback(dispatch, () => {
-        // eslint-disable-next-line react-hooks/rules-of-hooks -- this is not a react hook
-        pollingId = setTimeout(() => useFallback(fallback), 20000 + randomUpTo(20000));
-      });
+    const useFallback = async fallback => {
+      await fallback(dispatch);
+      // eslint-disable-next-line react-hooks/rules-of-hooks -- this is not a react hook
+      pollingId = setTimeout(() => useFallback(fallback), 20000 + randomUpTo(20000));
     };
 
     return {
@@ -132,21 +131,17 @@ export const connectTimelineStream = (timelineId, channelName, params = {}, opti
 
 /**
  * @param {Function} dispatch
- * @param {function(): void} done
  */
-const refreshHomeTimelineAndNotification = (dispatch, done) => {
-  // @ts-expect-error
-  dispatch(expandHomeTimeline({}, () =>
-    // @ts-expect-error
-    dispatch(expandNotifications({}, () =>
-      dispatch(fetchAnnouncements(done))))));
-};
+async function refreshHomeTimelineAndNotification(dispatch) {
+  await dispatch(expandHomeTimeline({ maxId: undefined }));
+  await dispatch(expandNotifications({}));
+  await dispatch(fetchAnnouncements());
+}
 
 /**
  * @returns {function(): void}
  */
 export const connectUserStream = () =>
-  // @ts-expect-error
   connectTimelineStream('home', 'user', {}, { fallback: refreshHomeTimelineAndNotification, fillGaps: fillHomeTimelineGaps });
 
 /**
diff --git a/app/javascript/flavours/glitch/actions/timelines.js b/app/javascript/flavours/glitch/actions/timelines.js
index eb5050f1524f0a..1d5a696c92da5b 100644
--- a/app/javascript/flavours/glitch/actions/timelines.js
+++ b/app/javascript/flavours/glitch/actions/timelines.js
@@ -87,21 +87,18 @@ export function clearTimeline(timeline) {
   };
 }
 
-const noOp = () => {};
-
 const parseTags = (tags = {}, mode) => {
   return (tags[mode] || []).map((tag) => {
     return tag.value;
   });
 };
 
-export function expandTimeline(timelineId, path, params = {}, done = noOp) {
-  return (dispatch, getState) => {
+export function expandTimeline(timelineId, path, params = {}) {
+  return async (dispatch, getState) => {
     const timeline = getState().getIn(['timelines', timelineId], ImmutableMap());
     const isLoadingMore = !!params.max_id;
 
     if (timeline.get('isLoading')) {
-      done();
       return;
     }
 
@@ -120,7 +117,8 @@ export function expandTimeline(timelineId, path, params = {}, done = noOp) {
 
     dispatch(expandTimelineRequest(timelineId, isLoadingMore));
 
-    api().get(path, { params }).then(response => {
+    try {
+      const response = await api().get(path, { params });
       const next = getLinks(response).refs.find(link => link.rel === 'next');
 
       dispatch(importFetchedStatuses(response.data));
@@ -138,53 +136,49 @@ export function expandTimeline(timelineId, path, params = {}, done = noOp) {
       if (timelineId === 'home') {
         dispatch(submitMarkers());
       }
-    }).catch(error => {
+    } catch(error) {
       dispatch(expandTimelineFail(timelineId, error, isLoadingMore));
-    }).finally(() => {
-      done();
-    });
+    }
   };
 }
 
-export function fillTimelineGaps(timelineId, path, params = {}, done = noOp) {
-  return (dispatch, getState) => {
+export function fillTimelineGaps(timelineId, path, params = {}) {
+  return async (dispatch, getState) => {
     const timeline = getState().getIn(['timelines', timelineId], ImmutableMap());
     const items = timeline.get('items');
     const nullIndexes = items.map((statusId, index) => statusId === null ? index : null);
     const gaps = nullIndexes.map(index => index > 0 ? items.get(index - 1) : null);
 
     // Only expand at most two gaps to avoid doing too many requests
-    done = gaps.take(2).reduce((done, maxId) => {
-      return (() => dispatch(expandTimeline(timelineId, path, { ...params, maxId }, done)));
-    }, done);
-
-    done();
+    for (const maxId of gaps.take(2)) {
+      await dispatch(expandTimeline(timelineId, path, { ...params, maxId }));
+    }
   };
 }
 
-export const expandHomeTimeline            = ({ maxId } = {}, done = noOp) => expandTimeline('home', '/api/v1/timelines/home', { max_id: maxId }, done);
-export const expandPublicTimeline          = ({ maxId, onlyMedia, onlyRemote, allowLocalOnly } = {}, done = noOp) => expandTimeline(`public${onlyRemote ? ':remote' : (allowLocalOnly ? ':allow_local_only' : '')}${onlyMedia ? ':media' : ''}`, '/api/v1/timelines/public', { remote: !!onlyRemote, allow_local_only: !!allowLocalOnly, max_id: maxId, only_media: !!onlyMedia }, done);
-export const expandCommunityTimeline       = ({ maxId, onlyMedia } = {}, done = noOp) => expandTimeline(`community${onlyMedia ? ':media' : ''}`, '/api/v1/timelines/public', { local: true, max_id: maxId, only_media: !!onlyMedia }, done);
-export const expandDirectTimeline          = ({ maxId } = {}, done = noOp) => expandTimeline('direct', '/api/v1/timelines/direct', { max_id: maxId }, done);
+export const expandHomeTimeline            = ({ maxId } = {}) => expandTimeline('home', '/api/v1/timelines/home', { max_id: maxId });
+export const expandPublicTimeline          = ({ maxId, onlyMedia, onlyRemote, allowLocalOnly } = {}) => expandTimeline(`public${onlyRemote ? ':remote' : (allowLocalOnly ? ':allow_local_only' : '')}${onlyMedia ? ':media' : ''}`, '/api/v1/timelines/public', { remote: !!onlyRemote, allow_local_only: !!allowLocalOnly, max_id: maxId, only_media: !!onlyMedia });
+export const expandCommunityTimeline       = ({ maxId, onlyMedia } = {}) => expandTimeline(`community${onlyMedia ? ':media' : ''}`, '/api/v1/timelines/public', { local: true, max_id: maxId, only_media: !!onlyMedia });
+export const expandDirectTimeline          = ({ maxId } = {}) => expandTimeline('direct', '/api/v1/timelines/direct', { max_id: maxId });
 export const expandAccountTimeline         = (accountId, { maxId, withReplies, tagged } = {}) => expandTimeline(`account:${accountId}${withReplies ? ':with_replies' : ''}${tagged ? `:${tagged}` : ''}`, `/api/v1/accounts/${accountId}/statuses`, { exclude_replies: !withReplies, exclude_reblogs: withReplies, tagged, max_id: maxId });
 export const expandAccountFeaturedTimeline = (accountId, { tagged } = {}) => expandTimeline(`account:${accountId}:pinned`, `/api/v1/accounts/${accountId}/statuses`, { pinned: true, tagged });
 export const expandAccountMediaTimeline    = (accountId, { maxId } = {}) => expandTimeline(`account:${accountId}:media`, `/api/v1/accounts/${accountId}/statuses`, { max_id: maxId, only_media: true, limit: 40 });
-export const expandListTimeline            = (id, { maxId } = {}, done = noOp) => expandTimeline(`list:${id}`, `/api/v1/timelines/list/${id}`, { max_id: maxId }, done);
-export const expandLinkTimeline            = (url, { maxId } = {}, done = noOp) => expandTimeline(`link:${url}`, `/api/v1/timelines/link`, { url, max_id: maxId }, done);
-export const expandHashtagTimeline         = (hashtag, { maxId, tags, local } = {}, done = noOp) => {
+export const expandListTimeline            = (id, { maxId } = {}) => expandTimeline(`list:${id}`, `/api/v1/timelines/list/${id}`, { max_id: maxId });
+export const expandLinkTimeline            = (url, { maxId } = {}) => expandTimeline(`link:${url}`, `/api/v1/timelines/link`, { url, max_id: maxId });
+export const expandHashtagTimeline         = (hashtag, { maxId, tags, local } = {}) => {
   return expandTimeline(`hashtag:${hashtag}${local ? ':local' : ''}`, `/api/v1/timelines/tag/${hashtag}`, {
     max_id: maxId,
     any:    parseTags(tags, 'any'),
     all:    parseTags(tags, 'all'),
     none:   parseTags(tags, 'none'),
     local:  local,
-  }, done);
+  });
 };
 
-export const fillHomeTimelineGaps      = (done = noOp) => fillTimelineGaps('home', '/api/v1/timelines/home', {}, done);
-export const fillPublicTimelineGaps    = ({ onlyMedia, onlyRemote, allowLocalOnly } = {}, done = noOp) => fillTimelineGaps(`public${onlyRemote ? ':remote' : (allowLocalOnly ? ':allow_local_only' : '')}${onlyMedia ? ':media' : ''}`, '/api/v1/timelines/public', { remote: !!onlyRemote, only_media: !!onlyMedia, allow_local_only: !!allowLocalOnly }, done);
-export const fillCommunityTimelineGaps = ({ onlyMedia } = {}, done = noOp) => fillTimelineGaps(`community${onlyMedia ? ':media' : ''}`, '/api/v1/timelines/public', { local: true, only_media: !!onlyMedia }, done);
-export const fillListTimelineGaps      = (id, done = noOp) => fillTimelineGaps(`list:${id}`, `/api/v1/timelines/list/${id}`, {}, done);
+export const fillHomeTimelineGaps      = () => fillTimelineGaps('home', '/api/v1/timelines/home', {});
+export const fillPublicTimelineGaps    = ({ onlyMedia, onlyRemote, allowLocalOnly } = {}) => fillTimelineGaps(`public${onlyRemote ? ':remote' : (allowLocalOnly ? ':allow_local_only' : '')}${onlyMedia ? ':media' : ''}`, '/api/v1/timelines/public', { remote: !!onlyRemote, only_media: !!onlyMedia, allow_local_only: !!allowLocalOnly });
+export const fillCommunityTimelineGaps = ({ onlyMedia } = {}) => fillTimelineGaps(`community${onlyMedia ? ':media' : ''}`, '/api/v1/timelines/public', { local: true, only_media: !!onlyMedia });
+export const fillListTimelineGaps      = (id) => fillTimelineGaps(`list:${id}`, `/api/v1/timelines/list/${id}`, {});
 
 export function expandTimelineRequest(timeline, isLoadingMore) {
   return {
diff --git a/app/javascript/flavours/glitch/features/link_timeline/index.tsx b/app/javascript/flavours/glitch/features/link_timeline/index.tsx
index bbe295d4741675..2a5ae9a156d26c 100644
--- a/app/javascript/flavours/glitch/features/link_timeline/index.tsx
+++ b/app/javascript/flavours/glitch/features/link_timeline/index.tsx
@@ -36,13 +36,13 @@ export const LinkTimeline: React.FC<{
 
   const handleLoadMore = useCallback(
     (maxId: string) => {
-      dispatch(expandLinkTimeline(decodedUrl, { maxId }));
+      void dispatch(expandLinkTimeline(decodedUrl, { maxId }));
     },
     [dispatch, decodedUrl],
   );
 
   useEffect(() => {
-    dispatch(expandLinkTimeline(decodedUrl));
+    void dispatch(expandLinkTimeline(decodedUrl));
   }, [dispatch, decodedUrl]);
 
   return (

From bfd01110d86001e29b746d026655982e5dab21ea Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 19 Aug 2024 17:59:06 +0200
Subject: [PATCH 1885/2191] [Glitch] Reload notifications when accepted
 notifications are merged (streaming only)

Port 53c183f899b5382f1eebd72e34a090c30f8eba6a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../glitch/actions/notification_groups.ts     | 43 ++++++++++++++++++-
 .../flavours/glitch/actions/streaming.js      | 10 ++++-
 .../features/notifications_v2/index.tsx       | 14 +++---
 .../glitch/reducers/notification_groups.ts    | 13 +++++-
 4 files changed, 70 insertions(+), 10 deletions(-)

diff --git a/app/javascript/flavours/glitch/actions/notification_groups.ts b/app/javascript/flavours/glitch/actions/notification_groups.ts
index 49a1a1362f1169..3d970e57f352de 100644
--- a/app/javascript/flavours/glitch/actions/notification_groups.ts
+++ b/app/javascript/flavours/glitch/actions/notification_groups.ts
@@ -138,8 +138,18 @@ export const processNewNotificationForGroups = createAppAsyncThunk(
 
 export const loadPending = createAction('notificationGroups/loadPending');
 
-export const updateScrollPosition = createAction<{ top: boolean }>(
+export const updateScrollPosition = createAppAsyncThunk(
   'notificationGroups/updateScrollPosition',
+  ({ top }: { top: boolean }, { dispatch, getState }) => {
+    if (
+      top &&
+      getState().notificationGroups.mergedNotifications === 'needs-reload'
+    ) {
+      void dispatch(fetchNotifications());
+    }
+
+    return { top };
+  },
 );
 
 export const setNotificationsFilter = createAppAsyncThunk(
@@ -165,5 +175,34 @@ export const markNotificationsAsRead = createAction(
   'notificationGroups/markAsRead',
 );
 
-export const mountNotifications = createAction('notificationGroups/mount');
+export const mountNotifications = createAppAsyncThunk(
+  'notificationGroups/mount',
+  (_, { dispatch, getState }) => {
+    const state = getState();
+
+    if (
+      state.notificationGroups.mounted === 0 &&
+      state.notificationGroups.mergedNotifications === 'needs-reload'
+    ) {
+      void dispatch(fetchNotifications());
+    }
+  },
+);
+
 export const unmountNotifications = createAction('notificationGroups/unmount');
+
+export const refreshStaleNotificationGroups = createAppAsyncThunk<{
+  deferredRefresh: boolean;
+}>('notificationGroups/refreshStale', (_, { dispatch, getState }) => {
+  const state = getState();
+
+  if (
+    state.notificationGroups.scrolledToTop ||
+    !state.notificationGroups.mounted
+  ) {
+    void dispatch(fetchNotifications());
+    return { deferredRefresh: false };
+  }
+
+  return { deferredRefresh: true };
+});
diff --git a/app/javascript/flavours/glitch/actions/streaming.js b/app/javascript/flavours/glitch/actions/streaming.js
index f7f7755acd9770..f5beff55d6ff36 100644
--- a/app/javascript/flavours/glitch/actions/streaming.js
+++ b/app/javascript/flavours/glitch/actions/streaming.js
@@ -10,7 +10,7 @@ import {
   deleteAnnouncement,
 } from './announcements';
 import { updateConversations } from './conversations';
-import { processNewNotificationForGroups } from './notification_groups';
+import { processNewNotificationForGroups, refreshStaleNotificationGroups } from './notification_groups';
 import { updateNotifications, expandNotifications } from './notifications';
 import { updateStatus } from './statuses';
 import {
@@ -108,6 +108,14 @@ export const connectTimelineStream = (timelineId, channelName, params = {}, opti
           }
           break;
         }
+        case 'notifications_merged':
+          const state = getState();
+          if (state.notifications.top || !state.notifications.mounted)
+            dispatch(expandNotifications({ forceLoad: true, maxId: undefined }));
+          if(state.settings.getIn(['notifications', 'groupingBeta'], false)) {
+            dispatch(refreshStaleNotificationGroups());
+          }
+          break;
         case 'conversation':
           // @ts-expect-error
           dispatch(updateConversations(JSON.parse(data.payload)));
diff --git a/app/javascript/flavours/glitch/features/notifications_v2/index.tsx b/app/javascript/flavours/glitch/features/notifications_v2/index.tsx
index 84fde80008459d..f5bf7adda3df00 100644
--- a/app/javascript/flavours/glitch/features/notifications_v2/index.tsx
+++ b/app/javascript/flavours/glitch/features/notifications_v2/index.tsx
@@ -81,7 +81,11 @@ export const Notifications: React.FC<{
 
   const anyPendingNotification = useAppSelector(selectAnyPendingNotification);
 
-  const isUnread = unreadNotificationsCount > 0;
+  const needsReload = useAppSelector(
+    (state) => state.notificationGroups.mergedNotifications === 'needs-reload',
+  );
+
+  const isUnread = unreadNotificationsCount > 0 || needsReload;
 
   const canMarkAsRead =
     useAppSelector(selectSettingsNotificationsShowUnread) &&
@@ -118,11 +122,11 @@ export const Notifications: React.FC<{
 
   // Keep track of mounted components for unread notification handling
   useEffect(() => {
-    dispatch(mountNotifications());
+    void dispatch(mountNotifications());
 
     return () => {
       dispatch(unmountNotifications());
-      dispatch(updateScrollPosition({ top: false }));
+      void dispatch(updateScrollPosition({ top: false }));
     };
   }, [dispatch]);
 
@@ -147,11 +151,11 @@ export const Notifications: React.FC<{
   }, [dispatch]);
 
   const handleScrollToTop = useDebouncedCallback(() => {
-    dispatch(updateScrollPosition({ top: true }));
+    void dispatch(updateScrollPosition({ top: true }));
   }, 100);
 
   const handleScroll = useDebouncedCallback(() => {
-    dispatch(updateScrollPosition({ top: false }));
+    void dispatch(updateScrollPosition({ top: false }));
   }, 100);
 
   useEffect(() => {
diff --git a/app/javascript/flavours/glitch/reducers/notification_groups.ts b/app/javascript/flavours/glitch/reducers/notification_groups.ts
index a721e4008d129b..af8e7a5e8ccd38 100644
--- a/app/javascript/flavours/glitch/reducers/notification_groups.ts
+++ b/app/javascript/flavours/glitch/reducers/notification_groups.ts
@@ -19,6 +19,7 @@ import {
   markNotificationsAsRead,
   mountNotifications,
   unmountNotifications,
+  refreshStaleNotificationGroups,
 } from 'flavours/glitch/actions/notification_groups';
 import {
   disconnectTimeline,
@@ -51,6 +52,7 @@ interface NotificationGroupsState {
   readMarkerId: string;
   mounted: number;
   isTabVisible: boolean;
+  mergedNotifications: 'ok' | 'pending' | 'needs-reload';
 }
 
 const initialState: NotificationGroupsState = {
@@ -58,6 +60,8 @@ const initialState: NotificationGroupsState = {
   pendingGroups: [], // holds pending groups in slow mode
   scrolledToTop: false,
   isLoading: false,
+  // this is used to track whether we need to refresh notifications after accepting requests
+  mergedNotifications: 'ok',
   // The following properties are used to track unread notifications
   lastReadId: '0', // used internally for unread notifications
   readMarkerId: '0', // user-facing and updated when focus changes
@@ -301,6 +305,7 @@ export const notificationGroupsReducer = createReducer<NotificationGroupsState>(
           json.type === 'gap' ? json : createNotificationGroupFromJSON(json),
         );
         state.isLoading = false;
+        state.mergedNotifications = 'ok';
         updateLastReadId(state);
       })
       .addCase(fetchNotificationsGap.fulfilled, (state, action) => {
@@ -455,7 +460,7 @@ export const notificationGroupsReducer = createReducer<NotificationGroupsState>(
         state.groups = state.pendingGroups.concat(state.groups);
         state.pendingGroups = [];
       })
-      .addCase(updateScrollPosition, (state, action) => {
+      .addCase(updateScrollPosition.fulfilled, (state, action) => {
         state.scrolledToTop = action.payload.top;
         updateLastReadId(state);
         trimNotifications(state);
@@ -482,7 +487,7 @@ export const notificationGroupsReducer = createReducer<NotificationGroupsState>(
             action.payload.markers.notifications.last_read_id;
         }
       })
-      .addCase(mountNotifications, (state) => {
+      .addCase(mountNotifications.fulfilled, (state) => {
         state.mounted += 1;
         commitLastReadId(state);
         updateLastReadId(state);
@@ -498,6 +503,10 @@ export const notificationGroupsReducer = createReducer<NotificationGroupsState>(
       .addCase(unfocusApp, (state) => {
         state.isTabVisible = false;
       })
+      .addCase(refreshStaleNotificationGroups.fulfilled, (state, action) => {
+        if (action.payload.deferredRefresh)
+          state.mergedNotifications = 'needs-reload';
+      })
       .addMatcher(
         isAnyOf(authorizeFollowRequestSuccess, rejectFollowRequestSuccess),
         (state, action) => {

From a7a2ff6c1d61223220590ccb3af4bfa0480587c1 Mon Sep 17 00:00:00 2001
From: Michael Stanclift <mx@vmstan.com>
Date: Mon, 19 Aug 2024 14:44:28 -0500
Subject: [PATCH 1886/2191] Use Dockerfile ADD to obtain ffmpeg and libvips
 source (#31498)

---
 Dockerfile | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 65440bb28117ac..cd555f7027d018 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -196,11 +196,14 @@ ARG VIPS_VERSION=8.15.3
 ARG VIPS_URL=https://github.com/libvips/libvips/releases/download
 
 WORKDIR /usr/local/libvips/src
+# Download and extract libvips source code
+ADD ${VIPS_URL}/v${VIPS_VERSION}/vips-${VIPS_VERSION}.tar.xz /usr/local/libvips/src/
+RUN tar xf vips-${VIPS_VERSION}.tar.xz;
 
+WORKDIR /usr/local/libvips/src/vips-${VIPS_VERSION}
+
+# Configure and compile libvips
 RUN \
-  curl -sSL -o vips-${VIPS_VERSION}.tar.xz ${VIPS_URL}/v${VIPS_VERSION}/vips-${VIPS_VERSION}.tar.xz; \
-  tar xf vips-${VIPS_VERSION}.tar.xz; \
-  cd vips-${VIPS_VERSION}; \
   meson setup build --prefix /usr/local/libvips --libdir=lib -Ddeprecated=false -Dintrospection=disabled -Dmodules=disabled -Dexamples=false; \
   cd build; \
   ninja; \
@@ -216,11 +219,14 @@ ARG FFMPEG_VERSION=7.0.2
 ARG FFMPEG_URL=https://ffmpeg.org/releases
 
 WORKDIR /usr/local/ffmpeg/src
+# Download and extract ffmpeg source code
+ADD ${FFMPEG_URL}/ffmpeg-${FFMPEG_VERSION}.tar.xz /usr/local/ffmpeg/src/
+RUN tar xf ffmpeg-${FFMPEG_VERSION}.tar.xz;
+
+WORKDIR /usr/local/ffmpeg/src/ffmpeg-${FFMPEG_VERSION}
 
+# Configure and compile ffmpeg
 RUN \
-  curl -sSL -o ffmpeg-${FFMPEG_VERSION}.tar.xz ${FFMPEG_URL}/ffmpeg-${FFMPEG_VERSION}.tar.xz; \
-  tar xf ffmpeg-${FFMPEG_VERSION}.tar.xz; \
-  cd ffmpeg-${FFMPEG_VERSION}; \
   ./configure \
     --prefix=/usr/local/ffmpeg \
     --toolchain=hardened \

From 98bf2fc27c6204527d8da5bc3847bd8406f1bfe8 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Tue, 20 Aug 2024 00:11:58 +0200
Subject: [PATCH 1887/2191] Improve the list selection UI for notification
 requests (#31457)

---
 .../features/notifications/requests.jsx       | 121 +++++++-----------
 app/javascript/mastodon/locales/en.json       |  22 ++--
 .../styles/mastodon-light/variables.scss      |   1 +
 .../styles/mastodon/components.scss           |  26 ++--
 app/javascript/styles/mastodon/variables.scss |   1 +
 5 files changed, 70 insertions(+), 101 deletions(-)

diff --git a/app/javascript/mastodon/features/notifications/requests.jsx b/app/javascript/mastodon/features/notifications/requests.jsx
index f323bda4fbc1d7..f35c042ba6c7e4 100644
--- a/app/javascript/mastodon/features/notifications/requests.jsx
+++ b/app/javascript/mastodon/features/notifications/requests.jsx
@@ -7,6 +7,7 @@ import { Helmet } from 'react-helmet';
 
 import { useSelector, useDispatch } from 'react-redux';
 
+import ArrowDropDownIcon from '@/material-icons/400-24px/arrow_drop_down.svg?react';
 import InventoryIcon from '@/material-icons/400-24px/inventory_2.svg?react';
 import MoreHorizIcon from '@/material-icons/400-24px/more_horiz.svg?react';
 import { openModal } from 'mastodon/actions/modal';
@@ -15,6 +16,7 @@ import { changeSetting } from 'mastodon/actions/settings';
 import { CheckBox } from 'mastodon/components/check_box';
 import Column from 'mastodon/components/column';
 import ColumnHeader from 'mastodon/components/column_header';
+import { Icon } from 'mastodon/components/icon';
 import ScrollableList from 'mastodon/components/scrollable_list';
 import DropdownMenuContainer from 'mastodon/containers/dropdown_menu_container';
 
@@ -26,16 +28,14 @@ const messages = defineMessages({
   title: { id: 'notification_requests.title', defaultMessage: 'Filtered notifications' },
   maximize: { id: 'notification_requests.maximize', defaultMessage: 'Maximize' },
   more: { id: 'status.more', defaultMessage: 'More' },
-  acceptAll: { id: 'notification_requests.accept_all', defaultMessage: 'Accept all' },
-  dismissAll: { id: 'notification_requests.dismiss_all', defaultMessage: 'Dismiss all' },
-  acceptMultiple: { id: 'notification_requests.accept_multiple', defaultMessage: '{count, plural, one {Accept # request} other {Accept # requests}}' },
-  dismissMultiple: { id: 'notification_requests.dismiss_multiple', defaultMessage: '{count, plural, one {Dismiss # request} other {Dismiss # requests}}' },
-  confirmAcceptAllTitle: { id: 'notification_requests.confirm_accept_all.title', defaultMessage: 'Accept notification requests?' },
-  confirmAcceptAllMessage: { id: 'notification_requests.confirm_accept_all.message', defaultMessage: 'You are about to accept {count, plural, one {one notification request} other {# notification requests}}. Are you sure you want to proceed?' },
-  confirmAcceptAllButton: { id: 'notification_requests.confirm_accept_all.button', defaultMessage: 'Accept all' },
-  confirmDismissAllTitle: { id: 'notification_requests.confirm_dismiss_all.title', defaultMessage: 'Dismiss notification requests?' },
-  confirmDismissAllMessage: { id: 'notification_requests.confirm_dismiss_all.message', defaultMessage: "You are about to dismiss {count, plural, one {one notification request} other {# notification requests}}. You won't be able to easily access {count, plural, one {it} other {them}} again. Are you sure you want to proceed?" },
-  confirmDismissAllButton: { id: 'notification_requests.confirm_dismiss_all.button', defaultMessage: 'Dismiss all' },
+  acceptMultiple: { id: 'notification_requests.accept_multiple', defaultMessage: '{count, plural, one {Accept # request…} other {Accept # requests…}}' },
+  dismissMultiple: { id: 'notification_requests.dismiss_multiple', defaultMessage: '{count, plural, one {Dismiss # request…} other {Dismiss # requests…}}' },
+  confirmAcceptMultipleTitle: { id: 'notification_requests.confirm_accept_multiple.title', defaultMessage: 'Accept notification requests?' },
+  confirmAcceptMultipleMessage: { id: 'notification_requests.confirm_accept_multiple.message', defaultMessage: 'You are about to accept {count, plural, one {one notification request} other {# notification requests}}. Are you sure you want to proceed?' },
+  confirmAcceptMultipleButton: { id: 'notification_requests.confirm_accept_multiple.button', defaultMessage: '{count, plural, one {Accept request} other {Accept requests}}' },
+  confirmDismissMultipleTitle: { id: 'notification_requests.confirm_dismiss_multiple.title', defaultMessage: 'Dismiss notification requests?' },
+  confirmDismissMultipleMessage: { id: 'notification_requests.confirm_dismiss_multiple.message', defaultMessage: "You are about to dismiss {count, plural, one {one notification request} other {# notification requests}}. You won't be able to easily access {count, plural, one {it} other {them}} again. Are you sure you want to proceed?" },
+  confirmDismissMultipleButton: { id: 'notification_requests.confirm_dismiss_multiple.button', defaultMessage: '{count, plural, one {Dismiss request} other {Dismiss requests}}' },
 });
 
 const ColumnSettings = () => {
@@ -74,45 +74,15 @@ const SelectRow = ({selectAllChecked, toggleSelectAll, selectedItems, selectionM
   const intl = useIntl();
   const dispatch = useDispatch();
 
-  const notificationRequests = useSelector(state => state.getIn(['notificationRequests', 'items']));
-
   const selectedCount = selectedItems.length;
 
-  const handleAcceptAll = useCallback(() => {
-    const items = notificationRequests.map(request => request.get('id')).toArray();
-    dispatch(openModal({
-      modalType: 'CONFIRM',
-      modalProps: {
-        title: intl.formatMessage(messages.confirmAcceptAllTitle),
-        message: intl.formatMessage(messages.confirmAcceptAllMessage, { count: items.length }),
-        confirm: intl.formatMessage(messages.confirmAcceptAllButton),
-        onConfirm: () =>
-          dispatch(acceptNotificationRequests(items)),
-      },
-    }));
-  }, [dispatch, intl, notificationRequests]);
-
-  const handleDismissAll = useCallback(() => {
-    const items = notificationRequests.map(request => request.get('id')).toArray();
-    dispatch(openModal({
-      modalType: 'CONFIRM',
-      modalProps: {
-        title: intl.formatMessage(messages.confirmDismissAllTitle),
-        message: intl.formatMessage(messages.confirmDismissAllMessage, { count: items.length }),
-        confirm: intl.formatMessage(messages.confirmDismissAllButton),
-        onConfirm: () =>
-          dispatch(dismissNotificationRequests(items)),
-      },
-    }));
-  }, [dispatch, intl, notificationRequests]);
-
   const handleAcceptMultiple = useCallback(() => {
     dispatch(openModal({
       modalType: 'CONFIRM',
       modalProps: {
-        title: intl.formatMessage(messages.confirmAcceptAllTitle),
-        message: intl.formatMessage(messages.confirmAcceptAllMessage, { count: selectedItems.length }),
-        confirm: intl.formatMessage(messages.confirmAcceptAllButton),
+        title: intl.formatMessage(messages.confirmAcceptMultipleTitle),
+        message: intl.formatMessage(messages.confirmAcceptMultipleMessage, { count: selectedItems.length }),
+        confirm: intl.formatMessage(messages.confirmAcceptMultipleButton, { count: selectedItems.length}),
         onConfirm: () =>
           dispatch(acceptNotificationRequests(selectedItems)),
       },
@@ -123,9 +93,9 @@ const SelectRow = ({selectAllChecked, toggleSelectAll, selectedItems, selectionM
     dispatch(openModal({
       modalType: 'CONFIRM',
       modalProps: {
-        title: intl.formatMessage(messages.confirmDismissAllTitle),
-        message: intl.formatMessage(messages.confirmDismissAllMessage, { count: selectedItems.length }),
-        confirm: intl.formatMessage(messages.confirmDismissAllButton),
+        title: intl.formatMessage(messages.confirmDismissMultipleTitle),
+        message: intl.formatMessage(messages.confirmDismissMultipleMessage, { count: selectedItems.length }),
+        confirm: intl.formatMessage(messages.confirmDismissMultipleButton, { count: selectedItems.length}),
         onConfirm: () =>
           dispatch(dismissNotificationRequests(selectedItems)),
       },
@@ -136,46 +106,45 @@ const SelectRow = ({selectAllChecked, toggleSelectAll, selectedItems, selectionM
     setSelectionMode((mode) => !mode);
   }, [setSelectionMode]);
 
-  const menu = selectedCount === 0 ?
-    [
-      { text: intl.formatMessage(messages.acceptAll), action: handleAcceptAll },
-      { text: intl.formatMessage(messages.dismissAll), action: handleDismissAll },
-    ] : [
-      { text: intl.formatMessage(messages.acceptMultiple, { count: selectedCount }), action: handleAcceptMultiple },
-      { text: intl.formatMessage(messages.dismissMultiple, { count: selectedCount }), action: handleDismissMultiple },
-    ];
+  const menu = [
+    { text: intl.formatMessage(messages.acceptMultiple, { count: selectedCount }), action: handleAcceptMultiple },
+    { text: intl.formatMessage(messages.dismissMultiple, { count: selectedCount }), action: handleDismissMultiple },
+  ];
+
+  const handleSelectAll = useCallback(() => {
+    setSelectionMode(true);
+    toggleSelectAll();
+  }, [setSelectionMode, toggleSelectAll]);
 
   return (
     <div className='column-header__select-row'>
-      {selectionMode && (
-        <div className='column-header__select-row__checkbox'>
-          <CheckBox checked={selectAllChecked} indeterminate={selectedCount > 0 && !selectAllChecked} onChange={toggleSelectAll} />
-        </div>
-      )}
-      <div className='column-header__select-row__selection-mode'>
+      <div className='column-header__select-row__checkbox'>
+        <CheckBox checked={selectAllChecked} indeterminate={selectedCount > 0 && !selectAllChecked} onChange={handleSelectAll} />
+      </div>
+      <DropdownMenuContainer
+        items={menu}
+        icons='ellipsis-h'
+        iconComponent={MoreHorizIcon}
+        direction='right'
+        title={intl.formatMessage(messages.more)}
+      >
+        <button className='dropdown-button column-header__select-row__select-menu' disabled={selectedItems.length === 0}>
+          <span className='dropdown-button__label'>
+            {selectedCount} selected
+          </span>
+          <Icon id='down' icon={ArrowDropDownIcon} />
+        </button>
+      </DropdownMenuContainer>
+      <div className='column-header__select-row__mode-button'>
         <button className='text-btn' tabIndex={0} onClick={handleToggleSelectionMode}>
           {selectionMode ? (
-            <FormattedMessage id='notification_requests.exit_selection_mode' defaultMessage='Cancel' />
+            <FormattedMessage id='notification_requests.exit_selection' defaultMessage='Done' />
           ) :
             (
-              <FormattedMessage id='notification_requests.enter_selection_mode' defaultMessage='Select' />
+              <FormattedMessage id='notification_requests.edit_selection' defaultMessage='Edit' />
             )}
         </button>
       </div>
-      {selectedCount > 0 &&
-        <div className='column-header__select-row__selected-count'>
-          {selectedCount} selected
-        </div>
-      }
-      <div className='column-header__select-row__actions'>
-        <DropdownMenuContainer
-          items={menu}
-          icons='ellipsis-h'
-          iconComponent={MoreHorizIcon}
-          direction='right'
-          title={intl.formatMessage(messages.more)}
-        />
-      </div>
     </div>
   );
 };
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index aeeaf8209c7d0c..6d2b93be5797e8 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -518,19 +518,17 @@
   "notification.status": "{name} just posted",
   "notification.update": "{name} edited a post",
   "notification_requests.accept": "Accept",
-  "notification_requests.accept_all": "Accept all",
-  "notification_requests.accept_multiple": "{count, plural, one {Accept # request} other {Accept # requests}}",
-  "notification_requests.confirm_accept_all.button": "Accept all",
-  "notification_requests.confirm_accept_all.message": "You are about to accept {count, plural, one {one notification request} other {# notification requests}}. Are you sure you want to proceed?",
-  "notification_requests.confirm_accept_all.title": "Accept notification requests?",
-  "notification_requests.confirm_dismiss_all.button": "Dismiss all",
-  "notification_requests.confirm_dismiss_all.message": "You are about to dismiss {count, plural, one {one notification request} other {# notification requests}}. You won't be able to easily access {count, plural, one {it} other {them}} again. Are you sure you want to proceed?",
-  "notification_requests.confirm_dismiss_all.title": "Dismiss notification requests?",
+  "notification_requests.accept_multiple": "{count, plural, one {Accept # request…} other {Accept # requests…}}",
+  "notification_requests.confirm_accept_multiple.button": "{count, plural, one {Accept request} other {Accept requests}}",
+  "notification_requests.confirm_accept_multiple.message": "You are about to accept {count, plural, one {one notification request} other {# notification requests}}. Are you sure you want to proceed?",
+  "notification_requests.confirm_accept_multiple.title": "Accept notification requests?",
+  "notification_requests.confirm_dismiss_multiple.button": "{count, plural, one {Dismiss request} other {Dismiss requests}}",
+  "notification_requests.confirm_dismiss_multiple.message": "You are about to dismiss {count, plural, one {one notification request} other {# notification requests}}. You won't be able to easily access {count, plural, one {it} other {them}} again. Are you sure you want to proceed?",
+  "notification_requests.confirm_dismiss_multiple.title": "Dismiss notification requests?",
   "notification_requests.dismiss": "Dismiss",
-  "notification_requests.dismiss_all": "Dismiss all",
-  "notification_requests.dismiss_multiple": "{count, plural, one {Dismiss # request} other {Dismiss # requests}}",
-  "notification_requests.enter_selection_mode": "Select",
-  "notification_requests.exit_selection_mode": "Cancel",
+  "notification_requests.dismiss_multiple": "{count, plural, one {Dismiss # request…} other {Dismiss # requests…}}",
+  "notification_requests.edit_selection": "Edit",
+  "notification_requests.exit_selection": "Done",
   "notification_requests.explainer_for_limited_account": "Notifications from this account have been filtered because the account has been limited by a moderator.",
   "notification_requests.explainer_for_limited_remote_account": "Notifications from this account have been filtered because the account or its server has been limited by a moderator.",
   "notification_requests.maximize": "Maximize",
diff --git a/app/javascript/styles/mastodon-light/variables.scss b/app/javascript/styles/mastodon-light/variables.scss
index 9d4fd60945a7d5..39809b437f4cd7 100644
--- a/app/javascript/styles/mastodon-light/variables.scss
+++ b/app/javascript/styles/mastodon-light/variables.scss
@@ -65,4 +65,5 @@ body {
   --background-color: #fff;
   --background-color-tint: rgba(255, 255, 255, 80%);
   --background-filter: blur(10px);
+  --on-surface-color: #{transparentize($ui-base-color, 0.65)};
 }
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 895762b8036a35..c1ee4ea10de232 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -4217,7 +4217,7 @@ a.status-card {
   text-decoration: none;
 
   &:hover {
-    background: lighten($ui-base-color, 2%);
+    background: var(--on-surface-color);
   }
 }
 
@@ -4346,19 +4346,18 @@ a.status-card {
     display: flex;
   }
 
-  &__selection-mode {
-    flex-grow: 1;
-
-    .text-btn:hover {
-      text-decoration: underline;
-    }
+  &__select-menu:disabled {
+    visibility: hidden;
   }
 
-  &__actions {
-    .icon-button {
-      border-radius: 4px;
-      border: 1px solid var(--background-border-color);
-      padding: 5px;
+  &__mode-button {
+    margin-left: auto;
+    color: $highlight-text-color;
+    font-weight: bold;
+    font-size: 14px;
+
+    &:hover {
+      color: lighten($highlight-text-color, 6%);
     }
   }
 }
@@ -4566,6 +4565,7 @@ a.status-card {
   padding: 0;
   font-family: inherit;
   font-size: inherit;
+  font-weight: inherit;
   color: inherit;
   border: 0;
   background: transparent;
@@ -10366,7 +10366,7 @@ noscript {
     cursor: pointer;
 
     &:hover {
-      background: lighten($ui-base-color, 1%);
+      background: var(--on-surface-color);
     }
 
     .notification-request__checkbox {
diff --git a/app/javascript/styles/mastodon/variables.scss b/app/javascript/styles/mastodon/variables.scss
index 92b4770fe3804d..c8271e0dcd95d4 100644
--- a/app/javascript/styles/mastodon/variables.scss
+++ b/app/javascript/styles/mastodon/variables.scss
@@ -109,5 +109,6 @@ $font-monospace: 'mastodon-font-monospace' !default;
   --surface-background-color: #{darken($ui-base-color, 4%)};
   --surface-variant-background-color: #{$ui-base-color};
   --surface-variant-active-background-color: #{lighten($ui-base-color, 4%)};
+  --on-surface-color: #{transparentize($ui-base-color, 0.5)};
   --avatar-border-radius: 8px;
 }

From 2f01f5f4ea886c4a1bec2148d0ca82da5ae67f0c Mon Sep 17 00:00:00 2001
From: Michael Stanclift <mx@vmstan.com>
Date: Tue, 20 Aug 2024 02:48:51 -0500
Subject: [PATCH 1888/2191] Harmonize persistent scrollbar styles (#31445)

---
 .../styles/mastodon-light/diff.scss           | 15 +++++++++++----
 .../styles/mastodon/components.scss           |  4 ----
 app/javascript/styles/mastodon/reset.scss     | 19 +++++++++++++------
 3 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/app/javascript/styles/mastodon-light/diff.scss b/app/javascript/styles/mastodon-light/diff.scss
index 55eb88dae1e851..8d801e4cd5b854 100644
--- a/app/javascript/styles/mastodon-light/diff.scss
+++ b/app/javascript/styles/mastodon-light/diff.scss
@@ -1,10 +1,6 @@
 // Notes!
 // Sass color functions, "darken" and "lighten" are automatically replaced.
 
-html {
-  scrollbar-color: $ui-base-color rgba($ui-base-color, 0.25);
-}
-
 .simple_form .button.button-tertiary {
   color: $highlight-text-color;
 }
@@ -561,3 +557,14 @@ a.sparkline {
     color: $dark-text-color;
   }
 }
+
+@supports not selector(::-webkit-scrollbar) {
+  html {
+    scrollbar-color: rgba($action-button-color, 0.25)
+      var(--background-border-color);
+  }
+}
+
+::-webkit-scrollbar-thumb {
+  opacity: 0.25;
+}
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index c1ee4ea10de232..97abf77d10e9f3 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -7560,10 +7560,6 @@ a.status-card {
   }
 }
 
-::-webkit-scrollbar-thumb {
-  border-radius: 0;
-}
-
 noscript {
   text-align: center;
 
diff --git a/app/javascript/styles/mastodon/reset.scss b/app/javascript/styles/mastodon/reset.scss
index f8a4a08ced6d3a..5a4152826d9e4b 100644
--- a/app/javascript/styles/mastodon/reset.scss
+++ b/app/javascript/styles/mastodon/reset.scss
@@ -53,22 +53,29 @@ table {
   border-spacing: 0;
 }
 
-html {
-  scrollbar-color: var(--background-border-color);
+@supports not selector(::-webkit-scrollbar) {
+  html {
+    scrollbar-color: $action-button-color var(--background-border-color);
+    scrollbar-width: thin;
+  }
 }
 
 ::-webkit-scrollbar {
-  width: 4px;
-  height: 4px;
+  width: 8px;
+  height: 8px;
 }
 
 ::-webkit-scrollbar-thumb {
-  background-color: $ui-highlight-color;
-  opacity: .25;
+  background-color: $action-button-color;
+  border: 2px var(--background-border-color);
+  border-radius: 12px;
+  width: 6px;
+  box-shadow: inset 0 0 0 2px var(--background-border-color);
 }
 
 ::-webkit-scrollbar-track {
   background-color: var(--background-border-color);
+  border-radius: 0px;
 }
 
 ::-webkit-scrollbar-corner {

From c75f7262ed32b7eb12aea154b0a41f876b7b58e9 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 20 Aug 2024 07:59:21 +0000
Subject: [PATCH 1889/2191] New Crowdin Translations (automated) (#31504)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/ar.json    |  7 ---
 app/javascript/mastodon/locales/be.json    | 13 +++++
 app/javascript/mastodon/locales/bg.json    |  2 -
 app/javascript/mastodon/locales/ca.json    | 20 ++++----
 app/javascript/mastodon/locales/cy.json    | 12 -----
 app/javascript/mastodon/locales/da.json    | 22 ++++-----
 app/javascript/mastodon/locales/de.json    | 12 -----
 app/javascript/mastodon/locales/el.json    | 12 -----
 app/javascript/mastodon/locales/en-GB.json | 12 -----
 app/javascript/mastodon/locales/es-AR.json | 12 -----
 app/javascript/mastodon/locales/es-MX.json | 12 -----
 app/javascript/mastodon/locales/es.json    | 12 -----
 app/javascript/mastodon/locales/eu.json    |  8 ----
 app/javascript/mastodon/locales/fi.json    | 24 +++++-----
 app/javascript/mastodon/locales/fo.json    | 12 -----
 app/javascript/mastodon/locales/fr-CA.json |  3 --
 app/javascript/mastodon/locales/fr.json    |  3 --
 app/javascript/mastodon/locales/ga.json    | 12 -----
 app/javascript/mastodon/locales/gd.json    | 12 -----
 app/javascript/mastodon/locales/gl.json    | 12 -----
 app/javascript/mastodon/locales/he.json    | 12 -----
 app/javascript/mastodon/locales/hu.json    | 12 -----
 app/javascript/mastodon/locales/ig.json    |  1 -
 app/javascript/mastodon/locales/is.json    | 12 -----
 app/javascript/mastodon/locales/it.json    | 12 -----
 app/javascript/mastodon/locales/kab.json   |  1 -
 app/javascript/mastodon/locales/ko.json    | 12 -----
 app/javascript/mastodon/locales/lad.json   |  4 --
 app/javascript/mastodon/locales/lt.json    | 12 -----
 app/javascript/mastodon/locales/nl.json    | 12 -----
 app/javascript/mastodon/locales/nn.json    | 12 -----
 app/javascript/mastodon/locales/pl.json    | 22 ++++-----
 app/javascript/mastodon/locales/pt-BR.json |  3 --
 app/javascript/mastodon/locales/sk.json    |  6 +++
 app/javascript/mastodon/locales/sl.json    |  6 ---
 app/javascript/mastodon/locales/sq.json    | 12 -----
 app/javascript/mastodon/locales/sv.json    |  9 +---
 app/javascript/mastodon/locales/th.json    | 10 ----
 app/javascript/mastodon/locales/tr.json    | 12 -----
 app/javascript/mastodon/locales/uk.json    | 12 -----
 app/javascript/mastodon/locales/vi.json    | 10 ++++
 app/javascript/mastodon/locales/zh-CN.json | 12 -----
 app/javascript/mastodon/locales/zh-TW.json | 22 ++++-----
 config/locales/be.yml                      | 55 ++++++++++++++++++++++
 44 files changed, 137 insertions(+), 390 deletions(-)

diff --git a/app/javascript/mastodon/locales/ar.json b/app/javascript/mastodon/locales/ar.json
index 02692743970290..a022f3a0e52da8 100644
--- a/app/javascript/mastodon/locales/ar.json
+++ b/app/javascript/mastodon/locales/ar.json
@@ -500,14 +500,7 @@
   "notification.status": "{name} نشر للتو",
   "notification.update": "عدّلَ {name} منشورًا",
   "notification_requests.accept": "موافقة",
-  "notification_requests.accept_all": "قبول الكل",
-  "notification_requests.confirm_accept_all.button": "قبول الكل",
-  "notification_requests.confirm_accept_all.title": "أتريد قبول طلبات الإشعار؟",
-  "notification_requests.confirm_dismiss_all.button": "تجاهل الكل",
   "notification_requests.dismiss": "تخطي",
-  "notification_requests.dismiss_all": "تجاهل الكل",
-  "notification_requests.enter_selection_mode": "اختر",
-  "notification_requests.exit_selection_mode": "إلغاء",
   "notification_requests.explainer_for_limited_account": "تم تصفية الإشعارات من هذا الحساب لأن الحساب تم تقييده من قبل مشرف.",
   "notification_requests.notifications_from": "إشعارات من {name}",
   "notification_requests.title": "الإشعارات المصفاة",
diff --git a/app/javascript/mastodon/locales/be.json b/app/javascript/mastodon/locales/be.json
index 1ba69f27f3ae40..546a1457a99b90 100644
--- a/app/javascript/mastodon/locales/be.json
+++ b/app/javascript/mastodon/locales/be.json
@@ -11,6 +11,7 @@
   "about.not_available": "Дадзеная інфармацыя не дасяжная на гэтым серверы.",
   "about.powered_by": "Дэцэнтралізаваная сацыяльная сетка, створаная {mastodon}",
   "about.rules": "Правілы сервера",
+  "account.account_note_header": "Асабістая нататка",
   "account.add_or_remove_from_list": "Дадаць або выдаліць са спісаў",
   "account.badges.bot": "Бот",
   "account.badges.group": "Група",
@@ -481,6 +482,11 @@
   "notification.favourite": "Ваш допіс упадабаны {name}",
   "notification.follow": "{name} падпісаўся на вас",
   "notification.follow_request": "{name} адправіў запыт на падпіску",
+  "notification.label.mention": "Згадванне",
+  "notification.label.private_mention": "Асабістае згадванне",
+  "notification.label.private_reply": "Асабісты адказ",
+  "notification.label.reply": "Адказ",
+  "notification.mention": "Згадванне",
   "notification.moderation-warning.learn_more": "Даведацца больш",
   "notification.moderation_warning": "Вы атрымалі папярэджанне аб мадэрацыі",
   "notification.moderation_warning.action_delete_statuses": "Некаторыя вашыя допісы былі выдаленыя.",
@@ -506,6 +512,7 @@
   "notification_requests.minimize_banner": "Згарнуць банер адфільтраваных апавяшчэнняў",
   "notification_requests.notifications_from": "Апавяшчэнні ад {name}",
   "notification_requests.title": "Адфільтраваныя апавяшчэнні",
+  "notification_requests.view": "Прагляд апавяшчэнняў",
   "notifications.clear": "Ачысціць апавяшчэнні",
   "notifications.clear_confirmation": "Вы ўпэўнены, што жадаеце назаўсёды сцерці ўсё паведамленні?",
   "notifications.clear_title": "Ачысціць апавяшчэнні?",
@@ -542,6 +549,10 @@
   "notifications.permission_denied": "Апавяшчэнні на працоўным стале недаступныя з-за папярэдне адхіленага запыта праў браўзера",
   "notifications.permission_denied_alert": "Апавяшчэнні на працоўным стале не могуць быць уключаныя, з-за таго што запыт браўзера быў адхілены",
   "notifications.permission_required": "Апавяшчэнні на працоўным стале недаступныя, з-за таго што неабходны дазвол не быў дадзены.",
+  "notifications.policy.accept": "Прыняць",
+  "notifications.policy.accept_hint": "Паказваць у апавяшчэннях",
+  "notifications.policy.drop": "Iгнараваць",
+  "notifications.policy.filter": "Фільтраваць",
   "notifications.policy.filter_new_accounts.hint": "Створаныя на працягу {days, plural, one {апошняга # дня} few {апошніх # дзён} many {апошніх # дзён} other {апошняй # дня}}",
   "notifications.policy.filter_new_accounts_title": "Новыя ўліковыя запісы",
   "notifications.policy.filter_not_followers_hint": "Уключаючы людзей, якія падпісаны на вас менш, чым {days, plural, one {# дзень} few {# дні} many {# дзён} other {# дня}}",
@@ -550,6 +561,7 @@
   "notifications.policy.filter_not_following_title": "Людзі, на якіх вы не падпісаны",
   "notifications.policy.filter_private_mentions_hint": "Фільтруецца за выключэннем адказу на вашае згадванне ці калі вы падпісаны на адпраўніка",
   "notifications.policy.filter_private_mentions_title": "Непажаданыя асаблівыя згадванні",
+  "notifications.policy.title": "Наладзіць апавяшчэнні ад…",
   "notifications_permission_banner.enable": "Уключыць апавяшчэнні на працоўным стале",
   "notifications_permission_banner.how_to_control": "Каб атрымліваць апавяшчэнні, калі Mastodon не адкрыты, уключыце апавяшчэнні працоўнага стала. Вы зможаце дакладна кантраляваць, якія падзеі будуць ствараць апавяшчэнні з дапамогай {icon} кнопкі, як толькі яны будуць уключаны.",
   "notifications_permission_banner.title": "Не прапусціце нічога",
@@ -790,6 +802,7 @@
   "timeline_hint.remote_resource_not_displayed": "{resource} з іншых сервераў не адлюстроўваецца.",
   "timeline_hint.resources.followers": "Падпісчыкі",
   "timeline_hint.resources.follows": "Падпіскі",
+  "timeline_hint.resources.replies": "Некаторыя адказы",
   "timeline_hint.resources.statuses": "Старыя допісы",
   "trends.counter_by_accounts": "{count, plural, one {{counter} чалавек} few {{counter} чалавекі} many {{counter} людзей} other {{counter} чалавек}} за {days, plural, one {{days} апошні дзень} few {{days} апошнія дні} many {{days} апошніх дзён} other {{days} апошніх дзён}}",
   "trends.trending_now": "Актуальнае",
diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json
index 6687c64a6d1482..69166eafb88d13 100644
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@@ -505,8 +505,6 @@
   "notification.update": "{name} промени публикация",
   "notification_requests.accept": "Приемам",
   "notification_requests.dismiss": "Отхвърлям",
-  "notification_requests.enter_selection_mode": "Изберете",
-  "notification_requests.exit_selection_mode": "Отказ",
   "notification_requests.explainer_for_limited_account": "Известията от този акаунт са прецедени, защото акаунтът е ограничен от модератор.",
   "notification_requests.explainer_for_limited_remote_account": "Известията от този акаунт са прецедени, защото акаунтът или сървърът му е ограничен от модератор.",
   "notification_requests.maximize": "Максимизиране",
diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index a41e7ba4dd6972..777e8863271298 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -517,17 +517,17 @@
   "notification.status": "{name} acaba de publicar",
   "notification.update": "{name} ha editat un tut",
   "notification_requests.accept": "Accepta",
-  "notification_requests.accept_all": "Accepta-ho tot",
-  "notification_requests.accept_multiple": "{count, plural, one {Accepta # petició} other {Accepta # peticions}}",
-  "notification_requests.confirm_accept_all.button": "Accepta-ho tot",
-  "notification_requests.confirm_accept_all.message": "Esteu a punt d'acceptar {count, plural, one {una petició de notificació} other {# peticions de notificació}}. N'esteu segurs de continuar?",
-  "notification_requests.confirm_accept_all.title": "Accepteu peticions de notificació?",
-  "notification_requests.confirm_dismiss_all.button": "Descarta-les totes",
-  "notification_requests.confirm_dismiss_all.title": "Descarta la sol·licitud de notificació?",
+  "notification_requests.accept_multiple": "{count, plural, one {Accepta # petició…} other {Accepta # peticions…}}",
+  "notification_requests.confirm_accept_multiple.button": "{count, plural, one {Accepta petició} other {Accepta peticions}}",
+  "notification_requests.confirm_accept_multiple.message": "Esteu a punt d'acceptar {count, plural, one {una petició de notificació} other {# peticions de notificació}}. N'esteu segurs de continuar?",
+  "notification_requests.confirm_accept_multiple.title": "Acceptar peticions de notificació?",
+  "notification_requests.confirm_dismiss_multiple.button": "{count, plural, one {Descarta petició} other {Descarta peticions}}",
+  "notification_requests.confirm_dismiss_multiple.message": "Esteu a punt de descartar {count, plural, one {una petició de notificació} other {# peticions de notificació}}. No hi {count, plural, one {} other {}} podreu tornar a accedir fàcilment. N'esteu segurs de continuar?",
+  "notification_requests.confirm_dismiss_multiple.title": "Descartar les peticions de notificació?",
   "notification_requests.dismiss": "Ignora",
-  "notification_requests.dismiss_all": "Descarta-ho tot",
-  "notification_requests.enter_selection_mode": "Selecciona",
-  "notification_requests.exit_selection_mode": "Cancel·la",
+  "notification_requests.dismiss_multiple": "{count, plural, one {Descarta # petició…} other {Descarta # peticions…}}",
+  "notification_requests.edit_selection": "Edita",
+  "notification_requests.exit_selection": "Fet",
   "notification_requests.explainer_for_limited_account": "S'han filtrat les notificacions d'aquest compte perquè un moderador l'ha limitat.",
   "notification_requests.explainer_for_limited_remote_account": "S'han filtrat les notificacions d'aquest compte perquè un moderador ha limitat el compte o el seu servidor.",
   "notification_requests.maximize": "Maximitza",
diff --git a/app/javascript/mastodon/locales/cy.json b/app/javascript/mastodon/locales/cy.json
index 8b86b49e06f5ee..4fb02ba7f12787 100644
--- a/app/javascript/mastodon/locales/cy.json
+++ b/app/javascript/mastodon/locales/cy.json
@@ -518,19 +518,7 @@
   "notification.status": "{name} newydd ei bostio",
   "notification.update": "Golygodd {name} bostiad",
   "notification_requests.accept": "Derbyn",
-  "notification_requests.accept_all": "Derbyn y cyfan",
-  "notification_requests.accept_multiple": "{count, plural, one {Derbyn # cais} other {Derbyn # cais}}",
-  "notification_requests.confirm_accept_all.button": "Derbyn y cyfan",
-  "notification_requests.confirm_accept_all.message": "Rydych ar fin derbyn {count, plural, one {un cais hysbysu} other {# cais hysbysiad}}. A ydych yn siŵr eich bod am fwrw ymlaen?",
-  "notification_requests.confirm_accept_all.title": "Derbyn ceisiadau hysbysu?",
-  "notification_requests.confirm_dismiss_all.button": "Diystyru pob un",
-  "notification_requests.confirm_dismiss_all.message": "Rydych ar fin diystyru {count, plural, one {un cais hysbysu} other {# cais hysbysiad}}. Ni fyddwch yn gallu cyrchu {count, plural, one {it} other {them}} yn hawdd eto. A ydych yn siŵr eich bod am fwrw ymlaen?",
-  "notification_requests.confirm_dismiss_all.title": "Diystyru ceisiadau hysbysu?",
   "notification_requests.dismiss": "Cau",
-  "notification_requests.dismiss_all": "Diystyru pob un",
-  "notification_requests.dismiss_multiple": "{count, plural, one {Diystyru # cais} other {Diystyru # cais}}",
-  "notification_requests.enter_selection_mode": "Dewis",
-  "notification_requests.exit_selection_mode": "Canslo",
   "notification_requests.explainer_for_limited_account": "Mae hysbysiadau o'r cyfrif hwn wedi'u hidlo oherwydd bod y cyfrif wedi'i gyfyngu gan gymedrolwr.",
   "notification_requests.explainer_for_limited_remote_account": "Mae hysbysiadau o'r cyfrif hwn wedi'u hidlo oherwydd bod y cyfrif neu ei weinydd wedi'i gyfyngu gan gymedrolwr.",
   "notification_requests.maximize": "Mwyhau",
diff --git a/app/javascript/mastodon/locales/da.json b/app/javascript/mastodon/locales/da.json
index a9e549470c8cf9..9ae27e134ea510 100644
--- a/app/javascript/mastodon/locales/da.json
+++ b/app/javascript/mastodon/locales/da.json
@@ -518,19 +518,17 @@
   "notification.status": "{name} har netop postet",
   "notification.update": "{name} redigerede et indlæg",
   "notification_requests.accept": "Acceptér",
-  "notification_requests.accept_all": "Acceptér alle",
-  "notification_requests.accept_multiple": "{count, plural, one {Acceptér # anmodning} other {Acceptér # anmodninger}}",
-  "notification_requests.confirm_accept_all.button": "Acceptér alle",
-  "notification_requests.confirm_accept_all.message": "Man er ved at acceptere {count, plural, one {en notifikationsanmodning} other {# notifikationsanmodninger}}. Fortsæt, sikker?",
-  "notification_requests.confirm_accept_all.title": "Acceptér notifikationsanmodninger?",
-  "notification_requests.confirm_dismiss_all.button": "Afvis alle",
-  "notification_requests.confirm_dismiss_all.message": "Man er ved at afvise {count, plural, one {en notifikationsanmodning} other {# notifikationsanmodninger}}. Man vil derfor ikke nemt kunne tilgå {count, plural, one {den} other {dem}} igen. Fortsæt, sikker?",
-  "notification_requests.confirm_dismiss_all.title": "Afvis notifikationsanmodninger?",
+  "notification_requests.accept_multiple": "{count, plural, one {Acceptér # anmodning…} other {Acceptér # anmodninger…}}",
+  "notification_requests.confirm_accept_multiple.button": "{count, plural, one {Acceptér anmodning} other {Acceptér anmodninger}}",
+  "notification_requests.confirm_accept_multiple.message": "{count, plural, one {En notifikationsanmodning} other {# notifikationsanmodninger}} er ved at blive accepteret. Fortsæt, sikker?",
+  "notification_requests.confirm_accept_multiple.title": "Acceptér notifikationsanmodninger?",
+  "notification_requests.confirm_dismiss_multiple.button": "{count, plural, one {Afvis anmodning} other {Afvis anmodninger}}",
+  "notification_requests.confirm_dismiss_multiple.message": "{count, plural, one {En notifikationsanmodning} other {# notifikationsanmodninger}} er ved at blive afvist, hvorfor man ikke nemt vil kunne tilgå {count, plural, one {den} other {dem}} igen. Fortsæt, sikker?",
+  "notification_requests.confirm_dismiss_multiple.title": "Afvis notifikationsanmodninger?",
   "notification_requests.dismiss": "Afvis",
-  "notification_requests.dismiss_all": "Afvis alle",
-  "notification_requests.dismiss_multiple": "{count, plural, one {Afvis # anmodning} other {Afvis # anmodninger}}",
-  "notification_requests.enter_selection_mode": "Vælg",
-  "notification_requests.exit_selection_mode": "Afbryd",
+  "notification_requests.dismiss_multiple": "{count, plural, one {Afvis # anmodning…} other {Afvis # anmodninger…}}",
+  "notification_requests.edit_selection": "Redigér",
+  "notification_requests.exit_selection": "Udført",
   "notification_requests.explainer_for_limited_account": "Notifikationer fra denne konto er blevet filtreret, da kontoen er pålagt restriktioner af en moderator.",
   "notification_requests.explainer_for_limited_remote_account": "Notifikationer fra denne konto er blevet filtreret, da kontoen eller dens server er pålagt restriktioner af en moderator.",
   "notification_requests.maximize": "Maksimér",
diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json
index 2d49f172e6bb4b..2d72740b4ae81c 100644
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@@ -518,19 +518,7 @@
   "notification.status": "{name} hat gerade etwas gepostet",
   "notification.update": "{name} bearbeitete einen Beitrag",
   "notification_requests.accept": "Genehmigen",
-  "notification_requests.accept_all": "Alle genehmigen",
-  "notification_requests.accept_multiple": "{count, plural, one {# Anfrage genehmigen} other {# Anfragen genehmigen}}",
-  "notification_requests.confirm_accept_all.button": "Alle genehmigen",
-  "notification_requests.confirm_accept_all.message": "Du bist dabei, {{count, plural, one {eine Benachrichtigungsanfrage} other {# Benachrichtigungsanfragen}} zu genehmigen. Möchtest du wirklich fortfahren?",
-  "notification_requests.confirm_accept_all.title": "Benachrichtigungsanfragen genehmigen?",
-  "notification_requests.confirm_dismiss_all.button": "Alle ablehnen",
-  "notification_requests.confirm_dismiss_all.message": "Du bist dabei, {count, plural, one {eine Benachrichtigungsanfrage} other {# Benachrichtigungsanfragen}} abzulehnen. Du wirst nicht mehr ohne Weiteres auf {count, plural, one {sie} other {sie}} zugreifen können. Möchtest du wirklich fortfahren?",
-  "notification_requests.confirm_dismiss_all.title": "Benachrichtigungsanfragen ablehnen?",
   "notification_requests.dismiss": "Ablehnen",
-  "notification_requests.dismiss_all": "Alle ablehnen",
-  "notification_requests.dismiss_multiple": "{count, plural, one {# Anfrage ablehnen} other {# Anfragen ablehnen}}",
-  "notification_requests.enter_selection_mode": "Auswählen",
-  "notification_requests.exit_selection_mode": "Abbrechen",
   "notification_requests.explainer_for_limited_account": "Benachrichtigungen von diesem Konto wurden gefiltert, weil es durch Moderator*innen eingeschränkt wurde.",
   "notification_requests.explainer_for_limited_remote_account": "Benachrichtigungen von diesem Konto wurden gefiltert, weil deren Konto oder Server durch Moderator*innen eingeschränkt wurde.",
   "notification_requests.maximize": "Maximieren",
diff --git a/app/javascript/mastodon/locales/el.json b/app/javascript/mastodon/locales/el.json
index c220f3a4e0c581..9603da4ffa95a1 100644
--- a/app/javascript/mastodon/locales/el.json
+++ b/app/javascript/mastodon/locales/el.json
@@ -518,19 +518,7 @@
   "notification.status": "Ο/Η {name} μόλις ανέρτησε κάτι",
   "notification.update": "ο/η {name} επεξεργάστηκε μια ανάρτηση",
   "notification_requests.accept": "Αποδοχή",
-  "notification_requests.accept_all": "Αποδοχή όλων",
-  "notification_requests.accept_multiple": "{count, plural, one {Αποδοχή # αιτήματος} other {Αποδοχή # αιτημάτων}}",
-  "notification_requests.confirm_accept_all.button": "Αποδοχή όλων",
-  "notification_requests.confirm_accept_all.message": "Πρόκειται να αποδεχτείς {count, plural, one {ένα αίτημα ειδοποίησης} other {# αιτήματα ειδοποίησης}}. Σίγουρα θες να συνεχίσεις;",
-  "notification_requests.confirm_accept_all.title": "Αποδοχή αιτήσεων ειδοποίησης;",
-  "notification_requests.confirm_dismiss_all.button": "Παράβλεψη όλων",
-  "notification_requests.confirm_dismiss_all.message": "Πρόκειται να απορρίψεις {count, plural, one {ένα αίτημα ειδοποίησης} other {# αιτήματα ειδοποίησης}}. Δεν θα μπορείς να έχεις πρόσβαση εύκολα {count, plural, one {σε αυτή} other {σε αυτές}} ξανά. Σίγουρα θες να συνεχίσεις;",
-  "notification_requests.confirm_dismiss_all.title": "Απόρριψη αιτημάτων ειδοποίησης;",
   "notification_requests.dismiss": "Απόρριψη",
-  "notification_requests.dismiss_all": "Παράβλεψη όλων",
-  "notification_requests.dismiss_multiple": "{count, plural, one {Παράβλεψη # αιτήματος} other {Παράβλεψη # αιτημάτων}}",
-  "notification_requests.enter_selection_mode": "Επιλογή",
-  "notification_requests.exit_selection_mode": "Άκυρο",
   "notification_requests.explainer_for_limited_account": "Οι ειδοποιήσεις από αυτόν τον λογαριασμό έχουν φιλτραριστεί επειδή ο λογαριασμός έχει περιοριστεί από έναν συντονιστή.",
   "notification_requests.explainer_for_limited_remote_account": "Οι ειδοποιήσεις από αυτόν τον λογαριασμό έχουν φιλτραριστεί επειδή ο λογαριασμός ή ο διακομιστής του έχει περιοριστεί από έναν συντονιστή.",
   "notification_requests.maximize": "Μεγιστοποίηση",
diff --git a/app/javascript/mastodon/locales/en-GB.json b/app/javascript/mastodon/locales/en-GB.json
index 8315333994194a..d6e3429c3bd190 100644
--- a/app/javascript/mastodon/locales/en-GB.json
+++ b/app/javascript/mastodon/locales/en-GB.json
@@ -517,19 +517,7 @@
   "notification.status": "{name} just posted",
   "notification.update": "{name} edited a post",
   "notification_requests.accept": "Accept",
-  "notification_requests.accept_all": "Accept all",
-  "notification_requests.accept_multiple": "{count, plural, one {Accept 1 request} other {Accept # requests}}",
-  "notification_requests.confirm_accept_all.button": "Accept all",
-  "notification_requests.confirm_accept_all.message": "You are about to accept {count, plural, one {one notification request} other {# notification requests}}. Are you sure you want to proceed?",
-  "notification_requests.confirm_accept_all.title": "Accept notification requests?",
-  "notification_requests.confirm_dismiss_all.button": "Dismiss all",
-  "notification_requests.confirm_dismiss_all.message": "You are about to dismiss {count, plural, one {one notification request} other {# notification requests}}. You won't be able to easily access {count, plural, one {it} other {them}} again. Are you sure you want to proceed?",
-  "notification_requests.confirm_dismiss_all.title": "Dismiss notification requests?",
   "notification_requests.dismiss": "Dismiss",
-  "notification_requests.dismiss_all": "Dismiss all",
-  "notification_requests.dismiss_multiple": "{count, plural, one {Dismiss one request} other {Dismiss # requests}}",
-  "notification_requests.enter_selection_mode": "Select",
-  "notification_requests.exit_selection_mode": "Cancel",
   "notification_requests.explainer_for_limited_account": "Notifications from this account have been filtered because the account has been limited by a moderator.",
   "notification_requests.explainer_for_limited_remote_account": "Notifications from this account have been filtered because the account or its server has been limited by a moderator.",
   "notification_requests.minimize_banner": "Minimize filtered notifications banner",
diff --git a/app/javascript/mastodon/locales/es-AR.json b/app/javascript/mastodon/locales/es-AR.json
index 0722a08ea63975..ba0a1a45b92313 100644
--- a/app/javascript/mastodon/locales/es-AR.json
+++ b/app/javascript/mastodon/locales/es-AR.json
@@ -518,19 +518,7 @@
   "notification.status": "{name} acaba de enviar un mensaje",
   "notification.update": "{name} editó un mensaje",
   "notification_requests.accept": "Aceptar",
-  "notification_requests.accept_all": "Aceptar todas",
-  "notification_requests.accept_multiple": "{count, plural, one {Aceptar # solicitud} other {Aceptar # solicitudes}}",
-  "notification_requests.confirm_accept_all.button": "Aceptar todas",
-  "notification_requests.confirm_accept_all.message": "Estás a punto de aceptar {count, plural, one {una solicitud} other {# solicitudes}}. ¿Estás seguro de que querés continuar?",
-  "notification_requests.confirm_accept_all.title": "¿Aceptar solicitudes de notificación?",
-  "notification_requests.confirm_dismiss_all.button": "Descartar todas",
-  "notification_requests.confirm_dismiss_all.message": "Estás a punto de descartar {count, plural, one {una solicitud} other {# solicitudes}}. No vas a poder acceder fácilmente a {count, plural, one {ella} other {ellas}} de nuevo. ¿Estás seguro de que querés continuar?",
-  "notification_requests.confirm_dismiss_all.title": "¿Descartar solicitudes de notificación?",
   "notification_requests.dismiss": "Descartar",
-  "notification_requests.dismiss_all": "Descartar todas",
-  "notification_requests.dismiss_multiple": "{count, plural, one {Descartar # solicitud} other {Descartar # solicitudes}}",
-  "notification_requests.enter_selection_mode": "Seleccionar",
-  "notification_requests.exit_selection_mode": "Cancelar",
   "notification_requests.explainer_for_limited_account": "Las notificaciones de esta cuenta fueron filtradas porque la misma fue limitada por un moderador.",
   "notification_requests.explainer_for_limited_remote_account": "Las notificaciones de esta cuenta fueron filtradas porque la cuenta o su servidor fueron limitados por un moderador.",
   "notification_requests.maximize": "Maximizar",
diff --git a/app/javascript/mastodon/locales/es-MX.json b/app/javascript/mastodon/locales/es-MX.json
index 0ff6c25328fda1..3267b28d613aca 100644
--- a/app/javascript/mastodon/locales/es-MX.json
+++ b/app/javascript/mastodon/locales/es-MX.json
@@ -518,19 +518,7 @@
   "notification.status": "{name} acaba de publicar",
   "notification.update": "{name} editó una publicación",
   "notification_requests.accept": "Aceptar",
-  "notification_requests.accept_all": "Aceptar todas",
-  "notification_requests.accept_multiple": "{count, plural, one {Aceptar # solicitud} other {Aceptar # solicitudes}}",
-  "notification_requests.confirm_accept_all.button": "Aceptar todas",
-  "notification_requests.confirm_accept_all.message": "Vas a aceptar {count, plural, one {una solicitud} other {# solicitudes}}. ¿Estás seguro de que quieres continuar?",
-  "notification_requests.confirm_accept_all.title": "¿Aceptar todas las solicitudes?",
-  "notification_requests.confirm_dismiss_all.button": "Descartar todas",
-  "notification_requests.confirm_dismiss_all.message": "Vas a descartar {count, plural, one {una solicitud} other {# solicitudes}}. No vas a poder acceder fácilmente a {count, plural, one {ella} other {ellas}} de nuevo. ¿Estás seguro de que quieres continuar?",
-  "notification_requests.confirm_dismiss_all.title": "¿Descartar todas las solicitudes?",
   "notification_requests.dismiss": "Descartar",
-  "notification_requests.dismiss_all": "Descartar todas",
-  "notification_requests.dismiss_multiple": "{count, plural, one {Descartar # solicitud} other {Descartar # solicitudes}}",
-  "notification_requests.enter_selection_mode": "Seleccionar",
-  "notification_requests.exit_selection_mode": "Cancelar",
   "notification_requests.explainer_for_limited_account": "Las notificaciones de esta cuenta han sido filtradas porque la cuenta ha sido limitada por un moderador.",
   "notification_requests.explainer_for_limited_remote_account": "Las notificaciones de esta cuenta han sido filtradas porque la cuenta o su servidor ha sido limitada por un moderador.",
   "notification_requests.maximize": "Maximizar",
diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json
index b8f5de997a24c4..04b46e166ade44 100644
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@@ -518,19 +518,7 @@
   "notification.status": "{name} acaba de publicar",
   "notification.update": "{name} editó una publicación",
   "notification_requests.accept": "Aceptar",
-  "notification_requests.accept_all": "Aceptar todas",
-  "notification_requests.accept_multiple": "{count, plural, one {Aceptar # solicitud} other {Aceptar # solicitudes}}",
-  "notification_requests.confirm_accept_all.button": "Aceptar todas",
-  "notification_requests.confirm_accept_all.message": "Vas a aceptar {count, plural, one {una solicitud} other {# solicitudes}}. ¿Estás seguro de que quieres continuar?",
-  "notification_requests.confirm_accept_all.title": "¿Aceptar todas las solicitudes?",
-  "notification_requests.confirm_dismiss_all.button": "Descartar todas",
-  "notification_requests.confirm_dismiss_all.message": "Vas a descartar {count, plural, one {una solicitud} other {# solicitudes}}. No vas a poder acceder fácilmente a {count, plural, one {ella} other {ellas}} de nuevo. ¿Estás seguro de que quieres continuar?",
-  "notification_requests.confirm_dismiss_all.title": "¿Descartar todas las solicitudes?",
   "notification_requests.dismiss": "Descartar",
-  "notification_requests.dismiss_all": "Descartar todas",
-  "notification_requests.dismiss_multiple": "{count, plural, one {Descartar # solicitud} other {Descartar # solicitudes}}",
-  "notification_requests.enter_selection_mode": "Seleccionar",
-  "notification_requests.exit_selection_mode": "Cancelar",
   "notification_requests.explainer_for_limited_account": "Las notificaciones de esta cuenta han sido filtradas porque la cuenta ha sido limitada por un moderador.",
   "notification_requests.explainer_for_limited_remote_account": "Las notificaciones de esta cuenta han sido filtradas porque la cuenta o su servidor ha sido limitada por un moderador.",
   "notification_requests.maximize": "Maximizar",
diff --git a/app/javascript/mastodon/locales/eu.json b/app/javascript/mastodon/locales/eu.json
index b2a8fe0da3e5f1..85855d91656bd3 100644
--- a/app/javascript/mastodon/locales/eu.json
+++ b/app/javascript/mastodon/locales/eu.json
@@ -502,15 +502,7 @@
   "notification.status": "{name} erabiltzaileak bidalketa egin berri du",
   "notification.update": "{name} erabiltzaileak bidalketa bat editatu du",
   "notification_requests.accept": "Onartu",
-  "notification_requests.accept_all": "Onartu dena",
-  "notification_requests.confirm_accept_all.button": "Onartu dena",
-  "notification_requests.confirm_accept_all.title": "Onartu jakinarazpen-eskaerak?",
-  "notification_requests.confirm_dismiss_all.button": "Baztertu guztiak",
-  "notification_requests.confirm_dismiss_all.title": "Baztertu jakinarazpen-eskaerak?",
   "notification_requests.dismiss": "Baztertu",
-  "notification_requests.dismiss_all": "Baztertu guztiak",
-  "notification_requests.enter_selection_mode": "Hautatu",
-  "notification_requests.exit_selection_mode": "Utzi",
   "notification_requests.maximize": "Maximizatu",
   "notification_requests.notifications_from": "{name} erabiltzailearen jakinarazpenak",
   "notification_requests.title": "Iragazitako jakinarazpenak",
diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index 9b48f1bf37d630..1dc3872b09ad39 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -518,19 +518,17 @@
   "notification.status": "{name} julkaisi juuri",
   "notification.update": "{name} muokkasi julkaisua",
   "notification_requests.accept": "Hyväksy",
-  "notification_requests.accept_all": "Hyväksy kaikki",
-  "notification_requests.accept_multiple": "{count, plural, one {Hyväksy # pyyntö} other {Hyväksy # pyyntöä}}",
-  "notification_requests.confirm_accept_all.button": "Hyväksy kaikki",
-  "notification_requests.confirm_accept_all.message": "Olet aikeissa hyväksyä {count, plural, one {ilmoituspyynnön} other {# ilmoituspyyntöä}}. Haluatko varmasti jatkaa?",
-  "notification_requests.confirm_accept_all.title": "Hyväksytäänkö ilmoituspyynnöt?",
-  "notification_requests.confirm_dismiss_all.button": "Hylkää kaikki",
-  "notification_requests.confirm_dismiss_all.message": "Olet aikeissa hylätä {count, plural, one {ilmoituspyynnön} other {# ilmoituspyyntöä}}. Et saa {count, plural, one {sitä} other {niitä}} enää helposti takaisin. Haluatko varmasti jatkaa?",
-  "notification_requests.confirm_dismiss_all.title": "Hylätäänkö ilmoituspyynnöt?",
+  "notification_requests.accept_multiple": "{count, plural, one {Hyväksy # pyyntö…} other {Hyväksy # pyyntöä…}}",
+  "notification_requests.confirm_accept_multiple.button": "{count, plural, one {Hyväksy pyyntö} other {Hyväksy pyynnöt}}",
+  "notification_requests.confirm_accept_multiple.message": "Olet aikeissa hyväksyä {count, plural, one {ilmoituspyynnön} other {# ilmoituspyyntöä}}. Haluatko varmasti jatkaa?",
+  "notification_requests.confirm_accept_multiple.title": "Hyväksytäänkö ilmoituspyynnöt?",
+  "notification_requests.confirm_dismiss_multiple.button": "{count, plural, one {Hylkää pyyntö} other {Hylkää pyynnöt}}",
+  "notification_requests.confirm_dismiss_multiple.message": "Olet aikeissa hylätä {count, plural, one {ilmoituspyynnön} other {# ilmoituspyyntöä}}. Et saa {count, plural, one {sitä} other {niitä}} enää helposti takaisin. Haluatko varmasti jatkaa?",
+  "notification_requests.confirm_dismiss_multiple.title": "Hylätäänkö ilmoituspyynnöt?",
   "notification_requests.dismiss": "Hylkää",
-  "notification_requests.dismiss_all": "Hylkää kaikki",
-  "notification_requests.dismiss_multiple": "{count, plural, one {Hylkää # pyyntö} other {Hylkää # pyyntöä}}",
-  "notification_requests.enter_selection_mode": "Valitse",
-  "notification_requests.exit_selection_mode": "Peruuta",
+  "notification_requests.dismiss_multiple": "{count, plural, one {Hylkää # pyyntö…} other {Hylkää # pyyntöä…}}",
+  "notification_requests.edit_selection": "Muokkaa",
+  "notification_requests.exit_selection": "Valmis",
   "notification_requests.explainer_for_limited_account": "Tähän tiliin liittyvät ilmoitukset on suodatettu, koska moderaattori on rajoittanut tiliä.",
   "notification_requests.explainer_for_limited_remote_account": "Tähän tiliin liittyvät ilmoitukset on suodatettu, koska moderaattori on rajoittanut tiliä tai sen palvelinta.",
   "notification_requests.maximize": "Suurenna",
@@ -589,7 +587,7 @@
   "notifications.policy.filter_not_following_hint": "Kunnes hyväksyt heidät manuaalisesti",
   "notifications.policy.filter_not_following_title": "Käyttäjät, joita et seuraa",
   "notifications.policy.filter_private_mentions_hint": "Suodatetaan, ellei se ole vastaus omaan mainintaasi tai ellet seuraa lähettäjää",
-  "notifications.policy.filter_private_mentions_title": "Ei-toivotut yksityismaininnat",
+  "notifications.policy.filter_private_mentions_title": "Pyytämättömät yksityismaininnat",
   "notifications.policy.title": "Hallitse ilmoituksia kohteesta…",
   "notifications_permission_banner.enable": "Ota työpöytäilmoitukset käyttöön",
   "notifications_permission_banner.how_to_control": "Saadaksesi ilmoituksia, kun Mastodon ei ole auki, ota työpöytäilmoitukset käyttöön. Voit hallita tarkasti, mistä saat työpöytäilmoituksia kun ilmoitukset on otettu käyttöön yllä olevan {icon}-painikkeen kautta.",
diff --git a/app/javascript/mastodon/locales/fo.json b/app/javascript/mastodon/locales/fo.json
index 36198e9e591f25..beabf7fa3b464b 100644
--- a/app/javascript/mastodon/locales/fo.json
+++ b/app/javascript/mastodon/locales/fo.json
@@ -518,19 +518,7 @@
   "notification.status": "{name} hevur júst postað",
   "notification.update": "{name} rættaði ein post",
   "notification_requests.accept": "Góðtak",
-  "notification_requests.accept_all": "Góðtak alt",
-  "notification_requests.accept_multiple": "{count, plural, one {Góðtak # umbøn} other {Góðtak # umbønir}}",
-  "notification_requests.confirm_accept_all.button": "Góðtak alt",
-  "notification_requests.confirm_accept_all.message": "Tú er í ferð við at góðtaka {count, plural, one {eina fráboðanarumbøn} other {# fráboðanarumbønir}}. Er tú vís/ur í at tú vilt halda fram?",
-  "notification_requests.confirm_accept_all.title": "Góðtekur tú umbøn um fráboðan?",
-  "notification_requests.confirm_dismiss_all.button": "Vraka alt",
-  "notification_requests.confirm_dismiss_all.message": "Tú ert í ferð við at kveistra burtur {count, plural, one {eina fráboðanarumbøn} other {# fráboðanarumbønir}}. Tað verður ikki lætt hjá tær at fáa atgongd til {count, plural, one {hana} other {tær}} aftur. Er tú vís/ur í, at tú vil halda fram?",
-  "notification_requests.confirm_dismiss_all.title": "Kveistra burtur fráboðanarumbønir?",
   "notification_requests.dismiss": "Avvís",
-  "notification_requests.dismiss_all": "Vraka alt",
-  "notification_requests.dismiss_multiple": "{count, plural, one {Kveistra burtur # umbøn} other {Kveistra burtur # umbønir}}",
-  "notification_requests.enter_selection_mode": "Vel",
-  "notification_requests.exit_selection_mode": "Strika",
   "notification_requests.explainer_for_limited_account": "Fráboðanir frá hesi kontuni eru filtreraðar burtur, tí kontan er avmarkað av einum umsjónarfólki.",
   "notification_requests.explainer_for_limited_remote_account": "Fráboðanir frá hesi kontuni eru filtreraðar burtur, tí kontan ella ambætarin hjá kontuni eru avmarkaði av einum umsjónarfólki.",
   "notification_requests.maximize": "Mesta",
diff --git a/app/javascript/mastodon/locales/fr-CA.json b/app/javascript/mastodon/locales/fr-CA.json
index 9cf1d8a69ba2b7..e57bc694afff1c 100644
--- a/app/javascript/mastodon/locales/fr-CA.json
+++ b/app/javascript/mastodon/locales/fr-CA.json
@@ -490,9 +490,6 @@
   "notification.status": "{name} vient de publier",
   "notification.update": "{name} a modifié une publication",
   "notification_requests.accept": "Accepter",
-  "notification_requests.accept_all": "Tout accepter",
-  "notification_requests.confirm_accept_all.button": "Tout accepter",
-  "notification_requests.confirm_dismiss_all.button": "Tout rejeter",
   "notification_requests.dismiss": "Rejeter",
   "notification_requests.notifications_from": "Notifications de {name}",
   "notification_requests.title": "Notifications filtrées",
diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json
index 6546cbb1e9f369..dd713e50ea156b 100644
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@@ -490,9 +490,6 @@
   "notification.status": "{name} vient de publier",
   "notification.update": "{name} a modifié un message",
   "notification_requests.accept": "Accepter",
-  "notification_requests.accept_all": "Tout accepter",
-  "notification_requests.confirm_accept_all.button": "Tout accepter",
-  "notification_requests.confirm_dismiss_all.button": "Tout rejeter",
   "notification_requests.dismiss": "Rejeter",
   "notification_requests.notifications_from": "Notifications de {name}",
   "notification_requests.title": "Notifications filtrées",
diff --git a/app/javascript/mastodon/locales/ga.json b/app/javascript/mastodon/locales/ga.json
index db36db17aa0e0c..945b2582aca957 100644
--- a/app/javascript/mastodon/locales/ga.json
+++ b/app/javascript/mastodon/locales/ga.json
@@ -518,19 +518,7 @@
   "notification.status": "Phostáil {name} díreach",
   "notification.update": "Chuir {name} postáil in eagar",
   "notification_requests.accept": "Glac",
-  "notification_requests.accept_all": "Glac le gach",
-  "notification_requests.accept_multiple": "{count, plural, one {Glac le # iarratas} two {Glac le # iarratas} few {Glac le # iarratas} many {Glac le # iarratas} other {Glac le # iarratais}}",
-  "notification_requests.confirm_accept_all.button": "Glac le gach",
-  "notification_requests.confirm_accept_all.message": "Tá tú ar tí glacadh le {count, plural, one {iarratas fógra amháin} two {# iarratas fógra} few {# iarratas fógra} many {# iarratas fógra} other {# iarratais fógra}}. An bhfuil tú cinnte gur mian leat leanúint ar aghaidh?",
-  "notification_requests.confirm_accept_all.title": "Glac le hiarratais ar fhógra?",
-  "notification_requests.confirm_dismiss_all.button": "Ruaig gach",
-  "notification_requests.confirm_dismiss_all.message": "Tá tú ar tí neamhaird a dhéanamh ar {count, plural, one {iarratas fógra amháin} two {# iarratas fógra} few {# iarratas fógra} many {# iarratas fógra} other {# iarratais fógra}}. Ní bheidh tú in ann {count, plural, one {é} two {iad} few {iad} many {iad} other {iad}} a rochtain go héasca arís. An bhfuil tú cinnte gur mian leat leanúint ar aghaidh?",
-  "notification_requests.confirm_dismiss_all.title": "An bhfuil fonn ort iarratais ar fhógra a dhíbhe?",
   "notification_requests.dismiss": "Díbhe",
-  "notification_requests.dismiss_all": "Ruaig gach",
-  "notification_requests.dismiss_multiple": "{count, plural, one {Neamhaird a dhéanamh ar # iarratas} two {Neamhaird a dhéanamh ar # iarratas} few {Neamhaird a dhéanamh ar # iarratas} many {Neamhaird a dhéanamh ar # iarratas} other {Neamhaird a dhéanamh ar # iarratais}}",
-  "notification_requests.enter_selection_mode": "Roghnaigh",
-  "notification_requests.exit_selection_mode": "Cealaigh",
   "notification_requests.explainer_for_limited_account": "Scagadh fógraí ón gcuntas seo toisc go bhfuil an cuntas teoranta ag modhnóir.",
   "notification_requests.explainer_for_limited_remote_account": "Scagadh fógraí ón gcuntas seo toisc go bhfuil an cuntas nó a fhreastalaí teoranta ag modhnóir.",
   "notification_requests.maximize": "Uasmhéadaigh",
diff --git a/app/javascript/mastodon/locales/gd.json b/app/javascript/mastodon/locales/gd.json
index 6cbf1e7a03d1b9..8ab4cafd1420a8 100644
--- a/app/javascript/mastodon/locales/gd.json
+++ b/app/javascript/mastodon/locales/gd.json
@@ -518,19 +518,7 @@
   "notification.status": "Phostaich {name} rud",
   "notification.update": "Dheasaich {name} post",
   "notification_requests.accept": "Gabh ris",
-  "notification_requests.accept_all": "Gabh ris na h-uile",
-  "notification_requests.accept_multiple": "{count, plural, one {Gabh ri # iarrtas} two {Gabh ri # iarrtas} few {Gabh ri # iarrtasan} other {Gabh ri # iarrtas}}",
-  "notification_requests.confirm_accept_all.button": "Gabh ris na h-uile",
-  "notification_requests.confirm_accept_all.message": "Tha thu gu bhith gabhail ri {count, plural, one {# iarrtas bratha} two {# iarrtas bratha} few {# iarrtasan bratha} other {# iarrtas bratha}} a leigeil seachad. A bheil thu cinnteach gu bheil thu airson leantainn air adhart?",
-  "notification_requests.confirm_accept_all.title": "A bheil thu airson gabhail ri iarrtasan bratha?",
-  "notification_requests.confirm_dismiss_all.button": "Leig seachad na h-uile",
-  "notification_requests.confirm_dismiss_all.message": "Tha thu gu bhith {count, plural, one {# iarrtas bratha} two {# iarrtas bratha} few {# iarrtasan bratha} other {# iarrtas bratha}} a leigeil seachad. Chan fhaigh thu grèim {count, plural, one {air} two {orra} few {orra} other {orra}} a-rithist gun duilgheadas. A bheil thu cinnteach gu bheil thu airson leantainn air adhart?",
-  "notification_requests.confirm_dismiss_all.title": "A bheil thu airson iarrtasan bratha a leigeil seachad?",
   "notification_requests.dismiss": "Leig seachad",
-  "notification_requests.dismiss_all": "Leig seachad na h-uile",
-  "notification_requests.dismiss_multiple": "{count, plural, one {Leig seachad # iarrtas} two {Leig seachad # iarrtas} few {Leig seachad # iarrtasan} other {Leig seachad # iarrtas}}",
-  "notification_requests.enter_selection_mode": "Tagh",
-  "notification_requests.exit_selection_mode": "Sguir dheth",
   "notification_requests.explainer_for_limited_account": "Chaidh na brathan on chunntas seo a chriathradh on a chaidh an cunntas a chuingeachadh le maor.",
   "notification_requests.explainer_for_limited_remote_account": "Chaidh na brathan on chunntas seo a chriathradh on a chaidh an cunntas no am frithealaiche aige a chuingeachadh le maor.",
   "notification_requests.maximize": "Làn-mheudaich",
diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json
index c344c19b7e98cd..1c694bf13d2907 100644
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@@ -518,19 +518,7 @@
   "notification.status": "{name} publicou",
   "notification.update": "{name} editou unha publicación",
   "notification_requests.accept": "Aceptar",
-  "notification_requests.accept_all": "Aceptar todo",
-  "notification_requests.accept_multiple": "{count, plural, one {Aceptar # solicitude} other {Acceptar # solicitudes}}",
-  "notification_requests.confirm_accept_all.button": "Aceptar todo",
-  "notification_requests.confirm_accept_all.message": "Vas aceptar {count, plural, one {unha solicitude de notificación} other {# solicitudes de notificación}}. Tes certeza de querer aceptalas?",
-  "notification_requests.confirm_accept_all.title": "Aceptar solicitudes de notificación?",
-  "notification_requests.confirm_dismiss_all.button": "Rexeitar todo",
-  "notification_requests.confirm_dismiss_all.message": "Vas rexeitar {count, plural, one {unha solicitude de notificación} other {# solicitudes de notificacións}}. Será complicado volver a {count, plural, one {vela} other {velas}}. Tes certeza de rexeitar?",
-  "notification_requests.confirm_dismiss_all.title": "Rexeitar solicitudes de notificacións?",
   "notification_requests.dismiss": "Desbotar",
-  "notification_requests.dismiss_all": "Rexeitar todo",
-  "notification_requests.dismiss_multiple": "{count, plural, one {Rexeitar # solicitude} other {Rexeitar # solicitudes}}",
-  "notification_requests.enter_selection_mode": "Escoller",
-  "notification_requests.exit_selection_mode": "Desbotar",
   "notification_requests.explainer_for_limited_account": "Filtráronse as notificacións desta conta porque a conta ten limitacións impostas pola moderación.",
   "notification_requests.explainer_for_limited_remote_account": "Filtráronse as notificacións desta conta porque a conta ou o seu servidor teñen limitacións impostas pola moderación.",
   "notification_requests.maximize": "Maximizar",
diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json
index e9cbfcbcc3367b..72f0612bc79d78 100644
--- a/app/javascript/mastodon/locales/he.json
+++ b/app/javascript/mastodon/locales/he.json
@@ -518,19 +518,7 @@
   "notification.status": "{name} הרגע פרסמו",
   "notification.update": "{name} ערכו הודעה",
   "notification_requests.accept": "לקבל",
-  "notification_requests.accept_all": "לקבל את כל הבקשות",
-  "notification_requests.accept_multiple": "{count, plural,one {לאשר קבלת בקשה}other {לאשר קבלת # בקשות}}",
-  "notification_requests.confirm_accept_all.button": "לקבל את כל הבקשות",
-  "notification_requests.confirm_accept_all.message": "אתם עומדים לאשר {count, plural,one {בקשת התראה אחת}other {# בקשות התראה}}. להמשיך?",
-  "notification_requests.confirm_accept_all.title": "לקבל בקשות התראה?",
-  "notification_requests.confirm_dismiss_all.button": "דחיית כל הבקשות",
-  "notification_requests.confirm_dismiss_all.message": "אתם עומדים לדחות {count, plural,one {בקשת התראה}other {# בקשות התראה}}. לא תוכלו למצוא {count, plural,one {אותה}other {אותן}} בקלות אחר כך. להמשיך?",
-  "notification_requests.confirm_dismiss_all.title": "לדחות בקשות התראה?",
   "notification_requests.dismiss": "לבטל",
-  "notification_requests.dismiss_all": "דחיית כל הבקשות",
-  "notification_requests.dismiss_multiple": "{count, plural,one {לדחות בקשה}other {לדחות # בקשות}} לקבלת התראה",
-  "notification_requests.enter_selection_mode": "בחירה",
-  "notification_requests.exit_selection_mode": "ביטול",
   "notification_requests.explainer_for_limited_account": "התראות על פעולות חשבון זה סוננו כי חשבון זה הוגבל על ידי מנהלי הדיונים.",
   "notification_requests.explainer_for_limited_remote_account": "התראות על פעולות חשבון זה סוננו כי חשבון זה או השרת שלו הוגבלו על ידי מנהלי הדיונים.",
   "notification_requests.maximize": "הגדלה למקסימום",
diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json
index eb618c4666dfa4..c3e568c780671b 100644
--- a/app/javascript/mastodon/locales/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@@ -518,19 +518,7 @@
   "notification.status": "{name} bejegyzést tett közzé",
   "notification.update": "{name} szerkesztett egy bejegyzést",
   "notification_requests.accept": "Elfogadás",
-  "notification_requests.accept_all": "Összes elfogadása",
-  "notification_requests.accept_multiple": "{count, plural, one {# kérés elfogadása} other {# kérés elfogadása}}",
-  "notification_requests.confirm_accept_all.button": "Összes elfogadása",
-  "notification_requests.confirm_accept_all.message": "Elfogadni készülsz {count, plural, one {egy értesítési kérést} other {# értesítési kérést}}. Biztosan folytatod?",
-  "notification_requests.confirm_accept_all.title": "Értesítési kérés elfogadása?",
-  "notification_requests.confirm_dismiss_all.button": "Összes elutasítása",
-  "notification_requests.confirm_dismiss_all.message": "{count, plural, one {Egy értesítési kérés} other {# értesítési kérés}} elvetésére készülsz. Többé nem fogsz {count, plural, one {hozzáférni} other {hozzájuk férni}}. Biztosan folytatod?",
-  "notification_requests.confirm_dismiss_all.title": "Értesítési kérések elvetése?",
   "notification_requests.dismiss": "Elvetés",
-  "notification_requests.dismiss_all": "Összes elutasítása",
-  "notification_requests.dismiss_multiple": "{count, plural, one {# kérés elvetése} other {# kérés elvetése}}",
-  "notification_requests.enter_selection_mode": "Kiválasztás",
-  "notification_requests.exit_selection_mode": "Mégse",
   "notification_requests.explainer_for_limited_account": "Az ettől a fióktól származó értesítéseket kiszűrték, mert a fiókot egy moderátor korlátozta.",
   "notification_requests.explainer_for_limited_remote_account": "Az ettől a fióktól származó értesítéseket kiszűrték, mert a fiókot vagy annak kiszolgálóját egy moderátor korlátozta.",
   "notification_requests.maximize": "Maximalizálás",
diff --git a/app/javascript/mastodon/locales/ig.json b/app/javascript/mastodon/locales/ig.json
index 0f4731ebaac444..1dd380164df431 100644
--- a/app/javascript/mastodon/locales/ig.json
+++ b/app/javascript/mastodon/locales/ig.json
@@ -113,7 +113,6 @@
   "navigation_bar.lists": "Ndepụta",
   "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
   "notification.reblog": "{name} boosted your status",
-  "notification_requests.enter_selection_mode": "Họrọ",
   "onboarding.actions.go_to_explore": "See what's trending",
   "onboarding.actions.go_to_home": "Go to your home feed",
   "onboarding.follows.lead": "You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!",
diff --git a/app/javascript/mastodon/locales/is.json b/app/javascript/mastodon/locales/is.json
index d5c791e1c5b2f0..2cfe8a7c640db7 100644
--- a/app/javascript/mastodon/locales/is.json
+++ b/app/javascript/mastodon/locales/is.json
@@ -518,19 +518,7 @@
   "notification.status": "{name} sendi inn rétt í þessu",
   "notification.update": "{name} breytti færslu",
   "notification_requests.accept": "Samþykkja",
-  "notification_requests.accept_all": "Samþykkja alla",
-  "notification_requests.accept_multiple": "{count, plural, one {Samþykkja # beiðni} other {Samþykkja # beiðnir}}",
-  "notification_requests.confirm_accept_all.button": "Samþykkja alla",
-  "notification_requests.confirm_accept_all.message": "Þú ert að fara að samþykkja {count, plural, one {eina beiðni um tilkynningar} other {# beiðnir um tilkynningar}}. Ertu viss um að þú viljir halda áfram?",
-  "notification_requests.confirm_accept_all.title": "Samþykkja beiðnir um tilkynningar?",
-  "notification_requests.confirm_dismiss_all.button": "Hunsa allt",
-  "notification_requests.confirm_dismiss_all.message": "Þú ert að fara að hunsa {count, plural, one {eina beiðni um tilkynningar} other {# beiðnir um tilkynningar}}. Þú munt ekki eiga auðvelt með að skoða {count, plural, one {hana} other {þær}} aftur síðar. Ertu viss um að þú viljir halda áfram?",
-  "notification_requests.confirm_dismiss_all.title": "Hunsa beiðnir um tilkynningar?",
   "notification_requests.dismiss": "Afgreiða",
-  "notification_requests.dismiss_all": "Hunsa allt",
-  "notification_requests.dismiss_multiple": "{count, plural, one {Afgreiða # beiðni} other {Afgreiða # beiðnir}}",
-  "notification_requests.enter_selection_mode": "Velja",
-  "notification_requests.exit_selection_mode": "Hætta við",
   "notification_requests.explainer_for_limited_account": "Tilkynningar frá þessum notanda hafa verið síaðar þar sem aðgangur hans hefur verið takmarkaður af umsjónarmanni.",
   "notification_requests.explainer_for_limited_remote_account": "Tilkynningar frá þessum notanda hafa verið síaðar þar sem aðgangurinn eða netþjónn hans hefur verið takmarkaður af umsjónarmanni.",
   "notification_requests.maximize": "Hámarka",
diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json
index 20f5f0aa0816cd..99fc7058befb14 100644
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@@ -518,19 +518,7 @@
   "notification.status": "{name} ha appena pubblicato un post",
   "notification.update": "{name} ha modificato un post",
   "notification_requests.accept": "Accetta",
-  "notification_requests.accept_all": "Accetta tutte",
-  "notification_requests.accept_multiple": "{count, plural,one {Accetta # richiesta} other {Accetta # richieste}}",
-  "notification_requests.confirm_accept_all.button": "Accetta tutte",
-  "notification_requests.confirm_accept_all.message": "Stai per accettare {count, plural, one {una richiesta di notifica} other {# richieste di notifica}}. Si è sicuri di voler procedere?",
-  "notification_requests.confirm_accept_all.title": "Accettare le richieste di notifica?",
-  "notification_requests.confirm_dismiss_all.button": "Ignora tutte",
-  "notification_requests.confirm_dismiss_all.message": "Stai per ignorare {count, plural, one {una richiesta di notifica} other {# richieste di notifica}}. Non sarai più in grado di accedere facilmente {count, plural, one {ad essa} other {ad esse}} nuovamente. Si è sicuri di voler procedere?",
-  "notification_requests.confirm_dismiss_all.title": "Ignorare le richieste di notifica?",
   "notification_requests.dismiss": "Ignora",
-  "notification_requests.dismiss_all": "Ignora tutte",
-  "notification_requests.dismiss_multiple": "{count, plural, one {Ignora # richiesta} other {Ignora # richieste}}",
-  "notification_requests.enter_selection_mode": "Seleziona",
-  "notification_requests.exit_selection_mode": "Annulla",
   "notification_requests.explainer_for_limited_account": "Le notifiche provenienti da questo account sono state filtrate perché l'account è stato limitato da un moderatore.",
   "notification_requests.explainer_for_limited_remote_account": "Le notifiche provenienti da questo account sono state filtrate perché l'account o il suo server sono stati limitati da un moderatore.",
   "notification_requests.maximize": "Ingrandisci",
diff --git a/app/javascript/mastodon/locales/kab.json b/app/javascript/mastodon/locales/kab.json
index 420ba495f05268..f5adc8c56c482c 100644
--- a/app/javascript/mastodon/locales/kab.json
+++ b/app/javascript/mastodon/locales/kab.json
@@ -403,7 +403,6 @@
   "notification.status": "{name} akken i d-yessufeɣ",
   "notification_requests.accept": "Qbel",
   "notification_requests.dismiss": "Agi",
-  "notification_requests.exit_selection_mode": "Sefsex",
   "notification_requests.notifications_from": "Alɣuten sɣur {name}",
   "notifications.clear": "Sfeḍ alɣuten",
   "notifications.clear_confirmation": "Tebɣiḍ s tidet ad tekkseḍ akk alɣuten-inek·em i lebda?",
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index a309a502636514..2e929040f445b9 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -516,19 +516,7 @@
   "notification.status": "{name} 님이 방금 게시물을 올렸습니다",
   "notification.update": "{name} 님이 게시물을 수정했습니다",
   "notification_requests.accept": "수락",
-  "notification_requests.accept_all": "모두 수락",
-  "notification_requests.accept_multiple": "{count, plural, other {#개의 요청 수락하기}}",
-  "notification_requests.confirm_accept_all.button": "모두 수락",
-  "notification_requests.confirm_accept_all.message": "{count, plural, other {#개의 요청}}을 수락하려 합니다. 계속 진행할까요?",
-  "notification_requests.confirm_accept_all.title": "알림 요청을 수락할까요?",
-  "notification_requests.confirm_dismiss_all.button": "모두 지우기",
-  "notification_requests.confirm_dismiss_all.message": "{count, plural, other {#개의 요청}}을 지우려고 합니다. {count, plural, other {}}다시 접근하기 어렵습니다. 계속할까요?",
-  "notification_requests.confirm_dismiss_all.title": "알림 요청을 지울까요?",
   "notification_requests.dismiss": "지우기",
-  "notification_requests.dismiss_all": "모두 지우기",
-  "notification_requests.dismiss_multiple": "{count, plural, other {#개의 요청 지우기}}",
-  "notification_requests.enter_selection_mode": "선택",
-  "notification_requests.exit_selection_mode": "취소",
   "notification_requests.explainer_for_limited_account": "이 계정은 중재자에 의해 제한되었기 때문에 이 계정의 알림은 걸러졌습니다.",
   "notification_requests.explainer_for_limited_remote_account": "이 계정 혹은 그가 속한 서버는 중재자에 의해 제한되었기 때문에 이 계정의 알림은 걸러졌습니다.",
   "notification_requests.maximize": "최대화",
diff --git a/app/javascript/mastodon/locales/lad.json b/app/javascript/mastodon/locales/lad.json
index 0b0449c96aa134..9711bc684d400b 100644
--- a/app/javascript/mastodon/locales/lad.json
+++ b/app/javascript/mastodon/locales/lad.json
@@ -475,11 +475,7 @@
   "notification.status": "{name} publiko algo",
   "notification.update": "{name} edito una publikasyon",
   "notification_requests.accept": "Acheta",
-  "notification_requests.accept_all": "Acheta todos",
-  "notification_requests.confirm_accept_all.button": "Acheta todos",
   "notification_requests.dismiss": "Kita",
-  "notification_requests.enter_selection_mode": "Eskoje",
-  "notification_requests.exit_selection_mode": "Anula",
   "notification_requests.notifications_from": "Avizos de {name}",
   "notification_requests.title": "Avizos filtrados",
   "notification_requests.view": "Amostra avizos",
diff --git a/app/javascript/mastodon/locales/lt.json b/app/javascript/mastodon/locales/lt.json
index 038ec8a7b30e2a..174d3033c799f9 100644
--- a/app/javascript/mastodon/locales/lt.json
+++ b/app/javascript/mastodon/locales/lt.json
@@ -516,19 +516,7 @@
   "notification.status": "{name} ką tik paskelbė",
   "notification.update": "{name} redagavo įrašą",
   "notification_requests.accept": "Priimti",
-  "notification_requests.accept_all": "Priimti visus",
-  "notification_requests.accept_multiple": "{count, plural, one {Priimti # prašymą} few {Priimti # prašymus} many {Priimti # prašymo} other {Priimti # prašymų}}",
-  "notification_requests.confirm_accept_all.button": "Priimti visus",
-  "notification_requests.confirm_accept_all.message": "Ketini priimti {count, plural, one {# pranešimo prašymą} few {# pranešimų prašymus} many {# pranešimo prašymo} other {# pranešimų prašymų}}. Ar tikrai nori tęsti?",
-  "notification_requests.confirm_accept_all.title": "Priimti pranešimų prašymus?",
-  "notification_requests.confirm_dismiss_all.button": "Atmesti visus",
-  "notification_requests.confirm_dismiss_all.message": "Ketini atmesti {count, plural, one {# pranešimo prašymą} few {# pranešimų prašymus} many {# pranešimo prašymo} other {# pranešimų prašymų}}. Daugiau negalėsi lengvai pasiekti {count, plural, one {jo} few {jų} many {juos} other {jų}}. Ar tikrai nori tęsti?",
-  "notification_requests.confirm_dismiss_all.title": "Atmesti pranešimų prašymus?",
   "notification_requests.dismiss": "Atmesti",
-  "notification_requests.dismiss_all": "Atmesti visus",
-  "notification_requests.dismiss_multiple": "{count, plural, one {Atmesti # prašymą} few {Atmesti # prašymus} many {Atmesti # prašymo} other {Atmesti # prašymų}}",
-  "notification_requests.enter_selection_mode": "Pasirinkti",
-  "notification_requests.exit_selection_mode": "Atšaukti",
   "notification_requests.explainer_for_limited_account": "Pranešimai iš šios paskyros buvo filtruojami, nes prižiūrėtojas (-a) apribojo paskyrą.",
   "notification_requests.explainer_for_limited_remote_account": "Pranešimai iš šios paskyros buvo filtruojami, nes prižiūrėtojas (-a) apribojo paskyrą arba serverį.",
   "notification_requests.maximize": "Padidinti",
diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json
index 9293cfb09214a4..a8a6b23f86fb54 100644
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@@ -518,19 +518,7 @@
   "notification.status": "{name} heeft zojuist een bericht geplaatst",
   "notification.update": "{name} heeft een bericht bewerkt",
   "notification_requests.accept": "Accepteren",
-  "notification_requests.accept_all": "Alles accepteren",
-  "notification_requests.accept_multiple": "{count, plural, one {# verzoek accepteren} other {# verzoeken accepteren}}",
-  "notification_requests.confirm_accept_all.button": "Alles accepteren",
-  "notification_requests.confirm_accept_all.message": "Je staat op het punt om {count, plural, one {een meldingsverzoek} other {# meldingsverzoeken}} te accepteren. Wil je doorgaan?",
-  "notification_requests.confirm_accept_all.title": "Meldingsverzoeken accepteren?",
-  "notification_requests.confirm_dismiss_all.button": "Alles afwijzen",
-  "notification_requests.confirm_dismiss_all.message": "Je staat op het punt om {count, plural, one {een meldingsverzoek} other {# meldingsverzoeken}} af te wijzen. Je zult niet in staat zijn om {count, plural, one {hier} other {hier}} weer gemakkelijk toegang toe te krijgen. Wil je doorgaan?",
-  "notification_requests.confirm_dismiss_all.title": "Meldingsverzoeken afwijzen?",
   "notification_requests.dismiss": "Afwijzen",
-  "notification_requests.dismiss_all": "Alles afwijzen",
-  "notification_requests.dismiss_multiple": "{count, plural, one {# verzoek afwijzen} other {# verzoeken afwijzen}}",
-  "notification_requests.enter_selection_mode": "Selecteren",
-  "notification_requests.exit_selection_mode": "Annuleren",
   "notification_requests.explainer_for_limited_account": "Meldingen van dit account zijn gefilterd omdat dit account door een moderator is beperkt.",
   "notification_requests.explainer_for_limited_remote_account": "Meldingen van dit account zijn gefilterd omdat dit account of diens server door een moderator is beperkt.",
   "notification_requests.maximize": "Maximaliseren",
diff --git a/app/javascript/mastodon/locales/nn.json b/app/javascript/mastodon/locales/nn.json
index 1b0e490e60edfa..7ecabd10c52ce7 100644
--- a/app/javascript/mastodon/locales/nn.json
+++ b/app/javascript/mastodon/locales/nn.json
@@ -518,19 +518,7 @@
   "notification.status": "{name} la nettopp ut",
   "notification.update": "{name} redigerte eit innlegg",
   "notification_requests.accept": "Godkjenn",
-  "notification_requests.accept_all": "Godta alle",
-  "notification_requests.accept_multiple": "{count, plural, one {Godta # førespurnad} other {Godta # førespurnader}}",
-  "notification_requests.confirm_accept_all.button": "Godta alle",
-  "notification_requests.confirm_accept_all.message": "Du er i ferd med å godta {count, plural, one {ein førespurnad om å fylgja deg} other {# førespurnader om å fylgja deg}}. Er du sikker på at du vil halda fram?",
-  "notification_requests.confirm_accept_all.title": "Godta førespurnad om varsel?",
-  "notification_requests.confirm_dismiss_all.button": "Avvis alle",
-  "notification_requests.confirm_dismiss_all.message": "Du er i ferd med å avvisa {count, plural, one {ein førespurnad om varsel} other {# førespurnader om varsel}}. Det blir ikkje lett å få tilgang til {count, plural, one {han} other {dei}} att. Er du sikker på at du vil halda fram?",
-  "notification_requests.confirm_dismiss_all.title": "Avvis førespurnader om varsel?",
   "notification_requests.dismiss": "Avvis",
-  "notification_requests.dismiss_all": "Avvis alle",
-  "notification_requests.dismiss_multiple": "{count, plural, one {Avvis # førespurnad} other {Avvis # førespurnader}}",
-  "notification_requests.enter_selection_mode": "Vel",
-  "notification_requests.exit_selection_mode": "Avbryt",
   "notification_requests.explainer_for_limited_account": "Varsla frå denne kontoen er filtrerte ut fordi ein moderator har avgrensa kontoen.",
   "notification_requests.explainer_for_limited_remote_account": "Varla frå denne kontoen er filtrerte ut fordi ein moderator har avgrensa kontoen eller tenaren.",
   "notification_requests.maximize": "Maksimer",
diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json
index c46c891d1bb49a..adbdedb78007e4 100644
--- a/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@@ -517,19 +517,17 @@
   "notification.status": "{name} opublikował(a) nowy wpis",
   "notification.update": "{name} edytował(a) post",
   "notification_requests.accept": "Akceptuj",
-  "notification_requests.accept_all": "Przyjmij wszystkie",
-  "notification_requests.accept_multiple": "Przyjmij {count, plural, one {# wniosek} few {# wnioski} other {# wniosków}} o powiadomienia",
-  "notification_requests.confirm_accept_all.button": "Przyjmij wszystkie",
-  "notification_requests.confirm_accept_all.message": "Na pewno przyjąć {count, plural, one {# wniosek o powiadomienie} few {# wnioski o powiadomienia} other {# wniosków o powiadomienia}}?",
-  "notification_requests.confirm_accept_all.title": "Przyjąć wnioski o powiadomienia?",
-  "notification_requests.confirm_dismiss_all.button": "Odrzuć wszystkie",
-  "notification_requests.confirm_dismiss_all.message": "Na pewno odrzucić {count, plural, one {# wniosek o powiadomienie} few {# wnioski o powiadomienia} other {# wniosków o powiadomienia}}? Stracisz do {count, plural, one {niego}  other {nich}} łatwy dostęp.",
-  "notification_requests.confirm_dismiss_all.title": "Odrzuć żądania powiadomień?",
+  "notification_requests.accept_multiple": "Przyjmij {count, plural, one {# wniosek} few {# wnioski} other {# wniosków}} o powiadomienia…",
+  "notification_requests.confirm_accept_multiple.button": "Przyjmij {count, plural, one {wniosek} other {wnioski}} o powiadomienia",
+  "notification_requests.confirm_accept_multiple.message": "Na pewno przyjąć {count, plural, one {# wniosek o powiadomienie} few {# wnioski o powiadomienia} other {# wniosków o powiadomienia}}?",
+  "notification_requests.confirm_accept_multiple.title": "Przyjąć wnioski o powiadomienia?",
+  "notification_requests.confirm_dismiss_multiple.button": "Odrzuć {count, plural, one {wniosek} other {wnioski}} o powiadomienia",
+  "notification_requests.confirm_dismiss_multiple.message": "Na pewno odrzucić {count, plural, one {# wniosek o powiadomienie} few {# wnioski o powiadomienia} other {# wniosków o powiadomienia}}? Stracisz do {count, plural, one {niego}  other {nich}} łatwy dostęp.",
+  "notification_requests.confirm_dismiss_multiple.title": "Odrzuć żądania powiadomień?",
   "notification_requests.dismiss": "Odrzuć",
-  "notification_requests.dismiss_all": "Odrzuć wszystkie",
-  "notification_requests.dismiss_multiple": "Odrzuć {count, plural, one {# wniosek} few {# wnioski} other {# wniosków}} o powiadomienia",
-  "notification_requests.enter_selection_mode": "Wybierz",
-  "notification_requests.exit_selection_mode": "Anuluj",
+  "notification_requests.dismiss_multiple": "Odrzuć {count, plural, one {# wniosek} few {# wnioski} other {# wniosków}} o powiadomienia…",
+  "notification_requests.edit_selection": "Edytuj",
+  "notification_requests.exit_selection": "Gotowe",
   "notification_requests.explainer_for_limited_account": "Powiadomienia od tego konta zostały odfiltrowane bo to konto zostało ograniczone przez moderatora.",
   "notification_requests.explainer_for_limited_remote_account": "Powiadomienia od tego konta zostały odfiltrowane bo to konto, albo serwer na którym się znajduje, zostało ograniczone przez moderatora.",
   "notification_requests.maximize": "Zmaksymalizuj",
diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json
index 613b1d454430e9..9f38f0b51a2aa1 100644
--- a/app/javascript/mastodon/locales/pt-BR.json
+++ b/app/javascript/mastodon/locales/pt-BR.json
@@ -498,10 +498,7 @@
   "notification.status": "{name} acabou de tootar",
   "notification.update": "{name} editou uma publicação",
   "notification_requests.accept": "Aceitar",
-  "notification_requests.accept_all": "Aceitar tudo",
-  "notification_requests.confirm_accept_all.button": "Aceitar tudo",
   "notification_requests.dismiss": "Rejeitar",
-  "notification_requests.exit_selection_mode": "Cancelar",
   "notification_requests.maximize": "Maximizar",
   "notification_requests.notifications_from": "Notificações de {name}",
   "notification_requests.title": "Notificações filtradas",
diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json
index 108b83f0b0e816..7ac05ea980d927 100644
--- a/app/javascript/mastodon/locales/sk.json
+++ b/app/javascript/mastodon/locales/sk.json
@@ -339,6 +339,7 @@
   "home.pending_critical_update.link": "Zobraziť aktualizácie",
   "home.pending_critical_update.title": "Je dostupná kritická bezpečnostná aktualizácia.",
   "home.show_announcements": "Zobraziť oznámenia",
+  "ignore_notifications_modal.ignore": "Ignoruj upozornenia",
   "interaction_modal.description.favourite": "S účtom na Mastodone môžete tento príspevok ohviezdičkovať, tak dať autorovi vedieť, že sa vám páči, a uložiť si ho na neskôr.",
   "interaction_modal.description.follow": "S účtom na Mastodone môžete {name} sledovať a vidieť ich príspevky vo svojom domovskom kanáli.",
   "interaction_modal.description.reblog": "S účtom na Mastodone môžete tento príspevok zdeľať so svojimi sledovateľmi.",
@@ -455,6 +456,11 @@
   "notification.favourite": "{name} hviezdičkuje váš príspevok",
   "notification.follow": "{name} vás sleduje",
   "notification.follow_request": "{name} vás žiada sledovať",
+  "notification.label.mention": "Zmienka",
+  "notification.label.private_mention": "Súkromná zmienka",
+  "notification.label.private_reply": "Súkromná odpoveď",
+  "notification.label.reply": "Odpoveď",
+  "notification.mention": "Zmienka",
   "notification.moderation-warning.learn_more": "Zisti viac",
   "notification.moderation_warning.action_delete_statuses": "Niektoré z tvojich príspevkov boli odstránené.",
   "notification.moderation_warning.action_disable": "Tvoj účet bol vypnutý.",
diff --git a/app/javascript/mastodon/locales/sl.json b/app/javascript/mastodon/locales/sl.json
index 353b521a1c9fa4..1f2d9c4cdfd610 100644
--- a/app/javascript/mastodon/locales/sl.json
+++ b/app/javascript/mastodon/locales/sl.json
@@ -507,13 +507,7 @@
   "notification.status": "{name} je pravkar objavil/a",
   "notification.update": "{name} je uredil(a) objavo",
   "notification_requests.accept": "Sprejmi",
-  "notification_requests.accept_all": "Sprejmi vse",
-  "notification_requests.confirm_accept_all.button": "Sprejmi vse",
-  "notification_requests.confirm_dismiss_all.button": "Opusti vse",
   "notification_requests.dismiss": "Zavrni",
-  "notification_requests.dismiss_all": "Opusti vse",
-  "notification_requests.enter_selection_mode": "Izberi",
-  "notification_requests.exit_selection_mode": "Prekliči",
   "notification_requests.maximize": "Maksimiraj",
   "notification_requests.notifications_from": "Obvestila od {name}",
   "notification_requests.title": "Filtrirana obvestila",
diff --git a/app/javascript/mastodon/locales/sq.json b/app/javascript/mastodon/locales/sq.json
index 78b90e2788af29..3fe22e4df5e22f 100644
--- a/app/javascript/mastodon/locales/sq.json
+++ b/app/javascript/mastodon/locales/sq.json
@@ -518,19 +518,7 @@
   "notification.status": "{name} sapo postoi",
   "notification.update": "{name} përpunoi një postim",
   "notification_requests.accept": "Pranoje",
-  "notification_requests.accept_all": "Pranoji krejt",
-  "notification_requests.accept_multiple": "{count, plural, one {Prano # kërkesë} other {Prano # kërkesa}}",
-  "notification_requests.confirm_accept_all.button": "Pranoji krejt",
-  "notification_requests.confirm_accept_all.message": "Ju ndan një hap nga pranimi i {count, plural, one {një kërkese njoftimi} other {# kërkesash njoftimi}}. Jeni i sigurt se doni të vazhdohet?",
-  "notification_requests.confirm_accept_all.title": "Të pranohen kërkesa njoftimesh?",
-  "notification_requests.confirm_dismiss_all.button": "Hidhi tej krejt",
-  "notification_requests.confirm_dismiss_all.message": "Ju ndan një hap nga hedhja tej e {count, plural, one {një kërkese njoftimesh} other {# kërkesash njoftimesh}}. S’do të jeni në gjendje të shihni sërish {count, plural, one {atë} other {ato}}. Jeni i sigurt se doni të bëhet kjo?",
-  "notification_requests.confirm_dismiss_all.title": "Të hidhen tej kërkesa njoftimesh?",
   "notification_requests.dismiss": "Hidhe tej",
-  "notification_requests.dismiss_all": "Hidhi tej krejt",
-  "notification_requests.dismiss_multiple": "{count, plural, one {Hidhni tej # kërkesë} other {Hidhni tej # kërkesa}}",
-  "notification_requests.enter_selection_mode": "Përzgjidhni",
-  "notification_requests.exit_selection_mode": "Anuloje",
   "notification_requests.explainer_for_limited_account": "Njoftimet prej kësaj llogarie janë filtruar, ngaqë llogaria është kufizuar nga një moderator.",
   "notification_requests.explainer_for_limited_remote_account": "Njoftimet prej kësaj llogarie janë filtruar, ngaqë llogaria, ose shërbyesi është kufizuar nga një moderator.",
   "notification_requests.maximize": "Maksimizoje",
diff --git a/app/javascript/mastodon/locales/sv.json b/app/javascript/mastodon/locales/sv.json
index b27b3633eefe32..7c57569b806ff4 100644
--- a/app/javascript/mastodon/locales/sv.json
+++ b/app/javascript/mastodon/locales/sv.json
@@ -502,14 +502,9 @@
   "notification.status": "{name} publicerade just ett inlägg",
   "notification.update": "{name} redigerade ett inlägg",
   "notification_requests.accept": "Godkänn",
-  "notification_requests.accept_all": "Acceptera alla",
-  "notification_requests.accept_multiple": "{count, plural, one {Acceptera # förfrågan} other {Acceptera # förfrågningar}}",
-  "notification_requests.confirm_accept_all.button": "Acceptera alla",
-  "notification_requests.confirm_dismiss_all.button": "Avvisa alla",
   "notification_requests.dismiss": "Avfärda",
-  "notification_requests.dismiss_all": "Avvisa alla",
-  "notification_requests.dismiss_multiple": "{count, plural, one {Avvisa # förfrågan} other {Avvisa # förfrågningar}}",
-  "notification_requests.exit_selection_mode": "Avbryt",
+  "notification_requests.edit_selection": "Redigera",
+  "notification_requests.exit_selection": "Klar",
   "notification_requests.notifications_from": "Aviseringar från {name}",
   "notification_requests.title": "Filtrerade meddelanden",
   "notifications.clear": "Rensa aviseringar",
diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json
index 9d378a67a2b8d9..dc155ac4333664 100644
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@@ -515,17 +515,7 @@
   "notification.status": "{name} เพิ่งโพสต์",
   "notification.update": "{name} ได้แก้ไขโพสต์",
   "notification_requests.accept": "ยอมรับ",
-  "notification_requests.accept_all": "ยอมรับทั้งหมด",
-  "notification_requests.accept_multiple": "{count, plural, other {ยอมรับ # คำขอ}}",
-  "notification_requests.confirm_accept_all.button": "ยอมรับทั้งหมด",
-  "notification_requests.confirm_accept_all.title": "ยอมรับคำขอการแจ้งเตือน?",
-  "notification_requests.confirm_dismiss_all.button": "ปิดทั้งหมด",
-  "notification_requests.confirm_dismiss_all.title": "ปิดคำขอการแจ้งเตือน?",
   "notification_requests.dismiss": "ปิด",
-  "notification_requests.dismiss_all": "ปิดทั้งหมด",
-  "notification_requests.dismiss_multiple": "{count, plural, other {ปิด # คำขอ}}",
-  "notification_requests.enter_selection_mode": "เลือก",
-  "notification_requests.exit_selection_mode": "ยกเลิก",
   "notification_requests.notifications_from": "การแจ้งเตือนจาก {name}",
   "notification_requests.title": "การแจ้งเตือนที่กรองอยู่",
   "notification_requests.view": "ดูการแจ้งเตือน",
diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json
index ba84b722128100..adada095b130b1 100644
--- a/app/javascript/mastodon/locales/tr.json
+++ b/app/javascript/mastodon/locales/tr.json
@@ -518,19 +518,7 @@
   "notification.status": "{name} az önce gönderdi",
   "notification.update": "{name} bir gönderiyi düzenledi",
   "notification_requests.accept": "Onayla",
-  "notification_requests.accept_all": "Tümünü kabul et",
-  "notification_requests.accept_multiple": "{count, plural, one {# isteği kabul et} other {# isteği kabul et}}",
-  "notification_requests.confirm_accept_all.button": "Tümünü kabul et",
-  "notification_requests.confirm_accept_all.message": "{count, plural, one {Bir bildirim isteğini} other {# bildirim isteğini}} kabul etmek üzeresiniz. Devam etmek istediğinizden emin misiniz?",
-  "notification_requests.confirm_accept_all.title": "Bildirim taleplerini kabul et?",
-  "notification_requests.confirm_dismiss_all.button": "Tümünü reddet",
-  "notification_requests.confirm_dismiss_all.message": "{count, plural, one {Bir bildirim isteğini} other {# bildirim isteğini}} reddetmek üzeresiniz. {count, plural, one {Ona} other {Onlara}} tekrar kolayca ulaşamayacaksınz. Devam etmek istediğinizden emin misiniz?",
-  "notification_requests.confirm_dismiss_all.title": "Bildirim taleplerini reddet?",
   "notification_requests.dismiss": "Yoksay",
-  "notification_requests.dismiss_all": "Tümünü reddet",
-  "notification_requests.dismiss_multiple": "{count, plural, one {# isteği reddet} other {# isteği reddet}}",
-  "notification_requests.enter_selection_mode": "Seç",
-  "notification_requests.exit_selection_mode": "İptal",
   "notification_requests.explainer_for_limited_account": "Hesap bir moderatör tarafından sınırlandığı için, bu hesaptan gönderilen bildirimler filtrelendi.",
   "notification_requests.explainer_for_limited_remote_account": "Hesap veya sunucusu bir moderatör tarafından sınırlandığı için, bu hesaptan gönderilen bildirimler filtrelendi.",
   "notification_requests.maximize": "Büyüt",
diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json
index 83b3be003ec63a..462b9fb171e938 100644
--- a/app/javascript/mastodon/locales/uk.json
+++ b/app/javascript/mastodon/locales/uk.json
@@ -518,19 +518,7 @@
   "notification.status": "{name} щойно дописує",
   "notification.update": "{name} змінює допис",
   "notification_requests.accept": "Прийняти",
-  "notification_requests.accept_all": "Прийняти все",
-  "notification_requests.accept_multiple": "{count, plural, one {Прийняти # запит} few {Прийняти # запити} many {Прийняти # запитів} other {Прийняти # запит}}",
-  "notification_requests.confirm_accept_all.button": "Прийняти все",
-  "notification_requests.confirm_accept_all.message": "Ви збираєтеся прийняти {count, plural, one {запит на сповіщення} few {# запити на сповіщення} many {# запитів на сповіщення} other {# запит на сповіщення}}. Ви впевнені, що хочете продовжити?",
-  "notification_requests.confirm_accept_all.title": "Прийняти запит на сповіщення?",
-  "notification_requests.confirm_dismiss_all.button": "Відхили все",
-  "notification_requests.confirm_dismiss_all.message": "Ви збираєтеся відхилити {count, plural, one {запит на сповіщення} few {# запити на сповіщення} many {# запитів на сповіщення} other {# запит на сповіщення}}. Ви не зможете легко отримати доступ до {count, plural, one {нього} other {них}} again. Ви впевнені, що хочете продовжити?",
-  "notification_requests.confirm_dismiss_all.title": "Відхилити запити на сповіщення?",
   "notification_requests.dismiss": "Відхилити",
-  "notification_requests.dismiss_all": "Відхили все",
-  "notification_requests.dismiss_multiple": "{count, plural, one {Відхилити # запит} other {Відхилити # запити}}",
-  "notification_requests.enter_selection_mode": "Вибрати",
-  "notification_requests.exit_selection_mode": "Скасувати",
   "notification_requests.explainer_for_limited_account": "Сповіщення від цього облікового запису фільтровані, оскільки обліковий запис обмежений модератором.",
   "notification_requests.explainer_for_limited_remote_account": "Сповіщення від цього облікового запису фільтровані, оскільки обліковий запис або його сервер обмежений модератором.",
   "notification_requests.maximize": "Розгорнути",
diff --git a/app/javascript/mastodon/locales/vi.json b/app/javascript/mastodon/locales/vi.json
index 688adc213716f4..8dceeccdbd428f 100644
--- a/app/javascript/mastodon/locales/vi.json
+++ b/app/javascript/mastodon/locales/vi.json
@@ -509,7 +509,17 @@
   "notification.status": "{name} đăng tút mới",
   "notification.update": "{name} đã sửa tút",
   "notification_requests.accept": "Chấp nhận",
+  "notification_requests.accept_multiple": "{count, plural, other {Duyệt # yêu cầu…}}",
+  "notification_requests.confirm_accept_multiple.button": "{count, plural, other {Yêu cầu cần duyệt}}",
+  "notification_requests.confirm_accept_multiple.message": "Bạn sẽ duyệt {count, plural, other {# yêu cầu thông báo}}. Vẫn tiếp tục?",
+  "notification_requests.confirm_accept_multiple.title": "Duyệt yêu cầu thông báo?",
+  "notification_requests.confirm_dismiss_multiple.button": "{count, plural, other {Bỏ qua yêu cầu}}",
+  "notification_requests.confirm_dismiss_multiple.message": "Bạn sẽ bỏ qua {count, plural, other {# yêu cầu thông báo}}. Bạn sẽ không thể truy cập dễ dàng {count, plural, other {chúng}} nữa. Vẫn tiếp tục?",
+  "notification_requests.confirm_dismiss_multiple.title": "Bỏ qua yêu cầu thông báo?",
   "notification_requests.dismiss": "Bỏ qua",
+  "notification_requests.dismiss_multiple": "{count, plural, other {Bỏ qua # yêu cầu…}}",
+  "notification_requests.edit_selection": "Sửa",
+  "notification_requests.exit_selection": "Xong",
   "notification_requests.explainer_for_limited_account": "Thông báo từ tài khoản này đã được lọc vì tài khoản đã bị giới hạn bởi kiểm duyệt viên.",
   "notification_requests.explainer_for_limited_remote_account": "Thông báo từ tài khoản này đã được lọc vì tài khoản hoặc máy chủ của tài khoản đã bị giới hạn bởi kiểm duyệt viên.",
   "notification_requests.maximize": "Tối đa",
diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json
index 517390f823c575..fd3ce2ae6c0f10 100644
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@@ -518,19 +518,7 @@
   "notification.status": "{name} 刚刚发布嘟文",
   "notification.update": "{name} 编辑了嘟文",
   "notification_requests.accept": "接受",
-  "notification_requests.accept_all": "全部接受",
-  "notification_requests.accept_multiple": "{count, plural, other {接受 # 个请求}}",
-  "notification_requests.confirm_accept_all.button": "全部接受",
-  "notification_requests.confirm_accept_all.message": "你将要接受 {count, plural, other {# 个通知请求}}。是否继续？",
-  "notification_requests.confirm_accept_all.title": "是否接受通知请求？",
-  "notification_requests.confirm_dismiss_all.button": "全部拒绝",
-  "notification_requests.confirm_dismiss_all.message": "你将要拒绝 {count, plural, other {# 个通知请求}}。你将无法再轻易访问{count, plural, other {它们}}。是否继续？",
-  "notification_requests.confirm_dismiss_all.title": "是否拒绝通知请求?",
   "notification_requests.dismiss": "拒绝",
-  "notification_requests.dismiss_all": "全部拒绝",
-  "notification_requests.dismiss_multiple": "{count, plural, other {拒绝 # 个请求}}",
-  "notification_requests.enter_selection_mode": "选择",
-  "notification_requests.exit_selection_mode": "取消",
   "notification_requests.explainer_for_limited_account": "来自该账户的通知已被过滤，因为该账户已被管理员限制。",
   "notification_requests.explainer_for_limited_remote_account": "来自该账户的通知已被过滤，因为该账户或其所在的实例已被管理员限制。",
   "notification_requests.maximize": "最大化",
diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json
index 16e506a181beb8..cc130cfafcc113 100644
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@@ -518,19 +518,17 @@
   "notification.status": "{name} 剛剛嘟文",
   "notification.update": "{name} 已編輯嘟文",
   "notification_requests.accept": "接受",
-  "notification_requests.accept_all": "全部接受",
-  "notification_requests.accept_multiple": "{count, plural, other {接受 # 則請求}}",
-  "notification_requests.confirm_accept_all.button": "全部接受",
-  "notification_requests.confirm_accept_all.message": "您將接受 {count, plural, other {# 則推播通知請求}}。您確定要繼續？",
-  "notification_requests.confirm_accept_all.title": "接受推播通知請求？",
-  "notification_requests.confirm_dismiss_all.button": "全部忽略",
-  "notification_requests.confirm_dismiss_all.message": "您將忽略 {count, plural, other {# 則推播通知請求}}。您將不再能輕易存取{count, plural, other {這些}}推播通知。您確定要繼續？",
-  "notification_requests.confirm_dismiss_all.title": "忽略推播通知請求？",
+  "notification_requests.accept_multiple": "{count, plural, other {接受 # 則請求...}}",
+  "notification_requests.confirm_accept_multiple.button": "{count, plural, other {接受請求}}",
+  "notification_requests.confirm_accept_multiple.message": "您將接受 {count, plural, other {# 則推播通知請求}}。您確定要繼續？",
+  "notification_requests.confirm_accept_multiple.title": "接受推播通知請求？",
+  "notification_requests.confirm_dismiss_multiple.button": "{count, plural, other {忽略請求}}",
+  "notification_requests.confirm_dismiss_multiple.message": "您將忽略 {count, plural, other {# 則推播通知請求}}。您將不再能輕易存取{count, plural, other {這些}}推播通知。您確定要繼續？",
+  "notification_requests.confirm_dismiss_multiple.title": "忽略推播通知請求？",
   "notification_requests.dismiss": "關閉",
-  "notification_requests.dismiss_all": "全部忽略",
-  "notification_requests.dismiss_multiple": "{count, plural, other {忽略 # 則請求}}",
-  "notification_requests.enter_selection_mode": "選擇",
-  "notification_requests.exit_selection_mode": "取消",
+  "notification_requests.dismiss_multiple": "{count, plural, other {忽略 # 則請求...}}",
+  "notification_requests.edit_selection": "編輯",
+  "notification_requests.exit_selection": "完成",
   "notification_requests.explainer_for_limited_account": "由於此帳號已被管理員限制，來自此帳號之通知已被過濾。",
   "notification_requests.explainer_for_limited_remote_account": "由於此帳號或其伺服器已被管理員限制，來自此帳號之通知已被過濾。",
   "notification_requests.maximize": "最大化",
diff --git a/config/locales/be.yml b/config/locales/be.yml
index 81804ffc32d42a..3d4c10cbb87543 100644
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -35,6 +35,7 @@ be:
       created_msg: Нататка мадэратара паспяхова створана!
       destroyed_msg: Нататка мадэратара паспяхова выдалена!
     accounts:
+      add_email_domain_block: Заблакіраваць дамен эл. пошты
       approve: Пацвердзіць
       approved_msg: Заяўка на рэгістрацыю %{username} ухваленая
       are_you_sure: Вы ўпэўнены?
@@ -135,6 +136,7 @@ be:
       resubscribe: Аднавіць падпіску
       role: Роля
       search: Пошук
+      search_same_email_domain: Іншыя карыстальнікі з такім жа даменам эл. пошты
       search_same_ip: Іншыя карыстальнікі з гэтым IP
       security: Бяспека
       security_measures:
@@ -175,21 +177,26 @@ be:
         approve_appeal: Ухваліць абскарджанне
         approve_user: Зацвердзіць карыстальніка
         assigned_to_self_report: Прызначыць скаргу
+        change_email_user: Змяніць эл. пошту карыстальніка
         change_role_user: Змяніць ролю карыстальніка
         confirm_user: Пацвердзіць карыстальніка
         create_account_warning: Стварыць папярэджанне
         create_announcement: Стварыць аб'яву
+        create_canonical_email_block: Стварыць блакіроўку электроннай пошты
         create_custom_emoji: Стварыць адвольны эмодзі
         create_domain_allow: Стварыць даменны дазвол
         create_domain_block: Стварыць даменны блок
+        create_email_domain_block: Стварыць даменны блок электроннай пошты
         create_ip_block: Стварыць IP правіла
         create_unavailable_domain: Стварыць недаступны Дамен
         create_user_role: Стварыць ролю
         demote_user: Панізіць карыстальніка
         destroy_announcement: Выдаліць аб'яву
+        destroy_canonical_email_block: Выдаліць блакіроўку электроннай пошты
         destroy_custom_emoji: Выдаліць адвольны эмодзі
         destroy_domain_allow: Выдаліць дамены дазвол
         destroy_domain_block: Выдаліць даменны блок
+        destroy_email_domain_block: Выдаліць даменны блок электроннай пошты
         destroy_instance: Вычысціць дамен
         destroy_ip_block: Выдаліць IP правіла
         destroy_status: Выдаліць допіс
@@ -197,8 +204,10 @@ be:
         destroy_user_role: Выдаліць ролю
         disable_2fa_user: Адключыць двухэтапнае спраўджанне
         disable_custom_emoji: Адключыць адвольныя эмодзі
+        disable_sign_in_token_auth_user: Адключыць аўтарызацыю праз электронную пошту для карыстальніка
         disable_user: Адключыць карыстальніка
         enable_custom_emoji: Уключыць адвольныя эмодзі
+        enable_sign_in_token_auth_user: Уключыць аўтарызацыю праз электронную пошту для карыстальніка
         enable_user: Уключыць карыстальніка
         memorialize_account: Запомніць уліковы запіс
         promote_user: Павысіць правы Карыстальніка
@@ -228,20 +237,26 @@ be:
         approve_appeal_html: Карыстальнік %{name} ухваліў запыт на мадэрацыю %{target}
         approve_user_html: "%{name} пацвердзіў рэгістрацыю ад %{target}"
         assigned_to_self_report_html: "%{name} прызначыў справаздачу %{target} на сябе\n"
+        change_email_user_html: "%{name} змяніў паштовы адрас карыстальніка %{target}"
         change_role_user_html: "%{name} змяніў ролю %{target}"
+        confirm_user_html: "%{name} пацвердзіў паштовы адрас %{target}"
         create_account_warning_html: "%{name} накіраваў папярэджанне %{target}"
         create_announcement_html: "%{name} зрабіў новую аб'яву %{target}"
+        create_canonical_email_block_html: "%{name} заблакіраваў эл. пошту з хэшам %{target}"
         create_custom_emoji_html: "%{name} загрузіў новы смайлік %{target}\n\n"
         create_domain_allow_html: "%{name} дазволіў федэрацыю з даменам %{target}"
         create_domain_block_html: "%{name} заблакіраваў дамен %{target}"
+        create_email_domain_block_html: "%{name} заблакіраваў дамен эл. пошты %{target}"
         create_ip_block_html: "%{name} стварыў правіла для IP %{target}"
         create_unavailable_domain_html: "%{name} прыпыніў дастаўку да дамена %{target}"
         create_user_role_html: "%{name} зрабіў ролю %{target}"
         demote_user_html: "%{name} прыбраў карыстальніка %{target}"
         destroy_announcement_html: "%{name} выдаліў аб'яву %{target}"
+        destroy_canonical_email_block_html: "%{name} разблакіраваў эл. пошту з хэшам %{target}"
         destroy_custom_emoji_html: "%{name} выдаліў(а) эмоджі %{target}"
         destroy_domain_allow_html: "%{name} зняў дазвол на аб'яднанне з даменам %{target}\n"
         destroy_domain_block_html: "%{name} разблакаваў дамен %{target}"
+        destroy_email_domain_block_html: "%{name} разблакіраваў дамен эл. пошты %{target}"
         destroy_instance_html: "%{name} цалкам прыбраў дамен %{target}"
         destroy_ip_block_html: "%{name} выдаліў правіла для IP %{target}"
         destroy_status_html: "%{name} выдаліў допіс %{target}"
@@ -249,8 +264,10 @@ be:
         destroy_user_role_html: "%{name} выдаліў ролю %{target}"
         disable_2fa_user_html: "%{name} амяніў абавязковую двухфактарную верыфікацыю для карыстальніка %{target}"
         disable_custom_emoji_html: "%{name} заблакіраваў эмодзі %{target}"
+        disable_sign_in_token_auth_user_html: "%{name} адключыў уваход праз эл. пошту для %{target}"
         disable_user_html: "%{name} адключыў уваход для карыстальніка %{target}"
         enable_custom_emoji_html: "%{name} уключыў эмодзі %{target}"
+        enable_sign_in_token_auth_user_html: "%{name} уключыў уваход праз эл. пошту для %{target}"
         enable_user_html: "%{name} уключыў уваход для карыстальніка %{target}"
         memorialize_account_html: Карыстальнік %{name} пераключыў уліковы запіс %{target} у старонку памяці
         promote_user_html: "%{name} павысіў карыстальніка %{target}"
@@ -258,6 +275,7 @@ be:
         reject_user_html: "%{name} адхіліў рэгістрацыю з %{target}"
         remove_avatar_user_html: "%{name} выдаліў аватар %{target}"
         reopen_report_html: "%{name} зноў адкрыў скаргу %{target}"
+        resend_user_html: "%{name} зноў адправіў ліст з пацвярджэннем для %{target}"
         reset_password_user_html: "%{name} скінул(а) пароль для %{target}"
         resolve_report_html: "%{name} вырашыў скаргу %{target}"
         sensitive_account_html: "%{name} адзначыў медыя %{target} як далікатнае"
@@ -428,6 +446,7 @@ be:
         many: "%{count} спроб рэгіістрацыі за апошні тыдзень"
         one: "%{count} спроба рэгістрацыі за апошні тыдзень"
         other: "%{count} спроб рэгіістрацыі за апошні тыдзень"
+      created_msg: Дамен эл. пошты паспяхова заблакіраваны
       delete: Выдаліць
       dns:
         types:
@@ -436,8 +455,11 @@ be:
       new:
         create: Дадаць дамен
         resolve: Вызначыць дамен
+        title: Заблакіраваць новы дамен эл. пошты
       not_permitted: Забаронена
+      resolved_dns_records_hint_html: Даменнае імя ператвараецца ў наступныя дамены MX, якія ў канчатковым выніку адказваюць за прыём электроннай пошты. Блакаванне дамена MX заблакуе рэгістрацыю з любога адраса электроннай пошты, які выкарыстоўвае той жа дамен MX, нават калі бачнае імя дамена адрозніваецца. <strong>Будзьце асцярожныя, каб не заблакіраваць асноўных пастаўшчыкоў электроннай пошты.</strong>
       resolved_through_html: Вызначына каля %{domain}
+      title: Заблакіраваныя паштовыя дамены
     export_domain_allows:
       new:
         title: Імпарт дазволаў дамена
@@ -599,6 +621,7 @@ be:
         resolve_description_html: Ніякіх дзеянняў супраць уліковага запісу, пра які паведамляецца, не будзе, папярэджэнне не зафіксавана, і скарга будзе закрыта.
         silence_description_html: Уліковы запіс будзе бачны толькі тым, хто ўжо сочыць за ім або шукае яго ўручную, што значна абмяжоўвае яго ахоп. Заўсёды можна вярнуць. Закрывае ўсе скаргі на гэты ўліковы запіс.
         suspend_description_html: Уліковы запіс і ўсё яго змесціва будзе недаступна і ў далейшым выдалены, узаемадзеянне з ім будзе немагчыма. Магчыма адмяніць на працягу 30 дзён. Закрывае ўсе скаргі на гэты ўліковы запіс.
+      actions_description_html: Вырашыце, якія дзеянні распачаць, каб вырашыць гэтую скаргу. Калі вы прымеце меры пакарання ў дачыненні да ўліковага запісу, пра які паведамляецца, ім будзе адпраўлена апавяшчэнне па электроннай пошце, за выключэннем выпадкаў, калі выбрана катэгорыя <strong>Спам</strong>.
       actions_description_remote_html: Вырашыце як паступіць з гэтай скаргай. Гэта паўплывае толькі на тое як <strong>ваш</strong> сервер звязваецца з аддалёным уліковым запісам і апрацоўвае яго кантэнт.
       add_to_report: Дадаць яшчэ дэталяў да скаргі
       already_suspended_badges:
@@ -663,6 +686,7 @@ be:
         delete_data_html: Выдаліць профіль <strong>@%{acct}</strong> і змесціва праз 30 дзён, калі тым часам гэтае дзеянне не будзе адменена
         preview_preamble_html: "<strong>@%{acct}</strong> атрымае папярэджанне наступнага зместу:"
         record_strike_html: Зарэгістраваць папярэджанне <strong>@%{acct}</strong>, каб дапамагчы вам эскаліраваць наступныя парушэнні з боку таго ж уліковага запісу
+        send_email_html: Адправіць <strong>@%{acct}</strong> папярэджанне па электроннай пошце
         warning_placeholder: Неабавязковае дадатковае абгрунтаванне мадэрацыі.
       target_origin: Крыніца уліковага запісу на які пададзена скарга
       title: Скаргі
@@ -706,6 +730,7 @@ be:
         manage_appeals: Кіраванне апеляцыямі
         manage_appeals_description: Дазваляе карыстальнікам разглядаць апеляцыі на дзеянні мадэратара
         manage_blocks: Кіраванне блакіроўкамі
+        manage_blocks_description: Дазваляе блакаваць пэўныя паштовыя правайдэры і IP адрасы
         manage_custom_emojis: Кіраванне адвольнымі эмодзі
         manage_custom_emojis_description: Дазваляе кіраваць адвольнымі эмодзі на серверы
         manage_federation: Кіраваць федэрацыяй
@@ -723,6 +748,7 @@ be:
         manage_taxonomies: Кіраванне катэгорыямі
         manage_taxonomies_description: Дазваляе карыстальнікам праглядаць папулярны кантэнт і абнаўляць налады хэштэгаў
         manage_user_access: Кіраванне наладамі доступу карыстальнікаў
+        manage_user_access_description: Дазваляе адключаць двухфактарную аўтэнтыфікацыю іншым карыстальнікам, змяняць іх паштовы адрас і скідваць пароль
         manage_users: Кіраванне карыстальнікамі
         manage_users_description: Дазваляе праглядаць звесткі іншых карыстальнікаў і іх мадэрацыю
         manage_webhooks: Кіраванне вэбхукамі
@@ -797,6 +823,7 @@ be:
       destroyed_msg: Загрузка сайту паспяхова выдалена!
     software_updates:
       critical_update: Крытычна - зрабіце абнаўленне як мага хутчэй
+      description: Рэкамендуецца падтрымліваць усталёўку Mastodon у актуальным стане, каб карыстацца апошнімі выпраўленнямі і магчымасцямі. Акрамя таго, часам вельмі важна своечасова абнаўляць Mastodon, каб пазбегнуць праблем з бяспекай. Па гэтых прычынах Mastodon правярае наяўнасць абнаўленняў кожныя 30 хвілін і паведамляе вам пра гэта ў адпаведнасці з вашымі наладамі апавяшчэнняў па электроннай пошце.
       documentation_link: Даведацца больш
       release_notes: Журнал змен
       title: Даступныя абнаўленні
@@ -970,6 +997,7 @@ be:
           many: Выкарысталі %{count} чалавек за апошні тыдзень
           one: Выкарыстаў адзін чалавек за апошні тыдзень
           other: Выкарысталі %{count} чалавек за апошні тыдзень
+      title: Рэкамендацыі і трэнды
       trending: Папулярныя
     warning_presets:
       add_new: Дадаць новы
@@ -1056,7 +1084,9 @@ be:
       guide_link_text: Кожны і кожная можа зрабіць унёсак.
     sensitive_content: Далікатны змест
   application_mailer:
+    notification_preferences: Змяніць налады эл. пошты
     salutation: "%{name},"
+    settings: 'Змяніць налады эл. пошты: %{link}'
     unsubscribe: Адпісацца
     view: 'Паглядзець:'
     view_profile: Паглядзець профіль
@@ -1076,6 +1106,7 @@ be:
       hint_html: Засталася яшчэ адна рэч! Каб не дапусціць спаму, нам трэба пацвердзіць, што вы чалавек. Разгадайце CAPTCHA ніжэй і націсніце «Працягнуць».
       title: Праверка бяспекі
     confirmations:
+      awaiting_review: Ваш электронны адрас пацверджаны! Адміністрацыя %{domain} зараз разглядае вашу рэгістрацыю. Вы атрымаеце паведамленне па электроннай пошце, калі ваш уліковы запіс будзе ўхвалены!
       awaiting_review_title: Ваша рэгістрацыя разглядаецца
       clicking_this_link: націснуць на гэту спасылку
       login_link: увайсці
@@ -1083,6 +1114,7 @@ be:
       redirect_to_app_html: Вы павінны былі быць перанакіраваны ў праграму <strong>%{app_name}</strong>. Калі гэтага не адбылося, паспрабуйце %{clicking_this_link} або вярніцеся да праграмы ўручную.
       registration_complete: Ваша рэгістрацыя на %{domain} завершана!
       welcome_title: Вітаем, %{name}!
+      wrong_email_hint: Калі гэты адрас электроннай пошты памылковы, вы можаце змяніць яго ў наладах уліковага запісу.
     delete_account: Выдаліць уліковы запіс
     delete_account_html: Калі вы жадаеце выдаліць ваш уліковы запіс, можаце <a href="%{path}">працягнуць тут</a>. Ад вас будзе запатрабавана пацвярджэнне.
     description:
@@ -1103,6 +1135,7 @@ be:
     or_log_in_with: Або ўвайсці з дапамогай
     privacy_policy_agreement_html: Я азнаёміўся і пагаджаюся з <a href="%{privacy_policy_path}" target="_blank">палітыкай канфідэнцыйнасці</a>
     progress:
+      confirm: Пацвердзіць email
       details: Вашы дадзеныя
       review: Наш водгук
       rules: Прыняць правілы
@@ -1124,8 +1157,10 @@ be:
     security: Бяспека
     set_new_password: Прызначыць новы пароль
     setup:
+      email_below_hint_html: Праверце папку са спамам або зрабіце новы запыт. Вы можаце выправіць свой email, калі ён няправільны.
       email_settings_hint_html: Націсніце на спасылку, якую мы адправілі, каб спраўдзіць %{email}. Мы вас пачакаем тут.
       link_not_received: Не атрымалі спасылку?
+      new_confirmation_instructions_sent: Праз некалькі хвілін вы атрымаеце новы ліст на email са спасылкай для пацверджання!
       title: Праверце вашу пошту
     sign_in:
       preamble_html: Уваход з уліковымі дадзенымі <strong>%{domain}</strong>. Калі ваш уліковы запіс знаходзіцца на іншым серверы, у вас не атрымаецца ўвайсці тут.
@@ -1136,7 +1171,9 @@ be:
       title: Наладзьма вас на %{domain}.
     status:
       account_status: Стан уліковага запісу
+      confirming: Чакаецца пацвярджэнне з электроннай пошты.
       functional: Ваш уліковы запіс поўнасцю працуе.
+      pending: Ваша заяўка разглядаецца нашым супрацоўнікам. Гэта можа заняць некаторы час. Вы атрымаеце электронны ліст, калі заяўка будзе ўхвалена.
       redirecting_to: Ваш уліковы запіс неактыўны, бо ў цяперашні час ён перанакіроўваецца на %{acct}.
       self_destruct: Паколькі %{domain} зачыняецца, вы атрымаеце толькі абмежаваны доступ да свайго уліковага запісу.
       view_strikes: Праглядзець мінулыя папярэджанні для вашага ўліковага запісу
@@ -1179,6 +1216,9 @@ be:
       before: 'Перш чым працягнуць, уважліва прачытайце гэтыя заўвагі:'
       caches: Змесціва, кэшаванае іншымі серверамі, можа захавацца
       data_removal: Вашы допісы і іншыя даныя будуць выдалены назаўсёды
+      email_change_html: Вы можаце <a href="%{path}">змяніць свой адрас электроннай пошты</a>, не выдаляючы ўліковы запіс
+      email_contact_html: Калі ліст усё яшчэ не дайшоў, вы можаце звярнуцца па дапамогу на эл. пошту <a href="mailto:%{email}">%{email}</a>
+      email_reconfirmation_html: Калі вы не атрымалі пацвярджэнне па электроннай пошце, вы можаце <a href="%{path}">запытаць яго зноў</a>
       irreversible: Вы не зможаце аднавіць або паўторна актываваць свой уліковы запіс
       more_details_html: Падрабязнасці глядзіце ў <a href="%{terms_path}">палітыцы прыватнасці</a>.
       username_available: Ваша імя карыстальніка зноў стане даступным
@@ -1427,6 +1467,7 @@ be:
     authentication_methods:
       otp: праграма двухфактарнай аўтэнтыфікацыі
       password: пароль
+      sign_in_token: код з электроннай пошты
       webauthn: ключы бяспекі
     description_html: Калі вы бачыце невядомую вам актыўнасць, падумайце пра змену пароля і ўключэнне двухфактарнай аўтэнтыфікацыі.
     empty: Няма гісторыі ўваходаў
@@ -1437,6 +1478,16 @@ be:
     unsubscribe:
       action: Так, адпісацца
       complete: Адпісаны
+      confirmation_html: Вы ўпэўнены, што жадаеце адмовіцца ад %{type} з Mastodon на дамене %{domain} на вашу электронную пошту %{email}? Вы заўсёды можаце паўторна падпісацца у <a href="%{settings_path}">наладах апавяшчэнняў па электроннай пошце</a>.
+      emails:
+        notification_emails:
+          favourite: апавяшчэнні на пошту пра упадабанае
+          follow: апавяшчэнні на пошту пра падпіскі
+          follow_request: апавяшчэнні на пошту пра запыты на падпіску
+          mention: апавяшчэнні на пошту пра згадванні
+          reblog: апавяшчэнні на пошту пра пашырэнні
+      resubscribe_html: Калі вы адмовіліся ад падпіскі памылкова, вы можаце зноў падпісацца ў <a href="%{settings_path}">наладах апавяшчэнняў па электроннай пошце</a>.
+      success_html: Вы больш не будзеце атрымліваць %{type} на сваю электронную пошту %{email} ад Mastodon на дамене %{domain}.
       title: Адпісацца
   media_attachments:
     validations:
@@ -1517,6 +1568,8 @@ be:
     update:
       subject: "%{name} адрэдагаваў допіс"
   notifications:
+    administration_emails: Апавяшчэнні эл. пошты для адміністратара
+    email_events: Падзеі для апавяшчэнняў эл. пошты
     email_events_hint: 'Выберыце падзеі, аб якіх вы хочаце атрымліваць апавяшчэнні:'
   number:
     human:
@@ -1675,6 +1728,7 @@ be:
     import: Імпарт
     import_and_export: Імпарт і экспарт
     migrate: Перамяшчэнне ўліковага запісу
+    notifications: Апавяшчэнні па эл. пошце
     preferences: Налады
     profile: Профіль
     relationships: Падпіскі і падпісчыкі
@@ -1935,6 +1989,7 @@ be:
     invalid_otp_token: Няправільны код двухфактарнай аўтэнтыфікацыі
     otp_lost_help_html: Калі вы страцілі доступ да абодвух, вы можаце скарыстацца %{email}
     rate_limited: Занадта шмат спробаў аўтэнтыфікацыі, паспрабуйце пазней.
+    seamless_external_login: Вы ўвайшлі праз знешні сэрвіс, таму налады пароля і эл. пошты недаступныя.
     signed_in_as: 'Увайшлі як:'
   verification:
     extra_instructions_html: <strong>Парада:</strong> спасылка на вашым сайце можа быць нябачнай. Важнай часткай з'яўляецца <code>rel="me"</code>, якая прадухіляе імперсанацыю на сайтах з карыстальніцкім кантэнтам. Вы нават можаце выкарыстоўваць тэг <code>link</code> у загалоўку старонкі замест <code>a</code>, але HTML павінен быць даступны без выканання JavaScript.

From 71405eabfca60776b0351b022e61248861cce971 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 20 Aug 2024 07:48:15 -0400
Subject: [PATCH 1890/2191] Use material symbols in table link helper (#31359)

---
 app/helpers/admin/filter_helper.rb                     |  2 +-
 app/javascript/material-icons/400-24px/key.svg         |  1 +
 app/javascript/material-icons/400-24px/toggle_off.svg  |  5 +++++
 app/javascript/material-icons/400-24px/toggle_on.svg   |  5 +++++
 app/views/admin/accounts/_local_account.html.haml      | 10 +++++-----
 app/views/admin/accounts/_remote_account.html.haml     |  2 +-
 app/views/admin/announcements/_announcement.html.haml  |  6 +++---
 app/views/admin/invites/_invite.html.haml              |  2 +-
 app/views/admin/relays/_relay.html.haml                |  6 +++---
 app/views/admin/report_notes/_report_note.html.haml    |  4 ++--
 app/views/admin/reports/_header_details.html.haml      |  4 ++--
 app/views/admin/roles/_role.html.haml                  |  2 +-
 app/views/admin/rules/_rule.html.haml                  |  2 +-
 .../admin/warning_presets/_warning_preset.html.haml    |  2 +-
 app/views/admin/webhooks/_webhook.html.haml            |  4 ++--
 app/views/admin/webhooks/show.html.haml                |  4 ++--
 app/views/auth/registrations/_session.html.haml        |  2 +-
 app/views/filters/_filter.html.haml                    |  4 ++--
 app/views/invites/_invite.html.haml                    |  2 +-
 .../oauth/authorized_applications/index.html.haml      |  2 +-
 app/views/settings/aliases/index.html.haml             |  2 +-
 app/views/settings/applications/index.html.haml        |  2 +-
 app/views/settings/featured_tags/index.html.haml       |  2 +-
 .../webauthn_credentials/index.html.haml               |  2 +-
 .../two_factor_authentication_methods/index.html.haml  |  4 ++--
 25 files changed, 47 insertions(+), 36 deletions(-)
 create mode 100644 app/javascript/material-icons/400-24px/key.svg
 create mode 100644 app/javascript/material-icons/400-24px/toggle_off.svg
 create mode 100644 app/javascript/material-icons/400-24px/toggle_on.svg

diff --git a/app/helpers/admin/filter_helper.rb b/app/helpers/admin/filter_helper.rb
index 140fc73ede4124..40806a451586df 100644
--- a/app/helpers/admin/filter_helper.rb
+++ b/app/helpers/admin/filter_helper.rb
@@ -25,7 +25,7 @@ def filter_link_to(text, link_to_params, link_class_params = link_to_params)
   end
 
   def table_link_to(icon, text, path, **options)
-    link_to safe_join([fa_icon(icon), text]), path, options.merge(class: 'table-action-link')
+    link_to safe_join([material_symbol(icon), text]), path, options.merge(class: 'table-action-link')
   end
 
   def selected?(more_params)
diff --git a/app/javascript/material-icons/400-24px/key.svg b/app/javascript/material-icons/400-24px/key.svg
new file mode 100644
index 00000000000000..bba7f1de9d5ce7
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/key.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#5f6368"><path d="M280-400q-33 0-56.5-23.5T200-480q0-33 23.5-56.5T280-560q33 0 56.5 23.5T360-480q0 33-23.5 56.5T280-400Zm0 160q-100 0-170-70T40-480q0-100 70-170t170-70q67 0 121.5 33t86.5 87h352l120 120-180 180-80-60-80 60-85-60h-47q-32 54-86.5 87T280-240Zm0-80q56 0 98.5-34t56.5-86h125l58 41 82-61 71 55 75-75-40-40H435q-14-52-56.5-86T280-640q-66 0-113 47t-47 113q0 66 47 113t113 47Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/toggle_off.svg b/app/javascript/material-icons/400-24px/toggle_off.svg
new file mode 100644
index 00000000000000..dcef49f69c15ef
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/toggle_off.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px"
+    fill="#5f6368">
+    <path
+        d="M280-240q-100 0-170-70T40-480q0-100 70-170t170-70h400q100 0 170 70t70 170q0 100-70 170t-170 70H280Zm0-80h400q66 0 113-47t47-113q0-66-47-113t-113-47H280q-66 0-113 47t-47 113q0 66 47 113t113 47Zm0-40q50 0 85-35t35-85q0-50-35-85t-85-35q-50 0-85 35t-35 85q0 50 35 85t85 35Zm200-120Z" />
+</svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/toggle_on.svg b/app/javascript/material-icons/400-24px/toggle_on.svg
new file mode 100644
index 00000000000000..943b6e6d332b9f
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/toggle_on.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px"
+    fill="#5f6368">
+    <path
+        d="M280-240q-100 0-170-70T40-480q0-100 70-170t170-70h400q100 0 170 70t70 170q0 100-70 170t-170 70H280Zm0-80h400q66 0 113-47t47-113q0-66-47-113t-113-47H280q-66 0-113 47t-47 113q0 66 47 113t113 47Zm400-40q50 0 85-35t35-85q0-50-35-85t-85-35q-50 0-85 35t-35 85q0 50 35 85t85 35ZM480-480Z" />
+</svg>
\ No newline at end of file
diff --git a/app/views/admin/accounts/_local_account.html.haml b/app/views/admin/accounts/_local_account.html.haml
index 3ed392cd1a53db..3ad47d8dfb8cdf 100644
--- a/app/views/admin/accounts/_local_account.html.haml
+++ b/app/views/admin/accounts/_local_account.html.haml
@@ -1,12 +1,12 @@
 - if account.avatar?
   %tr
     %th= t('admin.accounts.avatar')
-    %td= table_link_to 'trash', t('admin.accounts.remove_avatar'), remove_avatar_admin_account_path(account.id), method: :post, data: { confirm: t('admin.accounts.are_you_sure') } if can?(:remove_avatar, account)
+    %td= table_link_to 'delete', t('admin.accounts.remove_avatar'), remove_avatar_admin_account_path(account.id), method: :post, data: { confirm: t('admin.accounts.are_you_sure') } if can?(:remove_avatar, account)
     %td
 - if account.header?
   %tr
     %th= t('admin.accounts.header')
-    %td= table_link_to 'trash', t('admin.accounts.remove_header'), remove_header_admin_account_path(account.id), method: :post, data: { confirm: t('admin.accounts.are_you_sure') } if can?(:remove_header, account)
+    %td= table_link_to 'delete', t('admin.accounts.remove_header'), remove_header_admin_account_path(account.id), method: :post, data: { confirm: t('admin.accounts.are_you_sure') } if can?(:remove_header, account)
     %td
 %tr
   %th= t('admin.accounts.role')
@@ -16,7 +16,7 @@
     - else
       = account.user_role&.name
   %td
-    = table_link_to 'vcard', t('admin.accounts.change_role.label'), admin_user_role_path(account.user) if can?(:change_role, account.user)
+    = table_link_to 'contact_mail', t('admin.accounts.change_role.label'), admin_user_role_path(account.user) if can?(:change_role, account.user)
 %tr
   %th{ rowspan: can?(:create, :email_domain_block) ? 3 : 2 }= t('admin.accounts.email')
   %td{ rowspan: can?(:create, :email_domain_block) ? 3 : 2 }= account.user_email
@@ -25,7 +25,7 @@
   %td= table_link_to 'search', t('admin.accounts.search_same_email_domain'), admin_accounts_path(email: "%@#{account.user_email.split('@').last}")
 - if can?(:create, :email_domain_block)
   %tr
-    %td= table_link_to 'ban', t('admin.accounts.add_email_domain_block'), new_admin_email_domain_block_path(_domain: account.user_email.split('@').last)
+    %td= table_link_to 'hide_source', t('admin.accounts.add_email_domain_block'), new_admin_email_domain_block_path(_domain: account.user_email.split('@').last)
 - if account.user_unconfirmed_email.present?
   %tr
     %th= t('admin.accounts.unconfirmed_email')
@@ -48,7 +48,7 @@
       = t 'admin.accounts.security_measures.only_password'
   %td
     - if account.user&.two_factor_enabled? && can?(:disable_2fa, account.user)
-      = table_link_to 'unlock', t('admin.accounts.disable_two_factor_authentication'), admin_user_two_factor_authentication_path(account.user.id), method: :delete
+      = table_link_to 'lock_open', t('admin.accounts.disable_two_factor_authentication'), admin_user_two_factor_authentication_path(account.user.id), method: :delete
 - if can?(:reset_password, account.user)
   %tr
     %td
diff --git a/app/views/admin/accounts/_remote_account.html.haml b/app/views/admin/accounts/_remote_account.html.haml
index 6755af2496c10c..a052e877f43f12 100644
--- a/app/views/admin/accounts/_remote_account.html.haml
+++ b/app/views/admin/accounts/_remote_account.html.haml
@@ -12,4 +12,4 @@
     = material_symbol DeliveryFailureTracker.available?(account.shared_inbox_url) ? 'check' : 'close'
   %td
     - if domain_block.nil?
-      = table_link_to 'ban', t('admin.domain_blocks.add_new'), new_admin_domain_block_path(_domain: account.domain)
+      = table_link_to 'hide_source', t('admin.domain_blocks.add_new'), new_admin_domain_block_path(_domain: account.domain)
diff --git a/app/views/admin/announcements/_announcement.html.haml b/app/views/admin/announcements/_announcement.html.haml
index 1c7f89ef21a43c..eac78efb2889b6 100644
--- a/app/views/admin/announcements/_announcement.html.haml
+++ b/app/views/admin/announcements/_announcement.html.haml
@@ -12,8 +12,8 @@
     %div
       - if can?(:update, announcement)
         - if announcement.published?
-          = table_link_to 'toggle-off', t('admin.announcements.unpublish'), unpublish_admin_announcement_path(announcement), method: :post, data: { confirm: t('admin.accounts.are_you_sure') }
+          = table_link_to 'toggle_off', t('admin.announcements.unpublish'), unpublish_admin_announcement_path(announcement), method: :post, data: { confirm: t('admin.accounts.are_you_sure') }
         - else
-          = table_link_to 'toggle-on', t('admin.announcements.publish'), publish_admin_announcement_path(announcement), method: :post, data: { confirm: t('admin.accounts.are_you_sure') }
+          = table_link_to 'toggle_on', t('admin.announcements.publish'), publish_admin_announcement_path(announcement), method: :post, data: { confirm: t('admin.accounts.are_you_sure') }
 
-      = table_link_to 'trash', t('generic.delete'), admin_announcement_path(announcement), method: :delete, data: { confirm: t('admin.accounts.are_you_sure') } if can?(:destroy, announcement)
+      = table_link_to 'delete', t('generic.delete'), admin_announcement_path(announcement), method: :delete, data: { confirm: t('admin.accounts.are_you_sure') } if can?(:destroy, announcement)
diff --git a/app/views/admin/invites/_invite.html.haml b/app/views/admin/invites/_invite.html.haml
index f9cd6003f3da81..8bd5f10feefdc6 100644
--- a/app/views/admin/invites/_invite.html.haml
+++ b/app/views/admin/invites/_invite.html.haml
@@ -27,4 +27,4 @@
 
   %td
     - if invite.valid_for_use? && policy(invite).destroy?
-      = table_link_to 'times', t('invites.delete'), admin_invite_path(invite), method: :delete
+      = table_link_to 'close', t('invites.delete'), admin_invite_path(invite), method: :delete
diff --git a/app/views/admin/relays/_relay.html.haml b/app/views/admin/relays/_relay.html.haml
index 2e76f5430838be..9e9f629eee12d5 100644
--- a/app/views/admin/relays/_relay.html.haml
+++ b/app/views/admin/relays/_relay.html.haml
@@ -18,8 +18,8 @@
         = t 'admin.relays.disabled'
   %td
     - if relay.accepted?
-      = table_link_to 'power-off', t('admin.relays.disable'), disable_admin_relay_path(relay), method: :post, data: { confirm: t('admin.accounts.are_you_sure') }
+      = table_link_to 'power_off', t('admin.relays.disable'), disable_admin_relay_path(relay), method: :post, data: { confirm: t('admin.accounts.are_you_sure') }
     - elsif !relay.pending?
-      = table_link_to 'power-off', t('admin.relays.enable'), enable_admin_relay_path(relay), method: :post, data: { confirm: t('admin.accounts.are_you_sure') }
+      = table_link_to 'power_off', t('admin.relays.enable'), enable_admin_relay_path(relay), method: :post, data: { confirm: t('admin.accounts.are_you_sure') }
 
-    = table_link_to 'times', t('admin.relays.delete'), admin_relay_path(relay), method: :delete, data: { confirm: t('admin.accounts.are_you_sure') }
+    = table_link_to 'close', t('admin.relays.delete'), admin_relay_path(relay), method: :delete, data: { confirm: t('admin.accounts.are_you_sure') }
diff --git a/app/views/admin/report_notes/_report_note.html.haml b/app/views/admin/report_notes/_report_note.html.haml
index 64628989a6a743..dd60f7eabd07e8 100644
--- a/app/views/admin/report_notes/_report_note.html.haml
+++ b/app/views/admin/report_notes/_report_note.html.haml
@@ -13,6 +13,6 @@
   - if can?(:destroy, report_note)
     .report-notes__item__actions
       - if report_note.is_a?(AccountModerationNote)
-        = table_link_to 'trash', t('admin.reports.notes.delete'), admin_account_moderation_note_path(report_note), method: :delete
+        = table_link_to 'delete', t('admin.reports.notes.delete'), admin_account_moderation_note_path(report_note), method: :delete
       - else
-        = table_link_to 'trash', t('admin.reports.notes.delete'), admin_report_note_path(report_note), method: :delete
+        = table_link_to 'delete', t('admin.reports.notes.delete'), admin_report_note_path(report_note), method: :delete
diff --git a/app/views/admin/reports/_header_details.html.haml b/app/views/admin/reports/_header_details.html.haml
index 434231f7333626..cf81670845fddb 100644
--- a/app/views/admin/reports/_header_details.html.haml
+++ b/app/views/admin/reports/_header_details.html.haml
@@ -54,6 +54,6 @@
           = admin_account_link_to report.assigned_account
         —
         - if report.assigned_account != current_user.account
-          = table_link_to 'user', t('admin.reports.assign_to_self'), assign_to_self_admin_report_path(report), method: :post
+          = table_link_to 'person', t('admin.reports.assign_to_self'), assign_to_self_admin_report_path(report), method: :post
         - elsif !report.assigned_account.nil?
-          = table_link_to 'trash', t('admin.reports.unassign'), unassign_admin_report_path(report), method: :post
+          = table_link_to 'delete', t('admin.reports.unassign'), unassign_admin_report_path(report), method: :post
diff --git a/app/views/admin/roles/_role.html.haml b/app/views/admin/roles/_role.html.haml
index fd37644c835f90..636127354b0da7 100644
--- a/app/views/admin/roles/_role.html.haml
+++ b/app/views/admin/roles/_role.html.haml
@@ -27,4 +27,4 @@
         ·
         %abbr{ title: role.permissions_as_keys.map { |privilege| I18n.t("admin.roles.privileges.#{privilege}") }.join(', ') }= t('admin.roles.permissions_count', count: role.permissions_as_keys.size)
     %div
-      = table_link_to 'pencil', t('admin.accounts.edit'), edit_admin_role_path(role) if can?(:update, role)
+      = table_link_to 'edit', t('admin.accounts.edit'), edit_admin_role_path(role) if can?(:update, role)
diff --git a/app/views/admin/rules/_rule.html.haml b/app/views/admin/rules/_rule.html.haml
index 5f37f693543702..eb97eefb3c7fe7 100644
--- a/app/views/admin/rules/_rule.html.haml
+++ b/app/views/admin/rules/_rule.html.haml
@@ -8,4 +8,4 @@
       = rule.hint
 
     %div
-      = table_link_to 'trash', t('admin.rules.delete'), admin_rule_path(rule), method: :delete, data: { confirm: t('admin.accounts.are_you_sure') } if can?(:destroy, rule)
+      = table_link_to 'delete', t('admin.rules.delete'), admin_rule_path(rule), method: :delete, data: { confirm: t('admin.accounts.are_you_sure') } if can?(:destroy, rule)
diff --git a/app/views/admin/warning_presets/_warning_preset.html.haml b/app/views/admin/warning_presets/_warning_preset.html.haml
index a58199c80469a6..2cc056420f4aa9 100644
--- a/app/views/admin/warning_presets/_warning_preset.html.haml
+++ b/app/views/admin/warning_presets/_warning_preset.html.haml
@@ -7,4 +7,4 @@
       = truncate(warning_preset.text)
 
     %div
-      = table_link_to 'trash', t('admin.warning_presets.delete'), admin_warning_preset_path(warning_preset), method: :delete, data: { confirm: t('admin.accounts.are_you_sure') } if can?(:destroy, warning_preset)
+      = table_link_to 'delete', t('admin.warning_presets.delete'), admin_warning_preset_path(warning_preset), method: :delete, data: { confirm: t('admin.accounts.are_you_sure') } if can?(:destroy, warning_preset)
diff --git a/app/views/admin/webhooks/_webhook.html.haml b/app/views/admin/webhooks/_webhook.html.haml
index 39abb7dd2c7608..dca5abeb7779af 100644
--- a/app/views/admin/webhooks/_webhook.html.haml
+++ b/app/views/admin/webhooks/_webhook.html.haml
@@ -15,5 +15,5 @@
       %abbr{ title: webhook.events.join(', ') }= t('admin.webhooks.enabled_events', count: webhook.events.size)
 
     %div
-      = table_link_to 'pencil', t('admin.webhooks.edit'), edit_admin_webhook_path(webhook) if can?(:update, webhook)
-      = table_link_to 'trash', t('admin.webhooks.delete'), admin_webhook_path(webhook), method: :delete, data: { confirm: t('admin.accounts.are_you_sure') } if can?(:destroy, webhook)
+      = table_link_to 'edit', t('admin.webhooks.edit'), edit_admin_webhook_path(webhook) if can?(:update, webhook)
+      = table_link_to 'delete', t('admin.webhooks.delete'), admin_webhook_path(webhook), method: :delete, data: { confirm: t('admin.accounts.are_you_sure') } if can?(:destroy, webhook)
diff --git a/app/views/admin/webhooks/show.html.haml b/app/views/admin/webhooks/show.html.haml
index c2c4f55788e38a..a389e611029933 100644
--- a/app/views/admin/webhooks/show.html.haml
+++ b/app/views/admin/webhooks/show.html.haml
@@ -19,10 +19,10 @@
         %td
           - if @webhook.enabled?
             %span.positive-hint= t('admin.webhooks.enabled')
-            = table_link_to 'power-off', t('admin.webhooks.disable'), disable_admin_webhook_path(@webhook), method: :post if can?(:disable, @webhook)
+            = table_link_to 'power_off', t('admin.webhooks.disable'), disable_admin_webhook_path(@webhook), method: :post if can?(:disable, @webhook)
           - else
             %span.negative-hint= t('admin.webhooks.disabled')
-            = table_link_to 'power-off', t('admin.webhooks.enable'), enable_admin_webhook_path(@webhook), method: :post if can?(:enable, @webhook)
+            = table_link_to 'power_off', t('admin.webhooks.enable'), enable_admin_webhook_path(@webhook), method: :post if can?(:enable, @webhook)
       %tr
         %th= t('admin.webhooks.events')
         %td
diff --git a/app/views/auth/registrations/_session.html.haml b/app/views/auth/registrations/_session.html.haml
index 2fa7db70c7bbf3..631ae0460161c1 100644
--- a/app/views/auth/registrations/_session.html.haml
+++ b/app/views/auth/registrations/_session.html.haml
@@ -15,4 +15,4 @@
       %time.time-ago{ datetime: session.updated_at.iso8601, title: l(session.updated_at) }= l(session.updated_at)
   %td
     - if current_session.session_id != session.session_id && !current_account.suspended?
-      = table_link_to 'times', t('sessions.revoke'), settings_session_path(session), method: :delete
+      = table_link_to 'close', t('sessions.revoke'), settings_session_path(session), method: :delete
diff --git a/app/views/filters/_filter.html.haml b/app/views/filters/_filter.html.haml
index 9993ad2ee8eaa5..9d82a979fefada 100644
--- a/app/views/filters/_filter.html.haml
+++ b/app/views/filters/_filter.html.haml
@@ -37,5 +37,5 @@
       = t('filters.index.contexts', contexts: filter.context.map { |context| I18n.t("filters.contexts.#{context}") }.join(', '))
 
     %div
-      = table_link_to 'pencil', t('filters.edit.title'), edit_filter_path(filter)
-      = table_link_to 'times', t('filters.index.delete'), filter_path(filter), method: :delete, data: { confirm: t('admin.accounts.are_you_sure') }
+      = table_link_to 'edit', t('filters.edit.title'), edit_filter_path(filter)
+      = table_link_to 'close', t('filters.index.delete'), filter_path(filter), method: :delete, data: { confirm: t('admin.accounts.are_you_sure') }
diff --git a/app/views/invites/_invite.html.haml b/app/views/invites/_invite.html.haml
index 62799ca5be20ef..d332dc5a4d5dd7 100644
--- a/app/views/invites/_invite.html.haml
+++ b/app/views/invites/_invite.html.haml
@@ -22,4 +22,4 @@
 
   %td
     - if invite.valid_for_use? && policy(invite).destroy?
-      = table_link_to 'times', t('invites.delete'), invite_path(invite), method: :delete
+      = table_link_to 'close', t('invites.delete'), invite_path(invite), method: :delete
diff --git a/app/views/oauth/authorized_applications/index.html.haml b/app/views/oauth/authorized_applications/index.html.haml
index 92e24d30c8597d..009bbf8d85c994 100644
--- a/app/views/oauth/authorized_applications/index.html.haml
+++ b/app/views/oauth/authorized_applications/index.html.haml
@@ -29,7 +29,7 @@
 
         - unless application.superapp? || current_account.unavailable?
           %div
-            = table_link_to 'times', t('doorkeeper.authorized_applications.buttons.revoke'), oauth_authorized_application_path(application), method: :delete, data: { confirm: t('doorkeeper.authorized_applications.confirmations.revoke') }
+            = table_link_to 'close', t('doorkeeper.authorized_applications.buttons.revoke'), oauth_authorized_application_path(application), method: :delete, data: { confirm: t('doorkeeper.authorized_applications.confirmations.revoke') }
 
       .announcements-list__item__permissions
         %ul.permissions-list
diff --git a/app/views/settings/aliases/index.html.haml b/app/views/settings/aliases/index.html.haml
index c618a82f1dd65b..81c49c82031e9b 100644
--- a/app/views/settings/aliases/index.html.haml
+++ b/app/views/settings/aliases/index.html.haml
@@ -30,4 +30,4 @@
         - @aliases.each do |account_alias|
           %tr
             %td= account_alias.pretty_acct
-            %td= table_link_to 'trash', t('aliases.remove'), settings_alias_path(account_alias), data: { method: :delete }
+            %td= table_link_to 'delete', t('aliases.remove'), settings_alias_path(account_alias), data: { method: :delete }
diff --git a/app/views/settings/applications/index.html.haml b/app/views/settings/applications/index.html.haml
index 5c31d56bca572c..80eaed5c3994f8 100644
--- a/app/views/settings/applications/index.html.haml
+++ b/app/views/settings/applications/index.html.haml
@@ -20,6 +20,6 @@
             %td= link_to application.name, settings_application_path(application)
             %th= application.scopes
             %td
-              = table_link_to 'times', t('doorkeeper.applications.index.delete'), settings_application_path(application), method: :delete, data: { confirm: t('doorkeeper.applications.confirmations.destroy') }
+              = table_link_to 'close', t('doorkeeper.applications.index.delete'), settings_application_path(application), method: :delete, data: { confirm: t('doorkeeper.applications.confirmations.destroy') }
 
 = paginate @applications
diff --git a/app/views/settings/featured_tags/index.html.haml b/app/views/settings/featured_tags/index.html.haml
index 4b6c019e69b250..088a93bc595a14 100644
--- a/app/views/settings/featured_tags/index.html.haml
+++ b/app/views/settings/featured_tags/index.html.haml
@@ -31,5 +31,5 @@
             = t('accounts.nothing_here')
           - else
             %time.formatted{ datetime: featured_tag.last_status_at.iso8601, title: l(featured_tag.last_status_at) }= l featured_tag.last_status_at
-          = table_link_to 'trash', t('filters.index.delete'), settings_featured_tag_path(featured_tag), method: :delete, data: { confirm: t('admin.accounts.are_you_sure') }
+          = table_link_to 'delete', t('filters.index.delete'), settings_featured_tag_path(featured_tag), method: :delete, data: { confirm: t('admin.accounts.are_you_sure') }
       .trends__item__current= friendly_number_to_human featured_tag.statuses_count
diff --git a/app/views/settings/two_factor_authentication/webauthn_credentials/index.html.haml b/app/views/settings/two_factor_authentication/webauthn_credentials/index.html.haml
index 0dfd94ab9dcf58..3ea5810207fe3d 100644
--- a/app/views/settings/two_factor_authentication/webauthn_credentials/index.html.haml
+++ b/app/views/settings/two_factor_authentication/webauthn_credentials/index.html.haml
@@ -9,7 +9,7 @@
           %td= credential.nickname
           %td= t('webauthn_credentials.registered_on', date: l(credential.created_at.to_date, format: :with_month_name))
           %td
-            = table_link_to 'trash', t('webauthn_credentials.delete'), settings_webauthn_credential_path(credential.id), method: :delete, data: { confirm: t('webauthn_credentials.delete_confirmation') }
+            = table_link_to 'delete', t('webauthn_credentials.delete'), settings_webauthn_credential_path(credential.id), method: :delete, data: { confirm: t('webauthn_credentials.delete_confirmation') }
 
 %hr.spacer/
 
diff --git a/app/views/settings/two_factor_authentication_methods/index.html.haml b/app/views/settings/two_factor_authentication_methods/index.html.haml
index 2e4ff4091c7b51..8b670283b9e089 100644
--- a/app/views/settings/two_factor_authentication_methods/index.html.haml
+++ b/app/views/settings/two_factor_authentication_methods/index.html.haml
@@ -20,12 +20,12 @@
       %tr
         %td= t('two_factor_authentication.otp')
         %td
-          = table_link_to 'pencil', t('two_factor_authentication.edit'), settings_otp_authentication_path, method: :post
+          = table_link_to 'edit', t('two_factor_authentication.edit'), settings_otp_authentication_path, method: :post
       %tr
         %td= t('two_factor_authentication.webauthn')
         - if current_user.webauthn_enabled?
           %td
-            = table_link_to 'pencil', t('two_factor_authentication.edit'), settings_webauthn_credentials_path, method: :get
+            = table_link_to 'edit', t('two_factor_authentication.edit'), settings_webauthn_credentials_path, method: :get
         - else
           %td
             = table_link_to 'key', t('two_factor_authentication.add'), new_settings_webauthn_credential_path, method: :get

From 3be1b1eaaee1e315e4612012f431619b20861107 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 20 Aug 2024 07:52:27 -0400
Subject: [PATCH 1891/2191] Use material symbol for filters/statuses views
 (#31371)

---
 app/views/disputes/strikes/_card.html.haml          | 2 +-
 app/views/filters/statuses/_status_filter.html.haml | 4 ++--
 app/views/filters/statuses/index.html.haml          | 4 ++--
 app/views/statuses/_attachment_list.html.haml       | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/views/disputes/strikes/_card.html.haml b/app/views/disputes/strikes/_card.html.haml
index 55551cc7d0482b..58965ad6006ffe 100644
--- a/app/views/disputes/strikes/_card.html.haml
+++ b/app/views/disputes/strikes/_card.html.haml
@@ -24,7 +24,7 @@
               .emojify= one_line_preview(status)
               - status.ordered_media_attachments.each do |media_attachment|
                 %abbr{ title: media_attachment.description }
-                  = fa_icon 'link'
+                  = material_symbol 'link'
                   = media_attachment.file_file_name
             .strike-card__statuses-list__item__meta
               = link_to ActivityPub::TagManager.instance.url_for(status), target: '_blank', rel: 'noopener noreferrer' do
diff --git a/app/views/filters/statuses/_status_filter.html.haml b/app/views/filters/statuses/_status_filter.html.haml
index 9999dcda81fda5..31aa9ec23772c1 100644
--- a/app/views/filters/statuses/_status_filter.html.haml
+++ b/app/views/filters/statuses/_status_filter.html.haml
@@ -15,7 +15,7 @@
 
     - status.ordered_media_attachments.each do |media_attachment|
       %abbr{ title: media_attachment.description }
-        = fa_icon 'link'
+        = material_symbol 'link'
         = media_attachment.file_file_name
 
     .detailed-status__meta
@@ -33,5 +33,5 @@
       = t("statuses.visibilities.#{status.visibility}")
       - if status.sensitive?
         ·
-        = fa_icon('eye-slash fw')
+        = material_symbol 'visibility_off'
         = t('stream_entries.sensitive_content')
diff --git a/app/views/filters/statuses/index.html.haml b/app/views/filters/statuses/index.html.haml
index 915ec59cafdef3..f9f94eee90dd3f 100644
--- a/app/views/filters/statuses/index.html.haml
+++ b/app/views/filters/statuses/index.html.haml
@@ -6,7 +6,7 @@
 .filters
   .back-link
     = link_to edit_filter_path(@filter) do
-      = fa_icon 'chevron-left fw'
+      = material_symbol 'chevron_left'
       = t('filters.statuses.back_to_filter')
 
 %p.hint= t('filters.statuses.index.hint')
@@ -25,7 +25,7 @@
         = check_box_tag :batch_checkbox_all, nil, false
       .batch-table__toolbar__actions
         - unless @status_filters.empty?
-          = f.button safe_join([fa_icon('times'), t('filters.statuses.batch.remove')]), name: :remove, class: 'table-action-link', type: :submit
+          = f.button safe_join([material_symbol('close'), t('filters.statuses.batch.remove')]), name: :remove, class: 'table-action-link', type: :submit
     .batch-table__body
       - if @status_filters.empty?
         = nothing_here 'nothing-here--under-tabs'
diff --git a/app/views/statuses/_attachment_list.html.haml b/app/views/statuses/_attachment_list.html.haml
index d9706f47bd849a..a150a3fae9d005 100644
--- a/app/views/statuses/_attachment_list.html.haml
+++ b/app/views/statuses/_attachment_list.html.haml
@@ -1,6 +1,6 @@
 .attachment-list
   .attachment-list__icon
-    = fa_icon 'link'
+    = material_symbol 'link'
   %ul.attachment-list__list
     - attachments.each do |media|
       %li

From fa2e7b1708385c4277a67f04e540cc39fc661390 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 20 Aug 2024 07:52:45 -0400
Subject: [PATCH 1892/2191] Migrate fontawesome->material in more views
 (#31360)

---
 app/helpers/application_helper.rb                  |  3 ++-
 app/helpers/settings_helper.rb                     |  4 ++--
 app/javascript/material-icons/400-24px/chat.svg    |  5 +++++
 .../material-icons/400-24px/desktop_mac.svg        |  5 +++++
 .../material-icons/400-24px/format_paragraph.svg   |  5 +++++
 .../material-icons/400-24px/smartphone.svg         |  5 +++++
 app/javascript/material-icons/400-24px/tablet.svg  |  5 +++++
 app/javascript/styles/mastodon/accounts.scss       |  2 +-
 app/views/application/_card.html.haml              |  2 +-
 .../auth/registrations/_account_warning.html.haml  |  2 +-
 app/views/auth/registrations/_session.html.haml    |  2 +-
 app/views/disputes/strikes/show.html.haml          |  4 ++--
 app/views/filters/_filter.html.haml                |  4 ++--
 app/views/filters/_filter_fields.html.haml         |  2 +-
 app/views/filters/_keyword_fields.html.haml        |  2 +-
 app/views/invites/_invite.html.haml                |  2 +-
 app/views/kaminari/_next_page.html.haml            |  2 +-
 app/views/kaminari/_prev_page.html.haml            |  2 +-
 app/views/oauth/authorizations/new.html.haml       |  2 +-
 .../oauth/authorized_applications/index.html.haml  |  2 +-
 app/views/relationships/show.html.haml             |  8 ++++----
 app/views/statuses/_detailed_status.html.haml      | 10 +++++-----
 app/views/statuses/_simple_status.html.haml        | 14 +++++++-------
 spec/helpers/application_helper_spec.rb            |  9 +++++++++
 spec/helpers/settings_helper_spec.rb               |  4 ++--
 25 files changed, 71 insertions(+), 36 deletions(-)
 create mode 100644 app/javascript/material-icons/400-24px/chat.svg
 create mode 100644 app/javascript/material-icons/400-24px/desktop_mac.svg
 create mode 100644 app/javascript/material-icons/400-24px/format_paragraph.svg
 create mode 100644 app/javascript/material-icons/400-24px/smartphone.svg
 create mode 100644 app/javascript/material-icons/400-24px/tablet.svg

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index a6ab4044bcba8c..20da199d437800 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -117,7 +117,8 @@ def material_symbol(icon, attributes = {})
     inline_svg_tag(
       "400-24px/#{icon}.svg",
       class: ['icon', "material-#{icon}"].concat(attributes[:class].to_s.split),
-      role: :img
+      role: :img,
+      data: attributes[:data]
     )
   end
 
diff --git a/app/helpers/settings_helper.rb b/app/helpers/settings_helper.rb
index 10863a316c93b8..64f2ad70a66e16 100644
--- a/app/helpers/settings_helper.rb
+++ b/app/helpers/settings_helper.rb
@@ -26,11 +26,11 @@ def session_device_icon(session)
     device = session.detection.device
 
     if device.mobile?
-      'mobile'
+      'smartphone'
     elsif device.tablet?
       'tablet'
     else
-      'desktop'
+      'desktop_mac'
     end
   end
 
diff --git a/app/javascript/material-icons/400-24px/chat.svg b/app/javascript/material-icons/400-24px/chat.svg
new file mode 100644
index 00000000000000..7369e6f847a268
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/chat.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px"
+    fill="#5f6368">
+    <path
+        d="M240-400h320v-80H240v80Zm0-120h480v-80H240v80Zm0-120h480v-80H240v80ZM80-80v-720q0-33 23.5-56.5T160-880h640q33 0 56.5 23.5T880-800v480q0 33-23.5 56.5T800-240H240L80-80Zm126-240h594v-480H160v525l46-45Zm-46 0v-480 480Z" />
+</svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/desktop_mac.svg b/app/javascript/material-icons/400-24px/desktop_mac.svg
new file mode 100644
index 00000000000000..5d2a07a3698c48
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/desktop_mac.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px"
+    fill="#5f6368">
+    <path
+        d="M320-120v-40l80-80H160q-33 0-56.5-23.5T80-320v-440q0-33 23.5-56.5T160-840h640q33 0 56.5 23.5T880-760v440q0 33-23.5 56.5T800-240H560l80 80v40H320ZM160-440h640v-320H160v320Zm0 0v-320 320Z" />
+</svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/format_paragraph.svg b/app/javascript/material-icons/400-24px/format_paragraph.svg
new file mode 100644
index 00000000000000..657b483c00cd01
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/format_paragraph.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px"
+    fill="#5f6368">
+    <path
+        d="M360-160v-240q-83 0-141.5-58.5T160-600q0-83 58.5-141.5T360-800h360v80h-80v560h-80v-560H440v560h-80Z" />
+</svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/smartphone.svg b/app/javascript/material-icons/400-24px/smartphone.svg
new file mode 100644
index 00000000000000..fa56825488f3c9
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/smartphone.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px"
+    fill="#5f6368">
+    <path
+        d="M280-40q-33 0-56.5-23.5T200-120v-720q0-33 23.5-56.5T280-920h400q33 0 56.5 23.5T760-840v720q0 33-23.5 56.5T680-40H280Zm0-120v40h400v-40H280Zm0-80h400v-480H280v480Zm0-560h400v-40H280v40Zm0 0v-40 40Zm0 640v40-40Z" />
+</svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/tablet.svg b/app/javascript/material-icons/400-24px/tablet.svg
new file mode 100644
index 00000000000000..09a5fe6bb1a91a
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/tablet.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px"
+    fill="#5f6368">
+    <path
+        d="M120-160q-33 0-56.5-23.5T40-240v-480q0-33 23.5-56.5T120-800h720q33 0 56.5 23.5T920-720v480q0 33-23.5 56.5T840-160H120Zm40-560h-40v480h40v-480Zm80 480h480v-480H240v480Zm560-480v480h40v-480h-40Zm0 0h40-40Zm-640 0h-40 40Z" />
+</svg>
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon/accounts.scss b/app/javascript/styles/mastodon/accounts.scss
index 894332acb5868d..3f70a7d234327c 100644
--- a/app/javascript/styles/mastodon/accounts.scss
+++ b/app/javascript/styles/mastodon/accounts.scss
@@ -66,7 +66,7 @@
       margin-inline-start: 15px;
       text-align: start;
 
-      i[data-hidden] {
+      svg[data-hidden] {
         display: none;
       }
 
diff --git a/app/views/application/_card.html.haml b/app/views/application/_card.html.haml
index 1b3dd889c19b22..ae74f1dc638a17 100644
--- a/app/views/application/_card.html.haml
+++ b/app/views/application/_card.html.haml
@@ -15,4 +15,4 @@
           %strong.emojify.p-name= display_name(account, custom_emojify: true)
         %span
           = acct(account)
-          = fa_icon('lock', { data: ({ hidden: true } unless account.locked?) })
+          = material_symbol('lock', { data: ({ hidden: true } unless account.locked?) })
diff --git a/app/views/auth/registrations/_account_warning.html.haml b/app/views/auth/registrations/_account_warning.html.haml
index c51179b49dad8e..d558e1d9c96fe3 100644
--- a/app/views/auth/registrations/_account_warning.html.haml
+++ b/app/views/auth/registrations/_account_warning.html.haml
@@ -2,7 +2,7 @@
   .strike-entry__header
     .strike-entry__avatar
       .indicator-icon{ class: account_warning.overruled? ? 'success' : 'failure' }
-        = fa_icon 'warning'
+        = material_symbol 'warning'
     .strike-entry__content
       .strike-entry__title
         = t 'disputes.strikes.title',
diff --git a/app/views/auth/registrations/_session.html.haml b/app/views/auth/registrations/_session.html.haml
index 631ae0460161c1..92e5147593f980 100644
--- a/app/views/auth/registrations/_session.html.haml
+++ b/app/views/auth/registrations/_session.html.haml
@@ -1,7 +1,7 @@
 %tr
   %td
     %span{ title: session.user_agent }<
-      = fa_icon "#{session_device_icon(session)} fw", 'aria-label': session_device_icon(session)
+      = material_symbol session_device_icon(session), 'aria-label': session_device_icon(session)
       &nbsp;
       = t 'sessions.description',
           browser: t("sessions.browsers.#{session.browser}", default: session.browser.to_s),
diff --git a/app/views/disputes/strikes/show.html.haml b/app/views/disputes/strikes/show.html.haml
index 5f721388217ec9..2bfecebbff9af2 100644
--- a/app/views/disputes/strikes/show.html.haml
+++ b/app/views/disputes/strikes/show.html.haml
@@ -9,13 +9,13 @@
 - if @strike.overruled?
   %p.hint
     %span.positive-hint
-      = fa_icon 'check'
+      = material_symbol 'check'
       &nbsp;
       = t 'disputes.strikes.appeal_approved'
 - elsif @appeal.persisted? && @appeal.rejected?
   %p.hint
     %span.negative-hint
-      = fa_icon 'times'
+      = material_symbol 'close'
       &nbsp;
       = t 'disputes.strikes.appeal_rejected'
 
diff --git a/app/views/filters/_filter.html.haml b/app/views/filters/_filter.html.haml
index 9d82a979fefada..a544ac3a758166 100644
--- a/app/views/filters/_filter.html.haml
+++ b/app/views/filters/_filter.html.haml
@@ -14,7 +14,7 @@
       - unless filter.keywords.empty?
         %li.permissions-list__item
           .permissions-list__item__icon
-            = fa_icon('paragraph')
+            = material_symbol('format_paragraph')
           .permissions-list__item__text
             .permissions-list__item__text__title
               = t('filters.index.keywords', count: filter.keywords.size)
@@ -25,7 +25,7 @@
       - unless filter.statuses.empty?
         %li.permissions-list__item
           .permissions-list__item__icon
-            = fa_icon('comment')
+            = material_symbol('chat')
           .permissions-list__item__text
             .permissions-list__item__text__title
               = t('filters.index.statuses', count: filter.statuses.size)
diff --git a/app/views/filters/_filter_fields.html.haml b/app/views/filters/_filter_fields.html.haml
index 0f4049ffb61979..797c969b24d965 100644
--- a/app/views/filters/_filter_fields.html.haml
+++ b/app/views/filters/_filter_fields.html.haml
@@ -58,4 +58,4 @@
       %tr
         %td{ colspan: 3 }
           = link_to_add_association f, :keywords, class: 'table-action-link', partial: 'keyword_fields', 'data-association-insertion-node': '.keywords-table tbody', 'data-association-insertion-method': 'append' do
-            = safe_join([fa_icon('plus'), t('filters.edit.add_keyword')])
+            = safe_join([material_symbol('add'), t('filters.edit.add_keyword')])
diff --git a/app/views/filters/_keyword_fields.html.haml b/app/views/filters/_keyword_fields.html.haml
index eedd514ef5277b..136ab1653db648 100644
--- a/app/views/filters/_keyword_fields.html.haml
+++ b/app/views/filters/_keyword_fields.html.haml
@@ -5,4 +5,4 @@
   %td
     = f.hidden_field :id if f.object&.persisted? # Required so Rails doesn't put the field outside of the <tr/>
     = link_to_remove_association(f, class: 'table-action-link') do
-      = safe_join([fa_icon('times'), t('filters.index.delete')])
+      = safe_join([material_symbol('close'), t('filters.index.delete')])
diff --git a/app/views/invites/_invite.html.haml b/app/views/invites/_invite.html.haml
index d332dc5a4d5dd7..94e1a7112561ea 100644
--- a/app/views/invites/_invite.html.haml
+++ b/app/views/invites/_invite.html.haml
@@ -7,7 +7,7 @@
 
   - if invite.valid_for_use?
     %td
-      = fa_icon 'user fw'
+      = material_symbol 'person'
       = invite.uses
       = " / #{invite.max_uses}" unless invite.max_uses.nil?
     %td
diff --git a/app/views/kaminari/_next_page.html.haml b/app/views/kaminari/_next_page.html.haml
index c44aea1f11e15d..5f27f4c8eec265 100644
--- a/app/views/kaminari/_next_page.html.haml
+++ b/app/views/kaminari/_next_page.html.haml
@@ -8,4 +8,4 @@
     remote:        data-remote
 
 %span.next
-  = link_to_unless current_page.last?, safe_join([t('pagination.next'), fa_icon('chevron-right')], ' '), url, rel: 'next', remote: remote
+  = link_to_unless current_page.last?, safe_join([t('pagination.next'), material_symbol('chevron_right')], ' '), url, rel: 'next', remote: remote
diff --git a/app/views/kaminari/_prev_page.html.haml b/app/views/kaminari/_prev_page.html.haml
index 284d6223b874a1..c5584f6a81a62d 100644
--- a/app/views/kaminari/_prev_page.html.haml
+++ b/app/views/kaminari/_prev_page.html.haml
@@ -7,4 +7,4 @@
     per_page:      number of items to fetch per page
     remote:        data-remote
 %span.prev
-  = link_to_unless current_page.first?, safe_join([fa_icon('chevron-left'), t('pagination.prev')], ' '), url, rel: 'prev', remote: remote
+  = link_to_unless current_page.first?, safe_join([material_symbol('chevron_left'), t('pagination.prev')], ' '), url, rel: 'prev', remote: remote
diff --git a/app/views/oauth/authorizations/new.html.haml b/app/views/oauth/authorizations/new.html.haml
index d4563b2f01d644..ca9d12a67665e9 100644
--- a/app/views/oauth/authorizations/new.html.haml
+++ b/app/views/oauth/authorizations/new.html.haml
@@ -13,7 +13,7 @@
       - grouped_scopes(@pre_auth.scopes).each do |scope|
         %li.permissions-list__item
           .permissions-list__item__icon
-            = fa_icon('check')
+            = material_symbol('check')
           .permissions-list__item__text
             .permissions-list__item__text__title
               = t(scope.key, scope: [:doorkeeper, :grouped_scopes, :title])
diff --git a/app/views/oauth/authorized_applications/index.html.haml b/app/views/oauth/authorized_applications/index.html.haml
index 009bbf8d85c994..b6819bbd72518f 100644
--- a/app/views/oauth/authorized_applications/index.html.haml
+++ b/app/views/oauth/authorized_applications/index.html.haml
@@ -36,7 +36,7 @@
           - grouped_scopes(application.scopes).each do |scope|
             %li.permissions-list__item
               .permissions-list__item__icon
-                = fa_icon('check')
+                = material_symbol('check')
               .permissions-list__item__text
                 .permissions-list__item__text__title
                   = t(scope.key, scope: [:doorkeeper, :grouped_scopes, :title])
diff --git a/app/views/relationships/show.html.haml b/app/views/relationships/show.html.haml
index 6a866b13f86d74..7478b8c5ce1e90 100644
--- a/app/views/relationships/show.html.haml
+++ b/app/views/relationships/show.html.haml
@@ -42,13 +42,13 @@
       %label.batch-table__toolbar__select.batch-checkbox-all
         = check_box_tag :batch_checkbox_all, nil, false
       .batch-table__toolbar__actions
-        = f.button safe_join([fa_icon('user-plus'), t('relationships.follow_selected_followers')]), name: :follow, class: 'table-action-link', type: :submit, data: { confirm: t('relationships.confirm_follow_selected_followers') } if followed_by_relationship? && !mutual_relationship?
+        = f.button safe_join([material_symbol('person_add'), t('relationships.follow_selected_followers')]), name: :follow, class: 'table-action-link', type: :submit, data: { confirm: t('relationships.confirm_follow_selected_followers') } if followed_by_relationship? && !mutual_relationship?
 
-        = f.button safe_join([fa_icon('user-times'), t('relationships.remove_selected_follows')]), name: :unfollow, class: 'table-action-link', type: :submit, data: { confirm: t('relationships.confirm_remove_selected_follows') } unless followed_by_relationship?
+        = f.button safe_join([material_symbol('person_remove'), t('relationships.remove_selected_follows')]), name: :unfollow, class: 'table-action-link', type: :submit, data: { confirm: t('relationships.confirm_remove_selected_follows') } unless followed_by_relationship?
 
-        = f.button safe_join([fa_icon('trash'), t('relationships.remove_selected_followers')]), name: :remove_from_followers, class: 'table-action-link', type: :submit, data: { confirm: t('relationships.confirm_remove_selected_followers') } unless following_relationship?
+        = f.button safe_join([material_symbol('delete'), t('relationships.remove_selected_followers')]), name: :remove_from_followers, class: 'table-action-link', type: :submit, data: { confirm: t('relationships.confirm_remove_selected_followers') } unless following_relationship?
 
-        = f.button safe_join([fa_icon('trash'), t('relationships.remove_selected_domains')]), name: :remove_domains_from_followers, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') } if followed_by_relationship?
+        = f.button safe_join([material_symbol('delete'), t('relationships.remove_selected_domains')]), name: :remove_domains_from_followers, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') } if followed_by_relationship?
     .batch-table__body
       - if @accounts.empty?
         = nothing_here 'nothing-here--under-tabs'
diff --git a/app/views/statuses/_detailed_status.html.haml b/app/views/statuses/_detailed_status.html.haml
index c55dff5d9694e5..6cd240bbbcd7d4 100644
--- a/app/views/statuses/_detailed_status.html.haml
+++ b/app/views/statuses/_detailed_status.html.haml
@@ -11,7 +11,7 @@
           %strong.display-name__html.p-name.emojify= display_name(status.account, custom_emojify: true, autoplay: prefers_autoplay?)
         %span.display-name__account
           = acct(status.account)
-          = fa_icon('lock') if status.account.locked?
+          = material_symbol('lock') if status.account.locked?
 
   = account_action_button(status.account)
 
@@ -58,20 +58,20 @@
       ·
     %span.detailed-status__link
       - if status.in_reply_to_id.nil?
-        = fa_icon('reply')
+        = material_symbol('reply')
       - else
-        = fa_icon('reply-all')
+        = material_symbol('reply_all')
       %span.detailed-status__reblogs>= friendly_number_to_human status.replies_count
       &nbsp;
     ·
     - if status.public_visibility? || status.unlisted_visibility?
       %span.detailed-status__link
-        = fa_icon('retweet')
+        = material_symbol('repeat')
         %span.detailed-status__reblogs>= friendly_number_to_human status.reblogs_count
         &nbsp;
       ·
     %span.detailed-status__link
-      = fa_icon('star')
+      = material_symbol('star')
       %span.detailed-status__favorites>= friendly_number_to_human status.favourites_count
       &nbsp;
 
diff --git a/app/views/statuses/_simple_status.html.haml b/app/views/statuses/_simple_status.html.haml
index 93effc45242c40..ee7900fbfafaa0 100644
--- a/app/views/statuses/_simple_status.html.haml
+++ b/app/views/statuses/_simple_status.html.haml
@@ -26,7 +26,7 @@
           &nbsp;
           %span.display-name__account
             = acct(status.account)
-            = fa_icon('lock') if status.account.locked?
+            = material_symbol('lock') if status.account.locked?
   .status__content.emojify{ data: ({ spoiler: current_account&.user&.setting_expand_spoilers ? 'expanded' : 'folded' } if status.spoiler_text?) }<
     - if status.spoiler_text?
       %p<
@@ -55,16 +55,16 @@
   .status__action-bar
     %span.status__action-bar-button.icon-button.icon-button--with-counter
       - if status.in_reply_to_id.nil?
-        = fa_icon 'reply fw'
+        = material_symbol 'reply'
       - else
-        = fa_icon 'reply-all fw'
+        = material_symbol 'reply_all'
       %span.icon-button__counter= obscured_counter status.replies_count
     %span.status__action-bar-button.icon-button
       - if status.distributable?
-        = fa_icon 'retweet fw'
+        = material_symbol 'repeat'
       - elsif status.private_visibility? || status.limited_visibility?
-        = fa_icon 'lock fw'
+        = material_symbol 'lock'
       - else
-        = fa_icon 'at fw'
+        = material_symbol 'alternate_email'
     %span.status__action-bar-button.icon-button
-      = fa_icon 'star fw'
+      = material_symbol 'star'
diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
index 463a90b6986460..95e6976169e109 100644
--- a/spec/helpers/application_helper_spec.rb
+++ b/spec/helpers/application_helper_spec.rb
@@ -59,6 +59,15 @@ def current_theme = 'default'
     end
   end
 
+  describe '#material_symbol' do
+    it 'returns an svg with the icon and options' do
+      expect(helper.material_symbol('lock', class: :test, data: { hidden: true }))
+        .to match('<svg.*/svg>')
+        .and match('class="icon material-lock test"')
+        .and match('data-hidden="true"')
+    end
+  end
+
   describe 'open_registrations?' do
     it 'returns true when open for registrations' do
       allow(Setting).to receive(:[]).with('registrations_mode').and_return('open')
diff --git a/spec/helpers/settings_helper_spec.rb b/spec/helpers/settings_helper_spec.rb
index cba5c6ee891c74..ca447d8ce12633 100644
--- a/spec/helpers/settings_helper_spec.rb
+++ b/spec/helpers/settings_helper_spec.rb
@@ -10,7 +10,7 @@
       it 'detects the device and returns a descriptive string' do
         result = helper.session_device_icon(session)
 
-        expect(result).to eq('mobile')
+        expect(result).to eq('smartphone')
       end
     end
 
@@ -30,7 +30,7 @@
       it 'detects the device and returns a descriptive string' do
         result = helper.session_device_icon(session)
 
-        expect(result).to eq('desktop')
+        expect(result).to eq('desktop_mac')
       end
     end
   end

From 711e1fce0a6f0b883125614aade04d78bb4217ce Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 20 Aug 2024 15:54:08 +0200
Subject: [PATCH 1893/2191] Fix pagination parameters in `GET
 /api/v2_alpha/notificatins` (#31509)

---
 app/models/notification.rb                    |  8 +++---
 .../api/v2_alpha/notifications_spec.rb        | 28 +++++++++++++++----
 2 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/app/models/notification.rb b/app/models/notification.rb
index f1605f0347ad12..ae7c782bedf64a 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -180,8 +180,8 @@ def paginate_groups(limit, pagination_order)
     # Notifications that have no `group_key` each count as a separate group.
     def paginate_groups_by_max_id(limit, max_id: nil, since_id: nil)
       query = reorder(id: :desc)
-      query = query.where(id: ...max_id) if max_id.present?
-      query = query.where(id: (since_id + 1)...) if since_id.present?
+      query = query.where(id: ...(max_id.to_i)) if max_id.present?
+      query = query.where(id: (since_id.to_i + 1)...) if since_id.present?
       query.paginate_groups(limit, :desc)
     end
 
@@ -190,8 +190,8 @@ def paginate_groups_by_max_id(limit, max_id: nil, since_id: nil)
     # Results will be in ascending order by id.
     def paginate_groups_by_min_id(limit, max_id: nil, min_id: nil)
       query = reorder(id: :asc)
-      query = query.where(id: (min_id + 1)...) if min_id.present?
-      query = query.where(id: ...max_id) if max_id.present?
+      query = query.where(id: (min_id.to_i + 1)...) if min_id.present?
+      query = query.where(id: ...(max_id.to_i)) if max_id.present?
       query.paginate_groups(limit, :asc)
     end
 
diff --git a/spec/requests/api/v2_alpha/notifications_spec.rb b/spec/requests/api/v2_alpha/notifications_spec.rb
index 94bc7b0ee36722..a613158aa5b404 100644
--- a/spec/requests/api/v2_alpha/notifications_spec.rb
+++ b/spec/requests/api/v2_alpha/notifications_spec.rb
@@ -97,8 +97,7 @@
     before do
       first_status = PostStatusService.new.call(user.account, text: 'Test')
       ReblogService.new.call(bob.account, first_status)
-      mentioning_status = PostStatusService.new.call(bob.account, text: 'Hello @alice')
-      mentioning_status.mentions.first
+      PostStatusService.new.call(bob.account, text: 'Hello @alice')
       FavouriteService.new.call(bob.account, first_status)
       FavouriteService.new.call(tom.account, first_status)
       FollowService.new.call(bob.account, user.account)
@@ -141,18 +140,37 @@
 
     context 'with limit param' do
       let(:params) { { limit: 3 } }
+      let(:notifications) { user.account.notifications.reorder(id: :desc) }
 
       it 'returns the requested number of notifications paginated', :aggregate_failures do
         subject
 
-        notifications = user.account.notifications
-
         expect(body_as_json[:notification_groups].size)
           .to eq(params[:limit])
 
         expect(response)
           .to include_pagination_headers(
-            prev: api_v2_alpha_notifications_url(limit: params[:limit], min_id: notifications.last.id),
+            prev: api_v2_alpha_notifications_url(limit: params[:limit], min_id: notifications.first.id),
+            # TODO: one downside of the current approach is that we return the first ID matching the group,
+            # not the last that has been skipped, so pagination is very likely to give overlap
+            next: api_v2_alpha_notifications_url(limit: params[:limit], max_id: notifications[3].id)
+          )
+      end
+    end
+
+    context 'with since_id param' do
+      let(:params) { { since_id: notifications[2].id } }
+      let(:notifications) { user.account.notifications.reorder(id: :desc) }
+
+      it 'returns the requested number of notifications paginated', :aggregate_failures do
+        subject
+
+        expect(body_as_json[:notification_groups].size)
+          .to eq(2)
+
+        expect(response)
+          .to include_pagination_headers(
+            prev: api_v2_alpha_notifications_url(limit: params[:limit], min_id: notifications.first.id),
             # TODO: one downside of the current approach is that we return the first ID matching the group,
             # not the last that has been skipped, so pagination is very likely to give overlap
             next: api_v2_alpha_notifications_url(limit: params[:limit], max_id: notifications[1].id)

From 05b438005101dff2321bc645a5c7101fccdf342f Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Tue, 20 Aug 2024 16:03:09 +0200
Subject: [PATCH 1894/2191] Fix margin in follow notification in web UI
 (#31508)

---
 .../styles/mastodon/components.scss           | 27 +++++++++++--------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 97abf77d10e9f3..4c47a8db6c91b7 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -762,16 +762,6 @@ body > [data-popper-placement] {
     gap: 12px;
     flex-wrap: wrap;
 
-    .button {
-      display: block; // Otherwise text-ellipsis doesn't work
-      font-size: 14px;
-      line-height: normal;
-      font-weight: 700;
-      flex: 1 1 auto;
-      padding: 5px 12px;
-      border-radius: 4px;
-    }
-
     .icon-button {
       box-sizing: content-box;
       color: $highlight-text-color;
@@ -10530,8 +10520,10 @@ noscript {
     }
 
     &__additional-content {
-      color: $darker-text-color;
+      color: $dark-text-color;
       margin-top: -8px; // to offset the parent's `gap` property
+      font-size: 15px;
+      line-height: 22px;
     }
   }
 
@@ -10585,6 +10577,19 @@ noscript {
   }
 }
 
+.notification-group__actions,
+.compose-form__actions {
+  .button {
+    display: block; // Otherwise text-ellipsis doesn't work
+    font-size: 14px;
+    line-height: normal;
+    font-weight: 700;
+    flex: 1 1 auto;
+    padding: 5px 12px;
+    border-radius: 4px;
+  }
+}
+
 .notification-ungrouped {
   padding: 16px 24px;
   border-bottom: 1px solid var(--background-border-color);

From 6c26fb0ed63f080627ede26b73ed3f4f8e0e5220 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 20 Aug 2024 16:36:14 +0200
Subject: [PATCH 1895/2191] Update dependency core-js to v3.38.1 (#31507)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 47cd777f4391c5..5f116021a0d0af 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6389,9 +6389,9 @@ __metadata:
   linkType: hard
 
 "core-js@npm:^3.30.2":
-  version: 3.38.0
-  resolution: "core-js@npm:3.38.0"
-  checksum: 10c0/3218ae19bfe0c6560663012cbd3e7f3dc1b36d50fc71e8c365f3b119185e8a35ac4e8bb9698ae510b3c201ef93f40bdc29f9215716ccf31aca28f77969bb4ed0
+  version: 3.38.1
+  resolution: "core-js@npm:3.38.1"
+  checksum: 10c0/7df063b6f13a54e46515817ac3e235c6c598a4d3de65cd188a061fc250642be313b895fb9fb2f36e1e31890a1bb4ef61d82666a340413f540b7ce3c65689739b
   languageName: node
   linkType: hard
 

From 4016fd512898e9226a40b1973a742cb1e827ae3b Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Tue, 20 Aug 2024 17:56:44 +0200
Subject: [PATCH 1896/2191] Update CSS color variables to match our latest
 design system (#31510)

---
 app/javascript/styles/contrast/variables.scss |  8 ++---
 .../styles/mastodon-light/variables.scss      | 34 +++++++++----------
 app/javascript/styles/mastodon/variables.scss | 12 +++----
 app/lib/themes.rb                             |  2 +-
 4 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/app/javascript/styles/contrast/variables.scss b/app/javascript/styles/contrast/variables.scss
index e38d24b271cf8e..766591ba408383 100644
--- a/app/javascript/styles/contrast/variables.scss
+++ b/app/javascript/styles/contrast/variables.scss
@@ -1,10 +1,10 @@
 // Dependent colors
 $black: #000000;
 
-$classic-base-color: #282c37;
-$classic-primary-color: #9baec8;
-$classic-secondary-color: #d9e1e8;
-$classic-highlight-color: #6364ff;
+$classic-base-color: hsl(240deg, 16%, 19%);
+$classic-primary-color: hsl(240deg, 29%, 70%);
+$classic-secondary-color: hsl(255deg, 25%, 88%);
+$classic-highlight-color: hsl(240deg, 100%, 69%);
 
 $ui-base-color: $classic-base-color !default;
 $ui-primary-color: $classic-primary-color !default;
diff --git a/app/javascript/styles/mastodon-light/variables.scss b/app/javascript/styles/mastodon-light/variables.scss
index 39809b437f4cd7..76ede2623319f8 100644
--- a/app/javascript/styles/mastodon-light/variables.scss
+++ b/app/javascript/styles/mastodon-light/variables.scss
@@ -2,25 +2,25 @@
 $black: #000000;
 $white: #ffffff;
 
-$classic-base-color: #282c37;
-$classic-primary-color: #9baec8;
-$classic-secondary-color: #d9e1e8;
-$classic-highlight-color: #6364ff;
+$classic-base-color: hsl(240deg, 16%, 19%);
+$classic-primary-color: hsl(240deg, 29%, 70%);
+$classic-secondary-color: hsl(255deg, 25%, 88%);
+$classic-highlight-color: hsl(240deg, 100%, 69%);
 
-$blurple-600: #563acc; // Iris
-$blurple-500: #6364ff; // Brand purple
-$blurple-300: #858afa; // Faded Blue
-$grey-600: #4e4c5a; // Trout
-$grey-100: #dadaf3; // Topaz
+$blurple-600: hsl(252deg, 59%, 51%); // Iris
+$blurple-500: hsl(240deg, 100%, 69%); // Brand purple
+$blurple-300: hsl(237deg, 92%, 75%); // Faded Blue
+$grey-600: hsl(240deg, 8%, 33%); // Trout
+$grey-100: hsl(240deg, 51%, 90%); // Topaz
 
 // Differences
-$success-green: lighten(#3c754d, 8%);
+$success-green: lighten(hsl(138deg, 32%, 35%), 8%);
 
 $base-overlay-background: $white !default;
 $valid-value-color: $success-green !default;
 
 $ui-base-color: $classic-secondary-color !default;
-$ui-base-lighter-color: #b0c0cf;
+$ui-base-lighter-color: hsl(250deg, 24%, 75%);
 $ui-primary-color: $classic-primary-color !default;
 $ui-secondary-color: $classic-base-color !default;
 $ui-highlight-color: $classic-highlight-color !default;
@@ -35,12 +35,12 @@ $ui-button-tertiary-border-color: $blurple-500 !default;
 $primary-text-color: $black !default;
 $darker-text-color: $classic-base-color !default;
 $highlight-text-color: $ui-highlight-color !default;
-$dark-text-color: #444b5d;
-$action-button-color: #606984;
+$dark-text-color: hsl(240deg, 16%, 32%);
+$action-button-color: hsl(240deg, 16%, 45%);
 
 $inverted-text-color: $black !default;
 $lighter-text-color: $classic-base-color !default;
-$light-text-color: #444b5d;
+$light-text-color: hsl(240deg, 16%, 32%);
 
 // Newly added colors
 $account-background-color: $white !default;
@@ -57,11 +57,11 @@ $account-background-color: $white !default;
 $emojis-requiring-inversion: 'chains';
 
 body {
-  --dropdown-border-color: #d9e1e8;
+  --dropdown-border-color: hsl(240deg, 25%, 88%);
   --dropdown-background-color: #fff;
-  --modal-border-color: #d9e1e8;
+  --modal-border-color: hsl(240deg, 25%, 88%);
   --modal-background-color: var(--background-color-tint);
-  --background-border-color: #d9e1e8;
+  --background-border-color: hsl(240deg, 25%, 88%);
   --background-color: #fff;
   --background-color-tint: rgba(255, 255, 255, 80%);
   --background-filter: blur(10px);
diff --git a/app/javascript/styles/mastodon/variables.scss b/app/javascript/styles/mastodon/variables.scss
index c8271e0dcd95d4..c477e7a750cecc 100644
--- a/app/javascript/styles/mastodon/variables.scss
+++ b/app/javascript/styles/mastodon/variables.scss
@@ -7,8 +7,8 @@ $blurple-600: #563acc; // Iris
 $blurple-500: #6364ff; // Brand purple
 $blurple-400: #7477fd; // Medium slate blue
 $blurple-300: #858afa; // Faded Blue
-$grey-600: #4e4c5a; // Trout
-$grey-100: #dadaf3; // Topaz
+$grey-600: hsl(240deg, 8%, 33%); // Trout
+$grey-100: hsl(240deg, 51%, 90%); // Topaz
 
 $success-green: #79bd9a !default; // Padua
 $error-red: $red-500 !default; // Cerise
@@ -18,10 +18,10 @@ $gold-star: #ca8f04 !default; // Dark Goldenrod
 $red-bookmark: $warning-red;
 
 // Values from the classic Mastodon UI
-$classic-base-color: #282c37; // Midnight Express
-$classic-primary-color: #9baec8; // Echo Blue
-$classic-secondary-color: #d9e1e8; // Pattens Blue
-$classic-highlight-color: #6364ff; // Brand purple
+$classic-base-color: hsl(240deg, 16%, 19%);
+$classic-primary-color: hsl(240deg, 29%, 70%);
+$classic-secondary-color: hsl(255deg, 25%, 88%);
+$classic-highlight-color: $blurple-500;
 
 // Variables for defaults in UI
 $base-shadow-color: $black !default;
diff --git a/app/lib/themes.rb b/app/lib/themes.rb
index 183258d62f832e..8b68c92e45082c 100644
--- a/app/lib/themes.rb
+++ b/app/lib/themes.rb
@@ -7,7 +7,7 @@ class Themes
   include Singleton
 
   THEME_COLORS = {
-    dark: '#191b22',
+    dark: '#181820',
     light: '#ffffff',
   }.freeze
 

From 4c4bcad866f513f69d6ea74e5acfdf3fc5f469ff Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 20 Aug 2024 11:59:47 -0400
Subject: [PATCH 1897/2191] Remove `font-awesome` npm package (#31512)

---
 app/javascript/mastodon/common.js       | 1 -
 app/views/layouts/application.html.haml | 1 -
 app/views/layouts/embedded.html.haml    | 1 -
 app/views/layouts/error.html.haml       | 1 -
 package.json                            | 1 -
 yarn.lock                               | 8 --------
 6 files changed, 13 deletions(-)

diff --git a/app/javascript/mastodon/common.js b/app/javascript/mastodon/common.js
index 511568aa0f748a..28857de5346c20 100644
--- a/app/javascript/mastodon/common.js
+++ b/app/javascript/mastodon/common.js
@@ -1,5 +1,4 @@
 import Rails from '@rails/ujs';
-import 'font-awesome/css/font-awesome.css';
 
 export function start() {
   require.context('../images/', true, /\.(jpg|png|svg)$/);
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 0c0512e812f4f3..a6b34c8a36515a 100755
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -25,7 +25,6 @@
 
     %title= html_title
 
-    = stylesheet_pack_tag 'common', media: 'all', crossorigin: 'anonymous'
     = theme_style_tags current_theme
     -# Needed for the wicg-inert polyfill. It needs to be on it's own <style> tag, with this `id`
     = stylesheet_pack_tag 'inert', media: 'all', crossorigin: 'anonymous', id: 'inert-style'
diff --git a/app/views/layouts/embedded.html.haml b/app/views/layouts/embedded.html.haml
index f912b3fafdcf52..9258e80833a0e3 100644
--- a/app/views/layouts/embedded.html.haml
+++ b/app/views/layouts/embedded.html.haml
@@ -11,7 +11,6 @@
     - if storage_host?
       %link{ rel: 'dns-prefetch', href: storage_host }/
 
-    = stylesheet_pack_tag 'common', media: 'all', crossorigin: 'anonymous'
     = theme_style_tags Setting.theme # Use the admin-configured theme here, even if logged in
     = javascript_pack_tag 'common', integrity: true, crossorigin: 'anonymous'
     = preload_pack_asset "locale/#{I18n.locale}-json.js"
diff --git a/app/views/layouts/error.html.haml b/app/views/layouts/error.html.haml
index 485a69c909fabf..0e4a27d1fc9aee 100644
--- a/app/views/layouts/error.html.haml
+++ b/app/views/layouts/error.html.haml
@@ -5,7 +5,6 @@
     %meta{ charset: 'utf-8' }/
     %title= safe_join([yield(:page_title), Setting.default_settings['site_title']], ' - ')
     %meta{ content: 'width=device-width,initial-scale=1', name: 'viewport' }/
-    = stylesheet_pack_tag 'common', media: 'all', crossorigin: 'anonymous'
     = theme_style_tags Setting.default_settings['theme']
     = javascript_pack_tag 'common', crossorigin: 'anonymous'
     = javascript_pack_tag 'error', crossorigin: 'anonymous'
diff --git a/package.json b/package.json
index 321a78598df773..8ccbc31d39c754 100644
--- a/package.json
+++ b/package.json
@@ -70,7 +70,6 @@
     "emoji-mart": "npm:emoji-mart-lazyload@latest",
     "escape-html": "^1.0.3",
     "file-loader": "^6.2.0",
-    "font-awesome": "^4.7.0",
     "fuzzysort": "^3.0.0",
     "glob": "^10.2.6",
     "history": "^4.10.1",
diff --git a/yarn.lock b/yarn.lock
index 5f116021a0d0af..c3dc1c5d3f8545 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2856,7 +2856,6 @@ __metadata:
     eslint-plugin-react: "npm:^7.33.2"
     eslint-plugin-react-hooks: "npm:^4.6.0"
     file-loader: "npm:^6.2.0"
-    font-awesome: "npm:^4.7.0"
     fuzzysort: "npm:^3.0.0"
     glob: "npm:^10.2.6"
     history: "npm:^4.10.1"
@@ -8704,13 +8703,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"font-awesome@npm:^4.7.0":
-  version: 4.7.0
-  resolution: "font-awesome@npm:4.7.0"
-  checksum: 10c0/1c456e2939c55192eed67db9c0efb8db3e92fd357ca189ca00030eb44acffa1e9f835288d2204c14b9a9c490a7b14b7090dfaff80ded6b2473f50a923dfb41e7
-  languageName: node
-  linkType: hard
-
 "for-each@npm:^0.3.3":
   version: 0.3.3
   resolution: "for-each@npm:0.3.3"

From f91403ccaaf480891bb37746ad2634d3792a094c Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 20 Aug 2024 11:59:59 -0400
Subject: [PATCH 1898/2191] Remove unused `fa_icon` helper method (#31511)

---
 app/helpers/application_helper.rb       | 8 --------
 spec/helpers/application_helper_spec.rb | 6 ------
 2 files changed, 14 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 20da199d437800..61a8fc59770af4 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -105,14 +105,6 @@ def can?(action, record)
     policy(record).public_send(:"#{action}?")
   end
 
-  def fa_icon(icon, attributes = {})
-    class_names = attributes[:class]&.split || []
-    class_names << 'fa'
-    class_names += icon.split.map { |cl| "fa-#{cl}" }
-
-    content_tag(:i, nil, attributes.merge(class: class_names.join(' ')))
-  end
-
   def material_symbol(icon, attributes = {})
     inline_svg_tag(
       "400-24px/#{icon}.svg",
diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
index 95e6976169e109..2205167e5d13c6 100644
--- a/spec/helpers/application_helper_spec.rb
+++ b/spec/helpers/application_helper_spec.rb
@@ -53,12 +53,6 @@ def current_theme = 'default'
     end
   end
 
-  describe 'fa_icon' do
-    it 'returns a tag of fixed-width cog' do
-      expect(helper.fa_icon('cog fw')).to eq '<i class="fa fa-cog fa-fw"></i>'
-    end
-  end
-
   describe '#material_symbol' do
     it 'returns an svg with the icon and options' do
       expect(helper.material_symbol('lock', class: :test, data: { hidden: true }))

From 9ba7c90151463a6e4f7952317253fe8c113e9b0a Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 20 Aug 2024 18:18:33 +0200
Subject: [PATCH 1899/2191] Fix non-grouped notifications not loading on page
 load (#31514)

---
 app/javascript/mastodon/actions/notifications_migration.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/actions/notifications_migration.tsx b/app/javascript/mastodon/actions/notifications_migration.tsx
index b453aed6ef72a9..c245dc7565ae72 100644
--- a/app/javascript/mastodon/actions/notifications_migration.tsx
+++ b/app/javascript/mastodon/actions/notifications_migration.tsx
@@ -13,6 +13,6 @@ export const initializeNotifications = createAppAsyncThunk(
     ) as boolean;
 
     if (enableBeta) void dispatch(fetchNotifications());
-    else void dispatch(expandNotifications());
+    else void dispatch(expandNotifications({}));
   },
 );

From 4e5d85b63797b3dda8fce33a84807fbc496a74da Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Tue, 20 Aug 2024 00:11:58 +0200
Subject: [PATCH 1900/2191] [Glitch] Improve the list selection UI for
 notification requests

Port 98bf2fc27c6204527d8da5bc3847bd8406f1bfe8 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../features/notifications/requests.jsx       | 121 +++++++-----------
 .../flavours/glitch/styles/components.scss    |  26 ++--
 .../styles/mastodon-light/variables.scss      |   1 +
 .../flavours/glitch/styles/variables.scss     |   1 +
 4 files changed, 60 insertions(+), 89 deletions(-)

diff --git a/app/javascript/flavours/glitch/features/notifications/requests.jsx b/app/javascript/flavours/glitch/features/notifications/requests.jsx
index 6db16a42d11c9c..970ce3b40cd680 100644
--- a/app/javascript/flavours/glitch/features/notifications/requests.jsx
+++ b/app/javascript/flavours/glitch/features/notifications/requests.jsx
@@ -7,6 +7,7 @@ import { Helmet } from 'react-helmet';
 
 import { useSelector, useDispatch } from 'react-redux';
 
+import ArrowDropDownIcon from '@/material-icons/400-24px/arrow_drop_down.svg?react';
 import InventoryIcon from '@/material-icons/400-24px/inventory_2.svg?react';
 import MoreHorizIcon from '@/material-icons/400-24px/more_horiz.svg?react';
 import { openModal } from 'flavours/glitch/actions/modal';
@@ -15,6 +16,7 @@ import { changeSetting } from 'flavours/glitch/actions/settings';
 import { CheckBox } from 'flavours/glitch/components/check_box';
 import Column from 'flavours/glitch/components/column';
 import ColumnHeader from 'flavours/glitch/components/column_header';
+import { Icon } from 'flavours/glitch/components/icon';
 import ScrollableList from 'flavours/glitch/components/scrollable_list';
 import DropdownMenuContainer from 'flavours/glitch/containers/dropdown_menu_container';
 
@@ -26,16 +28,14 @@ const messages = defineMessages({
   title: { id: 'notification_requests.title', defaultMessage: 'Filtered notifications' },
   maximize: { id: 'notification_requests.maximize', defaultMessage: 'Maximize' },
   more: { id: 'status.more', defaultMessage: 'More' },
-  acceptAll: { id: 'notification_requests.accept_all', defaultMessage: 'Accept all' },
-  dismissAll: { id: 'notification_requests.dismiss_all', defaultMessage: 'Dismiss all' },
-  acceptMultiple: { id: 'notification_requests.accept_multiple', defaultMessage: '{count, plural, one {Accept # request} other {Accept # requests}}' },
-  dismissMultiple: { id: 'notification_requests.dismiss_multiple', defaultMessage: '{count, plural, one {Dismiss # request} other {Dismiss # requests}}' },
-  confirmAcceptAllTitle: { id: 'notification_requests.confirm_accept_all.title', defaultMessage: 'Accept notification requests?' },
-  confirmAcceptAllMessage: { id: 'notification_requests.confirm_accept_all.message', defaultMessage: 'You are about to accept {count, plural, one {one notification request} other {# notification requests}}. Are you sure you want to proceed?' },
-  confirmAcceptAllButton: { id: 'notification_requests.confirm_accept_all.button', defaultMessage: 'Accept all' },
-  confirmDismissAllTitle: { id: 'notification_requests.confirm_dismiss_all.title', defaultMessage: 'Dismiss notification requests?' },
-  confirmDismissAllMessage: { id: 'notification_requests.confirm_dismiss_all.message', defaultMessage: "You are about to dismiss {count, plural, one {one notification request} other {# notification requests}}. You won't be able to easily access {count, plural, one {it} other {them}} again. Are you sure you want to proceed?" },
-  confirmDismissAllButton: { id: 'notification_requests.confirm_dismiss_all.button', defaultMessage: 'Dismiss all' },
+  acceptMultiple: { id: 'notification_requests.accept_multiple', defaultMessage: '{count, plural, one {Accept # request…} other {Accept # requests…}}' },
+  dismissMultiple: { id: 'notification_requests.dismiss_multiple', defaultMessage: '{count, plural, one {Dismiss # request…} other {Dismiss # requests…}}' },
+  confirmAcceptMultipleTitle: { id: 'notification_requests.confirm_accept_multiple.title', defaultMessage: 'Accept notification requests?' },
+  confirmAcceptMultipleMessage: { id: 'notification_requests.confirm_accept_multiple.message', defaultMessage: 'You are about to accept {count, plural, one {one notification request} other {# notification requests}}. Are you sure you want to proceed?' },
+  confirmAcceptMultipleButton: { id: 'notification_requests.confirm_accept_multiple.button', defaultMessage: '{count, plural, one {Accept request} other {Accept requests}}' },
+  confirmDismissMultipleTitle: { id: 'notification_requests.confirm_dismiss_multiple.title', defaultMessage: 'Dismiss notification requests?' },
+  confirmDismissMultipleMessage: { id: 'notification_requests.confirm_dismiss_multiple.message', defaultMessage: "You are about to dismiss {count, plural, one {one notification request} other {# notification requests}}. You won't be able to easily access {count, plural, one {it} other {them}} again. Are you sure you want to proceed?" },
+  confirmDismissMultipleButton: { id: 'notification_requests.confirm_dismiss_multiple.button', defaultMessage: '{count, plural, one {Dismiss request} other {Dismiss requests}}' },
 });
 
 const ColumnSettings = () => {
@@ -74,45 +74,15 @@ const SelectRow = ({selectAllChecked, toggleSelectAll, selectedItems, selectionM
   const intl = useIntl();
   const dispatch = useDispatch();
 
-  const notificationRequests = useSelector(state => state.getIn(['notificationRequests', 'items']));
-
   const selectedCount = selectedItems.length;
 
-  const handleAcceptAll = useCallback(() => {
-    const items = notificationRequests.map(request => request.get('id')).toArray();
-    dispatch(openModal({
-      modalType: 'CONFIRM',
-      modalProps: {
-        title: intl.formatMessage(messages.confirmAcceptAllTitle),
-        message: intl.formatMessage(messages.confirmAcceptAllMessage, { count: items.length }),
-        confirm: intl.formatMessage(messages.confirmAcceptAllButton),
-        onConfirm: () =>
-          dispatch(acceptNotificationRequests(items)),
-      },
-    }));
-  }, [dispatch, intl, notificationRequests]);
-
-  const handleDismissAll = useCallback(() => {
-    const items = notificationRequests.map(request => request.get('id')).toArray();
-    dispatch(openModal({
-      modalType: 'CONFIRM',
-      modalProps: {
-        title: intl.formatMessage(messages.confirmDismissAllTitle),
-        message: intl.formatMessage(messages.confirmDismissAllMessage, { count: items.length }),
-        confirm: intl.formatMessage(messages.confirmDismissAllButton),
-        onConfirm: () =>
-          dispatch(dismissNotificationRequests(items)),
-      },
-    }));
-  }, [dispatch, intl, notificationRequests]);
-
   const handleAcceptMultiple = useCallback(() => {
     dispatch(openModal({
       modalType: 'CONFIRM',
       modalProps: {
-        title: intl.formatMessage(messages.confirmAcceptAllTitle),
-        message: intl.formatMessage(messages.confirmAcceptAllMessage, { count: selectedItems.length }),
-        confirm: intl.formatMessage(messages.confirmAcceptAllButton),
+        title: intl.formatMessage(messages.confirmAcceptMultipleTitle),
+        message: intl.formatMessage(messages.confirmAcceptMultipleMessage, { count: selectedItems.length }),
+        confirm: intl.formatMessage(messages.confirmAcceptMultipleButton, { count: selectedItems.length}),
         onConfirm: () =>
           dispatch(acceptNotificationRequests(selectedItems)),
       },
@@ -123,9 +93,9 @@ const SelectRow = ({selectAllChecked, toggleSelectAll, selectedItems, selectionM
     dispatch(openModal({
       modalType: 'CONFIRM',
       modalProps: {
-        title: intl.formatMessage(messages.confirmDismissAllTitle),
-        message: intl.formatMessage(messages.confirmDismissAllMessage, { count: selectedItems.length }),
-        confirm: intl.formatMessage(messages.confirmDismissAllButton),
+        title: intl.formatMessage(messages.confirmDismissMultipleTitle),
+        message: intl.formatMessage(messages.confirmDismissMultipleMessage, { count: selectedItems.length }),
+        confirm: intl.formatMessage(messages.confirmDismissMultipleButton, { count: selectedItems.length}),
         onConfirm: () =>
           dispatch(dismissNotificationRequests(selectedItems)),
       },
@@ -136,46 +106,45 @@ const SelectRow = ({selectAllChecked, toggleSelectAll, selectedItems, selectionM
     setSelectionMode((mode) => !mode);
   }, [setSelectionMode]);
 
-  const menu = selectedCount === 0 ?
-    [
-      { text: intl.formatMessage(messages.acceptAll), action: handleAcceptAll },
-      { text: intl.formatMessage(messages.dismissAll), action: handleDismissAll },
-    ] : [
-      { text: intl.formatMessage(messages.acceptMultiple, { count: selectedCount }), action: handleAcceptMultiple },
-      { text: intl.formatMessage(messages.dismissMultiple, { count: selectedCount }), action: handleDismissMultiple },
-    ];
+  const menu = [
+    { text: intl.formatMessage(messages.acceptMultiple, { count: selectedCount }), action: handleAcceptMultiple },
+    { text: intl.formatMessage(messages.dismissMultiple, { count: selectedCount }), action: handleDismissMultiple },
+  ];
+
+  const handleSelectAll = useCallback(() => {
+    setSelectionMode(true);
+    toggleSelectAll();
+  }, [setSelectionMode, toggleSelectAll]);
 
   return (
     <div className='column-header__select-row'>
-      {selectionMode && (
-        <div className='column-header__select-row__checkbox'>
-          <CheckBox checked={selectAllChecked} indeterminate={selectedCount > 0 && !selectAllChecked} onChange={toggleSelectAll} />
-        </div>
-      )}
-      <div className='column-header__select-row__selection-mode'>
+      <div className='column-header__select-row__checkbox'>
+        <CheckBox checked={selectAllChecked} indeterminate={selectedCount > 0 && !selectAllChecked} onChange={handleSelectAll} />
+      </div>
+      <DropdownMenuContainer
+        items={menu}
+        icons='ellipsis-h'
+        iconComponent={MoreHorizIcon}
+        direction='right'
+        title={intl.formatMessage(messages.more)}
+      >
+        <button className='dropdown-button column-header__select-row__select-menu' disabled={selectedItems.length === 0}>
+          <span className='dropdown-button__label'>
+            {selectedCount} selected
+          </span>
+          <Icon id='down' icon={ArrowDropDownIcon} />
+        </button>
+      </DropdownMenuContainer>
+      <div className='column-header__select-row__mode-button'>
         <button className='text-btn' tabIndex={0} onClick={handleToggleSelectionMode}>
           {selectionMode ? (
-            <FormattedMessage id='notification_requests.exit_selection_mode' defaultMessage='Cancel' />
+            <FormattedMessage id='notification_requests.exit_selection' defaultMessage='Done' />
           ) :
             (
-              <FormattedMessage id='notification_requests.enter_selection_mode' defaultMessage='Select' />
+              <FormattedMessage id='notification_requests.edit_selection' defaultMessage='Edit' />
             )}
         </button>
       </div>
-      {selectedCount > 0 &&
-        <div className='column-header__select-row__selected-count'>
-          {selectedCount} selected
-        </div>
-      }
-      <div className='column-header__select-row__actions'>
-        <DropdownMenuContainer
-          items={menu}
-          icons='ellipsis-h'
-          iconComponent={MoreHorizIcon}
-          direction='right'
-          title={intl.formatMessage(messages.more)}
-        />
-      </div>
     </div>
   );
 };
diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index ed5e1b319daf75..ae8bc9f7811205 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -4422,7 +4422,7 @@ a.status-card {
   text-decoration: none;
 
   &:hover {
-    background: lighten($ui-base-color, 2%);
+    background: var(--on-surface-color);
   }
 }
 
@@ -4551,19 +4551,18 @@ a.status-card {
     display: flex;
   }
 
-  &__selection-mode {
-    flex-grow: 1;
-
-    .text-btn:hover {
-      text-decoration: underline;
-    }
+  &__select-menu:disabled {
+    visibility: hidden;
   }
 
-  &__actions {
-    .icon-button {
-      border-radius: 4px;
-      border: 1px solid var(--background-border-color);
-      padding: 5px;
+  &__mode-button {
+    margin-left: auto;
+    color: $highlight-text-color;
+    font-weight: bold;
+    font-size: 14px;
+
+    &:hover {
+      color: lighten($highlight-text-color, 6%);
     }
   }
 }
@@ -4916,6 +4915,7 @@ a.status-card {
   padding: 0;
   font-family: inherit;
   font-size: inherit;
+  font-weight: inherit;
   color: inherit;
   border: 0;
   background: transparent;
@@ -10923,7 +10923,7 @@ noscript {
     cursor: pointer;
 
     &:hover {
-      background: lighten($ui-base-color, 1%);
+      background: var(--on-surface-color);
     }
 
     .notification-request__checkbox {
diff --git a/app/javascript/flavours/glitch/styles/mastodon-light/variables.scss b/app/javascript/flavours/glitch/styles/mastodon-light/variables.scss
index 9d4fd60945a7d5..39809b437f4cd7 100644
--- a/app/javascript/flavours/glitch/styles/mastodon-light/variables.scss
+++ b/app/javascript/flavours/glitch/styles/mastodon-light/variables.scss
@@ -65,4 +65,5 @@ body {
   --background-color: #fff;
   --background-color-tint: rgba(255, 255, 255, 80%);
   --background-filter: blur(10px);
+  --on-surface-color: #{transparentize($ui-base-color, 0.65)};
 }
diff --git a/app/javascript/flavours/glitch/styles/variables.scss b/app/javascript/flavours/glitch/styles/variables.scss
index 9405335336e3e6..faf515508fb3e8 100644
--- a/app/javascript/flavours/glitch/styles/variables.scss
+++ b/app/javascript/flavours/glitch/styles/variables.scss
@@ -115,5 +115,6 @@ $dismiss-overlay-width: 4rem;
   --surface-background-color: #{darken($ui-base-color, 4%)};
   --surface-variant-background-color: #{$ui-base-color};
   --surface-variant-active-background-color: #{lighten($ui-base-color, 4%)};
+  --on-surface-color: #{transparentize($ui-base-color, 0.5)};
   --avatar-border-radius: 8px;
 }

From 57c38b91563b6eedff1bb7f73bdf861c953c63b2 Mon Sep 17 00:00:00 2001
From: Michael Stanclift <mx@vmstan.com>
Date: Tue, 20 Aug 2024 02:48:51 -0500
Subject: [PATCH 1901/2191] [Glitch] Harmonize persistent scrollbar styles

Port 2f01f5f4ea886c4a1bec2148d0ca82da5ae67f0c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/styles/components.scss    |  4 ----
 .../glitch/styles/mastodon-light/diff.scss    | 15 +++++++++++----
 .../flavours/glitch/styles/reset.scss         | 19 +++++++++++++------
 3 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index ae8bc9f7811205..f45d0f663e87b2 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -8110,10 +8110,6 @@ img.modal-warning {
   }
 }
 
-::-webkit-scrollbar-thumb {
-  border-radius: 0;
-}
-
 noscript {
   text-align: center;
 
diff --git a/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss b/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss
index d41577cf0592f8..869253e5e584a9 100644
--- a/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss
+++ b/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss
@@ -1,10 +1,6 @@
 // Notes!
 // Sass color functions, "darken" and "lighten" are automatically replaced.
 
-html {
-  scrollbar-color: $ui-base-color rgba($ui-base-color, 0.25);
-}
-
 .simple_form .button.button-tertiary {
   color: $highlight-text-color;
 }
@@ -624,3 +620,14 @@ a.sparkline {
     color: $dark-text-color;
   }
 }
+
+@supports not selector(::-webkit-scrollbar) {
+  html {
+    scrollbar-color: rgba($action-button-color, 0.25)
+      var(--background-border-color);
+  }
+}
+
+::-webkit-scrollbar-thumb {
+  opacity: 0.25;
+}
diff --git a/app/javascript/flavours/glitch/styles/reset.scss b/app/javascript/flavours/glitch/styles/reset.scss
index f8a4a08ced6d3a..5a4152826d9e4b 100644
--- a/app/javascript/flavours/glitch/styles/reset.scss
+++ b/app/javascript/flavours/glitch/styles/reset.scss
@@ -53,22 +53,29 @@ table {
   border-spacing: 0;
 }
 
-html {
-  scrollbar-color: var(--background-border-color);
+@supports not selector(::-webkit-scrollbar) {
+  html {
+    scrollbar-color: $action-button-color var(--background-border-color);
+    scrollbar-width: thin;
+  }
 }
 
 ::-webkit-scrollbar {
-  width: 4px;
-  height: 4px;
+  width: 8px;
+  height: 8px;
 }
 
 ::-webkit-scrollbar-thumb {
-  background-color: $ui-highlight-color;
-  opacity: .25;
+  background-color: $action-button-color;
+  border: 2px var(--background-border-color);
+  border-radius: 12px;
+  width: 6px;
+  box-shadow: inset 0 0 0 2px var(--background-border-color);
 }
 
 ::-webkit-scrollbar-track {
   background-color: var(--background-border-color);
+  border-radius: 0px;
 }
 
 ::-webkit-scrollbar-corner {

From eb9405bed9f2167bc53b116170858df6e25a09b5 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Tue, 20 Aug 2024 16:03:09 +0200
Subject: [PATCH 1902/2191] [Glitch] Fix margin in follow notification in web
 UI

Port 05b438005101dff2321bc645a5c7101fccdf342f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/styles/components.scss    | 27 +++++++++++--------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index f45d0f663e87b2..e1c6f658f3c083 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -811,16 +811,6 @@ body > [data-popper-placement] {
     gap: 12px;
     flex-wrap: wrap;
 
-    .button {
-      display: block; // Otherwise text-ellipsis doesn't work
-      font-size: 14px;
-      line-height: normal;
-      font-weight: 700;
-      flex: 1 1 auto;
-      padding: 5px 12px;
-      border-radius: 4px;
-    }
-
     .icon-button {
       box-sizing: content-box;
       color: $highlight-text-color;
@@ -11087,8 +11077,10 @@ noscript {
     }
 
     &__additional-content {
-      color: $darker-text-color;
+      color: $dark-text-color;
       margin-top: -8px; // to offset the parent's `gap` property
+      font-size: 15px;
+      line-height: 22px;
     }
   }
 
@@ -11142,6 +11134,19 @@ noscript {
   }
 }
 
+.notification-group__actions,
+.compose-form__actions {
+  .button {
+    display: block; // Otherwise text-ellipsis doesn't work
+    font-size: 14px;
+    line-height: normal;
+    font-weight: 700;
+    flex: 1 1 auto;
+    padding: 5px 12px;
+    border-radius: 4px;
+  }
+}
+
 .notification-ungrouped {
   padding: 10px 14px; // glitch: reduced padding
   border-bottom: 1px solid var(--background-border-color);

From e19b3aaaba9ed4267e18ef2b0fb953232c2f2aae Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Tue, 20 Aug 2024 17:56:44 +0200
Subject: [PATCH 1903/2191] [Glitch] Update CSS color variables to match our
 latest design system

Port 4016fd512898e9226a40b1973a742cb1e827ae3b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../glitch/styles/contrast/variables.scss     |  8 ++---
 .../styles/mastodon-light/variables.scss      | 34 +++++++++----------
 .../flavours/glitch/styles/variables.scss     | 12 +++----
 3 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/app/javascript/flavours/glitch/styles/contrast/variables.scss b/app/javascript/flavours/glitch/styles/contrast/variables.scss
index e38d24b271cf8e..766591ba408383 100644
--- a/app/javascript/flavours/glitch/styles/contrast/variables.scss
+++ b/app/javascript/flavours/glitch/styles/contrast/variables.scss
@@ -1,10 +1,10 @@
 // Dependent colors
 $black: #000000;
 
-$classic-base-color: #282c37;
-$classic-primary-color: #9baec8;
-$classic-secondary-color: #d9e1e8;
-$classic-highlight-color: #6364ff;
+$classic-base-color: hsl(240deg, 16%, 19%);
+$classic-primary-color: hsl(240deg, 29%, 70%);
+$classic-secondary-color: hsl(255deg, 25%, 88%);
+$classic-highlight-color: hsl(240deg, 100%, 69%);
 
 $ui-base-color: $classic-base-color !default;
 $ui-primary-color: $classic-primary-color !default;
diff --git a/app/javascript/flavours/glitch/styles/mastodon-light/variables.scss b/app/javascript/flavours/glitch/styles/mastodon-light/variables.scss
index 39809b437f4cd7..76ede2623319f8 100644
--- a/app/javascript/flavours/glitch/styles/mastodon-light/variables.scss
+++ b/app/javascript/flavours/glitch/styles/mastodon-light/variables.scss
@@ -2,25 +2,25 @@
 $black: #000000;
 $white: #ffffff;
 
-$classic-base-color: #282c37;
-$classic-primary-color: #9baec8;
-$classic-secondary-color: #d9e1e8;
-$classic-highlight-color: #6364ff;
+$classic-base-color: hsl(240deg, 16%, 19%);
+$classic-primary-color: hsl(240deg, 29%, 70%);
+$classic-secondary-color: hsl(255deg, 25%, 88%);
+$classic-highlight-color: hsl(240deg, 100%, 69%);
 
-$blurple-600: #563acc; // Iris
-$blurple-500: #6364ff; // Brand purple
-$blurple-300: #858afa; // Faded Blue
-$grey-600: #4e4c5a; // Trout
-$grey-100: #dadaf3; // Topaz
+$blurple-600: hsl(252deg, 59%, 51%); // Iris
+$blurple-500: hsl(240deg, 100%, 69%); // Brand purple
+$blurple-300: hsl(237deg, 92%, 75%); // Faded Blue
+$grey-600: hsl(240deg, 8%, 33%); // Trout
+$grey-100: hsl(240deg, 51%, 90%); // Topaz
 
 // Differences
-$success-green: lighten(#3c754d, 8%);
+$success-green: lighten(hsl(138deg, 32%, 35%), 8%);
 
 $base-overlay-background: $white !default;
 $valid-value-color: $success-green !default;
 
 $ui-base-color: $classic-secondary-color !default;
-$ui-base-lighter-color: #b0c0cf;
+$ui-base-lighter-color: hsl(250deg, 24%, 75%);
 $ui-primary-color: $classic-primary-color !default;
 $ui-secondary-color: $classic-base-color !default;
 $ui-highlight-color: $classic-highlight-color !default;
@@ -35,12 +35,12 @@ $ui-button-tertiary-border-color: $blurple-500 !default;
 $primary-text-color: $black !default;
 $darker-text-color: $classic-base-color !default;
 $highlight-text-color: $ui-highlight-color !default;
-$dark-text-color: #444b5d;
-$action-button-color: #606984;
+$dark-text-color: hsl(240deg, 16%, 32%);
+$action-button-color: hsl(240deg, 16%, 45%);
 
 $inverted-text-color: $black !default;
 $lighter-text-color: $classic-base-color !default;
-$light-text-color: #444b5d;
+$light-text-color: hsl(240deg, 16%, 32%);
 
 // Newly added colors
 $account-background-color: $white !default;
@@ -57,11 +57,11 @@ $account-background-color: $white !default;
 $emojis-requiring-inversion: 'chains';
 
 body {
-  --dropdown-border-color: #d9e1e8;
+  --dropdown-border-color: hsl(240deg, 25%, 88%);
   --dropdown-background-color: #fff;
-  --modal-border-color: #d9e1e8;
+  --modal-border-color: hsl(240deg, 25%, 88%);
   --modal-background-color: var(--background-color-tint);
-  --background-border-color: #d9e1e8;
+  --background-border-color: hsl(240deg, 25%, 88%);
   --background-color: #fff;
   --background-color-tint: rgba(255, 255, 255, 80%);
   --background-filter: blur(10px);
diff --git a/app/javascript/flavours/glitch/styles/variables.scss b/app/javascript/flavours/glitch/styles/variables.scss
index faf515508fb3e8..8dd2cd0cda68ae 100644
--- a/app/javascript/flavours/glitch/styles/variables.scss
+++ b/app/javascript/flavours/glitch/styles/variables.scss
@@ -7,8 +7,8 @@ $blurple-600: #563acc; // Iris
 $blurple-500: #6364ff; // Brand purple
 $blurple-400: #7477fd; // Medium slate blue
 $blurple-300: #858afa; // Faded Blue
-$grey-600: #4e4c5a; // Trout
-$grey-100: #dadaf3; // Topaz
+$grey-600: hsl(240deg, 8%, 33%); // Trout
+$grey-100: hsl(240deg, 51%, 90%); // Topaz
 
 $success-green: #79bd9a !default; // Padua
 $error-red: $red-500 !default; // Cerise
@@ -18,10 +18,10 @@ $gold-star: #ca8f04 !default; // Dark Goldenrod
 $red-bookmark: $warning-red;
 
 // Values from the classic Mastodon UI
-$classic-base-color: #282c37; // Midnight Express
-$classic-primary-color: #9baec8; // Echo Blue
-$classic-secondary-color: #d9e1e8; // Pattens Blue
-$classic-highlight-color: #6364ff; // Brand purple
+$classic-base-color: hsl(240deg, 16%, 19%);
+$classic-primary-color: hsl(240deg, 29%, 70%);
+$classic-secondary-color: hsl(255deg, 25%, 88%);
+$classic-highlight-color: $blurple-500;
 
 // Variables for defaults in UI
 $base-shadow-color: $black !default;

From 4c85fec9939a144bd03c3ce93022db3cf61f21cf Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 20 Aug 2024 11:59:47 -0400
Subject: [PATCH 1904/2191] [Glitch] Remove `font-awesome` npm package

Port 4c4bcad866f513f69d6ea74e5acfdf3fc5f469ff to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/entrypoints/common.js                 | 1 -
 app/javascript/flavours/glitch/common.js             | 1 -
 app/javascript/flavours/glitch/entrypoints/common.js | 1 -
 3 files changed, 3 deletions(-)

diff --git a/app/javascript/entrypoints/common.js b/app/javascript/entrypoints/common.js
index 489041458f3700..fce857be920086 100644
--- a/app/javascript/entrypoints/common.js
+++ b/app/javascript/entrypoints/common.js
@@ -2,4 +2,3 @@
   that is implicitly generated as the common chunk through webpack's `splitChunks` config */
 
 import './public-path';
-import 'font-awesome/css/font-awesome.css';
diff --git a/app/javascript/flavours/glitch/common.js b/app/javascript/flavours/glitch/common.js
index 1bcb1d00f1b87e..ca4703d38bf56e 100644
--- a/app/javascript/flavours/glitch/common.js
+++ b/app/javascript/flavours/glitch/common.js
@@ -1,5 +1,4 @@
 import Rails from '@rails/ujs';
-import 'font-awesome/css/font-awesome.css';
 
 export function start() {
   require.context('@/images/', true, /\.(jpg|png|svg)$/);
diff --git a/app/javascript/flavours/glitch/entrypoints/common.js b/app/javascript/flavours/glitch/entrypoints/common.js
index ade52fc4130cd9..774139c35c7ccb 100644
--- a/app/javascript/flavours/glitch/entrypoints/common.js
+++ b/app/javascript/flavours/glitch/entrypoints/common.js
@@ -2,7 +2,6 @@
   that is implicitly generated as the common chunk through webpack's `splitChunks` config */
 
 import '@/entrypoints/public-path';
-import 'font-awesome/css/font-awesome.css';
 
 // This is a hack to ensures that webpack compiles our images.
 require.context('../images', true);

From bdc0e0d27e86e95b19b1a48e8f66532fd323aa2c Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 20 Aug 2024 18:18:33 +0200
Subject: [PATCH 1905/2191] [Glitch] Fix non-grouped notifications not loading
 on page load

Port 9ba7c90151463a6e4f7952317253fe8c113e9b0a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/actions/notifications_migration.tsx         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/flavours/glitch/actions/notifications_migration.tsx b/app/javascript/flavours/glitch/actions/notifications_migration.tsx
index 3acceef0f8a07a..ac7727ecd1e751 100644
--- a/app/javascript/flavours/glitch/actions/notifications_migration.tsx
+++ b/app/javascript/flavours/glitch/actions/notifications_migration.tsx
@@ -13,6 +13,6 @@ export const initializeNotifications = createAppAsyncThunk(
     ) as boolean;
 
     if (enableBeta) void dispatch(fetchNotifications());
-    else void dispatch(expandNotifications());
+    else void dispatch(expandNotifications({}));
   },
 );

From b06c7b6b5ae28cb81e5ba8ba632ebc629d1fed57 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 21 Aug 2024 09:08:58 +0200
Subject: [PATCH 1906/2191] Change hints for missing remote content in web UI
 (#31516)

---
 .../mastodon/components/timeline_hint.tsx     | 27 ++++++++-----------
 .../features/account_timeline/index.jsx       | 21 +++++++++++----
 .../mastodon/features/followers/index.jsx     | 21 +++++++++++----
 .../mastodon/features/following/index.jsx     | 21 +++++++++++----
 .../mastodon/features/status/index.jsx        |  9 ++++++-
 app/javascript/mastodon/locales/en.json       | 14 +++++-----
 .../styles/mastodon/components.scss           | 13 ++++-----
 7 files changed, 82 insertions(+), 44 deletions(-)

diff --git a/app/javascript/mastodon/components/timeline_hint.tsx b/app/javascript/mastodon/components/timeline_hint.tsx
index 6faad2fbb875eb..9e0d3676ec7469 100644
--- a/app/javascript/mastodon/components/timeline_hint.tsx
+++ b/app/javascript/mastodon/components/timeline_hint.tsx
@@ -1,28 +1,23 @@
-import { FormattedMessage } from 'react-intl';
-
 import classNames from 'classnames';
 
 interface Props {
-  resource: JSX.Element;
+  message: React.ReactNode;
+  label: React.ReactNode;
   url: string;
   className?: string;
 }
 
-export const TimelineHint: React.FC<Props> = ({ className, resource, url }) => (
+export const TimelineHint: React.FC<Props> = ({
+  className,
+  message,
+  label,
+  url,
+}) => (
   <div className={classNames('timeline-hint', className)}>
-    <strong>
-      <FormattedMessage
-        id='timeline_hint.remote_resource_not_displayed'
-        defaultMessage='{resource} from other servers are not displayed.'
-        values={{ resource }}
-      />
-    </strong>
-    <br />
+    <p>{message}</p>
+
     <a href={url} target='_blank' rel='noopener noreferrer'>
-      <FormattedMessage
-        id='account.browse_more_on_origin_server'
-        defaultMessage='Browse more on the original profile'
-      />
+      {label}
     </a>
   </div>
 );
diff --git a/app/javascript/mastodon/features/account_timeline/index.jsx b/app/javascript/mastodon/features/account_timeline/index.jsx
index dc69f83e77afaf..105c2e4e50843e 100644
--- a/app/javascript/mastodon/features/account_timeline/index.jsx
+++ b/app/javascript/mastodon/features/account_timeline/index.jsx
@@ -12,6 +12,7 @@ import BundleColumnError from 'mastodon/features/ui/components/bundle_column_err
 import { me } from 'mastodon/initial_state';
 import { normalizeForLookup } from 'mastodon/reducers/accounts_map';
 import { getAccountHidden } from 'mastodon/selectors';
+import { useAppSelector } from 'mastodon/store';
 
 import { lookupAccount, fetchAccount } from '../../actions/accounts';
 import { fetchFeaturedTags } from '../../actions/featured_tags';
@@ -59,12 +60,22 @@ const mapStateToProps = (state, { params: { acct, id, tagged }, withReplies = fa
   };
 };
 
-const RemoteHint = ({ url }) => (
-  <TimelineHint url={url} resource={<FormattedMessage id='timeline_hint.resources.statuses' defaultMessage='Older posts' />} />
-);
+const RemoteHint = ({ accountId, url }) => {
+  const acct = useAppSelector(state => state.accounts.get(accountId)?.acct);
+  const domain = acct ? acct.split('@')[1] : undefined;
+
+  return (
+    <TimelineHint
+      url={url}
+      message={<FormattedMessage id='hints.profiles.posts_may_be_missing' defaultMessage='Some posts from this profile may be missing.' />}
+      label={<FormattedMessage id='hints.profiles.see_more_posts' defaultMessage='See more posts on {domain}' values={{ domain: <strong>{domain}</strong> }} />}
+    />
+  );
+};
 
 RemoteHint.propTypes = {
   url: PropTypes.string.isRequired,
+  accountId: PropTypes.string.isRequired,
 };
 
 class AccountTimeline extends ImmutablePureComponent {
@@ -175,12 +186,12 @@ class AccountTimeline extends ImmutablePureComponent {
     } else if (blockedBy) {
       emptyMessage = <FormattedMessage id='empty_column.account_unavailable' defaultMessage='Profile unavailable' />;
     } else if (remote && statusIds.isEmpty()) {
-      emptyMessage = <RemoteHint url={remoteUrl} />;
+      emptyMessage = <RemoteHint accountId={accountId} url={remoteUrl} />;
     } else {
       emptyMessage = <FormattedMessage id='empty_column.account_timeline' defaultMessage='No posts found' />;
     }
 
-    const remoteMessage = remote ? <RemoteHint url={remoteUrl} /> : null;
+    const remoteMessage = remote ? <RemoteHint accountId={accountId} url={remoteUrl} /> : null;
 
     return (
       <Column>
diff --git a/app/javascript/mastodon/features/followers/index.jsx b/app/javascript/mastodon/features/followers/index.jsx
index 4885f9ca994693..92fce79c355715 100644
--- a/app/javascript/mastodon/features/followers/index.jsx
+++ b/app/javascript/mastodon/features/followers/index.jsx
@@ -12,6 +12,7 @@ import { TimelineHint } from 'mastodon/components/timeline_hint';
 import BundleColumnError from 'mastodon/features/ui/components/bundle_column_error';
 import { normalizeForLookup } from 'mastodon/reducers/accounts_map';
 import { getAccountHidden } from 'mastodon/selectors';
+import { useAppSelector } from 'mastodon/store';
 
 import {
   lookupAccount,
@@ -51,12 +52,22 @@ const mapStateToProps = (state, { params: { acct, id } }) => {
   };
 };
 
-const RemoteHint = ({ url }) => (
-  <TimelineHint url={url} resource={<FormattedMessage id='timeline_hint.resources.followers' defaultMessage='Followers' />} />
-);
+const RemoteHint = ({ accountId, url }) => {
+  const acct = useAppSelector(state => state.accounts.get(accountId)?.acct);
+  const domain = acct ? acct.split('@')[1] : undefined;
+
+  return (
+    <TimelineHint
+      url={url}
+      message={<FormattedMessage id='hints.profiles.followers_may_be_missing' defaultMessage='Followers for this profile may be missing.' />}
+      label={<FormattedMessage id='hints.profiles.see_more_followers' defaultMessage='See more followers on {domain}' values={{ domain: <strong>{domain}</strong> }} />}
+    />
+  );
+};
 
 RemoteHint.propTypes = {
   url: PropTypes.string.isRequired,
+  accountId: PropTypes.string.isRequired,
 };
 
 class Followers extends ImmutablePureComponent {
@@ -141,12 +152,12 @@ class Followers extends ImmutablePureComponent {
     } else if (hideCollections && accountIds.isEmpty()) {
       emptyMessage = <FormattedMessage id='empty_column.account_hides_collections' defaultMessage='This user has chosen to not make this information available' />;
     } else if (remote && accountIds.isEmpty()) {
-      emptyMessage = <RemoteHint url={remoteUrl} />;
+      emptyMessage = <RemoteHint accountId={accountId} url={remoteUrl} />;
     } else {
       emptyMessage = <FormattedMessage id='account.followers.empty' defaultMessage='No one follows this user yet.' />;
     }
 
-    const remoteMessage = remote ? <RemoteHint url={remoteUrl} /> : null;
+    const remoteMessage = remote ? <RemoteHint accountId={accountId} url={remoteUrl} /> : null;
 
     return (
       <Column>
diff --git a/app/javascript/mastodon/features/following/index.jsx b/app/javascript/mastodon/features/following/index.jsx
index fb4a4d5c3a664a..b53a016ff1d409 100644
--- a/app/javascript/mastodon/features/following/index.jsx
+++ b/app/javascript/mastodon/features/following/index.jsx
@@ -12,6 +12,7 @@ import { TimelineHint } from 'mastodon/components/timeline_hint';
 import BundleColumnError from 'mastodon/features/ui/components/bundle_column_error';
 import { normalizeForLookup } from 'mastodon/reducers/accounts_map';
 import { getAccountHidden } from 'mastodon/selectors';
+import { useAppSelector } from 'mastodon/store';
 
 import {
   lookupAccount,
@@ -51,12 +52,22 @@ const mapStateToProps = (state, { params: { acct, id } }) => {
   };
 };
 
-const RemoteHint = ({ url }) => (
-  <TimelineHint url={url} resource={<FormattedMessage id='timeline_hint.resources.follows' defaultMessage='Follows' />} />
-);
+const RemoteHint = ({ accountId, url }) => {
+  const acct = useAppSelector(state => state.accounts.get(accountId)?.acct);
+  const domain = acct ? acct.split('@')[1] : undefined;
+
+  return (
+    <TimelineHint
+      url={url}
+      message={<FormattedMessage id='hints.profiles.follows_may_be_missing' defaultMessage='Follows for this profile may be missing.' />}
+      label={<FormattedMessage id='hints.profiles.see_more_follows' defaultMessage='See more follows on {domain}' values={{ domain: <strong>{domain}</strong> }} />}
+    />
+  );
+};
 
 RemoteHint.propTypes = {
   url: PropTypes.string.isRequired,
+  accountId: PropTypes.string.isRequired,
 };
 
 class Following extends ImmutablePureComponent {
@@ -141,12 +152,12 @@ class Following extends ImmutablePureComponent {
     } else if (hideCollections && accountIds.isEmpty()) {
       emptyMessage = <FormattedMessage id='empty_column.account_hides_collections' defaultMessage='This user has chosen to not make this information available' />;
     } else if (remote && accountIds.isEmpty()) {
-      emptyMessage = <RemoteHint url={remoteUrl} />;
+      emptyMessage = <RemoteHint accountId={accountId} url={remoteUrl} />;
     } else {
       emptyMessage = <FormattedMessage id='account.follows.empty' defaultMessage="This user doesn't follow anyone yet." />;
     }
 
-    const remoteMessage = remote ? <RemoteHint url={remoteUrl} /> : null;
+    const remoteMessage = remote ? <RemoteHint accountId={accountId} url={remoteUrl} /> : null;
 
     return (
       <Column>
diff --git a/app/javascript/mastodon/features/status/index.jsx b/app/javascript/mastodon/features/status/index.jsx
index 1d15b13bd451d9..5f325fe7b87601 100644
--- a/app/javascript/mastodon/features/status/index.jsx
+++ b/app/javascript/mastodon/features/status/index.jsx
@@ -629,7 +629,14 @@ class Status extends ImmutablePureComponent {
     const isIndexable = !status.getIn(['account', 'noindex']);
 
     if (!isLocal) {
-      remoteHint = <TimelineHint className={classNames(!!descendants && 'timeline-hint--with-descendants')} url={status.get('url')} resource={<FormattedMessage id='timeline_hint.resources.replies' defaultMessage='Some replies' />} />;
+      remoteHint = (
+        <TimelineHint
+          className={classNames(!!descendants && 'timeline-hint--with-descendants')}
+          url={status.get('url')}
+          message={<FormattedMessage id='hints.threads.replies_may_be_missing' defaultMessage='Replies from other servers may be missing.' />}
+          label={<FormattedMessage id='hints.threads.see_more' defaultMessage='See more replies on {domain}' values={{ domain: <strong>{status.getIn(['account', 'acct']).split('@')[1]}</strong> }} />}
+        />
+      );
     }
 
     const handlers = {
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index 6d2b93be5797e8..43ff015791fbf0 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -19,7 +19,6 @@
   "account.block_domain": "Block domain {domain}",
   "account.block_short": "Block",
   "account.blocked": "Blocked",
-  "account.browse_more_on_origin_server": "Browse more on the original profile",
   "account.cancel_follow_request": "Cancel follow",
   "account.copy": "Copy link to profile",
   "account.direct": "Privately mention @{name}",
@@ -349,6 +348,14 @@
   "hashtag.follow": "Follow hashtag",
   "hashtag.unfollow": "Unfollow hashtag",
   "hashtags.and_other": "…and {count, plural, other {# more}}",
+  "hints.profiles.followers_may_be_missing": "Followers for this profile may be missing.",
+  "hints.profiles.follows_may_be_missing": "Follows for this profile may be missing.",
+  "hints.profiles.posts_may_be_missing": "Some posts from this profile may be missing.",
+  "hints.profiles.see_more_followers": "See more followers on {domain}",
+  "hints.profiles.see_more_follows": "See more follows on {domain}",
+  "hints.profiles.see_more_posts": "See more posts on {domain}",
+  "hints.threads.replies_may_be_missing": "Replies from other servers may be missing.",
+  "hints.threads.see_more": "See more replies on {domain}",
   "home.column_settings.show_reblogs": "Show boosts",
   "home.column_settings.show_replies": "Show replies",
   "home.hide_announcements": "Hide announcements",
@@ -826,11 +833,6 @@
   "time_remaining.minutes": "{number, plural, one {# minute} other {# minutes}} left",
   "time_remaining.moments": "Moments remaining",
   "time_remaining.seconds": "{number, plural, one {# second} other {# seconds}} left",
-  "timeline_hint.remote_resource_not_displayed": "{resource} from other servers are not displayed.",
-  "timeline_hint.resources.followers": "Followers",
-  "timeline_hint.resources.follows": "Follows",
-  "timeline_hint.resources.replies": "Some replies",
-  "timeline_hint.resources.statuses": "Older posts",
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "Trending now",
   "ui.beforeunload": "Your draft will be lost if you leave Mastodon.",
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 4c47a8db6c91b7..b6e71cde41bfb7 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -4217,11 +4217,12 @@ a.status-card {
 
 .timeline-hint {
   text-align: center;
-  color: $darker-text-color;
-  padding: 15px;
+  color: $dark-text-color;
+  padding: 16px;
   box-sizing: border-box;
   width: 100%;
-  cursor: default;
+  font-size: 14px;
+  line-height: 21px;
 
   strong {
     font-weight: 500;
@@ -4238,10 +4239,10 @@ a.status-card {
       color: lighten($highlight-text-color, 4%);
     }
   }
-}
 
-.timeline-hint--with-descendants {
-  border-top: 1px solid var(--background-border-color);
+  &--with-descendants {
+    border-top: 1px solid var(--background-border-color);
+  }
 }
 
 .regeneration-indicator {

From 3994195fea28d00611231da84c64eebcb277c7a8 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 21 Aug 2024 07:19:16 +0000
Subject: [PATCH 1907/2191] New Crowdin Translations (automated) (#31521)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/de.json    | 10 ++++
 app/javascript/mastodon/locales/es-AR.json | 10 ++++
 app/javascript/mastodon/locales/es-MX.json |  2 +
 app/javascript/mastodon/locales/es.json    |  2 +
 app/javascript/mastodon/locales/fi.json    |  2 +-
 app/javascript/mastodon/locales/fo.json    | 10 ++++
 app/javascript/mastodon/locales/gl.json    | 10 ++++
 app/javascript/mastodon/locales/hu.json    | 10 ++++
 app/javascript/mastodon/locales/is.json    | 10 ++++
 app/javascript/mastodon/locales/ja.json    | 27 +++++++----
 app/javascript/mastodon/locales/ko.json    | 24 +++++++---
 app/javascript/mastodon/locales/lt.json    | 10 ++++
 app/javascript/mastodon/locales/nl.json    | 10 ++++
 app/javascript/mastodon/locales/ru.json    |  2 +
 app/javascript/mastodon/locales/sl.json    |  3 ++
 app/javascript/mastodon/locales/sq.json    | 10 ++++
 app/javascript/mastodon/locales/tr.json    | 10 ++++
 app/javascript/mastodon/locales/uk.json    | 10 ++++
 config/locales/devise.ko.yml               |  2 +-
 config/locales/gl.yml                      |  2 +-
 config/locales/ko.yml                      | 55 +++++++++++++++++++---
 config/locales/ru.yml                      |  6 +++
 config/locales/simple_form.gl.yml          |  2 +-
 config/locales/simple_form.ru.yml          |  2 +
 24 files changed, 217 insertions(+), 24 deletions(-)

diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json
index 2d72740b4ae81c..b7872f0dea7b91 100644
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@@ -518,7 +518,17 @@
   "notification.status": "{name} hat gerade etwas gepostet",
   "notification.update": "{name} bearbeitete einen Beitrag",
   "notification_requests.accept": "Genehmigen",
+  "notification_requests.accept_multiple": "{count, plural, one {# Anfrage genehmigen …} other {# Anfragen genehmigen …}}",
+  "notification_requests.confirm_accept_multiple.button": "{count, plural, one {Anfrage genehmigen} other {Anfragen genehmigen}}",
+  "notification_requests.confirm_accept_multiple.message": "Du bist dabei, {{count, plural, one {eine Benachrichtigungsanfrage} other {# Benachrichtigungsanfragen}} zu genehmigen. Möchtest du wirklich fortfahren?",
+  "notification_requests.confirm_accept_multiple.title": "Benachrichtigungsanfragen genehmigen?",
+  "notification_requests.confirm_dismiss_multiple.button": "{count, plural, one {Anfrage ablehnen} other {Anfragen ablehnen}}",
+  "notification_requests.confirm_dismiss_multiple.message": "Du bist dabei, {count, plural, one {eine Benachrichtigungsanfrage} other {# Benachrichtigungsanfragen}} abzulehnen. Du wirst nicht mehr ohne Weiteres auf {count, plural, one {sie} other {sie}} zugreifen können. Möchtest du wirklich fortfahren?",
+  "notification_requests.confirm_dismiss_multiple.title": "Benachrichtigungsanfragen ablehnen?",
   "notification_requests.dismiss": "Ablehnen",
+  "notification_requests.dismiss_multiple": "{count, plural, one {# Anfrage ablehnen …} other {# Anfragen ablehnen …}}",
+  "notification_requests.edit_selection": "Bearbeiten",
+  "notification_requests.exit_selection": "Fertig",
   "notification_requests.explainer_for_limited_account": "Benachrichtigungen von diesem Konto wurden gefiltert, weil es durch Moderator*innen eingeschränkt wurde.",
   "notification_requests.explainer_for_limited_remote_account": "Benachrichtigungen von diesem Konto wurden gefiltert, weil deren Konto oder Server durch Moderator*innen eingeschränkt wurde.",
   "notification_requests.maximize": "Maximieren",
diff --git a/app/javascript/mastodon/locales/es-AR.json b/app/javascript/mastodon/locales/es-AR.json
index ba0a1a45b92313..779bf6344d6ff3 100644
--- a/app/javascript/mastodon/locales/es-AR.json
+++ b/app/javascript/mastodon/locales/es-AR.json
@@ -518,7 +518,17 @@
   "notification.status": "{name} acaba de enviar un mensaje",
   "notification.update": "{name} editó un mensaje",
   "notification_requests.accept": "Aceptar",
+  "notification_requests.accept_multiple": "{count, plural, one {Aceptar # solicitud…} other {Aceptar # solicitudes…}}",
+  "notification_requests.confirm_accept_multiple.button": "{count, plural, one {Aceptar solicitud} other {Aceptar solicitudes}}",
+  "notification_requests.confirm_accept_multiple.message": "Estás a punto de aceptar {count, plural, one {una solicitud} other {# solicitudes}}. ¿Estás seguro de que querés continuar?",
+  "notification_requests.confirm_accept_multiple.title": "¿Aceptar solicitudes de notificación?",
+  "notification_requests.confirm_dismiss_multiple.button": "{count, plural, one {Descartar solicitud} other {Descartar solicitudes}}",
+  "notification_requests.confirm_dismiss_multiple.message": "Estás a punto de descartar {count, plural, one {una solicitud} other {# solicitudes}}. No vas a poder acceder fácilmente a {count, plural, one {ella} other {ellas}} de nuevo. ¿Estás seguro de que querés continuar?",
+  "notification_requests.confirm_dismiss_multiple.title": "¿Descartar solicitudes de notificación?",
   "notification_requests.dismiss": "Descartar",
+  "notification_requests.dismiss_multiple": "{count, plural, one {Descartar # solicitud…} other {Descartar # solicitudes…}}",
+  "notification_requests.edit_selection": "Editar",
+  "notification_requests.exit_selection": "Listo",
   "notification_requests.explainer_for_limited_account": "Las notificaciones de esta cuenta fueron filtradas porque la misma fue limitada por un moderador.",
   "notification_requests.explainer_for_limited_remote_account": "Las notificaciones de esta cuenta fueron filtradas porque la cuenta o su servidor fueron limitados por un moderador.",
   "notification_requests.maximize": "Maximizar",
diff --git a/app/javascript/mastodon/locales/es-MX.json b/app/javascript/mastodon/locales/es-MX.json
index 3267b28d613aca..da1fc39fa499dc 100644
--- a/app/javascript/mastodon/locales/es-MX.json
+++ b/app/javascript/mastodon/locales/es-MX.json
@@ -518,6 +518,8 @@
   "notification.status": "{name} acaba de publicar",
   "notification.update": "{name} editó una publicación",
   "notification_requests.accept": "Aceptar",
+  "notification_requests.accept_multiple": "{count, plural, one {Aceptar # solicitud…} other {Aceptar # solicitudes…}}",
+  "notification_requests.confirm_accept_multiple.button": "{count, plural, one {Aceptar solicitud} other {Aceptar solicitudes}}",
   "notification_requests.dismiss": "Descartar",
   "notification_requests.explainer_for_limited_account": "Las notificaciones de esta cuenta han sido filtradas porque la cuenta ha sido limitada por un moderador.",
   "notification_requests.explainer_for_limited_remote_account": "Las notificaciones de esta cuenta han sido filtradas porque la cuenta o su servidor ha sido limitada por un moderador.",
diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json
index 04b46e166ade44..e77bf126932476 100644
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@@ -518,6 +518,8 @@
   "notification.status": "{name} acaba de publicar",
   "notification.update": "{name} editó una publicación",
   "notification_requests.accept": "Aceptar",
+  "notification_requests.accept_multiple": "{count, plural, one {Aceptar # solicitud…} other {Aceptar # solicitudes…}}",
+  "notification_requests.confirm_accept_multiple.button": "{count, plural, one {Aceptar solicitud} other {Aceptar solicitudes}}",
   "notification_requests.dismiss": "Descartar",
   "notification_requests.explainer_for_limited_account": "Las notificaciones de esta cuenta han sido filtradas porque la cuenta ha sido limitada por un moderador.",
   "notification_requests.explainer_for_limited_remote_account": "Las notificaciones de esta cuenta han sido filtradas porque la cuenta o su servidor ha sido limitada por un moderador.",
diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index 1dc3872b09ad39..2cae2d6def46bd 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -477,7 +477,7 @@
   "navigation_bar.logout": "Kirjaudu ulos",
   "navigation_bar.mutes": "Mykistetyt käyttäjät",
   "navigation_bar.opened_in_classic_interface": "Julkaisut, profiilit ja tietyt muut sivut avautuvat oletuksena perinteiseen selainkäyttöliittymään.",
-  "navigation_bar.personal": "Henkilökohtainen",
+  "navigation_bar.personal": "Henkilökohtaiset",
   "navigation_bar.pins": "Kiinnitetyt julkaisut",
   "navigation_bar.preferences": "Asetukset",
   "navigation_bar.public_timeline": "Yleinen aikajana",
diff --git a/app/javascript/mastodon/locales/fo.json b/app/javascript/mastodon/locales/fo.json
index beabf7fa3b464b..650dd9b0a2b228 100644
--- a/app/javascript/mastodon/locales/fo.json
+++ b/app/javascript/mastodon/locales/fo.json
@@ -518,7 +518,17 @@
   "notification.status": "{name} hevur júst postað",
   "notification.update": "{name} rættaði ein post",
   "notification_requests.accept": "Góðtak",
+  "notification_requests.accept_multiple": "{count, plural, one {Góðtak # umbøn…} other {Góðtak # umbønir…}}",
+  "notification_requests.confirm_accept_multiple.button": "{count, plural, one {Góðtak umbøn} other {Góðtak umbønir}}",
+  "notification_requests.confirm_accept_multiple.message": "Tú er í ferð við at góðtaka {count, plural, one {eina fráboðanarumbøn} other {# fráboðanarumbønir}}. Er tú vís/ur í, at tú vil halda fram?",
+  "notification_requests.confirm_accept_multiple.title": "Góðtak fráboðanarumbønir?",
+  "notification_requests.confirm_dismiss_multiple.button": "{count, plural, one {Avvís umbøn} other {Avvís umbønir}}",
+  "notification_requests.confirm_dismiss_multiple.message": "Tú er í ferð við at avvísa {count, plural, one {eina fráboðanarumbøn} other {# fráboðanarumbønir}}. Tað verður ikki lætt hjá tær at fáa fatur á {count, plural, one {henni} other {teimum}} aftur. Er tú vís/ur í at tú vil halda fram?",
+  "notification_requests.confirm_dismiss_multiple.title": "Avvís fráboðanarumbønir?",
   "notification_requests.dismiss": "Avvís",
+  "notification_requests.dismiss_multiple": "{count, plural, one {Avvís # umbøn…} other {Avvís # umbønir…}}",
+  "notification_requests.edit_selection": "Rætta",
+  "notification_requests.exit_selection": "Liðugt",
   "notification_requests.explainer_for_limited_account": "Fráboðanir frá hesi kontuni eru filtreraðar burtur, tí kontan er avmarkað av einum umsjónarfólki.",
   "notification_requests.explainer_for_limited_remote_account": "Fráboðanir frá hesi kontuni eru filtreraðar burtur, tí kontan ella ambætarin hjá kontuni eru avmarkaði av einum umsjónarfólki.",
   "notification_requests.maximize": "Mesta",
diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json
index 1c694bf13d2907..a87f316d700c67 100644
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@@ -518,7 +518,17 @@
   "notification.status": "{name} publicou",
   "notification.update": "{name} editou unha publicación",
   "notification_requests.accept": "Aceptar",
+  "notification_requests.accept_multiple": "{count, plural, one {Aceptar # solicitude…} other {Aceptar # solicitudes…}}",
+  "notification_requests.confirm_accept_multiple.button": "{count, plural, one {Aceptar solicitude} other {Aceptar solicitudes}}",
+  "notification_requests.confirm_accept_multiple.message": "Vas aceptar {count, plural, one {unha solicitude de notificación} other {# solicitudes de notificación}}. Tes certeza de querer aceptar?",
+  "notification_requests.confirm_accept_multiple.title": "Aceptar solicitudes de notificación?",
+  "notification_requests.confirm_dismiss_multiple.button": "{count, plural, one {Rexeitar solicitude} other {Rexeitar solicitudes}}",
+  "notification_requests.confirm_dismiss_multiple.message": "Vas rexeitar {count, plural, one {unha solicitude de notificación} other {# solicitudes de notificación}}. Non poderás volver acceder fácilmente a {count, plural, one {ela} other {elas}}. Tes certeza de querer rexeitar?",
+  "notification_requests.confirm_dismiss_multiple.title": "Rexeitar solicitudes de notificación?",
   "notification_requests.dismiss": "Desbotar",
+  "notification_requests.dismiss_multiple": "{count, plural, one {Rexeitar # solicitude…} other {Rexeitar # solicitudes…}}",
+  "notification_requests.edit_selection": "Editar",
+  "notification_requests.exit_selection": "Feito",
   "notification_requests.explainer_for_limited_account": "Filtráronse as notificacións desta conta porque a conta ten limitacións impostas pola moderación.",
   "notification_requests.explainer_for_limited_remote_account": "Filtráronse as notificacións desta conta porque a conta ou o seu servidor teñen limitacións impostas pola moderación.",
   "notification_requests.maximize": "Maximizar",
diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json
index c3e568c780671b..459e3f16a1b7f3 100644
--- a/app/javascript/mastodon/locales/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@@ -518,7 +518,17 @@
   "notification.status": "{name} bejegyzést tett közzé",
   "notification.update": "{name} szerkesztett egy bejegyzést",
   "notification_requests.accept": "Elfogadás",
+  "notification_requests.accept_multiple": "{count, plural, one {# kérés elfogadása…} other {# kérés elfogadása…}}",
+  "notification_requests.confirm_accept_multiple.button": "{count, plural, one {Kérés elfogadása} other {Kérések elfogadása}}",
+  "notification_requests.confirm_accept_multiple.message": "Elfogadni készülsz {count, plural, one {egy értesítési kérést} other {# értesítési kérést}}. Biztosan folytatod?",
+  "notification_requests.confirm_accept_multiple.title": "Értesítési kérések elfogadása?",
+  "notification_requests.confirm_dismiss_multiple.button": "{count, plural, one {Kérés elvetése} other {Kérések elvetése}}",
+  "notification_requests.confirm_dismiss_multiple.message": "{count, plural, one {Egy értesítési kérés} other {# értesítési kérés}} elvetésére készülsz. Többé nem fogsz {count, plural, one {hozzáférni} other {hozzájuk férni}}. Biztosan folytatod?",
+  "notification_requests.confirm_dismiss_multiple.title": "Értesítési kérések elvetése?",
   "notification_requests.dismiss": "Elvetés",
+  "notification_requests.dismiss_multiple": "{count, plural, one {# kérés elvetése…} other {# kérés elvetése…}}",
+  "notification_requests.edit_selection": "Szerkesztés",
+  "notification_requests.exit_selection": "Kész",
   "notification_requests.explainer_for_limited_account": "Az ettől a fióktól származó értesítéseket kiszűrték, mert a fiókot egy moderátor korlátozta.",
   "notification_requests.explainer_for_limited_remote_account": "Az ettől a fióktól származó értesítéseket kiszűrték, mert a fiókot vagy annak kiszolgálóját egy moderátor korlátozta.",
   "notification_requests.maximize": "Maximalizálás",
diff --git a/app/javascript/mastodon/locales/is.json b/app/javascript/mastodon/locales/is.json
index 2cfe8a7c640db7..d2edefdecb23bf 100644
--- a/app/javascript/mastodon/locales/is.json
+++ b/app/javascript/mastodon/locales/is.json
@@ -518,7 +518,17 @@
   "notification.status": "{name} sendi inn rétt í þessu",
   "notification.update": "{name} breytti færslu",
   "notification_requests.accept": "Samþykkja",
+  "notification_requests.accept_multiple": "{count, plural, one {Samþykkja # beiðni…} other {Samþykkja # beiðnir…}}",
+  "notification_requests.confirm_accept_multiple.button": "{count, plural, one {Samþykkja beiðni} other {Samþykkja beiðnir}}",
+  "notification_requests.confirm_accept_multiple.message": "Þú ert að fara að samþykkja {count, plural, one {eina beiðni um tilkynningar} other {# beiðnir um tilkynningar}}. Ertu viss um að þú viljir halda áfram?",
+  "notification_requests.confirm_accept_multiple.title": "Samþykkja beiðnir um tilkynningar?",
+  "notification_requests.confirm_dismiss_multiple.button": "{count, plural, one {Afgreiða beiðni} other {Afgreiða beiðnir}}",
+  "notification_requests.confirm_dismiss_multiple.message": "Þú ert að fara að hunsa {count, plural, one {eina beiðni um tilkynningar} other {# beiðnir um tilkynningar}}. Þú munt ekki eiga auðvelt með að skoða {count, plural, one {hana} other {þær}} aftur síðar. Ertu viss um að þú viljir halda áfram?",
+  "notification_requests.confirm_dismiss_multiple.title": "Hunsa beiðnir um tilkynningar?",
   "notification_requests.dismiss": "Afgreiða",
+  "notification_requests.dismiss_multiple": "{count, plural, one {Afgreiða # beiðni…} other {Afgreiða # beiðnir…}}",
+  "notification_requests.edit_selection": "Breyta",
+  "notification_requests.exit_selection": "Lokið",
   "notification_requests.explainer_for_limited_account": "Tilkynningar frá þessum notanda hafa verið síaðar þar sem aðgangur hans hefur verið takmarkaður af umsjónarmanni.",
   "notification_requests.explainer_for_limited_remote_account": "Tilkynningar frá þessum notanda hafa verið síaðar þar sem aðgangurinn eða netþjónn hans hefur verið takmarkaður af umsjónarmanni.",
   "notification_requests.maximize": "Hámarka",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index 610a71ef563b52..953bb55c166332 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -11,6 +11,7 @@
   "about.not_available": "この情報はこのサーバーでは利用できません。",
   "about.powered_by": "{mastodon}による分散型ソーシャルメディア",
   "about.rules": "サーバーのルール",
+  "account.account_note_header": "自分用メモ",
   "account.add_or_remove_from_list": "リストから追加または外す",
   "account.badges.bot": "Bot",
   "account.badges.group": "Group",
@@ -533,14 +534,23 @@
   "notifications.permission_denied": "ブラウザの通知が拒否されているためデスクトップ通知は利用できません",
   "notifications.permission_denied_alert": "ブラウザの通知が拒否されているためデスクトップ通知を有効にできません",
   "notifications.permission_required": "必要な権限が付与されていないため、デスクトップ通知は利用できません。",
-  "notifications.policy.filter_new_accounts.hint": "作成から{days, plural, other {#日}}以内のアカウントからの通知がブロックされます",
-  "notifications.policy.filter_new_accounts_title": "新しいアカウントからの通知をブロックする",
-  "notifications.policy.filter_not_followers_hint": "フォローされていても、フォローから{days, plural, other {#日}}経っていない場合はブロックされます",
-  "notifications.policy.filter_not_followers_title": "フォローされていないアカウントからの通知をブロックする",
-  "notifications.policy.filter_not_following_hint": "手動で通知を受け入れたアカウントはブロックされません",
-  "notifications.policy.filter_not_following_title": "フォローしていないアカウントからの通知をブロックする",
-  "notifications.policy.filter_private_mentions_hint": "あなたがメンションした相手からの返信、およびフォローしているアカウントからの返信以外がブロックされます",
-  "notifications.policy.filter_private_mentions_title": "外部からの非公開の返信をブロックする",
+  "notifications.policy.accept": "受入れ",
+  "notifications.policy.accept_hint": "通知を表示します",
+  "notifications.policy.drop": "無視",
+  "notifications.policy.drop_hint": "通知を破棄します。再表示はできません。",
+  "notifications.policy.filter": "保留",
+  "notifications.policy.filter_hint": "「保留中の通知」に止め置きます",
+  "notifications.policy.filter_limited_accounts_hint": "モデレーターにより制限されたアカウントから送られる通知が対象です",
+  "notifications.policy.filter_limited_accounts_title": "モデレーションされたアカウントからの通知",
+  "notifications.policy.filter_new_accounts.hint": "作成から{days, plural, other {#日}}以内のアカウントが対象です",
+  "notifications.policy.filter_new_accounts_title": "新しいアカウントからの通知",
+  "notifications.policy.filter_not_followers_hint": "フォローされていても、フォローから{days, plural, other {#日}}経っていない場合は対象になります",
+  "notifications.policy.filter_not_followers_title": "フォローされていないアカウントからの通知",
+  "notifications.policy.filter_not_following_hint": "手動で通知を受け入れたアカウントは対象外です",
+  "notifications.policy.filter_not_following_title": "フォローしていないアカウントからの通知",
+  "notifications.policy.filter_private_mentions_hint": "あなたがメンションした相手からの返信、およびフォローしているアカウントからの返信は対象外です",
+  "notifications.policy.filter_private_mentions_title": "外部からの非公開の返信",
+  "notifications.policy.title": "通知のフィルタリング",
   "notifications_permission_banner.enable": "デスクトップ通知を有効にする",
   "notifications_permission_banner.how_to_control": "Mastodonを閉じている間でも通知を受信するにはデスクトップ通知を有効にしてください。有効にすると上の {icon} ボタンから通知の内容を細かくカスタマイズできます。",
   "notifications_permission_banner.title": "お見逃しなく",
@@ -781,6 +791,7 @@
   "timeline_hint.remote_resource_not_displayed": "他のサーバーの{resource}は表示されません。",
   "timeline_hint.resources.followers": "フォロワー",
   "timeline_hint.resources.follows": "フォロー",
+  "timeline_hint.resources.replies": "返信の一部",
   "timeline_hint.resources.statuses": "以前の投稿",
   "trends.counter_by_accounts": "過去{days, plural, one {{days}日} other {{days}日}}に{count, plural, one {{counter}人} other {{counter} 人}}",
   "trends.trending_now": "トレンドタグ",
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index 2e929040f445b9..dd10d132cbe0a2 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -348,7 +348,7 @@
   "hashtag.counter_by_uses_today": "오늘 {count, plural, other {{counter} 개의 게시물}}",
   "hashtag.follow": "팔로우",
   "hashtag.unfollow": "팔로우 해제",
-  "hashtags.and_other": "…그리고 {count, plural,other {#개 더}}",
+  "hashtags.and_other": "…그리고 {count, plural,other {# 개 더}}",
   "home.column_settings.show_reblogs": "부스트 표시",
   "home.column_settings.show_replies": "답글 표시",
   "home.hide_announcements": "공지사항 숨기기",
@@ -359,6 +359,8 @@
   "ignore_notifications_modal.disclaimer": "마스토돈은 당신이 그들의 알림을 무시했다는 걸 알려줄 수 없습니다. 알림을 무시한다고 해서 메시지가 오지 않는 것은 아닙니다.",
   "ignore_notifications_modal.filter_instead": "대신 필터로 거르기",
   "ignore_notifications_modal.filter_to_act_users": "여전히 사용자를 수락, 거절, 신고할 수 있습니다",
+  "ignore_notifications_modal.filter_to_avoid_confusion": "필터링은 혼란을 예방하는데 도움이 될 수 있습니다",
+  "ignore_notifications_modal.filter_to_review_separately": "걸러진 알림들을 개별적으로 검토할 수 있습니다",
   "ignore_notifications_modal.ignore": "알림 무시",
   "ignore_notifications_modal.limited_accounts_title": "중재된 계정의 알림을 무시할까요?",
   "ignore_notifications_modal.new_accounts_title": "새 계정의 알림을 무시할까요?",
@@ -441,7 +443,7 @@
   "lists.replies_policy.title": "답글 표시:",
   "lists.search": "팔로우 중인 사람들 중에서 찾기",
   "lists.subheading": "리스트",
-  "load_pending": "{count}개의 새 항목",
+  "load_pending": "{count, plural, other {#}} 개의 새 항목",
   "loading_indicator.label": "불러오는 중...",
   "media_gallery.toggle_visible": "이미지 숨기기",
   "moved_to_account_banner.text": "당신의 계정 {disabledAccount}는 {movedToAccount}로 이동하였기 때문에 현재 비활성화 상태입니다.",
@@ -516,7 +518,17 @@
   "notification.status": "{name} 님이 방금 게시물을 올렸습니다",
   "notification.update": "{name} 님이 게시물을 수정했습니다",
   "notification_requests.accept": "수락",
+  "notification_requests.accept_multiple": "{count, plural, other {#}} 개의 요청 수락하기",
+  "notification_requests.confirm_accept_multiple.button": "{count, plural, other {}}요청 수락하기",
+  "notification_requests.confirm_accept_multiple.message": "{count, plural, other {#}} 개의 요청을 수락하려고 합니다. 계속 진행할까요?",
+  "notification_requests.confirm_accept_multiple.title": "알림 요청을 수락할까요?",
+  "notification_requests.confirm_dismiss_multiple.button": "{count, plural, other {요청 지우기}}",
+  "notification_requests.confirm_dismiss_multiple.message": "{count, plural, other {# 개의 요청}}을 지우려고 합니다. {count, plural, other {}}다시 접근하기 어렵습니다. 계속할까요?",
+  "notification_requests.confirm_dismiss_multiple.title": "알림 요청을 지울까요?",
   "notification_requests.dismiss": "지우기",
+  "notification_requests.dismiss_multiple": "{count, plural, other {# 개의 요청 지우기}}",
+  "notification_requests.edit_selection": "편집",
+  "notification_requests.exit_selection": "완료",
   "notification_requests.explainer_for_limited_account": "이 계정은 중재자에 의해 제한되었기 때문에 이 계정의 알림은 걸러졌습니다.",
   "notification_requests.explainer_for_limited_remote_account": "이 계정 혹은 그가 속한 서버는 중재자에 의해 제한되었기 때문에 이 계정의 알림은 걸러졌습니다.",
   "notification_requests.maximize": "최대화",
@@ -624,8 +636,8 @@
   "poll.closed": "마감",
   "poll.refresh": "새로고침",
   "poll.reveal": "결과 보기",
-  "poll.total_people": "{count}명",
-  "poll.total_votes": "{count} 표",
+  "poll.total_people": "{count, plural, other {#}} 명",
+  "poll.total_votes": "{count, plural, other {#}} 표",
   "poll.vote": "투표",
   "poll.voted": "이 답변에 투표함",
   "poll.votes": "{votes} 표",
@@ -658,7 +670,7 @@
   "relative_time.minutes": "{number}분 전",
   "relative_time.seconds": "{number}초 전",
   "relative_time.today": "오늘",
-  "reply_indicator.attachments": "{count, plural, one {#} other {#}}개의 첨부파일",
+  "reply_indicator.attachments": "{count, plural, other {#}} 개의 첨부파일",
   "reply_indicator.cancel": "취소",
   "reply_indicator.poll": "투표",
   "report.block": "차단",
@@ -758,7 +770,7 @@
   "status.direct_indicator": "개인적인 멘션",
   "status.edit": "수정",
   "status.edited": "{date}에 마지막으로 편집됨",
-  "status.edited_x_times": "{count}번 수정됨",
+  "status.edited_x_times": "{count, plural, other {{count}}} 번 수정됨",
   "status.embed": "임베드",
   "status.favourite": "좋아요",
   "status.favourites": "{count, plural, other {좋아요}}",
diff --git a/app/javascript/mastodon/locales/lt.json b/app/javascript/mastodon/locales/lt.json
index 174d3033c799f9..680dc9958effa6 100644
--- a/app/javascript/mastodon/locales/lt.json
+++ b/app/javascript/mastodon/locales/lt.json
@@ -516,7 +516,17 @@
   "notification.status": "{name} ką tik paskelbė",
   "notification.update": "{name} redagavo įrašą",
   "notification_requests.accept": "Priimti",
+  "notification_requests.accept_multiple": "{count, plural, one {Priimti # prašymą…} few {Priimti # prašymus…} many {Priimti # prašymo…} other {Priimti # prašymų…}}",
+  "notification_requests.confirm_accept_multiple.button": "{count, plural, one {Priimti prašymą} few {Priimti prašymus} many {Priimti prašymo} other {Priimti prašymų}}",
+  "notification_requests.confirm_accept_multiple.message": "Ketini priimti {count, plural, one {# pranešimo prašymą} few {# pranešimų prašymus} many {# pranešimo prašymo} other {# pranešimų prašymų}}. Ar tikrai nori tęsti?",
+  "notification_requests.confirm_accept_multiple.title": "Priimti pranešimų prašymus?",
+  "notification_requests.confirm_dismiss_multiple.button": "{count, plural, one {Atmesti prašymą} few {Atmesti prašymus} many {Atmesti prašymo} other {Atmesti prašymų}}",
+  "notification_requests.confirm_dismiss_multiple.message": "Ketini atmesti {count, plural, one {# pranešimo prašymą} few {# pranešimų prašymus} many {# pranešimo prašymo} other {# pranešimų prašymų}}. Daugiau negalėsi lengvai pasiekti {count, plural, one {jo} few {jų} many {juos} other {jų}}. Ar tikrai nori tęsti?",
+  "notification_requests.confirm_dismiss_multiple.title": "Atmesti pranešimų prašymus?",
   "notification_requests.dismiss": "Atmesti",
+  "notification_requests.dismiss_multiple": "{count, plural, one {Atmesti prašymą…} few {Atmesti prašymus…} many {Atmesti prašymo…} other {Atmesti prašymų…}}",
+  "notification_requests.edit_selection": "Redaguoti",
+  "notification_requests.exit_selection": "Atlikta",
   "notification_requests.explainer_for_limited_account": "Pranešimai iš šios paskyros buvo filtruojami, nes prižiūrėtojas (-a) apribojo paskyrą.",
   "notification_requests.explainer_for_limited_remote_account": "Pranešimai iš šios paskyros buvo filtruojami, nes prižiūrėtojas (-a) apribojo paskyrą arba serverį.",
   "notification_requests.maximize": "Padidinti",
diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json
index a8a6b23f86fb54..de9d80885ec2f8 100644
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@@ -518,7 +518,17 @@
   "notification.status": "{name} heeft zojuist een bericht geplaatst",
   "notification.update": "{name} heeft een bericht bewerkt",
   "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}}",
+  "notification_requests.confirm_accept_multiple.message": "Je staat op het punt om {count, plural, one {een meldingsverzoek} other {# meldingsverzoeken}} te accepteren. Weet je zeker dat je door wilt gaan?",
+  "notification_requests.confirm_accept_multiple.title": "Meldingsverzoeken accepteren?",
+  "notification_requests.confirm_dismiss_multiple.button": "{count, plural, one {Verzoek afwijzen} other {Verzoeken afwijzen}}",
+  "notification_requests.confirm_dismiss_multiple.message": "Je staat op het punt om {count, plural, one {een meldingsverzoek} other {# meldingsverzoeken}} af te wijzen. Je zult niet in staat zijn om {count, plural, one {hier} other {hier}} weer gemakkelijk toegang toe te krijgen. Wil je doorgaan?",
+  "notification_requests.confirm_dismiss_multiple.title": "Meldingsverzoeken afwijzen?",
   "notification_requests.dismiss": "Afwijzen",
+  "notification_requests.dismiss_multiple": "{count, plural, one {# verzoek afwijzen…} other {# verzoeken afwijzen…}}",
+  "notification_requests.edit_selection": "Bewerken",
+  "notification_requests.exit_selection": "Klaar",
   "notification_requests.explainer_for_limited_account": "Meldingen van dit account zijn gefilterd omdat dit account door een moderator is beperkt.",
   "notification_requests.explainer_for_limited_remote_account": "Meldingen van dit account zijn gefilterd omdat dit account of diens server door een moderator is beperkt.",
   "notification_requests.maximize": "Maximaliseren",
diff --git a/app/javascript/mastodon/locales/ru.json b/app/javascript/mastodon/locales/ru.json
index 288575286bc55d..8fc4b0a127e865 100644
--- a/app/javascript/mastodon/locales/ru.json
+++ b/app/javascript/mastodon/locales/ru.json
@@ -189,6 +189,7 @@
   "confirmations.reply.title": "Перепишем пост?",
   "confirmations.unfollow.confirm": "Отписаться",
   "confirmations.unfollow.message": "Вы уверены, что хотите отписаться от {name}?",
+  "confirmations.unfollow.title": "Отписаться?",
   "conversation.delete": "Удалить беседу",
   "conversation.mark_as_read": "Отметить как прочитанное",
   "conversation.open": "Просмотр беседы",
@@ -351,6 +352,7 @@
   "home.pending_critical_update.link": "Посмотреть обновления",
   "home.pending_critical_update.title": "Доступно критическое обновление безопасности!",
   "home.show_announcements": "Показать объявления",
+  "ignore_notifications_modal.filter_to_act_users": "Вы и далее сможете принять, отвергнуть и жаловаться на пользователей",
   "interaction_modal.description.favourite": "С учётной записью Mastodon, вы можете добавить этот пост в избранное, чтобы сохранить его на будущее и дать автору знать, что пост вам понравился.",
   "interaction_modal.description.follow": "С учётной записью Mastodon вы можете подписаться на {name}, чтобы получать их посты в своей домашней ленте.",
   "interaction_modal.description.reblog": "С учётной записью Mastodon, вы можете продвинуть этот пост, чтобы поделиться им со своими подписчиками.",
diff --git a/app/javascript/mastodon/locales/sl.json b/app/javascript/mastodon/locales/sl.json
index 1f2d9c4cdfd610..932d9524df96bb 100644
--- a/app/javascript/mastodon/locales/sl.json
+++ b/app/javascript/mastodon/locales/sl.json
@@ -487,6 +487,7 @@
   "notification.label.private_mention": "Zasebna omemba",
   "notification.label.private_reply": "Zasebni odgovor",
   "notification.label.reply": "Odgovori",
+  "notification.mention": "Omemba",
   "notification.moderation-warning.learn_more": "Več o tem",
   "notification.moderation_warning": "Prejeli ste opozorilo moderatorjev",
   "notification.moderation_warning.action_delete_statuses": "Nekatere vaše objave so odstranjene.",
@@ -508,6 +509,8 @@
   "notification.update": "{name} je uredil(a) objavo",
   "notification_requests.accept": "Sprejmi",
   "notification_requests.dismiss": "Zavrni",
+  "notification_requests.edit_selection": "Uredi",
+  "notification_requests.exit_selection": "Opravljeno",
   "notification_requests.maximize": "Maksimiraj",
   "notification_requests.notifications_from": "Obvestila od {name}",
   "notification_requests.title": "Filtrirana obvestila",
diff --git a/app/javascript/mastodon/locales/sq.json b/app/javascript/mastodon/locales/sq.json
index 3fe22e4df5e22f..3dc3c00c092ebe 100644
--- a/app/javascript/mastodon/locales/sq.json
+++ b/app/javascript/mastodon/locales/sq.json
@@ -518,7 +518,17 @@
   "notification.status": "{name} sapo postoi",
   "notification.update": "{name} përpunoi një postim",
   "notification_requests.accept": "Pranoje",
+  "notification_requests.accept_multiple": "{count, plural, one {Pranoni # kërkesë…} other {Pranoni # kërkesa…}}",
+  "notification_requests.confirm_accept_multiple.button": "{count, plural, one {Pranojeni kërkesën} other {Pranoje kërkesën}}",
+  "notification_requests.confirm_accept_multiple.message": "Ju ndan një hap nga pranimi i {count, plural, one {një kërkese njoftimi} other {# kërkesash njoftimi}}. Jeni i sigurt se doni të vazhdohet?",
+  "notification_requests.confirm_accept_multiple.title": "Të pranohen kërkesa njoftimesh?",
+  "notification_requests.confirm_dismiss_multiple.button": "{count, plural, one {Hidheni tej kërkesën} other {Hidhini tej kërkesat}}",
+  "notification_requests.confirm_dismiss_multiple.message": "Ju ndan një hap nga hedhja tej e {count, plural, one {një kërkese njoftimesh} other {# kërkesash njoftimesh}}. S’do të jeni në gjendje të shihni sërish {count, plural, one {atë} other {ato}}. Jeni i sigurt se doni të bëhet kjo?",
+  "notification_requests.confirm_dismiss_multiple.title": "Të hidhen tej kërkesa njoftimesh?",
   "notification_requests.dismiss": "Hidhe tej",
+  "notification_requests.dismiss_multiple": "{count, plural, one {Hidhni tej # kërkesë…} other {Hidhni tej # kërkesa…}}",
+  "notification_requests.edit_selection": "Përpunoni",
+  "notification_requests.exit_selection": "U bë",
   "notification_requests.explainer_for_limited_account": "Njoftimet prej kësaj llogarie janë filtruar, ngaqë llogaria është kufizuar nga një moderator.",
   "notification_requests.explainer_for_limited_remote_account": "Njoftimet prej kësaj llogarie janë filtruar, ngaqë llogaria, ose shërbyesi është kufizuar nga një moderator.",
   "notification_requests.maximize": "Maksimizoje",
diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json
index adada095b130b1..ac20d80cfadbe9 100644
--- a/app/javascript/mastodon/locales/tr.json
+++ b/app/javascript/mastodon/locales/tr.json
@@ -518,7 +518,17 @@
   "notification.status": "{name} az önce gönderdi",
   "notification.update": "{name} bir gönderiyi düzenledi",
   "notification_requests.accept": "Onayla",
+  "notification_requests.accept_multiple": "{count, plural, one {# isteği kabul et…} other {# isteği kabul et…}}",
+  "notification_requests.confirm_accept_multiple.button": "{count, plural, one {İsteği kabul et} other {İstekleri kabul et}}",
+  "notification_requests.confirm_accept_multiple.message": "{count, plural, one {Bir bildirim isteğini} other {# bildirim isteğini}} kabul etmek üzeresiniz. Devam etmek istediğinizden emin misiniz?",
+  "notification_requests.confirm_accept_multiple.title": "Bildirim isteklerini kabul et?",
+  "notification_requests.confirm_dismiss_multiple.button": "{count, plural, one {İsteği reddet} other {İstekleri reddet}}",
+  "notification_requests.confirm_dismiss_multiple.message": "{count, plural, one {Bir bildirim isteğini} other {# bildirim isteğini}} reddetmek üzeresiniz. {count, plural, one {Ona} other {Onlara}} tekrar kolayca ulaşamayacaksınz. Devam etmek istediğinizden emin misiniz?",
+  "notification_requests.confirm_dismiss_multiple.title": "Bildirim isteklerini reddet?",
   "notification_requests.dismiss": "Yoksay",
+  "notification_requests.dismiss_multiple": "{count, plural, one {# isteği reddet…} other {# isteği reddet…}}",
+  "notification_requests.edit_selection": "Düzenle",
+  "notification_requests.exit_selection": "Tamamlandı",
   "notification_requests.explainer_for_limited_account": "Hesap bir moderatör tarafından sınırlandığı için, bu hesaptan gönderilen bildirimler filtrelendi.",
   "notification_requests.explainer_for_limited_remote_account": "Hesap veya sunucusu bir moderatör tarafından sınırlandığı için, bu hesaptan gönderilen bildirimler filtrelendi.",
   "notification_requests.maximize": "Büyüt",
diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json
index 462b9fb171e938..acff4857eaa229 100644
--- a/app/javascript/mastodon/locales/uk.json
+++ b/app/javascript/mastodon/locales/uk.json
@@ -518,7 +518,17 @@
   "notification.status": "{name} щойно дописує",
   "notification.update": "{name} змінює допис",
   "notification_requests.accept": "Прийняти",
+  "notification_requests.accept_multiple": "{count, plural, one {Прийняти # запит…} few {Прийняти # запити…} many {Прийняти # запитів…} other {Прийняти # запит…}}",
+  "notification_requests.confirm_accept_multiple.button": "{count, plural, one {Прийняти запит} other {Прийняти запити}}",
+  "notification_requests.confirm_accept_multiple.message": "Ви збираєтеся прийняти {count, plural, one {запит на сповіщення} few {# запити на сповіщення} many {# запитів на сповіщення} other {# запит на сповіщення}}. Ви впевнені, що хочете продовжити?",
+  "notification_requests.confirm_accept_multiple.title": "Прийняти запит на сповіщення?",
+  "notification_requests.confirm_dismiss_multiple.button": "{count, plural, one {Відхилити запит} other {Відхилити запити}}",
+  "notification_requests.confirm_dismiss_multiple.message": "Ви збираєтеся відхилити {count, plural, one {один запит на сповіщення} few {# запити на сповіщення} many {# запитів на сповіщення} other {# запит на сповіщення}}. Ви не зможете легко отримати доступ до {count, plural, one {нього} other {них}} пізніше. Ви впевнені, що хочете продовжити?",
+  "notification_requests.confirm_dismiss_multiple.title": "Відхилити запити на сповіщення?",
   "notification_requests.dismiss": "Відхилити",
+  "notification_requests.dismiss_multiple": "{count, plural, one {Відхилити # запит…} few {Відхилити # запити…} many {Відхилити # запитів…} other {Відхилити # запит…}}",
+  "notification_requests.edit_selection": "Змінити",
+  "notification_requests.exit_selection": "Готово",
   "notification_requests.explainer_for_limited_account": "Сповіщення від цього облікового запису фільтровані, оскільки обліковий запис обмежений модератором.",
   "notification_requests.explainer_for_limited_remote_account": "Сповіщення від цього облікового запису фільтровані, оскільки обліковий запис або його сервер обмежений модератором.",
   "notification_requests.maximize": "Розгорнути",
diff --git a/config/locales/devise.ko.yml b/config/locales/devise.ko.yml
index 198d44a4f799b2..7ba5ffb9c8fd2f 100644
--- a/config/locales/devise.ko.yml
+++ b/config/locales/devise.ko.yml
@@ -117,4 +117,4 @@ ko:
       not_found: 찾을 수 없습니다
       not_locked: 잠기지 않았습니다
       not_saved:
-        other: "%{count}개의 에러로 인해 %{resource}가 저장 될 수 없습니다:"
+        other: "%{count} 개의 에러로 인해 %{resource}가 저장 될 수 없습니다:"
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 431bc1f915007a..c9382f05b3fbbb 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -493,7 +493,7 @@ gl:
       content_policies:
         comment: Nota interna
         description_html: Podes definir políticas acerca do contido que serán aplicadas a tódalas contas deste dominio e tódolos seus subdominios.
-        limited_federation_mode_description_html: Podes elexir se permites ou non a federación con este dominio.
+        limited_federation_mode_description_html: Podes escoller se permites ou non a federación con este dominio.
         policies:
           reject_media: Rexeitar multimedia
           reject_reports: Rexeitar denuncias
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index dc548c0f36bf82..7cbcb8201953d9 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -257,8 +257,10 @@ ko:
         destroy_user_role_html: "%{name} 님이 %{target} 역할을 삭제했습니다"
         disable_2fa_user_html: "%{name} 님이 사용자 %{target} 님의 2단계 인증을 비활성화 했습니다"
         disable_custom_emoji_html: "%{name} 님이 에모지 %{target}를 비활성화했습니다"
+        disable_sign_in_token_auth_user_html: "%{name} 님이 %{target} 님의 이메일 토큰 인증을 비활성화했습니다"
         disable_user_html: "%{name} 님이 사용자 %{target}의 로그인을 비활성화했습니다"
         enable_custom_emoji_html: "%{name} 님이 에모지 %{target}를 활성화했습니다"
+        enable_sign_in_token_auth_user_html: "%{name} 님이 %{target} 님의 이메일 토큰 인증을 활성화했습니다"
         enable_user_html: "%{name} 님이 사용자 %{target}의 로그인을 활성화했습니다"
         memorialize_account_html: "%{name} 님이 %{target}의 계정을 고인의 계정 페이지로 전환했습니다"
         promote_user_html: "%{name} 님이 사용자 %{target}를 승급시켰습니다"
@@ -266,6 +268,7 @@ ko:
         reject_user_html: "%{name} 님이 %{target} 님의 가입을 거부했습니다"
         remove_avatar_user_html: "%{name} 님이 %{target} 님의 아바타를 지웠습니다"
         reopen_report_html: "%{name} 님이 신고 %{target}을 다시 열었습니다"
+        resend_user_html: "%{name} 님이 %{target} 님에 대한 확인 메일을 다시 보냈습니다"
         reset_password_user_html: "%{name} 님이 사용자 %{target}의 암호를 초기화했습니다"
         resolve_report_html: "%{name} 님이 %{target}번 신고를 해결로 변경하였습니다"
         sensitive_account_html: "%{name} 님이 %{target}의 미디어를 민감함으로 표시했습니다"
@@ -423,6 +426,7 @@ ko:
       allow_registrations_with_approval: 승인을 통한 가입 허용
       attempts_over_week:
         other: 지난 주 동안 %{count}건의 가입 시도가 있었습니다
+      created_msg: 이메일 도메인 차단 규칙을 생성했습니다
       delete: 삭제하기
       dns:
         types:
@@ -432,7 +436,9 @@ ko:
         create: 도메인 추가하기
         resolve: 도메인 검사
         title: 새 이메일 도메인 차단
+      no_email_domain_block_selected: 아무 것도 선택 되지 않아 어떤 이메일 도메인 차단도 변경되지 않았습니다
       not_permitted: 허용하지 않음
+      resolved_dns_records_hint_html: 도메인 네임은 다음의 MX 도메인으로 연결되어 있으며, 이메일을 받는데 필수적입니다. MX 도메인을 차단하면 같은 MX 도메인을 사용하는 어떤 이메일이라도 가입할 수 없게 되며, 보여지는 도메인이 다르더라도 적용됩니다. <strong>주요 이메일 제공자를 차단하지 않도록 조심하세요.</strong>
       resolved_through_html: "%{domain}을 통해 리졸빙됨"
       title: 차단된 이메일 도메인
     export_domain_allows:
@@ -584,6 +590,7 @@ ko:
         resolve_description_html: 신고된 계정에 대해 아무런 동작도 취하지 않으며, 처벌기록이 남지 않으며, 신고는 처리됨으로 변경됩니다.
         silence_description_html: 이 계정을 이미 팔로우 하고 있는 사람이나 수동으로 찾아보는 사람에게만 프로필이 보여지고, 도달 범위를 엄격하게 제한합니다. 언제든지 되돌릴 수 있습니다. 이 계정에 대한 모든 신고를 닫습니다.
         suspend_description_html: 이 계정과 이 계정의 콘텐츠들은 접근 불가능해지고 삭제될 것이며, 상호작용은 불가능해집니다. 30일 이내에 되돌릴 수 있습니다. 이 계정에 대한 모든 신고를 닫습니다.
+      actions_description_html: 이 신고를 해결하기 위해 취해야 할 조치를 지정해주세요. 신고된 계정에 대해 처벌 조치를 취하면, <strong>스팸</strong> 카테고리가 선택된 경우를 제외하고 해당 계정으로 이메일 알림이 전송됩니다.
       actions_description_remote_html: 이 신고를 해결하기 위해 실행할 행동을 결정하세요. 이 결정은 이 원격 계정과 그 콘텐츠를 다루는 방식에 대해 <strong>이 서버</strong>에서만 영향을 끼칩니다
       add_to_report: 신고에 더 추가하기
       already_suspended_badges:
@@ -648,6 +655,7 @@ ko:
         delete_data_html: "<strong>@%{acct}</strong>의 프로필과 콘텐츠를 30일의 유예기간 이후에 삭제합니다"
         preview_preamble_html: "<strong>@%{acct}</strong>는 다음 내용의 경고를 받게 됩니다:"
         record_strike_html: 향후 규칙위반에 대한 참고사항이 될 수 있도록 <strong>@%{acct}</strong>에 대한 처벌기록을 남깁니다
+        send_email_html: "<strong>@%{acct}</strong>에게 경고 메일을 보냅니다"
         warning_placeholder: 중재 결정에 대한 추가적인 이유.
       target_origin: 신고된 계정의 소속
       title: 신고
@@ -685,6 +693,7 @@ ko:
         manage_appeals: 이의제기 관리
         manage_appeals_description: 사용자가 중재에 대한 이의제기를 리뷰할 수 있도록 허용
         manage_blocks: 차단 관리
+        manage_blocks_description: 사용자가 이메일 제공자와 IP 주소를 차단할 수 있도록 허용
         manage_custom_emojis: 커스텀 에모지 관리
         manage_custom_emojis_description: 사용자가 서버의 커스텀 에모지를 관리할 수 있도록 허용
         manage_federation: 연합 관리
@@ -702,6 +711,7 @@ ko:
         manage_taxonomies: 분류 관리
         manage_taxonomies_description: 사용자가 트렌드를 리뷰하고 해시태그 설정을 수정할 수 있도록 허용합니다
         manage_user_access: 사용자 접근 관리
+        manage_user_access_description: 사용자가 다른 사용자의 2차 인증을 비활성화 하거나, 이메일 주소를 바꾸거나, 암호를 초기화 할 수 있도록 허용
         manage_users: 사용자 관리
         manage_users_description: 사용자가 다른 사용자의 상세정보를 보고 해당 사용자에 대한 중재활동을 할 수 있도록 허용
         manage_webhooks: 웹훅 관리
@@ -776,6 +786,7 @@ ko:
       destroyed_msg: 사이트 업로드를 성공적으로 삭제했습니다!
     software_updates:
       critical_update: 긴급 — 빠른 업데이트 요망
+      description: 최신 수정 사항과 기능을 활용하기 위해 Mastodon 설치를 최신 상태로 유지하기를 권장합니다. 더욱이, 때로는 보안 문제를 피하기 위해 Mastodon을 적절한 시점에 긴급 업데이트해야 하는 경우도 있습니다. 따라서 Mastodon은 30분마다 업데이트를 확인하며, 이메일 알림 환경설정에 따라 사용자에게 알려드립니다.
       documentation_link: 더 알아보기
       release_notes: 릴리스 노트
       title: 사용 가능한 업데이트
@@ -884,12 +895,18 @@ ko:
     trends:
       allow: 허용
       approved: 승인됨
-      disallow: 거부
+      confirm_allow: 정말로 선택된 태그들을 허용하시겠습니까?
+      confirm_disallow: 정말로 선택된 태그들을 금지하시겠습니까?
+      disallow: 금지
       links:
         allow: 링크 허용
         allow_provider: 발행처 허용
+        confirm_allow: 정말로 선택된 링크들을 허용하시겠습니까?
+        confirm_allow_provider: 정말로 선택된 제공자들을 허용하시겠습니까?
+        confirm_disallow: 정말로 선택된 링크들을 금지하시겠습니까?
+        confirm_disallow_provider: 정말로 선택된 제공자들을 금지하시겠습니까?
         description_html: 현재 서버에서 게시물을 볼 수 있는 계정에서 많이 공유되고 있는 링크들입니다. 사용자가 세상 돌아가는 상황을 파악하는 데 도움이 됩니다. 출처를 승인할 때까지 링크는 공개적으로 게시되지 않습니다. 각각의 링크를 개별적으로 허용하거나 거부할 수도 있습니다.
-        disallow: 링크 거부
+        disallow: 링크 금지
         disallow_provider: 발행처 비허용
         no_link_selected: 아무 것도 선택 되지 않아 어떤 링크도 바뀌지 않았습니다
         publishers:
@@ -910,9 +927,13 @@ ko:
       statuses:
         allow: 게시물 허용
         allow_account: 작성자 허용
+        confirm_allow: 정말로 선택된 게시물들을 허용하시겠습니까?
+        confirm_allow_account: 정말로 선택된 계정들을 허용하시겠습니까?
+        confirm_disallow: 정말로 선택된 게시물들을 금지하시겠습니까?
+        confirm_disallow_account: 정말로 선택된 계정들을 금지하시겠습니까?
         description_html: 여러분의 서버가 알기로 현재 많은 수의 공유와 좋아요가 되고 있는 게시물들입니다. 새로운 사용자나 돌아오는 사용자들이 팔로우 할 사람들을 찾는 데 도움이 될 수 있습니다. 작성자를 승인하고, 작성자가 그들의 계정이 다른 계정에게 탐색되도록 설정하지 않는 한 게시물들은 공개적으로 표시되지 않습니다. 또한 각각의 게시물을 별개로 거절할 수도 있습니다.
         disallow: 게시물 비허용
-        disallow_account: 작성자 비허용
+        disallow_account: 작성자 금지
         no_status_selected: 아무 것도 선택 되지 않아 어떤 유행중인 게시물도 바뀌지 않았습니다
         not_discoverable: 작성자가 발견되기를 원치 않습니다
         shared_by:
@@ -940,6 +961,7 @@ ko:
         usage_comparison: 오늘은 %{today}회 쓰였고, 어제는 %{yesterday}회 쓰임
         used_by_over_week:
           other: 지난 주 동안 %{count} 명의 사람들이 사용했습니다
+      title: 추천과 유행
       trending: 유행 중
     warning_presets:
       add_new: 새로 추가
@@ -1053,6 +1075,7 @@ ko:
       redirect_to_app_html: 곧 <strong>%{app_name}</strong>으로 리디렉션 됩니다. 안 된다면, %{clicking_this_link}하거나 직접 앱으로 돌아가세요.
       registration_complete: 지금 막 %{domain} 가입이 완료되었습니다!
       welcome_title: "%{name} 님 반갑습니다!"
+      wrong_email_hint: 만약 이메일 주소가 올바르지 않다면, 계정 설정에서 변경할 수 있습니다.
     delete_account: 계정 삭제
     delete_account_html: 계정을 삭제하고 싶은 경우, <a href="%{path}">여기서</a> 삭제할 수 있습니다. 삭제 전 확인 화면이 표시됩니다.
     description:
@@ -1098,6 +1121,7 @@ ko:
       email_below_hint_html: 스팸 폴더를 체크해보거나, 새로 요청할 수 있습니다. 이메일을 잘못 입력한 경우 수정할 수 있습니다.
       email_settings_hint_html: "%{email}을 인증하기 위해 우리가 보낸 링크를 누르세요. 여기서 기다리겠습니다."
       link_not_received: 링크를 못 받으셨나요?
+      new_confirmation_instructions_sent: 확인 링크가 담긴 이메일이 몇 분 안에 도착할것입니다!
       title: 수신함 확인하기
     sign_in:
       preamble_html: "<strong>%{domain}</strong>의 계정 정보를 이용해 로그인 하세요. 만약 내 계정이 다른 서버에 존재한다면, 여기서는 로그인 할 수 없습니다."
@@ -1108,7 +1132,9 @@ ko:
       title: "%{domain}에 가입하기 위한 정보들을 입력하세요."
     status:
       account_status: 계정 상태
+      confirming: 이메일 확인 과정이 완료되기를 기다리는 중.
       functional: 계정이 완벽히 작동합니다.
+      pending: 당신의 가입 신청은 스태프의 검사를 위해 대기 중입니다. 시간이 조금 걸릴 수 있습니다. 가입 신청이 승인되면 이메일을 받게 됩니다.
       redirecting_to: 계정이 %{acct}로 리다이렉트 중이기 때문에 비활성 상태입니다.
       self_destruct: "%{domain} 도메인 폐쇄가 진행중이기 때문에, 계정에는 제한된 접근만 할 수 있습니다."
       view_strikes: 내 계정에 대한 과거 중재 기록 보기
@@ -1151,6 +1177,9 @@ ko:
       before: '진행하기 전, 주의사항을 꼼꼼히 읽어보세요:'
       caches: 다른 서버에 캐싱된 정보들은 남아있을 수 있습니다
       data_removal: 당신의 게시물과 다른 정보들은 영구적으로 삭제 됩니다
+      email_change_html: 계정을 지우지 않고도 <a href="%{path}">이메일 주소를 변경할 수 있습니다</a>
+      email_contact_html: 아직 도착하지 않았다면, <a href="mailto:%{email}">%{email}</a>에 메일을 보내 도움을 요청할 수 있습니다
+      email_reconfirmation_html: 아직 확인 메일이 도착하지 않은 경우, <a href="%{path}">다시 요청할 수 있습니다</a>
       irreversible: 계정을 복구하거나 다시 사용할 수 없게 됩니다
       more_details_html: 더 자세한 정보는, <a href="%{terms_path}">개인정보처리방침</a>을 참고하세요.
       username_available: 당신의 계정명은 다시 사용할 수 있게 됩니다
@@ -1386,6 +1415,16 @@ ko:
     unsubscribe:
       action: 네, 구독 취소합니다
       complete: 구독 취소됨
+      confirmation_html: 정말로 %{domain}에서 %{email}로 보내는 마스토돈의 %{type}에 대한 구독을 취소하시겠습니까? 언제든지 <a href="%{settings_path}">이메일 알림 설정</a>에서 다시 구독할 수 있습니다.
+      emails:
+        notification_emails:
+          favourite: 좋아요 알림 이메일
+          follow: 팔로우 알림 이메일
+          follow_request: 팔로우 요청 이메일
+          mention: 멘션 알림 이메일
+          reblog: 부스트 알림 이메일
+      resubscribe_html: 만약 실수로 구독 취소를 했다면 <a href="%{settings_path}">이메일 알림 설정</a>에서 다시 구독할 수 있습니다.
+      success_html: 이제 더이상 %{domain}의 마스토돈에서 %{email}로 %{type} 알림을 보내지 않습니다.
       title: 구독 취소
   media_attachments:
     validations:
@@ -1466,6 +1505,8 @@ ko:
     update:
       subject: "%{name} 님이 게시물을 수정했습니다"
   notifications:
+    administration_emails: 관리자 이메일 알림
+    email_events: 이메일 알림에 대한 이벤트
     email_events_hint: '알림 받을 이벤트를 선택해주세요:'
   number:
     human:
@@ -1624,6 +1665,7 @@ ko:
     import: 데이터 가져오기
     import_and_export: 가져오기 & 내보내기
     migrate: 계정 이동
+    notifications: 이메일 알림
     preferences: 환경설정
     profile: 공개 프로필
     relationships: 팔로잉과 팔로워
@@ -1646,12 +1688,12 @@ ko:
   statuses:
     attached:
       audio:
-        other: "%{count}개의 오디오"
+        other: "%{count} 개의 오디오"
       description: '첨부: %{attached}'
       image:
         other: "%{count}장의 이미지"
       video:
-        other: "%{count}개의 영상"
+        other: "%{count} 개의 영상"
     boosted_from_html: "%{acct_link}의 글을 부스트"
     content_warning: '열람 주의: %{warning}'
     default_language: 화면 표시 언어와 동일하게
@@ -1671,7 +1713,7 @@ ko:
       total_people:
         other: "%{count}명"
       total_votes:
-        other: "%{count}명 투표함"
+        other: "%{count} 명 투표함"
       vote: 투표
     show_more: 더 보기
     show_thread: 글타래 보기
@@ -1863,6 +1905,7 @@ ko:
     invalid_otp_token: 2단계 인증 코드가 올바르지 않습니다
     otp_lost_help_html: 만약 양쪽 모두를 잃어버렸다면 %{email}을 통해 복구할 수 있습니다
     rate_limited: 너무 많은 인증 시도가 있었습니다, 잠시 후에 시도하세요.
+    seamless_external_login: 외부 서비스를 이용해 로그인했으므로 이메일과 암호는 설정할 수 없습니다.
     signed_in_as: '다음과 같이 로그인 중:'
   verification:
     extra_instructions_html: <strong>팁:</strong> 웹사이트에 안 보이는 링크로 삽입할 수 있습니다. 중요한 것은 나를 도용하는 것을 방지하는 <code>rel="me"</code> 부분입니다. 심지어 <code>a</code> 대신 <code>link</code>태그를 페이지 헤더에 넣는 것으로 대체할 수도 있습니다. 하지만 HTML 코드는 자바스크립트 실행 없이 접근이 가능해야 합니다.
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 9a92879cc52851..ce6107c730832e 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -35,6 +35,7 @@ ru:
       created_msg: Заметка модератора успешно создана!
       destroyed_msg: Заметка модератора успешно удалена!
     accounts:
+      add_email_domain_block: Забанить email домен
       approve: Подтвердить
       approved_msg: Успешно одобрена заявка на регистрацию %{username}
       are_you_sure: Вы уверены?
@@ -428,6 +429,7 @@ ru:
         many: "%{count} попыток за последнюю неделю"
         one: "%{count} попытка за последнюю неделю"
         other: "%{count} попыток регистрации за последнюю неделю"
+      created_msg: Домен email забанен, ура
       delete: Удалить
       dns:
         types:
@@ -599,6 +601,9 @@ ru:
         suspend_description_html: Аккаунт и все его содержимое будут недоступны и в конечном итоге удалены, и взаимодействие с ним будет невозможно. Это действие можно отменить в течение 30 дней. Отменяет все жалобы против этого аккаунта.
       actions_description_remote_html: Решите вопрос о том, какие меры необходимо принять для урегулирования этой жалобы. Это повлияет только на то, как <strong>ваш</strong> сервер взаимодействует с этим удаленным аккаунтом и обрабатывает его содержимое.
       add_to_report: Прикрепить ещё
+      already_suspended_badges:
+        local: На этом сервере уже забанен
+        remote: На этом сервере уже забанен
       are_you_sure: Вы уверены?
       assign_to_self: Назначить себе
       assigned: Назначенный модератор
@@ -752,6 +757,7 @@ ru:
         desc_html: Это зависит от внешних скриптов из hCaptcha, которые могут представлять интерес для безопасности и конфиденциальности. Кроме того, <strong>это может сделать процесс регистрации значительно менее доступным для некоторых (особенно отключенных) людей</strong>. По этим причинам просьба рассмотреть альтернативные меры, такие, как регистрация, основанная на официальном утверждении или на приглашении.
         title: Запрашивать новых пользователей для решения CAPTCHA для подтверждения учетной записи
       content_retention:
+        danger_zone: Осторожно!
         preamble: Управление сохранением пользовательского контента в Mastodon.
         title: Хранение контента
       default_noindex:
diff --git a/config/locales/simple_form.gl.yml b/config/locales/simple_form.gl.yml
index 9adaa31efc2856..aff8a95f0dc8ff 100644
--- a/config/locales/simple_form.gl.yml
+++ b/config/locales/simple_form.gl.yml
@@ -138,7 +138,7 @@ gl:
         permissions_as_keys: As usuarias con este rol terán acceso a...
         position: O rol superior decide nos conflitos en certas situacións. Algunhas accións só poden aplicarse sobre roles cunha prioridade menor
       webhook:
-        events: Elixir eventos a enviar
+        events: Escoller eventos a enviar
         template: Crea o teu propio JSON interpolando variables. Déixao en branco para usar o JSON predeterminado.
         url: A onde se enviarán os eventos
     labels:
diff --git a/config/locales/simple_form.ru.yml b/config/locales/simple_form.ru.yml
index e7a29fdad19da4..0f830174c89dab 100644
--- a/config/locales/simple_form.ru.yml
+++ b/config/locales/simple_form.ru.yml
@@ -238,6 +238,7 @@ ru:
           warn: Скрыть с предупреждением
       form_admin_settings:
         activity_api_enabled: Публикация агрегированной статистики активности пользователей в API
+        app_icon: Иконка приложения
         backups_retention_period: Период хранения архива пользователя
         bootstrap_timeline_accounts: Всегда рекомендовать эти учетные записи новым пользователям
         closed_registrations_message: Сообщение, когда регистрация недоступна
@@ -307,6 +308,7 @@ ru:
         listable: Разрешить показ хэштега в поиске или в каталоге профилей
         name: Хэштег
         trendable: Разрешить показ хэштега в трендах
+        usable: Позволить этот хэштег в локальных сообщениях
       user:
         role: Роль
         time_zone: Часовой пояс

From b91264b1f3dae6f2042c0f2320db0ba7267bba0e Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 21 Aug 2024 10:15:12 +0200
Subject: [PATCH 1908/2191] Update dependency fugit (#31522)

---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index dada7c86c71710..596e32f24db9c3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -281,8 +281,8 @@ GEM
       fog-core (~> 2.1)
       fog-json (>= 1.0)
     formatador (1.1.0)
-    fugit (1.10.1)
-      et-orbi (~> 1, >= 1.2.7)
+    fugit (1.11.1)
+      et-orbi (~> 1, >= 1.2.11)
       raabro (~> 1.4)
     fuubar (2.5.1)
       rspec-core (~> 3.0)

From 8c7642cd186315f364a3a2d9090ebd87c2d684c6 Mon Sep 17 00:00:00 2001
From: mogaminsk <mgmnjp@icloud.com>
Date: Wed, 21 Aug 2024 17:56:36 +0900
Subject: [PATCH 1909/2191] Change translation strings of grouped notification
 label to have full context (#31486)

---
 .../components/displayed_name.tsx             | 22 ++++++++
 .../components/names_list.tsx                 | 51 -------------------
 .../components/notification_admin_sign_up.tsx | 28 +++++++---
 .../components/notification_favourite.tsx     | 32 +++++++++---
 .../components/notification_follow.tsx        | 28 +++++++---
 .../notification_follow_request.tsx           | 28 +++++++---
 .../notification_group_with_status.tsx        | 20 ++++----
 .../components/notification_reblog.tsx        | 32 +++++++++---
 .../components/notification_status.tsx        |  4 +-
 .../components/notification_update.tsx        |  4 +-
 .../components/notification_with_status.tsx   |  7 +--
 app/javascript/mastodon/locales/en.json       |  7 ++-
 12 files changed, 155 insertions(+), 108 deletions(-)
 create mode 100644 app/javascript/mastodon/features/notifications_v2/components/displayed_name.tsx
 delete mode 100644 app/javascript/mastodon/features/notifications_v2/components/names_list.tsx

diff --git a/app/javascript/mastodon/features/notifications_v2/components/displayed_name.tsx b/app/javascript/mastodon/features/notifications_v2/components/displayed_name.tsx
new file mode 100644
index 00000000000000..82ecb93ee5fdb9
--- /dev/null
+++ b/app/javascript/mastodon/features/notifications_v2/components/displayed_name.tsx
@@ -0,0 +1,22 @@
+import { Link } from 'react-router-dom';
+
+import { useAppSelector } from 'mastodon/store';
+
+export const DisplayedName: React.FC<{
+  accountIds: string[];
+}> = ({ accountIds }) => {
+  const lastAccountId = accountIds[0] ?? '0';
+  const account = useAppSelector((state) => state.accounts.get(lastAccountId));
+
+  if (!account) return null;
+
+  return (
+    <Link
+      to={`/@${account.acct}`}
+      title={`@${account.acct}`}
+      data-hover-card-account={account.id}
+    >
+      <bdi dangerouslySetInnerHTML={{ __html: account.display_name_html }} />
+    </Link>
+  );
+};
diff --git a/app/javascript/mastodon/features/notifications_v2/components/names_list.tsx b/app/javascript/mastodon/features/notifications_v2/components/names_list.tsx
deleted file mode 100644
index 3d70cc0b623260..00000000000000
--- a/app/javascript/mastodon/features/notifications_v2/components/names_list.tsx
+++ /dev/null
@@ -1,51 +0,0 @@
-import { FormattedMessage } from 'react-intl';
-
-import { Link } from 'react-router-dom';
-
-import { useAppSelector } from 'mastodon/store';
-
-export const NamesList: React.FC<{
-  accountIds: string[];
-  total: number;
-  seeMoreHref?: string;
-}> = ({ accountIds, total, seeMoreHref }) => {
-  const lastAccountId = accountIds[0] ?? '0';
-  const account = useAppSelector((state) => state.accounts.get(lastAccountId));
-
-  if (!account) return null;
-
-  const displayedName = (
-    <Link
-      to={`/@${account.acct}`}
-      title={`@${account.acct}`}
-      data-hover-card-account={account.id}
-    >
-      <bdi dangerouslySetInnerHTML={{ __html: account.display_name_html }} />
-    </Link>
-  );
-
-  if (total === 1) {
-    return displayedName;
-  }
-
-  if (seeMoreHref)
-    return (
-      <FormattedMessage
-        id='name_and_others_with_link'
-        defaultMessage='{name} and <a>{count, plural, one {# other} other {# others}}</a>'
-        values={{
-          name: displayedName,
-          count: total - 1,
-          a: (chunks) => <Link to={seeMoreHref}>{chunks}</Link>,
-        }}
-      />
-    );
-
-  return (
-    <FormattedMessage
-      id='name_and_others'
-      defaultMessage='{name} and {count, plural, one {# other} other {# others}}'
-      values={{ name: displayedName, count: total - 1 }}
-    />
-  );
-};
diff --git a/app/javascript/mastodon/features/notifications_v2/components/notification_admin_sign_up.tsx b/app/javascript/mastodon/features/notifications_v2/components/notification_admin_sign_up.tsx
index 9f7afc63f5b073..73a5851ad3c833 100644
--- a/app/javascript/mastodon/features/notifications_v2/components/notification_admin_sign_up.tsx
+++ b/app/javascript/mastodon/features/notifications_v2/components/notification_admin_sign_up.tsx
@@ -6,13 +6,27 @@ import type { NotificationGroupAdminSignUp } from 'mastodon/models/notification_
 import type { LabelRenderer } from './notification_group_with_status';
 import { NotificationGroupWithStatus } from './notification_group_with_status';
 
-const labelRenderer: LabelRenderer = (values) => (
-  <FormattedMessage
-    id='notification.admin.sign_up'
-    defaultMessage='{name} signed up'
-    values={values}
-  />
-);
+const labelRenderer: LabelRenderer = (displayedName, total) => {
+  if (total === 1)
+    return (
+      <FormattedMessage
+        id='notification.admin.sign_up'
+        defaultMessage='{name} signed up'
+        values={{ name: displayedName }}
+      />
+    );
+
+  return (
+    <FormattedMessage
+      id='notification.admin.sign_up.name_and_others'
+      defaultMessage='{name} and {count, plural, one {# other} other {# others}} signed up'
+      values={{
+        name: displayedName,
+        count: total - 1,
+      }}
+    />
+  );
+};
 
 export const NotificationAdminSignUp: React.FC<{
   notification: NotificationGroupAdminSignUp;
diff --git a/app/javascript/mastodon/features/notifications_v2/components/notification_favourite.tsx b/app/javascript/mastodon/features/notifications_v2/components/notification_favourite.tsx
index 22838fe69bc0be..eba37fe9371c44 100644
--- a/app/javascript/mastodon/features/notifications_v2/components/notification_favourite.tsx
+++ b/app/javascript/mastodon/features/notifications_v2/components/notification_favourite.tsx
@@ -1,5 +1,7 @@
 import { FormattedMessage } from 'react-intl';
 
+import { Link } from 'react-router-dom';
+
 import StarIcon from '@/material-icons/400-24px/star-fill.svg?react';
 import type { NotificationGroupFavourite } from 'mastodon/models/notification_group';
 import { useAppSelector } from 'mastodon/store';
@@ -7,13 +9,29 @@ import { useAppSelector } from 'mastodon/store';
 import type { LabelRenderer } from './notification_group_with_status';
 import { NotificationGroupWithStatus } from './notification_group_with_status';
 
-const labelRenderer: LabelRenderer = (values) => (
-  <FormattedMessage
-    id='notification.favourite'
-    defaultMessage='{name} favorited your status'
-    values={values}
-  />
-);
+const labelRenderer: LabelRenderer = (displayedName, total, seeMoreHref) => {
+  if (total === 1)
+    return (
+      <FormattedMessage
+        id='notification.favourite'
+        defaultMessage='{name} favorited your status'
+        values={{ name: displayedName }}
+      />
+    );
+
+  return (
+    <FormattedMessage
+      id='notification.favourite.name_and_others_with_link'
+      defaultMessage='{name} and <a>{count, plural, one {# other} other {# others}}</a> favorited your post'
+      values={{
+        name: displayedName,
+        count: total - 1,
+        a: (chunks) =>
+          seeMoreHref ? <Link to={seeMoreHref}>{chunks}</Link> : chunks,
+      }}
+    />
+  );
+};
 
 export const NotificationFavourite: React.FC<{
   notification: NotificationGroupFavourite;
diff --git a/app/javascript/mastodon/features/notifications_v2/components/notification_follow.tsx b/app/javascript/mastodon/features/notifications_v2/components/notification_follow.tsx
index 3760096d4427e9..6a9a45d242c348 100644
--- a/app/javascript/mastodon/features/notifications_v2/components/notification_follow.tsx
+++ b/app/javascript/mastodon/features/notifications_v2/components/notification_follow.tsx
@@ -10,13 +10,27 @@ import { useAppSelector } from 'mastodon/store';
 import type { LabelRenderer } from './notification_group_with_status';
 import { NotificationGroupWithStatus } from './notification_group_with_status';
 
-const labelRenderer: LabelRenderer = (values) => (
-  <FormattedMessage
-    id='notification.follow'
-    defaultMessage='{name} followed you'
-    values={values}
-  />
-);
+const labelRenderer: LabelRenderer = (displayedName, total) => {
+  if (total === 1)
+    return (
+      <FormattedMessage
+        id='notification.follow'
+        defaultMessage='{name} followed you'
+        values={{ name: displayedName }}
+      />
+    );
+
+  return (
+    <FormattedMessage
+      id='notification.follow.name_and_others'
+      defaultMessage='{name} and {count, plural, one {# other} other {# others}} followed you'
+      values={{
+        name: displayedName,
+        count: total - 1,
+      }}
+    />
+  );
+};
 
 const FollowerCount: React.FC<{ accountId: string }> = ({ accountId }) => {
   const account = useAppSelector((s) => s.accounts.get(accountId));
diff --git a/app/javascript/mastodon/features/notifications_v2/components/notification_follow_request.tsx b/app/javascript/mastodon/features/notifications_v2/components/notification_follow_request.tsx
index 281bfd94af67b9..5f61f2cd780afe 100644
--- a/app/javascript/mastodon/features/notifications_v2/components/notification_follow_request.tsx
+++ b/app/javascript/mastodon/features/notifications_v2/components/notification_follow_request.tsx
@@ -21,13 +21,27 @@ const messages = defineMessages({
   reject: { id: 'follow_request.reject', defaultMessage: 'Reject' },
 });
 
-const labelRenderer: LabelRenderer = (values) => (
-  <FormattedMessage
-    id='notification.follow_request'
-    defaultMessage='{name} has requested to follow you'
-    values={values}
-  />
-);
+const labelRenderer: LabelRenderer = (displayedName, total) => {
+  if (total === 1)
+    return (
+      <FormattedMessage
+        id='notification.follow_request'
+        defaultMessage='{name} has requested to follow you'
+        values={{ name: displayedName }}
+      />
+    );
+
+  return (
+    <FormattedMessage
+      id='notification.follow_request.name_and_others'
+      defaultMessage='{name} and {count, plural, one {# other} other {# others}} has requested to follow you'
+      values={{
+        name: displayedName,
+        count: total - 1,
+      }}
+    />
+  );
+};
 
 export const NotificationFollowRequest: React.FC<{
   notification: NotificationGroupFollowRequest;
diff --git a/app/javascript/mastodon/features/notifications_v2/components/notification_group_with_status.tsx b/app/javascript/mastodon/features/notifications_v2/components/notification_group_with_status.tsx
index 8f555956e0e771..343a9bc4c1ae2e 100644
--- a/app/javascript/mastodon/features/notifications_v2/components/notification_group_with_status.tsx
+++ b/app/javascript/mastodon/features/notifications_v2/components/notification_group_with_status.tsx
@@ -12,11 +12,13 @@ import { RelativeTimestamp } from 'mastodon/components/relative_timestamp';
 import { useAppDispatch } from 'mastodon/store';
 
 import { AvatarGroup } from './avatar_group';
+import { DisplayedName } from './displayed_name';
 import { EmbeddedStatus } from './embedded_status';
-import { NamesList } from './names_list';
 
 export type LabelRenderer = (
-  values: Record<string, React.ReactNode>,
+  displayedName: JSX.Element,
+  total: number,
+  seeMoreHref?: string,
 ) => JSX.Element;
 
 export const NotificationGroupWithStatus: React.FC<{
@@ -50,15 +52,11 @@ export const NotificationGroupWithStatus: React.FC<{
 
   const label = useMemo(
     () =>
-      labelRenderer({
-        name: (
-          <NamesList
-            accountIds={accountIds}
-            total={count}
-            seeMoreHref={labelSeeMoreHref}
-          />
-        ),
-      }),
+      labelRenderer(
+        <DisplayedName accountIds={accountIds} />,
+        count,
+        labelSeeMoreHref,
+      ),
     [labelRenderer, accountIds, count, labelSeeMoreHref],
   );
 
diff --git a/app/javascript/mastodon/features/notifications_v2/components/notification_reblog.tsx b/app/javascript/mastodon/features/notifications_v2/components/notification_reblog.tsx
index 06255686884142..7b3bda85e57e46 100644
--- a/app/javascript/mastodon/features/notifications_v2/components/notification_reblog.tsx
+++ b/app/javascript/mastodon/features/notifications_v2/components/notification_reblog.tsx
@@ -1,5 +1,7 @@
 import { FormattedMessage } from 'react-intl';
 
+import { Link } from 'react-router-dom';
+
 import RepeatIcon from '@/material-icons/400-24px/repeat.svg?react';
 import type { NotificationGroupReblog } from 'mastodon/models/notification_group';
 import { useAppSelector } from 'mastodon/store';
@@ -7,13 +9,29 @@ import { useAppSelector } from 'mastodon/store';
 import type { LabelRenderer } from './notification_group_with_status';
 import { NotificationGroupWithStatus } from './notification_group_with_status';
 
-const labelRenderer: LabelRenderer = (values) => (
-  <FormattedMessage
-    id='notification.reblog'
-    defaultMessage='{name} boosted your status'
-    values={values}
-  />
-);
+const labelRenderer: LabelRenderer = (displayedName, total, seeMoreHref) => {
+  if (total === 1)
+    return (
+      <FormattedMessage
+        id='notification.reblog'
+        defaultMessage='{name} boosted your status'
+        values={{ name: displayedName }}
+      />
+    );
+
+  return (
+    <FormattedMessage
+      id='notification.reblog.name_and_others_with_link'
+      defaultMessage='{name} and <a>{count, plural, one {# other} other {# others}}</a> boosted your post'
+      values={{
+        name: displayedName,
+        count: total - 1,
+        a: (chunks) =>
+          seeMoreHref ? <Link to={seeMoreHref}>{chunks}</Link> : chunks,
+      }}
+    />
+  );
+};
 
 export const NotificationReblog: React.FC<{
   notification: NotificationGroupReblog;
diff --git a/app/javascript/mastodon/features/notifications_v2/components/notification_status.tsx b/app/javascript/mastodon/features/notifications_v2/components/notification_status.tsx
index 9ade355a71494b..2955c3aeac5f1b 100644
--- a/app/javascript/mastodon/features/notifications_v2/components/notification_status.tsx
+++ b/app/javascript/mastodon/features/notifications_v2/components/notification_status.tsx
@@ -6,11 +6,11 @@ import type { NotificationGroupStatus } from 'mastodon/models/notification_group
 import type { LabelRenderer } from './notification_group_with_status';
 import { NotificationWithStatus } from './notification_with_status';
 
-const labelRenderer: LabelRenderer = (values) => (
+const labelRenderer: LabelRenderer = (displayedName) => (
   <FormattedMessage
     id='notification.status'
     defaultMessage='{name} just posted'
-    values={values}
+    values={{ name: displayedName }}
   />
 );
 
diff --git a/app/javascript/mastodon/features/notifications_v2/components/notification_update.tsx b/app/javascript/mastodon/features/notifications_v2/components/notification_update.tsx
index c518367bf5a24f..731f319f894a5c 100644
--- a/app/javascript/mastodon/features/notifications_v2/components/notification_update.tsx
+++ b/app/javascript/mastodon/features/notifications_v2/components/notification_update.tsx
@@ -6,11 +6,11 @@ import type { NotificationGroupUpdate } from 'mastodon/models/notification_group
 import type { LabelRenderer } from './notification_group_with_status';
 import { NotificationWithStatus } from './notification_with_status';
 
-const labelRenderer: LabelRenderer = (values) => (
+const labelRenderer: LabelRenderer = (displayedName) => (
   <FormattedMessage
     id='notification.update'
     defaultMessage='{name} edited a post'
-    values={values}
+    values={{ name: displayedName }}
   />
 );
 
diff --git a/app/javascript/mastodon/features/notifications_v2/components/notification_with_status.tsx b/app/javascript/mastodon/features/notifications_v2/components/notification_with_status.tsx
index 5d5cb98185bdf2..a1c275a1f39309 100644
--- a/app/javascript/mastodon/features/notifications_v2/components/notification_with_status.tsx
+++ b/app/javascript/mastodon/features/notifications_v2/components/notification_with_status.tsx
@@ -15,7 +15,7 @@ import { Icon } from 'mastodon/components/icon';
 import Status from 'mastodon/containers/status_container';
 import { useAppSelector, useAppDispatch } from 'mastodon/store';
 
-import { NamesList } from './names_list';
+import { DisplayedName } from './displayed_name';
 import type { LabelRenderer } from './notification_group_with_status';
 
 export const NotificationWithStatus: React.FC<{
@@ -40,10 +40,7 @@ export const NotificationWithStatus: React.FC<{
   const dispatch = useAppDispatch();
 
   const label = useMemo(
-    () =>
-      labelRenderer({
-        name: <NamesList accountIds={accountIds} total={count} />,
-      }),
+    () => labelRenderer(<DisplayedName accountIds={accountIds} />, count),
     [labelRenderer, accountIds, count],
   );
 
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index 43ff015791fbf0..ba351032ffd2a0 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -463,8 +463,6 @@
   "mute_modal.title": "Mute user?",
   "mute_modal.you_wont_see_mentions": "You won't see posts that mention them.",
   "mute_modal.you_wont_see_posts": "They can still see your posts, but you won't see theirs.",
-  "name_and_others": "{name} and {count, plural, one {# other} other {# others}}",
-  "name_and_others_with_link": "{name} and <a>{count, plural, one {# other} other {# others}}</a>",
   "navigation_bar.about": "About",
   "navigation_bar.advanced_interface": "Open in advanced web interface",
   "navigation_bar.blocks": "Blocked users",
@@ -497,9 +495,13 @@
   "notification.admin.report_statuses": "{name} reported {target} for {category}",
   "notification.admin.report_statuses_other": "{name} reported {target}",
   "notification.admin.sign_up": "{name} signed up",
+  "notification.admin.sign_up.name_and_others": "{name} and {count, plural, one {# other} other {# others}} signed up",
   "notification.favourite": "{name} favorited your post",
+  "notification.favourite.name_and_others_with_link": "{name} and <a>{count, plural, one {# other} other {# others}}</a> favorited your post",
   "notification.follow": "{name} followed you",
+  "notification.follow.name_and_others": "{name} and {count, plural, one {# other} other {# others}} followed you",
   "notification.follow_request": "{name} has requested to follow you",
+  "notification.follow_request.name_and_others": "{name} and {count, plural, one {# other} other {# others}} has requested to follow you",
   "notification.label.mention": "Mention",
   "notification.label.private_mention": "Private mention",
   "notification.label.private_reply": "Private reply",
@@ -517,6 +519,7 @@
   "notification.own_poll": "Your poll has ended",
   "notification.poll": "A poll you voted in has ended",
   "notification.reblog": "{name} boosted your post",
+  "notification.reblog.name_and_others_with_link": "{name} and <a>{count, plural, one {# other} other {# others}}</a> boosted your post",
   "notification.relationships_severance_event": "Lost connections with {name}",
   "notification.relationships_severance_event.account_suspension": "An admin from {from} has suspended {target}, which means you can no longer receive updates from them or interact with them.",
   "notification.relationships_severance_event.domain_block": "An admin from {from} has blocked {target}, including {followersCount} of your followers and {followingCount, plural, one {# account} other {# accounts}} you follow.",

From e48a64d3b541087acd101f9149c956ffb07119f3 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 21 Aug 2024 12:25:14 +0200
Subject: [PATCH 1910/2191] Fix distracting and confusing always-showing
 scrollbar track in boost confirmation modal (#31524)

---
 app/javascript/styles/mastodon/components.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index b6e71cde41bfb7..3d280ac4afd312 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -6247,7 +6247,7 @@ a.status-card {
 }
 
 .boost-modal__container {
-  overflow-x: scroll;
+  overflow-y: auto;
   padding: 10px;
 
   .status {

From 01a757d306276213276580a31ecbeffa21d88076 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?KMY=EF=BC=88=E9=9B=AA=E3=81=82=E3=81=99=E3=81=8B=EF=BC=89?=
 <tt@kmycode.net>
Date: Wed, 21 Aug 2024 22:11:36 +0900
Subject: [PATCH 1911/2191] Fix boost dialog visibility selection not being
 taken into account (#31523)

---
 app/javascript/mastodon/actions/interactions.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/javascript/mastodon/actions/interactions.js b/app/javascript/mastodon/actions/interactions.js
index b296a5006ac55c..d3538a8850a3d7 100644
--- a/app/javascript/mastodon/actions/interactions.js
+++ b/app/javascript/mastodon/actions/interactions.js
@@ -437,12 +437,12 @@ export function unpinFail(status, error) {
   };
 }
 
-function toggleReblogWithoutConfirmation(status, privacy) {
+function toggleReblogWithoutConfirmation(status, visibility) {
   return (dispatch) => {
     if (status.get('reblogged')) {
       dispatch(unreblog({ statusId: status.get('id') }));
     } else {
-      dispatch(reblog({ statusId: status.get('id'), privacy }));
+      dispatch(reblog({ statusId: status.get('id'), visibility }));
     }
   };
 }

From d67e11733e4159c736f4370ee7ea86240a297bb7 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 21 Aug 2024 16:41:31 +0200
Subject: [PATCH 1912/2191] Add automatic notification polling for grouped
 notifications (#31513)

---
 .../mastodon/actions/notification_groups.ts   |  23 ++
 app/javascript/mastodon/actions/streaming.js  |  25 +-
 app/javascript/mastodon/api/notifications.ts  |   1 +
 .../mastodon/reducers/notification_groups.ts  | 222 +++++++++++-------
 4 files changed, 186 insertions(+), 85 deletions(-)

diff --git a/app/javascript/mastodon/actions/notification_groups.ts b/app/javascript/mastodon/actions/notification_groups.ts
index 6b699706e2536a..51f83f1d241a4a 100644
--- a/app/javascript/mastodon/actions/notification_groups.ts
+++ b/app/javascript/mastodon/actions/notification_groups.ts
@@ -11,6 +11,7 @@ import type {
 } from 'mastodon/api_types/notifications';
 import { allNotificationTypes } from 'mastodon/api_types/notifications';
 import type { ApiStatusJSON } from 'mastodon/api_types/statuses';
+import { usePendingItems } from 'mastodon/initial_state';
 import type { NotificationGap } from 'mastodon/reducers/notification_groups';
 import {
   selectSettingsNotificationsExcludedTypes,
@@ -103,6 +104,28 @@ export const fetchNotificationsGap = createDataLoadingThunk(
   },
 );
 
+export const pollRecentNotifications = createDataLoadingThunk(
+  'notificationGroups/pollRecentNotifications',
+  async (_params, { getState }) => {
+    return apiFetchNotifications({
+      max_id: undefined,
+      // In slow mode, we don't want to include notifications that duplicate the already-displayed ones
+      since_id: usePendingItems
+        ? getState().notificationGroups.groups.find(
+            (group) => group.type !== 'gap',
+          )?.page_max_id
+        : undefined,
+    });
+  },
+  ({ notifications, accounts, statuses }, { dispatch }) => {
+    dispatch(importFetchedAccounts(accounts));
+    dispatch(importFetchedStatuses(statuses));
+    dispatchAssociatedRecords(dispatch, notifications);
+
+    return { notifications };
+  },
+);
+
 export const processNewNotificationForGroups = createAppAsyncThunk(
   'notificationGroups/processNew',
   (notification: ApiNotificationJSON, { dispatch, getState }) => {
diff --git a/app/javascript/mastodon/actions/streaming.js b/app/javascript/mastodon/actions/streaming.js
index e082aea43d9116..04f5e6b88c5b90 100644
--- a/app/javascript/mastodon/actions/streaming.js
+++ b/app/javascript/mastodon/actions/streaming.js
@@ -10,7 +10,7 @@ import {
   deleteAnnouncement,
 } from './announcements';
 import { updateConversations } from './conversations';
-import { processNewNotificationForGroups, refreshStaleNotificationGroups } from './notification_groups';
+import { processNewNotificationForGroups, refreshStaleNotificationGroups, pollRecentNotifications as pollRecentGroupNotifications } from './notification_groups';
 import { updateNotifications, expandNotifications } from './notifications';
 import { updateStatus } from './statuses';
 import {
@@ -37,7 +37,7 @@ const randomUpTo = max =>
  * @param {string} channelName
  * @param {Object.<string, string>} params
  * @param {Object} options
- * @param {function(Function): Promise<void>} [options.fallback]
+ * @param {function(Function, Function): Promise<void>} [options.fallback]
  * @param {function(): void} [options.fillGaps]
  * @param {function(object): boolean} [options.accept]
  * @returns {function(): void}
@@ -52,11 +52,11 @@ export const connectTimelineStream = (timelineId, channelName, params = {}, opti
     let pollingId;
 
     /**
-     * @param {function(Function): Promise<void>} fallback
+     * @param {function(Function, Function): Promise<void>} fallback
      */
 
     const useFallback = async fallback => {
-      await fallback(dispatch);
+      await fallback(dispatch, getState);
       // eslint-disable-next-line react-hooks/rules-of-hooks -- this is not a react hook
       pollingId = setTimeout(() => useFallback(fallback), 20000 + randomUpTo(20000));
     };
@@ -139,10 +139,23 @@ export const connectTimelineStream = (timelineId, channelName, params = {}, opti
 
 /**
  * @param {Function} dispatch
+ * @param {Function} getState
  */
-async function refreshHomeTimelineAndNotification(dispatch) {
+async function refreshHomeTimelineAndNotification(dispatch, getState) {
   await dispatch(expandHomeTimeline({ maxId: undefined }));
-  await dispatch(expandNotifications({}));
+
+  // TODO: remove this once the groups feature replaces the previous one
+  if(getState().settings.getIn(['notifications', 'groupingBeta'], false)) {
+    // TODO: polling for merged notifications
+    try {
+      await dispatch(pollRecentGroupNotifications());
+    } catch (error) {
+      // TODO
+    }
+  } else {
+    await dispatch(expandNotifications({}));
+  }
+
   await dispatch(fetchAnnouncements());
 }
 
diff --git a/app/javascript/mastodon/api/notifications.ts b/app/javascript/mastodon/api/notifications.ts
index ed187da5eccae0..cb07e4114cf8b5 100644
--- a/app/javascript/mastodon/api/notifications.ts
+++ b/app/javascript/mastodon/api/notifications.ts
@@ -4,6 +4,7 @@ import type { ApiNotificationGroupsResultJSON } from 'mastodon/api_types/notific
 export const apiFetchNotifications = async (params?: {
   exclude_types?: string[];
   max_id?: string;
+  since_id?: string;
 }) => {
   const response = await api().request<ApiNotificationGroupsResultJSON>({
     method: 'GET',
diff --git a/app/javascript/mastodon/reducers/notification_groups.ts b/app/javascript/mastodon/reducers/notification_groups.ts
index 0348f080ff2e76..b3535d7b672017 100644
--- a/app/javascript/mastodon/reducers/notification_groups.ts
+++ b/app/javascript/mastodon/reducers/notification_groups.ts
@@ -20,12 +20,16 @@ import {
   mountNotifications,
   unmountNotifications,
   refreshStaleNotificationGroups,
+  pollRecentNotifications,
 } from 'mastodon/actions/notification_groups';
 import {
   disconnectTimeline,
   timelineDelete,
 } from 'mastodon/actions/timelines_typed';
-import type { ApiNotificationJSON } from 'mastodon/api_types/notifications';
+import type {
+  ApiNotificationJSON,
+  ApiNotificationGroupJSON,
+} from 'mastodon/api_types/notifications';
 import { compareId } from 'mastodon/compare_id';
 import { usePendingItems } from 'mastodon/initial_state';
 import {
@@ -296,6 +300,106 @@ function commitLastReadId(state: NotificationGroupsState) {
   }
 }
 
+function fillNotificationsGap(
+  groups: NotificationGroupsState['groups'],
+  gap: NotificationGap,
+  notifications: ApiNotificationGroupJSON[],
+): NotificationGroupsState['groups'] {
+  // find the gap in the existing notifications
+  const gapIndex = groups.findIndex(
+    (groupOrGap) =>
+      groupOrGap.type === 'gap' &&
+      groupOrGap.sinceId === gap.sinceId &&
+      groupOrGap.maxId === gap.maxId,
+  );
+
+  if (gapIndex < 0)
+    // We do not know where to insert, let's return
+    return groups;
+
+  // Filling a disconnection gap means we're getting historical data
+  // about groups we may know or may not know about.
+
+  // The notifications timeline is split in two by the gap, with
+  // group information newer than the gap, and group information older
+  // than the gap.
+
+  // Filling a gap should not touch anything before the gap, so any
+  // information on groups already appearing before the gap should be
+  // discarded, while any information on groups appearing after the gap
+  // can be updated and re-ordered.
+
+  const oldestPageNotification = notifications.at(-1)?.page_min_id;
+
+  // replace the gap with the notifications + a new gap
+
+  const newerGroupKeys = groups
+    .slice(0, gapIndex)
+    .filter(isNotificationGroup)
+    .map((group) => group.group_key);
+
+  const toInsert: NotificationGroupsState['groups'] = notifications
+    .map((json) => createNotificationGroupFromJSON(json))
+    .filter((notification) => !newerGroupKeys.includes(notification.group_key));
+
+  const apiGroupKeys = (toInsert as NotificationGroup[]).map(
+    (group) => group.group_key,
+  );
+
+  const sinceId = gap.sinceId;
+  if (
+    notifications.length > 0 &&
+    !(
+      oldestPageNotification &&
+      sinceId &&
+      compareId(oldestPageNotification, sinceId) <= 0
+    )
+  ) {
+    // If we get an empty page, it means we reached the bottom, so we do not need to insert a new gap
+    // Similarly, if we've fetched more than the gap's, this means we have completely filled it
+    toInsert.push({
+      type: 'gap',
+      maxId: notifications.at(-1)?.page_max_id,
+      sinceId,
+    } as NotificationGap);
+  }
+
+  // Remove older groups covered by the API
+  groups = groups.filter(
+    (groupOrGap) =>
+      groupOrGap.type !== 'gap' && !apiGroupKeys.includes(groupOrGap.group_key),
+  );
+
+  // Replace the gap with API results (+ the new gap if needed)
+  groups.splice(gapIndex, 1, ...toInsert);
+
+  // Finally, merge any adjacent gaps that could have been created by filtering
+  // groups earlier
+  mergeGaps(groups);
+
+  return groups;
+}
+
+// Ensure the groups list starts with a gap, mutating it to prepend one if needed
+function ensureLeadingGap(
+  groups: NotificationGroupsState['groups'],
+): NotificationGap {
+  if (groups[0]?.type === 'gap') {
+    // We're expecting new notifications, so discard the maxId if there is one
+    groups[0].maxId = undefined;
+
+    return groups[0];
+  } else {
+    const gap: NotificationGap = {
+      type: 'gap',
+      sinceId: groups[0]?.page_min_id,
+    };
+
+    groups.unshift(gap);
+    return gap;
+  }
+}
+
 export const notificationGroupsReducer = createReducer<NotificationGroupsState>(
   initialState,
   (builder) => {
@@ -309,86 +413,36 @@ export const notificationGroupsReducer = createReducer<NotificationGroupsState>(
         updateLastReadId(state);
       })
       .addCase(fetchNotificationsGap.fulfilled, (state, action) => {
-        const { notifications } = action.payload;
-
-        // find the gap in the existing notifications
-        const gapIndex = state.groups.findIndex(
-          (groupOrGap) =>
-            groupOrGap.type === 'gap' &&
-            groupOrGap.sinceId === action.meta.arg.gap.sinceId &&
-            groupOrGap.maxId === action.meta.arg.gap.maxId,
+        state.groups = fillNotificationsGap(
+          state.groups,
+          action.meta.arg.gap,
+          action.payload.notifications,
         );
+        state.isLoading = false;
 
-        if (gapIndex < 0)
-          // We do not know where to insert, let's return
-          return;
-
-        // Filling a disconnection gap means we're getting historical data
-        // about groups we may know or may not know about.
-
-        // The notifications timeline is split in two by the gap, with
-        // group information newer than the gap, and group information older
-        // than the gap.
-
-        // Filling a gap should not touch anything before the gap, so any
-        // information on groups already appearing before the gap should be
-        // discarded, while any information on groups appearing after the gap
-        // can be updated and re-ordered.
-
-        const oldestPageNotification = notifications.at(-1)?.page_min_id;
-
-        // replace the gap with the notifications + a new gap
-
-        const newerGroupKeys = state.groups
-          .slice(0, gapIndex)
-          .filter(isNotificationGroup)
-          .map((group) => group.group_key);
-
-        const toInsert: NotificationGroupsState['groups'] = notifications
-          .map((json) => createNotificationGroupFromJSON(json))
-          .filter(
-            (notification) => !newerGroupKeys.includes(notification.group_key),
+        updateLastReadId(state);
+      })
+      .addCase(pollRecentNotifications.fulfilled, (state, action) => {
+        if (usePendingItems) {
+          const gap = ensureLeadingGap(state.pendingGroups);
+          state.pendingGroups = fillNotificationsGap(
+            state.pendingGroups,
+            gap,
+            action.payload.notifications,
+          );
+        } else {
+          const gap = ensureLeadingGap(state.groups);
+          state.groups = fillNotificationsGap(
+            state.groups,
+            gap,
+            action.payload.notifications,
           );
-
-        const apiGroupKeys = (toInsert as NotificationGroup[]).map(
-          (group) => group.group_key,
-        );
-
-        const sinceId = action.meta.arg.gap.sinceId;
-        if (
-          notifications.length > 0 &&
-          !(
-            oldestPageNotification &&
-            sinceId &&
-            compareId(oldestPageNotification, sinceId) <= 0
-          )
-        ) {
-          // If we get an empty page, it means we reached the bottom, so we do not need to insert a new gap
-          // Similarly, if we've fetched more than the gap's, this means we have completely filled it
-          toInsert.push({
-            type: 'gap',
-            maxId: notifications.at(-1)?.page_max_id,
-            sinceId,
-          } as NotificationGap);
         }
 
-        // Remove older groups covered by the API
-        state.groups = state.groups.filter(
-          (groupOrGap) =>
-            groupOrGap.type !== 'gap' &&
-            !apiGroupKeys.includes(groupOrGap.group_key),
-        );
-
-        // Replace the gap with API results (+ the new gap if needed)
-        state.groups.splice(gapIndex, 1, ...toInsert);
-
-        // Finally, merge any adjacent gaps that could have been created by filtering
-        // groups earlier
-        mergeGaps(state.groups);
-
         state.isLoading = false;
 
         updateLastReadId(state);
+        trimNotifications(state);
       })
       .addCase(processNewNotificationForGroups.fulfilled, (state, action) => {
         const notification = action.payload;
@@ -403,10 +457,11 @@ export const notificationGroupsReducer = createReducer<NotificationGroupsState>(
       })
       .addCase(disconnectTimeline, (state, action) => {
         if (action.payload.timeline === 'home') {
-          if (state.groups.length > 0 && state.groups[0]?.type !== 'gap') {
-            state.groups.unshift({
+          const groups = usePendingItems ? state.pendingGroups : state.groups;
+          if (groups.length > 0 && groups[0]?.type !== 'gap') {
+            groups.unshift({
               type: 'gap',
-              sinceId: state.groups[0]?.page_min_id,
+              sinceId: groups[0]?.page_min_id,
             });
           }
         }
@@ -453,12 +508,13 @@ export const notificationGroupsReducer = createReducer<NotificationGroupsState>(
               }
             }
           }
-          trimNotifications(state);
         });
 
         // Then build the consolidated list and clear pending groups
         state.groups = state.pendingGroups.concat(state.groups);
         state.pendingGroups = [];
+        mergeGaps(state.groups);
+        trimNotifications(state);
       })
       .addCase(updateScrollPosition.fulfilled, (state, action) => {
         state.scrolledToTop = action.payload.top;
@@ -518,13 +574,21 @@ export const notificationGroupsReducer = createReducer<NotificationGroupsState>(
         },
       )
       .addMatcher(
-        isAnyOf(fetchNotifications.pending, fetchNotificationsGap.pending),
+        isAnyOf(
+          fetchNotifications.pending,
+          fetchNotificationsGap.pending,
+          pollRecentNotifications.pending,
+        ),
         (state) => {
           state.isLoading = true;
         },
       )
       .addMatcher(
-        isAnyOf(fetchNotifications.rejected, fetchNotificationsGap.rejected),
+        isAnyOf(
+          fetchNotifications.rejected,
+          fetchNotificationsGap.rejected,
+          pollRecentNotifications.rejected,
+        ),
         (state) => {
           state.isLoading = false;
         },

From 19a1acb38b66c9d9f6e1ca937c9f163c4ffe9194 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 21 Aug 2024 16:54:59 +0200
Subject: [PATCH 1913/2191] Add `api_versions` to `/api/v2/instance` (#31354)

---
 app/serializers/rest/instance_serializer.rb |  8 +++++++-
 spec/requests/api/v2/instance_spec.rb       | 10 ++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/app/serializers/rest/instance_serializer.rb b/app/serializers/rest/instance_serializer.rb
index 8df79db6c774fd..5475bd12b43f2f 100644
--- a/app/serializers/rest/instance_serializer.rb
+++ b/app/serializers/rest/instance_serializer.rb
@@ -11,7 +11,7 @@ class ContactSerializer < ActiveModel::Serializer
 
   attributes :domain, :title, :version, :source_url, :description,
              :usage, :thumbnail, :languages, :configuration,
-             :registrations
+             :registrations, :api_versions
 
   has_one :contact, serializer: ContactSerializer
   has_many :rules, serializer: REST::RuleSerializer
@@ -94,6 +94,12 @@ def registrations
     }
   end
 
+  def api_versions
+    {
+      mastodon: 1,
+    }
+  end
+
   private
 
   def registrations_enabled?
diff --git a/spec/requests/api/v2/instance_spec.rb b/spec/requests/api/v2/instance_spec.rb
index 5c464f09a7d06e..2636970d6e5a36 100644
--- a/spec/requests/api/v2/instance_spec.rb
+++ b/spec/requests/api/v2/instance_spec.rb
@@ -18,6 +18,7 @@
         expect(body_as_json)
           .to be_present
           .and include(title: 'Mastodon')
+          .and include_api_versions
           .and include_configuration_limits
       end
     end
@@ -32,6 +33,7 @@
         expect(body_as_json)
           .to be_present
           .and include(title: 'Mastodon')
+          .and include_api_versions
           .and include_configuration_limits
       end
     end
@@ -53,5 +55,13 @@ def include_configuration_limits
         )
       )
     end
+
+    def include_api_versions
+      include(
+        api_versions: include(
+          mastodon: anything
+        )
+      )
+    end
   end
 end

From edeae945c0c9d6318d489ab720587621545063d0 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 21 Aug 2024 17:55:35 +0200
Subject: [PATCH 1914/2191] Remove fontawesome leftovers (#31525)

---
 app/javascript/styles/mastodon/accounts.scss   | 10 ----------
 app/javascript/styles/mastodon/admin.scss      |  8 --------
 app/javascript/styles/mastodon/components.scss |  4 ----
 app/javascript/styles/mastodon/dashboard.scss  |  4 ----
 app/javascript/styles/mastodon/forms.scss      |  4 ----
 app/javascript/styles/mastodon/rtl.scss        |  8 --------
 app/javascript/styles/mastodon/tables.scss     |  5 -----
 app/javascript/styles/mastodon/widgets.scss    |  9 +--------
 app/views/statuses/_poll.html.haml             |  6 +-----
 9 files changed, 2 insertions(+), 56 deletions(-)

diff --git a/app/javascript/styles/mastodon/accounts.scss b/app/javascript/styles/mastodon/accounts.scss
index 3f70a7d234327c..c769c88f75ae5a 100644
--- a/app/javascript/styles/mastodon/accounts.scss
+++ b/app/javascript/styles/mastodon/accounts.scss
@@ -130,21 +130,11 @@
   .older {
     float: left;
     padding-inline-start: 0;
-
-    .fa {
-      display: inline-block;
-      margin-inline-end: 5px;
-    }
   }
 
   .newer {
     float: right;
     padding-inline-end: 0;
-
-    .fa {
-      display: inline-block;
-      margin-inline-start: 5px;
-    }
   }
 
   .disabled {
diff --git a/app/javascript/styles/mastodon/admin.scss b/app/javascript/styles/mastodon/admin.scss
index 0df8d7a271cb01..fd9515cfefa62e 100644
--- a/app/javascript/styles/mastodon/admin.scss
+++ b/app/javascript/styles/mastodon/admin.scss
@@ -122,10 +122,6 @@ $content-width: 840px;
         overflow: hidden;
         text-overflow: ellipsis;
 
-        i.fa {
-          margin-inline-end: 5px;
-        }
-
         &:hover {
           color: $primary-text-color;
           transition: all 100ms linear;
@@ -306,10 +302,6 @@ $content-width: 840px;
       box-shadow: none;
     }
 
-    .directory__tag .table-action-link .fa {
-      color: inherit;
-    }
-
     .directory__tag h4 {
       font-size: 18px;
       font-weight: 700;
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 3d280ac4afd312..761dfb5696ca73 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -2891,10 +2891,6 @@ $ui-header-logo-wordmark-width: 99px;
     padding-inline-end: 30px;
   }
 
-  .search__icon .fa {
-    top: 15px;
-  }
-
   .scrollable {
     overflow: visible;
 
diff --git a/app/javascript/styles/mastodon/dashboard.scss b/app/javascript/styles/mastodon/dashboard.scss
index 12d0a6b92f9b90..1621220ccb522e 100644
--- a/app/javascript/styles/mastodon/dashboard.scss
+++ b/app/javascript/styles/mastodon/dashboard.scss
@@ -113,10 +113,6 @@
       flex: 1 1 auto;
     }
 
-    .fa {
-      flex: 0 0 auto;
-    }
-
     strong {
       font-weight: 700;
     }
diff --git a/app/javascript/styles/mastodon/forms.scss b/app/javascript/styles/mastodon/forms.scss
index cf8c1327dc51be..926df4e96fc039 100644
--- a/app/javascript/styles/mastodon/forms.scss
+++ b/app/javascript/styles/mastodon/forms.scss
@@ -930,10 +930,6 @@ code {
           font-weight: 700;
         }
       }
-
-      .fa {
-        font-weight: 400;
-      }
     }
   }
 }
diff --git a/app/javascript/styles/mastodon/rtl.scss b/app/javascript/styles/mastodon/rtl.scss
index 07fe96fc3ad1f1..e4e299ff82d9c2 100644
--- a/app/javascript/styles/mastodon/rtl.scss
+++ b/app/javascript/styles/mastodon/rtl.scss
@@ -41,14 +41,6 @@ body.rtl {
       no-repeat left 8px center / auto 16px;
   }
 
-  .fa-chevron-left::before {
-    content: '\F054';
-  }
-
-  .fa-chevron-right::before {
-    content: '\F053';
-  }
-
   .dismissable-banner,
   .warning-banner {
     &__action {
diff --git a/app/javascript/styles/mastodon/tables.scss b/app/javascript/styles/mastodon/tables.scss
index 4997ed9b847611..2becd85bc667ef 100644
--- a/app/javascript/styles/mastodon/tables.scss
+++ b/app/javascript/styles/mastodon/tables.scss
@@ -142,11 +142,6 @@ a.table-action-link {
     color: $highlight-text-color;
   }
 
-  i.fa {
-    font-weight: 400;
-    margin-inline-end: 5px;
-  }
-
   &:first-child {
     padding-inline-start: 0;
   }
diff --git a/app/javascript/styles/mastodon/widgets.scss b/app/javascript/styles/mastodon/widgets.scss
index da7d68ce8db39d..a8f678d482a2fe 100644
--- a/app/javascript/styles/mastodon/widgets.scss
+++ b/app/javascript/styles/mastodon/widgets.scss
@@ -169,11 +169,6 @@
 
   &__message {
     margin-bottom: 15px;
-
-    .fa {
-      margin-inline-end: 5px;
-      color: $darker-text-color;
-    }
   }
 
   &__card {
@@ -366,9 +361,7 @@
     padding-inline-end: 16px;
   }
 
-  .fa {
-    font-size: 16px;
-
+  .icon {
     &.active {
       color: $highlight-text-color;
     }
diff --git a/app/views/statuses/_poll.html.haml b/app/views/statuses/_poll.html.haml
index cf01b1da018dd6..62416a44da6dfd 100644
--- a/app/views/statuses/_poll.html.haml
+++ b/app/views/statuses/_poll.html.haml
@@ -1,11 +1,10 @@
 :ruby
   show_results = (user_signed_in? && poll.voted?(current_account)) || poll.expired?
-  own_votes = user_signed_in? ? poll.own_votes(current_account) : []
   total_votes_count = poll.voters_count || poll.votes_count
 
 .poll
   %ul
-    - poll.loaded_options.each_with_index do |option, index|
+    - poll.loaded_options.each do |option|
       %li
         - if show_results
           - percent = total_votes_count.positive? ? 100 * option.votes_count / total_votes_count : 0
@@ -14,9 +13,6 @@
               #{percent.round}%
             %span.poll__option__text
               = prerender_custom_emojis(h(option.title), status.emojis)
-            - if own_votes.include?(index)
-              %span.poll__voted
-                %i.poll__voted__mark.fa.fa-check
 
           %progress{ max: 100, value: [percent, 1].max, 'aria-hidden': 'true' }
             %span.poll__chart

From bae0b81779ccf798a7876f460c9841fb40540126 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 21 Aug 2024 09:08:58 +0200
Subject: [PATCH 1915/2191] [Glitch] Change hints for missing remote content in
 web UI

Port b06c7b6b5ae28cb81e5ba8ba632ebc629d1fed57 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../glitch/components/timeline_hint.tsx       | 27 ++++++++-----------
 .../features/account_timeline/index.jsx       | 21 +++++++++++----
 .../glitch/features/followers/index.jsx       | 21 +++++++++++----
 .../glitch/features/following/index.jsx       | 21 +++++++++++----
 .../flavours/glitch/features/status/index.jsx |  9 ++++++-
 .../flavours/glitch/styles/components.scss    | 13 ++++-----
 6 files changed, 74 insertions(+), 38 deletions(-)

diff --git a/app/javascript/flavours/glitch/components/timeline_hint.tsx b/app/javascript/flavours/glitch/components/timeline_hint.tsx
index 6faad2fbb875eb..9e0d3676ec7469 100644
--- a/app/javascript/flavours/glitch/components/timeline_hint.tsx
+++ b/app/javascript/flavours/glitch/components/timeline_hint.tsx
@@ -1,28 +1,23 @@
-import { FormattedMessage } from 'react-intl';
-
 import classNames from 'classnames';
 
 interface Props {
-  resource: JSX.Element;
+  message: React.ReactNode;
+  label: React.ReactNode;
   url: string;
   className?: string;
 }
 
-export const TimelineHint: React.FC<Props> = ({ className, resource, url }) => (
+export const TimelineHint: React.FC<Props> = ({
+  className,
+  message,
+  label,
+  url,
+}) => (
   <div className={classNames('timeline-hint', className)}>
-    <strong>
-      <FormattedMessage
-        id='timeline_hint.remote_resource_not_displayed'
-        defaultMessage='{resource} from other servers are not displayed.'
-        values={{ resource }}
-      />
-    </strong>
-    <br />
+    <p>{message}</p>
+
     <a href={url} target='_blank' rel='noopener noreferrer'>
-      <FormattedMessage
-        id='account.browse_more_on_origin_server'
-        defaultMessage='Browse more on the original profile'
-      />
+      {label}
     </a>
   </div>
 );
diff --git a/app/javascript/flavours/glitch/features/account_timeline/index.jsx b/app/javascript/flavours/glitch/features/account_timeline/index.jsx
index cf99a1f5699a90..813e0c7a311d92 100644
--- a/app/javascript/flavours/glitch/features/account_timeline/index.jsx
+++ b/app/javascript/flavours/glitch/features/account_timeline/index.jsx
@@ -12,6 +12,7 @@ import ProfileColumnHeader from 'flavours/glitch/features/account/components/pro
 import BundleColumnError from 'flavours/glitch/features/ui/components/bundle_column_error';
 import { normalizeForLookup } from 'flavours/glitch/reducers/accounts_map';
 import { getAccountHidden } from 'flavours/glitch/selectors';
+import { useAppSelector } from 'flavours/glitch/store';
 
 import { lookupAccount, fetchAccount } from '../../actions/accounts';
 import { fetchFeaturedTags } from '../../actions/featured_tags';
@@ -57,12 +58,22 @@ const mapStateToProps = (state, { params: { acct, id, tagged }, withReplies = fa
   };
 };
 
-const RemoteHint = ({ url }) => (
-  <TimelineHint url={url} resource={<FormattedMessage id='timeline_hint.resources.statuses' defaultMessage='Older posts' />} />
-);
+const RemoteHint = ({ accountId, url }) => {
+  const acct = useAppSelector(state => state.accounts.get(accountId)?.acct);
+  const domain = acct ? acct.split('@')[1] : undefined;
+
+  return (
+    <TimelineHint
+      url={url}
+      message={<FormattedMessage id='hints.profiles.posts_may_be_missing' defaultMessage='Some posts from this profile may be missing.' />}
+      label={<FormattedMessage id='hints.profiles.see_more_posts' defaultMessage='See more posts on {domain}' values={{ domain: <strong>{domain}</strong> }} />}
+    />
+  );
+};
 
 RemoteHint.propTypes = {
   url: PropTypes.string.isRequired,
+  accountId: PropTypes.string.isRequired,
 };
 
 class AccountTimeline extends ImmutablePureComponent {
@@ -176,12 +187,12 @@ class AccountTimeline extends ImmutablePureComponent {
     } else if (hidden) {
       emptyMessage = <LimitedAccountHint accountId={accountId} />;
     } else if (remote && statusIds.isEmpty()) {
-      emptyMessage = <RemoteHint url={remoteUrl} />;
+      emptyMessage = <RemoteHint accountId={accountId} url={remoteUrl} />;
     } else {
       emptyMessage = <FormattedMessage id='empty_column.account_timeline' defaultMessage='No posts found' />;
     }
 
-    const remoteMessage = remote ? <RemoteHint url={remoteUrl} /> : null;
+    const remoteMessage = remote ? <RemoteHint accountId={accountId} url={remoteUrl} /> : null;
 
     return (
       <Column ref={this.setRef}>
diff --git a/app/javascript/flavours/glitch/features/followers/index.jsx b/app/javascript/flavours/glitch/features/followers/index.jsx
index 2ea3574a9010f3..7b662963d24ce3 100644
--- a/app/javascript/flavours/glitch/features/followers/index.jsx
+++ b/app/javascript/flavours/glitch/features/followers/index.jsx
@@ -12,6 +12,7 @@ import { TimelineHint } from 'flavours/glitch/components/timeline_hint';
 import BundleColumnError from 'flavours/glitch/features/ui/components/bundle_column_error';
 import { normalizeForLookup } from 'flavours/glitch/reducers/accounts_map';
 import { getAccountHidden } from 'flavours/glitch/selectors';
+import { useAppSelector } from 'flavours/glitch/store';
 
 import {
   lookupAccount,
@@ -50,12 +51,22 @@ const mapStateToProps = (state, { params: { acct, id } }) => {
   };
 };
 
-const RemoteHint = ({ url }) => (
-  <TimelineHint url={url} resource={<FormattedMessage id='timeline_hint.resources.followers' defaultMessage='Followers' />} />
-);
+const RemoteHint = ({ accountId, url }) => {
+  const acct = useAppSelector(state => state.accounts.get(accountId)?.acct);
+  const domain = acct ? acct.split('@')[1] : undefined;
+
+  return (
+    <TimelineHint
+      url={url}
+      message={<FormattedMessage id='hints.profiles.followers_may_be_missing' defaultMessage='Followers for this profile may be missing.' />}
+      label={<FormattedMessage id='hints.profiles.see_more_followers' defaultMessage='See more followers on {domain}' values={{ domain: <strong>{domain}</strong> }} />}
+    />
+  );
+};
 
 RemoteHint.propTypes = {
   url: PropTypes.string.isRequired,
+  accountId: PropTypes.string.isRequired,
 };
 
 class Followers extends ImmutablePureComponent {
@@ -145,12 +156,12 @@ class Followers extends ImmutablePureComponent {
     } else if (hideCollections && accountIds.isEmpty()) {
       emptyMessage = <FormattedMessage id='empty_column.account_hides_collections' defaultMessage='This user has chosen to not make this information available' />;
     } else if (remote && accountIds.isEmpty()) {
-      emptyMessage = <RemoteHint url={remoteUrl} />;
+      emptyMessage = <RemoteHint accountId={accountId} url={remoteUrl} />;
     } else {
       emptyMessage = <FormattedMessage id='account.followers.empty' defaultMessage='No one follows this user yet.' />;
     }
 
-    const remoteMessage = remote ? <RemoteHint url={remoteUrl} /> : null;
+    const remoteMessage = remote ? <RemoteHint accountId={accountId} url={remoteUrl} /> : null;
 
     return (
       <Column ref={this.setRef}>
diff --git a/app/javascript/flavours/glitch/features/following/index.jsx b/app/javascript/flavours/glitch/features/following/index.jsx
index 0d18e76ec4e653..c3f00cc894f0d1 100644
--- a/app/javascript/flavours/glitch/features/following/index.jsx
+++ b/app/javascript/flavours/glitch/features/following/index.jsx
@@ -12,6 +12,7 @@ import { TimelineHint } from 'flavours/glitch/components/timeline_hint';
 import BundleColumnError from 'flavours/glitch/features/ui/components/bundle_column_error';
 import { normalizeForLookup } from 'flavours/glitch/reducers/accounts_map';
 import { getAccountHidden } from 'flavours/glitch/selectors';
+import { useAppSelector } from 'flavours/glitch/store';
 
 import {
   lookupAccount,
@@ -50,12 +51,22 @@ const mapStateToProps = (state, { params: { acct, id } }) => {
   };
 };
 
-const RemoteHint = ({ url }) => (
-  <TimelineHint url={url} resource={<FormattedMessage id='timeline_hint.resources.follows' defaultMessage='Follows' />} />
-);
+const RemoteHint = ({ accountId, url }) => {
+  const acct = useAppSelector(state => state.accounts.get(accountId)?.acct);
+  const domain = acct ? acct.split('@')[1] : undefined;
+
+  return (
+    <TimelineHint
+      url={url}
+      message={<FormattedMessage id='hints.profiles.follows_may_be_missing' defaultMessage='Follows for this profile may be missing.' />}
+      label={<FormattedMessage id='hints.profiles.see_more_follows' defaultMessage='See more follows on {domain}' values={{ domain: <strong>{domain}</strong> }} />}
+    />
+  );
+};
 
 RemoteHint.propTypes = {
   url: PropTypes.string.isRequired,
+  accountId: PropTypes.string.isRequired,
 };
 
 class Following extends ImmutablePureComponent {
@@ -145,12 +156,12 @@ class Following extends ImmutablePureComponent {
     } else if (hideCollections && accountIds.isEmpty()) {
       emptyMessage = <FormattedMessage id='empty_column.account_hides_collections' defaultMessage='This user has chosen to not make this information available' />;
     } else if (remote && accountIds.isEmpty()) {
-      emptyMessage = <RemoteHint url={remoteUrl} />;
+      emptyMessage = <RemoteHint accountId={accountId} url={remoteUrl} />;
     } else {
       emptyMessage = <FormattedMessage id='account.follows.empty' defaultMessage="This user doesn't follow anyone yet." />;
     }
 
-    const remoteMessage = remote ? <RemoteHint url={remoteUrl} /> : null;
+    const remoteMessage = remote ? <RemoteHint accountId={accountId} url={remoteUrl} /> : null;
 
     return (
       <Column ref={this.setRef}>
diff --git a/app/javascript/flavours/glitch/features/status/index.jsx b/app/javascript/flavours/glitch/features/status/index.jsx
index 382f0ae03740c6..279d90b99810d6 100644
--- a/app/javascript/flavours/glitch/features/status/index.jsx
+++ b/app/javascript/flavours/glitch/features/status/index.jsx
@@ -655,7 +655,14 @@ class Status extends ImmutablePureComponent {
     const isIndexable = !status.getIn(['account', 'noindex']);
 
     if (!isLocal) {
-      remoteHint = <TimelineHint className={classNames(!!descendants && 'timeline-hint--with-descendants')} url={status.get('url')} resource={<FormattedMessage id='timeline_hint.resources.replies' defaultMessage='Some replies' />} />;
+      remoteHint = (
+        <TimelineHint
+          className={classNames(!!descendants && 'timeline-hint--with-descendants')}
+          url={status.get('url')}
+          message={<FormattedMessage id='hints.threads.replies_may_be_missing' defaultMessage='Replies from other servers may be missing.' />}
+          label={<FormattedMessage id='hints.threads.see_more' defaultMessage='See more replies on {domain}' values={{ domain: <strong>{status.getIn(['account', 'acct']).split('@')[1]}</strong> }} />}
+        />
+      );
     }
 
     const handlers = {
diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index e1c6f658f3c083..06ac1ae4cdb5d4 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -4422,11 +4422,12 @@ a.status-card {
 
 .timeline-hint {
   text-align: center;
-  color: $darker-text-color;
-  padding: 15px;
+  color: $dark-text-color;
+  padding: 16px;
   box-sizing: border-box;
   width: 100%;
-  cursor: default;
+  font-size: 14px;
+  line-height: 21px;
 
   strong {
     font-weight: 500;
@@ -4443,10 +4444,10 @@ a.status-card {
       color: lighten($highlight-text-color, 4%);
     }
   }
-}
 
-.timeline-hint--with-descendants {
-  border-top: 1px solid var(--background-border-color);
+  &--with-descendants {
+    border-top: 1px solid var(--background-border-color);
+  }
 }
 
 .regeneration-indicator {

From b2e6f11b813bd8a5faf7c5f4c7c7c13a93438b60 Mon Sep 17 00:00:00 2001
From: mogaminsk <mgmnjp@icloud.com>
Date: Wed, 21 Aug 2024 17:56:36 +0900
Subject: [PATCH 1916/2191] [Glitch] Change translation strings of grouped
 notification label to have full context

Port 8c7642cd186315f364a3a2d9090ebd87c2d684c6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../components/displayed_name.tsx             | 22 ++++++++
 .../components/names_list.tsx                 | 51 -------------------
 .../components/notification_admin_sign_up.tsx | 28 +++++++---
 .../components/notification_favourite.tsx     | 32 +++++++++---
 .../components/notification_follow.tsx        | 28 +++++++---
 .../notification_follow_request.tsx           | 28 +++++++---
 .../notification_group_with_status.tsx        | 20 ++++----
 .../components/notification_reblog.tsx        | 32 +++++++++---
 .../components/notification_status.tsx        |  4 +-
 .../components/notification_update.tsx        |  4 +-
 .../components/notification_with_status.tsx   |  7 +--
 11 files changed, 150 insertions(+), 106 deletions(-)
 create mode 100644 app/javascript/flavours/glitch/features/notifications_v2/components/displayed_name.tsx
 delete mode 100644 app/javascript/flavours/glitch/features/notifications_v2/components/names_list.tsx

diff --git a/app/javascript/flavours/glitch/features/notifications_v2/components/displayed_name.tsx b/app/javascript/flavours/glitch/features/notifications_v2/components/displayed_name.tsx
new file mode 100644
index 00000000000000..dd0ac10aa03b60
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/notifications_v2/components/displayed_name.tsx
@@ -0,0 +1,22 @@
+import { Link } from 'react-router-dom';
+
+import { useAppSelector } from 'flavours/glitch/store';
+
+export const DisplayedName: React.FC<{
+  accountIds: string[];
+}> = ({ accountIds }) => {
+  const lastAccountId = accountIds[0] ?? '0';
+  const account = useAppSelector((state) => state.accounts.get(lastAccountId));
+
+  if (!account) return null;
+
+  return (
+    <Link
+      to={`/@${account.acct}`}
+      title={`@${account.acct}`}
+      data-hover-card-account={account.id}
+    >
+      <bdi dangerouslySetInnerHTML={{ __html: account.display_name_html }} />
+    </Link>
+  );
+};
diff --git a/app/javascript/flavours/glitch/features/notifications_v2/components/names_list.tsx b/app/javascript/flavours/glitch/features/notifications_v2/components/names_list.tsx
deleted file mode 100644
index a46b584e46b3c6..00000000000000
--- a/app/javascript/flavours/glitch/features/notifications_v2/components/names_list.tsx
+++ /dev/null
@@ -1,51 +0,0 @@
-import { FormattedMessage } from 'react-intl';
-
-import { Link } from 'react-router-dom';
-
-import { useAppSelector } from 'flavours/glitch/store';
-
-export const NamesList: React.FC<{
-  accountIds: string[];
-  total: number;
-  seeMoreHref?: string;
-}> = ({ accountIds, total, seeMoreHref }) => {
-  const lastAccountId = accountIds[0] ?? '0';
-  const account = useAppSelector((state) => state.accounts.get(lastAccountId));
-
-  if (!account) return null;
-
-  const displayedName = (
-    <Link
-      to={`/@${account.acct}`}
-      title={`@${account.acct}`}
-      data-hover-card-account={account.id}
-    >
-      <bdi dangerouslySetInnerHTML={{ __html: account.display_name_html }} />
-    </Link>
-  );
-
-  if (total === 1) {
-    return displayedName;
-  }
-
-  if (seeMoreHref)
-    return (
-      <FormattedMessage
-        id='name_and_others_with_link'
-        defaultMessage='{name} and <a>{count, plural, one {# other} other {# others}}</a>'
-        values={{
-          name: displayedName,
-          count: total - 1,
-          a: (chunks) => <Link to={seeMoreHref}>{chunks}</Link>,
-        }}
-      />
-    );
-
-  return (
-    <FormattedMessage
-      id='name_and_others'
-      defaultMessage='{name} and {count, plural, one {# other} other {# others}}'
-      values={{ name: displayedName, count: total - 1 }}
-    />
-  );
-};
diff --git a/app/javascript/flavours/glitch/features/notifications_v2/components/notification_admin_sign_up.tsx b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_admin_sign_up.tsx
index 8a56b880a8ed13..134ef2db5715b2 100644
--- a/app/javascript/flavours/glitch/features/notifications_v2/components/notification_admin_sign_up.tsx
+++ b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_admin_sign_up.tsx
@@ -6,13 +6,27 @@ import type { NotificationGroupAdminSignUp } from 'flavours/glitch/models/notifi
 import type { LabelRenderer } from './notification_group_with_status';
 import { NotificationGroupWithStatus } from './notification_group_with_status';
 
-const labelRenderer: LabelRenderer = (values) => (
-  <FormattedMessage
-    id='notification.admin.sign_up'
-    defaultMessage='{name} signed up'
-    values={values}
-  />
-);
+const labelRenderer: LabelRenderer = (displayedName, total) => {
+  if (total === 1)
+    return (
+      <FormattedMessage
+        id='notification.admin.sign_up'
+        defaultMessage='{name} signed up'
+        values={{ name: displayedName }}
+      />
+    );
+
+  return (
+    <FormattedMessage
+      id='notification.admin.sign_up.name_and_others'
+      defaultMessage='{name} and {count, plural, one {# other} other {# others}} signed up'
+      values={{
+        name: displayedName,
+        count: total - 1,
+      }}
+    />
+  );
+};
 
 export const NotificationAdminSignUp: React.FC<{
   notification: NotificationGroupAdminSignUp;
diff --git a/app/javascript/flavours/glitch/features/notifications_v2/components/notification_favourite.tsx b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_favourite.tsx
index 8e16a042ced32e..ad01f622f63451 100644
--- a/app/javascript/flavours/glitch/features/notifications_v2/components/notification_favourite.tsx
+++ b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_favourite.tsx
@@ -1,5 +1,7 @@
 import { FormattedMessage } from 'react-intl';
 
+import { Link } from 'react-router-dom';
+
 import StarIcon from '@/material-icons/400-24px/star-fill.svg?react';
 import type { NotificationGroupFavourite } from 'flavours/glitch/models/notification_group';
 import { useAppSelector } from 'flavours/glitch/store';
@@ -7,13 +9,29 @@ import { useAppSelector } from 'flavours/glitch/store';
 import type { LabelRenderer } from './notification_group_with_status';
 import { NotificationGroupWithStatus } from './notification_group_with_status';
 
-const labelRenderer: LabelRenderer = (values) => (
-  <FormattedMessage
-    id='notification.favourite'
-    defaultMessage='{name} favorited your status'
-    values={values}
-  />
-);
+const labelRenderer: LabelRenderer = (displayedName, total, seeMoreHref) => {
+  if (total === 1)
+    return (
+      <FormattedMessage
+        id='notification.favourite'
+        defaultMessage='{name} favorited your status'
+        values={{ name: displayedName }}
+      />
+    );
+
+  return (
+    <FormattedMessage
+      id='notification.favourite.name_and_others_with_link'
+      defaultMessage='{name} and <a>{count, plural, one {# other} other {# others}}</a> favorited your post'
+      values={{
+        name: displayedName,
+        count: total - 1,
+        a: (chunks) =>
+          seeMoreHref ? <Link to={seeMoreHref}>{chunks}</Link> : chunks,
+      }}
+    />
+  );
+};
 
 export const NotificationFavourite: React.FC<{
   notification: NotificationGroupFavourite;
diff --git a/app/javascript/flavours/glitch/features/notifications_v2/components/notification_follow.tsx b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_follow.tsx
index 3bb37082551f45..f154e801fb9017 100644
--- a/app/javascript/flavours/glitch/features/notifications_v2/components/notification_follow.tsx
+++ b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_follow.tsx
@@ -10,13 +10,27 @@ import { useAppSelector } from 'flavours/glitch/store';
 import type { LabelRenderer } from './notification_group_with_status';
 import { NotificationGroupWithStatus } from './notification_group_with_status';
 
-const labelRenderer: LabelRenderer = (values) => (
-  <FormattedMessage
-    id='notification.follow'
-    defaultMessage='{name} followed you'
-    values={values}
-  />
-);
+const labelRenderer: LabelRenderer = (displayedName, total) => {
+  if (total === 1)
+    return (
+      <FormattedMessage
+        id='notification.follow'
+        defaultMessage='{name} followed you'
+        values={{ name: displayedName }}
+      />
+    );
+
+  return (
+    <FormattedMessage
+      id='notification.follow.name_and_others'
+      defaultMessage='{name} and {count, plural, one {# other} other {# others}} followed you'
+      values={{
+        name: displayedName,
+        count: total - 1,
+      }}
+    />
+  );
+};
 
 const FollowerCount: React.FC<{ accountId: string }> = ({ accountId }) => {
   const account = useAppSelector((s) => s.accounts.get(accountId));
diff --git a/app/javascript/flavours/glitch/features/notifications_v2/components/notification_follow_request.tsx b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_follow_request.tsx
index 02fe1329e690e7..17baae2b27b7bd 100644
--- a/app/javascript/flavours/glitch/features/notifications_v2/components/notification_follow_request.tsx
+++ b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_follow_request.tsx
@@ -21,13 +21,27 @@ const messages = defineMessages({
   reject: { id: 'follow_request.reject', defaultMessage: 'Reject' },
 });
 
-const labelRenderer: LabelRenderer = (values) => (
-  <FormattedMessage
-    id='notification.follow_request'
-    defaultMessage='{name} has requested to follow you'
-    values={values}
-  />
-);
+const labelRenderer: LabelRenderer = (displayedName, total) => {
+  if (total === 1)
+    return (
+      <FormattedMessage
+        id='notification.follow_request'
+        defaultMessage='{name} has requested to follow you'
+        values={{ name: displayedName }}
+      />
+    );
+
+  return (
+    <FormattedMessage
+      id='notification.follow_request.name_and_others'
+      defaultMessage='{name} and {count, plural, one {# other} other {# others}} has requested to follow you'
+      values={{
+        name: displayedName,
+        count: total - 1,
+      }}
+    />
+  );
+};
 
 export const NotificationFollowRequest: React.FC<{
   notification: NotificationGroupFollowRequest;
diff --git a/app/javascript/flavours/glitch/features/notifications_v2/components/notification_group_with_status.tsx b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_group_with_status.tsx
index 7dc498f24473a0..233caaf65e6f8b 100644
--- a/app/javascript/flavours/glitch/features/notifications_v2/components/notification_group_with_status.tsx
+++ b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_group_with_status.tsx
@@ -12,11 +12,13 @@ import { RelativeTimestamp } from 'flavours/glitch/components/relative_timestamp
 import { useAppDispatch } from 'flavours/glitch/store';
 
 import { AvatarGroup } from './avatar_group';
+import { DisplayedName } from './displayed_name';
 import { EmbeddedStatus } from './embedded_status';
-import { NamesList } from './names_list';
 
 export type LabelRenderer = (
-  values: Record<string, React.ReactNode>,
+  displayedName: JSX.Element,
+  total: number,
+  seeMoreHref?: string,
 ) => JSX.Element;
 
 export const NotificationGroupWithStatus: React.FC<{
@@ -50,15 +52,11 @@ export const NotificationGroupWithStatus: React.FC<{
 
   const label = useMemo(
     () =>
-      labelRenderer({
-        name: (
-          <NamesList
-            accountIds={accountIds}
-            total={count}
-            seeMoreHref={labelSeeMoreHref}
-          />
-        ),
-      }),
+      labelRenderer(
+        <DisplayedName accountIds={accountIds} />,
+        count,
+        labelSeeMoreHref,
+      ),
     [labelRenderer, accountIds, count, labelSeeMoreHref],
   );
 
diff --git a/app/javascript/flavours/glitch/features/notifications_v2/components/notification_reblog.tsx b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_reblog.tsx
index 0748b56c9479c5..1029bae33c46ec 100644
--- a/app/javascript/flavours/glitch/features/notifications_v2/components/notification_reblog.tsx
+++ b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_reblog.tsx
@@ -1,5 +1,7 @@
 import { FormattedMessage } from 'react-intl';
 
+import { Link } from 'react-router-dom';
+
 import RepeatIcon from '@/material-icons/400-24px/repeat.svg?react';
 import type { NotificationGroupReblog } from 'flavours/glitch/models/notification_group';
 import { useAppSelector } from 'flavours/glitch/store';
@@ -7,13 +9,29 @@ import { useAppSelector } from 'flavours/glitch/store';
 import type { LabelRenderer } from './notification_group_with_status';
 import { NotificationGroupWithStatus } from './notification_group_with_status';
 
-const labelRenderer: LabelRenderer = (values) => (
-  <FormattedMessage
-    id='notification.reblog'
-    defaultMessage='{name} boosted your status'
-    values={values}
-  />
-);
+const labelRenderer: LabelRenderer = (displayedName, total, seeMoreHref) => {
+  if (total === 1)
+    return (
+      <FormattedMessage
+        id='notification.reblog'
+        defaultMessage='{name} boosted your status'
+        values={{ name: displayedName }}
+      />
+    );
+
+  return (
+    <FormattedMessage
+      id='notification.reblog.name_and_others_with_link'
+      defaultMessage='{name} and <a>{count, plural, one {# other} other {# others}}</a> boosted your post'
+      values={{
+        name: displayedName,
+        count: total - 1,
+        a: (chunks) =>
+          seeMoreHref ? <Link to={seeMoreHref}>{chunks}</Link> : chunks,
+      }}
+    />
+  );
+};
 
 export const NotificationReblog: React.FC<{
   notification: NotificationGroupReblog;
diff --git a/app/javascript/flavours/glitch/features/notifications_v2/components/notification_status.tsx b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_status.tsx
index 2d9944eb18f28f..7fea8edff714a2 100644
--- a/app/javascript/flavours/glitch/features/notifications_v2/components/notification_status.tsx
+++ b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_status.tsx
@@ -6,11 +6,11 @@ import type { NotificationGroupStatus } from 'flavours/glitch/models/notificatio
 import type { LabelRenderer } from './notification_group_with_status';
 import { NotificationWithStatus } from './notification_with_status';
 
-const labelRenderer: LabelRenderer = (values) => (
+const labelRenderer: LabelRenderer = (displayedName) => (
   <FormattedMessage
     id='notification.status'
     defaultMessage='{name} just posted'
-    values={values}
+    values={{ name: displayedName }}
   />
 );
 
diff --git a/app/javascript/flavours/glitch/features/notifications_v2/components/notification_update.tsx b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_update.tsx
index 6b9452a3ebba3a..52c7a4d0f9f798 100644
--- a/app/javascript/flavours/glitch/features/notifications_v2/components/notification_update.tsx
+++ b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_update.tsx
@@ -6,11 +6,11 @@ import type { NotificationGroupUpdate } from 'flavours/glitch/models/notificatio
 import type { LabelRenderer } from './notification_group_with_status';
 import { NotificationWithStatus } from './notification_with_status';
 
-const labelRenderer: LabelRenderer = (values) => (
+const labelRenderer: LabelRenderer = (displayedName) => (
   <FormattedMessage
     id='notification.update'
     defaultMessage='{name} edited a post'
-    values={values}
+    values={{ name: displayedName }}
   />
 );
 
diff --git a/app/javascript/flavours/glitch/features/notifications_v2/components/notification_with_status.tsx b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_with_status.tsx
index 8543baa537b798..941b1254f7cd02 100644
--- a/app/javascript/flavours/glitch/features/notifications_v2/components/notification_with_status.tsx
+++ b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_with_status.tsx
@@ -18,7 +18,7 @@ import { Icon } from 'flavours/glitch/components/icon';
 import Status from 'flavours/glitch/containers/status_container';
 import { useAppSelector, useAppDispatch } from 'flavours/glitch/store';
 
-import { NamesList } from './names_list';
+import { DisplayedName } from './displayed_name';
 import type { LabelRenderer } from './notification_group_with_status';
 
 export const NotificationWithStatus: React.FC<{
@@ -43,10 +43,7 @@ export const NotificationWithStatus: React.FC<{
   const dispatch = useAppDispatch();
 
   const label = useMemo(
-    () =>
-      labelRenderer({
-        name: <NamesList accountIds={accountIds} total={count} />,
-      }),
+    () => labelRenderer(<DisplayedName accountIds={accountIds} />, count),
     [labelRenderer, accountIds, count],
   );
 

From 66bc8d5717dbba486e7a95421eda33ec1b6dffdb Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 21 Aug 2024 12:25:14 +0200
Subject: [PATCH 1917/2191] [Glitch] Fix distracting and confusing
 always-showing scrollbar track in boost confirmation modal

Port e48a64d3b541087acd101f9149c956ffb07119f3 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/styles/components.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index 06ac1ae4cdb5d4..7536ab181ebd6d 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -6726,7 +6726,7 @@ a.status-card {
 }
 
 .boost-modal__container {
-  overflow-x: scroll;
+  overflow-y: auto;
   padding: 10px;
 
   .status {

From a9cef5c324db35a62e021d88384f13c02e701ae5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?KMY=EF=BC=88=E9=9B=AA=E3=81=82=E3=81=99=E3=81=8B=EF=BC=89?=
 <tt@kmycode.net>
Date: Wed, 21 Aug 2024 22:11:36 +0900
Subject: [PATCH 1918/2191] [Glitch] Fix boost dialog visibility selection not
 being taken into account

Port 01a757d306276213276580a31ecbeffa21d88076 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/actions/interactions.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/javascript/flavours/glitch/actions/interactions.js b/app/javascript/flavours/glitch/actions/interactions.js
index 43673642f5cb89..92142d782c1c90 100644
--- a/app/javascript/flavours/glitch/actions/interactions.js
+++ b/app/javascript/flavours/glitch/actions/interactions.js
@@ -437,12 +437,12 @@ export function unpinFail(status, error) {
   };
 }
 
-function toggleReblogWithoutConfirmation(status, privacy) {
+function toggleReblogWithoutConfirmation(status, visibility) {
   return (dispatch) => {
     if (status.get('reblogged')) {
       dispatch(unreblog({ statusId: status.get('id') }));
     } else {
-      dispatch(reblog({ statusId: status.get('id'), privacy }));
+      dispatch(reblog({ statusId: status.get('id'), visibility }));
     }
   };
 }

From 24849cdb1f66b8485cb7406de167d03f792e1e89 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 21 Aug 2024 16:41:31 +0200
Subject: [PATCH 1919/2191] [Glitch] Add automatic notification polling for
 grouped notifications

Port d67e11733e4159c736f4370ee7ea86240a297bb7 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../glitch/actions/notification_groups.ts     |  23 ++
 .../flavours/glitch/actions/streaming.js      |  25 +-
 .../flavours/glitch/api/notifications.ts      |   1 +
 .../glitch/reducers/notification_groups.ts    | 222 +++++++++++-------
 4 files changed, 186 insertions(+), 85 deletions(-)

diff --git a/app/javascript/flavours/glitch/actions/notification_groups.ts b/app/javascript/flavours/glitch/actions/notification_groups.ts
index 3d970e57f352de..ba93ab776b65b5 100644
--- a/app/javascript/flavours/glitch/actions/notification_groups.ts
+++ b/app/javascript/flavours/glitch/actions/notification_groups.ts
@@ -11,6 +11,7 @@ import type {
 } from 'flavours/glitch/api_types/notifications';
 import { allNotificationTypes } from 'flavours/glitch/api_types/notifications';
 import type { ApiStatusJSON } from 'flavours/glitch/api_types/statuses';
+import { usePendingItems } from 'flavours/glitch/initial_state';
 import type { NotificationGap } from 'flavours/glitch/reducers/notification_groups';
 import {
   selectSettingsNotificationsExcludedTypes,
@@ -103,6 +104,28 @@ export const fetchNotificationsGap = createDataLoadingThunk(
   },
 );
 
+export const pollRecentNotifications = createDataLoadingThunk(
+  'notificationGroups/pollRecentNotifications',
+  async (_params, { getState }) => {
+    return apiFetchNotifications({
+      max_id: undefined,
+      // In slow mode, we don't want to include notifications that duplicate the already-displayed ones
+      since_id: usePendingItems
+        ? getState().notificationGroups.groups.find(
+            (group) => group.type !== 'gap',
+          )?.page_max_id
+        : undefined,
+    });
+  },
+  ({ notifications, accounts, statuses }, { dispatch }) => {
+    dispatch(importFetchedAccounts(accounts));
+    dispatch(importFetchedStatuses(statuses));
+    dispatchAssociatedRecords(dispatch, notifications);
+
+    return { notifications };
+  },
+);
+
 export const processNewNotificationForGroups = createAppAsyncThunk(
   'notificationGroups/processNew',
   (notification: ApiNotificationJSON, { dispatch, getState }) => {
diff --git a/app/javascript/flavours/glitch/actions/streaming.js b/app/javascript/flavours/glitch/actions/streaming.js
index f5beff55d6ff36..49636d621253b8 100644
--- a/app/javascript/flavours/glitch/actions/streaming.js
+++ b/app/javascript/flavours/glitch/actions/streaming.js
@@ -10,7 +10,7 @@ import {
   deleteAnnouncement,
 } from './announcements';
 import { updateConversations } from './conversations';
-import { processNewNotificationForGroups, refreshStaleNotificationGroups } from './notification_groups';
+import { processNewNotificationForGroups, refreshStaleNotificationGroups, pollRecentNotifications as pollRecentGroupNotifications } from './notification_groups';
 import { updateNotifications, expandNotifications } from './notifications';
 import { updateStatus } from './statuses';
 import {
@@ -37,7 +37,7 @@ const randomUpTo = max =>
  * @param {string} channelName
  * @param {Object.<string, string>} params
  * @param {Object} options
- * @param {function(Function): Promise<void>} [options.fallback]
+ * @param {function(Function, Function): Promise<void>} [options.fallback]
  * @param {function(): void} [options.fillGaps]
  * @param {function(object): boolean} [options.accept]
  * @returns {function(): void}
@@ -52,11 +52,11 @@ export const connectTimelineStream = (timelineId, channelName, params = {}, opti
     let pollingId;
 
     /**
-     * @param {function(Function): Promise<void>} fallback
+     * @param {function(Function, Function): Promise<void>} fallback
      */
 
     const useFallback = async fallback => {
-      await fallback(dispatch);
+      await fallback(dispatch, getState);
       // eslint-disable-next-line react-hooks/rules-of-hooks -- this is not a react hook
       pollingId = setTimeout(() => useFallback(fallback), 20000 + randomUpTo(20000));
     };
@@ -139,10 +139,23 @@ export const connectTimelineStream = (timelineId, channelName, params = {}, opti
 
 /**
  * @param {Function} dispatch
+ * @param {Function} getState
  */
-async function refreshHomeTimelineAndNotification(dispatch) {
+async function refreshHomeTimelineAndNotification(dispatch, getState) {
   await dispatch(expandHomeTimeline({ maxId: undefined }));
-  await dispatch(expandNotifications({}));
+
+  // TODO: remove this once the groups feature replaces the previous one
+  if(getState().settings.getIn(['notifications', 'groupingBeta'], false)) {
+    // TODO: polling for merged notifications
+    try {
+      await dispatch(pollRecentGroupNotifications());
+    } catch (error) {
+      // TODO
+    }
+  } else {
+    await dispatch(expandNotifications({}));
+  }
+
   await dispatch(fetchAnnouncements());
 }
 
diff --git a/app/javascript/flavours/glitch/api/notifications.ts b/app/javascript/flavours/glitch/api/notifications.ts
index 781f4b1ddedbab..f1e3e4e5a2a887 100644
--- a/app/javascript/flavours/glitch/api/notifications.ts
+++ b/app/javascript/flavours/glitch/api/notifications.ts
@@ -4,6 +4,7 @@ import type { ApiNotificationGroupsResultJSON } from 'flavours/glitch/api_types/
 export const apiFetchNotifications = async (params?: {
   exclude_types?: string[];
   max_id?: string;
+  since_id?: string;
 }) => {
   const response = await api().request<ApiNotificationGroupsResultJSON>({
     method: 'GET',
diff --git a/app/javascript/flavours/glitch/reducers/notification_groups.ts b/app/javascript/flavours/glitch/reducers/notification_groups.ts
index af8e7a5e8ccd38..0fabf21b536cc4 100644
--- a/app/javascript/flavours/glitch/reducers/notification_groups.ts
+++ b/app/javascript/flavours/glitch/reducers/notification_groups.ts
@@ -20,12 +20,16 @@ import {
   mountNotifications,
   unmountNotifications,
   refreshStaleNotificationGroups,
+  pollRecentNotifications,
 } from 'flavours/glitch/actions/notification_groups';
 import {
   disconnectTimeline,
   timelineDelete,
 } from 'flavours/glitch/actions/timelines_typed';
-import type { ApiNotificationJSON } from 'flavours/glitch/api_types/notifications';
+import type {
+  ApiNotificationJSON,
+  ApiNotificationGroupJSON,
+} from 'flavours/glitch/api_types/notifications';
 import { compareId } from 'flavours/glitch/compare_id';
 import { usePendingItems } from 'flavours/glitch/initial_state';
 import {
@@ -296,6 +300,106 @@ function commitLastReadId(state: NotificationGroupsState) {
   }
 }
 
+function fillNotificationsGap(
+  groups: NotificationGroupsState['groups'],
+  gap: NotificationGap,
+  notifications: ApiNotificationGroupJSON[],
+): NotificationGroupsState['groups'] {
+  // find the gap in the existing notifications
+  const gapIndex = groups.findIndex(
+    (groupOrGap) =>
+      groupOrGap.type === 'gap' &&
+      groupOrGap.sinceId === gap.sinceId &&
+      groupOrGap.maxId === gap.maxId,
+  );
+
+  if (gapIndex < 0)
+    // We do not know where to insert, let's return
+    return groups;
+
+  // Filling a disconnection gap means we're getting historical data
+  // about groups we may know or may not know about.
+
+  // The notifications timeline is split in two by the gap, with
+  // group information newer than the gap, and group information older
+  // than the gap.
+
+  // Filling a gap should not touch anything before the gap, so any
+  // information on groups already appearing before the gap should be
+  // discarded, while any information on groups appearing after the gap
+  // can be updated and re-ordered.
+
+  const oldestPageNotification = notifications.at(-1)?.page_min_id;
+
+  // replace the gap with the notifications + a new gap
+
+  const newerGroupKeys = groups
+    .slice(0, gapIndex)
+    .filter(isNotificationGroup)
+    .map((group) => group.group_key);
+
+  const toInsert: NotificationGroupsState['groups'] = notifications
+    .map((json) => createNotificationGroupFromJSON(json))
+    .filter((notification) => !newerGroupKeys.includes(notification.group_key));
+
+  const apiGroupKeys = (toInsert as NotificationGroup[]).map(
+    (group) => group.group_key,
+  );
+
+  const sinceId = gap.sinceId;
+  if (
+    notifications.length > 0 &&
+    !(
+      oldestPageNotification &&
+      sinceId &&
+      compareId(oldestPageNotification, sinceId) <= 0
+    )
+  ) {
+    // If we get an empty page, it means we reached the bottom, so we do not need to insert a new gap
+    // Similarly, if we've fetched more than the gap's, this means we have completely filled it
+    toInsert.push({
+      type: 'gap',
+      maxId: notifications.at(-1)?.page_max_id,
+      sinceId,
+    } as NotificationGap);
+  }
+
+  // Remove older groups covered by the API
+  groups = groups.filter(
+    (groupOrGap) =>
+      groupOrGap.type !== 'gap' && !apiGroupKeys.includes(groupOrGap.group_key),
+  );
+
+  // Replace the gap with API results (+ the new gap if needed)
+  groups.splice(gapIndex, 1, ...toInsert);
+
+  // Finally, merge any adjacent gaps that could have been created by filtering
+  // groups earlier
+  mergeGaps(groups);
+
+  return groups;
+}
+
+// Ensure the groups list starts with a gap, mutating it to prepend one if needed
+function ensureLeadingGap(
+  groups: NotificationGroupsState['groups'],
+): NotificationGap {
+  if (groups[0]?.type === 'gap') {
+    // We're expecting new notifications, so discard the maxId if there is one
+    groups[0].maxId = undefined;
+
+    return groups[0];
+  } else {
+    const gap: NotificationGap = {
+      type: 'gap',
+      sinceId: groups[0]?.page_min_id,
+    };
+
+    groups.unshift(gap);
+    return gap;
+  }
+}
+
 export const notificationGroupsReducer = createReducer<NotificationGroupsState>(
   initialState,
   (builder) => {
@@ -309,86 +413,36 @@ export const notificationGroupsReducer = createReducer<NotificationGroupsState>(
         updateLastReadId(state);
       })
       .addCase(fetchNotificationsGap.fulfilled, (state, action) => {
-        const { notifications } = action.payload;
-
-        // find the gap in the existing notifications
-        const gapIndex = state.groups.findIndex(
-          (groupOrGap) =>
-            groupOrGap.type === 'gap' &&
-            groupOrGap.sinceId === action.meta.arg.gap.sinceId &&
-            groupOrGap.maxId === action.meta.arg.gap.maxId,
+        state.groups = fillNotificationsGap(
+          state.groups,
+          action.meta.arg.gap,
+          action.payload.notifications,
         );
+        state.isLoading = false;
 
-        if (gapIndex < 0)
-          // We do not know where to insert, let's return
-          return;
-
-        // Filling a disconnection gap means we're getting historical data
-        // about groups we may know or may not know about.
-
-        // The notifications timeline is split in two by the gap, with
-        // group information newer than the gap, and group information older
-        // than the gap.
-
-        // Filling a gap should not touch anything before the gap, so any
-        // information on groups already appearing before the gap should be
-        // discarded, while any information on groups appearing after the gap
-        // can be updated and re-ordered.
-
-        const oldestPageNotification = notifications.at(-1)?.page_min_id;
-
-        // replace the gap with the notifications + a new gap
-
-        const newerGroupKeys = state.groups
-          .slice(0, gapIndex)
-          .filter(isNotificationGroup)
-          .map((group) => group.group_key);
-
-        const toInsert: NotificationGroupsState['groups'] = notifications
-          .map((json) => createNotificationGroupFromJSON(json))
-          .filter(
-            (notification) => !newerGroupKeys.includes(notification.group_key),
+        updateLastReadId(state);
+      })
+      .addCase(pollRecentNotifications.fulfilled, (state, action) => {
+        if (usePendingItems) {
+          const gap = ensureLeadingGap(state.pendingGroups);
+          state.pendingGroups = fillNotificationsGap(
+            state.pendingGroups,
+            gap,
+            action.payload.notifications,
+          );
+        } else {
+          const gap = ensureLeadingGap(state.groups);
+          state.groups = fillNotificationsGap(
+            state.groups,
+            gap,
+            action.payload.notifications,
           );
-
-        const apiGroupKeys = (toInsert as NotificationGroup[]).map(
-          (group) => group.group_key,
-        );
-
-        const sinceId = action.meta.arg.gap.sinceId;
-        if (
-          notifications.length > 0 &&
-          !(
-            oldestPageNotification &&
-            sinceId &&
-            compareId(oldestPageNotification, sinceId) <= 0
-          )
-        ) {
-          // If we get an empty page, it means we reached the bottom, so we do not need to insert a new gap
-          // Similarly, if we've fetched more than the gap's, this means we have completely filled it
-          toInsert.push({
-            type: 'gap',
-            maxId: notifications.at(-1)?.page_max_id,
-            sinceId,
-          } as NotificationGap);
         }
 
-        // Remove older groups covered by the API
-        state.groups = state.groups.filter(
-          (groupOrGap) =>
-            groupOrGap.type !== 'gap' &&
-            !apiGroupKeys.includes(groupOrGap.group_key),
-        );
-
-        // Replace the gap with API results (+ the new gap if needed)
-        state.groups.splice(gapIndex, 1, ...toInsert);
-
-        // Finally, merge any adjacent gaps that could have been created by filtering
-        // groups earlier
-        mergeGaps(state.groups);
-
         state.isLoading = false;
 
         updateLastReadId(state);
+        trimNotifications(state);
       })
       .addCase(processNewNotificationForGroups.fulfilled, (state, action) => {
         const notification = action.payload;
@@ -403,10 +457,11 @@ export const notificationGroupsReducer = createReducer<NotificationGroupsState>(
       })
       .addCase(disconnectTimeline, (state, action) => {
         if (action.payload.timeline === 'home') {
-          if (state.groups.length > 0 && state.groups[0]?.type !== 'gap') {
-            state.groups.unshift({
+          const groups = usePendingItems ? state.pendingGroups : state.groups;
+          if (groups.length > 0 && groups[0]?.type !== 'gap') {
+            groups.unshift({
               type: 'gap',
-              sinceId: state.groups[0]?.page_min_id,
+              sinceId: groups[0]?.page_min_id,
             });
           }
         }
@@ -453,12 +508,13 @@ export const notificationGroupsReducer = createReducer<NotificationGroupsState>(
               }
             }
           }
-          trimNotifications(state);
         });
 
         // Then build the consolidated list and clear pending groups
         state.groups = state.pendingGroups.concat(state.groups);
         state.pendingGroups = [];
+        mergeGaps(state.groups);
+        trimNotifications(state);
       })
       .addCase(updateScrollPosition.fulfilled, (state, action) => {
         state.scrolledToTop = action.payload.top;
@@ -518,13 +574,21 @@ export const notificationGroupsReducer = createReducer<NotificationGroupsState>(
         },
       )
       .addMatcher(
-        isAnyOf(fetchNotifications.pending, fetchNotificationsGap.pending),
+        isAnyOf(
+          fetchNotifications.pending,
+          fetchNotificationsGap.pending,
+          pollRecentNotifications.pending,
+        ),
         (state) => {
           state.isLoading = true;
         },
       )
       .addMatcher(
-        isAnyOf(fetchNotifications.rejected, fetchNotificationsGap.rejected),
+        isAnyOf(
+          fetchNotifications.rejected,
+          fetchNotificationsGap.rejected,
+          pollRecentNotifications.rejected,
+        ),
         (state) => {
           state.isLoading = false;
         },

From 3ffdb7cdacb28f72d1990007515efb56f074aca3 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 21 Aug 2024 17:55:35 +0200
Subject: [PATCH 1920/2191] [Glitch] Remove fontawesome leftovers

Port edeae945c0c9d6318d489ab720587621545063d0 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/styles/accounts.scss   | 10 ----------
 app/javascript/flavours/glitch/styles/admin.scss      |  8 --------
 app/javascript/flavours/glitch/styles/components.scss |  4 ----
 app/javascript/flavours/glitch/styles/dashboard.scss  |  4 ----
 app/javascript/flavours/glitch/styles/forms.scss      |  4 ----
 app/javascript/flavours/glitch/styles/rtl.scss        |  8 --------
 app/javascript/flavours/glitch/styles/tables.scss     |  5 -----
 app/javascript/flavours/glitch/styles/widgets.scss    |  9 +--------
 8 files changed, 1 insertion(+), 51 deletions(-)

diff --git a/app/javascript/flavours/glitch/styles/accounts.scss b/app/javascript/flavours/glitch/styles/accounts.scss
index aa0d739e295004..c4e03007762a3e 100644
--- a/app/javascript/flavours/glitch/styles/accounts.scss
+++ b/app/javascript/flavours/glitch/styles/accounts.scss
@@ -130,21 +130,11 @@
   .older {
     float: left;
     padding-inline-start: 0;
-
-    .fa {
-      display: inline-block;
-      margin-inline-end: 5px;
-    }
   }
 
   .newer {
     float: right;
     padding-inline-start: 0;
-
-    .fa {
-      display: inline-block;
-      margin-inline-start: 5px;
-    }
   }
 
   .disabled {
diff --git a/app/javascript/flavours/glitch/styles/admin.scss b/app/javascript/flavours/glitch/styles/admin.scss
index 5bcf1323d81f76..52f9f39e912ac2 100644
--- a/app/javascript/flavours/glitch/styles/admin.scss
+++ b/app/javascript/flavours/glitch/styles/admin.scss
@@ -122,10 +122,6 @@ $content-width: 840px;
         overflow: hidden;
         text-overflow: ellipsis;
 
-        i.fa {
-          margin-inline-end: 5px;
-        }
-
         &:hover {
           color: $primary-text-color;
           transition: all 100ms linear;
@@ -306,10 +302,6 @@ $content-width: 840px;
       box-shadow: none;
     }
 
-    .directory__tag .table-action-link .fa {
-      color: inherit;
-    }
-
     .directory__tag h4 {
       font-size: 18px;
       font-weight: 700;
diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index 7536ab181ebd6d..5c84689f24e2e8 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -3073,10 +3073,6 @@ $ui-header-logo-wordmark-width: 99px;
     padding-inline-end: 30px;
   }
 
-  .search__icon .fa {
-    top: 15px;
-  }
-
   .scrollable {
     overflow: visible;
 
diff --git a/app/javascript/flavours/glitch/styles/dashboard.scss b/app/javascript/flavours/glitch/styles/dashboard.scss
index 12d0a6b92f9b90..1621220ccb522e 100644
--- a/app/javascript/flavours/glitch/styles/dashboard.scss
+++ b/app/javascript/flavours/glitch/styles/dashboard.scss
@@ -113,10 +113,6 @@
       flex: 1 1 auto;
     }
 
-    .fa {
-      flex: 0 0 auto;
-    }
-
     strong {
       font-weight: 700;
     }
diff --git a/app/javascript/flavours/glitch/styles/forms.scss b/app/javascript/flavours/glitch/styles/forms.scss
index 8a056694f90404..81ce9a695f2fc4 100644
--- a/app/javascript/flavours/glitch/styles/forms.scss
+++ b/app/javascript/flavours/glitch/styles/forms.scss
@@ -931,10 +931,6 @@ code {
           font-weight: 700;
         }
       }
-
-      .fa {
-        font-weight: 400;
-      }
     }
   }
 }
diff --git a/app/javascript/flavours/glitch/styles/rtl.scss b/app/javascript/flavours/glitch/styles/rtl.scss
index 3f03051ce19776..f6140b87e2c072 100644
--- a/app/javascript/flavours/glitch/styles/rtl.scss
+++ b/app/javascript/flavours/glitch/styles/rtl.scss
@@ -96,14 +96,6 @@ body.rtl {
       no-repeat left 8px center / auto 16px;
   }
 
-  .fa-chevron-left::before {
-    content: '\F054';
-  }
-
-  .fa-chevron-right::before {
-    content: '\F053';
-  }
-
   .dismissable-banner,
   .warning-banner {
     &__action {
diff --git a/app/javascript/flavours/glitch/styles/tables.scss b/app/javascript/flavours/glitch/styles/tables.scss
index 992ad0cbe4e548..6c7723b60d774e 100644
--- a/app/javascript/flavours/glitch/styles/tables.scss
+++ b/app/javascript/flavours/glitch/styles/tables.scss
@@ -142,11 +142,6 @@ a.table-action-link {
     color: $highlight-text-color;
   }
 
-  i.fa {
-    font-weight: 400;
-    margin-inline-end: 5px;
-  }
-
   &:first-child {
     padding-inline-start: 0;
   }
diff --git a/app/javascript/flavours/glitch/styles/widgets.scss b/app/javascript/flavours/glitch/styles/widgets.scss
index ac419b4570dda7..8225e23da4e090 100644
--- a/app/javascript/flavours/glitch/styles/widgets.scss
+++ b/app/javascript/flavours/glitch/styles/widgets.scss
@@ -163,11 +163,6 @@
 
   &__message {
     margin-bottom: 15px;
-
-    .fa {
-      margin-inline-end: 5px;
-      color: $darker-text-color;
-    }
   }
 
   &__card {
@@ -354,9 +349,7 @@
     width: 21px;
   }
 
-  .fa {
-    font-size: 16px;
-
+  .icon {
     &.active {
       color: $highlight-text-color;
     }

From 2da687a28b509025343d3d8ca17753de9b128e8f Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 21 Aug 2024 19:05:02 +0200
Subject: [PATCH 1921/2191] Remove dead CSS code (#31527)

---
 .../styles/mastodon-light/diff.scss           |   3 -
 .../styles/mastodon/components.scss           |  20 --
 app/javascript/styles/mastodon/widgets.scss   | 310 ------------------
 3 files changed, 333 deletions(-)

diff --git a/app/javascript/styles/mastodon-light/diff.scss b/app/javascript/styles/mastodon-light/diff.scss
index 8d801e4cd5b854..1df556b42a4e97 100644
--- a/app/javascript/styles/mastodon-light/diff.scss
+++ b/app/javascript/styles/mastodon-light/diff.scss
@@ -414,9 +414,6 @@
   border-color: transparent transparent $white;
 }
 
-.hero-widget,
-.moved-account-widget,
-.memoriam-widget,
 .activity-stream,
 .nothing-here,
 .directory__tag > a,
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 761dfb5696ca73..3d2c4662541985 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -3422,26 +3422,6 @@ $ui-header-logo-wordmark-width: 99px;
   height: calc(100% - 10px);
   overflow-y: hidden;
 
-  .hero-widget {
-    box-shadow: none;
-
-    &__text,
-    &__img,
-    &__img img {
-      border-radius: 0;
-    }
-
-    &__text {
-      padding: 15px;
-      color: $secondary-text-color;
-
-      strong {
-        font-weight: 700;
-        color: $primary-text-color;
-      }
-    }
-  }
-
   .compose-form {
     flex: 1 1 auto;
     min-height: 0;
diff --git a/app/javascript/styles/mastodon/widgets.scss b/app/javascript/styles/mastodon/widgets.scss
index a8f678d482a2fe..b37d790ce39262 100644
--- a/app/javascript/styles/mastodon/widgets.scss
+++ b/app/javascript/styles/mastodon/widgets.scss
@@ -1,289 +1,3 @@
-@use 'sass:math';
-
-.hero-widget {
-  margin-bottom: 10px;
-  box-shadow: 0 0 15px rgba($base-shadow-color, 0.2);
-
-  &:last-child {
-    margin-bottom: 0;
-  }
-
-  &__img {
-    width: 100%;
-    position: relative;
-    overflow: hidden;
-    border-radius: 4px 4px 0 0;
-    background: $base-shadow-color;
-
-    img {
-      object-fit: cover;
-      display: block;
-      width: 100%;
-      height: 100%;
-      margin: 0;
-      border-radius: 4px 4px 0 0;
-    }
-  }
-
-  &__text {
-    background: $ui-base-color;
-    padding: 20px;
-    border-radius: 0 0 4px 4px;
-    font-size: 15px;
-    color: $darker-text-color;
-    line-height: 20px;
-    word-wrap: break-word;
-    font-weight: 400;
-
-    .emojione {
-      width: 20px;
-      height: 20px;
-      margin: -3px 0 0;
-      margin-inline-start: 0.075em;
-      margin-inline-end: 0.075em;
-    }
-
-    p {
-      margin-bottom: 20px;
-
-      &:last-child {
-        margin-bottom: 0;
-      }
-    }
-
-    em {
-      display: inline;
-      margin: 0;
-      padding: 0;
-      font-weight: 700;
-      background: transparent;
-      font-family: inherit;
-      font-size: inherit;
-      line-height: inherit;
-      color: lighten($darker-text-color, 10%);
-    }
-
-    a {
-      color: $secondary-text-color;
-      text-decoration: none;
-
-      &:hover {
-        text-decoration: underline;
-      }
-    }
-  }
-
-  @media screen and (max-width: $no-gap-breakpoint) {
-    display: none;
-  }
-}
-
-.endorsements-widget {
-  margin-bottom: 10px;
-  padding-bottom: 10px;
-
-  h4 {
-    padding: 10px;
-    text-transform: uppercase;
-    font-weight: 700;
-    font-size: 13px;
-    color: $darker-text-color;
-  }
-
-  .account {
-    padding: 10px 0;
-
-    &:last-child {
-      border-bottom: 0;
-    }
-
-    .account__display-name {
-      display: flex;
-      align-items: center;
-    }
-  }
-
-  .trends__item {
-    padding: 10px;
-  }
-}
-
-.trends-widget {
-  h4 {
-    color: $darker-text-color;
-  }
-}
-
-.placeholder-widget {
-  padding: 16px;
-  border-radius: 4px;
-  border: 2px dashed $dark-text-color;
-  text-align: center;
-  color: $darker-text-color;
-  margin-bottom: 10px;
-}
-
-.moved-account-widget {
-  padding: 15px;
-  padding-bottom: 20px;
-  border-radius: 4px;
-  background: $ui-base-color;
-  box-shadow: 0 0 15px rgba($base-shadow-color, 0.2);
-  color: $secondary-text-color;
-  font-weight: 400;
-  margin-bottom: 10px;
-
-  strong,
-  a {
-    font-weight: 500;
-
-    @each $lang in $cjk-langs {
-      &:lang(#{$lang}) {
-        font-weight: 700;
-      }
-    }
-  }
-
-  a {
-    color: inherit;
-    text-decoration: underline;
-
-    &.mention {
-      text-decoration: none;
-
-      span {
-        text-decoration: none;
-      }
-
-      &:focus,
-      &:hover,
-      &:active {
-        text-decoration: none;
-
-        span {
-          text-decoration: underline;
-        }
-      }
-    }
-  }
-
-  &__message {
-    margin-bottom: 15px;
-  }
-
-  &__card {
-    .detailed-status__display-avatar {
-      position: relative;
-      cursor: pointer;
-    }
-
-    .detailed-status__display-name {
-      margin-bottom: 0;
-      text-decoration: none;
-
-      span {
-        font-weight: 400;
-      }
-    }
-  }
-}
-
-.memoriam-widget {
-  padding: 20px;
-  border-radius: 4px;
-  background: $base-shadow-color;
-  box-shadow: 0 0 15px rgba($base-shadow-color, 0.2);
-  font-size: 14px;
-  color: $darker-text-color;
-  margin-bottom: 10px;
-}
-
-.directory {
-  background: var(--background-color);
-  border-radius: 4px;
-  box-shadow: 0 0 15px rgba($base-shadow-color, 0.2);
-
-  &__tag {
-    box-sizing: border-box;
-    margin-bottom: 10px;
-
-    & > a,
-    & > div {
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-      border: 1px solid var(--background-border-color);
-      border-radius: 4px;
-      padding: 15px;
-      text-decoration: none;
-      color: inherit;
-      box-shadow: 0 0 15px rgba($base-shadow-color, 0.2);
-    }
-
-    & > a {
-      &:hover,
-      &:active,
-      &:focus {
-        background: $ui-base-color;
-      }
-    }
-
-    &.active > a {
-      background: $ui-highlight-color;
-      cursor: default;
-    }
-
-    &.disabled > div {
-      opacity: 0.5;
-      cursor: default;
-    }
-
-    h4 {
-      flex: 1 1 auto;
-      font-size: 18px;
-      font-weight: 700;
-      color: $primary-text-color;
-      white-space: nowrap;
-      overflow: hidden;
-      text-overflow: ellipsis;
-
-      .fa {
-        color: $darker-text-color;
-      }
-
-      small {
-        display: block;
-        font-weight: 400;
-        font-size: 15px;
-        margin-top: 8px;
-        color: $darker-text-color;
-      }
-    }
-
-    &.active h4 {
-      &,
-      .fa,
-      small,
-      .trends__item__current {
-        color: $primary-text-color;
-      }
-    }
-
-    .avatar-stack {
-      flex: 0 0 auto;
-      width: (36px + 4px) * 3;
-    }
-
-    &.active .avatar-stack .account__avatar {
-      border-color: $ui-highlight-color;
-    }
-
-    .trends__item__current {
-      padding-inline-end: 0;
-    }
-  }
-}
-
 .accounts-table {
   width: 100%;
 
@@ -381,27 +95,3 @@
     }
   }
 }
-
-.moved-account-widget,
-.memoriam-widget,
-.directory {
-  @media screen and (max-width: $no-gap-breakpoint) {
-    margin-bottom: 0;
-    box-shadow: none;
-    border-radius: 0;
-  }
-}
-
-.placeholder-widget {
-  a {
-    text-decoration: none;
-    font-weight: 500;
-    color: $ui-highlight-color;
-
-    &:hover,
-    &:focus,
-    &:active {
-      text-decoration: underline;
-    }
-  }
-}

From 1e814f58cc1e29c09df32d2f54b56b1f55eaae24 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 21 Aug 2024 19:05:02 +0200
Subject: [PATCH 1922/2191] [Glitch] Remove dead CSS code

Port 2da687a28b509025343d3d8ca17753de9b128e8f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/styles/components.scss    |  20 --
 .../glitch/styles/mastodon-light/diff.scss    |   3 -
 .../flavours/glitch/styles/widgets.scss       | 216 ------------------
 3 files changed, 239 deletions(-)

diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index 5c84689f24e2e8..a81a8bc22eabf6 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -3604,26 +3604,6 @@ $ui-header-logo-wordmark-width: 99px;
   height: calc(100% - 10px);
   overflow-y: hidden;
 
-  .hero-widget {
-    box-shadow: none;
-
-    &__text,
-    &__img,
-    &__img img {
-      border-radius: 0;
-    }
-
-    &__text {
-      padding: 15px;
-      color: $secondary-text-color;
-
-      strong {
-        font-weight: 700;
-        color: $primary-text-color;
-      }
-    }
-  }
-
   .compose-form {
     flex: 1 1 auto;
     min-height: 0;
diff --git a/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss b/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss
index 869253e5e584a9..73f3689066e102 100644
--- a/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss
+++ b/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss
@@ -414,9 +414,6 @@
   border-color: transparent transparent $white;
 }
 
-.hero-widget,
-.moved-account-widget,
-.memoriam-widget,
 .activity-stream,
 .nothing-here,
 .directory__tag > a,
diff --git a/app/javascript/flavours/glitch/styles/widgets.scss b/app/javascript/flavours/glitch/styles/widgets.scss
index 8225e23da4e090..6f5907f535f792 100644
--- a/app/javascript/flavours/glitch/styles/widgets.scss
+++ b/app/javascript/flavours/glitch/styles/widgets.scss
@@ -1,197 +1,5 @@
 @use 'sass:math';
 
-.hero-widget {
-  margin-bottom: 10px;
-  box-shadow: 0 0 15px rgba($base-shadow-color, 0.2);
-
-  &__img {
-    width: 100%;
-    position: relative;
-    overflow: hidden;
-    border-radius: 4px 4px 0 0;
-    background: $base-shadow-color;
-
-    img {
-      object-fit: cover;
-      display: block;
-      width: 100%;
-      height: 100%;
-      margin: 0;
-      border-radius: 4px 4px 0 0;
-    }
-  }
-
-  &__text {
-    background: $ui-base-color;
-    padding: 20px;
-    border-radius: 0 0 4px 4px;
-    font-size: 15px;
-    color: $darker-text-color;
-    line-height: 20px;
-    word-wrap: break-word;
-    font-weight: 400;
-
-    .emojione {
-      width: 20px;
-      height: 20px;
-      margin: -3px 0 0;
-    }
-
-    p {
-      margin-bottom: 20px;
-
-      &:last-child {
-        margin-bottom: 0;
-      }
-    }
-
-    em {
-      display: inline;
-      margin: 0;
-      padding: 0;
-      font-weight: 700;
-      background: transparent;
-      font-family: inherit;
-      font-size: inherit;
-      line-height: inherit;
-      color: lighten($darker-text-color, 10%);
-    }
-
-    a {
-      color: $secondary-text-color;
-      text-decoration: none;
-
-      &:hover {
-        text-decoration: underline;
-      }
-    }
-  }
-
-  @media screen and (max-width: $no-gap-breakpoint) {
-    display: none;
-  }
-}
-
-.endorsements-widget {
-  margin-bottom: 10px;
-  padding-bottom: 10px;
-
-  h4 {
-    padding: 10px;
-    text-transform: uppercase;
-    font-weight: 700;
-    font-size: 13px;
-    color: $darker-text-color;
-  }
-
-  .account {
-    padding: 10px 0;
-
-    &:last-child {
-      border-bottom: 0;
-    }
-
-    .account__display-name {
-      display: flex;
-      align-items: center;
-    }
-  }
-
-  .trends__item {
-    padding: 10px;
-  }
-}
-
-.trends-widget {
-  h4 {
-    color: $darker-text-color;
-  }
-}
-
-.placeholder-widget {
-  padding: 16px;
-  border-radius: 4px;
-  border: 2px dashed $dark-text-color;
-  text-align: center;
-  color: $darker-text-color;
-  margin-bottom: 10px;
-}
-
-.moved-account-widget {
-  padding: 15px;
-  padding-bottom: 20px;
-  border-radius: 4px;
-  background: $ui-base-color;
-  box-shadow: 0 0 15px rgba($base-shadow-color, 0.2);
-  color: $secondary-text-color;
-  font-weight: 400;
-  margin-bottom: 10px;
-
-  strong,
-  a {
-    font-weight: 500;
-
-    @each $lang in $cjk-langs {
-      &:lang(#{$lang}) {
-        font-weight: 700;
-      }
-    }
-  }
-
-  a {
-    color: inherit;
-    text-decoration: underline;
-
-    &.mention {
-      text-decoration: none;
-
-      span {
-        text-decoration: none;
-      }
-
-      &:focus,
-      &:hover,
-      &:active {
-        text-decoration: none;
-
-        span {
-          text-decoration: underline;
-        }
-      }
-    }
-  }
-
-  &__message {
-    margin-bottom: 15px;
-  }
-
-  &__card {
-    .detailed-status__display-avatar {
-      position: relative;
-      cursor: pointer;
-    }
-
-    .detailed-status__display-name {
-      margin-bottom: 0;
-      text-decoration: none;
-
-      span {
-        font-weight: 400;
-      }
-    }
-  }
-}
-
-.memoriam-widget {
-  padding: 20px;
-  border-radius: 4px;
-  background: $base-shadow-color;
-  box-shadow: 0 0 15px rgba($base-shadow-color, 0.2);
-  font-size: 14px;
-  color: $darker-text-color;
-  margin-bottom: 10px;
-}
-
 .directory {
   background: var(--background-color);
   border-radius: 4px;
@@ -369,27 +177,3 @@
     }
   }
 }
-
-.moved-account-widget,
-.memoriam-widget,
-.directory {
-  @media screen and (max-width: $no-gap-breakpoint) {
-    margin-bottom: 0;
-    box-shadow: none;
-    border-radius: 0;
-  }
-}
-
-.placeholder-widget {
-  a {
-    text-decoration: none;
-    font-weight: 500;
-    color: $ui-highlight-color;
-
-    &:hover,
-    &:focus,
-    &:active {
-      text-decoration: underline;
-    }
-  }
-}

From f86d16adbaeaa97034458b4dbd42fdb84e888fe2 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 22 Aug 2024 10:04:56 +0200
Subject: [PATCH 1923/2191] New Crowdin Translations (automated) (#31536)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/af.json      |  2 -
 app/javascript/mastodon/locales/an.json      |  5 --
 app/javascript/mastodon/locales/ar.json      |  6 ---
 app/javascript/mastodon/locales/ast.json     |  6 ---
 app/javascript/mastodon/locales/be.json      |  8 ----
 app/javascript/mastodon/locales/bg.json      |  9 +---
 app/javascript/mastodon/locales/bn.json      |  5 --
 app/javascript/mastodon/locales/br.json      |  5 --
 app/javascript/mastodon/locales/ca.json      | 32 +++++++------
 app/javascript/mastodon/locales/ckb.json     |  5 --
 app/javascript/mastodon/locales/co.json      |  5 --
 app/javascript/mastodon/locales/cs.json      |  5 --
 app/javascript/mastodon/locales/cy.json      |  8 ----
 app/javascript/mastodon/locales/da.json      | 21 +++++----
 app/javascript/mastodon/locales/de.json      | 29 +++++++-----
 app/javascript/mastodon/locales/el.json      | 31 +++++++++----
 app/javascript/mastodon/locales/en-GB.json   | 34 ++++++++++----
 app/javascript/mastodon/locales/eo.json      | 20 ++++++--
 app/javascript/mastodon/locales/es-AR.json   | 21 +++++----
 app/javascript/mastodon/locales/es-MX.json   | 29 ++++++++----
 app/javascript/mastodon/locales/es.json      | 29 ++++++++----
 app/javascript/mastodon/locales/et.json      |  5 --
 app/javascript/mastodon/locales/eu.json      |  6 ---
 app/javascript/mastodon/locales/fa.json      |  5 --
 app/javascript/mastodon/locales/fi.json      | 21 +++++----
 app/javascript/mastodon/locales/fil.json     |  6 +--
 app/javascript/mastodon/locales/fo.json      | 21 +++++----
 app/javascript/mastodon/locales/fr-CA.json   |  5 --
 app/javascript/mastodon/locales/fr.json      |  5 --
 app/javascript/mastodon/locales/fy.json      |  7 ---
 app/javascript/mastodon/locales/ga.json      |  8 ----
 app/javascript/mastodon/locales/gd.json      |  8 ----
 app/javascript/mastodon/locales/gl.json      | 21 +++++----
 app/javascript/mastodon/locales/he.json      |  8 ----
 app/javascript/mastodon/locales/hi.json      |  2 -
 app/javascript/mastodon/locales/hr.json      |  5 --
 app/javascript/mastodon/locales/hu.json      | 21 +++++----
 app/javascript/mastodon/locales/hy.json      |  5 --
 app/javascript/mastodon/locales/ia.json      |  7 ---
 app/javascript/mastodon/locales/id.json      |  5 --
 app/javascript/mastodon/locales/ie.json      |  5 --
 app/javascript/mastodon/locales/ig.json      |  1 -
 app/javascript/mastodon/locales/io.json      |  5 --
 app/javascript/mastodon/locales/is.json      |  8 ----
 app/javascript/mastodon/locales/it.json      | 31 +++++++++----
 app/javascript/mastodon/locales/ja.json      |  8 ----
 app/javascript/mastodon/locales/ka.json      |  1 -
 app/javascript/mastodon/locales/kab.json     |  6 ---
 app/javascript/mastodon/locales/kk.json      |  5 --
 app/javascript/mastodon/locales/kn.json      |  1 -
 app/javascript/mastodon/locales/ko.json      | 16 +++----
 app/javascript/mastodon/locales/ku.json      |  5 --
 app/javascript/mastodon/locales/kw.json      |  5 --
 app/javascript/mastodon/locales/la.json      |  2 -
 app/javascript/mastodon/locales/lad.json     |  6 ---
 app/javascript/mastodon/locales/lt.json      | 16 +++----
 app/javascript/mastodon/locales/lv.json      |  5 --
 app/javascript/mastodon/locales/mk.json      |  1 -
 app/javascript/mastodon/locales/ml.json      |  4 --
 app/javascript/mastodon/locales/mr.json      |  2 -
 app/javascript/mastodon/locales/ms.json      |  5 --
 app/javascript/mastodon/locales/my.json      |  5 --
 app/javascript/mastodon/locales/ne.json      |  1 -
 app/javascript/mastodon/locales/nl.json      | 21 +++++----
 app/javascript/mastodon/locales/nn.json      |  8 ----
 app/javascript/mastodon/locales/no.json      |  5 --
 app/javascript/mastodon/locales/oc.json      |  5 --
 app/javascript/mastodon/locales/pa.json      |  3 --
 app/javascript/mastodon/locales/pl.json      | 21 +++++----
 app/javascript/mastodon/locales/pt-BR.json   |  7 ---
 app/javascript/mastodon/locales/pt-PT.json   |  7 ---
 app/javascript/mastodon/locales/ro.json      |  5 --
 app/javascript/mastodon/locales/ru.json      |  5 --
 app/javascript/mastodon/locales/ry.json      |  4 +-
 app/javascript/mastodon/locales/sa.json      |  2 -
 app/javascript/mastodon/locales/sc.json      |  5 --
 app/javascript/mastodon/locales/sco.json     |  5 --
 app/javascript/mastodon/locales/si.json      |  5 --
 app/javascript/mastodon/locales/sk.json      |  5 --
 app/javascript/mastodon/locales/sl.json      |  8 ----
 app/javascript/mastodon/locales/sq.json      | 21 +++++----
 app/javascript/mastodon/locales/sr-Latn.json |  5 --
 app/javascript/mastodon/locales/sr.json      |  5 --
 app/javascript/mastodon/locales/sv.json      | 12 ++---
 app/javascript/mastodon/locales/szl.json     |  2 -
 app/javascript/mastodon/locales/ta.json      |  5 --
 app/javascript/mastodon/locales/tai.json     |  1 -
 app/javascript/mastodon/locales/te.json      |  1 -
 app/javascript/mastodon/locales/th.json      |  8 ----
 app/javascript/mastodon/locales/tok.json     |  4 --
 app/javascript/mastodon/locales/tr.json      | 23 ++++++----
 app/javascript/mastodon/locales/tt.json      |  2 -
 app/javascript/mastodon/locales/ug.json      |  1 -
 app/javascript/mastodon/locales/uk.json      | 20 +++++---
 app/javascript/mastodon/locales/ur.json      |  2 -
 app/javascript/mastodon/locales/uz.json      |  1 -
 app/javascript/mastodon/locales/vi.json      | 20 +++++---
 app/javascript/mastodon/locales/zgh.json     |  3 --
 app/javascript/mastodon/locales/zh-CN.json   | 31 +++++++++----
 app/javascript/mastodon/locales/zh-HK.json   |  5 --
 app/javascript/mastodon/locales/zh-TW.json   | 21 +++++----
 config/locales/be.yml                        |  3 ++
 config/locales/doorkeeper.en-GB.yml          |  1 +
 config/locales/fo.yml                        | 48 ++++++++++++++++++++
 config/locales/ru.yml                        |  1 +
 config/locales/simple_form.en-GB.yml         |  1 +
 config/locales/tr.yml                        |  6 +--
 107 files changed, 442 insertions(+), 562 deletions(-)

diff --git a/app/javascript/mastodon/locales/af.json b/app/javascript/mastodon/locales/af.json
index bedb3d1719e0f1..a506b9965442e0 100644
--- a/app/javascript/mastodon/locales/af.json
+++ b/app/javascript/mastodon/locales/af.json
@@ -16,7 +16,6 @@
   "account.block_domain": "Blokkeer domein {domain}",
   "account.block_short": "Blokkeer",
   "account.blocked": "Geblokkeer",
-  "account.browse_more_on_origin_server": "Verken die oorspronklike profiel",
   "account.cancel_follow_request": "Herroep volgversoek",
   "account.disable_notifications": "Hou op om my van @{name} se plasings te laat weet",
   "account.domain_blocked": "Domein geblokkeer",
@@ -308,7 +307,6 @@
   "status.translated_from_with": "Uit {lang} vertaal deur {provider}",
   "tabs_bar.home": "Tuis",
   "tabs_bar.notifications": "Kennisgewings",
-  "timeline_hint.resources.statuses": "Ouer plasings",
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {# days}}",
   "upload_form.audio_description": "Describe for people with hearing loss",
   "upload_form.description": "Describe for the visually impaired",
diff --git a/app/javascript/mastodon/locales/an.json b/app/javascript/mastodon/locales/an.json
index b44fa17cfcd031..4a82967877efde 100644
--- a/app/javascript/mastodon/locales/an.json
+++ b/app/javascript/mastodon/locales/an.json
@@ -17,7 +17,6 @@
   "account.block": "Blocar a @{name}",
   "account.block_domain": "Blocar dominio {domain}",
   "account.blocked": "Blocau",
-  "account.browse_more_on_origin_server": "Veyer mas en o perfil orichinal",
   "account.cancel_follow_request": "Retirar solicitut de seguimiento",
   "account.disable_notifications": "Deixar de notificar-me quan @{name} publique bella cosa",
   "account.domain_blocked": "Dominio blocau",
@@ -531,10 +530,6 @@
   "time_remaining.minutes": "{number, plural, one {# menuto restante} other {# menutos restantes}}",
   "time_remaining.moments": "Momentos restantes",
   "time_remaining.seconds": "{number, plural, one {# segundo restante} other {# segundos restantes}}",
-  "timeline_hint.remote_resource_not_displayed": "{resource} d'atros servidors no s'amuestran.",
-  "timeline_hint.resources.followers": "Seguidores",
-  "timeline_hint.resources.follows": "Seguius",
-  "timeline_hint.resources.statuses": "Publicacions mas antigas",
   "trends.counter_by_accounts": "{count, plural, one {{counter} persona} other {{counter} personas}} en os zaguers {days, plural, one {días} other {{days} días}}",
   "trends.trending_now": "Tendencia agora",
   "ui.beforeunload": "Lo tuyo borrador se perderá si sales de Mastodon.",
diff --git a/app/javascript/mastodon/locales/ar.json b/app/javascript/mastodon/locales/ar.json
index a022f3a0e52da8..6fd426b502023d 100644
--- a/app/javascript/mastodon/locales/ar.json
+++ b/app/javascript/mastodon/locales/ar.json
@@ -19,7 +19,6 @@
   "account.block_domain": "حظر اسم النِّطاق {domain}",
   "account.block_short": "حظر",
   "account.blocked": "محظور",
-  "account.browse_more_on_origin_server": "تصفح المزيد في الملف الشخصي الأصلي",
   "account.cancel_follow_request": "إلغاء طلب المتابعة",
   "account.copy": "نسخ الرابط إلى الملف الشخصي",
   "account.direct": "إشارة خاصة لـ @{name}",
@@ -788,11 +787,6 @@
   "time_remaining.minutes": "{number, plural, one {# دقيقة} other {# دقائق}} متبقية",
   "time_remaining.moments": "لحظات متبقية",
   "time_remaining.seconds": "{number, plural, one {# ثانية} other {# ثوانٍ}} متبقية",
-  "timeline_hint.remote_resource_not_displayed": "{resource} من الخوادم الأخرى لا يتم عرضها.",
-  "timeline_hint.resources.followers": "المتابِعون",
-  "timeline_hint.resources.follows": "المتابَعون",
-  "timeline_hint.resources.replies": "بعض الردود",
-  "timeline_hint.resources.statuses": "المنشورات القديمة",
   "trends.counter_by_accounts": "{count, plural, one {شخص واحد} two {شخصان} few {{counter} أشخاصٍ} many {{counter} شخصًا} other {{counter} شخصًا}} {days, plural, one {خلال اليوم الماضي} two {خلال اليومَيْنِ الماضيَيْنِ} few {خلال {days} أيام الماضية} many {خلال {days} يومًا الماضية} other {خلال {days} يومٍ الماضية}}",
   "trends.trending_now": "المتداولة الآن",
   "ui.beforeunload": "سوف تفقد مسودتك إن تركت ماستدون.",
diff --git a/app/javascript/mastodon/locales/ast.json b/app/javascript/mastodon/locales/ast.json
index debfcd04a7d5dc..ac181c7ab1b6ca 100644
--- a/app/javascript/mastodon/locales/ast.json
+++ b/app/javascript/mastodon/locales/ast.json
@@ -17,7 +17,6 @@
   "account.block": "Bloquiar a @{name}",
   "account.block_domain": "Bloquiar el dominiu {domain}",
   "account.blocked": "Perfil bloquiáu",
-  "account.browse_more_on_origin_server": "Restolar más nel perfil orixinal",
   "account.direct": "Mentar a @{name} per privao",
   "account.disable_notifications": "Dexar d'avisame cuando @{name} espublice artículos",
   "account.domain_blocked": "Dominiu bloquiáu",
@@ -270,8 +269,6 @@
   "lists.subheading": "Les tos llistes",
   "load_pending": "{count, plural, one {# elementu nuevu} other {# elementos nuevos}}",
   "media_gallery.toggle_visible": "{number, plural, one {Anubrir la imaxe} other {Anubrir les imáxenes}}",
-  "name_and_others": "{name} y {count, plural, one {# más} other {# más}}",
-  "name_and_others_with_link": "{name} y <a>{count, plural, one {# más} other {# más}}</a>",
   "navigation_bar.about": "Tocante a",
   "navigation_bar.blocks": "Perfiles bloquiaos",
   "navigation_bar.bookmarks": "Marcadores",
@@ -464,9 +461,6 @@
   "time_remaining.hours": "{number, plural, one {Queda # hora} other {Queden # hores}}",
   "time_remaining.minutes": "{number, plural, one {Queda # minutu} other {Queden # minutos}}",
   "time_remaining.seconds": "{number, plural, one {Queda # segundu} other {Queden # segundos}}",
-  "timeline_hint.remote_resource_not_displayed": "Nun s'amuesa'l recursu «{resource}» d'otros sirvidores.",
-  "timeline_hint.resources.followers": "Siguidores",
-  "timeline_hint.resources.statuses": "Artículos antiguos",
   "trends.counter_by_accounts": "{count, plural, one {{counter} persona} other {{counter} persones}} {days, plural, one {nel últimu día} other {nos últimos {days} díes}}",
   "trends.trending_now": "En tendencia",
   "ui.beforeunload": "El borrador piérdese si coles de Mastodon.",
diff --git a/app/javascript/mastodon/locales/be.json b/app/javascript/mastodon/locales/be.json
index 546a1457a99b90..29e636f50cc8a7 100644
--- a/app/javascript/mastodon/locales/be.json
+++ b/app/javascript/mastodon/locales/be.json
@@ -19,7 +19,6 @@
   "account.block_domain": "Заблакіраваць дамен {domain}",
   "account.block_short": "Заблакіраваць",
   "account.blocked": "Заблакіраваны",
-  "account.browse_more_on_origin_server": "Глядзіце больш у арыгінальным профілі",
   "account.cancel_follow_request": "Скасаваць запыт на падпіску",
   "account.copy": "Скапіраваць спасылку на профіль",
   "account.direct": "Згадаць асабіста @{name}",
@@ -445,8 +444,6 @@
   "mute_modal.title": "Ігнараваць карыстальніка?",
   "mute_modal.you_wont_see_mentions": "Вы не ўбачыце паведамленняў са згадваннем карыстальніка.",
   "mute_modal.you_wont_see_posts": "Карыстальнік па-ранейшаму будзе бачыць вашыя паведамленні, але вы не будзеце паведамленні карыстальніка.",
-  "name_and_others": "{name} і {count, plural, one {# іншы} many {# іншых} other {# іншых}}",
-  "name_and_others_with_link": "{name} і <a>{count, plural, one {# іншы} many {# іншых} other {# іншых}}</a>",
   "navigation_bar.about": "Пра нас",
   "navigation_bar.advanced_interface": "Адкрыць у пашыраным вэб-інтэрфейсе",
   "navigation_bar.blocks": "Заблакіраваныя карыстальнікі",
@@ -799,11 +796,6 @@
   "time_remaining.minutes": "{number, plural, one {засталася # хвіліна} few {засталося # хвіліны} many {засталося # хвілін} other {засталося # хвіліны}}",
   "time_remaining.moments": "Засталося некалькі секунд",
   "time_remaining.seconds": "{number, plural, one {засталася # секунда} few {засталося # секунды} many {засталося # секунд} other {засталося # секунды}}",
-  "timeline_hint.remote_resource_not_displayed": "{resource} з іншых сервераў не адлюстроўваецца.",
-  "timeline_hint.resources.followers": "Падпісчыкі",
-  "timeline_hint.resources.follows": "Падпіскі",
-  "timeline_hint.resources.replies": "Некаторыя адказы",
-  "timeline_hint.resources.statuses": "Старыя допісы",
   "trends.counter_by_accounts": "{count, plural, one {{counter} чалавек} few {{counter} чалавекі} many {{counter} людзей} other {{counter} чалавек}} за {days, plural, one {{days} апошні дзень} few {{days} апошнія дні} many {{days} апошніх дзён} other {{days} апошніх дзён}}",
   "trends.trending_now": "Актуальнае",
   "ui.beforeunload": "Ваш чарнавік знішчыцца калі вы пакінеце Mastodon.",
diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json
index 69166eafb88d13..6a5e66ad320541 100644
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@@ -19,7 +19,6 @@
   "account.block_domain": "Блокиране на домейн {domain}",
   "account.block_short": "Блокиране",
   "account.blocked": "Блокирани",
-  "account.browse_more_on_origin_server": "Разглеждане на още в оригиналния профил",
   "account.cancel_follow_request": "Оттегляне на заявката за последване",
   "account.copy": "Копиране на връзка към профила",
   "account.direct": "Частно споменаване на @{name}",
@@ -445,8 +444,6 @@
   "mute_modal.title": "Заглушавате ли потребител?",
   "mute_modal.you_wont_see_mentions": "Няма да виждате споменаващите ги публикации.",
   "mute_modal.you_wont_see_posts": "Още могат да виждат публикациите ви, но вие техните не.",
-  "name_and_others": "{name} и {count, plural, one {# друг} other {# други}}",
-  "name_and_others_with_link": "{name} и <a>{count, plural, one {# друг} other {# други}}</a>",
   "navigation_bar.about": "Относно",
   "navigation_bar.advanced_interface": "Отваряне в разширен уебинтерфейс",
   "navigation_bar.blocks": "Блокирани потребители",
@@ -505,6 +502,8 @@
   "notification.update": "{name} промени публикация",
   "notification_requests.accept": "Приемам",
   "notification_requests.dismiss": "Отхвърлям",
+  "notification_requests.edit_selection": "Редактиране",
+  "notification_requests.exit_selection": "Готово",
   "notification_requests.explainer_for_limited_account": "Известията от този акаунт са прецедени, защото акаунтът е ограничен от модератор.",
   "notification_requests.explainer_for_limited_remote_account": "Известията от този акаунт са прецедени, защото акаунтът или сървърът му е ограничен от модератор.",
   "notification_requests.maximize": "Максимизиране",
@@ -798,10 +797,6 @@
   "time_remaining.minutes": "{number, plural, one {остава # минута} other {остават # минути}}",
   "time_remaining.moments": "Оставащи моменти",
   "time_remaining.seconds": "{number, plural, one {# секунда} other {# секунди}} остава",
-  "timeline_hint.remote_resource_not_displayed": "{resource} от други сървъри не се показват.",
-  "timeline_hint.resources.followers": "Последователи",
-  "timeline_hint.resources.follows": "Последвани",
-  "timeline_hint.resources.statuses": "По-стари публикации",
   "trends.counter_by_accounts": "{count, plural, one {{counter} човек} other {{counter} души}} {days, plural, one {за последния {days} ден} other {за последните {days} дни}}",
   "trends.trending_now": "Налагащи се сега",
   "ui.beforeunload": "Черновата ви ще се загуби, излизайки от Mastodon.",
diff --git a/app/javascript/mastodon/locales/bn.json b/app/javascript/mastodon/locales/bn.json
index 849be0eaf2550c..1c57b86f4292a2 100644
--- a/app/javascript/mastodon/locales/bn.json
+++ b/app/javascript/mastodon/locales/bn.json
@@ -18,7 +18,6 @@
   "account.block_domain": "{domain} কে ব্লক করুন",
   "account.block_short": "ব্লক",
   "account.blocked": "অবরুদ্ধ",
-  "account.browse_more_on_origin_server": "মূল প্রোফাইলটিতে আরও ব্রাউজ করুন",
   "account.cancel_follow_request": "অনুসরণ অনুরোধ প্রত্যাহার করুন",
   "account.direct": "গোপনে মেনশন করুন @{name}",
   "account.disable_notifications": "আমাকে জানানো বন্ধ করো যখন @{name} পোস্ট করবে",
@@ -450,10 +449,6 @@
   "time_remaining.minutes": "{number, plural, one {# মিনিট} other {# মিনিট}} বাকি আছে",
   "time_remaining.moments": "সময় বাকি আছে",
   "time_remaining.seconds": "{number, plural, one {# second} other {# seconds}} বাকি আছে",
-  "timeline_hint.remote_resource_not_displayed": "অন্য সার্ভারগুলি থেকে {resource} দেখাচ্ছে না। ",
-  "timeline_hint.resources.followers": "অনুসরকারীরা",
-  "timeline_hint.resources.follows": "অনুসরণ করে",
-  "timeline_hint.resources.statuses": "পুরনো টুটগুলি",
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {# days}}",
   "trends.trending_now": "বর্তমানে জনপ্রিয়",
   "ui.beforeunload": "যে পর্যন্ত এটা লেখা হয়েছে, মাস্টাডন থেকে চলে গেলে এটা মুছে যাবে।",
diff --git a/app/javascript/mastodon/locales/br.json b/app/javascript/mastodon/locales/br.json
index b5abb3762f24cc..dc1e549759496a 100644
--- a/app/javascript/mastodon/locales/br.json
+++ b/app/javascript/mastodon/locales/br.json
@@ -18,7 +18,6 @@
   "account.block_domain": "Stankañ an domani {domain}",
   "account.block_short": "Stankañ",
   "account.blocked": "Stanket",
-  "account.browse_more_on_origin_server": "Furchal pelloc'h war ar profil orin",
   "account.cancel_follow_request": "Nullañ ar reked heuliañ",
   "account.copy": "Eilañ al liamm war-zu ho profil",
   "account.direct": "Menegiñ @{name} ent-prevez",
@@ -629,10 +628,6 @@
   "time_remaining.minutes": "{number, plural, one {# munut} other{# a vunut}} a chom",
   "time_remaining.moments": "Pennadoù a-zilerc'h",
   "time_remaining.seconds": "{number, plural, one {# eilenn} other{# eilenn}} a chom",
-  "timeline_hint.remote_resource_not_displayed": "{resource} eus servijerien all n'int ket skrammet.",
-  "timeline_hint.resources.followers": "Heulier·ezed·ien",
-  "timeline_hint.resources.follows": "Heuliañ",
-  "timeline_hint.resources.statuses": "Toudoù koshoc'h",
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {# days}}",
   "trends.trending_now": "Luskad ar mare",
   "ui.beforeunload": "Kollet e vo ho prell ma kuitit Mastodon.",
diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index 777e8863271298..6ea94151f86110 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -19,7 +19,6 @@
   "account.block_domain": "Bloca el domini {domain}",
   "account.block_short": "Bloca",
   "account.blocked": "Blocat",
-  "account.browse_more_on_origin_server": "Explora'n més al perfil original",
   "account.cancel_follow_request": "Cancel·la el seguiment",
   "account.copy": "Copia l'enllaç al perfil",
   "account.direct": "Menciona privadament @{name}",
@@ -349,6 +348,14 @@
   "hashtag.follow": "Segueix l'etiqueta",
   "hashtag.unfollow": "Deixa de seguir l'etiqueta",
   "hashtags.and_other": "…i {count, plural, other {# més}}",
+  "hints.profiles.followers_may_be_missing": "Es poden haver perdut seguidors d'aquest perfil.",
+  "hints.profiles.follows_may_be_missing": "Es poden haver perdut seguiments d'aquest perfil.",
+  "hints.profiles.posts_may_be_missing": "Es poden haver perdut algunes publicacions d'aquest perfil.",
+  "hints.profiles.see_more_followers": "Vegeu més seguidors a {domain}",
+  "hints.profiles.see_more_follows": "Vegeu més seguiments a {domain}",
+  "hints.profiles.see_more_posts": "Vegeu més publicacions a {domain}",
+  "hints.threads.replies_may_be_missing": "Es poden haver perdut respostes d'altres servidors.",
+  "hints.threads.see_more": "Vegeu més respostes a {domain}",
   "home.column_settings.show_reblogs": "Mostra els impulsos",
   "home.column_settings.show_replies": "Mostra les respostes",
   "home.hide_announcements": "Amaga els anuncis",
@@ -356,7 +363,8 @@
   "home.pending_critical_update.link": "Veure actualitzacions",
   "home.pending_critical_update.title": "Actualització de seguretat crítica disponible!",
   "home.show_announcements": "Mostra els anuncis",
-  "ignore_notifications_modal.disclaimer": "Mastodon no pot informar als usuaris de que heu ignorat notificacions seves.\nIgnorar notificacions no evitarà que se segueixin enviant els missatges.",
+  "ignore_notifications_modal.disclaimer": "Mastodon no pot informar els usuaris que heu ignorat notificacions seves.\nIgnorar notificacions no evitarà que se segueixin enviant els missatges.",
+  "ignore_notifications_modal.filter_instead": "Altrament filtra",
   "ignore_notifications_modal.filter_to_act_users": "Encara podreu acceptar, rebutjar o reportar usuaris",
   "ignore_notifications_modal.filter_to_avoid_confusion": "Filtrar ajuda a evitar potencials confusions",
   "ignore_notifications_modal.filter_to_review_separately": "Podeu revisar separadament notificacions filtrades",
@@ -455,8 +463,6 @@
   "mute_modal.title": "Silenciem l'usuari?",
   "mute_modal.you_wont_see_mentions": "No veureu publicacions que els esmentin.",
   "mute_modal.you_wont_see_posts": "Encara poden veure les vostres publicacions, però no veureu les seves.",
-  "name_and_others": "{name} i {count, plural, one {# altre} other {# altres}}",
-  "name_and_others_with_link": "{name} i <a>{count, plural, one {# altre} other {# altres}}</a>",
   "navigation_bar.about": "Quant a",
   "navigation_bar.advanced_interface": "Obre en la interfície web avançada",
   "navigation_bar.blocks": "Usuaris blocats",
@@ -489,9 +495,13 @@
   "notification.admin.report_statuses": "{name} ha reportat {target} per {category}",
   "notification.admin.report_statuses_other": "{name} ha reportat {target}",
   "notification.admin.sign_up": "{name} s'ha registrat",
+  "notification.admin.sign_up.name_and_others": "{name} i {count, plural, one {# altre} other {# altres}} s'han registrat",
   "notification.favourite": "{name} ha afavorit el teu tut",
+  "notification.favourite.name_and_others_with_link": "{name} i <a>{count, plural, one {# altre} other {# altres}}</a> han afavorit la vostra publicació",
   "notification.follow": "{name} et segueix",
+  "notification.follow.name_and_others": "{name} i {count, plural, one {# altre} other {# altres}} us han seguit",
   "notification.follow_request": "{name} ha sol·licitat de seguir-te",
+  "notification.follow_request.name_and_others": "{name} i {count, plural, one {# altre} other {# altres}} han demanat de seguir-vos",
   "notification.label.mention": "Menció",
   "notification.label.private_mention": "Menció privada",
   "notification.label.private_reply": "Resposta en privat",
@@ -509,6 +519,7 @@
   "notification.own_poll": "La teva enquesta ha finalitzat",
   "notification.poll": "Ha finalitzat una enquesta que heu respost",
   "notification.reblog": "{name} t'ha impulsat",
+  "notification.reblog.name_and_others_with_link": "{name} i <a>{count, plural, one {# altre} other {# altres}}</a> han impulsat la vostra publicació",
   "notification.relationships_severance_event": "S'han perdut les connexions amb {name}",
   "notification.relationships_severance_event.account_suspension": "Un administrador de {from} ha suspès {target}; això vol dir que ja no en podreu rebre actualitzacions o interactuar-hi.",
   "notification.relationships_severance_event.domain_block": "Un administrador de {from} ha blocat {target}, incloent-hi {followersCount} dels vostres seguidors i {followingCount, plural, one {# compte} other {# comptes}} que seguiu.",
@@ -571,12 +582,12 @@
   "notifications.permission_denied": "Les notificacions d’escriptori no estan disponibles perquè prèviament s’ha denegat el permís al navegador",
   "notifications.permission_denied_alert": "No es poden activar les notificacions de l'escriptori perquè abans s'ha denegat el permís del navegador",
   "notifications.permission_required": "Les notificacions d'escriptori no estan disponibles perquè el permís requerit no ha estat concedit.",
-  "notifications.policy.accept": "Acceptar",
+  "notifications.policy.accept": "Accepta",
   "notifications.policy.accept_hint": "Mostra a notificacions",
-  "notifications.policy.drop": "Ignorar",
+  "notifications.policy.drop": "Ignora",
   "notifications.policy.drop_hint": "Envia al buit, no es tornarà a veure mai més",
-  "notifications.policy.filter": "Filtrar",
-  "notifications.policy.filter_hint": "Filtrar",
+  "notifications.policy.filter": "Filtra",
+  "notifications.policy.filter_hint": "Envia a la bústia de notificacions filtrades",
   "notifications.policy.filter_limited_accounts_hint": "Limitat pels moderadors del servidor",
   "notifications.policy.filter_limited_accounts_title": "Comptes moderats",
   "notifications.policy.filter_new_accounts.hint": "Creat {days, plural, one {ahir} other {durant els # dies passats}}",
@@ -825,11 +836,6 @@
   "time_remaining.minutes": "{number, plural, one {# minut restant} other {# minuts restants}}",
   "time_remaining.moments": "Moments restants",
   "time_remaining.seconds": "{number, plural, one {# segon restant} other {# segons restants}}",
-  "timeline_hint.remote_resource_not_displayed": "No es mostren {resource} d'altres servidors.",
-  "timeline_hint.resources.followers": "Seguidors",
-  "timeline_hint.resources.follows": "Seguiments",
-  "timeline_hint.resources.replies": "Algunes respostes",
-  "timeline_hint.resources.statuses": "Tuts més antics",
   "trends.counter_by_accounts": "{count, plural, one {{counter} persona} other {{counter} persones}} en {days, plural, one {el passat dia} other {els passats {days} dies}}",
   "trends.trending_now": "És tendència",
   "ui.beforeunload": "El teu esborrany es perdrà si surts de Mastodon.",
diff --git a/app/javascript/mastodon/locales/ckb.json b/app/javascript/mastodon/locales/ckb.json
index ca6a363f4241ee..99ce6a81803d55 100644
--- a/app/javascript/mastodon/locales/ckb.json
+++ b/app/javascript/mastodon/locales/ckb.json
@@ -18,7 +18,6 @@
   "account.block_domain": "بلۆکی هەموو شتێک لە {domain}",
   "account.block_short": "بلۆک",
   "account.blocked": "بلۆککرا",
-  "account.browse_more_on_origin_server": "گەڕانی فرەتر لە سەر پرۆفایلی سەرەکی",
   "account.cancel_follow_request": "داواکاری فۆڵۆو بکشێنەوە",
   "account.copy": "ڕوونووسی بەستەر بۆ توت",
   "account.direct": "بە شێوەیەکی تایبەت باسی @{name} بکە",
@@ -590,10 +589,6 @@
   "time_remaining.minutes": "{number, plural, one {# خولەک} other {# خولەک}} ماوە",
   "time_remaining.moments": "کاتی ماوە",
   "time_remaining.seconds": "{number, plural, one {# چرکە} other {# چرکە}} ماوە",
-  "timeline_hint.remote_resource_not_displayed": "{resource} لە ڕاژەکانی ترەوە پیشان نادرێت.",
-  "timeline_hint.resources.followers": "شوێنکەوتوو",
-  "timeline_hint.resources.follows": "شوێنکەوتن",
-  "timeline_hint.resources.statuses": "نێردراوی کۆن",
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "ڕۆژەڤ",
   "ui.beforeunload": "ڕەشنووسەکەت لەدەست دەچێت ئەگەر ماستۆدۆن جێ بهێڵیت.",
diff --git a/app/javascript/mastodon/locales/co.json b/app/javascript/mastodon/locales/co.json
index fcd89b39a5d619..f1783465d99eee 100644
--- a/app/javascript/mastodon/locales/co.json
+++ b/app/javascript/mastodon/locales/co.json
@@ -5,7 +5,6 @@
   "account.block": "Bluccà @{name}",
   "account.block_domain": "Piattà u duminiu {domain}",
   "account.blocked": "Bluccatu",
-  "account.browse_more_on_origin_server": "Vede di più nant'à u prufile uriginale",
   "account.cancel_follow_request": "Withdraw follow request",
   "account.disable_notifications": "Ùn mi nutificate più quandu @{name} pubblica qualcosa",
   "account.domain_blocked": "Duminiu piattatu",
@@ -358,10 +357,6 @@
   "time_remaining.minutes": "{number, plural, one {# minuta ferma} other {# minute fermanu}} left",
   "time_remaining.moments": "Ci fermanu qualchi mumentu",
   "time_remaining.seconds": "{number, plural, one {# siconda ferma} other {# siconde fermanu}}",
-  "timeline_hint.remote_resource_not_displayed": "{resource} da l'altri servori ùn so micca affissati·e.",
-  "timeline_hint.resources.followers": "Abbunati",
-  "timeline_hint.resources.follows": "Abbunamenti",
-  "timeline_hint.resources.statuses": "Statuti più anziani",
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {# days}}",
   "trends.trending_now": "Tindenze d'avà",
   "ui.beforeunload": "A bruttacopia sarà persa s'ellu hè chjosu Mastodon.",
diff --git a/app/javascript/mastodon/locales/cs.json b/app/javascript/mastodon/locales/cs.json
index a4a96f1e2160c0..b726fef18b75d0 100644
--- a/app/javascript/mastodon/locales/cs.json
+++ b/app/javascript/mastodon/locales/cs.json
@@ -19,7 +19,6 @@
   "account.block_domain": "Blokovat doménu {domain}",
   "account.block_short": "Zablokovat",
   "account.blocked": "Blokovaný",
-  "account.browse_more_on_origin_server": "Více na původním profilu",
   "account.cancel_follow_request": "Zrušit sledování",
   "account.copy": "Kopírovat odkaz na profil",
   "account.direct": "Soukromě zmínit @{name}",
@@ -783,10 +782,6 @@
   "time_remaining.minutes": "{number, plural, one {Zbývá # minuta} few {Zbývají # minuty} many {Zbývá # minut} other {Zbývá # minut}}",
   "time_remaining.moments": "Zbývá několik sekund",
   "time_remaining.seconds": "{number, plural, one {Zbývá # sekunda} few {Zbývají # sekundy} many {Zbývá # sekund} other {Zbývá # sekund}}",
-  "timeline_hint.remote_resource_not_displayed": "{resource} z jiných serverů se nezobrazují.",
-  "timeline_hint.resources.followers": "Sledující",
-  "timeline_hint.resources.follows": "Sledovaní",
-  "timeline_hint.resources.statuses": "Starší příspěvky",
   "trends.counter_by_accounts": "{count, plural, one {{counter} člověk} few {{counter} lidé} many {{counter} lidí} other {{counter} lidí}} za poslední {days, plural, one {den} few {{days} dny} many {{days} dnů} other {{days} dnů}}",
   "trends.trending_now": "Právě populární",
   "ui.beforeunload": "Pokud Mastodon opustíte, váš koncept se ztratí.",
diff --git a/app/javascript/mastodon/locales/cy.json b/app/javascript/mastodon/locales/cy.json
index 4fb02ba7f12787..d40533765921f0 100644
--- a/app/javascript/mastodon/locales/cy.json
+++ b/app/javascript/mastodon/locales/cy.json
@@ -19,7 +19,6 @@
   "account.block_domain": "Blocio parth {domain}",
   "account.block_short": "Blocio",
   "account.blocked": "Blociwyd",
-  "account.browse_more_on_origin_server": "Pori mwy ar y proffil gwreiddiol",
   "account.cancel_follow_request": "Tynnu cais i ddilyn",
   "account.copy": "Copïo dolen i'r proffil",
   "account.direct": "Crybwyll yn breifat @{name}",
@@ -456,8 +455,6 @@
   "mute_modal.title": "Tewi defnyddiwr?",
   "mute_modal.you_wont_see_mentions": "Welwch chi ddim postiadau sy'n sôn amdanyn nhw.",
   "mute_modal.you_wont_see_posts": "Gallan nhw weld eich postiadau o hyd, ond fyddwch chi ddim yn gweld eu rhai hwy.",
-  "name_and_others": "{name} a(c) {count, plural, one {# arall} other {# eraill}}",
-  "name_and_others_with_link": "{name} a<a>{count, plural, zero {}one {c # arall} two { # eraill} few { # eraill} many { # eraill} other { # eraill}}</a>",
   "navigation_bar.about": "Ynghylch",
   "navigation_bar.advanced_interface": "Agor mewn rhyngwyneb gwe uwch",
   "navigation_bar.blocks": "Defnyddwyr wedi eu blocio",
@@ -816,11 +813,6 @@
   "time_remaining.minutes": "{number, plural, one {# munud} other {# munud}} ar ôl",
   "time_remaining.moments": "Munudau yn weddill",
   "time_remaining.seconds": "{number, plural, one {# eiliad} other {# eiliad}} ar ôl",
-  "timeline_hint.remote_resource_not_displayed": "Nid yw {resource} o weinyddion eraill yn cael ei ddangos.",
-  "timeline_hint.resources.followers": "Dilynwyr",
-  "timeline_hint.resources.follows": "Yn dilyn",
-  "timeline_hint.resources.replies": "Rhai atebion",
-  "timeline_hint.resources.statuses": "Postiadau hŷn",
   "trends.counter_by_accounts": "{count, plural, zero {neb} one {{counter} person} two {{counter} berson} few {{counter} pherson} other {{counter} o bobl}} yn y {days, plural, one {diwrnod diwethaf} two {ddeuddydd diwethaf} other {{days} diwrnod diwethaf}}",
   "trends.trending_now": "Yn trendio nawr",
   "ui.beforeunload": "Byddwch yn colli eich drafft os byddwch yn gadael Mastodon.",
diff --git a/app/javascript/mastodon/locales/da.json b/app/javascript/mastodon/locales/da.json
index 9ae27e134ea510..9a23d70bc62f72 100644
--- a/app/javascript/mastodon/locales/da.json
+++ b/app/javascript/mastodon/locales/da.json
@@ -19,7 +19,6 @@
   "account.block_domain": "Blokér domænet {domain}",
   "account.block_short": "Bloker",
   "account.blocked": "Blokeret",
-  "account.browse_more_on_origin_server": "Se mere på den oprindelige profil",
   "account.cancel_follow_request": "Annullér anmodning om at følge",
   "account.copy": "Kopiér link til profil",
   "account.direct": "Privat omtale @{name}",
@@ -349,6 +348,14 @@
   "hashtag.follow": "Følg hashtag",
   "hashtag.unfollow": "Stop med at følge hashtag",
   "hashtags.and_other": "…og {count, plural, one {}other {# flere}}",
+  "hints.profiles.followers_may_be_missing": "Der kan mangle følgere for denne profil.",
+  "hints.profiles.follows_may_be_missing": "Fulgte kan mangle for denne profil.",
+  "hints.profiles.posts_may_be_missing": "Nogle indlæg kan mangle for denne profil.",
+  "hints.profiles.see_more_followers": "Se flere følgere på {domain}",
+  "hints.profiles.see_more_follows": "Se flere fulgte på {domain}",
+  "hints.profiles.see_more_posts": "Se flere indlæg på {domain}",
+  "hints.threads.replies_may_be_missing": "Der kan mangle svar fra andre servere.",
+  "hints.threads.see_more": "Se flere svar på {domain}",
   "home.column_settings.show_reblogs": "Vis boosts",
   "home.column_settings.show_replies": "Vis svar",
   "home.hide_announcements": "Skjul bekendtgørelser",
@@ -456,8 +463,6 @@
   "mute_modal.title": "Tavsgør bruger?",
   "mute_modal.you_wont_see_mentions": "Indlæg, som nævner vedkommende, vises ikke.",
   "mute_modal.you_wont_see_posts": "Vedkommende kan stadig se dine indlæg, med vedkommendes vise ikke.",
-  "name_and_others": "{name} og {count, plural, one {# anden} other {# andre}}",
-  "name_and_others_with_link": "{name} og <a>{count, plural, one {# anden} other {# andre}}</a>",
   "navigation_bar.about": "Om",
   "navigation_bar.advanced_interface": "Åbn i avanceret webgrænseflade",
   "navigation_bar.blocks": "Blokerede brugere",
@@ -490,9 +495,13 @@
   "notification.admin.report_statuses": "{name} anmeldte {target} angående {category}",
   "notification.admin.report_statuses_other": "{name} anmeldte {target}",
   "notification.admin.sign_up": "{name} tilmeldte sig",
+  "notification.admin.sign_up.name_and_others": "{name} og {count, plural, one {# anden} other {# andre}} tilmeldte sig",
   "notification.favourite": "{name} favoritmarkerede dit indlæg",
+  "notification.favourite.name_and_others_with_link": "{name} og <a>{count, plural, one {# anden} other {# andre}}</a> gjorde dit indlæg til favorit",
   "notification.follow": "{name} begyndte at følge dig",
+  "notification.follow.name_and_others": "{name} og {count, plural, one {# anden} other {# andre}} følger dig",
   "notification.follow_request": "{name} har anmodet om at følge dig",
+  "notification.follow_request.name_and_others": "{name} og {count, plural, one {# anden} other {# andre}} har anmodet om at følger dig",
   "notification.label.mention": "Omtale",
   "notification.label.private_mention": "Privat omtale",
   "notification.label.private_reply": "Privat svar",
@@ -510,6 +519,7 @@
   "notification.own_poll": "Din afstemning er afsluttet",
   "notification.poll": "En afstemning, hvori du har stemt, er slut",
   "notification.reblog": "{name} boostede dit indlæg",
+  "notification.reblog.name_and_others_with_link": "{name} og <a>{count, plural, one {# anden} other {# andre}}</a> boostede dit indlæg",
   "notification.relationships_severance_event": "Mistede forbindelser med {name}",
   "notification.relationships_severance_event.account_suspension": "En admin fra {from} har suspenderet {target}, hvofor opdateringer herfra eller interaktion hermed ikke længer er mulig.",
   "notification.relationships_severance_event.domain_block": "En admin fra {from} har blokeret {target}, herunder {followersCount} tilhængere og {followingCount, plural, one {# konto, der} other {# konti, som}} følges.",
@@ -826,11 +836,6 @@
   "time_remaining.minutes": "{number, plural, one {# minut} other {# minutter}} tilbage",
   "time_remaining.moments": "Få øjeblikke tilbage",
   "time_remaining.seconds": "{number, plural, one {# sekund} other {# sekunder}} tilbage",
-  "timeline_hint.remote_resource_not_displayed": "{resource} fra andre servere vises ikke.",
-  "timeline_hint.resources.followers": "Følgere",
-  "timeline_hint.resources.follows": "Følger",
-  "timeline_hint.resources.replies": "Visse svar",
-  "timeline_hint.resources.statuses": "Ældre indlæg",
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} personer}} {days, plural, one {den seneste dag} other {de seneste {days} dage}}",
   "trends.trending_now": "Hot lige nu",
   "ui.beforeunload": "Dit udkast går tabt, hvis du lukker Mastodon.",
diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json
index b7872f0dea7b91..5030a824ad7255 100644
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@@ -19,7 +19,6 @@
   "account.block_domain": "{domain} sperren",
   "account.block_short": "Blockieren",
   "account.blocked": "Blockiert",
-  "account.browse_more_on_origin_server": "Mehr auf dem Originalprofil durchsuchen",
   "account.cancel_follow_request": "Folgeanfrage zurückziehen",
   "account.copy": "Link zum Profil kopieren",
   "account.direct": "@{name} privat erwähnen",
@@ -97,7 +96,7 @@
   "block_modal.they_will_know": "Es wird erkennbar sein, dass dieses Profil blockiert wurde.",
   "block_modal.title": "Profil blockieren?",
   "block_modal.you_wont_see_mentions": "Du wirst keine Beiträge sehen, die dieses Profil erwähnen.",
-  "boost_modal.combo": "Mit {combo} wird dieses Fenster beim nächsten Mal nicht mehr angezeigt",
+  "boost_modal.combo": "Mit {combo} erscheint dieses Fenster beim nächsten Mal nicht mehr",
   "bundle_column_error.copy_stacktrace": "Fehlerbericht kopieren",
   "bundle_column_error.error.body": "Die angeforderte Seite konnte nicht dargestellt werden. Dies könnte auf einen Fehler in unserem Code oder auf ein Browser-Kompatibilitätsproblem zurückzuführen sein.",
   "bundle_column_error.error.title": "Oh nein!",
@@ -185,7 +184,7 @@
   "confirmations.logout.title": "Abmelden?",
   "confirmations.mute.confirm": "Stummschalten",
   "confirmations.redraft.confirm": "Löschen und neu erstellen",
-  "confirmations.redraft.message": "Möchtest du diesen Beitrag wirklich löschen und neu verfassen? Favoriten und geteilte Beiträge gehen verloren, und Antworten auf den ursprünglichen Beitrag verlieren den Zusammenhang.",
+  "confirmations.redraft.message": "Möchtest du diesen Beitrag wirklich löschen und neu verfassen? Alle Favoriten sowie die bisher geteilten Beiträge werden verloren gehen und Antworten auf den ursprünglichen Beitrag verlieren den Zusammenhang.",
   "confirmations.redraft.title": "Beitrag löschen und neu erstellen?",
   "confirmations.reply.confirm": "Antworten",
   "confirmations.reply.message": "Wenn du jetzt darauf antwortest, wird der andere Beitrag, an dem du gerade geschrieben hast, verworfen. Möchtest du wirklich fortfahren?",
@@ -349,6 +348,14 @@
   "hashtag.follow": "Hashtag folgen",
   "hashtag.unfollow": "Hashtag entfolgen",
   "hashtags.and_other": "… und {count, plural, one{# weiterer} other {# weitere}}",
+  "hints.profiles.followers_may_be_missing": "Möglicherweise werden für dieses Profil nicht alle Follower angezeigt.",
+  "hints.profiles.follows_may_be_missing": "Möglicherweise werden für dieses Profil nicht alle gefolgten Profile angezeigt.",
+  "hints.profiles.posts_may_be_missing": "Möglicherweise werden für dieses Profil nicht alle Beiträge angezeigt.",
+  "hints.profiles.see_more_followers": "Weitere Follower auf {domain} ansehen",
+  "hints.profiles.see_more_follows": "Weitere gefolgte Profile auf {domain} ansehen",
+  "hints.profiles.see_more_posts": "Weitere Beiträge auf {domain} ansehen",
+  "hints.threads.replies_may_be_missing": "Möglicherweise werden für dieses Profil nicht alle Antworten angezeigt.",
+  "hints.threads.see_more": "Weitere Antworten auf {domain} ansehen",
   "home.column_settings.show_reblogs": "Geteilte Beiträge anzeigen",
   "home.column_settings.show_replies": "Antworten anzeigen",
   "home.hide_announcements": "Ankündigungen ausblenden",
@@ -456,8 +463,6 @@
   "mute_modal.title": "Profil stummschalten?",
   "mute_modal.you_wont_see_mentions": "Du wirst keine Beiträge sehen, die dieses Profil erwähnen.",
   "mute_modal.you_wont_see_posts": "Deine Beiträge können weiterhin angesehen werden, aber du wirst deren Beiträge nicht mehr sehen.",
-  "name_and_others": "{name} und {count, plural, one {# weitere Person} other {# weitere Personen}}",
-  "name_and_others_with_link": "{name} und <a>{count, plural, one {# weitere Person} other {# weitere Personen}}</a>",
   "navigation_bar.about": "Über",
   "navigation_bar.advanced_interface": "Im erweiterten Webinterface öffnen",
   "navigation_bar.blocks": "Blockierte Profile",
@@ -490,9 +495,13 @@
   "notification.admin.report_statuses": "{name} meldete {target} wegen {category}",
   "notification.admin.report_statuses_other": "{name} meldete {target}",
   "notification.admin.sign_up": "{name} registrierte sich",
+  "notification.admin.sign_up.name_and_others": "{name} und {count, plural, one {# weitere Person} other {# weitere Personen}} registrierten sich",
   "notification.favourite": "{name} favorisierte deinen Beitrag",
+  "notification.favourite.name_and_others_with_link": "{name} und <a>{count, plural, one {# weitere Person} other {# weitere Personen}}</a> favorisierten deinen Beitrag",
   "notification.follow": "{name} folgt dir",
+  "notification.follow.name_and_others": "{name} und {count, plural, one {# weitere Person} other {# weitere Personen}} folgen dir",
   "notification.follow_request": "{name} möchte dir folgen",
+  "notification.follow_request.name_and_others": "{name} und {count, plural, one {# weitere Person} other {# weitere Personen}} möchten dir folgen",
   "notification.label.mention": "Erwähnung",
   "notification.label.private_mention": "Private Erwähnung",
   "notification.label.private_reply": "Private Antwort",
@@ -510,6 +519,7 @@
   "notification.own_poll": "Deine Umfrage ist beendet",
   "notification.poll": "Eine Umfrage, an der du teilgenommen hast, ist beendet",
   "notification.reblog": "{name} teilte deinen Beitrag",
+  "notification.reblog.name_and_others_with_link": "{name} und <a>{count, plural, one {# weitere Person} other {# weitere Personen}}</a> teilten deinen Beitrag",
   "notification.relationships_severance_event": "Verbindungen mit {name} verloren",
   "notification.relationships_severance_event.account_suspension": "Ein Admin von {from} hat {target} gesperrt. Du wirst von diesem Profil keine Updates mehr erhalten und auch nicht mit ihm interagieren können.",
   "notification.relationships_severance_event.domain_block": "Ein Admin von {from} hat {target} blockiert – darunter {followersCount} deiner Follower und {followingCount, plural, one {# Konto, dem} other {# Konten, denen}} du folgst.",
@@ -650,9 +660,9 @@
   "privacy.private.short": "Follower",
   "privacy.public.long": "Alle in und außerhalb von Mastodon",
   "privacy.public.short": "Öffentlich",
-  "privacy.unlisted.additional": "Das Verhalten ist wie bei „Öffentlich“, jedoch erscheint dieser Beitrag nicht in „Live-Feeds“, „Erkunden“, Hashtags oder über die Mastodon-Suchfunktion – selbst wenn du das in den Einstellungen aktiviert hast.",
+  "privacy.unlisted.additional": "Das Verhalten ist wie bei „Öffentlich“, jedoch gibt es einige Einschränkungen. Der Beitrag wird nicht in „Live-Feeds“, „Erkunden“, Hashtags oder über die Mastodon-Suchfunktion auffindbar sein – selbst wenn die zugehörige Einstellung aktiviert wurde.",
   "privacy.unlisted.long": "Weniger im Algorithmus berücksichtigt",
-  "privacy.unlisted.short": "Öffentlich (eingeschränkt)",
+  "privacy.unlisted.short": "Öffentlich (still)",
   "privacy_policy.last_updated": "Stand: {date}",
   "privacy_policy.title": "Datenschutzerklärung",
   "recommended": "Empfohlen",
@@ -826,11 +836,6 @@
   "time_remaining.minutes": "noch {number, plural, one {# Minute} other {# Minuten}}",
   "time_remaining.moments": "Wird gleich beendet",
   "time_remaining.seconds": "noch {number, plural, one {# Sekunde} other {# Sekunden}}",
-  "timeline_hint.remote_resource_not_displayed": "{resource} von anderen Servern werden nicht angezeigt.",
-  "timeline_hint.resources.followers": "Follower",
-  "timeline_hint.resources.follows": "„Folge ich“",
-  "timeline_hint.resources.replies": "Einige Antworten",
-  "timeline_hint.resources.statuses": "Ältere Beiträge",
   "trends.counter_by_accounts": "{count, plural, one {{counter} Profil} other {{counter} Profile}} {days, plural, one {seit gestern} other {in {days} Tagen}}",
   "trends.trending_now": "Aktuelle Trends",
   "ui.beforeunload": "Dein Entwurf geht verloren, wenn du Mastodon verlässt.",
diff --git a/app/javascript/mastodon/locales/el.json b/app/javascript/mastodon/locales/el.json
index 9603da4ffa95a1..6cdb9d6f383d24 100644
--- a/app/javascript/mastodon/locales/el.json
+++ b/app/javascript/mastodon/locales/el.json
@@ -19,7 +19,6 @@
   "account.block_domain": "Αποκλεισμός τομέα {domain}",
   "account.block_short": "Αποκλεισμός",
   "account.blocked": "Αποκλεισμένος/η",
-  "account.browse_more_on_origin_server": "Δες περισσότερα στο αρχικό προφίλ",
   "account.cancel_follow_request": "Απόσυρση αιτήματος παρακολούθησης",
   "account.copy": "Αντιγραφή συνδέσμου προφίλ",
   "account.direct": "Ιδιωτική αναφορά @{name}",
@@ -349,6 +348,14 @@
   "hashtag.follow": "Παρακολούθηση ετικέτας",
   "hashtag.unfollow": "Διακοπή παρακολούθησης ετικέτας",
   "hashtags.and_other": "…και {count, plural, one {}other {# ακόμη}}",
+  "hints.profiles.followers_may_be_missing": "Μπορεί να λείπουν ακόλουθοι για αυτό το προφίλ.",
+  "hints.profiles.follows_may_be_missing": "Άτομα που ακολουθούνται μπορεί να λείπουν απ' αυτό το προφίλ.",
+  "hints.profiles.posts_may_be_missing": "Κάποιες αναρτήσεις από αυτό το προφίλ μπορεί να λείπουν.",
+  "hints.profiles.see_more_followers": "Δες περισσότερους ακόλουθους στο {domain}",
+  "hints.profiles.see_more_follows": "Δες περισσότερα άτομα που ακολουθούνται στο {domain}",
+  "hints.profiles.see_more_posts": "Δες περισσότερες αναρτήσεις στο {domain}",
+  "hints.threads.replies_may_be_missing": "Απαντήσεις από άλλους διακομιστές μπορεί να λείπουν.",
+  "hints.threads.see_more": "Δες περισσότερες αναρτήσεις στο {domain}",
   "home.column_settings.show_reblogs": "Εμφάνιση προωθήσεων",
   "home.column_settings.show_replies": "Εμφάνιση απαντήσεων",
   "home.hide_announcements": "Απόκρυψη ανακοινώσεων",
@@ -456,8 +463,6 @@
   "mute_modal.title": "Σίγαση χρήστη;",
   "mute_modal.you_wont_see_mentions": "Δε θα βλέπεις τις αναρτήσεις που τον αναφέρουν.",
   "mute_modal.you_wont_see_posts": "Μπορεί ακόμα να δει τις αναρτήσεις σου, αλλά δε θα βλέπεις τις δικές του.",
-  "name_and_others": "{name} και {count, plural, one {# ακόμη} other {# ακόμη}}",
-  "name_and_others_with_link": "{name} και <a>{count, plural, one {# ακόμη} other {# ακόμη}}</a>",
   "navigation_bar.about": "Σχετικά με",
   "navigation_bar.advanced_interface": "Άνοιγμα σε προηγμένη διεπαφή ιστού",
   "navigation_bar.blocks": "Αποκλεισμένοι χρήστες",
@@ -490,9 +495,13 @@
   "notification.admin.report_statuses": "Ο χρήστης {name} ανέφερε τον χρήστη {target} για {category}",
   "notification.admin.report_statuses_other": "Ο χρήστης {name} ανέφερε τον χρήστη {target}",
   "notification.admin.sign_up": "{name} έχει εγγραφεί",
+  "notification.admin.sign_up.name_and_others": "{name} και {count, plural, one {# ακόμη} other {# ακόμη}} έχουν εγγραφεί",
   "notification.favourite": "{name} favorited your post\n{name} προτίμησε την ανάρτηση σου",
+  "notification.favourite.name_and_others_with_link": "{name} και <a>{count, plural, one {# ακόμη} other {# ακόμη}}</a> αγάπησαν την ανάρτησή σου",
   "notification.follow": "Ο/Η {name} σε ακολούθησε",
+  "notification.follow.name_and_others": "{name} και {count, plural, one {# ακόμη} other {# ακόμη}} σε ακολούθησαν",
   "notification.follow_request": "Ο/H {name} ζήτησε να σε ακολουθήσει",
+  "notification.follow_request.name_and_others": "{name} και {count, plural, one {# άλλος} other {# άλλοι}} ζήτησαν να σε ακολουθήσουν",
   "notification.label.mention": "Επισήμανση",
   "notification.label.private_mention": "Ιδιωτική επισήμανση",
   "notification.label.private_reply": "Ιδιωτική απάντηση",
@@ -510,6 +519,7 @@
   "notification.own_poll": "Η δημοσκόπησή σου έληξε",
   "notification.poll": "Μία ψηφοφορία στην οποία συμμετείχες έχει τελειώσει",
   "notification.reblog": "Ο/Η {name} ενίσχυσε τη δημοσίευσή σου",
+  "notification.reblog.name_and_others_with_link": "{name} και <a>{count, plural, one {# ακόμη} other {# ακόμη}}</a> ενίσχυσαν την ανάρτησή σου",
   "notification.relationships_severance_event": "Χάθηκε η σύνδεση με το {name}",
   "notification.relationships_severance_event.account_suspension": "Ένας διαχειριστής από το {from} ανέστειλε το {target}, πράγμα που σημαίνει ότι δεν μπορείς πλέον να λαμβάνεις ενημερώσεις από αυτούς ή να αλληλεπιδράς μαζί τους.",
   "notification.relationships_severance_event.domain_block": "Ένας διαχειριστής από {from} έχει μπλοκάρει το {target}, συμπεριλαμβανομένων {followersCount} από τους ακόλουθούς σου και {followingCount, plural, one {# λογαριασμό} other {# λογαριασμοί}} που ακολουθείς.",
@@ -518,7 +528,17 @@
   "notification.status": "Ο/Η {name} μόλις ανέρτησε κάτι",
   "notification.update": "ο/η {name} επεξεργάστηκε μια ανάρτηση",
   "notification_requests.accept": "Αποδοχή",
+  "notification_requests.accept_multiple": "{count, plural, one {Αποδοχή # αιτήματος…} other {Αποδοχή # αιτημάτων…}}",
+  "notification_requests.confirm_accept_multiple.button": "{count, plural, one {Αποδοχή αιτήματος} other {Αποδοχή αιτημάτων}}",
+  "notification_requests.confirm_accept_multiple.message": "Πρόκειται να αποδεχτείς {count, plural, one {ένα αίτημα ειδοποίησης} other {# αιτήματα ειδοποίησης}}. Σίγουρα θες να συνεχίσεις;",
+  "notification_requests.confirm_accept_multiple.title": "Αποδοχή αιτήσεων ειδοποίησης;",
+  "notification_requests.confirm_dismiss_multiple.button": "{count, plural, one {Παράβλεψη αιτήματος} other {Παράβλεψη αιτημάτων}}",
+  "notification_requests.confirm_dismiss_multiple.message": "Πρόκειται να απορρίψεις {count, plural, one {ένα αίτημα ειδοποίησης} other {# αιτήματα ειδοποίησης}}. Δεν θα μπορείς να έχεις πρόσβαση εύκολα {count, plural, one {σε αυτό} other {σε αυτά}} ξανά. Σίγουρα θες να συνεχίσεις;",
+  "notification_requests.confirm_dismiss_multiple.title": "Απόρριψη αιτημάτων ειδοποίησης;",
   "notification_requests.dismiss": "Απόρριψη",
+  "notification_requests.dismiss_multiple": "{count, plural, one {Παράβλεψη # αιτήματος…} other {Παράβλεψη # αιτημάτων…}}",
+  "notification_requests.edit_selection": "Επεξεργασία",
+  "notification_requests.exit_selection": "Έγινε",
   "notification_requests.explainer_for_limited_account": "Οι ειδοποιήσεις από αυτόν τον λογαριασμό έχουν φιλτραριστεί επειδή ο λογαριασμός έχει περιοριστεί από έναν συντονιστή.",
   "notification_requests.explainer_for_limited_remote_account": "Οι ειδοποιήσεις από αυτόν τον λογαριασμό έχουν φιλτραριστεί επειδή ο λογαριασμός ή ο διακομιστής του έχει περιοριστεί από έναν συντονιστή.",
   "notification_requests.maximize": "Μεγιστοποίηση",
@@ -816,11 +836,6 @@
   "time_remaining.minutes": "απομένουν {number, plural, one {# λεπτό} other {# λεπτά}}",
   "time_remaining.moments": "Στιγμές που απομένουν",
   "time_remaining.seconds": "απομένουν {number, plural, one {# δευτερόλεπτο} other {# δευτερόλεπτα}}",
-  "timeline_hint.remote_resource_not_displayed": "{resource} από άλλους διακομιστές δεν εμφανίζονται.",
-  "timeline_hint.resources.followers": "Ακόλουθοι",
-  "timeline_hint.resources.follows": "Ακολουθείς",
-  "timeline_hint.resources.replies": "Κάποιες απαντήσεις",
-  "timeline_hint.resources.statuses": "Παλαιότερες αναρτήσεις",
   "trends.counter_by_accounts": "{count, plural, one {{counter} άτομο} other {{counter} άτομα} }{days, plural, one { την τελευταία ημέρα} other { τις τελευταίες {days} ημέρες}}",
   "trends.trending_now": "Δημοφιλή τώρα",
   "ui.beforeunload": "Το προσχέδιό σου θα χαθεί αν φύγεις από το Mastodon.",
diff --git a/app/javascript/mastodon/locales/en-GB.json b/app/javascript/mastodon/locales/en-GB.json
index d6e3429c3bd190..c3366c65452981 100644
--- a/app/javascript/mastodon/locales/en-GB.json
+++ b/app/javascript/mastodon/locales/en-GB.json
@@ -19,7 +19,6 @@
   "account.block_domain": "Block domain {domain}",
   "account.block_short": "Block",
   "account.blocked": "Blocked",
-  "account.browse_more_on_origin_server": "Browse more on the original profile",
   "account.cancel_follow_request": "Cancel follow",
   "account.copy": "Copy link to profile",
   "account.direct": "Privately mention @{name}",
@@ -349,6 +348,14 @@
   "hashtag.follow": "Follow hashtag",
   "hashtag.unfollow": "Unfollow hashtag",
   "hashtags.and_other": "…and {count, plural, one {one more} other {# more}}",
+  "hints.profiles.followers_may_be_missing": "Followers for this profile may be missing.",
+  "hints.profiles.follows_may_be_missing": "Follows for this profile may be missing.",
+  "hints.profiles.posts_may_be_missing": "Some posts from this profile may be missing.",
+  "hints.profiles.see_more_followers": "See more followers on {domain}",
+  "hints.profiles.see_more_follows": "See more follows on {domain}",
+  "hints.profiles.see_more_posts": "See more posts on {domain}",
+  "hints.threads.replies_may_be_missing": "Replies from other servers may be missing.",
+  "hints.threads.see_more": "See more replies on {domain}",
   "home.column_settings.show_reblogs": "Show boosts",
   "home.column_settings.show_replies": "Show replies",
   "home.hide_announcements": "Hide announcements",
@@ -366,6 +373,7 @@
   "ignore_notifications_modal.new_accounts_title": "Ignore notifications from new accounts?",
   "ignore_notifications_modal.not_followers_title": "Ignore notifications from people not following you?",
   "ignore_notifications_modal.not_following_title": "Ignore notifications from people you don't follow?",
+  "ignore_notifications_modal.private_mentions_title": "Ignore notifications from unsolicited Private Mentions?",
   "interaction_modal.description.favourite": "With an account on Mastodon, you can favourite this post to let the author know you appreciate it and save it for later.",
   "interaction_modal.description.follow": "With an account on Mastodon, you can follow {name} to receive their posts in your home feed.",
   "interaction_modal.description.reblog": "With an account on Mastodon, you can boost this post to share it with your own followers.",
@@ -455,8 +463,6 @@
   "mute_modal.title": "Mute user?",
   "mute_modal.you_wont_see_mentions": "You won't see posts that mention them.",
   "mute_modal.you_wont_see_posts": "They can still see your posts, but you won't see theirs.",
-  "name_and_others": "{name} and {count, plural, one {# other} other {# others}}",
-  "name_and_others_with_link": "{name} and <a>{count, plural, one {# other} other {# others}}</a>",
   "navigation_bar.about": "About",
   "navigation_bar.advanced_interface": "Open in advanced web interface",
   "navigation_bar.blocks": "Blocked users",
@@ -489,9 +495,13 @@
   "notification.admin.report_statuses": "{name} reported {target} for {category}",
   "notification.admin.report_statuses_other": "{name} reported {target}",
   "notification.admin.sign_up": "{name} signed up",
+  "notification.admin.sign_up.name_and_others": "{name} and {count, plural, one {# other} other {# others}} signed up",
   "notification.favourite": "{name} favourited your post",
+  "notification.favourite.name_and_others_with_link": "{name} and <a>{count, plural, one {# other} other {# others}}</a> favourited your post",
   "notification.follow": "{name} followed you",
+  "notification.follow.name_and_others": "{name} and {count, plural, one {# other} other {# others}} followed you",
   "notification.follow_request": "{name} has requested to follow you",
+  "notification.follow_request.name_and_others": "{name} and {count, plural, one {# other} other {# others}} has requested to follow you",
   "notification.label.mention": "Mention",
   "notification.label.private_mention": "Private mention",
   "notification.label.private_reply": "Private reply",
@@ -509,6 +519,7 @@
   "notification.own_poll": "Your poll has ended",
   "notification.poll": "A poll you voted in has ended",
   "notification.reblog": "{name} boosted your status",
+  "notification.reblog.name_and_others_with_link": "{name} and <a>{count, plural, one {# other} other {# others}}</a> boosted your post",
   "notification.relationships_severance_event": "Lost connections with {name}",
   "notification.relationships_severance_event.account_suspension": "An admin from {from} has suspended {target}, which means you can no longer receive updates from them or interact with them.",
   "notification.relationships_severance_event.domain_block": "An admin from {from} has blocked {target}, including {followersCount} of your followers and {followingCount, plural, one {# account} other {# accounts}} you follow.",
@@ -517,9 +528,20 @@
   "notification.status": "{name} just posted",
   "notification.update": "{name} edited a post",
   "notification_requests.accept": "Accept",
+  "notification_requests.accept_multiple": "{count, plural, one {Accept # request…} other {Accept # requests…}}",
+  "notification_requests.confirm_accept_multiple.button": "{count, plural, one {Accept request} other {Accept requests}}",
+  "notification_requests.confirm_accept_multiple.message": "You are about to accept {count, plural, one {one notification request} other {# notification requests}}. Are you sure you want to proceed?",
+  "notification_requests.confirm_accept_multiple.title": "Accept notification requests?",
+  "notification_requests.confirm_dismiss_multiple.button": "{count, plural, one {Dismiss request} other {Dismiss requests}}",
+  "notification_requests.confirm_dismiss_multiple.message": "You are about to dismiss {count, plural, one {one notification request} other {# notification requests}}. You won't be able to easily access {count, plural, one {it} other {them}} again. Are you sure you want to proceed?",
+  "notification_requests.confirm_dismiss_multiple.title": "Dismiss notification requests?",
   "notification_requests.dismiss": "Dismiss",
+  "notification_requests.dismiss_multiple": "{count, plural, one {Dismiss # request…} other {Dismiss # requests…}}",
+  "notification_requests.edit_selection": "Edit",
+  "notification_requests.exit_selection": "Done",
   "notification_requests.explainer_for_limited_account": "Notifications from this account have been filtered because the account has been limited by a moderator.",
   "notification_requests.explainer_for_limited_remote_account": "Notifications from this account have been filtered because the account or its server has been limited by a moderator.",
+  "notification_requests.maximize": "Maximise",
   "notification_requests.minimize_banner": "Minimize filtered notifications banner",
   "notification_requests.notifications_from": "Notifications from {name}",
   "notification_requests.title": "Filtered notifications",
@@ -561,6 +583,7 @@
   "notifications.permission_denied_alert": "Desktop notifications can't be enabled, as browser permission has been denied before",
   "notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
   "notifications.policy.accept": "Accept",
+  "notifications.policy.accept_hint": "Show in notifications",
   "notifications.policy.drop": "Ignore",
   "notifications.policy.drop_hint": "Send to the void, never to be seen again",
   "notifications.policy.filter": "Filter",
@@ -813,11 +836,6 @@
   "time_remaining.minutes": "{number, plural, one {# minute} other {# minutes}} left",
   "time_remaining.moments": "Moments remaining",
   "time_remaining.seconds": "{number, plural, one {# second} other {# seconds}} left",
-  "timeline_hint.remote_resource_not_displayed": "{resource} from other servers are not displayed.",
-  "timeline_hint.resources.followers": "Followers",
-  "timeline_hint.resources.follows": "Follows",
-  "timeline_hint.resources.replies": "Some replies",
-  "timeline_hint.resources.statuses": "Older posts",
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "Trending now",
   "ui.beforeunload": "Your draft will be lost if you leave Mastodon.",
diff --git a/app/javascript/mastodon/locales/eo.json b/app/javascript/mastodon/locales/eo.json
index 0b1ffa2bc4c36c..a469e36409c4a2 100644
--- a/app/javascript/mastodon/locales/eo.json
+++ b/app/javascript/mastodon/locales/eo.json
@@ -19,7 +19,6 @@
   "account.block_domain": "Bloki la domajnon {domain}",
   "account.block_short": "Bloko",
   "account.blocked": "Blokita",
-  "account.browse_more_on_origin_server": "Foliumi pli ĉe la originala profilo",
   "account.cancel_follow_request": "Nuligi peton por sekvado",
   "account.copy": "Kopii ligilon al profilo",
   "account.direct": "Private mencii @{name}",
@@ -89,9 +88,14 @@
   "announcement.announcement": "Anoncoj",
   "attachments_list.unprocessed": "(neprilaborita)",
   "audio.hide": "Kaŝi aŭdion",
+  "block_modal.remote_users_caveat": "Ni petos al la servilo {domain} respekti vian elekton. Tamen, plenumo ne estas garantiita ĉar iuj serviloj eble manipulas blokojn malsame. Publikaj afiŝoj eble ankoraŭ estas videbla por ne-ensalutintaj uzantoj.",
   "block_modal.show_less": "Montri malpli",
   "block_modal.show_more": "Montri pli",
+  "block_modal.they_cant_mention": "Ili ne povas mencii aŭ sekvi vin.",
+  "block_modal.they_cant_see_posts": "Ili ne povas vidi viajn afiŝojn kaj vi ne povas vidi iliajn.",
+  "block_modal.they_will_know": "Ili povas vidi, ke ili estas blokita.",
   "block_modal.title": "Ĉu bloki uzanton?",
+  "block_modal.you_wont_see_mentions": "Vi ne vidos afiŝojn, ke mencii ilin.",
   "boost_modal.combo": "Vi povas premi {combo} por preterpasi sekvafoje",
   "bundle_column_error.copy_stacktrace": "Kopii la eraran raporton",
   "bundle_column_error.error.body": "La petita paĝo ne povas redonitis. Eble estas eraro.",
@@ -149,29 +153,39 @@
   "compose_form.lock_disclaimer.lock": "ŝlosita",
   "compose_form.placeholder": "Kion vi pensas?",
   "compose_form.poll.duration": "Daŭro de la balotenketo",
+  "compose_form.poll.multiple": "Multobla elekto",
+  "compose_form.poll.option_placeholder": "Opcio {number}",
+  "compose_form.poll.single": "Elektu unu",
   "compose_form.poll.switch_to_multiple": "Ŝanĝi la balotenketon por permesi multajn elektojn",
   "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.reply": "Respondi",
   "compose_form.save_changes": "Ĝisdatigi",
   "compose_form.spoiler.marked": "Forigi la averton de enhavo",
   "compose_form.spoiler.unmarked": "Aldoni averton de enhavo",
+  "compose_form.spoiler_placeholder": "Enhava Averto (nedeviga)",
   "confirmation_modal.cancel": "Nuligi",
   "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_list.confirm": "Forigi",
   "confirmations.delete_list.message": "Ĉu vi certas, ke vi volas porĉiame forigi ĉi tiun liston?",
+  "confirmations.delete_list.title": "Ĉu forigi liston?",
   "confirmations.discard_edit_media.confirm": "Forĵeti",
   "confirmations.discard_edit_media.message": "Vi havas nekonservitajn ŝanĝojn de la priskribo aŭ la antaŭmontro de la plurmedio, ĉu vi forĵetu ilin malgraŭe?",
   "confirmations.edit.confirm": "Redakti",
   "confirmations.edit.message": "Redakti nun anstataŭigos la skribatan afiŝon. Ĉu vi certas, ke vi volas daŭrigi?",
+  "confirmations.edit.title": "Ĉu superskribi afiŝon?",
   "confirmations.logout.confirm": "Adiaŭi",
   "confirmations.logout.message": "Ĉu vi certas ke vi volas adiaŭi?",
+  "confirmations.logout.title": "Ĉu elsaluti?",
   "confirmations.mute.confirm": "Silentigi",
   "confirmations.redraft.confirm": "Forigi kaj reskribi",
   "confirmations.redraft.message": "Ĉu vi certas ke vi volas forigi tiun afiŝon kaj reskribi ĝin? Ĉiuj diskonigoj kaj stelumoj estos perditaj, kaj respondoj al la originala mesaĝo estos senparentaj.",
+  "confirmations.redraft.title": "Ĉu forigi kaj redakcii afiŝon?",
   "confirmations.reply.confirm": "Respondi",
   "confirmations.reply.message": "Respondi nun anstataŭigos la skribatan afiŝon. Ĉu vi certas, ke vi volas daŭrigi?",
   "confirmations.unfollow.confirm": "Ne plu sekvi",
@@ -668,10 +682,6 @@
   "time_remaining.minutes": "{number, plural, one {# minuto} other {# minutoj}} restas",
   "time_remaining.moments": "Momenteto restas",
   "time_remaining.seconds": "{number, plural, one {# sekundo} other {# sekundoj}} restas",
-  "timeline_hint.remote_resource_not_displayed": "{resource} de aliaj serviloj ne estas montrata.",
-  "timeline_hint.resources.followers": "Sekvantoj",
-  "timeline_hint.resources.follows": "Sekvatoj",
-  "timeline_hint.resources.statuses": "Pli malnovaj mesaĝoj",
   "trends.counter_by_accounts": "{count, plural, one {{counter} persono} other {{counter} personoj}} dum la pasinta{days, plural, one { tago} other {j {days} tagoj}}",
   "trends.trending_now": "Nunaj furoraĵoj",
   "ui.beforeunload": "Via malneto perdiĝos se vi eliras de Mastodon.",
diff --git a/app/javascript/mastodon/locales/es-AR.json b/app/javascript/mastodon/locales/es-AR.json
index 779bf6344d6ff3..baec70fd28ab13 100644
--- a/app/javascript/mastodon/locales/es-AR.json
+++ b/app/javascript/mastodon/locales/es-AR.json
@@ -19,7 +19,6 @@
   "account.block_domain": "Bloquear dominio {domain}",
   "account.block_short": "Bloquear",
   "account.blocked": "Bloqueado",
-  "account.browse_more_on_origin_server": "Explorar más en el perfil original",
   "account.cancel_follow_request": "Dejar de seguir",
   "account.copy": "Copiar enlace al perfil",
   "account.direct": "Mención privada a @{name}",
@@ -349,6 +348,14 @@
   "hashtag.follow": "Seguir etiqueta",
   "hashtag.unfollow": "Dejar de seguir etiqueta",
   "hashtags.and_other": "…y {count, plural, other {# más}}",
+  "hints.profiles.followers_may_be_missing": "Es posible que falten seguidores de este perfil.",
+  "hints.profiles.follows_may_be_missing": "Es posible que falten seguimientos a este perfil.",
+  "hints.profiles.posts_may_be_missing": "Es posible que falten mensajes de este perfil.",
+  "hints.profiles.see_more_followers": "Ver más seguidores en {domain}",
+  "hints.profiles.see_more_follows": "Ver más seguimientos en {domain}",
+  "hints.profiles.see_more_posts": "Ver más mensajes en {domain}",
+  "hints.threads.replies_may_be_missing": "Es posible que falten respuestas de otros servidores.",
+  "hints.threads.see_more": "Ver más respuestas en {domain}",
   "home.column_settings.show_reblogs": "Mostrar adhesiones",
   "home.column_settings.show_replies": "Mostrar respuestas",
   "home.hide_announcements": "Ocultar anuncios",
@@ -456,8 +463,6 @@
   "mute_modal.title": "¿Silenciar usuario?",
   "mute_modal.you_wont_see_mentions": "No verás mensajes que los mencionen.",
   "mute_modal.you_wont_see_posts": "Todavía pueden ver tus mensajes, pero vos no verás los suyos.",
-  "name_and_others": "{name} y {count, plural, one {# cuenta más} other {# cuentas más}}",
-  "name_and_others_with_link": "{name} y <a>{count, plural, one {# cuenta más} other {# cuentas más}}</a>",
   "navigation_bar.about": "Información",
   "navigation_bar.advanced_interface": "Abrir en interface web avanzada",
   "navigation_bar.blocks": "Usuarios bloqueados",
@@ -490,9 +495,13 @@
   "notification.admin.report_statuses": "{name} denunció a {target} por {category}",
   "notification.admin.report_statuses_other": "{name} denunció a {target}",
   "notification.admin.sign_up": "Se registró {name}",
+  "notification.admin.sign_up.name_and_others": "Se registraron {name} y {count, plural, one {# cuenta más} other {# cuentas más}}",
   "notification.favourite": "{name} marcó tu mensaje como favorito",
+  "notification.favourite.name_and_others_with_link": "{name} y <a>{count, plural, one {# cuenta más} other {# cuentas más}}</a> marcaron tu mensaje como favorito",
   "notification.follow": "{name} te empezó a seguir",
+  "notification.follow.name_and_others": "{name} y {count, plural, one {# cuenta más} other {# cuentas más}} te están siguiendo",
   "notification.follow_request": "{name} solicitó seguirte",
+  "notification.follow_request.name_and_others": "{name} y {count, plural, one {# cuenta más} other {# cuentas más}} solicitaron seguirte",
   "notification.label.mention": "Mención",
   "notification.label.private_mention": "Mención privada",
   "notification.label.private_reply": "Respuesta privada",
@@ -510,6 +519,7 @@
   "notification.own_poll": "Tu encuesta finalizó",
   "notification.poll": "Finalizó una encuesta en la que votaste",
   "notification.reblog": "{name} adhirió a tu mensaje",
+  "notification.reblog.name_and_others_with_link": "{name} y <a>{count, plural, one {# cuenta más} other {# cuentas más}}</a> marcaron tu mensaje como favorito",
   "notification.relationships_severance_event": "Conexiones perdidas con {name}",
   "notification.relationships_severance_event.account_suspension": "Un administrador de {from} suspendió a {target}, lo que significa que ya no podés recibir actualizaciones de esa cuenta o interactuar con la misma.",
   "notification.relationships_severance_event.domain_block": "Un administrador de {from} bloqueó a {target}, incluyendo {followersCount} de tus seguidores y {followingCount, plural, one {# cuenta} other {# cuentas}} que seguís.",
@@ -826,11 +836,6 @@
   "time_remaining.minutes": "{number, plural,one {queda # minuto} other {quedan # minutos}}",
   "time_remaining.moments": "Momentos restantes",
   "time_remaining.seconds": "{number, plural,one {queda # segundo} other {quedan # segundos}}",
-  "timeline_hint.remote_resource_not_displayed": "{resource} desde otros servidores no se muestran.",
-  "timeline_hint.resources.followers": "Tus seguidores",
-  "timeline_hint.resources.follows": "Las cuentas que seguís",
-  "timeline_hint.resources.replies": "Algunas respuestas",
-  "timeline_hint.resources.statuses": "Mensajes más antiguos",
   "trends.counter_by_accounts": "{count, plural, one {{counter} persona} other {{counter} personas}} en {days, plural, one {el pasado día} other {los pasados {days} días}}",
   "trends.trending_now": "Tendencia ahora",
   "ui.beforeunload": "Tu borrador se perderá si abandonás Mastodon.",
diff --git a/app/javascript/mastodon/locales/es-MX.json b/app/javascript/mastodon/locales/es-MX.json
index da1fc39fa499dc..929356352b826f 100644
--- a/app/javascript/mastodon/locales/es-MX.json
+++ b/app/javascript/mastodon/locales/es-MX.json
@@ -19,7 +19,6 @@
   "account.block_domain": "Bloquear dominio {domain}",
   "account.block_short": "Bloquear",
   "account.blocked": "Bloqueado",
-  "account.browse_more_on_origin_server": "Ver más en el perfil original",
   "account.cancel_follow_request": "Retirar solicitud de seguimiento",
   "account.copy": "Copiar enlace al perfil",
   "account.direct": "Mención privada @{name}",
@@ -349,6 +348,14 @@
   "hashtag.follow": "Seguir etiqueta",
   "hashtag.unfollow": "Dejar de seguir etiqueta",
   "hashtags.and_other": "…y {count, plural, other {# más}}",
+  "hints.profiles.followers_may_be_missing": "Puede que no se muestren todos los seguidores de este perfil.",
+  "hints.profiles.follows_may_be_missing": "Puede que no se muestren todas las cuentas seguidas por este perfil.",
+  "hints.profiles.posts_may_be_missing": "Puede que no se muestren todas las publicaciones de este perfil.",
+  "hints.profiles.see_more_followers": "Ver más seguidores en {domain}",
+  "hints.profiles.see_more_follows": "Ver más perfiles seguidos en {domain}",
+  "hints.profiles.see_more_posts": "Ver más publicaciones en {domain}",
+  "hints.threads.replies_may_be_missing": "Puede que no se muestren algunas respuestas de otros servidores.",
+  "hints.threads.see_more": "Ver más respuestas en {domain}",
   "home.column_settings.show_reblogs": "Mostrar retoots",
   "home.column_settings.show_replies": "Mostrar respuestas",
   "home.hide_announcements": "Ocultar anuncios",
@@ -456,8 +463,6 @@
   "mute_modal.title": "¿Silenciar usuario?",
   "mute_modal.you_wont_see_mentions": "No verás publicaciones que los mencionen.",
   "mute_modal.you_wont_see_posts": "Todavía pueden ver tus publicaciones, pero tú no verás las de ellos.",
-  "name_and_others": "{name} y {count, plural, one {# más} other {# más}}",
-  "name_and_others_with_link": "{name} y <a>{count, plural, one {# más} other {# más}}</a>",
   "navigation_bar.about": "Acerca de",
   "navigation_bar.advanced_interface": "Abrir en interfaz web avanzada",
   "navigation_bar.blocks": "Usuarios bloqueados",
@@ -490,9 +495,13 @@
   "notification.admin.report_statuses": "{name} informó de {target} por {category}",
   "notification.admin.report_statuses_other": "{name} informó de {target}",
   "notification.admin.sign_up": "{name} se unio",
+  "notification.admin.sign_up.name_and_others": "{name} y {count, plural, one {# más} other {# más}} se registraron",
   "notification.favourite": "{name} marcó como favorita tu publicación",
+  "notification.favourite.name_and_others_with_link": "{name} y <a>{count, plural, one {# más} other {# más}}</a> marcaron tu publicación como favorita",
   "notification.follow": "{name} te empezó a seguir",
+  "notification.follow.name_and_others": "{name} y {count, plural, one {# más} other {# más}} te siguieron",
   "notification.follow_request": "{name} ha solicitado seguirte",
+  "notification.follow_request.name_and_others": "{name} y {count, plural, one {# más} other {# más}} han solicitado seguirte",
   "notification.label.mention": "Mención",
   "notification.label.private_mention": "Mención privada",
   "notification.label.private_reply": "Respuesta privada",
@@ -510,6 +519,7 @@
   "notification.own_poll": "Tu encuesta ha terminado",
   "notification.poll": "Una encuesta ha terminado",
   "notification.reblog": "{name} ha retooteado tu estado",
+  "notification.reblog.name_and_others_with_link": "{name} y <a>{count, plural, one {# más} other {# más}}</a> impulsaron tu publicación",
   "notification.relationships_severance_event": "Conexiones perdidas con {name}",
   "notification.relationships_severance_event.account_suspension": "Un administrador de {from} ha suspendido {target}, lo que significa que ya no puedes recibir actualizaciones de sus cuentas o interactuar con ellas.",
   "notification.relationships_severance_event.domain_block": "Un administrador de {from} ha bloqueado {target}, incluyendo {followersCount} de tus seguidores y {followingCount, plural, one {# cuenta} other {# cuentas}} que sigues.",
@@ -520,7 +530,15 @@
   "notification_requests.accept": "Aceptar",
   "notification_requests.accept_multiple": "{count, plural, one {Aceptar # solicitud…} other {Aceptar # solicitudes…}}",
   "notification_requests.confirm_accept_multiple.button": "{count, plural, one {Aceptar solicitud} other {Aceptar solicitudes}}",
+  "notification_requests.confirm_accept_multiple.message": "Vas a aceptar {count, plural, one {una solicitud} other {# solicitudes}}. ¿Quieres continuar?",
+  "notification_requests.confirm_accept_multiple.title": "¿Aceptar las solicitudes?",
+  "notification_requests.confirm_dismiss_multiple.button": "{count, plural, one {Descartar solicitud} other {Descartar solicitudes}}",
+  "notification_requests.confirm_dismiss_multiple.message": "Vas a descartar {count, plural, one {una solicitud} other {# solicitudes}}. No podrás volver a acceder fácilmente a {count, plural, one {ella} other {ellas}} de nuevo. ¿Seguro que quieres continuar?",
+  "notification_requests.confirm_dismiss_multiple.title": "¿Descartar las solicitudes?",
   "notification_requests.dismiss": "Descartar",
+  "notification_requests.dismiss_multiple": "{count, plural, one {Descartar # solicitud…} other {Descartar # solicitudes…}}",
+  "notification_requests.edit_selection": "Editar",
+  "notification_requests.exit_selection": "Hecho",
   "notification_requests.explainer_for_limited_account": "Las notificaciones de esta cuenta han sido filtradas porque la cuenta ha sido limitada por un moderador.",
   "notification_requests.explainer_for_limited_remote_account": "Las notificaciones de esta cuenta han sido filtradas porque la cuenta o su servidor ha sido limitada por un moderador.",
   "notification_requests.maximize": "Maximizar",
@@ -818,11 +836,6 @@
   "time_remaining.minutes": "{number, plural, one {# minuto restante} other {# minutos restantes}}",
   "time_remaining.moments": "Momentos restantes",
   "time_remaining.seconds": "{number, plural, one {# segundo restante} other {# segundos restantes}}",
-  "timeline_hint.remote_resource_not_displayed": "{resource} de otros servidores no se muestran.",
-  "timeline_hint.resources.followers": "Seguidores",
-  "timeline_hint.resources.follows": "Seguidos",
-  "timeline_hint.resources.replies": "Algunas respuestas",
-  "timeline_hint.resources.statuses": "Toots más antiguos",
   "trends.counter_by_accounts": "{count, plural, one {{counter} persona} other {{counter} personas}} en los últimos {days, plural, one {días} other {{days} días}}",
   "trends.trending_now": "Tendencia ahora",
   "ui.beforeunload": "Tu borrador se perderá si sales de Mastodon.",
diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json
index e77bf126932476..1b54fa615e4b08 100644
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@@ -19,7 +19,6 @@
   "account.block_domain": "Bloquear dominio {domain}",
   "account.block_short": "Bloquear",
   "account.blocked": "Bloqueado",
-  "account.browse_more_on_origin_server": "Ver más en el perfil original",
   "account.cancel_follow_request": "Retirar solicitud de seguimiento",
   "account.copy": "Copiar enlace al perfil",
   "account.direct": "Mención privada a @{name}",
@@ -349,6 +348,14 @@
   "hashtag.follow": "Seguir etiqueta",
   "hashtag.unfollow": "Dejar de seguir etiqueta",
   "hashtags.and_other": "…y {count, plural, other {# más}}",
+  "hints.profiles.followers_may_be_missing": "Puede que no se muestren todos los seguidores de este perfil.",
+  "hints.profiles.follows_may_be_missing": "Puede que no se muestren todas las cuentas seguidas por este perfil.",
+  "hints.profiles.posts_may_be_missing": "Puede que no se muestren todas las publicaciones de este perfil.",
+  "hints.profiles.see_more_followers": "Ver más seguidores en {domain}",
+  "hints.profiles.see_more_follows": "Ver más perfiles seguidos en {domain}",
+  "hints.profiles.see_more_posts": "Ver más publicaciones en {domain}",
+  "hints.threads.replies_may_be_missing": "Puede que no se muestren algunas respuestas de otros servidores.",
+  "hints.threads.see_more": "Ver más respuestas en {domain}",
   "home.column_settings.show_reblogs": "Mostrar impulsos",
   "home.column_settings.show_replies": "Mostrar respuestas",
   "home.hide_announcements": "Ocultar anuncios",
@@ -456,8 +463,6 @@
   "mute_modal.title": "¿Silenciar usuario?",
   "mute_modal.you_wont_see_mentions": "No verás mensajes que los mencionen.",
   "mute_modal.you_wont_see_posts": "Todavía pueden ver tus publicaciones, pero tú no verás las suyas.",
-  "name_and_others": "{name} y {count, plural, one {# más} other {# más}}",
-  "name_and_others_with_link": "{name} y <a>{count, plural, one {# más} other {# más}}</a>",
   "navigation_bar.about": "Acerca de",
   "navigation_bar.advanced_interface": "Abrir en la interfaz web avanzada",
   "navigation_bar.blocks": "Usuarios bloqueados",
@@ -490,9 +495,13 @@
   "notification.admin.report_statuses": "{name} informó de {target} por {category}",
   "notification.admin.report_statuses_other": "{name} informó de {target}",
   "notification.admin.sign_up": "{name} se registró",
+  "notification.admin.sign_up.name_and_others": "{name} y {count, plural, one {# más} other {# más}} se registraron",
   "notification.favourite": "{name} marcó como favorita tu publicación",
+  "notification.favourite.name_and_others_with_link": "{name} y <a>{count, plural, one {# más} other {# más}}</a> marcaron tu publicación como favorita",
   "notification.follow": "{name} te empezó a seguir",
+  "notification.follow.name_and_others": "{name} y {count, plural, one {# más} other {# más}} te siguieron",
   "notification.follow_request": "{name} ha solicitado seguirte",
+  "notification.follow_request.name_and_others": "{name} y {count, plural, one {# más} other {# más}} han solicitado seguirte",
   "notification.label.mention": "Mención",
   "notification.label.private_mention": "Mención privada",
   "notification.label.private_reply": "Respuesta privada",
@@ -510,6 +519,7 @@
   "notification.own_poll": "Tu encuesta ha terminado",
   "notification.poll": "Una encuesta ha terminado",
   "notification.reblog": "{name} ha impulsado tu publicación",
+  "notification.reblog.name_and_others_with_link": "{name} y <a>{count, plural, one {# más} other {# más}}</a> impulsaron tu publicación",
   "notification.relationships_severance_event": "Conexiones perdidas con {name}",
   "notification.relationships_severance_event.account_suspension": "Un administrador de {from} ha suspendido {target}, lo que significa que ya no puedes recibir actualizaciones de sus cuentas o interactuar con ellas.",
   "notification.relationships_severance_event.domain_block": "Un administrador de {from} ha bloqueado {target}, incluyendo {followersCount} de tus seguidores y {followingCount, plural, one {# cuenta} other {# cuentas}} que sigues.",
@@ -520,7 +530,15 @@
   "notification_requests.accept": "Aceptar",
   "notification_requests.accept_multiple": "{count, plural, one {Aceptar # solicitud…} other {Aceptar # solicitudes…}}",
   "notification_requests.confirm_accept_multiple.button": "{count, plural, one {Aceptar solicitud} other {Aceptar solicitudes}}",
+  "notification_requests.confirm_accept_multiple.message": "Vas a aceptar {count, plural, one {una solicitud} other {# solicitudes}}. ¿Quieres continuar?",
+  "notification_requests.confirm_accept_multiple.title": "¿Aceptar las solicitudes?",
+  "notification_requests.confirm_dismiss_multiple.button": "{count, plural, one {Descartar solicitud} other {Descartar solicitudes}}",
+  "notification_requests.confirm_dismiss_multiple.message": "Vas a descartar {count, plural, one {una solicitud} other {# solicitudes}}. No podrás volver a acceder fácilmente a {count, plural, one {ella} other {ellas}} de nuevo. ¿Seguro que quieres continuar?",
+  "notification_requests.confirm_dismiss_multiple.title": "¿Descartar las solicitudes?",
   "notification_requests.dismiss": "Descartar",
+  "notification_requests.dismiss_multiple": "{count, plural, one {Descartar # solicitud…} other {Descartar # solicitudes…}}",
+  "notification_requests.edit_selection": "Editar",
+  "notification_requests.exit_selection": "Hecho",
   "notification_requests.explainer_for_limited_account": "Las notificaciones de esta cuenta han sido filtradas porque la cuenta ha sido limitada por un moderador.",
   "notification_requests.explainer_for_limited_remote_account": "Las notificaciones de esta cuenta han sido filtradas porque la cuenta o su servidor ha sido limitada por un moderador.",
   "notification_requests.maximize": "Maximizar",
@@ -818,11 +836,6 @@
   "time_remaining.minutes": "{number, plural, one {# minuto restante} other {# minutos restantes}}",
   "time_remaining.moments": "Momentos restantes",
   "time_remaining.seconds": "{number, plural, one {# segundo restante} other {# segundos restantes}}",
-  "timeline_hint.remote_resource_not_displayed": "{resource} de otros servidores no se muestran.",
-  "timeline_hint.resources.followers": "Seguidores",
-  "timeline_hint.resources.follows": "Seguidos",
-  "timeline_hint.resources.replies": "Algunas respuestas",
-  "timeline_hint.resources.statuses": "Publicaciones más antiguas",
   "trends.counter_by_accounts": "{count, plural, one {{counter} persona} other {{counter} personas}} en los últimos {days, plural, one {días} other {{days} días}}",
   "trends.trending_now": "Tendencia ahora",
   "ui.beforeunload": "Tu borrador se perderá si sales de Mastodon.",
diff --git a/app/javascript/mastodon/locales/et.json b/app/javascript/mastodon/locales/et.json
index 737ee1bad0d1e4..9c358e0e5768cc 100644
--- a/app/javascript/mastodon/locales/et.json
+++ b/app/javascript/mastodon/locales/et.json
@@ -18,7 +18,6 @@
   "account.block_domain": "Peida kõik domeenist {domain}",
   "account.block_short": "Blokeerimine",
   "account.blocked": "Blokeeritud",
-  "account.browse_more_on_origin_server": "Vaata rohkem algsel profiilil",
   "account.cancel_follow_request": "Võta jälgimistaotlus tagasi",
   "account.copy": "Kopeeri profiili link",
   "account.direct": "Maini privaatselt @{name}",
@@ -760,10 +759,6 @@
   "time_remaining.minutes": "{number, plural, one {# minut} other {# minutit}} jäänud",
   "time_remaining.moments": "Hetked jäänud",
   "time_remaining.seconds": "{number, plural, one {# sekund} other {# sekundit}} jäänud",
-  "timeline_hint.remote_resource_not_displayed": "{resource} teistest serveritest ei kuvata.",
-  "timeline_hint.resources.followers": "Jälgijaid",
-  "timeline_hint.resources.follows": "Jälgimisi",
-  "timeline_hint.resources.statuses": "Eelnevaid postitusi",
   "trends.counter_by_accounts": "{count, plural, one {{counter} inimene} other {{counter} inimest}} viimase {days, plural, one {päeva} other {{days} päeva}} jooksul",
   "trends.trending_now": "Hetkel populaarne",
   "ui.beforeunload": "Mustand läheb kaotsi, kui lahkud Mastodonist.",
diff --git a/app/javascript/mastodon/locales/eu.json b/app/javascript/mastodon/locales/eu.json
index 85855d91656bd3..8ab42965bf30e5 100644
--- a/app/javascript/mastodon/locales/eu.json
+++ b/app/javascript/mastodon/locales/eu.json
@@ -19,7 +19,6 @@
   "account.block_domain": "Blokeatu {domain} domeinua",
   "account.block_short": "Blokeatu",
   "account.blocked": "Blokeatuta",
-  "account.browse_more_on_origin_server": "Arakatu gehiago jatorrizko profilean",
   "account.cancel_follow_request": "Baztertu jarraitzeko eskaera",
   "account.copy": "Kopiatu profilerako esteka",
   "account.direct": "Aipatu pribatuki @{name}",
@@ -795,11 +794,6 @@
   "time_remaining.minutes": "{number, plural, one {minutu #} other {# minutu}} amaitzeko",
   "time_remaining.moments": "Amaitzekotan",
   "time_remaining.seconds": "{number, plural, one {segundo #} other {# segundo}} amaitzeko",
-  "timeline_hint.remote_resource_not_displayed": "Beste zerbitzarietako {resource} ez da bistaratzen.",
-  "timeline_hint.resources.followers": "Jarraitzaileak",
-  "timeline_hint.resources.follows": "Jarraitzen",
-  "timeline_hint.resources.replies": "Erantzun batzuk",
-  "timeline_hint.resources.statuses": "Bidalketa zaharragoak",
   "trends.counter_by_accounts": "{count, plural, one {Pertsona {counter}} other {{counter} pertsona}} azken {days, plural, one {egunean} other {{days} egunetan}}",
   "trends.trending_now": "Joera orain",
   "ui.beforeunload": "Zure zirriborroa galduko da Mastodon uzten baduzu.",
diff --git a/app/javascript/mastodon/locales/fa.json b/app/javascript/mastodon/locales/fa.json
index a2d511c5a0ca01..6d76bc3349d609 100644
--- a/app/javascript/mastodon/locales/fa.json
+++ b/app/javascript/mastodon/locales/fa.json
@@ -18,7 +18,6 @@
   "account.block_domain": "انسداد دامنهٔ {domain}",
   "account.block_short": "انسداد",
   "account.blocked": "مسدود",
-  "account.browse_more_on_origin_server": "مرور بیش‌تر روی نمایهٔ اصلی",
   "account.cancel_follow_request": "رد کردن درخواست پی‌گیری",
   "account.copy": "رونوشت از پیوند به نمایه",
   "account.direct": "اشارهٔ خصوصی به ‪@{name}‬",
@@ -708,10 +707,6 @@
   "time_remaining.minutes": "{number, plural, one {# دقیقه} other {# دقیقه}} باقی مانده",
   "time_remaining.moments": "زمان باقی‌مانده",
   "time_remaining.seconds": "{number, plural, one {# ثانیه} other {# ثانیه}} باقی مانده",
-  "timeline_hint.remote_resource_not_displayed": "{resource} از دیگر کارسازها نمایش داده نمی‌شوند.",
-  "timeline_hint.resources.followers": "پی‌گیرندگان",
-  "timeline_hint.resources.follows": "پی‌گرفتگان",
-  "timeline_hint.resources.statuses": "فرسته‌های قدیمی‌تر",
   "trends.counter_by_accounts": "{count, plural, one {{counter} نفر} other {{counter} نفر}} در {days, plural, one {روز} other {{days} روز}} گذشته",
   "trends.trending_now": "پرطرفدار",
   "ui.beforeunload": "اگر از ماستودون خارج شوید پیش‌نویس شما از دست خواهد رفت.",
diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index 2cae2d6def46bd..e6671e67bd7773 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -19,7 +19,6 @@
   "account.block_domain": "Estä verkkotunnus {domain}",
   "account.block_short": "Estä",
   "account.blocked": "Estetty",
-  "account.browse_more_on_origin_server": "Selaa lisää alkuperäisessä profiilissa",
   "account.cancel_follow_request": "Peruuta seurantapyyntö",
   "account.copy": "Kopioi linkki profiiliin",
   "account.direct": "Mainitse @{name} yksityisesti",
@@ -349,6 +348,14 @@
   "hashtag.follow": "Seuraa aihetunnistetta",
   "hashtag.unfollow": "Lopeta aihetunnisteen seuraaminen",
   "hashtags.and_other": "…ja {count, plural, other {# lisää}}",
+  "hints.profiles.followers_may_be_missing": "Tämän profiilin seuraajia saattaa puuttua.",
+  "hints.profiles.follows_may_be_missing": "Tämän profiilin seurattuja saattaa puuttua.",
+  "hints.profiles.posts_may_be_missing": "Tämän profiilin julkaisuja saattaa puuttua.",
+  "hints.profiles.see_more_followers": "Näytä lisää seuraajia palvelimella {domain}",
+  "hints.profiles.see_more_follows": "Näytä lisää seurattuja palvelimella {domain}",
+  "hints.profiles.see_more_posts": "Näytä lisää julkaisuja palvelimella {domain}",
+  "hints.threads.replies_may_be_missing": "Muiden palvelinten vastauksia saattaa puuttua.",
+  "hints.threads.see_more": "Näytä lisää vastauksia palvelimella {domain}",
   "home.column_settings.show_reblogs": "Näytä tehostukset",
   "home.column_settings.show_replies": "Näytä vastaukset",
   "home.hide_announcements": "Piilota tiedotteet",
@@ -456,8 +463,6 @@
   "mute_modal.title": "Mykistetäänkö käyttäjä?",
   "mute_modal.you_wont_see_mentions": "Et näe enää julkaisuja, joissa hänet mainitaan.",
   "mute_modal.you_wont_see_posts": "Hän voi yhä nähdä julkaisusi, mutta sinä et näe hänen.",
-  "name_and_others": "{name} ja {count, plural, one {# muu} other {# muuta}}",
-  "name_and_others_with_link": "{name} ja <a>{count, plural, one {# muu} other {# muuta}}</a>",
   "navigation_bar.about": "Tietoja",
   "navigation_bar.advanced_interface": "Avaa edistyneessä selainkäyttöliittymässä",
   "navigation_bar.blocks": "Estetyt käyttäjät",
@@ -490,9 +495,13 @@
   "notification.admin.report_statuses": "{name} raportoi käyttäjän {target}, syynä {category}",
   "notification.admin.report_statuses_other": "{name} raportoi käyttäjän {target}",
   "notification.admin.sign_up": "{name} rekisteröityi",
+  "notification.admin.sign_up.name_and_others": "{name} ja {count, plural, one {# muu} other {# muuta}} rekisteröityivät",
   "notification.favourite": "{name} lisäsi julkaisusi suosikkeihinsa",
+  "notification.favourite.name_and_others_with_link": "{name} ja <a>{count, plural, one {# muu} other {# muuta}}</a> lisäsivät julkaisusi suosikkeihinsa",
   "notification.follow": "{name} seurasi sinua",
+  "notification.follow.name_and_others": "{name} ja {count, plural, one {# muu} other {# muuta}} seurasivat sinua",
   "notification.follow_request": "{name} on pyytänyt lupaa seurata sinua",
+  "notification.follow_request.name_and_others": "{name} ja {count, plural, one {# muu} other {# muuta}} pyysivät saada seurata sinua",
   "notification.label.mention": "Maininta",
   "notification.label.private_mention": "Yksityismaininta",
   "notification.label.private_reply": "Yksityinen vastaus",
@@ -510,6 +519,7 @@
   "notification.own_poll": "Äänestyksesi on päättynyt",
   "notification.poll": "Äänestys, johon osallistuit, on päättynyt",
   "notification.reblog": "{name} tehosti julkaisuasi",
+  "notification.reblog.name_and_others_with_link": "{name} ja <a>{count, plural, one {# muu} other {# muuta}}</a> tehostivat julkaisuasi",
   "notification.relationships_severance_event": "Menetettiin yhteydet palvelimeen {name}",
   "notification.relationships_severance_event.account_suspension": "Palvelimen {from} ylläpitäjä on jäädyttänyt palvelimen {target} vuorovaikutuksen. Enää et voi siis vastaanottaa päivityksiä heiltä tai olla yhteyksissä heidän kanssaan.",
   "notification.relationships_severance_event.domain_block": "Palvelimen {from} ylläpitäjä on estänyt palvelimen {target} vuorovaikutuksen – mukaan lukien {followersCount} seuraajistasi ja {followingCount, plural, one {# seuratuistasi} other {# seuratuistasi}}.",
@@ -826,11 +836,6 @@
   "time_remaining.minutes": "{number, plural, one {# minuutti} other {# minuuttia}} jäljellä",
   "time_remaining.moments": "Hetkiä jäljellä",
   "time_remaining.seconds": "{number, plural, one {# sekunti} other {# sekuntia}} jäljellä",
-  "timeline_hint.remote_resource_not_displayed": "Muiden palvelinten {resource} eivät näy tässä.",
-  "timeline_hint.resources.followers": "seuraajat",
-  "timeline_hint.resources.follows": "seuratut",
-  "timeline_hint.resources.replies": "kaikki vastaukset",
-  "timeline_hint.resources.statuses": "vanhemmat julkaisut",
   "trends.counter_by_accounts": "{count, plural, one {{counter} käyttäjä} other {{counter} käyttäjää}} {days, plural, one {viime päivänä} other {viimeisenä {days} päivänä}}",
   "trends.trending_now": "Suosittua nyt",
   "ui.beforeunload": "Luonnos häviää, jos poistut Mastodonista.",
diff --git a/app/javascript/mastodon/locales/fil.json b/app/javascript/mastodon/locales/fil.json
index 4aa45f3fc693d0..9eaa62facbc3c2 100644
--- a/app/javascript/mastodon/locales/fil.json
+++ b/app/javascript/mastodon/locales/fil.json
@@ -13,7 +13,6 @@
   "account.block_domain": "Hadlangan ang domain na {domain}",
   "account.block_short": "Hadlangan",
   "account.blocked": "Hinadlangan",
-  "account.browse_more_on_origin_server": "Tingnan pa sa pangunahing profile",
   "account.cancel_follow_request": "I-kansela ang pagsunod",
   "account.copy": "I-sipi ang kawing sa profile",
   "account.direct": "Palihim banggitin si @{name}",
@@ -340,8 +339,5 @@
   "time_remaining.days": "{number, plural, one {# araw} other {# na araw}} ang natitira",
   "time_remaining.hours": "{number, plural, one {# oras} other {# na oras}} ang natitira",
   "time_remaining.minutes": "{number, plural, one {# minuto} other {# na minuto}} ang natitira",
-  "time_remaining.seconds": "{number, plural, one {# segundo} other {# na segundo}} ang natitira",
-  "timeline_hint.remote_resource_not_displayed": "Hindi ipinapakita ang {resource} mula sa ibang mga serbiro.",
-  "timeline_hint.resources.followers": "Mga tagasunod",
-  "timeline_hint.resources.follows": "Mga sinusundan"
+  "time_remaining.seconds": "{number, plural, one {# segundo} other {# na segundo}} ang natitira"
 }
diff --git a/app/javascript/mastodon/locales/fo.json b/app/javascript/mastodon/locales/fo.json
index 650dd9b0a2b228..7d3421beb2a9a0 100644
--- a/app/javascript/mastodon/locales/fo.json
+++ b/app/javascript/mastodon/locales/fo.json
@@ -19,7 +19,6 @@
   "account.block_domain": "Banna økisnavnið {domain}",
   "account.block_short": "Blokera",
   "account.blocked": "Bannað/ur",
-  "account.browse_more_on_origin_server": "Kaga meira á upprunaligu vangamyndina",
   "account.cancel_follow_request": "Strika fylgjaraumbøn",
   "account.copy": "Avrita leinki til vangan",
   "account.direct": "Umrøð @{name} privat",
@@ -349,6 +348,14 @@
   "hashtag.follow": "Fylg frámerki",
   "hashtag.unfollow": "Gevst at fylgja frámerki",
   "hashtags.and_other": "…og {count, plural, other {# afturat}}",
+  "hints.profiles.followers_may_be_missing": "Fylgjarar hjá hesum vanganum kunnu mangla.",
+  "hints.profiles.follows_may_be_missing": "Listin við teimum, sum hesin vangin fylgir, kunnu mangla.",
+  "hints.profiles.posts_may_be_missing": "Summir postar frá hesum vanganum kunnu mangla.",
+  "hints.profiles.see_more_followers": "Sí fleiri fylgjarar á {domain}",
+  "hints.profiles.see_more_follows": "Sí fleiri, ið viðkomandi fylgir, á {domain}",
+  "hints.profiles.see_more_posts": "Sí fleiri postar á {domain}",
+  "hints.threads.replies_may_be_missing": "Svar frá øðrum ambætarum mangla møguliga.",
+  "hints.threads.see_more": "Sí fleiri svar á {domain}",
   "home.column_settings.show_reblogs": "Vís lyft",
   "home.column_settings.show_replies": "Vís svar",
   "home.hide_announcements": "Fjal kunngerðir",
@@ -456,8 +463,6 @@
   "mute_modal.title": "Sløkk brúkara?",
   "mute_modal.you_wont_see_mentions": "Tú sært ikki postar, sum nevna tey.",
   "mute_modal.you_wont_see_posts": "Tey síggja framvegis tínar postar, men tú sært ikki teirra.",
-  "name_and_others": "{name} og {count, plural, one {# annar} other {# onnur}}",
-  "name_and_others_with_link": "{name} og <a>{count, plural, one {# annar} other {# onnur}}</a>",
   "navigation_bar.about": "Um",
   "navigation_bar.advanced_interface": "Lat upp í framkomnum vevmarkamóti",
   "navigation_bar.blocks": "Bannaðir brúkarar",
@@ -490,9 +495,13 @@
   "notification.admin.report_statuses": "{name} meldaði {target} fyri {category}",
   "notification.admin.report_statuses_other": "{name} meldaði {target}",
   "notification.admin.sign_up": "{name} meldaði seg til",
+  "notification.admin.sign_up.name_and_others": "{name} og {count, plural, one {# annar/onnur} other {# onnur}} teknaðu seg",
   "notification.favourite": "{name} dámdi postin hjá tær",
+  "notification.favourite.name_and_others_with_link": "{name} og <a>{count, plural, one {# annar/onnur} other {# onnur}}</a> yndisfrámerktu postin hjá tær",
   "notification.follow": "{name} fylgdi tær",
+  "notification.follow.name_and_others": "{name} og {count, plural, one {# annar/onnur} other {# onnur}} fylgdu tær",
   "notification.follow_request": "{name} biður um at fylgja tær",
+  "notification.follow_request.name_and_others": "{name} og {count, plural, one {# annar/onnur} other {# onnur}} hava biðið um at fylgja tær",
   "notification.label.mention": "Umrøða",
   "notification.label.private_mention": "Privat umrøða",
   "notification.label.private_reply": "Privat svar",
@@ -510,6 +519,7 @@
   "notification.own_poll": "Tín atkvøðugreiðsla er endað",
   "notification.poll": "Ein atkvøðugreiðsla, har tú atkvøddi, er endað",
   "notification.reblog": "{name} lyfti tín post",
+  "notification.reblog.name_and_others_with_link": "{name} og <a>{count, plural, one {# annar/onnur} other {# onnur}}</a> framhevjaðu tín post",
   "notification.relationships_severance_event": "Mist sambond við {name}",
   "notification.relationships_severance_event.account_suspension": "Ein umsitari frá {from} hevur gjørt {target} óvirkna, sum merkir, at tú ikki kanst móttaka dagføringar ella virka saman við teimum longur.",
   "notification.relationships_severance_event.domain_block": "Ein umsitari frá {from} hevur blokerað {target}, íroknað {followersCount} av tínum fylgjarum og {followingCount, plural, one {# kontu} other {# kontur}}, sum tú fylgir.",
@@ -826,11 +836,6 @@
   "time_remaining.minutes": "{number, plural, one {# minuttur} other {# minuttir}} eftir",
   "time_remaining.moments": "Lítið bil eftir",
   "time_remaining.seconds": "{number, plural, one {# sekund} other {# sekund}} eftir",
-  "timeline_hint.remote_resource_not_displayed": "{resource} frá øðrum ambætarum verður ikki víst.",
-  "timeline_hint.resources.followers": "Fylgjarar",
-  "timeline_hint.resources.follows": "Fylgir",
-  "timeline_hint.resources.replies": "Nøkur svar",
-  "timeline_hint.resources.statuses": "Gamlir postar",
   "trends.counter_by_accounts": "{count, plural, one {{counter} persónur} other {{counter} persónar}} {days, plural, one {seinasta dagin} other {{days} seinastu dagarnar}}",
   "trends.trending_now": "Rák beint nú",
   "ui.beforeunload": "Kladdan verður mist, um tú fer úr Mastodon.",
diff --git a/app/javascript/mastodon/locales/fr-CA.json b/app/javascript/mastodon/locales/fr-CA.json
index e57bc694afff1c..3def8ccfd73eb3 100644
--- a/app/javascript/mastodon/locales/fr-CA.json
+++ b/app/javascript/mastodon/locales/fr-CA.json
@@ -19,7 +19,6 @@
   "account.block_domain": "Bloquer le domaine {domain}",
   "account.block_short": "Bloquer",
   "account.blocked": "Bloqué·e",
-  "account.browse_more_on_origin_server": "Parcourir davantage sur le profil original",
   "account.cancel_follow_request": "Retirer cette demande d'abonnement",
   "account.copy": "Copier le lien vers le profil",
   "account.direct": "Mention privée @{name}",
@@ -766,10 +765,6 @@
   "time_remaining.minutes": "{number, plural, one {# minute restante} other {# minutes restantes}}",
   "time_remaining.moments": "Encore quelques instants",
   "time_remaining.seconds": "{number, plural, one {# seconde restante} other {# secondes restantes}}",
-  "timeline_hint.remote_resource_not_displayed": "{resource} des autres serveurs ne sont pas affichés.",
-  "timeline_hint.resources.followers": "Abonné·e·s",
-  "timeline_hint.resources.follows": "Abonnements",
-  "timeline_hint.resources.statuses": "Publications plus anciennes",
   "trends.counter_by_accounts": "{count, plural, one {{counter} personne} other {{counter} personnes}} au cours {days, plural, one {des dernières 24h} other {des {days} derniers jours}}",
   "trends.trending_now": "Présentement populaire",
   "ui.beforeunload": "Votre brouillon sera perdu si vous quittez Mastodon.",
diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json
index dd713e50ea156b..a2abe1efe13bed 100644
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@@ -19,7 +19,6 @@
   "account.block_domain": "Bloquer le domaine {domain}",
   "account.block_short": "Bloquer",
   "account.blocked": "Bloqué·e",
-  "account.browse_more_on_origin_server": "Parcourir davantage sur le profil original",
   "account.cancel_follow_request": "Annuler le suivi",
   "account.copy": "Copier le lien vers le profil",
   "account.direct": "Mention privée @{name}",
@@ -766,10 +765,6 @@
   "time_remaining.minutes": "{number, plural, one {# minute restante} other {# minutes restantes}}",
   "time_remaining.moments": "Encore quelques instants",
   "time_remaining.seconds": "{number, plural, one {# seconde restante} other {# secondes restantes}}",
-  "timeline_hint.remote_resource_not_displayed": "{resource} des autres serveurs ne sont pas affichés.",
-  "timeline_hint.resources.followers": "Les abonnés",
-  "timeline_hint.resources.follows": "Les abonnements",
-  "timeline_hint.resources.statuses": "Messages plus anciens",
   "trends.counter_by_accounts": "{count, plural, one {{counter} pers.} other {{counter} pers.}} sur {days, plural, one {les dernières 24h} other {les {days} derniers jours}}",
   "trends.trending_now": "Tendance en ce moment",
   "ui.beforeunload": "Votre brouillon sera perdu si vous quittez Mastodon.",
diff --git a/app/javascript/mastodon/locales/fy.json b/app/javascript/mastodon/locales/fy.json
index 6f7da4409683b5..cf960cd0a22176 100644
--- a/app/javascript/mastodon/locales/fy.json
+++ b/app/javascript/mastodon/locales/fy.json
@@ -18,7 +18,6 @@
   "account.block_domain": "Domein {domain} blokkearje",
   "account.block_short": "Blokkearje",
   "account.blocked": "Blokkearre",
-  "account.browse_more_on_origin_server": "Mear op it orizjinele profyl besjen",
   "account.cancel_follow_request": "Folchfersyk annulearje",
   "account.copy": "Keppeling nei profyl kopiearje",
   "account.direct": "Privee fermelde @{name}",
@@ -433,8 +432,6 @@
   "mute_modal.title": "Brûker negearje?",
   "mute_modal.you_wont_see_mentions": "Jo sjogge gjin berjochten mear dy’t dizze account fermelde.",
   "mute_modal.you_wont_see_posts": "De persoan kin jo berjochten noch hieltyd sjen, mar jo sjogge harren berjochten net mear.",
-  "name_and_others": "{name} en {count, plural, one {# oar} other {# oaren}}",
-  "name_and_others_with_link": "{name} en <a>{count, plural, one {# oar} other {# oaren}}</a>",
   "navigation_bar.about": "Oer",
   "navigation_bar.advanced_interface": "Yn avansearre webomjouwing iepenje",
   "navigation_bar.blocks": "Blokkearre brûkers",
@@ -757,10 +754,6 @@
   "time_remaining.minutes": "{number, plural, one {# minút} other {# minuten}} te gean",
   "time_remaining.moments": "Noch krekt efkes te gean",
   "time_remaining.seconds": "{number, plural, one {# sekonde} other {# sekonden}} te gean",
-  "timeline_hint.remote_resource_not_displayed": "{resource} fan oare servers wurde net toand.",
-  "timeline_hint.resources.followers": "Folgers",
-  "timeline_hint.resources.follows": "Folgjend",
-  "timeline_hint.resources.statuses": "Aldere berjochten",
   "trends.counter_by_accounts": "{count, plural, one {{counter} persoan} other {{counter} persoanen}} {days, plural, one {de ôfrûne dei} other {de ôfrûne {days} dagen}}",
   "trends.trending_now": "Aktuele trends",
   "ui.beforeunload": "Jo konsept giet ferlern wannear’t jo Mastodon ferlitte.",
diff --git a/app/javascript/mastodon/locales/ga.json b/app/javascript/mastodon/locales/ga.json
index 945b2582aca957..9ba86fc5dfdd31 100644
--- a/app/javascript/mastodon/locales/ga.json
+++ b/app/javascript/mastodon/locales/ga.json
@@ -19,7 +19,6 @@
   "account.block_domain": "Bac ainm fearainn {domain}",
   "account.block_short": "Bloc",
   "account.blocked": "Bactha",
-  "account.browse_more_on_origin_server": "Brabhsáil níos mó ar an phróifíl bhunaidh",
   "account.cancel_follow_request": "Éirigh as iarratas leanta",
   "account.copy": "Cóipeáil nasc chuig an bpróifíl",
   "account.direct": "Luaigh @{name} go príobháideach",
@@ -456,8 +455,6 @@
   "mute_modal.title": "An bhfuil fonn ort úsáideoir a bhalbhú?",
   "mute_modal.you_wont_see_mentions": "Ní fheicfidh tú postálacha a luann iad.",
   "mute_modal.you_wont_see_posts": "Is féidir leo do phoist a fheiceáil go fóill, ach ní fheicfidh tú a gcuid postanna.",
-  "name_and_others": "{name} and {count, plural, one {# eile} two {# eile} few {# eile} many {# eile} other {# eile}}",
-  "name_and_others_with_link": "{name} agus <a>{count, plural, one {# eile} two {# eile} few {# eile} many {# eile} other {# eile}}</a>",
   "navigation_bar.about": "Maidir le",
   "navigation_bar.advanced_interface": "Oscail i gcomhéadan gréasáin chun cinn",
   "navigation_bar.blocks": "Cuntais bhactha",
@@ -816,11 +813,6 @@
   "time_remaining.minutes": "{number, plural, one {# nóiméad} other {# nóiméad}} fágtha",
   "time_remaining.moments": "Chuimhneacháin fágtha",
   "time_remaining.seconds": "{number, plural, one {# soicind} other {# soicind}} fágtha",
-  "timeline_hint.remote_resource_not_displayed": "Níl {resource} ó fhreastalaithe eile ar taispeáint.",
-  "timeline_hint.resources.followers": "Leantóirí",
-  "timeline_hint.resources.follows": "Cuntais leanta",
-  "timeline_hint.resources.replies": "Roinnt freagraí",
-  "timeline_hint.resources.statuses": "Postáilí níos sine",
   "trends.counter_by_accounts": "{count, plural, one {{counter} duine} other {{counter} duine}} le {days, plural, one {lá} other {{days} lá}} anuas",
   "trends.trending_now": "Ag treochtáil anois",
   "ui.beforeunload": "Caillfear do dhréacht má fhágann tú Mastodon.",
diff --git a/app/javascript/mastodon/locales/gd.json b/app/javascript/mastodon/locales/gd.json
index 8ab4cafd1420a8..be586e755c7bc7 100644
--- a/app/javascript/mastodon/locales/gd.json
+++ b/app/javascript/mastodon/locales/gd.json
@@ -19,7 +19,6 @@
   "account.block_domain": "Bac an àrainn {domain}",
   "account.block_short": "Bac",
   "account.blocked": "’Ga bhacadh",
-  "account.browse_more_on_origin_server": "Rùraich barrachd dheth air a’ phròifil thùsail",
   "account.cancel_follow_request": "Sguir dhen leantainn",
   "account.copy": "Dèan lethbhreac dhen cheangal dhan phròifil",
   "account.direct": "Thoir iomradh air @{name} gu prìobhaideach",
@@ -456,8 +455,6 @@
   "mute_modal.title": "A bheil thu airson an cleachdaiche a mhùchadh?",
   "mute_modal.you_wont_see_mentions": "Chan fhaic thu na postaichean a bheir iomradh orra.",
   "mute_modal.you_wont_see_posts": "Chì iad na postaichean agad fhathast ach chan fhaic thu na postaichean aca-san.",
-  "name_and_others": "{name} ’s {count, plural, one {# eile} other {# eile}}",
-  "name_and_others_with_link": "{name} ’s <a>{count, plural, one {# eile} other {# eile}}</a>",
   "navigation_bar.about": "Mu dhèidhinn",
   "navigation_bar.advanced_interface": "Fosgail san eadar-aghaidh-lìn adhartach",
   "navigation_bar.blocks": "Cleachdaichean bacte",
@@ -816,11 +813,6 @@
   "time_remaining.minutes": "{number, plural, one {# mhionaid} two {# mhionaid} few {# mionaidean} other {# mionaid}} air fhàgail",
   "time_remaining.moments": "Cha doir e ach greiseag",
   "time_remaining.seconds": "{number, plural, one {# diog} two {# dhiog} few {# diogan} other {# diog}} air fhàgail",
-  "timeline_hint.remote_resource_not_displayed": "Cha dèid {resource} o fhrithealaichean eile a shealltainn.",
-  "timeline_hint.resources.followers": "luchd-leantainn",
-  "timeline_hint.resources.follows": "an fheadhainn gan leantainn",
-  "timeline_hint.resources.replies": "Cuid de na freagairtean",
-  "timeline_hint.resources.statuses": "postaichean nas sine",
   "trends.counter_by_accounts": "{count, plural, one {{counter} neach} two {{counter} neach} few {{counter} daoine} other {{counter} duine}} {days, plural, one {san {days} latha} two {san {days} latha} few {sna {days} làithean} other {sna {days} latha}} seo chaidh",
   "trends.trending_now": "A’ treandadh an-dràsta",
   "ui.beforeunload": "Caillidh tu an dreachd agad ma dh’fhàgas tu Mastodon an-dràsta.",
diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json
index a87f316d700c67..e4d5f560b4ae98 100644
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@@ -19,7 +19,6 @@
   "account.block_domain": "Agochar todo de {domain}",
   "account.block_short": "Bloquear",
   "account.blocked": "Bloqueada",
-  "account.browse_more_on_origin_server": "Busca máis no perfil orixinal",
   "account.cancel_follow_request": "Desbotar a solicitude de seguimento",
   "account.copy": "Copiar ligazón ao perfil",
   "account.direct": "Mencionar de xeito privado a @{name}",
@@ -349,6 +348,14 @@
   "hashtag.follow": "Seguir cancelo",
   "hashtag.unfollow": "Deixar de seguir cancelo",
   "hashtags.and_other": "…e {count, plural, one {}other {# máis}}",
+  "hints.profiles.followers_may_be_missing": "Poderían faltar seguidoras deste perfil.",
+  "hints.profiles.follows_may_be_missing": "Poderían faltar seguimentos deste perfil.",
+  "hints.profiles.posts_may_be_missing": "Poderían faltar algunhas publicacións deste perfil.",
+  "hints.profiles.see_more_followers": "Mira máis seguidoras en {domain}",
+  "hints.profiles.see_more_follows": "Mira máis seguimentos en {domain}",
+  "hints.profiles.see_more_posts": "Mira máis publicacións en {domain}",
+  "hints.threads.replies_may_be_missing": "Poderían faltar respostas desde outros servidores.",
+  "hints.threads.see_more": "Mira máis respostas en {domain}",
   "home.column_settings.show_reblogs": "Amosar compartidos",
   "home.column_settings.show_replies": "Amosar respostas",
   "home.hide_announcements": "Agochar anuncios",
@@ -456,8 +463,6 @@
   "mute_modal.title": "Acalar usuaria?",
   "mute_modal.you_wont_see_mentions": "Non verás as publicacións que a mencionen.",
   "mute_modal.you_wont_see_posts": "Seguirá podendo ler as túas publicacións, pero non verás as súas.",
-  "name_and_others": "{name} e {count, plural, one {outra máis} other {# máis}}",
-  "name_and_others_with_link": "{name} e <a>{count, plural, one {outra máis} other {# máis}}</a>",
   "navigation_bar.about": "Sobre",
   "navigation_bar.advanced_interface": "Abrir coa interface web avanzada",
   "navigation_bar.blocks": "Usuarias bloqueadas",
@@ -490,9 +495,13 @@
   "notification.admin.report_statuses": "{name} deununciou a {target} por {category}",
   "notification.admin.report_statuses_other": "{name} denunciou a {target}",
   "notification.admin.sign_up": "{name} rexistrouse",
+  "notification.admin.sign_up.name_and_others": "{name} e {count, plural, one {# máis} other {# máis}} crearon unha conta",
   "notification.favourite": "{name} marcou como favorita a túa publicación",
+  "notification.favourite.name_and_others_with_link": "{name} e <a>{count, plural, one {# máis} other {# máis}}</a> favoreceron a túa publicación",
   "notification.follow": "{name} comezou a seguirte",
+  "notification.follow.name_and_others": "{name} e {count, plural, one {# máis} other {# máis}} seguíronte",
   "notification.follow_request": "{name} solicitou seguirte",
+  "notification.follow_request.name_and_others": "{name} e {count, plural, one {# máis} other {# máis}} solicitaron seguirte",
   "notification.label.mention": "Mención",
   "notification.label.private_mention": "Mención privada",
   "notification.label.private_reply": "Resposta privada",
@@ -510,6 +519,7 @@
   "notification.own_poll": "A túa enquisa rematou",
   "notification.poll": "Rematou a enquisa na que votaches",
   "notification.reblog": "{name} compartiu a túa publicación",
+  "notification.reblog.name_and_others_with_link": "{name} e <a>{count, plural, one {# máis} other {# máis}}</a> promoveron a túa publicación",
   "notification.relationships_severance_event": "Perdeuse a conexión con {name}",
   "notification.relationships_severance_event.account_suspension": "A administración de {from} suspendeu a {target}, o que significa que xa non vas recibir actualizacións de esa conta ou interactuar con ela.",
   "notification.relationships_severance_event.domain_block": "A administración de {from} bloqueou a {target}, que inclúe a {followersCount} das túas seguidoras e a {followingCount, plural, one {# conta} other {# contas}} que sigues.",
@@ -826,11 +836,6 @@
   "time_remaining.minutes": "Remata en {number, plural, one {# minuto} other {# minutos}}",
   "time_remaining.moments": "A piques de rematar",
   "time_remaining.seconds": "Remata en {number, plural, one {# segundo} other {# segundos}}",
-  "timeline_hint.remote_resource_not_displayed": "Non se mostran {resource} desde outros servidores.",
-  "timeline_hint.resources.followers": "Seguidoras",
-  "timeline_hint.resources.follows": "Seguindo",
-  "timeline_hint.resources.replies": "Algunhas respostas",
-  "timeline_hint.resources.statuses": "Publicacións antigas",
   "trends.counter_by_accounts": "{count, plural, one {{counter} persoa} other {{counter} persoas}} {days, plural, one {no último día} other {nos {days} últimos días}}",
   "trends.trending_now": "Temas populares",
   "ui.beforeunload": "O borrador perderase se saes de Mastodon.",
diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json
index 72f0612bc79d78..c89d6387d688fb 100644
--- a/app/javascript/mastodon/locales/he.json
+++ b/app/javascript/mastodon/locales/he.json
@@ -19,7 +19,6 @@
   "account.block_domain": "חסמו את קהילת {domain}",
   "account.block_short": "לחסום",
   "account.blocked": "לחסום",
-  "account.browse_more_on_origin_server": "ראה יותר בפרופיל המקורי",
   "account.cancel_follow_request": "משיכת בקשת מעקב",
   "account.copy": "להעתיק קישור לפרופיל",
   "account.direct": "הודעה פרטית אל @{name}",
@@ -456,8 +455,6 @@
   "mute_modal.title": "להשתיק משתמש?",
   "mute_modal.you_wont_see_mentions": "לא תראה הודעות שמאזכרות אותם.",
   "mute_modal.you_wont_see_posts": "הם יכולים לראות את הודעותכם, אבל אתם לא תוכלו לראות את שלהם.",
-  "name_and_others": "{name} ועוד {count, plural,one {אחד נוסף}other {# נוספים}}",
-  "name_and_others_with_link": "{name} ועוד <a>{count, plural,one {אחד נוסף}other {# נוספים}}</a>",
   "navigation_bar.about": "אודות",
   "navigation_bar.advanced_interface": "פתח במנשק ווב מתקדם",
   "navigation_bar.blocks": "משתמשים חסומים",
@@ -816,11 +813,6 @@
   "time_remaining.minutes": "נותרו {number, plural, one {# דקה} other {# דקות}}",
   "time_remaining.moments": "רגעים נותרו",
   "time_remaining.seconds": "נותרו {number, plural, one {# שניה} other {# שניות}}",
-  "timeline_hint.remote_resource_not_displayed": "{resource} משרתים אחרים לא מוצגים.",
-  "timeline_hint.resources.followers": "עוקבים",
-  "timeline_hint.resources.follows": "נעקבים",
-  "timeline_hint.resources.replies": "מספר תשובות",
-  "timeline_hint.resources.statuses": "הודעות ישנות יותר",
   "trends.counter_by_accounts": "{count, plural, one {אדם אחד} other {{count} א.נשים}} {days, plural, one {מאז אתמול} two {ביומיים האחרונים} other {במשך {days} הימים האחרונים}}",
   "trends.trending_now": "נושאים חמים",
   "ui.beforeunload": "הטיוטא תאבד אם תעזבו את מסטודון.",
diff --git a/app/javascript/mastodon/locales/hi.json b/app/javascript/mastodon/locales/hi.json
index 0d2a9065692d50..80f645ebe8a3a6 100644
--- a/app/javascript/mastodon/locales/hi.json
+++ b/app/javascript/mastodon/locales/hi.json
@@ -18,7 +18,6 @@
   "account.block_domain": "{domain} के सारी चीज़े छुपाएं",
   "account.block_short": "ब्लॉक किया गया",
   "account.blocked": "ब्लॉक",
-  "account.browse_more_on_origin_server": "मूल प्रोफ़ाइल पर अधिक ब्राउज़ करें",
   "account.cancel_follow_request": "फॉलो रिक्वेस्ट वापस लें",
   "account.copy": "प्रोफाइल पर लिंक कॉपी करें",
   "account.direct": "निजि तरीके से उल्लेख करे @{name}",
@@ -524,7 +523,6 @@
   "status.translated_from_with": "{provider} का उपयोग करते हुये {lang} से अनुवादित किया गया",
   "tabs_bar.home": "होम",
   "tabs_bar.notifications": "सूचनाएँ",
-  "timeline_hint.resources.statuses": "Older toots",
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {# days}}",
   "upload_form.audio_description": "Describe for people with hearing loss",
   "upload_form.description": "Describe for the visually impaired",
diff --git a/app/javascript/mastodon/locales/hr.json b/app/javascript/mastodon/locales/hr.json
index e20fb9b4dcd28f..0eee4da8fcaef9 100644
--- a/app/javascript/mastodon/locales/hr.json
+++ b/app/javascript/mastodon/locales/hr.json
@@ -18,7 +18,6 @@
   "account.block_domain": "Blokiraj domenu {domain}",
   "account.block_short": "Blokiraj",
   "account.blocked": "Blokirano",
-  "account.browse_more_on_origin_server": "Pogledajte više na izvornom profilu",
   "account.cancel_follow_request": "Withdraw follow request",
   "account.copy": "Kopiraj vezu u profil",
   "account.direct": "Privatno spomeni @{name}",
@@ -505,10 +504,6 @@
   "time_remaining.hours": "{number, plural, one {preostao # sat} few {preostalo # sata} other {preostalo # sati}}",
   "time_remaining.minutes": "{number, plural, one {preostala # minuta} few {preostale # minute} other {preostalo # minuta}}",
   "time_remaining.seconds": "{number, plural, one {preostala # sekunda} few {preostale # sekunde} other {preostalo # sekundi}}",
-  "timeline_hint.remote_resource_not_displayed": "{resource} s drugih poslužitelja nisu prikazani.",
-  "timeline_hint.resources.followers": "Pratitelji",
-  "timeline_hint.resources.follows": "Praćenja",
-  "timeline_hint.resources.statuses": "Stariji tootovi",
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {# days}}",
   "trends.trending_now": "Popularno",
   "ui.beforeunload": "Vaša skica bit će izgubljena ako napustite Mastodon.",
diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json
index 459e3f16a1b7f3..97f5a70294f988 100644
--- a/app/javascript/mastodon/locales/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@@ -19,7 +19,6 @@
   "account.block_domain": "Domain letiltása: {domain}",
   "account.block_short": "Letiltás",
   "account.blocked": "Letiltva",
-  "account.browse_more_on_origin_server": "További böngészés az eredeti profilon",
   "account.cancel_follow_request": "Követési kérés visszavonása",
   "account.copy": "Hivatkozás másolása a profilba",
   "account.direct": "@{name} személyes említése",
@@ -349,6 +348,14 @@
   "hashtag.follow": "Hashtag követése",
   "hashtag.unfollow": "Hashtag követésének megszüntetése",
   "hashtags.and_other": "…és {count, plural, other {# további}}",
+  "hints.profiles.followers_may_be_missing": "A profil követői lehet, hogy hiányoznak.",
+  "hints.profiles.follows_may_be_missing": "A profil követései lehet, hogy hiányoznak.",
+  "hints.profiles.posts_may_be_missing": "A profil egyes bejegyzései lehet, hogy hiányoznak.",
+  "hints.profiles.see_more_followers": "További követők megtekintése itt: {domain}",
+  "hints.profiles.see_more_follows": "További követések megtekintése itt: {domain}",
+  "hints.profiles.see_more_posts": "További bejegyzések megtekintése itt: {domain}",
+  "hints.threads.replies_may_be_missing": "A más kiszolgálókról érkező válaszok lehet, hogy hiányoznak.",
+  "hints.threads.see_more": "További válaszok megtekintése itt: {domain}",
   "home.column_settings.show_reblogs": "Megtolások megjelenítése",
   "home.column_settings.show_replies": "Válaszok megjelenítése",
   "home.hide_announcements": "Közlemények elrejtése",
@@ -456,8 +463,6 @@
   "mute_modal.title": "Elnémítsuk a felhasználót?",
   "mute_modal.you_wont_see_mentions": "Nem látsz majd őt említő bejegyzéseket.",
   "mute_modal.you_wont_see_posts": "Továbbra is látni fogja a bejegyzéseidet, de te nem fogod látni az övéit.",
-  "name_and_others": "{name} és {count, plural, one {# másik} other {# másik}}",
-  "name_and_others_with_link": "{name} és <a>{count, plural, one {# másik} other {# másik}}</a>",
   "navigation_bar.about": "Névjegy",
   "navigation_bar.advanced_interface": "Megnyitás a speciális webes felületben",
   "navigation_bar.blocks": "Letiltott felhasználók",
@@ -490,9 +495,13 @@
   "notification.admin.report_statuses": "{name} jelentette: {target}, ezért: {category}",
   "notification.admin.report_statuses_other": "{name} jelentette: {target}",
   "notification.admin.sign_up": "{name} regisztrált",
+  "notification.admin.sign_up.name_and_others": "{name} és {count, plural, one {# másik} other {# másik}} regisztrált",
   "notification.favourite": "{name} kedvencnek jelölte a bejegyzésedet",
+  "notification.favourite.name_and_others_with_link": "{name} és <a>{count, plural, one {# másik} other {# másik}}</a> kedvencnek jelölte a bejegyzésedet",
   "notification.follow": "{name} követ téged",
+  "notification.follow.name_and_others": "{name} és {count, plural, one {# másik} other {# másik}} követni kezdett",
   "notification.follow_request": "{name} követni szeretne téged",
+  "notification.follow_request.name_and_others": "{name} és {count, plural, one {# másik} other {# másik}} kérte, hogy követhessenek",
   "notification.label.mention": "Említés",
   "notification.label.private_mention": "Privát említés",
   "notification.label.private_reply": "Privát válasz",
@@ -510,6 +519,7 @@
   "notification.own_poll": "A szavazásod véget ért",
   "notification.poll": "Véget ért egy szavazás, melyben részt vettél",
   "notification.reblog": "{name} megtolta a bejegyzésedet",
+  "notification.reblog.name_and_others_with_link": "{name} és <a>{count, plural, one {# másik} other {# másik}}</a> megtolta a bejegyzésedet",
   "notification.relationships_severance_event": "Elvesztek a kapcsolatok vele: {name}",
   "notification.relationships_severance_event.account_suspension": "Egy admin a(z) {from} kiszolgálóról felfüggesztette {target} fiókját, ami azt jelenti, hogy mostantól nem fogsz róla értesítést kapni, és nem fogsz tudni vele kapcsolatba lépni.",
   "notification.relationships_severance_event.domain_block": "Egy admin a(z) {from} kiszolgálón letiltotta {target} domaint, beleértve {followersCount} követőt és {followingCount, plural, one {#} other {#}} követett fiókot.",
@@ -826,11 +836,6 @@
   "time_remaining.minutes": "{number, plural, one {# perc} other {# perc}} van hátra",
   "time_remaining.moments": "Pillanatok vannak hátra",
   "time_remaining.seconds": "{number, plural, one {# másodperc} other {# másodperc}} van hátra",
-  "timeline_hint.remote_resource_not_displayed": "a más kiszolgálókról származó {resource} tartalmak nem jelennek meg.",
-  "timeline_hint.resources.followers": "Követő",
-  "timeline_hint.resources.follows": "Követett",
-  "timeline_hint.resources.replies": "Néhány válasz",
-  "timeline_hint.resources.statuses": "Régi bejegyzések",
   "trends.counter_by_accounts": "{count, plural, one {{counter} ember} other {{counter} ember}} az elmúlt {days, plural,one {napban} other {{days} napban}}",
   "trends.trending_now": "Most felkapott",
   "ui.beforeunload": "A piszkozatod el fog veszni, ha elhagyod a Mastodont.",
diff --git a/app/javascript/mastodon/locales/hy.json b/app/javascript/mastodon/locales/hy.json
index 98a40f56e8c7d2..51a99bb022cb19 100644
--- a/app/javascript/mastodon/locales/hy.json
+++ b/app/javascript/mastodon/locales/hy.json
@@ -14,7 +14,6 @@
   "account.block_domain": "Թաքցնել ամէնը հետեւեալ տիրոյթից՝ {domain}",
   "account.block_short": "Արգելափակել",
   "account.blocked": "Արգելափակուած է",
-  "account.browse_more_on_origin_server": "Դիտել աւելին իրական պրոֆիլում",
   "account.cancel_follow_request": "Withdraw follow request",
   "account.direct": "Մասնաւոր յիշատակում @{name}",
   "account.disable_notifications": "Ծանուցումները անջատել @{name} գրառումների համար",
@@ -497,10 +496,6 @@
   "time_remaining.minutes": "{number, plural, one {# րոպէ} other {# րոպէ}} անց",
   "time_remaining.moments": "Մնացել է մի քանի վարկեան",
   "time_remaining.seconds": "{number, plural, one {# վարկեան} other {# վարկեան}} անց",
-  "timeline_hint.remote_resource_not_displayed": "{resource} այլ սպասարկիչներից չեն ցուցադրվել:",
-  "timeline_hint.resources.followers": "Հետեւորդ",
-  "timeline_hint.resources.follows": "Հետեւել",
-  "timeline_hint.resources.statuses": "Հին գրառումներ",
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {# days}}",
   "trends.trending_now": "Այժմ արդիական",
   "ui.beforeunload": "Քո սեւագիրը կը կորի, եթէ լքես Մաստոդոնը։",
diff --git a/app/javascript/mastodon/locales/ia.json b/app/javascript/mastodon/locales/ia.json
index 3750fc82a8655a..07bc88398fb099 100644
--- a/app/javascript/mastodon/locales/ia.json
+++ b/app/javascript/mastodon/locales/ia.json
@@ -19,7 +19,6 @@
   "account.block_domain": "Blocar dominio {domain}",
   "account.block_short": "Blocar",
   "account.blocked": "Blocate",
-  "account.browse_more_on_origin_server": "Explorar plus sur le profilo original",
   "account.cancel_follow_request": "Cancellar sequimento",
   "account.copy": "Copiar ligamine a profilo",
   "account.direct": "Mentionar privatemente @{name}",
@@ -442,8 +441,6 @@
   "mute_modal.title": "Silentiar le usator?",
   "mute_modal.you_wont_see_mentions": "Tu non videra le messages que mentiona iste persona.",
   "mute_modal.you_wont_see_posts": "Iste persona pote totevia vider tu messages, ma tu non videra le sues.",
-  "name_and_others": "{name} e {count, plural, one {# altere} other {# alteres}}",
-  "name_and_others_with_link": "{name} e <a>{count, plural, one {# altere} other {# alteres}}</a>",
   "navigation_bar.about": "A proposito",
   "navigation_bar.advanced_interface": "Aperir in le interfacie web avantiate",
   "navigation_bar.blocks": "Usatores blocate",
@@ -782,10 +779,6 @@
   "time_remaining.minutes": "{number, plural, one {# minuta} other {# minutas}} restante",
   "time_remaining.moments": "Qualque momentos restante",
   "time_remaining.seconds": "{number, plural, one {# secunda} other {# secundas}} restante",
-  "timeline_hint.remote_resource_not_displayed": "Le {resource} de altere servitores non appare hic.",
-  "timeline_hint.resources.followers": "Sequitores",
-  "timeline_hint.resources.follows": "Sequites",
-  "timeline_hint.resources.statuses": "Messages ancian",
   "trends.counter_by_accounts": "{count, plural, one {{counter} persona} other {{counter} personas}} in le passate {days, plural, one {die} other {{days} dies}}",
   "trends.trending_now": "Ora in tendentias",
   "ui.beforeunload": "Tu esbosso essera predite si tu exi de Mastodon.",
diff --git a/app/javascript/mastodon/locales/id.json b/app/javascript/mastodon/locales/id.json
index 5c296cf4fe56bb..27e967a9e4d095 100644
--- a/app/javascript/mastodon/locales/id.json
+++ b/app/javascript/mastodon/locales/id.json
@@ -18,7 +18,6 @@
   "account.block_domain": "Blokir domain {domain}",
   "account.block_short": "Blokir",
   "account.blocked": "Terblokir",
-  "account.browse_more_on_origin_server": "Lihat lebih lanjut di profil asli",
   "account.cancel_follow_request": "Batalkan permintaan ikut",
   "account.copy": "Salin tautan ke profil",
   "account.direct": "Sebut secara pribadi @{name}",
@@ -619,10 +618,6 @@
   "time_remaining.minutes": "{number, plural, other {# menit}} tersisa",
   "time_remaining.moments": "Momen tersisa",
   "time_remaining.seconds": "{number, plural, other {# detik}} tersisa",
-  "timeline_hint.remote_resource_not_displayed": "{resource} dari server lain tidak ditampilkan.",
-  "timeline_hint.resources.followers": "Pengikut",
-  "timeline_hint.resources.follows": "Ikuti",
-  "timeline_hint.resources.statuses": "Kiriman lama",
   "trends.counter_by_accounts": "{count, plural, other {{counter} orang}} dalam {days, plural, other {{days} hari}} terakhir",
   "trends.trending_now": "Sedang tren sekarang",
   "ui.beforeunload": "Draf Anda akan hilang jika Anda keluar dari Mastodon.",
diff --git a/app/javascript/mastodon/locales/ie.json b/app/javascript/mastodon/locales/ie.json
index 61a93a3e50c613..541b586de49cb3 100644
--- a/app/javascript/mastodon/locales/ie.json
+++ b/app/javascript/mastodon/locales/ie.json
@@ -18,7 +18,6 @@
   "account.block_domain": "Bloccar dominia {domain}",
   "account.block_short": "Bloccar",
   "account.blocked": "Bloccat",
-  "account.browse_more_on_origin_server": "Navigar plu sur li profil original",
   "account.cancel_follow_request": "Anullar sequer",
   "account.copy": "Copiar ligament al profil",
   "account.direct": "Privatmen mentionar @{name}",
@@ -755,10 +754,6 @@
   "time_remaining.minutes": "{number, plural, one {# minute} other {# minutes}} resta",
   "time_remaining.moments": "Momentes resta",
   "time_remaining.seconds": "{number, plural, one {# second} other {# secondes}} resta",
-  "timeline_hint.remote_resource_not_displayed": "{resource} de altri servitores ne es monstrat.",
-  "timeline_hint.resources.followers": "Sequitores",
-  "timeline_hint.resources.follows": "Sequetes",
-  "timeline_hint.resources.statuses": "Plu old postas",
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} persones}} durant li ultim {days, plural, one {die} other {{days} dies}}",
   "trends.trending_now": "Actualmen populari",
   "ui.beforeunload": "Tui íncomplet posta va esser perdit si tu lassa Mastodon.",
diff --git a/app/javascript/mastodon/locales/ig.json b/app/javascript/mastodon/locales/ig.json
index 1dd380164df431..8a8d043a6b0089 100644
--- a/app/javascript/mastodon/locales/ig.json
+++ b/app/javascript/mastodon/locales/ig.json
@@ -154,7 +154,6 @@
   "status.translate": "Tụgharịa",
   "tabs_bar.home": "Be",
   "tabs_bar.notifications": "Nziọkwà",
-  "timeline_hint.resources.followers": "Ndị na-eso",
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {# days}}",
   "trends.trending_now": "Na-ewu ewu kịta",
   "upload_form.audio_description": "Describe for people with hearing loss",
diff --git a/app/javascript/mastodon/locales/io.json b/app/javascript/mastodon/locales/io.json
index fa083522c8c506..8290d9d2e437f3 100644
--- a/app/javascript/mastodon/locales/io.json
+++ b/app/javascript/mastodon/locales/io.json
@@ -17,7 +17,6 @@
   "account.block_domain": "Blokusar {domain}",
   "account.block_short": "Blokusar",
   "account.blocked": "Blokusita",
-  "account.browse_more_on_origin_server": "Videz pluse che la originala profilo",
   "account.cancel_follow_request": "Desendez sequodemando",
   "account.copy": "Kopiez ligilo al profilo",
   "account.direct": "Private mencionez @{name}",
@@ -644,10 +643,6 @@
   "time_remaining.minutes": "{number, plural, one {# minuto} other {# minuti}} restas",
   "time_remaining.moments": "Poka sekundi restas",
   "time_remaining.seconds": "{number, plural, one {# sekundo} other {# sekundi}} restas",
-  "timeline_hint.remote_resource_not_displayed": "{resource} de altra servili ne montresas.",
-  "timeline_hint.resources.followers": "Sequanti",
-  "timeline_hint.resources.follows": "Sequati",
-  "timeline_hint.resources.statuses": "Older toots",
   "trends.counter_by_accounts": "{count, plural,one {{counter} persono} other {{counter} personi}} en antea {days, plural,one {dio} other {{days} dii}}",
   "trends.trending_now": "Tendencigas nun",
   "ui.beforeunload": "Vua skisato perdesos se vu ekiras Mastodon.",
diff --git a/app/javascript/mastodon/locales/is.json b/app/javascript/mastodon/locales/is.json
index d2edefdecb23bf..92dda83575e1e9 100644
--- a/app/javascript/mastodon/locales/is.json
+++ b/app/javascript/mastodon/locales/is.json
@@ -19,7 +19,6 @@
   "account.block_domain": "Útiloka lénið {domain}",
   "account.block_short": "Útiloka",
   "account.blocked": "Útilokaður",
-  "account.browse_more_on_origin_server": "Skoða nánari upplýsingar á notandasniðinu",
   "account.cancel_follow_request": "Taka fylgjendabeiðni til baka",
   "account.copy": "Afrita tengil í notandasnið",
   "account.direct": "Einkaspjall við @{name}",
@@ -456,8 +455,6 @@
   "mute_modal.title": "Þagga niður í notanda?",
   "mute_modal.you_wont_see_mentions": "Þú munt ekki sjá færslur sem minnast á viðkomandi aðila.",
   "mute_modal.you_wont_see_posts": "Viðkomandi geta áfram séð færslurnar þínar en þú munt ekki sjá færslurnar þeirra.",
-  "name_and_others": "{name} og {count, plural, one {# annar} other {# aðrir}}",
-  "name_and_others_with_link": "{name} og <a>{count, plural, one {# annar} other {# aðrir}}</a>",
   "navigation_bar.about": "Um hugbúnaðinn",
   "navigation_bar.advanced_interface": "Opna í ítarlegu vefviðmóti",
   "navigation_bar.blocks": "Útilokaðir notendur",
@@ -826,11 +823,6 @@
   "time_remaining.minutes": "{number, plural, one {# mínúta} other {# mínútur}} eftir",
   "time_remaining.moments": "Tími eftir",
   "time_remaining.seconds": "{number, plural, one {# sekúnda} other {# sekúndur}} eftir",
-  "timeline_hint.remote_resource_not_displayed": "{resource} frá öðrum netþjónum er ekki birt.",
-  "timeline_hint.resources.followers": "Fylgjendur",
-  "timeline_hint.resources.follows": "Fylgist með",
-  "timeline_hint.resources.replies": "Sum svör",
-  "timeline_hint.resources.statuses": "Eldri færslur",
   "trends.counter_by_accounts": "{count, plural, one {{counter} aðili} other {{counter} manns}} {days, plural, one {síðasta sólarhringinn} other {síðustu {days} daga}}",
   "trends.trending_now": "Vinsælt núna",
   "ui.beforeunload": "Drögin tapast ef þú ferð út úr Mastodon.",
diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json
index 99fc7058befb14..e334d63fe70ec9 100644
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@@ -19,7 +19,6 @@
   "account.block_domain": "Blocca dominio {domain}",
   "account.block_short": "Blocca",
   "account.blocked": "Bloccato",
-  "account.browse_more_on_origin_server": "Sfoglia di più sul profilo originale",
   "account.cancel_follow_request": "Annulla la richiesta di seguire",
   "account.copy": "Copia link del profilo",
   "account.direct": "Menziona privatamente @{name}",
@@ -349,6 +348,14 @@
   "hashtag.follow": "Segui l'hashtag",
   "hashtag.unfollow": "Smetti di seguire l'hashtag",
   "hashtags.and_other": "…e {count, plural, other {# in più}}",
+  "hints.profiles.followers_may_be_missing": "I seguaci per questo profilo potrebbero essere mancanti.",
+  "hints.profiles.follows_may_be_missing": "I profili seguiti per questo profilo potrebbero essere mancanti.",
+  "hints.profiles.posts_may_be_missing": "Alcuni post da questo profilo potrebbero essere mancanti.",
+  "hints.profiles.see_more_followers": "Vedi altri seguaci su {domain}",
+  "hints.profiles.see_more_follows": "Vedi altri profili seguiti su {domain}",
+  "hints.profiles.see_more_posts": "Vedi altri post su {domain}",
+  "hints.threads.replies_may_be_missing": "Le risposte da altri server potrebbero essere mancanti.",
+  "hints.threads.see_more": "Vedi altre risposte su {domain}",
   "home.column_settings.show_reblogs": "Mostra reblog",
   "home.column_settings.show_replies": "Mostra risposte",
   "home.hide_announcements": "Nascondi annunci",
@@ -456,8 +463,6 @@
   "mute_modal.title": "Silenziare l'utente?",
   "mute_modal.you_wont_see_mentions": "Non vedrai i post che li menzionano.",
   "mute_modal.you_wont_see_posts": "Possono ancora vedere i tuoi post, ma tu non vedrai i loro.",
-  "name_and_others": "{name} e {count, plural, one {# un altro} other {# altri}}",
-  "name_and_others_with_link": "{name} e <a>{count, plural, one {# un altro} other {# altri}}</a>",
   "navigation_bar.about": "Info",
   "navigation_bar.advanced_interface": "Apri nell'interfaccia web avanzata",
   "navigation_bar.blocks": "Utenti bloccati",
@@ -490,9 +495,13 @@
   "notification.admin.report_statuses": "{name} ha segnalato {target} per {category}",
   "notification.admin.report_statuses_other": "{name} ha segnalato {target}",
   "notification.admin.sign_up": "{name} si è iscritto",
+  "notification.admin.sign_up.name_and_others": "Si sono iscritti: {name} e {count, plural, one {# altro utente} other {altri # utenti}}",
   "notification.favourite": "{name} ha aggiunto il tuo post ai preferiti",
+  "notification.favourite.name_and_others_with_link": "{name} e <a>{count, plural, one {# altro} other {altri #}}</a> hanno aggiunto il tuo post ai preferiti",
   "notification.follow": "{name} ha iniziato a seguirti",
+  "notification.follow.name_and_others": "{name} e {count, plural, one {# altro} other {altri #}} hanno iniziato a seguirti",
   "notification.follow_request": "{name} ha richiesto di seguirti",
+  "notification.follow_request.name_and_others": "{name} e {count, plural, one {# altro} other {altri #}} hanno richiesto di seguirti",
   "notification.label.mention": "Menziona",
   "notification.label.private_mention": "Menzione privata",
   "notification.label.private_reply": "Rispondi in privato",
@@ -510,6 +519,7 @@
   "notification.own_poll": "Il tuo sondaggio è terminato",
   "notification.poll": "Un sondaggio in cui hai votato è terminato",
   "notification.reblog": "{name} ha rebloggato il tuo post",
+  "notification.reblog.name_and_others_with_link": "{name} e <a>{count,  plural, one {# altro} other {altri #}}</a> hanno condiviso il tuo post",
   "notification.relationships_severance_event": "Connessioni perse con {name}",
   "notification.relationships_severance_event.account_suspension": "Un amministratore da {from} ha sospeso {target}, il che significa che non puoi più ricevere aggiornamenti da loro o interagire con loro.",
   "notification.relationships_severance_event.domain_block": "Un amministratore da {from} ha bloccato {target}, inclusi {followersCount} dei tuoi seguaci e {followingCount, plural, one {# account} other {# account}} che segui.",
@@ -518,7 +528,17 @@
   "notification.status": "{name} ha appena pubblicato un post",
   "notification.update": "{name} ha modificato un post",
   "notification_requests.accept": "Accetta",
+  "notification_requests.accept_multiple": "{count, plural, one {Accetta # richiesta…} other {Accetta # richieste…}}",
+  "notification_requests.confirm_accept_multiple.button": "{count, plural, one {Accetta la richiesta} other {Accetta le richieste}}",
+  "notification_requests.confirm_accept_multiple.message": "Stai per accettare {count, plural, one {una richiesta di notifica} other {# richieste di notifica}}. Si è sicuri di voler procedere?",
+  "notification_requests.confirm_accept_multiple.title": "Accettare le richieste di notifica?",
+  "notification_requests.confirm_dismiss_multiple.button": "{count, plural, one {Ignora la richiesta} other {Ignora le richieste}}",
+  "notification_requests.confirm_dismiss_multiple.message": "Stai per ignorare {count, plural, one {una richiesta di notifica} other {# richieste di notifiche}}. Non potrai più accedere facilmente ad {count, plural, one {essa} other {esse}}. Si è sicuri di voler procedere?",
+  "notification_requests.confirm_dismiss_multiple.title": "Ignorare le richieste di notifica?",
   "notification_requests.dismiss": "Ignora",
+  "notification_requests.dismiss_multiple": "{count, plural, one {Ignora # richiesta…} other {Ignora # richieste…}}",
+  "notification_requests.edit_selection": "Modifica",
+  "notification_requests.exit_selection": "Fatto",
   "notification_requests.explainer_for_limited_account": "Le notifiche provenienti da questo account sono state filtrate perché l'account è stato limitato da un moderatore.",
   "notification_requests.explainer_for_limited_remote_account": "Le notifiche provenienti da questo account sono state filtrate perché l'account o il suo server sono stati limitati da un moderatore.",
   "notification_requests.maximize": "Ingrandisci",
@@ -816,11 +836,6 @@
   "time_remaining.minutes": "{number, plural, one {# minuto} other {# minuti}} left",
   "time_remaining.moments": "Restano pochi istanti",
   "time_remaining.seconds": "{number, plural, one {# secondo} other {# secondi}} left",
-  "timeline_hint.remote_resource_not_displayed": "{resource} da altri server non sono mostrati.",
-  "timeline_hint.resources.followers": "Seguaci",
-  "timeline_hint.resources.follows": "Segue",
-  "timeline_hint.resources.replies": "Alcune risposte",
-  "timeline_hint.resources.statuses": "Post meno recenti",
   "trends.counter_by_accounts": "{count, plural, one {{count} persona} other {{count} persone}} {days, plural, one {nell'ultimo giorno} other {negli ultimi {days} giorni}}",
   "trends.trending_now": "Ora in tendenza",
   "ui.beforeunload": "La tua bozza andrà persa, se abbandoni Mastodon.",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index 953bb55c166332..bdae9707eb4612 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -19,7 +19,6 @@
   "account.block_domain": "{domain}全体をブロック",
   "account.block_short": "ブロック",
   "account.blocked": "ブロック済み",
-  "account.browse_more_on_origin_server": "リモートで表示",
   "account.cancel_follow_request": "フォローリクエストの取り消し",
   "account.copy": "プロフィールへのリンクをコピー",
   "account.direct": "@{name}さんに非公開でメンション",
@@ -438,8 +437,6 @@
   "mute_modal.title": "ユーザーをミュートしますか？",
   "mute_modal.you_wont_see_mentions": "宛先に相手が入っている投稿も閲覧できなくなります。",
   "mute_modal.you_wont_see_posts": "相手はあなたの投稿を今までどおり閲覧できますが、あなたは相手の投稿を閲覧できなくなります。",
-  "name_and_others": "{count, plural, other {#人のユーザー}}と{name}",
-  "name_and_others_with_link": "<a>{count, plural, other {#人のユーザー}}</a>と{name}",
   "navigation_bar.about": "概要",
   "navigation_bar.advanced_interface": "上級者向けUIに戻る",
   "navigation_bar.blocks": "ブロックしたユーザー",
@@ -788,11 +785,6 @@
   "time_remaining.minutes": "残り{number}分",
   "time_remaining.moments": "まもなく終了",
   "time_remaining.seconds": "残り{number}秒",
-  "timeline_hint.remote_resource_not_displayed": "他のサーバーの{resource}は表示されません。",
-  "timeline_hint.resources.followers": "フォロワー",
-  "timeline_hint.resources.follows": "フォロー",
-  "timeline_hint.resources.replies": "返信の一部",
-  "timeline_hint.resources.statuses": "以前の投稿",
   "trends.counter_by_accounts": "過去{days, plural, one {{days}日} other {{days}日}}に{count, plural, one {{counter}人} other {{counter} 人}}",
   "trends.trending_now": "トレンドタグ",
   "ui.beforeunload": "Mastodonから離れると送信前の投稿は失われます。",
diff --git a/app/javascript/mastodon/locales/ka.json b/app/javascript/mastodon/locales/ka.json
index edb19c1d3a912f..16baf0c2d8c663 100644
--- a/app/javascript/mastodon/locales/ka.json
+++ b/app/javascript/mastodon/locales/ka.json
@@ -253,7 +253,6 @@
   "status.unpin": "პროფილიდან პინის მოშორება",
   "tabs_bar.home": "სახლი",
   "tabs_bar.notifications": "შეტყობინებები",
-  "timeline_hint.resources.statuses": "Older toots",
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {# days}}",
   "ui.beforeunload": "თქვენი დრაფტი გაუქმდება თუ დატოვებთ მასტოდონს.",
   "upload_area.title": "გადმოწიეთ და ჩააგდეთ ასატვირთათ",
diff --git a/app/javascript/mastodon/locales/kab.json b/app/javascript/mastodon/locales/kab.json
index f5adc8c56c482c..c2b3db6e02b675 100644
--- a/app/javascript/mastodon/locales/kab.json
+++ b/app/javascript/mastodon/locales/kab.json
@@ -15,7 +15,6 @@
   "account.block_domain": "Ffer kra i d-yekkan seg {domain}",
   "account.block_short": "Sewḥel",
   "account.blocked": "Yettusewḥel",
-  "account.browse_more_on_origin_server": "Snirem ugar deg umeɣnu aneẓli",
   "account.cancel_follow_request": "Sefsex taḍfart",
   "account.copy": "Nɣel assaɣ ɣer umaɣnu",
   "account.direct": "Bder-d @{name} weḥd-s",
@@ -632,11 +631,6 @@
   "time_remaining.minutes": "Mazal {number, plural, one {# n tesdat} other {# n tesdatin}}",
   "time_remaining.moments": "Akuden i d-yeqqimen",
   "time_remaining.seconds": "Mazal {number, plural, one {# n tasint} other {# n tsinin}} id yugran",
-  "timeline_hint.remote_resource_not_displayed": "{resource} seg yiqeddacen-nniḍen ur d-ttwaskanent ara.",
-  "timeline_hint.resources.followers": "Imeḍfaṛen",
-  "timeline_hint.resources.follows": "T·Yeṭafaṛ",
-  "timeline_hint.resources.replies": "Kra tririyin",
-  "timeline_hint.resources.statuses": "Tisuffaɣ tiqdimin",
   "trends.counter_by_accounts": "{count, plural, one {{counter} wemdan} other {{counter} medden}} deg {days, plural, one {ass} other {{days} wussan}} iɛeddan",
   "trends.trending_now": "Ayen mucaɛen tura",
   "ui.beforeunload": "Arewway-ik·im ad iruḥ ma yella tefeɣ-d deg Maṣṭudun.",
diff --git a/app/javascript/mastodon/locales/kk.json b/app/javascript/mastodon/locales/kk.json
index 2eed22e0edf6ec..a150be5daf3ec8 100644
--- a/app/javascript/mastodon/locales/kk.json
+++ b/app/javascript/mastodon/locales/kk.json
@@ -18,7 +18,6 @@
   "account.block_domain": "{domain} доменін бұғаттау",
   "account.block_short": "Бұғаттау",
   "account.blocked": "Бұғатталған",
-  "account.browse_more_on_origin_server": "Бастапқы профильден шолу",
   "account.cancel_follow_request": "Withdraw follow request",
   "account.disable_notifications": "@{name} постары туралы ескертпеу",
   "account.domain_blocked": "Домен бұғатталған",
@@ -354,10 +353,6 @@
   "time_remaining.minutes": "{number, plural, one {# минут} other {# минут}}",
   "time_remaining.moments": "Қалған уақыт",
   "time_remaining.seconds": "{number, plural, one {# секунд} other {# секунд}}",
-  "timeline_hint.remote_resource_not_displayed": "{resource} басқа серверлерде көрсетілмейді.",
-  "timeline_hint.resources.followers": "Оқырман",
-  "timeline_hint.resources.follows": "Жазылым",
-  "timeline_hint.resources.statuses": "Ескі посттары",
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {# days}}",
   "trends.trending_now": "Тренд тақырыптар",
   "ui.beforeunload": "Mastodon желісінен шықсаңыз, нобайыңыз сақталмайды.",
diff --git a/app/javascript/mastodon/locales/kn.json b/app/javascript/mastodon/locales/kn.json
index 2dabae0c147b60..941857e25f803f 100644
--- a/app/javascript/mastodon/locales/kn.json
+++ b/app/javascript/mastodon/locales/kn.json
@@ -101,7 +101,6 @@
   "status.pinned": "Pinned toot",
   "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
-  "timeline_hint.resources.statuses": "Older toots",
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {# days}}",
   "upload_form.audio_description": "Describe for people with hearing loss",
   "upload_form.description": "Describe for the visually impaired",
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index dd10d132cbe0a2..cc4b6a9de57578 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -19,7 +19,6 @@
   "account.block_domain": "{domain} 도메인 차단",
   "account.block_short": "차단",
   "account.blocked": "차단함",
-  "account.browse_more_on_origin_server": "원본 프로필에서 더 탐색하기",
   "account.cancel_follow_request": "팔로우 취소",
   "account.copy": "프로필 링크 복사",
   "account.direct": "@{name} 님에게 개인적으로 멘션",
@@ -349,6 +348,14 @@
   "hashtag.follow": "팔로우",
   "hashtag.unfollow": "팔로우 해제",
   "hashtags.and_other": "…그리고 {count, plural,other {# 개 더}}",
+  "hints.profiles.followers_may_be_missing": "이 프로필의 팔로워 목록은 일부 누락되었을 수 있습니다.",
+  "hints.profiles.follows_may_be_missing": "이 프로필의 팔로우 목록은 일부 누락되었을 수 있습니다.",
+  "hints.profiles.posts_may_be_missing": "이 프로필의 게시물은 일부 누락되었을 수 있습니다.",
+  "hints.profiles.see_more_followers": "{domain}에서 더 많은 팔로워 보기",
+  "hints.profiles.see_more_follows": "{domain}에서 더 많은 팔로우 보기",
+  "hints.profiles.see_more_posts": "{domain}에서 더 많은 게시물 보기",
+  "hints.threads.replies_may_be_missing": "다른 서버의 답글은 일부 누락되었을 수 있습니다.",
+  "hints.threads.see_more": "{domain}에서 더 많은 답글 보기",
   "home.column_settings.show_reblogs": "부스트 표시",
   "home.column_settings.show_replies": "답글 표시",
   "home.hide_announcements": "공지사항 숨기기",
@@ -456,8 +463,6 @@
   "mute_modal.title": "사용자를 뮤트할까요?",
   "mute_modal.you_wont_see_mentions": "그를 멘션하는 게시물을 더는 보지 않게 됩니다.",
   "mute_modal.you_wont_see_posts": "내가 작성한 게시물을 볼 수는 있지만, 나는 그가 작성한 것을 보지 않게 됩니다.",
-  "name_and_others": "{name} 외 {count, plural, other {# 명}}",
-  "name_and_others_with_link": "{name} 외 <a>{count, plural, other {# 명}}</a>",
   "navigation_bar.about": "정보",
   "navigation_bar.advanced_interface": "고급 웹 인터페이스에서 열기",
   "navigation_bar.blocks": "차단한 사용자",
@@ -826,11 +831,6 @@
   "time_remaining.minutes": "{number} 분 남음",
   "time_remaining.moments": "남은 시간",
   "time_remaining.seconds": "{number} 초 남음",
-  "timeline_hint.remote_resource_not_displayed": "다른 서버의 {resource} 표시할 수 없습니다.",
-  "timeline_hint.resources.followers": "팔로워는",
-  "timeline_hint.resources.follows": "팔로우는",
-  "timeline_hint.resources.replies": "몇몇 답글은",
-  "timeline_hint.resources.statuses": "이전 게시물은",
   "trends.counter_by_accounts": "이전 {days}일 동안 {counter} 명의 사용자",
   "trends.trending_now": "지금 유행 중",
   "ui.beforeunload": "지금 나가면 저장되지 않은 항목을 잃게 됩니다.",
diff --git a/app/javascript/mastodon/locales/ku.json b/app/javascript/mastodon/locales/ku.json
index c8188743897931..f62c600fe258d4 100644
--- a/app/javascript/mastodon/locales/ku.json
+++ b/app/javascript/mastodon/locales/ku.json
@@ -17,7 +17,6 @@
   "account.block": "@{name} asteng bike",
   "account.block_domain": "Navpera {domain} asteng bike",
   "account.blocked": "Astengkirî",
-  "account.browse_more_on_origin_server": "Li pelên resen bêtir bigere",
   "account.cancel_follow_request": "Daxwaza şopandinê vekişîne",
   "account.direct": "Bi taybetî qale @{name} bike",
   "account.disable_notifications": "Êdî min agahdar neke gava @{name} diweşîne",
@@ -549,10 +548,6 @@
   "time_remaining.minutes": "{number, plural, one {# xulek} other {# xulek}} maye",
   "time_remaining.moments": "Demên mayî",
   "time_remaining.seconds": "{number, plural, one {# çirke} other {# çirke}} maye",
-  "timeline_hint.remote_resource_not_displayed": "{resource} Ji rajekerên din nayê dîtin.",
-  "timeline_hint.resources.followers": "Şopîner",
-  "timeline_hint.resources.follows": "Dişopîne",
-  "timeline_hint.resources.statuses": "Şandiyên kevn",
   "trends.counter_by_accounts": "{count, plural, one {{counter} kes} other {{counter} kes}} berî {days, plural, one {roj} other {{days} roj}}",
   "trends.trending_now": "Rojev",
   "ui.beforeunload": "Ger ji Mastodonê veketi wê reşnivîsa te jî winda bibe.",
diff --git a/app/javascript/mastodon/locales/kw.json b/app/javascript/mastodon/locales/kw.json
index ae1d1047bf132f..90ae8104706621 100644
--- a/app/javascript/mastodon/locales/kw.json
+++ b/app/javascript/mastodon/locales/kw.json
@@ -6,7 +6,6 @@
   "account.block": "Lettya @{name}",
   "account.block_domain": "Lettya gorfarth {domain}",
   "account.blocked": "Lettys",
-  "account.browse_more_on_origin_server": "Peuri moy y'n profil derowel",
   "account.cancel_follow_request": "Withdraw follow request",
   "account.disable_notifications": "Hedhi ow gwarnya pan wra @{name} postya",
   "account.domain_blocked": "Gorfarth lettys",
@@ -356,10 +355,6 @@
   "time_remaining.minutes": "{number, plural, one {# vynysen} other {# a vynysennow}} gesys",
   "time_remaining.moments": "Polsyow gesys",
   "time_remaining.seconds": "{number, plural, one {# eylen} other {# eylen}} gesys",
-  "timeline_hint.remote_resource_not_displayed": "Nyns yw {resource} a'n leurennow erel displetys.",
-  "timeline_hint.resources.followers": "Holyoryon",
-  "timeline_hint.resources.follows": "Holyansow",
-  "timeline_hint.resources.statuses": "Kottha postow",
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {# days}}",
   "trends.trending_now": "Tuedhegus lemmyn",
   "ui.beforeunload": "Agas kysnkrif a vydh kellys mar kwrewgh diberth a Mastodon.",
diff --git a/app/javascript/mastodon/locales/la.json b/app/javascript/mastodon/locales/la.json
index 4237f885a7734d..5ef238a2bd997a 100644
--- a/app/javascript/mastodon/locales/la.json
+++ b/app/javascript/mastodon/locales/la.json
@@ -234,8 +234,6 @@
   "time_remaining.hours": "{number, plural, one {# hora} other {# horae}} restant",
   "time_remaining.minutes": "{number, plural, one {# minutum} other {# minuta}} restant",
   "time_remaining.seconds": "{number, plural, one {# secundum} other {# secunda}} restant",
-  "timeline_hint.remote_resource_not_displayed": "{resource} ab aliīs servīs nōn ostenduntur.",
-  "timeline_hint.resources.statuses": "Contributa pristina",
   "trends.counter_by_accounts": "{count, plural, one {{counter} persōna} other {{counter} persōnae}} in {days, plural, one {diē prīdiē} other {diēbus praeteritīs {days}}}",
   "ui.beforeunload": "Si Mastodon discesseris, tua epitome peribit.",
   "units.short.billion": "{count} millia milionum",
diff --git a/app/javascript/mastodon/locales/lad.json b/app/javascript/mastodon/locales/lad.json
index 9711bc684d400b..9e082a742d64e3 100644
--- a/app/javascript/mastodon/locales/lad.json
+++ b/app/javascript/mastodon/locales/lad.json
@@ -19,7 +19,6 @@
   "account.block_domain": "Bloka el domeno {domain}",
   "account.block_short": "Bloka",
   "account.blocked": "Blokado",
-  "account.browse_more_on_origin_server": "Ve mas en el profil orijinal",
   "account.cancel_follow_request": "Anula solisitud de segir",
   "account.copy": "Kopia atadijo de profil",
   "account.direct": "Enmenta a @{name} en privado",
@@ -755,11 +754,6 @@
   "time_remaining.minutes": "{number, plural, one {# minuto restante} other {# minutos restantes}}",
   "time_remaining.moments": "Momentos restantes",
   "time_remaining.seconds": "{number, plural, one {# sigundo restante} other {# sigundos restantes}}",
-  "timeline_hint.remote_resource_not_displayed": "{resource} de otros sirvidores no se amostran.",
-  "timeline_hint.resources.followers": "Suivantes",
-  "timeline_hint.resources.follows": "Segidos",
-  "timeline_hint.resources.replies": "Algunas repuestas",
-  "timeline_hint.resources.statuses": "Publikasyones mas viejas",
   "trends.counter_by_accounts": "{count, plural, one {{counter} kuento} other {{counter} kuentos}} en los ultimos {days, plural, one {diyas} other {{days} diyas}}",
   "trends.trending_now": "Trendes",
   "ui.beforeunload": "La publikasyon ke estas eskriviendo se pedrera si sales de Mastodon.",
diff --git a/app/javascript/mastodon/locales/lt.json b/app/javascript/mastodon/locales/lt.json
index 680dc9958effa6..389e75bf86fc61 100644
--- a/app/javascript/mastodon/locales/lt.json
+++ b/app/javascript/mastodon/locales/lt.json
@@ -19,7 +19,6 @@
   "account.block_domain": "Blokuoti domeną {domain}",
   "account.block_short": "Blokuoti",
   "account.blocked": "Užblokuota",
-  "account.browse_more_on_origin_server": "Naršyti daugiau originaliame profilyje",
   "account.cancel_follow_request": "Atšaukti sekimą",
   "account.copy": "Kopijuoti nuorodą į profilį",
   "account.direct": "Privačiai paminėti @{name}",
@@ -349,6 +348,14 @@
   "hashtag.follow": "Sekti saitažodį",
   "hashtag.unfollow": "Nebesekti saitažodį",
   "hashtags.and_other": "…ir {count, plural, one {# daugiau} few {# daugiau} many {# daugiau}other {# daugiau}}",
+  "hints.profiles.followers_may_be_missing": "Sekėjai šiai profiliui gali būti nepateikti.",
+  "hints.profiles.follows_may_be_missing": "Sekimai šiai profiliui gali būti nepateikti.",
+  "hints.profiles.posts_may_be_missing": "Kai kurie įrašai iš šio profilio gali būti nepateikti.",
+  "hints.profiles.see_more_followers": "Žiūrėti daugiau sekėjų serveryje {domain}",
+  "hints.profiles.see_more_follows": "Žiūrėti daugiau sekimų serveryje {domain}",
+  "hints.profiles.see_more_posts": "Žiūrėti daugiau įrašų serveryje {domain}",
+  "hints.threads.replies_may_be_missing": "Atsakymai iš kitų serverių gali būti nepateikti.",
+  "hints.threads.see_more": "Žiūrėti daugiau atsakymų serveryje {domain}",
   "home.column_settings.show_reblogs": "Rodyti pakėlimus",
   "home.column_settings.show_replies": "Rodyti atsakymus",
   "home.hide_announcements": "Slėpti skelbimus",
@@ -456,8 +463,6 @@
   "mute_modal.title": "Nutildyti naudotoją?",
   "mute_modal.you_wont_see_mentions": "Nematysi įrašus, kuriuose jie paminimi.",
   "mute_modal.you_wont_see_posts": "Jie vis tiek gali matyti tavo įrašus, bet tu nematysi jų.",
-  "name_and_others": "{name} ir {count, plural, one {# kitas} few {# kiti} many {# kito} other {# kitų}}",
-  "name_and_others_with_link": "{name} ir <a>{count, plural, one {# kitas} few {# kiti} many {# kito} other {# kitų}}</a>",
   "navigation_bar.about": "Apie",
   "navigation_bar.advanced_interface": "Atidaryti išplėstinę žiniatinklio sąsają",
   "navigation_bar.blocks": "Užblokuoti naudotojai",
@@ -820,11 +825,6 @@
   "time_remaining.minutes": "liko {number, plural, one {# minutė} few {# minutės} many {# minutės} other {# minučių}}",
   "time_remaining.moments": "liko akimirkos",
   "time_remaining.seconds": "liko {number, plural, one {# sekundė} few {# sekundės} many {# sekundės} other {# sekundžių}}",
-  "timeline_hint.remote_resource_not_displayed": "{resource} iš kitų serverių nerodomi.",
-  "timeline_hint.resources.followers": "Sekėjai",
-  "timeline_hint.resources.follows": "Seka",
-  "timeline_hint.resources.replies": "Kai kurie atsakymai",
-  "timeline_hint.resources.statuses": "Senesni įrašai",
   "trends.counter_by_accounts": "{count, plural, one {{counter} žmogus} few {{counter} žmonės} many {{counter} žmogus} other {{counter} žmonių}} per {days, plural, one {dieną} few {{days} dienas} many {{days} dienas} other {{days} dienų}}",
   "trends.trending_now": "Tendencinga dabar",
   "ui.beforeunload": "Jei paliksi Mastodon, tavo juodraštis bus prarastas.",
diff --git a/app/javascript/mastodon/locales/lv.json b/app/javascript/mastodon/locales/lv.json
index 02b709301c20b8..18bb12fbdf6260 100644
--- a/app/javascript/mastodon/locales/lv.json
+++ b/app/javascript/mastodon/locales/lv.json
@@ -18,7 +18,6 @@
   "account.block_domain": "Bloķēt domēnu {domain}",
   "account.block_short": "Bloķēt",
   "account.blocked": "Bloķēts",
-  "account.browse_more_on_origin_server": "Pārlūkot vairāk sākotnējā profilā",
   "account.cancel_follow_request": "Atsaukt sekošanas pieprasījumu",
   "account.copy": "Ievietot saiti uz profilu starpliktuvē",
   "account.direct": "Pieminēt @{name} privāti",
@@ -706,10 +705,6 @@
   "time_remaining.minutes": "{number, plural, one {Atlikusi # minūte} other {Atlikušas # minūtes}}",
   "time_remaining.moments": "Atlikuši daži mirkļi",
   "time_remaining.seconds": "Atlikušas {number, plural, one {# sekunde} other {# sekundes}}",
-  "timeline_hint.remote_resource_not_displayed": "{resource} no citiem serveriem nav parādīti.",
-  "timeline_hint.resources.followers": "Sekotāji",
-  "timeline_hint.resources.follows": "Seko",
-  "timeline_hint.resources.statuses": "Vecāki ieraksti",
   "trends.counter_by_accounts": "{count, plural, zero {{counter} cilvēku} one {{counter} cilvēks} other {{counter} cilvēki}} {days, plural, one {{day} dienā} other {{days} dienās}}",
   "trends.trending_now": "Pašlaik populāri",
   "ui.beforeunload": "Ja pametīsit Mastodonu, jūsu melnraksts tiks zaudēts.",
diff --git a/app/javascript/mastodon/locales/mk.json b/app/javascript/mastodon/locales/mk.json
index 5c8b752cf96c92..084a94cc14a412 100644
--- a/app/javascript/mastodon/locales/mk.json
+++ b/app/javascript/mastodon/locales/mk.json
@@ -245,7 +245,6 @@
   "time_remaining.minutes": "{number, plural, one {# минута} other {# минути}} {number, plural, one {остана} other {останаа}}",
   "time_remaining.moments": "Уште некои мига",
   "time_remaining.seconds": "{number, plural, one {# секунда} other {# секунди}} {number, plural, one {остана} other {останаа}}",
-  "timeline_hint.resources.statuses": "Older toots",
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {# days}}",
   "upload_form.audio_description": "Describe for people with hearing loss",
   "upload_form.description": "Describe for the visually impaired",
diff --git a/app/javascript/mastodon/locales/ml.json b/app/javascript/mastodon/locales/ml.json
index 65a11750758c80..60f400487e8a87 100644
--- a/app/javascript/mastodon/locales/ml.json
+++ b/app/javascript/mastodon/locales/ml.json
@@ -11,7 +11,6 @@
   "account.block": "@{name} -നെ തടയുക",
   "account.block_domain": "{domain} എന്ന മേഖല തടയുക",
   "account.blocked": "തടഞ്ഞു",
-  "account.browse_more_on_origin_server": "യഥാർത്ഥ പ്രൊഫൈലിലേക്ക് പോവുക",
   "account.cancel_follow_request": "Withdraw follow request",
   "account.disable_notifications": "@{name} പോസ്റ്റുചെയ്യുന്നത് എന്നെ അറിയിക്കുന്നത് നിർത്തുക",
   "account.domain_blocked": "മേഖല തടഞ്ഞു",
@@ -336,9 +335,6 @@
   "tabs_bar.notifications": "അറിയിപ്പുകൾ",
   "time_remaining.days": "{number, plural, one {# ദിവസം} other {# ദിവസങ്ങൾ}} ബാക്കി",
   "time_remaining.hours": "{number, plural, one {# മണിക്കൂർ} other {# മണിക്കൂർ}} ശേഷിക്കുന്നു",
-  "timeline_hint.resources.followers": "പിന്തുടരുന്നവർ",
-  "timeline_hint.resources.follows": "പിന്തുടരുന്നു",
-  "timeline_hint.resources.statuses": "പഴയ ടൂട്ടുകൾ",
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {# days}}",
   "trends.trending_now": "ഇപ്പോൾ ട്രെൻഡിംഗ്",
   "units.short.million": "{count}ദശലക്ഷം",
diff --git a/app/javascript/mastodon/locales/mr.json b/app/javascript/mastodon/locales/mr.json
index b72d44aa55896e..47c3a55e55c6fa 100644
--- a/app/javascript/mastodon/locales/mr.json
+++ b/app/javascript/mastodon/locales/mr.json
@@ -18,7 +18,6 @@
   "account.block_domain": "{domain} पासून सर्व लपवा",
   "account.block_short": "अवरोध",
   "account.blocked": "ब्लॉक केले आहे",
-  "account.browse_more_on_origin_server": "मूळ प्रोफाइलवर अधिक ब्राउझ करा",
   "account.cancel_follow_request": "फॉलो विनंती मागे घ्या",
   "account.copy": "दुवा कॉपी करा",
   "account.direct": "खाजगीरित्या उल्लेखीत @{name}",
@@ -236,7 +235,6 @@
   "status.pinned": "Pinned toot",
   "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
-  "timeline_hint.resources.statuses": "Older toots",
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {# days}}",
   "upload_form.audio_description": "Describe for people with hearing loss",
   "upload_form.description": "Describe for the visually impaired",
diff --git a/app/javascript/mastodon/locales/ms.json b/app/javascript/mastodon/locales/ms.json
index d782f363e8885f..695d4e4083a5e5 100644
--- a/app/javascript/mastodon/locales/ms.json
+++ b/app/javascript/mastodon/locales/ms.json
@@ -18,7 +18,6 @@
   "account.block_domain": "Sekat domain {domain}",
   "account.block_short": "Malay",
   "account.blocked": "Disekat",
-  "account.browse_more_on_origin_server": "Layari selebihnya di profil asal",
   "account.cancel_follow_request": "Menarik balik permintaan mengikut",
   "account.copy": "Salin pautan ke profil",
   "account.direct": "Sebut secara persendirian @{name}",
@@ -666,10 +665,6 @@
   "time_remaining.minutes": "Tinggal {number, plural, other {# minit}}",
   "time_remaining.moments": "Tinggal beberapa saat",
   "time_remaining.seconds": "Tinggal {number, plural, other {# saat}}",
-  "timeline_hint.remote_resource_not_displayed": "{resource} dari pelayan lain tidak dipaparkan.",
-  "timeline_hint.resources.followers": "Pengikut",
-  "timeline_hint.resources.follows": "Ikutan",
-  "timeline_hint.resources.statuses": "Hantaran lebih lama",
   "trends.counter_by_accounts": "{count, plural, other {{counter} orang}} dalam {days, plural, other {{days} hari}} yang lalu",
   "trends.trending_now": "Sohor kini",
   "ui.beforeunload": "Rangka anda akan terhapus jika anda meninggalkan Mastodon.",
diff --git a/app/javascript/mastodon/locales/my.json b/app/javascript/mastodon/locales/my.json
index 310a944060d379..903dc8d919b71d 100644
--- a/app/javascript/mastodon/locales/my.json
+++ b/app/javascript/mastodon/locales/my.json
@@ -18,7 +18,6 @@
   "account.block_domain": " {domain} ဒိုမိန်းကိုပိတ်မည်",
   "account.block_short": "ပိတ်ဆို့",
   "account.blocked": "ဘလော့ထားသည်",
-  "account.browse_more_on_origin_server": "မူရင်းပရိုဖိုင်တွင် ပိုမိုကြည့်ရှုပါ။",
   "account.cancel_follow_request": "စောင့်ကြည့်မှု ပယ်ဖျက်ခြင်း",
   "account.copy": "လင့်ခ်ကို ပရိုဖိုင်သို့ ကူးယူပါ",
   "account.direct": "@{name} သီးသန့် သိရှိနိုင်အောင် မန်းရှင်းခေါ်မည်",
@@ -644,10 +643,6 @@
   "time_remaining.minutes": "{number, plural, one {# minute} other {# minutes}} left",
   "time_remaining.moments": "အခိုက်အတန့်များ ကျန်ရှိနေသေးသည်",
   "time_remaining.seconds": "{number, plural, one {# second} other {# seconds}} left",
-  "timeline_hint.remote_resource_not_displayed": "အခြားဆာဗာများမှ {resource} ကို ပြသမည်မဟုတ်ပါ။",
-  "timeline_hint.resources.followers": "စောင့်ကြည့်သူများ",
-  "timeline_hint.resources.follows": "စောင့်ကြည့်မယ်",
-  "timeline_hint.resources.statuses": "ပို့စ်အဟောင်းများ",
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "လက်ရှိခေတ်စားနေသော ပို့စ်များ",
   "ui.beforeunload": "Mastodon မှ ထွက်ခွာပါက သင့်မူကြမ်း ဆုံးရှုံးသွားပါမည်။",
diff --git a/app/javascript/mastodon/locales/ne.json b/app/javascript/mastodon/locales/ne.json
index ca23a1f781495e..1cb10a93b48365 100644
--- a/app/javascript/mastodon/locales/ne.json
+++ b/app/javascript/mastodon/locales/ne.json
@@ -15,7 +15,6 @@
   "account.block_domain": "{domain} डोमेनलाई ब्लक गर्नुहोस्",
   "account.block_short": "ब्लक",
   "account.blocked": "ब्लक गरिएको",
-  "account.browse_more_on_origin_server": "मूल प्रोफाइलमा थप ब्राउज गर्नुहोस्",
   "account.cancel_follow_request": "फलो अनुरोध रद्द गर्नुहोस",
   "account.copy": "प्रोफाइलको लिङ्क प्रतिलिपि गर्नुहोस्",
   "account.direct": "@{name} लाई निजी रूपमा उल्लेख गर्नुहोस्",
diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json
index de9d80885ec2f8..ed9eaeec3a8b79 100644
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@@ -19,7 +19,6 @@
   "account.block_domain": "Alles van {domain} blokkeren",
   "account.block_short": "Blokkeren",
   "account.blocked": "Geblokkeerd",
-  "account.browse_more_on_origin_server": "Zie meer op het originele profiel",
   "account.cancel_follow_request": "Ontvolgen",
   "account.copy": "Link naar profiel kopiëren",
   "account.direct": "@{name} een privébericht sturen",
@@ -349,6 +348,14 @@
   "hashtag.follow": "Hashtag volgen",
   "hashtag.unfollow": "Hashtag ontvolgen",
   "hashtags.and_other": "…en {count, plural, one {}other {# meer}}",
+  "hints.profiles.followers_may_be_missing": "Volgers voor dit profiel kunnen ontbreken.",
+  "hints.profiles.follows_may_be_missing": "De volgers voor dit profiel kunnen ontbreken.",
+  "hints.profiles.posts_may_be_missing": "Er ontbreken mogelijk berichten van dit profiel.",
+  "hints.profiles.see_more_followers": "Bekijk meer volgers op {domain}",
+  "hints.profiles.see_more_follows": "Bekijk meer gevolgde accounts op {domain}",
+  "hints.profiles.see_more_posts": "Bekijk meer berichten op {domain}",
+  "hints.threads.replies_may_be_missing": "Antwoorden van andere servers kunnen ontbreken.",
+  "hints.threads.see_more": "Bekijk meer reacties op {domain}",
   "home.column_settings.show_reblogs": "Boosts tonen",
   "home.column_settings.show_replies": "Reacties tonen",
   "home.hide_announcements": "Mededelingen verbergen",
@@ -456,8 +463,6 @@
   "mute_modal.title": "Gebruiker negeren?",
   "mute_modal.you_wont_see_mentions": "Je ziet geen berichten meer die dit account vermelden.",
   "mute_modal.you_wont_see_posts": "De persoon kan nog steeds jouw berichten zien, maar diens berichten zie je niet meer.",
-  "name_and_others": "{name} en {count, plural, one {# ander} other {# anderen}}",
-  "name_and_others_with_link": "{name} en <a>{count, plural, one {# ander} other {# anderen}}</a>",
   "navigation_bar.about": "Over",
   "navigation_bar.advanced_interface": "In geavanceerde webinterface openen",
   "navigation_bar.blocks": "Geblokkeerde gebruikers",
@@ -490,9 +495,13 @@
   "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.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.follow": "{name} volgt jou nu",
+  "notification.follow.name_and_others": "{name} en {count, plural, one {# ander} other {# anderen}} 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.label.mention": "Vermelding",
   "notification.label.private_mention": "Privébericht",
   "notification.label.private_reply": "Privéreactie",
@@ -510,6 +519,7 @@
   "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.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.",
@@ -826,11 +836,6 @@
   "time_remaining.minutes": "{number, plural, one {# minuut} other {# minuten}} te gaan",
   "time_remaining.moments": "Nog enkele ogenblikken resterend",
   "time_remaining.seconds": "{number, plural, one {# seconde} other {# seconden}} te gaan",
-  "timeline_hint.remote_resource_not_displayed": "{resource} van andere servers worden niet getoond.",
-  "timeline_hint.resources.followers": "Volgers",
-  "timeline_hint.resources.follows": "Volgend",
-  "timeline_hint.resources.replies": "Enkele reacties",
-  "timeline_hint.resources.statuses": "Oudere berichten",
   "trends.counter_by_accounts": "{count, plural, one {{counter} persoon} other {{counter} mensen}} {days, plural, one {in het afgelopen etmaal} other {in de afgelopen {days} dagen}}",
   "trends.trending_now": "Huidige trends",
   "ui.beforeunload": "Je concept gaat verloren wanneer je Mastodon verlaat.",
diff --git a/app/javascript/mastodon/locales/nn.json b/app/javascript/mastodon/locales/nn.json
index 7ecabd10c52ce7..502fd0ab3b72d2 100644
--- a/app/javascript/mastodon/locales/nn.json
+++ b/app/javascript/mastodon/locales/nn.json
@@ -19,7 +19,6 @@
   "account.block_domain": "Skjul alt frå {domain}",
   "account.block_short": "Blokker",
   "account.blocked": "Blokkert",
-  "account.browse_more_on_origin_server": "Sjå gjennom meir på den opphavlege profilen",
   "account.cancel_follow_request": "Trekk attende fylgeførespurnad",
   "account.copy": "Kopier lenka til profilen",
   "account.direct": "Nevn @{name} privat",
@@ -456,8 +455,6 @@
   "mute_modal.title": "Demp brukaren?",
   "mute_modal.you_wont_see_mentions": "Du vil ikkje sjå innlegg som nemner dei.",
   "mute_modal.you_wont_see_posts": "Dei kan framleis sjå innlegga dine, men du vil ikkje sjå deira.",
-  "name_and_others": "{name} og {count, plural, one {# annan} other {# andre}}",
-  "name_and_others_with_link": "{name} og <a>{count, plural, one {# annan} other {# andre}}</a>",
   "navigation_bar.about": "Om",
   "navigation_bar.advanced_interface": "Opne i avansert nettgrensesnitt",
   "navigation_bar.blocks": "Blokkerte brukarar",
@@ -816,11 +813,6 @@
   "time_remaining.minutes": "{number, plural, one {# minutt} other {# minutt}} igjen",
   "time_remaining.moments": "Kort tid igjen",
   "time_remaining.seconds": "{number, plural, one {# sekund} other {# sekund}} igjen",
-  "timeline_hint.remote_resource_not_displayed": "{resource} frå andre tenarar blir ikkje vist.",
-  "timeline_hint.resources.followers": "Fylgjarar",
-  "timeline_hint.resources.follows": "Fylgjer",
-  "timeline_hint.resources.replies": "Nokre svar",
-  "timeline_hint.resources.statuses": "Eldre tut",
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} folk}} siste {days, plural, one {døgnet} other {{days} dagane}}",
   "trends.trending_now": "Populært no",
   "ui.beforeunload": "Kladden din forsvinn om du forlèt Mastodon no.",
diff --git a/app/javascript/mastodon/locales/no.json b/app/javascript/mastodon/locales/no.json
index 4657a1ac42c985..a81d9932d6ca33 100644
--- a/app/javascript/mastodon/locales/no.json
+++ b/app/javascript/mastodon/locales/no.json
@@ -18,7 +18,6 @@
   "account.block_domain": "Blokker domenet {domain}",
   "account.block_short": "Blokker",
   "account.blocked": "Blokkert",
-  "account.browse_more_on_origin_server": "Bla mer på den opprinnelige profilen",
   "account.cancel_follow_request": "Avbryt følgeforespørselen",
   "account.copy": "Kopier lenke til profil",
   "account.direct": "Nevn @{name} privat",
@@ -668,10 +667,6 @@
   "time_remaining.minutes": "{number, plural, one {# minutt} other {# minutter}} igjen",
   "time_remaining.moments": "Gjenværende øyeblikk",
   "time_remaining.seconds": "{number, plural, one {# sekund} other {# sekunder}} igjen",
-  "timeline_hint.remote_resource_not_displayed": "{resource} fra andre servere vises ikke.",
-  "timeline_hint.resources.followers": "Følgere",
-  "timeline_hint.resources.follows": "Følger",
-  "timeline_hint.resources.statuses": "Eldre innlegg",
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} folk}} {days, plural, one {den siste dagen} other {de siste {days} dagene}}",
   "trends.trending_now": "Trender nå",
   "ui.beforeunload": "Din kladd vil bli forkastet om du forlater Mastodon.",
diff --git a/app/javascript/mastodon/locales/oc.json b/app/javascript/mastodon/locales/oc.json
index 56814f6f85b655..b21947009873da 100644
--- a/app/javascript/mastodon/locales/oc.json
+++ b/app/javascript/mastodon/locales/oc.json
@@ -15,7 +15,6 @@
   "account.block_domain": "Tot amagar del domeni {domain}",
   "account.block_short": "Blocar",
   "account.blocked": "Blocat",
-  "account.browse_more_on_origin_server": "Navigar sul perfil original",
   "account.cancel_follow_request": "Retirar la demanda d’abonament",
   "account.copy": "Copiar lo ligam del perfil",
   "account.direct": "Mencionar @{name} en privat",
@@ -560,10 +559,6 @@
   "time_remaining.minutes": "demòra{number, plural, one { # minuta} other {n # minutas}}",
   "time_remaining.moments": "Moments restants",
   "time_remaining.seconds": "demòra{number, plural, one { # segonda} other {n # segondas}}",
-  "timeline_hint.remote_resource_not_displayed": "{resource} suls autres servidors son pas afichats.",
-  "timeline_hint.resources.followers": "Seguidors",
-  "timeline_hint.resources.follows": "Abonaments",
-  "timeline_hint.resources.statuses": "Tuts mai ancians",
   "trends.counter_by_accounts": "{count, plural, one {{counter} persona} other {{counter} personas}} dins los darrièrs {days, plural, one {jorn} other {{days} jorns}}",
   "trends.trending_now": "Tendéncia del moment",
   "ui.beforeunload": "Vòstre brolhon serà perdut se quitatz Mastodon.",
diff --git a/app/javascript/mastodon/locales/pa.json b/app/javascript/mastodon/locales/pa.json
index 83ded408ecebbb..7298227e6dc5b3 100644
--- a/app/javascript/mastodon/locales/pa.json
+++ b/app/javascript/mastodon/locales/pa.json
@@ -349,9 +349,6 @@
   "subscribed_languages.save": "ਤਬਦੀਲੀਆਂ ਸੰਭਾਲੋ",
   "tabs_bar.home": "ਘਰ",
   "tabs_bar.notifications": "ਸੂਚਨਾਵਾਂ",
-  "timeline_hint.resources.followers": "ਫ਼ਾਲੋਅਰ",
-  "timeline_hint.resources.follows": "ਫ਼ਾਲੋ",
-  "timeline_hint.resources.statuses": "ਪੂਰਾਣੀਆਂ ਪੋਸਟਾਂ",
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {# days}}",
   "units.short.billion": "{count}ਿਬ",
   "units.short.million": "{count}ਮਿ",
diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json
index adbdedb78007e4..48f9ee1e896406 100644
--- a/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@@ -19,7 +19,6 @@
   "account.block_domain": "Blokuj wszystko z {domain}",
   "account.block_short": "Zablokuj",
   "account.blocked": "Zablokowany(-a)",
-  "account.browse_more_on_origin_server": "Zobacz więcej na oryginalnym profilu",
   "account.cancel_follow_request": "Wycofaj żądanie obserwowania",
   "account.copy": "Skopiuj odnośnik do profilu",
   "account.direct": "Prywatna wzmianka @{name}",
@@ -349,6 +348,14 @@
   "hashtag.follow": "Obserwuj hasztag",
   "hashtag.unfollow": "Przestań obserwować hashtag",
   "hashtags.and_other": "…i {count, plural, other {jeszcze #}}",
+  "hints.profiles.followers_may_be_missing": "Może brakować niektórych obserwujących tego profilu.",
+  "hints.profiles.follows_may_be_missing": "Może brakować niektórych obserwowanych przez tego użytkownika.",
+  "hints.profiles.posts_may_be_missing": "Może brakować niektórych wpisów tego profilu.",
+  "hints.profiles.see_more_followers": "Zobacz wszystkich obserwujących na {domain}",
+  "hints.profiles.see_more_follows": "Zobacz wszystkich obserwowanych na {domain}",
+  "hints.profiles.see_more_posts": "Zobacz wszystkie wpisy na {domain}",
+  "hints.threads.replies_may_be_missing": "Może brakować odpowiedzi z innych serwerów.",
+  "hints.threads.see_more": "Zobacz wszystkie odpowiedzi na {domain}",
   "home.column_settings.show_reblogs": "Pokazuj podbicia",
   "home.column_settings.show_replies": "Pokazuj odpowiedzi",
   "home.hide_announcements": "Ukryj ogłoszenia",
@@ -456,8 +463,6 @@
   "mute_modal.title": "Wyciszyć użytkownika?",
   "mute_modal.you_wont_see_mentions": "Nie zobaczysz wpisów, które wspominają tego użytkownika.",
   "mute_modal.you_wont_see_posts": "Użytkownik dalej będzie widzieć Twoje posty, ale Ty nie będziesz widzieć jego.",
-  "name_and_others": "{name} i {count, plural, one {# inny} few {# inne} many {# innych} other {# innych}}",
-  "name_and_others_with_link": "{name} i <a>{count, plural, one {# inny} few {# inne} many {# innych} other {# innych}}</a>",
   "navigation_bar.about": "O serwerze",
   "navigation_bar.advanced_interface": "Otwórz w zaawansowanym interfejsie użytkownika",
   "navigation_bar.blocks": "Zablokowani użytkownicy",
@@ -490,9 +495,13 @@
   "notification.admin.report_statuses": "{name} zgłosił(a) {target} w kategorii {category}",
   "notification.admin.report_statuses_other": "{name} zgłosił(a) {target}",
   "notification.admin.sign_up": "Użytkownik {name} zarejestrował się",
+  "notification.admin.sign_up.name_and_others": "zarejestrował(-a) się {name} i {count, plural, one {# inna osoba} few {# inne osoby}  other {# innych osób}}",
   "notification.favourite": "{name} dodaje Twój wpis do ulubionych",
+  "notification.favourite.name_and_others_with_link": "{name} i <a>{count, plural, one {# inna osoba</a> polubiła twój wpis} few {# inne osoby</a> polubiły twój wpis} other {# innych osób</a> polubiło twój wpis}}",
   "notification.follow": "{name} obserwuje Cię",
+  "notification.follow.name_and_others": "{name} i {count, plural, one {# inna osoba cię zaobserwowała} few {# inne osoby cię zaobserwowały} other {# innych osób cię zaobserwowało}}",
   "notification.follow_request": "{name} chce cię zaobserwować",
+  "notification.follow_request.name_and_others": "{name} i {count, plural, one {# inna osoba chce} few {# inne osoby chcą} other {# innych osób chce}} zaobserwować twój profil",
   "notification.label.mention": "Wzmianka",
   "notification.label.private_mention": "Prywatna wzmianka",
   "notification.label.private_reply": "Odpowiedź prywatna",
@@ -510,6 +519,7 @@
   "notification.own_poll": "Twoje głosowanie zakończyło się",
   "notification.poll": "Głosowanie, w którym brałeś(-aś) udział, zostało zakończone",
   "notification.reblog": "Twój post został podbity przez {name}",
+  "notification.reblog.name_and_others_with_link": "{name} i <a>{count, plural, one {# inna osoba</a> podbiła twój wpis} few {# inne osoby</a> podbiły twój wpis} other {# innych osób</a> podbiło twój wpis}}",
   "notification.relationships_severance_event": "Utracone związki z {name}",
   "notification.relationships_severance_event.account_suspension": "Administrator z {from} zawiesił {target}, więc nie dostaniesz wieści ani nie wejdziesz w interakcje z użytkownikami z tego serwera.",
   "notification.relationships_severance_event.domain_block": "Administrator z {from} zablokował {target}, w tym {followersCount} z Twoich obserwujących i {followingCount, plural, one {# konto} other {# konta}} które obserwujesz.",
@@ -825,11 +835,6 @@
   "time_remaining.minutes": "{number, plural, one {Pozostała # minuta} few {Pozostały # minuty} many {Pozostało # minut} other {Pozostało # minut}}",
   "time_remaining.moments": "Pozostała chwila",
   "time_remaining.seconds": "{number, plural, one {Pozostała # sekunda} few {Pozostały # sekundy} many {Pozostało # sekund} other {Pozostało # sekund}}",
-  "timeline_hint.remote_resource_not_displayed": "{resource} z innych serwerów nie są wyświetlane.",
-  "timeline_hint.resources.followers": "Obserwujący",
-  "timeline_hint.resources.follows": "Obserwowani",
-  "timeline_hint.resources.replies": "Niektóre odpowiedzi",
-  "timeline_hint.resources.statuses": "Starsze wpisy",
   "trends.counter_by_accounts": "{count, plural, one {jedna osoba} few {{count} osoby} many {{count} osób} other {{counter} ludzie}} w ciągu {days, plural, one {ostatniego dnia} other {ostatnich {days} dni}}",
   "trends.trending_now": "Popularne teraz",
   "ui.beforeunload": "Utracisz tworzony wpis, jeżeli opuścisz Mastodona.",
diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json
index 9f38f0b51a2aa1..b14c6ce49b3c1b 100644
--- a/app/javascript/mastodon/locales/pt-BR.json
+++ b/app/javascript/mastodon/locales/pt-BR.json
@@ -18,7 +18,6 @@
   "account.block_domain": "Bloquear domínio {domain}",
   "account.block_short": "Bloquear",
   "account.blocked": "Bloqueado",
-  "account.browse_more_on_origin_server": "Veja mais no perfil original",
   "account.cancel_follow_request": "Cancelar solicitação para seguir",
   "account.copy": "Copiar link do perfil",
   "account.direct": "Mencione em privado @{name}",
@@ -446,8 +445,6 @@
   "mute_modal.title": "Silenciar usuário?",
   "mute_modal.you_wont_see_mentions": "Você não verá publicações que os mencionem.",
   "mute_modal.you_wont_see_posts": "Eles ainda poderão ver suas publicações, mas você não verá as deles.",
-  "name_and_others": "{name} e {count, plural, one {# outro} other {# outros}}",
-  "name_and_others_with_link": "{name} e <a>{count, plural, one {# outro} other {# outros}}</a>",
   "navigation_bar.about": "Sobre",
   "navigation_bar.advanced_interface": "Ativar na interface web avançada",
   "navigation_bar.blocks": "Usuários bloqueados",
@@ -780,10 +777,6 @@
   "time_remaining.minutes": "{number, plural, one {# minuto restante} other {# minutos restantes}}",
   "time_remaining.moments": "Momentos restantes",
   "time_remaining.seconds": "{number, plural, one {# segundo restante} other {# segundos restantes}}",
-  "timeline_hint.remote_resource_not_displayed": "{resource} de outros servidores não são mostrados.",
-  "timeline_hint.resources.followers": "Seguidores",
-  "timeline_hint.resources.follows": "Segue",
-  "timeline_hint.resources.statuses": "Toots anteriores",
   "trends.counter_by_accounts": "{count, plural, one {{counter} pessoa} other {{counter} pessoas}} no(s) último(s) {days, plural, one {dia} other {{days} dias}}",
   "trends.trending_now": "Em alta agora",
   "ui.beforeunload": "Seu rascunho será perdido se sair do Mastodon.",
diff --git a/app/javascript/mastodon/locales/pt-PT.json b/app/javascript/mastodon/locales/pt-PT.json
index 8736f53baa4e66..e084beea2833ee 100644
--- a/app/javascript/mastodon/locales/pt-PT.json
+++ b/app/javascript/mastodon/locales/pt-PT.json
@@ -19,7 +19,6 @@
   "account.block_domain": "Bloquear domínio {domain}",
   "account.block_short": "Bloquear",
   "account.blocked": "Bloqueado(a)",
-  "account.browse_more_on_origin_server": "Encontrar mais no perfil original",
   "account.cancel_follow_request": "Retirar pedido para seguir",
   "account.copy": "Copiar hiperligação para o perfil",
   "account.direct": "Mencionar @{name} em privado",
@@ -445,8 +444,6 @@
   "mute_modal.title": "Silenciar utilizador?",
   "mute_modal.you_wont_see_mentions": "Não verá publicações que os mencionem.",
   "mute_modal.you_wont_see_posts": "Eles podem continuar a ver as suas publicações, mas você não verá as deles.",
-  "name_and_others": "{name} e {count, plural, one {# outro} other {# outros}}",
-  "name_and_others_with_link": "{name} e <a>{count, plural, one {# outro} other {# outros}}</a>",
   "navigation_bar.about": "Sobre",
   "navigation_bar.advanced_interface": "Abrir na interface web avançada",
   "navigation_bar.blocks": "Utilizadores bloqueados",
@@ -797,10 +794,6 @@
   "time_remaining.minutes": "{número, plural, um {# minute} outro {# minutes}} faltam",
   "time_remaining.moments": "Momentos restantes",
   "time_remaining.seconds": "{número, plural, um {# second} outro {# seconds}} faltam",
-  "timeline_hint.remote_resource_not_displayed": "{resource} de outros servidores não são exibidos.",
-  "timeline_hint.resources.followers": "Seguidores",
-  "timeline_hint.resources.follows": "Seguindo",
-  "timeline_hint.resources.statuses": "Publicações mais antigas",
   "trends.counter_by_accounts": "{count, plural, one {{counter} pessoa} other {{counter} pessoas}} {days, plural, one {no último dia} other {nos últimos {days} dias}}",
   "trends.trending_now": "Em alta neste momento",
   "ui.beforeunload": "O teu rascunho será perdido se abandonares o Mastodon.",
diff --git a/app/javascript/mastodon/locales/ro.json b/app/javascript/mastodon/locales/ro.json
index 6bb90dcd2354e2..21e93510ced5d1 100644
--- a/app/javascript/mastodon/locales/ro.json
+++ b/app/javascript/mastodon/locales/ro.json
@@ -18,7 +18,6 @@
   "account.block_domain": "Blochează domeniul {domain}",
   "account.block_short": "Blochează",
   "account.blocked": "Blocat",
-  "account.browse_more_on_origin_server": "Vezi mai multe pe profilul original",
   "account.cancel_follow_request": "Retrage cererea de urmărire",
   "account.copy": "Copiază link-ul profilului",
   "account.direct": "Menționează pe @{name} în privat",
@@ -610,10 +609,6 @@
   "time_remaining.minutes": "{number, plural, one {un minut rămas} few {# minute rămase} other {# de minute rămase}}",
   "time_remaining.moments": "Momente rămase",
   "time_remaining.seconds": "{number, plural, one {o secundă rămasă} few {# secunde rămase} other {# de secunde rămase}}",
-  "timeline_hint.remote_resource_not_displayed": "{resource} de la alte servere nu sunt afișate.",
-  "timeline_hint.resources.followers": "Urmăritori",
-  "timeline_hint.resources.follows": "Urmăriri",
-  "timeline_hint.resources.statuses": "Postări mai vechi",
   "trends.counter_by_accounts": "{count, plural, one {o persoană} few {{counter} persoane} other {{counter} de persoane}} în {days, plural, one {ultima zi} few {ultimele {days} zile} other {ultimele {days} de zile}}",
   "trends.trending_now": "În tendință acum",
   "ui.beforeunload": "Postarea se va pierde dacă părăsești pagina.",
diff --git a/app/javascript/mastodon/locales/ru.json b/app/javascript/mastodon/locales/ru.json
index 8fc4b0a127e865..642550369ae896 100644
--- a/app/javascript/mastodon/locales/ru.json
+++ b/app/javascript/mastodon/locales/ru.json
@@ -19,7 +19,6 @@
   "account.block_domain": "Заблокировать {domain}",
   "account.block_short": "Блокировать",
   "account.blocked": "Заблокировано",
-  "account.browse_more_on_origin_server": "Посмотреть в оригинальном профиле",
   "account.cancel_follow_request": "Отозвать запрос на подписку",
   "account.copy": "Скопировать ссылку на профиль",
   "account.direct": "Лично упоминать @{name}",
@@ -769,10 +768,6 @@
   "time_remaining.minutes": "{number, plural, one {осталась # минута} few {осталось # минуты} many {осталось # минут} other {осталось # минут}}",
   "time_remaining.moments": "остались считанные мгновения",
   "time_remaining.seconds": "{number, plural, one {# секунда} many {# секунд} other {# секунды}}",
-  "timeline_hint.remote_resource_not_displayed": "Мы не отображаем {resource} с других серверов.",
-  "timeline_hint.resources.followers": "подписчиков",
-  "timeline_hint.resources.follows": "подписки",
-  "timeline_hint.resources.statuses": "прошлые посты",
   "trends.counter_by_accounts": "{count, plural, few {{counter} человека} other {{counter} человек}} за {days, plural, one {последний день} few {последние {days} дня} other {последние {days} дней}}",
   "trends.trending_now": "Самое актуальное",
   "ui.beforeunload": "Ваш черновик будет утерян, если вы покинете Mastodon.",
diff --git a/app/javascript/mastodon/locales/ry.json b/app/javascript/mastodon/locales/ry.json
index a53394dc5a224c..b33b95fe51c04b 100644
--- a/app/javascript/mastodon/locales/ry.json
+++ b/app/javascript/mastodon/locales/ry.json
@@ -18,7 +18,6 @@
   "account.block_domain": "Заблоковати домен {domain}",
   "account.block_short": "Заблоковати",
   "account.blocked": "Заблоковано",
-  "account.browse_more_on_origin_server": "Позирайте бульше на ориґіналнум профілю",
   "account.cancel_follow_request": "Удмінити пудписку",
   "account.copy": "Зкопіровати удкликованя на профіл",
   "account.direct": "Пошептати @{name}",
@@ -125,6 +124,8 @@
   "column_header.show_settings": "Указати штімованя",
   "column_header.unpin": "Удкріпити",
   "column_subheading.settings": "Штімованя",
+  "community.column_settings.local_only": "Лем локалноє",
+  "community.column_settings.media_only": "Лем медіа",
   "compose.language.change": "Поміняти язык",
   "compose.language.search": "Глядати языкы...",
   "compose.published.body": "Пост опубликованый.",
@@ -146,6 +147,7 @@
   "compose_form.publish": "Публикація",
   "compose_form.publish_form": "Нова публикація",
   "compose_form.reply": "Удповідь",
+  "compose_form.save_changes": "Усокотити",
   "copypaste.copy_to_clipboard": "Копіровати у памнять",
   "directory.recently_active": "Недавно актівні",
   "disabled_account_banner.account_settings": "Штімованя акаунта",
diff --git a/app/javascript/mastodon/locales/sa.json b/app/javascript/mastodon/locales/sa.json
index 5e0b3e2b7a5de4..11b428f064b79a 100644
--- a/app/javascript/mastodon/locales/sa.json
+++ b/app/javascript/mastodon/locales/sa.json
@@ -17,7 +17,6 @@
   "account.block": "अवरुध्यताम् @{name}",
   "account.block_domain": "अवरुध्यतां प्रदेशः {domain}",
   "account.blocked": "अवरुद्धम्",
-  "account.browse_more_on_origin_server": "अधिकं मूलव्यक्तिगतविवरणे दृश्यताम्",
   "account.cancel_follow_request": "अनुसरणयाचनामपनय",
   "account.direct": "गोपनीयरूपेण उल्लेखित-@{name}",
   "account.disable_notifications": "यदा @{name} स्थापयति तदा माम्मा ज्ञापय",
@@ -525,7 +524,6 @@
   "status.reblogs.empty": "न केनापि पत्रमिदं बुस्त्कृतम्। यदा कोऽपि करोति, तानि इह दृश्यन्ते।",
   "status.redraft": "मार्जय पुनश्च लिख्यताम्",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
-  "timeline_hint.resources.statuses": "पूरातनपत्राणि",
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {# days}}",
   "upload_form.audio_description": "Describe for people with hearing loss",
   "upload_form.description": "Describe for the visually impaired",
diff --git a/app/javascript/mastodon/locales/sc.json b/app/javascript/mastodon/locales/sc.json
index 8c08d4e54e2440..5f099240743cf3 100644
--- a/app/javascript/mastodon/locales/sc.json
+++ b/app/javascript/mastodon/locales/sc.json
@@ -19,7 +19,6 @@
   "account.block_domain": "Bloca su domìniu {domain}",
   "account.block_short": "Bloca",
   "account.blocked": "Blocadu",
-  "account.browse_more_on_origin_server": "Esplora de prus in su profilu originale",
   "account.cancel_follow_request": "Annulla sa sighidura",
   "account.copy": "Còpia su ligòngiu a su profilu",
   "account.direct": "Mèntova a @{name} in privadu",
@@ -586,10 +585,6 @@
   "time_remaining.minutes": "{number, plural, one {abarrat # minutu} other {abarrant # minutos}}",
   "time_remaining.moments": "Abarrant pagu momentos",
   "time_remaining.seconds": "{number, plural, one {abarrat # segundu} other {abarrant # segundos}}",
-  "timeline_hint.remote_resource_not_displayed": "Is {resource} dae àteros serbidores non benint ammustradas.",
-  "timeline_hint.resources.followers": "Sighiduras",
-  "timeline_hint.resources.follows": "Sighende",
-  "timeline_hint.resources.statuses": "Publicatziones prus betzas",
   "trends.counter_by_accounts": "{count, plural, one {{counter} persone} other {{counter} persones}} in {days, plural, one {s'ùrtima die} other {{days} is ùrtimas dies}}",
   "trends.trending_now": "Est tendèntzia immoe",
   "ui.beforeunload": "S'abbotzu tuo at a èssere pèrdidu si essis dae Mastodon.",
diff --git a/app/javascript/mastodon/locales/sco.json b/app/javascript/mastodon/locales/sco.json
index 5aa5cd418559b7..191bcbd3e03d9a 100644
--- a/app/javascript/mastodon/locales/sco.json
+++ b/app/javascript/mastodon/locales/sco.json
@@ -17,7 +17,6 @@
   "account.block": "Dingie @{name}",
   "account.block_domain": "Dingie domain {domain}",
   "account.blocked": "Dingied",
-  "account.browse_more_on_origin_server": "Luik mair oan the oreeginal profile",
   "account.cancel_follow_request": "Resile follae requeest",
   "account.disable_notifications": "Stap notifyin me whan @{name} posts",
   "account.domain_blocked": "Domain dingied",
@@ -524,10 +523,6 @@
   "time_remaining.minutes": "{number, plural, one {# minute} other {# minties}} left",
   "time_remaining.moments": "Moments remainin",
   "time_remaining.seconds": "{number, plural, one {# saicont} other {# saiconts}} left",
-  "timeline_hint.remote_resource_not_displayed": "{resource} fae ither servers urnae displayed.",
-  "timeline_hint.resources.followers": "Follaers",
-  "timeline_hint.resources.follows": "Follaes",
-  "timeline_hint.resources.statuses": "Aulder posts",
   "trends.counter_by_accounts": "{count, plural, one {{counter} body} other {{counter} fowk}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "Trendin noo",
   "ui.beforeunload": "Yer draft wull be lost if ye lea Mastodon.",
diff --git a/app/javascript/mastodon/locales/si.json b/app/javascript/mastodon/locales/si.json
index bb5fcc5e9b09d6..ce48fbaa8c3695 100644
--- a/app/javascript/mastodon/locales/si.json
+++ b/app/javascript/mastodon/locales/si.json
@@ -11,7 +11,6 @@
   "account.block_domain": "{domain} වසම අවහිර කරන්න",
   "account.block_short": "අවහිර",
   "account.blocked": "අවහිර කර ඇත",
-  "account.browse_more_on_origin_server": "මුල් පැතිකඩෙහි තවත් පිරික්සන්න",
   "account.disable_notifications": "@{name} පළ කරන විට මට දැනුම් නොදෙන්න",
   "account.domain_blocked": "වසම අවහිර කර ඇත",
   "account.edit_profile": "පැතිකඩ සංස්කරණය",
@@ -455,10 +454,6 @@
   "time_remaining.hours": "{number, plural, one {පැය #} other {පැය #}} ක් ඉතිරිය",
   "time_remaining.minutes": "{number, plural, one {විනාඩි #} other {විනාඩි #}} ක් ඉතිරිය",
   "time_remaining.seconds": "{number, plural, one {තත්පර #} other {තත්පර #}} ක් ඉතිරිය",
-  "timeline_hint.remote_resource_not_displayed": "වෙනත් සේවාදායකයන්ගෙන් {resource} දර්ශනය නොවේ.",
-  "timeline_hint.resources.followers": "අනුගාමිකයින්",
-  "timeline_hint.resources.follows": "අනුගමන",
-  "timeline_hint.resources.statuses": "පරණ ලිපි",
   "trends.trending_now": "දැන් නැගී එන",
   "ui.beforeunload": "ඔබ මාස්ටඩන් හැර ගියහොත් කටුපිටපත අහිමි වේ.",
   "units.short.billion": "{count}බී",
diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json
index 7ac05ea980d927..babb6e3054e15f 100644
--- a/app/javascript/mastodon/locales/sk.json
+++ b/app/javascript/mastodon/locales/sk.json
@@ -19,7 +19,6 @@
   "account.block_domain": "Blokovať doménu {domain}",
   "account.block_short": "Blokovať",
   "account.blocked": "Účet blokovaný",
-  "account.browse_more_on_origin_server": "Zobraziť viac na pôvodnom profile",
   "account.cancel_follow_request": "Zrušiť žiadosť o sledovanie",
   "account.copy": "Skopírovať odkaz na profil",
   "account.direct": "Súkromne označiť @{name}",
@@ -745,10 +744,6 @@
   "time_remaining.minutes": "Ostáva{number, plural, one { # minúta} few {jú # minúty} many { # minút} other { # minút}}",
   "time_remaining.moments": "Ostáva už iba chviľka",
   "time_remaining.seconds": "Ostáva{number, plural, one { # sekunda} few {jú # sekundy} many { # sekúnd} other { # sekúnd}}",
-  "timeline_hint.remote_resource_not_displayed": "{resource} z iných serverov sa nezobrazia.",
-  "timeline_hint.resources.followers": "Sledujúci",
-  "timeline_hint.resources.follows": "Sledovaní",
-  "timeline_hint.resources.statuses": "Staršie príspevky",
   "trends.counter_by_accounts": "{count, plural, one {{counter} osoba} few {{counter} ľudia} many {{counter} ľudí} other {{counter} ľudí}} za posledn{days, plural, one {ý deň} few {é {days} dni} many {ých {days} dní} other {ých {days} dní}}",
   "trends.trending_now": "Teraz populárne",
   "ui.beforeunload": "Po opustení Mastodonu prídete o to, čo máte rozpísané.",
diff --git a/app/javascript/mastodon/locales/sl.json b/app/javascript/mastodon/locales/sl.json
index 932d9524df96bb..9bbbcc5978fe30 100644
--- a/app/javascript/mastodon/locales/sl.json
+++ b/app/javascript/mastodon/locales/sl.json
@@ -19,7 +19,6 @@
   "account.block_domain": "Blokiraj domeno {domain}",
   "account.block_short": "Blokiraj",
   "account.blocked": "Blokirano",
-  "account.browse_more_on_origin_server": "Brskaj več po izvirnem profilu",
   "account.cancel_follow_request": "Umakni zahtevo za sledenje",
   "account.copy": "Kopiraj povezavo do profila",
   "account.direct": "Zasebno omeni @{name}",
@@ -447,8 +446,6 @@
   "mute_modal.title": "Utišaj uporabnika?",
   "mute_modal.you_wont_see_mentions": "Objav, ki jih omenjajo, ne boste videli.",
   "mute_modal.you_wont_see_posts": "Še vedno vidijo vaše objave, vi pa ne njihovih.",
-  "name_and_others": "{name} in {count, plural, one {# drug} two {# druga} few {# drugi} other {# drugih}}",
-  "name_and_others_with_link": "{name} in <a>{count, plural, one {# drug} two {# druga} few {# drugi} other {# drugih}}</a>",
   "navigation_bar.about": "O Mastodonu",
   "navigation_bar.advanced_interface": "Odpri v naprednem spletnem vmesniku",
   "navigation_bar.blocks": "Blokirani uporabniki",
@@ -800,11 +797,6 @@
   "time_remaining.minutes": "{number, plural, one {# minuta} other {# minut}} je ostalo",
   "time_remaining.moments": "Preostali trenutki",
   "time_remaining.seconds": "{number, plural, one {# sekunda je preostala} two {# sekundi sta preostali} few {# sekunde so preostale} other {# sekund je preostalo}}",
-  "timeline_hint.remote_resource_not_displayed": "{resource} z drugih strežnikov ni prikazano.",
-  "timeline_hint.resources.followers": "sledilcev",
-  "timeline_hint.resources.follows": "Sledi",
-  "timeline_hint.resources.replies": "Nekaj odgovorov",
-  "timeline_hint.resources.statuses": "Starejše objave",
   "trends.counter_by_accounts": "{count, plural, one {{count} oseba} two {{count} osebi} few {{count} osebe} other {{count} oseb}} v {days, plural, one {zadnjem {day} dnevu} two {zadnjih {days} dneh} few {zadnjih {days} dneh} other {zadnjih {days} dneh}}",
   "trends.trending_now": "Zdaj v trendu",
   "ui.beforeunload": "Vaš osnutek bo izgubljen, če zapustite Mastodona.",
diff --git a/app/javascript/mastodon/locales/sq.json b/app/javascript/mastodon/locales/sq.json
index 3dc3c00c092ebe..904955f422ab34 100644
--- a/app/javascript/mastodon/locales/sq.json
+++ b/app/javascript/mastodon/locales/sq.json
@@ -19,7 +19,6 @@
   "account.block_domain": "Blloko përkatësinë {domain}",
   "account.block_short": "Bllokoje",
   "account.blocked": "E bllokuar",
-  "account.browse_more_on_origin_server": "Shfletoni më tepër rreth profilit origjinal",
   "account.cancel_follow_request": "Tërhiq mbrapsht kërkesë për ndjekje",
   "account.copy": "Kopjoje lidhjen te profili",
   "account.direct": "Përmendje private për @{name}",
@@ -349,6 +348,14 @@
   "hashtag.follow": "Ndiqe hashtag-un",
   "hashtag.unfollow": "Hiqe ndjekjen e hashtag-ut",
   "hashtags.and_other": "…dhe {count, plural, one {}other {# më tepër}}",
+  "hints.profiles.followers_may_be_missing": "Mund të mungojnë ndjekës për këtë profil.",
+  "hints.profiles.follows_may_be_missing": "Mund të mungojnë ndjekje për këtë profil.",
+  "hints.profiles.posts_may_be_missing": "Mund të mungojnë disa postime prej këtij profili.",
+  "hints.profiles.see_more_followers": "Shihni më tepër ndjekës në {domain}",
+  "hints.profiles.see_more_follows": "Shihni më tepër ndjekje në {domain}",
+  "hints.profiles.see_more_posts": "Shihni më tepër postime në {domain}",
+  "hints.threads.replies_may_be_missing": "Mund të mungojnë përgjigje nga shërbyes të tjerë.",
+  "hints.threads.see_more": "Shihni më tepër përgjigje në {domain}",
   "home.column_settings.show_reblogs": "Shfaq përforcime",
   "home.column_settings.show_replies": "Shfaq përgjigje",
   "home.hide_announcements": "Fshihi lajmërimet",
@@ -456,8 +463,6 @@
   "mute_modal.title": "Të heshtohet përdoruesi?",
   "mute_modal.you_wont_see_mentions": "S’do të shihni postime ku përmenden.",
   "mute_modal.you_wont_see_posts": "Ata munden ende të shohin postimet tuaja, por ju s’do të shihni të tyret.",
-  "name_and_others": "{name} dhe {count, plural, one {# tjetër} other {# të tjerë}}",
-  "name_and_others_with_link": "{name} dhe <a>{count, plural, one {# tjetër} other {# të tjerë}}</a>",
   "navigation_bar.about": "Mbi",
   "navigation_bar.advanced_interface": "Hape në ndërfaqe web të thelluar",
   "navigation_bar.blocks": "Përdorues të bllokuar",
@@ -490,9 +495,13 @@
   "notification.admin.report_statuses": "{name} raportoi {target} për {category}",
   "notification.admin.report_statuses_other": "{name} raportoi {target}",
   "notification.admin.sign_up": "{name} u regjistrua",
+  "notification.admin.sign_up.name_and_others": "U regjistrua {name} dhe {count, plural, one {# tjetër} other {# të tjerë}}",
   "notification.favourite": "{name} i vuri shenjë postimit tuaj si të parapëlqyer",
+  "notification.favourite.name_and_others_with_link": "{name} dhe <a>{count, plural, one {# tjetër} other {# të tjerë}}</a> i vunë shenjë postimit tuaj si të parapëlqyer",
   "notification.follow": "{name} zuri t’ju ndjekë",
+  "notification.follow.name_and_others": "Ju ndoqi {name} dhe {count, plural, one {# tjetër} other {# të tjerë}}",
   "notification.follow_request": "{name} ka kërkuar t’ju ndjekë",
+  "notification.follow_request.name_and_others": "Ka kërkuar t’ju ndjekë {name} dhe {count, plural, one {# tjetër} other {# të tjerë}}",
   "notification.label.mention": "Përmendje",
   "notification.label.private_mention": "Përmendje private",
   "notification.label.private_reply": "Përgjigje private",
@@ -510,6 +519,7 @@
   "notification.own_poll": "Pyetësori juaj ka përfunduar",
   "notification.poll": "Ka përfunduar një pyetësor në të cilin keni marrë pjesë",
   "notification.reblog": "{name} përforcoi mesazhin tuaj",
+  "notification.reblog.name_and_others_with_link": "Ju ka përforcuar {name} dhe <a>{count, plural, one {# tjetër} other {# të tjerë}}</a>",
   "notification.relationships_severance_event": "Lidhje të humbura me {name}",
   "notification.relationships_severance_event.account_suspension": "Një përgjegjës nga {from} ka pezulluar {target}, që do të thotë se s’mund të merrni më përditësime prej tij, apo të ndërveproni me të.",
   "notification.relationships_severance_event.domain_block": "Një përgjegjës nga {from} ka bllokuar {target}, përfshi {followersCount} të ndjekësve tuaj dhe {followingCount, plural, one {# llogari} other {# llogari}} që ndiqni.",
@@ -826,11 +836,6 @@
   "time_remaining.minutes": "Edhe {number, plural, one {# minutë} other {# minuta}}",
   "time_remaining.moments": "Çaste të mbetur",
   "time_remaining.seconds": "Edhe {number, plural, one {# sekondë} other {# sekonda}}",
-  "timeline_hint.remote_resource_not_displayed": "S’janë shfaqur {resource} nga shërbyes të tjerë.",
-  "timeline_hint.resources.followers": "Ndjekës",
-  "timeline_hint.resources.follows": "Ndjekje",
-  "timeline_hint.resources.replies": "Disa përgjigje",
-  "timeline_hint.resources.statuses": "Mesazhe të vjetër",
   "trends.counter_by_accounts": "{count, plural, një {{counter} person} other {{counter} vetë}} në {days, plural, një {day} other {{days} ditë}} të kaluar",
   "trends.trending_now": "Prirjet e tashme",
   "ui.beforeunload": "Skica juaj do të humbë, nëse dilni nga Mastodon-i.",
diff --git a/app/javascript/mastodon/locales/sr-Latn.json b/app/javascript/mastodon/locales/sr-Latn.json
index 5d890242cfc187..b82445cf97edbd 100644
--- a/app/javascript/mastodon/locales/sr-Latn.json
+++ b/app/javascript/mastodon/locales/sr-Latn.json
@@ -18,7 +18,6 @@
   "account.block_domain": "Blokiraj domen {domain}",
   "account.block_short": "Blokiraj",
   "account.blocked": "Blokiran",
-  "account.browse_more_on_origin_server": "Pregledajte još na originalnom profilu",
   "account.cancel_follow_request": "Otkaži praćenje",
   "account.copy": "Kopiraj vezu u profil",
   "account.direct": "Privatno pomeni @{name}",
@@ -763,10 +762,6 @@
   "time_remaining.minutes": "Ostalo {number, plural, one {# minut} few {# minuta} other {# minuta}}",
   "time_remaining.moments": "Još nekoliko trenutaka",
   "time_remaining.seconds": "Ostalo {number, plural, one {# sekund} few {# sekunde} other {# sekundi}}",
-  "timeline_hint.remote_resource_not_displayed": "{resource} sa drugih servera se ne prikazuju.",
-  "timeline_hint.resources.followers": "Pratioci",
-  "timeline_hint.resources.follows": "Praćenja",
-  "timeline_hint.resources.statuses": "Starije objave",
   "trends.counter_by_accounts": "{count, plural, one {{counter} osoba} few {{counter} osobe} other {{counter} osoba}} u proteklih {days, plural, one {dan} other {{days} dana}}",
   "trends.trending_now": "U trendu sada",
   "ui.beforeunload": "Vaš nacrt će biti izgubljen ako napustite Mastodon.",
diff --git a/app/javascript/mastodon/locales/sr.json b/app/javascript/mastodon/locales/sr.json
index 25c3a37b229a04..604a4e81d4d386 100644
--- a/app/javascript/mastodon/locales/sr.json
+++ b/app/javascript/mastodon/locales/sr.json
@@ -18,7 +18,6 @@
   "account.block_domain": "Блокирај домен {domain}",
   "account.block_short": "Блокирај",
   "account.blocked": "Блокиран",
-  "account.browse_more_on_origin_server": "Прегледајте још на оригиналном профилу",
   "account.cancel_follow_request": "Откажи праћење",
   "account.copy": "Копирај везу у профил",
   "account.direct": "Приватно помени @{name}",
@@ -763,10 +762,6 @@
   "time_remaining.minutes": "Остало {number, plural, one {# минут} few {# минута} other {# минута}}",
   "time_remaining.moments": "Још неколико тренутака",
   "time_remaining.seconds": "Остало {number, plural, one {# секунд} few {# секунде} other {# секунди}}",
-  "timeline_hint.remote_resource_not_displayed": "{resource} са других сервера се не приказују.",
-  "timeline_hint.resources.followers": "Пратиоци",
-  "timeline_hint.resources.follows": "Праћења",
-  "timeline_hint.resources.statuses": "Старије објаве",
   "trends.counter_by_accounts": "{count, plural, one {{counter} особа} few {{counter} особе} other {{counter} особа}} у протеклих {days, plural, one {дан} other {{days} дана}}",
   "trends.trending_now": "У тренду сада",
   "ui.beforeunload": "Ваш нацрт ће бити изгубљен ако напустите Mastodon.",
diff --git a/app/javascript/mastodon/locales/sv.json b/app/javascript/mastodon/locales/sv.json
index 7c57569b806ff4..3be1ade0742b33 100644
--- a/app/javascript/mastodon/locales/sv.json
+++ b/app/javascript/mastodon/locales/sv.json
@@ -19,7 +19,6 @@
   "account.block_domain": "Blockera domänen {domain}",
   "account.block_short": "Blockera",
   "account.blocked": "Blockerad",
-  "account.browse_more_on_origin_server": "Läs mer på den ursprungliga profilen",
   "account.cancel_follow_request": "Återkalla din begäran om att få följa",
   "account.copy": "Kopiera länk till profil",
   "account.direct": "Nämn @{name} privat",
@@ -349,6 +348,9 @@
   "hashtag.follow": "Följ hashtagg",
   "hashtag.unfollow": "Avfölj hashtagg",
   "hashtags.and_other": "…och {count, plural, one {}other {# mer}}",
+  "hints.profiles.see_more_followers": "Se fler följare på {domain}",
+  "hints.profiles.see_more_posts": "Se fler inlägg på {domain}",
+  "hints.threads.see_more": "Se fler svar på {domain}",
   "home.column_settings.show_reblogs": "Visa boostar",
   "home.column_settings.show_replies": "Visa svar",
   "home.hide_announcements": "Dölj notiser",
@@ -445,8 +447,6 @@
   "mute_modal.title": "Tysta användare?",
   "mute_modal.you_wont_see_mentions": "Du kommer inte att se inlägg som nämner dem.",
   "mute_modal.you_wont_see_posts": "De kan fortfarande se dina inlägg, men du kan inte se deras.",
-  "name_and_others": "{name} och {count, plural, one {# annan} other {# andra}}",
-  "name_and_others_with_link": "{name} och <a>{count, plural, one {# annan} other {# andra}}</a>",
   "navigation_bar.about": "Om",
   "navigation_bar.advanced_interface": "Öppna i avancerat webbgränssnitt",
   "navigation_bar.blocks": "Blockerade användare",
@@ -502,6 +502,8 @@
   "notification.status": "{name} publicerade just ett inlägg",
   "notification.update": "{name} redigerade ett inlägg",
   "notification_requests.accept": "Godkänn",
+  "notification_requests.accept_multiple": "{count, plural, one {Acceptera # förfrågan…} other {Acceptera # förfrågningar…}}",
+  "notification_requests.confirm_accept_multiple.button": "{count, plural, one {Acceptera förfrågan} other {Acceptera förfrågningar}}",
   "notification_requests.dismiss": "Avfärda",
   "notification_requests.edit_selection": "Redigera",
   "notification_requests.exit_selection": "Klar",
@@ -790,10 +792,6 @@
   "time_remaining.minutes": "{number, plural, one {# minut} other {# minuter}} kvar",
   "time_remaining.moments": "Återstående tillfällen",
   "time_remaining.seconds": "{number, plural, one {# sekund} other {# sekunder}} kvar",
-  "timeline_hint.remote_resource_not_displayed": "{resource} från andra servrar visas inte.",
-  "timeline_hint.resources.followers": "Följare",
-  "timeline_hint.resources.follows": "Följer",
-  "timeline_hint.resources.statuses": "Äldre inlägg",
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} personer}} senaste {days, plural, one {dygnet} other {{days} dagarna}}",
   "trends.trending_now": "Trendar nu",
   "ui.beforeunload": "Ditt utkast kommer att förloras om du lämnar Mastodon.",
diff --git a/app/javascript/mastodon/locales/szl.json b/app/javascript/mastodon/locales/szl.json
index 269e3b06b50cea..404f7e2fd4c0f8 100644
--- a/app/javascript/mastodon/locales/szl.json
+++ b/app/javascript/mastodon/locales/szl.json
@@ -14,7 +14,6 @@
   "account.badges.group": "Grupa",
   "account.block": "Zablokuj @{name}",
   "account.block_domain": "Zablokuj domena {domain}",
-  "account.browse_more_on_origin_server": "Ôbocz wiyncyj we ôryginalnym profilu",
   "account.cancel_follow_request": "Withdraw follow request",
   "account.domain_blocked": "Domena zablokowanŏ",
   "account.media": "Mydia",
@@ -103,7 +102,6 @@
   "status.pinned": "Pinned toot",
   "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
-  "timeline_hint.resources.statuses": "Older toots",
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {# days}}",
   "upload_form.audio_description": "Describe for people with hearing loss",
   "upload_form.description": "Describe for the visually impaired",
diff --git a/app/javascript/mastodon/locales/ta.json b/app/javascript/mastodon/locales/ta.json
index daa4edd978b826..377d06a3ecf91e 100644
--- a/app/javascript/mastodon/locales/ta.json
+++ b/app/javascript/mastodon/locales/ta.json
@@ -11,7 +11,6 @@
   "account.block_domain": "{domain} யில் இருந்து வரும் எல்லாவற்றையும் மறை",
   "account.block_short": "தடு",
   "account.blocked": "முடக்கப்பட்டது",
-  "account.browse_more_on_origin_server": "மேலும் உலாவ சுயவிவரத்திற்குச் செல்க",
   "account.cancel_follow_request": "Withdraw follow request",
   "account.disable_notifications": "@{name} பதிவிட்டல் எனக்கு தெரியபடுத்த வேண்டாம்",
   "account.domain_blocked": "மறைக்கப்பட்டத் தளங்கள்",
@@ -384,10 +383,6 @@
   "time_remaining.minutes": "{number, plural, one {# minute} மற்ற {# minutes}} left",
   "time_remaining.moments": "தருணங்கள் மீதமுள்ளன",
   "time_remaining.seconds": "{number, plural, one {# second} மற்ற {# seconds}} left",
-  "timeline_hint.remote_resource_not_displayed": "பிற சர்வர்களிலிருந்து வரும் {resource} காட்டப்படவில்லை.",
-  "timeline_hint.resources.followers": "வாசகர்கள்",
-  "timeline_hint.resources.follows": "வாசிக்கிறார்",
-  "timeline_hint.resources.statuses": "பழைய டூட்டுகள்",
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {# days}}",
   "trends.trending_now": "இப்போது செல்திசையில் இருப்பவை",
   "ui.beforeunload": "நீங்கள் வெளியே சென்றால் உங்கள் வரைவு இழக்கப்படும் மஸ்தோடோன்.",
diff --git a/app/javascript/mastodon/locales/tai.json b/app/javascript/mastodon/locales/tai.json
index cad6e8eaa5a478..6a86088fa88276 100644
--- a/app/javascript/mastodon/locales/tai.json
+++ b/app/javascript/mastodon/locales/tai.json
@@ -90,7 +90,6 @@
   "status.pinned": "Pinned toot",
   "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
-  "timeline_hint.resources.statuses": "Older toots",
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {# days}}",
   "upload_form.audio_description": "Describe for people with hearing loss",
   "upload_form.description": "Describe for the visually impaired",
diff --git a/app/javascript/mastodon/locales/te.json b/app/javascript/mastodon/locales/te.json
index 2cebb719724d93..a18f16740d21ce 100644
--- a/app/javascript/mastodon/locales/te.json
+++ b/app/javascript/mastodon/locales/te.json
@@ -278,7 +278,6 @@
   "tabs_bar.home": "హోమ్",
   "tabs_bar.notifications": "ప్రకటనలు",
   "time_remaining.moments": "కొన్ని క్షణాలు మాత్రమే మిగిలి ఉన్నాయి",
-  "timeline_hint.resources.statuses": "Older toots",
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {# days}}",
   "ui.beforeunload": "మీరు మాస్టొడొన్ను వదిలివేస్తే మీ డ్రాఫ్ట్లు పోతాయి.",
   "upload_area.title": "అప్లోడ్ చేయడానికి డ్రాగ్ & డ్రాప్ చేయండి",
diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json
index dc155ac4333664..7384342c8f4a19 100644
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@@ -19,7 +19,6 @@
   "account.block_domain": "ปิดกั้นโดเมน {domain}",
   "account.block_short": "ปิดกั้น",
   "account.blocked": "ปิดกั้นอยู่",
-  "account.browse_more_on_origin_server": "เรียกดูเพิ่มเติมในโปรไฟล์ดั้งเดิม",
   "account.cancel_follow_request": "ยกเลิกการติดตาม",
   "account.copy": "คัดลอกลิงก์ไปยังโปรไฟล์",
   "account.direct": "กล่าวถึง @{name} แบบส่วนตัว",
@@ -453,8 +452,6 @@
   "mute_modal.title": "ซ่อนผู้ใช้?",
   "mute_modal.you_wont_see_mentions": "คุณจะไม่เห็นโพสต์ที่กล่าวถึงเขา",
   "mute_modal.you_wont_see_posts": "เขายังคงสามารถเห็นโพสต์ของคุณ แต่คุณจะไม่เห็นโพสต์ของเขา",
-  "name_and_others": "{name} และ {count, plural, other {# อื่น ๆ}}",
-  "name_and_others_with_link": "{name} และ <a>{count, plural, other {# อื่น ๆ}}</a>",
   "navigation_bar.about": "เกี่ยวกับ",
   "navigation_bar.advanced_interface": "เปิดในส่วนติดต่อเว็บขั้นสูง",
   "navigation_bar.blocks": "ผู้ใช้ที่ปิดกั้นอยู่",
@@ -807,11 +804,6 @@
   "time_remaining.minutes": "เหลืออีก {number, plural, other {# นาที}}",
   "time_remaining.moments": "ช่วงเวลาที่เหลือ",
   "time_remaining.seconds": "เหลืออีก {number, plural, other {# วินาที}}",
-  "timeline_hint.remote_resource_not_displayed": "ไม่ได้แสดง {resource} จากเซิร์ฟเวอร์อื่น ๆ",
-  "timeline_hint.resources.followers": "ผู้ติดตาม",
-  "timeline_hint.resources.follows": "การติดตาม",
-  "timeline_hint.resources.replies": "การตอบกลับบางส่วน",
-  "timeline_hint.resources.statuses": "โพสต์ที่เก่ากว่า",
   "trends.counter_by_accounts": "{count, plural, other {{counter} คน}}ใน {days, plural, other {{days} วัน}}ที่ผ่านมา",
   "trends.trending_now": "กำลังนิยม",
   "ui.beforeunload": "แบบร่างของคุณจะสูญหายหากคุณออกจาก Mastodon",
diff --git a/app/javascript/mastodon/locales/tok.json b/app/javascript/mastodon/locales/tok.json
index 5518cc3697f554..8c0a860b8494d0 100644
--- a/app/javascript/mastodon/locales/tok.json
+++ b/app/javascript/mastodon/locales/tok.json
@@ -15,7 +15,6 @@
   "account.block_domain": "o weka e ma {domain}",
   "account.block_short": "o weka e jan tawa mi",
   "account.blocked": "jan li weka tawa mi",
-  "account.browse_more_on_origin_server": "sina tawa ma tan pi jan ni la sina ken lukin e mute",
   "account.cancel_follow_request": "o pini kute",
   "account.copy": "o pali same e linja pi lipu jan",
   "account.direct": "len la o mu e @{name}",
@@ -390,9 +389,6 @@
   "status.unpin": "o sewi ala lon lipu sina",
   "subscribed_languages.save": "o awen e ante",
   "tabs_bar.home": "lipu open",
-  "timeline_hint.resources.followers": "jan kute",
-  "timeline_hint.resources.follows": "jan lukin",
-  "timeline_hint.resources.statuses": "ijo pi tenpo suli",
   "trends.trending_now": "jan mute li toki",
   "units.short.billion": "{count}B",
   "units.short.million": "{count}AAA",
diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json
index ac20d80cfadbe9..7839011c1de106 100644
--- a/app/javascript/mastodon/locales/tr.json
+++ b/app/javascript/mastodon/locales/tr.json
@@ -19,7 +19,6 @@
   "account.block_domain": "{domain} alan adını engelle",
   "account.block_short": "Engelle",
   "account.blocked": "Engellendi",
-  "account.browse_more_on_origin_server": "Orijinal profilde daha fazlasına göz atın",
   "account.cancel_follow_request": "Takip isteğini geri çek",
   "account.copy": "Gönderi bağlantısını kopyala",
   "account.direct": "@{name} kullanıcısına özelden değin",
@@ -349,6 +348,14 @@
   "hashtag.follow": "Etiketi takip et",
   "hashtag.unfollow": "Etiketi takibi bırak",
   "hashtags.and_other": "…ve {count, plural, one {}other {# fazlası}}",
+  "hints.profiles.followers_may_be_missing": "Bu profilin takipçileri eksik olabilir.",
+  "hints.profiles.follows_may_be_missing": "Bu profilin takip edilenleri eksik olabilir.",
+  "hints.profiles.posts_may_be_missing": "Bu profilin bazı gönderileri eksik olabilir.",
+  "hints.profiles.see_more_followers": "{domain} adresinde daha fazla takipçi gör",
+  "hints.profiles.see_more_follows": "{domain} adresinde daha fazla takip edilen gör",
+  "hints.profiles.see_more_posts": "{domain} adresinde daha fazla gönderi gör",
+  "hints.threads.replies_may_be_missing": "Diğer sunuculardan yanıtlar eksik olabilir.",
+  "hints.threads.see_more": "{domain} adresinde daha fazla yanıt gör",
   "home.column_settings.show_reblogs": "Yeniden paylaşımları göster",
   "home.column_settings.show_replies": "Yanıtları göster",
   "home.hide_announcements": "Duyuruları gizle",
@@ -456,8 +463,6 @@
   "mute_modal.title": "Kullanıcıyı sustur?",
   "mute_modal.you_wont_see_mentions": "Onlardan bahseden gönderiler göremezsiniz.",
   "mute_modal.you_wont_see_posts": "Onlar sizin gönderilerinizi görmeye devam edebilir, ancak siz onlarınkini göremezsiniz.",
-  "name_and_others": "{name} ve {count, plural, one {# diğer} other {# diğerleri}}",
-  "name_and_others_with_link": "{name} ve <a>{count, plural, one {# diğer} other {# diğerleri}}</a>",
   "navigation_bar.about": "Hakkında",
   "navigation_bar.advanced_interface": "Gelişmiş web arayüzünde aç",
   "navigation_bar.blocks": "Engellenen kullanıcılar",
@@ -490,9 +495,13 @@
   "notification.admin.report_statuses": "{name}, {category} kategorisi için {target} kişisini bildirdi",
   "notification.admin.report_statuses_other": "{name}, {target} kişisini bildirdi",
   "notification.admin.sign_up": "{name} kaydoldu",
+  "notification.admin.sign_up.name_and_others": "{name} ve {count, plural, one {# diğer kişi} other {# diğer kişi}} kaydoldu",
   "notification.favourite": "{name} gönderinizi beğendi",
+  "notification.favourite.name_and_others_with_link": "{name} ve <a>{count, plural, one {# diğer kişi} other {# diğer kişi}}</a> gönderinizi beğendi",
   "notification.follow": "{name} seni takip etti",
+  "notification.follow.name_and_others": "{name} ve {count, plural, one {# diğer kişi} other {# diğer kişi}} sizi takip etti",
   "notification.follow_request": "{name} size takip isteği gönderdi",
+  "notification.follow_request.name_and_others": "{name} ve {count, plural, one {# diğer kişi} other {# diğer kişi}} size takip etme isteği gönderdi",
   "notification.label.mention": "Bahsetme",
   "notification.label.private_mention": "Özel bahsetme",
   "notification.label.private_reply": "Özel yanıt",
@@ -510,6 +519,7 @@
   "notification.own_poll": "Anketiniz sona erdi",
   "notification.poll": "Oy verdiğiniz bir anket sona erdi",
   "notification.reblog": "{name} gönderini yeniden paylaştı",
+  "notification.reblog.name_and_others_with_link": "{name} ve <a>{count, plural, one {# diğer kişi} other {# diğer kişi}}</a> gönderinizi yeniden paylaştı",
   "notification.relationships_severance_event": "{name} ile bağlantılar koptu",
   "notification.relationships_severance_event.account_suspension": "{from} yöneticisi, {target} askıya aldı, bunun anlamı onlardan artık güncelleme alamayacak veya etkileşemeyeceksiniz demektir.",
   "notification.relationships_severance_event.domain_block": "{from} yöneticisi {target} engelledi, {followersCount} takipçiniz ve takip ettiğiniz {followingCount, plural, one {# hesap} other {# hesap}} buna dahil.",
@@ -795,7 +805,7 @@
   "status.reblog_private": "Özgün görünürlük ile yeniden paylaş",
   "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.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.remove_bookmark": "Yer işaretini kaldır",
   "status.replied_to": "{name} kullanıcısına yanıt verdi",
@@ -826,11 +836,6 @@
   "time_remaining.minutes": "{number, plural, one {# dakika} other {# dakika}} kaldı",
   "time_remaining.moments": "Sadece birkaç dakika kaldı",
   "time_remaining.seconds": "{number, plural, one {# saniye} other {# saniye}} kaldı",
-  "timeline_hint.remote_resource_not_displayed": "diğer sunucudaki {resource} gösterilemiyor.",
-  "timeline_hint.resources.followers": "Takipçiler",
-  "timeline_hint.resources.follows": "Takip Edilenler",
-  "timeline_hint.resources.replies": "Bazı yanıtlar",
-  "timeline_hint.resources.statuses": "Eski gönderiler",
   "trends.counter_by_accounts": "Son {days, plural, one {gündeki} other {{days} gündeki}} {count, plural, one {{counter} kişi} other {{counter} kişi}}",
   "trends.trending_now": "Şu an gündemde",
   "ui.beforeunload": "Mastodon'u terk ederseniz taslağınız kaybolacak.",
diff --git a/app/javascript/mastodon/locales/tt.json b/app/javascript/mastodon/locales/tt.json
index 0f95b904eb06b7..3106c98007e4ed 100644
--- a/app/javascript/mastodon/locales/tt.json
+++ b/app/javascript/mastodon/locales/tt.json
@@ -17,7 +17,6 @@
   "account.block": "@{name} кулланучыны блоклау",
   "account.block_domain": "{domain} доменын блоклау",
   "account.blocked": "Блокланган",
-  "account.browse_more_on_origin_server": "Оригиналь профилендә күбрәк карау",
   "account.cancel_follow_request": "Киләсе сорау",
   "account.disable_notifications": "@{name} язулары өчен белдерүләр сүндерү",
   "account.domain_blocked": "Домен блокланган",
@@ -439,7 +438,6 @@
   "time_remaining.hours": "{number, plural, one {# сәгать} other {# сәгать}} калды",
   "time_remaining.minutes": "{number, plural, one {# минут} other {# минут}} калды",
   "time_remaining.seconds": "{number, plural, one {# секунд} other {# секунд}} калды",
-  "timeline_hint.resources.statuses": "Older toots",
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {# days}}",
   "units.short.billion": "{count} млрд",
   "units.short.million": "{count} млн",
diff --git a/app/javascript/mastodon/locales/ug.json b/app/javascript/mastodon/locales/ug.json
index e3dd0e6b1187b7..7e7d6836da8424 100644
--- a/app/javascript/mastodon/locales/ug.json
+++ b/app/javascript/mastodon/locales/ug.json
@@ -87,7 +87,6 @@
   "status.pinned": "Pinned toot",
   "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
-  "timeline_hint.resources.statuses": "Older toots",
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {# days}}",
   "upload_form.audio_description": "Describe for people with hearing loss",
   "upload_form.description": "Describe for the visually impaired",
diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json
index acff4857eaa229..a6172ce09566a6 100644
--- a/app/javascript/mastodon/locales/uk.json
+++ b/app/javascript/mastodon/locales/uk.json
@@ -19,7 +19,6 @@
   "account.block_domain": "Заблокувати домен {domain}",
   "account.block_short": "Заблокувати",
   "account.blocked": "Заблоковані",
-  "account.browse_more_on_origin_server": "Переглянути більше в оригінальному профілі",
   "account.cancel_follow_request": "Відкликати запит на стеження",
   "account.copy": "Копіювати посилання на профіль",
   "account.direct": "Особиста згадка @{name}",
@@ -349,6 +348,14 @@
   "hashtag.follow": "Стежити за хештегом",
   "hashtag.unfollow": "Не стежити за хештегом",
   "hashtags.and_other": "…і {count, plural, other {ще #}}",
+  "hints.profiles.followers_may_be_missing": "Підписники цього профілю можуть бути не показані.",
+  "hints.profiles.follows_may_be_missing": "Підписки цього профілю можуть бути не показані.",
+  "hints.profiles.posts_may_be_missing": "Деякі дописи від цього профілю можуть бути не показані.",
+  "hints.profiles.see_more_followers": "Переглянути більше підписників на {domain}",
+  "hints.profiles.see_more_follows": "Переглянути більше підписок на {domain}",
+  "hints.profiles.see_more_posts": "Переглянути більше дописів на {domain}",
+  "hints.threads.replies_may_be_missing": "Відповіді з інших серверів можуть бути не показані.",
+  "hints.threads.see_more": "Переглянути більше відповідей на {domain}",
   "home.column_settings.show_reblogs": "Показувати поширення",
   "home.column_settings.show_replies": "Показувати відповіді",
   "home.hide_announcements": "Приховати оголошення",
@@ -456,8 +463,6 @@
   "mute_modal.title": "Ігнорувати користувача?",
   "mute_modal.you_wont_see_mentions": "Ви не бачитимете дописів, де їх згадано.",
   "mute_modal.you_wont_see_posts": "Вони все ще можуть бачити ваші дописи, але ви не бачитимете їхніх.",
-  "name_and_others": "{name} і {count, plural, one {# інший} few {# інших} many {# інших} other {# інший}}",
-  "name_and_others_with_link": "{name} і <a>{count, plural, one {# інший} few {# інших} many {# інших} other {# інший}}</a>",
   "navigation_bar.about": "Про застосунок",
   "navigation_bar.advanced_interface": "Відкрити в розширеному вебінтерфейсі",
   "navigation_bar.blocks": "Заблоковані користувачі",
@@ -490,9 +495,13 @@
   "notification.admin.report_statuses": "{name} повідомляє про {target} в категорії {category}",
   "notification.admin.report_statuses_other": "{name} повідомляє про {target}",
   "notification.admin.sign_up": "{name} приєдналися",
+  "notification.admin.sign_up.name_and_others": "{name} та {count, plural, one {# інший} few {# інших} many {# інших} other {# інший}} зареєструвалися",
   "notification.favourite": "Ваш допис сподобався {name}",
+  "notification.favourite.name_and_others_with_link": "{name} та <a>{count, plural, one {# інший} few {# інших} many {# інших} other {# інший}}</a> вподобали ваш допис",
   "notification.follow": "{name} підписалися на вас",
+  "notification.follow.name_and_others": "{name} та {count, plural, one {# інший} few {# інших} many {# інших} other {# інший}} стежать за вами",
   "notification.follow_request": "{name} відправили запит на підписку",
+  "notification.follow_request.name_and_others": "{name} та {count, plural, one {# інший} few {# інших} many {# інших} other {# інший}} надсилають вам запит на стеження",
   "notification.label.mention": "Згадка",
   "notification.label.private_mention": "Особиста згадка",
   "notification.label.private_reply": "Приватна відповідь",
@@ -510,6 +519,7 @@
   "notification.own_poll": "Ваше опитування завершилося",
   "notification.poll": "Опитування, в якому ви проголосували, завершено",
   "notification.reblog": "{name} поширює ваш допис",
+  "notification.reblog.name_and_others_with_link": "{name} та <a>{count, plural, one {# інший} few {# інших} many {# інших} other {# інший}}</a> поширили ваш допис",
   "notification.relationships_severance_event": "Втрачено з'єднання з {name}",
   "notification.relationships_severance_event.account_suspension": "Адміністратор з {from} призупинив {target}, що означає, що ви більше не можете отримувати оновлення від них або взаємодіяти з ними.",
   "notification.relationships_severance_event.domain_block": "Адміністратор з {from} заблокував {target}, включаючи {followersCount} ваших підписників і {followingCount , plural, one {# обліковий запис} few {# облікові записи} many {# облікових записів} other {# обліковий запис}}, на які ви підписані.",
@@ -826,10 +836,6 @@
   "time_remaining.minutes": "{number, plural, one {# хвилина} few {# хвилини} other {# хвилин}}",
   "time_remaining.moments": "Залишилось секунд",
   "time_remaining.seconds": "{number, plural, one {# секунда} few {# секунди} other {# секунд}}",
-  "timeline_hint.remote_resource_not_displayed": "{resource} з інших серверів не зображується.",
-  "timeline_hint.resources.followers": "Підписники",
-  "timeline_hint.resources.follows": "Підписки",
-  "timeline_hint.resources.statuses": "Попередні дописи",
   "trends.counter_by_accounts": "{count, plural, one {{counter} особа} few {{counter} особи} other {{counter} осіб}} {days, plural, one {за останній {days} день} few {за останні {days} дні} other {за останні {days} днів}}",
   "trends.trending_now": "Популярне зараз",
   "ui.beforeunload": "Вашу чернетку буде втрачено, якщо ви покинете Mastodon.",
diff --git a/app/javascript/mastodon/locales/ur.json b/app/javascript/mastodon/locales/ur.json
index 303e37da39fdc8..cb5dfa63cd01e9 100644
--- a/app/javascript/mastodon/locales/ur.json
+++ b/app/javascript/mastodon/locales/ur.json
@@ -13,7 +13,6 @@
   "account.block_domain": "{domain} سے سب چھپائیں",
   "account.block_short": "بلاک",
   "account.blocked": "مسدود کردہ",
-  "account.browse_more_on_origin_server": "اصل پروفائل پر مزید براؤز کریں",
   "account.cancel_follow_request": "Withdraw follow request",
   "account.direct": "نجی طور پر @{name} کا ذکر کریں",
   "account.disable_notifications": "جب @{name} پوسٹ کرے تو مجھ مطلع نہ کریں",
@@ -270,7 +269,6 @@
   "status.pinned": "Pinned toot",
   "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
-  "timeline_hint.resources.statuses": "Older toots",
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {# days}}",
   "upload_form.audio_description": "Describe for people with hearing loss",
   "upload_form.description": "Describe for the visually impaired",
diff --git a/app/javascript/mastodon/locales/uz.json b/app/javascript/mastodon/locales/uz.json
index 534ba74ef74245..048f8e77570356 100644
--- a/app/javascript/mastodon/locales/uz.json
+++ b/app/javascript/mastodon/locales/uz.json
@@ -17,7 +17,6 @@
   "account.block": "Blok @{name}",
   "account.block_domain": "{domain} domenini bloklash",
   "account.blocked": "Bloklangan",
-  "account.browse_more_on_origin_server": "Asl profilda ko'proq ko'rish",
   "account.cancel_follow_request": "Kuzatuv so‘rovini bekor qilish",
   "account.disable_notifications": "@{name} post qo‘yganida menga xabar berishni to‘xtating",
   "account.domain_blocked": "Domen bloklangan",
diff --git a/app/javascript/mastodon/locales/vi.json b/app/javascript/mastodon/locales/vi.json
index 8dceeccdbd428f..f422fbbdb49765 100644
--- a/app/javascript/mastodon/locales/vi.json
+++ b/app/javascript/mastodon/locales/vi.json
@@ -19,7 +19,6 @@
   "account.block_domain": "Chặn mọi thứ từ {domain}",
   "account.block_short": "Chặn",
   "account.blocked": "Đã chặn",
-  "account.browse_more_on_origin_server": "Truy cập trang của người này",
   "account.cancel_follow_request": "Thu hồi yêu cầu theo dõi",
   "account.copy": "Sao chép địa chỉ",
   "account.direct": "Nhắn riêng @{name}",
@@ -349,6 +348,14 @@
   "hashtag.follow": "Theo dõi hashtag",
   "hashtag.unfollow": "Bỏ theo dõi hashtag",
   "hashtags.and_other": "…và {count, plural, other {# nữa}}",
+  "hints.profiles.followers_may_be_missing": "Số người theo dõi có thể không đầy đủ.",
+  "hints.profiles.follows_may_be_missing": "Số người mà người này theo dõi có thể không đầy đủ.",
+  "hints.profiles.posts_may_be_missing": "Số tút của người này có thể không đầy đủ.",
+  "hints.profiles.see_more_followers": "Xem thêm người theo dõi ở {domain}",
+  "hints.profiles.see_more_follows": "Xem thêm người mà người này theo dõi ở {domain}",
+  "hints.profiles.see_more_posts": "Xem thêm tút ở {domain}",
+  "hints.threads.replies_may_be_missing": "Lượt trả lời trên máy chủ khác có thể không đầy đủ.",
+  "hints.threads.see_more": "Xem thêm ở {domain}",
   "home.column_settings.show_reblogs": "Hiện những lượt đăng lại",
   "home.column_settings.show_replies": "Hiện những tút dạng trả lời",
   "home.hide_announcements": "Ẩn thông báo máy chủ",
@@ -447,8 +454,6 @@
   "mute_modal.title": "Ẩn người này?",
   "mute_modal.you_wont_see_mentions": "Bạn sẽ không nhìn thấy tút có nhắc đến họ.",
   "mute_modal.you_wont_see_posts": "Bạn sẽ không nhìn thấy tút của họ.",
-  "name_and_others": "{name} và {count, plural, other {# người khác}}",
-  "name_and_others_with_link": "{name} và <a>{count, plural, other {# người khác}}</a>",
   "navigation_bar.about": "Giới thiệu",
   "navigation_bar.advanced_interface": "Dùng bố cục nhiều cột",
   "navigation_bar.blocks": "Người đã chặn",
@@ -481,9 +486,13 @@
   "notification.admin.report_statuses": "{name} báo cáo {target} vì {category}",
   "notification.admin.report_statuses_other": "{name} báo cáo {target}",
   "notification.admin.sign_up": "{name} tham gia máy chủ của bạn",
+  "notification.admin.sign_up.name_and_others": "{name} và {count, plural, other {# người}} đã đăng ký",
   "notification.favourite": "{name} thích tút của bạn",
+  "notification.favourite.name_and_others_with_link": "{name} và <a>{count, plural, other {# người khác}}</a> đã thích tút của bạn",
   "notification.follow": "{name} theo dõi bạn",
+  "notification.follow.name_and_others": "{name} và {count, plural, other {# người khác}} đã theo dõi bạn",
   "notification.follow_request": "{name} yêu cầu theo dõi bạn",
+  "notification.follow_request.name_and_others": "{name} và {count, plural, other {# người khác}} đã yêu cầu theo dõi bạn",
   "notification.label.mention": "Lượt nhắc",
   "notification.label.private_mention": "Nhắn riêng",
   "notification.label.private_reply": "Trả lời riêng",
@@ -501,6 +510,7 @@
   "notification.own_poll": "Cuộc bình chọn của bạn đã kết thúc",
   "notification.poll": "Cuộc bình chọn có bạn tham gia đã kết thúc",
   "notification.reblog": "{name} đăng lại tút của bạn",
+  "notification.reblog.name_and_others_with_link": "{name} và <a>{count, plural, other {# người khác}}</a> đã đăng lại tút của bạn",
   "notification.relationships_severance_event": "Mất kết nối với {name}",
   "notification.relationships_severance_event.account_suspension": "Quản trị viên {from} đã vô hiệu hóa {target}, điều này có nghĩa là bạn không còn có thể nhận được cập nhật từ họ hoặc tương tác với họ nữa.",
   "notification.relationships_severance_event.domain_block": "Quản trị viên {from} đã chặn {target}, bao gồm {followersCount} người theo dõi bạn và {followingCount, plural, other {# người}} mà bạn theo dõi.",
@@ -809,10 +819,6 @@
   "time_remaining.minutes": "{number, plural, other {# phút}}",
   "time_remaining.moments": "Còn lại",
   "time_remaining.seconds": "{number, plural, other {# giây}}",
-  "timeline_hint.remote_resource_not_displayed": "{resource} từ máy chủ khác sẽ không hiển thị.",
-  "timeline_hint.resources.followers": "Người theo dõi",
-  "timeline_hint.resources.follows": "Đang theo dõi",
-  "timeline_hint.resources.statuses": "Tút cũ hơn",
   "trends.counter_by_accounts": "{count, plural, other {{count} lượt}} dùng trong {days, plural, other {{days} ngày}} qua",
   "trends.trending_now": "Xu hướng",
   "ui.beforeunload": "Bản nháp của bạn sẽ bị mất nếu bạn thoát khỏi Mastodon.",
diff --git a/app/javascript/mastodon/locales/zgh.json b/app/javascript/mastodon/locales/zgh.json
index 2e09642af93189..de003e3921e388 100644
--- a/app/javascript/mastodon/locales/zgh.json
+++ b/app/javascript/mastodon/locales/zgh.json
@@ -5,7 +5,6 @@
   "account.block": "ⴳⴷⵍ @{name}",
   "account.block_domain": "ⴳⴷⵍ ⵉⴳⵔ {domain}",
   "account.blocked": "ⵉⵜⵜⵓⴳⴷⵍ",
-  "account.browse_more_on_origin_server": "ⵙⵜⴰⵔⴰ ⵓⴳⴳⴰⵔ ⴳ ⵉⴼⵔⵙ ⴰⵏⵚⵍⵉ",
   "account.cancel_follow_request": "Withdraw follow request",
   "account.domain_blocked": "ⵉⵜⵜⵓⴳⴷⵍ ⵉⴳⵔ",
   "account.edit_profile": "ⵙⵏⴼⵍ ⵉⴼⵔⵙ",
@@ -194,8 +193,6 @@
   "tabs_bar.home": "ⴰⵙⵏⵓⴱⴳ",
   "tabs_bar.notifications": "ⵜⵉⵏⵖⵎⵉⵙⵉⵏ",
   "time_remaining.days": "{number, plural, one {# ⵡⴰⵙⵙ} other {# ⵡⵓⵙⵙⴰⵏ}} ⵉⵇⵇⵉⵎⵏ",
-  "timeline_hint.resources.followers": "ⵉⵎⴹⴼⴰⵕⵏ",
-  "timeline_hint.resources.statuses": "Older toots",
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {# days}}",
   "upload_button.label": "ⵔⵏⵓ ⵜⴰⵡⵍⴰⴼⵜ, ⴰⴼⵉⴷⵢⵓ ⵏⵖ ⴰⴼⴰⵢⵍⵓ ⵙ ⵉⵎⵙⵍⵉ",
   "upload_form.audio_description": "Describe for people with hearing loss",
diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json
index fd3ce2ae6c0f10..2beeb761e52546 100644
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@@ -19,7 +19,6 @@
   "account.block_domain": "屏蔽 {domain} 实例",
   "account.block_short": "屏蔽",
   "account.blocked": "已屏蔽",
-  "account.browse_more_on_origin_server": "在原始个人资料页面上浏览详情",
   "account.cancel_follow_request": "撤回关注请求",
   "account.copy": "复制个人资料链接",
   "account.direct": "私下提及 @{name}",
@@ -349,6 +348,14 @@
   "hashtag.follow": "关注话题标签",
   "hashtag.unfollow": "取消关注话题标签",
   "hashtags.and_other": "… 和另外 {count, plural, other {# 个话题}}",
+  "hints.profiles.followers_may_be_missing": "该账户的关注者列表可能没有完全显示。",
+  "hints.profiles.follows_may_be_missing": "该账户的关注列表可能没有完全显示。",
+  "hints.profiles.posts_may_be_missing": "该账户的嘟文可能没有完全显示。",
+  "hints.profiles.see_more_followers": "在 {domain} 查看更多关注者",
+  "hints.profiles.see_more_follows": "在 {domain} 查看更多关注",
+  "hints.profiles.see_more_posts": "在 {domain} 查看更多嘟文",
+  "hints.threads.replies_may_be_missing": "来自其它实例的回复可能没有完全显示。",
+  "hints.threads.see_more": "在 {domain} 查看更多回复",
   "home.column_settings.show_reblogs": "显示转嘟",
   "home.column_settings.show_replies": "显示回复",
   "home.hide_announcements": "隐藏公告",
@@ -456,8 +463,6 @@
   "mute_modal.title": "隐藏用户？",
   "mute_modal.you_wont_see_mentions": "你看不到提及他们的嘟文。",
   "mute_modal.you_wont_see_posts": "他们可以看到你的嘟文，但是你看不到他们的。",
-  "name_and_others": "{name} 和其它 {count, plural, other {# 人}}",
-  "name_and_others_with_link": "{name} 和<a>其它 {count, plural, other {# 人}}</a>",
   "navigation_bar.about": "关于",
   "navigation_bar.advanced_interface": "在高级网页界面中打开",
   "navigation_bar.blocks": "已屏蔽的用户",
@@ -490,9 +495,13 @@
   "notification.admin.report_statuses": "{name} 举报了 {target}，原因为 {category}",
   "notification.admin.report_statuses_other": "{name} 举报了 {target}",
   "notification.admin.sign_up": "{name} 注册了",
+  "notification.admin.sign_up.name_and_others": "{name} 和 {count, plural, other {另外 # 人}}注册了",
   "notification.favourite": "{name} 喜欢了你的嘟文",
+  "notification.favourite.name_and_others_with_link": "{name} 和 <a>{count, plural, other {另外 # 人}}</a> 喜欢了你的嘟文",
   "notification.follow": "{name} 开始关注你",
+  "notification.follow.name_and_others": "{name} 和 {count, plural, other {另外 # 人}} 关注了你",
   "notification.follow_request": "{name} 向你发送了关注请求",
+  "notification.follow_request.name_and_others": "{name} 和 {count, plural, other {另外 # 人}} 向你发送了关注请求",
   "notification.label.mention": "提及",
   "notification.label.private_mention": "私下提及",
   "notification.label.private_reply": "私人回复",
@@ -510,6 +519,7 @@
   "notification.own_poll": "你的投票已经结束",
   "notification.poll": "你参与的一项投票已结束",
   "notification.reblog": "{name} 转发了你的嘟文",
+  "notification.reblog.name_and_others_with_link": "{name} 和 <a>{count, plural, other {另外 # 人}}</a> 转嘟了你的嘟文",
   "notification.relationships_severance_event": "与 {name} 的联系已断开",
   "notification.relationships_severance_event.account_suspension": "一名来自 {from} 的管理员已经封禁了{target}，这意味着你将无法再收到他们的更新或与他们互动。",
   "notification.relationships_severance_event.domain_block": "一名来自 {from} 的管理员已经屏蔽了 {target}，其中包括你的 {followersCount} 个关注者和 {followingCount, plural, other {# 个关注}}。",
@@ -518,7 +528,17 @@
   "notification.status": "{name} 刚刚发布嘟文",
   "notification.update": "{name} 编辑了嘟文",
   "notification_requests.accept": "接受",
+  "notification_requests.accept_multiple": "{count, plural, other {接受 # 个请求…}}",
+  "notification_requests.confirm_accept_multiple.button": "{count, plural, other {接受请求}}",
+  "notification_requests.confirm_accept_multiple.message": "你即将接受 {count, plural, other {# 个通知请求}}。是否确定要继续？",
+  "notification_requests.confirm_accept_multiple.title": "是否接受通知请求？",
+  "notification_requests.confirm_dismiss_multiple.button": "{count, plural, other {拒绝请求}}",
+  "notification_requests.confirm_dismiss_multiple.message": "你将要拒绝 {count, plural, other {# 个通知请求}}。你将无法再轻易访问{count, plural, other {它们}}。是否继续？",
+  "notification_requests.confirm_dismiss_multiple.title": "是否拒绝通知请求?",
   "notification_requests.dismiss": "拒绝",
+  "notification_requests.dismiss_multiple": "{count, plural, other {拒绝 # 个请求…}}",
+  "notification_requests.edit_selection": "编辑",
+  "notification_requests.exit_selection": "完成",
   "notification_requests.explainer_for_limited_account": "来自该账户的通知已被过滤，因为该账户已被管理员限制。",
   "notification_requests.explainer_for_limited_remote_account": "来自该账户的通知已被过滤，因为该账户或其所在的实例已被管理员限制。",
   "notification_requests.maximize": "最大化",
@@ -816,11 +836,6 @@
   "time_remaining.minutes": "剩余 {number, plural, one {# 分钟} other {# 分钟}}",
   "time_remaining.moments": "即将结束",
   "time_remaining.seconds": "剩余 {number, plural, one {# 秒} other {# 秒}}",
-  "timeline_hint.remote_resource_not_displayed": "不会显示来自其它服务器的{resource}",
-  "timeline_hint.resources.followers": "粉丝",
-  "timeline_hint.resources.follows": "关注",
-  "timeline_hint.resources.replies": "某些回复",
-  "timeline_hint.resources.statuses": "更早的嘟文",
   "trends.counter_by_accounts": "过去 {days, plural, other {{days} 天}}有{count, plural, other { {counter} 人}}讨论",
   "trends.trending_now": "当前热门",
   "ui.beforeunload": "如果你现在离开 Mastodon，你的草稿内容将会丢失。",
diff --git a/app/javascript/mastodon/locales/zh-HK.json b/app/javascript/mastodon/locales/zh-HK.json
index 9fb50c6cff9c2f..170ef8e70d0d53 100644
--- a/app/javascript/mastodon/locales/zh-HK.json
+++ b/app/javascript/mastodon/locales/zh-HK.json
@@ -18,7 +18,6 @@
   "account.block_domain": "封鎖網域 {domain}",
   "account.block_short": "封鎖",
   "account.blocked": "已封鎖",
-  "account.browse_more_on_origin_server": "前往原始的個人檔案頁瀏覽更多",
   "account.cancel_follow_request": "撤回追蹤請求",
   "account.copy": "複製個人檔案連結",
   "account.direct": "私下提及 @{name}",
@@ -756,10 +755,6 @@
   "time_remaining.minutes": "剩餘 {number, plural, one {# 分鐘} other {# 分鐘}}",
   "time_remaining.moments": "剩餘時間",
   "time_remaining.seconds": "剩餘 {number, plural, one {# 秒} other {# 秒}}",
-  "timeline_hint.remote_resource_not_displayed": "不會顯示來自其他伺服器的 {resource}",
-  "timeline_hint.resources.followers": "追蹤者",
-  "timeline_hint.resources.follows": "追蹤中",
-  "timeline_hint.resources.statuses": "更早的文章",
   "trends.counter_by_accounts": "{count, plural, one {{counter} 人} other {{counter} 人}} 於過去 {days, plural, one {日} other {{days} days}} 之間",
   "trends.trending_now": "現在流行",
   "ui.beforeunload": "如果你現在離開 Mastodon，你的草稿內容將會被丟棄。",
diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json
index cc130cfafcc113..110d3c9c4639e7 100644
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@@ -19,7 +19,6 @@
   "account.block_domain": "封鎖來自 {domain} 網域的所有內容",
   "account.block_short": "封鎖",
   "account.blocked": "已封鎖",
-  "account.browse_more_on_origin_server": "在該伺服器上的個人檔案頁面瀏覽更多",
   "account.cancel_follow_request": "收回跟隨請求",
   "account.copy": "複製個人檔案連結",
   "account.direct": "私訊 @{name}",
@@ -349,6 +348,14 @@
   "hashtag.follow": "跟隨主題標籤",
   "hashtag.unfollow": "取消跟隨主題標籤",
   "hashtags.and_other": "…及其他 {count, plural, other {# 個}}",
+  "hints.profiles.followers_may_be_missing": "此個人檔案之跟隨者或有缺失。",
+  "hints.profiles.follows_may_be_missing": "此個人檔案之正在跟隨或有缺失。",
+  "hints.profiles.posts_may_be_missing": "此個人檔案之某些嘟文或有缺失。",
+  "hints.profiles.see_more_followers": "於 {domain} 檢視更多跟隨者",
+  "hints.profiles.see_more_follows": "於 {domain} 檢視更多正在跟隨",
+  "hints.profiles.see_more_posts": "於 {domain} 檢視更多嘟文",
+  "hints.threads.replies_may_be_missing": "來自其他站點之回覆或有缺失。",
+  "hints.threads.see_more": "於 {domain} 檢視更多回覆",
   "home.column_settings.show_reblogs": "顯示轉嘟",
   "home.column_settings.show_replies": "顯示回覆",
   "home.hide_announcements": "隱藏公告",
@@ -456,8 +463,6 @@
   "mute_modal.title": "是否靜音該使用者？",
   "mute_modal.you_wont_see_mentions": "您不會見到提及他們的嘟文。",
   "mute_modal.you_wont_see_posts": "他們仍可讀取您的嘟文，但您不會見到他們的。",
-  "name_and_others": "{name} 與 {count, plural, other {# 個人}}",
-  "name_and_others_with_link": "{name} 與 <a>{count, plural, other {# 個人}}</a>",
   "navigation_bar.about": "關於",
   "navigation_bar.advanced_interface": "以進階網頁介面開啟",
   "navigation_bar.blocks": "已封鎖的使用者",
@@ -490,9 +495,13 @@
   "notification.admin.report_statuses": "{name} 已檢舉 {target} 關於 {category}",
   "notification.admin.report_statuses_other": "{name} 已檢舉 {target}",
   "notification.admin.sign_up": "{name} 已經註冊",
+  "notification.admin.sign_up.name_and_others": "{name} 與{count, plural, other {其他 # 個人}}已註冊",
   "notification.favourite": "{name} 已將您的嘟文加入最愛",
+  "notification.favourite.name_and_others_with_link": "{name} 與<a>{count, plural, other {其他 # 個人}}</a>已將您的嘟文加入最愛",
   "notification.follow": "{name} 已跟隨您",
+  "notification.follow.name_and_others": "{name} 與{count, plural, other {其他 # 個人}}已跟隨您",
   "notification.follow_request": "{name} 要求跟隨您",
+  "notification.follow_request.name_and_others": "{name} 與{count, plural, other {其他 # 個人}}已請求跟隨您",
   "notification.label.mention": "提及",
   "notification.label.private_mention": "私訊",
   "notification.label.private_reply": "私訊回嘟",
@@ -510,6 +519,7 @@
   "notification.own_poll": "您的投票已結束",
   "notification.poll": "您曾投過的投票已經結束",
   "notification.reblog": "{name} 已轉嘟您的嘟文",
+  "notification.reblog.name_and_others_with_link": "{name} 與<a>{count, plural, other {其他 # 個人}}</a>已轉嘟您的嘟文",
   "notification.relationships_severance_event": "與 {name} 失去連結",
   "notification.relationships_severance_event.account_suspension": "{from} 之管理員已將 {target} 停權，意味著您將不再收到來自他們的更新或與之互動。",
   "notification.relationships_severance_event.domain_block": "{from} 之管理員已將 {target} 封鎖，包含 {followersCount} 名您的跟隨者及 {followingCount, plural, other {#}} 名您跟隨的帳號。",
@@ -826,11 +836,6 @@
   "time_remaining.minutes": "剩餘 {number, plural, one {# 分鐘} other {# 分鐘}}",
   "time_remaining.moments": "剩餘時間",
   "time_remaining.seconds": "剩餘 {number, plural, one {# 秒} other {# 秒}}",
-  "timeline_hint.remote_resource_not_displayed": "不會顯示來自其他伺服器的 {resource}",
-  "timeline_hint.resources.followers": "跟隨者",
-  "timeline_hint.resources.follows": "正在跟隨",
-  "timeline_hint.resources.replies": "某些回覆",
-  "timeline_hint.resources.statuses": "更早的嘟文",
   "trends.counter_by_accounts": "{count, plural, one {{counter} 人} other {{counter} 人}}於過去 {days, plural, one {日} other {{days} 日}} 之間",
   "trends.trending_now": "現正熱門趨勢",
   "ui.beforeunload": "如果離開 Mastodon，您的草稿將會不見。",
diff --git a/config/locales/be.yml b/config/locales/be.yml
index 3d4c10cbb87543..fbeb55add701c7 100644
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -62,6 +62,7 @@ be:
       demote: Панізіць у правах
       destroyed_msg: Даныя %{username} цяпер у чарзе на прымусовае выдаленне
       disable: Замарозіць
+      disable_sign_in_token_auth: Выключыць аўтэнтыфікацыю па токену эл. пошты
       disable_two_factor_authentication: Адключыць 2FA
       disabled: Замарожаны
       display_name: Бачнае імя
@@ -70,6 +71,7 @@ be:
       email: Электронная пошта
       email_status: Статус электроннай пошты
       enable: Размарозіць
+      enable_sign_in_token_auth: Уключыць аўтэнтыфікацыю па токену эл. пошты
       enabled: Уключана
       enabled_msg: Уліковы запіс %{username} размарожаны
       followers: Падпісчыкі
@@ -456,6 +458,7 @@ be:
         create: Дадаць дамен
         resolve: Вызначыць дамен
         title: Заблакіраваць новы дамен эл. пошты
+      no_email_domain_block_selected: Блакіроўкі даменаў эл. пошты не былі змененыя, таму што ні адзін з іх не быў выбраны
       not_permitted: Забаронена
       resolved_dns_records_hint_html: Даменнае імя ператвараецца ў наступныя дамены MX, якія ў канчатковым выніку адказваюць за прыём электроннай пошты. Блакаванне дамена MX заблакуе рэгістрацыю з любога адраса электроннай пошты, які выкарыстоўвае той жа дамен MX, нават калі бачнае імя дамена адрозніваецца. <strong>Будзьце асцярожныя, каб не заблакіраваць асноўных пастаўшчыкоў электроннай пошты.</strong>
       resolved_through_html: Вызначына каля %{domain}
diff --git a/config/locales/doorkeeper.en-GB.yml b/config/locales/doorkeeper.en-GB.yml
index f254825b1ba685..999284e85ff38e 100644
--- a/config/locales/doorkeeper.en-GB.yml
+++ b/config/locales/doorkeeper.en-GB.yml
@@ -83,6 +83,7 @@ en-GB:
         access_denied: The resource owner or authorisation server denied the request.
         credential_flow_not_configured: Resource Owner Password Credentials flow failed due to Doorkeeper.configure.resource_owner_from_credentials being unconfigured.
         invalid_client: Client authentication failed due to unknown client, no client authentication included, or unsupported authentication method.
+        invalid_code_challenge_method: The code challenge method must be S256, plain is unsupported.
         invalid_grant: The provided authorisation grant is invalid, expired, revoked, does not match the redirection URI used in the authorisation request, or was issued to another client.
         invalid_redirect_uri: The redirect URI included is not valid.
         invalid_request:
diff --git a/config/locales/fo.yml b/config/locales/fo.yml
index 7b1e11c264a4ef..4dd7fa3386347d 100644
--- a/config/locales/fo.yml
+++ b/config/locales/fo.yml
@@ -58,6 +58,7 @@ fo:
       demote: Lækka í tign
       destroyed_msg: Dáturnar hjá %{username} eru nú settar í bíðirøð at blíva strikaðar sum skjótast
       disable: Fryst
+      disable_sign_in_token_auth: Ger váttan við teldupostateknum óvirkna
       disable_two_factor_authentication: Ger 2FA óvirkið
       disabled: Fryst
       display_name: Vís navn
@@ -66,6 +67,7 @@ fo:
       email: Teldupostur
       email_status: Teldupostastøða
       enable: Tiðna
+      enable_sign_in_token_auth: Ger váttan við teldupostateknum virkna
       enabled: Í gildi
       enabled_msg: Tiðnaði kontuna hjá %{username}
       followers: Fylgjarar
@@ -198,8 +200,10 @@ fo:
         destroy_user_role: Bein burtur leiklut
         disable_2fa_user: Ger 2FA óvirkið
         disable_custom_emoji: Ger serligt kenslutekn óvirkið
+        disable_sign_in_token_auth_user: Ger váttan við teldupostateknum óvirkna fyri brúkara
         disable_user: Ger brúkara óvirknan
         enable_custom_emoji: Ger serligt kenslutekn virkið
+        enable_sign_in_token_auth_user: Ger váttan við teldupostateknum virkna fyri brúkara
         enable_user: Ger brúkara virknan
         memorialize_account: Minnst til Konto
         promote_user: Vís fram Brúkara
@@ -234,17 +238,21 @@ fo:
         confirm_user_html: "%{name} váttaði t-post hjá brúkara %{target}"
         create_account_warning_html: "%{name} sendi eina ávaring til %{target}"
         create_announcement_html: "%{name} stovnaði eina fráboðan %{target}"
+        create_canonical_email_block_html: "%{name} forðaði telduposti við hash'inum %{target}"
         create_custom_emoji_html: "%{name} legði upp nýtt kenslutekn %{target}"
         create_domain_allow_html: "%{name} loyv sameining við domainið %{target}"
         create_domain_block_html: "%{name} blokeraði navnaøkið %{target}"
+        create_email_domain_block_html: "%{name} blokeraði teldupostanavnaøkið %{target}"
         create_ip_block_html: "%{name} gjørdi reglu fyri IP %{target}"
         create_unavailable_domain_html: "%{name} steðgaði veiting til navnaøkið %{target}"
         create_user_role_html: "%{name} stovnaði %{target} leiklutin"
         demote_user_html: "%{name} lækkaði tignina hjá brúkaranum %{target}"
         destroy_announcement_html: "%{name} strikaðar fráboðanir %{target}"
+        destroy_canonical_email_block_html: "%{name} strikaði blokeringina av teldupostin við hashkodu %{target}"
         destroy_custom_emoji_html: "%{name} strikaði kensluteknið %{target}"
         destroy_domain_allow_html: "%{name} havnaði sameining við navnaøkið %{target}"
         destroy_domain_block_html: "%{name} strikaði blokering av navnaøkinum %{target}"
+        destroy_email_domain_block_html: "%{name} leysgav teldupostanavnaøkið %{target}"
         destroy_instance_html: "%{name} reinsaði navnaøkið %{target}"
         destroy_ip_block_html: "%{name} slettaðar reglur fyri IP %{target}"
         destroy_status_html: "%{name} slettaði upplegg hjá %{target}"
@@ -252,8 +260,10 @@ fo:
         destroy_user_role_html: "%{name} slettaði leiklutin hjá %{target}"
         disable_2fa_user_html: "%{name} slepti kravið um váttan í tveimum stigum fyri brúkaran %{target}"
         disable_custom_emoji_html: "%{name} gjørdi kensluteknið %{target} óvirkið"
+        disable_sign_in_token_auth_user_html: "%{name} gjørdi váttan við teldupostteknum óvirkna fyri %{target}"
         disable_user_html: "%{name} gjørdi innritan hjá brúkaranum %{target} óvirkna"
         enable_custom_emoji_html: "%{name} gjørdi kensluteknið %{target} virkið"
+        enable_sign_in_token_auth_user_html: "%{name} gjørdi váttan við teldupostteknum virkna fyri %{target}"
         enable_user_html: "%{name} gjørdi innritan virkna fyri brúkaran %{target}"
         memorialize_account_html: "%{name} broytti kontuna hjá %{target} til eina minnissíðu"
         promote_user_html: "%{name} flutti brúkaran %{target} fram"
@@ -261,6 +271,7 @@ fo:
         reject_user_html: "%{name} avvísti skráseting hjá %{target}"
         remove_avatar_user_html: "%{name} strikaði eftirgjørda skapningin hjá %{target}"
         reopen_report_html: "%{name} lat uppaftur meldingina %{target}"
+        resend_user_html: "%{name} endursendi váttanarteldubrævið fyri %{target}"
         reset_password_user_html: "%{name} setti loyniorðið hjá brúkaranum %{target} av nýggjum"
         resolve_report_html: "%{name} avgreiddi meldingina %{target}"
         sensitive_account_html: "%{name} hevur merkt media hjá %{target} sum viðkvæmt"
@@ -421,6 +432,7 @@ fo:
       attempts_over_week:
         one: "%{count} roynd seinastu vikuna"
         other: "%{count} tilmeldingarroyndir seinastu vikuna"
+      created_msg: Teldupostanavnaøkið blokerað
       delete: Strika
       dns:
         types:
@@ -429,8 +441,12 @@ fo:
       new:
         create: Stovna nýtt økisnavn
         resolve: Loys navnaøki
+        title: Blokera nýtt teldupostanavnaøki
+      no_email_domain_block_selected: Ongar teldupostanavnaøkisblokeringar vóru broyttar, tí ongar vóru valdar
       not_permitted: Ikki loyvt
+      resolved_dns_records_hint_html: Navnaøkið verður loyst til hesi MX navnaøki, sum í síðsta enda hava ábyrgdina av at móttaka teldupost. At blokera eitt MX navnaøki fer at blokera tilmeldingar frá einum og hvørjum teldupoststaði, sum brúkar sama MX navnaøki, sjálvt um sjónliga navnaøkið er eitt annað. <strong>Ansa eftir ikki at blokera stórar veitarar av telduposti</strong>
       resolved_through_html: Loyst gjøgnum %{domain}
+      title: Blokeraði teldupostanavnaøki
     export_domain_allows:
       new:
         title: Innflyt navnaøkjaloyvi
@@ -584,6 +600,7 @@ fo:
         resolve_description_html: Eingin atgerð verður tikin móti meldaðu kontuni, eingin atsókn verður skrásett og meldingin verður lukkað.
         silence_description_html: Kontan verður einans sjónlig hjá teimum, sum longu fylgja henni ella leita eftir henni við hond, og tað minkar nógv um, hvussu langt hon røkkur. Kann altíð angrast. Lukkar allar rapporteringar um hesa kontuna.
         suspend_description_html: Kontan og alt innihald hjá kontuni gerast óatkomulig og við tíðini strikaði, og tað verður ógjørligt at samvirka við henni. Kann angrast innan 30 dagar. Lukkar allar rapporteringar av hesi kontuni.
+      actions_description_html: Ger av hvør atgerð skal takast fyri at avgreiða hesa meldingina. Revsitiltøk móti meldaðu kontuni føra við sær, at ein teldupostfráboðan verður send teimum, undantikið tá <strong>Ruskpostur</strong> verður valdur.
       actions_description_remote_html: Tak avgerð um hvat skal gerast fyri at avgreiða hesa rapporteringina. Hetta fer einans at ávirka, hvussu <strong>tín</strong> ambætari samskiftir við hesa fjarkontuna og hvussu hann handfer tilfar frá henni.
       add_to_report: Legg meira afturat meldingini
       already_suspended_badges:
@@ -648,6 +665,7 @@ fo:
         delete_data_html: Strika vangan og innihaldið hjá <strong>@%{acct}</strong> um 30 dagar uttan so at kontan verður gjørd virkin aftur áðrenn tað
         preview_preamble_html: "<strong>@%{acct}</strong> ger at móttaka eina ávaring við hesum innihaldi:"
         record_strike_html: Skráset eitt brot á <strong>@%{acct}</strong>, soleiðis at tað kann havast í huga í samband við møgulig framtíðar mishald
+        send_email_html: Send <strong>@%{acct}</strong> eitt teldubræv við eini ávaring
         warning_placeholder: Møguligar eyka grundgevingar fyri umsjónaratgerð.
       target_origin: Uppruni hjá meldaðu kontuni
       title: Meldingar
@@ -687,6 +705,7 @@ fo:
         manage_appeals: Umsit kærur
         manage_appeals_description: Loyvir brúkarum at eftirkanna kærur um umsjónaratgerðir
         manage_blocks: Stýra blokeringum
+        manage_blocks_description: Loyvir brúkarum at blokera teldupostveitarum og IP adressum
         manage_custom_emojis: Stýra sergjørd kenslutekn
         manage_custom_emojis_description: Loyvir brúkarum at stýra sergjørdum kensluteknum á ambætaranum
         manage_federation: Stýra sameindum
@@ -704,6 +723,7 @@ fo:
         manage_taxonomies: Stýra flokkingum
         manage_taxonomies_description: Loyvir brúkarum at eftirkanna vælumtókt tilfar og at dagføra stillingar viðvíkjandi frámerkjum
         manage_user_access: Stýr brúkaraatgongd
+        manage_user_access_description: Loyvir brúkarum at gera 'váttan í tveimum stigum' (2FA) hjá øðrum brúkarum óvirkna, at broyta teirra teldupost og at nullstilla teirra loyniorð
         manage_users: Stýr brúkarum
         manage_users_description: Loyvir brúkarum at vísa smálutir um aðrar brúkarar og at gjøgnumføra umsjónaratgerðir móti teimum
         manage_webhooks: Stýr webhooks
@@ -778,6 +798,7 @@ fo:
       destroyed_msg: Vevstaðs-uppsending strikað!
     software_updates:
       critical_update: Kritiskt - vinarliga dagfør beinan vegin
+      description: Mælt verður til, at Mastodon-innleggingin hjá tær altíð er dagførd, soleiðis at hon fær gagn av nýggjastu ábótunum og hentleikunum. Harumframt er tað summatíðir kritiskt, at Mastodon umgangandi verður dagført fyri at mótvirka trygdartrupulleikum. Tí kekkar Mastodon hvørjar 30 minuttir, um dagføringar eru neyðugar, og letur teg frætta samsvarandi teldubrævafráboðanarstillingunum hjá tær.
       documentation_link: Lær meira
       release_notes: Útgávuviðmerkingar
       title: Tøkar dagføringar
@@ -1040,7 +1061,9 @@ fo:
       guide_link_text: Øll kunnu geva íkast.
     sensitive_content: Viðkvæmt innihald
   application_mailer:
+    notification_preferences: Broyt teldupostastillingar
     salutation: "%{name}"
+    settings: 'Broyt teldupostastillingar: %{link}'
     unsubscribe: Strika hald
     view: 'Vís:'
     view_profile: Vís vanga
@@ -1060,6 +1083,7 @@ fo:
       hint_html: Bara eitt afturat! Tað er neyðugt hjá okkum at vátta, at tú ert eitt menniskja (fyri at sleppa undan ruskposti!). Loys CAPTCHA niðanfyri og trýst á "Halt fram".
       title: Trygdarkanning
     confirmations:
+      awaiting_review: Teldupostadressan hjá góðkend! Nú kanna %{domain} ábyrgdarfólk skrásetingina hjá tær. Góðkenna tey kontu tína, so senda tey tær eitt teldubræv!
       awaiting_review_title: Skrásetingin hjá tær verður viðgjørd
       clicking_this_link: við at klikkja á hetta leinki
       login_link: rita inn
@@ -1067,6 +1091,7 @@ fo:
       redirect_to_app_html: Tú skuldi verið send/ur víðari til <strong>%{app_name}</strong> appina. Hendi tað ikki, so kanst tú royna %{clicking_this_link} ella fara manuelt aftur til appina.
       registration_complete: Skráseting tín á %{domain} er nú avgreidd!
       welcome_title: Vælkomin, %{name}!
+      wrong_email_hint: Um hesin teldupoststaðurin ikki er rættur, so kanst tú broyta hann í kontustillingunum.
     delete_account: Strika kontu
     delete_account_html: Ynskir tú at strika kontuna, so kanst tú <a href="%{path}">halda fram her</a>. Tú verður spurd/ur um váttan.
     description:
@@ -1087,6 +1112,7 @@ fo:
     or_log_in_with: Ella innrita við
     privacy_policy_agreement_html: Eg havi lisið og taki undir við <a href="%{privacy_policy_path}" target="_blank">privatlívspolitikkinum</a>
     progress:
+      confirm: Vátta teldupost
       details: Tínir smálutir
       review: Okkara kanning
       rules: Góðtak reglur
@@ -1108,8 +1134,10 @@ fo:
     security: Trygd
     set_new_password: Áset nýtt loyniorð
     setup:
+      email_below_hint_html: Kekka mappuna við ruskposti ella bið um ein annan. Tú kanst rætta teldupostadressuna, um hon er skeiv.
       email_settings_hint_html: Kekka leinkið, sum vit sendu tær at eftirkanna %{email}. Vit bíða beint her.
       link_not_received: Fekk tú einki leinki?
+      new_confirmation_instructions_sent: Tú fer at móttaka eitt nýtt teldubræv við váttanarleinkinum um nakrar fáar minuttir!
       title: Kekka innbakkan hjá tær
     sign_in:
       preamble_html: Rita inn við tínum <strong>%{domain}</strong> heimildum. Er konta tín á einum øðrum ambætara, so er ikki gjørligt hjá tær at rita inn her.
@@ -1120,7 +1148,9 @@ fo:
       title: Latum okkum fáa teg settan upp á %{domain}.
     status:
       account_status: Kontustøða
+      confirming: Bíði eftir at teldupostváttanin er gjøgnumførd.
       functional: Konta tín er fult virkin.
+      pending: Umsókn tín verður eftirkannað av okkara starvsfeløgum. Tað kann taka eina løtu. Tú móttekur eitt teldubræv, um umsóknin er góðkend.
       redirecting_to: Konta tín er óvirkin, tí í løtuni verður hon víðaribeind til %{acct}.
       self_destruct: Av tí at %{domain} er í ferð við at lukka, fært tú einans avmarkaða atgongd til tína kontu.
       view_strikes: Vís eldri atsóknir móti tíni kontu
@@ -1163,6 +1193,9 @@ fo:
       before: 'Áðrenn tú heldur fram, vinarliga les hesar notur nágreiniliga:'
       caches: Innihald, sum er lagt í goymslu á øðrum ambætarum, kann vera varandi har
       data_removal: Postar tínir og aðrar dátur verða burturbeind varandi
+      email_change_html: Tú kann <a href="%{path}">broyta tín teldupost</a> uttan at strika tína kontu
+      email_contact_html: Um tað framvegis ikki kemur vegin fram, so kanst tú senda teldubræv til <a href="mailto:%{email}">%{email}</a> og biðja um hjálp
+      email_reconfirmation_html: Móttekur tú ikki váttanarteldupostin, so kanst tú <a href="%{path}">biðja um hann aftur</a>
       irreversible: Tað verður ikki møguligt hjá tær at endurskapa ella gera kontu tína virkna aftur
       more_details_html: Fyri fleiri smálutir, sí <a href="%{terms_path}">privatlívpolitikkin</a>.
       username_available: Brúkaranavnið hjá tær verður tøkt aftur
@@ -1395,6 +1428,7 @@ fo:
     authentication_methods:
       otp: app til váttan í tveimum stigum
       password: loyniorð
+      sign_in_token: teldupostatrygdarkoda
       webauthn: trygdarlyklar
     description_html: Sært tú virksemi, sum tú ikki kennir aftur, so eigur tú at umhugsa at broyta loyniorðið ella at gera váttan í tveimum stigum virkna.
     empty: Eingin samgildissøga tøk
@@ -1405,6 +1439,16 @@ fo:
     unsubscribe:
       action: Ja, strika hald
       complete: Hald strikað
+      confirmation_html: Ert tú vís/ur í, at tú vil gevast at móttaka %{type} fyri Mastodon á %{domain} til tína teldupostadressu á %{email}? Tú kanst altíð gera haldið virkið aftur frá tínum <a href="%{settings_path}">teldupostfráboðanarstillingum</a>.
+      emails:
+        notification_emails:
+          favourite: yndisfráboðanarteldupostar
+          follow: fylg fráboðanarteldupostar
+          follow_request: fylg umbønir um teldupost
+          mention: nevn fráboðanarteldupostar
+          reblog: framhevja fráboðanarpostar
+      resubscribe_html: Um tú hevur strikað haldið av misgávum, so kanst tú tekna haldið av nýggjum í tínum <a href="%{settings_path}">teldupostfráboðarstillingum</a>.
+      success_html: Tú fer ikki longur at móttaka %{type} fyri Mastodon á %{domain} til tín teldupost á %{email}.
       title: Strika hald
   media_attachments:
     validations:
@@ -1485,6 +1529,8 @@ fo:
     update:
       subject: "%{name} rættaði ein post"
   notifications:
+    administration_emails: Fráboðanir um teldupost til umsitarar
+    email_events: Hendingar fyri teldupostfráboðanir
     email_events_hint: 'Vel hendingar, sum tú vil hava fráboðanir um:'
   number:
     human:
@@ -1643,6 +1689,7 @@ fo:
     import: Innflyt
     import_and_export: Innflyt og útflyt
     migrate: Flyting av kontu
+    notifications: Teldupostfráboðanir
     preferences: Stillingar
     profile: Vangi
     relationships: Fylging og fylgjarar
@@ -1886,6 +1933,7 @@ fo:
     invalid_otp_token: Ógyldug tvey-stigs koda
     otp_lost_help_html: Hevur tú mist atgongd til bæði, so kanst tú koma í samband við %{email}
     rate_limited: Ov nógvar samgildisroyndir, royn aftur seinni.
+    seamless_external_login: Tú er ritað/ur inn umvegis eina uttanhýsis tænastu, so loyniorð og teldupoststillingar eru ikki tøkar.
     signed_in_as: 'Ritað/ur inn sum:'
   verification:
     extra_instructions_html: <strong>Góð ráð:</strong> Leinkið á heimasíðuni hjá tær kann vera ósjónligt. Tann týdningarmikli parturin er <code>rel="me"</code> sum forðar tí, at onkur kann látast at vera ein annar á heimasíðuni við brúkara-gjørdum tilfari. Tú kanst enntá brúka eitt <code>link</code> frámerki í høvdinum á síðuni heldur enn <code>a</code>, men HTML kodan má vera atkomulig uttan at JavaScript skal koyra.
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index ce6107c730832e..b9c582843d1f6f 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -1857,6 +1857,7 @@ ru:
         silence: На учётную запись наложены ограничения
         suspend: Учётная запись заблокирована
     welcome:
+      apps_android_action: Скачать на Google Play
       explanation: Вот несколько советов для новичков
       feature_action: Подробнее
       subject: Добро пожаловать в Mastodon
diff --git a/config/locales/simple_form.en-GB.yml b/config/locales/simple_form.en-GB.yml
index 606b9a4d4040b7..2f40feb5ed6bdf 100644
--- a/config/locales/simple_form.en-GB.yml
+++ b/config/locales/simple_form.en-GB.yml
@@ -314,6 +314,7 @@ en-GB:
         listable: Allow this hashtag to appear in searches and suggestions
         name: Hashtag
         trendable: Allow this hashtag to appear under trends
+        usable: Allow posts to use this hashtag locally
       user:
         role: Role
         time_zone: Time Zone
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 52d81df60c5a47..94d3d7381694ea 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -1521,8 +1521,8 @@ tr:
     poll:
       subject: Anket %{name} tarafından sonlandırıldı
     reblog:
-      body: "%{name} durumunuzu boostladı:"
-      subject: "%{name} durumunuzu paylaştı"
+      body: "%{name} durumunuzu yeniden paylaştı:"
+      subject: "%{name} durumunuzu yeniden paylaştı"
       title: Yeni paylaşım
     status:
       subject: "%{name} az önce gönderdi"
@@ -1721,7 +1721,7 @@ tr:
       video:
         one: "%{count} video"
         other: "%{count} videolar"
-    boosted_from_html: "%{acct_link} kişisinden paylaştı"
+    boosted_from_html: "%{acct_link} kişisinden yeniden paylaştı"
     content_warning: 'İçerik uyarısı: %{warning}'
     default_language: Arayüz diliyle aynı
     disallowed_hashtags:

From fd93f817e75071b8a6d67e063c128b5cb9f45626 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 22 Aug 2024 10:15:54 +0200
Subject: [PATCH 1924/2191] Update dependency aws-sdk-s3 to v1.159.0 (#31518)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 596e32f24db9c3..4d281a1e861b38 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -100,7 +100,7 @@ GEM
     attr_required (1.0.2)
     awrence (1.2.1)
     aws-eventstream (1.3.0)
-    aws-partitions (1.964.0)
+    aws-partitions (1.966.0)
     aws-sdk-core (3.201.5)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
@@ -109,7 +109,7 @@ GEM
     aws-sdk-kms (1.88.0)
       aws-sdk-core (~> 3, >= 3.201.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.158.0)
+    aws-sdk-s3 (1.159.0)
       aws-sdk-core (~> 3, >= 3.201.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)

From 170c6e9733d38f538d20483c11ea72cab2216e44 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 22 Aug 2024 08:27:46 +0000
Subject: [PATCH 1925/2191] Update dependency
 opentelemetry-instrumentation-active_job to v0.7.7 (#31530)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 4d281a1e861b38..8ea4fb66fd05d0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -518,7 +518,7 @@ GEM
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-active_support (~> 0.1)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-active_job (0.7.6)
+    opentelemetry-instrumentation-active_job (0.7.7)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
     opentelemetry-instrumentation-active_model_serializers (0.20.2)

From 376088f6da71e0250e144cc57b42d0dc18822317 Mon Sep 17 00:00:00 2001
From: Emelia Smith <ThisIsMissEm@users.noreply.github.com>
Date: Thu, 22 Aug 2024 10:42:33 +0200
Subject: [PATCH 1926/2191] Add button to view the Hashtag on the instance from
 Hashtags in Moderation UI (#31533)

---
 app/javascript/styles/mastodon/admin.scss | 5 +++++
 app/views/admin/tags/show.html.haml       | 9 ++++++---
 config/locales/en.yml                     | 1 +
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/app/javascript/styles/mastodon/admin.scss b/app/javascript/styles/mastodon/admin.scss
index fd9515cfefa62e..120bad27ed9324 100644
--- a/app/javascript/styles/mastodon/admin.scss
+++ b/app/javascript/styles/mastodon/admin.scss
@@ -244,6 +244,11 @@ $content-width: 840px;
         display: inline-flex;
         flex-flow: wrap;
         gap: 5px;
+        align-items: center;
+
+        .time-period {
+          padding: 0 10px;
+        }
       }
 
       h2 small {
diff --git a/app/views/admin/tags/show.html.haml b/app/views/admin/tags/show.html.haml
index f6155575ae25d0..93387843b2ce41 100644
--- a/app/views/admin/tags/show.html.haml
+++ b/app/views/admin/tags/show.html.haml
@@ -3,9 +3,12 @@
 
 - content_for :heading_actions do
   - if current_user.can?(:view_dashboard)
-    = l(@time_period.first)
-    = ' - '
-    = l(@time_period.last)
+    .time-period
+      = l(@time_period.first)
+      = ' - '
+      = l(@time_period.last)
+
+  = link_to t('admin.tags.open'), tag_url(@tag), class: 'button', target: '_blank', rel: 'noopener noreferrer'
 
 - if current_user.can?(:view_dashboard)
   .dashboard
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 1df9af88d95306..99dcb657f43606 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -898,6 +898,7 @@ en:
       name: Name
       newest: Newest
       oldest: Oldest
+      open: View Publicly
       reset: Reset
       review: Review status
       search: Search

From 4a968cb7a97edd2a613a39fbd8b3f339d6c5002f Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Thu, 22 Aug 2024 12:04:27 +0200
Subject: [PATCH 1927/2191] Add `icon` field to instance endpoint (#30205)

---
 app/helpers/application_helper.rb           | 16 ------------
 app/helpers/instance_helper.rb              | 16 ++++++++++++
 app/serializers/manifest_serializer.rb      |  2 +-
 app/serializers/rest/instance_serializer.rb | 15 ++++++++++-
 spec/helpers/application_helper_spec.rb     | 29 ---------------------
 spec/helpers/instance_helper_spec.rb        | 29 +++++++++++++++++++++
 6 files changed, 60 insertions(+), 47 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 61a8fc59770af4..2799ceecb5949d 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -237,22 +237,6 @@ def mascot_url
     full_asset_url(instance_presenter.mascot&.file&.url || frontend_asset_path('images/elephant_ui_plane.svg'))
   end
 
-  def instance_presenter
-    @instance_presenter ||= InstancePresenter.new
-  end
-
-  def favicon_path(size = '48')
-    instance_presenter.favicon&.file&.url(size)
-  end
-
-  def app_icon_path(size = '48')
-    instance_presenter.app_icon&.file&.url(size)
-  end
-
-  def use_mask_icon?
-    instance_presenter.app_icon.blank?
-  end
-
   private
 
   def storage_host_var
diff --git a/app/helpers/instance_helper.rb b/app/helpers/instance_helper.rb
index 893afdd51ff100..018c69e62074a1 100644
--- a/app/helpers/instance_helper.rb
+++ b/app/helpers/instance_helper.rb
@@ -13,6 +13,22 @@ def description_for_sign_up(invite = nil)
     safe_join([description_prefix(invite), I18n.t('auth.description.suffix')], ' ')
   end
 
+  def instance_presenter
+    @instance_presenter ||= InstancePresenter.new
+  end
+
+  def favicon_path(size = '48')
+    instance_presenter.favicon&.file&.url(size)
+  end
+
+  def app_icon_path(size = '48')
+    instance_presenter.app_icon&.file&.url(size)
+  end
+
+  def use_mask_icon?
+    instance_presenter.app_icon.blank?
+  end
+
   private
 
   def description_prefix(invite)
diff --git a/app/serializers/manifest_serializer.rb b/app/serializers/manifest_serializer.rb
index a39fb5ef540765..cf0164c24a34b8 100644
--- a/app/serializers/manifest_serializer.rb
+++ b/app/serializers/manifest_serializer.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class ManifestSerializer < ActiveModel::Serializer
-  include ApplicationHelper
+  include InstanceHelper
   include RoutingHelper
   include ActionView::Helpers::TextHelper
 
diff --git a/app/serializers/rest/instance_serializer.rb b/app/serializers/rest/instance_serializer.rb
index 5475bd12b43f2f..084701657e85c9 100644
--- a/app/serializers/rest/instance_serializer.rb
+++ b/app/serializers/rest/instance_serializer.rb
@@ -7,10 +7,11 @@ class ContactSerializer < ActiveModel::Serializer
     has_one :account, serializer: REST::AccountSerializer
   end
 
+  include InstanceHelper
   include RoutingHelper
 
   attributes :domain, :title, :version, :source_url, :description,
-             :usage, :thumbnail, :languages, :configuration,
+             :usage, :thumbnail, :icon, :languages, :configuration,
              :registrations, :api_versions
 
   has_one :contact, serializer: ContactSerializer
@@ -33,6 +34,18 @@ def thumbnail
     end
   end
 
+  def icon
+    SiteUpload::ANDROID_ICON_SIZES.map do |size|
+      src = app_icon_path(size.to_i)
+      src = URI.join(root_url, src).to_s if src.present?
+
+      {
+        src: src || frontend_asset_url("icons/android-chrome-#{size}x#{size}.png"),
+        size: "#{size}x#{size}",
+      }
+    end
+  end
+
   def usage
     {
       users: {
diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
index 2205167e5d13c6..0bfce6946b1a87 100644
--- a/spec/helpers/application_helper_spec.rb
+++ b/spec/helpers/application_helper_spec.rb
@@ -288,33 +288,4 @@ def current_theme = 'default'
       end
     end
   end
-
-  describe 'favicon' do
-    context 'when an icon exists' do
-      let!(:favicon) { Fabricate(:site_upload, var: 'favicon') }
-      let!(:app_icon) { Fabricate(:site_upload, var: 'app_icon') }
-
-      it 'returns the URL of the icon' do
-        expect(helper.favicon_path).to eq(favicon.file.url('48'))
-        expect(helper.app_icon_path).to eq(app_icon.file.url('48'))
-      end
-
-      it 'returns the URL of the icon with size parameter' do
-        expect(helper.favicon_path(16)).to eq(favicon.file.url('16'))
-        expect(helper.app_icon_path(16)).to eq(app_icon.file.url('16'))
-      end
-    end
-
-    context 'when an icon does not exist' do
-      it 'returns nil' do
-        expect(helper.favicon_path).to be_nil
-        expect(helper.app_icon_path).to be_nil
-      end
-
-      it 'returns nil with size parameter' do
-        expect(helper.favicon_path(16)).to be_nil
-        expect(helper.app_icon_path(16)).to be_nil
-      end
-    end
-  end
 end
diff --git a/spec/helpers/instance_helper_spec.rb b/spec/helpers/instance_helper_spec.rb
index 7e39b7cb3d1eaf..9a2d8841586e31 100644
--- a/spec/helpers/instance_helper_spec.rb
+++ b/spec/helpers/instance_helper_spec.rb
@@ -24,4 +24,33 @@
       expect(helper.site_hostname).to eq 'example.com'
     end
   end
+
+  describe 'favicon' do
+    context 'when an icon exists' do
+      let!(:favicon) { Fabricate(:site_upload, var: 'favicon') }
+      let!(:app_icon) { Fabricate(:site_upload, var: 'app_icon') }
+
+      it 'returns the URL of the icon' do
+        expect(helper.favicon_path).to eq(favicon.file.url('48'))
+        expect(helper.app_icon_path).to eq(app_icon.file.url('48'))
+      end
+
+      it 'returns the URL of the icon with size parameter' do
+        expect(helper.favicon_path(16)).to eq(favicon.file.url('16'))
+        expect(helper.app_icon_path(16)).to eq(app_icon.file.url('16'))
+      end
+    end
+
+    context 'when an icon does not exist' do
+      it 'returns nil' do
+        expect(helper.favicon_path).to be_nil
+        expect(helper.app_icon_path).to be_nil
+      end
+
+      it 'returns nil with size parameter' do
+        expect(helper.favicon_path(16)).to be_nil
+        expect(helper.app_icon_path(16)).to be_nil
+      end
+    end
+  end
 end

From c70dc5f0d7c05f4886c2ba748c0e407988267cdc Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 22 Aug 2024 13:50:46 +0200
Subject: [PATCH 1928/2191] Update dependency node to 20.17 (#31531)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .nvmrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.nvmrc b/.nvmrc
index 1bdd901e66fd02..65da8ce3917325 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-20.16
+20.17

From 61d9704f6d768f10f8f4a41e7bc3145003586b6e Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 22 Aug 2024 11:51:30 +0000
Subject: [PATCH 1929/2191] Update babel monorepo to v7.25.4 (#31542)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 222 +++++++++++++++++++++++-------------------------------
 1 file changed, 96 insertions(+), 126 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index c3dc1c5d3f8545..e1e36d207eddef 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -52,10 +52,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/compat-data@npm:^7.22.6, @babel/compat-data@npm:^7.25.2":
-  version: 7.25.2
-  resolution: "@babel/compat-data@npm:7.25.2"
-  checksum: 10c0/5bf1f14d6e5f0d37c19543e99209ff4a94bb97915e1ce01e5334a144aa08cd56b6e62ece8135dac77e126723d63d4d4b96fc603a12c43b88c28f4b5e070270c5
+"@babel/compat-data@npm:^7.22.6, @babel/compat-data@npm:^7.25.2, @babel/compat-data@npm:^7.25.4":
+  version: 7.25.4
+  resolution: "@babel/compat-data@npm:7.25.4"
+  checksum: 10c0/50d79734d584a28c69d6f5b99adfaa064d0f41609a378aef04eb06accc5b44f8520e68549eba3a082478180957b7d5783f1bfb1672e4ae8574e797ce8bae79fa
   languageName: node
   linkType: hard
 
@@ -82,15 +82,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/generator@npm:^7.25.0, @babel/generator@npm:^7.7.2":
-  version: 7.25.0
-  resolution: "@babel/generator@npm:7.25.0"
+"@babel/generator@npm:^7.25.0, @babel/generator@npm:^7.25.4, @babel/generator@npm:^7.7.2":
+  version: 7.25.4
+  resolution: "@babel/generator@npm:7.25.4"
   dependencies:
-    "@babel/types": "npm:^7.25.0"
+    "@babel/types": "npm:^7.25.4"
     "@jridgewell/gen-mapping": "npm:^0.3.5"
     "@jridgewell/trace-mapping": "npm:^0.3.25"
     jsesc: "npm:^2.5.1"
-  checksum: 10c0/d0e2dfcdc8bdbb5dded34b705ceebf2e0bc1b06795a1530e64fb6a3ccf313c189db7f60c1616effae48114e1a25adc75855bc4496f3779a396b3377bae718ce7
+  checksum: 10c0/a2d8cc39e759214740f836360c8d9c17aa93e16e41afe73368a9e7ccd1d5c3303a420ce3aca1c9a31fdb93d1899de471d5aac97d1c64f741f8750a25a6e91fbc
   languageName: node
   linkType: hard
 
@@ -136,26 +136,24 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-create-class-features-plugin@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/helper-create-class-features-plugin@npm:7.24.7"
+"@babel/helper-create-class-features-plugin@npm:^7.24.7, @babel/helper-create-class-features-plugin@npm:^7.25.4":
+  version: 7.25.4
+  resolution: "@babel/helper-create-class-features-plugin@npm:7.25.4"
   dependencies:
     "@babel/helper-annotate-as-pure": "npm:^7.24.7"
-    "@babel/helper-environment-visitor": "npm:^7.24.7"
-    "@babel/helper-function-name": "npm:^7.24.7"
-    "@babel/helper-member-expression-to-functions": "npm:^7.24.7"
+    "@babel/helper-member-expression-to-functions": "npm:^7.24.8"
     "@babel/helper-optimise-call-expression": "npm:^7.24.7"
-    "@babel/helper-replace-supers": "npm:^7.24.7"
+    "@babel/helper-replace-supers": "npm:^7.25.0"
     "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.24.7"
-    "@babel/helper-split-export-declaration": "npm:^7.24.7"
+    "@babel/traverse": "npm:^7.25.4"
     semver: "npm:^6.3.1"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10c0/6b7b47d70b41c00f39f86790cff67acf2bce0289d52a7c182b28e797f4e0e6d69027e3d06eccf1d54dddc2e5dde1df663bb1932437e5f447aeb8635d8d64a6ab
+  checksum: 10c0/a765d9e0482e13cf96642fa8aa28e6f7d4d7d39f37840d6246e5e10a7c47f47c52d52522edd3073f229449d17ec0db6f9b7b5e398bff6bb0b4994d65957a164c
   languageName: node
   linkType: hard
 
-"@babel/helper-create-regexp-features-plugin@npm:^7.18.6, @babel/helper-create-regexp-features-plugin@npm:^7.24.7, @babel/helper-create-regexp-features-plugin@npm:^7.25.0":
+"@babel/helper-create-regexp-features-plugin@npm:^7.18.6, @babel/helper-create-regexp-features-plugin@npm:^7.24.7, @babel/helper-create-regexp-features-plugin@npm:^7.25.0, @babel/helper-create-regexp-features-plugin@npm:^7.25.2":
   version: 7.25.2
   resolution: "@babel/helper-create-regexp-features-plugin@npm:7.25.2"
   dependencies:
@@ -168,9 +166,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-define-polyfill-provider@npm:^0.6.1":
-  version: 0.6.1
-  resolution: "@babel/helper-define-polyfill-provider@npm:0.6.1"
+"@babel/helper-define-polyfill-provider@npm:^0.6.1, @babel/helper-define-polyfill-provider@npm:^0.6.2":
+  version: 0.6.2
+  resolution: "@babel/helper-define-polyfill-provider@npm:0.6.2"
   dependencies:
     "@babel/helper-compilation-targets": "npm:^7.22.6"
     "@babel/helper-plugin-utils": "npm:^7.22.5"
@@ -179,30 +177,11 @@ __metadata:
     resolve: "npm:^1.14.2"
   peerDependencies:
     "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0
-  checksum: 10c0/210e1c8ac118f7c5a0ef5b42c4267c3db2f59b1ebc666a275d442b86896de4a66ef93539d702870f172f9749cd44c89f53056a5b17e619c3142b12ed4e4e6aae
+  checksum: 10c0/f777fe0ee1e467fdaaac059c39ed203bdc94ef2465fb873316e9e1acfc511a276263724b061e3b0af2f6d7ad3ff174f2bb368fde236a860e0f650fda43d7e022
   languageName: node
   linkType: hard
 
-"@babel/helper-environment-visitor@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/helper-environment-visitor@npm:7.24.7"
-  dependencies:
-    "@babel/types": "npm:^7.24.7"
-  checksum: 10c0/36ece78882b5960e2d26abf13cf15ff5689bf7c325b10a2895a74a499e712de0d305f8d78bb382dd3c05cfba7e47ec98fe28aab5674243e0625cd38438dd0b2d
-  languageName: node
-  linkType: hard
-
-"@babel/helper-function-name@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/helper-function-name@npm:7.24.7"
-  dependencies:
-    "@babel/template": "npm:^7.24.7"
-    "@babel/types": "npm:^7.24.7"
-  checksum: 10c0/e5e41e6cf86bd0f8bf272cbb6e7c5ee0f3e9660414174435a46653efba4f2479ce03ce04abff2aa2ef9359cf057c79c06cb7b134a565ad9c0e8a50dcdc3b43c4
-  languageName: node
-  linkType: hard
-
-"@babel/helper-member-expression-to-functions@npm:^7.24.7, @babel/helper-member-expression-to-functions@npm:^7.24.8":
+"@babel/helper-member-expression-to-functions@npm:^7.24.8":
   version: 7.24.8
   resolution: "@babel/helper-member-expression-to-functions@npm:7.24.8"
   dependencies:
@@ -298,15 +277,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-split-export-declaration@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/helper-split-export-declaration@npm:7.24.7"
-  dependencies:
-    "@babel/types": "npm:^7.24.7"
-  checksum: 10c0/0254577d7086bf09b01bbde98f731d4fcf4b7c3fa9634fdb87929801307c1f6202a1352e3faa5492450fa8da4420542d44de604daf540704ff349594a78184f6
-  languageName: node
-  linkType: hard
-
 "@babel/helper-string-parser@npm:^7.24.8":
   version: 7.24.8
   resolution: "@babel/helper-string-parser@npm:7.24.8"
@@ -361,14 +331,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.25.0, @babel/parser@npm:^7.25.3":
-  version: 7.25.3
-  resolution: "@babel/parser@npm:7.25.3"
+"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.25.0, @babel/parser@npm:^7.25.4":
+  version: 7.25.4
+  resolution: "@babel/parser@npm:7.25.4"
   dependencies:
-    "@babel/types": "npm:^7.25.2"
+    "@babel/types": "npm:^7.25.4"
   bin:
     parser: ./bin/babel-parser.js
-  checksum: 10c0/874b01349aedb805d6694f867a752fdc7469778fad76aca4548d2cc6ce96087c3ba5fb917a6f8d05d2d1a74aae309b5f50f1a4dba035f5a2c9fcfe6e106d2c4e
+  checksum: 10c0/bdada5662f15d1df11a7266ec3bc9bb769bf3637ecf3d051eafcfc8f576dcf5a3ac1007c5e059db4a1e1387db9ae9caad239fc4f79e4c2200930ed610e779993
   languageName: node
   linkType: hard
 
@@ -683,17 +653,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-async-generator-functions@npm:^7.25.0":
-  version: 7.25.0
-  resolution: "@babel/plugin-transform-async-generator-functions@npm:7.25.0"
+"@babel/plugin-transform-async-generator-functions@npm:^7.25.4":
+  version: 7.25.4
+  resolution: "@babel/plugin-transform-async-generator-functions@npm:7.25.4"
   dependencies:
     "@babel/helper-plugin-utils": "npm:^7.24.8"
     "@babel/helper-remap-async-to-generator": "npm:^7.25.0"
     "@babel/plugin-syntax-async-generators": "npm:^7.8.4"
-    "@babel/traverse": "npm:^7.25.0"
+    "@babel/traverse": "npm:^7.25.4"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/5348c3a33d16e0d62f13482c6fa432185ba096d58880b08d42450f7db662d6b03e6149d495c8620897dcd3da35061068cbd6c09da7d0ec95743e55a788809e4e
+  checksum: 10c0/efed6f6be90b25ad77c15a622a0dc0b22dbf5d45599c207ab8fbc4e959aef21f574fa467d9cf872e45de664a46c32334e78dee2332d82f5f27e26249a34a0920
   languageName: node
   linkType: hard
 
@@ -732,15 +702,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-class-properties@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/plugin-transform-class-properties@npm:7.24.7"
+"@babel/plugin-transform-class-properties@npm:^7.25.4":
+  version: 7.25.4
+  resolution: "@babel/plugin-transform-class-properties@npm:7.25.4"
   dependencies:
-    "@babel/helper-create-class-features-plugin": "npm:^7.24.7"
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
+    "@babel/helper-create-class-features-plugin": "npm:^7.25.4"
+    "@babel/helper-plugin-utils": "npm:^7.24.8"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/75018a466c7ede3d2397e158891c224ba7fca72864506ce067ddbc02fc65191d44da4d6379c996d0c7f09019e26b5c3f5f1d3a639cd98366519723886f0689d0
+  checksum: 10c0/0b41bc8a5920d3d17c7c06220b601cf43e0a32ac34f05f05cd0cdf08915e4521b1b707cb1e60942b4fc68a5dfac09f0444a8720e0c72ce76fb039e8ec5263115
   languageName: node
   linkType: hard
 
@@ -757,19 +727,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-classes@npm:^7.25.0":
-  version: 7.25.0
-  resolution: "@babel/plugin-transform-classes@npm:7.25.0"
+"@babel/plugin-transform-classes@npm:^7.25.4":
+  version: 7.25.4
+  resolution: "@babel/plugin-transform-classes@npm:7.25.4"
   dependencies:
     "@babel/helper-annotate-as-pure": "npm:^7.24.7"
-    "@babel/helper-compilation-targets": "npm:^7.24.8"
+    "@babel/helper-compilation-targets": "npm:^7.25.2"
     "@babel/helper-plugin-utils": "npm:^7.24.8"
     "@babel/helper-replace-supers": "npm:^7.25.0"
-    "@babel/traverse": "npm:^7.25.0"
+    "@babel/traverse": "npm:^7.25.4"
     globals: "npm:^11.1.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/4451dccf8a7979427ae042afe381233f30764a8072faf0de1337a4fc297c6d7cb40df9e28931ac096e5b56392d0cd97d3ce10aee68288150a8701624d362a791
+  checksum: 10c0/c68424d9dd64860825111aa4a4ed5caf29494b7a02ddb9c36351d768c41e8e05127d89274795cdfcade032d9d299e6c677418259df58c71e68f1741583dcf467
   languageName: node
   linkType: hard
 
@@ -1098,15 +1068,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-private-methods@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/plugin-transform-private-methods@npm:7.24.7"
+"@babel/plugin-transform-private-methods@npm:^7.25.4":
+  version: 7.25.4
+  resolution: "@babel/plugin-transform-private-methods@npm:7.25.4"
   dependencies:
-    "@babel/helper-create-class-features-plugin": "npm:^7.24.7"
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
+    "@babel/helper-create-class-features-plugin": "npm:^7.25.4"
+    "@babel/helper-plugin-utils": "npm:^7.24.8"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/5b7bf923b738fbe3ad6c33b260e0a7451be288edfe4ef516303fa787a1870cd87533bfbf61abb779c22ed003c2fc484dec2436fe75a48756f686c0241173d364
+  checksum: 10c0/7abdb427c3984a2c8a2e9d806297d8509b02f78a3501b7760e544be532446e9df328b876daa8fc38718f3dce7ccc45083016ee7aeaab169b81c142bc18700794
   languageName: node
   linkType: hard
 
@@ -1231,18 +1201,18 @@ __metadata:
   linkType: hard
 
 "@babel/plugin-transform-runtime@npm:^7.22.4":
-  version: 7.24.7
-  resolution: "@babel/plugin-transform-runtime@npm:7.24.7"
+  version: 7.25.4
+  resolution: "@babel/plugin-transform-runtime@npm:7.25.4"
   dependencies:
     "@babel/helper-module-imports": "npm:^7.24.7"
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.8"
     babel-plugin-polyfill-corejs2: "npm:^0.4.10"
-    babel-plugin-polyfill-corejs3: "npm:^0.10.1"
+    babel-plugin-polyfill-corejs3: "npm:^0.10.6"
     babel-plugin-polyfill-regenerator: "npm:^0.6.1"
     semver: "npm:^6.3.1"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/a33f5095872bbba00b8ee553dfe6941477e69a017a2e65e9dd86e80dab5c627635093b796eb1eb22aaaf2f874704f63ad1d99b952b83b59ef6b368ae04e5bb41
+  checksum: 10c0/c08698276596d58bf49e222ead3c414c35d099a7e5a6174b11e2db9b74420e94783ada596820437622c3eccc8852c0e750ad053bd8e775f0050839479ba76e6a
   languageName: node
   linkType: hard
 
@@ -1351,23 +1321,23 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-unicode-sets-regex@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/plugin-transform-unicode-sets-regex@npm:7.24.7"
+"@babel/plugin-transform-unicode-sets-regex@npm:^7.25.4":
+  version: 7.25.4
+  resolution: "@babel/plugin-transform-unicode-sets-regex@npm:7.25.4"
   dependencies:
-    "@babel/helper-create-regexp-features-plugin": "npm:^7.24.7"
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
+    "@babel/helper-create-regexp-features-plugin": "npm:^7.25.2"
+    "@babel/helper-plugin-utils": "npm:^7.24.8"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10c0/7457c0ee8e80a80cb6fdc1fe54ab115b52815627616ce9151be8ef292fc99d04a910ec24f11382b4f124b89374264396892b086886bd2a9c2317904d87c9b21b
+  checksum: 10c0/f65749835a98d8d6242e961f9276bdcdb09020e791d151ccc145acaca9a66f025b2c7cb761104f139180d35eb066a429596ee6edece81f5fd9244e0edb97d7ec
   languageName: node
   linkType: hard
 
 "@babel/preset-env@npm:^7.11.0, @babel/preset-env@npm:^7.12.1, @babel/preset-env@npm:^7.22.4":
-  version: 7.25.3
-  resolution: "@babel/preset-env@npm:7.25.3"
+  version: 7.25.4
+  resolution: "@babel/preset-env@npm:7.25.4"
   dependencies:
-    "@babel/compat-data": "npm:^7.25.2"
+    "@babel/compat-data": "npm:^7.25.4"
     "@babel/helper-compilation-targets": "npm:^7.25.2"
     "@babel/helper-plugin-utils": "npm:^7.24.8"
     "@babel/helper-validator-option": "npm:^7.24.8"
@@ -1396,13 +1366,13 @@ __metadata:
     "@babel/plugin-syntax-top-level-await": "npm:^7.14.5"
     "@babel/plugin-syntax-unicode-sets-regex": "npm:^7.18.6"
     "@babel/plugin-transform-arrow-functions": "npm:^7.24.7"
-    "@babel/plugin-transform-async-generator-functions": "npm:^7.25.0"
+    "@babel/plugin-transform-async-generator-functions": "npm:^7.25.4"
     "@babel/plugin-transform-async-to-generator": "npm:^7.24.7"
     "@babel/plugin-transform-block-scoped-functions": "npm:^7.24.7"
     "@babel/plugin-transform-block-scoping": "npm:^7.25.0"
-    "@babel/plugin-transform-class-properties": "npm:^7.24.7"
+    "@babel/plugin-transform-class-properties": "npm:^7.25.4"
     "@babel/plugin-transform-class-static-block": "npm:^7.24.7"
-    "@babel/plugin-transform-classes": "npm:^7.25.0"
+    "@babel/plugin-transform-classes": "npm:^7.25.4"
     "@babel/plugin-transform-computed-properties": "npm:^7.24.7"
     "@babel/plugin-transform-destructuring": "npm:^7.24.8"
     "@babel/plugin-transform-dotall-regex": "npm:^7.24.7"
@@ -1430,7 +1400,7 @@ __metadata:
     "@babel/plugin-transform-optional-catch-binding": "npm:^7.24.7"
     "@babel/plugin-transform-optional-chaining": "npm:^7.24.8"
     "@babel/plugin-transform-parameters": "npm:^7.24.7"
-    "@babel/plugin-transform-private-methods": "npm:^7.24.7"
+    "@babel/plugin-transform-private-methods": "npm:^7.25.4"
     "@babel/plugin-transform-private-property-in-object": "npm:^7.24.7"
     "@babel/plugin-transform-property-literals": "npm:^7.24.7"
     "@babel/plugin-transform-regenerator": "npm:^7.24.7"
@@ -1443,16 +1413,16 @@ __metadata:
     "@babel/plugin-transform-unicode-escapes": "npm:^7.24.7"
     "@babel/plugin-transform-unicode-property-regex": "npm:^7.24.7"
     "@babel/plugin-transform-unicode-regex": "npm:^7.24.7"
-    "@babel/plugin-transform-unicode-sets-regex": "npm:^7.24.7"
+    "@babel/plugin-transform-unicode-sets-regex": "npm:^7.25.4"
     "@babel/preset-modules": "npm:0.1.6-no-external-plugins"
     babel-plugin-polyfill-corejs2: "npm:^0.4.10"
-    babel-plugin-polyfill-corejs3: "npm:^0.10.4"
+    babel-plugin-polyfill-corejs3: "npm:^0.10.6"
     babel-plugin-polyfill-regenerator: "npm:^0.6.1"
     core-js-compat: "npm:^3.37.1"
     semver: "npm:^6.3.1"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/9287dc2e296fe2aa3367d84c2a799db17c9d1e48bba86525f47c6f51f5ba2e2cce454f45f4ae2ef928f9077c0640b04556b55b94835675ceeca94a0c5133205e
+  checksum: 10c0/ed210a1974b5a1e7f80a933c87253907ec869457cea900bc97892642fa9a690c47627a9bac08a7c9495deb992a2b15f308ffca2741e1876ba47172c96fa27e14
   languageName: node
   linkType: hard
 
@@ -1517,11 +1487,11 @@ __metadata:
   linkType: hard
 
 "@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.0, @babel/runtime@npm:^7.12.13, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.13.8, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.2.0, @babel/runtime@npm:^7.20.13, @babel/runtime@npm:^7.22.3, @babel/runtime@npm:^7.3.1, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.6.3, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.8.7, @babel/runtime@npm:^7.9.2":
-  version: 7.25.0
-  resolution: "@babel/runtime@npm:7.25.0"
+  version: 7.25.4
+  resolution: "@babel/runtime@npm:7.25.4"
   dependencies:
     regenerator-runtime: "npm:^0.14.0"
-  checksum: 10c0/bd3faf246170826cef2071a94d7b47b49d532351360ecd17722d03f6713fd93a3eb3dbd9518faa778d5e8ccad7392a7a604e56bd37aaad3f3aa68d619ccd983d
+  checksum: 10c0/33e937e685f0bfc2d40c219261e2e50d0df7381a6e7cbf56b770e0c5d77cb0c21bf4d97da566cf0164317ed7508e992082c7b6cce7aaa3b17da5794f93fbfb46
   languageName: node
   linkType: hard
 
@@ -1536,29 +1506,29 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/traverse@npm:7, @babel/traverse@npm:^7.24.7, @babel/traverse@npm:^7.24.8, @babel/traverse@npm:^7.25.0, @babel/traverse@npm:^7.25.1, @babel/traverse@npm:^7.25.2, @babel/traverse@npm:^7.25.3":
-  version: 7.25.3
-  resolution: "@babel/traverse@npm:7.25.3"
+"@babel/traverse@npm:7, @babel/traverse@npm:^7.24.7, @babel/traverse@npm:^7.24.8, @babel/traverse@npm:^7.25.0, @babel/traverse@npm:^7.25.1, @babel/traverse@npm:^7.25.2, @babel/traverse@npm:^7.25.3, @babel/traverse@npm:^7.25.4":
+  version: 7.25.4
+  resolution: "@babel/traverse@npm:7.25.4"
   dependencies:
     "@babel/code-frame": "npm:^7.24.7"
-    "@babel/generator": "npm:^7.25.0"
-    "@babel/parser": "npm:^7.25.3"
+    "@babel/generator": "npm:^7.25.4"
+    "@babel/parser": "npm:^7.25.4"
     "@babel/template": "npm:^7.25.0"
-    "@babel/types": "npm:^7.25.2"
+    "@babel/types": "npm:^7.25.4"
     debug: "npm:^4.3.1"
     globals: "npm:^11.1.0"
-  checksum: 10c0/4c8a1966fa90b53a783a4afd2fcdaa6ab1a912e6621dca9fcc6633e80ccb9491620e88caf73b537da4e16cefd537b548c87d7087868d5b0066414dea375c0e9b
+  checksum: 10c0/37c9b49b277e051fe499ef5f6f217370c4f648d6370564d70b5e6beb2da75bfda6d7dab1d39504d89e9245448f8959bc1a5880d2238840cdc3979b35338ed0f5
   languageName: node
   linkType: hard
 
-"@babel/types@npm:^7.0.0, @babel/types@npm:^7.0.0-beta.49, @babel/types@npm:^7.12.11, @babel/types@npm:^7.12.6, @babel/types@npm:^7.20.7, @babel/types@npm:^7.24.7, @babel/types@npm:^7.24.8, @babel/types@npm:^7.25.0, @babel/types@npm:^7.25.2, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4":
-  version: 7.25.2
-  resolution: "@babel/types@npm:7.25.2"
+"@babel/types@npm:^7.0.0, @babel/types@npm:^7.0.0-beta.49, @babel/types@npm:^7.12.11, @babel/types@npm:^7.12.6, @babel/types@npm:^7.20.7, @babel/types@npm:^7.24.7, @babel/types@npm:^7.24.8, @babel/types@npm:^7.25.0, @babel/types@npm:^7.25.2, @babel/types@npm:^7.25.4, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4":
+  version: 7.25.4
+  resolution: "@babel/types@npm:7.25.4"
   dependencies:
     "@babel/helper-string-parser": "npm:^7.24.8"
     "@babel/helper-validator-identifier": "npm:^7.24.7"
     to-fast-properties: "npm:^2.0.0"
-  checksum: 10c0/e489435856be239f8cc1120c90a197e4c2865385121908e5edb7223cfdff3768cba18f489adfe0c26955d9e7bbb1fb10625bc2517505908ceb0af848989bd864
+  checksum: 10c0/9aa25dfcd89cc4e4dde3188091c34398a005a49e2c2b069d0367b41e1122c91e80fd92998c52a90f2fb500f7e897b6090ec8be263d9cb53d0d75c756f44419f2
   languageName: node
   linkType: hard
 
@@ -5297,15 +5267,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"babel-plugin-polyfill-corejs3@npm:^0.10.1, babel-plugin-polyfill-corejs3@npm:^0.10.4":
-  version: 0.10.4
-  resolution: "babel-plugin-polyfill-corejs3@npm:0.10.4"
+"babel-plugin-polyfill-corejs3@npm:^0.10.6":
+  version: 0.10.6
+  resolution: "babel-plugin-polyfill-corejs3@npm:0.10.6"
   dependencies:
-    "@babel/helper-define-polyfill-provider": "npm:^0.6.1"
-    core-js-compat: "npm:^3.36.1"
+    "@babel/helper-define-polyfill-provider": "npm:^0.6.2"
+    core-js-compat: "npm:^3.38.0"
   peerDependencies:
     "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0
-  checksum: 10c0/31b92cd3dfb5b417da8dfcf0deaa4b8b032b476d7bb31ca51c66127cf25d41e89260e89d17bc004b2520faa38aa9515fafabf81d89f9d4976e9dc1163e4a7c41
+  checksum: 10c0/3a69220471b07722c2ae6537310bf26b772514e12b601398082965459c838be70a0ca70b0662f0737070654ff6207673391221d48599abb4a2b27765206d9f79
   languageName: node
   linkType: hard
 
@@ -6371,12 +6341,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"core-js-compat@npm:^3.36.1, core-js-compat@npm:^3.37.1":
-  version: 3.37.1
-  resolution: "core-js-compat@npm:3.37.1"
+"core-js-compat@npm:^3.37.1, core-js-compat@npm:^3.38.0":
+  version: 3.38.1
+  resolution: "core-js-compat@npm:3.38.1"
   dependencies:
-    browserslist: "npm:^4.23.0"
-  checksum: 10c0/4e2da9c900f2951a57947af7aeef4d16f2c75d7f7e966c0d0b62953f65225003ade5e84d3ae98847f65b24c109c606821d9dc925db8ca418fb761e7c81963c2a
+    browserslist: "npm:^4.23.3"
+  checksum: 10c0/d8bc8a35591fc5fbf3e376d793f298ec41eb452619c7ef9de4ea59b74be06e9fda799e0dcbf9ba59880dae87e3b41fb191d744ffc988315642a1272bb9442b31
   languageName: node
   linkType: hard
 

From abe292b0ec7f1e5ae0871db0492e191c65a18784 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 22 Aug 2024 15:42:02 +0200
Subject: [PATCH 1930/2191] Hide multiple selection bar for notification
 requests when no notificion requests are loaded (#31540)

---
 app/javascript/mastodon/features/notifications/requests.jsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/features/notifications/requests.jsx b/app/javascript/mastodon/features/notifications/requests.jsx
index f35c042ba6c7e4..622a171fd30026 100644
--- a/app/javascript/mastodon/features/notifications/requests.jsx
+++ b/app/javascript/mastodon/features/notifications/requests.jsx
@@ -217,7 +217,9 @@ export const NotificationRequests = ({ multiColumn }) => {
         multiColumn={multiColumn}
         showBackButton
         appendContent={
-          <SelectRow selectionMode={selectionMode} setSelectionMode={setSelectionMode} selectAllChecked={selectAllChecked} toggleSelectAll={toggleSelectAll} selectedItems={checkedRequestIds} />}
+          notificationRequests.size > 0 && (
+            <SelectRow selectionMode={selectionMode} setSelectionMode={setSelectionMode} selectAllChecked={selectAllChecked} toggleSelectAll={toggleSelectAll} selectedItems={checkedRequestIds} />
+          )}
       >
         <ColumnSettings />
       </ColumnHeader>

From 98237207e67697abffc6b141f2388e3d8c925260 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 22 Aug 2024 15:42:04 +0200
Subject: [PATCH 1931/2191] =?UTF-8?q?Fix=20unnecessary=20=E2=80=9Cnext?=
 =?UTF-8?q?=E2=80=9D=20link=20when=20API=20returns=20fewer=20notification?=
 =?UTF-8?q?=20requests=20than=20requested=20(#31541)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/api/v1/notifications/requests_controller.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/controllers/api/v1/notifications/requests_controller.rb b/app/controllers/api/v1/notifications/requests_controller.rb
index b820a2ed2e98cf..36ee073b9cef27 100644
--- a/app/controllers/api/v1/notifications/requests_controller.rb
+++ b/app/controllers/api/v1/notifications/requests_controller.rb
@@ -75,13 +75,17 @@ def set_requests
   end
 
   def next_path
-    api_v1_notifications_requests_url pagination_params(max_id: pagination_max_id) unless @requests.empty?
+    api_v1_notifications_requests_url pagination_params(max_id: pagination_max_id) if records_continue?
   end
 
   def prev_path
     api_v1_notifications_requests_url pagination_params(min_id: pagination_since_id) unless @requests.empty?
   end
 
+  def records_continue?
+    @requests.size == limit_param(DEFAULT_ACCOUNTS_LIMIT)
+  end
+
   def pagination_max_id
     @requests.last.id
   end

From 500f4925a5e5ee45f2576ee3b0c603a0ab851840 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 22 Aug 2024 19:12:35 +0200
Subject: [PATCH 1932/2191] Change how content warnings and filters are
 displayed in web UI (#31365)

---
 app/javascript/images/filter-stripes.svg      |  24 ++++
 .../mastodon/components/content_warning.tsx   |  15 +++
 .../mastodon/components/filter_warning.tsx    |  23 ++++
 app/javascript/mastodon/components/status.jsx |  86 +++++++--------
 .../mastodon/components/status_action_bar.jsx |  12 --
 .../mastodon/components/status_banner.tsx     |  37 +++++++
 .../mastodon/components/status_content.jsx    |  56 +---------
 .../components/embedded_status.tsx            |  35 ++++--
 .../status/components/detailed_status.jsx     |  22 ++--
 app/javascript/mastodon/locales/en.json       |   8 +-
 .../styles/mastodon/components.scss           | 104 ++++++++++++++++--
 11 files changed, 281 insertions(+), 141 deletions(-)
 create mode 100755 app/javascript/images/filter-stripes.svg
 create mode 100644 app/javascript/mastodon/components/content_warning.tsx
 create mode 100644 app/javascript/mastodon/components/filter_warning.tsx
 create mode 100644 app/javascript/mastodon/components/status_banner.tsx

diff --git a/app/javascript/images/filter-stripes.svg b/app/javascript/images/filter-stripes.svg
new file mode 100755
index 00000000000000..4c1b58cb744f7e
--- /dev/null
+++ b/app/javascript/images/filter-stripes.svg
@@ -0,0 +1,24 @@
+<svg width="5" height="80" viewBox="0 0 5 80" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_954_5239)">
+<rect width="5" height="80" transform="matrix(1 0 0 -1 0 80)" fill="#2F0C7A"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6.35524 84C6.46234 83.9609 6.57112 83.9208 6.68172 83.8795C6.79039 83.839 7.16116 83.7 7.21197 83.681C10.0919 82.6043 11.8941 82.2 15 82.2C18.0813 82.2 19.6086 82.5665 22.3886 83.6785C22.6753 83.7932 22.9494 83.9003 23.2136 84H25.0812C24.3279 83.7808 23.5395 83.4927 22.6114 83.1215C19.7664 81.9835 18.1687 81.6 15 81.6C11.8122 81.6 9.94344 82.0192 7.00185 83.119C6.95066 83.1381 6.58016 83.277 6.47198 83.3174C5.72954 83.5944 5.0738 83.8198 4.45483 84H6.35524ZM6.35524 78C3.97726 78.8676 2.42302 79.2 0 79.2L0 78.6C1.72318 78.6 2.98542 78.4277 4.45483 78H6.35524ZM23.2136 78C25.5716 78.8899 27.1507 79.2 30 79.2V78.6C27.9473 78.6 26.5843 78.4373 25.0812 78L23.2136 78ZM0 82.2C2.53215 82.2 4.1155 81.837 6.68172 80.8795C6.79039 80.839 7.16116 80.7 7.21197 80.681C10.0919 79.6043 11.8941 79.2 15 79.2C18.0813 79.2 19.6086 79.5665 22.3886 80.6785C25.2336 81.8165 26.8313 82.2 30 82.2V81.6C26.9187 81.6 25.3914 81.2335 22.6114 80.1215C19.7664 78.9835 18.1687 78.6 15 78.6C11.8122 78.6 9.94344 79.0192 7.00185 80.119C6.95066 80.1381 6.58016 80.277 6.47198 80.3174C3.96706 81.2519 2.44905 81.6 0 81.6L0 82.2Z" fill="#858AFA" stroke="#858AFA" stroke-width="0.5"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6.35524 78C6.46234 77.9609 6.57112 77.9208 6.68172 77.8795C6.79039 77.839 7.16116 77.7 7.21197 77.681C10.0919 76.6043 11.8941 76.2 15 76.2C18.0813 76.2 19.6086 76.5665 22.3886 77.6785C22.6753 77.7932 22.9494 77.9003 23.2136 78H25.0812C24.3279 77.7808 23.5395 77.4927 22.6114 77.1215C19.7664 75.9835 18.1687 75.6 15 75.6C11.8122 75.6 9.94344 76.0192 7.00185 77.119C6.95066 77.1381 6.58016 77.277 6.47198 77.3174C5.72954 77.5944 5.0738 77.8198 4.45483 78H6.35524ZM6.35524 72C3.97726 72.8676 2.42302 73.2 0 73.2L0 72.6C1.72318 72.6 2.98542 72.4277 4.45483 72H6.35524ZM23.2136 72C25.5716 72.8899 27.1507 73.2 30 73.2V72.6C27.9473 72.6 26.5843 72.4373 25.0812 72L23.2136 72ZM0 76.2C2.53215 76.2 4.1155 75.837 6.68172 74.8795C6.79039 74.839 7.16116 74.7 7.21197 74.681C10.0919 73.6043 11.8941 73.2 15 73.2C18.0813 73.2 19.6086 73.5665 22.3886 74.6785C25.2336 75.8165 26.8313 76.2 30 76.2V75.6C26.9187 75.6 25.3914 75.2335 22.6114 74.1215C19.7664 72.9835 18.1687 72.6 15 72.6C11.8122 72.6 9.94344 73.0192 7.00185 74.119C6.95066 74.1381 6.58016 74.277 6.47198 74.3174C3.96706 75.2519 2.44905 75.6 0 75.6L0 76.2Z" fill="#858AFA" stroke="#858AFA" stroke-width="0.5"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6.35524 72C6.46234 71.9609 6.57112 71.9208 6.68172 71.8795C6.79039 71.839 7.16116 71.7 7.21197 71.681C10.0919 70.6043 11.8941 70.2 15 70.2C18.0813 70.2 19.6086 70.5665 22.3886 71.6785C22.6753 71.7932 22.9494 71.9003 23.2136 72H25.0812C24.3279 71.7808 23.5395 71.4927 22.6114 71.1215C19.7664 69.9835 18.1687 69.6 15 69.6C11.8122 69.6 9.94344 70.0192 7.00185 71.119C6.95066 71.1381 6.58016 71.277 6.47198 71.3174C5.72954 71.5944 5.0738 71.8198 4.45483 72H6.35524ZM6.35524 66C3.97726 66.8676 2.42302 67.2 0 67.2L0 66.6C1.72318 66.6 2.98542 66.4277 4.45483 66H6.35524ZM23.2136 66C25.5716 66.8899 27.1507 67.2 30 67.2V66.6C27.9473 66.6 26.5843 66.4373 25.0812 66L23.2136 66ZM0 70.2C2.53215 70.2 4.1155 69.837 6.68172 68.8795C6.79039 68.839 7.16116 68.7 7.21197 68.681C10.0919 67.6043 11.8941 67.2 15 67.2C18.0813 67.2 19.6086 67.5665 22.3886 68.6785C25.2336 69.8165 26.8313 70.2 30 70.2V69.6C26.9187 69.6 25.3914 69.2335 22.6114 68.1215C19.7664 66.9835 18.1687 66.6 15 66.6C11.8122 66.6 9.94344 67.0192 7.00185 68.119C6.95066 68.1381 6.58016 68.277 6.47198 68.3174C3.96706 69.2519 2.44905 69.6 0 69.6L0 70.2Z" fill="#858AFA" stroke="#858AFA" stroke-width="0.5"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6.35524 66C6.46234 65.9609 6.57112 65.9208 6.68172 65.8795C6.79039 65.839 7.16116 65.7 7.21197 65.681C10.0919 64.6043 11.8941 64.2 15 64.2C18.0813 64.2 19.6086 64.5665 22.3886 65.6785C22.6753 65.7932 22.9494 65.9003 23.2136 66H25.0812C24.3279 65.7808 23.5395 65.4927 22.6114 65.1215C19.7664 63.9835 18.1687 63.6 15 63.6C11.8122 63.6 9.94344 64.0192 7.00185 65.119C6.95066 65.1381 6.58016 65.277 6.47198 65.3174C5.72954 65.5944 5.0738 65.8198 4.45483 66H6.35524ZM6.35524 60C3.97726 60.8676 2.42302 61.2 0 61.2L0 60.6C1.72318 60.6 2.98542 60.4277 4.45483 60H6.35524ZM23.2136 60C25.5716 60.8899 27.1507 61.2 30 61.2V60.6C27.9473 60.6 26.5843 60.4373 25.0812 60L23.2136 60ZM0 64.2C2.53215 64.2 4.1155 63.837 6.68172 62.8795C6.79039 62.839 7.16116 62.7 7.21197 62.681C10.0919 61.6043 11.8941 61.2 15 61.2C18.0813 61.2 19.6086 61.5665 22.3886 62.6785C25.2336 63.8165 26.8313 64.2 30 64.2V63.6C26.9187 63.6 25.3914 63.2335 22.6114 62.1215C19.7664 60.9835 18.1687 60.6 15 60.6C11.8122 60.6 9.94344 61.0192 7.00185 62.119C6.95066 62.1381 6.58016 62.277 6.47198 62.3174C3.96706 63.2519 2.44905 63.6 0 63.6L0 64.2Z" fill="#858AFA" stroke="#858AFA" stroke-width="0.5"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6.35524 60C6.46234 59.9609 6.57112 59.9208 6.68172 59.8795C6.79039 59.839 7.16116 59.7 7.21197 59.681C10.0919 58.6043 11.8941 58.2 15 58.2C18.0813 58.2 19.6086 58.5665 22.3886 59.6785C22.6753 59.7932 22.9494 59.9003 23.2136 60H25.0812C24.3279 59.7808 23.5395 59.4927 22.6114 59.1215C19.7664 57.9835 18.1687 57.6 15 57.6C11.8122 57.6 9.94344 58.0192 7.00185 59.119C6.95066 59.1381 6.58016 59.277 6.47198 59.3174C5.72954 59.5944 5.0738 59.8198 4.45483 60H6.35524ZM6.35524 54C3.97726 54.8676 2.42302 55.2 0 55.2L0 54.6C1.72318 54.6 2.98542 54.4277 4.45483 54H6.35524ZM23.2136 54C25.5716 54.8899 27.1507 55.2 30 55.2V54.6C27.9473 54.6 26.5843 54.4373 25.0812 54L23.2136 54ZM0 58.2C2.53215 58.2 4.1155 57.837 6.68172 56.8795C6.79039 56.839 7.16116 56.7 7.21197 56.681C10.0919 55.6043 11.8941 55.2 15 55.2C18.0813 55.2 19.6086 55.5665 22.3886 56.6785C25.2336 57.8165 26.8313 58.2 30 58.2V57.6C26.9187 57.6 25.3914 57.2335 22.6114 56.1215C19.7664 54.9835 18.1687 54.6 15 54.6C11.8122 54.6 9.94344 55.0192 7.00185 56.119C6.95066 56.1381 6.58016 56.277 6.47198 56.3174C3.96706 57.2519 2.44905 57.6 0 57.6L0 58.2Z" fill="#858AFA" stroke="#858AFA" stroke-width="0.5"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6.35524 54C6.46234 53.9609 6.57112 53.9208 6.68172 53.8795C6.79039 53.839 7.16116 53.7 7.21197 53.681C10.0919 52.6043 11.8941 52.2 15 52.2C18.0813 52.2 19.6086 52.5665 22.3886 53.6785C22.6753 53.7932 22.9494 53.9003 23.2136 54H25.0812C24.3279 53.7808 23.5395 53.4927 22.6114 53.1215C19.7664 51.9835 18.1687 51.6 15 51.6C11.8122 51.6 9.94344 52.0192 7.00185 53.119C6.95066 53.1381 6.58016 53.277 6.47198 53.3174C5.72954 53.5944 5.0738 53.8198 4.45483 54H6.35524ZM6.35524 48C3.97726 48.8676 2.42302 49.2 0 49.2L0 48.6C1.72318 48.6 2.98542 48.4277 4.45483 48H6.35524ZM23.2136 48C25.5716 48.8899 27.1507 49.2 30 49.2V48.6C27.9473 48.6 26.5843 48.4373 25.0812 48L23.2136 48ZM0 52.2C2.53215 52.2 4.1155 51.837 6.68172 50.8795C6.79039 50.839 7.16116 50.7 7.21197 50.681C10.0919 49.6043 11.8941 49.2 15 49.2C18.0813 49.2 19.6086 49.5665 22.3886 50.6785C25.2336 51.8165 26.8313 52.2 30 52.2V51.6C26.9187 51.6 25.3914 51.2335 22.6114 50.1215C19.7664 48.9835 18.1687 48.6 15 48.6C11.8122 48.6 9.94344 49.0192 7.00185 50.119C6.95066 50.1381 6.58016 50.277 6.47198 50.3174C3.96706 51.2519 2.44905 51.6 0 51.6L0 52.2Z" fill="#858AFA" stroke="#858AFA" stroke-width="0.5"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6.35524 48C6.46234 47.9609 6.57112 47.9208 6.68172 47.8795C6.79039 47.839 7.16116 47.7 7.21197 47.681C10.0919 46.6043 11.8941 46.2 15 46.2C18.0813 46.2 19.6086 46.5665 22.3886 47.6785C22.6753 47.7932 22.9494 47.9003 23.2136 48H25.0812C24.3279 47.7808 23.5395 47.4927 22.6114 47.1215C19.7664 45.9835 18.1687 45.6 15 45.6C11.8122 45.6 9.94344 46.0192 7.00185 47.119C6.95066 47.1381 6.58016 47.277 6.47198 47.3174C5.72954 47.5944 5.0738 47.8198 4.45483 48H6.35524ZM6.35524 42C3.97726 42.8676 2.42302 43.2 0 43.2L0 42.6C1.72318 42.6 2.98542 42.4277 4.45483 42H6.35524ZM23.2136 42C25.5716 42.8899 27.1507 43.2 30 43.2V42.6C27.9473 42.6 26.5843 42.4373 25.0812 42L23.2136 42ZM0 46.2C2.53215 46.2 4.1155 45.837 6.68172 44.8795C6.79039 44.839 7.16116 44.7 7.21197 44.681C10.0919 43.6043 11.8941 43.2 15 43.2C18.0813 43.2 19.6086 43.5665 22.3886 44.6785C25.2336 45.8165 26.8313 46.2 30 46.2V45.6C26.9187 45.6 25.3914 45.2335 22.6114 44.1215C19.7664 42.9835 18.1687 42.6 15 42.6C11.8122 42.6 9.94344 43.0192 7.00185 44.119C6.95066 44.1381 6.58016 44.277 6.47198 44.3174C3.96706 45.2519 2.44905 45.6 0 45.6L0 46.2Z" fill="#858AFA" stroke="#858AFA" stroke-width="0.5"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6.35524 42C6.46234 41.9609 6.57112 41.9208 6.68172 41.8795C6.79039 41.839 7.16116 41.7 7.21197 41.681C10.0919 40.6043 11.8941 40.2 15 40.2C18.0813 40.2 19.6086 40.5665 22.3886 41.6785C22.6753 41.7932 22.9494 41.9003 23.2136 42H25.0812C24.3279 41.7808 23.5395 41.4927 22.6114 41.1215C19.7664 39.9835 18.1687 39.6 15 39.6C11.8122 39.6 9.94344 40.0192 7.00185 41.119C6.95066 41.1381 6.58016 41.277 6.47198 41.3174C5.72954 41.5944 5.0738 41.8198 4.45483 42H6.35524ZM6.35524 36C3.97726 36.8676 2.42302 37.2 0 37.2L0 36.6C1.72318 36.6 2.98542 36.4277 4.45483 36H6.35524ZM23.2136 36C25.5716 36.8899 27.1507 37.2 30 37.2V36.6C27.9473 36.6 26.5843 36.4373 25.0812 36L23.2136 36ZM0 40.2C2.53215 40.2 4.1155 39.837 6.68172 38.8795C6.79039 38.839 7.16116 38.7 7.21197 38.681C10.0919 37.6043 11.8941 37.2 15 37.2C18.0813 37.2 19.6086 37.5665 22.3886 38.6785C25.2336 39.8165 26.8313 40.2 30 40.2V39.6C26.9187 39.6 25.3914 39.2335 22.6114 38.1215C19.7664 36.9835 18.1687 36.6 15 36.6C11.8122 36.6 9.94344 37.0192 7.00185 38.119C6.95066 38.1381 6.58016 38.277 6.47198 38.3174C3.96706 39.2519 2.44905 39.6 0 39.6L0 40.2Z" fill="#858AFA" stroke="#858AFA" stroke-width="0.5"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6.35524 36C6.46234 35.9609 6.57112 35.9208 6.68172 35.8795C6.79039 35.839 7.16116 35.7 7.21197 35.681C10.0919 34.6043 11.8941 34.2 15 34.2C18.0813 34.2 19.6086 34.5665 22.3886 35.6785C22.6753 35.7932 22.9494 35.9003 23.2136 36H25.0812C24.3279 35.7808 23.5395 35.4927 22.6114 35.1215C19.7664 33.9835 18.1687 33.6 15 33.6C11.8122 33.6 9.94344 34.0192 7.00185 35.119C6.95066 35.1381 6.58016 35.277 6.47198 35.3174C5.72954 35.5944 5.0738 35.8198 4.45483 36H6.35524ZM6.35524 30C3.97726 30.8676 2.42302 31.2 0 31.2L0 30.6C1.72318 30.6 2.98542 30.4277 4.45483 30H6.35524ZM23.2136 30C25.5716 30.8899 27.1507 31.2 30 31.2V30.6C27.9473 30.6 26.5843 30.4373 25.0812 30L23.2136 30ZM0 34.2C2.53215 34.2 4.1155 33.837 6.68172 32.8795C6.79039 32.839 7.16116 32.7 7.21197 32.681C10.0919 31.6043 11.8941 31.2 15 31.2C18.0813 31.2 19.6086 31.5665 22.3886 32.6785C25.2336 33.8165 26.8313 34.2 30 34.2V33.6C26.9187 33.6 25.3914 33.2335 22.6114 32.1215C19.7664 30.9835 18.1687 30.6 15 30.6C11.8122 30.6 9.94344 31.0192 7.00185 32.119C6.95066 32.1381 6.58016 32.277 6.47198 32.3174C3.96706 33.2519 2.44905 33.6 0 33.6L0 34.2Z" fill="#858AFA" stroke="#858AFA" stroke-width="0.5"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6.35524 30C6.46234 29.9609 6.57112 29.9208 6.68172 29.8795C6.79039 29.839 7.16116 29.7 7.21197 29.681C10.0919 28.6043 11.8941 28.2 15 28.2C18.0813 28.2 19.6086 28.5665 22.3886 29.6785C22.6753 29.7932 22.9494 29.9003 23.2136 30H25.0812C24.3279 29.7808 23.5395 29.4927 22.6114 29.1215C19.7664 27.9835 18.1687 27.6 15 27.6C11.8122 27.6 9.94344 28.0192 7.00185 29.119C6.95066 29.1381 6.58016 29.277 6.47198 29.3174C5.72954 29.5944 5.0738 29.8198 4.45483 30H6.35524ZM6.35524 24C3.97726 24.8676 2.42302 25.2 0 25.2L0 24.6C1.72318 24.6 2.98542 24.4277 4.45483 24H6.35524ZM23.2136 24C25.5716 24.8899 27.1507 25.2 30 25.2V24.6C27.9473 24.6 26.5843 24.4373 25.0812 24L23.2136 24ZM0 28.2C2.53215 28.2 4.1155 27.837 6.68172 26.8795C6.79039 26.839 7.16116 26.7 7.21197 26.681C10.0919 25.6043 11.8941 25.2 15 25.2C18.0813 25.2 19.6086 25.5665 22.3886 26.6785C25.2336 27.8165 26.8313 28.2 30 28.2V27.6C26.9187 27.6 25.3914 27.2335 22.6114 26.1215C19.7664 24.9835 18.1687 24.6 15 24.6C11.8122 24.6 9.94344 25.0192 7.00185 26.119C6.95066 26.1381 6.58016 26.277 6.47198 26.3174C3.96706 27.2519 2.44905 27.6 0 27.6L0 28.2Z" fill="#858AFA" stroke="#858AFA" stroke-width="0.5"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6.35524 24C6.46234 23.9609 6.57112 23.9208 6.68172 23.8795C6.79039 23.839 7.16116 23.7 7.21197 23.681C10.0919 22.6043 11.8941 22.2 15 22.2C18.0813 22.2 19.6086 22.5665 22.3886 23.6785C22.6753 23.7932 22.9494 23.9003 23.2136 24H25.0812C24.3279 23.7808 23.5395 23.4927 22.6114 23.1215C19.7664 21.9835 18.1687 21.6 15 21.6C11.8122 21.6 9.94344 22.0192 7.00185 23.119C6.95066 23.1381 6.58016 23.277 6.47198 23.3174C5.72954 23.5944 5.0738 23.8198 4.45483 24H6.35524ZM6.35524 18C3.97726 18.8676 2.42302 19.2 0 19.2L0 18.6C1.72318 18.6 2.98542 18.4277 4.45483 18H6.35524ZM23.2136 18C25.5716 18.8899 27.1507 19.2 30 19.2V18.6C27.9473 18.6 26.5843 18.4373 25.0812 18L23.2136 18ZM0 22.2C2.53215 22.2 4.1155 21.837 6.68172 20.8795C6.79039 20.839 7.16116 20.7 7.21197 20.681C10.0919 19.6043 11.8941 19.2 15 19.2C18.0813 19.2 19.6086 19.5665 22.3886 20.6785C25.2336 21.8165 26.8313 22.2 30 22.2V21.6C26.9187 21.6 25.3914 21.2335 22.6114 20.1215C19.7664 18.9835 18.1687 18.6 15 18.6C11.8122 18.6 9.94344 19.0192 7.00185 20.119C6.95066 20.1381 6.58016 20.277 6.47198 20.3174C3.96706 21.2519 2.44905 21.6 0 21.6L0 22.2Z" fill="#858AFA" stroke="#858AFA" stroke-width="0.5"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6.35524 18C6.46234 17.9609 6.57112 17.9208 6.68172 17.8795C6.79039 17.839 7.16116 17.7 7.21197 17.681C10.0919 16.6043 11.8941 16.2 15 16.2C18.0813 16.2 19.6086 16.5665 22.3886 17.6785C22.6753 17.7932 22.9494 17.9003 23.2136 18H25.0812C24.3279 17.7808 23.5395 17.4927 22.6114 17.1215C19.7664 15.9835 18.1687 15.6 15 15.6C11.8122 15.6 9.94344 16.0192 7.00185 17.119C6.95066 17.1381 6.58016 17.277 6.47198 17.3174C5.72954 17.5944 5.0738 17.8198 4.45483 18H6.35524ZM6.35524 12C3.97726 12.8676 2.42302 13.2 0 13.2L0 12.6C1.72318 12.6 2.98542 12.4277 4.45483 12H6.35524ZM23.2136 12C25.5716 12.8899 27.1507 13.2 30 13.2V12.6C27.9473 12.6 26.5843 12.4373 25.0812 12L23.2136 12ZM0 16.2C2.53215 16.2 4.1155 15.837 6.68172 14.8795C6.79039 14.839 7.16116 14.7 7.21197 14.681C10.0919 13.6043 11.8941 13.2 15 13.2C18.0813 13.2 19.6086 13.5665 22.3886 14.6785C25.2336 15.8165 26.8313 16.2 30 16.2V15.6C26.9187 15.6 25.3914 15.2335 22.6114 14.1215C19.7664 12.9835 18.1687 12.6 15 12.6C11.8122 12.6 9.94344 13.0192 7.00185 14.119C6.95066 14.1381 6.58016 14.277 6.47198 14.3174C3.96706 15.2519 2.44905 15.6 0 15.6L0 16.2Z" fill="#858AFA" stroke="#858AFA" stroke-width="0.5"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6.35524 12C6.46234 11.9609 6.57112 11.9208 6.68172 11.8795C6.79039 11.839 7.16116 11.7 7.21197 11.681C10.0919 10.6043 11.8941 10.2 15 10.2C18.0813 10.2 19.6086 10.5665 22.3886 11.6785C22.6753 11.7932 22.9494 11.9003 23.2136 12H25.0812C24.3279 11.7808 23.5395 11.4927 22.6114 11.1215C19.7664 9.98347 18.1687 9.6 15 9.6C11.8122 9.6 9.94344 10.0192 7.00185 11.119C6.95066 11.1381 6.58016 11.277 6.47198 11.3174C5.72954 11.5944 5.0738 11.8198 4.45483 12H6.35524ZM6.35524 6C3.97726 6.86758 2.42302 7.2 0 7.2L0 6.6C1.72318 6.6 2.98542 6.42769 4.45483 6H6.35524ZM23.2136 6C25.5716 6.88993 27.1507 7.2 30 7.2V6.6C27.9473 6.6 26.5843 6.43734 25.0812 6L23.2136 6ZM0 10.2C2.53215 10.2 4.1155 9.83697 6.68172 8.8795C6.79039 8.83895 7.16116 8.7 7.21197 8.681C10.0919 7.60427 11.8941 7.2 15 7.2C18.0813 7.2 19.6086 7.56653 22.3886 8.67854C25.2336 9.81653 26.8313 10.2 30 10.2V9.6C26.9187 9.6 25.3914 9.23347 22.6114 8.12146C19.7664 6.98347 18.1687 6.6 15 6.6C11.8122 6.6 9.94344 7.01922 7.00185 8.119C6.95066 8.13814 6.58016 8.27699 6.47198 8.31735C3.96706 9.25195 2.44905 9.6 0 9.6L0 10.2Z" fill="#858AFA" stroke="#858AFA" stroke-width="0.5"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6.35524 6C6.46234 5.96092 6.57112 5.92076 6.68172 5.8795C6.79039 5.83895 7.16116 5.7 7.21197 5.681C10.0919 4.60427 11.8941 4.2 15 4.2C18.0813 4.2 19.6086 4.56653 22.3886 5.67854C22.6753 5.79323 22.9494 5.90026 23.2136 6H25.0812C24.3279 5.78083 23.5395 5.49269 22.6114 5.12146C19.7664 3.98347 18.1687 3.6 15 3.6C11.8122 3.6 9.94344 4.01922 7.00185 5.119C6.95066 5.13814 6.58016 5.27699 6.47198 5.31735C5.72954 5.59436 5.0738 5.81984 4.45483 6H6.35524ZM6.35524 0C3.97726 0.867585 2.42302 1.2 0 1.2L0 0.6C1.72318 0.6 2.98542 0.427692 4.45483 0L6.35524 0ZM23.2136 0C25.5716 0.88993 27.1507 1.2 30 1.2V0.6C27.9473 0.6 26.5843 0.437343 25.0812 0L23.2136 0ZM0 4.2C2.53215 4.2 4.1155 3.83697 6.68172 2.8795C6.79039 2.83895 7.16116 2.7 7.21197 2.681C10.0919 1.60427 11.8941 1.2 15 1.2C18.0813 1.2 19.6086 1.56653 22.3886 2.67854C25.2336 3.81653 26.8313 4.2 30 4.2V3.6C26.9187 3.6 25.3914 3.23347 22.6114 2.12146C19.7664 0.983469 18.1687 0.6 15 0.6C11.8122 0.6 9.94344 1.01922 7.00185 2.119C6.95066 2.13814 6.58016 2.27699 6.47198 2.31735C3.96706 3.25195 2.44905 3.6 0 3.6L0 4.2Z" fill="#858AFA" stroke="#858AFA" stroke-width="0.5"/>
+</g>
+<defs>
+<clipPath id="clip0_954_5239">
+<rect width="5" height="80" fill="white" transform="matrix(1 0 0 -1 0 80)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/app/javascript/mastodon/components/content_warning.tsx b/app/javascript/mastodon/components/content_warning.tsx
new file mode 100644
index 00000000000000..df8afca74d6a86
--- /dev/null
+++ b/app/javascript/mastodon/components/content_warning.tsx
@@ -0,0 +1,15 @@
+import { StatusBanner, BannerVariant } from './status_banner';
+
+export const ContentWarning: React.FC<{
+  text: string;
+  expanded?: boolean;
+  onClick?: () => void;
+}> = ({ text, expanded, onClick }) => (
+  <StatusBanner
+    expanded={expanded}
+    onClick={onClick}
+    variant={BannerVariant.Yellow}
+  >
+    <p dangerouslySetInnerHTML={{ __html: text }} />
+  </StatusBanner>
+);
diff --git a/app/javascript/mastodon/components/filter_warning.tsx b/app/javascript/mastodon/components/filter_warning.tsx
new file mode 100644
index 00000000000000..4305e43038df9f
--- /dev/null
+++ b/app/javascript/mastodon/components/filter_warning.tsx
@@ -0,0 +1,23 @@
+import { FormattedMessage } from 'react-intl';
+
+import { StatusBanner, BannerVariant } from './status_banner';
+
+export const FilterWarning: React.FC<{
+  title: string;
+  expanded?: boolean;
+  onClick?: () => void;
+}> = ({ title, expanded, onClick }) => (
+  <StatusBanner
+    expanded={expanded}
+    onClick={onClick}
+    variant={BannerVariant.Blue}
+  >
+    <p>
+      <FormattedMessage
+        id='filter_warning.matches_filter'
+        defaultMessage='Matches filter “{title}”'
+        values={{ title }}
+      />
+    </p>
+  </StatusBanner>
+);
diff --git a/app/javascript/mastodon/components/status.jsx b/app/javascript/mastodon/components/status.jsx
index 6e3792d7dcf220..7236c9633dd2ba 100644
--- a/app/javascript/mastodon/components/status.jsx
+++ b/app/javascript/mastodon/components/status.jsx
@@ -13,6 +13,8 @@ import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?re
 import PushPinIcon from '@/material-icons/400-24px/push_pin.svg?react';
 import RepeatIcon from '@/material-icons/400-24px/repeat.svg?react';
 import ReplyIcon from '@/material-icons/400-24px/reply.svg?react';
+import { ContentWarning } from 'mastodon/components/content_warning';
+import { FilterWarning } from 'mastodon/components/filter_warning';
 import { Icon }  from 'mastodon/components/icon';
 import PictureInPicturePlaceholder from 'mastodon/components/picture_in_picture_placeholder';
 import { withOptionalRouter, WithOptionalRouterPropTypes } from 'mastodon/utils/react_router';
@@ -140,7 +142,7 @@ class Status extends ImmutablePureComponent {
 
   state = {
     showMedia: defaultMediaVisibility(this.props.status) && !(this.context?.hideMediaByDefault),
-    forceFilter: undefined,
+    showDespiteFilter: undefined,
   };
 
   componentDidUpdate (prevProps) {
@@ -152,7 +154,7 @@ class Status extends ImmutablePureComponent {
     if (this.props.status?.get('id') !== prevProps.status?.get('id')) {
       this.setState({
         showMedia: defaultMediaVisibility(this.props.status) && !(this.context?.hideMediaByDefault),
-        forceFilter: undefined,
+        showDespiteFilter: undefined,
       });
     }
   }
@@ -325,20 +327,32 @@ class Status extends ImmutablePureComponent {
   };
 
   handleHotkeyToggleHidden = () => {
-    this.props.onToggleHidden(this._properStatus());
+    const { onToggleHidden } = this.props;
+    const status = this._properStatus();
+
+    if (status.get('matched_filters')) {
+      const expandedBecauseOfCW = !status.get('hidden') || status.get('spoiler_text').length === 0;
+      const expandedBecauseOfFilter = this.state.showDespiteFilter;
+
+      if (expandedBecauseOfFilter && !expandedBecauseOfCW) {
+        onToggleHidden(status);
+      } else if (expandedBecauseOfFilter && expandedBecauseOfCW) {
+        onToggleHidden(status);
+        this.handleFilterToggle();
+      } else  {
+        this.handleFilterToggle();
+      }
+    } else {
+      onToggleHidden(status);
+    }
   };
 
   handleHotkeyToggleSensitive = () => {
     this.handleToggleMediaVisibility();
   };
 
-  handleUnfilterClick = e => {
-    this.setState({ forceFilter: false });
-    e.preventDefault();
-  };
-
-  handleFilterClick = () => {
-    this.setState({ forceFilter: true });
+  handleFilterToggle = () => {
+    this.setState(state => ({ ...state, showDespiteFilter: !state.showDespiteFilter }));
   };
 
   _properStatus () {
@@ -396,25 +410,6 @@ class Status extends ImmutablePureComponent {
     const connectReply = nextInReplyToId && nextInReplyToId === status.get('id');
     const matchedFilters = status.get('matched_filters');
 
-    if (this.state.forceFilter === undefined ? matchedFilters : this.state.forceFilter) {
-      const minHandlers = this.props.muted ? {} : {
-        moveUp: this.handleHotkeyMoveUp,
-        moveDown: this.handleHotkeyMoveDown,
-      };
-
-      return (
-        <HotKeys handlers={minHandlers} tabIndex={unfocusable ? null : -1}>
-          <div className='status__wrapper status__wrapper--filtered focusable' tabIndex={unfocusable ? null : 0} ref={this.handleRef}>
-            <FormattedMessage id='status.filtered' defaultMessage='Filtered' />: {matchedFilters.join(', ')}.
-            {' '}
-            <button className='status__wrapper--filtered__button' onClick={this.handleUnfilterClick}>
-              <FormattedMessage id='status.show_filter_reason' defaultMessage='Show anyway' />
-            </button>
-          </div>
-        </HotKeys>
-      );
-    }
-
     if (featured) {
       prepend = (
         <div className='status__prepend'>
@@ -548,7 +543,7 @@ class Status extends ImmutablePureComponent {
     }
 
     const {statusContentProps, hashtagBar} = getHashtagBarForStatus(status);
-    const expanded = !status.get('hidden') || status.get('spoiler_text').length === 0;
+    const expanded = (!matchedFilters || this.state.showDespiteFilter) && (!status.get('hidden') || status.get('spoiler_text').length === 0);
 
     return (
       <HotKeys handlers={handlers} tabIndex={unfocusable ? null : -1}>
@@ -574,22 +569,27 @@ class Status extends ImmutablePureComponent {
               </a>
             </div>
 
-            <StatusContent
-              status={status}
-              onClick={this.handleClick}
-              expanded={expanded}
-              onExpandedToggle={this.handleExpandedToggle}
-              onTranslate={this.handleTranslate}
-              collapsible
-              onCollapsedToggle={this.handleCollapsedToggle}
-              {...statusContentProps}
-            />
+            {matchedFilters && <FilterWarning title={matchedFilters.join(', ')} expanded={this.state.showDespiteFilter} onClick={this.handleFilterToggle} />}
 
-            {media}
+            {(status.get('spoiler_text').length > 0 && (!matchedFilters || this.state.showDespiteFilter)) && <ContentWarning text={status.getIn(['translation', 'spoilerHtml']) || status.get('spoilerHtml')} expanded={expanded} onClick={this.handleExpandedToggle} />}
 
-            {expanded && hashtagBar}
+            {expanded && (
+              <>
+                <StatusContent
+                  status={status}
+                  onClick={this.handleClick}
+                  onTranslate={this.handleTranslate}
+                  collapsible
+                  onCollapsedToggle={this.handleCollapsedToggle}
+                  {...statusContentProps}
+                />
+
+                {media}
+                {hashtagBar}
+              </>
+            )}
 
-            <StatusActionBar scrollKey={scrollKey} status={status} account={account} onFilter={matchedFilters ? this.handleFilterClick : null} {...other} />
+            <StatusActionBar scrollKey={scrollKey} status={status} account={account}  {...other} />
           </div>
         </div>
       </HotKeys>
diff --git a/app/javascript/mastodon/components/status_action_bar.jsx b/app/javascript/mastodon/components/status_action_bar.jsx
index 2a7bd0a3059ec9..f24f81e1b207b3 100644
--- a/app/javascript/mastodon/components/status_action_bar.jsx
+++ b/app/javascript/mastodon/components/status_action_bar.jsx
@@ -17,7 +17,6 @@ import ReplyIcon from '@/material-icons/400-24px/reply.svg?react';
 import ReplyAllIcon from '@/material-icons/400-24px/reply_all.svg?react';
 import StarIcon from '@/material-icons/400-24px/star-fill.svg?react';
 import StarBorderIcon from '@/material-icons/400-24px/star.svg?react';
-import VisibilityIcon from '@/material-icons/400-24px/visibility.svg?react';
 import RepeatActiveIcon from '@/svg-icons/repeat_active.svg?react';
 import RepeatDisabledIcon from '@/svg-icons/repeat_disabled.svg?react';
 import RepeatPrivateIcon from '@/svg-icons/repeat_private.svg?react';
@@ -61,7 +60,6 @@ const messages = defineMessages({
   admin_status: { id: 'status.admin_status', defaultMessage: 'Open this post in the moderation interface' },
   admin_domain: { id: 'status.admin_domain', defaultMessage: 'Open moderation interface for {domain}' },
   copy: { id: 'status.copy', defaultMessage: 'Copy link to post' },
-  hide: { id: 'status.hide', defaultMessage: 'Hide post' },
   blockDomain: { id: 'account.block_domain', defaultMessage: 'Block domain {domain}' },
   unblockDomain: { id: 'account.unblock_domain', defaultMessage: 'Unblock domain {domain}' },
   unmute: { id: 'account.unmute', defaultMessage: 'Unmute @{name}' },
@@ -241,10 +239,6 @@ class StatusActionBar extends ImmutablePureComponent {
     navigator.clipboard.writeText(url);
   };
 
-  handleHideClick = () => {
-    this.props.onFilter();
-  };
-
   render () {
     const { status, relationship, intl, withDismiss, withCounters, scrollKey } = this.props;
     const { signedIn, permissions } = this.props.identity;
@@ -377,10 +371,6 @@ class StatusActionBar extends ImmutablePureComponent {
       reblogIconComponent = RepeatDisabledIcon;
     }
 
-    const filterButton = this.props.onFilter && (
-      <IconButton className='status__action-bar__button' title={intl.formatMessage(messages.hide)} icon='eye' iconComponent={VisibilityIcon} onClick={this.handleHideClick} />
-    );
-
     const isReply = status.get('in_reply_to_account_id') === status.getIn(['account', 'id']);
 
     return (
@@ -390,8 +380,6 @@ class StatusActionBar extends ImmutablePureComponent {
         <IconButton className='status__action-bar__button star-icon' animate active={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='star' iconComponent={status.get('favourited') ? StarIcon : StarBorderIcon} onClick={this.handleFavouriteClick} counter={withCounters ? status.get('favourites_count') : undefined} />
         <IconButton className='status__action-bar__button bookmark-icon' disabled={!signedIn} active={status.get('bookmarked')} title={intl.formatMessage(messages.bookmark)} icon='bookmark' iconComponent={status.get('bookmarked') ? BookmarkIcon : BookmarkBorderIcon} onClick={this.handleBookmarkClick} />
 
-        {filterButton}
-
         <DropdownMenuContainer
           scrollKey={scrollKey}
           status={status}
diff --git a/app/javascript/mastodon/components/status_banner.tsx b/app/javascript/mastodon/components/status_banner.tsx
new file mode 100644
index 00000000000000..8ff17a9b2e4b84
--- /dev/null
+++ b/app/javascript/mastodon/components/status_banner.tsx
@@ -0,0 +1,37 @@
+import { FormattedMessage } from 'react-intl';
+
+export enum BannerVariant {
+  Yellow = 'yellow',
+  Blue = 'blue',
+}
+
+export const StatusBanner: React.FC<{
+  children: React.ReactNode;
+  variant: BannerVariant;
+  expanded?: boolean;
+  onClick?: () => void;
+}> = ({ children, variant, expanded, onClick }) => (
+  <div
+    className={
+      variant === BannerVariant.Yellow
+        ? 'content-warning'
+        : 'content-warning content-warning--filter'
+    }
+  >
+    {children}
+
+    <button className='link-button' onClick={onClick}>
+      {expanded ? (
+        <FormattedMessage
+          id='content_warning.hide'
+          defaultMessage='Hide post'
+        />
+      ) : (
+        <FormattedMessage
+          id='content_warning.show'
+          defaultMessage='Show anyway'
+        />
+      )}
+    </button>
+  </div>
+);
diff --git a/app/javascript/mastodon/components/status_content.jsx b/app/javascript/mastodon/components/status_content.jsx
index 96452374dcc639..3316be8350603c 100644
--- a/app/javascript/mastodon/components/status_content.jsx
+++ b/app/javascript/mastodon/components/status_content.jsx
@@ -4,7 +4,7 @@ import { PureComponent } from 'react';
 import { FormattedMessage, injectIntl } from 'react-intl';
 
 import classnames from 'classnames';
-import { Link, withRouter } from 'react-router-dom';
+import { withRouter } from 'react-router-dom';
 
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { connect } from 'react-redux';
@@ -15,7 +15,6 @@ import PollContainer from 'mastodon/containers/poll_container';
 import { identityContextPropShape, withIdentity } from 'mastodon/identity_context';
 import { autoPlayGif, languages as preloadedLanguages } from 'mastodon/initial_state';
 
-
 const MAX_HEIGHT = 706; // 22px * 32 (+ 2px padding at the top)
 
 /**
@@ -73,8 +72,6 @@ class StatusContent extends PureComponent {
     identity: identityContextPropShape,
     status: ImmutablePropTypes.map.isRequired,
     statusContent: PropTypes.string,
-    expanded: PropTypes.bool,
-    onExpandedToggle: PropTypes.func,
     onTranslate: PropTypes.func,
     onClick: PropTypes.func,
     collapsible: PropTypes.bool,
@@ -87,10 +84,6 @@ class StatusContent extends PureComponent {
     history: PropTypes.object.isRequired
   };
 
-  state = {
-    hidden: true,
-  };
-
   _updateStatusLinks () {
     const node = this.node;
 
@@ -218,17 +211,6 @@ class StatusContent extends PureComponent {
     this.startXY = null;
   };
 
-  handleSpoilerClick = (e) => {
-    e.preventDefault();
-
-    if (this.props.onExpandedToggle) {
-      // The parent manages the state
-      this.props.onExpandedToggle();
-    } else {
-      this.setState({ hidden: !this.state.hidden });
-    }
-  };
-
   handleTranslate = () => {
     this.props.onTranslate();
   };
@@ -240,18 +222,15 @@ class StatusContent extends PureComponent {
   render () {
     const { status, intl, statusContent } = this.props;
 
-    const hidden = this.props.onExpandedToggle ? !this.props.expanded : this.state.hidden;
     const renderReadMore = this.props.onClick && status.get('collapsed');
     const contentLocale = intl.locale.replace(/[_-].*/, '');
     const targetLanguages = this.props.languages?.get(status.get('language') || 'und');
     const renderTranslate = this.props.onTranslate && this.props.identity.signedIn && ['public', 'unlisted'].includes(status.get('visibility')) && status.get('search_index').trim().length > 0 && targetLanguages?.includes(contentLocale);
 
     const content = { __html: statusContent ?? getStatusContent(status) };
-    const spoilerContent = { __html: status.getIn(['translation', 'spoilerHtml']) || status.get('spoilerHtml') };
     const language = status.getIn(['translation', 'language']) || status.get('language');
     const classNames = classnames('status__content', {
       'status__content--with-action': this.props.onClick && this.props.history,
-      'status__content--with-spoiler': status.get('spoiler_text').length > 0,
       'status__content--collapsed': renderReadMore,
     });
 
@@ -269,38 +248,7 @@ class StatusContent extends PureComponent {
       <PollContainer pollId={status.get('poll')} lang={language} />
     );
 
-    if (status.get('spoiler_text').length > 0) {
-      let mentionsPlaceholder = '';
-
-      const mentionLinks = status.get('mentions').map(item => (
-        <Link to={`/@${item.get('acct')}`} key={item.get('id')} className='status-link mention'>
-          @<span>{item.get('username')}</span>
-        </Link>
-      )).reduce((aggregate, item) => [...aggregate, item, ' '], []);
-
-      const toggleText = hidden ? <FormattedMessage id='status.show_more' defaultMessage='Show more' /> : <FormattedMessage id='status.show_less' defaultMessage='Show less' />;
-
-      if (hidden) {
-        mentionsPlaceholder = <div>{mentionLinks}</div>;
-      }
-
-      return (
-        <div className={classNames} ref={this.setRef} tabIndex={0} onMouseDown={this.handleMouseDown} onMouseUp={this.handleMouseUp} onMouseEnter={this.handleMouseEnter} onMouseLeave={this.handleMouseLeave}>
-          <p style={{ marginBottom: hidden && status.get('mentions').isEmpty() ? '0px' : null }}>
-            <span dangerouslySetInnerHTML={spoilerContent} className='translate' lang={language} />
-            {' '}
-            <button type='button' className={`status__content__spoiler-link ${hidden ? 'status__content__spoiler-link--show-more' : 'status__content__spoiler-link--show-less'}`} onClick={this.handleSpoilerClick} aria-expanded={!hidden}>{toggleText}</button>
-          </p>
-
-          {mentionsPlaceholder}
-
-          <div tabIndex={!hidden ? 0 : null} className={`status__content__text ${!hidden ? 'status__content__text--visible' : ''} translate`} lang={language} dangerouslySetInnerHTML={content} />
-
-          {!hidden && poll}
-          {translateButton}
-        </div>
-      );
-    } else if (this.props.onClick) {
+    if (this.props.onClick) {
       return (
         <>
           <div className={classNames} ref={this.setRef} tabIndex={0} onMouseDown={this.handleMouseDown} onMouseUp={this.handleMouseUp} key='status-content' onMouseEnter={this.handleMouseEnter} onMouseLeave={this.handleMouseLeave}>
diff --git a/app/javascript/mastodon/features/notifications_v2/components/embedded_status.tsx b/app/javascript/mastodon/features/notifications_v2/components/embedded_status.tsx
index baec0161173ff3..65ea9b5d5e27bc 100644
--- a/app/javascript/mastodon/features/notifications_v2/components/embedded_status.tsx
+++ b/app/javascript/mastodon/features/notifications_v2/components/embedded_status.tsx
@@ -8,11 +8,13 @@ import type { List as ImmutableList, RecordOf } from 'immutable';
 
 import BarChart4BarsIcon from '@/material-icons/400-24px/bar_chart_4_bars.svg?react';
 import PhotoLibraryIcon from '@/material-icons/400-24px/photo_library.svg?react';
+import { toggleStatusSpoilers } from 'mastodon/actions/statuses';
 import { Avatar } from 'mastodon/components/avatar';
+import { ContentWarning } from 'mastodon/components/content_warning';
 import { DisplayName } from 'mastodon/components/display_name';
 import { Icon } from 'mastodon/components/icon';
 import type { Status } from 'mastodon/models/status';
-import { useAppSelector } from 'mastodon/store';
+import { useAppSelector, useAppDispatch } from 'mastodon/store';
 
 import { EmbeddedStatusContent } from './embedded_status_content';
 
@@ -23,6 +25,7 @@ export const EmbeddedStatus: React.FC<{ statusId: string }> = ({
 }) => {
   const history = useHistory();
   const clickCoordinatesRef = useRef<[number, number] | null>();
+  const dispatch = useAppDispatch();
 
   const status = useAppSelector(
     (state) => state.statuses.get(statusId) as Status | undefined,
@@ -96,15 +99,21 @@ export const EmbeddedStatus: React.FC<{ statusId: string }> = ({
     [],
   );
 
+  const handleContentWarningClick = useCallback(() => {
+    dispatch(toggleStatusSpoilers(statusId));
+  }, [dispatch, statusId]);
+
   if (!status) {
     return null;
   }
 
   // Assign status attributes to variables with a forced type, as status is not yet properly typed
   const contentHtml = status.get('contentHtml') as string;
+  const contentWarning = status.get('spoilerHtml') as string;
   const poll = status.get('poll');
   const language = status.get('language') as string;
   const mentions = status.get('mentions') as ImmutableList<Mention>;
+  const expanded = !status.get('hidden') || !contentWarning;
   const mediaAttachmentsSize = (
     status.get('media_attachments') as ImmutableList<unknown>
   ).size;
@@ -124,14 +133,24 @@ export const EmbeddedStatus: React.FC<{ statusId: string }> = ({
         <DisplayName account={account} />
       </div>
 
-      <EmbeddedStatusContent
-        className='notification-group__embedded-status__content reply-indicator__content translate'
-        content={contentHtml}
-        language={language}
-        mentions={mentions}
-      />
+      {contentWarning && (
+        <ContentWarning
+          text={contentWarning}
+          onClick={handleContentWarningClick}
+          expanded={expanded}
+        />
+      )}
+
+      {(!contentWarning || expanded) && (
+        <EmbeddedStatusContent
+          className='notification-group__embedded-status__content reply-indicator__content translate'
+          content={contentHtml}
+          language={language}
+          mentions={mentions}
+        />
+      )}
 
-      {(poll || mediaAttachmentsSize > 0) && (
+      {expanded && (poll || mediaAttachmentsSize > 0) && (
         <div className='notification-group__embedded-status__attachments reply-indicator__attachments'>
           {!!poll && (
             <>
diff --git a/app/javascript/mastodon/features/status/components/detailed_status.jsx b/app/javascript/mastodon/features/status/components/detailed_status.jsx
index bc81fd2dfb1789..8ee1ec9b9bd40d 100644
--- a/app/javascript/mastodon/features/status/components/detailed_status.jsx
+++ b/app/javascript/mastodon/features/status/components/detailed_status.jsx
@@ -10,6 +10,7 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
 
 import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
 import { AnimatedNumber } from 'mastodon/components/animated_number';
+import { ContentWarning } from 'mastodon/components/content_warning';
 import EditedTimestamp from 'mastodon/components/edited_timestamp';
 import { getHashtagBarForStatus } from 'mastodon/components/hashtag_bar';
 import { Icon }  from 'mastodon/components/icon';
@@ -277,17 +278,20 @@ class DetailedStatus extends ImmutablePureComponent {
             <DisplayName account={status.get('account')} localDomain={this.props.domain} />
           </a>
 
-          <StatusContent
-            status={status}
-            expanded={!status.get('hidden')}
-            onExpandedToggle={this.handleExpandedToggle}
-            onTranslate={this.handleTranslate}
-            {...statusContentProps}
-          />
+          {status.get('spoiler_text').length > 0 && <ContentWarning text={status.getIn(['translation', 'spoilerHtml']) || status.get('spoilerHtml')} expanded={expanded} onClick={this.handleExpandedToggle} />}
 
-          {media}
+          {expanded && (
+            <>
+              <StatusContent
+                status={status}
+                onTranslate={this.handleTranslate}
+                {...statusContentProps}
+              />
 
-          {expanded && hashtagBar}
+              {media}
+              {hashtagBar}
+            </>
+          )}
 
           <div className='detailed-status__meta'>
             <div className='detailed-status__meta__line'>
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index ba351032ffd2a0..88920431fb61c8 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -192,6 +192,8 @@
   "confirmations.unfollow.confirm": "Unfollow",
   "confirmations.unfollow.message": "Are you sure you want to unfollow {name}?",
   "confirmations.unfollow.title": "Unfollow user?",
+  "content_warning.hide": "Hide post",
+  "content_warning.show": "Show anyway",
   "conversation.delete": "Delete conversation",
   "conversation.mark_as_read": "Mark as read",
   "conversation.open": "View conversation",
@@ -299,6 +301,7 @@
   "filter_modal.select_filter.subtitle": "Use an existing category or create a new one",
   "filter_modal.select_filter.title": "Filter this post",
   "filter_modal.title.status": "Filter a post",
+  "filter_warning.matches_filter": "Matches filter “{title}”",
   "filtered_notifications_banner.pending_requests": "From {count, plural, =0 {no one} one {one person} other {# people}} you may know",
   "filtered_notifications_banner.title": "Filtered notifications",
   "firehose.all": "All",
@@ -785,8 +788,6 @@
   "status.favourite": "Favorite",
   "status.favourites": "{count, plural, one {favorite} other {favorites}}",
   "status.filter": "Filter this post",
-  "status.filtered": "Filtered",
-  "status.hide": "Hide post",
   "status.history.created": "{name} created {date}",
   "status.history.edited": "{name} edited {date}",
   "status.load_more": "Load more",
@@ -814,10 +815,7 @@
   "status.report": "Report @{name}",
   "status.sensitive_warning": "Sensitive content",
   "status.share": "Share",
-  "status.show_filter_reason": "Show anyway",
-  "status.show_less": "Show less",
   "status.show_less_all": "Show less for all",
-  "status.show_more": "Show more",
   "status.show_more_all": "Show more for all",
   "status.show_original": "Show original",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {{attachmentCount} attachments}}",
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 3d2c4662541985..6157a83af42446 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -620,7 +620,7 @@ body > [data-popper-placement] {
 
   .spoiler-input__input {
     padding: 12px 12px - 5px;
-    background: mix($ui-base-color, $ui-highlight-color, 85%);
+    background: rgba($ui-highlight-color, 0.05);
     color: $highlight-text-color;
   }
 
@@ -1383,6 +1383,14 @@ body > [data-popper-placement] {
     }
   }
 
+  .content-warning {
+    margin-bottom: 10px;
+
+    &:last-child {
+      margin-bottom: 0;
+    }
+  }
+
   .media-gallery,
   .video-player,
   .audio-player,
@@ -1441,7 +1449,9 @@ body > [data-popper-placement] {
     .picture-in-picture-placeholder,
     .more-from-author,
     .status-card,
-    .hashtag-bar {
+    .hashtag-bar,
+    .content-warning,
+    .filter-warning {
       margin-inline-start: $thread-margin;
       width: calc(100% - $thread-margin);
     }
@@ -1690,6 +1700,14 @@ body > [data-popper-placement] {
     padding: 0;
     margin-bottom: 16px;
   }
+
+  .content-warning {
+    margin-bottom: 16px;
+
+    &:last-child {
+      margin-bottom: 0;
+    }
+  }
 }
 
 .scrollable > div:first-child .detailed-status {
@@ -10518,39 +10536,53 @@ noscript {
   }
 
   &__embedded-status {
+    display: flex;
+    flex-direction: column;
+    gap: 8px;
     cursor: pointer;
 
     &__account {
       display: flex;
       align-items: center;
       gap: 4px;
-      margin-bottom: 8px;
       color: $dark-text-color;
+      font-size: 15px;
+      line-height: 22px;
 
       bdi {
-        color: inherit;
+        color: $darker-text-color;
       }
     }
 
-    .account__avatar {
-      opacity: 0.5;
-    }
-
     &__content {
       display: -webkit-box;
       font-size: 15px;
       line-height: 22px;
-      color: $dark-text-color;
+      color: $darker-text-color;
       -webkit-line-clamp: 4;
       -webkit-box-orient: vertical;
       max-height: 4 * 22px;
       overflow: hidden;
 
+      p {
+        display: none;
+
+        &:first-child {
+          display: initial;
+        }
+      }
+
       p,
       a {
         color: inherit;
       }
     }
+
+    .reply-indicator__attachments {
+      font-size: 15px;
+      line-height: 22px;
+      color: $dark-text-color;
+    }
   }
 }
 
@@ -10625,7 +10657,9 @@ noscript {
   .picture-in-picture-placeholder,
   .more-from-author,
   .status-card,
-  .hashtag-bar {
+  .hashtag-bar,
+  .content-warning,
+  .filter-warning {
     margin-inline-start: $icon-margin;
     width: calc(100% - $icon-margin);
   }
@@ -10833,3 +10867,53 @@ noscript {
     }
   }
 }
+
+.content-warning {
+  background: rgba($ui-highlight-color, 0.05);
+  color: $secondary-text-color;
+  border-top: 1px solid;
+  border-bottom: 1px solid;
+  border-color: rgba($ui-highlight-color, 0.15);
+  padding: 8px (5px + 8px);
+  position: relative;
+  font-size: 15px;
+  line-height: 22px;
+
+  p {
+    margin-bottom: 8px;
+  }
+
+  .link-button {
+    font-size: inherit;
+    line-height: inherit;
+    font-weight: 500;
+  }
+
+  &::before,
+  &::after {
+    content: '';
+    display: block;
+    position: absolute;
+    height: 100%;
+    background: url('../images/warning-stripes.svg') repeat-y;
+    width: 5px;
+    top: 0;
+  }
+
+  &::before {
+    border-start-start-radius: 4px;
+    border-end-start-radius: 4px;
+    inset-inline-start: 0;
+  }
+
+  &::after {
+    border-start-end-radius: 4px;
+    border-end-end-radius: 4px;
+    inset-inline-end: 0;
+  }
+
+  &--filter::before,
+  &--filter::after {
+    background-image: url('../images/filter-stripes.svg');
+  }
+}

From 37f20514d31c72404cb90dfb46d582fbda4152cc Mon Sep 17 00:00:00 2001
From: Emelia Smith <ThisIsMissEm@users.noreply.github.com>
Date: Thu, 22 Aug 2024 10:42:33 +0200
Subject: [PATCH 1933/2191] [Glitch] Add button to view the Hashtag on the
 instance from Hashtags in Moderation UI

Port 376088f6da71e0250e144cc57b42d0dc18822317 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/styles/admin.scss | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/javascript/flavours/glitch/styles/admin.scss b/app/javascript/flavours/glitch/styles/admin.scss
index 52f9f39e912ac2..c4a16247b8dad0 100644
--- a/app/javascript/flavours/glitch/styles/admin.scss
+++ b/app/javascript/flavours/glitch/styles/admin.scss
@@ -244,6 +244,11 @@ $content-width: 840px;
         display: inline-flex;
         flex-flow: wrap;
         gap: 5px;
+        align-items: center;
+
+        .time-period {
+          padding: 0 10px;
+        }
       }
 
       h2 small {

From 9f2d3c721c182ff31f694b87f2049337ff3ddec1 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 22 Aug 2024 15:42:02 +0200
Subject: [PATCH 1934/2191] [Glitch] Hide multiple selection bar for
 notification requests when no notificion requests are loaded

Port abe292b0ec7f1e5ae0871db0492e191c65a18784 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/features/notifications/requests.jsx       | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/javascript/flavours/glitch/features/notifications/requests.jsx b/app/javascript/flavours/glitch/features/notifications/requests.jsx
index 970ce3b40cd680..aa39805aac05fd 100644
--- a/app/javascript/flavours/glitch/features/notifications/requests.jsx
+++ b/app/javascript/flavours/glitch/features/notifications/requests.jsx
@@ -217,7 +217,9 @@ export const NotificationRequests = ({ multiColumn }) => {
         multiColumn={multiColumn}
         showBackButton
         appendContent={
-          <SelectRow selectionMode={selectionMode} setSelectionMode={setSelectionMode} selectAllChecked={selectAllChecked} toggleSelectAll={toggleSelectAll} selectedItems={checkedRequestIds} />}
+          notificationRequests.size > 0 && (
+            <SelectRow selectionMode={selectionMode} setSelectionMode={setSelectionMode} selectAllChecked={selectAllChecked} toggleSelectAll={toggleSelectAll} selectedItems={checkedRequestIds} />
+          )}
       >
         <ColumnSettings />
       </ColumnHeader>

From e08d22724d9baf6c639466507c2b117788e5b8de Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 22 Aug 2024 20:57:22 +0200
Subject: [PATCH 1935/2191] Fix missing CSS in moderation interface (#31550)

---
 app/javascript/styles/mastodon/widgets.scss | 82 +++++++++++++++++++++
 1 file changed, 82 insertions(+)

diff --git a/app/javascript/styles/mastodon/widgets.scss b/app/javascript/styles/mastodon/widgets.scss
index b37d790ce39262..d810ee4bfc7ce4 100644
--- a/app/javascript/styles/mastodon/widgets.scss
+++ b/app/javascript/styles/mastodon/widgets.scss
@@ -1,3 +1,85 @@
+.directory {
+  &__tag {
+    box-sizing: border-box;
+    margin-bottom: 10px;
+
+    & > a,
+    & > div {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      border: 1px solid var(--background-border-color);
+      border-radius: 4px;
+      padding: 15px;
+      text-decoration: none;
+      color: inherit;
+      box-shadow: 0 0 15px rgba($base-shadow-color, 0.2);
+    }
+
+    & > a {
+      &:hover,
+      &:active,
+      &:focus {
+        background: $ui-base-color;
+      }
+    }
+
+    &.active > a {
+      background: $ui-highlight-color;
+      cursor: default;
+    }
+
+    &.disabled > div {
+      opacity: 0.5;
+      cursor: default;
+    }
+
+    h4 {
+      flex: 1 1 auto;
+      font-size: 18px;
+      font-weight: 700;
+      color: $primary-text-color;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+
+      .fa {
+        color: $darker-text-color;
+      }
+
+      small {
+        display: block;
+        font-weight: 400;
+        font-size: 15px;
+        margin-top: 8px;
+        color: $darker-text-color;
+      }
+    }
+
+    &.active h4 {
+      &,
+      .fa,
+      small,
+      .trends__item__current {
+        color: $primary-text-color;
+      }
+    }
+
+    .avatar-stack {
+      flex: 0 0 auto;
+      width: (36px + 4px) * 3;
+    }
+
+    &.active .avatar-stack .account__avatar {
+      border-color: $ui-highlight-color;
+    }
+
+    .trends__item__current {
+      padding-inline-end: 0;
+    }
+  }
+}
+
 .accounts-table {
   width: 100%;
 

From 7ce079cd2634c97b1154358014c14b92eec686ff Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 22 Aug 2024 20:57:22 +0200
Subject: [PATCH 1936/2191] [Glitch] Fix missing CSS in moderation interface

Port e08d22724d9baf6c639466507c2b117788e5b8de to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/styles/widgets.scss          | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/javascript/flavours/glitch/styles/widgets.scss b/app/javascript/flavours/glitch/styles/widgets.scss
index 6f5907f535f792..d810ee4bfc7ce4 100644
--- a/app/javascript/flavours/glitch/styles/widgets.scss
+++ b/app/javascript/flavours/glitch/styles/widgets.scss
@@ -1,10 +1,4 @@
-@use 'sass:math';
-
 .directory {
-  background: var(--background-color);
-  border-radius: 4px;
-  box-shadow: 0 0 15px rgba($base-shadow-color, 0.2);
-
   &__tag {
     box-sizing: border-box;
     margin-bottom: 10px;
@@ -65,7 +59,8 @@
     &.active h4 {
       &,
       .fa,
-      small {
+      small,
+      .trends__item__current {
         color: $primary-text-color;
       }
     }
@@ -78,6 +73,10 @@
     &.active .avatar-stack .account__avatar {
       border-color: $ui-highlight-color;
     }
+
+    .trends__item__current {
+      padding-inline-end: 0;
+    }
   }
 }
 
@@ -153,8 +152,9 @@
     vertical-align: initial !important;
   }
 
-  &__interrelationships {
+  tbody td.accounts-table__interrelationships {
     width: 21px;
+    padding-inline-end: 16px;
   }
 
   .icon {

From e18bd0450a78214ab1d5efde41d1041617a7989a Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 22 Aug 2024 22:17:33 +0200
Subject: [PATCH 1937/2191] Extract strings removed upstream

---
 app/javascript/flavours/glitch/locales/en.json | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/javascript/flavours/glitch/locales/en.json b/app/javascript/flavours/glitch/locales/en.json
index 02e44932f8adbf..3faf16c3358614 100644
--- a/app/javascript/flavours/glitch/locales/en.json
+++ b/app/javascript/flavours/glitch/locales/en.json
@@ -144,12 +144,17 @@
   "settings.wide_view": "Wide view (Desktop mode only)",
   "settings.wide_view_hint": "Stretches columns to better fill the available space.",
   "status.collapse": "Collapse",
+  "status.filtered": "Filtered",
   "status.has_audio": "Features attached audio files",
   "status.has_pictures": "Features attached pictures",
   "status.has_preview_card": "Features an attached preview card",
   "status.has_video": "Features attached videos",
+  "status.hide": "Hide post",
   "status.in_reply_to": "This toot is a reply",
   "status.is_poll": "This toot is a poll",
   "status.local_only": "Only visible from your instance",
+  "status.show_filter_reason": "Show anyway",
+  "status.show_less": "Show less",
+  "status.show_more": "Show more",
   "status.uncollapse": "Uncollapse"
 }

From 532b53eeceb4c370679f6dd1098b59cd1923f69c Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 22 Aug 2024 22:23:06 +0200
Subject: [PATCH 1938/2191] Fix assets build issue due to slightly different
 webpack config

---
 app/javascript/styles/mastodon/components.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 04944f1465fbdc..d9f3a8d7ada747 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -10895,7 +10895,7 @@ noscript {
     display: block;
     position: absolute;
     height: 100%;
-    background: url('../images/warning-stripes.svg') repeat-y;
+    background: url('~images/warning-stripes.svg') repeat-y;
     width: 5px;
     top: 0;
   }
@@ -10914,6 +10914,6 @@ noscript {
 
   &--filter::before,
   &--filter::after {
-    background-image: url('../images/filter-stripes.svg');
+    background-image: url('~images/filter-stripes.svg');
   }
 }

From 6ec768668ec521a5752ced29924dff0f4591d083 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 22 Aug 2024 16:28:54 -0400
Subject: [PATCH 1939/2191] Remove `nsa` statsd integration (replaced by
 OpenTelemetry) (#30240)

---
 Gemfile                       |  1 -
 Gemfile.lock                  |  7 -------
 config/initializers/statsd.rb | 19 -------------------
 3 files changed, 27 deletions(-)
 delete mode 100644 config/initializers/statsd.rb

diff --git a/Gemfile b/Gemfile
index 5b82fa98dd8865..9a6db1ec0986d2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -64,7 +64,6 @@ gem 'link_header', '~> 0.0'
 gem 'mario-redis-lock', '~> 1.2', require: 'redis_lock'
 gem 'mime-types', '~> 3.5.0', require: 'mime/types/columnar'
 gem 'nokogiri', '~> 1.15'
-gem 'nsa'
 gem 'oj', '~> 3.14'
 gem 'ox', '~> 2.14'
 gem 'parslet'
diff --git a/Gemfile.lock b/Gemfile.lock
index 8ea4fb66fd05d0..62f6f091b8c492 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -455,11 +455,6 @@ GEM
     nokogiri (1.16.7)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nsa (0.3.0)
-      activesupport (>= 4.2, < 7.2)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      sidekiq (>= 3.5)
-      statsd-ruby (~> 1.4, >= 1.4.0)
     oj (3.16.5)
       bigdecimal (>= 3.0)
       ostruct (>= 0.2)
@@ -821,7 +816,6 @@ GEM
     simplecov-lcov (0.8.0)
     simplecov_json_formatter (0.1.4)
     stackprof (0.2.26)
-    statsd-ruby (1.5.0)
     stoplight (4.1.0)
       redlock (~> 1.0)
     stringio (3.1.1)
@@ -980,7 +974,6 @@ DEPENDENCIES
   net-http (~> 0.4.0)
   net-ldap (~> 0.18)
   nokogiri (~> 1.15)
-  nsa
   oj (~> 3.14)
   omniauth (~> 2.0)
   omniauth-cas (~> 3.0.0.beta.1)
diff --git a/config/initializers/statsd.rb b/config/initializers/statsd.rb
deleted file mode 100644
index f1628a9d12ca32..00000000000000
--- a/config/initializers/statsd.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-if ENV['STATSD_ADDR'].present?
-  host, port = ENV['STATSD_ADDR'].split(':')
-
-  begin
-    statsd = Statsd.new(host, port)
-    statsd.namespace = ENV.fetch('STATSD_NAMESPACE') { ['Mastodon', Rails.env].join('.') }
-
-    NSA.inform_statsd(statsd) do |informant|
-      informant.collect(:action_controller, :web)
-      informant.collect(:active_record, :db)
-      informant.collect(:active_support_cache, :cache)
-      informant.collect(:sidekiq, :sidekiq) if ENV['STATSD_SIDEKIQ'] == 'true'
-    end
-  rescue
-    Rails.logger.warn("statsd address #{ENV['STATSD_ADDR']} not reachable, proceeding without statsd")
-  end
-end

From 0374918746e3943a655712529ddc14b71aecc9c2 Mon Sep 17 00:00:00 2001
From: David Roetzel <david@roetzel.de>
Date: Fri, 23 Aug 2024 10:20:32 +0200
Subject: [PATCH 1940/2191] Add spec for doorkeeper behavior around issuing
 tokens (#31545)

---
 spec/requests/oauth/token_spec.rb | 107 ++++++++++++++++++++++++++++++
 1 file changed, 107 insertions(+)
 create mode 100644 spec/requests/oauth/token_spec.rb

diff --git a/spec/requests/oauth/token_spec.rb b/spec/requests/oauth/token_spec.rb
new file mode 100644
index 00000000000000..39ea9b35ff6bcb
--- /dev/null
+++ b/spec/requests/oauth/token_spec.rb
@@ -0,0 +1,107 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Obtaining OAuth Tokens' do
+  describe 'POST /oauth/token' do
+    subject do
+      post '/oauth/token', params: params
+    end
+
+    let(:application) do
+      Fabricate(:application, scopes: 'read write follow', redirect_uri: 'urn:ietf:wg:oauth:2.0:oob')
+    end
+    let(:params) do
+      {
+        grant_type: grant_type,
+        client_id: application.uid,
+        client_secret: application.secret,
+        redirect_uri: 'urn:ietf:wg:oauth:2.0:oob',
+        code: code,
+        scope: scope,
+      }
+    end
+
+    context "with grant_type 'authorization_code'" do
+      let(:grant_type) { 'authorization_code' }
+      let(:code) do
+        access_grant = Fabricate(:access_grant, application: application, redirect_uri: 'urn:ietf:wg:oauth:2.0:oob', scopes: 'read write')
+        access_grant.plaintext_token
+      end
+
+      shared_examples 'returns originally requested scopes' do
+        it 'returns all scopes requested for the given code' do
+          subject
+
+          expect(response).to have_http_status(200)
+          expect(body_as_json[:scope]).to eq 'read write'
+        end
+      end
+
+      context 'with no scopes specified' do
+        let(:scope) { nil }
+
+        include_examples 'returns originally requested scopes'
+      end
+
+      context 'with scopes specified' do
+        context 'when the scopes were requested for this code' do
+          let(:scope) { 'write' }
+
+          include_examples 'returns originally requested scopes'
+        end
+
+        context 'when the scope was not requested for the code' do
+          let(:scope) { 'follow' }
+
+          include_examples 'returns originally requested scopes'
+        end
+
+        context 'when the scope does not belong to the application' do
+          let(:scope) { 'push' }
+
+          include_examples 'returns originally requested scopes'
+        end
+      end
+    end
+
+    context "with grant_type 'client_credentials'" do
+      let(:grant_type) { 'client_credentials' }
+      let(:code) { nil }
+
+      context 'with no scopes specified' do
+        let(:scope) { nil }
+
+        it 'returns only the default scope' do
+          subject
+
+          expect(response).to have_http_status(200)
+          expect(body_as_json[:scope]).to eq('read')
+        end
+      end
+
+      context 'with scopes specified' do
+        context 'when the scopes belong to the application' do
+          let(:scope) { 'read write' }
+
+          it 'returns all the requested scopes' do
+            subject
+
+            expect(response).to have_http_status(200)
+            expect(body_as_json[:scope]).to eq 'read write'
+          end
+        end
+
+        context 'when some scopes do not belong to the application' do
+          let(:scope) { 'read write push' }
+
+          it 'returns an error' do
+            subject
+
+            expect(response).to have_http_status(400)
+          end
+        end
+      end
+    end
+  end
+end

From 62be0234d5d1788c12d0c9504fd4243099518521 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 23 Aug 2024 10:59:31 +0200
Subject: [PATCH 1941/2191] New Crowdin Translations (automated) (#31559)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/an.json      |  5 -
 app/javascript/mastodon/locales/ar.json      |  5 -
 app/javascript/mastodon/locales/ast.json     |  5 -
 app/javascript/mastodon/locales/be.json      |  5 -
 app/javascript/mastodon/locales/bg.json      |  5 -
 app/javascript/mastodon/locales/bn.json      |  4 -
 app/javascript/mastodon/locales/br.json      |  5 -
 app/javascript/mastodon/locales/ca.json      |  8 +-
 app/javascript/mastodon/locales/ckb.json     |  5 -
 app/javascript/mastodon/locales/co.json      |  3 -
 app/javascript/mastodon/locales/cs.json      |  5 -
 app/javascript/mastodon/locales/cy.json      |  5 -
 app/javascript/mastodon/locales/da.json      |  8 +-
 app/javascript/mastodon/locales/de.json      |  8 +-
 app/javascript/mastodon/locales/el.json      |  5 -
 app/javascript/mastodon/locales/en-GB.json   |  5 -
 app/javascript/mastodon/locales/eo.json      |  5 -
 app/javascript/mastodon/locales/es-AR.json   |  5 -
 app/javascript/mastodon/locales/es-MX.json   |  5 -
 app/javascript/mastodon/locales/es.json      |  5 -
 app/javascript/mastodon/locales/et.json      |  5 -
 app/javascript/mastodon/locales/eu.json      |  5 -
 app/javascript/mastodon/locales/fa.json      |  5 -
 app/javascript/mastodon/locales/fi.json      |  8 +-
 app/javascript/mastodon/locales/fil.json     |  2 -
 app/javascript/mastodon/locales/fo.json      |  8 +-
 app/javascript/mastodon/locales/fr-CA.json   | 24 +++--
 app/javascript/mastodon/locales/fr.json      | 26 ++++--
 app/javascript/mastodon/locales/fy.json      |  5 -
 app/javascript/mastodon/locales/ga.json      |  5 -
 app/javascript/mastodon/locales/gd.json      |  5 -
 app/javascript/mastodon/locales/gl.json      |  8 +-
 app/javascript/mastodon/locales/he.json      | 28 +++++-
 app/javascript/mastodon/locales/hi.json      |  2 -
 app/javascript/mastodon/locales/hr.json      |  5 -
 app/javascript/mastodon/locales/hu.json      | 10 +-
 app/javascript/mastodon/locales/hy.json      |  5 -
 app/javascript/mastodon/locales/ia.json      |  5 -
 app/javascript/mastodon/locales/id.json      |  5 -
 app/javascript/mastodon/locales/ie.json      |  5 -
 app/javascript/mastodon/locales/io.json      |  5 -
 app/javascript/mastodon/locales/is.json      | 21 ++++-
 app/javascript/mastodon/locales/it.json      |  8 +-
 app/javascript/mastodon/locales/ja.json      |  5 -
 app/javascript/mastodon/locales/ka.json      |  3 -
 app/javascript/mastodon/locales/kab.json     |  5 -
 app/javascript/mastodon/locales/kk.json      |  3 -
 app/javascript/mastodon/locales/ko.json      |  5 -
 app/javascript/mastodon/locales/ku.json      |  5 -
 app/javascript/mastodon/locales/kw.json      |  3 -
 app/javascript/mastodon/locales/lad.json     |  5 -
 app/javascript/mastodon/locales/lt.json      | 98 ++++++++++----------
 app/javascript/mastodon/locales/lv.json      |  5 -
 app/javascript/mastodon/locales/ml.json      |  3 -
 app/javascript/mastodon/locales/ms.json      |  5 -
 app/javascript/mastodon/locales/my.json      |  5 -
 app/javascript/mastodon/locales/nl.json      |  8 +-
 app/javascript/mastodon/locales/nn.json      |  6 +-
 app/javascript/mastodon/locales/no.json      |  5 -
 app/javascript/mastodon/locales/oc.json      |  5 -
 app/javascript/mastodon/locales/pa.json      |  3 -
 app/javascript/mastodon/locales/pl.json      |  8 +-
 app/javascript/mastodon/locales/pt-BR.json   |  5 -
 app/javascript/mastodon/locales/pt-PT.json   |  5 -
 app/javascript/mastodon/locales/ro.json      |  5 -
 app/javascript/mastodon/locales/ru.json      |  5 -
 app/javascript/mastodon/locales/sa.json      |  2 -
 app/javascript/mastodon/locales/sc.json      |  3 -
 app/javascript/mastodon/locales/sco.json     |  4 -
 app/javascript/mastodon/locales/si.json      |  5 -
 app/javascript/mastodon/locales/sk.json      |  5 -
 app/javascript/mastodon/locales/sl.json      | 10 +-
 app/javascript/mastodon/locales/sq.json      |  5 -
 app/javascript/mastodon/locales/sr-Latn.json |  5 -
 app/javascript/mastodon/locales/sr.json      |  5 -
 app/javascript/mastodon/locales/sv.json      | 49 +++++++++-
 app/javascript/mastodon/locales/ta.json      |  3 -
 app/javascript/mastodon/locales/te.json      |  3 -
 app/javascript/mastodon/locales/th.json      |  5 -
 app/javascript/mastodon/locales/tok.json     |  4 -
 app/javascript/mastodon/locales/tr.json      |  5 -
 app/javascript/mastodon/locales/tt.json      |  5 -
 app/javascript/mastodon/locales/uk.json      |  5 -
 app/javascript/mastodon/locales/vi.json      |  5 -
 app/javascript/mastodon/locales/zgh.json     |  2 -
 app/javascript/mastodon/locales/zh-CN.json   |  5 -
 app/javascript/mastodon/locales/zh-HK.json   |  5 -
 app/javascript/mastodon/locales/zh-TW.json   |  8 +-
 config/locales/ca.yml                        |  1 +
 config/locales/da.yml                        |  1 +
 config/locales/de.yml                        |  1 +
 config/locales/doorkeeper.lt.yml             |  8 +-
 config/locales/fi.yml                        |  1 +
 config/locales/fo.yml                        |  1 +
 config/locales/fr-CA.yml                     | 12 +++
 config/locales/fr.yml                        | 12 +++
 config/locales/gl.yml                        |  1 +
 config/locales/he.yml                        |  1 +
 config/locales/hu.yml                        |  1 +
 config/locales/is.yml                        |  1 +
 config/locales/it.yml                        |  1 +
 config/locales/lt.yml                        |  1 +
 config/locales/nl.yml                        |  1 +
 config/locales/pl.yml                        |  1 +
 config/locales/simple_form.fr-CA.yml         |  4 +
 config/locales/simple_form.fr.yml            |  4 +
 config/locales/simple_form.sv.yml            |  3 +-
 config/locales/sq.yml                        |  1 +
 config/locales/sv.yml                        | 25 +++++
 config/locales/tr.yml                        |  1 +
 config/locales/uk.yml                        |  1 +
 config/locales/zh-TW.yml                     |  1 +
 112 files changed, 288 insertions(+), 461 deletions(-)

diff --git a/app/javascript/mastodon/locales/an.json b/app/javascript/mastodon/locales/an.json
index 4a82967877efde..7974cea6404b57 100644
--- a/app/javascript/mastodon/locales/an.json
+++ b/app/javascript/mastodon/locales/an.json
@@ -483,8 +483,6 @@
   "status.edited_x_times": "Editau {count, plural, one {{count} vez} other {{count} veces}}",
   "status.embed": "Incrustado",
   "status.filter": "Filtrar esta publicación",
-  "status.filtered": "Filtrau",
-  "status.hide": "Amagar la publicación",
   "status.history.created": "{name} creyó {date}",
   "status.history.edited": "{name} editó {date}",
   "status.load_more": "Cargar mas",
@@ -509,10 +507,7 @@
   "status.report": "Denunciar €{name}",
   "status.sensitive_warning": "Conteniu sensible",
   "status.share": "Compartir",
-  "status.show_filter_reason": "Amostrar de totz modos",
-  "status.show_less": "Amostrar menos",
   "status.show_less_all": "Amostrar menos pa tot",
-  "status.show_more": "Amostrar mas",
   "status.show_more_all": "Amostrar mas pa tot",
   "status.show_original": "Amostrar orichinal",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
diff --git a/app/javascript/mastodon/locales/ar.json b/app/javascript/mastodon/locales/ar.json
index 6fd426b502023d..8d3289ff45d995 100644
--- a/app/javascript/mastodon/locales/ar.json
+++ b/app/javascript/mastodon/locales/ar.json
@@ -736,8 +736,6 @@
   "status.favourite": "فضّل",
   "status.favourites": "{count, plural, zero {}one {مفضلة واحدة} two {مفضلتان} few {# مفضلات} many {# مفضلات} other {# مفضلات}}",
   "status.filter": "تصفية هذا المنشور",
-  "status.filtered": "مُصفّى",
-  "status.hide": "إخفاء المنشور",
   "status.history.created": "أنشأه {name} {date}",
   "status.history.edited": "عدله {name} {date}",
   "status.load_more": "حمّل المزيد",
@@ -765,10 +763,7 @@
   "status.report": "ابلِغ عن @{name}",
   "status.sensitive_warning": "محتوى حساس",
   "status.share": "مشاركة",
-  "status.show_filter_reason": "إظهار على أي حال",
-  "status.show_less": "اعرض أقلّ",
   "status.show_less_all": "طي الكل",
-  "status.show_more": "أظهر المزيد",
   "status.show_more_all": "توسيع الكل",
   "status.show_original": "إظهار الأصل",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
diff --git a/app/javascript/mastodon/locales/ast.json b/app/javascript/mastodon/locales/ast.json
index ac181c7ab1b6ca..74eb7021d34e05 100644
--- a/app/javascript/mastodon/locales/ast.json
+++ b/app/javascript/mastodon/locales/ast.json
@@ -422,8 +422,6 @@
   "status.edited_x_times": "Editóse {count, plural, one {{count} vegada} other {{count} vegaes}}",
   "status.embed": "Empotrar",
   "status.filter": "Peñerar esti artículu",
-  "status.filtered": "Peñeróse",
-  "status.hide": "Anubrir l'artículu",
   "status.history.created": "{name} creó {date}",
   "status.history.edited": "{name} editó {date}",
   "status.load_more": "Cargar más",
@@ -446,9 +444,6 @@
   "status.report": "Informar de @{name}",
   "status.sensitive_warning": "Conteníu sensible",
   "status.share": "Compartir",
-  "status.show_filter_reason": "Amosar de toes toes",
-  "status.show_less": "Amosar menos",
-  "status.show_more": "Amosar más",
   "status.show_original": "Amosar l'orixinal",
   "status.translate": "Traducir",
   "status.translated_from_with": "Tradúxose del {lang} con {provider}",
diff --git a/app/javascript/mastodon/locales/be.json b/app/javascript/mastodon/locales/be.json
index 29e636f50cc8a7..6335b546d7b602 100644
--- a/app/javascript/mastodon/locales/be.json
+++ b/app/javascript/mastodon/locales/be.json
@@ -745,8 +745,6 @@
   "status.favourite": "Упадабанае",
   "status.favourites": "{count, plural, one {# упадабанае} few {# упадабаныя} many {# упадабаных} other {# упадабанага}}",
   "status.filter": "Фільтраваць гэты допіс",
-  "status.filtered": "Адфільтравана",
-  "status.hide": "Схаваць допіс",
   "status.history.created": "Створана {name} {date}",
   "status.history.edited": "Адрэдагавана {name} {date}",
   "status.load_more": "Загрузіць яшчэ",
@@ -774,10 +772,7 @@
   "status.report": "Паскардзіцца на @{name}",
   "status.sensitive_warning": "Уражвальны змест",
   "status.share": "Абагуліць",
-  "status.show_filter_reason": "Усё адно паказаць",
-  "status.show_less": "Паказаць меньш",
   "status.show_less_all": "Згарнуць усё",
-  "status.show_more": "Паказаць болей",
   "status.show_more_all": "Разгарнуць усё",
   "status.show_original": "Паказаць арыгінал",
   "status.title.with_attachments": "{user} апублікаваў {attachmentCount, plural, one {далучэнне} few {{attachmentCount} далучэнні} many {{attachmentCount} далучэнняў} other {{attachmentCount} далучэння}}",
diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json
index 6a5e66ad320541..83d9c5343ab160 100644
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@@ -746,8 +746,6 @@
   "status.favourite": "Любимо",
   "status.favourites": "{count, plural, one {любимо} other {любими}}",
   "status.filter": "Филтриране на публ.",
-  "status.filtered": "Филтрирано",
-  "status.hide": "Скриване на публ.",
   "status.history.created": "{name} създаде {date}",
   "status.history.edited": "{name} редактира {date}",
   "status.load_more": "Зареждане на още",
@@ -775,10 +773,7 @@
   "status.report": "Докладване на @{name}",
   "status.sensitive_warning": "Деликатно съдържание",
   "status.share": "Споделяне",
-  "status.show_filter_reason": "Покажи въпреки това",
-  "status.show_less": "Показване на по-малко",
   "status.show_less_all": "Показване на по-малко за всички",
-  "status.show_more": "Показване на повече",
   "status.show_more_all": "Показване на повече за всички",
   "status.show_original": "Показване на първообраза",
   "status.title.with_attachments": "{user} публикува {attachmentCount, plural, one {прикачване} other {{attachmentCount} прикачвания}}",
diff --git a/app/javascript/mastodon/locales/bn.json b/app/javascript/mastodon/locales/bn.json
index 1c57b86f4292a2..584bf303b126ac 100644
--- a/app/javascript/mastodon/locales/bn.json
+++ b/app/javascript/mastodon/locales/bn.json
@@ -411,8 +411,6 @@
   "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
   "status.embed": "এমবেড করতে",
   "status.favourite": "পছন্দ",
-  "status.filtered": "ছাঁকনিদিত",
-  "status.hide": "পোস্ট লুকাও",
   "status.load_more": "আরো দেখুন",
   "status.media_hidden": "মিডিয়া লুকানো আছে",
   "status.mention": "@{name}কে উল্লেখ করতে",
@@ -434,9 +432,7 @@
   "status.report": "@{name} কে রিপোর্ট করতে",
   "status.sensitive_warning": "সংবেদনশীল কিছু",
   "status.share": "অন্যদের জানান",
-  "status.show_less": "কম দেখতে",
   "status.show_less_all": "সবগুলোতে কম দেখতে",
-  "status.show_more": "আরো দেখাতে",
   "status.show_more_all": "সবগুলোতে আরো দেখতে",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
   "status.translate": "অনুবাদ",
diff --git a/app/javascript/mastodon/locales/br.json b/app/javascript/mastodon/locales/br.json
index dc1e549759496a..c8bb4975dedf10 100644
--- a/app/javascript/mastodon/locales/br.json
+++ b/app/javascript/mastodon/locales/br.json
@@ -579,8 +579,6 @@
   "status.embed": "Enframmañ",
   "status.favourite": "Muiañ-karet",
   "status.filter": "Silañ ar c'hannad-mañ",
-  "status.filtered": "Silet",
-  "status.hide": "Kuzhat an embannadur",
   "status.history.created": "Krouet gant {name} {date}",
   "status.history.edited": "Kemmet gant {name} {date}",
   "status.load_more": "Kargañ muioc'h",
@@ -607,10 +605,7 @@
   "status.report": "Disklêriañ @{name}",
   "status.sensitive_warning": "Dalc'had kizidik",
   "status.share": "Rannañ",
-  "status.show_filter_reason": "Diskwel memes tra",
-  "status.show_less": "Diskouez nebeutoc'h",
   "status.show_less_all": "Diskouez nebeutoc'h evit an holl",
-  "status.show_more": "Diskouez muioc'h",
   "status.show_more_all": "Diskouez miuoc'h evit an holl",
   "status.show_original": "Diskouez hini orin",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index 6ea94151f86110..727c161873c209 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -192,6 +192,8 @@
   "confirmations.unfollow.confirm": "Deixa de seguir",
   "confirmations.unfollow.message": "Segur que vols deixar de seguir {name}?",
   "confirmations.unfollow.title": "Deixar de seguir l'usuari?",
+  "content_warning.hide": "Amaga la publicació",
+  "content_warning.show": "Mostra-la igualment",
   "conversation.delete": "Elimina la conversa",
   "conversation.mark_as_read": "Marca com a llegida",
   "conversation.open": "Mostra la conversa",
@@ -299,6 +301,7 @@
   "filter_modal.select_filter.subtitle": "Usa una categoria existent o crea'n una de nova",
   "filter_modal.select_filter.title": "Filtra aquest tut",
   "filter_modal.title.status": "Filtra un tut",
+  "filter_warning.matches_filter": "Coincideix amb el filtre “{title}”",
   "filtered_notifications_banner.pending_requests": "{count, plural, =0 {De ningú} one {D'una persona} other {De # persones}} que potser coneixes",
   "filtered_notifications_banner.title": "Notificacions filtrades",
   "firehose.all": "Tots",
@@ -785,8 +788,6 @@
   "status.favourite": "Favorit",
   "status.favourites": "{count, plural, one {favorit} other {favorits}}",
   "status.filter": "Filtra aquest tut",
-  "status.filtered": "Filtrada",
-  "status.hide": "Amaga el tut",
   "status.history.created": "creat per {name} {date}",
   "status.history.edited": "editat per {name} {date}",
   "status.load_more": "Carrega'n més",
@@ -814,10 +815,7 @@
   "status.report": "Denuncia @{name}",
   "status.sensitive_warning": "Contingut sensible",
   "status.share": "Comparteix",
-  "status.show_filter_reason": "Mostra igualment",
-  "status.show_less": "Mostra'n menys",
   "status.show_less_all": "Mostra'n menys per a tot",
-  "status.show_more": "Mostra'n més",
   "status.show_more_all": "Mostra'n més per a tot",
   "status.show_original": "Mostra l'original",
   "status.title.with_attachments": "{user} ha publicat {attachmentCount, plural, one {un adjunt} other {{attachmentCount} adjunts}}",
diff --git a/app/javascript/mastodon/locales/ckb.json b/app/javascript/mastodon/locales/ckb.json
index 99ce6a81803d55..9def7533aea657 100644
--- a/app/javascript/mastodon/locales/ckb.json
+++ b/app/javascript/mastodon/locales/ckb.json
@@ -542,8 +542,6 @@
   "status.edited_x_times": "دەستکاریکراوە {count, plural, one {{count} کات} other {{count} کات}}",
   "status.embed": "نیشتەجێ بکە",
   "status.filter": "ئەم پۆستە فلتەر بکە",
-  "status.filtered": "پاڵاوتن",
-  "status.hide": "شاردنەوەی پۆست",
   "status.history.created": "{name} دروستکراوە لە{date}",
   "status.history.edited": "{name} دروستکاریکراوە لە{date}",
   "status.load_more": "زیاتر بار بکە",
@@ -568,10 +566,7 @@
   "status.report": "گوزارشت @{name}",
   "status.sensitive_warning": "ناوەڕۆکی هەستیار",
   "status.share": "هاوبەشی بکە",
-  "status.show_filter_reason": "بە هەر حاڵ نیشان بدە",
-  "status.show_less": "کەمتر نیشان بدە",
   "status.show_less_all": "هەمووی بچووک بکەوە",
-  "status.show_more": "زیاتر نیشان بدە",
   "status.show_more_all": "زیاتر نیشان بدە بۆ هەمووی",
   "status.show_original": "پیشاندانی شێوه‌ی ڕاسته‌قینه‌",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
diff --git a/app/javascript/mastodon/locales/co.json b/app/javascript/mastodon/locales/co.json
index f1783465d99eee..3a72ecd3fb111b 100644
--- a/app/javascript/mastodon/locales/co.json
+++ b/app/javascript/mastodon/locales/co.json
@@ -321,7 +321,6 @@
   "status.detailed_status": "Vista in ditagliu di a cunversazione",
   "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
   "status.embed": "Integrà",
-  "status.filtered": "Filtratu",
   "status.load_more": "Vede di più",
   "status.media_hidden": "Media piattata",
   "status.mention": "Mintuvà @{name}",
@@ -343,9 +342,7 @@
   "status.report": "Palisà @{name}",
   "status.sensitive_warning": "Cuntinutu sensibile",
   "status.share": "Sparte",
-  "status.show_less": "Ripiegà",
   "status.show_less_all": "Ripiegà tuttu",
-  "status.show_more": "Slibrà",
   "status.show_more_all": "Slibrà tuttu",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
   "status.unmute_conversation": "Ùn piattà più a cunversazione",
diff --git a/app/javascript/mastodon/locales/cs.json b/app/javascript/mastodon/locales/cs.json
index b726fef18b75d0..ebfaef36751df7 100644
--- a/app/javascript/mastodon/locales/cs.json
+++ b/app/javascript/mastodon/locales/cs.json
@@ -731,8 +731,6 @@
   "status.favourite": "Oblíbit",
   "status.favourites": "{count, plural, one {oblíbený} few {oblíbené} many {oblíbených} other {oblíbených}}",
   "status.filter": "Filtrovat tento příspěvek",
-  "status.filtered": "Filtrováno",
-  "status.hide": "Skrýt příspěvek",
   "status.history.created": "Uživatel {name} vytvořil {date}",
   "status.history.edited": "Uživatel {name} upravil {date}",
   "status.load_more": "Načíst více",
@@ -760,10 +758,7 @@
   "status.report": "Nahlásit @{name}",
   "status.sensitive_warning": "Citlivý obsah",
   "status.share": "Sdílet",
-  "status.show_filter_reason": "Přesto zobrazit",
-  "status.show_less": "Zobrazit méně",
   "status.show_less_all": "Zobrazit méně pro všechny",
-  "status.show_more": "Zobrazit více",
   "status.show_more_all": "Zobrazit více pro všechny",
   "status.show_original": "Zobrazit originál",
   "status.title.with_attachments": "{user} zveřejnil {attachmentCount, plural, one {přílohu} few {{attachmentCount} přílohy} many {{attachmentCount} příloh} other {{attachmentCount} příloh}}",
diff --git a/app/javascript/mastodon/locales/cy.json b/app/javascript/mastodon/locales/cy.json
index d40533765921f0..d029f6bad1835b 100644
--- a/app/javascript/mastodon/locales/cy.json
+++ b/app/javascript/mastodon/locales/cy.json
@@ -762,8 +762,6 @@
   "status.favourite": "Hoffi",
   "status.favourites": "{count, plural, one {ffefryn} other {ffefryn}}",
   "status.filter": "Hidlo'r postiad hwn",
-  "status.filtered": "Wedi'i hidlo",
-  "status.hide": "Cuddio'r postiad",
   "status.history.created": "Crëwyd gan {name} {date}",
   "status.history.edited": "Golygwyd gan {name} {date}",
   "status.load_more": "Llwythwch ragor",
@@ -791,10 +789,7 @@
   "status.report": "Adrodd ar @{name}",
   "status.sensitive_warning": "Cynnwys sensitif",
   "status.share": "Rhannu",
-  "status.show_filter_reason": "Dangos beth bynnag",
-  "status.show_less": "Dangos llai",
   "status.show_less_all": "Dangos llai i bawb",
-  "status.show_more": "Dangos mwy",
   "status.show_more_all": "Dangos mwy i bawb",
   "status.show_original": "Dangos y gwreiddiol",
   "status.title.with_attachments": "Postiodd {user} {attachmentCount, plural, one {an attachment} other {{attachmentCount} attachments}}",
diff --git a/app/javascript/mastodon/locales/da.json b/app/javascript/mastodon/locales/da.json
index 9a23d70bc62f72..a791ec75e04185 100644
--- a/app/javascript/mastodon/locales/da.json
+++ b/app/javascript/mastodon/locales/da.json
@@ -192,6 +192,8 @@
   "confirmations.unfollow.confirm": "Følg ikke længere",
   "confirmations.unfollow.message": "Er du sikker på, at du ikke længere vil følge {name}?",
   "confirmations.unfollow.title": "Følg ikke længere bruger?",
+  "content_warning.hide": "Skjul indlæg",
+  "content_warning.show": "Vis alligevel",
   "conversation.delete": "Slet samtale",
   "conversation.mark_as_read": "Markér som læst",
   "conversation.open": "Vis samtale",
@@ -299,6 +301,7 @@
   "filter_modal.select_filter.subtitle": "Vælg en eksisterende kategori eller opret en ny",
   "filter_modal.select_filter.title": "Filtrér dette indlæg",
   "filter_modal.title.status": "Filtrér et indlæg",
+  "filter_warning.matches_filter": "Matcher filteret “{title}”",
   "filtered_notifications_banner.pending_requests": "Fra {count, plural, =0 {ingen} one {én person} other {# personer}}, man måske kender",
   "filtered_notifications_banner.title": "Filtrerede notifikationer",
   "firehose.all": "Alle",
@@ -785,8 +788,6 @@
   "status.favourite": "Favorit",
   "status.favourites": "{count, plural, one {# favorit} other {# favoritter}}",
   "status.filter": "Filtrér dette indlæg",
-  "status.filtered": "Filtreret",
-  "status.hide": "Skjul indlæg",
   "status.history.created": "{name} oprettet {date}",
   "status.history.edited": "{name} redigeret {date}",
   "status.load_more": "Indlæs mere",
@@ -814,10 +815,7 @@
   "status.report": "Anmeld @{name}",
   "status.sensitive_warning": "Følsomt indhold",
   "status.share": "Del",
-  "status.show_filter_reason": "Vis alligevel",
-  "status.show_less": "Vis mindre",
   "status.show_less_all": "Vis mindre for alle",
-  "status.show_more": "Vis mere",
   "status.show_more_all": "Vis mere for alle",
   "status.show_original": "Vis original",
   "status.title.with_attachments": "{user} postede {attachmentCount, plural, one {en vedhæftning} other {{attachmentCount} vedhæftninger}}",
diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json
index 5030a824ad7255..b960649eb21c1d 100644
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@@ -192,6 +192,8 @@
   "confirmations.unfollow.confirm": "Entfolgen",
   "confirmations.unfollow.message": "Möchtest du {name} wirklich entfolgen?",
   "confirmations.unfollow.title": "Profil entfolgen?",
+  "content_warning.hide": "Beitrag ausblenden",
+  "content_warning.show": "Trotzdem anzeigen",
   "conversation.delete": "Unterhaltung löschen",
   "conversation.mark_as_read": "Als gelesen markieren",
   "conversation.open": "Unterhaltung anzeigen",
@@ -299,6 +301,7 @@
   "filter_modal.select_filter.subtitle": "Einem vorhandenen Filter hinzufügen oder einen neuen erstellen",
   "filter_modal.select_filter.title": "Diesen Beitrag filtern",
   "filter_modal.title.status": "Beitrag per Filter ausblenden",
+  "filter_warning.matches_filter": "Übereinstimmend mit dem Filter „{title}“",
   "filtered_notifications_banner.pending_requests": "Von {count, plural, =0 {keinem, den} one {einer Person, die} other {# Personen, die}} du möglicherweise kennst",
   "filtered_notifications_banner.title": "Gefilterte Benachrichtigungen",
   "firehose.all": "Alles",
@@ -785,8 +788,6 @@
   "status.favourite": "Favorisieren",
   "status.favourites": "{count, plural, one {Mal favorisiert} other {Mal favorisiert}}",
   "status.filter": "Beitrag filtern",
-  "status.filtered": "Gefiltert",
-  "status.hide": "Beitrag ausblenden",
   "status.history.created": "{name} erstellte {date}",
   "status.history.edited": "{name} bearbeitete {date}",
   "status.load_more": "Mehr laden",
@@ -814,10 +815,7 @@
   "status.report": "@{name} melden",
   "status.sensitive_warning": "Inhaltswarnung",
   "status.share": "Teilen",
-  "status.show_filter_reason": "Trotzdem anzeigen",
-  "status.show_less": "Weniger anzeigen",
   "status.show_less_all": "Alles einklappen",
-  "status.show_more": "Mehr anzeigen",
   "status.show_more_all": "Alles ausklappen",
   "status.show_original": "Ursprünglichen Beitrag anzeigen",
   "status.title.with_attachments": "{user} veröffentlichte {attachmentCount, plural, one {ein Medium} other {{attachmentCount} Medien}}",
diff --git a/app/javascript/mastodon/locales/el.json b/app/javascript/mastodon/locales/el.json
index 6cdb9d6f383d24..a3adaaf9d11573 100644
--- a/app/javascript/mastodon/locales/el.json
+++ b/app/javascript/mastodon/locales/el.json
@@ -785,8 +785,6 @@
   "status.favourite": "Αγαπημένα",
   "status.favourites": "{count, plural, one {# αγαπημένο} other {# αγαπημένα}}",
   "status.filter": "Φιλτράρισμα αυτής της ανάρτησης",
-  "status.filtered": "Φιλτραρισμένα",
-  "status.hide": "Απόκρυψη ανάρτησης",
   "status.history.created": "{name} δημιούργησε στις {date}",
   "status.history.edited": "{name} επεξεργάστηκε στις {date}",
   "status.load_more": "Φόρτωσε περισσότερα",
@@ -814,10 +812,7 @@
   "status.report": "Αναφορά @{name}",
   "status.sensitive_warning": "Ευαίσθητο περιεχόμενο",
   "status.share": "Κοινοποίηση",
-  "status.show_filter_reason": "Εμφάνιση παρ' όλα αυτά",
-  "status.show_less": "Δείξε λιγότερα",
   "status.show_less_all": "Δείξε λιγότερα για όλα",
-  "status.show_more": "Δείξε περισσότερα",
   "status.show_more_all": "Δείξε περισσότερα για όλα",
   "status.show_original": "Εμφάνιση αρχικού",
   "status.title.with_attachments": "{user} δημοσίευσε {attachmentCount, plural, one {ένα συνημμένο} other {{attachmentCount} συνημμένα}}",
diff --git a/app/javascript/mastodon/locales/en-GB.json b/app/javascript/mastodon/locales/en-GB.json
index c3366c65452981..ec0db40f77cacd 100644
--- a/app/javascript/mastodon/locales/en-GB.json
+++ b/app/javascript/mastodon/locales/en-GB.json
@@ -785,8 +785,6 @@
   "status.favourite": "Favourite",
   "status.favourites": "{count, plural, one {favorite} other {favorites}}",
   "status.filter": "Filter this post",
-  "status.filtered": "Filtered",
-  "status.hide": "Hide post",
   "status.history.created": "{name} created {date}",
   "status.history.edited": "{name} edited {date}",
   "status.load_more": "Load more",
@@ -814,10 +812,7 @@
   "status.report": "Report @{name}",
   "status.sensitive_warning": "Sensitive content",
   "status.share": "Share",
-  "status.show_filter_reason": "Show anyway",
-  "status.show_less": "Show less",
   "status.show_less_all": "Show less for all",
-  "status.show_more": "Show more",
   "status.show_more_all": "Show more for all",
   "status.show_original": "Show original",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {{attachmentCount} attachments}}",
diff --git a/app/javascript/mastodon/locales/eo.json b/app/javascript/mastodon/locales/eo.json
index a469e36409c4a2..76ca4980fa2449 100644
--- a/app/javascript/mastodon/locales/eo.json
+++ b/app/javascript/mastodon/locales/eo.json
@@ -632,8 +632,6 @@
   "status.embed": "Enkorpigi",
   "status.favourite": "Ŝatata",
   "status.filter": "Filtri ĉi tiun afiŝon",
-  "status.filtered": "Filtrita",
-  "status.hide": "Kaŝi mesaĝon",
   "status.history.created": "{name} kreis {date}",
   "status.history.edited": "{name} redaktis {date}",
   "status.load_more": "Ŝargi pli",
@@ -660,10 +658,7 @@
   "status.report": "Raporti @{name}",
   "status.sensitive_warning": "Tikla enhavo",
   "status.share": "Kundividi",
-  "status.show_filter_reason": "Ĉial montri",
-  "status.show_less": "Montri malpli",
   "status.show_less_all": "Montri malpli ĉiun",
-  "status.show_more": "Montri pli",
   "status.show_more_all": "Montri pli ĉiun",
   "status.show_original": "Montru originalon",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
diff --git a/app/javascript/mastodon/locales/es-AR.json b/app/javascript/mastodon/locales/es-AR.json
index baec70fd28ab13..85561495d754f0 100644
--- a/app/javascript/mastodon/locales/es-AR.json
+++ b/app/javascript/mastodon/locales/es-AR.json
@@ -785,8 +785,6 @@
   "status.favourite": "Marcar como favorito",
   "status.favourites": "{count, plural, one {# voto} other {# votos}}",
   "status.filter": "Filtrar este mensaje",
-  "status.filtered": "Filtrado",
-  "status.hide": "Ocultar mensaje",
   "status.history.created": "Creado por {name}, {date}",
   "status.history.edited": "Editado por {name}, {date}",
   "status.load_more": "Cargar más",
@@ -814,10 +812,7 @@
   "status.report": "Denunciar a @{name}",
   "status.sensitive_warning": "Contenido sensible",
   "status.share": "Compartir",
-  "status.show_filter_reason": "Mostrar de todos modos",
-  "status.show_less": "Mostrar menos",
   "status.show_less_all": "Mostrar menos para todo",
-  "status.show_more": "Mostrar más",
   "status.show_more_all": "Mostrar más para todo",
   "status.show_original": "Mostrar original",
   "status.title.with_attachments": "{user} envió {attachmentCount, plural, one {un adjunto} other {{attachmentCount} adjuntos}}",
diff --git a/app/javascript/mastodon/locales/es-MX.json b/app/javascript/mastodon/locales/es-MX.json
index 929356352b826f..30a3a42fde4e6e 100644
--- a/app/javascript/mastodon/locales/es-MX.json
+++ b/app/javascript/mastodon/locales/es-MX.json
@@ -785,8 +785,6 @@
   "status.favourite": "Favorito",
   "status.favourites": "{count, plural, one {favorito} other {favoritos}}",
   "status.filter": "Filtrar esta publicación",
-  "status.filtered": "Filtrado",
-  "status.hide": "Ocultar toot",
   "status.history.created": "{name} creó {date}",
   "status.history.edited": "{name} editado {date}",
   "status.load_more": "Cargar más",
@@ -814,10 +812,7 @@
   "status.report": "Reportar",
   "status.sensitive_warning": "Contenido sensible",
   "status.share": "Compartir",
-  "status.show_filter_reason": "Mostrar de todos modos",
-  "status.show_less": "Mostrar menos",
   "status.show_less_all": "Mostrar menos para todo",
-  "status.show_more": "Mostrar más",
   "status.show_more_all": "Mostrar más para todo",
   "status.show_original": "Mostrar original",
   "status.title.with_attachments": "{user} ha publicado {attachmentCount, plural, one {un adjunto} other {{attachmentCount} adjuntos}}",
diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json
index 1b54fa615e4b08..c047a2aa890c95 100644
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@@ -785,8 +785,6 @@
   "status.favourite": "Favorito",
   "status.favourites": "{count, plural, one {favorito} other {favoritos}}",
   "status.filter": "Filtrar esta publicación",
-  "status.filtered": "Filtrado",
-  "status.hide": "Ocultar publicación",
   "status.history.created": "{name} creó {date}",
   "status.history.edited": "{name} editó {date}",
   "status.load_more": "Cargar más",
@@ -814,10 +812,7 @@
   "status.report": "Reportar",
   "status.sensitive_warning": "Contenido sensible",
   "status.share": "Compartir",
-  "status.show_filter_reason": "Mostrar de todos modos",
-  "status.show_less": "Mostrar menos",
   "status.show_less_all": "Mostrar menos para todo",
-  "status.show_more": "Mostrar más",
   "status.show_more_all": "Mostrar más para todo",
   "status.show_original": "Mostrar original",
   "status.title.with_attachments": "{user} ha publicado {attachmentCount, plural, one {un adjunto} other {{attachmentCount} adjuntos}}",
diff --git a/app/javascript/mastodon/locales/et.json b/app/javascript/mastodon/locales/et.json
index 9c358e0e5768cc..80c65804fadd18 100644
--- a/app/javascript/mastodon/locales/et.json
+++ b/app/javascript/mastodon/locales/et.json
@@ -708,8 +708,6 @@
   "status.favourite": "Lemmik",
   "status.favourites": "{count, plural, one {lemmik} other {lemmikud}}",
   "status.filter": "Filtreeri seda postitust",
-  "status.filtered": "Filtreeritud",
-  "status.hide": "Peida postitus",
   "status.history.created": "{name} lõi {date}",
   "status.history.edited": "{name} muutis {date}",
   "status.load_more": "Lae rohkem",
@@ -737,10 +735,7 @@
   "status.report": "Raporteeri @{name}",
   "status.sensitive_warning": "Tundlik sisu",
   "status.share": "Jaga",
-  "status.show_filter_reason": "Näita ikka",
-  "status.show_less": "Peida sisu",
   "status.show_less_all": "Peida kogu tundlik sisu",
-  "status.show_more": "Näita sisu",
   "status.show_more_all": "Näita kogu tundlikku sisu",
   "status.show_original": "Näita algset",
   "status.title.with_attachments": "{user} postitas {attachmentCount, plural, one {manuse} other {{attachmentCount} manust}}",
diff --git a/app/javascript/mastodon/locales/eu.json b/app/javascript/mastodon/locales/eu.json
index 8ab42965bf30e5..a8e2e668c3f789 100644
--- a/app/javascript/mastodon/locales/eu.json
+++ b/app/javascript/mastodon/locales/eu.json
@@ -743,8 +743,6 @@
   "status.favourite": "Gogokoa",
   "status.favourites": "{count, plural, one {gogoko} other {gogoko}}",
   "status.filter": "Iragazi bidalketa hau",
-  "status.filtered": "Iragazita",
-  "status.hide": "Tuta ezkutatu",
   "status.history.created": "{name} erabiltzaileak sortua {date}",
   "status.history.edited": "{name} erabiltzaileak editatua {date}",
   "status.load_more": "Kargatu gehiago",
@@ -772,10 +770,7 @@
   "status.report": "Salatu @{name}",
   "status.sensitive_warning": "Kontuz: Eduki hunkigarria",
   "status.share": "Partekatu",
-  "status.show_filter_reason": "Erakutsi hala ere",
-  "status.show_less": "Erakutsi gutxiago",
   "status.show_less_all": "Erakutsi denetarik gutxiago",
-  "status.show_more": "Erakutsi gehiago",
   "status.show_more_all": "Erakutsi denetarik gehiago",
   "status.show_original": "Erakutsi jatorrizkoa",
   "status.title.with_attachments": "{user} erabiltzaileak {attachmentCount, plural, one {eranskin bat} other {{attachmentCount} eranskin}} argitaratu d(it)u",
diff --git a/app/javascript/mastodon/locales/fa.json b/app/javascript/mastodon/locales/fa.json
index 6d76bc3349d609..169c325ad78a3a 100644
--- a/app/javascript/mastodon/locales/fa.json
+++ b/app/javascript/mastodon/locales/fa.json
@@ -657,8 +657,6 @@
   "status.embed": "جاسازی",
   "status.favourite": "برگزیده‌",
   "status.filter": "پالایش این فرسته",
-  "status.filtered": "پالوده",
-  "status.hide": "نهفتن فرسته",
   "status.history.created": "توسط {name} در {date} ایجاد شد",
   "status.history.edited": "توسط {name} در {date} ویرایش شد",
   "status.load_more": "بار کردن بیش‌تر",
@@ -685,10 +683,7 @@
   "status.report": "گزارش ‎@{name}",
   "status.sensitive_warning": "محتوای حساس",
   "status.share": "هم‌رسانی",
-  "status.show_filter_reason": "به هر روی نشان داده شود",
-  "status.show_less": "نمایش کمتر",
   "status.show_less_all": "نمایش کمتر همه",
-  "status.show_more": "نمایش بیشتر",
   "status.show_more_all": "نمایش بیشتر همه",
   "status.show_original": "نمایش اصلی",
   "status.title.with_attachments": "{user} {attachmentCount, plural, one {یک پیوست} other {{attachmentCount} پیوست}} فرستاد",
diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index e6671e67bd7773..10f9d79614eb05 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -192,6 +192,8 @@
   "confirmations.unfollow.confirm": "Lopeta seuraaminen",
   "confirmations.unfollow.message": "Haluatko varmasti lopettaa profiilin {name} seuraamisen?",
   "confirmations.unfollow.title": "Lopetetaanko käyttäjän seuraaminen?",
+  "content_warning.hide": "Piilota julkaisu",
+  "content_warning.show": "Näytä kuitenkin",
   "conversation.delete": "Poista keskustelu",
   "conversation.mark_as_read": "Merkitse luetuksi",
   "conversation.open": "Näytä keskustelu",
@@ -299,6 +301,7 @@
   "filter_modal.select_filter.subtitle": "Käytä olemassa olevaa luokkaa tai luo uusi",
   "filter_modal.select_filter.title": "Suodata tämä julkaisu",
   "filter_modal.title.status": "Suodata julkaisu",
+  "filter_warning.matches_filter": "Vastaa suodatinta ”{title}”",
   "filtered_notifications_banner.pending_requests": "{count, plural, =0 {Ei keneltäkään, jonka} one {1 käyttäjältä, jonka} other {# käyttäjältä, jotka}} saatat tuntea",
   "filtered_notifications_banner.title": "Suodatetut ilmoitukset",
   "firehose.all": "Kaikki",
@@ -785,8 +788,6 @@
   "status.favourite": "Suosikki",
   "status.favourites": "{count, plural, one {suosikki} other {suosikkia}}",
   "status.filter": "Suodata tämä julkaisu",
-  "status.filtered": "Suodatettu",
-  "status.hide": "Piilota julkaisu",
   "status.history.created": "{name} loi {date}",
   "status.history.edited": "{name} muokkasi {date}",
   "status.load_more": "Lataa lisää",
@@ -814,10 +815,7 @@
   "status.report": "Raportoi @{name}",
   "status.sensitive_warning": "Arkaluonteista sisältöä",
   "status.share": "Jaa",
-  "status.show_filter_reason": "Näytä joka tapauksessa",
-  "status.show_less": "Näytä vähemmän",
   "status.show_less_all": "Näytä kaikista vähemmän",
-  "status.show_more": "Näytä enemmän",
   "status.show_more_all": "Näytä kaikista enemmän",
   "status.show_original": "Näytä alkuperäinen",
   "status.title.with_attachments": "{user} liitti {attachmentCount, plural, one {{attachmentCount} tiedoston} other {{attachmentCount} tiedostoa}}",
diff --git a/app/javascript/mastodon/locales/fil.json b/app/javascript/mastodon/locales/fil.json
index 9eaa62facbc3c2..31004560912a6e 100644
--- a/app/javascript/mastodon/locales/fil.json
+++ b/app/javascript/mastodon/locales/fil.json
@@ -328,9 +328,7 @@
   "status.report": "I-ulat si/ang @{name}",
   "status.sensitive_warning": "Sensitibong nilalaman",
   "status.share": "Ibahagi",
-  "status.show_less": "Magpakita ng mas kaunti",
   "status.show_less_all": "Magpakita ng mas kaunti para sa lahat",
-  "status.show_more": "Magpakita ng higit pa",
   "status.show_more_all": "Magpakita ng higit pa para sa lahat",
   "status.translate": "Isalin",
   "status.translated_from_with": "Isalin mula sa {lang} gamit ang {provider}",
diff --git a/app/javascript/mastodon/locales/fo.json b/app/javascript/mastodon/locales/fo.json
index 7d3421beb2a9a0..576cacef4e0631 100644
--- a/app/javascript/mastodon/locales/fo.json
+++ b/app/javascript/mastodon/locales/fo.json
@@ -192,6 +192,8 @@
   "confirmations.unfollow.confirm": "Fylg ikki",
   "confirmations.unfollow.message": "Ert tú vís/ur í, at tú vil steðga við at fylgja {name}?",
   "confirmations.unfollow.title": "Gevst at fylgja brúkara?",
+  "content_warning.hide": "Fjal post",
+  "content_warning.show": "Vís kortini",
   "conversation.delete": "Strika samrøðu",
   "conversation.mark_as_read": "Merk sum lisið",
   "conversation.open": "Vís samrøðu",
@@ -299,6 +301,7 @@
   "filter_modal.select_filter.subtitle": "Brúka ein verandi bólk ella skapa ein nýggjan",
   "filter_modal.select_filter.title": "Filtrera hendan postin",
   "filter_modal.title.status": "Filtrera ein post",
+  "filter_warning.matches_filter": "Samsvarar við filtrið “{title}”",
   "filtered_notifications_banner.pending_requests": "Frá {count, plural, =0 {ongum} one {einum persóni} other {# persónum}}, sum tú kanska kennir",
   "filtered_notifications_banner.title": "Filtreraðar fráboðanir",
   "firehose.all": "Allar",
@@ -785,8 +788,6 @@
   "status.favourite": "Dámdur postur",
   "status.favourites": "{count, plural, one {yndispostur} other {yndispostar}}",
   "status.filter": "Filtrera hendan postin",
-  "status.filtered": "Filtrerað",
-  "status.hide": "Fjal post",
   "status.history.created": "{name} stovnað {date}",
   "status.history.edited": "{name} rættað {date}",
   "status.load_more": "Tak meira niður",
@@ -814,10 +815,7 @@
   "status.report": "Melda @{name}",
   "status.sensitive_warning": "Viðkvæmt tilfar",
   "status.share": "Deil",
-  "status.show_filter_reason": "Vís kortini",
-  "status.show_less": "Vís minni",
   "status.show_less_all": "Vís øllum minni",
-  "status.show_more": "Vís meira",
   "status.show_more_all": "Vís øllum meira",
   "status.show_original": "Vís upprunaliga",
   "status.title.with_attachments": "{user} postaði {attachmentCount, plural, one {eitt viðhefti} other {{attachmentCount} viðhefti}}",
diff --git a/app/javascript/mastodon/locales/fr-CA.json b/app/javascript/mastodon/locales/fr-CA.json
index 3def8ccfd73eb3..667b7013ef50d0 100644
--- a/app/javascript/mastodon/locales/fr-CA.json
+++ b/app/javascript/mastodon/locales/fr-CA.json
@@ -61,6 +61,7 @@
   "account.requested_follow": "{name} a demandé à vous suivre",
   "account.share": "Partager le profil de @{name}",
   "account.show_reblogs": "Afficher les boosts de @{name}",
+  "account.statuses_counter": "{count, plural, one {{counter} message} other {{counter} messages}}",
   "account.unblock": "Débloquer @{name}",
   "account.unblock_domain": "Débloquer le domaine {domain}",
   "account.unblock_short": "Débloquer",
@@ -92,7 +93,7 @@
   "block_modal.they_cant_mention": "Il ne peut pas vous mentionner ou vous suivre.",
   "block_modal.they_cant_see_posts": "Il peut toujours voir vos publications, mais vous ne verrez pas les siennes.",
   "block_modal.they_will_know": "Il peut voir qu'il est bloqué.",
-  "block_modal.title": "Bloquer l'utilisateur ?",
+  "block_modal.title": "Bloquer l'utilisateur·rice ?",
   "block_modal.you_wont_see_mentions": "Vous ne verrez pas les publications qui le mentionne.",
   "boost_modal.combo": "Vous pouvez appuyer sur {combo} pour sauter ceci la prochaine fois",
   "bundle_column_error.copy_stacktrace": "Copier le rapport d'erreur",
@@ -342,6 +343,8 @@
   "hashtag.follow": "Suivre ce hashtag",
   "hashtag.unfollow": "Ne plus suivre ce hashtag",
   "hashtags.and_other": "…et {count, plural, other {# de plus}}",
+  "hints.profiles.see_more_posts": "Voir plus de messages sur {domain}",
+  "hints.threads.see_more": "Voir plus de réponses sur {domain}",
   "home.column_settings.show_reblogs": "Afficher boosts",
   "home.column_settings.show_replies": "Afficher réponses",
   "home.hide_announcements": "Masquer les annonces",
@@ -409,6 +412,7 @@
   "limited_account_hint.action": "Afficher le profil quand même",
   "limited_account_hint.title": "Ce profil a été masqué par la modération de {domain}.",
   "link_preview.author": "Par {name}",
+  "link_preview.shares": "{count, plural, one {{counter} message} other {{counter} messages}}",
   "lists.account.add": "Ajouter à une liste",
   "lists.account.remove": "Retirer d'une liste",
   "lists.delete": "Supprimer la liste",
@@ -467,8 +471,10 @@
   "notification.favourite": "{name} a ajouté votre publication à ses favoris",
   "notification.follow": "{name} vous suit",
   "notification.follow_request": "{name} a demandé à vous suivre",
+  "notification.label.mention": "Mention",
   "notification.label.private_mention": "Mention privée",
   "notification.label.private_reply": "Répondre en privé",
+  "notification.label.reply": "Réponse",
   "notification.moderation-warning.learn_more": "En savoir plus",
   "notification.moderation_warning": "Vous avez reçu un avertissement de modération",
   "notification.moderation_warning.action_delete_statuses": "Certains de vos messages ont été supprimés.",
@@ -490,6 +496,8 @@
   "notification.update": "{name} a modifié une publication",
   "notification_requests.accept": "Accepter",
   "notification_requests.dismiss": "Rejeter",
+  "notification_requests.edit_selection": "Modifier",
+  "notification_requests.exit_selection": "Fait",
   "notification_requests.notifications_from": "Notifications de {name}",
   "notification_requests.title": "Notifications filtrées",
   "notifications.clear": "Effacer notifications",
@@ -526,6 +534,10 @@
   "notifications.permission_denied": "Les notifications de bureau ne sont pas disponibles en raison d'une demande de permission de navigateur précédemment refusée",
   "notifications.permission_denied_alert": "Les notifications de bureau ne peuvent pas être activées, car l’autorisation du navigateur a précedemment été refusée",
   "notifications.permission_required": "Les notifications de bureau ne sont pas disponibles car l’autorisation requise n’a pas été accordée.",
+  "notifications.policy.drop": "Ignorer",
+  "notifications.policy.filter": "Filtrer",
+  "notifications.policy.filter_limited_accounts_hint": "Limité par les modérateur·rice·s du serveur",
+  "notifications.policy.filter_limited_accounts_title": "Comptes modérés",
   "notifications.policy.filter_new_accounts.hint": "Créés au cours des derniers {days, plural, one {un jour} other {# jours}}",
   "notifications.policy.filter_new_accounts_title": "Nouveaux comptes",
   "notifications.policy.filter_not_followers_hint": "Incluant les personnes qui vous suivent depuis moins de {days, plural, one {un jour} other {# jours}}",
@@ -660,10 +672,13 @@
   "report.unfollow_explanation": "Vous suivez ce compte. Pour ne plus en voir les messages sur votre fil d'accueil, arrêtez de le suivre.",
   "report_notification.attached_statuses": "{count, plural, one {{count} publication liée} other {{count} publications liées}}",
   "report_notification.categories.legal": "Mentions légales",
+  "report_notification.categories.legal_sentence": "contenu illégal",
   "report_notification.categories.other": "Autre",
+  "report_notification.categories.other_sentence": "autre",
   "report_notification.categories.spam": "Spam",
   "report_notification.categories.spam_sentence": "indésirable",
   "report_notification.categories.violation": "Infraction aux règles du serveur",
+  "report_notification.categories.violation_sentence": "infraction de règle",
   "report_notification.open": "Ouvrir le signalement",
   "search.no_recent_searches": "Aucune recherche récente",
   "search.placeholder": "Rechercher",
@@ -691,8 +706,10 @@
   "server_banner.about_active_users": "Personnes utilisant ce serveur au cours des 30 derniers jours (Comptes actifs mensuellement)",
   "server_banner.active_users": "comptes actifs",
   "server_banner.administered_by": "Administré par:",
+  "server_banner.is_one_of_many": "{domain} est l'un des nombreux serveurs Mastodon indépendants que vous pouvez utiliser pour participer au fédiverse.",
   "server_banner.server_stats": "Statistiques du serveur:",
   "sign_in_banner.create_account": "Créer un compte",
+  "sign_in_banner.mastodon_is": "Mastodon est le meilleur moyen de suivre ce qui se passe.",
   "sign_in_banner.sign_in": "Se connecter",
   "sign_in_banner.sso_redirect": "Se connecter ou s’inscrire",
   "status.admin_account": "Ouvrir l’interface de modération pour @{name}",
@@ -714,8 +731,6 @@
   "status.favourite": "Ajouter aux favoris",
   "status.favourites": "{count, plural, one {favori} other {favoris}}",
   "status.filter": "Filtrer cette publication",
-  "status.filtered": "Filtrée",
-  "status.hide": "Masquer le message",
   "status.history.created": "créé par {name} {date}",
   "status.history.edited": "modifié par {name} {date}",
   "status.load_more": "Charger plus",
@@ -743,10 +758,7 @@
   "status.report": "Signaler @{name}",
   "status.sensitive_warning": "Contenu sensible",
   "status.share": "Partager",
-  "status.show_filter_reason": "Afficher quand même",
-  "status.show_less": "Replier",
   "status.show_less_all": "Tout replier",
-  "status.show_more": "Déplier",
   "status.show_more_all": "Tout déplier",
   "status.show_original": "Afficher l’original",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json
index a2abe1efe13bed..11773e38e5da11 100644
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@@ -48,7 +48,7 @@
   "account.mention": "Mentionner @{name}",
   "account.moved_to": "{name} a indiqué que son nouveau compte est maintenant :",
   "account.mute": "Masquer @{name}",
-  "account.mute_notifications_short": "Désactiver les alertes",
+  "account.mute_notifications_short": "Désactiver les notifications",
   "account.mute_short": "Mettre en sourdine",
   "account.muted": "Masqué·e",
   "account.mutual": "Mutuel",
@@ -61,6 +61,7 @@
   "account.requested_follow": "{name} a demandé à vous suivre",
   "account.share": "Partager le profil de @{name}",
   "account.show_reblogs": "Afficher les partages de @{name}",
+  "account.statuses_counter": "{count, plural, one {{counter} message} other {{counter} messages}}",
   "account.unblock": "Débloquer @{name}",
   "account.unblock_domain": "Débloquer le domaine {domain}",
   "account.unblock_short": "Débloquer",
@@ -92,7 +93,7 @@
   "block_modal.they_cant_mention": "Il ne peut pas vous mentionner ou vous suivre.",
   "block_modal.they_cant_see_posts": "Il peut toujours voir vos publications, mais vous ne verrez pas les siennes.",
   "block_modal.they_will_know": "Il peut voir qu'il est bloqué.",
-  "block_modal.title": "Bloquer l'utilisateur ?",
+  "block_modal.title": "Bloquer l'utilisateur·rice ?",
   "block_modal.you_wont_see_mentions": "Vous ne verrez pas les publications qui le mentionne.",
   "boost_modal.combo": "Vous pouvez appuyer sur {combo} pour passer ceci la prochaine fois",
   "bundle_column_error.copy_stacktrace": "Copier le rapport d'erreur",
@@ -342,6 +343,8 @@
   "hashtag.follow": "Suivre le hashtag",
   "hashtag.unfollow": "Ne plus suivre le hashtag",
   "hashtags.and_other": "…et {count, plural, other {# de plus}}",
+  "hints.profiles.see_more_posts": "Voir plus de messages sur {domain}",
+  "hints.threads.see_more": "Voir plus de réponses sur {domain}",
   "home.column_settings.show_reblogs": "Afficher les partages",
   "home.column_settings.show_replies": "Afficher les réponses",
   "home.hide_announcements": "Masquer les annonces",
@@ -409,6 +412,7 @@
   "limited_account_hint.action": "Afficher le profil quand même",
   "limited_account_hint.title": "Ce profil a été masqué par la modération de {domain}.",
   "link_preview.author": "Par {name}",
+  "link_preview.shares": "{count, plural, one {{counter} message} other {{counter} messages}}",
   "lists.account.add": "Ajouter à la liste",
   "lists.account.remove": "Supprimer de la liste",
   "lists.delete": "Supprimer la liste",
@@ -467,8 +471,10 @@
   "notification.favourite": "{name} a ajouté votre message à ses favoris",
   "notification.follow": "{name} vous suit",
   "notification.follow_request": "{name} a demandé à vous suivre",
+  "notification.label.mention": "Mention",
   "notification.label.private_mention": "Mention privée",
   "notification.label.private_reply": "Répondre en privé",
+  "notification.label.reply": "Réponse",
   "notification.moderation-warning.learn_more": "En savoir plus",
   "notification.moderation_warning": "Vous avez reçu un avertissement de modération",
   "notification.moderation_warning.action_delete_statuses": "Certains de vos messages ont été supprimés.",
@@ -490,6 +496,8 @@
   "notification.update": "{name} a modifié un message",
   "notification_requests.accept": "Accepter",
   "notification_requests.dismiss": "Rejeter",
+  "notification_requests.edit_selection": "Modifier",
+  "notification_requests.exit_selection": "Fait",
   "notification_requests.notifications_from": "Notifications de {name}",
   "notification_requests.title": "Notifications filtrées",
   "notifications.clear": "Effacer les notifications",
@@ -526,6 +534,10 @@
   "notifications.permission_denied": "Impossible d’activer les notifications de bureau car l’autorisation a été refusée.",
   "notifications.permission_denied_alert": "Les notifications de bureau ne peuvent pas être activées, car l’autorisation du navigateur a été refusée avant",
   "notifications.permission_required": "Les notifications de bureau ne sont pas disponibles car l’autorisation requise n’a pas été accordée.",
+  "notifications.policy.drop": "Ignorer",
+  "notifications.policy.filter": "Filtrer",
+  "notifications.policy.filter_limited_accounts_hint": "Limité par les modérateur·rice·s du serveur",
+  "notifications.policy.filter_limited_accounts_title": "Comptes modérés",
   "notifications.policy.filter_new_accounts.hint": "Créés au cours des derniers {days, plural, one {un jour} other {# jours}}",
   "notifications.policy.filter_new_accounts_title": "Nouveaux comptes",
   "notifications.policy.filter_not_followers_hint": "Incluant les personnes qui vous suivent depuis moins de {days, plural, one {un jour} other {# jours}}",
@@ -660,10 +672,13 @@
   "report.unfollow_explanation": "Vous suivez ce compte. Désabonnez-vous pour ne plus en voir les messages sur votre fil principal.",
   "report_notification.attached_statuses": "{count, plural, one {{count} message lié} other {{count} messages liés}}",
   "report_notification.categories.legal": "Légal",
+  "report_notification.categories.legal_sentence": "contenu illégal",
   "report_notification.categories.other": "Autre",
+  "report_notification.categories.other_sentence": "autre",
   "report_notification.categories.spam": "Spam",
   "report_notification.categories.spam_sentence": "indésirable",
   "report_notification.categories.violation": "Infraction aux règles du serveur",
+  "report_notification.categories.violation_sentence": "infraction de règle",
   "report_notification.open": "Ouvrir le signalement",
   "search.no_recent_searches": "Aucune recherche récente",
   "search.placeholder": "Rechercher",
@@ -691,8 +706,10 @@
   "server_banner.about_active_users": "Personnes utilisant ce serveur au cours des 30 derniers jours (Comptes actifs mensuellement)",
   "server_banner.active_users": "comptes actifs",
   "server_banner.administered_by": "Administré par :",
+  "server_banner.is_one_of_many": "{domain} est l'un des nombreux serveurs Mastodon indépendants que vous pouvez utiliser pour participer au fédiverse.",
   "server_banner.server_stats": "Statistiques du serveur :",
   "sign_in_banner.create_account": "Créer un compte",
+  "sign_in_banner.mastodon_is": "Mastodon est le meilleur moyen de suivre ce qui se passe.",
   "sign_in_banner.sign_in": "Se connecter",
   "sign_in_banner.sso_redirect": "Se connecter ou s’inscrire",
   "status.admin_account": "Ouvrir l’interface de modération pour @{name}",
@@ -714,8 +731,6 @@
   "status.favourite": "Ajouter aux favoris",
   "status.favourites": "{count, plural, one {favori} other {favoris}}",
   "status.filter": "Filtrer ce message",
-  "status.filtered": "Filtré",
-  "status.hide": "Masquer le message",
   "status.history.created": "créé par {name} {date}",
   "status.history.edited": "modifié par {name} {date}",
   "status.load_more": "Charger plus",
@@ -743,10 +758,7 @@
   "status.report": "Signaler @{name}",
   "status.sensitive_warning": "Contenu sensible",
   "status.share": "Partager",
-  "status.show_filter_reason": "Afficher quand même",
-  "status.show_less": "Replier",
   "status.show_less_all": "Tout replier",
-  "status.show_more": "Déplier",
   "status.show_more_all": "Tout déplier",
   "status.show_original": "Afficher l’original",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
diff --git a/app/javascript/mastodon/locales/fy.json b/app/javascript/mastodon/locales/fy.json
index cf960cd0a22176..0a985a0310c058 100644
--- a/app/javascript/mastodon/locales/fy.json
+++ b/app/javascript/mastodon/locales/fy.json
@@ -703,8 +703,6 @@
   "status.favourite": "Favoryt",
   "status.favourites": "{count, plural, one {favoryt} other {favoriten}}",
   "status.filter": "Dit berjocht filterje",
-  "status.filtered": "Filtere",
-  "status.hide": "Berjocht ferstopje",
   "status.history.created": "{name} makke dit {date}",
   "status.history.edited": "{name} bewurke dit {date}",
   "status.load_more": "Mear lade",
@@ -732,10 +730,7 @@
   "status.report": "@{name} rapportearje",
   "status.sensitive_warning": "Gefoelige ynhâld",
   "status.share": "Diele",
-  "status.show_filter_reason": "Dochs toane",
-  "status.show_less": "Minder toane",
   "status.show_less_all": "Alles minder toane",
-  "status.show_more": "Mear toane",
   "status.show_more_all": "Alles mear toane",
   "status.show_original": "Orizjineel besjen",
   "status.title.with_attachments": "{user} hat {attachmentCount, plural, one {ien bylage} other {{attachmentCount} bylagen}} tafoege",
diff --git a/app/javascript/mastodon/locales/ga.json b/app/javascript/mastodon/locales/ga.json
index 9ba86fc5dfdd31..440761649964f2 100644
--- a/app/javascript/mastodon/locales/ga.json
+++ b/app/javascript/mastodon/locales/ga.json
@@ -762,8 +762,6 @@
   "status.favourite": "Is fearr leat",
   "status.favourites": "{count, plural, one {a bhfuil grá agat do} two {gráite} few {gráite} many {gráite} other {gráite}}",
   "status.filter": "Déan scagadh ar an bpostáil seo",
-  "status.filtered": "Scagtha",
-  "status.hide": "Cuir postáil i bhfolach",
   "status.history.created": "Chruthaigh {name} {date}",
   "status.history.edited": "Curtha in eagar ag {name} in {date}",
   "status.load_more": "Lódáil a thuilleadh",
@@ -791,10 +789,7 @@
   "status.report": "Tuairiscigh @{name}",
   "status.sensitive_warning": "Ábhar íogair",
   "status.share": "Comhroinn",
-  "status.show_filter_reason": "Taispeáin ar aon nós",
-  "status.show_less": "Taispeáin níos lú",
   "status.show_less_all": "Taispeáin níos lú d'uile",
-  "status.show_more": "Taispeáin níos mó",
   "status.show_more_all": "Taispeáin níos mó d'uile",
   "status.show_original": "Taispeáin bunchóip",
   "status.title.with_attachments": "{user} a sheol {attachmentCount, plural, one {ceangal} two {{attachmentCount} ceangal} few {{attachmentCount} ceangail} many {{attachmentCount} ceangal} other {{attachmentCount} ceangal}}",
diff --git a/app/javascript/mastodon/locales/gd.json b/app/javascript/mastodon/locales/gd.json
index be586e755c7bc7..8e6260b00fdf85 100644
--- a/app/javascript/mastodon/locales/gd.json
+++ b/app/javascript/mastodon/locales/gd.json
@@ -762,8 +762,6 @@
   "status.favourite": "Cuir ris na h-annsachdan",
   "status.favourites": "{count, plural, one {annsachd} two {annsachd} few {annsachdan} other {annsachd}}",
   "status.filter": "Criathraich am post seo",
-  "status.filtered": "Criathraichte",
-  "status.hide": "Falaich am post",
   "status.history.created": "Chruthaich {name} {date} e",
   "status.history.edited": "Dheasaich {name} {date} e",
   "status.load_more": "Luchdaich barrachd dheth",
@@ -791,10 +789,7 @@
   "status.report": "Dèan gearan mu @{name}",
   "status.sensitive_warning": "Susbaint fhrionasach",
   "status.share": "Co-roinn",
-  "status.show_filter_reason": "Seall e co-dhiù",
-  "status.show_less": "Seall nas lugha dheth",
   "status.show_less_all": "Seall nas lugha dhen a h-uile",
-  "status.show_more": "Seall barrachd dheth",
   "status.show_more_all": "Seall barrachd dhen a h-uile",
   "status.show_original": "Seall an tionndadh tùsail",
   "status.title.with_attachments": "Phostaich {user} {attachmentCount, plural, one {{attachmentCount} cheanglachan} two {{attachmentCount} cheanglachan} few {{attachmentCount} ceanglachain} other {{attachmentCount} ceanglachan}}",
diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json
index e4d5f560b4ae98..9da7438da6a747 100644
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@@ -192,6 +192,8 @@
   "confirmations.unfollow.confirm": "Deixar de seguir",
   "confirmations.unfollow.message": "Desexas deixar de seguir a {name}?",
   "confirmations.unfollow.title": "Deixar de seguir á usuaria?",
+  "content_warning.hide": "Agochar publicación",
+  "content_warning.show": "Mostrar igualmente",
   "conversation.delete": "Eliminar conversa",
   "conversation.mark_as_read": "Marcar como lido",
   "conversation.open": "Ver conversa",
@@ -299,6 +301,7 @@
   "filter_modal.select_filter.subtitle": "Usar unha categoría existente ou crear unha nova",
   "filter_modal.select_filter.title": "Filtrar esta publicación",
   "filter_modal.title.status": "Filtrar unha publicación",
+  "filter_warning.matches_filter": "Debido ao filtro “{title}”",
   "filtered_notifications_banner.pending_requests": "De {count, plural, =0 {ninguén} one {unha persoa} other {# persoas}} que igual coñeces",
   "filtered_notifications_banner.title": "Notificacións filtradas",
   "firehose.all": "Todo",
@@ -785,8 +788,6 @@
   "status.favourite": "Favorecer",
   "status.favourites": "{count, plural, one {favorecemento} other {favorecementos}}",
   "status.filter": "Filtrar esta publicación",
-  "status.filtered": "Filtrado",
-  "status.hide": "Agochar publicación",
   "status.history.created": "{name} creouno o {date}",
   "status.history.edited": "{name} editouno o {date}",
   "status.load_more": "Cargar máis",
@@ -814,10 +815,7 @@
   "status.report": "Denunciar @{name}",
   "status.sensitive_warning": "Contido sensíbel",
   "status.share": "Compartir",
-  "status.show_filter_reason": "Mostrar igualmente",
-  "status.show_less": "Amosar menos",
   "status.show_less_all": "Amosar menos para todos",
-  "status.show_more": "Amosar máis",
   "status.show_more_all": "Amosar máis para todos",
   "status.show_original": "Mostrar o orixinal",
   "status.title.with_attachments": "{user} publicou {attachmentCount, plural, one {un anexo} other {{attachmentCount} anexos}}",
diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json
index c89d6387d688fb..1d21e3bda733e2 100644
--- a/app/javascript/mastodon/locales/he.json
+++ b/app/javascript/mastodon/locales/he.json
@@ -348,6 +348,14 @@
   "hashtag.follow": "לעקוב אחרי תגית",
   "hashtag.unfollow": "להפסיק לעקוב אחרי תגית",
   "hashtags.and_other": "…{count, plural,other {ועוד #}}",
+  "hints.profiles.followers_may_be_missing": "יתכן כי עוקבים של פרופיל זה חסרים.",
+  "hints.profiles.follows_may_be_missing": "יתכן כי נעקבים של פרופיל זה חסרים.",
+  "hints.profiles.posts_may_be_missing": "יתכן כי פרסומים של פרופיל זה חסרים.",
+  "hints.profiles.see_more_followers": "צפיה בעוד עוקבים משרת {domain}",
+  "hints.profiles.see_more_follows": "צפיה בעוד נעקבים בשרת {domain}",
+  "hints.profiles.see_more_posts": "צפיה בעוד פרסומים בשרת {domain}",
+  "hints.threads.replies_may_be_missing": "תגובות משרתים אחרים עלולות להיות חסרות.",
+  "hints.threads.see_more": "צפיה בעוד תגובות משרת {domain}",
   "home.column_settings.show_reblogs": "הצגת הדהודים",
   "home.column_settings.show_replies": "הצגת תגובות",
   "home.hide_announcements": "הסתר הכרזות",
@@ -487,9 +495,13 @@
   "notification.admin.report_statuses": "{name} דווחו על {target} בגין {category}",
   "notification.admin.report_statuses_other": "{name} דיווח.ה על {target}",
   "notification.admin.sign_up": "{name} נרשמו",
+  "notification.admin.sign_up.name_and_others": "{name} ועוד {count, plural,one {אחד אחר}other {# אחרים}} נרשמו",
   "notification.favourite": "הודעתך חובבה על ידי {name}",
+  "notification.favourite.name_and_others_with_link": "{name} ועוד <a>{count, plural,one {אחד נוסף}other {# נוספים}}</a> חיבבו את הודעתך",
   "notification.follow": "{name} במעקב אחרייך",
+  "notification.follow.name_and_others": "{name} ועוד {count, plural,one {אחד אחר}other {# אחרים}} עקבו אחריך",
   "notification.follow_request": "{name} ביקשו לעקוב אחריך",
+  "notification.follow_request.name_and_others": "{name} ועוד {count, plural,one {אחד אחר}other {# אחרים}} ביקשו לעקוב אחריך",
   "notification.label.mention": "אזכור",
   "notification.label.private_mention": "אזכור פרטי",
   "notification.label.private_reply": "תשובה בפרטי",
@@ -507,6 +519,7 @@
   "notification.own_poll": "הסקר שלך הסתיים",
   "notification.poll": "סקר שהצבעת בו הסתיים",
   "notification.reblog": "הודעתך הודהדה על ידי {name}",
+  "notification.reblog.name_and_others_with_link": "{name} ועוד <a>{count, plural,one {אחד נוסף}other {# נוספים}}</a> הדהדו את הודעתך",
   "notification.relationships_severance_event": "אבד הקשר עם {name}",
   "notification.relationships_severance_event.account_suspension": "מנהל.ת משרת {from} השע(ת)ה את {target}, ולפיכך לא תעודכנו יותר על ידם ולא תוכלו להיות איתם בקשר.",
   "notification.relationships_severance_event.domain_block": "מנהל.ת מאתר {from} חסמו את {target} ובכלל זה {followersCount} מעוקביך וגם {followingCount, plural, one {חשבון אחד} two {שני חשבונות} many {# חשבונות} other {# חשבונות}} מבין נעקביך.",
@@ -515,7 +528,17 @@
   "notification.status": "{name} הרגע פרסמו",
   "notification.update": "{name} ערכו הודעה",
   "notification_requests.accept": "לקבל",
+  "notification_requests.accept_multiple": "{count, plural,one {לאשר קבלת בקשה…}other {לאשר קבלת # בקשות…}}",
+  "notification_requests.confirm_accept_multiple.button": "{count, plural,one {לאשר קבלת בקשה}other {לאשר קבלת בקשות}}",
+  "notification_requests.confirm_accept_multiple.message": "אתם עומדים לאשר {count, plural,one {בקשת התראה אחת} other {# בקשות התראה}}. להמשיך?",
+  "notification_requests.confirm_accept_multiple.title": "לקבל בקשות התראה?",
+  "notification_requests.confirm_dismiss_multiple.button": "{count, plural,one {לדחות בקשה}other {לדחות בקשות}} לקבלת התראה",
+  "notification_requests.confirm_dismiss_multiple.message": "אתם עומדים לדחות {count, plural,one {בקשת התראה}other {# בקשות התראה}}. לא תוכלו למצוא {count, plural,one {אותה}other {אותן}} בקלות אחר כך. להמשיך?",
+  "notification_requests.confirm_dismiss_multiple.title": "לדחות בקשות התראה?",
   "notification_requests.dismiss": "לבטל",
+  "notification_requests.dismiss_multiple": "{count, plural,one {לדחות בקשה…}other {לדחות # בקשות…}}",
+  "notification_requests.edit_selection": "עריכה",
+  "notification_requests.exit_selection": "בוצע",
   "notification_requests.explainer_for_limited_account": "התראות על פעולות חשבון זה סוננו כי חשבון זה הוגבל על ידי מנהלי הדיונים.",
   "notification_requests.explainer_for_limited_remote_account": "התראות על פעולות חשבון זה סוננו כי חשבון זה או השרת שלו הוגבלו על ידי מנהלי הדיונים.",
   "notification_requests.maximize": "הגדלה למקסימום",
@@ -762,8 +785,6 @@
   "status.favourite": "חיבוב",
   "status.favourites": "{count, plural, one {חיבוב אחד} two {זוג חיבובים} other {# חיבובים}}",
   "status.filter": "סנן הודעה זו",
-  "status.filtered": "סונן",
-  "status.hide": "הסתרת חיצרוץ",
   "status.history.created": "{name} יצר/ה {date}",
   "status.history.edited": "{name} ערך/ה {date}",
   "status.load_more": "עוד",
@@ -791,10 +812,7 @@
   "status.report": "דיווח על @{name}",
   "status.sensitive_warning": "תוכן רגיש",
   "status.share": "שיתוף",
-  "status.show_filter_reason": "הראה בכל זאת",
-  "status.show_less": "הראה פחות",
   "status.show_less_all": "להציג פחות מהכל",
-  "status.show_more": "הראה יותר",
   "status.show_more_all": "להציג יותר מהכל",
   "status.show_original": "הצגת מקור",
   "status.title.with_attachments": "{user} פרסם.ה {attachmentCount, plural, one {צרופה} other {{attachmentCount} צרופות}}",
diff --git a/app/javascript/mastodon/locales/hi.json b/app/javascript/mastodon/locales/hi.json
index 80f645ebe8a3a6..0b402517300d23 100644
--- a/app/javascript/mastodon/locales/hi.json
+++ b/app/javascript/mastodon/locales/hi.json
@@ -517,8 +517,6 @@
   "status.reply": "जवाब",
   "status.sensitive_warning": "संवेदनशील विषय वस्तु",
   "status.share": "शेयर करें",
-  "status.show_less": "कम दिखाएँ",
-  "status.show_more": "और दिखाएँ",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
   "status.translated_from_with": "{provider} का उपयोग करते हुये {lang} से अनुवादित किया गया",
   "tabs_bar.home": "होम",
diff --git a/app/javascript/mastodon/locales/hr.json b/app/javascript/mastodon/locales/hr.json
index 0eee4da8fcaef9..0b42c493381dd3 100644
--- a/app/javascript/mastodon/locales/hr.json
+++ b/app/javascript/mastodon/locales/hr.json
@@ -460,8 +460,6 @@
   "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
   "status.embed": "Umetni",
   "status.filter": "Filtriraj ovu objavu",
-  "status.filtered": "Filtrirano",
-  "status.hide": "Sakrij objavu",
   "status.history.created": "Kreirao/la {name} prije {date}",
   "status.history.edited": "Uredio/la {name} prije {date}",
   "status.load_more": "Učitaj više",
@@ -487,9 +485,6 @@
   "status.report": "Prijavi @{name}",
   "status.sensitive_warning": "Osjetljiv sadržaj",
   "status.share": "Podijeli",
-  "status.show_filter_reason": "Svejedno prikaži",
-  "status.show_less": "Pokaži manje",
-  "status.show_more": "Pokaži više",
   "status.show_original": "Prikaži original",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
   "status.translate": "Prevedi",
diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json
index 97f5a70294f988..b76b2e92cd5440 100644
--- a/app/javascript/mastodon/locales/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@@ -192,6 +192,8 @@
   "confirmations.unfollow.confirm": "Követés visszavonása",
   "confirmations.unfollow.message": "Biztos, hogy vissza szeretnéd vonni {name} követését?",
   "confirmations.unfollow.title": "Megszünteted a felhasználó követését?",
+  "content_warning.hide": "Bejegyzés elrejtése",
+  "content_warning.show": "Megjelenítés mindenképp",
   "conversation.delete": "Beszélgetés törlése",
   "conversation.mark_as_read": "Megjelölés olvasottként",
   "conversation.open": "Beszélgetés megtekintése",
@@ -299,6 +301,7 @@
   "filter_modal.select_filter.subtitle": "Válassz egy meglévő kategóriát, vagy hozz létre egy újat",
   "filter_modal.select_filter.title": "E bejegyzés szűrése",
   "filter_modal.title.status": "Egy bejegyzés szűrése",
+  "filter_warning.matches_filter": "Megfelel a szűrőnek: „{title}”",
   "filtered_notifications_banner.pending_requests": "{count, plural, =0 {senkitől} one {egy valószínűleg ismerős személytől} other {# valószínűleg ismerős személytől}}",
   "filtered_notifications_banner.title": "Szűrt értesítések",
   "firehose.all": "Összes",
@@ -501,7 +504,7 @@
   "notification.follow": "{name} követ téged",
   "notification.follow.name_and_others": "{name} és {count, plural, one {# másik} other {# másik}} követni kezdett",
   "notification.follow_request": "{name} követni szeretne téged",
-  "notification.follow_request.name_and_others": "{name} és {count, plural, one {# másik} other {# másik}} kérte, hogy követhessenek",
+  "notification.follow_request.name_and_others": "{name} és {count, plural, one {# másik} other {# másik}} kérte, hogy követhessen",
   "notification.label.mention": "Említés",
   "notification.label.private_mention": "Privát említés",
   "notification.label.private_reply": "Privát válasz",
@@ -785,8 +788,6 @@
   "status.favourite": "Kedvenc",
   "status.favourites": "{count, plural, one {kedvenc} other {kedvenc}}",
   "status.filter": "E bejegyzés szűrése",
-  "status.filtered": "Megszűrt",
-  "status.hide": "Bejegyzés elrejtése",
   "status.history.created": "{name} létrehozta: {date}",
   "status.history.edited": "{name} szerkesztette: {date}",
   "status.load_more": "Többet",
@@ -814,10 +815,7 @@
   "status.report": "@{name} bejelentése",
   "status.sensitive_warning": "Kényes tartalom",
   "status.share": "Megosztás",
-  "status.show_filter_reason": "Megjelenítés mindenképp",
-  "status.show_less": "Kevesebb megjelenítése",
   "status.show_less_all": "Kevesebbet mindenhol",
-  "status.show_more": "Többet",
   "status.show_more_all": "Többet mindenhol",
   "status.show_original": "Eredeti megjelenítése",
   "status.title.with_attachments": "{user} {attachmentCount, plural, one {mellékletet} other {{attachmentCount} mellékletet}} küldött be.",
diff --git a/app/javascript/mastodon/locales/hy.json b/app/javascript/mastodon/locales/hy.json
index 51a99bb022cb19..1d82e884ff8647 100644
--- a/app/javascript/mastodon/locales/hy.json
+++ b/app/javascript/mastodon/locales/hy.json
@@ -452,8 +452,6 @@
   "status.embed": "Ներդնել",
   "status.favourite": "Հավանել",
   "status.filter": "Զտել այս գրառումը",
-  "status.filtered": "Զտուած",
-  "status.hide": "Թաքցնել գրառումը",
   "status.history.created": "{name}-ը ստեղծել է՝ {date}",
   "status.history.edited": "{name}-ը խմբագրել է՝ {date}",
   "status.load_more": "Բեռնել աւելին",
@@ -478,10 +476,7 @@
   "status.report": "Բողոքել @{name}֊ից",
   "status.sensitive_warning": "Կասկածելի բովանդակութիւն",
   "status.share": "Կիսուել",
-  "status.show_filter_reason": "Ցոյց տալ բոլոր դէպքերում",
-  "status.show_less": "Պակաս",
   "status.show_less_all": "Թաքցնել բոլոր նախազգուշացնումները",
-  "status.show_more": "Աւելին",
   "status.show_more_all": "Ցուցադրել բոլոր նախազգուշացնումները",
   "status.show_original": "Ցոյց տալ բնօրինակը",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
diff --git a/app/javascript/mastodon/locales/ia.json b/app/javascript/mastodon/locales/ia.json
index 07bc88398fb099..2c3b04f9989ea4 100644
--- a/app/javascript/mastodon/locales/ia.json
+++ b/app/javascript/mastodon/locales/ia.json
@@ -728,8 +728,6 @@
   "status.favourite": "Adder al favorites",
   "status.favourites": "{count, plural, one {favorite} other {favorites}}",
   "status.filter": "Filtrar iste message",
-  "status.filtered": "Filtrate",
-  "status.hide": "Celar le message",
   "status.history.created": "create per {name} le {date}",
   "status.history.edited": "modificate per {name} le {date}",
   "status.load_more": "Cargar plus",
@@ -757,10 +755,7 @@
   "status.report": "Reportar @{name}",
   "status.sensitive_warning": "Contento sensibile",
   "status.share": "Compartir",
-  "status.show_filter_reason": "Monstrar in omne caso",
-  "status.show_less": "Monstrar minus",
   "status.show_less_all": "Monstrar minus pro totes",
-  "status.show_more": "Monstrar plus",
   "status.show_more_all": "Monstrar plus pro totes",
   "status.show_original": "Monstrar original",
   "status.title.with_attachments": "{user} ha publicate {attachmentCount, plural, one {un annexo} other {{attachmentCount} annexos}}",
diff --git a/app/javascript/mastodon/locales/id.json b/app/javascript/mastodon/locales/id.json
index 27e967a9e4d095..b46e25919900a8 100644
--- a/app/javascript/mastodon/locales/id.json
+++ b/app/javascript/mastodon/locales/id.json
@@ -571,8 +571,6 @@
   "status.edited_x_times": "Diedit {count, plural, other {{count} kali}}",
   "status.embed": "Tanam",
   "status.filter": "Saring kiriman ini",
-  "status.filtered": "Disaring",
-  "status.hide": "Sembunyikan pos",
   "status.history.created": "{name} membuat {date}",
   "status.history.edited": "{name} mengedit {date}",
   "status.load_more": "Tampilkan semua",
@@ -597,10 +595,7 @@
   "status.report": "Laporkan @{name}",
   "status.sensitive_warning": "Konten sensitif",
   "status.share": "Bagikan",
-  "status.show_filter_reason": "Tampilkan saja",
-  "status.show_less": "Tampilkan lebih sedikit",
   "status.show_less_all": "Tampilkan lebih sedikit untuk semua",
-  "status.show_more": "Tampilkan semua",
   "status.show_more_all": "Tampilkan lebih banyak untuk semua",
   "status.show_original": "Tampilkan yang asli",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
diff --git a/app/javascript/mastodon/locales/ie.json b/app/javascript/mastodon/locales/ie.json
index 541b586de49cb3..4002767cf9c4e6 100644
--- a/app/javascript/mastodon/locales/ie.json
+++ b/app/javascript/mastodon/locales/ie.json
@@ -703,8 +703,6 @@
   "status.favourite": "Favoritisar",
   "status.favourites": "{count, plural, one {favorit} other {favorites}}",
   "status.filter": "Filtrar ti-ci posta",
-  "status.filtered": "Filtrat",
-  "status.hide": "Celar posta",
   "status.history.created": "creat de {name} ye {date}",
   "status.history.edited": "modificat de {name} ye {date}",
   "status.load_more": "Cargar plu",
@@ -732,10 +730,7 @@
   "status.report": "Raportar @{name}",
   "status.sensitive_warning": "Sensitiv contenete",
   "status.share": "Partir",
-  "status.show_filter_reason": "Monstrar totvez",
-  "status.show_less": "Monstrar minu",
   "status.show_less_all": "Monstrar minu por omno",
-  "status.show_more": "Monstrar plu",
   "status.show_more_all": "Monstrar plu por omno",
   "status.show_original": "Monstrar li original",
   "status.title.with_attachments": "{user} postat {attachmentCount, plural, one {un atachament} other {{attachmentCount} atachamentes}}",
diff --git a/app/javascript/mastodon/locales/io.json b/app/javascript/mastodon/locales/io.json
index 8290d9d2e437f3..1329875185ee90 100644
--- a/app/javascript/mastodon/locales/io.json
+++ b/app/javascript/mastodon/locales/io.json
@@ -593,8 +593,6 @@
   "status.embed": "Eninsertez",
   "status.favourite": "Favorizar",
   "status.filter": "Filtragez ca posto",
-  "status.filtered": "Filtrita",
-  "status.hide": "Celez posto",
   "status.history.created": "{name} kreis ye {date}",
   "status.history.edited": "{name} modifikis ye {date}",
   "status.load_more": "Kargar pluse",
@@ -621,10 +619,7 @@
   "status.report": "Denuncar @{name}",
   "status.sensitive_warning": "Trubliva kontenajo",
   "status.share": "Partigez",
-  "status.show_filter_reason": "Jus montrez",
-  "status.show_less": "Montrar mine",
   "status.show_less_all": "Montrez min por omno",
-  "status.show_more": "Montrar plue",
   "status.show_more_all": "Montrez pluse por omno",
   "status.show_original": "Montrez originalo",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
diff --git a/app/javascript/mastodon/locales/is.json b/app/javascript/mastodon/locales/is.json
index 92dda83575e1e9..e4e21649ccdf5c 100644
--- a/app/javascript/mastodon/locales/is.json
+++ b/app/javascript/mastodon/locales/is.json
@@ -192,6 +192,8 @@
   "confirmations.unfollow.confirm": "Hætta að fylgja",
   "confirmations.unfollow.message": "Ertu viss um að þú viljir hætta að fylgjast með {name}?",
   "confirmations.unfollow.title": "Hætta að fylgjast með viðkomandi?",
+  "content_warning.hide": "Fela færslu",
+  "content_warning.show": "Birta samt",
   "conversation.delete": "Eyða samtali",
   "conversation.mark_as_read": "Merkja sem lesið",
   "conversation.open": "Skoða samtal",
@@ -299,6 +301,7 @@
   "filter_modal.select_filter.subtitle": "Notaðu fyrirliggjandi flokk eða útbúðu nýjan",
   "filter_modal.select_filter.title": "Sía þessa færslu",
   "filter_modal.title.status": "Sía færslu",
+  "filter_warning.matches_filter": "Samsvarar síunni“{title}”",
   "filtered_notifications_banner.pending_requests": "Frá {count, plural, =0 {engum} one {einum aðila} other {# manns}} sem þú gætir þekkt",
   "filtered_notifications_banner.title": "Síaðar tilkynningar",
   "firehose.all": "Allt",
@@ -348,6 +351,14 @@
   "hashtag.follow": "Fylgjast með myllumerki",
   "hashtag.unfollow": "Hætta að fylgjast með myllumerki",
   "hashtags.and_other": "…og {count, plural, other {# til viðbótar}}",
+  "hints.profiles.followers_may_be_missing": "Fylgjendur frá þessum notanda gæti vantað.",
+  "hints.profiles.follows_may_be_missing": "Aðila sem þessi notandi fylgist með gæti vantað.",
+  "hints.profiles.posts_may_be_missing": "Sumar færslur frá þessum notanda gæti vantað.",
+  "hints.profiles.see_more_followers": "Sjá fleiri fylgjendur á {domain}",
+  "hints.profiles.see_more_follows": "Sjá fleiri sem þú fylgist með á {domain}",
+  "hints.profiles.see_more_posts": "Sjá fleiri færslur á {domain}",
+  "hints.threads.replies_may_be_missing": "Svör af öðrum netþjónum gæti vantað.",
+  "hints.threads.see_more": "Sjá fleiri svör á {domain}",
   "home.column_settings.show_reblogs": "Sýna endurbirtingar",
   "home.column_settings.show_replies": "Birta svör",
   "home.hide_announcements": "Fela auglýsingar",
@@ -487,9 +498,13 @@
   "notification.admin.report_statuses": "{name} kærði {target} fyrir {category}",
   "notification.admin.report_statuses_other": "{name} kærði {target}",
   "notification.admin.sign_up": "{name} skráði sig",
+  "notification.admin.sign_up.name_and_others": "{name} og {count, plural, one {# í viðbót hefur} other {# í viðbót hafa}} skráð sig",
   "notification.favourite": "{name} setti færsluna þína í eftirlæti",
+  "notification.favourite.name_and_others_with_link": "{name} og <a>{count, plural, one {# í viðbót hefur} other {# í viðbót hafa}}</a> sett færsluna þína í eftirlæti",
   "notification.follow": "{name} fylgist með þér",
+  "notification.follow.name_and_others": "{name} og {count, plural, one {# í viðbót fylgdist} other {# í viðbót fylgdust}} með þér",
   "notification.follow_request": "{name} hefur beðið um að fylgjast með þér",
+  "notification.follow_request.name_and_others": "{name} og {count, plural, one {# í viðbót hefur} other {# í viðbót hafa}} beðið um að fylgjast með þér",
   "notification.label.mention": "Minnst á",
   "notification.label.private_mention": "Einkaspjall",
   "notification.label.private_reply": "Einkasvar",
@@ -507,6 +522,7 @@
   "notification.own_poll": "Könnuninni þinni er lokið",
   "notification.poll": "Könnun sem þú greiddir atkvæði í er lokið",
   "notification.reblog": "{name} endurbirti færsluna þína",
+  "notification.reblog.name_and_others_with_link": "{name} og <a>{count, plural, one {# í viðbót hefur} other {# í viðbót hafa}}</a> endurbirt færsluna þína",
   "notification.relationships_severance_event": "Missti tengingar við {name}",
   "notification.relationships_severance_event.account_suspension": "Stjórnandi á {from} hefur fryst {target}, sem þýðir að þú færð ekki lengur skilaboð frá viðkomandi né átt í samskiptum við viðkomandi.",
   "notification.relationships_severance_event.domain_block": "Stjórnandi á {from} hefur lokað á {target} og þar með {followersCount} fylgjendur þína auk {followingCount, plural, one {# aðgangs} other {# aðganga}} sem þú fylgist með.",
@@ -772,8 +788,6 @@
   "status.favourite": "Eftirlæti",
   "status.favourites": "{count, plural, one {eftirlæti} other {eftirlæti}}",
   "status.filter": "Sía þessa færslu",
-  "status.filtered": "Síað",
-  "status.hide": "Fela færslu",
   "status.history.created": "{name} útbjó {date}",
   "status.history.edited": "{name} breytti {date}",
   "status.load_more": "Hlaða inn meiru",
@@ -801,10 +815,7 @@
   "status.report": "Kæra @{name}",
   "status.sensitive_warning": "Viðkvæmt efni",
   "status.share": "Deila",
-  "status.show_filter_reason": "Birta samt",
-  "status.show_less": "Sýna minna",
   "status.show_less_all": "Sýna minna fyrir allt",
-  "status.show_more": "Sýna meira",
   "status.show_more_all": "Sýna meira fyrir allt",
   "status.show_original": "Sýna upprunalega",
   "status.title.with_attachments": "{user} birti {attachmentCount, plural, one {viðhengi} other {{attachmentCount} viðhengi}}",
diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json
index e334d63fe70ec9..8e3082359ed02e 100644
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@@ -192,6 +192,8 @@
   "confirmations.unfollow.confirm": "Smetti di seguire",
   "confirmations.unfollow.message": "Sei sicuro di voler smettere di seguire {name}?",
   "confirmations.unfollow.title": "Smettere di seguire l'utente?",
+  "content_warning.hide": "Nascondi post",
+  "content_warning.show": "Mostra comunque",
   "conversation.delete": "Elimina conversazione",
   "conversation.mark_as_read": "Segna come letto",
   "conversation.open": "Visualizza conversazione",
@@ -299,6 +301,7 @@
   "filter_modal.select_filter.subtitle": "Usa una categoria esistente o creane una nuova",
   "filter_modal.select_filter.title": "Filtra questo post",
   "filter_modal.title.status": "Filtra un post",
+  "filter_warning.matches_filter": "Corrisponde al filtro \"{title}\"",
   "filtered_notifications_banner.pending_requests": "Da {count, plural, =0 {nessuno} one {una persona} other {# persone}} che potresti conoscere",
   "filtered_notifications_banner.title": "Notifiche filtrate",
   "firehose.all": "Tutto",
@@ -785,8 +788,6 @@
   "status.favourite": "Preferito",
   "status.favourites": "{count, plural, one {preferito} other {preferiti}}",
   "status.filter": "Filtra questo post",
-  "status.filtered": "Filtrato",
-  "status.hide": "Nascondi il post",
   "status.history.created": "Creato da {name} il {date}",
   "status.history.edited": "Modificato da {name} il {date}",
   "status.load_more": "Carica altro",
@@ -814,10 +815,7 @@
   "status.report": "Segnala @{name}",
   "status.sensitive_warning": "Contenuto sensibile",
   "status.share": "Condividi",
-  "status.show_filter_reason": "Mostra comunque",
-  "status.show_less": "Mostra meno",
   "status.show_less_all": "Mostra meno per tutti",
-  "status.show_more": "Mostra di più",
   "status.show_more_all": "Mostra di più per tutti",
   "status.show_original": "Mostra originale",
   "status.title.with_attachments": "{user} ha pubblicato {attachmentCount, plural, one {un allegato} other {{attachmentCount} allegati}}",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index bdae9707eb4612..c23c2f87d50725 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -734,8 +734,6 @@
   "status.favourite": "お気に入り",
   "status.favourites": "{count, plural, one {お気に入り} other {お気に入り}}",
   "status.filter": "この投稿をフィルターする",
-  "status.filtered": "フィルターされました",
-  "status.hide": "投稿を非表示",
   "status.history.created": "{name}さんが{date}に作成",
   "status.history.edited": "{name}さんが{date}に編集",
   "status.load_more": "もっと見る",
@@ -763,10 +761,7 @@
   "status.report": "@{name}さんを通報",
   "status.sensitive_warning": "閲覧注意",
   "status.share": "共有",
-  "status.show_filter_reason": "表示する",
-  "status.show_less": "隠す",
   "status.show_less_all": "全て隠す",
-  "status.show_more": "もっと見る",
   "status.show_more_all": "全て見る",
   "status.show_original": "原文を表示",
   "status.title.with_attachments": "{user}さんの投稿 {attachmentCount, plural, other {({attachmentCount}件のメディア)}}",
diff --git a/app/javascript/mastodon/locales/ka.json b/app/javascript/mastodon/locales/ka.json
index 16baf0c2d8c663..5713fe60ee9150 100644
--- a/app/javascript/mastodon/locales/ka.json
+++ b/app/javascript/mastodon/locales/ka.json
@@ -224,7 +224,6 @@
   "status.delete": "წაშლა",
   "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
   "status.embed": "ჩართვა",
-  "status.filtered": "ფილტრირებული",
   "status.load_more": "მეტის ჩატვირთვა",
   "status.media_hidden": "მედია დამალულია",
   "status.mention": "ასახელე @{name}",
@@ -244,9 +243,7 @@
   "status.report": "დაარეპორტე @{name}",
   "status.sensitive_warning": "მგრძნობიარე კონტენტი",
   "status.share": "გაზიარება",
-  "status.show_less": "აჩვენე ნაკლები",
   "status.show_less_all": "აჩვენე ნაკლები ყველაზე",
-  "status.show_more": "აჩვენე მეტი",
   "status.show_more_all": "აჩვენე მეტი ყველაზე",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
   "status.unmute_conversation": "საუბარზე გაჩუმების მოშორება",
diff --git a/app/javascript/mastodon/locales/kab.json b/app/javascript/mastodon/locales/kab.json
index c2b3db6e02b675..c5c0fa94c13265 100644
--- a/app/javascript/mastodon/locales/kab.json
+++ b/app/javascript/mastodon/locales/kab.json
@@ -584,8 +584,6 @@
   "status.favourite": "Amenyaf",
   "status.favourites": "{count, plural, one {n usmenyaf} other {n ismenyafen}}",
   "status.filter": "Sizdeg tassufeɣt-a",
-  "status.filtered": "Yettwasizdeg",
-  "status.hide": "Ffer tasuffeɣt",
   "status.history.created": "Yerna-t {name} {date}",
   "status.history.edited": "Ibeddel-it {name} {date}",
   "status.load_more": "Sali ugar",
@@ -612,10 +610,7 @@
   "status.report": "Cetki ɣef @{name}",
   "status.sensitive_warning": "Agbur amḥulfu",
   "status.share": "Bḍu",
-  "status.show_filter_reason": "Ssken-d akken yebɣu yili",
-  "status.show_less": "Ssken-d drus",
   "status.show_less_all": "Semẓi akk tisuffɣin",
-  "status.show_more": "Ssken-d ugar",
   "status.show_more_all": "Ẓerr ugar lebda",
   "status.show_original": "Sken aɣbalu",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
diff --git a/app/javascript/mastodon/locales/kk.json b/app/javascript/mastodon/locales/kk.json
index a150be5daf3ec8..85b2fdc005bf02 100644
--- a/app/javascript/mastodon/locales/kk.json
+++ b/app/javascript/mastodon/locales/kk.json
@@ -317,7 +317,6 @@
   "status.detailed_status": "Толық пікірталас көрінісі",
   "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
   "status.embed": "Embеd",
-  "status.filtered": "Фильтрленген",
   "status.load_more": "Тағы әкел",
   "status.media_hidden": "Жабық медиа",
   "status.mention": "Аталым @{name}",
@@ -339,9 +338,7 @@
   "status.report": "Шағым @{name}",
   "status.sensitive_warning": "Нәзік контент",
   "status.share": "Бөлісу",
-  "status.show_less": "Аздап көрсет",
   "status.show_less_all": "Бәрін аздап көрсет",
-  "status.show_more": "Толығырақ",
   "status.show_more_all": "Бәрін толығымен",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
   "status.unmute_conversation": "Пікірталасты үнсіз қылмау",
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index cc4b6a9de57578..fe1b30c6cc8141 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -780,8 +780,6 @@
   "status.favourite": "좋아요",
   "status.favourites": "{count, plural, other {좋아요}}",
   "status.filter": "이 게시물을 필터",
-  "status.filtered": "필터로 걸러짐",
-  "status.hide": "게시물 숨기기",
   "status.history.created": "{name} 님이 {date}에 처음 게시함",
   "status.history.edited": "{name} 님이 {date}에 수정함",
   "status.load_more": "더 보기",
@@ -809,10 +807,7 @@
   "status.report": "@{name} 신고하기",
   "status.sensitive_warning": "민감한 내용",
   "status.share": "공유",
-  "status.show_filter_reason": "그냥 표시하기",
-  "status.show_less": "접기",
   "status.show_less_all": "모두 접기",
-  "status.show_more": "펼치기",
   "status.show_more_all": "모두 펼치기",
   "status.show_original": "원본 보기",
   "status.title.with_attachments": "{user} 님이 {attachmentCount, plural, one {첨부파일} other {{attachmentCount}개의 첨부파일}}과 함께 게시함",
diff --git a/app/javascript/mastodon/locales/ku.json b/app/javascript/mastodon/locales/ku.json
index f62c600fe258d4..73cfa69f424c63 100644
--- a/app/javascript/mastodon/locales/ku.json
+++ b/app/javascript/mastodon/locales/ku.json
@@ -501,8 +501,6 @@
   "status.edited_x_times": "{count, plural, one {{count} car} other {{count} car}} hate serrastkirin",
   "status.embed": "Bi cih bike",
   "status.filter": "Vê şandiyê parzûn bike",
-  "status.filtered": "Parzûnkirî",
-  "status.hide": "Şandiyê veşêre",
   "status.history.created": "{name} {date} afirand",
   "status.history.edited": "{name} {date} serrast kir",
   "status.load_more": "Bêtir bar bike",
@@ -527,10 +525,7 @@
   "status.report": "@{name} ragihîne",
   "status.sensitive_warning": "Naveroka hestiyarî",
   "status.share": "Parve bike",
-  "status.show_filter_reason": "Bi her awayî nîşan bide",
-  "status.show_less": "Kêmtir nîşan bide",
   "status.show_less_all": "Ji bo hemîyan kêmtir nîşan bide",
-  "status.show_more": "Bêtir nîşan bide",
   "status.show_more_all": "Bêtir nîşan bide bo hemûyan",
   "status.show_original": "A resen nîşan bide",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
diff --git a/app/javascript/mastodon/locales/kw.json b/app/javascript/mastodon/locales/kw.json
index 90ae8104706621..0d60d09e30a8be 100644
--- a/app/javascript/mastodon/locales/kw.json
+++ b/app/javascript/mastodon/locales/kw.json
@@ -319,7 +319,6 @@
   "status.detailed_status": "Gwel kesklapp a-vanyl",
   "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
   "status.embed": "Staga",
-  "status.filtered": "Sidhlys",
   "status.load_more": "Karga moy",
   "status.media_hidden": "Myski kudhys",
   "status.mention": "Meneges @{name}",
@@ -341,9 +340,7 @@
   "status.report": "Reportya @{name}",
   "status.sensitive_warning": "Dalgh tender",
   "status.share": "Kevrenna",
-  "status.show_less": "Diskwedhes le",
   "status.show_less_all": "Diskwedhes le rag puptra",
-  "status.show_more": "Diskwedhes moy",
   "status.show_more_all": "Diskwedhes moy rag puptra",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
   "status.unmute_conversation": "Antawhe kesklapp",
diff --git a/app/javascript/mastodon/locales/lad.json b/app/javascript/mastodon/locales/lad.json
index 9e082a742d64e3..48aeec07957f08 100644
--- a/app/javascript/mastodon/locales/lad.json
+++ b/app/javascript/mastodon/locales/lad.json
@@ -704,8 +704,6 @@
   "status.embed": "Inkrusta",
   "status.favourite": "Te plaze",
   "status.filter": "Filtra esta publikasyon",
-  "status.filtered": "Filtrado",
-  "status.hide": "Eskonde publikasyon",
   "status.history.created": "{name} kriyo {date}",
   "status.history.edited": "{name} edito {date}",
   "status.load_more": "Eskarga mas",
@@ -732,10 +730,7 @@
   "status.report": "Raporta @{name}",
   "status.sensitive_warning": "Kontenido sensivle",
   "status.share": "Partaja",
-  "status.show_filter_reason": "Amostra entanto",
-  "status.show_less": "Amostra manko",
   "status.show_less_all": "Amostra manko para todo",
-  "status.show_more": "Amostra mas",
   "status.show_more_all": "Amostra mas para todo",
   "status.show_original": "Amostra orijinal",
   "status.title.with_attachments": "{user} publiko {attachmentCount, plural, one {un anekso} other {{attachmentCount} aneksos}}",
diff --git a/app/javascript/mastodon/locales/lt.json b/app/javascript/mastodon/locales/lt.json
index 389e75bf86fc61..027326f9cb1645 100644
--- a/app/javascript/mastodon/locales/lt.json
+++ b/app/javascript/mastodon/locales/lt.json
@@ -1,11 +1,11 @@
 {
   "about.blocks": "Prižiūrimi serveriai",
-  "about.contact": "Kontaktuoti:",
+  "about.contact": "Kontaktai:",
   "about.disclaimer": "„Mastodon“ – tai nemokama atvirojo kodo programinė įranga ir „Mastodon“ gGmbH prekės ženklas.",
   "about.domain_blocks.no_reason_available": "Priežastis nepateikta",
   "about.domain_blocks.preamble": "„Mastodon“ paprastai leidžia peržiūrėti turinį ir bendrauti su naudotojais iš bet kurio kito fediverse esančio serverio. Šios yra išimtys, kurios buvo padarytos šiame konkrečiame serveryje.",
-  "about.domain_blocks.silenced.explanation": "Paprastai nematysi profilių ir turinio iš šio serverio, nebent jį aiškiai ieškosi arba pasirinksi jį sekdamas (-a).",
-  "about.domain_blocks.silenced.title": "Ribota",
+  "about.domain_blocks.silenced.explanation": "Paprastai nematysi profilių ir turinio iš šio serverio, nebent jį aiškiai ieškosi arba pasirinksi jį sekant.",
+  "about.domain_blocks.silenced.title": "Apribota",
   "about.domain_blocks.suspended.explanation": "Jokie duomenys iš šio serverio nebus apdorojami, saugomi ar keičiami, todėl bet kokia sąveika ar bendravimas su šio serverio naudotojais bus neįmanomas.",
   "about.domain_blocks.suspended.title": "Pristabdyta",
   "about.not_available": "Ši informacija nebuvo pateikta šiame serveryje.",
@@ -16,14 +16,14 @@
   "account.badges.bot": "Automatizuotas",
   "account.badges.group": "Grupė",
   "account.block": "Blokuoti @{name}",
-  "account.block_domain": "Blokuoti domeną {domain}",
+  "account.block_domain": "Blokuoti serverį {domain}",
   "account.block_short": "Blokuoti",
   "account.blocked": "Užblokuota",
   "account.cancel_follow_request": "Atšaukti sekimą",
   "account.copy": "Kopijuoti nuorodą į profilį",
   "account.direct": "Privačiai paminėti @{name}",
   "account.disable_notifications": "Nustoti man pranešti, kai @{name} paskelbia",
-  "account.domain_blocked": "Užblokuotas domenas",
+  "account.domain_blocked": "Užblokuotas serveris",
   "account.edit_profile": "Redaguoti profilį",
   "account.enable_notifications": "Pranešti man, kai @{name} paskelbia",
   "account.endorse": "Rodyti profilyje",
@@ -39,7 +39,7 @@
   "account.following_counter": "{count, plural, one {{counter} sekimas} few {{counter} sekimai} many {{counter} sekimo} other {{counter} sekimų}}",
   "account.follows.empty": "Šis naudotojas dar nieko neseka.",
   "account.go_to_profile": "Eiti į profilį",
-  "account.hide_reblogs": "Slėpti pakėlimus iš @{name}",
+  "account.hide_reblogs": "Slėpti pasidalinimus iš @{name}",
   "account.in_memoriam": "Atminimui.",
   "account.joined_short": "Prisijungė",
   "account.languages": "Keisti prenumeruojamas kalbas",
@@ -54,24 +54,24 @@
   "account.muted": "Nutildytas",
   "account.mutual": "Bendri",
   "account.no_bio": "Nėra pateikto aprašymo.",
-  "account.open_original_page": "Atidaryti originalinį puslapį",
+  "account.open_original_page": "Atidaryti originalų puslapį",
   "account.posts": "Įrašai",
   "account.posts_with_replies": "Įrašai ir atsakymai",
   "account.report": "Pranešti apie @{name}",
-  "account.requested": "Laukiama patvirtinimo. Spustelėk, jei nori atšaukti sekimo prašymą",
+  "account.requested": "Laukiama patvirtinimo. Spustelėk, kad atšauktum sekimo prašymą",
   "account.requested_follow": "{name} paprašė tave sekti",
   "account.share": "Bendrinti @{name} profilį",
-  "account.show_reblogs": "Rodyti pakėlimus iš @{name}",
+  "account.show_reblogs": "Rodyti pasidalinimus iš @{name}",
   "account.statuses_counter": "{count, plural, one {{counter} įrašas} few {{counter} įrašai} many {{counter} įrašo} other {{counter} įrašų}}",
   "account.unblock": "Atblokuoti @{name}",
-  "account.unblock_domain": "Atblokuoti domeną {domain}",
+  "account.unblock_domain": "Atblokuoti serverį {domain}",
   "account.unblock_short": "Atblokuoti",
   "account.unendorse": "Nerodyti profilyje",
   "account.unfollow": "Nebesekti",
   "account.unmute": "Atšaukti nutildymą @{name}",
   "account.unmute_notifications_short": "Atšaukti nutildymą pranešimams",
   "account.unmute_short": "Atšaukti nutildymą",
-  "account_note.placeholder": "Spustelėk norint pridėti pastabą.",
+  "account_note.placeholder": "Spustelėk, kad pridėtum pastabą.",
   "admin.dashboard.daily_retention": "Naudotojų pasilikimo rodiklis pagal dieną po registracijos",
   "admin.dashboard.monthly_retention": "Naudotojų pasilikimo rodiklis pagal mėnesį po registracijos",
   "admin.dashboard.retention.average": "Vidurkis",
@@ -81,8 +81,8 @@
   "admin.impact_report.instance_followers": "Sekėjai, kuriuos prarastų mūsų naudotojai",
   "admin.impact_report.instance_follows": "Sekėjai, kuriuos prarastų jų naudotojai",
   "admin.impact_report.title": "Poveikio apibendrinimas",
-  "alert.rate_limited.message": "Bandyk vėliau po {retry_time, time, medium}.",
-  "alert.rate_limited.title": "Sparta ribota.",
+  "alert.rate_limited.message": "Bandyk vėl po {retry_time, time, medium}.",
+  "alert.rate_limited.title": "Sparta apribota.",
   "alert.unexpected.message": "Įvyko netikėta klaida.",
   "alert.unexpected.title": "Ups!",
   "announcement.announcement": "Skelbimas",
@@ -93,7 +93,7 @@
   "block_modal.show_more": "Rodyti daugiau",
   "block_modal.they_cant_mention": "Jie negali tave paminėti ar sekti.",
   "block_modal.they_cant_see_posts": "Jie negali matyti tavo įrašus, o tu nematysi jų.",
-  "block_modal.they_will_know": "Jie mato, kad yra užblokuoti.",
+  "block_modal.they_will_know": "Jie gali matyti, kad yra užblokuoti.",
   "block_modal.title": "Blokuoti naudotoją?",
   "block_modal.you_wont_see_mentions": "Nematysi įrašus, kuriuose jie paminimi.",
   "boost_modal.combo": "Galima paspausti {combo}, kad praleisti tai kitą kartą",
@@ -103,24 +103,24 @@
   "bundle_column_error.network.body": "Bandant užkrauti šį puslapį įvyko klaida. Tai galėjo atsitikti dėl laikinos tavo interneto ryšio arba šio serverio problemos.",
   "bundle_column_error.network.title": "Tinklo klaida",
   "bundle_column_error.retry": "Bandyti dar kartą",
-  "bundle_column_error.return": "Grįžti į pagrindinį",
-  "bundle_column_error.routing.body": "Prašyto puslapio nepavyko rasti. Ar esi tikras (-a), kad adreso juostoje nurodytas URL adresas yra teisingas?",
+  "bundle_column_error.return": "Atgal į pagrindinį",
+  "bundle_column_error.routing.body": "Paprašyto puslapio nepavyko rasti. Ar esi tikras (-a), kad adreso juostoje nurodytas URL adresas yra teisingas?",
   "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Uždaryti",
-  "bundle_modal_error.message": "Kraunant šį komponentą kažkas nepavyko.",
+  "bundle_modal_error.message": "Įkeliant šį komponentą kažkas nutiko ne taip.",
   "bundle_modal_error.retry": "Bandyti dar kartą",
-  "closed_registrations.other_server_instructions": "Kadangi Mastodon yra decentralizuotas, gali susikurti paskyrą kitame serveryje ir vis tiek bendrauti su šiuo serveriu.",
-  "closed_registrations_modal.description": "Sukurti paskyrą {domain} šiuo metu neįmanoma, bet nepamiršk, kad norint naudotis Mastodon nebūtina turėti paskyrą domene {domain}.",
+  "closed_registrations.other_server_instructions": "Kadangi „Mastodon“ yra decentralizuotas, gali susikurti paskyrą kitame serveryje ir vis tiek bendrauti su šiuo serveriu.",
+  "closed_registrations_modal.description": "Sukurti paskyrą serveryje {domain} šiuo metu neįmanoma, bet nepamiršk, kad norint naudotis „Mastodon“ nebūtina turėti paskyrą serveryje {domain}.",
   "closed_registrations_modal.find_another_server": "Rasti kitą serverį",
-  "closed_registrations_modal.preamble": "Mastodon yra decentralizuotas, todėl nesvarbu, kur susikursi paskyrą, galėsi sekti ir bendrauti su bet kuriuo šiame serveryje esančiu asmeniu. Jį gali net savarankiškai talpinti!",
-  "closed_registrations_modal.title": "Užsiregistruoti Mastodon",
+  "closed_registrations_modal.preamble": "„Mastodon“ yra decentralizuotas, todėl nesvarbu, kur susikursi paskyrą, galėsi sekti ir bendrauti su bet kuriuo šiame serveryje esančiu asmeniu. Jį gali net savarankiškai talpinti!",
+  "closed_registrations_modal.title": "Užsiregistruoti platformoje „Mastodon“",
   "column.about": "Apie",
   "column.blocks": "Užblokuoti naudotojai",
   "column.bookmarks": "Žymės",
   "column.community": "Vietinė laiko skalė",
   "column.direct": "Privatūs paminėjimai",
   "column.directory": "Naršyti profilius",
-  "column.domain_blocks": "Užblokuoti domenai",
+  "column.domain_blocks": "Užblokuoti serveriai",
   "column.favourites": "Mėgstami",
   "column.firehose": "Tiesioginiai srautai",
   "column.follow_requests": "Sekimo prašymai",
@@ -130,15 +130,15 @@
   "column.notifications": "Pranešimai",
   "column.pins": "Prisegti įrašai",
   "column.public": "Federacinė laiko skalė",
-  "column_back_button.label": "Grįžti",
+  "column_back_button.label": "Atgal",
   "column_header.hide_settings": "Slėpti nustatymus",
-  "column_header.moveLeft_settings": "Judinti stulpelį į kairę",
-  "column_header.moveRight_settings": "Judinti stulpelį į dešinę",
+  "column_header.moveLeft_settings": "Perkelti stulpelį į kairę",
+  "column_header.moveRight_settings": "Perkelti stulpelį į dešinę",
   "column_header.pin": "Prisegti",
   "column_header.show_settings": "Rodyti nustatymus",
   "column_header.unpin": "Atsegti",
   "column_subheading.settings": "Nustatymai",
-  "community.column_settings.local_only": "Tik vietinė",
+  "community.column_settings.local_only": "Tik vietinis",
   "community.column_settings.media_only": "Tik medija",
   "community.column_settings.remote_only": "Tik nuotolinis",
   "compose.language.change": "Keisti kalbą",
@@ -147,7 +147,7 @@
   "compose.published.open": "Atidaryti",
   "compose.saved.body": "Įrašas išsaugotas.",
   "compose_form.direct_message_warning_learn_more": "Sužinoti daugiau",
-  "compose_form.encryption_warning": "Mastodon įrašai nėra visapusiškai šifruojami. Per Mastodon nesidalyk jokia slapta informacija.",
+  "compose_form.encryption_warning": "„Mastodon“ įrašai nėra visapusiškai šifruojami. Per „Mastodon“ nesidalyk jokia slapta informacija.",
   "compose_form.hashtag_warning": "Šis įrašas nebus įtrauktas į jokį saitažodį, nes ji nėra vieša. Tik viešų įrašų galima ieškoti pagal saitažodį.",
   "compose_form.lock_disclaimer": "Tavo paskyra nėra {locked}. Bet kas gali sekti tave ir peržiūrėti tik sekėjams skirtus įrašus.",
   "compose_form.lock_disclaimer.lock": "užrakinta",
@@ -156,8 +156,8 @@
   "compose_form.poll.multiple": "Keli pasirinkimai",
   "compose_form.poll.option_placeholder": "{number} parinktis",
   "compose_form.poll.single": "Pasirinkti vieną",
-  "compose_form.poll.switch_to_multiple": "Keisti apklausą, kad būtų galima pasirinkti kelis pasirinkimus",
-  "compose_form.poll.switch_to_single": "Keisti apklausą, kad būtų galima pasirinkti vieną pasirinkimą",
+  "compose_form.poll.switch_to_multiple": "Keisti apklausą, kad būtų leidžiama pasirinkti kelis pasirinkimus",
+  "compose_form.poll.switch_to_single": "Keisti apklausą, kad būtų leidžiama pasirinkti vieną pasirinkimą",
   "compose_form.poll.type": "Stilius",
   "compose_form.publish": "Skelbti",
   "compose_form.publish_form": "Naujas įrašas",
@@ -172,10 +172,10 @@
   "confirmations.delete.message": "Ar tikrai nori ištrinti šį įrašą?",
   "confirmations.delete.title": "Ištrinti įrašą?",
   "confirmations.delete_list.confirm": "Ištrinti",
-  "confirmations.delete_list.message": "Ar tikrai nori visam laikui ištrinti šį sąrašą?",
+  "confirmations.delete_list.message": "Ar tikrai nori negrįžtamai ištrinti šį sąrašą?",
   "confirmations.delete_list.title": "Ištrinti sąrašą?",
   "confirmations.discard_edit_media.confirm": "Atmesti",
-  "confirmations.discard_edit_media.message": "Turi neišsaugotų medijos aprašymo ar peržiūros pakeitimų, vis tiek juos atmesti?",
+  "confirmations.discard_edit_media.message": "Turi neišsaugotų medijos aprašymo ar peržiūros pakeitimų. Vis tiek juos atmesti?",
   "confirmations.edit.confirm": "Redaguoti",
   "confirmations.edit.message": "Redaguojant dabar, bus perrašyta šiuo metu kuriama žinutė. Ar tikrai nori tęsti?",
   "confirmations.edit.title": "Perrašyti įrašą?",
@@ -183,8 +183,8 @@
   "confirmations.logout.message": "Ar tikrai nori atsijungti?",
   "confirmations.logout.title": "Atsijungti?",
   "confirmations.mute.confirm": "Nutildyti",
-  "confirmations.redraft.confirm": "Ištrinti ir perrašyti",
-  "confirmations.redraft.message": "Ar tikrai nori ištrinti šį įrašą ir parašyti jį iš naujo? Bus prarastos mėgstamai ir pakėlimai, o atsakymai į originalinį įrašą taps liekamojais.",
+  "confirmations.redraft.confirm": "Ištrinti ir iš naujo parengti",
+  "confirmations.redraft.message": "Ar tikrai nori ištrinti šį įrašą ir parengti jį iš naujo? Bus prarasti mėgstami ir pasidalinimai, o atsakymai į originalų įrašą bus panaikinti.",
   "confirmations.redraft.title": "Ištrinti ir iš naujo parengti įrašą?",
   "confirmations.reply.confirm": "Atsakyti",
   "confirmations.reply.message": "Atsakant dabar, bus perrašyta šiuo metu kuriama žinutė. Ar tikrai nori tęsti?",
@@ -192,6 +192,8 @@
   "confirmations.unfollow.confirm": "Nebesekti",
   "confirmations.unfollow.message": "Ar tikrai nori nebesekti {name}?",
   "confirmations.unfollow.title": "Nebesekti naudotoją?",
+  "content_warning.hide": "Slėpti įrašą",
+  "content_warning.show": "Rodyti vis tiek",
   "conversation.delete": "Ištrinti pokalbį",
   "conversation.mark_as_read": "Žymėti kaip skaitytą",
   "conversation.open": "Peržiūrėti pokalbį",
@@ -202,33 +204,33 @@
   "directory.federated": "Iš žinomų fediversų",
   "directory.local": "Tik iš {domain}",
   "directory.new_arrivals": "Nauji atvykėliai",
-  "directory.recently_active": "Neseniai aktyvus (-i)",
+  "directory.recently_active": "Neseniai aktyvus",
   "disabled_account_banner.account_settings": "Paskyros nustatymai",
-  "disabled_account_banner.text": "Tavo paskyra {disabledAccount} šiuo metu yra išjungta.",
+  "disabled_account_banner.text": "Tavo paskyra {disabledAccount} šiuo metu išjungta.",
   "dismissable_banner.community_timeline": "Tai – naujausi vieši įrašai iš žmonių, kurių paskyros talpinamos {domain}.",
   "dismissable_banner.dismiss": "Atmesti",
   "dismissable_banner.explore_links": "Tai – naujienos, kuriomis šiandien daugiausiai bendrinamasi socialiniame žiniatinklyje. Naujesnės naujienų istorijos, kurias paskelbė daugiau skirtingų žmonių, vertinamos aukščiau.",
-  "dismissable_banner.explore_statuses": "Tai – įrašai iš viso socialinio žiniatinklio, kurie šiandien sulaukia daug dėmesio. Naujesni įrašai, turintys daugiau pakėlimų ir mėgstamų, vertinami aukščiau.",
+  "dismissable_banner.explore_statuses": "Tai – įrašai iš viso socialinio žiniatinklio, kurie šiandien sulaukia daug dėmesio. Naujesni įrašai, turintys daugiau pasidalinimų ir mėgstamų, vertinami aukščiau.",
   "dismissable_banner.explore_tags": "Tai – saitažodžiai, kurie šiandien sulaukia daug dėmesio socialiniame žiniatinklyje. Saitažodžiai, kuriuos naudoja daugiau skirtingų žmonių, vertinami aukščiau.",
   "dismissable_banner.public_timeline": "Tai – naujausi vieši įrašai iš žmonių socialiniame žiniatinklyje, kuriuos seka {domain} žmonės.",
   "domain_block_modal.block": "Blokuoti serverį",
-  "domain_block_modal.block_account_instead": "Blokuoti {name} vietoj to",
-  "domain_block_modal.they_can_interact_with_old_posts": "Žmonės iš šio serverio gali sąveikauti su tavo senomis įrašomis.",
+  "domain_block_modal.block_account_instead": "Blokuoti @{name} vietoj to",
+  "domain_block_modal.they_can_interact_with_old_posts": "Žmonės iš šio serverio gali bendrauti su tavo senomis įrašomis.",
   "domain_block_modal.they_cant_follow": "Niekas iš šio serverio negali tavęs sekti.",
   "domain_block_modal.they_wont_know": "Jie nežinos, kad buvo užblokuoti.",
-  "domain_block_modal.title": "Blokuoti domeną?",
+  "domain_block_modal.title": "Blokuoti serverį?",
   "domain_block_modal.you_will_lose_followers": "Visi tavo sekėjai iš šio serverio bus pašalinti.",
   "domain_block_modal.you_wont_see_posts": "Nematysi naudotojų įrašų ar pranešimų šiame serveryje.",
-  "domain_pill.activitypub_lets_connect": "Tai leidžia tau prisijungti ir bendrauti su žmonėmis ne tik Mastodon, bet ir įvairiose socialinėse programėlėse.",
-  "domain_pill.activitypub_like_language": "ActivityPub – tai tarsi kalba, kuria Mastodon kalba su kitais socialiniais tinklais.",
+  "domain_pill.activitypub_lets_connect": "Tai leidžia tau prisijungti ir bendrauti su žmonėmis ne tik „Mastodon“ platformoje, bet ir įvairiose socialinėse programėlėse.",
+  "domain_pill.activitypub_like_language": "„ActivityPub“ – tai tarsi kalba, kuria „Mastodon“ kalba su kitais socialiniais tinklais.",
   "domain_pill.server": "Serveris",
   "domain_pill.their_handle": "Jų socialinis medijos vardas:",
   "domain_pill.their_server": "Jų skaitmeniniai namai, kuriuose saugomi visi jų įrašai.",
-  "domain_pill.their_username": "Jų unikalus identifikatorius jų serveryje. Skirtinguose serveriuose galima rasti naudotojų, turinčių tą patį naudotojo vardą.",
+  "domain_pill.their_username": "Jų unikalus identifikatorius jų serveryje. Skirtinguose serveriuose galima rasti naudotojų su tuo pačiu naudotojo vardu.",
   "domain_pill.username": "Naudotojo vardas",
   "domain_pill.whats_in_a_handle": "Kas yra socialiniame medijos varde?",
-  "domain_pill.who_they_are": "Kadangi socialines medijos vardai nurodo, kas žmogus yra ir kur jie yra, gali sąveikauti su žmonėmis visame socialiniame žiniatinklyje, kurį sudaro <button>ActivityPub veikiančios platformos</button>.",
-  "domain_pill.who_you_are": "Kadangi tavo socialinis medijos vardas nurodo, kas esi ir kur esi, žmonės gali sąveikauti su tavimi visame socialiniame tinkle, kurį sudaro <button>ActivityPub veikiančios platformos</button>.",
+  "domain_pill.who_they_are": "Kadangi socialines medijos vardai pasako, kas ir kur jie yra, galima bendrauti su žmonėmis visame socialiniame žiniatinklyje, kurį sudaro <button>„ActivityPub“ veikiančios platformos</button>.",
+  "domain_pill.who_you_are": "Kadangi tavo socialinis medijos vardas pasako, kas ir kur esi, žmonės gali bendrauti su tavimi visame socialiniame žiniatinklyje, kurį sudaro <button>„ActivityPub“ veikiančios platformos</button>.",
   "domain_pill.your_handle": "Tavo socialinis medijos vardas:",
   "domain_pill.your_server": "Tavo skaitmeniniai namai, kuriuose saugomi visi tavo įrašai. Nepatinka šis? Bet kada perkelk serverius ir atsivesk ir savo sekėjus.",
   "domain_pill.your_username": "Tavo unikalus identifikatorius šiame serveryje. Skirtinguose serveriuose galima rasti naudotojų su tuo pačiu naudotojo vardu.",
@@ -257,7 +259,7 @@
   "empty_column.bookmarked_statuses": "Dar neturi nė vienos įrašo pridėtos žymės. Kai vieną iš jų pridėsi į žymes, jis bus rodomas čia.",
   "empty_column.community": "Vietinė laiko skalė yra tuščia. Parašyk ką nors viešai, kad pradėtum sąveikauti.",
   "empty_column.direct": "Dar neturi jokių privačių paminėjimų. Kai išsiųsi arba gausi vieną iš jų, jis bus rodomas čia.",
-  "empty_column.domain_blocks": "Dar nėra užblokuotų domenų.",
+  "empty_column.domain_blocks": "Kol kas nėra užblokuotų serverių.",
   "empty_column.explore_statuses": "Šiuo metu niekas nėra tendencinga. Patikrink vėliau!",
   "empty_column.favourited_statuses": "Dar neturi mėgstamų įrašų. Kai vieną iš jų pamėgsi, jis bus rodomas čia.",
   "empty_column.favourites": "Šio įrašo dar niekas nepamėgo. Kai kas nors tai padarys, jie bus rodomi čia.",
@@ -299,6 +301,7 @@
   "filter_modal.select_filter.subtitle": "Naudok esamą kategoriją arba sukurk naują.",
   "filter_modal.select_filter.title": "Filtruoti šį įrašą",
   "filter_modal.title.status": "Filtruoti įrašą",
+  "filter_warning.matches_filter": "Atitinka filtrą „{title}“",
   "filtered_notifications_banner.pending_requests": "Iš {count, plural, =0 {nė vieno} one {žmogaus} few {# žmonių} many {# žmonių} other {# žmonių}}, kuriuos galbūt pažįsti",
   "filtered_notifications_banner.title": "Filtruojami pranešimai",
   "firehose.all": "Visi",
@@ -775,8 +778,6 @@
   "status.favourite": "Pamėgti",
   "status.favourites": "{count, plural, one {mėgstamas} few {mėgstamai} many {mėgstamų} other {mėgstamų}}",
   "status.filter": "Filtruoti šį įrašą",
-  "status.filtered": "Filtruota",
-  "status.hide": "Slėpti įrašą",
   "status.history.created": "{name} sukurta {date}",
   "status.history.edited": "{name} redaguota {date}",
   "status.load_more": "Krauti daugiau",
@@ -803,10 +804,7 @@
   "status.report": "Pranešti apie @{name}",
   "status.sensitive_warning": "Jautrus turinys",
   "status.share": "Bendrinti",
-  "status.show_filter_reason": "Rodyti vis tiek",
-  "status.show_less": "Rodyti mažiau",
   "status.show_less_all": "Rodyti mažiau visiems",
-  "status.show_more": "Rodyti daugiau",
   "status.show_more_all": "Rodyti daugiau visiems",
   "status.show_original": "Rodyti originalą",
   "status.title.with_attachments": "{user} paskelbė {attachmentCount, plural, one {priedą} few {{attachmentCount} priedus} many {{attachmentCount} priedo} other {{attachmentCount} priedų}}",
diff --git a/app/javascript/mastodon/locales/lv.json b/app/javascript/mastodon/locales/lv.json
index 18bb12fbdf6260..6cd15afbec4364 100644
--- a/app/javascript/mastodon/locales/lv.json
+++ b/app/javascript/mastodon/locales/lv.json
@@ -654,8 +654,6 @@
   "status.favourite": "Izlasē",
   "status.favourites": "{count, plural, zero {izlasēs} one {izlasē} other {izlasēs}}",
   "status.filter": "Filtrē šo ziņu",
-  "status.filtered": "Filtrēts",
-  "status.hide": "Slēpt ierakstu",
   "status.history.created": "{name} izveidoja {date}",
   "status.history.edited": "{name} laboja {date}",
   "status.load_more": "Ielādēt vairāk",
@@ -683,10 +681,7 @@
   "status.report": "Ziņot par @{name}",
   "status.sensitive_warning": "Sensitīvs saturs",
   "status.share": "Kopīgot",
-  "status.show_filter_reason": "Tomēr rādīt",
-  "status.show_less": "Rādīt mazāk",
   "status.show_less_all": "Rādīt mazāk visiem",
-  "status.show_more": "Rādīt vairāk",
   "status.show_more_all": "Rādīt vairāk visiem",
   "status.show_original": "Rādīt oriģinālu",
   "status.title.with_attachments": "{user} publicējis {attachmentCount, plural, one {pielikumu} other {{attachmentCount} pielikumus}}",
diff --git a/app/javascript/mastodon/locales/ml.json b/app/javascript/mastodon/locales/ml.json
index 60f400487e8a87..48ea29f9836ca1 100644
--- a/app/javascript/mastodon/locales/ml.json
+++ b/app/javascript/mastodon/locales/ml.json
@@ -309,7 +309,6 @@
   "status.detailed_status": "വിശദമായ സംഭാഷണ കാഴ്‌ച",
   "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
   "status.embed": "ഉൾച്ചേർക്കുക",
-  "status.filtered": "ഫിൽട്ടർ ചെയ്‌തു",
   "status.load_more": "കൂടുതൽ ലോഡു ചെയ്യുക",
   "status.media_hidden": "മീഡിയ മറച്ചു",
   "status.mention": "@{name} സൂചിപ്പിക്കുക",
@@ -327,8 +326,6 @@
   "status.reply": "മറുപടി",
   "status.report": "@{name}--നെ റിപ്പോർട്ട് ചെയ്യുക",
   "status.share": "പങ്കിടുക",
-  "status.show_less": "കുറച്ച് കാണിക്കുക",
-  "status.show_more": "കൂടുതകൽ കാണിക്കുക",
   "status.show_more_all": "എല്ലാവർക്കുമായി കൂടുതൽ കാണിക്കുക",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
   "tabs_bar.home": "ഹോം",
diff --git a/app/javascript/mastodon/locales/ms.json b/app/javascript/mastodon/locales/ms.json
index 695d4e4083a5e5..c9f8b7a2744ac1 100644
--- a/app/javascript/mastodon/locales/ms.json
+++ b/app/javascript/mastodon/locales/ms.json
@@ -615,8 +615,6 @@
   "status.embed": "Benaman",
   "status.favourite": "Kegemaran",
   "status.filter": "Tapiskan hantaran ini",
-  "status.filtered": "Ditapis",
-  "status.hide": "Sembunyikan pos",
   "status.history.created": "{name} mencipta pada {date}",
   "status.history.edited": "{name} menyunting pada {date}",
   "status.load_more": "Muatkan lagi",
@@ -643,10 +641,7 @@
   "status.report": "Laporkan @{name}",
   "status.sensitive_warning": "Kandungan sensitif",
   "status.share": "Kongsi",
-  "status.show_filter_reason": "Paparkan juga",
-  "status.show_less": "Tunjukkan kurang",
   "status.show_less_all": "Tunjukkan kurang untuk semua",
-  "status.show_more": "Tunjukkan lebih",
   "status.show_more_all": "Tunjukkan lebih untuk semua",
   "status.show_original": "Paparkan yang asal",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
diff --git a/app/javascript/mastodon/locales/my.json b/app/javascript/mastodon/locales/my.json
index 903dc8d919b71d..b042ebbcced531 100644
--- a/app/javascript/mastodon/locales/my.json
+++ b/app/javascript/mastodon/locales/my.json
@@ -593,8 +593,6 @@
   "status.embed": "Embed",
   "status.favourite": "Favorite",
   "status.filter": "ဤပို့စ်ကို စစ်ထုတ်ပါ",
-  "status.filtered": "စစ်ထုတ်ထားသည်",
-  "status.hide": "ပို့စ်ကိုပိတ်ထားမည်",
   "status.history.created": "{name} က {date} က ဖန်တီးခဲ့သည်",
   "status.history.edited": "{name} က {date} က ပြင်ဆင်ခဲ့သည်",
   "status.load_more": "ပို၍ဆောင်ရွက်ပါ",
@@ -621,10 +619,7 @@
   "status.report": "@{name} ကို တိုင်ကြားရန်",
   "status.sensitive_warning": "သတိထားရသော အကြောင်းအရာ",
   "status.share": "မျှဝေ",
-  "status.show_filter_reason": "မည်သို့ပင်ဖြစ်စေ ပြပါ",
-  "status.show_less": "အနည်းငယ်သာ ပြပါ",
   "status.show_less_all": "အားလုံးအတွက် အနည်းငယ်သာ ပြပါ",
-  "status.show_more": "ပိုမိုပြရန်",
   "status.show_more_all": "အားလုံးအတွက် ပိုပြပါ",
   "status.show_original": "မူရင်းပြပါ",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {{attachmentCount} attachments}}",
diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json
index ed9eaeec3a8b79..b15c09feadf172 100644
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@@ -192,6 +192,8 @@
   "confirmations.unfollow.confirm": "Ontvolgen",
   "confirmations.unfollow.message": "Weet je het zeker dat je {name} wilt ontvolgen?",
   "confirmations.unfollow.title": "Gebruiker ontvolgen?",
+  "content_warning.hide": "Bericht verbergen",
+  "content_warning.show": "Alsnog tonen",
   "conversation.delete": "Gesprek verwijderen",
   "conversation.mark_as_read": "Als gelezen markeren",
   "conversation.open": "Gesprek tonen",
@@ -299,6 +301,7 @@
   "filter_modal.select_filter.subtitle": "Een bestaande categorie gebruiken of een nieuwe aanmaken",
   "filter_modal.select_filter.title": "Dit bericht filteren",
   "filter_modal.title.status": "Een bericht filteren",
+  "filter_warning.matches_filter": "Komt overeen met filter “{title}”",
   "filtered_notifications_banner.pending_requests": "Van {count, plural, =0 {niemand} one {een persoon} other {# personen}} die je mogelijk kent",
   "filtered_notifications_banner.title": "Gefilterde meldingen",
   "firehose.all": "Alles",
@@ -785,8 +788,6 @@
   "status.favourite": "Favoriet",
   "status.favourites": "{count, plural, one {favoriet} other {favorieten}}",
   "status.filter": "Dit bericht filteren",
-  "status.filtered": "Gefilterd",
-  "status.hide": "Bericht verbergen",
   "status.history.created": "{name} plaatste dit {date}",
   "status.history.edited": "{name} bewerkte dit {date}",
   "status.load_more": "Meer laden",
@@ -814,10 +815,7 @@
   "status.report": "@{name} rapporteren",
   "status.sensitive_warning": "Gevoelige inhoud",
   "status.share": "Delen",
-  "status.show_filter_reason": "Alsnog tonen",
-  "status.show_less": "Minder tonen",
   "status.show_less_all": "Alles minder tonen",
-  "status.show_more": "Meer tonen",
   "status.show_more_all": "Alles meer tonen",
   "status.show_original": "Origineel bekijken",
   "status.title.with_attachments": "{user} heeft {attachmentCount, plural, one {een bijlage} other {{attachmentCount} bijlagen}} toegevoegd",
diff --git a/app/javascript/mastodon/locales/nn.json b/app/javascript/mastodon/locales/nn.json
index 502fd0ab3b72d2..dd9fa5fd92cc33 100644
--- a/app/javascript/mastodon/locales/nn.json
+++ b/app/javascript/mastodon/locales/nn.json
@@ -192,6 +192,7 @@
   "confirmations.unfollow.confirm": "Slutt å fylgja",
   "confirmations.unfollow.message": "Er du sikker på at du vil slutta å fylgja {name}?",
   "confirmations.unfollow.title": "Slutt å fylgja brukaren?",
+  "content_warning.hide": "Gøym innlegg",
   "conversation.delete": "Slett samtale",
   "conversation.mark_as_read": "Marker som lesen",
   "conversation.open": "Sjå samtale",
@@ -762,8 +763,6 @@
   "status.favourite": "Favoritt",
   "status.favourites": "{count, plural, one {favoritt} other {favorittar}}",
   "status.filter": "Filtrer dette innlegget",
-  "status.filtered": "Filtrert",
-  "status.hide": "Skjul innlegget",
   "status.history.created": "{name} oppretta {date}",
   "status.history.edited": "{name} redigerte {date}",
   "status.load_more": "Last inn meir",
@@ -791,10 +790,7 @@
   "status.report": "Rapporter @{name}",
   "status.sensitive_warning": "Ømtolig innhald",
   "status.share": "Del",
-  "status.show_filter_reason": "Vis likevel",
-  "status.show_less": "Vis mindre",
   "status.show_less_all": "Vis mindre for alle",
-  "status.show_more": "Vis meir",
   "status.show_more_all": "Vis meir for alle",
   "status.show_original": "Vis original",
   "status.title.with_attachments": "{user} la ut {attachmentCount, plural, one {eitt vedlegg} other {{attachmentCount} vedlegg}}",
diff --git a/app/javascript/mastodon/locales/no.json b/app/javascript/mastodon/locales/no.json
index a81d9932d6ca33..a3780de550ac95 100644
--- a/app/javascript/mastodon/locales/no.json
+++ b/app/javascript/mastodon/locales/no.json
@@ -617,8 +617,6 @@
   "status.embed": "Bygge inn",
   "status.favourite": "Favoritt",
   "status.filter": "Filtrer dette innlegget",
-  "status.filtered": "Filtrert",
-  "status.hide": "Skjul innlegg",
   "status.history.created": "{name} opprettet {date}",
   "status.history.edited": "{name} redigerte {date}",
   "status.load_more": "Last mer",
@@ -645,10 +643,7 @@
   "status.report": "Rapporter @{name}",
   "status.sensitive_warning": "Følsomt innhold",
   "status.share": "Del",
-  "status.show_filter_reason": "Vis likevel",
-  "status.show_less": "Vis mindre",
   "status.show_less_all": "Vis mindre for alle",
-  "status.show_more": "Vis mer",
   "status.show_more_all": "Vis mer for alle",
   "status.show_original": "Vis original",
   "status.title.with_attachments": "{user} postet {attachmentCount, plural, one {et vedlegg} other {{attachmentCount} vedlegg}}",
diff --git a/app/javascript/mastodon/locales/oc.json b/app/javascript/mastodon/locales/oc.json
index b21947009873da..a4e552ba459832 100644
--- a/app/javascript/mastodon/locales/oc.json
+++ b/app/javascript/mastodon/locales/oc.json
@@ -509,8 +509,6 @@
   "status.embed": "Embarcar",
   "status.favourite": "Apondre als favorits",
   "status.filter": "Filtrar aquesta publicacion",
-  "status.filtered": "Filtrat",
-  "status.hide": "Amagar la publicacion",
   "status.history.created": "{name} o creèt lo {date}",
   "status.history.edited": "{name} o modifiquèt lo {date}",
   "status.load_more": "Cargar mai",
@@ -537,10 +535,7 @@
   "status.report": "Senhalar @{name}",
   "status.sensitive_warning": "Contengut sensible",
   "status.share": "Partejar",
-  "status.show_filter_reason": "Afichar de tot biais",
-  "status.show_less": "Tornar plegar",
   "status.show_less_all": "Los tornar plegar totes",
-  "status.show_more": "Desplegar",
   "status.show_more_all": "Los desplegar totes",
   "status.show_original": "Veire l’original",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
diff --git a/app/javascript/mastodon/locales/pa.json b/app/javascript/mastodon/locales/pa.json
index 7298227e6dc5b3..a71c01b3c14cff 100644
--- a/app/javascript/mastodon/locales/pa.json
+++ b/app/javascript/mastodon/locales/pa.json
@@ -341,9 +341,6 @@
   "status.report": "@{name} ਦੀ ਰਿਪੋਰਟ ਕਰੋ",
   "status.sensitive_warning": "ਸੰਵੇਦਨਸ਼ੀਲ ਸਮੱਗਰੀ",
   "status.share": "ਸਾਂਝਾ ਕਰੋ",
-  "status.show_filter_reason": "ਕਿਵੇਂ ਵੀ ਵੇਖਾਓ",
-  "status.show_less": "ਘੱਟ ਦਿਖਾਓ",
-  "status.show_more": "ਹੋਰ ਦਿਖਾਓ",
   "status.title.with_attachments": "{user} ਨੇ {attachmentCount, plural,one {ਅਟੈਚਮੈਂਟ} other {{attachmentCount}ਅਟੈਚਮੈਂਟਾਂ}} ਪੋਸਟ ਕੀਤੀਆਂ",
   "status.translate": "ਉਲੱਥਾ ਕਰੋ",
   "subscribed_languages.save": "ਤਬਦੀਲੀਆਂ ਸੰਭਾਲੋ",
diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json
index 48f9ee1e896406..2a4c5d6e44390e 100644
--- a/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@@ -192,6 +192,8 @@
   "confirmations.unfollow.confirm": "Przestań obserwować",
   "confirmations.unfollow.message": "Czy na pewno zamierzasz przestać obserwować {name}?",
   "confirmations.unfollow.title": "Przestać obserwować?",
+  "content_warning.hide": "Ukryj wpis",
+  "content_warning.show": "Pokaż mimo to",
   "conversation.delete": "Usuń konwersację",
   "conversation.mark_as_read": "Oznacz jako przeczytane",
   "conversation.open": "Zobacz konwersację",
@@ -299,6 +301,7 @@
   "filter_modal.select_filter.subtitle": "Użyj istniejącej kategorii lub utwórz nową",
   "filter_modal.select_filter.title": "Filtruj ten wpis",
   "filter_modal.title.status": "Filtruj wpis",
+  "filter_warning.matches_filter": "Pasuje do filtra \"{title}\"",
   "filtered_notifications_banner.pending_requests": "Od {count, plural, =0 {żadnej osoby którą możesz znać} one {# osoby którą możesz znać} other {# osób które możesz znać}}",
   "filtered_notifications_banner.title": "Powiadomienia filtrowane",
   "firehose.all": "Wszystko",
@@ -784,8 +787,6 @@
   "status.favourite": "Dodaj do ulubionych",
   "status.favourites": "{count, plural, one {polubienie} few {polubienia} other {polubień}}",
   "status.filter": "Filtruj ten wpis",
-  "status.filtered": "Filtrowany(-a)",
-  "status.hide": "Ukryj post",
   "status.history.created": "{name} utworzone {date}",
   "status.history.edited": "{name} edytowane {date}",
   "status.load_more": "Załaduj więcej",
@@ -813,10 +814,7 @@
   "status.report": "Zgłoś @{name}",
   "status.sensitive_warning": "Wrażliwa zawartość",
   "status.share": "Udostępnij",
-  "status.show_filter_reason": "Pokaż mimo wszystko",
-  "status.show_less": "Zwiń",
   "status.show_less_all": "Zwiń wszystkie",
-  "status.show_more": "Rozwiń",
   "status.show_more_all": "Rozwiń wszystkie",
   "status.show_original": "Pokaż oryginał",
   "status.title.with_attachments": "{user} opublikował(a) {attachmentCount, plural, one {załącznik} few {{attachmentCount} załączniki} other {{attachmentCount} załączników}}",
diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json
index b14c6ce49b3c1b..14957c16d4072e 100644
--- a/app/javascript/mastodon/locales/pt-BR.json
+++ b/app/javascript/mastodon/locales/pt-BR.json
@@ -726,8 +726,6 @@
   "status.favourite": "Favorita",
   "status.favourites": "{count, plural, one {favorite} other {favorites}}",
   "status.filter": "Filtrar esta publicação",
-  "status.filtered": "Filtrado",
-  "status.hide": "Ocultar publicação",
   "status.history.created": "{name} criou {date}",
   "status.history.edited": "{name} editou {date}",
   "status.load_more": "Ver mais",
@@ -755,10 +753,7 @@
   "status.report": "Denunciar @{name}",
   "status.sensitive_warning": "Mídia sensível",
   "status.share": "Compartilhar",
-  "status.show_filter_reason": "Mostrar mesmo assim",
-  "status.show_less": "Mostrar menos",
   "status.show_less_all": "Mostrar menos em tudo",
-  "status.show_more": "Mostrar mais",
   "status.show_more_all": "Mostrar mais em tudo",
   "status.show_original": "Mostrar original",
   "status.title.with_attachments": "{user} postou {attachmentCount, plural, one {um anexo} other {{attachmentCount} attachments}}",
diff --git a/app/javascript/mastodon/locales/pt-PT.json b/app/javascript/mastodon/locales/pt-PT.json
index e084beea2833ee..e2414963c55e3c 100644
--- a/app/javascript/mastodon/locales/pt-PT.json
+++ b/app/javascript/mastodon/locales/pt-PT.json
@@ -743,8 +743,6 @@
   "status.favourite": "Assinalar como favorito",
   "status.favourites": "{count, plural, one {favorito} other {favoritos}}",
   "status.filter": "Filtrar esta publicação",
-  "status.filtered": "Filtrada",
-  "status.hide": "Ocultar publicação",
   "status.history.created": "{name} criado em {date}",
   "status.history.edited": "{name} editado em {date}",
   "status.load_more": "Carregar mais",
@@ -772,10 +770,7 @@
   "status.report": "Denunciar @{name}",
   "status.sensitive_warning": "Conteúdo problemático",
   "status.share": "Partilhar",
-  "status.show_filter_reason": "Mostrar mesmo assim",
-  "status.show_less": "Mostrar menos",
   "status.show_less_all": "Mostrar menos para todas",
-  "status.show_more": "Mostrar mais",
   "status.show_more_all": "Mostrar mais para todas",
   "status.show_original": "Mostrar original",
   "status.title.with_attachments": "{user} publicou {attachmentCount, plural,one {um anexo} other {{attachmentCount} anexos}}",
diff --git a/app/javascript/mastodon/locales/ro.json b/app/javascript/mastodon/locales/ro.json
index 21e93510ced5d1..5b1901fbe0ab64 100644
--- a/app/javascript/mastodon/locales/ro.json
+++ b/app/javascript/mastodon/locales/ro.json
@@ -559,8 +559,6 @@
   "status.edited_x_times": "Modificată {count, plural, one {o dată} few {de {count} ori} other {de {count} de ori}}",
   "status.embed": "Înglobează",
   "status.filter": "Filtrează această postare",
-  "status.filtered": "Sortate",
-  "status.hide": "Ascunde postarea",
   "status.history.created": "creată de {name} pe {date}",
   "status.history.edited": "modificată de {name} pe {date}",
   "status.load_more": "Încarcă mai multe",
@@ -587,10 +585,7 @@
   "status.report": "Raportează pe @{name}",
   "status.sensitive_warning": "Conținut sensibil",
   "status.share": "Distribuie",
-  "status.show_filter_reason": "Afișează oricum",
-  "status.show_less": "Arată mai puțin",
   "status.show_less_all": "Arată mai puțin pentru toți",
-  "status.show_more": "Arată mai mult",
   "status.show_more_all": "Arată mai mult pentru toți",
   "status.show_original": "Afișează originalul",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
diff --git a/app/javascript/mastodon/locales/ru.json b/app/javascript/mastodon/locales/ru.json
index 642550369ae896..94f82e422d3507 100644
--- a/app/javascript/mastodon/locales/ru.json
+++ b/app/javascript/mastodon/locales/ru.json
@@ -718,8 +718,6 @@
   "status.embed": "Встроить на свой сайт",
   "status.favourite": "Избранное",
   "status.filter": "Фильтровать этот пост",
-  "status.filtered": "Отфильтровано",
-  "status.hide": "Скрыть пост",
   "status.history.created": "{name} создал {date}",
   "status.history.edited": "{name} отредактировал(а) {date}",
   "status.load_more": "Загрузить остальное",
@@ -746,10 +744,7 @@
   "status.report": "Пожаловаться",
   "status.sensitive_warning": "Содержимое «деликатного характера»",
   "status.share": "Поделиться",
-  "status.show_filter_reason": "Все равно показать",
-  "status.show_less": "Свернуть",
   "status.show_less_all": "Свернуть все спойлеры в ветке",
-  "status.show_more": "Развернуть",
   "status.show_more_all": "Развернуть все спойлеры в ветке",
   "status.show_original": "Показать оригинал",
   "status.title.with_attachments": "{user} размещено {attachmentCount, plural, one {вложение} other {{attachmentCount} вложений}}",
diff --git a/app/javascript/mastodon/locales/sa.json b/app/javascript/mastodon/locales/sa.json
index 11b428f064b79a..6ca4eafe19395f 100644
--- a/app/javascript/mastodon/locales/sa.json
+++ b/app/javascript/mastodon/locales/sa.json
@@ -506,8 +506,6 @@
   "status.edited_x_times": "Edited {count, plural, one {{count} वारम्} other {{count} वारम्}}",
   "status.embed": "निहितम्",
   "status.filter": "पत्रमिदं फिल्तरं कुरु",
-  "status.filtered": "फिल्तर्कृतम्",
-  "status.hide": "प्रेषरणं प्रच्छादय",
   "status.history.created": "{name} असृजत् {date}",
   "status.history.edited": "{name} समपादयत् {date}",
   "status.load_more": "अधिकं स्थापय",
diff --git a/app/javascript/mastodon/locales/sc.json b/app/javascript/mastodon/locales/sc.json
index 5f099240743cf3..461383191ed571 100644
--- a/app/javascript/mastodon/locales/sc.json
+++ b/app/javascript/mastodon/locales/sc.json
@@ -548,7 +548,6 @@
   "status.edited_x_times": "Modificadu {count, plural, one {{count} # borta} other {{count} bortas}}",
   "status.embed": "Afissa",
   "status.favourites": "{count, plural, one {preferidu} other {preferidos}}",
-  "status.filtered": "Filtradu",
   "status.load_more": "Càrriga·nde àteros",
   "status.media_hidden": "Elementos multimediales cuados",
   "status.mention": "Mèntova a @{name}",
@@ -570,9 +569,7 @@
   "status.report": "Sinnala @{name}",
   "status.sensitive_warning": "Cuntenutu sensìbile",
   "status.share": "Cumpartzi",
-  "status.show_less": "Ammustra·nde prus pagu",
   "status.show_less_all": "Ammustra·nde prus pagu pro totus",
-  "status.show_more": "Ammustra·nde prus",
   "status.show_more_all": "Ammustra·nde prus pro totus",
   "status.title.with_attachments": "{user} at publicadu {attachmentCount, plural, one {un'alligongiadu} other {{attachmentCount} alligongiados}}",
   "status.unmute_conversation": "Torra a ativare s'arresonada",
diff --git a/app/javascript/mastodon/locales/sco.json b/app/javascript/mastodon/locales/sco.json
index 191bcbd3e03d9a..e8ae521ae583fa 100644
--- a/app/javascript/mastodon/locales/sco.json
+++ b/app/javascript/mastodon/locales/sco.json
@@ -477,7 +477,6 @@
   "status.edited_x_times": "Editit {count, plural, one {{count} time} other {{count} times}}",
   "status.embed": "Embed",
   "status.filter": "Filter this post",
-  "status.filtered": "Filtert",
   "status.history.created": "{name} creatit {date}",
   "status.history.edited": "{name} editit {date}",
   "status.load_more": "Load mair",
@@ -502,10 +501,7 @@
   "status.report": "Clype @{name}",
   "status.sensitive_warning": "Sensitive content",
   "status.share": "Shaire",
-  "status.show_filter_reason": "Shaw onieweys",
-  "status.show_less": "Shaw less",
   "status.show_less_all": "Shaw less fir aw",
-  "status.show_more": "Shaw mair",
   "status.show_more_all": "Shaw mair fir aw",
   "status.show_original": "Shaw original",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
diff --git a/app/javascript/mastodon/locales/si.json b/app/javascript/mastodon/locales/si.json
index ce48fbaa8c3695..a9288fd104945a 100644
--- a/app/javascript/mastodon/locales/si.json
+++ b/app/javascript/mastodon/locales/si.json
@@ -417,8 +417,6 @@
   "status.edited_x_times": "සංශෝධිතයි {count, plural, one {වාර {count}} other {වාර {count}}}",
   "status.embed": "කාවැද්දූ",
   "status.filter": "මෙම ලිපිය පෙරන්න",
-  "status.filtered": "පෙරන ලද",
-  "status.hide": "ලිපිය සඟවන්න",
   "status.history.created": "{name} නිර්මාණය {date}",
   "status.history.edited": "{name} සංස්කරණය {date}",
   "status.load_more": "තව පූරණය",
@@ -437,10 +435,7 @@
   "status.report": "@{name} වාර්තා කරන්න",
   "status.sensitive_warning": "සංවේදී අන්තර්ගතයකි",
   "status.share": "බෙදාගන්න",
-  "status.show_filter_reason": "කෙසේ වුවද පෙන්වන්න",
-  "status.show_less": "අඩුවෙන් පෙන්වන්න",
   "status.show_less_all": "සියල්ල අඩුවෙන් පෙන්වන්න",
-  "status.show_more": "තවත් පෙන්වන්න",
   "status.show_more_all": "සියල්ල වැඩියෙන් පෙන්වන්න",
   "status.translate": "පරිවර්තනය",
   "status.translated_from_with": "{provider} මගින් {lang} භාෂාවෙන් පරිවර්තනය කර ඇත",
diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json
index babb6e3054e15f..dfb1309ddfd2af 100644
--- a/app/javascript/mastodon/locales/sk.json
+++ b/app/javascript/mastodon/locales/sk.json
@@ -694,8 +694,6 @@
   "status.embed": "Vložiť",
   "status.favourite": "Ohviezdičkované",
   "status.filter": "Filtrovanie tohto príspevku",
-  "status.filtered": "Filtrované",
-  "status.hide": "Skryť príspevok",
   "status.history.created": "Vytvorené účtom {name} {date}",
   "status.history.edited": "Upravené účtom {name} {date}",
   "status.load_more": "Načitať viac",
@@ -722,10 +720,7 @@
   "status.report": "Nahlásiť @{name}",
   "status.sensitive_warning": "Citlivý obsah",
   "status.share": "Zdieľať",
-  "status.show_filter_reason": "Aj tak zobraziť",
-  "status.show_less": "Zobraziť menej",
   "status.show_less_all": "Všetkým zobraziť menej",
-  "status.show_more": "Zobraziť viac",
   "status.show_more_all": "Všetkým zobraziť viac",
   "status.show_original": "Zobraziť originál",
   "status.title.with_attachments": "Účet {user} nahral {attachmentCount, plural, one {prílohu} few {{attachmentCount} prílohy} many {{attachmentCount} príloh} other {{attachmentCount} príloh}}",
diff --git a/app/javascript/mastodon/locales/sl.json b/app/javascript/mastodon/locales/sl.json
index 9bbbcc5978fe30..6e8ac52df3bc35 100644
--- a/app/javascript/mastodon/locales/sl.json
+++ b/app/javascript/mastodon/locales/sl.json
@@ -347,6 +347,8 @@
   "hashtag.follow": "Sledi ključniku",
   "hashtag.unfollow": "Nehaj slediti ključniku",
   "hashtags.and_other": "…in še {count, plural, other {#}}",
+  "hints.profiles.posts_may_be_missing": "Nekatere objave s tega profila morda manjkajo.",
+  "hints.threads.replies_may_be_missing": "Odgovori z drugih strežnikov morda manjkajo.",
   "home.column_settings.show_reblogs": "Pokaži izpostavitve",
   "home.column_settings.show_replies": "Pokaži odgovore",
   "home.hide_announcements": "Skrij obvestila",
@@ -505,6 +507,7 @@
   "notification.status": "{name} je pravkar objavil/a",
   "notification.update": "{name} je uredil(a) objavo",
   "notification_requests.accept": "Sprejmi",
+  "notification_requests.confirm_dismiss_multiple.title": "Želite opustiti zahteve za obvestila?",
   "notification_requests.dismiss": "Zavrni",
   "notification_requests.edit_selection": "Uredi",
   "notification_requests.exit_selection": "Opravljeno",
@@ -551,6 +554,8 @@
   "notifications.policy.accept": "Sprejmi",
   "notifications.policy.accept_hint": "Pokaži med obvestili",
   "notifications.policy.drop": "Prezri",
+  "notifications.policy.filter_limited_accounts_hint": "Omejeno s strani moderatorjev strežnika",
+  "notifications.policy.filter_limited_accounts_title": "Moderirani računi",
   "notifications.policy.filter_new_accounts.hint": "Ustvarjen v {days, plural, one {zadnjem # dnevu} two {zadnjih # dnevih} few {zadnjih # dnevih} other {zadnjih # dnevih}}",
   "notifications.policy.filter_new_accounts_title": "Novi računi",
   "notifications.policy.filter_not_followers_hint": "Vključujoč ljudi, ki vam sledijo manj kot {days, plural, one {# dan} two {# dneva} few {# dni} other {# dni}}",
@@ -746,8 +751,6 @@
   "status.favourite": "Priljubljen_a",
   "status.favourites": "{count, plural, one {priljubitev} two {priljubitvi} few {priljubitve} other {priljubitev}}",
   "status.filter": "Filtriraj to objavo",
-  "status.filtered": "Filtrirano",
-  "status.hide": "Skrij objavo",
   "status.history.created": "{name}: ustvarjeno {date}",
   "status.history.edited": "{name}: urejeno {date}",
   "status.load_more": "Naloži več",
@@ -775,10 +778,7 @@
   "status.report": "Prijavi @{name}",
   "status.sensitive_warning": "Občutljiva vsebina",
   "status.share": "Deli",
-  "status.show_filter_reason": "Vseeno pokaži",
-  "status.show_less": "Pokaži manj",
   "status.show_less_all": "Prikaži manj za vse",
-  "status.show_more": "Pokaži več",
   "status.show_more_all": "Pokaži več za vse",
   "status.show_original": "Pokaži izvirnik",
   "status.title.with_attachments": "{user} je objavil_a {attachmentCount, plural, one {{attachmentCount} priponko} two {{attachmentCount} priponki} few {{attachmentCount} priponke} other {{attachmentCount} priponk}}",
diff --git a/app/javascript/mastodon/locales/sq.json b/app/javascript/mastodon/locales/sq.json
index 904955f422ab34..39abd13d95c84c 100644
--- a/app/javascript/mastodon/locales/sq.json
+++ b/app/javascript/mastodon/locales/sq.json
@@ -785,8 +785,6 @@
   "status.favourite": "I vini shenjë si të parapëlqyer",
   "status.favourites": "{count, plural, one {i parapëlqyer} other {të parapëlqyer}}",
   "status.filter": "Filtroje këtë postim",
-  "status.filtered": "I filtruar",
-  "status.hide": "Fshihe postimin",
   "status.history.created": "{name} u krijua më {date}",
   "status.history.edited": "{name} u përpunua më {date}",
   "status.load_more": "Ngarko më tepër",
@@ -814,10 +812,7 @@
   "status.report": "Raportojeni @{name}",
   "status.sensitive_warning": "Lëndë rezervat",
   "status.share": "Ndajeni me të tjerë",
-  "status.show_filter_reason": "Shfaqe, sido qoftë",
-  "status.show_less": "Shfaq më pak",
   "status.show_less_all": "Shfaq më pak për të tërë",
-  "status.show_more": "Shfaq më tepër",
   "status.show_more_all": "Shfaq më tepër për të tërë",
   "status.show_original": "Shfaq origjinalin",
   "status.title.with_attachments": "{user} postoi {attachmentCount, plural, one {një bashkëngjitje} other {{attachmentCount} bashkëngjitje}}",
diff --git a/app/javascript/mastodon/locales/sr-Latn.json b/app/javascript/mastodon/locales/sr-Latn.json
index b82445cf97edbd..d550f6517c687b 100644
--- a/app/javascript/mastodon/locales/sr-Latn.json
+++ b/app/javascript/mastodon/locales/sr-Latn.json
@@ -711,8 +711,6 @@
   "status.favourite": "Omiljeno",
   "status.favourites": "{count, plural, one {# omiljeno} few {# omiljena} other {# omiljenih}}",
   "status.filter": "Filtriraj ovu objavu",
-  "status.filtered": "Filtrirano",
-  "status.hide": "Sakrij objavu",
   "status.history.created": "{name} napisao/la {date}",
   "status.history.edited": "{name} uredio/la {date}",
   "status.load_more": "Učitaj još",
@@ -740,10 +738,7 @@
   "status.report": "Prijavi @{name}",
   "status.sensitive_warning": "Osetljiv sadržaj",
   "status.share": "Podeli",
-  "status.show_filter_reason": "Ipak prikaži",
-  "status.show_less": "Prikaži manje",
   "status.show_less_all": "Prikaži manje za sve",
-  "status.show_more": "Prikaži više",
   "status.show_more_all": "Prikaži više za sve",
   "status.show_original": "Prikaži orginal",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
diff --git a/app/javascript/mastodon/locales/sr.json b/app/javascript/mastodon/locales/sr.json
index 604a4e81d4d386..f608d46a20bcc7 100644
--- a/app/javascript/mastodon/locales/sr.json
+++ b/app/javascript/mastodon/locales/sr.json
@@ -711,8 +711,6 @@
   "status.favourite": "Омиљено",
   "status.favourites": "{count, plural, one {# омиљено} few {# омиљена} other {# омиљених}}",
   "status.filter": "Филтрирај ову објаву",
-  "status.filtered": "Филтрирано",
-  "status.hide": "Сакриј објаву",
   "status.history.created": "{name} написао/ла {date}",
   "status.history.edited": "{name} уредио/ла {date}",
   "status.load_more": "Учитај још",
@@ -740,10 +738,7 @@
   "status.report": "Пријави @{name}",
   "status.sensitive_warning": "Осетљив садржај",
   "status.share": "Подели",
-  "status.show_filter_reason": "Ипак прикажи",
-  "status.show_less": "Прикажи мање",
   "status.show_less_all": "Прикажи мање за све",
-  "status.show_more": "Прикажи више",
   "status.show_more_all": "Прикажи више за све",
   "status.show_original": "Прикажи оргинал",
   "status.title.with_attachments": "{user} је објавио {attachmentCount, plural, one {прилог} few {{attachmentCount} прилога} other {{attachmentCount} прилога}}",
diff --git a/app/javascript/mastodon/locales/sv.json b/app/javascript/mastodon/locales/sv.json
index 3be1ade0742b33..a4a30fbbc58450 100644
--- a/app/javascript/mastodon/locales/sv.json
+++ b/app/javascript/mastodon/locales/sv.json
@@ -348,8 +348,13 @@
   "hashtag.follow": "Följ hashtagg",
   "hashtag.unfollow": "Avfölj hashtagg",
   "hashtags.and_other": "…och {count, plural, one {}other {# mer}}",
+  "hints.profiles.followers_may_be_missing": "Det kan saknas vissa följare av denna profil.",
+  "hints.profiles.follows_may_be_missing": "Det kan saknas vissa följare av denna profil.",
+  "hints.profiles.posts_may_be_missing": "Det kan saknas vissa följare för denna profil.",
   "hints.profiles.see_more_followers": "Se fler följare på {domain}",
+  "hints.profiles.see_more_follows": "Se fler följare på {domain}",
   "hints.profiles.see_more_posts": "Se fler inlägg på {domain}",
+  "hints.threads.replies_may_be_missing": "Det kan saknas svar från andra servrar.",
   "hints.threads.see_more": "Se fler svar på {domain}",
   "home.column_settings.show_reblogs": "Visa boostar",
   "home.column_settings.show_replies": "Visa svar",
@@ -358,6 +363,17 @@
   "home.pending_critical_update.link": "Se uppdateringar",
   "home.pending_critical_update.title": "En kritisk säkerhetsuppdatering är tillgänglig!",
   "home.show_announcements": "Visa notiser",
+  "ignore_notifications_modal.disclaimer": "Mastodon kan inte informera användarna om att du har ignorerat deras meddelanden. Ignorering av aviseringar kommer inte att stoppa själva meddelandena från att skickas.",
+  "ignore_notifications_modal.filter_instead": "Filtrera istället",
+  "ignore_notifications_modal.filter_to_act_users": "Du kommer fortfarande att kunna acceptera, avvisa eller rapportera användare",
+  "ignore_notifications_modal.filter_to_avoid_confusion": "Filtrering hjälper till att undvika eventuell förvirring",
+  "ignore_notifications_modal.filter_to_review_separately": "Du kan granska filtrerade aviseringar separat",
+  "ignore_notifications_modal.ignore": "Ignorera notifikationer",
+  "ignore_notifications_modal.limited_accounts_title": "Vill du ignorera aviseringar från modererade konton?",
+  "ignore_notifications_modal.new_accounts_title": "Vill du ignorera aviseringar från nya konton?",
+  "ignore_notifications_modal.not_followers_title": "Vill du ignorera aviseringar från personer som inte följer dig?",
+  "ignore_notifications_modal.not_following_title": "Vill du blockera aviseringar från personer som du inte följer dig?",
+  "ignore_notifications_modal.private_mentions_title": "Vill du ignorera aviseringar från oönskade privata omnämningar?",
   "interaction_modal.description.favourite": "Med ett Mastodon-konto kan du favoritmarkera detta inlägg för att visa författaren att du gillar det och för att spara det till senare.",
   "interaction_modal.description.follow": "Med ett Mastodon-konto kan du följa {name} för att se hens inlägg i ditt hemflöde.",
   "interaction_modal.description.reblog": "Med ett Mastodon-konto kan du boosta detta inlägg för att dela den med dina egna följare.",
@@ -479,9 +495,18 @@
   "notification.admin.report_statuses": "{name} rapporterade {target} för {category}",
   "notification.admin.report_statuses_other": "{name} rapporterade {target}",
   "notification.admin.sign_up": "{name} registrerade sig",
+  "notification.admin.sign_up.name_and_others": "{name} och {count, plural, one {# en annan} other {# andra}} har registrerat sig",
   "notification.favourite": "{name} favoritmarkerade ditt inlägg",
+  "notification.favourite.name_and_others_with_link": "{name} och <a>{count, plural, one {# annan} other {# andra}}</a> har favoritmarkerat ditt inlägg",
   "notification.follow": "{name} följer dig",
+  "notification.follow.name_and_others": "{name} och {count, plural, one {# en annan} other {# andra}} följer dig",
   "notification.follow_request": "{name} har begärt att följa dig",
+  "notification.follow_request.name_and_others": "{name} och {count, plural, one {# en annan} other {# andra}} har bett att följa dig",
+  "notification.label.mention": "Nämn",
+  "notification.label.private_mention": "Privat nämning",
+  "notification.label.private_reply": "Privata svar",
+  "notification.label.reply": "Svar",
+  "notification.mention": "Nämn",
   "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.",
@@ -494,6 +519,7 @@
   "notification.own_poll": "Din röstning har avslutats",
   "notification.poll": "En enkät som du röstat i har avslutats",
   "notification.reblog": "{name} boostade ditt inlägg",
+  "notification.reblog.name_and_others_with_link": "{name} och <a>{count, plural, one {# annan} other {# andra}}</a> har förhöjt ditt inlägg",
   "notification.relationships_severance_event": "Förlorade kontakter med {name}",
   "notification.relationships_severance_event.account_suspension": "En administratör från {from} har stängt av {target}, vilket innebär att du inte längre kan ta emot uppdateringar från dem eller interagera med dem.",
   "notification.relationships_severance_event.domain_block": "En administratör från {from} har blockerat {target}, inklusive {followersCount} av dina följare och {followingCount, plural, one {# konto} other {# konton}} du följer.",
@@ -504,11 +530,22 @@
   "notification_requests.accept": "Godkänn",
   "notification_requests.accept_multiple": "{count, plural, one {Acceptera # förfrågan…} other {Acceptera # förfrågningar…}}",
   "notification_requests.confirm_accept_multiple.button": "{count, plural, one {Acceptera förfrågan} other {Acceptera förfrågningar}}",
+  "notification_requests.confirm_accept_multiple.message": "Du håller på att acceptera {count, plural, one {en förfrågan} other {# förfrågningar}} om avisering. Är du säker på att du vill fortsätta?",
+  "notification_requests.confirm_accept_multiple.title": "Vill du acceptera aviseringsförfrågningar?",
+  "notification_requests.confirm_dismiss_multiple.button": "Avvisa {count, plural, one {# förfrågan} other {# förfrågningar}}",
+  "notification_requests.confirm_dismiss_multiple.message": "Du håller på att avfärda {count, plural, one {en begäran} other {# begäran}} om aviseringar. Du kommer inte enkelt att kunna komma åt {count, plural, one {det} other {dem}} igen. Är du säker på att du vill fortsätta?",
+  "notification_requests.confirm_dismiss_multiple.title": "Vill du acceptera aviseringsförfrågningar?",
   "notification_requests.dismiss": "Avfärda",
+  "notification_requests.dismiss_multiple": "Avvisa {count, plural, one {# förfrågan} other {# förfrågningar}}...",
   "notification_requests.edit_selection": "Redigera",
   "notification_requests.exit_selection": "Klar",
+  "notification_requests.explainer_for_limited_account": "Aviseringar från detta konto har filtrerats eftersom kontot har begränsats av en moderator.",
+  "notification_requests.explainer_for_limited_remote_account": "Aviseringar från detta konto eller denna server har filtrerats eftersom kontot har begränsats av en moderator.",
+  "notification_requests.maximize": "Maximera",
+  "notification_requests.minimize_banner": "Minimera ruta för filtrerade aviseringar",
   "notification_requests.notifications_from": "Aviseringar från {name}",
   "notification_requests.title": "Filtrerade meddelanden",
+  "notification_requests.view": "Visa aviseringar",
   "notifications.clear": "Rensa aviseringar",
   "notifications.clear_confirmation": "Är du säker på att du vill rensa alla dina aviseringar permanent?",
   "notifications.clear_title": "Rensa aviseringar?",
@@ -546,7 +583,13 @@
   "notifications.permission_denied_alert": "Skrivbordsaviseringar kan inte aktiveras, eftersom att webbläsarens behörighet har nekats innan",
   "notifications.permission_required": "Skrivbordsaviseringar är otillgängliga eftersom att rättigheten som krävs inte har godkänts.",
   "notifications.policy.accept": "Acceptera",
+  "notifications.policy.accept_hint": "Visa bland aviseringar",
   "notifications.policy.drop": "Ignorera",
+  "notifications.policy.drop_hint": "Skicka ut i tomrummet för aldrig synas till igen",
+  "notifications.policy.filter": "Filtrera",
+  "notifications.policy.filter_hint": "Skicka till inkorgen för filtrerade aviserings",
+  "notifications.policy.filter_limited_accounts_hint": "Begränsade av servermoderatorer",
+  "notifications.policy.filter_limited_accounts_title": "Modererade konton",
   "notifications.policy.filter_new_accounts.hint": "Skapad inom de senaste {days, plural, one {dagen} other {# dagarna}}",
   "notifications.policy.filter_new_accounts_title": "Nya konton",
   "notifications.policy.filter_not_followers_hint": "Inklusive personer som har följt dig kortare än {days, plural, one {en dag} other {# dagar}}",
@@ -555,6 +598,7 @@
   "notifications.policy.filter_not_following_title": "Personer du inte följer",
   "notifications.policy.filter_private_mentions_hint": "Filtrerat om det inte är som svar på ditt eget omnämnande eller om du följer avsändaren",
   "notifications.policy.filter_private_mentions_title": "Oombedda privata omnämnanden",
+  "notifications.policy.title": "Hantera aviseringar från…",
   "notifications_permission_banner.enable": "Aktivera skrivbordsaviseringar",
   "notifications_permission_banner.how_to_control": "För att ta emot aviseringar när Mastodon inte är öppet, aktivera skrivbordsaviseringar. När de är aktiverade kan du styra exakt vilka typer av interaktioner som aviseras via {icon} -knappen ovan.",
   "notifications_permission_banner.title": "Missa aldrig något",
@@ -741,8 +785,6 @@
   "status.favourite": "Favoritmarkera",
   "status.favourites": "{count, plural, one {favorit} other {favoriter}}",
   "status.filter": "Filtrera detta inlägg",
-  "status.filtered": "Filtrerat",
-  "status.hide": "Dölj inlägg",
   "status.history.created": "{name} skapade {date}",
   "status.history.edited": "{name} redigerade {date}",
   "status.load_more": "Ladda fler",
@@ -770,10 +812,7 @@
   "status.report": "Rapportera @{name}",
   "status.sensitive_warning": "Känsligt innehåll",
   "status.share": "Dela",
-  "status.show_filter_reason": "Visa ändå",
-  "status.show_less": "Visa mindre",
   "status.show_less_all": "Visa mindre för alla",
-  "status.show_more": "Visa mer",
   "status.show_more_all": "Visa mer för alla",
   "status.show_original": "Visa original",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
diff --git a/app/javascript/mastodon/locales/ta.json b/app/javascript/mastodon/locales/ta.json
index 377d06a3ecf91e..4bded45679020a 100644
--- a/app/javascript/mastodon/locales/ta.json
+++ b/app/javascript/mastodon/locales/ta.json
@@ -347,7 +347,6 @@
   "status.detailed_status": "விரிவான உரையாடல் காட்சி",
   "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
   "status.embed": "கிடத்து",
-  "status.filtered": "வடிகட்டு",
   "status.load_more": "அதிகமாய் ஏற்று",
   "status.media_hidden": "மீடியா மறைக்கப்பட்டது",
   "status.mention": "குறிப்பிடு @{name}",
@@ -369,9 +368,7 @@
   "status.report": "@{name} மீது புகாரளி",
   "status.sensitive_warning": "உணர்திறன் உள்ளடக்கம்",
   "status.share": "பங்கிடு",
-  "status.show_less": "குறைவாகக் காண்பி",
   "status.show_less_all": "அனைத்தையும் குறைவாக காட்டு",
-  "status.show_more": "மேலும் காட்ட",
   "status.show_more_all": "அனைவருக்கும் மேலும் காட்டு",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
   "status.unmute_conversation": "ஊமையாக உரையாடல் இல்லை",
diff --git a/app/javascript/mastodon/locales/te.json b/app/javascript/mastodon/locales/te.json
index a18f16740d21ce..52cb612d86b8b8 100644
--- a/app/javascript/mastodon/locales/te.json
+++ b/app/javascript/mastodon/locales/te.json
@@ -247,7 +247,6 @@
   "status.detailed_status": "వివరణాత్మక సంభాషణ వీక్షణ",
   "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
   "status.embed": "ఎంబెడ్",
-  "status.filtered": "వడకట్టబడిన",
   "status.load_more": "మరిన్ని లోడ్ చేయి",
   "status.media_hidden": "మీడియా దాచబడింది",
   "status.mention": "@{name}ను ప్రస్తావించు",
@@ -268,9 +267,7 @@
   "status.report": "@{name}పై ఫిర్యాదుచేయు",
   "status.sensitive_warning": "సున్నితమైన కంటెంట్",
   "status.share": "పంచుకోండి",
-  "status.show_less": "తక్కువ చూపించు",
   "status.show_less_all": "అన్నిటికీ తక్కువ చూపించు",
-  "status.show_more": "ఇంకా చూపించు",
   "status.show_more_all": "అన్నిటికీ ఇంకా చూపించు",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
   "status.unmute_conversation": "సంభాషణను అన్మ్యూట్ చేయి",
diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json
index 7384342c8f4a19..9dbaa5a6cb7ca8 100644
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@@ -753,8 +753,6 @@
   "status.favourite": "ชื่นชอบ",
   "status.favourites": "{count, plural, other {รายการโปรด}}",
   "status.filter": "กรองโพสต์นี้",
-  "status.filtered": "กรองอยู่",
-  "status.hide": "ซ่อนโพสต์",
   "status.history.created": "{name} ได้สร้างเมื่อ {date}",
   "status.history.edited": "{name} ได้แก้ไขเมื่อ {date}",
   "status.load_more": "โหลดเพิ่มเติม",
@@ -782,10 +780,7 @@
   "status.report": "รายงาน @{name}",
   "status.sensitive_warning": "เนื้อหาที่ละเอียดอ่อน",
   "status.share": "แชร์",
-  "status.show_filter_reason": "แสดงต่อไป",
-  "status.show_less": "แสดงน้อยลง",
   "status.show_less_all": "แสดงน้อยลงทั้งหมด",
-  "status.show_more": "แสดงเพิ่มเติม",
   "status.show_more_all": "แสดงเพิ่มเติมทั้งหมด",
   "status.show_original": "แสดงดั้งเดิม",
   "status.title.with_attachments": "{user} ได้โพสต์ {attachmentCount, plural, other {{attachmentCount} ไฟล์แนบ}}",
diff --git a/app/javascript/mastodon/locales/tok.json b/app/javascript/mastodon/locales/tok.json
index 8c0a860b8494d0..19e33233c07d09 100644
--- a/app/javascript/mastodon/locales/tok.json
+++ b/app/javascript/mastodon/locales/tok.json
@@ -362,7 +362,6 @@
   "status.edit": "o ante",
   "status.embed": "ni o lon insa pi lipu ante",
   "status.favourite": "o sitelen pona",
-  "status.hide": "o len",
   "status.history.created": "{name} li pali e ni lon {date}",
   "status.history.edited": "{name} li ante lon {date}",
   "status.load_more": "o kama e ijo ante",
@@ -376,10 +375,7 @@
   "status.pinned": "toki sewi",
   "status.reblog": "o wawa",
   "status.share": "o pana tawa ante",
-  "status.show_filter_reason": "o lukin",
-  "status.show_less": "o lili e ni",
   "status.show_less_all": "o lili e ale",
-  "status.show_more": "o suli e ni",
   "status.show_more_all": "o suli e ale",
   "status.show_original": "o lukin e mama",
   "status.translate": "o ante pi nasin toki",
diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json
index 7839011c1de106..23a25a7299d24b 100644
--- a/app/javascript/mastodon/locales/tr.json
+++ b/app/javascript/mastodon/locales/tr.json
@@ -785,8 +785,6 @@
   "status.favourite": "Favori",
   "status.favourites": "{count, plural, one {beğeni} other {beğeni}}",
   "status.filter": "Bu gönderiyi süzgeçle",
-  "status.filtered": "Süzgeçlenmiş",
-  "status.hide": "Gönderiyi gizle",
   "status.history.created": "{name} oluşturdu {date}",
   "status.history.edited": "{name} düzenledi {date}",
   "status.load_more": "Daha fazlası",
@@ -814,10 +812,7 @@
   "status.report": "@{name} adlı kişiyi bildir",
   "status.sensitive_warning": "Hassas içerik",
   "status.share": "Paylaş",
-  "status.show_filter_reason": "Yine de göster",
-  "status.show_less": "Daha az göster",
   "status.show_less_all": "Hepsi için daha az göster",
-  "status.show_more": "Daha fazlasını göster",
   "status.show_more_all": "Hepsi için daha fazla göster",
   "status.show_original": "Özgün içeriği göster",
   "status.title.with_attachments": "{user}, {attachmentCount, plural, one {1 ek} other {{attachmentCount} ek}} gönderdi",
diff --git a/app/javascript/mastodon/locales/tt.json b/app/javascript/mastodon/locales/tt.json
index 3106c98007e4ed..1439e2ef5830b0 100644
--- a/app/javascript/mastodon/locales/tt.json
+++ b/app/javascript/mastodon/locales/tt.json
@@ -411,8 +411,6 @@
   "status.edit": "Үзгәртү",
   "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
   "status.embed": "Веб-биткә кертү",
-  "status.filtered": "Сөзелгән",
-  "status.hide": "Язманы яшерү",
   "status.history.created": "{name} ясалды {date}",
   "status.history.edited": "{name} төзәтте {date}",
   "status.load_more": "Күбрәк йөкләү",
@@ -426,9 +424,6 @@
   "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
   "status.reply": "Җавап бирү",
   "status.share": "Уртаклашу",
-  "status.show_filter_reason": "Барыбер карау",
-  "status.show_less": "Әзрәк күрсәтү",
-  "status.show_more": "Күбрәк күрсәтү",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
   "status.translate": "Тәрҗемә итү",
   "subscribed_languages.save": "Үзгәрешләрне саклау",
diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json
index a6172ce09566a6..7f8b33594d7110 100644
--- a/app/javascript/mastodon/locales/uk.json
+++ b/app/javascript/mastodon/locales/uk.json
@@ -785,8 +785,6 @@
   "status.favourite": "Уподобане",
   "status.favourites": "{count, plural, one {вподобання} few {вподобання} many {вподобань} other {вподобання}}",
   "status.filter": "Фільтрувати цей допис",
-  "status.filtered": "Відфільтровано",
-  "status.hide": "Сховати допис",
   "status.history.created": "{name} створює {date}",
   "status.history.edited": "{name} змінює {date}",
   "status.load_more": "Завантажити більше",
@@ -814,10 +812,7 @@
   "status.report": "Поскаржитися на @{name}",
   "status.sensitive_warning": "Делікатний вміст",
   "status.share": "Поділитися",
-  "status.show_filter_reason": "Усе одно показати",
-  "status.show_less": "Згорнути",
   "status.show_less_all": "Згорнути для всіх",
-  "status.show_more": "Розгорнути",
   "status.show_more_all": "Розгорнути для всіх",
   "status.show_original": "Показати оригінал",
   "status.title.with_attachments": "{user} розміщує {{attachmentCount, plural, one {вкладення} few {{attachmentCount} вкладення} many {{attachmentCount} вкладень} other {{attachmentCount} вкладень}}",
diff --git a/app/javascript/mastodon/locales/vi.json b/app/javascript/mastodon/locales/vi.json
index f422fbbdb49765..a0c28db77e5105 100644
--- a/app/javascript/mastodon/locales/vi.json
+++ b/app/javascript/mastodon/locales/vi.json
@@ -768,8 +768,6 @@
   "status.favourite": "Thích",
   "status.favourites": "{count, plural, other {lượt thích}}",
   "status.filter": "Lọc tút này",
-  "status.filtered": "Bộ lọc",
-  "status.hide": "Ẩn tút",
   "status.history.created": "{name} đăng {date}",
   "status.history.edited": "{name} đã sửa {date}",
   "status.load_more": "Tải thêm",
@@ -797,10 +795,7 @@
   "status.report": "Báo cáo @{name}",
   "status.sensitive_warning": "Nhạy cảm",
   "status.share": "Chia sẻ",
-  "status.show_filter_reason": "Vẫn cứ xem",
-  "status.show_less": "Thu gọn",
   "status.show_less_all": "Thu gọn toàn bộ",
-  "status.show_more": "Xem thêm",
   "status.show_more_all": "Hiển thị tất cả",
   "status.show_original": "Bản gốc",
   "status.title.with_attachments": "{user} đã đăng {attachmentCount, plural, other {{attachmentCount} đính kèm}}",
diff --git a/app/javascript/mastodon/locales/zgh.json b/app/javascript/mastodon/locales/zgh.json
index de003e3921e388..d9367520e89d01 100644
--- a/app/javascript/mastodon/locales/zgh.json
+++ b/app/javascript/mastodon/locales/zgh.json
@@ -185,9 +185,7 @@
   "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
   "status.reply": "ⵔⴰⵔ",
   "status.share": "ⴱⴹⵓ",
-  "status.show_less": "ⵙⵎⴰⵍ ⴷⵔⵓⵙ",
   "status.show_less_all": "ⵙⵎⴰⵍ ⴷⵔⵓⵙ ⵉ ⵎⴰⵕⵕⴰ",
-  "status.show_more": "ⵙⵎⴰⵍ ⵓⴳⴳⴰⵔ",
   "status.show_more_all": "ⵙⵎⴰⵍ ⵓⴳⴳⴰⵔ ⵉ ⵎⴰⵕⵕⴰ",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
   "tabs_bar.home": "ⴰⵙⵏⵓⴱⴳ",
diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json
index 2beeb761e52546..44608c60719502 100644
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@@ -785,8 +785,6 @@
   "status.favourite": "喜欢",
   "status.favourites": "{count, plural, other {次喜欢}}",
   "status.filter": "过滤此嘟文",
-  "status.filtered": "已过滤",
-  "status.hide": "隐藏嘟文",
   "status.history.created": "{name} 创建于 {date}",
   "status.history.edited": "{name} 编辑于 {date}",
   "status.load_more": "加载更多",
@@ -814,10 +812,7 @@
   "status.report": "举报 @{name}",
   "status.sensitive_warning": "敏感内容",
   "status.share": "分享",
-  "status.show_filter_reason": "仍要显示",
-  "status.show_less": "隐藏内容",
   "status.show_less_all": "隐藏全部内容",
-  "status.show_more": "显示更多",
   "status.show_more_all": "显示全部内容",
   "status.show_original": "显示原文",
   "status.title.with_attachments": "{user} 上传了 {attachmentCount, plural, one {一个附件} other {{attachmentCount} 个附件}}",
diff --git a/app/javascript/mastodon/locales/zh-HK.json b/app/javascript/mastodon/locales/zh-HK.json
index 170ef8e70d0d53..8543090b9a64e9 100644
--- a/app/javascript/mastodon/locales/zh-HK.json
+++ b/app/javascript/mastodon/locales/zh-HK.json
@@ -704,8 +704,6 @@
   "status.favourite": "最愛",
   "status.favourites": "{count, plural, one {則最愛} other {則最愛}}",
   "status.filter": "篩選此帖文",
-  "status.filtered": "已過濾",
-  "status.hide": "隱藏帖文",
   "status.history.created": "{name} 於 {date} 建立",
   "status.history.edited": "{name} 於 {date} 編輯",
   "status.load_more": "載入更多",
@@ -733,10 +731,7 @@
   "status.report": "舉報 @{name}",
   "status.sensitive_warning": "敏感內容",
   "status.share": "分享",
-  "status.show_filter_reason": "仍要顯示",
-  "status.show_less": "收起",
   "status.show_less_all": "全部收起",
-  "status.show_more": "展開",
   "status.show_more_all": "全部展開",
   "status.show_original": "顯示原文",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json
index 110d3c9c4639e7..107267b5e52063 100644
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@@ -192,6 +192,8 @@
   "confirmations.unfollow.confirm": "取消跟隨",
   "confirmations.unfollow.message": "您確定要取消跟隨 {name} 嗎？",
   "confirmations.unfollow.title": "是否取消跟隨該使用者？",
+  "content_warning.hide": "隱藏嘟文",
+  "content_warning.show": "仍要顯示",
   "conversation.delete": "刪除對話",
   "conversation.mark_as_read": "標記為已讀",
   "conversation.open": "檢視對話",
@@ -299,6 +301,7 @@
   "filter_modal.select_filter.subtitle": "使用既有的類別或是新增",
   "filter_modal.select_filter.title": "過濾此嘟文",
   "filter_modal.title.status": "過濾一則嘟文",
+  "filter_warning.matches_filter": "匹配過濾器「{title}」",
   "filtered_notifications_banner.pending_requests": "來自您可能認識的 {count, plural, =0 {0 人} other {# 人}}",
   "filtered_notifications_banner.title": "已過濾之推播通知",
   "firehose.all": "全部",
@@ -785,8 +788,6 @@
   "status.favourite": "最愛",
   "status.favourites": "{count, plural, other {# 則最愛}}",
   "status.filter": "過濾此嘟文",
-  "status.filtered": "已過濾",
-  "status.hide": "隱藏嘟文",
   "status.history.created": "{name} 於 {date} 建立",
   "status.history.edited": "{name} 於 {date} 修改",
   "status.load_more": "載入更多",
@@ -814,10 +815,7 @@
   "status.report": "檢舉 @{name}",
   "status.sensitive_warning": "敏感內容",
   "status.share": "分享",
-  "status.show_filter_reason": "仍要顯示",
-  "status.show_less": "減少顯示",
   "status.show_less_all": "隱藏所有內容警告與額外標籤",
-  "status.show_more": "顯示更多",
   "status.show_more_all": "顯示所有內容警告與額外標籤",
   "status.show_original": "顯示原文",
   "status.title.with_attachments": "{user} 嘟了 {attachmentCount, plural, other {{attachmentCount} 個附加檔案}}",
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 7cf675559d2840..d8de84c283e04f 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -877,6 +877,7 @@ ca:
       name: Nom
       newest: Més nous
       oldest: Més vells
+      open: Vegeu en públic
       reset: Restableix
       review: Revisar l'estat
       search: Cerca
diff --git a/config/locales/da.yml b/config/locales/da.yml
index 416618ec99f389..94f2369f8ed655 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -898,6 +898,7 @@ da:
       name: Navn
       newest: Seneste
       oldest: Ældste
+      open: Vis offentligt
       reset: Nulstil
       review: Gennmgangsstatus
       search: Søg
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 9bb070caf3bbfc..a852c736cf889b 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -898,6 +898,7 @@ de:
       name: Name
       newest: Neueste
       oldest: Älteste
+      open: Öffentlich anzeigen
       reset: Zurücksetzen
       review: Prüfstatus
       search: Suchen
diff --git a/config/locales/doorkeeper.lt.yml b/config/locales/doorkeeper.lt.yml
index d04e4c9f2c9610..ccdf8668484702 100644
--- a/config/locales/doorkeeper.lt.yml
+++ b/config/locales/doorkeeper.lt.yml
@@ -185,14 +185,14 @@ lt:
       write: modifikuoti visus tavo paskyros duomenis
       write:accounts: modifikuoti tavo profilį
       write:blocks: blokuoti paskyras ir domenus
-      write:bookmarks: pridėti į žymes įrašus
+      write:bookmarks: pridėti įrašus į žymes
       write:conversations: nutildyti ir ištrinti pokalbius
       write:favourites: pamėgti įrašus
-      write:filters: sukurti filtrus
+      write:filters: kurti filtrus
       write:follows: sekti žmones
-      write:lists: sukurti sąrašus
+      write:lists: kurti sąrašus
       write:media: įkelti medijos failus
       write:mutes: nutildyti žmones ir pokalbius
-      write:notifications: išvalyti tavo pranešimus
+      write:notifications: valyti tavo pranešimus
       write:reports: pranešti apie kitus žmones
       write:statuses: skelbti įrašus
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index aaf30fa760a4d6..95190d88465fb6 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -898,6 +898,7 @@ fi:
       name: Nimi
       newest: Uusimmat
       oldest: Vanhimmat
+      open: Näytä julkisesti
       reset: Palauta
       review: Tarkastuksen tila
       search: Hae
diff --git a/config/locales/fo.yml b/config/locales/fo.yml
index 4dd7fa3386347d..b2309694b180dd 100644
--- a/config/locales/fo.yml
+++ b/config/locales/fo.yml
@@ -898,6 +898,7 @@ fo:
       name: Navn
       newest: Nýggjasta/u
       oldest: Elsta/u
+      open: Vís fyri øllum
       reset: Endurstilla
       review: Eftirkanna støðu
       search: Leita
diff --git a/config/locales/fr-CA.yml b/config/locales/fr-CA.yml
index 6ad27bc62d354d..4542b248587a4c 100644
--- a/config/locales/fr-CA.yml
+++ b/config/locales/fr-CA.yml
@@ -847,7 +847,10 @@ fr-CA:
         action: Pour plus d'informations, cliquez ici
         message_html: "<strong>Votre serveur web est mal configuré. La confidentialité de vos utilisateurs est en péril.</strong>"
     tags:
+      name: Nom
       review: État du traitement
+      search: Recherche
+      title: Hashtags
       updated_msg: Paramètres du hashtag mis à jour avec succès
     title: Administration
     trends:
@@ -912,12 +915,14 @@ fr-CA:
         used_by_over_week:
           one: Utilisé par %{count} personne au cours de la dernière semaine
           other: Utilisé par %{count} personnes au cours de la dernière semaine
+      title: Recommandations et tendances
       trending: Tendances
     warning_presets:
       add_new: Ajouter un nouveau
       delete: Supprimer
       edit_preset: Éditer les avertissements prédéfinis
       empty: Vous n'avez pas encore créé de paramètres prédéfinis pour les avertissements.
+      title: Préréglages d'avertissement
     webhooks:
       add_new: Ajouter un point de terminaison
       delete: Supprimer
@@ -1065,6 +1070,7 @@ fr-CA:
     setup:
       email_settings_hint_html: Cliquez sur le lien que nous vous avons envoyé pour vérifier %{email}. Nous vous attendrons ici.
       link_not_received: Vous n'avez pas reçu de lien?
+      new_confirmation_instructions_sent: Vous allez recevoir un nouvel e-mail avec le lien de confirmation dans quelques minutes !
       title: Vérifiez votre boîte de réception
     sign_in:
       preamble_html: Connectez-vous avec vos identifiants sur <strong>%{domain}</strong>. Si votre compte est hébergé sur un autre serveur, vous ne pourrez pas vous connecter ici.
@@ -1076,6 +1082,7 @@ fr-CA:
     status:
       account_status: État du compte
       functional: Votre compte est entièrement opérationnel.
+      pending: Votre demande est en attente d’examen par notre équipe. Cela peut prendre un certain temps. Vous recevrez un e-mail si votre demande est approuvée.
       redirecting_to: Votre compte est inactif car il est actuellement redirigé vers %{acct}.
       self_destruct: Comme %{domain} est en train de fermer, vous n’aurez qu’un accès limité à votre compte.
       view_strikes: Voir les sanctions précédemment appliquées à votre compte
@@ -1118,6 +1125,7 @@ fr-CA:
       before: 'Veuillez lire attentivement ces notes avant de continuer :'
       caches: Le contenu mis en cache par d'autres serveurs peut persister
       data_removal: Vos messages et autres données seront définitivement supprimés
+      email_change_html: Vous pouvez <a href="%{path}">modifier votre adresse e-mail</a> sans supprimer votre compte
       irreversible: Vous ne pourrez pas restaurer ou réactiver votre compte
       more_details_html: Pour plus de détails, voir la <a href="%{terms_path}">politique de confidentialité</a>.
       username_available: Votre nom d’utilisateur·rice sera à nouveau disponible
@@ -1350,6 +1358,7 @@ fr-CA:
     authentication_methods:
       otp: application d'authentification à deux facteurs
       password: mot de passe
+      sign_in_token: code de sécurité par courriel
       webauthn: clés de sécurité
     description_html: Si vous voyez une activité que vous ne reconnaissez pas, envisagez de changer votre mot de passe et d'activer l'authentification à deux facteurs.
     empty: Aucun historique d'authentification disponible
@@ -1440,6 +1449,8 @@ fr-CA:
     update:
       subject: "%{name} a modifié un message"
   notifications:
+    administration_emails: Notifications d'administration par courriel
+    email_events: Événements pour les notifications par e-mail
     email_events_hint: 'Sélectionnez les événements pour lesquels vous souhaitez recevoir des notifications :'
   number:
     human:
@@ -1598,6 +1609,7 @@ fr-CA:
     import: Import de données
     import_and_export: Import et export
     migrate: Migration de compte
+    notifications: Notifications par courriel
     preferences: Préférences
     profile: Profil
     relationships: Abonnements et abonné·e·s
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 0a2b0f860d630a..38c9ca299ad71f 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -847,7 +847,10 @@ fr:
         action: Pour plus d'informations, cliquez ici
         message_html: "<strong>Votre serveur web est mal configuré. La confidentialité de vos utilisateurs est en péril.</strong>"
     tags:
+      name: Nom
       review: État du traitement
+      search: Recherche
+      title: Hashtags
       updated_msg: Paramètres du hashtag mis à jour avec succès
     title: Administration
     trends:
@@ -912,12 +915,14 @@ fr:
         used_by_over_week:
           one: Utilisé par %{count} personne au cours de la dernière semaine
           other: Utilisé par %{count} personnes au cours de la dernière semaine
+      title: Recommandations et tendances
       trending: Tendances
     warning_presets:
       add_new: Ajouter un nouveau
       delete: Supprimer
       edit_preset: Éditer les avertissements prédéfinis
       empty: Vous n'avez pas encore créé de paramètres prédéfinis pour les avertissements.
+      title: Préréglages d'avertissement
     webhooks:
       add_new: Ajouter un point de terminaison
       delete: Supprimer
@@ -1065,6 +1070,7 @@ fr:
     setup:
       email_settings_hint_html: Cliquez sur le lien que nous vous avons envoyé pour vérifier l’adresse %{email}. Nous vous attendons ici.
       link_not_received: Vous n'avez pas reçu de lien ?
+      new_confirmation_instructions_sent: Vous allez recevoir un nouvel e-mail avec le lien de confirmation dans quelques minutes !
       title: Vérifiez votre boîte de réception
     sign_in:
       preamble_html: Connectez-vous avec vos identifiants sur <strong>%{domain}</strong>. Si votre compte est hébergé sur un autre serveur, vous ne pourrez pas vous connecter ici.
@@ -1076,6 +1082,7 @@ fr:
     status:
       account_status: État du compte
       functional: Votre compte est entièrement opérationnel.
+      pending: Votre demande est en attente d’examen par notre équipe. Cela peut prendre un certain temps. Vous recevrez un e-mail si votre demande est approuvée.
       redirecting_to: Votre compte est inactif car il est actuellement redirigé vers %{acct}.
       self_destruct: Comme %{domain} est en train de fermer, vous n’aurez qu’un accès limité à votre compte.
       view_strikes: Voir les sanctions précédemment appliquées à votre compte
@@ -1118,6 +1125,7 @@ fr:
       before: 'Veuillez lire attentivement ces notes avant de continuer :'
       caches: Le contenu mis en cache par d'autres serveurs peut persister
       data_removal: Vos messages et autres données seront définitivement supprimés
+      email_change_html: Vous pouvez <a href="%{path}">modifier votre adresse e-mail</a> sans supprimer votre compte
       irreversible: Vous ne pourrez pas restaurer ou réactiver votre compte
       more_details_html: Pour plus de détails, voir la <a href="%{terms_path}">politique de confidentialité</a>.
       username_available: Votre nom d’utilisateur·rice sera à nouveau disponible
@@ -1350,6 +1358,7 @@ fr:
     authentication_methods:
       otp: application d'authentification à deux facteurs
       password: mot de passe
+      sign_in_token: code de sécurité par courriel
       webauthn: clés de sécurité
     description_html: Si vous voyez une activité que vous ne reconnaissez pas, envisagez de changer votre mot de passe et d'activer l'authentification à deux facteurs.
     empty: Aucun historique d'authentification disponible
@@ -1440,6 +1449,8 @@ fr:
     update:
       subject: "%{name} a modifié un message"
   notifications:
+    administration_emails: Notifications d'administration par courriel
+    email_events: Événements pour les notifications par e-mail
     email_events_hint: 'Sélectionnez les événements pour lesquels vous souhaitez recevoir des notifications :'
   number:
     human:
@@ -1598,6 +1609,7 @@ fr:
     import: Import de données
     import_and_export: Import et export
     migrate: Migration de compte
+    notifications: Notifications par courriel
     preferences: Préférences
     profile: Profil
     relationships: Abonnements et abonné·e·s
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index c9382f05b3fbbb..71df4c8d9318d3 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -898,6 +898,7 @@ gl:
       name: Nome
       newest: Máis recente
       oldest: Máis antiga
+      open: Ver públicamente
       reset: Restabelecer
       review: Estado de revisión
       search: Buscar
diff --git a/config/locales/he.yml b/config/locales/he.yml
index d090302311b6ab..72b4156dbf0500 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -926,6 +926,7 @@ he:
       name: שם
       newest: החדש ביותר
       oldest: הישן ביותר
+      open: צפיה בפומבי
       reset: איפוס
       review: סקירת מצב
       search: חיפוש
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 5eb4d048816b5a..cdddc79b0e9e5e 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -898,6 +898,7 @@ hu:
       name: Név
       newest: Legújabb
       oldest: Legrégebbi
+      open: Megtekintés nyilvánosan
       reset: Visszaállítás
       review: Engedélyezés állapota
       search: Keresés
diff --git a/config/locales/is.yml b/config/locales/is.yml
index 4da16a1ce93264..41347d44bbf97c 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -900,6 +900,7 @@ is:
       name: Nafn
       newest: Nýjast
       oldest: Elsta
+      open: Skoða opinberlega
       reset: Endurstilla
       review: Yfirfara stöðufærslu
       search: Leita
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 16641001015608..bc60b6ea507e82 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -898,6 +898,7 @@ it:
       name: Nome
       newest: Più recenti
       oldest: Più vecchio
+      open: Visualizza pubblicamente
       reset: Ripristina
       review: Esamina status
       search: Cerca
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 6cd647e7404161..fd3dbc00b1fc23 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -605,6 +605,7 @@ lt:
       name: Pavadinimas
       newest: Naujausias
       oldest: Seniausias
+      open: Peržiūrėti viešai
       reset: Atkurti
       search: Paieška
       title: Saitažodžiai
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index c782a41b7d6ff1..0c125acd07b927 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -898,6 +898,7 @@ nl:
       name: Naam
       newest: Nieuwste
       oldest: Oudste
+      open: Openbaar bekijken
       reset: Opnieuw
       review: Status beoordelen
       search: Zoeken
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 2201a2695a4698..d79df666e5c49b 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -926,6 +926,7 @@ pl:
       name: Nazwa
       newest: Najnowsze
       oldest: Najstarsze
+      open: Zobacz w widoku publicznym
       reset: Resetuj
       review: Stan przeglądu
       search: Szukaj
diff --git a/config/locales/simple_form.fr-CA.yml b/config/locales/simple_form.fr-CA.yml
index b9582fab74938b..4e67db2db6d688 100644
--- a/config/locales/simple_form.fr-CA.yml
+++ b/config/locales/simple_form.fr-CA.yml
@@ -77,6 +77,7 @@ fr-CA:
           warn: Cacher le contenu filtré derrière un avertissement mentionnant le nom du filtre
       form_admin_settings:
         activity_api_enabled: Nombre de messages publiés localement, de comptes actifs et de nouvelles inscriptions par tranche hebdomadaire
+        backups_retention_period: Les utilisateur·rice·s ont la possibilité de générer des archives de leurs messages pour les télécharger plus tard. Lorsqu'elles sont définies à une valeur positive, ces archives seront automatiquement supprimées de votre stockage après le nombre de jours spécifié.
         bootstrap_timeline_accounts: Ces comptes seront épinglés en tête de liste des recommandations pour les nouveaux utilisateurs.
         closed_registrations_message: Affiché lorsque les inscriptions sont fermées
         custom_css: Vous pouvez appliquer des styles personnalisés sur la version Web de Mastodon.
@@ -206,6 +207,7 @@ fr-CA:
         setting_default_privacy: Confidentialité des messages
         setting_default_sensitive: Toujours marquer les médias comme sensibles
         setting_delete_modal: Demander confirmation avant de supprimer un message
+        setting_disable_hover_cards: Désactiver l'aperçu du profil au survol
         setting_disable_swiping: Désactiver les actions par glissement
         setting_display_media: Affichage des médias
         setting_display_media_default: Défaut
@@ -241,6 +243,7 @@ fr-CA:
         backups_retention_period: Période d'archivage utilisateur
         bootstrap_timeline_accounts: Toujours recommander ces comptes aux nouveaux utilisateurs
         closed_registrations_message: Message personnalisé lorsque les inscriptions ne sont pas disponibles
+        content_cache_retention_period: Durée de rétention du contenu distant
         custom_css: CSS personnalisé
         favicon: Favicon
         mascot: Mascotte personnalisée (héritée)
@@ -307,6 +310,7 @@ fr-CA:
         listable: Autoriser ce hashtag à apparaître dans les recherches et dans l’annuaire des profils
         name: Mot-clic
         trendable: Autoriser ce hashtag à apparaitre dans les tendances
+        usable: Autoriser les messages à utiliser ce hashtag localement
       user:
         role: Rôle
         time_zone: Fuseau horaire
diff --git a/config/locales/simple_form.fr.yml b/config/locales/simple_form.fr.yml
index 99e0e1f210aa64..a9df5375f385c6 100644
--- a/config/locales/simple_form.fr.yml
+++ b/config/locales/simple_form.fr.yml
@@ -77,6 +77,7 @@ fr:
           warn: Cacher le contenu filtré derrière un avertissement mentionnant le nom du filtre
       form_admin_settings:
         activity_api_enabled: Nombre de messages publiés localement, de comptes actifs et de nouvelles inscriptions par tranche hebdomadaire
+        backups_retention_period: Les utilisateur·rice·s ont la possibilité de générer des archives de leurs messages pour les télécharger plus tard. Lorsqu'elles sont définies à une valeur positive, ces archives seront automatiquement supprimées de votre stockage après le nombre de jours spécifié.
         bootstrap_timeline_accounts: Ces comptes seront épinglés en tête de liste des recommandations pour les nouveaux utilisateurs.
         closed_registrations_message: Affiché lorsque les inscriptions sont fermées
         custom_css: Vous pouvez appliquer des styles personnalisés sur la version Web de Mastodon.
@@ -206,6 +207,7 @@ fr:
         setting_default_privacy: Confidentialité des messages
         setting_default_sensitive: Toujours marquer les médias comme sensibles
         setting_delete_modal: Demander confirmation avant de supprimer un message
+        setting_disable_hover_cards: Désactiver l'aperçu du profil au survol
         setting_disable_swiping: Désactiver les actions par glissement
         setting_display_media: Affichage des médias
         setting_display_media_default: Défaut
@@ -241,6 +243,7 @@ fr:
         backups_retention_period: Durée de rétention des archives utilisateur
         bootstrap_timeline_accounts: Toujours recommander ces comptes aux nouveaux⋅elles utilisateur⋅rice⋅s
         closed_registrations_message: Message personnalisé lorsque les inscriptions ne sont pas disponibles
+        content_cache_retention_period: Durée de rétention du contenu distant
         custom_css: CSS personnalisé
         favicon: Favicon
         mascot: Mascotte personnalisée (héritée)
@@ -307,6 +310,7 @@ fr:
         listable: Autoriser ce hashtag à apparaître dans les recherches et dans l’annuaire des profils
         name: Hashtag
         trendable: Autoriser ce hashtag à apparaitre dans les tendances
+        usable: Autoriser les messages à utiliser ce hashtag localement
       user:
         role: Rôle
         time_zone: Fuseau horaire
diff --git a/config/locales/simple_form.sv.yml b/config/locales/simple_form.sv.yml
index b0b974d7421c49..329cabf941e049 100644
--- a/config/locales/simple_form.sv.yml
+++ b/config/locales/simple_form.sv.yml
@@ -159,7 +159,7 @@ sv:
         title: Rubrik
       admin_account_action:
         include_statuses: Inkludera rapporterade inlägg i e-postmeddelandet
-        send_email_notification: Notifiera användaren via e-post
+        send_email_notification: Avisera användaren via e-post
         text: Anpassad varning
         type: Åtgärd
         types:
@@ -314,6 +314,7 @@ sv:
         listable: Tillåt denna hashtagg att visas i sökningar och förslag
         name: Hashtagg
         trendable: Tillåt denna hashtagg att visas under trender
+        usable: Tillåt inlägg att använda denna fyrkantstagg
       user:
         role: Roll
         time_zone: Tidszon
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index d13c42e2630be6..ffaa8e00b99280 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -891,6 +891,7 @@ sq:
       name: Emër
       newest: Më të rejat
       oldest: Më të vjetrat
+      open: Shiheni Publikisht
       reset: Riktheje te parazgjedhjet
       review: Gjendje rishikimi
       search: Kërkim
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 1a54451716e710..e47f506e6b761f 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -58,6 +58,7 @@ sv:
       demote: Degradera
       destroyed_msg: "%{username}'s data har nu lagts till kön för att raderas omedelbart"
       disable: inaktivera
+      disable_sign_in_token_auth: Inaktivera autentisering med pollett via e-post
       disable_two_factor_authentication: Inaktivera 2FA
       disabled: inaktiverad
       display_name: Visningsnamn
@@ -66,6 +67,7 @@ sv:
       email: E-post
       email_status: E-poststatus
       enable: Aktivera
+      enable_sign_in_token_auth: Aktivera autentisering med pollett via e-post
       enabled: Aktiverad
       enabled_msg: Uppfrysningen av %{username}'s konto lyckades
       followers: Följare
@@ -130,6 +132,7 @@ sv:
       resubscribe: Starta en ny prenumeration
       role: Roll
       search: Sök
+      search_same_email_domain: Andra användare med samma e-postdomän
       search_same_ip: Annan användare med samma IP-adress
       security: Säkerhet
       security_measures:
@@ -170,6 +173,7 @@ sv:
         approve_appeal: Godkänn överklagande
         approve_user: Godkänn användare
         assigned_to_self_report: Tilldela anmälan
+        change_email_user: Ändra e-postadress för användare
         change_role_user: Ändra roll för användaren
         confirm_user: Bekräfta användare
         create_account_warning: Skapa varning
@@ -192,8 +196,10 @@ sv:
         destroy_user_role: Förstör roll
         disable_2fa_user: Inaktivera 2FA
         disable_custom_emoji: Inaktivera egna emojis
+        disable_sign_in_token_auth_user: Inaktivera autentisering med pollett via e-post för användare
         disable_user: Inaktivera användare
         enable_custom_emoji: Aktivera egna emojis
+        enable_sign_in_token_auth_user: Aktivera autentisering med pollett via e-post för användare
         enable_user: Aktivera användare
         memorialize_account: Minnesmärk konto
         promote_user: Befordra användare
@@ -223,6 +229,7 @@ sv:
         approve_appeal_html: "%{name} godkände överklagande av modereringsbeslut från %{target}"
         approve_user_html: "%{name} godkände registrering från %{target}"
         assigned_to_self_report_html: "%{name} tilldelade rapporten %{target} till sig själva"
+        change_email_user_html: "%{name} bytte e-postadress för användaren %{target}"
         change_role_user_html: "%{name} ändrade roll för %{target}"
         create_account_warning_html: "%{name} skickade en varning till %{target}"
         create_announcement_html: "%{name} skapade kungörelsen %{target}"
@@ -1093,6 +1100,7 @@ sv:
     status:
       account_status: Kontostatus
       functional: Ditt konto fungerar som det ska.
+      pending: Din ansökan inväntar granskning. Detta kan ta tid. Du kommer att få ett e-postmeddelande om din ansökan har godkänts.
       redirecting_to: Ditt konto är inaktivt eftersom det för närvarande dirigeras om till %{acct}.
       self_destruct: Eftersom %{domain} håller på att stängas ned, kommer du endast att ha begränsad tillgång till ditt konto.
       view_strikes: Visa tidigare prickar på ditt konto
@@ -1136,6 +1144,8 @@ sv:
       caches: Innehåll som har cachats av andra servrar kan bibehållas
       data_removal: Dina inlägg och annan data kommer permanent raderas
       email_change_html: Du kan <a href="%{path}">ändra din e-postadress</a> utan att radera ditt konto
+      email_contact_html: Om det inte kommer kan du mejla <a href="mailto:%{email}">%{email}</a> för att få hjälp
+      email_reconfirmation_html: Om du inte får bekräftelsemeddelandet kan du <a href="%{path}">begära ett på nytt</a>
       irreversible: Du kan inte återställa eller återaktivera ditt konto
       more_details_html: För mer information, se <a href="%{terms_path}">integritetspolicyn</a>.
       username_available: Ditt användarnamn kommer att bli tillgängligt igen
@@ -1368,6 +1378,7 @@ sv:
     authentication_methods:
       otp: tvåfaktorsautentiseringsapp
       password: lösenord
+      sign_in_token: e-postsäkerhetskod
       webauthn: säkerhetsnycklar
     description_html: Om du ser aktivitet som du inte känner igen, överväg att byta ditt lösenord och aktivera tvåfaktor-autentisering.
     empty: Ingen autentiseringshistorik tillgänglig
@@ -1378,6 +1389,16 @@ sv:
     unsubscribe:
       action: Ja, avsluta prenumerationen
       complete: Prenumeration avslutad
+      confirmation_html: Är du säker på att du vill avregistrera dig från att ta emot %{type} för Mastodon på %{domain} med din e-post på %{email}? Du kan alltid återprenumerera bland dina <a href="%{settings_path}">e-postmeddelandeinställningar</a>.
+      emails:
+        notification_emails:
+          favourite: aviseringsmejl för favoriserade inlägg
+          follow: aviseringsmejl för följda inlägg
+          follow_request: aviseringsmejl för följdförfrågningar
+          mention: aviseringsmejl för inlägg där du nämns
+          reblog: aviseringsmejl för förhöjda inlägg
+      resubscribe_html: Om du slutat prenumerera av misstag kan du återprenumerera i dina <a href="%{settings_path}">e-postaviseringsinställningar</a>.
+      success_html: Du får inte längre %{type} för Mastodon på %{domain} till din e-post på %{email}.
       title: Avsluta prenumeration
   media_attachments:
     validations:
@@ -1458,6 +1479,8 @@ sv:
     update:
       subject: "%{name} redigerade ett inlägg"
   notifications:
+    administration_emails: E-postaviseringar från administratör
+    email_events: Händelser vid e-postnotiser
     email_events_hint: 'Välj händelser som du vill ta emot aviseringar för:'
   number:
     human:
@@ -1616,6 +1639,7 @@ sv:
     import: Importera
     import_and_export: Import och export
     migrate: Kontoflytt
+    notifications: E-postaviseringar
     preferences: Inställningar
     profile: Profil
     relationships: Följer och följare
@@ -1862,6 +1886,7 @@ sv:
     invalid_otp_token: Ogiltig tvåfaktorskod
     otp_lost_help_html: Om du förlorat åtkomst till båda kan du komma i kontakt med %{email}
     rate_limited: För många autentiseringsförsök, försök igen senare.
+    seamless_external_login: Du är inloggad via en extern tjänst. Därför finns inställningar för lösenord och e-post inte tillgängliga.
     signed_in_as: 'Inloggad som:'
   verification:
     extra_instructions_html: <strong>Tips:</strong> Länken på din webbplats kan vara osynlig. Den viktiga delen är <code>rel="me"</code> som förhindrar personifiering på webbplatser med användargenererat innehåll. Du kan även använda en <code>länk</code> tagg i huvudet på sidan istället för <code>en</code>, men HTML:en måste vara tillgänglig utan att exekvera JavaScript.
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 94d3d7381694ea..fc9fde36154daa 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -898,6 +898,7 @@ tr:
       name: Ad
       newest: En yeni
       oldest: En eski
+      open: Herkese Açık Görüntüle
       reset: Sıfırla
       review: Durumu gözden geçir
       search: Ara
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index a7b48dc3204661..faff0b4e42bc68 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -926,6 +926,7 @@ uk:
       name: Назва
       newest: Найновіші
       oldest: Найдавніші
+      open: Переглянути публічно
       reset: Скинути
       review: Переглянути допис
       search: Пошук
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index df1d1cc810ed41..f85646b5bc5ab9 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -886,6 +886,7 @@ zh-TW:
       name: 名稱
       newest: 最新
       oldest: 最舊
+      open: 公開檢視
       reset: 重設
       review: 審核嘟文
       search: 搜尋

From c493689e84eadf2f9c055d9f2ce688d8d0b1b291 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 23 Aug 2024 14:55:54 +0200
Subject: [PATCH 1942/2191] Change output format of `repo:changelog` task
 (#31546)

---
 lib/tasks/repo.rake | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/lib/tasks/repo.rake b/lib/tasks/repo.rake
index 1ed1ee5c3235d0..b90b48934eeee0 100644
--- a/lib/tasks/repo.rake
+++ b/lib/tasks/repo.rake
@@ -49,24 +49,32 @@ namespace :repo do
       File.open(path, 'r') do |file|
         file.each_line do |line|
           if line.start_with?('-')
-            new_line = line.gsub(/[(]#([[:digit:]]+)[)]\Z/) do |pull_request_reference|
-              pull_request_number = pull_request_reference[2..-2]
+            new_line = line.gsub(/\(#([[:digit:]]+)(, #([[:digit:]]+))*\)\Z/) do |pull_requests_string|
+              pull_requests = pull_requests_string[1...-1].split(',').map { |pr_id| pr_id.strip[1...] }
               response = nil
 
-              loop do
-                response = HTTP.headers('Authorization' => "token #{ENV['GITHUB_API_TOKEN']}").get("https://api.github.com/repos/#{REPOSITORY_NAME}/pulls/#{pull_request_number}")
+              authors = pull_requests.map do |pull_request_number|
+                response = nil
 
-                if response.code == 403
-                  sleep_for = (response.headers['X-RateLimit-Reset'].to_i - Time.now.to_i).abs
-                  puts "Sleeping for #{sleep_for} seconds to get over rate limit"
-                  sleep sleep_for
-                else
-                  break
+                loop do
+                  response = HTTP.headers('Authorization' => "token #{ENV['GITHUB_API_TOKEN']}").get("https://api.github.com/repos/#{REPOSITORY_NAME}/pulls/#{pull_request_number}")
+
+                  if response.code == 403
+                    sleep_for = (response.headers['X-RateLimit-Reset'].to_i - Time.now.to_i).abs
+                    puts "Sleeping for #{sleep_for} seconds to get over rate limit"
+                    sleep sleep_for
+                  else
+                    break
+                  end
                 end
+
+                pull_request = Oj.load(response.to_s)
+                pull_request['user']['login']
               end
 
-              pull_request = Oj.load(response.to_s)
-              "([#{pull_request['user']['login']}](#{pull_request['html_url']}))"
+              authors.sort!.uniq!
+
+              "(#{pull_requests.map { |pr| "##{pr}" }.to_sentence} by #{authors.map { |author| "@#{author}" }.to_sentence})"
             end
 
             tmp.puts new_line

From 77c055b78ca3df0e17cd42414e6ff6fac85c160a Mon Sep 17 00:00:00 2001
From: Michael Stanclift <mx@vmstan.com>
Date: Fri, 23 Aug 2024 11:00:07 -0500
Subject: [PATCH 1943/2191] Update Docker Compose for 4.3-beta (#31554)

---
 docker-compose.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 1c4ab536a84eab..05fd9e18878ed9 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -58,7 +58,7 @@ services:
 
   web:
     build: .
-    image: ghcr.io/mastodon/mastodon:v4.2.11
+    image: ghcr.io/mastodon/mastodon:v4.3.0-beta.1
     restart: always
     env_file: .env.production
     command: bundle exec puma -C config/puma.rb
@@ -67,7 +67,7 @@ services:
       - internal_network
     healthcheck:
       # prettier-ignore
-      test: ['CMD-SHELL', 'wget -q --spider --proxy=off localhost:3000/health || exit 1']
+      test: ['CMD-SHELL',"curl -s --noproxy localhost localhost:3000/health | grep -q 'OK' || exit 1"]
     ports:
       - '127.0.0.1:3000:3000'
     depends_on:
@@ -79,16 +79,16 @@ services:
 
   streaming:
     build: .
-    image: ghcr.io/mastodon/mastodon:v4.2.11
+    image: ghcr.io/mastodon/mastodon-streaming:v4.3.0-beta.1
     restart: always
     env_file: .env.production
-    command: node ./streaming
+    command: node ./streaming/index.js
     networks:
       - external_network
       - internal_network
     healthcheck:
       # prettier-ignore
-      test: ['CMD-SHELL', 'wget -q --spider --proxy=off localhost:4000/api/v1/streaming/health || exit 1']
+      test: ['CMD-SHELL', "curl -s --noproxy localhost localhost:4000/api/v1/streaming/health | grep -q 'OK' || exit 1'"]
     ports:
       - '127.0.0.1:4000:4000'
     depends_on:
@@ -97,7 +97,7 @@ services:
 
   sidekiq:
     build: .
-    image: ghcr.io/mastodon/mastodon:v4.2.11
+    image: ghcr.io/mastodon/mastodon:v4.3.0-beta.1
     restart: always
     env_file: .env.production
     command: bundle exec sidekiq

From 97f6baf977212e84125ac325176ad305ad5b068a Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 23 Aug 2024 18:07:32 +0200
Subject: [PATCH 1944/2191] Bump version to v4.3.0-beta.1 (#30989)

---
 CHANGELOG.md            | 295 ++++++++++++++++++++++++++++++++++++++++
 lib/mastodon/version.rb |   2 +-
 2 files changed, 296 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d47c9bc1681117..7388e5b461be94 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,301 @@
 
 All notable changes to this project will be documented in this file.
 
+## [4.3.0] - UNRELEASED
+
+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.
+
+### Security
+
+- **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.
+
+### Added
+
+- **Add experimental 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, and #31513 by @ClearlyClaire, @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.\
+  This feature is intended to eventually replace the existing notifications column, but for this first beta, users will have to enable it in the “Experimental features” section of the notifications column settings.\
+  The API is not final yet, but it consists of:
+  - a new `group_key` attribute to `Notification` entities
+  - `GET /api/v2_alpha/notifications`: https://docs.joinmastodon.org/methods/notifications_alpha/#get-grouped
+  - `GET /api/v2_alpha/notifications/:group_key`: https://docs.joinmastodon.org/methods/notifications_alpha/#get-notification-group
+  - `POST /api/v2_alpha/notifications/:group_key/dimsiss`: https://docs.joinmastodon.org/methods/notifications_alpha/#dismiss-group
+  - `GET /api/v2_alpha/notifications/:unread_count`: https://docs.joinmastodon.org/methods/notifications_alpha/#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, and #31541 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.\
+  This adds the following REST API endpoints:
+
+  - `GET /api/v2/notifications/policy`: https://docs.joinmastodon.org/methods/notifications/#get-policy
+  - `PATCH /api/v2/notifications/policy`: https://docs.joinmastodon.org/methods/notifications/#update-the-filtering-policy-for-notifications
+  - `GET /api/v1/notifications/requests`: https://docs.joinmastodon.org/methods/notifications/#get-requests
+  - `GET /api/v1/notifications/requests/:id`: https://docs.joinmastodon.org/methods/notifications/#get-one-request
+  - `POST /api/v1/notifications/requests/:id/accept`: https://docs.joinmastodon.org/methods/notifications/#accept-request
+  - `POST /api/v1/notifications/requests/:id/dismiss`: https://docs.joinmastodon.org/methods/notifications/#dismiss-request
+  - `POST /api/v1/notifications/requests/accept`: https://docs.joinmastodon.org/methods/notifications/#accept-multiple-requests
+  - `POST /api/v1/notifications/requests/dismiss`: https://docs.joinmastodon.org/methods/notifications/#dismiss-multiple-requests
+  - `GET /api/v1/notifications/requests/merged`: https://docs.joinmastodon.org/methods/notifications/#requests-merged
+
+  In addition, accepting one or more notification requests generates a new streaming event:
+
+  - `notifications_merged`: an event of this type indicates accepted notification requests have finished merging, and the notifications list should be refreshed
+
+- **Add notifications of severed relationships** (#27511, #29665, #29668, #29670, #29700, #29714, #29712, and #29731 by @ClearlyClaire and @Gargron)\
+  Notify local users when they lose relationships as a result of a local moderator blocking a remote account or server, allowing the affected user to retrieve the list of broken relationships.\
+  Note that this does not notify remote users.\
+  This adds the `severed_relationships` notification type to the REST API and streaming, with a new [`relationship_severance_event` attribute](https://docs.joinmastodon.org/entities/Notification/#relationship_severance_event).
+- **Add hover cards in web UI** (#30754, #30864, #30850, #30879, #30928, #30949, #30948, #30931, and #31300 by @ClearlyClaire, @Gargron, and @renchap)\
+  Hovering over an avatar or username will now display a hover card with the first two lines of the user's description and their first two profile fields.\
+  This can be disabled in the “Animations and accessibility” section of the preferences.
+- **Add "system" theme setting (light/dark theme depending on user system preference)** (#29748, #29553, #29795, #29918, #30839, and #30861 by @nshki, @ErikUden, @mjankowski, @renchap, and @vmstan)\
+  Add a “system” theme that automatically switch between default dark and light themes depending on the user's system preferences.\
+  Also changes the default server theme to this new “system” theme so that automatic theme selection happens even when logged out.
+- **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, and #30846 by @Gargron)\
+  This adds a mechanism to [highlight the author of news articles](https://blog.joinmastodon.org/2024/07/highlighting-journalism-on-mastodon/) shared on Mastodon.\
+  Articles hosted outside the fediverse can indicate a fediverse author with a meta tag:
+  ```html
+  <meta name="fediverse:creator" content="username@domain" />
+  ```
+  On the API side, this is represented by a new `authors` attribute to the `PreviewCard` entity: https://docs.joinmastodon.org/entities/PreviewCard/#authors\
+  Note that this feature is still work in progress and the tagging format and verification mechanisms may change in future releases.
+- **Add in-app notifications for moderation actions and warnings** (#30065, #30082, and #30081 by @ClearlyClaire)\
+  In addition to email notifications, also notify users of moderation actions or warnings against them directly within the app, so they are less likely to miss important communication from their moderators.\
+  This adds the `moderation_warning` notification type to the REST API and streaming, with a new [`moderation_warning` attribute](https://docs.joinmastodon.org/entities/Notification/#moderation_warning).
+- **Add domain information to profiles in web UI** (#29602 by @Gargron)\
+  Clicking the domain of a user in their profile will now open a tooltip with a short explanation about servers and federation.
+- Add ability to reorder uploaded media before posting in web UI (#28456 by @Gargron)
+- Add moderation interface for searching hashtags (#30880 by @ThisIsMissEm)
+- Add ability for admins to configure instance favicon and logo (#30040, #30208, #30259, #30375, #30734, #31016, and #30205 by @ClearlyClaire, @FawazFarid, @JasonPunyon, @mgmn, and @renchap)\
+  This is also exposed through the REST API: https://docs.joinmastodon.org/entities/Instance/#icon
+- Add `api_versions` to `/api/v2/instance` (#31354 by @ClearlyClaire)\
+  Add API version number to make it easier for clients to detect compatible features going forward.\
+  See API documentation at https://docs.joinmastodon.org/entities/Instance/#api-versions
+- Add recent audit log entries in federation moderation interface (#27386 by @ThisIsMissEm)
+- Add profile setup to onboarding in web UI (#27829, #27876, and #28453 by @Gargron)
+- Add prominent share/copy button on profiles in web UI (#27865 and #27889 by @ClearlyClaire and @Gargron)
+- Add optional hints for server rules (#29539 and #29758 by @ClearlyClaire and @Gargron)\
+  Server rules can now be broken into a short rule name and a longer explanation of the rule.\
+  This adds a new [`hint` attribute](https://docs.joinmastodon.org/entities/Rule/#hint) to `Rule` entities in the REST API.
+- Add support for PKCE in OAuth flow (#31129 by @ThisIsMissEm)
+- Add CDN cache busting on media deletion (#31353 and #31414 by @ClearlyClaire and @tribela)
+- Add the OAuth application used in local reports (#30539 by @ThisIsMissEm)
+- Add hint to user that other remote statuses may be missing (#26910, #31387, and #31516 by @Gargron, @audiodude, and @renchap)
+- Add lang attribute on preview card title (#31303 by @c960657)
+- Add check for `Content-Length` in `ResponseWithLimitAdapter` (#31285 by @c960657)
+- Add `Accept-Language` header to fetch preview cards in the server's default language (#31232 by @c960657)
+- Add support for PKCE Extension in OmniAuth OIDC through the `OIDC_USE_PKCE` environment variable (#31131 by @ThisIsMissEm)
+- Add API endpoints for unread notifications count (#31191 by @ClearlyClaire)\
+  This adds the following REST API endpoints:
+  - `GET /api/v1/notifications/unread_count`: https://docs.joinmastodon.org/methods/notifications/#unread-count
+- Add `/` keyboard shortcut to focus the search field (#29921 by @ClearlyClaire)
+- Add button to view the Hashtag on the instance from Hashtags in Moderation UI (#31533 by @ThisIsMissEm)
+- Add list of pending releases directly in mail notifications for version updates (#29436 and #30035 by @ClearlyClaire)
+- Add “Appeals” link under “Moderation” navigation category in moderation interface (#31071 by @ThisIsMissEm)
+- Add badge on account card in report moderation interface when account is already suspended (#29592 by @ClearlyClaire)
+- Add admin comments directly to the `admin/instances` page (#29240 by @tribela)
+- Add ability to require approval when users sign up using specific email domains (#28468, #28732, #28607, and #28608 by @ClearlyClaire)
+- Add banner for forwarded reports made by remote users about remote content (#27549 by @ClearlyClaire)
+- Add support HTML ruby tags in remote posts for east-asian languages (#30897 by @ThisIsMissEm)
+- Add link to manage warning presets in admin navigation (#26199 by @vmstan)
+- Add volume saving/reuse to video player (#27488 by @thehydrogen)
+- Add Elasticsearch index size, ffmpeg and ImageMagick versions to the admin dashboard (#27301, #30710, #31130, and #30845 by @vmstan)
+- Add `MASTODON_SIDEKIQ_READY_FILENAME` environment variable to use a file for Sidekiq to signal it is ready to process jobs (#30971 and #30988 by @renchap)\
+  In the official Docker image, this is set to `sidekiq_process_has_started_and_will_begin_processing_jobs` so that Sidekiq will touch `tmp/sidekiq_process_has_started_and_will_begin_processing_jobs` to signal readiness.
+- Add `S3_RETRY_LIMIT` environment variable to make S3 retries configurable (#23215 by @smiba)
+- Add `S3_KEY_PREFIX` environment variable (#30181 by @S0yKaf)
+- Add support for multiple `redirect_uris` when creating OAuth 2.0 Applications (#29192 by @ThisIsMissEm)
+- Add Interlingue and Interlingua to interface languages (#28630 and #30828 by @Dhghomon and @renchap)
+- Add Kashubian, Pennsylvania Dutch, Vai, Jawi Malay, Mohawk and Low German to posting languages (#26024, #26634, #27136, #29098, #27115, and #27434 by @EngineerDali, @HelgeKrueger, and @gunchleoc)
+- Add validations to `Web::PushSubscription` (#30540 and #30542 by @ThisIsMissEm)
+- Add option to use native Ruby driver for Redis through `REDIS_DRIVER=ruby` (#30717 by @vmstan)
+- Add support for libvips in addition to ImageMagick (#30090, #30590, #30597, #30632, #30857, #30869, and #30858 by @ClearlyClaire, @Gargron, and @mjankowski)\
+  Server admins can now use libvips as a faster and lighter alternative to ImageMagick for processing user-uploaded images.\
+  This requires libvips 8.13 or newer, and needs to be enabled with `MASTODON_USE_LIBVIPS=true`.\
+  This is enabled by default in the official Docker images, and is intended to completely replace ImageMagick in the future.
+- Add active animation to header settings button (#30221, #30307, and #30388 by @daudix)
+- Add OpenTelemetry instrumentation (#30130, #30322, #30353, and #30350 by @julianocosta89, @renchap, and @robbkidd)\
+  See https://docs.joinmastodon.org/admin/config/#otel for documentation
+- Add API to get multiple accounts and statuses (#27871 and #30465 by @ClearlyClaire)\
+  This adds `GET /api/v1/accounts` and `GET /api/v1/statuses` to the REST API, see https://docs.joinmastodon.org/methods/accounts/#index and https://docs.joinmastodon.org/methods/statuses/#index
+- Add redirection back to previous page after site upload deletion (#30141 by @FawazFarid)
+- Add RFC8414 OAuth 2.0 server metadata (#29191 by @ThisIsMissEm)
+- Add loading indicator and empty result message to advanced interface search (#30085 by @ClearlyClaire)
+- Add `profile` OAuth 2.0 scope, allowing more limited access to user data (#29087 and #30357 by @ThisIsMissEm)
+- Add the role ID to the badge component (#29707 by @renchap)
+- Add diagnostic message for failure during CLI search deploy (#29462 by @mjankowski)
+- Add pagination `Link` headers on API accounts/statuses when pinned true (#29442 by @mjankowski)
+- Add support for specifying custom CA cert for Elasticsearch through `ES_CA_FILE` (#29122 and #29147 by @ClearlyClaire)
+- 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 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 `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)
+- Add support for invite codes in the registration API (#27805 by @ClearlyClaire)
+- Add HTML lang attribute to preview card descriptions (#27503 by @srapilly)
+- Add display of relevant account warnings to report action logs (#27425 by @ClearlyClaire)
+- Add validation of allowed schemes on preview card URLs (#27485 by @mjankowski)
+- Add token introspection without read scope to `/api/v1/apps/verify_credentials` (#27142 by @ThisIsMissEm)
+- Add support for cross-origin request to `/nodeinfo/2.0` (#27413 by @palant)
+- Add variable delay before link verification of remote account links (#27351 by @ClearlyClaire)
+- Add PWA shortcut to `/explore` page (#27235 by @jake-anto)
+
+### 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)\
+  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, and #29659 by @ClearlyClaire, @Gargron, @eai04191, @hinaloe, and @ronilaukkarinen)\
+  The compose form has been completely redesigned for a more modern and consistent look, as well as spelling out the chosen privacy setting and language name at all times.\
+  As part of this, the “Unlisted” privacy setting has been renamed to “Quiet public”.
+- **Change design of confirmation modals in the web UI** (#29576, #29614, #29640, #29644, #30131, #30884, and #31399 by @ClearlyClaire, @Gargron, and @tribela)\
+  The mute, block, and domain block confirmation modals have been completely redesigned to be clearer and include more detailed information on the action to be performed.\
+  They also have a more modern and consistent design, along with other confirmation modals in the application.
+- **Change colors throughout the web UI** (#29522, #29584, #29653, #29779, #29803, #29809, #29808, #29828, #31034, #31168, #31266, #31348, #31349, #31361, and #31510 by @ClearlyClaire, @Gargron, @renchap, and @vmstan)
+- **Change onboarding prompt to follow suggestions carousel in web UI** (#28878 and #29272 by @Gargron)
+- **Change email templates** (#28416, #28755, #28814, #29064, #28883, #29470, #29607, #29761, #29760, and #29879 by @ClearlyClaire, @Gargron, @hteumeuleu, and @mjankowski)\
+  All emails to end-users have been completely redesigned with a fresh new look, providing more information while making them easier to reand and keeping maximum compatibility across mail clients.
+- **Change follow recommendations algorithm** (#28314, #28433, #29017, #29108, #29306, #29550, #29619, and #31474 by @ClearlyClaire, @Gargron, @kernal053, @mjankowski, and @wheatear-dev)\
+  This replaces the “past interactions” recommendation algorithm with a “friends of friends” algorithm that suggests accounts followed by people you follow, and a “similar profiles” algorithm that suggests accounts with a profile similar to your most recent follows.\
+  In addition, the implementation has been significantly reworked, and all follow recommendations are now dismissable.\
+  This change deprecates the `source` attribute in `Suggestion` entities in the REST API, and replaces it with the new [`sources` attribute](https://docs.joinmastodon.org/entities/Suggestion/#sources).
+- Change account search algorithm (#30803 by @Gargron)
+- **Change streaming server to use its own dependencies and its own docker image** (#24702, #27967, #26850, #28112, #28115, #28137, #28138, #28497, #28548, and #30795 by @TheEssem, @ThisIsMissEm, @jippi, @timetinytim, and @vmstan)\
+  In order to reduce the amount of runtime dependencies, the streaming server has been moved into a separate package and Docker image.\
+  The `mastodon` image does not contain the streaming server anymore, as it has been moved to its own `mastodon-streaming` image.\
+  Administrators may need to update their setup accordingly.
+- Change how content warnings and filters are displayed in web UI (#31365 by @Gargron)
+- Change Web UI to allow viewing and severing relationships with suspended accounts (#27667 by @ClearlyClaire)\
+  This also adds a `with_suspended` parameter to `GET /api/v1/accounts/relationships` in the REST API.
+- Change avatars border radius (#31390 by @renchap)
+- Change counters to be displayed on profile timelines in web UI (#30525 by @Gargron)
+- Change disabled buttons color in light mode to make the difference more visible (#30998 by @renchap)
+- Change design of people tab on explore in web UI (#30059 by @Gargron)
+- Change sidebar text in web UI (#30696 by @Gargron)
+- Change "Follow" to "Follow back" and "Mutual" when appropriate in web UI (#28452 and #28465 by @Gargron and @renchap)
+- Change media to be hidden/blurred by default in report modal (#28522 by @ClearlyClaire)
+- Change order of the "muting" and "blocking" list options in “Data Exports” (#26088 by @fixermark)
+- Change admin and moderation notes character limit from 500 to 2000 characters (#30288 by @ThisIsMissEm)
+- Change mute options to be in dropdown on muted users list in web UI (#30049 and #31315 by @ClearlyClaire and @Gargron)
+- Change out-of-band hashtags design in web UI (#29732 by @Gargron)
+- Change design of metadata underneath detailed posts in web UI (#29585, #29605, and #29648 by @ClearlyClaire and @Gargron)
+- Change action button to be last on profiles in web UI (#29533 and #29923 by @ClearlyClaire and @Gargron)
+- Change confirmation prompts in trending moderation interface to be more specific (#19626 by @tribela)
+- Change “Trends” moderation menu to “Recommendations & Trends” and move follow recommendations there (#31292 by @ThisIsMissEm)
+- Change irrelevant fields in account cleanup settings to be disabled unless automatic cleanup is enabled (#26562 by @c960657)
+- Change dropdown menu icon to not be replaced by close icon when open in web UI (#29532 by @Gargron)
+- Change back button to always appear in advanced web UI (#29551 and #29669 by @Gargron)
+- Change border of active compose field search inputs (#29832 and #29839 by @vmstan)
+- Change link detection to allow `@` at the end of an URL (#31124 by @adamniedzielski)
+- Change User-Agent to use Mastodon as the product, and http.rb as platform details (#31192 by @ClearlyClaire)
+- Change layout and wording of the Content Retention server settings page (#27733 by @vmstan)
+- Change unconfirmed users to be kept for one week instead of two days (#30285 by @renchap)
+- Change maximum page size for Admin Domain Management APIs from 200 to 500 (#31253 by @ThisIsMissEm)
+- Change database pool size to default to Sidekiq concurrency settings in Sidekiq processes (#26488 by @sinoru)
+- Change alt text to empty string for avatars (#21875 by @jasminjohal)
+- Change Docker images to use custom-built libvips and ffmpeg (#30571, #30569, and #31498 by @vmstan)
+- Change external links in the admin audit log to plain text or local administration pages (#27139 and #27150 by @ClearlyClaire and @ThisIsMissEm)
+- Change YJIT to be enabled when available (#30310 and #27283 by @ClearlyClaire and @mjankowski)\
+  Enable Ruby's built-in just-in-time compiler. This improves performances substantially, at the cost of a slightly increased memory usage.
+- Change `.env` file loading from deprecated `dotenv-rails` gem to `dotenv` gem (#29173 and #30121 by @mjankowski)\
+  This should have no effect except in the unlikely case an environment variable included a newline.
+- Change “Panjabi” language name to the more common spelling “Punjabi” (#27117 by @gunchleoc)
+- Change encryption of OTP secrets to use ActiveRecord Encryption (#29831, #28325, #30151, #30202, #30340, and #30344 by @ClearlyClaire and @mjankowski)\
+  This requires a manual step from administrators of existing servers. Indeed, they need to generate new secrets, which can be done using `bundle exec rails db:encryption:init`.\
+  Furthermore, there is a risk that the introduced migration fails if the server was misconfigured in the past. If that happens, the migration error will include the relevant information.
+- Change `/api/v1/announcements` to return regular `Status` entities (#26736 by @ClearlyClaire)
+- Change imports to convert case-insensitive fields to lowercase (#29739 and #29740 by @ThisIsMissEm)
+- Change stats in the admin interface to be inclusive of the full selected range, from beginning of day to end of day (#29416 and #29841 by @mjankowski)
+- Change materialized views to be refreshed concurrently to avoid locks (#29015 by @Gargron)
+- Change compose form to use server-provided post character and poll options limits (#28928 and #29490 by @ClearlyClaire and @renchap)
+- Change streaming server logging from `npmlog` to `pino` and `pino-http` (#27828 by @ThisIsMissEm)\
+  This changes the Mastodon streaming server log format, so this might be considered a breaking change if you were parsing the logs.
+- Change media “ALT” label to use a specific CSS class (#28777 by @ClearlyClaire)
+- Change streaming API host to not be overridden to localhost in development mode (#28557 by @ClearlyClaire)
+- Change cookie rotator to use SHA1 digest for new cookies (#27392 by @ClearlyClaire)\
+  Note that this requires that no pre-4.2.0 Mastodon web server is running when this code is deployed, as those would not understand the new cookies.\
+  Therefore, zero-downtime updates are only supported if you're coming from 4.2.0 or newer. If you want to skip Mastodon 4.2, you will need to completely stop Mastodon services before updating.
+- Change preview card deletes to be done using batch method (#28183 by @vmstan)
+- Change `img-src` and `media-src` CSP directives to not include `https:` (#28025 and #28561 by @ClearlyClaire)
+- Change self-destruct procedure (#26439, #29049, and #29420 by @ClearlyClaire and @zunda)\
+  Instead of enqueuing deletion jobs immediately, `tootctl self-destruct` now outputs a value for the `SELF_DESTRUCT` environment variable, which puts a server in self-destruct mode, processing deletions in the background, while giving users access to their export archives.
+
+### Removed
+
+- Remove StatsD integration (replaced by OpenTelemetry) (#30240 by @mjankowski)
+- Remove `CacheBuster` default options (#30718 by @mjankowski)
+- Remove home marker updates from the Web UI (#22721 by @davbeck)\
+  The web interface was unconditionally updating the home marker to the most recent received post, discarding any value set by other clients, thus making the feature unreliable.
+- Remove support for Ruby 3.0 (reaching EOL) (#29702 by @mjankowski)
+- Remove setting for unfollow confirmation modal (#29373 by @ClearlyClaire)\
+  Instead, the unfollow confirmation modal will always be displayed.
+- Remove support for Capistrano (#27295 and #30009 by @mjankowski and @renchap)
+
+### Fixed
+
+- **Fix link preview cards not always preserving the original URL from the status** (#27312 by @Gargron)
+- Fix log out from user menu not working on Safari (#31402 by @renchap)
+- Fix various issues when in link preview card generation (#28748, #30017, #30362, #30173, #30853, #30929, #30933, #30957, #30987, and #31144 by @adamniedzielski, @oneiros, @phocks, @timothyjrogers, and @tribela)
+- Fix handling of missing links in Webfinger responses (#31030 by @adamniedzielski)
+- Fix HTTP 500 error in `/api/v1/polls/:id/votes` when required `choices` parameter is missing (#25598 by @danielmbrasil)
+- Fix cross-origin loading of `inert.css` polyfill (#30687 by @louis77)
+- Fix cutoff of instance name in sign-up form (#30598 by @oneiros)
+- Fix empty `aria-hidden` attribute value in logo resources area (#30570 by @mjankowski)
+- Fix “Redirect URI” field not being marked as required in “New application” form (#30311 by @ThisIsMissEm)
+- Fix right-to-left text in preview cards (#30930 by @ClearlyClaire)
+- Fix rack attack `match_type` value typo in logging config (#30514 by @mjankowski)
+- Fix various cases of duplicate, missing, or inconsistent borders or scrollbar styles (#31068, #31286, #31268, #31275, #31284, #31305, #31346, #31372, #31373, #31389, #31432, #31391, and #31445 by @valtlai and @vmstan)
+- Fix 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 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)
+- Fix distracting and confusing always-showing scrollbar track in boost confirmation modal (#31524 by @ClearlyClaire)
+- Fix being able to upload more than 4 media attachments in some cases (#29183 by @mashirozx)
+- Fix preview card player getting embedded when clicking on the external link button (#29457 by @ClearlyClaire)
+- 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 “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)
+- Fix moderation report updates through `PUT /api/v1/admin/reports/:id` not being logged in the audit log (#29044, #30342, and #31033 by @mjankowski, @tribela, and @vmstan)
+- Fix moderation interface allowing to select rule violation when there are no server rules (#31458 by @ThisIsMissEm)
+- Fix redirection from paths with url-encoded `@` to their decoded form (#31184 by @timothyjrogers)
+- Fix Trending Tags pending review having an unstable sort order (#31473 by @ThisIsMissEm)
+- Fix the emoji dropdown button always opening the dropdown instead of behaving like a toggle (#29012 by @jh97uk)
+- Fix processing of incoming posts with bearcaps (#26527 by @kmycode)
+- Fix support for IPv6 redis connections in streaming (#31229 by @ThisIsMissEm)
+- Fix search form re-rendering spuriously in web UI (#28876 by @Gargron)
+- Fix `RedownloadMediaWorker` not being called on transient S3 failure (#28714 by @ClearlyClaire)
+- Fix ISO code for Canadian French from incorrect `fr-QC` to `fr-CA` (#26015 by @gunchleoc)
+- Fix `.opus` file uploads being misidentified by Paperclip (#28580 by @vmstan)
+- Fix loading local accounts with extraneous domain part in WebUI (#28559 by @ClearlyClaire)
+- Fix destructive actions in dropdowns not using error color in light theme (#28484 by @logicalmoody)
+- Fix call to inefficient `delete_matched` cache method in domain blocks (#28374 by @ClearlyClaire)
+- Fix status edits not always being streamed to mentioned users (#28324 by @ClearlyClaire)
+- Fix onboarding step descriptions being truncated on narrow screens (#28021 by @ClearlyClaire)
+- Fix duplicate IDs in relationships and familiar_followers APIs (#27982 by @KevinBongart)
+- Fix modal content not being selectable (#27813 by @pajowu)
+- Fix Web UI not displaying appropriate explanation when a user hides their follows/followers (#27791 by @ClearlyClaire)
+- Fix format-dependent redirects being cached regardless of requested format (#27632 by @ClearlyClaire)
+- Fix confusing screen when visiting a confirmation link for an already-confirmed email (#27368 by @ClearlyClaire)
+- Fix explore page reloading when you navigate back to it in web UI (#27489 by @Gargron)
+- Fix missing redirection from `/home` to `/deck/home` in the advanced interface (#27378 by @Signez)
+- Fix empty environment variables not using default nil value (#27400 by @renchap)
+- Fix language sorting in settings (#27158 by @gunchleoc)
+
 ## |4.2.11] - 2024-08-16
 
 ### Added
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index fd05dac7b98c9f..caafa96b361b29 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -17,7 +17,7 @@ def patch
     end
 
     def default_prerelease
-      'alpha.5'
+      'beta.1'
     end
 
     def prerelease

From 117af5847a9c06850eaa145f0585f319eb7f993b Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Sat, 24 Aug 2024 12:32:48 +0200
Subject: [PATCH 1945/2191] Disable tagging nightly images as latest

---
 .github/workflows/build-nightly.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-nightly.yml b/.github/workflows/build-nightly.yml
index eddcd80f266fe5..0ea553cfda2335 100644
--- a/.github/workflows/build-nightly.yml
+++ b/.github/workflows/build-nightly.yml
@@ -35,7 +35,7 @@ jobs:
       labels: |
         org.opencontainers.image.description=Nightly build image used for testing purposes
       flavor: |
-        latest=true
+        latest=auto
       tags: |
         type=raw,value=edge
         type=raw,value=nightly
@@ -56,7 +56,7 @@ jobs:
       labels: |
         org.opencontainers.image.description=Nightly build image used for testing purposes
       flavor: |
-        latest=true
+        latest=auto
       tags: |
         type=raw,value=edge
         type=raw,value=nightly

From f5d26225eda4fcc5a96d51f08c53f600f9c14cf3 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Sat, 24 Aug 2024 12:33:09 +0200
Subject: [PATCH 1946/2191] Re-enable PR-needs-rebase action for glitch-soc
 (was disabled upstream for forks)

---
 .github/workflows/rebase-needed.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/rebase-needed.yml b/.github/workflows/rebase-needed.yml
index f0fc8b0db729e3..945315d52d4bb8 100644
--- a/.github/workflows/rebase-needed.yml
+++ b/.github/workflows/rebase-needed.yml
@@ -10,7 +10,7 @@ permissions:
 jobs:
   label-rebase-needed:
     runs-on: ubuntu-latest
-    if: github.repository == 'mastodon/mastodon'
+    if: github.repository == 'glitch-soc/mastodon'
 
     concurrency:
       group: ${{ github.workflow }}-${{ github.ref }}

From 3bfa5ffe29e14ad4a4cdfa7ff94d4fa756fcb193 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 26 Aug 2024 09:21:39 +0200
Subject: [PATCH 1947/2191] Update dependency rexml (#31590)

---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 62f6f091b8c492..34469db2041b3c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -695,7 +695,7 @@ GEM
     responders (3.1.1)
       actionpack (>= 5.2)
       railties (>= 5.2)
-    rexml (3.3.4)
+    rexml (3.3.6)
       strscan
     rotp (6.3.0)
     rouge (4.2.1)

From 626d44b6c6d1843288ea6a3bfaa58ab337ab9c82 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 26 Aug 2024 09:25:39 +0200
Subject: [PATCH 1948/2191] New Crowdin Translations (automated) (#31572)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/ar.json    |  7 ++
 app/javascript/mastodon/locales/be.json    |  8 +++
 app/javascript/mastodon/locales/bg.json    |  1 +
 app/javascript/mastodon/locales/cy.json    | 69 +++++++++++-------
 app/javascript/mastodon/locales/es-AR.json |  3 +
 app/javascript/mastodon/locales/es-MX.json |  3 +
 app/javascript/mastodon/locales/es.json    |  3 +
 app/javascript/mastodon/locales/fr-CA.json | 14 +++-
 app/javascript/mastodon/locales/fr.json    | 18 ++++-
 app/javascript/mastodon/locales/ga.json    | 26 +++++++
 app/javascript/mastodon/locales/gd.json    | 28 +++++++-
 app/javascript/mastodon/locales/he.json    |  3 +
 app/javascript/mastodon/locales/id.json    | 19 ++++-
 app/javascript/mastodon/locales/is.json    |  2 +-
 app/javascript/mastodon/locales/ja.json    | 13 ++++
 app/javascript/mastodon/locales/ko.json    |  3 +
 app/javascript/mastodon/locales/nn.json    | 25 +++++++
 app/javascript/mastodon/locales/sq.json    |  3 +
 app/javascript/mastodon/locales/sv.json    |  2 +
 app/javascript/mastodon/locales/th.json    | 37 +++++++++-
 app/javascript/mastodon/locales/tr.json    |  3 +
 app/javascript/mastodon/locales/uk.json    |  3 +
 app/javascript/mastodon/locales/vi.json    |  3 +
 app/javascript/mastodon/locales/zh-CN.json |  3 +
 config/locales/ar.yml                      |  2 +
 config/locales/cy.yml                      |  1 +
 config/locales/devise.ro.yml               | 35 ++++-----
 config/locales/doorkeeper.lt.yml           | 84 +++++++++++-----------
 config/locales/es-AR.yml                   |  1 +
 config/locales/es-MX.yml                   |  1 +
 config/locales/es.yml                      |  1 +
 config/locales/fr.yml                      |  2 +-
 config/locales/ga.yml                      |  1 +
 config/locales/gd.yml                      |  1 +
 config/locales/nn.yml                      |  1 +
 config/locales/th.yml                      |  5 +-
 config/locales/vi.yml                      |  1 +
 config/locales/zh-CN.yml                   |  1 +
 38 files changed, 339 insertions(+), 97 deletions(-)

diff --git a/app/javascript/mastodon/locales/ar.json b/app/javascript/mastodon/locales/ar.json
index 8d3289ff45d995..c1cb734a6301ec 100644
--- a/app/javascript/mastodon/locales/ar.json
+++ b/app/javascript/mastodon/locales/ar.json
@@ -190,6 +190,8 @@
   "confirmations.unfollow.confirm": "إلغاء المتابعة",
   "confirmations.unfollow.message": "متأكد من أنك تريد إلغاء متابعة {name} ؟",
   "confirmations.unfollow.title": "إلغاء متابعة المستخدم؟",
+  "content_warning.hide": "إخفاء المنشور",
+  "content_warning.show": "إظهار على أي حال",
   "conversation.delete": "احذف المحادثة",
   "conversation.mark_as_read": "اعتبرها كمقروءة",
   "conversation.open": "اعرض المحادثة",
@@ -297,6 +299,7 @@
   "filter_modal.select_filter.subtitle": "استخدم فئة موجودة أو قم بإنشاء فئة جديدة",
   "filter_modal.select_filter.title": "تصفية هذا المنشور",
   "filter_modal.title.status": "تصفية منشور",
+  "filter_warning.matches_filter": "يطابق عامل التصفية \"{title}\"",
   "filtered_notifications_banner.title": "الإشعارات المصفاة",
   "firehose.all": "الكل",
   "firehose.local": "هذا الخادم",
@@ -500,11 +503,14 @@
   "notification.update": "عدّلَ {name} منشورًا",
   "notification_requests.accept": "موافقة",
   "notification_requests.dismiss": "تخطي",
+  "notification_requests.edit_selection": "تعديل",
+  "notification_requests.exit_selection": "تمّ",
   "notification_requests.explainer_for_limited_account": "تم تصفية الإشعارات من هذا الحساب لأن الحساب تم تقييده من قبل مشرف.",
   "notification_requests.notifications_from": "إشعارات من {name}",
   "notification_requests.title": "الإشعارات المصفاة",
   "notifications.clear": "مسح الإشعارات",
   "notifications.clear_confirmation": "متأكد من أنك تود مسح جميع الإشعارات الخاصة بك و المتلقاة إلى حد الآن ؟",
+  "notifications.clear_title": "أترغب في مسح الإشعارات؟",
   "notifications.column_settings.admin.report": "التبليغات الجديدة:",
   "notifications.column_settings.admin.sign_up": "التسجيلات الجديدة:",
   "notifications.column_settings.alert": "إشعارات سطح المكتب",
@@ -713,6 +719,7 @@
   "server_banner.about_active_users": "الأشخاص الذين يستخدمون هذا الخادم خلال الأيام الثلاثين الأخيرة (المستخدمون النشطون شهريًا)",
   "server_banner.active_users": "مستخدم نشط",
   "server_banner.administered_by": "يُديره:",
+  "server_banner.is_one_of_many": "{domain} هو واحد من بين العديد من خوادم ماستدون المستقلة التي يمكنك استخدامها للمشاركة في الفديفرس.",
   "server_banner.server_stats": "إحصائيات الخادم:",
   "sign_in_banner.create_account": "أنشئ حسابًا",
   "sign_in_banner.sign_in": "تسجيل الدخول",
diff --git a/app/javascript/mastodon/locales/be.json b/app/javascript/mastodon/locales/be.json
index 6335b546d7b602..57431b0a5731f6 100644
--- a/app/javascript/mastodon/locales/be.json
+++ b/app/javascript/mastodon/locales/be.json
@@ -192,6 +192,8 @@
   "confirmations.unfollow.confirm": "Адпісацца",
   "confirmations.unfollow.message": "Вы ўпэўненыя, што хочаце адпісацца ад {name}?",
   "confirmations.unfollow.title": "Адпісацца ад карыстальніка?",
+  "content_warning.hide": "Схаваць допіс",
+  "content_warning.show": "Усё адно паказаць",
   "conversation.delete": "Выдаліць размову",
   "conversation.mark_as_read": "Адзначыць прачытаным",
   "conversation.open": "Прагледзець размову",
@@ -299,6 +301,7 @@
   "filter_modal.select_filter.subtitle": "Скарыстайцеся існуючай катэгорыяй або стварыце новую",
   "filter_modal.select_filter.title": "Фільтраваць гэты допіс",
   "filter_modal.title.status": "Фільтраваць допіс",
+  "filter_warning.matches_filter": "Адпавядае фільтру \"{title}\"",
   "filtered_notifications_banner.pending_requests": "Ад {count, plural, =0 {# людзей якіх} one {# чалавека якіх} few {# чалавек якіх} many {# людзей якіх} other {# чалавека якіх}} вы магчыма ведаеце",
   "filtered_notifications_banner.title": "Адфільтраваныя апавяшчэнні",
   "firehose.all": "Усе",
@@ -355,6 +358,7 @@
   "home.pending_critical_update.link": "Прагледзець абнаўленні",
   "home.pending_critical_update.title": "Даступна крытычнае абнаўленне бяспекі!",
   "home.show_announcements": "Паказаць аб'явы",
+  "ignore_notifications_modal.not_following_title": "Ігнараваць апавяшчэнні ад людзей на якіх вы не падпісаны?",
   "interaction_modal.description.favourite": "Маючы ўліковы запіс Mastodon, вы можаце ўпадабаць гэты допіс, каб паведаміць аўтару, што ён вам падабаецца, і захаваць яго на будучыню.",
   "interaction_modal.description.follow": "Маючы акаўнт у Mastodon, вы можаце падпісацца на {name}, каб бачыць яго/яе допісы ў сваёй хатняй стужцы.",
   "interaction_modal.description.reblog": "З уліковым запісам Mastodon, вы можаце пашырыць гэты пост, каб падзяліцца ім са сваімі падпісчыкамі.",
@@ -504,7 +508,11 @@
   "notification.status": "Новы допіс ад {name}",
   "notification.update": "Допіс {name} адрэдагаваны",
   "notification_requests.accept": "Прыняць",
+  "notification_requests.confirm_accept_multiple.title": "Прыняць запыты на апавяшчэнні?",
+  "notification_requests.confirm_dismiss_multiple.title": "Адхіліць запыты на апавяшчэнні?",
   "notification_requests.dismiss": "Адхіліць",
+  "notification_requests.edit_selection": "Рэдагаваць",
+  "notification_requests.exit_selection": "Гатова",
   "notification_requests.maximize": "Разгарнуць",
   "notification_requests.minimize_banner": "Згарнуць банер адфільтраваных апавяшчэнняў",
   "notification_requests.notifications_from": "Апавяшчэнні ад {name}",
diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json
index 83d9c5343ab160..5fb254e3901f33 100644
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@@ -192,6 +192,7 @@
   "confirmations.unfollow.confirm": "Без следване",
   "confirmations.unfollow.message": "Наистина ли искате да не следвате {name}?",
   "confirmations.unfollow.title": "Спирате ли да следвате потребителя?",
+  "content_warning.hide": "Скриване на публ.",
   "conversation.delete": "Изтриване на разговора",
   "conversation.mark_as_read": "Маркиране като прочетено",
   "conversation.open": "Преглед на разговора",
diff --git a/app/javascript/mastodon/locales/cy.json b/app/javascript/mastodon/locales/cy.json
index d029f6bad1835b..7e7bc25c9eb46c 100644
--- a/app/javascript/mastodon/locales/cy.json
+++ b/app/javascript/mastodon/locales/cy.json
@@ -1,5 +1,5 @@
 {
-  "about.blocks": "Gweinyddion sy'n cael eu cymedroli",
+  "about.blocks": "Gweinyddion gyda chymedrolwyr",
   "about.contact": "Cysylltwch â:",
   "about.disclaimer": "Mae Mastodon yn feddalwedd cod agored rhydd ac o dan hawlfraint Mastodon gGmbH.",
   "about.domain_blocks.no_reason_available": "Nid yw'r rheswm ar gael",
@@ -103,7 +103,7 @@
   "bundle_column_error.network.body": "Bu gwall wrth geisio llwytho'r dudalen hon. Gall hyn fod oherwydd anhawster dros-dro gyda'ch cysylltiad gwe neu'r gweinydd hwn.",
   "bundle_column_error.network.title": "Gwall rhwydwaith",
   "bundle_column_error.retry": "Ceisiwch eto",
-  "bundle_column_error.return": "Mynd nôl adref",
+  "bundle_column_error.return": "Mynd i'r ffrwd gartref",
   "bundle_column_error.routing.body": "Nid oedd modd canfod y dudalen honno. Ydych chi'n siŵr fod yr URL yn y bar cyfeiriad yn gywir?",
   "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Cau",
@@ -124,7 +124,7 @@
   "column.favourites": "Ffefrynnau",
   "column.firehose": "Ffrydiau byw",
   "column.follow_requests": "Ceisiadau dilyn",
-  "column.home": "Hafan",
+  "column.home": "Cartref",
   "column.lists": "Rhestrau",
   "column.mutes": "Defnyddwyr wedi'u tewi",
   "column.notifications": "Hysbysiadau",
@@ -184,7 +184,7 @@
   "confirmations.logout.title": "Allgofnodi?",
   "confirmations.mute.confirm": "Tewi",
   "confirmations.redraft.confirm": "Dileu ac ailddrafftio",
-  "confirmations.redraft.message": "Ydych chi'n siŵr eich bod am ddileu'r postiad hwn a'i ailddrafftio? Bydd ffefrynnau a hybiau'n cael eu colli, a bydd atebion i'r post gwreiddiol yn mynd yn amddifad.",
+  "confirmations.redraft.message": "Ydych chi wir eisiau'r dileu'r postiad hwn a'i ailddrafftio? Bydd ffefrynnau a hybiau'n cael eu colli, a bydd atebion i'r post gwreiddiol yn mynd yn amddifad.",
   "confirmations.redraft.title": "Dileu & ailddraftio post?",
   "confirmations.reply.confirm": "Ateb",
   "confirmations.reply.message": "Bydd ateb nawr yn cymryd lle y neges yr ydych yn cyfansoddi ar hyn o bryd. Ydych chi'n siŵr eich bod am barhau?",
@@ -192,6 +192,8 @@
   "confirmations.unfollow.confirm": "Dad-ddilyn",
   "confirmations.unfollow.message": "Ydych chi'n siŵr eich bod am ddad-ddilyn {name}?",
   "confirmations.unfollow.title": "Dad-ddilyn defnyddiwr?",
+  "content_warning.hide": "Cuddio'r post",
+  "content_warning.show": "Dangos beth bynnag",
   "conversation.delete": "Dileu sgwrs",
   "conversation.mark_as_read": "Nodi fel wedi'i ddarllen",
   "conversation.open": "Gweld sgwrs",
@@ -208,7 +210,7 @@
   "dismissable_banner.community_timeline": "Dyma'r postiadau cyhoeddus diweddaraf gan bobl sydd â chyfrifon ar {domain}.",
   "dismissable_banner.dismiss": "Cau",
   "dismissable_banner.explore_links": "Dyma straeon newyddion sy’n cael eu rhannu fwyaf ar y we gymdeithasol heddiw. Mae'r straeon newyddion diweddaraf sy'n cael eu postio gan fwy o unigolion gwahanol yn cael eu graddio'n uwch.",
-  "dismissable_banner.explore_statuses": "Mae'r rhain yn bostiadau o bob rhan o'r we gymdeithasol sydd ar gynnydd heddiw. Mae postiadau mwy diweddar sydd â mwy o hybiau a ffefrynu'n cael eu graddio'n uwch.",
+  "dismissable_banner.explore_statuses": "Dyma postiadau o bob gwr o'r we gymdeithasol sy'n derbyn sylw heddiw. Mae postiadau mwy diweddar sydd â mwy o hybiau a ffefrynnau'n cael eu graddio'n uwch.",
   "dismissable_banner.explore_tags": "Mae'r rhain yn hashnodau sydd ar gynnydd ar y we gymdeithasol heddiw. Mae hashnodau sy'n cael eu defnyddio gan fwy o unigolion gwahanol yn cael eu graddio'n uwch.",
   "dismissable_banner.public_timeline": "Dyma'r postiadau cyhoeddus diweddaraf gan bobl ar y we gymdeithasol y mae pobl ar {domain} yn eu dilyn.",
   "domain_block_modal.block": "Blocio gweinydd",
@@ -258,13 +260,13 @@
   "empty_column.community": "Mae'r ffrwd lleol yn wag. Beth am ysgrifennu rhywbeth cyhoeddus!",
   "empty_column.direct": "Nid oes gennych unrhyw grybwylliadau preifat eto. Pan fyddwch chi'n anfon neu'n derbyn un, bydd yn ymddangos yma.",
   "empty_column.domain_blocks": "Nid oes unrhyw barthau wedi'u blocio eto.",
-  "empty_column.explore_statuses": "Does dim yn trendio ar hyn o bryd. Dewch nôl nes ymlaen!",
-  "empty_column.favourited_statuses": "Nid oes gennych unrhyw hoff bostiadau eto. Pan byddwch yn hoffi un, bydd yn ymddangos yma.",
-  "empty_column.favourites": "Nid oes unrhyw un wedi hoffi'r postiad hwn eto. Pan fydd rhywun yn gwneud hynny, byddan nhw'n ymddangos yma.",
+  "empty_column.explore_statuses": "Does dim pynciau llosg ar hyn o bryd. Dewch nôl nes ymlaen!",
+  "empty_column.favourited_statuses": "Rydych chi heb ffafrio unrhyw bostiadau eto. Pan byddwch chi'n ffafrio un, bydd yn ymddangos yma.",
+  "empty_column.favourites": "Nid oes unrhyw un wedi ffafrio'r postiad hwn eto. Pan fydd rhywun yn gwneud hynny, byddan nhw'n ymddangos yma.",
   "empty_column.follow_requests": "Nid oes gennych unrhyw geisiadau dilyn eto. Pan fyddwch yn derbyn un, byddan nhw'n ymddangos yma.",
   "empty_column.followed_tags": "Nid ydych wedi dilyn unrhyw hashnodau eto. Pan fyddwch chi'n gwneud hynny, byddan nhw'n ymddangos yma.",
   "empty_column.hashtag": "Nid oes dim ar yr hashnod hwn eto.",
-  "empty_column.home": "Mae eich ffrwd gartref yn wag! Ymwelwch â {public} neu defnyddiwch y chwilotwr i ddechrau arni ac i gwrdd â defnyddwyr eraill.",
+  "empty_column.home": "Mae eich ffrwd gartref yn wag! Dilynwch fwy o bobl i'w llenwi.",
   "empty_column.list": "Does dim yn y rhestr yma eto. Pan fydd aelodau'r rhestr yn cyhoeddi postiad newydd, mi fydd yn ymddangos yma.",
   "empty_column.lists": "Nid oes gennych unrhyw restrau eto. Pan fyddwch yn creu un, mi fydd yn ymddangos yma.",
   "empty_column.mutes": "Nid ydych wedi tewi unrhyw ddefnyddwyr eto.",
@@ -299,6 +301,7 @@
   "filter_modal.select_filter.subtitle": "Defnyddiwch gategori sy'n bodoli eisoes neu crëu un newydd",
   "filter_modal.select_filter.title": "Hidlo'r postiad hwn",
   "filter_modal.title.status": "Hidlo postiad",
+  "filter_warning.matches_filter": "Yn cydweddu'r hidlydd “{title}”",
   "filtered_notifications_banner.pending_requests": "Gan {count, plural, =0 {no one} one {un person} two {# berson} few {# pherson} other {# person}} efallai eich bod yn eu hadnabod",
   "filtered_notifications_banner.title": "Hysbysiadau wedi'u hidlo",
   "firehose.all": "Popeth",
@@ -348,11 +351,15 @@
   "hashtag.follow": "Dilyn hashnod",
   "hashtag.unfollow": "Dad-ddilyn hashnod",
   "hashtags.and_other": "…a {count, plural, other {# more}}",
+  "hints.profiles.see_more_followers": "Gweld mwy o ddilynwyr ar {domain}",
+  "hints.profiles.see_more_follows": "Gweld mwy o 'yn dilyn' ar {domain}",
+  "hints.profiles.see_more_posts": "Gweld mwy o bostiadau ar {domain}",
+  "hints.threads.see_more": "Gweld mwy o atebion ar {domain}",
   "home.column_settings.show_reblogs": "Dangos hybiau",
   "home.column_settings.show_replies": "Dangos atebion",
   "home.hide_announcements": "Cuddio cyhoeddiadau",
   "home.pending_critical_update.body": "Diweddarwch eich gweinydd Mastodon cyn gynted â phosibl!",
-  "home.pending_critical_update.link": "Gweld y diweddariadau",
+  "home.pending_critical_update.link": "Gweld diweddariadau",
   "home.pending_critical_update.title": "Mae diweddariad diogelwch hanfodol ar gael!",
   "home.show_announcements": "Dangos cyhoeddiadau",
   "ignore_notifications_modal.disclaimer": "Ni all Mastodon hysbysu defnyddwyr eich bod wedi anwybyddu eu hysbysiadau. Ni fydd anwybyddu hysbysiadau yn atal y negeseuon eu hunain rhag cael eu hanfon.",
@@ -366,18 +373,18 @@
   "ignore_notifications_modal.not_followers_title": "Anwybyddu hysbysiadau gan bobl nad ydynt yn eich dilyn?",
   "ignore_notifications_modal.not_following_title": "Anwybyddu hysbysiadau gan bobl nad ydych yn eu dilyn?",
   "ignore_notifications_modal.private_mentions_title": "Anwybyddu hysbysiadau o Grybwylliadau Preifat digymell?",
-  "interaction_modal.description.favourite": "Gyda chyfrif ar Mastodon, gallwch chi hoffi'r postiad hwn er mwyn roi gwybod i'r awdur eich bod chi'n ei werthfawrogi ac yn ei gadw ar gyfer nes ymlaen.",
-  "interaction_modal.description.follow": "Gyda chyfrif ar Mastodon, gallwch ddilyn {name} i dderbyn eu postiadau yn eich llif cartref.",
+  "interaction_modal.description.favourite": "Gyda chyfrif ar Mastodon, gallwch chi ffafrio'r postiad hwn er mwyn roi gwybod i'r awdur eich bod chi'n ei werthfawrogi ac yn ei gadw ar gyfer nes ymlaen.",
+  "interaction_modal.description.follow": "Gyda chyfrif ar Mastodon, gallwch ddilyn {name} i dderbyn eu postiadau yn eich ffrwd gartref.",
   "interaction_modal.description.reblog": "Gyda chyfrif ar Mastodon, gallwch hybu'r postiad hwn i'w rannu â'ch dilynwyr.",
   "interaction_modal.description.reply": "Gyda chyfrif ar Mastodon, gallwch ymateb i'r postiad hwn.",
-  "interaction_modal.login.action": "Ewch â fi adref",
+  "interaction_modal.login.action": "Mynd i'm ffrwd gartref",
   "interaction_modal.login.prompt": "Parth eich gweinydd cartref, e.e. mastodon.social",
   "interaction_modal.no_account_yet": "Dim ar Mastodon?",
   "interaction_modal.on_another_server": "Ar weinydd gwahanol",
   "interaction_modal.on_this_server": "Ar y gweinydd hwn",
   "interaction_modal.sign_in": "Nid ydych wedi mewngofnodi i'r gweinydd hwn. Ble mae eich cyfrif yn cael ei gynnal?",
   "interaction_modal.sign_in_hint": "Awgrym: Dyna'r wefan lle gwnaethoch gofrestru. Os nad ydych yn cofio, edrychwch am yr e-bost croeso yn eich blwch derbyn. Gallwch hefyd nodi eich enw defnyddiwr llawn! (e.e. @Mastodon@mastodon.social)",
-  "interaction_modal.title.favourite": "Hoffi postiad {name}",
+  "interaction_modal.title.favourite": "Ffafrio postiad {name}",
   "interaction_modal.title.follow": "Dilyn {name}",
   "interaction_modal.title.reblog": "Hybu postiad {name}",
   "interaction_modal.title.reply": "Ymateb i bostiad {name}",
@@ -393,11 +400,11 @@
   "keyboard_shortcuts.direct": "i agor colofn crybwylliadau preifat",
   "keyboard_shortcuts.down": "Symud lawr yn y rhestr",
   "keyboard_shortcuts.enter": "Agor post",
-  "keyboard_shortcuts.favourite": "Hoffi postiad",
+  "keyboard_shortcuts.favourite": "Ffafrio postiad",
   "keyboard_shortcuts.favourites": "Agor rhestr ffefrynnau",
   "keyboard_shortcuts.federated": "Agor ffrwd y ffederasiwn",
   "keyboard_shortcuts.heading": "Bysellau brys",
-  "keyboard_shortcuts.home": "Agor ffrwd cartref",
+  "keyboard_shortcuts.home": "Agor ffrwd gartref",
   "keyboard_shortcuts.hotkey": "Bysell boeth",
   "keyboard_shortcuts.legend": "Dangos y rhestr hon",
   "keyboard_shortcuts.local": "Agor ffrwd lleol",
@@ -433,7 +440,7 @@
   "lists.delete": "Dileu rhestr",
   "lists.edit": "Golygu rhestr",
   "lists.edit.submit": "Newid teitl",
-  "lists.exclusive": "Cuddiwch y postiadau hyn rhag cartref",
+  "lists.exclusive": "Cuddio'r postiadau hyn o'r ffrwd gartref",
   "lists.new.create": "Ychwanegu rhestr",
   "lists.new.title_placeholder": "Teitl rhestr newydd",
   "lists.replies_policy.followed": "Unrhyw ddefnyddiwr sy'n cael ei ddilyn",
@@ -487,7 +494,9 @@
   "notification.admin.report_statuses": "Adroddodd {name} {target} ar gyfer {category}",
   "notification.admin.report_statuses_other": "Adroddodd {name} {target}",
   "notification.admin.sign_up": "Cofrestrodd {name}",
-  "notification.favourite": "Hoffodd {name} eich postiad",
+  "notification.admin.sign_up.name_and_others": "Cofrestrodd {name} {count, plural, one {ac # arall} other {a # eraill}}",
+  "notification.favourite": "Ffafriodd {name} eich postiad",
+  "notification.favourite.name_and_others_with_link": "Ffafriodd {name} a <a>{count, plural, one {# arall} other {# eraill}}</a> eich postiad",
   "notification.follow": "Dilynodd {name} chi",
   "notification.follow_request": "Mae {name} wedi gwneud cais i'ch dilyn",
   "notification.label.mention": "Crybwyll",
@@ -515,7 +524,13 @@
   "notification.status": "{name} newydd ei bostio",
   "notification.update": "Golygodd {name} bostiad",
   "notification_requests.accept": "Derbyn",
+  "notification_requests.confirm_accept_multiple.title": "Derbyn ceisiadau hysbysu?",
+  "notification_requests.confirm_dismiss_multiple.button": "{count, plural, one {Diystyru cais} other {Diystyru ceisiadau}}",
+  "notification_requests.confirm_dismiss_multiple.title": "Diystyru ceisiadau hysbysu?",
   "notification_requests.dismiss": "Cau",
+  "notification_requests.dismiss_multiple": "{count, plural, one {Diystyru # cais…} two {Diystyru # gais…} few {Diystyru # chais…} other {Diystyru # cais…}}",
+  "notification_requests.edit_selection": "Golygu",
+  "notification_requests.exit_selection": "Iawn",
   "notification_requests.explainer_for_limited_account": "Mae hysbysiadau o'r cyfrif hwn wedi'u hidlo oherwydd bod y cyfrif wedi'i gyfyngu gan gymedrolwr.",
   "notification_requests.explainer_for_limited_remote_account": "Mae hysbysiadau o'r cyfrif hwn wedi'u hidlo oherwydd bod y cyfrif neu ei weinydd wedi'i gyfyngu gan gymedrolwr.",
   "notification_requests.maximize": "Mwyhau",
@@ -581,12 +596,12 @@
   "notifications_permission_banner.title": "Peidiwch â cholli dim",
   "onboarding.action.back": "Ewch â fi nôl",
   "onboarding.actions.back": "Ewch â fi nôl",
-  "onboarding.actions.go_to_explore": "Gweld beth sy'n trendio",
-  "onboarding.actions.go_to_home": "Ewch i'ch ffrwd gartref",
+  "onboarding.actions.go_to_explore": "Gweld y pynciau llosg",
+  "onboarding.actions.go_to_home": "Ewch i'm ffrwd gartref",
   "onboarding.compose.template": "Helo, #Mastodon!",
   "onboarding.follows.empty": "Yn anffodus, nid oes modd dangos unrhyw ganlyniadau ar hyn o bryd. Gallwch geisio defnyddio chwilio neu bori'r dudalen archwilio i ddod o hyd i bobl i'w dilyn, neu ceisio eto yn nes ymlaen.",
   "onboarding.follows.lead": "Rydych chi'n curadu eich ffrwd gartref eich hun. Po fwyaf o bobl y byddwch chi'n eu dilyn, y mwyaf egnïol a diddorol fydd hi. Gall y proffiliau hyn fod yn fan cychwyn da - gallwch chi bob amser eu dad-ddilyn yn nes ymlaen:",
-  "onboarding.follows.title": "Yn boblogaidd ar Mastodon",
+  "onboarding.follows.title": "Personolwch eich ffrwd gartref",
   "onboarding.profile.discoverable": "Gwnewch fy mhroffil yn un y gellir ei ddarganfod",
   "onboarding.profile.discoverable_hint": "Pan fyddwch yn optio i mewn i ddarganfodadwyedd ar Mastodon, gall eich postiadau ymddangos mewn canlyniadau chwilio a threndiau, ac efallai y bydd eich proffil yn cael ei awgrymu i bobl sydd â diddordebau tebyg i chi.",
   "onboarding.profile.display_name": "Enw dangos",
@@ -606,7 +621,7 @@
   "onboarding.start.skip": "Eisiau mynd syth yn eich blaen?",
   "onboarding.start.title": "Rydych chi wedi cyrraedd!",
   "onboarding.steps.follow_people.body": "Rydych chi'n curadu eich ffrwd eich hun. Gadewch i ni ei lenwi â phobl ddiddorol.",
-  "onboarding.steps.follow_people.title": "Dilynwch {count, plural, one {one person} other {# people}}",
+  "onboarding.steps.follow_people.title": "Personolwch eich ffrwd gartref",
   "onboarding.steps.publish_status.body": "Dywedwch helo wrth y byd gyda thestun, lluniau, fideos neu arolygon barn {emoji}",
   "onboarding.steps.publish_status.title": "Gwnewch eich postiad cyntaf",
   "onboarding.steps.setup_profile.body": "Mae eraill yn fwy tebygol o ryngweithio â chi gyda phroffil wedi'i lenwi.",
@@ -645,7 +660,7 @@
   "recommended": "Argymhellwyd",
   "refresh": "Adnewyddu",
   "regeneration_indicator.label": "Yn llwytho…",
-  "regeneration_indicator.sublabel": "Mae eich ffrwd cartref yn cael ei baratoi!",
+  "regeneration_indicator.sublabel": "Mae eich ffrwd cartref yn cael ei pharatoi!",
   "relative_time.days": "{number}d",
   "relative_time.full.days": "{number, plural, one {# diwrnod} other {# diwrnod}} yn ôl",
   "relative_time.full.hours": "{number, plural, one {# awr} other {# awr}} yn ôl",
@@ -699,7 +714,7 @@
   "report.thanks.title": "Ddim eisiau gweld hwn?",
   "report.thanks.title_actionable": "Diolch am adrodd, byddwn yn ymchwilio i hyn.",
   "report.unfollow": "Dad-ddilyn @{name}",
-  "report.unfollow_explanation": "Rydych chi'n dilyn y cyfrif hwn. I beidio â gweld eu postiadau yn eich porthiant cartref mwyach, dad-ddilynwch nhw.",
+  "report.unfollow_explanation": "Rydych chi'n dilyn y cyfrif hwn. I beidio â gweld eu postiadau yn eich ffrwd gartref mwyach, dad-ddilynwch nhw.",
   "report_notification.attached_statuses": "{count, plural, one {{count} postiad} arall {{count} postiad}} atodwyd",
   "report_notification.categories.legal": "Cyfreithiol",
   "report_notification.categories.legal_sentence": "cynnwys anghyfreithlon",
@@ -759,7 +774,7 @@
   "status.edited": "Golygwyd ddiwethaf {date}",
   "status.edited_x_times": "Golygwyd {count, plural, one {count} two {count} other {{count} gwaith}}",
   "status.embed": "Mewnblannu",
-  "status.favourite": "Hoffi",
+  "status.favourite": "Ffafrio",
   "status.favourites": "{count, plural, one {ffefryn} other {ffefryn}}",
   "status.filter": "Hidlo'r postiad hwn",
   "status.history.created": "Crëwyd gan {name} {date}",
@@ -798,7 +813,7 @@
   "status.uncached_media_warning": "Dim rhagolwg ar gael",
   "status.unmute_conversation": "Dad-dewi sgwrs",
   "status.unpin": "Dadbinio o'r proffil",
-  "subscribed_languages.lead": "Dim ond postiadau mewn ieithoedd penodol fydd yn ymddangos yn eich ffrydiau ar ôl y newid. Dewiswch ddim byd i dderbyn postiadau ym mhob iaith.",
+  "subscribed_languages.lead": "Dim ond postiadau mewn ieithoedd penodol fydd yn ymddangos yn eich ffrydiau cartref a rhestr ar ôl y newid. Dewiswch ddim byd i dderbyn postiadau ym mhob iaith.",
   "subscribed_languages.save": "Cadw'r newidiadau",
   "subscribed_languages.target": "Newid ieithoedd tanysgrifio {target}",
   "tabs_bar.home": "Cartref",
@@ -809,7 +824,7 @@
   "time_remaining.moments": "Munudau yn weddill",
   "time_remaining.seconds": "{number, plural, one {# eiliad} other {# eiliad}} ar ôl",
   "trends.counter_by_accounts": "{count, plural, zero {neb} one {{counter} person} two {{counter} berson} few {{counter} pherson} other {{counter} o bobl}} yn y {days, plural, one {diwrnod diwethaf} two {ddeuddydd diwethaf} other {{days} diwrnod diwethaf}}",
-  "trends.trending_now": "Yn trendio nawr",
+  "trends.trending_now": "Pynciau llosg",
   "ui.beforeunload": "Byddwch yn colli eich drafft os byddwch yn gadael Mastodon.",
   "units.short.billion": "{count}biliwn",
   "units.short.million": "{count}miliwn",
diff --git a/app/javascript/mastodon/locales/es-AR.json b/app/javascript/mastodon/locales/es-AR.json
index 85561495d754f0..21e70dd98de3ab 100644
--- a/app/javascript/mastodon/locales/es-AR.json
+++ b/app/javascript/mastodon/locales/es-AR.json
@@ -192,6 +192,8 @@
   "confirmations.unfollow.confirm": "Dejar de seguir",
   "confirmations.unfollow.message": "¿Estás seguro que querés dejar de seguir a {name}?",
   "confirmations.unfollow.title": "¿Dejar de seguir al usuario?",
+  "content_warning.hide": "Ocultar mensaje",
+  "content_warning.show": "Mostrar de todos modos",
   "conversation.delete": "Eliminar conversación",
   "conversation.mark_as_read": "Marcar como leída",
   "conversation.open": "Ver conversación",
@@ -299,6 +301,7 @@
   "filter_modal.select_filter.subtitle": "Usar una categoría existente o crear una nueva",
   "filter_modal.select_filter.title": "Filtrar este mensaje",
   "filter_modal.title.status": "Filtrar un mensaje",
+  "filter_warning.matches_filter": "Coincide con el filtro “{title}”",
   "filtered_notifications_banner.pending_requests": "De {count, plural, =0 {nadie} one {una persona} other {# personas}} que podrías conocer",
   "filtered_notifications_banner.title": "Notificaciones filtradas",
   "firehose.all": "Todos",
diff --git a/app/javascript/mastodon/locales/es-MX.json b/app/javascript/mastodon/locales/es-MX.json
index 30a3a42fde4e6e..35ea5ba59216d0 100644
--- a/app/javascript/mastodon/locales/es-MX.json
+++ b/app/javascript/mastodon/locales/es-MX.json
@@ -192,6 +192,8 @@
   "confirmations.unfollow.confirm": "Dejar de seguir",
   "confirmations.unfollow.message": "¿Estás seguro de que quieres dejar de seguir a {name}?",
   "confirmations.unfollow.title": "¿Dejar de seguir al usuario?",
+  "content_warning.hide": "Ocultar publicación",
+  "content_warning.show": "Mostrar de todos modos",
   "conversation.delete": "Borrar conversación",
   "conversation.mark_as_read": "Marcar como leído",
   "conversation.open": "Ver conversación",
@@ -299,6 +301,7 @@
   "filter_modal.select_filter.subtitle": "Usar una categoría existente o crear una nueva",
   "filter_modal.select_filter.title": "Filtrar esta publicación",
   "filter_modal.title.status": "Filtrar una publicación",
+  "filter_warning.matches_filter": "Coincide con el filtro “{title}”",
   "filtered_notifications_banner.pending_requests": "De {count, plural, =0 {nadie} one {una persona} other {# personas}} que puede que conozcas",
   "filtered_notifications_banner.title": "Notificaciones filtradas",
   "firehose.all": "Todas",
diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json
index c047a2aa890c95..718c1452166f2b 100644
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@@ -192,6 +192,8 @@
   "confirmations.unfollow.confirm": "Dejar de seguir",
   "confirmations.unfollow.message": "¿Seguro que quieres dejar de seguir a {name}?",
   "confirmations.unfollow.title": "¿Dejar de seguir al usuario?",
+  "content_warning.hide": "Ocultar publicación",
+  "content_warning.show": "Mostrar de todos modos",
   "conversation.delete": "Borrar conversación",
   "conversation.mark_as_read": "Marcar como leído",
   "conversation.open": "Ver conversación",
@@ -299,6 +301,7 @@
   "filter_modal.select_filter.subtitle": "Usar una categoría existente o crear una nueva",
   "filter_modal.select_filter.title": "Filtrar esta publicación",
   "filter_modal.title.status": "Filtrar una publicación",
+  "filter_warning.matches_filter": "Coincide con el filtro “{title}”",
   "filtered_notifications_banner.pending_requests": "De {count, plural, =0 {nadie} one {una persona} other {# personas}} que puede que conozcas",
   "filtered_notifications_banner.title": "Notificaciones filtradas",
   "firehose.all": "Todas",
diff --git a/app/javascript/mastodon/locales/fr-CA.json b/app/javascript/mastodon/locales/fr-CA.json
index 667b7013ef50d0..1a2a16f1f978d5 100644
--- a/app/javascript/mastodon/locales/fr-CA.json
+++ b/app/javascript/mastodon/locales/fr-CA.json
@@ -191,6 +191,8 @@
   "confirmations.unfollow.confirm": "Ne plus suivre",
   "confirmations.unfollow.message": "Voulez-vous vraiment arrêter de suivre {name}?",
   "confirmations.unfollow.title": "Se désabonner de l'utilisateur ?",
+  "content_warning.hide": "Masquer le message",
+  "content_warning.show": "Afficher quand même",
   "conversation.delete": "Supprimer cette conversation",
   "conversation.mark_as_read": "Marquer comme lu",
   "conversation.open": "Afficher cette conversation",
@@ -298,6 +300,7 @@
   "filter_modal.select_filter.subtitle": "Utilisez une catégorie existante ou en créer une nouvelle",
   "filter_modal.select_filter.title": "Filtrer cette publication",
   "filter_modal.title.status": "Filtrer une publication",
+  "filter_warning.matches_filter": "Correspond au filtre « {title} »",
   "filtered_notifications_banner.title": "Notifications filtrées",
   "firehose.all": "Tout",
   "firehose.local": "Ce serveur",
@@ -307,6 +310,7 @@
   "follow_requests.unlocked_explanation": "Même si votre compte n’est pas privé, l’équipe de {domain} a pensé que vous pourriez vouloir peut-être consulter manuellement les demandes d'abonnement de ces comptes.",
   "follow_suggestions.curated_suggestion": "Choix du staff",
   "follow_suggestions.dismiss": "Ne plus afficher",
+  "follow_suggestions.friends_of_friends_longer": "Populaire dans le cercle des personnes que vous suivez",
   "follow_suggestions.hints.featured": "Ce profil a été sélectionné par l'équipe de {domain}.",
   "follow_suggestions.hints.friends_of_friends": "Ce profil est populaire parmi les personnes que vous suivez.",
   "follow_suggestions.hints.most_followed": "Ce profil est l'un des plus suivis sur {domain}.",
@@ -315,6 +319,7 @@
   "follow_suggestions.personalized_suggestion": "Suggestion personnalisée",
   "follow_suggestions.popular_suggestion": "Suggestion populaire",
   "follow_suggestions.popular_suggestion_longer": "Populaire sur {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Similaire aux profils que vous avez dernièrement suivis",
   "follow_suggestions.view_all": "Tout afficher",
   "follow_suggestions.who_to_follow": "Qui suivre",
   "followed_tags": "Hashtags suivis",
@@ -343,8 +348,9 @@
   "hashtag.follow": "Suivre ce hashtag",
   "hashtag.unfollow": "Ne plus suivre ce hashtag",
   "hashtags.and_other": "…et {count, plural, other {# de plus}}",
+  "hints.profiles.see_more_followers": "Afficher plus d'abonné·e·s sur {domain}",
   "hints.profiles.see_more_posts": "Voir plus de messages sur {domain}",
-  "hints.threads.see_more": "Voir plus de réponses sur {domain}",
+  "hints.threads.see_more": "Afficher plus de réponses sur {domain}",
   "home.column_settings.show_reblogs": "Afficher boosts",
   "home.column_settings.show_replies": "Afficher réponses",
   "home.hide_announcements": "Masquer les annonces",
@@ -412,6 +418,7 @@
   "limited_account_hint.action": "Afficher le profil quand même",
   "limited_account_hint.title": "Ce profil a été masqué par la modération de {domain}.",
   "link_preview.author": "Par {name}",
+  "link_preview.more_from_author": "Plus via {name}",
   "link_preview.shares": "{count, plural, one {{counter} message} other {{counter} messages}}",
   "lists.account.add": "Ajouter à une liste",
   "lists.account.remove": "Retirer d'une liste",
@@ -506,6 +513,8 @@
   "notifications.column_settings.admin.report": "Nouveaux signalements:",
   "notifications.column_settings.admin.sign_up": "Nouvelles inscriptions:",
   "notifications.column_settings.alert": "Notifications navigateur",
+  "notifications.column_settings.beta.category": "Fonctionnalités expérimentales",
+  "notifications.column_settings.beta.grouping": "Grouper les notifications",
   "notifications.column_settings.favourite": "Favoris:",
   "notifications.column_settings.filter_bar.advanced": "Afficher toutes les catégories",
   "notifications.column_settings.filter_bar.category": "Barre de filtre rapide",
@@ -534,7 +543,10 @@
   "notifications.permission_denied": "Les notifications de bureau ne sont pas disponibles en raison d'une demande de permission de navigateur précédemment refusée",
   "notifications.permission_denied_alert": "Les notifications de bureau ne peuvent pas être activées, car l’autorisation du navigateur a précedemment été refusée",
   "notifications.permission_required": "Les notifications de bureau ne sont pas disponibles car l’autorisation requise n’a pas été accordée.",
+  "notifications.policy.accept": "Accepter",
+  "notifications.policy.accept_hint": "Afficher dans les notifications",
   "notifications.policy.drop": "Ignorer",
+  "notifications.policy.drop_hint": "Expulser vers le vide, pour ne plus jamais les revoir",
   "notifications.policy.filter": "Filtrer",
   "notifications.policy.filter_limited_accounts_hint": "Limité par les modérateur·rice·s du serveur",
   "notifications.policy.filter_limited_accounts_title": "Comptes modérés",
diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json
index 11773e38e5da11..99592372cbc871 100644
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@@ -191,6 +191,8 @@
   "confirmations.unfollow.confirm": "Ne plus suivre",
   "confirmations.unfollow.message": "Voulez-vous vraiment vous désabonner de {name} ?",
   "confirmations.unfollow.title": "Se désabonner de l'utilisateur ?",
+  "content_warning.hide": "Masquer le message",
+  "content_warning.show": "Afficher quand même",
   "conversation.delete": "Supprimer la conversation",
   "conversation.mark_as_read": "Marquer comme lu",
   "conversation.open": "Afficher la conversation",
@@ -209,7 +211,7 @@
   "dismissable_banner.explore_links": "On parle actuellement de ces nouvelles sur ce serveur, ainsi que sur d'autres serveurs du réseau décentralisé.",
   "dismissable_banner.explore_statuses": "Ces messages venant de tout le web social gagnent en popularité aujourd’hui. Les nouveaux messages avec plus de boosts et de favoris sont classés plus haut.",
   "dismissable_banner.explore_tags": "Ces hashtags sont actuellement en train de gagner de l'ampleur parmi les personnes sur les serveurs du réseau décentralisé dont celui-ci.",
-  "dismissable_banner.public_timeline": "Ce sont les posts publics les plus récents de personnes sur le web social que les gens sur {domain} suivent.",
+  "dismissable_banner.public_timeline": "Il s'agit des messages publics les plus récents publiés par des gens sur le web social et que les utilisateurs de {domain} suivent.",
   "domain_block_modal.block": "Bloquer le serveur",
   "domain_block_modal.block_account_instead": "Bloquer @{name} à la place",
   "domain_block_modal.they_can_interact_with_old_posts": "Les personnes de ce serveur peuvent interagir avec vos anciennes publications.",
@@ -298,6 +300,7 @@
   "filter_modal.select_filter.subtitle": "Utilisez une catégorie existante ou en créer une nouvelle",
   "filter_modal.select_filter.title": "Filtrer ce message",
   "filter_modal.title.status": "Filtrer un message",
+  "filter_warning.matches_filter": "Correspond au filtre « {title} »",
   "filtered_notifications_banner.title": "Notifications filtrées",
   "firehose.all": "Tout",
   "firehose.local": "Ce serveur",
@@ -307,6 +310,7 @@
   "follow_requests.unlocked_explanation": "Même si votre compte n’est pas privé, l’équipe de {domain} a pensé que vous pourriez vouloir consulter manuellement les demandes de suivi de ces comptes.",
   "follow_suggestions.curated_suggestion": "Choix du staff",
   "follow_suggestions.dismiss": "Ne plus afficher",
+  "follow_suggestions.friends_of_friends_longer": "Populaire dans le cercle des personnes que vous suivez",
   "follow_suggestions.hints.featured": "Ce profil a été sélectionné par l'équipe de {domain}.",
   "follow_suggestions.hints.friends_of_friends": "Ce profil est populaire parmi les personnes que vous suivez.",
   "follow_suggestions.hints.most_followed": "Ce profil est l'un des plus suivis sur {domain}.",
@@ -315,6 +319,7 @@
   "follow_suggestions.personalized_suggestion": "Suggestion personnalisée",
   "follow_suggestions.popular_suggestion": "Suggestion populaire",
   "follow_suggestions.popular_suggestion_longer": "Populaire sur {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Similaire aux profils que vous avez dernièrement suivis",
   "follow_suggestions.view_all": "Tout afficher",
   "follow_suggestions.who_to_follow": "Qui suivre",
   "followed_tags": "Hashtags suivis",
@@ -343,8 +348,9 @@
   "hashtag.follow": "Suivre le hashtag",
   "hashtag.unfollow": "Ne plus suivre le hashtag",
   "hashtags.and_other": "…et {count, plural, other {# de plus}}",
+  "hints.profiles.see_more_followers": "Afficher plus d'abonné·e·s sur {domain}",
   "hints.profiles.see_more_posts": "Voir plus de messages sur {domain}",
-  "hints.threads.see_more": "Voir plus de réponses sur {domain}",
+  "hints.threads.see_more": "Afficher plus de réponses sur {domain}",
   "home.column_settings.show_reblogs": "Afficher les partages",
   "home.column_settings.show_replies": "Afficher les réponses",
   "home.hide_announcements": "Masquer les annonces",
@@ -412,6 +418,7 @@
   "limited_account_hint.action": "Afficher le profil quand même",
   "limited_account_hint.title": "Ce profil a été masqué par la modération de {domain}.",
   "link_preview.author": "Par {name}",
+  "link_preview.more_from_author": "Plus via {name}",
   "link_preview.shares": "{count, plural, one {{counter} message} other {{counter} messages}}",
   "lists.account.add": "Ajouter à la liste",
   "lists.account.remove": "Supprimer de la liste",
@@ -506,6 +513,8 @@
   "notifications.column_settings.admin.report": "Nouveaux signalements :",
   "notifications.column_settings.admin.sign_up": "Nouvelles inscriptions :",
   "notifications.column_settings.alert": "Notifications du navigateur",
+  "notifications.column_settings.beta.category": "Fonctionnalités expérimentales",
+  "notifications.column_settings.beta.grouping": "Grouper les notifications",
   "notifications.column_settings.favourite": "Favoris :",
   "notifications.column_settings.filter_bar.advanced": "Afficher toutes les catégories",
   "notifications.column_settings.filter_bar.category": "Barre de filtre rapide",
@@ -534,7 +543,10 @@
   "notifications.permission_denied": "Impossible d’activer les notifications de bureau car l’autorisation a été refusée.",
   "notifications.permission_denied_alert": "Les notifications de bureau ne peuvent pas être activées, car l’autorisation du navigateur a été refusée avant",
   "notifications.permission_required": "Les notifications de bureau ne sont pas disponibles car l’autorisation requise n’a pas été accordée.",
+  "notifications.policy.accept": "Accepter",
+  "notifications.policy.accept_hint": "Afficher dans les notifications",
   "notifications.policy.drop": "Ignorer",
+  "notifications.policy.drop_hint": "Expulser vers le vide, pour ne plus jamais les revoir",
   "notifications.policy.filter": "Filtrer",
   "notifications.policy.filter_limited_accounts_hint": "Limité par les modérateur·rice·s du serveur",
   "notifications.policy.filter_limited_accounts_title": "Comptes modérés",
@@ -669,7 +681,7 @@
   "report.thanks.title": "Vous ne voulez pas voir cela ?",
   "report.thanks.title_actionable": "Merci pour votre signalement, nous allons investiguer.",
   "report.unfollow": "Ne plus suivre @{name}",
-  "report.unfollow_explanation": "Vous suivez ce compte. Désabonnez-vous pour ne plus en voir les messages sur votre fil principal.",
+  "report.unfollow_explanation": "Vous êtes abonné à ce compte. Pour ne plus voir ses publications dans votre flux principal, retirez-le de votre liste d'abonnements.",
   "report_notification.attached_statuses": "{count, plural, one {{count} message lié} other {{count} messages liés}}",
   "report_notification.categories.legal": "Légal",
   "report_notification.categories.legal_sentence": "contenu illégal",
diff --git a/app/javascript/mastodon/locales/ga.json b/app/javascript/mastodon/locales/ga.json
index 440761649964f2..71577be95582bc 100644
--- a/app/javascript/mastodon/locales/ga.json
+++ b/app/javascript/mastodon/locales/ga.json
@@ -192,6 +192,8 @@
   "confirmations.unfollow.confirm": "Ná lean",
   "confirmations.unfollow.message": "An bhfuil tú cinnte gur mhaith leat {name} a dhíleanúint?",
   "confirmations.unfollow.title": "Dílean ​​an t-úsáideoir?",
+  "content_warning.hide": "Folaigh postáil",
+  "content_warning.show": "Taispeáin ar aon nós",
   "conversation.delete": "Scrios comhrá",
   "conversation.mark_as_read": "Marcáil mar léite",
   "conversation.open": "Féach ar comhrá",
@@ -299,6 +301,7 @@
   "filter_modal.select_filter.subtitle": "Bain úsáid as catagóir reatha nó cruthaigh ceann nua",
   "filter_modal.select_filter.title": "Déan scagadh ar an bpostáil seo",
   "filter_modal.title.status": "Déan scagadh ar phostáil",
+  "filter_warning.matches_filter": "Meaitseálann an scagaire “{title}”",
   "filtered_notifications_banner.pending_requests": "Ó {count, plural, =0 {duine ar bith} one {duine amháin} two {# daoine} few {# daoine} many {# daoine} other {# daoine}} b’fhéidir go bhfuil aithne agat orthu",
   "filtered_notifications_banner.title": "Fógraí scagtha",
   "firehose.all": "Gach",
@@ -348,6 +351,14 @@
   "hashtag.follow": "Lean haischlib",
   "hashtag.unfollow": "Ná lean haischlib",
   "hashtags.and_other": "agus {count, plural, one {} two {# níos} few {# níos} many {# níos} other {# níos}}",
+  "hints.profiles.followers_may_be_missing": "Seans go bhfuil leantóirí don phróifíl seo in easnamh.",
+  "hints.profiles.follows_may_be_missing": "Seans go bhfuil na nithe seo a leanas in easnamh ar an bpróifíl seo.",
+  "hints.profiles.posts_may_be_missing": "Seans go bhfuil roinnt postálacha ón bpróifíl seo in easnamh.",
+  "hints.profiles.see_more_followers": "Féach ar a thuilleadh leantóirí ar {domain}",
+  "hints.profiles.see_more_follows": "Féach tuilleadh seo a leanas ar {domain}",
+  "hints.profiles.see_more_posts": "Féach ar a thuilleadh postálacha ar {domain}",
+  "hints.threads.replies_may_be_missing": "Seans go bhfuil freagraí ó fhreastalaithe eile in easnamh.",
+  "hints.threads.see_more": "Féach ar a thuilleadh freagraí ar {domain}",
   "home.column_settings.show_reblogs": "Taispeáin moltaí",
   "home.column_settings.show_replies": "Taispeán freagraí",
   "home.hide_announcements": "Cuir fógraí i bhfolach",
@@ -487,9 +498,13 @@
   "notification.admin.report_statuses": "Thuairiscigh {name} {target} le haghaidh {category}",
   "notification.admin.report_statuses_other": "{name} tuairiscithe {target}",
   "notification.admin.sign_up": "Chláraigh {name}",
+  "notification.admin.sign_up.name_and_others": "{name} agus {count, plural, one {# duine eile} two {# daoine eile} few {# daoine eile} many {# daoine eile} other {# daoine eile}} a chláraigh",
   "notification.favourite": "Is fearr le {name} do phostáil",
+  "notification.favourite.name_and_others_with_link": "{name} agus <a>{count, plural, one {# duine eile} other {# daoine eile}}</a> thaitin le do phost",
   "notification.follow": "Lean {name} thú",
+  "notification.follow.name_and_others": "{name} agus {count, plural, one {# duine eile} other {# daoine eile}} a lean tú",
   "notification.follow_request": "D'iarr {name} ort do chuntas a leanúint",
+  "notification.follow_request.name_and_others": "{name} agus {count, plural, one {# duine eile} other {# daoine eile}} iarratas a dhéanamh chun tú a leanúint",
   "notification.label.mention": "Luaigh",
   "notification.label.private_mention": "Lua príobháideach",
   "notification.label.private_reply": "Freagra príobháideach",
@@ -507,6 +522,7 @@
   "notification.own_poll": "Tá do suirbhé críochnaithe",
   "notification.poll": "Tá deireadh le vótaíocht inar vótáil tú",
   "notification.reblog": "Mhol {name} do phostáil",
+  "notification.reblog.name_and_others_with_link": "{name} agus <a>{count, plural, one {# duine eile} other {# daoine eile}}</a> a chuir borradh faoi do phost",
   "notification.relationships_severance_event": "Cailleadh naisc le {name}",
   "notification.relationships_severance_event.account_suspension": "Chuir riarthóir ó {from} {target} ar fionraí, rud a chiallaíonn nach féidir leat nuashonruithe a fháil uathu a thuilleadh ná idirghníomhú leo.",
   "notification.relationships_severance_event.domain_block": "Chuir riarthóir ó {from} bac ar {target}, lena n-áirítear {followersCount} de do leantóirí agus {followingCount, plural, one {#cuntas} other {#cuntas}} leanann tú.",
@@ -515,7 +531,17 @@
   "notification.status": "Phostáil {name} díreach",
   "notification.update": "Chuir {name} postáil in eagar",
   "notification_requests.accept": "Glac",
+  "notification_requests.accept_multiple": "{count, plural, one {Glac le # iarratas…} other {Glac le # iarratais…}}",
+  "notification_requests.confirm_accept_multiple.button": "{count, plural, one {Glac le hIarratas} other {Glac le hIarratais}}",
+  "notification_requests.confirm_accept_multiple.message": "Tá tú ar tí glacadh le {count, plural, one {iarratas fógra amháin} other {# iarratas fógra}}. An bhfuil tú cinnte gur mian leat leanúint ar aghaidh?",
+  "notification_requests.confirm_accept_multiple.title": "Glac le hiarratais ar fhógra?",
+  "notification_requests.confirm_dismiss_multiple.button": "{count, plural, one {Dún iarratas} other {Dún iarratais}}",
+  "notification_requests.confirm_dismiss_multiple.message": "Tá tú ar tí iarratas fógra {count, plural, one {a hAon} other {#}} a dhúnadh. Ní bheidh tú in ann {count, plural, one {é} other {iad}} a fháil go héasca arís. An bhfuil tú cinnte gur mian leat leanúint ar aghaidh?",
+  "notification_requests.confirm_dismiss_multiple.title": "An bhfuil fonn ort iarratais ar fhógra a dhíbhe?",
   "notification_requests.dismiss": "Díbhe",
+  "notification_requests.dismiss_multiple": "{count, plural, one {Dún # iarratas…} other {Dún # iarratais…}}",
+  "notification_requests.edit_selection": "Cuir in eagar",
+  "notification_requests.exit_selection": "Déanta",
   "notification_requests.explainer_for_limited_account": "Scagadh fógraí ón gcuntas seo toisc go bhfuil an cuntas teoranta ag modhnóir.",
   "notification_requests.explainer_for_limited_remote_account": "Scagadh fógraí ón gcuntas seo toisc go bhfuil an cuntas nó a fhreastalaí teoranta ag modhnóir.",
   "notification_requests.maximize": "Uasmhéadaigh",
diff --git a/app/javascript/mastodon/locales/gd.json b/app/javascript/mastodon/locales/gd.json
index 8e6260b00fdf85..aecc26477c7317 100644
--- a/app/javascript/mastodon/locales/gd.json
+++ b/app/javascript/mastodon/locales/gd.json
@@ -192,6 +192,8 @@
   "confirmations.unfollow.confirm": "Na lean tuilleadh",
   "confirmations.unfollow.message": "A bheil thu cinnteach nach eil thu airson {name} a leantainn tuilleadh?",
   "confirmations.unfollow.title": "A bheil thu airson sgur de leantainn a chleachdaiche?",
+  "content_warning.hide": "Falaich am post",
+  "content_warning.show": "Seall e co-dhiù",
   "conversation.delete": "Sguab às an còmhradh",
   "conversation.mark_as_read": "Cuir comharra gun deach a leughadh",
   "conversation.open": "Seall an còmhradh",
@@ -299,6 +301,7 @@
   "filter_modal.select_filter.subtitle": "Cleachd roinn-seòrsa a tha ann no cruthaich tè ùr",
   "filter_modal.select_filter.title": "Criathraich am post seo",
   "filter_modal.title.status": "Criathraich post",
+  "filter_warning.matches_filter": "A’ maidseadh na criathraige “{title}”",
   "filtered_notifications_banner.pending_requests": "{count, plural, =0 {Chan eil gin ann} one {O # neach} two {O # neach} few {O # daoine} other {O # duine}} air a bheil thu eòlach ’s dòcha",
   "filtered_notifications_banner.title": "Brathan criathraichte",
   "firehose.all": "Na h-uile",
@@ -348,6 +351,14 @@
   "hashtag.follow": "Lean an taga hais",
   "hashtag.unfollow": "Na lean an taga hais tuilleadh",
   "hashtags.and_other": "…agus {count, plural, one {# eile} two {# eile} few {# eile} other {# eile}}",
+  "hints.profiles.followers_may_be_missing": "Dh’fhaoidte gu bheil cuid dhen luchd-leantainn na pròifil seo a dhìth.",
+  "hints.profiles.follows_may_be_missing": "Dh’fhaoidte gu bheil cuid a tha a’ phròifil seo a’ leantainn a dhìth.",
+  "hints.profiles.posts_may_be_missing": "Dh’fhaoide gu bheil cuid dhe na postaichean aig a’ phròifil seo a dhìth.",
+  "hints.profiles.see_more_followers": "Faic barrachd luchd-leantainn air {domain}",
+  "hints.profiles.see_more_follows": "Faic barrachd a tha 'gan leantainn air {domain}",
+  "hints.profiles.see_more_posts": "Faic barrachd phostaichean air {domain}",
+  "hints.threads.replies_may_be_missing": "Dh’fhaoidte gu bheil freagairtean o fhrithealaichean eile a dhìth.",
+  "hints.threads.see_more": "Faic barrachd fhreagairtean air {domain}",
   "home.column_settings.show_reblogs": "Seall na brosnachaidhean",
   "home.column_settings.show_replies": "Seall na freagairtean",
   "home.hide_announcements": "Falaich na brathan-fios",
@@ -487,9 +498,13 @@
   "notification.admin.report_statuses": "Rinn {name} gearan mu {target} air adhbhar {category}",
   "notification.admin.report_statuses_other": "Rinn {name} gearan mu {target}",
   "notification.admin.sign_up": "Chlàraich {name}",
+  "notification.admin.sign_up.name_and_others": "Chlàraich {name} ’s {count, plural, one {# eile} two {# eile} few {# eile} other {# eile}}",
   "notification.favourite": "Is annsa le {name} am post agad",
+  "notification.favourite.name_and_others_with_link": "Is annsa le {name} ’s <a>{count, plural, one {# eile} two {# eile} few {# eile} other {# eile}}</a> am post agad",
   "notification.follow": "Tha {name} ’gad leantainn a-nis",
+  "notification.follow.name_and_others": "Lean {name} ’s {count, plural, one {# eile} two {# eile} few {# eile} other {# eile}} thu",
   "notification.follow_request": "Dh’iarr {name} ’gad leantainn",
+  "notification.follow_request.name_and_others": "Dh’iarr {name} ’s {count, plural, one {# eile} two {# eile} few {# eile} other {# eile}} ’gad leantainn",
   "notification.label.mention": "Iomradh",
   "notification.label.private_mention": "Iomradh prìobhaideach",
   "notification.label.private_reply": "Freagairt phrìobhaideach",
@@ -507,6 +522,7 @@
   "notification.own_poll": "Thàinig an cunntas-bheachd agad gu crìoch",
   "notification.poll": "Thàinig cunntas-bheachd sa bhòt thu gu crìoch",
   "notification.reblog": "Bhrosnaich {name} am post agad",
+  "notification.reblog.name_and_others_with_link": "Bhrosnaich {name} ’s <a>{count, plural, one {# eile} two {# eile} few {# eile} other {# eile}}</a> am post agad",
   "notification.relationships_severance_event": "Chaill thu dàimhean le {name}",
   "notification.relationships_severance_event.account_suspension": "Chuir rianaire aig {from} {target} à rèim agus is ciall dha sin nach fhaigh thu naidheachdan uapa ’s nach urrainn dhut conaltradh leotha.",
   "notification.relationships_severance_event.domain_block": "Bhac rianaire aig {from} {target}, a’ gabhail a-staigh {followersCount} dhen luchd-leantainn agad agus {followingCount, plural, one {# chunntas} two {# chunntas} few {# cunntasan} other {# cunntas}} a tha thu fhèin a’ leantainn.",
@@ -515,7 +531,17 @@
   "notification.status": "Phostaich {name} rud",
   "notification.update": "Dheasaich {name} post",
   "notification_requests.accept": "Gabh ris",
+  "notification_requests.accept_multiple": "{count, plural, one {Gabh ri # iarrtas…} two {Gabh ri # iarrtas…} few {Gabh ri # iarrtasan…} other {Gabh ri # iarrtas…}}",
+  "notification_requests.confirm_accept_multiple.button": "{count, plural, one {Gabh ris an t-iarrtas} two {Gabh ris na h-iarrtasan} few {Gabh ris na h-iarrtasan} other {Gabh ris na h-iarrtasan}}",
+  "notification_requests.confirm_accept_multiple.message": "Tha thu gu bhith gabhail ri {count, plural, one {# iarrtas bratha} two {# iarrtas bratha} few {# iarrtasan bratha} other {# iarrtas bratha}} a leigeil seachad. A bheil thu cinnteach gu bheil thu airson leantainn air adhart?",
+  "notification_requests.confirm_accept_multiple.title": "A bheil thu airson gabhail ri iarrtasan bratha?",
+  "notification_requests.confirm_dismiss_multiple.button": "{count, plural, one {Leig seachad an t-iarrtas} two {Leig seachad na h-iarrtasan} few {Leig seachad na h-iarrtasan} other {Leig seachad na h-iarrtasan}}",
+  "notification_requests.confirm_dismiss_multiple.message": "Tha thu gu bhith {count, plural, one {# iarrtas bratha} two {# iarrtas bratha} few {# iarrtasan bratha} other {# iarrtas bratha}} a leigeil seachad. Chan fhaigh thu grèim {count, plural, one {air} two {orra} few {orra} other {orra}} a-rithist gun duilgheadas. A bheil thu cinnteach gu bheil thu airson leantainn air adhart?",
+  "notification_requests.confirm_dismiss_multiple.title": "A bheil thu airson iarrtasan bratha a leigeil seachad?",
   "notification_requests.dismiss": "Leig seachad",
+  "notification_requests.dismiss_multiple": "{count, plural, one {Leig seachad # iarrtas…} two {Leig seachad # iarrtas…} few {Leig seachad # iarrtasan…} other {Leig seachad # iarrtas…}}",
+  "notification_requests.edit_selection": "Deasaich",
+  "notification_requests.exit_selection": "Deiseil",
   "notification_requests.explainer_for_limited_account": "Chaidh na brathan on chunntas seo a chriathradh on a chaidh an cunntas a chuingeachadh le maor.",
   "notification_requests.explainer_for_limited_remote_account": "Chaidh na brathan on chunntas seo a chriathradh on a chaidh an cunntas no am frithealaiche aige a chuingeachadh le maor.",
   "notification_requests.maximize": "Làn-mheudaich",
@@ -569,7 +595,7 @@
   "notifications.policy.filter_limited_accounts_title": "Cunntasan fo mhaorsainneachd",
   "notifications.policy.filter_new_accounts.hint": "A chaidh a chruthachadh o chionn {days, plural, one {# latha} two {# latha} few {# làithean} other {# latha}}",
   "notifications.policy.filter_new_accounts_title": "Cunntasan ùra",
-  "notifications.policy.filter_not_followers_hint": "A’ gabhail a-staigh an fheadhainn a lean ort nas lugha na {days, plural, one {# latha} two {# latha} few {# làithean} other {# latha}} seo chaidh",
+  "notifications.policy.filter_not_followers_hint": "A’ gabhail a-staigh an fheadhainn a lean thu nas lugha na {days, plural, one {# latha} two {# latha} few {# làithean} other {# latha}} seo chaidh",
   "notifications.policy.filter_not_followers_title": "Daoine nach eil gad leantainn",
   "notifications.policy.filter_not_following_hint": "Gus an aontaich thu riutha a làimh",
   "notifications.policy.filter_not_following_title": "Daoine nach eil thu a’ leantainn",
diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json
index 1d21e3bda733e2..3ccd9510809a41 100644
--- a/app/javascript/mastodon/locales/he.json
+++ b/app/javascript/mastodon/locales/he.json
@@ -192,6 +192,8 @@
   "confirmations.unfollow.confirm": "הפסקת מעקב",
   "confirmations.unfollow.message": "להפסיק מעקב אחרי {name}?",
   "confirmations.unfollow.title": "לבטל מעקב אחר המשתמש.ת?",
+  "content_warning.hide": "הסתרת חיצרוץ",
+  "content_warning.show": "להציג בכל זאת",
   "conversation.delete": "מחיקת שיחה",
   "conversation.mark_as_read": "סמן כנקרא",
   "conversation.open": "צפו בשיחה",
@@ -299,6 +301,7 @@
   "filter_modal.select_filter.subtitle": "שימוש בקטגורייה קיימת או יצירת אחת חדשה",
   "filter_modal.select_filter.title": "סינון ההודעה הזו",
   "filter_modal.title.status": "סנן הודעה",
+  "filter_warning.matches_filter": "תואם לסנן “{title}”",
   "filtered_notifications_banner.pending_requests": "{count, plural,=0 {אין בקשות ממשתמשים }one {בקשה אחת ממישהו/מישהי }two {יש בקשותיים ממשתמשים }other {יש # בקשות ממשתמשים }}שאולי מוכרים לך",
   "filtered_notifications_banner.title": "התראות מסוננות",
   "firehose.all": "הכל",
diff --git a/app/javascript/mastodon/locales/id.json b/app/javascript/mastodon/locales/id.json
index b46e25919900a8..29f0bfda9d331d 100644
--- a/app/javascript/mastodon/locales/id.json
+++ b/app/javascript/mastodon/locales/id.json
@@ -1,7 +1,7 @@
 {
   "about.blocks": "Server yang dimoderasi",
-  "about.contact": "Hubungi:",
-  "about.disclaimer": "Mastodon adalah perangkat lunak bebas dan sumber terbuka, dan adalah merek dagang dari Mastodon gGmbH.",
+  "about.contact": "Kontak:",
+  "about.disclaimer": "perangkat lunak sumber terbuperangkat lunak sumber terbukaka184124.",
   "about.domain_blocks.no_reason_available": "Alasan tidak tersedia",
   "about.domain_blocks.preamble": "Mastodon umumnya mengizinkan Anda untuk melihat konten dan berinteraksi dengan pengguna dari server lain di fediverse. Ini adalah pengecualian yang dibuat untuk beberapa server.",
   "about.domain_blocks.silenced.explanation": "Anda secara umum tidak melihat profil dan konten dari server ini, kecuali jika Anda mencarinya atau memilihnya dengan mengikuti secara eksplisit.",
@@ -11,6 +11,7 @@
   "about.not_available": "Informasi ini belum tersedia di server ini.",
   "about.powered_by": "Media sosial terdesentralisasi diberdayakan oleh {mastodon}",
   "about.rules": "Aturan server",
+  "account.account_note_header": "Personal note",
   "account.add_or_remove_from_list": "Tambah atau Hapus dari daftar",
   "account.badges.bot": "Bot",
   "account.badges.group": "Grup",
@@ -33,7 +34,9 @@
   "account.follow_back": "Ikuti balik",
   "account.followers": "Pengikut",
   "account.followers.empty": "Pengguna ini belum ada pengikut.",
+  "account.followers_counter": "{count, plural, other {{counter} followers}}",
   "account.following": "Mengikuti",
+  "account.following_counter": "{count, plural, other {{counter} following}}",
   "account.follows.empty": "Pengguna ini belum mengikuti siapa pun.",
   "account.go_to_profile": "Buka profil",
   "account.hide_reblogs": "Sembunyikan boosts dari @{name}",
@@ -59,6 +62,7 @@
   "account.requested_follow": "{name} ingin mengikuti Anda",
   "account.share": "Bagikan profil @{name}",
   "account.show_reblogs": "Tampilkan boost dari @{name}",
+  "account.statuses_counter": "{count, plural, other {{counter} posts}}",
   "account.unblock": "Buka blokir @{name}",
   "account.unblock_domain": "Buka blokir domain {domain}",
   "account.unblock_short": "Buka blokir",
@@ -166,21 +170,30 @@
   "confirmations.block.confirm": "Blokir",
   "confirmations.delete.confirm": "Hapus",
   "confirmations.delete.message": "Apakah Anda yakin untuk menghapus kiriman ini?",
+  "confirmations.delete.title": "Delete post?",
   "confirmations.delete_list.confirm": "Hapus",
   "confirmations.delete_list.message": "Apakah Anda yakin untuk menghapus daftar ini secara permanen?",
+  "confirmations.delete_list.title": "Delete list?",
   "confirmations.discard_edit_media.confirm": "Buang",
   "confirmations.discard_edit_media.message": "Anda belum menyimpan perubahan deskripsi atau pratinjau media, buang saja?",
   "confirmations.edit.confirm": "Ubah",
   "confirmations.edit.message": "Mengubah akan menimpa pesan yang sedang anda tulis. Apakah anda yakin ingin melanjutkan?",
+  "confirmations.edit.title": "Overwrite post?",
   "confirmations.logout.confirm": "Keluar",
   "confirmations.logout.message": "Apakah Anda yakin ingin keluar?",
+  "confirmations.logout.title": "Log out?",
   "confirmations.mute.confirm": "Bisukan",
   "confirmations.redraft.confirm": "Hapus dan susun ulang",
   "confirmations.redraft.message": "Apakah anda yakin ingin menghapus postingan ini dan menyusun ulang postingan ini? Favorit dan peningkatan akan hilang, dan balasan ke postingan asli tidak akan terhubung ke postingan manapun.",
+  "confirmations.redraft.title": "Delete & redraft post?",
   "confirmations.reply.confirm": "Balas",
   "confirmations.reply.message": "Membalas sekarang akan menimpa pesan yang sedang Anda buat. Anda yakin ingin melanjutkan?",
+  "confirmations.reply.title": "Delete & redraft post?",
   "confirmations.unfollow.confirm": "Berhenti mengikuti",
   "confirmations.unfollow.message": "Apakah Anda ingin berhenti mengikuti {name}?",
+  "confirmations.unfollow.title": "Unfollow user?",
+  "content_warning.hide": "Hide post",
+  "content_warning.show": "Show anyway",
   "conversation.delete": "Hapus percakapan",
   "conversation.mark_as_read": "Tandai sudah dibaca",
   "conversation.open": "Lihat percakapan",
@@ -217,7 +230,9 @@
   "domain_pill.username": "Nama pengguna",
   "domain_pill.whats_in_a_handle": "Apa itu nama pengguna?",
   "domain_pill.who_they_are": "Karena nama pengguna menunjukkan siapa seseorang dan di mana server mereka berada, anda dapat berinteraksi dengan orang-orang di seluruh web sosial  <button>ActivityPub-powered platforms</button>.",
+  "domain_pill.who_you_are": "<button>ActivityPub-powered platforms</button>.",
   "domain_pill.your_handle": "Nama pengguna anda:",
+  "domain_pill.your_server": "Your digital home, where all of your posts live. Don’t like this one? Transfer servers at any time and bring your followers, too.",
   "embed.instructions": "Sematkan kiriman ini di situs web Anda dengan menyalin kode di bawah ini.",
   "embed.preview": "Tampilan akan seperti ini nantinya:",
   "emoji_button.activity": "Aktivitas",
diff --git a/app/javascript/mastodon/locales/is.json b/app/javascript/mastodon/locales/is.json
index e4e21649ccdf5c..49b31755fa5ba9 100644
--- a/app/javascript/mastodon/locales/is.json
+++ b/app/javascript/mastodon/locales/is.json
@@ -436,7 +436,7 @@
   "lightbox.previous": "Fyrra",
   "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": "Eftir {name}",
+  "link_preview.author": "Frá {name}",
   "link_preview.more_from_author": "Meira frá {name}",
   "link_preview.shares": "{count, plural, one {{counter} færsla} other {{counter} færslur}}",
   "lists.account.add": "Bæta á lista",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index c23c2f87d50725..ee4ba949b97638 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -170,21 +170,30 @@
   "confirmations.block.confirm": "ブロック",
   "confirmations.delete.confirm": "削除",
   "confirmations.delete.message": "本当に削除しますか？",
+  "confirmations.delete.title": "投稿を削除しようとしています",
   "confirmations.delete_list.confirm": "削除",
   "confirmations.delete_list.message": "本当にこのリストを完全に削除しますか？",
+  "confirmations.delete_list.title": "リストを削除しようとしています",
   "confirmations.discard_edit_media.confirm": "破棄",
   "confirmations.discard_edit_media.message": "メディアの説明またはプレビューに保存されていない変更があります。それでも破棄しますか？",
   "confirmations.edit.confirm": "編集",
   "confirmations.edit.message": "今編集すると現在作成中のメッセージが上書きされます。本当に実行しますか？",
+  "confirmations.edit.title": "作成中の内容を上書きしようとしています",
   "confirmations.logout.confirm": "ログアウト",
   "confirmations.logout.message": "本当にログアウトしますか？",
+  "confirmations.logout.title": "ログアウトしようとしています",
   "confirmations.mute.confirm": "ミュート",
   "confirmations.redraft.confirm": "削除して下書きに戻す",
   "confirmations.redraft.message": "投稿を削除して下書きに戻します。この投稿へのお気に入り登録やブーストは失われ、返信は孤立することになります。よろしいですか？",
+  "confirmations.redraft.title": "投稿の削除と下書きの再作成",
   "confirmations.reply.confirm": "返信",
   "confirmations.reply.message": "今返信すると現在作成中のメッセージが上書きされます。本当に実行しますか？",
+  "confirmations.reply.title": "作成中の内容を上書きしようとしています",
   "confirmations.unfollow.confirm": "フォロー解除",
   "confirmations.unfollow.message": "本当に{name}さんのフォローを解除しますか？",
+  "confirmations.unfollow.title": "フォローを解除しようとしています",
+  "content_warning.hide": "投稿を隠す",
+  "content_warning.show": "承知の上で表示",
   "conversation.delete": "会話を削除",
   "conversation.mark_as_read": "既読にする",
   "conversation.open": "会話を表示",
@@ -292,6 +301,7 @@
   "filter_modal.select_filter.subtitle": "既存のカテゴリーを使用するか新規作成します",
   "filter_modal.select_filter.title": "この投稿をフィルターする",
   "filter_modal.title.status": "投稿をフィルターする",
+  "filter_warning.matches_filter": "フィルター「{title}」に一致する投稿です",
   "filtered_notifications_banner.pending_requests": "{count, plural,  =0 {すべて完了しました} other {#人の通知がブロックされています}}",
   "filtered_notifications_banner.title": "保留中の通知",
   "firehose.all": "すべて",
@@ -493,11 +503,14 @@
   "notification.update": "{name}さんが投稿を編集しました",
   "notification_requests.accept": "受け入れる",
   "notification_requests.dismiss": "無視",
+  "notification_requests.explainer_for_limited_account": "このアカウントはモデレーターにより制限が課されているため、このアカウントによる通知は保留されています",
+  "notification_requests.explainer_for_limited_remote_account": "このアカウントが所属するサーバーはモデレーターにより制限が課されているため、このアカウントによる通知は保留されています",
   "notification_requests.minimize_banner": "「保留中の通知」のバナーを最小化する",
   "notification_requests.notifications_from": "{name}からの通知",
   "notification_requests.title": "保留中の通知",
   "notifications.clear": "通知を消去",
   "notifications.clear_confirmation": "本当に通知を消去しますか？",
+  "notifications.clear_title": "通知を消去しようとしています",
   "notifications.column_settings.admin.report": "新しい通報:",
   "notifications.column_settings.admin.sign_up": "新規登録:",
   "notifications.column_settings.alert": "デスクトップ通知",
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index fe1b30c6cc8141..32a846308d890d 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -192,6 +192,8 @@
   "confirmations.unfollow.confirm": "팔로우 해제",
   "confirmations.unfollow.message": "정말로 {name} 님을 팔로우 해제하시겠습니까?",
   "confirmations.unfollow.title": "사용자를 언팔로우 할까요?",
+  "content_warning.hide": "게시물 숨기기",
+  "content_warning.show": "무시하고 보기",
   "conversation.delete": "대화 삭제",
   "conversation.mark_as_read": "읽은 상태로 표시",
   "conversation.open": "대화 보기",
@@ -299,6 +301,7 @@
   "filter_modal.select_filter.subtitle": "기존의 카테고리를 사용하거나 새로 하나를 만듧니다",
   "filter_modal.select_filter.title": "이 게시물을 필터",
   "filter_modal.title.status": "게시물 필터",
+  "filter_warning.matches_filter": "\"{title}\" 필터에 걸림",
   "filtered_notifications_banner.pending_requests": "알 수도 있는 {count, plural, =0 {0 명} one {한 명} other {# 명}}의 사람들로부터",
   "filtered_notifications_banner.title": "걸러진 알림",
   "firehose.all": "모두",
diff --git a/app/javascript/mastodon/locales/nn.json b/app/javascript/mastodon/locales/nn.json
index dd9fa5fd92cc33..9ceb6eda92b597 100644
--- a/app/javascript/mastodon/locales/nn.json
+++ b/app/javascript/mastodon/locales/nn.json
@@ -193,6 +193,7 @@
   "confirmations.unfollow.message": "Er du sikker på at du vil slutta å fylgja {name}?",
   "confirmations.unfollow.title": "Slutt å fylgja brukaren?",
   "content_warning.hide": "Gøym innlegg",
+  "content_warning.show": "Vis likevel",
   "conversation.delete": "Slett samtale",
   "conversation.mark_as_read": "Marker som lesen",
   "conversation.open": "Sjå samtale",
@@ -300,6 +301,7 @@
   "filter_modal.select_filter.subtitle": "Bruk ein eksisterande kategori eller opprett ein ny",
   "filter_modal.select_filter.title": "Filtrer dette innlegget",
   "filter_modal.title.status": "Filtrer eit innlegg",
+  "filter_warning.matches_filter": "Passar med filteret «{title}»",
   "filtered_notifications_banner.pending_requests": "Frå {count, plural, =0 {ingen} one {éin person} other {# personar}} du kanskje kjenner",
   "filtered_notifications_banner.title": "Filtrerte varslingar",
   "firehose.all": "Alle",
@@ -349,6 +351,14 @@
   "hashtag.follow": "Fylg emneknagg",
   "hashtag.unfollow": "Slutt å fylgje emneknaggen",
   "hashtags.and_other": "…og {count, plural, one {}other {# fleire}}",
+  "hints.profiles.followers_may_be_missing": "Kven som fylgjer denne profilen manglar kanskje.",
+  "hints.profiles.follows_may_be_missing": "Kven denne profilen fylgjer manglar kanskje.",
+  "hints.profiles.posts_may_be_missing": "Nokre innlegg frå denne profilen manglar kanskje.",
+  "hints.profiles.see_more_followers": "Sjå fleire fylgjarar på {domain}",
+  "hints.profiles.see_more_follows": "Sjå fleire fylgjer på {domain}",
+  "hints.profiles.see_more_posts": "Sjå fleire innlegg på {domain}",
+  "hints.threads.replies_may_be_missing": "Svar frå andre tenarar manglar kanskje.",
+  "hints.threads.see_more": "Sjå fleire svar på {domain}",
   "home.column_settings.show_reblogs": "Vis framhevingar",
   "home.column_settings.show_replies": "Vis svar",
   "home.hide_announcements": "Skjul kunngjeringar",
@@ -488,9 +498,13 @@
   "notification.admin.report_statuses": "{name} rapporterte {target} for {category}",
   "notification.admin.report_statuses_other": "{name} rapporterte {target}",
   "notification.admin.sign_up": "{name} er registrert",
+  "notification.admin.sign_up.name_and_others": "{name} og {count, plural, one {# annan} other {# andre}} vart med",
   "notification.favourite": "{name} markerte innlegget ditt som favoritt",
+  "notification.favourite.name_and_others_with_link": "{name} og <a>{count, plural, one {# annan} other {# andre}}</a> favorittmerka innlegget ditt",
   "notification.follow": "{name} fylgde deg",
+  "notification.follow.name_and_others": "{name} og {count, plural, one {# annan} other {# andre}} fylgde deg",
   "notification.follow_request": "{name} har bedt om å fylgja deg",
+  "notification.follow_request.name_and_others": "{name} og {count, plural, one {# annan} other {# andre}} har spurt om å fylgja deg",
   "notification.label.mention": "Omtale",
   "notification.label.private_mention": "Privat omtale",
   "notification.label.private_reply": "Privat svar",
@@ -508,6 +522,7 @@
   "notification.own_poll": "Rundspørjinga di er ferdig",
   "notification.poll": "Ei rundspørjing du røysta i er ferdig",
   "notification.reblog": "{name} framheva innlegget ditt",
+  "notification.reblog.name_and_others_with_link": "{name} og <a>{count, plural, one {# annan} other {# andre}}</a> framheva innlegget ditt",
   "notification.relationships_severance_event": "Tapte samband med {name}",
   "notification.relationships_severance_event.account_suspension": "Ein administrator på {from} har utvist {target}, som tyder at du ikkje lenger får oppdateringar frå dei eller kan samhandla med dei.",
   "notification.relationships_severance_event.domain_block": "Ein administrator på {from} har blokkert {target}, inkludert {followersCount} av fylgjarane dine og {followingCount, plural, one {# konto} other {# kontoar}} du fylgjer.",
@@ -516,7 +531,17 @@
   "notification.status": "{name} la nettopp ut",
   "notification.update": "{name} redigerte eit innlegg",
   "notification_requests.accept": "Godkjenn",
+  "notification_requests.accept_multiple": "{count, plural, one {Godta # førespurnad…} other {Godta # førespurnader…}}",
+  "notification_requests.confirm_accept_multiple.button": "{count, plural, one {Godta førespurnad} other {Godta førespurnader}}",
+  "notification_requests.confirm_accept_multiple.message": "Du er i ferd med å godta {count, plural, one {ein førespurnad om varsling} other {# førespurnader om varsling}}. Er du sikker på at du vil halda fram?",
+  "notification_requests.confirm_accept_multiple.title": "Godta førespurnader om varsling?",
+  "notification_requests.confirm_dismiss_multiple.button": "{count, plural, one {Avvis førespurnad} other {Avvis førespurnader}}",
+  "notification_requests.confirm_dismiss_multiple.message": "Du er i ferd med å avvisa {count, plural, one {ein førespurnad om varsel} other {# førespurnader om varsel}}. Det blir ikkje lett å få tilgang til {count, plural, one {han} other {dei}} att. Er du sikker på at du vil halda fram?",
+  "notification_requests.confirm_dismiss_multiple.title": "Avvis førespurnader om varsel?",
   "notification_requests.dismiss": "Avvis",
+  "notification_requests.dismiss_multiple": "{count, plural, one {Avvis # førespurnad…} other {Avvis # førespurnader…}}",
+  "notification_requests.edit_selection": "Rediger",
+  "notification_requests.exit_selection": "Ferdig",
   "notification_requests.explainer_for_limited_account": "Varsla frå denne kontoen er filtrerte ut fordi ein moderator har avgrensa kontoen.",
   "notification_requests.explainer_for_limited_remote_account": "Varla frå denne kontoen er filtrerte ut fordi ein moderator har avgrensa kontoen eller tenaren.",
   "notification_requests.maximize": "Maksimer",
diff --git a/app/javascript/mastodon/locales/sq.json b/app/javascript/mastodon/locales/sq.json
index 39abd13d95c84c..48f667086b663c 100644
--- a/app/javascript/mastodon/locales/sq.json
+++ b/app/javascript/mastodon/locales/sq.json
@@ -192,6 +192,8 @@
   "confirmations.unfollow.confirm": "Resht së ndjekuri",
   "confirmations.unfollow.message": "Jeni i sigurt se doni të mos ndiqet më {name}?",
   "confirmations.unfollow.title": "Të ndalet ndjekja e përdoruesit?",
+  "content_warning.hide": "Fshihe postimin",
+  "content_warning.show": "Shfaqe, sido qoftë",
   "conversation.delete": "Fshije bisedën",
   "conversation.mark_as_read": "Vëri shenjë si të lexuar",
   "conversation.open": "Shfaq bisedën",
@@ -299,6 +301,7 @@
   "filter_modal.select_filter.subtitle": "Përdorni një kategori ekzistuese, ose krijoni një të re",
   "filter_modal.select_filter.title": "Filtroje këtë postim",
   "filter_modal.title.status": "Filtroni një postim",
+  "filter_warning.matches_filter": "Ka përkim me filtrin “{title}”",
   "filtered_notifications_banner.pending_requests": "Nga {count, plural, =0 {askush} one {një person} other {# vetë}} që mund të njihni",
   "filtered_notifications_banner.title": "Njoftime të filtruar",
   "firehose.all": "Krejt",
diff --git a/app/javascript/mastodon/locales/sv.json b/app/javascript/mastodon/locales/sv.json
index a4a30fbbc58450..76b46f3425d0ff 100644
--- a/app/javascript/mastodon/locales/sv.json
+++ b/app/javascript/mastodon/locales/sv.json
@@ -192,6 +192,8 @@
   "confirmations.unfollow.confirm": "Avfölj",
   "confirmations.unfollow.message": "Är du säker på att du vill avfölja {name}?",
   "confirmations.unfollow.title": "Avfölj %s?",
+  "content_warning.hide": "Dölj inlägg",
+  "content_warning.show": "Visa ändå",
   "conversation.delete": "Radera konversation",
   "conversation.mark_as_read": "Markera som läst",
   "conversation.open": "Visa konversation",
diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json
index 9dbaa5a6cb7ca8..370b49e7e17cf8 100644
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@@ -192,6 +192,8 @@
   "confirmations.unfollow.confirm": "เลิกติดตาม",
   "confirmations.unfollow.message": "คุณแน่ใจหรือไม่ว่าต้องการเลิกติดตาม {name}?",
   "confirmations.unfollow.title": "เลิกติดตามผู้ใช้?",
+  "content_warning.hide": "ซ่อนโพสต์",
+  "content_warning.show": "แสดงต่อไป",
   "conversation.delete": "ลบการสนทนา",
   "conversation.mark_as_read": "ทำเครื่องหมายว่าอ่านแล้ว",
   "conversation.open": "ดูการสนทนา",
@@ -299,6 +301,7 @@
   "filter_modal.select_filter.subtitle": "ใช้หมวดหมู่ที่มีอยู่หรือสร้างหมวดหมู่ใหม่",
   "filter_modal.select_filter.title": "กรองโพสต์นี้",
   "filter_modal.title.status": "กรองโพสต์",
+  "filter_warning.matches_filter": "ตรงกับตัวกรอง “{title}”",
   "filtered_notifications_banner.pending_requests": "จาก {count, plural, =0 {ไม่มีใคร} other {# คน}} ที่คุณอาจรู้จัก",
   "filtered_notifications_banner.title": "การแจ้งเตือนที่กรองอยู่",
   "firehose.all": "ทั้งหมด",
@@ -348,6 +351,14 @@
   "hashtag.follow": "ติดตามแฮชแท็ก",
   "hashtag.unfollow": "เลิกติดตามแฮชแท็ก",
   "hashtags.and_other": "…และอีก {count, plural, other {# เพิ่มเติม}}",
+  "hints.profiles.followers_may_be_missing": "ผู้ติดตามสำหรับโปรไฟล์นี้อาจขาดหายไป",
+  "hints.profiles.follows_may_be_missing": "การติดตามสำหรับโปรไฟล์นี้อาจขาดหายไป",
+  "hints.profiles.posts_may_be_missing": "โพสต์บางส่วนจากโปรไฟล์นี้อาจขาดหายไป",
+  "hints.profiles.see_more_followers": "ดูผู้ติดตามเพิ่มเติมใน {domain}",
+  "hints.profiles.see_more_follows": "ดูการติดตามเพิ่มเติมใน {domain}",
+  "hints.profiles.see_more_posts": "ดูโพสต์เพิ่มเติมใน {domain}",
+  "hints.threads.replies_may_be_missing": "การตอบกลับจากเซิร์ฟเวอร์อื่น ๆ อาจขาดหายไป",
+  "hints.threads.see_more": "ดูการตอบกลับเพิ่มเติมใน {domain}",
   "home.column_settings.show_reblogs": "แสดงการดัน",
   "home.column_settings.show_replies": "แสดงการตอบกลับ",
   "home.hide_announcements": "ซ่อนประกาศ",
@@ -355,8 +366,11 @@
   "home.pending_critical_update.link": "ดูการอัปเดต",
   "home.pending_critical_update.title": "มีการอัปเดตความปลอดภัยสำคัญพร้อมใช้งาน!",
   "home.show_announcements": "แสดงประกาศ",
+  "ignore_notifications_modal.disclaimer": "Mastodon ไม่สามารถแจ้งผู้ใช้ว่าคุณได้เพิกเฉยการแจ้งเตือนของเขา การเพิกเฉยการแจ้งเตือนจะไม่หยุดการส่งข้อความนั้นเอง",
   "ignore_notifications_modal.filter_instead": "กรองแทน",
   "ignore_notifications_modal.filter_to_act_users": "คุณจะยังสามารถยอมรับ ปฏิเสธ หรือรายงานผู้ใช้",
+  "ignore_notifications_modal.filter_to_avoid_confusion": "การกรองช่วยหลีกเลี่ยงความสับสนที่อาจเกิดขึ้น",
+  "ignore_notifications_modal.filter_to_review_separately": "คุณสามารถตรวจทานการแจ้งเตือนที่กรองอยู่แยกต่างหาก",
   "ignore_notifications_modal.ignore": "เพิกเฉยการแจ้งเตือน",
   "ignore_notifications_modal.limited_accounts_title": "เพิกเฉยการแจ้งเตือนจากบัญชีที่ได้รับการกลั่นกรอง?",
   "ignore_notifications_modal.new_accounts_title": "เพิกเฉยการแจ้งเตือนจากบัญชีใหม่?",
@@ -484,9 +498,13 @@
   "notification.admin.report_statuses": "{name} ได้รายงาน {target} สำหรับ {category}",
   "notification.admin.report_statuses_other": "{name} ได้รายงาน {target}",
   "notification.admin.sign_up": "{name} ได้ลงทะเบียน",
+  "notification.admin.sign_up.name_and_others": "{name} และ {count, plural, other {# อื่น ๆ}} ได้ลงทะเบียน",
   "notification.favourite": "{name} ได้ชื่นชอบโพสต์ของคุณ",
+  "notification.favourite.name_and_others_with_link": "{name} และ <a>{count, plural, other {# อื่น ๆ}}</a> ได้ชื่นชอบโพสต์ของคุณ",
   "notification.follow": "{name} ได้ติดตามคุณ",
+  "notification.follow.name_and_others": "{name} และ {count, plural, other {# อื่น ๆ}} ได้ติดตามคุณ",
   "notification.follow_request": "{name} ได้ขอติดตามคุณ",
+  "notification.follow_request.name_and_others": "{name} และ {count, plural, other {# อื่น ๆ}} ได้ขอติดตามคุณ",
   "notification.label.mention": "การกล่าวถึง",
   "notification.label.private_mention": "การกล่าวถึงแบบส่วนตัว",
   "notification.label.private_reply": "การตอบกลับแบบส่วนตัว",
@@ -504,6 +522,7 @@
   "notification.own_poll": "การสำรวจความคิดเห็นของคุณได้สิ้นสุดแล้ว",
   "notification.poll": "การสำรวจความคิดเห็นที่คุณได้ลงคะแนนได้สิ้นสุดแล้ว",
   "notification.reblog": "{name} ได้ดันโพสต์ของคุณ",
+  "notification.reblog.name_and_others_with_link": "{name} และ <a>{count, plural, other {# อื่น ๆ}}</a> ได้ดันโพสต์ของคุณ",
   "notification.relationships_severance_event": "สูญเสียการเชื่อมต่อกับ {name}",
   "notification.relationships_severance_event.account_suspension": "ผู้ดูแลจาก {from} ได้ระงับ {target} ซึ่งหมายความว่าคุณจะไม่สามารถรับการอัปเดตจากเขาหรือโต้ตอบกับเขาได้อีกต่อไป",
   "notification.relationships_severance_event.domain_block": "ผู้ดูแลจาก {from} ได้ปิดกั้น {target} รวมถึง {followersCount} ผู้ติดตามของคุณและ {followingCount, plural, other {# บัญชี}}ที่คุณติดตาม",
@@ -512,7 +531,21 @@
   "notification.status": "{name} เพิ่งโพสต์",
   "notification.update": "{name} ได้แก้ไขโพสต์",
   "notification_requests.accept": "ยอมรับ",
+  "notification_requests.accept_multiple": "{count, plural, other {ยอมรับ # คำขอ…}}",
+  "notification_requests.confirm_accept_multiple.button": "{count, plural, other {ยอมรับคำขอ}}",
+  "notification_requests.confirm_accept_multiple.message": "คุณกำลังจะยอมรับ {count, plural, other {# คำขอการแจ้งเตือน}} คุณแน่ใจหรือไม่ว่าต้องการดำเนินการต่อ?",
+  "notification_requests.confirm_accept_multiple.title": "ยอมรับคำขอการแจ้งเตือน?",
+  "notification_requests.confirm_dismiss_multiple.button": "{count, plural, other {ปิดคำขอ}}",
+  "notification_requests.confirm_dismiss_multiple.message": "คุณกำลังจะปิด {count, plural, other {# คำขอการแจ้งเตือน}} คุณจะไม่สามารถเข้าถึง{count, plural, other {การแจ้งเตือน}}ได้อย่างง่ายดายอีกครั้ง คุณแน่ใจหรือไม่ว่าต้องการดำเนินการต่อ?",
+  "notification_requests.confirm_dismiss_multiple.title": "ปิดคำขอการแจ้งเตือน?",
   "notification_requests.dismiss": "ปิด",
+  "notification_requests.dismiss_multiple": "{count, plural, other {ปิด # คำขอ…}}",
+  "notification_requests.edit_selection": "แก้ไข",
+  "notification_requests.exit_selection": "เสร็จสิ้น",
+  "notification_requests.explainer_for_limited_account": "มีการกรองการแจ้งเตือนจากบัญชีนี้เนื่องจากมีการจำกัดบัญชีโดยผู้กลั่นกรอง",
+  "notification_requests.explainer_for_limited_remote_account": "มีการกรองการแจ้งเตือนจากบัญชีนี้เนื่องจากมีการจำกัดบัญชีหรือเซิร์ฟเวอร์ของบัญชีโดยผู้กลั่นกรอง",
+  "notification_requests.maximize": "ขยายใหญ่สุด",
+  "notification_requests.minimize_banner": "ย่อแบนเนอร์การแจ้งเตือนที่กรองอยู่ให้เล็กสุด",
   "notification_requests.notifications_from": "การแจ้งเตือนจาก {name}",
   "notification_requests.title": "การแจ้งเตือนที่กรองอยู่",
   "notification_requests.view": "ดูการแจ้งเตือน",
@@ -555,8 +588,10 @@
   "notifications.policy.accept": "ยอมรับ",
   "notifications.policy.accept_hint": "แสดงในการแจ้งเตือน",
   "notifications.policy.drop": "เพิกเฉย",
+  "notifications.policy.drop_hint": "ละทิ้งอย่างถาวร ไม่ให้เห็นอีกเลย",
   "notifications.policy.filter": "กรอง",
   "notifications.policy.filter_hint": "ส่งไปยังกล่องขาเข้าการแจ้งเตือนที่กรองอยู่",
+  "notifications.policy.filter_limited_accounts_hint": "จำกัดโดยผู้กลั่นกรองเซิร์ฟเวอร์",
   "notifications.policy.filter_limited_accounts_title": "บัญชีที่ได้รับการกลั่นกรอง",
   "notifications.policy.filter_new_accounts.hint": "สร้างขึ้นภายใน {days, plural, other {# วัน}}ที่ผ่านมา",
   "notifications.policy.filter_new_accounts_title": "บัญชีใหม่",
@@ -606,7 +641,7 @@
   "onboarding.steps.share_profile.title": "แชร์โปรไฟล์ Mastodon ของคุณ",
   "onboarding.tips.2fa": "<strong>คุณทราบหรือไม่?</strong> คุณสามารถรักษาความปลอดภัยบัญชีของคุณได้โดยตั้งค่าการรับรองความถูกต้องด้วยสองปัจจัยในการตั้งค่าบัญชีของคุณ การรับรองความถูกต้องด้วยสองปัจจัยทำงานร่วมกับแอป TOTP ใด ๆ ที่คุณเลือก ไม่จำเป็นต้องมีหมายเลขโทรศัพท์!",
   "onboarding.tips.accounts_from_other_servers": "<strong>คุณทราบหรือไม่?</strong> เนื่องจาก Mastodon เป็นแบบกระจายศูนย์ โปรไฟล์บางส่วนที่คุณเจอจะได้รับการโฮสต์ในเซิร์ฟเวอร์อื่น ๆ ที่ไม่ใช่ของคุณ และคุณยังสามารถโต้ตอบกับเขาได้อย่างไร้รอยต่อ! เซิร์ฟเวอร์ของเขาอยู่ในครึ่งหลังของชื่อผู้ใช้ของเขา!",
-  "onboarding.tips.migration": "<strong>คุณทราบหรือไม่?</strong> หากคุณรู้สึกว่า {domain} ไม่ใช่ตัวเลือกเซิร์ฟเวอร์ที่ยอดเยี่ยมสำหรับคุณในอนาคต คุณสามารถย้ายไปยังเซิร์ฟเวอร์ Mastodon อื่นได้โดยไม่สูญเสียผู้ติดตามของคุณ คุณยังสามารถโฮสต์เซิร์ฟเวอร์ของคุณเอง!",
+  "onboarding.tips.migration": "<strong>คุณทราบหรือไม่?</strong> หากคุณรู้สึกว่า {domain} ไม่ใช่ตัวเลือกเซิร์ฟเวอร์ที่ยอดเยี่ยมสำหรับคุณในอนาคต คุณสามารถย้ายไปยังเซิร์ฟเวอร์ Mastodon อื่นได้โดยไม่สูญเสียผู้ติดตามของคุณ คุณยังสามารถโฮสต์เซิร์ฟเวอร์ของคุณเองได้อีกด้วย!",
   "onboarding.tips.verification": "<strong>คุณทราบหรือไม่?</strong> คุณสามารถยืนยันบัญชีของคุณได้โดยใส่ลิงก์ไปยังโปรไฟล์ Mastodon ของคุณในเว็บไซต์ของคุณเองและเพิ่มเว็บไซต์ไปยังโปรไฟล์ของคุณ ไม่จำเป็นต้องมีค่าธรรมเนียมหรือเอกสาร!",
   "password_confirmation.exceeds_maxlength": "การยืนยันรหัสผ่านเกินความยาวรหัสผ่านสูงสุดแล้ว",
   "password_confirmation.mismatching": "การยืนยันรหัสผ่านไม่ตรงกัน",
diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json
index 23a25a7299d24b..c80be8ab4ca31f 100644
--- a/app/javascript/mastodon/locales/tr.json
+++ b/app/javascript/mastodon/locales/tr.json
@@ -192,6 +192,8 @@
   "confirmations.unfollow.confirm": "Takibi bırak",
   "confirmations.unfollow.message": "{name} adlı kullanıcıyı takibi bırakmak istediğinden emin misin?",
   "confirmations.unfollow.title": "Kullanıcıyı takipten çık?",
+  "content_warning.hide": "Gönderiyi gizle",
+  "content_warning.show": "Yine de göster",
   "conversation.delete": "Sohbeti sil",
   "conversation.mark_as_read": "Okundu olarak işaretle",
   "conversation.open": "Sohbeti görüntüle",
@@ -299,6 +301,7 @@
   "filter_modal.select_filter.subtitle": "Mevcut bir kategoriyi kullan veya yeni bir tane oluştur",
   "filter_modal.select_filter.title": "Bu gönderiyi süzgeçle",
   "filter_modal.title.status": "Bir gönderi süzgeçle",
+  "filter_warning.matches_filter": "“{title}” filtresiyle eşleşiyor",
   "filtered_notifications_banner.pending_requests": "Bildiğiniz {count, plural, =0 {hiç kimseden} one {bir kişiden} other {# kişiden}}",
   "filtered_notifications_banner.title": "Filtrelenmiş bildirimler",
   "firehose.all": "Tümü",
diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json
index 7f8b33594d7110..84ff487bdad8d1 100644
--- a/app/javascript/mastodon/locales/uk.json
+++ b/app/javascript/mastodon/locales/uk.json
@@ -192,6 +192,8 @@
   "confirmations.unfollow.confirm": "Відписатися",
   "confirmations.unfollow.message": "Ви впевнені, що хочете відписатися від {name}?",
   "confirmations.unfollow.title": "Відписатися від користувача?",
+  "content_warning.hide": "Сховати допис",
+  "content_warning.show": "Усе одно показати",
   "conversation.delete": "Видалити бесіду",
   "conversation.mark_as_read": "Позначити як прочитане",
   "conversation.open": "Переглянути бесіду",
@@ -299,6 +301,7 @@
   "filter_modal.select_filter.subtitle": "Використати наявну категорію або створити нову",
   "filter_modal.select_filter.title": "Фільтрувати цей допис",
   "filter_modal.title.status": "Фільтрувати допис",
+  "filter_warning.matches_filter": "Збігається з фільтром “{title}”",
   "filtered_notifications_banner.pending_requests": "Від {count, plural, =0 {жодної особи} one {однієї особи} few {# осіб} many {# осіб} other {# особи}}, котрих ви можете знати",
   "filtered_notifications_banner.title": "Відфільтровані сповіщення",
   "firehose.all": "Всі",
diff --git a/app/javascript/mastodon/locales/vi.json b/app/javascript/mastodon/locales/vi.json
index a0c28db77e5105..962984f1003073 100644
--- a/app/javascript/mastodon/locales/vi.json
+++ b/app/javascript/mastodon/locales/vi.json
@@ -192,6 +192,8 @@
   "confirmations.unfollow.confirm": "Bỏ theo dõi",
   "confirmations.unfollow.message": "Bạn thật sự muốn bỏ theo dõi {name}?",
   "confirmations.unfollow.title": "Bỏ theo dõi?",
+  "content_warning.hide": "Ẩn tút",
+  "content_warning.show": "Nhấn để xem",
   "conversation.delete": "Xóa tin nhắn này",
   "conversation.mark_as_read": "Đánh dấu là đã đọc",
   "conversation.open": "Xem toàn bộ tin nhắn",
@@ -299,6 +301,7 @@
   "filter_modal.select_filter.subtitle": "Sử dụng một danh mục hiện có hoặc tạo một danh mục mới",
   "filter_modal.select_filter.title": "Lọc tút này",
   "filter_modal.title.status": "Lọc một tút",
+  "filter_warning.matches_filter": "Khớp bộ lọc “{title}”",
   "filtered_notifications_banner.pending_requests": "Từ {count, plural, =0 {không ai} other {# người}} bạn có thể biết",
   "filtered_notifications_banner.title": "Thông báo đã lọc",
   "firehose.all": "Toàn bộ",
diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json
index 44608c60719502..aab806ec8e984f 100644
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@@ -192,6 +192,8 @@
   "confirmations.unfollow.confirm": "取消关注",
   "confirmations.unfollow.message": "你确定要取消关注 {name} 吗？",
   "confirmations.unfollow.title": "是否取消关注用户？",
+  "content_warning.hide": "隐藏嘟文",
+  "content_warning.show": "仍然显示",
   "conversation.delete": "删除对话",
   "conversation.mark_as_read": "标记为已读",
   "conversation.open": "查看对话",
@@ -299,6 +301,7 @@
   "filter_modal.select_filter.subtitle": "使用一个已存在类别，或创建一个新类别",
   "filter_modal.select_filter.title": "过滤此嘟文",
   "filter_modal.title.status": "过滤一条嘟文",
+  "filter_warning.matches_filter": "命中过滤规则 “{title}”",
   "filtered_notifications_banner.pending_requests": "来自你可能认识的 {count, plural, =0 {0 个人} other {# 个人}}",
   "filtered_notifications_banner.title": "通知（已过滤）",
   "firehose.all": "全部",
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 18dede8fbf453c..027d80215d18a0 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -286,6 +286,7 @@ ar:
       filter_by_action: تصفية بحسب الإجراء
       filter_by_user: تصفية حسب المستخدم
       title: سِجلّ التفتيش و المعاينة
+      unavailable_instance: "(اسم النطاق غير متوفر)"
     announcements:
       destroyed_msg: تم حذف الإعلان بنجاح!
       edit:
@@ -990,6 +991,7 @@ ar:
       delete: حذف
       edit_preset: تعديل نموذج التحذير
       empty: لم تحدد أي إعدادات تحذير مسبقة بعد.
+      title: نماذج التحذير
     webhooks:
       add_new: إضافة نقطة نهاية
       delete: حذف
diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index 73b35bf8bf045d..492eb8af7ec10e 100644
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@@ -954,6 +954,7 @@ cy:
       name: Enw
       newest: Mwyaf newydd
       oldest: Hynaf
+      open: Gweld yn gyhoeddus
       reset: Ailosod
       review: Adolygu statws
       search: Chwilio
diff --git a/config/locales/devise.ro.yml b/config/locales/devise.ro.yml
index 868bb4b3a19401..40cb6a7581b833 100644
--- a/config/locales/devise.ro.yml
+++ b/config/locales/devise.ro.yml
@@ -9,9 +9,10 @@ ro:
       already_authenticated: Ești deja conectat.
       inactive: Contul tău nu este încă activat.
       invalid: "%{authentication_keys} sau parolă greșită."
-      last_attempt: Mai ai încă o încercare înainte de a bloca contul.
+      last_attempt: Mai ai încă o încercare înainte ca contul tău să fie blocat.
       locked: Contul tău este blocat.
       not_found_in_database: "%{authentication_keys} sau parolă greșită."
+      omniauth_user_creation_failure: Eroare la crearea unui cont pentru această identitate.
       pending: Contul tău este încă în curs de revizuire.
       timeout: Sesiunea ta a expirat. Te rugăm să te conectezi din nou pentru a continua.
       unauthenticated: Trebuie să te conectezi sau să te înregistrezi înainte de a continua.
@@ -20,7 +21,7 @@ ro:
       confirmation_instructions:
         action: Verifică adresa de e-mail
         action_with_app: Confirmați și reveniți la %{app}
-        explanation: Ai creat un cont pe %{host} cu această adresă de e-mail. Ești la un click distanță de a o activa. Dacă nu ai fost tu, ignoră acest e-mail.
+        explanation: Ai creat un cont pe %{host} cu această adresă de e-mail. Ești la un clic distanță de a-l activa. Dacă nu ai fost tu, ignoră acest e-mail.
         explanation_when_pending: Ai solicitat o invitație către %{host} cu această adresă de e-mail. Odată ce îți confirmi adresa de e-mail, îți vom revizui cererea. Te poți autentifica pentru a-ți schimba detaliile sau pentru a-ți șterge contul, dar nu poți accesa majoritatea funcțiilor până când contul tău nu este aprobat. Dacă cererea ta este respinsă, datele tale vor fi șterse, astfel încât nu va fi necesară nicio altă acțiune din partea ta. Dacă nu ai fost tu, ignoră acest e-mail.
         extra_html: Te rugăm să verifici și <a href="%{terms_path}">regulile serverului</a> și <a href="%{policy_path}">termenii noștri de serviciu</a>.
         subject: 'Mastodon: Instrucțiuni de confirmare pentru %{instance}'
@@ -28,12 +29,12 @@ ro:
       email_changed:
         explanation: 'Adresa de e-mail pentru contul tău este schimbată la:'
         extra: Dacă nu v-ați schimbat adresa de e-mail, probabil că cineva a obținut acces la contul dvs. Te rugăm să îți schimbi parola imediat sau să contactezi administratorul serverului dacă nu ai acces la contul tău.
-        subject: E-mail schimbat
+        subject: 'Mastodon: E-mail schimbat'
         title: Noua adresa de e-mail
       password_change:
         explanation: Parola contului tău a fost schimbată.
         extra: Dacă nu v-ați schimbat parola, este posibil ca cineva să fi obținut acces la contul dvs. Te rugăm să îți schimbi parola imediat sau să contactezi administratorul serverului dacă nu ai acces la contul tău.
-        subject: Parolă schimbată
+        subject: 'Mastodon: Parolă schimbată'
         title: Parolă schimbată
       reconfirmation_instructions:
         explanation: Confirmă noua adresă pentru a schimba adresa de e-mail.
@@ -44,25 +45,25 @@ ro:
         action: Schimbă parola
         explanation: Ați solicitat o nouă parolă pentru contul dvs.
         extra: Dacă nu ați solicitat acest lucru, ignorați acest e-mail. Parola dvs. nu se va schimba până când nu veți accesa link-ul de mai sus și nu veți crea unul nou.
-        subject: Instrucțiuni pentru resetarea parolei
+        subject: 'Mastodon: Instrucțiuni pentru resetarea parolei'
         title: Resetare parolă
       two_factor_disabled:
         explanation: Conectarea este acum posibilă folosind doar adresa de e-mail și parola.
-        subject: Autentificare cu doi factori dezactivată
+        subject: 'Mastodon: Autentificare cu doi factori dezactivată'
         subtitle: Autentificarea cu doi factori pentru contul dvs. a fost dezactivată.
-        title: 2FA dezactivat
+        title: A2F dezactivată
       two_factor_enabled:
         explanation: Pentru autentificare va fi necesar un token generat de aplicația TOTP asociată.
-        subject: Autentificare în doi pași activată
+        subject: 'Mastodon: Autentificare în doi pași activată'
         subtitle: Autentificarea cu doi factori a fost activată pentru contul dvs.
-        title: 2FA activat
+        title: A2F activată
       two_factor_recovery_codes_changed:
-        explanation: Codurile anterioare de recuperare au fost invalidate și unele noi generate.
-        subject: Recuperare în doi factori
+        explanation: Codurile de recuperare anterioare au fost invalidate și s-au generat altele noi.
+        subject: 'Mastodon: Coduri de recuperare în doi pași regenerate'
         subtitle: Codurile de recuperare anterioare au fost invalidate și s-au generat altele noi.
-        title: Coduri de recuperare 2FA modificate
+        title: Codurile de recuperare în doi pași au fost modificate
       unlock_instructions:
-        subject: Instrucțiuni de deblocare
+        subject: 'Mastodon: Instrucțiuni de deblocare'
       webauthn_credential:
         added:
           explanation: Următoarea cheie de securitate a fost adăugată în contul tău
@@ -80,7 +81,7 @@ ro:
       webauthn_enabled:
         explanation: Autentificarea cu cheie de securitate a fost activată pentru contul dvs.
         extra: Cheia ta de securitate poate fi acum folosită pentru conectare.
-        subject: 'Mastodon: Autentificarea cheii de securitate activată'
+        subject: 'Mastodon: Autentificarea prin chei de securitate activată'
         title: Chei de securitate activate
     omniauth_callbacks:
       failure: Nu te-am putut autentifica de la %{kind} deoarece "%{reason}".
@@ -97,7 +98,7 @@ ro:
       signed_up_but_inactive: V-ați înregistrat cu succes. Cu toate acestea, nu vă putem conecta deoarece contul dvs. nu este încă activat.
       signed_up_but_locked: V-ați înregistrat cu succes. Cu toate acestea, nu vă putem conecta deoarece contul dvs. este blocat.
       signed_up_but_pending: Un mesaj cu un link de confirmare a fost trimis la adresa ta de e-mail. După ce faceți clic pe link, vă vom revizui cererea. Veți fi notificat dacă este aprobat.
-      signed_up_but_unconfirmed: Un mesaj cu un link de confirmare a fost trimis la adresa ta de e-mail. Vă rugăm să urmaţi link-ul pentru a vă activa contul. Vă rugăm să verificaţi folderul spam dacă nu aţi primit acest e-mail.
+      signed_up_but_unconfirmed: Un mesaj cu un link de confirmare a fost trimis la adresa ta de e-mail. Vă rugăm să urmați link-ul pentru a vă activa contul. Vă rugăm să verificați folderul spam dacă nu ați primit acest e-mail.
       update_needs_confirmation: Ți-ai actualizat contul cu succes, dar trebuie să verificăm noua ta adresă de e-mail. Vă rugăm să verificați adresa de e-mail și să urmați link-ul de confirmare pentru a confirma noua dvs. adresă de e-mail. Te rugăm să verifici dosarul spam dacă nu ai primit acest e-mail.
       updated: Contul dvs. a fost actualizat cu succes.
     sessions:
@@ -105,7 +106,7 @@ ro:
       signed_in: Conectat cu succes.
       signed_out: Deconectat cu succes.
     unlocks:
-      send_instructions: Veţi primi un e-mail cu instrucţiuni despre cum să vă deblocaţi contul în câteva minute. Te rugăm să verifici dosarul spam dacă nu ai primit acest e-mail.
+      send_instructions: Veți primi un e-mail cu instrucțiuni despre cum să vă deblocați contul în câteva minute. Te rugăm să verifici dosarul spam dacă nu ai primit acest e-mail.
       send_paranoid_instructions: Dacă contul tău există, vei primi un e-mail cu instrucțiuni pentru cum să-l deblochezi în câteva minute. Te rugăm să verifici dosarul spam dacă nu ai primit acest e-mail.
       unlocked: Contul tău a fost deblocat cu succes. Te rugăm să te autentifici pentru a continua.
   errors:
@@ -118,4 +119,4 @@ ro:
       not_saved:
         few: "%{count} erori au împiedicat salvarea acestui %{resource}:"
         one: 'O eroare a împiedicat salvarea acestui %{resource}:'
-        other: "%{count} de erori au împiedicat salvarea acestui %{resource}:"
+        other: "%{count} erori au împiedicat salvarea acestui %{resource}:"
diff --git a/config/locales/doorkeeper.lt.yml b/config/locales/doorkeeper.lt.yml
index ccdf8668484702..9b3b6558a42b1c 100644
--- a/config/locales/doorkeeper.lt.yml
+++ b/config/locales/doorkeeper.lt.yml
@@ -35,24 +35,24 @@ lt:
         redirect_uri: Naudok po vieną eilutę kiekvienam URI.
         scopes: Atskirk aprėptis tarpais. Palik tuščią, jei nori naudoti numatytąsias aprėtis.
       index:
-        application: Programėlė
+        application: Programa
         callback_url: Atgalinis URL
         delete: Ištrinti
-        empty: Neturi jokių programėlių.
+        empty: Neturi jokių programų.
         name: Pavadinimas
-        new: Nauja programėlė
+        new: Nauja programa
         scopes: Aprėptys
         show: Rodyti
-        title: Tavo programėlės
+        title: Tavo programos
       new:
-        title: Nauja programėlė
+        title: Nauja programa
       show:
         actions: Veiksmai
-        application_id: Kliento raktas
-        callback_urls: Atgalinių URL adresų
+        application_id: Kliento programos raktas
+        callback_urls: Atgalinių URL
         scopes: Aprėptys
-        secret: Kliento paslaptis
-        title: 'Programėlė: %{name}'
+        secret: Kliento programos paslaptis
+        title: 'Programa: %{name}'
     authorizations:
       buttons:
         authorize: Leisti
@@ -60,48 +60,48 @@ lt:
       error:
         title: Įvyko klaida.
       new:
-        prompt_html: "%{client_name} norėtų gauti leidimą prieigos prie tavo paskyros. Tai trečiosios šalies programėlė. <strong>Jei ja nepasitiki, neturėtum leisti.</strong>"
+        prompt_html: "%{client_name} norėtų gauti leidimą pasiekti tavo paskyrą. Tai – trečiosios šalies programa. <strong>Jei ja nepasitiki, tada neturėtum leisti.</strong>"
         review_permissions: Peržiūrėti leidimus
-        title: Reikalingas leidimas
+        title: Privalomas leidimas
       show:
-        title: Nukopijuok šį tapatybės patvirtinimo kodą ir įklijuok jį į programėlę.
+        title: Nukopijuok šį leidimo kodą ir įklijuok jį į programą.
     authorized_applications:
       buttons:
         revoke: Naikinti
       confirmations:
         revoke: Ar esi įsitikinęs (-usi)?
       index:
-        authorized_at: Įgaliota %{date}
-        description_html: Tai programėlės, kurios gali pasiekti tavo paskyrą naudojant API. Jei čia yra programėlių, kurių neatpažįsti, arba jei programėlė elgiasi netinkamai, gali panaikinti jos prieigą.
+        authorized_at: Leidžiama %{date}
+        description_html: Tai – programos, kurios gali pasiekti tavo paskyrą naudojant API. Jei čia yra programų, kurių neatpažįsti, arba jei programa elgiasi netinkamai, gali panaikinti jos prieigą.
         last_used_at: Paskutinį kartą naudota %{date}
-        never_used: Niekada nenaudotas
+        never_used: Niekada nenaudota
         scopes: Leidimai
         superapp: Vidinis
-        title: Tavo leidžiamos programėlės
+        title: Tavo leidžiamos programos
     errors:
       messages:
-        access_denied: Išteklių savininkas (-ė) arba įgaliojimų serveris atmetė užklausą.
+        access_denied: Išteklių savininkas (-ė) arba leidžiamų serveris atmetė užklausą.
         credential_flow_not_configured: Išteklių savininko slaptažodžio kredencialų srautas nepavyko, nes Doorkeeper.configure.resource_owner_from_credentials nėra nesukonfigūruotas.
-        invalid_client: Kliento tapatybės nustatymas nepavyko dėl nežinomo kliento, neįtraukto kliento tapatybės nustatymo arba nepalaikomo tapatybės nustatymo metodo.
-        invalid_code_challenge_method: Kodo iššūkio būdas turi būti S256. Paprastas nepalaikomas.
-        invalid_grant: Pateiktas įgaliojimas yra netinkamas, pasibaigęs, panaikintas, neatitinka įgaliojimo užklausoje naudoto nukreipimo URI arba buvo išduotas kitam klientui.
-        invalid_redirect_uri: Nukreipimo uri įtrauktas yra netinkamas.
+        invalid_client: Kliento programos tapatybės nustatymas nepavyko dėl nežinomo kliento programos, neįtraukto kliento programos tapatybės nustatymo arba nepalaikomo tapatybės nustatymo metodo.
+        invalid_code_challenge_method: Kodo iššūkio metodas turi būti S256. Paprastas nepalaikomas.
+        invalid_grant: Pateiktas leidimo suteikimas yra netinkamas, nebegaliojantis, panaikintas, neatitinka leidimo užklausoje naudoto nukreipimo URI arba buvo išduotas kitam kliento programui.
+        invalid_redirect_uri: Įtrauktas nukreipimo URI netinkamas.
         invalid_request:
           missing_param: 'Trūksta privalomo parametro: %{value}.'
-          request_not_authorized: Užklausą reikia įgalioti. Reikalingo parametro užklausai įgalioti trūksta arba jis netinkamas.
-          unknown: Užklausoje trūksta privalomo parametro, turi nepalaikomą parametro reikšmę arba yra kitaip netinkamai suformuota.
-        invalid_resource_owner: Pateikti išteklių savininko įgaliojimai yra netinkami arba išteklių savininko negalima surasti.
+          request_not_authorized: Užklausą reikia leisti. Trūksta privalomo parametro užklausai leisti arba jis netinkamas.
+          unknown: Užklausai trūksta privalomo parametro, įtraukta nepalaikoma parametro reikšmė arba ji yra kitaip netaisyklingas.
+        invalid_resource_owner: Pateikti išteklių savininko kredencialai yra netinkami arba išteklių savininko negalima surasti.
         invalid_scope: Užklausos aprėptis yra netinkama, nežinoma arba netaisyklingas.
         invalid_token:
-          expired: Baigėsi prieigos rakto galiojimas.
+          expired: Prieigos raktas nebegalioja.
           revoked: Prieigos raktas buvo panaikintas.
-          unknown: Prieigos raktas yra netinkamas.
-        resource_owner_authenticator_not_configured: Išteklių savininko suradimas nepavyko dėl to, kad Doorkeeper.configure.resource_owner_authenticator nėra sukonfigūruotas.
-        server_error: Įgaliojimų serveris susidūrė su netikėta sąlyga, dėl kurios negalėjo užpildyti užklausos.
+          unknown: Prieigos raktas netinkamas.
+        resource_owner_authenticator_not_configured: Išteklių savininko suradimas nepavyko, nes Doorkeeper.configure.resource_owner_authenticator nėra sukonfigūruotas.
+        server_error: Leidimo serveris susidūrė su netikėta sąlyga, dėl kurios negalėjo užpildyti užklausos.
         temporarily_unavailable: Įgaliojimų serveris šiuo metu negali apdoroti užklausos dėl laikinos serverio perkrovos arba techninės priežiūros.
-        unauthorized_client: Klientas nėra įgaliotas atlikti šią užklausą šiuo metodu.
-        unsupported_grant_type: Įgaliojimų suteikimo tipas nepalaikomas įgaliojimų serveryje.
-        unsupported_response_type: Įgaliojimų serveris nepalaiko šio atsako tipo.
+        unauthorized_client: Klientas nėra leidžiamas atlikti šią užklausą šiuo metodu.
+        unsupported_grant_type: Leidimo suteikimo tipas nepalaikomas leidimo serveryje.
+        unsupported_response_type: Leidimo serveris nepalaiko šio atsakymo tipo.
     flash:
       applications:
         create:
@@ -123,7 +123,7 @@ lt:
         admin/accounts: Paskyrų administravimas
         admin/all: Visi administraciniai funkcijos
         admin/reports: Ataskaitų administravimas
-        all: Pilna prieiga prie tavo Mastodon paskyros
+        all: Pilna prieiga prie tavo „Mastodon“ paskyros
         blocks: Blokavimai
         bookmarks: Žymės
         conversations: Pokalbiai
@@ -136,7 +136,7 @@ lt:
         media: Medijos priedai
         mutes: Nutildymai
         notifications: Pranešimai
-        profile: Tavo Mastodon profilis
+        profile: Tavo „Mastodon“ profilis
         push: Tiesioginiai pranešimai
         reports: Ataskaitos
         search: Paieška
@@ -151,25 +151,25 @@ lt:
     scopes:
       admin:read: skaityti visus duomenis serveryje
       admin:read:accounts: skaityti slaptą visų paskyrų informaciją
-      admin:read:canonical_email_blocks: skaityti slaptą visų kanoninių el. laiško blokavimų informaciją
-      admin:read:domain_allows: skaityti slaptą visų domeno leidimus informaciją
-      admin:read:domain_blocks: skaityti slaptą visų domeno blokavimų informaciją
-      admin:read:email_domain_blocks: skaityti slaptą visų el. laiško domeno blokavimų informaciją
+      admin:read:canonical_email_blocks: skaityti slaptą visų kanoninių el. laiškų blokavimų informaciją
+      admin:read:domain_allows: skaityti slaptą visų serverių leidžiamų informaciją
+      admin:read:domain_blocks: skaityti slaptą visų serverių blokavimų informaciją
+      admin:read:email_domain_blocks: skaityti slaptą visų el. laiškų serverių blokavimų informaciją
       admin:read:ip_blocks: skaityti slaptą visų IP blokavimų informaciją
       admin:read:reports: skaityti slaptą visų ataskaitų ir praneštų paskyrų informaciją
       admin:write: modifikuoti visus duomenis serveryje
       admin:write:accounts: atlikti paskyrų prižiūrėjimo veiksmus
-      admin:write:canonical_email_blocks: atlikti kanoninių el. laiško blokavimų prižiūrėjimo veiksmus
-      admin:write:domain_allows: atlikti domeno leidimų prižiūrėjimo veiksmus
-      admin:write:domain_blocks: atlikti domeno blokavimų prižiūrėjimo veiksmus
-      admin:write:email_domain_blocks: atlikti el. laiško domenų blokavimų prižiūrėjimo veiksmus
+      admin:write:canonical_email_blocks: atlikti kanoninių el. laiškų blokavimų prižiūrėjimo veiksmus
+      admin:write:domain_allows: atlikti serverio leidžiamų prižiūrėjimo veiksmus
+      admin:write:domain_blocks: atlikti serverio blokavimų prižiūrėjimo veiksmus
+      admin:write:email_domain_blocks: atlikti el. laiškų serverių blokavimų prižiūrėjimo veiksmus
       admin:write:ip_blocks: atlikti IP blokavimų prižiūrėjimo veiksmus
       admin:write:reports: atlikti ataskaitų prižiūrėjimo veiksmus
       crypto: naudoti visapusį šifravimą
       follow: modifikuoti paskyros sąryšius
       profile: skaityti tik tavo paskyros profilio informaciją
       push: gauti tiesioginius pranešimus
-      read: skaityti visus paskyros duomenis
+      read: skaityti visus tavo paskyros duomenis
       read:accounts: matyti paskyrų informaciją
       read:blocks: matyti tavo blokavimus
       read:bookmarks: matyti tavo žymes
diff --git a/config/locales/es-AR.yml b/config/locales/es-AR.yml
index 21836e79f1cb71..b0882e0a27ab47 100644
--- a/config/locales/es-AR.yml
+++ b/config/locales/es-AR.yml
@@ -898,6 +898,7 @@ es-AR:
       name: Nombre
       newest: Lo más reciente
       oldest: Lo más antiguo
+      open: Ver públicamente
       reset: Restablecer
       review: Estado de revisión
       search: Buscar
diff --git a/config/locales/es-MX.yml b/config/locales/es-MX.yml
index 61f4a6c16711f3..9df6a784de95a1 100644
--- a/config/locales/es-MX.yml
+++ b/config/locales/es-MX.yml
@@ -898,6 +898,7 @@ es-MX:
       name: Nombre
       newest: Más reciente
       oldest: Menos reciente
+      open: Ver públicamente
       reset: Reiniciar
       review: Estado de revisión
       search: Buscar
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 883a95371721e8..dc52d8113d2e4c 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -898,6 +898,7 @@ es:
       name: Nombre
       newest: Más reciente
       oldest: Menos reciente
+      open: Ver públicamente
       reset: Reiniciar
       review: Estado de revisión
       search: Buscar
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 38c9ca299ad71f..0f2d24772037ae 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -1203,7 +1203,7 @@ fr:
     add_new: Ajouter un nouveau hashtag
     errors:
       limit: Vous avez déjà mis en avant le nombre maximum de hashtags
-    hint_html: "<strong>Que sont les hashtags mis en avant ?</strong> Ils sont affichés en évidence sur votre profil public et permettent aux gens de parcourir vos messages publics qui utilisent ces hashtags. Ils sont un excellent outil pour garder la trace d’activités créatrices ou de projets de long terme."
+    hint_html: "<strong>Mettez en évidence vos hashtags les plus importants sur votre profil.</strong> Un outil idéal pour suivre vos travaux créatifs et vos projets à long terme, les hashtags mis en avant sont affichés bien en évidence sur votre profil et permettent un accès rapide à vos propres publications."
   filters:
     contexts:
       account: Profils
diff --git a/config/locales/ga.yml b/config/locales/ga.yml
index 9d4d281f4fa646..27237bf3a42794 100644
--- a/config/locales/ga.yml
+++ b/config/locales/ga.yml
@@ -940,6 +940,7 @@ ga:
       name: Ainm
       newest: Is nuaí
       oldest: Is sine
+      open: Amharc go Poiblí
       reset: Athshocraigh
       review: Stádas athbhreithnithe
       search: Cuardach
diff --git a/config/locales/gd.yml b/config/locales/gd.yml
index 9592a86c6572a5..ef4add838e75b0 100644
--- a/config/locales/gd.yml
+++ b/config/locales/gd.yml
@@ -926,6 +926,7 @@ gd:
       name: Ainm
       newest: As ùire
       oldest: As sine
+      open: Seall gu poblach
       reset: Ath-shuidhich
       review: Dèan lèirmheas air an staid
       search: Lorg
diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index a845c1fbb64998..90b3d216c3bae6 100644
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -898,6 +898,7 @@ nn:
       name: Namn
       newest: Nyaste
       oldest: Eldste
+      open: Vis offentleg
       reset: Nullstill
       review: Sjå gjennom status
       search: Søk
diff --git a/config/locales/th.yml b/config/locales/th.yml
index efa142fed3ce20..7f90c3bc940c29 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -872,16 +872,19 @@ th:
         message_html: "<strong>ที่เก็บข้อมูลวัตถุของคุณกำหนดค่าไม่ถูกต้อง ความเป็นส่วนตัวของผู้ใช้ของคุณตกอยู่ในความเสี่ยง</strong>"
     tags:
       moderation:
+        not_trendable: ไม่สามารถขึ้นแนวโน้มได้
         not_usable: ไม่สามารถใช้งานได้
         pending_review: การตรวจทานที่รอดำเนินการ
         review_requested: ต้องการการตรวจทาน
         reviewed: ตรวจทานแล้ว
         title: สถานะ
+        trendable: ขึ้นแนวโน้มได้
         unreviewed: ไม่ได้รับการตรวจทาน
         usable: ใช้งานได้
       name: ชื่อ
       newest: ใหม่ที่สุด
       oldest: เก่าที่สุด
+      open: ดูแบบสาธารณะ
       reset: รีเซ็ต
       review: สถานะการตรวจทาน
       search: ค้นหา
@@ -1904,7 +1907,7 @@ th:
     seamless_external_login: คุณได้เข้าสู่ระบบผ่านบริการภายนอก ดังนั้นการตั้งค่ารหัสผ่านและอีเมลจึงไม่พร้อมใช้งาน
     signed_in_as: 'ลงชื่อเข้าเป็น:'
   verification:
-    extra_instructions_html: <strong>เคล็ดลับ:</strong> ลิงก์ในเว็บไซต์ของคุณสามารถเป็นแบบมองไม่เห็น ส่วนที่สำคัญคือ <code>rel="me"</code> ซึ่งป้องกันการแอบอ้างในเว็บไซต์ที่มีเนื้อหาที่ผู้ใช้สร้างขึ้น คุณยังสามารถใช้แท็ก <code>link</code> ในส่วนหัวของหน้าแทนที่จะเป็น <code>a</code> แต่ HTML ต้องเข้าถึงได้โดยไม่มีการประมวลผล JavaScript
+    extra_instructions_html: <strong>เคล็ดลับ:</strong> ลิงก์ในเว็บไซต์ของคุณสามารถเป็นแบบมองไม่เห็น ส่วนที่สำคัญคือ <code>rel="me"</code> ซึ่งป้องกันการแอบอ้างในเว็บไซต์ที่มีเนื้อหาที่ผู้ใช้สร้างขึ้น คุณยังสามารถใช้แท็ก <code>link</code> ในส่วนหัวของหน้าแทนที่จะเป็น <code>a</code> ได้อีกด้วย แต่ HTML ต้องเข้าถึงได้โดยไม่มีการประมวลผล JavaScript
     here_is_how: นี่คือวิธี
     hint_html: "<strong>การยืนยันตัวตนของคุณใน Mastodon มีไว้สำหรับทุกคน</strong> โดยอิงตามมาตรฐานเว็บแบบเปิด ฟรีตอนนี้และตลอดไป ทั้งหมดที่คุณจำเป็นต้องมีคือเว็บไซต์ส่วนบุคคลที่ผู้คนรู้จักคุณ เมื่อคุณเชื่อมโยงไปยังเว็บไซต์นี้จากโปรไฟล์ของคุณ เราจะตรวจสอบว่าเว็บไซต์เชื่อมโยงกลับไปยังโปรไฟล์ของคุณและแสดงตัวบ่งชี้ที่มองเห็นได้ในโปรไฟล์"
     instructions_html: คัดลอกแล้ววางโค้ดด้านล่างลงใน HTML ของเว็บไซต์ของคุณ จากนั้นเพิ่มที่อยู่ของเว็บไซต์ของคุณลงในหนึ่งในช่องพิเศษในโปรไฟล์ของคุณจากแท็บ "แก้ไขโปรไฟล์" และบันทึกการเปลี่ยนแปลง
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 35b55583a06aac..9b3d2a1d756c33 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -884,6 +884,7 @@ vi:
       name: Tên
       newest: Mới nhất
       oldest: Cũ nhất
+      open: Xem công khai
       reset: Đặt lại
       review: Phê duyệt
       search: Tìm kiếm
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 36b62e535d9fda..c31a68926eed40 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -884,6 +884,7 @@ zh-CN:
       name: 名称
       newest: 最新
       oldest: 最早
+      open: 以公开身份查看
       reset: 重置
       review: 审核状态
       search: 搜索

From a6906e045b3b73627ee09e26e5fa1f7659f78938 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 26 Aug 2024 09:34:01 +0200
Subject: [PATCH 1949/2191] Update devDependencies (non-major) (#31587)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index e1e36d207eddef..5fa8feaa38973e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3365,18 +3365,17 @@ __metadata:
   linkType: hard
 
 "@testing-library/jest-dom@npm:^6.0.0":
-  version: 6.4.8
-  resolution: "@testing-library/jest-dom@npm:6.4.8"
+  version: 6.5.0
+  resolution: "@testing-library/jest-dom@npm:6.5.0"
   dependencies:
     "@adobe/css-tools": "npm:^4.4.0"
-    "@babel/runtime": "npm:^7.9.2"
     aria-query: "npm:^5.0.0"
     chalk: "npm:^3.0.0"
     css.escape: "npm:^1.5.1"
     dom-accessibility-api: "npm:^0.6.3"
     lodash: "npm:^4.17.21"
     redent: "npm:^3.0.0"
-  checksum: 10c0/8eececcac1ec7728c038b9d9eabfc8b8dcf4dc1e997c959450bff16d946e3344275862b84bfe0e1d1beb3817368e782464816aca47ab5c94f0ebf66db71df55d
+  checksum: 10c0/fd5936a547f04608d8de15a7de3ae26516f21023f8f45169b10c8c8847015fd20ec259b7309f08aa1031bcbc37c6e5e6f532d1bb85ef8f91bad654193ec66a4c
   languageName: node
   linkType: hard
 
@@ -9510,11 +9509,11 @@ __metadata:
   linkType: hard
 
 "husky@npm:^9.0.11":
-  version: 9.1.4
-  resolution: "husky@npm:9.1.4"
+  version: 9.1.5
+  resolution: "husky@npm:9.1.5"
   bin:
     husky: bin.js
-  checksum: 10c0/f5185003bef9ad9ec3f40e821963e4c12409b993fdcab89e3d660bed7d8c9d8bfd399f05222e27e0ead6589601fb1bb08d1a589c51751a4ab0547ead3429b8de
+  checksum: 10c0/f42efb95a026303eb880898760f802d88409780dd72f17781d2dfc302177d4f80b641cf1f1694f53f6d97c536c7397684133d8c8fe4a4426f7460186a7d1c6b8
   languageName: node
   linkType: hard
 

From 5bcfe8d4213a9e890971dc06ce32e45541491fb5 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 26 Aug 2024 09:34:16 +0200
Subject: [PATCH 1950/2191] Update dependency @types/react to v18.3.4 (#31586)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 5fa8feaa38973e..fa2caa8b60ca58 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3917,12 +3917,12 @@ __metadata:
   linkType: hard
 
 "@types/react@npm:*, @types/react@npm:16 || 17 || 18, @types/react@npm:>=16.9.11, @types/react@npm:^18.2.7":
-  version: 18.3.3
-  resolution: "@types/react@npm:18.3.3"
+  version: 18.3.4
+  resolution: "@types/react@npm:18.3.4"
   dependencies:
     "@types/prop-types": "npm:*"
     csstype: "npm:^3.0.2"
-  checksum: 10c0/fe455f805c5da13b89964c3d68060cebd43e73ec15001a68b34634604a78140e6fc202f3f61679b9d809dde6d7a7c2cb3ed51e0fd1462557911db09879b55114
+  checksum: 10c0/5c52e1e6f540cff21e3c2a5212066d02e005f6fb21e4a536a29097fae878db9f407cd7a4b43778f51359349c5f692e08bc77ddb5f5cecbfca9ca4d4e3c91a48e
   languageName: node
   linkType: hard
 

From bcc4b1078cf44515ef1b4193b004cb94ecfd288c Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 26 Aug 2024 03:35:07 -0400
Subject: [PATCH 1951/2191] Fix `Rails/RootPathnameMethods` cop (#31582)

---
 db/seeds.rb             | 2 +-
 lib/tasks/branding.rake | 2 +-
 lib/tasks/icons.rake    | 2 +-
 lib/tasks/repo.rake     | 2 +-
 spec/rails_helper.rb    | 2 +-
 spec/spec_helper.rb     | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/db/seeds.rb b/db/seeds.rb
index 370790e5139549..9d25ef0a4e0ad1 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 Chewy.strategy(:mastodon) do
-  Dir[Rails.root.join('db', 'seeds', '*.rb')].each do |seed|
+  Rails.root.glob('db/seeds/*.rb').each do |seed|
     load seed
   end
 end
diff --git a/lib/tasks/branding.rake b/lib/tasks/branding.rake
index be72454ce29eea..1e2af1b44629c1 100644
--- a/lib/tasks/branding.rake
+++ b/lib/tasks/branding.rake
@@ -15,7 +15,7 @@ namespace :branding do
     output_dest  = Rails.root.join('app', 'javascript', 'images', 'mailer')
 
     # Displayed size is 64px, at 3x it's 192px
-    Dir[Rails.root.join('app', 'javascript', 'images', 'icons', '*.svg')].each do |path|
+    Rails.root.glob('app/javascript/images/icons/*.svg').each do |path|
       rsvg_convert.run(input: path, size: 192, output: output_dest.join("#{File.basename(path, '.svg')}.png"))
     end
 
diff --git a/lib/tasks/icons.rake b/lib/tasks/icons.rake
index 374ea149fee388..96e0a143150584 100644
--- a/lib/tasks/icons.rake
+++ b/lib/tasks/icons.rake
@@ -20,7 +20,7 @@ end
 def find_used_icons
   icons_by_weight_and_size = {}
 
-  Dir[Rails.root.join('app', 'javascript', '**', '*.*s*')].map do |path|
+  Rails.root.glob('app/javascript/**/*.*s*').map do |path|
     File.open(path, 'r') do |file|
       pattern = %r{\Aimport .* from '@/material-icons/(?<weight>[0-9]+)-(?<size>[0-9]+)px/(?<icon>[^-]*)(?<fill>-fill)?.svg\?react';}
       file.each_line do |line|
diff --git a/lib/tasks/repo.rake b/lib/tasks/repo.rake
index b90b48934eeee0..539c44273f4a3a 100644
--- a/lib/tasks/repo.rake
+++ b/lib/tasks/repo.rake
@@ -98,7 +98,7 @@ namespace :repo do
     missing_yaml_files = I18n.available_locales.reject { |locale| Rails.root.join('config', 'locales', "#{locale}.yml").exist? }
     missing_json_files = I18n.available_locales.reject { |locale| Rails.root.join('app', 'javascript', 'mastodon', 'locales', "#{locale}.json").exist? }
 
-    locales_in_files = Dir[Rails.root.join('config', 'locales', '*.yml')].map do |path|
+    locales_in_files = Rails.root.glob('config/locales/*.yml').map do |path|
       file_name = File.basename(path, '.yml')
       file_name.gsub(/\A(doorkeeper|devise|activerecord|simple_form)\./, '').to_sym
     end.uniq.compact
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index d4b9bddf93f12a..9af2d1e337e512 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -44,7 +44,7 @@
 require 'email_spec/rspec'
 require 'test_prof/recipes/rspec/before_all'
 
-Dir[Rails.root.join('spec', 'support', '**', '*.rb')].each { |f| require f }
+Rails.root.glob('spec/support/**/*.rb').each { |f| require f }
 
 ActiveRecord::Migration.maintain_test_schema!
 WebMock.disable_net_connect!(
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 1f9cc40f12afd4..496ebfd09d2267 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -28,7 +28,7 @@
   end
 
   config.after :suite do
-    FileUtils.rm_rf(Dir[Rails.root.join('spec', 'test_files')])
+    FileUtils.rm_rf(Rails.root.glob('spec/test_files'))
   end
 
   # Use the GitHub Annotations formatter for CI

From a6df12530397f046d9c7c787bf497a0c7606a453 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 26 Aug 2024 03:35:33 -0400
Subject: [PATCH 1952/2191] Fix `Rails/CompactBlank` cop (#31581)

---
 app/helpers/application_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 2799ceecb5949d..f1c77d40eb4c87 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -86,7 +86,7 @@ def locale_direction
   def html_title
     safe_join(
       [content_for(:page_title).to_s.chomp, title]
-      .select(&:present?),
+      .compact_blank,
       ' - '
     )
   end

From 4cc589e53351a939e10887faf791ae84b15850d8 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 26 Aug 2024 07:35:53 +0000
Subject: [PATCH 1953/2191] Update dependency jsdom to v24.1.3 (#31577)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index fa2caa8b60ca58..c354b95720dcf0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -11061,8 +11061,8 @@ __metadata:
   linkType: hard
 
 "jsdom@npm:^24.0.0":
-  version: 24.1.1
-  resolution: "jsdom@npm:24.1.1"
+  version: 24.1.3
+  resolution: "jsdom@npm:24.1.3"
   dependencies:
     cssstyle: "npm:^4.0.1"
     data-urls: "npm:^5.0.0"
@@ -11090,7 +11090,7 @@ __metadata:
   peerDependenciesMeta:
     canvas:
       optional: true
-  checksum: 10c0/02d6bfe32f09f26329c0e53ad9f9883a3c671fc1f75725167d2089ca412f5b7ca85ff8aa62327d1cc6fc70ffbb3b18dfc7642c4b2096c2c8b19aaf9a48473eb3
+  checksum: 10c0/e48b342afacd7418a23dac204a62deea729c50f4d072a7c04c09fd32355fdb4335f8779fa79fd0277a2dbeb2d356250a950955719d00047324b251233b11277f
   languageName: node
   linkType: hard
 

From f9f4006a1b0a388bf2fadfe8949f5df30aab6ecd Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Mon, 26 Aug 2024 09:51:21 +0200
Subject: [PATCH 1954/2191] Update `omniauth-rails_csrf_protection` (#31552)

---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 34469db2041b3c..3c5ffc21afa3ef 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -432,7 +432,7 @@ GEM
     mime-types-data (3.2024.0702)
     mini_mime (1.1.5)
     mini_portile2 (2.8.7)
-    minitest (5.24.1)
+    minitest (5.25.1)
     msgpack (1.7.2)
     multi_json (1.15.0)
     multipart-post (2.4.0)
@@ -466,7 +466,7 @@ GEM
       addressable (~> 2.8)
       nokogiri (~> 1.12)
       omniauth (~> 2.1)
-    omniauth-rails_csrf_protection (1.0.1)
+    omniauth-rails_csrf_protection (1.0.2)
       actionpack (>= 4.2)
       omniauth (~> 2.0)
     omniauth-saml (2.1.0)

From c245a2044ecf5418b8010e3e8340a5899db38cf3 Mon Sep 17 00:00:00 2001
From: Emelia Smith <ThisIsMissEm@users.noreply.github.com>
Date: Mon, 26 Aug 2024 10:08:21 +0200
Subject: [PATCH 1955/2191] Streaming: Refactor to use metrics.$name instead of
 destructuring (#31566)

---
 streaming/index.js   | 53 ++++++++++++++++----------------------------
 streaming/metrics.js | 17 ++++++++++++--
 2 files changed, 34 insertions(+), 36 deletions(-)

diff --git a/streaming/index.js b/streaming/index.js
index 8f66362178a2c2..2267c469c00362 100644
--- a/streaming/index.js
+++ b/streaming/index.js
@@ -292,6 +292,9 @@ const CHANNEL_NAMES = [
 
 const startServer = async () => {
   const pgPool = new pg.Pool(pgConfigFromEnv(process.env));
+
+  const metrics = setupMetrics(CHANNEL_NAMES, pgPool);
+
   const server = http.createServer();
   const wss = new WebSocketServer({ noServer: true });
 
@@ -388,16 +391,6 @@ const startServer = async () => {
   const redisClient = await createRedisClient(redisConfig);
   const { redisPrefix } = redisConfig;
 
-  const metrics = setupMetrics(CHANNEL_NAMES, pgPool);
-  // TODO: migrate all metrics to metrics.X.method() instead of just X.method()
-  const {
-    connectedClients,
-    connectedChannels,
-    redisSubscriptions,
-    redisMessagesReceived,
-    messagesSent,
-  } = metrics;
-
   // When checking metrics in the browser, the favicon is requested this
   // prevents the request from falling through to the API Router, which would
   // error for this endpoint:
@@ -408,15 +401,7 @@ const startServer = async () => {
     res.end('OK');
   });
 
-  app.get('/metrics', async (req, res) => {
-    try {
-      res.set('Content-Type', metrics.register.contentType);
-      res.end(await metrics.register.metrics());
-    } catch (ex) {
-      req.log.error(ex);
-      res.status(500).end();
-    }
-  });
+  app.get('/metrics', metrics.requestHandler);
 
   /**
    * @param {string[]} channels
@@ -443,7 +428,7 @@ const startServer = async () => {
    * @param {string} message
    */
   const onRedisMessage = (channel, message) => {
-    redisMessagesReceived.inc();
+    metrics.redisMessagesReceived.inc();
 
     const callbacks = subs[channel];
 
@@ -481,7 +466,7 @@ const startServer = async () => {
         if (err) {
           logger.error(`Error subscribing to ${channel}`);
         } else if (typeof count === 'number') {
-          redisSubscriptions.set(count);
+          metrics.redisSubscriptions.set(count);
         }
       });
     }
@@ -508,7 +493,7 @@ const startServer = async () => {
         if (err) {
           logger.error(`Error unsubscribing to ${channel}`);
         } else if (typeof count === 'number') {
-          redisSubscriptions.set(count);
+          metrics.redisSubscriptions.set(count);
         }
       });
       delete subs[channel];
@@ -688,13 +673,13 @@ const startServer = async () => {
       unsubscribe(`${redisPrefix}${accessTokenChannelId}`, listener);
       unsubscribe(`${redisPrefix}${systemChannelId}`, listener);
 
-      connectedChannels.labels({ type: 'eventsource', channel: 'system' }).dec(2);
+      metrics.connectedChannels.labels({ type: 'eventsource', channel: 'system' }).dec(2);
     });
 
     subscribe(`${redisPrefix}${accessTokenChannelId}`, listener);
     subscribe(`${redisPrefix}${systemChannelId}`, listener);
 
-    connectedChannels.labels({ type: 'eventsource', channel: 'system' }).inc(2);
+    metrics.connectedChannels.labels({ type: 'eventsource', channel: 'system' }).inc(2);
   };
 
   /**
@@ -790,7 +775,7 @@ const startServer = async () => {
       // TODO: Replace "string"-based delete payloads with object payloads:
       const encodedPayload = typeof payload === 'object' ? JSON.stringify(payload) : payload;
 
-      messagesSent.labels({ type: destinationType }).inc(1);
+      metrics.messagesSent.labels({ type: destinationType }).inc(1);
 
       log.debug({ event, payload }, `Transmitting ${event} to ${req.accountId}`);
 
@@ -1027,11 +1012,11 @@ const startServer = async () => {
   const streamToHttp = (req, res) => {
     const channelName = channelNameFromPath(req);
 
-    connectedClients.labels({ type: 'eventsource' }).inc();
+    metrics.connectedClients.labels({ type: 'eventsource' }).inc();
 
     // In theory we'll always have a channel name, but channelNameFromPath can return undefined:
     if (typeof channelName === 'string') {
-      connectedChannels.labels({ type: 'eventsource', channel: channelName }).inc();
+      metrics.connectedChannels.labels({ type: 'eventsource', channel: channelName }).inc();
     }
 
     res.setHeader('Content-Type', 'text/event-stream');
@@ -1047,10 +1032,10 @@ const startServer = async () => {
 
       // We decrement these counters here instead of in streamHttpEnd as in that
       // method we don't have knowledge of the channel names
-      connectedClients.labels({ type: 'eventsource' }).dec();
+      metrics.connectedClients.labels({ type: 'eventsource' }).dec();
       // In theory we'll always have a channel name, but channelNameFromPath can return undefined:
       if (typeof channelName === 'string') {
-        connectedChannels.labels({ type: 'eventsource', channel: channelName }).dec();
+        metrics.connectedChannels.labels({ type: 'eventsource', channel: channelName }).dec();
       }
 
       clearInterval(heartbeat);
@@ -1324,7 +1309,7 @@ const startServer = async () => {
       const stopHeartbeat = subscriptionHeartbeat(channelIds);
       const listener = streamFrom(channelIds, request, logger, onSend, undefined, 'websocket', options.needsFiltering);
 
-      connectedChannels.labels({ type: 'websocket', channel: channelName }).inc();
+      metrics.connectedChannels.labels({ type: 'websocket', channel: channelName }).inc();
 
       subscriptions[channelIds.join(';')] = {
         channelName,
@@ -1363,7 +1348,7 @@ const startServer = async () => {
       unsubscribe(`${redisPrefix}${channelId}`, subscription.listener);
     });
 
-    connectedChannels.labels({ type: 'websocket', channel: subscription.channelName }).dec();
+    metrics.connectedChannels.labels({ type: 'websocket', channel: subscription.channelName }).dec();
     subscription.stopHeartbeat();
 
     delete subscriptions[channelIds.join(';')];
@@ -1421,7 +1406,7 @@ const startServer = async () => {
       },
     };
 
-    connectedChannels.labels({ type: 'websocket', channel: 'system' }).inc(2);
+    metrics.connectedChannels.labels({ type: 'websocket', channel: 'system' }).inc(2);
   };
 
   /**
@@ -1433,7 +1418,7 @@ const startServer = async () => {
     // Note: url.parse could throw, which would terminate the connection, so we
     // increment the connected clients metric straight away when we establish
     // the connection, without waiting:
-    connectedClients.labels({ type: 'websocket' }).inc();
+    metrics.connectedClients.labels({ type: 'websocket' }).inc();
 
     // Setup connection keep-alive state:
     ws.isAlive = true;
@@ -1459,7 +1444,7 @@ const startServer = async () => {
       });
 
       // Decrement the metrics for connected clients:
-      connectedClients.labels({ type: 'websocket' }).dec();
+      metrics.connectedClients.labels({ type: 'websocket' }).dec();
 
       // We need to unassign the session object as to ensure it correctly gets
       // garbage collected, without doing this we could accidentally hold on to
diff --git a/streaming/metrics.js b/streaming/metrics.js
index a029d778fcf67a..bb6bce3f3c16a4 100644
--- a/streaming/metrics.js
+++ b/streaming/metrics.js
@@ -4,12 +4,12 @@ import metrics from 'prom-client';
 
 /**
  * @typedef StreamingMetrics
- * @property {metrics.Registry} register
  * @property {metrics.Gauge<"type">} connectedClients
  * @property {metrics.Gauge<"type" | "channel">} connectedChannels
  * @property {metrics.Gauge} redisSubscriptions
  * @property {metrics.Counter} redisMessagesReceived
  * @property {metrics.Counter<"type">} messagesSent
+ * @property {import('express').RequestHandler<{}>} requestHandler
  */
 
 /**
@@ -92,8 +92,21 @@ export function setupMetrics(channels, pgPool) {
   messagesSent.inc({ type: 'websocket' }, 0);
   messagesSent.inc({ type: 'eventsource' }, 0);
 
+  /**
+   * @type {import('express').RequestHandler<{}>}
+   */
+  const requestHandler = (req, res) => {
+    metrics.register.metrics().then((output) => {
+      res.set('Content-Type', metrics.register.contentType);
+      res.end(output);
+    }).catch((err) => {
+      req.log.error(err, "Error collecting metrics");
+      res.status(500).end();
+    });
+  };
+
   return {
-    register: metrics.register,
+    requestHandler,
     connectedClients,
     connectedChannels,
     redisSubscriptions,

From 0422a5c208dc9ca13684690c5a83e7363ca797d3 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 26 Aug 2024 08:44:32 +0000
Subject: [PATCH 1956/2191] Update dependency axios to v1.7.5 (#31564)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index c354b95720dcf0..c3a7c6b1a57bb8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5121,13 +5121,13 @@ __metadata:
   linkType: hard
 
 "axios@npm:^1.4.0":
-  version: 1.7.4
-  resolution: "axios@npm:1.7.4"
+  version: 1.7.5
+  resolution: "axios@npm:1.7.5"
   dependencies:
     follow-redirects: "npm:^1.15.6"
     form-data: "npm:^4.0.0"
     proxy-from-env: "npm:^1.1.0"
-  checksum: 10c0/5ea1a93140ca1d49db25ef8e1bd8cfc59da6f9220159a944168860ad15a2743ea21c5df2967795acb15cbe81362f5b157fdebbea39d53117ca27658bab9f7f17
+  checksum: 10c0/1d5daeb28b3d1bb2a7b9f0743433c4bfbeaddc15461e50ebde487eec6c009af2515749d5261096dd430c90cd891bd310bcba5ec3967bae2033c4a307f58a6ad3
   languageName: node
   linkType: hard
 

From d0822a0e78cac93cc0350e8e6abe7a89b536e836 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 26 Aug 2024 08:47:21 +0000
Subject: [PATCH 1957/2191] Update dependency test-prof to v1.4.1 (#31561)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 3c5ffc21afa3ef..beef1d7f9636d2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -832,7 +832,7 @@ GEM
       unicode-display_width (>= 1.1.1, < 3)
     terrapin (1.0.1)
       climate_control
-    test-prof (1.4.0)
+    test-prof (1.4.1)
     thor (1.3.1)
     tilt (2.3.0)
     timeout (0.4.1)

From ccc0aea767bd8c01e9b401f4367c8e2f01d4c64f Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 26 Aug 2024 08:48:04 +0000
Subject: [PATCH 1958/2191] Update dependency bundler-audit to v0.9.2 (#31558)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index beef1d7f9636d2..af43b95294ca77 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -144,7 +144,7 @@ GEM
       concurrent-ruby (~> 1.0, >= 1.0.5)
       redis (>= 1.0, < 6)
     builder (3.3.0)
-    bundler-audit (0.9.1)
+    bundler-audit (0.9.2)
       bundler (>= 1.2.0, < 3)
       thor (~> 1.0)
     capybara (3.40.0)

From 3e1bd9756eff27e73d441252427494f3df975ad7 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 26 Aug 2024 08:50:40 +0000
Subject: [PATCH 1959/2191] Update dependency brakeman to v6.2.1 (#31553)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index af43b95294ca77..40d7cea3d67542 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -137,7 +137,7 @@ GEM
     blurhash (0.1.7)
     bootsnap (1.18.4)
       msgpack (~> 1.2)
-    brakeman (6.1.2)
+    brakeman (6.2.1)
       racc
     browser (5.3.1)
     brpoplpush-redis_script (0.1.3)

From a3c33c77ab3737dfef9d1d0303faa6dfec9e9e20 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 26 Aug 2024 13:01:00 +0200
Subject: [PATCH 1960/2191] Fix typo in changelog (#31591)

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7388e5b461be94..02ac2898ddbb9f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -165,7 +165,7 @@ The following changelog entries focus on changes visible to users, administrator
 - **Change colors throughout the web UI** (#29522, #29584, #29653, #29779, #29803, #29809, #29808, #29828, #31034, #31168, #31266, #31348, #31349, #31361, and #31510 by @ClearlyClaire, @Gargron, @renchap, and @vmstan)
 - **Change onboarding prompt to follow suggestions carousel in web UI** (#28878 and #29272 by @Gargron)
 - **Change email templates** (#28416, #28755, #28814, #29064, #28883, #29470, #29607, #29761, #29760, and #29879 by @ClearlyClaire, @Gargron, @hteumeuleu, and @mjankowski)\
-  All emails to end-users have been completely redesigned with a fresh new look, providing more information while making them easier to reand and keeping maximum compatibility across mail clients.
+  All emails to end-users have been completely redesigned with a fresh new look, providing more information while making them easier to read and keeping maximum compatibility across mail clients.
 - **Change follow recommendations algorithm** (#28314, #28433, #29017, #29108, #29306, #29550, #29619, and #31474 by @ClearlyClaire, @Gargron, @kernal053, @mjankowski, and @wheatear-dev)\
   This replaces the “past interactions” recommendation algorithm with a “friends of friends” algorithm that suggests accounts followed by people you follow, and a “similar profiles” algorithm that suggests accounts with a profile similar to your most recent follows.\
   In addition, the implementation has been significantly reworked, and all follow recommendations are now dismissable.\

From e3516fa8cfa81c07776e02d8c5161fffc585ffa5 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 26 Aug 2024 13:01:09 +0200
Subject: [PATCH 1961/2191] Update Yarn to v4.4.1 (#31575)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 package.json           | 2 +-
 streaming/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 8ccbc31d39c754..7f21b11404789b 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@mastodon/mastodon",
   "license": "AGPL-3.0-or-later",
-  "packageManager": "yarn@4.4.0",
+  "packageManager": "yarn@4.4.1",
   "engines": {
     "node": ">=18"
   },
diff --git a/streaming/package.json b/streaming/package.json
index 4f44927831d3d6..444d9483e4edfd 100644
--- a/streaming/package.json
+++ b/streaming/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@mastodon/streaming",
   "license": "AGPL-3.0-or-later",
-  "packageManager": "yarn@4.4.0",
+  "packageManager": "yarn@4.4.1",
   "engines": {
     "node": ">=18"
   },

From 641ae6a2cf7eac47599620bc9cb24095829418e0 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 26 Aug 2024 08:17:35 -0400
Subject: [PATCH 1962/2191] Convert health check endpoint controller spec to
 request spec (#31565)

---
 spec/controllers/health_controller_spec.rb | 14 --------------
 spec/requests/health_spec.rb               | 16 ++++++++++++++++
 2 files changed, 16 insertions(+), 14 deletions(-)
 delete mode 100644 spec/controllers/health_controller_spec.rb
 create mode 100644 spec/requests/health_spec.rb

diff --git a/spec/controllers/health_controller_spec.rb b/spec/controllers/health_controller_spec.rb
deleted file mode 100644
index 282b664199b61f..00000000000000
--- a/spec/controllers/health_controller_spec.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe HealthController do
-  render_views
-
-  describe 'GET #show' do
-    it 'returns http success' do
-      get :show
-      expect(response).to have_http_status(200)
-    end
-  end
-end
diff --git a/spec/requests/health_spec.rb b/spec/requests/health_spec.rb
new file mode 100644
index 00000000000000..03317f9723986c
--- /dev/null
+++ b/spec/requests/health_spec.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'Health check endpoint' do
+  describe 'GET /health' do
+    it 'returns http success when server is functioning' do
+      get '/health'
+
+      expect(response)
+        .to have_http_status(200)
+      expect(response.body)
+        .to include('OK')
+    end
+  end
+end

From 36ccdcc9e12d35399742cbe05c2589d69dbbbc99 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 26 Aug 2024 10:36:31 -0400
Subject: [PATCH 1963/2191] Convert "custom css" controller spec to request
 spec (#31595)

---
 .../controllers/custom_css_controller_spec.rb | 19 -------------------
 spec/requests/custom_stylesheets_spec.rb      | 19 +++++++++++++++++++
 2 files changed, 19 insertions(+), 19 deletions(-)
 delete mode 100644 spec/controllers/custom_css_controller_spec.rb
 create mode 100644 spec/requests/custom_stylesheets_spec.rb

diff --git a/spec/controllers/custom_css_controller_spec.rb b/spec/controllers/custom_css_controller_spec.rb
deleted file mode 100644
index 405fa0bcf35c53..00000000000000
--- a/spec/controllers/custom_css_controller_spec.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe CustomCssController do
-  render_views
-
-  describe 'GET #show' do
-    before do
-      get :show
-    end
-
-    it 'returns http success' do
-      expect(response).to have_http_status(200)
-    end
-
-    it_behaves_like 'cacheable response'
-  end
-end
diff --git a/spec/requests/custom_stylesheets_spec.rb b/spec/requests/custom_stylesheets_spec.rb
new file mode 100644
index 00000000000000..982511297b380f
--- /dev/null
+++ b/spec/requests/custom_stylesheets_spec.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'Custom stylesheets' do
+  describe 'GET /custom.css' do
+    before { get '/custom.css' }
+
+    it 'returns http success' do
+      expect(response)
+        .to have_http_status(200)
+        .and have_attributes(
+          content_type: match('text/css')
+        )
+    end
+
+    it_behaves_like 'cacheable response'
+  end
+end

From 5172d84946eba2b844a3aee3896e270b59f66695 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 26 Aug 2024 10:37:23 -0400
Subject: [PATCH 1964/2191] Convert `manifest` controller spec to request spec
 (#31596)

---
 spec/controllers/manifests_controller_spec.rb | 19 ---------------
 spec/requests/manifest_spec.rb                | 24 +++++++++++++++++++
 2 files changed, 24 insertions(+), 19 deletions(-)
 delete mode 100644 spec/controllers/manifests_controller_spec.rb
 create mode 100644 spec/requests/manifest_spec.rb

diff --git a/spec/controllers/manifests_controller_spec.rb b/spec/controllers/manifests_controller_spec.rb
deleted file mode 100644
index 9279fae0245561..00000000000000
--- a/spec/controllers/manifests_controller_spec.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe ManifestsController do
-  render_views
-
-  describe 'GET #show' do
-    before do
-      get :show
-    end
-
-    it 'returns http success' do
-      expect(response).to have_http_status(200)
-    end
-
-    it_behaves_like 'cacheable response'
-  end
-end
diff --git a/spec/requests/manifest_spec.rb b/spec/requests/manifest_spec.rb
new file mode 100644
index 00000000000000..749c4038dfe377
--- /dev/null
+++ b/spec/requests/manifest_spec.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'Manifest' do
+  describe 'GET /manifest' do
+    before { get '/manifest' }
+
+    it 'returns http success' do
+      expect(response)
+        .to have_http_status(200)
+        .and have_attributes(
+          content_type: match('application/json')
+        )
+      expect(body_as_json)
+        .to include(
+          id: '/home',
+          name: 'Mastodon'
+        )
+    end
+
+    it_behaves_like 'cacheable response'
+  end
+end

From dbe0ee8a81516eccbbc6d47278e727b96cba841e Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 26 Aug 2024 11:00:05 -0400
Subject: [PATCH 1965/2191] Convert `emojis` controller spec to request spec
 (#31597)

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
---
 spec/controllers/emojis_controller_spec.rb | 18 ------------------
 spec/requests/emojis_spec.rb               | 21 +++++++++++++++++++++
 2 files changed, 21 insertions(+), 18 deletions(-)
 delete mode 100644 spec/controllers/emojis_controller_spec.rb
 create mode 100644 spec/requests/emojis_spec.rb

diff --git a/spec/controllers/emojis_controller_spec.rb b/spec/controllers/emojis_controller_spec.rb
deleted file mode 100644
index dd139de931afcc..00000000000000
--- a/spec/controllers/emojis_controller_spec.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe EmojisController do
-  render_views
-
-  let(:emoji) { Fabricate(:custom_emoji, shortcode: 'coolcat') }
-
-  describe 'GET #show' do
-    let(:response) { get :show, params: { id: emoji.id, format: :json } }
-
-    it 'returns the right response' do
-      expect(response).to have_http_status 200
-      expect(body_as_json[:name]).to eq ':coolcat:'
-    end
-  end
-end
diff --git a/spec/requests/emojis_spec.rb b/spec/requests/emojis_spec.rb
new file mode 100644
index 00000000000000..458d500762c837
--- /dev/null
+++ b/spec/requests/emojis_spec.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'Emojis' do
+  describe 'GET /emojis/:id' do
+    let(:emoji) { Fabricate(:custom_emoji, shortcode: 'coolcat') }
+
+    it 'returns http success with correct json' do
+      get "/emojis/#{emoji.id}"
+
+      expect(response)
+        .to have_http_status(200)
+      expect(body_as_json)
+        .to include(
+          name: ':coolcat:',
+          type: 'Emoji'
+        )
+    end
+  end
+end

From 963c1309a40b797b9b32d21208d9812ad25f6304 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 26 Aug 2024 11:20:05 -0400
Subject: [PATCH 1966/2191] Cache asset compilation results on CI (#30868)

---
 .github/workflows/test-ruby.yml | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/test-ruby.yml b/.github/workflows/test-ruby.yml
index fcfeed5fbad7b3..859b23ba66c2ce 100644
--- a/.github/workflows/test-ruby.yml
+++ b/.github/workflows/test-ruby.yml
@@ -42,11 +42,24 @@ jobs:
         with:
           onlyProduction: 'true'
 
+      - name: Cache assets from compilation
+        uses: actions/cache@v4
+        with:
+          path: |
+            public/assets
+            public/packs
+            public/packs-test
+            tmp/cache/webpacker
+          key: ${{ matrix.mode }}-assets-${{ github.head_ref || github.ref_name }}-${{ github.sha }}
+          restore-keys: |
+            ${{ matrix.mode }}-assets-${{ github.head_ref || github.ref_name }}-${{ github.sha }}
+            ${{ matrix.mode }}-assets-${{ github.head_ref || github.ref_name }}
+            ${{ matrix.mode }}-assets-main
+            ${{ matrix.mode }}-assets
+
       - name: Precompile assets
-        # Previously had set this, but it's not supported
-        # export NODE_OPTIONS=--openssl-legacy-provider
         run: |-
-          ./bin/rails assets:precompile
+          bin/rails assets:precompile
 
       - name: Archive asset artifacts
         run: |

From 4c2534d12e805638bcb70e1c1e13de351527f607 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 26 Aug 2024 11:53:48 -0400
Subject: [PATCH 1967/2191] Convert "static page" controller specs to system
 specs (#31599)

---
 spec/controllers/about_controller_spec.rb   | 17 ------------
 spec/controllers/home_controller_spec.rb    | 30 ---------------------
 spec/controllers/privacy_controller_spec.rb | 14 ----------
 spec/system/about_spec.rb                   | 12 +++++++++
 spec/system/home_spec.rb                    | 25 +++++++++++++++++
 spec/system/privacy_spec.rb                 | 12 +++++++++
 6 files changed, 49 insertions(+), 61 deletions(-)
 delete mode 100644 spec/controllers/about_controller_spec.rb
 delete mode 100644 spec/controllers/home_controller_spec.rb
 delete mode 100644 spec/controllers/privacy_controller_spec.rb
 create mode 100644 spec/system/about_spec.rb
 create mode 100644 spec/system/home_spec.rb
 create mode 100644 spec/system/privacy_spec.rb

diff --git a/spec/controllers/about_controller_spec.rb b/spec/controllers/about_controller_spec.rb
deleted file mode 100644
index 8db6d80b0b1438..00000000000000
--- a/spec/controllers/about_controller_spec.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-RSpec.describe AboutController do
-  render_views
-
-  describe 'GET #show' do
-    before do
-      get :show
-    end
-
-    it 'returns http success' do
-      expect(response).to have_http_status(200)
-    end
-  end
-end
diff --git a/spec/controllers/home_controller_spec.rb b/spec/controllers/home_controller_spec.rb
deleted file mode 100644
index 50a8aba2d89f6e..00000000000000
--- a/spec/controllers/home_controller_spec.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-RSpec.describe HomeController do
-  render_views
-
-  describe 'GET #index' do
-    subject { get :index }
-
-    context 'when not signed in' do
-      it 'returns http success' do
-        request.path = '/'
-        expect(subject).to have_http_status(:success)
-      end
-    end
-
-    context 'when signed in' do
-      let(:user) { Fabricate(:user) }
-
-      before do
-        sign_in(user)
-      end
-
-      it 'returns http success' do
-        expect(subject).to have_http_status(:success)
-      end
-    end
-  end
-end
diff --git a/spec/controllers/privacy_controller_spec.rb b/spec/controllers/privacy_controller_spec.rb
deleted file mode 100644
index c92c71ea64571d..00000000000000
--- a/spec/controllers/privacy_controller_spec.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe PrivacyController do
-  render_views
-
-  describe 'GET #show' do
-    it 'returns http success' do
-      get :show
-      expect(response).to have_http_status(200)
-    end
-  end
-end
diff --git a/spec/system/about_spec.rb b/spec/system/about_spec.rb
new file mode 100644
index 00000000000000..dc976b91e07b53
--- /dev/null
+++ b/spec/system/about_spec.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'About page' do
+  it 'visits the about page and renders the web app' do
+    visit about_path
+
+    expect(page)
+      .to have_css('noscript', text: /Mastodon/)
+  end
+end
diff --git a/spec/system/home_spec.rb b/spec/system/home_spec.rb
new file mode 100644
index 00000000000000..08b9737d6b6d8a
--- /dev/null
+++ b/spec/system/home_spec.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'Home page' do
+  context 'when signed in' do
+    before { sign_in Fabricate(:user) }
+
+    it 'visits the homepage and renders the web app' do
+      visit root_path
+
+      expect(page)
+        .to have_css('noscript', text: /Mastodon/)
+    end
+  end
+
+  context 'when not signed in' do
+    it 'visits the homepage and renders the web app' do
+      visit root_path
+
+      expect(page)
+        .to have_css('noscript', text: /Mastodon/)
+    end
+  end
+end
diff --git a/spec/system/privacy_spec.rb b/spec/system/privacy_spec.rb
new file mode 100644
index 00000000000000..f2ab1310cc40fd
--- /dev/null
+++ b/spec/system/privacy_spec.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'Privacy policy page' do
+  it 'visits the privacy policy page and renders the web app' do
+    visit privacy_policy_path
+
+    expect(page)
+      .to have_css('noscript', text: /Mastodon/)
+  end
+end

From c00f37f87b17f0e07cb35dd2fb816b5a19004ccc Mon Sep 17 00:00:00 2001
From: Essem <smswessem@gmail.com>
Date: Thu, 22 Aug 2024 12:22:36 -0500
Subject: [PATCH 1968/2191] Fix grouped reaction notification text

---
 .../components/notification_reaction.tsx      | 28 ++++++++++++++-----
 .../flavours/glitch/locales/en.json           |  1 +
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/app/javascript/flavours/glitch/features/notifications_v2/components/notification_reaction.tsx b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_reaction.tsx
index 95dd4d850a8ed4..0ec53234f8fb8e 100644
--- a/app/javascript/flavours/glitch/features/notifications_v2/components/notification_reaction.tsx
+++ b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_reaction.tsx
@@ -6,13 +6,27 @@ import type { NotificationGroupReaction } from 'flavours/glitch/models/notificat
 import type { LabelRenderer } from './notification_group_with_status';
 import { NotificationGroupWithStatus } from './notification_group_with_status';
 
-const labelRenderer: LabelRenderer = (values) => (
-  <FormattedMessage
-    id='notification.reaction'
-    defaultMessage='{name} reacted to your status'
-    values={values}
-  />
-);
+const labelRenderer: LabelRenderer = (displayedName, total) => {
+  if (total === 1)
+    return (
+      <FormattedMessage
+        id='notification.reaction'
+        defaultMessage='{name} reacted to your status'
+        values={{ name: displayedName }}
+      />
+    );
+
+  return (
+    <FormattedMessage
+      id='notification.reaction.name_and_others'
+      defaultMessage='{name} and {count, plural, one {# other} other {# others}} reacted to your post'
+      values={{
+        name: displayedName,
+        count: total - 1,
+      }}
+    />
+  );
+};
 
 export const NotificationReaction: React.FC<{
   notification: NotificationGroupReaction;
diff --git a/app/javascript/flavours/glitch/locales/en.json b/app/javascript/flavours/glitch/locales/en.json
index f514daee4270ee..66230e55cc8a2b 100644
--- a/app/javascript/flavours/glitch/locales/en.json
+++ b/app/javascript/flavours/glitch/locales/en.json
@@ -56,6 +56,7 @@
   "navigation_bar.misc": "Misc",
   "notification.markForDeletion": "Mark for deletion",
   "notification.reaction": "{name} reacted to your post",
+  "notification.reaction.name_and_others": "{name} and {count, plural, one {# other} other {# others}} reacted to your post",
   "notification_purge.btn_all": "Select\nall",
   "notification_purge.btn_apply": "Clear\nselected",
   "notification_purge.btn_invert": "Invert\nselection",

From e38ce3beb7b83f43ef6e6f144c19b186c393910c Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 26 Aug 2024 18:38:34 +0200
Subject: [PATCH 1969/2191] Fix spurious loading bar middleware usage (#31592)

---
 .../mastodon/actions/account_notes.ts         |  1 -
 .../mastodon/store/middlewares/loading_bar.ts |  5 +++--
 .../mastodon/store/typed_functions.ts         | 19 ++++++++++++-------
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/app/javascript/mastodon/actions/account_notes.ts b/app/javascript/mastodon/actions/account_notes.ts
index c2ebaf54a43055..9e7d199dc9a30f 100644
--- a/app/javascript/mastodon/actions/account_notes.ts
+++ b/app/javascript/mastodon/actions/account_notes.ts
@@ -6,5 +6,4 @@ export const submitAccountNote = createDataLoadingThunk(
   ({ accountId, note }: { accountId: string; note: string }) =>
     apiSubmitAccountNote(accountId, note),
   (relationship) => ({ relationship }),
-  { skipLoading: true },
 );
diff --git a/app/javascript/mastodon/store/middlewares/loading_bar.ts b/app/javascript/mastodon/store/middlewares/loading_bar.ts
index d259be899b1a5f..33d99f985261cf 100644
--- a/app/javascript/mastodon/store/middlewares/loading_bar.ts
+++ b/app/javascript/mastodon/store/middlewares/loading_bar.ts
@@ -48,8 +48,9 @@ export const loadingBarMiddleware = (
       let isRejected = false;
 
       if (
-        isAsyncThunkAction(action)
-        // TODO: once we get the first use-case for it, add a check for skipLoading
+        isAsyncThunkAction(action) &&
+        'useLoadingBar' in action.meta &&
+        action.meta.useLoadingBar
       ) {
         if (isThunkActionPending(action)) isPending = true;
         else if (isThunkActionFulfilled(action)) isFulfilled = true;
diff --git a/app/javascript/mastodon/store/typed_functions.ts b/app/javascript/mastodon/store/typed_functions.ts
index cd0f95cef9a9c0..544d619682949a 100644
--- a/app/javascript/mastodon/store/typed_functions.ts
+++ b/app/javascript/mastodon/store/typed_functions.ts
@@ -15,7 +15,7 @@ export interface AsyncThunkRejectValue {
 }
 
 interface AppMeta {
-  skipLoading?: boolean;
+  useLoadingBar?: boolean;
 }
 
 export const createAppAsyncThunk = createAsyncThunk.withTypes<{
@@ -34,7 +34,7 @@ interface AppThunkConfig {
 type AppThunkApi = Pick<GetThunkAPI<AppThunkConfig>, 'getState' | 'dispatch'>;
 
 interface AppThunkOptions {
-  skipLoading?: boolean;
+  useLoadingBar?: boolean;
 }
 
 const createBaseAsyncThunk = createAsyncThunk.withTypes<AppThunkConfig>();
@@ -54,15 +54,20 @@ export function createThunk<Arg = void, Returned = void>(
         const result = await creator(arg, { dispatch, getState });
 
         return fulfillWithValue(result, {
-          skipLoading: options.skipLoading,
+          useLoadingBar: options.useLoadingBar,
         });
       } catch (error) {
-        return rejectWithValue({ error }, { skipLoading: true });
+        return rejectWithValue(
+          { error },
+          {
+            useLoadingBar: options.useLoadingBar,
+          },
+        );
       }
     },
     {
       getPendingMeta() {
-        if (options.skipLoading) return { skipLoading: true };
+        if (options.useLoadingBar) return { useLoadingBar: true };
         return {};
       },
     },
@@ -148,7 +153,7 @@ export function createDataLoadingThunk<
  *   You can also omit this parameter and pass `thunkOptions` directly
  * @param maybeThunkOptions
  *   Additional Mastodon specific options for the thunk. Currently supports:
- *   - `skipLoading` to avoid showing the loading bar when the request is in progress
+ *   - `useLoadingBar` to display a loading bar while this action is pending. Defaults to true.
  * @returns The created thunk
  */
 export function createDataLoadingThunk<
@@ -198,6 +203,6 @@ export function createDataLoadingThunk<
         return undefined as Returned;
       else return result;
     },
-    thunkOptions,
+    { useLoadingBar: thunkOptions?.useLoadingBar ?? true },
   );
 }

From d820c0883d5557f011b4de8fafa1ff9f68b0d5de Mon Sep 17 00:00:00 2001
From: Emelia Smith <ThisIsMissEm@users.noreply.github.com>
Date: Mon, 26 Aug 2024 18:42:46 +0200
Subject: [PATCH 1970/2191] Add quick links to Administration and Moderation
 Reports from Web UI (#24838)

---
 .../features/getting_started/index.jsx        | 14 +++++++++++++-
 .../ui/components/navigation_panel.jsx        | 11 +++++++++--
 app/javascript/mastodon/locales/en.json       |  2 ++
 app/javascript/mastodon/permissions.ts        | 19 +++++++++++++++++++
 4 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/app/javascript/mastodon/features/getting_started/index.jsx b/app/javascript/mastodon/features/getting_started/index.jsx
index 628bbe62bbf1aa..8d26115dfa0e53 100644
--- a/app/javascript/mastodon/features/getting_started/index.jsx
+++ b/app/javascript/mastodon/features/getting_started/index.jsx
@@ -12,9 +12,11 @@ import { connect } from 'react-redux';
 import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
 import BookmarksIcon from '@/material-icons/400-24px/bookmarks-fill.svg?react';
 import ExploreIcon from '@/material-icons/400-24px/explore.svg?react';
+import ModerationIcon from '@/material-icons/400-24px/gavel.svg?react';
 import PeopleIcon from '@/material-icons/400-24px/group.svg?react';
 import HomeIcon from '@/material-icons/400-24px/home-fill.svg?react';
 import ListAltIcon from '@/material-icons/400-24px/list_alt.svg?react';
+import AdministrationIcon from '@/material-icons/400-24px/manufacturing.svg?react';
 import MenuIcon from '@/material-icons/400-24px/menu.svg?react';
 import PersonAddIcon from '@/material-icons/400-24px/person_add.svg?react';
 import PublicIcon from '@/material-icons/400-24px/public.svg?react';
@@ -25,6 +27,7 @@ import Column from 'mastodon/components/column';
 import ColumnHeader from 'mastodon/components/column_header';
 import LinkFooter from 'mastodon/features/ui/components/link_footer';
 import { identityContextPropShape, withIdentity } from 'mastodon/identity_context';
+import { canManageReports, canViewAdminDashboard } from 'mastodon/permissions';
 
 import { me, showTrends } from '../../initial_state';
 import { NavigationBar } from '../compose/components/navigation_bar';
@@ -43,6 +46,8 @@ const messages = defineMessages({
   direct: { id: 'navigation_bar.direct', defaultMessage: 'Private mentions' },
   bookmarks: { id: 'navigation_bar.bookmarks', defaultMessage: 'Bookmarks' },
   preferences: { id: 'navigation_bar.preferences', defaultMessage: 'Preferences' },
+  administration: { id: 'navigation_bar.administration', defaultMessage: 'Administration' },
+  moderation: { id: 'navigation_bar.moderation', defaultMessage: 'Moderation' },
   follow_requests: { id: 'navigation_bar.follow_requests', defaultMessage: 'Follow requests' },
   favourites: { id: 'navigation_bar.favourites', defaultMessage: 'Favorites' },
   blocks: { id: 'navigation_bar.blocks', defaultMessage: 'Blocked users' },
@@ -99,7 +104,7 @@ class GettingStarted extends ImmutablePureComponent {
 
   render () {
     const { intl, myAccount, multiColumn, unreadFollowRequests } = this.props;
-    const { signedIn } = this.props.identity;
+    const { signedIn, permissions } = this.props.identity;
 
     const navItems = [];
 
@@ -136,6 +141,13 @@ class GettingStarted extends ImmutablePureComponent {
         <ColumnSubheading key='header-settings' text={intl.formatMessage(messages.settings_subheading)} />,
         <ColumnLink key='preferences' icon='cog' iconComponent={SettingsIcon} text={intl.formatMessage(messages.preferences)} href='/settings/preferences' />,
       );
+
+      if (canManageReports(permissions)) {
+        navItems.push(<ColumnLink key='moderation' href='/admin/reports' icon='flag' iconComponent={ModerationIcon} text={intl.formatMessage(messages.moderation)} />);
+      }
+      if (canViewAdminDashboard(permissions)) {
+        navItems.push(<ColumnLink key='administration' href='/admin/dashboard' icon='tachometer' iconComponent={AdministrationIcon} text={intl.formatMessage(messages.administration)} />);
+      }
     }
 
     return (
diff --git a/app/javascript/mastodon/features/ui/components/navigation_panel.jsx b/app/javascript/mastodon/features/ui/components/navigation_panel.jsx
index 2648923bfc4161..d30ea0ac5db685 100644
--- a/app/javascript/mastodon/features/ui/components/navigation_panel.jsx
+++ b/app/javascript/mastodon/features/ui/components/navigation_panel.jsx
@@ -7,16 +7,17 @@ import { Link } from 'react-router-dom';
 
 import { useSelector, useDispatch } from 'react-redux';
 
-
 import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
 import BookmarksActiveIcon from '@/material-icons/400-24px/bookmarks-fill.svg?react';
 import BookmarksIcon from '@/material-icons/400-24px/bookmarks.svg?react';
 import ExploreActiveIcon from '@/material-icons/400-24px/explore-fill.svg?react';
 import ExploreIcon from '@/material-icons/400-24px/explore.svg?react';
+import ModerationIcon from '@/material-icons/400-24px/gavel.svg?react';
 import HomeActiveIcon from '@/material-icons/400-24px/home-fill.svg?react';
 import HomeIcon from '@/material-icons/400-24px/home.svg?react';
 import ListAltActiveIcon from '@/material-icons/400-24px/list_alt-fill.svg?react';
 import ListAltIcon from '@/material-icons/400-24px/list_alt.svg?react';
+import AdministrationIcon from '@/material-icons/400-24px/manufacturing.svg?react';
 import MoreHorizIcon from '@/material-icons/400-24px/more_horiz.svg?react';
 import NotificationsActiveIcon from '@/material-icons/400-24px/notifications-fill.svg?react';
 import NotificationsIcon from '@/material-icons/400-24px/notifications.svg?react';
@@ -34,6 +35,7 @@ import { NavigationPortal } from 'mastodon/components/navigation_portal';
 import { identityContextPropShape, withIdentity } from 'mastodon/identity_context';
 import { timelinePreview, trendsEnabled } from 'mastodon/initial_state';
 import { transientSingleColumn } from 'mastodon/is_mobile';
+import { canManageReports, canViewAdminDashboard } from 'mastodon/permissions';
 import { selectUnreadNotificationGroupsCount } from 'mastodon/selectors/notifications';
 
 import ColumnLink from './column_link';
@@ -51,6 +53,8 @@ const messages = defineMessages({
   bookmarks: { id: 'navigation_bar.bookmarks', defaultMessage: 'Bookmarks' },
   lists: { id: 'navigation_bar.lists', defaultMessage: 'Lists' },
   preferences: { id: 'navigation_bar.preferences', defaultMessage: 'Preferences' },
+  administration: { id: 'navigation_bar.administration', defaultMessage: 'Administration' },
+  moderation: { id: 'navigation_bar.moderation', defaultMessage: 'Moderation' },
   followsAndFollowers: { id: 'navigation_bar.follows_and_followers', defaultMessage: 'Follows and followers' },
   about: { id: 'navigation_bar.about', defaultMessage: 'About' },
   search: { id: 'navigation_bar.search', defaultMessage: 'Search' },
@@ -114,7 +118,7 @@ class NavigationPanel extends Component {
 
   render () {
     const { intl } = this.props;
-    const { signedIn, disabledAccountId } = this.props.identity;
+    const { signedIn, disabledAccountId, permissions } = this.props.identity;
 
     let banner = undefined;
 
@@ -176,6 +180,9 @@ class NavigationPanel extends Component {
             <hr />
 
             <ColumnLink transparent href='/settings/preferences' icon='cog' iconComponent={SettingsIcon} text={intl.formatMessage(messages.preferences)} />
+
+            {canManageReports(permissions) && <ColumnLink transparent href='/admin/reports' icon='flag' iconComponent={ModerationIcon} text={intl.formatMessage(messages.moderation)} />}
+            {canViewAdminDashboard(permissions) && <ColumnLink transparent href='/admin/dashboard' icon='tachometer' iconComponent={AdministrationIcon} text={intl.formatMessage(messages.administration)} />}
           </>
         )}
 
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index 88920431fb61c8..343af40424b635 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -467,6 +467,7 @@
   "mute_modal.you_wont_see_mentions": "You won't see posts that mention them.",
   "mute_modal.you_wont_see_posts": "They can still see your posts, but you won't see theirs.",
   "navigation_bar.about": "About",
+  "navigation_bar.administration": "Administration",
   "navigation_bar.advanced_interface": "Open in advanced web interface",
   "navigation_bar.blocks": "Blocked users",
   "navigation_bar.bookmarks": "Bookmarks",
@@ -483,6 +484,7 @@
   "navigation_bar.follows_and_followers": "Follows and followers",
   "navigation_bar.lists": "Lists",
   "navigation_bar.logout": "Logout",
+  "navigation_bar.moderation": "Moderation",
   "navigation_bar.mutes": "Muted users",
   "navigation_bar.opened_in_classic_interface": "Posts, accounts, and other specific pages are opened by default in the classic web interface.",
   "navigation_bar.personal": "Personal",
diff --git a/app/javascript/mastodon/permissions.ts b/app/javascript/mastodon/permissions.ts
index b583535c00e35f..8f015610ea08e7 100644
--- a/app/javascript/mastodon/permissions.ts
+++ b/app/javascript/mastodon/permissions.ts
@@ -1,4 +1,23 @@
 export const PERMISSION_INVITE_USERS = 0x0000000000010000;
 export const PERMISSION_MANAGE_USERS = 0x0000000000000400;
 export const PERMISSION_MANAGE_FEDERATION = 0x0000000000000020;
+
 export const PERMISSION_MANAGE_REPORTS = 0x0000000000000010;
+export const PERMISSION_VIEW_DASHBOARD = 0x0000000000000008;
+
+// These helpers don't quite align with the names/categories in UserRole,
+// but are likely "good enough" for the use cases at present.
+//
+// See: https://docs.joinmastodon.org/entities/Role/#permission-flags
+
+export function canViewAdminDashboard(permissions: number) {
+  return (
+    (permissions & PERMISSION_VIEW_DASHBOARD) === PERMISSION_VIEW_DASHBOARD
+  );
+}
+
+export function canManageReports(permissions: number) {
+  return (
+    (permissions & PERMISSION_MANAGE_REPORTS) === PERMISSION_MANAGE_REPORTS
+  );
+}

From 2379bfe3ea9f1612b865a45c547b9f96059d22ba Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 26 Aug 2024 18:38:34 +0200
Subject: [PATCH 1971/2191] [Glitch] Fix spurious loading bar middleware usage

Port e38ce3beb7b83f43ef6e6f144c19b186c393910c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/actions/account_notes.ts  |  1 -
 .../glitch/store/middlewares/loading_bar.ts   |  5 +++--
 .../flavours/glitch/store/typed_functions.ts  | 19 ++++++++++++-------
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/app/javascript/flavours/glitch/actions/account_notes.ts b/app/javascript/flavours/glitch/actions/account_notes.ts
index a71b342b060638..162fa675050dd2 100644
--- a/app/javascript/flavours/glitch/actions/account_notes.ts
+++ b/app/javascript/flavours/glitch/actions/account_notes.ts
@@ -6,5 +6,4 @@ export const submitAccountNote = createDataLoadingThunk(
   ({ accountId, note }: { accountId: string; note: string }) =>
     apiSubmitAccountNote(accountId, note),
   (relationship) => ({ relationship }),
-  { skipLoading: true },
 );
diff --git a/app/javascript/flavours/glitch/store/middlewares/loading_bar.ts b/app/javascript/flavours/glitch/store/middlewares/loading_bar.ts
index d259be899b1a5f..33d99f985261cf 100644
--- a/app/javascript/flavours/glitch/store/middlewares/loading_bar.ts
+++ b/app/javascript/flavours/glitch/store/middlewares/loading_bar.ts
@@ -48,8 +48,9 @@ export const loadingBarMiddleware = (
       let isRejected = false;
 
       if (
-        isAsyncThunkAction(action)
-        // TODO: once we get the first use-case for it, add a check for skipLoading
+        isAsyncThunkAction(action) &&
+        'useLoadingBar' in action.meta &&
+        action.meta.useLoadingBar
       ) {
         if (isThunkActionPending(action)) isPending = true;
         else if (isThunkActionFulfilled(action)) isFulfilled = true;
diff --git a/app/javascript/flavours/glitch/store/typed_functions.ts b/app/javascript/flavours/glitch/store/typed_functions.ts
index cd0f95cef9a9c0..544d619682949a 100644
--- a/app/javascript/flavours/glitch/store/typed_functions.ts
+++ b/app/javascript/flavours/glitch/store/typed_functions.ts
@@ -15,7 +15,7 @@ export interface AsyncThunkRejectValue {
 }
 
 interface AppMeta {
-  skipLoading?: boolean;
+  useLoadingBar?: boolean;
 }
 
 export const createAppAsyncThunk = createAsyncThunk.withTypes<{
@@ -34,7 +34,7 @@ interface AppThunkConfig {
 type AppThunkApi = Pick<GetThunkAPI<AppThunkConfig>, 'getState' | 'dispatch'>;
 
 interface AppThunkOptions {
-  skipLoading?: boolean;
+  useLoadingBar?: boolean;
 }
 
 const createBaseAsyncThunk = createAsyncThunk.withTypes<AppThunkConfig>();
@@ -54,15 +54,20 @@ export function createThunk<Arg = void, Returned = void>(
         const result = await creator(arg, { dispatch, getState });
 
         return fulfillWithValue(result, {
-          skipLoading: options.skipLoading,
+          useLoadingBar: options.useLoadingBar,
         });
       } catch (error) {
-        return rejectWithValue({ error }, { skipLoading: true });
+        return rejectWithValue(
+          { error },
+          {
+            useLoadingBar: options.useLoadingBar,
+          },
+        );
       }
     },
     {
       getPendingMeta() {
-        if (options.skipLoading) return { skipLoading: true };
+        if (options.useLoadingBar) return { useLoadingBar: true };
         return {};
       },
     },
@@ -148,7 +153,7 @@ export function createDataLoadingThunk<
  *   You can also omit this parameter and pass `thunkOptions` directly
  * @param maybeThunkOptions
  *   Additional Mastodon specific options for the thunk. Currently supports:
- *   - `skipLoading` to avoid showing the loading bar when the request is in progress
+ *   - `useLoadingBar` to display a loading bar while this action is pending. Defaults to true.
  * @returns The created thunk
  */
 export function createDataLoadingThunk<
@@ -198,6 +203,6 @@ export function createDataLoadingThunk<
         return undefined as Returned;
       else return result;
     },
-    thunkOptions,
+    { useLoadingBar: thunkOptions?.useLoadingBar ?? true },
   );
 }

From 232b6409f50b33bded4edf449f7cfb8fe95f299d Mon Sep 17 00:00:00 2001
From: Jeremy Kescher <jeremy@kescher.at>
Date: Mon, 26 Aug 2024 19:07:22 +0200
Subject: [PATCH 1972/2191] New versioning scheme, bump Catstodon revision to
 1.0.0

---
 CHANGELOG.md            | 16 +++++++++++++++-
 lib/mastodon/version.rb |  4 ++--
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 46652abf1b1852..565634ff7104b8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,18 @@ All changes to Catstodon that aren't Mastodon or glitch-soc Mastodon changes wil
 
 All release dates, as well as most other dates, are intended to be read as "within the day, in UTC time."
 
+## [4.3.0-beta.1+cat.1.0.0] - 2024-08-26
+
+- Upstream (glitch-soc) changes
+- Shorter versioning scheme (drops "glitch" in version)
+  - It is obvious this code is still, and will for the foreseeable future, be based on glitch-soc.
+- Release model changes
+  - Glitch-soc is trying out releases. We will, similarly, do releases as well.
+  - This means the main branch will now contain "nightly, but stable enough" states, similar to glitch-soc's main
+    branch, but not every wave of commits to main will be accompanied by a new version.
+  - Each glitch-soc release will be accompanied by a Catstodon release eventually.
+  - Releases are now made whenever glitch-soc does one, or when important bugs are fixed either upstream or in Catstodon.
+
 ## [4.3.0-alpha.5+glitch+cat+1.0.10] - 2024-08-16
 
 - Upstream changes. See [CHANGELOG_glitch.md](CHANGELOG_glitch.md), version 4.2.11.
@@ -38,7 +50,9 @@ All release dates, as well as most other dates, are intended to be read as "with
 - Upstream changes
   - Fixes for intermittent errors in grouped notifications
 - Emoji reaction patch changes
-  - "Fix reactions bar alignment in ungrouped notifications" ([30899e050e](https://git.kescher.at/CatCatNya/catstodon/commit/30899e050e4de5952da14278e804ea23110f9204)) by Essem
+  - "Fix reactions bar alignment in ungrouped
+    notifications" ([30899e050e](https://git.kescher.at/CatCatNya/catstodon/commit/30899e050e4de5952da14278e804ea23110f9204))
+    by Essem
   - Other commit for i18n fixes was already applied in Catstodon.
 
 ## [v4.3.0-alpha.5+glitch+cat+1.0.2] - 2024-07-16
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index 3de5e2c6f1d5bc..42c8b9ea1aa425 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -25,11 +25,11 @@ def prerelease
     end
 
     def catstodon_revision
-      '1.0.10'
+      '1.0.0'
     end
 
     def build_metadata
-      ["glitch+cat+#{catstodon_revision}", ENV.fetch('MASTODON_VERSION_METADATA', nil)].compact_blank.join('.')
+      ["cat.#{catstodon_revision}", ENV.fetch('MASTODON_VERSION_METADATA', nil)].compact_blank.join('.')
     end
 
     def to_a

From 8f678a3cf4e6f0c29ab03442141f2ddbcc78b489 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 26 Aug 2024 19:08:42 +0200
Subject: [PATCH 1973/2191] Fix tests for glitch-soc

---
 spec/requests/manifest_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/requests/manifest_spec.rb b/spec/requests/manifest_spec.rb
index 749c4038dfe377..f68202aca624a4 100644
--- a/spec/requests/manifest_spec.rb
+++ b/spec/requests/manifest_spec.rb
@@ -15,7 +15,7 @@
       expect(body_as_json)
         .to include(
           id: '/home',
-          name: 'Mastodon'
+          name: 'Mastodon Glitch Edition'
         )
     end
 

From 29b9642b315a30ca5d3dd9375fa85ab8fe74ad52 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 26 Aug 2024 19:12:17 +0200
Subject: [PATCH 1974/2191] Change design of boost modal in web UI (#31555)

---
 .../features/ui/components/boost_modal.tsx    | 170 ++++++++----------
 app/javascript/mastodon/locales/en.json       |   2 +
 .../styles/mastodon/components.scss           |  61 +++++++
 3 files changed, 135 insertions(+), 98 deletions(-)

diff --git a/app/javascript/mastodon/features/ui/components/boost_modal.tsx b/app/javascript/mastodon/features/ui/components/boost_modal.tsx
index 40b0c81833001a..cdf7138d496d51 100644
--- a/app/javascript/mastodon/features/ui/components/boost_modal.tsx
+++ b/app/javascript/mastodon/features/ui/components/boost_modal.tsx
@@ -1,28 +1,17 @@
-import type { MouseEventHandler } from 'react';
 import { useCallback, useState } from 'react';
 
 import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
 
 import classNames from 'classnames';
-import { useHistory } from 'react-router';
-
-import type Immutable from 'immutable';
 
 import RepeatIcon from '@/material-icons/400-24px/repeat.svg?react';
-import AttachmentList from 'mastodon/components/attachment_list';
+import { Button } from 'mastodon/components/button';
 import { Icon } from 'mastodon/components/icon';
-import { VisibilityIcon } from 'mastodon/components/visibility_icon';
 import PrivacyDropdown from 'mastodon/features/compose/components/privacy_dropdown';
-import type { Account } from 'mastodon/models/account';
+import { EmbeddedStatus } from 'mastodon/features/notifications_v2/components/embedded_status';
 import type { Status, StatusVisibility } from 'mastodon/models/status';
 import { useAppSelector } from 'mastodon/store';
 
-import { Avatar } from '../../../components/avatar';
-import { Button } from '../../../components/button';
-import { DisplayName } from '../../../components/display_name';
-import { RelativeTimestamp } from '../../../components/relative_timestamp';
-import StatusContent from '../../../components/status_content';
-
 const messages = defineMessages({
   cancel_reblog: {
     id: 'status.cancel_reblog_private',
@@ -37,18 +26,17 @@ export const BoostModal: React.FC<{
   onReblog: (status: Status, privacy: StatusVisibility) => void;
 }> = ({ status, onReblog, onClose }) => {
   const intl = useIntl();
-  const history = useHistory();
 
-  const default_privacy = useAppSelector(
+  const defaultPrivacy = useAppSelector(
     // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
     (state) => state.compose.get('default_privacy') as StatusVisibility,
   );
 
-  const account = status.get('account') as Account;
+  const statusId = status.get('id') as string;
   const statusVisibility = status.get('visibility') as StatusVisibility;
 
   const [privacy, setPrivacy] = useState<StatusVisibility>(
-    statusVisibility === 'private' ? 'private' : default_privacy,
+    statusVisibility === 'private' ? 'private' : defaultPrivacy,
   );
 
   const onPrivacyChange = useCallback((value: StatusVisibility) => {
@@ -60,20 +48,9 @@ export const BoostModal: React.FC<{
     onClose();
   }, [onClose, onReblog, status, privacy]);
 
-  const handleAccountClick = useCallback<MouseEventHandler>(
-    (e) => {
-      if (e.button === 0 && !(e.ctrlKey || e.metaKey)) {
-        e.preventDefault();
-        onClose();
-        history.push(`/@${account.acct}`);
-      }
-    },
-    [history, onClose, account],
-  );
-
-  const buttonText = status.get('reblogged')
-    ? messages.cancel_reblog
-    : messages.reblog;
+  const handleCancel = useCallback(() => {
+    onClose();
+  }, [onClose]);
 
   const findContainer = useCallback(
     () => document.getElementsByClassName('modal-root__container')[0],
@@ -81,81 +58,78 @@ export const BoostModal: React.FC<{
   );
 
   return (
-    <div className='modal-root__modal boost-modal'>
-      <div className='boost-modal__container'>
-        <div
-          className={classNames(
-            'status',
-            `status-${statusVisibility}`,
-            'light',
-          )}
-        >
-          <div className='status__info'>
-            <a
-              href={`/@${account.acct}/${status.get('id') as string}`}
-              className='status__relative-time'
-              target='_blank'
-              rel='noopener noreferrer'
-            >
-              <span className='status__visibility-icon'>
-                <VisibilityIcon visibility={statusVisibility} />
-              </span>
-              <RelativeTimestamp
-                timestamp={status.get('created_at') as string}
-              />
-            </a>
-
-            <a
-              onClick={handleAccountClick}
-              href={`/@${account.acct}`}
-              className='status__display-name'
-            >
-              <div className='status__avatar'>
-                <Avatar account={account} size={48} />
-              </div>
-
-              <DisplayName account={account} />
-            </a>
+    <div className='modal-root__modal safety-action-modal'>
+      <div className='safety-action-modal__top'>
+        <div className='safety-action-modal__header'>
+          <div className='safety-action-modal__header__icon'>
+            <Icon icon={RepeatIcon} id='retweet' />
           </div>
 
-          {/* @ts-expect-error Expected until StatusContent is typed */}
-          <StatusContent status={status} />
+          <div>
+            <h1>
+              {status.get('reblogged') ? (
+                <FormattedMessage
+                  id='boost_modal.undo_reblog'
+                  defaultMessage='Unboost post?'
+                />
+              ) : (
+                <FormattedMessage
+                  id='boost_modal.reblog'
+                  defaultMessage='Boost post?'
+                />
+              )}
+            </h1>
+            <div>
+              <FormattedMessage
+                id='boost_modal.combo'
+                defaultMessage='You can press {combo} to skip this next time'
+                values={{
+                  combo: (
+                    <span className='hotkey-combination'>
+                      <kbd>Shift</kbd>+<Icon id='retweet' icon={RepeatIcon} />
+                    </span>
+                  ),
+                }}
+              />
+            </div>
+          </div>
+        </div>
 
-          {(status.get('media_attachments') as Immutable.List<unknown>).size >
-            0 && (
-            <AttachmentList compact media={status.get('media_attachments')} />
-          )}
+        <div className='safety-action-modal__status'>
+          <EmbeddedStatus statusId={statusId} />
         </div>
       </div>
 
-      <div className='boost-modal__action-bar'>
-        <div>
-          <FormattedMessage
-            id='boost_modal.combo'
-            defaultMessage='You can press {combo} to skip this next time'
-            values={{
-              combo: (
-                <span>
-                  Shift + <Icon id='retweet' icon={RepeatIcon} />
-                </span>
-              ),
-            }}
+      <div className={classNames('safety-action-modal__bottom')}>
+        <div className='safety-action-modal__actions'>
+          {!status.get('reblogged') && (
+            <PrivacyDropdown
+              noDirect
+              value={privacy}
+              container={findContainer}
+              onChange={onPrivacyChange}
+              disabled={statusVisibility === 'private'}
+            />
+          )}
+
+          <div className='spacer' />
+
+          <button onClick={handleCancel} className='link-button'>
+            <FormattedMessage
+              id='confirmation_modal.cancel'
+              defaultMessage='Cancel'
+            />
+          </button>
+
+          <Button
+            onClick={handleReblog}
+            text={intl.formatMessage(
+              status.get('reblogged')
+                ? messages.cancel_reblog
+                : messages.reblog,
+            )}
           />
         </div>
-        {statusVisibility !== 'private' && !status.get('reblogged') && (
-          <PrivacyDropdown
-            noDirect
-            value={privacy}
-            container={findContainer}
-            onChange={onPrivacyChange}
-          />
-        )}
-        <Button
-          text={intl.formatMessage(buttonText)}
-          onClick={handleReblog}
-          // eslint-disable-next-line jsx-a11y/no-autofocus
-          autoFocus
-        />
       </div>
     </div>
   );
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index 343af40424b635..4321acef4b7651 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -97,6 +97,8 @@
   "block_modal.title": "Block user?",
   "block_modal.you_wont_see_mentions": "You won't see posts that mention them.",
   "boost_modal.combo": "You can press {combo} to skip this next time",
+  "boost_modal.reblog": "Boost post?",
+  "boost_modal.undo_reblog": "Unboost post?",
   "bundle_column_error.copy_stacktrace": "Copy error report",
   "bundle_column_error.error.body": "The requested page could not be rendered. It could be due to a bug in our code, or a browser compatibility issue.",
   "bundle_column_error.error.title": "Oh, no!",
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 6157a83af42446..0b0cbbfa84fc49 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -6142,6 +6142,48 @@ a.status-card {
     }
   }
 
+  &__status {
+    border: 1px solid var(--modal-border-color);
+    border-radius: 8px;
+    padding: 8px;
+    cursor: pointer;
+
+    &__account {
+      display: flex;
+      align-items: center;
+      gap: 4px;
+      margin-bottom: 8px;
+      color: $dark-text-color;
+
+      bdi {
+        color: inherit;
+      }
+    }
+
+    &__content {
+      display: -webkit-box;
+      font-size: 15px;
+      line-height: 22px;
+      color: $dark-text-color;
+      -webkit-line-clamp: 4;
+      -webkit-box-orient: vertical;
+      max-height: 4 * 22px;
+      overflow: hidden;
+
+      p,
+      a {
+        color: inherit;
+      }
+    }
+
+    .reply-indicator__attachments {
+      margin-top: 0;
+      font-size: 15px;
+      line-height: 22px;
+      color: $dark-text-color;
+    }
+  }
+
   &__bullet-points {
     display: flex;
     flex-direction: column;
@@ -6219,6 +6261,12 @@ a.status-card {
     gap: 8px;
     justify-content: flex-end;
 
+    &__hint {
+      font-size: 14px;
+      line-height: 20px;
+      color: $dark-text-color;
+    }
+
     .link-button {
       padding: 10px 12px;
       font-weight: 600;
@@ -6226,6 +6274,18 @@ a.status-card {
   }
 }
 
+.hotkey-combination {
+  display: inline-flex;
+  align-items: center;
+  gap: 4px;
+
+  kbd {
+    padding: 3px 5px;
+    border: 1px solid var(--background-border-color);
+    border-radius: 4px;
+  }
+}
+
 .boost-modal,
 .report-modal,
 .actions-modal,
@@ -10579,6 +10639,7 @@ noscript {
     }
 
     .reply-indicator__attachments {
+      margin-top: 0;
       font-size: 15px;
       line-height: 22px;
       color: $dark-text-color;

From 14d7fe05d05473a5b078ad397cc078f1b033c5b5 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 27 Aug 2024 03:40:18 -0400
Subject: [PATCH 1975/2191] Use `describe` instead of `context` in top-level
 spec declaration (#31607)

---
 spec/requests/anonymous_cookies_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/requests/anonymous_cookies_spec.rb b/spec/requests/anonymous_cookies_spec.rb
index 427f54e449ca03..337ed4ec31cd28 100644
--- a/spec/requests/anonymous_cookies_spec.rb
+++ b/spec/requests/anonymous_cookies_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-context 'when visited anonymously' do
+describe 'Anonymous visits' do
   around do |example|
     old = ActionController::Base.allow_forgery_protection
     ActionController::Base.allow_forgery_protection = true

From c09d232ee33f14a17b32ead7caa3aa2332d4b3d3 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 27 Aug 2024 03:42:35 -0400
Subject: [PATCH 1976/2191] Convert `api/web/settings` controller spec to
 request spec (#31606)

---
 .../api/web/settings_controller_spec.rb       | 24 -----------
 spec/requests/api/web/settings_spec.rb        | 41 +++++++++++++++++++
 2 files changed, 41 insertions(+), 24 deletions(-)
 delete mode 100644 spec/controllers/api/web/settings_controller_spec.rb
 create mode 100644 spec/requests/api/web/settings_spec.rb

diff --git a/spec/controllers/api/web/settings_controller_spec.rb b/spec/controllers/api/web/settings_controller_spec.rb
deleted file mode 100644
index 815da04c477854..00000000000000
--- a/spec/controllers/api/web/settings_controller_spec.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe Api::Web::SettingsController do
-  render_views
-
-  let!(:user) { Fabricate(:user) }
-
-  describe 'PATCH #update' do
-    it 'redirects to about page' do
-      sign_in(user)
-      patch :update, format: :json, params: { data: { 'onboarded' => true } }
-
-      user.reload
-      expect(response).to have_http_status(200)
-      expect(user_web_setting.data['onboarded']).to eq('true')
-    end
-
-    def user_web_setting
-      Web::Setting.where(user: user).first
-    end
-  end
-end
diff --git a/spec/requests/api/web/settings_spec.rb b/spec/requests/api/web/settings_spec.rb
new file mode 100644
index 00000000000000..81b8b449535a18
--- /dev/null
+++ b/spec/requests/api/web/settings_spec.rb
@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe '/api/web/settings' do
+  describe 'PATCH /api/web/settings' do
+    let(:user) { Fabricate :user }
+
+    context 'when signed in' do
+      before { sign_in(user) }
+
+      it 'updates setting and responds with success' do
+        patch '/api/web/settings', params: { data: { 'onboarded' => true } }
+
+        expect(user_web_setting.data)
+          .to include('onboarded' => 'true')
+
+        expect(response)
+          .to have_http_status(200)
+      end
+    end
+
+    context 'when not signed in' do
+      it 'responds with unprocessable and does not modify setting' do
+        patch '/api/web/settings', params: { data: { 'onboarded' => true } }
+
+        expect(user_web_setting)
+          .to be_nil
+
+        expect(response)
+          .to have_http_status(422)
+      end
+    end
+
+    def user_web_setting
+      Web::Setting
+        .where(user: user)
+        .first
+    end
+  end
+end

From 0e7c88aa6df12e2927396518f7663b07fb9660f2 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 27 Aug 2024 09:54:58 +0200
Subject: [PATCH 1977/2191] New Crowdin Translations (automated) (#31609)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/ca.json    |  4 ++++
 app/javascript/mastodon/locales/de.json    |  4 ++++
 app/javascript/mastodon/locales/es-AR.json |  4 ++++
 app/javascript/mastodon/locales/et.json    |  3 +++
 app/javascript/mastodon/locales/fi.json    |  4 ++++
 app/javascript/mastodon/locales/gl.json    |  4 ++++
 app/javascript/mastodon/locales/is.json    |  4 ++++
 app/javascript/mastodon/locales/ja.json    | 10 ++++++++++
 app/javascript/mastodon/locales/ko.json    |  7 ++++++-
 app/javascript/mastodon/locales/lt.json    |  4 ++++
 app/javascript/mastodon/locales/nl.json    |  3 +++
 app/javascript/mastodon/locales/pl.json    |  4 ++++
 app/javascript/mastodon/locales/sq.json    |  4 ++++
 app/javascript/mastodon/locales/zh-TW.json |  4 ++++
 config/locales/ko.yml                      |  1 +
 config/locales/simple_form.et.yml          |  3 +++
 16 files changed, 66 insertions(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index 727c161873c209..d99b5c7375d8e6 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -97,6 +97,8 @@
   "block_modal.title": "Bloquem l'usuari?",
   "block_modal.you_wont_see_mentions": "No veureu publicacions que l'esmentin.",
   "boost_modal.combo": "Pots prémer {combo} per a evitar-ho el pròxim cop",
+  "boost_modal.reblog": "Voleu impulsar la publicació?",
+  "boost_modal.undo_reblog": "Voleu retirar l'impuls a la publicació?",
   "bundle_column_error.copy_stacktrace": "Copia l'informe d'error",
   "bundle_column_error.error.body": "No s'ha pogut renderitzar la pàgina sol·licitada. Podria ser per un error en el nostre codi o per un problema de compatibilitat del navegador.",
   "bundle_column_error.error.title": "Oh, no!",
@@ -467,6 +469,7 @@
   "mute_modal.you_wont_see_mentions": "No veureu publicacions que els esmentin.",
   "mute_modal.you_wont_see_posts": "Encara poden veure les vostres publicacions, però no veureu les seves.",
   "navigation_bar.about": "Quant a",
+  "navigation_bar.administration": "Administració",
   "navigation_bar.advanced_interface": "Obre en la interfície web avançada",
   "navigation_bar.blocks": "Usuaris blocats",
   "navigation_bar.bookmarks": "Marcadors",
@@ -483,6 +486,7 @@
   "navigation_bar.follows_and_followers": "Seguint i seguidors",
   "navigation_bar.lists": "Llistes",
   "navigation_bar.logout": "Tanca la sessió",
+  "navigation_bar.moderation": "Moderació",
   "navigation_bar.mutes": "Usuaris silenciats",
   "navigation_bar.opened_in_classic_interface": "Els tuts, comptes i altres pàgines especifiques s'obren per defecte en la interfície web clàssica.",
   "navigation_bar.personal": "Personal",
diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json
index b960649eb21c1d..8e52cf10863257 100644
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@@ -97,6 +97,8 @@
   "block_modal.title": "Profil blockieren?",
   "block_modal.you_wont_see_mentions": "Du wirst keine Beiträge sehen, die dieses Profil erwähnen.",
   "boost_modal.combo": "Mit {combo} erscheint dieses Fenster beim nächsten Mal nicht mehr",
+  "boost_modal.reblog": "Beitrag teilen?",
+  "boost_modal.undo_reblog": "Beitrag nicht mehr teilen?",
   "bundle_column_error.copy_stacktrace": "Fehlerbericht kopieren",
   "bundle_column_error.error.body": "Die angeforderte Seite konnte nicht dargestellt werden. Dies könnte auf einen Fehler in unserem Code oder auf ein Browser-Kompatibilitätsproblem zurückzuführen sein.",
   "bundle_column_error.error.title": "Oh nein!",
@@ -467,6 +469,7 @@
   "mute_modal.you_wont_see_mentions": "Du wirst keine Beiträge sehen, die dieses Profil erwähnen.",
   "mute_modal.you_wont_see_posts": "Deine Beiträge können weiterhin angesehen werden, aber du wirst deren Beiträge nicht mehr sehen.",
   "navigation_bar.about": "Über",
+  "navigation_bar.administration": "Administration",
   "navigation_bar.advanced_interface": "Im erweiterten Webinterface öffnen",
   "navigation_bar.blocks": "Blockierte Profile",
   "navigation_bar.bookmarks": "Lesezeichen",
@@ -483,6 +486,7 @@
   "navigation_bar.follows_and_followers": "Follower und Folge ich",
   "navigation_bar.lists": "Listen",
   "navigation_bar.logout": "Abmelden",
+  "navigation_bar.moderation": "Moderation",
   "navigation_bar.mutes": "Stummgeschaltete Profile",
   "navigation_bar.opened_in_classic_interface": "Beiträge, Konten und andere bestimmte Seiten werden standardmäßig im klassischen Webinterface geöffnet.",
   "navigation_bar.personal": "Persönlich",
diff --git a/app/javascript/mastodon/locales/es-AR.json b/app/javascript/mastodon/locales/es-AR.json
index 21e70dd98de3ab..c3915c9b746717 100644
--- a/app/javascript/mastodon/locales/es-AR.json
+++ b/app/javascript/mastodon/locales/es-AR.json
@@ -97,6 +97,8 @@
   "block_modal.title": "¿Bloquear usuario?",
   "block_modal.you_wont_see_mentions": "No verás mensajes que los mencionen.",
   "boost_modal.combo": "Podés hacer clic en {combo} para saltar esto la próxima vez",
+  "boost_modal.reblog": "¿Adherir al mensaje?",
+  "boost_modal.undo_reblog": "¿Dejar de adherir al mensaje?",
   "bundle_column_error.copy_stacktrace": "Copiar informe de error",
   "bundle_column_error.error.body": "La página solicitada no pudo ser cargada. Podría deberse a un error de programación en nuestro código o a un problema de compatibilidad con el navegador web.",
   "bundle_column_error.error.title": "¡Epa!",
@@ -467,6 +469,7 @@
   "mute_modal.you_wont_see_mentions": "No verás mensajes que los mencionen.",
   "mute_modal.you_wont_see_posts": "Todavía pueden ver tus mensajes, pero vos no verás los suyos.",
   "navigation_bar.about": "Información",
+  "navigation_bar.administration": "Administración",
   "navigation_bar.advanced_interface": "Abrir en interface web avanzada",
   "navigation_bar.blocks": "Usuarios bloqueados",
   "navigation_bar.bookmarks": "Marcadores",
@@ -483,6 +486,7 @@
   "navigation_bar.follows_and_followers": "Cuentas seguidas y seguidores",
   "navigation_bar.lists": "Listas",
   "navigation_bar.logout": "Cerrar sesión",
+  "navigation_bar.moderation": "Moderación",
   "navigation_bar.mutes": "Usuarios silenciados",
   "navigation_bar.opened_in_classic_interface": "Los mensajes, las cuentas y otras páginas específicas se abren predeterminadamente en la interface web clásica.",
   "navigation_bar.personal": "Personal",
diff --git a/app/javascript/mastodon/locales/et.json b/app/javascript/mastodon/locales/et.json
index 80c65804fadd18..5caa258cd2093b 100644
--- a/app/javascript/mastodon/locales/et.json
+++ b/app/javascript/mastodon/locales/et.json
@@ -33,7 +33,9 @@
   "account.follow_back": "Jälgi vastu",
   "account.followers": "Jälgijad",
   "account.followers.empty": "Keegi ei jälgi veel seda kasutajat.",
+  "account.followers_counter": "{count, plural, one {{counter} jälgija} other {{counter} jälgijat}}",
   "account.following": "Jälgib",
+  "account.following_counter": "{count, plural, one {{counter} jälgib} other {{counter} jälgib}}",
   "account.follows.empty": "See kasutaja ei jälgi veel kedagi.",
   "account.go_to_profile": "Mine profiilile",
   "account.hide_reblogs": "Peida @{name} jagamised",
@@ -59,6 +61,7 @@
   "account.requested_follow": "{name} on taodelnud sinu jälgimist",
   "account.share": "Jaga @{name} profiili",
   "account.show_reblogs": "Näita @{name} jagamisi",
+  "account.statuses_counter": "{count, plural, one {{counter} postitus} other {{counter} postitust}}",
   "account.unblock": "Eemalda blokeering @{name}",
   "account.unblock_domain": "Tee {domain} nähtavaks",
   "account.unblock_short": "Eemalda blokeering",
diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index 10f9d79614eb05..39df3e010f5cc4 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -97,6 +97,8 @@
   "block_modal.title": "Estetäänkö käyttäjä?",
   "block_modal.you_wont_see_mentions": "Et näe enää julkaisuja, joissa hänet mainitaan.",
   "boost_modal.combo": "Ensi kerralla voit ohittaa tämän painamalla {combo}",
+  "boost_modal.reblog": "Tehostetaanko julkaisua?",
+  "boost_modal.undo_reblog": "Perutaanko julkaisun tehostus?",
   "bundle_column_error.copy_stacktrace": "Kopioi virheraportti",
   "bundle_column_error.error.body": "Pyydettyä sivua ei voitu hahmontaa. Se voi johtua virheestä koodissamme tai selaimen yhteensopivuudessa.",
   "bundle_column_error.error.title": "Voi ei!",
@@ -467,6 +469,7 @@
   "mute_modal.you_wont_see_mentions": "Et näe enää julkaisuja, joissa hänet mainitaan.",
   "mute_modal.you_wont_see_posts": "Hän voi yhä nähdä julkaisusi, mutta sinä et näe hänen.",
   "navigation_bar.about": "Tietoja",
+  "navigation_bar.administration": "Ylläpito",
   "navigation_bar.advanced_interface": "Avaa edistyneessä selainkäyttöliittymässä",
   "navigation_bar.blocks": "Estetyt käyttäjät",
   "navigation_bar.bookmarks": "Kirjanmerkit",
@@ -483,6 +486,7 @@
   "navigation_bar.follows_and_followers": "Seuratut ja seuraajat",
   "navigation_bar.lists": "Listat",
   "navigation_bar.logout": "Kirjaudu ulos",
+  "navigation_bar.moderation": "Moderointi",
   "navigation_bar.mutes": "Mykistetyt käyttäjät",
   "navigation_bar.opened_in_classic_interface": "Julkaisut, profiilit ja tietyt muut sivut avautuvat oletuksena perinteiseen selainkäyttöliittymään.",
   "navigation_bar.personal": "Henkilökohtaiset",
diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json
index 9da7438da6a747..5a5ac1dd382bf9 100644
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@@ -97,6 +97,8 @@
   "block_modal.title": "Bloquear usuaria?",
   "block_modal.you_wont_see_mentions": "Non verás publicacións que a mencionen.",
   "boost_modal.combo": "Preme {combo} para ignorar isto na seguinte vez",
+  "boost_modal.reblog": "Promover publicación?",
+  "boost_modal.undo_reblog": "Retirar promoción?",
   "bundle_column_error.copy_stacktrace": "Copiar informe do erro",
   "bundle_column_error.error.body": "Non se puido mostrar a páxina solicitada. Podería deberse a un problema no código, ou incompatiblidade co navegador.",
   "bundle_column_error.error.title": "Vaites!",
@@ -467,6 +469,7 @@
   "mute_modal.you_wont_see_mentions": "Non verás as publicacións que a mencionen.",
   "mute_modal.you_wont_see_posts": "Seguirá podendo ler as túas publicacións, pero non verás as súas.",
   "navigation_bar.about": "Sobre",
+  "navigation_bar.administration": "Administración",
   "navigation_bar.advanced_interface": "Abrir coa interface web avanzada",
   "navigation_bar.blocks": "Usuarias bloqueadas",
   "navigation_bar.bookmarks": "Marcadores",
@@ -483,6 +486,7 @@
   "navigation_bar.follows_and_followers": "Seguindo e seguidoras",
   "navigation_bar.lists": "Listaxes",
   "navigation_bar.logout": "Pechar sesión",
+  "navigation_bar.moderation": "Moderación",
   "navigation_bar.mutes": "Usuarias silenciadas",
   "navigation_bar.opened_in_classic_interface": "Publicacións, contas e outras páxinas dedicadas ábrense por defecto na interface web clásica.",
   "navigation_bar.personal": "Persoal",
diff --git a/app/javascript/mastodon/locales/is.json b/app/javascript/mastodon/locales/is.json
index 49b31755fa5ba9..54fbee48e62dfd 100644
--- a/app/javascript/mastodon/locales/is.json
+++ b/app/javascript/mastodon/locales/is.json
@@ -97,6 +97,8 @@
   "block_modal.title": "Útiloka notanda?",
   "block_modal.you_wont_see_mentions": "Þú munt ekki sjá færslur sem minnast á viðkomandi aðila.",
   "boost_modal.combo": "Þú getur ýtt á {combo} til að sleppa þessu næst",
+  "boost_modal.reblog": "Endurbirta færslu?",
+  "boost_modal.undo_reblog": "Taka færslu úr endurbirtingu?",
   "bundle_column_error.copy_stacktrace": "Afrita villuskýrslu",
   "bundle_column_error.error.body": "Umbeðna síðau var ekki hægt að myndgera. Það gæti verið vegna villu í kóðanum okkar eða vandamáls með samhæfni vafra.",
   "bundle_column_error.error.title": "Ó-nei!",
@@ -467,6 +469,7 @@
   "mute_modal.you_wont_see_mentions": "Þú munt ekki sjá færslur sem minnast á viðkomandi aðila.",
   "mute_modal.you_wont_see_posts": "Viðkomandi geta áfram séð færslurnar þínar en þú munt ekki sjá færslurnar þeirra.",
   "navigation_bar.about": "Um hugbúnaðinn",
+  "navigation_bar.administration": "Stjórnun",
   "navigation_bar.advanced_interface": "Opna í ítarlegu vefviðmóti",
   "navigation_bar.blocks": "Útilokaðir notendur",
   "navigation_bar.bookmarks": "Bókamerki",
@@ -483,6 +486,7 @@
   "navigation_bar.follows_and_followers": "Fylgist með og fylgjendur",
   "navigation_bar.lists": "Listar",
   "navigation_bar.logout": "Útskráning",
+  "navigation_bar.moderation": "Umsjón",
   "navigation_bar.mutes": "Þaggaðir notendur",
   "navigation_bar.opened_in_classic_interface": "Færslur, notendaaðgangar og aðrar sérhæfðar síður eru sjálfgefið opnaðar í klassíska vefviðmótinu.",
   "navigation_bar.personal": "Einka",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index ee4ba949b97638..8784c6d1a82788 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -502,7 +502,17 @@
   "notification.status": "{name}さんが投稿しました",
   "notification.update": "{name}さんが投稿を編集しました",
   "notification_requests.accept": "受け入れる",
+  "notification_requests.accept_multiple": "{count, plural, other {選択中の#件を受け入れる}}",
+  "notification_requests.confirm_accept_multiple.button": "{count, plural, other {#件のアカウントを受け入れる}}",
+  "notification_requests.confirm_accept_multiple.message": "{count, plural, other {#件のアカウント}}に対して今後通知を受け入れるようにします。よろしいですか？",
+  "notification_requests.confirm_accept_multiple.title": "保留中のアカウントの受け入れ",
+  "notification_requests.confirm_dismiss_multiple.button": "{count, plural, other {#件のアカウントを無視する}}",
+  "notification_requests.confirm_dismiss_multiple.message": "{count, plural, other {#件のアカウント}}からの通知を今後無視するようにします。一度この操作を行った{count, plural, other {アカウント}}とふたたび出会うことは容易ではありません。よろしいですか？",
+  "notification_requests.confirm_dismiss_multiple.title": "保留中のアカウントを無視しようとしています",
   "notification_requests.dismiss": "無視",
+  "notification_requests.dismiss_multiple": "{count, plural, other {選択中の#件を無視する}}",
+  "notification_requests.edit_selection": "選択",
+  "notification_requests.exit_selection": "選択の終了",
   "notification_requests.explainer_for_limited_account": "このアカウントはモデレーターにより制限が課されているため、このアカウントによる通知は保留されています",
   "notification_requests.explainer_for_limited_remote_account": "このアカウントが所属するサーバーはモデレーターにより制限が課されているため、このアカウントによる通知は保留されています",
   "notification_requests.minimize_banner": "「保留中の通知」のバナーを最小化する",
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index 32a846308d890d..3b4434fef70f5d 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -498,9 +498,13 @@
   "notification.admin.report_statuses": "{name} 님이 {target}을 {category}로 신고했습니다",
   "notification.admin.report_statuses_other": "{name} 님이 {target}을 신고했습니다",
   "notification.admin.sign_up": "{name} 님이 가입했습니다",
+  "notification.admin.sign_up.name_and_others": "{name} 외 {count, plural, other {# 명}}이 가입했습니다",
   "notification.favourite": "{name} 님이 내 게시물을 좋아합니다",
+  "notification.favourite.name_and_others_with_link": "{name} 외 <a>{count, plural, other {# 명}}</a>이 내 게시물을 좋아합니다",
   "notification.follow": "{name} 님이 나를 팔로우했습니다",
+  "notification.follow.name_and_others": "{name} 외 {count, plural, other {# 명}}이 날 팔로우 했습니다",
   "notification.follow_request": "{name} 님이 팔로우 요청을 보냈습니다",
+  "notification.follow_request.name_and_others": "{name} 외 {count, plural, other {# 명}}이 나에게 팔로우 요청을 보냈습니다",
   "notification.label.mention": "멘션",
   "notification.label.private_mention": "개인 멘션",
   "notification.label.private_reply": "개인 답글",
@@ -518,6 +522,7 @@
   "notification.own_poll": "설문을 마침",
   "notification.poll": "참여한 투표가 끝났습니다",
   "notification.reblog": "{name} 님이 부스트했습니다",
+  "notification.reblog.name_and_others_with_link": "{name} 외 <a>{count, plural, other {# 명}}</a>이 내 게시물을 부스트했습니다",
   "notification.relationships_severance_event": "{name} 님과의 연결이 끊어졌습니다",
   "notification.relationships_severance_event.account_suspension": "{from}의 관리자가 {target}를 정지시켰기 때문에 그들과 더이상 상호작용 할 수 없고 정보를 받아볼 수 없습니다.",
   "notification.relationships_severance_event.domain_block": "{from}의 관리자가 {target}를 차단하였고 여기에는 나의 {followersCount} 명의 팔로워와 {followingCount, plural, other {#}} 명의 팔로우가 포함되었습니다.",
@@ -851,7 +856,7 @@
   "upload_modal.description_placeholder": "다람쥐 헌 쳇바퀴 타고파",
   "upload_modal.detect_text": "사진에서 문자 탐색",
   "upload_modal.edit_media": "미디어 수정",
-  "upload_modal.hint": "미리보기를 클릭하거나 드래그 해서 포컬 포인트를 맞추세요. 이 점은 썸네일에 항상 보여질 부분을 나타냅니다.",
+  "upload_modal.hint": "미리보기를 클릭하거나 드래그 해서 초점을 맞추세요. 이 점은 썸네일에서 항상 보여질 부분을 나타냅니다.",
   "upload_modal.preparing_ocr": "OCR 준비 중…",
   "upload_modal.preview_label": "미리보기 ({ratio})",
   "upload_progress.label": "업로드 중...",
diff --git a/app/javascript/mastodon/locales/lt.json b/app/javascript/mastodon/locales/lt.json
index 027326f9cb1645..051fd3717cc773 100644
--- a/app/javascript/mastodon/locales/lt.json
+++ b/app/javascript/mastodon/locales/lt.json
@@ -97,6 +97,8 @@
   "block_modal.title": "Blokuoti naudotoją?",
   "block_modal.you_wont_see_mentions": "Nematysi įrašus, kuriuose jie paminimi.",
   "boost_modal.combo": "Galima paspausti {combo}, kad praleisti tai kitą kartą",
+  "boost_modal.reblog": "Pasidalinti įrašą?",
+  "boost_modal.undo_reblog": "Panaikinti pasidalintą įrašą?",
   "bundle_column_error.copy_stacktrace": "Kopijuoti klaidos ataskaitą",
   "bundle_column_error.error.body": "Paprašytos puslapio nepavyko atvaizduoti. Tai gali būti dėl mūsų kodo klaidos arba naršyklės suderinamumo problemos.",
   "bundle_column_error.error.title": "O, ne!",
@@ -467,6 +469,7 @@
   "mute_modal.you_wont_see_mentions": "Nematysi įrašus, kuriuose jie paminimi.",
   "mute_modal.you_wont_see_posts": "Jie vis tiek gali matyti tavo įrašus, bet tu nematysi jų.",
   "navigation_bar.about": "Apie",
+  "navigation_bar.administration": "Administravimas",
   "navigation_bar.advanced_interface": "Atidaryti išplėstinę žiniatinklio sąsają",
   "navigation_bar.blocks": "Užblokuoti naudotojai",
   "navigation_bar.bookmarks": "Žymės",
@@ -483,6 +486,7 @@
   "navigation_bar.follows_and_followers": "Sekimai ir sekėjai",
   "navigation_bar.lists": "Sąrašai",
   "navigation_bar.logout": "Atsijungti",
+  "navigation_bar.moderation": "Prižiūrėjimas",
   "navigation_bar.mutes": "Nutildyti naudotojai",
   "navigation_bar.opened_in_classic_interface": "Įrašai, paskyros ir kiti konkretūs puslapiai pagal numatytuosius nustatymus atidaromi klasikinėje žiniatinklio sąsajoje.",
   "navigation_bar.personal": "Asmeninis",
diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json
index b15c09feadf172..3362cf36ce1225 100644
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@@ -97,6 +97,7 @@
   "block_modal.title": "Gebruiker blokkeren?",
   "block_modal.you_wont_see_mentions": "Je ziet geen berichten meer die dit account vermelden.",
   "boost_modal.combo": "Je kunt {combo} klikken om dit de volgende keer over te slaan",
+  "boost_modal.reblog": "Bericht boosten?",
   "bundle_column_error.copy_stacktrace": "Foutrapportage kopiëren",
   "bundle_column_error.error.body": "De opgevraagde pagina kon niet worden weergegeven. Dit kan het gevolg zijn van een fout in onze broncode, of van een compatibiliteitsprobleem met je webbrowser.",
   "bundle_column_error.error.title": "O nee!",
@@ -467,6 +468,7 @@
   "mute_modal.you_wont_see_mentions": "Je ziet geen berichten meer die dit account vermelden.",
   "mute_modal.you_wont_see_posts": "De persoon kan nog steeds jouw berichten zien, maar diens berichten zie je niet meer.",
   "navigation_bar.about": "Over",
+  "navigation_bar.administration": "Beheer",
   "navigation_bar.advanced_interface": "In geavanceerde webinterface openen",
   "navigation_bar.blocks": "Geblokkeerde gebruikers",
   "navigation_bar.bookmarks": "Bladwijzers",
@@ -483,6 +485,7 @@
   "navigation_bar.follows_and_followers": "Volgers en gevolgde accounts",
   "navigation_bar.lists": "Lijsten",
   "navigation_bar.logout": "Uitloggen",
+  "navigation_bar.moderation": "Moderatie",
   "navigation_bar.mutes": "Genegeerde gebruikers",
   "navigation_bar.opened_in_classic_interface": "Berichten, accounts en andere specifieke pagina’s, worden standaard geopend in de klassieke webinterface.",
   "navigation_bar.personal": "Persoonlijk",
diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json
index 2a4c5d6e44390e..1af79127a5c16b 100644
--- a/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@@ -97,6 +97,8 @@
   "block_modal.title": "Zablokować użytkownika?",
   "block_modal.you_wont_see_mentions": "Nie zobaczysz wpisów, które wspominają tego użytkownika.",
   "boost_modal.combo": "Naciśnij {combo}, aby pominąć to następnym razem",
+  "boost_modal.reblog": "Podbić wpis?",
+  "boost_modal.undo_reblog": "Cofnąć podbicie?",
   "bundle_column_error.copy_stacktrace": "Skopiuj raport o błędzie",
   "bundle_column_error.error.body": "Nie można zrenderować żądanej strony. Może to być spowodowane błędem w naszym kodzie lub problemami z kompatybilnością przeglądarki.",
   "bundle_column_error.error.title": "O nie!",
@@ -467,6 +469,7 @@
   "mute_modal.you_wont_see_mentions": "Nie zobaczysz wpisów, które wspominają tego użytkownika.",
   "mute_modal.you_wont_see_posts": "Użytkownik dalej będzie widzieć Twoje posty, ale Ty nie będziesz widzieć jego.",
   "navigation_bar.about": "O serwerze",
+  "navigation_bar.administration": "Administracja",
   "navigation_bar.advanced_interface": "Otwórz w zaawansowanym interfejsie użytkownika",
   "navigation_bar.blocks": "Zablokowani użytkownicy",
   "navigation_bar.bookmarks": "Zakładki",
@@ -483,6 +486,7 @@
   "navigation_bar.follows_and_followers": "Obserwowani i obserwujący",
   "navigation_bar.lists": "Listy",
   "navigation_bar.logout": "Wyloguj",
+  "navigation_bar.moderation": "Moderacja",
   "navigation_bar.mutes": "Wyciszeni użytkownicy",
   "navigation_bar.opened_in_classic_interface": "Posty, konta i inne konkretne strony są otwierane domyślnie w klasycznym interfejsie sieciowym.",
   "navigation_bar.personal": "Osobiste",
diff --git a/app/javascript/mastodon/locales/sq.json b/app/javascript/mastodon/locales/sq.json
index 48f667086b663c..51b7a551c1cd4b 100644
--- a/app/javascript/mastodon/locales/sq.json
+++ b/app/javascript/mastodon/locales/sq.json
@@ -97,6 +97,8 @@
   "block_modal.title": "Të bllokohet përdoruesi?",
   "block_modal.you_wont_see_mentions": "S’do të shihni postimet ku përmenden.",
   "boost_modal.combo": "Që kjo të anashkalohet herës tjetër, mund të shtypni {combo}",
+  "boost_modal.reblog": "Përforcim postimi?",
+  "boost_modal.undo_reblog": "Të hiqet përforcim për postimin?",
   "bundle_column_error.copy_stacktrace": "Kopjo raportim gabimi",
   "bundle_column_error.error.body": "Faqja e kërkuar s’u vizatua dot. Kjo mund të vijë nga një e metë në kodin tonë, ose nga një problem përputhshmërie i shfletuesit.",
   "bundle_column_error.error.title": "Oh, mos!",
@@ -467,6 +469,7 @@
   "mute_modal.you_wont_see_mentions": "S’do të shihni postime ku përmenden.",
   "mute_modal.you_wont_see_posts": "Ata munden ende të shohin postimet tuaja, por ju s’do të shihni të tyret.",
   "navigation_bar.about": "Mbi",
+  "navigation_bar.administration": "Administrim",
   "navigation_bar.advanced_interface": "Hape në ndërfaqe web të thelluar",
   "navigation_bar.blocks": "Përdorues të bllokuar",
   "navigation_bar.bookmarks": "Faqerojtës",
@@ -483,6 +486,7 @@
   "navigation_bar.follows_and_followers": "Ndjekje dhe ndjekës",
   "navigation_bar.lists": "Lista",
   "navigation_bar.logout": "Dalje",
+  "navigation_bar.moderation": "Moderim",
   "navigation_bar.mutes": "Përdorues të heshtuar",
   "navigation_bar.opened_in_classic_interface": "Postime, llogari dhe të tjera faqe specifike, si parazgjedhje, hapen në ndërfaqe klasike web.",
   "navigation_bar.personal": "Personale",
diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json
index 107267b5e52063..df754f6d68179a 100644
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@@ -97,6 +97,8 @@
   "block_modal.title": "是否封鎖該使用者？",
   "block_modal.you_wont_see_mentions": "您不會見到提及他們的嘟文。",
   "boost_modal.combo": "下次您可以按 {combo} 跳過",
+  "boost_modal.reblog": "是否要轉嘟？",
+  "boost_modal.undo_reblog": "是否要取消轉嘟？",
   "bundle_column_error.copy_stacktrace": "複製錯誤報告",
   "bundle_column_error.error.body": "無法繪製請求的頁面。這可能是因為我們程式碼中的臭蟲或是瀏覽器的相容問題。",
   "bundle_column_error.error.title": "糟糕！",
@@ -467,6 +469,7 @@
   "mute_modal.you_wont_see_mentions": "您不會見到提及他們的嘟文。",
   "mute_modal.you_wont_see_posts": "他們仍可讀取您的嘟文，但您不會見到他們的。",
   "navigation_bar.about": "關於",
+  "navigation_bar.administration": "管理介面",
   "navigation_bar.advanced_interface": "以進階網頁介面開啟",
   "navigation_bar.blocks": "已封鎖的使用者",
   "navigation_bar.bookmarks": "書籤",
@@ -483,6 +486,7 @@
   "navigation_bar.follows_and_followers": "跟隨中與跟隨者",
   "navigation_bar.lists": "列表",
   "navigation_bar.logout": "登出",
+  "navigation_bar.moderation": "站務",
   "navigation_bar.mutes": "已靜音的使用者",
   "navigation_bar.opened_in_classic_interface": "預設於經典網頁介面中開啟嘟文、帳號與其他特定頁面。",
   "navigation_bar.personal": "個人",
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 7cbcb8201953d9..e919e183d4d66e 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -886,6 +886,7 @@ ko:
       name: 이름
       newest: 최신
       oldest: 오래된 순
+      open: 공개시점으로 보기
       reset: 초기화
       review: 심사 상태
       search: 검색
diff --git a/config/locales/simple_form.et.yml b/config/locales/simple_form.et.yml
index 74660921d2d552..2109ceb496661d 100644
--- a/config/locales/simple_form.et.yml
+++ b/config/locales/simple_form.et.yml
@@ -211,6 +211,7 @@ et:
         setting_default_privacy: Postituse nähtavus
         setting_default_sensitive: Alati märgista meedia tundlikuks
         setting_delete_modal: Näita kinnitusdialoogi enne postituse kustutamist
+        setting_disable_hover_cards: Keela profiili eelvaade kui hõljutada
         setting_disable_swiping: Keela pühkimisliigutused
         setting_display_media: Meedia kuvarežiim
         setting_display_media_default: Vaikimisi
@@ -242,11 +243,13 @@ et:
           warn: Peida hoiatusega
       form_admin_settings:
         activity_api_enabled: Avalda agregeeritud statistika kasutajaaktiivsuse kohta API-s
+        app_icon: Äpi ikoon
         backups_retention_period: Kasutajate arhiivi talletusperiood
         bootstrap_timeline_accounts: Alati soovita neid kontosid uutele kasutajatele
         closed_registrations_message: Kohandatud teade, kui liitumine pole võimalik
         content_cache_retention_period: Kaugsisu säilitamise aeg
         custom_css: Kohandatud CSS
+        favicon: Favicon
         mascot: Kohandatud maskott (kunagine)
         media_cache_retention_period: Meediapuhvri talletusperiood
         peers_api_enabled: Avalda avastatud serverite loetelu API kaudu

From 38a3466741cfa148692c7aa58d8cf207793ac3c1 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 27 Aug 2024 03:55:25 -0400
Subject: [PATCH 1978/2191] Convert `api/oembed` controller spec to request
 spec (#31605)

---
 .../controllers/api/oembed_controller_spec.rb | 22 -------------
 spec/requests/api/oembed_spec.rb              | 33 +++++++++++++++++++
 2 files changed, 33 insertions(+), 22 deletions(-)
 delete mode 100644 spec/controllers/api/oembed_controller_spec.rb
 create mode 100644 spec/requests/api/oembed_spec.rb

diff --git a/spec/controllers/api/oembed_controller_spec.rb b/spec/controllers/api/oembed_controller_spec.rb
deleted file mode 100644
index 5f0ca560d22864..00000000000000
--- a/spec/controllers/api/oembed_controller_spec.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-RSpec.describe Api::OEmbedController do
-  render_views
-
-  let(:alice)  { Fabricate(:account, username: 'alice') }
-  let(:status) { Fabricate(:status, text: 'Hello world', account: alice) }
-
-  describe 'GET #show' do
-    before do
-      request.host = Rails.configuration.x.local_domain
-      get :show, params: { url: short_account_status_url(alice, status) }, format: :json
-    end
-
-    it 'returns private cache control headers', :aggregate_failures do
-      expect(response).to have_http_status(200)
-      expect(response.headers['Cache-Control']).to include('private, no-store')
-    end
-  end
-end
diff --git a/spec/requests/api/oembed_spec.rb b/spec/requests/api/oembed_spec.rb
new file mode 100644
index 00000000000000..b9578b37c817df
--- /dev/null
+++ b/spec/requests/api/oembed_spec.rb
@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'API OEmbed' do
+  describe 'GET /api/oembed' do
+    before { host! Rails.configuration.x.local_domain }
+
+    context 'when status is public' do
+      let(:status) { Fabricate(:status, visibility: :public) }
+
+      it 'returns success with private cache control headers' do
+        get '/api/oembed', params: { url: short_account_status_url(status.account, status) }
+
+        expect(response)
+          .to have_http_status(200)
+        expect(response.headers['Cache-Control'])
+          .to include('private, no-store')
+      end
+    end
+
+    context 'when status is not public' do
+      let(:status) { Fabricate(:status, visibility: :direct) }
+
+      it 'returns not found' do
+        get '/api/oembed', params: { url: short_account_status_url(status.account, status) }
+
+        expect(response)
+          .to have_http_status(404)
+      end
+    end
+  end
+end

From a7f8417795a7306e10c9bec7202359a8e73f6e46 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 27 Aug 2024 04:12:39 -0400
Subject: [PATCH 1979/2191] Convert "CSV export" settings controller specs to
 request specs (#31601)

---
 .../blocked_accounts_controller_spec.rb       | 19 --------
 .../blocked_domains_controller_spec.rb        | 20 ---------
 .../exports/bookmarks_controller_spec.rb      | 24 ----------
 .../following_accounts_controller_spec.rb     | 19 --------
 .../settings/exports/lists_controller_spec.rb | 21 ---------
 .../exports/muted_accounts_controller_spec.rb | 19 --------
 .../settings/exports/blocked_accounts_spec.rb | 42 ++++++++++++++++++
 .../settings/exports/blocked_domains_spec.rb  | 39 ++++++++++++++++
 .../settings/exports/bookmarks_spec.rb        | 44 +++++++++++++++++++
 .../exports/following_accounts_spec.rb        | 44 +++++++++++++++++++
 spec/requests/settings/exports/lists_spec.rb  | 40 +++++++++++++++++
 .../settings/exports/muted_accounts_spec.rb   | 43 ++++++++++++++++++
 12 files changed, 252 insertions(+), 122 deletions(-)
 delete mode 100644 spec/controllers/settings/exports/blocked_accounts_controller_spec.rb
 delete mode 100644 spec/controllers/settings/exports/blocked_domains_controller_spec.rb
 delete mode 100644 spec/controllers/settings/exports/bookmarks_controller_spec.rb
 delete mode 100644 spec/controllers/settings/exports/following_accounts_controller_spec.rb
 delete mode 100644 spec/controllers/settings/exports/lists_controller_spec.rb
 delete mode 100644 spec/controllers/settings/exports/muted_accounts_controller_spec.rb
 create mode 100644 spec/requests/settings/exports/blocked_accounts_spec.rb
 create mode 100644 spec/requests/settings/exports/blocked_domains_spec.rb
 create mode 100644 spec/requests/settings/exports/bookmarks_spec.rb
 create mode 100644 spec/requests/settings/exports/following_accounts_spec.rb
 create mode 100644 spec/requests/settings/exports/lists_spec.rb
 create mode 100644 spec/requests/settings/exports/muted_accounts_spec.rb

diff --git a/spec/controllers/settings/exports/blocked_accounts_controller_spec.rb b/spec/controllers/settings/exports/blocked_accounts_controller_spec.rb
deleted file mode 100644
index 459b278d64998b..00000000000000
--- a/spec/controllers/settings/exports/blocked_accounts_controller_spec.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe Settings::Exports::BlockedAccountsController do
-  render_views
-
-  describe 'GET #index' do
-    it 'returns a csv of the blocking accounts' do
-      user = Fabricate(:user)
-      user.account.block!(Fabricate(:account, username: 'username', domain: 'domain'))
-
-      sign_in user, scope: :user
-      get :index, format: :csv
-
-      expect(response.body).to eq "username@domain\n"
-    end
-  end
-end
diff --git a/spec/controllers/settings/exports/blocked_domains_controller_spec.rb b/spec/controllers/settings/exports/blocked_domains_controller_spec.rb
deleted file mode 100644
index ac72fd9dd7241b..00000000000000
--- a/spec/controllers/settings/exports/blocked_domains_controller_spec.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe Settings::Exports::BlockedDomainsController do
-  render_views
-
-  describe 'GET #index' do
-    it 'returns a csv of the domains' do
-      account = Fabricate(:account, domain: 'example.com')
-      user = Fabricate(:user, account: account)
-      Fabricate(:account_domain_block, domain: 'example.com', account: account)
-
-      sign_in user, scope: :user
-      get :index, format: :csv
-
-      expect(response.body).to eq "example.com\n"
-    end
-  end
-end
diff --git a/spec/controllers/settings/exports/bookmarks_controller_spec.rb b/spec/controllers/settings/exports/bookmarks_controller_spec.rb
deleted file mode 100644
index 9982eff165aa13..00000000000000
--- a/spec/controllers/settings/exports/bookmarks_controller_spec.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe Settings::Exports::BookmarksController do
-  render_views
-
-  let(:user)    { Fabricate(:user) }
-  let(:account) { Fabricate(:account, domain: 'foo.bar') }
-  let(:status)  { Fabricate(:status, account: account, uri: 'https://foo.bar/statuses/1312') }
-
-  describe 'GET #index' do
-    before do
-      user.account.bookmarks.create!(status: status)
-    end
-
-    it 'returns a csv of the bookmarked toots' do
-      sign_in user, scope: :user
-      get :index, format: :csv
-
-      expect(response.body).to eq "https://foo.bar/statuses/1312\n"
-    end
-  end
-end
diff --git a/spec/controllers/settings/exports/following_accounts_controller_spec.rb b/spec/controllers/settings/exports/following_accounts_controller_spec.rb
deleted file mode 100644
index 72b0b94e13b7ec..00000000000000
--- a/spec/controllers/settings/exports/following_accounts_controller_spec.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe Settings::Exports::FollowingAccountsController do
-  render_views
-
-  describe 'GET #index' do
-    it 'returns a csv of the following accounts' do
-      user = Fabricate(:user)
-      user.account.follow!(Fabricate(:account, username: 'username', domain: 'domain'))
-
-      sign_in user, scope: :user
-      get :index, format: :csv
-
-      expect(response.body).to eq "Account address,Show boosts,Notify on new posts,Languages\nusername@domain,true,false,\n"
-    end
-  end
-end
diff --git a/spec/controllers/settings/exports/lists_controller_spec.rb b/spec/controllers/settings/exports/lists_controller_spec.rb
deleted file mode 100644
index 29623ba4991672..00000000000000
--- a/spec/controllers/settings/exports/lists_controller_spec.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe Settings::Exports::ListsController do
-  render_views
-
-  describe 'GET #index' do
-    it 'returns a csv of the domains' do
-      account = Fabricate(:account)
-      user = Fabricate(:user, account: account)
-      list = Fabricate(:list, account: account, title: 'The List')
-      Fabricate(:list_account, list: list, account: account)
-
-      sign_in user, scope: :user
-      get :index, format: :csv
-
-      expect(response.body).to match 'The List'
-    end
-  end
-end
diff --git a/spec/controllers/settings/exports/muted_accounts_controller_spec.rb b/spec/controllers/settings/exports/muted_accounts_controller_spec.rb
deleted file mode 100644
index b4170cb160b6e1..00000000000000
--- a/spec/controllers/settings/exports/muted_accounts_controller_spec.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe Settings::Exports::MutedAccountsController do
-  render_views
-
-  describe 'GET #index' do
-    it 'returns a csv of the muting accounts' do
-      user = Fabricate(:user)
-      user.account.mute!(Fabricate(:account, username: 'username', domain: 'domain'))
-
-      sign_in user, scope: :user
-      get :index, format: :csv
-
-      expect(response.body).to eq "Account address,Hide notifications\nusername@domain,true\n"
-    end
-  end
-end
diff --git a/spec/requests/settings/exports/blocked_accounts_spec.rb b/spec/requests/settings/exports/blocked_accounts_spec.rb
new file mode 100644
index 00000000000000..f335ba18c05281
--- /dev/null
+++ b/spec/requests/settings/exports/blocked_accounts_spec.rb
@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'Settings / Exports / Blocked Accounts' do
+  describe 'GET /settings/exports/blocks' do
+    context 'with a signed in user who has blocked accounts' do
+      let(:user) { Fabricate :user }
+
+      before do
+        Fabricate(
+          :block,
+          account: user.account,
+          target_account: Fabricate(:account, username: 'username', domain: 'domain')
+        )
+        sign_in user
+      end
+
+      it 'returns a CSV with the blocking accounts' do
+        get '/settings/exports/blocks.csv'
+
+        expect(response)
+          .to have_http_status(200)
+        expect(response.content_type)
+          .to eq('text/csv')
+        expect(response.body)
+          .to eq(<<~CSV)
+            username@domain
+          CSV
+      end
+    end
+
+    describe 'when signed out' do
+      it 'returns unauthorized' do
+        get '/settings/exports/blocks.csv'
+
+        expect(response)
+          .to have_http_status(401)
+      end
+    end
+  end
+end
diff --git a/spec/requests/settings/exports/blocked_domains_spec.rb b/spec/requests/settings/exports/blocked_domains_spec.rb
new file mode 100644
index 00000000000000..762907585f3a2b
--- /dev/null
+++ b/spec/requests/settings/exports/blocked_domains_spec.rb
@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'Settings / Exports / Blocked Domains' do
+  describe 'GET /settings/exports/domain_blocks' do
+    context 'with a signed in user who has blocked domains' do
+      let(:account) { Fabricate :account, domain: 'example.com' }
+      let(:user) { Fabricate :user, account: account }
+
+      before do
+        Fabricate(:account_domain_block, domain: 'example.com', account: account)
+        sign_in user
+      end
+
+      it 'returns a CSV with the domains' do
+        get '/settings/exports/domain_blocks.csv'
+
+        expect(response)
+          .to have_http_status(200)
+        expect(response.content_type)
+          .to eq('text/csv')
+        expect(response.body)
+          .to eq(<<~CSV)
+            example.com
+          CSV
+      end
+    end
+
+    describe 'when signed out' do
+      it 'returns unauthorized' do
+        get '/settings/exports/domain_blocks.csv'
+
+        expect(response)
+          .to have_http_status(401)
+      end
+    end
+  end
+end
diff --git a/spec/requests/settings/exports/bookmarks_spec.rb b/spec/requests/settings/exports/bookmarks_spec.rb
new file mode 100644
index 00000000000000..f200e70383eef3
--- /dev/null
+++ b/spec/requests/settings/exports/bookmarks_spec.rb
@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'Settings / Exports / Bookmarks' do
+  describe 'GET /settings/exports/bookmarks' do
+    context 'with a signed in user who has bookmarks' do
+      let(:account) { Fabricate(:account, domain: 'foo.bar') }
+      let(:status) { Fabricate(:status, account: account, uri: 'https://foo.bar/statuses/1312') }
+      let(:user) { Fabricate(:user) }
+
+      before do
+        Fabricate(
+          :bookmark,
+          account: user.account,
+          status: status
+        )
+        sign_in user
+      end
+
+      it 'returns a CSV with the bookmarked statuses' do
+        get '/settings/exports/bookmarks.csv'
+
+        expect(response)
+          .to have_http_status(200)
+        expect(response.content_type)
+          .to eq('text/csv')
+        expect(response.body)
+          .to eq(<<~CSV)
+            https://foo.bar/statuses/1312
+          CSV
+      end
+    end
+
+    describe 'when signed out' do
+      it 'returns unauthorized' do
+        get '/settings/exports/bookmarks.csv'
+
+        expect(response)
+          .to have_http_status(401)
+      end
+    end
+  end
+end
diff --git a/spec/requests/settings/exports/following_accounts_spec.rb b/spec/requests/settings/exports/following_accounts_spec.rb
new file mode 100644
index 00000000000000..268b72c4128160
--- /dev/null
+++ b/spec/requests/settings/exports/following_accounts_spec.rb
@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'Settings / Exports / Following Accounts' do
+  describe 'GET /settings/exports/follows' do
+    context 'with a signed in user who is following accounts' do
+      let(:user) { Fabricate :user }
+
+      before do
+        Fabricate(
+          :follow,
+          account: user.account,
+          target_account: Fabricate(:account, username: 'username', domain: 'domain'),
+          languages: ['en']
+        )
+        sign_in user
+      end
+
+      it 'returns a CSV with the accounts' do
+        get '/settings/exports/follows.csv'
+
+        expect(response)
+          .to have_http_status(200)
+        expect(response.content_type)
+          .to eq('text/csv')
+        expect(response.body)
+          .to eq(<<~CSV)
+            Account address,Show boosts,Notify on new posts,Languages
+            username@domain,true,false,en
+          CSV
+      end
+    end
+
+    describe 'when signed out' do
+      it 'returns unauthorized' do
+        get '/settings/exports/follows.csv'
+
+        expect(response)
+          .to have_http_status(401)
+      end
+    end
+  end
+end
diff --git a/spec/requests/settings/exports/lists_spec.rb b/spec/requests/settings/exports/lists_spec.rb
new file mode 100644
index 00000000000000..b868f8dfda359f
--- /dev/null
+++ b/spec/requests/settings/exports/lists_spec.rb
@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'Settings / Exports / Lists' do
+  describe 'GET /settings/exports/lists' do
+    context 'with a signed in user who has lists' do
+      let(:account) { Fabricate(:account, username: 'test', domain: 'example.com') }
+      let(:list) { Fabricate :list, account: account, title: 'The List' }
+      let(:user) { Fabricate(:user, account: account) }
+
+      before do
+        Fabricate(:list_account, list: list, account: account)
+        sign_in user
+      end
+
+      it 'returns a CSV with the list' do
+        get '/settings/exports/lists.csv'
+
+        expect(response)
+          .to have_http_status(200)
+        expect(response.content_type)
+          .to eq('text/csv')
+        expect(response.body)
+          .to eq(<<~CSV)
+            The List,test@example.com
+          CSV
+      end
+    end
+
+    describe 'when signed out' do
+      it 'returns unauthorized' do
+        get '/settings/exports/lists.csv'
+
+        expect(response)
+          .to have_http_status(401)
+      end
+    end
+  end
+end
diff --git a/spec/requests/settings/exports/muted_accounts_spec.rb b/spec/requests/settings/exports/muted_accounts_spec.rb
new file mode 100644
index 00000000000000..efdb0d8221f012
--- /dev/null
+++ b/spec/requests/settings/exports/muted_accounts_spec.rb
@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'Settings / Exports / Muted Accounts' do
+  describe 'GET /settings/exports/mutes' do
+    context 'with a signed in user who has muted accounts' do
+      let(:user) { Fabricate :user }
+
+      before do
+        Fabricate(
+          :mute,
+          account: user.account,
+          target_account: Fabricate(:account, username: 'username', domain: 'domain')
+        )
+        sign_in user
+      end
+
+      it 'returns a CSV with the muted accounts' do
+        get '/settings/exports/mutes.csv'
+
+        expect(response)
+          .to have_http_status(200)
+        expect(response.content_type)
+          .to eq('text/csv')
+        expect(response.body)
+          .to eq(<<~CSV)
+            Account address,Hide notifications
+            username@domain,true
+          CSV
+      end
+    end
+
+    describe 'when signed out' do
+      it 'returns unauthorized' do
+        get '/settings/exports/mutes.csv'
+
+        expect(response)
+          .to have_http_status(401)
+      end
+    end
+  end
+end

From 4118688fba789a84956d77415c87d049d46a7bf4 Mon Sep 17 00:00:00 2001
From: Emelia Smith <ThisIsMissEm@users.noreply.github.com>
Date: Tue, 27 Aug 2024 10:40:04 +0200
Subject: [PATCH 1980/2191] Streaming: Refactor move database and redis logic
 into separate files (#31567)

---
 streaming/database.js | 128 +++++++++++++++++++++++++++
 streaming/index.js    | 201 ++----------------------------------------
 streaming/redis.js    |  65 ++++++++++++++
 streaming/utils.js    |  20 +++++
 4 files changed, 219 insertions(+), 195 deletions(-)
 create mode 100644 streaming/database.js
 create mode 100644 streaming/redis.js

diff --git a/streaming/database.js b/streaming/database.js
new file mode 100644
index 00000000000000..9f1d742143a158
--- /dev/null
+++ b/streaming/database.js
@@ -0,0 +1,128 @@
+import pg from 'pg';
+import pgConnectionString from 'pg-connection-string';
+
+import { parseIntFromEnvValue } from './utils.js';
+
+/**
+ * @param {NodeJS.ProcessEnv} env the `process.env` value to read configuration from
+ * @param {string} environment
+ * @returns {pg.PoolConfig} the configuration for the PostgreSQL connection
+ */
+export function configFromEnv(env, environment) {
+  /** @type {Record<string, pg.PoolConfig>} */
+  const pgConfigs = {
+    development: {
+      user: env.DB_USER || pg.defaults.user,
+      password: env.DB_PASS || pg.defaults.password,
+      database: env.DB_NAME || 'mastodon_development',
+      host: env.DB_HOST || pg.defaults.host,
+      port: parseIntFromEnvValue(env.DB_PORT, pg.defaults.port ?? 5432, 'DB_PORT')
+    },
+
+    production: {
+      user: env.DB_USER || 'mastodon',
+      password: env.DB_PASS || '',
+      database: env.DB_NAME || 'mastodon_production',
+      host: env.DB_HOST || 'localhost',
+      port: parseIntFromEnvValue(env.DB_PORT, 5432, 'DB_PORT')
+    },
+  };
+
+  /**
+   * @type {pg.PoolConfig}
+   */
+  let baseConfig = {};
+
+  if (env.DATABASE_URL) {
+    const parsedUrl = pgConnectionString.parse(env.DATABASE_URL);
+
+    // The result of dbUrlToConfig from pg-connection-string is not type
+    // compatible with pg.PoolConfig, since parts of the connection URL may be
+    // `null` when pg.PoolConfig expects `undefined`, as such we have to
+    // manually create the baseConfig object from the properties of the
+    // parsedUrl.
+    //
+    // For more information see:
+    // https://github.com/brianc/node-postgres/issues/2280
+    //
+    // FIXME: clean up once brianc/node-postgres#3128 lands
+    if (typeof parsedUrl.password === 'string') baseConfig.password = parsedUrl.password;
+    if (typeof parsedUrl.host === 'string') baseConfig.host = parsedUrl.host;
+    if (typeof parsedUrl.user === 'string') baseConfig.user = parsedUrl.user;
+    if (typeof parsedUrl.port === 'string') {
+      const parsedPort = parseInt(parsedUrl.port, 10);
+      if (isNaN(parsedPort)) {
+        throw new Error('Invalid port specified in DATABASE_URL environment variable');
+      }
+      baseConfig.port = parsedPort;
+    }
+    if (typeof parsedUrl.database === 'string') baseConfig.database = parsedUrl.database;
+    if (typeof parsedUrl.options === 'string') baseConfig.options = parsedUrl.options;
+
+    // The pg-connection-string type definition isn't correct, as parsedUrl.ssl
+    // can absolutely be an Object, this is to work around these incorrect
+    // types, including the casting of parsedUrl.ssl to Record<string, any>
+    if (typeof parsedUrl.ssl === 'boolean') {
+      baseConfig.ssl = parsedUrl.ssl;
+    } else if (typeof parsedUrl.ssl === 'object' && !Array.isArray(parsedUrl.ssl) && parsedUrl.ssl !== null) {
+      /** @type {Record<string, any>} */
+      const sslOptions = parsedUrl.ssl;
+      baseConfig.ssl = {};
+
+      baseConfig.ssl.cert = sslOptions.cert;
+      baseConfig.ssl.key = sslOptions.key;
+      baseConfig.ssl.ca = sslOptions.ca;
+      baseConfig.ssl.rejectUnauthorized = sslOptions.rejectUnauthorized;
+    }
+
+    // Support overriding the database password in the connection URL
+    if (!baseConfig.password && env.DB_PASS) {
+      baseConfig.password = env.DB_PASS;
+    }
+  } else if (Object.hasOwn(pgConfigs, environment)) {
+    baseConfig = pgConfigs[environment];
+
+    if (env.DB_SSLMODE) {
+      switch(env.DB_SSLMODE) {
+      case 'disable':
+      case '':
+        baseConfig.ssl = false;
+        break;
+      case 'no-verify':
+        baseConfig.ssl = { rejectUnauthorized: false };
+        break;
+      default:
+        baseConfig.ssl = {};
+        break;
+      }
+    }
+  } else {
+    throw new Error('Unable to resolve postgresql database configuration.');
+  }
+
+  return {
+    ...baseConfig,
+    max: parseIntFromEnvValue(env.DB_POOL, 10, 'DB_POOL'),
+    connectionTimeoutMillis: 15000,
+    // Deliberately set application_name to an empty string to prevent excessive
+    // CPU usage with PG Bouncer. See:
+    // - https://github.com/mastodon/mastodon/pull/23958
+    // - https://github.com/pgbouncer/pgbouncer/issues/349
+    application_name: '',
+  };
+}
+
+let pool;
+/**
+ *
+ * @param {pg.PoolConfig} config
+ * @returns {pg.Pool}
+ */
+export function getPool(config) {
+  if (pool) {
+    return pool;
+  }
+
+  pool = new pg.Pool(config);
+  return pool;
+}
diff --git a/streaming/index.js b/streaming/index.js
index 2267c469c00362..d94649d6e24284 100644
--- a/streaming/index.js
+++ b/streaming/index.js
@@ -8,15 +8,14 @@ import url from 'node:url';
 import cors from 'cors';
 import dotenv from 'dotenv';
 import express from 'express';
-import { Redis } from 'ioredis';
 import { JSDOM } from 'jsdom';
-import pg from 'pg';
-import pgConnectionString from 'pg-connection-string';
 import { WebSocketServer } from 'ws';
 
+import * as Database from './database.js';
 import { AuthenticationError, RequestError, extractStatusAndMessage as extractErrorStatusAndMessage } from './errors.js';
 import { logger, httpLogger, initializeLogLevel, attachWebsocketHttpLogger, createWebsocketLogger } from './logging.js';
 import { setupMetrics } from './metrics.js';
+import * as Redis from './redis.js';
 import { isTruthy, normalizeHashtag, firstParam } from './utils.js';
 
 const environment = process.env.NODE_ENV || 'development';
@@ -48,23 +47,6 @@ initializeLogLevel(process.env, environment);
  * @property {string} deviceId
  */
 
-/**
- * @param {RedisConfiguration} config
- * @returns {Promise<Redis>}
- */
-const createRedisClient = async ({ redisParams, redisUrl }) => {
-  let client;
-
-  if (typeof redisUrl === 'string') {
-    client = new Redis(redisUrl, redisParams);
-  } else {
-    client = new Redis(redisParams);
-  }
-
-  client.on('error', (err) => logger.error({ err }, 'Redis Client Error!'));
-
-  return client;
-};
 
 /**
  * Attempts to safely parse a string as JSON, used when both receiving a message
@@ -97,177 +79,6 @@ const parseJSON = (json, req) => {
   }
 };
 
-/**
- * Takes an environment variable that should be an integer, attempts to parse
- * it falling back to a default if not set, and handles errors parsing.
- * @param {string|undefined} value
- * @param {number} defaultValue
- * @param {string} variableName
- * @returns {number}
- */
-const parseIntFromEnv = (value, defaultValue, variableName) => {
-  if (typeof value === 'string' && value.length > 0) {
-    const parsedValue = parseInt(value, 10);
-    if (isNaN(parsedValue)) {
-      throw new Error(`Invalid ${variableName} environment variable: ${value}`);
-    }
-    return parsedValue;
-  } else {
-    return defaultValue;
-  }
-};
-
-/**
- * @param {NodeJS.ProcessEnv} env the `process.env` value to read configuration from
- * @returns {pg.PoolConfig} the configuration for the PostgreSQL connection
- */
-const pgConfigFromEnv = (env) => {
-  /** @type {Record<string, pg.PoolConfig>} */
-  const pgConfigs = {
-    development: {
-      user: env.DB_USER || pg.defaults.user,
-      password: env.DB_PASS || pg.defaults.password,
-      database: env.DB_NAME || 'mastodon_development',
-      host: env.DB_HOST || pg.defaults.host,
-      port: parseIntFromEnv(env.DB_PORT, pg.defaults.port ?? 5432, 'DB_PORT')
-    },
-
-    production: {
-      user: env.DB_USER || 'mastodon',
-      password: env.DB_PASS || '',
-      database: env.DB_NAME || 'mastodon_production',
-      host: env.DB_HOST || 'localhost',
-      port: parseIntFromEnv(env.DB_PORT, 5432, 'DB_PORT')
-    },
-  };
-
-  /**
-   * @type {pg.PoolConfig}
-   */
-  let baseConfig = {};
-
-  if (env.DATABASE_URL) {
-    const parsedUrl = pgConnectionString.parse(env.DATABASE_URL);
-
-    // The result of dbUrlToConfig from pg-connection-string is not type
-    // compatible with pg.PoolConfig, since parts of the connection URL may be
-    // `null` when pg.PoolConfig expects `undefined`, as such we have to
-    // manually create the baseConfig object from the properties of the
-    // parsedUrl.
-    //
-    // For more information see:
-    // https://github.com/brianc/node-postgres/issues/2280
-    //
-    // FIXME: clean up once brianc/node-postgres#3128 lands
-    if (typeof parsedUrl.password === 'string') baseConfig.password = parsedUrl.password;
-    if (typeof parsedUrl.host === 'string') baseConfig.host = parsedUrl.host;
-    if (typeof parsedUrl.user === 'string') baseConfig.user = parsedUrl.user;
-    if (typeof parsedUrl.port === 'string') {
-      const parsedPort = parseInt(parsedUrl.port, 10);
-      if (isNaN(parsedPort)) {
-        throw new Error('Invalid port specified in DATABASE_URL environment variable');
-      }
-      baseConfig.port = parsedPort;
-    }
-    if (typeof parsedUrl.database === 'string') baseConfig.database = parsedUrl.database;
-    if (typeof parsedUrl.options === 'string') baseConfig.options = parsedUrl.options;
-
-    // The pg-connection-string type definition isn't correct, as parsedUrl.ssl
-    // can absolutely be an Object, this is to work around these incorrect
-    // types, including the casting of parsedUrl.ssl to Record<string, any>
-    if (typeof parsedUrl.ssl === 'boolean') {
-      baseConfig.ssl = parsedUrl.ssl;
-    } else if (typeof parsedUrl.ssl === 'object' && !Array.isArray(parsedUrl.ssl) && parsedUrl.ssl !== null) {
-      /** @type {Record<string, any>} */
-      const sslOptions = parsedUrl.ssl;
-      baseConfig.ssl = {};
-
-      baseConfig.ssl.cert = sslOptions.cert;
-      baseConfig.ssl.key = sslOptions.key;
-      baseConfig.ssl.ca = sslOptions.ca;
-      baseConfig.ssl.rejectUnauthorized = sslOptions.rejectUnauthorized;
-    }
-
-    // Support overriding the database password in the connection URL
-    if (!baseConfig.password && env.DB_PASS) {
-      baseConfig.password = env.DB_PASS;
-    }
-  } else if (Object.hasOwn(pgConfigs, environment)) {
-    baseConfig = pgConfigs[environment];
-
-    if (env.DB_SSLMODE) {
-      switch(env.DB_SSLMODE) {
-      case 'disable':
-      case '':
-        baseConfig.ssl = false;
-        break;
-      case 'no-verify':
-        baseConfig.ssl = { rejectUnauthorized: false };
-        break;
-      default:
-        baseConfig.ssl = {};
-        break;
-      }
-    }
-  } else {
-    throw new Error('Unable to resolve postgresql database configuration.');
-  }
-
-  return {
-    ...baseConfig,
-    max: parseIntFromEnv(env.DB_POOL, 10, 'DB_POOL'),
-    connectionTimeoutMillis: 15000,
-    // Deliberately set application_name to an empty string to prevent excessive
-    // CPU usage with PG Bouncer. See:
-    // - https://github.com/mastodon/mastodon/pull/23958
-    // - https://github.com/pgbouncer/pgbouncer/issues/349
-    application_name: '',
-  };
-};
-
-/**
- * @typedef RedisConfiguration
- * @property {import('ioredis').RedisOptions} redisParams
- * @property {string} redisPrefix
- * @property {string|undefined} redisUrl
- */
-
-/**
- * @param {NodeJS.ProcessEnv} env the `process.env` value to read configuration from
- * @returns {RedisConfiguration} configuration for the Redis connection
- */
-const redisConfigFromEnv = (env) => {
-  // ioredis *can* transparently add prefixes for us, but it doesn't *in some cases*,
-  // which means we can't use it. But this is something that should be looked into.
-  const redisPrefix = env.REDIS_NAMESPACE ? `${env.REDIS_NAMESPACE}:` : '';
-
-  let redisPort = parseIntFromEnv(env.REDIS_PORT, 6379, 'REDIS_PORT');
-  let redisDatabase = parseIntFromEnv(env.REDIS_DB, 0, 'REDIS_DB');
-
-  /** @type {import('ioredis').RedisOptions} */
-  const redisParams = {
-    host: env.REDIS_HOST || '127.0.0.1',
-    port: redisPort,
-    // Force support for both IPv6 and IPv4, by default ioredis sets this to 4,
-    // only allowing IPv4 connections:
-    // https://github.com/redis/ioredis/issues/1576
-    family: 0,
-    db: redisDatabase,
-    password: env.REDIS_PASSWORD || undefined,
-  };
-
-  // redisParams.path takes precedence over host and port.
-  if (env.REDIS_URL && env.REDIS_URL.startsWith('unix://')) {
-    redisParams.path = env.REDIS_URL.slice(7);
-  }
-
-  return {
-    redisParams,
-    redisPrefix,
-    redisUrl: typeof env.REDIS_URL === 'string' ? env.REDIS_URL : undefined,
-  };
-};
-
 const PUBLIC_CHANNELS = [
   'public',
   'public:media',
@@ -291,10 +102,12 @@ const CHANNEL_NAMES = [
 ];
 
 const startServer = async () => {
-  const pgPool = new pg.Pool(pgConfigFromEnv(process.env));
+  const pgPool = Database.getPool(Database.configFromEnv(process.env, environment));
 
   const metrics = setupMetrics(CHANNEL_NAMES, pgPool);
 
+  const redisConfig = Redis.configFromEnv(process.env);
+  const redisClient = Redis.createClient(redisConfig, logger);
   const server = http.createServer();
   const wss = new WebSocketServer({ noServer: true });
 
@@ -386,9 +199,7 @@ const startServer = async () => {
    */
   const subs = {};
 
-  const redisConfig = redisConfigFromEnv(process.env);
-  const redisSubscribeClient = await createRedisClient(redisConfig);
-  const redisClient = await createRedisClient(redisConfig);
+  const redisSubscribeClient = Redis.createClient(redisConfig, logger);
   const { redisPrefix } = redisConfig;
 
   // When checking metrics in the browser, the favicon is requested this
diff --git a/streaming/redis.js b/streaming/redis.js
new file mode 100644
index 00000000000000..208d6ae0784b76
--- /dev/null
+++ b/streaming/redis.js
@@ -0,0 +1,65 @@
+import { Redis } from 'ioredis';
+
+import { parseIntFromEnvValue } from './utils.js';
+
+/**
+ * @typedef RedisConfiguration
+ * @property {import('ioredis').RedisOptions} redisParams
+ * @property {string} redisPrefix
+ * @property {string|undefined} redisUrl
+ */
+
+/**
+ * @param {NodeJS.ProcessEnv} env the `process.env` value to read configuration from
+ * @returns {RedisConfiguration} configuration for the Redis connection
+ */
+export function configFromEnv(env) {
+  // ioredis *can* transparently add prefixes for us, but it doesn't *in some cases*,
+  // which means we can't use it. But this is something that should be looked into.
+  const redisPrefix = env.REDIS_NAMESPACE ? `${env.REDIS_NAMESPACE}:` : '';
+
+  let redisPort = parseIntFromEnvValue(env.REDIS_PORT, 6379, 'REDIS_PORT');
+  let redisDatabase = parseIntFromEnvValue(env.REDIS_DB, 0, 'REDIS_DB');
+
+  /** @type {import('ioredis').RedisOptions} */
+  const redisParams = {
+    host: env.REDIS_HOST || '127.0.0.1',
+    port: redisPort,
+    // Force support for both IPv6 and IPv4, by default ioredis sets this to 4,
+    // only allowing IPv4 connections:
+    // https://github.com/redis/ioredis/issues/1576
+    family: 0,
+    db: redisDatabase,
+    password: env.REDIS_PASSWORD || undefined,
+  };
+
+  // redisParams.path takes precedence over host and port.
+  if (env.REDIS_URL && env.REDIS_URL.startsWith('unix://')) {
+    redisParams.path = env.REDIS_URL.slice(7);
+  }
+
+  return {
+    redisParams,
+    redisPrefix,
+    redisUrl: typeof env.REDIS_URL === 'string' ? env.REDIS_URL : undefined,
+  };
+}
+
+/**
+ * @param {RedisConfiguration} config
+ * @param {import('pino').Logger} logger
+ * @returns {Redis}
+ */
+export function createClient({ redisParams, redisUrl }, logger) {
+  let client;
+
+  if (typeof redisUrl === 'string') {
+    client = new Redis(redisUrl, redisParams);
+  } else {
+    client = new Redis(redisParams);
+  }
+
+  client.on('error', (err) => logger.error({ err }, 'Redis Client Error!'));
+
+  return client;
+}
diff --git a/streaming/utils.js b/streaming/utils.js
index 4610bf660d8930..47c63dd4caed7a 100644
--- a/streaming/utils.js
+++ b/streaming/utils.js
@@ -59,3 +59,23 @@ export function firstParam(arrayOrString) {
     return arrayOrString;
   }
 }
+
+/**
+ * Takes an environment variable that should be an integer, attempts to parse
+ * it falling back to a default if not set, and handles errors parsing.
+ * @param {string|undefined} value
+ * @param {number} defaultValue
+ * @param {string} variableName
+ * @returns {number}
+ */
+export function parseIntFromEnvValue(value, defaultValue, variableName) {
+  if (typeof value === 'string' && value.length > 0) {
+    const parsedValue = parseInt(value, 10);
+    if (isNaN(parsedValue)) {
+      throw new Error(`Invalid ${variableName} environment variable: ${value}`);
+    }
+    return parsedValue;
+  } else {
+    return defaultValue;
+  }
+}

From 48f4e5444d1676414e7cf8e1344fab68fc61644b Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 27 Aug 2024 05:44:16 -0400
Subject: [PATCH 1981/2191] Convert `media_proxy` controller spec to request
 spec (#31600)

---
 .../media_proxy_controller_spec.rb            | 42 ------------
 spec/requests/media_proxy_spec.rb             | 67 +++++++++++++++++++
 2 files changed, 67 insertions(+), 42 deletions(-)
 delete mode 100644 spec/controllers/media_proxy_controller_spec.rb
 create mode 100644 spec/requests/media_proxy_spec.rb

diff --git a/spec/controllers/media_proxy_controller_spec.rb b/spec/controllers/media_proxy_controller_spec.rb
deleted file mode 100644
index 32510cf43d57e4..00000000000000
--- a/spec/controllers/media_proxy_controller_spec.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe MediaProxyController do
-  render_views
-
-  before do
-    stub_request(:get, 'http://example.com/attachment.png').to_return(request_fixture('avatar.txt'))
-  end
-
-  describe '#show' do
-    it 'redirects when attached to a status' do
-      status = Fabricate(:status)
-      media_attachment = Fabricate(:media_attachment, status: status, remote_url: 'http://example.com/attachment.png')
-      get :show, params: { id: media_attachment.id }
-
-      expect(response).to have_http_status(302)
-    end
-
-    it 'responds with missing when there is not an attached status' do
-      media_attachment = Fabricate(:media_attachment, status: nil, remote_url: 'http://example.com/attachment.png')
-      get :show, params: { id: media_attachment.id }
-
-      expect(response).to have_http_status(404)
-    end
-
-    it 'raises when id cant be found' do
-      get :show, params: { id: 'missing' }
-
-      expect(response).to have_http_status(404)
-    end
-
-    it 'raises when not permitted to view' do
-      status = Fabricate(:status, visibility: :direct)
-      media_attachment = Fabricate(:media_attachment, status: status, remote_url: 'http://example.com/attachment.png')
-      get :show, params: { id: media_attachment.id }
-
-      expect(response).to have_http_status(404)
-    end
-  end
-end
diff --git a/spec/requests/media_proxy_spec.rb b/spec/requests/media_proxy_spec.rb
new file mode 100644
index 00000000000000..0524105d90611b
--- /dev/null
+++ b/spec/requests/media_proxy_spec.rb
@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'Media Proxy' do
+  describe 'GET /media_proxy/:id' do
+    before do
+      integration_session.https! # TODO: Move to global rails_helper for all request specs?
+      host! Rails.configuration.x.local_domain # TODO: Move to global rails_helper for all request specs?
+
+      stub_request(:get, 'http://example.com/attachment.png').to_return(request_fixture('avatar.txt'))
+    end
+
+    context 'when attached to a status' do
+      let(:status) { Fabricate(:status) }
+      let(:media_attachment) { Fabricate(:media_attachment, status: status, remote_url: 'http://example.com/attachment.png') }
+
+      it 'redirects to correct original url' do
+        get "/media_proxy/#{media_attachment.id}"
+
+        expect(response)
+          .to have_http_status(302)
+          .and redirect_to media_attachment.file.url(:original)
+      end
+
+      it 'redirects to small style url' do
+        get "/media_proxy/#{media_attachment.id}/small"
+
+        expect(response)
+          .to have_http_status(302)
+          .and redirect_to media_attachment.file.url(:small)
+      end
+    end
+
+    context 'when there is not an attached status' do
+      let(:media_attachment) { Fabricate(:media_attachment, status: status, remote_url: 'http://example.com/attachment.png') }
+
+      it 'responds with missing' do
+        get "/media_proxy/#{media_attachment.id}"
+
+        expect(response)
+          .to have_http_status(404)
+      end
+    end
+
+    context 'when id cannot be found' do
+      it 'responds with missing' do
+        get '/media_proxy/missing'
+
+        expect(response)
+          .to have_http_status(404)
+      end
+    end
+
+    context 'when not permitted to view' do
+      let(:status) { Fabricate(:status, visibility: :direct) }
+      let(:media_attachment) { Fabricate(:media_attachment, status: status, remote_url: 'http://example.com/attachment.png') }
+
+      it 'responds with missing' do
+        get "/media_proxy/#{media_attachment.id}"
+
+        expect(response)
+          .to have_http_status(404)
+      end
+    end
+  end
+end

From c513fdb9c5f69a7ae9d5efd89aa84778787096a7 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 27 Aug 2024 11:51:29 +0200
Subject: [PATCH 1982/2191] Update dependency pundit to v2.4.0 (#31598)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 40d7cea3d67542..d14fc0168f2d04 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -608,7 +608,7 @@ GEM
     public_suffix (6.0.1)
     puma (6.4.2)
       nio4r (~> 2.0)
-    pundit (2.3.2)
+    pundit (2.4.0)
       activesupport (>= 3.0.0)
     raabro (1.4.0)
     racc (1.8.1)

From da42e9d44618a09aca57b5c229e5f0ebc24e66fa Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Tue, 27 Aug 2024 14:51:34 +0200
Subject: [PATCH 1983/2191] Fix typo in Compose file (#31612)

---
 docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 05fd9e18878ed9..0b3f24631c968c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -88,7 +88,7 @@ services:
       - internal_network
     healthcheck:
       # prettier-ignore
-      test: ['CMD-SHELL', "curl -s --noproxy localhost localhost:4000/api/v1/streaming/health | grep -q 'OK' || exit 1'"]
+      test: ['CMD-SHELL', "curl -s --noproxy localhost localhost:4000/api/v1/streaming/health | grep -q 'OK' || exit 1"]
     ports:
       - '127.0.0.1:4000:4000'
     depends_on:

From c73868cd78592780cb9e0be6985fe2f34b7c91cd Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 27 Aug 2024 16:55:51 +0200
Subject: [PATCH 1984/2191] Add ability for admins to force grouped
 notifications in web UI (#31610)

---
 app/javascript/mastodon/actions/markers.ts    |  8 ++------
 .../actions/notifications_migration.tsx       | 10 +++-------
 app/javascript/mastodon/actions/streaming.js  |  8 +++++---
 .../components/column_settings.jsx            | 19 +++++++++++--------
 .../features/notifications_wrapper.jsx        |  3 ++-
 .../ui/components/navigation_panel.jsx        |  3 ++-
 app/javascript/mastodon/initial_state.js      |  2 ++
 app/javascript/mastodon/selectors/settings.ts |  5 +++++
 app/serializers/initial_state_serializer.rb   |  1 +
 9 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/app/javascript/mastodon/actions/markers.ts b/app/javascript/mastodon/actions/markers.ts
index 77d91d9b9c3411..521859f6c25b42 100644
--- a/app/javascript/mastodon/actions/markers.ts
+++ b/app/javascript/mastodon/actions/markers.ts
@@ -2,6 +2,7 @@ import { debounce } from 'lodash';
 
 import type { MarkerJSON } from 'mastodon/api_types/markers';
 import { getAccessToken } from 'mastodon/initial_state';
+import { selectUseGroupedNotifications } from 'mastodon/selectors/settings';
 import type { AppDispatch, RootState } from 'mastodon/store';
 import { createAppAsyncThunk } from 'mastodon/store/typed_functions';
 
@@ -75,13 +76,8 @@ interface MarkerParam {
 }
 
 function getLastNotificationId(state: RootState): string | undefined {
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
-  const enableBeta = state.settings.getIn(
-    ['notifications', 'groupingBeta'],
-    false,
-  ) as boolean;
   // eslint-disable-next-line @typescript-eslint/no-unsafe-return
-  return enableBeta
+  return selectUseGroupedNotifications(state)
     ? state.notificationGroups.lastReadId
     : // @ts-expect-error state.notifications is not yet typed
       // eslint-disable-next-line @typescript-eslint/no-unsafe-call
diff --git a/app/javascript/mastodon/actions/notifications_migration.tsx b/app/javascript/mastodon/actions/notifications_migration.tsx
index c245dc7565ae72..0d4da765ec327b 100644
--- a/app/javascript/mastodon/actions/notifications_migration.tsx
+++ b/app/javascript/mastodon/actions/notifications_migration.tsx
@@ -1,3 +1,4 @@
+import { selectUseGroupedNotifications } from 'mastodon/selectors/settings';
 import { createAppAsyncThunk } from 'mastodon/store';
 
 import { fetchNotifications } from './notification_groups';
@@ -6,13 +7,8 @@ import { expandNotifications } from './notifications';
 export const initializeNotifications = createAppAsyncThunk(
   'notifications/initialize',
   (_, { dispatch, getState }) => {
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
-    const enableBeta = getState().settings.getIn(
-      ['notifications', 'groupingBeta'],
-      false,
-    ) as boolean;
-
-    if (enableBeta) void dispatch(fetchNotifications());
+    if (selectUseGroupedNotifications(getState()))
+      void dispatch(fetchNotifications());
     else void dispatch(expandNotifications({}));
   },
 );
diff --git a/app/javascript/mastodon/actions/streaming.js b/app/javascript/mastodon/actions/streaming.js
index 04f5e6b88c5b90..bfdd894b81561d 100644
--- a/app/javascript/mastodon/actions/streaming.js
+++ b/app/javascript/mastodon/actions/streaming.js
@@ -1,5 +1,7 @@
 // @ts-check
 
+import { selectUseGroupedNotifications } from 'mastodon/selectors/settings';
+
 import { getLocale } from '../locales';
 import { connectStream } from '../stream';
 
@@ -103,7 +105,7 @@ export const connectTimelineStream = (timelineId, channelName, params = {}, opti
           const notificationJSON = JSON.parse(data.payload);
           dispatch(updateNotifications(notificationJSON, messages, locale));
           // TODO: remove this once the groups feature replaces the previous one
-          if(getState().settings.getIn(['notifications', 'groupingBeta'], false)) {
+          if(selectUseGroupedNotifications(getState())) {
             dispatch(processNewNotificationForGroups(notificationJSON));
           }
           break;
@@ -112,7 +114,7 @@ export const connectTimelineStream = (timelineId, channelName, params = {}, opti
           const state = getState();
           if (state.notifications.top || !state.notifications.mounted)
             dispatch(expandNotifications({ forceLoad: true, maxId: undefined }));
-          if(state.settings.getIn(['notifications', 'groupingBeta'], false)) {
+          if (selectUseGroupedNotifications(state)) {
             dispatch(refreshStaleNotificationGroups());
           }
           break;
@@ -145,7 +147,7 @@ async function refreshHomeTimelineAndNotification(dispatch, getState) {
   await dispatch(expandHomeTimeline({ maxId: undefined }));
 
   // TODO: remove this once the groups feature replaces the previous one
-  if(getState().settings.getIn(['notifications', 'groupingBeta'], false)) {
+  if(selectUseGroupedNotifications(getState())) {
     // TODO: polling for merged notifications
     try {
       await dispatch(pollRecentGroupNotifications());
diff --git a/app/javascript/mastodon/features/notifications/components/column_settings.jsx b/app/javascript/mastodon/features/notifications/components/column_settings.jsx
index 359f0fb1266d54..ed2f4ada3a4c27 100644
--- a/app/javascript/mastodon/features/notifications/components/column_settings.jsx
+++ b/app/javascript/mastodon/features/notifications/components/column_settings.jsx
@@ -6,6 +6,7 @@ import { FormattedMessage } from 'react-intl';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 
 import { identityContextPropShape, withIdentity } from 'mastodon/identity_context';
+import { forceGroupedNotifications } from 'mastodon/initial_state';
 import { PERMISSION_MANAGE_USERS, PERMISSION_MANAGE_REPORTS } from 'mastodon/permissions';
 
 import ClearColumnButton from './clear_column_button';
@@ -67,15 +68,17 @@ class ColumnSettings extends PureComponent {
 
         <PolicyControls />
 
-        <section role='group' aria-labelledby='notifications-beta'>
-          <h3 id='notifications-beta'>
-            <FormattedMessage id='notifications.column_settings.beta.category' defaultMessage='Experimental features' />
-          </h3>
+        {!forceGroupedNotifications && (
+          <section role='group' aria-labelledby='notifications-beta'>
+            <h3 id='notifications-beta'>
+              <FormattedMessage id='notifications.column_settings.beta.category' defaultMessage='Experimental features' />
+            </h3>
 
-          <div className='column-settings__row'>
-            <SettingToggle id='unread-notification-markers' prefix='notifications' settings={settings} settingPath={['groupingBeta']} onChange={onChange} label={groupingShowStr} />
-          </div>
-        </section>
+            <div className='column-settings__row'>
+              <SettingToggle id='unread-notification-markers' prefix='notifications' settings={settings} settingPath={['groupingBeta']} onChange={onChange} label={groupingShowStr} />
+            </div>
+          </section>
+        )}
 
         <section role='group' aria-labelledby='notifications-unread-markers'>
           <h3 id='notifications-unread-markers'>
diff --git a/app/javascript/mastodon/features/notifications_wrapper.jsx b/app/javascript/mastodon/features/notifications_wrapper.jsx
index 057ed1b395f8ec..4b3efeb54e182c 100644
--- a/app/javascript/mastodon/features/notifications_wrapper.jsx
+++ b/app/javascript/mastodon/features/notifications_wrapper.jsx
@@ -1,9 +1,10 @@
 import Notifications from 'mastodon/features/notifications';
 import Notifications_v2 from 'mastodon/features/notifications_v2';
+import { selectUseGroupedNotifications } from 'mastodon/selectors/settings';
 import { useAppSelector } from 'mastodon/store';
 
 export const NotificationsWrapper = (props) => {
-  const optedInGroupedNotifications = useAppSelector((state) => state.getIn(['settings', 'notifications', 'groupingBeta'], false));
+  const optedInGroupedNotifications = useAppSelector(selectUseGroupedNotifications);
 
   return (
     optedInGroupedNotifications ? <Notifications_v2 {...props} /> : <Notifications {...props} />
diff --git a/app/javascript/mastodon/features/ui/components/navigation_panel.jsx b/app/javascript/mastodon/features/ui/components/navigation_panel.jsx
index d30ea0ac5db685..407276d12619bd 100644
--- a/app/javascript/mastodon/features/ui/components/navigation_panel.jsx
+++ b/app/javascript/mastodon/features/ui/components/navigation_panel.jsx
@@ -37,6 +37,7 @@ import { timelinePreview, trendsEnabled } from 'mastodon/initial_state';
 import { transientSingleColumn } from 'mastodon/is_mobile';
 import { canManageReports, canViewAdminDashboard } from 'mastodon/permissions';
 import { selectUnreadNotificationGroupsCount } from 'mastodon/selectors/notifications';
+import { selectUseGroupedNotifications } from 'mastodon/selectors/settings';
 
 import ColumnLink from './column_link';
 import DisabledAccountBanner from './disabled_account_banner';
@@ -64,7 +65,7 @@ const messages = defineMessages({
 });
 
 const NotificationsLink = () => {
-  const optedInGroupedNotifications = useSelector((state) => state.getIn(['settings', 'notifications', 'groupingBeta'], false));
+  const optedInGroupedNotifications = useSelector(selectUseGroupedNotifications);
   const count = useSelector(state => state.getIn(['notifications', 'unread']));
   const intl = useIntl();
 
diff --git a/app/javascript/mastodon/initial_state.js b/app/javascript/mastodon/initial_state.js
index 60b35cb31ac72e..cf33b12dd9232e 100644
--- a/app/javascript/mastodon/initial_state.js
+++ b/app/javascript/mastodon/initial_state.js
@@ -43,6 +43,7 @@
  * @property {boolean=} use_pending_items
  * @property {string} version
  * @property {string} sso_redirect
+ * @property {boolean} force_grouped_notifications
  */
 
 /**
@@ -118,6 +119,7 @@ export const criticalUpdatesPending = initialState?.critical_updates_pending;
 // @ts-expect-error
 export const statusPageUrl = getMeta('status_page_url');
 export const sso_redirect = getMeta('sso_redirect');
+export const forceGroupedNotifications = getMeta('force_grouped_notifications');
 
 /**
  * @returns {string | undefined}
diff --git a/app/javascript/mastodon/selectors/settings.ts b/app/javascript/mastodon/selectors/settings.ts
index 93276c66920609..22e7c13b932e46 100644
--- a/app/javascript/mastodon/selectors/settings.ts
+++ b/app/javascript/mastodon/selectors/settings.ts
@@ -1,3 +1,4 @@
+import { forceGroupedNotifications } from 'mastodon/initial_state';
 import type { RootState } from 'mastodon/store';
 
 /* eslint-disable @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access */
@@ -25,6 +26,10 @@ export const selectSettingsNotificationsQuickFilterAdvanced = (
 ) =>
   state.settings.getIn(['notifications', 'quickFilter', 'advanced']) as boolean;
 
+export const selectUseGroupedNotifications = (state: RootState) =>
+  forceGroupedNotifications ||
+  (state.settings.getIn(['notifications', 'groupingBeta']) as boolean);
+
 export const selectSettingsNotificationsShowUnread = (state: RootState) =>
   state.settings.getIn(['notifications', 'showUnread']) as boolean;
 
diff --git a/app/serializers/initial_state_serializer.rb b/app/serializers/initial_state_serializer.rb
index 13f332c95c4d7b..25a352806fc317 100644
--- a/app/serializers/initial_state_serializer.rb
+++ b/app/serializers/initial_state_serializer.rb
@@ -109,6 +109,7 @@ def default_meta_store
       trends_as_landing_page: Setting.trends_as_landing_page,
       trends_enabled: Setting.trends,
       version: instance_presenter.version,
+      force_grouped_notifications: ENV['FORCE_GROUPED_NOTIFICATIONS'] == 'true',
     }
   end
 

From 3959f36d1913e1baa163dc86f6d0776d02b37ca2 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 27 Aug 2024 10:59:56 -0400
Subject: [PATCH 1985/2191] Add checks about response body content to
 admin/dash spec (#30716)

---
 .../admin/dashboard_controller_spec.rb        | 27 +++++++++++++------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/spec/controllers/admin/dashboard_controller_spec.rb b/spec/controllers/admin/dashboard_controller_spec.rb
index 25300fdd90ed43..3e29ce1278583b 100644
--- a/spec/controllers/admin/dashboard_controller_spec.rb
+++ b/spec/controllers/admin/dashboard_controller_spec.rb
@@ -6,19 +6,30 @@
   render_views
 
   describe 'GET #index' do
+    let(:user) { Fabricate(:user, role: UserRole.find_by(name: 'Owner')) }
+
     before do
-      allow(Admin::SystemCheck).to receive(:perform).and_return([
-                                                                  Admin::SystemCheck::Message.new(:database_schema_check),
-                                                                  Admin::SystemCheck::Message.new(:rules_check, nil, admin_rules_path),
-                                                                  Admin::SystemCheck::Message.new(:sidekiq_process_check, 'foo, bar'),
-                                                                ])
-      sign_in Fabricate(:user, role: UserRole.find_by(name: 'Admin'))
+      stub_system_checks
+      Fabricate :software_update
+      sign_in(user)
     end
 
-    it 'returns 200' do
+    it 'returns http success and body with system check messages' do
       get :index
 
-      expect(response).to have_http_status(200)
+      expect(response)
+        .to have_http_status(200)
+        .and have_attributes(
+          body: include(I18n.t('admin.system_checks.software_version_patch_check.message_html'))
+        )
+    end
+
+    private
+
+    def stub_system_checks
+      stub_const 'Admin::SystemCheck::ACTIVE_CHECKS', [
+        Admin::SystemCheck::SoftwareVersionCheck,
+      ]
     end
   end
 end

From 6eba057e644d427428a9540c9a8d4906dde41f64 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 27 Aug 2024 11:23:08 -0400
Subject: [PATCH 1986/2191] Cache rspec persistence file between CI runs
 (#31065)

---
 .github/workflows/test-ruby.yml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/.github/workflows/test-ruby.yml b/.github/workflows/test-ruby.yml
index 859b23ba66c2ce..3da53c1ae8e0dc 100644
--- a/.github/workflows/test-ruby.yml
+++ b/.github/workflows/test-ruby.yml
@@ -150,6 +150,19 @@ jobs:
           bin/rails db:setup
           bin/flatware fan bin/rails db:test:prepare
 
+      - name: Cache RSpec persistence file
+        uses: actions/cache@v4
+        with:
+          path: |
+            tmp/rspec/examples.txt
+          key: rspec-persistence-${{ github.head_ref || github.ref_name }}-${{ github.sha }}
+          restore-keys: |
+            rspec-persistence-${{ github.head_ref || github.ref_name }}-${{ github.sha }}-${{ matrix.ruby-version }}
+            rspec-persistence-${{ github.head_ref || github.ref_name }}-${{ github.sha }}
+            rspec-persistence-${{ github.head_ref || github.ref_name }}
+            rspec-persistence-main
+            rspec-persistence
+
       - run: bin/flatware rspec -r ./spec/flatware_helper.rb
 
       - name: Upload coverage reports to Codecov

From 04f0468016b450ace8e0ce707b4c21aa18b51262 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Tue, 27 Aug 2024 18:05:19 +0200
Subject: [PATCH 1987/2191] Fix streaming image with Docker Compose (#31615)

---
 docker-compose.yml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 0b3f24631c968c..8053b436ce02f8 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -57,7 +57,8 @@ services:
   #     - '127.0.0.1:9200:9200'
 
   web:
-    build: .
+    # You can uncomment the following line if you want to not use the prebuilt image, for example if you have local code changes
+    # build: .
     image: ghcr.io/mastodon/mastodon:v4.3.0-beta.1
     restart: always
     env_file: .env.production
@@ -78,7 +79,10 @@ services:
       - ./public/system:/mastodon/public/system
 
   streaming:
-    build: .
+    # You can uncomment the following lines if you want to not use the prebuilt image, for example if you have local code changes
+    # build:
+    #   dockerfile: ./streaming/Dockerfile
+    #   context: .
     image: ghcr.io/mastodon/mastodon-streaming:v4.3.0-beta.1
     restart: always
     env_file: .env.production

From 33ad67fcea52c4f8251b8774a1c965d53d8c0a34 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 27 Aug 2024 18:11:14 +0200
Subject: [PATCH 1988/2191] Fix target account link in old report notifications

---
 .../glitch/features/notifications/components/notification.jsx   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/flavours/glitch/features/notifications/components/notification.jsx b/app/javascript/flavours/glitch/features/notifications/components/notification.jsx
index 1a049847d5b792..cba2e87d2f5e32 100644
--- a/app/javascript/flavours/glitch/features/notifications/components/notification.jsx
+++ b/app/javascript/flavours/glitch/features/notifications/components/notification.jsx
@@ -385,7 +385,7 @@ class Notification extends ImmutablePureComponent {
       <bdi>
         <Permalink
           className='notification__display-name'
-          href={account.get('url')}
+          href={targetAccount.get('url')}
           title={targetAccount.get('acct')}
           to={`/@${targetAccount.get('acct')}`}
           dangerouslySetInnerHTML={targetDisplayNameHtml}

From d3629d191f1cb1b47b872caed1ea303240ec26bd Mon Sep 17 00:00:00 2001
From: Emelia Smith <ThisIsMissEm@users.noreply.github.com>
Date: Mon, 26 Aug 2024 18:42:46 +0200
Subject: [PATCH 1989/2191] [Glitch] Add quick links to Administration and
 Moderation Reports from Web UI

Port d820c0883d5557f011b4de8fafa1ff9f68b0d5de to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../glitch/features/getting_started/index.jsx | 13 +++++++++----
 .../ui/components/navigation_panel.jsx        | 13 ++++++++++---
 app/javascript/flavours/glitch/permissions.ts | 19 +++++++++++++++++++
 3 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/app/javascript/flavours/glitch/features/getting_started/index.jsx b/app/javascript/flavours/glitch/features/getting_started/index.jsx
index 2d13d3d58493c0..af6dc313ad74dc 100644
--- a/app/javascript/flavours/glitch/features/getting_started/index.jsx
+++ b/app/javascript/flavours/glitch/features/getting_started/index.jsx
@@ -12,11 +12,12 @@ import { connect } from 'react-redux';
 
 import BookmarksIcon from '@/material-icons/400-24px/bookmarks-fill.svg?react';
 import ExploreIcon from '@/material-icons/400-24px/explore.svg?react';
+import ModerationIcon from '@/material-icons/400-24px/gavel.svg?react';
 import PeopleIcon from '@/material-icons/400-24px/group.svg?react';
 import HomeIcon from '@/material-icons/400-24px/home-fill.svg?react';
 import ListAltIcon from '@/material-icons/400-24px/list_alt.svg?react';
 import MailIcon from '@/material-icons/400-24px/mail.svg?react';
-import ManufacturingIcon from '@/material-icons/400-24px/manufacturing.svg?react';
+import AdministrationIcon from '@/material-icons/400-24px/manufacturing.svg?react';
 import MenuIcon from '@/material-icons/400-24px/menu.svg?react';
 import MoreHorizIcon from '@/material-icons/400-24px/more_horiz.svg?react';
 import NotificationsIcon from '@/material-icons/400-24px/notifications.svg?react';
@@ -29,9 +30,9 @@ import { openModal } from 'flavours/glitch/actions/modal';
 import Column from 'flavours/glitch/features/ui/components/column';
 import LinkFooter from 'flavours/glitch/features/ui/components/link_footer';
 import { identityContextPropShape, withIdentity } from 'flavours/glitch/identity_context';
+import { canManageReports, canViewAdminDashboard } from 'flavours/glitch/permissions';
 import { preferencesLink } from 'flavours/glitch/utils/backend_links';
 
-
 import { me, showTrends } from '../../initial_state';
 import { NavigationBar } from '../compose/components/navigation_bar';
 import ColumnLink from '../ui/components/column_link';
@@ -51,6 +52,8 @@ const messages = defineMessages({
   direct: { id: 'navigation_bar.direct', defaultMessage: 'Private mentions' },
   bookmarks: { id: 'navigation_bar.bookmarks', defaultMessage: 'Bookmarks' },
   preferences: { id: 'navigation_bar.preferences', defaultMessage: 'Preferences' },
+  administration: { id: 'navigation_bar.administration', defaultMessage: 'Administration' },
+  moderation: { id: 'navigation_bar.moderation', defaultMessage: 'Moderation' },
   settings: { id: 'navigation_bar.app_settings', defaultMessage: 'App settings' },
   follow_requests: { id: 'navigation_bar.follow_requests', defaultMessage: 'Follow requests' },
   lists: { id: 'navigation_bar.lists', defaultMessage: 'Lists' },
@@ -131,7 +134,7 @@ class GettingStarted extends ImmutablePureComponent {
 
   render () {
     const { intl, myAccount, columns, multiColumn, unreadFollowRequests, unreadNotifications, lists, openSettings } = this.props;
-    const { signedIn } = this.props.identity;
+    const { signedIn, permissions } = this.props.identity;
 
     const navItems = [];
     let listItems = [];
@@ -196,7 +199,9 @@ class GettingStarted extends ImmutablePureComponent {
                 {listItems}
                 <ColumnSubheading text={intl.formatMessage(messages.settings_subheading)} />
                 { preferencesLink !== undefined && <ColumnLink icon='cog' iconComponent={SettingsIcon} text={intl.formatMessage(messages.preferences)} href={preferencesLink} /> }
-                <ColumnLink icon='cogs' iconComponent={ManufacturingIcon} text={intl.formatMessage(messages.settings)} onClick={openSettings} />
+                <ColumnLink icon='cogs' iconComponent={AdministrationIcon} text={intl.formatMessage(messages.settings)} onClick={openSettings} />
+                {canManageReports(permissions) && <ColumnLink key='moderation' href='/admin/reports' icon='flag' iconComponent={ModerationIcon} text={intl.formatMessage(messages.moderation)} />}
+                {canViewAdminDashboard(permissions) && <ColumnLink key='administration' href='/admin/dashboard' icon='tachometer' iconComponent={AdministrationIcon} text={intl.formatMessage(messages.administration)} />}
               </>
             )}
           </div>
diff --git a/app/javascript/flavours/glitch/features/ui/components/navigation_panel.jsx b/app/javascript/flavours/glitch/features/ui/components/navigation_panel.jsx
index 6153b3ceaa7c4e..33c2db8278934e 100644
--- a/app/javascript/flavours/glitch/features/ui/components/navigation_panel.jsx
+++ b/app/javascript/flavours/glitch/features/ui/components/navigation_panel.jsx
@@ -10,13 +10,14 @@ import BookmarksActiveIcon from '@/material-icons/400-24px/bookmarks-fill.svg?re
 import BookmarksIcon from '@/material-icons/400-24px/bookmarks.svg?react';
 import ExploreActiveIcon from '@/material-icons/400-24px/explore-fill.svg?react';
 import ExploreIcon from '@/material-icons/400-24px/explore.svg?react';
+import ModerationIcon from '@/material-icons/400-24px/gavel.svg?react';
 import HomeActiveIcon from '@/material-icons/400-24px/home-fill.svg?react';
 import HomeIcon from '@/material-icons/400-24px/home.svg?react';
 import ListAltActiveIcon from '@/material-icons/400-24px/list_alt-fill.svg?react';
 import ListAltIcon from '@/material-icons/400-24px/list_alt.svg?react';
 import MailActiveIcon from '@/material-icons/400-24px/mail-fill.svg?react';
 import MailIcon from '@/material-icons/400-24px/mail.svg?react';
-import ManufacturingIcon from '@/material-icons/400-24px/manufacturing.svg?react';
+import AdministrationIcon from '@/material-icons/400-24px/manufacturing.svg?react';
 import MoreHorizIcon from '@/material-icons/400-24px/more_horiz.svg?react';
 import NotificationsActiveIcon from '@/material-icons/400-24px/notifications-fill.svg?react';
 import NotificationsIcon from '@/material-icons/400-24px/notifications.svg?react';
@@ -33,6 +34,7 @@ import { NavigationPortal } from 'flavours/glitch/components/navigation_portal';
 import { identityContextPropShape, withIdentity } from 'flavours/glitch/identity_context';
 import { timelinePreview, trendsEnabled } from 'flavours/glitch/initial_state';
 import { transientSingleColumn } from 'flavours/glitch/is_mobile';
+import { canManageReports, canViewAdminDashboard } from 'flavours/glitch/permissions';
 import { selectUnreadNotificationGroupsCount } from 'flavours/glitch/selectors/notifications';
 import { preferencesLink } from 'flavours/glitch/utils/backend_links';
 
@@ -51,6 +53,8 @@ const messages = defineMessages({
   bookmarks: { id: 'navigation_bar.bookmarks', defaultMessage: 'Bookmarks' },
   lists: { id: 'navigation_bar.lists', defaultMessage: 'Lists' },
   preferences: { id: 'navigation_bar.preferences', defaultMessage: 'Preferences' },
+  administration: { id: 'navigation_bar.administration', defaultMessage: 'Administration' },
+  moderation: { id: 'navigation_bar.moderation', defaultMessage: 'Moderation' },
   followsAndFollowers: { id: 'navigation_bar.follows_and_followers', defaultMessage: 'Follows and followers' },
   about: { id: 'navigation_bar.about', defaultMessage: 'About' },
   search: { id: 'navigation_bar.search', defaultMessage: 'Search' },
@@ -116,7 +120,7 @@ class NavigationPanel extends Component {
 
   render () {
     const { intl, onOpenSettings } = this.props;
-    const { signedIn, disabledAccountId } = this.props.identity;
+    const { signedIn, disabledAccountId, permissions } = this.props.identity;
 
     let banner = undefined;
 
@@ -174,7 +178,10 @@ class NavigationPanel extends Component {
             <hr />
 
             {!!preferencesLink && <ColumnLink transparent href={preferencesLink} icon='cog' iconComponent={SettingsIcon} text={intl.formatMessage(messages.preferences)} />}
-            <ColumnLink transparent onClick={onOpenSettings} icon='cogs' iconComponent={ManufacturingIcon} text={intl.formatMessage(messages.app_settings)} />
+            <ColumnLink transparent onClick={onOpenSettings} icon='cogs' iconComponent={AdministrationIcon} text={intl.formatMessage(messages.app_settings)} />
+
+            {canManageReports(permissions) && <ColumnLink transparent href='/admin/reports' icon='flag' iconComponent={ModerationIcon} text={intl.formatMessage(messages.moderation)} />}
+            {canViewAdminDashboard(permissions) && <ColumnLink transparent href='/admin/dashboard' icon='tachometer' iconComponent={AdministrationIcon} text={intl.formatMessage(messages.administration)} />}
           </>
         )}
 
diff --git a/app/javascript/flavours/glitch/permissions.ts b/app/javascript/flavours/glitch/permissions.ts
index b583535c00e35f..8f015610ea08e7 100644
--- a/app/javascript/flavours/glitch/permissions.ts
+++ b/app/javascript/flavours/glitch/permissions.ts
@@ -1,4 +1,23 @@
 export const PERMISSION_INVITE_USERS = 0x0000000000010000;
 export const PERMISSION_MANAGE_USERS = 0x0000000000000400;
 export const PERMISSION_MANAGE_FEDERATION = 0x0000000000000020;
+
 export const PERMISSION_MANAGE_REPORTS = 0x0000000000000010;
+export const PERMISSION_VIEW_DASHBOARD = 0x0000000000000008;
+
+// These helpers don't quite align with the names/categories in UserRole,
+// but are likely "good enough" for the use cases at present.
+//
+// See: https://docs.joinmastodon.org/entities/Role/#permission-flags
+
+export function canViewAdminDashboard(permissions: number) {
+  return (
+    (permissions & PERMISSION_VIEW_DASHBOARD) === PERMISSION_VIEW_DASHBOARD
+  );
+}
+
+export function canManageReports(permissions: number) {
+  return (
+    (permissions & PERMISSION_MANAGE_REPORTS) === PERMISSION_MANAGE_REPORTS
+  );
+}

From e15fad27bceaa3252d8778c1695526b9b8e127d2 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 26 Aug 2024 19:12:17 +0200
Subject: [PATCH 1990/2191] [Glitch] Change design of boost modal in web UI

Port 29b9642b315a30ca5d3dd9375fa85ab8fe74ad52 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../features/ui/components/boost_modal.tsx    | 176 +++++++-----------
 .../flavours/glitch/styles/components.scss    |  60 ++++++
 2 files changed, 131 insertions(+), 105 deletions(-)

diff --git a/app/javascript/flavours/glitch/features/ui/components/boost_modal.tsx b/app/javascript/flavours/glitch/features/ui/components/boost_modal.tsx
index 452a022a7d554e..38c7894c24a6e9 100644
--- a/app/javascript/flavours/glitch/features/ui/components/boost_modal.tsx
+++ b/app/javascript/flavours/glitch/features/ui/components/boost_modal.tsx
@@ -1,28 +1,17 @@
-import type { MouseEventHandler } from 'react';
 import { useCallback, useState } from 'react';
 
 import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
 
 import classNames from 'classnames';
-import { useHistory } from 'react-router';
-
-import type Immutable from 'immutable';
 
 import RepeatIcon from '@/material-icons/400-24px/repeat.svg?react';
-import AttachmentList from 'flavours/glitch/components/attachment_list';
+import { Button } from 'flavours/glitch/components/button';
 import { Icon } from 'flavours/glitch/components/icon';
-import { VisibilityIcon } from 'flavours/glitch/components/visibility_icon';
 import PrivacyDropdown from 'flavours/glitch/features/compose/components/privacy_dropdown';
-import type { Account } from 'flavours/glitch/models/account';
+import { EmbeddedStatus } from 'flavours/glitch/features/notifications_v2/components/embedded_status';
 import type { Status, StatusVisibility } from 'flavours/glitch/models/status';
 import { useAppSelector } from 'flavours/glitch/store';
 
-import { Avatar } from '../../../components/avatar';
-import { Button } from '../../../components/button';
-import { DisplayName } from '../../../components/display_name';
-import { RelativeTimestamp } from '../../../components/relative_timestamp';
-import StatusContent from '../../../components/status_content';
-
 const messages = defineMessages({
   cancel_reblog: {
     id: 'status.cancel_reblog_private',
@@ -35,21 +24,19 @@ export const BoostModal: React.FC<{
   status: Status;
   onClose: () => void;
   onReblog: (status: Status, privacy: StatusVisibility) => void;
-  missingMediaDescription?: boolean;
-}> = ({ status, onReblog, onClose, missingMediaDescription }) => {
+}> = ({ status, onReblog, onClose }) => {
   const intl = useIntl();
-  const history = useHistory();
 
-  const default_privacy = useAppSelector(
+  const defaultPrivacy = useAppSelector(
     // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
     (state) => state.compose.get('default_privacy') as StatusVisibility,
   );
 
-  const account = status.get('account') as Account;
+  const statusId = status.get('id') as string;
   const statusVisibility = status.get('visibility') as StatusVisibility;
 
   const [privacy, setPrivacy] = useState<StatusVisibility>(
-    statusVisibility === 'private' ? 'private' : default_privacy,
+    statusVisibility === 'private' ? 'private' : defaultPrivacy,
   );
 
   const onPrivacyChange = useCallback((value: StatusVisibility) => {
@@ -61,20 +48,9 @@ export const BoostModal: React.FC<{
     onClose();
   }, [onClose, onReblog, status, privacy]);
 
-  const handleAccountClick = useCallback<MouseEventHandler>(
-    (e) => {
-      if (e.button === 0 && !(e.ctrlKey || e.metaKey)) {
-        e.preventDefault();
-        onClose();
-        history.push(`/@${account.acct}`);
-      }
-    },
-    [history, onClose, account],
-  );
-
-  const buttonText = status.get('reblogged')
-    ? messages.cancel_reblog
-    : messages.reblog;
+  const handleCancel = useCallback(() => {
+    onClose();
+  }, [onClose]);
 
   const findContainer = useCallback(
     () => document.getElementsByClassName('modal-root__container')[0],
@@ -82,88 +58,78 @@ export const BoostModal: React.FC<{
   );
 
   return (
-    <div className='modal-root__modal boost-modal'>
-      <div className='boost-modal__container'>
-        <div
-          className={classNames(
-            'status',
-            `status-${statusVisibility}`,
-            'light',
-          )}
-        >
-          <div className='status__info'>
-            <a
-              href={status.get('url') as string}
-              className='status__relative-time'
-              target='_blank'
-              rel='noopener noreferrer'
-            >
-              <span className='status__visibility-icon'>
-                <VisibilityIcon visibility={statusVisibility} />
-              </span>
-              <RelativeTimestamp
-                timestamp={status.get('created_at') as string}
-              />
-            </a>
-
-            <a
-              onClick={handleAccountClick}
-              href={account.url}
-              className='status__display-name'
-            >
-              <div className='status__avatar'>
-                <Avatar account={account} size={48} />
-              </div>
-
-              <DisplayName account={account} />
-            </a>
+    <div className='modal-root__modal safety-action-modal'>
+      <div className='safety-action-modal__top'>
+        <div className='safety-action-modal__header'>
+          <div className='safety-action-modal__header__icon'>
+            <Icon icon={RepeatIcon} id='retweet' />
           </div>
 
-          {/* @ts-expect-error Expected until StatusContent is typed */}
-          <StatusContent status={status} />
+          <div>
+            <h1>
+              {status.get('reblogged') ? (
+                <FormattedMessage
+                  id='boost_modal.undo_reblog'
+                  defaultMessage='Unboost post?'
+                />
+              ) : (
+                <FormattedMessage
+                  id='boost_modal.reblog'
+                  defaultMessage='Boost post?'
+                />
+              )}
+            </h1>
+            <div>
+              <FormattedMessage
+                id='boost_modal.combo'
+                defaultMessage='You can press {combo} to skip this next time'
+                values={{
+                  combo: (
+                    <span className='hotkey-combination'>
+                      <kbd>Shift</kbd>+<Icon id='retweet' icon={RepeatIcon} />
+                    </span>
+                  ),
+                }}
+              />
+            </div>
+          </div>
+        </div>
 
-          {(status.get('media_attachments') as Immutable.List<unknown>).size >
-            0 && (
-            <AttachmentList compact media={status.get('media_attachments')} />
-          )}
+        <div className='safety-action-modal__status'>
+          <EmbeddedStatus statusId={statusId} />
         </div>
       </div>
 
-      <div className='boost-modal__action-bar'>
-        <div>
-          {missingMediaDescription ? (
-            <FormattedMessage
-              id='boost_modal.missing_description'
-              defaultMessage='This toot contains some media without description'
+      <div className={classNames('safety-action-modal__bottom')}>
+        <div className='safety-action-modal__actions'>
+          {!status.get('reblogged') && (
+            <PrivacyDropdown
+              noDirect
+              value={privacy}
+              container={findContainer}
+              onChange={onPrivacyChange}
+              disabled={statusVisibility === 'private'}
             />
-          ) : (
+          )}
+
+          <div className='spacer' />
+
+          <button onClick={handleCancel} className='link-button'>
             <FormattedMessage
-              id='boost_modal.combo'
-              defaultMessage='You can press {combo} to skip this next time'
-              values={{
-                combo: (
-                  <span>
-                    Shift + <Icon id='retweet' icon={RepeatIcon} />
-                  </span>
-                ),
-              }}
+              id='confirmation_modal.cancel'
+              defaultMessage='Cancel'
             />
-          )}
-        </div>
-        {statusVisibility !== 'private' && !status.get('reblogged') && (
-          <PrivacyDropdown
-            noDirect
-            value={privacy}
-            container={findContainer}
-            onChange={onPrivacyChange}
+          </button>
+
+          <Button
+            onClick={handleReblog}
+            text={intl.formatMessage(
+              status.get('reblogged')
+                ? messages.cancel_reblog
+                : messages.reblog,
+            )}
           />
-        )}
-        <Button
-          text={intl.formatMessage(buttonText)}
-          onClick={handleReblog}
-          // eslint-disable-next-line jsx-a11y/no-autofocus
-          autoFocus
-        />
+        </div>
       </div>
     </div>
   );
diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index a81a8bc22eabf6..662607a7ca3dc4 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -6590,6 +6590,48 @@ a.status-card {
     }
   }
 
+  &__status {
+    border: 1px solid var(--modal-border-color);
+    border-radius: 8px;
+    padding: 8px;
+    cursor: pointer;
+
+    &__account {
+      display: flex;
+      align-items: center;
+      gap: 4px;
+      margin-bottom: 8px;
+      color: $dark-text-color;
+
+      bdi {
+        color: inherit;
+      }
+    }
+
+    &__content {
+      display: -webkit-box;
+      font-size: 15px;
+      line-height: 22px;
+      color: $dark-text-color;
+      -webkit-line-clamp: 4;
+      -webkit-box-orient: vertical;
+      max-height: 4 * 22px;
+      overflow: hidden;
+
+      p,
+      a {
+        color: inherit;
+      }
+    }
+
+    .reply-indicator__attachments {
+      margin-top: 0;
+      font-size: 15px;
+      line-height: 22px;
+      color: $dark-text-color;
+    }
+  }
+
   &__bullet-points {
     display: flex;
     flex-direction: column;
@@ -6667,6 +6709,12 @@ a.status-card {
     gap: 8px;
     justify-content: flex-end;
 
+    &__hint {
+      font-size: 14px;
+      line-height: 20px;
+      color: $dark-text-color;
+    }
+
     .link-button {
       padding: 10px 12px;
       font-weight: 600;
@@ -6674,6 +6722,18 @@ a.status-card {
   }
 }
 
+.hotkey-combination {
+  display: inline-flex;
+  align-items: center;
+  gap: 4px;
+
+  kbd {
+    padding: 3px 5px;
+    border: 1px solid var(--background-border-color);
+    border-radius: 4px;
+  }
+}
+
 .doodle-modal,
 .boost-modal,
 .report-modal,

From 435ff8e550fbcbf83e7eca1bccafe2817252e666 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 27 Aug 2024 16:55:51 +0200
Subject: [PATCH 1991/2191] [Glitch] Add ability for admins to force grouped
 notifications in web UI

Port c73868cd78592780cb9e0be6985fe2f34b7c91cd to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/actions/markers.ts        |  8 ++---
 .../actions/notifications_migration.tsx       | 10 ++----
 .../flavours/glitch/actions/streaming.js      |  8 +++--
 .../components/column_settings.jsx            | 19 ++++++-----
 .../glitch/features/notifications_wrapper.jsx |  3 +-
 .../features/ui/components/boost_modal.tsx    | 32 ++++++++++++-------
 .../ui/components/navigation_panel.jsx        |  3 +-
 .../flavours/glitch/initial_state.js          |  2 ++
 .../flavours/glitch/selectors/settings.ts     |  5 +++
 9 files changed, 52 insertions(+), 38 deletions(-)

diff --git a/app/javascript/flavours/glitch/actions/markers.ts b/app/javascript/flavours/glitch/actions/markers.ts
index 861eae41ec4f1e..1c1fd60dcf628b 100644
--- a/app/javascript/flavours/glitch/actions/markers.ts
+++ b/app/javascript/flavours/glitch/actions/markers.ts
@@ -2,6 +2,7 @@ import { debounce } from 'lodash';
 
 import type { MarkerJSON } from 'flavours/glitch/api_types/markers';
 import { getAccessToken } from 'flavours/glitch/initial_state';
+import { selectUseGroupedNotifications } from 'flavours/glitch/selectors/settings';
 import type { AppDispatch, RootState } from 'flavours/glitch/store';
 import { createAppAsyncThunk } from 'flavours/glitch/store/typed_functions';
 
@@ -75,13 +76,8 @@ interface MarkerParam {
 }
 
 function getLastNotificationId(state: RootState): string | undefined {
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
-  const enableBeta = state.settings.getIn(
-    ['notifications', 'groupingBeta'],
-    false,
-  ) as boolean;
   // eslint-disable-next-line @typescript-eslint/no-unsafe-return
-  return enableBeta
+  return selectUseGroupedNotifications(state)
     ? state.notificationGroups.lastReadId
     : // @ts-expect-error state.notifications is not yet typed
       // eslint-disable-next-line @typescript-eslint/no-unsafe-call
diff --git a/app/javascript/flavours/glitch/actions/notifications_migration.tsx b/app/javascript/flavours/glitch/actions/notifications_migration.tsx
index ac7727ecd1e751..6789dbf38ce07a 100644
--- a/app/javascript/flavours/glitch/actions/notifications_migration.tsx
+++ b/app/javascript/flavours/glitch/actions/notifications_migration.tsx
@@ -1,3 +1,4 @@
+import { selectUseGroupedNotifications } from 'flavours/glitch/selectors/settings';
 import { createAppAsyncThunk } from 'flavours/glitch/store';
 
 import { fetchNotifications } from './notification_groups';
@@ -6,13 +7,8 @@ import { expandNotifications } from './notifications';
 export const initializeNotifications = createAppAsyncThunk(
   'notifications/initialize',
   (_, { dispatch, getState }) => {
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
-    const enableBeta = getState().settings.getIn(
-      ['notifications', 'groupingBeta'],
-      false,
-    ) as boolean;
-
-    if (enableBeta) void dispatch(fetchNotifications());
+    if (selectUseGroupedNotifications(getState()))
+      void dispatch(fetchNotifications());
     else void dispatch(expandNotifications({}));
   },
 );
diff --git a/app/javascript/flavours/glitch/actions/streaming.js b/app/javascript/flavours/glitch/actions/streaming.js
index 49636d621253b8..3584a256252036 100644
--- a/app/javascript/flavours/glitch/actions/streaming.js
+++ b/app/javascript/flavours/glitch/actions/streaming.js
@@ -1,5 +1,7 @@
 // @ts-check
 
+import { selectUseGroupedNotifications } from 'flavours/glitch/selectors/settings';
+
 import { getLocale } from '../locales';
 import { connectStream } from '../stream';
 
@@ -103,7 +105,7 @@ export const connectTimelineStream = (timelineId, channelName, params = {}, opti
           const notificationJSON = JSON.parse(data.payload);
           dispatch(updateNotifications(notificationJSON, messages, locale));
           // TODO: remove this once the groups feature replaces the previous one
-          if(getState().settings.getIn(['notifications', 'groupingBeta'], false)) {
+          if(selectUseGroupedNotifications(getState())) {
             dispatch(processNewNotificationForGroups(notificationJSON));
           }
           break;
@@ -112,7 +114,7 @@ export const connectTimelineStream = (timelineId, channelName, params = {}, opti
           const state = getState();
           if (state.notifications.top || !state.notifications.mounted)
             dispatch(expandNotifications({ forceLoad: true, maxId: undefined }));
-          if(state.settings.getIn(['notifications', 'groupingBeta'], false)) {
+          if (selectUseGroupedNotifications(state)) {
             dispatch(refreshStaleNotificationGroups());
           }
           break;
@@ -145,7 +147,7 @@ async function refreshHomeTimelineAndNotification(dispatch, getState) {
   await dispatch(expandHomeTimeline({ maxId: undefined }));
 
   // TODO: remove this once the groups feature replaces the previous one
-  if(getState().settings.getIn(['notifications', 'groupingBeta'], false)) {
+  if(selectUseGroupedNotifications(getState())) {
     // TODO: polling for merged notifications
     try {
       await dispatch(pollRecentGroupNotifications());
diff --git a/app/javascript/flavours/glitch/features/notifications/components/column_settings.jsx b/app/javascript/flavours/glitch/features/notifications/components/column_settings.jsx
index f98d09b5000042..3bd040eb516fbf 100644
--- a/app/javascript/flavours/glitch/features/notifications/components/column_settings.jsx
+++ b/app/javascript/flavours/glitch/features/notifications/components/column_settings.jsx
@@ -6,6 +6,7 @@ import { FormattedMessage } from 'react-intl';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 
 import { identityContextPropShape, withIdentity } from 'flavours/glitch/identity_context';
+import { forceGroupedNotifications } from 'flavours/glitch/initial_state';
 import { PERMISSION_MANAGE_USERS, PERMISSION_MANAGE_REPORTS } from 'flavours/glitch/permissions';
 
 import ClearColumnButton from './clear_column_button';
@@ -78,15 +79,17 @@ class ColumnSettings extends PureComponent {
           </div>
         </section>
 
-        <section role='group' aria-labelledby='notifications-beta'>
-          <h3 id='notifications-beta'>
-            <FormattedMessage id='notifications.column_settings.beta.category' defaultMessage='Experimental features' />
-          </h3>
+        {!forceGroupedNotifications && (
+          <section role='group' aria-labelledby='notifications-beta'>
+            <h3 id='notifications-beta'>
+              <FormattedMessage id='notifications.column_settings.beta.category' defaultMessage='Experimental features' />
+            </h3>
 
-          <div className='column-settings__row'>
-            <SettingToggle id='unread-notification-markers' prefix='notifications' settings={settings} settingPath={['groupingBeta']} onChange={onChange} label={groupingShowStr} />
-          </div>
-        </section>
+            <div className='column-settings__row'>
+              <SettingToggle id='unread-notification-markers' prefix='notifications' settings={settings} settingPath={['groupingBeta']} onChange={onChange} label={groupingShowStr} />
+            </div>
+          </section>
+        )}
 
         <section role='group' aria-labelledby='notifications-unread-markers'>
           <h3 id='notifications-unread-markers'>
diff --git a/app/javascript/flavours/glitch/features/notifications_wrapper.jsx b/app/javascript/flavours/glitch/features/notifications_wrapper.jsx
index 15ab3367cc1bf8..ab3eff889cd2c7 100644
--- a/app/javascript/flavours/glitch/features/notifications_wrapper.jsx
+++ b/app/javascript/flavours/glitch/features/notifications_wrapper.jsx
@@ -1,9 +1,10 @@
 import Notifications from 'flavours/glitch/features/notifications';
 import Notifications_v2 from 'flavours/glitch/features/notifications_v2';
+import { selectUseGroupedNotifications } from 'flavours/glitch/selectors/settings';
 import { useAppSelector } from 'flavours/glitch/store';
 
 export const NotificationsWrapper = (props) => {
-  const optedInGroupedNotifications = useAppSelector((state) => state.getIn(['settings', 'notifications', 'groupingBeta'], false));
+  const optedInGroupedNotifications = useAppSelector(selectUseGroupedNotifications);
 
   return (
     optedInGroupedNotifications ? <Notifications_v2 {...props} /> : <Notifications {...props} />
diff --git a/app/javascript/flavours/glitch/features/ui/components/boost_modal.tsx b/app/javascript/flavours/glitch/features/ui/components/boost_modal.tsx
index 38c7894c24a6e9..9d1cf8545fa796 100644
--- a/app/javascript/flavours/glitch/features/ui/components/boost_modal.tsx
+++ b/app/javascript/flavours/glitch/features/ui/components/boost_modal.tsx
@@ -24,7 +24,8 @@ export const BoostModal: React.FC<{
   status: Status;
   onClose: () => void;
   onReblog: (status: Status, privacy: StatusVisibility) => void;
-}> = ({ status, onReblog, onClose }) => {
+  missingMediaDescription?: boolean;
+}> = ({ status, onReblog, onClose, missingMediaDescription }) => {
   const intl = useIntl();
 
   const defaultPrivacy = useAppSelector(
@@ -80,17 +81,24 @@ export const BoostModal: React.FC<{
               )}
             </h1>
             <div>
-              <FormattedMessage
-                id='boost_modal.combo'
-                defaultMessage='You can press {combo} to skip this next time'
-                values={{
-                  combo: (
-                    <span className='hotkey-combination'>
-                      <kbd>Shift</kbd>+<Icon id='retweet' icon={RepeatIcon} />
-                    </span>
-                  ),
-                }}
-              />
+              {missingMediaDescription ? (
+                <FormattedMessage
+                  id='boost_modal.missing_description'
+                  defaultMessage='This toot contains some media without description'
+                />
+              ) : (
+                <FormattedMessage
+                  id='boost_modal.combo'
+                  defaultMessage='You can press {combo} to skip this next time'
+                  values={{
+                    combo: (
+                      <span className='hotkey-combination'>
+                        <kbd>Shift</kbd>+<Icon id='retweet' icon={RepeatIcon} />
+                      </span>
+                    ),
+                  }}
+                />
+              )}
             </div>
           </div>
         </div>
diff --git a/app/javascript/flavours/glitch/features/ui/components/navigation_panel.jsx b/app/javascript/flavours/glitch/features/ui/components/navigation_panel.jsx
index 33c2db8278934e..905387caea3b52 100644
--- a/app/javascript/flavours/glitch/features/ui/components/navigation_panel.jsx
+++ b/app/javascript/flavours/glitch/features/ui/components/navigation_panel.jsx
@@ -36,6 +36,7 @@ import { timelinePreview, trendsEnabled } from 'flavours/glitch/initial_state';
 import { transientSingleColumn } from 'flavours/glitch/is_mobile';
 import { canManageReports, canViewAdminDashboard } from 'flavours/glitch/permissions';
 import { selectUnreadNotificationGroupsCount } from 'flavours/glitch/selectors/notifications';
+import { selectUseGroupedNotifications } from 'flavours/glitch/selectors/settings';
 import { preferencesLink } from 'flavours/glitch/utils/backend_links';
 
 import ColumnLink from './column_link';
@@ -65,7 +66,7 @@ const messages = defineMessages({
 });
 
 const NotificationsLink = () => {
-  const optedInGroupedNotifications = useSelector((state) => state.getIn(['settings', 'notifications', 'groupingBeta'], false));
+  const optedInGroupedNotifications = useSelector(selectUseGroupedNotifications);
   const count = useSelector(state => state.getIn(['local_settings', 'notifications', 'tab_badge']) ? state.getIn(['notifications', 'unread']) : 0);
   const intl = useIntl();
 
diff --git a/app/javascript/flavours/glitch/initial_state.js b/app/javascript/flavours/glitch/initial_state.js
index c5628f51ce475c..624f8bb101efbb 100644
--- a/app/javascript/flavours/glitch/initial_state.js
+++ b/app/javascript/flavours/glitch/initial_state.js
@@ -46,6 +46,7 @@
  * @property {boolean=} use_pending_items
  * @property {string} version
  * @property {string} sso_redirect
+ * @property {boolean} force_grouped_notifications
  * @property {string} status_page_url
  * @property {boolean} system_emoji_font
  * @property {string} default_content_type
@@ -137,6 +138,7 @@ export const languages = initialState?.languages;
 export const criticalUpdatesPending = initialState?.critical_updates_pending;
 export const statusPageUrl = getMeta('status_page_url');
 export const sso_redirect = getMeta('sso_redirect');
+export const forceGroupedNotifications = getMeta('force_grouped_notifications');
 
 // Glitch-soc-specific settings
 export const maxFeedHashtags = (initialState && initialState.max_feed_hashtags) || 4;
diff --git a/app/javascript/flavours/glitch/selectors/settings.ts b/app/javascript/flavours/glitch/selectors/settings.ts
index 9a1a2c990baa40..c9cfd6dde5915f 100644
--- a/app/javascript/flavours/glitch/selectors/settings.ts
+++ b/app/javascript/flavours/glitch/selectors/settings.ts
@@ -1,3 +1,4 @@
+import { forceGroupedNotifications } from 'flavours/glitch/initial_state';
 import type { RootState } from 'flavours/glitch/store';
 
 /* eslint-disable @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access */
@@ -25,6 +26,10 @@ export const selectSettingsNotificationsQuickFilterAdvanced = (
 ) =>
   state.settings.getIn(['notifications', 'quickFilter', 'advanced']) as boolean;
 
+export const selectUseGroupedNotifications = (state: RootState) =>
+  forceGroupedNotifications ||
+  (state.settings.getIn(['notifications', 'groupingBeta']) as boolean);
+
 export const selectSettingsNotificationsShowUnread = (state: RootState) =>
   state.settings.getIn(['notifications', 'showUnread']) as boolean;
 

From 00586d27cb0f84377614a5ca2a3683c9fe9b74a5 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 28 Aug 2024 03:56:07 -0400
Subject: [PATCH 1992/2191] Convert `instance_actor` controller spec to request
 spec (#31621)

---
 .../instance_actors_controller_spec.rb        | 54 --------------
 spec/requests/instance_actor_spec.rb          | 71 +++++++++++++++++++
 2 files changed, 71 insertions(+), 54 deletions(-)
 delete mode 100644 spec/controllers/instance_actors_controller_spec.rb
 create mode 100644 spec/requests/instance_actor_spec.rb

diff --git a/spec/controllers/instance_actors_controller_spec.rb b/spec/controllers/instance_actors_controller_spec.rb
deleted file mode 100644
index 42ffb679884e08..00000000000000
--- a/spec/controllers/instance_actors_controller_spec.rb
+++ /dev/null
@@ -1,54 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-RSpec.describe InstanceActorsController do
-  describe 'GET #show' do
-    context 'with JSON' do
-      let(:format) { 'json' }
-
-      shared_examples 'shared behavior' do
-        before do
-          get :show, params: { format: format }
-        end
-
-        it 'returns http success with correct media type and body' do
-          expect(response)
-            .to have_http_status(200)
-            .and have_attributes(
-              media_type: eq('application/activity+json')
-            )
-
-          expect(body_as_json)
-            .to include(:id, :type, :preferredUsername, :inbox, :publicKey, :inbox, :outbox, :url)
-        end
-
-        it_behaves_like 'cacheable response'
-      end
-
-      before do
-        allow(controller).to receive(:authorized_fetch_mode?).and_return(authorized_fetch_mode)
-      end
-
-      context 'without authorized fetch mode' do
-        let(:authorized_fetch_mode) { false }
-
-        it_behaves_like 'shared behavior'
-      end
-
-      context 'with authorized fetch mode' do
-        let(:authorized_fetch_mode) { true }
-
-        it_behaves_like 'shared behavior'
-      end
-
-      context 'with a suspended instance actor' do
-        let(:authorized_fetch_mode) { false }
-
-        before { Account.representative.update(suspended_at: 10.days.ago) }
-
-        it_behaves_like 'shared behavior'
-      end
-    end
-  end
-end
diff --git a/spec/requests/instance_actor_spec.rb b/spec/requests/instance_actor_spec.rb
new file mode 100644
index 00000000000000..9c7ee9ff90830f
--- /dev/null
+++ b/spec/requests/instance_actor_spec.rb
@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Instance actor endpoint' do
+  describe 'GET /actor' do
+    before do
+      integration_session.https! # TODO: Move to global rails_helper for all request specs?
+      host! Rails.configuration.x.local_domain # TODO: Move to global rails_helper for all request specs?
+    end
+
+    let!(:original_federation_mode) { Rails.configuration.x.limited_federation_mode }
+
+    shared_examples 'instance actor endpoint' do
+      before { get instance_actor_path(format: :json) }
+
+      it 'returns http success with correct media type and body' do
+        expect(response)
+          .to have_http_status(200)
+        expect(response.content_type)
+          .to start_with('application/activity+json')
+        expect(body_as_json)
+          .to include(
+            id: instance_actor_url,
+            type: 'Application',
+            preferredUsername: 'mastodon.internal',
+            inbox: instance_actor_inbox_url,
+            outbox: instance_actor_outbox_url,
+            publicKey: include(
+              id: instance_actor_url(anchor: 'main-key')
+            ),
+            url: about_more_url(instance_actor: true)
+          )
+      end
+
+      it_behaves_like 'cacheable response'
+    end
+
+    context 'with limited federation mode disabled' do
+      before { Rails.configuration.x.limited_federation_mode = false }
+      after { Rails.configuration.x.limited_federation_mode = original_federation_mode }
+
+      it_behaves_like 'instance actor endpoint'
+
+      context 'with a disabled instance actor' do
+        before { disable_instance_actor }
+
+        it_behaves_like 'instance actor endpoint'
+      end
+    end
+
+    context 'with limited federation mode enabled' do
+      before { Rails.configuration.x.limited_federation_mode = true }
+      after { Rails.configuration.x.limited_federation_mode = original_federation_mode }
+
+      it_behaves_like 'instance actor endpoint'
+
+      context 'with a disabled instance actor' do
+        before { disable_instance_actor }
+
+        it_behaves_like 'instance actor endpoint'
+      end
+    end
+
+    def disable_instance_actor
+      Account
+        .representative
+        .update(suspended_at: 10.days.ago)
+    end
+  end
+end

From 0ef636f72d5cb5df93e558ffb0489b2804f4a815 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 28 Aug 2024 03:58:40 -0400
Subject: [PATCH 1993/2191] Convert `shares` controller spec to system spec
 (#31619)

---
 spec/controllers/shares_controller_spec.rb | 22 ------------
 spec/system/share_entrypoint_spec.rb       | 39 ++++++++++++++--------
 2 files changed, 26 insertions(+), 35 deletions(-)
 delete mode 100644 spec/controllers/shares_controller_spec.rb

diff --git a/spec/controllers/shares_controller_spec.rb b/spec/controllers/shares_controller_spec.rb
deleted file mode 100644
index 5dcc46e47acf35..00000000000000
--- a/spec/controllers/shares_controller_spec.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe SharesController do
-  render_views
-
-  let(:user) { Fabricate(:user) }
-
-  before { sign_in user }
-
-  describe 'GET #show' do
-    subject(:body_classes) { assigns(:body_classes) }
-
-    before { get :show, params: { title: 'test title', text: 'test text', url: 'url1 url2' } }
-
-    it 'returns http success' do
-      expect(response).to have_http_status 200
-      expect(body_classes).to eq 'modal-layout compose-standalone'
-    end
-  end
-end
diff --git a/spec/system/share_entrypoint_spec.rb b/spec/system/share_entrypoint_spec.rb
index 5fdbeacefa407a..5e27781f2ae5df 100644
--- a/spec/system/share_entrypoint_spec.rb
+++ b/spec/system/share_entrypoint_spec.rb
@@ -2,32 +2,45 @@
 
 require 'rails_helper'
 
-describe 'ShareEntrypoint', :js, :streaming do
+describe 'Share page', :js, :streaming do
   include ProfileStories
 
-  subject { page }
-
   let(:email)               { 'test@example.com' }
   let(:password)            { 'password' }
   let(:confirmed_at)        { Time.zone.now }
   let(:finished_onboarding) { true }
 
-  before do
-    as_a_logged_in_user
+  before { as_a_logged_in_user }
+
+  it 'allows posting a new status' do
     visit share_path
-  end
 
-  it 'can be used to post a new status' do
-    expect(subject).to have_css('div#mastodon-compose')
-    expect(subject).to have_css('.compose-form__submit')
+    expect(page)
+      .to have_css('.modal-layout__mastodon')
+      .and have_css('div#mastodon-compose')
+      .and have_css('.compose-form__submit')
 
-    status_text = 'This is a new status!'
+    fill_in_form
 
+    expect(page)
+      .to have_css('.notification-bar-message', text: translations['compose.published.body'])
+  end
+
+  def fill_in_form
     within('.compose-form') do
-      fill_in "What's on your mind?", with: status_text
-      click_on 'Post'
+      fill_in translations['compose_form.placeholder'],
+              with: 'This is a new status!'
+      click_on translations['compose_form.publish']
     end
+  end
 
-    expect(subject).to have_css('.notification-bar-message', text: 'Post published.')
+  def translations
+    # TODO: Extract to system spec helper for re-use?
+    JSON.parse(
+      Rails
+        .root
+        .join('app', 'javascript', 'mastodon', 'locales', 'en.json')
+        .read
+    )
   end
 end

From 26d6d291c37194c40e3e5acbf4d8bae6734c2ace Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 28 Aug 2024 10:59:15 +0200
Subject: [PATCH 1994/2191] New Crowdin Translations (automated) (#31627)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/cy.json    | 39 +++++++++++++-------
 app/javascript/mastodon/locales/da.json    |  4 +++
 app/javascript/mastodon/locales/de.json    |  4 +--
 app/javascript/mastodon/locales/en-GB.json |  7 ++++
 app/javascript/mastodon/locales/fo.json    |  4 +++
 app/javascript/mastodon/locales/fr-CA.json | 37 +++++++++++++++++--
 app/javascript/mastodon/locales/fr.json    | 41 +++++++++++++++++++---
 app/javascript/mastodon/locales/he.json    |  4 +++
 app/javascript/mastodon/locales/hu.json    |  4 +++
 app/javascript/mastodon/locales/ia.json    |  1 +
 app/javascript/mastodon/locales/it.json    |  8 +++--
 app/javascript/mastodon/locales/ja.json    | 20 +++++++++++
 app/javascript/mastodon/locales/ko.json    |  4 +++
 app/javascript/mastodon/locales/nl.json    |  1 +
 app/javascript/mastodon/locales/nn.json    |  4 +++
 app/javascript/mastodon/locales/th.json    |  4 +++
 app/javascript/mastodon/locales/tr.json    |  4 +++
 app/javascript/mastodon/locales/uk.json    |  4 +++
 app/javascript/mastodon/locales/vi.json    |  4 +++
 app/javascript/mastodon/locales/zh-CN.json |  4 +++
 config/locales/doorkeeper.fr.yml           |  4 +--
 config/locales/en-GB.yml                   |  7 ++++
 config/locales/fr-CA.yml                   |  2 ++
 config/locales/fr.yml                      |  4 ++-
 config/locales/nl.yml                      |  6 ++--
 config/locales/simple_form.fr-CA.yml       |  1 +
 config/locales/simple_form.fr.yml          |  1 +
 27 files changed, 199 insertions(+), 28 deletions(-)

diff --git a/app/javascript/mastodon/locales/cy.json b/app/javascript/mastodon/locales/cy.json
index 7e7bc25c9eb46c..158f31aeb3a6bf 100644
--- a/app/javascript/mastodon/locales/cy.json
+++ b/app/javascript/mastodon/locales/cy.json
@@ -95,8 +95,10 @@
   "block_modal.they_cant_see_posts": "Nid ydynt yn gallu gweld eich postiadau ac ni fyddwch yn gweld eu rhai hwy.",
   "block_modal.they_will_know": "Gallant weld eu bod wedi'u rhwystro.",
   "block_modal.title": "Blocio defnyddiwr?",
-  "block_modal.you_wont_see_mentions": "Ni welwch bostiadau sy'n sôn amdanynt.",
+  "block_modal.you_wont_see_mentions": "Fyddwch chi ddim yn gweld postiadau sy'n sôn amdanyn nhw.",
   "boost_modal.combo": "Mae modd pwyso {combo} er mwyn hepgor hyn tro nesa",
+  "boost_modal.reblog": "Hybu postiad",
+  "boost_modal.undo_reblog": "Dad-hybu postiad?",
   "bundle_column_error.copy_stacktrace": "Copïo'r adroddiad gwall",
   "bundle_column_error.error.body": "Nid oedd modd cynhyrchu'r dudalen honno. Gall fod oherwydd gwall yn ein cod neu fater cydnawsedd porwr.",
   "bundle_column_error.error.title": "O na!",
@@ -145,7 +147,7 @@
   "compose.language.search": "Chwilio ieithoedd...",
   "compose.published.body": "Postiad wedi ei gyhoeddi.",
   "compose.published.open": "Agor",
-  "compose.saved.body": "Post wedi'i gadw.",
+  "compose.saved.body": "Postiad wedi'i gadw.",
   "compose_form.direct_message_warning_learn_more": "Dysgu mwy",
   "compose_form.encryption_warning": "Dyw postiadau ar Mastodon ddim wedi'u hamgryptio o ben i ben. Peidiwch â rhannu unrhyw wybodaeth sensitif dros Mastodon.",
   "compose_form.hashtag_warning": "Ni fydd y postiad hwn wedi ei restru o dan unrhyw hashnod gan nad yw'n gyhoeddus. Dim ond postiadau cyhoeddus y mae modd eu chwilio drwy hashnod.",
@@ -170,7 +172,7 @@
   "confirmations.block.confirm": "Blocio",
   "confirmations.delete.confirm": "Dileu",
   "confirmations.delete.message": "Ydych chi'n sicr eich bod eisiau dileu y post hwn?",
-  "confirmations.delete.title": "Dileu post?",
+  "confirmations.delete.title": "Dileu postiad?",
   "confirmations.delete_list.confirm": "Dileu",
   "confirmations.delete_list.message": "Ydych chi'n siŵr eich bod eisiau dileu'r rhestr hwn am byth?",
   "confirmations.delete_list.title": "Dileu rhestr?",
@@ -178,21 +180,21 @@
   "confirmations.discard_edit_media.message": "Mae gennych newidiadau heb eu cadw i'r disgrifiad cyfryngau neu'r rhagolwg - eu dileu beth bynnag?",
   "confirmations.edit.confirm": "Golygu",
   "confirmations.edit.message": "Bydd golygu nawr yn trosysgrifennu'r neges rydych yn ei ysgrifennu ar hyn o bryd. Ydych chi'n siŵr eich bod eisiau gwneud hyn?",
-  "confirmations.edit.title": "Trosysgrifo post?",
+  "confirmations.edit.title": "Trosysgrifo'r postiad?",
   "confirmations.logout.confirm": "Allgofnodi",
   "confirmations.logout.message": "Ydych chi'n siŵr eich bod am allgofnodi?",
   "confirmations.logout.title": "Allgofnodi?",
   "confirmations.mute.confirm": "Tewi",
   "confirmations.redraft.confirm": "Dileu ac ailddrafftio",
   "confirmations.redraft.message": "Ydych chi wir eisiau'r dileu'r postiad hwn a'i ailddrafftio? Bydd ffefrynnau a hybiau'n cael eu colli, a bydd atebion i'r post gwreiddiol yn mynd yn amddifad.",
-  "confirmations.redraft.title": "Dileu & ailddraftio post?",
+  "confirmations.redraft.title": "Dileu & ailddraftio postiad?",
   "confirmations.reply.confirm": "Ateb",
   "confirmations.reply.message": "Bydd ateb nawr yn cymryd lle y neges yr ydych yn cyfansoddi ar hyn o bryd. Ydych chi'n siŵr eich bod am barhau?",
-  "confirmations.reply.title": "Trosysgrifo post?",
+  "confirmations.reply.title": "Trosysgrifo'r postiad?",
   "confirmations.unfollow.confirm": "Dad-ddilyn",
   "confirmations.unfollow.message": "Ydych chi'n siŵr eich bod am ddad-ddilyn {name}?",
   "confirmations.unfollow.title": "Dad-ddilyn defnyddiwr?",
-  "content_warning.hide": "Cuddio'r post",
+  "content_warning.hide": "Cuddio'r postiad",
   "content_warning.show": "Dangos beth bynnag",
   "conversation.delete": "Dileu sgwrs",
   "conversation.mark_as_read": "Nodi fel wedi'i ddarllen",
@@ -256,7 +258,7 @@
   "empty_column.account_timeline": "Dim postiadau yma!",
   "empty_column.account_unavailable": "Nid yw'r proffil ar gael",
   "empty_column.blocks": "Nid ydych wedi blocio unrhyw ddefnyddwyr eto.",
-  "empty_column.bookmarked_statuses": "Nid oes gennych unrhyw bostiad wedi'u cadw fel llyfrnodau eto. Pan fyddwch yn gosod nod tudalen i un, mi fydd yn ymddangos yma.",
+  "empty_column.bookmarked_statuses": "Nid oes gennych unrhyw bostiad wedi'u cadw fel nod tudalen eto. Pan fyddwch yn gosod nod tudalen i un, mi fydd yn ymddangos yma.",
   "empty_column.community": "Mae'r ffrwd lleol yn wag. Beth am ysgrifennu rhywbeth cyhoeddus!",
   "empty_column.direct": "Nid oes gennych unrhyw grybwylliadau preifat eto. Pan fyddwch chi'n anfon neu'n derbyn un, bydd yn ymddangos yma.",
   "empty_column.domain_blocks": "Nid oes unrhyw barthau wedi'u blocio eto.",
@@ -351,9 +353,13 @@
   "hashtag.follow": "Dilyn hashnod",
   "hashtag.unfollow": "Dad-ddilyn hashnod",
   "hashtags.and_other": "…a {count, plural, other {# more}}",
+  "hints.profiles.followers_may_be_missing": "Mae'n bosibl bod dilynwyr y proffil hwn ar goll.",
+  "hints.profiles.follows_may_be_missing": "Mae'n bosibl bod dilynwyr y proffil hwn ar goll.",
+  "hints.profiles.posts_may_be_missing": "Mae'n bosibl bod rhai postiadau y proffil hwn ar goll.",
   "hints.profiles.see_more_followers": "Gweld mwy o ddilynwyr ar {domain}",
   "hints.profiles.see_more_follows": "Gweld mwy o 'yn dilyn' ar {domain}",
   "hints.profiles.see_more_posts": "Gweld mwy o bostiadau ar {domain}",
+  "hints.threads.replies_may_be_missing": "Mae'n bosibl y bydd atebion gan weinyddion eraill ar goll.",
   "hints.threads.see_more": "Gweld mwy o atebion ar {domain}",
   "home.column_settings.show_reblogs": "Dangos hybiau",
   "home.column_settings.show_replies": "Dangos atebion",
@@ -434,7 +440,7 @@
   "limited_account_hint.title": "Mae'r proffil hwn wedi cael ei guddio gan gymedrolwyr {domain}.",
   "link_preview.author": "Gan {name}",
   "link_preview.more_from_author": "Mwy gan {name}",
-  "link_preview.shares": "{count, plural, one {{counter} post} two {{counter} bost} few {{counter} phost} many {{counter} post} other {{counter} post}}",
+  "link_preview.shares": "{count, plural, one {{counter} ostiad } two {{counter} bostiad } few {{counter} postiad} many {{counter} postiad} other {{counter} postiad}}",
   "lists.account.add": "Ychwanegu at restr",
   "lists.account.remove": "Tynnu o'r rhestr",
   "lists.delete": "Dileu rhestr",
@@ -463,6 +469,7 @@
   "mute_modal.you_wont_see_mentions": "Welwch chi ddim postiadau sy'n sôn amdanyn nhw.",
   "mute_modal.you_wont_see_posts": "Gallan nhw weld eich postiadau o hyd, ond fyddwch chi ddim yn gweld eu rhai hwy.",
   "navigation_bar.about": "Ynghylch",
+  "navigation_bar.administration": "Gweinyddiaeth",
   "navigation_bar.advanced_interface": "Agor mewn rhyngwyneb gwe uwch",
   "navigation_bar.blocks": "Defnyddwyr wedi eu blocio",
   "navigation_bar.bookmarks": "Nodau Tudalen",
@@ -479,6 +486,7 @@
   "navigation_bar.follows_and_followers": "Yn dilyn a dilynwyr",
   "navigation_bar.lists": "Rhestrau",
   "navigation_bar.logout": "Allgofnodi",
+  "navigation_bar.moderation": "Cymedroil",
   "navigation_bar.mutes": "Defnyddwyr wedi'u tewi",
   "navigation_bar.opened_in_classic_interface": "Mae postiadau, cyfrifon a thudalennau penodol eraill yn cael eu hagor fel rhagosodiad yn y rhyngwyneb gwe clasurol.",
   "navigation_bar.personal": "Personol",
@@ -489,8 +497,8 @@
   "navigation_bar.security": "Diogelwch",
   "not_signed_in_indicator.not_signed_in": "Rhaid i chi fewngofnodi i weld yr adnodd hwn.",
   "notification.admin.report": "Adroddwyd ar {name} {target}",
-  "notification.admin.report_account": "{name} reported {count, plural, one {un post} other {# postsiadau}} from {target} for {category}",
-  "notification.admin.report_account_other": "Adroddodd {name} {count, plural, one {un post} two {# bost} few {# phost} other {# post}} gan {target}",
+  "notification.admin.report_account": "{name} reported {count, plural, one {un postiad} other {# postiad}} from {target} for {category}",
+  "notification.admin.report_account_other": "Adroddodd {name} {count, plural, one {un postiad} two {# bostiad} few {# phost} other {# postiad}} gan {target}",
   "notification.admin.report_statuses": "Adroddodd {name} {target} ar gyfer {category}",
   "notification.admin.report_statuses_other": "Adroddodd {name} {target}",
   "notification.admin.sign_up": "Cofrestrodd {name}",
@@ -498,7 +506,9 @@
   "notification.favourite": "Ffafriodd {name} eich postiad",
   "notification.favourite.name_and_others_with_link": "Ffafriodd {name} a <a>{count, plural, one {# arall} other {# eraill}}</a> eich postiad",
   "notification.follow": "Dilynodd {name} chi",
+  "notification.follow.name_and_others": "Mae {name} a {count, plural, one {# other} other {# others}} wedi'ch dilyn chi",
   "notification.follow_request": "Mae {name} wedi gwneud cais i'ch dilyn",
+  "notification.follow_request.name_and_others": "Mae {name} a{count, plural, one {# other} other {# others}} wedi gofyn i'ch dilyn chi",
   "notification.label.mention": "Crybwyll",
   "notification.label.private_mention": "Crybwyll preifat",
   "notification.label.private_reply": "Ateb preifat",
@@ -516,6 +526,7 @@
   "notification.own_poll": "Mae eich pleidlais wedi dod i ben",
   "notification.poll": "Mae arolwg y gwnaethoch bleidleisio ynddo wedi dod i ben",
   "notification.reblog": "Hybodd {name} eich post",
+  "notification.reblog.name_and_others_with_link": "Mae {name} a <a>{count, plural, one {# other} other {# others}}</a> wedi hybu eich postiad",
   "notification.relationships_severance_event": "Wedi colli cysylltiad â {name}",
   "notification.relationships_severance_event.account_suspension": "Mae gweinyddwr o {from} wedi atal {target}, sy'n golygu na allwch dderbyn diweddariadau ganddynt mwyach na rhyngweithio â nhw.",
   "notification.relationships_severance_event.domain_block": "Mae gweinyddwr o {from} wedi blocio {target}, gan gynnwys {followersCount} o'ch dilynwyr a {followingCount, plural, one {# cyfrif} other {# cyfrif}} arall rydych chi'n ei ddilyn.",
@@ -524,8 +535,12 @@
   "notification.status": "{name} newydd ei bostio",
   "notification.update": "Golygodd {name} bostiad",
   "notification_requests.accept": "Derbyn",
+  "notification_requests.accept_multiple": "{count, plural, one {Accept # request…} other {Accept # requests…}}",
+  "notification_requests.confirm_accept_multiple.button": "{count, plural, one {Accept request} other {Accept requests}}",
+  "notification_requests.confirm_accept_multiple.message": "Rydych ar fin derbyn {count, plural, one {one notification request} other {# notification requests}}. Ydych chi'n siŵr eich bod am barhau?",
   "notification_requests.confirm_accept_multiple.title": "Derbyn ceisiadau hysbysu?",
   "notification_requests.confirm_dismiss_multiple.button": "{count, plural, one {Diystyru cais} other {Diystyru ceisiadau}}",
+  "notification_requests.confirm_dismiss_multiple.message": "Rydych ar fin diystyru {count, plural, one {un cais hysbysu} other {# cais hysbysiad}}. Fyddwch chi ddim yn gallu cyrchu {count, plural, one {it} other {them}} yn hawdd eto. Ydych chi'n yn siŵr eich bod am fwrw ymlaen?",
   "notification_requests.confirm_dismiss_multiple.title": "Diystyru ceisiadau hysbysu?",
   "notification_requests.dismiss": "Cau",
   "notification_requests.dismiss_multiple": "{count, plural, one {Diystyru # cais…} two {Diystyru # gais…} few {Diystyru # chais…} other {Diystyru # cais…}}",
@@ -646,7 +661,7 @@
   "poll_button.add_poll": "Ychwanegu pleidlais",
   "poll_button.remove_poll": "Tynnu pleidlais",
   "privacy.change": "Addasu preifatrwdd y post",
-  "privacy.direct.long": "Pawb sydd â son amdanyn nhw yn y postiad",
+  "privacy.direct.long": "Pawb sydd â sôn amdanyn nhw yn y postiad",
   "privacy.direct.short": "Pobl benodol",
   "privacy.private.long": "Eich dilynwyr yn unig",
   "privacy.private.short": "Dilynwyr",
diff --git a/app/javascript/mastodon/locales/da.json b/app/javascript/mastodon/locales/da.json
index a791ec75e04185..732e4a100e5a2e 100644
--- a/app/javascript/mastodon/locales/da.json
+++ b/app/javascript/mastodon/locales/da.json
@@ -97,6 +97,8 @@
   "block_modal.title": "Blokér bruger?",
   "block_modal.you_wont_see_mentions": "Du vil ikke se indlæg, som nævner vedkommende.",
   "boost_modal.combo": "Du kan trykke {combo} for at springe dette over næste gang",
+  "boost_modal.reblog": "Boost indlæg?",
+  "boost_modal.undo_reblog": "Fjern boost af indlæg?",
   "bundle_column_error.copy_stacktrace": "Kopiér fejlrapport",
   "bundle_column_error.error.body": "Den anmodede side kunne ikke gengives. Dette kan skyldes flere typer fejl.",
   "bundle_column_error.error.title": "Åh nej!",
@@ -467,6 +469,7 @@
   "mute_modal.you_wont_see_mentions": "Indlæg, som nævner vedkommende, vises ikke.",
   "mute_modal.you_wont_see_posts": "Vedkommende kan stadig se dine indlæg, med vedkommendes vise ikke.",
   "navigation_bar.about": "Om",
+  "navigation_bar.administration": "Håndtering",
   "navigation_bar.advanced_interface": "Åbn i avanceret webgrænseflade",
   "navigation_bar.blocks": "Blokerede brugere",
   "navigation_bar.bookmarks": "Bogmærker",
@@ -483,6 +486,7 @@
   "navigation_bar.follows_and_followers": "Følges og følgere",
   "navigation_bar.lists": "Lister",
   "navigation_bar.logout": "Log af",
+  "navigation_bar.moderation": "Moderering",
   "navigation_bar.mutes": "Skjulte brugere (mutede)",
   "navigation_bar.opened_in_classic_interface": "Indlæg, konti og visse andre sider åbnes som standard i den klassiske webgrænseflade.",
   "navigation_bar.personal": "Personlig",
diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json
index 8e52cf10863257..3c180f9f5cce03 100644
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@@ -355,11 +355,11 @@
   "hashtags.and_other": "… und {count, plural, one{# weiterer} other {# weitere}}",
   "hints.profiles.followers_may_be_missing": "Möglicherweise werden für dieses Profil nicht alle Follower angezeigt.",
   "hints.profiles.follows_may_be_missing": "Möglicherweise werden für dieses Profil nicht alle gefolgten Profile angezeigt.",
-  "hints.profiles.posts_may_be_missing": "Möglicherweise werden für dieses Profil nicht alle Beiträge angezeigt.",
+  "hints.profiles.posts_may_be_missing": "Möglicherweise werden nicht alle Beiträge von diesem Profil angezeigt.",
   "hints.profiles.see_more_followers": "Weitere Follower auf {domain} ansehen",
   "hints.profiles.see_more_follows": "Weitere gefolgte Profile auf {domain} ansehen",
   "hints.profiles.see_more_posts": "Weitere Beiträge auf {domain} ansehen",
-  "hints.threads.replies_may_be_missing": "Möglicherweise werden für dieses Profil nicht alle Antworten angezeigt.",
+  "hints.threads.replies_may_be_missing": "Möglicherweise werden nicht alle Antworten von anderen Servern angezeigt.",
   "hints.threads.see_more": "Weitere Antworten auf {domain} ansehen",
   "home.column_settings.show_reblogs": "Geteilte Beiträge anzeigen",
   "home.column_settings.show_replies": "Antworten anzeigen",
diff --git a/app/javascript/mastodon/locales/en-GB.json b/app/javascript/mastodon/locales/en-GB.json
index ec0db40f77cacd..e9007c8654fc27 100644
--- a/app/javascript/mastodon/locales/en-GB.json
+++ b/app/javascript/mastodon/locales/en-GB.json
@@ -97,6 +97,8 @@
   "block_modal.title": "Block user?",
   "block_modal.you_wont_see_mentions": "You won't see posts that mention them.",
   "boost_modal.combo": "You can press {combo} to skip this next time",
+  "boost_modal.reblog": "Boost post?",
+  "boost_modal.undo_reblog": "Unboost post?",
   "bundle_column_error.copy_stacktrace": "Copy error report",
   "bundle_column_error.error.body": "The requested page could not be rendered. It could be due to a bug in our code, or a browser compatibility issue.",
   "bundle_column_error.error.title": "Oh, no!",
@@ -192,6 +194,8 @@
   "confirmations.unfollow.confirm": "Unfollow",
   "confirmations.unfollow.message": "Are you sure you want to unfollow {name}?",
   "confirmations.unfollow.title": "Unfollow user?",
+  "content_warning.hide": "Hide post",
+  "content_warning.show": "Show anyway",
   "conversation.delete": "Delete conversation",
   "conversation.mark_as_read": "Mark as read",
   "conversation.open": "View conversation",
@@ -299,6 +303,7 @@
   "filter_modal.select_filter.subtitle": "Use an existing category or create a new one",
   "filter_modal.select_filter.title": "Filter this post",
   "filter_modal.title.status": "Filter a post",
+  "filter_warning.matches_filter": "Matches filter “{title}”",
   "filtered_notifications_banner.pending_requests": "From {count, plural, =0 {no one} one {one person} other {# people}} you may know",
   "filtered_notifications_banner.title": "Filtered notifications",
   "firehose.all": "All",
@@ -464,6 +469,7 @@
   "mute_modal.you_wont_see_mentions": "You won't see posts that mention them.",
   "mute_modal.you_wont_see_posts": "They can still see your posts, but you won't see theirs.",
   "navigation_bar.about": "About",
+  "navigation_bar.administration": "Administration",
   "navigation_bar.advanced_interface": "Open in advanced web interface",
   "navigation_bar.blocks": "Blocked users",
   "navigation_bar.bookmarks": "Bookmarks",
@@ -480,6 +486,7 @@
   "navigation_bar.follows_and_followers": "Follows and followers",
   "navigation_bar.lists": "Lists",
   "navigation_bar.logout": "Logout",
+  "navigation_bar.moderation": "Moderation",
   "navigation_bar.mutes": "Muted users",
   "navigation_bar.opened_in_classic_interface": "Posts, accounts, and other specific pages are opened by default in the classic web interface.",
   "navigation_bar.personal": "Personal",
diff --git a/app/javascript/mastodon/locales/fo.json b/app/javascript/mastodon/locales/fo.json
index 576cacef4e0631..d4e5d9ad54ebe8 100644
--- a/app/javascript/mastodon/locales/fo.json
+++ b/app/javascript/mastodon/locales/fo.json
@@ -97,6 +97,8 @@
   "block_modal.title": "Banna brúkara?",
   "block_modal.you_wont_see_mentions": "Tú sært ikki postar, sum nevna tey.",
   "boost_modal.combo": "Tú kanst trýsta á {combo} fyri at loypa uppum hetta næstu ferð",
+  "boost_modal.reblog": "Stimbra post?",
+  "boost_modal.undo_reblog": "Strika stimbran av posti?",
   "bundle_column_error.copy_stacktrace": "Avrita feilfráboðan",
   "bundle_column_error.error.body": "Umbidna síðan kann ikki vísast. Tað kann vera orsakað av einum feili í koduni hjá okkum ella tað kann vera orsakað av kaganum, sum tú brúkar.",
   "bundle_column_error.error.title": "Áh, nei!",
@@ -467,6 +469,7 @@
   "mute_modal.you_wont_see_mentions": "Tú sært ikki postar, sum nevna tey.",
   "mute_modal.you_wont_see_posts": "Tey síggja framvegis tínar postar, men tú sært ikki teirra.",
   "navigation_bar.about": "Um",
+  "navigation_bar.administration": "Umsiting",
   "navigation_bar.advanced_interface": "Lat upp í framkomnum vevmarkamóti",
   "navigation_bar.blocks": "Bannaðir brúkarar",
   "navigation_bar.bookmarks": "Goymd",
@@ -483,6 +486,7 @@
   "navigation_bar.follows_and_followers": "Fylgd og fylgjarar",
   "navigation_bar.lists": "Listar",
   "navigation_bar.logout": "Rita út",
+  "navigation_bar.moderation": "Umsjón",
   "navigation_bar.mutes": "Doyvdir brúkarar",
   "navigation_bar.opened_in_classic_interface": "Postar, kontur og aðrar serstakar síður verða - um ikki annað er ásett - latnar upp í klassiska vev-markamótinum.",
   "navigation_bar.personal": "Persónligt",
diff --git a/app/javascript/mastodon/locales/fr-CA.json b/app/javascript/mastodon/locales/fr-CA.json
index 1a2a16f1f978d5..29612852679711 100644
--- a/app/javascript/mastodon/locales/fr-CA.json
+++ b/app/javascript/mastodon/locales/fr-CA.json
@@ -96,6 +96,7 @@
   "block_modal.title": "Bloquer l'utilisateur·rice ?",
   "block_modal.you_wont_see_mentions": "Vous ne verrez pas les publications qui le mentionne.",
   "boost_modal.combo": "Vous pouvez appuyer sur {combo} pour sauter ceci la prochaine fois",
+  "boost_modal.reblog": "Booster le message ?",
   "bundle_column_error.copy_stacktrace": "Copier le rapport d'erreur",
   "bundle_column_error.error.body": "La page demandée n'a pas pu être affichée. Cela pourrait être dû à un bogue dans notre code, ou à un problème de compatibilité avec le navigateur.",
   "bundle_column_error.error.title": "Oh non!",
@@ -310,6 +311,7 @@
   "follow_requests.unlocked_explanation": "Même si votre compte n’est pas privé, l’équipe de {domain} a pensé que vous pourriez vouloir peut-être consulter manuellement les demandes d'abonnement de ces comptes.",
   "follow_suggestions.curated_suggestion": "Choix du staff",
   "follow_suggestions.dismiss": "Ne plus afficher",
+  "follow_suggestions.featured_longer": "Sélectionné par l'équipe de {domain}",
   "follow_suggestions.friends_of_friends_longer": "Populaire dans le cercle des personnes que vous suivez",
   "follow_suggestions.hints.featured": "Ce profil a été sélectionné par l'équipe de {domain}.",
   "follow_suggestions.hints.friends_of_friends": "Ce profil est populaire parmi les personnes que vous suivez.",
@@ -358,6 +360,17 @@
   "home.pending_critical_update.link": "Voir les mises à jour",
   "home.pending_critical_update.title": "Une mise à jour de sécurité critique est disponible !",
   "home.show_announcements": "Afficher annonces",
+  "ignore_notifications_modal.disclaimer": "Mastodon ne peut pas indiquer aux utilisateurs que vous avez ignoré leurs notifications. Le fait d'ignorer les notifications n'empêchera pas la transmission des messages eux-mêmes.",
+  "ignore_notifications_modal.filter_instead": "Filtrer plutôt",
+  "ignore_notifications_modal.filter_to_act_users": "Vous serez toujours en mesure d'accepter, de rejeter ou de signaler les utilisateur·rice·s",
+  "ignore_notifications_modal.filter_to_avoid_confusion": "Le filtrage permet d'éviter toute éventuelle confusion",
+  "ignore_notifications_modal.filter_to_review_separately": "Vous pouvez réexaminer les notifications filtrées séparément",
+  "ignore_notifications_modal.ignore": "Ignorer les notifications",
+  "ignore_notifications_modal.limited_accounts_title": "Ignorer les notifications provenant des comptes modérés ?",
+  "ignore_notifications_modal.new_accounts_title": "Ignorer les notifications provenant des nouveaux comptes ?",
+  "ignore_notifications_modal.not_followers_title": "Ignorer les notifications provenant des personnes qui ne vous suivent pas ?",
+  "ignore_notifications_modal.not_following_title": "Ignorer les notifications provenant des personnes que vous ne suivez pas ?",
+  "ignore_notifications_modal.private_mentions_title": "Ignorer les notifications issues des mentions privées non sollicitées ?",
   "interaction_modal.description.favourite": "Avec un compte Mastodon, vous pouvez ajouter cette publication à vos favoris pour informer l'auteur⋅rice que vous l'appréciez et la sauvegarder pour plus tard.",
   "interaction_modal.description.follow": "Avec un compte Mastodon, vous pouvez suivre {name} et recevoir leurs publications dans votre fil d'accueil.",
   "interaction_modal.description.reblog": "Avec un compte Mastodon, vous pouvez booster cette publication pour la partager avec vos propres abonné·e·s.",
@@ -448,6 +461,7 @@
   "mute_modal.you_wont_see_mentions": "Vous ne verrez pas les publications qui le mentionne.",
   "mute_modal.you_wont_see_posts": "Il peut toujours voir vos publications, mais vous ne verrez pas les siennes.",
   "navigation_bar.about": "À propos",
+  "navigation_bar.administration": "Administration",
   "navigation_bar.advanced_interface": "Ouvrir dans l’interface avancée",
   "navigation_bar.blocks": "Comptes bloqués",
   "navigation_bar.bookmarks": "Signets",
@@ -464,6 +478,7 @@
   "navigation_bar.follows_and_followers": "Abonnements et abonnés",
   "navigation_bar.lists": "Listes",
   "navigation_bar.logout": "Se déconnecter",
+  "navigation_bar.moderation": "Modération",
   "navigation_bar.mutes": "Utilisateurs masqués",
   "navigation_bar.opened_in_classic_interface": "Les messages, les comptes et les pages spécifiques sont ouvertes dans l’interface classique.",
   "navigation_bar.personal": "Personnel",
@@ -474,14 +489,23 @@
   "navigation_bar.security": "Sécurité",
   "not_signed_in_indicator.not_signed_in": "Vous devez vous connecter pour accéder à cette ressource.",
   "notification.admin.report": "{name} a signalé {target}",
+  "notification.admin.report_account": "{name} a signalé {count, plural, one {un message} other {# messages}} de {target} pour {category}",
+  "notification.admin.report_account_other": "{name} a signalé {count, plural, one {un message} other {# messages}} depuis {target}",
+  "notification.admin.report_statuses": "{name} a signalé {target} pour {category}",
+  "notification.admin.report_statuses_other": "{name} a signalé {target}",
   "notification.admin.sign_up": "{name} s'est inscrit·e",
+  "notification.admin.sign_up.name_and_others": "{name} et {count, plural, one {# autre} other {# autres}} se sont inscrit",
   "notification.favourite": "{name} a ajouté votre publication à ses favoris",
+  "notification.favourite.name_and_others_with_link": "{name} et <a>{count, plural, one {# autre} other {# autres}}</a> ont mis votre message en favori",
   "notification.follow": "{name} vous suit",
+  "notification.follow.name_and_others": "{name} et {count, plural, one {# autre} other {# autres}} se sont abonné à votre compte",
   "notification.follow_request": "{name} a demandé à vous suivre",
+  "notification.follow_request.name_and_others": "{name} et {count, plural, one {# autre} other {# autres}} ont demandé à vous suivre",
   "notification.label.mention": "Mention",
   "notification.label.private_mention": "Mention privée",
   "notification.label.private_reply": "Répondre en privé",
   "notification.label.reply": "Réponse",
+  "notification.mention": "Mention",
   "notification.moderation-warning.learn_more": "En savoir plus",
   "notification.moderation_warning": "Vous avez reçu un avertissement de modération",
   "notification.moderation_warning.action_delete_statuses": "Certains de vos messages ont été supprimés.",
@@ -494,6 +518,7 @@
   "notification.own_poll": "Votre sondage est terminé",
   "notification.poll": "Un sondage auquel vous avez participé vient de se terminer",
   "notification.reblog": "{name} a boosté votre message",
+  "notification.reblog.name_and_others_with_link": "{name} et <a>{count, plural, one {# autre} other {# autres}}</a> ont boosté votre message",
   "notification.relationships_severance_event": "Connexions perdues avec {name}",
   "notification.relationships_severance_event.account_suspension": "Un·e administrateur·rice de {from} a suspendu {target}, ce qui signifie que vous ne pourrez plus recevoir de mises à jour ou interagir avec lui.",
   "notification.relationships_severance_event.domain_block": "Un·e administrateur·rice de {from} en a bloqué {target}, comprenant {followersCount} de vos abonné·e·s et {followingCount, plural, one {# compte} other {# comptes}} vous suivez.",
@@ -505,8 +530,13 @@
   "notification_requests.dismiss": "Rejeter",
   "notification_requests.edit_selection": "Modifier",
   "notification_requests.exit_selection": "Fait",
+  "notification_requests.explainer_for_limited_account": "Les notifications en provenance de ce compte ont été filtrées car le compte a été limité par un modérateur.",
+  "notification_requests.explainer_for_limited_remote_account": "Les notifications en provenance de ce compte ont été filtrées car le compte ou le serveur dont il est issu a été limité par un modérateur.",
+  "notification_requests.maximize": "Agrandir",
+  "notification_requests.minimize_banner": "Réduire la bannière des notifications filtrées",
   "notification_requests.notifications_from": "Notifications de {name}",
   "notification_requests.title": "Notifications filtrées",
+  "notification_requests.view": "Afficher les notifications",
   "notifications.clear": "Effacer notifications",
   "notifications.clear_confirmation": "Voulez-vous vraiment effacer toutes vos notifications?",
   "notifications.clear_title": "Effacer les notifications ?",
@@ -548,7 +578,8 @@
   "notifications.policy.drop": "Ignorer",
   "notifications.policy.drop_hint": "Expulser vers le vide, pour ne plus jamais les revoir",
   "notifications.policy.filter": "Filtrer",
-  "notifications.policy.filter_limited_accounts_hint": "Limité par les modérateur·rice·s du serveur",
+  "notifications.policy.filter_hint": "Envoyer à la boîte de réception des notifications filtrées",
+  "notifications.policy.filter_limited_accounts_hint": "Limités par les modérateur·rice·s du serveur",
   "notifications.policy.filter_limited_accounts_title": "Comptes modérés",
   "notifications.policy.filter_new_accounts.hint": "Créés au cours des derniers {days, plural, one {un jour} other {# jours}}",
   "notifications.policy.filter_new_accounts_title": "Nouveaux comptes",
@@ -556,8 +587,9 @@
   "notifications.policy.filter_not_followers_title": "Personnes qui ne vous suivent pas",
   "notifications.policy.filter_not_following_hint": "Jusqu'à ce que vous les validiez manuellement",
   "notifications.policy.filter_not_following_title": "Personnes que vous ne suivez pas",
-  "notifications.policy.filter_private_mentions_hint": "Filtré sauf si c'est en réponse à une mention de vous ou si vous suivez l'expéditeur",
+  "notifications.policy.filter_private_mentions_hint": "Filtrées sauf si c'est en réponse à l'une de vos mentions ou si vous suivez l'expéditeur·ice",
   "notifications.policy.filter_private_mentions_title": "Mentions privées non sollicitées",
+  "notifications.policy.title": "Gérer les notifications en provenance de …",
   "notifications_permission_banner.enable": "Activer les notifications de bureau",
   "notifications_permission_banner.how_to_control": "Pour recevoir des notifications lorsque Mastodon n’est pas ouvert, activez les notifications de bureau. Vous pouvez contrôler précisément quels types d’interactions génèrent des notifications de bureau via le bouton {icon} ci-dessus une fois qu’elles sont activées.",
   "notifications_permission_banner.title": "Ne rien rater",
@@ -721,6 +753,7 @@
   "server_banner.is_one_of_many": "{domain} est l'un des nombreux serveurs Mastodon indépendants que vous pouvez utiliser pour participer au fédiverse.",
   "server_banner.server_stats": "Statistiques du serveur:",
   "sign_in_banner.create_account": "Créer un compte",
+  "sign_in_banner.follow_anyone": "Suivez n'importe qui à travers le fédivers et affichez tout dans un ordre chronologique. Ni algorithmes, ni publicités, ni appâts à clics en perspective.",
   "sign_in_banner.mastodon_is": "Mastodon est le meilleur moyen de suivre ce qui se passe.",
   "sign_in_banner.sign_in": "Se connecter",
   "sign_in_banner.sso_redirect": "Se connecter ou s’inscrire",
diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json
index 99592372cbc871..970103db839237 100644
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@@ -96,6 +96,7 @@
   "block_modal.title": "Bloquer l'utilisateur·rice ?",
   "block_modal.you_wont_see_mentions": "Vous ne verrez pas les publications qui le mentionne.",
   "boost_modal.combo": "Vous pouvez appuyer sur {combo} pour passer ceci la prochaine fois",
+  "boost_modal.reblog": "Booster le message ?",
   "bundle_column_error.copy_stacktrace": "Copier le rapport d'erreur",
   "bundle_column_error.error.body": "La page demandée n'a pas pu être affichée. Cela peut être dû à un bogue dans notre code, ou à un problème de compatibilité avec le navigateur.",
   "bundle_column_error.error.title": "Oh non !",
@@ -288,7 +289,7 @@
   "filter_modal.added.context_mismatch_title": "Incompatibilité du contexte !",
   "filter_modal.added.expired_explanation": "Cette catégorie de filtre a expiré, vous devrez modifier la date d'expiration pour qu'elle soit appliquée.",
   "filter_modal.added.expired_title": "Filtre expiré !",
-  "filter_modal.added.review_and_configure": "Pour examiner et affiner la configuration de cette catégorie de filtre, allez à {settings_link}.",
+  "filter_modal.added.review_and_configure": "Pour examiner et affiner la configuration de cette catégorie de filtres, allez à {settings_link}.",
   "filter_modal.added.review_and_configure_title": "Paramètres du filtre",
   "filter_modal.added.settings_link": "page des paramètres",
   "filter_modal.added.short_explanation": "Ce message a été ajouté à la catégorie de filtre suivante : {title}.",
@@ -297,7 +298,7 @@
   "filter_modal.select_filter.expired": "a expiré",
   "filter_modal.select_filter.prompt_new": "Nouvelle catégorie : {name}",
   "filter_modal.select_filter.search": "Rechercher ou créer",
-  "filter_modal.select_filter.subtitle": "Utilisez une catégorie existante ou en créer une nouvelle",
+  "filter_modal.select_filter.subtitle": "Utilisez une catégorie existante ou créez-en une nouvelle",
   "filter_modal.select_filter.title": "Filtrer ce message",
   "filter_modal.title.status": "Filtrer un message",
   "filter_warning.matches_filter": "Correspond au filtre « {title} »",
@@ -310,6 +311,7 @@
   "follow_requests.unlocked_explanation": "Même si votre compte n’est pas privé, l’équipe de {domain} a pensé que vous pourriez vouloir consulter manuellement les demandes de suivi de ces comptes.",
   "follow_suggestions.curated_suggestion": "Choix du staff",
   "follow_suggestions.dismiss": "Ne plus afficher",
+  "follow_suggestions.featured_longer": "Sélectionné par l'équipe de {domain}",
   "follow_suggestions.friends_of_friends_longer": "Populaire dans le cercle des personnes que vous suivez",
   "follow_suggestions.hints.featured": "Ce profil a été sélectionné par l'équipe de {domain}.",
   "follow_suggestions.hints.friends_of_friends": "Ce profil est populaire parmi les personnes que vous suivez.",
@@ -358,6 +360,17 @@
   "home.pending_critical_update.link": "Voir les mises à jour",
   "home.pending_critical_update.title": "Une mise à jour de sécurité critique est disponible !",
   "home.show_announcements": "Afficher les annonces",
+  "ignore_notifications_modal.disclaimer": "Mastodon ne peut pas indiquer aux utilisateurs que vous avez ignoré leurs notifications. Le fait d'ignorer les notifications n'empêchera pas la transmission des messages eux-mêmes.",
+  "ignore_notifications_modal.filter_instead": "Filtrer plutôt",
+  "ignore_notifications_modal.filter_to_act_users": "Vous serez toujours en mesure d'accepter, de rejeter ou de signaler les utilisateur·rice·s",
+  "ignore_notifications_modal.filter_to_avoid_confusion": "Le filtrage permet d'éviter toute éventuelle confusion",
+  "ignore_notifications_modal.filter_to_review_separately": "Vous pouvez réexaminer les notifications filtrées séparément",
+  "ignore_notifications_modal.ignore": "Ignorer les notifications",
+  "ignore_notifications_modal.limited_accounts_title": "Ignorer les notifications provenant des comptes modérés ?",
+  "ignore_notifications_modal.new_accounts_title": "Ignorer les notifications provenant des nouveaux comptes ?",
+  "ignore_notifications_modal.not_followers_title": "Ignorer les notifications provenant des personnes qui ne vous suivent pas ?",
+  "ignore_notifications_modal.not_following_title": "Ignorer les notifications provenant des personnes que vous ne suivez pas ?",
+  "ignore_notifications_modal.private_mentions_title": "Ignorer les notifications issues des mentions privées non sollicitées ?",
   "interaction_modal.description.favourite": "Avec un compte Mastodon, vous pouvez ajouter ce message à vos favoris pour informer l'auteur⋅rice que vous l'appréciez et pour le sauvegarder pour plus tard.",
   "interaction_modal.description.follow": "Avec un compte Mastodon, vous pouvez suivre {name} et recevoir leurs posts dans votre fil d'actualité.",
   "interaction_modal.description.reblog": "Avec un compte sur Mastodon, vous pouvez partager ce message pour le faire découvrir à vos propres abonné⋅e⋅s.",
@@ -448,6 +461,7 @@
   "mute_modal.you_wont_see_mentions": "Vous ne verrez pas les publications qui le mentionne.",
   "mute_modal.you_wont_see_posts": "Il peut toujours voir vos publications, mais vous ne verrez pas les siennes.",
   "navigation_bar.about": "À propos",
+  "navigation_bar.administration": "Administration",
   "navigation_bar.advanced_interface": "Ouvrir dans l’interface avancée",
   "navigation_bar.blocks": "Comptes bloqués",
   "navigation_bar.bookmarks": "Marque-pages",
@@ -464,6 +478,7 @@
   "navigation_bar.follows_and_followers": "Abonnements et abonnés",
   "navigation_bar.lists": "Listes",
   "navigation_bar.logout": "Déconnexion",
+  "navigation_bar.moderation": "Modération",
   "navigation_bar.mutes": "Comptes masqués",
   "navigation_bar.opened_in_classic_interface": "Les messages, les comptes et les pages spécifiques sont ouvertes dans l’interface classique.",
   "navigation_bar.personal": "Personnel",
@@ -474,14 +489,23 @@
   "navigation_bar.security": "Sécurité",
   "not_signed_in_indicator.not_signed_in": "Vous devez vous connecter pour accéder à cette ressource.",
   "notification.admin.report": "{name} a signalé {target}",
+  "notification.admin.report_account": "{name} a signalé {count, plural, one {un message} other {# messages}} de {target} pour {category}",
+  "notification.admin.report_account_other": "{name} a signalé {count, plural, one {un message} other {# messages}} depuis {target}",
+  "notification.admin.report_statuses": "{name} a signalé {target} pour {category}",
+  "notification.admin.report_statuses_other": "{name} a signalé {target}",
   "notification.admin.sign_up": "{name} s'est inscrit",
+  "notification.admin.sign_up.name_and_others": "{name} et {count, plural, one {# autre} other {# autres}} se sont inscrit",
   "notification.favourite": "{name} a ajouté votre message à ses favoris",
+  "notification.favourite.name_and_others_with_link": "{name} et <a>{count, plural, one {# autre} other {# autres}}</a> ont mis votre message en favori",
   "notification.follow": "{name} vous suit",
+  "notification.follow.name_and_others": "{name} et {count, plural, one {# autre} other {# autres}} se sont abonné à votre compte",
   "notification.follow_request": "{name} a demandé à vous suivre",
+  "notification.follow_request.name_and_others": "{name} et {count, plural, one {# autre} other {# autres}} ont demandé à vous suivre",
   "notification.label.mention": "Mention",
   "notification.label.private_mention": "Mention privée",
   "notification.label.private_reply": "Répondre en privé",
   "notification.label.reply": "Réponse",
+  "notification.mention": "Mention",
   "notification.moderation-warning.learn_more": "En savoir plus",
   "notification.moderation_warning": "Vous avez reçu un avertissement de modération",
   "notification.moderation_warning.action_delete_statuses": "Certains de vos messages ont été supprimés.",
@@ -494,6 +518,7 @@
   "notification.own_poll": "Votre sondage est terminé",
   "notification.poll": "Un sondage auquel vous avez participé vient de se terminer",
   "notification.reblog": "{name} a partagé votre message",
+  "notification.reblog.name_and_others_with_link": "{name} et <a>{count, plural, one {# autre} other {# autres}}</a> ont boosté votre message",
   "notification.relationships_severance_event": "Connexions perdues avec {name}",
   "notification.relationships_severance_event.account_suspension": "Un·e administrateur·rice de {from} a suspendu {target}, ce qui signifie que vous ne pourrez plus recevoir de mises à jour ou interagir avec lui.",
   "notification.relationships_severance_event.domain_block": "Un·e administrateur·rice de {from} en a bloqué {target}, comprenant {followersCount} de vos abonné·e·s et {followingCount, plural, one {# compte} other {# comptes}} vous suivez.",
@@ -505,8 +530,13 @@
   "notification_requests.dismiss": "Rejeter",
   "notification_requests.edit_selection": "Modifier",
   "notification_requests.exit_selection": "Fait",
+  "notification_requests.explainer_for_limited_account": "Les notifications en provenance de ce compte ont été filtrées car le compte a été limité par un modérateur.",
+  "notification_requests.explainer_for_limited_remote_account": "Les notifications en provenance de ce compte ont été filtrées car le compte ou le serveur dont il est issu a été limité par un modérateur.",
+  "notification_requests.maximize": "Agrandir",
+  "notification_requests.minimize_banner": "Réduire la bannière des notifications filtrées",
   "notification_requests.notifications_from": "Notifications de {name}",
   "notification_requests.title": "Notifications filtrées",
+  "notification_requests.view": "Afficher les notifications",
   "notifications.clear": "Effacer les notifications",
   "notifications.clear_confirmation": "Voulez-vous vraiment effacer toutes vos notifications ?",
   "notifications.clear_title": "Effacer les notifications ?",
@@ -548,7 +578,8 @@
   "notifications.policy.drop": "Ignorer",
   "notifications.policy.drop_hint": "Expulser vers le vide, pour ne plus jamais les revoir",
   "notifications.policy.filter": "Filtrer",
-  "notifications.policy.filter_limited_accounts_hint": "Limité par les modérateur·rice·s du serveur",
+  "notifications.policy.filter_hint": "Envoyer à la boîte de réception des notifications filtrées",
+  "notifications.policy.filter_limited_accounts_hint": "Limités par les modérateur·rice·s du serveur",
   "notifications.policy.filter_limited_accounts_title": "Comptes modérés",
   "notifications.policy.filter_new_accounts.hint": "Créés au cours des derniers {days, plural, one {un jour} other {# jours}}",
   "notifications.policy.filter_new_accounts_title": "Nouveaux comptes",
@@ -556,8 +587,9 @@
   "notifications.policy.filter_not_followers_title": "Personnes qui ne vous suivent pas",
   "notifications.policy.filter_not_following_hint": "Jusqu'à ce que vous les validiez manuellement",
   "notifications.policy.filter_not_following_title": "Personnes que vous ne suivez pas",
-  "notifications.policy.filter_private_mentions_hint": "Filtré sauf si c'est en réponse à une mention de vous ou si vous suivez l'expéditeur",
+  "notifications.policy.filter_private_mentions_hint": "Filtrées sauf si c'est en réponse à l'une de vos mentions ou si vous suivez l'expéditeur·ice",
   "notifications.policy.filter_private_mentions_title": "Mentions privées non sollicitées",
+  "notifications.policy.title": "Gérer les notifications en provenance de …",
   "notifications_permission_banner.enable": "Activer les notifications de bureau",
   "notifications_permission_banner.how_to_control": "Pour recevoir des notifications lorsque Mastodon n’est pas ouvert, activez les notifications du bureau. Vous pouvez contrôler précisément quels types d’interactions génèrent des notifications de bureau via le bouton {icon} ci-dessus une fois qu’elles sont activées.",
   "notifications_permission_banner.title": "Toujours au courant",
@@ -721,6 +753,7 @@
   "server_banner.is_one_of_many": "{domain} est l'un des nombreux serveurs Mastodon indépendants que vous pouvez utiliser pour participer au fédiverse.",
   "server_banner.server_stats": "Statistiques du serveur :",
   "sign_in_banner.create_account": "Créer un compte",
+  "sign_in_banner.follow_anyone": "Suivez n'importe qui à travers le fédivers et affichez tout dans un ordre chronologique. Ni algorithmes, ni publicités, ni appâts à clics en perspective.",
   "sign_in_banner.mastodon_is": "Mastodon est le meilleur moyen de suivre ce qui se passe.",
   "sign_in_banner.sign_in": "Se connecter",
   "sign_in_banner.sso_redirect": "Se connecter ou s’inscrire",
diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json
index 3ccd9510809a41..44c95d64c6f762 100644
--- a/app/javascript/mastodon/locales/he.json
+++ b/app/javascript/mastodon/locales/he.json
@@ -97,6 +97,8 @@
   "block_modal.title": "לחסום משתמש?",
   "block_modal.you_wont_see_mentions": "לא תראה הודעות שמאזכרות אותם.",
   "boost_modal.combo": "ניתן להקיש {combo} כדי לדלג בפעם הבאה",
+  "boost_modal.reblog": "להדהד הודעה?",
+  "boost_modal.undo_reblog": "להסיר הדהוד?",
   "bundle_column_error.copy_stacktrace": "העתקת הודעת שגיאה",
   "bundle_column_error.error.body": "הדף המבוקש אינו זמין. זה עשוי להיות באג בקוד או בעייה בתאימות הדפדפן.",
   "bundle_column_error.error.title": "הו, לא!",
@@ -467,6 +469,7 @@
   "mute_modal.you_wont_see_mentions": "לא תראה הודעות שמאזכרות אותם.",
   "mute_modal.you_wont_see_posts": "הם יכולים לראות את הודעותכם, אבל אתם לא תוכלו לראות את שלהם.",
   "navigation_bar.about": "אודות",
+  "navigation_bar.administration": "ניהול",
   "navigation_bar.advanced_interface": "פתח במנשק ווב מתקדם",
   "navigation_bar.blocks": "משתמשים חסומים",
   "navigation_bar.bookmarks": "סימניות",
@@ -483,6 +486,7 @@
   "navigation_bar.follows_and_followers": "נעקבים ועוקבים",
   "navigation_bar.lists": "רשימות",
   "navigation_bar.logout": "התנתקות",
+  "navigation_bar.moderation": "פיקוח",
   "navigation_bar.mutes": "משתמשים בהשתקה",
   "navigation_bar.opened_in_classic_interface": "הודעות, חשבונות ושאר עמודי רשת יפתחו כברירת מחדל בדפדפן רשת קלאסי.",
   "navigation_bar.personal": "אישי",
diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json
index b76b2e92cd5440..d55a85ee335183 100644
--- a/app/javascript/mastodon/locales/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@@ -97,6 +97,8 @@
   "block_modal.title": "Letiltsuk a felhasználót?",
   "block_modal.you_wont_see_mentions": "Nem látsz majd őt említő bejegyzéseket.",
   "boost_modal.combo": "Hogy átugord ezt következő alkalommal, használd {combo}",
+  "boost_modal.reblog": "Bejegyzés megtolása?",
+  "boost_modal.undo_reblog": "Megtolás visszavonása?",
   "bundle_column_error.copy_stacktrace": "Hibajelentés másolása",
   "bundle_column_error.error.body": "A kért lap nem jeleníthető meg. Ez lehet, hogy kódhiba, vagy böngészőkompatibitási hiba.",
   "bundle_column_error.error.title": "Jaj ne!",
@@ -467,6 +469,7 @@
   "mute_modal.you_wont_see_mentions": "Nem látsz majd őt említő bejegyzéseket.",
   "mute_modal.you_wont_see_posts": "Továbbra is látni fogja a bejegyzéseidet, de te nem fogod látni az övéit.",
   "navigation_bar.about": "Névjegy",
+  "navigation_bar.administration": "Adminisztráció",
   "navigation_bar.advanced_interface": "Megnyitás a speciális webes felületben",
   "navigation_bar.blocks": "Letiltott felhasználók",
   "navigation_bar.bookmarks": "Könyvjelzők",
@@ -483,6 +486,7 @@
   "navigation_bar.follows_and_followers": "Követések és követők",
   "navigation_bar.lists": "Listák",
   "navigation_bar.logout": "Kijelentkezés",
+  "navigation_bar.moderation": "Moderáció",
   "navigation_bar.mutes": "Némított felhasználók",
   "navigation_bar.opened_in_classic_interface": "A bejegyzések, fiókok és más speciális oldalak alapértelmezés szerint a klasszikus webes felületen nyílnak meg.",
   "navigation_bar.personal": "Személyes",
diff --git a/app/javascript/mastodon/locales/ia.json b/app/javascript/mastodon/locales/ia.json
index 2c3b04f9989ea4..31fb52552b8832 100644
--- a/app/javascript/mastodon/locales/ia.json
+++ b/app/javascript/mastodon/locales/ia.json
@@ -97,6 +97,7 @@
   "block_modal.title": "Blocar usator?",
   "block_modal.you_wont_see_mentions": "Tu non videra le messages que mentiona iste persona.",
   "boost_modal.combo": "Tu pote premer {combo} pro saltar isto le proxime vice",
+  "boost_modal.reblog": "Impulsar le message?",
   "bundle_column_error.copy_stacktrace": "Copiar reporto de error",
   "bundle_column_error.error.body": "Le pagina requestate non pote esser visualisate. Pote esser a causa de un defecto in nostre codice o de un problema de compatibilitate del navigator.",
   "bundle_column_error.error.title": "Oh, no!",
diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json
index 8e3082359ed02e..46d1fdd7ab328b 100644
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@@ -97,6 +97,8 @@
   "block_modal.title": "Bloccare l'utente?",
   "block_modal.you_wont_see_mentions": "Non vedrai i post che li menzionano.",
   "boost_modal.combo": "Puoi premere {combo} per saltare questo passaggio, la prossima volta",
+  "boost_modal.reblog": "Condividere il post?",
+  "boost_modal.undo_reblog": "Annullare la condivisione del post?",
   "bundle_column_error.copy_stacktrace": "Copia rapporto sull'errore",
   "bundle_column_error.error.body": "Impossibile rendedrizzare la pagina richiesta. Potrebbe dipendere da un bug nel nostro codice o da un problema di compatibilità di un browser.",
   "bundle_column_error.error.title": "Oh, no!",
@@ -125,7 +127,7 @@
   "column.firehose": "Feed dal vivo",
   "column.follow_requests": "Richieste di seguirti",
   "column.home": "Home",
-  "column.lists": "Elenchi",
+  "column.lists": "Liste",
   "column.mutes": "Utenti silenziati",
   "column.notifications": "Notifiche",
   "column.pins": "Post fissati",
@@ -452,7 +454,7 @@
   "lists.replies_policy.none": "Nessuno",
   "lists.replies_policy.title": "Mostra risposte a:",
   "lists.search": "Cerca tra le persone che segui",
-  "lists.subheading": "I tuoi elenchi",
+  "lists.subheading": "Le tue liste",
   "load_pending": "{count, plural, one {# nuovo oggetto} other {# nuovi oggetti}}",
   "loading_indicator.label": "Caricamento…",
   "media_gallery.toggle_visible": "{number, plural, one {Nascondi immagine} other {Nascondi immagini}}",
@@ -467,6 +469,7 @@
   "mute_modal.you_wont_see_mentions": "Non vedrai i post che li menzionano.",
   "mute_modal.you_wont_see_posts": "Possono ancora vedere i tuoi post, ma tu non vedrai i loro.",
   "navigation_bar.about": "Info",
+  "navigation_bar.administration": "Amministrazione",
   "navigation_bar.advanced_interface": "Apri nell'interfaccia web avanzata",
   "navigation_bar.blocks": "Utenti bloccati",
   "navigation_bar.bookmarks": "Segnalibri",
@@ -483,6 +486,7 @@
   "navigation_bar.follows_and_followers": "Seguiti e seguaci",
   "navigation_bar.lists": "Liste",
   "navigation_bar.logout": "Disconnettiti",
+  "navigation_bar.moderation": "Moderazione",
   "navigation_bar.mutes": "Utenti silenziati",
   "navigation_bar.opened_in_classic_interface": "Post, account e altre pagine specifiche sono aperti per impostazione predefinita nella classica interfaccia web.",
   "navigation_bar.personal": "Personale",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index 8784c6d1a82788..86ba4ad64d9c73 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -351,6 +351,14 @@
   "hashtag.follow": "ハッシュタグをフォローする",
   "hashtag.unfollow": "ハッシュタグのフォローを解除",
   "hashtags.and_other": "ほか{count, plural, other {#個}}",
+  "hints.profiles.followers_may_be_missing": "フォロワーの一覧は不正確な場合があります。",
+  "hints.profiles.follows_may_be_missing": "フォローの一覧は不正確な場合があります。",
+  "hints.profiles.posts_may_be_missing": "すべての投稿を表示できていない場合があります。",
+  "hints.profiles.see_more_followers": "{domain} で正確な情報を見る",
+  "hints.profiles.see_more_follows": "{domain} で正確な情報を見る",
+  "hints.profiles.see_more_posts": "{domain} でその他の投稿を見る",
+  "hints.threads.replies_may_be_missing": "リモートの返信は表示されない場合があります。",
+  "hints.threads.see_more": "{domain} でその他の返信を見る",
   "home.column_settings.show_reblogs": "ブースト表示",
   "home.column_settings.show_replies": "返信表示",
   "home.hide_announcements": "お知らせを隠す",
@@ -358,6 +366,17 @@
   "home.pending_critical_update.link": "詳細",
   "home.pending_critical_update.title": "緊急のセキュリティアップデートがあります",
   "home.show_announcements": "お知らせを表示",
+  "ignore_notifications_modal.disclaimer": "通知が無視されていることは通知の送信元の相手には伝わりません。通知が破棄されるのみで、投稿や返信の送信を止めさせる効果はありません。",
+  "ignore_notifications_modal.filter_instead": "「保留」に設定",
+  "ignore_notifications_modal.filter_to_act_users": "保留された通知は「受け入れ」「無視」を選択できます。当該ユーザーの通報も可能です",
+  "ignore_notifications_modal.filter_to_avoid_confusion": "通知の破棄による意図しない混乱を避けるためにも、「保留」設定の使用を検討してください",
+  "ignore_notifications_modal.filter_to_review_separately": "「保留」設定を使用することで、保留された通知を個別に確認できます",
+  "ignore_notifications_modal.ignore": "「無視」に設定",
+  "ignore_notifications_modal.limited_accounts_title": "本当に「モデレーションされたアカウントからの通知」を無視するようにしますか？",
+  "ignore_notifications_modal.new_accounts_title": "本当に「新しいアカウントからの通知」を無視するようにしますか？",
+  "ignore_notifications_modal.not_followers_title": "本当に「フォローされていないアカウントからの通知」を無視するようにしますか？",
+  "ignore_notifications_modal.not_following_title": "本当に「フォローしていないアカウントからの通知」を無視するようにしますか？",
+  "ignore_notifications_modal.private_mentions_title": "本当に「外部からの非公開の返信」を無視するようにしますか？",
   "interaction_modal.description.favourite": "Mastodonのアカウントがあれば投稿をお気に入り登録して投稿者に気持ちを伝えたり、あとで見返すことができます。",
   "interaction_modal.description.follow": "Mastodonのアカウントで{name}さんをフォローしてホームフィードで投稿を受け取れます。",
   "interaction_modal.description.reblog": "Mastodonのアカウントでこの投稿をブーストして自分のフォロワーに共有できます。",
@@ -518,6 +537,7 @@
   "notification_requests.minimize_banner": "「保留中の通知」のバナーを最小化する",
   "notification_requests.notifications_from": "{name}からの通知",
   "notification_requests.title": "保留中の通知",
+  "notification_requests.view": "通知を確認",
   "notifications.clear": "通知を消去",
   "notifications.clear_confirmation": "本当に通知を消去しますか？",
   "notifications.clear_title": "通知を消去しようとしています",
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index 3b4434fef70f5d..001363278409fc 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -97,6 +97,8 @@
   "block_modal.title": "사용자를 차단할까요?",
   "block_modal.you_wont_see_mentions": "그를 멘션하는 게시물을 더는 보지 않습니다.",
   "boost_modal.combo": "다음엔 {combo}를 눌러서 이 과정을 건너뛸 수 있습니다",
+  "boost_modal.reblog": "게시물을 부스트할까요?",
+  "boost_modal.undo_reblog": "게시물을 부스트 취소할까요?",
   "bundle_column_error.copy_stacktrace": "에러 리포트 복사하기",
   "bundle_column_error.error.body": "요청한 페이지를 렌더링 할 수 없습니다. 저희의 코드에 버그가 있거나, 브라우저 호환성 문제일 수 있습니다.",
   "bundle_column_error.error.title": "으악, 안돼!",
@@ -467,6 +469,7 @@
   "mute_modal.you_wont_see_mentions": "그를 멘션하는 게시물을 더는 보지 않게 됩니다.",
   "mute_modal.you_wont_see_posts": "내가 작성한 게시물을 볼 수는 있지만, 나는 그가 작성한 것을 보지 않게 됩니다.",
   "navigation_bar.about": "정보",
+  "navigation_bar.administration": "관리",
   "navigation_bar.advanced_interface": "고급 웹 인터페이스에서 열기",
   "navigation_bar.blocks": "차단한 사용자",
   "navigation_bar.bookmarks": "북마크",
@@ -483,6 +486,7 @@
   "navigation_bar.follows_and_followers": "팔로우와 팔로워",
   "navigation_bar.lists": "리스트",
   "navigation_bar.logout": "로그아웃",
+  "navigation_bar.moderation": "중재",
   "navigation_bar.mutes": "뮤트한 사용자",
   "navigation_bar.opened_in_classic_interface": "게시물, 계정, 기타 특정 페이지들은 기본적으로 기존 웹 인터페이스로 열리게 됩니다.",
   "navigation_bar.personal": "개인용",
diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json
index 3362cf36ce1225..3526568249a77d 100644
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@@ -98,6 +98,7 @@
   "block_modal.you_wont_see_mentions": "Je ziet geen berichten meer die dit account vermelden.",
   "boost_modal.combo": "Je kunt {combo} klikken om dit de volgende keer over te slaan",
   "boost_modal.reblog": "Bericht boosten?",
+  "boost_modal.undo_reblog": "Bericht niet langer boosten?",
   "bundle_column_error.copy_stacktrace": "Foutrapportage kopiëren",
   "bundle_column_error.error.body": "De opgevraagde pagina kon niet worden weergegeven. Dit kan het gevolg zijn van een fout in onze broncode, of van een compatibiliteitsprobleem met je webbrowser.",
   "bundle_column_error.error.title": "O nee!",
diff --git a/app/javascript/mastodon/locales/nn.json b/app/javascript/mastodon/locales/nn.json
index 9ceb6eda92b597..393946ff18fca4 100644
--- a/app/javascript/mastodon/locales/nn.json
+++ b/app/javascript/mastodon/locales/nn.json
@@ -97,6 +97,8 @@
   "block_modal.title": "Blokker brukaren?",
   "block_modal.you_wont_see_mentions": "Du ser ikkje innlegg som nemner dei.",
   "boost_modal.combo": "Du kan trykkja {combo} for å hoppa over dette neste gong",
+  "boost_modal.reblog": "Framhev innlegget?",
+  "boost_modal.undo_reblog": "Fjern framhevinga?",
   "bundle_column_error.copy_stacktrace": "Kopier feilrapport",
   "bundle_column_error.error.body": "Den etterspurde sida kan ikke hentast fram. Det kan skuldast ein feil i koden vår eller eit kompatibilitetsproblem.",
   "bundle_column_error.error.title": "Ånei!",
@@ -467,6 +469,7 @@
   "mute_modal.you_wont_see_mentions": "Du vil ikkje sjå innlegg som nemner dei.",
   "mute_modal.you_wont_see_posts": "Dei kan framleis sjå innlegga dine, men du vil ikkje sjå deira.",
   "navigation_bar.about": "Om",
+  "navigation_bar.administration": "Administrasjon",
   "navigation_bar.advanced_interface": "Opne i avansert nettgrensesnitt",
   "navigation_bar.blocks": "Blokkerte brukarar",
   "navigation_bar.bookmarks": "Bokmerke",
@@ -483,6 +486,7 @@
   "navigation_bar.follows_and_followers": "Fylgje og fylgjarar",
   "navigation_bar.lists": "Lister",
   "navigation_bar.logout": "Logg ut",
+  "navigation_bar.moderation": "Moderering",
   "navigation_bar.mutes": "Målbundne brukarar",
   "navigation_bar.opened_in_classic_interface": "Innlegg, kontoar, og enkelte andre sider blir opna som standard i det klassiske webgrensesnittet.",
   "navigation_bar.personal": "Personleg",
diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json
index 370b49e7e17cf8..55f0fe02be06cc 100644
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@@ -97,6 +97,8 @@
   "block_modal.title": "ปิดกั้นผู้ใช้?",
   "block_modal.you_wont_see_mentions": "คุณจะไม่เห็นโพสต์ที่กล่าวถึงเขา",
   "boost_modal.combo": "คุณสามารถกด {combo} เพื่อข้ามสิ่งนี้ในครั้งถัดไป",
+  "boost_modal.reblog": "ดันโพสต์?",
+  "boost_modal.undo_reblog": "เลิกดันโพสต์?",
   "bundle_column_error.copy_stacktrace": "คัดลอกรายงานข้อผิดพลาด",
   "bundle_column_error.error.body": "ไม่สามารถแสดงผลหน้าที่ขอ ข้อผิดพลาดอาจเป็นเพราะข้อบกพร่องในโค้ดของเรา หรือปัญหาความเข้ากันได้ของเบราว์เซอร์",
   "bundle_column_error.error.title": "โอ้ ไม่!",
@@ -467,6 +469,7 @@
   "mute_modal.you_wont_see_mentions": "คุณจะไม่เห็นโพสต์ที่กล่าวถึงเขา",
   "mute_modal.you_wont_see_posts": "เขายังคงสามารถเห็นโพสต์ของคุณ แต่คุณจะไม่เห็นโพสต์ของเขา",
   "navigation_bar.about": "เกี่ยวกับ",
+  "navigation_bar.administration": "การดูแล",
   "navigation_bar.advanced_interface": "เปิดในส่วนติดต่อเว็บขั้นสูง",
   "navigation_bar.blocks": "ผู้ใช้ที่ปิดกั้นอยู่",
   "navigation_bar.bookmarks": "ที่คั่นหน้า",
@@ -483,6 +486,7 @@
   "navigation_bar.follows_and_followers": "การติดตามและผู้ติดตาม",
   "navigation_bar.lists": "รายการ",
   "navigation_bar.logout": "ออกจากระบบ",
+  "navigation_bar.moderation": "การกลั่นกรอง",
   "navigation_bar.mutes": "ผู้ใช้ที่ซ่อนอยู่",
   "navigation_bar.opened_in_classic_interface": "จะเปิดโพสต์, บัญชี และหน้าที่เฉพาะเจาะจงอื่น ๆ เป็นค่าเริ่มต้นในส่วนติดต่อเว็บแบบคลาสสิก",
   "navigation_bar.personal": "ส่วนบุคคล",
diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json
index c80be8ab4ca31f..9b94ede76a6d2e 100644
--- a/app/javascript/mastodon/locales/tr.json
+++ b/app/javascript/mastodon/locales/tr.json
@@ -97,6 +97,8 @@
   "block_modal.title": "Kullanıcıyı engelle?",
   "block_modal.you_wont_see_mentions": "Onlardan bahseden gönderiler göremezsiniz.",
   "boost_modal.combo": "Bir daha ki sefere {combo} tuşuna basabilirsin",
+  "boost_modal.reblog": "Gönderiyi yeniden paylaş?",
+  "boost_modal.undo_reblog": "Gönderinin yeniden paylaşımını geri al?",
   "bundle_column_error.copy_stacktrace": "Hata raporunu kopyala",
   "bundle_column_error.error.body": "İstenen sayfa gösterilemiyor. Bu durum kodumuzdaki bir hatadan veya tarayıcı uyum sorunundan kaynaklanıyor olabilir.",
   "bundle_column_error.error.title": "Ah, hayır!",
@@ -467,6 +469,7 @@
   "mute_modal.you_wont_see_mentions": "Onlardan bahseden gönderiler göremezsiniz.",
   "mute_modal.you_wont_see_posts": "Onlar sizin gönderilerinizi görmeye devam edebilir, ancak siz onlarınkini göremezsiniz.",
   "navigation_bar.about": "Hakkında",
+  "navigation_bar.administration": "Yönetim",
   "navigation_bar.advanced_interface": "Gelişmiş web arayüzünde aç",
   "navigation_bar.blocks": "Engellenen kullanıcılar",
   "navigation_bar.bookmarks": "Yer İşaretleri",
@@ -483,6 +486,7 @@
   "navigation_bar.follows_and_followers": "Takip edilenler ve takipçiler",
   "navigation_bar.lists": "Listeler",
   "navigation_bar.logout": "Oturumu kapat",
+  "navigation_bar.moderation": "Moderasyon",
   "navigation_bar.mutes": "Sessize alınmış kullanıcılar",
   "navigation_bar.opened_in_classic_interface": "Gönderiler, hesaplar ve diğer belirli sayfalar klasik web arayüzünde varsayılan olarak açılıyorlar.",
   "navigation_bar.personal": "Kişisel",
diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json
index 84ff487bdad8d1..905938d158d3d9 100644
--- a/app/javascript/mastodon/locales/uk.json
+++ b/app/javascript/mastodon/locales/uk.json
@@ -97,6 +97,8 @@
   "block_modal.title": "Заблокувати користувача?",
   "block_modal.you_wont_see_mentions": "Ви не бачитимете дописів, де їх згадано.",
   "boost_modal.combo": "Ви можете натиснути {combo}, щоби пропустити це наступного разу",
+  "boost_modal.reblog": "Поширити допис?",
+  "boost_modal.undo_reblog": "Скасувати поширення?",
   "bundle_column_error.copy_stacktrace": "Копіювати звіт про помилку",
   "bundle_column_error.error.body": "Неможливо показати запитану сторінку. Це може бути спричинено помилкою у нашому коді, або через проблему сумісності з браузером.",
   "bundle_column_error.error.title": "О, ні!",
@@ -467,6 +469,7 @@
   "mute_modal.you_wont_see_mentions": "Ви не бачитимете дописів, де їх згадано.",
   "mute_modal.you_wont_see_posts": "Вони все ще можуть бачити ваші дописи, але ви не бачитимете їхніх.",
   "navigation_bar.about": "Про застосунок",
+  "navigation_bar.administration": "Адміністрування",
   "navigation_bar.advanced_interface": "Відкрити в розширеному вебінтерфейсі",
   "navigation_bar.blocks": "Заблоковані користувачі",
   "navigation_bar.bookmarks": "Закладки",
@@ -483,6 +486,7 @@
   "navigation_bar.follows_and_followers": "Підписки та підписники",
   "navigation_bar.lists": "Списки",
   "navigation_bar.logout": "Вийти",
+  "navigation_bar.moderation": "Модерування",
   "navigation_bar.mutes": "Приховані користувачі",
   "navigation_bar.opened_in_classic_interface": "Дописи, облікові записи та інші специфічні сторінки усталено відкриваються в класичному вебінтерфейсі.",
   "navigation_bar.personal": "Особисте",
diff --git a/app/javascript/mastodon/locales/vi.json b/app/javascript/mastodon/locales/vi.json
index 962984f1003073..48f56a089019d8 100644
--- a/app/javascript/mastodon/locales/vi.json
+++ b/app/javascript/mastodon/locales/vi.json
@@ -97,6 +97,8 @@
   "block_modal.title": "Chặn người này?",
   "block_modal.you_wont_see_mentions": "Bạn sẽ không nhìn thấy tút có nhắc đến họ.",
   "boost_modal.combo": "Nhấn {combo} để bỏ qua bước này",
+  "boost_modal.reblog": "Đăng lại?",
+  "boost_modal.undo_reblog": "Hủy đăng lại?",
   "bundle_column_error.copy_stacktrace": "Sao chép báo lỗi",
   "bundle_column_error.error.body": "Không thể hiện trang này. Đây có thể là một lỗi trong mã lập trình của chúng tôi, hoặc là vấn đề tương thích của trình duyệt.",
   "bundle_column_error.error.title": "Ôi không!",
@@ -458,6 +460,7 @@
   "mute_modal.you_wont_see_mentions": "Bạn sẽ không nhìn thấy tút có nhắc đến họ.",
   "mute_modal.you_wont_see_posts": "Bạn sẽ không nhìn thấy tút của họ.",
   "navigation_bar.about": "Giới thiệu",
+  "navigation_bar.administration": "Quản trị",
   "navigation_bar.advanced_interface": "Dùng bố cục nhiều cột",
   "navigation_bar.blocks": "Người đã chặn",
   "navigation_bar.bookmarks": "Đã lưu",
@@ -474,6 +477,7 @@
   "navigation_bar.follows_and_followers": "Quan hệ",
   "navigation_bar.lists": "Danh sách",
   "navigation_bar.logout": "Đăng xuất",
+  "navigation_bar.moderation": "Kiểm duyệt",
   "navigation_bar.mutes": "Người đã ẩn",
   "navigation_bar.opened_in_classic_interface": "Tút, tài khoản và các trang cụ thể khác được mở theo mặc định trong giao diện web cổ điển.",
   "navigation_bar.personal": "Cá nhân",
diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json
index aab806ec8e984f..fded16b195f3df 100644
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@@ -97,6 +97,8 @@
   "block_modal.title": "屏蔽该用户？",
   "block_modal.you_wont_see_mentions": "你将无法看到提及他们的嘟文。",
   "boost_modal.combo": "下次按住 {combo} 即可跳过此提示",
+  "boost_modal.reblog": "是否转嘟？",
+  "boost_modal.undo_reblog": "是否取消转嘟？",
   "bundle_column_error.copy_stacktrace": "复制错误报告",
   "bundle_column_error.error.body": "请求的页面无法渲染，可能是代码出现错误或浏览器存在兼容性问题。",
   "bundle_column_error.error.title": "糟糕！",
@@ -467,6 +469,7 @@
   "mute_modal.you_wont_see_mentions": "你看不到提及他们的嘟文。",
   "mute_modal.you_wont_see_posts": "他们可以看到你的嘟文，但是你看不到他们的。",
   "navigation_bar.about": "关于",
+  "navigation_bar.administration": "管理",
   "navigation_bar.advanced_interface": "在高级网页界面中打开",
   "navigation_bar.blocks": "已屏蔽的用户",
   "navigation_bar.bookmarks": "书签",
@@ -483,6 +486,7 @@
   "navigation_bar.follows_and_followers": "关注和粉丝",
   "navigation_bar.lists": "列表",
   "navigation_bar.logout": "退出登录",
+  "navigation_bar.moderation": "运营",
   "navigation_bar.mutes": "已隐藏的用户",
   "navigation_bar.opened_in_classic_interface": "嘟文、账户和其他特定页面默认在经典网页界面中打开。",
   "navigation_bar.personal": "个人",
diff --git a/config/locales/doorkeeper.fr.yml b/config/locales/doorkeeper.fr.yml
index a5d70030a59c24..8855ca542619d8 100644
--- a/config/locales/doorkeeper.fr.yml
+++ b/config/locales/doorkeeper.fr.yml
@@ -25,7 +25,7 @@ fr:
         edit: Modifier
         submit: Envoyer
       confirmations:
-        destroy: Voulez-vous vraiment faire ça ?
+        destroy: En êtes-vous sûr ?
       edit:
         title: Modifier l’application
       form:
@@ -69,7 +69,7 @@ fr:
       buttons:
         revoke: Révoquer
       confirmations:
-        revoke: Voulez-vous vraiment faire ça ?
+        revoke: En êtes-vous sûr ?
       index:
         authorized_at: Autorisée le %{date}
         description_html: Ces applications peuvent accéder à votre compte via l'API. Si vous voyez ici des applications que vous ne reconnaissez pas ou qui ne fonctionnent pas normalement, vous pouvez en révoquer les accès.
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 61dd5d9b38f685..ca747953f66bcf 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -865,6 +865,8 @@ en-GB:
       links:
         allow: Allow link
         allow_provider: Allow publisher
+        confirm_disallow: Are you sure you want to disallow selected links?
+        confirm_disallow_provider: Are you sure you want to disallow selected providers?
         description_html: These are links that are currently being shared a lot by accounts that your server sees posts from. It can help your users find out what's going on in the world. No links are displayed publicly until you approve the publisher. You can also allow or reject individual links.
         disallow: Disallow link
         disallow_provider: Disallow publisher
@@ -888,6 +890,10 @@ en-GB:
       statuses:
         allow: Allow post
         allow_account: Allow author
+        confirm_allow: Are you sure you want to allow selected statuses?
+        confirm_allow_account: Are you sure you want to allow selected accounts?
+        confirm_disallow: Are you sure you want to disallow selected statuses?
+        confirm_disallow_account: Are you sure you want to disallow selected accounts?
         description_html: These are posts that your server knows about that are currently being shared and favourited a lot at the moment. It can help your new and returning users to find more people to follow. No posts are displayed publicly until you approve the author, and the author allows their account to be suggested to others. You can also allow or reject individual posts.
         disallow: Disallow post
         disallow_account: Disallow author
@@ -920,6 +926,7 @@ en-GB:
         used_by_over_week:
           one: Used by one person over the last week
           other: Used by %{count} people over the last week
+      title: Recommendations & Trends
       trending: Trending
     warning_presets:
       add_new: Add new
diff --git a/config/locales/fr-CA.yml b/config/locales/fr-CA.yml
index 4542b248587a4c..e27750e1ad6714 100644
--- a/config/locales/fr-CA.yml
+++ b/config/locales/fr-CA.yml
@@ -722,6 +722,7 @@ fr-CA:
         desc_html: Ceci se base sur des scripts externes de hCaptcha, ce qui peut engendrer des soucis de sécurité et de confidentialité. De plus, <strong>cela peut rendre l'inscription beaucoup moins accessible pour certaines personnes (surtout les personnes handicapées)</strong>. Pour ces raisons, veuillez envisager des mesures alternatives telles que l'inscription par acceptation ou par invitation.
         title: Obliger les nouveaux utilisateurs à résoudre un CAPTCHA pour vérifier leur compte
       content_retention:
+        danger_zone: Zone de danger
         preamble: Contrôle comment le contenu créé par les utilisateurs est enregistré et stocké dans Mastodon.
         title: Rétention du contenu
       default_noindex:
@@ -761,6 +762,7 @@ fr-CA:
       destroyed_msg: Téléversement sur le site supprimé avec succès !
     software_updates:
       critical_update: Critique — veuillez mettre à jour au plus vite
+      description: Il est recommandé de maintenir votre installation de Mastodon à jour afin de bénéficier des derniers correctifs et fonctionnalités. Par ailleurs, il est parfois critique de mettre à jour Mastodon en temps voulu de manière à éviter les incidents relatifs à la sécurité. Pour ces raisons, Mastodon examine la disponibilté des mises à jour toutes les 30 minutes, et vous en avisera en fonction de vos préférences de notification par messagerie électronique.
       documentation_link: En savoir plus
       release_notes: Notes de mises à jour
       title: Mises à jour disponibles
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 0f2d24772037ae..006696fc8d2fd8 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -574,7 +574,7 @@ fr:
       already_suspended_badges:
         local: Déjà suspendu sur ce serveur
         remote: Déjà suspendu sur le serveur distant
-      are_you_sure: Voulez-vous vraiment faire ça ?
+      are_you_sure: En êtes-vous sûr ?
       assign_to_self: Me l’assigner
       assigned: Modérateur assigné
       by_target_domain: Domaine du compte signalé
@@ -722,6 +722,7 @@ fr:
         desc_html: Ceci se base sur des scripts externes venant de hCaptcha, ce qui peut engendrer des soucis de sécurité et de confidentialité. De plus, <strong>cela peut rendre l'inscription beaucoup moins accessible pour certaines personnes (comme les personnes handicapées)</strong>. Pour ces raisons, veuillez envisager des mesures alternatives telles que l'inscription sur acceptation ou invitation.
         title: Exiger que les nouveaux utilisateurs résolvent un CAPTCHA pour confirmer leur compte
       content_retention:
+        danger_zone: Zone de danger
         preamble: Contrôle comment le contenu créé par les utilisateurs est enregistré et stocké dans Mastodon.
         title: Rétention du contenu
       default_noindex:
@@ -761,6 +762,7 @@ fr:
       destroyed_msg: Téléversement sur le site supprimé avec succès !
     software_updates:
       critical_update: Critique — veuillez mettre à jour au plus vite
+      description: Il est recommandé de maintenir votre installation de Mastodon à jour afin de bénéficier des derniers correctifs et fonctionnalités. Par ailleurs, il est parfois critique de mettre à jour Mastodon en temps voulu de manière à éviter les incidents relatifs à la sécurité. Pour ces raisons, Mastodon examine la disponibilté des mises à jour toutes les 30 minutes, et vous en avisera en fonction de vos préférences de notification par messagerie électronique.
       documentation_link: En savoir plus
       release_notes: Notes de mises à jour
       title: Mises à jour disponibles
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 0c125acd07b927..cdd71112e9c2c2 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -505,8 +505,8 @@ nl:
       dashboard:
         instance_accounts_dimension: Meest door ons gevolgde accounts
         instance_accounts_measure: opgeslagen accounts
-        instance_followers_measure: daar ons daar gevolgd
-        instance_follows_measure: door hun hier gevolgd
+        instance_followers_measure: onze volgens daar
+        instance_follows_measure: hun volgers hier
         instance_languages_dimension: Meest actieve talen
         instance_media_attachments_measure: opgeslagen mediabestanden
         instance_reports_measure: rapportages over hun
@@ -898,7 +898,7 @@ nl:
       name: Naam
       newest: Nieuwste
       oldest: Oudste
-      open: Openbaar bekijken
+      open: In het openbaar bekijken
       reset: Opnieuw
       review: Status beoordelen
       search: Zoeken
diff --git a/config/locales/simple_form.fr-CA.yml b/config/locales/simple_form.fr-CA.yml
index 4e67db2db6d688..e8aafa4b1cf2b0 100644
--- a/config/locales/simple_form.fr-CA.yml
+++ b/config/locales/simple_form.fr-CA.yml
@@ -82,6 +82,7 @@ fr-CA:
         closed_registrations_message: Affiché lorsque les inscriptions sont fermées
         custom_css: Vous pouvez appliquer des styles personnalisés sur la version Web de Mastodon.
         mascot: Remplace l'illustration dans l'interface Web avancée.
+        media_cache_retention_period: Les fichiers médias des messages publiés par des utilisateurs distants sont mis en cache sur votre serveur. Lorsque cette valeur est positive, les médias sont supprimés au terme du nombre de jours spécifié. Si les données des médias sont demandées après leur suppression, elles seront téléchargées à nouveau, dans la mesure où le contenu source est toujours disponible. En raison des restrictions concernant la fréquence à laquelle les cartes de prévisualisation des liens interrogent des sites tiers, il est recommandé de fixer cette valeur à au moins 14 jours, faute de quoi les cartes de prévisualisation des liens ne seront pas mises à jour à la demande avant cette échéance.
         peers_api_enabled: Une liste de noms de domaine que ce serveur a rencontrés dans le fédiverse. Aucune donnée indiquant si vous vous fédérez ou non avec un serveur particulier n'est incluse ici, seulement l'information que votre serveur connaît un autre serveur. Cette option est utilisée par les services qui collectent des statistiques sur la fédération en général.
         profile_directory: L'annuaire des profils répertorie tous les utilisateurs qui ont opté pour être découverts.
         require_invite_text: Lorsque les inscriptions nécessitent une approbation manuelle, rendre le texte de l’invitation "Pourquoi voulez-vous vous inscrire ?" obligatoire plutôt que facultatif
diff --git a/config/locales/simple_form.fr.yml b/config/locales/simple_form.fr.yml
index a9df5375f385c6..315e22c5fb1761 100644
--- a/config/locales/simple_form.fr.yml
+++ b/config/locales/simple_form.fr.yml
@@ -82,6 +82,7 @@ fr:
         closed_registrations_message: Affiché lorsque les inscriptions sont fermées
         custom_css: Vous pouvez appliquer des styles personnalisés sur la version Web de Mastodon.
         mascot: Remplace l'illustration dans l'interface Web avancée.
+        media_cache_retention_period: Les fichiers médias des messages publiés par des utilisateurs distants sont mis en cache sur votre serveur. Lorsque cette valeur est positive, les médias sont supprimés au terme du nombre de jours spécifié. Si les données des médias sont demandées après leur suppression, elles seront téléchargées à nouveau, dans la mesure où le contenu source est toujours disponible. En raison des restrictions concernant la fréquence à laquelle les cartes de prévisualisation des liens interrogent des sites tiers, il est recommandé de fixer cette valeur à au moins 14 jours, faute de quoi les cartes de prévisualisation des liens ne seront pas mises à jour à la demande avant cette échéance.
         peers_api_enabled: Une liste de noms de domaine que ce serveur a rencontrés dans le fédiverse. Aucune donnée indiquant si vous vous fédérez ou non avec un serveur particulier n'est incluse ici, seulement l'information que votre serveur connaît un autre serveur. Cette option est utilisée par les services qui collectent des statistiques sur la fédération en général.
         profile_directory: L'annuaire des profils répertorie tous les comptes qui choisi d'être découvrables.
         require_invite_text: Lorsque les inscriptions nécessitent une approbation manuelle, rendre le texte de l’invitation "Pourquoi voulez-vous vous inscrire ?" obligatoire plutôt que facultatif

From 3c412578c916f4bdebb2abd3ca793f8fad00f921 Mon Sep 17 00:00:00 2001
From: HolgerHuo <50446405+HolgerHuo@users.noreply.github.com>
Date: Wed, 28 Aug 2024 17:28:48 +0800
Subject: [PATCH 1995/2191] update: max_media_attachments follow server
 advertised value (#31616)

---
 app/javascript/mastodon/features/ui/index.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/features/ui/index.jsx b/app/javascript/mastodon/features/ui/index.jsx
index f36e0cf501fdbf..657c9e9e583df0 100644
--- a/app/javascript/mastodon/features/ui/index.jsx
+++ b/app/javascript/mastodon/features/ui/index.jsx
@@ -85,7 +85,7 @@ const mapStateToProps = state => ({
   isComposing: state.getIn(['compose', 'is_composing']),
   hasComposingText: state.getIn(['compose', 'text']).trim().length !== 0,
   hasMediaAttachments: state.getIn(['compose', 'media_attachments']).size > 0,
-  canUploadMore: !state.getIn(['compose', 'media_attachments']).some(x => ['audio', 'video'].includes(x.get('type'))) && state.getIn(['compose', 'media_attachments']).size < 4,
+  canUploadMore: !state.getIn(['compose', 'media_attachments']).some(x => ['audio', 'video'].includes(x.get('type'))) && state.getIn(['compose', 'media_attachments']).size < state.getIn(['server', 'server', 'configuration', 'statuses', 'max_media_attachments']),
   firstLaunch: state.getIn(['settings', 'introductionVersion'], 0) < INTRODUCTION_VERSION,
   username: state.getIn(['accounts', me, 'username']),
 });

From f6fb9b75dbc10cee8beee4bcb84dd08e821baf1b Mon Sep 17 00:00:00 2001
From: Emelia Smith <ThisIsMissEm@users.noreply.github.com>
Date: Wed, 28 Aug 2024 12:40:37 +0200
Subject: [PATCH 1996/2191] Streaming: Fix BIND IPv6 handling (#31624)

---
 streaming/index.js | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/streaming/index.js b/streaming/index.js
index d94649d6e24284..5ef1f6f319f3e6 100644
--- a/streaming/index.js
+++ b/streaming/index.js
@@ -1351,15 +1351,23 @@ const startServer = async () => {
  * @param {function(string): void} [onSuccess]
  */
 const attachServerWithConfig = (server, onSuccess) => {
-  if (process.env.SOCKET || process.env.PORT && isNaN(+process.env.PORT)) {
-    server.listen(process.env.SOCKET || process.env.PORT, () => {
+  if (process.env.SOCKET) {
+    server.listen(process.env.SOCKET, () => {
       if (onSuccess) {
         fs.chmodSync(server.address(), 0o666);
         onSuccess(server.address());
       }
     });
   } else {
-    server.listen(+(process.env.PORT || 4000), process.env.BIND || '127.0.0.1', () => {
+    const port = +(process.env.PORT || 4000);
+    let bind = process.env.BIND ?? '127.0.0.1';
+    // Web uses the URI syntax for BIND, which means IPv6 addresses may
+    // be wrapped in square brackets:
+    if (bind.startsWith('[') && bind.endsWith(']')) {
+      bind = bind.slice(1, -1);
+    }
+
+    server.listen(port, bind, () => {
       if (onSuccess) {
         onSuccess(`${server.address().address}:${server.address().port}`);
       }

From dc7412c15f3e447a06cd0046c0a35c721878d49d Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 29 Aug 2024 10:18:41 +0200
Subject: [PATCH 1997/2191] Update opentelemetry-ruby (non-major) (#31646)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile      |  4 ++--
 Gemfile.lock | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Gemfile b/Gemfile
index 9a6db1ec0986d2..3fcde202ad5262 100644
--- a/Gemfile
+++ b/Gemfile
@@ -99,10 +99,10 @@ gem 'json-ld'
 gem 'json-ld-preloaded', '~> 3.2'
 gem 'rdf-normalize', '~> 0.5'
 
-gem 'opentelemetry-api', '~> 1.3.0'
+gem 'opentelemetry-api', '~> 1.4.0'
 
 group :opentelemetry do
-  gem 'opentelemetry-exporter-otlp', '~> 0.28.0', require: false
+  gem 'opentelemetry-exporter-otlp', '~> 0.29.0', require: false
   gem 'opentelemetry-instrumentation-active_job', '~> 0.7.1', require: false
   gem 'opentelemetry-instrumentation-active_model_serializers', '~> 0.20.1', require: false
   gem 'opentelemetry-instrumentation-concurrent_ruby', '~> 0.21.2', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index d14fc0168f2d04..3ae4de2329fb77 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -290,8 +290,8 @@ GEM
     globalid (1.2.1)
       activesupport (>= 6.1)
     google-protobuf (3.25.4)
-    googleapis-common-protos-types (1.14.0)
-      google-protobuf (~> 3.18)
+    googleapis-common-protos-types (1.15.0)
+      google-protobuf (>= 3.18, < 5.a)
     haml (6.3.0)
       temple (>= 0.8.2)
       thor
@@ -489,10 +489,10 @@ GEM
     openssl (3.2.0)
     openssl-signature_algorithm (1.3.0)
       openssl (> 2.0)
-    opentelemetry-api (1.3.0)
-    opentelemetry-common (0.20.1)
+    opentelemetry-api (1.4.0)
+    opentelemetry-common (0.21.0)
       opentelemetry-api (~> 1.0)
-    opentelemetry-exporter-otlp (0.28.1)
+    opentelemetry-exporter-otlp (0.29.0)
       google-protobuf (>= 3.18)
       googleapis-common-protos-types (~> 1.3)
       opentelemetry-api (~> 1.1)
@@ -980,8 +980,8 @@ DEPENDENCIES
   omniauth-rails_csrf_protection (~> 1.0)
   omniauth-saml (~> 2.0)
   omniauth_openid_connect (~> 0.6.1)
-  opentelemetry-api (~> 1.3.0)
-  opentelemetry-exporter-otlp (~> 0.28.0)
+  opentelemetry-api (~> 1.4.0)
+  opentelemetry-exporter-otlp (~> 0.29.0)
   opentelemetry-instrumentation-active_job (~> 0.7.1)
   opentelemetry-instrumentation-active_model_serializers (~> 0.20.1)
   opentelemetry-instrumentation-concurrent_ruby (~> 0.21.2)

From 099657be9a4f261e6502212689250b0af47b64da Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 29 Aug 2024 10:19:38 +0200
Subject: [PATCH 1998/2191] Update dependency flatware-rspec to v2.3.3 (#31636)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 3ae4de2329fb77..cb9f92d3354a72 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -264,10 +264,11 @@ GEM
     ffi-compiler (1.3.2)
       ffi (>= 1.15.5)
       rake
-    flatware (2.3.2)
+    flatware (2.3.3)
+      drb
       thor (< 2.0)
-    flatware-rspec (2.3.2)
-      flatware (= 2.3.2)
+    flatware-rspec (2.3.3)
+      flatware (= 2.3.3)
       rspec (>= 3.6)
     fog-core (2.5.0)
       builder
@@ -710,7 +711,7 @@ GEM
       rspec-mocks (~> 3.13.0)
     rspec-core (3.13.0)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.1)
+    rspec-expectations (3.13.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-github (2.4.0)

From 8bd8238d4156a338e9e3790738fda80a29103789 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 29 Aug 2024 08:20:02 +0000
Subject: [PATCH 1999/2191] Update dependency selenium-webdriver to v4.24.0
 (#31633)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index cb9f92d3354a72..78fd21b4e8dea1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -781,7 +781,7 @@ GEM
     scenic (1.8.0)
       activerecord (>= 4.0.0)
       railties (>= 4.0.0)
-    selenium-webdriver (4.23.0)
+    selenium-webdriver (4.24.0)
       base64 (~> 0.2)
       logger (~> 1.4)
       rexml (~> 3.2, >= 3.2.5)

From 4f4be654529429ff1886ce5b11ef1d1189d80d2d Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 29 Aug 2024 10:30:09 +0200
Subject: [PATCH 2000/2191] Update dependency @rails/ujs to v7.1.400 (#31628)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 package.json |  2 +-
 yarn.lock    | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 7f21b11404789b..a6f86dfd4c8b08 100644
--- a/package.json
+++ b/package.json
@@ -45,7 +45,7 @@
     "@formatjs/intl-pluralrules": "^5.2.2",
     "@gamestdio/websocket": "^0.3.2",
     "@github/webauthn-json": "^2.1.1",
-    "@rails/ujs": "7.1.3",
+    "@rails/ujs": "7.1.400",
     "@reduxjs/toolkit": "^2.0.1",
     "@svgr/webpack": "^5.5.0",
     "arrow-key-navigation": "^1.2.0",
diff --git a/yarn.lock b/yarn.lock
index c3a7c6b1a57bb8..b5c44fd30699c0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2757,7 +2757,7 @@ __metadata:
     "@formatjs/intl-pluralrules": "npm:^5.2.2"
     "@gamestdio/websocket": "npm:^0.3.2"
     "@github/webauthn-json": "npm:^2.1.1"
-    "@rails/ujs": "npm:7.1.3"
+    "@rails/ujs": "npm:7.1.400"
     "@reduxjs/toolkit": "npm:^2.0.1"
     "@svgr/webpack": "npm:^5.5.0"
     "@testing-library/dom": "npm:^10.2.0"
@@ -3049,10 +3049,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rails/ujs@npm:7.1.3":
-  version: 7.1.3
-  resolution: "@rails/ujs@npm:7.1.3"
-  checksum: 10c0/68112d9add9dbc59b40c2ec1bc095a67445c57d20d0ab7d817ce3de0cd90374e2690af8ad54ce6ecc2d1c748b34c0c44d0fbd2f515ce2c443d7c5d23d00b9ce5
+"@rails/ujs@npm:7.1.400":
+  version: 7.1.400
+  resolution: "@rails/ujs@npm:7.1.400"
+  checksum: 10c0/181329e731b925788a530dc5bc44eb4a07ae780e20b0309fd9140ebeeca30d9432ed50be0f25ae60f10beb3aa8883f6d662e4b9c6f6cd19a32c1f42ab2505c47
   languageName: node
   linkType: hard
 

From 5d725b2c12516f0dccc79cee47fd1f616082a21b Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 29 Aug 2024 10:30:39 +0200
Subject: [PATCH 2001/2191] New Crowdin Translations (automated) (#31647)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/cs.json    |  3 ++
 app/javascript/mastodon/locales/eu.json    | 45 ++++++++++++++++++++++
 app/javascript/mastodon/locales/fr-CA.json | 11 +++++-
 app/javascript/mastodon/locales/fr.json    | 11 +++++-
 app/javascript/mastodon/locales/pl.json    |  1 +
 config/locales/doorkeeper.fr-CA.yml        |  1 +
 config/locales/doorkeeper.fr.yml           |  1 +
 config/locales/fr-CA.yml                   | 29 ++++++++++++++
 config/locales/fr.yml                      | 29 ++++++++++++++
 9 files changed, 129 insertions(+), 2 deletions(-)

diff --git a/app/javascript/mastodon/locales/cs.json b/app/javascript/mastodon/locales/cs.json
index ebfaef36751df7..116a9c01482d40 100644
--- a/app/javascript/mastodon/locales/cs.json
+++ b/app/javascript/mastodon/locales/cs.json
@@ -97,6 +97,8 @@
   "block_modal.title": "Zablokovat uživatele?",
   "block_modal.you_wont_see_mentions": "Neuvidíte příspěvky, které ho zmiňují.",
   "boost_modal.combo": "Příště můžete pro přeskočení stisknout {combo}",
+  "boost_modal.reblog": "Boostnout příspěvek?",
+  "boost_modal.undo_reblog": "Zrušit boostování příspěvku?",
   "bundle_column_error.copy_stacktrace": "Zkopírovat zprávu o chybě",
   "bundle_column_error.error.body": "Požadovanou stránku nelze vykreslit. Může to být způsobeno chybou v našem kódu nebo problémem s kompatibilitou prohlížeče.",
   "bundle_column_error.error.title": "Ale ne!",
@@ -192,6 +194,7 @@
   "confirmations.unfollow.confirm": "Přestat sledovat",
   "confirmations.unfollow.message": "Opravdu chcete {name} přestat sledovat?",
   "confirmations.unfollow.title": "Přestat sledovat uživatele?",
+  "content_warning.hide": "Skrýt příspěvek",
   "conversation.delete": "Smazat konverzaci",
   "conversation.mark_as_read": "Označit jako přečtené",
   "conversation.open": "Zobrazit konverzaci",
diff --git a/app/javascript/mastodon/locales/eu.json b/app/javascript/mastodon/locales/eu.json
index a8e2e668c3f789..f169e2905b0b77 100644
--- a/app/javascript/mastodon/locales/eu.json
+++ b/app/javascript/mastodon/locales/eu.json
@@ -97,6 +97,8 @@
   "block_modal.title": "Erabiltzailea blokeatu nahi duzu?",
   "block_modal.you_wont_see_mentions": "Ez duzu ikusiko bera aipatzen duen argitalpenik.",
   "boost_modal.combo": "{combo} sakatu dezakezu hurrengoan hau saltatzeko",
+  "boost_modal.reblog": "Bultzatu bidalketa?",
+  "boost_modal.undo_reblog": "Bidalketari bultzada kendu?",
   "bundle_column_error.copy_stacktrace": "Kopiatu errore-txostena",
   "bundle_column_error.error.body": "Eskatutako orria ezin izan da bistaratu. Kodeko errore bategatik izan daiteke edo nabigatzailearen bateragarritasun arazo bategatik.",
   "bundle_column_error.error.title": "O ez!",
@@ -192,6 +194,8 @@
   "confirmations.unfollow.confirm": "Utzi jarraitzeari",
   "confirmations.unfollow.message": "Ziur {name} jarraitzeari utzi nahi diozula?",
   "confirmations.unfollow.title": "Erabiltzailea jarraitzeari utzi?",
+  "content_warning.hide": "Tuta ezkutatu",
+  "content_warning.show": "Erakutsi hala ere",
   "conversation.delete": "Ezabatu elkarrizketa",
   "conversation.mark_as_read": "Markatu irakurrita bezala",
   "conversation.open": "Ikusi elkarrizketa",
@@ -299,6 +303,8 @@
   "filter_modal.select_filter.subtitle": "Hautatu lehendik dagoen kategoria bat edo sortu berria",
   "filter_modal.select_filter.title": "Iragazi bidalketa hau",
   "filter_modal.title.status": "Iragazi bidalketa bat",
+  "filter_warning.matches_filter": "“{title}” iragazkiarekin bat dator",
+  "filtered_notifications_banner.pending_requests": "Ezagutu dezakezun {count, plural, =0 {inoren} one {pertsona baten} other {# pertsonen}}",
   "filtered_notifications_banner.title": "Iragazitako jakinarazpenak",
   "firehose.all": "Guztiak",
   "firehose.local": "Zerbitzari hau",
@@ -347,6 +353,14 @@
   "hashtag.follow": "Jarraitu traolari",
   "hashtag.unfollow": "Utzi traola jarraitzeari",
   "hashtags.and_other": "…eta {count, plural, one {}other {# gehiago}}",
+  "hints.profiles.followers_may_be_missing": "Baliteke profil honen jarraitzaile guztiak ez agertzea.",
+  "hints.profiles.follows_may_be_missing": "Baliteke profil honek jarraitzen dituen profil guztiak ez erakustea.",
+  "hints.profiles.posts_may_be_missing": "Baliteke profil honen tut guztiak ez erakustea.",
+  "hints.profiles.see_more_followers": "Ikusi jarraitzaile gehiago {domain}-(e)n",
+  "hints.profiles.see_more_follows": "Ikusi jarraitzaile gehiago {domain}-(e)n",
+  "hints.profiles.see_more_posts": "Ikusi bidalketa gehiago {domain}-(e)n",
+  "hints.threads.replies_may_be_missing": "Baliteke beste zerbitzari batzuen erantzun batzuk ez erakustea.",
+  "hints.threads.see_more": "Ikusi erantzun gehiago {domain}-(e)n",
   "home.column_settings.show_reblogs": "Erakutsi bultzadak",
   "home.column_settings.show_replies": "Erakutsi erantzunak",
   "home.hide_announcements": "Ezkutatu iragarpenak",
@@ -354,12 +368,17 @@
   "home.pending_critical_update.link": "Ikusi eguneraketak",
   "home.pending_critical_update.title": "Segurtasun eguneraketa kritikoa eskuragarri!",
   "home.show_announcements": "Erakutsi iragarpenak",
+  "ignore_notifications_modal.disclaimer": "Mastodonek ezin die jakinarazi erabiltzaileei beraien jakinarazpenei ezikusiarena egingo diezula. Jakinarazpenei ezikusiarena egiteak ez du eragotziko mezuak bidaltzen jarraitzea.",
   "ignore_notifications_modal.filter_instead": "Iragazi ez ikusiarena egin beharrean",
+  "ignore_notifications_modal.filter_to_act_users": "Oraindik ere erabiltzaileak onartu, baztertu edo salatu ahal izango dituzu",
+  "ignore_notifications_modal.filter_to_avoid_confusion": "Iragazteak nahaste potentzialak saihesten laguntzen du",
+  "ignore_notifications_modal.filter_to_review_separately": "Banaka berrikus ditzakezu iragazitako jakinarazpenak",
   "ignore_notifications_modal.ignore": "Ezikusi jakinarazpenak",
   "ignore_notifications_modal.limited_accounts_title": "Moderatutako kontuen jakinarazpenei ez ikusiarena egin?",
   "ignore_notifications_modal.new_accounts_title": "Kontu berrien jakinarazpenei ez ikusiarena egin?",
   "ignore_notifications_modal.not_followers_title": "Jarraitzen ez zaituzten pertsonen jakinarazpenei ez ikusiarena egin?",
   "ignore_notifications_modal.not_following_title": "Jarraitzen ez dituzun pertsonen jakinarazpenei ez ikusiarena egin?",
+  "ignore_notifications_modal.private_mentions_title": "Eskatu gabeko aipamen pribatuen jakinarazpenei ez ikusiarena egin?",
   "interaction_modal.description.favourite": "Mastodon kontu batekin bidalketa hau gogoko egin dezakezu, egileari eskertzeko eta gerorako gordetzeko.",
   "interaction_modal.description.follow": "Mastodon kontu batekin {name} jarraitu dezakezu bere bidalketak zure hasierako denbora lerroan jasotzeko.",
   "interaction_modal.description.reblog": "Mastodon kontu batekin bidalketa hau bultzatu dezakezu, zure jarraitzaileekin partekatzeko.",
@@ -420,6 +439,8 @@
   "limited_account_hint.action": "Erakutsi profila hala ere",
   "limited_account_hint.title": "Profil hau ezkutatu egin dute {domain} zerbitzariko moderatzaileek.",
   "link_preview.author": "Egilea: {name}",
+  "link_preview.more_from_author": "{name} erabiltzaileaz gehiago jakin",
+  "link_preview.shares": "{count, plural, one {{counter} bidalketa} other {{counter} bidalketa}}",
   "lists.account.add": "Gehitu zerrendara",
   "lists.account.remove": "Kendu zerrendatik",
   "lists.delete": "Ezabatu zerrenda",
@@ -448,6 +469,7 @@
   "mute_modal.you_wont_see_mentions": "Ez duzu ikusiko bera aipatzen duen argitalpenik.",
   "mute_modal.you_wont_see_posts": "Zure argitalpenak ikus ditzake, baina ez dituzu bereak ikusiko.",
   "navigation_bar.about": "Honi buruz",
+  "navigation_bar.administration": "Administrazioa",
   "navigation_bar.advanced_interface": "Ireki web interfaze aurreratuan",
   "navigation_bar.blocks": "Blokeatutako erabiltzaileak",
   "navigation_bar.bookmarks": "Laster-markak",
@@ -464,6 +486,7 @@
   "navigation_bar.follows_and_followers": "Jarraitutakoak eta jarraitzaileak",
   "navigation_bar.lists": "Zerrendak",
   "navigation_bar.logout": "Amaitu saioa",
+  "navigation_bar.moderation": "Moderazioa",
   "navigation_bar.mutes": "Mutututako erabiltzaileak",
   "navigation_bar.opened_in_classic_interface": "Argitalpenak, kontuak eta beste orri jakin batzuk lehenespenez irekitzen dira web-interfaze klasikoan.",
   "navigation_bar.personal": "Pertsonala",
@@ -474,10 +497,18 @@
   "navigation_bar.security": "Segurtasuna",
   "not_signed_in_indicator.not_signed_in": "Baliabide honetara sarbidea izateko saioa hasi behar duzu.",
   "notification.admin.report": "{name} erabiltzaileak {target} salatu du",
+  "notification.admin.report_account": "{name}-(e)k {target}-ren {count, plural, one {bidalketa bat} other {# bidalketa}} salatu zituen {category} delakoagatik",
+  "notification.admin.report_account_other": "{name}-(e)k {target}-ren {count, plural, one {bidalketa bat salatu zuen} other {# bidalketa salatu zituen}}",
+  "notification.admin.report_statuses": "{name}-(e)k {target} salatu zuen {category} delakoagatik",
+  "notification.admin.report_statuses_other": "{name} erabiltzaileak {target} salatu du",
   "notification.admin.sign_up": "{name} erabiltzailea erregistratu da",
+  "notification.admin.sign_up.name_and_others": "{name} eta {count, plural, one {erabiltzaile # gehiago} other {# erabiltzaile gehiago}} erregistratu dira",
   "notification.favourite": "{name}(e)k zure bidalketa gogoko du",
+  "notification.favourite.name_and_others_with_link": "{name} eta <a>{count, plural, one {erabiltzaile # gehiagok} other {# erabiltzaile gehiagok}}</a> zure bidalketa gogoko dute",
   "notification.follow": "{name}(e)k jarraitzen dizu",
+  "notification.follow.name_and_others": "{name} eta {count, plural, one {erabiltzaile # gehiagok} other {# erabiltzaile gehiagok}} jarraitu dizute",
   "notification.follow_request": "{name}(e)k zu jarraitzeko eskaera egin du",
+  "notification.follow_request.name_and_others": "{name} eta {count, plural, one {erabiltzaile # gehiagok} other {# erabiltzaile gehiagok}} zu jarraitzeko eskaera egin dute",
   "notification.label.mention": "Aipamena",
   "notification.label.private_mention": "Aipamen pribatua",
   "notification.label.private_reply": "Erantzun pribatua",
@@ -495,14 +526,26 @@
   "notification.own_poll": "Zure inkesta amaitu da",
   "notification.poll": "Zuk erantzun duzun inkesta bat bukatu da",
   "notification.reblog": "{name}(e)k bultzada eman dio zure bidalketari",
+  "notification.reblog.name_and_others_with_link": "{name} eta <a>{count, plural, one {erabiltzaile # gehiagok} other {# erabiltzaile gehiagok}}</a> bultzada eman diote zure bidalketari",
   "notification.relationships_severance_event": "{name} erabiltzailearekin galdutako konexioak",
   "notification.relationships_severance_event.account_suspension": "{from} zerbitzariko administratzaile batek {target} bertan behera utzi du, hau da, ezin izango dituzu jaso hango eguneratzerik edo hangoekin elkarreragin.",
   "notification.relationships_severance_event.learn_more": "Informazio gehiago",
   "notification.status": "{name} erabiltzaileak bidalketa egin berri du",
   "notification.update": "{name} erabiltzaileak bidalketa bat editatu du",
   "notification_requests.accept": "Onartu",
+  "notification_requests.accept_multiple": "{count, plural, one {Onartu eskaera…} other {Onartu # eskaerak…}}",
+  "notification_requests.confirm_accept_multiple.button": "{count, plural, one {Onartu eskaera} other {Onartu eskaerak}}",
+  "notification_requests.confirm_accept_multiple.title": "Onartu jakinarazpen-eskaerak?",
+  "notification_requests.confirm_dismiss_multiple.button": "{count, plural, one {Baztertu eskaera} other {Baztertu eskaerak}}",
+  "notification_requests.confirm_dismiss_multiple.title": "Baztertu jakinarazpen-eskaerak?",
   "notification_requests.dismiss": "Baztertu",
+  "notification_requests.dismiss_multiple": "{count, plural, one {Baztertu eskaera…} other {Baztertu # eskaerak…}}",
+  "notification_requests.edit_selection": "Editatu",
+  "notification_requests.exit_selection": "Egina",
+  "notification_requests.explainer_for_limited_account": "Kontu honen jakinarazpenak iragazi egin dira, kontua moderatzaile batek mugatu duelako.",
+  "notification_requests.explainer_for_limited_remote_account": "Kontu horren jakinarazpenak iragazi egin dira kontua edo bere zerbitzaria moderatzaile batek mugatu duelako.",
   "notification_requests.maximize": "Maximizatu",
+  "notification_requests.minimize_banner": "Minimizatu iragazitako jakinarazpenen bannerra",
   "notification_requests.notifications_from": "{name} erabiltzailearen jakinarazpenak",
   "notification_requests.title": "Iragazitako jakinarazpenak",
   "notification_requests.view": "Ikusi jakinarazpenak",
@@ -719,8 +762,10 @@
   "server_banner.about_active_users": "Azken 30 egunetan zerbitzari hau erabili duen jendea (hilabeteko erabiltzaile aktiboak)",
   "server_banner.active_users": "erabiltzaile aktibo",
   "server_banner.administered_by": "Administratzailea(k):",
+  "server_banner.is_one_of_many": "{domain} fedibertsoan parte hartzeko erabil dezakezun Mastodonen zerbitzari independenteetako bat da.",
   "server_banner.server_stats": "Zerbitzariaren estatistikak:",
   "sign_in_banner.create_account": "Sortu kontua",
+  "sign_in_banner.follow_anyone": "Jarraitu edonori fedibertsoan eta ikusi dena ordena kronologikoan. Algoritmorik gabe, iragarki edo titulu gezurtirik gabe.",
   "sign_in_banner.mastodon_is": "Mastodon gertatzen ari denari buruz egunean egoteko modurik onena da.",
   "sign_in_banner.sign_in": "Hasi saioa",
   "sign_in_banner.sso_redirect": "Hasi saioa edo izena eman",
diff --git a/app/javascript/mastodon/locales/fr-CA.json b/app/javascript/mastodon/locales/fr-CA.json
index 29612852679711..4327ccb366174c 100644
--- a/app/javascript/mastodon/locales/fr-CA.json
+++ b/app/javascript/mastodon/locales/fr-CA.json
@@ -302,6 +302,7 @@
   "filter_modal.select_filter.title": "Filtrer cette publication",
   "filter_modal.title.status": "Filtrer une publication",
   "filter_warning.matches_filter": "Correspond au filtre « {title} »",
+  "filtered_notifications_banner.pending_requests": "De la part {count, plural, =0 {d’aucune personne} one {d'une personne} other {de # personnes}} que vous pourriez connaître",
   "filtered_notifications_banner.title": "Notifications filtrées",
   "firehose.all": "Tout",
   "firehose.local": "Ce serveur",
@@ -527,7 +528,15 @@
   "notification.status": "{name} vient de publier",
   "notification.update": "{name} a modifié une publication",
   "notification_requests.accept": "Accepter",
+  "notification_requests.accept_multiple": "{count, plural, one {Accepter # requête …} other {Accepter # requêtes …}}",
+  "notification_requests.confirm_accept_multiple.button": "{count, plural, one {Accepter la requête} other {Accepter les requêtes}}",
+  "notification_requests.confirm_accept_multiple.message": "Vous êtes sur le point d'accepter {count, plural, one {une requête de notification} other {# requêtes de notification}}. Êtes-vous sûr de vouloir continuer ?",
+  "notification_requests.confirm_accept_multiple.title": "Accepter les requêtes de notification ?",
+  "notification_requests.confirm_dismiss_multiple.button": "{count, plural, one {Ignorer la requête} other {Ignorer les requêtes}}",
+  "notification_requests.confirm_dismiss_multiple.message": "Vous êtes sur le point de rejeter {count, plural, one {une requête de notification} other {# requêtes de notification}}. Vous ne serez plus en mesure d'{count, plural, one {y} other {y}} accéder facilement, ultérieurement. Êtes-vous sûr de vouloir continuer ?",
+  "notification_requests.confirm_dismiss_multiple.title": "Rejeter les requêtes de notification ?",
   "notification_requests.dismiss": "Rejeter",
+  "notification_requests.dismiss_multiple": "{count, plural, one {Rejeter # requête …} other {Rejeter # requêtes …}}",
   "notification_requests.edit_selection": "Modifier",
   "notification_requests.exit_selection": "Fait",
   "notification_requests.explainer_for_limited_account": "Les notifications en provenance de ce compte ont été filtrées car le compte a été limité par un modérateur.",
@@ -589,7 +598,7 @@
   "notifications.policy.filter_not_following_title": "Personnes que vous ne suivez pas",
   "notifications.policy.filter_private_mentions_hint": "Filtrées sauf si c'est en réponse à l'une de vos mentions ou si vous suivez l'expéditeur·ice",
   "notifications.policy.filter_private_mentions_title": "Mentions privées non sollicitées",
-  "notifications.policy.title": "Gérer les notifications en provenance de …",
+  "notifications.policy.title": "Gestion des notifications des …",
   "notifications_permission_banner.enable": "Activer les notifications de bureau",
   "notifications_permission_banner.how_to_control": "Pour recevoir des notifications lorsque Mastodon n’est pas ouvert, activez les notifications de bureau. Vous pouvez contrôler précisément quels types d’interactions génèrent des notifications de bureau via le bouton {icon} ci-dessus une fois qu’elles sont activées.",
   "notifications_permission_banner.title": "Ne rien rater",
diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json
index 970103db839237..e38f5b33cea64b 100644
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@@ -302,6 +302,7 @@
   "filter_modal.select_filter.title": "Filtrer ce message",
   "filter_modal.title.status": "Filtrer un message",
   "filter_warning.matches_filter": "Correspond au filtre « {title} »",
+  "filtered_notifications_banner.pending_requests": "De la part {count, plural, =0 {d’aucune personne} one {d'une personne} other {de # personnes}} que vous pourriez connaître",
   "filtered_notifications_banner.title": "Notifications filtrées",
   "firehose.all": "Tout",
   "firehose.local": "Ce serveur",
@@ -527,7 +528,15 @@
   "notification.status": "{name} vient de publier",
   "notification.update": "{name} a modifié un message",
   "notification_requests.accept": "Accepter",
+  "notification_requests.accept_multiple": "{count, plural, one {Accepter # requête …} other {Accepter # requêtes …}}",
+  "notification_requests.confirm_accept_multiple.button": "{count, plural, one {Accepter la requête} other {Accepter les requêtes}}",
+  "notification_requests.confirm_accept_multiple.message": "Vous êtes sur le point d'accepter {count, plural, one {une requête de notification} other {# requêtes de notification}}. Êtes-vous sûr de vouloir continuer ?",
+  "notification_requests.confirm_accept_multiple.title": "Accepter les requêtes de notification ?",
+  "notification_requests.confirm_dismiss_multiple.button": "{count, plural, one {Ignorer la requête} other {Ignorer les requêtes}}",
+  "notification_requests.confirm_dismiss_multiple.message": "Vous êtes sur le point de rejeter {count, plural, one {une requête de notification} other {# requêtes de notification}}. Vous ne serez plus en mesure d'{count, plural, one {y} other {y}} accéder facilement, ultérieurement. Êtes-vous sûr de vouloir continuer ?",
+  "notification_requests.confirm_dismiss_multiple.title": "Rejeter les requêtes de notification ?",
   "notification_requests.dismiss": "Rejeter",
+  "notification_requests.dismiss_multiple": "{count, plural, one {Rejeter # requête …} other {Rejeter # requêtes …}}",
   "notification_requests.edit_selection": "Modifier",
   "notification_requests.exit_selection": "Fait",
   "notification_requests.explainer_for_limited_account": "Les notifications en provenance de ce compte ont été filtrées car le compte a été limité par un modérateur.",
@@ -589,7 +598,7 @@
   "notifications.policy.filter_not_following_title": "Personnes que vous ne suivez pas",
   "notifications.policy.filter_private_mentions_hint": "Filtrées sauf si c'est en réponse à l'une de vos mentions ou si vous suivez l'expéditeur·ice",
   "notifications.policy.filter_private_mentions_title": "Mentions privées non sollicitées",
-  "notifications.policy.title": "Gérer les notifications en provenance de …",
+  "notifications.policy.title": "Gestion des notifications des …",
   "notifications_permission_banner.enable": "Activer les notifications de bureau",
   "notifications_permission_banner.how_to_control": "Pour recevoir des notifications lorsque Mastodon n’est pas ouvert, activez les notifications du bureau. Vous pouvez contrôler précisément quels types d’interactions génèrent des notifications de bureau via le bouton {icon} ci-dessus une fois qu’elles sont activées.",
   "notifications_permission_banner.title": "Toujours au courant",
diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json
index 1af79127a5c16b..09ac636185dfb2 100644
--- a/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@@ -531,6 +531,7 @@
   "notification.relationships_severance_event.account_suspension": "Administrator z {from} zawiesił {target}, więc nie dostaniesz wieści ani nie wejdziesz w interakcje z użytkownikami z tego serwera.",
   "notification.relationships_severance_event.domain_block": "Administrator z {from} zablokował {target}, w tym {followersCount} z Twoich obserwujących i {followingCount, plural, one {# konto} other {# konta}} które obserwujesz.",
   "notification.relationships_severance_event.learn_more": "Dowiedz się więcej",
+  "notification.relationships_severance_event.user_domain_block": "Zablokowałeś {target}, w tym {followersCount} z Twoich obserwujących i {followingCount, plural, one {# konto} other {# konta}} które obserwujesz.",
   "notification.status": "{name} opublikował(a) nowy wpis",
   "notification.update": "{name} edytował(a) post",
   "notification_requests.accept": "Akceptuj",
diff --git a/config/locales/doorkeeper.fr-CA.yml b/config/locales/doorkeeper.fr-CA.yml
index 00df58be7929b2..f06cc7804df4aa 100644
--- a/config/locales/doorkeeper.fr-CA.yml
+++ b/config/locales/doorkeeper.fr-CA.yml
@@ -83,6 +83,7 @@ fr-CA:
         access_denied: Le/la propriétaire de la ressource ou le serveur d’autorisation a refusé la requête.
         credential_flow_not_configured: Le flux des identifiants du mot de passe du/de la propriétaire de la ressource a échoué car Doorkeeper.configure.resource_owner_from_credentials n’est pas configuré.
         invalid_client: L’authentification du client a échoué à cause d’un client inconnu, d’aucune authentification de client incluse ou d’une méthode d’authentification non prise en charge.
+        invalid_code_challenge_method: La méthode de contrôle du code doit être S256, le mode « en clair » n'est pas pris en charge.
         invalid_grant: L’autorisation accordée est invalide, expirée, révoquée, ne concorde pas avec l’URI de redirection utilisée dans la requête d’autorisation, ou a été délivrée à un autre client.
         invalid_redirect_uri: L’URI de redirection n’est pas valide.
         invalid_request:
diff --git a/config/locales/doorkeeper.fr.yml b/config/locales/doorkeeper.fr.yml
index 8855ca542619d8..cf8d1f08b43e77 100644
--- a/config/locales/doorkeeper.fr.yml
+++ b/config/locales/doorkeeper.fr.yml
@@ -83,6 +83,7 @@ fr:
         access_denied: Le propriétaire de la ressource ou le serveur d’autorisation a refusé la requête.
         credential_flow_not_configured: Le flux des identifiants du mot de passe du propriétaire de la ressource a échoué car Doorkeeper.configure.resource_owner_from_credentials n’est pas configuré.
         invalid_client: L’authentification du client a échoué à cause d’un client inconnu, d’aucune authentification de client incluse ou d’une méthode d’authentification non prise en charge.
+        invalid_code_challenge_method: La méthode de contrôle du code doit être S256, le mode « en clair » n'est pas pris en charge.
         invalid_grant: L’autorisation accordée est invalide, expirée, annulée, ne concorde pas avec l’URL de redirection utilisée dans la requête d’autorisation, ou a été délivrée à un autre client.
         invalid_redirect_uri: L’URL de redirection n’est pas valide.
         invalid_request:
diff --git a/config/locales/fr-CA.yml b/config/locales/fr-CA.yml
index e27750e1ad6714..52b3515725f22b 100644
--- a/config/locales/fr-CA.yml
+++ b/config/locales/fr-CA.yml
@@ -169,13 +169,16 @@ fr-CA:
         approve_appeal: Approuver l'appel
         approve_user: Approuver l’utilisateur
         assigned_to_self_report: Affecter le signalement
+        change_email_user: Modification de l’adresse de messagerie électronique pour l'utilisateur·ce
         change_role_user: Changer le rôle de l’utilisateur·rice
         confirm_user: Confirmer l’utilisateur
         create_account_warning: Créer une alerte
         create_announcement: Créer une annonce
+        create_canonical_email_block: Création d'un blocage de courrier électronique
         create_custom_emoji: Créer des émojis personnalisés
         create_domain_allow: Créer un domaine autorisé
         create_domain_block: Créer un blocage de domaine
+        create_email_domain_block: Création d'un blocage de domaine de courrier électronique
         create_ip_block: Créer une règle IP
         create_unavailable_domain: Créer un domaine indisponible
         create_user_role: Créer le rôle
@@ -417,8 +420,10 @@ fr-CA:
       new:
         create: Créer le blocage
         resolve: Résoudre le domaine
+        title: Blocage d'un nouveau domaine de messagerie électronique
       not_permitted: Non autorisé
       resolved_through_html: Résolu par %{domain}
+      title: Domaines de messagerie électronique bloqués
     export_domain_allows:
       new:
         title: Importer les autorisations de domaine
@@ -443,6 +448,9 @@ fr-CA:
       title: Recommandations d'abonnement
       unsuppress: Rétablir les recommandations d'abonnement
     instances:
+      audit_log:
+        title: Journaux d'audit récents
+        view_all: Voir les journaux d'audit complets
       availability:
         description_html:
           one: Si la livraison au domaine échoue pendant <strong>%{count} jour</strong>, aucune autre tentative de livraison ne sera faite à moins qu'une livraison <em>depuis</em> le domaine ne soit reçue.
@@ -610,6 +618,7 @@ fr-CA:
       report: 'Signalement #%{id}'
       reported_account: Compte signalé
       reported_by: Signalé par
+      reported_with_application: Signalé avec l'application
       resolved: Résolus
       resolved_msg: Signalement résolu avec succès !
       skip_to_actions: Passer aux actions
@@ -632,6 +641,7 @@ fr-CA:
         delete_data_html: effacer le profil de <strong>@%{acct}</strong> et ses contenus dans 30 jours, à moins que la suspension du compte ne soit annulée entre temps
         preview_preamble_html: "<strong>@%{acct}</strong> recevra un avertissement contenant les éléments suivants :"
         record_strike_html: enregistrer une sanction contre <strong>@%{acct}</strong> pour vous aider à prendre des mesures supplémentaires en cas d'infractions futures de ce compte
+        send_email_html: Envoyer un courriel d'avertissement à <strong>@%{acct}</strong>
         warning_placeholder: Arguments supplémentaires pour l'action de modération (facultatif).
       target_origin: Origine du compte signalé
       title: Signalements
@@ -671,6 +681,7 @@ fr-CA:
         manage_appeals: Gérer les contestations
         manage_appeals_description: Permet aux utilisateur⋅rice⋅s d'examiner les appels contre les actions de modération
         manage_blocks: Gérer les blocages
+        manage_blocks_description: Permet aux utilisateur⋅rice⋅s de bloquer des fournisseurs de courriel et des adresses IP
         manage_custom_emojis: Gérer les émojis personnalisés
         manage_custom_emojis_description: Permet aux utilisateur⋅rice⋅s de gérer les émoticônes personnalisées sur le serveur
         manage_federation: Gérer de la féderation
@@ -850,6 +861,9 @@ fr-CA:
         message_html: "<strong>Votre serveur web est mal configuré. La confidentialité de vos utilisateurs est en péril.</strong>"
     tags:
       name: Nom
+      newest: Plus récents
+      oldest: Plus anciens
+      reset: Réinitialiser
       review: État du traitement
       search: Recherche
       title: Hashtags
@@ -858,10 +872,16 @@ fr-CA:
     trends:
       allow: Autoriser
       approved: Approuvé
+      confirm_allow: Êtes-vous sûr de vouloir autoriser les hashtags sélectionnés ?
+      confirm_disallow: Êtes-vous sûr de vouloir interdire les hashtags sélectionnés ?
       disallow: Interdire
       links:
         allow: Autoriser le lien
         allow_provider: Autoriser l'éditeur
+        confirm_allow: Êtes-vous sûr de vouloir autoriser les liens sélectionnés ?
+        confirm_allow_provider: Êtes-vous sûr de vouloir autoriser les fournisseurs sélectionnés ?
+        confirm_disallow: Êtes-vous sûr de vouloir interdire les liens sélectionnés ?
+        confirm_disallow_provider: Êtes-vous sûr de vouloir interdire les fournisseurs sélectionnés ?
         description_html: Ces liens sont actuellement énormément partagés par des comptes dont votre serveur voit les messages. Cela peut aider vos utilisateur⋅rice⋅s à découvrir ce qu'il se passe dans le monde. Aucun lien n'est publiquement affiché tant que vous n'avez pas approuvé le compte qui le publie. Vous pouvez également autoriser ou rejeter les liens individuellement.
         disallow: Interdire le lien
         disallow_provider: Interdire l'éditeur
@@ -1002,7 +1022,9 @@ fr-CA:
       guide_link_text: Tout le monde peut y contribuer.
     sensitive_content: Contenu sensible
   application_mailer:
+    notification_preferences: Modification des préférences de la messagerie
     salutation: "%{name},"
+    settings: 'Modifier les préférences de la messagerie : %{link}'
     unsubscribe: Se désabonner
     view: 'Voir :'
     view_profile: Voir le profil
@@ -1022,6 +1044,7 @@ fr-CA:
       hint_html: Juste une autre chose! Nous avons besoin de confirmer que vous êtes un humain (pour que nous puissions empêcher les spams!). Résolvez le CAPTCHA ci-dessous et cliquez sur "Continuer".
       title: Vérification de sécurité
     confirmations:
+      awaiting_review: Votre adresse de messagerie est confirmée ! L'équipe de %{domain} est en train d'examiner votre inscription. Vous recevrez un e-mail si votre compte est approuvé !
       awaiting_review_title: Votre inscription est en cours de validation
       clicking_this_link: cliquer sur ce lien
       login_link: vous connecter
@@ -1029,6 +1052,7 @@ fr-CA:
       redirect_to_app_html: Vous auriez dû être redirigé vers l’application <strong>%{app_name}</strong>. Si cela ne s’est pas produit, essayez de %{clicking_this_link} ou de revenir manuellement à l’application.
       registration_complete: Votre inscription sur %{domain} est désormais terminée !
       welcome_title: Bienvenue, %{name} !
+      wrong_email_hint: Si cette adresse de messagerie est incorrecte, vous pouvez la modifier dans vos paramètres de compte.
     delete_account: Supprimer le compte
     delete_account_html: Si vous désirez supprimer votre compte, vous pouvez <a href="%{path}">cliquer ici</a>. Il vous sera demandé de confirmer cette action.
     description:
@@ -1049,6 +1073,7 @@ fr-CA:
     or_log_in_with: Ou authentifiez-vous avec
     privacy_policy_agreement_html: J’ai lu et j’accepte la <a href="%{privacy_policy_path}" target="_blank">politique de confidentialité</a>
     progress:
+      confirm: Confirmation de l'adresse mail
       details: Vos infos
       review: Notre avis
       rules: Accepter les règles
@@ -1070,6 +1095,7 @@ fr-CA:
     security: Sécurité
     set_new_password: Définir le nouveau mot de passe
     setup:
+      email_below_hint_html: Consultez votre dossier de courrier indésirable ou demandez-en un autre. Vous pouvez corriger votre adresse e-mail si elle est incorrecte.
       email_settings_hint_html: Cliquez sur le lien que nous vous avons envoyé pour vérifier %{email}. Nous vous attendrons ici.
       link_not_received: Vous n'avez pas reçu de lien?
       new_confirmation_instructions_sent: Vous allez recevoir un nouvel e-mail avec le lien de confirmation dans quelques minutes !
@@ -1083,6 +1109,7 @@ fr-CA:
       title: Mettons les choses en place pour %{domain}.
     status:
       account_status: État du compte
+      confirming: En attente de la confirmation par courrier électronique.
       functional: Votre compte est entièrement opérationnel.
       pending: Votre demande est en attente d’examen par notre équipe. Cela peut prendre un certain temps. Vous recevrez un e-mail si votre demande est approuvée.
       redirecting_to: Votre compte est inactif car il est actuellement redirigé vers %{acct}.
@@ -1128,6 +1155,8 @@ fr-CA:
       caches: Le contenu mis en cache par d'autres serveurs peut persister
       data_removal: Vos messages et autres données seront définitivement supprimés
       email_change_html: Vous pouvez <a href="%{path}">modifier votre adresse e-mail</a> sans supprimer votre compte
+      email_contact_html: S'il ne vous est toujours pas parvenu, vous pouvez envoyer un message à <a href="mailto:%{email}">%{email}</a> pour obtenir de l'aide
+      email_reconfirmation_html: Dans le cas où vous n'auriez pas reçu l'email de confirmation, vous pouvez <a href="%{path}">en réclamer un nouveau</a>
       irreversible: Vous ne pourrez pas restaurer ou réactiver votre compte
       more_details_html: Pour plus de détails, voir la <a href="%{terms_path}">politique de confidentialité</a>.
       username_available: Votre nom d’utilisateur·rice sera à nouveau disponible
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 006696fc8d2fd8..d7830bfe339b2e 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -169,13 +169,16 @@ fr:
         approve_appeal: Approuver l'appel
         approve_user: Approuver le compte
         assigned_to_self_report: Affecter le signalement
+        change_email_user: Modification de l’adresse de messagerie électronique pour l'utilisateur·ce
         change_role_user: Changer le rôle du compte
         confirm_user: Confirmer le compte
         create_account_warning: Créer une alerte
         create_announcement: Créer une annonce
+        create_canonical_email_block: Création d'un blocage de courrier électronique
         create_custom_emoji: Créer des émojis personnalisés
         create_domain_allow: Créer un domaine autorisé
         create_domain_block: Créer un blocage de domaine
+        create_email_domain_block: Création d'un blocage de domaine de courrier électronique
         create_ip_block: Créer une règle IP
         create_unavailable_domain: Créer un domaine indisponible
         create_user_role: Créer le rôle
@@ -417,8 +420,10 @@ fr:
       new:
         create: Créer le blocage
         resolve: Résoudre le domaine
+        title: Blocage d'un nouveau domaine de messagerie électronique
       not_permitted: Non autorisé
       resolved_through_html: Résolu par %{domain}
+      title: Domaines de messagerie électronique bloqués
     export_domain_allows:
       new:
         title: Importer les autorisations de domaine
@@ -443,6 +448,9 @@ fr:
       title: Recommandations d'abonnement
       unsuppress: Rétablir les recommandations d'abonnement
     instances:
+      audit_log:
+        title: Journaux d'audit récents
+        view_all: Voir les journaux d'audit complets
       availability:
         description_html:
           one: Si la livraison au domaine échoue pendant <strong>%{count} jour</strong>, aucune autre tentative de livraison ne sera faite à moins qu'une livraison <em>depuis</em> le domaine ne soit reçue.
@@ -610,6 +618,7 @@ fr:
       report: 'Signalement #%{id}'
       reported_account: Compte signalé
       reported_by: Signalé par
+      reported_with_application: Signalé avec l'application
       resolved: Résolus
       resolved_msg: Signalement résolu avec succès !
       skip_to_actions: Passer aux actions
@@ -632,6 +641,7 @@ fr:
         delete_data_html: effacer le profil de <strong>@%{acct}</strong> et ses contenus dans 30 jours, à moins que la suspension du compte ne soit annulée entre temps
         preview_preamble_html: "<strong>@%{acct}</strong> recevra un avertissement contenant les éléments suivants :"
         record_strike_html: enregistrer une sanction contre <strong>@%{acct}</strong> pour vous aider à prendre des mesures supplémentaires en cas d'infractions futures de ce compte
+        send_email_html: Envoyer un courriel d'avertissement à <strong>@%{acct}</strong>
         warning_placeholder: Arguments supplémentaires pour l'action de modération (facultatif).
       target_origin: Origine du compte signalé
       title: Signalements
@@ -671,6 +681,7 @@ fr:
         manage_appeals: Gérer les contestations
         manage_appeals_description: Permet aux utilisateur⋅rice⋅s d'examiner les appels contre les actions de modération
         manage_blocks: Gérer les blocages
+        manage_blocks_description: Permet aux utilisateur⋅rice⋅s de bloquer des fournisseurs de courriel et des adresses IP
         manage_custom_emojis: Gérer les émojis personnalisés
         manage_custom_emojis_description: Permet aux utilisateur⋅rice⋅s de gérer les émoticônes personnalisées sur le serveur
         manage_federation: Gérer de la féderation
@@ -850,6 +861,9 @@ fr:
         message_html: "<strong>Votre serveur web est mal configuré. La confidentialité de vos utilisateurs est en péril.</strong>"
     tags:
       name: Nom
+      newest: Plus récents
+      oldest: Plus anciens
+      reset: Réinitialiser
       review: État du traitement
       search: Recherche
       title: Hashtags
@@ -858,10 +872,16 @@ fr:
     trends:
       allow: Autoriser
       approved: Approuvé
+      confirm_allow: Êtes-vous sûr de vouloir autoriser les hashtags sélectionnés ?
+      confirm_disallow: Êtes-vous sûr de vouloir interdire les hashtags sélectionnés ?
       disallow: Interdire
       links:
         allow: Autoriser le lien
         allow_provider: Autoriser l'éditeur
+        confirm_allow: Êtes-vous sûr de vouloir autoriser les liens sélectionnés ?
+        confirm_allow_provider: Êtes-vous sûr de vouloir autoriser les fournisseurs sélectionnés ?
+        confirm_disallow: Êtes-vous sûr de vouloir interdire les liens sélectionnés ?
+        confirm_disallow_provider: Êtes-vous sûr de vouloir interdire les fournisseurs sélectionnés ?
         description_html: Ces liens sont actuellement énormément partagés par des comptes dont votre serveur voit les messages. Cela peut aider vos utilisateur⋅rice⋅s à découvrir ce qu'il se passe dans le monde. Aucun lien n'est publiquement affiché tant que vous n'avez pas approuvé le compte qui le publie. Vous pouvez également autoriser ou rejeter les liens individuellement.
         disallow: Interdire le lien
         disallow_provider: Interdire l'éditeur
@@ -1002,7 +1022,9 @@ fr:
       guide_link_text: Tout le monde peut y contribuer.
     sensitive_content: Contenu sensible
   application_mailer:
+    notification_preferences: Modification des préférences de la messagerie
     salutation: "%{name},"
+    settings: 'Modifier les préférences de la messagerie : %{link}'
     unsubscribe: Se désabonner
     view: 'Voir :'
     view_profile: Voir le profil
@@ -1022,6 +1044,7 @@ fr:
       hint_html: Encore une chose ! Nous avons besoin de confirmer que vous êtes un humain (c'est pour que nous puissions empêcher les spams !). Résolvez le CAPTCHA ci-dessous et cliquez sur "Continuer".
       title: Vérification de sécurité
     confirmations:
+      awaiting_review: Votre adresse de messagerie est confirmée ! L'équipe de %{domain} est en train d'examiner votre inscription. Vous recevrez un e-mail si votre compte est approuvé !
       awaiting_review_title: Votre inscription est en cours de validation
       clicking_this_link: cliquer sur ce lien
       login_link: vous connecter
@@ -1029,6 +1052,7 @@ fr:
       redirect_to_app_html: Vous auriez dû être redirigé vers l’application <strong>%{app_name}</strong>. Si cela ne s’est pas produit, essayez de %{clicking_this_link} ou de revenir manuellement à l’application.
       registration_complete: Votre inscription sur %{domain} est désormais terminée !
       welcome_title: Bienvenue, %{name} !
+      wrong_email_hint: Si cette adresse de messagerie est incorrecte, vous pouvez la modifier dans vos paramètres de compte.
     delete_account: Supprimer le compte
     delete_account_html: Si vous désirez supprimer votre compte, vous pouvez <a href="%{path}">cliquer ici</a>. Il vous sera demandé de confirmer cette action.
     description:
@@ -1049,6 +1073,7 @@ fr:
     or_log_in_with: Ou authentifiez-vous avec
     privacy_policy_agreement_html: J’ai lu et j’accepte la <a href="%{privacy_policy_path}" target="_blank">politique de confidentialité</a>
     progress:
+      confirm: Confirmation de l'adresse mail
       details: Vos infos
       review: Notre avis
       rules: Accepter les règles
@@ -1070,6 +1095,7 @@ fr:
     security: Sécurité
     set_new_password: Définir le nouveau mot de passe
     setup:
+      email_below_hint_html: Consultez votre dossier de courrier indésirable ou demandez-en un autre. Vous pouvez corriger votre adresse e-mail si elle est incorrecte.
       email_settings_hint_html: Cliquez sur le lien que nous vous avons envoyé pour vérifier l’adresse %{email}. Nous vous attendons ici.
       link_not_received: Vous n'avez pas reçu de lien ?
       new_confirmation_instructions_sent: Vous allez recevoir un nouvel e-mail avec le lien de confirmation dans quelques minutes !
@@ -1083,6 +1109,7 @@ fr:
       title: Mettons les choses en place pour %{domain}.
     status:
       account_status: État du compte
+      confirming: En attente de la confirmation par courrier électronique.
       functional: Votre compte est entièrement opérationnel.
       pending: Votre demande est en attente d’examen par notre équipe. Cela peut prendre un certain temps. Vous recevrez un e-mail si votre demande est approuvée.
       redirecting_to: Votre compte est inactif car il est actuellement redirigé vers %{acct}.
@@ -1128,6 +1155,8 @@ fr:
       caches: Le contenu mis en cache par d'autres serveurs peut persister
       data_removal: Vos messages et autres données seront définitivement supprimés
       email_change_html: Vous pouvez <a href="%{path}">modifier votre adresse e-mail</a> sans supprimer votre compte
+      email_contact_html: S'il ne vous est toujours pas parvenu, vous pouvez envoyer un message à <a href="mailto:%{email}">%{email}</a> pour obtenir de l'aide
+      email_reconfirmation_html: Dans le cas où vous n'auriez pas reçu l'email de confirmation, vous pouvez <a href="%{path}">en réclamer un nouveau</a>
       irreversible: Vous ne pourrez pas restaurer ou réactiver votre compte
       more_details_html: Pour plus de détails, voir la <a href="%{terms_path}">politique de confidentialité</a>.
       username_available: Votre nom d’utilisateur·rice sera à nouveau disponible

From b9269c8d3800bab8f1d37bfec755eb7b0e860553 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 29 Aug 2024 04:38:17 -0400
Subject: [PATCH 2002/2191] Convert `admin/reset` controller spec to system
 spec (#31643)

---
 .../admin/accounts/_local_account.html.haml   |  2 +-
 .../admin/resets_controller_spec.rb           | 35 ---------------
 spec/system/admin/reset_spec.rb               | 45 +++++++++++++++++++
 3 files changed, 46 insertions(+), 36 deletions(-)
 delete mode 100644 spec/controllers/admin/resets_controller_spec.rb
 create mode 100644 spec/system/admin/reset_spec.rb

diff --git a/app/views/admin/accounts/_local_account.html.haml b/app/views/admin/accounts/_local_account.html.haml
index 3ad47d8dfb8cdf..5357ebcce9bc7b 100644
--- a/app/views/admin/accounts/_local_account.html.haml
+++ b/app/views/admin/accounts/_local_account.html.haml
@@ -52,7 +52,7 @@
 - if can?(:reset_password, account.user)
   %tr
     %td
-      = table_link_to 'key', t('admin.accounts.reset_password'), admin_account_reset_path(account.id), method: :create, data: { confirm: t('admin.accounts.are_you_sure') }
+      = table_link_to 'key', t('admin.accounts.reset_password'), admin_account_reset_path(account.id), method: :post, data: { confirm: t('admin.accounts.are_you_sure') }
 %tr
   %th= t('simple_form.labels.defaults.locale')
   %td= standard_locale_name(account.user_locale)
diff --git a/spec/controllers/admin/resets_controller_spec.rb b/spec/controllers/admin/resets_controller_spec.rb
deleted file mode 100644
index 0cbc3b60ab6f88..00000000000000
--- a/spec/controllers/admin/resets_controller_spec.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe Admin::ResetsController do
-  render_views
-
-  subject { post :create, params: { account_id: account.id } }
-
-  let(:account) { Fabricate(:account) }
-
-  before do
-    sign_in Fabricate(:user, role: UserRole.find_by(name: 'Admin')), scope: :user
-  end
-
-  describe 'POST #create', :inline_jobs do
-    it 'redirects to admin accounts page' do
-      emails = capture_emails { subject }
-
-      expect(emails.size)
-        .to eq(2)
-      expect(emails).to have_attributes(
-        first: have_attributes(
-          to: include(account.user.email),
-          subject: I18n.t('devise.mailer.password_change.subject')
-        ),
-        last: have_attributes(
-          to: include(account.user.email),
-          subject: I18n.t('devise.mailer.reset_password_instructions.subject')
-        )
-      )
-      expect(response).to redirect_to(admin_account_path(account.id))
-    end
-  end
-end
diff --git a/spec/system/admin/reset_spec.rb b/spec/system/admin/reset_spec.rb
new file mode 100644
index 00000000000000..50fb4b46dfaf2d
--- /dev/null
+++ b/spec/system/admin/reset_spec.rb
@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'Admin::Reset' do
+  it 'Resets password for account user' do
+    account = Fabricate :account
+    sign_in admin_user
+    visit admin_account_path(account.id)
+
+    emails = capture_emails do
+      expect { submit_reset }
+        .to change(Admin::ActionLog.where(target: account.user), :count).by(1)
+    end
+
+    expect(emails.first)
+      .to be_present
+      .and(deliver_to(account.user.email))
+      .and(have_subject(password_change_subject))
+
+    expect(emails.last)
+      .to be_present
+      .and(deliver_to(account.user.email))
+      .and(have_subject(reset_instructions_subject))
+
+    expect(page)
+      .to have_content(account.username)
+  end
+
+  def admin_user
+    Fabricate(:user, role: UserRole.find_by(name: 'Admin'))
+  end
+
+  def submit_reset
+    click_on I18n.t('admin.accounts.reset_password')
+  end
+
+  def password_change_subject
+    I18n.t('devise.mailer.password_change.subject')
+  end
+
+  def reset_instructions_subject
+    I18n.t('devise.mailer.reset_password_instructions.subject')
+  end
+end

From 02585d87894c52bb182260b3f33e6212a90e9ca7 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 29 Aug 2024 04:46:00 -0400
Subject: [PATCH 2003/2191] Convert `media` controller spec to request spec
 (#31634)

---
 spec/controllers/media_controller_spec.rb | 65 ----------------
 spec/requests/media_spec.rb               | 90 +++++++++++++++++++++++
 2 files changed, 90 insertions(+), 65 deletions(-)
 delete mode 100644 spec/controllers/media_controller_spec.rb
 create mode 100644 spec/requests/media_spec.rb

diff --git a/spec/controllers/media_controller_spec.rb b/spec/controllers/media_controller_spec.rb
deleted file mode 100644
index efd15b5b40b714..00000000000000
--- a/spec/controllers/media_controller_spec.rb
+++ /dev/null
@@ -1,65 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe MediaController do
-  render_views
-
-  describe '#show' do
-    it 'raises when shortcode cant be found' do
-      get :show, params: { id: 'missing' }
-
-      expect(response).to have_http_status(404)
-    end
-
-    context 'when the media attachment has a shortcode' do
-      it 'redirects to the file url when attached to a status' do
-        status = Fabricate(:status)
-        media_attachment = Fabricate(:media_attachment, status: status, shortcode: 'OI6IgDzG-nYTqvDQ994')
-        get :show, params: { id: media_attachment.to_param }
-
-        expect(response).to redirect_to(media_attachment.file.url(:original))
-      end
-
-      it 'responds with missing when there is not an attached status' do
-        media_attachment = Fabricate(:media_attachment, status: nil, shortcode: 'OI6IgDzG-nYTqvDQ994')
-        get :show, params: { id: media_attachment.to_param }
-
-        expect(response).to have_http_status(404)
-      end
-
-      it 'raises when not permitted to view' do
-        status = Fabricate(:status, visibility: :direct)
-        media_attachment = Fabricate(:media_attachment, status: status, shortcode: 'OI6IgDzG-nYTqvDQ994')
-        get :show, params: { id: media_attachment.to_param }
-
-        expect(response).to have_http_status(404)
-      end
-    end
-
-    context 'when the media attachment has no shortcode' do
-      it 'redirects to the file url when attached to a status' do
-        status = Fabricate(:status)
-        media_attachment = Fabricate(:media_attachment, status: status)
-        get :show, params: { id: media_attachment.to_param }
-
-        expect(response).to redirect_to(media_attachment.file.url(:original))
-      end
-
-      it 'responds with missing when there is not an attached status' do
-        media_attachment = Fabricate(:media_attachment, status: nil)
-        get :show, params: { id: media_attachment.to_param }
-
-        expect(response).to have_http_status(404)
-      end
-
-      it 'raises when not permitted to view' do
-        status = Fabricate(:status, visibility: :direct)
-        media_attachment = Fabricate(:media_attachment, status: status)
-        get :show, params: { id: media_attachment.to_param }
-
-        expect(response).to have_http_status(404)
-      end
-    end
-  end
-end
diff --git a/spec/requests/media_spec.rb b/spec/requests/media_spec.rb
new file mode 100644
index 00000000000000..a448a87492e972
--- /dev/null
+++ b/spec/requests/media_spec.rb
@@ -0,0 +1,90 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Media' do
+  describe 'GET /media/:id' do
+    context 'when the media attachment does not exist' do
+      it 'responds with not found' do
+        get '/media/missing'
+
+        expect(response)
+          .to have_http_status(404)
+      end
+    end
+
+    context 'when the media attachment has a shortcode' do
+      let(:media_attachment) { Fabricate :media_attachment, status: status, shortcode: 'OI6IgDzG-nYTqvDQ994' }
+
+      context 'when attached to a status' do
+        let(:status) { Fabricate :status }
+
+        it 'redirects to file url' do
+          get medium_path(id: media_attachment.shortcode)
+
+          expect(response)
+            .to redirect_to(media_attachment.file.url(:original))
+        end
+      end
+
+      context 'when not attached to a status' do
+        let(:status) { nil }
+
+        it 'responds with not found' do
+          get medium_path(id: media_attachment.shortcode)
+
+          expect(response)
+            .to have_http_status(404)
+        end
+      end
+
+      context 'when attached to non-public status' do
+        let(:status) { Fabricate :status, visibility: :direct }
+
+        it 'responds with not found' do
+          get medium_path(id: media_attachment.shortcode)
+
+          expect(response)
+            .to have_http_status(404)
+        end
+      end
+    end
+
+    context 'when the media attachment does not have a shortcode' do
+      let(:media_attachment) { Fabricate :media_attachment, status: status, shortcode: nil }
+
+      context 'when attached to a status' do
+        let(:status) { Fabricate :status }
+
+        it 'redirects to file url' do
+          get medium_path(id: media_attachment.id)
+
+          expect(response)
+            .to redirect_to(media_attachment.file.url(:original))
+        end
+      end
+
+      context 'when not attached to a status' do
+        let(:status) { nil }
+
+        it 'responds with not found' do
+          get medium_path(id: media_attachment.id)
+
+          expect(response)
+            .to have_http_status(404)
+        end
+      end
+
+      context 'when attached to non-public status' do
+        let(:status) { Fabricate :status, visibility: :direct }
+
+        it 'responds with not found' do
+          get medium_path(id: media_attachment.id)
+
+          expect(response)
+            .to have_http_status(404)
+        end
+      end
+    end
+  end
+end

From 662f87dbe9c23e505fc9ffa3f21d6a623f4df974 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 29 Aug 2024 04:52:29 -0400
Subject: [PATCH 2004/2191] Use `MediaAttachment.supported_mime_types` method
 where relevant (#31635)

---
 app/serializers/rest/instance_serializer.rb    | 2 +-
 app/serializers/rest/v1/instance_serializer.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/serializers/rest/instance_serializer.rb b/app/serializers/rest/instance_serializer.rb
index 084701657e85c9..cced83587d0736 100644
--- a/app/serializers/rest/instance_serializer.rb
+++ b/app/serializers/rest/instance_serializer.rb
@@ -77,7 +77,7 @@ def configuration
       },
 
       media_attachments: {
-        supported_mime_types: MediaAttachment::IMAGE_MIME_TYPES + MediaAttachment::VIDEO_MIME_TYPES + MediaAttachment::AUDIO_MIME_TYPES,
+        supported_mime_types: MediaAttachment.supported_mime_types,
         image_size_limit: MediaAttachment::IMAGE_LIMIT,
         image_matrix_limit: Attachmentable::MAX_MATRIX_LIMIT,
         video_size_limit: MediaAttachment::VIDEO_LIMIT,
diff --git a/app/serializers/rest/v1/instance_serializer.rb b/app/serializers/rest/v1/instance_serializer.rb
index 636925b973f23d..7f9f21c5af18f2 100644
--- a/app/serializers/rest/v1/instance_serializer.rb
+++ b/app/serializers/rest/v1/instance_serializer.rb
@@ -69,7 +69,7 @@ def configuration
       },
 
       media_attachments: {
-        supported_mime_types: MediaAttachment::IMAGE_MIME_TYPES + MediaAttachment::VIDEO_MIME_TYPES + MediaAttachment::AUDIO_MIME_TYPES,
+        supported_mime_types: MediaAttachment.supported_mime_types,
         image_size_limit: MediaAttachment::IMAGE_LIMIT,
         image_matrix_limit: Attachmentable::MAX_MATRIX_LIMIT,
         video_size_limit: MediaAttachment::VIDEO_LIMIT,

From ad0a28a8bfb8b527eae11cdc29829d87b07db53c Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 29 Aug 2024 14:39:07 +0200
Subject: [PATCH 2005/2191] Add `grouped_types` parameter to allow clients to
 restrict which notifications types get grouped (#31594)

---
 .../api/v2_alpha/notifications_controller.rb  | 10 ++---
 app/models/notification.rb                    | 45 ++++++++++++++-----
 app/models/notification_group.rb              |  9 ++--
 app/services/notify_service.rb                |  2 +-
 .../api/v2_alpha/notifications_spec.rb        | 43 ++++++++++++++++++
 5 files changed, 90 insertions(+), 19 deletions(-)

diff --git a/app/controllers/api/v2_alpha/notifications_controller.rb b/app/controllers/api/v2_alpha/notifications_controller.rb
index d0205ad6af890e..a9f4ac02a038f3 100644
--- a/app/controllers/api/v2_alpha/notifications_controller.rb
+++ b/app/controllers/api/v2_alpha/notifications_controller.rb
@@ -42,7 +42,7 @@ def unread_count
     limit = limit_param(DEFAULT_NOTIFICATIONS_COUNT_LIMIT, MAX_NOTIFICATIONS_COUNT_LIMIT)
 
     with_read_replica do
-      render json: { count: browserable_account_notifications.paginate_groups_by_min_id(limit, min_id: notification_marker&.last_read_id).count }
+      render json: { count: browserable_account_notifications.paginate_groups_by_min_id(limit, min_id: notification_marker&.last_read_id, grouped_types: params[:grouped_types]).count }
     end
   end
 
@@ -68,7 +68,7 @@ def load_notifications
     MastodonOTELTracer.in_span('Api::V2Alpha::NotificationsController#load_notifications') do
       notifications = browserable_account_notifications.includes(from_account: [:account_stat, :user]).to_a_grouped_paginated_by_id(
         limit_param(DEFAULT_NOTIFICATIONS_LIMIT),
-        params_slice(:max_id, :since_id, :min_id)
+        params.slice(:max_id, :since_id, :min_id, :grouped_types).permit(:max_id, :since_id, :min_id, grouped_types: [])
       )
 
       Notification.preload_cache_collection_target_statuses(notifications) do |target_statuses|
@@ -92,7 +92,7 @@ def load_group_metadata
 
   def load_grouped_notifications
     MastodonOTELTracer.in_span('Api::V2Alpha::NotificationsController#load_grouped_notifications') do
-      @notifications.map { |notification| NotificationGroup.from_notification(notification, max_id: @group_metadata.dig(notification.group_key, :max_id)) }
+      @notifications.map { |notification| NotificationGroup.from_notification(notification, max_id: @group_metadata.dig(notification.group_key, :max_id), grouped_types: params[:grouped_types]) }
     end
   end
 
@@ -125,11 +125,11 @@ def pagination_collection
   end
 
   def browserable_params
-    params.permit(:include_filtered, types: [], exclude_types: [])
+    params.slice(:include_filtered, :types, :exclude_types, :grouped_types).permit(:include_filtered, types: [], exclude_types: [], grouped_types: [])
   end
 
   def pagination_params(core_params)
-    params.slice(:limit, :types, :exclude_types, :include_filtered).permit(:limit, :include_filtered, types: [], exclude_types: []).merge(core_params)
+    params.slice(:limit, :include_filtered, :types, :exclude_types, :grouped_types).permit(:limit, :include_filtered, types: [], exclude_types: [], grouped_types: []).merge(core_params)
   end
 
   def expand_accounts_param
diff --git a/app/models/notification.rb b/app/models/notification.rb
index ae7c782bedf64a..44a43d2ece0c65 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -30,6 +30,8 @@ class Notification < ApplicationRecord
     'Poll' => :poll,
   }.freeze
 
+  GROUPABLE_NOTIFICATION_TYPES = %i(favourite reblog).freeze
+
   # Please update app/javascript/api_types/notification.ts if you change this
   PROPERTIES = {
     mention: {
@@ -138,17 +140,40 @@ def browserable(types: [], exclude_types: [], from_account_id: nil, include_filt
       end
     end
 
-    def paginate_groups(limit, pagination_order)
+    def paginate_groups(limit, pagination_order, grouped_types: nil)
       raise ArgumentError unless %i(asc desc).include?(pagination_order)
 
       query = reorder(id: pagination_order)
 
+      # Ideally `:types` would be a bind rather than part of the SQL itself, but that does not
+      # seem to be possible to do with Rails, considering that the expression would occur in
+      # multiple places, including in a `select`
+      group_key_sql = begin
+        if grouped_types.present?
+          # Normalize `grouped_types` so the number of different SQL query shapes remains small, and
+          # the queries can be analyzed in monitoring/telemetry tools
+          grouped_types = (grouped_types.map(&:to_sym) & GROUPABLE_NOTIFICATION_TYPES).sort
+
+          sanitize_sql_array([<<~SQL.squish, { types: grouped_types }])
+            COALESCE(
+              CASE
+                WHEN notifications.type IN (:types) THEN notifications.group_key
+                ELSE NULL
+              END,
+              'ungrouped-' || notifications.id
+            )
+          SQL
+        else
+          "COALESCE(notifications.group_key, 'ungrouped-' || notifications.id)"
+        end
+      end
+
       unscoped
         .with_recursive(
           grouped_notifications: [
             # Base case: fetching one notification and annotating it with visited groups
             query
-              .select('notifications.*', "ARRAY[COALESCE(notifications.group_key, 'ungrouped-' || notifications.id)] AS groups")
+              .select('notifications.*', "ARRAY[#{group_key_sql}] AS groups")
               .limit(1),
             # Recursive case, always yielding at most one annotated notification
             unscoped
@@ -163,12 +188,12 @@ def paginate_groups(limit, pagination_order)
                   # Recursive query, using `LATERAL` so we can refer to `wt`
                   query
                     .where(pagination_order == :desc ? 'notifications.id < wt.id' : 'notifications.id > wt.id')
-                    .where.not("COALESCE(notifications.group_key, 'ungrouped-' || notifications.id) = ANY(wt.groups)")
+                    .where.not("#{group_key_sql} = ANY(wt.groups)")
                     .limit(1)
                     .arel.lateral('notifications'),
                 ]
               )
-              .select('notifications.*', "array_append(wt.groups, COALESCE(notifications.group_key, 'ungrouped-' || notifications.id))"),
+              .select('notifications.*', "array_append(wt.groups, #{group_key_sql}) AS groups"),
           ]
         )
         .from('grouped_notifications AS notifications')
@@ -178,28 +203,28 @@ def paginate_groups(limit, pagination_order)
 
     # This returns notifications from the request page, but with at most one notification per group.
     # Notifications that have no `group_key` each count as a separate group.
-    def paginate_groups_by_max_id(limit, max_id: nil, since_id: nil)
+    def paginate_groups_by_max_id(limit, max_id: nil, since_id: nil, grouped_types: nil)
       query = reorder(id: :desc)
       query = query.where(id: ...(max_id.to_i)) if max_id.present?
       query = query.where(id: (since_id.to_i + 1)...) if since_id.present?
-      query.paginate_groups(limit, :desc)
+      query.paginate_groups(limit, :desc, grouped_types: grouped_types)
     end
 
     # Differs from :paginate_groups_by_max_id in that it gives the results immediately following min_id,
     # whereas since_id gives the items with largest id, but with since_id as a cutoff.
     # Results will be in ascending order by id.
-    def paginate_groups_by_min_id(limit, max_id: nil, min_id: nil)
+    def paginate_groups_by_min_id(limit, max_id: nil, min_id: nil, grouped_types: nil)
       query = reorder(id: :asc)
       query = query.where(id: (min_id.to_i + 1)...) if min_id.present?
       query = query.where(id: ...(max_id.to_i)) if max_id.present?
-      query.paginate_groups(limit, :asc)
+      query.paginate_groups(limit, :asc, grouped_types: grouped_types)
     end
 
     def to_a_grouped_paginated_by_id(limit, options = {})
       if options[:min_id].present?
-        paginate_groups_by_min_id(limit, min_id: options[:min_id], max_id: options[:max_id]).reverse
+        paginate_groups_by_min_id(limit, min_id: options[:min_id], max_id: options[:max_id], grouped_types: options[:grouped_types]).reverse
       else
-        paginate_groups_by_max_id(limit, max_id: options[:max_id], since_id: options[:since_id]).to_a
+        paginate_groups_by_max_id(limit, max_id: options[:max_id], since_id: options[:since_id], grouped_types: options[:grouped_types]).to_a
       end
     end
 
diff --git a/app/models/notification_group.rb b/app/models/notification_group.rb
index 223945f07bf681..12294f24ec11a0 100644
--- a/app/models/notification_group.rb
+++ b/app/models/notification_group.rb
@@ -6,8 +6,11 @@ class NotificationGroup < ActiveModelSerializers::Model
   # Try to keep this consistent with `app/javascript/mastodon/models/notification_group.ts`
   SAMPLE_ACCOUNTS_SIZE = 8
 
-  def self.from_notification(notification, max_id: nil)
-    if notification.group_key.present?
+  def self.from_notification(notification, max_id: nil, grouped_types: nil)
+    grouped_types = grouped_types.presence&.map(&:to_sym) || Notification::GROUPABLE_NOTIFICATION_TYPES
+    groupable = notification.group_key.present? && grouped_types.include?(notification.type)
+
+    if groupable
       # TODO: caching, and, if caching, preloading
       scope = notification.account.notifications.where(group_key: notification.group_key)
       scope = scope.where(id: ..max_id) if max_id.present?
@@ -25,7 +28,7 @@ def self.from_notification(notification, max_id: nil)
 
     NotificationGroup.new(
       notification: notification,
-      group_key: notification.group_key || "ungrouped-#{notification.id}",
+      group_key: groupable ? notification.group_key : "ungrouped-#{notification.id}",
       sample_accounts: sample_accounts,
       notifications_count: notifications_count,
       most_recent_notification_id: most_recent_id
diff --git a/app/services/notify_service.rb b/app/services/notify_service.rb
index 695f4153c6c1a1..97eee0548763e6 100644
--- a/app/services/notify_service.rb
+++ b/app/services/notify_service.rb
@@ -237,7 +237,7 @@ def call(recipient, type, activity)
   private
 
   def notification_group_key
-    return nil if @notification.filtered || %i(favourite reblog).exclude?(@notification.type)
+    return nil if @notification.filtered || Notification::GROUPABLE_NOTIFICATION_TYPES.exclude?(@notification.type)
 
     type_prefix = "#{@notification.type}-#{@notification.target_status.id}"
     redis_key   = "notif-group/#{@recipient.id}/#{type_prefix}"
diff --git a/spec/requests/api/v2_alpha/notifications_spec.rb b/spec/requests/api/v2_alpha/notifications_spec.rb
index a613158aa5b404..9d9eb34ebd4712 100644
--- a/spec/requests/api/v2_alpha/notifications_spec.rb
+++ b/spec/requests/api/v2_alpha/notifications_spec.rb
@@ -35,6 +35,17 @@
       end
     end
 
+    context 'with grouped_types parameter' do
+      let(:params) { { grouped_types: %w(reblog) } }
+
+      it 'returns expected notifications count' do
+        subject
+
+        expect(response).to have_http_status(200)
+        expect(body_as_json[:count]).to eq 5
+      end
+    end
+
     context 'with a read marker' do
       before do
         id = user.account.notifications.browserable.order(id: :desc).offset(2).first.id
@@ -114,6 +125,38 @@
       end
     end
 
+    context 'with grouped_types param' do
+      let(:params) { { grouped_types: %w(reblog) } }
+
+      it 'returns everything, but does not group favourites' do
+        subject
+
+        expect(response).to have_http_status(200)
+        expect(body_as_json[:notification_groups]).to contain_exactly(
+          a_hash_including(
+            type: 'reblog',
+            sample_account_ids: [bob.account_id.to_s]
+          ),
+          a_hash_including(
+            type: 'mention',
+            sample_account_ids: [bob.account_id.to_s]
+          ),
+          a_hash_including(
+            type: 'favourite',
+            sample_account_ids: [bob.account_id.to_s]
+          ),
+          a_hash_including(
+            type: 'favourite',
+            sample_account_ids: [tom.account_id.to_s]
+          ),
+          a_hash_including(
+            type: 'follow',
+            sample_account_ids: [bob.account_id.to_s]
+          )
+        )
+      end
+    end
+
     context 'with exclude_types param' do
       let(:params) { { exclude_types: %w(mention) } }
 

From b0a30967d7f2a53aeaa3d3a630b0e012e5254231 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 30 Aug 2024 09:05:39 +0200
Subject: [PATCH 2006/2191] Update dependency thor to v1.3.2 (#31654)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 78fd21b4e8dea1..8c43ef054adf85 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -834,7 +834,7 @@ GEM
     terrapin (1.0.1)
       climate_control
     test-prof (1.4.1)
-    thor (1.3.1)
+    thor (1.3.2)
     tilt (2.3.0)
     timeout (0.4.1)
     tpm-key_attestation (0.12.0)

From 92eba9096b6a75b46befb5c271755a6167ac342c Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 30 Aug 2024 09:12:56 +0200
Subject: [PATCH 2007/2191] New Crowdin Translations (automated) (#31656)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/es-MX.json |  4 ++++
 app/javascript/mastodon/locales/es.json    |  4 ++++
 app/javascript/mastodon/locales/fr-CA.json |  5 +++++
 app/javascript/mastodon/locales/fr.json    |  5 +++++
 app/javascript/mastodon/locales/ja.json    | 14 +++++++++++++-
 app/javascript/mastodon/locales/ru.json    |  1 +
 app/javascript/mastodon/locales/ry.json    |  5 +++++
 config/locales/es.yml                      |  4 ++--
 config/locales/fr-CA.yml                   |  9 +++++++++
 config/locales/fr.yml                      |  9 +++++++++
 config/locales/ja.yml                      | 17 +++++++++++++++++
 11 files changed, 74 insertions(+), 3 deletions(-)

diff --git a/app/javascript/mastodon/locales/es-MX.json b/app/javascript/mastodon/locales/es-MX.json
index 35ea5ba59216d0..348300f7289d59 100644
--- a/app/javascript/mastodon/locales/es-MX.json
+++ b/app/javascript/mastodon/locales/es-MX.json
@@ -97,6 +97,8 @@
   "block_modal.title": "¿Bloquear usuario?",
   "block_modal.you_wont_see_mentions": "No verás publicaciones que los mencionen.",
   "boost_modal.combo": "Puedes hacer clic en {combo} para saltar este aviso la próxima vez",
+  "boost_modal.reblog": "¿Impulsar la publicación?",
+  "boost_modal.undo_reblog": "¿Dejar de impulsar la publicación?",
   "bundle_column_error.copy_stacktrace": "Copiar informe de error",
   "bundle_column_error.error.body": "La página solicitada no pudo ser renderizada. Podría deberse a un error en nuestro código o a un problema de compatibilidad con el navegador.",
   "bundle_column_error.error.title": "¡Oh, no!",
@@ -467,6 +469,7 @@
   "mute_modal.you_wont_see_mentions": "No verás publicaciones que los mencionen.",
   "mute_modal.you_wont_see_posts": "Todavía pueden ver tus publicaciones, pero tú no verás las de ellos.",
   "navigation_bar.about": "Acerca de",
+  "navigation_bar.administration": "Administración",
   "navigation_bar.advanced_interface": "Abrir en interfaz web avanzada",
   "navigation_bar.blocks": "Usuarios bloqueados",
   "navigation_bar.bookmarks": "Marcadores",
@@ -483,6 +486,7 @@
   "navigation_bar.follows_and_followers": "Siguiendo y seguidores",
   "navigation_bar.lists": "Listas",
   "navigation_bar.logout": "Cerrar sesión",
+  "navigation_bar.moderation": "Moderación",
   "navigation_bar.mutes": "Usuarios silenciados",
   "navigation_bar.opened_in_classic_interface": "Publicaciones, cuentas y otras páginas específicas se abren por defecto en la interfaz web clásica.",
   "navigation_bar.personal": "Personal",
diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json
index 718c1452166f2b..85b160d7a8fdbf 100644
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@@ -97,6 +97,8 @@
   "block_modal.title": "¿Bloquear usuario?",
   "block_modal.you_wont_see_mentions": "No verás mensajes que los mencionen.",
   "boost_modal.combo": "Puedes hacer clic en {combo} para saltar este aviso la próxima vez",
+  "boost_modal.reblog": "¿Impulsar la publicación?",
+  "boost_modal.undo_reblog": "¿Dejar de impulsar la publicación?",
   "bundle_column_error.copy_stacktrace": "Copiar informe de error",
   "bundle_column_error.error.body": "La página solicitada no pudo ser renderizada. Podría deberse a un error en nuestro código o a un problema de compatibilidad con el navegador.",
   "bundle_column_error.error.title": "¡Oh, no!",
@@ -467,6 +469,7 @@
   "mute_modal.you_wont_see_mentions": "No verás mensajes que los mencionen.",
   "mute_modal.you_wont_see_posts": "Todavía pueden ver tus publicaciones, pero tú no verás las suyas.",
   "navigation_bar.about": "Acerca de",
+  "navigation_bar.administration": "Administración",
   "navigation_bar.advanced_interface": "Abrir en la interfaz web avanzada",
   "navigation_bar.blocks": "Usuarios bloqueados",
   "navigation_bar.bookmarks": "Marcadores",
@@ -483,6 +486,7 @@
   "navigation_bar.follows_and_followers": "Siguiendo y seguidores",
   "navigation_bar.lists": "Listas",
   "navigation_bar.logout": "Cerrar sesión",
+  "navigation_bar.moderation": "Moderación",
   "navigation_bar.mutes": "Usuarios silenciados",
   "navigation_bar.opened_in_classic_interface": "Publicaciones, cuentas y otras páginas específicas se abren por defecto en la interfaz web clásica.",
   "navigation_bar.personal": "Personal",
diff --git a/app/javascript/mastodon/locales/fr-CA.json b/app/javascript/mastodon/locales/fr-CA.json
index 4327ccb366174c..c0a575637e8d7f 100644
--- a/app/javascript/mastodon/locales/fr-CA.json
+++ b/app/javascript/mastodon/locales/fr-CA.json
@@ -97,6 +97,7 @@
   "block_modal.you_wont_see_mentions": "Vous ne verrez pas les publications qui le mentionne.",
   "boost_modal.combo": "Vous pouvez appuyer sur {combo} pour sauter ceci la prochaine fois",
   "boost_modal.reblog": "Booster le message ?",
+  "boost_modal.undo_reblog": "Annuler le boost du message ?",
   "bundle_column_error.copy_stacktrace": "Copier le rapport d'erreur",
   "bundle_column_error.error.body": "La page demandée n'a pas pu être affichée. Cela pourrait être dû à un bogue dans notre code, ou à un problème de compatibilité avec le navigateur.",
   "bundle_column_error.error.title": "Oh non!",
@@ -351,8 +352,12 @@
   "hashtag.follow": "Suivre ce hashtag",
   "hashtag.unfollow": "Ne plus suivre ce hashtag",
   "hashtags.and_other": "…et {count, plural, other {# de plus}}",
+  "hints.profiles.followers_may_be_missing": "Les abonné·e·s à ce profil peuvent être manquant·e·s.",
+  "hints.profiles.follows_may_be_missing": "Les abonnements pour ce profil peuvent être manquants.",
+  "hints.profiles.posts_may_be_missing": "Certains messages de ce profil peuvent être manquants.",
   "hints.profiles.see_more_followers": "Afficher plus d'abonné·e·s sur {domain}",
   "hints.profiles.see_more_posts": "Voir plus de messages sur {domain}",
+  "hints.threads.replies_may_be_missing": "Les réponses provenant des autres serveurs pourraient être manquantes.",
   "hints.threads.see_more": "Afficher plus de réponses sur {domain}",
   "home.column_settings.show_reblogs": "Afficher boosts",
   "home.column_settings.show_replies": "Afficher réponses",
diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json
index e38f5b33cea64b..ed3533719e8e96 100644
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@@ -97,6 +97,7 @@
   "block_modal.you_wont_see_mentions": "Vous ne verrez pas les publications qui le mentionne.",
   "boost_modal.combo": "Vous pouvez appuyer sur {combo} pour passer ceci la prochaine fois",
   "boost_modal.reblog": "Booster le message ?",
+  "boost_modal.undo_reblog": "Annuler le boost du message ?",
   "bundle_column_error.copy_stacktrace": "Copier le rapport d'erreur",
   "bundle_column_error.error.body": "La page demandée n'a pas pu être affichée. Cela peut être dû à un bogue dans notre code, ou à un problème de compatibilité avec le navigateur.",
   "bundle_column_error.error.title": "Oh non !",
@@ -351,8 +352,12 @@
   "hashtag.follow": "Suivre le hashtag",
   "hashtag.unfollow": "Ne plus suivre le hashtag",
   "hashtags.and_other": "…et {count, plural, other {# de plus}}",
+  "hints.profiles.followers_may_be_missing": "Les abonné·e·s à ce profil peuvent être manquant·e·s.",
+  "hints.profiles.follows_may_be_missing": "Les abonnements pour ce profil peuvent être manquants.",
+  "hints.profiles.posts_may_be_missing": "Certains messages de ce profil peuvent être manquants.",
   "hints.profiles.see_more_followers": "Afficher plus d'abonné·e·s sur {domain}",
   "hints.profiles.see_more_posts": "Voir plus de messages sur {domain}",
+  "hints.threads.replies_may_be_missing": "Les réponses provenant des autres serveurs pourraient être manquantes.",
   "hints.threads.see_more": "Afficher plus de réponses sur {domain}",
   "home.column_settings.show_reblogs": "Afficher les partages",
   "home.column_settings.show_replies": "Afficher les réponses",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index 86ba4ad64d9c73..f24b54aa48bd2e 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -97,6 +97,8 @@
   "block_modal.title": "ユーザーをブロックしますか？",
   "block_modal.you_wont_see_mentions": "宛先に相手が入っている投稿も閲覧できなくなります。",
   "boost_modal.combo": "次からは{combo}を押せばスキップできます",
+  "boost_modal.reblog": "ブーストしますか？",
+  "boost_modal.undo_reblog": "ブーストを解除しますか？",
   "bundle_column_error.copy_stacktrace": "エラーレポートをコピー",
   "bundle_column_error.error.body": "要求されたページをレンダリングできませんでした。コードのバグ、またはブラウザの互換性の問題が原因である可能性があります。",
   "bundle_column_error.error.title": "おっと！",
@@ -498,9 +500,18 @@
   "notification.admin.report_statuses": "{name}さんが{target}さんを「{category}」として通報しました",
   "notification.admin.report_statuses_other": "{name}さんが{target}さんを通報しました",
   "notification.admin.sign_up": "{name}さんがサインアップしました",
+  "notification.admin.sign_up.name_and_others": "{name}さんほか{count, plural, other {#人}}がサインアップしました",
   "notification.favourite": "{name}さんがお気に入りしました",
+  "notification.favourite.name_and_others_with_link": "{name}さん<a>ほか{count, plural, other {#人}}</a>がお気に入りしました",
   "notification.follow": "{name}さんにフォローされました",
+  "notification.follow.name_and_others": "{name}さんほか{count, plural, other {#人}}にフォローされました",
   "notification.follow_request": "{name}さんがあなたにフォローリクエストしました",
+  "notification.follow_request.name_and_others": "{name}さんほか{count, plural, other {#人}}があなたにフォローリクエストしました",
+  "notification.label.mention": "メンション",
+  "notification.label.private_mention": "非公開の返信 (メンション)",
+  "notification.label.private_reply": "非公開の返信",
+  "notification.label.reply": "返信",
+  "notification.mention": "メンション",
   "notification.moderation-warning.learn_more": "さらに詳しく",
   "notification.moderation_warning": "管理者から警告が来ています",
   "notification.moderation_warning.action_delete_statuses": "あなたによるいくつかの投稿が削除されました。",
@@ -513,6 +524,7 @@
   "notification.own_poll": "アンケートが終了しました",
   "notification.poll": "投票したアンケートが終了しました",
   "notification.reblog": "{name}さんがあなたの投稿をブーストしました",
+  "notification.reblog.name_and_others_with_link": "{name}さん<a>ほか{count, plural, other {#人}}</a>にブーストされました",
   "notification.relationships_severance_event": "{name} との関係が失われました",
   "notification.relationships_severance_event.account_suspension": "{from} の管理者が {target} さんを停止したため、今後このユーザーとの交流や新しい投稿の受け取りができなくなりました。",
   "notification.relationships_severance_event.domain_block": "{from} の管理者が {target} をブロックしました。これにより{followersCount}フォロワーと{followingCount, plural, other {#フォロー}}が失われました。",
@@ -588,7 +600,7 @@
   "notifications.policy.filter_not_followers_title": "フォローされていないアカウントからの通知",
   "notifications.policy.filter_not_following_hint": "手動で通知を受け入れたアカウントは対象外です",
   "notifications.policy.filter_not_following_title": "フォローしていないアカウントからの通知",
-  "notifications.policy.filter_private_mentions_hint": "あなたがメンションした相手からの返信、およびフォローしているアカウントからの返信は対象外です",
+  "notifications.policy.filter_private_mentions_hint": "メンションした相手からの返信、およびフォローしているアカウントからの返信は対象外です",
   "notifications.policy.filter_private_mentions_title": "外部からの非公開の返信",
   "notifications.policy.title": "通知のフィルタリング",
   "notifications_permission_banner.enable": "デスクトップ通知を有効にする",
diff --git a/app/javascript/mastodon/locales/ru.json b/app/javascript/mastodon/locales/ru.json
index 94f82e422d3507..cd64e8b8e534b3 100644
--- a/app/javascript/mastodon/locales/ru.json
+++ b/app/javascript/mastodon/locales/ru.json
@@ -189,6 +189,7 @@
   "confirmations.unfollow.confirm": "Отписаться",
   "confirmations.unfollow.message": "Вы уверены, что хотите отписаться от {name}?",
   "confirmations.unfollow.title": "Отписаться?",
+  "content_warning.hide": "Скрыть пост",
   "conversation.delete": "Удалить беседу",
   "conversation.mark_as_read": "Отметить как прочитанное",
   "conversation.open": "Просмотр беседы",
diff --git a/app/javascript/mastodon/locales/ry.json b/app/javascript/mastodon/locales/ry.json
index b33b95fe51c04b..02d1c005cfb078 100644
--- a/app/javascript/mastodon/locales/ry.json
+++ b/app/javascript/mastodon/locales/ry.json
@@ -148,6 +148,11 @@
   "compose_form.publish_form": "Нова публикація",
   "compose_form.reply": "Удповідь",
   "compose_form.save_changes": "Усокотити",
+  "confirmations.logout.confirm": "Уйти гет",
+  "confirmations.logout.message": "Бизувні сьте ож хочете уйти?",
+  "confirmations.logout.title": "Уйти гет?",
+  "confirmations.mute.confirm": "Стишити",
+  "confirmations.reply.confirm": "Удповісти",
   "copypaste.copy_to_clipboard": "Копіровати у памнять",
   "directory.recently_active": "Недавно актівні",
   "disabled_account_banner.account_settings": "Штімованя акаунта",
diff --git a/config/locales/es.yml b/config/locales/es.yml
index dc52d8113d2e4c..0bbad767e33477 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -1091,7 +1091,7 @@ es:
       proceed_to_login_html: Ahora puedes proceder a %{login_link}.
       redirect_to_app_html: Serás redirigido a la aplicación <strong>%{app_name}</strong>. Si esto no sucede, prueba %{clicking_this_link} o regresa manualmente a la aplicación.
       registration_complete: "¡Has completado tu registro en %{domain}!"
-      welcome_title: "¡Bienvenido, %{name}!"
+      welcome_title: "¡Te damos la bienvenida, %{name}!"
       wrong_email_hint: Si esa dirección de correo electrónico no es correcta, puedes cambiarla en la configuración de la cuenta.
     delete_account: Borrar cuenta
     delete_account_html: Si desea eliminar su cuenta, puede <a href="%{path}">proceder aquí</a>. Será pedido de una confirmación.
@@ -1913,7 +1913,7 @@ es:
       follow_action: Seguir
       follow_step: Seguir a personas interesantes es de lo que trata Mastodon.
       follow_title: Personaliza tu línea de inicio
-      follows_subtitle: Seguir cuentas conocidas
+      follows_subtitle: Sigue a cuentas conocidas
       follows_title: A quién seguir
       follows_view_more: Ver más personas para seguir
       hashtags_recent_count:
diff --git a/config/locales/fr-CA.yml b/config/locales/fr-CA.yml
index 52b3515725f22b..c38435c7fb523b 100644
--- a/config/locales/fr-CA.yml
+++ b/config/locales/fr-CA.yml
@@ -31,6 +31,7 @@ fr-CA:
       created_msg: Note de modération créée avec succès !
       destroyed_msg: Note de modération supprimée avec succès !
     accounts:
+      add_email_domain_block: Bloquer le domaine de messagerie
       approve: Approuver
       approved_msg: La demande d’inscription de %{username} a été approuvée avec succès
       are_you_sure: Voulez-vous vraiment faire ça ?
@@ -860,6 +861,14 @@ fr-CA:
         action: Pour plus d'informations, cliquez ici
         message_html: "<strong>Votre serveur web est mal configuré. La confidentialité de vos utilisateurs est en péril.</strong>"
     tags:
+      moderation:
+        not_usable: Non utilisable
+        pending_review: En attente de traitement
+        review_requested: Révision requise
+        reviewed: Traité
+        title: État
+        unreviewed: Non traité
+        usable: Utilisable
       name: Nom
       newest: Plus récents
       oldest: Plus anciens
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index d7830bfe339b2e..42554aeb39e96a 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -31,6 +31,7 @@ fr:
       created_msg: Note de modération créée avec succès !
       destroyed_msg: Note de modération supprimée avec succès !
     accounts:
+      add_email_domain_block: Bloquer le domaine de messagerie
       approve: Approuver
       approved_msg: La demande d’inscription de %{username} a été approuvée avec succès
       are_you_sure: Voulez-vous vraiment faire ça ?
@@ -860,6 +861,14 @@ fr:
         action: Pour plus d'informations, cliquez ici
         message_html: "<strong>Votre serveur web est mal configuré. La confidentialité de vos utilisateurs est en péril.</strong>"
     tags:
+      moderation:
+        not_usable: Non utilisable
+        pending_review: En attente de traitement
+        review_requested: Révision requise
+        reviewed: Traité
+        title: État
+        unreviewed: Non traité
+        usable: Utilisable
       name: Nom
       newest: Plus récents
       oldest: Plus anciens
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index a6b4822c58623c..ec7216b0015f2e 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -404,6 +404,7 @@ ja:
       allow_registrations_with_approval: 承認制での新規登録を可能にする
       attempts_over_week:
         other: 先週は%{count}回サインアップが試みられました
+      created_msg: メールドメインブロックを追加しました
       delete: 消去
       dns:
         types:
@@ -412,8 +413,12 @@ ja:
       new:
         create: ドメインを追加
         resolve: ドメイン解決
+        title: 新規メールドメインブロック
+      no_email_domain_block_selected: 変更対象のメールドメインブロックを選択してください
       not_permitted: 権限がありません
+      resolved_dns_records_hint_html: 入力されたドメイン名のMXレコードから以下のドメインが解決されました。MXレコードが指すドメインはメールの送受信において重要な役割をもっています。MXレコードのドメインをブロックすると、見た目のドメインが異なるメールアドレスからの登録であっても、そのドメイン名から解決されるMXレコードのドメインが同じ場合はブロックの対象になります。<strong>大手のメールプロバイダをブロックしないように注意してください。</strong>
       resolved_through_html: "%{domain}を通して解決しました"
+      title: メールドメインブロック
     export_domain_allows:
       new:
         title: ドメイン許可をインポート
@@ -900,6 +905,7 @@ ja:
         usage_comparison: 今日は%{today}回、昨日は%{yesterday}回使用されました。
         used_by_over_week:
           other: 週間%{count}人に使用されました
+      title: おすすめとトレンド
       trending: トレンド
     warning_presets:
       add_new: 追加
@@ -1340,6 +1346,16 @@ ja:
     unsubscribe:
       action: 購読を解除する
       complete: 購読を解除しました
+      confirmation_html: Mastodon (%{domain}) による %{email} 宛の「%{type}」の配信を停止します。再度必要になった場合は<a href="%{settings_path}">メール通知の設定</a>からいつでも再開できます。
+      emails:
+        notification_emails:
+          favourite: お気に入りの通知メール
+          follow: フォローの通知メール
+          follow_request: フォローリクエストの通知メール
+          mention: 返信の通知メール
+          reblog: ブーストの通知メール
+      resubscribe_html: 誤って解除した場合は<a href="%{settings_path}">メール通知の設定</a>から再購読できます。
+      success_html: Mastodon (%{domain}) から %{email} への「%{type}」の配信が停止されました。
       title: 購読の解除
   media_attachments:
     validations:
@@ -1578,6 +1594,7 @@ ja:
     import: データのインポート
     import_and_export: インポート・エクスポート
     migrate: アカウントの引っ越し
+    notifications: メール通知
     preferences: ユーザー設定
     profile: プロフィール
     relationships: フォロー・フォロワー

From 1ee1c329cc12fa7a167eb312d6c91693f56327d9 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 30 Aug 2024 03:15:28 -0400
Subject: [PATCH 2008/2191] Convert `admin/announcements` controller spec to
 system spec (#31655)

---
 .../announcements/_announcement.html.haml     |   2 +-
 .../admin/announcements_controller_spec.rb    | 102 -------------
 spec/system/admin/announcements_spec.rb       | 134 ++++++++++++++++++
 3 files changed, 135 insertions(+), 103 deletions(-)
 delete mode 100644 spec/controllers/admin/announcements_controller_spec.rb
 create mode 100644 spec/system/admin/announcements_spec.rb

diff --git a/app/views/admin/announcements/_announcement.html.haml b/app/views/admin/announcements/_announcement.html.haml
index eac78efb2889b6..8190f87d2f6b23 100644
--- a/app/views/admin/announcements/_announcement.html.haml
+++ b/app/views/admin/announcements/_announcement.html.haml
@@ -1,4 +1,4 @@
-.announcements-list__item
+.announcements-list__item{ id: dom_id(announcement) }
   = link_to edit_admin_announcement_path(announcement), class: 'announcements-list__item__title' do
     = truncate(announcement.text)
 
diff --git a/spec/controllers/admin/announcements_controller_spec.rb b/spec/controllers/admin/announcements_controller_spec.rb
deleted file mode 100644
index c2d3135d92c5b9..00000000000000
--- a/spec/controllers/admin/announcements_controller_spec.rb
+++ /dev/null
@@ -1,102 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe Admin::AnnouncementsController do
-  render_views
-
-  let(:user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
-
-  before do
-    sign_in user, scope: :user
-  end
-
-  describe 'GET #index' do
-    it 'returns http success' do
-      get :index
-
-      expect(response).to have_http_status(:success)
-    end
-  end
-
-  describe 'GET #new' do
-    it 'returns http success and renders new' do
-      get :new
-
-      expect(response).to have_http_status(:success)
-      expect(response).to render_template(:new)
-    end
-  end
-
-  describe 'GET #edit' do
-    let(:announcement) { Fabricate(:announcement) }
-
-    it 'returns http success and renders edit' do
-      get :edit, params: { id: announcement.id }
-
-      expect(response).to have_http_status(:success)
-      expect(response).to render_template(:edit)
-    end
-  end
-
-  describe 'POST #create' do
-    it 'creates a new announcement and redirects' do
-      expect do
-        post :create, params: { announcement: { text: 'The announcement message.' } }
-      end.to change(Announcement, :count).by(1)
-
-      expect(response).to redirect_to(admin_announcements_path)
-      expect(flash.notice).to match(I18n.t('admin.announcements.published_msg'))
-    end
-  end
-
-  describe 'PUT #update' do
-    let(:announcement) { Fabricate(:announcement, text: 'Original text') }
-
-    it 'updates an announcement and redirects' do
-      put :update, params: { id: announcement.id, announcement: { text: 'Updated text.' } }
-
-      expect(response).to redirect_to(admin_announcements_path)
-      expect(flash.notice).to match(I18n.t('admin.announcements.updated_msg'))
-    end
-  end
-
-  describe 'DELETE #destroy' do
-    let!(:announcement) { Fabricate(:announcement, text: 'Original text') }
-
-    it 'destroys an announcement and redirects' do
-      expect do
-        delete :destroy, params: { id: announcement.id }
-      end.to change(Announcement, :count).by(-1)
-
-      expect(response).to redirect_to(admin_announcements_path)
-      expect(flash.notice).to match(I18n.t('admin.announcements.destroyed_msg'))
-    end
-  end
-
-  describe 'POST #publish' do
-    subject { post :publish, params: { id: announcement.id } }
-
-    let(:announcement) { Fabricate(:announcement, published_at: nil) }
-
-    it 'marks announcement published' do
-      subject
-
-      expect(announcement.reload).to be_published
-      expect(response).to redirect_to admin_announcements_path
-    end
-  end
-
-  describe 'POST #unpublish' do
-    subject { post :unpublish, params: { id: announcement.id } }
-
-    let(:announcement) { Fabricate(:announcement, published_at: 4.days.ago) }
-
-    it 'marks announcement as not published' do
-      subject
-
-      expect(announcement.reload).to_not be_published
-      expect(response).to redirect_to admin_announcements_path
-    end
-  end
-end
diff --git a/spec/system/admin/announcements_spec.rb b/spec/system/admin/announcements_spec.rb
new file mode 100644
index 00000000000000..5c4e5d3e6ab429
--- /dev/null
+++ b/spec/system/admin/announcements_spec.rb
@@ -0,0 +1,134 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'Admin::Announcements' do
+  include ActionView::RecordIdentifier
+
+  describe 'Viewing announcements' do
+    it 'can view a list of existing announcements' do
+      announcement = Fabricate :announcement, text: 'Test Announcement'
+      sign_in admin_user
+      visit admin_announcements_path
+
+      within css_id(announcement) do
+        expect(page)
+          .to have_content(announcement.text)
+      end
+    end
+  end
+
+  describe 'Creating announcements' do
+    it 'create a new announcement' do
+      sign_in admin_user
+      visit new_admin_announcement_path
+
+      fill_in text_label,
+              with: 'Announcement text'
+
+      expect { submit_form }
+        .to change(Announcement, :count).by(1)
+      expect(page)
+        .to have_content(I18n.t('admin.announcements.published_msg'))
+    end
+  end
+
+  describe 'Updating announcements' do
+    it 'updates an existing announcement' do
+      announcement = Fabricate :announcement, text: 'Test Announcement'
+      sign_in admin_user
+      visit admin_announcements_path
+
+      within css_id(announcement) do
+        click_on announcement.text
+      end
+
+      fill_in text_label,
+              with: 'Announcement text'
+      save_changes
+
+      expect(page)
+        .to have_content(I18n.t('admin.announcements.updated_msg'))
+    end
+  end
+
+  describe 'Deleting announcements' do
+    it 'deletes an existing announcement' do
+      announcement = Fabricate :announcement, text: 'Test Announcement'
+      sign_in admin_user
+      visit admin_announcements_path
+
+      expect { delete_announcement(announcement) }
+        .to change(Announcement, :count).by(-1)
+
+      expect(page)
+        .to have_content(I18n.t('admin.announcements.destroyed_msg'))
+    end
+  end
+
+  describe 'Publishing announcements' do
+    it 'publishes an existing announcement' do
+      announcement = Fabricate :announcement, published: false, scheduled_at: 10.days.from_now
+      sign_in admin_user
+      visit admin_announcements_path
+
+      expect { publish_announcement(announcement) }
+        .to change { announcement.reload.published? }.to(true)
+
+      expect(page)
+        .to have_content(I18n.t('admin.announcements.published_msg'))
+    end
+
+    it 'unpublishes an existing announcement' do
+      announcement = Fabricate :announcement, published: true
+      sign_in admin_user
+      visit admin_announcements_path
+
+      expect { unpublish_announcement(announcement) }
+        .to change { announcement.reload.published? }.to(false)
+
+      expect(page)
+        .to have_content(I18n.t('admin.announcements.unpublished_msg'))
+    end
+  end
+
+  private
+
+  def css_id(record)
+    "##{dom_id(record)}" # TODO: Extract to system spec helper?
+  end
+
+  def publish_announcement(announcement)
+    within css_id(announcement) do
+      click_on I18n.t('admin.announcements.publish')
+    end
+  end
+
+  def unpublish_announcement(announcement)
+    within css_id(announcement) do
+      click_on I18n.t('admin.announcements.unpublish')
+    end
+  end
+
+  def delete_announcement(announcement)
+    within css_id(announcement) do
+      click_on I18n.t('generic.delete')
+    end
+  end
+
+  def save_changes
+    click_on I18n.t('generic.save_changes')
+  end
+
+  def submit_form
+    click_on I18n.t('admin.announcements.new.create')
+  end
+
+  def text_label
+    I18n.t('simple_form.labels.announcement.text')
+  end
+
+  def admin_user
+    Fabricate(:user, role: UserRole.find_by(name: 'Admin'))
+  end
+end

From 35538fe694765d0fa20bb85047680704f85be795 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 30 Aug 2024 11:37:39 +0200
Subject: [PATCH 2009/2191] Fix inconsistencies between code and notification
 source translation strings (#31658)

---
 .../features/notifications/components/notification.jsx    | 8 ++++----
 .../components/notification_favourite.tsx                 | 2 +-
 .../notifications_v2/components/notification_reblog.tsx   | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/javascript/mastodon/features/notifications/components/notification.jsx b/app/javascript/mastodon/features/notifications/components/notification.jsx
index f1eada13595f82..7e3a860e3ec4c3 100644
--- a/app/javascript/mastodon/features/notifications/components/notification.jsx
+++ b/app/javascript/mastodon/features/notifications/components/notification.jsx
@@ -31,11 +31,11 @@ import { RelationshipsSeveranceEvent } from './relationships_severance_event';
 import Report from './report';
 
 const messages = defineMessages({
-  favourite: { id: 'notification.favourite', defaultMessage: '{name} favorited your status' },
+  favourite: { id: 'notification.favourite', defaultMessage: '{name} favorited your post' },
   follow: { id: 'notification.follow', defaultMessage: '{name} followed you' },
   ownPoll: { id: 'notification.own_poll', defaultMessage: 'Your poll has ended' },
   poll: { id: 'notification.poll', defaultMessage: 'A poll you voted in has ended' },
-  reblog: { id: 'notification.reblog', defaultMessage: '{name} boosted your status' },
+  reblog: { id: 'notification.reblog', defaultMessage: '{name} boosted your post' },
   status: { id: 'notification.status', defaultMessage: '{name} just posted' },
   update: { id: 'notification.update', defaultMessage: '{name} edited a post' },
   adminSignUp: { id: 'notification.admin.sign_up', defaultMessage: '{name} signed up' },
@@ -201,7 +201,7 @@ class Notification extends ImmutablePureComponent {
             <Icon id='star' icon={StarIcon} className='star-icon' />
 
             <span title={notification.get('created_at')}>
-              <FormattedMessage id='notification.favourite' defaultMessage='{name} favorited your status' values={{ name: link }} />
+              <FormattedMessage id='notification.favourite' defaultMessage='{name} favorited your post' values={{ name: link }} />
             </span>
           </div>
 
@@ -231,7 +231,7 @@ class Notification extends ImmutablePureComponent {
             <Icon id='retweet' icon={RepeatIcon} />
 
             <span title={notification.get('created_at')}>
-              <FormattedMessage id='notification.reblog' defaultMessage='{name} boosted your status' values={{ name: link }} />
+              <FormattedMessage id='notification.reblog' defaultMessage='{name} boosted your post' values={{ name: link }} />
             </span>
           </div>
 
diff --git a/app/javascript/mastodon/features/notifications_v2/components/notification_favourite.tsx b/app/javascript/mastodon/features/notifications_v2/components/notification_favourite.tsx
index eba37fe9371c44..49866540e536ee 100644
--- a/app/javascript/mastodon/features/notifications_v2/components/notification_favourite.tsx
+++ b/app/javascript/mastodon/features/notifications_v2/components/notification_favourite.tsx
@@ -14,7 +14,7 @@ const labelRenderer: LabelRenderer = (displayedName, total, seeMoreHref) => {
     return (
       <FormattedMessage
         id='notification.favourite'
-        defaultMessage='{name} favorited your status'
+        defaultMessage='{name} favorited your post'
         values={{ name: displayedName }}
       />
     );
diff --git a/app/javascript/mastodon/features/notifications_v2/components/notification_reblog.tsx b/app/javascript/mastodon/features/notifications_v2/components/notification_reblog.tsx
index 7b3bda85e57e46..36a798032bffd5 100644
--- a/app/javascript/mastodon/features/notifications_v2/components/notification_reblog.tsx
+++ b/app/javascript/mastodon/features/notifications_v2/components/notification_reblog.tsx
@@ -14,7 +14,7 @@ const labelRenderer: LabelRenderer = (displayedName, total, seeMoreHref) => {
     return (
       <FormattedMessage
         id='notification.reblog'
-        defaultMessage='{name} boosted your status'
+        defaultMessage='{name} boosted your post'
         values={{ name: displayedName }}
       />
     );

From 3ddeaca863999270719752aff49d55d73ae5f412 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 30 Aug 2024 11:42:48 +0200
Subject: [PATCH 2010/2191] Change background color of notifications on private
 messages (#31657)

---
 .../components/notification_group_with_status.tsx     | 11 +++++++++--
 app/javascript/styles/mastodon/components.scss        |  3 ++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/app/javascript/mastodon/features/notifications_v2/components/notification_group_with_status.tsx b/app/javascript/mastodon/features/notifications_v2/components/notification_group_with_status.tsx
index 343a9bc4c1ae2e..91f8ae2d401bdc 100644
--- a/app/javascript/mastodon/features/notifications_v2/components/notification_group_with_status.tsx
+++ b/app/javascript/mastodon/features/notifications_v2/components/notification_group_with_status.tsx
@@ -9,7 +9,7 @@ import { navigateToStatus } from 'mastodon/actions/statuses';
 import type { IconProp } from 'mastodon/components/icon';
 import { Icon } from 'mastodon/components/icon';
 import { RelativeTimestamp } from 'mastodon/components/relative_timestamp';
-import { useAppDispatch } from 'mastodon/store';
+import { useAppSelector, useAppDispatch } from 'mastodon/store';
 
 import { AvatarGroup } from './avatar_group';
 import { DisplayedName } from './displayed_name';
@@ -60,6 +60,10 @@ export const NotificationGroupWithStatus: React.FC<{
     [labelRenderer, accountIds, count, labelSeeMoreHref],
   );
 
+  const isPrivateMention = useAppSelector(
+    (state) => state.statuses.getIn([statusId, 'visibility']) === 'direct',
+  );
+
   const handlers = useMemo(
     () => ({
       open: () => {
@@ -79,7 +83,10 @@ export const NotificationGroupWithStatus: React.FC<{
         role='button'
         className={classNames(
           `notification-group focusable notification-group--${type}`,
-          { 'notification-group--unread': unread },
+          {
+            'notification-group--unread': unread,
+            'notification-group--direct': isPrivateMention,
+          },
         )}
         tabIndex={0}
       >
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 0b0cbbfa84fc49..208cdd6768c3f4 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -1626,7 +1626,8 @@ body > [data-popper-placement] {
 }
 
 .status__wrapper-direct,
-.notification-ungrouped--direct {
+.notification-ungrouped--direct,
+.notification-group--direct {
   background: rgba($ui-highlight-color, 0.05);
 
   &:focus {

From 85e8d1f2859742c3f455ed6b70ba06b4ee86d249 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 30 Aug 2024 05:46:09 -0400
Subject: [PATCH 2011/2191] Use rails configuration storage for paperclip path
 (#31651)

---
 config/initializers/paperclip.rb | 3 ++-
 lib/mastodon/cli/media.rb        | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/config/initializers/paperclip.rb b/config/initializers/paperclip.rb
index 6b14985ae3050e..ed16d50a76d7a3 100644
--- a/config/initializers/paperclip.rb
+++ b/config/initializers/paperclip.rb
@@ -160,9 +160,10 @@ def copy_to_local_file(style, local_dest_path)
     )
   end
 else
+  Rails.configuration.x.file_storage_root_path = ENV.fetch('PAPERCLIP_ROOT_PATH', File.join(':rails_root', 'public', 'system'))
   Paperclip::Attachment.default_options.merge!(
     storage: :filesystem,
-    path: File.join(ENV.fetch('PAPERCLIP_ROOT_PATH', File.join(':rails_root', 'public', 'system')), ':prefix_path:class', ':attachment', ':id_partition', ':style', ':filename'),
+    path: File.join(Rails.configuration.x.file_storage_root_path, ':prefix_path:class', ':attachment', ':id_partition', ':style', ':filename'),
     url: ENV.fetch('PAPERCLIP_ROOT_URL', '/system') + "/#{PATH}"
   )
 end
diff --git a/lib/mastodon/cli/media.rb b/lib/mastodon/cli/media.rb
index 123973d1954f98..70c11ee1a15b94 100644
--- a/lib/mastodon/cli/media.rb
+++ b/lib/mastodon/cli/media.rb
@@ -157,7 +157,7 @@ def remove_orphans
       when :filesystem
         require 'find'
 
-        root_path = ENV.fetch('PAPERCLIP_ROOT_PATH', File.join(':rails_root', 'public', 'system')).gsub(':rails_root', Rails.root.to_s)
+        root_path = Rails.configuration.x.file_storage_root_path.gsub(':rails_root', Rails.root.to_s)
 
         Find.find(File.join(*[root_path, prefix].compact)) do |path|
           next if File.directory?(path)

From 3655e3204fbf70d14ce60e4aa67a331e63668e62 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 30 Aug 2024 09:46:53 +0000
Subject: [PATCH 2012/2191] Update dependency @babel/runtime to v7.25.6
 (#31649)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index b5c44fd30699c0..5596ed536df790 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1487,11 +1487,11 @@ __metadata:
   linkType: hard
 
 "@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.0, @babel/runtime@npm:^7.12.13, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.13.8, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.2.0, @babel/runtime@npm:^7.20.13, @babel/runtime@npm:^7.22.3, @babel/runtime@npm:^7.3.1, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.6.3, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.8.7, @babel/runtime@npm:^7.9.2":
-  version: 7.25.4
-  resolution: "@babel/runtime@npm:7.25.4"
+  version: 7.25.6
+  resolution: "@babel/runtime@npm:7.25.6"
   dependencies:
     regenerator-runtime: "npm:^0.14.0"
-  checksum: 10c0/33e937e685f0bfc2d40c219261e2e50d0df7381a6e7cbf56b770e0c5d77cb0c21bf4d97da566cf0164317ed7508e992082c7b6cce7aaa3b17da5794f93fbfb46
+  checksum: 10c0/d6143adf5aa1ce79ed374e33fdfd74fa975055a80bc6e479672ab1eadc4e4bfd7484444e17dd063a1d180e051f3ec62b357c7a2b817e7657687b47313158c3d2
   languageName: node
   linkType: hard
 

From 02633d6ebbe944a8769c8f2229fa9e0d6c7d1142 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 30 Aug 2024 09:48:54 +0000
Subject: [PATCH 2013/2191] Update dependency jsdom to v25 (#31578)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 streaming/package.json |  2 +-
 yarn.lock              | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/streaming/package.json b/streaming/package.json
index 444d9483e4edfd..64947749a17ad8 100644
--- a/streaming/package.json
+++ b/streaming/package.json
@@ -21,7 +21,7 @@
     "dotenv": "^16.0.3",
     "express": "^4.18.2",
     "ioredis": "^5.3.2",
-    "jsdom": "^24.0.0",
+    "jsdom": "^25.0.0",
     "pg": "^8.5.0",
     "pg-connection-string": "^2.6.0",
     "pino": "^9.0.0",
diff --git a/yarn.lock b/yarn.lock
index 5596ed536df790..49373fb3cab18b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2926,7 +2926,7 @@ __metadata:
     eslint-define-config: "npm:^2.0.0"
     express: "npm:^4.18.2"
     ioredis: "npm:^5.3.2"
-    jsdom: "npm:^24.0.0"
+    jsdom: "npm:^25.0.0"
     pg: "npm:^8.5.0"
     pg-connection-string: "npm:^2.6.0"
     pino: "npm:^9.0.0"
@@ -11060,9 +11060,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jsdom@npm:^24.0.0":
-  version: 24.1.3
-  resolution: "jsdom@npm:24.1.3"
+"jsdom@npm:^25.0.0":
+  version: 25.0.0
+  resolution: "jsdom@npm:25.0.0"
   dependencies:
     cssstyle: "npm:^4.0.1"
     data-urls: "npm:^5.0.0"
@@ -11090,7 +11090,7 @@ __metadata:
   peerDependenciesMeta:
     canvas:
       optional: true
-  checksum: 10c0/e48b342afacd7418a23dac204a62deea729c50f4d072a7c04c09fd32355fdb4335f8779fa79fd0277a2dbeb2d356250a950955719d00047324b251233b11277f
+  checksum: 10c0/1552bcfb816b2c69ae159ba0cd79e8964030c106cc0cb2deb20a64c1ca54e1ea41352b9802d89b7cf823e43e6d74ed7289abff4aacc95b1b2bc936570aab3594
   languageName: node
   linkType: hard
 

From fbbd08b72722c1bcc157aede423d2a4b3249b2b0 Mon Sep 17 00:00:00 2001
From: Jeremy Kescher <jeremy@kescher.at>
Date: Sat, 31 Aug 2024 13:09:14 +0200
Subject: [PATCH 2014/2191] Add changelog for unreleased version

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 565634ff7104b8..50c45716b5cf84 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@ All changes to Catstodon that aren't Mastodon or glitch-soc Mastodon changes wil
 
 All release dates, as well as most other dates, are intended to be read as "within the day, in UTC time."
 
+## [Unreleased] - Unreleased
+
+- Upstream changes
+
 ## [4.3.0-beta.1+cat.1.0.0] - 2024-08-26
 
 - Upstream (glitch-soc) changes

From c0382b144601c054c0c1dfa0766307723e569d0a Mon Sep 17 00:00:00 2001
From: Jeremy Kescher <jeremy@kescher.at>
Date: Sat, 31 Aug 2024 13:12:03 +0200
Subject: [PATCH 2015/2191] Mark nightly version

---
 lib/mastodon/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index 42c8b9ea1aa425..7028a00431c78f 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -25,7 +25,7 @@ def prerelease
     end
 
     def catstodon_revision
-      '1.0.0'
+      '1.0.0+nightly'
     end
 
     def build_metadata

From 4f1da814a873608f8dd5d14ff7ec011c80876013 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 30 Aug 2024 11:37:39 +0200
Subject: [PATCH 2016/2191] [Glitch] Fix inconsistencies between code and
 notification source translation strings

Port 35538fe694765d0fa20bb85047680704f85be795 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/components/status_prepend.jsx  | 4 ++--
 .../notifications_v2/components/notification_favourite.tsx    | 2 +-
 .../notifications_v2/components/notification_reblog.tsx       | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/javascript/flavours/glitch/components/status_prepend.jsx b/app/javascript/flavours/glitch/components/status_prepend.jsx
index 0777ffcda6ec15..4756b366964093 100644
--- a/app/javascript/flavours/glitch/components/status_prepend.jsx
+++ b/app/javascript/flavours/glitch/components/status_prepend.jsx
@@ -66,7 +66,7 @@ export default class StatusPrepend extends PureComponent {
       return (
         <FormattedMessage
           id='notification.favourite'
-          defaultMessage='{name} favorited your status'
+          defaultMessage='{name} favorited your post'
           values={{ name : link }}
         />
       );
@@ -74,7 +74,7 @@ export default class StatusPrepend extends PureComponent {
       return (
         <FormattedMessage
           id='notification.reblog'
-          defaultMessage='{name} boosted your status'
+          defaultMessage='{name} boosted your post'
           values={{ name : link }}
         />
       );
diff --git a/app/javascript/flavours/glitch/features/notifications_v2/components/notification_favourite.tsx b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_favourite.tsx
index ad01f622f63451..e2aae3c8e6d9cb 100644
--- a/app/javascript/flavours/glitch/features/notifications_v2/components/notification_favourite.tsx
+++ b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_favourite.tsx
@@ -14,7 +14,7 @@ const labelRenderer: LabelRenderer = (displayedName, total, seeMoreHref) => {
     return (
       <FormattedMessage
         id='notification.favourite'
-        defaultMessage='{name} favorited your status'
+        defaultMessage='{name} favorited your post'
         values={{ name: displayedName }}
       />
     );
diff --git a/app/javascript/flavours/glitch/features/notifications_v2/components/notification_reblog.tsx b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_reblog.tsx
index 1029bae33c46ec..525037d095487f 100644
--- a/app/javascript/flavours/glitch/features/notifications_v2/components/notification_reblog.tsx
+++ b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_reblog.tsx
@@ -14,7 +14,7 @@ const labelRenderer: LabelRenderer = (displayedName, total, seeMoreHref) => {
     return (
       <FormattedMessage
         id='notification.reblog'
-        defaultMessage='{name} boosted your status'
+        defaultMessage='{name} boosted your post'
         values={{ name: displayedName }}
       />
     );

From ee2c38fcb8141584644928ece32461768a59fba4 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 30 Aug 2024 11:42:48 +0200
Subject: [PATCH 2017/2191] [Glitch] Change background color of notifications
 on private messages

Port 3ddeaca863999270719752aff49d55d73ae5f412 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../components/notification_group_with_status.tsx     | 11 +++++++++--
 app/javascript/flavours/glitch/styles/components.scss |  3 ++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/app/javascript/flavours/glitch/features/notifications_v2/components/notification_group_with_status.tsx b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_group_with_status.tsx
index 233caaf65e6f8b..99045fa53b2b9f 100644
--- a/app/javascript/flavours/glitch/features/notifications_v2/components/notification_group_with_status.tsx
+++ b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_group_with_status.tsx
@@ -9,7 +9,7 @@ import { navigateToStatus } from 'flavours/glitch/actions/statuses';
 import type { IconProp } from 'flavours/glitch/components/icon';
 import { Icon } from 'flavours/glitch/components/icon';
 import { RelativeTimestamp } from 'flavours/glitch/components/relative_timestamp';
-import { useAppDispatch } from 'flavours/glitch/store';
+import { useAppSelector, useAppDispatch } from 'flavours/glitch/store';
 
 import { AvatarGroup } from './avatar_group';
 import { DisplayedName } from './displayed_name';
@@ -60,6 +60,10 @@ export const NotificationGroupWithStatus: React.FC<{
     [labelRenderer, accountIds, count, labelSeeMoreHref],
   );
 
+  const isPrivateMention = useAppSelector(
+    (state) => state.statuses.getIn([statusId, 'visibility']) === 'direct',
+  );
+
   const handlers = useMemo(
     () => ({
       open: () => {
@@ -79,7 +83,10 @@ export const NotificationGroupWithStatus: React.FC<{
         role='button'
         className={classNames(
           `notification-group focusable notification-group--${type}`,
-          { 'notification-group--unread': unread },
+          {
+            'notification-group--unread': unread,
+            'notification-group--direct': isPrivateMention,
+          },
         )}
         tabIndex={0}
       >
diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index 662607a7ca3dc4..ca841b5e47741d 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -1795,7 +1795,8 @@ body > [data-popper-placement] {
 }
 
 .status__wrapper-direct,
-.notification-ungrouped--direct {
+.notification-ungrouped--direct,
+.notification-group--direct {
   background: rgba($ui-highlight-color, 0.05);
 
   &:focus {

From 5f8f8cc98f5101db827ffd9e264ed32ba4b7bd85 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Sat, 31 Aug 2024 17:33:06 +0200
Subject: [PATCH 2018/2191] Fix crowdin upload workflow not running on
 glitch-soc (#2830)

---
 .github/workflows/crowdin-upload.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/crowdin-upload.yml b/.github/workflows/crowdin-upload.yml
index 5c20faf3bea17a..d07f661ace8b26 100644
--- a/.github/workflows/crowdin-upload.yml
+++ b/.github/workflows/crowdin-upload.yml
@@ -19,7 +19,7 @@ on:
 jobs:
   upload-translations:
     runs-on: ubuntu-latest
-    if: github.repository == 'mastodon/mastodon'
+    if: github.repository == 'glitch-soc/mastodon'
 
     steps:
       - name: Checkout

From b06907e4e4725cf28dc53d65e5e166a16e2b814c Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Sat, 31 Aug 2024 18:41:25 +0200
Subject: [PATCH 2019/2191] Rewrite favourite modal as a Typescript functional
 component, use revamped design (#2831)

---
 .../ui/components/favourite_modal.jsx         | 92 -------------------
 .../ui/components/favourite_modal.tsx         | 90 ++++++++++++++++++
 .../features/ui/components/modal_root.jsx     |  2 +-
 .../flavours/glitch/locales/en.json           |  2 +-
 4 files changed, 92 insertions(+), 94 deletions(-)
 delete mode 100644 app/javascript/flavours/glitch/features/ui/components/favourite_modal.jsx
 create mode 100644 app/javascript/flavours/glitch/features/ui/components/favourite_modal.tsx

diff --git a/app/javascript/flavours/glitch/features/ui/components/favourite_modal.jsx b/app/javascript/flavours/glitch/features/ui/components/favourite_modal.jsx
deleted file mode 100644
index 138f44f21c1fad..00000000000000
--- a/app/javascript/flavours/glitch/features/ui/components/favourite_modal.jsx
+++ /dev/null
@@ -1,92 +0,0 @@
-import PropTypes from 'prop-types';
-
-import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
-
-import classNames from 'classnames';
-import { withRouter } from 'react-router-dom';
-
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import ImmutablePureComponent from 'react-immutable-pure-component';
-
-import StarIcon from '@/material-icons/400-24px/star-fill.svg?react';
-import AttachmentList from 'flavours/glitch/components/attachment_list';
-import { Avatar } from 'flavours/glitch/components/avatar';
-import { Button } from 'flavours/glitch/components/button';
-import { DisplayName } from 'flavours/glitch/components/display_name';
-import { Icon } from 'flavours/glitch/components/icon';
-import { RelativeTimestamp } from 'flavours/glitch/components/relative_timestamp';
-import StatusContent from 'flavours/glitch/components/status_content';
-import { VisibilityIcon } from 'flavours/glitch/components/visibility_icon';
-import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router';
-
-const messages = defineMessages({
-  favourite: { id: 'status.favourite', defaultMessage: 'Favorite' },
-});
-
-class FavouriteModal extends ImmutablePureComponent {
-
-  static propTypes = {
-    status: ImmutablePropTypes.map.isRequired,
-    onFavourite: PropTypes.func.isRequired,
-    onClose: PropTypes.func.isRequired,
-    intl: PropTypes.object.isRequired,
-    ...WithRouterPropTypes,
-  };
-
-  handleFavourite = () => {
-    this.props.onFavourite(this.props.status);
-    this.props.onClose();
-  };
-
-  handleAccountClick = (e) => {
-    if (e.button === 0) {
-      e.preventDefault();
-      this.props.onClose();
-      this.props.history.push(`/@${this.props.status.getIn(['account', 'acct'])}`);
-    }
-  };
-
-  render () {
-    const { status, intl } = this.props;
-
-    return (
-      <div className='modal-root__modal boost-modal'>
-        <div className='boost-modal__container'>
-          <div className={classNames('status', `status-${status.get('visibility')}`, 'light')}>
-            <div className='status__info'>
-              <a href={status.get('url')} className='status__relative-time' target='_blank' rel='noopener noreferrer'>
-                <span className='status__visibility-icon'><VisibilityIcon visibility={status.get('visibility')} /></span>
-                <RelativeTimestamp timestamp={status.get('created_at')} />
-              </a>
-
-              <a onClick={this.handleAccountClick} href={status.getIn(['account', 'url'])} className='status__display-name'>
-                <div className='status__avatar'>
-                  <Avatar account={status.get('account')} size={48} />
-                </div>
-
-                <DisplayName account={status.get('account')} />
-              </a>
-            </div>
-
-            <StatusContent status={status} />
-
-            {status.get('media_attachments').size > 0 && (
-              <AttachmentList
-                compact
-                media={status.get('media_attachments')}
-              />
-            )}
-          </div>
-        </div>
-
-        <div className='boost-modal__action-bar'>
-          <div><FormattedMessage id='favourite_modal.combo' defaultMessage='You can press {combo} to skip this next time' values={{ combo: <span>Shift + <Icon id='star' icon={StarIcon} /></span> }} /></div>
-          <Button text={intl.formatMessage(messages.favourite)} onClick={this.handleFavourite} autoFocus />
-        </div>
-      </div>
-    );
-  }
-
-}
-
-export default withRouter(injectIntl(FavouriteModal));
diff --git a/app/javascript/flavours/glitch/features/ui/components/favourite_modal.tsx b/app/javascript/flavours/glitch/features/ui/components/favourite_modal.tsx
new file mode 100644
index 00000000000000..88d8bb91b89e1f
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/ui/components/favourite_modal.tsx
@@ -0,0 +1,90 @@
+import { useCallback } from 'react';
+
+import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
+
+import classNames from 'classnames';
+
+import StarIcon from '@/material-icons/400-24px/star.svg?react';
+import { Button } from 'flavours/glitch/components/button';
+import { Icon } from 'flavours/glitch/components/icon';
+import { EmbeddedStatus } from 'flavours/glitch/features/notifications_v2/components/embedded_status';
+import type { Status } from 'flavours/glitch/models/status';
+
+const messages = defineMessages({
+  favourite: { id: 'status.favourite', defaultMessage: 'Favorite' },
+});
+
+export const FavouriteModal: React.FC<{
+  status: Status;
+  onClose: () => void;
+  onFavourite: (status: Status) => void;
+}> = ({ status, onFavourite, onClose }) => {
+  const intl = useIntl();
+
+  const statusId = status.get('id') as string;
+
+  const handleFavourite = useCallback(() => {
+    onFavourite(status);
+    onClose();
+  }, [onClose, onFavourite, status]);
+
+  const handleCancel = useCallback(() => {
+    onClose();
+  }, [onClose]);
+
+  return (
+    <div className='modal-root__modal safety-action-modal'>
+      <div className='safety-action-modal__top'>
+        <div className='safety-action-modal__header'>
+          <div className='safety-action-modal__header__icon'>
+            <Icon icon={StarIcon} id='star' />
+          </div>
+
+          <div>
+            <h1>
+              <FormattedMessage
+                id='favourite_modal.favourite'
+                defaultMessage='Favourite post?'
+              />
+            </h1>
+            <div>
+              <FormattedMessage
+                id='boost_modal.combo'
+                defaultMessage='You can press {combo} to skip this next time'
+                values={{
+                  combo: (
+                    <span className='hotkey-combination'>
+                      <kbd>Shift</kbd>+<Icon id='star' icon={StarIcon} />
+                    </span>
+                  ),
+                }}
+              />
+            </div>
+          </div>
+        </div>
+
+        <div className='safety-action-modal__status'>
+          <EmbeddedStatus statusId={statusId} />
+        </div>
+      </div>
+
+      <div className={classNames('safety-action-modal__bottom')}>
+        <div className='safety-action-modal__actions'>
+          <div className='spacer' />
+
+          <button onClick={handleCancel} className='link-button'>
+            <FormattedMessage
+              id='confirmation_modal.cancel'
+              defaultMessage='Cancel'
+            />
+          </button>
+
+          <Button
+            onClick={handleFavourite}
+            text={intl.formatMessage(messages.favourite)}
+          />
+        </div>
+      </div>
+    </div>
+  );
+};
diff --git a/app/javascript/flavours/glitch/features/ui/components/modal_root.jsx b/app/javascript/flavours/glitch/features/ui/components/modal_root.jsx
index 64c6b52c31ec3d..83345905becb97 100644
--- a/app/javascript/flavours/glitch/features/ui/components/modal_root.jsx
+++ b/app/javascript/flavours/glitch/features/ui/components/modal_root.jsx
@@ -41,7 +41,7 @@ import {
 } from './confirmation_modals';
 import DeprecatedSettingsModal from './deprecated_settings_modal';
 import DoodleModal from './doodle_modal';
-import FavouriteModal from './favourite_modal';
+import { FavouriteModal } from './favourite_modal';
 import FocalPointModal from './focal_point_modal';
 import ImageModal from './image_modal';
 import MediaModal from './media_modal';
diff --git a/app/javascript/flavours/glitch/locales/en.json b/app/javascript/flavours/glitch/locales/en.json
index 3faf16c3358614..3b0439e7ed5f51 100644
--- a/app/javascript/flavours/glitch/locales/en.json
+++ b/app/javascript/flavours/glitch/locales/en.json
@@ -36,7 +36,7 @@
   "confirmations.missing_media_description.message": "At least one media attachment is lacking a description. Consider describing all media attachments for the visually impaired before sending your toot.",
   "direct.group_by_conversations": "Group by conversation",
   "endorsed_accounts_editor.endorsed_accounts": "Featured accounts",
-  "favourite_modal.combo": "You can press {combo} to skip this next time",
+  "favourite_modal.favourite": "Favourite post?",
   "federation.federated.long": "Allow this post to reach other servers",
   "federation.federated.short": "Federated",
   "federation.local_only.long": "Prevent this post from reaching other servers",

From 1701b1fc8011748070084015c3d01cb0d0806cde Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 2 Sep 2024 10:26:43 +0200
Subject: [PATCH 2020/2191] Update dependency axios to v1.7.7 (#31670)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 49373fb3cab18b..451902a1d4d8dc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5121,13 +5121,13 @@ __metadata:
   linkType: hard
 
 "axios@npm:^1.4.0":
-  version: 1.7.5
-  resolution: "axios@npm:1.7.5"
+  version: 1.7.7
+  resolution: "axios@npm:1.7.7"
   dependencies:
     follow-redirects: "npm:^1.15.6"
     form-data: "npm:^4.0.0"
     proxy-from-env: "npm:^1.1.0"
-  checksum: 10c0/1d5daeb28b3d1bb2a7b9f0743433c4bfbeaddc15461e50ebde487eec6c009af2515749d5261096dd430c90cd891bd310bcba5ec3967bae2033c4a307f58a6ad3
+  checksum: 10c0/4499efc89e86b0b49ffddc018798de05fab26e3bf57913818266be73279a6418c3ce8f9e934c7d2d707ab8c095e837fc6c90608fb7715b94d357720b5f568af7
   languageName: node
   linkType: hard
 

From 2f2b98c8cbc4997a39b121fada23975214479394 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 2 Sep 2024 10:35:09 +0200
Subject: [PATCH 2021/2191] New Crowdin Translations (automated) (#31671)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/bg.json    |  24 +++++
 app/javascript/mastodon/locales/eo.json    |   2 +-
 app/javascript/mastodon/locales/et.json    |  39 +++++++
 app/javascript/mastodon/locales/fr-CA.json |   2 +-
 app/javascript/mastodon/locales/fr.json    |   4 +-
 app/javascript/mastodon/locales/gd.json    |   4 +
 app/javascript/mastodon/locales/ia.json    |  27 ++++-
 app/javascript/mastodon/locales/ja.json    |   7 +-
 app/javascript/mastodon/locales/kab.json   |   5 +
 app/javascript/mastodon/locales/ko.json    |   2 +-
 app/javascript/mastodon/locales/lad.json   |   7 ++
 app/javascript/mastodon/locales/lt.json    |   2 +-
 app/javascript/mastodon/locales/no.json    | 116 ++++++++++++++++++++-
 app/javascript/mastodon/locales/pt-BR.json |  38 +++++++
 app/javascript/mastodon/locales/pt-PT.json |  11 ++
 app/javascript/mastodon/locales/sk.json    |  12 +++
 app/javascript/mastodon/locales/uk.json    |   8 +-
 app/javascript/mastodon/locales/vi.json    |  31 ++++--
 config/locales/doorkeeper.et.yml           |   1 +
 config/locales/doorkeeper.ja.yml           |   1 +
 config/locales/en-GB.yml                   |  27 +++++
 config/locales/et.yml                      |  22 ++++
 config/locales/fr.yml                      |   2 +-
 config/locales/ia.yml                      |  58 +++++++++++
 config/locales/ja.yml                      |  71 +++++++++++++
 config/locales/lad.yml                     |   3 +
 config/locales/lt.yml                      |   4 +-
 config/locales/no.yml                      |   1 +
 config/locales/simple_form.et.yml          |   1 +
 config/locales/simple_form.ia.yml          |   1 +
 config/locales/simple_form.ja.yml          |   1 +
 config/locales/simple_form.kab.yml         |   2 +-
 config/locales/simple_form.uk.yml          |   2 +-
 config/locales/sk.yml                      |   6 ++
 config/locales/uk.yml                      |   2 +-
 35 files changed, 519 insertions(+), 27 deletions(-)

diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json
index 5fb254e3901f33..828092d43033a3 100644
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@@ -97,6 +97,8 @@
   "block_modal.title": "Блокирате ли потребителя?",
   "block_modal.you_wont_see_mentions": "Няма да виждате публикациите, които ги споменават.",
   "boost_modal.combo": "Можете да натиснете {combo}, за да пропуснете това следващия път",
+  "boost_modal.reblog": "Подсилвате ли публикация?",
+  "boost_modal.undo_reblog": "Без подсилване на публикация ли?",
   "bundle_column_error.copy_stacktrace": "Копиране на доклада за грешката",
   "bundle_column_error.error.body": "Заявената страница не може да се изобрази. Това може да е заради грешка в кода ни или проблем със съвместимостта на браузъра.",
   "bundle_column_error.error.title": "О, не!",
@@ -349,6 +351,14 @@
   "hashtag.follow": "Следване на хаштаг",
   "hashtag.unfollow": "Спиране на следване на хаштаг",
   "hashtags.and_other": "…и {count, plural, other {# още}}",
+  "hints.profiles.followers_may_be_missing": "Последователи за този профил може да липсват.",
+  "hints.profiles.follows_may_be_missing": "Последванията за този профил може да липсват.",
+  "hints.profiles.posts_may_be_missing": "Някои публикации от този профил може да липсват.",
+  "hints.profiles.see_more_followers": "Преглед на още последователи на {domain}",
+  "hints.profiles.see_more_follows": "Преглед на още последвания на {domain}",
+  "hints.profiles.see_more_posts": "Преглед на още публикации на {domain}",
+  "hints.threads.replies_may_be_missing": "Отговори от други сървъри може да липсват.",
+  "hints.threads.see_more": "Преглед на още отговори на {domain}",
   "home.column_settings.show_reblogs": "Показване на подсилванията",
   "home.column_settings.show_replies": "Показване на отговорите",
   "home.hide_announcements": "Скриване на оповестяванията",
@@ -446,6 +456,7 @@
   "mute_modal.you_wont_see_mentions": "Няма да виждате споменаващите ги публикации.",
   "mute_modal.you_wont_see_posts": "Още могат да виждат публикациите ви, но вие техните не.",
   "navigation_bar.about": "Относно",
+  "navigation_bar.administration": "Администрация",
   "navigation_bar.advanced_interface": "Отваряне в разширен уебинтерфейс",
   "navigation_bar.blocks": "Блокирани потребители",
   "navigation_bar.bookmarks": "Отметки",
@@ -462,6 +473,7 @@
   "navigation_bar.follows_and_followers": "Последвания и последователи",
   "navigation_bar.lists": "Списъци",
   "navigation_bar.logout": "Излизане",
+  "navigation_bar.moderation": "Модериране",
   "navigation_bar.mutes": "Заглушени потребители",
   "navigation_bar.opened_in_classic_interface": "Публикации, акаунти и други особени страници се отварят по подразбиране в класическия мрежови интерфейс.",
   "navigation_bar.personal": "Лично",
@@ -477,10 +489,17 @@
   "notification.admin.report_statuses": "{name} докладва {target} за {category}",
   "notification.admin.report_statuses_other": "{name} докладва {target}",
   "notification.admin.sign_up": "{name} се регистрира",
+  "notification.admin.sign_up.name_and_others": "{name} и {count, plural, one {# друг} other {# други}} се регистрираха",
   "notification.favourite": "{name} направи любима публикацията ви",
+  "notification.favourite.name_and_others_with_link": "{name} и <a>{count, plural, one {# друг} other {# други}}</a> направиха любима ваша публикация",
   "notification.follow": "{name} ви последва",
+  "notification.follow.name_and_others": "{name} и {count, plural, one {# друг} other {# други}} ви последваха",
   "notification.follow_request": "{name} поиска да ви последва",
+  "notification.follow_request.name_and_others": "{name} и {count, plural, one {# друг} other {# други}} поискаха да ви последват",
   "notification.label.mention": "Споменаване",
+  "notification.label.private_mention": "Частно споменаване",
+  "notification.label.private_reply": "Личен отговор",
+  "notification.label.reply": "Отговор",
   "notification.mention": "Споменаване",
   "notification.moderation-warning.learn_more": "Научете повече",
   "notification.moderation_warning": "Получихте предупреждение за модериране",
@@ -494,6 +513,7 @@
   "notification.own_poll": "Анкетата ви приключи",
   "notification.poll": "Анкета, в която гласувахте, приключи",
   "notification.reblog": "{name} подсили ваша публикация",
+  "notification.reblog.name_and_others_with_link": "{name} и <a>{count, plural, one {# друг} other {# други}}</a> подсилиха ваша публикация",
   "notification.relationships_severance_event": "Изгуби се връзката с {name}",
   "notification.relationships_severance_event.account_suspension": "Администратор от {from} спря {target}, което значи че повече не може да получавате новости от тях или да взаимодействате с тях.",
   "notification.relationships_severance_event.domain_block": "Администратор от {from} блокира {target}, вкючващо {followersCount} от последователите ви и {followingCount, plural, one {# акаунт, който} other {# акаунта, които}} следвате.",
@@ -502,6 +522,9 @@
   "notification.status": "{name} току-що публикува",
   "notification.update": "{name} промени публикация",
   "notification_requests.accept": "Приемам",
+  "notification_requests.confirm_accept_multiple.message": "На път сте да приемете {count, plural, one {едно известие за заявка} other {# известия за заявки}}. Наистина ли искате да продължите?",
+  "notification_requests.confirm_accept_multiple.title": "Приемате ли заявките за известие?",
+  "notification_requests.confirm_dismiss_multiple.title": "Отхвърляте ли заявките за известие?",
   "notification_requests.dismiss": "Отхвърлям",
   "notification_requests.edit_selection": "Редактиране",
   "notification_requests.exit_selection": "Готово",
@@ -561,6 +584,7 @@
   "notifications.policy.filter_not_following_title": "Хора, които не следвате",
   "notifications.policy.filter_private_mentions_hint": "Филтрирано, освен ако е отговор към ваше собствено споменаване или ако следвате подателя",
   "notifications.policy.filter_private_mentions_title": "Непоискани частни споменавания",
+  "notifications.policy.title": "Управление на известията от…",
   "notifications_permission_banner.enable": "Включване на известията на работния плот",
   "notifications_permission_banner.how_to_control": "За да получавате известия, когато Mastodon не е отворен, включете известията на работния плот. Може да управлявате точно кои видове взаимодействия пораждат известия на работния плот чрез бутона {icon} по-горе, след като бъдат включени.",
   "notifications_permission_banner.title": "Никога не пропускайте нищо",
diff --git a/app/javascript/mastodon/locales/eo.json b/app/javascript/mastodon/locales/eo.json
index 76ca4980fa2449..40eee9805aff5e 100644
--- a/app/javascript/mastodon/locales/eo.json
+++ b/app/javascript/mastodon/locales/eo.json
@@ -67,7 +67,7 @@
   "account.unblock_domain": "Malbloki la domajnon {domain}",
   "account.unblock_short": "Malbloki",
   "account.unendorse": "Ne plu rekomendi ĉe la profilo",
-  "account.unfollow": "Malaboni",
+  "account.unfollow": "Ĉesi sekvi",
   "account.unmute": "Ne plu silentigi @{name}",
   "account.unmute_notifications_short": "Malsilentigu Sciigojn",
   "account.unmute_short": "Ne plu silentigi",
diff --git a/app/javascript/mastodon/locales/et.json b/app/javascript/mastodon/locales/et.json
index 5caa258cd2093b..4838f7015504ca 100644
--- a/app/javascript/mastodon/locales/et.json
+++ b/app/javascript/mastodon/locales/et.json
@@ -11,6 +11,7 @@
   "about.not_available": "See info ei ole sellel serveril saadavaks tehtud.",
   "about.powered_by": "Hajutatud sotsiaalmeedia, mille taga on {mastodon}",
   "about.rules": "Serveri reeglid",
+  "account.account_note_header": "Isiklik märge",
   "account.add_or_remove_from_list": "Lisa või Eemalda nimekirjadest",
   "account.badges.bot": "Robot",
   "account.badges.group": "Grupp",
@@ -96,6 +97,8 @@
   "block_modal.title": "Blokeeri kasutaja?",
   "block_modal.you_wont_see_mentions": "Sa ei näe postitusi, mis mainivad teda.",
   "boost_modal.combo": "Vajutades {combo}, saab selle edaspidi vahele jätta",
+  "boost_modal.reblog": "Jagada postitust?",
+  "boost_modal.undo_reblog": "Tühista postituse jagamine?",
   "bundle_column_error.copy_stacktrace": "Kopeeri veateade",
   "bundle_column_error.error.body": "Soovitud lehte ei õnnestunud esitada. See võib olla meie koodiviga või probleem brauseri ühilduvusega.",
   "bundle_column_error.error.title": "Oh, ei!",
@@ -169,21 +172,30 @@
   "confirmations.block.confirm": "Blokeeri",
   "confirmations.delete.confirm": "Kustuta",
   "confirmations.delete.message": "Oled kindel, et soovid postituse kustutada?",
+  "confirmations.delete.title": "Kustutada postitus?",
   "confirmations.delete_list.confirm": "Kustuta",
   "confirmations.delete_list.message": "Oled kindel, et soovid selle loetelu pöördumatult kustutada?",
+  "confirmations.delete_list.title": "Kustutada loetelu?",
   "confirmations.discard_edit_media.confirm": "Hülga",
   "confirmations.discard_edit_media.message": "Sul on salvestamata muudatusi meediakirjelduses või eelvaates, kas hülgad need?",
   "confirmations.edit.confirm": "Muuda",
   "confirmations.edit.message": "Muutes praegu kirjutatakse hetkel loodav sõnum üle. Kas oled kindel, et soovid jätkata?",
+  "confirmations.edit.title": "Kirjutada postitus üle?",
   "confirmations.logout.confirm": "Välju",
   "confirmations.logout.message": "Kas oled kindel, et soovid välja logida?",
+  "confirmations.logout.title": "Logida välja?",
   "confirmations.mute.confirm": "Vaigista",
   "confirmations.redraft.confirm": "Kustuta & taasalusta",
   "confirmations.redraft.message": "Kindel, et soovid postituse kustutada ja võtta uue aluseks? Lemmikuks märkimised ja jagamised lähevad kaotsi ning vastused jäävad ilma algse postituseta.",
+  "confirmations.redraft.title": "Kustudada ja luua postituse mustand?",
   "confirmations.reply.confirm": "Vasta",
   "confirmations.reply.message": "Praegu vastamine kirjutab hetkel koostatava sõnumi üle. Oled kindel, et soovid jätkata?",
+  "confirmations.reply.title": "Kirjutada postitus üle?",
   "confirmations.unfollow.confirm": "Ära jälgi",
   "confirmations.unfollow.message": "Oled kindel, et ei soovi rohkem jälgida kasutajat {name}?",
+  "confirmations.unfollow.title": "Ei jälgi enam kasutajat?",
+  "content_warning.hide": "Peida postitus",
+  "content_warning.show": "Näita ikkagi",
   "conversation.delete": "Kustuta vestlus",
   "conversation.mark_as_read": "Märgi loetuks",
   "conversation.open": "Vaata vestlust",
@@ -291,6 +303,8 @@
   "filter_modal.select_filter.subtitle": "Kasuta olemasolevat kategooriat või loo uus",
   "filter_modal.select_filter.title": "Filtreeri seda postitust",
   "filter_modal.title.status": "Postituse filtreerimine",
+  "filter_warning.matches_filter": "Sobib filtriga “{title}”",
+  "filtered_notifications_banner.pending_requests": "{count, plural, =0 {Mitte üheltki inimeselt} one {Ühelt inimeselt} other {# inimeselt}}, keda võid teada",
   "filtered_notifications_banner.title": "Filtreeritud teavitused",
   "firehose.all": "Kõik",
   "firehose.local": "See server",
@@ -436,6 +450,7 @@
   "mute_modal.you_wont_see_mentions": "Sa ei näe postitusi, mis teda mainivad.",
   "mute_modal.you_wont_see_posts": "Ta näeb jätkuvalt sinu postitusi, kuid sa ei näe tema omi.",
   "navigation_bar.about": "Teave",
+  "navigation_bar.administration": "Administreerimine",
   "navigation_bar.advanced_interface": "Ava kohandatud veebiliides",
   "navigation_bar.blocks": "Blokeeritud kasutajad",
   "navigation_bar.bookmarks": "Järjehoidjad",
@@ -452,6 +467,7 @@
   "navigation_bar.follows_and_followers": "Jälgitavad ja jälgijad",
   "navigation_bar.lists": "Nimekirjad",
   "navigation_bar.logout": "Logi välja",
+  "navigation_bar.moderation": "Modereerimine",
   "navigation_bar.mutes": "Vaigistatud kasutajad",
   "navigation_bar.opened_in_classic_interface": "Postitused, kontod ja teised spetsiaalsed lehed avatakse vaikimisi klassikalises veebiliideses.",
   "navigation_bar.personal": "Isiklik",
@@ -462,10 +478,19 @@
   "navigation_bar.security": "Turvalisus",
   "not_signed_in_indicator.not_signed_in": "Pead sisse logima, et saada ligipääsu sellele ressursile.",
   "notification.admin.report": "{name} saatis teavituse {target} kohta",
+  "notification.admin.report_account": "{name} raporteeris {count, plural, one {ühest postitusest} other {# postitusest}} kohast {target} kategooriast {category}",
+  "notification.admin.report_account_other": "{name} raporteeris {count, plural, one {ühest postitusest} other {# postitusest}} kohast {target}",
+  "notification.admin.report_statuses": "{name} raporteeris {target} kategooriast {category}",
+  "notification.admin.report_statuses_other": "{name} raporteeris kohast {target}",
   "notification.admin.sign_up": "{name} registreerus",
   "notification.favourite": "{name} märkis su postituse lemmikuks",
   "notification.follow": "{name} alustas su jälgimist",
   "notification.follow_request": "{name} soovib sind jälgida",
+  "notification.label.mention": "Mainimine",
+  "notification.label.private_mention": "Privaatne mainimine",
+  "notification.label.private_reply": "Privaatne vastus",
+  "notification.label.reply": "Vastus",
+  "notification.mention": "Mainimine",
   "notification.moderation-warning.learn_more": "Vaata lisa",
   "notification.moderation_warning": "Said modereerimise hoiatuse",
   "notification.moderation_warning.action_delete_statuses": "Mõni su postitus on eemaldatud.",
@@ -476,6 +501,7 @@
   "notification.moderation_warning.action_silence": "Su kontole pandi piirang.",
   "notification.moderation_warning.action_suspend": "Su konto on peatatud.",
   "notification.own_poll": "Su küsitlus on lõppenud",
+  "notification.poll": "Hääletus, millel osalesid, on lõppenud",
   "notification.reblog": "{name} jagas edasi postitust",
   "notification.relationships_severance_event": "Kadunud ühendus kasutajaga {name}",
   "notification.relationships_severance_event.account_suspension": "{from} admin on kustutanud {target}, mis tähendab, et sa ei saa enam neilt uuendusi või suhelda nendega.",
@@ -486,13 +512,20 @@
   "notification.update": "{name} muutis postitust",
   "notification_requests.accept": "Nõus",
   "notification_requests.dismiss": "Hülga",
+  "notification_requests.explainer_for_limited_account": "Sellelt kontolt tulevad teavitused on filtreeritud, sest moderaator on seda kontot piiranud.",
+  "notification_requests.explainer_for_limited_remote_account": "Sellelt kontolt tulevad teavitused on filtreeritud, sest moderaator on seda kontot või serverit piiranud.",
+  "notification_requests.maximize": "Maksimeeri",
+  "notification_requests.minimize_banner": "Minimeeri filtreeritud teavituste bänner",
   "notification_requests.notifications_from": "Teavitus kasutajalt {name}",
   "notification_requests.title": "Filtreeritud teavitused",
   "notifications.clear": "Puhasta teated",
   "notifications.clear_confirmation": "Oled kindel, et soovid püsivalt kõik oma teated eemaldada?",
+  "notifications.clear_title": "Tühjenda teavitus?",
   "notifications.column_settings.admin.report": "Uued teavitused:",
   "notifications.column_settings.admin.sign_up": "Uued kasutajad:",
   "notifications.column_settings.alert": "Töölauateated",
+  "notifications.column_settings.beta.category": "Eksperimentaalsed oskused",
+  "notifications.column_settings.beta.grouping": "Teavituste rühmitamine",
   "notifications.column_settings.favourite": "Lemmikud:",
   "notifications.column_settings.filter_bar.advanced": "Näita kõiki kategooriaid",
   "notifications.column_settings.filter_bar.category": "Kiirfiltri riba",
@@ -521,6 +554,8 @@
   "notifications.permission_denied": "Töölauamärguanded pole saadaval, kuna eelnevalt keelduti lehitsejale teavituste luba andmast",
   "notifications.permission_denied_alert": "Töölaua märguandeid ei saa lubada, kuna brauseri luba on varem keeldutud",
   "notifications.permission_required": "Töölaua märguanded ei ole saadaval, kuna vajalik luba pole antud.",
+  "notifications.policy.filter_limited_accounts_hint": "Piiratud serveri moderaatorite poolt",
+  "notifications.policy.filter_limited_accounts_title": "Modereeritud kontod",
   "notifications.policy.filter_new_accounts.hint": "Loodud viimase {days, plural, one {ühe päeva} other {# päeva}} jooksul",
   "notifications.policy.filter_new_accounts_title": "Uued kontod",
   "notifications.policy.filter_not_followers_hint": "Kaasates kasutajad, kes on sind jälginud vähem kui {days, plural, one {ühe päeva} other {# päeva}}",
@@ -655,9 +690,13 @@
   "report.unfollow_explanation": "Jälgid seda kontot. Et mitte näha tema postitusi oma koduvoos, lõpeta ta jälgimine.",
   "report_notification.attached_statuses": "{count, plural, one {{count} postitus} other {{count} postitust}} listatud",
   "report_notification.categories.legal": "Õiguslik",
+  "report_notification.categories.legal_sentence": "ebaseaduslik sisu",
   "report_notification.categories.other": "Muu",
+  "report_notification.categories.other_sentence": "muu",
   "report_notification.categories.spam": "Rämpspost",
+  "report_notification.categories.spam_sentence": "rämps",
   "report_notification.categories.violation": "Reeglite rikkumine",
+  "report_notification.categories.violation_sentence": "reeglite rikkumine",
   "report_notification.open": "Ava teavitus",
   "search.no_recent_searches": "Pole viimatisi otsinguid",
   "search.placeholder": "Otsi",
diff --git a/app/javascript/mastodon/locales/fr-CA.json b/app/javascript/mastodon/locales/fr-CA.json
index c0a575637e8d7f..983f737a797b50 100644
--- a/app/javascript/mastodon/locales/fr-CA.json
+++ b/app/javascript/mastodon/locales/fr-CA.json
@@ -538,7 +538,7 @@
   "notification_requests.confirm_accept_multiple.message": "Vous êtes sur le point d'accepter {count, plural, one {une requête de notification} other {# requêtes de notification}}. Êtes-vous sûr de vouloir continuer ?",
   "notification_requests.confirm_accept_multiple.title": "Accepter les requêtes de notification ?",
   "notification_requests.confirm_dismiss_multiple.button": "{count, plural, one {Ignorer la requête} other {Ignorer les requêtes}}",
-  "notification_requests.confirm_dismiss_multiple.message": "Vous êtes sur le point de rejeter {count, plural, one {une requête de notification} other {# requêtes de notification}}. Vous ne serez plus en mesure d'{count, plural, one {y} other {y}} accéder facilement, ultérieurement. Êtes-vous sûr de vouloir continuer ?",
+  "notification_requests.confirm_dismiss_multiple.message": "Vous êtes sur le point de rejeter {count, plural, one {une requête de notification} other {# requêtes de notification}}. Vous ne serez plus en mesure d’{count, plural, one {y} other {y}} accéder facilement, ultérieurement. Êtes-vous sûr de vouloir continuer ?",
   "notification_requests.confirm_dismiss_multiple.title": "Rejeter les requêtes de notification ?",
   "notification_requests.dismiss": "Rejeter",
   "notification_requests.dismiss_multiple": "{count, plural, one {Rejeter # requête …} other {Rejeter # requêtes …}}",
diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json
index ed3533719e8e96..2b22f4ba32b353 100644
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@@ -538,7 +538,7 @@
   "notification_requests.confirm_accept_multiple.message": "Vous êtes sur le point d'accepter {count, plural, one {une requête de notification} other {# requêtes de notification}}. Êtes-vous sûr de vouloir continuer ?",
   "notification_requests.confirm_accept_multiple.title": "Accepter les requêtes de notification ?",
   "notification_requests.confirm_dismiss_multiple.button": "{count, plural, one {Ignorer la requête} other {Ignorer les requêtes}}",
-  "notification_requests.confirm_dismiss_multiple.message": "Vous êtes sur le point de rejeter {count, plural, one {une requête de notification} other {# requêtes de notification}}. Vous ne serez plus en mesure d'{count, plural, one {y} other {y}} accéder facilement, ultérieurement. Êtes-vous sûr de vouloir continuer ?",
+  "notification_requests.confirm_dismiss_multiple.message": "Vous êtes sur le point de rejeter {count, plural, one {une requête de notification} other {# requêtes de notification}}. Vous ne serez plus en mesure d’{count, plural, one {y} other {y}} accéder facilement, ultérieurement. Êtes-vous sûr de vouloir continuer ?",
   "notification_requests.confirm_dismiss_multiple.title": "Rejeter les requêtes de notification ?",
   "notification_requests.dismiss": "Rejeter",
   "notification_requests.dismiss_multiple": "{count, plural, one {Rejeter # requête …} other {Rejeter # requêtes …}}",
@@ -727,7 +727,7 @@
   "report.thanks.title": "Vous ne voulez pas voir cela ?",
   "report.thanks.title_actionable": "Merci pour votre signalement, nous allons investiguer.",
   "report.unfollow": "Ne plus suivre @{name}",
-  "report.unfollow_explanation": "Vous êtes abonné à ce compte. Pour ne plus voir ses publications dans votre flux principal, retirez-le de votre liste d'abonnements.",
+  "report.unfollow_explanation": "Vous êtes abonné à ce compte. Pour ne plus voir ses publications dans votre fil principal, retirez-le de votre liste d'abonnements.",
   "report_notification.attached_statuses": "{count, plural, one {{count} message lié} other {{count} messages liés}}",
   "report_notification.categories.legal": "Légal",
   "report_notification.categories.legal_sentence": "contenu illégal",
diff --git a/app/javascript/mastodon/locales/gd.json b/app/javascript/mastodon/locales/gd.json
index aecc26477c7317..1090df0881013c 100644
--- a/app/javascript/mastodon/locales/gd.json
+++ b/app/javascript/mastodon/locales/gd.json
@@ -97,6 +97,8 @@
   "block_modal.title": "A bheil thu airson an cleachdaiche a bhacadh?",
   "block_modal.you_wont_see_mentions": "Chan fhaic thu na postaichean a bheir iomradh orra.",
   "boost_modal.combo": "Brùth air {combo} nam b’ fheàrr leat leum a ghearradh thar seo an ath-thuras",
+  "boost_modal.reblog": "A bheil thu airson am post a bhrosnachadh?",
+  "boost_modal.undo_reblog": "A bheil thu airson sgur de bhrosnachadh a’ phuist?",
   "bundle_column_error.copy_stacktrace": "Dèan lethbhreac de aithris na mearachd",
   "bundle_column_error.error.body": "Cha b’ urrainn dhuinn an duilleag a dh’iarr thu a reandaradh. Dh’fhaoidte gu bheil buga sa chòd againn no duilgheadas co-chòrdalachd leis a’ bhrabhsair.",
   "bundle_column_error.error.title": "Ìoc!",
@@ -467,6 +469,7 @@
   "mute_modal.you_wont_see_mentions": "Chan fhaic thu na postaichean a bheir iomradh orra.",
   "mute_modal.you_wont_see_posts": "Chì iad na postaichean agad fhathast ach chan fhaic thu na postaichean aca-san.",
   "navigation_bar.about": "Mu dhèidhinn",
+  "navigation_bar.administration": "Rianachd",
   "navigation_bar.advanced_interface": "Fosgail san eadar-aghaidh-lìn adhartach",
   "navigation_bar.blocks": "Cleachdaichean bacte",
   "navigation_bar.bookmarks": "Comharran-lìn",
@@ -483,6 +486,7 @@
   "navigation_bar.follows_and_followers": "Dàimhean leantainn",
   "navigation_bar.lists": "Liostaichean",
   "navigation_bar.logout": "Clàraich a-mach",
+  "navigation_bar.moderation": "Maorsainneachd",
   "navigation_bar.mutes": "Cleachdaichean mùchte",
   "navigation_bar.opened_in_classic_interface": "Thèid postaichean, cunntasan ’s duilleagan sònraichte eile fhosgladh san eadar-aghaidh-lìn chlasaigeach a ghnàth.",
   "navigation_bar.personal": "Pearsanta",
diff --git a/app/javascript/mastodon/locales/ia.json b/app/javascript/mastodon/locales/ia.json
index 31fb52552b8832..9bf89ce7168455 100644
--- a/app/javascript/mastodon/locales/ia.json
+++ b/app/javascript/mastodon/locales/ia.json
@@ -191,6 +191,8 @@
   "confirmations.unfollow.confirm": "Non plus sequer",
   "confirmations.unfollow.message": "Es tu secur que tu vole cessar de sequer {name}?",
   "confirmations.unfollow.title": "Cessar de sequer le usator?",
+  "content_warning.hide": "Celar le message",
+  "content_warning.show": "Monstrar in omne caso",
   "conversation.delete": "Deler conversation",
   "conversation.mark_as_read": "Marcar como legite",
   "conversation.open": "Vider conversation",
@@ -298,6 +300,7 @@
   "filter_modal.select_filter.subtitle": "Usa un categoria existente o crea un nove",
   "filter_modal.select_filter.title": "Filtrar iste message",
   "filter_modal.title.status": "Filtrar un message",
+  "filter_warning.matches_filter": "Corresponde al filtro “{title}”",
   "filtered_notifications_banner.title": "Notificationes filtrate",
   "firehose.all": "Toto",
   "firehose.local": "Iste servitor",
@@ -346,6 +349,10 @@
   "hashtag.follow": "Sequer hashtag",
   "hashtag.unfollow": "Non sequer plus le hashtag",
   "hashtags.and_other": "…e {count, plural, one {}other {# plus}}",
+  "hints.profiles.see_more_followers": "Vider plus de sequitores sur {domain}",
+  "hints.profiles.see_more_follows": "Vider plus de sequites sur {domain}",
+  "hints.profiles.see_more_posts": "Vider plus de messages sur {domain}",
+  "hints.threads.see_more": "Vider plus de responsas sur {domain}",
   "home.column_settings.show_reblogs": "Monstrar impulsos",
   "home.column_settings.show_replies": "Monstrar responsas",
   "home.hide_announcements": "Celar annuncios",
@@ -443,6 +450,7 @@
   "mute_modal.you_wont_see_mentions": "Tu non videra le messages que mentiona iste persona.",
   "mute_modal.you_wont_see_posts": "Iste persona pote totevia vider tu messages, ma tu non videra le sues.",
   "navigation_bar.about": "A proposito",
+  "navigation_bar.administration": "Administration",
   "navigation_bar.advanced_interface": "Aperir in le interfacie web avantiate",
   "navigation_bar.blocks": "Usatores blocate",
   "navigation_bar.bookmarks": "Marcapaginas",
@@ -459,6 +467,7 @@
   "navigation_bar.follows_and_followers": "Sequites e sequitores",
   "navigation_bar.lists": "Listas",
   "navigation_bar.logout": "Clauder session",
+  "navigation_bar.moderation": "Moderation",
   "navigation_bar.mutes": "Usatores silentiate",
   "navigation_bar.opened_in_classic_interface": "Messages, contos e altere paginas specific es aperite per predefinition in le interfacie web classic.",
   "navigation_bar.personal": "Personal",
@@ -469,6 +478,8 @@
   "navigation_bar.security": "Securitate",
   "not_signed_in_indicator.not_signed_in": "Es necessari aperir session pro acceder a iste ressource.",
   "notification.admin.report": "{name} ha reportate {target}",
+  "notification.admin.report_statuses": "{name} ha reportate {target} pro {category}",
+  "notification.admin.report_statuses_other": "{name} ha reportate {target}",
   "notification.admin.sign_up": "{name} se ha inscribite",
   "notification.favourite": "{name} ha marcate tu message como favorite",
   "notification.follow": "{name} te ha sequite",
@@ -488,6 +499,7 @@
   "notification.moderation_warning.action_silence": "Tu conto ha essite limitate.",
   "notification.moderation_warning.action_suspend": "Tu conto ha essite suspendite.",
   "notification.own_poll": "Tu sondage ha finite",
+  "notification.poll": "Un sondage in le qual tu ha votate ha finite",
   "notification.reblog": "{name} ha impulsate tu message",
   "notification.relationships_severance_event": "Connexiones perdite con {name}",
   "notification.relationships_severance_event.account_suspension": "Un administrator de {from} ha suspendiute {target}. Isto significa que tu non pote plus reciper actualisationes de iste persona o interager con ille.",
@@ -497,9 +509,14 @@
   "notification.status": "{name} ha justo ora publicate",
   "notification.update": "{name} ha modificate un message",
   "notification_requests.accept": "Acceptar",
+  "notification_requests.confirm_accept_multiple.title": "Acceptar petitiones de notification?",
+  "notification_requests.confirm_dismiss_multiple.title": "Dimitter petitiones de notification?",
   "notification_requests.dismiss": "Clauder",
+  "notification_requests.edit_selection": "Modificar",
+  "notification_requests.exit_selection": "Facite",
   "notification_requests.notifications_from": "Notificationes de {name}",
   "notification_requests.title": "Notificationes filtrate",
+  "notification_requests.view": "Vider notificationes",
   "notifications.clear": "Rader notificationes",
   "notifications.clear_confirmation": "Es tu secur que tu vole rader permanentemente tote tu notificationes?",
   "notifications.clear_title": "Rader le notificationes?",
@@ -536,6 +553,11 @@
   "notifications.permission_denied": "Le notificationes de scriptorio es indisponibile a causa de un requesta anteriormente refusate de permissiones del navigator",
   "notifications.permission_denied_alert": "Le notificationes de scriptorio non pote esser activate perque le permission del navigator ha essite refusate anteriormente",
   "notifications.permission_required": "Le notificationes de scriptorio es indisponibile perque le permission necessari non ha essite concedite.",
+  "notifications.policy.accept": "Acceptar",
+  "notifications.policy.accept_hint": "Monstrar in le notificationes",
+  "notifications.policy.filter": "Filtrar",
+  "notifications.policy.filter_hint": "Inviar al cassa de notificationes filtrate",
+  "notifications.policy.filter_limited_accounts_title": "Contos moderate",
   "notifications.policy.filter_new_accounts.hint": "Create in le ultime {days, plural, one {die} other {# dies}}",
   "notifications.policy.filter_new_accounts_title": "Nove contos",
   "notifications.policy.filter_not_followers_hint": "Includente le personas que te ha sequite durante minus de {days, plural, one {un die} other {# dies}}",
@@ -544,6 +566,7 @@
   "notifications.policy.filter_not_following_title": "Personas que tu non seque",
   "notifications.policy.filter_private_mentions_hint": "Filtrate, excepte si es in responsa a tu proprie mention o si tu seque le expeditor",
   "notifications.policy.filter_private_mentions_title": "Mentiones private indesirate",
+  "notifications.policy.title": "Gerer notificationes de…",
   "notifications_permission_banner.enable": "Activar notificationes de scriptorio",
   "notifications_permission_banner.how_to_control": "Pro reciper notificationes quando Mastodon non es aperte, activa le notificationes de scriptorio. Post lor activation, es possibile controlar precisemente qual typos de interaction genera notificationes de scriptorio per medio del button {icon} hic supra.",
   "notifications_permission_banner.title": "Non mancar jammais a un cosa",
@@ -596,8 +619,8 @@
   "poll.vote": "Votar",
   "poll.voted": "Tu ha votate pro iste responsa",
   "poll.votes": "{votes, plural, one {# voto} other {# votos}}",
-  "poll_button.add_poll": "Adder un inquesta",
-  "poll_button.remove_poll": "Remover un inquesta",
+  "poll_button.add_poll": "Adder un sondage",
+  "poll_button.remove_poll": "Remover un sondage",
   "privacy.change": "Cambiar le confidentialitate del message",
   "privacy.direct.long": "Tote le personas mentionate in le message",
   "privacy.direct.short": "Personas specific",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index f24b54aa48bd2e..489ff9c8e7d55e 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -194,7 +194,7 @@
   "confirmations.unfollow.confirm": "フォロー解除",
   "confirmations.unfollow.message": "本当に{name}さんのフォローを解除しますか？",
   "confirmations.unfollow.title": "フォローを解除しようとしています",
-  "content_warning.hide": "投稿を隠す",
+  "content_warning.hide": "内容を隠す",
   "content_warning.show": "承知の上で表示",
   "conversation.delete": "会話を削除",
   "conversation.mark_as_read": "既読にする",
@@ -469,6 +469,7 @@
   "mute_modal.you_wont_see_mentions": "宛先に相手が入っている投稿も閲覧できなくなります。",
   "mute_modal.you_wont_see_posts": "相手はあなたの投稿を今までどおり閲覧できますが、あなたは相手の投稿を閲覧できなくなります。",
   "navigation_bar.about": "概要",
+  "navigation_bar.administration": "管理",
   "navigation_bar.advanced_interface": "上級者向けUIに戻る",
   "navigation_bar.blocks": "ブロックしたユーザー",
   "navigation_bar.bookmarks": "ブックマーク",
@@ -485,6 +486,7 @@
   "navigation_bar.follows_and_followers": "フォロー・フォロワー",
   "navigation_bar.lists": "リスト",
   "navigation_bar.logout": "ログアウト",
+  "navigation_bar.moderation": "モデレーション",
   "navigation_bar.mutes": "ミュートしたユーザー",
   "navigation_bar.opened_in_classic_interface": "投稿やプロフィールを直接開いた場合は一時的に標準UIで表示されます。",
   "navigation_bar.personal": "個人用",
@@ -546,10 +548,11 @@
   "notification_requests.exit_selection": "選択の終了",
   "notification_requests.explainer_for_limited_account": "このアカウントはモデレーターにより制限が課されているため、このアカウントによる通知は保留されています",
   "notification_requests.explainer_for_limited_remote_account": "このアカウントが所属するサーバーはモデレーターにより制限が課されているため、このアカウントによる通知は保留されています",
+  "notification_requests.maximize": "最大化",
   "notification_requests.minimize_banner": "「保留中の通知」のバナーを最小化する",
   "notification_requests.notifications_from": "{name}からの通知",
   "notification_requests.title": "保留中の通知",
-  "notification_requests.view": "通知を確認",
+  "notification_requests.view": "通知を見る",
   "notifications.clear": "通知を消去",
   "notifications.clear_confirmation": "本当に通知を消去しますか？",
   "notifications.clear_title": "通知を消去しようとしています",
diff --git a/app/javascript/mastodon/locales/kab.json b/app/javascript/mastodon/locales/kab.json
index c5c0fa94c13265..a1e95fd8d17499 100644
--- a/app/javascript/mastodon/locales/kab.json
+++ b/app/javascript/mastodon/locales/kab.json
@@ -158,6 +158,8 @@
   "confirmations.reply.message": "Tiririt akka tura ad k-degger izen-agi i tettaruḍ. Tebɣiḍ ad tkemmleḍ?",
   "confirmations.unfollow.confirm": "Ur ḍḍafaṛ ara",
   "confirmations.unfollow.message": "Tetḥeqqeḍ belli tebɣiḍ ur teṭafaṛeḍ ara {name}?",
+  "content_warning.hide": "Ffer tasuffeɣt",
+  "content_warning.show": "Ssken-d akken tebɣu tili",
   "conversation.delete": "Kkes adiwenni",
   "conversation.mark_as_read": "Creḍ yettwaɣṛa",
   "conversation.open": "Ssken adiwenni",
@@ -360,6 +362,7 @@
   "mute_modal.you_wont_see_mentions": "Ur tezmireḍ ara ad twaliḍ tisuffaɣ anda d-yettwabdar.",
   "mute_modal.you_wont_see_posts": "Yezmer ad yettwali tisuffaɣ-ik·im, maca ur tettwaliḍ ara tidak-is.",
   "navigation_bar.about": "Ɣef",
+  "navigation_bar.administration": "Tadbelt",
   "navigation_bar.advanced_interface": "Ldi deg ugrudem n web leqqayen",
   "navigation_bar.blocks": "Iseqdacen yettusḥebsen",
   "navigation_bar.bookmarks": "Ticraḍ",
@@ -390,6 +393,7 @@
   "notification.favourite": "{name} yesmenyaf addad-ik·im",
   "notification.follow": "iṭṭafar-ik·em-id {name}",
   "notification.follow_request": "{name} yessuter-d ad k·m-yeḍfeṛ",
+  "notification.label.mention": "Abdar",
   "notification.label.private_mention": "Abdar uslig",
   "notification.label.private_reply": "Tiririt tusligt",
   "notification.label.reply": "Tiririt",
@@ -402,6 +406,7 @@
   "notification.status": "{name} akken i d-yessufeɣ",
   "notification_requests.accept": "Qbel",
   "notification_requests.dismiss": "Agi",
+  "notification_requests.exit_selection": "Immed",
   "notification_requests.notifications_from": "Alɣuten sɣur {name}",
   "notifications.clear": "Sfeḍ alɣuten",
   "notifications.clear_confirmation": "Tebɣiḍ s tidet ad tekkseḍ akk alɣuten-inek·em i lebda?",
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index 001363278409fc..b3d3476e4f782c 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -605,7 +605,7 @@
   "notifications.policy.filter_not_following_title": "내가 팔로우하지 않는 사람들",
   "notifications.policy.filter_private_mentions_hint": "내가 한 멘션에 단 답글이거나 내가 발신자를 팔로우 한 것이 아닌 이상 걸러집니다",
   "notifications.policy.filter_private_mentions_title": "청하지 않은 개인적인 멘션",
-  "notifications.policy.title": "…의 알림 설정",
+  "notifications.policy.title": "알림 조건 설정",
   "notifications_permission_banner.enable": "데스크탑 알림 활성화",
   "notifications_permission_banner.how_to_control": "마스토돈이 열려 있지 않을 때에도 알림을 받으려면, 데스크탑 알림을 활성화 하세요. 당신은 어떤 종류의 반응이 데스크탑 알림을 발생할 지를 {icon} 버튼을 통해 세세하게 설정할 수 있습니다.",
   "notifications_permission_banner.title": "아무것도 놓치지 마세요",
diff --git a/app/javascript/mastodon/locales/lad.json b/app/javascript/mastodon/locales/lad.json
index 48aeec07957f08..3d0bfcb4be605d 100644
--- a/app/javascript/mastodon/locales/lad.json
+++ b/app/javascript/mastodon/locales/lad.json
@@ -92,6 +92,7 @@
   "block_modal.title": "Bloka utilizador?",
   "block_modal.you_wont_see_mentions": "No veras publikasyones ke lo enmentan.",
   "boost_modal.combo": "Puedes klikar {combo} para ometer esto la proksima vez",
+  "boost_modal.reblog": "Repartajar puvlikasyon?",
   "bundle_column_error.copy_stacktrace": "Kopia el raporto de yerro",
   "bundle_column_error.error.body": "La pajina solisitada no pudo ser renderada. Podria ser por un yerro en muestro kodiche o un problem de kompatibilita kon el navigador.",
   "bundle_column_error.error.title": "Atyo, no!",
@@ -185,6 +186,8 @@
   "confirmations.unfollow.confirm": "Desige",
   "confirmations.unfollow.message": "Estas siguro ke keres deshar de segir a {name}?",
   "confirmations.unfollow.title": "Desige utilizador?",
+  "content_warning.hide": "Eskonde puvlikasyon",
+  "content_warning.show": "Amostra entanto",
   "conversation.delete": "Efasa konversasyon",
   "conversation.mark_as_read": "Marka komo meldado",
   "conversation.open": "Ve konversasyon",
@@ -425,6 +428,7 @@
   "mute_modal.title": "Silensiar utilizador?",
   "mute_modal.you_wont_see_mentions": "No veras publikasyones ke lo enmentan.",
   "navigation_bar.about": "Sovre mozotros",
+  "navigation_bar.administration": "Administrasyon",
   "navigation_bar.advanced_interface": "Avre en la enterfaz avanzada",
   "navigation_bar.blocks": "Utilizadores blokados",
   "navigation_bar.bookmarks": "Markadores",
@@ -441,6 +445,7 @@
   "navigation_bar.follows_and_followers": "Segidos i suivantes",
   "navigation_bar.lists": "Listas",
   "navigation_bar.logout": "Salir",
+  "navigation_bar.moderation": "Moderasyon",
   "navigation_bar.mutes": "Utilizadores silensiados",
   "navigation_bar.opened_in_classic_interface": "Publikasyones, kuentos i otras pajinas espesifikas se avren kon preferensyas predeterminadas en la enterfaz web klasika.",
   "navigation_bar.personal": "Personal",
@@ -475,6 +480,8 @@
   "notification.update": "{name} edito una publikasyon",
   "notification_requests.accept": "Acheta",
   "notification_requests.dismiss": "Kita",
+  "notification_requests.edit_selection": "Edita",
+  "notification_requests.exit_selection": "Fecho",
   "notification_requests.notifications_from": "Avizos de {name}",
   "notification_requests.title": "Avizos filtrados",
   "notification_requests.view": "Amostra avizos",
diff --git a/app/javascript/mastodon/locales/lt.json b/app/javascript/mastodon/locales/lt.json
index 051fd3717cc773..f58c405f28bb75 100644
--- a/app/javascript/mastodon/locales/lt.json
+++ b/app/javascript/mastodon/locales/lt.json
@@ -635,7 +635,7 @@
   "onboarding.steps.share_profile.title": "Bendrink savo Mastodon profilį",
   "onboarding.tips.2fa": "<strong>Ar žinojai?</strong> Savo paskyrą gali apsaugoti nustatant dviejų veiksnių tapatybės nustatymą paskyros nustatymuose. Jis veikia su bet kuria pasirinkta TOTP programėle, telefono numeris nebūtinas.",
   "onboarding.tips.accounts_from_other_servers": "<strong>Ar žinojai?</strong> Kadangi Mastodon decentralizuotas, kai kurie profiliai, su kuriais susidursi, bus talpinami ne tavo, o kituose serveriuose. Ir vis tiek galėsi su jais sklandžiai bendrauti! Jų serveris yra antroje naudotojo vardo pusėje.",
-  "onboarding.tips.migration": "<strong>Ar žinojai?</strong> Jei manai, kad {domain} serveris ateityje tau netiks, gali persikelti į kitą Mastodon serverį neprarandant savo sekėjų. Gali net talpinti savo paties serverį.",
+  "onboarding.tips.migration": "<strong>Ar žinojai?</strong> Jei manai, kad {domain} serveris ateityje tau netiks, gali persikelti į kitą „Mastodon“ serverį neprarandant savo sekėjų. Gali net talpinti savo paties serverį!",
   "onboarding.tips.verification": "<strong>Ar žinojai?</strong> Savo paskyrą gali patvirtinti pateikęs (-usi) nuorodą į Mastodon profilį savo interneto svetainėje ir pridėjęs (-usi) svetainę prie savo profilio. Nereikia jokių mokesčių ar dokumentų.",
   "password_confirmation.exceeds_maxlength": "Slaptažodžio patvirtinimas viršija maksimalų slaptažodžio ilgį.",
   "password_confirmation.mismatching": "Slaptažodžio patvirtinimas nesutampa.",
diff --git a/app/javascript/mastodon/locales/no.json b/app/javascript/mastodon/locales/no.json
index a3780de550ac95..bb41754e7d9ed9 100644
--- a/app/javascript/mastodon/locales/no.json
+++ b/app/javascript/mastodon/locales/no.json
@@ -11,6 +11,7 @@
   "about.not_available": "Denne informasjonen er ikke gjort tilgjengelig på denne tjeneren.",
   "about.powered_by": "Desentraliserte sosiale medier drevet av {mastodon}",
   "about.rules": "Regler for serveren",
+  "account.account_note_header": "Personlig notat",
   "account.add_or_remove_from_list": "Legg til eller fjern fra lister",
   "account.badges.bot": "Automatisert",
   "account.badges.group": "Gruppe",
@@ -33,7 +34,9 @@
   "account.follow_back": "Følg tilbake",
   "account.followers": "Følgere",
   "account.followers.empty": "Ingen følger denne brukeren ennå.",
+  "account.followers_counter": "{count, plural, one {{counter} følger} other {{counter} følgere}}",
   "account.following": "Følger",
+  "account.following_counter": "{count, plural, one {{counter} som følges} other {{counter} som følges}}",
   "account.follows.empty": "Denne brukeren følger ikke noen enda.",
   "account.go_to_profile": "Gå til profil",
   "account.hide_reblogs": "Skjul fremhevinger fra @{name}",
@@ -59,6 +62,7 @@
   "account.requested_follow": "{name} har bedt om å få følge deg",
   "account.share": "Del @{name} sin profil",
   "account.show_reblogs": "Vis fremhevinger fra @{name}",
+  "account.statuses_counter": "{count, plural, one {{counter} innlegg} other {{counter} innlegg}}",
   "account.unblock": "Opphev blokkering av @{name}",
   "account.unblock_domain": "Opphev blokkering av {domain}",
   "account.unblock_short": "Opphev blokkering",
@@ -84,7 +88,17 @@
   "announcement.announcement": "Kunngjøring",
   "attachments_list.unprocessed": "(ubehandlet)",
   "audio.hide": "Skjul lyd",
+  "block_modal.remote_users_caveat": "Vi vil be serveren {domain} om å respektere din beslutning. Det er imidlertid ingen garanti at det blir overholdt, siden noen servere kan håndtere blokkeringer på forskjellig vis. Offentlige innlegg kan fortsatt være synlige for ikke-innloggede brukere.",
+  "block_modal.show_less": "Vis mindre",
+  "block_modal.show_more": "Vis mer",
+  "block_modal.they_cant_mention": "De kan ikke nevne eller følge deg.",
+  "block_modal.they_cant_see_posts": "De kan ikke se dine innlegg og du kommer ikke til å se deres.",
+  "block_modal.they_will_know": "De kan se at de er blitt blokkert.",
+  "block_modal.title": "Blokker bruker?",
+  "block_modal.you_wont_see_mentions": "Du kommer ikke til å se innlegg som nevner dem.",
   "boost_modal.combo": "You kan trykke {combo} for å hoppe over dette neste gang",
+  "boost_modal.reblog": "Fremhev innlegg?",
+  "boost_modal.undo_reblog": "Fjern fremheving?",
   "bundle_column_error.copy_stacktrace": "Kopier feilrapport",
   "bundle_column_error.error.body": "Den forespurte siden kan ikke gjengis. Den kan skyldes en feil i vår kode eller et kompatibilitetsproblem med nettleseren.",
   "bundle_column_error.error.title": "Å nei!",
@@ -158,21 +172,30 @@
   "confirmations.block.confirm": "Blokkèr",
   "confirmations.delete.confirm": "Slett",
   "confirmations.delete.message": "Er du sikker på at du vil slette dette innlegget?",
+  "confirmations.delete.title": "Slett innlegg?",
   "confirmations.delete_list.confirm": "Slett",
   "confirmations.delete_list.message": "Er du sikker på at du vil slette denne listen permanent?",
+  "confirmations.delete_list.title": "Slett liste?",
   "confirmations.discard_edit_media.confirm": "Forkast",
   "confirmations.discard_edit_media.message": "Du har ulagrede endringer i mediebeskrivelsen eller i forhåndsvisning, forkast dem likevel?",
   "confirmations.edit.confirm": "Redigér",
   "confirmations.edit.message": "Å redigere nå vil overskrive meldingen du skriver for øyeblikket. Er du sikker på at du vil fortsette?",
+  "confirmations.edit.title": "Overskriv innlegg?",
   "confirmations.logout.confirm": "Logg ut",
   "confirmations.logout.message": "Er du sikker på at du vil logge ut?",
+  "confirmations.logout.title": "Logg ut?",
   "confirmations.mute.confirm": "Demp",
   "confirmations.redraft.confirm": "Slett og skriv på nytt",
   "confirmations.redraft.message": "Er du sikker på at du vil slette dette innlegget og lagre det på nytt? Favoritter og fremhevinger vil gå tapt, og svar til det originale innlegget vil bli foreldreløse.",
+  "confirmations.redraft.title": "Slett og skriv på nytt?",
   "confirmations.reply.confirm": "Svar",
   "confirmations.reply.message": "Å svare nå vil overskrive meldingen du skriver for øyeblikket. Er du sikker på at du vil fortsette?",
+  "confirmations.reply.title": "Overskriv innlegg?",
   "confirmations.unfollow.confirm": "Slutt å følge",
   "confirmations.unfollow.message": "Er du sikker på at du vil slutte å følge {name}?",
+  "confirmations.unfollow.title": "Slutt å følge bruker?",
+  "content_warning.hide": "Skjul innlegg",
+  "content_warning.show": "Vis likevel",
   "conversation.delete": "Slett samtalen",
   "conversation.mark_as_read": "Marker som lest",
   "conversation.open": "Vis samtale",
@@ -192,6 +215,27 @@
   "dismissable_banner.explore_statuses": "Disse innleggene fra denne og andre servere i det desentraliserte nettverket får økt oppmerksomhet på denne serveren akkurat nå. Nyere innlegg med flere fremhevinger og favoritter er rangert høyere.",
   "dismissable_banner.explore_tags": "Disse emneknaggene snakker folk om akkurat nå, på denne og andre servere i det desentraliserte nettverket.",
   "dismissable_banner.public_timeline": "Dette er de siste offentlige innleggene fra mennesker på det sosiale nettet som folk på {domain} følger.",
+  "domain_block_modal.block": "Blokker server",
+  "domain_block_modal.block_account_instead": "Blokker @{name} i stedet",
+  "domain_block_modal.they_can_interact_with_old_posts": "Personer fra denne serveren kan samhandle med dine gamle innlegg.",
+  "domain_block_modal.they_cant_follow": "Ingen fra denne serveren kan følge deg.",
+  "domain_block_modal.they_wont_know": "De kommer ikke til å få vite at du har valgt å blokkere dem.",
+  "domain_block_modal.title": "Blokker domenet?",
+  "domain_block_modal.you_will_lose_followers": "Alle dine følgere fra denne serveren vil bli fjernet.",
+  "domain_block_modal.you_wont_see_posts": "Du vil ikke se innlegg eller få varsler fra brukere på denne serveren.",
+  "domain_pill.activitypub_lets_connect": "Den lar deg koble til og samhandle med folk ikke bare på Mastodon, men også på tvers av forskjellige sosiale apper.",
+  "domain_pill.activitypub_like_language": "ActivityPub er liksom språket Mastodon snakker med andre sosiale nettverk.",
+  "domain_pill.server": "Server",
+  "domain_pill.their_handle": "Deres håndtak:",
+  "domain_pill.their_server": "Deres digitale hjem, hvor alle innleggene deres bor.",
+  "domain_pill.their_username": "Deres unike identifikator på serveren sin. Det er mulig å finne brukere med samme brukernavn på forskjellige servere.",
+  "domain_pill.username": "Brukernavn",
+  "domain_pill.whats_in_a_handle": "Hva er et håndtak?",
+  "domain_pill.who_they_are": "Siden håndtakene sier hvem noen er og hvor de er, kan du samhandle med folk på tvers av det sosiale nettverket bestående av <button>plattformer som støtter ActivityPub</button>.",
+  "domain_pill.who_you_are": "Fordi ditt håndtak sier hvem du er og hvor du er, kan folk kommunisere med deg på tvers av <button>plattformer som støtter ActivityPub</button>.",
+  "domain_pill.your_handle": "Din håndtak:",
+  "domain_pill.your_server": "Ditt digitale hjem, hvor alle dine innlegg bor. Liker du ikke denne? Flytt till en annen server når som helst og ta med følgerne dine.",
+  "domain_pill.your_username": "Din unike identifikator på denne serveren. Det er mulig å finne brukere med samme brukernavn på forskjellige servere.",
   "embed.instructions": "Kopier koden under for å bygge inn denne statusen på hjemmesiden din.",
   "embed.preview": "Slik kommer det til å se ut:",
   "emoji_button.activity": "Aktivitet",
@@ -228,6 +272,7 @@
   "empty_column.list": "Det er ingenting i denne listen ennå. Når medlemmene av denne listen legger ut nye statuser vil de dukke opp her.",
   "empty_column.lists": "Du har ingen lister enda. Når du lager en, vil den dukke opp her.",
   "empty_column.mutes": "Du har ikke dempet noen brukere enda.",
+  "empty_column.notification_requests": "Alt klart! Det er ingenting her. Når du mottar nye varsler, vises de her i henhold til dine innstillinger.",
   "empty_column.notifications": "Du har ingen varsler ennå. Kommuniser med andre for å begynne samtalen.",
   "empty_column.public": "Det er ingenting her! Skriv noe offentlig, eller følg brukere manuelt fra andre instanser for å fylle den opp",
   "error.unexpected_crash.explanation": "På grunn av en bug i koden vår eller et nettleserkompatibilitetsproblem, kunne denne siden ikke vises riktig.",
@@ -258,13 +303,30 @@
   "filter_modal.select_filter.subtitle": "Bruk en eksisterende kategori eller opprett en ny",
   "filter_modal.select_filter.title": "Filtrer dette innlegget",
   "filter_modal.title.status": "Filtrer et innlegg",
+  "filter_warning.matches_filter": "Passer med filteret «{title}»",
+  "filtered_notifications_banner.pending_requests": "Fra {count, plural, =0 {ingen} one {en person} other {# folk}} du kanskje kjenner",
+  "filtered_notifications_banner.title": "Filtrerte varsler",
   "firehose.all": "Alt",
   "firehose.local": "Denne serveren",
   "firehose.remote": "Andre servere",
   "follow_request.authorize": "Autoriser",
   "follow_request.reject": "Avvis",
   "follow_requests.unlocked_explanation": "Selv om kontoen din ikke er låst, tror {domain} ansatte at du kanskje vil gjennomgå forespørsler fra disse kontoene manuelt.",
+  "follow_suggestions.curated_suggestion": "Utvalgt av staben",
+  "follow_suggestions.dismiss": "Ikke vis igjen",
+  "follow_suggestions.featured_longer": "Håndplukket av {domain}-teamet",
+  "follow_suggestions.friends_of_friends_longer": "Populært blant personer du følger",
+  "follow_suggestions.hints.featured": "Denne profilen er håndplukket av {domain}-teamet.",
+  "follow_suggestions.hints.friends_of_friends": "Denne profilen er populær blant de du følger.",
+  "follow_suggestions.hints.most_followed": "Denne profilen er en av de på {domain} som har flest følgere.",
+  "follow_suggestions.hints.most_interactions": "Denne profilen fått mye oppmerksomhet i det siste på {domain}.",
+  "follow_suggestions.hints.similar_to_recently_followed": "Denne profilen ligner på profilene du nylig har fulgt.",
+  "follow_suggestions.personalized_suggestion": "Personlig forslag",
+  "follow_suggestions.popular_suggestion": "Populært forslag",
+  "follow_suggestions.popular_suggestion_longer": "Populært på {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Likner på profiler du nylig har fulgt",
   "follow_suggestions.view_all": "Vis alle",
+  "follow_suggestions.who_to_follow": "Hvem du kan følge",
   "followed_tags": "Fulgte emneknagger",
   "footer.about": "Om",
   "footer.directory": "Profilkatalog",
@@ -291,6 +353,14 @@
   "hashtag.follow": "Følg emneknagg",
   "hashtag.unfollow": "Slutt å følge emneknagg",
   "hashtags.and_other": "…og {count, plural, one{en til} other {# til}}",
+  "hints.profiles.followers_may_be_missing": "Følgere for denne profilen mangler kanskje.",
+  "hints.profiles.follows_may_be_missing": "Hvem denne profilen følger mangler kanskje.",
+  "hints.profiles.posts_may_be_missing": "Det kan hende at noen av innleggene til denne profilen mangler.",
+  "hints.profiles.see_more_followers": "Se flere følgere på {domain}",
+  "hints.profiles.see_more_follows": "Se flere som følger på {domain}",
+  "hints.profiles.see_more_posts": "Se flere innlegg på {domain}",
+  "hints.threads.replies_may_be_missing": "Svar fra andre servere mangler kanskje.",
+  "hints.threads.see_more": "Se flere svar på {domain}",
   "home.column_settings.show_reblogs": "Vis fremhevinger",
   "home.column_settings.show_replies": "Vis svar",
   "home.hide_announcements": "Skjul kunngjøring",
@@ -298,6 +368,17 @@
   "home.pending_critical_update.link": "Se oppdateringer",
   "home.pending_critical_update.title": "Kritisk sikkerhetsoppdatering er tilgjengelig!",
   "home.show_announcements": "Vis kunngjøring",
+  "ignore_notifications_modal.disclaimer": "Mastodon kan ikke informere brukere at du har ignorert deres varsler. Å ignorere varsler vil ikke stoppe meldinger selv fra å bli sendt.",
+  "ignore_notifications_modal.filter_instead": "Filtrer i stedet",
+  "ignore_notifications_modal.filter_to_act_users": "Du kan fremdeles akseptere, avvise eller rapportere brukere",
+  "ignore_notifications_modal.filter_to_avoid_confusion": "Filtrering bidrar til å unngå potensiell forvirring",
+  "ignore_notifications_modal.filter_to_review_separately": "Du kan gjennomgå filtrerte varsler for seg",
+  "ignore_notifications_modal.ignore": "Overse varsler",
+  "ignore_notifications_modal.limited_accounts_title": "Overse varsler fra modererte kontoer?",
+  "ignore_notifications_modal.new_accounts_title": "Overse varsler fra nye kontoer?",
+  "ignore_notifications_modal.not_followers_title": "Overse varsler fra folk som ikke følger deg?",
+  "ignore_notifications_modal.not_following_title": "Overse varsler fra folk du ikke følger?",
+  "ignore_notifications_modal.private_mentions_title": "Overse varsler fra uoppfordrede private omtaler?",
   "interaction_modal.description.favourite": "Med en konto på Mastodon, kan du favorittmarkere dette innlegget for å la forfatteren vite at du satte pris på det, og lagre innlegget til senere.",
   "interaction_modal.description.follow": "Med en konto på Mastodon, kan du følge {name} for å få innleggene deres i tidslinjen din.",
   "interaction_modal.description.reblog": "Med en konto på Mastodon, kan du fremheve dette innlegget for å dele det med dine egne følgere.",
@@ -358,6 +439,8 @@
   "limited_account_hint.action": "Vis profil likevel",
   "limited_account_hint.title": "Denne profilen har blitt skjult av moderatorene til {domain}.",
   "link_preview.author": "Av {name}",
+  "link_preview.more_from_author": "Mer fra {name}",
+  "link_preview.shares": "{count, plural, one {{counter} innlegg} other {{counter} innlegg}}",
   "lists.account.add": "Legg til i listen",
   "lists.account.remove": "Fjern fra listen",
   "lists.delete": "Slett listen",
@@ -376,7 +459,17 @@
   "loading_indicator.label": "Laster…",
   "media_gallery.toggle_visible": "Veksle synlighet",
   "moved_to_account_banner.text": "Din konto {disabledAccount} er for øyeblikket deaktivert fordi du flyttet til {movedToAccount}.",
+  "mute_modal.hide_from_notifications": "Ikke varsle",
+  "mute_modal.hide_options": "Skjul alternativer",
+  "mute_modal.indefinite": "Til jeg opphever dempingen",
+  "mute_modal.show_options": "Vis alternativer",
+  "mute_modal.they_can_mention_and_follow": "De kan nevne og følge deg, men du kommer ikke til å se dem.",
+  "mute_modal.they_wont_know": "De kommer ikke til å få vite at du har valgt å skjule dem.",
+  "mute_modal.title": "Demp bruker?",
+  "mute_modal.you_wont_see_mentions": "Du kommer ikke til å se innlegg som nevner dem.",
+  "mute_modal.you_wont_see_posts": "De kan fremdeles se dine innlegg, men du kommer ikke til å se deres.",
   "navigation_bar.about": "Om",
+  "navigation_bar.administration": "Administrasjon",
   "navigation_bar.advanced_interface": "Åpne i det avanserte nettgrensesnittet",
   "navigation_bar.blocks": "Blokkerte brukere",
   "navigation_bar.bookmarks": "Bokmerker",
@@ -393,6 +486,7 @@
   "navigation_bar.follows_and_followers": "Følginger og følgere",
   "navigation_bar.lists": "Lister",
   "navigation_bar.logout": "Logg ut",
+  "navigation_bar.moderation": "Moderering",
   "navigation_bar.mutes": "Dempede brukere",
   "navigation_bar.opened_in_classic_interface": "Innlegg, kontoer og andre spesifikke sider åpnes som standard i det klassiske webgrensesnittet.",
   "navigation_bar.personal": "Personlig",
@@ -403,6 +497,7 @@
   "navigation_bar.security": "Sikkerhet",
   "not_signed_in_indicator.not_signed_in": "Du må logge inn for å få tilgang til denne ressursen.",
   "notification.admin.report": "{name} rapporterte {target}",
+  "notification.admin.report_account": "{name} rapporterte {count, plural, one {et innlegg} other {# innlegg}} fra {target} for {category}",
   "notification.admin.sign_up": "{name} registrerte seg",
   "notification.favourite": "{name} favorittmarkerte innlegget ditt",
   "notification.follow": "{name} fulgte deg",
@@ -417,6 +512,8 @@
   "notifications.column_settings.admin.sign_up": "Nye registreringer:",
   "notifications.column_settings.alert": "Skrivebordsvarslinger",
   "notifications.column_settings.favourite": "Favoritter:",
+  "notifications.column_settings.filter_bar.advanced": "Vis alle kategorier",
+  "notifications.column_settings.filter_bar.category": "Hurtigfiltreringslinje",
   "notifications.column_settings.follow": "Nye følgere:",
   "notifications.column_settings.follow_request": "Nye følgerforespørsler:",
   "notifications.column_settings.mention": "Nevnt:",
@@ -442,6 +539,23 @@
   "notifications.permission_denied": "Skrivebordsvarsler er ikke tilgjengelige på grunn av tidligere nektet nettlesertillatelser",
   "notifications.permission_denied_alert": "Skrivebordsvarsler kan ikke aktiveres, ettersom lesertillatelse har blitt nektet før",
   "notifications.permission_required": "Skrivebordsvarsler er utilgjengelige fordi nødvendige rettigheter ikke er gitt.",
+  "notifications.policy.accept": "Godta",
+  "notifications.policy.accept_hint": "Vis i varsler",
+  "notifications.policy.drop": "Overse",
+  "notifications.policy.drop_hint": "Send til avgrunnen, for aldri å bli sett igjen",
+  "notifications.policy.filter": "Filter",
+  "notifications.policy.filter_hint": "Send til filtrert varslingsinnboks",
+  "notifications.policy.filter_limited_accounts_hint": "Begrenset av serverens moderatorer",
+  "notifications.policy.filter_limited_accounts_title": "Modererte kontoer",
+  "notifications.policy.filter_new_accounts.hint": "Opprettet {days, plural, one {den siste dagen} other {i de siste # dagene}}",
+  "notifications.policy.filter_new_accounts_title": "Nye kontoer",
+  "notifications.policy.filter_not_followers_hint": "Inkludert personer som har fulgt deg mindre enn {days, plural, one {en dag} other {# dager}}",
+  "notifications.policy.filter_not_followers_title": "Personer som ikke følger deg",
+  "notifications.policy.filter_not_following_hint": "Inntil du manuelt godkjenner dem",
+  "notifications.policy.filter_not_following_title": "Personer du ikke følger",
+  "notifications.policy.filter_private_mentions_hint": "Filtrert med mindre det er et svar som omtaler deg, eller hvis du følger avsenderen",
+  "notifications.policy.filter_private_mentions_title": "Uoppfordrede private omtaler",
+  "notifications.policy.title": "Behandle varsler fra…",
   "notifications_permission_banner.enable": "Skru på skrivebordsvarsler",
   "notifications_permission_banner.how_to_control": "For å motta varsler når Mastodon ikke er åpne, aktiver desktop varsler. Du kan kontrollere nøyaktig hvilke typer interaksjoner genererer skrivebordsvarsler gjennom {icon} -knappen ovenfor når de er aktivert.",
   "notifications_permission_banner.title": "Aldri gå glipp av noe",
@@ -602,7 +716,7 @@
   "sign_in_banner.sso_redirect": "Logg inn eller registrer deg",
   "status.admin_account": "Åpne moderatorgrensesnittet for @{name}",
   "status.admin_domain": "Åpne moderatorgrensesnittet for {domain}",
-  "status.admin_status": "Åpne denne statusen i moderatorgrensesnittet",
+  "status.admin_status": "Åpne dette innlegget i moderatorgrensesnittet",
   "status.block": "Blokker @{name}",
   "status.bookmark": "Bokmerke",
   "status.cancel_reblog_private": "Fjern fremheving",
diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json
index 14957c16d4072e..e925246bf75954 100644
--- a/app/javascript/mastodon/locales/pt-BR.json
+++ b/app/javascript/mastodon/locales/pt-BR.json
@@ -11,6 +11,7 @@
   "about.not_available": "Esta informação não foi disponibilizada neste servidor.",
   "about.powered_by": "Redes sociais descentralizadas alimentadas por {mastodon}",
   "about.rules": "Regras do servidor",
+  "account.account_note_header": "Nota pessoal",
   "account.add_or_remove_from_list": "Adicionar ou remover de listas",
   "account.badges.bot": "Robô",
   "account.badges.group": "Grupo",
@@ -61,6 +62,7 @@
   "account.requested_follow": "{name} quer te seguir",
   "account.share": "Compartilhar perfil de @{name}",
   "account.show_reblogs": "Mostrar boosts de @{name}",
+  "account.statuses_counter": "{count, plural, one {{counter} publicação} other {{counter} publicações}}",
   "account.unblock": "Desbloquear @{name}",
   "account.unblock_domain": "Desbloquear domínio {domain}",
   "account.unblock_short": "Desbloquear",
@@ -95,6 +97,8 @@
   "block_modal.title": "Bloquear usuário?",
   "block_modal.you_wont_see_mentions": "Você não verá publicações que os mencionem.",
   "boost_modal.combo": "Pressione {combo} para pular isso na próxima vez",
+  "boost_modal.reblog": "Impulsionar a publicação?",
+  "boost_modal.undo_reblog": "Retirar o impulsionamento do post?",
   "bundle_column_error.copy_stacktrace": "Copiar relatório do erro",
   "bundle_column_error.error.body": "A página solicitada não pôde ser renderizada. Pode ser devido a um erro no nosso código, ou um problema de compatibilidade do seu navegador.",
   "bundle_column_error.error.title": "Ah, não!",
@@ -190,6 +194,8 @@
   "confirmations.unfollow.confirm": "Deixar de seguir",
   "confirmations.unfollow.message": "Você tem certeza de que deseja deixar de seguir {name}?",
   "confirmations.unfollow.title": "Deixar de seguir o usuário?",
+  "content_warning.hide": "Ocultar post",
+  "content_warning.show": "Mostrar mesmo assim",
   "conversation.delete": "Excluir conversa",
   "conversation.mark_as_read": "Marcar como lida",
   "conversation.open": "Ver conversa",
@@ -297,6 +303,8 @@
   "filter_modal.select_filter.subtitle": "Use uma categoria existente ou crie uma nova",
   "filter_modal.select_filter.title": "Filtrar esta publicação",
   "filter_modal.title.status": "Filtrar uma publicação",
+  "filter_warning.matches_filter": "Correspondente ao filtro “{title}”",
+  "filtered_notifications_banner.pending_requests": "Por {count, plural, =0 {no one} one {one person} other {# people}} que você talvez conheça",
   "filtered_notifications_banner.title": "Notificações filtradas",
   "firehose.all": "Tudo",
   "firehose.local": "Este servidor",
@@ -345,6 +353,14 @@
   "hashtag.follow": "Seguir hashtag",
   "hashtag.unfollow": "Parar de seguir hashtag",
   "hashtags.and_other": "…e {count, plural, one {}other {outros #}}",
+  "hints.profiles.followers_may_be_missing": "Os seguidores deste perfil podem estar faltando.",
+  "hints.profiles.follows_may_be_missing": "Os seguidores deste perfil podem estar faltando.",
+  "hints.profiles.posts_may_be_missing": "É possível que algumas publicações deste perfil estejam faltando.",
+  "hints.profiles.see_more_followers": "Ver mais seguidores no {domain}",
+  "hints.profiles.see_more_follows": "Ver mais seguidores no {domain}",
+  "hints.profiles.see_more_posts": "Ver mais publicações em {domain}",
+  "hints.threads.replies_may_be_missing": "Respostas de outros servidores podem estar faltando.",
+  "hints.threads.see_more": "Ver mais respostas no {domain}",
   "home.column_settings.show_reblogs": "Mostrar boosts",
   "home.column_settings.show_replies": "Mostrar respostas",
   "home.hide_announcements": "Ocultar comunicados",
@@ -352,6 +368,13 @@
   "home.pending_critical_update.link": "Ver atualizações",
   "home.pending_critical_update.title": "Atualização de segurança crítica disponível!",
   "home.show_announcements": "Mostrar comunicados",
+  "ignore_notifications_modal.disclaimer": "O Mastodon não pode informar aos usuários que você ignorou suas notificações. Ignorar notificações não impedirá que as próprias mensagens sejam enviadas.",
+  "ignore_notifications_modal.filter_instead": "Filtrar em vez disso",
+  "ignore_notifications_modal.filter_to_act_users": "Você ainda conseguirá aceitar, rejeitar ou denunciar usuários",
+  "ignore_notifications_modal.filter_to_avoid_confusion": "A filtragem ajuda a evitar confusão potencial",
+  "ignore_notifications_modal.filter_to_review_separately": "Você pode rever notificações filtradas separadamente",
+  "ignore_notifications_modal.ignore": "Ignorar notificações",
+  "ignore_notifications_modal.limited_accounts_title": "Ignorar notificações de contas moderadas?",
   "ignore_notifications_modal.new_accounts_title": "Ignorar notificações de novas contas?",
   "ignore_notifications_modal.not_followers_title": "Ignorar notificações de pessoas que não seguem você?",
   "ignore_notifications_modal.not_following_title": "Ignorar notificações de pessoas que você não segue?",
@@ -446,6 +469,7 @@
   "mute_modal.you_wont_see_mentions": "Você não verá publicações que os mencionem.",
   "mute_modal.you_wont_see_posts": "Eles ainda poderão ver suas publicações, mas você não verá as deles.",
   "navigation_bar.about": "Sobre",
+  "navigation_bar.administration": "Administração",
   "navigation_bar.advanced_interface": "Ativar na interface web avançada",
   "navigation_bar.blocks": "Usuários bloqueados",
   "navigation_bar.bookmarks": "Salvos",
@@ -462,6 +486,7 @@
   "navigation_bar.follows_and_followers": "Segue e seguidores",
   "navigation_bar.lists": "Listas",
   "navigation_bar.logout": "Sair",
+  "navigation_bar.moderation": "Moderação",
   "navigation_bar.mutes": "Usuários silenciados",
   "navigation_bar.opened_in_classic_interface": "Publicações, contas e outras páginas específicas são abertas por padrão na interface 'web' clássica.",
   "navigation_bar.personal": "Pessoal",
@@ -472,10 +497,23 @@
   "navigation_bar.security": "Segurança",
   "not_signed_in_indicator.not_signed_in": "Você precisa se autenticar para acessar este recurso.",
   "notification.admin.report": "{name} denunciou {target}",
+  "notification.admin.report_account": "{name} reportou {count, plural, one {Um post} other {# posts}} de {target} para {category}",
+  "notification.admin.report_account_other": "{name} reportou {count, plural, one {Um post} other {# posts}} de {target}",
+  "notification.admin.report_statuses": "{name} Reportou {target} para {category}",
+  "notification.admin.report_statuses_other": "{name} denunciou {target}",
   "notification.admin.sign_up": "{name} se inscreveu",
+  "notification.admin.sign_up.name_and_others": "{name} e {count, plural, one {# other} other {# outros}}",
   "notification.favourite": "{name} favoritou sua publicação",
+  "notification.favourite.name_and_others_with_link": "{name} e <a>{count, plural, one {# outro} other {# others}}</a> favoritaram a publicação",
   "notification.follow": "{name} te seguiu",
+  "notification.follow.name_and_others": "{name} e {count, plural, one {# other} other {# outros}} seguiu você",
   "notification.follow_request": "{name} quer te seguir",
+  "notification.follow_request.name_and_others": "{name} e {count, plural, one {# other} other {# outros}} pediu para seguir você",
+  "notification.label.mention": "Menção",
+  "notification.label.private_mention": "Menção privada",
+  "notification.label.private_reply": "Resposta privada",
+  "notification.label.reply": "Resposta",
+  "notification.mention": "Menção",
   "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.",
diff --git a/app/javascript/mastodon/locales/pt-PT.json b/app/javascript/mastodon/locales/pt-PT.json
index e2414963c55e3c..c5d84b9ac6f092 100644
--- a/app/javascript/mastodon/locales/pt-PT.json
+++ b/app/javascript/mastodon/locales/pt-PT.json
@@ -97,6 +97,8 @@
   "block_modal.title": "Bloquear utilizador?",
   "block_modal.you_wont_see_mentions": "Não verá publicações que os mencionem.",
   "boost_modal.combo": "Pode clicar {combo} para não voltar a ver",
+  "boost_modal.reblog": "Impulsionar a publicação?",
+  "boost_modal.undo_reblog": "Retirar post?",
   "bundle_column_error.copy_stacktrace": "Copiar relatório de erros",
   "bundle_column_error.error.body": "A página solicitada não pôde ser sintetizada. Isto pode ser devido a uma falha no nosso código ou a um problema de compatibilidade com o navegador.",
   "bundle_column_error.error.title": "Ó, não!",
@@ -192,6 +194,8 @@
   "confirmations.unfollow.confirm": "Deixar de seguir",
   "confirmations.unfollow.message": "De certeza que queres deixar de seguir {name}?",
   "confirmations.unfollow.title": "Deixar de seguir utilizador?",
+  "content_warning.hide": "Ocultar publicação",
+  "content_warning.show": "Mostrar mesmo assim",
   "conversation.delete": "Eliminar conversa",
   "conversation.mark_as_read": "Marcar como lida",
   "conversation.open": "Ver conversa",
@@ -299,6 +303,7 @@
   "filter_modal.select_filter.subtitle": "Utilize uma categoria existente ou crie uma nova",
   "filter_modal.select_filter.title": "Filtrar esta publicação",
   "filter_modal.title.status": "Filtrar uma publicação",
+  "filter_warning.matches_filter": "Corresponde ao filtro “{title}”",
   "filtered_notifications_banner.pending_requests": "De {count, plural, =0 {ninguém} one {uma pessoa} other {# pessoas}} que pode conhecer",
   "filtered_notifications_banner.title": "Notificações filtradas",
   "firehose.all": "Todas",
@@ -348,6 +353,12 @@
   "hashtag.follow": "Seguir #etiqueta",
   "hashtag.unfollow": "Deixar de seguir #etiqueta",
   "hashtags.and_other": "…e {count, plural, other {mais #}}",
+  "hints.profiles.followers_may_be_missing": "Podem faltar seguidores neste perfil.",
+  "hints.profiles.follows_may_be_missing": "O número de perfis seguidos por este perfil pode faltar.",
+  "hints.profiles.posts_may_be_missing": "Podem faltar alguns posts deste perfil.",
+  "hints.profiles.see_more_followers": "Ver mais seguidores no {domain}",
+  "hints.profiles.see_more_follows": "Veja mais perfis seguidos em {domain}",
+  "hints.profiles.see_more_posts": "Ver mais posts em {domain}",
   "home.column_settings.show_reblogs": "Mostrar impulsos",
   "home.column_settings.show_replies": "Mostrar respostas",
   "home.hide_announcements": "Ocultar comunicações",
diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json
index dfb1309ddfd2af..3d7c5416c9e8eb 100644
--- a/app/javascript/mastodon/locales/sk.json
+++ b/app/javascript/mastodon/locales/sk.json
@@ -92,6 +92,7 @@
   "block_modal.title": "Blokovať užívateľa?",
   "block_modal.you_wont_see_mentions": "Neuvidíš príspevky, ktoré ich spomínajú.",
   "boost_modal.combo": "Nabudúce môžete preskočiť stlačením {combo}",
+  "boost_modal.reblog": "Vyzdvihnúť príspevok?",
   "bundle_column_error.copy_stacktrace": "Kopírovať chybovú hlášku",
   "bundle_column_error.error.body": "Požadovanú stránku nebolo možné vykresliť. Môže to byť spôsobené chybou v našom kóde alebo problémom s kompatibilitou prehliadača.",
   "bundle_column_error.error.title": "Ale nie!",
@@ -187,6 +188,8 @@
   "confirmations.unfollow.confirm": "Prestať sledovať",
   "confirmations.unfollow.message": "Určite chcete prestať sledovať {name}?",
   "confirmations.unfollow.title": "Prestať sledovať užívateľa?",
+  "content_warning.hide": "Skryť príspevok",
+  "content_warning.show": "Aj tak zobraziť",
   "conversation.delete": "Vymazať konverzáciu",
   "conversation.mark_as_read": "Označiť ako prečítanú",
   "conversation.open": "Zobraziť konverzáciu",
@@ -285,6 +288,7 @@
   "filter_modal.select_filter.subtitle": "Použite existujúcu kategóriu alebo vytvorte novú",
   "filter_modal.select_filter.title": "Filtrovanie tohto príspevku",
   "filter_modal.title.status": "Filtrovanie príspevku",
+  "filter_warning.matches_filter": "Zhody triedenia “{title}”",
   "filtered_notifications_banner.title": "Filtrované oznámenia",
   "firehose.all": "Všetko",
   "firehose.local": "Tento server",
@@ -424,6 +428,7 @@
   "mute_modal.show_options": "Zobraziť možnosti",
   "mute_modal.title": "Stíšiť užívateľa?",
   "navigation_bar.about": "O tomto serveri",
+  "navigation_bar.administration": "Spravovanie",
   "navigation_bar.advanced_interface": "Otvoriť v pokročilom webovom rozhraní",
   "navigation_bar.blocks": "Blokované účty",
   "navigation_bar.bookmarks": "Záložky",
@@ -440,6 +445,7 @@
   "navigation_bar.follows_and_followers": "Sledovania a sledovatelia",
   "navigation_bar.lists": "Zoznamy",
   "navigation_bar.logout": "Odhlásiť sa",
+  "navigation_bar.moderation": "Moderovanie",
   "navigation_bar.mutes": "Stíšené účty",
   "navigation_bar.opened_in_classic_interface": "Príspevky, účty a iné špeciálne stránky sú predvolene otvárané v klasickom webovom rozhraní.",
   "navigation_bar.personal": "Osobné",
@@ -474,8 +480,11 @@
   "notification.update": "{name} upravuje príspevok",
   "notification_requests.accept": "Prijať",
   "notification_requests.dismiss": "Zamietnuť",
+  "notification_requests.edit_selection": "Uprav",
+  "notification_requests.exit_selection": "Hotovo",
   "notification_requests.notifications_from": "Oboznámenia od {name}",
   "notification_requests.title": "Filtrované oboznámenia",
+  "notification_requests.view": "Zobraz upozornenia",
   "notifications.clear": "Vyčistiť upozornenia",
   "notifications.clear_confirmation": "Určite chcete nenávratne odstrániť všetky svoje upozornenia?",
   "notifications.clear_title": "Vyčistiť upozornenia?",
@@ -509,6 +518,9 @@
   "notifications.permission_denied": "Upozornenia na ploche sú nedostupné pre už skôr zamietnutú požiadavku prehliadača",
   "notifications.permission_denied_alert": "Upozornenia na ploche nemôžu byť zapnuté, pretože požiadavka prehliadača bola už skôr zamietnutá",
   "notifications.permission_required": "Upozornenia na ploche sú nedostupné, pretože neboli udelené potrebné povolenia.",
+  "notifications.policy.drop": "Ignoruj",
+  "notifications.policy.filter": "Triediť",
+  "notifications.policy.filter_limited_accounts_title": "Moderované účty",
   "notifications.policy.filter_new_accounts_title": "Nové účty",
   "notifications.policy.filter_not_followers_title": "Ľudia, ktorí ťa nenasledujú",
   "notifications.policy.filter_not_following_title": "Ľudia, ktorých nenasleduješ",
diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json
index 905938d158d3d9..714348db251756 100644
--- a/app/javascript/mastodon/locales/uk.json
+++ b/app/javascript/mastodon/locales/uk.json
@@ -514,13 +514,13 @@
   "notification.label.private_reply": "Приватна відповідь",
   "notification.label.reply": "Відповідь",
   "notification.mention": "Згадка",
-  "notification.moderation-warning.learn_more": "Дізнатися більше",
+  "notification.moderation-warning.learn_more": "Докладніше",
   "notification.moderation_warning": "Ви отримали попередження модерації",
-  "notification.moderation_warning.action_delete_statuses": "Деякі з ваших дописів було видалено.",
+  "notification.moderation_warning.action_delete_statuses": "Деякі з ваших дописів було вилучено.",
   "notification.moderation_warning.action_disable": "Ваш обліковий запис було вимкнено.",
-  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Деякі з ваших дописів були позначені як чутливі.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Деякі з ваших дописів були позначені делікатними.",
   "notification.moderation_warning.action_none": "Ваш обліковий запис отримав попередження модерації.",
-  "notification.moderation_warning.action_sensitive": "Відтепер ваші дописи будуть позначені як чутливі.",
+  "notification.moderation_warning.action_sensitive": "Відтепер ваші дописи будуть позначені делікатними.",
   "notification.moderation_warning.action_silence": "Ваш обліковий запис було обмежено.",
   "notification.moderation_warning.action_suspend": "Ваш обліковий запис було заблоковано.",
   "notification.own_poll": "Ваше опитування завершилося",
diff --git a/app/javascript/mastodon/locales/vi.json b/app/javascript/mastodon/locales/vi.json
index 48f56a089019d8..80a766683a0786 100644
--- a/app/javascript/mastodon/locales/vi.json
+++ b/app/javascript/mastodon/locales/vi.json
@@ -56,7 +56,7 @@
   "account.no_bio": "Chưa có miêu tả.",
   "account.open_original_page": "Mở trang gốc",
   "account.posts": "Tút",
-  "account.posts_with_replies": "Lượt trả lời",
+  "account.posts_with_replies": "Trả lời",
   "account.report": "Báo cáo @{name}",
   "account.requested": "Đang chờ chấp thuận. Nhấp vào đây để hủy yêu cầu theo dõi",
   "account.requested_follow": "{name} yêu cầu theo dõi bạn",
@@ -118,15 +118,15 @@
   "closed_registrations_modal.title": "Đăng ký Mastodon",
   "column.about": "Giới thiệu",
   "column.blocks": "Người đã chặn",
-  "column.bookmarks": "Đã lưu",
+  "column.bookmarks": "Những tút đã lưu",
   "column.community": "Máy chủ này",
   "column.direct": "Nhắn riêng",
   "column.directory": "Tìm người cùng sở thích",
   "column.domain_blocks": "Máy chủ đã chặn",
-  "column.favourites": "Lượt thích",
+  "column.favourites": "Những tút đã thích",
   "column.firehose": "Bảng tin",
   "column.follow_requests": "Yêu cầu theo dõi",
-  "column.home": "Trang chính",
+  "column.home": "Trang chủ",
   "column.lists": "Danh sách",
   "column.mutes": "Người đã ẩn",
   "column.notifications": "Thông báo",
@@ -368,8 +368,17 @@
   "home.pending_critical_update.link": "Xem bản cập nhật",
   "home.pending_critical_update.title": "Có bản cập nhật bảo mật quan trọng!",
   "home.show_announcements": "Xem thông báo máy chủ",
+  "ignore_notifications_modal.disclaimer": "Mastodon sẽ không thông báo cho người dùng rằng bạn đã bỏ qua thông báo của họ. Họ sẽ vẫn có thể tương tác với bạn.",
+  "ignore_notifications_modal.filter_instead": "Lọc thay thế",
   "ignore_notifications_modal.filter_to_act_users": "Bạn vẫn có thể chấp nhận, từ chối hoặc báo cáo người khác",
-  "ignore_notifications_modal.filter_to_review_separately": "Bạn có thể xem lại các thông báo đã lọc riêng biệt",
+  "ignore_notifications_modal.filter_to_avoid_confusion": "Lọc giúp tránh nhầm lẫn tiềm ẩn",
+  "ignore_notifications_modal.filter_to_review_separately": "Bạn có thể xem lại riêng các thông báo đã lọc",
+  "ignore_notifications_modal.ignore": "Bỏ qua thông báo",
+  "ignore_notifications_modal.limited_accounts_title": "Bỏ qua thông báo từ các tài khoản bị kiểm duyệt?",
+  "ignore_notifications_modal.new_accounts_title": "Bỏ qua thông báo từ các tài khoản mới đăng ký?",
+  "ignore_notifications_modal.not_followers_title": "Bỏ qua thông báo từ những người chưa theo dõi bạn?",
+  "ignore_notifications_modal.not_following_title": "Bỏ qua thông báo từ những người bạn không theo dõi?",
+  "ignore_notifications_modal.private_mentions_title": "Bỏ qua thông báo từ những lượt Nhắn Riêng không mong muốn?",
   "interaction_modal.description.favourite": "Với tài khoản Mastodon, bạn có thể cho người đăng biết bạn thích tút này và lưu lại tút.",
   "interaction_modal.description.follow": "Với tài khoản Mastodon, bạn có thể theo dõi {name} để tút của họ hiện trên bảng tin của mình.",
   "interaction_modal.description.reblog": "Với tài khoản Mastodon, bạn có thể đăng lại tút này để chia sẻ nó với những người đang theo dõi bạn.",
@@ -463,14 +472,14 @@
   "navigation_bar.administration": "Quản trị",
   "navigation_bar.advanced_interface": "Dùng bố cục nhiều cột",
   "navigation_bar.blocks": "Người đã chặn",
-  "navigation_bar.bookmarks": "Đã lưu",
+  "navigation_bar.bookmarks": "Tút lưu",
   "navigation_bar.community_timeline": "Cộng đồng",
   "navigation_bar.compose": "Soạn tút mới",
   "navigation_bar.direct": "Nhắn riêng",
   "navigation_bar.discover": "Khám phá",
   "navigation_bar.domain_blocks": "Máy chủ đã ẩn",
   "navigation_bar.explore": "Xu hướng",
-  "navigation_bar.favourites": "Lượt thích",
+  "navigation_bar.favourites": "Tút thích",
   "navigation_bar.filters": "Bộ lọc từ ngữ",
   "navigation_bar.follow_requests": "Yêu cầu theo dõi",
   "navigation_bar.followed_tags": "Hashtag theo dõi",
@@ -543,6 +552,7 @@
   "notification_requests.minimize_banner": "Tinh giản banner lọc thông báo",
   "notification_requests.notifications_from": "Thông báo từ {name}",
   "notification_requests.title": "Thông báo đã lọc",
+  "notification_requests.view": "Hiện thông báo",
   "notifications.clear": "Xóa hết thông báo",
   "notifications.clear_confirmation": "Bạn thật sự muốn xóa vĩnh viễn tất cả thông báo của mình?",
   "notifications.clear_title": "Xóa hết thông báo?",
@@ -579,6 +589,12 @@
   "notifications.permission_denied": "Trình duyệt không cho phép hiển thị thông báo trên màn hình.",
   "notifications.permission_denied_alert": "Không thể bật thông báo trên màn hình bởi vì trình duyệt đã cấm trước đó",
   "notifications.permission_required": "Không hiện thông báo trên màn hình bởi vì chưa cho phép.",
+  "notifications.policy.accept": "Có",
+  "notifications.policy.accept_hint": "Hiện trong thông báo",
+  "notifications.policy.drop": "Không",
+  "notifications.policy.drop_hint": "Loại bỏ vĩnh viễn",
+  "notifications.policy.filter": "Lọc",
+  "notifications.policy.filter_hint": "Cho vào mục thông báo bị lọc",
   "notifications.policy.filter_limited_accounts_hint": "Chỉ dành cho kiểm duyệt viên",
   "notifications.policy.filter_limited_accounts_title": "Kiểm duyệt tài khoản",
   "notifications.policy.filter_new_accounts.hint": "Đã tạo trong vòng {days, plural, other {# ngày}}",
@@ -589,6 +605,7 @@
   "notifications.policy.filter_not_following_title": "Những người bạn không theo dõi",
   "notifications.policy.filter_private_mentions_hint": "Được lọc trừ khi nó trả lời lượt nhắc từ bạn hoặc nếu bạn theo dõi người gửi",
   "notifications.policy.filter_private_mentions_title": "Lượt nhắc riêng tư không được yêu cầu",
+  "notifications.policy.title": "Quản lý thông báo từ…",
   "notifications_permission_banner.enable": "Cho phép thông báo trên màn hình",
   "notifications_permission_banner.how_to_control": "Hãy bật thông báo trên màn hình để không bỏ lỡ những thông báo từ Mastodon. Một khi đã bật, bạn có thể lựa chọn từng loại thông báo khác nhau thông qua {icon} nút bên dưới.",
   "notifications_permission_banner.title": "Không bỏ lỡ điều thú vị nào",
diff --git a/config/locales/doorkeeper.et.yml b/config/locales/doorkeeper.et.yml
index 13d3f40fea5e2b..ffc42239a90296 100644
--- a/config/locales/doorkeeper.et.yml
+++ b/config/locales/doorkeeper.et.yml
@@ -83,6 +83,7 @@ et:
         access_denied: Ressursi omanik või autoriseerimisserver lükkas taotluse tagasi.
         credential_flow_not_configured: Resource Owner Password Credentials vool ebaõnnestus, kuna Doorkeeper.configure.resource_owner_from_credentials ei ole seadistatud.
         invalid_client: Kliendi autentimine ebaõnnestus. Põhjus kas tundmatu klient, puudulik autentimine või toetamata autentimismeetod.
+        invalid_code_challenge_method: Code challenge meetod peab olema S256,, plain ei ole toetatud.
         invalid_grant: Antud autoriseerimisluba on vale, aegunud, tagasi võetud, ei kattu kasutatud ümbersuunamise URLid või oli antud teisele kliendile.
         invalid_redirect_uri: Antud ümbersuunamise URL ei ole õige.
         invalid_request:
diff --git a/config/locales/doorkeeper.ja.yml b/config/locales/doorkeeper.ja.yml
index 26f7ff5635d996..38c4d2c1aa9ad4 100644
--- a/config/locales/doorkeeper.ja.yml
+++ b/config/locales/doorkeeper.ja.yml
@@ -83,6 +83,7 @@ ja:
         access_denied: リソースの所有者または認証サーバーが要求を拒否しました。
         credential_flow_not_configured: リソース所有者のパスワード Doorkeeper.configure.resource_owner_from_credentials が設定されていないためクレデンシャルフローに失敗しました。
         invalid_client: 不明なクライアントであるか、クライアント情報が含まれていない、またはサポートされていない認証方法のため、クライアントの認証に失敗しました。
+        invalid_code_challenge_method: code challenge methodはS256のみが利用可能です。plainはサポートされていません。
         invalid_grant: 指定された認証許可は無効であるか、期限切れ、取り消されている、リダイレクトURIの不一致、または別のクライアントに発行されています。
         invalid_redirect_uri: 無効なリダイレクトURIが含まれています。
         invalid_request:
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index ca747953f66bcf..012d0d91ee6128 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -31,6 +31,7 @@ en-GB:
       created_msg: Moderation note successfully created!
       destroyed_msg: Moderation note successfully destroyed!
     accounts:
+      add_email_domain_block: Block email domain
       approve: Approve
       approved_msg: Successfully approved %{username}'s sign-up application
       are_you_sure: Are you sure?
@@ -57,6 +58,7 @@ en-GB:
       demote: Demote
       destroyed_msg: "%{username}'s data is now queued to be deleted imminently"
       disable: Freeze
+      disable_sign_in_token_auth: Disable email token authentication
       disable_two_factor_authentication: Disable 2FA
       disabled: Frozen
       display_name: Display name
@@ -65,6 +67,7 @@ en-GB:
       email: Email
       email_status: Email status
       enable: Unfreeze
+      enable_sign_in_token_auth: Enable email token authentication
       enabled: Enabled
       enabled_msg: Successfully unfroze %{username}'s account
       followers: Followers
@@ -129,6 +132,7 @@ en-GB:
       resubscribe: Resubscribe
       role: Role
       search: Search
+      search_same_email_domain: Other users with the same email domain
       search_same_ip: Other users with the same IP
       security: Security
       security_measures:
@@ -169,10 +173,12 @@ en-GB:
         approve_appeal: Approve Appeal
         approve_user: Approve User
         assigned_to_self_report: Assign Report
+        change_email_user: Change Email for User
         change_role_user: Change Role of User
         confirm_user: Confirm User
         create_account_warning: Create Warning
         create_announcement: Create Announcement
+        create_canonical_email_block: Create Email Block
         create_custom_emoji: Create Custom Emoji
         create_domain_allow: Create Domain Allow
         create_domain_block: Create Domain Block
@@ -1081,6 +1087,7 @@ en-GB:
     setup:
       email_settings_hint_html: Click the link we sent you to verify %{email}. We'll wait right here.
       link_not_received: Didn't get a link?
+      new_confirmation_instructions_sent: You will receive a new email with the confirmation link in a few minutes!
       title: Check your inbox
     sign_in:
       preamble_html: Log in with your <strong>%{domain}</strong> credentials. If your account is hosted on a different server, you will not be able to log in here.
@@ -1091,7 +1098,9 @@ en-GB:
       title: Let's get you set up on %{domain}.
     status:
       account_status: Account status
+      confirming: Waiting for email confirmation to be completed.
       functional: Your account is fully operational.
+      pending: Your application is pending review by our staff. This may take some time. You will receive an email if your application is approved.
       redirecting_to: Your account is inactive because it is currently redirecting to %{acct}.
       self_destruct: As %{domain} is closing down, you will only get limited access to your account.
       view_strikes: View past strikes against your account
@@ -1134,6 +1143,9 @@ en-GB:
       before: 'Before proceeding, please read these notes carefully:'
       caches: Content that has been cached by other servers may persist
       data_removal: Your posts and other data will be permanently removed
+      email_change_html: You can <a href="%{path}">change your email address</a> without deleting your account
+      email_contact_html: If it still doesn't arrive, you can email <a href="mailto:%{email}">%{email}</a> for help
+      email_reconfirmation_html: If you are not receiving the confirmation email, you can <a href="%{path}">request it again</a>
       irreversible: You will not be able to restore or reactivate your account
       more_details_html: For more details, see the <a href="%{terms_path}">privacy policy</a>.
       username_available: Your username will become available again
@@ -1366,6 +1378,7 @@ en-GB:
     authentication_methods:
       otp: two-factor authentication app
       password: password
+      sign_in_token: email security code
       webauthn: security keys
     description_html: If you see activity that you don't recognise, consider changing your password and enabling two-factor authentication.
     empty: No authentication history available
@@ -1376,6 +1389,16 @@ en-GB:
     unsubscribe:
       action: Yes, unsubscribe
       complete: Unsubscribed
+      confirmation_html: Are you sure you want to unsubscribe from receiving %{type} for Mastodon on %{domain} to your email at %{email}? You can always re-subscribe from your <a href="%{settings_path}">email notification settings</a>.
+      emails:
+        notification_emails:
+          favourite: favourite notification emails
+          follow: follow notification emails
+          follow_request: follow request emails
+          mention: mention notification emails
+          reblog: boost notification emails
+      resubscribe_html: If you've unsubscribed by mistake, you can re-subscribe from your <a href="%{settings_path}">email notification settings</a>.
+      success_html: You'll no longer receive %{type} for Mastodon on %{domain} to your email at %{email}.
       title: Unsubscribe
   media_attachments:
     validations:
@@ -1456,6 +1479,8 @@ en-GB:
     update:
       subject: "%{name} edited a post"
   notifications:
+    administration_emails: Admin email notifications
+    email_events: Events for email notifications
     email_events_hint: 'Select events that you want to receive notifications for:'
   number:
     human:
@@ -1614,6 +1639,7 @@ en-GB:
     import: Import
     import_and_export: Import and export
     migrate: Account migration
+    notifications: Email notifications
     preferences: Preferences
     profile: Profile
     relationships: Follows and followers
@@ -1860,6 +1886,7 @@ en-GB:
     invalid_otp_token: Invalid two-factor code
     otp_lost_help_html: If you lost access to both, you may get in touch with %{email}
     rate_limited: Too many authentication attempts, try again later.
+    seamless_external_login: You are logged in via an external service, so password and email settings are not available.
     signed_in_as: 'Logged in as:'
   verification:
     extra_instructions_html: <strong>Tip:</strong> The link on your website can be invisible. The important part is <code>rel="me"</code> which prevents impersonation on websites with user-generated content. You can even use a <code>link</code> tag in the header of the page instead of <code>a</code>, but the HTML must be accessible without executing JavaScript.
diff --git a/config/locales/et.yml b/config/locales/et.yml
index 547cc8a64318ed..17fd41a8e3913b 100644
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -215,6 +215,7 @@ et:
         update_custom_emoji: Uuendas kohandatud emotikoni
         update_domain_block: Uuenda domeenipiirangut
         update_ip_block: IP-reegli uuendamine
+        update_report: Uuendamise raport
         update_status: Uuenda postitust
         update_user_role: Uuenda rolli
       actions:
@@ -445,6 +446,9 @@ et:
       title: Jälgimissoovitused
       unsuppress: Taasta jälgimissoovitused
     instances:
+      audit_log:
+        title: Viimatised auditi logid
+        view_all: Vaata täielikke auditi logisid
       availability:
         description_html:
           one: Kui domeenile edastamine nurjub <strong>%{count} päeval</strong>, siis ei tehta enam edastamiskatseid, välja arvatud juhul, kui domeenilt <em>võetakse vastu</em> saadetis.
@@ -612,6 +616,7 @@ et:
       report: 'Teavitus #%{id}'
       reported_account: Teavitatud kontost
       reported_by: Teavitaja
+      reported_with_application: Raporteeritud rakendusega
       resolved: Lahendatud
       resolved_msg: Teavituse lahendamine õnnestus!
       skip_to_actions: Otsuste juurde
@@ -850,7 +855,24 @@ et:
         action: Klõpsa lisainfo saamiseks siia
         message_html: "<strong>Objektihoidla on valesti seadistatud. Kasutajate privaatsus on ohustatud.</strong>"
     tags:
+      moderation:
+        not_trendable: Pole trendis
+        not_usable: Pole kasutatav
+        pending_review: Ootab läbivaatust
+        review_requested: Taodeldud läbivaatust
+        reviewed: Läbivaadatud
+        title: Olek
+        trendable: Trendil
+        unreviewed: Läbivaatamata
+        usable: Kasutatav
+      name: Nimi
+      newest: Uusim
+      oldest: Vanim
+      open: Vaata avalikult
+      reset: Lähtesta
       review: Vaata olek üle
+      search: Otsi
+      title: Märksõnad
       updated_msg: Sildi sätted edukalt uuendatud
     title: Administreerimine
     trends:
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 42554aeb39e96a..c3fa237759f1a1 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -431,7 +431,7 @@ fr:
       no_file: Aucun fichier sélectionné
     export_domain_blocks:
       import:
-        description_html: Vous êtes sur le point d'importer une liste de bloqueurs de domaine. Veuillez examiner cette liste très attentivement, surtout si vous ne l'avez pas créée vous-même.
+        description_html: Vous êtes sur le point d'importer une liste de blocage de domaines. Veuillez examiner cette liste très attentivement, surtout si vous ne l'avez pas créée vous-même.
         existing_relationships_warning: Relations d'abonnement existantes
         private_comment_description_html: 'Pour vous aider à savoir d''où proviennent les blocages importés, ceux-ci seront créés avec le commentaire privé suivant : <q>%{comment}</q>'
         private_comment_template: Importé depuis %{source} le %{date}
diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index 698c7c49e1a1d5..c282a17f92567a 100644
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -31,6 +31,7 @@ ia:
       created_msg: Nota de moderation create con successo!
       destroyed_msg: Nota de moderation destruite con successo!
     accounts:
+      add_email_domain_block: Blocar dominio de e-mail
       approve: Approbar
       approved_msg: Demanda de inscription de %{username} approbate con successo
       are_you_sure: Es tu secur?
@@ -57,6 +58,7 @@ ia:
       demote: Degradar
       destroyed_msg: Le datos de %{username} es ora in cauda pro lor imminente deletion
       disable: Gelar
+      disable_sign_in_token_auth: Disactivar le authentication per token in e-mail
       disable_two_factor_authentication: Disactivar A2F
       disabled: Gelate
       display_name: Nomine a monstrar
@@ -65,6 +67,7 @@ ia:
       email: E-mail
       email_status: Stato de e-mail
       enable: Disgelar
+      enable_sign_in_token_auth: Activar le authentication per token in e-mail
       enabled: Activate
       enabled_msg: Conto de %{username} disgelate con successo
       followers: Sequitores
@@ -129,6 +132,7 @@ ia:
       resubscribe: Resubscriber
       role: Rolo
       search: Cercar
+      search_same_email_domain: Altere usatores con le mesme dominio de e-mail
       search_same_ip: Altere usatores con le mesme IP
       security: Securitate
       security_measures:
@@ -169,21 +173,26 @@ ia:
         approve_appeal: Approbar appello
         approve_user: Approbar usator
         assigned_to_self_report: Assignar reporto
+        change_email_user: Cambiar e-mail pro le usator
         change_role_user: Cambiar le rolo del usator
         confirm_user: Confirmar le usator
         create_account_warning: Crear un advertimento
         create_announcement: Crear annuncio
+        create_canonical_email_block: Crear blocada de e-mail
         create_custom_emoji: Crear emoji personalisate
         create_domain_allow: Crear permisso de dominio
         create_domain_block: Crear blocada de dominio
+        create_email_domain_block: Crear blocada de dominio de e-mail
         create_ip_block: Crear un regula IP
         create_unavailable_domain: Crear dominio indisponibile
         create_user_role: Crear un rolo
         demote_user: Degradar usator
         destroy_announcement: Deler annuncio
+        destroy_canonical_email_block: Deler blocada de e-mail
         destroy_custom_emoji: Deler emoji personalisate
         destroy_domain_allow: Deler permisso de dominio
         destroy_domain_block: Deler blocada de dominio
+        destroy_email_domain_block: Deler blocada de dominio de e-mail
         destroy_instance: Purgar dominio
         destroy_ip_block: Deler le regula IP
         destroy_status: Deler message
@@ -191,8 +200,10 @@ ia:
         destroy_user_role: Destruer rolo
         disable_2fa_user: Disactivar A2F
         disable_custom_emoji: Disactivar emoji personalisate
+        disable_sign_in_token_auth_user: Disactivar le authentication per token de e-mail pro le usator
         disable_user: Disactivar le usator
         enable_custom_emoji: Activar emoji personalisate
+        enable_sign_in_token_auth_user: Activar le authentication per token de e-mail pro le usator
         enable_user: Activar le usator
         memorialize_account: Converter conto in memorial
         promote_user: Promover usator
@@ -222,20 +233,26 @@ ia:
         approve_appeal_html: "%{name} approbava appello del decision de moderation de %{target}"
         approve_user_html: "%{name} approbava inscription de %{target}"
         assigned_to_self_report_html: "%{name} assignava reporto %{target} a se mesme"
+        change_email_user_html: "%{name} cambiava le adresse de e-mail address del usator %{target}"
         change_role_user_html: "%{name} cambiava rolo de %{target}"
+        confirm_user_html: "%{name} confirmava le adresse de e-mail del. usator %{target}"
         create_account_warning_html: "%{name} inviava un advertimento a %{target}"
         create_announcement_html: "%{name} creava un nove annuncio %{target}"
+        create_canonical_email_block_html: "%{name} blocava le e-mail con le hash %{target}"
         create_custom_emoji_html: "%{name} incargava le nove emoji %{target}"
         create_domain_allow_html: "%{name} permitteva federation con dominio %{target}"
         create_domain_block_html: "%{name} blocava dominio %{target}"
+        create_email_domain_block_html: "%{name} blocava le dominio de e-mail %{target}"
         create_ip_block_html: "%{name} creava regula pro IP %{target}"
         create_unavailable_domain_html: "%{name} stoppava livration al dominio %{target}"
         create_user_role_html: "%{name} creava rolo de %{target}"
         demote_user_html: "%{name} degradava usator %{target}"
         destroy_announcement_html: "%{name} deleva annuncio %{target}"
+        destroy_canonical_email_block_html: "%{name} disblocava le e-mail con le hash %{target}"
         destroy_custom_emoji_html: "%{name} deleva emoji %{target}"
         destroy_domain_allow_html: "%{name} impediva le federation con dominio %{target}"
         destroy_domain_block_html: "%{name} disblocava dominio %{target}"
+        destroy_email_domain_block_html: "%{name} disblocava le dominio de e-mail %{target}"
         destroy_instance_html: "%{name} purgava le dominio %{target}"
         destroy_ip_block_html: "%{name} deleva le regula pro IP %{target}"
         destroy_status_html: "%{name} removeva un message de %{target}"
@@ -243,8 +260,10 @@ ia:
         destroy_user_role_html: "%{name} deleva le rolo %{target}"
         disable_2fa_user_html: "%{name} disactivava le authentication a duo factores pro le usator %{target}"
         disable_custom_emoji_html: "%{name} disactivava le emoji %{target}"
+        disable_sign_in_token_auth_user_html: "%{name} disactivava le authentication per token de e-mail pro %{target}"
         disable_user_html: "%{name} disactivava le apertura de session pro le usator %{target}"
         enable_custom_emoji_html: "%{name} activava le emoji %{target}"
+        enable_sign_in_token_auth_user_html: "%{name} activava le authentication per token de e-mail pro %{target}"
         enable_user_html: "%{name} activava le apertura de session pro le usator %{target}"
         memorialize_account_html: "%{name} converteva le conto de %{target} in un pagina commemorative"
         promote_user_html: "%{name} promoveva le usator %{target}"
@@ -252,6 +271,7 @@ ia:
         reject_user_html: "%{name} refusava le inscription de %{target}"
         remove_avatar_user_html: "%{name} removeva le avatar de %{target}"
         reopen_report_html: "%{name} reaperiva le reporto %{target}"
+        resend_user_html: "%{name} reinviava le e-mail de confirmation pro %{target}"
         reset_password_user_html: "%{name} reinitialisava le contrasigno del usator %{target}"
         resolve_report_html: "%{name} resolveva le reporto %{target}"
         sensitive_account_html: "%{name} marcava le multimedia de %{target} como sensibile"
@@ -412,6 +432,7 @@ ia:
       attempts_over_week:
         one: "%{count} tentativa de inscription in le ultime septimana"
         other: "%{count} tentativas de inscription in le ultime septimana"
+      created_msg: Le dominio de e-mail ha essite blocate con successo
       delete: Deler
       dns:
         types:
@@ -420,8 +441,12 @@ ia:
       new:
         create: Adder un dominio
         resolve: Resolver dominio
+        title: Blocar un nove dominio de e-mail
+      no_email_domain_block_selected: Necun blocadas de dominio de e-mail ha essite cambiate perque necun ha essite seligite
       not_permitted: Non permittite
+      resolved_dns_records_hint_html: Le nomine de dominio se resolve al sequente dominios MX, le quales ha le ultime responsibilitate pro le reception de e-mail. Blocar un dominio MX blocara le inscriptiones de qualcunque adresse de e-mail que usa le mesme dominio MX, mesmo si le nomine de dominio visibile es differente. <strong>Presta attention a evitar de blocar le grande fornitores de e-mail.</strong>
       resolved_through_html: Resolvite per %{domain}
+      title: Dominios de e-mail blocate
     export_domain_allows:
       new:
         title: Importar permissiones de dominio
@@ -868,10 +893,15 @@ ia:
       allow: Permitter
       approved: Approbate
       confirm_allow: Es tu secur que tu vole permitter le etiquettas seligite?
+      confirm_disallow: Es tu secur que tu vole cessar de permitter le etiquettas seligite?
       disallow: Refusar
       links:
         allow: Permitter ligamine
         allow_provider: Autorisar le publicator
+        confirm_allow: Es tu secur que tu vole permitter le ligamines seligite?
+        confirm_allow_provider: Es tu secur que tu vole permitter le fornitores seligite?
+        confirm_disallow: Es tu secur que tu vole cessar de permitter le ligamines seligite?
+        confirm_disallow_provider: Es tu secur que tu vole cessar de permitter le fornitores seligite?
         description_html: Istes es ligamines que es actualmente compartite multo per contos del quales tu servitor recipe messages. Illos pote adjutar tu usatores a discoperir lo que eveni in le mundo. Necun ligamine es monstrate publicamente usque tu autorisa le publicator. Tu pote tamben permitter o rejectar ligamines singule.
         disallow: Prohibir le ligamine
         disallow_provider: Prohibir le publicator
@@ -895,6 +925,8 @@ ia:
       statuses:
         allow: Permitter message
         allow_account: Permitter autor
+        confirm_allow_account: Es tu secur que tu vole permitter le contos seligite?
+        confirm_disallow_account: Es tu secur que tu vole cessar de permitter le contos seligite?
         description_html: Istes es le messages cognoscite sur tu servitor que al momento es multo compartite e marcate como favorite. Illos pote adjutar tu usatores nove e reveniente a trovar plus personas a sequer. Necun message es monstrate publicamente usque tu approba le autor, a condition que le autor permitte que su conto es suggerite a alteres. Tu pote tamben permitter o rejectar messages singule.
         disallow: Non permitter message
         disallow_account: Non permitter autor
@@ -1011,7 +1043,9 @@ ia:
       guide_link_text: Totes pote contribuer.
     sensitive_content: Contento sensibile
   application_mailer:
+    notification_preferences: Cambiar preferentias de e-mail
     salutation: "%{name},"
+    settings: 'Cambiar preferentias de e-mail: %{link}'
     unsubscribe: Desubscriber
     view: 'Visita:'
     view_profile: Vider profilo
@@ -1031,6 +1065,7 @@ ia:
       hint_html: Solo un altere cosa! Nos debe confirmar que tu es un humano (de sorta que nos pote mantener le spam foras!). Solve le CAPTCHA infra e clicca sur "Continuar".
       title: Controlo de securitate
     confirmations:
+      awaiting_review: Tu adresse de e-mail es confirmate! Le personal de %{domain} ora revide tu registration. Tu recipera un e-mail si illes approba tu conto!
       awaiting_review_title: Tu inscription es in curso de revision
       clicking_this_link: cliccar sur iste ligamine
       login_link: aperir session
@@ -1038,6 +1073,7 @@ ia:
       redirect_to_app_html: Tu deberea haber essite redirigite al app <strong>%{app_name}</strong>. Si isto non ha evenite, tenta %{clicking_this_link} o retornar manualmente al app.
       registration_complete: Tu inscription sur %{domain} es ora concludite!
       welcome_title: Benvenite, %{name}!
+      wrong_email_hint: Si ille adresse de e-mail non es correcte, tu pote cambiar lo in le parametros del conto.
     delete_account: Deler le conto
     delete_account_html: Si tu vole deler tu conto, tu pote <a href="%{path}">facer lo hic</a>. Te essera demandate un confirmation.
     description:
@@ -1058,6 +1094,7 @@ ia:
     or_log_in_with: O aperi session con
     privacy_policy_agreement_html: Io ha legite e accepta le <a href="<a href="%{privacy_policy_path}" target="_blank">politica de confidentialitate</a>
     progress:
+      confirm: Confirmar e-mail
       details: Tu detalios
       review: Nostre revision
       rules: Accepta le regulas
@@ -1079,8 +1116,10 @@ ia:
     security: Securitate
     set_new_password: Definir un nove contrasigno
     setup:
+      email_below_hint_html: Consulta tu dossier de spam, o requesta un altere ligamine de confirmation. Tu pote corriger tu adresse de e-mail si illo es errate.
       email_settings_hint_html: Clicca sur le ligamine que nos te ha inviate pro verificar %{email}. Nos te attendera hic.
       link_not_received: Necun ligamine recipite?
+      new_confirmation_instructions_sent: Tu recipera un nove e-mail con le ligamine de confirmation in poc minutas!
       title: Consulta tu cassa de entrata
     sign_in:
       preamble_html: Aperi session con tu credentiales de <strong>%{domain}</strong>. Si tu conto es albergate sur un altere servitor, tu non potera aperir session hic.
@@ -1091,7 +1130,9 @@ ia:
       title: Lassa nos installar tu conto sur %{domain}.
     status:
       account_status: Stato del conto
+      confirming: Attendente le termination del confirmation del adresse de e-mail.
       functional: Tu conto es completemente operative.
+      pending: Tu demanda attende le revision per nostre personal. Isto pote prender alcun tempore. Tu recipera un e-mail si tu demanda es approbate.
       redirecting_to: Tu conto es inactive perque illo actualmente redirige a %{acct}.
       self_destruct: Perque %{domain} va clauder, tu solo habera accesso limitate a tu conto.
       view_strikes: Examinar le sanctiones passate contra tu conto
@@ -1134,6 +1175,9 @@ ia:
       before: 'Ante de continuar, per favor lege attentemente iste notas:'
       caches: Le contento que altere servitores ha immagazinate in cache pote persister
       data_removal: Tu messages e altere datos essera removite permanentemente
+      email_change_html: Tu pote <a href="%{path}">cambiar tu adresse de e-mail</a> sin deler tu conto
+      email_contact_html: Si illo ancora non arriva, tu pote inviar e-mail a <a href="mailto:%{email}">%{email}</a> pro peter adjuta
+      email_reconfirmation_html: Si tu non recipe le e-mail de confirmation, tu pote <a href="%{path}>requestar lo de novo</a>
       irreversible: Tu non potera restaurar o reactivar tu conto
       more_details_html: Pro plus detalios, vide le <a href="%{terms_path}">politica de confidentialitate</a>.
       username_available: Tu nomine de usator essera disponibile novemente
@@ -1377,6 +1421,16 @@ ia:
     unsubscribe:
       action: Si, desubscriber
       complete: Desubscribite
+      confirmation_html: Es tu secur de voler cancellar le subscription al %{type} de Mastodon sur %{domain} pro tu adresse de e-mail %{email}? Tu pote sempre resubscriber te a partir del <a href="%{settings_path}">parametros de notification in e-mail</a>.
+      emails:
+        notification_emails:
+          favourite: notificationes de favorites in e-mail
+          follow: notificationes de sequimento in e-mail
+          follow_request: requestas de sequimento in e-mail
+          mention: notificationes de mentiones in e-mail
+          reblog: notificationes de impulsos in e-mail
+      resubscribe_html: Si tu ha cancellate le subscription in error, tu pote resubscriber te a partir del <a href="%{settings_path}">parametros de notification in e-mail</a>.
+      success_html: Tu non recipera plus %{type} pro Mastodon sur %{domain} a tu adresse de e-mail %{email}.
       title: Desubcriber
   media_attachments:
     validations:
@@ -1457,6 +1511,8 @@ ia:
     update:
       subject: "%{name} ha modificate un message"
   notifications:
+    administration_emails: Notificationes per e-mail pro administratores
+    email_events: Eventos pro notificationes per e-mail
     email_events_hint: 'Selige eventos pro le quales tu vole reciper notificationes:'
   number:
     human:
@@ -1615,6 +1671,7 @@ ia:
     import: Importar
     import_and_export: Importar e exportar
     migrate: Migration de conto
+    notifications: Notificationes per e-mail
     preferences: Preferentias
     profile: Profilo public
     relationships: Sequites e sequitores
@@ -1861,6 +1918,7 @@ ia:
     invalid_otp_token: Codice de duo factores non valide
     otp_lost_help_html: Si tu ha perdite le accesso a ambes, tu pote contactar %{email}
     rate_limited: Troppo de tentativas de authentication. Per favor reessaya plus tarde.
+    seamless_external_login: Tu ha aperite session per medio de un servicio externe. Le parametros de contrasigno e de e-mail es dunque indisponibile.
     signed_in_as: 'Session aperite como:'
   verification:
     extra_instructions_html: <strong>Consilio:</strong> Le ligamine sur tu sito web pote esser invisibile. Le parte importante es <code>rel="me"</code> que impedi le usurpation de identitate sur sitos web con contento generate per usatores. Tu pote mesmo usar un etiquetta <code>link</code> in le capite del pagina in vice de <code>a</code>, ma le codice HTML debe esser accessibile sin executar JavaScript.
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index ec7216b0015f2e..b54707c7cc1fd0 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -29,6 +29,7 @@ ja:
       created_msg: モデレーションメモを書き込みました！
       destroyed_msg: モデレーションメモを削除しました！
     accounts:
+      add_email_domain_block: メールのドメインをブロック
       approve: 承認
       approved_msg: "%{username}さんの登録申請を承認しました"
       are_you_sure: 本当に実行しますか？
@@ -55,6 +56,7 @@ ja:
       demote: 降格
       destroyed_msg: "%{username}さんのデータは完全に削除されるよう登録されました"
       disable: 無効化
+      disable_sign_in_token_auth: メールトークン認証を無効化
       disable_two_factor_authentication: 二要素認証を無効にする
       disabled: 無効
       display_name: 表示名
@@ -63,6 +65,7 @@ ja:
       email: メールアドレス
       email_status: メールアドレスの状態
       enable: 有効化
+      enable_sign_in_token_auth: メールトークン認証を有効化
       enabled: 有効
       enabled_msg: "%{username}の無効化を解除しました"
       followers: フォロワー数
@@ -126,6 +129,7 @@ ja:
       resubscribe: 再講読
       role: ロール
       search: 検索
+      search_same_email_domain: 同じメールドメインを持つ他のユーザ
       search_same_ip: 同じIPのユーザーを検索
       security: 認証方法
       security_measures:
@@ -166,21 +170,26 @@ ja:
         approve_appeal: 抗議を承認
         approve_user: ユーザーの承認
         assigned_to_self_report: 通報の担当者に設定
+        change_email_user: ユーザーのメールアドレスの変更
         change_role_user: ユーザーのロールを変更
         confirm_user: ユーザーの確認
         create_account_warning: 警告を作成
         create_announcement: お知らせを作成
+        create_canonical_email_block: メールアドレスブロックの作成
         create_custom_emoji: カスタム絵文字を作成
         create_domain_allow: 連合を許可
         create_domain_block: ドメインブロックを作成
+        create_email_domain_block: メールドメインブロックを作成
         create_ip_block: IPルールを作成
         create_unavailable_domain: 配送できないドメインを作成
         create_user_role: ロールを作成
         demote_user: ユーザーを降格
         destroy_announcement: お知らせを削除
+        destroy_canonical_email_block: メールアドレスブロックの削除
         destroy_custom_emoji: カスタム絵文字を削除
         destroy_domain_allow: 連合許可を外す
         destroy_domain_block: ドメインブロックを削除
+        destroy_email_domain_block: メールドメインブロックを削除
         destroy_instance: ドメインをブロックする
         destroy_ip_block: IPルールを削除
         destroy_status: 投稿を削除
@@ -188,8 +197,10 @@ ja:
         destroy_user_role: ロールを削除
         disable_2fa_user: 二要素認証を無効化
         disable_custom_emoji: カスタム絵文字を無効化
+        disable_sign_in_token_auth_user: ユーザのメールトークン認証を無効化
         disable_user: ユーザーを無効化
         enable_custom_emoji: カスタム絵文字を有効化
+        enable_sign_in_token_auth_user: ユーザのメールトークン認証を有効化
         enable_user: ユーザーを有効化
         memorialize_account: 追悼アカウント化
         promote_user: ユーザーを昇格
@@ -219,20 +230,26 @@ ja:
         approve_appeal_html: "%{name}さんが%{target}さんからの抗議を承認しました"
         approve_user_html: "%{name}さんが%{target}さんからの登録を承認しました"
         assigned_to_self_report_html: "%{name}さんが通報 %{target}を自身の担当に割り当てました"
+        change_email_user_html: "%{name}さんが%{target}さんのメールアドレスを変更しました"
         change_role_user_html: "%{name}さんが%{target}さんのロールを変更しました"
+        confirm_user_html: "%{name}さんが%{target}さんのメールアドレスを確認済みにしました"
         create_account_warning_html: "%{name}さんが%{target}さんに警告メールを送信しました"
         create_announcement_html: "%{name}さんが新しいお知らせ %{target}を作成しました"
+        create_canonical_email_block_html: "%{name}さんがメールアドレス (ハッシュ値: %{target}) をブロックしました"
         create_custom_emoji_html: "%{name}さんがカスタム絵文字 %{target}を追加しました"
         create_domain_allow_html: "%{name}さんが%{target}の連合を許可しました"
         create_domain_block_html: "%{name}さんがドメイン %{target}をブロックしました"
+        create_email_domain_block_html: "%{name}さんがメールドメイン %{target} をブロックしました"
         create_ip_block_html: "%{name}さんがIP %{target}のルールを作成しました"
         create_unavailable_domain_html: "%{name}がドメイン %{target}への配送を停止しました"
         create_user_role_html: "%{name}さんがロール『%{target}』を作成しました"
         demote_user_html: "%{name}さんが%{target}さんを降格しました"
         destroy_announcement_html: "%{name}さんがお知らせ %{target}を削除しました"
+        destroy_canonical_email_block_html: "%{name}さんがメールアドレス (ハッシュ値: %{target}) のブロックを外しました"
         destroy_custom_emoji_html: "%{name}さんがカスタム絵文字『%{target}』を削除しました"
         destroy_domain_allow_html: "%{name}さんが%{target}の連合許可を外しました"
         destroy_domain_block_html: "%{name}さんがドメイン %{target}のブロックを外しました"
+        destroy_email_domain_block_html: "%{name} がメールドメイン %{target} のブロックを外しました"
         destroy_instance_html: "%{name}さんがドメイン %{target}をブロックしました"
         destroy_ip_block_html: "%{name}さんが IP %{target}のルールを削除しました"
         destroy_status_html: "%{name}さんが%{target}さんの投稿を削除しました"
@@ -240,8 +257,10 @@ ja:
         destroy_user_role_html: "%{name}さんがロール『%{target}』を削除しました"
         disable_2fa_user_html: "%{name}さんが%{target}さんの二要素認証を無効化しました"
         disable_custom_emoji_html: "%{name}さんがカスタム絵文字 %{target}を無効化しました"
+        disable_sign_in_token_auth_user_html: "%{name} が %{target} のメールトークン認証を無効化しました"
         disable_user_html: "%{name}さんが%{target}さんのログインを無効化しました"
         enable_custom_emoji_html: "%{name}さんがカスタム絵文字 %{target}を有効化しました"
+        enable_sign_in_token_auth_user_html: "%{name} が %{target} のメールトークン認証を有効化しました"
         enable_user_html: "%{name}さんが%{target}さんのログインを有効化しました"
         memorialize_account_html: "%{name}さんが%{target}さんを追悼アカウントページに登録しました"
         promote_user_html: "%{name}さんが%{target}さんを昇格しました"
@@ -249,6 +268,7 @@ ja:
         reject_user_html: "%{name}さんが%{target}さんからの登録を拒否しました"
         remove_avatar_user_html: "%{name}さんが%{target}さんのアイコンを削除しました"
         reopen_report_html: "%{name}さんが通報 %{target}を未解決に戻しました"
+        resend_user_html: "%{name}さんが %{target} の確認メールを再送信しました"
         reset_password_user_html: "%{name}さんが%{target}さんのパスワードをリセットしました"
         resolve_report_html: "%{name}さんが通報 %{target}を解決済みにしました"
         sensitive_account_html: "%{name}さんが%{target}さんのメディアを閲覧注意にマークしました"
@@ -443,6 +463,9 @@ ja:
       title: おすすめフォロー
       unsuppress: おすすめフォローを復元
     instances:
+      audit_log:
+        title: 最近の監査ログ
+        view_all: 全ての監査ログを閲覧
       availability:
         description_html:
           other: ドメインへの配信が <strong>%{count}</strong> 日失敗した場合、そのドメイン<em>からの</em>配信を受信しない限り、それ以上の配信を行いません。
@@ -565,6 +588,7 @@ ja:
         resolve_description_html: 報告されたアカウントに対していかなる措置も取られず、ストライクも記録されず、報告は終了します。
         silence_description_html: このアカウントは、すでにフォローしている人、または手動で検索した人にしか見えないため、リーチが極端に制限されます。いつでも元に戻すことができます。このアカウントに対するすべての通報をクローズします。
         suspend_description_html: アカウントとそのすべての内容にアクセスできなくなり、最終的に削除され、やり取りは不可能になります。 30日以内であれば元に戻すことができます。このアカウントに対するすべての通報をクローズします。
+      actions_description_html: このレポートへのアクションを決定してください。アカウントへ懲罰的な措置を取った場合、<strong>Span</strong>カテゴリが選択されている場合を除き、メール通知が送信されます。
       actions_description_remote_html: この通報を解決するためのアクションを選択してください。これは<strong>あなたの</strong>サーバーがこのリモートアカウントと通信し、そのコンテンツを処理する時のみ影響します。
       add_to_report: 通報にさらに追加
       already_suspended_badges:
@@ -629,6 +653,7 @@ ja:
         delete_data_html: 停止が解除されないまま30日経過すると、<strong>@%{acct}</strong>さんのプロフィールとコンテンツは削除されます
         preview_preamble_html: "<strong>@%{acct}</strong>さんに次の内容の警告を通知します:"
         record_strike_html: 今後、<strong>@%{acct}</strong>さんが違反行為をしたときにエスカレーションできるように、このアカウントに対するストライクを記録します
+        send_email_html: "<strong>@%{acct}</strong>さんに警告メールを送信します"
         warning_placeholder: アクションを行使する追加の理由（オプション）
       target_origin: 報告されたアカウントの起源
       title: 通報
@@ -666,6 +691,7 @@ ja:
         manage_appeals: 抗議の管理
         manage_appeals_description: ユーザーはモデレーションアクションに対する抗議を確認できます
         manage_blocks: ブロックの管理
+        manage_blocks_description: メールプロバイダとIPアドレスのブロックを許可
         manage_custom_emojis: カスタム絵文字を管理
         manage_custom_emojis_description: ユーザーがサーバー上のカスタム絵文字を管理できるようにします
         manage_federation: 連合の管理
@@ -683,6 +709,7 @@ ja:
         manage_taxonomies: 分類の管理
         manage_taxonomies_description: トレンドコンテンツの確認とハッシュタグの設定の更新
         manage_user_access: アクセス権を管理
+        manage_user_access_description: 他のユーザの二段階認証の無効化、メールアドレスの変更、パスワードリセットを許可
         manage_users: ユーザーの管理
         manage_users_description: 他のユーザーの詳細情報を閲覧し、モデレーションを行うことができます。
         manage_webhooks: Webhookの管理
@@ -757,6 +784,7 @@ ja:
       destroyed_msg: ファイルを削除しました！
     software_updates:
       critical_update: "※緊急 (速やかに適用してください)"
+      description: Mastodonサーバーはいつでも最新の状態を保ち、新しい機能や修正を利用できるようにしておくことをおすすめします。またセキュリティの問題が発生した場合は、速やかにMastodonをアップデートすることが大切です。Mastodonは30分おきにアップデートを確認し、通知設定に応じて新しいアップデートをメールで通知します。
       documentation_link: もっと見る
       release_notes: リリースノート
       title: 利用可能なアップデート
@@ -843,16 +871,39 @@ ja:
         action: ここを開いて詳細を確認してください
         message_html: "<strong>オブジェクトストレージが正しく設定されていません。ユーザーのプライバシーが危険な状態になっています。</strong>"
     tags:
+      moderation:
+        not_trendable: トレンド不許可
+        not_usable: 使用不可
+        pending_review: 審査を保留中
+        review_requested: 審査待ち
+        reviewed: 審査済
+        title: ステータス
+        trendable: トレンド許可済
+        unreviewed: 未審査
+        usable: 使用可能
+      name: タグ名
+      newest: 新しい順
+      oldest: 古い順
+      open: タグ検索を見る
+      reset: リセット
       review: 審査状況
+      search: 検索
+      title: ハッシュタグ
       updated_msg: ハッシュタグ設定が更新されました
     title: 管理
     trends:
       allow: 許可
       approved: 承認
+      confirm_allow: 本当に選択されたタグを許可しますか？
+      confirm_disallow: 本当に選択されたタグを禁止しますか？
       disallow: 拒否
       links:
         allow: リンクの許可
         allow_provider: 発行者の承認
+        confirm_allow: 本当に選択されたリンクを許可しますか？
+        confirm_allow_provider: 本当に選択されたプロバイダを許可しますか？
+        confirm_disallow: 本当に選択されたリンクを禁止しますか？
+        confirm_disallow_provider: 本当に選択されたプロバイダを禁止しますか？
         description_html: これらは、多くのユーザーに共有されているリンクです。あなたのユーザーが世の中の動きを知るのに役立ちます。あなたが公開者を承認するまで、リンクは一般に表示されません。また、個別のリンクの許可・拒否も可能です。
         disallow: リンクの拒否
         disallow_provider: 発行者の拒否
@@ -875,6 +926,10 @@ ja:
       statuses:
         allow: 掲載を許可
         allow_account: 投稿者を許可
+        confirm_allow: 本当に選択されたトゥートを許可しますか？
+        confirm_allow_account: 本当に選択されたアカウントを許可しますか？
+        confirm_disallow: 本当に選択されたトゥートを禁止しますか？
+        confirm_disallow_account: 本当に選択されたアカウントを禁止しますか？
         description_html: これらは、このサーバーが知っている、たくさんシェアされ、お気に入り登録されている投稿です。新しいユーザーや久しぶりにアクセスするユーザーがフォローする人を探すのに役立ちます。あなたが投稿者を承認し、投稿者が許可するまで、表示されることはありません。また、個別の投稿を許可または拒否することもできます。
         disallow: 掲載を拒否
         disallow_account: 投稿者を拒否
@@ -989,7 +1044,9 @@ ja:
       guide_link_text: 誰でも参加することができます。
     sensitive_content: 閲覧注意コンテンツ
   application_mailer:
+    notification_preferences: メール設定の変更
     salutation: "%{name}さん"
+    settings: 'メール設定の変更: %{link}'
     unsubscribe: 購読解除
     view: 'リンク:'
     view_profile: プロフィールを表示
@@ -1009,6 +1066,7 @@ ja:
       hint_html: もう一つだけ！あなたが人間であることを確認する必要があります(スパムを防ぐためです！)。 以下のCAPTCHAを解き、「続ける」をクリックします。
       title: セキュリティチェック
     confirmations:
+      awaiting_review: メールアドレスが確認できました。%{domain} のスタッフからの審査をお待ちください。承認された場合、メールにより連絡します。
       awaiting_review_title: 登録の審査待ちです
       clicking_this_link: このリンクを押す
       login_link: ログイン
@@ -1016,6 +1074,7 @@ ja:
       redirect_to_app_html: 自動的に<strong>%{app_name}</strong>に戻らなかった場合、%{clicking_this_link}か、手動でアプリを切り替えてください。
       registration_complete: "%{domain} へのアカウント登録が完了しました。"
       welcome_title: ようこそ、%{name}さん！
+      wrong_email_hint: メールアドレスが正しくない場合は、アカウント設定画面で変更できます。
     delete_account: アカウントの削除
     delete_account_html: アカウントを削除したい場合、<a href="%{path}">こちら</a>から手続きが行えます。削除する前に、確認画面があります。
     description:
@@ -1036,6 +1095,7 @@ ja:
     or_log_in_with: または次のサービスでログイン
     privacy_policy_agreement_html: <a href="%{privacy_policy_path}" target="_blank">プライバシーポリシー</a>を読み、同意します
     progress:
+      confirm: メールアドレスの確認
       details: ユーザー情報
       review: 承認
       rules: ルール
@@ -1057,8 +1117,10 @@ ja:
     security: セキュリティ
     set_new_password: 新しいパスワード
     setup:
+      email_below_hint_html: 確認メールが迷惑メールフォルダに振り分けられていないか確認してください。メールアドレスを間違えた場合は、ここでメールアドレスの変更と確認メールの再送ができます。
       email_settings_hint_html: メールに記載のリンクを開いて %{email} を確認してください。
       link_not_received: 確認メールを受信できない場合は
+      new_confirmation_instructions_sent: 確認用のリンクを記載した新しいメールを送信しました
       title: 確認メールを送信しました
     sign_in:
       preamble_html: "<strong>%{domain}</strong> の資格情報でサインインします。 あなたのアカウントが別のサーバーでホストされている場合は、ここでログインすることはできません。"
@@ -1069,7 +1131,9 @@ ja:
       title: さあ %{domain} でセットアップしましょう.
     status:
       account_status: アカウントの状態
+      confirming: メールアドレスの確認が完了するのを待っています。
       functional: アカウントは完全に機能しています。
+      pending: あなたの申請は現在サーバー管理者による審査待ちです。これにはしばらくかかります。申請が承認されるとメールが届きます。
       redirecting_to: アカウントは%{acct}に引っ越し設定されているため非アクティブになっています。
       self_destruct: "%{domain} は閉鎖されるため、今後このアカウントでは限られた操作しかできません。"
       view_strikes: 過去のストライクを表示
@@ -1112,6 +1176,9 @@ ja:
       before: '続行する前に、次の点を再度確認してください:'
       caches: 他のサーバーにコンテンツのキャッシュがずっと残る場合があります
       data_removal: あなたの投稿やその他のデータはこのサーバーから完全に削除されます
+      email_change_html: アカウントを削除しなくても<a href="%{path}">メールアドレスを変更</a>できます
+      email_contact_html: それでも届かない場合、<a href="mailto:%{email}">%{email}</a>までメールで問い合わせてください
+      email_reconfirmation_html: 確認メールが届かない場合は<a href="%{path}">こちらから確認メールを再送</a>してみてください
       irreversible: 削除操作の撤回やアカウントの復活はできません
       more_details_html: 詳しくは<a href="%{terms_path}">プライバシーポリシー</a>をご覧ください。
       username_available: あなたのユーザー名は再利用できるようになります
@@ -1336,6 +1403,7 @@ ja:
     authentication_methods:
       otp: 二要素認証アプリ
       password: パスワード
+      sign_in_token: メール認証
       webauthn: セキュリティキー
     description_html: 認識できないアクティビティが表示された場合は、パスワードの変更と二要素認証の有効化を検討してください。
     empty: 利用可能な認証履歴がありません
@@ -1436,6 +1504,8 @@ ja:
     update:
       subject: "%{name}さんが投稿を更新しました"
   notifications:
+    administration_emails: 管理にかかわるメール通知
+    email_events: メールによる通知
     email_events_hint: '受信する通知を選択:'
   number:
     human:
@@ -1834,6 +1904,7 @@ ja:
     invalid_otp_token: 二要素認証コードが間違っています
     otp_lost_help_html: どちらも使用できない場合、%{email}に連絡を取ると解決できるかもしれません
     rate_limited: 認証に失敗した回数が多すぎます。時間をおいてからログインしてください。
+    seamless_external_login: あなたは外部サービスを介してログインしているため、パスワードとメールアドレスの設定は利用できません。
     signed_in_as: '下記でログイン中:'
   verification:
     extra_instructions_html: <strong>ワンポイント:</strong> webサイト上のプロフィールへのリンクは表示上見えなくてもかまいません。重要な部分は <code>rel="me"</code> で、これはユーザーが自由にリンクを作成可能なサイトを悪用してなりすまされるのを防ぐための情報です。<code>a</code> タグを配置する代わりに <code>link</code> タグをHTMLヘッダーに挿入することでも認証が可能です。ただし、HTMLにはJavaScriptを使わなくてもアクセスできるようにしてください。
diff --git a/config/locales/lad.yml b/config/locales/lad.yml
index 40be2627dabd58..0de73fd27985e9 100644
--- a/config/locales/lad.yml
+++ b/config/locales/lad.yml
@@ -440,8 +440,11 @@ lad:
         create: Adjusta domeno
         resolve: Rezolve domeno
         title: Bloka muevo domeno de posta
+      no_email_domain_block_selected: No se tienen trokado blokos de domeno porke dinguno a sido eskojido
       not_permitted: Sin permiso
+      resolved_dns_records_hint_html: El nombre de domeno rezolve los sigientes domenos MX, los kualos son responsavles en ultima instansya de achetar la posta elektronika. Blokar un domeno MX blokara los rejistros de kualkier adreso de posta elektronika ke utilize el mezmo domeno MX, inkluzo si el nombre de domeno vizivle es desferente. <strong>Tenga kudiado de no blokar los prinsipales domenos de posta elektronika.</strong>
       resolved_through_html: Rezolvido por %{domain}
+      title: Domenos de posta blokados
     export_domain_allows:
       new:
         title: Importa permisos de domeno
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index fd3dbc00b1fc23..6cc35d939dbccc 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -582,6 +582,8 @@ lt:
       trending: Tendencinga
       with_media: Su medija
     system_checks:
+      database_schema_check:
+        message_html: Laukiama duomenų bazės perkėlimo. Paleisk juos, kad įsitikintum, jog programa veikia taip, kaip tikimasi.
       elasticsearch_health_yellow:
         message_html: Elasticsearch klasteris yra nesveikas (geltona būsena), galbūt norėsi išsiaiškinti priežastį
       elasticsearch_preset:
@@ -836,7 +838,7 @@ lt:
       title: Nepavyko saugumo patvirtinimas
     '429': Stabdomas
     '500':
-      content: Atsiprašome, tačiau mūsų pusėje įvyko klaida.
+      content: Atsiprašome, bet kažkas nutiko ne taip mūsų pusėje.
       title: Netinkamas puslapis
     noscript_html: Kad naudotumėtės Mastodon web aplikacija, prašome įsijungti JavaScript. Alternatyviai, pabandykite viena iš <a href="%{apps_path}">vietinių aplikacijų</a> Mastodon savo platformai.
   exports:
diff --git a/config/locales/no.yml b/config/locales/no.yml
index 1087e6485e02f4..e2ede9328b43e0 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -31,6 +31,7 @@
       created_msg: Moderasjonsnotat laget uten problem!
       destroyed_msg: Moderasjonsnotat slettet uten problem!
     accounts:
+      add_email_domain_block: Blokker e-postdomenet
       approve: Godkjenn
       approved_msg: Godkjent %{username} sin registreringsapplikasjon
       are_you_sure: Er du sikker?
diff --git a/config/locales/simple_form.et.yml b/config/locales/simple_form.et.yml
index 2109ceb496661d..9fd9e238aaea55 100644
--- a/config/locales/simple_form.et.yml
+++ b/config/locales/simple_form.et.yml
@@ -314,6 +314,7 @@ et:
         listable: Luba sellel sildil ilmuda profiilide kataloogis
         name: Silt
         trendable: Luba sellel sildil trendida
+        usable: Luba seda märksõna postitustes kasutada lokaalselt
       user:
         role: Roll
         time_zone: Ajavöönd
diff --git a/config/locales/simple_form.ia.yml b/config/locales/simple_form.ia.yml
index 00226aee90b4b9..76990527a0b0c9 100644
--- a/config/locales/simple_form.ia.yml
+++ b/config/locales/simple_form.ia.yml
@@ -313,6 +313,7 @@ ia:
         listable: Permitter a iste hashtag apparer in le recercas e suggestiones
         name: Hashtag
         trendable: Permitter a iste hashtag de sub tendentias
+        usable: Permitter al messages usar iste hashtag localmente
       user:
         role: Rolo
         time_zone: Fuso horari
diff --git a/config/locales/simple_form.ja.yml b/config/locales/simple_form.ja.yml
index 7f4a9daeff85a2..8815af99334d42 100644
--- a/config/locales/simple_form.ja.yml
+++ b/config/locales/simple_form.ja.yml
@@ -314,6 +314,7 @@ ja:
         listable: 検索とディレクトリへの使用を許可する
         name: ハッシュタグ
         trendable: トレンドへの表示を許可する
+        usable: このサーバーのユーザーがタグをつけて投稿することを許可する
       user:
         role: ロール
         time_zone: タイムゾーン
diff --git a/config/locales/simple_form.kab.yml b/config/locales/simple_form.kab.yml
index 16f4bdd41696b7..68fc629d9ecebf 100644
--- a/config/locales/simple_form.kab.yml
+++ b/config/locales/simple_form.kab.yml
@@ -20,7 +20,7 @@ kab:
         irreversible: Tisuffaɣ i tessazedgeḍ ad ttwakksent i lebda, ula ma tekkseḍ imsizdeg-nni ar zdat
         locale: Tutlayt n ugrudem, imaylen d walɣuten yettudemren
         password: Seqdec ma drus 8 n yisekkilen
-        setting_display_media_default: Ffer teywalt yettwacreḍ d tanafrit
+        setting_display_media_default: Ffer imidyaten yettwacreḍ d infariyen
         setting_display_media_hide_all: Ffer yal tikkelt akk taywalt
         setting_display_media_show_all: Ffer yal tikkelt teywalt yettwacreḍ d tanafrit
         username: Tzemreḍ ad tesqedceḍ isekkilen, uṭṭunen akked yijerriden n wadda
diff --git a/config/locales/simple_form.uk.yml b/config/locales/simple_form.uk.yml
index 12067148690350..c6305598b11b60 100644
--- a/config/locales/simple_form.uk.yml
+++ b/config/locales/simple_form.uk.yml
@@ -85,7 +85,7 @@ uk:
         custom_css: Ви можете застосувати користувацькі стилі у вебверсії Mastodon.
         favicon: WEBP, PNG, GIF або JPG. Замінює стандартну піктограму Mastodon на власну.
         mascot: Змінює ілюстрацію в розширеному вебінтерфейсі.
-        media_cache_retention_period: Медіафайли з дописів віддалених користувачів кешуються на вашому сервері. Якщо встановлено додатне значення, медіа буде видалено через вказану кількість днів. Якщо медіа-дані будуть запитані після видалення, вони будуть завантажені повторно, якщо вихідний вміст все ще доступний. Через обмеження на частоту опитування карток попереднього перегляду посилань на сторонніх сайтах, рекомендується встановити це значення не менше 14 днів, інакше картки попереднього перегляду посилань не будуть оновлюватися на вимогу раніше цього часу.
+        media_cache_retention_period: Медіафайли з дописів віддалених користувачів кешуються на вашому сервері. Якщо встановлено додатне значення, медіа буде видалено через вказану кількість днів. Якщо медіадані будуть запитані після видалення, вони будуть завантажені повторно, якщо вихідний вміст все ще доступний. Через обмеження на частоту опитування карток попереднього перегляду посилань на сторонніх сайтах, рекомендується встановити це значення не менше 14 днів, інакше картки попереднього перегляду посилань не будуть оновлюватися на вимогу раніше цього часу.
         peers_api_enabled: Список доменів імен цього сервера з'явився у федівсесвіті. Сюди не входять дані чи ви пов'язані федерацією з цим сервером, а лише відомості, що вашому серверу відомо про нього. Його використовують служби, які збирають загальну статистику про федерації.
         profile_directory: У каталозі профілів перераховані всі користувачі, які погодились бути видимими.
         require_invite_text: Якщо реєстрація вимагає власноручного затвердження, зробіть текстове поле «Чому ви хочете приєднатися?» обов'язковим, а не додатковим
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index ac6134caa784b8..ad9f8fb5eea2c8 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -35,6 +35,7 @@ sk:
       created_msg: Poznámka moderátora bola úspešne vytvorená!
       destroyed_msg: Moderátorska poznámka bola úspešne zmazaná!
     accounts:
+      add_email_domain_block: Blokuj emailovú doménu
       approve: Schváľ
       approved_msg: Úspešne schválená prihláška %{username}
       are_you_sure: Si si istý/á?
@@ -170,10 +171,12 @@ sk:
         approve_appeal: Schváľ námietku
         approve_user: Odobri užívateľa
         assigned_to_self_report: Priraď hlásenie
+        change_email_user: Zmeň email pre užívateľa
         change_role_user: Zmeň užívateľskú rolu
         confirm_user: Potvrď užívateľa
         create_account_warning: Vytvor výstrahu
         create_announcement: Vytvor oboznámenie
+        create_canonical_email_block: Vytvor blokovanie emailu
         create_custom_emoji: Vytvor vlastné emotikony
         create_domain_allow: Vytvor povolenie pre doménu
         create_domain_block: Vytvor zákaz domény
@@ -224,10 +227,13 @@ sk:
         change_role_user_html: "%{name} zmenil/a rolu pre %{target}"
         create_account_warning_html: "%{name} poslal/a upozornenie užívateľovi %{target}"
         create_announcement_html: "%{name} vytvoril/a nové oboznámenie %{target}"
+        create_canonical_email_block_html: "%{name} zablokoval/a email s hašom %{target}"
         create_custom_emoji_html: "%{name} nahral/a novú emotikonu %{target}"
         create_domain_allow_html: "%{name} povolil/a federáciu s doménou %{target}"
         create_domain_block_html: "%{name} zablokoval/a doménu %{target}"
+        create_email_domain_block_html: "%{name} zablokoval/a emailovú doménu %{target}"
         create_ip_block_html: "%{name} vytvoril/a pravidlo pre IP %{target}"
+        create_unavailable_domain_html: "%{name} pozastavil/a doručovanie k doméne %{target}"
         create_user_role_html: "%{name} vytvoril/a rolu pre %{target}"
         demote_user_html: "%{name} degradoval/a užívateľa %{target}"
         destroy_announcement_html: "%{name} vymazal/a oboznámenie %{target}"
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index faff0b4e42bc68..c24ed77aef5ec0 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -786,7 +786,7 @@ uk:
         desc_html: Це залежить від зовнішніх скриптів hCaptcha, що може становити загрозу безпеці та приватності. Крім того, <strong>це може зробити процес реєстрації значно менш доступним для деяких людей (особливо з обмеженими можливостями)</strong>. З цих причин, будь ласка, розгляньте альтернативні заходи, такі як реєстрація на основі схвалення або на основі запрошення.
         title: Вимагати нових користувачів розв'язувати CAPTCHA для підтвердження облікового запису
       content_retention:
-        danger_zone: Зони небезпеки
+        danger_zone: Небезпечна зона
         preamble: Контролюйте, як зберігаються користувацькі матеріали в Mastodon.
         title: Зберігання вмісту
       default_noindex:

From 478155b015d0af5e7caf4e2aab4644cb6c6b9238 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 2 Sep 2024 10:35:28 +0200
Subject: [PATCH 2022/2191] Update dependency postcss to v8.4.43 (#31676)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 451902a1d4d8dc..05de52b098316a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -14016,13 +14016,13 @@ __metadata:
   linkType: hard
 
 "postcss@npm:^8.2.15, postcss@npm:^8.4.24, postcss@npm:^8.4.41":
-  version: 8.4.41
-  resolution: "postcss@npm:8.4.41"
+  version: 8.4.43
+  resolution: "postcss@npm:8.4.43"
   dependencies:
     nanoid: "npm:^3.3.7"
     picocolors: "npm:^1.0.1"
     source-map-js: "npm:^1.2.0"
-  checksum: 10c0/c1828fc59e7ec1a3bf52b3a42f615dba53c67960ed82a81df6441b485fe43c20aba7f4e7c55425762fd99c594ecabbaaba8cf5b30fd79dfec5b52a9f63a2d690
+  checksum: 10c0/7cc9c6393ca00fcdca6fef8d119218df9357389b9fed30b6d4b463fc0e85159595a877f4ac0a2a565ea4c447cab1f424e527e68d8b7d40b8c94a6684663d45c5
   languageName: node
   linkType: hard
 

From 25d5e19b8348f40ee5b0fdb16b9a1f612031e26d Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 2 Sep 2024 10:35:51 +0200
Subject: [PATCH 2023/2191] Update DefinitelyTyped types (non-major) (#31683)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 05de52b098316a..31dd9ab7d6c9b5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3754,13 +3754,13 @@ __metadata:
   linkType: hard
 
 "@types/pg@npm:^8.6.6":
-  version: 8.11.6
-  resolution: "@types/pg@npm:8.11.6"
+  version: 8.11.8
+  resolution: "@types/pg@npm:8.11.8"
   dependencies:
     "@types/node": "npm:*"
     pg-protocol: "npm:*"
     pg-types: "npm:^4.0.1"
-  checksum: 10c0/e68e057d9500b25cd776f4fcc547b4880c4f3b0c7b6e03c8a0e5e262b6189dd7a00f4edc8937ffc55a9f6a136a78d7e4a9b6bbe6a46122a95c134f7be66f6842
+  checksum: 10c0/040eb04edda338a13dccee47585b4479549fd54561e1bc3768690545adb8708a089b178e04fab9241935d7bad361314fc57af3ad87b391cfb9dc0895dd049763
   languageName: node
   linkType: hard
 
@@ -3917,12 +3917,12 @@ __metadata:
   linkType: hard
 
 "@types/react@npm:*, @types/react@npm:16 || 17 || 18, @types/react@npm:>=16.9.11, @types/react@npm:^18.2.7":
-  version: 18.3.4
-  resolution: "@types/react@npm:18.3.4"
+  version: 18.3.5
+  resolution: "@types/react@npm:18.3.5"
   dependencies:
     "@types/prop-types": "npm:*"
     csstype: "npm:^3.0.2"
-  checksum: 10c0/5c52e1e6f540cff21e3c2a5212066d02e005f6fb21e4a536a29097fae878db9f407cd7a4b43778f51359349c5f692e08bc77ddb5f5cecbfca9ca4d4e3c91a48e
+  checksum: 10c0/548b1d3d7c2f0242fbfdbbd658731b4ce69a134be072fa83e6ab516f2840402a3f20e3e7f72e95133b23d4880ef24a6d864050dc8e1f7c68f39fa87ca8445917
   languageName: node
   linkType: hard
 

From d1cca521e1a011255b91f9af9e0cdaebab6c0dab Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 2 Sep 2024 08:36:56 +0000
Subject: [PATCH 2024/2191] Update devDependencies (non-major) (#31686)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 52 ++++++++++++++++++++++++++--------------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 31dd9ab7d6c9b5..44e8ba025e3978 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1579,7 +1579,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/css-parser-algorithms@npm:^3.0.0, @csstools/css-parser-algorithms@npm:^3.0.1":
+"@csstools/css-parser-algorithms@npm:^3.0.1":
   version: 3.0.1
   resolution: "@csstools/css-parser-algorithms@npm:3.0.1"
   peerDependencies:
@@ -1588,14 +1588,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/css-tokenizer@npm:^3.0.0, @csstools/css-tokenizer@npm:^3.0.1":
+"@csstools/css-tokenizer@npm:^3.0.1":
   version: 3.0.1
   resolution: "@csstools/css-tokenizer@npm:3.0.1"
   checksum: 10c0/c9ed4373e5731b5375ea9791590081019c04e95f08b46b272977e5e7b8c3d560affc62e82263cb8def1df1e57f0673140e7e16a14a5e7be04e6a234be088d1d3
   languageName: node
   linkType: hard
 
-"@csstools/media-query-list-parser@npm:^3.0.0, @csstools/media-query-list-parser@npm:^3.0.1":
+"@csstools/media-query-list-parser@npm:^3.0.1":
   version: 3.0.1
   resolution: "@csstools/media-query-list-parser@npm:3.0.1"
   peerDependencies:
@@ -3380,8 +3380,8 @@ __metadata:
   linkType: hard
 
 "@testing-library/react@npm:^16.0.0":
-  version: 16.0.0
-  resolution: "@testing-library/react@npm:16.0.0"
+  version: 16.0.1
+  resolution: "@testing-library/react@npm:16.0.1"
   dependencies:
     "@babel/runtime": "npm:^7.12.5"
   peerDependencies:
@@ -3395,7 +3395,7 @@ __metadata:
       optional: true
     "@types/react-dom":
       optional: true
-  checksum: 10c0/297f97bf4722dad05f11d9cafd47d387dbdb096fea4b79b876c7466460f0f2e345b55b81b3e37fc81ed8185c528cb53dd8455ca1b6b019b229edf6c796f11c9f
+  checksum: 10c0/67d05dec5ad5a2e6f92b6a3234af785435c7bb62bdbf12f3bfc89c9bca0c871a189e88c4ba023ed4cea504704c87c6ac7e86e24a3962df6c521ae89b62f48ff7
   languageName: node
   linkType: hard
 
@@ -11335,8 +11335,8 @@ __metadata:
   linkType: hard
 
 "lint-staged@npm:^15.0.0":
-  version: 15.2.9
-  resolution: "lint-staged@npm:15.2.9"
+  version: 15.2.10
+  resolution: "lint-staged@npm:15.2.10"
   dependencies:
     chalk: "npm:~5.3.0"
     commander: "npm:~12.1.0"
@@ -11344,13 +11344,13 @@ __metadata:
     execa: "npm:~8.0.1"
     lilconfig: "npm:~3.1.2"
     listr2: "npm:~8.2.4"
-    micromatch: "npm:~4.0.7"
+    micromatch: "npm:~4.0.8"
     pidtree: "npm:~0.6.0"
     string-argv: "npm:~0.3.2"
     yaml: "npm:~2.5.0"
   bin:
     lint-staged: bin/lint-staged.js
-  checksum: 10c0/820c622378b62b826974af17f1747e2a4b0556e4fb99d101af89ad298d392ff079f580fdc576f16a27e975d726b95d73495fd524139402ff654c4649ef2f1a6a
+  checksum: 10c0/6ad7b41f5e87a84fa2eb1990080ea3c68a2f2031b4e81edcdc2a458cc878538eedb310e6f98ffd878a1287e1a52ac968e540ee8a0e96c247e04b0cbc36421cdd
   languageName: node
   linkType: hard
 
@@ -11827,13 +11827,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"micromatch@npm:^4.0.4, micromatch@npm:^4.0.7, micromatch@npm:~4.0.7":
-  version: 4.0.7
-  resolution: "micromatch@npm:4.0.7"
+"micromatch@npm:^4.0.4, micromatch@npm:^4.0.8, micromatch@npm:~4.0.8":
+  version: 4.0.8
+  resolution: "micromatch@npm:4.0.8"
   dependencies:
     braces: "npm:^3.0.3"
     picomatch: "npm:^2.3.1"
-  checksum: 10c0/58fa99bc5265edec206e9163a1d2cec5fabc46a5b473c45f4a700adce88c2520456ae35f2b301e4410fb3afb27e9521fb2813f6fc96be0a48a89430e0916a772
+  checksum: 10c0/166fa6eb926b9553f32ef81f5f531d27b4ce7da60e5baf8c021d043b27a388fb95e46a8038d5045877881e673f8134122b59624d5cecbd16eb50a42e7a6b5ca8
   languageName: node
   linkType: hard
 
@@ -16622,12 +16622,12 @@ __metadata:
   linkType: hard
 
 "stylelint@npm:^16.0.2":
-  version: 16.8.2
-  resolution: "stylelint@npm:16.8.2"
+  version: 16.9.0
+  resolution: "stylelint@npm:16.9.0"
   dependencies:
-    "@csstools/css-parser-algorithms": "npm:^3.0.0"
-    "@csstools/css-tokenizer": "npm:^3.0.0"
-    "@csstools/media-query-list-parser": "npm:^3.0.0"
+    "@csstools/css-parser-algorithms": "npm:^3.0.1"
+    "@csstools/css-tokenizer": "npm:^3.0.1"
+    "@csstools/media-query-list-parser": "npm:^3.0.1"
     "@csstools/selector-specificity": "npm:^4.0.0"
     "@dual-bundle/import-meta-resolve": "npm:^4.1.0"
     balanced-match: "npm:^2.0.0"
@@ -16649,7 +16649,7 @@ __metadata:
     known-css-properties: "npm:^0.34.0"
     mathml-tag-names: "npm:^2.1.3"
     meow: "npm:^13.2.0"
-    micromatch: "npm:^4.0.7"
+    micromatch: "npm:^4.0.8"
     normalize-path: "npm:^3.0.0"
     picocolors: "npm:^1.0.1"
     postcss: "npm:^8.4.41"
@@ -16660,13 +16660,13 @@ __metadata:
     resolve-from: "npm:^5.0.0"
     string-width: "npm:^4.2.3"
     strip-ansi: "npm:^7.1.0"
-    supports-hyperlinks: "npm:^3.0.0"
+    supports-hyperlinks: "npm:^3.1.0"
     svg-tags: "npm:^1.0.0"
     table: "npm:^6.8.2"
     write-file-atomic: "npm:^5.0.1"
   bin:
     stylelint: bin/stylelint.mjs
-  checksum: 10c0/898cde9b5d981f249133df709458eebf2af0a525e72410ddfafd76a7308f7da493578b6a909c593cc70061556b9eda1fed4f477385ee615435f0996d9e18d8df
+  checksum: 10c0/d3ff9c8945c56b04a2fa16ec33d163325496d5db94b6fcb5adf74c76f7f794ac992888273f9a3317652ba8b6195168b2ffff382ca2a667a241e2ace8c9505ae2
   languageName: node
   linkType: hard
 
@@ -16720,13 +16720,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"supports-hyperlinks@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "supports-hyperlinks@npm:3.0.0"
+"supports-hyperlinks@npm:^3.1.0":
+  version: 3.1.0
+  resolution: "supports-hyperlinks@npm:3.1.0"
   dependencies:
     has-flag: "npm:^4.0.0"
     supports-color: "npm:^7.0.0"
-  checksum: 10c0/36aaa55e67645dded8e0f846fd81d7dd05ce82ea81e62347f58d86213577eb627b2b45298656ce7a70e7155e39f071d0d3f83be91e112aed801ebaa8db1ef1d0
+  checksum: 10c0/78cc3e17eb27e6846fa355a8ebf343befe36272899cd409e45317a06c1997e95c23ff99d91080a517bd8c96508d4fa456e6ceb338c02ba5d7544277dbec0f10f
   languageName: node
   linkType: hard
 

From 5439af327646de337b16e6706d412f8fbaffc8a7 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 2 Sep 2024 04:46:50 -0400
Subject: [PATCH 2025/2191] Bump Bundler/Ruby versions in lockfile, misc gem
 version bumps (#31666)

---
 Gemfile.lock | 61 ++++++++++++++++++++++++++++------------------------
 1 file changed, 33 insertions(+), 28 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 8c43ef054adf85..11e8aee83b45bb 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -100,8 +100,8 @@ GEM
     attr_required (1.0.2)
     awrence (1.2.1)
     aws-eventstream (1.3.0)
-    aws-partitions (1.966.0)
-    aws-sdk-core (3.201.5)
+    aws-partitions (1.969.0)
+    aws-sdk-core (3.202.1)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.9)
@@ -164,20 +164,22 @@ GEM
       activesupport (>= 5.2)
       elasticsearch (>= 7.14.0, < 8)
       elasticsearch-dsl
+    childprocess (5.1.0)
+      logger (~> 1.5)
     chunky_png (1.4.0)
     climate_control (1.2.0)
     cocoon (1.2.15)
     color_diff (0.1)
     concurrent-ruby (1.3.4)
     connection_pool (2.4.1)
-    cose (1.3.0)
+    cose (1.3.1)
       cbor (~> 0.5.9)
       openssl-signature_algorithm (~> 1.0)
     crack (1.0.0)
       bigdecimal
       rexml
     crass (1.0.6)
-    css_parser (1.17.1)
+    css_parser (1.19.0)
       addressable
     csv (3.3.0)
     database_cleaner-active_record (2.2.0)
@@ -206,20 +208,21 @@ GEM
     diff-lcs (1.5.1)
     discard (1.3.0)
       activerecord (>= 4.2, < 8)
-    docile (1.4.0)
+    docile (1.4.1)
     domain_name (0.6.20240107)
     doorkeeper (5.7.1)
       railties (>= 5)
     dotenv (3.1.2)
     drb (2.2.1)
     ed25519 (1.3.0)
-    elasticsearch (7.17.10)
-      elasticsearch-api (= 7.17.10)
-      elasticsearch-transport (= 7.17.10)
-    elasticsearch-api (7.17.10)
+    elasticsearch (7.17.11)
+      elasticsearch-api (= 7.17.11)
+      elasticsearch-transport (= 7.17.11)
+    elasticsearch-api (7.17.11)
       multi_json
     elasticsearch-dsl (0.1.10)
-    elasticsearch-transport (7.17.10)
+    elasticsearch-transport (7.17.11)
+      base64
       faraday (>= 1, < 3)
       multi_json
     email_spec (2.3.0)
@@ -251,7 +254,7 @@ GEM
     faraday-httpclient (1.0.1)
     faraday-multipart (1.0.4)
       multipart-post (~> 2)
-    faraday-net_http (1.0.1)
+    faraday-net_http (1.0.2)
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
@@ -308,11 +311,12 @@ GEM
       rainbow
       rubocop (>= 1.0)
       sysexits (~> 1.1)
-    hashdiff (1.1.0)
+    hashdiff (1.1.1)
     hashie (5.0.0)
     hcaptcha (7.1.0)
       json
-    highline (3.0.1)
+    highline (3.1.1)
+      reline
     hiredis (0.6.3)
     hkdf (0.3.0)
     htmlentities (4.3.4)
@@ -392,8 +396,9 @@ GEM
       mime-types
       terrapin (>= 0.6.0, < 2.0)
     language_server-protocol (3.17.0.3)
-    launchy (2.5.2)
+    launchy (3.0.1)
       addressable (~> 2.8)
+      childprocess (~> 5.0)
     letter_opener (1.10.0)
       launchy (>= 2.2, < 4)
     letter_opener_web (3.0.0)
@@ -430,19 +435,19 @@ GEM
     memory_profiler (1.0.2)
     mime-types (3.5.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2024.0702)
+    mime-types-data (3.2024.0820)
     mini_mime (1.1.5)
     mini_portile2 (2.8.7)
     minitest (5.25.1)
     msgpack (1.7.2)
     multi_json (1.15.0)
-    multipart-post (2.4.0)
+    multipart-post (2.4.1)
     mutex_m (0.2.0)
     net-http (0.4.1)
       uri
     net-http-persistent (4.0.2)
       connection_pool (~> 2.2)
-    net-imap (0.4.14)
+    net-imap (0.4.15)
       date
       net-protocol
     net-ldap (0.19.0)
@@ -581,8 +586,8 @@ GEM
     orm_adapter (0.5.0)
     ostruct (0.6.0)
     ox (2.14.18)
-    parallel (1.25.1)
-    parser (3.3.4.0)
+    parallel (1.26.3)
+    parser (3.3.4.2)
       ast (~> 2.4.1)
       racc
     parslet (2.0.0)
@@ -591,9 +596,9 @@ GEM
     pg (1.5.7)
     pghero (3.6.0)
       activerecord (>= 6.1)
-    premailer (1.23.0)
+    premailer (1.27.0)
       addressable
-      css_parser (>= 1.12.0)
+      css_parser (>= 1.19.0)
       htmlentities (>= 4.0.0)
     premailer-rails (1.12.0)
       actionmailer (>= 3)
@@ -699,7 +704,7 @@ GEM
     rexml (3.3.6)
       strscan
     rotp (6.3.0)
-    rouge (4.2.1)
+    rouge (4.3.0)
     rpam2 (4.0.2)
     rqrcode (2.2.0)
       chunky_png (~> 1.0)
@@ -744,7 +749,7 @@ GEM
       rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.31.3)
+    rubocop-ast (1.32.1)
       parser (>= 3.3.1.0)
     rubocop-capybara (2.21.0)
       rubocop (~> 1.41)
@@ -835,9 +840,9 @@ GEM
       climate_control
     test-prof (1.4.1)
     thor (1.3.2)
-    tilt (2.3.0)
+    tilt (2.4.0)
     timeout (0.4.1)
-    tpm-key_attestation (0.12.0)
+    tpm-key_attestation (0.12.1)
       bindata (~> 2.4)
       openssl (> 2.0)
       openssl-signature_algorithm (~> 1.0)
@@ -862,7 +867,7 @@ GEM
       unf_ext
     unf_ext (0.0.9.1)
     unicode-display_width (2.5.0)
-    uri (0.13.0)
+    uri (0.13.1)
     validate_email (0.1.6)
       activemodel (>= 3.0)
       mail (>= 2.2.5)
@@ -1057,7 +1062,7 @@ DEPENDENCIES
   xorcist (~> 1.1)
 
 RUBY VERSION
-   ruby 3.3.2p78
+   ruby 3.3.4p94
 
 BUNDLED WITH
-   2.5.11
+   2.5.18

From fc870c7e5ac7de96bfa90b67c013f87d62fc8fb2 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 2 Sep 2024 11:35:43 +0200
Subject: [PATCH 2026/2191] Update dependency postcss to v8.4.44 (#31691)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 44e8ba025e3978..57e928c4de40cc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -14016,13 +14016,13 @@ __metadata:
   linkType: hard
 
 "postcss@npm:^8.2.15, postcss@npm:^8.4.24, postcss@npm:^8.4.41":
-  version: 8.4.43
-  resolution: "postcss@npm:8.4.43"
+  version: 8.4.44
+  resolution: "postcss@npm:8.4.44"
   dependencies:
     nanoid: "npm:^3.3.7"
     picocolors: "npm:^1.0.1"
     source-map-js: "npm:^1.2.0"
-  checksum: 10c0/7cc9c6393ca00fcdca6fef8d119218df9357389b9fed30b6d4b463fc0e85159595a877f4ac0a2a565ea4c447cab1f424e527e68d8b7d40b8c94a6684663d45c5
+  checksum: 10c0/53c33338261a3d4f4198f8893e9dfe8b828d8d9186142ee85f02d228f04245c5bbe31239411a357a556ad20ed96f28db24d0921d63edc428fdc9133289371a1d
   languageName: node
   linkType: hard
 

From a23b3747ac7131a1725748b386109732942120fc Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 2 Sep 2024 11:56:00 +0200
Subject: [PATCH 2027/2191] Fix N+1s in grouped notifications (#31638)

---
 .../api/v2_alpha/notifications_controller.rb  |  20 +---
 app/models/notification_group.rb              | 109 +++++++++++++-----
 .../rest/notification_group_serializer.rb     |  11 +-
 3 files changed, 90 insertions(+), 50 deletions(-)

diff --git a/app/controllers/api/v2_alpha/notifications_controller.rb b/app/controllers/api/v2_alpha/notifications_controller.rb
index a9f4ac02a038f3..13a016aeb7084f 100644
--- a/app/controllers/api/v2_alpha/notifications_controller.rb
+++ b/app/controllers/api/v2_alpha/notifications_controller.rb
@@ -13,7 +13,6 @@ class Api::V2Alpha::NotificationsController < Api::BaseController
   def index
     with_read_replica do
       @notifications = load_notifications
-      @group_metadata = load_group_metadata
       @grouped_notifications = load_grouped_notifications
       @relationships = StatusRelationshipsPresenter.new(target_statuses_from_notifications, current_user&.account_id)
       @presenter = GroupedNotificationsPresenter.new(@grouped_notifications, expand_accounts: expand_accounts_param)
@@ -34,7 +33,7 @@ def index
         'app.notification_grouping.expand_accounts_param' => expand_accounts_param
       )
 
-      render json: @presenter, serializer: REST::DedupNotificationGroupSerializer, relationships: @relationships, group_metadata: @group_metadata, expand_accounts: expand_accounts_param
+      render json: @presenter, serializer: REST::DedupNotificationGroupSerializer, relationships: @relationships, expand_accounts: expand_accounts_param
     end
   end
 
@@ -48,7 +47,7 @@ def unread_count
 
   def show
     @notification = current_account.notifications.without_suspended.find_by!(group_key: params[:id])
-    presenter = GroupedNotificationsPresenter.new([NotificationGroup.from_notification(@notification)])
+    presenter = GroupedNotificationsPresenter.new(NotificationGroup.from_notifications([@notification]))
     render json: presenter, serializer: REST::DedupNotificationGroupSerializer
   end
 
@@ -77,22 +76,9 @@ def load_notifications
     end
   end
 
-  def load_group_metadata
-    return {} if @notifications.empty?
-
-    MastodonOTELTracer.in_span('Api::V2Alpha::NotificationsController#load_group_metadata') do
-      browserable_account_notifications
-        .where(group_key: @notifications.filter_map(&:group_key))
-        .where(id: (@notifications.last.id)..(@notifications.first.id))
-        .group(:group_key)
-        .pluck(:group_key, 'min(notifications.id) as min_id', 'max(notifications.id) as max_id', 'max(notifications.created_at) as latest_notification_at')
-        .to_h { |group_key, min_id, max_id, latest_notification_at| [group_key, { min_id: min_id, max_id: max_id, latest_notification_at: latest_notification_at }] }
-    end
-  end
-
   def load_grouped_notifications
     MastodonOTELTracer.in_span('Api::V2Alpha::NotificationsController#load_grouped_notifications') do
-      @notifications.map { |notification| NotificationGroup.from_notification(notification, max_id: @group_metadata.dig(notification.group_key, :max_id), grouped_types: params[:grouped_types]) }
+      NotificationGroup.from_notifications(@notifications, pagination_range: (@notifications.last.id)..(@notifications.first.id), grouped_types: params[:grouped_types])
     end
   end
 
diff --git a/app/models/notification_group.rb b/app/models/notification_group.rb
index 12294f24ec11a0..b6aa4d309caa5a 100644
--- a/app/models/notification_group.rb
+++ b/app/models/notification_group.rb
@@ -1,38 +1,49 @@
 # frozen_string_literal: true
 
 class NotificationGroup < ActiveModelSerializers::Model
-  attributes :group_key, :sample_accounts, :notifications_count, :notification, :most_recent_notification_id
+  attributes :group_key, :sample_accounts, :notifications_count, :notification, :most_recent_notification_id, :pagination_data
 
   # Try to keep this consistent with `app/javascript/mastodon/models/notification_group.ts`
   SAMPLE_ACCOUNTS_SIZE = 8
 
-  def self.from_notification(notification, max_id: nil, grouped_types: nil)
+  def self.from_notifications(notifications, pagination_range: nil, grouped_types: nil)
+    return [] if notifications.empty?
+
     grouped_types = grouped_types.presence&.map(&:to_sym) || Notification::GROUPABLE_NOTIFICATION_TYPES
-    groupable = notification.group_key.present? && grouped_types.include?(notification.type)
-
-    if groupable
-      # TODO: caching, and, if caching, preloading
-      scope = notification.account.notifications.where(group_key: notification.group_key)
-      scope = scope.where(id: ..max_id) if max_id.present?
-
-      # Ideally, we would not load accounts for each notification group
-      most_recent_notifications = scope.order(id: :desc).includes(:from_account).take(SAMPLE_ACCOUNTS_SIZE)
-      most_recent_id = most_recent_notifications.first.id
-      sample_accounts = most_recent_notifications.map(&:from_account)
-      notifications_count = scope.count
-    else
-      most_recent_id = notification.id
-      sample_accounts = [notification.from_account]
-      notifications_count = 1
-    end
 
-    NotificationGroup.new(
-      notification: notification,
-      group_key: groupable ? notification.group_key : "ungrouped-#{notification.id}",
-      sample_accounts: sample_accounts,
-      notifications_count: notifications_count,
-      most_recent_notification_id: most_recent_id
-    )
+    grouped_notifications = notifications.filter { |notification| notification.group_key.present? && grouped_types.include?(notification.type) }
+    group_keys = grouped_notifications.pluck(:group_key)
+
+    groups_data = load_groups_data(notifications.first.account_id, group_keys, pagination_range: pagination_range)
+    accounts_map = Account.where(id: groups_data.values.pluck(1).flatten).index_by(&:id)
+
+    notifications.map do |notification|
+      if notification.group_key.present? && grouped_types.include?(notification.type)
+        most_recent_notification_id, sample_account_ids, count, *raw_pagination_data = groups_data[notification.group_key]
+
+        pagination_data = raw_pagination_data.empty? ? nil : { min_id: raw_pagination_data[0], latest_notification_at: raw_pagination_data[1] }
+
+        NotificationGroup.new(
+          notification: notification,
+          group_key: notification.group_key,
+          sample_accounts: sample_account_ids.map { |id| accounts_map[id] },
+          notifications_count: count,
+          most_recent_notification_id: most_recent_notification_id,
+          pagination_data: pagination_data
+        )
+      else
+        pagination_data = pagination_range.blank? ? nil : { min_id: notification.id, latest_notification_at: notification.created_at }
+
+        NotificationGroup.new(
+          notification: notification,
+          group_key: "ungrouped-#{notification.id}",
+          sample_accounts: [notification.from_account],
+          notifications_count: 1,
+          most_recent_notification_id: notification.id,
+          pagination_data: pagination_data
+        )
+      end
+    end
   end
 
   delegate :type,
@@ -41,4 +52,50 @@ def self.from_notification(notification, max_id: nil, grouped_types: nil)
            :account_relationship_severance_event,
            :account_warning,
            to: :notification, prefix: false
+
+  class << self
+    private
+
+    def load_groups_data(account_id, group_keys, pagination_range: nil)
+      return {} if group_keys.empty?
+
+      if pagination_range.present?
+        binds = [
+          account_id,
+          SAMPLE_ACCOUNTS_SIZE,
+          pagination_range.begin,
+          pagination_range.end,
+          ActiveRecord::Relation::QueryAttribute.new('group_keys', group_keys, ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Array.new(ActiveModel::Type::String.new)),
+        ]
+
+        ActiveRecord::Base.connection.select_all(<<~SQL.squish, 'grouped_notifications', binds).cast_values.to_h { |k, *values| [k, values] }
+          SELECT
+            groups.group_key,
+            (SELECT id FROM notifications WHERE notifications.account_id = $1 AND notifications.group_key = groups.group_key AND id <= $4 ORDER BY id DESC LIMIT 1),
+            array(SELECT from_account_id FROM notifications WHERE notifications.account_id = $1 AND notifications.group_key = groups.group_key AND id <= $4 ORDER BY id DESC LIMIT $2),
+            (SELECT count(*) FROM notifications WHERE notifications.account_id = $1 AND notifications.group_key = groups.group_key AND id <= $4) AS notifications_count,
+            (SELECT id FROM notifications WHERE notifications.account_id = $1 AND notifications.group_key = groups.group_key AND id >= $3 ORDER BY id ASC LIMIT 1) AS min_id,
+            (SELECT created_at FROM notifications WHERE notifications.account_id = $1 AND notifications.group_key = groups.group_key AND id <= $4 ORDER BY id DESC LIMIT 1)
+          FROM
+            unnest($5::text[]) AS groups(group_key);
+        SQL
+      else
+        binds = [
+          account_id,
+          SAMPLE_ACCOUNTS_SIZE,
+          ActiveRecord::Relation::QueryAttribute.new('group_keys', group_keys, ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Array.new(ActiveModel::Type::String.new)),
+        ]
+
+        ActiveRecord::Base.connection.select_all(<<~SQL.squish, 'grouped_notifications', binds).cast_values.to_h { |k, *values| [k, values] }
+          SELECT
+            groups.group_key,
+            (SELECT id FROM notifications WHERE notifications.account_id = $1 AND notifications.group_key = groups.group_key ORDER BY id DESC LIMIT 1),
+            array(SELECT from_account_id FROM notifications WHERE notifications.account_id = $1 AND notifications.group_key = groups.group_key ORDER BY id DESC LIMIT $2),
+            (SELECT count(*) FROM notifications WHERE notifications.account_id = $1 AND notifications.group_key = groups.group_key) AS notifications_count
+          FROM
+            unnest($3::text[]) AS groups(group_key);
+        SQL
+      end
+    end
+  end
 end
diff --git a/app/serializers/rest/notification_group_serializer.rb b/app/serializers/rest/notification_group_serializer.rb
index b855f1cba9c53b..7e8f00df3c7189 100644
--- a/app/serializers/rest/notification_group_serializer.rb
+++ b/app/serializers/rest/notification_group_serializer.rb
@@ -39,21 +39,18 @@ def moderation_warning_event?
   end
 
   def page_min_id
-    range = instance_options[:group_metadata][object.group_key]
-    range.present? ? range[:min_id].to_s : object.notification.id.to_s
+    object.pagination_data[:min_id].to_s
   end
 
   def page_max_id
-    range = instance_options[:group_metadata][object.group_key]
-    range.present? ? range[:max_id].to_s : object.notification.id.to_s
+    object.most_recent_notification_id.to_s
   end
 
   def latest_page_notification_at
-    range = instance_options[:group_metadata][object.group_key]
-    range.present? ? range[:latest_notification_at] : object.notification.created_at
+    object.pagination_data[:latest_notification_at]
   end
 
   def paginated?
-    !instance_options[:group_metadata].nil?
+    object.pagination_data.present?
   end
 end

From 388d5473e11f1e1b4119cf55b9f499cf87f87c8b Mon Sep 17 00:00:00 2001
From: David Roetzel <david@roetzel.de>
Date: Mon, 2 Sep 2024 16:19:55 +0200
Subject: [PATCH 2028/2191] Refactor (ruby) redis configuration (#31694)

---
 ...s_configuration.rb => redis_connection.rb} |  29 ++-
 app/models/concerns/redisable.rb              |   4 +-
 config/application.rb                         |   3 +-
 config/environments/development.rb            |   2 +-
 config/environments/production.rb             |   2 +-
 config/initializers/sidekiq.rb                |   4 +-
 config/initializers/stoplight.rb              |   2 +-
 .../20170920032311_fix_reblogs_in_feeds.rb    |   2 +-
 ...00407202420_migrate_unavailable_inboxes.rb |   2 +-
 lib/chewy/strategy/mastodon.rb                |   2 +-
 lib/mastodon/cli/base.rb                      |   2 +-
 lib/mastodon/cli/progress_helper.rb           |   2 +-
 lib/mastodon/rack_middleware.rb               |   2 +-
 lib/mastodon/redis_config.rb                  |  53 ------
 lib/mastodon/redis_configuration.rb           |  96 ++++++++++
 lib/mastodon/sidekiq_middleware.rb            |   2 +-
 spec/lib/mastodon/redis_configuration_spec.rb | 170 ++++++++++++++++++
 spec/rails_helper.rb                          |   2 +-
 spec/services/resolve_account_service_spec.rb |   2 +-
 spec/support/streaming_server_manager.rb      |   2 +-
 20 files changed, 295 insertions(+), 90 deletions(-)
 rename app/lib/{redis_configuration.rb => redis_connection.rb} (65%)
 delete mode 100644 lib/mastodon/redis_config.rb
 create mode 100644 lib/mastodon/redis_configuration.rb
 create mode 100644 spec/lib/mastodon/redis_configuration_spec.rb

diff --git a/app/lib/redis_configuration.rb b/app/lib/redis_connection.rb
similarity index 65%
rename from app/lib/redis_configuration.rb
rename to app/lib/redis_connection.rb
index fb1249640fd733..24e376e6a5cec3 100644
--- a/app/lib/redis_configuration.rb
+++ b/app/lib/redis_connection.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class RedisConfiguration
+class RedisConnection
   class << self
     def establish_pool(new_pool_size)
       @pool&.shutdown(&:close)
@@ -22,33 +22,24 @@ def pool_size
     end
   end
 
+  attr_reader :config
+
+  def initialize
+    @config = REDIS_CONFIGURATION.base
+  end
+
   def connection
-    if namespace?
+    namespace = config[:namespace]
+    if namespace.present?
       Redis::Namespace.new(namespace, redis: raw_connection)
     else
       raw_connection
     end
   end
 
-  def namespace?
-    namespace.present?
-  end
-
-  def namespace
-    ENV.fetch('REDIS_NAMESPACE', nil)
-  end
-
-  def url
-    ENV['REDIS_URL']
-  end
-
-  def redis_driver
-    ENV.fetch('REDIS_DRIVER', 'hiredis') == 'ruby' ? :ruby : :hiredis
-  end
-
   private
 
   def raw_connection
-    Redis.new(url: url, driver: redis_driver)
+    Redis.new(**config)
   end
 end
diff --git a/app/models/concerns/redisable.rb b/app/models/concerns/redisable.rb
index 0dad3abb2b3e0a..01763fa2978be6 100644
--- a/app/models/concerns/redisable.rb
+++ b/app/models/concerns/redisable.rb
@@ -2,10 +2,10 @@
 
 module Redisable
   def redis
-    Thread.current[:redis] ||= RedisConfiguration.pool.checkout
+    Thread.current[:redis] ||= RedisConnection.pool.checkout
   end
 
   def with_redis(&block)
-    RedisConfiguration.with(&block)
+    RedisConnection.with(&block)
   end
 end
diff --git a/config/application.rb b/config/application.rb
index 3c62a4922898d4..0013c788583035 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -101,7 +101,8 @@ class Application < Rails::Application
     end
 
     config.before_configuration do
-      require 'mastodon/redis_config'
+      require 'mastodon/redis_configuration'
+      ::REDIS_CONFIGURATION = Mastodon::RedisConfiguration.new
 
       config.x.use_vips = ENV['MASTODON_USE_LIBVIPS'] == 'true'
 
diff --git a/config/environments/development.rb b/config/environments/development.rb
index e4da60ac8e89bd..74f0913da241c4 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -25,7 +25,7 @@
     config.action_controller.perform_caching = true
     config.action_controller.enable_fragment_cache_logging = true
 
-    config.cache_store = :redis_cache_store, REDIS_CACHE_PARAMS
+    config.cache_store = :redis_cache_store, REDIS_CONFIGURATION.cache
     config.public_file_server.headers = {
       'Cache-Control' => "public, max-age=#{2.days.to_i}",
     }
diff --git a/config/environments/production.rb b/config/environments/production.rb
index b42f78b14eafca..5129b73e411799 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -57,7 +57,7 @@
   config.log_tags = [:request_id]
 
   # Use a different cache store in production.
-  config.cache_store = :redis_cache_store, REDIS_CACHE_PARAMS
+  config.cache_store = :redis_cache_store, REDIS_CONFIGURATION.cache
 
   # Use a real queuing backend for Active Job (and separate queues per environment).
   # config.active_job.queue_adapter     = :resque
diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb
index 5b2f317bf2efc1..5b281c4339ef77 100644
--- a/config/initializers/sidekiq.rb
+++ b/config/initializers/sidekiq.rb
@@ -3,7 +3,7 @@
 require_relative '../../lib/mastodon/sidekiq_middleware'
 
 Sidekiq.configure_server do |config|
-  config.redis = REDIS_SIDEKIQ_PARAMS
+  config.redis = REDIS_CONFIGURATION.sidekiq
 
   # This is used in Kubernetes setups, to signal that the Sidekiq process has started and will begin processing jobs
   # This comes from https://github.com/sidekiq/sidekiq/wiki/Kubernetes#sidekiq
@@ -51,7 +51,7 @@
 end
 
 Sidekiq.configure_client do |config|
-  config.redis = REDIS_SIDEKIQ_PARAMS
+  config.redis = REDIS_CONFIGURATION.sidekiq
 
   config.client_middleware do |chain|
     chain.add SidekiqUniqueJobs::Middleware::Client
diff --git a/config/initializers/stoplight.rb b/config/initializers/stoplight.rb
index 7c13d506378f44..0ade504f67b174 100644
--- a/config/initializers/stoplight.rb
+++ b/config/initializers/stoplight.rb
@@ -3,6 +3,6 @@
 require 'stoplight'
 
 Rails.application.reloader.to_prepare do
-  Stoplight.default_data_store = Stoplight::DataStore::Redis.new(RedisConfiguration.new.connection)
+  Stoplight.default_data_store = Stoplight::DataStore::Redis.new(RedisConnection.new.connection)
   Stoplight.default_notifiers  = [Stoplight::Notifier::Logger.new(Rails.logger)]
 end
diff --git a/db/migrate/20170920032311_fix_reblogs_in_feeds.rb b/db/migrate/20170920032311_fix_reblogs_in_feeds.rb
index fd6ad39f083b74..e752915fb90045 100644
--- a/db/migrate/20170920032311_fix_reblogs_in_feeds.rb
+++ b/db/migrate/20170920032311_fix_reblogs_in_feeds.rb
@@ -2,7 +2,7 @@
 
 class FixReblogsInFeeds < ActiveRecord::Migration[5.1]
   def up
-    redis = RedisConfiguration.pool.checkout
+    redis = RedisConnection.pool.checkout
     fm = FeedManager.instance
 
     # Old scheme:
diff --git a/db/migrate/20200407202420_migrate_unavailable_inboxes.rb b/db/migrate/20200407202420_migrate_unavailable_inboxes.rb
index a79045839ba99e..3caacbe90ba6c8 100644
--- a/db/migrate/20200407202420_migrate_unavailable_inboxes.rb
+++ b/db/migrate/20200407202420_migrate_unavailable_inboxes.rb
@@ -4,7 +4,7 @@ class MigrateUnavailableInboxes < ActiveRecord::Migration[5.2]
   disable_ddl_transaction!
 
   def up
-    redis = RedisConfiguration.pool.checkout
+    redis = RedisConnection.pool.checkout
     urls = redis.smembers('unavailable_inboxes')
 
     hosts = urls.filter_map do |url|
diff --git a/lib/chewy/strategy/mastodon.rb b/lib/chewy/strategy/mastodon.rb
index ee8b921865e218..a4b655c506e0d1 100644
--- a/lib/chewy/strategy/mastodon.rb
+++ b/lib/chewy/strategy/mastodon.rb
@@ -14,7 +14,7 @@ def update(type, objects, _options = {})
       end
 
       def leave
-        RedisConfiguration.with do |redis|
+        RedisConnection.with do |redis|
           redis.pipelined do |pipeline|
             @stash.each do |type, ids|
               pipeline.sadd("chewy:queue:#{type.name}", ids)
diff --git a/lib/mastodon/cli/base.rb b/lib/mastodon/cli/base.rb
index 93dec1fb8fefc3..dfdcec57befc45 100644
--- a/lib/mastodon/cli/base.rb
+++ b/lib/mastodon/cli/base.rb
@@ -40,7 +40,7 @@ def reset_connection_pools!
             .dup
             .tap { |config| config['pool'] = options[:concurrency] + 1 }
         )
-        RedisConfiguration.establish_pool(options[:concurrency])
+        RedisConnection.establish_pool(options[:concurrency])
       end
     end
   end
diff --git a/lib/mastodon/cli/progress_helper.rb b/lib/mastodon/cli/progress_helper.rb
index f22492afcf45b8..56343437967650 100644
--- a/lib/mastodon/cli/progress_helper.rb
+++ b/lib/mastodon/cli/progress_helper.rb
@@ -51,7 +51,7 @@ def parallelize_with_progress(scope)
               result = ActiveRecord::Base.connection_pool.with_connection do
                 yield(item)
               ensure
-                RedisConfiguration.pool.checkin if Thread.current[:redis]
+                RedisConnection.pool.checkin if Thread.current[:redis]
                 Thread.current[:redis] = nil
               end
 
diff --git a/lib/mastodon/rack_middleware.rb b/lib/mastodon/rack_middleware.rb
index 8aa7911fe7edc5..0e452f06d6d06d 100644
--- a/lib/mastodon/rack_middleware.rb
+++ b/lib/mastodon/rack_middleware.rb
@@ -19,7 +19,7 @@ def clean_up_sockets!
   end
 
   def clean_up_redis_socket!
-    RedisConfiguration.pool.checkin if Thread.current[:redis]
+    RedisConnection.pool.checkin if Thread.current[:redis]
     Thread.current[:redis] = nil
   end
 
diff --git a/lib/mastodon/redis_config.rb b/lib/mastodon/redis_config.rb
deleted file mode 100644
index c858b61a053682..00000000000000
--- a/lib/mastodon/redis_config.rb
+++ /dev/null
@@ -1,53 +0,0 @@
-# frozen_string_literal: true
-
-def setup_redis_env_url(prefix = nil, defaults = true)
-  prefix = "#{prefix.to_s.upcase}_" unless prefix.nil?
-  prefix = '' if prefix.nil?
-
-  return if ENV["#{prefix}REDIS_URL"].present?
-
-  password = ENV.fetch("#{prefix}REDIS_PASSWORD") { '' if defaults }
-  host     = ENV.fetch("#{prefix}REDIS_HOST") { 'localhost' if defaults }
-  port     = ENV.fetch("#{prefix}REDIS_PORT") { 6379 if defaults }
-  db       = ENV.fetch("#{prefix}REDIS_DB") { 0 if defaults }
-
-  ENV["#{prefix}REDIS_URL"] = begin
-    if [password, host, port, db].all?(&:nil?)
-      ENV['REDIS_URL']
-    else
-      Addressable::URI.parse("redis://#{host}:#{port}/#{db}").tap do |uri|
-        uri.password = password if password.present?
-      end.normalize.to_str
-    end
-  end
-end
-
-setup_redis_env_url
-setup_redis_env_url(:cache, false)
-setup_redis_env_url(:sidekiq, false)
-
-namespace         = ENV.fetch('REDIS_NAMESPACE', nil)
-cache_namespace   = namespace ? "#{namespace}_cache" : 'cache'
-sidekiq_namespace = namespace
-
-redis_driver = ENV.fetch('REDIS_DRIVER', 'hiredis') == 'ruby' ? :ruby : :hiredis
-
-REDIS_CACHE_PARAMS = {
-  driver: redis_driver,
-  url: ENV['CACHE_REDIS_URL'],
-  expires_in: 10.minutes,
-  namespace: "#{cache_namespace}:7.1",
-  connect_timeout: 5,
-  pool: {
-    size: Sidekiq.server? ? Sidekiq[:concurrency] : Integer(ENV['MAX_THREADS'] || 5),
-    timeout: 5,
-  },
-}.freeze
-
-REDIS_SIDEKIQ_PARAMS = {
-  driver: redis_driver,
-  url: ENV['SIDEKIQ_REDIS_URL'],
-  namespace: sidekiq_namespace,
-}.freeze
-
-ENV['REDIS_NAMESPACE'] = "mastodon_test#{ENV['TEST_ENV_NUMBER']}" if Rails.env.test?
diff --git a/lib/mastodon/redis_configuration.rb b/lib/mastodon/redis_configuration.rb
new file mode 100644
index 00000000000000..3cd121e4ac2762
--- /dev/null
+++ b/lib/mastodon/redis_configuration.rb
@@ -0,0 +1,96 @@
+# frozen_string_literal: true
+
+class Mastodon::RedisConfiguration
+  def base
+    @base ||= {
+      url: setup_base_redis_url,
+      driver: driver,
+      namespace: base_namespace,
+    }
+  end
+
+  def sidekiq
+    @sidekiq ||= {
+      url: setup_prefixed_redis_url(:sidekiq),
+      driver: driver,
+      namespace: sidekiq_namespace,
+    }
+  end
+
+  def cache
+    @cache ||= {
+      url: setup_prefixed_redis_url(:cache),
+      driver: driver,
+      namespace: cache_namespace,
+      expires_in: 10.minutes,
+      connect_timeout: 5,
+      pool: {
+        size: Sidekiq.server? ? Sidekiq[:concurrency] : Integer(ENV['MAX_THREADS'] || 5),
+        timeout: 5,
+      },
+    }
+  end
+
+  private
+
+  def driver
+    ENV['REDIS_DRIVER'] == 'ruby' ? :ruby : :hiredis
+  end
+
+  def namespace
+    @namespace ||= ENV.fetch('REDIS_NAMESPACE', nil)
+  end
+
+  def base_namespace
+    return "mastodon_test#{ENV.fetch('TEST_ENV_NUMBER', nil)}" if Rails.env.test?
+
+    namespace
+  end
+
+  def sidekiq_namespace
+    namespace
+  end
+
+  def cache_namespace
+    namespace ? "#{namespace}_cache" : 'cache'
+  end
+
+  def setup_base_redis_url
+    url = ENV.fetch('REDIS_URL', nil)
+    return url if url.present?
+
+    user     = ENV.fetch('REDIS_USER', '')
+    password = ENV.fetch('REDIS_PASSWORD', '')
+    host     = ENV.fetch('REDIS_HOST', 'localhost')
+    port     = ENV.fetch('REDIS_PORT', 6379)
+    db       = ENV.fetch('REDIS_DB', 0)
+
+    construct_uri(host, port, db, user, password)
+  end
+
+  def setup_prefixed_redis_url(prefix)
+    prefix = "#{prefix.to_s.upcase}_"
+    url = ENV.fetch("#{prefix}REDIS_URL", nil)
+
+    return url if url.present?
+
+    user     = ENV.fetch("#{prefix}REDIS_USER", nil)
+    password = ENV.fetch("#{prefix}REDIS_PASSWORD", nil)
+    host     = ENV.fetch("#{prefix}REDIS_HOST", nil)
+    port     = ENV.fetch("#{prefix}REDIS_PORT", nil)
+    db       = ENV.fetch("#{prefix}REDIS_DB", nil)
+
+    if host.nil?
+      base[:url]
+    else
+      construct_uri(host, port, db, user, password)
+    end
+  end
+
+  def construct_uri(host, port, db, user, password)
+    Addressable::URI.parse("redis://#{host}:#{port}/#{db}").tap do |uri|
+      uri.user = user if user.present?
+      uri.password = password if password.present?
+    end.normalize.to_str
+  end
+end
diff --git a/lib/mastodon/sidekiq_middleware.rb b/lib/mastodon/sidekiq_middleware.rb
index c5f4d8da356247..8ce1124c69f47d 100644
--- a/lib/mastodon/sidekiq_middleware.rb
+++ b/lib/mastodon/sidekiq_middleware.rb
@@ -53,7 +53,7 @@ def clean_up_elasticsearch_connections!
   end
 
   def clean_up_redis_socket!
-    RedisConfiguration.pool.checkin if Thread.current[:redis]
+    RedisConnection.pool.checkin if Thread.current[:redis]
     Thread.current[:redis] = nil
   end
 
diff --git a/spec/lib/mastodon/redis_configuration_spec.rb b/spec/lib/mastodon/redis_configuration_spec.rb
new file mode 100644
index 00000000000000..c7326fd41175a4
--- /dev/null
+++ b/spec/lib/mastodon/redis_configuration_spec.rb
@@ -0,0 +1,170 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe Mastodon::RedisConfiguration do
+  let(:redis_environment) { described_class.new }
+
+  before do
+    # We use one numbered namespace per parallel test runner
+    # in the test env. This here should test the non-test
+    # behavior, so we disable it temporarily.
+    allow(Rails.env).to receive(:test?).and_return(false)
+  end
+
+  shared_examples 'setting a different driver' do
+    context 'when setting the `REDIS_DRIVER` variable to `ruby`' do
+      around do |example|
+        ClimateControl.modify REDIS_DRIVER: 'ruby' do
+          example.run
+        end
+      end
+
+      it 'sets the driver accordingly' do
+        expect(subject[:driver]).to eq :ruby
+      end
+    end
+  end
+
+  shared_examples 'setting a namespace' do
+    context 'when setting the `REDIS_NAMESPACE` variable' do
+      around do |example|
+        ClimateControl.modify REDIS_NAMESPACE: 'testns' do
+          example.run
+        end
+      end
+
+      it 'uses the value for the namespace' do
+        expect(subject[:namespace]).to eq 'testns'
+      end
+    end
+  end
+
+  shared_examples 'secondary configuration' do |prefix|
+    context "when no `#{prefix}_REDIS_` environment variables are present" do
+      it 'uses the url from the base config' do
+        expect(subject[:url]).to eq 'redis://localhost:6379/0'
+      end
+    end
+
+    context "when the `#{prefix}_REDIS_URL` environment variable is present" do
+      around do |example|
+        ClimateControl.modify "#{prefix}_REDIS_URL": 'redis::/user@other.example.com/4' do
+          example.run
+        end
+      end
+
+      it 'uses the provided URL' do
+        expect(subject[:url]).to eq 'redis::/user@other.example.com/4'
+      end
+    end
+
+    context 'when giving separate environment variables' do
+      around do |example|
+        ClimateControl.modify "#{prefix}_REDIS_PASSWORD": 'testpass1', "#{prefix}_REDIS_HOST": 'redis2.example.com', "#{prefix}_REDIS_PORT": '3322', "#{prefix}_REDIS_DB": '8' do
+          example.run
+        end
+      end
+
+      it 'constructs the url from them' do
+        expect(subject[:url]).to eq 'redis://:testpass1@redis2.example.com:3322/8'
+      end
+    end
+  end
+
+  describe '#base' do
+    subject { redis_environment.base }
+
+    context 'when no `REDIS_` environment variables are present' do
+      it 'uses defaults' do
+        expect(subject).to eq({
+          url: 'redis://localhost:6379/0',
+          driver: :hiredis,
+          namespace: nil,
+        })
+      end
+    end
+
+    context 'when the `REDIS_URL` environment variable is present' do
+      around do |example|
+        ClimateControl.modify REDIS_URL: 'redis::/user@example.com/2' do
+          example.run
+        end
+      end
+
+      it 'uses the provided URL' do
+        expect(subject).to eq({
+          url: 'redis::/user@example.com/2',
+          driver: :hiredis,
+          namespace: nil,
+        })
+      end
+    end
+
+    context 'when giving separate environment variables' do
+      around do |example|
+        ClimateControl.modify REDIS_PASSWORD: 'testpass', REDIS_HOST: 'redis.example.com', REDIS_PORT: '3333', REDIS_DB: '3' do
+          example.run
+        end
+      end
+
+      it 'constructs the url from them' do
+        expect(subject).to eq({
+          url: 'redis://:testpass@redis.example.com:3333/3',
+          driver: :hiredis,
+          namespace: nil,
+        })
+      end
+    end
+
+    include_examples 'setting a different driver'
+    include_examples 'setting a namespace'
+  end
+
+  describe '#sidekiq' do
+    subject { redis_environment.sidekiq }
+
+    include_examples 'secondary configuration', 'SIDEKIQ'
+    include_examples 'setting a different driver'
+    include_examples 'setting a namespace'
+  end
+
+  describe '#cache' do
+    subject { redis_environment.cache }
+
+    it 'includes extra configuration' do
+      expect(subject).to eq({
+        url: 'redis://localhost:6379/0',
+        driver: :hiredis,
+        namespace: 'cache',
+        expires_in: 10.minutes,
+        connect_timeout: 5,
+        pool: {
+          size: 5,
+          timeout: 5,
+        },
+      })
+    end
+
+    context 'when `REDIS_NAMESPACE` is not set' do
+      it 'uses the `cache` namespace' do
+        expect(subject[:namespace]).to eq 'cache'
+      end
+    end
+
+    context 'when setting the `REDIS_NAMESPACE` variable' do
+      around do |example|
+        ClimateControl.modify REDIS_NAMESPACE: 'testns' do
+          example.run
+        end
+      end
+
+      it 'attaches the `_cache` postfix to the namespace' do
+        expect(subject[:namespace]).to eq 'testns_cache'
+      end
+    end
+
+    include_examples 'secondary configuration', 'CACHE'
+    include_examples 'setting a different driver'
+  end
+end
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 9af2d1e337e512..ba712c08f99e9a 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -176,5 +176,5 @@ def stub_reset_connection_pools
   # TODO: Is there a better way to correctly run specs without stubbing this?
   # (Avoids reset_connection_pools! in test env)
   allow(ActiveRecord::Base).to receive(:establish_connection)
-  allow(RedisConfiguration).to receive(:establish_pool)
+  allow(RedisConnection).to receive(:establish_pool)
 end
diff --git a/spec/services/resolve_account_service_spec.rb b/spec/services/resolve_account_service_spec.rb
index e0084a15791a1a..a856e019a7fe2f 100644
--- a/spec/services/resolve_account_service_spec.rb
+++ b/spec/services/resolve_account_service_spec.rb
@@ -228,7 +228,7 @@
       rescue ActiveRecord::RecordNotUnique
         fail_occurred = true
       ensure
-        RedisConfiguration.pool.checkin if Thread.current[:redis]
+        RedisConnection.pool.checkin if Thread.current[:redis]
       end
     end
 
diff --git a/spec/support/streaming_server_manager.rb b/spec/support/streaming_server_manager.rb
index 376d6b87251030..78cadcf6ad9d94 100644
--- a/spec/support/streaming_server_manager.rb
+++ b/spec/support/streaming_server_manager.rb
@@ -17,7 +17,7 @@ def start(port: 4020)
     @running_thread = Thread.new do
       Open3.popen2e(
         {
-          'REDIS_NAMESPACE' => ENV.fetch('REDIS_NAMESPACE'),
+          'REDIS_NAMESPACE' => REDIS_CONFIGURATION.base[:namespace],
           'DB_NAME' => "#{ENV.fetch('DB_NAME', 'mastodon')}_test#{ENV.fetch('TEST_ENV_NUMBER', '')}",
           'RAILS_ENV' => ENV.fetch('RAILS_ENV', 'test'),
           'NODE_ENV' => ENV.fetch('STREAMING_NODE_ENV', 'development'),

From 40f993b3a0cadfdc9765363e89fdd222bc4c5c4f Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 2 Sep 2024 10:25:21 -0400
Subject: [PATCH 2029/2191] Use built-in `response.parsed_body` for JSON
 response specs (#31674)

---
 spec/requests/api/v1/admin/domain_blocks_spec.rb            | 2 +-
 .../requests/api/v1/instances/translation_languages_spec.rb | 2 +-
 spec/requests/api/v1/lists_spec.rb                          | 4 ++--
 spec/requests/api/v1/notifications/requests_spec.rb         | 4 ++--
 spec/requests/api/v1/statuses/sources_spec.rb               | 4 ++--
 spec/requests/api/v1/statuses_spec.rb                       | 2 +-
 spec/requests/api/v2/filters_spec.rb                        | 2 +-
 spec/requests/api/v2_alpha/notifications_spec.rb            | 2 +-
 spec/spec_helper.rb                                         | 6 +-----
 spec/support/matchers/json/match_json_schema.rb             | 4 +++-
 10 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/spec/requests/api/v1/admin/domain_blocks_spec.rb b/spec/requests/api/v1/admin/domain_blocks_spec.rb
index 415281a932747d..3aa79d3ce55c12 100644
--- a/spec/requests/api/v1/admin/domain_blocks_spec.rb
+++ b/spec/requests/api/v1/admin/domain_blocks_spec.rb
@@ -94,7 +94,7 @@
       subject
 
       expect(response).to have_http_status(200)
-      expect(body_as_json).to eq(
+      expect(body_as_json).to match(
         {
           id: domain_block.id.to_s,
           domain: domain_block.domain,
diff --git a/spec/requests/api/v1/instances/translation_languages_spec.rb b/spec/requests/api/v1/instances/translation_languages_spec.rb
index 0b7dd8314d0e7b..7cfb24e86fbe34 100644
--- a/spec/requests/api/v1/instances/translation_languages_spec.rb
+++ b/spec/requests/api/v1/instances/translation_languages_spec.rb
@@ -26,7 +26,7 @@
           .to have_http_status(200)
 
         expect(body_as_json)
-          .to eq({ und: %w(en de), en: ['de'] })
+          .to match({ und: %w(en de), en: ['de'] })
       end
 
       private
diff --git a/spec/requests/api/v1/lists_spec.rb b/spec/requests/api/v1/lists_spec.rb
index 4635e936f59590..cf5ac28a56c4b8 100644
--- a/spec/requests/api/v1/lists_spec.rb
+++ b/spec/requests/api/v1/lists_spec.rb
@@ -60,7 +60,7 @@
       subject
 
       expect(response).to have_http_status(200)
-      expect(body_as_json).to eq({
+      expect(body_as_json).to match({
         id: list.id.to_s,
         title: list.title,
         replies_policy: list.replies_policy,
@@ -144,7 +144,7 @@
       expect(response).to have_http_status(200)
       list.reload
 
-      expect(body_as_json).to eq({
+      expect(body_as_json).to match({
         id: list.id.to_s,
         title: list.title,
         replies_policy: list.replies_policy,
diff --git a/spec/requests/api/v1/notifications/requests_spec.rb b/spec/requests/api/v1/notifications/requests_spec.rb
index c385fb34995f38..45bb71adb05e87 100644
--- a/spec/requests/api/v1/notifications/requests_spec.rb
+++ b/spec/requests/api/v1/notifications/requests_spec.rb
@@ -133,7 +133,7 @@
         subject
 
         expect(response).to have_http_status(200)
-        expect(body_as_json).to eq({ merged: true })
+        expect(body_as_json).to match({ merged: true })
       end
     end
 
@@ -146,7 +146,7 @@
         subject
 
         expect(response).to have_http_status(200)
-        expect(body_as_json).to eq({ merged: false })
+        expect(body_as_json).to match({ merged: false })
       end
     end
   end
diff --git a/spec/requests/api/v1/statuses/sources_spec.rb b/spec/requests/api/v1/statuses/sources_spec.rb
index 723b81905e9a62..c7b1603824b7d1 100644
--- a/spec/requests/api/v1/statuses/sources_spec.rb
+++ b/spec/requests/api/v1/statuses/sources_spec.rb
@@ -22,7 +22,7 @@
         subject
 
         expect(response).to have_http_status(200)
-        expect(body_as_json).to eq({
+        expect(body_as_json).to match({
           id: status.id.to_s,
           text: status.text,
           spoiler_text: status.spoiler_text,
@@ -51,7 +51,7 @@
         subject
 
         expect(response).to have_http_status(200)
-        expect(body_as_json).to eq({
+        expect(body_as_json).to match({
           id: status.id.to_s,
           text: status.text,
           spoiler_text: status.spoiler_text,
diff --git a/spec/requests/api/v1/statuses_spec.rb b/spec/requests/api/v1/statuses_spec.rb
index 2f99b35e74fa0d..3e91fcdd98ed7d 100644
--- a/spec/requests/api/v1/statuses_spec.rb
+++ b/spec/requests/api/v1/statuses_spec.rb
@@ -154,7 +154,7 @@
           subject
 
           expect(response).to have_http_status(422)
-          expect(body_as_json[:unexpected_accounts].map { |a| a.slice(:id, :acct) }).to eq [{ id: bob.id.to_s, acct: bob.acct }]
+          expect(body_as_json[:unexpected_accounts].map { |a| a.slice(:id, :acct) }).to match [{ id: bob.id.to_s, acct: bob.acct }]
         end
       end
 
diff --git a/spec/requests/api/v2/filters_spec.rb b/spec/requests/api/v2/filters_spec.rb
index fd0483abbe5409..8609e7dca173b2 100644
--- a/spec/requests/api/v2/filters_spec.rb
+++ b/spec/requests/api/v2/filters_spec.rb
@@ -63,7 +63,7 @@
         expect(json[:title]).to eq 'magic'
         expect(json[:filter_action]).to eq 'hide'
         expect(json[:context]).to eq ['home']
-        expect(json[:keywords].map { |keyword| keyword.slice(:keyword, :whole_word) }).to eq [{ keyword: 'magic', whole_word: true }]
+        expect(json[:keywords].map { |keyword| keyword.slice(:keyword, :whole_word) }).to match [{ keyword: 'magic', whole_word: true }]
       end
 
       it 'creates a filter', :aggregate_failures do
diff --git a/spec/requests/api/v2_alpha/notifications_spec.rb b/spec/requests/api/v2_alpha/notifications_spec.rb
index 9d9eb34ebd4712..7663d215ebf96f 100644
--- a/spec/requests/api/v2_alpha/notifications_spec.rb
+++ b/spec/requests/api/v2_alpha/notifications_spec.rb
@@ -235,7 +235,7 @@
 
         expect(response).to have_http_status(200)
         expect(body_as_json[:partial_accounts].size).to be > 0
-        expect(body_as_json[:partial_accounts][0].keys).to contain_exactly(:acct, :avatar, :avatar_static, :bot, :id, :locked, :url)
+        expect(body_as_json[:partial_accounts][0].keys.map(&:to_sym)).to contain_exactly(:acct, :avatar, :avatar_static, :bot, :id, :locked, :url)
         expect(body_as_json[:partial_accounts].pluck(:id)).to_not include(recent_account.id.to_s)
         expect(body_as_json[:accounts].pluck(:id)).to include(recent_account.id.to_s)
       end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 496ebfd09d2267..248c2c41050252 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -39,11 +39,7 @@
 end
 
 def body_as_json
-  json_str_to_hash(response.body)
-end
-
-def json_str_to_hash(str)
-  JSON.parse(str, symbolize_names: true)
+  response.parsed_body
 end
 
 def serialized_record_json(record, serializer, adapter: nil)
diff --git a/spec/support/matchers/json/match_json_schema.rb b/spec/support/matchers/json/match_json_schema.rb
index b4ced8addbdc84..05dc1ee5a0b95f 100644
--- a/spec/support/matchers/json/match_json_schema.rb
+++ b/spec/support/matchers/json/match_json_schema.rb
@@ -9,7 +9,9 @@
 
 RSpec::Matchers.define :match_json_values do |values|
   match do |string|
-    expect(json_str_to_hash(string))
+    parsed_json = JSON.parse(string, symbolize_names: true)
+
+    expect(parsed_json)
       .to include(values)
   end
 

From 491033c86cc9c29302bfe68cc94dabad82ded4cc Mon Sep 17 00:00:00 2001
From: Christian Schmidt <github@chsc.dk>
Date: Mon, 2 Sep 2024 17:30:48 +0200
Subject: [PATCH 2030/2191] Reject status creation with invalid `media_ids`
 parameter (#31681)

---
 app/services/post_status_service.rb       |  3 +++
 app/services/update_status_service.rb     |  3 +++
 config/locales/en.yml                     |  1 +
 spec/services/post_status_service_spec.rb | 15 +++++++++------
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/app/services/post_status_service.rb b/app/services/post_status_service.rb
index 8b18ce038d8d47..727f9dc56bab14 100644
--- a/app/services/post_status_service.rb
+++ b/app/services/post_status_service.rb
@@ -134,6 +134,9 @@ def validate_media!
 
     @media = @account.media_attachments.where(status_id: nil).where(id: @options[:media_ids].take(Status::MEDIA_ATTACHMENTS_LIMIT).map(&:to_i))
 
+    not_found_ids = @options[:media_ids] - @media.map(&:id)
+    raise Mastodon::ValidationError, I18n.t('media_attachments.validations.not_found', ids: not_found_ids.join(', ')) if not_found_ids.any?
+
     raise Mastodon::ValidationError, I18n.t('media_attachments.validations.images_and_video') if @media.size > 1 && @media.find(&:audio_or_video?)
     raise Mastodon::ValidationError, I18n.t('media_attachments.validations.not_ready') if @media.any?(&:not_processed?)
   end
diff --git a/app/services/update_status_service.rb b/app/services/update_status_service.rb
index dc7d177e2d1ef2..cd82a0b997c882 100644
--- a/app/services/update_status_service.rb
+++ b/app/services/update_status_service.rb
@@ -73,6 +73,9 @@ def validate_media!
 
     media_attachments = @status.account.media_attachments.where(status_id: [nil, @status.id]).where(scheduled_status_id: nil).where(id: @options[:media_ids].take(Status::MEDIA_ATTACHMENTS_LIMIT).map(&:to_i)).to_a
 
+    not_found_ids = @options[:media_ids] - media_attachments.map(&:id)
+    raise Mastodon::ValidationError, I18n.t('media_attachments.validations.not_found', ids: not_found_ids.join(', ')) if not_found_ids.any?
+
     raise Mastodon::ValidationError, I18n.t('media_attachments.validations.images_and_video') if media_attachments.size > 1 && media_attachments.find(&:audio_or_video?)
     raise Mastodon::ValidationError, I18n.t('media_attachments.validations.not_ready') if media_attachments.any?(&:not_processed?)
 
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 99dcb657f43606..267e04618b648f 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1454,6 +1454,7 @@ en:
   media_attachments:
     validations:
       images_and_video: Cannot attach a video to a post that already contains images
+      not_found: Media %{ids} not found or already attached to another post
       not_ready: Cannot attach files that have not finished processing. Try again in a moment!
       too_many: Cannot attach more than 4 files
   migrations:
diff --git a/spec/services/post_status_service_spec.rb b/spec/services/post_status_service_spec.rb
index f21548b5f2c1d5..5857263f61757f 100644
--- a/spec/services/post_status_service_spec.rb
+++ b/spec/services/post_status_service_spec.rb
@@ -229,13 +229,16 @@
     account = Fabricate(:account)
     media = Fabricate(:media_attachment, account: Fabricate(:account))
 
-    subject.call(
-      account,
-      text: 'test status update',
-      media_ids: [media.id]
+    expect do
+      subject.call(
+        account,
+        text: 'test status update',
+        media_ids: [media.id]
+      )
+    end.to raise_error(
+      Mastodon::ValidationError,
+      I18n.t('media_attachments.validations.not_found', ids: media.id)
     )
-
-    expect(media.reload.status).to be_nil
   end
 
   it 'does not allow attaching more files than configured limit' do

From c1795ee9639b56d14687416135c627bb99efbff2 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 2 Sep 2024 22:14:04 +0200
Subject: [PATCH 2031/2191] Fix not being able to load more notifications after
 trimming (#31652)

---
 .../mastodon/reducers/notification_groups.ts  | 25 ++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/reducers/notification_groups.ts b/app/javascript/mastodon/reducers/notification_groups.ts
index b3535d7b672017..f3c83ccd8d6e44 100644
--- a/app/javascript/mastodon/reducers/notification_groups.ts
+++ b/app/javascript/mastodon/reducers/notification_groups.ts
@@ -248,8 +248,9 @@ function processNewNotification(
 }
 
 function trimNotifications(state: NotificationGroupsState) {
-  if (state.scrolledToTop) {
+  if (state.scrolledToTop && state.groups.length > NOTIFICATIONS_TRIM_LIMIT) {
     state.groups.splice(NOTIFICATIONS_TRIM_LIMIT);
+    ensureTrailingGap(state.groups);
   }
 }
 
@@ -400,6 +401,28 @@ function ensureLeadingGap(
   }
 }
 
+// Ensure the groups list ends with a gap suitable for loading more, mutating it to append one if needed
+function ensureTrailingGap(
+  groups: NotificationGroupsState['groups'],
+): NotificationGap {
+  const groupOrGap = groups.at(-1);
+
+  if (groupOrGap?.type === 'gap') {
+    // We're expecting older notifications, so discard sinceId if it's set
+    groupOrGap.sinceId = undefined;
+
+    return groupOrGap;
+  } else {
+    const gap: NotificationGap = {
+      type: 'gap',
+      maxId: groupOrGap?.page_min_id,
+    };
+
+    groups.push(gap);
+    return gap;
+  }
+}
+
 export const notificationGroupsReducer = createReducer<NotificationGroupsState>(
   initialState,
   (builder) => {

From a5bbe83dfd456c72855f7e2b25eabe28d37ddb40 Mon Sep 17 00:00:00 2001
From: Christian Schmidt <github@chsc.dk>
Date: Mon, 2 Sep 2024 22:18:09 +0200
Subject: [PATCH 2032/2191] media_ids is an array of strings (#31709)

---
 app/services/post_status_service.rb         |  2 +-
 app/services/update_status_service.rb       |  2 +-
 spec/services/post_status_service_spec.rb   | 12 ++++++------
 spec/services/update_status_service_spec.rb |  4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/services/post_status_service.rb b/app/services/post_status_service.rb
index 727f9dc56bab14..98fd95f0258da4 100644
--- a/app/services/post_status_service.rb
+++ b/app/services/post_status_service.rb
@@ -134,7 +134,7 @@ def validate_media!
 
     @media = @account.media_attachments.where(status_id: nil).where(id: @options[:media_ids].take(Status::MEDIA_ATTACHMENTS_LIMIT).map(&:to_i))
 
-    not_found_ids = @options[:media_ids] - @media.map(&:id)
+    not_found_ids = @options[:media_ids].map(&:to_i) - @media.map(&:id)
     raise Mastodon::ValidationError, I18n.t('media_attachments.validations.not_found', ids: not_found_ids.join(', ')) if not_found_ids.any?
 
     raise Mastodon::ValidationError, I18n.t('media_attachments.validations.images_and_video') if @media.size > 1 && @media.find(&:audio_or_video?)
diff --git a/app/services/update_status_service.rb b/app/services/update_status_service.rb
index cd82a0b997c882..7837d37c959871 100644
--- a/app/services/update_status_service.rb
+++ b/app/services/update_status_service.rb
@@ -73,7 +73,7 @@ def validate_media!
 
     media_attachments = @status.account.media_attachments.where(status_id: [nil, @status.id]).where(scheduled_status_id: nil).where(id: @options[:media_ids].take(Status::MEDIA_ATTACHMENTS_LIMIT).map(&:to_i)).to_a
 
-    not_found_ids = @options[:media_ids] - media_attachments.map(&:id)
+    not_found_ids = @options[:media_ids].map(&:to_i) - media_attachments.map(&:id)
     raise Mastodon::ValidationError, I18n.t('media_attachments.validations.not_found', ids: not_found_ids.join(', ')) if not_found_ids.any?
 
     raise Mastodon::ValidationError, I18n.t('media_attachments.validations.images_and_video') if media_attachments.size > 1 && media_attachments.find(&:audio_or_video?)
diff --git a/spec/services/post_status_service_spec.rb b/spec/services/post_status_service_spec.rb
index 5857263f61757f..7e4478962807bf 100644
--- a/spec/services/post_status_service_spec.rb
+++ b/spec/services/post_status_service_spec.rb
@@ -34,7 +34,7 @@
 
     it 'schedules a status for future creation and does not create one immediately' do
       media = Fabricate(:media_attachment, account: account)
-      status = subject.call(account, text: 'Hi future!', media_ids: [media.id], scheduled_at: future)
+      status = subject.call(account, text: 'Hi future!', media_ids: [media.id.to_s], scheduled_at: future)
 
       expect(status)
         .to be_a(ScheduledStatus)
@@ -42,7 +42,7 @@
           scheduled_at: eq(future),
           params: include(
             'text' => eq('Hi future!'),
-            'media_ids' => contain_exactly(media.id)
+            'media_ids' => contain_exactly(media.id.to_s)
           )
         )
       expect(media.reload.status).to be_nil
@@ -219,7 +219,7 @@
     status = subject.call(
       account,
       text: 'test status update',
-      media_ids: [media.id]
+      media_ids: [media.id.to_s]
     )
 
     expect(media.reload.status).to eq status
@@ -233,7 +233,7 @@
       subject.call(
         account,
         text: 'test status update',
-        media_ids: [media.id]
+        media_ids: [media.id.to_s]
       )
     end.to raise_error(
       Mastodon::ValidationError,
@@ -249,7 +249,7 @@
       subject.call(
         account,
         text: 'test status update',
-        media_ids: Array.new(2) { Fabricate(:media_attachment, account: account) }.map(&:id)
+        media_ids: Array.new(2) { Fabricate(:media_attachment, account: account) }.map { |m| m.id.to_s }
       )
     end.to raise_error(
       Mastodon::ValidationError,
@@ -271,7 +271,7 @@
         media_ids: [
           video,
           image,
-        ].map(&:id)
+        ].map { |m| m.id.to_s }
       )
     end.to raise_error(
       Mastodon::ValidationError,
diff --git a/spec/services/update_status_service_spec.rb b/spec/services/update_status_service_spec.rb
index 47be53f4fc7add..de06fb13c63ad5 100644
--- a/spec/services/update_status_service_spec.rb
+++ b/spec/services/update_status_service_spec.rb
@@ -69,7 +69,7 @@
 
     before do
       status.media_attachments << detached_media_attachment
-      subject.call(status, status.account_id, text: 'Foo', media_ids: [attached_media_attachment.id])
+      subject.call(status, status.account_id, text: 'Foo', media_ids: [attached_media_attachment.id.to_s])
     end
 
     it 'updates media attachments' do
@@ -95,7 +95,7 @@
 
     before do
       status.media_attachments << media_attachment
-      subject.call(status, status.account_id, text: 'Foo', media_ids: [media_attachment.id], media_attributes: [{ id: media_attachment.id, description: 'New description' }])
+      subject.call(status, status.account_id, text: 'Foo', media_ids: [media_attachment.id.to_s], media_attributes: [{ id: media_attachment.id, description: 'New description' }])
     end
 
     it 'does not detach media attachment' do

From 5f7a3958482762d3907375e3813fb7b44d2b7629 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 3 Sep 2024 10:00:52 +0200
Subject: [PATCH 2033/2191] Update dependency rspec-rails to v7 (#31710)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile      |  2 +-
 Gemfile.lock | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Gemfile b/Gemfile
index 3fcde202ad5262..f2851c55c5924c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -210,7 +210,7 @@ group :development, :test do
   gem 'test-prof'
 
   # RSpec runner for rails
-  gem 'rspec-rails', '~> 6.0'
+  gem 'rspec-rails', '~> 7.0'
 end
 
 group :production do
diff --git a/Gemfile.lock b/Gemfile.lock
index 11e8aee83b45bb..7813a71eddcff7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -724,10 +724,10 @@ GEM
     rspec-mocks (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-rails (6.1.4)
-      actionpack (>= 6.1)
-      activesupport (>= 6.1)
-      railties (>= 6.1)
+    rspec-rails (7.0.0)
+      actionpack (>= 7.0)
+      activesupport (>= 7.0)
+      railties (>= 7.0)
       rspec-core (~> 3.13)
       rspec-expectations (~> 3.13)
       rspec-mocks (~> 3.13)
@@ -906,7 +906,7 @@ GEM
     xorcist (1.1.3)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.17)
+    zeitwerk (2.6.18)
 
 PLATFORMS
   ruby
@@ -1024,7 +1024,7 @@ DEPENDENCIES
   redis-namespace (~> 1.10)
   rqrcode (~> 2.2)
   rspec-github (~> 2.4)
-  rspec-rails (~> 6.0)
+  rspec-rails (~> 7.0)
   rspec-sidekiq (~> 5.0)
   rubocop
   rubocop-capybara

From 754baf00c01e0f682ec5fcdd024e46d6d48d1502 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 3 Sep 2024 10:01:12 +0200
Subject: [PATCH 2034/2191] Update dependency inline_svg to v1.10.0 (#31717)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 7813a71eddcff7..b6235402b074cd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -347,7 +347,7 @@ GEM
       rainbow (>= 2.2.2, < 4.0)
       terminal-table (>= 1.5.1)
     idn-ruby (0.1.5)
-    inline_svg (1.9.0)
+    inline_svg (1.10.0)
       activesupport (>= 3.0)
       nokogiri (>= 1.6)
     io-console (0.7.2)

From e5155c50fd1585ac32f7fcc2eb7201e0f67085fd Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 3 Sep 2024 08:02:08 +0000
Subject: [PATCH 2035/2191] New Crowdin Translations (automated) (#31716)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/fy.json | 89 +++++++++++++++++++++++++
 app/javascript/mastodon/locales/ia.json |  1 +
 config/locales/ca.yml                   |  1 +
 config/locales/da.yml                   |  1 +
 config/locales/de.yml                   |  1 +
 config/locales/doorkeeper.fy.yml        |  1 +
 config/locales/es-AR.yml                |  1 +
 config/locales/fi.yml                   |  1 +
 config/locales/fo.yml                   |  1 +
 config/locales/fy.yml                   | 85 +++++++++++++++++++++++
 config/locales/gl.yml                   |  1 +
 config/locales/ia.yml                   |  5 ++
 config/locales/it.yml                   |  1 +
 config/locales/ko.yml                   |  1 +
 config/locales/lt.yml                   |  1 +
 config/locales/nl.yml                   |  1 +
 config/locales/pl.yml                   |  1 +
 config/locales/simple_form.fy.yml       |  1 +
 config/locales/sq.yml                   |  1 +
 config/locales/uk.yml                   |  1 +
 config/locales/vi.yml                   |  1 +
 config/locales/zh-TW.yml                |  1 +
 22 files changed, 198 insertions(+)

diff --git a/app/javascript/mastodon/locales/fy.json b/app/javascript/mastodon/locales/fy.json
index 0a985a0310c058..bb409b63c19fc7 100644
--- a/app/javascript/mastodon/locales/fy.json
+++ b/app/javascript/mastodon/locales/fy.json
@@ -11,6 +11,7 @@
   "about.not_available": "Dizze ynformaasje is troch dizze server net iepenbier makke.",
   "about.powered_by": "Desintralisearre sosjale media, mooglik makke troch {mastodon}",
   "about.rules": "Serverrigels",
+  "account.account_note_header": "Persoanlike opmerking",
   "account.add_or_remove_from_list": "Tafoegje oan of fuortsmite út listen",
   "account.badges.bot": "Automatisearre",
   "account.badges.group": "Groep",
@@ -96,6 +97,8 @@
   "block_modal.title": "Brûker blokkearje?",
   "block_modal.you_wont_see_mentions": "Jo sjogge gjin berjochten mear dy’t dizze account fermelde.",
   "boost_modal.combo": "Jo kinne op {combo} drukke om dit de folgjende kear oer te slaan",
+  "boost_modal.reblog": "Berjocht booste?",
+  "boost_modal.undo_reblog": "Berjocht net langer booste?",
   "bundle_column_error.copy_stacktrace": "Flaterrapport kopiearje",
   "bundle_column_error.error.body": "De opfrege side koe net werjûn wurde. It kin wêze troch in flater yn ús koade, of in probleem mei browserkompatibiliteit.",
   "bundle_column_error.error.title": "Oh nee!",
@@ -169,21 +172,30 @@
   "confirmations.block.confirm": "Blokkearje",
   "confirmations.delete.confirm": "Fuortsmite",
   "confirmations.delete.message": "Binne jo wis dat jo dit berjocht fuortsmite wolle?",
+  "confirmations.delete.title": "Berjocht fuortsmite?",
   "confirmations.delete_list.confirm": "Fuortsmite",
   "confirmations.delete_list.message": "Binne jo wis dat jo dizze list foar permanint fuortsmite wolle?",
+  "confirmations.delete_list.title": "List fuortsmite?",
   "confirmations.discard_edit_media.confirm": "Fuortsmite",
   "confirmations.discard_edit_media.message": "Jo hawwe net-bewarre wizigingen yn de mediabeskriuwing of foarfertoaning, wolle jo dizze dochs fuortsmite?",
   "confirmations.edit.confirm": "Bewurkje",
   "confirmations.edit.message": "Troch no te bewurkjen sil it berjocht dat jo no oan it skriuwen binne oerskreaun wurde. Wolle jo trochgean?",
+  "confirmations.edit.title": "Berjocht oerskriuwe?",
   "confirmations.logout.confirm": "Ofmelde",
   "confirmations.logout.message": "Binne jo wis dat jo ôfmelde wolle?",
+  "confirmations.logout.title": "Ofmelde?",
   "confirmations.mute.confirm": "Negearje",
   "confirmations.redraft.confirm": "Fuortsmite en opnij opstelle",
   "confirmations.redraft.message": "Binne jo wis dat jo dit berjocht fuortsmite en opnij opstelle wolle? Favoriten en boosts geane dan ferlern en reaksjes op it oarspronklike berjocht reitsje jo kwyt.",
+  "confirmations.redraft.title": "Berjocht fuortsmite en opnij opstelle?",
   "confirmations.reply.confirm": "Reagearje",
   "confirmations.reply.message": "Troch no te reagearjen sil it berjocht dat jo no oan it skriuwen binne oerskreaun wurde. Wolle jo trochgean?",
+  "confirmations.reply.title": "Berjocht oerskriuwe?",
   "confirmations.unfollow.confirm": "Net mear folgje",
   "confirmations.unfollow.message": "Binne jo wis dat jo {name} net mear folgje wolle?",
+  "confirmations.unfollow.title": "Brûker net mear folgje?",
+  "content_warning.hide": "Berjocht ferstopje",
+  "content_warning.show": "Dochs toane",
   "conversation.delete": "Petear fuortsmite",
   "conversation.mark_as_read": "As lêzen markearje",
   "conversation.open": "Petear toane",
@@ -220,7 +232,9 @@
   "domain_pill.username": "Brûkersnamme",
   "domain_pill.whats_in_a_handle": "Wat is in fediverse-adres?",
   "domain_pill.who_they_are": "Omdat jo oan in fediverse-adres sjen kinne hoe’t ien hjit en op hokker server dy sit, kinne jo mei minsken op it troch <button>ActivityPub oandreaune</button> sosjale web (fediverse) kommunisearje.",
+  "domain_pill.who_you_are": "Omdat jo oan in fediverse-adres sjen kinne hoe’t jo hjitte en op hokker server jo sitte, kinne jo mei minsken op it troch <button>ActivityPub oandreaune</button> sosjale web (fediverse) kommunisearje.",
   "domain_pill.your_handle": "Jo fediverse-adres:",
+  "domain_pill.your_server": "Jo digitale thús, wer't al jo berjochten stean. Is dizze server dochs net nei jo winsk? Dan kinne jo op elk momint nei in oare server ferhúzje en ek jo folgers oerbringe.",
   "domain_pill.your_username": "Jo unike identifikaasje-adres op dizze server. It is mooglik dat der brûkers mei deselde brûkersnamme op ferskate servers te finen binne.",
   "embed.instructions": "Embed this status on your website by copying the code below.",
   "embed.preview": "Sa komt it der út te sjen:",
@@ -258,6 +272,7 @@
   "empty_column.list": "There is nothing in this list yet. When members of this list post new statuses, they will appear here.",
   "empty_column.lists": "Jo hawwe noch gjin inkelde list. Wannear’t jo der ien oanmakke hawwe, falt dat hjir te sjen.",
   "empty_column.mutes": "Jo hawwe noch gjin brûkers negearre.",
+  "empty_column.notification_requests": "Hielendal leech! Der is hjir neat. Wannear’t jo nije meldingen ûntfange, ferskine dizze hjir neffens jo ynstellingen.",
   "empty_column.notifications": "Jo hawwe noch gjin meldingen. Ynteraksjes mei oare minsken sjogge jo hjir.",
   "empty_column.public": "Der is hjir neat! Skriuw eat publyklik, of folgje sels brûkers fan oare servers om it hjir te foljen",
   "error.unexpected_crash.explanation": "Troch in bug in ús koade of in probleem mei de komptabiliteit fan jo browser, koe dizze side net toand wurde.",
@@ -288,6 +303,8 @@
   "filter_modal.select_filter.subtitle": "In besteande kategory brûke of in nije oanmeitsje",
   "filter_modal.select_filter.title": "Dit berjocht filterje",
   "filter_modal.title.status": "In berjocht filterje",
+  "filter_warning.matches_filter": "Komt oerien mei filter ‘{title}’",
+  "filtered_notifications_banner.pending_requests": "Fan {count, plural, =0 {net ien} one {ien persoan} other {# persoanen}} dy’t jo mooglik kinne",
   "filtered_notifications_banner.title": "Filtere meldingen",
   "firehose.all": "Alles",
   "firehose.local": "Dizze server",
@@ -336,6 +353,14 @@
   "hashtag.follow": "Hashtag folgje",
   "hashtag.unfollow": "Hashtag ûntfolgje",
   "hashtags.and_other": "…en {count, plural, one {}other {# mear}}",
+  "hints.profiles.followers_may_be_missing": "Folgers foar dit profyl kinne ûntbrekke.",
+  "hints.profiles.follows_may_be_missing": "De folgers foar dit profyl kinne ûntbrekke.",
+  "hints.profiles.posts_may_be_missing": "Der ûntbrekke mooglik berjochten fan dit profyl.",
+  "hints.profiles.see_more_followers": "Besjoch mear folgers op {domain}",
+  "hints.profiles.see_more_follows": "Besjoch mear folge accounts op {domain}",
+  "hints.profiles.see_more_posts": "Besjoch mear berjochten op {domain}",
+  "hints.threads.replies_may_be_missing": "Antwurden fan oare servers kinne ûntbrekke.",
+  "hints.threads.see_more": "Besjoch mear reaksjes op {domain}",
   "home.column_settings.show_reblogs": "Boosts toane",
   "home.column_settings.show_replies": "Reaksjes toane",
   "home.hide_announcements": "Meidielingen ferstopje",
@@ -343,6 +368,17 @@
   "home.pending_critical_update.link": "Fernijingen besjen",
   "home.pending_critical_update.title": "Kritike befeiligingsfernijing beskikber!",
   "home.show_announcements": "Meidielingen toane",
+  "ignore_notifications_modal.disclaimer": "Mastodon kin brûkers net ynformearje dat jo harren meldingen negearre hawwe. Meldingen negearje sil net foarkomme dat de berjochten sels ferstjoerd wurde.",
+  "ignore_notifications_modal.filter_instead": "Yn stee derfan filterje",
+  "ignore_notifications_modal.filter_to_act_users": "Jo binne noch hieltyd yn steat om folchfersiken goed- of ôf te karren en om brûkers te rapportearjen",
+  "ignore_notifications_modal.filter_to_avoid_confusion": "Filterjen foarkomt potinsjele betizing",
+  "ignore_notifications_modal.filter_to_review_separately": "Jo kinne filtere meldingen ôfsûnderlik beoardiele",
+  "ignore_notifications_modal.ignore": "Meldingen negearje",
+  "ignore_notifications_modal.limited_accounts_title": "Meldingen fan beheinde accounts negearje?",
+  "ignore_notifications_modal.new_accounts_title": "Meldingen fan nije accounts negearje?",
+  "ignore_notifications_modal.not_followers_title": "Meldingen negearje fan minsken dy’t jo net folgje?",
+  "ignore_notifications_modal.not_following_title": "Meldingen negearje fan minsken dy’t josels net folgje?",
+  "ignore_notifications_modal.private_mentions_title": "Meldingen negearje fan net frege priveeberjochten?",
   "interaction_modal.description.favourite": "Jo kinne mei in Mastodon-account dit berjocht as favoryt markearje, om dy brûker witte te litten dat jo it berjocht wurdearje en om it te bewarjen.",
   "interaction_modal.description.follow": "Jo kinne mei in Mastodon-account {name} folgje, om sa harren berjochten op jo starttiidline te ûntfangen.",
   "interaction_modal.description.reblog": "Jo kinne mei in Mastodon-account dit berjocht booste, om it sa mei jo folgers te dielen.",
@@ -433,6 +469,7 @@
   "mute_modal.you_wont_see_mentions": "Jo sjogge gjin berjochten mear dy’t dizze account fermelde.",
   "mute_modal.you_wont_see_posts": "De persoan kin jo berjochten noch hieltyd sjen, mar jo sjogge harren berjochten net mear.",
   "navigation_bar.about": "Oer",
+  "navigation_bar.administration": "Behear",
   "navigation_bar.advanced_interface": "Yn avansearre webomjouwing iepenje",
   "navigation_bar.blocks": "Blokkearre brûkers",
   "navigation_bar.bookmarks": "Blêdwizers",
@@ -449,6 +486,7 @@
   "navigation_bar.follows_and_followers": "Folgers en folgjenden",
   "navigation_bar.lists": "Listen",
   "navigation_bar.logout": "Ofmelde",
+  "navigation_bar.moderation": "Moderaasje",
   "navigation_bar.mutes": "Negearre brûkers",
   "navigation_bar.opened_in_classic_interface": "Berjochten, accounts en oare spesifike siden, wurde standert iepene yn de klassike webinterface.",
   "navigation_bar.personal": "Persoanlik",
@@ -464,9 +502,18 @@
   "notification.admin.report_statuses": "{name} rapportearre {target} foar {category}",
   "notification.admin.report_statuses_other": "{name} hat {target} rapportearre",
   "notification.admin.sign_up": "{name} hat harren registrearre",
+  "notification.admin.sign_up.name_and_others": "{name} en {count, plural, one {# oar} other {# oaren}} hawwe harren registrearre",
   "notification.favourite": "{name} hat jo berjocht as favoryt markearre",
+  "notification.favourite.name_and_others_with_link": "{name} en <a>{count, plural, one {# oar} other {# oaren}}</a> hawwe jo berjocht as favoryt markearre",
   "notification.follow": "{name} folget dy",
+  "notification.follow.name_and_others": "{name} en {count, plural, one {# oar} other {# oaren}} hawwe jo folge",
   "notification.follow_request": "{name} hat dy in folchfersyk stjoerd",
+  "notification.follow_request.name_and_others": "{name} en {count, plural, one {# oar} other {# oaren}} hawwe frege om jo te folgjen",
+  "notification.label.mention": "Fermelding",
+  "notification.label.private_mention": "Priveeberjocht",
+  "notification.label.private_reply": "Priveereaksje",
+  "notification.label.reply": "Beäntwurdzje",
+  "notification.mention": "Fermelding",
   "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.",
@@ -479,23 +526,44 @@
   "notification.own_poll": "Jo poll is beëinige",
   "notification.poll": "In enkête dêr’t jo oan meidien hawwe is beëinige",
   "notification.reblog": "{name} hat jo berjocht boost",
+  "notification.reblog.name_and_others_with_link": "{name} en <a>{count, plural, one {# oar} other {# oaren}}</a> hawwe jo berjocht boost",
   "notification.relationships_severance_event": "Ferlerne ferbiningen mei {name}",
   "notification.relationships_severance_event.account_suspension": "In behearder fan {from} hat {target} útsteld, wat betsjut dat jo gjin updates mear fan harren ûntfange kinne of mei harren kommunisearje kinne.",
   "notification.relationships_severance_event.domain_block": "In behearder fan {from} hat {target} blokkearre, ynklusyf {followersCount} fan jo folgers en {followingCount, plural, one {# account} other {# accounts}} dy’t jo folgje.",
   "notification.relationships_severance_event.learn_more": "Mear ynfo",
+  "notification.relationships_severance_event.user_domain_block": "Jo hawwe {target} blokkearre, wêrmei’t jo {followersCount} fan jo folgers en {followingCount, plural, one {# account} other {# accounts}} dy’t jo folgje ferlern binne.",
   "notification.status": "{name} hat in berjocht pleatst",
   "notification.update": "{name} hat in berjocht bewurke",
   "notification_requests.accept": "Akseptearje",
+  "notification_requests.accept_multiple": "{count, plural, one {# fersyk akseptearje…} other {# fersiken akseptearje…}}",
+  "notification_requests.confirm_accept_multiple.button": "{count, plural, one {Fersyk akseptearje} other {Fersiken akseptearje}}",
+  "notification_requests.confirm_accept_multiple.message": "Jo steane op it punt om {count, plural, one {ien meldingsfersyk} other {# meldingsfersiken}} te akseptearjen. Binne jo wis dat jo trochgean wolle?",
+  "notification_requests.confirm_accept_multiple.title": "Meldingsfersiken akseptearje?",
+  "notification_requests.confirm_dismiss_multiple.button": "{count, plural, one {Fersyk ôfwize} other {Fersiken ôfwize}}",
+  "notification_requests.confirm_dismiss_multiple.message": "Jo steane op it punt om {count, plural, one {ien meldingsfersyk} other {# meldingsfersiken}} ôf te wizen. Jo sille net yn steat wêze om {count, plural, one {hier} other {hier}} wer maklik tagong ta te krijen. Wolle jo trochgean?",
+  "notification_requests.confirm_dismiss_multiple.title": "Meldingsfersiken ôfwize?",
   "notification_requests.dismiss": "Ofwize",
+  "notification_requests.dismiss_multiple": "{count, plural, one {# fersyk ôfwize…} other {# fersiken ôfwize…}}",
+  "notification_requests.edit_selection": "Bewurkje",
+  "notification_requests.exit_selection": "Klear",
+  "notification_requests.explainer_for_limited_account": "Meldingen fan dizze account binne filtere, omdat dizze account troch in moderator beheind is.",
+  "notification_requests.explainer_for_limited_remote_account": "Meldingen fan dizze account binne filtere, omdat dizze account of harren server troch in moderator beheind is.",
+  "notification_requests.maximize": "Maksimalisearje",
+  "notification_requests.minimize_banner": "Banner mei filtere meldingen minimalisearje",
   "notification_requests.notifications_from": "Meldingen fan {name}",
   "notification_requests.title": "Filtere meldingen",
+  "notification_requests.view": "Meldingen besjen",
   "notifications.clear": "Meldingen wiskje",
   "notifications.clear_confirmation": "Binne jo wis dat jo al jo meldingen permanint fuortsmite wolle?",
+  "notifications.clear_title": "Meldingen fuortsmite?",
   "notifications.column_settings.admin.report": "Nije rapportaazjes:",
   "notifications.column_settings.admin.sign_up": "Nije registraasjes:",
   "notifications.column_settings.alert": "Desktopmeldingen",
+  "notifications.column_settings.beta.category": "Eksperimintele funksjes",
+  "notifications.column_settings.beta.grouping": "Notifikaasjes groepearje",
   "notifications.column_settings.favourite": "Favoriten:",
   "notifications.column_settings.filter_bar.advanced": "Alle kategoryen toane",
+  "notifications.column_settings.filter_bar.category": "Flugge filterbalke",
   "notifications.column_settings.follow": "Nije folgers:",
   "notifications.column_settings.follow_request": "Nij folchfersyk:",
   "notifications.column_settings.mention": "Fermeldingen:",
@@ -521,6 +589,23 @@
   "notifications.permission_denied": "Desktopmeldingen binne net beskikber, omdat in eardere browsertastimming wegere waard",
   "notifications.permission_denied_alert": "Desktopmeldingen kinne net ynskeakele wurde, omdat in eardere browsertastimming wegere waard",
   "notifications.permission_required": "Desktopmeldingen binne net beskikber, omdat de nedige tastimming net ferliend is.",
+  "notifications.policy.accept": "Akseptearje",
+  "notifications.policy.accept_hint": "Yn meldingen toane",
+  "notifications.policy.drop": "Negearje",
+  "notifications.policy.drop_hint": "Permanint fuortsmite",
+  "notifications.policy.filter": "Filter",
+  "notifications.policy.filter_hint": "Nei filtere ynboks foar meldingen ferstjoere",
+  "notifications.policy.filter_limited_accounts_hint": "Beheind troch servermoderatoren",
+  "notifications.policy.filter_limited_accounts_title": "Moderearre accounts",
+  "notifications.policy.filter_new_accounts.hint": "Yn de ôfrûne {days, plural, one {dei} other {# dagen}} registrearre",
+  "notifications.policy.filter_new_accounts_title": "Nije accounts",
+  "notifications.policy.filter_not_followers_hint": "Ynklusyf minsken dy’t jo koarter as {days, plural, one {dei} other {# dagen}} folgje",
+  "notifications.policy.filter_not_followers_title": "Minsken dy’t jo net folgje",
+  "notifications.policy.filter_not_following_hint": "Oant jo se hânmjittich goedkarre",
+  "notifications.policy.filter_not_following_title": "Minsken dy’t josels net folgje",
+  "notifications.policy.filter_private_mentions_hint": "Unsichtber útsein it in antwurd is op in priveeberjocht fan jo of wannear’t jo de ôfstjoerder folgje",
+  "notifications.policy.filter_private_mentions_title": "Net frege priveeberjochten",
+  "notifications.policy.title": "Meldingen beheare fan…",
   "notifications_permission_banner.enable": "Desktopmeldingen ynskeakelje",
   "notifications_permission_banner.how_to_control": "Om meldingen te ûntfangen wannear’t Mastodon net iepen stiet. Jo kinne krekt bepale hokker soarte fan ynteraksjes wol of gjin desktopmeldingen jouwe fia de boppesteande {icon} knop.",
   "notifications_permission_banner.title": "Mis neat",
@@ -647,6 +732,7 @@
   "report.unfollow_explanation": "Jo folgje dizze account. Om harren berjochten net mear op jo starttiidline te sjen, kinne jo dyjinge ûntfolgje.",
   "report_notification.attached_statuses": "{count, plural, one {{count} berjocht} other {{count} berjochten}} tafoege",
   "report_notification.categories.legal": "Juridysk",
+  "report_notification.categories.legal_sentence": "yllegale ynhâld",
   "report_notification.categories.other": "Oars",
   "report_notification.categories.other_sentence": "oars",
   "report_notification.categories.spam": "Spam",
@@ -680,8 +766,11 @@
   "server_banner.about_active_users": "Oantal brûkers yn de ôfrûne 30 dagen (MAU)",
   "server_banner.active_users": "warbere brûkers",
   "server_banner.administered_by": "Beheard troch:",
+  "server_banner.is_one_of_many": "{domain} is ien fan de protte ôfhinklike Mastodon-servers dy’t jo brûke kinne om diel te nimmen oan de fediverse.",
   "server_banner.server_stats": "Serverstatistiken:",
   "sign_in_banner.create_account": "Account registrearje",
+  "sign_in_banner.follow_anyone": "Folgje elkenien yn de fediverse en sjoch it allegearre yn gronologyske folchoarder. Gjin algoritmen, advertinsjes of clickbaits.",
+  "sign_in_banner.mastodon_is": "Mastodon is de beste manier om wat der bart by te hâlden.",
   "sign_in_banner.sign_in": "Oanmelde",
   "sign_in_banner.sso_redirect": "Oanmelde of Registrearje",
   "status.admin_account": "Moderaasje-omjouwing fan @{name} iepenje",
diff --git a/app/javascript/mastodon/locales/ia.json b/app/javascript/mastodon/locales/ia.json
index 9bf89ce7168455..f575c005d8dd19 100644
--- a/app/javascript/mastodon/locales/ia.json
+++ b/app/javascript/mastodon/locales/ia.json
@@ -98,6 +98,7 @@
   "block_modal.you_wont_see_mentions": "Tu non videra le messages que mentiona iste persona.",
   "boost_modal.combo": "Tu pote premer {combo} pro saltar isto le proxime vice",
   "boost_modal.reblog": "Impulsar le message?",
+  "boost_modal.undo_reblog": "Cessar de impulsar le message?",
   "bundle_column_error.copy_stacktrace": "Copiar reporto de error",
   "bundle_column_error.error.body": "Le pagina requestate non pote esser visualisate. Pote esser a causa de un defecto in nostre codice o de un problema de compatibilitate del navigator.",
   "bundle_column_error.error.title": "Oh, no!",
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index d8de84c283e04f..9a8f32117e98da 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -1412,6 +1412,7 @@ ca:
   media_attachments:
     validations:
       images_and_video: No es pot adjuntar un vídeo a una publicació que ja contingui imatges
+      not_found: No s'ha trobat el contingut multimèdia %{ids} o ja s'ha adjuntat a una altra publicació
       not_ready: No es poden adjuntar fitxers que no s'hagin acabat de processar. Torna-ho a provar en un moment!
       too_many: No es poden adjuntar més de 4 fitxers
   migrations:
diff --git a/config/locales/da.yml b/config/locales/da.yml
index 94f2369f8ed655..1366370eb06745 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -1454,6 +1454,7 @@ da:
   media_attachments:
     validations:
       images_and_video: En video kan ikke vedhæftes et indlæg med billedindhold
+      not_found: Mediet %{ids} ikke fundet eller allerede vedhæftet andet indlæg
       not_ready: Filer under behandling kan ikke vedhæftes. Forsøg igen senere!
       too_many: Maks. 4 filer kan vedhæftes
   migrations:
diff --git a/config/locales/de.yml b/config/locales/de.yml
index a852c736cf889b..e5e3f37a363906 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -1454,6 +1454,7 @@ de:
   media_attachments:
     validations:
       images_and_video: Es kann kein Video an einen Beitrag angehängt werden, der bereits Bilder enthält
+      not_found: Medien %{ids} nicht verfügbar oder bereits an einen anderen Beitrag angehängt
       not_ready: Dateien, die noch nicht verarbeitet wurden, können nicht angehängt werden. Versuche es gleich noch einmal!
       too_many: Mehr als vier Dateien können nicht angehängt werden
   migrations:
diff --git a/config/locales/doorkeeper.fy.yml b/config/locales/doorkeeper.fy.yml
index 1cf2d32212a8f1..f15389faf90b42 100644
--- a/config/locales/doorkeeper.fy.yml
+++ b/config/locales/doorkeeper.fy.yml
@@ -83,6 +83,7 @@ fy:
         access_denied: De boarne-eigener of autorisaasjeserver hat it fersyk wegere.
         credential_flow_not_configured: De wachtwurdgegevens-flow fan de boarne-eigener is mislearre, omdat Doorkeeper.configure.resource_owner_from_credentials net ynsteld is.
         invalid_client: Clientferifikaasje is mislearre troch in ûnbekende client, ûntbrekkende client-autentikaasje of in net stipe autentikaasjemetoade.
+        invalid_code_challenge_method: De koadechallengemetoade moat S256 wezen, plain wurdt net stipe.
         invalid_grant: De opjûne autorisaasje is ûnjildich, ferrûn, ynlutsen, komt net oerien mei de redirect-URI dy’t opjûn is of útjûn waard oan in oere client.
         invalid_redirect_uri: De opjûne redirect-URI is ûnjildich.
         invalid_request:
diff --git a/config/locales/es-AR.yml b/config/locales/es-AR.yml
index b0882e0a27ab47..ab0dcb58fa38ce 100644
--- a/config/locales/es-AR.yml
+++ b/config/locales/es-AR.yml
@@ -1454,6 +1454,7 @@ es-AR:
   media_attachments:
     validations:
       images_and_video: No se puede adjuntar un video a un mensaje que ya contenga imágenes
+      not_found: Medios %{ids} no encontrados o ya adjuntados a otro mensaje
       not_ready: No se pueden adjuntar archivos que no se han terminado de procesar. ¡Intentá de nuevo en un rato!
       too_many: No se pueden adjuntar más de 4 archivos
   migrations:
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 95190d88465fb6..42d1977662b89e 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -1454,6 +1454,7 @@ fi:
   media_attachments:
     validations:
       images_and_video: Videota ei voi liittää tilapäivitykseen, jossa on jo kuvia
+      not_found: Mediaa %{ids} ei löytynyt, tai se on jo liitetty toiseen julkaisuun
       not_ready: Ei voi liittää tiedostoja, joiden käsittely on kesken. Yritä hetken kuluttua uudelleen!
       too_many: Tiedostoja voi liittää enintään 4
   migrations:
diff --git a/config/locales/fo.yml b/config/locales/fo.yml
index b2309694b180dd..0c3620ad425460 100644
--- a/config/locales/fo.yml
+++ b/config/locales/fo.yml
@@ -1454,6 +1454,7 @@ fo:
   media_attachments:
     validations:
       images_and_video: Kann ikki viðfesta sjónfílu til ein post, sum longu inniheldur myndir
+      not_found: Miðilin %{ids} ikki funnin ella longu knýttur at øðrum posti
       not_ready: Kann ikki viðfesta fílur, sum ikki eru liðugt viðgjørdar. Roynd aftur um eina løtu!
       too_many: Kann ikki viðfest fleiri enn 4 fílur
   migrations:
diff --git a/config/locales/fy.yml b/config/locales/fy.yml
index 62889c0b28657c..d0127f77b17f22 100644
--- a/config/locales/fy.yml
+++ b/config/locales/fy.yml
@@ -31,6 +31,7 @@ fy:
       created_msg: Oanmeitsjen fan opmerking foar moderatoaren slagge!
       destroyed_msg: Fuortsmiten fan opmerking foar moderatoaren slagge!
     accounts:
+      add_email_domain_block: E-maildomein blokkearje
       approve: Goedkarre
       approved_msg: It goedkarren fan de account fan %{username} is slagge
       are_you_sure: Binne jo wis?
@@ -57,6 +58,7 @@ fy:
       demote: Degradearje
       destroyed_msg: It fuortsmiten fan de gegevens fan %{username} stiet no yn de wachtrige
       disable: Befrieze
+      disable_sign_in_token_auth: Ferifikaasje mei in tagongskoade fia e-mail útskeakelje
       disable_two_factor_authentication: 2FA útskeakelje
       disabled: Beferzen
       display_name: Werjeftenamme
@@ -65,6 +67,7 @@ fy:
       email: E-mailadres
       email_status: E-mailsteat
       enable: Untteie
+      enable_sign_in_token_auth: Ferifikaasje mei in tagongskoade fia e-mail ynskeakelje
       enabled: Ynskeakele
       enabled_msg: It ûntteie fan de account fan %{username} is slagge
       followers: Folgers
@@ -129,6 +132,7 @@ fy:
       resubscribe: Opnij abonnearje
       role: Rol
       search: Sykje
+      search_same_email_domain: Oare brûkers mei itselde e-maildomein
       search_same_ip: Oare brûkers mei itselde IP-adres
       security: Befeiliging
       security_measures:
@@ -169,21 +173,26 @@ fy:
         approve_appeal: Beswier goedkarre
         approve_user: Brûker goedkarre
         assigned_to_self_report: Rapportaazje tawize
+        change_email_user: E-mailadres fan brûker wizigje
         change_role_user: Brûkersrol wizigje
         confirm_user: Brûker befêstigje
         create_account_warning: Warskôging oanmeitsje
         create_announcement: Meidieling oanmeitsje
+        create_canonical_email_block: E-mailblokkade oanmeitsje
         create_custom_emoji: Lokale emoji oanmeitsje
         create_domain_allow: Domeingoedkarring oanmeitsje
         create_domain_block: Domeinblokkade oanmeitsje
+        create_email_domain_block: E-maildomeinblokkade oanmeitsje
         create_ip_block: IP-rigel oanmeitsje
         create_unavailable_domain: Net beskikber domein oanmeitsje
         create_user_role: Rol oanmeitsje
         demote_user: Brûker degradearje
         destroy_announcement: Meidieling fuortsmite
+        destroy_canonical_email_block: E-mailblokkade fuortsmite
         destroy_custom_emoji: Lokale emoji fuortsmite
         destroy_domain_allow: Domeingoedkarring fuortsmite
         destroy_domain_block: Domeinblokkade fuortsmite
+        destroy_email_domain_block: E-maildomeinblokkade fuortsmite
         destroy_instance: Domein folslein fuortsmite
         destroy_ip_block: IP-rigel fuortsmite
         destroy_status: Toot fuortsmite
@@ -191,8 +200,10 @@ fy:
         destroy_user_role: Rol permanint fuortsmite
         disable_2fa_user: Twa-stapsferifikaasje útskeakelje
         disable_custom_emoji: Lokale emoji útskeakelje
+        disable_sign_in_token_auth_user: Ferifikaasje mei in tagongskoade fia e-mail foar de brûker útskeakelje
         disable_user: Brûker útskeakelje
         enable_custom_emoji: Lokale emoji ynskeakelje
+        enable_sign_in_token_auth_user: Ferifikaasje mei in tagongskoade fia e-mail foar de brûker ynskeakelje
         enable_user: Brûker ynskeakelje
         memorialize_account: De account yn in Yn memoriam wizigje
         promote_user: Brûker promovearje
@@ -222,20 +233,26 @@ fy:
         approve_appeal_html: "%{name} hat it beswier tsjin de moderaasjemaatregel fan %{target} goedkard"
         approve_user_html: "%{name} hat de registraasje fan %{target} goedkard"
         assigned_to_self_report_html: "%{name} hat rapportaazje %{target} oan harrensels tawiisd"
+        change_email_user_html: "%{name} hat it e-mailadres fan brûker %{target} wizige"
         change_role_user_html: "%{name} hat de rol fan %{target} wizige"
+        confirm_user_html: E-mailadres fan brûker %{target} is troch %{name} befêstige
         create_account_warning_html: "%{name} hat in warskôging nei %{target} ferstjoerd"
         create_announcement_html: "%{name} hat de nije meidieling %{target} oanmakke"
+        create_canonical_email_block_html: "%{name} hat it e-mailberjocht mei de hash %{target} blokkearre"
         create_custom_emoji_html: Nije emoji %{target} is troch %{name} opladen
         create_domain_allow_html: "%{name} hat de federaasje mei it domein %{target} goedkard"
         create_domain_block_html: Domein %{target} is troch %{name} blokkearre
+        create_email_domain_block_html: "%{name} hat it e-maildomein %{target} blokkearre"
         create_ip_block_html: "%{name} hat de rigel foar IP %{target} oanmakke"
         create_unavailable_domain_html: "%{name} hat de besoarging foar domein %{target} beëinige"
         create_user_role_html: "%{name} hat de rol %{target} oanmakke"
         demote_user_html: Brûker %{target} is troch %{name} degradearre
         destroy_announcement_html: "%{name} hat de meidieling %{target} fuortsmiten"
+        destroy_canonical_email_block_html: "%{name} hat it e-mailberjocht mei de hash %{target} deblokkearre"
         destroy_custom_emoji_html: Emoji %{target} is troch %{name} fuortsmiten
         destroy_domain_allow_html: "%{name} hat de federaasje mei it domein %{target} ôfkard"
         destroy_domain_block_html: Domein %{target} is troch %{name} deblokkearre
+        destroy_email_domain_block_html: "%{name} hat it e-maildomein %{target} deblokkearre"
         destroy_instance_html: "%{name} hat it domein %{target} folslein fuortsmiten"
         destroy_ip_block_html: "%{name} hat de rigel foar IP %{target} fuortsmiten"
         destroy_status_html: Berjocht fan %{target} is troch %{name} fuortsmiten
@@ -243,8 +260,10 @@ fy:
         destroy_user_role_html: "%{name} hat de rol %{target} fuortsmiten"
         disable_2fa_user_html: De fereaske twa-stapsferifikaasje foar %{target} is troch %{name} útskeakele
         disable_custom_emoji_html: Emoji %{target} is troch %{name} útskeakele
+        disable_sign_in_token_auth_user_html: "%{name} hat ferifikaasje mei in tagongskoade fia e-mail útskeakele foar %{target}"
         disable_user_html: Oanmelden foar %{target} is troch %{name} útskeakele
         enable_custom_emoji_html: Emoji %{target} is troch %{name} ynskeakele
+        enable_sign_in_token_auth_user_html: "%{name} hat ferifikaasje mei in tagongskoade fia e-mail ynskeakele foar %{target}"
         enable_user_html: Oanmelden foar %{target} is troch %{name} ynskeakele
         memorialize_account_html: De account %{target} is troch %{name} yn in Yn memoriam wizige
         promote_user_html: Brûker %{target} is troch %{name} promovearre
@@ -252,6 +271,7 @@ fy:
         reject_user_html: "%{name} hat de registraasje fan %{target} ôfwêzen"
         remove_avatar_user_html: "%{name} hat de profylfoto fan %{target} fuortsmiten"
         reopen_report_html: "%{name} hat rapportaazje %{target} opnij iepene"
+        resend_user_html: "%{name} hat it befêstigings-e-mailberjocht foar %{target} opnij ferstjoerd"
         reset_password_user_html: Wachtwurd fan brûker %{target} is troch %{name} opnij ynsteld
         resolve_report_html: "%{name} hat rapportaazje %{target} oplost"
         sensitive_account_html: "%{name} markearre de media fan %{target} as gefoelich"
@@ -412,6 +432,7 @@ fy:
       attempts_over_week:
         one: "%{count} registraasjebesykjen yn de ôfrûne wike"
         other: "%{count} registraasjebesykjen yn de ôfrûne wike"
+      created_msg: E-maildomein blokkearjen slagge
       delete: Fuortsmite
       dns:
         types:
@@ -420,8 +441,12 @@ fy:
       new:
         create: Domein tafoegje
         resolve: Domein opsykje
+        title: Nije e-maildomein blokkearje
+      no_email_domain_block_selected: Der binne gjin e-maildomeinblokkaden wizige, omdat der gjin ien selektearre waard
       not_permitted: Net tastien
+      resolved_dns_records_hint_html: De domeinnamme slacht op de folgjende MX-domeinen dy’t úteinlik ferantwurdlik binne foar it akseptearjen fan e-mail. It blokkearjen fan in MX-domein blokkearret oanmeldingen fan elk e-mailadres dat itselde MX-domein brûkt, sels as de sichtbere domeinnamme oars is. <strong>Pas op dat jo gjin grutte e-mailproviders blokkearje.</strong>
       resolved_through_html: Blokkearre fia %{domain}
+      title: Blokkearre e-maildomeinen
     export_domain_allows:
       new:
         title: Tastiene domeinen ymportearje
@@ -575,6 +600,7 @@ fy:
         resolve_description_html: Der wurdt tsjin it rapportearre account gjin maatregel nommen, gjin oertrêding registrearre en de rapportaazje wurdt markearre as oplost.
         silence_description_html: De account sil allinnich sichtber wêze foar dyjinge dy’t it al folgje of it hânmjittich opsykje, wêrtroch it berik earnstich beheind wurdt. Kin altyd weromdraaid wurde. Dit slút alle rapportaazjes oer dizze account.
         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.
       add_to_report: Mear oan de rapportaazje tafoegje
       already_suspended_badges:
@@ -639,6 +665,7 @@ fy:
         delete_data_html: It profyl en de ynhâld fan <strong>@%{acct}</strong> wurde nei 30 dagen fan no ôf fuortsmiten, útsein as de account yn de tuskentiid net mear blokkearre wurdt
         preview_preamble_html: "<strong>@%{acct}</strong> sil in warskôging ûntfange mei de folgjende ynhâld:"
         record_strike_html: In ban tsjin <strong>@%{acct}</strong> ynstelle, om jo te helpen by takomstige skeiningen fan dizze acount te eskalearjen
+        send_email_html: Stjoer <strong>@%{acct}</strong> in warskôgings-e-mailberjocht
         warning_placeholder: Ekstra opsjonele reden foar de moderaasje-aksje.
       target_origin: Orizjineel fan rapportearre account
       title: Rapportaazjes
@@ -678,6 +705,7 @@ fy:
         manage_appeals: Beswieren beheare
         manage_appeals_description: Stiet brûkers ta om beswieren tsjin moderaasjemaatregelen te beoardielen
         manage_blocks: Blokkaden beheare
+        manage_blocks_description: Stiet brûkers ta om e-mailproviders en IP-adressen te blokkearjen
         manage_custom_emojis: Lokale emoji’s beheare
         manage_custom_emojis_description: Stiet brûkers ta om lokale emoji’s op de server te behearen
         manage_federation: Federaasje beheare
@@ -695,6 +723,7 @@ fy:
         manage_taxonomies: Trends en hashtags beheare
         manage_taxonomies_description: Stiet brûkers ta om trending ynhâld te besjen en om hashtagynstellingen by te wurkjen
         manage_user_access: Brûkerstagong beheare
+        manage_user_access_description: Stiet brûkers ta om twa-stapsferifikaasje fan oare brûkers út te skeakeljen, om harren e-mailadres te wizigjen en om harren wachtwurd opnij yn te stellen
         manage_users: Brûkers beheare
         manage_users_description: Stiet brûkers ta om brûkersdetails fan oaren te besjen en moderaasjemaatregelen tsjin harren te nimmen
         manage_webhooks: Webhooks beheare
@@ -769,6 +798,7 @@ fy:
       destroyed_msg: Fuortsmiten website-oplaad slagge!
     software_updates:
       critical_update: Krityk — fernij sa gau as mooglik
+      description: It wurdt oanrekommandearre om jo Mastodon-ynstallaasje by-de-tiid te hâlden om gebrûk meitsje te kinnen fan de nijste oplossingen en funksjes. Boppe dat is it somtiden krúsjaal om Mastodon tidich by te wurkjen om feiligheidsproblemen foar te kommen. Om dizze redenen kontrolearret Mastodon elke 30 minuten fernijingen en bringt jo hjirfan op de hichte neffens jo foarkarren foar e-mailmeldingen.
       documentation_link: Mear ynfo
       release_notes: Utjefte-opmerkingen
       title: Beskikbere fernijingen
@@ -855,16 +885,39 @@ fy:
         action: Klik hjir foar mear ynformaasje
         message_html: "<strong>Jo objektûnthâld is ferkeard konfigurearre. De privacy fan jo brûkers is yn gefaar.</strong>"
     tags:
+      moderation:
+        not_trendable: Net trendber
+        not_usable: Net brûkber
+        pending_review: Moat noch beoardiele wurde
+        review_requested: Beoardieling oanfrege
+        reviewed: Beoardiele
+        title: Status
+        trendable: Trendber
+        unreviewed: Net beoardiele
+        usable: Brûkber
+      name: Namme
+      newest: Nijste
+      oldest: Aldste
+      open: Yn it iepenbier besjen
+      reset: Opnij ynstelle
       review: Steat beoardiele
+      search: Sykje
+      title: Hashtags
       updated_msg: Hashtagynstellingen mei sukses bywurke
     title: Behear
     trends:
       allow: Tastean
       approved: Goedkarre
+      confirm_allow: Binne jo wis dat jo de selektearre hashtags tastean wolle?
+      confirm_disallow: Binne jo wis dat jo de selektearre hashtags ôfkarre wolle?
       disallow: Ofkarre
       links:
         allow: Keppeling goedkarre
         allow_provider: Auteur goedkarre
+        confirm_allow: Binne jo wis dat jo de selektearre keppelingen tastean wolle?
+        confirm_allow_provider: Binne jo wis dat jo de selektearre websites tastean wolle?
+        confirm_disallow: Binne jo wis dat jo de selektearre keppelingen ôfkarre wolle?
+        confirm_disallow_provider: Binne jo wis dat jo de selektearre providers ôfkarre wolle?
         description_html: Dit binne keppelingen dy’t op dit stuit in protte dield wurde troch accounts wêr’t jo server berjochten fan ûntfangt. Hjirtroch kinne jo brûkers sjen wat der yn de wrâld oan de hân is. Der wurde gjin keppelingen werjûn oant jo de website goedkard hawwe. Jo kinne ek yndividuele keppelingen goed- of ôfkarre.
         disallow: Keppeling ôfkarre
         disallow_provider: Website ôfkarre
@@ -888,6 +941,10 @@ fy:
       statuses:
         allow: Berjocht goedkarre
         allow_account: Account goedkarre
+        confirm_allow: Binne jo wis dat jo de selektearre statussen ofkarre wolle?
+        confirm_allow_account: Binne jo wis dat jo de selektearre accounts tastean wolle?
+        confirm_disallow: Binne jo wis dat jo de selektearre statussen ôfkarre wolle?
+        confirm_disallow_account: Binne jo wis dat jo de selektearre accounts ôfkarre wolle?
         description_html: Dit binne berjochten dy’t op jo server bekend binne en dy’t op dit stuit in protte dield wurde en as favoryt markearre wurde. Hjirmei kinne nije en weromkearende brûkers mear minsken fine om te folgjen. Der wurde gjin berjochten yn it iepenbier werjûn oant de account troch jo goedkard is en de brûker tastiet dat harren account oan oaren oanrekommandearre wurdt. Jo kinne ek yndividuele berjochten goed- of ôfkarre.
         disallow: Berjocht ôfkarre
         disallow_account: Account ôfkarre
@@ -920,6 +977,7 @@ fy:
         used_by_over_week:
           one: Dizze wike troch ien persoan brûkt
           other: Dizze wike troch %{count} persoanen brûkt
+      title: Oanrekommandaasjes & trends
       trending: Trending
     warning_presets:
       add_new: Nije tafoegje
@@ -1004,7 +1062,9 @@ fy:
       guide_link_text: Elkenien kin bydrage.
     sensitive_content: Gefoelige ynhâld
   application_mailer:
+    notification_preferences: E-mailynstellingen wizigje
     salutation: "%{name},"
+    settings: 'E-mailfoarkarren wizigje: %{link}'
     unsubscribe: Ofmelde
     view: 'Besjoch:'
     view_profile: Profyl besjen
@@ -1024,6 +1084,7 @@ fy:
       hint_html: Noch ien ding! Jo moatte befêstigje dat jo in minske binne (dit is om de spam bûten de doar te hâlden!). Los de ûndersteande CAPTCHA op en klik op ‘Trochgean’.
       title: Befeiligingskontrôle
     confirmations:
+      awaiting_review: Jo e-mailadres is befêstige! De %{domain}-meiwurkers binne no dwaande mei it besjen fan jo registraasje. Jo ûntfange in e-mailberjocht as de jo account goedkarre!
       awaiting_review_title: Jo registraasje wurdt beoardield
       clicking_this_link: klik op dizze keppeling
       login_link: oanmelde
@@ -1031,6 +1092,7 @@ fy:
       redirect_to_app_html: Jo soene omlaad wêze moatte nei de <strong>%{app_name}</strong> app. As dat net bard is, probearje dan %{clicking_this_link} of kear hânmjittich werom nei de app.
       registration_complete: Jo registraasje op %{domain} is no foltôge!
       welcome_title: Wolkom, %{name}!
+      wrong_email_hint: As it e-mailadres net korrekt is, kinne jo dat wizigje yn de accountynstellingen.
     delete_account: Account fuortsmite
     delete_account_html: Wannear’t jo jo account graach fuortsmite wolle, kinne jo dat <a href="%{path}">hjir dwaan</a>. Wy freegje jo dêr om in befêstiging.
     description:
@@ -1051,6 +1113,7 @@ fy:
     or_log_in_with: Of oanmelde mei
     privacy_policy_agreement_html: Ik haw it <a href="%{privacy_policy_path}" target="_blank">privacybelied</a> lêzen en gean dêrmei akkoard
     progress:
+      confirm: E-mailadres werhelje
       details: Jo gegevens
       review: Us beoardieling
       rules: Regels akseptearje
@@ -1072,8 +1135,10 @@ fy:
     security: Befeiliging
     set_new_password: Nij wachtwurd ynstelle
     setup:
+      email_below_hint_html: Kontrolearje jo map Net-winske, of freegje in nije befêstigingskeppeling oan. Jo kinne jo e-mailadres wizigje as it ferkeard is.
       email_settings_hint_html: Klik op de keppeling dy’t wy jo stjoerd hawwe om %{email} te ferifiearjen. Wy wachtsje wol even.
       link_not_received: Gjin keppeling krigen?
+      new_confirmation_instructions_sent: Jo ûntfange binnen inkelde minuten in nij e-mailberjocht mei de befêstigingskeppeling!
       title: Kontrolearje jo Postfek YN
     sign_in:
       preamble_html: Meld jo oan mei de oanmeldgegevens fan <strong>%{domain}</strong>. As jo account op in oare server stiet, kinne jo hjir net oanmelde.
@@ -1084,7 +1149,9 @@ fy:
       title: Litte wy jo account op %{domain} ynstelle.
     status:
       account_status: Accountsteat
+      confirming: Oan it wachtsjen oant it e-mailadres befêstige is.
       functional: Jo account kin folslein brûkt wurde.
+      pending: Jo oanfraach moat noch beoardiele wurde troch ien fan ús meiwurkers. Dit kin miskien efkes duorje. Jo ûntfangt in e-mailberjocht wannear’t jo oanfraach goedkard is.
       redirecting_to: Jo account is ynaktyf, omdat it op dit stuit trochferwezen wurdt nei %{acct}.
       self_destruct: Omdat %{domain} sluten sil, krije jo mar beheind tagong ta jo account.
       view_strikes: Besjoch de earder troch moderatoaren fêststelde skeiningen dy’t jo makke hawwe
@@ -1127,6 +1194,9 @@ fy:
       before: 'Lês dizze tekst soarchfâldich eardat jo troch gean:'
       caches: Berjochten en media dy’t op oare servers bewarre binne kinne dêr efterbliuwe
       data_removal: Jo berjochten en oare gegevens wurde permanint fuortmiten
+      email_change_html: Jo kinne <a href="%{path}">jo e-mailadres wizigje</a> sûnder dat jo jo account fuort hoege te smiten
+      email_contact_html: Wannear’t it noch hieltyd net oankomt, kinne jo foar help in e-mailberjocht stjoere nei <a href="mailto:%{email}">%{email}</a>
+      email_reconfirmation_html: Wannear’t jo it befêstigings-e-mailberjocht net ûntfongen hawwe, kinne jo dizze <a href="%{path}">opnij oanfreegje</a>
       irreversible: Jo sille net yn steat wêze om jo account te werstellen of te de-aktivearjen
       more_details_html: Sjoch it <a href="%{terms_path}">privacybelied</a> foar mear ynformaasje.
       username_available: Jo brûkersnamme sil wer beskikber komme
@@ -1359,6 +1429,7 @@ fy:
     authentication_methods:
       otp: twa-stapsferifikaasje-app
       password: wachtwurd
+      sign_in_token: befeiligingskoade fia e-mailberjocht
       webauthn: befeiligingskaaien
     description_html: Wannear’t jo aktiviteit sjogge dy’t jo net werkenne, tink dan nei om jo wachtwurd te wizigjen en twa-stapsferifikaasje yn te skeakeljen.
     empty: Gjin oanmeldskiednis beskikber
@@ -1369,6 +1440,16 @@ fy:
     unsubscribe:
       action: Ja, ôfmelde
       complete: Ofmelden
+      confirmation_html: Binne jo wis dat jo jo ôfmelde wolle foar it ûntfangen fan %{type} fan Mastodon op %{domain} op jo e-mailadres %{email}? Jo kinne jo altyd opnij abonnearje yn jo <a href="%{settings_path}">ynstellingen foar e-mailmeldingen</a>.
+      emails:
+        notification_emails:
+          favourite: e-mailmeldingen foar favoriten
+          follow: e-mailmeldingen foar nije folgers
+          follow_request: e-mailmeldingen foar folchfersiken
+          mention: e-mailmeldingen foar fermeldingen
+          reblog: e-mailmeldingen foar boosts
+      resubscribe_html: As jo jo mei fersin ôfmeld hawwe, kinne jo jo opnij abonnearje yn jo <a href="%{settings_path}">ynstellingen foar e-mailmeldingen</a>.
+      success_html: Jo ûntfange net langer %{type} fan Mastodon op %{domain} op jo e-mailadres %{email}.
       title: Ofmelde
   media_attachments:
     validations:
@@ -1449,6 +1530,8 @@ fy:
     update:
       subject: "%{name} hat in berjocht bewurke"
   notifications:
+    administration_emails: E-mailmeldingen behearder
+    email_events: E-mailmeldingen foar eveneminten
     email_events_hint: 'Selektearje eveneminten wêrfoar’t jo meldingen ûntfange wolle:'
   number:
     human:
@@ -1607,6 +1690,7 @@ fy:
     import: Ymportearje
     import_and_export: Ymportearje en eksportearje
     migrate: Accountmigraasje
+    notifications: E-mailmeldingen
     preferences: Ynstellingen
     profile: Profyl
     relationships: Folgers en folgjenden
@@ -1853,6 +1937,7 @@ fy:
     invalid_otp_token: Unjildige twa-stapstagongskoade
     otp_lost_help_html: As jo tagong ta beide kwytrekke binne, nim dan kontakt op fia %{email}
     rate_limited: Te folle autentikaasjebesykjen, probearje it letter opnij.
+    seamless_external_login: Jo binne oanmeld fia in eksterne tsjinst, dêrom binne wachtwurden en e-mailynstellingen net beskikber.
     signed_in_as: 'Oanmeld as:'
   verification:
     extra_instructions_html: <strong>Tip:</strong> De keppeling op jo website kin ûnsichtber wêze. It wichtige part is <code>rel="me"</code> dat ympersonaasje op websites mei user-generated ynhâld foarkomt. Jo kinne sels in <code>link</code>-label brûke yn de header fan de side yn stee fan <code>a</code>, mar de HTML moat ek sûnder JavaScript tagonklik wêze.
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 71df4c8d9318d3..b43ec5d17268a4 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -1454,6 +1454,7 @@ gl:
   media_attachments:
     validations:
       images_and_video: Non podes anexar un vídeo a unha publicación que xa contén imaxes
+      not_found: Non se atopou o multimedia %{ids} ou xa é adxunto noutra publicación
       not_ready: Non se poden anexar ficheiros que aínda se están a procesar. Agarda un intre!
       too_many: Non pode anexar máis de 4 ficheiros
   migrations:
diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index c282a17f92567a..5596aacf2dbb60 100644
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -661,6 +661,7 @@ ia:
         delete_data_html: Deler le profilo e contento de <strong>@%{acct}</strong> in 30 dies excepte si le suspension es disfacite intertanto
         preview_preamble_html: "<strong>@%{acct}</strong> recipera un advertimento con le sequente contento:"
         record_strike_html: Registra un sanction contra <strong>@%{acct}</strong> pro adjutar te a prender mesuras adequate in caso de futur violationes committite desde iste conto
+        send_email_html: Inviar un e-mail de advertimento a <strong>@%{acct}</strong>
         warning_placeholder: Motivation supplementari facultative pro le action de moderation.
       target_origin: Origine del conto reportate
       title: Reportos
@@ -700,6 +701,7 @@ ia:
         manage_appeals: Gerer appellos
         manage_appeals_description: Permitte que usatores revide appellos contra actiones de moderation
         manage_blocks: Gerer blocadas
+        manage_blocks_description: Permitter que usatores bloca le fornitores de e-mail e le adresses IP
         manage_custom_emojis: Gerer emojis personalisate
         manage_custom_emojis_description: Permitte que usatores gere emojis personalisate sur le servitor
         manage_federation: Gerer federation
@@ -717,6 +719,7 @@ ia:
         manage_taxonomies: Gerer taxonomias
         manage_taxonomies_description: Permitte que usatores revide contento in tendentias e actualisa le parametros de hashtag
         manage_user_access: Gerer le accesso de usatores
+        manage_user_access_description: Permitte que usatores disactiva le authentication bifactorial de altere usatores, cambia lor adresses de e-mail, e reinitialisa lor contrasigno
         manage_users: Gerer usatores
         manage_users_description: Permitte que usatores vide le detalios de altere usatores e exeque actiones de moderation contra illes
         manage_webhooks: Gerer Webhooks
@@ -791,6 +794,7 @@ ia:
       destroyed_msg: Le file incargate al sito ha essite delite!
     software_updates:
       critical_update: Critic – per favor, actualisa rapidemente
+      description: Il es recommendate mantener tu installation de Mastodon actualisate pro beneficiar del ultime reparationes e functiones. In ultra, de tempore a tempore, il es de importantia critic actualisar Mastodon in tempore utile pro evitar problemas de securitate. Pro iste rationes, Mastodon verifica le presentia de actualisationes cata 30 minutas, e te notificara secundo tu preferentias de notification in e-mail.
       documentation_link: Pro saper plus
       release_notes: Notas de version
       title: Actualisationes disponibile
@@ -878,6 +882,7 @@ ia:
         message_html: "<strong>Tu immagazinage de objectos es mal configurate. Le confidentialitate de tu usatores es in risco.</strong>"
     tags:
       moderation:
+        not_trendable: Non pro tendentia
         pending_review: Attende revision
         title: Stato
       name: Nomine
diff --git a/config/locales/it.yml b/config/locales/it.yml
index bc60b6ea507e82..54e122fd75d966 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -1456,6 +1456,7 @@ it:
   media_attachments:
     validations:
       images_and_video: Impossibile allegare video a un post che contiene già immagini
+      not_found: Media %{ids} non trovato o già collegato a un altro post
       not_ready: Impossibile allegare file per cui l'elaborazione non è finita. Riprova tra poco!
       too_many: Impossibile allegare più di 4 file
   migrations:
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index e919e183d4d66e..9632a3027bfbaa 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -1430,6 +1430,7 @@ ko:
   media_attachments:
     validations:
       images_and_video: 이미 사진이 첨부된 게시물엔 동영상을 첨부할 수 없습니다.
+      not_found: 미디어 %{ids}는 찾을 수 없거나 이미 다른 게시물에 첨부되었습니다
       not_ready: 처리가 끝나지 않은 파일은 첨부할 수 없습니다. 잠시 후에 다시 시도해 주세요!
       too_many: 최대 4개까지 첨부할 수 있습니다
   migrations:
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 6cc35d939dbccc..8c3b8e2e73bed3 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -941,6 +941,7 @@ lt:
   media_attachments:
     validations:
       images_and_video: Negalima pridėti video prie statuso, kuris jau turi nuotrauką
+      not_found: Medija %{ids} nerasta arba jau pridėta prie kito įrašo.
       too_many: Negalima pridėti daugiau nei 4 failų
   migrations:
     acct: Perkelta į
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index cdd71112e9c2c2..46ed411776a221 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -1454,6 +1454,7 @@ nl:
   media_attachments:
     validations:
       images_and_video: Een video kan niet aan een bericht met afbeeldingen worden gekoppeld
+      not_found: Media %{ids} niet gevonden of al toegevoegd aan een ander bericht
       not_ready: Kan geen bestanden toevoegen die nog niet zijn verwerkt. Probeer het later opnieuw!
       too_many: Er kunnen niet meer dan 4 afbeeldingen toegevoegd worden
   migrations:
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index d79df666e5c49b..95746bd10b926b 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -1506,6 +1506,7 @@ pl:
   media_attachments:
     validations:
       images_and_video: Nie możesz załączyć pliku wideo do wpisu, który zawiera już zdjęcia
+      not_found: Nie znaleziono mediów %{ids}, lub są już  dołączone do innego wpisu
       not_ready: Nie można załączyć plików których przetwarzanie nie zostało ukończone. Spróbuj ponownie za chwilę!
       too_many: Nie możesz załączyć więcej niż 4 plików
   migrations:
diff --git a/config/locales/simple_form.fy.yml b/config/locales/simple_form.fy.yml
index bde97237f6f393..e6c1b0ee82d544 100644
--- a/config/locales/simple_form.fy.yml
+++ b/config/locales/simple_form.fy.yml
@@ -314,6 +314,7 @@ fy:
         listable: Tastean dat dizze hashtag yn sykopdrachten en oanrekommandaasjes te sjen is
         name: Hashtag
         trendable: Goedkarre dat dizze hashtag ûnder trends te sjen is
+        usable: Berjochten tastean dizze hashtag lokaal te brûken
       user:
         role: Rol
         time_zone: Tiidsône
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index ffaa8e00b99280..b3d273024b0cd6 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -1446,6 +1446,7 @@ sq:
   media_attachments:
     validations:
       images_and_video: S’mund të bashkëngjitet video te një gjendje që përmban figura tashmë
+      not_found: S’u gjet media %{ids}, ose është bashkëngjitur tashmë një tjetër postimi
       not_ready: S’mund të bashkëngjiten kartela që s’kanë përfunduar së përpunuari. Riprovoni pas një çasti!
       too_many: S’mund të bashkëngjiten më shumë se 4 kartela
   migrations:
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index c24ed77aef5ec0..544e2671c62da6 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -1506,6 +1506,7 @@ uk:
   media_attachments:
     validations:
       images_and_video: Не можна додати відео до допису з зображеннями
+      not_found: Медіа %{ids} не знайдено або вже прикріплено до іншого допису
       not_ready: Не можна прикріпити файли, оброблення яких ще не закінчилося. Спробуйте ще раз через хвилину!
       too_many: Не можна додати більше 4 файлів
   migrations:
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 9b3d2a1d756c33..2f607d1ecbe088 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -1428,6 +1428,7 @@ vi:
   media_attachments:
     validations:
       images_and_video: Không thể đính kèm video vào tút đã chứa hình ảnh
+      not_found: Không tìm thấy %{ids} hoặc nó đã bị đính kèm với tút khác
       not_ready: Tập tin này vẫn chưa xử lý xong. Hãy thử lại sau!
       too_many: Không thể đính kèm hơn 4 tệp
   migrations:
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index f85646b5bc5ab9..97a4399b21ef9b 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -1430,6 +1430,7 @@ zh-TW:
   media_attachments:
     validations:
       images_and_video: 無法於已有圖片之嘟文中加入影片
+      not_found: 找不到多媒體 %{ids} 或已附加於另一嘟文中
       not_ready: 修但幾勒！不能附加未完成處理的檔案欸，咁按呢？
       too_many: 無法加入超過 4 個檔案
   migrations:

From 24a0b20408447d44dfb166e6da3aff4856b1827b Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 3 Sep 2024 04:03:08 -0400
Subject: [PATCH 2036/2191] Use `body_as_json` directly instead of via local
 var assignment (#31696)

---
 spec/requests/api/v1/accounts_spec.rb         | 18 +++++-----
 .../v1/admin/canonical_email_blocks_spec.rb   |  9 ++---
 .../api/v1/admin/domain_blocks_spec.rb        |  8 ++---
 spec/requests/api/v1/admin/ip_blocks_spec.rb  | 19 +++++-----
 spec/requests/api/v1/apps_spec.rb             | 32 +++++++++--------
 spec/requests/api/v1/blocks_spec.rb           | 12 +++----
 spec/requests/api/v1/featured_tags_spec.rb    | 23 ++++++------
 spec/requests/api/v1/markers_spec.rb          | 11 +++---
 spec/requests/api/v1/mutes_spec.rb            | 12 +++----
 spec/requests/api/v1/statuses/reblogs_spec.rb | 35 +++++++++++--------
 spec/requests/api/v1/suggestions_spec.rb      |  6 ++--
 spec/requests/api/v2/filters/keywords_spec.rb | 16 +++++----
 spec/requests/api/v2/filters/statuses_spec.rb | 12 ++++---
 spec/requests/api/v2/filters_spec.rb          | 15 ++++----
 spec/requests/well_known/webfinger_spec.rb    |  8 +++--
 15 files changed, 123 insertions(+), 113 deletions(-)

diff --git a/spec/requests/api/v1/accounts_spec.rb b/spec/requests/api/v1/accounts_spec.rb
index 3d9eb650194a2d..3432106a469f54 100644
--- a/spec/requests/api/v1/accounts_spec.rb
+++ b/spec/requests/api/v1/accounts_spec.rb
@@ -114,10 +114,11 @@
 
           expect(response).to have_http_status(200)
 
-          json = body_as_json
-
-          expect(json[:following]).to be true
-          expect(json[:requested]).to be false
+          expect(body_as_json)
+            .to include(
+              following: true,
+              requested: false
+            )
 
           expect(user.account.following?(other_account)).to be true
         end
@@ -133,10 +134,11 @@
 
           expect(response).to have_http_status(200)
 
-          json = body_as_json
-
-          expect(json[:following]).to be false
-          expect(json[:requested]).to be true
+          expect(body_as_json)
+            .to include(
+              following: false,
+              requested: true
+            )
 
           expect(user.account.requested?(other_account)).to be true
         end
diff --git a/spec/requests/api/v1/admin/canonical_email_blocks_spec.rb b/spec/requests/api/v1/admin/canonical_email_blocks_spec.rb
index 3f33b50f39ab1f..0cddf2c69e7725 100644
--- a/spec/requests/api/v1/admin/canonical_email_blocks_spec.rb
+++ b/spec/requests/api/v1/admin/canonical_email_blocks_spec.rb
@@ -96,10 +96,11 @@
         subject
 
         expect(response).to have_http_status(200)
-        json = body_as_json
-
-        expect(json[:id]).to eq(canonical_email_block.id.to_s)
-        expect(json[:canonical_email_hash]).to eq(canonical_email_block.canonical_email_hash)
+        expect(body_as_json)
+          .to include(
+            id: eq(canonical_email_block.id.to_s),
+            canonical_email_hash: eq(canonical_email_block.canonical_email_hash)
+          )
       end
     end
 
diff --git a/spec/requests/api/v1/admin/domain_blocks_spec.rb b/spec/requests/api/v1/admin/domain_blocks_spec.rb
index 3aa79d3ce55c12..7f7b9aa48af0e3 100644
--- a/spec/requests/api/v1/admin/domain_blocks_spec.rb
+++ b/spec/requests/api/v1/admin/domain_blocks_spec.rb
@@ -133,10 +133,8 @@
     it 'creates a domain block with the expected domain name and severity', :aggregate_failures do
       subject
 
-      body = body_as_json
-
       expect(response).to have_http_status(200)
-      expect(body).to match a_hash_including(
+      expect(body_as_json).to match a_hash_including(
         {
           domain: 'foo.bar.com',
           severity: 'silence',
@@ -156,10 +154,8 @@
       it 'creates a domain block with the expected domain name and severity', :aggregate_failures do
         subject
 
-        body = body_as_json
-
         expect(response).to have_http_status(200)
-        expect(body).to match a_hash_including(
+        expect(body_as_json).to match a_hash_including(
           {
             domain: 'foo.bar.com',
             severity: 'suspend',
diff --git a/spec/requests/api/v1/admin/ip_blocks_spec.rb b/spec/requests/api/v1/admin/ip_blocks_spec.rb
index 98b954dd49fb85..bd4015b2d99214 100644
--- a/spec/requests/api/v1/admin/ip_blocks_spec.rb
+++ b/spec/requests/api/v1/admin/ip_blocks_spec.rb
@@ -88,10 +88,12 @@
       subject
 
       expect(response).to have_http_status(200)
-      json = body_as_json
 
-      expect(json[:ip]).to eq("#{ip_block.ip}/#{ip_block.ip.prefix}")
-      expect(json[:severity]).to eq(ip_block.severity.to_s)
+      expect(body_as_json)
+        .to include(
+          ip: eq("#{ip_block.ip}/#{ip_block.ip.prefix}"),
+          severity: eq(ip_block.severity.to_s)
+        )
     end
 
     context 'when ip block does not exist' do
@@ -118,11 +120,12 @@
       subject
 
       expect(response).to have_http_status(200)
-      json = body_as_json
-
-      expect(json[:ip]).to eq("#{params[:ip]}/32")
-      expect(json[:severity]).to eq(params[:severity])
-      expect(json[:comment]).to eq(params[:comment])
+      expect(body_as_json)
+        .to include(
+          ip: eq("#{params[:ip]}/32"),
+          severity: eq(params[:severity]),
+          comment: eq(params[:comment])
+        )
     end
 
     context 'when the required ip param is not provided' do
diff --git a/spec/requests/api/v1/apps_spec.rb b/spec/requests/api/v1/apps_spec.rb
index 1f01bddf3caed2..81d6c6812602a3 100644
--- a/spec/requests/api/v1/apps_spec.rb
+++ b/spec/requests/api/v1/apps_spec.rb
@@ -61,9 +61,10 @@
         expect(response).to have_http_status(200)
         expect(Doorkeeper::Application.find_by(name: client_name)).to be_present
 
-        body = body_as_json
-
-        expect(body[:scopes]).to eq Doorkeeper.config.default_scopes.to_a
+        expect(body_as_json)
+          .to include(
+            scopes: Doorkeeper.config.default_scopes.to_a
+          )
       end
     end
 
@@ -81,9 +82,10 @@
         expect(app).to be_present
         expect(app.scopes.to_s).to eq 'read'
 
-        body = body_as_json
-
-        expect(body[:scopes]).to eq ['read']
+        expect(body_as_json)
+          .to include(
+            scopes: %w(read)
+          )
       end
     end
 
@@ -163,10 +165,11 @@
         expect(app.redirect_uri).to eq redirect_uris
         expect(app.redirect_uris).to eq redirect_uris.split
 
-        body = body_as_json
-
-        expect(body[:redirect_uri]).to eq redirect_uris
-        expect(body[:redirect_uris]).to eq redirect_uris.split
+        expect(body_as_json)
+          .to include(
+            redirect_uri: redirect_uris,
+            redirect_uris: redirect_uris.split
+          )
       end
     end
 
@@ -184,10 +187,11 @@
         expect(app.redirect_uri).to eq redirect_uris.join "\n"
         expect(app.redirect_uris).to eq redirect_uris
 
-        body = body_as_json
-
-        expect(body[:redirect_uri]).to eq redirect_uris.join "\n"
-        expect(body[:redirect_uris]).to eq redirect_uris
+        expect(body_as_json)
+          .to include(
+            redirect_uri: redirect_uris.join("\n"),
+            redirect_uris: redirect_uris
+          )
       end
     end
 
diff --git a/spec/requests/api/v1/blocks_spec.rb b/spec/requests/api/v1/blocks_spec.rb
index c6c2d56f364ca1..06d2c4d997ad0e 100644
--- a/spec/requests/api/v1/blocks_spec.rb
+++ b/spec/requests/api/v1/blocks_spec.rb
@@ -55,10 +55,8 @@
       it 'queries the blocks in range according to max_id', :aggregate_failures do
         subject
 
-        response_body = body_as_json
-
-        expect(response_body.size).to be 1
-        expect(response_body[0][:id]).to eq(blocks[0].target_account.id.to_s)
+        expect(body_as_json)
+          .to contain_exactly(include(id: blocks.first.target_account.id.to_s))
       end
     end
 
@@ -68,10 +66,8 @@
       it 'queries the blocks in range according to since_id', :aggregate_failures do
         subject
 
-        response_body = body_as_json
-
-        expect(response_body.size).to be 1
-        expect(response_body[0][:id]).to eq(blocks[2].target_account.id.to_s)
+        expect(body_as_json)
+          .to contain_exactly(include(id: blocks[2].target_account.id.to_s))
       end
     end
   end
diff --git a/spec/requests/api/v1/featured_tags_spec.rb b/spec/requests/api/v1/featured_tags_spec.rb
index 4b9698870411aa..81e99e015bd804 100644
--- a/spec/requests/api/v1/featured_tags_spec.rb
+++ b/spec/requests/api/v1/featured_tags_spec.rb
@@ -37,9 +37,7 @@
       it 'returns an empty body' do
         get '/api/v1/featured_tags', headers: headers
 
-        body = body_as_json
-
-        expect(body).to be_empty
+        expect(body_as_json).to be_empty
       end
     end
 
@@ -49,10 +47,10 @@
       it 'returns only the featured tags belonging to the requesting user' do
         get '/api/v1/featured_tags', headers: headers
 
-        body = body_as_json
-        expected_ids = user_featured_tags.pluck(:id).map(&:to_s)
-
-        expect(body.pluck(:id)).to match_array(expected_ids)
+        expect(body_as_json.pluck(:id))
+          .to match_array(
+            user_featured_tags.pluck(:id).map(&:to_s)
+          )
       end
     end
   end
@@ -69,9 +67,10 @@
     it 'returns the correct tag name' do
       post '/api/v1/featured_tags', headers: headers, params: params
 
-      body = body_as_json
-
-      expect(body[:name]).to eq(params[:name])
+      expect(body_as_json)
+        .to include(
+          name: params[:name]
+        )
     end
 
     it 'creates a new featured tag for the requesting user' do
@@ -142,9 +141,7 @@
     it 'returns an empty body' do
       delete "/api/v1/featured_tags/#{id}", headers: headers
 
-      body = body_as_json
-
-      expect(body).to be_empty
+      expect(body_as_json).to be_empty
     end
 
     it 'deletes the featured tag', :inline_jobs do
diff --git a/spec/requests/api/v1/markers_spec.rb b/spec/requests/api/v1/markers_spec.rb
index b04adf25943e28..2dbb9d205afb89 100644
--- a/spec/requests/api/v1/markers_spec.rb
+++ b/spec/requests/api/v1/markers_spec.rb
@@ -17,13 +17,12 @@
     end
 
     it 'returns markers', :aggregate_failures do
-      json = body_as_json
-
       expect(response).to have_http_status(200)
-      expect(json.key?(:home)).to be true
-      expect(json[:home][:last_read_id]).to eq '123'
-      expect(json.key?(:notifications)).to be true
-      expect(json[:notifications][:last_read_id]).to eq '456'
+      expect(body_as_json)
+        .to include(
+          home: include(last_read_id: '123'),
+          notifications: include(last_read_id: '456')
+        )
     end
   end
 
diff --git a/spec/requests/api/v1/mutes_spec.rb b/spec/requests/api/v1/mutes_spec.rb
index 019bf16584e11e..988bb3c3990354 100644
--- a/spec/requests/api/v1/mutes_spec.rb
+++ b/spec/requests/api/v1/mutes_spec.rb
@@ -58,10 +58,8 @@
       it 'queries mutes in range according to max_id', :aggregate_failures do
         subject
 
-        body = body_as_json
-
-        expect(body.size).to eq 1
-        expect(body[0][:id]).to eq mutes[0].target_account_id.to_s
+        expect(body_as_json)
+          .to contain_exactly(include(id: mutes.first.target_account_id.to_s))
       end
     end
 
@@ -71,10 +69,8 @@
       it 'queries mutes in range according to since_id', :aggregate_failures do
         subject
 
-        body = body_as_json
-
-        expect(body.size).to eq 1
-        expect(body[0][:id]).to eq mutes[1].target_account_id.to_s
+        expect(body_as_json)
+          .to contain_exactly(include(id: mutes[1].target_account_id.to_s))
       end
     end
 
diff --git a/spec/requests/api/v1/statuses/reblogs_spec.rb b/spec/requests/api/v1/statuses/reblogs_spec.rb
index 503d804ed01c0b..77542d294e3187 100644
--- a/spec/requests/api/v1/statuses/reblogs_spec.rb
+++ b/spec/requests/api/v1/statuses/reblogs_spec.rb
@@ -24,11 +24,14 @@
 
           expect(user.account.reblogged?(status)).to be true
 
-          hash_body = body_as_json
-
-          expect(hash_body[:reblog][:id]).to eq status.id.to_s
-          expect(hash_body[:reblog][:reblogs_count]).to eq 1
-          expect(hash_body[:reblog][:reblogged]).to be true
+          expect(body_as_json)
+            .to include(
+              reblog: include(
+                id: status.id.to_s,
+                reblogs_count: 1,
+                reblogged: true
+              )
+            )
         end
       end
 
@@ -57,11 +60,12 @@
 
           expect(user.account.reblogged?(status)).to be false
 
-          hash_body = body_as_json
-
-          expect(hash_body[:id]).to eq status.id.to_s
-          expect(hash_body[:reblogs_count]).to eq 0
-          expect(hash_body[:reblogged]).to be false
+          expect(body_as_json)
+            .to include(
+              id: status.id.to_s,
+              reblogs_count: 0,
+              reblogged: false
+            )
         end
       end
 
@@ -81,11 +85,12 @@
 
           expect(user.account.reblogged?(status)).to be false
 
-          hash_body = body_as_json
-
-          expect(hash_body[:id]).to eq status.id.to_s
-          expect(hash_body[:reblogs_count]).to eq 0
-          expect(hash_body[:reblogged]).to be false
+          expect(body_as_json)
+            .to include(
+              id: status.id.to_s,
+              reblogs_count: 0,
+              reblogged: false
+            )
         end
       end
 
diff --git a/spec/requests/api/v1/suggestions_spec.rb b/spec/requests/api/v1/suggestions_spec.rb
index dc89613fc52b22..b900c910df9dc6 100644
--- a/spec/requests/api/v1/suggestions_spec.rb
+++ b/spec/requests/api/v1/suggestions_spec.rb
@@ -32,10 +32,8 @@
     it 'returns accounts' do
       subject
 
-      body = body_as_json
-
-      expect(body.size).to eq 2
-      expect(body.pluck(:id)).to match_array([bob, jeff].map { |i| i.id.to_s })
+      expect(body_as_json)
+        .to contain_exactly(include(id: bob.id.to_s), include(id: jeff.id.to_s))
     end
 
     context 'with limit param' do
diff --git a/spec/requests/api/v2/filters/keywords_spec.rb b/spec/requests/api/v2/filters/keywords_spec.rb
index 55fb2afd955e70..69eff5a064d9ea 100644
--- a/spec/requests/api/v2/filters/keywords_spec.rb
+++ b/spec/requests/api/v2/filters/keywords_spec.rb
@@ -42,9 +42,11 @@
     it 'creates a filter', :aggregate_failures do
       expect(response).to have_http_status(200)
 
-      json = body_as_json
-      expect(json[:keyword]).to eq 'magic'
-      expect(json[:whole_word]).to be false
+      expect(body_as_json)
+        .to include(
+          keyword: 'magic',
+          whole_word: false
+        )
 
       filter = user.account.custom_filters.first
       expect(filter).to_not be_nil
@@ -71,9 +73,11 @@
     it 'responds with the keyword', :aggregate_failures do
       expect(response).to have_http_status(200)
 
-      json = body_as_json
-      expect(json[:keyword]).to eq 'foo'
-      expect(json[:whole_word]).to be false
+      expect(body_as_json)
+        .to include(
+          keyword: 'foo',
+          whole_word: false
+        )
     end
 
     context "when trying to access another user's filter keyword" do
diff --git a/spec/requests/api/v2/filters/statuses_spec.rb b/spec/requests/api/v2/filters/statuses_spec.rb
index 26d2fb00e13fe9..59693278291139 100644
--- a/spec/requests/api/v2/filters/statuses_spec.rb
+++ b/spec/requests/api/v2/filters/statuses_spec.rb
@@ -43,8 +43,10 @@
     it 'creates a filter', :aggregate_failures do
       expect(response).to have_http_status(200)
 
-      json = body_as_json
-      expect(json[:status_id]).to eq status.id.to_s
+      expect(body_as_json)
+        .to include(
+          status_id: status.id.to_s
+        )
 
       filter = user.account.custom_filters.first
       expect(filter).to_not be_nil
@@ -71,8 +73,10 @@
     it 'responds with the filter', :aggregate_failures do
       expect(response).to have_http_status(200)
 
-      json = body_as_json
-      expect(json[:status_id]).to eq status_filter.status_id.to_s
+      expect(body_as_json)
+        .to include(
+          status_id: status_filter.status.id.to_s
+        )
     end
 
     context "when trying to access another user's filter keyword" do
diff --git a/spec/requests/api/v2/filters_spec.rb b/spec/requests/api/v2/filters_spec.rb
index 8609e7dca173b2..036a6a65a90406 100644
--- a/spec/requests/api/v2/filters_spec.rb
+++ b/spec/requests/api/v2/filters_spec.rb
@@ -58,12 +58,15 @@
       it 'returns a filter with keywords', :aggregate_failures do
         subject
 
-        json = body_as_json
-
-        expect(json[:title]).to eq 'magic'
-        expect(json[:filter_action]).to eq 'hide'
-        expect(json[:context]).to eq ['home']
-        expect(json[:keywords].map { |keyword| keyword.slice(:keyword, :whole_word) }).to match [{ keyword: 'magic', whole_word: true }]
+        expect(body_as_json)
+          .to include(
+            title: 'magic',
+            filter_action: 'hide',
+            context: %w(home),
+            keywords: contain_exactly(
+              include(keyword: 'magic', whole_word: true)
+            )
+          )
       end
 
       it 'creates a filter', :aggregate_failures do
diff --git a/spec/requests/well_known/webfinger_spec.rb b/spec/requests/well_known/webfinger_spec.rb
index 0aafdf56244ec5..cd8a35c7023d05 100644
--- a/spec/requests/well_known/webfinger_spec.rb
+++ b/spec/requests/well_known/webfinger_spec.rb
@@ -129,9 +129,11 @@
     end
 
     it 'returns links for the internal account' do
-      json = body_as_json
-      expect(json[:subject]).to eq 'acct:mastodon.internal@cb6e6126.ngrok.io'
-      expect(json[:aliases]).to eq ['https://cb6e6126.ngrok.io/actor']
+      expect(body_as_json)
+        .to include(
+          subject: 'acct:mastodon.internal@cb6e6126.ngrok.io',
+          aliases: ['https://cb6e6126.ngrok.io/actor']
+        )
     end
   end
 

From 406b8211f554bfa68058632f849690395c18fe82 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 3 Sep 2024 04:03:25 -0400
Subject: [PATCH 2037/2191] Remove unused `Mention#active?` method (#31697)

---
 app/models/mention.rb | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app/models/mention.rb b/app/models/mention.rb
index af9bb7378bcf8f..a508ed630e2f2f 100644
--- a/app/models/mention.rb
+++ b/app/models/mention.rb
@@ -29,8 +29,4 @@ class Mention < ApplicationRecord
     to: :account,
     prefix: true
   )
-
-  def active?
-    !silent?
-  end
 end

From 48379e62e4a4aae0464b6eecba5ee60e528dcce1 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 3 Sep 2024 04:04:00 -0400
Subject: [PATCH 2038/2191] Remove unused `User#inactive_message` method
 (#31698)

---
 app/models/user.rb | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index f22b7ec684cc62..fcb0eced72e3b9 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -246,10 +246,6 @@ def unconfirmed_or_pending?
     unconfirmed? || pending?
   end
 
-  def inactive_message
-    approved? ? super : :pending
-  end
-
   def approve!
     return if approved?
 

From 25bbb01666222c5f6a277775b43e6151fc9c39f8 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 3 Sep 2024 04:04:22 -0400
Subject: [PATCH 2039/2191] Remove unused helper method in spec (#31699)

---
 spec/helpers/statuses_helper_spec.rb | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/spec/helpers/statuses_helper_spec.rb b/spec/helpers/statuses_helper_spec.rb
index ba6fe361d96685..b7531ec0b7a41a 100644
--- a/spec/helpers/statuses_helper_spec.rb
+++ b/spec/helpers/statuses_helper_spec.rb
@@ -23,12 +23,6 @@
     end
   end
 
-  def status_text_summary(status)
-    return if status.spoiler_text.blank?
-
-    I18n.t('statuses.content_warning', warning: status.spoiler_text)
-  end
-
   describe 'fa_visibility_icon' do
     context 'with a status that is public' do
       let(:status) { Status.new(visibility: 'public') }

From b8957241af9ffa0b3e4a9a6adaa043799621d421 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 3 Sep 2024 04:41:11 -0400
Subject: [PATCH 2040/2191] Add coverage for `JsonLdHelper#uri_from_bearcap`
 method (#31700)

---
 spec/helpers/json_ld_helper_spec.rb | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/spec/helpers/json_ld_helper_spec.rb b/spec/helpers/json_ld_helper_spec.rb
index 48550850274e01..f4b849d7a12b8c 100644
--- a/spec/helpers/json_ld_helper_spec.rb
+++ b/spec/helpers/json_ld_helper_spec.rb
@@ -21,6 +21,34 @@
     end
   end
 
+  describe '#uri_from_bearcap' do
+    subject { helper.uri_from_bearcap(string) }
+
+    context 'when a bear string has a u param' do
+      let(:string) { 'bear:?t=TOKEN&u=https://example.com/foo' }
+
+      it 'returns the value from the u query param' do
+        expect(subject).to eq('https://example.com/foo')
+      end
+    end
+
+    context 'when a bear string does not have a u param' do
+      let(:string) { 'bear:?t=TOKEN&h=https://example.com/foo' }
+
+      it 'returns nil' do
+        expect(subject).to be_nil
+      end
+    end
+
+    context 'when a non-bear string' do
+      let(:string) { 'http://example.com' }
+
+      it 'returns the string' do
+        expect(subject).to eq('http://example.com')
+      end
+    end
+  end
+
   describe '#first_of_value' do
     context 'when value.is_a?(Array)' do
       it 'returns value.first' do

From 3efe98aa9589cec628da0ef928f2e4cd7d16654c Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 3 Sep 2024 10:55:24 +0200
Subject: [PATCH 2041/2191] Update libretranslate/libretranslate Docker tag to
 v1.6.0 (#31687)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .devcontainer/compose.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.devcontainer/compose.yaml b/.devcontainer/compose.yaml
index 1e2e1ba7de2274..f87082013c6572 100644
--- a/.devcontainer/compose.yaml
+++ b/.devcontainer/compose.yaml
@@ -69,7 +69,7 @@ services:
         hard: -1
 
   libretranslate:
-    image: libretranslate/libretranslate:v1.5.7
+    image: libretranslate/libretranslate:v1.6.0
     restart: unless-stopped
     volumes:
       - lt-data:/home/libretranslate/.local

From 2a244e2fdb7cce8288ecf015fd2e370e2ddb0360 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 3 Sep 2024 04:59:37 -0400
Subject: [PATCH 2042/2191] Remove unused `merge_context` helper (#31703)

---
 app/helpers/jsonld_helper.rb | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/app/helpers/jsonld_helper.rb b/app/helpers/jsonld_helper.rb
index 932a3420db9d61..ba096427cfc9fb 100644
--- a/app/helpers/jsonld_helper.rb
+++ b/app/helpers/jsonld_helper.rb
@@ -200,14 +200,6 @@ def body_to_json(body, compare_id: nil)
     nil
   end
 
-  def merge_context(context, new_context)
-    if context.is_a?(Array)
-      context << new_context
-    else
-      [context, new_context]
-    end
-  end
-
   def response_successful?(response)
     (200...300).cover?(response.code)
   end

From 31c00108a447ff482dd7c9f47d9a8eaa3189d9b2 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 3 Sep 2024 05:05:26 -0400
Subject: [PATCH 2043/2191] Add first pass coverage for `AnnualReport` class
 (#31704)

---
 spec/lib/annual_report_spec.rb | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 spec/lib/annual_report_spec.rb

diff --git a/spec/lib/annual_report_spec.rb b/spec/lib/annual_report_spec.rb
new file mode 100644
index 00000000000000..ffb742697b3f09
--- /dev/null
+++ b/spec/lib/annual_report_spec.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe AnnualReport do
+  describe '#generate' do
+    subject { described_class.new(account, Time.zone.now.year) }
+
+    let(:account) { Fabricate :account }
+
+    it 'builds a report for an account' do
+      expect { subject.generate }
+        .to change(GeneratedAnnualReport, :count).by(1)
+    end
+  end
+end

From 4819fc72ee9941e40aea8a1e6d63dff5f479efda Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 3 Sep 2024 05:13:54 -0400
Subject: [PATCH 2044/2191] Remove `config/secrets.yml` file (#31562)

---
 config/secrets.yml | 22 ----------------------
 1 file changed, 22 deletions(-)
 delete mode 100644 config/secrets.yml

diff --git a/config/secrets.yml b/config/secrets.yml
deleted file mode 100644
index 51681d7a5c8135..00000000000000
--- a/config/secrets.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-# Be sure to restart your server when you modify this file.
-
-# Your secret key is used for verifying the integrity of signed cookies.
-# If you change this key, all old signed cookies will become invalid!
-
-# Make sure the secret is at least 30 characters and all random,
-# no regular words or you'll be exposed to dictionary attacks.
-# You can use `rails secret` to generate a secure secret key.
-
-# Make sure the secrets in this file are kept private
-# if you're sharing your code publicly.
-
-development:
-  secret_key_base: d4398e4af52f1fc5be5c3c8764e9ecce7beac5462826cb8b649373b2aad5a0f133598ed817c4e9931e943041460d6b6eda40a854e825e1bbd510c4594b1538f2
-
-test:
-  secret_key_base: 5be187ddbd651211a906f9aa399f4a148edf6e06b971c7c0b5429b9483df6e21d262cc846447d0f89b89c32d56a99e151039df5dd874ede7f712afbe041a9269
-
-# Do not keep production secrets in the repository,
-# instead read values from the environment.
-production:
-  secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>

From 611533cd12059d365ca0267342b750e615637bd4 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 3 Sep 2024 09:53:44 +0000
Subject: [PATCH 2045/2191] Update dependency json-schema to v5 (#31499)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile      | 2 +-
 Gemfile.lock | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index f2851c55c5924c..af05ec84026188 100644
--- a/Gemfile
+++ b/Gemfile
@@ -149,7 +149,7 @@ group :test do
   gem 'rails-controller-testing', '~> 1.0'
 
   # Validate schemas in specs
-  gem 'json-schema', '~> 4.0'
+  gem 'json-schema', '~> 5.0'
 
   # Test harness fo rack components
   gem 'rack-test', '~> 2.1'
diff --git a/Gemfile.lock b/Gemfile.lock
index b6235402b074cd..6d13efdb663ad8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -373,8 +373,8 @@ GEM
     json-ld-preloaded (3.3.0)
       json-ld (~> 3.3)
       rdf (~> 3.3)
-    json-schema (4.3.1)
-      addressable (>= 2.8)
+    json-schema (5.0.0)
+      addressable (~> 2.8)
     jsonapi-renderer (0.2.2)
     jwt (2.7.1)
     kaminari (1.2.2)
@@ -965,7 +965,7 @@ DEPENDENCIES
   irb (~> 1.8)
   json-ld
   json-ld-preloaded (~> 3.2)
-  json-schema (~> 4.0)
+  json-schema (~> 5.0)
   kaminari (~> 1.2)
   kt-paperclip (~> 7.2)
   letter_opener (~> 1.8)

From e9adba60af868fedc17c7303aa5ef21e7d22a778 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 2 Sep 2024 22:14:04 +0200
Subject: [PATCH 2046/2191] [Glitch] Fix not being able to load more
 notifications after trimming

Port c1795ee9639b56d14687416135c627bb99efbff2 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../glitch/reducers/notification_groups.ts    | 25 ++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/app/javascript/flavours/glitch/reducers/notification_groups.ts b/app/javascript/flavours/glitch/reducers/notification_groups.ts
index 0fabf21b536cc4..30f7b58737124c 100644
--- a/app/javascript/flavours/glitch/reducers/notification_groups.ts
+++ b/app/javascript/flavours/glitch/reducers/notification_groups.ts
@@ -248,8 +248,9 @@ function processNewNotification(
 }
 
 function trimNotifications(state: NotificationGroupsState) {
-  if (state.scrolledToTop) {
+  if (state.scrolledToTop && state.groups.length > NOTIFICATIONS_TRIM_LIMIT) {
     state.groups.splice(NOTIFICATIONS_TRIM_LIMIT);
+    ensureTrailingGap(state.groups);
   }
 }
 
@@ -400,6 +401,28 @@ function ensureLeadingGap(
   }
 }
 
+// Ensure the groups list ends with a gap suitable for loading more, mutating it to append one if needed
+function ensureTrailingGap(
+  groups: NotificationGroupsState['groups'],
+): NotificationGap {
+  const groupOrGap = groups.at(-1);
+
+  if (groupOrGap?.type === 'gap') {
+    // We're expecting older notifications, so discard sinceId if it's set
+    groupOrGap.sinceId = undefined;
+
+    return groupOrGap;
+  } else {
+    const gap: NotificationGap = {
+      type: 'gap',
+      maxId: groupOrGap?.page_min_id,
+    };
+
+    groups.push(gap);
+    return gap;
+  }
+}
+
 export const notificationGroupsReducer = createReducer<NotificationGroupsState>(
   initialState,
   (builder) => {

From 0437dd9e770c293ec4f16d0513d1d5dd65209406 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 3 Sep 2024 13:37:09 +0200
Subject: [PATCH 2047/2191] Fix radio buttons styling in web UI (#31723)

---
 app/javascript/styles/mastodon/components.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 208cdd6768c3f4..c1e5075702dc1c 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -7580,7 +7580,7 @@ a.status-card {
   }
 }
 
-.radio-button.checked::before {
+.radio-button__input.checked::before {
   position: absolute;
   left: 2px;
   top: 2px;

From 219458d7d4c9bb9ee0ed3c89c72438ee4edc2e1c Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 3 Sep 2024 09:18:53 -0400
Subject: [PATCH 2048/2191] Convert `tags` controller spec to system and
 request specs (#31708)

---
 spec/controllers/tags_controller_spec.rb | 45 ------------------
 spec/requests/tags_spec.rb               | 59 ++++++++++++++++++++++++
 spec/system/tags_spec.rb                 | 16 +++++++
 3 files changed, 75 insertions(+), 45 deletions(-)
 delete mode 100644 spec/controllers/tags_controller_spec.rb
 create mode 100644 spec/requests/tags_spec.rb
 create mode 100644 spec/system/tags_spec.rb

diff --git a/spec/controllers/tags_controller_spec.rb b/spec/controllers/tags_controller_spec.rb
deleted file mode 100644
index 2bb0c8de3b05d9..00000000000000
--- a/spec/controllers/tags_controller_spec.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-RSpec.describe TagsController do
-  render_views
-
-  describe 'GET #show' do
-    let(:format) { 'html' }
-    let(:tag) { Fabricate(:tag, name: 'test') }
-    let(:tag_name) { tag&.name }
-
-    before do
-      get :show, params: { id: tag_name, format: format }
-    end
-
-    context 'when tag exists' do
-      context 'when requested as HTML' do
-        it 'returns http success' do
-          expect(response).to have_http_status(200)
-        end
-
-        it_behaves_like 'cacheable response', expects_vary: 'Accept, Accept-Language, Cookie'
-      end
-
-      context 'when requested as JSON' do
-        let(:format) { 'json' }
-
-        it 'returns http success' do
-          expect(response).to have_http_status(200)
-        end
-
-        it_behaves_like 'cacheable response', expects_vary: 'Accept, Accept-Language, Cookie'
-      end
-    end
-
-    context 'when tag does not exist' do
-      let(:tag_name) { 'hoge' }
-
-      it 'returns http not found' do
-        expect(response).to have_http_status(404)
-      end
-    end
-  end
-end
diff --git a/spec/requests/tags_spec.rb b/spec/requests/tags_spec.rb
new file mode 100644
index 00000000000000..c037bbef5ade8e
--- /dev/null
+++ b/spec/requests/tags_spec.rb
@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Tags' do
+  describe 'GET /tags/:id' do
+    context 'when tag exists' do
+      let(:tag) { Fabricate :tag }
+
+      context 'with HTML format' do
+        # TODO: Convert the cacheable response shared example into a matcher,
+        # remove this example, rely on system spec (which should use matcher)
+        before { get tag_path(tag) }
+
+        it 'returns http success' do
+          expect(response)
+            .to have_http_status(200)
+        end
+
+        it_behaves_like 'cacheable response', expects_vary: 'Accept, Accept-Language, Cookie'
+      end
+
+      context 'with JSON format' do
+        before { get tag_path(tag, format: :json) }
+
+        it 'returns http success' do
+          expect(response)
+            .to have_http_status(200)
+          expect(response.content_type)
+            .to start_with('application/activity+json')
+        end
+
+        it_behaves_like 'cacheable response', expects_vary: 'Accept, Accept-Language, Cookie'
+      end
+
+      context 'with RSS format' do
+        before { get tag_path(tag, format: :rss) }
+
+        it 'returns http success' do
+          expect(response)
+            .to have_http_status(200)
+          expect(response.content_type)
+            .to start_with('application/rss+xml')
+        end
+
+        it_behaves_like 'cacheable response', expects_vary: 'Accept, Accept-Language, Cookie'
+      end
+    end
+
+    context 'when tag does not exist' do
+      before { get tag_path('missing') }
+
+      it 'returns http not found' do
+        expect(response)
+          .to have_http_status(404)
+      end
+    end
+  end
+end
diff --git a/spec/system/tags_spec.rb b/spec/system/tags_spec.rb
new file mode 100644
index 00000000000000..e9ad970a5435fb
--- /dev/null
+++ b/spec/system/tags_spec.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Tags' do
+  describe 'Viewing a tag' do
+    let(:tag) { Fabricate(:tag, name: 'test') }
+
+    it 'visits the tag page and renders the web app' do
+      visit tag_path(tag)
+
+      expect(page)
+        .to have_css('noscript', text: /Mastodon/)
+    end
+  end
+end

From c9641c8070c07caa2da1e2875367a6bad8f0ecca Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 3 Sep 2024 09:19:48 -0400
Subject: [PATCH 2049/2191] Remove un-needed edge case sort condition in
 languages helper (#31724)

---
 app/helpers/languages_helper.rb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/helpers/languages_helper.rb b/app/helpers/languages_helper.rb
index 9e1c0a7db1d416..b6c09b7314722e 100644
--- a/app/helpers/languages_helper.rb
+++ b/app/helpers/languages_helper.rb
@@ -238,9 +238,7 @@ module LanguagesHelper
 
   # Helper for self.sorted_locale_keys
   private_class_method def self.locale_name_for_sorting(locale)
-    if locale.blank? || locale == 'und'
-      '000'
-    elsif (supported_locale = SUPPORTED_LOCALES[locale.to_sym])
+    if (supported_locale = SUPPORTED_LOCALES[locale.to_sym])
       ASCIIFolding.new.fold(supported_locale[1]).downcase
     elsif (regional_locale = REGIONAL_LOCALE_NAMES[locale.to_sym])
       ASCIIFolding.new.fold(regional_locale).downcase

From ea0d691e196753b1a5b6747b014bac5b7da50e97 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 3 Sep 2024 16:32:26 +0200
Subject: [PATCH 2050/2191] Add `GET
 /api/v2_alpha/notifications/:group_key/accounts` (#31725)

---
 .../notifications/accounts_controller.rb      | 50 ++++++++++++
 .../api/v2_alpha/notifications_controller.rb  |  4 +-
 config/routes/api.rb                          |  4 +-
 .../v2_alpha/notifications/accounts_spec.rb   | 80 +++++++++++++++++++
 4 files changed, 135 insertions(+), 3 deletions(-)
 create mode 100644 app/controllers/api/v2_alpha/notifications/accounts_controller.rb
 create mode 100644 spec/requests/api/v2_alpha/notifications/accounts_spec.rb

diff --git a/app/controllers/api/v2_alpha/notifications/accounts_controller.rb b/app/controllers/api/v2_alpha/notifications/accounts_controller.rb
new file mode 100644
index 00000000000000..9933b63373e1fc
--- /dev/null
+++ b/app/controllers/api/v2_alpha/notifications/accounts_controller.rb
@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+class Api::V2Alpha::Notifications::AccountsController < Api::BaseController
+  before_action -> { doorkeeper_authorize! :read, :'read:notifications' }
+  before_action :require_user!
+  before_action :set_notifications!
+  after_action :insert_pagination_headers, only: :index
+
+  def index
+    @accounts = load_accounts
+    render json: @accounts, each_serializer: REST::AccountSerializer
+  end
+
+  private
+
+  def load_accounts
+    @paginated_notifications.map(&:from_account)
+  end
+
+  def set_notifications!
+    @paginated_notifications = begin
+      current_account
+        .notifications
+        .without_suspended
+        .where(group_key: params[:notification_group_key])
+        .includes(from_account: [:account_stat, :user])
+        .paginate_by_max_id(
+          limit_param(DEFAULT_ACCOUNTS_LIMIT),
+          params[:max_id],
+          params[:since_id]
+        )
+    end
+  end
+
+  def next_path
+    api_v2_alpha_notification_accounts_url pagination_params(max_id: pagination_max_id) if records_continue?
+  end
+
+  def prev_path
+    api_v2_alpha_notification_accounts_url pagination_params(min_id: pagination_since_id) unless @paginated_notifications.empty?
+  end
+
+  def pagination_collection
+    @paginated_notifications
+  end
+
+  def records_continue?
+    @paginated_notifications.size == limit_param(DEFAULT_ACCOUNTS_LIMIT)
+  end
+end
diff --git a/app/controllers/api/v2_alpha/notifications_controller.rb b/app/controllers/api/v2_alpha/notifications_controller.rb
index 13a016aeb7084f..bd6979955aa38c 100644
--- a/app/controllers/api/v2_alpha/notifications_controller.rb
+++ b/app/controllers/api/v2_alpha/notifications_controller.rb
@@ -46,7 +46,7 @@ def unread_count
   end
 
   def show
-    @notification = current_account.notifications.without_suspended.find_by!(group_key: params[:id])
+    @notification = current_account.notifications.without_suspended.find_by!(group_key: params[:group_key])
     presenter = GroupedNotificationsPresenter.new(NotificationGroup.from_notifications([@notification]))
     render json: presenter, serializer: REST::DedupNotificationGroupSerializer
   end
@@ -57,7 +57,7 @@ def clear
   end
 
   def dismiss
-    current_account.notifications.where(group_key: params[:id]).destroy_all
+    current_account.notifications.where(group_key: params[:group_key]).destroy_all
     render_empty
   end
 
diff --git a/config/routes/api.rb b/config/routes/api.rb
index c5addd33854992..df975065bd7bdc 100644
--- a/config/routes/api.rb
+++ b/config/routes/api.rb
@@ -344,7 +344,7 @@
   end
 
   namespace :v2_alpha do
-    resources :notifications, only: [:index, :show] do
+    resources :notifications, param: :group_key, only: [:index, :show] do
       collection do
         post :clear
         get :unread_count
@@ -353,6 +353,8 @@
       member do
         post :dismiss
       end
+
+      resources :accounts, only: [:index], module: :notifications
     end
   end
 
diff --git a/spec/requests/api/v2_alpha/notifications/accounts_spec.rb b/spec/requests/api/v2_alpha/notifications/accounts_spec.rb
new file mode 100644
index 00000000000000..6a6ce043d36bf3
--- /dev/null
+++ b/spec/requests/api/v2_alpha/notifications/accounts_spec.rb
@@ -0,0 +1,80 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Accounts in grouped notifications' do
+  let(:user)    { Fabricate(:user, account_attributes: { username: 'alice' }) }
+  let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+  let(:scopes)  { 'read:notifications write:notifications' }
+  let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
+
+  describe 'GET /api/v2_alpha/notifications/:group_key/accounts', :inline_jobs do
+    subject do
+      get "/api/v2_alpha/notifications/#{user.account.notifications.first.group_key}/accounts", headers: headers, params: params
+    end
+
+    let(:params) { {} }
+
+    before do
+      first_status = PostStatusService.new.call(user.account, text: 'Test')
+      FavouriteService.new.call(Fabricate(:account), first_status)
+      FavouriteService.new.call(Fabricate(:account), first_status)
+      ReblogService.new.call(Fabricate(:account), first_status)
+      FollowService.new.call(Fabricate(:account), user.account)
+      FavouriteService.new.call(Fabricate(:account), first_status)
+    end
+
+    it_behaves_like 'forbidden for wrong scope', 'write write:notifications'
+
+    it 'returns a list of accounts' do
+      subject
+
+      expect(response).to have_http_status(200)
+
+      # The group we are interested in is only favorites
+      notifications = user.account.notifications.where(type: 'favourite').reorder(id: :desc)
+      expect(body_as_json).to match(
+        [
+          a_hash_including(
+            id: notifications.first.from_account_id.to_s
+          ),
+          a_hash_including(
+            id: notifications.second.from_account_id.to_s
+          ),
+          a_hash_including(
+            id: notifications.third.from_account_id.to_s
+          ),
+        ]
+      )
+    end
+
+    context 'with limit param' do
+      let(:params) { { limit: 2 } }
+
+      it 'returns the requested number of accounts, with pagination headers' do
+        subject
+
+        expect(response).to have_http_status(200)
+
+        # The group we are interested in is only favorites
+        notifications = user.account.notifications.where(type: 'favourite').reorder(id: :desc)
+        expect(body_as_json).to match(
+          [
+            a_hash_including(
+              id: notifications.first.from_account_id.to_s
+            ),
+            a_hash_including(
+              id: notifications.second.from_account_id.to_s
+            ),
+          ]
+        )
+
+        expect(response)
+          .to include_pagination_headers(
+            prev: api_v2_alpha_notification_accounts_url(limit: params[:limit], min_id: notifications.first.id),
+            next: api_v2_alpha_notification_accounts_url(limit: params[:limit], max_id: notifications.second.id)
+          )
+      end
+    end
+  end
+end

From 97bb8df1c1ba33631c71df13210aa4b7a9ce06f1 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 3 Sep 2024 16:32:59 +0200
Subject: [PATCH 2051/2191] Update dependency rspec-rails to v7.0.1 (#31695)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 6d13efdb663ad8..192142fc5f545b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -714,7 +714,7 @@ GEM
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.0)
+    rspec-core (3.13.1)
       rspec-support (~> 3.13.0)
     rspec-expectations (3.13.2)
       diff-lcs (>= 1.2.0, < 2.0)
@@ -724,7 +724,7 @@ GEM
     rspec-mocks (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-rails (7.0.0)
+    rspec-rails (7.0.1)
       actionpack (>= 7.0)
       activesupport (>= 7.0)
       railties (>= 7.0)

From ae363f05555115503ab4679e826c6658416c38b5 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 3 Sep 2024 16:43:34 +0200
Subject: [PATCH 2052/2191] Fix spacing between icons and labels in
 settings/admin interface (#31728)

---
 app/helpers/application_helper.rb | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index f1c77d40eb4c87..7c91df8d4f5bc0 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -106,11 +106,16 @@ def can?(action, record)
   end
 
   def material_symbol(icon, attributes = {})
-    inline_svg_tag(
-      "400-24px/#{icon}.svg",
-      class: ['icon', "material-#{icon}"].concat(attributes[:class].to_s.split),
-      role: :img,
-      data: attributes[:data]
+    safe_join(
+      [
+        inline_svg_tag(
+          "400-24px/#{icon}.svg",
+          class: ['icon', "material-#{icon}"].concat(attributes[:class].to_s.split),
+          role: :img,
+          data: attributes[:data]
+        ),
+        ' ',
+      ]
     )
   end
 

From 5b595b8a5a0872a5c4eaaca83a60ba7b3652e847 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 3 Sep 2024 11:23:16 -0400
Subject: [PATCH 2053/2191] Remove usage of `assigns` in controller specs
 (#30195)

---
 app/views/settings/imports/index.html.haml    |  2 +-
 .../admin/accounts_controller_spec.rb         | 11 ++++----
 .../admin/domain_allows_controller_spec.rb    |  1 -
 .../admin/domain_blocks_controller_spec.rb    |  2 --
 .../export_domain_blocks_controller_spec.rb   | 22 +++++++++-------
 .../admin/instances_controller_spec.rb        |  9 ++++---
 .../admin/invites_controller_spec.rb          |  3 ++-
 .../admin/reports_controller_spec.rb          | 26 +++++++++----------
 .../authorize_interactions_controller_spec.rb | 10 ++++---
 .../account_controller_concern_spec.rb        |  7 ++---
 .../settings/imports_controller_spec.rb       |  8 +++---
 .../confirmations_controller_spec.rb          | 13 +++++++---
 .../recovery_codes_controller_spec.rb         |  3 ++-
 13 files changed, 66 insertions(+), 51 deletions(-)

diff --git a/app/views/settings/imports/index.html.haml b/app/views/settings/imports/index.html.haml
index ca815720fd6bd7..bfddd4546022eb 100644
--- a/app/views/settings/imports/index.html.haml
+++ b/app/views/settings/imports/index.html.haml
@@ -46,7 +46,7 @@
           %th= t('imports.failures')
       %tbody
         - @recent_imports.each do |import|
-          %tr
+          %tr{ id: dom_id(import) }
             %td= t("imports.types.#{import.type}")
             %td
               - if import.state_unconfirmed?
diff --git a/spec/controllers/admin/accounts_controller_spec.rb b/spec/controllers/admin/accounts_controller_spec.rb
index f241d261b1b18d..89a7239f53f45d 100644
--- a/spec/controllers/admin/accounts_controller_spec.rb
+++ b/spec/controllers/admin/accounts_controller_spec.rb
@@ -40,15 +40,16 @@
 
       expect(response)
         .to have_http_status(200)
-      expect(assigns(:accounts))
-        .to have_attributes(
-          count: eq(1),
-          klass: be(Account)
-        )
+      expect(accounts_table_rows.size)
+        .to eq(1)
       expect(AccountFilter)
         .to have_received(:new)
         .with(hash_including(params))
     end
+
+    def accounts_table_rows
+      Nokogiri::Slop(response.body).css('table.accounts-table tr')
+    end
   end
 
   describe 'GET #show' do
diff --git a/spec/controllers/admin/domain_allows_controller_spec.rb b/spec/controllers/admin/domain_allows_controller_spec.rb
index 6f82f322b5e385..036d229091a8ef 100644
--- a/spec/controllers/admin/domain_allows_controller_spec.rb
+++ b/spec/controllers/admin/domain_allows_controller_spec.rb
@@ -13,7 +13,6 @@
     it 'assigns a new domain allow' do
       get :new
 
-      expect(assigns(:domain_allow)).to be_instance_of(DomainAllow)
       expect(response).to have_http_status(200)
     end
   end
diff --git a/spec/controllers/admin/domain_blocks_controller_spec.rb b/spec/controllers/admin/domain_blocks_controller_spec.rb
index eb2c6265d12eec..a99ca6c641c672 100644
--- a/spec/controllers/admin/domain_blocks_controller_spec.rb
+++ b/spec/controllers/admin/domain_blocks_controller_spec.rb
@@ -13,7 +13,6 @@
     it 'assigns a new domain block' do
       get :new
 
-      expect(assigns(:domain_block)).to be_instance_of(DomainBlock)
       expect(response).to have_http_status(200)
     end
   end
@@ -171,7 +170,6 @@
     it 'returns http success' do
       get :edit, params: { id: domain_block.id }
 
-      expect(assigns(:domain_block)).to be_instance_of(DomainBlock)
       expect(response).to have_http_status(200)
     end
   end
diff --git a/spec/controllers/admin/export_domain_blocks_controller_spec.rb b/spec/controllers/admin/export_domain_blocks_controller_spec.rb
index bfcccfa06cf595..39195716c5c684 100644
--- a/spec/controllers/admin/export_domain_blocks_controller_spec.rb
+++ b/spec/controllers/admin/export_domain_blocks_controller_spec.rb
@@ -42,11 +42,8 @@ def domain_blocks_csv_file
         post :import, params: { admin_import: { data: fixture_file_upload('domain_blocks.csv') } }
       end
 
-      it 'renders page with expected domain blocks' do
-        expect(assigns(:domain_blocks).map { |block| [block.domain, block.severity.to_sym] }).to contain_exactly(['bad.domain', :silence], ['worse.domain', :suspend], ['reject.media', :noop])
-      end
-
-      it 'returns http success' do
+      it 'renders page with expected domain blocks and returns http success' do
+        expect(mapped_batch_table_rows).to contain_exactly(['bad.domain', :silence], ['worse.domain', :suspend], ['reject.media', :noop])
         expect(response).to have_http_status(200)
       end
     end
@@ -56,14 +53,19 @@ def domain_blocks_csv_file
         post :import, params: { admin_import: { data: fixture_file_upload('domain_blocks_list.txt') } }
       end
 
-      it 'renders page with expected domain blocks' do
-        expect(assigns(:domain_blocks).map { |block| [block.domain, block.severity.to_sym] }).to contain_exactly(['bad.domain', :suspend], ['worse.domain', :suspend], ['reject.media', :suspend])
-      end
-
-      it 'returns http success' do
+      it 'renders page with expected domain blocks and returns http success' do
+        expect(mapped_batch_table_rows).to contain_exactly(['bad.domain', :suspend], ['worse.domain', :suspend], ['reject.media', :suspend])
         expect(response).to have_http_status(200)
       end
     end
+
+    def mapped_batch_table_rows
+      batch_table_rows.map { |row| [row.at_css('[id$=_domain]')['value'], row.at_css('[id$=_severity]')['value'].to_sym] }
+    end
+
+    def batch_table_rows
+      Nokogiri::Slop(response.body).css('body div.batch-table__row')
+    end
   end
 
   it 'displays error on no file selected' do
diff --git a/spec/controllers/admin/instances_controller_spec.rb b/spec/controllers/admin/instances_controller_spec.rb
index ca64dd90a04dd9..a64bbb2c9f7911 100644
--- a/spec/controllers/admin/instances_controller_spec.rb
+++ b/spec/controllers/admin/instances_controller_spec.rb
@@ -28,12 +28,15 @@
     it 'renders instances' do
       get :index, params: { page: 2 }
 
-      instances = assigns(:instances).to_a
-      expect(instances.size).to eq 1
-      expect(instances[0].domain).to eq 'less.popular'
+      expect(instance_directory_links.size).to eq(1)
+      expect(instance_directory_links.first.text.strip).to match('less.popular')
 
       expect(response).to have_http_status(200)
     end
+
+    def instance_directory_links
+      Nokogiri::Slop(response.body).css('div.directory__tag a')
+    end
   end
 
   describe 'GET #show' do
diff --git a/spec/controllers/admin/invites_controller_spec.rb b/spec/controllers/admin/invites_controller_spec.rb
index 71748cbbec2122..8638f8e2141fc1 100644
--- a/spec/controllers/admin/invites_controller_spec.rb
+++ b/spec/controllers/admin/invites_controller_spec.rb
@@ -18,7 +18,8 @@
 
     it 'renders index page' do
       expect(subject).to render_template :index
-      expect(assigns(:invites)).to include invite
+      expect(response.body)
+        .to include(invite.code)
     end
   end
 
diff --git a/spec/controllers/admin/reports_controller_spec.rb b/spec/controllers/admin/reports_controller_spec.rb
index 5849163b5fe06e..67fb28e7a57fff 100644
--- a/spec/controllers/admin/reports_controller_spec.rb
+++ b/spec/controllers/admin/reports_controller_spec.rb
@@ -13,39 +13,39 @@
 
   describe 'GET #index' do
     it 'returns http success with no filters' do
-      specified = Fabricate(:report, action_taken_at: nil)
-      Fabricate(:report, action_taken_at: Time.now.utc)
+      specified = Fabricate(:report, action_taken_at: nil, comment: 'First report')
+      other = Fabricate(:report, action_taken_at: Time.now.utc, comment: 'Second report')
 
       get :index
 
-      reports = assigns(:reports).to_a
-      expect(reports.size).to eq 1
-      expect(reports[0]).to eq specified
       expect(response).to have_http_status(200)
+      expect(response.body)
+        .to include(specified.comment)
+        .and not_include(other.comment)
     end
 
     it 'returns http success with resolved filter' do
-      specified = Fabricate(:report, action_taken_at: Time.now.utc)
-      Fabricate(:report, action_taken_at: nil)
+      specified = Fabricate(:report, action_taken_at: Time.now.utc, comment: 'First report')
+      other = Fabricate(:report, action_taken_at: nil, comment: 'Second report')
 
       get :index, params: { resolved: '1' }
 
-      reports = assigns(:reports).to_a
-      expect(reports.size).to eq 1
-      expect(reports[0]).to eq specified
-
       expect(response).to have_http_status(200)
+      expect(response.body)
+        .to include(specified.comment)
+        .and not_include(other.comment)
     end
   end
 
   describe 'GET #show' do
     it 'renders report' do
-      report = Fabricate(:report)
+      report = Fabricate(:report, comment: 'A big problem')
 
       get :show, params: { id: report }
 
-      expect(assigns(:report)).to eq report
       expect(response).to have_http_status(200)
+      expect(response.body)
+        .to include(report.comment)
     end
   end
 
diff --git a/spec/controllers/authorize_interactions_controller_spec.rb b/spec/controllers/authorize_interactions_controller_spec.rb
index 5282a196a65af7..ed55df08d9a74b 100644
--- a/spec/controllers/authorize_interactions_controller_spec.rb
+++ b/spec/controllers/authorize_interactions_controller_spec.rb
@@ -46,8 +46,9 @@
 
         get :show, params: { acct: 'http://example.com' }
 
-        expect(response).to have_http_status(302)
-        expect(assigns(:resource)).to eq account
+        expect(response)
+          .to have_http_status(302)
+          .and redirect_to(web_url("@#{account.pretty_acct}"))
       end
 
       it 'sets resource from acct uri' do
@@ -58,8 +59,9 @@
 
         get :show, params: { acct: 'acct:found@hostname' }
 
-        expect(response).to have_http_status(302)
-        expect(assigns(:resource)).to eq account
+        expect(response)
+          .to have_http_status(302)
+          .and redirect_to(web_url("@#{account.pretty_acct}"))
       end
     end
   end
diff --git a/spec/controllers/concerns/account_controller_concern_spec.rb b/spec/controllers/concerns/account_controller_concern_spec.rb
index 6eb970dedbba59..122ef21e93039f 100644
--- a/spec/controllers/concerns/account_controller_concern_spec.rb
+++ b/spec/controllers/concerns/account_controller_concern_spec.rb
@@ -7,7 +7,7 @@
     include AccountControllerConcern
 
     def success
-      head 200
+      render plain: @account.username # rubocop:disable RSpec/InstanceVariable
     end
   end
 
@@ -51,12 +51,13 @@ def success
   context 'when account is not suspended' do
     let(:account) { Fabricate(:account, username: 'username') }
 
-    it 'assigns @account, returns success, and sets link headers' do
+    it 'Prepares the account, returns success, and sets link headers' do
       get 'success', params: { account_username: account.username }
 
-      expect(assigns(:account)).to eq account
       expect(response).to have_http_status(200)
       expect(response.headers['Link'].to_s).to eq(expected_link_headers)
+      expect(response.body)
+        .to include(account.username)
     end
 
     def expected_link_headers
diff --git a/spec/controllers/settings/imports_controller_spec.rb b/spec/controllers/settings/imports_controller_spec.rb
index 89ec39e54d4564..219b882e6ddfd6 100644
--- a/spec/controllers/settings/imports_controller_spec.rb
+++ b/spec/controllers/settings/imports_controller_spec.rb
@@ -21,9 +21,10 @@
 
     it 'assigns the expected imports', :aggregate_failures do
       expect(response).to have_http_status(200)
-      expect(assigns(:recent_imports)).to eq [import]
-      expect(assigns(:recent_imports)).to_not include(other_import)
       expect(response.headers['Cache-Control']).to include('private, no-store')
+      expect(response.body)
+        .to include("bulk_import_#{import.id}")
+        .and not_include("bulk_import_#{other_import.id}")
     end
   end
 
@@ -261,7 +262,8 @@
       it 'does not creates an unconfirmed bulk_import', :aggregate_failures do
         expect { subject }.to_not(change { user.account.bulk_imports.count })
 
-        expect(assigns(:import).errors).to_not be_empty
+        expect(response.body)
+          .to include('field_with_errors')
       end
     end
 
diff --git a/spec/controllers/settings/two_factor_authentication/confirmations_controller_spec.rb b/spec/controllers/settings/two_factor_authentication/confirmations_controller_spec.rb
index 1b3b0cb0aeebaa..1c8b483a0a22e7 100644
--- a/spec/controllers/settings/two_factor_authentication/confirmations_controller_spec.rb
+++ b/spec/controllers/settings/two_factor_authentication/confirmations_controller_spec.rb
@@ -9,11 +9,16 @@
     it 'renders the new view' do
       subject
 
-      expect(assigns(:confirmation)).to be_instance_of Form::TwoFactorConfirmation
-      expect(assigns(:provision_url)).to eq 'otpauth://totp/cb6e6126.ngrok.io:local-part%40domain?secret=thisisasecretforthespecofnewview&issuer=cb6e6126.ngrok.io'
-      expect(assigns(:qrcode)).to be_instance_of RQRCode::QRCode
       expect(response).to have_http_status(200)
       expect(response).to render_template(:new)
+      expect(response.body)
+        .to include(qr_code_markup)
+    end
+
+    def qr_code_markup
+      RQRCode::QRCode.new(
+        'otpauth://totp/cb6e6126.ngrok.io:local-part%40domain?secret=thisisasecretforthespecofnewview&issuer=cb6e6126.ngrok.io'
+      ).as_svg(padding: 0, module_size: 4)
     end
   end
 
@@ -61,10 +66,10 @@
             expect { post_create_with_options }
               .to change { user.reload.otp_secret }.to 'thisisasecretforthespecofnewview'
 
-            expect(assigns(:recovery_codes)).to eq otp_backup_codes
             expect(flash[:notice]).to eq 'Two-factor authentication successfully enabled'
             expect(response).to have_http_status(200)
             expect(response).to render_template('settings/two_factor_authentication/recovery_codes/index')
+            expect(response.body).to include(*otp_backup_codes)
           end
         end
 
diff --git a/spec/controllers/settings/two_factor_authentication/recovery_codes_controller_spec.rb b/spec/controllers/settings/two_factor_authentication/recovery_codes_controller_spec.rb
index 28a40e138c3388..dbc2e3059ce2c9 100644
--- a/spec/controllers/settings/two_factor_authentication/recovery_codes_controller_spec.rb
+++ b/spec/controllers/settings/two_factor_authentication/recovery_codes_controller_spec.rb
@@ -15,10 +15,11 @@
       sign_in user, scope: :user
       post :create, session: { challenge_passed_at: Time.now.utc }
 
-      expect(assigns(:recovery_codes)).to eq otp_backup_codes
       expect(flash[:notice]).to eq 'Recovery codes successfully regenerated'
       expect(response).to have_http_status(200)
       expect(response).to render_template(:index)
+      expect(response.body)
+        .to include(*otp_backup_codes)
     end
 
     it 'redirects when not signed in' do

From 79b1841805f47cd3931bfdb7d51e1791529c3845 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 3 Sep 2024 11:23:57 -0400
Subject: [PATCH 2054/2191] Disable `without_verify_partial_doubles` in
 statuses/show view spec (#29132)

---
 spec/spec_helper.rb                        |  6 ------
 spec/views/statuses/show.html.haml_spec.rb | 21 +++++++++++++++++----
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 248c2c41050252..2d20239b27749d 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -8,12 +8,6 @@
 
   config.mock_with :rspec do |mocks|
     mocks.verify_partial_doubles = true
-
-    config.around(:example, :without_verify_partial_doubles) do |example|
-      mocks.verify_partial_doubles = false
-      example.call
-      mocks.verify_partial_doubles = true
-    end
   end
 
   config.before :suite do
diff --git a/spec/views/statuses/show.html.haml_spec.rb b/spec/views/statuses/show.html.haml_spec.rb
index 1c408db6c5ea7e..fd08f2772d6086 100644
--- a/spec/views/statuses/show.html.haml_spec.rb
+++ b/spec/views/statuses/show.html.haml_spec.rb
@@ -2,14 +2,13 @@
 
 require 'rails_helper'
 
-describe 'statuses/show.html.haml', :without_verify_partial_doubles do
+describe 'statuses/show.html.haml' do
   let(:alice) { Fabricate(:account, username: 'alice', display_name: 'Alice') }
   let(:status) { Fabricate(:status, account: alice, text: 'Hello World') }
 
   before do
-    allow(view).to receive_messages(api_oembed_url: '', site_title: 'example site', site_hostname: 'example.com', full_asset_url: '//asset.host/image.svg', current_account: nil, single_user_mode?: false)
-    allow(view).to receive(:local_time)
-    allow(view).to receive(:local_time_ago)
+    view.extend view_helpers
+
     assign(:instance_presenter, InstancePresenter.new)
 
     Fabricate(:media_attachment, account: alice, status: status, type: :video)
@@ -40,4 +39,18 @@
   def header_tags
     view.content_for(:header_tags)
   end
+
+  def view_helpers
+    Module.new do
+      def api_oembed_url(_) = ''
+      def show_landing_strip? = true
+      def site_title = 'example site'
+      def site_hostname = 'example.com'
+      def full_asset_url(_) = '//asset.host/image.svg'
+      def current_account = nil
+      def single_user_mode? = false
+      def local_time = nil
+      def local_time_ago = nil
+    end
+  end
 end

From dc2f67f69bfd0536564268eb73a79f1eec80cb03 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 3 Sep 2024 11:24:31 -0400
Subject: [PATCH 2055/2191] Remove `fuubar` gem and custom rspec `--format`
 setting (#30594)

---
 .gitignore   | 3 +++
 .rspec       | 1 -
 Gemfile      | 3 ---
 Gemfile.lock | 4 ----
 4 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index a70f30f952854e..a74317bd7d81b2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -71,3 +71,6 @@ docker-compose.override.yml
 
 # Ignore dotenv .local files
 .env*.local
+
+# Ignore local-only rspec configuration
+.rspec-local
diff --git a/.rspec b/.rspec
index 9a8e706d0911b2..83e16f80447460 100644
--- a/.rspec
+++ b/.rspec
@@ -1,3 +1,2 @@
 --color
 --require spec_helper
---format Fuubar
diff --git a/Gemfile b/Gemfile
index af05ec84026188..6538067cff0681 100644
--- a/Gemfile
+++ b/Gemfile
@@ -126,9 +126,6 @@ group :test do
   # Adds RSpec Error/Warning annotations to GitHub PRs on the Files tab
   gem 'rspec-github', '~> 2.4', require: false
 
-  # RSpec progress bar formatter
-  gem 'fuubar', '~> 2.5'
-
   # RSpec helpers for email specs
   gem 'email_spec'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 192142fc5f545b..2e9037d8a64374 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -288,9 +288,6 @@ GEM
     fugit (1.11.1)
       et-orbi (~> 1, >= 1.2.11)
       raabro (~> 1.4)
-    fuubar (2.5.1)
-      rspec-core (~> 3.0)
-      ruby-progressbar (~> 1.4)
     globalid (1.2.1)
       activesupport (>= 6.1)
     google-protobuf (3.25.4)
@@ -949,7 +946,6 @@ DEPENDENCIES
   flatware-rspec
   fog-core (<= 2.5.0)
   fog-openstack (~> 1.0)
-  fuubar (~> 2.5)
   haml-rails (~> 2.0)
   haml_lint
   hcaptcha (~> 7.1)

From ef4920c6c92b4191b12f0de820d694e8abf14d4a Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 3 Sep 2024 11:28:57 -0400
Subject: [PATCH 2056/2191] Pull out https/hostname setup for request specs to
 shared config (#31622)

---
 spec/rails_helper.rb                    |  6 ++++++
 spec/requests/account_show_page_spec.rb |  2 +-
 spec/requests/api/v1/streaming_spec.rb  |  5 ++---
 spec/requests/link_headers_spec.rb      |  2 +-
 spec/requests/media_proxy_spec.rb       | 17 +++++++++++------
 5 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index ba712c08f99e9a..0c3d01c7850bc8 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -142,6 +142,12 @@ def sign_in(resource, _deprecated = nil, scope: nil)
     end
   end
 
+  config.before :each, type: :request do
+    # Use https and configured hostname in request spec requests
+    integration_session.https!
+    host! Rails.configuration.x.local_domain
+  end
+
   config.after do
     Rails.cache.clear
     redis.del(redis.keys)
diff --git a/spec/requests/account_show_page_spec.rb b/spec/requests/account_show_page_spec.rb
index 830d7786081fc2..bdcec12fdb5a59 100644
--- a/spec/requests/account_show_page_spec.rb
+++ b/spec/requests/account_show_page_spec.rb
@@ -14,7 +14,7 @@
     expect(head_meta_content('og:title')).to match alice.display_name
     expect(head_meta_content('og:type')).to eq 'profile'
     expect(head_meta_content('og:image')).to match '.+'
-    expect(head_meta_content('og:url')).to match 'http://.+'
+    expect(head_meta_content('og:url')).to eq short_account_url(username: alice.username)
   end
 
   def head_link_icons
diff --git a/spec/requests/api/v1/streaming_spec.rb b/spec/requests/api/v1/streaming_spec.rb
index 6b550dfa606b8f..6ce35c2fe60f14 100644
--- a/spec/requests/api/v1/streaming_spec.rb
+++ b/spec/requests/api/v1/streaming_spec.rb
@@ -10,12 +10,11 @@
     Rails.configuration.x.streaming_api_base_url = before
   end
 
-  let(:headers) { { 'Host' => Rails.configuration.x.web_domain } }
-
   context 'with streaming api on same host' do
     describe 'GET /api/v1/streaming' do
       it 'raises ActiveRecord::RecordNotFound' do
-        get '/api/v1/streaming', headers: headers
+        integration_session.https!(false)
+        get '/api/v1/streaming'
 
         expect(response).to have_http_status(404)
       end
diff --git a/spec/requests/link_headers_spec.rb b/spec/requests/link_headers_spec.rb
index b822adbfb85559..522cff46427f0a 100644
--- a/spec/requests/link_headers_spec.rb
+++ b/spec/requests/link_headers_spec.rb
@@ -13,7 +13,7 @@
     it 'contains webfinger url in link header' do
       link_header = link_header_with_type('application/jrd+json')
 
-      expect(link_header.href).to eq 'http://www.example.com/.well-known/webfinger?resource=acct%3Atest%40cb6e6126.ngrok.io'
+      expect(link_header.href).to eq 'https://cb6e6126.ngrok.io/.well-known/webfinger?resource=acct%3Atest%40cb6e6126.ngrok.io'
       expect(link_header.attr_pairs.first).to eq %w(rel lrdd)
     end
 
diff --git a/spec/requests/media_proxy_spec.rb b/spec/requests/media_proxy_spec.rb
index 0524105d90611b..814d4c11664bcb 100644
--- a/spec/requests/media_proxy_spec.rb
+++ b/spec/requests/media_proxy_spec.rb
@@ -4,12 +4,7 @@
 
 describe 'Media Proxy' do
   describe 'GET /media_proxy/:id' do
-    before do
-      integration_session.https! # TODO: Move to global rails_helper for all request specs?
-      host! Rails.configuration.x.local_domain # TODO: Move to global rails_helper for all request specs?
-
-      stub_request(:get, 'http://example.com/attachment.png').to_return(request_fixture('avatar.txt'))
-    end
+    before { stub_attachment_request }
 
     context 'when attached to a status' do
       let(:status) { Fabricate(:status) }
@@ -63,5 +58,15 @@
           .to have_http_status(404)
       end
     end
+
+    def stub_attachment_request
+      stub_request(
+        :get,
+        'http://example.com/attachment.png'
+      )
+        .to_return(
+          request_fixture('avatar.txt')
+        )
+    end
   end
 end

From 928390c2ba4e8c6f433025f3eb3ecd89337a2660 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 3 Sep 2024 11:29:32 -0400
Subject: [PATCH 2057/2191] Convert `admin/settings` controller specs to system
 specs (#31548)

---
 .../admin/settings/about_controller_spec.rb   | 29 ---------------
 .../settings/appearance_controller_spec.rb    | 29 ---------------
 .../settings/branding_controller_spec.rb      | 17 ---------
 .../content_retention_controller_spec.rb      | 29 ---------------
 .../settings/discovery_controller_spec.rb     | 29 ---------------
 .../settings/registrations_controller_spec.rb | 29 ---------------
 spec/rails_helper.rb                          |  1 +
 spec/support/system_helpers.rb                | 19 ++++++++++
 spec/system/admin/settings/about_spec.rb      | 22 +++++++++++
 spec/system/admin/settings/appearance_spec.rb | 22 +++++++++++
 spec/system/admin/settings/branding_spec.rb   | 37 +++++++++++++++++++
 .../admin/settings/content_retention_spec.rb  | 22 +++++++++++
 spec/system/admin/settings/discovery_spec.rb  | 21 +++++++++++
 .../admin/settings/registrations_spec.rb      | 26 +++++++++++++
 14 files changed, 170 insertions(+), 162 deletions(-)
 delete mode 100644 spec/controllers/admin/settings/about_controller_spec.rb
 delete mode 100644 spec/controllers/admin/settings/appearance_controller_spec.rb
 delete mode 100644 spec/controllers/admin/settings/content_retention_controller_spec.rb
 delete mode 100644 spec/controllers/admin/settings/discovery_controller_spec.rb
 delete mode 100644 spec/controllers/admin/settings/registrations_controller_spec.rb
 create mode 100644 spec/support/system_helpers.rb
 create mode 100644 spec/system/admin/settings/about_spec.rb
 create mode 100644 spec/system/admin/settings/appearance_spec.rb
 create mode 100644 spec/system/admin/settings/branding_spec.rb
 create mode 100644 spec/system/admin/settings/content_retention_spec.rb
 create mode 100644 spec/system/admin/settings/discovery_spec.rb
 create mode 100644 spec/system/admin/settings/registrations_spec.rb

diff --git a/spec/controllers/admin/settings/about_controller_spec.rb b/spec/controllers/admin/settings/about_controller_spec.rb
deleted file mode 100644
index f322cb44346b01..00000000000000
--- a/spec/controllers/admin/settings/about_controller_spec.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe Admin::Settings::AboutController do
-  render_views
-
-  let(:user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
-
-  before do
-    sign_in user, scope: :user
-  end
-
-  describe 'GET #show' do
-    it 'returns http success' do
-      get :show
-
-      expect(response).to have_http_status(:success)
-    end
-  end
-
-  describe 'PUT #update' do
-    it 'updates the settings' do
-      put :update, params: { form_admin_settings: { site_extended_description: 'new site description' } }
-
-      expect(response).to redirect_to(admin_settings_about_path)
-    end
-  end
-end
diff --git a/spec/controllers/admin/settings/appearance_controller_spec.rb b/spec/controllers/admin/settings/appearance_controller_spec.rb
deleted file mode 100644
index ea6f3b7833a834..00000000000000
--- a/spec/controllers/admin/settings/appearance_controller_spec.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe Admin::Settings::AppearanceController do
-  render_views
-
-  let(:user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
-
-  before do
-    sign_in user, scope: :user
-  end
-
-  describe 'GET #show' do
-    it 'returns http success' do
-      get :show
-
-      expect(response).to have_http_status(:success)
-    end
-  end
-
-  describe 'PUT #update' do
-    it 'updates the settings' do
-      put :update, params: { form_admin_settings: { custom_css: 'html { display: inline; }' } }
-
-      expect(response).to redirect_to(admin_settings_appearance_path)
-    end
-  end
-end
diff --git a/spec/controllers/admin/settings/branding_controller_spec.rb b/spec/controllers/admin/settings/branding_controller_spec.rb
index e30300b4e4fcb6..5e46910cc6f453 100644
--- a/spec/controllers/admin/settings/branding_controller_spec.rb
+++ b/spec/controllers/admin/settings/branding_controller_spec.rb
@@ -10,14 +10,6 @@
       sign_in Fabricate(:user, role: UserRole.find_by(name: 'Admin')), scope: :user
     end
 
-    describe 'GET #show' do
-      it 'returns http success' do
-        get :show
-
-        expect(response).to have_http_status(200)
-      end
-    end
-
     describe 'PUT #update' do
       it 'cannot create a setting value for a non-admin key' do
         expect(Setting.new_setting_key).to be_blank
@@ -27,15 +19,6 @@
         expect(response).to redirect_to(admin_settings_branding_path)
         expect(Setting.new_setting_key).to be_nil
       end
-
-      it 'creates a settings value that didnt exist before for eligible key' do
-        expect(Setting.site_short_description).to be_blank
-
-        patch :update, params: { form_admin_settings: { site_short_description: 'New key value' } }
-
-        expect(response).to redirect_to(admin_settings_branding_path)
-        expect(Setting.site_short_description).to eq 'New key value'
-      end
     end
   end
 end
diff --git a/spec/controllers/admin/settings/content_retention_controller_spec.rb b/spec/controllers/admin/settings/content_retention_controller_spec.rb
deleted file mode 100644
index fb6a3d28484dc2..00000000000000
--- a/spec/controllers/admin/settings/content_retention_controller_spec.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe Admin::Settings::ContentRetentionController do
-  render_views
-
-  let(:user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
-
-  before do
-    sign_in user, scope: :user
-  end
-
-  describe 'GET #show' do
-    it 'returns http success' do
-      get :show
-
-      expect(response).to have_http_status(:success)
-    end
-  end
-
-  describe 'PUT #update' do
-    it 'updates the settings' do
-      put :update, params: { form_admin_settings: { media_cache_retention_period: '2' } }
-
-      expect(response).to redirect_to(admin_settings_content_retention_path)
-    end
-  end
-end
diff --git a/spec/controllers/admin/settings/discovery_controller_spec.rb b/spec/controllers/admin/settings/discovery_controller_spec.rb
deleted file mode 100644
index 33109e3c014ef5..00000000000000
--- a/spec/controllers/admin/settings/discovery_controller_spec.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe Admin::Settings::DiscoveryController do
-  render_views
-
-  let(:user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
-
-  before do
-    sign_in user, scope: :user
-  end
-
-  describe 'GET #show' do
-    it 'returns http success' do
-      get :show
-
-      expect(response).to have_http_status(:success)
-    end
-  end
-
-  describe 'PUT #update' do
-    it 'updates the settings' do
-      put :update, params: { form_admin_settings: { trends: '1' } }
-
-      expect(response).to redirect_to(admin_settings_discovery_path)
-    end
-  end
-end
diff --git a/spec/controllers/admin/settings/registrations_controller_spec.rb b/spec/controllers/admin/settings/registrations_controller_spec.rb
deleted file mode 100644
index e0765446037de8..00000000000000
--- a/spec/controllers/admin/settings/registrations_controller_spec.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe Admin::Settings::RegistrationsController do
-  render_views
-
-  let(:user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
-
-  before do
-    sign_in user, scope: :user
-  end
-
-  describe 'GET #show' do
-    it 'returns http success' do
-      get :show
-
-      expect(response).to have_http_status(:success)
-    end
-  end
-
-  describe 'PUT #update' do
-    it 'updates the settings' do
-      put :update, params: { form_admin_settings: { registrations_mode: 'open' } }
-
-      expect(response).to redirect_to(admin_settings_registrations_path)
-    end
-  end
-end
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 0c3d01c7850bc8..2a602d113a8b0e 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -112,6 +112,7 @@ def sign_in(resource, _deprecated = nil, scope: nil)
   config.include ThreadingHelpers
   config.include SignedRequestHelpers, type: :request
   config.include CommandLineHelpers, type: :cli
+  config.include SystemHelpers, type: :system
 
   config.around(:each, use_transactional_tests: false) do |example|
     self.use_transactional_tests = false
diff --git a/spec/support/system_helpers.rb b/spec/support/system_helpers.rb
new file mode 100644
index 00000000000000..05c9d3b125a565
--- /dev/null
+++ b/spec/support/system_helpers.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module SystemHelpers
+  def admin_user
+    Fabricate(:user, role: UserRole.find_by(name: 'Admin'))
+  end
+
+  def submit_button
+    I18n.t('generic.save_changes')
+  end
+
+  def success_message
+    I18n.t('generic.changes_saved_msg')
+  end
+
+  def form_label(key)
+    I18n.t key, scope: 'simple_form.labels'
+  end
+end
diff --git a/spec/system/admin/settings/about_spec.rb b/spec/system/admin/settings/about_spec.rb
new file mode 100644
index 00000000000000..0f8ae5605cec0c
--- /dev/null
+++ b/spec/system/admin/settings/about_spec.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'Admin::Settings::About' do
+  it 'Saves changes to about settings' do
+    sign_in admin_user
+    visit admin_settings_about_path
+
+    fill_in extended_description_field,
+            with: 'new site description'
+
+    click_on submit_button
+
+    expect(page)
+      .to have_content(success_message)
+  end
+
+  def extended_description_field
+    form_label 'form_admin_settings.site_extended_description'
+  end
+end
diff --git a/spec/system/admin/settings/appearance_spec.rb b/spec/system/admin/settings/appearance_spec.rb
new file mode 100644
index 00000000000000..99e97ea4d128dc
--- /dev/null
+++ b/spec/system/admin/settings/appearance_spec.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'Admin::Settings::Appearance' do
+  it 'Saves changes to appearance settings' do
+    sign_in admin_user
+    visit admin_settings_appearance_path
+
+    fill_in custom_css_field,
+            with: 'html { display: inline; }'
+
+    click_on submit_button
+
+    expect(page)
+      .to have_content(success_message)
+  end
+
+  def custom_css_field
+    form_label 'form_admin_settings.custom_css'
+  end
+end
diff --git a/spec/system/admin/settings/branding_spec.rb b/spec/system/admin/settings/branding_spec.rb
new file mode 100644
index 00000000000000..ac47e04d53442a
--- /dev/null
+++ b/spec/system/admin/settings/branding_spec.rb
@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'Admin::Settings::Branding' do
+  it 'Saves changes to branding settings' do
+    sign_in admin_user
+    visit admin_settings_branding_path
+
+    fill_in short_description_field,
+            with: 'new key value'
+
+    fill_in site_contact_email_field,
+            with: User.last.email
+
+    fill_in site_contact_username_field,
+            with: Account.last.username
+
+    expect { click_on submit_button }
+      .to change(Setting, :site_short_description).to('new key value')
+
+    expect(page)
+      .to have_content(success_message)
+  end
+
+  def short_description_field
+    form_label 'form_admin_settings.site_short_description'
+  end
+
+  def site_contact_email_field
+    form_label 'form_admin_settings.site_contact_email'
+  end
+
+  def site_contact_username_field
+    form_label 'form_admin_settings.site_contact_username'
+  end
+end
diff --git a/spec/system/admin/settings/content_retention_spec.rb b/spec/system/admin/settings/content_retention_spec.rb
new file mode 100644
index 00000000000000..9867122675a280
--- /dev/null
+++ b/spec/system/admin/settings/content_retention_spec.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'Admin::Settings::ContentRetention' do
+  it 'Saves changes to content retention settings' do
+    sign_in admin_user
+    visit admin_settings_content_retention_path
+
+    fill_in media_cache_retention_period_field,
+            with: '2'
+
+    click_on submit_button
+
+    expect(page)
+      .to have_content(success_message)
+  end
+
+  def media_cache_retention_period_field
+    form_label 'form_admin_settings.media_cache_retention_period'
+  end
+end
diff --git a/spec/system/admin/settings/discovery_spec.rb b/spec/system/admin/settings/discovery_spec.rb
new file mode 100644
index 00000000000000..bdab91107d0334
--- /dev/null
+++ b/spec/system/admin/settings/discovery_spec.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'Admin::Settings::Discovery' do
+  it 'Saves changes to discovery settings' do
+    sign_in admin_user
+    visit admin_settings_discovery_path
+
+    check trends_box
+
+    click_on submit_button
+
+    expect(page)
+      .to have_content(success_message)
+  end
+
+  def trends_box
+    form_label 'form_admin_settings.trends'
+  end
+end
diff --git a/spec/system/admin/settings/registrations_spec.rb b/spec/system/admin/settings/registrations_spec.rb
new file mode 100644
index 00000000000000..88c750e8ee1b7a
--- /dev/null
+++ b/spec/system/admin/settings/registrations_spec.rb
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'Admin::Settings::Registrations' do
+  it 'Saves changes to registrations settings' do
+    sign_in admin_user
+    visit admin_settings_registrations_path
+
+    select open_mode_option,
+           from: registrations_mode_field
+
+    click_on submit_button
+
+    expect(page)
+      .to have_content(success_message)
+  end
+
+  def open_mode_option
+    I18n.t('admin.settings.registrations_mode.modes.open')
+  end
+
+  def registrations_mode_field
+    form_label 'form_admin_settings.registrations_mode'
+  end
+end

From fcb83be8b23f64d336d7d3aca2829e9b92ff1df2 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 3 Sep 2024 11:30:13 -0400
Subject: [PATCH 2058/2191] Improve coverage specificity for Webhook
 enable/disable/secret specs (#31194)

---
 spec/models/webhook_spec.rb | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/spec/models/webhook_spec.rb b/spec/models/webhook_spec.rb
index effaf92e9c8a47..864baf2e1aebfb 100644
--- a/spec/models/webhook_spec.rb
+++ b/spec/models/webhook_spec.rb
@@ -38,28 +38,28 @@
 
   describe '#rotate_secret!' do
     it 'changes the secret' do
-      previous_value = webhook.secret
-      webhook.rotate_secret!
-      expect(webhook.secret).to_not be_blank
-      expect(webhook.secret).to_not eq previous_value
+      expect { webhook.rotate_secret! }
+        .to change(webhook, :secret)
+      expect(webhook.secret)
+        .to_not be_blank
     end
   end
 
   describe '#enable!' do
-    before do
-      webhook.disable!
-    end
+    let(:webhook) { Fabricate(:webhook, enabled: false) }
 
     it 'enables the webhook' do
-      webhook.enable!
-      expect(webhook.enabled?).to be true
+      expect { webhook.enable! }
+        .to change(webhook, :enabled?).to(true)
     end
   end
 
   describe '#disable!' do
+    let(:webhook) { Fabricate(:webhook, enabled: true) }
+
     it 'disables the webhook' do
-      webhook.disable!
-      expect(webhook.enabled?).to be false
+      expect { webhook.disable! }
+        .to change(webhook, :enabled?).to(false)
     end
   end
 end

From 67faaf555723e8b202620725b7144a183543809e Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 3 Sep 2024 11:30:57 -0400
Subject: [PATCH 2059/2191] Simplify account model username presence validation
 spec (#31013)

---
 Gemfile                          | 2 ++
 Gemfile.lock                     | 3 +++
 spec/models/account_spec.rb      | 6 +-----
 spec/support/shoulda_matchers.rb | 8 ++++++++
 4 files changed, 14 insertions(+), 5 deletions(-)
 create mode 100644 spec/support/shoulda_matchers.rb

diff --git a/Gemfile b/Gemfile
index 6538067cff0681..4c808fa48006b7 100644
--- a/Gemfile
+++ b/Gemfile
@@ -151,6 +151,8 @@ group :test do
   # Test harness fo rack components
   gem 'rack-test', '~> 2.1'
 
+  gem 'shoulda-matchers'
+
   # Coverage formatter for RSpec test if DISABLE_SIMPLECOV is false
   gem 'simplecov', '~> 0.22', require: false
   gem 'simplecov-lcov', '~> 0.8', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 2e9037d8a64374..461a2d43a23550 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -790,6 +790,8 @@ GEM
       rubyzip (>= 1.2.2, < 3.0)
       websocket (~> 1.0)
     semantic_range (3.0.0)
+    shoulda-matchers (6.3.1)
+      activesupport (>= 5.2.0)
     sidekiq (6.5.12)
       connection_pool (>= 2.2.5, < 3)
       rack (~> 2.0)
@@ -1035,6 +1037,7 @@ DEPENDENCIES
   sanitize (~> 6.0)
   scenic (~> 1.7)
   selenium-webdriver
+  shoulda-matchers
   sidekiq (~> 6.5)
   sidekiq-bulk (~> 0.2.0)
   sidekiq-scheduler (~> 5.0)
diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb
index 8e5648a0b0e189..14528ed17bf00b 100644
--- a/spec/models/account_spec.rb
+++ b/spec/models/account_spec.rb
@@ -722,11 +722,7 @@
   end
 
   describe 'validations' do
-    it 'is invalid without a username' do
-      account = Fabricate.build(:account, username: nil)
-      account.valid?
-      expect(account).to model_have_error_on_field(:username)
-    end
+    it { is_expected.to validate_presence_of(:username) }
 
     it 'squishes the username before validation' do
       account = Fabricate(:account, domain: nil, username: " \u3000bob \t \u00a0 \n ")
diff --git a/spec/support/shoulda_matchers.rb b/spec/support/shoulda_matchers.rb
new file mode 100644
index 00000000000000..edcf9dd8590e73
--- /dev/null
+++ b/spec/support/shoulda_matchers.rb
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+Shoulda::Matchers.configure do |config|
+  config.integrate do |with|
+    with.test_framework :rspec
+    with.library :rails
+  end
+end

From 8922786ef48951a3d4ce719a0e40ef96d2a3792c Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 3 Sep 2024 11:32:12 -0400
Subject: [PATCH 2060/2191] Fix `RSpec/LetSetup` cop in api/v1/timelines/tag
 spec (#30796)

---
 spec/requests/api/v1/timelines/tag_spec.rb | 23 ++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/spec/requests/api/v1/timelines/tag_spec.rb b/spec/requests/api/v1/timelines/tag_spec.rb
index 5e1415bb1acb16..cfbfa0291c546e 100644
--- a/spec/requests/api/v1/timelines/tag_spec.rb
+++ b/spec/requests/api/v1/timelines/tag_spec.rb
@@ -8,22 +8,25 @@
   let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
   let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
 
-  shared_examples 'a successful request to the tag timeline' do
-    it 'returns the expected statuses', :aggregate_failures do
-      subject
-
-      expect(response).to have_http_status(200)
-      expect(body_as_json.pluck(:id)).to match_array(expected_statuses.map { |status| status.id.to_s })
-    end
-  end
-
   describe 'GET /api/v1/timelines/tag/:hashtag' do
     subject do
       get "/api/v1/timelines/tag/#{hashtag}", headers: headers, params: params
     end
 
+    shared_examples 'a successful request to the tag timeline' do
+      it 'returns the expected statuses', :aggregate_failures do
+        subject
+
+        expect(response)
+          .to have_http_status(200)
+        expect(body_as_json.pluck(:id))
+          .to match_array(expected_statuses.map { |status| status.id.to_s })
+          .and not_include(private_status.id)
+      end
+    end
+
     let(:account)         { Fabricate(:account) }
-    let!(:private_status) { PostStatusService.new.call(account, visibility: :private, text: '#life could be a dream') } # rubocop:disable RSpec/LetSetup
+    let!(:private_status) { PostStatusService.new.call(account, visibility: :private, text: '#life could be a dream') }
     let!(:life_status)    { PostStatusService.new.call(account, text: 'tell me what is my #life without your #love') }
     let!(:war_status)     { PostStatusService.new.call(user.account, text: '#war, war never changes') }
     let!(:love_status)    { PostStatusService.new.call(account, text: 'what is #love?') }

From 46828044481f2a2698483d7bfa4ca36b04980d40 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 3 Sep 2024 11:32:22 -0400
Subject: [PATCH 2061/2191] Fix `Rails/ReversibleMigration` cop for
 `remove_index` (#30832)

---
 db/migrate/20161122163057_remove_unneeded_indexes.rb        | 6 +++---
 db/migrate/20171129172043_add_index_on_stream_entries.rb    | 2 +-
 .../20171212195226_remove_duplicate_indexes_in_lists.rb     | 4 ++--
 .../20171226094803_more_faster_index_on_notifications.rb    | 2 +-
 ...x_on_statuses_for_api_v1_accounts_account_id_statuses.rb | 2 +-
 db/migrate/20180617162849_remove_unused_indexes.rb          | 6 +++---
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/db/migrate/20161122163057_remove_unneeded_indexes.rb b/db/migrate/20161122163057_remove_unneeded_indexes.rb
index 7ed92127d70595..249618470381c3 100644
--- a/db/migrate/20161122163057_remove_unneeded_indexes.rb
+++ b/db/migrate/20161122163057_remove_unneeded_indexes.rb
@@ -2,8 +2,8 @@
 
 class RemoveUnneededIndexes < ActiveRecord::Migration[5.0]
   def change
-    remove_index :notifications, name: 'index_notifications_on_account_id'
-    remove_index :settings, name: 'index_settings_on_target_type_and_target_id'
-    remove_index :statuses_tags, name: 'index_statuses_tags_on_tag_id'
+    remove_index :notifications, :account_id, name: 'index_notifications_on_account_id'
+    remove_index :settings, [:target_type, :target_id], name: 'index_settings_on_target_type_and_target_id'
+    remove_index :statuses_tags, :tag_id, name: 'index_statuses_tags_on_tag_id'
   end
 end
diff --git a/db/migrate/20171129172043_add_index_on_stream_entries.rb b/db/migrate/20171129172043_add_index_on_stream_entries.rb
index c959135c22a02d..e861cdc2d1cba8 100644
--- a/db/migrate/20171129172043_add_index_on_stream_entries.rb
+++ b/db/migrate/20171129172043_add_index_on_stream_entries.rb
@@ -5,6 +5,6 @@ class AddIndexOnStreamEntries < ActiveRecord::Migration[5.2]
 
   def change
     add_index :stream_entries, [:account_id, :activity_type, :id], algorithm: :concurrently
-    remove_index :stream_entries, name: :index_stream_entries_on_account_id
+    remove_index :stream_entries, :account_id, name: :index_stream_entries_on_account_id
   end
 end
diff --git a/db/migrate/20171212195226_remove_duplicate_indexes_in_lists.rb b/db/migrate/20171212195226_remove_duplicate_indexes_in_lists.rb
index 362b1367df932d..6f51f0a0631668 100644
--- a/db/migrate/20171212195226_remove_duplicate_indexes_in_lists.rb
+++ b/db/migrate/20171212195226_remove_duplicate_indexes_in_lists.rb
@@ -2,7 +2,7 @@
 
 class RemoveDuplicateIndexesInLists < ActiveRecord::Migration[5.2]
   def change
-    remove_index :list_accounts, name: 'index_list_accounts_on_account_id'
-    remove_index :list_accounts, name: 'index_list_accounts_on_list_id'
+    remove_index :list_accounts, :account_id, name: 'index_list_accounts_on_account_id'
+    remove_index :list_accounts, :list_id, name: 'index_list_accounts_on_list_id'
   end
 end
diff --git a/db/migrate/20171226094803_more_faster_index_on_notifications.rb b/db/migrate/20171226094803_more_faster_index_on_notifications.rb
index 429eab96a1807c..b2fc040e2e24e5 100644
--- a/db/migrate/20171226094803_more_faster_index_on_notifications.rb
+++ b/db/migrate/20171226094803_more_faster_index_on_notifications.rb
@@ -5,6 +5,6 @@ class MoreFasterIndexOnNotifications < ActiveRecord::Migration[5.2]
 
   def change
     add_index :notifications, [:account_id, :id], order: { id: :desc }, algorithm: :concurrently
-    remove_index :notifications, name: :index_notifications_on_id_and_account_id_and_activity_type
+    remove_index :notifications, [:id, :account_id, :activity_type], name: :index_notifications_on_id_and_account_id_and_activity_type
   end
 end
diff --git a/db/migrate/20180106000232_add_index_on_statuses_for_api_v1_accounts_account_id_statuses.rb b/db/migrate/20180106000232_add_index_on_statuses_for_api_v1_accounts_account_id_statuses.rb
index 1531c4dd2921fd..4c3a25e838ace3 100644
--- a/db/migrate/20180106000232_add_index_on_statuses_for_api_v1_accounts_account_id_statuses.rb
+++ b/db/migrate/20180106000232_add_index_on_statuses_for_api_v1_accounts_account_id_statuses.rb
@@ -7,6 +7,6 @@ def change
     safety_assured do
       add_index :statuses, [:account_id, :id, :visibility, :updated_at], order: { id: :desc }, algorithm: :concurrently, name: :index_statuses_20180106
     end
-    remove_index :statuses, name: :index_statuses_on_account_id_id
+    remove_index :statuses, [:account_id, :id], name: :index_statuses_on_account_id_id
   end
 end
diff --git a/db/migrate/20180617162849_remove_unused_indexes.rb b/db/migrate/20180617162849_remove_unused_indexes.rb
index 14766589fde2b0..cf8faceb3ad4d3 100644
--- a/db/migrate/20180617162849_remove_unused_indexes.rb
+++ b/db/migrate/20180617162849_remove_unused_indexes.rb
@@ -2,8 +2,8 @@
 
 class RemoveUnusedIndexes < ActiveRecord::Migration[5.2]
   def change
-    remove_index :statuses, name: 'index_statuses_on_conversation_id'
-    remove_index :users, name: 'index_users_on_filtered_languages'
-    remove_index :backups, name: 'index_backups_on_user_id'
+    remove_index :statuses, :conversation_id, name: 'index_statuses_on_conversation_id'
+    remove_index :users, :filtered_languages, name: 'index_users_on_filtered_languages'
+    remove_index :backups, :user_id, name: 'index_backups_on_user_id'
   end
 end

From 490bdb7944fd2fe323494b3bbd60130673ccfa33 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 3 Sep 2024 11:34:09 -0400
Subject: [PATCH 2062/2191] Add coverage for `StatusesHelper#media_summary`
 method (#31726)

---
 spec/helpers/statuses_helper_spec.rb | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/spec/helpers/statuses_helper_spec.rb b/spec/helpers/statuses_helper_spec.rb
index b7531ec0b7a41a..66eb996f996704 100644
--- a/spec/helpers/statuses_helper_spec.rb
+++ b/spec/helpers/statuses_helper_spec.rb
@@ -23,6 +23,19 @@
     end
   end
 
+  describe '#media_summary' do
+    it 'describes the media on a status' do
+      status = Fabricate :status
+      Fabricate :media_attachment, status: status, type: :video
+      Fabricate :media_attachment, status: status, type: :audio
+      Fabricate :media_attachment, status: status, type: :image
+
+      result = helper.media_summary(status)
+
+      expect(result).to eq('Attached: 1 image · 1 video · 1 audio')
+    end
+  end
+
   describe 'fa_visibility_icon' do
     context 'with a status that is public' do
       let(:status) { Status.new(visibility: 'public') }

From e1fa456c7cfa5dc41cec21a94573bc6cb1ec60cc Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 3 Sep 2024 11:35:19 -0400
Subject: [PATCH 2063/2191] Add `have_cacheable_headers` matcher for responses
 (#31727)

---
 .../collections_controller_spec.rb            | 13 ++---
 .../activitypub/outboxes_controller_spec.rb   | 14 +++---
 .../activitypub/replies_controller_spec.rb    |  7 +--
 spec/controllers/statuses_controller_spec.rb  |  9 ++--
 spec/requests/accounts_spec.rb                | 32 ++++++------
 spec/requests/custom_stylesheets_spec.rb      |  3 +-
 spec/requests/instance_actor_spec.rb          |  3 +-
 spec/requests/manifest_spec.rb                |  3 +-
 spec/requests/tags_spec.rb                    | 13 ++---
 spec/support/examples/cache.rb                | 14 ------
 spec/support/matchers/cacheable_response.rb   | 50 +++++++++++++++++++
 11 files changed, 96 insertions(+), 65 deletions(-)
 delete mode 100644 spec/support/examples/cache.rb
 create mode 100644 spec/support/matchers/cacheable_response.rb

diff --git a/spec/controllers/activitypub/collections_controller_spec.rb b/spec/controllers/activitypub/collections_controller_spec.rb
index a5718fbd7d3c06..088027385321f7 100644
--- a/spec/controllers/activitypub/collections_controller_spec.rb
+++ b/spec/controllers/activitypub/collections_controller_spec.rb
@@ -25,10 +25,10 @@
       context 'without signature' do
         let(:remote_account) { nil }
 
-        it_behaves_like 'cacheable response'
-
         it 'returns http success and correct media type and correct items' do
-          expect(response).to have_http_status(200)
+          expect(response)
+            .to have_http_status(200)
+            .and have_cacheable_headers
           expect(response.media_type).to eq 'application/activity+json'
 
           expect(body_as_json[:orderedItems])
@@ -64,10 +64,11 @@
         let(:remote_account) { Fabricate(:account, domain: 'example.com') }
 
         context 'when getting a featured resource' do
-          it_behaves_like 'cacheable response'
-
           it 'returns http success and correct media type and expected items' do
-            expect(response).to have_http_status(200)
+            expect(response)
+              .to have_http_status(200)
+              .and have_cacheable_headers
+
             expect(response.media_type).to eq 'application/activity+json'
 
             expect(body_as_json[:orderedItems])
diff --git a/spec/controllers/activitypub/outboxes_controller_spec.rb b/spec/controllers/activitypub/outboxes_controller_spec.rb
index 3c8e8e399f6296..26a52bad93d89f 100644
--- a/spec/controllers/activitypub/outboxes_controller_spec.rb
+++ b/spec/controllers/activitypub/outboxes_controller_spec.rb
@@ -25,10 +25,11 @@
       context 'with page not requested' do
         let(:page) { nil }
 
-        it_behaves_like 'cacheable response'
-
         it 'returns http success and correct media type and headers and items count' do
-          expect(response).to have_http_status(200)
+          expect(response)
+            .to have_http_status(200)
+            .and have_cacheable_headers
+
           expect(response.media_type).to eq 'application/activity+json'
           expect(response.headers['Vary']).to be_nil
           expect(body[:totalItems]).to eq 4
@@ -59,10 +60,11 @@
       context 'with page requested' do
         let(:page) { 'true' }
 
-        it_behaves_like 'cacheable response'
-
         it 'returns http success and correct media type and vary header and items' do
-          expect(response).to have_http_status(200)
+          expect(response)
+            .to have_http_status(200)
+            .and have_cacheable_headers
+
           expect(response.media_type).to eq 'application/activity+json'
           expect(response.headers['Vary']).to include 'Signature'
 
diff --git a/spec/controllers/activitypub/replies_controller_spec.rb b/spec/controllers/activitypub/replies_controller_spec.rb
index c556e0727047c4..c10c782c9ae311 100644
--- a/spec/controllers/activitypub/replies_controller_spec.rb
+++ b/spec/controllers/activitypub/replies_controller_spec.rb
@@ -68,10 +68,11 @@
       let(:parent_visibility) { :public }
       let(:page_json) { body_as_json[:first] }
 
-      it_behaves_like 'cacheable response'
-
       it 'returns http success and correct media type' do
-        expect(response).to have_http_status(200)
+        expect(response)
+          .to have_http_status(200)
+          .and have_cacheable_headers
+
         expect(response.media_type).to eq 'application/activity+json'
       end
 
diff --git a/spec/controllers/statuses_controller_spec.rb b/spec/controllers/statuses_controller_spec.rb
index fe40ee6de172f3..084dcfaa751d69 100644
--- a/spec/controllers/statuses_controller_spec.rb
+++ b/spec/controllers/statuses_controller_spec.rb
@@ -72,13 +72,12 @@
       context 'with JSON' do
         let(:format) { 'json' }
 
-        it_behaves_like 'cacheable response', expects_vary: 'Accept, Accept-Language, Cookie'
-
         it 'renders ActivityPub Note object successfully', :aggregate_failures do
           expect(response)
             .to have_http_status(200)
+            .and have_cacheable_headers.with_vary('Accept, Accept-Language, Cookie')
+
           expect(response.headers).to include(
-            'Vary' => 'Accept, Accept-Language, Cookie',
             'Content-Type' => include('application/activity+json'),
             'Link' => satisfy { |header| header.to_s.include?('activity+json') }
           )
@@ -380,13 +379,11 @@
         context 'with JSON' do
           let(:format) { 'json' }
 
-          it_behaves_like 'cacheable response', expects_vary: 'Accept, Accept-Language, Cookie'
-
           it 'renders ActivityPub Note object successfully', :aggregate_failures do
             expect(response)
               .to have_http_status(200)
+              .and have_cacheable_headers.with_vary('Accept, Accept-Language, Cookie')
             expect(response.headers).to include(
-              'Vary' => 'Accept, Accept-Language, Cookie',
               'Content-Type' => include('application/activity+json'),
               'Link' => satisfy { |header| header.to_s.include?('activity+json') }
             )
diff --git a/spec/requests/accounts_spec.rb b/spec/requests/accounts_spec.rb
index bf067cdc38ac56..238524c75c7ec1 100644
--- a/spec/requests/accounts_spec.rb
+++ b/spec/requests/accounts_spec.rb
@@ -130,6 +130,7 @@
           it 'returns a JSON version of the account', :aggregate_failures do
             expect(response)
               .to have_http_status(200)
+              .and have_cacheable_headers.with_vary('Accept, Accept-Language, Cookie')
               .and have_attributes(
                 media_type: eq('application/activity+json')
               )
@@ -137,8 +138,6 @@
             expect(body_as_json).to include(:id, :type, :preferredUsername, :inbox, :publicKey, :name, :summary)
           end
 
-          it_behaves_like 'cacheable response', expects_vary: 'Accept, Accept-Language, Cookie'
-
           context 'with authorized fetch mode' do
             let(:authorized_fetch_mode) { true }
 
@@ -179,6 +178,7 @@
           it 'returns a JSON version of the account', :aggregate_failures do
             expect(response)
               .to have_http_status(200)
+              .and have_cacheable_headers.with_vary('Accept, Accept-Language, Cookie')
               .and have_attributes(
                 media_type: eq('application/activity+json')
               )
@@ -186,8 +186,6 @@
             expect(body_as_json).to include(:id, :type, :preferredUsername, :inbox, :publicKey, :name, :summary)
           end
 
-          it_behaves_like 'cacheable response', expects_vary: 'Accept, Accept-Language, Cookie'
-
           context 'with authorized fetch mode' do
             let(:authorized_fetch_mode) { true }
 
@@ -215,10 +213,10 @@
             get short_account_path(username: account.username, format: format)
           end
 
-          it_behaves_like 'cacheable response', expects_vary: 'Accept, Accept-Language, Cookie'
-
           it 'responds with correct statuses', :aggregate_failures do
-            expect(response).to have_http_status(200)
+            expect(response)
+              .to have_http_status(200)
+              .and have_cacheable_headers.with_vary('Accept, Accept-Language, Cookie')
             expect(response.body).to include(status_tag_for(status_media))
             expect(response.body).to include(status_tag_for(status_self_reply))
             expect(response.body).to include(status_tag_for(status))
@@ -234,10 +232,11 @@
             get short_account_with_replies_path(username: account.username, format: format)
           end
 
-          it_behaves_like 'cacheable response', expects_vary: 'Accept, Accept-Language, Cookie'
-
           it 'responds with correct statuses with replies', :aggregate_failures do
-            expect(response).to have_http_status(200)
+            expect(response)
+              .to have_http_status(200)
+              .and have_cacheable_headers.with_vary('Accept, Accept-Language, Cookie')
+
             expect(response.body).to include(status_tag_for(status_media))
             expect(response.body).to include(status_tag_for(status_reply))
             expect(response.body).to include(status_tag_for(status_self_reply))
@@ -253,10 +252,10 @@
             get short_account_media_path(username: account.username, format: format)
           end
 
-          it_behaves_like 'cacheable response', expects_vary: 'Accept, Accept-Language, Cookie'
-
           it 'responds with correct statuses with media', :aggregate_failures do
-            expect(response).to have_http_status(200)
+            expect(response)
+              .to have_http_status(200)
+              .and have_cacheable_headers.with_vary('Accept, Accept-Language, Cookie')
             expect(response.body).to include(status_tag_for(status_media))
             expect(response.body).to_not include(status_tag_for(status_direct))
             expect(response.body).to_not include(status_tag_for(status_private))
@@ -277,10 +276,11 @@
             get short_account_tag_path(username: account.username, tag: tag, format: format)
           end
 
-          it_behaves_like 'cacheable response', expects_vary: 'Accept, Accept-Language, Cookie'
-
           it 'responds with correct statuses with a tag', :aggregate_failures do
-            expect(response).to have_http_status(200)
+            expect(response)
+              .to have_http_status(200)
+              .and have_cacheable_headers.with_vary('Accept, Accept-Language, Cookie')
+
             expect(response.body).to include(status_tag_for(status_tag))
             expect(response.body).to_not include(status_tag_for(status_direct))
             expect(response.body).to_not include(status_tag_for(status_media))
diff --git a/spec/requests/custom_stylesheets_spec.rb b/spec/requests/custom_stylesheets_spec.rb
index 982511297b380f..128d173f3abb8a 100644
--- a/spec/requests/custom_stylesheets_spec.rb
+++ b/spec/requests/custom_stylesheets_spec.rb
@@ -9,11 +9,10 @@
     it 'returns http success' do
       expect(response)
         .to have_http_status(200)
+        .and have_cacheable_headers
         .and have_attributes(
           content_type: match('text/css')
         )
     end
-
-    it_behaves_like 'cacheable response'
   end
 end
diff --git a/spec/requests/instance_actor_spec.rb b/spec/requests/instance_actor_spec.rb
index 9c7ee9ff90830f..7e4784203f0cd3 100644
--- a/spec/requests/instance_actor_spec.rb
+++ b/spec/requests/instance_actor_spec.rb
@@ -17,6 +17,7 @@
       it 'returns http success with correct media type and body' do
         expect(response)
           .to have_http_status(200)
+          .and have_cacheable_headers
         expect(response.content_type)
           .to start_with('application/activity+json')
         expect(body_as_json)
@@ -32,8 +33,6 @@
             url: about_more_url(instance_actor: true)
           )
       end
-
-      it_behaves_like 'cacheable response'
     end
 
     context 'with limited federation mode disabled' do
diff --git a/spec/requests/manifest_spec.rb b/spec/requests/manifest_spec.rb
index 749c4038dfe377..55b8147d7eebaa 100644
--- a/spec/requests/manifest_spec.rb
+++ b/spec/requests/manifest_spec.rb
@@ -9,6 +9,7 @@
     it 'returns http success' do
       expect(response)
         .to have_http_status(200)
+        .and have_cacheable_headers
         .and have_attributes(
           content_type: match('application/json')
         )
@@ -18,7 +19,5 @@
           name: 'Mastodon'
         )
     end
-
-    it_behaves_like 'cacheable response'
   end
 end
diff --git a/spec/requests/tags_spec.rb b/spec/requests/tags_spec.rb
index c037bbef5ade8e..7974a6b15267b9 100644
--- a/spec/requests/tags_spec.rb
+++ b/spec/requests/tags_spec.rb
@@ -8,16 +8,15 @@
       let(:tag) { Fabricate :tag }
 
       context 'with HTML format' do
-        # TODO: Convert the cacheable response shared example into a matcher,
-        # remove this example, rely on system spec (which should use matcher)
+        # TODO: Update the have_cacheable_headers matcher to operate on capybara sessions
+        # Remove this example, rely on system spec (which should use matcher)
         before { get tag_path(tag) }
 
         it 'returns http success' do
           expect(response)
             .to have_http_status(200)
+            .and have_cacheable_headers.with_vary('Accept, Accept-Language, Cookie')
         end
-
-        it_behaves_like 'cacheable response', expects_vary: 'Accept, Accept-Language, Cookie'
       end
 
       context 'with JSON format' do
@@ -26,11 +25,10 @@
         it 'returns http success' do
           expect(response)
             .to have_http_status(200)
+            .and have_cacheable_headers.with_vary('Accept, Accept-Language, Cookie')
           expect(response.content_type)
             .to start_with('application/activity+json')
         end
-
-        it_behaves_like 'cacheable response', expects_vary: 'Accept, Accept-Language, Cookie'
       end
 
       context 'with RSS format' do
@@ -39,11 +37,10 @@
         it 'returns http success' do
           expect(response)
             .to have_http_status(200)
+            .and have_cacheable_headers.with_vary('Accept, Accept-Language, Cookie')
           expect(response.content_type)
             .to start_with('application/rss+xml')
         end
-
-        it_behaves_like 'cacheable response', expects_vary: 'Accept, Accept-Language, Cookie'
       end
     end
 
diff --git a/spec/support/examples/cache.rb b/spec/support/examples/cache.rb
deleted file mode 100644
index 60e522f4269311..00000000000000
--- a/spec/support/examples/cache.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-shared_examples 'cacheable response' do |expects_vary: false|
-  it 'sets correct cache and vary headers and does not set cookies or session', :aggregate_failures do
-    expect(response.cookies).to be_empty
-    expect(response.headers['Set-Cookies']).to be_nil
-
-    expect(session).to be_empty
-
-    expect(response.headers['Vary']).to include(expects_vary) if expects_vary
-
-    expect(response.headers['Cache-Control']).to include('public')
-  end
-end
diff --git a/spec/support/matchers/cacheable_response.rb b/spec/support/matchers/cacheable_response.rb
new file mode 100644
index 00000000000000..da8570c8c5a6a1
--- /dev/null
+++ b/spec/support/matchers/cacheable_response.rb
@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+RSpec::Matchers.define :have_cacheable_headers do
+  match do |response|
+    @response = response
+
+    @errors = [].tap do |errors|
+      errors << check_cookies
+      errors << check_cookie_headers
+      errors << check_session
+      errors << check_cache_control
+      errors << check_vary if @expected_vary.present?
+    end
+
+    @errors.compact.empty?
+  end
+
+  chain :with_vary do |string|
+    @expected_vary = string
+  end
+
+  failure_message do
+    <<~ERROR
+      Expected that the response would be cacheable but it was not:
+        - #{@errors.compact.join("\n  - ")}
+    ERROR
+  end
+
+  def check_vary
+    puts @expected_vary
+    pp @response.headers
+    "Response `Vary` header does not contain `#{@expected_vary}`" unless @response.headers['Vary'].include?(@expected_vary)
+  end
+
+  def check_cookies
+    'Reponse cookies are present' unless @response.cookies.empty?
+  end
+
+  def check_cookie_headers
+    'Response `Set-Cookies` headers are present' if @response.headers['Set-Cookies'].present?
+  end
+
+  def check_session
+    'The session is not empty' unless session.empty?
+  end
+
+  def check_cache_control
+    'The `Cache-Control` header does not contain `public`' unless @response.headers['Cache-Control'].include?('public')
+  end
+end

From 2f0d0fc127c73d74c7105441bf6dd8163b14450c Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 3 Sep 2024 11:36:59 -0400
Subject: [PATCH 2064/2191] Add coverage for `CLI::Accounts#fix_duplications`
 task (#30639)

---
 app/models/account.rb                  |  1 +
 lib/mastodon/cli/accounts.rb           |  2 +-
 spec/lib/mastodon/cli/accounts_spec.rb | 19 +++++++++++++++++++
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/app/models/account.rb b/app/models/account.rb
index 482eaa4aba9826..04095890efca77 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -145,6 +145,7 @@ class Account < ApplicationRecord
   scope :with_username, ->(value) { where arel_table[:username].lower.eq(value.to_s.downcase) }
   scope :with_domain, ->(value) { where arel_table[:domain].lower.eq(value&.to_s&.downcase) }
   scope :without_memorial, -> { where(memorial: false) }
+  scope :duplicate_uris, -> { select(:uri, Arel.star.count).group(:uri).having(Arel.star.count.gt(1)) }
 
   after_update_commit :trigger_update_webhooks
 
diff --git a/lib/mastodon/cli/accounts.rb b/lib/mastodon/cli/accounts.rb
index d3b7ebe5805709..0cdf68158fac08 100644
--- a/lib/mastodon/cli/accounts.rb
+++ b/lib/mastodon/cli/accounts.rb
@@ -252,7 +252,7 @@ def merge(from_acct, to_acct)
       domain configuration.
     LONG_DESC
     def fix_duplicates
-      Account.remote.select(:uri, 'count(*)').group(:uri).having('count(*) > 1').pluck(:uri).each do |uri|
+      Account.remote.duplicate_uris.pluck(:uri).each do |uri|
         say("Duplicates found for #{uri}")
         begin
           ActivityPub::FetchRemoteAccountService.new.call(uri) unless dry_run?
diff --git a/spec/lib/mastodon/cli/accounts_spec.rb b/spec/lib/mastodon/cli/accounts_spec.rb
index 137f85c6ca20f7..3988e0b0271836 100644
--- a/spec/lib/mastodon/cli/accounts_spec.rb
+++ b/spec/lib/mastodon/cli/accounts_spec.rb
@@ -613,6 +613,25 @@ def pending_registrations
     end
   end
 
+  describe '#fix_duplicates' do
+    let(:action) { :fix_duplicates }
+    let(:service_double) { instance_double(ActivityPub::FetchRemoteAccountService, call: nil) }
+    let(:uri) { 'https://host.example/same/value' }
+
+    context 'when there are duplicate URI accounts' do
+      before do
+        Fabricate.times(2, :account, domain: 'host.example', uri: uri)
+        allow(ActivityPub::FetchRemoteAccountService).to receive(:new).and_return(service_double)
+      end
+
+      it 'finds the duplicates and calls fetch remote account service' do
+        expect { subject }
+          .to output_results('Duplicates found')
+        expect(service_double).to have_received(:call).with(uri)
+      end
+    end
+  end
+
   describe '#backup' do
     let(:action) { :backup }
 

From 7c26e5e4a101e2784d8c627055b4caad5812015f Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 3 Sep 2024 11:37:45 -0400
Subject: [PATCH 2065/2191] Add `Reviewable` model concern (#31152)

---
 app/models/account.rb                         | 17 +-----
 app/models/concerns/reviewable.rb             | 21 ++++++++
 app/models/preview_card_provider.rb           | 17 +-----
 app/models/tag.rb                             | 18 +------
 spec/models/account_spec.rb                   |  2 +
 spec/models/preview_card_provider_spec.rb     |  2 +
 spec/models/tag_spec.rb                       |  2 +
 .../examples/models/concerns/reviewable.rb    | 54 +++++++++++++++++++
 8 files changed, 85 insertions(+), 48 deletions(-)
 create mode 100644 app/models/concerns/reviewable.rb
 create mode 100644 spec/support/examples/models/concerns/reviewable.rb

diff --git a/app/models/account.rb b/app/models/account.rb
index 04095890efca77..c20b72658bc7fd 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -89,6 +89,7 @@ class Account < ApplicationRecord
   include DomainMaterializable
   include DomainNormalizable
   include Paginable
+  include Reviewable
 
   enum :protocol, { ostatus: 0, activitypub: 1 }
   enum :suspension_origin, { local: 0, remote: 1 }, prefix: true
@@ -426,22 +427,6 @@ def synchronization_uri_prefix
     @synchronization_uri_prefix ||= "#{uri[URL_PREFIX_RE]}/"
   end
 
-  def requires_review?
-    reviewed_at.nil?
-  end
-
-  def reviewed?
-    reviewed_at.present?
-  end
-
-  def requested_review?
-    requested_review_at.present?
-  end
-
-  def requires_review_notification?
-    requires_review? && !requested_review?
-  end
-
   class << self
     def readonly_attributes
       super - %w(statuses_count following_count followers_count)
diff --git a/app/models/concerns/reviewable.rb b/app/models/concerns/reviewable.rb
new file mode 100644
index 00000000000000..1f70474b35b1fd
--- /dev/null
+++ b/app/models/concerns/reviewable.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Reviewable
+  extend ActiveSupport::Concern
+
+  def requires_review?
+    reviewed_at.nil?
+  end
+
+  def reviewed?
+    reviewed_at.present?
+  end
+
+  def requested_review?
+    requested_review_at.present?
+  end
+
+  def requires_review_notification?
+    requires_review? && !requested_review?
+  end
+end
diff --git a/app/models/preview_card_provider.rb b/app/models/preview_card_provider.rb
index 756707e3f1aed8..48944fe638467d 100644
--- a/app/models/preview_card_provider.rb
+++ b/app/models/preview_card_provider.rb
@@ -21,6 +21,7 @@ class PreviewCardProvider < ApplicationRecord
   include Paginable
   include DomainNormalizable
   include Attachmentable
+  include Reviewable
 
   ICON_MIME_TYPES = %w(image/x-icon image/vnd.microsoft.icon image/png).freeze
   LIMIT = 1.megabyte
@@ -36,22 +37,6 @@ class PreviewCardProvider < ApplicationRecord
   scope :reviewed, -> { where.not(reviewed_at: nil) }
   scope :pending_review, -> { where(reviewed_at: nil) }
 
-  def requires_review?
-    reviewed_at.nil?
-  end
-
-  def reviewed?
-    reviewed_at.present?
-  end
-
-  def requested_review?
-    requested_review_at.present?
-  end
-
-  def requires_review_notification?
-    requires_review? && !requested_review?
-  end
-
   def self.matching_domain(domain)
     segments = domain.split('.')
     where(domain: segments.map.with_index { |_, i| segments[i..].join('.') }).by_domain_length.first
diff --git a/app/models/tag.rb b/app/models/tag.rb
index 9006e1f25d9c4b..acf514919be9b7 100644
--- a/app/models/tag.rb
+++ b/app/models/tag.rb
@@ -21,6 +21,8 @@
 
 class Tag < ApplicationRecord
   include Paginable
+  include Reviewable
+
   # rubocop:disable Rails/HasAndBelongsToMany
   has_and_belongs_to_many :statuses
   has_and_belongs_to_many :accounts
@@ -97,22 +99,6 @@ def trendable
 
   alias trendable? trendable
 
-  def requires_review?
-    reviewed_at.nil?
-  end
-
-  def reviewed?
-    reviewed_at.present?
-  end
-
-  def requested_review?
-    requested_review_at.present?
-  end
-
-  def requires_review_notification?
-    requires_review? && !requested_review?
-  end
-
   def decaying?
     max_score_at && max_score_at >= Trends.tags.options[:max_score_cooldown].ago && max_score_at < 1.day.ago
   end
diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb
index 14528ed17bf00b..83f1585b612f2d 100644
--- a/spec/models/account_spec.rb
+++ b/spec/models/account_spec.rb
@@ -3,6 +3,8 @@
 require 'rails_helper'
 
 RSpec.describe Account do
+  include_examples 'Reviewable'
+
   context 'with an account record' do
     subject { Fabricate(:account) }
 
diff --git a/spec/models/preview_card_provider_spec.rb b/spec/models/preview_card_provider_spec.rb
index 7425b939462f69..8b18b3d2b71237 100644
--- a/spec/models/preview_card_provider_spec.rb
+++ b/spec/models/preview_card_provider_spec.rb
@@ -3,6 +3,8 @@
 require 'rails_helper'
 
 describe PreviewCardProvider do
+  include_examples 'Reviewable'
+
   describe 'scopes' do
     let(:trendable_and_reviewed) { Fabricate(:preview_card_provider, trendable: true, reviewed_at: 5.days.ago) }
     let(:not_trendable_and_not_reviewed) { Fabricate(:preview_card_provider, trendable: false, reviewed_at: nil) }
diff --git a/spec/models/tag_spec.rb b/spec/models/tag_spec.rb
index ff0a0551133102..18dd26be947668 100644
--- a/spec/models/tag_spec.rb
+++ b/spec/models/tag_spec.rb
@@ -3,6 +3,8 @@
 require 'rails_helper'
 
 RSpec.describe Tag do
+  include_examples 'Reviewable'
+
   describe 'validations' do
     it 'invalid with #' do
       expect(described_class.new(name: '#hello_world')).to_not be_valid
diff --git a/spec/support/examples/models/concerns/reviewable.rb b/spec/support/examples/models/concerns/reviewable.rb
new file mode 100644
index 00000000000000..562183d1ccbe6b
--- /dev/null
+++ b/spec/support/examples/models/concerns/reviewable.rb
@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+shared_examples 'Reviewable' do
+  subject { described_class.new(reviewed_at: reviewed_at, requested_review_at: requested_review_at) }
+
+  let(:reviewed_at) { nil }
+  let(:requested_review_at) { nil }
+
+  describe '#requires_review?' do
+    it { is_expected.to be_requires_review }
+
+    context 'when reviewed_at is not null' do
+      let(:reviewed_at) { 5.days.ago }
+
+      it { is_expected.to_not be_requires_review }
+    end
+  end
+
+  describe '#reviewed?' do
+    it { is_expected.to_not be_reviewed }
+
+    context 'when reviewed_at is not null' do
+      let(:reviewed_at) { 5.days.ago }
+
+      it { is_expected.to be_reviewed }
+    end
+  end
+
+  describe '#requested_review?' do
+    it { is_expected.to_not be_requested_review }
+
+    context 'when requested_reviewed_at is not null' do
+      let(:requested_review_at) { 5.days.ago }
+
+      it { is_expected.to be_requested_review }
+    end
+  end
+
+  describe '#requires_review_notification?' do
+    it { is_expected.to be_requires_review_notification }
+
+    context 'when reviewed_at is not null' do
+      let(:reviewed_at) { 5.days.ago }
+
+      it { is_expected.to_not be_requires_review_notification }
+    end
+
+    context 'when requested_reviewed_at is not null' do
+      let(:requested_review_at) { 5.days.ago }
+
+      it { is_expected.to_not be_requires_review_notification }
+    end
+  end
+end

From 69dbc2303826d4a90322892f1fdf96c5ec22a948 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 3 Sep 2024 11:38:38 -0400
Subject: [PATCH 2066/2191] Only enable chewy in search-tagged specs (#30583)

---
 spec/rails_helper.rb | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 2a602d113a8b0e..883eaec84ca196 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -55,6 +55,8 @@
 
 DatabaseCleaner.strategy = [:deletion]
 
+Chewy.settings[:enabled] = false
+
 Devise::Test::ControllerHelpers.module_eval do
   alias_method :original_sign_in, :sign_in
 
@@ -129,6 +131,12 @@ def sign_in(resource, _deprecated = nil, scope: nil)
     example.run
   end
 
+  config.around(:each, type: :search) do |example|
+    Chewy.settings[:enabled] = true
+    example.run
+    Chewy.settings[:enabled] = false
+  end
+
   config.before :each, type: :cli do
     stub_reset_connection_pools
   end

From 19849eb91d1a7f8b5700abc50cbd84181666fa2c Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 3 Sep 2024 11:39:19 -0400
Subject: [PATCH 2067/2191] Skip paperclip spoof detector unless opted into
 attachment processing specs (#31454)

---
 spec/rails_helper.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 883eaec84ca196..0b24f68f736267 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -147,7 +147,10 @@ def sign_in(resource, _deprecated = nil, scope: nil)
 
   config.before do |example|
     unless example.metadata[:attachment_processing]
-      allow_any_instance_of(Paperclip::Attachment).to receive(:post_process).and_return(true) # rubocop:disable RSpec/AnyInstance
+      # rubocop:disable RSpec/AnyInstance
+      allow_any_instance_of(Paperclip::Attachment).to receive(:post_process).and_return(true)
+      allow_any_instance_of(Paperclip::MediaTypeSpoofDetector).to receive(:spoofed?).and_return(false)
+      # rubocop:enable RSpec/AnyInstance
     end
   end
 

From 8adf67f2dbde0ae249ccadd8cbd2156e14932f52 Mon Sep 17 00:00:00 2001
From: Christian Schmidt <github@chsc.dk>
Date: Tue, 3 Sep 2024 17:55:13 +0200
Subject: [PATCH 2068/2191] `frequentlyUsedLanguages` not updated correctly
 (#31386)

---
 app/javascript/mastodon/actions/languages.js         | 12 ------------
 .../compose/components/language_dropdown.jsx         |  4 ----
 .../containers/language_dropdown_container.js        |  6 ------
 app/javascript/mastodon/reducers/settings.js         |  4 ++--
 4 files changed, 2 insertions(+), 24 deletions(-)
 delete mode 100644 app/javascript/mastodon/actions/languages.js

diff --git a/app/javascript/mastodon/actions/languages.js b/app/javascript/mastodon/actions/languages.js
deleted file mode 100644
index ad186ba0ccd3e5..00000000000000
--- a/app/javascript/mastodon/actions/languages.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import { saveSettings } from './settings';
-
-export const LANGUAGE_USE = 'LANGUAGE_USE';
-
-export const useLanguage = language => dispatch => {
-  dispatch({
-    type: LANGUAGE_USE,
-    language,
-  });
-
-  dispatch(saveSettings());
-};
diff --git a/app/javascript/mastodon/features/compose/components/language_dropdown.jsx b/app/javascript/mastodon/features/compose/components/language_dropdown.jsx
index 47e81cf134be16..b164a07cbd8771 100644
--- a/app/javascript/mastodon/features/compose/components/language_dropdown.jsx
+++ b/app/javascript/mastodon/features/compose/components/language_dropdown.jsx
@@ -240,7 +240,6 @@ class LanguageDropdown extends PureComponent {
     frequentlyUsedLanguages: PropTypes.arrayOf(PropTypes.string),
     intl: PropTypes.object.isRequired,
     onChange: PropTypes.func,
-    onClose: PropTypes.func,
   };
 
   state = {
@@ -257,14 +256,11 @@ class LanguageDropdown extends PureComponent {
   };
 
   handleClose = () => {
-    const { value, onClose } = this.props;
-
     if (this.state.open && this.activeElement) {
       this.activeElement.focus({ preventScroll: true });
     }
 
     this.setState({ open: false });
-    onClose(value);
   };
 
   handleChange = value => {
diff --git a/app/javascript/mastodon/features/compose/containers/language_dropdown_container.js b/app/javascript/mastodon/features/compose/containers/language_dropdown_container.js
index ba4b5f05a598f7..64c90afa92d9c5 100644
--- a/app/javascript/mastodon/features/compose/containers/language_dropdown_container.js
+++ b/app/javascript/mastodon/features/compose/containers/language_dropdown_container.js
@@ -4,7 +4,6 @@ import { connect } from 'react-redux';
 
 
 import { changeComposeLanguage } from 'mastodon/actions/compose';
-import { useLanguage } from 'mastodon/actions/languages';
 
 import LanguageDropdown from '../components/language_dropdown';
 
@@ -28,11 +27,6 @@ const mapDispatchToProps = dispatch => ({
     dispatch(changeComposeLanguage(value));
   },
 
-  onClose (value) {
-    // eslint-disable-next-line react-hooks/rules-of-hooks -- this is not a react hook
-    dispatch(useLanguage(value));
-  },
-
 });
 
 export default connect(mapStateToProps, mapDispatchToProps)(LanguageDropdown);
diff --git a/app/javascript/mastodon/reducers/settings.js b/app/javascript/mastodon/reducers/settings.js
index 6f55241dc1ce29..e5ff2ff9104615 100644
--- a/app/javascript/mastodon/reducers/settings.js
+++ b/app/javascript/mastodon/reducers/settings.js
@@ -1,8 +1,8 @@
 import { Map as ImmutableMap, fromJS } from 'immutable';
 
 import { COLUMN_ADD, COLUMN_REMOVE, COLUMN_MOVE, COLUMN_PARAMS_CHANGE } from '../actions/columns';
+import { COMPOSE_LANGUAGE_CHANGE } from '../actions/compose';
 import { EMOJI_USE } from '../actions/emojis';
-import { LANGUAGE_USE } from '../actions/languages';
 import { LIST_DELETE_SUCCESS, LIST_FETCH_FAIL } from '../actions/lists';
 import { NOTIFICATIONS_FILTER_SET } from '../actions/notifications';
 import { SETTING_CHANGE, SETTING_SAVE } from '../actions/settings';
@@ -175,7 +175,7 @@ export default function settings(state = initialState, action) {
     return changeColumnParams(state, action.uuid, action.path, action.value);
   case EMOJI_USE:
     return updateFrequentEmojis(state, action.emoji);
-  case LANGUAGE_USE:
+  case COMPOSE_LANGUAGE_CHANGE:
     return updateFrequentLanguages(state, action.language);
   case SETTING_SAVE:
     return state.set('saved', true);

From 8c928faff3b9de1087b5cf983fd0e575bd2181dc Mon Sep 17 00:00:00 2001
From: zunda <zundan@gmail.com>
Date: Tue, 3 Sep 2024 16:03:00 +0000
Subject: [PATCH 2069/2191] Refresh Heroku related thingy for heroku-24 stack
 (#31135)

---
 .profile |  1 -
 Aptfile  | 10 +++++-----
 Procfile |  2 +-
 app.json |  9 ++++++++-
 4 files changed, 14 insertions(+), 8 deletions(-)
 delete mode 100644 .profile

diff --git a/.profile b/.profile
deleted file mode 100644
index f4826ea30339ca..00000000000000
--- a/.profile
+++ /dev/null
@@ -1 +0,0 @@
-LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/app/.apt/lib/x86_64-linux-gnu:/app/.apt/usr/lib/x86_64-linux-gnu/mesa:/app/.apt/usr/lib/x86_64-linux-gnu/pulseaudio:/app/.apt/usr/lib/x86_64-linux-gnu/openblas-pthread
diff --git a/Aptfile b/Aptfile
index 5e033f13650b9f..06c91d4c7b034b 100644
--- a/Aptfile
+++ b/Aptfile
@@ -1,5 +1,5 @@
-ffmpeg
-libopenblas0-pthread
-libpq-dev
-libxdamage1
-libxfixes3
+libidn12
+# for idn-ruby on heroku-24 stack
+
+# use https://github.com/heroku/heroku-buildpack-activestorage-preview
+# in place for ffmpeg and its dependent packages to reduce slag size
diff --git a/Procfile b/Procfile
index d15c835b867517..f033fd36c6bd22 100644
--- a/Procfile
+++ b/Procfile
@@ -11,4 +11,4 @@ worker: bundle exec sidekiq
 #
 # and let the main app use the separate app:
 #
-# heroku config:set STREAMING_API_BASE_URL=wss://<streaming-app>.herokuapp.com -a <main-app>
+# heroku config:set STREAMING_API_BASE_URL=wss://<streaming-app-random>.herokuapp.com -a <main-app>
diff --git a/app.json b/app.json
index 4f05a64f516800..5e5a3dc1e7b802 100644
--- a/app.json
+++ b/app.json
@@ -90,9 +90,15 @@
     }
   },
   "buildpacks": [
+    {
+      "url": "https://github.com/heroku/heroku-buildpack-activestorage-preview"
+    },
     {
       "url": "https://github.com/heroku/heroku-buildpack-apt"
     },
+    {
+      "url": "heroku/nodejs"
+    },
     {
       "url": "heroku/ruby"
     }
@@ -100,5 +106,6 @@
   "scripts": {
     "postdeploy": "bundle exec rails db:migrate && bundle exec rails db:seed"
   },
-  "addons": ["heroku-postgresql", "heroku-redis"]
+  "addons": ["heroku-postgresql", "heroku-redis"],
+  "stack": "heroku-24"
 }

From c9ea91f8683cd5c0cfac14071a17e3956ac6d3b0 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 3 Sep 2024 12:10:48 -0400
Subject: [PATCH 2070/2191] Add coverage for `api/v1/annual_reports` area
 (#31730)

---
 .../generated_annual_report_fabricator.rb     |  8 +++
 spec/requests/api/v1/annual_reports_spec.rb   | 57 +++++++++++++++++++
 2 files changed, 65 insertions(+)
 create mode 100644 spec/fabricators/generated_annual_report_fabricator.rb
 create mode 100644 spec/requests/api/v1/annual_reports_spec.rb

diff --git a/spec/fabricators/generated_annual_report_fabricator.rb b/spec/fabricators/generated_annual_report_fabricator.rb
new file mode 100644
index 00000000000000..462d0cf4bcdc42
--- /dev/null
+++ b/spec/fabricators/generated_annual_report_fabricator.rb
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+Fabricator(:generated_annual_report) do
+  account { Fabricate.build(:account) }
+  data { { test: :data } }
+  schema_version { AnnualReport::SCHEMA }
+  year { sequence(:year) { |i| 2000 + i } }
+end
diff --git a/spec/requests/api/v1/annual_reports_spec.rb b/spec/requests/api/v1/annual_reports_spec.rb
new file mode 100644
index 00000000000000..60cd8ed5262eeb
--- /dev/null
+++ b/spec/requests/api/v1/annual_reports_spec.rb
@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'API V1 Annual Reports' do
+  let(:user)    { Fabricate(:user) }
+  let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+  let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
+
+  describe 'GET /api/v1/annual_reports' do
+    context 'when not authorized' do
+      it 'returns http unauthorized' do
+        get api_v1_annual_reports_path
+
+        expect(response)
+          .to have_http_status(401)
+      end
+    end
+
+    context 'with wrong scope' do
+      before do
+        get api_v1_annual_reports_path, headers: headers
+      end
+
+      it_behaves_like 'forbidden for wrong scope', 'write write:accounts'
+    end
+
+    context 'with correct scope' do
+      let(:scopes) { 'read:accounts' }
+
+      it 'returns http success' do
+        get api_v1_annual_reports_path, headers: headers
+
+        expect(response)
+          .to have_http_status(200)
+
+        expect(body_as_json)
+          .to be_present
+      end
+    end
+  end
+
+  describe 'POST /api/v1/annual_reports/:id/read' do
+    context 'with correct scope' do
+      let(:scopes) { 'write:accounts' }
+
+      it 'returns success and marks the report as read' do
+        annual_report = Fabricate :generated_annual_report, account: user.account
+
+        expect { post read_api_v1_annual_report_path(id: annual_report.year), headers: headers }
+          .to change { annual_report.reload.viewed? }.to(true)
+        expect(response)
+          .to have_http_status(200)
+      end
+    end
+  end
+end

From 663cebbe3b47942b695ad2be8b576539c8b83874 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 3 Sep 2024 13:37:09 +0200
Subject: [PATCH 2071/2191] [Glitch] Fix radio buttons styling in web UI

Port 0437dd9e770c293ec4f16d0513d1d5dd65209406 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/styles/components.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index ca841b5e47741d..26be1f866c598a 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -8112,7 +8112,7 @@ img.modal-warning {
   }
 }
 
-.radio-button.checked::before {
+.radio-button__input.checked::before {
   position: absolute;
   left: 2px;
   top: 2px;

From 8e3c47aff5327c52ce92b4821cf4bb54ece5d441 Mon Sep 17 00:00:00 2001
From: Christian Schmidt <github@chsc.dk>
Date: Tue, 3 Sep 2024 17:55:13 +0200
Subject: [PATCH 2072/2191] [Glitch] `frequentlyUsedLanguages` not updated
 correctly

Port 8adf67f2dbde0ae249ccadd8cbd2156e14932f52 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/actions/languages.js  | 12 ------------
 .../compose/components/language_dropdown.jsx         |  4 ----
 .../containers/language_dropdown_container.js        |  6 ------
 app/javascript/flavours/glitch/reducers/settings.js  |  4 ++--
 4 files changed, 2 insertions(+), 24 deletions(-)
 delete mode 100644 app/javascript/flavours/glitch/actions/languages.js

diff --git a/app/javascript/flavours/glitch/actions/languages.js b/app/javascript/flavours/glitch/actions/languages.js
deleted file mode 100644
index ad186ba0ccd3e5..00000000000000
--- a/app/javascript/flavours/glitch/actions/languages.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import { saveSettings } from './settings';
-
-export const LANGUAGE_USE = 'LANGUAGE_USE';
-
-export const useLanguage = language => dispatch => {
-  dispatch({
-    type: LANGUAGE_USE,
-    language,
-  });
-
-  dispatch(saveSettings());
-};
diff --git a/app/javascript/flavours/glitch/features/compose/components/language_dropdown.jsx b/app/javascript/flavours/glitch/features/compose/components/language_dropdown.jsx
index 1ad9e030403896..a2efa0d500aad5 100644
--- a/app/javascript/flavours/glitch/features/compose/components/language_dropdown.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/language_dropdown.jsx
@@ -240,7 +240,6 @@ class LanguageDropdown extends PureComponent {
     frequentlyUsedLanguages: PropTypes.arrayOf(PropTypes.string),
     intl: PropTypes.object.isRequired,
     onChange: PropTypes.func,
-    onClose: PropTypes.func,
   };
 
   state = {
@@ -257,14 +256,11 @@ class LanguageDropdown extends PureComponent {
   };
 
   handleClose = () => {
-    const { value, onClose } = this.props;
-
     if (this.state.open && this.activeElement) {
       this.activeElement.focus({ preventScroll: true });
     }
 
     this.setState({ open: false });
-    onClose(value);
   };
 
   handleChange = value => {
diff --git a/app/javascript/flavours/glitch/features/compose/containers/language_dropdown_container.js b/app/javascript/flavours/glitch/features/compose/containers/language_dropdown_container.js
index 9388cb0059cddf..7d1b1e8d4294cf 100644
--- a/app/javascript/flavours/glitch/features/compose/containers/language_dropdown_container.js
+++ b/app/javascript/flavours/glitch/features/compose/containers/language_dropdown_container.js
@@ -4,7 +4,6 @@ import { connect } from 'react-redux';
 
 
 import { changeComposeLanguage } from 'flavours/glitch/actions/compose';
-import { useLanguage } from 'flavours/glitch/actions/languages';
 
 import LanguageDropdown from '../components/language_dropdown';
 
@@ -28,11 +27,6 @@ const mapDispatchToProps = dispatch => ({
     dispatch(changeComposeLanguage(value));
   },
 
-  onClose (value) {
-    // eslint-disable-next-line react-hooks/rules-of-hooks -- this is not a react hook
-    dispatch(useLanguage(value));
-  },
-
 });
 
 export default connect(mapStateToProps, mapDispatchToProps)(LanguageDropdown);
diff --git a/app/javascript/flavours/glitch/reducers/settings.js b/app/javascript/flavours/glitch/reducers/settings.js
index ff4af68752b82f..660b5f11ca4b93 100644
--- a/app/javascript/flavours/glitch/reducers/settings.js
+++ b/app/javascript/flavours/glitch/reducers/settings.js
@@ -1,8 +1,8 @@
 import { Map as ImmutableMap, fromJS } from 'immutable';
 
 import { COLUMN_ADD, COLUMN_REMOVE, COLUMN_MOVE, COLUMN_PARAMS_CHANGE } from '../actions/columns';
+import { COMPOSE_LANGUAGE_CHANGE } from '../actions/compose';
 import { EMOJI_USE } from '../actions/emojis';
-import { LANGUAGE_USE } from '../actions/languages';
 import { LIST_DELETE_SUCCESS, LIST_FETCH_FAIL } from '../actions/lists';
 import { NOTIFICATIONS_FILTER_SET } from '../actions/notifications';
 import { SETTING_CHANGE, SETTING_SAVE } from '../actions/settings';
@@ -182,7 +182,7 @@ export default function settings(state = initialState, action) {
     return changeColumnParams(state, action.uuid, action.path, action.value);
   case EMOJI_USE:
     return updateFrequentEmojis(state, action.emoji);
-  case LANGUAGE_USE:
+  case COMPOSE_LANGUAGE_CHANGE:
     return updateFrequentLanguages(state, action.language);
   case SETTING_SAVE:
     return state.set('saved', true);

From f1003b256055e7eaf5d81cc95c370fc1ab82dfde Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 4 Sep 2024 01:12:25 -0400
Subject: [PATCH 2073/2191] Enable "zero monkey patching" mode in RSpec
 (#31614)

---
 spec/chewy/accounts_index_spec.rb                             | 2 +-
 spec/chewy/public_statuses_index_spec.rb                      | 2 +-
 spec/chewy/statuses_index_spec.rb                             | 2 +-
 spec/chewy/tags_index_spec.rb                                 | 2 +-
 spec/config/initializers/rack/attack_spec.rb                  | 2 +-
 spec/controllers/activitypub/claims_controller_spec.rb        | 2 +-
 spec/controllers/admin/account_actions_controller_spec.rb     | 2 +-
 spec/controllers/admin/action_logs_controller_spec.rb         | 2 +-
 spec/controllers/admin/base_controller_spec.rb                | 2 +-
 spec/controllers/admin/custom_emojis_controller_spec.rb       | 2 +-
 spec/controllers/admin/dashboard_controller_spec.rb           | 2 +-
 .../admin/follow_recommendations_controller_spec.rb           | 2 +-
 spec/controllers/admin/invites_controller_spec.rb             | 2 +-
 spec/controllers/admin/ip_blocks_controller_spec.rb           | 2 +-
 spec/controllers/admin/relationships_controller_spec.rb       | 2 +-
 spec/controllers/admin/relays_controller_spec.rb              | 2 +-
 spec/controllers/admin/report_notes_controller_spec.rb        | 2 +-
 spec/controllers/admin/reports/actions_controller_spec.rb     | 2 +-
 spec/controllers/admin/reports_controller_spec.rb             | 2 +-
 spec/controllers/admin/roles_controller_spec.rb               | 2 +-
 spec/controllers/admin/rules_controller_spec.rb               | 2 +-
 spec/controllers/admin/site_uploads_controller_spec.rb        | 2 +-
 spec/controllers/admin/statuses_controller_spec.rb            | 2 +-
 .../trends/links/preview_card_providers_controller_spec.rb    | 2 +-
 spec/controllers/admin/trends/links_controller_spec.rb        | 2 +-
 spec/controllers/admin/trends/statuses_controller_spec.rb     | 2 +-
 spec/controllers/admin/trends/tags_controller_spec.rb         | 2 +-
 spec/controllers/admin/users/roles_controller_spec.rb         | 2 +-
 .../admin/users/two_factor_authentications_controller_spec.rb | 2 +-
 spec/controllers/admin/warning_presets_controller_spec.rb     | 2 +-
 spec/controllers/admin/webhooks/secrets_controller_spec.rb    | 2 +-
 spec/controllers/admin/webhooks_controller_spec.rb            | 2 +-
 spec/controllers/api/base_controller_spec.rb                  | 2 +-
 .../controllers/api/web/push_subscriptions_controller_spec.rb | 2 +-
 spec/controllers/application_controller_spec.rb               | 2 +-
 spec/controllers/auth/challenges_controller_spec.rb           | 2 +-
 spec/controllers/auth/confirmations_controller_spec.rb        | 2 +-
 spec/controllers/auth/passwords_controller_spec.rb            | 2 +-
 spec/controllers/auth/setup_controller_spec.rb                | 2 +-
 spec/controllers/authorize_interactions_controller_spec.rb    | 2 +-
 spec/controllers/concerns/account_controller_concern_spec.rb  | 2 +-
 spec/controllers/concerns/api/error_handling_spec.rb          | 2 +-
 spec/controllers/concerns/api/rate_limit_headers_spec.rb      | 2 +-
 spec/controllers/concerns/localized_spec.rb                   | 2 +-
 .../concerns/settings/export_controller_concern_spec.rb       | 2 +-
 spec/controllers/concerns/user_tracking_concern_spec.rb       | 2 +-
 spec/controllers/filters/statuses_controller_spec.rb          | 2 +-
 spec/controllers/filters_controller_spec.rb                   | 2 +-
 spec/controllers/follower_accounts_controller_spec.rb         | 2 +-
 spec/controllers/following_accounts_controller_spec.rb        | 2 +-
 spec/controllers/invites_controller_spec.rb                   | 2 +-
 .../oauth/authorized_applications_controller_spec.rb          | 2 +-
 spec/controllers/relationships_controller_spec.rb             | 2 +-
 spec/controllers/settings/aliases_controller_spec.rb          | 2 +-
 spec/controllers/settings/applications_controller_spec.rb     | 2 +-
 spec/controllers/settings/deletes_controller_spec.rb          | 2 +-
 spec/controllers/settings/exports_controller_spec.rb          | 2 +-
 spec/controllers/settings/featured_tags_controller_spec.rb    | 2 +-
 spec/controllers/settings/login_activities_controller_spec.rb | 2 +-
 .../settings/migration/redirects_controller_spec.rb           | 2 +-
 spec/controllers/settings/migrations_controller_spec.rb       | 2 +-
 spec/controllers/settings/pictures_controller_spec.rb         | 2 +-
 .../settings/preferences/appearance_controller_spec.rb        | 2 +-
 spec/controllers/settings/preferences/base_controller_spec.rb | 2 +-
 .../settings/preferences/notifications_controller_spec.rb     | 2 +-
 .../controllers/settings/preferences/other_controller_spec.rb | 2 +-
 spec/controllers/settings/sessions_controller_spec.rb         | 2 +-
 .../confirmations_controller_spec.rb                          | 2 +-
 .../otp_authentication_controller_spec.rb                     | 2 +-
 .../recovery_codes_controller_spec.rb                         | 2 +-
 .../webauthn_credentials_controller_spec.rb                   | 2 +-
 .../two_factor_authentication_methods_controller_spec.rb      | 2 +-
 spec/controllers/statuses_controller_spec.rb                  | 2 +-
 spec/fabrication/fabricators_spec.rb                          | 2 +-
 spec/generators/post_deployment_migration_generator_spec.rb   | 2 +-
 spec/helpers/admin/dashboard_helper_spec.rb                   | 2 +-
 spec/helpers/admin/disputes_helper_spec.rb                    | 2 +-
 spec/helpers/admin/filter_helper_spec.rb                      | 2 +-
 spec/helpers/admin/trends/statuses_helper_spec.rb             | 2 +-
 spec/helpers/application_helper_spec.rb                       | 2 +-
 spec/helpers/flashes_helper_spec.rb                           | 2 +-
 spec/helpers/formatting_helper_spec.rb                        | 2 +-
 spec/helpers/instance_helper_spec.rb                          | 2 +-
 spec/helpers/json_ld_helper_spec.rb                           | 2 +-
 spec/helpers/languages_helper_spec.rb                         | 2 +-
 spec/helpers/media_component_helper_spec.rb                   | 2 +-
 spec/helpers/react_component_helper_spec.rb                   | 2 +-
 spec/helpers/settings_helper_spec.rb                          | 2 +-
 spec/helpers/statuses_helper_spec.rb                          | 2 +-
 spec/helpers/theme_helper_spec.rb                             | 2 +-
 .../metrics/dimension/instance_accounts_dimension_spec.rb     | 2 +-
 .../metrics/dimension/instance_languages_dimension_spec.rb    | 2 +-
 spec/lib/admin/metrics/dimension/languages_dimension_spec.rb  | 2 +-
 spec/lib/admin/metrics/dimension/servers_dimension_spec.rb    | 2 +-
 .../metrics/dimension/software_versions_dimension_spec.rb     | 2 +-
 spec/lib/admin/metrics/dimension/sources_dimension_spec.rb    | 2 +-
 .../lib/admin/metrics/dimension/space_usage_dimension_spec.rb | 2 +-
 .../admin/metrics/dimension/tag_languages_dimension_spec.rb   | 2 +-
 .../lib/admin/metrics/dimension/tag_servers_dimension_spec.rb | 2 +-
 spec/lib/admin/metrics/dimension_spec.rb                      | 2 +-
 spec/lib/admin/metrics/measure/active_users_measure_spec.rb   | 2 +-
 .../admin/metrics/measure/instance_accounts_measure_spec.rb   | 2 +-
 .../admin/metrics/measure/instance_followers_measure_spec.rb  | 2 +-
 .../admin/metrics/measure/instance_follows_measure_spec.rb    | 2 +-
 .../measure/instance_media_attachments_measure_spec.rb        | 2 +-
 .../admin/metrics/measure/instance_reports_measure_spec.rb    | 2 +-
 .../admin/metrics/measure/instance_statuses_measure_spec.rb   | 2 +-
 spec/lib/admin/metrics/measure/interactions_measure_spec.rb   | 2 +-
 spec/lib/admin/metrics/measure/new_users_measure_spec.rb      | 2 +-
 spec/lib/admin/metrics/measure/opened_reports_measure_spec.rb | 2 +-
 .../admin/metrics/measure/resolved_reports_measure_spec.rb    | 2 +-
 spec/lib/admin/metrics/measure/tag_accounts_measure_spec.rb   | 2 +-
 spec/lib/admin/metrics/measure/tag_servers_measure_spec.rb    | 2 +-
 spec/lib/admin/metrics/measure/tag_uses_measure_spec.rb       | 2 +-
 spec/lib/admin/metrics/measure_spec.rb                        | 2 +-
 spec/lib/admin/system_check/base_check_spec.rb                | 2 +-
 spec/lib/admin/system_check/database_schema_check_spec.rb     | 2 +-
 spec/lib/admin/system_check/elasticsearch_check_spec.rb       | 2 +-
 spec/lib/admin/system_check/media_privacy_check_spec.rb       | 2 +-
 spec/lib/admin/system_check/message_spec.rb                   | 2 +-
 spec/lib/admin/system_check/rules_check_spec.rb               | 2 +-
 spec/lib/admin/system_check/sidekiq_process_check_spec.rb     | 2 +-
 spec/lib/admin/system_check/software_version_check_spec.rb    | 2 +-
 spec/lib/admin/system_check_spec.rb                           | 2 +-
 spec/lib/annual_report_spec.rb                                | 2 +-
 spec/lib/cache_buster_spec.rb                                 | 2 +-
 spec/lib/connection_pool/shared_connection_pool_spec.rb       | 2 +-
 spec/lib/connection_pool/shared_timed_stack_spec.rb           | 2 +-
 spec/lib/content_security_policy_spec.rb                      | 2 +-
 spec/lib/delivery_failure_tracker_spec.rb                     | 2 +-
 spec/lib/extractor_spec.rb                                    | 2 +-
 spec/lib/fast_ip_map_spec.rb                                  | 2 +-
 spec/lib/hashtag_normalizer_spec.rb                           | 2 +-
 spec/lib/importer/accounts_index_importer_spec.rb             | 2 +-
 spec/lib/importer/base_importer_spec.rb                       | 2 +-
 spec/lib/importer/public_statuses_index_importer_spec.rb      | 2 +-
 spec/lib/importer/statuses_index_importer_spec.rb             | 2 +-
 spec/lib/importer/tags_index_importer_spec.rb                 | 2 +-
 spec/lib/mastodon/cli/accounts_spec.rb                        | 2 +-
 spec/lib/mastodon/cli/cache_spec.rb                           | 2 +-
 spec/lib/mastodon/cli/canonical_email_blocks_spec.rb          | 2 +-
 spec/lib/mastodon/cli/domains_spec.rb                         | 2 +-
 spec/lib/mastodon/cli/email_domain_blocks_spec.rb             | 2 +-
 spec/lib/mastodon/cli/emoji_spec.rb                           | 2 +-
 spec/lib/mastodon/cli/feeds_spec.rb                           | 2 +-
 spec/lib/mastodon/cli/ip_blocks_spec.rb                       | 2 +-
 spec/lib/mastodon/cli/main_spec.rb                            | 2 +-
 spec/lib/mastodon/cli/maintenance_spec.rb                     | 2 +-
 spec/lib/mastodon/cli/media_spec.rb                           | 2 +-
 spec/lib/mastodon/cli/preview_cards_spec.rb                   | 2 +-
 spec/lib/mastodon/cli/search_spec.rb                          | 2 +-
 spec/lib/mastodon/cli/settings_spec.rb                        | 2 +-
 spec/lib/mastodon/cli/statuses_spec.rb                        | 2 +-
 spec/lib/mastodon/cli/upgrade_spec.rb                         | 2 +-
 spec/lib/mastodon/migration_warning_spec.rb                   | 2 +-
 spec/lib/ostatus/tag_manager_spec.rb                          | 2 +-
 spec/lib/paperclip/response_with_limit_adapter_spec.rb        | 2 +-
 spec/lib/permalink_redirector_spec.rb                         | 2 +-
 spec/lib/request_pool_spec.rb                                 | 2 +-
 spec/lib/request_spec.rb                                      | 2 +-
 spec/lib/sanitize/config_spec.rb                              | 2 +-
 spec/lib/scope_transformer_spec.rb                            | 2 +-
 spec/lib/search_query_parser_spec.rb                          | 2 +-
 spec/lib/search_query_transformer_spec.rb                     | 2 +-
 spec/lib/status_cache_hydrator_spec.rb                        | 2 +-
 spec/lib/status_filter_spec.rb                                | 2 +-
 spec/lib/status_finder_spec.rb                                | 2 +-
 spec/lib/status_reach_finder_spec.rb                          | 2 +-
 spec/lib/webfinger_resource_spec.rb                           | 2 +-
 spec/lib/webhooks/payload_renderer_spec.rb                    | 2 +-
 spec/locales/i18n_spec.rb                                     | 2 +-
 spec/mailers/user_mailer_spec.rb                              | 2 +-
 spec/models/account_filter_spec.rb                            | 2 +-
 spec/models/account_warning_preset_spec.rb                    | 2 +-
 spec/models/admin/appeal_filter_spec.rb                       | 2 +-
 spec/models/admin/tag_filter_spec.rb                          | 2 +-
 spec/models/announcement_spec.rb                              | 2 +-
 spec/models/appeal_spec.rb                                    | 2 +-
 spec/models/concerns/account/counters_spec.rb                 | 2 +-
 spec/models/concerns/account/finder_concern_spec.rb           | 2 +-
 spec/models/concerns/account/interactions_spec.rb             | 2 +-
 spec/models/concerns/account/statuses_search_spec.rb          | 2 +-
 spec/models/concerns/status/threading_concern_spec.rb         | 2 +-
 spec/models/custom_emoji_category_spec.rb                     | 2 +-
 spec/models/domain_allow_spec.rb                              | 2 +-
 spec/models/export_spec.rb                                    | 2 +-
 spec/models/extended_description_spec.rb                      | 2 +-
 spec/models/form/admin_settings_spec.rb                       | 2 +-
 spec/models/form/custom_emoji_batch_spec.rb                   | 2 +-
 spec/models/form/status_filter_batch_action_spec.rb           | 2 +-
 spec/models/ip_block_spec.rb                                  | 2 +-
 spec/models/marker_spec.rb                                    | 2 +-
 spec/models/one_time_key_spec.rb                              | 2 +-
 spec/models/poll_spec.rb                                      | 2 +-
 spec/models/preview_card_provider_spec.rb                     | 2 +-
 spec/models/preview_card_spec.rb                              | 2 +-
 spec/models/privacy_policy_spec.rb                            | 2 +-
 spec/models/relationship_filter_spec.rb                       | 2 +-
 spec/models/report_filter_spec.rb                             | 2 +-
 spec/models/report_spec.rb                                    | 2 +-
 spec/models/rule_spec.rb                                      | 2 +-
 spec/models/status_edit_spec.rb                               | 2 +-
 spec/models/tag_feed_spec.rb                                  | 2 +-
 spec/policies/account_warning_preset_policy_spec.rb           | 2 +-
 spec/policies/admin/status_policy_spec.rb                     | 2 +-
 spec/policies/announcement_policy_spec.rb                     | 2 +-
 spec/policies/appeal_policy_spec.rb                           | 2 +-
 spec/policies/canonical_email_block_policy_spec.rb            | 2 +-
 spec/policies/delivery_policy_spec.rb                         | 2 +-
 spec/policies/follow_recommendation_policy_spec.rb            | 2 +-
 spec/policies/ip_block_policy_spec.rb                         | 2 +-
 spec/policies/preview_card_policy_spec.rb                     | 2 +-
 spec/policies/preview_card_provider_policy_spec.rb            | 2 +-
 spec/policies/rule_policy_spec.rb                             | 2 +-
 spec/policies/webhook_policy_spec.rb                          | 2 +-
 spec/presenters/instance_presenter_spec.rb                    | 2 +-
 spec/requests/account_show_page_spec.rb                       | 2 +-
 spec/requests/accounts_spec.rb                                | 2 +-
 spec/requests/anonymous_cookies_spec.rb                       | 2 +-
 spec/requests/api/v1/accounts/familiar_followers_spec.rb      | 2 +-
 spec/requests/api/v1/accounts/follower_accounts_spec.rb       | 2 +-
 spec/requests/api/v1/accounts/following_accounts_spec.rb      | 2 +-
 spec/requests/api/v1/accounts/identity_proofs_spec.rb         | 2 +-
 spec/requests/api/v1/accounts/lists_spec.rb                   | 2 +-
 spec/requests/api/v1/accounts/lookup_spec.rb                  | 2 +-
 spec/requests/api/v1/accounts/notes_spec.rb                   | 2 +-
 spec/requests/api/v1/accounts/pins_spec.rb                    | 2 +-
 spec/requests/api/v1/accounts/relationships_spec.rb           | 2 +-
 spec/requests/api/v1/accounts/search_spec.rb                  | 2 +-
 spec/requests/api/v1/accounts/statuses_spec.rb                | 2 +-
 spec/requests/api/v1/accounts_spec.rb                         | 2 +-
 spec/requests/api/v1/admin/dimensions_spec.rb                 | 2 +-
 spec/requests/api/v1/admin/measures_spec.rb                   | 2 +-
 spec/requests/api/v1/admin/retention_spec.rb                  | 2 +-
 spec/requests/api/v1/admin/trends/links/links_spec.rb         | 2 +-
 .../api/v1/admin/trends/links/preview_card_providers_spec.rb  | 2 +-
 spec/requests/api/v1/admin/trends/statuses_spec.rb            | 2 +-
 spec/requests/api/v1/admin/trends/tags_spec.rb                | 2 +-
 spec/requests/api/v1/annual_reports_spec.rb                   | 2 +-
 spec/requests/api/v1/apps/credentials_spec.rb                 | 2 +-
 spec/requests/api/v1/csp_spec.rb                              | 2 +-
 spec/requests/api/v1/custom_emojis_spec.rb                    | 2 +-
 spec/requests/api/v1/directories_spec.rb                      | 2 +-
 spec/requests/api/v1/endorsements_spec.rb                     | 2 +-
 spec/requests/api/v1/featured_tags/suggestions_spec.rb        | 2 +-
 spec/requests/api/v1/instance_spec.rb                         | 2 +-
 spec/requests/api/v1/instances/translation_languages_spec.rb  | 2 +-
 spec/requests/api/v1/peers/search_spec.rb                     | 2 +-
 spec/requests/api/v1/preferences_spec.rb                      | 2 +-
 spec/requests/api/v1/push/subscriptions_spec.rb               | 2 +-
 spec/requests/api/v1/scheduled_status_spec.rb                 | 2 +-
 spec/requests/api/v1/statuses/histories_spec.rb               | 2 +-
 spec/requests/api/v1/statuses/mutes_spec.rb                   | 2 +-
 spec/requests/api/v1/statuses/pins_spec.rb                    | 2 +-
 spec/requests/api/v1/statuses/reblogs_spec.rb                 | 2 +-
 spec/requests/api/v1/statuses/translations_spec.rb            | 2 +-
 spec/requests/api/v1/statuses_spec.rb                         | 2 +-
 spec/requests/api/v1/streaming_spec.rb                        | 2 +-
 spec/requests/api/v1/timelines/home_spec.rb                   | 2 +-
 spec/requests/api/v1/timelines/link_spec.rb                   | 2 +-
 spec/requests/api/v1/timelines/list_spec.rb                   | 2 +-
 spec/requests/api/v1/timelines/public_spec.rb                 | 2 +-
 spec/requests/api/v2/instance_spec.rb                         | 2 +-
 spec/requests/api/v2/search_spec.rb                           | 2 +-
 spec/requests/api/v2/suggestions_spec.rb                      | 2 +-
 spec/requests/backups_spec.rb                                 | 2 +-
 spec/requests/cache_spec.rb                                   | 2 +-
 spec/requests/catch_all_route_request_spec.rb                 | 2 +-
 spec/requests/content_security_policy_spec.rb                 | 2 +-
 spec/requests/custom_css_spec.rb                              | 2 +-
 spec/requests/custom_stylesheets_spec.rb                      | 2 +-
 spec/requests/disabled_oauth_endpoints_spec.rb                | 2 +-
 spec/requests/emojis_spec.rb                                  | 2 +-
 spec/requests/health_spec.rb                                  | 2 +-
 spec/requests/invite_spec.rb                                  | 2 +-
 spec/requests/link_headers_spec.rb                            | 2 +-
 spec/requests/localization_spec.rb                            | 2 +-
 spec/requests/log_out_spec.rb                                 | 2 +-
 spec/requests/manifest_spec.rb                                | 2 +-
 spec/requests/media_proxy_spec.rb                             | 2 +-
 spec/requests/omniauth_callbacks_spec.rb                      | 2 +-
 spec/requests/remote_interaction_helper_spec.rb               | 2 +-
 spec/requests/self_destruct_spec.rb                           | 2 +-
 spec/requests/settings/exports/blocked_accounts_spec.rb       | 2 +-
 spec/requests/settings/exports/blocked_domains_spec.rb        | 2 +-
 spec/requests/settings/exports/bookmarks_spec.rb              | 2 +-
 spec/requests/settings/exports/following_accounts_spec.rb     | 2 +-
 spec/requests/settings/exports/lists_spec.rb                  | 2 +-
 spec/requests/settings/exports/muted_accounts_spec.rb         | 2 +-
 spec/requests/signature_verification_spec.rb                  | 2 +-
 spec/requests/well_known/change_password_spec.rb              | 2 +-
 spec/requests/well_known/host_meta_spec.rb                    | 2 +-
 spec/requests/well_known/node_info_spec.rb                    | 2 +-
 spec/requests/well_known/oauth_metadata_spec.rb               | 2 +-
 spec/requests/well_known/webfinger_spec.rb                    | 2 +-
 spec/routing/accounts_routing_spec.rb                         | 2 +-
 spec/routing/api_routing_spec.rb                              | 2 +-
 spec/routing/well_known_routes_spec.rb                        | 2 +-
 spec/search/models/concerns/account/search_spec.rb            | 2 +-
 spec/search/models/concerns/account/statuses_search_spec.rb   | 2 +-
 spec/serializers/activitypub/device_serializer_spec.rb        | 2 +-
 spec/serializers/activitypub/note_serializer_spec.rb          | 2 +-
 spec/serializers/activitypub/one_time_key_serializer_spec.rb  | 2 +-
 spec/serializers/activitypub/undo_like_serializer_spec.rb     | 2 +-
 spec/serializers/activitypub/update_poll_serializer_spec.rb   | 2 +-
 spec/serializers/activitypub/vote_serializer_spec.rb          | 2 +-
 spec/serializers/rest/account_serializer_spec.rb              | 2 +-
 spec/serializers/rest/encrypted_message_serializer_spec.rb    | 2 +-
 spec/serializers/rest/instance_serializer_spec.rb             | 2 +-
 spec/serializers/rest/keys/claim_result_serializer_spec.rb    | 2 +-
 spec/serializers/rest/keys/device_serializer_spec.rb          | 2 +-
 spec/serializers/rest/keys/query_result_serializer_spec.rb    | 2 +-
 spec/serializers/rest/suggestion_serializer_spec.rb           | 2 +-
 spec/services/account_search_service_spec.rb                  | 2 +-
 spec/services/account_statuses_cleanup_service_spec.rb        | 2 +-
 spec/services/fetch_oembed_service_spec.rb                    | 2 +-
 spec/services/resolve_url_service_spec.rb                     | 2 +-
 spec/services/search_service_spec.rb                          | 2 +-
 spec/services/unblock_domain_service_spec.rb                  | 2 +-
 spec/spec_helper.rb                                           | 2 ++
 spec/support/examples/api.rb                                  | 4 ++--
 spec/support/examples/cli.rb                                  | 2 +-
 spec/support/examples/lib/admin/checks.rb                     | 2 +-
 spec/support/examples/mailers.rb                              | 2 +-
 spec/support/examples/models/concerns/account_avatar.rb       | 2 +-
 spec/support/examples/models/concerns/account_header.rb       | 2 +-
 spec/support/examples/models/concerns/reviewable.rb           | 2 +-
 spec/system/about_spec.rb                                     | 2 +-
 spec/system/admin/accounts_spec.rb                            | 2 +-
 spec/system/admin/announcements_spec.rb                       | 2 +-
 spec/system/admin/custom_emojis_spec.rb                       | 2 +-
 spec/system/admin/domain_blocks_spec.rb                       | 2 +-
 spec/system/admin/email_domain_blocks_spec.rb                 | 2 +-
 spec/system/admin/ip_blocks_spec.rb                           | 2 +-
 spec/system/admin/reset_spec.rb                               | 2 +-
 spec/system/admin/settings/about_spec.rb                      | 2 +-
 spec/system/admin/settings/appearance_spec.rb                 | 2 +-
 spec/system/admin/settings/branding_spec.rb                   | 2 +-
 spec/system/admin/settings/content_retention_spec.rb          | 2 +-
 spec/system/admin/settings/discovery_spec.rb                  | 2 +-
 spec/system/admin/settings/registrations_spec.rb              | 2 +-
 spec/system/admin/software_updates_spec.rb                    | 2 +-
 spec/system/admin/statuses_spec.rb                            | 2 +-
 spec/system/admin/trends/links/preview_card_providers_spec.rb | 2 +-
 spec/system/admin/trends/links_spec.rb                        | 2 +-
 spec/system/admin/trends/statuses_spec.rb                     | 2 +-
 spec/system/admin/trends/tags_spec.rb                         | 2 +-
 spec/system/captcha_spec.rb                                   | 2 +-
 spec/system/filters_spec.rb                                   | 2 +-
 spec/system/home_spec.rb                                      | 2 +-
 spec/system/log_in_spec.rb                                    | 2 +-
 spec/system/log_out_spec.rb                                   | 2 +-
 spec/system/new_statuses_spec.rb                              | 2 +-
 spec/system/oauth_spec.rb                                     | 2 +-
 spec/system/ocr_spec.rb                                       | 2 +-
 spec/system/privacy_spec.rb                                   | 2 +-
 spec/system/profile_spec.rb                                   | 2 +-
 spec/system/redirections_spec.rb                              | 2 +-
 spec/system/report_interface_spec.rb                          | 2 +-
 spec/system/severed_relationships_spec.rb                     | 2 +-
 spec/system/share_entrypoint_spec.rb                          | 2 +-
 spec/system/unlogged_spec.rb                                  | 2 +-
 spec/validators/email_mx_validator_spec.rb                    | 2 +-
 spec/validators/existing_username_validator_spec.rb           | 2 +-
 spec/validators/language_validator_spec.rb                    | 2 +-
 spec/validators/note_length_validator_spec.rb                 | 2 +-
 spec/validators/reaction_validator_spec.rb                    | 2 +-
 spec/validators/status_length_validator_spec.rb               | 2 +-
 spec/validators/unique_username_validator_spec.rb             | 2 +-
 spec/validators/unreserved_username_validator_spec.rb         | 2 +-
 spec/validators/url_validator_spec.rb                         | 2 +-
 spec/views/admin/trends/links/_preview_card.html.haml_spec.rb | 2 +-
 spec/views/statuses/show.html.haml_spec.rb                    | 2 +-
 spec/workers/account_refresh_worker_spec.rb                   | 2 +-
 spec/workers/activitypub/delivery_worker_spec.rb              | 2 +-
 .../workers/activitypub/distribute_poll_update_worker_spec.rb | 2 +-
 spec/workers/activitypub/distribution_worker_spec.rb          | 2 +-
 spec/workers/activitypub/fetch_replies_worker_spec.rb         | 2 +-
 spec/workers/activitypub/move_distribution_worker_spec.rb     | 2 +-
 spec/workers/activitypub/post_upgrade_worker_spec.rb          | 2 +-
 spec/workers/activitypub/processing_worker_spec.rb            | 2 +-
 .../activitypub/status_update_distribution_worker_spec.rb     | 2 +-
 .../synchronize_featured_tags_collection_worker_spec.rb       | 2 +-
 spec/workers/activitypub/update_distribution_worker_spec.rb   | 2 +-
 spec/workers/add_to_public_statuses_index_worker_spec.rb      | 2 +-
 spec/workers/admin/account_deletion_worker_spec.rb            | 2 +-
 spec/workers/admin/domain_purge_worker_spec.rb                | 2 +-
 spec/workers/admin/suspension_worker_spec.rb                  | 2 +-
 spec/workers/after_account_domain_block_worker_spec.rb        | 2 +-
 spec/workers/backup_worker_spec.rb                            | 2 +-
 spec/workers/bulk_import_worker_spec.rb                       | 2 +-
 spec/workers/cache_buster_worker_spec.rb                      | 2 +-
 spec/workers/delete_mute_worker_spec.rb                       | 2 +-
 spec/workers/domain_block_worker_spec.rb                      | 2 +-
 spec/workers/domain_clear_media_worker_spec.rb                | 2 +-
 spec/workers/feed_insert_worker_spec.rb                       | 2 +-
 spec/workers/filtered_notification_cleanup_worker_spec.rb     | 2 +-
 spec/workers/import/row_worker_spec.rb                        | 2 +-
 spec/workers/import_worker_spec.rb                            | 2 +-
 spec/workers/move_worker_spec.rb                              | 2 +-
 spec/workers/poll_expiration_notify_worker_spec.rb            | 2 +-
 spec/workers/post_process_media_worker_spec.rb                | 2 +-
 spec/workers/publish_announcement_reaction_worker_spec.rb     | 2 +-
 spec/workers/publish_scheduled_announcement_worker_spec.rb    | 2 +-
 spec/workers/publish_scheduled_status_worker_spec.rb          | 2 +-
 spec/workers/push_conversation_worker_spec.rb                 | 2 +-
 spec/workers/push_encrypted_message_worker_spec.rb            | 2 +-
 spec/workers/push_update_worker_spec.rb                       | 2 +-
 spec/workers/redownload_avatar_worker_spec.rb                 | 2 +-
 spec/workers/redownload_header_worker_spec.rb                 | 2 +-
 spec/workers/redownload_media_worker_spec.rb                  | 2 +-
 spec/workers/refollow_worker_spec.rb                          | 2 +-
 spec/workers/regeneration_worker_spec.rb                      | 2 +-
 spec/workers/removal_worker_spec.rb                           | 2 +-
 spec/workers/remove_featured_tag_worker_spec.rb               | 2 +-
 spec/workers/remove_from_public_statuses_index_worker_spec.rb | 2 +-
 spec/workers/resolve_account_worker_spec.rb                   | 2 +-
 .../scheduler/accounts_statuses_cleanup_scheduler_spec.rb     | 2 +-
 .../scheduler/auto_close_registrations_scheduler_spec.rb      | 2 +-
 .../scheduler/follow_recommendations_scheduler_spec.rb        | 2 +-
 spec/workers/scheduler/indexing_scheduler_spec.rb             | 2 +-
 spec/workers/scheduler/instance_refresh_scheduler_spec.rb     | 2 +-
 spec/workers/scheduler/ip_cleanup_scheduler_spec.rb           | 2 +-
 spec/workers/scheduler/pghero_scheduler_spec.rb               | 2 +-
 spec/workers/scheduler/scheduled_statuses_scheduler_spec.rb   | 2 +-
 spec/workers/scheduler/self_destruct_scheduler_spec.rb        | 2 +-
 .../workers/scheduler/software_update_check_scheduler_spec.rb | 2 +-
 .../scheduler/suspended_user_cleanup_scheduler_spec.rb        | 2 +-
 spec/workers/scheduler/trends/refresh_scheduler_spec.rb       | 2 +-
 .../scheduler/trends/review_notifications_scheduler_spec.rb   | 2 +-
 spec/workers/scheduler/user_cleanup_scheduler_spec.rb         | 2 +-
 spec/workers/scheduler/vacuum_scheduler_spec.rb               | 2 +-
 spec/workers/tag_unmerge_worker_spec.rb                       | 2 +-
 spec/workers/unfilter_notifications_worker_spec.rb            | 2 +-
 spec/workers/unfollow_follow_worker_spec.rb                   | 2 +-
 spec/workers/unpublish_announcement_worker_spec.rb            | 2 +-
 spec/workers/verify_account_links_worker_spec.rb              | 2 +-
 spec/workers/web/push_notification_worker_spec.rb             | 2 +-
 spec/workers/webhooks/delivery_worker_spec.rb                 | 2 +-
 439 files changed, 441 insertions(+), 439 deletions(-)

diff --git a/spec/chewy/accounts_index_spec.rb b/spec/chewy/accounts_index_spec.rb
index f9c5922c76efea..f7b5b2e249b6fa 100644
--- a/spec/chewy/accounts_index_spec.rb
+++ b/spec/chewy/accounts_index_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe AccountsIndex do
+RSpec.describe AccountsIndex do
   describe 'Searching the index' do
     before do
       mock_elasticsearch_response(described_class, raw_response)
diff --git a/spec/chewy/public_statuses_index_spec.rb b/spec/chewy/public_statuses_index_spec.rb
index 2f93d0ff025a59..6bc08832f33992 100644
--- a/spec/chewy/public_statuses_index_spec.rb
+++ b/spec/chewy/public_statuses_index_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe PublicStatusesIndex do
+RSpec.describe PublicStatusesIndex do
   describe 'Searching the index' do
     before do
       mock_elasticsearch_response(described_class, raw_response)
diff --git a/spec/chewy/statuses_index_spec.rb b/spec/chewy/statuses_index_spec.rb
index 768e9415fc1f69..e3899f3a1767a5 100644
--- a/spec/chewy/statuses_index_spec.rb
+++ b/spec/chewy/statuses_index_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe StatusesIndex do
+RSpec.describe StatusesIndex do
   describe 'Searching the index' do
     before do
       mock_elasticsearch_response(described_class, raw_response)
diff --git a/spec/chewy/tags_index_spec.rb b/spec/chewy/tags_index_spec.rb
index 054589bdfb1929..6b57da65e4d737 100644
--- a/spec/chewy/tags_index_spec.rb
+++ b/spec/chewy/tags_index_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe TagsIndex do
+RSpec.describe TagsIndex do
   describe 'Searching the index' do
     before do
       mock_elasticsearch_response(described_class, raw_response)
diff --git a/spec/config/initializers/rack/attack_spec.rb b/spec/config/initializers/rack/attack_spec.rb
index 19de4808983bc9..c7af11bea7c128 100644
--- a/spec/config/initializers/rack/attack_spec.rb
+++ b/spec/config/initializers/rack/attack_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Rack::Attack, type: :request do
+RSpec.describe Rack::Attack, type: :request do
   def app
     Rails.application
   end
diff --git a/spec/controllers/activitypub/claims_controller_spec.rb b/spec/controllers/activitypub/claims_controller_spec.rb
index f00eeb732a7af2..e887be2cbe1ae2 100644
--- a/spec/controllers/activitypub/claims_controller_spec.rb
+++ b/spec/controllers/activitypub/claims_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe ActivityPub::ClaimsController do
+RSpec.describe ActivityPub::ClaimsController do
   let(:account) { Fabricate(:account) }
 
   describe 'POST #create' do
diff --git a/spec/controllers/admin/account_actions_controller_spec.rb b/spec/controllers/admin/account_actions_controller_spec.rb
index b8dae7993935e1..d513b3d4a09261 100644
--- a/spec/controllers/admin/account_actions_controller_spec.rb
+++ b/spec/controllers/admin/account_actions_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Admin::AccountActionsController do
+RSpec.describe Admin::AccountActionsController do
   render_views
 
   let(:user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
diff --git a/spec/controllers/admin/action_logs_controller_spec.rb b/spec/controllers/admin/action_logs_controller_spec.rb
index be4222df080f87..3daf2606729fcb 100644
--- a/spec/controllers/admin/action_logs_controller_spec.rb
+++ b/spec/controllers/admin/action_logs_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Admin::ActionLogsController do
+RSpec.describe Admin::ActionLogsController do
   render_views
 
   # Action logs typically cause issues when their targets are not in the database
diff --git a/spec/controllers/admin/base_controller_spec.rb b/spec/controllers/admin/base_controller_spec.rb
index 1f1fa8441af24a..8b8b7fe63d931d 100644
--- a/spec/controllers/admin/base_controller_spec.rb
+++ b/spec/controllers/admin/base_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Admin::BaseController do
+RSpec.describe Admin::BaseController do
   controller do
     def success
       authorize :dashboard, :index?
diff --git a/spec/controllers/admin/custom_emojis_controller_spec.rb b/spec/controllers/admin/custom_emojis_controller_spec.rb
index 9e732200dd26a7..57c2a6d21b4b9f 100644
--- a/spec/controllers/admin/custom_emojis_controller_spec.rb
+++ b/spec/controllers/admin/custom_emojis_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Admin::CustomEmojisController do
+RSpec.describe Admin::CustomEmojisController do
   render_views
 
   let(:user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
diff --git a/spec/controllers/admin/dashboard_controller_spec.rb b/spec/controllers/admin/dashboard_controller_spec.rb
index 3e29ce1278583b..9177be4b6dc2cb 100644
--- a/spec/controllers/admin/dashboard_controller_spec.rb
+++ b/spec/controllers/admin/dashboard_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Admin::DashboardController do
+RSpec.describe Admin::DashboardController do
   render_views
 
   describe 'GET #index' do
diff --git a/spec/controllers/admin/follow_recommendations_controller_spec.rb b/spec/controllers/admin/follow_recommendations_controller_spec.rb
index f62aa6e4b2f030..d614f2ef43d4f0 100644
--- a/spec/controllers/admin/follow_recommendations_controller_spec.rb
+++ b/spec/controllers/admin/follow_recommendations_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Admin::FollowRecommendationsController do
+RSpec.describe Admin::FollowRecommendationsController do
   render_views
 
   let(:user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
diff --git a/spec/controllers/admin/invites_controller_spec.rb b/spec/controllers/admin/invites_controller_spec.rb
index 8638f8e2141fc1..b6471e80b2766b 100644
--- a/spec/controllers/admin/invites_controller_spec.rb
+++ b/spec/controllers/admin/invites_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Admin::InvitesController do
+RSpec.describe Admin::InvitesController do
   render_views
 
   let(:user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
diff --git a/spec/controllers/admin/ip_blocks_controller_spec.rb b/spec/controllers/admin/ip_blocks_controller_spec.rb
index 05190f13408eac..2e32db5a0118b9 100644
--- a/spec/controllers/admin/ip_blocks_controller_spec.rb
+++ b/spec/controllers/admin/ip_blocks_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Admin::IpBlocksController do
+RSpec.describe Admin::IpBlocksController do
   render_views
 
   let(:user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
diff --git a/spec/controllers/admin/relationships_controller_spec.rb b/spec/controllers/admin/relationships_controller_spec.rb
index 1099a37a3b3b31..214be7c7cd212e 100644
--- a/spec/controllers/admin/relationships_controller_spec.rb
+++ b/spec/controllers/admin/relationships_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Admin::RelationshipsController do
+RSpec.describe Admin::RelationshipsController do
   render_views
 
   let(:user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
diff --git a/spec/controllers/admin/relays_controller_spec.rb b/spec/controllers/admin/relays_controller_spec.rb
index ca351c39b2c7e8..c6251a6d764025 100644
--- a/spec/controllers/admin/relays_controller_spec.rb
+++ b/spec/controllers/admin/relays_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Admin::RelaysController do
+RSpec.describe Admin::RelaysController do
   render_views
 
   let(:user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
diff --git a/spec/controllers/admin/report_notes_controller_spec.rb b/spec/controllers/admin/report_notes_controller_spec.rb
index 8d5b5c7aecf871..423a64ebc455e1 100644
--- a/spec/controllers/admin/report_notes_controller_spec.rb
+++ b/spec/controllers/admin/report_notes_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Admin::ReportNotesController do
+RSpec.describe Admin::ReportNotesController do
   render_views
 
   let(:user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
diff --git a/spec/controllers/admin/reports/actions_controller_spec.rb b/spec/controllers/admin/reports/actions_controller_spec.rb
index 06d4b31f54e469..6185702c303811 100644
--- a/spec/controllers/admin/reports/actions_controller_spec.rb
+++ b/spec/controllers/admin/reports/actions_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Admin::Reports::ActionsController do
+RSpec.describe Admin::Reports::ActionsController do
   render_views
 
   let(:user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
diff --git a/spec/controllers/admin/reports_controller_spec.rb b/spec/controllers/admin/reports_controller_spec.rb
index 67fb28e7a57fff..d07468a37b4fa4 100644
--- a/spec/controllers/admin/reports_controller_spec.rb
+++ b/spec/controllers/admin/reports_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Admin::ReportsController do
+RSpec.describe Admin::ReportsController do
   render_views
 
   let(:user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
diff --git a/spec/controllers/admin/roles_controller_spec.rb b/spec/controllers/admin/roles_controller_spec.rb
index 223d0a472a5164..2c43a0ca870ae5 100644
--- a/spec/controllers/admin/roles_controller_spec.rb
+++ b/spec/controllers/admin/roles_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Admin::RolesController do
+RSpec.describe Admin::RolesController do
   render_views
 
   let(:permissions)  { UserRole::Flags::NONE }
diff --git a/spec/controllers/admin/rules_controller_spec.rb b/spec/controllers/admin/rules_controller_spec.rb
index 92ffb415671c3c..1b2a2010d0de77 100644
--- a/spec/controllers/admin/rules_controller_spec.rb
+++ b/spec/controllers/admin/rules_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Admin::RulesController do
+RSpec.describe Admin::RulesController do
   render_views
 
   let(:user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
diff --git a/spec/controllers/admin/site_uploads_controller_spec.rb b/spec/controllers/admin/site_uploads_controller_spec.rb
index 4ea37f396a7773..9c65c63b78e11b 100644
--- a/spec/controllers/admin/site_uploads_controller_spec.rb
+++ b/spec/controllers/admin/site_uploads_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Admin::SiteUploadsController do
+RSpec.describe Admin::SiteUploadsController do
   render_views
 
   let(:user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
diff --git a/spec/controllers/admin/statuses_controller_spec.rb b/spec/controllers/admin/statuses_controller_spec.rb
index 4ab6d109ef89b5..e6053a6e8a9cca 100644
--- a/spec/controllers/admin/statuses_controller_spec.rb
+++ b/spec/controllers/admin/statuses_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Admin::StatusesController do
+RSpec.describe Admin::StatusesController do
   render_views
 
   let(:user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
diff --git a/spec/controllers/admin/trends/links/preview_card_providers_controller_spec.rb b/spec/controllers/admin/trends/links/preview_card_providers_controller_spec.rb
index 95ed38d6b1da5e..ce62a13db6c7f2 100644
--- a/spec/controllers/admin/trends/links/preview_card_providers_controller_spec.rb
+++ b/spec/controllers/admin/trends/links/preview_card_providers_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Admin::Trends::Links::PreviewCardProvidersController do
+RSpec.describe Admin::Trends::Links::PreviewCardProvidersController do
   render_views
 
   let(:user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
diff --git a/spec/controllers/admin/trends/links_controller_spec.rb b/spec/controllers/admin/trends/links_controller_spec.rb
index 7c67f5e5aa3e41..984f3007c2db8b 100644
--- a/spec/controllers/admin/trends/links_controller_spec.rb
+++ b/spec/controllers/admin/trends/links_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Admin::Trends::LinksController do
+RSpec.describe Admin::Trends::LinksController do
   render_views
 
   let(:user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
diff --git a/spec/controllers/admin/trends/statuses_controller_spec.rb b/spec/controllers/admin/trends/statuses_controller_spec.rb
index b752234d3cd4f5..eecf4ab4f2695f 100644
--- a/spec/controllers/admin/trends/statuses_controller_spec.rb
+++ b/spec/controllers/admin/trends/statuses_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Admin::Trends::StatusesController do
+RSpec.describe Admin::Trends::StatusesController do
   render_views
 
   let(:user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
diff --git a/spec/controllers/admin/trends/tags_controller_spec.rb b/spec/controllers/admin/trends/tags_controller_spec.rb
index 4f74a55455d613..51ad1860c8aebb 100644
--- a/spec/controllers/admin/trends/tags_controller_spec.rb
+++ b/spec/controllers/admin/trends/tags_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Admin::Trends::TagsController do
+RSpec.describe Admin::Trends::TagsController do
   render_views
 
   let(:user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
diff --git a/spec/controllers/admin/users/roles_controller_spec.rb b/spec/controllers/admin/users/roles_controller_spec.rb
index 97f69a0b0a90da..bfc2bb151fa7c5 100644
--- a/spec/controllers/admin/users/roles_controller_spec.rb
+++ b/spec/controllers/admin/users/roles_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Admin::Users::RolesController do
+RSpec.describe Admin::Users::RolesController do
   render_views
 
   let(:current_role) { UserRole.create(name: 'Foo', permissions: UserRole::FLAGS[:manage_roles], position: 10) }
diff --git a/spec/controllers/admin/users/two_factor_authentications_controller_spec.rb b/spec/controllers/admin/users/two_factor_authentications_controller_spec.rb
index eb10d4796302c0..1f0a6ac34d3ecd 100644
--- a/spec/controllers/admin/users/two_factor_authentications_controller_spec.rb
+++ b/spec/controllers/admin/users/two_factor_authentications_controller_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 require 'webauthn/fake_client'
 
-describe Admin::Users::TwoFactorAuthenticationsController do
+RSpec.describe Admin::Users::TwoFactorAuthenticationsController do
   render_views
 
   let(:user) { Fabricate(:user) }
diff --git a/spec/controllers/admin/warning_presets_controller_spec.rb b/spec/controllers/admin/warning_presets_controller_spec.rb
index b32a58e990f1af..4171bbad824c8e 100644
--- a/spec/controllers/admin/warning_presets_controller_spec.rb
+++ b/spec/controllers/admin/warning_presets_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Admin::WarningPresetsController do
+RSpec.describe Admin::WarningPresetsController do
   render_views
 
   let(:user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
diff --git a/spec/controllers/admin/webhooks/secrets_controller_spec.rb b/spec/controllers/admin/webhooks/secrets_controller_spec.rb
index 291a10fba5e0ca..61ae8cdaa50bf1 100644
--- a/spec/controllers/admin/webhooks/secrets_controller_spec.rb
+++ b/spec/controllers/admin/webhooks/secrets_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Admin::Webhooks::SecretsController do
+RSpec.describe Admin::Webhooks::SecretsController do
   render_views
 
   let(:user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
diff --git a/spec/controllers/admin/webhooks_controller_spec.rb b/spec/controllers/admin/webhooks_controller_spec.rb
index 17d85060256207..4fe787c26cd470 100644
--- a/spec/controllers/admin/webhooks_controller_spec.rb
+++ b/spec/controllers/admin/webhooks_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Admin::WebhooksController do
+RSpec.describe Admin::WebhooksController do
   render_views
 
   let(:user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
diff --git a/spec/controllers/api/base_controller_spec.rb b/spec/controllers/api/base_controller_spec.rb
index 659d55f8012d0e..1e0e7c8f4dcffe 100644
--- a/spec/controllers/api/base_controller_spec.rb
+++ b/spec/controllers/api/base_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Api::BaseController do
+RSpec.describe Api::BaseController do
   controller do
     def success
       head 200
diff --git a/spec/controllers/api/web/push_subscriptions_controller_spec.rb b/spec/controllers/api/web/push_subscriptions_controller_spec.rb
index 58677841ca7785..acc03121132332 100644
--- a/spec/controllers/api/web/push_subscriptions_controller_spec.rb
+++ b/spec/controllers/api/web/push_subscriptions_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Api::Web::PushSubscriptionsController do
+RSpec.describe Api::Web::PushSubscriptionsController do
   render_views
 
   let(:user) { Fabricate(:user) }
diff --git a/spec/controllers/application_controller_spec.rb b/spec/controllers/application_controller_spec.rb
index f595e8ca19e6dc..4ee951628e7786 100644
--- a/spec/controllers/application_controller_spec.rb
+++ b/spec/controllers/application_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe ApplicationController do
+RSpec.describe ApplicationController do
   controller do
     def success
       head 200
diff --git a/spec/controllers/auth/challenges_controller_spec.rb b/spec/controllers/auth/challenges_controller_spec.rb
index 32bbedde633a94..56fdfa61b58078 100644
--- a/spec/controllers/auth/challenges_controller_spec.rb
+++ b/spec/controllers/auth/challenges_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Auth::ChallengesController do
+RSpec.describe Auth::ChallengesController do
   render_views
 
   let(:password) { 'foobar12345' }
diff --git a/spec/controllers/auth/confirmations_controller_spec.rb b/spec/controllers/auth/confirmations_controller_spec.rb
index 15403e8ea13513..a5b212e660036d 100644
--- a/spec/controllers/auth/confirmations_controller_spec.rb
+++ b/spec/controllers/auth/confirmations_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Auth::ConfirmationsController do
+RSpec.describe Auth::ConfirmationsController do
   render_views
 
   describe 'GET #new' do
diff --git a/spec/controllers/auth/passwords_controller_spec.rb b/spec/controllers/auth/passwords_controller_spec.rb
index d70490abcf15ad..9ccbb9e4942921 100644
--- a/spec/controllers/auth/passwords_controller_spec.rb
+++ b/spec/controllers/auth/passwords_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Auth::PasswordsController do
+RSpec.describe Auth::PasswordsController do
   include Devise::Test::ControllerHelpers
 
   describe 'GET #new' do
diff --git a/spec/controllers/auth/setup_controller_spec.rb b/spec/controllers/auth/setup_controller_spec.rb
index 75e42aaf96d672..28b07cb4b289e9 100644
--- a/spec/controllers/auth/setup_controller_spec.rb
+++ b/spec/controllers/auth/setup_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Auth::SetupController do
+RSpec.describe Auth::SetupController do
   render_views
 
   describe 'GET #show' do
diff --git a/spec/controllers/authorize_interactions_controller_spec.rb b/spec/controllers/authorize_interactions_controller_spec.rb
index ed55df08d9a74b..2a0422efa927cf 100644
--- a/spec/controllers/authorize_interactions_controller_spec.rb
+++ b/spec/controllers/authorize_interactions_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe AuthorizeInteractionsController do
+RSpec.describe AuthorizeInteractionsController do
   render_views
 
   describe 'GET #show' do
diff --git a/spec/controllers/concerns/account_controller_concern_spec.rb b/spec/controllers/concerns/account_controller_concern_spec.rb
index 122ef21e93039f..3eee46d7b956fc 100644
--- a/spec/controllers/concerns/account_controller_concern_spec.rb
+++ b/spec/controllers/concerns/account_controller_concern_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe AccountControllerConcern do
+RSpec.describe AccountControllerConcern do
   controller(ApplicationController) do
     include AccountControllerConcern
 
diff --git a/spec/controllers/concerns/api/error_handling_spec.rb b/spec/controllers/concerns/api/error_handling_spec.rb
index 9b36fc20a32403..eff01605d2a89a 100644
--- a/spec/controllers/concerns/api/error_handling_spec.rb
+++ b/spec/controllers/concerns/api/error_handling_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Api::ErrorHandling do
+RSpec.describe Api::ErrorHandling do
   before do
     stub_const('FakeService', Class.new)
   end
diff --git a/spec/controllers/concerns/api/rate_limit_headers_spec.rb b/spec/controllers/concerns/api/rate_limit_headers_spec.rb
index 2050de2aed4ed8..6372c94e6c2af4 100644
--- a/spec/controllers/concerns/api/rate_limit_headers_spec.rb
+++ b/spec/controllers/concerns/api/rate_limit_headers_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Api::RateLimitHeaders do
+RSpec.describe Api::RateLimitHeaders do
   controller(ApplicationController) do
     include Api::RateLimitHeaders
 
diff --git a/spec/controllers/concerns/localized_spec.rb b/spec/controllers/concerns/localized_spec.rb
index ce31e786f0a352..b1f805ae50c883 100644
--- a/spec/controllers/concerns/localized_spec.rb
+++ b/spec/controllers/concerns/localized_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Localized do
+RSpec.describe Localized do
   controller(ApplicationController) do
     include Localized
 
diff --git a/spec/controllers/concerns/settings/export_controller_concern_spec.rb b/spec/controllers/concerns/settings/export_controller_concern_spec.rb
index a19af8689ac877..2c67991e3a8251 100644
--- a/spec/controllers/concerns/settings/export_controller_concern_spec.rb
+++ b/spec/controllers/concerns/settings/export_controller_concern_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Settings::ExportControllerConcern do
+RSpec.describe Settings::ExportControllerConcern do
   controller(ApplicationController) do
     include Settings::ExportControllerConcern
 
diff --git a/spec/controllers/concerns/user_tracking_concern_spec.rb b/spec/controllers/concerns/user_tracking_concern_spec.rb
index f23d482f5f9303..cc61e285cc2e2c 100644
--- a/spec/controllers/concerns/user_tracking_concern_spec.rb
+++ b/spec/controllers/concerns/user_tracking_concern_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe UserTrackingConcern do
+RSpec.describe UserTrackingConcern do
   controller(ApplicationController) do
     include UserTrackingConcern
 
diff --git a/spec/controllers/filters/statuses_controller_spec.rb b/spec/controllers/filters/statuses_controller_spec.rb
index 2c80613302cb9e..f1fed76fca6069 100644
--- a/spec/controllers/filters/statuses_controller_spec.rb
+++ b/spec/controllers/filters/statuses_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Filters::StatusesController do
+RSpec.describe Filters::StatusesController do
   render_views
 
   describe 'GET #index' do
diff --git a/spec/controllers/filters_controller_spec.rb b/spec/controllers/filters_controller_spec.rb
index 091f714bb37cb2..de043e8ae3f996 100644
--- a/spec/controllers/filters_controller_spec.rb
+++ b/spec/controllers/filters_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe FiltersController do
+RSpec.describe FiltersController do
   render_views
 
   describe 'GET #index' do
diff --git a/spec/controllers/follower_accounts_controller_spec.rb b/spec/controllers/follower_accounts_controller_spec.rb
index dd78c96c053934..e84528d13e085e 100644
--- a/spec/controllers/follower_accounts_controller_spec.rb
+++ b/spec/controllers/follower_accounts_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe FollowerAccountsController do
+RSpec.describe FollowerAccountsController do
   render_views
 
   let(:alice) { Fabricate(:account, username: 'alice') }
diff --git a/spec/controllers/following_accounts_controller_spec.rb b/spec/controllers/following_accounts_controller_spec.rb
index 7bb78fb4204569..1e01b9f4945722 100644
--- a/spec/controllers/following_accounts_controller_spec.rb
+++ b/spec/controllers/following_accounts_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe FollowingAccountsController do
+RSpec.describe FollowingAccountsController do
   render_views
 
   let(:alice) { Fabricate(:account, username: 'alice') }
diff --git a/spec/controllers/invites_controller_spec.rb b/spec/controllers/invites_controller_spec.rb
index 5221941267fa00..192c5b00ba86e7 100644
--- a/spec/controllers/invites_controller_spec.rb
+++ b/spec/controllers/invites_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe InvitesController do
+RSpec.describe InvitesController do
   render_views
 
   let(:user) { Fabricate(:user) }
diff --git a/spec/controllers/oauth/authorized_applications_controller_spec.rb b/spec/controllers/oauth/authorized_applications_controller_spec.rb
index 3fd9f9499f4387..52d3dbde83e034 100644
--- a/spec/controllers/oauth/authorized_applications_controller_spec.rb
+++ b/spec/controllers/oauth/authorized_applications_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Oauth::AuthorizedApplicationsController do
+RSpec.describe Oauth::AuthorizedApplicationsController do
   render_views
 
   describe 'GET #index' do
diff --git a/spec/controllers/relationships_controller_spec.rb b/spec/controllers/relationships_controller_spec.rb
index 9495fc214f04ac..323fcc995de83b 100644
--- a/spec/controllers/relationships_controller_spec.rb
+++ b/spec/controllers/relationships_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe RelationshipsController do
+RSpec.describe RelationshipsController do
   render_views
 
   let(:user) { Fabricate(:user) }
diff --git a/spec/controllers/settings/aliases_controller_spec.rb b/spec/controllers/settings/aliases_controller_spec.rb
index 18e568be0be43b..4858c15298c7df 100644
--- a/spec/controllers/settings/aliases_controller_spec.rb
+++ b/spec/controllers/settings/aliases_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Settings::AliasesController do
+RSpec.describe Settings::AliasesController do
   render_views
 
   let!(:user) { Fabricate(:user) }
diff --git a/spec/controllers/settings/applications_controller_spec.rb b/spec/controllers/settings/applications_controller_spec.rb
index ce2e0749a763b8..721741bacb2272 100644
--- a/spec/controllers/settings/applications_controller_spec.rb
+++ b/spec/controllers/settings/applications_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Settings::ApplicationsController do
+RSpec.describe Settings::ApplicationsController do
   render_views
 
   let!(:user) { Fabricate(:user) }
diff --git a/spec/controllers/settings/deletes_controller_spec.rb b/spec/controllers/settings/deletes_controller_spec.rb
index 3342599bc1172e..98104b8454b782 100644
--- a/spec/controllers/settings/deletes_controller_spec.rb
+++ b/spec/controllers/settings/deletes_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Settings::DeletesController do
+RSpec.describe Settings::DeletesController do
   render_views
 
   describe 'GET #show' do
diff --git a/spec/controllers/settings/exports_controller_spec.rb b/spec/controllers/settings/exports_controller_spec.rb
index 3399f78ac58f5b..1eafabc7e50129 100644
--- a/spec/controllers/settings/exports_controller_spec.rb
+++ b/spec/controllers/settings/exports_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Settings::ExportsController do
+RSpec.describe Settings::ExportsController do
   render_views
 
   describe 'GET #show' do
diff --git a/spec/controllers/settings/featured_tags_controller_spec.rb b/spec/controllers/settings/featured_tags_controller_spec.rb
index 4e1dd52945902b..a56ae1c498cf00 100644
--- a/spec/controllers/settings/featured_tags_controller_spec.rb
+++ b/spec/controllers/settings/featured_tags_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Settings::FeaturedTagsController do
+RSpec.describe Settings::FeaturedTagsController do
   render_views
 
   shared_examples 'authenticate user' do
diff --git a/spec/controllers/settings/login_activities_controller_spec.rb b/spec/controllers/settings/login_activities_controller_spec.rb
index 294bf85c97ad26..3447620abbf8ff 100644
--- a/spec/controllers/settings/login_activities_controller_spec.rb
+++ b/spec/controllers/settings/login_activities_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Settings::LoginActivitiesController do
+RSpec.describe Settings::LoginActivitiesController do
   render_views
 
   let!(:user) { Fabricate(:user) }
diff --git a/spec/controllers/settings/migration/redirects_controller_spec.rb b/spec/controllers/settings/migration/redirects_controller_spec.rb
index b909a02668b787..d853fe8ae64249 100644
--- a/spec/controllers/settings/migration/redirects_controller_spec.rb
+++ b/spec/controllers/settings/migration/redirects_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Settings::Migration::RedirectsController do
+RSpec.describe Settings::Migration::RedirectsController do
   render_views
 
   let!(:user) { Fabricate(:user, password: 'testtest') }
diff --git a/spec/controllers/settings/migrations_controller_spec.rb b/spec/controllers/settings/migrations_controller_spec.rb
index f3340574d08be5..93c5de08990e96 100644
--- a/spec/controllers/settings/migrations_controller_spec.rb
+++ b/spec/controllers/settings/migrations_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Settings::MigrationsController do
+RSpec.describe Settings::MigrationsController do
   render_views
 
   shared_examples 'authenticate user' do
diff --git a/spec/controllers/settings/pictures_controller_spec.rb b/spec/controllers/settings/pictures_controller_spec.rb
index 705878f03da7a0..683d231ed1e433 100644
--- a/spec/controllers/settings/pictures_controller_spec.rb
+++ b/spec/controllers/settings/pictures_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Settings::PicturesController do
+RSpec.describe Settings::PicturesController do
   render_views
 
   let!(:user) { Fabricate(:user) }
diff --git a/spec/controllers/settings/preferences/appearance_controller_spec.rb b/spec/controllers/settings/preferences/appearance_controller_spec.rb
index 84b82772502fec..14f9b244ab280f 100644
--- a/spec/controllers/settings/preferences/appearance_controller_spec.rb
+++ b/spec/controllers/settings/preferences/appearance_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Settings::Preferences::AppearanceController do
+RSpec.describe Settings::Preferences::AppearanceController do
   render_views
 
   let!(:user) { Fabricate(:user) }
diff --git a/spec/controllers/settings/preferences/base_controller_spec.rb b/spec/controllers/settings/preferences/base_controller_spec.rb
index 53b3a461ed589a..75fc999a4831f8 100644
--- a/spec/controllers/settings/preferences/base_controller_spec.rb
+++ b/spec/controllers/settings/preferences/base_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Settings::Preferences::BaseController do
+RSpec.describe Settings::Preferences::BaseController do
   describe 'after_update_redirect_path' do
     it 'raises error when called' do
       expect { described_class.new.send(:after_update_redirect_path) }.to raise_error(/Override/)
diff --git a/spec/controllers/settings/preferences/notifications_controller_spec.rb b/spec/controllers/settings/preferences/notifications_controller_spec.rb
index e0f0bc55a7580d..edfdea50e066b8 100644
--- a/spec/controllers/settings/preferences/notifications_controller_spec.rb
+++ b/spec/controllers/settings/preferences/notifications_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Settings::Preferences::NotificationsController do
+RSpec.describe Settings::Preferences::NotificationsController do
   render_views
 
   let(:user) { Fabricate(:user) }
diff --git a/spec/controllers/settings/preferences/other_controller_spec.rb b/spec/controllers/settings/preferences/other_controller_spec.rb
index 61a94a41423775..117fdeea7c8bb4 100644
--- a/spec/controllers/settings/preferences/other_controller_spec.rb
+++ b/spec/controllers/settings/preferences/other_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Settings::Preferences::OtherController do
+RSpec.describe Settings::Preferences::OtherController do
   render_views
 
   let(:user) { Fabricate(:user, chosen_languages: []) }
diff --git a/spec/controllers/settings/sessions_controller_spec.rb b/spec/controllers/settings/sessions_controller_spec.rb
index a4248e1bde6f11..c098af74855bef 100644
--- a/spec/controllers/settings/sessions_controller_spec.rb
+++ b/spec/controllers/settings/sessions_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Settings::SessionsController do
+RSpec.describe Settings::SessionsController do
   render_views
 
   let(:user) { Fabricate(:user) }
diff --git a/spec/controllers/settings/two_factor_authentication/confirmations_controller_spec.rb b/spec/controllers/settings/two_factor_authentication/confirmations_controller_spec.rb
index 1c8b483a0a22e7..34eaacdf498f96 100644
--- a/spec/controllers/settings/two_factor_authentication/confirmations_controller_spec.rb
+++ b/spec/controllers/settings/two_factor_authentication/confirmations_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Settings::TwoFactorAuthentication::ConfirmationsController do
+RSpec.describe Settings::TwoFactorAuthentication::ConfirmationsController do
   render_views
 
   shared_examples 'renders :new' do
diff --git a/spec/controllers/settings/two_factor_authentication/otp_authentication_controller_spec.rb b/spec/controllers/settings/two_factor_authentication/otp_authentication_controller_spec.rb
index 007df87d954c75..a03c4a4adb2442 100644
--- a/spec/controllers/settings/two_factor_authentication/otp_authentication_controller_spec.rb
+++ b/spec/controllers/settings/two_factor_authentication/otp_authentication_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Settings::TwoFactorAuthentication::OtpAuthenticationController do
+RSpec.describe Settings::TwoFactorAuthentication::OtpAuthenticationController do
   render_views
 
   let(:user) { Fabricate(:user) }
diff --git a/spec/controllers/settings/two_factor_authentication/recovery_codes_controller_spec.rb b/spec/controllers/settings/two_factor_authentication/recovery_codes_controller_spec.rb
index dbc2e3059ce2c9..0defc52cde92db 100644
--- a/spec/controllers/settings/two_factor_authentication/recovery_codes_controller_spec.rb
+++ b/spec/controllers/settings/two_factor_authentication/recovery_codes_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Settings::TwoFactorAuthentication::RecoveryCodesController do
+RSpec.describe Settings::TwoFactorAuthentication::RecoveryCodesController do
   render_views
 
   describe 'POST #create' do
diff --git a/spec/controllers/settings/two_factor_authentication/webauthn_credentials_controller_spec.rb b/spec/controllers/settings/two_factor_authentication/webauthn_credentials_controller_spec.rb
index 41a3ba5eb5bbf5..cccf3c51d321b1 100644
--- a/spec/controllers/settings/two_factor_authentication/webauthn_credentials_controller_spec.rb
+++ b/spec/controllers/settings/two_factor_authentication/webauthn_credentials_controller_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 require 'webauthn/fake_client'
 
-describe Settings::TwoFactorAuthentication::WebauthnCredentialsController do
+RSpec.describe Settings::TwoFactorAuthentication::WebauthnCredentialsController do
   render_views
 
   let(:user) { Fabricate(:user) }
diff --git a/spec/controllers/settings/two_factor_authentication_methods_controller_spec.rb b/spec/controllers/settings/two_factor_authentication_methods_controller_spec.rb
index de0d28463bb2aa..c55f113d4d2d3e 100644
--- a/spec/controllers/settings/two_factor_authentication_methods_controller_spec.rb
+++ b/spec/controllers/settings/two_factor_authentication_methods_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Settings::TwoFactorAuthenticationMethodsController do
+RSpec.describe Settings::TwoFactorAuthenticationMethodsController do
   render_views
 
   context 'when not signed in' do
diff --git a/spec/controllers/statuses_controller_spec.rb b/spec/controllers/statuses_controller_spec.rb
index 084dcfaa751d69..289109a1fab450 100644
--- a/spec/controllers/statuses_controller_spec.rb
+++ b/spec/controllers/statuses_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe StatusesController do
+RSpec.describe StatusesController do
   render_views
 
   describe 'GET #show' do
diff --git a/spec/fabrication/fabricators_spec.rb b/spec/fabrication/fabricators_spec.rb
index 2cf45041a4a80d..f7bb504543d239 100644
--- a/spec/fabrication/fabricators_spec.rb
+++ b/spec/fabrication/fabricators_spec.rb
@@ -5,7 +5,7 @@
 Fabrication.manager.load_definitions if Fabrication.manager.empty?
 
 Fabrication.manager.schematics.map(&:first).each do |factory_name|
-  describe "The #{factory_name} factory" do
+  RSpec.describe "The #{factory_name} factory" do
     it 'is able to create valid records' do
       records = Fabricate.times(2, factory_name) # Create multiple of each to uncover uniqueness issues
       expect(records).to all(be_valid)
diff --git a/spec/generators/post_deployment_migration_generator_spec.rb b/spec/generators/post_deployment_migration_generator_spec.rb
index 55e70a7917032c..1aa8e0915c3d7a 100644
--- a/spec/generators/post_deployment_migration_generator_spec.rb
+++ b/spec/generators/post_deployment_migration_generator_spec.rb
@@ -6,7 +6,7 @@
 
 require 'generators/post_deployment_migration/post_deployment_migration_generator'
 
-describe PostDeploymentMigrationGenerator, type: :generator do
+RSpec.describe PostDeploymentMigrationGenerator, type: :generator do
   include Rails::Generators::Testing::Behavior
   include Rails::Generators::Testing::Assertions
   include FileUtils
diff --git a/spec/helpers/admin/dashboard_helper_spec.rb b/spec/helpers/admin/dashboard_helper_spec.rb
index 59062e48396b9d..9c674fb4b9664d 100644
--- a/spec/helpers/admin/dashboard_helper_spec.rb
+++ b/spec/helpers/admin/dashboard_helper_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Admin::DashboardHelper do
+RSpec.describe Admin::DashboardHelper do
   describe 'relevant_account_timestamp' do
     context 'with an account with older sign in' do
       let(:account) { Fabricate(:account) }
diff --git a/spec/helpers/admin/disputes_helper_spec.rb b/spec/helpers/admin/disputes_helper_spec.rb
index 5f9a85df869140..a6ac021bd491bb 100644
--- a/spec/helpers/admin/disputes_helper_spec.rb
+++ b/spec/helpers/admin/disputes_helper_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Admin::DisputesHelper do
+RSpec.describe Admin::DisputesHelper do
   describe 'strike_action_label' do
     it 'returns html describing the appeal' do
       adam = Account.new(username: 'Adam')
diff --git a/spec/helpers/admin/filter_helper_spec.rb b/spec/helpers/admin/filter_helper_spec.rb
index 40ed63239f03a7..d07a6e1bb756c4 100644
--- a/spec/helpers/admin/filter_helper_spec.rb
+++ b/spec/helpers/admin/filter_helper_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Admin::FilterHelper do
+RSpec.describe Admin::FilterHelper do
   it 'Uses filter_link_to to create filter links' do
     params = ActionController::Parameters.new(
       { test: 'test' }
diff --git a/spec/helpers/admin/trends/statuses_helper_spec.rb b/spec/helpers/admin/trends/statuses_helper_spec.rb
index 92caae6909960e..fa5c337e973643 100644
--- a/spec/helpers/admin/trends/statuses_helper_spec.rb
+++ b/spec/helpers/admin/trends/statuses_helper_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Admin::Trends::StatusesHelper do
+RSpec.describe Admin::Trends::StatusesHelper do
   describe '.one_line_preview' do
     before do
       allow(helper).to receive(:current_user).and_return(Fabricate.build(:user))
diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
index 0bfce6946b1a87..c2e618c7def033 100644
--- a/spec/helpers/application_helper_spec.rb
+++ b/spec/helpers/application_helper_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe ApplicationHelper do
+RSpec.describe ApplicationHelper do
   describe 'body_classes' do
     context 'with a body class string from a controller' do
       before { helper.extend controller_helpers }
diff --git a/spec/helpers/flashes_helper_spec.rb b/spec/helpers/flashes_helper_spec.rb
index a6a3b062d7ef28..aaef7ab1443e74 100644
--- a/spec/helpers/flashes_helper_spec.rb
+++ b/spec/helpers/flashes_helper_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe FlashesHelper do
+RSpec.describe FlashesHelper do
   describe 'user_facing_flashes' do
     before do
       # rubocop:disable Rails/I18nLocaleTexts
diff --git a/spec/helpers/formatting_helper_spec.rb b/spec/helpers/formatting_helper_spec.rb
index d6e7631f66c1ee..136a609b1c9cf4 100644
--- a/spec/helpers/formatting_helper_spec.rb
+++ b/spec/helpers/formatting_helper_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe FormattingHelper do
+RSpec.describe FormattingHelper do
   include Devise::Test::ControllerHelpers
 
   describe '#rss_status_content_format' do
diff --git a/spec/helpers/instance_helper_spec.rb b/spec/helpers/instance_helper_spec.rb
index 9a2d8841586e31..e7b15e6513cc7c 100644
--- a/spec/helpers/instance_helper_spec.rb
+++ b/spec/helpers/instance_helper_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe InstanceHelper do
+RSpec.describe InstanceHelper do
   describe 'site_title' do
     it 'Uses the Setting.site_title value when it exists' do
       Setting.site_title = 'New site title'
diff --git a/spec/helpers/json_ld_helper_spec.rb b/spec/helpers/json_ld_helper_spec.rb
index f4b849d7a12b8c..d76c5167a7d9a3 100644
--- a/spec/helpers/json_ld_helper_spec.rb
+++ b/spec/helpers/json_ld_helper_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe JsonLdHelper do
+RSpec.describe JsonLdHelper do
   describe '#equals_or_includes?' do
     it 'returns true when value equals' do
       expect(helper.equals_or_includes?('foo', 'foo')).to be true
diff --git a/spec/helpers/languages_helper_spec.rb b/spec/helpers/languages_helper_spec.rb
index 99461b293ba6f9..dd9b6004d1cf5b 100644
--- a/spec/helpers/languages_helper_spec.rb
+++ b/spec/helpers/languages_helper_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe LanguagesHelper do
+RSpec.describe LanguagesHelper do
   describe 'the SUPPORTED_LOCALES constant' do
     it 'includes all i18n locales' do
       expect(Set.new(described_class::SUPPORTED_LOCALES.keys + described_class::REGIONAL_LOCALE_NAMES.keys)).to include(*I18n.available_locales)
diff --git a/spec/helpers/media_component_helper_spec.rb b/spec/helpers/media_component_helper_spec.rb
index af5d92769ca249..ec87a707cb6e8e 100644
--- a/spec/helpers/media_component_helper_spec.rb
+++ b/spec/helpers/media_component_helper_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe MediaComponentHelper do
+RSpec.describe MediaComponentHelper do
   before { helper.extend controller_helpers }
 
   describe 'render_video_component' do
diff --git a/spec/helpers/react_component_helper_spec.rb b/spec/helpers/react_component_helper_spec.rb
index 28208b619bae0f..202694fbe4d8b0 100644
--- a/spec/helpers/react_component_helper_spec.rb
+++ b/spec/helpers/react_component_helper_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe ReactComponentHelper do
+RSpec.describe ReactComponentHelper do
   describe 'react_component' do
     context 'with no block passed in' do
       let(:result) { helper.react_component('name', { one: :two }) }
diff --git a/spec/helpers/settings_helper_spec.rb b/spec/helpers/settings_helper_spec.rb
index ca447d8ce12633..ecff2edbfa159d 100644
--- a/spec/helpers/settings_helper_spec.rb
+++ b/spec/helpers/settings_helper_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe SettingsHelper do
+RSpec.describe SettingsHelper do
   describe 'session_device_icon' do
     context 'with a mobile device' do
       let(:session) { SessionActivation.new(user_agent: 'Mozilla/5.0 (iPhone)') }
diff --git a/spec/helpers/statuses_helper_spec.rb b/spec/helpers/statuses_helper_spec.rb
index 66eb996f996704..8809d0afaeb303 100644
--- a/spec/helpers/statuses_helper_spec.rb
+++ b/spec/helpers/statuses_helper_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe StatusesHelper do
+RSpec.describe StatusesHelper do
   describe 'status_text_summary' do
     context 'with blank text' do
       let(:status) { Status.new(spoiler_text: '') }
diff --git a/spec/helpers/theme_helper_spec.rb b/spec/helpers/theme_helper_spec.rb
index c0b6380a1f2b91..7663e59436d9a4 100644
--- a/spec/helpers/theme_helper_spec.rb
+++ b/spec/helpers/theme_helper_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe ThemeHelper do
+RSpec.describe ThemeHelper do
   describe 'theme_style_tags' do
     let(:result) { helper.theme_style_tags(theme) }
 
diff --git a/spec/lib/admin/metrics/dimension/instance_accounts_dimension_spec.rb b/spec/lib/admin/metrics/dimension/instance_accounts_dimension_spec.rb
index 2b14e6956c8d6c..c8683afda9e222 100644
--- a/spec/lib/admin/metrics/dimension/instance_accounts_dimension_spec.rb
+++ b/spec/lib/admin/metrics/dimension/instance_accounts_dimension_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Admin::Metrics::Dimension::InstanceAccountsDimension do
+RSpec.describe Admin::Metrics::Dimension::InstanceAccountsDimension do
   subject { described_class.new(start_at, end_at, limit, params) }
 
   let(:start_at) { 2.days.ago }
diff --git a/spec/lib/admin/metrics/dimension/instance_languages_dimension_spec.rb b/spec/lib/admin/metrics/dimension/instance_languages_dimension_spec.rb
index e4e9fbe2b7b0a8..c633041f9d40d8 100644
--- a/spec/lib/admin/metrics/dimension/instance_languages_dimension_spec.rb
+++ b/spec/lib/admin/metrics/dimension/instance_languages_dimension_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Admin::Metrics::Dimension::InstanceLanguagesDimension do
+RSpec.describe Admin::Metrics::Dimension::InstanceLanguagesDimension do
   subject { described_class.new(start_at, end_at, limit, params) }
 
   let(:start_at) { 2.days.ago }
diff --git a/spec/lib/admin/metrics/dimension/languages_dimension_spec.rb b/spec/lib/admin/metrics/dimension/languages_dimension_spec.rb
index 9d8097069390cc..801b3d84dfc8cc 100644
--- a/spec/lib/admin/metrics/dimension/languages_dimension_spec.rb
+++ b/spec/lib/admin/metrics/dimension/languages_dimension_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Admin::Metrics::Dimension::LanguagesDimension do
+RSpec.describe Admin::Metrics::Dimension::LanguagesDimension do
   subject { described_class.new(start_at, end_at, limit, params) }
 
   let(:start_at) { 2.days.ago }
diff --git a/spec/lib/admin/metrics/dimension/servers_dimension_spec.rb b/spec/lib/admin/metrics/dimension/servers_dimension_spec.rb
index 5661441d5d0c0f..d86ccd099a1af9 100644
--- a/spec/lib/admin/metrics/dimension/servers_dimension_spec.rb
+++ b/spec/lib/admin/metrics/dimension/servers_dimension_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Admin::Metrics::Dimension::ServersDimension do
+RSpec.describe Admin::Metrics::Dimension::ServersDimension do
   subject { described_class.new(start_at, end_at, limit, params) }
 
   let(:start_at) { 2.days.ago }
diff --git a/spec/lib/admin/metrics/dimension/software_versions_dimension_spec.rb b/spec/lib/admin/metrics/dimension/software_versions_dimension_spec.rb
index 5d31121ab3bd10..5b0fb902e015a9 100644
--- a/spec/lib/admin/metrics/dimension/software_versions_dimension_spec.rb
+++ b/spec/lib/admin/metrics/dimension/software_versions_dimension_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Admin::Metrics::Dimension::SoftwareVersionsDimension do
+RSpec.describe Admin::Metrics::Dimension::SoftwareVersionsDimension do
   subject { described_class.new(start_at, end_at, limit, params) }
 
   let(:start_at) { 2.days.ago }
diff --git a/spec/lib/admin/metrics/dimension/sources_dimension_spec.rb b/spec/lib/admin/metrics/dimension/sources_dimension_spec.rb
index 5fa5aa8af51730..ca7f716afd3e92 100644
--- a/spec/lib/admin/metrics/dimension/sources_dimension_spec.rb
+++ b/spec/lib/admin/metrics/dimension/sources_dimension_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Admin::Metrics::Dimension::SourcesDimension do
+RSpec.describe Admin::Metrics::Dimension::SourcesDimension do
   subject { described_class.new(start_at, end_at, limit, params) }
 
   let(:start_at) { 2.days.ago }
diff --git a/spec/lib/admin/metrics/dimension/space_usage_dimension_spec.rb b/spec/lib/admin/metrics/dimension/space_usage_dimension_spec.rb
index 96ff9c66dc7f55..4be5ed30ee1663 100644
--- a/spec/lib/admin/metrics/dimension/space_usage_dimension_spec.rb
+++ b/spec/lib/admin/metrics/dimension/space_usage_dimension_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Admin::Metrics::Dimension::SpaceUsageDimension do
+RSpec.describe Admin::Metrics::Dimension::SpaceUsageDimension do
   subject { described_class.new(start_at, end_at, limit, params) }
 
   let(:start_at) { 2.days.ago }
diff --git a/spec/lib/admin/metrics/dimension/tag_languages_dimension_spec.rb b/spec/lib/admin/metrics/dimension/tag_languages_dimension_spec.rb
index c1dfd0eaf4eb2e..166edf92b0aac4 100644
--- a/spec/lib/admin/metrics/dimension/tag_languages_dimension_spec.rb
+++ b/spec/lib/admin/metrics/dimension/tag_languages_dimension_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Admin::Metrics::Dimension::TagLanguagesDimension do
+RSpec.describe Admin::Metrics::Dimension::TagLanguagesDimension do
   subject { described_class.new(start_at, end_at, limit, params) }
 
   let(:start_at) { 2.days.ago }
diff --git a/spec/lib/admin/metrics/dimension/tag_servers_dimension_spec.rb b/spec/lib/admin/metrics/dimension/tag_servers_dimension_spec.rb
index 025cf1b7ec7870..7391b5545624b5 100644
--- a/spec/lib/admin/metrics/dimension/tag_servers_dimension_spec.rb
+++ b/spec/lib/admin/metrics/dimension/tag_servers_dimension_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Admin::Metrics::Dimension::TagServersDimension do
+RSpec.describe Admin::Metrics::Dimension::TagServersDimension do
   subject { described_class.new(start_at, end_at, limit, params) }
 
   let(:start_at) { 2.days.ago }
diff --git a/spec/lib/admin/metrics/dimension_spec.rb b/spec/lib/admin/metrics/dimension_spec.rb
index 109250b72b73ff..0a52d442be92f2 100644
--- a/spec/lib/admin/metrics/dimension_spec.rb
+++ b/spec/lib/admin/metrics/dimension_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Admin::Metrics::Dimension do
+RSpec.describe Admin::Metrics::Dimension do
   describe '.retrieve' do
     subject { described_class.retrieve(reports, start_at, end_at, 5, params) }
 
diff --git a/spec/lib/admin/metrics/measure/active_users_measure_spec.rb b/spec/lib/admin/metrics/measure/active_users_measure_spec.rb
index 38ee14075b3e38..653e677354b8be 100644
--- a/spec/lib/admin/metrics/measure/active_users_measure_spec.rb
+++ b/spec/lib/admin/metrics/measure/active_users_measure_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Admin::Metrics::Measure::ActiveUsersMeasure do
+RSpec.describe Admin::Metrics::Measure::ActiveUsersMeasure do
   subject { described_class.new(start_at, end_at, params) }
 
   let(:start_at) { 2.days.ago }
diff --git a/spec/lib/admin/metrics/measure/instance_accounts_measure_spec.rb b/spec/lib/admin/metrics/measure/instance_accounts_measure_spec.rb
index 0d2ad31c399a45..f974f2ca462d25 100644
--- a/spec/lib/admin/metrics/measure/instance_accounts_measure_spec.rb
+++ b/spec/lib/admin/metrics/measure/instance_accounts_measure_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Admin::Metrics::Measure::InstanceAccountsMeasure do
+RSpec.describe Admin::Metrics::Measure::InstanceAccountsMeasure do
   subject { described_class.new(start_at, end_at, params) }
 
   let(:domain) { 'example.com' }
diff --git a/spec/lib/admin/metrics/measure/instance_followers_measure_spec.rb b/spec/lib/admin/metrics/measure/instance_followers_measure_spec.rb
index 27bf30d17d5f49..643249fa4e23d2 100644
--- a/spec/lib/admin/metrics/measure/instance_followers_measure_spec.rb
+++ b/spec/lib/admin/metrics/measure/instance_followers_measure_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Admin::Metrics::Measure::InstanceFollowersMeasure do
+RSpec.describe Admin::Metrics::Measure::InstanceFollowersMeasure do
   subject { described_class.new(start_at, end_at, params) }
 
   let(:domain) { 'example.com' }
diff --git a/spec/lib/admin/metrics/measure/instance_follows_measure_spec.rb b/spec/lib/admin/metrics/measure/instance_follows_measure_spec.rb
index 9961ea56c42b1d..70f5004fefc277 100644
--- a/spec/lib/admin/metrics/measure/instance_follows_measure_spec.rb
+++ b/spec/lib/admin/metrics/measure/instance_follows_measure_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Admin::Metrics::Measure::InstanceFollowsMeasure do
+RSpec.describe Admin::Metrics::Measure::InstanceFollowsMeasure do
   subject { described_class.new(start_at, end_at, params) }
 
   let(:domain) { 'example.com' }
diff --git a/spec/lib/admin/metrics/measure/instance_media_attachments_measure_spec.rb b/spec/lib/admin/metrics/measure/instance_media_attachments_measure_spec.rb
index 3634450930656b..11f13b85bc17fa 100644
--- a/spec/lib/admin/metrics/measure/instance_media_attachments_measure_spec.rb
+++ b/spec/lib/admin/metrics/measure/instance_media_attachments_measure_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Admin::Metrics::Measure::InstanceMediaAttachmentsMeasure do
+RSpec.describe Admin::Metrics::Measure::InstanceMediaAttachmentsMeasure do
   subject { described_class.new(start_at, end_at, params) }
 
   let(:domain) { 'example.com' }
diff --git a/spec/lib/admin/metrics/measure/instance_reports_measure_spec.rb b/spec/lib/admin/metrics/measure/instance_reports_measure_spec.rb
index ca64049d9265bd..62c9dec464434c 100644
--- a/spec/lib/admin/metrics/measure/instance_reports_measure_spec.rb
+++ b/spec/lib/admin/metrics/measure/instance_reports_measure_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Admin::Metrics::Measure::InstanceReportsMeasure do
+RSpec.describe Admin::Metrics::Measure::InstanceReportsMeasure do
   subject { described_class.new(start_at, end_at, params) }
 
   let(:domain) { 'example.com' }
diff --git a/spec/lib/admin/metrics/measure/instance_statuses_measure_spec.rb b/spec/lib/admin/metrics/measure/instance_statuses_measure_spec.rb
index ac28658ea07b67..0fc903a2a81cde 100644
--- a/spec/lib/admin/metrics/measure/instance_statuses_measure_spec.rb
+++ b/spec/lib/admin/metrics/measure/instance_statuses_measure_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Admin::Metrics::Measure::InstanceStatusesMeasure do
+RSpec.describe Admin::Metrics::Measure::InstanceStatusesMeasure do
   subject { described_class.new(start_at, end_at, params) }
 
   let(:domain) { 'example.com' }
diff --git a/spec/lib/admin/metrics/measure/interactions_measure_spec.rb b/spec/lib/admin/metrics/measure/interactions_measure_spec.rb
index ed333380cfbe9d..edbec2eabff630 100644
--- a/spec/lib/admin/metrics/measure/interactions_measure_spec.rb
+++ b/spec/lib/admin/metrics/measure/interactions_measure_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Admin::Metrics::Measure::InteractionsMeasure do
+RSpec.describe Admin::Metrics::Measure::InteractionsMeasure do
   subject { described_class.new(start_at, end_at, params) }
 
   let(:start_at) { 2.days.ago }
diff --git a/spec/lib/admin/metrics/measure/new_users_measure_spec.rb b/spec/lib/admin/metrics/measure/new_users_measure_spec.rb
index 085acbcede811b..5c03b67a18c5d4 100644
--- a/spec/lib/admin/metrics/measure/new_users_measure_spec.rb
+++ b/spec/lib/admin/metrics/measure/new_users_measure_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Admin::Metrics::Measure::NewUsersMeasure do
+RSpec.describe Admin::Metrics::Measure::NewUsersMeasure do
   subject { described_class.new(start_at, end_at, params) }
 
   let(:start_at) { 2.days.ago }
diff --git a/spec/lib/admin/metrics/measure/opened_reports_measure_spec.rb b/spec/lib/admin/metrics/measure/opened_reports_measure_spec.rb
index d5ba78527ea2ac..f4d3a66454a297 100644
--- a/spec/lib/admin/metrics/measure/opened_reports_measure_spec.rb
+++ b/spec/lib/admin/metrics/measure/opened_reports_measure_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Admin::Metrics::Measure::OpenedReportsMeasure do
+RSpec.describe Admin::Metrics::Measure::OpenedReportsMeasure do
   subject { described_class.new(start_at, end_at, params) }
 
   let(:start_at) { 2.days.ago }
diff --git a/spec/lib/admin/metrics/measure/resolved_reports_measure_spec.rb b/spec/lib/admin/metrics/measure/resolved_reports_measure_spec.rb
index f7b497590d3df9..432dbbe79635de 100644
--- a/spec/lib/admin/metrics/measure/resolved_reports_measure_spec.rb
+++ b/spec/lib/admin/metrics/measure/resolved_reports_measure_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Admin::Metrics::Measure::ResolvedReportsMeasure do
+RSpec.describe Admin::Metrics::Measure::ResolvedReportsMeasure do
   subject { described_class.new(start_at, end_at, params) }
 
   let(:start_at) { 2.days.ago }
diff --git a/spec/lib/admin/metrics/measure/tag_accounts_measure_spec.rb b/spec/lib/admin/metrics/measure/tag_accounts_measure_spec.rb
index b33ae7bb7106f3..577b1260ff044a 100644
--- a/spec/lib/admin/metrics/measure/tag_accounts_measure_spec.rb
+++ b/spec/lib/admin/metrics/measure/tag_accounts_measure_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Admin::Metrics::Measure::TagAccountsMeasure do
+RSpec.describe Admin::Metrics::Measure::TagAccountsMeasure do
   subject { described_class.new(start_at, end_at, params) }
 
   let!(:tag) { Fabricate(:tag) }
diff --git a/spec/lib/admin/metrics/measure/tag_servers_measure_spec.rb b/spec/lib/admin/metrics/measure/tag_servers_measure_spec.rb
index e1e2ced43a5802..42715e5adc78e0 100644
--- a/spec/lib/admin/metrics/measure/tag_servers_measure_spec.rb
+++ b/spec/lib/admin/metrics/measure/tag_servers_measure_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Admin::Metrics::Measure::TagServersMeasure do
+RSpec.describe Admin::Metrics::Measure::TagServersMeasure do
   subject { described_class.new(start_at, end_at, params) }
 
   let!(:tag) { Fabricate(:tag) }
diff --git a/spec/lib/admin/metrics/measure/tag_uses_measure_spec.rb b/spec/lib/admin/metrics/measure/tag_uses_measure_spec.rb
index dd66f00de05694..b258455dabbb21 100644
--- a/spec/lib/admin/metrics/measure/tag_uses_measure_spec.rb
+++ b/spec/lib/admin/metrics/measure/tag_uses_measure_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Admin::Metrics::Measure::TagUsesMeasure do
+RSpec.describe Admin::Metrics::Measure::TagUsesMeasure do
   subject { described_class.new(start_at, end_at, params) }
 
   let!(:tag) { Fabricate(:tag) }
diff --git a/spec/lib/admin/metrics/measure_spec.rb b/spec/lib/admin/metrics/measure_spec.rb
index c9809b0f792d30..49a5aecc611cc4 100644
--- a/spec/lib/admin/metrics/measure_spec.rb
+++ b/spec/lib/admin/metrics/measure_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Admin::Metrics::Measure do
+RSpec.describe Admin::Metrics::Measure do
   describe '.retrieve' do
     subject { described_class.retrieve(reports, start_at, end_at, params) }
 
diff --git a/spec/lib/admin/system_check/base_check_spec.rb b/spec/lib/admin/system_check/base_check_spec.rb
index fdd9f6b6c44d5c..769e0e1d180ebe 100644
--- a/spec/lib/admin/system_check/base_check_spec.rb
+++ b/spec/lib/admin/system_check/base_check_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Admin::SystemCheck::BaseCheck do
+RSpec.describe Admin::SystemCheck::BaseCheck do
   subject(:check) { described_class.new(user) }
 
   let(:user) { Fabricate(:user) }
diff --git a/spec/lib/admin/system_check/database_schema_check_spec.rb b/spec/lib/admin/system_check/database_schema_check_spec.rb
index db1dcb52fa43e2..311d5249563ea2 100644
--- a/spec/lib/admin/system_check/database_schema_check_spec.rb
+++ b/spec/lib/admin/system_check/database_schema_check_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Admin::SystemCheck::DatabaseSchemaCheck do
+RSpec.describe Admin::SystemCheck::DatabaseSchemaCheck do
   subject(:check) { described_class.new(user) }
 
   let(:user) { Fabricate(:user) }
diff --git a/spec/lib/admin/system_check/elasticsearch_check_spec.rb b/spec/lib/admin/system_check/elasticsearch_check_spec.rb
index 8f210579d000ac..05d204c4530698 100644
--- a/spec/lib/admin/system_check/elasticsearch_check_spec.rb
+++ b/spec/lib/admin/system_check/elasticsearch_check_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Admin::SystemCheck::ElasticsearchCheck do
+RSpec.describe Admin::SystemCheck::ElasticsearchCheck do
   subject(:check) { described_class.new(user) }
 
   let(:user) { Fabricate(:user) }
diff --git a/spec/lib/admin/system_check/media_privacy_check_spec.rb b/spec/lib/admin/system_check/media_privacy_check_spec.rb
index 316bf121561f10..0d5bcdb3e87a6b 100644
--- a/spec/lib/admin/system_check/media_privacy_check_spec.rb
+++ b/spec/lib/admin/system_check/media_privacy_check_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Admin::SystemCheck::MediaPrivacyCheck do
+RSpec.describe Admin::SystemCheck::MediaPrivacyCheck do
   subject(:check) { described_class.new(user) }
 
   let(:user) { Fabricate(:user) }
diff --git a/spec/lib/admin/system_check/message_spec.rb b/spec/lib/admin/system_check/message_spec.rb
index c0671f34525ff5..81ef4f2f09d40f 100644
--- a/spec/lib/admin/system_check/message_spec.rb
+++ b/spec/lib/admin/system_check/message_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Admin::SystemCheck::Message do
+RSpec.describe Admin::SystemCheck::Message do
   subject(:check) { described_class.new(:key_value, :value_value, :action_value, :critical_value) }
 
   it 'providers readers when initialized' do
diff --git a/spec/lib/admin/system_check/rules_check_spec.rb b/spec/lib/admin/system_check/rules_check_spec.rb
index fb3293fb2d0615..32650d9cd8a410 100644
--- a/spec/lib/admin/system_check/rules_check_spec.rb
+++ b/spec/lib/admin/system_check/rules_check_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Admin::SystemCheck::RulesCheck do
+RSpec.describe Admin::SystemCheck::RulesCheck do
   subject(:check) { described_class.new(user) }
 
   let(:user) { Fabricate(:user) }
diff --git a/spec/lib/admin/system_check/sidekiq_process_check_spec.rb b/spec/lib/admin/system_check/sidekiq_process_check_spec.rb
index 9bd9daddf6722f..992fd7aee0f378 100644
--- a/spec/lib/admin/system_check/sidekiq_process_check_spec.rb
+++ b/spec/lib/admin/system_check/sidekiq_process_check_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Admin::SystemCheck::SidekiqProcessCheck do
+RSpec.describe Admin::SystemCheck::SidekiqProcessCheck do
   subject(:check) { described_class.new(user) }
 
   let(:user) { Fabricate(:user) }
diff --git a/spec/lib/admin/system_check/software_version_check_spec.rb b/spec/lib/admin/system_check/software_version_check_spec.rb
index de4335fc519fc2..1affaa3a969d82 100644
--- a/spec/lib/admin/system_check/software_version_check_spec.rb
+++ b/spec/lib/admin/system_check/software_version_check_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Admin::SystemCheck::SoftwareVersionCheck do
+RSpec.describe Admin::SystemCheck::SoftwareVersionCheck do
   include RoutingHelper
 
   subject(:check) { described_class.new(user) }
diff --git a/spec/lib/admin/system_check_spec.rb b/spec/lib/admin/system_check_spec.rb
index 30048fd3ade0e0..92852ab025baa8 100644
--- a/spec/lib/admin/system_check_spec.rb
+++ b/spec/lib/admin/system_check_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Admin::SystemCheck do
+RSpec.describe Admin::SystemCheck do
   let(:user) { Fabricate(:user) }
 
   describe 'perform' do
diff --git a/spec/lib/annual_report_spec.rb b/spec/lib/annual_report_spec.rb
index ffb742697b3f09..bd4d0f33876a06 100644
--- a/spec/lib/annual_report_spec.rb
+++ b/spec/lib/annual_report_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe AnnualReport do
+RSpec.describe AnnualReport do
   describe '#generate' do
     subject { described_class.new(account, Time.zone.now.year) }
 
diff --git a/spec/lib/cache_buster_spec.rb b/spec/lib/cache_buster_spec.rb
index 84085608e8544e..f7cff9c1c36050 100644
--- a/spec/lib/cache_buster_spec.rb
+++ b/spec/lib/cache_buster_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe CacheBuster do
+RSpec.describe CacheBuster do
   subject { described_class.new(secret_header: secret_header, secret: secret, http_method: http_method) }
 
   let(:secret_header) { nil }
diff --git a/spec/lib/connection_pool/shared_connection_pool_spec.rb b/spec/lib/connection_pool/shared_connection_pool_spec.rb
index a2fe75f742a78b..2352703b5a376c 100644
--- a/spec/lib/connection_pool/shared_connection_pool_spec.rb
+++ b/spec/lib/connection_pool/shared_connection_pool_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe ConnectionPool::SharedConnectionPool do
+RSpec.describe ConnectionPool::SharedConnectionPool do
   subject { described_class.new(size: 5, timeout: 5) { |site| mini_connection_class.new(site) } }
 
   let(:mini_connection_class) do
diff --git a/spec/lib/connection_pool/shared_timed_stack_spec.rb b/spec/lib/connection_pool/shared_timed_stack_spec.rb
index 04d550eec57156..7469664ea0acb1 100644
--- a/spec/lib/connection_pool/shared_timed_stack_spec.rb
+++ b/spec/lib/connection_pool/shared_timed_stack_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe ConnectionPool::SharedTimedStack do
+RSpec.describe ConnectionPool::SharedTimedStack do
   subject { described_class.new(5) { |site| mini_connection_class.new(site) } }
 
   let(:mini_connection_class) do
diff --git a/spec/lib/content_security_policy_spec.rb b/spec/lib/content_security_policy_spec.rb
index 27a3e8025731a3..5ecea6054310da 100644
--- a/spec/lib/content_security_policy_spec.rb
+++ b/spec/lib/content_security_policy_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe ContentSecurityPolicy do
+RSpec.describe ContentSecurityPolicy do
   subject { described_class.new }
 
   around do |example|
diff --git a/spec/lib/delivery_failure_tracker_spec.rb b/spec/lib/delivery_failure_tracker_spec.rb
index c8179ebd91cdea..40c8adc4c80620 100644
--- a/spec/lib/delivery_failure_tracker_spec.rb
+++ b/spec/lib/delivery_failure_tracker_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe DeliveryFailureTracker do
+RSpec.describe DeliveryFailureTracker do
   subject { described_class.new('http://example.com/inbox') }
 
   describe '#track_success!' do
diff --git a/spec/lib/extractor_spec.rb b/spec/lib/extractor_spec.rb
index af5c62d4c8a3a9..bc3ee8ac496a2b 100644
--- a/spec/lib/extractor_spec.rb
+++ b/spec/lib/extractor_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Extractor do
+RSpec.describe Extractor do
   describe 'extract_mentions_or_lists_with_indices' do
     it 'returns an empty array if the given string does not have at signs' do
       text = 'a string without at signs'
diff --git a/spec/lib/fast_ip_map_spec.rb b/spec/lib/fast_ip_map_spec.rb
index 78b3ddb054258e..a3a647e3e3a35b 100644
--- a/spec/lib/fast_ip_map_spec.rb
+++ b/spec/lib/fast_ip_map_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe FastIpMap do
+RSpec.describe FastIpMap do
   describe '#include?' do
     subject { described_class.new([IPAddr.new('20.4.0.0/16'), IPAddr.new('145.22.30.0/24'), IPAddr.new('189.45.86.3')]) }
 
diff --git a/spec/lib/hashtag_normalizer_spec.rb b/spec/lib/hashtag_normalizer_spec.rb
index fbb9f37c07076b..796445043a3b1f 100644
--- a/spec/lib/hashtag_normalizer_spec.rb
+++ b/spec/lib/hashtag_normalizer_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe HashtagNormalizer do
+RSpec.describe HashtagNormalizer do
   subject { described_class.new }
 
   describe '#normalize' do
diff --git a/spec/lib/importer/accounts_index_importer_spec.rb b/spec/lib/importer/accounts_index_importer_spec.rb
index 73f9bce39914d9..a5d11c747ad256 100644
--- a/spec/lib/importer/accounts_index_importer_spec.rb
+++ b/spec/lib/importer/accounts_index_importer_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Importer::AccountsIndexImporter do
+RSpec.describe Importer::AccountsIndexImporter do
   describe 'import!' do
     let(:pool) { Concurrent::FixedThreadPool.new(5) }
     let(:importer) { described_class.new(batch_size: 123, executor: pool) }
diff --git a/spec/lib/importer/base_importer_spec.rb b/spec/lib/importer/base_importer_spec.rb
index 78e9a869b8beed..0d12f975aa21c9 100644
--- a/spec/lib/importer/base_importer_spec.rb
+++ b/spec/lib/importer/base_importer_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Importer::BaseImporter do
+RSpec.describe Importer::BaseImporter do
   describe 'import!' do
     let(:pool) { Concurrent::FixedThreadPool.new(5) }
     let(:importer) { described_class.new(batch_size: 123, executor: pool) }
diff --git a/spec/lib/importer/public_statuses_index_importer_spec.rb b/spec/lib/importer/public_statuses_index_importer_spec.rb
index bc7c038a97c5a8..2407717409bdfe 100644
--- a/spec/lib/importer/public_statuses_index_importer_spec.rb
+++ b/spec/lib/importer/public_statuses_index_importer_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Importer::PublicStatusesIndexImporter do
+RSpec.describe Importer::PublicStatusesIndexImporter do
   describe 'import!' do
     let(:pool) { Concurrent::FixedThreadPool.new(5) }
     let(:importer) { described_class.new(batch_size: 123, executor: pool) }
diff --git a/spec/lib/importer/statuses_index_importer_spec.rb b/spec/lib/importer/statuses_index_importer_spec.rb
index d5e1c9f2cb9a0f..f6fac3bd678fc5 100644
--- a/spec/lib/importer/statuses_index_importer_spec.rb
+++ b/spec/lib/importer/statuses_index_importer_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Importer::StatusesIndexImporter do
+RSpec.describe Importer::StatusesIndexImporter do
   describe 'import!' do
     let(:pool) { Concurrent::FixedThreadPool.new(5) }
     let(:importer) { described_class.new(batch_size: 123, executor: pool) }
diff --git a/spec/lib/importer/tags_index_importer_spec.rb b/spec/lib/importer/tags_index_importer_spec.rb
index 348990c01e8235..44de9e7c3459ad 100644
--- a/spec/lib/importer/tags_index_importer_spec.rb
+++ b/spec/lib/importer/tags_index_importer_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Importer::TagsIndexImporter do
+RSpec.describe Importer::TagsIndexImporter do
   describe 'import!' do
     let(:pool) { Concurrent::FixedThreadPool.new(5) }
     let(:importer) { described_class.new(batch_size: 123, executor: pool) }
diff --git a/spec/lib/mastodon/cli/accounts_spec.rb b/spec/lib/mastodon/cli/accounts_spec.rb
index 3988e0b0271836..f6cc28297a94cd 100644
--- a/spec/lib/mastodon/cli/accounts_spec.rb
+++ b/spec/lib/mastodon/cli/accounts_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 require 'mastodon/cli/accounts'
 
-describe Mastodon::CLI::Accounts do
+RSpec.describe Mastodon::CLI::Accounts do
   subject { cli.invoke(action, arguments, options) }
 
   let(:cli) { described_class.new }
diff --git a/spec/lib/mastodon/cli/cache_spec.rb b/spec/lib/mastodon/cli/cache_spec.rb
index 247a14f9e2713f..dc571238d21f33 100644
--- a/spec/lib/mastodon/cli/cache_spec.rb
+++ b/spec/lib/mastodon/cli/cache_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 require 'mastodon/cli/cache'
 
-describe Mastodon::CLI::Cache do
+RSpec.describe Mastodon::CLI::Cache do
   subject { cli.invoke(action, arguments, options) }
 
   let(:cli) { described_class.new }
diff --git a/spec/lib/mastodon/cli/canonical_email_blocks_spec.rb b/spec/lib/mastodon/cli/canonical_email_blocks_spec.rb
index 1745ea01bf3311..faa5ec7cb83f72 100644
--- a/spec/lib/mastodon/cli/canonical_email_blocks_spec.rb
+++ b/spec/lib/mastodon/cli/canonical_email_blocks_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 require 'mastodon/cli/canonical_email_blocks'
 
-describe Mastodon::CLI::CanonicalEmailBlocks do
+RSpec.describe Mastodon::CLI::CanonicalEmailBlocks do
   subject { cli.invoke(action, arguments, options) }
 
   let(:cli) { described_class.new }
diff --git a/spec/lib/mastodon/cli/domains_spec.rb b/spec/lib/mastodon/cli/domains_spec.rb
index 448e6fe42b34e7..d1c26546f04dd9 100644
--- a/spec/lib/mastodon/cli/domains_spec.rb
+++ b/spec/lib/mastodon/cli/domains_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 require 'mastodon/cli/domains'
 
-describe Mastodon::CLI::Domains do
+RSpec.describe Mastodon::CLI::Domains do
   subject { cli.invoke(action, arguments, options) }
 
   let(:cli) { described_class.new }
diff --git a/spec/lib/mastodon/cli/email_domain_blocks_spec.rb b/spec/lib/mastodon/cli/email_domain_blocks_spec.rb
index 55e3da0bb89be7..a5fbd23e652a63 100644
--- a/spec/lib/mastodon/cli/email_domain_blocks_spec.rb
+++ b/spec/lib/mastodon/cli/email_domain_blocks_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 require 'mastodon/cli/email_domain_blocks'
 
-describe Mastodon::CLI::EmailDomainBlocks do
+RSpec.describe Mastodon::CLI::EmailDomainBlocks do
   subject { cli.invoke(action, arguments, options) }
 
   let(:cli) { described_class.new }
diff --git a/spec/lib/mastodon/cli/emoji_spec.rb b/spec/lib/mastodon/cli/emoji_spec.rb
index d05e972e77c15a..4336db17d37472 100644
--- a/spec/lib/mastodon/cli/emoji_spec.rb
+++ b/spec/lib/mastodon/cli/emoji_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 require 'mastodon/cli/emoji'
 
-describe Mastodon::CLI::Emoji do
+RSpec.describe Mastodon::CLI::Emoji do
   subject { cli.invoke(action, arguments, options) }
 
   let(:cli) { described_class.new }
diff --git a/spec/lib/mastodon/cli/feeds_spec.rb b/spec/lib/mastodon/cli/feeds_spec.rb
index 420cb3d5872893..75a8cb3ebc6f56 100644
--- a/spec/lib/mastodon/cli/feeds_spec.rb
+++ b/spec/lib/mastodon/cli/feeds_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 require 'mastodon/cli/feeds'
 
-describe Mastodon::CLI::Feeds do
+RSpec.describe Mastodon::CLI::Feeds do
   subject { cli.invoke(action, arguments, options) }
 
   let(:cli) { described_class.new }
diff --git a/spec/lib/mastodon/cli/ip_blocks_spec.rb b/spec/lib/mastodon/cli/ip_blocks_spec.rb
index d44b1b9fe44e3e..68d6b198593c61 100644
--- a/spec/lib/mastodon/cli/ip_blocks_spec.rb
+++ b/spec/lib/mastodon/cli/ip_blocks_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 require 'mastodon/cli/ip_blocks'
 
-describe Mastodon::CLI::IpBlocks do
+RSpec.describe Mastodon::CLI::IpBlocks do
   subject { cli.invoke(action, arguments, options) }
 
   let(:cli) { described_class.new }
diff --git a/spec/lib/mastodon/cli/main_spec.rb b/spec/lib/mastodon/cli/main_spec.rb
index 99d770a81dd188..a63b798683c4d1 100644
--- a/spec/lib/mastodon/cli/main_spec.rb
+++ b/spec/lib/mastodon/cli/main_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 require 'mastodon/cli/main'
 
-describe Mastodon::CLI::Main do
+RSpec.describe Mastodon::CLI::Main do
   subject { cli.invoke(action, arguments, options) }
 
   let(:cli) { described_class.new }
diff --git a/spec/lib/mastodon/cli/maintenance_spec.rb b/spec/lib/mastodon/cli/maintenance_spec.rb
index cde25d39eda357..6a15677f43ab91 100644
--- a/spec/lib/mastodon/cli/maintenance_spec.rb
+++ b/spec/lib/mastodon/cli/maintenance_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 require 'mastodon/cli/maintenance'
 
-describe Mastodon::CLI::Maintenance do
+RSpec.describe Mastodon::CLI::Maintenance do
   subject { cli.invoke(action, arguments, options) }
 
   let(:cli) { described_class.new }
diff --git a/spec/lib/mastodon/cli/media_spec.rb b/spec/lib/mastodon/cli/media_spec.rb
index ecc7101b6cf8c8..fa7a3161d09945 100644
--- a/spec/lib/mastodon/cli/media_spec.rb
+++ b/spec/lib/mastodon/cli/media_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 require 'mastodon/cli/media'
 
-describe Mastodon::CLI::Media do
+RSpec.describe Mastodon::CLI::Media do
   subject { cli.invoke(action, arguments, options) }
 
   let(:cli) { described_class.new }
diff --git a/spec/lib/mastodon/cli/preview_cards_spec.rb b/spec/lib/mastodon/cli/preview_cards_spec.rb
index 951ae3758f0642..949787a7590fab 100644
--- a/spec/lib/mastodon/cli/preview_cards_spec.rb
+++ b/spec/lib/mastodon/cli/preview_cards_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 require 'mastodon/cli/preview_cards'
 
-describe Mastodon::CLI::PreviewCards do
+RSpec.describe Mastodon::CLI::PreviewCards do
   subject { cli.invoke(action, arguments, options) }
 
   let(:cli) { described_class.new }
diff --git a/spec/lib/mastodon/cli/search_spec.rb b/spec/lib/mastodon/cli/search_spec.rb
index ed3789c3e7d282..8a6c2492aa43d0 100644
--- a/spec/lib/mastodon/cli/search_spec.rb
+++ b/spec/lib/mastodon/cli/search_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 require 'mastodon/cli/search'
 
-describe Mastodon::CLI::Search do
+RSpec.describe Mastodon::CLI::Search do
   subject { cli.invoke(action, arguments, options) }
 
   let(:cli) { described_class.new }
diff --git a/spec/lib/mastodon/cli/settings_spec.rb b/spec/lib/mastodon/cli/settings_spec.rb
index e1b353eb90296d..5565b798ef9cd1 100644
--- a/spec/lib/mastodon/cli/settings_spec.rb
+++ b/spec/lib/mastodon/cli/settings_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 require 'mastodon/cli/settings'
 
-describe Mastodon::CLI::Settings do
+RSpec.describe Mastodon::CLI::Settings do
   it_behaves_like 'CLI Command'
 
   describe 'subcommand "registrations"' do
diff --git a/spec/lib/mastodon/cli/statuses_spec.rb b/spec/lib/mastodon/cli/statuses_spec.rb
index 161b7c02bbf64a..2597ad7f2741eb 100644
--- a/spec/lib/mastodon/cli/statuses_spec.rb
+++ b/spec/lib/mastodon/cli/statuses_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 require 'mastodon/cli/statuses'
 
-describe Mastodon::CLI::Statuses do
+RSpec.describe Mastodon::CLI::Statuses do
   subject { cli.invoke(action, arguments, options) }
 
   let(:cli) { described_class.new }
diff --git a/spec/lib/mastodon/cli/upgrade_spec.rb b/spec/lib/mastodon/cli/upgrade_spec.rb
index 6861e04887655f..6861e1a06854d1 100644
--- a/spec/lib/mastodon/cli/upgrade_spec.rb
+++ b/spec/lib/mastodon/cli/upgrade_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 require 'mastodon/cli/upgrade'
 
-describe Mastodon::CLI::Upgrade do
+RSpec.describe Mastodon::CLI::Upgrade do
   subject { cli.invoke(action, arguments, options) }
 
   let(:cli) { described_class.new }
diff --git a/spec/lib/mastodon/migration_warning_spec.rb b/spec/lib/mastodon/migration_warning_spec.rb
index 4adf0837ab23d7..d796d1e90210ea 100644
--- a/spec/lib/mastodon/migration_warning_spec.rb
+++ b/spec/lib/mastodon/migration_warning_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 require 'mastodon/migration_warning'
 
-describe Mastodon::MigrationWarning do
+RSpec.describe Mastodon::MigrationWarning do
   describe 'migration_duration_warning' do
     before do
       allow(migration).to receive(:valid_environment?).and_return(true)
diff --git a/spec/lib/ostatus/tag_manager_spec.rb b/spec/lib/ostatus/tag_manager_spec.rb
index 0e20f26c7c335a..f808b96289d436 100644
--- a/spec/lib/ostatus/tag_manager_spec.rb
+++ b/spec/lib/ostatus/tag_manager_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe OStatus::TagManager do
+RSpec.describe OStatus::TagManager do
   describe '#unique_tag' do
     it 'returns a unique tag' do
       expect(described_class.instance.unique_tag(Time.utc(2000), 12, 'Status')).to eq 'tag:cb6e6126.ngrok.io,2000-01-01:objectId=12:objectType=Status'
diff --git a/spec/lib/paperclip/response_with_limit_adapter_spec.rb b/spec/lib/paperclip/response_with_limit_adapter_spec.rb
index baf8bf5bb72b59..3db52ffa0d85ad 100644
--- a/spec/lib/paperclip/response_with_limit_adapter_spec.rb
+++ b/spec/lib/paperclip/response_with_limit_adapter_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Paperclip::ResponseWithLimitAdapter do
+RSpec.describe Paperclip::ResponseWithLimitAdapter do
   subject { described_class.new(response_with_limit) }
 
   before { stub_request(:get, url).to_return(headers: headers, body: body) }
diff --git a/spec/lib/permalink_redirector_spec.rb b/spec/lib/permalink_redirector_spec.rb
index a0091365616f67..3f77d7665a23d2 100644
--- a/spec/lib/permalink_redirector_spec.rb
+++ b/spec/lib/permalink_redirector_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe PermalinkRedirector do
+RSpec.describe PermalinkRedirector do
   let(:remote_account) { Fabricate(:account, username: 'alice', domain: 'example.com', url: 'https://example.com/@alice', id: 2) }
 
   describe '#redirect_url' do
diff --git a/spec/lib/request_pool_spec.rb b/spec/lib/request_pool_spec.rb
index a82eb5a188c0d9..2e8c785de8b3e6 100644
--- a/spec/lib/request_pool_spec.rb
+++ b/spec/lib/request_pool_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe RequestPool do
+RSpec.describe RequestPool do
   subject { described_class.new }
 
   describe '#with' do
diff --git a/spec/lib/request_spec.rb b/spec/lib/request_spec.rb
index c99f18838ba432..c600a48ee24e3a 100644
--- a/spec/lib/request_spec.rb
+++ b/spec/lib/request_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 require 'securerandom'
 
-describe Request do
+RSpec.describe Request do
   subject { described_class.new(:get, 'http://example.com') }
 
   describe '#headers' do
diff --git a/spec/lib/sanitize/config_spec.rb b/spec/lib/sanitize/config_spec.rb
index fe0b272c0a22ee..17b78a95f6d7a6 100644
--- a/spec/lib/sanitize/config_spec.rb
+++ b/spec/lib/sanitize/config_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Sanitize::Config do
+RSpec.describe Sanitize::Config do
   describe '::MASTODON_STRICT' do
     subject { described_class::MASTODON_STRICT }
 
diff --git a/spec/lib/scope_transformer_spec.rb b/spec/lib/scope_transformer_spec.rb
index 7bc226e94f7a0e..09a31e04c57f32 100644
--- a/spec/lib/scope_transformer_spec.rb
+++ b/spec/lib/scope_transformer_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe ScopeTransformer do
+RSpec.describe ScopeTransformer do
   describe '#apply' do
     subject { described_class.new.apply(ScopeParser.new.parse(input)) }
 
diff --git a/spec/lib/search_query_parser_spec.rb b/spec/lib/search_query_parser_spec.rb
index 66b0e8f9e2367b..22149b34028842 100644
--- a/spec/lib/search_query_parser_spec.rb
+++ b/spec/lib/search_query_parser_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 require 'parslet/rig/rspec'
 
-describe SearchQueryParser do
+RSpec.describe SearchQueryParser do
   let(:parser) { described_class.new }
 
   context 'with term' do
diff --git a/spec/lib/search_query_transformer_spec.rb b/spec/lib/search_query_transformer_spec.rb
index 5817e3d1d2015c..00220f84fd2225 100644
--- a/spec/lib/search_query_transformer_spec.rb
+++ b/spec/lib/search_query_transformer_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe SearchQueryTransformer do
+RSpec.describe SearchQueryTransformer do
   subject { described_class.new.apply(parser, current_account: account) }
 
   let(:account) { Fabricate(:account) }
diff --git a/spec/lib/status_cache_hydrator_spec.rb b/spec/lib/status_cache_hydrator_spec.rb
index 5b80ccb97080fa..958e2f62d74ede 100644
--- a/spec/lib/status_cache_hydrator_spec.rb
+++ b/spec/lib/status_cache_hydrator_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe StatusCacheHydrator do
+RSpec.describe StatusCacheHydrator do
   let(:status)  { Fabricate(:status) }
   let(:account) { Fabricate(:account) }
 
diff --git a/spec/lib/status_filter_spec.rb b/spec/lib/status_filter_spec.rb
index cf6f3c79592c40..16c2e84f229006 100644
--- a/spec/lib/status_filter_spec.rb
+++ b/spec/lib/status_filter_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe StatusFilter do
+RSpec.describe StatusFilter do
   describe '#filtered?' do
     let(:status) { Fabricate(:status) }
 
diff --git a/spec/lib/status_finder_spec.rb b/spec/lib/status_finder_spec.rb
index 53f5039af97838..4d1c27afff8f11 100644
--- a/spec/lib/status_finder_spec.rb
+++ b/spec/lib/status_finder_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe StatusFinder do
+RSpec.describe StatusFinder do
   include RoutingHelper
 
   describe '#status' do
diff --git a/spec/lib/status_reach_finder_spec.rb b/spec/lib/status_reach_finder_spec.rb
index 7181717dc11e58..c045980ea9db80 100644
--- a/spec/lib/status_reach_finder_spec.rb
+++ b/spec/lib/status_reach_finder_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe StatusReachFinder do
+RSpec.describe StatusReachFinder do
   describe '#inboxes' do
     context 'with a local status' do
       subject { described_class.new(status) }
diff --git a/spec/lib/webfinger_resource_spec.rb b/spec/lib/webfinger_resource_spec.rb
index 442f91aad02095..0b86b41c481db3 100644
--- a/spec/lib/webfinger_resource_spec.rb
+++ b/spec/lib/webfinger_resource_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe WebfingerResource do
+RSpec.describe WebfingerResource do
   around do |example|
     before_local = Rails.configuration.x.local_domain
     before_web = Rails.configuration.x.web_domain
diff --git a/spec/lib/webhooks/payload_renderer_spec.rb b/spec/lib/webhooks/payload_renderer_spec.rb
index 074847c74c569b..0623edd25475d4 100644
--- a/spec/lib/webhooks/payload_renderer_spec.rb
+++ b/spec/lib/webhooks/payload_renderer_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Webhooks::PayloadRenderer do
+RSpec.describe Webhooks::PayloadRenderer do
   subject(:renderer) { described_class.new(json) }
 
   let(:event)   { Webhooks::EventPresenter.new(type, object) }
diff --git a/spec/locales/i18n_spec.rb b/spec/locales/i18n_spec.rb
index cfce8e2234b4ef..8facf6612c07d1 100644
--- a/spec/locales/i18n_spec.rb
+++ b/spec/locales/i18n_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'I18n' do
+RSpec.describe 'I18n' do
   describe 'Pluralizing locale translations' do
     subject { I18n.t('generic.validation_errors', count: 1) }
 
diff --git a/spec/mailers/user_mailer_spec.rb b/spec/mailers/user_mailer_spec.rb
index 5a8c293740bdbd..0257465817418e 100644
--- a/spec/mailers/user_mailer_spec.rb
+++ b/spec/mailers/user_mailer_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe UserMailer do
+RSpec.describe UserMailer do
   let(:receiver) { Fabricate(:user) }
 
   describe '#confirmation_instructions' do
diff --git a/spec/models/account_filter_spec.rb b/spec/models/account_filter_spec.rb
index fa47b5954a8e31..5cb7fa92d44b4d 100644
--- a/spec/models/account_filter_spec.rb
+++ b/spec/models/account_filter_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe AccountFilter do
+RSpec.describe AccountFilter do
   describe 'with empty params' do
     it 'excludes instance actor by default' do
       filter = described_class.new({})
diff --git a/spec/models/account_warning_preset_spec.rb b/spec/models/account_warning_preset_spec.rb
index f171df7c974ea6..e7a98551751373 100644
--- a/spec/models/account_warning_preset_spec.rb
+++ b/spec/models/account_warning_preset_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe AccountWarningPreset do
+RSpec.describe AccountWarningPreset do
   describe 'alphabetical' do
     let(:first) { Fabricate(:account_warning_preset, title: 'aaa', text: 'aaa') }
     let(:second) { Fabricate(:account_warning_preset, title: 'bbb', text: 'aaa') }
diff --git a/spec/models/admin/appeal_filter_spec.rb b/spec/models/admin/appeal_filter_spec.rb
index e840bc3bc12575..8303e58ad6311c 100644
--- a/spec/models/admin/appeal_filter_spec.rb
+++ b/spec/models/admin/appeal_filter_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Admin::AppealFilter do
+RSpec.describe Admin::AppealFilter do
   describe '#results' do
     let(:approved_appeal) { Fabricate(:appeal, approved_at: 10.days.ago) }
     let(:not_approved_appeal) { Fabricate(:appeal, approved_at: nil) }
diff --git a/spec/models/admin/tag_filter_spec.rb b/spec/models/admin/tag_filter_spec.rb
index 21dc28affb3209..1baae117b87701 100644
--- a/spec/models/admin/tag_filter_spec.rb
+++ b/spec/models/admin/tag_filter_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Admin::TagFilter do
+RSpec.describe Admin::TagFilter do
   describe 'with invalid params' do
     it 'raises with key error' do
       filter = described_class.new(wrong: true)
diff --git a/spec/models/announcement_spec.rb b/spec/models/announcement_spec.rb
index 1e7283ca77090f..e3865e6fc7ff50 100644
--- a/spec/models/announcement_spec.rb
+++ b/spec/models/announcement_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Announcement do
+RSpec.describe Announcement do
   describe 'Scopes' do
     context 'with published and unpublished records' do
       let!(:published) { Fabricate(:announcement, published: true) }
diff --git a/spec/models/appeal_spec.rb b/spec/models/appeal_spec.rb
index 13ca3a2d901ae5..7e324582ed5d37 100644
--- a/spec/models/appeal_spec.rb
+++ b/spec/models/appeal_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Appeal do
+RSpec.describe Appeal do
   describe 'Validations' do
     it 'validates text length is under limit' do
       appeal = Fabricate.build(
diff --git a/spec/models/concerns/account/counters_spec.rb b/spec/models/concerns/account/counters_spec.rb
index ccac9e95de6712..bbbaa7d06c9402 100644
--- a/spec/models/concerns/account/counters_spec.rb
+++ b/spec/models/concerns/account/counters_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Account::Counters do
+RSpec.describe Account::Counters do
   let!(:account) { Fabricate(:account) }
 
   describe '#increment_count!' do
diff --git a/spec/models/concerns/account/finder_concern_spec.rb b/spec/models/concerns/account/finder_concern_spec.rb
index ab5149e987ff15..b3fae56dfc51e8 100644
--- a/spec/models/concerns/account/finder_concern_spec.rb
+++ b/spec/models/concerns/account/finder_concern_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Account::FinderConcern do
+RSpec.describe Account::FinderConcern do
   describe 'local finders' do
     let!(:account) { Fabricate(:account, username: 'Alice') }
 
diff --git a/spec/models/concerns/account/interactions_spec.rb b/spec/models/concerns/account/interactions_spec.rb
index 3f2c601f387694..4868054df7e7cb 100644
--- a/spec/models/concerns/account/interactions_spec.rb
+++ b/spec/models/concerns/account/interactions_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Account::Interactions do
+RSpec.describe Account::Interactions do
   let(:account)            { Fabricate(:account, username: 'account') }
   let(:account_id)         { account.id }
   let(:account_ids)        { [account_id] }
diff --git a/spec/models/concerns/account/statuses_search_spec.rb b/spec/models/concerns/account/statuses_search_spec.rb
index ab249d62d0756a..9488d42021c882 100644
--- a/spec/models/concerns/account/statuses_search_spec.rb
+++ b/spec/models/concerns/account/statuses_search_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Account::StatusesSearch do
+RSpec.describe Account::StatusesSearch do
   let(:account) { Fabricate(:account, indexable: indexable) }
 
   before do
diff --git a/spec/models/concerns/status/threading_concern_spec.rb b/spec/models/concerns/status/threading_concern_spec.rb
index 09fb21856618a1..a13487c10a3514 100644
--- a/spec/models/concerns/status/threading_concern_spec.rb
+++ b/spec/models/concerns/status/threading_concern_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Status::ThreadingConcern do
+RSpec.describe Status::ThreadingConcern do
   describe '#ancestors' do
     let!(:alice)  { Fabricate(:account, username: 'alice') }
     let!(:bob)    { Fabricate(:account, username: 'bob', domain: 'example.com') }
diff --git a/spec/models/custom_emoji_category_spec.rb b/spec/models/custom_emoji_category_spec.rb
index 30de07bd81c7fb..3da77344e26721 100644
--- a/spec/models/custom_emoji_category_spec.rb
+++ b/spec/models/custom_emoji_category_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe CustomEmojiCategory do
+RSpec.describe CustomEmojiCategory do
   describe 'validations' do
     it 'validates name presence' do
       record = described_class.new(name: nil)
diff --git a/spec/models/domain_allow_spec.rb b/spec/models/domain_allow_spec.rb
index 12504211a1f19d..92f1ef8ccf3308 100644
--- a/spec/models/domain_allow_spec.rb
+++ b/spec/models/domain_allow_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe DomainAllow do
+RSpec.describe DomainAllow do
   describe 'Validations' do
     it 'is invalid without a domain' do
       domain_allow = Fabricate.build(:domain_allow, domain: nil)
diff --git a/spec/models/export_spec.rb b/spec/models/export_spec.rb
index 75468898d2739c..06bf07ed78a314 100644
--- a/spec/models/export_spec.rb
+++ b/spec/models/export_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Export do
+RSpec.describe Export do
   let(:account) { Fabricate(:account) }
   let(:target_accounts) do
     [{}, { username: 'one', domain: 'local.host' }].map(&method(:Fabricate).curry(2).call(:account))
diff --git a/spec/models/extended_description_spec.rb b/spec/models/extended_description_spec.rb
index ecc27c0f6dd2a3..368ca33f5b1290 100644
--- a/spec/models/extended_description_spec.rb
+++ b/spec/models/extended_description_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe ExtendedDescription do
+RSpec.describe ExtendedDescription do
   describe '.current' do
     context 'with the default values' do
       it 'makes a new instance' do
diff --git a/spec/models/form/admin_settings_spec.rb b/spec/models/form/admin_settings_spec.rb
index 0dc2d881ad2fce..6080b9e081d39e 100644
--- a/spec/models/form/admin_settings_spec.rb
+++ b/spec/models/form/admin_settings_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Form::AdminSettings do
+RSpec.describe Form::AdminSettings do
   describe 'validations' do
     describe 'site_contact_username' do
       context 'with no accounts' do
diff --git a/spec/models/form/custom_emoji_batch_spec.rb b/spec/models/form/custom_emoji_batch_spec.rb
index abeada5d507984..180c6abd23c353 100644
--- a/spec/models/form/custom_emoji_batch_spec.rb
+++ b/spec/models/form/custom_emoji_batch_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Form::CustomEmojiBatch do
+RSpec.describe Form::CustomEmojiBatch do
   describe '#save' do
     subject { described_class.new({ current_account: account }.merge(options)) }
 
diff --git a/spec/models/form/status_filter_batch_action_spec.rb b/spec/models/form/status_filter_batch_action_spec.rb
index f06a11cc8b0320..8ea9d7545e8c2f 100644
--- a/spec/models/form/status_filter_batch_action_spec.rb
+++ b/spec/models/form/status_filter_batch_action_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Form::StatusFilterBatchAction do
+RSpec.describe Form::StatusFilterBatchAction do
   describe '#save!' do
     it 'does nothing if status_filter_ids is empty' do
       batch_action = described_class.new(status_filter_ids: [])
diff --git a/spec/models/ip_block_spec.rb b/spec/models/ip_block_spec.rb
index 290b99b28842b6..6f1eb38425c7d4 100644
--- a/spec/models/ip_block_spec.rb
+++ b/spec/models/ip_block_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe IpBlock do
+RSpec.describe IpBlock do
   describe 'validations' do
     it 'validates ip presence', :aggregate_failures do
       ip_block = described_class.new(ip: nil, severity: :no_access)
diff --git a/spec/models/marker_spec.rb b/spec/models/marker_spec.rb
index 51dd584388dfca..8339f8e259b150 100644
--- a/spec/models/marker_spec.rb
+++ b/spec/models/marker_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Marker do
+RSpec.describe Marker do
   describe 'validations' do
     describe 'timeline' do
       it 'must be included in valid list' do
diff --git a/spec/models/one_time_key_spec.rb b/spec/models/one_time_key_spec.rb
index 6ff7ffc5c148e3..17fcdf37883987 100644
--- a/spec/models/one_time_key_spec.rb
+++ b/spec/models/one_time_key_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe OneTimeKey do
+RSpec.describe OneTimeKey do
   describe 'validations' do
     context 'with an invalid signature' do
       let(:one_time_key) { Fabricate.build(:one_time_key, signature: 'wrong!') }
diff --git a/spec/models/poll_spec.rb b/spec/models/poll_spec.rb
index ebcc459078b88c..740ef63d81aaf0 100644
--- a/spec/models/poll_spec.rb
+++ b/spec/models/poll_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Poll do
+RSpec.describe Poll do
   describe 'scopes' do
     let(:status) { Fabricate(:status) }
     let(:attached_poll) { Fabricate(:poll, status: status) }
diff --git a/spec/models/preview_card_provider_spec.rb b/spec/models/preview_card_provider_spec.rb
index 8b18b3d2b71237..12bca83440f126 100644
--- a/spec/models/preview_card_provider_spec.rb
+++ b/spec/models/preview_card_provider_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe PreviewCardProvider do
+RSpec.describe PreviewCardProvider do
   include_examples 'Reviewable'
 
   describe 'scopes' do
diff --git a/spec/models/preview_card_spec.rb b/spec/models/preview_card_spec.rb
index a17c7532e9eeb3..2f0ea38ee450ef 100644
--- a/spec/models/preview_card_spec.rb
+++ b/spec/models/preview_card_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe PreviewCard do
+RSpec.describe PreviewCard do
   describe 'validations' do
     describe 'urls' do
       it 'allows http schemes' do
diff --git a/spec/models/privacy_policy_spec.rb b/spec/models/privacy_policy_spec.rb
index 03bbe7264b6ee9..742cac8e185691 100644
--- a/spec/models/privacy_policy_spec.rb
+++ b/spec/models/privacy_policy_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe PrivacyPolicy do
+RSpec.describe PrivacyPolicy do
   describe '.current' do
     context 'with the default values' do
       it 'has the privacy text' do
diff --git a/spec/models/relationship_filter_spec.rb b/spec/models/relationship_filter_spec.rb
index fccd42aaad0622..b56da91f8d6acc 100644
--- a/spec/models/relationship_filter_spec.rb
+++ b/spec/models/relationship_filter_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe RelationshipFilter do
+RSpec.describe RelationshipFilter do
   let(:account) { Fabricate(:account) }
 
   describe '#results' do
diff --git a/spec/models/report_filter_spec.rb b/spec/models/report_filter_spec.rb
index 6baf0ea421c54e..8668eb3d1085e8 100644
--- a/spec/models/report_filter_spec.rb
+++ b/spec/models/report_filter_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe ReportFilter do
+RSpec.describe ReportFilter do
   describe 'with empty params' do
     it 'defaults to unresolved reports list' do
       filter = described_class.new({})
diff --git a/spec/models/report_spec.rb b/spec/models/report_spec.rb
index d01d37bd8bba0e..a0e4f6fafd5e71 100644
--- a/spec/models/report_spec.rb
+++ b/spec/models/report_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Report do
+RSpec.describe Report do
   describe 'statuses' do
     it 'returns the statuses for the report' do
       status = Fabricate(:status)
diff --git a/spec/models/rule_spec.rb b/spec/models/rule_spec.rb
index c9b9c55028f366..375483e0dbbafb 100644
--- a/spec/models/rule_spec.rb
+++ b/spec/models/rule_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Rule do
+RSpec.describe Rule do
   describe 'scopes' do
     describe 'ordered' do
       let(:deleted_rule) { Fabricate(:rule, deleted_at: 10.days.ago) }
diff --git a/spec/models/status_edit_spec.rb b/spec/models/status_edit_spec.rb
index 2d3351452258bc..7a469b44dc80b7 100644
--- a/spec/models/status_edit_spec.rb
+++ b/spec/models/status_edit_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe StatusEdit do
+RSpec.describe StatusEdit do
   describe '#reblog?' do
     it 'returns false' do
       record = described_class.new
diff --git a/spec/models/tag_feed_spec.rb b/spec/models/tag_feed_spec.rb
index 61b8d8d824ec46..578fc78238b317 100644
--- a/spec/models/tag_feed_spec.rb
+++ b/spec/models/tag_feed_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe TagFeed do
+RSpec.describe TagFeed do
   describe '#get' do
     let(:account) { Fabricate(:account) }
     let(:tag_cats) { Fabricate(:tag, name: 'cats') }
diff --git a/spec/policies/account_warning_preset_policy_spec.rb b/spec/policies/account_warning_preset_policy_spec.rb
index 63bf33de249948..53e224f19f7f00 100644
--- a/spec/policies/account_warning_preset_policy_spec.rb
+++ b/spec/policies/account_warning_preset_policy_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 require 'pundit/rspec'
 
-describe AccountWarningPresetPolicy do
+RSpec.describe AccountWarningPresetPolicy do
   let(:policy) { described_class }
   let(:admin)   { Fabricate(:user, role: UserRole.find_by(name: 'Admin')).account }
   let(:john)    { Fabricate(:account) }
diff --git a/spec/policies/admin/status_policy_spec.rb b/spec/policies/admin/status_policy_spec.rb
index af9f7716be382c..07af425516d93b 100644
--- a/spec/policies/admin/status_policy_spec.rb
+++ b/spec/policies/admin/status_policy_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 require 'pundit/rspec'
 
-describe Admin::StatusPolicy do
+RSpec.describe Admin::StatusPolicy do
   let(:policy) { described_class }
   let(:admin)   { Fabricate(:user, role: UserRole.find_by(name: 'Admin')).account }
   let(:john)    { Fabricate(:account) }
diff --git a/spec/policies/announcement_policy_spec.rb b/spec/policies/announcement_policy_spec.rb
index 3d230b3cb46179..503ffca6dca518 100644
--- a/spec/policies/announcement_policy_spec.rb
+++ b/spec/policies/announcement_policy_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 require 'pundit/rspec'
 
-describe AnnouncementPolicy do
+RSpec.describe AnnouncementPolicy do
   let(:policy) { described_class }
   let(:admin)   { Fabricate(:user, role: UserRole.find_by(name: 'Admin')).account }
   let(:john)    { Fabricate(:account) }
diff --git a/spec/policies/appeal_policy_spec.rb b/spec/policies/appeal_policy_spec.rb
index d7498eb9f09eae..1bf8ce0a0da0e6 100644
--- a/spec/policies/appeal_policy_spec.rb
+++ b/spec/policies/appeal_policy_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 require 'pundit/rspec'
 
-describe AppealPolicy do
+RSpec.describe AppealPolicy do
   let(:policy) { described_class }
   let(:admin)   { Fabricate(:user, role: UserRole.find_by(name: 'Admin')).account }
   let(:john)    { Fabricate(:account) }
diff --git a/spec/policies/canonical_email_block_policy_spec.rb b/spec/policies/canonical_email_block_policy_spec.rb
index 0e55febfa90fa4..f5029d9e6b60e8 100644
--- a/spec/policies/canonical_email_block_policy_spec.rb
+++ b/spec/policies/canonical_email_block_policy_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 require 'pundit/rspec'
 
-describe CanonicalEmailBlockPolicy do
+RSpec.describe CanonicalEmailBlockPolicy do
   let(:policy) { described_class }
   let(:admin)   { Fabricate(:user, role: UserRole.find_by(name: 'Admin')).account }
   let(:john)    { Fabricate(:account) }
diff --git a/spec/policies/delivery_policy_spec.rb b/spec/policies/delivery_policy_spec.rb
index fbcbf390d73312..bb82389eec8a47 100644
--- a/spec/policies/delivery_policy_spec.rb
+++ b/spec/policies/delivery_policy_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 require 'pundit/rspec'
 
-describe DeliveryPolicy do
+RSpec.describe DeliveryPolicy do
   let(:policy) { described_class }
   let(:admin)   { Fabricate(:user, role: UserRole.find_by(name: 'Admin')).account }
   let(:john)    { Fabricate(:account) }
diff --git a/spec/policies/follow_recommendation_policy_spec.rb b/spec/policies/follow_recommendation_policy_spec.rb
index 01f4da0be2929e..ae74d5c3a862ab 100644
--- a/spec/policies/follow_recommendation_policy_spec.rb
+++ b/spec/policies/follow_recommendation_policy_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 require 'pundit/rspec'
 
-describe FollowRecommendationPolicy do
+RSpec.describe FollowRecommendationPolicy do
   let(:policy) { described_class }
   let(:admin)   { Fabricate(:user, role: UserRole.find_by(name: 'Admin')).account }
   let(:john)    { Fabricate(:account) }
diff --git a/spec/policies/ip_block_policy_spec.rb b/spec/policies/ip_block_policy_spec.rb
index 3cfa85863ca7fe..97bc239e9ac91e 100644
--- a/spec/policies/ip_block_policy_spec.rb
+++ b/spec/policies/ip_block_policy_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 require 'pundit/rspec'
 
-describe IpBlockPolicy do
+RSpec.describe IpBlockPolicy do
   let(:policy) { described_class }
   let(:admin)   { Fabricate(:user, role: UserRole.find_by(name: 'Admin')).account }
   let(:john)    { Fabricate(:account) }
diff --git a/spec/policies/preview_card_policy_spec.rb b/spec/policies/preview_card_policy_spec.rb
index d6675c5b341ad2..a1944303e17ffc 100644
--- a/spec/policies/preview_card_policy_spec.rb
+++ b/spec/policies/preview_card_policy_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 require 'pundit/rspec'
 
-describe PreviewCardPolicy do
+RSpec.describe PreviewCardPolicy do
   let(:policy) { described_class }
   let(:admin)   { Fabricate(:user, role: UserRole.find_by(name: 'Admin')).account }
   let(:john)    { Fabricate(:account) }
diff --git a/spec/policies/preview_card_provider_policy_spec.rb b/spec/policies/preview_card_provider_policy_spec.rb
index 8d3715de9552ff..676039a1b79a97 100644
--- a/spec/policies/preview_card_provider_policy_spec.rb
+++ b/spec/policies/preview_card_provider_policy_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 require 'pundit/rspec'
 
-describe PreviewCardProviderPolicy do
+RSpec.describe PreviewCardProviderPolicy do
   let(:policy) { described_class }
   let(:admin)   { Fabricate(:user, role: UserRole.find_by(name: 'Admin')).account }
   let(:john)    { Fabricate(:account) }
diff --git a/spec/policies/rule_policy_spec.rb b/spec/policies/rule_policy_spec.rb
index 0e45f6df02f9da..5d435e38c1fe33 100644
--- a/spec/policies/rule_policy_spec.rb
+++ b/spec/policies/rule_policy_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 require 'pundit/rspec'
 
-describe RulePolicy do
+RSpec.describe RulePolicy do
   let(:policy) { described_class }
   let(:admin)   { Fabricate(:user, role: UserRole.find_by(name: 'Admin')).account }
   let(:john)    { Fabricate(:account) }
diff --git a/spec/policies/webhook_policy_spec.rb b/spec/policies/webhook_policy_spec.rb
index 909311461a842f..96aaae2c306726 100644
--- a/spec/policies/webhook_policy_spec.rb
+++ b/spec/policies/webhook_policy_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 require 'pundit/rspec'
 
-describe WebhookPolicy do
+RSpec.describe WebhookPolicy do
   let(:policy) { described_class }
   let(:admin)   { Fabricate(:user, role: UserRole.find_by(name: 'Admin')).account }
   let(:john)    { Fabricate(:account) }
diff --git a/spec/presenters/instance_presenter_spec.rb b/spec/presenters/instance_presenter_spec.rb
index 516c7e9896a7e3..42f5200f3af4c5 100644
--- a/spec/presenters/instance_presenter_spec.rb
+++ b/spec/presenters/instance_presenter_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe InstancePresenter do
+RSpec.describe InstancePresenter do
   let(:instance_presenter) { described_class.new }
 
   describe '#description' do
diff --git a/spec/requests/account_show_page_spec.rb b/spec/requests/account_show_page_spec.rb
index bdcec12fdb5a59..d0857c8980ec3e 100644
--- a/spec/requests/account_show_page_spec.rb
+++ b/spec/requests/account_show_page_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'The account show page' do
+RSpec.describe 'The account show page' do
   it 'has valid opengraph tags' do
     alice = Fabricate(:account, username: 'alice', display_name: 'Alice')
     _status = Fabricate(:status, account: alice, text: 'Hello World')
diff --git a/spec/requests/accounts_spec.rb b/spec/requests/accounts_spec.rb
index 238524c75c7ec1..d53816eff0632d 100644
--- a/spec/requests/accounts_spec.rb
+++ b/spec/requests/accounts_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Accounts show response' do
+RSpec.describe 'Accounts show response' do
   let(:account) { Fabricate(:account) }
 
   context 'with an unapproved account' do
diff --git a/spec/requests/anonymous_cookies_spec.rb b/spec/requests/anonymous_cookies_spec.rb
index 337ed4ec31cd28..235dd46a63dcd7 100644
--- a/spec/requests/anonymous_cookies_spec.rb
+++ b/spec/requests/anonymous_cookies_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Anonymous visits' do
+RSpec.describe 'Anonymous visits' do
   around do |example|
     old = ActionController::Base.allow_forgery_protection
     ActionController::Base.allow_forgery_protection = true
diff --git a/spec/requests/api/v1/accounts/familiar_followers_spec.rb b/spec/requests/api/v1/accounts/familiar_followers_spec.rb
index fdc0a3a9323e1a..475f1b17e4add0 100644
--- a/spec/requests/api/v1/accounts/familiar_followers_spec.rb
+++ b/spec/requests/api/v1/accounts/familiar_followers_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Accounts Familiar Followers API' do
+RSpec.describe 'Accounts Familiar Followers API' do
   let(:user)     { Fabricate(:user) }
   let(:token)    { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
   let(:scopes)   { 'read:follows' }
diff --git a/spec/requests/api/v1/accounts/follower_accounts_spec.rb b/spec/requests/api/v1/accounts/follower_accounts_spec.rb
index 7ff92d6a4809c5..400b1c7aff1c85 100644
--- a/spec/requests/api/v1/accounts/follower_accounts_spec.rb
+++ b/spec/requests/api/v1/accounts/follower_accounts_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'API V1 Accounts FollowerAccounts' do
+RSpec.describe 'API V1 Accounts FollowerAccounts' do
   let(:user)    { Fabricate(:user) }
   let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
   let(:scopes)   { 'read:accounts' }
diff --git a/spec/requests/api/v1/accounts/following_accounts_spec.rb b/spec/requests/api/v1/accounts/following_accounts_spec.rb
index b343a48654cd22..b0bb5141ca2799 100644
--- a/spec/requests/api/v1/accounts/following_accounts_spec.rb
+++ b/spec/requests/api/v1/accounts/following_accounts_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'API V1 Accounts FollowingAccounts' do
+RSpec.describe 'API V1 Accounts FollowingAccounts' do
   let(:user)    { Fabricate(:user) }
   let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
   let(:scopes)   { 'read:accounts' }
diff --git a/spec/requests/api/v1/accounts/identity_proofs_spec.rb b/spec/requests/api/v1/accounts/identity_proofs_spec.rb
index 3727af7e8931bb..d1d9db8e737973 100644
--- a/spec/requests/api/v1/accounts/identity_proofs_spec.rb
+++ b/spec/requests/api/v1/accounts/identity_proofs_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Accounts Identity Proofs API' do
+RSpec.describe 'Accounts Identity Proofs API' do
   let(:user)     { Fabricate(:user) }
   let(:token)    { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
   let(:scopes)   { 'read:accounts' }
diff --git a/spec/requests/api/v1/accounts/lists_spec.rb b/spec/requests/api/v1/accounts/lists_spec.rb
index 48c0337e5497cf..8b04f07f652519 100644
--- a/spec/requests/api/v1/accounts/lists_spec.rb
+++ b/spec/requests/api/v1/accounts/lists_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Accounts Lists API' do
+RSpec.describe 'Accounts Lists API' do
   let(:user)     { Fabricate(:user) }
   let(:token)    { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
   let(:scopes)   { 'read:lists' }
diff --git a/spec/requests/api/v1/accounts/lookup_spec.rb b/spec/requests/api/v1/accounts/lookup_spec.rb
index 4c022c7c1316fe..dfd9fad49d8a96 100644
--- a/spec/requests/api/v1/accounts/lookup_spec.rb
+++ b/spec/requests/api/v1/accounts/lookup_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Accounts Lookup API' do
+RSpec.describe 'Accounts Lookup API' do
   let(:user)     { Fabricate(:user) }
   let(:token)    { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
   let(:scopes)   { 'read:accounts' }
diff --git a/spec/requests/api/v1/accounts/notes_spec.rb b/spec/requests/api/v1/accounts/notes_spec.rb
index 4f3ac68c7479c8..b8c493abcc96d0 100644
--- a/spec/requests/api/v1/accounts/notes_spec.rb
+++ b/spec/requests/api/v1/accounts/notes_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Accounts Notes API' do
+RSpec.describe 'Accounts Notes API' do
   let(:user)     { Fabricate(:user) }
   let(:token)    { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
   let(:scopes)   { 'write:accounts' }
diff --git a/spec/requests/api/v1/accounts/pins_spec.rb b/spec/requests/api/v1/accounts/pins_spec.rb
index c293715f7ed237..c66b80c7fd98d5 100644
--- a/spec/requests/api/v1/accounts/pins_spec.rb
+++ b/spec/requests/api/v1/accounts/pins_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Accounts Pins API' do
+RSpec.describe 'Accounts Pins API' do
   let(:user)     { Fabricate(:user) }
   let(:token)    { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
   let(:scopes)   { 'write:accounts' }
diff --git a/spec/requests/api/v1/accounts/relationships_spec.rb b/spec/requests/api/v1/accounts/relationships_spec.rb
index b06ce0509df366..76b1830bbe0ac2 100644
--- a/spec/requests/api/v1/accounts/relationships_spec.rb
+++ b/spec/requests/api/v1/accounts/relationships_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'GET /api/v1/accounts/relationships' do
+RSpec.describe 'GET /api/v1/accounts/relationships' do
   subject do
     get '/api/v1/accounts/relationships', headers: headers, params: params
   end
diff --git a/spec/requests/api/v1/accounts/search_spec.rb b/spec/requests/api/v1/accounts/search_spec.rb
index 76b32e7b2ca3af..f6ab7a85319da1 100644
--- a/spec/requests/api/v1/accounts/search_spec.rb
+++ b/spec/requests/api/v1/accounts/search_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Accounts Search API' do
+RSpec.describe 'Accounts Search API' do
   let(:user)     { Fabricate(:user) }
   let(:token)    { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
   let(:scopes)   { 'read:accounts' }
diff --git a/spec/requests/api/v1/accounts/statuses_spec.rb b/spec/requests/api/v1/accounts/statuses_spec.rb
index 97cdbe0156f7b0..4a4d9383db31bb 100644
--- a/spec/requests/api/v1/accounts/statuses_spec.rb
+++ b/spec/requests/api/v1/accounts/statuses_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'API V1 Accounts Statuses' do
+RSpec.describe 'API V1 Accounts Statuses' do
   let(:user) { Fabricate(:user) }
   let(:scopes) { 'read:statuses' }
   let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
diff --git a/spec/requests/api/v1/accounts_spec.rb b/spec/requests/api/v1/accounts_spec.rb
index 3432106a469f54..e31644352b7eac 100644
--- a/spec/requests/api/v1/accounts_spec.rb
+++ b/spec/requests/api/v1/accounts_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe '/api/v1/accounts' do
+RSpec.describe '/api/v1/accounts' do
   let(:user)    { Fabricate(:user) }
   let(:scopes)  { '' }
   let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
diff --git a/spec/requests/api/v1/admin/dimensions_spec.rb b/spec/requests/api/v1/admin/dimensions_spec.rb
index 87534a74b85c5b..43e2db00c5c2d5 100644
--- a/spec/requests/api/v1/admin/dimensions_spec.rb
+++ b/spec/requests/api/v1/admin/dimensions_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Admin Dimensions' do
+RSpec.describe 'Admin Dimensions' do
   let(:user)    { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
   let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
   let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
diff --git a/spec/requests/api/v1/admin/measures_spec.rb b/spec/requests/api/v1/admin/measures_spec.rb
index 80fed79d9a6720..56a2c1eaee38fb 100644
--- a/spec/requests/api/v1/admin/measures_spec.rb
+++ b/spec/requests/api/v1/admin/measures_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Admin Measures' do
+RSpec.describe 'Admin Measures' do
   let(:user)    { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
   let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
   let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
diff --git a/spec/requests/api/v1/admin/retention_spec.rb b/spec/requests/api/v1/admin/retention_spec.rb
index 9178335ba5f55b..138959a0ab7015 100644
--- a/spec/requests/api/v1/admin/retention_spec.rb
+++ b/spec/requests/api/v1/admin/retention_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Admin Retention' do
+RSpec.describe 'Admin Retention' do
   let(:user)    { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
   let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
   let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
diff --git a/spec/requests/api/v1/admin/trends/links/links_spec.rb b/spec/requests/api/v1/admin/trends/links/links_spec.rb
index 48842828b32b0f..082af785ab0e37 100644
--- a/spec/requests/api/v1/admin/trends/links/links_spec.rb
+++ b/spec/requests/api/v1/admin/trends/links/links_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Links' do
+RSpec.describe 'Links' do
   let(:role)    { UserRole.find_by(name: 'Admin') }
   let(:user)    { Fabricate(:user, role: role) }
   let(:scopes)  { 'admin:read admin:write' }
diff --git a/spec/requests/api/v1/admin/trends/links/preview_card_providers_spec.rb b/spec/requests/api/v1/admin/trends/links/preview_card_providers_spec.rb
index 384a305d4a0551..193906ab057b6d 100644
--- a/spec/requests/api/v1/admin/trends/links/preview_card_providers_spec.rb
+++ b/spec/requests/api/v1/admin/trends/links/preview_card_providers_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'API V1 Admin Trends Links Preview Card Providers' do
+RSpec.describe 'API V1 Admin Trends Links Preview Card Providers' do
   let(:role)   { UserRole.find_by(name: 'Admin') }
   let(:user)   { Fabricate(:user, role: role) }
   let(:scopes) { 'admin:read admin:write' }
diff --git a/spec/requests/api/v1/admin/trends/statuses_spec.rb b/spec/requests/api/v1/admin/trends/statuses_spec.rb
index 04aa0465f2809e..e33a9658a9ff1e 100644
--- a/spec/requests/api/v1/admin/trends/statuses_spec.rb
+++ b/spec/requests/api/v1/admin/trends/statuses_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'API V1 Admin Trends Statuses' do
+RSpec.describe 'API V1 Admin Trends Statuses' do
   let(:role)   { UserRole.find_by(name: 'Admin') }
   let(:user)   { Fabricate(:user, role: role) }
   let(:scopes) { 'admin:read admin:write' }
diff --git a/spec/requests/api/v1/admin/trends/tags_spec.rb b/spec/requests/api/v1/admin/trends/tags_spec.rb
index b1437dad8dbd0e..748a27283c14b7 100644
--- a/spec/requests/api/v1/admin/trends/tags_spec.rb
+++ b/spec/requests/api/v1/admin/trends/tags_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'API V1 Admin Trends Tags' do
+RSpec.describe 'API V1 Admin Trends Tags' do
   let(:role)   { UserRole.find_by(name: 'Admin') }
   let(:user)   { Fabricate(:user, role: role) }
   let(:scopes) { 'admin:read admin:write' }
diff --git a/spec/requests/api/v1/annual_reports_spec.rb b/spec/requests/api/v1/annual_reports_spec.rb
index 60cd8ed5262eeb..bab184787f3e4a 100644
--- a/spec/requests/api/v1/annual_reports_spec.rb
+++ b/spec/requests/api/v1/annual_reports_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'API V1 Annual Reports' do
+RSpec.describe 'API V1 Annual Reports' do
   let(:user)    { Fabricate(:user) }
   let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
   let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
diff --git a/spec/requests/api/v1/apps/credentials_spec.rb b/spec/requests/api/v1/apps/credentials_spec.rb
index 6e6970ce53f03d..b899999640bff0 100644
--- a/spec/requests/api/v1/apps/credentials_spec.rb
+++ b/spec/requests/api/v1/apps/credentials_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Credentials' do
+RSpec.describe 'Credentials' do
   describe 'GET /api/v1/apps/verify_credentials' do
     subject do
       get '/api/v1/apps/verify_credentials', headers: headers
diff --git a/spec/requests/api/v1/csp_spec.rb b/spec/requests/api/v1/csp_spec.rb
index 2db52ac72502fd..5d61d7f3f54712 100644
--- a/spec/requests/api/v1/csp_spec.rb
+++ b/spec/requests/api/v1/csp_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'API namespace minimal Content-Security-Policy' do
+RSpec.describe 'API namespace minimal Content-Security-Policy' do
   before { stub_tests_controller }
 
   after { Rails.application.reload_routes! }
diff --git a/spec/requests/api/v1/custom_emojis_spec.rb b/spec/requests/api/v1/custom_emojis_spec.rb
index 2f0dc729449c51..798d8e29ed0b71 100644
--- a/spec/requests/api/v1/custom_emojis_spec.rb
+++ b/spec/requests/api/v1/custom_emojis_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Custom Emojis' do
+RSpec.describe 'Custom Emojis' do
   let(:user)    { Fabricate(:user) }
   let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id) }
   let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
diff --git a/spec/requests/api/v1/directories_spec.rb b/spec/requests/api/v1/directories_spec.rb
index 0a1864d136cc5e..94306c06ec32fe 100644
--- a/spec/requests/api/v1/directories_spec.rb
+++ b/spec/requests/api/v1/directories_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Directories API' do
+RSpec.describe 'Directories API' do
   let(:user)    { Fabricate(:user, confirmed_at: nil) }
   let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
   let(:scopes)  { 'read:follows' }
diff --git a/spec/requests/api/v1/endorsements_spec.rb b/spec/requests/api/v1/endorsements_spec.rb
index e267f2abd26f14..255211a4041848 100644
--- a/spec/requests/api/v1/endorsements_spec.rb
+++ b/spec/requests/api/v1/endorsements_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Endorsements' do
+RSpec.describe 'Endorsements' do
   let(:user)    { Fabricate(:user) }
   let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
   let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
diff --git a/spec/requests/api/v1/featured_tags/suggestions_spec.rb b/spec/requests/api/v1/featured_tags/suggestions_spec.rb
index 00451540cac0ea..0a7bfe5cda9f78 100644
--- a/spec/requests/api/v1/featured_tags/suggestions_spec.rb
+++ b/spec/requests/api/v1/featured_tags/suggestions_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Featured Tags Suggestions API' do
+RSpec.describe 'Featured Tags Suggestions API' do
   let(:user)    { Fabricate(:user) }
   let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
   let(:scopes)  { 'read:accounts' }
diff --git a/spec/requests/api/v1/instance_spec.rb b/spec/requests/api/v1/instance_spec.rb
index 9cac280c4df0c3..f0a4ceadb8964a 100644
--- a/spec/requests/api/v1/instance_spec.rb
+++ b/spec/requests/api/v1/instance_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Instances' do
+RSpec.describe 'Instances' do
   let(:user)    { Fabricate(:user) }
   let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id) }
   let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
diff --git a/spec/requests/api/v1/instances/translation_languages_spec.rb b/spec/requests/api/v1/instances/translation_languages_spec.rb
index 7cfb24e86fbe34..e5a480c17515cd 100644
--- a/spec/requests/api/v1/instances/translation_languages_spec.rb
+++ b/spec/requests/api/v1/instances/translation_languages_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Translation Languages' do
+RSpec.describe 'Translation Languages' do
   describe 'GET /api/v1/instances/translation_languages' do
     context 'when no translation service is configured' do
       it 'returns empty language matrix', :aggregate_failures do
diff --git a/spec/requests/api/v1/peers/search_spec.rb b/spec/requests/api/v1/peers/search_spec.rb
index dcdea387a5b455..87b0dc4f642c2f 100644
--- a/spec/requests/api/v1/peers/search_spec.rb
+++ b/spec/requests/api/v1/peers/search_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'API Peers Search' do
+RSpec.describe 'API Peers Search' do
   describe 'GET /api/v1/peers/search' do
     context 'when peers api is disabled' do
       before do
diff --git a/spec/requests/api/v1/preferences_spec.rb b/spec/requests/api/v1/preferences_spec.rb
index 6f4188c35a1e1f..6508b51c04e6d9 100644
--- a/spec/requests/api/v1/preferences_spec.rb
+++ b/spec/requests/api/v1/preferences_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Preferences' do
+RSpec.describe 'Preferences' do
   let(:user)    { Fabricate(:user) }
   let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
   let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
diff --git a/spec/requests/api/v1/push/subscriptions_spec.rb b/spec/requests/api/v1/push/subscriptions_spec.rb
index 54ef5a13ade6b8..6674b048e854b2 100644
--- a/spec/requests/api/v1/push/subscriptions_spec.rb
+++ b/spec/requests/api/v1/push/subscriptions_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'API V1 Push Subscriptions' do
+RSpec.describe 'API V1 Push Subscriptions' do
   let(:user) { Fabricate(:user) }
   let(:endpoint) { 'https://fcm.googleapis.com/fcm/send/fiuH06a27qE:APA91bHnSiGcLwdaxdyqVXNDR9w1NlztsHb6lyt5WDKOC_Z_Q8BlFxQoR8tWFSXUIDdkyw0EdvxTu63iqamSaqVSevW5LfoFwojws8XYDXv_NRRLH6vo2CdgiN4jgHv5VLt2A8ah6lUX' }
   let(:keys) do
diff --git a/spec/requests/api/v1/scheduled_status_spec.rb b/spec/requests/api/v1/scheduled_status_spec.rb
index f4612410bf38cc..b35d297a60ee95 100644
--- a/spec/requests/api/v1/scheduled_status_spec.rb
+++ b/spec/requests/api/v1/scheduled_status_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Scheduled Statuses' do
+RSpec.describe 'Scheduled Statuses' do
   let(:user)    { Fabricate(:user) }
   let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
   let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
diff --git a/spec/requests/api/v1/statuses/histories_spec.rb b/spec/requests/api/v1/statuses/histories_spec.rb
index b3761ca6882a44..f13bf798670f9e 100644
--- a/spec/requests/api/v1/statuses/histories_spec.rb
+++ b/spec/requests/api/v1/statuses/histories_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'API V1 Statuses Histories' do
+RSpec.describe 'API V1 Statuses Histories' do
   let(:user)  { Fabricate(:user) }
   let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
   let(:scopes)  { 'read:statuses' }
diff --git a/spec/requests/api/v1/statuses/mutes_spec.rb b/spec/requests/api/v1/statuses/mutes_spec.rb
index 72fd7d9d11503d..69ae948852888a 100644
--- a/spec/requests/api/v1/statuses/mutes_spec.rb
+++ b/spec/requests/api/v1/statuses/mutes_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'API V1 Statuses Mutes' do
+RSpec.describe 'API V1 Statuses Mutes' do
   let(:user)  { Fabricate(:user) }
   let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
   let(:scopes)  { 'write:mutes' }
diff --git a/spec/requests/api/v1/statuses/pins_spec.rb b/spec/requests/api/v1/statuses/pins_spec.rb
index db07fa424f7a61..3be1a16ee19a82 100644
--- a/spec/requests/api/v1/statuses/pins_spec.rb
+++ b/spec/requests/api/v1/statuses/pins_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Pins' do
+RSpec.describe 'Pins' do
   let(:user)    { Fabricate(:user) }
   let(:scopes)  { 'write:accounts' }
   let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
diff --git a/spec/requests/api/v1/statuses/reblogs_spec.rb b/spec/requests/api/v1/statuses/reblogs_spec.rb
index 77542d294e3187..0978c890a4bf81 100644
--- a/spec/requests/api/v1/statuses/reblogs_spec.rb
+++ b/spec/requests/api/v1/statuses/reblogs_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'API V1 Statuses Reblogs' do
+RSpec.describe 'API V1 Statuses Reblogs' do
   let(:user)  { Fabricate(:user) }
   let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
   let(:scopes)  { 'write:statuses' }
diff --git a/spec/requests/api/v1/statuses/translations_spec.rb b/spec/requests/api/v1/statuses/translations_spec.rb
index e2ab5d0b806825..047b2f0485548e 100644
--- a/spec/requests/api/v1/statuses/translations_spec.rb
+++ b/spec/requests/api/v1/statuses/translations_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'API V1 Statuses Translations' do
+RSpec.describe 'API V1 Statuses Translations' do
   let(:user)  { Fabricate(:user) }
   let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
   let(:scopes)  { 'read:statuses' }
diff --git a/spec/requests/api/v1/statuses_spec.rb b/spec/requests/api/v1/statuses_spec.rb
index 3e91fcdd98ed7d..1a211d14d87f6c 100644
--- a/spec/requests/api/v1/statuses_spec.rb
+++ b/spec/requests/api/v1/statuses_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe '/api/v1/statuses' do
+RSpec.describe '/api/v1/statuses' do
   context 'with an oauth token' do
     let(:user)  { Fabricate(:user) }
     let(:client_app) { Fabricate(:application, name: 'Test app', website: 'http://testapp.com') }
diff --git a/spec/requests/api/v1/streaming_spec.rb b/spec/requests/api/v1/streaming_spec.rb
index 6ce35c2fe60f14..a1f64846cf7d6a 100644
--- a/spec/requests/api/v1/streaming_spec.rb
+++ b/spec/requests/api/v1/streaming_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'API V1 Streaming' do
+RSpec.describe 'API V1 Streaming' do
   around do |example|
     before = Rails.configuration.x.streaming_api_base_url
     Rails.configuration.x.streaming_api_base_url = "wss://#{Rails.configuration.x.web_domain}"
diff --git a/spec/requests/api/v1/timelines/home_spec.rb b/spec/requests/api/v1/timelines/home_spec.rb
index 96bd153affe5a4..d158e0801c1e6d 100644
--- a/spec/requests/api/v1/timelines/home_spec.rb
+++ b/spec/requests/api/v1/timelines/home_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Home', :inline_jobs do
+RSpec.describe 'Home', :inline_jobs do
   let(:user)    { Fabricate(:user) }
   let(:scopes)  { 'read:statuses' }
   let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
diff --git a/spec/requests/api/v1/timelines/link_spec.rb b/spec/requests/api/v1/timelines/link_spec.rb
index e1c914ab81a4ac..67d8bca0229bfd 100644
--- a/spec/requests/api/v1/timelines/link_spec.rb
+++ b/spec/requests/api/v1/timelines/link_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Link' do
+RSpec.describe 'Link' do
   let(:user)    { Fabricate(:user) }
   let(:scopes)  { 'read:statuses' }
   let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
diff --git a/spec/requests/api/v1/timelines/list_spec.rb b/spec/requests/api/v1/timelines/list_spec.rb
index 98d24567459c51..753c784866519f 100644
--- a/spec/requests/api/v1/timelines/list_spec.rb
+++ b/spec/requests/api/v1/timelines/list_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'API V1 Timelines List' do
+RSpec.describe 'API V1 Timelines List' do
   let(:user) { Fabricate(:user) }
   let(:scopes)  { 'read:statuses' }
   let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
diff --git a/spec/requests/api/v1/timelines/public_spec.rb b/spec/requests/api/v1/timelines/public_spec.rb
index 100f6c1bfc17ec..1fc62b393268ac 100644
--- a/spec/requests/api/v1/timelines/public_spec.rb
+++ b/spec/requests/api/v1/timelines/public_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Public' do
+RSpec.describe 'Public' do
   let(:user)    { Fabricate(:user) }
   let(:scopes)  { 'read:statuses' }
   let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
diff --git a/spec/requests/api/v2/instance_spec.rb b/spec/requests/api/v2/instance_spec.rb
index 2636970d6e5a36..2f01db500345d8 100644
--- a/spec/requests/api/v2/instance_spec.rb
+++ b/spec/requests/api/v2/instance_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Instances' do
+RSpec.describe 'Instances' do
   let(:user)    { Fabricate(:user) }
   let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id) }
   let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
diff --git a/spec/requests/api/v2/search_spec.rb b/spec/requests/api/v2/search_spec.rb
index 13bcf17984b11b..039e7513cdfeca 100644
--- a/spec/requests/api/v2/search_spec.rb
+++ b/spec/requests/api/v2/search_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Search API' do
+RSpec.describe 'Search API' do
   context 'with token' do
     let(:user)    { Fabricate(:user) }
     let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
diff --git a/spec/requests/api/v2/suggestions_spec.rb b/spec/requests/api/v2/suggestions_spec.rb
index a7d6a0864f542e..8895efd23de9e0 100644
--- a/spec/requests/api/v2/suggestions_spec.rb
+++ b/spec/requests/api/v2/suggestions_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Suggestions API' do
+RSpec.describe 'Suggestions API' do
   let(:user)    { Fabricate(:user) }
   let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
   let(:scopes)  { 'read' }
diff --git a/spec/requests/backups_spec.rb b/spec/requests/backups_spec.rb
index a6c2efe0db02f1..a8c1124ed2611b 100644
--- a/spec/requests/backups_spec.rb
+++ b/spec/requests/backups_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Backups' do
+RSpec.describe 'Backups' do
   include RoutingHelper
 
   describe 'GET backups#download' do
diff --git a/spec/requests/cache_spec.rb b/spec/requests/cache_spec.rb
index 91e5b022e3951a..9cce241b38b66c 100644
--- a/spec/requests/cache_spec.rb
+++ b/spec/requests/cache_spec.rb
@@ -118,7 +118,7 @@ module DisabledAnonymousAPI
   end
 end
 
-describe 'Caching behavior' do
+RSpec.describe 'Caching behavior' do
   shared_examples 'cachable response' do |http_success: false|
     it 'does not set cookies or set public cache control', :aggregate_failures do
       expect(response.cookies).to be_empty
diff --git a/spec/requests/catch_all_route_request_spec.rb b/spec/requests/catch_all_route_request_spec.rb
index e600bedfe07eb9..e7ea21524c5994 100644
--- a/spec/requests/catch_all_route_request_spec.rb
+++ b/spec/requests/catch_all_route_request_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'The catch all route' do
+RSpec.describe 'The catch all route' do
   describe 'with a simple value' do
     it 'returns a 404 page as html' do
       get '/test'
diff --git a/spec/requests/content_security_policy_spec.rb b/spec/requests/content_security_policy_spec.rb
index ba6fe47741665b..7520ecb0db4cd0 100644
--- a/spec/requests/content_security_policy_spec.rb
+++ b/spec/requests/content_security_policy_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Content-Security-Policy' do
+RSpec.describe 'Content-Security-Policy' do
   before { allow(SecureRandom).to receive(:base64).with(16).and_return('ZbA+JmE7+bK8F5qvADZHuQ==') }
 
   it 'sets the expected CSP headers' do
diff --git a/spec/requests/custom_css_spec.rb b/spec/requests/custom_css_spec.rb
index 5271ed4a5a6d53..a46ebd7281f930 100644
--- a/spec/requests/custom_css_spec.rb
+++ b/spec/requests/custom_css_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Custom CSS' do
+RSpec.describe 'Custom CSS' do
   include RoutingHelper
 
   describe 'GET /custom.css' do
diff --git a/spec/requests/custom_stylesheets_spec.rb b/spec/requests/custom_stylesheets_spec.rb
index 128d173f3abb8a..9c5c058344e0b1 100644
--- a/spec/requests/custom_stylesheets_spec.rb
+++ b/spec/requests/custom_stylesheets_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Custom stylesheets' do
+RSpec.describe 'Custom stylesheets' do
   describe 'GET /custom.css' do
     before { get '/custom.css' }
 
diff --git a/spec/requests/disabled_oauth_endpoints_spec.rb b/spec/requests/disabled_oauth_endpoints_spec.rb
index 7c2c09f3804bf3..279d2576a35795 100644
--- a/spec/requests/disabled_oauth_endpoints_spec.rb
+++ b/spec/requests/disabled_oauth_endpoints_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Disabled OAuth routes' do
+RSpec.describe 'Disabled OAuth routes' do
   # These routes are disabled via the doorkeeper configuration for
   # `admin_authenticator`, as these routes should only be accessible by server
   # administrators. For now, these routes are not properly designed and
diff --git a/spec/requests/emojis_spec.rb b/spec/requests/emojis_spec.rb
index 458d500762c837..b2e4702f2dc95c 100644
--- a/spec/requests/emojis_spec.rb
+++ b/spec/requests/emojis_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Emojis' do
+RSpec.describe 'Emojis' do
   describe 'GET /emojis/:id' do
     let(:emoji) { Fabricate(:custom_emoji, shortcode: 'coolcat') }
 
diff --git a/spec/requests/health_spec.rb b/spec/requests/health_spec.rb
index 03317f9723986c..1d2f96bb3d5a80 100644
--- a/spec/requests/health_spec.rb
+++ b/spec/requests/health_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Health check endpoint' do
+RSpec.describe 'Health check endpoint' do
   describe 'GET /health' do
     it 'returns http success when server is functioning' do
       get '/health'
diff --git a/spec/requests/invite_spec.rb b/spec/requests/invite_spec.rb
index c44ef2419c0c20..4ce6c78e940aba 100644
--- a/spec/requests/invite_spec.rb
+++ b/spec/requests/invite_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'invites' do
+RSpec.describe 'invites' do
   let(:invite) { Fabricate(:invite) }
 
   context 'when requesting a JSON document' do
diff --git a/spec/requests/link_headers_spec.rb b/spec/requests/link_headers_spec.rb
index 522cff46427f0a..3116a54d6a41c4 100644
--- a/spec/requests/link_headers_spec.rb
+++ b/spec/requests/link_headers_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Link headers' do
+RSpec.describe 'Link headers' do
   describe 'on the account show page' do
     let(:account) { Fabricate(:account, username: 'test') }
 
diff --git a/spec/requests/localization_spec.rb b/spec/requests/localization_spec.rb
index b7fb53ed8d7374..26fc204ea4f609 100644
--- a/spec/requests/localization_spec.rb
+++ b/spec/requests/localization_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Localization' do
+RSpec.describe 'Localization' do
   around do |example|
     I18n.with_locale(I18n.locale) do
       example.run
diff --git a/spec/requests/log_out_spec.rb b/spec/requests/log_out_spec.rb
index 62ca1ac54728b3..62ede0c1060aea 100644
--- a/spec/requests/log_out_spec.rb
+++ b/spec/requests/log_out_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Log Out' do
+RSpec.describe 'Log Out' do
   include RoutingHelper
 
   describe 'DELETE /auth/sign_out' do
diff --git a/spec/requests/manifest_spec.rb b/spec/requests/manifest_spec.rb
index 55b8147d7eebaa..69e308e3ce9209 100644
--- a/spec/requests/manifest_spec.rb
+++ b/spec/requests/manifest_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Manifest' do
+RSpec.describe 'Manifest' do
   describe 'GET /manifest' do
     before { get '/manifest' }
 
diff --git a/spec/requests/media_proxy_spec.rb b/spec/requests/media_proxy_spec.rb
index 814d4c11664bcb..fb4801ee67a866 100644
--- a/spec/requests/media_proxy_spec.rb
+++ b/spec/requests/media_proxy_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Media Proxy' do
+RSpec.describe 'Media Proxy' do
   describe 'GET /media_proxy/:id' do
     before { stub_attachment_request }
 
diff --git a/spec/requests/omniauth_callbacks_spec.rb b/spec/requests/omniauth_callbacks_spec.rb
index 095535e48598e0..e13a49ec622782 100644
--- a/spec/requests/omniauth_callbacks_spec.rb
+++ b/spec/requests/omniauth_callbacks_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'OmniAuth callbacks' do
+RSpec.describe 'OmniAuth callbacks' do
   shared_examples 'omniauth provider callbacks' do |provider|
     subject { post send :"user_#{provider}_omniauth_callback_path" }
 
diff --git a/spec/requests/remote_interaction_helper_spec.rb b/spec/requests/remote_interaction_helper_spec.rb
index e6364fe8ce83e9..942f70b9a411a2 100644
--- a/spec/requests/remote_interaction_helper_spec.rb
+++ b/spec/requests/remote_interaction_helper_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Remote Interaction Helper' do
+RSpec.describe 'Remote Interaction Helper' do
   describe 'GET /remote_interaction_helper' do
     it 'returns http success' do
       get remote_interaction_helper_path
diff --git a/spec/requests/self_destruct_spec.rb b/spec/requests/self_destruct_spec.rb
index f71a2325e2a897..651a894c89b9d5 100644
--- a/spec/requests/self_destruct_spec.rb
+++ b/spec/requests/self_destruct_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Self-destruct mode' do
+RSpec.describe 'Self-destruct mode' do
   before do
     allow(SelfDestructHelper).to receive(:self_destruct?).and_return(true)
   end
diff --git a/spec/requests/settings/exports/blocked_accounts_spec.rb b/spec/requests/settings/exports/blocked_accounts_spec.rb
index f335ba18c05281..9d0768a1e333ec 100644
--- a/spec/requests/settings/exports/blocked_accounts_spec.rb
+++ b/spec/requests/settings/exports/blocked_accounts_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Settings / Exports / Blocked Accounts' do
+RSpec.describe 'Settings / Exports / Blocked Accounts' do
   describe 'GET /settings/exports/blocks' do
     context 'with a signed in user who has blocked accounts' do
       let(:user) { Fabricate :user }
diff --git a/spec/requests/settings/exports/blocked_domains_spec.rb b/spec/requests/settings/exports/blocked_domains_spec.rb
index 762907585f3a2b..838baf8cdb2fcd 100644
--- a/spec/requests/settings/exports/blocked_domains_spec.rb
+++ b/spec/requests/settings/exports/blocked_domains_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Settings / Exports / Blocked Domains' do
+RSpec.describe 'Settings / Exports / Blocked Domains' do
   describe 'GET /settings/exports/domain_blocks' do
     context 'with a signed in user who has blocked domains' do
       let(:account) { Fabricate :account, domain: 'example.com' }
diff --git a/spec/requests/settings/exports/bookmarks_spec.rb b/spec/requests/settings/exports/bookmarks_spec.rb
index f200e70383eef3..e97f4a84d2b06c 100644
--- a/spec/requests/settings/exports/bookmarks_spec.rb
+++ b/spec/requests/settings/exports/bookmarks_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Settings / Exports / Bookmarks' do
+RSpec.describe 'Settings / Exports / Bookmarks' do
   describe 'GET /settings/exports/bookmarks' do
     context 'with a signed in user who has bookmarks' do
       let(:account) { Fabricate(:account, domain: 'foo.bar') }
diff --git a/spec/requests/settings/exports/following_accounts_spec.rb b/spec/requests/settings/exports/following_accounts_spec.rb
index 268b72c4128160..c34ec261a696db 100644
--- a/spec/requests/settings/exports/following_accounts_spec.rb
+++ b/spec/requests/settings/exports/following_accounts_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Settings / Exports / Following Accounts' do
+RSpec.describe 'Settings / Exports / Following Accounts' do
   describe 'GET /settings/exports/follows' do
     context 'with a signed in user who is following accounts' do
       let(:user) { Fabricate :user }
diff --git a/spec/requests/settings/exports/lists_spec.rb b/spec/requests/settings/exports/lists_spec.rb
index b868f8dfda359f..4c13225bb99fd2 100644
--- a/spec/requests/settings/exports/lists_spec.rb
+++ b/spec/requests/settings/exports/lists_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Settings / Exports / Lists' do
+RSpec.describe 'Settings / Exports / Lists' do
   describe 'GET /settings/exports/lists' do
     context 'with a signed in user who has lists' do
       let(:account) { Fabricate(:account, username: 'test', domain: 'example.com') }
diff --git a/spec/requests/settings/exports/muted_accounts_spec.rb b/spec/requests/settings/exports/muted_accounts_spec.rb
index efdb0d8221f012..98ccb3e4a2be5c 100644
--- a/spec/requests/settings/exports/muted_accounts_spec.rb
+++ b/spec/requests/settings/exports/muted_accounts_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Settings / Exports / Muted Accounts' do
+RSpec.describe 'Settings / Exports / Muted Accounts' do
   describe 'GET /settings/exports/mutes' do
     context 'with a signed in user who has muted accounts' do
       let(:user) { Fabricate :user }
diff --git a/spec/requests/signature_verification_spec.rb b/spec/requests/signature_verification_spec.rb
index 401828c4a3c5d1..580d0283389b65 100644
--- a/spec/requests/signature_verification_spec.rb
+++ b/spec/requests/signature_verification_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'signature verification concern' do
+RSpec.describe 'signature verification concern' do
   before do
     stub_tests_controller
 
diff --git a/spec/requests/well_known/change_password_spec.rb b/spec/requests/well_known/change_password_spec.rb
index 04134b71ff5e68..77fec154127902 100644
--- a/spec/requests/well_known/change_password_spec.rb
+++ b/spec/requests/well_known/change_password_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'The /.well-known/change-password request' do
+RSpec.describe 'The /.well-known/change-password request' do
   it 'redirects to the change password page' do
     get '/.well-known/change-password'
 
diff --git a/spec/requests/well_known/host_meta_spec.rb b/spec/requests/well_known/host_meta_spec.rb
index ca10a51a01b26f..09f17baa894d64 100644
--- a/spec/requests/well_known/host_meta_spec.rb
+++ b/spec/requests/well_known/host_meta_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'The /.well-known/host-meta request' do
+RSpec.describe 'The /.well-known/host-meta request' do
   it 'returns http success with valid XML response' do
     get '/.well-known/host-meta'
 
diff --git a/spec/requests/well_known/node_info_spec.rb b/spec/requests/well_known/node_info_spec.rb
index 0934b0fde6fed8..d02732c32bb231 100644
--- a/spec/requests/well_known/node_info_spec.rb
+++ b/spec/requests/well_known/node_info_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'The well-known node-info endpoints' do
+RSpec.describe 'The well-known node-info endpoints' do
   describe 'The /.well-known/node-info endpoint' do
     it 'returns JSON document pointing to node info' do
       get '/.well-known/nodeinfo'
diff --git a/spec/requests/well_known/oauth_metadata_spec.rb b/spec/requests/well_known/oauth_metadata_spec.rb
index 9d2d20228677e4..378295b5a356ec 100644
--- a/spec/requests/well_known/oauth_metadata_spec.rb
+++ b/spec/requests/well_known/oauth_metadata_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'The /.well-known/oauth-authorization-server request' do
+RSpec.describe 'The /.well-known/oauth-authorization-server request' do
   let(:protocol) { ENV.fetch('LOCAL_HTTPS', true) ? :https : :http }
 
   before do
diff --git a/spec/requests/well_known/webfinger_spec.rb b/spec/requests/well_known/webfinger_spec.rb
index cd8a35c7023d05..e5ce352d50791f 100644
--- a/spec/requests/well_known/webfinger_spec.rb
+++ b/spec/requests/well_known/webfinger_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'The /.well-known/webfinger endpoint' do
+RSpec.describe 'The /.well-known/webfinger endpoint' do
   subject(:perform_request!) { get webfinger_url(resource: resource) }
 
   let(:alternate_domains) { [] }
diff --git a/spec/routing/accounts_routing_spec.rb b/spec/routing/accounts_routing_spec.rb
index 588855943e64be..8ff711a681e082 100644
--- a/spec/routing/accounts_routing_spec.rb
+++ b/spec/routing/accounts_routing_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Routes under accounts/' do
+RSpec.describe 'Routes under accounts/' do
   context 'with local username' do
     let(:username) { 'alice' }
 
diff --git a/spec/routing/api_routing_spec.rb b/spec/routing/api_routing_spec.rb
index a822fba4c55c7d..c46fa75d1fdeba 100644
--- a/spec/routing/api_routing_spec.rb
+++ b/spec/routing/api_routing_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'API routes' do
+RSpec.describe 'API routes' do
   describe 'Credentials routes' do
     it 'routes to verify credentials' do
       expect(get('/api/v1/accounts/verify_credentials'))
diff --git a/spec/routing/well_known_routes_spec.rb b/spec/routing/well_known_routes_spec.rb
index 8cf08c13c127ed..6578e939ae1e14 100644
--- a/spec/routing/well_known_routes_spec.rb
+++ b/spec/routing/well_known_routes_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Well Known routes' do
+RSpec.describe 'Well Known routes' do
   describe 'the host-meta route' do
     it 'routes to correct place with xml format' do
       expect(get('/.well-known/host-meta'))
diff --git a/spec/search/models/concerns/account/search_spec.rb b/spec/search/models/concerns/account/search_spec.rb
index d8d7f355dd4bf3..de12161ef9f3a6 100644
--- a/spec/search/models/concerns/account/search_spec.rb
+++ b/spec/search/models/concerns/account/search_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Account::Search do
+RSpec.describe Account::Search do
   describe 'a non-discoverable account becoming discoverable' do
     let(:account) { Account.find_by(username: 'search_test_account_1') }
 
diff --git a/spec/search/models/concerns/account/statuses_search_spec.rb b/spec/search/models/concerns/account/statuses_search_spec.rb
index b1bf4968ca9abd..bce1aecd7505f3 100644
--- a/spec/search/models/concerns/account/statuses_search_spec.rb
+++ b/spec/search/models/concerns/account/statuses_search_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Account::StatusesSearch, :inline_jobs do
+RSpec.describe Account::StatusesSearch, :inline_jobs do
   describe 'a non-indexable account becoming indexable' do
     let(:account) { Account.find_by(username: 'search_test_account_1') }
 
diff --git a/spec/serializers/activitypub/device_serializer_spec.rb b/spec/serializers/activitypub/device_serializer_spec.rb
index 23f0b24c4eabf5..226e1364465407 100644
--- a/spec/serializers/activitypub/device_serializer_spec.rb
+++ b/spec/serializers/activitypub/device_serializer_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe ActivityPub::DeviceSerializer do
+RSpec.describe ActivityPub::DeviceSerializer do
   let(:serialization) { serialized_record_json(record, described_class) }
   let(:record) { Fabricate(:device) }
 
diff --git a/spec/serializers/activitypub/note_serializer_spec.rb b/spec/serializers/activitypub/note_serializer_spec.rb
index 338d66b308ebaa..285b241ee237e3 100644
--- a/spec/serializers/activitypub/note_serializer_spec.rb
+++ b/spec/serializers/activitypub/note_serializer_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe ActivityPub::NoteSerializer do
+RSpec.describe ActivityPub::NoteSerializer do
   subject { serialized_record_json(parent, described_class, adapter: ActivityPub::Adapter) }
 
   let!(:account) { Fabricate(:account) }
diff --git a/spec/serializers/activitypub/one_time_key_serializer_spec.rb b/spec/serializers/activitypub/one_time_key_serializer_spec.rb
index 89efe95c8c2e3e..b9792ebae35445 100644
--- a/spec/serializers/activitypub/one_time_key_serializer_spec.rb
+++ b/spec/serializers/activitypub/one_time_key_serializer_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe ActivityPub::OneTimeKeySerializer do
+RSpec.describe ActivityPub::OneTimeKeySerializer do
   let(:serialization) { serialized_record_json(record, described_class) }
   let(:record) { Fabricate(:one_time_key) }
 
diff --git a/spec/serializers/activitypub/undo_like_serializer_spec.rb b/spec/serializers/activitypub/undo_like_serializer_spec.rb
index 3d61e8675195ea..c7190adc1aa4f6 100644
--- a/spec/serializers/activitypub/undo_like_serializer_spec.rb
+++ b/spec/serializers/activitypub/undo_like_serializer_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe ActivityPub::UndoLikeSerializer do
+RSpec.describe ActivityPub::UndoLikeSerializer do
   let(:serialization) { serialized_record_json(record, described_class) }
   let(:record) { Fabricate(:favourite) }
 
diff --git a/spec/serializers/activitypub/update_poll_serializer_spec.rb b/spec/serializers/activitypub/update_poll_serializer_spec.rb
index 8ff4fd27013467..6a4d8177fcc32d 100644
--- a/spec/serializers/activitypub/update_poll_serializer_spec.rb
+++ b/spec/serializers/activitypub/update_poll_serializer_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe ActivityPub::UpdatePollSerializer do
+RSpec.describe ActivityPub::UpdatePollSerializer do
   subject { serialized_record_json(status, described_class, adapter: ActivityPub::Adapter) }
 
   let(:account) { Fabricate(:account) }
diff --git a/spec/serializers/activitypub/vote_serializer_spec.rb b/spec/serializers/activitypub/vote_serializer_spec.rb
index b7c0b8928b862b..4e8a2beca38aa3 100644
--- a/spec/serializers/activitypub/vote_serializer_spec.rb
+++ b/spec/serializers/activitypub/vote_serializer_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe ActivityPub::VoteSerializer do
+RSpec.describe ActivityPub::VoteSerializer do
   let(:serialization) { serialized_record_json(record, described_class) }
   let(:record) { Fabricate(:poll_vote) }
 
diff --git a/spec/serializers/rest/account_serializer_spec.rb b/spec/serializers/rest/account_serializer_spec.rb
index 15939e484d86e5..7daa0796a9c964 100644
--- a/spec/serializers/rest/account_serializer_spec.rb
+++ b/spec/serializers/rest/account_serializer_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe REST::AccountSerializer do
+RSpec.describe REST::AccountSerializer do
   subject { serialized_record_json(account, described_class) }
 
   let(:role)    { Fabricate(:user_role, name: 'Role', highlighted: true) }
diff --git a/spec/serializers/rest/encrypted_message_serializer_spec.rb b/spec/serializers/rest/encrypted_message_serializer_spec.rb
index 01db1149af52e9..a4b8ee83b2a1e9 100644
--- a/spec/serializers/rest/encrypted_message_serializer_spec.rb
+++ b/spec/serializers/rest/encrypted_message_serializer_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe REST::EncryptedMessageSerializer do
+RSpec.describe REST::EncryptedMessageSerializer do
   let(:serialization) { serialized_record_json(record, described_class) }
   let(:record) { Fabricate(:encrypted_message) }
 
diff --git a/spec/serializers/rest/instance_serializer_spec.rb b/spec/serializers/rest/instance_serializer_spec.rb
index 39e6b3820b7049..2d8d14e39a81e8 100644
--- a/spec/serializers/rest/instance_serializer_spec.rb
+++ b/spec/serializers/rest/instance_serializer_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe REST::InstanceSerializer do
+RSpec.describe REST::InstanceSerializer do
   let(:serialization) { serialized_record_json(record, described_class) }
   let(:record) { InstancePresenter.new }
 
diff --git a/spec/serializers/rest/keys/claim_result_serializer_spec.rb b/spec/serializers/rest/keys/claim_result_serializer_spec.rb
index 7f7fb850cdacaa..e45112705b70cd 100644
--- a/spec/serializers/rest/keys/claim_result_serializer_spec.rb
+++ b/spec/serializers/rest/keys/claim_result_serializer_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe REST::Keys::ClaimResultSerializer do
+RSpec.describe REST::Keys::ClaimResultSerializer do
   let(:serialization) { serialized_record_json(record, described_class) }
   let(:record) { Keys::ClaimService::Result.new(Account.new(id: 123), 456) }
 
diff --git a/spec/serializers/rest/keys/device_serializer_spec.rb b/spec/serializers/rest/keys/device_serializer_spec.rb
index 28177a3db5a212..b8370beac706f6 100644
--- a/spec/serializers/rest/keys/device_serializer_spec.rb
+++ b/spec/serializers/rest/keys/device_serializer_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe REST::Keys::DeviceSerializer do
+RSpec.describe REST::Keys::DeviceSerializer do
   let(:serialization) { serialized_record_json(record, described_class) }
   let(:record) { Device.new(name: 'Device name') }
 
diff --git a/spec/serializers/rest/keys/query_result_serializer_spec.rb b/spec/serializers/rest/keys/query_result_serializer_spec.rb
index ef67d706750ffb..41492f5e78f265 100644
--- a/spec/serializers/rest/keys/query_result_serializer_spec.rb
+++ b/spec/serializers/rest/keys/query_result_serializer_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe REST::Keys::QueryResultSerializer do
+RSpec.describe REST::Keys::QueryResultSerializer do
   let(:serialization) { serialized_record_json(record, described_class) }
   let(:record) { Keys::QueryService::Result.new(Account.new(id: 123), []) }
 
diff --git a/spec/serializers/rest/suggestion_serializer_spec.rb b/spec/serializers/rest/suggestion_serializer_spec.rb
index b5efba082defa0..288d1daa230e10 100644
--- a/spec/serializers/rest/suggestion_serializer_spec.rb
+++ b/spec/serializers/rest/suggestion_serializer_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe REST::SuggestionSerializer do
+RSpec.describe REST::SuggestionSerializer do
   let(:serialization) { serialized_record_json(record, described_class) }
   let(:record) do
     AccountSuggestions::Suggestion.new(
diff --git a/spec/services/account_search_service_spec.rb b/spec/services/account_search_service_spec.rb
index 5ec08859031759..7d251641ee45db 100644
--- a/spec/services/account_search_service_spec.rb
+++ b/spec/services/account_search_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe AccountSearchService do
+RSpec.describe AccountSearchService do
   describe '#call' do
     context 'with a query to ignore' do
       it 'returns empty array for missing query' do
diff --git a/spec/services/account_statuses_cleanup_service_spec.rb b/spec/services/account_statuses_cleanup_service_spec.rb
index 403c4632d74303..857bd4fda499af 100644
--- a/spec/services/account_statuses_cleanup_service_spec.rb
+++ b/spec/services/account_statuses_cleanup_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe AccountStatusesCleanupService do
+RSpec.describe AccountStatusesCleanupService do
   let(:account)           { Fabricate(:account, username: 'alice', domain: nil) }
   let(:account_policy)    { Fabricate(:account_statuses_cleanup_policy, account: account) }
   let!(:unrelated_status) { Fabricate(:status, created_at: 3.years.ago) }
diff --git a/spec/services/fetch_oembed_service_spec.rb b/spec/services/fetch_oembed_service_spec.rb
index c9f84048b615f4..52d2b9cf2283ad 100644
--- a/spec/services/fetch_oembed_service_spec.rb
+++ b/spec/services/fetch_oembed_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe FetchOEmbedService do
+RSpec.describe FetchOEmbedService do
   subject { described_class.new }
 
   before do
diff --git a/spec/services/resolve_url_service_spec.rb b/spec/services/resolve_url_service_spec.rb
index 3d59a55f105855..80f2a5a4baf55d 100644
--- a/spec/services/resolve_url_service_spec.rb
+++ b/spec/services/resolve_url_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe ResolveURLService do
+RSpec.describe ResolveURLService do
   subject { described_class.new }
 
   describe '#call' do
diff --git a/spec/services/search_service_spec.rb b/spec/services/search_service_spec.rb
index 394ee7c3a660e7..cd4c42463012f3 100644
--- a/spec/services/search_service_spec.rb
+++ b/spec/services/search_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe SearchService do
+RSpec.describe SearchService do
   subject { described_class.new }
 
   describe '#call' do
diff --git a/spec/services/unblock_domain_service_spec.rb b/spec/services/unblock_domain_service_spec.rb
index 289ddfc218bcaa..405fe1cfd2f8a3 100644
--- a/spec/services/unblock_domain_service_spec.rb
+++ b/spec/services/unblock_domain_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe UnblockDomainService do
+RSpec.describe UnblockDomainService do
   subject { described_class.new }
 
   describe 'call' do
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 2d20239b27749d..60bec918ea4100 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -6,6 +6,8 @@
     expectations.include_chain_clauses_in_custom_matcher_descriptions = true
   end
 
+  config.disable_monkey_patching!
+
   config.mock_with :rspec do |mocks|
     mocks.verify_partial_doubles = true
   end
diff --git a/spec/support/examples/api.rb b/spec/support/examples/api.rb
index d531860abfddfe..ddc61fcbe08b6d 100644
--- a/spec/support/examples/api.rb
+++ b/spec/support/examples/api.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-shared_examples 'forbidden for wrong scope' do |wrong_scope|
+RSpec.shared_examples 'forbidden for wrong scope' do |wrong_scope|
   let(:scopes) { wrong_scope }
 
   it 'returns http forbidden' do
@@ -11,7 +11,7 @@
   end
 end
 
-shared_examples 'forbidden for wrong role' do |wrong_role|
+RSpec.shared_examples 'forbidden for wrong role' do |wrong_role|
   let(:role) { UserRole.find_by(name: wrong_role) }
 
   it 'returns http forbidden' do
diff --git a/spec/support/examples/cli.rb b/spec/support/examples/cli.rb
index 091c842bd1aaec..5f357fc915466a 100644
--- a/spec/support/examples/cli.rb
+++ b/spec/support/examples/cli.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-shared_examples 'CLI Command' do
+RSpec.shared_examples 'CLI Command' do
   it 'configures Thor to exit on failure' do
     expect(described_class.exit_on_failure?).to be true
   end
diff --git a/spec/support/examples/lib/admin/checks.rb b/spec/support/examples/lib/admin/checks.rb
index b50faa77ba00ab..e8c1336c5f9fb6 100644
--- a/spec/support/examples/lib/admin/checks.rb
+++ b/spec/support/examples/lib/admin/checks.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-shared_examples 'a check available to devops users' do
+RSpec.shared_examples 'a check available to devops users' do
   describe 'skip?' do
     context 'when user can view devops' do
       before { allow(user).to receive(:can?).with(:view_devops).and_return(true) }
diff --git a/spec/support/examples/mailers.rb b/spec/support/examples/mailers.rb
index 213e873b4e18e7..a8469f196490ac 100644
--- a/spec/support/examples/mailers.rb
+++ b/spec/support/examples/mailers.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-shared_examples 'localized subject' do |*args, **kwrest|
+RSpec.shared_examples 'localized subject' do |*args, **kwrest|
   it 'renders subject localized for the locale of the receiver' do
     locale = :de
     receiver.update!(locale: locale)
diff --git a/spec/support/examples/models/concerns/account_avatar.rb b/spec/support/examples/models/concerns/account_avatar.rb
index ab6020d834a8f7..232f51fa3c7bd4 100644
--- a/spec/support/examples/models/concerns/account_avatar.rb
+++ b/spec/support/examples/models/concerns/account_avatar.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-shared_examples 'AccountAvatar' do |fabricator|
+RSpec.shared_examples 'AccountAvatar' do |fabricator|
   describe 'static avatars', :attachment_processing do
     describe 'when GIF' do
       it 'creates a png static style' do
diff --git a/spec/support/examples/models/concerns/account_header.rb b/spec/support/examples/models/concerns/account_header.rb
index 43bbdaacf425d9..af8d22d633089e 100644
--- a/spec/support/examples/models/concerns/account_header.rb
+++ b/spec/support/examples/models/concerns/account_header.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-shared_examples 'AccountHeader' do |fabricator|
+RSpec.shared_examples 'AccountHeader' do |fabricator|
   describe 'base64-encoded files', :attachment_processing do
     let(:base64_attachment) { "data:image/jpeg;base64,#{Base64.encode64(attachment_fixture('attachment.jpg').read)}" }
     let(:account) { Fabricate(fabricator, header: base64_attachment) }
diff --git a/spec/support/examples/models/concerns/reviewable.rb b/spec/support/examples/models/concerns/reviewable.rb
index 562183d1ccbe6b..b63e44b43f9853 100644
--- a/spec/support/examples/models/concerns/reviewable.rb
+++ b/spec/support/examples/models/concerns/reviewable.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-shared_examples 'Reviewable' do
+RSpec.shared_examples 'Reviewable' do
   subject { described_class.new(reviewed_at: reviewed_at, requested_review_at: requested_review_at) }
 
   let(:reviewed_at) { nil }
diff --git a/spec/system/about_spec.rb b/spec/system/about_spec.rb
index dc976b91e07b53..f832802f91dc3c 100644
--- a/spec/system/about_spec.rb
+++ b/spec/system/about_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'About page' do
+RSpec.describe 'About page' do
   it 'visits the about page and renders the web app' do
     visit about_path
 
diff --git a/spec/system/admin/accounts_spec.rb b/spec/system/admin/accounts_spec.rb
index 20813f6be42505..c21e01e4f3da05 100644
--- a/spec/system/admin/accounts_spec.rb
+++ b/spec/system/admin/accounts_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Admin::Accounts' do
+RSpec.describe 'Admin::Accounts' do
   let(:current_user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
 
   before do
diff --git a/spec/system/admin/announcements_spec.rb b/spec/system/admin/announcements_spec.rb
index 5c4e5d3e6ab429..1da5699656a20f 100644
--- a/spec/system/admin/announcements_spec.rb
+++ b/spec/system/admin/announcements_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Admin::Announcements' do
+RSpec.describe 'Admin::Announcements' do
   include ActionView::RecordIdentifier
 
   describe 'Viewing announcements' do
diff --git a/spec/system/admin/custom_emojis_spec.rb b/spec/system/admin/custom_emojis_spec.rb
index 8a8b6efcd119fb..e47f21f8a93881 100644
--- a/spec/system/admin/custom_emojis_spec.rb
+++ b/spec/system/admin/custom_emojis_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Admin::CustomEmojis' do
+RSpec.describe 'Admin::CustomEmojis' do
   let(:current_user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
 
   before do
diff --git a/spec/system/admin/domain_blocks_spec.rb b/spec/system/admin/domain_blocks_spec.rb
index 99aa7cf1a760fa..9a39e290623cd3 100644
--- a/spec/system/admin/domain_blocks_spec.rb
+++ b/spec/system/admin/domain_blocks_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'blocking domains through the moderation interface' do
+RSpec.describe 'blocking domains through the moderation interface' do
   before do
     allow(DomainBlockWorker).to receive(:perform_async).and_return(true)
     sign_in Fabricate(:user, role: UserRole.find_by(name: 'Admin')), scope: :user
diff --git a/spec/system/admin/email_domain_blocks_spec.rb b/spec/system/admin/email_domain_blocks_spec.rb
index 14959cbe74b0dd..a90bede827e33e 100644
--- a/spec/system/admin/email_domain_blocks_spec.rb
+++ b/spec/system/admin/email_domain_blocks_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Admin::EmailDomainBlocks' do
+RSpec.describe 'Admin::EmailDomainBlocks' do
   let(:current_user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
 
   before do
diff --git a/spec/system/admin/ip_blocks_spec.rb b/spec/system/admin/ip_blocks_spec.rb
index c9b16f6f78fb1d..9c03520277534c 100644
--- a/spec/system/admin/ip_blocks_spec.rb
+++ b/spec/system/admin/ip_blocks_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Admin::IpBlocks' do
+RSpec.describe 'Admin::IpBlocks' do
   let(:current_user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
 
   before do
diff --git a/spec/system/admin/reset_spec.rb b/spec/system/admin/reset_spec.rb
index 50fb4b46dfaf2d..1e787ea110f2d4 100644
--- a/spec/system/admin/reset_spec.rb
+++ b/spec/system/admin/reset_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Admin::Reset' do
+RSpec.describe 'Admin::Reset' do
   it 'Resets password for account user' do
     account = Fabricate :account
     sign_in admin_user
diff --git a/spec/system/admin/settings/about_spec.rb b/spec/system/admin/settings/about_spec.rb
index 0f8ae5605cec0c..c7405a8d5aab56 100644
--- a/spec/system/admin/settings/about_spec.rb
+++ b/spec/system/admin/settings/about_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Admin::Settings::About' do
+RSpec.describe 'Admin::Settings::About' do
   it 'Saves changes to about settings' do
     sign_in admin_user
     visit admin_settings_about_path
diff --git a/spec/system/admin/settings/appearance_spec.rb b/spec/system/admin/settings/appearance_spec.rb
index 99e97ea4d128dc..56af58c81267ee 100644
--- a/spec/system/admin/settings/appearance_spec.rb
+++ b/spec/system/admin/settings/appearance_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Admin::Settings::Appearance' do
+RSpec.describe 'Admin::Settings::Appearance' do
   it 'Saves changes to appearance settings' do
     sign_in admin_user
     visit admin_settings_appearance_path
diff --git a/spec/system/admin/settings/branding_spec.rb b/spec/system/admin/settings/branding_spec.rb
index ac47e04d53442a..5cd9319ce0308f 100644
--- a/spec/system/admin/settings/branding_spec.rb
+++ b/spec/system/admin/settings/branding_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Admin::Settings::Branding' do
+RSpec.describe 'Admin::Settings::Branding' do
   it 'Saves changes to branding settings' do
     sign_in admin_user
     visit admin_settings_branding_path
diff --git a/spec/system/admin/settings/content_retention_spec.rb b/spec/system/admin/settings/content_retention_spec.rb
index 9867122675a280..f788f8eea0f51b 100644
--- a/spec/system/admin/settings/content_retention_spec.rb
+++ b/spec/system/admin/settings/content_retention_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Admin::Settings::ContentRetention' do
+RSpec.describe 'Admin::Settings::ContentRetention' do
   it 'Saves changes to content retention settings' do
     sign_in admin_user
     visit admin_settings_content_retention_path
diff --git a/spec/system/admin/settings/discovery_spec.rb b/spec/system/admin/settings/discovery_spec.rb
index bdab91107d0334..f000d183709099 100644
--- a/spec/system/admin/settings/discovery_spec.rb
+++ b/spec/system/admin/settings/discovery_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Admin::Settings::Discovery' do
+RSpec.describe 'Admin::Settings::Discovery' do
   it 'Saves changes to discovery settings' do
     sign_in admin_user
     visit admin_settings_discovery_path
diff --git a/spec/system/admin/settings/registrations_spec.rb b/spec/system/admin/settings/registrations_spec.rb
index 88c750e8ee1b7a..d026b07c85f16b 100644
--- a/spec/system/admin/settings/registrations_spec.rb
+++ b/spec/system/admin/settings/registrations_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Admin::Settings::Registrations' do
+RSpec.describe 'Admin::Settings::Registrations' do
   it 'Saves changes to registrations settings' do
     sign_in admin_user
     visit admin_settings_registrations_path
diff --git a/spec/system/admin/software_updates_spec.rb b/spec/system/admin/software_updates_spec.rb
index 4a635d1a794f8f..77e9f166842d02 100644
--- a/spec/system/admin/software_updates_spec.rb
+++ b/spec/system/admin/software_updates_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'finding software updates through the admin interface' do
+RSpec.describe 'finding software updates through the admin interface' do
   before do
     Fabricate(:software_update, version: '99.99.99', type: 'major', urgent: true, release_notes: 'https://github.com/mastodon/mastodon/releases/v99')
 
diff --git a/spec/system/admin/statuses_spec.rb b/spec/system/admin/statuses_spec.rb
index 531d0de9538b21..bb76a2963d0d07 100644
--- a/spec/system/admin/statuses_spec.rb
+++ b/spec/system/admin/statuses_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Admin::Statuses' do
+RSpec.describe 'Admin::Statuses' do
   let(:current_user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
 
   before do
diff --git a/spec/system/admin/trends/links/preview_card_providers_spec.rb b/spec/system/admin/trends/links/preview_card_providers_spec.rb
index dca89117b1079a..16343a68917c44 100644
--- a/spec/system/admin/trends/links/preview_card_providers_spec.rb
+++ b/spec/system/admin/trends/links/preview_card_providers_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Admin::Trends::Links::PreviewCardProviders' do
+RSpec.describe 'Admin::Trends::Links::PreviewCardProviders' do
   let(:current_user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
 
   before do
diff --git a/spec/system/admin/trends/links_spec.rb b/spec/system/admin/trends/links_spec.rb
index 99638bc069ffbe..7a51c337c9f04b 100644
--- a/spec/system/admin/trends/links_spec.rb
+++ b/spec/system/admin/trends/links_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Admin::Trends::Links' do
+RSpec.describe 'Admin::Trends::Links' do
   let(:current_user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
 
   before do
diff --git a/spec/system/admin/trends/statuses_spec.rb b/spec/system/admin/trends/statuses_spec.rb
index 779a15d38fbec3..13fc966dfd17af 100644
--- a/spec/system/admin/trends/statuses_spec.rb
+++ b/spec/system/admin/trends/statuses_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Admin::Trends::Statuses' do
+RSpec.describe 'Admin::Trends::Statuses' do
   let(:current_user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
 
   before do
diff --git a/spec/system/admin/trends/tags_spec.rb b/spec/system/admin/trends/tags_spec.rb
index 52e49c3a5d92b6..d914badbd4c443 100644
--- a/spec/system/admin/trends/tags_spec.rb
+++ b/spec/system/admin/trends/tags_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Admin::Trends::Tags' do
+RSpec.describe 'Admin::Trends::Tags' do
   let(:current_user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
 
   before do
diff --git a/spec/system/captcha_spec.rb b/spec/system/captcha_spec.rb
index 06c823adf258eb..4c0ce02d1be970 100644
--- a/spec/system/captcha_spec.rb
+++ b/spec/system/captcha_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'email confirmation flow when captcha is enabled' do
+RSpec.describe 'email confirmation flow when captcha is enabled' do
   let(:user)        { Fabricate(:user, confirmed_at: nil, confirmation_token: 'foobar', created_by_application: client_app) }
   let(:client_app)  { nil }
 
diff --git a/spec/system/filters_spec.rb b/spec/system/filters_spec.rb
index a0cb965a61b100..052b5e17306543 100644
--- a/spec/system/filters_spec.rb
+++ b/spec/system/filters_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Filters' do
+RSpec.describe 'Filters' do
   let(:user) { Fabricate(:user) }
   let(:filter_title) { 'Filter of fun and games' }
 
diff --git a/spec/system/home_spec.rb b/spec/system/home_spec.rb
index 08b9737d6b6d8a..c1ce4e17261b3e 100644
--- a/spec/system/home_spec.rb
+++ b/spec/system/home_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Home page' do
+RSpec.describe 'Home page' do
   context 'when signed in' do
     before { sign_in Fabricate(:user) }
 
diff --git a/spec/system/log_in_spec.rb b/spec/system/log_in_spec.rb
index 8a73c42d2edf00..f8765e8e1cbd52 100644
--- a/spec/system/log_in_spec.rb
+++ b/spec/system/log_in_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Log in' do
+RSpec.describe 'Log in' do
   include ProfileStories
 
   subject { page }
diff --git a/spec/system/log_out_spec.rb b/spec/system/log_out_spec.rb
index f50f7c2d18d91f..2e52254ca03bb3 100644
--- a/spec/system/log_out_spec.rb
+++ b/spec/system/log_out_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Log out' do
+RSpec.describe 'Log out' do
   include ProfileStories
 
   before do
diff --git a/spec/system/new_statuses_spec.rb b/spec/system/new_statuses_spec.rb
index 2f2fcf22485ee4..317508a0bb4192 100644
--- a/spec/system/new_statuses_spec.rb
+++ b/spec/system/new_statuses_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'NewStatuses', :inline_jobs, :js, :streaming do
+RSpec.describe 'NewStatuses', :inline_jobs, :js, :streaming do
   include ProfileStories
 
   subject { page }
diff --git a/spec/system/oauth_spec.rb b/spec/system/oauth_spec.rb
index 5d06f6111cee79..0f96a59675803b 100644
--- a/spec/system/oauth_spec.rb
+++ b/spec/system/oauth_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Using OAuth from an external app' do
+RSpec.describe 'Using OAuth from an external app' do
   include ProfileStories
 
   subject { visit "/oauth/authorize?#{params.to_query}" }
diff --git a/spec/system/ocr_spec.rb b/spec/system/ocr_spec.rb
index 17d18af1586ed7..fc816b6dbafa13 100644
--- a/spec/system/ocr_spec.rb
+++ b/spec/system/ocr_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'OCR', :attachment_processing, :inline_jobs, :js, :streaming do
+RSpec.describe 'OCR', :attachment_processing, :inline_jobs, :js, :streaming do
   include ProfileStories
 
   let(:email)               { 'test@example.com' }
diff --git a/spec/system/privacy_spec.rb b/spec/system/privacy_spec.rb
index f2ab1310cc40fd..631440ebb2c72f 100644
--- a/spec/system/privacy_spec.rb
+++ b/spec/system/privacy_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Privacy policy page' do
+RSpec.describe 'Privacy policy page' do
   it 'visits the privacy policy page and renders the web app' do
     visit privacy_policy_path
 
diff --git a/spec/system/profile_spec.rb b/spec/system/profile_spec.rb
index 2517e823b50c5f..7e3cbfd334ea44 100644
--- a/spec/system/profile_spec.rb
+++ b/spec/system/profile_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Profile' do
+RSpec.describe 'Profile' do
   include ProfileStories
 
   subject { page }
diff --git a/spec/system/redirections_spec.rb b/spec/system/redirections_spec.rb
index f73ab58470194c..860bbdd6b72c12 100644
--- a/spec/system/redirections_spec.rb
+++ b/spec/system/redirections_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'redirection confirmations' do
+RSpec.describe 'redirection confirmations' do
   let(:account) { Fabricate(:account, domain: 'example.com', uri: 'https://example.com/users/foo', url: 'https://example.com/@foo') }
   let(:status)  { Fabricate(:status, account: account, uri: 'https://example.com/users/foo/statuses/1', url: 'https://example.com/@foo/1') }
 
diff --git a/spec/system/report_interface_spec.rb b/spec/system/report_interface_spec.rb
index e6cc3b1b68870f..257a1cd6fd371c 100644
--- a/spec/system/report_interface_spec.rb
+++ b/spec/system/report_interface_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'report interface', :attachment_processing, :js, :streaming do
+RSpec.describe 'report interface', :attachment_processing, :js, :streaming do
   include ProfileStories
 
   let(:email)               { 'admin@example.com' }
diff --git a/spec/system/severed_relationships_spec.rb b/spec/system/severed_relationships_spec.rb
index b933398a083888..4a7bf3e280faaa 100644
--- a/spec/system/severed_relationships_spec.rb
+++ b/spec/system/severed_relationships_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Severed relationships page' do
+RSpec.describe 'Severed relationships page' do
   include ProfileStories
 
   describe 'GET severed_relationships#index' do
diff --git a/spec/system/share_entrypoint_spec.rb b/spec/system/share_entrypoint_spec.rb
index 5e27781f2ae5df..7ccfee599ac97f 100644
--- a/spec/system/share_entrypoint_spec.rb
+++ b/spec/system/share_entrypoint_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Share page', :js, :streaming do
+RSpec.describe 'Share page', :js, :streaming do
   include ProfileStories
 
   let(:email)               { 'test@example.com' }
diff --git a/spec/system/unlogged_spec.rb b/spec/system/unlogged_spec.rb
index 417ccdaeb65668..26d1bd4542604b 100644
--- a/spec/system/unlogged_spec.rb
+++ b/spec/system/unlogged_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'UnloggedBrowsing', :js, :streaming do
+RSpec.describe 'UnloggedBrowsing', :js, :streaming do
   subject { page }
 
   before do
diff --git a/spec/validators/email_mx_validator_spec.rb b/spec/validators/email_mx_validator_spec.rb
index 23a5f768efc8b6..7109c9f4e23b01 100644
--- a/spec/validators/email_mx_validator_spec.rb
+++ b/spec/validators/email_mx_validator_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe EmailMxValidator do
+RSpec.describe EmailMxValidator do
   describe '#validate' do
     let(:user) { instance_double(User, email: 'foo@example.com', sign_up_ip: '1.2.3.4', errors: instance_double(ActiveModel::Errors, add: nil)) }
     let(:resolv_dns_double) { instance_double(Resolv::DNS) }
diff --git a/spec/validators/existing_username_validator_spec.rb b/spec/validators/existing_username_validator_spec.rb
index 4f1dd55a17bb07..25ecb1fbcdedaa 100644
--- a/spec/validators/existing_username_validator_spec.rb
+++ b/spec/validators/existing_username_validator_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe ExistingUsernameValidator do
+RSpec.describe ExistingUsernameValidator do
   let(:record_class) do
     Class.new do
       include ActiveModel::Validations
diff --git a/spec/validators/language_validator_spec.rb b/spec/validators/language_validator_spec.rb
index cb693dcd81fc5e..19e55f34672f6c 100644
--- a/spec/validators/language_validator_spec.rb
+++ b/spec/validators/language_validator_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe LanguageValidator do
+RSpec.describe LanguageValidator do
   let(:record_class) do
     Class.new do
       include ActiveModel::Validations
diff --git a/spec/validators/note_length_validator_spec.rb b/spec/validators/note_length_validator_spec.rb
index 3bca93a283da2f..3fdb4ae8b9000e 100644
--- a/spec/validators/note_length_validator_spec.rb
+++ b/spec/validators/note_length_validator_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe NoteLengthValidator do
+RSpec.describe NoteLengthValidator do
   subject { described_class.new(attributes: { note: true }, maximum: 500) }
 
   describe '#validate' do
diff --git a/spec/validators/reaction_validator_spec.rb b/spec/validators/reaction_validator_spec.rb
index f99c1cb5f93ddf..c4d4a517799bc0 100644
--- a/spec/validators/reaction_validator_spec.rb
+++ b/spec/validators/reaction_validator_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe ReactionValidator do
+RSpec.describe ReactionValidator do
   let(:announcement) { Fabricate(:announcement) }
 
   describe '#validate' do
diff --git a/spec/validators/status_length_validator_spec.rb b/spec/validators/status_length_validator_spec.rb
index 249b90f4904e3d..ecbfd4ba37fb50 100644
--- a/spec/validators/status_length_validator_spec.rb
+++ b/spec/validators/status_length_validator_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe StatusLengthValidator do
+RSpec.describe StatusLengthValidator do
   describe '#validate' do
     before { stub_const("#{described_class}::MAX_CHARS", 500) } # Example values below are relative to this baseline
 
diff --git a/spec/validators/unique_username_validator_spec.rb b/spec/validators/unique_username_validator_spec.rb
index 0d172c8408959d..037ddadb9f70f7 100644
--- a/spec/validators/unique_username_validator_spec.rb
+++ b/spec/validators/unique_username_validator_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe UniqueUsernameValidator do
+RSpec.describe UniqueUsernameValidator do
   describe '#validate' do
     context 'when local account' do
       it 'does not add errors if username is nil' do
diff --git a/spec/validators/unreserved_username_validator_spec.rb b/spec/validators/unreserved_username_validator_spec.rb
index 0eb5f83683df4f..ad1092109db7bb 100644
--- a/spec/validators/unreserved_username_validator_spec.rb
+++ b/spec/validators/unreserved_username_validator_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe UnreservedUsernameValidator do
+RSpec.describe UnreservedUsernameValidator do
   let(:record_class) do
     Class.new do
       include ActiveModel::Validations
diff --git a/spec/validators/url_validator_spec.rb b/spec/validators/url_validator_spec.rb
index 4f32b7b39957ac..2297dddaa01b7b 100644
--- a/spec/validators/url_validator_spec.rb
+++ b/spec/validators/url_validator_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe URLValidator do
+RSpec.describe URLValidator do
   let(:record_class) do
     Class.new do
       include ActiveModel::Validations
diff --git a/spec/views/admin/trends/links/_preview_card.html.haml_spec.rb b/spec/views/admin/trends/links/_preview_card.html.haml_spec.rb
index 82a1dee6d72feb..47a8564eff406d 100644
--- a/spec/views/admin/trends/links/_preview_card.html.haml_spec.rb
+++ b/spec/views/admin/trends/links/_preview_card.html.haml_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'admin/trends/links/_preview_card.html.haml' do
+RSpec.describe 'admin/trends/links/_preview_card.html.haml' do
   it 'correctly escapes user supplied url values' do
     form = instance_double(ActionView::Helpers::FormHelper, check_box: nil)
     trend = PreviewCardTrend.new(allowed: false)
diff --git a/spec/views/statuses/show.html.haml_spec.rb b/spec/views/statuses/show.html.haml_spec.rb
index fd08f2772d6086..1afcb046d4f4c9 100644
--- a/spec/views/statuses/show.html.haml_spec.rb
+++ b/spec/views/statuses/show.html.haml_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'statuses/show.html.haml' do
+RSpec.describe 'statuses/show.html.haml' do
   let(:alice) { Fabricate(:account, username: 'alice', display_name: 'Alice') }
   let(:status) { Fabricate(:status, account: alice, text: 'Hello World') }
 
diff --git a/spec/workers/account_refresh_worker_spec.rb b/spec/workers/account_refresh_worker_spec.rb
index 361d69aa0a5940..3e88e8db28be7f 100644
--- a/spec/workers/account_refresh_worker_spec.rb
+++ b/spec/workers/account_refresh_worker_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe AccountRefreshWorker do
+RSpec.describe AccountRefreshWorker do
   let(:worker) { described_class.new }
   let(:service) { instance_double(ResolveAccountService, call: true) }
 
diff --git a/spec/workers/activitypub/delivery_worker_spec.rb b/spec/workers/activitypub/delivery_worker_spec.rb
index efce610ae4ecd4..3dfbef31a43594 100644
--- a/spec/workers/activitypub/delivery_worker_spec.rb
+++ b/spec/workers/activitypub/delivery_worker_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe ActivityPub::DeliveryWorker do
+RSpec.describe ActivityPub::DeliveryWorker do
   include RoutingHelper
 
   subject { described_class.new }
diff --git a/spec/workers/activitypub/distribute_poll_update_worker_spec.rb b/spec/workers/activitypub/distribute_poll_update_worker_spec.rb
index 4427cfdf95988f..9ff4731f96aa3c 100644
--- a/spec/workers/activitypub/distribute_poll_update_worker_spec.rb
+++ b/spec/workers/activitypub/distribute_poll_update_worker_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe ActivityPub::DistributePollUpdateWorker do
+RSpec.describe ActivityPub::DistributePollUpdateWorker do
   subject { described_class.new }
 
   let(:account)  { Fabricate(:account) }
diff --git a/spec/workers/activitypub/distribution_worker_spec.rb b/spec/workers/activitypub/distribution_worker_spec.rb
index 0eb6227859d758..9e5db53185fbdb 100644
--- a/spec/workers/activitypub/distribution_worker_spec.rb
+++ b/spec/workers/activitypub/distribution_worker_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe ActivityPub::DistributionWorker do
+RSpec.describe ActivityPub::DistributionWorker do
   subject { described_class.new }
 
   let(:status)   { Fabricate(:status) }
diff --git a/spec/workers/activitypub/fetch_replies_worker_spec.rb b/spec/workers/activitypub/fetch_replies_worker_spec.rb
index 2d080e286ecc98..56d19705a4d034 100644
--- a/spec/workers/activitypub/fetch_replies_worker_spec.rb
+++ b/spec/workers/activitypub/fetch_replies_worker_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe ActivityPub::FetchRepliesWorker do
+RSpec.describe ActivityPub::FetchRepliesWorker do
   subject { described_class.new }
 
   let(:account) { Fabricate(:account, domain: 'example.com') }
diff --git a/spec/workers/activitypub/move_distribution_worker_spec.rb b/spec/workers/activitypub/move_distribution_worker_spec.rb
index c810b33c23a644..63396834de01db 100644
--- a/spec/workers/activitypub/move_distribution_worker_spec.rb
+++ b/spec/workers/activitypub/move_distribution_worker_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe ActivityPub::MoveDistributionWorker do
+RSpec.describe ActivityPub::MoveDistributionWorker do
   subject { described_class.new }
 
   let(:migration) { Fabricate(:account_migration) }
diff --git a/spec/workers/activitypub/post_upgrade_worker_spec.rb b/spec/workers/activitypub/post_upgrade_worker_spec.rb
index 08de150ad960e8..fe1c5e895eda51 100644
--- a/spec/workers/activitypub/post_upgrade_worker_spec.rb
+++ b/spec/workers/activitypub/post_upgrade_worker_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe ActivityPub::PostUpgradeWorker do
+RSpec.describe ActivityPub::PostUpgradeWorker do
   let(:worker) { described_class.new }
 
   describe '#perform' do
diff --git a/spec/workers/activitypub/processing_worker_spec.rb b/spec/workers/activitypub/processing_worker_spec.rb
index 66d1cf48904b9e..c06ba63d39b8e1 100644
--- a/spec/workers/activitypub/processing_worker_spec.rb
+++ b/spec/workers/activitypub/processing_worker_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe ActivityPub::ProcessingWorker do
+RSpec.describe ActivityPub::ProcessingWorker do
   subject { described_class.new }
 
   let(:account) { Fabricate(:account) }
diff --git a/spec/workers/activitypub/status_update_distribution_worker_spec.rb b/spec/workers/activitypub/status_update_distribution_worker_spec.rb
index 66e52c4f288281..e9a70d11d19f81 100644
--- a/spec/workers/activitypub/status_update_distribution_worker_spec.rb
+++ b/spec/workers/activitypub/status_update_distribution_worker_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe ActivityPub::StatusUpdateDistributionWorker do
+RSpec.describe ActivityPub::StatusUpdateDistributionWorker do
   subject { described_class.new }
 
   let(:status)   { Fabricate(:status, text: 'foo') }
diff --git a/spec/workers/activitypub/synchronize_featured_tags_collection_worker_spec.rb b/spec/workers/activitypub/synchronize_featured_tags_collection_worker_spec.rb
index 8cf13cb9001c85..d10ea8a75e088a 100644
--- a/spec/workers/activitypub/synchronize_featured_tags_collection_worker_spec.rb
+++ b/spec/workers/activitypub/synchronize_featured_tags_collection_worker_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe ActivityPub::SynchronizeFeaturedTagsCollectionWorker do
+RSpec.describe ActivityPub::SynchronizeFeaturedTagsCollectionWorker do
   let(:worker) { described_class.new }
   let(:service) { instance_double(ActivityPub::FetchFeaturedTagsCollectionService, call: true) }
 
diff --git a/spec/workers/activitypub/update_distribution_worker_spec.rb b/spec/workers/activitypub/update_distribution_worker_spec.rb
index b183a58dfd074c..7d786063988b59 100644
--- a/spec/workers/activitypub/update_distribution_worker_spec.rb
+++ b/spec/workers/activitypub/update_distribution_worker_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe ActivityPub::UpdateDistributionWorker do
+RSpec.describe ActivityPub::UpdateDistributionWorker do
   subject { described_class.new }
 
   let(:account)  { Fabricate(:account) }
diff --git a/spec/workers/add_to_public_statuses_index_worker_spec.rb b/spec/workers/add_to_public_statuses_index_worker_spec.rb
index fa150722419bd4..edaec1dd3a6ce1 100644
--- a/spec/workers/add_to_public_statuses_index_worker_spec.rb
+++ b/spec/workers/add_to_public_statuses_index_worker_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe AddToPublicStatusesIndexWorker do
+RSpec.describe AddToPublicStatusesIndexWorker do
   describe '#perform' do
     let(:account) { Fabricate(:account, indexable: indexable) }
     let(:account_id) { account.id }
diff --git a/spec/workers/admin/account_deletion_worker_spec.rb b/spec/workers/admin/account_deletion_worker_spec.rb
index 631cab6648ef5f..e41b734f214711 100644
--- a/spec/workers/admin/account_deletion_worker_spec.rb
+++ b/spec/workers/admin/account_deletion_worker_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Admin::AccountDeletionWorker do
+RSpec.describe Admin::AccountDeletionWorker do
   let(:worker) { described_class.new }
 
   describe 'perform' do
diff --git a/spec/workers/admin/domain_purge_worker_spec.rb b/spec/workers/admin/domain_purge_worker_spec.rb
index 861fd71a7f91d5..32bdd0868bc2b5 100644
--- a/spec/workers/admin/domain_purge_worker_spec.rb
+++ b/spec/workers/admin/domain_purge_worker_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Admin::DomainPurgeWorker do
+RSpec.describe Admin::DomainPurgeWorker do
   subject { described_class.new }
 
   describe 'perform' do
diff --git a/spec/workers/admin/suspension_worker_spec.rb b/spec/workers/admin/suspension_worker_spec.rb
index da12037edcb987..445e0b635ec516 100644
--- a/spec/workers/admin/suspension_worker_spec.rb
+++ b/spec/workers/admin/suspension_worker_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Admin::SuspensionWorker do
+RSpec.describe Admin::SuspensionWorker do
   let(:worker) { described_class.new }
   let(:service) { instance_double(SuspendAccountService, call: true) }
 
diff --git a/spec/workers/after_account_domain_block_worker_spec.rb b/spec/workers/after_account_domain_block_worker_spec.rb
index 54a113a2b318f8..56f5957ea23736 100644
--- a/spec/workers/after_account_domain_block_worker_spec.rb
+++ b/spec/workers/after_account_domain_block_worker_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe AfterAccountDomainBlockWorker do
+RSpec.describe AfterAccountDomainBlockWorker do
   let(:worker) { described_class.new }
   let(:service) { instance_double(AfterBlockDomainFromAccountService, call: true) }
 
diff --git a/spec/workers/backup_worker_spec.rb b/spec/workers/backup_worker_spec.rb
index db1b50140b6790..5d1d91267a52bf 100644
--- a/spec/workers/backup_worker_spec.rb
+++ b/spec/workers/backup_worker_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe BackupWorker do
+RSpec.describe BackupWorker do
   let(:worker) { described_class.new }
   let(:service) { instance_double(BackupService, call: true) }
 
diff --git a/spec/workers/bulk_import_worker_spec.rb b/spec/workers/bulk_import_worker_spec.rb
index 91f51fbb425428..2d429c880b0848 100644
--- a/spec/workers/bulk_import_worker_spec.rb
+++ b/spec/workers/bulk_import_worker_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe BulkImportWorker do
+RSpec.describe BulkImportWorker do
   subject { described_class.new }
 
   let(:import) { Fabricate(:bulk_import, state: :scheduled) }
diff --git a/spec/workers/cache_buster_worker_spec.rb b/spec/workers/cache_buster_worker_spec.rb
index adeb287fa37246..b6948395b88fa2 100644
--- a/spec/workers/cache_buster_worker_spec.rb
+++ b/spec/workers/cache_buster_worker_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe CacheBusterWorker do
+RSpec.describe CacheBusterWorker do
   let(:worker) { described_class.new }
 
   describe 'perform' do
diff --git a/spec/workers/delete_mute_worker_spec.rb b/spec/workers/delete_mute_worker_spec.rb
index 1fc84491c3bfa3..a5d1fe343d19c2 100644
--- a/spec/workers/delete_mute_worker_spec.rb
+++ b/spec/workers/delete_mute_worker_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe DeleteMuteWorker do
+RSpec.describe DeleteMuteWorker do
   let(:worker) { described_class.new }
   let(:service) { instance_double(UnmuteService, call: true) }
 
diff --git a/spec/workers/domain_block_worker_spec.rb b/spec/workers/domain_block_worker_spec.rb
index 33c3ca009ac32a..c55aa2c0c337f6 100644
--- a/spec/workers/domain_block_worker_spec.rb
+++ b/spec/workers/domain_block_worker_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe DomainBlockWorker do
+RSpec.describe DomainBlockWorker do
   subject { described_class.new }
 
   describe 'perform' do
diff --git a/spec/workers/domain_clear_media_worker_spec.rb b/spec/workers/domain_clear_media_worker_spec.rb
index 21f8f87b2f615c..20911007b0f3d1 100644
--- a/spec/workers/domain_clear_media_worker_spec.rb
+++ b/spec/workers/domain_clear_media_worker_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe DomainClearMediaWorker do
+RSpec.describe DomainClearMediaWorker do
   subject { described_class.new }
 
   describe 'perform' do
diff --git a/spec/workers/feed_insert_worker_spec.rb b/spec/workers/feed_insert_worker_spec.rb
index e9484879ff4190..92ae304d0e84cf 100644
--- a/spec/workers/feed_insert_worker_spec.rb
+++ b/spec/workers/feed_insert_worker_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe FeedInsertWorker do
+RSpec.describe FeedInsertWorker do
   subject { described_class.new }
 
   describe 'perform' do
diff --git a/spec/workers/filtered_notification_cleanup_worker_spec.rb b/spec/workers/filtered_notification_cleanup_worker_spec.rb
index 2636b70ad4aec1..5ecd4291af900b 100644
--- a/spec/workers/filtered_notification_cleanup_worker_spec.rb
+++ b/spec/workers/filtered_notification_cleanup_worker_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe FilteredNotificationCleanupWorker do
+RSpec.describe FilteredNotificationCleanupWorker do
   describe '#perform' do
     let(:sender) { Fabricate(:account) }
     let(:recipient) { Fabricate(:account) }
diff --git a/spec/workers/import/row_worker_spec.rb b/spec/workers/import/row_worker_spec.rb
index 0a71a838fcc573..edb02cb3914227 100644
--- a/spec/workers/import/row_worker_spec.rb
+++ b/spec/workers/import/row_worker_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Import::RowWorker do
+RSpec.describe Import::RowWorker do
   subject { described_class.new }
 
   let(:row) { Fabricate(:bulk_import_row, bulk_import: import) }
diff --git a/spec/workers/import_worker_spec.rb b/spec/workers/import_worker_spec.rb
index 4095a5d354b9a9..1d34aafe861656 100644
--- a/spec/workers/import_worker_spec.rb
+++ b/spec/workers/import_worker_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe ImportWorker do
+RSpec.describe ImportWorker do
   let(:worker) { described_class.new }
   let(:service) { instance_double(ImportService, call: true) }
 
diff --git a/spec/workers/move_worker_spec.rb b/spec/workers/move_worker_spec.rb
index b25992e44bd615..a24de57e274a6e 100644
--- a/spec/workers/move_worker_spec.rb
+++ b/spec/workers/move_worker_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe MoveWorker do
+RSpec.describe MoveWorker do
   subject { described_class.new }
 
   let(:local_follower)   { Fabricate(:account, domain: nil) }
diff --git a/spec/workers/poll_expiration_notify_worker_spec.rb b/spec/workers/poll_expiration_notify_worker_spec.rb
index 4bd90270d89b79..b3ccdd3d7775af 100644
--- a/spec/workers/poll_expiration_notify_worker_spec.rb
+++ b/spec/workers/poll_expiration_notify_worker_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe PollExpirationNotifyWorker do
+RSpec.describe PollExpirationNotifyWorker do
   let(:worker) { described_class.new }
   let(:account) { Fabricate(:account, domain: remote? ? 'example.com' : nil) }
   let(:status) { Fabricate(:status, account: account) }
diff --git a/spec/workers/post_process_media_worker_spec.rb b/spec/workers/post_process_media_worker_spec.rb
index 1a274623d73fba..f4b441a9202384 100644
--- a/spec/workers/post_process_media_worker_spec.rb
+++ b/spec/workers/post_process_media_worker_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe PostProcessMediaWorker, :attachment_processing do
+RSpec.describe PostProcessMediaWorker, :attachment_processing do
   let(:worker) { described_class.new }
 
   describe '#perform' do
diff --git a/spec/workers/publish_announcement_reaction_worker_spec.rb b/spec/workers/publish_announcement_reaction_worker_spec.rb
index 91668b5ada6992..37687ca1a8ab94 100644
--- a/spec/workers/publish_announcement_reaction_worker_spec.rb
+++ b/spec/workers/publish_announcement_reaction_worker_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe PublishAnnouncementReactionWorker do
+RSpec.describe PublishAnnouncementReactionWorker do
   let(:worker) { described_class.new }
 
   describe '#perform' do
diff --git a/spec/workers/publish_scheduled_announcement_worker_spec.rb b/spec/workers/publish_scheduled_announcement_worker_spec.rb
index 2e50d4a50da398..c4e17903a94a0e 100644
--- a/spec/workers/publish_scheduled_announcement_worker_spec.rb
+++ b/spec/workers/publish_scheduled_announcement_worker_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe PublishScheduledAnnouncementWorker do
+RSpec.describe PublishScheduledAnnouncementWorker do
   subject { described_class.new }
 
   let!(:remote_account) { Fabricate(:account, domain: 'domain.com', username: 'foo', uri: 'https://domain.com/users/foo') }
diff --git a/spec/workers/publish_scheduled_status_worker_spec.rb b/spec/workers/publish_scheduled_status_worker_spec.rb
index f8547e6fe2a685..35e510d2539cf0 100644
--- a/spec/workers/publish_scheduled_status_worker_spec.rb
+++ b/spec/workers/publish_scheduled_status_worker_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe PublishScheduledStatusWorker do
+RSpec.describe PublishScheduledStatusWorker do
   subject { described_class.new }
 
   let(:scheduled_status) { Fabricate(:scheduled_status, params: { text: 'Hello world, future!' }) }
diff --git a/spec/workers/push_conversation_worker_spec.rb b/spec/workers/push_conversation_worker_spec.rb
index 5fbb4c6853b4a9..d651059c9a6ed8 100644
--- a/spec/workers/push_conversation_worker_spec.rb
+++ b/spec/workers/push_conversation_worker_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe PushConversationWorker do
+RSpec.describe PushConversationWorker do
   let(:worker) { described_class.new }
 
   describe 'perform' do
diff --git a/spec/workers/push_encrypted_message_worker_spec.rb b/spec/workers/push_encrypted_message_worker_spec.rb
index 3cd04ce7b4c60f..311545cf562297 100644
--- a/spec/workers/push_encrypted_message_worker_spec.rb
+++ b/spec/workers/push_encrypted_message_worker_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe PushEncryptedMessageWorker do
+RSpec.describe PushEncryptedMessageWorker do
   let(:worker) { described_class.new }
 
   describe 'perform' do
diff --git a/spec/workers/push_update_worker_spec.rb b/spec/workers/push_update_worker_spec.rb
index c8f94fa82a81d1..6206ab59867a27 100644
--- a/spec/workers/push_update_worker_spec.rb
+++ b/spec/workers/push_update_worker_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe PushUpdateWorker do
+RSpec.describe PushUpdateWorker do
   let(:worker) { described_class.new }
 
   describe 'perform' do
diff --git a/spec/workers/redownload_avatar_worker_spec.rb b/spec/workers/redownload_avatar_worker_spec.rb
index 6ef320bc4fd2ad..6712ce8f4029f5 100644
--- a/spec/workers/redownload_avatar_worker_spec.rb
+++ b/spec/workers/redownload_avatar_worker_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe RedownloadAvatarWorker do
+RSpec.describe RedownloadAvatarWorker do
   let(:worker) { described_class.new }
 
   describe '#perform' do
diff --git a/spec/workers/redownload_header_worker_spec.rb b/spec/workers/redownload_header_worker_spec.rb
index 746c1a63ffbb76..a57ed3179235d9 100644
--- a/spec/workers/redownload_header_worker_spec.rb
+++ b/spec/workers/redownload_header_worker_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe RedownloadHeaderWorker do
+RSpec.describe RedownloadHeaderWorker do
   let(:worker) { described_class.new }
 
   describe '#perform' do
diff --git a/spec/workers/redownload_media_worker_spec.rb b/spec/workers/redownload_media_worker_spec.rb
index cd561d148b11f0..adf9a7171c37ca 100644
--- a/spec/workers/redownload_media_worker_spec.rb
+++ b/spec/workers/redownload_media_worker_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe RedownloadMediaWorker do
+RSpec.describe RedownloadMediaWorker do
   let(:worker) { described_class.new }
 
   describe '#perform' do
diff --git a/spec/workers/refollow_worker_spec.rb b/spec/workers/refollow_worker_spec.rb
index 5718d4db497652..30d53279473ec0 100644
--- a/spec/workers/refollow_worker_spec.rb
+++ b/spec/workers/refollow_worker_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe RefollowWorker do
+RSpec.describe RefollowWorker do
   subject { described_class.new }
 
   let(:account) { Fabricate(:account, domain: 'example.org', protocol: :activitypub) }
diff --git a/spec/workers/regeneration_worker_spec.rb b/spec/workers/regeneration_worker_spec.rb
index 37b0a04c49fb5b..980f1d81db71b0 100644
--- a/spec/workers/regeneration_worker_spec.rb
+++ b/spec/workers/regeneration_worker_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe RegenerationWorker do
+RSpec.describe RegenerationWorker do
   subject { described_class.new }
 
   describe 'perform' do
diff --git a/spec/workers/removal_worker_spec.rb b/spec/workers/removal_worker_spec.rb
index 5071e882b6ad97..784e72441cd83d 100644
--- a/spec/workers/removal_worker_spec.rb
+++ b/spec/workers/removal_worker_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe RemovalWorker do
+RSpec.describe RemovalWorker do
   let(:worker) { described_class.new }
   let(:service) { instance_double(RemoveStatusService, call: true) }
 
diff --git a/spec/workers/remove_featured_tag_worker_spec.rb b/spec/workers/remove_featured_tag_worker_spec.rb
index a64bd0605f3db0..7866824ee751fc 100644
--- a/spec/workers/remove_featured_tag_worker_spec.rb
+++ b/spec/workers/remove_featured_tag_worker_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe RemoveFeaturedTagWorker do
+RSpec.describe RemoveFeaturedTagWorker do
   let(:worker) { described_class.new }
 
   describe 'perform' do
diff --git a/spec/workers/remove_from_public_statuses_index_worker_spec.rb b/spec/workers/remove_from_public_statuses_index_worker_spec.rb
index 43ff211eaa772a..90f05d6a26793a 100644
--- a/spec/workers/remove_from_public_statuses_index_worker_spec.rb
+++ b/spec/workers/remove_from_public_statuses_index_worker_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe RemoveFromPublicStatusesIndexWorker do
+RSpec.describe RemoveFromPublicStatusesIndexWorker do
   describe '#perform' do
     let(:account) { Fabricate(:account, indexable: indexable) }
     let(:account_id) { account.id }
diff --git a/spec/workers/resolve_account_worker_spec.rb b/spec/workers/resolve_account_worker_spec.rb
index 6f3cff099f16c4..de349adacb6f39 100644
--- a/spec/workers/resolve_account_worker_spec.rb
+++ b/spec/workers/resolve_account_worker_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe ResolveAccountWorker do
+RSpec.describe ResolveAccountWorker do
   let(:worker) { described_class.new }
 
   describe 'perform' do
diff --git a/spec/workers/scheduler/accounts_statuses_cleanup_scheduler_spec.rb b/spec/workers/scheduler/accounts_statuses_cleanup_scheduler_spec.rb
index 08ebf82785f6d9..28a41761931d02 100644
--- a/spec/workers/scheduler/accounts_statuses_cleanup_scheduler_spec.rb
+++ b/spec/workers/scheduler/accounts_statuses_cleanup_scheduler_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Scheduler::AccountsStatusesCleanupScheduler do
+RSpec.describe Scheduler::AccountsStatusesCleanupScheduler do
   subject { described_class.new }
 
   let!(:account_alice) { Fabricate(:account, domain: nil, username: 'alice') }
diff --git a/spec/workers/scheduler/auto_close_registrations_scheduler_spec.rb b/spec/workers/scheduler/auto_close_registrations_scheduler_spec.rb
index c0c50b128d8f47..d9355248ba8389 100644
--- a/spec/workers/scheduler/auto_close_registrations_scheduler_spec.rb
+++ b/spec/workers/scheduler/auto_close_registrations_scheduler_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Scheduler::AutoCloseRegistrationsScheduler do
+RSpec.describe Scheduler::AutoCloseRegistrationsScheduler do
   subject { described_class.new }
 
   describe '#perform' do
diff --git a/spec/workers/scheduler/follow_recommendations_scheduler_spec.rb b/spec/workers/scheduler/follow_recommendations_scheduler_spec.rb
index 246012e128c9ce..eb9d88e59a485d 100644
--- a/spec/workers/scheduler/follow_recommendations_scheduler_spec.rb
+++ b/spec/workers/scheduler/follow_recommendations_scheduler_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Scheduler::FollowRecommendationsScheduler do
+RSpec.describe Scheduler::FollowRecommendationsScheduler do
   let!(:target_accounts) do
     Fabricate.times(3, :account) do
       statuses(count: 6)
diff --git a/spec/workers/scheduler/indexing_scheduler_spec.rb b/spec/workers/scheduler/indexing_scheduler_spec.rb
index 568f0fc84dbd06..39a88e80637c6c 100644
--- a/spec/workers/scheduler/indexing_scheduler_spec.rb
+++ b/spec/workers/scheduler/indexing_scheduler_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Scheduler::IndexingScheduler do
+RSpec.describe Scheduler::IndexingScheduler do
   let(:worker) { described_class.new }
 
   describe 'perform' do
diff --git a/spec/workers/scheduler/instance_refresh_scheduler_spec.rb b/spec/workers/scheduler/instance_refresh_scheduler_spec.rb
index 8f686a69988c79..37682ebb8f1a4f 100644
--- a/spec/workers/scheduler/instance_refresh_scheduler_spec.rb
+++ b/spec/workers/scheduler/instance_refresh_scheduler_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Scheduler::InstanceRefreshScheduler do
+RSpec.describe Scheduler::InstanceRefreshScheduler do
   let(:worker) { described_class.new }
 
   describe 'perform' do
diff --git a/spec/workers/scheduler/ip_cleanup_scheduler_spec.rb b/spec/workers/scheduler/ip_cleanup_scheduler_spec.rb
index 50af0301174d1a..7071fa6e984e2f 100644
--- a/spec/workers/scheduler/ip_cleanup_scheduler_spec.rb
+++ b/spec/workers/scheduler/ip_cleanup_scheduler_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Scheduler::IpCleanupScheduler do
+RSpec.describe Scheduler::IpCleanupScheduler do
   let(:worker) { described_class.new }
 
   describe 'perform' do
diff --git a/spec/workers/scheduler/pghero_scheduler_spec.rb b/spec/workers/scheduler/pghero_scheduler_spec.rb
index e404e5fe4726a7..c99e5bb164c58f 100644
--- a/spec/workers/scheduler/pghero_scheduler_spec.rb
+++ b/spec/workers/scheduler/pghero_scheduler_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Scheduler::PgheroScheduler do
+RSpec.describe Scheduler::PgheroScheduler do
   let(:worker) { described_class.new }
 
   describe 'perform' do
diff --git a/spec/workers/scheduler/scheduled_statuses_scheduler_spec.rb b/spec/workers/scheduler/scheduled_statuses_scheduler_spec.rb
index 13c853c62ac9f7..2eeaeffe376de2 100644
--- a/spec/workers/scheduler/scheduled_statuses_scheduler_spec.rb
+++ b/spec/workers/scheduler/scheduled_statuses_scheduler_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Scheduler::ScheduledStatusesScheduler do
+RSpec.describe Scheduler::ScheduledStatusesScheduler do
   let(:worker) { described_class.new }
 
   describe 'perform' do
diff --git a/spec/workers/scheduler/self_destruct_scheduler_spec.rb b/spec/workers/scheduler/self_destruct_scheduler_spec.rb
index 2bf578357197ae..a79559efddd571 100644
--- a/spec/workers/scheduler/self_destruct_scheduler_spec.rb
+++ b/spec/workers/scheduler/self_destruct_scheduler_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Scheduler::SelfDestructScheduler do
+RSpec.describe Scheduler::SelfDestructScheduler do
   let(:worker) { described_class.new }
 
   describe '#perform' do
diff --git a/spec/workers/scheduler/software_update_check_scheduler_spec.rb b/spec/workers/scheduler/software_update_check_scheduler_spec.rb
index f596c0a1eca5a7..c88dbfe0af2ec2 100644
--- a/spec/workers/scheduler/software_update_check_scheduler_spec.rb
+++ b/spec/workers/scheduler/software_update_check_scheduler_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Scheduler::SoftwareUpdateCheckScheduler do
+RSpec.describe Scheduler::SoftwareUpdateCheckScheduler do
   subject { described_class.new }
 
   describe 'perform' do
diff --git a/spec/workers/scheduler/suspended_user_cleanup_scheduler_spec.rb b/spec/workers/scheduler/suspended_user_cleanup_scheduler_spec.rb
index 25f0e1fce4793e..2782848e76d9e8 100644
--- a/spec/workers/scheduler/suspended_user_cleanup_scheduler_spec.rb
+++ b/spec/workers/scheduler/suspended_user_cleanup_scheduler_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Scheduler::SuspendedUserCleanupScheduler do
+RSpec.describe Scheduler::SuspendedUserCleanupScheduler do
   let(:worker) { described_class.new }
 
   describe 'perform' do
diff --git a/spec/workers/scheduler/trends/refresh_scheduler_spec.rb b/spec/workers/scheduler/trends/refresh_scheduler_spec.rb
index c0c5f032bfcc8e..34bcd8fdd8266c 100644
--- a/spec/workers/scheduler/trends/refresh_scheduler_spec.rb
+++ b/spec/workers/scheduler/trends/refresh_scheduler_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Scheduler::Trends::RefreshScheduler do
+RSpec.describe Scheduler::Trends::RefreshScheduler do
   let(:worker) { described_class.new }
 
   describe 'perform' do
diff --git a/spec/workers/scheduler/trends/review_notifications_scheduler_spec.rb b/spec/workers/scheduler/trends/review_notifications_scheduler_spec.rb
index cc971c24b40978..ec35236172ffe9 100644
--- a/spec/workers/scheduler/trends/review_notifications_scheduler_spec.rb
+++ b/spec/workers/scheduler/trends/review_notifications_scheduler_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Scheduler::Trends::ReviewNotificationsScheduler do
+RSpec.describe Scheduler::Trends::ReviewNotificationsScheduler do
   let(:worker) { described_class.new }
 
   describe 'perform' do
diff --git a/spec/workers/scheduler/user_cleanup_scheduler_spec.rb b/spec/workers/scheduler/user_cleanup_scheduler_spec.rb
index 7952f2c146309c..b1be7c46117203 100644
--- a/spec/workers/scheduler/user_cleanup_scheduler_spec.rb
+++ b/spec/workers/scheduler/user_cleanup_scheduler_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Scheduler::UserCleanupScheduler do
+RSpec.describe Scheduler::UserCleanupScheduler do
   subject { described_class.new }
 
   let!(:new_unconfirmed_user) { Fabricate(:user) }
diff --git a/spec/workers/scheduler/vacuum_scheduler_spec.rb b/spec/workers/scheduler/vacuum_scheduler_spec.rb
index 36ecc93d8e4aac..29a7eeac40a8e7 100644
--- a/spec/workers/scheduler/vacuum_scheduler_spec.rb
+++ b/spec/workers/scheduler/vacuum_scheduler_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Scheduler::VacuumScheduler do
+RSpec.describe Scheduler::VacuumScheduler do
   let(:worker) { described_class.new }
 
   describe 'perform' do
diff --git a/spec/workers/tag_unmerge_worker_spec.rb b/spec/workers/tag_unmerge_worker_spec.rb
index 5d3a12c4492af6..a0e53e36d936e7 100644
--- a/spec/workers/tag_unmerge_worker_spec.rb
+++ b/spec/workers/tag_unmerge_worker_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe TagUnmergeWorker do
+RSpec.describe TagUnmergeWorker do
   subject { described_class.new }
 
   describe 'perform' do
diff --git a/spec/workers/unfilter_notifications_worker_spec.rb b/spec/workers/unfilter_notifications_worker_spec.rb
index 629eb644e4f2bb..464a4520ffd535 100644
--- a/spec/workers/unfilter_notifications_worker_spec.rb
+++ b/spec/workers/unfilter_notifications_worker_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe UnfilterNotificationsWorker do
+RSpec.describe UnfilterNotificationsWorker do
   let(:recipient) { Fabricate(:account) }
   let(:sender) { Fabricate(:account) }
 
diff --git a/spec/workers/unfollow_follow_worker_spec.rb b/spec/workers/unfollow_follow_worker_spec.rb
index 8025b88c0c366c..7b9d49b902dbe3 100644
--- a/spec/workers/unfollow_follow_worker_spec.rb
+++ b/spec/workers/unfollow_follow_worker_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe UnfollowFollowWorker do
+RSpec.describe UnfollowFollowWorker do
   subject { described_class.new }
 
   let(:local_follower)   { Fabricate(:account) }
diff --git a/spec/workers/unpublish_announcement_worker_spec.rb b/spec/workers/unpublish_announcement_worker_spec.rb
index c742c30bcea4a2..f4838ac2487a14 100644
--- a/spec/workers/unpublish_announcement_worker_spec.rb
+++ b/spec/workers/unpublish_announcement_worker_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe UnpublishAnnouncementWorker do
+RSpec.describe UnpublishAnnouncementWorker do
   let(:worker) { described_class.new }
 
   describe 'perform' do
diff --git a/spec/workers/verify_account_links_worker_spec.rb b/spec/workers/verify_account_links_worker_spec.rb
index 227591392c5bc1..3f600b8c979199 100644
--- a/spec/workers/verify_account_links_worker_spec.rb
+++ b/spec/workers/verify_account_links_worker_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe VerifyAccountLinksWorker do
+RSpec.describe VerifyAccountLinksWorker do
   let(:worker) { described_class.new }
 
   describe 'perform' do
diff --git a/spec/workers/web/push_notification_worker_spec.rb b/spec/workers/web/push_notification_worker_spec.rb
index 637206a40939ab..ced21d5bf799b4 100644
--- a/spec/workers/web/push_notification_worker_spec.rb
+++ b/spec/workers/web/push_notification_worker_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Web::PushNotificationWorker do
+RSpec.describe Web::PushNotificationWorker do
   subject { described_class.new }
 
   let(:p256dh) { 'BN4GvZtEZiZuqFxSKVZfSfluwKBD7UxHNBmWkfiZfCtgDE8Bwh-_MtLXbBxTBAWH9r7IPKL0lhdcaqtL1dfxU5E=' }
diff --git a/spec/workers/webhooks/delivery_worker_spec.rb b/spec/workers/webhooks/delivery_worker_spec.rb
index 6a5483d1d46e0a..48fcfc607bff7a 100644
--- a/spec/workers/webhooks/delivery_worker_spec.rb
+++ b/spec/workers/webhooks/delivery_worker_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Webhooks::DeliveryWorker do
+RSpec.describe Webhooks::DeliveryWorker do
   let(:worker) { described_class.new }
 
   describe '#perform' do

From 9ed1aab9b7a96076e949d5c47b391376af23d9c8 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 4 Sep 2024 01:12:35 -0400
Subject: [PATCH 2074/2191] Remove accidental matcher debug code (#31732)

---
 spec/support/matchers/cacheable_response.rb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/spec/support/matchers/cacheable_response.rb b/spec/support/matchers/cacheable_response.rb
index da8570c8c5a6a1..e48eb28cc15aca 100644
--- a/spec/support/matchers/cacheable_response.rb
+++ b/spec/support/matchers/cacheable_response.rb
@@ -27,8 +27,6 @@
   end
 
   def check_vary
-    puts @expected_vary
-    pp @response.headers
     "Response `Vary` header does not contain `#{@expected_vary}`" unless @response.headers['Vary'].include?(@expected_vary)
   end
 

From 14af5b47ac2230937e9244bec41390301c7b0067 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 4 Sep 2024 01:12:40 -0400
Subject: [PATCH 2075/2191] Add coverage for model normalizations (#31734)

---
 spec/models/account_alias_spec.rb     | 11 +++++++
 spec/models/account_migration_spec.rb |  6 ++++
 spec/models/account_spec.rb           | 11 +++----
 spec/models/account_warning_spec.rb   | 11 +++++++
 spec/models/custom_emoji_spec.rb      | 19 ++-----------
 spec/models/custom_filter_spec.rb     |  6 ++--
 spec/models/featured_tag_spec.rb      | 11 +++++++
 spec/models/relay_spec.rb             | 11 +++++++
 spec/models/user_spec.rb              | 41 +++++----------------------
 spec/models/webhook_spec.rb           |  6 ++--
 10 files changed, 70 insertions(+), 63 deletions(-)
 create mode 100644 spec/models/account_alias_spec.rb
 create mode 100644 spec/models/account_warning_spec.rb
 create mode 100644 spec/models/featured_tag_spec.rb
 create mode 100644 spec/models/relay_spec.rb

diff --git a/spec/models/account_alias_spec.rb b/spec/models/account_alias_spec.rb
new file mode 100644
index 00000000000000..fc8c6bd250efde
--- /dev/null
+++ b/spec/models/account_alias_spec.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe AccountAlias do
+  describe 'Normalizations' do
+    describe 'acct' do
+      it { is_expected.to normalize(:acct).from('  @username@domain  ').to('username@domain') }
+    end
+  end
+end
diff --git a/spec/models/account_migration_spec.rb b/spec/models/account_migration_spec.rb
index 1f32c6082ef00b..d658915ce3c4e6 100644
--- a/spec/models/account_migration_spec.rb
+++ b/spec/models/account_migration_spec.rb
@@ -3,6 +3,12 @@
 require 'rails_helper'
 
 RSpec.describe AccountMigration do
+  describe 'Normalizations' do
+    describe 'acct' do
+      it { is_expected.to normalize(:acct).from('  @username@domain  ').to('username@domain') }
+    end
+  end
+
   describe 'validations' do
     subject { described_class.new(account: source_account, acct: target_acct) }
 
diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb
index 83f1585b612f2d..27707fa897e3d1 100644
--- a/spec/models/account_spec.rb
+++ b/spec/models/account_spec.rb
@@ -723,14 +723,15 @@
     end
   end
 
+  describe 'Normalizations' do
+    describe 'username' do
+      it { is_expected.to normalize(:username).from(" \u3000bob \t \u00a0 \n ").to('bob') }
+    end
+  end
+
   describe 'validations' do
     it { is_expected.to validate_presence_of(:username) }
 
-    it 'squishes the username before validation' do
-      account = Fabricate(:account, domain: nil, username: " \u3000bob \t \u00a0 \n ")
-      expect(account.username).to eq 'bob'
-    end
-
     context 'when is local' do
       it 'is invalid if the username is not unique in case-insensitive comparison among local accounts' do
         _account = Fabricate(:account, username: 'the_doctor')
diff --git a/spec/models/account_warning_spec.rb b/spec/models/account_warning_spec.rb
new file mode 100644
index 00000000000000..37866ce3da95f6
--- /dev/null
+++ b/spec/models/account_warning_spec.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe AccountWarning do
+  describe 'Normalizations' do
+    describe 'text' do
+      it { is_expected.to normalize(:text).from(nil).to('') }
+    end
+  end
+end
diff --git a/spec/models/custom_emoji_spec.rb b/spec/models/custom_emoji_spec.rb
index cb8cb5c11bd67e..87b111441a1df3 100644
--- a/spec/models/custom_emoji_spec.rb
+++ b/spec/models/custom_emoji_spec.rb
@@ -79,22 +79,9 @@
   end
 
   describe 'Normalizations' do
-    describe 'downcase domain value' do
-      context 'with a mixed case domain value' do
-        it 'normalizes the value to downcased' do
-          custom_emoji = Fabricate.build(:custom_emoji, domain: 'wWw.MaStOdOn.CoM')
-
-          expect(custom_emoji.domain).to eq('www.mastodon.com')
-        end
-      end
-
-      context 'with a nil domain value' do
-        it 'leaves the value as nil' do
-          custom_emoji = Fabricate.build(:custom_emoji, domain: nil)
-
-          expect(custom_emoji.domain).to be_nil
-        end
-      end
+    describe 'domain' do
+      it { is_expected.to normalize(:domain).from('wWw.MaStOdOn.CoM').to('www.mastodon.com') }
+      it { is_expected.to normalize(:domain).from(nil).to(nil) }
     end
   end
 end
diff --git a/spec/models/custom_filter_spec.rb b/spec/models/custom_filter_spec.rb
index 8ac9dbb896434e..5bb615bb37f68e 100644
--- a/spec/models/custom_filter_spec.rb
+++ b/spec/models/custom_filter_spec.rb
@@ -34,10 +34,8 @@
   end
 
   describe 'Normalizations' do
-    it 'cleans up context values' do
-      record = described_class.new(context: ['home', 'notifications', 'public    ', ''])
-
-      expect(record.context).to eq(%w(home notifications public))
+    describe 'context' do
+      it { is_expected.to normalize(:context).from(['home', 'notifications', 'public    ', '']).to(%w(home notifications public)) }
     end
   end
 end
diff --git a/spec/models/featured_tag_spec.rb b/spec/models/featured_tag_spec.rb
new file mode 100644
index 00000000000000..6056e645e05b2b
--- /dev/null
+++ b/spec/models/featured_tag_spec.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe FeaturedTag do
+  describe 'Normalizations' do
+    describe 'name' do
+      it { is_expected.to normalize(:name).from('  #hashtag  ').to('hashtag') }
+    end
+  end
+end
diff --git a/spec/models/relay_spec.rb b/spec/models/relay_spec.rb
new file mode 100644
index 00000000000000..4b95c596e4566b
--- /dev/null
+++ b/spec/models/relay_spec.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe Relay do
+  describe 'Normalizations' do
+    describe 'inbox_url' do
+      it { is_expected.to normalize(:inbox_url).from('  http://host.example  ').to('http://host.example') }
+    end
+  end
+end
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 0f3e25576ee688..5c2af4dc396902 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -59,45 +59,18 @@
 
   describe 'Normalizations' do
     describe 'locale' do
-      it 'preserves valid locale' do
-        user = Fabricate.build(:user, locale: 'en')
-
-        expect(user.locale).to eq('en')
-      end
-
-      it 'cleans out invalid locale' do
-        user = Fabricate.build(:user, locale: 'toto')
-
-        expect(user.locale).to be_nil
-      end
+      it { is_expected.to_not normalize(:locale).from('en') }
+      it { is_expected.to normalize(:locale).from('toto').to(nil) }
     end
 
     describe 'time_zone' do
-      it 'preserves valid timezone' do
-        user = Fabricate.build(:user, time_zone: 'UTC')
-
-        expect(user.time_zone).to eq('UTC')
-      end
-
-      it 'cleans out invalid timezone' do
-        user = Fabricate.build(:user, time_zone: 'toto')
-
-        expect(user.time_zone).to be_nil
-      end
+      it { is_expected.to_not normalize(:time_zone).from('UTC') }
+      it { is_expected.to normalize(:time_zone).from('toto').to(nil) }
     end
 
-    describe 'languages' do
-      it 'preserves valid options for languages' do
-        user = Fabricate.build(:user, chosen_languages: ['en', 'fr', ''])
-
-        expect(user.chosen_languages).to eq(['en', 'fr'])
-      end
-
-      it 'cleans out empty string from languages' do
-        user = Fabricate.build(:user, chosen_languages: [''])
-
-        expect(user.chosen_languages).to be_nil
-      end
+    describe 'chosen_languages' do
+      it { is_expected.to normalize(:chosen_languages).from(['en', 'fr', '']).to(%w(en fr)) }
+      it { is_expected.to normalize(:chosen_languages).from(['']).to(nil) }
     end
   end
 
diff --git a/spec/models/webhook_spec.rb b/spec/models/webhook_spec.rb
index 864baf2e1aebfb..1b2d803bd75ed0 100644
--- a/spec/models/webhook_spec.rb
+++ b/spec/models/webhook_spec.rb
@@ -29,10 +29,8 @@
   end
 
   describe 'Normalizations' do
-    it 'cleans up events values' do
-      record = described_class.new(events: ['account.approved', 'account.created     ', ''])
-
-      expect(record.events).to eq(%w(account.approved account.created))
+    describe 'events' do
+      it { is_expected.to normalize(:events).from(['account.approved', 'account.created     ', '']).to(%w(account.approved account.created)) }
     end
   end
 

From a24049db306a97dc5b29da4d794751b4757529bf Mon Sep 17 00:00:00 2001
From: Michael Stanclift <mx@vmstan.com>
Date: Wed, 4 Sep 2024 03:20:46 -0500
Subject: [PATCH 2076/2191] Fix Corepack prompt on Devcontainer (#31729)

---
 .devcontainer/Dockerfile                   | 3 +++
 .devcontainer/codespaces/devcontainer.json | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index c6dcc4d46a37d6..3aa0bbf7da4ec3 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -11,5 +11,8 @@ RUN apt-get update && \
     export DEBIAN_FRONTEND=noninteractive && \
     apt-get -y install --no-install-recommends libicu-dev libidn11-dev ffmpeg imagemagick libvips42 libpam-dev
 
+# Disable download prompt for Corepack
+ENV COREPACK_ENABLE_DOWNLOAD_PROMPT=0
+
 # Move welcome message to where VS Code expects it
 COPY .devcontainer/welcome-message.txt /usr/local/etc/vscode-dev-containers/first-run-notice.txt
diff --git a/.devcontainer/codespaces/devcontainer.json b/.devcontainer/codespaces/devcontainer.json
index 8acffec8259867..d2358657f6d664 100644
--- a/.devcontainer/codespaces/devcontainer.json
+++ b/.devcontainer/codespaces/devcontainer.json
@@ -39,7 +39,7 @@
   },
 
   "onCreateCommand": "git config --global --add safe.directory ${containerWorkspaceFolder}",
-  "postCreateCommand": "COREPACK_ENABLE_DOWNLOAD_PROMPT=0 bin/setup",
+  "postCreateCommand": "bin/setup",
   "waitFor": "postCreateCommand",
 
   "customizations": {

From 612802b9e5ede73e76e711a65f5c95e451fab0b7 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 4 Sep 2024 08:22:44 +0000
Subject: [PATCH 2077/2191] Update dependency sass to v1.78.0 (#31739)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 57e928c4de40cc..727dfacd92b2ab 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -15441,15 +15441,15 @@ __metadata:
   linkType: hard
 
 "sass@npm:^1.62.1":
-  version: 1.77.8
-  resolution: "sass@npm:1.77.8"
+  version: 1.78.0
+  resolution: "sass@npm:1.78.0"
   dependencies:
     chokidar: "npm:>=3.0.0 <4.0.0"
     immutable: "npm:^4.0.0"
     source-map-js: "npm:>=0.6.2 <2.0.0"
   bin:
     sass: sass.js
-  checksum: 10c0/2bfd62794070352c804f949e69bd8bb5b4ec846deeb924251b2c3f7b503170fb1ae186f513f0166907749eb34e0277dee747edcb78c886fb471aac01be1e864c
+  checksum: 10c0/6577a87c00b03a5a50f3a11b4b6592f28abce34e61812e381535a3b712151bd94db3ca06467d20395431e0f38a23f99e616d6859d771fb6d4617c359f590c48c
   languageName: node
   linkType: hard
 

From 3553d6c36f522d4b3365db0139ff40261fc0728b Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 4 Sep 2024 08:23:00 +0000
Subject: [PATCH 2078/2191] Update dependency aws-sdk-s3 to v1.160.0 (#31735)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 461a2d43a23550..dcd82b273ab8f8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -100,17 +100,17 @@ GEM
     attr_required (1.0.2)
     awrence (1.2.1)
     aws-eventstream (1.3.0)
-    aws-partitions (1.969.0)
-    aws-sdk-core (3.202.1)
+    aws-partitions (1.970.0)
+    aws-sdk-core (3.203.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.9)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.88.0)
-      aws-sdk-core (~> 3, >= 3.201.0)
+    aws-sdk-kms (1.89.0)
+      aws-sdk-core (~> 3, >= 3.203.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.159.0)
-      aws-sdk-core (~> 3, >= 3.201.0)
+    aws-sdk-s3 (1.160.0)
+      aws-sdk-core (~> 3, >= 3.203.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
     aws-sigv4 (1.9.1)

From 2c6131c9a1957b4847cf6d0b23986824e64c60c2 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 4 Sep 2024 10:23:15 +0200
Subject: [PATCH 2079/2191] Update dependency test-prof to v1.4.2 (#31733)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index dcd82b273ab8f8..09be3e6921f23c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -837,7 +837,7 @@ GEM
       unicode-display_width (>= 1.1.1, < 3)
     terrapin (1.0.1)
       climate_control
-    test-prof (1.4.1)
+    test-prof (1.4.2)
     thor (1.3.2)
     tilt (2.4.0)
     timeout (0.4.1)

From 393a5504e58e05e389781abe7f17e153eb4583eb Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 4 Sep 2024 10:25:37 +0200
Subject: [PATCH 2080/2191] Update dependency ruby to v3.3.5 (#31719)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .ruby-version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.ruby-version b/.ruby-version
index a0891f563f38b0..fa7adc7ac72a28 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-3.3.4
+3.3.5

From 1c17dca6d9c36371cbcdd0f9a610e9c5eb53718b Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 4 Sep 2024 10:42:36 +0200
Subject: [PATCH 2081/2191] New Crowdin Translations (automated) (#31741)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/pt-BR.json | 28 +++++++
 config/locales/activerecord.pt-BR.yml      | 14 ++--
 config/locales/devise.pt-BR.yml            | 10 +--
 config/locales/doorkeeper.pt-BR.yml        | 35 ++++----
 config/locales/en-GB.yml                   | 22 ++++++
 config/locales/fr-CA.yml                   | 16 ++++
 config/locales/fr.yml                      | 16 ++++
 config/locales/he.yml                      |  1 +
 config/locales/hu.yml                      |  1 +
 config/locales/is.yml                      |  1 +
 config/locales/ko.yml                      |  2 +-
 config/locales/nn.yml                      |  1 +
 config/locales/pt-BR.yml                   | 92 ++++++++++++++++++++--
 config/locales/simple_form.pt-BR.yml       |  4 +
 config/locales/tr.yml                      |  1 +
 15 files changed, 209 insertions(+), 35 deletions(-)

diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json
index e925246bf75954..aeff65485e0494 100644
--- a/app/javascript/mastodon/locales/pt-BR.json
+++ b/app/javascript/mastodon/locales/pt-BR.json
@@ -524,7 +524,9 @@
   "notification.moderation_warning.action_silence": "Sua conta foi limitada.",
   "notification.moderation_warning.action_suspend": "Sua conta foi suspensa.",
   "notification.own_poll": "Sua enquete terminou",
+  "notification.poll": "Uma enquete que você votou terminou",
   "notification.reblog": "{name} deu boost no teu toot",
+  "notification.reblog.name_and_others_with_link": "{name} e <a>{count, plural, one {# outra} other {# outras}}</a> impulsionaram a publicação",
   "notification.relationships_severance_event": "Conexões perdidas com {name}",
   "notification.relationships_severance_event.account_suspension": "Um administrador de {from} suspendeu {target}, o que significa que você não pode mais receber atualizações deles ou interagir com eles.",
   "notification.relationships_severance_event.domain_block": "An admin from {from} has blocked {target}, including {followersCount} of your followers and {followingCount, plural, one {# account} other {# accounts}} you follow.",
@@ -533,16 +535,32 @@
   "notification.status": "{name} acabou de tootar",
   "notification.update": "{name} editou uma publicação",
   "notification_requests.accept": "Aceitar",
+  "notification_requests.accept_multiple": "{count, plural, one {Aceite # pedido…} other {Aceite # pedidos…}}",
+  "notification_requests.confirm_accept_multiple.button": "{count, plural, one {Aceite # pedido} other {Aceite # pedidos}}",
+  "notification_requests.confirm_accept_multiple.message": "Você está prestes a aceitar {count, plural, one {um pedido de notificação} other {# pedidos de notificação}}. Tem certeza de que deseja continuar?",
+  "notification_requests.confirm_accept_multiple.title": "Aceitar solicitações de notificação?",
+  "notification_requests.confirm_dismiss_multiple.button": "{count, plural, one {Dispensar pedido} other {Dispensar pedidos}}",
+  "notification_requests.confirm_dismiss_multiple.message": "Você está prestes a descartar {count, plural, one {um pedido de notificação} other {# pedidos de notificação}}. Você não será capaz de acessar facilmente{count, plural, one {} other {}} novamente. Tem certeza de que deseja continuar?",
+  "notification_requests.confirm_dismiss_multiple.title": "Descartar solicitações de notificação?",
   "notification_requests.dismiss": "Rejeitar",
+  "notification_requests.dismiss_multiple": "{count, plural, one {Dispensar # pedido…} other {Dispensar # pedidos…}}",
+  "notification_requests.edit_selection": "Editar",
+  "notification_requests.exit_selection": "Concluído",
+  "notification_requests.explainer_for_limited_account": "As notificações desta conta foram filtradas porque a conta foi limitada por um moderador.",
+  "notification_requests.explainer_for_limited_remote_account": "As notificações desta conta foram filtradas porque a conta ou o seu servidor foi limitado por um moderador.",
   "notification_requests.maximize": "Maximizar",
+  "notification_requests.minimize_banner": "Minimizar banner de notificações filtradas",
   "notification_requests.notifications_from": "Notificações de {name}",
   "notification_requests.title": "Notificações filtradas",
+  "notification_requests.view": "Ver notificações",
   "notifications.clear": "Limpar notificações",
   "notifications.clear_confirmation": "Você tem certeza de que deseja limpar todas as suas notificações?",
   "notifications.clear_title": "Limpar notificações?",
   "notifications.column_settings.admin.report": "Novas denúncias:",
   "notifications.column_settings.admin.sign_up": "Novas inscrições:",
   "notifications.column_settings.alert": "Notificações no computador",
+  "notifications.column_settings.beta.category": "Recursos experimentais",
+  "notifications.column_settings.beta.grouping": "Agrupar notificações",
   "notifications.column_settings.favourite": "Favoritos:",
   "notifications.column_settings.filter_bar.advanced": "Exibir todas as categorias",
   "notifications.column_settings.filter_bar.category": "Barra de filtro rápido",
@@ -574,6 +592,11 @@
   "notifications.policy.accept": "Aceitar",
   "notifications.policy.accept_hint": "Mostrar nas notificações",
   "notifications.policy.drop": "Ignorar",
+  "notifications.policy.drop_hint": "Envie para o void, para nunca mais ser visto novamente",
+  "notifications.policy.filter": "Filtrar",
+  "notifications.policy.filter_hint": "Enviar para caixa de notificações filtradas",
+  "notifications.policy.filter_limited_accounts_hint": "Limitado pelos moderadores do servidor",
+  "notifications.policy.filter_limited_accounts_title": "Contas moderadas",
   "notifications.policy.filter_new_accounts.hint": "Created within the past {days, plural, one {one day} other {# days}}",
   "notifications.policy.filter_new_accounts_title": "Novas contas",
   "notifications.policy.filter_not_followers_hint": "Including people who have been following you fewer than {days, plural, one {one day} other {# days}}",
@@ -582,6 +605,7 @@
   "notifications.policy.filter_not_following_title": "Pessoas que você não segue",
   "notifications.policy.filter_private_mentions_hint": "Filtrado, a menos que respondido em sua própria menção ou se você segue o remetente",
   "notifications.policy.filter_private_mentions_title": "Menções privadas não solicitadas",
+  "notifications.policy.title": "Gerenciar notificações de…",
   "notifications_permission_banner.enable": "Ativar notificações no computador",
   "notifications_permission_banner.how_to_control": "Para receber notificações quando o Mastodon não estiver aberto, ative as notificações no computador. Você pode controlar precisamente quais tipos de interações geram notificações no computador através do botão {icon}.",
   "notifications_permission_banner.title": "Nunca perca nada",
@@ -708,9 +732,13 @@
   "report.unfollow_explanation": "Você está seguindo esta conta. Para não ver as publicações dela em sua página inicial, deixe de segui-la.",
   "report_notification.attached_statuses": "{count, plural, one {{count} publicação anexada} other {{count} publicações anexadas}}",
   "report_notification.categories.legal": "Legal",
+  "report_notification.categories.legal_sentence": "conteúdo ilegal",
   "report_notification.categories.other": "Outro",
+  "report_notification.categories.other_sentence": "outro",
   "report_notification.categories.spam": "Spam",
+  "report_notification.categories.spam_sentence": "spam",
   "report_notification.categories.violation": "Violação de regra",
+  "report_notification.categories.violation_sentence": "violação de regra",
   "report_notification.open": "Abrir denúncia",
   "search.no_recent_searches": "Nenhuma busca recente",
   "search.placeholder": "Pesquisar",
diff --git a/config/locales/activerecord.pt-BR.yml b/config/locales/activerecord.pt-BR.yml
index ae78026629025a..3199eb8e2d2e7d 100644
--- a/config/locales/activerecord.pt-BR.yml
+++ b/config/locales/activerecord.pt-BR.yml
@@ -32,7 +32,7 @@ pt-BR:
         import:
           attributes:
             data:
-              malformed: está incorreto
+              malformed: está malformado
         status:
           attributes:
             reblog:
@@ -43,16 +43,16 @@ pt-BR:
               blocked: usa provedor de e-mail não permitido
               unreachable: parece não existir
             role_id:
-              elevated: não pode ser maior que seu cargo atual
+              elevated: não pode maior que sua função atual
         user_role:
           attributes:
             permissions_as_keys:
-              dangerous: incluir permissões que não são seguras para o cargo base
-              elevated: não pode incluir permissões que o seu cargo atual não possui
-              own_role: não pode ser alterado com seu cargo atual
+              dangerous: incluir permissões que não são seguras para a função base
+              elevated: não pode incluir permissões que a sua função atual não possui
+              own_role: não pode ser alterado com sua função atual
             position:
-              elevated: não pode ser maior do que seu cargo atual
-              own_role: não pode ser alterado com seu cargo atual
+              elevated: não pode ser maior do que sua função atual
+              own_role: não pode ser alterado com sua função atual
         webhook:
           attributes:
             events:
diff --git a/config/locales/devise.pt-BR.yml b/config/locales/devise.pt-BR.yml
index 4a7f346fabcf85..8f504362defe3e 100644
--- a/config/locales/devise.pt-BR.yml
+++ b/config/locales/devise.pt-BR.yml
@@ -14,7 +14,7 @@ pt-BR:
       not_found_in_database: "%{authentication_keys} ou senha inválida."
       omniauth_user_creation_failure: Erro ao criar uma conta para esta identidade.
       pending: Sua conta está sendo revisada.
-      timeout: Sua sessão expirou. Por favor, entre novamente para continuar.
+      timeout: Sua sessão expirou. Faça ‘login’ novamente para continuar.
       unauthenticated: Você precisa entrar ou criar uma conta antes de continuar.
       unconfirmed: Você precisa confirmar o seu endereço de e-mail antes de continuar.
     mailer:
@@ -48,12 +48,12 @@ pt-BR:
         subject: 'Mastodon: Instruções para alterar senha'
         title: Redefinir senha
       two_factor_disabled:
-        explanation: O ‘login’ agora é possível usando apenas o endereço de e-mail e senha.
+        explanation: O ‘login’ agora é possível usando apenas o endereço eletrônico e senha.
         subject: 'Mastodon: Autenticação de dois fatores desativada'
         subtitle: A autenticação de dois fatores foi desativada.
         title: 2FA desativada
       two_factor_enabled:
-        explanation: Será necessário um código gerado pelo aplicativo de autenticação para fazer login.
+        explanation: Será necessário um código gerado pelo aplicativo de autenticação TOTP para fazer login.
         subject: 'Mastodon: Autenticação de dois fatores ativada'
         subtitle: A autenticação de dois fatores foi ativada para sua conta.
         title: 2FA ativada
@@ -75,11 +75,11 @@ pt-BR:
           title: Uma das suas chaves de segurança foi excluída
       webauthn_disabled:
         explanation: A autenticação por chaves de segurança foi desativada para sua conta.
-        extra: O login agora é possível usando o código gerado por um aplicativo de autenticação de dois fatores.
+        extra: Agora você pode fazer login usando apenas o código gerado pelo aplicativo de autenticação TOTP.
         subject: 'Mastodon: Autenticação por chaves de segurança desativada'
         title: Chaves de segurança desativadas
       webauthn_enabled:
-        explanation: Autenticação por chave de segurança foi ativada para sua conta.
+        explanation: A autenticação por chave de segurança foi ativada para sua conta.
         extra: Sua chave de segurança agora pode ser usada para ‘login’.
         subject: 'Mastodon: Autenticação por chaves de segurança ativada'
         title: Chaves de segurança ativadas
diff --git a/config/locales/doorkeeper.pt-BR.yml b/config/locales/doorkeeper.pt-BR.yml
index 6b076e9081c7a6..c991850c68cc7a 100644
--- a/config/locales/doorkeeper.pt-BR.yml
+++ b/config/locales/doorkeeper.pt-BR.yml
@@ -60,8 +60,8 @@ pt-BR:
       error:
         title: Ocorreu um erro
       new:
-        prompt_html: O %{client_name} gostaria de ter permissão para acessar sua conta. É uma aplicação de terceiros. <strong>Se você não confia, então você não deve autorizá-lo.</strong>
-        review_permissions: Revisar permissões
+        prompt_html: O %{client_name} gostaria de ter permissão para acessar sua conta. Trata-se de uma aplicação de terceiros. <strong>Se você não confia nesta aplicação, então você não deve autorizá-la.</strong>
+        review_permissions: Rever permissões
         title: Autorização necessária
       show:
         title: Copie este código de autorização e cole no aplicativo.
@@ -72,8 +72,8 @@ pt-BR:
         revoke: Você tem certeza?
       index:
         authorized_at: Autorizado em %{date}
-        description_html: Estas são as aplicações que podem acessar sua conta usando a API. Se houver aplicativos que você não reconhece ou com mau funcionamento, você pode revogar seu acesso.
-        last_used_at: Última vez usado em %{date}
+        description_html: Estas são as aplicações que podem acessar sua conta usando a API. Se houver aplicações que você não reconhece ou que não funcionem corretamente, você pode revogar os acessos.
+        last_used_at: Usado pela última vez em %{date}
         never_used: Nunca usado
         scopes: Permissões
         superapp: Interno
@@ -83,6 +83,7 @@ pt-BR:
         access_denied: O proprietário do recurso ou servidor de autorização recusou a solicitação.
         credential_flow_not_configured: Fluxo das Credenciais de Senha do Proprietário do Recurso falhou porque Doorkeeper.configure.resource_owner_from_credentials não foi configurado.
         invalid_client: Autenticação do cliente falhou por causa de um cliente desconhecido, nenhum cliente de autenticação foi incluído ou o método de autenticação não é suportado.
+        invalid_code_challenge_method: O método de desafio de código deve ser S256; o método 'plain' não é suportado.
         invalid_grant: A garantia de autorização está inválida, expirou ou foi revogada, não é equivalente ao link de redirecionamento usado na solicitação de autorização ou foi emitido por outro cliente.
         invalid_redirect_uri: O link de redirecionamento é inválido.
         invalid_request:
@@ -114,23 +115,23 @@ pt-BR:
           notice: Aplicativo revogado.
     grouped_scopes:
       access:
-        read: Acesso somente para leitura
+        read: Acesso somente leitura
         read/write: Acesso de leitura e escrita
-        write: Acesso somente para escrita
+        write: Acesso somente escrita
       title:
         accounts: Contas
         admin/accounts: Administração de contas
         admin/all: Todas as funções administrativas
-        admin/reports: Controle de denúncias
+        admin/reports: Administração de denúncias
         all: Acesso total à sua conta Mastodon
         blocks: Bloqueios
         bookmarks: Salvos
         conversations: Conversas
         crypto: Criptografia de ponta a ponta
-        favourites: Favoritas
+        favourites: Favoritos
         filters: Filtros
-        follow: Seguidores, Silenciados e Bloqueados
-        follows: Seguidores
+        follow: Seguimentos, Silenciamentos e Bloqueios
+        follows: Seguidos
         lists: Listas
         media: Mídias anexadas
         mutes: Silenciados
@@ -151,17 +152,17 @@ pt-BR:
       admin:read: ler todos os dados no servidor
       admin:read:accounts: ler informações sensíveis de todas as contas
       admin:read:canonical_email_blocks: ler informações sensíveis de todos os blocos de e-mail canônicos
-      admin:read:domain_allows: ler informações sensíveis de todos os domínios (URL) permitidos
-      admin:read:domain_blocks: ler informações sensíveis de todos os domínios (URL) bloqueados
-      admin:read:email_domain_blocks: ler informações sensíveis de todos os e-mails de domínios bloqueados
+      admin:read:domain_allows: ler informações sensíveis de todos os domínios permitidos
+      admin:read:domain_blocks: ler informações sensíveis de todos os domínios bloqueados
+      admin:read:email_domain_blocks: ler informações sensíveis de todos os domínios de e-mail bloqueados
       admin:read:ip_blocks: ler informações sensíveis de todos os endereços de IP bloqueados
       admin:read:reports: ler informações sensíveis de todas as denúncias e contas denunciadas
       admin:write: alterar todos os dados no servidor
       admin:write:accounts: executar ações de moderação em contas
       admin:write:canonical_email_blocks: executar ações de moderação em blocos canônicos de e-mail
-      admin:write:domain_allows: executar ações de moderação em domínios (URL) permitidos
-      admin:write:domain_blocks: executar ações de moderação em domínios (URL) bloqueados
-      admin:write:email_domain_blocks: executar ações de moderação em blocos de e-mail bloqueados
+      admin:write:domain_allows: executar ações de moderação em domínios permitidos
+      admin:write:domain_blocks: executar ações de moderação em domínios bloqueados
+      admin:write:email_domain_blocks: executar ações de moderação em domínios de e-mail bloqueados
       admin:write:ip_blocks: executar ações de moderação em IPs bloqueados
       admin:write:reports: executar ações de moderação em denúncias
       crypto: usar criptografia de ponta-a-ponta
@@ -172,7 +173,7 @@ pt-BR:
       read:accounts: ver informações das contas
       read:blocks: ver seus bloqueados
       read:bookmarks: ver seus salvos
-      read:favourites: veja suas favoritas
+      read:favourites: veja seus favoritos
       read:filters: ver seus filtros
       read:follows: ver quem você segue
       read:lists: ver suas listas
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 012d0d91ee6128..bcde9956c2b4aa 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -182,14 +182,17 @@ en-GB:
         create_custom_emoji: Create Custom Emoji
         create_domain_allow: Create Domain Allow
         create_domain_block: Create Domain Block
+        create_email_domain_block: Create Email Domain Block
         create_ip_block: Create IP rule
         create_unavailable_domain: Create Unavailable Domain
         create_user_role: Create Role
         demote_user: Demote User
         destroy_announcement: Delete Announcement
+        destroy_canonical_email_block: Delete Email Block
         destroy_custom_emoji: Delete Custom Emoji
         destroy_domain_allow: Delete Domain Allow
         destroy_domain_block: Delete Domain Block
+        destroy_email_domain_block: Delete Email Domain Block
         destroy_instance: Purge Domain
         destroy_ip_block: Delete IP rule
         destroy_status: Delete Post
@@ -197,8 +200,10 @@ en-GB:
         destroy_user_role: Destroy Role
         disable_2fa_user: Disable 2FA
         disable_custom_emoji: Disable Custom Emoji
+        disable_sign_in_token_auth_user: Disable Email Token Authentication for User
         disable_user: Disable User
         enable_custom_emoji: Enable Custom Emoji
+        enable_sign_in_token_auth_user: Enable Email Token Authentication for User
         enable_user: Enable User
         memorialize_account: Memorialise Account
         promote_user: Promote User
@@ -228,20 +233,26 @@ en-GB:
         approve_appeal_html: "%{name} approved moderation decision appeal from %{target}"
         approve_user_html: "%{name} approved sign-up from %{target}"
         assigned_to_self_report_html: "%{name} assigned report %{target} to themselves"
+        change_email_user_html: "%{name} changed the email address of user %{target}"
         change_role_user_html: "%{name} changed role of %{target}"
+        confirm_user_html: "%{name} confirmed email address of user %{target}"
         create_account_warning_html: "%{name} sent a warning to %{target}"
         create_announcement_html: "%{name} created new announcement %{target}"
+        create_canonical_email_block_html: "%{name} blocked email with the hash %{target}"
         create_custom_emoji_html: "%{name} uploaded new emoji %{target}"
         create_domain_allow_html: "%{name} allowed federation with domain %{target}"
         create_domain_block_html: "%{name} blocked domain %{target}"
+        create_email_domain_block_html: "%{name} blocked email domain %{target}"
         create_ip_block_html: "%{name} created rule for IP %{target}"
         create_unavailable_domain_html: "%{name} stopped delivery to domain %{target}"
         create_user_role_html: "%{name} created %{target} role"
         demote_user_html: "%{name} demoted user %{target}"
         destroy_announcement_html: "%{name} deleted announcement %{target}"
+        destroy_canonical_email_block_html: "%{name} unblocked email with the hash %{target}"
         destroy_custom_emoji_html: "%{name} deleted emoji %{target}"
         destroy_domain_allow_html: "%{name} disallowed federation with domain %{target}"
         destroy_domain_block_html: "%{name} unblocked domain %{target}"
+        destroy_email_domain_block_html: "%{name} unblocked email domain %{target}"
         destroy_instance_html: "%{name} purged domain %{target}"
         destroy_ip_block_html: "%{name} deleted rule for IP %{target}"
         destroy_status_html: "%{name} removed post by %{target}"
@@ -249,8 +260,10 @@ en-GB:
         destroy_user_role_html: "%{name} deleted %{target} role"
         disable_2fa_user_html: "%{name} disabled two factor requirement for user %{target}"
         disable_custom_emoji_html: "%{name} disabled emoji %{target}"
+        disable_sign_in_token_auth_user_html: "%{name} disabled email token authentication for %{target}"
         disable_user_html: "%{name} disabled login for user %{target}"
         enable_custom_emoji_html: "%{name} enabled emoji %{target}"
+        enable_sign_in_token_auth_user_html: "%{name} enabled email token authentication for %{target}"
         enable_user_html: "%{name} enabled login for user %{target}"
         memorialize_account_html: "%{name} turned %{target}'s account into a memoriam page"
         promote_user_html: "%{name} promoted user %{target}"
@@ -258,6 +271,7 @@ en-GB:
         reject_user_html: "%{name} rejected sign-up from %{target}"
         remove_avatar_user_html: "%{name} removed %{target}'s avatar"
         reopen_report_html: "%{name} reopened report %{target}"
+        resend_user_html: "%{name} resent confirmation email for %{target}"
         reset_password_user_html: "%{name} reset password of user %{target}"
         resolve_report_html: "%{name} resolved report %{target}"
         sensitive_account_html: "%{name} marked %{target}'s media as sensitive"
@@ -418,6 +432,7 @@ en-GB:
       attempts_over_week:
         one: "%{count} attempt over the last week"
         other: "%{count} sign-up attempts over the last week"
+      created_msg: Successfully blocked email domain
       delete: Delete
       dns:
         types:
@@ -426,8 +441,12 @@ en-GB:
       new:
         create: Add domain
         resolve: Resolve domain
+        title: Block new email domain
+      no_email_domain_block_selected: No email domain blocks were changed as none were selected
       not_permitted: Not permitted
+      resolved_dns_records_hint_html: The domain name resolves to the following MX domains, which are ultimately responsible for accepting email. Blocking an MX domain will block sign-ups from any email address which uses the same MX domain, even if the visible domain name is different. <strong>Be careful not to block major email providers.</strong>
       resolved_through_html: Resolved through %{domain}
+      title: Blocked email domains
     export_domain_allows:
       new:
         title: Import domain allows
@@ -581,6 +600,7 @@ en-GB:
         resolve_description_html: No action will be taken against the reported account, no strike recorded, and the report will be closed.
         silence_description_html: The account will be visible only to those who already follow it or manually look it up, severely limiting its reach. Can always be reverted. Closes all reports against this account.
         suspend_description_html: The account and all its contents will be inaccessible and eventually deleted, and interacting with it will be impossible. Reversible within 30 days. Closes all reports against this account.
+      actions_description_html: Decide which action to take to resolve this report. If you take a punitive action against the reported account, an email notification will be sent to them, except when the <strong>Spam</strong> category is selected.
       actions_description_remote_html: Decide which action to take to resolve this report. This will only affect how <strong>your</strong> server communicates with this remote account and handle its content.
       add_to_report: Add more to report
       already_suspended_badges:
@@ -645,6 +665,7 @@ en-GB:
         delete_data_html: Delete <strong>@%{acct}</strong>'s profile and contents 30 days from now unless they get unsuspended in the meantime
         preview_preamble_html: "<strong>@%{acct}</strong> will receive a warning with the following contents:"
         record_strike_html: Record a strike against <strong>@%{acct}</strong> to help you escalate on future violations from this account
+        send_email_html: Send <strong>@%{acct}</strong> a warning email
         warning_placeholder: Optional additional reasoning for the moderation action.
       target_origin: Origin of reported account
       title: Reports
@@ -684,6 +705,7 @@ en-GB:
         manage_appeals: Manage Appeals
         manage_appeals_description: Allows users to review appeals against moderation actions
         manage_blocks: Manage Blocks
+        manage_blocks_description: Allows users to block email providers and IP addresses
         manage_custom_emojis: Manage Custom Emojis
         manage_custom_emojis_description: Allows users to manage custom emojis on the server
         manage_federation: Manage Federation
diff --git a/config/locales/fr-CA.yml b/config/locales/fr-CA.yml
index c38435c7fb523b..45c6baece912ba 100644
--- a/config/locales/fr-CA.yml
+++ b/config/locales/fr-CA.yml
@@ -58,6 +58,7 @@ fr-CA:
       demote: Rétrograder
       destroyed_msg: Les données de %{username} sont maintenant en file d’attente pour être supprimées imminemment
       disable: Geler
+      disable_sign_in_token_auth: Désactiver le jeton d'authentification par e-mail
       disable_two_factor_authentication: Désactiver l’authentification à deux facteurs
       disabled: Gelé
       display_name: Nom affiché
@@ -66,6 +67,7 @@ fr-CA:
       email: Courriel
       email_status: État du courriel
       enable: Dégeler
+      enable_sign_in_token_auth: Activer le jeton d'authentification par e-mail
       enabled: Activé
       enabled_msg: Le compte de %{username} a été dégelé avec succès
       followers: Abonné·e·s
@@ -195,8 +197,10 @@ fr-CA:
         destroy_user_role: Détruire le rôle
         disable_2fa_user: Désactiver l’A2F
         disable_custom_emoji: Désactiver les émojis personnalisés
+        disable_sign_in_token_auth_user: Désactiver le jeton d'authentification par e-mail pour l'utilisateur
         disable_user: Désactiver le compte
         enable_custom_emoji: Activer les émojis personnalisées
+        enable_sign_in_token_auth_user: Activer le jeton d'authentification par e-mail pour l'utilisateur
         enable_user: Activer l’utilisateur
         memorialize_account: Ériger en mémorial
         promote_user: Promouvoir l’utilisateur
@@ -219,18 +223,22 @@ fr-CA:
         update_custom_emoji: Mettre à jour les émojis personnalisés
         update_domain_block: Mettre à jour le blocage de domaine
         update_ip_block: Mettre à jour la règle IP
+        update_report: Mettre à jour le rapport
         update_status: Mettre à jour le message
         update_user_role: Mettre à jour le rôle
       actions:
         approve_appeal_html: "%{name} a approuvé l'appel de la décision de modération émis par %{target}"
         approve_user_html: "%{name} a approuvé l’inscription de %{target}"
         assigned_to_self_report_html: "%{name} s’est assigné·e le signalement de %{target}"
+        change_email_user_html: "%{name} a changé l'adresse e-mail de l'utilisateur \n%{target}"
         change_role_user_html: "%{name} a changé le rôle de %{target}"
+        confirm_user_html: "%{name} a confirmé l'adresse e-mail de l'utilisateur %{target}"
         create_account_warning_html: "%{name} a envoyé un avertissement à %{target}"
         create_announcement_html: "%{name} a créé une nouvelle annonce %{target}"
         create_custom_emoji_html: "%{name} a téléversé un nouvel émoji %{target}"
         create_domain_allow_html: "%{name} a autorisé la fédération avec le domaine %{target}"
         create_domain_block_html: "%{name} a bloqué le domaine %{target}"
+        create_email_domain_block_html: "%{name} a bloqué le domaine d'e-mail %{target}"
         create_ip_block_html: "%{name} a créé une règle pour l'IP %{target}"
         create_unavailable_domain_html: "%{name} a arrêté la livraison vers le domaine %{target}"
         create_user_role_html: "%{name} a créé le rôle %{target}"
@@ -239,6 +247,7 @@ fr-CA:
         destroy_custom_emoji_html: "%{name} a supprimé l'émoji %{target}"
         destroy_domain_allow_html: "%{name} a rejeté la fédération avec le domaine %{target}"
         destroy_domain_block_html: "%{name} a débloqué le domaine %{target}"
+        destroy_email_domain_block_html: "%{name} a débloqué le domaine d'e-mail %{target}"
         destroy_instance_html: "%{name} a purgé le domaine %{target}"
         destroy_ip_block_html: "%{name} a supprimé la règle pour l'IP %{target}"
         destroy_status_html: "%{name} a supprimé le message de %{target}"
@@ -276,6 +285,7 @@ fr-CA:
       filter_by_action: Filtrer par action
       filter_by_user: Filtrer par utilisateur·ice
       title: Journal d’audit
+      unavailable_instance: "(nom de domaine indisponible)"
     announcements:
       destroyed_msg: Annonce supprimée avec succès !
       edit:
@@ -413,6 +423,7 @@ fr-CA:
       attempts_over_week:
         one: "%{count} tentative au cours de la dernière semaine"
         other: "%{count} tentatives au cours de la dernière semaine"
+      created_msg: Domaine d'e-mail bloqué avec succès
       delete: Supprimer
       dns:
         types:
@@ -914,6 +925,10 @@ fr-CA:
       statuses:
         allow: Autoriser le message
         allow_account: Autoriser l'auteur·rice
+        confirm_allow: Êtes-vous sûr de vouloir autoriser les statuts sélectionnés ?
+        confirm_allow_account: Êtes-vous sûr de vouloir autoriser les comptes sélectionnés ?
+        confirm_disallow: Êtes-vous sûr de vouloir rejeter les statuts sélectionnés ?
+        confirm_disallow_account: Êtes-vous sûr de vouloir rejeter les comptes sélectionnés ?
         description_html: Voici les messages dont votre serveur a connaissance qui sont beaucoup partagés et mis en favoris en ce moment. Cela peut aider vos utilisateur⋅rice⋅s, néophytes comme aguerri⋅e⋅s, à trouver plus de comptes à suivre. Aucun message n'est publiquement affiché tant que vous n'en avez pas approuvé l'auteur⋅rice, et seulement si icellui permet que son compte soit suggéré aux autres. Vous pouvez également autoriser ou rejeter les messages individuellement.
         disallow: Proscrire le message
         disallow_account: Proscrire l'auteur·rice
@@ -1896,6 +1911,7 @@ fr-CA:
     invalid_otp_token: Le code d’authentification à deux facteurs est invalide
     otp_lost_help_html: Si vous perdez accès aux deux, vous pouvez contacter %{email}
     rate_limited: Trop de tentatives d'authentification, réessayez plus tard.
+    seamless_external_login: Vous êtes connectés sur un service externe, de fait les paramètres de mot de passe et d'e-mail ne sont pas disponibles.
     signed_in_as: 'Connecté·e en tant que :'
   verification:
     extra_instructions_html: <strong>Astuce:</strong> Le lien sur votre site Web peut être invisible. La partie importante est <code>rel="me"</code> qui évite d’autres liens provenant de contenu générés par des utilisateurs tiers d'être pris en compte. Vous pouvez même utiliser une balise <code>link</code> dans l’en-tête de la page au lieu de <code>a</code>, mais le HTML doit être accessible sans avoir besoin d’exécuter du JavaScript.
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index c3fa237759f1a1..4434a165317f18 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -58,6 +58,7 @@ fr:
       demote: Rétrograder
       destroyed_msg: Les données de %{username} sont maintenant en file d’attente pour être supprimées imminemment
       disable: Geler
+      disable_sign_in_token_auth: Désactiver le jeton d'authentification par e-mail
       disable_two_factor_authentication: Désactiver l’authentification à deux facteurs
       disabled: Gelé
       display_name: Nom affiché
@@ -66,6 +67,7 @@ fr:
       email: Adresse de courriel
       email_status: État du courriel
       enable: Dégeler
+      enable_sign_in_token_auth: Activer le jeton d'authentification par e-mail
       enabled: Activé
       enabled_msg: Le compte de %{username} a été dégelé avec succès
       followers: Abonné·e·s
@@ -195,8 +197,10 @@ fr:
         destroy_user_role: Détruire le rôle
         disable_2fa_user: Désactiver l’A2F
         disable_custom_emoji: Désactiver les émojis personnalisés
+        disable_sign_in_token_auth_user: Désactiver le jeton d'authentification par e-mail pour l'utilisateur
         disable_user: Désactiver le compte
         enable_custom_emoji: Activer les émojis personnalisées
+        enable_sign_in_token_auth_user: Activer le jeton d'authentification par e-mail pour l'utilisateur
         enable_user: Activer le compte
         memorialize_account: Ériger en mémorial
         promote_user: Promouvoir le compte
@@ -219,18 +223,22 @@ fr:
         update_custom_emoji: Mettre à jour les émojis personnalisés
         update_domain_block: Mettre à jour le blocage de domaine
         update_ip_block: Mettre à jour la règle IP
+        update_report: Mettre à jour le rapport
         update_status: Mettre à jour le message
         update_user_role: Mettre à jour le rôle
       actions:
         approve_appeal_html: "%{name} a approuvé l'appel de la décision de modération émis par %{target}"
         approve_user_html: "%{name} a approuvé l’inscription de %{target}"
         assigned_to_self_report_html: "%{name} s’est assigné·e le signalement de %{target}"
+        change_email_user_html: "%{name} a changé l'adresse e-mail de l'utilisateur \n%{target}"
         change_role_user_html: "%{name} a changé le rôle de %{target}"
+        confirm_user_html: "%{name} a confirmé l'adresse e-mail de l'utilisateur %{target}"
         create_account_warning_html: "%{name} a envoyé un avertissement à %{target}"
         create_announcement_html: "%{name} a créé une nouvelle annonce %{target}"
         create_custom_emoji_html: "%{name} a téléversé un nouvel émoji %{target}"
         create_domain_allow_html: "%{name} a autorisé la fédération avec le domaine %{target}"
         create_domain_block_html: "%{name} a bloqué le domaine %{target}"
+        create_email_domain_block_html: "%{name} a bloqué le domaine d'e-mail %{target}"
         create_ip_block_html: "%{name} a créé une règle pour l'IP %{target}"
         create_unavailable_domain_html: "%{name} a arrêté la livraison vers le domaine %{target}"
         create_user_role_html: "%{name} a créé le rôle %{target}"
@@ -239,6 +247,7 @@ fr:
         destroy_custom_emoji_html: "%{name} a supprimé l'émoji %{target}"
         destroy_domain_allow_html: "%{name} a rejeté la fédération avec le domaine %{target}"
         destroy_domain_block_html: "%{name} a débloqué le domaine %{target}"
+        destroy_email_domain_block_html: "%{name} a débloqué le domaine d'e-mail %{target}"
         destroy_instance_html: "%{name} a purgé le domaine %{target}"
         destroy_ip_block_html: "%{name} a supprimé la règle pour l'IP %{target}"
         destroy_status_html: "%{name} a supprimé le message de %{target}"
@@ -276,6 +285,7 @@ fr:
       filter_by_action: Filtrer par action
       filter_by_user: Filtrer par utilisateur·ice
       title: Journal d’audit
+      unavailable_instance: "(nom de domaine indisponible)"
     announcements:
       destroyed_msg: Annonce supprimée avec succès !
       edit:
@@ -413,6 +423,7 @@ fr:
       attempts_over_week:
         one: "%{count} tentative au cours de la dernière semaine"
         other: "%{count} tentatives au cours de la dernière semaine"
+      created_msg: Domaine d'e-mail bloqué avec succès
       delete: Supprimer
       dns:
         types:
@@ -914,6 +925,10 @@ fr:
       statuses:
         allow: Autoriser le message
         allow_account: Autoriser l'auteur·rice
+        confirm_allow: Êtes-vous sûr de vouloir autoriser les statuts sélectionnés ?
+        confirm_allow_account: Êtes-vous sûr de vouloir autoriser les comptes sélectionnés ?
+        confirm_disallow: Êtes-vous sûr de vouloir rejeter les statuts sélectionnés ?
+        confirm_disallow_account: Êtes-vous sûr de vouloir rejeter les comptes sélectionnés ?
         description_html: Voici les messages dont votre serveur a connaissance qui sont beaucoup partagés et mis en favoris en ce moment. Cela peut aider vos utilisateur⋅rice⋅s, néophytes comme aguerri⋅e⋅s, à trouver plus de comptes à suivre. Aucun message n'est publiquement affiché tant que vous n'en avez pas approuvé l'auteur⋅rice, et seulement si icellui permet que son compte soit suggéré aux autres. Vous pouvez également autoriser ou rejeter les messages individuellement.
         disallow: Proscrire le message
         disallow_account: Proscrire l'auteur·rice
@@ -1896,6 +1911,7 @@ fr:
     invalid_otp_token: Le code d’authentification à deux facteurs est invalide
     otp_lost_help_html: Si vous perdez accès aux deux, vous pouvez contacter %{email}
     rate_limited: Trop de tentatives d'authentification, réessayez plus tard.
+    seamless_external_login: Vous êtes connectés sur un service externe, de fait les paramètres de mot de passe et d'e-mail ne sont pas disponibles.
     signed_in_as: 'Connecté·e en tant que :'
   verification:
     extra_instructions_html: <strong>Astuce :</strong> Le lien sur votre site Web peut être invisible. La partie importante est <code>rel="me"</code> qui évite que soient pris en compte d’autres liens provenant de contenu générés par des utilisateurs tiers. Vous pouvez même utiliser une balise <code>link</code> dans l’en-tête de la page au lieu de <code>a</code>, mais le HTML doit être accessible sans avoir besoin d’exécuter du JavaScript.
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 72b4156dbf0500..47ec5cafbe29dc 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -1506,6 +1506,7 @@ he:
   media_attachments:
     validations:
       images_and_video: לא ניתן להוסיף וידאו להודעה שכבר מכילה תמונות
+      not_found: קובץ %{ids} לא נמצא, או שהוצמד כבר להודעה אחרת
       not_ready: לא ניתן להצמיד קבצים שהעלאתם לא הסתיימה. נסה/י שוב בעוד רגע!
       too_many: לא ניתן להוסיף יותר מארבעה קבצים
   migrations:
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index cdddc79b0e9e5e..2bf138d9be10ad 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -1454,6 +1454,7 @@ hu:
   media_attachments:
     validations:
       images_and_video: Nem csatolhatsz videót olyan bejegyzéshez, amelyhez már csatoltál képet
+      not_found: A(z) %{ids} média nem található, vagy már egy másik bejegyzéshez lett csatolva
       not_ready: Nem lehet olyan fájlt csatolni, melynek még nem fejeződött be a feldolgozása. Próbáld kicsit később!
       too_many: Maximum négy fájlt csatolhatsz
   migrations:
diff --git a/config/locales/is.yml b/config/locales/is.yml
index 41347d44bbf97c..2c73dbae744520 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -1458,6 +1458,7 @@ is:
   media_attachments:
     validations:
       images_and_video: Ekki er hægt að hengja myndskeið við færslu sem þegar inniheldur myndir
+      not_found: Myndefnið %{ids} fannst ekki eða er þegar hengt við aðra færslu
       not_ready: Ekki er hægt að hengja við skrár sem ekki er búið að vinna til fulls. Prófaðu aftur eftir augnablik!
       too_many: Ekki er hægt að hengja við fleiri en 4 skrár
   migrations:
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 9632a3027bfbaa..ef3775d4df7197 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -830,7 +830,7 @@ ko:
         sensitive: "%{name} 님이 %{target}의 계정을 민감함으로 표시했습니다"
         silence: "%{name} 님이 %{target}의 계정을 제한시켰습니다"
         suspend: "%{name} 님이 %{target}의 계정을 정지시켰습니다"
-      appeal_approved: 이의제기됨
+      appeal_approved: 이의 받아들여짐
       appeal_pending: 이의제기 대기중
       appeal_rejected: 이의 제기 거절됨
     system_checks:
diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index 90b3d216c3bae6..f301b8ca98cc56 100644
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -1454,6 +1454,7 @@ nn:
   media_attachments:
     validations:
       images_and_video: Kan ikkje leggja ved video til status som allereie inneheld bilete
+      not_found: Media %{ids} vart ikkje funne eller er allereie kopla til eit anna innlegg
       not_ready: Kan ikke legge til filer som ikke er ferdigbehandlet. Prøv igjen om et øyeblikk!
       too_many: Kan ikkje leggja til meir enn 4 filer
   migrations:
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 418d3d059e0e44..579dbd967fbacd 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -4,7 +4,7 @@ pt-BR:
     about_mastodon_html: 'A rede social do futuro: Sem anúncios, sem vigilância corporativa, com design ético e muita descentralização! Possua seus próprios dados com o Mastodon!'
     contact_missing: Não definido
     contact_unavailable: Não disponível
-    hosted_on: Servidor Mastodon em %{domain}
+    hosted_on: Mastodon hospedado em %{domain}
     title: Sobre
   accounts:
     follow: Seguir
@@ -31,6 +31,7 @@ pt-BR:
       created_msg: Nota de moderação criada!
       destroyed_msg: Nota de moderação excluída!
     accounts:
+      add_email_domain_block: Bloquear domínio de email
       approve: Aprovar
       approved_msg: O registro de %{username} foi aprovado
       are_you_sure: Você tem certeza?
@@ -44,10 +45,10 @@ pt-BR:
         submit: Alterar e-mail
         title: Alterar e-mail para %{username}
       change_role:
-        changed_msg: Cargo alterado!
-        label: Alterar cargo
-        no_role: Sem cargo
-        title: Alterar cargo para %{username}
+        changed_msg: Função alterada com sucesso!
+        label: Alterar função
+        no_role: Nenhuma função
+        title: Alterar função para %{username}
       confirm: Confirmar
       confirmed: Confirmado
       confirming: Confirmando
@@ -57,6 +58,7 @@ pt-BR:
       demote: Rebaixar
       destroyed_msg: Os dados de %{username} estão na fila para serem excluídos em breve
       disable: Congelar
+      disable_sign_in_token_auth: Desativar autenticação via token por email
       disable_two_factor_authentication: Desativar autenticação de dois fatores
       disabled: Congelada
       display_name: Nome de exibição
@@ -65,6 +67,7 @@ pt-BR:
       email: E-mail
       email_status: Estado do e-mail
       enable: Descongelar
+      enable_sign_in_token_auth: Ativar autenticação via token por email
       enabled: Ativada
       enabled_msg: A conta de %{username} foi descongelada
       followers: Seguidores
@@ -129,6 +132,7 @@ pt-BR:
       resubscribe: Reinscrever-se
       role: Cargo
       search: Buscar
+      search_same_email_domain: Outros usuários com o mesmo domínio de e-mail
       search_same_ip: Outros usuários com o mesmo IP
       security: Segurança
       security_measures:
@@ -169,21 +173,26 @@ pt-BR:
         approve_appeal: Aprovar revisão
         approve_user: Aprovar usuário
         assigned_to_self_report: Atribuir denúncia
+        change_email_user: Alterar o Email para o usuário
         change_role_user: Alterar cargo do usuário
         confirm_user: Confirmar usuário
         create_account_warning: Criar aviso
         create_announcement: Criar anúncio
+        create_canonical_email_block: Criar bloqueio de Email
         create_custom_emoji: Criar emoji personalizado
         create_domain_allow: Permitir domínio
         create_domain_block: Bloquear domínio
+        create_email_domain_block: Criar Bloqueio de Domínio de Email
         create_ip_block: Criar regra de IP
         create_unavailable_domain: Criar domínio indisponível
         create_user_role: Criar cargo
         demote_user: Rebaixar usuário
         destroy_announcement: Excluir anúncio
+        destroy_canonical_email_block: Deletar bloqueio de Email
         destroy_custom_emoji: Excluir emoji personalizado
         destroy_domain_allow: Excluir domínio permitido
         destroy_domain_block: Desbloquear domínio
+        destroy_email_domain_block: Deletar bloqueio de domínio Email
         destroy_instance: Limpar domínio
         destroy_ip_block: Excluir regra de IP
         destroy_status: Excluir publicação
@@ -191,8 +200,10 @@ pt-BR:
         destroy_user_role: Destruir cargo
         disable_2fa_user: Desativar autenticação de dois fatores
         disable_custom_emoji: Desativar emoji personalizado
+        disable_sign_in_token_auth_user: Desativar autenticação via Token de Email para Usuário
         disable_user: Desativar usuário
         enable_custom_emoji: Ativar emoji personalizado
+        enable_sign_in_token_auth_user: Desativar autenticação via token por e-mail para o usuário
         enable_user: Ativar usuário
         memorialize_account: Converter conta em memorial
         promote_user: Promover usuário
@@ -215,6 +226,7 @@ pt-BR:
         update_custom_emoji: Editar Emoji Personalizado
         update_domain_block: Atualizar bloqueio de domínio
         update_ip_block: Atualizar regra de IP
+        update_report: Atualizar Relatório
         update_status: Editar Status
         update_user_role: Atualizar cargo
       actions:
@@ -223,19 +235,24 @@ pt-BR:
         assigned_to_self_report_html: "%{name} atribuiu a denúncia %{target} para si"
         change_email_user_html: "%{name} alterou o endereço de e-mail do usuário %{target}"
         change_role_user_html: "%{name} alterou o cargo de %{target}"
+        confirm_user_html: "%{name} confirmou o endereço de e-mail do usuário %{target}"
         create_account_warning_html: "%{name} enviou um aviso para %{target}"
         create_announcement_html: "%{name} criou o novo anúncio %{target}"
+        create_canonical_email_block_html: "%{name} bloqueou o endereço de e-mail com o hash %{target}"
         create_custom_emoji_html: "%{name} enviou o novo emoji %{target}"
         create_domain_allow_html: "%{name} permitiu federação com domínio %{target}"
         create_domain_block_html: "%{name} bloqueou o domínio %{target}"
+        create_email_domain_block_html: "%{name} bloqueou o domínio de e-mail %{target}"
         create_ip_block_html: "%{name} criou a regra para o IP %{target}"
         create_unavailable_domain_html: "%{name} parou a entrega ao domínio %{target}"
         create_user_role_html: "%{name} criou o cargo %{target}"
         demote_user_html: "%{name} rebaixou o usuário %{target}"
         destroy_announcement_html: "%{name} excluiu o anúncio %{target}"
+        destroy_canonical_email_block_html: "%{name} desbloqueou o endereço e-mail com o hash %{target}"
         destroy_custom_emoji_html: "%{name} apagou o emoji %{target}"
         destroy_domain_allow_html: "%{name} bloqueou federação com domínio %{target}"
         destroy_domain_block_html: "%{name} desbloqueou o domínio %{target}"
+        destroy_email_domain_block_html: "%{name} desbloqueou o domínio de e-mail %{target}"
         destroy_instance_html: "%{name} limpou o domínio %{target}"
         destroy_ip_block_html: "%{name} excluiu a regra para o IP %{target}"
         destroy_status_html: "%{name} removeu a publicação de %{target}"
@@ -243,8 +260,10 @@ pt-BR:
         destroy_user_role_html: "%{name} excluiu o cargo %{target}"
         disable_2fa_user_html: "%{name} desativou a exigência da autenticação de dois fatores para o usuário %{target}"
         disable_custom_emoji_html: "%{name} desativou o emoji %{target}"
+        disable_sign_in_token_auth_user_html: "%{name} desativou a autenticação via token por e-mail para %{target}"
         disable_user_html: "%{name} desativou o login para %{target}"
         enable_custom_emoji_html: "%{name} ativou o emoji %{target}"
+        enable_sign_in_token_auth_user_html: "%{name} ativou a autenticação via token por e-mail para %{target}"
         enable_user_html: "%{name} ativou o login para %{target}"
         memorialize_account_html: "%{name} transformou a conta de %{target} em um memorial"
         promote_user_html: "%{name} promoveu o usuário %{target}"
@@ -252,6 +271,7 @@ pt-BR:
         reject_user_html: "%{name} rejeitou a inscrição de %{target}"
         remove_avatar_user_html: "%{name} removeu a imagem de perfil de %{target}"
         reopen_report_html: "%{name} reabriu a denúncia %{target}"
+        resend_user_html: "%{name} reenviou um e-mail de confirmação para %{target}"
         reset_password_user_html: "%{name} redefiniu a senha de %{target}"
         resolve_report_html: "%{name} resolveu a denúncia %{target}"
         sensitive_account_html: "%{name} marcou a mídia de %{target} como sensível"
@@ -412,6 +432,7 @@ pt-BR:
       attempts_over_week:
         one: "%{count} tentativa na última semana"
         other: "%{count} tentativas de inscrição na última semana"
+      created_msg: Domínio de e-mail bloqueado com sucesso
       delete: Excluir
       dns:
         types:
@@ -420,8 +441,11 @@ pt-BR:
       new:
         create: Adicionar domínio
         resolve: Resolver domínio
+        title: Bloquear novo domínio de e-mail
       not_permitted: Não permitido
+      resolved_dns_records_hint_html: O nome de domínio é associado aos seguintes domínios MX, que são responsáveis por aceitar e-mails. Ao bloquear um domínio MX, você bloqueará as inscrições de qualquer endereço de e-mail que use o mesmo domínio MX, mesmo que o nome de domínio visível seja diferente. <strong>Tenha cuidado para não bloquear os principais provedores de e-mail.</strong>
       resolved_through_html: Resolvido através de %{domain}
+      title: Domínios de e-mail bloqueados
     export_domain_allows:
       new:
         title: Importar domínios permitidos
@@ -446,6 +470,9 @@ pt-BR:
       title: Recomendações de contas
       unsuppress: Restaurar recomendação de contas
     instances:
+      audit_log:
+        title: Logs de auditoria recentes
+        view_all: Ver todos os logs de auditoria
       availability:
         description_html:
           one: Se a entrega ao domínio falhar em <strong>%{count} dia</strong> sem sucesso, nenhuma tentativa de entrega será feita a menos que uma entrega <em>do</em> domínio seja recebida.
@@ -572,6 +599,7 @@ pt-BR:
         resolve_description_html: Nenhuma ação será tomada contra a conta denunciada, nenhuma violação será guardada e a denúncia será encerrada.
         silence_description_html: A conta ficará visível apenas para aqueles que já a seguem ou que a procuram manualmente, limitando severamente seu alcance. Pode ser revertido a qualquer momento. Fecha todas as denúncias desta conta.
         suspend_description_html: A conta e todo o seu conteúdo ficará inacessível e, eventualmente, excluído e interagir com ela será impossível. Reversível dentro de 30 dias. Encerra todas as denúncias contra esta conta.
+      actions_description_html: Decida qual ação tomar para responder a essa denúncia. Se você tomar uma ação punitiva contra a conta denunciada, uma notificação por e-mail será enviada ao usuário, exceto quando a categoria <strong>Spam</strong> for selecionada.
       actions_description_remote_html: Decida quais medidas tomará para resolver esta denúncia. Isso só afetará como <strong>seu servidor</strong> se comunica com esta conta remota e manipula seu conteúdo.
       add_to_report: Adicionar mais à denúncia
       already_suspended_badges:
@@ -613,6 +641,7 @@ pt-BR:
       report: 'Denúncia #%{id}'
       reported_account: Conta denunciada
       reported_by: Denunciada por
+      reported_with_application: Denunciado pelo aplicativo
       resolved: Resolvido
       resolved_msg: Denúncia resolvida!
       skip_to_actions: Pular para ações
@@ -635,6 +664,7 @@ pt-BR:
         delete_data_html: Exclua o perfil e o conteúdo de <strong>@%{acct}</strong> daqui a 30 dias, a menos que a suspensão seja desfeita nesse meio tempo
         preview_preamble_html: "<strong>@%{acct}</strong> receberá um aviso com o seguinte conteúdo:"
         record_strike_html: Registre uma ação contra <strong>@%{acct}</strong> para te ajudar em futuras violações desta conta
+        send_email_html: Enviar <strong>@%{acct}</strong> um e-mail de alerta
         warning_placeholder: Argumentos adicionais para a ação de moderação.
       target_origin: Origem da conta denunciada
       title: Denúncias
@@ -674,6 +704,7 @@ pt-BR:
         manage_appeals: Gerenciar revisões
         manage_appeals_description: Permite aos usuários visualizar as revisões das decisões da moderação
         manage_blocks: Gerenciar Bloqueios
+        manage_blocks_description: Permite aos usuários bloquear provedores de e-mail e endereços IP
         manage_custom_emojis: Gerenciar Emojis Personalizados
         manage_custom_emojis_description: Permite aos usuários gerenciar emojis personalizados no servidor
         manage_federation: Gerenciar Federação
@@ -691,6 +722,7 @@ pt-BR:
         manage_taxonomies: Gerenciar taxonomias
         manage_taxonomies_description: Permite aos usuários rever o conteúdo em alta e atualizar as configurações de hashtag
         manage_user_access: Gerenciar Acesso de Usuário
+        manage_user_access_description: Permite aos usuários desativar a autenticação de dois fatores de outros usuários, alterar seu endereço de e-mail e redefinir sua senha
         manage_users: Gerenciar usuários
         manage_users_description: Permite aos usuários ver os detalhes de outros usuários e executar ações de moderação contra eles
         manage_webhooks: Gerenciar Webhooks
@@ -765,6 +797,7 @@ pt-BR:
       destroyed_msg: Upload do site excluído com sucesso!
     software_updates:
       critical_update: Crítico — por favor, atualize rapidamente
+      description: É recomendável que você mantenha a instalação do Mastodon atualizada para se beneficiar das correções e das novas funcionalidades. Além disso, às vezes é imprescindível atualizar o Mastodon rapidamente para evitar problemas de segurança. Por esses motivos, o Mastodon verifica se há atualizações a cada 30 minutos e notificará você de acordo com as suas preferências de notificação por e-mail.
       documentation_link: Saiba mais
       release_notes: Notas de lançamento
       title: Atualizações disponíveis
@@ -851,16 +884,39 @@ pt-BR:
         action: Confira aqui para mais informações
         message_html: "<strong>Seu armazenamento de objetos está mal configurado. A privacidade de seus usuários está em risco.</strong>"
     tags:
+      moderation:
+        not_trendable: Fora de moda
+        not_usable: Não utilizável
+        pending_review: Revisão pendente
+        review_requested: Revisão solicitada
+        reviewed: Revisado
+        title: Status
+        trendable: Tendências
+        unreviewed: Não revisado
+        usable: Utilizável
+      name: Nome
+      newest: Mais recente
+      oldest: Mais antigos
+      open: Visualizar Publicamente
+      reset: Reinicializar
       review: Status da revisão
+      search: Buscar
+      title: Hashtags
       updated_msg: Configurações de hashtag atualizadas
     title: Administração
     trends:
       allow: Permitir
       approved: Aprovado
+      confirm_allow: Você tem certeza que deseja permitir as tags selecionadas?
+      confirm_disallow: Você tem certeza de que deseja vetar as tags selecionadas?
       disallow: Impedir
       links:
         allow: Permitir link
         allow_provider: Permitir editor
+        confirm_allow: Tem certeza que deseja permitir os links selecionados?
+        confirm_allow_provider: Tem certeza que deseja permitir os provedores selecionados?
+        confirm_disallow: Tem certeza que deseja vetar os links selecionados?
+        confirm_disallow_provider: Tem certeza que deseja vetar os provedores selecionados?
         description_html: Estes são links que estão sendo compartilhados por contas que seu servidor vê. Você pode ajudar seus usuários a descobrir o que está acontecendo no mundo. Nenhum link é exibido publicamente até que você aprove o editor. Você também pode permitir ou rejeitar links individuais.
         disallow: Proibir link
         disallow_provider: Proibir autor
@@ -884,6 +940,10 @@ pt-BR:
       statuses:
         allow: Permitir publicação
         allow_account: Permitir autor
+        confirm_allow: Tem certeza que deseja permitir os status selecionados?
+        confirm_allow_account: Tem certeza que deseja permitir as contas selecionadas?
+        confirm_disallow: Tem certeza que deseja vetar os status selecionados?
+        confirm_disallow_account: Tem certeza que deseja vetar as contas selecionadas?
         description_html: Estes são as publicações que seu servidor sabe que estão sendo muito compartilhadas e favorecidas no momento. Isso pode ajudar seus usuários, novos e atuais, a encontrar mais pessoas para seguir. Nenhuma publicação é exibida publicamente até que você aprove o autor e o autor permitir que sua conta seja sugerida a outros. Você também pode permitir ou rejeitar publicações individuais.
         disallow: Proibir publicação
         disallow_account: Proibir autor
@@ -916,6 +976,7 @@ pt-BR:
         used_by_over_week:
           one: Usado por uma pessoa na última semana
           other: Usado por %{count} pessoas na última semana
+      title: Recomendações e tendências
       trending: Em alta
     warning_presets:
       add_new: Adicionar novo
@@ -1000,7 +1061,9 @@ pt-BR:
       guide_link_text: Todos podem contribuir.
     sensitive_content: Conteúdo sensível
   application_mailer:
+    notification_preferences: Alterar preferências de e-mail
     salutation: "%{name},"
+    settings: 'Alterar preferências de e-mail: %{link}'
     unsubscribe: Desinscrever
     view: 'Ver:'
     view_profile: Ver perfil
@@ -1020,6 +1083,7 @@ pt-BR:
       hint_html: Só mais uma coisa! Precisamos confirmar que você é um humano (isso é para que possamos evitar o spam!). Resolva o CAPTCHA abaixo e clique em "Continuar".
       title: Verificação de segurança
     confirmations:
+      awaiting_review: Seu endereço de e-mail está confirmado! A equipe %{domain} está agora revisando a sua inscrição. Você receberá um e-mail se a sua conta for aprovada!
       awaiting_review_title: Seu cadastro está sendo analisado
       clicking_this_link: clicar este link
       login_link: entrar
@@ -1027,6 +1091,7 @@ pt-BR:
       redirect_to_app_html: Você deveria ter sido redirecionado para o aplicativo <strong>%{app_name}</strong>. Se isso não aconteceu, tente %{clicking_this_link} ou volte manualmente para o aplicativo.
       registration_complete: Seu cadastro no %{domain} foi concluído!
       welcome_title: Boas vindas, %{name}!
+      wrong_email_hint: Se esse endereço de e-mail não estiver correto, você pode alterá-lo nas configurações da conta.
     delete_account: Excluir conta
     delete_account_html: Se você deseja excluir sua conta, você pode <a href="%{path}">fazer isso aqui</a>. Uma confirmação será solicitada.
     description:
@@ -1047,6 +1112,7 @@ pt-BR:
     or_log_in_with: Ou entre com
     privacy_policy_agreement_html: Eu li e concordo com a <a href="%{privacy_policy_path}" target="_blank">política de privacidade</a>
     progress:
+      confirm: Confirmar e-mail
       details: Suas informações
       review: Nossa avaliação
       rules: Aceitar regras
@@ -1068,8 +1134,10 @@ pt-BR:
     security: Segurança
     set_new_password: Definir uma nova senha
     setup:
+      email_below_hint_html: Verifique a sua pasta de spam, ou solicite outra. Você pode corrigir o seu endereço de e-mail se estiver errado.
       email_settings_hint_html: Clique no link que te enviamos para verificar %{email}. Esperaremos aqui.
       link_not_received: Não recebeu um link?
+      new_confirmation_instructions_sent: Você receberá um novo e-mail com o link de confirmação em alguns minutos!
       title: Verifique sua caixa de entrada
     sign_in:
       preamble_html: Entre com suas credenciais de domínios ( <strong>%{domain}</strong> ) . Se sua conta estiver hospedada em um servidor diferente, você não deve conseguir acessar este conteúdo.
@@ -1080,7 +1148,9 @@ pt-BR:
       title: Então vamos lá criar uma conta em %{domain}.
     status:
       account_status: Status da conta
+      confirming: Confirmação por e-mail pendente.
       functional: Sua conta está totalmente operacional.
+      pending: Sua inscrição está aguardando revisão pela nossa equipe. Isto pode levar algum tempo. Você receberá um e-mail se sua inscrição for aprovada.
       redirecting_to: Sua conta está inativa porque atualmente está redirecionando para %{acct}.
       self_destruct: Como %{domain} está se encerrando, você só terá acesso limitado à sua conta.
       view_strikes: Veja os avisos anteriores em relação à sua conta
@@ -1123,6 +1193,9 @@ pt-BR:
       before: 'Antes de prosseguir, leia com cuidado:'
       caches: Conteúdo que foi armazenado em cache por outros servidores pode continuar a existir
       data_removal: Suas publicações e outros dados serão removidos permanentemente
+      email_change_html: Você pode <a href="%{path}">alterar seu endereço de e-mail</a> sem excluir sua conta
+      email_contact_html: Se ainda não chegar, você pode enviar um e-mail para <a href="mailto:%{email}">%{email}</a> para obter ajuda
+      email_reconfirmation_html: Se você não recebeu o e-mail de confirmação, você pode <a href="%{path}">solicitá-lo novamente</a>
       irreversible: Você não conseguirá restaurar ou reativar a sua conta
       more_details_html: Para mais detalhes, consulte a <a href="%{terms_path}">Política de Privacidade</a>.
       username_available: Seu nome de usuário ficará disponível novamente
@@ -1355,6 +1428,7 @@ pt-BR:
     authentication_methods:
       otp: autenticação de dois fatores
       password: senha
+      sign_in_token: código de segurança do e-mail
       webauthn: chaves de segurança
     description_html: Se você vir atividades suspeitas ou não reconhecidas, considere alterar sua senha e ativar a autenticação de dois fatores.
     empty: Sem histórico de autenticação disponível
@@ -1365,10 +1439,14 @@ pt-BR:
     unsubscribe:
       action: Sim, cancelar subscrição
       complete: Desinscrito
+      confirmation_html: Tem certeza que deseja cancelar a assinatura de %{type} para Mastodon no %{domain} para o seu endereço de e-mail %{email}? Você sempre pode se inscrever novamente nas <a href="%{settings_path}">configurações de notificação de email</a>.
+      resubscribe_html: Se você cancelou sua inscrição por engano, você pode se inscrever novamente em suas <a href="%{settings_path}"> configurações de notificações por e-mail</a>.
+      success_html: Você não mais receberá %{type} no Mastodon em %{domain} ao seu endereço de e-mail %{email}.
       title: Cancelar inscrição
   media_attachments:
     validations:
       images_and_video: Não foi possível anexar um vídeo a uma publicação que já contém imagens
+      not_found: Mídia %{ids} não encontrada ou já anexada a outra publicação
       not_ready: Não é possível anexar arquivos que não terminaram de ser processados. Tente novamente daqui a pouco!
       too_many: Não foi possível anexar mais de 4 imagens
   migrations:
@@ -1445,6 +1523,8 @@ pt-BR:
     update:
       subject: "%{name} editou uma publicação"
   notifications:
+    administration_emails: Notificações de e-mail do administrador
+    email_events: Eventos para notificações por e-mail
     email_events_hint: 'Selecione os eventos que deseja receber notificações:'
   number:
     human:
@@ -1603,6 +1683,7 @@ pt-BR:
     import: Importar
     import_and_export: Importar e exportar
     migrate: Migração de conta
+    notifications: Notificações por e-mail
     preferences: Preferências
     profile: Perfil
     relationships: Seguindo e seguidores
@@ -1849,6 +1930,7 @@ pt-BR:
     invalid_otp_token: Código de dois fatores inválido
     otp_lost_help_html: Se você perder o acesso à ambos, você pode entrar em contato com %{email}
     rate_limited: Muitas tentativas de autenticação; tente novamente mais tarde.
+    seamless_external_login: Você está logado através de um serviço externo, portanto as configurações de senha e e-mail não estão disponíveis.
     signed_in_as: 'Entrou como:'
   verification:
     extra_instructions_html: <strong>Dica:</strong> O link do seu site não precisa ser visível. O importante é a parte <code>rel="me"</code>, que impede a personificação em sites com conteúdo gerado pelo usuário. Você pode até usar uma tag <code>link</code> no cabeçalho da página ao invés de uma tag <code>a</code>, mas é importante que o HTML esteja acessível sem executar JavaScript.
diff --git a/config/locales/simple_form.pt-BR.yml b/config/locales/simple_form.pt-BR.yml
index fc3c09cf1d09d0..65d3883690112c 100644
--- a/config/locales/simple_form.pt-BR.yml
+++ b/config/locales/simple_form.pt-BR.yml
@@ -211,6 +211,7 @@ pt-BR:
         setting_default_privacy: Privacidade dos toots
         setting_default_sensitive: Sempre marcar mídia como sensível
         setting_delete_modal: Solicitar confirmação antes de excluir toot
+        setting_disable_hover_cards: Desativar visualização de perfil ao passar o mouse por cima
         setting_disable_swiping: Desabilitar movimentos deslizantes
         setting_display_media: Exibição das mídias
         setting_display_media_default: Padrão
@@ -242,11 +243,13 @@ pt-BR:
           warn: Ocultar com um aviso
       form_admin_settings:
         activity_api_enabled: Publicar estatísticas agregadas sobre atividade de usuários na API
+        app_icon: Ícone do aplicativo
         backups_retention_period: Período de retenção do arquivo de usuário
         bootstrap_timeline_accounts: Sempre recomendar essas contas para novos usuários
         closed_registrations_message: Mensagem personalizada quando inscrições não estão disponíveis
         content_cache_retention_period: Período de retenção de conteúdo remoto
         custom_css: CSS personalizável
+        favicon: Favicon
         mascot: Mascote personalizado (legado)
         media_cache_retention_period: Período de retenção do cachê de mídia
         peers_api_enabled: Publicar lista de instâncias de servidor descobertas na API
@@ -311,6 +314,7 @@ pt-BR:
         listable: Permitir que esta hashtag apareça em pesquisas e sugestões
         name: Hashtag
         trendable: Permitir que esta hashtag fique em alta
+        usable: Permitir que as publicações usem esta hashtag localmente
       user:
         role: Cargo
         time_zone: Fuso horário
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index fc9fde36154daa..4318f4eac48c18 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -1454,6 +1454,7 @@ tr:
   media_attachments:
     validations:
       images_and_video: Zaten resim içeren bir duruma video eklenemez
+      not_found: "%{ids} medya dosyaları bulunamadı veya başka bir gönderiye zaten eklenmiş"
       not_ready: İşlemi tamamlanmamış dosyalar eklenemez. Birazdan tekrar deneyin!
       too_many: 4'ten fazla dosya eklenemiyor
   migrations:

From 58df00f04d39cf25e7d4d4cbb111bc4cfe1875c4 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 4 Sep 2024 04:52:37 -0400
Subject: [PATCH 2082/2191] Extract method for self-referencing records in
 `AccountStatusCleanupPolicy` (#31244)

---
 app/models/account_statuses_cleanup_policy.rb | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/app/models/account_statuses_cleanup_policy.rb b/app/models/account_statuses_cleanup_policy.rb
index a102795446d465..e2c035284be24f 100644
--- a/app/models/account_statuses_cleanup_policy.rb
+++ b/app/models/account_statuses_cleanup_policy.rb
@@ -145,15 +145,15 @@ def old_enough_scope(max_id = nil)
   end
 
   def without_self_fav_scope
-    Status.where('NOT EXISTS (SELECT 1 FROM favourites fav WHERE fav.account_id = statuses.account_id AND fav.status_id = statuses.id)')
+    Status.where.not(self_status_reference_exists(Favourite))
   end
 
   def without_self_bookmark_scope
-    Status.where('NOT EXISTS (SELECT 1 FROM bookmarks bookmark WHERE bookmark.account_id = statuses.account_id AND bookmark.status_id = statuses.id)')
+    Status.where.not(self_status_reference_exists(Bookmark))
   end
 
   def without_pinned_scope
-    Status.where('NOT EXISTS (SELECT 1 FROM status_pins pin WHERE pin.account_id = statuses.account_id AND pin.status_id = statuses.id)')
+    Status.where.not(self_status_reference_exists(StatusPin))
   end
 
   def without_media_scope
@@ -174,4 +174,13 @@ def without_popular_scope
   def account_statuses
     Status.where(account_id: account_id)
   end
+
+  def self_status_reference_exists(model)
+    model
+      .where(model.arel_table[:account_id].eq Status.arel_table[:account_id])
+      .where(model.arel_table[:status_id].eq Status.arel_table[:id])
+      .select(1)
+      .arel
+      .exists
+  end
 end

From ffe29ce4174673cd4b19d0ef330c56e584f284e6 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 4 Sep 2024 08:58:28 +0000
Subject: [PATCH 2083/2191] Update dependency shoulda-matchers to v6.4.0
 (#31731)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 09be3e6921f23c..a533b662411414 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -790,7 +790,7 @@ GEM
       rubyzip (>= 1.2.2, < 3.0)
       websocket (~> 1.0)
     semantic_range (3.0.0)
-    shoulda-matchers (6.3.1)
+    shoulda-matchers (6.4.0)
       activesupport (>= 5.2.0)
     sidekiq (6.5.12)
       connection_pool (>= 2.2.5, < 3)

From d8bd9ef19082ab3bccd4a8d2b6727e56de25b335 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 4 Sep 2024 09:25:25 +0000
Subject: [PATCH 2084/2191] Update eslint (non-major) (#31684)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 package.json |   4 +-
 yarn.lock    | 193 +++++++++++++++++++++++++++++----------------------
 2 files changed, 113 insertions(+), 84 deletions(-)

diff --git a/package.json b/package.json
index a6f86dfd4c8b08..ddf7ee75a2343b 100644
--- a/package.json
+++ b/package.json
@@ -175,9 +175,9 @@
     "eslint-define-config": "^2.0.0",
     "eslint-import-resolver-typescript": "^3.5.5",
     "eslint-plugin-formatjs": "^4.10.1",
-    "eslint-plugin-import": "~2.29.0",
+    "eslint-plugin-import": "~2.30.0",
     "eslint-plugin-jsdoc": "^50.0.0",
-    "eslint-plugin-jsx-a11y": "~6.9.0",
+    "eslint-plugin-jsx-a11y": "~6.10.0",
     "eslint-plugin-promise": "~7.1.0",
     "eslint-plugin-react": "^7.33.2",
     "eslint-plugin-react-hooks": "^4.6.0",
diff --git a/yarn.lock b/yarn.lock
index 727dfacd92b2ab..e9ab694ffe0264 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2819,9 +2819,9 @@ __metadata:
     eslint-define-config: "npm:^2.0.0"
     eslint-import-resolver-typescript: "npm:^3.5.5"
     eslint-plugin-formatjs: "npm:^4.10.1"
-    eslint-plugin-import: "npm:~2.29.0"
+    eslint-plugin-import: "npm:~2.30.0"
     eslint-plugin-jsdoc: "npm:^50.0.0"
-    eslint-plugin-jsx-a11y: "npm:~6.9.0"
+    eslint-plugin-jsx-a11y: "npm:~6.10.0"
     eslint-plugin-promise: "npm:~7.1.0"
     eslint-plugin-react: "npm:^7.33.2"
     eslint-plugin-react-hooks: "npm:^4.6.0"
@@ -2972,6 +2972,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@nolyfill/is-core-module@npm:1.0.39":
+  version: 1.0.39
+  resolution: "@nolyfill/is-core-module@npm:1.0.39"
+  checksum: 10c0/34ab85fdc2e0250879518841f74a30c276bca4f6c3e13526d2d1fe515e1adf6d46c25fcd5989d22ea056d76f7c39210945180b4859fc83b050e2da411aa86289
+  languageName: node
+  linkType: hard
+
 "@npmcli/agent@npm:^2.0.0":
   version: 2.2.0
   resolution: "@npmcli/agent@npm:2.2.0"
@@ -3180,6 +3187,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@rtsao/scc@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "@rtsao/scc@npm:1.1.0"
+  checksum: 10c0/b5bcfb0d87f7d1c1c7c0f7693f53b07866ed9fec4c34a97a8c948fb9a7c0082e416ce4d3b60beb4f5e167cbe04cdeefbf6771320f3ede059b9ce91188c409a5b
+  languageName: node
+  linkType: hard
+
 "@sinclair/typebox@npm:^0.27.8":
   version: 0.27.8
   resolution: "@sinclair/typebox@npm:0.27.8"
@@ -4830,7 +4844,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"array-includes@npm:^3.1.6, array-includes@npm:^3.1.7, array-includes@npm:^3.1.8":
+"array-includes@npm:^3.1.6, array-includes@npm:^3.1.8":
   version: 3.1.8
   resolution: "array-includes@npm:3.1.8"
   dependencies:
@@ -4888,16 +4902,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"array.prototype.findlastindex@npm:^1.2.3":
-  version: 1.2.3
-  resolution: "array.prototype.findlastindex@npm:1.2.3"
+"array.prototype.findlastindex@npm:^1.2.5":
+  version: 1.2.5
+  resolution: "array.prototype.findlastindex@npm:1.2.5"
   dependencies:
-    call-bind: "npm:^1.0.2"
-    define-properties: "npm:^1.2.0"
-    es-abstract: "npm:^1.22.1"
-    es-shim-unscopables: "npm:^1.0.0"
-    get-intrinsic: "npm:^1.2.1"
-  checksum: 10c0/2c5c4d3f07512d6729f728f6260a314c00f2eb0a243123092661fa1bc65dce90234c3b483b5f978396eccef6f69c50f0bea248448aaf9cdfcd1cedad6217acbb
+    call-bind: "npm:^1.0.7"
+    define-properties: "npm:^1.2.1"
+    es-abstract: "npm:^1.23.2"
+    es-errors: "npm:^1.3.0"
+    es-object-atoms: "npm:^1.0.0"
+    es-shim-unscopables: "npm:^1.0.2"
+  checksum: 10c0/962189487728b034f3134802b421b5f39e42ee2356d13b42d2ddb0e52057ffdcc170b9524867f4f0611a6f638f4c19b31e14606e8bcbda67799e26685b195aa3
   languageName: node
   linkType: hard
 
@@ -5113,10 +5128,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"axe-core@npm:^4.9.1":
-  version: 4.9.1
-  resolution: "axe-core@npm:4.9.1"
-  checksum: 10c0/ac9e5a0c6fa115a43ebffc32a1d2189e1ca6431b5a78e88cdcf94a72a25c5964185682edd94fe6bdb1cb4266c0d06301b022866e0e50dcdf6e3cefe556470110
+"axe-core@npm:^4.10.0":
+  version: 4.10.0
+  resolution: "axe-core@npm:4.10.0"
+  checksum: 10c0/732c171d48caaace5e784895c4dacb8ca6155e9d98045138ebe3952f78457dd05b92c57d05b41ce2a570aff87dbd0471e8398d2c0f6ebe79617b746c8f658998
   languageName: node
   linkType: hard
 
@@ -5131,12 +5146,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"axobject-query@npm:~3.1.1":
-  version: 3.1.1
-  resolution: "axobject-query@npm:3.1.1"
-  dependencies:
-    deep-equal: "npm:^2.0.5"
-  checksum: 10c0/fff3175a22fd1f41fceb7ae0cd25f6594a0d7fba28c2335dd904538b80eb4e1040432564a3c643025cd2bb748f68d35aaabffb780b794da97ecfc748810b25ad
+"axobject-query@npm:^4.1.0":
+  version: 4.1.0
+  resolution: "axobject-query@npm:4.1.0"
+  checksum: 10c0/c470e4f95008f232eadd755b018cb55f16c03ccf39c027b941cd8820ac6b68707ce5d7368a46756db4256fbc91bb4ead368f84f7fb034b2b7932f082f6dc0775
   languageName: node
   linkType: hard
 
@@ -6906,7 +6919,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"debug@npm:4, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.4, debug@npm:^4.3.6, debug@npm:~4.3.6":
+"debug@npm:4, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.4, debug@npm:^4.3.5, debug@npm:^4.3.6, debug@npm:~4.3.6":
   version: 4.3.6
   resolution: "debug@npm:4.3.6"
   dependencies:
@@ -7515,13 +7528,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"enhanced-resolve@npm:^5.12.0":
-  version: 5.15.0
-  resolution: "enhanced-resolve@npm:5.15.0"
+"enhanced-resolve@npm:^5.15.0":
+  version: 5.17.1
+  resolution: "enhanced-resolve@npm:5.17.1"
   dependencies:
     graceful-fs: "npm:^4.2.4"
     tapable: "npm:^2.2.0"
-  checksum: 10c0/69984a7990913948b4150855aed26a84afb4cb1c5a94fb8e3a65bd00729a73fc2eaff6871fb8e345377f294831afe349615c93560f2f54d61b43cdfdf668f19a
+  checksum: 10c0/81a0515675eca17efdba2cf5bad87abc91a528fc1191aad50e275e74f045b41506167d420099022da7181c8d787170ea41e4a11a0b10b7a16f6237daecb15370
   languageName: node
   linkType: hard
 
@@ -7824,32 +7837,39 @@ __metadata:
   linkType: hard
 
 "eslint-import-resolver-typescript@npm:^3.5.5":
-  version: 3.6.1
-  resolution: "eslint-import-resolver-typescript@npm:3.6.1"
+  version: 3.6.3
+  resolution: "eslint-import-resolver-typescript@npm:3.6.3"
   dependencies:
-    debug: "npm:^4.3.4"
-    enhanced-resolve: "npm:^5.12.0"
-    eslint-module-utils: "npm:^2.7.4"
-    fast-glob: "npm:^3.3.1"
-    get-tsconfig: "npm:^4.5.0"
-    is-core-module: "npm:^2.11.0"
+    "@nolyfill/is-core-module": "npm:1.0.39"
+    debug: "npm:^4.3.5"
+    enhanced-resolve: "npm:^5.15.0"
+    eslint-module-utils: "npm:^2.8.1"
+    fast-glob: "npm:^3.3.2"
+    get-tsconfig: "npm:^4.7.5"
+    is-bun-module: "npm:^1.0.2"
     is-glob: "npm:^4.0.3"
   peerDependencies:
     eslint: "*"
     eslint-plugin-import: "*"
-  checksum: 10c0/cb1cb4389916fe78bf8c8567aae2f69243dbfe624bfe21078c56ad46fa1ebf0634fa7239dd3b2055ab5c27359e4b4c28b69b11fcb3a5df8a9e6f7add8e034d86
+    eslint-plugin-import-x: "*"
+  peerDependenciesMeta:
+    eslint-plugin-import:
+      optional: true
+    eslint-plugin-import-x:
+      optional: true
+  checksum: 10c0/5933b00791b7b077725b9ba9a85327d2e2dc7c8944c18a868feb317a0bf0e1e77aed2254c9c5e24dcc49360d119331d2c15281837f4269592965ace380a75111
   languageName: node
   linkType: hard
 
-"eslint-module-utils@npm:^2.7.4, eslint-module-utils@npm:^2.8.0":
-  version: 2.8.0
-  resolution: "eslint-module-utils@npm:2.8.0"
+"eslint-module-utils@npm:^2.8.1, eslint-module-utils@npm:^2.9.0":
+  version: 2.9.0
+  resolution: "eslint-module-utils@npm:2.9.0"
   dependencies:
     debug: "npm:^3.2.7"
   peerDependenciesMeta:
     eslint:
       optional: true
-  checksum: 10c0/c7a8d1a58d76ec8217a8fea49271ec8132d1b9390965a75f6a4ecbc9e5983d742195b46d2e4378231d2186801439fe1aa5700714b0bfd4eb17aac6e1b65309df
+  checksum: 10c0/7c45c5b54402a969e99315890c10e9bf8c8bee16c7890573343af05dfa04566d61546585678c413e5228af0550e39461be47e35a8ff0d1863e113bdbb28d1d29
   languageName: node
   linkType: hard
 
@@ -7874,30 +7894,31 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint-plugin-import@npm:~2.29.0":
-  version: 2.29.1
-  resolution: "eslint-plugin-import@npm:2.29.1"
+"eslint-plugin-import@npm:~2.30.0":
+  version: 2.30.0
+  resolution: "eslint-plugin-import@npm:2.30.0"
   dependencies:
-    array-includes: "npm:^3.1.7"
-    array.prototype.findlastindex: "npm:^1.2.3"
+    "@rtsao/scc": "npm:^1.1.0"
+    array-includes: "npm:^3.1.8"
+    array.prototype.findlastindex: "npm:^1.2.5"
     array.prototype.flat: "npm:^1.3.2"
     array.prototype.flatmap: "npm:^1.3.2"
     debug: "npm:^3.2.7"
     doctrine: "npm:^2.1.0"
     eslint-import-resolver-node: "npm:^0.3.9"
-    eslint-module-utils: "npm:^2.8.0"
-    hasown: "npm:^2.0.0"
-    is-core-module: "npm:^2.13.1"
+    eslint-module-utils: "npm:^2.9.0"
+    hasown: "npm:^2.0.2"
+    is-core-module: "npm:^2.15.1"
     is-glob: "npm:^4.0.3"
     minimatch: "npm:^3.1.2"
-    object.fromentries: "npm:^2.0.7"
-    object.groupby: "npm:^1.0.1"
-    object.values: "npm:^1.1.7"
+    object.fromentries: "npm:^2.0.8"
+    object.groupby: "npm:^1.0.3"
+    object.values: "npm:^1.2.0"
     semver: "npm:^6.3.1"
     tsconfig-paths: "npm:^3.15.0"
   peerDependencies:
     eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8
-  checksum: 10c0/5f35dfbf4e8e67f741f396987de9504ad125c49f4144508a93282b4ea0127e052bde65ab6def1f31b6ace6d5d430be698333f75bdd7dca3bc14226c92a083196
+  checksum: 10c0/4c9dcb1f27505c4d5dd891d2b551f56c70786d136aa3992a77e785bdc67c9f60200a2c7fb0ce55b7647fe550b12bc433d5dfa59e2c00ab44227791c5ab86badf
   languageName: node
   linkType: hard
 
@@ -7922,16 +7943,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint-plugin-jsx-a11y@npm:~6.9.0":
-  version: 6.9.0
-  resolution: "eslint-plugin-jsx-a11y@npm:6.9.0"
+"eslint-plugin-jsx-a11y@npm:~6.10.0":
+  version: 6.10.0
+  resolution: "eslint-plugin-jsx-a11y@npm:6.10.0"
   dependencies:
     aria-query: "npm:~5.1.3"
     array-includes: "npm:^3.1.8"
     array.prototype.flatmap: "npm:^1.3.2"
     ast-types-flow: "npm:^0.0.8"
-    axe-core: "npm:^4.9.1"
-    axobject-query: "npm:~3.1.1"
+    axe-core: "npm:^4.10.0"
+    axobject-query: "npm:^4.1.0"
     damerau-levenshtein: "npm:^1.0.8"
     emoji-regex: "npm:^9.2.2"
     es-iterator-helpers: "npm:^1.0.19"
@@ -7943,8 +7964,8 @@ __metadata:
     safe-regex-test: "npm:^1.0.3"
     string.prototype.includes: "npm:^2.0.0"
   peerDependencies:
-    eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8
-  checksum: 10c0/72ac719ca90b6149c8f3c708ac5b1177f6757668b6e174d72a78512d4ac10329331b9c666c21e9561237a96a45d7f147f6a5d270dadbb99eb4ee093f127792c3
+    eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8 || ^9
+  checksum: 10c0/9f8e29a3317fb6a82e2ecd333fe0fab3a69fff786d087eb65dc723d6e954473ab681d14a252d7cb2971f5e7f68816cb6f7731766558e1833a77bd73af1b5ab34
   languageName: node
   linkType: hard
 
@@ -7967,8 +7988,8 @@ __metadata:
   linkType: hard
 
 "eslint-plugin-react@npm:^7.33.2":
-  version: 7.35.0
-  resolution: "eslint-plugin-react@npm:7.35.0"
+  version: 7.35.2
+  resolution: "eslint-plugin-react@npm:7.35.2"
   dependencies:
     array-includes: "npm:^3.1.8"
     array.prototype.findlast: "npm:^1.2.5"
@@ -7990,7 +8011,7 @@ __metadata:
     string.prototype.repeat: "npm:^1.0.0"
   peerDependencies:
     eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8 || ^9.7
-  checksum: 10c0/eedcc33de4b2cda91d56ae517a4f771a0c76da9c1e26c95543969012871381e11d4d6cffdf6fa8423036585c289eb3500f3f93fb1d314fb2624e0aa1e463305e
+  checksum: 10c0/5f891f5a77e902a0ca8d10b23d0b800e90a09400187febe5986c5078d6277baa4b974d6acdbba25baae065dbcf12eb9241b5f5782527d0780314c2ee5006a8af
   languageName: node
   linkType: hard
 
@@ -8402,7 +8423,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fast-glob@npm:^3.2.9, fast-glob@npm:^3.3.1, fast-glob@npm:^3.3.2":
+"fast-glob@npm:^3.2.9, fast-glob@npm:^3.3.2":
   version: 3.3.2
   resolution: "fast-glob@npm:3.3.2"
   dependencies:
@@ -8931,12 +8952,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"get-tsconfig@npm:^4.5.0":
-  version: 4.7.2
-  resolution: "get-tsconfig@npm:4.7.2"
+"get-tsconfig@npm:^4.7.5":
+  version: 4.8.0
+  resolution: "get-tsconfig@npm:4.8.0"
   dependencies:
     resolve-pkg-maps: "npm:^1.0.0"
-  checksum: 10c0/169b2beababfbb16e8a0ae813ee59d3e14d4960231c816615161ab5be68ec07a394dce59695742ac84295e2efab8d9e89bcf3abaf5e253dfbec3496e01bb9a65
+  checksum: 10c0/943721c996d9a77351aa7c07956de77baece97f997bd30f3247f46907e4b743f7b9da02c7b3692a36f0884d3724271faeb88ed1c3aca3aba2afe3f27d6c4aeb3
   languageName: node
   linkType: hard
 
@@ -9908,6 +9929,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-bun-module@npm:^1.0.2":
+  version: 1.1.0
+  resolution: "is-bun-module@npm:1.1.0"
+  dependencies:
+    semver: "npm:^7.6.3"
+  checksum: 10c0/17cae968c3fe08e2bd66f8477e4d5a166d6299b5e7ce5c7558355551c50267f77dd386297fada6b68e4a32f01ce8920b0423e4d258242ea463b45901ec474beb
+  languageName: node
+  linkType: hard
+
 "is-callable@npm:^1.1.3, is-callable@npm:^1.1.4, is-callable@npm:^1.2.7":
   version: 1.2.7
   resolution: "is-callable@npm:1.2.7"
@@ -9915,12 +9945,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-core-module@npm:^2.11.0, is-core-module@npm:^2.13.0, is-core-module@npm:^2.13.1":
-  version: 2.13.1
-  resolution: "is-core-module@npm:2.13.1"
+"is-core-module@npm:^2.13.0, is-core-module@npm:^2.15.1":
+  version: 2.15.1
+  resolution: "is-core-module@npm:2.15.1"
   dependencies:
-    hasown: "npm:^2.0.0"
-  checksum: 10c0/2cba9903aaa52718f11c4896dabc189bab980870aae86a62dc0d5cedb546896770ee946fb14c84b7adf0735f5eaea4277243f1b95f5cefa90054f92fbcac2518
+    hasown: "npm:^2.0.2"
+  checksum: 10c0/53432f10c69c40bfd2fa8914133a68709ff9498c86c3bf5fca3cdf3145a56fd2168cbf4a43b29843a6202a120a5f9c5ffba0a4322e1e3441739bc0b641682612
   languageName: node
   linkType: hard
 
@@ -12471,7 +12501,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"object.fromentries@npm:^2.0.7, object.fromentries@npm:^2.0.8":
+"object.fromentries@npm:^2.0.8":
   version: 2.0.8
   resolution: "object.fromentries@npm:2.0.8"
   dependencies:
@@ -12496,15 +12526,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"object.groupby@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "object.groupby@npm:1.0.1"
+"object.groupby@npm:^1.0.3":
+  version: 1.0.3
+  resolution: "object.groupby@npm:1.0.3"
   dependencies:
-    call-bind: "npm:^1.0.2"
-    define-properties: "npm:^1.2.0"
-    es-abstract: "npm:^1.22.1"
-    get-intrinsic: "npm:^1.2.1"
-  checksum: 10c0/61e41fbf08cc04ed860363db9629eedeaa590fce243c0960e948fd7b11f78a9d4350065c339936d118a2dd8775d7259e26207340cc8ce688bec66cb615fec6fe
+    call-bind: "npm:^1.0.7"
+    define-properties: "npm:^1.2.1"
+    es-abstract: "npm:^1.23.2"
+  checksum: 10c0/60d0455c85c736fbfeda0217d1a77525956f76f7b2495edeca9e9bbf8168a45783199e77b894d30638837c654d0cc410e0e02cbfcf445bc8de71c3da1ede6a9c
   languageName: node
   linkType: hard
 
@@ -12517,7 +12546,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"object.values@npm:^1.1.0, object.values@npm:^1.1.6, object.values@npm:^1.1.7, object.values@npm:^1.2.0":
+"object.values@npm:^1.1.0, object.values@npm:^1.1.6, object.values@npm:^1.2.0":
   version: 1.2.0
   resolution: "object.values@npm:1.2.0"
   dependencies:

From 44fd0803cea855ef28fc3fe709b3febd9caa8eed Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 4 Sep 2024 09:27:12 +0000
Subject: [PATCH 2085/2191] Update dependency pino to v9.4.0 (#31720)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index e9ab694ffe0264..74d545d587e632 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -13197,8 +13197,8 @@ __metadata:
   linkType: hard
 
 "pino@npm:^9.0.0":
-  version: 9.3.2
-  resolution: "pino@npm:9.3.2"
+  version: 9.4.0
+  resolution: "pino@npm:9.4.0"
   dependencies:
     atomic-sleep: "npm:^1.0.0"
     fast-redact: "npm:^3.1.1"
@@ -13213,7 +13213,7 @@ __metadata:
     thread-stream: "npm:^3.0.0"
   bin:
     pino: bin.js
-  checksum: 10c0/698eb2ebfcc4252da9d035fcf9c999bf27615b66ebc47f9b3d7e942750e50ebe38429e6457abcf8014d70125964ddf114e696cb8225b480d9930271708e3fb52
+  checksum: 10c0/12a3d74968964d92b18ca7d6095a3c5b86478dc22264a37486d64e102085ed08820fcbe75e640acc3542fdf2937a34e5050b624f98e6ac62dd10f5e1328058a2
   languageName: node
   linkType: hard
 

From 7fb8834dd79b93f164369d252d505ad983be027b Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 4 Sep 2024 09:29:14 +0000
Subject: [PATCH 2086/2191] Update dependency pino-http to v10.3.0 (#31721)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 74d545d587e632..9825260d6bf451 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -13154,14 +13154,14 @@ __metadata:
   linkType: hard
 
 "pino-http@npm:^10.0.0":
-  version: 10.2.0
-  resolution: "pino-http@npm:10.2.0"
+  version: 10.3.0
+  resolution: "pino-http@npm:10.3.0"
   dependencies:
     get-caller-file: "npm:^2.0.5"
     pino: "npm:^9.0.0"
     pino-std-serializers: "npm:^7.0.0"
-    process-warning: "npm:^3.0.0"
-  checksum: 10c0/0b79cd3602531ee5043693e2a3ccf9d955bd93759e80c0b3a458b95b241f36ca8ebc72c8050b395e9d8fcb9581ebc18ecd6b7dc136526bebe924bc5c5079374d
+    process-warning: "npm:^4.0.0"
+  checksum: 10c0/da95d93e1176c02201f9b9bb0af53ad737105c5772acbb077dcad0f52ebce2438e0e9fc8216cd96396d1305d0ecf1f1d23142c7a50110a701ea093b2ee999ea7
   languageName: node
   linkType: hard
 
@@ -14181,13 +14181,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"process-warning@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "process-warning@npm:3.0.0"
-  checksum: 10c0/60f3c8ddee586f0706c1e6cb5aa9c86df05774b9330d792d7c8851cf0031afd759d665404d07037e0b4901b55c44a423f07bdc465c63de07d8d23196bb403622
-  languageName: node
-  linkType: hard
-
 "process-warning@npm:^4.0.0":
   version: 4.0.0
   resolution: "process-warning@npm:4.0.0"

From 36710aec8b2cc622034828f0fe7f6c9a649bc0ce Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 4 Sep 2024 09:57:28 +0000
Subject: [PATCH 2087/2191] Update dependency postcss to v8.4.45 (#31742)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 9825260d6bf451..c77ebfa4444f19 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -14045,13 +14045,13 @@ __metadata:
   linkType: hard
 
 "postcss@npm:^8.2.15, postcss@npm:^8.4.24, postcss@npm:^8.4.41":
-  version: 8.4.44
-  resolution: "postcss@npm:8.4.44"
+  version: 8.4.45
+  resolution: "postcss@npm:8.4.45"
   dependencies:
     nanoid: "npm:^3.3.7"
     picocolors: "npm:^1.0.1"
     source-map-js: "npm:^1.2.0"
-  checksum: 10c0/53c33338261a3d4f4198f8893e9dfe8b828d8d9186142ee85f02d228f04245c5bbe31239411a357a556ad20ed96f28db24d0921d63edc428fdc9133289371a1d
+  checksum: 10c0/ad6f8b9b1157d678560373696109745ab97a947d449f8a997acac41c7f1e4c0f3ca4b092d6df1387f430f2c9a319987b1780dbdc27e35800a88cde9b606c1e8f
   languageName: node
   linkType: hard
 

From ee55d20fd57fefc3bd865fb0a172bd64e908af3b Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 4 Sep 2024 12:46:28 +0200
Subject: [PATCH 2088/2191] Allow `POST /oauth/revoke` through CORS (#31743)

---
 config/initializers/cors.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/initializers/cors.rb b/config/initializers/cors.rb
index 37a818bf467bf9..c530693a3f3a41 100644
--- a/config/initializers/cors.rb
+++ b/config/initializers/cors.rb
@@ -22,6 +22,7 @@
                expose: %w(Link X-RateLimit-Reset X-RateLimit-Limit X-RateLimit-Remaining X-Request-Id),
                methods: %i(post put delete get patch options)
       resource '/oauth/token', methods: [:post]
+      resource '/oauth/revoke', methods: [:post]
     end
   end
 end

From 1fcffa573cf1ca9373ac1b65b2f7e805cc691927 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 4 Sep 2024 14:54:15 +0200
Subject: [PATCH 2089/2191] Fix 500 error in `GET /api/v2_alpha/notifications`
 when there are no notifications to return (#31746)

---
 .../api/v2_alpha/notifications_controller.rb        |  2 ++
 spec/requests/api/v2_alpha/notifications_spec.rb    | 13 +++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/app/controllers/api/v2_alpha/notifications_controller.rb b/app/controllers/api/v2_alpha/notifications_controller.rb
index bd6979955aa38c..e8aa0b9e498777 100644
--- a/app/controllers/api/v2_alpha/notifications_controller.rb
+++ b/app/controllers/api/v2_alpha/notifications_controller.rb
@@ -77,6 +77,8 @@ def load_notifications
   end
 
   def load_grouped_notifications
+    return [] if @notifications.empty?
+
     MastodonOTELTracer.in_span('Api::V2Alpha::NotificationsController#load_grouped_notifications') do
       NotificationGroup.from_notifications(@notifications, pagination_range: (@notifications.last.id)..(@notifications.first.id), grouped_types: params[:grouped_types])
     end
diff --git a/spec/requests/api/v2_alpha/notifications_spec.rb b/spec/requests/api/v2_alpha/notifications_spec.rb
index 7663d215ebf96f..8009e7edce798a 100644
--- a/spec/requests/api/v2_alpha/notifications_spec.rb
+++ b/spec/requests/api/v2_alpha/notifications_spec.rb
@@ -116,6 +116,19 @@
 
     it_behaves_like 'forbidden for wrong scope', 'write write:notifications'
 
+    context 'when there are no notifications' do
+      before do
+        user.account.notifications.destroy_all
+      end
+
+      it 'returns 0 notifications' do
+        subject
+
+        expect(response).to have_http_status(200)
+        expect(body_as_json[:notification_groups]).to eq []
+      end
+    end
+
     context 'with no options' do
       it 'returns expected notification types', :aggregate_failures do
         subject

From fab29ebbe864f0aec84857fc3d87f0d56f4f6b9b Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 4 Sep 2024 15:28:16 +0200
Subject: [PATCH 2090/2191] Fix all notification types being stored without
 filtering when polling (#31745)

---
 .../mastodon/actions/notification_groups.ts   | 33 ++++++++++---------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/app/javascript/mastodon/actions/notification_groups.ts b/app/javascript/mastodon/actions/notification_groups.ts
index 51f83f1d241a4a..2ee46500ab8035 100644
--- a/app/javascript/mastodon/actions/notification_groups.ts
+++ b/app/javascript/mastodon/actions/notification_groups.ts
@@ -18,7 +18,7 @@ import {
   selectSettingsNotificationsQuickFilterActive,
   selectSettingsNotificationsShows,
 } from 'mastodon/selectors/settings';
-import type { AppDispatch } from 'mastodon/store';
+import type { AppDispatch, RootState } from 'mastodon/store';
 import {
   createAppAsyncThunk,
   createDataLoadingThunk,
@@ -32,6 +32,14 @@ function excludeAllTypesExcept(filter: string) {
   return allNotificationTypes.filter((item) => item !== filter);
 }
 
+function getExcludedTypes(state: RootState) {
+  const activeFilter = selectSettingsNotificationsQuickFilterActive(state);
+
+  return activeFilter === 'all'
+    ? selectSettingsNotificationsExcludedTypes(state)
+    : excludeAllTypesExcept(activeFilter);
+}
+
 function dispatchAssociatedRecords(
   dispatch: AppDispatch,
   notifications: ApiNotificationGroupJSON[] | ApiNotificationJSON[],
@@ -62,17 +70,8 @@ function dispatchAssociatedRecords(
 
 export const fetchNotifications = createDataLoadingThunk(
   'notificationGroups/fetch',
-  async (_params, { getState }) => {
-    const activeFilter =
-      selectSettingsNotificationsQuickFilterActive(getState());
-
-    return apiFetchNotifications({
-      exclude_types:
-        activeFilter === 'all'
-          ? selectSettingsNotificationsExcludedTypes(getState())
-          : excludeAllTypesExcept(activeFilter),
-    });
-  },
+  async (_params, { getState }) =>
+    apiFetchNotifications({ exclude_types: getExcludedTypes(getState()) }),
   ({ notifications, accounts, statuses }, { dispatch }) => {
     dispatch(importFetchedAccounts(accounts));
     dispatch(importFetchedStatuses(statuses));
@@ -92,9 +91,11 @@ export const fetchNotifications = createDataLoadingThunk(
 
 export const fetchNotificationsGap = createDataLoadingThunk(
   'notificationGroups/fetchGap',
-  async (params: { gap: NotificationGap }) =>
-    apiFetchNotifications({ max_id: params.gap.maxId }),
-
+  async (params: { gap: NotificationGap }, { getState }) =>
+    apiFetchNotifications({
+      max_id: params.gap.maxId,
+      exclude_types: getExcludedTypes(getState()),
+    }),
   ({ notifications, accounts, statuses }, { dispatch }) => {
     dispatch(importFetchedAccounts(accounts));
     dispatch(importFetchedStatuses(statuses));
@@ -109,6 +110,7 @@ export const pollRecentNotifications = createDataLoadingThunk(
   async (_params, { getState }) => {
     return apiFetchNotifications({
       max_id: undefined,
+      exclude_types: getExcludedTypes(getState()),
       // In slow mode, we don't want to include notifications that duplicate the already-displayed ones
       since_id: usePendingItems
         ? getState().notificationGroups.groups.find(
@@ -183,7 +185,6 @@ export const setNotificationsFilter = createAppAsyncThunk(
       path: ['notifications', 'quickFilter', 'active'],
       value: filterType,
     });
-    // dispatch(expandNotifications({ forceLoad: true }));
     void dispatch(fetchNotifications());
     dispatch(saveSettings());
   },

From 585e369e0bb0e17ff5e025385dfefde1e9e81fa3 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 4 Sep 2024 15:43:08 +0200
Subject: [PATCH 2091/2191] Fix display name being displayed instead of domain
 in remote reports (#31613)

---
 .../components/notification_admin_report.tsx     | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/app/javascript/mastodon/features/notifications_v2/components/notification_admin_report.tsx b/app/javascript/mastodon/features/notifications_v2/components/notification_admin_report.tsx
index fda5798ae98b49..e41a6b2736c3c4 100644
--- a/app/javascript/mastodon/features/notifications_v2/components/notification_admin_report.tsx
+++ b/app/javascript/mastodon/features/notifications_v2/components/notification_admin_report.tsx
@@ -42,19 +42,11 @@ export const NotificationAdminReport: React.FC<{
 
   if (!account || !targetAccount) return null;
 
+  const domain = account.acct.split('@')[1];
+
   const values = {
-    name: (
-      <bdi
-        dangerouslySetInnerHTML={{ __html: account.get('display_name_html') }}
-      />
-    ),
-    target: (
-      <bdi
-        dangerouslySetInnerHTML={{
-          __html: targetAccount.get('display_name_html'),
-        }}
-      />
-    ),
+    name: <bdi>{domain ?? `@${account.acct}`}</bdi>,
+    target: <bdi>@{targetAccount.acct}</bdi>,
     category: intl.formatMessage(messages[report.category]),
     count: report.status_ids.length,
   };

From 9ba81eae3e526724dda1c693117aae5c0c235fe9 Mon Sep 17 00:00:00 2001
From: Emelia Smith <ThisIsMissEm@users.noreply.github.com>
Date: Wed, 4 Sep 2024 16:10:26 +0200
Subject: [PATCH 2092/2191] Streaming: Improve Redis connection options
 handling (#31623)

---
 streaming/index.js |  64 +++++++++++++++++-------
 streaming/redis.js | 120 +++++++++++++++++++++++++++++++++++----------
 2 files changed, 142 insertions(+), 42 deletions(-)

diff --git a/streaming/index.js b/streaming/index.js
index 5ef1f6f319f3e6..b302565a4e0521 100644
--- a/streaming/index.js
+++ b/streaming/index.js
@@ -111,6 +111,35 @@ const startServer = async () => {
   const server = http.createServer();
   const wss = new WebSocketServer({ noServer: true });
 
+  /**
+   * Adds a namespace to Redis keys or channel names
+   * Fixes: https://github.com/redis/ioredis/issues/1910
+   * @param {string} keyOrChannel
+   * @returns {string}
+   */
+  function redisNamespaced(keyOrChannel) {
+    if (redisConfig.namespace) {
+      return `${redisConfig.namespace}:${keyOrChannel}`;
+    } else {
+      return keyOrChannel;
+    }
+  }
+
+  /**
+   * Removes the redis namespace from a channel name
+   * @param {string} channel
+   * @returns {string}
+   */
+  function redisUnnamespaced(channel) {
+    if (typeof redisConfig.namespace === "string") {
+      // Note: this removes the configured namespace and the colon that is used
+      // to separate it:
+      return channel.slice(redisConfig.namespace.length + 1);
+    } else {
+      return channel;
+    }
+  }
+
   // Set the X-Request-Id header on WebSockets:
   wss.on("headers", function onHeaders(headers, req) {
     headers.push(`X-Request-Id: ${req.id}`);
@@ -200,7 +229,6 @@ const startServer = async () => {
   const subs = {};
 
   const redisSubscribeClient = Redis.createClient(redisConfig, logger);
-  const { redisPrefix } = redisConfig;
 
   // When checking metrics in the browser, the favicon is requested this
   // prevents the request from falling through to the API Router, which would
@@ -222,7 +250,7 @@ const startServer = async () => {
     const interval = 6 * 60;
 
     const tellSubscribed = () => {
-      channels.forEach(channel => redisClient.set(`${redisPrefix}subscribed:${channel}`, '1', 'EX', interval * 3));
+      channels.forEach(channel => redisClient.set(redisNamespaced(`subscribed:${channel}`), '1', 'EX', interval * 3));
     };
 
     tellSubscribed();
@@ -240,11 +268,10 @@ const startServer = async () => {
    */
   const onRedisMessage = (channel, message) => {
     metrics.redisMessagesReceived.inc();
+    logger.debug(`New message on channel ${channel}`);
 
-    const callbacks = subs[channel];
-
-    logger.debug(`New message on channel ${redisPrefix}${channel}`);
-
+    const key = redisUnnamespaced(channel);
+    const callbacks = subs[key];
     if (!callbacks) {
       return;
     }
@@ -273,7 +300,8 @@ const startServer = async () => {
 
     if (subs[channel].length === 0) {
       logger.debug(`Subscribe ${channel}`);
-      redisSubscribeClient.subscribe(channel, (err, count) => {
+
+      redisSubscribeClient.subscribe(redisNamespaced(channel), (err, count) => {
         if (err) {
           logger.error(`Error subscribing to ${channel}`);
         } else if (typeof count === 'number') {
@@ -300,7 +328,9 @@ const startServer = async () => {
 
     if (subs[channel].length === 0) {
       logger.debug(`Unsubscribe ${channel}`);
-      redisSubscribeClient.unsubscribe(channel, (err, count) => {
+
+      // FIXME: https://github.com/redis/ioredis/issues/1910
+      redisSubscribeClient.unsubscribe(redisNamespaced(channel), (err, count) => {
         if (err) {
           logger.error(`Error unsubscribing to ${channel}`);
         } else if (typeof count === 'number') {
@@ -481,14 +511,14 @@ const startServer = async () => {
     });
 
     res.on('close', () => {
-      unsubscribe(`${redisPrefix}${accessTokenChannelId}`, listener);
-      unsubscribe(`${redisPrefix}${systemChannelId}`, listener);
+      unsubscribe(accessTokenChannelId, listener);
+      unsubscribe(systemChannelId, listener);
 
       metrics.connectedChannels.labels({ type: 'eventsource', channel: 'system' }).dec(2);
     });
 
-    subscribe(`${redisPrefix}${accessTokenChannelId}`, listener);
-    subscribe(`${redisPrefix}${systemChannelId}`, listener);
+    subscribe(accessTokenChannelId, listener);
+    subscribe(systemChannelId, listener);
 
     metrics.connectedChannels.labels({ type: 'eventsource', channel: 'system' }).inc(2);
   };
@@ -805,11 +835,11 @@ const startServer = async () => {
     };
 
     channelIds.forEach(id => {
-      subscribe(`${redisPrefix}${id}`, listener);
+      subscribe(id, listener);
     });
 
     if (typeof attachCloseHandler === 'function') {
-      attachCloseHandler(channelIds.map(id => `${redisPrefix}${id}`), listener);
+      attachCloseHandler(channelIds, listener);
     }
 
     return listener;
@@ -1156,7 +1186,7 @@ const startServer = async () => {
     }
 
     channelIds.forEach(channelId => {
-      unsubscribe(`${redisPrefix}${channelId}`, subscription.listener);
+      unsubscribe(channelId, subscription.listener);
     });
 
     metrics.connectedChannels.labels({ type: 'websocket', channel: subscription.channelName }).dec();
@@ -1200,8 +1230,8 @@ const startServer = async () => {
       },
     });
 
-    subscribe(`${redisPrefix}${accessTokenChannelId}`, listener);
-    subscribe(`${redisPrefix}${systemChannelId}`, listener);
+    subscribe(accessTokenChannelId, listener);
+    subscribe(systemChannelId, listener);
 
     subscriptions[accessTokenChannelId] = {
       channelName: 'system',
diff --git a/streaming/redis.js b/streaming/redis.js
index 208d6ae0784b76..2a36b89dc553a3 100644
--- a/streaming/redis.js
+++ b/streaming/redis.js
@@ -4,44 +4,114 @@ import { parseIntFromEnvValue } from './utils.js';
 
 /**
  * @typedef RedisConfiguration
- * @property {import('ioredis').RedisOptions} redisParams
- * @property {string} redisPrefix
- * @property {string|undefined} redisUrl
+ * @property {string|undefined} namespace
+ * @property {string|undefined} url
+ * @property {import('ioredis').RedisOptions} options
  */
 
+/**
+ *
+ * @param {NodeJS.ProcessEnv} env
+ * @returns {boolean}
+ */
+function hasSentinelConfiguration(env) {
+  return (
+    typeof env.REDIS_SENTINELS === 'string' &&
+    env.REDIS_SENTINELS.length > 0 &&
+    typeof env.REDIS_SENTINEL_MASTER === 'string' &&
+    env.REDIS_SENTINEL_MASTER.length > 0
+  );
+}
+
+/**
+ *
+ * @param {NodeJS.ProcessEnv} env
+ * @param {import('ioredis').SentinelConnectionOptions} commonOptions
+ * @returns {import('ioredis').SentinelConnectionOptions}
+ */
+function getSentinelConfiguration(env, commonOptions) {
+  const redisDatabase = parseIntFromEnvValue(env.REDIS_DB, 0, 'REDIS_DB');
+  const sentinelPort = parseIntFromEnvValue(env.REDIS_SENTINEL_PORT, 26379, 'REDIS_SENTINEL_PORT');
+
+  const sentinels = env.REDIS_SENTINELS.split(',').map((sentinel) => {
+    const [host, port] = sentinel.split(':', 2);
+
+    /** @type {import('ioredis').SentinelAddress} */
+    return {
+      host: host,
+      port: port ?? sentinelPort,
+      // Force support for both IPv6 and IPv4, by default ioredis sets this to 4,
+      // only allowing IPv4 connections:
+      // https://github.com/redis/ioredis/issues/1576
+      family: 0
+    };
+  });
+
+  return {
+    db: redisDatabase,
+    name: env.REDIS_SENTINEL_MASTER,
+    username: env.REDIS_USERNAME,
+    password: env.REDIS_PASSWORD,
+    sentinelUsername: env.REDIS_SENTINEL_USERNAME ?? env.REDIS_USERNAME,
+    sentinelPassword: env.REDIS_SENTINEL_PASSWORD ?? env.REDIS_PASSWORD,
+    sentinels,
+    ...commonOptions,
+  };
+}
+
 /**
  * @param {NodeJS.ProcessEnv} env the `process.env` value to read configuration from
  * @returns {RedisConfiguration} configuration for the Redis connection
  */
 export function configFromEnv(env) {
-  // ioredis *can* transparently add prefixes for us, but it doesn't *in some cases*,
-  // which means we can't use it. But this is something that should be looked into.
-  const redisPrefix = env.REDIS_NAMESPACE ? `${env.REDIS_NAMESPACE}:` : '';
+  const redisNamespace = env.REDIS_NAMESPACE;
 
+  // These options apply for both REDIS_URL based connections and connections
+  // using the other REDIS_* environment variables:
+  const commonOptions = {
+    // Force support for both IPv6 and IPv4, by default ioredis sets this to 4,
+    // only allowing IPv4 connections:
+    // https://github.com/redis/ioredis/issues/1576
+    family: 0
+    // Note: we don't use auto-prefixing of keys since this doesn't apply to
+    // subscribe/unsubscribe which have "channel" instead of "key" arguments
+  };
+
+  // If we receive REDIS_URL, don't continue parsing any other REDIS_*
+  // environment variables:
+  if (typeof env.REDIS_URL === 'string' && env.REDIS_URL.length > 0) {
+    return {
+      url: env.REDIS_URL,
+      options: commonOptions,
+      namespace: redisNamespace
+    };
+  }
+
+  // If we have configuration for Redis Sentinel mode, prefer that:
+  if (hasSentinelConfiguration(env)) {
+    return {
+      options: getSentinelConfiguration(env, commonOptions),
+      namespace: redisNamespace
+    };
+  }
+
+  // Finally, handle all the other REDIS_* environment variables:
   let redisPort = parseIntFromEnvValue(env.REDIS_PORT, 6379, 'REDIS_PORT');
   let redisDatabase = parseIntFromEnvValue(env.REDIS_DB, 0, 'REDIS_DB');
 
   /** @type {import('ioredis').RedisOptions} */
-  const redisParams = {
-    host: env.REDIS_HOST || '127.0.0.1',
+  const options = {
+    host: env.REDIS_HOST ?? '127.0.0.1',
     port: redisPort,
-    // Force support for both IPv6 and IPv4, by default ioredis sets this to 4,
-    // only allowing IPv4 connections:
-    // https://github.com/redis/ioredis/issues/1576
-    family: 0,
     db: redisDatabase,
-    password: env.REDIS_PASSWORD || undefined,
+    username: env.REDIS_USERNAME,
+    password: env.REDIS_PASSWORD,
+    ...commonOptions,
   };
 
-  // redisParams.path takes precedence over host and port.
-  if (env.REDIS_URL && env.REDIS_URL.startsWith('unix://')) {
-    redisParams.path = env.REDIS_URL.slice(7);
-  }
-
   return {
-    redisParams,
-    redisPrefix,
-    redisUrl: typeof env.REDIS_URL === 'string' ? env.REDIS_URL : undefined,
+    options,
+    namespace: redisNamespace
   };
 }
 
@@ -50,13 +120,13 @@ export function configFromEnv(env) {
  * @param {import('pino').Logger} logger
  * @returns {Redis}
  */
-export function createClient({ redisParams, redisUrl }, logger) {
+export function createClient({ url, options }, logger) {
   let client;
 
-  if (typeof redisUrl === 'string') {
-    client = new Redis(redisUrl, redisParams);
+  if (typeof url === 'string') {
+    client = new Redis(url, options);
   } else {
-    client = new Redis(redisParams);
+    client = new Redis(options);
   }
 
   client.on('error', (err) => logger.error({ err }, 'Redis Client Error!'));

From ef2bc8ea261838cf31fe4fe11b2954a19c864295 Mon Sep 17 00:00:00 2001
From: David Roetzel <david@roetzel.de>
Date: Wed, 4 Sep 2024 16:10:45 +0200
Subject: [PATCH 2093/2191] Add redis sentinel support to ruby part of code
 (#31744)

---
 lib/mastodon/redis_configuration.rb           | 98 ++++++++++---------
 spec/lib/mastodon/redis_configuration_spec.rb | 56 +++++++++++
 2 files changed, 110 insertions(+), 44 deletions(-)

diff --git a/lib/mastodon/redis_configuration.rb b/lib/mastodon/redis_configuration.rb
index 3cd121e4ac2762..9139d87583e33f 100644
--- a/lib/mastodon/redis_configuration.rb
+++ b/lib/mastodon/redis_configuration.rb
@@ -1,34 +1,33 @@
 # frozen_string_literal: true
 
 class Mastodon::RedisConfiguration
+  DEFAULTS = {
+    host: 'localhost',
+    port: 6379,
+    db: 0,
+  }.freeze
+
   def base
-    @base ||= {
-      url: setup_base_redis_url,
-      driver: driver,
-      namespace: base_namespace,
-    }
+    @base ||= setup_config(prefix: nil, defaults: DEFAULTS)
+              .merge(namespace: base_namespace)
   end
 
   def sidekiq
-    @sidekiq ||= {
-      url: setup_prefixed_redis_url(:sidekiq),
-      driver: driver,
-      namespace: sidekiq_namespace,
-    }
+    @sidekiq ||= setup_config(prefix: 'SIDEKIQ_')
+                 .merge(namespace: sidekiq_namespace)
   end
 
   def cache
-    @cache ||= {
-      url: setup_prefixed_redis_url(:cache),
-      driver: driver,
-      namespace: cache_namespace,
-      expires_in: 10.minutes,
-      connect_timeout: 5,
-      pool: {
-        size: Sidekiq.server? ? Sidekiq[:concurrency] : Integer(ENV['MAX_THREADS'] || 5),
-        timeout: 5,
-      },
-    }
+    @cache ||= setup_config(prefix: 'CACHE_')
+               .merge({
+                 namespace: cache_namespace,
+                 expires_in: 10.minutes,
+                 connect_timeout: 5,
+                 pool: {
+                   size: Sidekiq.server? ? Sidekiq[:concurrency] : Integer(ENV['MAX_THREADS'] || 5),
+                   timeout: 5,
+                 },
+               })
   end
 
   private
@@ -55,42 +54,53 @@ def cache_namespace
     namespace ? "#{namespace}_cache" : 'cache'
   end
 
-  def setup_base_redis_url
-    url = ENV.fetch('REDIS_URL', nil)
-    return url if url.present?
-
-    user     = ENV.fetch('REDIS_USER', '')
-    password = ENV.fetch('REDIS_PASSWORD', '')
-    host     = ENV.fetch('REDIS_HOST', 'localhost')
-    port     = ENV.fetch('REDIS_PORT', 6379)
-    db       = ENV.fetch('REDIS_DB', 0)
+  def setup_config(prefix: nil, defaults: {})
+    prefix = "#{prefix}REDIS_"
 
-    construct_uri(host, port, db, user, password)
-  end
+    url       = ENV.fetch("#{prefix}URL", nil)
+    user      = ENV.fetch("#{prefix}USER", nil)
+    password  = ENV.fetch("#{prefix}PASSWORD", nil)
+    host      = ENV.fetch("#{prefix}HOST", defaults[:host])
+    port      = ENV.fetch("#{prefix}PORT", defaults[:port])
+    db        = ENV.fetch("#{prefix}DB", defaults[:db])
+    name      = ENV.fetch("#{prefix}SENTINEL_MASTER", nil)
+    sentinels = parse_sentinels(ENV.fetch("#{prefix}SENTINELS", nil))
 
-  def setup_prefixed_redis_url(prefix)
-    prefix = "#{prefix.to_s.upcase}_"
-    url = ENV.fetch("#{prefix}REDIS_URL", nil)
+    return { url:, driver: } if url
 
-    return url if url.present?
+    if name.present? && sentinels.present?
+      host = name
+      port = nil
+      db ||= 0
+    else
+      sentinels = nil
+    end
 
-    user     = ENV.fetch("#{prefix}REDIS_USER", nil)
-    password = ENV.fetch("#{prefix}REDIS_PASSWORD", nil)
-    host     = ENV.fetch("#{prefix}REDIS_HOST", nil)
-    port     = ENV.fetch("#{prefix}REDIS_PORT", nil)
-    db       = ENV.fetch("#{prefix}REDIS_DB", nil)
+    url = construct_uri(host, port, db, user, password)
 
-    if host.nil?
-      base[:url]
+    if url.present?
+      { url:, driver:, name:, sentinels: }
     else
-      construct_uri(host, port, db, user, password)
+      # Fall back to base config. This has defaults for the URL
+      # so this cannot lead to an endless loop.
+      base
     end
   end
 
   def construct_uri(host, port, db, user, password)
+    return nil if host.blank?
+
     Addressable::URI.parse("redis://#{host}:#{port}/#{db}").tap do |uri|
       uri.user = user if user.present?
       uri.password = password if password.present?
     end.normalize.to_str
   end
+
+  def parse_sentinels(sentinels_string)
+    (sentinels_string || '').split(',').map do |sentinel|
+      host, port = sentinel.split(':')
+      port = port.present? ? port.to_i : 26_379
+      { host: host, port: port }
+    end.presence
+  end
 end
diff --git a/spec/lib/mastodon/redis_configuration_spec.rb b/spec/lib/mastodon/redis_configuration_spec.rb
index c7326fd41175a4..a48ffc80e6c743 100644
--- a/spec/lib/mastodon/redis_configuration_spec.rb
+++ b/spec/lib/mastodon/redis_configuration_spec.rb
@@ -45,6 +45,20 @@
       it 'uses the url from the base config' do
         expect(subject[:url]).to eq 'redis://localhost:6379/0'
       end
+
+      context 'when the base config uses sentinel' do
+        around do |example|
+          ClimateControl.modify REDIS_SENTINELS: '192.168.0.1:3000,192.168.0.2:4000', REDIS_SENTINEL_MASTER: 'mainsentinel' do
+            example.run
+          end
+        end
+
+        it 'uses the sentinel configuration from base config' do
+          expect(subject[:url]).to eq 'redis://mainsentinel/0'
+          expect(subject[:name]).to eq 'mainsentinel'
+          expect(subject[:sentinels]).to contain_exactly({ host: '192.168.0.1', port: 3000 }, { host: '192.168.0.2', port: 4000 })
+        end
+      end
     end
 
     context "when the `#{prefix}_REDIS_URL` environment variable is present" do
@@ -72,6 +86,39 @@
     end
   end
 
+  shared_examples 'sentinel support' do |prefix = nil|
+    prefix = prefix ? "#{prefix}_" : ''
+
+    context 'when configuring sentinel support' do
+      around do |example|
+        ClimateControl.modify "#{prefix}REDIS_PASSWORD": 'testpass1', "#{prefix}REDIS_HOST": 'redis2.example.com', "#{prefix}REDIS_SENTINELS": '192.168.0.1:3000,192.168.0.2:4000', "#{prefix}REDIS_SENTINEL_MASTER": 'mainsentinel' do
+          example.run
+        end
+      end
+
+      it 'constructs the url using the sentinel master name' do
+        expect(subject[:url]).to eq 'redis://:testpass1@mainsentinel/0'
+      end
+
+      it 'includes the sentinel master name and list of sentinels' do
+        expect(subject[:name]).to eq 'mainsentinel'
+        expect(subject[:sentinels]).to contain_exactly({ host: '192.168.0.1', port: 3000 }, { host: '192.168.0.2', port: 4000 })
+      end
+    end
+
+    context 'when giving sentinels without port numbers' do
+      around do |example|
+        ClimateControl.modify "#{prefix}REDIS_SENTINELS": '192.168.0.1,192.168.0.2', "#{prefix}REDIS_SENTINEL_MASTER": 'mainsentinel' do
+          example.run
+        end
+      end
+
+      it 'uses the default sentinel port' do
+        expect(subject[:sentinels]).to contain_exactly({ host: '192.168.0.1', port: 26_379 }, { host: '192.168.0.2', port: 26_379 })
+      end
+    end
+  end
+
   describe '#base' do
     subject { redis_environment.base }
 
@@ -81,6 +128,8 @@
           url: 'redis://localhost:6379/0',
           driver: :hiredis,
           namespace: nil,
+          name: nil,
+          sentinels: nil,
         })
       end
     end
@@ -113,12 +162,15 @@
           url: 'redis://:testpass@redis.example.com:3333/3',
           driver: :hiredis,
           namespace: nil,
+          name: nil,
+          sentinels: nil,
         })
       end
     end
 
     include_examples 'setting a different driver'
     include_examples 'setting a namespace'
+    include_examples 'sentinel support'
   end
 
   describe '#sidekiq' do
@@ -127,6 +179,7 @@
     include_examples 'secondary configuration', 'SIDEKIQ'
     include_examples 'setting a different driver'
     include_examples 'setting a namespace'
+    include_examples 'sentinel support', 'SIDEKIQ'
   end
 
   describe '#cache' do
@@ -139,6 +192,8 @@
         namespace: 'cache',
         expires_in: 10.minutes,
         connect_timeout: 5,
+        name: nil,
+        sentinels: nil,
         pool: {
           size: 5,
           timeout: 5,
@@ -166,5 +221,6 @@
 
     include_examples 'secondary configuration', 'CACHE'
     include_examples 'setting a different driver'
+    include_examples 'sentinel support', 'CACHE'
   end
 end

From fe04291af46d7cb9d3439fa73739b2ffb2b53d72 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 4 Sep 2024 13:19:53 -0400
Subject: [PATCH 2094/2191] Use more accurate beginning/ending times in annual
 report source (#31751)

---
 app/lib/annual_report/source.rb | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/lib/annual_report/source.rb b/app/lib/annual_report/source.rb
index 1ccb622676faf4..d56a1fcccf697f 100644
--- a/app/lib/annual_report/source.rb
+++ b/app/lib/annual_report/source.rb
@@ -11,6 +11,16 @@ def initialize(account, year)
   protected
 
   def year_as_snowflake_range
-    (Mastodon::Snowflake.id_at(DateTime.new(year, 1, 1))..Mastodon::Snowflake.id_at(DateTime.new(year, 12, 31)))
+    (beginning_snowflake_id..ending_snowflake_id)
+  end
+
+  private
+
+  def beginning_snowflake_id
+    Mastodon::Snowflake.id_at DateTime.new(year).beginning_of_year
+  end
+
+  def ending_snowflake_id
+    Mastodon::Snowflake.id_at DateTime.new(year).end_of_year
   end
 end

From e1b5f3fc6f1bb6e77a7cad725a963d008c7ce983 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 4 Sep 2024 13:29:05 -0400
Subject: [PATCH 2095/2191] Use `response.parsed_body` for html response checks
 (#31750)

---
 spec/controllers/admin/accounts_controller_spec.rb |  2 +-
 .../admin/export_domain_blocks_controller_spec.rb  |  2 +-
 .../controllers/admin/instances_controller_spec.rb |  2 +-
 .../auth/registrations_controller_spec.rb          |  2 +-
 spec/requests/account_show_page_spec.rb            | 14 ++++++++------
 5 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/spec/controllers/admin/accounts_controller_spec.rb b/spec/controllers/admin/accounts_controller_spec.rb
index 89a7239f53f45d..ca399fbd9bba03 100644
--- a/spec/controllers/admin/accounts_controller_spec.rb
+++ b/spec/controllers/admin/accounts_controller_spec.rb
@@ -48,7 +48,7 @@
     end
 
     def accounts_table_rows
-      Nokogiri::Slop(response.body).css('table.accounts-table tr')
+      response.parsed_body.css('table.accounts-table tr')
     end
   end
 
diff --git a/spec/controllers/admin/export_domain_blocks_controller_spec.rb b/spec/controllers/admin/export_domain_blocks_controller_spec.rb
index 39195716c5c684..564f5a88c51027 100644
--- a/spec/controllers/admin/export_domain_blocks_controller_spec.rb
+++ b/spec/controllers/admin/export_domain_blocks_controller_spec.rb
@@ -64,7 +64,7 @@ def mapped_batch_table_rows
     end
 
     def batch_table_rows
-      Nokogiri::Slop(response.body).css('body div.batch-table__row')
+      response.parsed_body.css('body div.batch-table__row')
     end
   end
 
diff --git a/spec/controllers/admin/instances_controller_spec.rb b/spec/controllers/admin/instances_controller_spec.rb
index a64bbb2c9f7911..1e65373e1f5365 100644
--- a/spec/controllers/admin/instances_controller_spec.rb
+++ b/spec/controllers/admin/instances_controller_spec.rb
@@ -35,7 +35,7 @@
     end
 
     def instance_directory_links
-      Nokogiri::Slop(response.body).css('div.directory__tag a')
+      response.parsed_body.css('div.directory__tag a')
     end
   end
 
diff --git a/spec/controllers/auth/registrations_controller_spec.rb b/spec/controllers/auth/registrations_controller_spec.rb
index 75ab2876523ea7..6118edf4e34331 100644
--- a/spec/controllers/auth/registrations_controller_spec.rb
+++ b/spec/controllers/auth/registrations_controller_spec.rb
@@ -342,7 +342,7 @@
       end
 
       def username_error_text
-        Nokogiri::Slop(response.body).css('.user_account_username .error').text
+        response.parsed_body.css('.user_account_username .error').text
       end
     end
 
diff --git a/spec/requests/account_show_page_spec.rb b/spec/requests/account_show_page_spec.rb
index d0857c8980ec3e..7f3ea2595f8eef 100644
--- a/spec/requests/account_show_page_spec.rb
+++ b/spec/requests/account_show_page_spec.rb
@@ -18,14 +18,16 @@
   end
 
   def head_link_icons
-    head_section.css('link[rel=icon]')
+    response
+      .parsed_body
+      .search('html head link[rel=icon]')
   end
 
   def head_meta_content(property)
-    head_section.meta("[@property='#{property}']")[:content]
-  end
-
-  def head_section
-    Nokogiri::Slop(response.body).html.head
+    response
+      .parsed_body
+      .search("html head meta[property='#{property}']")
+      .attr('content')
+      .text
   end
 end

From 559958f8c540a28c9f41da040fa23a228fadad0b Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 4 Sep 2024 19:35:40 +0200
Subject: [PATCH 2096/2191] Fix email language when recipient has no selected
 locale (#31747)

---
 app/mailers/application_mailer.rb |  2 +-
 app/mailers/user_mailer.rb        | 24 ++++++++++++------------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb
index 3312183d47db66..35f0b5fee18a9a 100644
--- a/app/mailers/application_mailer.rb
+++ b/app/mailers/application_mailer.rb
@@ -12,7 +12,7 @@ class ApplicationMailer < ActionMailer::Base
   protected
 
   def locale_for_account(account, &block)
-    I18n.with_locale(account.user_locale || I18n.locale || I18n.default_locale, &block)
+    I18n.with_locale(account.user_locale || I18n.default_locale, &block)
   end
 
   def set_autoreply_headers!
diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb
index 81a2c0c6d04bbc..5c9e5c96d91589 100644
--- a/app/mailers/user_mailer.rb
+++ b/app/mailers/user_mailer.rb
@@ -33,7 +33,7 @@ def reset_password_instructions(user, token, *, **)
 
     return unless @resource.active_for_authentication?
 
-    I18n.with_locale(locale) do
+    I18n.with_locale(locale(use_current_locale: true)) do
       mail subject: default_devise_subject
     end
   end
@@ -43,7 +43,7 @@ def password_change(user, *, **)
 
     return unless @resource.active_for_authentication?
 
-    I18n.with_locale(locale) do
+    I18n.with_locale(locale(use_current_locale: true)) do
       mail subject: default_devise_subject
     end
   end
@@ -53,7 +53,7 @@ def email_changed(user, *, **)
 
     return unless @resource.active_for_authentication?
 
-    I18n.with_locale(locale) do
+    I18n.with_locale(locale(use_current_locale: true)) do
       mail subject: default_devise_subject
     end
   end
@@ -63,7 +63,7 @@ def two_factor_enabled(user, *, **)
 
     return unless @resource.active_for_authentication?
 
-    I18n.with_locale(locale) do
+    I18n.with_locale(locale(use_current_locale: true)) do
       mail subject: default_devise_subject
     end
   end
@@ -73,7 +73,7 @@ def two_factor_disabled(user, *, **)
 
     return unless @resource.active_for_authentication?
 
-    I18n.with_locale(locale) do
+    I18n.with_locale(locale(use_current_locale: true)) do
       mail subject: default_devise_subject
     end
   end
@@ -83,7 +83,7 @@ def two_factor_recovery_codes_changed(user, *, **)
 
     return unless @resource.active_for_authentication?
 
-    I18n.with_locale(locale) do
+    I18n.with_locale(locale(use_current_locale: true)) do
       mail subject: default_devise_subject
     end
   end
@@ -93,7 +93,7 @@ def webauthn_enabled(user, *, **)
 
     return unless @resource.active_for_authentication?
 
-    I18n.with_locale(locale) do
+    I18n.with_locale(locale(use_current_locale: true)) do
       mail subject: default_devise_subject
     end
   end
@@ -103,7 +103,7 @@ def webauthn_disabled(user, *, **)
 
     return unless @resource.active_for_authentication?
 
-    I18n.with_locale(locale) do
+    I18n.with_locale(locale(use_current_locale: true)) do
       mail subject: default_devise_subject
     end
   end
@@ -114,7 +114,7 @@ def webauthn_credential_added(user, webauthn_credential)
 
     return unless @resource.active_for_authentication?
 
-    I18n.with_locale(locale) do
+    I18n.with_locale(locale(use_current_locale: true)) do
       mail subject: I18n.t('devise.mailer.webauthn_credential.added.subject')
     end
   end
@@ -125,7 +125,7 @@ def webauthn_credential_deleted(user, webauthn_credential)
 
     return unless @resource.active_for_authentication?
 
-    I18n.with_locale(locale) do
+    I18n.with_locale(locale(use_current_locale: true)) do
       mail subject: I18n.t('devise.mailer.webauthn_credential.deleted.subject')
     end
   end
@@ -219,7 +219,7 @@ def set_instance
     @instance = Rails.configuration.x.local_domain
   end
 
-  def locale
-    @resource.locale.presence || I18n.locale || I18n.default_locale
+  def locale(use_current_locale: false)
+    @resource.locale.presence || (use_current_locale && I18n.locale) || I18n.default_locale
   end
 end

From 1d86377ba90c640763cb61ae3a6d79544a92e8df Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 4 Sep 2024 15:28:16 +0200
Subject: [PATCH 2097/2191] [Glitch] Fix all notification types being stored
 without filtering when polling

Port fab29ebbe864f0aec84857fc3d87f0d56f4f6b9b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../glitch/actions/notification_groups.ts     | 33 ++++++++++---------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/app/javascript/flavours/glitch/actions/notification_groups.ts b/app/javascript/flavours/glitch/actions/notification_groups.ts
index ba93ab776b65b5..b0a54ad5b45a69 100644
--- a/app/javascript/flavours/glitch/actions/notification_groups.ts
+++ b/app/javascript/flavours/glitch/actions/notification_groups.ts
@@ -18,7 +18,7 @@ import {
   selectSettingsNotificationsQuickFilterActive,
   selectSettingsNotificationsShows,
 } from 'flavours/glitch/selectors/settings';
-import type { AppDispatch } from 'flavours/glitch/store';
+import type { AppDispatch, RootState } from 'flavours/glitch/store';
 import {
   createAppAsyncThunk,
   createDataLoadingThunk,
@@ -32,6 +32,14 @@ function excludeAllTypesExcept(filter: string) {
   return allNotificationTypes.filter((item) => item !== filter);
 }
 
+function getExcludedTypes(state: RootState) {
+  const activeFilter = selectSettingsNotificationsQuickFilterActive(state);
+
+  return activeFilter === 'all'
+    ? selectSettingsNotificationsExcludedTypes(state)
+    : excludeAllTypesExcept(activeFilter);
+}
+
 function dispatchAssociatedRecords(
   dispatch: AppDispatch,
   notifications: ApiNotificationGroupJSON[] | ApiNotificationJSON[],
@@ -62,17 +70,8 @@ function dispatchAssociatedRecords(
 
 export const fetchNotifications = createDataLoadingThunk(
   'notificationGroups/fetch',
-  async (_params, { getState }) => {
-    const activeFilter =
-      selectSettingsNotificationsQuickFilterActive(getState());
-
-    return apiFetchNotifications({
-      exclude_types:
-        activeFilter === 'all'
-          ? selectSettingsNotificationsExcludedTypes(getState())
-          : excludeAllTypesExcept(activeFilter),
-    });
-  },
+  async (_params, { getState }) =>
+    apiFetchNotifications({ exclude_types: getExcludedTypes(getState()) }),
   ({ notifications, accounts, statuses }, { dispatch }) => {
     dispatch(importFetchedAccounts(accounts));
     dispatch(importFetchedStatuses(statuses));
@@ -92,9 +91,11 @@ export const fetchNotifications = createDataLoadingThunk(
 
 export const fetchNotificationsGap = createDataLoadingThunk(
   'notificationGroups/fetchGap',
-  async (params: { gap: NotificationGap }) =>
-    apiFetchNotifications({ max_id: params.gap.maxId }),
-
+  async (params: { gap: NotificationGap }, { getState }) =>
+    apiFetchNotifications({
+      max_id: params.gap.maxId,
+      exclude_types: getExcludedTypes(getState()),
+    }),
   ({ notifications, accounts, statuses }, { dispatch }) => {
     dispatch(importFetchedAccounts(accounts));
     dispatch(importFetchedStatuses(statuses));
@@ -109,6 +110,7 @@ export const pollRecentNotifications = createDataLoadingThunk(
   async (_params, { getState }) => {
     return apiFetchNotifications({
       max_id: undefined,
+      exclude_types: getExcludedTypes(getState()),
       // In slow mode, we don't want to include notifications that duplicate the already-displayed ones
       since_id: usePendingItems
         ? getState().notificationGroups.groups.find(
@@ -183,7 +185,6 @@ export const setNotificationsFilter = createAppAsyncThunk(
       path: ['notifications', 'quickFilter', 'active'],
       value: filterType,
     });
-    // dispatch(expandNotifications({ forceLoad: true }));
     void dispatch(fetchNotifications());
     dispatch(saveSettings());
   },

From 1fb31ad9b1be6d7c629300657d773b803c943ff1 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 4 Sep 2024 15:43:08 +0200
Subject: [PATCH 2098/2191] [Glitch] Fix display name being displayed instead
 of domain in remote reports

Port 585e369e0bb0e17ff5e025385dfefde1e9e81fa3 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../components/notification_admin_report.tsx     | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/app/javascript/flavours/glitch/features/notifications_v2/components/notification_admin_report.tsx b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_admin_report.tsx
index fc2d3149b3006f..3ab87291637286 100644
--- a/app/javascript/flavours/glitch/features/notifications_v2/components/notification_admin_report.tsx
+++ b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_admin_report.tsx
@@ -42,19 +42,11 @@ export const NotificationAdminReport: React.FC<{
 
   if (!account || !targetAccount) return null;
 
+  const domain = account.acct.split('@')[1];
+
   const values = {
-    name: (
-      <bdi
-        dangerouslySetInnerHTML={{ __html: account.get('display_name_html') }}
-      />
-    ),
-    target: (
-      <bdi
-        dangerouslySetInnerHTML={{
-          __html: targetAccount.get('display_name_html'),
-        }}
-      />
-    ),
+    name: <bdi>{domain ?? `@${account.acct}`}</bdi>,
+    target: <bdi>@{targetAccount.acct}</bdi>,
     category: intl.formatMessage(messages[report.category]),
     count: report.status_ids.length,
   };

From cb1eaa10f21ae0524a0ea909c6271be2621dfade Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 4 Sep 2024 20:07:23 +0200
Subject: [PATCH 2099/2191] Fix glitch-soc-only tests

---
 spec/requests/api/v1/timelines/direct_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/requests/api/v1/timelines/direct_spec.rb b/spec/requests/api/v1/timelines/direct_spec.rb
index f882e4ccc59406..2551060fa99323 100644
--- a/spec/requests/api/v1/timelines/direct_spec.rb
+++ b/spec/requests/api/v1/timelines/direct_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'API V1 Direct Timeline' do
+RSpec.describe 'API V1 Direct Timeline' do
   let(:user) { Fabricate(:user) }
   let(:scopes)  { 'read:statuses' }
   let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }

From 4678473e54de33200919ad39f08162aed9350e8a Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 4 Sep 2024 15:50:33 -0400
Subject: [PATCH 2100/2191] Add `AnnualReport::Source#report_statuses` method
 for subclasses to use (#31753)

---
 app/lib/annual_report/archetype.rb                 | 12 ++++--------
 .../commonly_interacted_with_accounts.rb           |  2 +-
 app/lib/annual_report/most_reblogged_accounts.rb   |  2 +-
 app/lib/annual_report/most_used_apps.rb            |  2 +-
 app/lib/annual_report/percentiles.rb               |  2 +-
 app/lib/annual_report/source.rb                    |  7 +++++++
 app/lib/annual_report/time_series.rb               |  2 +-
 app/lib/annual_report/top_hashtags.rb              |  2 +-
 app/lib/annual_report/top_statuses.rb              |  2 +-
 app/lib/annual_report/type_distribution.rb         | 14 ++++----------
 10 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/app/lib/annual_report/archetype.rb b/app/lib/annual_report/archetype.rb
index ea9ef366df7e09..c02b28dfda239f 100644
--- a/app/lib/annual_report/archetype.rb
+++ b/app/lib/annual_report/archetype.rb
@@ -28,22 +28,18 @@ def archetype
   end
 
   def polls_count
-    @polls_count ||= base_scope.where.not(poll_id: nil).count
+    @polls_count ||= report_statuses.where.not(poll_id: nil).count
   end
 
   def reblogs_count
-    @reblogs_count ||= base_scope.where.not(reblog_of_id: nil).count
+    @reblogs_count ||= report_statuses.where.not(reblog_of_id: nil).count
   end
 
   def replies_count
-    @replies_count ||= base_scope.where.not(in_reply_to_id: nil).where.not(in_reply_to_account_id: @account.id).count
+    @replies_count ||= report_statuses.where.not(in_reply_to_id: nil).where.not(in_reply_to_account_id: @account.id).count
   end
 
   def standalone_count
-    @standalone_count ||= base_scope.without_replies.without_reblogs.count
-  end
-
-  def base_scope
-    @account.statuses.where(id: year_as_snowflake_range)
+    @standalone_count ||= report_statuses.without_replies.without_reblogs.count
   end
 end
diff --git a/app/lib/annual_report/commonly_interacted_with_accounts.rb b/app/lib/annual_report/commonly_interacted_with_accounts.rb
index af5e854c222f78..e7482f0d52a792 100644
--- a/app/lib/annual_report/commonly_interacted_with_accounts.rb
+++ b/app/lib/annual_report/commonly_interacted_with_accounts.rb
@@ -17,6 +17,6 @@ def generate
   private
 
   def commonly_interacted_with_accounts
-    @account.statuses.reorder(nil).where(id: year_as_snowflake_range).where.not(in_reply_to_account_id: @account.id).group(:in_reply_to_account_id).having('count(*) > 1').order(total: :desc).limit(SET_SIZE).pluck(Arel.sql('in_reply_to_account_id, count(*) AS total'))
+    report_statuses.where.not(in_reply_to_account_id: @account.id).group(:in_reply_to_account_id).having('count(*) > 1').order(total: :desc).limit(SET_SIZE).pluck(Arel.sql('in_reply_to_account_id, count(*) AS total'))
   end
 end
diff --git a/app/lib/annual_report/most_reblogged_accounts.rb b/app/lib/annual_report/most_reblogged_accounts.rb
index e3e8a7c90b1246..39ed3868ea06ad 100644
--- a/app/lib/annual_report/most_reblogged_accounts.rb
+++ b/app/lib/annual_report/most_reblogged_accounts.rb
@@ -17,6 +17,6 @@ def generate
   private
 
   def most_reblogged_accounts
-    @account.statuses.reorder(nil).where(id: year_as_snowflake_range).where.not(reblog_of_id: nil).joins(reblog: :account).group('accounts.id').having('count(*) > 1').order(total: :desc).limit(SET_SIZE).pluck(Arel.sql('accounts.id, count(*) as total'))
+    report_statuses.where.not(reblog_of_id: nil).joins(reblog: :account).group('accounts.id').having('count(*) > 1').order(total: :desc).limit(SET_SIZE).pluck(Arel.sql('accounts.id, count(*) as total'))
   end
 end
diff --git a/app/lib/annual_report/most_used_apps.rb b/app/lib/annual_report/most_used_apps.rb
index 85ff1ff86e10c2..fb1ca1d16705c6 100644
--- a/app/lib/annual_report/most_used_apps.rb
+++ b/app/lib/annual_report/most_used_apps.rb
@@ -17,6 +17,6 @@ def generate
   private
 
   def most_used_apps
-    @account.statuses.reorder(nil).where(id: year_as_snowflake_range).joins(:application).group('oauth_applications.name').order(total: :desc).limit(SET_SIZE).pluck(Arel.sql('oauth_applications.name, count(*) as total'))
+    report_statuses.joins(:application).group('oauth_applications.name').order(total: :desc).limit(SET_SIZE).pluck(Arel.sql('oauth_applications.name, count(*) as total'))
   end
 end
diff --git a/app/lib/annual_report/percentiles.rb b/app/lib/annual_report/percentiles.rb
index 9fe4698ee5df52..0251cb66ad27e9 100644
--- a/app/lib/annual_report/percentiles.rb
+++ b/app/lib/annual_report/percentiles.rb
@@ -17,7 +17,7 @@ def followers_gained
   end
 
   def statuses_created
-    @statuses_created ||= @account.statuses.where(id: year_as_snowflake_range).count
+    @statuses_created ||= report_statuses.count
   end
 
   def total_with_fewer_followers
diff --git a/app/lib/annual_report/source.rb b/app/lib/annual_report/source.rb
index d56a1fcccf697f..cb9f7b16e32a10 100644
--- a/app/lib/annual_report/source.rb
+++ b/app/lib/annual_report/source.rb
@@ -10,6 +10,13 @@ def initialize(account, year)
 
   protected
 
+  def report_statuses
+    @account
+      .statuses
+      .where(id: year_as_snowflake_range)
+      .reorder(nil)
+  end
+
   def year_as_snowflake_range
     (beginning_snowflake_id..ending_snowflake_id)
   end
diff --git a/app/lib/annual_report/time_series.rb b/app/lib/annual_report/time_series.rb
index a144bac0d1587a..65a188eda7b299 100644
--- a/app/lib/annual_report/time_series.rb
+++ b/app/lib/annual_report/time_series.rb
@@ -17,7 +17,7 @@ def generate
   private
 
   def statuses_per_month
-    @statuses_per_month ||= @account.statuses.reorder(nil).where(id: year_as_snowflake_range).group(:period).pluck(Arel.sql("date_part('month', created_at)::int AS period, count(*)")).to_h
+    @statuses_per_month ||= report_statuses.group(:period).pluck(Arel.sql("date_part('month', created_at)::int AS period, count(*)")).to_h
   end
 
   def following_per_month
diff --git a/app/lib/annual_report/top_hashtags.rb b/app/lib/annual_report/top_hashtags.rb
index 488dacb1b45b2c..32bd10d6989b48 100644
--- a/app/lib/annual_report/top_hashtags.rb
+++ b/app/lib/annual_report/top_hashtags.rb
@@ -17,6 +17,6 @@ def generate
   private
 
   def top_hashtags
-    Tag.joins(:statuses).where(statuses: { id: @account.statuses.where(id: year_as_snowflake_range).reorder(nil).select(:id) }).group(:id).having('count(*) > 1').order(total: :desc).limit(SET_SIZE).pluck(Arel.sql('COALESCE(tags.display_name, tags.name), count(*) AS total'))
+    Tag.joins(:statuses).where(statuses: { id: report_statuses.select(:id) }).group(:id).having('count(*) > 1').order(total: :desc).limit(SET_SIZE).pluck(Arel.sql('COALESCE(tags.display_name, tags.name), count(*) AS total'))
   end
 end
diff --git a/app/lib/annual_report/top_statuses.rb b/app/lib/annual_report/top_statuses.rb
index 1ab1709523b7de..c5abeaa58d81d2 100644
--- a/app/lib/annual_report/top_statuses.rb
+++ b/app/lib/annual_report/top_statuses.rb
@@ -16,6 +16,6 @@ def generate
   end
 
   def base_scope
-    @account.statuses.public_visibility.joins(:status_stat).where(id: year_as_snowflake_range).reorder(nil)
+    report_statuses.public_visibility.joins(:status_stat)
   end
 end
diff --git a/app/lib/annual_report/type_distribution.rb b/app/lib/annual_report/type_distribution.rb
index fc12a6f1f4b665..fe38d8a8a2d254 100644
--- a/app/lib/annual_report/type_distribution.rb
+++ b/app/lib/annual_report/type_distribution.rb
@@ -4,17 +4,11 @@ class AnnualReport::TypeDistribution < AnnualReport::Source
   def generate
     {
       type_distribution: {
-        total: base_scope.count,
-        reblogs: base_scope.where.not(reblog_of_id: nil).count,
-        replies: base_scope.where.not(in_reply_to_id: nil).where.not(in_reply_to_account_id: @account.id).count,
-        standalone: base_scope.without_replies.without_reblogs.count,
+        total: report_statuses.count,
+        reblogs: report_statuses.where.not(reblog_of_id: nil).count,
+        replies: report_statuses.where.not(in_reply_to_id: nil).where.not(in_reply_to_account_id: @account.id).count,
+        standalone: report_statuses.without_replies.without_reblogs.count,
       },
     }
   end
-
-  private
-
-  def base_scope
-    @account.statuses.where(id: year_as_snowflake_range)
-  end
 end

From 4d5c91e99a3897addd737b12b8b6e3baded6d2d9 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 4 Sep 2024 15:51:40 -0400
Subject: [PATCH 2101/2191] Remove `before` block in spec with TODOs which have
 been TO-DONE already (#31754)

---
 spec/requests/instance_actor_spec.rb | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/spec/requests/instance_actor_spec.rb b/spec/requests/instance_actor_spec.rb
index 7e4784203f0cd3..bb294b04a44133 100644
--- a/spec/requests/instance_actor_spec.rb
+++ b/spec/requests/instance_actor_spec.rb
@@ -4,11 +4,6 @@
 
 RSpec.describe 'Instance actor endpoint' do
   describe 'GET /actor' do
-    before do
-      integration_session.https! # TODO: Move to global rails_helper for all request specs?
-      host! Rails.configuration.x.local_domain # TODO: Move to global rails_helper for all request specs?
-    end
-
     let!(:original_federation_mode) { Rails.configuration.x.limited_federation_mode }
 
     shared_examples 'instance actor endpoint' do

From 7d91723f052f42a2b5fed365b007767e5717a9bb Mon Sep 17 00:00:00 2001
From: David Roetzel <david@roetzel.de>
Date: Thu, 5 Sep 2024 11:26:49 +0200
Subject: [PATCH 2102/2191] Support `REDIS_SENTINEL_PORT` variables (#31767)

---
 lib/mastodon/redis_configuration.rb           | 23 ++++++------
 spec/lib/mastodon/redis_configuration_spec.rb | 36 ++++++++++++++++---
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/lib/mastodon/redis_configuration.rb b/lib/mastodon/redis_configuration.rb
index 9139d87583e33f..5a096a1bf2210f 100644
--- a/lib/mastodon/redis_configuration.rb
+++ b/lib/mastodon/redis_configuration.rb
@@ -57,17 +57,20 @@ def cache_namespace
   def setup_config(prefix: nil, defaults: {})
     prefix = "#{prefix}REDIS_"
 
-    url       = ENV.fetch("#{prefix}URL", nil)
-    user      = ENV.fetch("#{prefix}USER", nil)
-    password  = ENV.fetch("#{prefix}PASSWORD", nil)
-    host      = ENV.fetch("#{prefix}HOST", defaults[:host])
-    port      = ENV.fetch("#{prefix}PORT", defaults[:port])
-    db        = ENV.fetch("#{prefix}DB", defaults[:db])
-    name      = ENV.fetch("#{prefix}SENTINEL_MASTER", nil)
-    sentinels = parse_sentinels(ENV.fetch("#{prefix}SENTINELS", nil))
+    url           = ENV.fetch("#{prefix}URL", nil)
+    user          = ENV.fetch("#{prefix}USER", nil)
+    password      = ENV.fetch("#{prefix}PASSWORD", nil)
+    host          = ENV.fetch("#{prefix}HOST", defaults[:host])
+    port          = ENV.fetch("#{prefix}PORT", defaults[:port])
+    db            = ENV.fetch("#{prefix}DB", defaults[:db])
+    name          = ENV.fetch("#{prefix}SENTINEL_MASTER", nil)
+    sentinel_port = ENV.fetch("#{prefix}SENTINEL_PORT", 26_379)
+    sentinel_list = ENV.fetch("#{prefix}SENTINELS", nil)
 
     return { url:, driver: } if url
 
+    sentinels = parse_sentinels(sentinel_list, default_port: sentinel_port)
+
     if name.present? && sentinels.present?
       host = name
       port = nil
@@ -96,10 +99,10 @@ def construct_uri(host, port, db, user, password)
     end.normalize.to_str
   end
 
-  def parse_sentinels(sentinels_string)
+  def parse_sentinels(sentinels_string, default_port: 26_379)
     (sentinels_string || '').split(',').map do |sentinel|
       host, port = sentinel.split(':')
-      port = port.present? ? port.to_i : 26_379
+      port = (port || default_port).to_i
       { host: host, port: port }
     end.presence
   end
diff --git a/spec/lib/mastodon/redis_configuration_spec.rb b/spec/lib/mastodon/redis_configuration_spec.rb
index a48ffc80e6c743..d14adf95182dc9 100644
--- a/spec/lib/mastodon/redis_configuration_spec.rb
+++ b/spec/lib/mastodon/redis_configuration_spec.rb
@@ -107,14 +107,40 @@
     end
 
     context 'when giving sentinels without port numbers' do
-      around do |example|
-        ClimateControl.modify "#{prefix}REDIS_SENTINELS": '192.168.0.1,192.168.0.2', "#{prefix}REDIS_SENTINEL_MASTER": 'mainsentinel' do
-          example.run
+      context "when no default port is given via `#{prefix}REDIS_SENTINEL_PORT`" do
+        around do |example|
+          ClimateControl.modify "#{prefix}REDIS_SENTINELS": '192.168.0.1,192.168.0.2', "#{prefix}REDIS_SENTINEL_MASTER": 'mainsentinel' do
+            example.run
+          end
+        end
+
+        it 'uses the default sentinel port' do
+          expect(subject[:sentinels]).to contain_exactly({ host: '192.168.0.1', port: 26_379 }, { host: '192.168.0.2', port: 26_379 })
         end
       end
 
-      it 'uses the default sentinel port' do
-        expect(subject[:sentinels]).to contain_exactly({ host: '192.168.0.1', port: 26_379 }, { host: '192.168.0.2', port: 26_379 })
+      context 'when adding port numbers to some, but not all sentinels' do
+        around do |example|
+          ClimateControl.modify "#{prefix}REDIS_SENTINELS": '192.168.0.1:5678,192.168.0.2', "#{prefix}REDIS_SENTINEL_MASTER": 'mainsentinel' do
+            example.run
+          end
+        end
+
+        it 'uses the given port number when available and the default otherwise' do
+          expect(subject[:sentinels]).to contain_exactly({ host: '192.168.0.1', port: 5678 }, { host: '192.168.0.2', port: 26_379 })
+        end
+      end
+
+      context "when a default port is given via `#{prefix}REDIS_SENTINEL_PORT`" do
+        around do |example|
+          ClimateControl.modify "#{prefix}REDIS_SENTINEL_PORT": '1234', "#{prefix}REDIS_SENTINELS": '192.168.0.1,192.168.0.2', "#{prefix}REDIS_SENTINEL_MASTER": 'mainsentinel' do
+            example.run
+          end
+        end
+
+        it 'uses the given port number' do
+          expect(subject[:sentinels]).to contain_exactly({ host: '192.168.0.1', port: 1234 }, { host: '192.168.0.2', port: 1234 })
+        end
       end
     end
   end

From ec4c49082edb5f4941bd4e129900628c6b30101e Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 5 Sep 2024 11:39:59 +0200
Subject: [PATCH 2103/2191] Change design of unread conversations in web UI
 (#31763)

---
 .../components/conversation.jsx               |  2 +-
 .../styles/mastodon/components.scss           | 19 ++-----------------
 2 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/app/javascript/mastodon/features/direct_timeline/components/conversation.jsx b/app/javascript/mastodon/features/direct_timeline/components/conversation.jsx
index 6588c8b763aee6..0d154db1e16d8e 100644
--- a/app/javascript/mastodon/features/direct_timeline/components/conversation.jsx
+++ b/app/javascript/mastodon/features/direct_timeline/components/conversation.jsx
@@ -170,7 +170,7 @@ export const Conversation = ({ conversation, scrollKey, onMoveUp, onMoveDown })
 
   return (
     <HotKeys handlers={handlers}>
-      <div className={classNames('conversation focusable muted', { 'conversation--unread': unread })} tabIndex={0}>
+      <div className={classNames('conversation focusable muted', { unread })} tabIndex={0}>
         <div className='conversation__avatar' onClick={handleClick} role='presentation'>
           <AvatarComposite accounts={accounts} size={48} />
         </div>
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index c1e5075702dc1c..d892c008bc23b6 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -8522,22 +8522,6 @@ noscript {
       word-break: break-word;
     }
   }
-
-  &--unread {
-    background: lighten($ui-base-color, 2%);
-
-    &:focus {
-      background: lighten($ui-base-color, 4%);
-    }
-
-    .conversation__content__info {
-      font-weight: 700;
-    }
-
-    .conversation__content__relative-time {
-      color: $primary-text-color;
-    }
-  }
 }
 
 .announcements {
@@ -8732,7 +8716,8 @@ noscript {
 }
 
 .notification,
-.status__wrapper {
+.status__wrapper,
+.conversation {
   position: relative;
 
   &.unread {

From eb23d9f0f6d8415551e31d264418de733f71d83d Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 5 Sep 2024 09:40:38 +0000
Subject: [PATCH 2104/2191] New Crowdin Translations (automated) (#31765)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/ar.json    |  22 ++-
 app/javascript/mastodon/locales/fr-CA.json |   1 +
 app/javascript/mastodon/locales/fr.json    |   1 +
 app/javascript/mastodon/locales/pt-PT.json |  78 ++++-----
 config/locales/activerecord.pt-PT.yml      |  10 +-
 config/locales/ar.yml                      |  23 ++-
 config/locales/devise.pt-PT.yml            | 106 ++++++-------
 config/locales/doorkeeper.pt-PT.yml        |  72 ++++-----
 config/locales/gl.yml                      |   4 +-
 config/locales/pt-PT.yml                   | 175 +++++++++++----------
 config/locales/simple_form.ar.yml          |   2 +-
 config/locales/simple_form.pt-PT.yml       |  24 +--
 12 files changed, 272 insertions(+), 246 deletions(-)

diff --git a/app/javascript/mastodon/locales/ar.json b/app/javascript/mastodon/locales/ar.json
index c1cb734a6301ec..d83a42a6c7620e 100644
--- a/app/javascript/mastodon/locales/ar.json
+++ b/app/javascript/mastodon/locales/ar.json
@@ -95,6 +95,8 @@
   "block_modal.title": "أتريد حظر هذا المستخدم؟",
   "block_modal.you_wont_see_mentions": "لن تر المنشورات التي يُشار فيهم إليه.",
   "boost_modal.combo": "يُمكنك الضّغط على {combo} لتخطي هذا في المرة المُقبلة",
+  "boost_modal.reblog": "أتريد إعادة نشر المنشور؟",
+  "boost_modal.undo_reblog": "أتريد إلغاء إعادة نشر المنشور؟",
   "bundle_column_error.copy_stacktrace": "انسخ تقرير الخطأ",
   "bundle_column_error.error.body": "لا يمكن تقديم الصفحة المطلوبة. قد يكون بسبب خطأ في التعليمات البرمجية، أو مشكلة توافق المتصفح.",
   "bundle_column_error.error.title": "أوه لا!",
@@ -230,7 +232,7 @@
   "domain_pill.who_they_are": "بما أن المعرفات تقول من هو الشخص ومكان وجوده، يمكنك التفاعل مع الناس عبر الويب الاجتماعي لل <button>منصات التي تعمل ب ActivityPub</button>.",
   "domain_pill.who_you_are": "بما أن معرفك يقول من أنت ومكان وجوده، يمكن للناس التفاعل معك عبر الويب الاجتماعي لل <button>منصات التي تعمل ب ActivityPub</button>.",
   "domain_pill.your_handle": "عنوانك الكامل:",
-  "domain_pill.your_server": "منزلك الرقمي، حيث تعيش جميع مشاركاتك. لا تحب هذا؟ إنقل الخوادم في أي وقت واخضر متابعينك أيضًا.",
+  "domain_pill.your_server": "موطِنك الرقمي، حيث توجد فيه كافة منشوراتك. ألا يعجبك المكان؟ يمكنك الانتقال بين الخوادم في أي وقت واصطحاب متابعيك أيضاً.",
   "domain_pill.your_username": "معرفك الفريد على هذا الخادم. من الممكن العثور على مستخدمين بنفس إسم المستخدم على خوادم مختلفة.",
   "embed.instructions": "يمكنكم إدماج هذا المنشور على موقعكم الإلكتروني عن طريق نسخ الشفرة أدناه.",
   "embed.preview": "إليك ما سيبدو عليه:",
@@ -290,7 +292,7 @@
   "filter_modal.added.review_and_configure": "لمراجعة وزيادة تكوين فئة عوامل التصفية هذه، انتقل إلى {settings_link}.",
   "filter_modal.added.review_and_configure_title": "إعدادات التصفية",
   "filter_modal.added.settings_link": "صفحة الإعدادات",
-  "filter_modal.added.short_explanation": "تمت إضافة هذه المشاركة إلى فئة الفلاتر التالية: {title}.",
+  "filter_modal.added.short_explanation": "تمت إضافة هذا المنشور إلى فئة عوامل التصفية التالية: {title}.",
   "filter_modal.added.title": "تمت إضافة عامل التصفية!",
   "filter_modal.select_filter.context_mismatch": "لا ينطبق على هذا السياق",
   "filter_modal.select_filter.expired": "منتهية الصلاحيّة",
@@ -348,6 +350,9 @@
   "hashtag.follow": "اتبع الوسم",
   "hashtag.unfollow": "ألغِ متابعة الوسم",
   "hashtags.and_other": "…و {count, plural, zero {} one {# واحد آخر} two {# اثنان آخران} few {# آخرون} many {# آخَرًا}other {# آخرون}}",
+  "hints.profiles.see_more_followers": "عرض المزيد من المتابعين على {domain}",
+  "hints.profiles.see_more_posts": "عرض المزيد من المنشورات من {domain}",
+  "hints.threads.see_more": "اطلع على المزيد من الردود على {domain}",
   "home.column_settings.show_reblogs": "اعرض المعاد نشرها",
   "home.column_settings.show_replies": "اعرض الردود",
   "home.hide_announcements": "إخفاء الإعلانات",
@@ -356,8 +361,10 @@
   "home.pending_critical_update.title": "تحديث أمان حرج متوفر!",
   "home.show_announcements": "إظهار الإعلانات",
   "ignore_notifications_modal.disclaimer": "لا يمكن لـ Mastodon إبلاغ المستخدمين بأنك قد تجاهلت إشعاراتهم. تجاهل الإشعارات لن يمنع إرسال الرسائل نفسها.",
+  "ignore_notifications_modal.filter_instead": "تصفيتها بدلا من ذلك",
   "ignore_notifications_modal.ignore": "تجاهل الإشعارات",
   "ignore_notifications_modal.limited_accounts_title": "تجاهل الإشعارات من الحسابات التي هي تحت الإشراف؟",
+  "ignore_notifications_modal.new_accounts_title": "تجاهل الإشعارات الصادرة من الحسابات الجديدة؟",
   "interaction_modal.description.favourite": "بفضل حساب على ماستدون، يمكنك إضافة هذا المنشور إلى مفضلتك لإبلاغ الناشر عن تقديرك وكذا للاحتفاظ بالمنشور إلى وقت لاحق.",
   "interaction_modal.description.follow": "بفضل حساب في ماستدون، يمكنك متابعة {name} وتلقي منشوراته في موجزات خيطك الرئيس.",
   "interaction_modal.description.reblog": "مع حساب في ماستدون، يمكنك تعزيز هذا المنشور ومشاركته مع مُتابِعيك.",
@@ -447,6 +454,7 @@
   "mute_modal.you_wont_see_mentions": "لن تر المنشورات التي يُشار فيها إليه.",
   "mute_modal.you_wont_see_posts": "سيكون بإمكانه رؤية منشوراتك، لكنك لن ترى منشوراته.",
   "navigation_bar.about": "عن",
+  "navigation_bar.administration": "الإدارة",
   "navigation_bar.advanced_interface": "افتحه في واجهة الويب المتقدمة",
   "navigation_bar.blocks": "الحسابات المحجوبة",
   "navigation_bar.bookmarks": "الفواصل المرجعية",
@@ -463,6 +471,7 @@
   "navigation_bar.follows_and_followers": "المتابِعون والمتابَعون",
   "navigation_bar.lists": "القوائم",
   "navigation_bar.logout": "خروج",
+  "navigation_bar.moderation": "الإشراف",
   "navigation_bar.mutes": "الحسابات المكتومة",
   "navigation_bar.opened_in_classic_interface": "تُفتَح المنشورات والحسابات وغيرها من الصفحات الخاصة بشكل مبدئي على واجهة الويب التقليدية.",
   "navigation_bar.personal": "شخصي",
@@ -484,7 +493,7 @@
   "notification.mention": "إشارة",
   "notification.moderation-warning.learn_more": "اعرف المزيد",
   "notification.moderation_warning": "لقد تلقيت تحذيرًا بالإشراف",
-  "notification.moderation_warning.action_delete_statuses": "تم إزالة بعض مشاركاتك.",
+  "notification.moderation_warning.action_delete_statuses": "تم حذف بعض من منشوراتك.",
   "notification.moderation_warning.action_disable": "تم تعطيل حسابك.",
   "notification.moderation_warning.action_mark_statuses_as_sensitive": "بعض من منشوراتك تم تصنيفها على أنها حساسة.",
   "notification.moderation_warning.action_none": "لقد تلقى حسابك تحذيرا بالإشراف.",
@@ -502,12 +511,15 @@
   "notification.status": "{name} نشر للتو",
   "notification.update": "عدّلَ {name} منشورًا",
   "notification_requests.accept": "موافقة",
+  "notification_requests.confirm_accept_multiple.title": "قبول طلبات الإشعار؟",
+  "notification_requests.confirm_dismiss_multiple.title": "تجاهل طلبات الإشعار؟",
   "notification_requests.dismiss": "تخطي",
   "notification_requests.edit_selection": "تعديل",
   "notification_requests.exit_selection": "تمّ",
   "notification_requests.explainer_for_limited_account": "تم تصفية الإشعارات من هذا الحساب لأن الحساب تم تقييده من قبل مشرف.",
   "notification_requests.notifications_from": "إشعارات من {name}",
   "notification_requests.title": "الإشعارات المصفاة",
+  "notification_requests.view": "عرض الإشعارات",
   "notifications.clear": "مسح الإشعارات",
   "notifications.clear_confirmation": "متأكد من أنك تود مسح جميع الإشعارات الخاصة بك و المتلقاة إلى حد الآن ؟",
   "notifications.clear_title": "أترغب في مسح الإشعارات؟",
@@ -520,7 +532,7 @@
   "notifications.column_settings.filter_bar.advanced": "عرض جميع الفئات",
   "notifications.column_settings.filter_bar.category": "شريط التصفية السريعة",
   "notifications.column_settings.follow": "متابعُون جُدُد:",
-  "notifications.column_settings.follow_request": "الطلبات الجديد لِمتابَعتك:",
+  "notifications.column_settings.follow_request": "الطلبات الجديدة لِمتابَعتك:",
   "notifications.column_settings.mention": "الإشارات:",
   "notifications.column_settings.poll": "نتائج استطلاع الرأي:",
   "notifications.column_settings.push": "الإشعارات",
@@ -747,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": "المزيد",
diff --git a/app/javascript/mastodon/locales/fr-CA.json b/app/javascript/mastodon/locales/fr-CA.json
index 983f737a797b50..a1d4061ebab448 100644
--- a/app/javascript/mastodon/locales/fr-CA.json
+++ b/app/javascript/mastodon/locales/fr-CA.json
@@ -356,6 +356,7 @@
   "hints.profiles.follows_may_be_missing": "Les abonnements pour ce profil peuvent être manquants.",
   "hints.profiles.posts_may_be_missing": "Certains messages de ce profil peuvent être manquants.",
   "hints.profiles.see_more_followers": "Afficher plus d'abonné·e·s sur {domain}",
+  "hints.profiles.see_more_follows": "Afficher plus d'abonné·e·s sur {domain}",
   "hints.profiles.see_more_posts": "Voir plus de messages sur {domain}",
   "hints.threads.replies_may_be_missing": "Les réponses provenant des autres serveurs pourraient être manquantes.",
   "hints.threads.see_more": "Afficher plus de réponses sur {domain}",
diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json
index 2b22f4ba32b353..9f55634b290845 100644
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@@ -356,6 +356,7 @@
   "hints.profiles.follows_may_be_missing": "Les abonnements pour ce profil peuvent être manquants.",
   "hints.profiles.posts_may_be_missing": "Certains messages de ce profil peuvent être manquants.",
   "hints.profiles.see_more_followers": "Afficher plus d'abonné·e·s sur {domain}",
+  "hints.profiles.see_more_follows": "Afficher plus d'abonné·e·s sur {domain}",
   "hints.profiles.see_more_posts": "Voir plus de messages sur {domain}",
   "hints.threads.replies_may_be_missing": "Les réponses provenant des autres serveurs pourraient être manquantes.",
   "hints.threads.see_more": "Afficher plus de réponses sur {domain}",
diff --git a/app/javascript/mastodon/locales/pt-PT.json b/app/javascript/mastodon/locales/pt-PT.json
index c5d84b9ac6f092..2d0013d607ba0e 100644
--- a/app/javascript/mastodon/locales/pt-PT.json
+++ b/app/javascript/mastodon/locales/pt-PT.json
@@ -43,7 +43,7 @@
   "account.in_memoriam": "Em Memória.",
   "account.joined_short": "Juntou-se a",
   "account.languages": "Alterar línguas subscritas",
-  "account.link_verified_on": "A posse desta ligação foi verificada em {date}",
+  "account.link_verified_on": "O proprietário desta hiperligação foi verificado em {date}",
   "account.locked_info": "Esta conta é privada. O proprietário revê manualmente quem o pode seguir.",
   "account.media": "Média",
   "account.mention": "Mencionar @{name}",
@@ -154,15 +154,15 @@
   "compose_form.lock_disclaimer": "A sua conta não é {locked}. Qualquer pessoa pode segui-lo e ver as publicações direcionadas apenas a seguidores.",
   "compose_form.lock_disclaimer.lock": "fechada",
   "compose_form.placeholder": "Em que está a pensar?",
-  "compose_form.poll.duration": "Duração do inquérito",
+  "compose_form.poll.duration": "Duração da sondagem",
   "compose_form.poll.multiple": "Escolha múltipla",
   "compose_form.poll.option_placeholder": "Opção {number}",
   "compose_form.poll.single": "Escolha uma",
-  "compose_form.poll.switch_to_multiple": "Alterar o inquérito para permitir várias respostas",
-  "compose_form.poll.switch_to_single": "Alterar o inquérito para permitir uma única resposta",
+  "compose_form.poll.switch_to_multiple": "Alterar a sondagem para permitir várias respostas",
+  "compose_form.poll.switch_to_single": "Alterar a sondagem para permitir uma única resposta",
   "compose_form.poll.type": "Estilo",
   "compose_form.publish": "Publicar",
-  "compose_form.publish_form": "Publicar",
+  "compose_form.publish_form": "Nova publicação",
   "compose_form.reply": "Responder",
   "compose_form.save_changes": "Atualizar",
   "compose_form.spoiler.marked": "Texto escondido atrás de aviso",
@@ -189,7 +189,7 @@
   "confirmations.redraft.message": "Tem a certeza de que quer eliminar e reescrever esta publicação? Os favoritos e partilhas perder-se-ão e as respostas à publicação original ficarão órfãs.",
   "confirmations.redraft.title": "Eliminar e reescrever publicação?",
   "confirmations.reply.confirm": "Responder",
-  "confirmations.reply.message": "Responder agora irá reescrever a mensagem que está a compor actualmente. Tem a certeza que quer continuar?",
+  "confirmations.reply.message": "Se responder agora, a mensagem que está a escrever será substituída. Tem a certeza que pretende continuar?",
   "confirmations.reply.title": "Sobrescrever publicação?",
   "confirmations.unfollow.confirm": "Deixar de seguir",
   "confirmations.unfollow.message": "De certeza que queres deixar de seguir {name}?",
@@ -206,14 +206,14 @@
   "directory.federated": "Do fediverso conhecido",
   "directory.local": "Apenas de {domain}",
   "directory.new_arrivals": "Recém chegados",
-  "directory.recently_active": "Com actividade recente",
+  "directory.recently_active": "Recentemente ativo",
   "disabled_account_banner.account_settings": "Definições da conta",
   "disabled_account_banner.text": "A sua conta {disabledAccount} está presentemente desativada.",
   "dismissable_banner.community_timeline": "Estas são as publicações públicas mais recentes de pessoas cujas contas são hospedadas por {domain}.",
   "dismissable_banner.dismiss": "Descartar",
   "dismissable_banner.explore_links": "Essas histórias de notícias estão, no momento, a ser faladas por pessoas neste e noutros servidores da rede descentralizada.",
   "dismissable_banner.explore_statuses": "Estas são publicações de toda a rede social que estão a ganhar popularidade atualmente. As mensagens mais recentes com mais partilhas e favoritos obtêm uma classificação mais elevada.",
-  "dismissable_banner.explore_tags": "Estas #etiquetas estão presentemente a ganhar atenção entre as pessoas neste e noutros servidores da rede descentralizada.",
+  "dismissable_banner.explore_tags": "Estas são hashtags que estão a ganhar força na rede social atualmente. As hashtags que são utilizadas por mais pessoas diferentes têm uma classificação mais elevada.",
   "dismissable_banner.public_timeline": "Estas são as publicações públicas mais recentes de pessoas na rede social que as pessoas em {domain} seguem.",
   "domain_block_modal.block": "Bloquear servidor",
   "domain_block_modal.block_account_instead": "Bloquear @{name} em alternativa",
@@ -238,7 +238,7 @@
   "domain_pill.your_username": "O seu identificador único neste servidor. É possível encontrar utilizadores com o mesmo nome de utilizador em diferentes servidores.",
   "embed.instructions": "Incorpore esta publicação no seu site copiando o código abaixo.",
   "embed.preview": "Podes ver aqui como irá ficar:",
-  "emoji_button.activity": "Actividade",
+  "emoji_button.activity": "Atividade",
   "emoji_button.clear": "Limpar",
   "emoji_button.custom": "Personalizar",
   "emoji_button.flags": "Bandeiras",
@@ -246,7 +246,7 @@
   "emoji_button.label": "Inserir Emoji",
   "emoji_button.nature": "Natureza",
   "emoji_button.not_found": "Nenhum emoji correspondente encontrado",
-  "emoji_button.objects": "Objectos",
+  "emoji_button.objects": "Objetos",
   "emoji_button.people": "Pessoas",
   "emoji_button.recent": "Utilizados regularmente",
   "emoji_button.search": "Pesquisar...",
@@ -258,24 +258,24 @@
   "empty_column.account_timeline": "Sem publicações por aqui!",
   "empty_column.account_unavailable": "Perfil indisponível",
   "empty_column.blocks": "Ainda não bloqueaste qualquer utilizador.",
-  "empty_column.bookmarked_statuses": "Ainda não adicionou nenhuma publicação aos itens salvos. Quando adicionar, eles serão exibidos aqui.",
+  "empty_column.bookmarked_statuses": "Ainda não tem nenhuma publicação marcada. Quando marcar uma, ela aparecerá aqui.",
   "empty_column.community": "A cronologia local está vazia. Escreve algo público para começar!",
   "empty_column.direct": "Ainda não tem qualquer menção privada. Quando enviar ou receber uma, ela irá aparecer aqui.",
   "empty_column.domain_blocks": "Ainda não há qualquer domínio escondido.",
-  "empty_column.explore_statuses": "Nada está em alta no momento. Volte mais tarde!",
+  "empty_column.explore_statuses": "Nada é tendência neste momento. Volte mais tarde!",
   "empty_column.favourited_statuses": "Ainda não assinalou qualquer publicação como favorita. Quando o fizer, aparecerá aqui.",
   "empty_column.favourites": "Ainda ninguém assinalou esta publicação como favorita. Quando alguém o fizer, aparecerá aqui.",
   "empty_column.follow_requests": "Ainda não tens nenhum pedido de seguidor. Quando receberes algum, ele irá aparecer aqui.",
   "empty_column.followed_tags": "Ainda não segue nenhuma hashtag. Quando o fizer, ela aparecerá aqui.",
   "empty_column.hashtag": "Não foram encontradas publicações com essa #etiqueta.",
-  "empty_column.home": "Ainda não segues qualquer utilizador. Visita {public} ou utiliza a pesquisa para procurar outros utilizadores.",
+  "empty_column.home": "A sua linha cronológica inicial está vazia! Siga mais pessoas para a preencher.",
   "empty_column.list": "Ainda não existem publicações nesta lista. Quando membros desta lista fizerem novas publicações, elas aparecerão aqui.",
   "empty_column.lists": "Ainda não tem qualquer lista. Quando criar uma, ela irá aparecer aqui.",
   "empty_column.mutes": "Ainda não silenciaste qualquer utilizador.",
   "empty_column.notification_requests": "Tudo limpo! Não há nada aqui. Quando você receber novas notificações, elas aparecerão aqui conforme as suas configurações.",
   "empty_column.notifications": "Não tens notificações. Interage com outros utilizadores para iniciar uma conversa.",
   "empty_column.public": "Não há nada aqui! Escreve algo publicamente ou segue outros utilizadores para veres aqui os conteúdos públicos",
-  "error.unexpected_crash.explanation": "Devido a um erro no nosso código ou a uma compatilidade com o seu navegador, esta página não pôde ser apresentada correctamente.",
+  "error.unexpected_crash.explanation": "Devido a um erro no nosso código ou a um problema de compatibilidade do navegador, esta página não pôde ser apresentada corretamente.",
   "error.unexpected_crash.explanation_addons": "Esta página não pôde ser exibida corretamente. Este erro provavelmente é causado por um complemento do navegador ou ferramentas de tradução automática.",
   "error.unexpected_crash.next_steps": "Tente atualizar a página. Se isso não ajudar, pode usar o Mastodon através de um navegador diferente ou uma aplicação nativa.",
   "error.unexpected_crash.next_steps_addons": "Tente desabilitá-los e atualizar a página. Se isso não ajudar, você ainda poderá usar o Mastodon por meio de um navegador diferente ou de um aplicativo nativo.",
@@ -355,10 +355,10 @@
   "hashtags.and_other": "…e {count, plural, other {mais #}}",
   "hints.profiles.followers_may_be_missing": "Podem faltar seguidores neste perfil.",
   "hints.profiles.follows_may_be_missing": "O número de perfis seguidos por este perfil pode faltar.",
-  "hints.profiles.posts_may_be_missing": "Podem faltar alguns posts deste perfil.",
+  "hints.profiles.posts_may_be_missing": "Podem faltar algumas publicações deste perfil.",
   "hints.profiles.see_more_followers": "Ver mais seguidores no {domain}",
   "hints.profiles.see_more_follows": "Veja mais perfis seguidos em {domain}",
-  "hints.profiles.see_more_posts": "Ver mais posts em {domain}",
+  "hints.profiles.see_more_posts": "Ver mais publicações em {domain}",
   "home.column_settings.show_reblogs": "Mostrar impulsos",
   "home.column_settings.show_replies": "Mostrar respostas",
   "home.hide_announcements": "Ocultar comunicações",
@@ -406,7 +406,7 @@
   "keyboard_shortcuts.my_profile": "para abrir o teu perfil",
   "keyboard_shortcuts.notifications": "para abrir a coluna das notificações",
   "keyboard_shortcuts.open_media": "para abrir media",
-  "keyboard_shortcuts.pinned": "para abrir a lista dos toots fixados",
+  "keyboard_shortcuts.pinned": "Abrir lista de publicações fixadas",
   "keyboard_shortcuts.profile": "para abrir o perfil do autor",
   "keyboard_shortcuts.reply": "para responder",
   "keyboard_shortcuts.requests": "para abrir a lista dos pedidos de seguidor",
@@ -475,7 +475,7 @@
   "navigation_bar.mutes": "Utilizadores silenciados",
   "navigation_bar.opened_in_classic_interface": "Por norma, publicações, contas, e outras páginas específicas são abertas na interface web clássica.",
   "navigation_bar.personal": "Pessoal",
-  "navigation_bar.pins": "Toots afixados",
+  "navigation_bar.pins": "Publicações fixadas",
   "navigation_bar.preferences": "Preferências",
   "navigation_bar.public_timeline": "Cronologia federada",
   "navigation_bar.search": "Pesquisar",
@@ -504,8 +504,8 @@
   "notification.moderation_warning.action_sensitive": "As suas publicações serão, a partir de agora, assinaladas como sensíveis.",
   "notification.moderation_warning.action_silence": "A sua conta foi limitada.",
   "notification.moderation_warning.action_suspend": "A sua conta foi suspensa.",
-  "notification.own_poll": "A sua votação terminou",
-  "notification.poll": "Uma votação em que participaste chegou ao fim",
+  "notification.own_poll": "A sua sondagem terminou",
+  "notification.poll": "Terminou uma sondagem em que votou",
   "notification.reblog": "{name} reforçou a tua publicação",
   "notification.relationships_severance_event": "Perdeu as ligações com {name}",
   "notification.relationships_severance_event.account_suspension": "Um administrador de {from} suspendeu {target}, o que significa que já não pode receber atualizações dele ou interagir com ele.",
@@ -536,7 +536,7 @@
   "notifications.column_settings.follow": "Novos seguidores:",
   "notifications.column_settings.follow_request": "Novos pedidos de seguidor:",
   "notifications.column_settings.mention": "Menções:",
-  "notifications.column_settings.poll": "Resultados do inquérito:",
+  "notifications.column_settings.poll": "Resultados da sondagem:",
   "notifications.column_settings.push": "Notificações Push",
   "notifications.column_settings.reblog": "Reforços:",
   "notifications.column_settings.show": "Mostrar na coluna",
@@ -550,7 +550,7 @@
   "notifications.filter.favourites": "Favoritos",
   "notifications.filter.follows": "Seguidores",
   "notifications.filter.mentions": "Menções",
-  "notifications.filter.polls": "Resultados do inquérito",
+  "notifications.filter.polls": "Resultados da sondagem",
   "notifications.filter.statuses": "Atualizações de pessoas que você segue",
   "notifications.grant_permission": "Conceder permissão.",
   "notifications.group": "{count} notificações",
@@ -573,7 +573,7 @@
   "notifications_permission_banner.title": "Nunca perca nada",
   "onboarding.action.back": "Voltar atrás",
   "onboarding.actions.back": "Voltar atrás",
-  "onboarding.actions.go_to_explore": "Veja as tendências atuais",
+  "onboarding.actions.go_to_explore": "Ver tendências atuais",
   "onboarding.actions.go_to_home": "Ir para a sua página inicial",
   "onboarding.compose.template": "Olá #Mastodon!",
   "onboarding.follows.empty": "Infelizmente, não é possível mostrar resultados neste momento. Pode tentar utilizar a pesquisa ou navegar na página \"Explorar\" para encontrar pessoas para seguir ou tentar novamente mais tarde.",
@@ -599,7 +599,7 @@
   "onboarding.start.title": "Conseguiu!",
   "onboarding.steps.follow_people.body": "Seguir pessoas interessantes é o propósito do Mastodon. ",
   "onboarding.steps.follow_people.title": "Personalize o seu feed",
-  "onboarding.steps.publish_status.body": "Diga olá ao mundo com texto, fotos, vídeos ou votos {emoji}",
+  "onboarding.steps.publish_status.body": "Diga olá ao mundo com texto, fotos, vídeos ou sondagens {emoji}",
   "onboarding.steps.publish_status.title": "Faça a sua primeira publicação",
   "onboarding.steps.setup_profile.body": "Promova as suas interações para ter um perfil preenchido. ",
   "onboarding.steps.setup_profile.title": "Personalize o seu perfil",
@@ -608,19 +608,19 @@
   "onboarding.tips.2fa": "<strong>Sabia?</strong> Pode proteger a sua conta ativando a autenticação em duas etapas nas configurações de conta. Funciona com qualquer aplicativo TOTP à sua escolha, sem necessitar de um número de telefone!",
   "onboarding.tips.accounts_from_other_servers": "<strong>Sabia?</strong> Como o Mastodon é descentralizado, alguns perfis que encontra estarão hospedados noutros servidores que não os seus. E ainda assim pode interagir com eles perfeitamente! O servidor deles está na segunda metade do nome de utilizador!",
   "onboarding.tips.migration": "<strong>Sabia?</strong> Se sentir que o {domain} não é um bom servidor para si, no futuro pode mudar para outro servidor Mastodon sem perder os seus seguidores. Pode até mesmo hospedar o seu próprio servidor!",
-  "onboarding.tips.verification": "<strong>Sabia que?</strong> Pode fazer a verificação do seu site, adicionando o link do seu perfil à primeira página do seu site, como também pode adicionar o seu site ao seu perfil? Sem taxas ou documentos!",
+  "onboarding.tips.verification": "<strong>Sabia que?</strong> Pode verificar a sua conta colocando uma hiperligação para o seu perfil Mastodon no seu próprio site e adicionando o site ao seu perfil. Sem taxas ou documentos!",
   "password_confirmation.exceeds_maxlength": "A confirmação da palavra-passe excedeu o tamanho máximo ",
   "password_confirmation.mismatching": "A confirmação da palavra-passe não corresponde",
   "picture_in_picture.restore": "Colocá-lo de volta",
   "poll.closed": "Fechado",
-  "poll.refresh": "Recarregar",
+  "poll.refresh": "Atualizar",
   "poll.reveal": "Ver resultados",
   "poll.total_people": "{count, plural, one {# pessoa} other {# pessoas}}",
   "poll.total_votes": "{count, plural, one {# voto} other {# votos}}",
   "poll.vote": "Votar",
-  "poll.voted": "Votaste nesta resposta",
+  "poll.voted": "Votou nesta resposta",
   "poll.votes": "{votes, plural, one {# voto } other {# votos}}",
-  "poll_button.add_poll": "Adicionar votação",
+  "poll_button.add_poll": "Adicionar uma sondagem",
   "poll_button.remove_poll": "Remover sondagem",
   "privacy.change": "Ajustar a privacidade da publicação",
   "privacy.direct.long": "Todos os mencionados na publicação",
@@ -635,7 +635,7 @@
   "privacy_policy.last_updated": "Última atualização em {date}",
   "privacy_policy.title": "Política de privacidade",
   "recommended": "Recomendado",
-  "refresh": "Actualizar",
+  "refresh": "Atualizar",
   "regeneration_indicator.label": "A carregar…",
   "regeneration_indicator.sublabel": "A tua página inicial está a ser preparada!",
   "relative_time.days": "{number}d",
@@ -677,7 +677,7 @@
   "report.reasons.other": "É outra coisa",
   "report.reasons.other_description": "O problema não se encaixa nas outras categorias",
   "report.reasons.spam": "É spam",
-  "report.reasons.spam_description": "Hiperligações maliciosas, contactos falsos, ou respostas repetitivas",
+  "report.reasons.spam_description": "Hiperligações maliciosas, contactos falsos ou respostas repetitivas",
   "report.reasons.violation": "Viola as regras do servidor",
   "report.reasons.violation_description": "Está ciente de que infringe regras específicas",
   "report.rules.subtitle": "Selecione tudo o que se aplicar",
@@ -733,8 +733,8 @@
   "sign_in_banner.create_account": "Criar conta",
   "sign_in_banner.follow_anyone": "Siga alguém no fediverso e veja tudo em ordem cronológica. Sem algoritmos, anúncios ou clickbait à vista.",
   "sign_in_banner.mastodon_is": "O Mastodon é a melhor maneira de acompanhar o que está a acontecer.",
-  "sign_in_banner.sign_in": "Iniciar Sessão",
-  "sign_in_banner.sso_redirect": "Inicie Sessão ou Registe-se",
+  "sign_in_banner.sign_in": "Iniciar sessão",
+  "sign_in_banner.sso_redirect": "Inicie sessão ou registe-se",
   "status.admin_account": "Abrir a interface de moderação para @{name}",
   "status.admin_domain": "Abrir interface de moderação para {domain}",
   "status.admin_status": "Abrir esta publicação na interface de moderação",
@@ -742,7 +742,7 @@
   "status.bookmark": "Guardar nos marcadores",
   "status.cancel_reblog_private": "Deixar de reforçar",
   "status.cannot_reblog": "Não é possível partilhar esta publicação",
-  "status.copy": "Copiar ligação para a publicação",
+  "status.copy": "Copiar hiperligação para a publicação",
   "status.delete": "Eliminar",
   "status.detailed_status": "Vista pormenorizada da conversa",
   "status.direct": "Mencionar @{name} em privado",
@@ -801,15 +801,15 @@
   "time_remaining.moments": "Momentos restantes",
   "time_remaining.seconds": "{número, plural, um {# second} outro {# seconds}} faltam",
   "trends.counter_by_accounts": "{count, plural, one {{counter} pessoa} other {{counter} pessoas}} {days, plural, one {no último dia} other {nos últimos {days} dias}}",
-  "trends.trending_now": "Em alta neste momento",
+  "trends.trending_now": "Tendências atuais",
   "ui.beforeunload": "O teu rascunho será perdido se abandonares o Mastodon.",
   "units.short.billion": "{count}MM",
   "units.short.million": "{count}M",
   "units.short.thousand": "{count}m",
-  "upload_area.title": "Arraste e solte para enviar",
-  "upload_button.label": "Juntar imagens, um vídeo, ou um ficheiro de som",
-  "upload_error.limit": "Limite máximo do ficheiro a carregar excedido.",
-  "upload_error.poll": "O carregamento de ficheiros não é permitido em sondagens.",
+  "upload_area.title": "Arrastar e largar para enviar",
+  "upload_button.label": "Adicionar imagens, um vídeo ou um ficheiro de som",
+  "upload_error.limit": "Limite de envio de ficheiros excedido.",
+  "upload_error.poll": "Não é permitido o envio de ficheiros em sondagens.",
   "upload_form.audio_description": "Descreva para pessoas com diminuição da acuidade auditiva",
   "upload_form.description": "Descreva para pessoas com diminuição da acuidade visual",
   "upload_form.edit": "Editar",
@@ -820,7 +820,7 @@
   "upload_modal.applying": "A aplicar…",
   "upload_modal.choose_image": "Escolher imagem",
   "upload_modal.description_placeholder": "Grave e cabisbaixo, o filho justo zelava pela querida mãe doente",
-  "upload_modal.detect_text": "Detectar texto na imagem",
+  "upload_modal.detect_text": "Detetar texto na imagem",
   "upload_modal.edit_media": "Editar media",
   "upload_modal.hint": "Clique ou arraste o círculo na pré-visualização para escolher o ponto focal que será sempre visível em todas as miniaturas.",
   "upload_modal.preparing_ocr": "A preparar o reconhecimento de caracteres (OCR)…",
diff --git a/config/locales/activerecord.pt-PT.yml b/config/locales/activerecord.pt-PT.yml
index ba738741f86776..60f3def5d325a7 100644
--- a/config/locales/activerecord.pt-PT.yml
+++ b/config/locales/activerecord.pt-PT.yml
@@ -6,7 +6,7 @@ pt-PT:
         expires_at: Prazo
         options: Escolhas
       user:
-        agreement: Acordo de serviço
+        agreement: Contrato de prestação de serviço
         email: Endereço de correio electrónico
         locale: Região
         password: Palavra-passe
@@ -19,7 +19,7 @@ pt-PT:
         account:
           attributes:
             username:
-              invalid: apenas letras, números e underscores
+              invalid: deve conter apenas letras, números e traços inferiores
               reserved: está reservado
         admin/webhook:
           attributes:
@@ -43,15 +43,15 @@ pt-PT:
               blocked: usa um fornecedor de e-mail que não é permitido
               unreachable: não parece existir
             role_id:
-              elevated: não pode ser maior que o da sua função atual
+              elevated: não pode ser superior à sua função atual
         user_role:
           attributes:
             permissions_as_keys:
               dangerous: incluir permissões que não são seguras para a função base
-              elevated: não pode incluir permissões que a sua função atual não possui
+              elevated: não pode incluir permissões que a sua função atual não possua
               own_role: não pode ser alterado com a sua função atual
             position:
-              elevated: não pode ser maior que o da sua função atual
+              elevated: não pode ser superior à sua função atual
               own_role: não pode ser alterado com a sua função atual
         webhook:
           attributes:
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 027d80215d18a0..7ab1b4f075f321 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -906,6 +906,7 @@ ar:
       moderation:
         title: الحالة
       newest: الأحدث
+      reset: إعادة التعيين
       review: حالة المراجعة
       search: البحث
       title: الوسوم
@@ -985,6 +986,7 @@ ar:
           other: مستخدَم من قِبل %{count} شخص خلال الأسبوع الماضي
           two: مستخدَم من قِبل %{count} شخصين خلال الأسبوع الماضي
           zero: مستخدَم من قِبل %{count} شخص خلال الأسبوع الماضي
+      title: التوصيات والرائجة
       trending: المتداولة
     warning_presets:
       add_new: إضافة واحد جديد
@@ -1141,8 +1143,10 @@ ar:
     security: الأمان
     set_new_password: إدخال كلمة مرور جديدة
     setup:
+      email_below_hint_html: قم بفحص مجلد البريد المزعج الخاص بك، أو قم بطلب آخر. يمكنك تصحيح عنوان بريدك الإلكتروني إن كان خاطئا.
       email_settings_hint_html: انقر على الرابط الذي أرسلناه لك للتحقق من %{email}. سننتظر هنا.
       link_not_received: ألم تحصل على رابط؟
+      new_confirmation_instructions_sent: سوف تتلقى رسالة بريد إلكتروني جديدة مع رابط التأكيد في غضون بضع دقائق!
       title: تحقَّق من بريدك الوارِد
     sign_in:
       preamble_html: قم بتسجيل الدخول باستخدام بيانات الاعتماد الخاصة بك على <strong>%{domain}</strong>. إن استُضيف حسابك على خادم مختلف عن هذا الخادم، لن تتمكن من الولوج هنا.
@@ -1153,7 +1157,9 @@ ar:
       title: دعنا نجهّز %{domain}.
     status:
       account_status: حالة الحساب
+      confirming: في انتظار اكتمال تأكيد البريد الإلكتروني.
       functional: حسابك يعمل بشكل كامل.
+      pending: إن طلبك قيد المراجعة من قبل فريقنا. قد يستغرق هذا بعض الوقت. سوف تتلقى بريدا إلكترونيا إذا تمت الموافقة على طلبك.
       redirecting_to: حسابك غير نشط لأنه تم تحويله حاليا إلى %{acct}.
       self_destruct: نظرًا لإغلاق %{domain}، ستحصل فقط على وصول محدود إلى حسابك.
       view_strikes: عرض العقوبات السابقة المُطَبَّقة ضد حسابك
@@ -1196,6 +1202,9 @@ ar:
       before: 'يرجى قراءة هذه الملاحظات بتأنّي قبل المواصلة:'
       caches: قد يبقى المحتوى الذي تم تخزينه مؤقتًا مِن طرف الخوادم الأخرى
       data_removal: سوف تُحذَف منشوراتك والبيانات الأخرى نهائيا
+      email_change_html: بإمكانك <a href="%{path}">تغيير عنوان بريدك الإلكتروني</a> دون أن يُحذف حسابك
+      email_contact_html: إن لم تتلقّ أي شيء ، يمكنك مراسلة <a href="mailto:%{email}">%{email}</a> لطلب المساعدة
+      email_reconfirmation_html: إن لم تتلقّ الرسالة الإلكترونية للتأكيد ، بإمكانك <a href="%{path}">إعادة طلبها ثانيةً</a>
       irreversible: لن يكون بإمكانك استرجاع أو إعادة تنشيط حسابك
       more_details_html: للمزيد مِن التفاصيل ، يرجى الإطلاع على <a href="%{terms_path}">سياسة الخصوصية</a>.
       username_available: سيصبح اسم مستخدمك متوفرا ثانية
@@ -1448,7 +1457,7 @@ ar:
       two: "%{count} استخدامات"
       zero: "%{count} استخدامات"
     max_uses_prompt: بلا حدود
-    prompt: توليد و مشاركة روابط للسماح للآخَرين بالنفاذ إلى مثيل الخادم هذا
+    prompt: توليد و مشاركة روابط للسماح للآخَرين النفاذ إلى هذا الخادم
     table:
       expires_at: تنتهي مدة صلاحيتها في
       uses: عدد الاستخدامات
@@ -1460,6 +1469,7 @@ ar:
     authentication_methods:
       otp: تطبيق المصادقة الثنائية
       password: كلمة المرور
+      sign_in_token: رمز الأمان للبريد الإلكتروني
       webauthn: مفاتيح الأمان
     description_html: إذا رأيت النشاط الذي لا تتعرف عليه، فكر في تغيير كلمة المرور الخاصة بك وتفعيل المصادقة ذات العاملين.
     empty: لا يوجد سجل مصادقة متاح
@@ -1553,6 +1563,7 @@ ar:
     update:
       subject: قام %{name} بتحرير منشور
   notifications:
+    administration_emails: إشعارات البريد الإلكتروني الإدارية
     email_events_hint: 'اختر الأحداث التي تريد أن تصِلَك اشعارات عنها:'
   number:
     human:
@@ -1811,13 +1822,13 @@ ar:
     keep_media: الاحتفاظ بالمنشورات ذات وسائط مرفقة
     keep_media_hint: لن تُحذف أي من منشوراتك التي تحتوي على وسائط مرفقة
     keep_pinned: الاحتفاظ بالمنشورات المثبتة
-    keep_pinned_hint: لم تقوم بحذف أي من مشاركتك المثبتة
+    keep_pinned_hint: لن تحذف أي من منشوراتك المثبتة
     keep_polls: الاحتفاظ باستطلاعات الرأي
     keep_polls_hint: لم تقم بحذف أي من استطلاعاتك
     keep_self_bookmark: احتفظ بالمنشورات التي أدرجتها في الفواصل المرجعية
-    keep_self_bookmark_hint: لم تقم بحذف مشاركاتك الخاصة إذا قمت بوضع علامة مرجعية عليها
+    keep_self_bookmark_hint: لن تحذف منشوراتك الخاصة إذا قمت بوضع علامة مرجعية عليها
     keep_self_fav: احتفظ بالمنشورات التي أدرجتها في المفضلة
-    keep_self_fav_hint: لم تقم بحذف مشاركاتك الخاصة إذا كنت قد فضلتهم
+    keep_self_fav_hint: لن تحذف منشوراتك الخاصة إذا كنت قد فضلتها
     min_age:
       '1209600': أسبوعان
       '15778476': 6 أشهر
@@ -1828,9 +1839,9 @@ ar:
       '63113904': سنتان
       '7889238': 3 أشهر
     min_age_label: عتبة العمر
-    min_favs: إبقاء المشاركات المفضلة أكثر من
+    min_favs: إبقاء المنشورات المفضلة على الأقل
     min_favs_hint: لن تُحذف أي من منشوراتك التي تلقّت على الأقل هذا العدد من المفضلات. اتركه فارغاً لحذف المنشورات مهما كان عدد المفضلات التي تلقتها
-    min_reblogs: إبقاء المنشورات المعاد نشرها أكثر من
+    min_reblogs: إبقاء المنشورات المعاد نشرها على الأقل
     min_reblogs_hint: لن تُحذف أي من منشوراتك التي أعيد مشاركتها أكثر من هذا العدد من المرات. اتركه فارغاً لحذف المنشورات بغض النظر عن عدد إعادات النشر
   stream_entries:
     sensitive_content: محتوى حساس
diff --git a/config/locales/devise.pt-PT.yml b/config/locales/devise.pt-PT.yml
index c66181fc5b8e3b..edfb798509a622 100644
--- a/config/locales/devise.pt-PT.yml
+++ b/config/locales/devise.pt-PT.yml
@@ -2,117 +2,117 @@
 pt-PT:
   devise:
     confirmations:
-      confirmed: O seu endereço correio electrónico foi correctamente confirmado.
-      send_instructions: Vais receber um e-mail com as instruções para confirmar o teu endereço de e-mail dentro de alguns minutos. Por favor, verifica a caixa de spam se não recebeu o e-mail.
-      send_paranoid_instructions: Se o teu endereço de e-mail já existir na nossa base de dados, vais receber um e-mail com as instruções de confirmação dentro de alguns minutos. Por favor, verifica a caixa de spam se não recebeu o e-mail.
+      confirmed: O seu endereço de e-mail foi corretamente confirmado.
+      send_instructions: Irá receber um e-mail com instruções sobre como confirmar o seu endereço de e-mail dentro de alguns minutos. Verifique a sua pasta de spam se não recebeu este e-mail.
+      send_paranoid_instructions: Se o seu endereço de e-mail existir na nossa base de dados, receberá um e-mail com instruções sobre como confirmar o seu endereço de e-mail dentro de alguns minutos. Verifique a sua pasta de spam se não recebeu este e-mail.
     failure:
-      already_authenticated: A tua sessão já está aberta.
-      inactive: A tua conta ainda não está ativada.
+      already_authenticated: Já tem sessão iniciada.
+      inactive: A sua conta ainda não está ativada.
       invalid: "%{authentication_keys} ou palavra-passe inválida."
       last_attempt: Tem só mais uma tentativa antes da sua conta ser bloqueada.
-      locked: A tua conta está bloqueada.
+      locked: A sua conta está bloqueada.
       not_found_in_database: "%{authentication_keys} ou palavra-passe inválida."
       omniauth_user_creation_failure: Erro ao criar uma conta para esta identidade.
       pending: A sua conta está ainda a aguardar revisão.
-      timeout: A tua sessão expirou. Por favor, entra de novo para continuares.
-      unauthenticated: Precisas de entrar na tua conta ou de te registares antes de continuar.
-      unconfirmed: Tens de confirmar o teu endereço de e-mail antes de continuar.
+      timeout: A sua sessão expirou. Inicie sessão novamente para continuar.
+      unauthenticated: É necessário iniciar sessão ou registar-se antes de continuar.
+      unconfirmed: Tem de confirmar o seu endereço de e-mail antes de continuar.
     mailer:
       confirmation_instructions:
         action: Verificar o endereço de e-mail
         action_with_app: Confirmar e regressar a %{app}
-        explanation: Criou uma conta em %{host} com este endereço de e-mail. Está a um clique de ativá-la. Se não foi você que fez este registo, por favor ignore esta mensagem.
+        explanation: Foi criada uma conta em %{host} com este endereço de e-mail. Está a um clique de ativá-la. Se não foi você que fez este registo, por favor ignore esta mensagem.
         explanation_when_pending: Candidatou-se com um convite para %{host} com este endereço de e-mail. Logo que confirme o seu endereço de e-mail, iremos rever a sua candidatura. Pode iniciar sessão para alterar os seus dados ou eliminar a sua conta, mas não poderá aceder à maioria das funções até que a sua conta seja aprovada. Se a sua inscrição for indeferida, os seus dados serão eliminados, pelo que não será necessária qualquer ação adicional da sua parte. Se não solicitou este convite, queira ignorar este e-mail.
-        extra_html: Por favor leia as <a href="%{terms_path}">regras da instância</a> e os <a href="%{policy_path}">nossos termos de serviço</a>.
-        subject: 'Mastodon: Instruções de confirmação %{instance}'
+        extra_html: Por favor leia as <a href="%{terms_path}">regras do servidor</a> e os <a href="%{policy_path}">nossos termos de serviço</a>.
+        subject: 'Mastodon: instruções de confirmação para %{instance}'
         title: Verificar o endereço de e-mail
       email_changed:
         explanation: 'O e-mail associado à sua conta será alterado para:'
-        extra: Se não alterou o seu e-mail, é possível que alguém tenha conseguido aceder à sua conta. Por favor altere a sua palavra-passe imediatamente ou entra em contacto com um administrador da instância se tiver ficado sem acesso à sua conta.
-        subject: 'Mastodon: E-mail alterado'
+        extra: Se não alterou o seu e-mail, é possível que alguém tenha conseguido aceder à sua conta. Por favor altere a sua palavra-passe imediatamente ou entre em contacto com um administrador do servidor se tiver ficado sem acesso à sua conta.
+        subject: 'Mastodon: e-mail alterado'
         title: Novo endereço de e-mail
       password_change:
-        explanation: A palavra-passe da tua conta foi alterada.
-        extra: Se não alterou a sua palavra-passe, é possível que alguém tenha conseguido aceder à sua conta. Por favor altere a sua palavra-passe imediatamente ou entre em contacto com um administrador da instância se tiver ficado sem acesso à sua conta.
+        explanation: A palavra-passe da sua conta foi alterada.
+        extra: Se não alterou a sua palavra-passe, é possível que alguém tenha conseguido aceder à sua conta. Por favor altere a sua palavra-passe imediatamente ou entre em contacto com um administrador do servidor se tiver ficado sem acesso à sua conta.
         subject: 'Mastodon: palavra-passe alterada'
         title: Palavra-passe alterada
       reconfirmation_instructions:
         explanation: Confirme o seu novo endereço para alterar o e-mail.
-        extra: Se esta mudança não foi iniciada por si, queira ignorar este e-mail. O endereço de correio electrónico da sua conta do Mastodon não irá mudar enquanto não aceder à hiperligação acima.
-        subject: 'Mastodon: Confirmação de e-mail %{instance}'
+        extra: Se esta alteração não foi iniciada por si, ignore este e-mail. O endereço de e-mail da conta Mastodon não será alterado até aceder à hiperligação acima.
+        subject: 'Mastodon: confirmação de e-mail para %{instance}'
         title: Validar o endereço de e-mail
       reset_password_instructions:
         action: Alterar palavra-passe
-        explanation: Pediste a alteração da palavra-passe da tua conta.
-        extra: Se não fez este pedido, queira ignorar este e-mail. A sua palavra-passe não irá mudar se não aceder à hiperligação acima e criar uma nova.
-        subject: 'Mastodon: Instruções para redefinir a palavra-passe'
+        explanation: Solicitou uma nova palavra-passe para a sua conta.
+        extra: Se não solicitou esta alteração, ignore este e-mail. A sua palavra-passe não será alterada até aceder à hiperligação acima e criar uma nova.
+        subject: 'Mastodon: instruções para redefinir a palavra-passe'
         title: Solicitar nova palavra-passe
       two_factor_disabled:
-        explanation: O acesso agora é possível usando apenas o endereço de correio eletrónico e palavra-passe.
-        subject: 'Mastodon: Autenticação de duas etapas desativada'
+        explanation: O início de sessão é agora possível utilizando apenas o endereço de e-mail e a palavra-passe.
+        subject: 'Mastodon: autenticação de duas etapas desativada'
         subtitle: A autenticação de dois fatores foi desativada para a sua conta.
         title: 2FA desativado
       two_factor_enabled:
-        explanation: Um token gerado pelo aplicativo TOTP emparelhado será necessário para login.
-        subject: 'Mastodon: Autenticação em duas etapas ativada'
-        subtitle: A autenticação de dois fatores foi habilitada para sua conta.
+        explanation: Para iniciar sessão, será necessário um token gerado pela aplicação TOTP emparelhada.
+        subject: 'Mastodon: autenticação em duas etapas ativada'
+        subtitle: A autenticação de dois fatores foi ativada para a sua conta.
         title: 2FA ativado
       two_factor_recovery_codes_changed:
-        explanation: Os códigos de recuperação anteriores foram invalidados e novos foram gerados.
-        subject: 'Mastodon: Gerados novos códigos de recuperação em duas etapas'
-        subtitle: Os códigos de recuperação anteriores foram invalidados e novos foram gerados.
+        explanation: Os códigos de recuperação anteriores foram invalidados e foram gerados novos códigos.
+        subject: 'Mastodon: gerados novos códigos de recuperação em duas etapas'
+        subtitle: Os códigos de recuperação anteriores foram invalidados e foram gerados novos códigos.
         title: Códigos de recuperação 2FA alterados
       unlock_instructions:
-        subject: 'Mastodon: Instruções para desbloquear a tua conta'
+        subject: 'Mastodon: instruções para desbloquear'
       webauthn_credential:
         added:
           explanation: A seguinte chave de segurança foi adicionada à sua conta
-          subject: 'Mastodon: Nova chave de segurança'
+          subject: 'Mastodon: nova chave de segurança'
           title: Foi adicionada uma nova chave de segurança
         deleted:
           explanation: A seguinte chave de segurança foi eliminada da sua conta
-          subject: 'Mastodon: Chave de segurança eliminada'
+          subject: 'Mastodon: chave de segurança eliminada'
           title: Uma das suas chaves de segurança foi eliminada
       webauthn_disabled:
         explanation: A autenticação com chaves de segurança foi desativada para sua conta.
-        extra: O login agora é possível usando apenas o token gerado pelo aplicativo TOTP emparelhado.
-        subject: 'Mastodon: Autenticação com chave de segurança desativada'
+        extra: O início de sessão é agora possível utilizando apenas o token gerado pela aplicação TOTP emparelhada.
+        subject: 'Mastodon: autenticação com chave de segurança desativada'
         title: Chaves de segurança desativadas
       webauthn_enabled:
-        explanation: A autenticação da chave de segurança foi habilitada para sua conta.
-        extra: Sua chave de segurança agora pode ser usada para login.
-        subject: 'Mastodon: Autenticação com chave de segurança ativada'
+        explanation: A autenticação por chave de segurança foi ativada para a sua conta.
+        extra: A sua chave de segurança pode agora ser utilizada para iniciar sessão.
+        subject: 'Mastodon: autenticação com chave de segurança ativada'
         title: Chaves de segurança ativadas
     omniauth_callbacks:
       failure: Não foi possível autenticar %{kind} porque "%{reason}".
       success: Autenticado correctamente na conta %{kind}.
     passwords:
-      no_token: Não pode aceder a esta página se não vier através da ligação enviada por e-mail para alteração da sua palavra-passe. Se de facto usou essa ligação para chegar até aqui, queira garantir de que usou o endereço URL completo.
-      send_instructions: Vai receber um e-mail com instruções para alterar a palavra-passe dentro de alguns minutos.
-      send_paranoid_instructions: Se o seu endereço de e-mail existir na nossa base de dados, dentro de alguns minutos irá receber uma ligação para recuperar a palavra-passe.
-      updated: A tua palavra-passe foi alterada. Estás agora autenticado na tua conta.
+      no_token: Não pode aceder a esta página se não vier através da hiperligação enviada por e-mail para alteração da sua palavra-passe. Se de facto usou essa hiperligação para chegar até aqui, verifique se usou o endereço URL completo.
+      send_instructions: Se o seu endereço de e-mail existir na nossa base de dados, receberá uma hiperligação de recuperação da palavra-passe no seu endereço de e-mail dentro de alguns minutos. Verifique a sua pasta de spam se não recebeu esta mensagem de correio eletrónico.
+      send_paranoid_instructions: Se o seu endereço de e-mail existir na nossa base de dados, receberá uma hiperligação de recuperação da palavra-passe no seu endereço de e-mail dentro de alguns minutos. Verifique a sua pasta de spam se não recebeu esta mensagem de correio eletrónico.
+      updated: A sua palavra-passe foi alterada com sucesso. Está agora autenticado.
       updated_not_active: A tua palavra-passe foi alterada.
     registrations:
-      destroyed: Adeus! A tua conta foi cancelada. Esperamos ver-te em breve.
-      signed_up: Seja bem-vindo! A sua conta foi correctamente registada.
-      signed_up_but_inactive: A tua conta foi registada. No entanto ainda não está activa.
-      signed_up_but_locked: A sua conta foi correctamente registada. Contudo, não pudemos iniciar sessão porque a sua conta está bloqueada.
-      signed_up_but_pending: Foi enviada uma hiperligação de confirmação para o seu correio electrónico. Só depois de clicar na hiperligação avaliaremos a sua inscrição. Será notificado caso a sua conta seja aprovada.
-      signed_up_but_unconfirmed: Foi enviada uma hiperligação de confirmação para o seu correio electrónico. Queira usar essa hiperligação para activar a sua conta.
-      update_needs_confirmation: Solicitou uma alteração da informação da sua conta, mas para tal é necessário confirmá-la. Queira ver o seu correio electrónico e seguir a hiperligação para a confirmar. Se não encontrar essa mensagem, veja se está na pasta de lixo electrónico.
-      updated: A sua conta foi correctamente actualizada.
+      destroyed: Adeus! A sua conta foi cancelada com sucesso. Esperamos voltar a vê-lo em breve.
+      signed_up: Bem-vindo! A sua conta foi registada com sucesso.
+      signed_up_but_inactive: Registou-se com sucesso. No entanto, não foi possível iniciar sessão porque a sua conta ainda não está ativada.
+      signed_up_but_locked: Registou-se com sucesso. No entanto, não foi possível iniciar sessão porque a sua conta está bloqueada.
+      signed_up_but_pending: Foi enviada uma mensagem com uma hiperligação de confirmação para o seu endereço de e-mail. Depois de clicar na hiperligação, analisaremos a sua candidatura. Será notificado se for aprovado.
+      signed_up_but_unconfirmed: Foi enviada para o seu endereço de e-mail uma mensagem com uma hiperligação de confirmação. Siga a hiperligação para ativar a sua conta. Verifique a sua pasta de spam se não recebeu esta mensagem de e-mail.
+      update_needs_confirmation: Atualizou a sua conta com sucesso, mas temos de verificar o seu novo endereço de e-mail. Verifique o seu e-mail e siga a hiperligação de confirmação para confirmar o seu novo endereço de e-mail. Verifique a sua pasta de spam se não recebeu esta mensagem de correio eletrónico.
+      updated: A sua conta foi corretamente atualizada.
     sessions:
       already_signed_out: Sessão encerrada.
       signed_in: Sessão iniciada.
       signed_out: Sessão encerrada.
     unlocks:
-      send_instructions: Dentro de alguns momentos, irá receber um e-mail com instruções para desbloquear a sua conta. Consulte a sua pasta de lixo electrónico se não o encontrar.
-      send_paranoid_instructions: Se a sua conta existir, dentro de momentos irá receber um e-mail com instruções para a desbloquear. Consulte a sua pasta de lixo electrónico se não o encontrar.
-      unlocked: A sua conta foi correctamente desbloqueada. Queira iniciar uma nova sessão para continuar.
+      send_instructions: Receberá um e-mail com instruções sobre como desbloquear a sua conta dentro de alguns minutos. Verifique a sua pasta de spam se não recebeu este e-mail.
+      send_paranoid_instructions: Se a sua conta existir, receberá um e-mail com instruções sobre como a desbloquear dentro de alguns minutos. Verifique a sua pasta de spam se não recebeu este e-mail.
+      unlocked: A sua conta foi desbloqueada com sucesso. Inicie sessão para continuar.
   errors:
     messages:
       already_confirmed: já confirmado, por favor tente iniciar sessão
-      confirmation_period_expired: tem de ser confirmado durante %{period}, por favor tenta outra vez
+      confirmation_period_expired: tem de ser confirmado dentro de %{period}, por favor tente outra vez
       expired: expirou, por favor tente outra vez
       not_found: não encontrado
       not_locked: não estava bloqueada
diff --git a/config/locales/doorkeeper.pt-PT.yml b/config/locales/doorkeeper.pt-PT.yml
index 30ea62d9eb5562..3b4439584b01c1 100644
--- a/config/locales/doorkeeper.pt-PT.yml
+++ b/config/locales/doorkeeper.pt-PT.yml
@@ -4,9 +4,9 @@ pt-PT:
     attributes:
       doorkeeper/application:
         name: Nome da aplicação
-        redirect_uri: URI de redireccionamento
+        redirect_uri: URI de redirecionamento
         scopes: Âmbitos
-        website: Página na teia da aplicação
+        website: Site da aplicação
     errors:
       models:
         doorkeeper/application:
@@ -31,11 +31,11 @@ pt-PT:
       form:
         error: Ups! Verifique que o formulário não tem erros
       help:
-        native_redirect_uri: Usa %{native_redirect_uri} para testes locais
-        redirect_uri: Utiliza uma linha por URI
-        scopes: Separe as esferas de acção com espaços. Deixe em branco para usar autorizações predefinidas.
+        native_redirect_uri: Usar %{native_redirect_uri} para testes locais
+        redirect_uri: Usar uma linha por URI
+        scopes: Separe os âmbitos de aplicação com espaços. Deixe em branco para utilizar os âmbitos de aplicação predefinidos.
       index:
-        application: Aplicações
+        application: Aplicação
         callback_url: URL de retorno
         delete: Eliminar
         empty: Não tem aplicações.
@@ -48,31 +48,31 @@ pt-PT:
         title: Nova aplicação
       show:
         actions: Ações
-        application_id: Id de Aplicação
-        callback_urls: Callback urls
-        scopes: Autorizações
+        application_id: Chave da aplicação
+        callback_urls: URLs de retorno
+        scopes: Âmbitos
         secret: Segredo
         title: 'Aplicação: %{name}'
     authorizations:
       buttons:
-        authorize: Autorize
-        deny: Não autorize
+        authorize: Autorizar
+        deny: Negar
       error:
         title: Ocorreu um erro
       new:
         prompt_html: "%{client_name} pretende ter permissão para aceder à sua conta. É uma aplicação de terceiros. <strong>Se não confia nesta aplicação, então não deve autorizá-la.</strong>"
         review_permissions: Rever permissões
-        title: Autorização é necessária
+        title: Autorização necessária
       show:
-        title: Copiar o código desta autorização e colar na aplicação.
+        title: Copie este código de autorização e cole-o na aplicação.
     authorized_applications:
       buttons:
         revoke: Revogar
       confirmations:
-        revoke: Tens a certeza?
+        revoke: Tem a certeza?
       index:
         authorized_at: Autorizado em %{date}
-        description_html: Estas são aplicações que podem aceder à sua conta utilizando a API. Se encontrar aqui aplicativos que não reconhece, ou um aplicativo está com mau funcionamento, pode revogar o seu acesso.
+        description_html: Estas são as aplicações que podem aceder à sua conta utilizando a API. Se houver aplicações que não reconhece aqui, ou se uma aplicação estiver a comportar-se mal, pode revogar o seu acesso.
         last_used_at: Última utilização em %{date}
         never_used: Nunca utilizado
         scopes: Permissões
@@ -81,15 +81,15 @@ pt-PT:
     errors:
       messages:
         access_denied: O proprietário do recurso ou servidor de autorização negou o pedido.
-        credential_flow_not_configured: As credenciais da palavra-passe do proprietário do recurso falhou devido a que Doorkeeper.configure.resource_owner_from_credentials não foram configuradas.
-        invalid_client: Autenticação do cliente falhou por causa de um cliente desconhecido, nenhum cliente de autenticação incluído ou método de autenticação não suportado.
+        credential_flow_not_configured: Falha no fluxo de credenciais da palavra-passe do proprietário do recurso porque Doorkeeper.configure.resource_owner_from_credentials não está configurado.
+        invalid_client: A autenticação do cliente falhou devido a cliente desconhecido, sem autenticação de cliente incluída ou método de autenticação não suportado.
         invalid_code_challenge_method: O método de validação do código tem de ser S256, o método simples não é suportado.
         invalid_grant: A concessão de autorização fornecida é inválida, expirou, foi revogada, não corresponde à URI de redirecionamento usada no pedido de autorização ou foi emitida para outro cliente.
         invalid_redirect_uri: A URI de redirecionamento incluída não é válida.
         invalid_request:
           missing_param: 'Parâmetro requerido em falta: %{value}.'
-          request_not_authorized: O pedido precisa ser autorizado. O parâmetro requerido para autorização da solicitação está ausente ou é inválido.
-          unknown: A solicitação não possui um parâmetro requerido, inclui um valor de parâmetro não suportado ou tem outro tipo de formato incorreto.
+          request_not_authorized: O pedido tem de ser autorizado. O parâmetro necessário para autorizar o pedido está em falta ou é inválido.
+          unknown: O pedido não tem um parâmetro obrigatório, inclui um valor de parâmetro não suportado ou está mal formado.
         invalid_resource_owner: As credenciais do proprietário do recurso não são válidas ou o proprietário do recurso não pode ser encontrado
         invalid_scope: O âmbito solicitado é inválido, desconhecido ou tem um formato incorreto.
         invalid_token:
@@ -98,7 +98,7 @@ pt-PT:
           unknown: O token de acesso é inválido
         resource_owner_authenticator_not_configured: A procura pelo proprietário do recurso falhou porque Doorkeeper.configure.resource_owner_authenticator não foi configurado.
         server_error: O servidor de autorização encontrou uma condição inesperada que impediu o cumprimento do pedido .
-        temporarily_unavailable: O servidor de autorização não é capaz de lidar com o pedido devido a uma sobrecarga ou mantenimento do servidor.
+        temporarily_unavailable: O servidor de autorização não pode atualmente tratar o pedido devido a uma sobrecarga temporária ou à manutenção do servidor.
         unauthorized_client: O cliente não está autorizado a realizar esta solicitação usando este método.
         unsupported_grant_type: O tipo de concessão de autorização não é suportado pelo servidor de autorização.
         unsupported_response_type: O servidor de autorização não suporta este tipo de resposta.
@@ -125,12 +125,12 @@ pt-PT:
         admin/reports: Administração de denúncias
         all: Acesso total à sua conta Mastodon
         blocks: Bloqueios
-        bookmarks: Itens Salvos
+        bookmarks: Marcadores
         conversations: Conversas
-        crypto: Encriptação ponta-a-ponta
+        crypto: Encriptação ponta a ponta
         favourites: Favoritos
         filters: Filtros
-        follow: A seguir, a silenciar, e a bloquear
+        follow: A seguir, a silenciar e a bloquear
         follows: Seguidores
         lists: Listas
         media: Anexos de media
@@ -139,7 +139,7 @@ pt-PT:
         profile: O seu perfil Mastodon
         push: Notificações push
         reports: Denúncias
-        search: Pesquisa
+        search: Pesquisar
         statuses: Publicações
     layouts:
       admin:
@@ -165,14 +165,14 @@ pt-PT:
       admin:write:email_domain_blocks: executar ações de moderação no bloqueio de domínios de e-mail
       admin:write:ip_blocks: executar ações de moderação no bloqueio de IPs
       admin:write:reports: executar ações de moderação em denúncias
-      crypto: usa encriptação ponta-a-ponta
-      follow: siga, bloqueie, desbloqueie, e deixa de seguir contas
-      profile: apenas ler as informações do perfil da sua conta
+      crypto: usar encriptação ponta a ponta
+      follow: alterar relações de conta
+      profile: ler apenas as informações do perfil da sua conta
       push: receber as suas notificações push
-      read: tenha acesso aos dados da tua conta
+      read: ler todos os dados da sua conta
       read:accounts: ver as informações da conta
       read:blocks: ver os seus bloqueios
-      read:bookmarks: ver os seus favoritos
+      read:bookmarks: ver os seus marcadores
       read:favourites: ver os seus favoritos
       read:filters: ver os seus filtros
       read:follows: ver quem você segue
@@ -181,18 +181,18 @@ pt-PT:
       read:notifications: ver as suas notificações
       read:reports: ver as suas denúncias
       read:search: pesquisar em seu nome
-      read:statuses: ver todos os estados
-      write: publique por ti
-      write:accounts: modificar o seu perfil
+      read:statuses: ver todas as publicações
+      write: alterar todos os dados da sua conta
+      write:accounts: alterar o seu perfil
       write:blocks: bloquear contas e domínios
-      write:bookmarks: estado dos favoritos
+      write:bookmarks: marcar publicações
       write:conversations: silenciar e eliminar conversas
-      write:favourites: assinalar como favoritas
+      write:favourites: favoritar publicações
       write:filters: criar filtros
       write:follows: seguir pessoas
       write:lists: criar listas
-      write:media: carregar arquivos de media
+      write:media: enviar ficheiros de media
       write:mutes: silenciar pessoas e conversas
       write:notifications: limpar as suas notificações
       write:reports: denunciar outras pessoas
-      write:statuses: publicar estado
+      write:statuses: publicar publicações
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index b43ec5d17268a4..86010b0665c224 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -343,7 +343,7 @@ gl:
       title: Emoticonas personalizadas
       uncategorized: Sen categoría
       unlist: Non listar
-      unlisted: Sen listar
+      unlisted: Fóra das listas
       update_failed_msg: Non foi posíbel actualizar a emoticona
       updated_msg: Actualizouse a emoticona de xeito correcto!
       upload: Subir
@@ -1756,7 +1756,7 @@ gl:
       private_long: Mostrar só as seguidoras
       public: Público
       public_long: Visible para calquera
-      unlisted: Sen listar
+      unlisted: Fóra das listas
       unlisted_long: Visible para calquera, pero non en cronoloxías públicas
   statuses_cleanup:
     enabled: Borrar automáticamente publicacións antigas
diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index 262063698b5370..1bd724595d1897 100644
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -12,8 +12,8 @@ pt-PT:
       one: Seguidor
       other: Seguidores
     following: A seguir
-    instance_actor_flash: Esta conta é um actor virtual usado para representar a própria instância e não um utilizador individual. É usada para motivos de federação e não deve ser suspenso.
-    last_active: última vez activo
+    instance_actor_flash: Esta conta é um ator virtual utilizado para representar o servidor em si e não um utilizador individual. É utilizada para efeitos de federação e não deve ser suspensa.
+    last_active: última atividade
     link_verified_on: A posse desta hiperligação foi verificada em %{date}
     nothing_here: Não há nada aqui!
     pin_errors:
@@ -25,19 +25,19 @@ pt-PT:
   admin:
     account_actions:
       action: Executar acção
-      title: Executar acção de moderação em %{acct}
+      title: Executar ação de moderação em %{acct}
     account_moderation_notes:
       create: Deixar uma nota
-      created_msg: Nota de moderação correctamente criada!
+      created_msg: Nota de moderação criada com sucesso!
       destroyed_msg: Nota de moderação destruída!
     accounts:
       approve: Aprovar
-      approved_msg: Inscrição de %{username} aprovada correctamente
+      approved_msg: Inscrição de %{username} aprovada com sucesso
       are_you_sure: Tens a certeza?
       avatar: Imagem de perfil
       by_domain: Domínio
       change_email:
-        changed_msg: Endereço de correio electrónico alterado!
+        changed_msg: E-mail alterado com sucesso!
         current_email: E-mail atual
         label: Alterar e-mail
         new_email: Novo e-mail
@@ -57,12 +57,12 @@ pt-PT:
       demote: Despromoveu
       destroyed_msg: Os dados de %{username} estão agora em fila de espera para serem eliminados de imediato
       disable: Congelar
-      disable_two_factor_authentication: Desactivar autenticação por dois factores (2FA)
+      disable_two_factor_authentication: Desativar autenticação por dois fatores (2FA)
       disabled: Congelada
       display_name: Nome a mostrar
       domain: Domínio
       edit: Editar
-      email: Correio electrónico
+      email: E-mail
       email_status: Estado do e-mail
       enable: Descongelar
       enabled: Ativado
@@ -86,7 +86,7 @@ pt-PT:
       memorialized: Em memória
       memorialized_msg: Conta %{username} transformada com sucesso em memorial
       moderation:
-        active: Activo
+        active: Ativo
         all: Todos
         disabled: Desativado
         pending: Pendente
@@ -94,7 +94,7 @@ pt-PT:
         suspended: Supensos
         title: Moderação
       moderation_notes: Notas de moderação
-      most_recent_activity: Actividade mais recente
+      most_recent_activity: Atividade mais recente
       most_recent_ip: IP mais recente
       no_account_selected: Nenhuma conta foi alterada porque nenhuma foi selecionada
       no_limits_imposed: Sem limites impostos
@@ -111,9 +111,9 @@ pt-PT:
       public: Público
       push_subscription_expires: A Inscrição PuSH expira
       redownload: Atualizar perfil
-      redownloaded_msg: Perfil de %{username} correctamente actualizado a partir da origem
+      redownloaded_msg: Perfil de %{username} atualizado a partir da origem com sucesso
       reject: Rejeitar
-      rejected_msg: Inscrição de %{username} correctamente rejeitada
+      rejected_msg: Inscrição de %{username} rejeitada com sucesso
       remote_suspension_irreversible: Os dados desta conta foram eliminados irreversivelmente.
       remote_suspension_reversible_hint_html: A conta foi suspensa no servidor de origem e os seus dados serão totalmente eliminados em %{date}. Até lá, o servidor de origem poderá recuperar esta conta sem quaisquer efeitos negativos. Se desejar eliminar todos os dados desta conta imediatamente, pode fazê-lo em baixo.
       remove_avatar: Remover a imagem de perfil
@@ -152,7 +152,7 @@ pt-PT:
       title: Contas
       unblock_email: Desbloquear endereço de e-mail
       unblocked_email_msg: Endereço de e-mail de %{username} desbloqueado
-      unconfirmed_email: Correio electrónico por confirmar
+      unconfirmed_email: E-mail por confirmar
       undo_sensitized: Desmarcar como problemático
       undo_silenced: Desfazer silenciar
       undo_suspension: Desfazer supensão
@@ -226,7 +226,7 @@ pt-PT:
         create_account_warning_html: "%{name} enviou um aviso para %{target}"
         create_announcement_html: "%{name} criou o novo anúncio %{target}"
         create_custom_emoji_html: "%{name} carregou o novo emoji %{target}"
-        create_domain_allow_html: "%{name} habilitou a federação com o domínio %{target}"
+        create_domain_allow_html: "%{name} permitiu a federação com o domínio %{target}"
         create_domain_block_html: "%{name} bloqueou o domínio %{target}"
         create_ip_block_html: "%{name} criou regra para o IP %{target}"
         create_unavailable_domain_html: "%{name} parou a entrega ao domínio %{target}"
@@ -244,7 +244,7 @@ pt-PT:
         disable_2fa_user_html: "%{name} desativou o requerimento de autenticação em dois passos para o utilizador %{target}"
         disable_custom_emoji_html: "%{name} desabilitou o emoji %{target}"
         disable_user_html: "%{name} desativou o acesso para o utilizador %{target}"
-        enable_custom_emoji_html: "%{name} habilitou o emoji %{target}"
+        enable_custom_emoji_html: "%{name} ativou o emoji %{target}"
         enable_user_html: "%{name} ativou o acesso para o utilizador %{target}"
         memorialize_account_html: "%{name} transformou a conta de %{target} em um memorial"
         promote_user_html: "%{name} promoveu o utilizador %{target}"
@@ -276,22 +276,22 @@ pt-PT:
       title: Registo de auditoria
       unavailable_instance: "(nome de domínio indisponível)"
     announcements:
-      destroyed_msg: Comunicado correctamente eliminado!
+      destroyed_msg: Comunicado eliminado com sucesso!
       edit:
         title: Editar comunicado
       empty: Nenhum comunicado encontrado.
-      live: Em directo
+      live: Em direto
       new:
         create: Criar comunicado
         title: Novo comunicado
       publish: Publicar
-      published_msg: Comunicado correctamente publicado!
+      published_msg: Comunicado publicado com sucesso!
       scheduled_for: Agendado para %{time}
       scheduled_msg: Comunicado agendado para publicação!
       title: Comunicados
       unpublish: Anular publicação
-      unpublished_msg: Comunicado correctamente retirado de publicação!
-      updated_msg: Comunicado correctamente actualizado!
+      unpublished_msg: Comunicado corretamente retirado de publicação!
+      updated_msg: Comunicado atualizado com sucesso!
     critical_update_pending: Atualização crítica pendente
     custom_emojis:
       assign_category: Atribuir categoria
@@ -319,16 +319,16 @@ pt-PT:
       not_permitted: Não está autorizado a executar esta ação
       overwrite: Escrever por cima
       shortcode: Código de atalho
-      shortcode_hint: Pelo menos 2 caracteres, apenas caracteres alfanuméricos e underscores
+      shortcode_hint: Pelo menos 2 caracteres, apenas caracteres alfanuméricos e traços inferiores
       title: Emojis personalizados
       uncategorized: Não categorizados
       unlist: Não listar
       unlisted: Não inventariado
       update_failed_msg: Não foi possível atualizar esse emoji
-      updated_msg: Emoji correctamente actualizado!
+      updated_msg: Emoji atualizado com sucesso!
       upload: Enviar
     dashboard:
-      active_users: utilizadores activos
+      active_users: utilizadores ativos
       interactions: interações
       media_storage: Armazenamento de media
       new_users: novos utilizadores
@@ -350,8 +350,8 @@ pt-PT:
       sources: Origem de inscrições
       space: Utilização do espaço
       title: Painel de controlo
-      top_languages: Principais idiomas activos
-      top_servers: Servidores mais activos
+      top_languages: Principais idiomas ativos
+      top_servers: Servidores mais ativos
       website: Página na teia
     disputes:
       appeals:
@@ -359,7 +359,7 @@ pt-PT:
         title: Recursos
     domain_allows:
       add_new: Permitir federação com o domínio
-      created_msg: Permissão correctamente atribuída para federação
+      created_msg: O domínio foi autorizado com êxito para a federação
       destroyed_msg: Revogada a permissão de federação para o domínio
       export: Exportar
       import: Importar
@@ -385,14 +385,14 @@ pt-PT:
       import: Importar
       new:
         create: Criar bloqueio
-        hint: O bloqueio por domínio não vai prevenir a criação de contas na base de dados, mas irá retroactiva e automaticamente aplicar certos métodos de moderação nessas contas.
+        hint: O bloqueio do domínio não impedirá a criação de registos de contas na base de dados, mas aplicará retroativamente e automaticamente métodos de moderação específicos a essas contas.
         severity:
           desc_html: "<strong>Limitar</strong> tornará as mensagens das contas neste domínio invisíveis a qualquer pessoa que não as esteja a seguir. <strong>Suspender</strong> removerá do seu servidor todo o conteúdo, media, e dados de perfil das contas deste domínio. Utilize <strong>Nenhum</strong> se apenas quiser rejeitar ficheiros media."
           noop: Nenhum
           silence: Limitar
           suspend: Suspender
         title: Novo bloqueio de domínio
-      no_domain_block_selected: Nenhum bloqueio de domínio foi alterado, pois nenhum foi seleccionado
+      no_domain_block_selected: Nenhum bloqueio de domínio foi alterado pois nenhum foi selecionado
       not_permitted: Não está autorizado a executar esta ação
       obfuscate: Ofuscar nome de domínio
       obfuscate_hint: Ofuscar parcialmente o nome de domínio na lista, caso estejam definidas limitações na publicação da lista de domínios
@@ -527,7 +527,7 @@ pt-PT:
       title: Convites
     ip_blocks:
       add_new: Criar regra
-      created_msg: Nova regra de IP correctamente adicionada
+      created_msg: Nova regra de IP corretamente adicionada
       delete: Eliminar
       expires_in:
         '1209600': 2 semanas
@@ -547,15 +547,15 @@ pt-PT:
       delete: Eliminar
       description_html: Um <strong>repetidor de federação</strong> é um servidor intermediário que troca grandes volumes de publicações públicas entre instâncias que o subscrevem e publicam. <strong>Ele pode ajudar pequenas e medias instâncias a descobrir conteúdo do fediverso</strong> que, de outro modo, exigiria que os utilizadores locais seguissem manualmente outras pessoas em instâncias remotas.
       disable: Desativar
-      disabled: Desactivado
-      enable: Activar
+      disabled: Desativado
+      enable: Ativar
       enable_hint: Uma vez ativado, a tua instância irá assinar todas as publicações deste repetidor e irá começar a enviar as suas publicações públicas para lá.
       enabled: Ativado
       inbox_url: URL do repetidor
       pending: À espera da aprovação do repetidor
       save_and_enable: Guardar e ativar
       setup: Configurar uma ligação ao repetidor
-      signatures_not_enabled: Os repetidores não funcionarão correctamente enquanto o modo seguro ou o modo de lista branca estiverem activados
+      signatures_not_enabled: Os repetidores não funcionarão corretamente enquanto o modo seguro ou o modo de lista branca estiverem ativados
       status: Estado
       title: Retransmissores
     report_notes:
@@ -618,27 +618,27 @@ pt-PT:
       reported_by: Denunciado por
       reported_with_application: Reportado com a aplicação
       resolved: Resolvido
-      resolved_msg: Denúncia correctamente resolvida!
+      resolved_msg: Denúncia resolvida com sucesso!
       skip_to_actions: Passar para as ações
       status: Estado
       statuses: Conteúdo denunciado
       statuses_description_html: O conteúdo ofensivo será citado na comunicação com a conta denunciada
       summary:
         action_preambles:
-          delete_html: 'Você está prestes a <strong>remover</strong> algumas das publicações de <strong>@%{acct}</strong>. Isto irá:'
-          mark_as_sensitive_html: 'Você está prestes a <strong>marcar</strong> alguns dos posts de <strong>@%{acct}</strong>como <strong>sensível</strong>. Isto irá:'
-          silence_html: 'Você está prestes a <strong>limitar a conta do</strong> <strong>@%{acct}</strong>. Isto irá:'
-          suspend_html: 'Você está prestes a <strong>suspender a conta de</strong> <strong>@%{acct}</strong>. Isto irá:'
+          delete_html: 'Está prestes a <strong>remover</strong> algumas das publicações de <strong>@%{acct}</strong>. Isto irá:'
+          mark_as_sensitive_html: 'Está prestes a <strong>marcar</strong> algumas das publicações de <strong>@%{acct}</strong>como <strong>sensível</strong>. Isto irá:'
+          silence_html: 'Está prestes a <strong>limitar a conta de</strong> <strong>@%{acct}</strong>. Isto irá:'
+          suspend_html: 'Está prestes a <strong>suspender a conta de</strong> <strong>@%{acct}</strong>. Isto irá:'
         actions:
           delete_html: Excluir as publicações ofensivas
           mark_as_sensitive_html: Marcar a mídia dos posts ofensivos como sensível
           silence_html: Limitar firmemente o alcance de <strong>@%{acct}</strong>, tornando seus perfis e conteúdos apenas visíveis para pessoas que já os estão seguindo ou olhando manualmente no perfil
-          suspend_html: Suspender <strong>@%{acct}</strong>, tornando seu perfil e conteúdo inacessíveis e impossível de interagir com
+          suspend_html: Suspender <strong>@%{acct}</strong>, tornando seu perfil e conteúdo inacessíveis e impossível de interagir
         close_report: 'Marcar relatório #%{id} como resolvido'
-        close_reports_html: Marcar <strong>todos os</strong> relatórios contra <strong>@%{acct}</strong> como resolvidos
-        delete_data_html: Excluir <strong>@%{acct}</strong>perfil e conteúdo 30 dias a menos que sejam dessuspensos
+        close_reports_html: Marcar <strong>todas as</strong> denúncias contra <strong>@%{acct}</strong> como resolvidas
+        delete_data_html: Eliminar o perfil de <strong>@%{acct}</strong> e conteúdos daqui a 30 dias, a menos que entretanto sejam suspensos
         preview_preamble_html: "<strong>@%{acct}</strong> receberá um aviso com o seguinte conteúdo:"
-        record_strike_html: Registre um ataque contra <strong>@%{acct}</strong> para ajudá-lo a escalar futuras violações desta conta
+        record_strike_html: Registar um ataque contra <strong>@%{acct}</strong> para ajudar a escalar futuras violações desta conta
         warning_placeholder: Argumentos adicionais opcionais para a acção de moderação.
       target_origin: Origem da conta denunciada
       title: Denúncias
@@ -693,7 +693,7 @@ pt-PT:
         manage_settings: Gerir Configurações
         manage_settings_description: Permite aos utilizadores alterar as configurações do sítio na teia
         manage_taxonomies: Gerir Taxonomias
-        manage_taxonomies_description: 'Permite aos utilizadores avaliar o conteúdo em alta e atualizar as configurações de #etiquetas'
+        manage_taxonomies_description: Permite aos utilizadores rever o conteúdo em tendência e atualizar as configurações de hashtag
         manage_user_access: Gerir Acesso de Utilizador
         manage_users: Gerir Utilizadores
         manage_users_description: Permite aos utilizadores ver os detalhes de outros utilizadores e executar ações de moderação contra eles
@@ -743,13 +743,13 @@ pt-PT:
         publish_discovered_servers: Publicar servidores descobertos
         publish_statistics: Publicar estatísticas
         title: Descobrir
-        trends: Em alta
+        trends: Tendências
       domain_blocks:
         all: Para toda a gente
         disabled: Para ninguém
         users: Para utilizadores locais que se encontrem autenticados
       registrations:
-        moderation_recommandation: Por favor, certifique-se de que você tem uma equipe de moderação adequada e reativa antes de abrir os registros para todos!
+        moderation_recommandation: Certifique-se de que dispõe de uma equipa de moderação adequada e reativa antes de abrir as inscrições a todos!
         preamble: Controle quem pode criar uma conta no seu servidor.
         title: Inscrições
       registrations_mode:
@@ -757,7 +757,7 @@ pt-PT:
           approved: Registo sujeito a aprovação
           none: Ninguém se pode registar
           open: Qualquer pessoa se pode registar
-        warning_hint: Recomendamos o uso de "Aprovação necessária para se cadastrar", a menos que você esteja confiante de que sua equipe de moderação pode lidar com spam e registros maliciosos em tempo hábil.
+        warning_hint: Recomendamos a utilização de “É necessária aprovação para o registo”, a menos que esteja confiante de que a sua equipa de moderação pode tratar o spam e os registos maliciosos de forma atempada.
       security:
         authorized_fetch: Exigir autenticação de servidores federados
         authorized_fetch_hint: Exigir autenticação de servidores federados permite uma aplicação mais rigorosa de bloqueios tanto ao nível do utilizador como do servidor. No entanto, isso é feito à custa de uma diminuição de desempenho, reduz o alcance das suas respostas e pode introduzir problemas de compatibilidade com alguns serviços federados. Além disso, isso não impede os atores mais empenhados de aceder às suas publicações e contas públicas.
@@ -766,7 +766,7 @@ pt-PT:
       title: Definições do servidor
     site_uploads:
       delete: Eliminar arquivo carregado
-      destroyed_msg: Envio de sítio na teia correctamente eliminado!
+      destroyed_msg: Envio do site eliminado com sucesso!
     software_updates:
       critical_update: Crítico — por favor, atualize rapidamente
       documentation_link: Saber mais
@@ -800,7 +800,7 @@ pt-PT:
       reblogs: Re-publicacões
       status_changed: Publicação alterada
       title: Estado das contas
-      trending: Em alta
+      trending: Em tendência
       visibility: Visibilidade
       with_media: Com media
     strikes:
@@ -823,7 +823,7 @@ pt-PT:
       elasticsearch_health_yellow:
         message_html: O cluster elasticsearch não está de boa saúde (estado amarelo), pode querer investigar o motivo
       elasticsearch_index_mismatch:
-        message_html: Os mapeamentos elasticsearch estão desatualizados. Por favor, execute <code>tootctl search deploy --only=%{value}</code>
+        message_html: Os mapeamentos de índice Elasticsearch estão desatualizados. Execute <code>tootctl search deploy --only=%{value}</code>
       elasticsearch_preset:
         action: Ver a documentação
         message_html: O seu cluster elasticsearch tem mais de um nó, mas o Mastodon não está configurado para os usar.
@@ -831,9 +831,9 @@ pt-PT:
         action: Ver documentação
         message_html: O seu cluster elasticsearch tem apenas um nó, <code>ES_PRESET</code> deve ser configurado para <code>single_node_cluster</code>.
       elasticsearch_reset_chewy:
-        message_html: O seu índice de sistema elasticsearch está desatualizado devido a uma mudança de configuração. Por favor, execute <code>tootctl search deploy --reset-chewy</code> para o atualizar.
+        message_html: O seu índice de sistema Elasticsearch está desatualizado devido a uma mudança de configuração. Execute <code>tootctl search deploy --reset-chewy</code> para o atualizar.
       elasticsearch_running_check:
-        message_html: Não foi possível conectar ao Elasticsearch. Por favor, verifique se está em execução, ou desabilite a pesquisa de texto completo
+        message_html: Não foi possível conectar ao Elasticsearch. Verifique se está em execução ou desative a pesquisa de texto completo
       elasticsearch_version_check:
         message_html: 'Versão de Elasticsearch incompatível: %{value}'
         version_comparison: A versão de Elasticsearch %{running_version} está em execução. No entanto, é obrigatória a versão %{required_version}
@@ -872,14 +872,14 @@ pt-PT:
       review: Estado da revisão
       search: Pesquisar
       title: Hashtags
-      updated_msg: 'Definições de #etiquetas correctamente actualizadas'
+      updated_msg: 'Definições de #etiquetas atualizadas com sucesso'
     title: Administração
     trends:
       allow: Permitir
       approved: Aprovado
       disallow: Não permitir
       links:
-        allow: Permitir ligação
+        allow: Permitir hiperligação
         allow_provider: Permitir editor
         description_html: Estas são as ligações que presentemente estão a ser muito partilhadas por contas visíveis pelo seu servidor. Estas podem ajudar os seus utilizador a descobrir o que está a acontecer no mundo. Nenhuma ligação é exibida publicamente até que o editor a aprove. Também pode permitir ou rejeitar ligações em avulso.
         disallow: Não permitir ligação
@@ -890,15 +890,15 @@ pt-PT:
         shared_by_over_week:
           one: Partilhado por uma pessoa na última semana
           other: Partilhado por %{count} pessoas na última semana
-        title: Ligações em alta
+        title: Hiperligações em tendência
         usage_comparison: Partilhado %{today} vezes hoje, em comparação com %{yesterday} ontem
       not_allowed_to_trend: Não permitido para tendência
       only_allowed: Apenas permitidos
       pending_review: Pendente de revisão
       preview_card_providers:
-        allowed: Ligações deste editor poderão vir a ficar em alta
+        allowed: As hiperligações deste editor podem ser tendência
         description_html: Estes são os domínios a partir dos quais ligações são frequentemente partilhadas no seu servidor. As suas ligações não serão colocadas em alta a menos que o seu domínio de origem seja aprovado. A sua aprovação (ou rejeição) estende-se a subdomínios.
-        rejected: Ligações deste editor não serão postas em alta
+        rejected: As hiperligações deste editor não podem ser tendência
         title: Editores
       rejected: Rejeitado
       statuses:
@@ -907,18 +907,18 @@ pt-PT:
         description_html: Estas são publicações que o seu servidor conhece e que atualmente estão a ser frequentemente partilhadas e adicionadas aos favoritos. Isto pode ajudar os seus utilizadores, novos e retornados, a encontrar mais pessoas para seguir. Nenhuma publicação será exibida publicamente até que aprove o autor, e o autor permita que a sua conta seja sugerida a outros. Você também pode permitir ou rejeitar publicações individualmente.
         disallow: Não permitir publicação
         disallow_account: Não permitir autor
-        no_status_selected: Nenhuma publicação em alta foi alterada, pois nenhuma foi selecionada
+        no_status_selected: Não foram alteradas quaisquer publicações de tendências, uma vez que nenhuma foi selecionada
         not_discoverable: O autor optou por não permitir que a sua conta seja sugerida a outros
         shared_by:
           one: Partilhado ou adicionado aos marcadores uma vez
           other: Partilhado e adicionado aos marcadores %{friendly_count} vezes
-        title: Publicações em alta
+        title: Publicações em tendência
       tags:
         current_score: Pontuação atual %{score}
         dashboard:
           tag_accounts_measure: utilizadores únicos
           tag_languages_dimension: Idiomas mais populares
-          tag_servers_dimension: Topo de servidores
+          tag_servers_dimension: Servidores mais populares
           tag_servers_measure: servidores diferentes
           tag_uses_measure: utilizações totais
         description_html: 'Estas são as #etiquetas que aparecem atualmente com frequência em publicações visíveis pelo seu servidor. Isto pode ajudar os seus utilizadores a descobrir o que está ser mais falado no momento. Nenhuma #etiqueta será exibida publicamente até que a aprove.'
@@ -928,15 +928,16 @@ pt-PT:
         not_trendable: Não aparecerá nas tendências
         not_usable: Não pode ser utilizada
         peaked_on_and_decaying: Máximo em %{date}, agora a decair
-        title: Etiquetas em alta
-        trendable: Pode aparecer em alta
-        trending_rank: 'Em alta #%{rank}'
+        title: Etiquetas em tendência
+        trendable: Pode aparecer nas tendências
+        trending_rank: 'Tendência #%{rank}'
         usable: Pode ser utilizada
         usage_comparison: Utilizada %{today} vezes hoje, em comparação com %{yesterday} ontem
         used_by_over_week:
           one: Utilizada por uma pessoa na última semana
           other: Utilizada por %{count} pessoas na última semana
-      trending: Em alta
+      title: Recomendações e tendências
+      trending: Em tendência
     warning_presets:
       add_new: Adicionar novo
       delete: Eliminar
@@ -946,13 +947,13 @@ pt-PT:
     webhooks:
       add_new: Adicionar endpoint
       delete: Eliminar
-      description_html: Um <strong>webhook</strong> possibilita que o Mastodon envie <strong>notificações em tempo real</strong> de eventos seleccionados, para uma aplicação sua, de modo que esta possa <strong>espoletar ações automaticamente</strong>.
+      description_html: Um <strong>webhook</strong> possibilita que o Mastodon envie <strong>notificações em tempo real</strong> de eventos selecionados, para uma aplicação sua, de modo que esta possa <strong>despoletar ações automaticamente</strong>.
       disable: Desativar
       disabled: Desativado
       edit: Editar endpoint
       empty: Não tem ainda qualquer endpoint de webhook configurado.
       enable: Ativar
-      enabled: Activo
+      enabled: Ativo
       enabled_events:
         one: 1 evento ativado
         other: "%{count} eventos ativados"
@@ -993,18 +994,18 @@ pt-PT:
       body: Foram lançadas novas versões do Mastodon, talvez queira atualizar!
       subject: Estão disponíveis novas versões do Mastodon para %{instance}!
     new_trends:
-      body: 'Os seguintes itens precisam ser revistos antes de poderem ser exibidos publicamente:'
+      body: 'Os seguintes itens necessitam de uma revisão antes de poderem ser apresentados publicamente:'
       new_trending_links:
-        title: Ligações em alta
+        title: Hiperligações em tendência
       new_trending_statuses:
-        title: Publicações em alta
+        title: Publicações em tendência
       new_trending_tags:
-        title: Etiquetas em alta
+        title: Etiquetas em tendência
       subject: Novas tendências para revisão em %{instance}
   aliases:
     add_new: Criar pseudónimo
     created_msg: Criou com sucesso um novo pseudónimo. Pode agora iniciar a migração da conta antiga.
-    deleted_msg: O pseudónimo foi correctamente eliminado. Não será mais possível migrar a partir dessa conta.
+    deleted_msg: O pseudónimo foi removido com êxito. Deixará de ser possível passar dessa conta para esta.
     empty: Não tem pseudónimos.
     hint_html: Se quiser mudar de outra conta para esta, pode criar aqui um pseudónimo, que é necessário antes de poder prosseguir com a migração de seguidores da conta antiga para esta. Esta ação por si só é <strong>inofensiva e reversível</strong>. <strong>A migração da conta é iniciada a partir da conta antiga</strong>.
     remove: Desvincular pseudónimo
@@ -1026,8 +1027,8 @@ pt-PT:
     view_profile: Ver perfil
     view_status: Ver publicação
   applications:
-    created: Aplicação correctamente criada
-    destroyed: Aplicação correctamente eliminada
+    created: Aplicação criada com sucesso
+    destroyed: Aplicação eliminada com sucesso
     logout: Sair
     regenerate_token: Regenerar token de acesso
     token_regenerated: Token de acesso regenerado com sucesso
@@ -1036,7 +1037,7 @@ pt-PT:
   auth:
     apply_for_account: Solicitar uma conta
     captcha_confirmation:
-      help_html: Se tiver problemas a resolver o CAPTCHA, pode entrar em contacto conosco através de %{email} e poderemos ajudá-lo.
+      help_html: Se tiver problemas a resolver o CAPTCHA, pode entrar em contacto connosco através de %{email} e poderemos ajudá-lo.
       hint_html: Só mais uma coisa! Precisamos confirmar que você é um humano (isto para que possamos evitar spam!). Resolva o CAPTCHA abaixo e clique em "Continuar".
       title: Verificação de segurança
     confirmations:
@@ -1138,7 +1139,7 @@ pt-PT:
     confirm_password: Insira sua palavra-passe atual para verificar a sua identidade
     confirm_username: Insira seu nome de utilizador para confirmar o procedimento
     proceed: Eliminar conta
-    success_msg: A sua conta foi correctamente eliminada
+    success_msg: A sua conta foi eliminada com sucesso
     warning:
       before: 'Antes de continuar, por favor leia cuidadosamente estas notas:'
       caches: O conteúdo que foi armazenado em cache por outras instâncias pode perdurar
@@ -1335,11 +1336,11 @@ pt-PT:
       muting: Importando contas silenciadas
     type: Tipo de importação
     type_groups:
-      constructive: Seguidores e Marcadores
+      constructive: Seguidores e marcadores
       destructive: Bloqueios e silenciamentos
     types:
       blocking: Lista de bloqueio
-      bookmarks: Itens salvos
+      bookmarks: Marcadores
       domain_blocking: Lista de domínios bloqueados
       following: Lista de pessoas que estás a seguir
       lists: Listas
@@ -1395,7 +1396,7 @@ pt-PT:
     acct: Mudou-se para
     cancel: Cancelar redirecionamento
     cancel_explanation: Cancelar o redirecionamento irá reativar a sua conta atual, mas não trará de volta os seguidores que foram migrados para essa conta.
-    cancelled_msg: Cancelou correctamente o redireccionamento.
+    cancelled_msg: Cancelou corretamente o redirecionamento.
     errors:
       already_moved: é a mesma conta para a qual já migrou
       missing_also_known_as: não é um pseudónimo dessa conta
@@ -1405,13 +1406,13 @@ pt-PT:
     followers_count: Seguidores no momento da migração
     incoming_migrations: A migrar de uma conta diferente
     incoming_migrations_html: Para migrar de outra conta para esta, primeiro você precisa <a href="%{path}">criar um pseudónimo</a>.
-    moved_msg: A sua conta está agora a ser redireccionada para %{acct} e os seus seguidores estão a ser transferidos.
+    moved_msg: A sua conta está agora a ser redirecionada para %{acct} e os seus seguidores estão a ser transferidos.
     not_redirecting: A sua conta não está atualmente a ser redirecionada para nenhuma outra conta.
     on_cooldown: Migrou recentemente a sua conta. Esta função ficará disponível novamente em %{count} dias.
     past_migrations: Migrações anteriores
     proceed_with_move: Migrar seguidores
-    redirected_msg: A sua conta está agora a ser redireccionada para %{acct}.
-    redirecting_to: A sua conta está a ser redireccionada para %{acct}.
+    redirected_msg: A sua conta está agora a ser redirecionada para %{acct}.
+    redirecting_to: A sua conta está a ser redirecionada para %{acct}.
     set_redirect: Definir redirecionamento
     warning:
       backreference_required: A nova conta deve primeiro ser configurada para que esta seja referenciada
@@ -1419,7 +1420,7 @@ pt-PT:
       cooldown: Após a migração, há um período de tempo de espera durante o qual não poderá voltar a migrar
       disabled_account: Posteriormente, a sua conta atual não será totalmente utilizável. No entanto, continuará a ter acesso à exportação de dados, bem como à reativação.
       followers: Esta ação irá migrar todos os seguidores da conta atual para a nova conta
-      only_redirect_html: Em alternativa, pode <a href="%{path}">apenas colocar um redireccionamento no seu perfil</a>.
+      only_redirect_html: Em alternativa, pode <a href="%{path}">apenas colocar um redirecionamento no seu perfil</a>.
       other_data: Nenhum outro dado será migrado automaticamente
       redirect: O perfil da sua conta atual será atualizado com um aviso de redirecionamento e será excluído das pesquisas
   moderation:
@@ -1546,7 +1547,7 @@ pt-PT:
     remove_selected_follows: Deixar de seguir os utilizadores selecionados
     status: Estado da conta
   remote_follow:
-    missing_resource: Não foi possível encontrar o URL de redireccionamento para a sua conta
+    missing_resource: Não foi possível encontrar o URL de redirecionamento para a sua conta
   reports:
     errors:
       invalid_rules: não faz referência a regras válidas
@@ -1639,7 +1640,7 @@ pt-PT:
       user_domain_block: Bloqueou %{target_name}
     lost_followers: Seguidores perdidos
     lost_follows: Pessoas que segue perdidas
-    preamble: Pode perder seguidores e pessoas que segue quando bloqueia um domínio ou quando os seus moderadores decidem suspender um servidor remoto. Quando isso acontecer, poderá descarregar listas de relações cessadas, para serem inspeccionadas e possivelmente importadas para outro servidor.
+    preamble: Pode perder seguidores e pessoas que segue quando bloqueia um domínio ou quando os seus moderadores decidem suspender um servidor remoto. Quando isso acontecer, poderá descarregar listas de relações cortadas, para serem inspecionadas e possivelmente importadas para outro servidor.
     purged: Informações sobre este servidor foram purgadas pelos administradores do seu servidor.
     type: Evento
   statuses:
@@ -1706,8 +1707,8 @@ pt-PT:
     keep_pinned_hint: Não apagar nenhuma das suas publicações afixadas
     keep_polls: Manter sondagens
     keep_polls_hint: Não apaga nenhuma das suas sondagens
-    keep_self_bookmark: Manter as publicações que guardou
-    keep_self_bookmark_hint: Não apaga as suas próprias publicações se as tiver guardado
+    keep_self_bookmark: Manter as publicações que marcou
+    keep_self_bookmark_hint: Não elimina as suas próprias publicações se as tiver nos marcadores
     keep_self_fav: Manter as publicações que marcou
     keep_self_fav_hint: Não apaga as suas próprias publicações se as tiver marcado
     min_age:
@@ -1852,8 +1853,8 @@ pt-PT:
         one: "%{people} pessoa nos últimos 2 dias"
         other: "%{people} pessoas nos últimos 2 dias"
       hashtags_subtitle: Explore o que está em tendência desde os últimos 2 dias
-      hashtags_title: Trending hashtags
-      hashtags_view_more: Ver mais hashtags em alta
+      hashtags_title: Etiquetas em tendência
+      hashtags_view_more: Ver mais etiquetas em tendência
       post_action: Compor
       post_step: Diga olá para o mundo com texto, fotos, vídeos ou enquetes.
       post_title: Faça a sua primeira publicação
@@ -1874,7 +1875,7 @@ pt-PT:
     extra_instructions_html: <strong>Dica:</strong> A ligação no seu site pode ser invisível. A parte importante é <code>rel="me"</code> que impede a personificação em sites com conteúdo gerado pelo utilizador. Pode até utilizar uma etiqueta <code>link</code> no cabeçalho da página ao invés de <code>a</code>, mas o HTML deve ser acessível sem executar JavaScript.
     here_is_how: Veja como
     hint_html: "<strong>Verificar a sua identidade no Mastodon é para todos.</strong> Baseado em normas públicas da web, agora e para sempre gratuitas. Tudo o que precisa é de um site pessoal pelo qual as pessoas o reconheçam. Quando coloca no seu perfil uma ligação para esse site, vamos verificar que o site tem uma ligação de volta para o seu perfil e mostrar um indicador visual."
-    instructions_html: Copie e cole o código abaixo no HTML do seu site. Em seguida, adicione o endereço do seu site em um dos campos extras no seu perfil, na aba "Editar perfil" e salve as alterações.
+    instructions_html: Copie e cole o código abaixo no HTML do seu site. Em seguida, adicione o endereço do seu site num dos campos extras no seu perfil, na aba "Editar perfil" e guarde as alterações.
     verification: Verificação
     verified_links: As suas ligações verificadas
   webauthn_credentials:
diff --git a/config/locales/simple_form.ar.yml b/config/locales/simple_form.ar.yml
index e552b42b187080..81be19a44e7b8a 100644
--- a/config/locales/simple_form.ar.yml
+++ b/config/locales/simple_form.ar.yml
@@ -206,7 +206,7 @@ ar:
         setting_aggregate_reblogs: جمّع المنشورات المعاد نشرها في الخيوط الزمنية
         setting_always_send_emails: ارسل إشعارات البريد الإلكتروني دائماً
         setting_auto_play_gif: تشغيل تلقائي لِوَسائط جيف المتحركة
-        setting_boost_modal: إظهار مربع حوار التأكيد قبل إعادة مشاركة أي منشور
+        setting_boost_modal: إظهار مربع حوار التأكيد قبل إعادة نشر أي منشور
         setting_default_language: لغة النشر
         setting_default_privacy: خصوصية المنشور
         setting_default_sensitive: اعتبر الوسائط دائما كمحتوى حساس
diff --git a/config/locales/simple_form.pt-PT.yml b/config/locales/simple_form.pt-PT.yml
index a76076a5cbc6ee..25348f27701f8f 100644
--- a/config/locales/simple_form.pt-PT.yml
+++ b/config/locales/simple_form.pt-PT.yml
@@ -52,7 +52,7 @@ pt-PT:
         locale: O idioma da interface de utilizador, e-mails e notificações push
         password: Use pelo menos 8 caracteres
         phrase: Será correspondido independentemente da capitalização ou do aviso de conteúdo duma publicação
-        scopes: Quais as API a que será concedido acesso. Se escolher uma abrangência de nível superior, não precisará de as seleccionar individualmente.
+        scopes: Quais as API a que a aplicação terá permissão para aceder. Se selecionar um âmbito de nível superior, não precisa de selecionar âmbitos individuais.
         setting_aggregate_reblogs: Não mostrar novos reforços de publicações recentemente reforçadas (só afecta publicações acabadas de reforçar)
         setting_always_send_emails: Normalmente as notificações por e-mail não serão enviadas quando estiver a utilizar ativamente o Mastodon
         setting_default_sensitive: Media problemática oculta por padrão, pode ser revelada com um clique
@@ -81,7 +81,7 @@ pt-PT:
         backups_retention_period: Os utilizadores têm a possibilidade de gerar arquivos das suas mensagens para descarregar mais tarde. Quando definido para um valor positivo, estes arquivos serão automaticamente eliminados do seu armazenamento após o número de dias especificado.
         bootstrap_timeline_accounts: Estas contas serão destacadas no topo das recomendações aos novos utilizadores.
         closed_registrations_message: Apresentado quando as inscrições estiverem encerradas
-        content_cache_retention_period: Todas as publicações de outros servidores (incluindo boosts e respostas) serão eliminadas após o número de dias especificado, independentemente de qualquer interação do utilizador local com essas publicações. Isto inclui publicações em que um utilizador local as tenha marcado como favoritas ou adicionado aos items salvos. As menções privadas entre utilizadores de instâncias diferentes também se perderão e serão impossíveis de restaurar. A utilização desta definição destina-se a instâncias para fins especiais e quebra muitas expectativas dos utilizadores quando implementada para utilização geral.
+        content_cache_retention_period: Todas as publicações de outros servidores (incluindo boosts e respostas) serão eliminadas após o número de dias especificado, independentemente de qualquer interação do utilizador local com essas publicações. Isto inclui publicações em que um utilizador local as tenha marcado ou favoritado. As menções privadas entre utilizadores de instâncias diferentes também se perderão e serão impossíveis de restaurar. A utilização desta definição destina-se a instâncias para fins especiais e quebra muitas expectativas dos utilizadores quando implementada para utilização geral.
         custom_css: Pode aplicar estilos personalizados na versão web do Mastodon.
         favicon: WEBP, PNG, GIF ou JPG. Substitui o ícone de favorito padrão do Mastodon por um ícone personalizado.
         mascot: Sobrepõe-se à ilustração na interface web avançada.
@@ -99,9 +99,9 @@ pt-PT:
         theme: Tema que os visitantes e os novos utilizadores veem.
         thumbnail: Uma imagem de cerca de 2:1, apresentada ao lado da informação do seu servidor.
         timeline_preview: Os visitantes sem sessão iniciada poderão consultar as publicações públicas mais recentes disponíveis no servidor.
-        trendable_by_default: Ignorar a revisão manual do conteúdo em alta. Elementos em avulso poderão ainda assim ser retirados das tendências mesmo após a sua apresentação.
-        trends: As publicações em alta mostram quais as publicações, etiquetas e notícias que estão a ganhar destaque no seu servidor.
-        trends_as_landing_page: Mostrar conteúdo de tendências para usuários logados e visitantes em vez de uma descrição deste servidor. Requer que as tendências sejam ativadas.
+        trendable_by_default: Ignorar a revisão manual do conteúdo de tendências. Os itens individuais ainda podem ser removidos das tendências após a apresentação.
+        trends: As tendências mostram quais as publicações, etiquetas e notícias que estão a ganhar destaque no seu servidor.
+        trends_as_landing_page: Mostrar conteúdo de tendências a utilizadores e visitantes com sessão terminada em vez de uma descrição deste servidor. Requer que as tendências estejam ativadas.
       form_challenge:
         current_password: Está a entrar numa área segura
       imports:
@@ -129,7 +129,7 @@ pt-PT:
       tag:
         name: Só pode alterar a capitalização das letras, por exemplo, para torná-las mais legíveis
       user:
-        chosen_languages: Quando seleccionado, só serão mostradas nas cronologias públicas as publicações nos idiomas escolhidos
+        chosen_languages: Quando selecionado, só serão mostradas nas cronologias públicas as publicações nos idiomas escolhidos
         role: A função controla que permissões o utilizador tem
       user_role:
         color: Cor a ser utilizada para a função em toda a interface de utilizador, como RGB no formato hexadecimal
@@ -222,7 +222,7 @@ pt-PT:
         setting_reduce_motion: Reduz movimento em animações
         setting_system_font_ui: Usar o tipo de letra padrão do sistema
         setting_theme: Tema do sítio
-        setting_trends: Mostrar o que está hoje em alta
+        setting_trends: Mostrar as tendências de hoje
         setting_unfollow_modal: Solicitar confirmação antes de deixar de seguir alguém
         setting_use_blurhash: Mostrar gradientes coloridos para medias ocultas
         setting_use_pending_items: Modo lento
@@ -253,7 +253,7 @@ pt-PT:
         mascot: Mascote personalizada (legado)
         media_cache_retention_period: Período de retenção de ficheiros de media em cache
         peers_api_enabled: Publicar lista de servidores descobertos na API
-        profile_directory: Habilitar diretório de perfis
+        profile_directory: Ativar o diretório de perfis
         registrations_mode: Quem se pode inscrever
         require_invite_text: Requerer uma razão para entrar
         show_domain_blocks: Mostrar domínios bloqueados
@@ -268,8 +268,8 @@ pt-PT:
         theme: Tema predefinido
         thumbnail: Miniatura do servidor
         timeline_preview: Permitir acesso não autenticado às cronologias públicas
-        trendable_by_default: Permitir publicações em alta sem revisão prévia
-        trends: Activar publicações em alta
+        trendable_by_default: Permitir tendências sem revisão prévia
+        trends: Ativar tendências
         trends_as_landing_page: Usar tendências como página inicial
       interactions:
         must_be_follower: Bloquear notificações de não-seguidores
@@ -303,7 +303,7 @@ pt-PT:
           label: Está disponível uma nova versão do Mastodon
           none: Nunca notificar atualizações (não recomendado)
           patch: Notificar sobre atualizações de correções de problemas
-        trending_tag: Uma nova publicação em alta requer avaliação
+        trending_tag: Uma nova publicação em tendência requer revisão
       rule:
         hint: Informação Adicional
         text: Regra
@@ -313,7 +313,7 @@ pt-PT:
       tag:
         listable: Permitir que esta etiqueta apareça em pesquisas e no diretório de perfis
         name: Etiqueta
-        trendable: Permitir que esta etiqueta apareça em alta
+        trendable: Permitir que esta etiqueta apareça nas tendências
         usable: Permitir que as publicações usem esta hashtag localmente
       user:
         role: Cargo

From b265a654d74f649b6a58debe39a439cc9b07b730 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 5 Sep 2024 11:46:11 +0200
Subject: [PATCH 2105/2191] Fix wrong width on content warnings and filters in
 web UI (#31761)

---
 app/javascript/styles/mastodon/components.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index d892c008bc23b6..2fc195a3bdc559 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -10916,6 +10916,7 @@ noscript {
 }
 
 .content-warning {
+  box-sizing: border-box;
   background: rgba($ui-highlight-color, 0.05);
   color: $secondary-text-color;
   border-top: 1px solid;

From ba9fd1c32e760582041758105b2844debed640a3 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 5 Sep 2024 05:48:33 -0400
Subject: [PATCH 2106/2191] Add coverage for `Account#prepare_contents`
 callback (#31748)

---
 spec/models/account_spec.rb | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb
index 27707fa897e3d1..1e8e4b1e4d35de 100644
--- a/spec/models/account_spec.rb
+++ b/spec/models/account_spec.rb
@@ -723,6 +723,30 @@
     end
   end
 
+  describe '#prepare_contents' do
+    subject { Fabricate.build :account, domain: domain, note: '  padded note  ', display_name: '  padded name  ' }
+
+    context 'with local account' do
+      let(:domain) { nil }
+
+      it 'strips values' do
+        expect { subject.valid? }
+          .to change(subject, :note).to('padded note')
+          .and(change(subject, :display_name).to('padded name'))
+      end
+    end
+
+    context 'with remote account' do
+      let(:domain) { 'host.example' }
+
+      it 'preserves values' do
+        expect { subject.valid? }
+          .to not_change(subject, :note)
+          .and(not_change(subject, :display_name))
+      end
+    end
+  end
+
   describe 'Normalizations' do
     describe 'username' do
       it { is_expected.to normalize(:username).from(" \u3000bob \t \u00a0 \n ").to('bob') }

From f9712fad1b62e93961280243970c6ccff4d3e3ff Mon Sep 17 00:00:00 2001
From: James May <fowl2@users.noreply.github.com>
Date: Thu, 5 Sep 2024 19:48:42 +1000
Subject: [PATCH 2107/2191] Direct link to each authorized_application entry
 with html anchor (#31677)

Co-authored-by: Matt Jankowski <matt@jankowski.online>
---
 app/views/oauth/authorized_applications/index.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/oauth/authorized_applications/index.html.haml b/app/views/oauth/authorized_applications/index.html.haml
index b6819bbd72518f..eb544d079b5728 100644
--- a/app/views/oauth/authorized_applications/index.html.haml
+++ b/app/views/oauth/authorized_applications/index.html.haml
@@ -7,7 +7,7 @@
 
 .applications-list
   - @applications.each do |application|
-    .applications-list__item
+    .applications-list__item{ id: dom_id(application) }
       - if application.website.present?
         = link_to application.name, application.website, target: '_blank', rel: 'noopener noreferrer', class: 'announcements-list__item__title'
       - else

From bd8cd0c6e746356eea83ffc4d3185a51e4eeb5dc Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 5 Sep 2024 09:50:38 +0000
Subject: [PATCH 2108/2191] Update dependency cssnano to v7.0.6 (#31757)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 110 +++++++++++++++++++++++++++---------------------------
 1 file changed, 55 insertions(+), 55 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index c77ebfa4444f19..1b3a7f1e4072e1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6717,26 +6717,26 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cssnano-preset-default@npm:^7.0.5":
-  version: 7.0.5
-  resolution: "cssnano-preset-default@npm:7.0.5"
+"cssnano-preset-default@npm:^7.0.6":
+  version: 7.0.6
+  resolution: "cssnano-preset-default@npm:7.0.6"
   dependencies:
     browserslist: "npm:^4.23.3"
     css-declaration-sorter: "npm:^7.2.0"
     cssnano-utils: "npm:^5.0.0"
-    postcss-calc: "npm:^10.0.1"
+    postcss-calc: "npm:^10.0.2"
     postcss-colormin: "npm:^7.0.2"
-    postcss-convert-values: "npm:^7.0.3"
-    postcss-discard-comments: "npm:^7.0.2"
+    postcss-convert-values: "npm:^7.0.4"
+    postcss-discard-comments: "npm:^7.0.3"
     postcss-discard-duplicates: "npm:^7.0.1"
     postcss-discard-empty: "npm:^7.0.0"
     postcss-discard-overridden: "npm:^7.0.0"
-    postcss-merge-longhand: "npm:^7.0.3"
-    postcss-merge-rules: "npm:^7.0.3"
+    postcss-merge-longhand: "npm:^7.0.4"
+    postcss-merge-rules: "npm:^7.0.4"
     postcss-minify-font-values: "npm:^7.0.0"
     postcss-minify-gradients: "npm:^7.0.0"
     postcss-minify-params: "npm:^7.0.2"
-    postcss-minify-selectors: "npm:^7.0.3"
+    postcss-minify-selectors: "npm:^7.0.4"
     postcss-normalize-charset: "npm:^7.0.0"
     postcss-normalize-display-values: "npm:^7.0.0"
     postcss-normalize-positions: "npm:^7.0.0"
@@ -6750,10 +6750,10 @@ __metadata:
     postcss-reduce-initial: "npm:^7.0.2"
     postcss-reduce-transforms: "npm:^7.0.0"
     postcss-svgo: "npm:^7.0.1"
-    postcss-unique-selectors: "npm:^7.0.2"
+    postcss-unique-selectors: "npm:^7.0.3"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/ffa7c6fa16c6ad98b7732fc563de74d492e6ad6d243a9f00431c0cbdbc576bcd49226d2695d881465d32dea0a2916add40ac10e7560dd7b5de9fd0fa25ee081b
+  checksum: 10c0/5c827a9f6b35475267af0512d55f569994b8334eb06565498daa2070ef52f0cdd2013f5efc1cbc0b4664370f491b0080f93c8ee56a7730d38fdf451fb65b030c
   languageName: node
   linkType: hard
 
@@ -6767,14 +6767,14 @@ __metadata:
   linkType: hard
 
 "cssnano@npm:^7.0.0":
-  version: 7.0.5
-  resolution: "cssnano@npm:7.0.5"
+  version: 7.0.6
+  resolution: "cssnano@npm:7.0.6"
   dependencies:
-    cssnano-preset-default: "npm:^7.0.5"
+    cssnano-preset-default: "npm:^7.0.6"
     lilconfig: "npm:^3.1.2"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/cb43ed964787dca33efb44d8f4fea8a49c495db44d1d12940493f0dd5d63db78e01c5b140fe42b480b332733602a25f4c85186d00977eb3070b29f7422761985
+  checksum: 10c0/19ff09931a1531e7c0c0d8928da554d99213aa0bb1f3b93cc6b4987727d60a8cd5537b113a5cf4f95cc1db65bba3f2b35476bd63bb57e7469d4eab73e07d736d
   languageName: node
   linkType: hard
 
@@ -13278,15 +13278,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-calc@npm:^10.0.1":
-  version: 10.0.1
-  resolution: "postcss-calc@npm:10.0.1"
+"postcss-calc@npm:^10.0.2":
+  version: 10.0.2
+  resolution: "postcss-calc@npm:10.0.2"
   dependencies:
-    postcss-selector-parser: "npm:^6.1.1"
+    postcss-selector-parser: "npm:^6.1.2"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.38
-  checksum: 10c0/5e38cc6f082f87e82067497b41684410784223ecd3701bf52242ea9f2f467f1fad6b5a561f8aa3be307d89435b4060f58aeb27c4064003586daf653cc4d91fef
+  checksum: 10c0/f57c9db7a7a2f3a0cdf45990089c051248d995bb2b9d1bd1fcd1634507851e92ea85bbc71a3594e359e9e9287ba0a820c90d6d292126a4b735cda364a86ce9cf
   languageName: node
   linkType: hard
 
@@ -13354,15 +13354,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-convert-values@npm:^7.0.3":
-  version: 7.0.3
-  resolution: "postcss-convert-values@npm:7.0.3"
+"postcss-convert-values@npm:^7.0.4":
+  version: 7.0.4
+  resolution: "postcss-convert-values@npm:7.0.4"
   dependencies:
     browserslist: "npm:^4.23.3"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/dbb6278bd8d8b11e448933d823426c883bff3f6abeaa23c7530cc4668b9da6f714e073840f280273f8a14022c3a99eb461ec732f7539e062b32f5281e1be6526
+  checksum: 10c0/9839b29f7c638672115c9fef5ed7df016aa43ea9dd42a4a2ace16e6a49c75246d2c19f3e03a6409ed3bc7c2fa4de6203bf5789cef8268c76618326b68e3bc591
   languageName: node
   linkType: hard
 
@@ -13420,14 +13420,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-discard-comments@npm:^7.0.2":
-  version: 7.0.2
-  resolution: "postcss-discard-comments@npm:7.0.2"
+"postcss-discard-comments@npm:^7.0.3":
+  version: 7.0.3
+  resolution: "postcss-discard-comments@npm:7.0.3"
   dependencies:
-    postcss-selector-parser: "npm:^6.1.1"
+    postcss-selector-parser: "npm:^6.1.2"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/c01632e643b6ec1f61ad59efe06a9e8dfc7fcedeb1551ae48fc33fa801353f6222e31954286cd97171c694f34c2b4c7f7a2213fd0f913e37c34d0353258ed234
+  checksum: 10c0/7700c8fb9a83c6ea5cc784267b9afd6e2968fda0358d583af5913baa28dfc91b0f2a4bd0b2bd62a86ebcb8dadb2547e287beae25b5a097e21c1f723367ccf112
   languageName: node
   linkType: hard
 
@@ -13572,29 +13572,29 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-merge-longhand@npm:^7.0.3":
-  version: 7.0.3
-  resolution: "postcss-merge-longhand@npm:7.0.3"
+"postcss-merge-longhand@npm:^7.0.4":
+  version: 7.0.4
+  resolution: "postcss-merge-longhand@npm:7.0.4"
   dependencies:
     postcss-value-parser: "npm:^4.2.0"
-    stylehacks: "npm:^7.0.3"
+    stylehacks: "npm:^7.0.4"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/b968c3d16f3edc6075b20219a1165c089dc454a6a42951dcdfc94adb932fb96ef7bcd465c6cd21b0e5b55ac08921355ddbbbc7cdcf87a345e4bef8b3cdd2e7e9
+  checksum: 10c0/6f50f7775dd361f83daf1acb3e0001d700ed2b7b9bea02df172143adc7fa196ce9209c9e482010ce36fd704512433b62692c5ab2eef5226db71ea3e694654dc7
   languageName: node
   linkType: hard
 
-"postcss-merge-rules@npm:^7.0.3":
-  version: 7.0.3
-  resolution: "postcss-merge-rules@npm:7.0.3"
+"postcss-merge-rules@npm:^7.0.4":
+  version: 7.0.4
+  resolution: "postcss-merge-rules@npm:7.0.4"
   dependencies:
     browserslist: "npm:^4.23.3"
     caniuse-api: "npm:^3.0.0"
     cssnano-utils: "npm:^5.0.0"
-    postcss-selector-parser: "npm:^6.1.1"
+    postcss-selector-parser: "npm:^6.1.2"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/3cd20484ab6d15c62eded408248d5eeaba52a573935943f933865680e070a0e75b3a7447802c575bc86e1fae667cf51d9d5766537835d9b8c090337b5adf928e
+  checksum: 10c0/fffdcef4ada68e92ab8e6dc34a3b9aa2b87188cd4d08f5ba0ff2aff7e3e3c7f086830748ff64db091b5ccb9ac59ac37cfaab1268ed3efb50ab9c4f3714eb5f6d
   languageName: node
   linkType: hard
 
@@ -13635,15 +13635,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-minify-selectors@npm:^7.0.3":
-  version: 7.0.3
-  resolution: "postcss-minify-selectors@npm:7.0.3"
+"postcss-minify-selectors@npm:^7.0.4":
+  version: 7.0.4
+  resolution: "postcss-minify-selectors@npm:7.0.4"
   dependencies:
     cssesc: "npm:^3.0.0"
-    postcss-selector-parser: "npm:^6.1.1"
+    postcss-selector-parser: "npm:^6.1.2"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/5211f63a1672f646a1bab57bd8eac0816d42adacb5e286ad5e6e342a795bb0d086bd6044a1b338311ca28f33f2c1833165ee611eaa671287379821ba3c5d68ad
+  checksum: 10c0/212b8f3d62eb2a27ed57d4e76b75b0886806ddb9e2497c0bb79308fa75dabaaaa4ed2b97734896e87603272d05231fd74aee2c256a48d77aa468b5b64cc7866a
   languageName: node
   linkType: hard
 
@@ -14004,7 +14004,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-selector-parser@npm:^6.0.13, postcss-selector-parser@npm:^6.0.2, postcss-selector-parser@npm:^6.0.4, postcss-selector-parser@npm:^6.1.0, postcss-selector-parser@npm:^6.1.1, postcss-selector-parser@npm:^6.1.2":
+"postcss-selector-parser@npm:^6.0.13, postcss-selector-parser@npm:^6.0.2, postcss-selector-parser@npm:^6.0.4, postcss-selector-parser@npm:^6.1.0, postcss-selector-parser@npm:^6.1.2":
   version: 6.1.2
   resolution: "postcss-selector-parser@npm:6.1.2"
   dependencies:
@@ -14026,14 +14026,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-unique-selectors@npm:^7.0.2":
-  version: 7.0.2
-  resolution: "postcss-unique-selectors@npm:7.0.2"
+"postcss-unique-selectors@npm:^7.0.3":
+  version: 7.0.3
+  resolution: "postcss-unique-selectors@npm:7.0.3"
   dependencies:
-    postcss-selector-parser: "npm:^6.1.1"
+    postcss-selector-parser: "npm:^6.1.2"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/cc54c57cd1c5a6e3e166ec63cc036d9e2df80b05e508d9ce754ca4193bf8c1bfcc16b3c6f0d81b8352a3282201d249b90bb87abacfcfb9065c9e3705ea5d110e
+  checksum: 10c0/2eb90eb0745d1e29d411ea5108f1cd9737de5b8f739cabc717074872bc4015950c9963f870b23b33b9ef45e7887eecfe5560cffee56616d4e0b8d0fac4f7cb10
   languageName: node
   linkType: hard
 
@@ -16551,15 +16551,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"stylehacks@npm:^7.0.3":
-  version: 7.0.3
-  resolution: "stylehacks@npm:7.0.3"
+"stylehacks@npm:^7.0.4":
+  version: 7.0.4
+  resolution: "stylehacks@npm:7.0.4"
   dependencies:
     browserslist: "npm:^4.23.3"
-    postcss-selector-parser: "npm:^6.1.1"
+    postcss-selector-parser: "npm:^6.1.2"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/5030334b06ef705b5700444dab120b540b09159e935e75b60f25bd56db1d85f0d11755f0b0f64ce3f12c5a72ff1b6f57fea49c26d18eb0de2334d6a143b94f8d
+  checksum: 10c0/b4d0b280ba274503ecc04111cc11c713e0d65db079fbcd8b42d6350be1cca20e28611eddee93b419aa208176a0d3a5fff83d83ef958d1876713809b6a2787c0c
   languageName: node
   linkType: hard
 

From 8fd3e37747b6cdde100bae33ac5d84f3255c24ce Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 5 Sep 2024 06:20:27 -0400
Subject: [PATCH 2109/2191] Update `parser` and `rubocop` gems (#31760)

---
 .rubocop_todo.yml |  5 +----
 Gemfile.lock      | 13 +++++--------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 09acb795bf26cb..a6e51d6aee1c7e 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config --auto-gen-only-exclude --no-offense-counts --no-auto-gen-timestamp`
-# using RuboCop version 1.65.0.
+# using RuboCop version 1.66.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -35,7 +35,6 @@ Rails/OutputSafety:
 # Configuration parameters: AllowedVars.
 Style/FetchEnvVar:
   Exclude:
-    - 'app/lib/redis_configuration.rb'
     - 'app/lib/translation_service.rb'
     - 'config/environments/production.rb'
     - 'config/initializers/2_limited_federation_mode.rb'
@@ -44,7 +43,6 @@ Style/FetchEnvVar:
     - 'config/initializers/devise.rb'
     - 'config/initializers/paperclip.rb'
     - 'config/initializers/vapid.rb'
-    - 'lib/mastodon/redis_config.rb'
     - 'lib/tasks/repo.rake'
 
 # This cop supports safe autocorrection (--autocorrect).
@@ -93,7 +91,6 @@ Style/OptionalBooleanParameter:
     - 'app/services/fetch_resource_service.rb'
     - 'app/workers/domain_block_worker.rb'
     - 'app/workers/unfollow_follow_worker.rb'
-    - 'lib/mastodon/redis_config.rb'
 
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: EnforcedStyle.
diff --git a/Gemfile.lock b/Gemfile.lock
index a533b662411414..c70823d0513e9e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -584,7 +584,7 @@ GEM
     ostruct (0.6.0)
     ox (2.14.18)
     parallel (1.26.3)
-    parser (3.3.4.2)
+    parser (3.3.5.0)
       ast (~> 2.4.1)
       racc
     parslet (2.0.0)
@@ -698,8 +698,7 @@ GEM
     responders (3.1.1)
       actionpack (>= 5.2)
       railties (>= 5.2)
-    rexml (3.3.6)
-      strscan
+    rexml (3.3.7)
     rotp (6.3.0)
     rouge (4.3.0)
     rpam2 (4.0.2)
@@ -735,18 +734,17 @@ GEM
       rspec-mocks (~> 3.0)
       sidekiq (>= 5, < 8)
     rspec-support (3.13.1)
-    rubocop (1.65.1)
+    rubocop (1.66.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.4, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.31.1, < 2.0)
+      rubocop-ast (>= 1.32.2, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.32.1)
+    rubocop-ast (1.32.3)
       parser (>= 3.3.1.0)
     rubocop-capybara (2.21.0)
       rubocop (~> 1.41)
@@ -826,7 +824,6 @@ GEM
     stringio (3.1.1)
     strong_migrations (2.0.0)
       activerecord (>= 6.1)
-    strscan (3.1.0)
     swd (1.3.0)
       activesupport (>= 3)
       attr_required (>= 0.0.5)

From 5b1ae15a368aa800fd045d6e3b6a7500c7196889 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 5 Sep 2024 13:06:05 +0200
Subject: [PATCH 2110/2191] Update docker.io/ruby Docker tag to v3.3.5 (#31758)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index cd555f7027d018..c7c02d9b467ef9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,7 +12,7 @@ ARG BUILDPLATFORM=${BUILDPLATFORM}
 
 # Ruby image to use for base image, change with [--build-arg RUBY_VERSION="3.3.x"]
 # renovate: datasource=docker depName=docker.io/ruby
-ARG RUBY_VERSION="3.3.4"
+ARG RUBY_VERSION="3.3.5"
 # # Node version to use in base image, change with [--build-arg NODE_MAJOR_VERSION="20"]
 # renovate: datasource=node-version depName=node
 ARG NODE_MAJOR_VERSION="20"

From e820cc30b8798c1d9e30d4e780c511b5ab395345 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 5 Sep 2024 07:54:27 -0400
Subject: [PATCH 2111/2191] Convert invites controller spec to system/request
 specs (#31755)

---
 app/views/invites/_invite.html.haml           |  2 +-
 spec/controllers/invites_controller_spec.rb   | 84 ------------------
 spec/requests/invites_spec.rb                 | 31 +++++++
 .../support/matchers/private_cache_control.rb | 14 +++
 spec/system/invites_spec.rb                   | 86 +++++++++++++++++++
 spec/system/tags_spec.rb                      |  3 +
 6 files changed, 135 insertions(+), 85 deletions(-)
 delete mode 100644 spec/controllers/invites_controller_spec.rb
 create mode 100644 spec/requests/invites_spec.rb
 create mode 100644 spec/support/matchers/private_cache_control.rb
 create mode 100644 spec/system/invites_spec.rb

diff --git a/app/views/invites/_invite.html.haml b/app/views/invites/_invite.html.haml
index 94e1a7112561ea..892fdc5a0e38af 100644
--- a/app/views/invites/_invite.html.haml
+++ b/app/views/invites/_invite.html.haml
@@ -1,4 +1,4 @@
-%tr
+%tr{ id: dom_id(invite) }
   %td
     .input-copy
       .input-copy__wrapper
diff --git a/spec/controllers/invites_controller_spec.rb b/spec/controllers/invites_controller_spec.rb
deleted file mode 100644
index 192c5b00ba86e7..00000000000000
--- a/spec/controllers/invites_controller_spec.rb
+++ /dev/null
@@ -1,84 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-RSpec.describe InvitesController do
-  render_views
-
-  let(:user) { Fabricate(:user) }
-
-  before do
-    sign_in user
-  end
-
-  describe 'GET #index' do
-    before do
-      Fabricate(:invite, user: user)
-    end
-
-    context 'when everyone can invite' do
-      before do
-        UserRole.everyone.update(permissions: UserRole.everyone.permissions | UserRole::FLAGS[:invite_users])
-        get :index
-      end
-
-      it 'returns http success' do
-        expect(response).to have_http_status(:success)
-      end
-
-      it 'returns private cache control headers' do
-        expect(response.headers['Cache-Control']).to include('private, no-store')
-      end
-    end
-
-    context 'when not everyone can invite' do
-      before do
-        UserRole.everyone.update(permissions: UserRole.everyone.permissions & ~UserRole::FLAGS[:invite_users])
-        get :index
-      end
-
-      it 'returns http forbidden' do
-        expect(response).to have_http_status(403)
-      end
-    end
-  end
-
-  describe 'POST #create' do
-    subject { post :create, params: { invite: { max_uses: '10', expires_in: 1800 } } }
-
-    context 'when everyone can invite' do
-      before do
-        UserRole.everyone.update(permissions: UserRole.everyone.permissions | UserRole::FLAGS[:invite_users])
-      end
-
-      it 'succeeds to create a invite' do
-        expect { subject }.to change(Invite, :count).by(1)
-        expect(subject).to redirect_to invites_path
-        expect(Invite.last).to have_attributes(user_id: user.id, max_uses: 10)
-      end
-    end
-
-    context 'when not everyone can invite' do
-      before do
-        UserRole.everyone.update(permissions: UserRole.everyone.permissions & ~UserRole::FLAGS[:invite_users])
-      end
-
-      it 'returns http forbidden' do
-        expect(subject).to have_http_status(403)
-      end
-    end
-  end
-
-  describe 'DELETE #destroy' do
-    subject { delete :destroy, params: { id: invite.id } }
-
-    let(:invite) { Fabricate(:invite, user: user, expires_at: nil) }
-
-    it 'expires invite and redirects' do
-      expect { subject }
-        .to(change { invite.reload.expired? }.to(true))
-      expect(response)
-        .to redirect_to invites_path
-    end
-  end
-end
diff --git a/spec/requests/invites_spec.rb b/spec/requests/invites_spec.rb
new file mode 100644
index 00000000000000..8a5ad2ccd159e1
--- /dev/null
+++ b/spec/requests/invites_spec.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Invites' do
+  let(:user) { Fabricate(:user) }
+
+  before { sign_in user }
+
+  context 'when not everyone can invite' do
+    before { UserRole.everyone.update(permissions: UserRole.everyone.permissions & ~UserRole::FLAGS[:invite_users]) }
+
+    describe 'GET /invites' do
+      it 'returns http forbidden' do
+        get invites_path
+
+        expect(response)
+          .to have_http_status(403)
+      end
+    end
+
+    describe 'POST /invites' do
+      it 'returns http forbidden' do
+        post invites_path, params: { invite: { max_users: '10', expires_in: 1800 } }
+
+        expect(response)
+          .to have_http_status(403)
+      end
+    end
+  end
+end
diff --git a/spec/support/matchers/private_cache_control.rb b/spec/support/matchers/private_cache_control.rb
new file mode 100644
index 00000000000000..7fcf56be3e8ec8
--- /dev/null
+++ b/spec/support/matchers/private_cache_control.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+RSpec::Matchers.define :have_private_cache_control do
+  match do |page|
+    page.response_headers['Cache-Control'] == 'private, no-store'
+  end
+
+  failure_message do |page|
+    <<~ERROR
+      Expected page to have `Cache-Control` header with `private, no-store` but it has:
+        #{page.response_headers['Cache-Control']}
+    ERROR
+  end
+end
diff --git a/spec/system/invites_spec.rb b/spec/system/invites_spec.rb
new file mode 100644
index 00000000000000..648bbea82562a1
--- /dev/null
+++ b/spec/system/invites_spec.rb
@@ -0,0 +1,86 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Invites' do
+  include ActionView::RecordIdentifier
+
+  let(:user) { Fabricate :user }
+
+  before do
+    host! 'localhost:3000' # TODO: Move into before for all system specs?
+    sign_in user
+  end
+
+  describe 'Viewing invites' do
+    it 'Lists existing user invites' do
+      invite = Fabricate :invite, user: user
+
+      visit invites_path
+
+      within css_id(invite) do
+        expect(page)
+          .to have_content(invite.uses)
+          .and have_private_cache_control
+        expect(copyable_field.value)
+          .to eq(public_invite_url(invite_code: invite.code))
+      end
+    end
+  end
+
+  describe 'Creating a new invite' do
+    it 'Saves the invite for the user' do
+      visit invites_path
+
+      fill_invite_form
+
+      expect { submit_form }
+        .to change(user.invites, :count).by(1)
+    end
+  end
+
+  describe 'Deleting an existing invite' do
+    it 'Expires the invite' do
+      invite = Fabricate :invite, user: user
+
+      visit invites_path
+
+      expect { delete_invite(invite) }
+        .to change { invite.reload.expired? }.to(true)
+
+      within css_id(invite) do
+        expect(page).to have_content I18n.t('invites.expired')
+      end
+    end
+  end
+
+  private
+
+  def css_id(record)
+    "##{dom_id(record)}" # TODO: Extract to system spec helper?
+  end
+
+  def copyable_field
+    within '.input-copy' do
+      find(:field, type: :text, readonly: true)
+    end
+  end
+
+  def submit_form
+    click_on I18n.t('invites.generate')
+  end
+
+  def delete_invite(invite)
+    within css_id(invite) do
+      click_on I18n.t('invites.delete')
+    end
+  end
+
+  def fill_invite_form
+    select I18n.t('invites.max_uses', count: 100),
+           from: I18n.t('simple_form.labels.defaults.max_uses')
+    select I18n.t("invites.expires_in.#{30.minutes.to_i}"),
+           from: I18n.t('simple_form.labels.defaults.expires_in')
+    check I18n.t('simple_form.labels.defaults.autofollow')
+  end
+end
diff --git a/spec/system/tags_spec.rb b/spec/system/tags_spec.rb
index e9ad970a5435fb..f39c6bf0d8dc24 100644
--- a/spec/system/tags_spec.rb
+++ b/spec/system/tags_spec.rb
@@ -6,11 +6,14 @@
   describe 'Viewing a tag' do
     let(:tag) { Fabricate(:tag, name: 'test') }
 
+    before { sign_in Fabricate(:user) }
+
     it 'visits the tag page and renders the web app' do
       visit tag_path(tag)
 
       expect(page)
         .to have_css('noscript', text: /Mastodon/)
+        .and have_private_cache_control
     end
   end
 end

From b4b639ee4a059385874f143027b75516c8db17d9 Mon Sep 17 00:00:00 2001
From: Michael Stanclift <mx@vmstan.com>
Date: Thu, 5 Sep 2024 07:34:13 -0500
Subject: [PATCH 2112/2191] Fix radio checkbox visibility in Report dialogs
 (#31752)

---
 app/javascript/styles/mastodon/components.scss | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 2fc195a3bdc559..5936ef8a6490ba 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -6437,7 +6437,7 @@ a.status-card {
   }
 
   .dialog-option .poll__input {
-    border-color: $inverted-text-color;
+    border-color: $darker-text-color;
     color: $ui-secondary-color;
     display: inline-flex;
     align-items: center;
@@ -6451,13 +6451,13 @@ a.status-card {
     &:active,
     &:focus,
     &:hover {
-      border-color: lighten($inverted-text-color, 15%);
+      border-color: $valid-value-color;
       border-width: 4px;
     }
 
     &.active {
-      border-color: $inverted-text-color;
-      background: $inverted-text-color;
+      border-color: $valid-value-color;
+      background: $valid-value-color;
     }
   }
 

From f85694acfdaf57c113bba49ca2aef949b16d4141 Mon Sep 17 00:00:00 2001
From: David Roetzel <david@roetzel.de>
Date: Thu, 5 Sep 2024 16:06:58 +0200
Subject: [PATCH 2113/2191] Add credentials to redis sentinel configuration
 (#31768)

---
 lib/mastodon/redis_configuration.rb           | 45 ++++++++++++-------
 spec/lib/mastodon/redis_configuration_spec.rb | 23 +++++++---
 2 files changed, 45 insertions(+), 23 deletions(-)

diff --git a/lib/mastodon/redis_configuration.rb b/lib/mastodon/redis_configuration.rb
index 5a096a1bf2210f..3d739a2ac6c533 100644
--- a/lib/mastodon/redis_configuration.rb
+++ b/lib/mastodon/redis_configuration.rb
@@ -57,39 +57,50 @@ def cache_namespace
   def setup_config(prefix: nil, defaults: {})
     prefix = "#{prefix}REDIS_"
 
-    url           = ENV.fetch("#{prefix}URL", nil)
-    user          = ENV.fetch("#{prefix}USER", nil)
-    password      = ENV.fetch("#{prefix}PASSWORD", nil)
-    host          = ENV.fetch("#{prefix}HOST", defaults[:host])
-    port          = ENV.fetch("#{prefix}PORT", defaults[:port])
-    db            = ENV.fetch("#{prefix}DB", defaults[:db])
-    name          = ENV.fetch("#{prefix}SENTINEL_MASTER", nil)
-    sentinel_port = ENV.fetch("#{prefix}SENTINEL_PORT", 26_379)
-    sentinel_list = ENV.fetch("#{prefix}SENTINELS", nil)
+    url      = ENV.fetch("#{prefix}URL", nil)
+    user     = ENV.fetch("#{prefix}USER", nil)
+    password = ENV.fetch("#{prefix}PASSWORD", nil)
+    host     = ENV.fetch("#{prefix}HOST", defaults[:host])
+    port     = ENV.fetch("#{prefix}PORT", defaults[:port])
+    db       = ENV.fetch("#{prefix}DB", defaults[:db])
 
     return { url:, driver: } if url
 
-    sentinels = parse_sentinels(sentinel_list, default_port: sentinel_port)
+    sentinel_options = setup_sentinels(prefix, default_user: user, default_password: password)
 
-    if name.present? && sentinels.present?
-      host = name
+    if sentinel_options.present?
+      host = sentinel_options[:name]
       port = nil
       db ||= 0
-    else
-      sentinels = nil
     end
 
     url = construct_uri(host, port, db, user, password)
 
     if url.present?
-      { url:, driver:, name:, sentinels: }
+      { url:, driver: }.merge(sentinel_options)
     else
-      # Fall back to base config. This has defaults for the URL
-      # so this cannot lead to an endless loop.
+      # Fall back to base config, which has defaults for the URL
+      # so this cannot lead to endless recursion.
       base
     end
   end
 
+  def setup_sentinels(prefix, default_user: nil, default_password: nil)
+    name              = ENV.fetch("#{prefix}SENTINEL_MASTER", nil)
+    sentinel_port     = ENV.fetch("#{prefix}SENTINEL_PORT", 26_379)
+    sentinel_list     = ENV.fetch("#{prefix}SENTINELS", nil)
+    sentinel_username = ENV.fetch("#{prefix}SENTINEL_USERNAME", default_user)
+    sentinel_password = ENV.fetch("#{prefix}SENTINEL_PASSWORD", default_password)
+
+    sentinels = parse_sentinels(sentinel_list, default_port: sentinel_port)
+
+    if name.present? && sentinels.present?
+      { name:, sentinels:, sentinel_username:, sentinel_password: }
+    else
+      {}
+    end
+  end
+
   def construct_uri(host, port, db, user, password)
     return nil if host.blank?
 
diff --git a/spec/lib/mastodon/redis_configuration_spec.rb b/spec/lib/mastodon/redis_configuration_spec.rb
index d14adf95182dc9..e36dcfba0ad698 100644
--- a/spec/lib/mastodon/redis_configuration_spec.rb
+++ b/spec/lib/mastodon/redis_configuration_spec.rb
@@ -100,10 +100,27 @@
         expect(subject[:url]).to eq 'redis://:testpass1@mainsentinel/0'
       end
 
+      it 'uses the redis password to authenticate with sentinels' do
+        expect(subject[:sentinel_password]).to eq 'testpass1'
+      end
+
       it 'includes the sentinel master name and list of sentinels' do
         expect(subject[:name]).to eq 'mainsentinel'
         expect(subject[:sentinels]).to contain_exactly({ host: '192.168.0.1', port: 3000 }, { host: '192.168.0.2', port: 4000 })
       end
+
+      context "when giving dedicated credentials in `#{prefix}REDIS_SENTINEL_USERNAME` and `#{prefix}REDIS_SENTINEL_PASSWORD`" do
+        around do |example|
+          ClimateControl.modify "#{prefix}REDIS_SENTINEL_USERNAME": 'sentinel_user', "#{prefix}REDIS_SENTINEL_PASSWORD": 'sentinel_pass1' do
+            example.run
+          end
+        end
+
+        it 'uses the credential to authenticate with sentinels' do
+          expect(subject[:sentinel_username]).to eq 'sentinel_user'
+          expect(subject[:sentinel_password]).to eq 'sentinel_pass1'
+        end
+      end
     end
 
     context 'when giving sentinels without port numbers' do
@@ -154,8 +171,6 @@
           url: 'redis://localhost:6379/0',
           driver: :hiredis,
           namespace: nil,
-          name: nil,
-          sentinels: nil,
         })
       end
     end
@@ -188,8 +203,6 @@
           url: 'redis://:testpass@redis.example.com:3333/3',
           driver: :hiredis,
           namespace: nil,
-          name: nil,
-          sentinels: nil,
         })
       end
     end
@@ -218,8 +231,6 @@
         namespace: 'cache',
         expires_in: 10.minutes,
         connect_timeout: 5,
-        name: nil,
-        sentinels: nil,
         pool: {
           size: 5,
           timeout: 5,

From d58faa20181c95b82ace744494a683b81eea681a Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 5 Sep 2024 10:07:17 -0400
Subject: [PATCH 2114/2191] Remove references to deprecated `Import` model
 (#31759)

---
 app/views/settings/imports/index.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/settings/imports/index.html.haml b/app/views/settings/imports/index.html.haml
index bfddd4546022eb..634631b5aaa4cc 100644
--- a/app/views/settings/imports/index.html.haml
+++ b/app/views/settings/imports/index.html.haml
@@ -23,7 +23,7 @@
       = f.input :mode,
                 as: :radio_buttons,
                 collection_wrapper_tag: 'ul',
-                collection: Import::MODES,
+                collection: Form::Import::MODES,
                 item_wrapper_tag: 'li',
                 label_method: ->(mode) { safe_join([I18n.t("imports.modes.#{mode}"), content_tag(:span, I18n.t("imports.modes.#{mode}_long"), class: 'hint')]) }
 

From 850478dc140f16d407ade46f791e08f3ceb4bf2e Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 5 Sep 2024 10:41:14 -0400
Subject: [PATCH 2115/2191] Use `conflicted` configuration for renovate rebase
 strategy (#31770)

---
 .github/renovate.json5 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/renovate.json5 b/.github/renovate.json5
index 968c77cac27108..8a106762838bcb 100644
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -7,6 +7,7 @@
     ':prConcurrentLimitNone', // Remove limit for open PRs at any time.
     ':prHourlyLimit2', // Rate limit PR creation to a maximum of two per hour.
   ],
+  rebaseWhen: 'conflicted',
   minimumReleaseAge: '3', // Wait 3 days after the package has been published before upgrading it
   // packageRules order is important, they are applied from top to bottom and are merged,
   // meaning the most important ones must be at the bottom, for example grouping rules

From bc435c63bd99df757d02737674ca2f39aca49438 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 5 Sep 2024 16:57:53 +0200
Subject: [PATCH 2116/2191] Change width of columns in advanced web UI (#31762)

---
 app/javascript/styles/mastodon/components.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 5936ef8a6490ba..0b7c9ac90310a6 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -2789,7 +2789,7 @@ $ui-header-logo-wordmark-width: 99px;
 }
 
 .column {
-  width: 350px;
+  width: 400px;
   position: relative;
   box-sizing: border-box;
   display: flex;
@@ -2822,7 +2822,7 @@ $ui-header-logo-wordmark-width: 99px;
 }
 
 .drawer {
-  width: 300px;
+  width: 350px;
   box-sizing: border-box;
   display: flex;
   flex-direction: column;

From 5acec087caed4a2fdf0fd8ed11f891222496f321 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 5 Sep 2024 11:36:05 -0400
Subject: [PATCH 2117/2191] Simplify basic presence validations (#29664)

---
 spec/models/announcement_spec.rb          |  9 +-----
 spec/models/block_spec.rb                 | 13 ++-------
 spec/models/custom_emoji_category_spec.rb |  7 +----
 spec/models/custom_filter_spec.rb         | 15 ++--------
 spec/models/domain_allow_spec.rb          |  6 +---
 spec/models/domain_block_spec.rb          |  6 +---
 spec/models/follow_spec.rb                | 13 ++-------
 spec/models/import_spec.rb                | 17 ++---------
 spec/models/ip_block_spec.rb              | 15 ++--------
 spec/models/marker_spec.rb                | 11 ++-----
 spec/models/media_attachment_spec.rb      |  7 +----
 spec/models/mention_spec.rb               | 13 ++-------
 spec/models/poll_spec.rb                  |  7 ++---
 spec/models/user_spec.rb                  |  6 +---
 spec/models/webauthn_credential_spec.rb   | 35 +++--------------------
 spec/models/webhook_spec.rb               |  7 +----
 16 files changed, 28 insertions(+), 159 deletions(-)

diff --git a/spec/models/announcement_spec.rb b/spec/models/announcement_spec.rb
index e3865e6fc7ff50..8bd1e74b2975b5 100644
--- a/spec/models/announcement_spec.rb
+++ b/spec/models/announcement_spec.rb
@@ -64,14 +64,7 @@
   end
 
   describe 'Validations' do
-    describe 'text' do
-      it 'validates presence of attribute' do
-        record = Fabricate.build(:announcement, text: nil)
-
-        expect(record).to_not be_valid
-        expect(record.errors[:text]).to be_present
-      end
-    end
+    it { is_expected.to validate_presence_of(:text) }
 
     describe 'ends_at' do
       it 'validates presence when starts_at is present' do
diff --git a/spec/models/block_spec.rb b/spec/models/block_spec.rb
index 8249503c592a67..84f0f318f42583 100644
--- a/spec/models/block_spec.rb
+++ b/spec/models/block_spec.rb
@@ -4,17 +4,8 @@
 
 RSpec.describe Block do
   describe 'validations' do
-    it 'is invalid without an account' do
-      block = Fabricate.build(:block, account: nil)
-      block.valid?
-      expect(block).to model_have_error_on_field(:account)
-    end
-
-    it 'is invalid without a target_account' do
-      block = Fabricate.build(:block, target_account: nil)
-      block.valid?
-      expect(block).to model_have_error_on_field(:target_account)
-    end
+    it { is_expected.to belong_to(:account).required }
+    it { is_expected.to belong_to(:target_account).required }
   end
 
   it 'removes blocking cache after creation' do
diff --git a/spec/models/custom_emoji_category_spec.rb b/spec/models/custom_emoji_category_spec.rb
index 3da77344e26721..2b414a66eecdd7 100644
--- a/spec/models/custom_emoji_category_spec.rb
+++ b/spec/models/custom_emoji_category_spec.rb
@@ -4,11 +4,6 @@
 
 RSpec.describe CustomEmojiCategory do
   describe 'validations' do
-    it 'validates name presence' do
-      record = described_class.new(name: nil)
-
-      expect(record).to_not be_valid
-      expect(record).to model_have_error_on_field(:name)
-    end
+    it { is_expected.to validate_presence_of(:name) }
   end
 end
diff --git a/spec/models/custom_filter_spec.rb b/spec/models/custom_filter_spec.rb
index 5bb615bb37f68e..afbc42024173e0 100644
--- a/spec/models/custom_filter_spec.rb
+++ b/spec/models/custom_filter_spec.rb
@@ -4,19 +4,8 @@
 
 RSpec.describe CustomFilter do
   describe 'Validations' do
-    it 'requires presence of title' do
-      record = described_class.new(title: '')
-      record.valid?
-
-      expect(record).to model_have_error_on_field(:title)
-    end
-
-    it 'requires presence of context' do
-      record = described_class.new(context: nil)
-      record.valid?
-
-      expect(record).to model_have_error_on_field(:context)
-    end
+    it { is_expected.to validate_presence_of(:title) }
+    it { is_expected.to validate_presence_of(:context) }
 
     it 'requires non-empty of context' do
       record = described_class.new(context: [])
diff --git a/spec/models/domain_allow_spec.rb b/spec/models/domain_allow_spec.rb
index 92f1ef8ccf3308..d8f438f07eea2e 100644
--- a/spec/models/domain_allow_spec.rb
+++ b/spec/models/domain_allow_spec.rb
@@ -4,11 +4,7 @@
 
 RSpec.describe DomainAllow do
   describe 'Validations' do
-    it 'is invalid without a domain' do
-      domain_allow = Fabricate.build(:domain_allow, domain: nil)
-      domain_allow.valid?
-      expect(domain_allow).to model_have_error_on_field(:domain)
-    end
+    it { is_expected.to validate_presence_of(:domain) }
 
     it 'is invalid if the same normalized domain already exists' do
       _domain_allow = Fabricate(:domain_allow, domain: 'にゃん')
diff --git a/spec/models/domain_block_spec.rb b/spec/models/domain_block_spec.rb
index d595441fd30a8d..8278454cd7811a 100644
--- a/spec/models/domain_block_spec.rb
+++ b/spec/models/domain_block_spec.rb
@@ -4,11 +4,7 @@
 
 RSpec.describe DomainBlock do
   describe 'validations' do
-    it 'is invalid without a domain' do
-      domain_block = Fabricate.build(:domain_block, domain: nil)
-      domain_block.valid?
-      expect(domain_block).to model_have_error_on_field(:domain)
-    end
+    it { is_expected.to validate_presence_of(:domain) }
 
     it 'is invalid if the same normalized domain already exists' do
       _domain_block = Fabricate(:domain_block, domain: 'にゃん')
diff --git a/spec/models/follow_spec.rb b/spec/models/follow_spec.rb
index 9aa172b2f21cfc..f22bd6ea88d53d 100644
--- a/spec/models/follow_spec.rb
+++ b/spec/models/follow_spec.rb
@@ -9,17 +9,8 @@
   describe 'validations' do
     subject { described_class.new(account: alice, target_account: bob, rate_limit: true) }
 
-    it 'is invalid without an account' do
-      follow = Fabricate.build(:follow, account: nil)
-      follow.valid?
-      expect(follow).to model_have_error_on_field(:account)
-    end
-
-    it 'is invalid without a target_account' do
-      follow = Fabricate.build(:follow, target_account: nil)
-      follow.valid?
-      expect(follow).to model_have_error_on_field(:target_account)
-    end
+    it { is_expected.to belong_to(:account).required }
+    it { is_expected.to belong_to(:target_account).required }
 
     it 'is invalid if account already follows too many people' do
       alice.update(following_count: FollowLimitValidator::LIMIT)
diff --git a/spec/models/import_spec.rb b/spec/models/import_spec.rb
index 10df5f8c0b2a31..587e0a9d260aa8 100644
--- a/spec/models/import_spec.rb
+++ b/spec/models/import_spec.rb
@@ -3,19 +3,8 @@
 require 'rails_helper'
 
 RSpec.describe Import do
-  let(:account) { Fabricate(:account) }
-  let(:type) { 'following' }
-  let(:data) { attachment_fixture('imports.txt') }
-
-  describe 'validations' do
-    it 'is invalid without an type' do
-      import = described_class.create(account: account, data: data)
-      expect(import).to model_have_error_on_field(:type)
-    end
-
-    it 'is invalid without a data' do
-      import = described_class.create(account: account, type: type)
-      expect(import).to model_have_error_on_field(:data)
-    end
+  describe 'Validations' do
+    it { is_expected.to validate_presence_of(:type) }
+    it { is_expected.to validate_presence_of(:data) }
   end
 end
diff --git a/spec/models/ip_block_spec.rb b/spec/models/ip_block_spec.rb
index 6f1eb38425c7d4..ac9f5db601329e 100644
--- a/spec/models/ip_block_spec.rb
+++ b/spec/models/ip_block_spec.rb
@@ -4,19 +4,8 @@
 
 RSpec.describe IpBlock do
   describe 'validations' do
-    it 'validates ip presence', :aggregate_failures do
-      ip_block = described_class.new(ip: nil, severity: :no_access)
-
-      expect(ip_block).to_not be_valid
-      expect(ip_block).to model_have_error_on_field(:ip)
-    end
-
-    it 'validates severity presence', :aggregate_failures do
-      ip_block = described_class.new(ip: '127.0.0.1', severity: nil)
-
-      expect(ip_block).to_not be_valid
-      expect(ip_block).to model_have_error_on_field(:severity)
-    end
+    it { is_expected.to validate_presence_of(:ip) }
+    it { is_expected.to validate_presence_of(:severity) }
 
     it 'validates ip uniqueness', :aggregate_failures do
       described_class.create!(ip: '127.0.0.1', severity: :no_access)
diff --git a/spec/models/marker_spec.rb b/spec/models/marker_spec.rb
index 8339f8e259b150..1da8eb6f43001b 100644
--- a/spec/models/marker_spec.rb
+++ b/spec/models/marker_spec.rb
@@ -3,14 +3,7 @@
 require 'rails_helper'
 
 RSpec.describe Marker do
-  describe 'validations' do
-    describe 'timeline' do
-      it 'must be included in valid list' do
-        record = described_class.new(timeline: 'not real timeline')
-
-        expect(record).to_not be_valid
-        expect(record).to model_have_error_on_field(:timeline)
-      end
-    end
+  describe 'Validations' do
+    it { is_expected.to validate_inclusion_of(:timeline).in_array(described_class::TIMELINES) }
   end
 end
diff --git a/spec/models/media_attachment_spec.rb b/spec/models/media_attachment_spec.rb
index 50f8d00a5439c4..5f91ae096734c7 100644
--- a/spec/models/media_attachment_spec.rb
+++ b/spec/models/media_attachment_spec.rb
@@ -257,12 +257,7 @@
     end
   end
 
-  it 'is invalid without file' do
-    media = described_class.new
-
-    expect(media.valid?).to be false
-    expect(media).to model_have_error_on_field(:file)
-  end
+  it { is_expected.to validate_presence_of(:file) }
 
   describe 'size limit validation' do
     it 'rejects video files that are too large' do
diff --git a/spec/models/mention_spec.rb b/spec/models/mention_spec.rb
index b241049a54b346..3a9b9fddf2d3dd 100644
--- a/spec/models/mention_spec.rb
+++ b/spec/models/mention_spec.rb
@@ -4,16 +4,7 @@
 
 RSpec.describe Mention do
   describe 'validations' do
-    it 'is invalid without an account' do
-      mention = Fabricate.build(:mention, account: nil)
-      mention.valid?
-      expect(mention).to model_have_error_on_field(:account)
-    end
-
-    it 'is invalid without a status' do
-      mention = Fabricate.build(:mention, status: nil)
-      mention.valid?
-      expect(mention).to model_have_error_on_field(:status)
-    end
+    it { is_expected.to belong_to(:account).required }
+    it { is_expected.to belong_to(:status).required }
   end
 end
diff --git a/spec/models/poll_spec.rb b/spec/models/poll_spec.rb
index 740ef63d81aaf0..736f3615d0d3c8 100644
--- a/spec/models/poll_spec.rb
+++ b/spec/models/poll_spec.rb
@@ -32,12 +32,9 @@
 
   describe 'validations' do
     context 'when not valid' do
-      let(:poll) { Fabricate.build(:poll, expires_at: nil) }
+      subject { Fabricate.build(:poll) }
 
-      it 'is invalid without an expire date' do
-        poll.valid?
-        expect(poll).to model_have_error_on_field(:expires_at)
-      end
+      it { is_expected.to validate_presence_of(:expires_at) }
     end
   end
 end
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 5c2af4dc396902..fcff4c0d3bd435 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -32,11 +32,7 @@
   end
 
   describe 'validations' do
-    it 'is invalid without an account' do
-      user = Fabricate.build(:user, account: nil)
-      user.valid?
-      expect(user).to model_have_error_on_field(:account)
-    end
+    it { is_expected.to belong_to(:account).required }
 
     it 'is invalid without a valid email' do
       user = Fabricate.build(:user, email: 'john@')
diff --git a/spec/models/webauthn_credential_spec.rb b/spec/models/webauthn_credential_spec.rb
index 23f0229a67ab39..c4105d91500622 100644
--- a/spec/models/webauthn_credential_spec.rb
+++ b/spec/models/webauthn_credential_spec.rb
@@ -4,37 +4,10 @@
 
 RSpec.describe WebauthnCredential do
   describe 'validations' do
-    it 'is invalid without an external id' do
-      webauthn_credential = Fabricate.build(:webauthn_credential, external_id: nil)
-
-      webauthn_credential.valid?
-
-      expect(webauthn_credential).to model_have_error_on_field(:external_id)
-    end
-
-    it 'is invalid without a public key' do
-      webauthn_credential = Fabricate.build(:webauthn_credential, public_key: nil)
-
-      webauthn_credential.valid?
-
-      expect(webauthn_credential).to model_have_error_on_field(:public_key)
-    end
-
-    it 'is invalid without a nickname' do
-      webauthn_credential = Fabricate.build(:webauthn_credential, nickname: nil)
-
-      webauthn_credential.valid?
-
-      expect(webauthn_credential).to model_have_error_on_field(:nickname)
-    end
-
-    it 'is invalid without a sign_count' do
-      webauthn_credential = Fabricate.build(:webauthn_credential, sign_count: nil)
-
-      webauthn_credential.valid?
-
-      expect(webauthn_credential).to model_have_error_on_field(:sign_count)
-    end
+    it { is_expected.to validate_presence_of(:external_id) }
+    it { is_expected.to validate_presence_of(:public_key) }
+    it { is_expected.to validate_presence_of(:nickname) }
+    it { is_expected.to validate_presence_of(:sign_count) }
 
     it 'is invalid if already exist a webauthn credential with the same external id' do
       Fabricate(:webauthn_credential, external_id: '_Typ0ygudDnk9YUVWLQayw')
diff --git a/spec/models/webhook_spec.rb b/spec/models/webhook_spec.rb
index 1b2d803bd75ed0..03ef1dcc68e2e9 100644
--- a/spec/models/webhook_spec.rb
+++ b/spec/models/webhook_spec.rb
@@ -6,12 +6,7 @@
   let(:webhook) { Fabricate(:webhook) }
 
   describe 'Validations' do
-    it 'requires presence of events' do
-      record = described_class.new(events: nil)
-      record.valid?
-
-      expect(record).to model_have_error_on_field(:events)
-    end
+    it { is_expected.to validate_presence_of(:events) }
 
     it 'requires non-empty events value' do
       record = described_class.new(events: [])

From cb324b5d7c6eba78aad28bfee1c806dc01517f2b Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 5 Sep 2024 11:39:59 +0200
Subject: [PATCH 2118/2191] [Glitch] Change design of unread conversations in
 web UI

Port ec4c49082edb5f4941bd4e129900628c6b30101e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../components/conversation.jsx               |  2 +-
 .../flavours/glitch/styles/components.scss    | 19 ++-----------------
 2 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/app/javascript/flavours/glitch/features/direct_timeline/components/conversation.jsx b/app/javascript/flavours/glitch/features/direct_timeline/components/conversation.jsx
index 50b2a9d5ab8f83..e7fc914b65c740 100644
--- a/app/javascript/flavours/glitch/features/direct_timeline/components/conversation.jsx
+++ b/app/javascript/flavours/glitch/features/direct_timeline/components/conversation.jsx
@@ -197,7 +197,7 @@ export const Conversation = ({ conversation, scrollKey, onMoveUp, onMoveDown })
 
   return (
     <HotKeys handlers={handlers}>
-      <div className={classNames('conversation focusable muted', { 'conversation--unread': unread })} tabIndex={0}>
+      <div className={classNames('conversation focusable muted', { unread })} tabIndex={0}>
         <div className='conversation__avatar' onClick={handleClick} role='presentation'>
           <AvatarComposite accounts={accounts} size={48} />
         </div>
diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index 26be1f866c598a..c26ce0d62c7e67 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -9055,22 +9055,6 @@ noscript {
       margin: 0;
     }
   }
-
-  &--unread {
-    background: lighten($ui-base-color, 2%);
-
-    &:focus {
-      background: lighten($ui-base-color, 4%);
-    }
-
-    .conversation__content__info {
-      font-weight: 700;
-    }
-
-    .conversation__content__relative-time {
-      color: $primary-text-color;
-    }
-  }
 }
 
 .announcements {
@@ -9265,7 +9249,8 @@ noscript {
 }
 
 .notification,
-.status__wrapper {
+.status__wrapper,
+.conversation {
   position: relative;
 
   &.unread {

From db6b1fe8fb56c5eab4f11cc2cd79703739ca2608 Mon Sep 17 00:00:00 2001
From: Michael Stanclift <mx@vmstan.com>
Date: Thu, 5 Sep 2024 07:34:13 -0500
Subject: [PATCH 2119/2191] [Glitch] Fix radio checkbox visibility in Report
 dialogs

Port b4b639ee4a059385874f143027b75516c8db17d9 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/styles/components.scss | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index c26ce0d62c7e67..4ae330d0a5df7e 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -6899,7 +6899,7 @@ a.status-card {
   }
 
   .dialog-option .poll__input {
-    border-color: $inverted-text-color;
+    border-color: $darker-text-color;
     color: $ui-secondary-color;
     display: inline-flex;
     align-items: center;
@@ -6913,13 +6913,13 @@ a.status-card {
     &:active,
     &:focus,
     &:hover {
-      border-color: lighten($inverted-text-color, 15%);
+      border-color: $valid-value-color;
       border-width: 4px;
     }
 
     &.active {
-      border-color: $inverted-text-color;
-      background: $inverted-text-color;
+      border-color: $valid-value-color;
+      background: $valid-value-color;
     }
   }
 

From 09017dd8f063926738b253fe964a6b12faaa744f Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 5 Sep 2024 15:51:17 -0400
Subject: [PATCH 2120/2191] Add worker spec for annual report worker (#31778)

---
 .../generate_annual_report_worker_spec.rb     | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 spec/workers/generate_annual_report_worker_spec.rb

diff --git a/spec/workers/generate_annual_report_worker_spec.rb b/spec/workers/generate_annual_report_worker_spec.rb
new file mode 100644
index 00000000000000..69b0d4424b7d78
--- /dev/null
+++ b/spec/workers/generate_annual_report_worker_spec.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe GenerateAnnualReportWorker do
+  let(:worker) { described_class.new }
+  let(:account) { Fabricate :account }
+
+  describe '#perform' do
+    it 'generates new report for the account' do
+      expect { worker.perform(account.id, Date.current.year) }
+        .to change(account_reports, :count).by(1)
+    end
+
+    it 'returns true for non-existent record' do
+      result = worker.perform(123_123_123, Date.current.year)
+
+      expect(result).to be(true)
+    end
+
+    def account_reports
+      GeneratedAnnualReport
+        .where(account: account)
+        .where(year: Date.current.year)
+    end
+  end
+end

From 7efe0bde9dc363de57fc350dbcdb0b099bd1329a Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 5 Sep 2024 16:05:38 -0400
Subject: [PATCH 2121/2191] Add `have_http_link_header` matcher and set header
 values as strings (#31010)

---
 .../concerns/account_controller_concern.rb    |  2 +-
 app/controllers/concerns/api/pagination.rb    |  2 +-
 app/controllers/statuses_controller.rb        |  4 ++-
 .../account_controller_concern_spec.rb        | 13 +++-----
 spec/requests/accounts_spec.rb                |  3 +-
 spec/requests/api/v1/timelines/home_spec.rb   |  5 +--
 spec/requests/api/v1/timelines/list_spec.rb   |  5 +--
 spec/requests/link_headers_spec.rb            | 24 +++-----------
 spec/support/matchers/api_pagination.rb       |  2 +-
 spec/support/matchers/http_link_header.rb     | 33 +++++++++++++++++++
 10 files changed, 54 insertions(+), 39 deletions(-)
 create mode 100644 spec/support/matchers/http_link_header.rb

diff --git a/app/controllers/concerns/account_controller_concern.rb b/app/controllers/concerns/account_controller_concern.rb
index d63bcc85c95d13..b75f3e358195a8 100644
--- a/app/controllers/concerns/account_controller_concern.rb
+++ b/app/controllers/concerns/account_controller_concern.rb
@@ -20,7 +20,7 @@ def set_link_headers
         webfinger_account_link,
         actor_url_link,
       ]
-    )
+    ).to_s
   end
 
   def webfinger_account_link
diff --git a/app/controllers/concerns/api/pagination.rb b/app/controllers/concerns/api/pagination.rb
index 7f06dc0202345f..b0b4ae4603f24b 100644
--- a/app/controllers/concerns/api/pagination.rb
+++ b/app/controllers/concerns/api/pagination.rb
@@ -19,7 +19,7 @@ def set_pagination_headers(next_path = nil, prev_path = nil)
     links = []
     links << [next_path, [%w(rel next)]] if next_path
     links << [prev_path, [%w(rel prev)]] if prev_path
-    response.headers['Link'] = LinkHeader.new(links) unless links.empty?
+    response.headers['Link'] = LinkHeader.new(links).to_s unless links.empty?
   end
 
   def require_valid_pagination_options!
diff --git a/app/controllers/statuses_controller.rb b/app/controllers/statuses_controller.rb
index db7eddd78b35d5..a0885b469b2429 100644
--- a/app/controllers/statuses_controller.rb
+++ b/app/controllers/statuses_controller.rb
@@ -56,7 +56,9 @@ def set_body_classes
   end
 
   def set_link_headers
-    response.headers['Link'] = LinkHeader.new([[ActivityPub::TagManager.instance.uri_for(@status), [%w(rel alternate), %w(type application/activity+json)]]])
+    response.headers['Link'] = LinkHeader.new(
+      [[ActivityPub::TagManager.instance.uri_for(@status), [%w(rel alternate), %w(type application/activity+json)]]]
+    ).to_s
   end
 
   def set_status
diff --git a/spec/controllers/concerns/account_controller_concern_spec.rb b/spec/controllers/concerns/account_controller_concern_spec.rb
index 3eee46d7b956fc..384406a0ea496e 100644
--- a/spec/controllers/concerns/account_controller_concern_spec.rb
+++ b/spec/controllers/concerns/account_controller_concern_spec.rb
@@ -54,17 +54,12 @@ def success
     it 'Prepares the account, returns success, and sets link headers' do
       get 'success', params: { account_username: account.username }
 
-      expect(response).to have_http_status(200)
-      expect(response.headers['Link'].to_s).to eq(expected_link_headers)
+      expect(response)
+        .to have_http_status(200)
+        .and have_http_link_header('http://test.host/.well-known/webfinger?resource=acct%3Ausername%40cb6e6126.ngrok.io').for(rel: 'lrdd', type: 'application/jrd+json')
+        .and have_http_link_header('https://cb6e6126.ngrok.io/users/username').for(rel: 'alternate', type: 'application/activity+json')
       expect(response.body)
         .to include(account.username)
     end
-
-    def expected_link_headers
-      [
-        '<http://test.host/.well-known/webfinger?resource=acct%3Ausername%40cb6e6126.ngrok.io>; rel="lrdd"; type="application/jrd+json"',
-        '<https://cb6e6126.ngrok.io/users/username>; rel="alternate"; type="application/activity+json"',
-      ].join(', ')
-    end
   end
 end
diff --git a/spec/requests/accounts_spec.rb b/spec/requests/accounts_spec.rb
index d53816eff0632d..3615868d745b28 100644
--- a/spec/requests/accounts_spec.rb
+++ b/spec/requests/accounts_spec.rb
@@ -69,8 +69,7 @@
             expect(response)
               .to have_http_status(200)
               .and render_template(:show)
-
-            expect(response.headers['Link'].to_s).to include ActivityPub::TagManager.instance.uri_for(account)
+              .and have_http_link_header(ActivityPub::TagManager.instance.uri_for(account)).for(rel: 'alternate')
           end
         end
 
diff --git a/spec/requests/api/v1/timelines/home_spec.rb b/spec/requests/api/v1/timelines/home_spec.rb
index d158e0801c1e6d..9dd102fcb62203 100644
--- a/spec/requests/api/v1/timelines/home_spec.rb
+++ b/spec/requests/api/v1/timelines/home_spec.rb
@@ -94,8 +94,9 @@
       it 'returns http unprocessable entity', :aggregate_failures do
         subject
 
-        expect(response).to have_http_status(422)
-        expect(response.headers['Link']).to be_nil
+        expect(response)
+          .to have_http_status(422)
+          .and not_have_http_link_header
       end
     end
   end
diff --git a/spec/requests/api/v1/timelines/list_spec.rb b/spec/requests/api/v1/timelines/list_spec.rb
index 753c784866519f..eb4395d1f97b54 100644
--- a/spec/requests/api/v1/timelines/list_spec.rb
+++ b/spec/requests/api/v1/timelines/list_spec.rb
@@ -47,8 +47,9 @@
       it 'returns http unprocessable entity' do
         get "/api/v1/timelines/list/#{list.id}", headers: headers
 
-        expect(response).to have_http_status(422)
-        expect(response.headers['Link']).to be_nil
+        expect(response)
+          .to have_http_status(422)
+          .and not_have_http_link_header
       end
     end
   end
diff --git a/spec/requests/link_headers_spec.rb b/spec/requests/link_headers_spec.rb
index 3116a54d6a41c4..e20f5e79e577b2 100644
--- a/spec/requests/link_headers_spec.rb
+++ b/spec/requests/link_headers_spec.rb
@@ -6,28 +6,12 @@
   describe 'on the account show page' do
     let(:account) { Fabricate(:account, username: 'test') }
 
-    before do
+    it 'contains webfinger and activitypub urls in link header' do
       get short_account_path(username: account)
-    end
-
-    it 'contains webfinger url in link header' do
-      link_header = link_header_with_type('application/jrd+json')
-
-      expect(link_header.href).to eq 'https://cb6e6126.ngrok.io/.well-known/webfinger?resource=acct%3Atest%40cb6e6126.ngrok.io'
-      expect(link_header.attr_pairs.first).to eq %w(rel lrdd)
-    end
-
-    it 'contains activitypub url in link header' do
-      link_header = link_header_with_type('application/activity+json')
-
-      expect(link_header.href).to eq 'https://cb6e6126.ngrok.io/users/test'
-      expect(link_header.attr_pairs.first).to eq %w(rel alternate)
-    end
 
-    def link_header_with_type(type)
-      LinkHeader.parse(response.headers['Link'].to_s).links.find do |link|
-        link.attr_pairs.any?(['type', type])
-      end
+      expect(response)
+        .to have_http_link_header('https://cb6e6126.ngrok.io/.well-known/webfinger?resource=acct%3Atest%40cb6e6126.ngrok.io').for(rel: 'lrdd', type: 'application/jrd+json')
+        .and have_http_link_header('https://cb6e6126.ngrok.io/users/test').for(rel: 'alternate', type: 'application/activity+json')
     end
   end
 end
diff --git a/spec/support/matchers/api_pagination.rb b/spec/support/matchers/api_pagination.rb
index f7d552b242a25f..1a4f53a84a7494 100644
--- a/spec/support/matchers/api_pagination.rb
+++ b/spec/support/matchers/api_pagination.rb
@@ -3,7 +3,7 @@
 RSpec::Matchers.define :include_pagination_headers do |links|
   match do |response|
     links.map do |key, value|
-      response.headers['Link'].find_link(['rel', key.to_s]).href == value
+      expect(response).to have_http_link_header(value).for(rel: key.to_s)
     end.all?
   end
 
diff --git a/spec/support/matchers/http_link_header.rb b/spec/support/matchers/http_link_header.rb
new file mode 100644
index 00000000000000..3e658071c9005f
--- /dev/null
+++ b/spec/support/matchers/http_link_header.rb
@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+RSpec::Matchers.define :have_http_link_header do |href|
+  match do |response|
+    @response = response
+
+    header_link&.href == href
+  end
+
+  match_when_negated do |response|
+    response.headers['Link'].blank?
+  end
+
+  chain :for do |attributes|
+    @attributes = attributes
+  end
+
+  failure_message do |response|
+    "Expected `#{response.headers['Link']}` to include `href` value of `#{href}` for `#{@attributes}` but it did not."
+  end
+
+  failure_message_when_negated do
+    "Expected response not to have a `Link` header but `#{response.headers['Link']}` is present."
+  end
+
+  def header_link
+    LinkHeader
+      .parse(@response.headers['Link'])
+      .find_link(*@attributes.stringify_keys)
+  end
+end
+
+RSpec::Matchers.define_negated_matcher :not_have_http_link_header, :have_http_link_header # Allow chaining

From 60182db0ca49f863d8f81f50f31b22386f734c90 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 6 Sep 2024 09:30:53 +0200
Subject: [PATCH 2122/2191] Update dependency tzinfo-data to v1.2024.2 (#31780)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index c70823d0513e9e..8577a52691fe78 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -857,7 +857,7 @@ GEM
       unf (~> 0.1.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    tzinfo-data (1.2024.1)
+    tzinfo-data (1.2024.2)
       tzinfo (>= 1.0.0)
     unf (0.1.4)
       unf_ext

From cc4865193a4454c8650bd6877c30dfec68d69d55 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 6 Sep 2024 07:38:08 +0000
Subject: [PATCH 2123/2191] New Crowdin Translations (automated) (#31781)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/fi.json |  6 +++---
 app/javascript/mastodon/locales/ga.json |  4 ++++
 app/javascript/mastodon/locales/ru.json |  2 +-
 config/locales/fi.yml                   | 14 +++++++-------
 config/locales/fr-CA.yml                |  2 ++
 config/locales/fr.yml                   |  2 ++
 config/locales/fy.yml                   |  1 +
 config/locales/ga.yml                   |  1 +
 config/locales/gd.yml                   |  1 +
 config/locales/pt-BR.yml                | 10 +++++++++-
 config/locales/simple_form.fr-CA.yml    |  1 +
 config/locales/simple_form.fr.yml       |  1 +
 config/locales/zh-CN.yml                |  1 +
 13 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index 39df3e010f5cc4..79ca95a58c0180 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -1,6 +1,6 @@
 {
   "about.blocks": "Moderoidut palvelimet",
-  "about.contact": "Yhteydenotto:",
+  "about.contact": "Yhteystiedot:",
   "about.disclaimer": "Mastodon on vapaa avoimen lähdekoodin ohjelmisto ja Mastodon gGmbH:n tavaramerkki.",
   "about.domain_blocks.no_reason_available": "Syy ei ole tiedossa",
   "about.domain_blocks.preamble": "Mastodonin avulla voi yleensä tarkastella minkä tahansa fediversumiin kuuluvan palvelimen sisältöä ja olla yhteyksissä eri palvelinten käyttäjien kanssa. Nämä poikkeukset koskevat yksin tätä palvelinta.",
@@ -304,7 +304,7 @@
   "filter_modal.select_filter.title": "Suodata tämä julkaisu",
   "filter_modal.title.status": "Suodata julkaisu",
   "filter_warning.matches_filter": "Vastaa suodatinta ”{title}”",
-  "filtered_notifications_banner.pending_requests": "{count, plural, =0 {Ei keneltäkään, jonka} one {1 käyttäjältä, jonka} other {# käyttäjältä, jotka}} saatat tuntea",
+  "filtered_notifications_banner.pending_requests": "{count, plural, =0 {Ei keneltäkään, jonka} one {Yhdeltä käyttäjältä, jonka} other {# käyttäjältä, jotka}} saatat tuntea",
   "filtered_notifications_banner.title": "Suodatetut ilmoitukset",
   "firehose.all": "Kaikki",
   "firehose.local": "Tämä palvelin",
@@ -370,7 +370,7 @@
   "home.show_announcements": "Näytä tiedotteet",
   "ignore_notifications_modal.disclaimer": "Mastodon ei voi ilmoittaa käyttäjille, että olet sivuuttanut heidän ilmoituksensa. Ilmoitusten sivuuttaminen ei lopeta itse viestien lähetystä.",
   "ignore_notifications_modal.filter_instead": "Suodata sen sijaan",
-  "ignore_notifications_modal.filter_to_act_users": "Voit silti hyväksyä, hylätä tai raportoida käyttäjiä",
+  "ignore_notifications_modal.filter_to_act_users": "Voit kuitenkin yhä hyväksyä, hylätä tai raportoida käyttäjiä",
   "ignore_notifications_modal.filter_to_avoid_confusion": "Suodatus auttaa välttämään mahdollisia sekaannuksia",
   "ignore_notifications_modal.filter_to_review_separately": "Voit käydä suodatettuja ilmoituksia läpi erikseen",
   "ignore_notifications_modal.ignore": "Sivuuta ilmoitukset",
diff --git a/app/javascript/mastodon/locales/ga.json b/app/javascript/mastodon/locales/ga.json
index 71577be95582bc..b51d4adf68150d 100644
--- a/app/javascript/mastodon/locales/ga.json
+++ b/app/javascript/mastodon/locales/ga.json
@@ -97,6 +97,8 @@
   "block_modal.title": "An bhfuil fonn ort an t-úsáideoir a bhlocáil?",
   "block_modal.you_wont_see_mentions": "Ní fheicfidh tú postálacha a luann iad.",
   "boost_modal.combo": "Is féidir leat {combo} a bhrú chun é seo a scipeáil an chéad uair eile",
+  "boost_modal.reblog": "An post a threisiú?",
+  "boost_modal.undo_reblog": "An deireadh a chur le postáil?",
   "bundle_column_error.copy_stacktrace": "Cóipeáil tuairisc earráide",
   "bundle_column_error.error.body": "Ní féidir an leathanach a iarradh a sholáthar. Seans gurb amhlaidh mar gheall ar fhabht sa chód, nó mar gheall ar mhíréireacht leis an mbrabhsálaí.",
   "bundle_column_error.error.title": "Ó, níl sé sin go maith!",
@@ -467,6 +469,7 @@
   "mute_modal.you_wont_see_mentions": "Ní fheicfidh tú postálacha a luann iad.",
   "mute_modal.you_wont_see_posts": "Is féidir leo do phoist a fheiceáil go fóill, ach ní fheicfidh tú a gcuid postanna.",
   "navigation_bar.about": "Maidir le",
+  "navigation_bar.administration": "Riarachán",
   "navigation_bar.advanced_interface": "Oscail i gcomhéadan gréasáin chun cinn",
   "navigation_bar.blocks": "Cuntais bhactha",
   "navigation_bar.bookmarks": "Leabharmharcanna",
@@ -483,6 +486,7 @@
   "navigation_bar.follows_and_followers": "Ag leanúint agus do do leanúint",
   "navigation_bar.lists": "Liostaí",
   "navigation_bar.logout": "Logáil Amach",
+  "navigation_bar.moderation": "Measarthacht",
   "navigation_bar.mutes": "Úsáideoirí balbhaithe",
   "navigation_bar.opened_in_classic_interface": "Osclaítear poist, cuntais agus leathanaigh shonracha eile de réir réamhshocraithe sa chomhéadan gréasáin clasaiceach.",
   "navigation_bar.personal": "Pearsanta",
diff --git a/app/javascript/mastodon/locales/ru.json b/app/javascript/mastodon/locales/ru.json
index cd64e8b8e534b3..4439b8dc0a1fbe 100644
--- a/app/javascript/mastodon/locales/ru.json
+++ b/app/javascript/mastodon/locales/ru.json
@@ -48,7 +48,7 @@
   "account.moved_to": "У {name} теперь новый аккаунт:",
   "account.mute": "Игнорировать @{name}",
   "account.mute_notifications_short": "Отключить уведомления",
-  "account.mute_short": "Немой",
+  "account.mute_short": "Глохни!",
   "account.muted": "Игнорируется",
   "account.mutual": "Взаимно",
   "account.no_bio": "Описание не предоставлено.",
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 42d1977662b89e..8f0c80f1df049c 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -442,9 +442,9 @@ fi:
         create: Lisää verkkotunnus
         resolve: Selvitä verkkotunnus
         title: Estä uusi sähköpostiverkkotunnus
-      no_email_domain_block_selected: Sähköpostin verkkotunnuksia ei muutettu, koska yhtään ei ollut valittuna
+      no_email_domain_block_selected: Sähköpostiverkkotunnusten estoja ei muutettu; yhtäkään ei ollut valittu
       not_permitted: Ei sallittu
-      resolved_dns_records_hint_html: Verkkotunnuksen nimi määräytyy seuraaviin MX-verkkotunnuksiin, jotka ovat viime kädessä vastuussa sähköpostin vastaanottamisesta. MX-verkkotunnuksen estäminen estää rekisteröitymisen mistä tahansa sähköpostiosoitteesta, joka käyttää samaa MX-verkkotunnusta, vaikka näkyvä verkkotunnuksen nimi olisikin erilainen. <strong>Varo estämästä suuria sähköpostin palveluntarjoajia.</strong>
+      resolved_dns_records_hint_html: Verkkotunnusnimi kytkeytyy seuraaviin MX-verkkotunnuksiin, jotka ovat viime kädessä vastuussa sähköpostin vastaanottamisesta. MX-verkkotunnuksen estäminen estää rekisteröitymisen mistä tahansa sähköpostiosoitteesta, joka käyttää samaa MX-verkkotunnusta, vaikka näkyvä verkkotunnuksen nimi olisikin erilainen. <strong>Varo estämästä suuria sähköpostipalvelujen tarjoajia.</strong>
       resolved_through_html: Ratkaistu verkkotunnuksen %{domain} kautta
       title: Estetyt sähköpostiverkkotunnukset
     export_domain_allows:
@@ -600,7 +600,7 @@ fi:
         resolve_description_html: Ilmoitettua tiliä kohtaan ei ryhdytä toimiin, varoitusta ei kirjata ja raportti suljetaan.
         silence_description_html: Tili näkyy vain niille, jotka jo seuraavat sitä tai etsivät sen manuaalisesti, mikä rajoittaa merkittävästi sen tavoitettavuutta. Voidaan perua milloin vain. Sulkee kaikki tiliin kohdistuvat raportit.
         suspend_description_html: Tili ja mikään sen sisältö eivät ole käytettävissä, ja lopulta ne poistetaan ja vuorovaikutus tilin kanssa on mahdotonta. Peruttavissa 30 päivän ajan. Sulkee kaikki tiliin kohdistuvat raportit.
-      actions_description_html: Päätä, mihin toimiin ryhdyt tämän raportin ratkaisemiseksi. Jos ryhdyt rangaistustoimeen ilmoitettua tiliä kohtaan, hänelle lähetetään sähköposti-ilmoitus, paitsi jos <strong>Roskaposti</strong>-luokka on valittuna.
+      actions_description_html: Päätä, mihin toimiin ryhdyt tämän raportin ratkaisemiseksi. Jos ryhdyt rangaistustoimeen ilmoitettua tiliä kohtaan, hänelle lähetetään sähköpostitse ilmoitus asiasta, paitsi jos valittuna on <strong>Roskaposti</strong>-luokka.
       actions_description_remote_html: Päätä, mihin toimiin ryhdyt tämän raportin ratkaisemiseksi. Tämä vaikuttaa vain siihen, miten <strong>sinun</strong> palvelimesi viestii tämän etätilin kanssa ja käsittelee sen sisältöä.
       add_to_report: Lisää raporttiin
       already_suspended_badges:
@@ -977,7 +977,7 @@ fi:
         used_by_over_week:
           one: Käyttänyt yksi käyttäjä viimeisen viikon aikana
           other: Käyttänyt %{count} käyttäjää viimeisen viikon aikana
-      title: Suositukset ja trendit
+      title: Suositukset ja suuntaukset
       trending: Trendaus
     warning_presets:
       add_new: Lisää uusi
@@ -1135,7 +1135,7 @@ fi:
     security: Turvallisuus
     set_new_password: Aseta uusi salasana
     setup:
-      email_below_hint_html: Tarkista roskapostikansiosi tai pyydä uusi viesti. Voit korjata sähköpostiosoitteesi, jos se oli väärin.
+      email_below_hint_html: Tarkista roskapostikansiosi tai pyydä uusi viesti. Voit myös korjata sähköpostiosoitteesi tarvittaessa.
       email_settings_hint_html: Napsauta lähettämäämme linkkiä vahvistaaksesi osoitteen %{email}. Odotamme täällä.
       link_not_received: Etkö saanut linkkiä?
       new_confirmation_instructions_sent: Saat pian uuden vahvistuslinkin sisältävän sähköpostiviestin!
@@ -1195,8 +1195,8 @@ fi:
       caches: Muiden palvelinten välimuistiinsa tallentamaa sisältöä voi säilyä
       data_removal: Julkaisusi ja muut tietosi poistetaan pysyvästi
       email_change_html: Voit <a href="%{path}">muuttaa sähköpostiosoitettasi</a> poistamatta tiliäsi
-      email_contact_html: Jos ei saavu perille, voit pyytää apua sähköpostilla <a href="mailto:%{email}">%{email}</a>
-      email_reconfirmation_html: Jos et saa vahvistuksen sähköpostia, niin voit <a href="%{path}">pyytää sitä uudelleen</a>
+      email_contact_html: Mikäli viesti ei vieläkään saavu perille, voit pyytää apua sähköpostitse osoitteella <a href="mailto:%{email}">%{email}</a>
+      email_reconfirmation_html: Jos et saa vahvistussähköpostiviestiä, voit <a href="%{path}">pyytää sitä uudelleen</a>
       irreversible: Et voi palauttaa tiliäsi etkä aktivoida sitä uudelleen
       more_details_html: Tarkempia tietoja saat <a href="%{terms_path}">tietosuojakäytännöstämme</a>.
       username_available: Käyttäjänimesi tulee saataville uudelleen
diff --git a/config/locales/fr-CA.yml b/config/locales/fr-CA.yml
index 45c6baece912ba..140bc94344b93c 100644
--- a/config/locales/fr-CA.yml
+++ b/config/locales/fr-CA.yml
@@ -132,6 +132,7 @@ fr-CA:
       resubscribe: Se réabonner
       role: Rôle
       search: Rechercher
+      search_same_email_domain: Autres utilisateurs avec le même domaine de courriel
       search_same_ip: Autres utilisateur·rice·s avec la même IP
       security: Sécurité
       security_measures:
@@ -1428,6 +1429,7 @@ fr-CA:
   media_attachments:
     validations:
       images_and_video: Impossible de joindre une vidéo à un message contenant déjà des images
+      not_found: Média %{ids} introuvable ou déjà attaché à un autre message
       not_ready: Impossible de joindre les fichiers en cours de traitement. Réessayez dans un instant !
       too_many: Impossible de joindre plus de 4 fichiers
   migrations:
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 4434a165317f18..5646877d23c95a 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -132,6 +132,7 @@ fr:
       resubscribe: Se réabonner
       role: Rôle
       search: Rechercher
+      search_same_email_domain: Autres utilisateurs avec le même domaine de courriel
       search_same_ip: Autres utilisateur·rice·s avec la même IP
       security: Sécurité
       security_measures:
@@ -1428,6 +1429,7 @@ fr:
   media_attachments:
     validations:
       images_and_video: Impossible de joindre une vidéo à un message contenant déjà des images
+      not_found: Média %{ids} introuvable ou déjà attaché à un autre message
       not_ready: Impossible de joindre les fichiers en cours de traitement. Réessayez dans un instant !
       too_many: Impossible de joindre plus de 4 fichiers
   migrations:
diff --git a/config/locales/fy.yml b/config/locales/fy.yml
index d0127f77b17f22..de7495dd55d02e 100644
--- a/config/locales/fy.yml
+++ b/config/locales/fy.yml
@@ -1454,6 +1454,7 @@ fy:
   media_attachments:
     validations:
       images_and_video: In fideo kin net oan in berjocht mei ôfbyldingen keppele wurde
+      not_found: Media %{ids} net fûn of al tafoege oan in oar berjocht
       not_ready: Kin gjin bestannen tafoegje dy’t noch net ferwurke binne. Probearje it letter opnij!
       too_many: Der kinne net mear as 4 ôfbyldingen tafoege wurde
   migrations:
diff --git a/config/locales/ga.yml b/config/locales/ga.yml
index 27237bf3a42794..ad9ee21d3e2032 100644
--- a/config/locales/ga.yml
+++ b/config/locales/ga.yml
@@ -1532,6 +1532,7 @@ ga:
   media_attachments:
     validations:
       images_and_video: Ní féidir físeán a cheangal le postáil a bhfuil íomhánna ann cheana féin
+      not_found: Meán %{ids} gan aimsiú nó ceangailte le postáil eile cheana
       not_ready: Ní féidir comhaid nach bhfuil próiseáil críochnaithe acu a cheangal. Bain triail eile as i gceann nóiméad!
       too_many: Ní féidir níos mó ná 4 chomhad a cheangal
   migrations:
diff --git a/config/locales/gd.yml b/config/locales/gd.yml
index ef4add838e75b0..2af647ab9c5936 100644
--- a/config/locales/gd.yml
+++ b/config/locales/gd.yml
@@ -1506,6 +1506,7 @@ gd:
   media_attachments:
     validations:
       images_and_video: Chan urrainn dhut video a cheangal ri post sa bheil dealbh mu thràth
+      not_found: Cha deach na meadhanan %{ids} a lorg no chaidh an ceangal ri post eile mu thràth
       not_ready: Chan urrainn dhuinn faidhlichean a cheangal ris nach eil air am pròiseasadh fhathast. Feuch ris a-rithist an ceann greis!
       too_many: Chan urrainn dhut barrachd air 4 faidhlichean a ceangal ris
   migrations:
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 579dbd967fbacd..18496b9e1df78e 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -203,7 +203,7 @@ pt-BR:
         disable_sign_in_token_auth_user: Desativar autenticação via Token de Email para Usuário
         disable_user: Desativar usuário
         enable_custom_emoji: Ativar emoji personalizado
-        enable_sign_in_token_auth_user: Desativar autenticação via token por e-mail para o usuário
+        enable_sign_in_token_auth_user: Ativar autenticação via Token de Email para Usuário
         enable_user: Ativar usuário
         memorialize_account: Converter conta em memorial
         promote_user: Promover usuário
@@ -442,6 +442,7 @@ pt-BR:
         create: Adicionar domínio
         resolve: Resolver domínio
         title: Bloquear novo domínio de e-mail
+      no_email_domain_block_selected: Nenhum bloco de domínio de email foi alterado, pois, nenhum foi selecionado
       not_permitted: Não permitido
       resolved_dns_records_hint_html: O nome de domínio é associado aos seguintes domínios MX, que são responsáveis por aceitar e-mails. Ao bloquear um domínio MX, você bloqueará as inscrições de qualquer endereço de e-mail que use o mesmo domínio MX, mesmo que o nome de domínio visível seja diferente. <strong>Tenha cuidado para não bloquear os principais provedores de e-mail.</strong>
       resolved_through_html: Resolvido através de %{domain}
@@ -1440,6 +1441,13 @@ pt-BR:
       action: Sim, cancelar subscrição
       complete: Desinscrito
       confirmation_html: Tem certeza que deseja cancelar a assinatura de %{type} para Mastodon no %{domain} para o seu endereço de e-mail %{email}? Você sempre pode se inscrever novamente nas <a href="%{settings_path}">configurações de notificação de email</a>.
+      emails:
+        notification_emails:
+          favourite: emails de notificação favoritos
+          follow: seguir emails de notificação
+          follow_request: emails de seguidores pendentes
+          mention: emails de notificação de menções
+          reblog: emails de notificação de boosts
       resubscribe_html: Se você cancelou sua inscrição por engano, você pode se inscrever novamente em suas <a href="%{settings_path}"> configurações de notificações por e-mail</a>.
       success_html: Você não mais receberá %{type} no Mastodon em %{domain} ao seu endereço de e-mail %{email}.
       title: Cancelar inscrição
diff --git a/config/locales/simple_form.fr-CA.yml b/config/locales/simple_form.fr-CA.yml
index e8aafa4b1cf2b0..640d7e344a64c6 100644
--- a/config/locales/simple_form.fr-CA.yml
+++ b/config/locales/simple_form.fr-CA.yml
@@ -81,6 +81,7 @@ fr-CA:
         bootstrap_timeline_accounts: Ces comptes seront épinglés en tête de liste des recommandations pour les nouveaux utilisateurs.
         closed_registrations_message: Affiché lorsque les inscriptions sont fermées
         custom_css: Vous pouvez appliquer des styles personnalisés sur la version Web de Mastodon.
+        favicon: WEBP, PNG, GIF ou JPG. Remplace la favicon Mastodon par défaut avec une icône personnalisée.
         mascot: Remplace l'illustration dans l'interface Web avancée.
         media_cache_retention_period: Les fichiers médias des messages publiés par des utilisateurs distants sont mis en cache sur votre serveur. Lorsque cette valeur est positive, les médias sont supprimés au terme du nombre de jours spécifié. Si les données des médias sont demandées après leur suppression, elles seront téléchargées à nouveau, dans la mesure où le contenu source est toujours disponible. En raison des restrictions concernant la fréquence à laquelle les cartes de prévisualisation des liens interrogent des sites tiers, il est recommandé de fixer cette valeur à au moins 14 jours, faute de quoi les cartes de prévisualisation des liens ne seront pas mises à jour à la demande avant cette échéance.
         peers_api_enabled: Une liste de noms de domaine que ce serveur a rencontrés dans le fédiverse. Aucune donnée indiquant si vous vous fédérez ou non avec un serveur particulier n'est incluse ici, seulement l'information que votre serveur connaît un autre serveur. Cette option est utilisée par les services qui collectent des statistiques sur la fédération en général.
diff --git a/config/locales/simple_form.fr.yml b/config/locales/simple_form.fr.yml
index 315e22c5fb1761..04d48573a3ddb8 100644
--- a/config/locales/simple_form.fr.yml
+++ b/config/locales/simple_form.fr.yml
@@ -81,6 +81,7 @@ fr:
         bootstrap_timeline_accounts: Ces comptes seront épinglés en tête de liste des recommandations pour les nouveaux utilisateurs.
         closed_registrations_message: Affiché lorsque les inscriptions sont fermées
         custom_css: Vous pouvez appliquer des styles personnalisés sur la version Web de Mastodon.
+        favicon: WEBP, PNG, GIF ou JPG. Remplace la favicon Mastodon par défaut avec une icône personnalisée.
         mascot: Remplace l'illustration dans l'interface Web avancée.
         media_cache_retention_period: Les fichiers médias des messages publiés par des utilisateurs distants sont mis en cache sur votre serveur. Lorsque cette valeur est positive, les médias sont supprimés au terme du nombre de jours spécifié. Si les données des médias sont demandées après leur suppression, elles seront téléchargées à nouveau, dans la mesure où le contenu source est toujours disponible. En raison des restrictions concernant la fréquence à laquelle les cartes de prévisualisation des liens interrogent des sites tiers, il est recommandé de fixer cette valeur à au moins 14 jours, faute de quoi les cartes de prévisualisation des liens ne seront pas mises à jour à la demande avant cette échéance.
         peers_api_enabled: Une liste de noms de domaine que ce serveur a rencontrés dans le fédiverse. Aucune donnée indiquant si vous vous fédérez ou non avec un serveur particulier n'est incluse ici, seulement l'information que votre serveur connaît un autre serveur. Cette option est utilisée par les services qui collectent des statistiques sur la fédération en général.
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index c31a68926eed40..a8d401c7bbfe5b 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -1428,6 +1428,7 @@ zh-CN:
   media_attachments:
     validations:
       images_and_video: 无法在嘟文中同时插入视频和图片
+      not_found: 未发现媒体%{ids} 或已附在另一条嘟文中
       not_ready: 不能附加还在处理中的文件。请稍后再试！
       too_many: 最多只能添加 4 张图片
   migrations:

From be77a1098bef771dffe85d94e8ed4ddeb53cc768 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 6 Sep 2024 03:49:38 -0400
Subject: [PATCH 2124/2191] Extract `Account::AUTOMATED_ACTOR_TYPES` for "bot"
 actor_type values (#31772)

---
 app/models/account.rb        | 7 +++++--
 lib/mastodon/cli/accounts.rb | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/models/account.rb b/app/models/account.rb
index c20b72658bc7fd..d773d3344176bd 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -75,6 +75,8 @@ class Account < ApplicationRecord
   DISPLAY_NAME_LENGTH_LIMIT = 30
   NOTE_LENGTH_LIMIT = 500
 
+  AUTOMATED_ACTOR_TYPES = %w(Application Service).freeze
+
   include Attachmentable # Load prior to Avatar & Header concerns
 
   include Account::Associations
@@ -127,7 +129,8 @@ class Account < ApplicationRecord
   scope :without_silenced, -> { where(silenced_at: nil) }
   scope :without_instance_actor, -> { where.not(id: INSTANCE_ACTOR_ID) }
   scope :recent, -> { reorder(id: :desc) }
-  scope :bots, -> { where(actor_type: %w(Application Service)) }
+  scope :bots, -> { where(actor_type: AUTOMATED_ACTOR_TYPES) }
+  scope :non_automated, -> { where.not(actor_type: AUTOMATED_ACTOR_TYPES) }
   scope :groups, -> { where(actor_type: 'Group') }
   scope :alphabetic, -> { order(domain: :asc, username: :asc) }
   scope :matches_uri_prefix, ->(value) { where(arel_table[:uri].matches("#{sanitize_sql_like(value)}/%", false, true)).or(where(uri: value)) }
@@ -183,7 +186,7 @@ def moved?
   end
 
   def bot?
-    %w(Application Service).include? actor_type
+    AUTOMATED_ACTOR_TYPES.include?(actor_type)
   end
 
   def instance_actor?
diff --git a/lib/mastodon/cli/accounts.rb b/lib/mastodon/cli/accounts.rb
index 0cdf68158fac08..8a138323d49a8e 100644
--- a/lib/mastodon/cli/accounts.rb
+++ b/lib/mastodon/cli/accounts.rb
@@ -502,7 +502,7 @@ def approve(username = nil)
       - not muted/blocked by us
     LONG_DESC
     def prune
-      query = Account.remote.where.not(actor_type: %i(Application Service))
+      query = Account.remote.non_automated
       query = query.where('NOT EXISTS (SELECT 1 FROM mentions WHERE account_id = accounts.id)')
       query = query.where('NOT EXISTS (SELECT 1 FROM favourites WHERE account_id = accounts.id)')
       query = query.where('NOT EXISTS (SELECT 1 FROM statuses WHERE account_id = accounts.id)')

From 6b6a80b407e03c31326deb9838bc9c199bab39ea Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 6 Sep 2024 05:58:46 -0400
Subject: [PATCH 2125/2191] Remove `body_as_json` in favor of built-in
 `response.parsed_body` for JSON response specs (#31749)

---
 .../collections_controller_spec.rb            |  8 ++--
 ...lowers_synchronizations_controller_spec.rb |  3 +-
 .../activitypub/outboxes_controller_spec.rb   | 41 +++++++++++--------
 .../activitypub/replies_controller_spec.rb    |  2 +-
 .../auth/sessions_controller_spec.rb          |  2 +-
 .../follower_accounts_controller_spec.rb      | 37 +++++++++--------
 .../following_accounts_controller_spec.rb     | 37 +++++++++--------
 spec/controllers/statuses_controller_spec.rb  | 14 +++----
 spec/requests/accounts_spec.rb                |  8 ++--
 .../api/v1/accounts/credentials_spec.rb       |  6 +--
 .../v1/accounts/familiar_followers_spec.rb    |  2 +-
 .../api/v1/accounts/featured_tags_spec.rb     |  4 +-
 .../api/v1/accounts/follower_accounts_spec.rb | 14 +++----
 .../v1/accounts/following_accounts_spec.rb    | 14 +++----
 .../api/v1/accounts/relationships_spec.rb     | 14 +++----
 .../requests/api/v1/accounts/statuses_spec.rb |  6 +--
 spec/requests/api/v1/accounts_spec.rb         | 20 ++++-----
 spec/requests/api/v1/admin/accounts_spec.rb   |  6 +--
 .../v1/admin/canonical_email_blocks_spec.rb   | 22 +++++-----
 spec/requests/api/v1/admin/dimensions_spec.rb |  2 +-
 .../api/v1/admin/domain_allows_spec.rb        | 12 +++---
 .../api/v1/admin/domain_blocks_spec.rb        | 40 +++++++++---------
 .../api/v1/admin/email_domain_blocks_spec.rb  | 16 ++++----
 spec/requests/api/v1/admin/ip_blocks_spec.rb  | 14 +++----
 spec/requests/api/v1/admin/measures_spec.rb   |  2 +-
 spec/requests/api/v1/admin/reports_spec.rb    | 16 ++++----
 spec/requests/api/v1/admin/retention_spec.rb  |  2 +-
 spec/requests/api/v1/admin/tags_spec.rb       | 14 +++----
 .../api/v1/admin/trends/links/links_spec.rb   |  4 +-
 spec/requests/api/v1/annual_reports_spec.rb   |  2 +-
 spec/requests/api/v1/apps/credentials_spec.rb | 12 +++---
 spec/requests/api/v1/apps_spec.rb             | 10 ++---
 spec/requests/api/v1/blocks_spec.rb           |  8 ++--
 spec/requests/api/v1/bookmarks_spec.rb        |  4 +-
 spec/requests/api/v1/conversations_spec.rb    |  8 ++--
 spec/requests/api/v1/custom_emojis_spec.rb    |  4 +-
 spec/requests/api/v1/directories_spec.rb      | 20 ++++-----
 spec/requests/api/v1/domain_blocks_spec.rb    |  4 +-
 .../api/v1/emails/confirmations_spec.rb       |  8 ++--
 spec/requests/api/v1/endorsements_spec.rb     |  4 +-
 spec/requests/api/v1/favourites_spec.rb       |  4 +-
 .../api/v1/featured_tags/suggestions_spec.rb  |  2 +-
 spec/requests/api/v1/featured_tags_spec.rb    |  8 ++--
 spec/requests/api/v1/filters_spec.rb          |  2 +-
 spec/requests/api/v1/follow_requests_spec.rb  |  8 ++--
 spec/requests/api/v1/followed_tags_spec.rb    |  4 +-
 spec/requests/api/v1/instance_spec.rb         |  4 +-
 .../api/v1/instances/activity_spec.rb         |  2 +-
 .../api/v1/instances/domain_blocks_spec.rb    |  2 +-
 .../instances/extended_descriptions_spec.rb   |  2 +-
 .../api/v1/instances/languages_spec.rb        |  2 +-
 spec/requests/api/v1/instances/peers_spec.rb  |  2 +-
 .../api/v1/instances/privacy_policies_spec.rb |  2 +-
 spec/requests/api/v1/instances/rules_spec.rb  |  2 +-
 .../instances/translation_languages_spec.rb   |  4 +-
 spec/requests/api/v1/lists/accounts_spec.rb   |  4 +-
 spec/requests/api/v1/lists_spec.rb            |  8 ++--
 spec/requests/api/v1/markers_spec.rb          |  4 +-
 spec/requests/api/v1/media_spec.rb            |  4 +-
 spec/requests/api/v1/mutes_spec.rb            |  8 ++--
 .../api/v1/notifications/policies_spec.rb     |  4 +-
 .../api/v1/notifications/requests_spec.rb     |  4 +-
 spec/requests/api/v1/notifications_spec.rb    | 28 ++++++-------
 spec/requests/api/v1/peers/search_spec.rb     |  8 ++--
 spec/requests/api/v1/polls_spec.rb            |  2 +-
 spec/requests/api/v1/preferences_spec.rb      |  2 +-
 .../api/v1/push/subscriptions_spec.rb         |  4 +-
 spec/requests/api/v1/reports_spec.rb          |  2 +-
 spec/requests/api/v1/scheduled_status_spec.rb |  4 +-
 .../api/v1/statuses/bookmarks_spec.rb         |  6 +--
 .../statuses/favourited_by_accounts_spec.rb   |  8 ++--
 .../api/v1/statuses/favourites_spec.rb        |  6 +--
 .../api/v1/statuses/histories_spec.rb         |  2 +-
 spec/requests/api/v1/statuses/pins_spec.rb    |  4 +-
 .../v1/statuses/reblogged_by_accounts_spec.rb |  8 ++--
 spec/requests/api/v1/statuses/reblogs_spec.rb |  6 +--
 spec/requests/api/v1/statuses/sources_spec.rb |  4 +-
 spec/requests/api/v1/statuses_spec.rb         | 10 ++---
 spec/requests/api/v1/suggestions_spec.rb      |  4 +-
 spec/requests/api/v1/tags_spec.rb             |  2 +-
 spec/requests/api/v1/timelines/home_spec.rb   |  4 +-
 spec/requests/api/v1/timelines/link_spec.rb   |  4 +-
 spec/requests/api/v1/timelines/public_spec.rb |  4 +-
 spec/requests/api/v1/timelines/tag_spec.rb    |  4 +-
 spec/requests/api/v2/admin/accounts_spec.rb   |  2 +-
 spec/requests/api/v2/filters/keywords_spec.rb |  6 +--
 spec/requests/api/v2/filters/statuses_spec.rb |  6 +--
 spec/requests/api/v2/filters_spec.rb          |  9 ++--
 spec/requests/api/v2/instance_spec.rb         |  4 +-
 spec/requests/api/v2/media_spec.rb            |  8 ++--
 .../api/v2/notifications/policies_spec.rb     |  4 +-
 spec/requests/api/v2/search_spec.rb           |  4 +-
 spec/requests/api/v2/suggestions_spec.rb      |  2 +-
 .../v2_alpha/notifications/accounts_spec.rb   |  4 +-
 .../api/v2_alpha/notifications_spec.rb        | 34 +++++++--------
 spec/requests/api/web/embeds_spec.rb          |  6 +--
 spec/requests/emojis_spec.rb                  |  2 +-
 spec/requests/instance_actor_spec.rb          |  2 +-
 spec/requests/invite_spec.rb                  |  2 +-
 spec/requests/log_out_spec.rb                 |  2 +-
 spec/requests/manifest_spec.rb                |  2 +-
 spec/requests/oauth/token_spec.rb             |  6 +--
 spec/requests/signature_verification_spec.rb  | 30 +++++++-------
 spec/requests/well_known/node_info_spec.rb    |  4 +-
 .../well_known/oauth_metadata_spec.rb         |  2 +-
 spec/requests/well_known/webfinger_spec.rb    | 12 +++---
 spec/spec_helper.rb                           |  4 --
 107 files changed, 422 insertions(+), 413 deletions(-)

diff --git a/spec/controllers/activitypub/collections_controller_spec.rb b/spec/controllers/activitypub/collections_controller_spec.rb
index 088027385321f7..408e0dd2f6eb87 100644
--- a/spec/controllers/activitypub/collections_controller_spec.rb
+++ b/spec/controllers/activitypub/collections_controller_spec.rb
@@ -31,7 +31,7 @@
             .and have_cacheable_headers
           expect(response.media_type).to eq 'application/activity+json'
 
-          expect(body_as_json[:orderedItems])
+          expect(response.parsed_body[:orderedItems])
             .to be_an(Array)
             .and have_attributes(size: 3)
             .and include(ActivityPub::TagManager.instance.uri_for(private_pinned))
@@ -71,7 +71,7 @@
 
             expect(response.media_type).to eq 'application/activity+json'
 
-            expect(body_as_json[:orderedItems])
+            expect(response.parsed_body[:orderedItems])
               .to be_an(Array)
               .and have_attributes(size: 3)
               .and include(ActivityPub::TagManager.instance.uri_for(private_pinned))
@@ -94,7 +94,7 @@
               expect(response.media_type).to eq 'application/activity+json'
               expect(response.headers['Cache-Control']).to include 'private'
 
-              expect(body_as_json[:orderedItems])
+              expect(response.parsed_body[:orderedItems])
                 .to be_an(Array)
                 .and be_empty
             end
@@ -110,7 +110,7 @@
               expect(response.media_type).to eq 'application/activity+json'
               expect(response.headers['Cache-Control']).to include 'private'
 
-              expect(body_as_json[:orderedItems])
+              expect(response.parsed_body[:orderedItems])
                 .to be_an(Array)
                 .and be_empty
             end
diff --git a/spec/controllers/activitypub/followers_synchronizations_controller_spec.rb b/spec/controllers/activitypub/followers_synchronizations_controller_spec.rb
index c030078d43a643..cbd982f18f4cbb 100644
--- a/spec/controllers/activitypub/followers_synchronizations_controller_spec.rb
+++ b/spec/controllers/activitypub/followers_synchronizations_controller_spec.rb
@@ -34,7 +34,6 @@
     context 'with signature from example.com' do
       subject(:response) { get :show, params: { account_username: account.username } }
 
-      let(:body) { body_as_json }
       let(:remote_account) { Fabricate(:account, domain: 'example.com', uri: 'https://example.com/instance') }
 
       it 'returns http success and cache control and activity json types and correct items' do
@@ -42,7 +41,7 @@
         expect(response.headers['Cache-Control']).to eq 'max-age=0, private'
         expect(response.media_type).to eq 'application/activity+json'
 
-        expect(body[:orderedItems])
+        expect(response.parsed_body[:orderedItems])
           .to be_an(Array)
           .and contain_exactly(
             follower_example_com_instance_actor.uri,
diff --git a/spec/controllers/activitypub/outboxes_controller_spec.rb b/spec/controllers/activitypub/outboxes_controller_spec.rb
index 26a52bad93d89f..7ae28e8e09bf00 100644
--- a/spec/controllers/activitypub/outboxes_controller_spec.rb
+++ b/spec/controllers/activitypub/outboxes_controller_spec.rb
@@ -19,7 +19,6 @@
     context 'without signature' do
       subject(:response) { get :show, params: { account_username: account.username, page: page } }
 
-      let(:body) { body_as_json }
       let(:remote_account) { nil }
 
       context 'with page not requested' do
@@ -32,7 +31,7 @@
 
           expect(response.media_type).to eq 'application/activity+json'
           expect(response.headers['Vary']).to be_nil
-          expect(body[:totalItems]).to eq 4
+          expect(response.parsed_body[:totalItems]).to eq 4
         end
 
         context 'when account is permanently suspended' do
@@ -68,9 +67,11 @@
           expect(response.media_type).to eq 'application/activity+json'
           expect(response.headers['Vary']).to include 'Signature'
 
-          expect(body[:orderedItems]).to be_an Array
-          expect(body[:orderedItems].size).to eq 2
-          expect(body[:orderedItems].all? { |item| targets_public_collection?(item) }).to be true
+          expect(response.parsed_body)
+            .to include(
+              orderedItems: be_an(Array).and(have_attributes(size: 2))
+            )
+          expect(response.parsed_body[:orderedItems].all? { |item| targets_public_collection?(item) }).to be true
         end
 
         context 'when account is permanently suspended' do
@@ -110,9 +111,11 @@
           expect(response.media_type).to eq 'application/activity+json'
           expect(response.headers['Cache-Control']).to eq 'max-age=60, private'
 
-          expect(body_as_json[:orderedItems]).to be_an Array
-          expect(body_as_json[:orderedItems].size).to eq 2
-          expect(body_as_json[:orderedItems].all? { |item| targets_public_collection?(item) }).to be true
+          expect(response.parsed_body)
+            .to include(
+              orderedItems: be_an(Array).and(have_attributes(size: 2))
+            )
+          expect(response.parsed_body[:orderedItems].all? { |item| targets_public_collection?(item) }).to be true
         end
       end
 
@@ -127,9 +130,11 @@
           expect(response.media_type).to eq 'application/activity+json'
           expect(response.headers['Cache-Control']).to eq 'max-age=60, private'
 
-          expect(body_as_json[:orderedItems]).to be_an Array
-          expect(body_as_json[:orderedItems].size).to eq 3
-          expect(body_as_json[:orderedItems].all? { |item| targets_public_collection?(item) || targets_followers_collection?(item, account) }).to be true
+          expect(response.parsed_body)
+            .to include(
+              orderedItems: be_an(Array).and(have_attributes(size: 3))
+            )
+          expect(response.parsed_body[:orderedItems].all? { |item| targets_public_collection?(item) || targets_followers_collection?(item, account) }).to be true
         end
       end
 
@@ -144,9 +149,10 @@
           expect(response.media_type).to eq 'application/activity+json'
           expect(response.headers['Cache-Control']).to eq 'max-age=60, private'
 
-          expect(body_as_json[:orderedItems])
-            .to be_an(Array)
-            .and be_empty
+          expect(response.parsed_body)
+            .to include(
+              orderedItems: be_an(Array).and(be_empty)
+            )
         end
       end
 
@@ -161,9 +167,10 @@
           expect(response.media_type).to eq 'application/activity+json'
           expect(response.headers['Cache-Control']).to eq 'max-age=60, private'
 
-          expect(body_as_json[:orderedItems])
-            .to be_an(Array)
-            .and be_empty
+          expect(response.parsed_body)
+            .to include(
+              orderedItems: be_an(Array).and(be_empty)
+            )
         end
       end
     end
diff --git a/spec/controllers/activitypub/replies_controller_spec.rb b/spec/controllers/activitypub/replies_controller_spec.rb
index c10c782c9ae311..27821b0d4ec415 100644
--- a/spec/controllers/activitypub/replies_controller_spec.rb
+++ b/spec/controllers/activitypub/replies_controller_spec.rb
@@ -66,7 +66,7 @@
 
     context 'when status is public' do
       let(:parent_visibility) { :public }
-      let(:page_json) { body_as_json[:first] }
+      let(:page_json) { response.parsed_body[:first] }
 
       it 'returns http success and correct media type' do
         expect(response)
diff --git a/spec/controllers/auth/sessions_controller_spec.rb b/spec/controllers/auth/sessions_controller_spec.rb
index 9a94e5e1a1a464..3cc3460718caed 100644
--- a/spec/controllers/auth/sessions_controller_spec.rb
+++ b/spec/controllers/auth/sessions_controller_spec.rb
@@ -402,7 +402,7 @@
           end
 
           it 'instructs the browser to redirect to home, logs the user in, and updates the sign count' do
-            expect(body_as_json[:redirect_path]).to eq(root_path)
+            expect(response.parsed_body[:redirect_path]).to eq(root_path)
 
             expect(controller.current_user).to eq user
 
diff --git a/spec/controllers/follower_accounts_controller_spec.rb b/spec/controllers/follower_accounts_controller_spec.rb
index e84528d13e085e..e14ed00e609a24 100644
--- a/spec/controllers/follower_accounts_controller_spec.rb
+++ b/spec/controllers/follower_accounts_controller_spec.rb
@@ -39,8 +39,6 @@
     end
 
     context 'when format is json' do
-      subject(:body) { response.parsed_body }
-
       let(:response) { get :index, params: { account_username: alice.username, page: page, format: :json } }
 
       context 'with page' do
@@ -48,15 +46,15 @@
 
         it 'returns followers' do
           expect(response).to have_http_status(200)
-          expect(body_as_json)
+          expect(response.parsed_body)
             .to include(
               orderedItems: contain_exactly(
                 include(follow_from_bob.account.username),
                 include(follow_from_chris.account.username)
-              )
+              ),
+              totalItems: eq(2),
+              partOf: be_present
             )
-          expect(body['totalItems']).to eq 2
-          expect(body['partOf']).to be_present
         end
 
         context 'when account is permanently suspended' do
@@ -86,8 +84,11 @@
 
         it 'returns followers' do
           expect(response).to have_http_status(200)
-          expect(body['totalItems']).to eq 2
-          expect(body['partOf']).to be_blank
+          expect(response.parsed_body)
+            .to include(
+              totalItems: eq(2)
+            )
+            .and not_include(:partOf)
         end
 
         context 'when account hides their network' do
@@ -95,15 +96,17 @@
             alice.update(hide_collections: true)
           end
 
-          it 'returns followers count' do
-            expect(body['totalItems']).to eq 2
-          end
-
-          it 'does not return items' do
-            expect(body['items']).to be_blank
-            expect(body['orderedItems']).to be_blank
-            expect(body['first']).to be_blank
-            expect(body['last']).to be_blank
+          it 'returns followers count but not any items' do
+            expect(response.parsed_body)
+              .to include(
+                totalItems: eq(2)
+              )
+              .and not_include(
+                :items,
+                :orderedItems,
+                :first,
+                :last
+              )
           end
         end
 
diff --git a/spec/controllers/following_accounts_controller_spec.rb b/spec/controllers/following_accounts_controller_spec.rb
index 1e01b9f4945722..fea4d4845c8497 100644
--- a/spec/controllers/following_accounts_controller_spec.rb
+++ b/spec/controllers/following_accounts_controller_spec.rb
@@ -39,8 +39,6 @@
     end
 
     context 'when format is json' do
-      subject(:body) { response.parsed_body }
-
       let(:response) { get :index, params: { account_username: alice.username, page: page, format: :json } }
 
       context 'with page' do
@@ -48,15 +46,15 @@
 
         it 'returns followers' do
           expect(response).to have_http_status(200)
-          expect(body_as_json)
+          expect(response.parsed_body)
             .to include(
               orderedItems: contain_exactly(
                 include(follow_of_bob.target_account.username),
                 include(follow_of_chris.target_account.username)
-              )
+              ),
+              totalItems: eq(2),
+              partOf: be_present
             )
-          expect(body['totalItems']).to eq 2
-          expect(body['partOf']).to be_present
         end
 
         context 'when account is permanently suspended' do
@@ -86,8 +84,11 @@
 
         it 'returns followers' do
           expect(response).to have_http_status(200)
-          expect(body['totalItems']).to eq 2
-          expect(body['partOf']).to be_blank
+          expect(response.parsed_body)
+            .to include(
+              totalItems: eq(2)
+            )
+            .and not_include(:partOf)
         end
 
         context 'when account hides their network' do
@@ -95,15 +96,17 @@
             alice.update(hide_collections: true)
           end
 
-          it 'returns followers count' do
-            expect(body['totalItems']).to eq 2
-          end
-
-          it 'does not return items' do
-            expect(body['items']).to be_blank
-            expect(body['orderedItems']).to be_blank
-            expect(body['first']).to be_blank
-            expect(body['last']).to be_blank
+          it 'returns followers count but not any items' do
+            expect(response.parsed_body)
+              .to include(
+                totalItems: eq(2)
+              )
+              .and not_include(
+                :items,
+                :orderedItems,
+                :first,
+                :last
+              )
           end
         end
 
diff --git a/spec/controllers/statuses_controller_spec.rb b/spec/controllers/statuses_controller_spec.rb
index 289109a1fab450..2d5ff0135bb233 100644
--- a/spec/controllers/statuses_controller_spec.rb
+++ b/spec/controllers/statuses_controller_spec.rb
@@ -81,7 +81,7 @@
             'Content-Type' => include('application/activity+json'),
             'Link' => satisfy { |header| header.to_s.include?('activity+json') }
           )
-          expect(body_as_json)
+          expect(response.parsed_body)
             .to include(content: include(status.text))
         end
       end
@@ -186,7 +186,7 @@
               'Content-Type' => include('application/activity+json'),
               'Link' => satisfy { |header| header.to_s.include?('activity+json') }
             )
-            expect(body_as_json)
+            expect(response.parsed_body)
               .to include(content: include(status.text))
           end
         end
@@ -230,7 +230,7 @@
                 'Content-Type' => include('application/activity+json'),
                 'Link' => satisfy { |header| header.to_s.include?('activity+json') }
               )
-              expect(body_as_json)
+              expect(response.parsed_body)
                 .to include(content: include(status.text))
             end
           end
@@ -296,7 +296,7 @@
                 'Content-Type' => include('application/activity+json'),
                 'Link' => satisfy { |header| header.to_s.include?('activity+json') }
               )
-              expect(body_as_json)
+              expect(response.parsed_body)
                 .to include(content: include(status.text))
             end
           end
@@ -387,7 +387,7 @@
               'Content-Type' => include('application/activity+json'),
               'Link' => satisfy { |header| header.to_s.include?('activity+json') }
             )
-            expect(body_as_json)
+            expect(response.parsed_body)
               .to include(content: include(status.text))
           end
         end
@@ -431,7 +431,7 @@
                 'Link' => satisfy { |header| header.to_s.include?('activity+json') }
               )
 
-              expect(body_as_json)
+              expect(response.parsed_body)
                 .to include(content: include(status.text))
             end
           end
@@ -497,7 +497,7 @@
                 'Content-Type' => include('application/activity+json'),
                 'Link' => satisfy { |header| header.to_s.include?('activity+json') }
               )
-              expect(body_as_json)
+              expect(response.parsed_body)
                 .to include(content: include(status.text))
             end
           end
diff --git a/spec/requests/accounts_spec.rb b/spec/requests/accounts_spec.rb
index 3615868d745b28..e657ae60602bda 100644
--- a/spec/requests/accounts_spec.rb
+++ b/spec/requests/accounts_spec.rb
@@ -134,7 +134,7 @@
                 media_type: eq('application/activity+json')
               )
 
-            expect(body_as_json).to include(:id, :type, :preferredUsername, :inbox, :publicKey, :name, :summary)
+            expect(response.parsed_body).to include(:id, :type, :preferredUsername, :inbox, :publicKey, :name, :summary)
           end
 
           context 'with authorized fetch mode' do
@@ -163,7 +163,7 @@
 
             expect(response.headers['Cache-Control']).to include 'private'
 
-            expect(body_as_json).to include(:id, :type, :preferredUsername, :inbox, :publicKey, :name, :summary)
+            expect(response.parsed_body).to include(:id, :type, :preferredUsername, :inbox, :publicKey, :name, :summary)
           end
         end
 
@@ -182,7 +182,7 @@
                 media_type: eq('application/activity+json')
               )
 
-            expect(body_as_json).to include(:id, :type, :preferredUsername, :inbox, :publicKey, :name, :summary)
+            expect(response.parsed_body).to include(:id, :type, :preferredUsername, :inbox, :publicKey, :name, :summary)
           end
 
           context 'with authorized fetch mode' do
@@ -198,7 +198,7 @@
               expect(response.headers['Cache-Control']).to include 'private'
               expect(response.headers['Vary']).to include 'Signature'
 
-              expect(body_as_json).to include(:id, :type, :preferredUsername, :inbox, :publicKey, :name, :summary)
+              expect(response.parsed_body).to include(:id, :type, :preferredUsername, :inbox, :publicKey, :name, :summary)
             end
           end
         end
diff --git a/spec/requests/api/v1/accounts/credentials_spec.rb b/spec/requests/api/v1/accounts/credentials_spec.rb
index a3f552cada1e15..cc82e1892e2e69 100644
--- a/spec/requests/api/v1/accounts/credentials_spec.rb
+++ b/spec/requests/api/v1/accounts/credentials_spec.rb
@@ -20,7 +20,7 @@
 
       expect(response)
         .to have_http_status(200)
-      expect(body_as_json).to include({
+      expect(response.parsed_body).to include({
         source: hash_including({
           discoverable: false,
           indexable: false,
@@ -37,7 +37,7 @@
 
         expect(response).to have_http_status(200)
 
-        expect(body_as_json).to include({
+        expect(response.parsed_body).to include({
           locked: true,
         })
       end
@@ -93,7 +93,7 @@
       expect(response)
         .to have_http_status(200)
 
-      expect(body_as_json).to include({
+      expect(response.parsed_body).to include({
         source: hash_including({
           discoverable: true,
           indexable: true,
diff --git a/spec/requests/api/v1/accounts/familiar_followers_spec.rb b/spec/requests/api/v1/accounts/familiar_followers_spec.rb
index 475f1b17e4add0..8edfa4c8831f60 100644
--- a/spec/requests/api/v1/accounts/familiar_followers_spec.rb
+++ b/spec/requests/api/v1/accounts/familiar_followers_spec.rb
@@ -24,7 +24,7 @@
         account_ids = [account_a, account_b, account_b, account_a, account_a].map { |a| a.id.to_s }
         get '/api/v1/accounts/familiar_followers', params: { id: account_ids }, headers: headers
 
-        expect(body_as_json.pluck(:id)).to contain_exactly(account_a.id.to_s, account_b.id.to_s)
+        expect(response.parsed_body.pluck(:id)).to contain_exactly(account_a.id.to_s, account_b.id.to_s)
       end
     end
   end
diff --git a/spec/requests/api/v1/accounts/featured_tags_spec.rb b/spec/requests/api/v1/accounts/featured_tags_spec.rb
index bae7d448b6daee..f48ed01def00be 100644
--- a/spec/requests/api/v1/accounts/featured_tags_spec.rb
+++ b/spec/requests/api/v1/accounts/featured_tags_spec.rb
@@ -23,7 +23,7 @@
       subject
 
       expect(response).to have_http_status(200)
-      expect(body_as_json).to contain_exactly(a_hash_including({
+      expect(response.parsed_body).to contain_exactly(a_hash_including({
         name: 'bar',
         url: "https://cb6e6126.ngrok.io/@#{account.username}/tagged/bar",
       }), a_hash_including({
@@ -37,7 +37,7 @@
         subject
 
         expect(response).to have_http_status(200)
-        expect(body_as_json).to contain_exactly(a_hash_including({
+        expect(response.parsed_body).to contain_exactly(a_hash_including({
           name: 'bar',
           url: "https://cb6e6126.ngrok.io/@#{account.pretty_acct}/tagged/bar",
         }), a_hash_including({
diff --git a/spec/requests/api/v1/accounts/follower_accounts_spec.rb b/spec/requests/api/v1/accounts/follower_accounts_spec.rb
index 400b1c7aff1c85..2672615390a36e 100644
--- a/spec/requests/api/v1/accounts/follower_accounts_spec.rb
+++ b/spec/requests/api/v1/accounts/follower_accounts_spec.rb
@@ -21,8 +21,8 @@
       get "/api/v1/accounts/#{account.id}/followers", params: { limit: 2 }, headers: headers
 
       expect(response).to have_http_status(200)
-      expect(body_as_json.size).to eq 2
-      expect([body_as_json[0][:id], body_as_json[1][:id]]).to contain_exactly(alice.id.to_s, bob.id.to_s)
+      expect(response.parsed_body.size).to eq 2
+      expect([response.parsed_body[0][:id], response.parsed_body[1][:id]]).to contain_exactly(alice.id.to_s, bob.id.to_s)
     end
 
     it 'does not return blocked users', :aggregate_failures do
@@ -30,8 +30,8 @@
       get "/api/v1/accounts/#{account.id}/followers", params: { limit: 2 }, headers: headers
 
       expect(response).to have_http_status(200)
-      expect(body_as_json.size).to eq 1
-      expect(body_as_json[0][:id]).to eq alice.id.to_s
+      expect(response.parsed_body.size).to eq 1
+      expect(response.parsed_body[0][:id]).to eq alice.id.to_s
     end
 
     context 'when requesting user is blocked' do
@@ -41,7 +41,7 @@
 
       it 'hides results' do
         get "/api/v1/accounts/#{account.id}/followers", params: { limit: 2 }, headers: headers
-        expect(body_as_json.size).to eq 0
+        expect(response.parsed_body.size).to eq 0
       end
     end
 
@@ -52,8 +52,8 @@
         account.mute!(bob)
         get "/api/v1/accounts/#{account.id}/followers", params: { limit: 2 }, headers: headers
 
-        expect(body_as_json.size).to eq 2
-        expect([body_as_json[0][:id], body_as_json[1][:id]]).to contain_exactly(alice.id.to_s, bob.id.to_s)
+        expect(response.parsed_body.size).to eq 2
+        expect([response.parsed_body[0][:id], response.parsed_body[1][:id]]).to contain_exactly(alice.id.to_s, bob.id.to_s)
       end
     end
   end
diff --git a/spec/requests/api/v1/accounts/following_accounts_spec.rb b/spec/requests/api/v1/accounts/following_accounts_spec.rb
index b0bb5141ca2799..19105ebf2f3e0b 100644
--- a/spec/requests/api/v1/accounts/following_accounts_spec.rb
+++ b/spec/requests/api/v1/accounts/following_accounts_spec.rb
@@ -21,8 +21,8 @@
       get "/api/v1/accounts/#{account.id}/following", params: { limit: 2 }, headers: headers
 
       expect(response).to have_http_status(200)
-      expect(body_as_json.size).to eq 2
-      expect([body_as_json[0][:id], body_as_json[1][:id]]).to contain_exactly(alice.id.to_s, bob.id.to_s)
+      expect(response.parsed_body.size).to eq 2
+      expect([response.parsed_body[0][:id], response.parsed_body[1][:id]]).to contain_exactly(alice.id.to_s, bob.id.to_s)
     end
 
     it 'does not return blocked users', :aggregate_failures do
@@ -30,8 +30,8 @@
       get "/api/v1/accounts/#{account.id}/following", params: { limit: 2 }, headers: headers
 
       expect(response).to have_http_status(200)
-      expect(body_as_json.size).to eq 1
-      expect(body_as_json[0][:id]).to eq alice.id.to_s
+      expect(response.parsed_body.size).to eq 1
+      expect(response.parsed_body[0][:id]).to eq alice.id.to_s
     end
 
     context 'when requesting user is blocked' do
@@ -41,7 +41,7 @@
 
       it 'hides results' do
         get "/api/v1/accounts/#{account.id}/following", params: { limit: 2 }, headers: headers
-        expect(body_as_json.size).to eq 0
+        expect(response.parsed_body.size).to eq 0
       end
     end
 
@@ -52,8 +52,8 @@
         account.mute!(bob)
         get "/api/v1/accounts/#{account.id}/following", params: { limit: 2 }, headers: headers
 
-        expect(body_as_json.size).to eq 2
-        expect([body_as_json[0][:id], body_as_json[1][:id]]).to contain_exactly(alice.id.to_s, bob.id.to_s)
+        expect(response.parsed_body.size).to eq 2
+        expect([response.parsed_body[0][:id], response.parsed_body[1][:id]]).to contain_exactly(alice.id.to_s, bob.id.to_s)
       end
     end
   end
diff --git a/spec/requests/api/v1/accounts/relationships_spec.rb b/spec/requests/api/v1/accounts/relationships_spec.rb
index 76b1830bbe0ac2..9570d1214c6d04 100644
--- a/spec/requests/api/v1/accounts/relationships_spec.rb
+++ b/spec/requests/api/v1/accounts/relationships_spec.rb
@@ -29,7 +29,7 @@
 
       expect(response)
         .to have_http_status(200)
-      expect(body_as_json)
+      expect(response.parsed_body)
         .to be_an(Enumerable)
         .and contain_exactly(
           include(
@@ -50,7 +50,7 @@
 
           expect(response)
             .to have_http_status(200)
-          expect(body_as_json)
+          expect(response.parsed_body)
             .to be_an(Enumerable)
             .and have_attributes(
               size: 2
@@ -70,7 +70,7 @@
 
           expect(response)
             .to have_http_status(200)
-          expect(body_as_json)
+          expect(response.parsed_body)
             .to be_an(Enumerable)
             .and have_attributes(
               size: 3
@@ -89,7 +89,7 @@
         it 'removes duplicate account IDs from params' do
           subject
 
-          expect(body_as_json)
+          expect(response.parsed_body)
             .to be_an(Enumerable)
             .and have_attributes(
               size: 2
@@ -141,7 +141,7 @@ def bob_item
     it 'returns JSON with correct data on previously cached requests' do
       # Initial request including multiple accounts in params
       get '/api/v1/accounts/relationships', headers: headers, params: { id: [simon.id, lewis.id] }
-      expect(body_as_json)
+      expect(response.parsed_body)
         .to have_attributes(size: 2)
 
       # Subsequent request with different id, should override cache from first request
@@ -150,7 +150,7 @@ def bob_item
       expect(response)
         .to have_http_status(200)
 
-      expect(body_as_json)
+      expect(response.parsed_body)
         .to be_an(Enumerable)
         .and have_attributes(
           size: 1
@@ -172,7 +172,7 @@ def bob_item
       expect(response)
         .to have_http_status(200)
 
-      expect(body_as_json)
+      expect(response.parsed_body)
         .to be_an(Enumerable)
         .and contain_exactly(
           include(
diff --git a/spec/requests/api/v1/accounts/statuses_spec.rb b/spec/requests/api/v1/accounts/statuses_spec.rb
index 4a4d9383db31bb..e056a7890158fe 100644
--- a/spec/requests/api/v1/accounts/statuses_spec.rb
+++ b/spec/requests/api/v1/accounts/statuses_spec.rb
@@ -41,7 +41,7 @@
       it 'returns posts along with self replies', :aggregate_failures do
         expect(response)
           .to have_http_status(200)
-        expect(body_as_json)
+        expect(response.parsed_body)
           .to have_attributes(size: 2)
           .and contain_exactly(
             include(id: status.id.to_s),
@@ -102,7 +102,7 @@
         it 'lists the public status only' do
           get "/api/v1/accounts/#{account.id}/statuses", params: { pinned: true }, headers: headers
 
-          expect(body_as_json)
+          expect(response.parsed_body)
             .to contain_exactly(
               a_hash_including(id: status.id.to_s)
             )
@@ -117,7 +117,7 @@
         it 'lists both the public and the private statuses' do
           get "/api/v1/accounts/#{account.id}/statuses", params: { pinned: true }, headers: headers
 
-          expect(body_as_json)
+          expect(response.parsed_body)
             .to contain_exactly(
               a_hash_including(id: status.id.to_s),
               a_hash_including(id: private_status.id.to_s)
diff --git a/spec/requests/api/v1/accounts_spec.rb b/spec/requests/api/v1/accounts_spec.rb
index e31644352b7eac..2ebe56fa7d0281 100644
--- a/spec/requests/api/v1/accounts_spec.rb
+++ b/spec/requests/api/v1/accounts_spec.rb
@@ -17,7 +17,7 @@
       get '/api/v1/accounts', headers: headers, params: { id: [account.id, other_account.id, 123_123] }
 
       expect(response).to have_http_status(200)
-      expect(body_as_json).to contain_exactly(
+      expect(response.parsed_body).to contain_exactly(
         hash_including(id: account.id.to_s),
         hash_including(id: other_account.id.to_s)
       )
@@ -32,7 +32,7 @@
         get "/api/v1/accounts/#{account.id}"
 
         expect(response).to have_http_status(200)
-        expect(body_as_json[:id]).to eq(account.id.to_s)
+        expect(response.parsed_body[:id]).to eq(account.id.to_s)
       end
     end
 
@@ -41,7 +41,7 @@
         get '/api/v1/accounts/1'
 
         expect(response).to have_http_status(404)
-        expect(body_as_json[:error]).to eq('Record not found')
+        expect(response.parsed_body[:error]).to eq('Record not found')
       end
     end
 
@@ -57,7 +57,7 @@
         subject
 
         expect(response).to have_http_status(200)
-        expect(body_as_json[:id]).to eq(account.id.to_s)
+        expect(response.parsed_body[:id]).to eq(account.id.to_s)
       end
 
       it_behaves_like 'forbidden for wrong scope', 'write:statuses'
@@ -80,7 +80,7 @@
         subject
 
         expect(response).to have_http_status(200)
-        expect(body_as_json[:access_token]).to_not be_blank
+        expect(response.parsed_body[:access_token]).to_not be_blank
 
         user = User.find_by(email: 'hello@world.tld')
         expect(user).to_not be_nil
@@ -114,7 +114,7 @@
 
           expect(response).to have_http_status(200)
 
-          expect(body_as_json)
+          expect(response.parsed_body)
             .to include(
               following: true,
               requested: false
@@ -134,7 +134,7 @@
 
           expect(response).to have_http_status(200)
 
-          expect(body_as_json)
+          expect(response.parsed_body)
             .to include(
               following: false,
               requested: true
@@ -157,7 +157,7 @@
       it 'changes reblogs option' do
         post "/api/v1/accounts/#{other_account.id}/follow", headers: headers, params: { reblogs: true }
 
-        expect(body_as_json).to include({
+        expect(response.parsed_body).to include({
           following: true,
           showing_reblogs: true,
           notifying: false,
@@ -167,7 +167,7 @@
       it 'changes notify option' do
         post "/api/v1/accounts/#{other_account.id}/follow", headers: headers, params: { notify: true }
 
-        expect(body_as_json).to include({
+        expect(response.parsed_body).to include({
           following: true,
           showing_reblogs: false,
           notifying: true,
@@ -177,7 +177,7 @@
       it 'changes languages option' do
         post "/api/v1/accounts/#{other_account.id}/follow", headers: headers, params: { languages: %w(en es) }
 
-        expect(body_as_json).to include({
+        expect(response.parsed_body).to include({
           following: true,
           showing_reblogs: false,
           notifying: false,
diff --git a/spec/requests/api/v1/admin/accounts_spec.rb b/spec/requests/api/v1/admin/accounts_spec.rb
index 1615581f0ea26d..2dc45d5eb25505 100644
--- a/spec/requests/api/v1/admin/accounts_spec.rb
+++ b/spec/requests/api/v1/admin/accounts_spec.rb
@@ -19,7 +19,7 @@
         subject
 
         expect(response).to have_http_status(200)
-        expect(body_as_json.pluck(:id)).to match_array(expected_results.map { |a| a.id.to_s })
+        expect(response.parsed_body.pluck(:id)).to match_array(expected_results.map { |a| a.id.to_s })
       end
     end
 
@@ -93,7 +93,7 @@
         subject
 
         expect(response).to have_http_status(200)
-        expect(body_as_json.size).to eq(params[:limit])
+        expect(response.parsed_body.size).to eq(params[:limit])
       end
     end
   end
@@ -112,7 +112,7 @@
       subject
 
       expect(response).to have_http_status(200)
-      expect(body_as_json).to match(
+      expect(response.parsed_body).to match(
         a_hash_including(id: account.id.to_s, username: account.username, email: account.user.email)
       )
     end
diff --git a/spec/requests/api/v1/admin/canonical_email_blocks_spec.rb b/spec/requests/api/v1/admin/canonical_email_blocks_spec.rb
index 0cddf2c69e7725..dd7e119911cbe9 100644
--- a/spec/requests/api/v1/admin/canonical_email_blocks_spec.rb
+++ b/spec/requests/api/v1/admin/canonical_email_blocks_spec.rb
@@ -30,7 +30,7 @@
       it 'returns an empty list' do
         subject
 
-        expect(body_as_json).to be_empty
+        expect(response.parsed_body).to be_empty
       end
     end
 
@@ -41,7 +41,7 @@
       it 'returns the correct canonical email hashes' do
         subject
 
-        expect(body_as_json.pluck(:canonical_email_hash)).to match_array(expected_email_hashes)
+        expect(response.parsed_body.pluck(:canonical_email_hash)).to match_array(expected_email_hashes)
       end
 
       context 'with limit param' do
@@ -50,7 +50,7 @@
         it 'returns only the requested number of canonical email blocks' do
           subject
 
-          expect(body_as_json.size).to eq(params[:limit])
+          expect(response.parsed_body.size).to eq(params[:limit])
         end
       end
 
@@ -62,7 +62,7 @@
 
           canonical_email_blocks_ids = canonical_email_blocks.pluck(:id).map(&:to_s)
 
-          expect(body_as_json.pluck(:id)).to match_array(canonical_email_blocks_ids[2..])
+          expect(response.parsed_body.pluck(:id)).to match_array(canonical_email_blocks_ids[2..])
         end
       end
 
@@ -74,7 +74,7 @@
 
           canonical_email_blocks_ids = canonical_email_blocks.pluck(:id).map(&:to_s)
 
-          expect(body_as_json.pluck(:id)).to match_array(canonical_email_blocks_ids[..2])
+          expect(response.parsed_body.pluck(:id)).to match_array(canonical_email_blocks_ids[..2])
         end
       end
     end
@@ -96,7 +96,7 @@
         subject
 
         expect(response).to have_http_status(200)
-        expect(body_as_json)
+        expect(response.parsed_body)
           .to include(
             id: eq(canonical_email_block.id.to_s),
             canonical_email_hash: eq(canonical_email_block.canonical_email_hash)
@@ -142,7 +142,7 @@
           subject
 
           expect(response).to have_http_status(200)
-          expect(body_as_json[0][:canonical_email_hash]).to eq(canonical_email_block.canonical_email_hash)
+          expect(response.parsed_body.first[:canonical_email_hash]).to eq(canonical_email_block.canonical_email_hash)
         end
       end
 
@@ -151,7 +151,7 @@
           subject
 
           expect(response).to have_http_status(200)
-          expect(body_as_json).to be_empty
+          expect(response.parsed_body).to be_empty
         end
       end
     end
@@ -173,7 +173,7 @@
       subject
 
       expect(response).to have_http_status(200)
-      expect(body_as_json[:canonical_email_hash]).to eq(canonical_email_block.canonical_email_hash)
+      expect(response.parsed_body[:canonical_email_hash]).to eq(canonical_email_block.canonical_email_hash)
     end
 
     context 'when the required email param is not provided' do
@@ -193,7 +193,7 @@
         subject
 
         expect(response).to have_http_status(200)
-        expect(body_as_json[:canonical_email_hash]).to eq(params[:canonical_email_hash])
+        expect(response.parsed_body[:canonical_email_hash]).to eq(params[:canonical_email_hash])
       end
     end
 
@@ -204,7 +204,7 @@
         subject
 
         expect(response).to have_http_status(200)
-        expect(body_as_json[:canonical_email_hash]).to eq(canonical_email_block.canonical_email_hash)
+        expect(response.parsed_body[:canonical_email_hash]).to eq(canonical_email_block.canonical_email_hash)
       end
     end
 
diff --git a/spec/requests/api/v1/admin/dimensions_spec.rb b/spec/requests/api/v1/admin/dimensions_spec.rb
index 43e2db00c5c2d5..a28c2a9e3e521a 100644
--- a/spec/requests/api/v1/admin/dimensions_spec.rb
+++ b/spec/requests/api/v1/admin/dimensions_spec.rb
@@ -27,7 +27,7 @@
         expect(response)
           .to have_http_status(200)
 
-        expect(body_as_json)
+        expect(response.parsed_body)
           .to be_an(Array)
       end
     end
diff --git a/spec/requests/api/v1/admin/domain_allows_spec.rb b/spec/requests/api/v1/admin/domain_allows_spec.rb
index b8f0b0055c84fc..26c962b347a61f 100644
--- a/spec/requests/api/v1/admin/domain_allows_spec.rb
+++ b/spec/requests/api/v1/admin/domain_allows_spec.rb
@@ -30,7 +30,7 @@
       it 'returns an empty body' do
         subject
 
-        expect(body_as_json).to be_empty
+        expect(response.parsed_body).to be_empty
       end
     end
 
@@ -49,7 +49,7 @@
       it 'returns the correct allowed domains' do
         subject
 
-        expect(body_as_json).to match_array(expected_response)
+        expect(response.parsed_body).to match_array(expected_response)
       end
 
       context 'with limit param' do
@@ -58,7 +58,7 @@
         it 'returns only the requested number of allowed domains' do
           subject
 
-          expect(body_as_json.size).to eq(params[:limit])
+          expect(response.parsed_body.size).to eq(params[:limit])
         end
       end
     end
@@ -79,7 +79,7 @@
       subject
 
       expect(response).to have_http_status(200)
-      expect(body_as_json[:domain]).to eq domain_allow.domain
+      expect(response.parsed_body[:domain]).to eq domain_allow.domain
     end
 
     context 'when the requested allowed domain does not exist' do
@@ -107,7 +107,7 @@
         subject
 
         expect(response).to have_http_status(200)
-        expect(body_as_json[:domain]).to eq 'foo.bar.com'
+        expect(response.parsed_body[:domain]).to eq 'foo.bar.com'
         expect(DomainAllow.find_by(domain: 'foo.bar.com')).to be_present
       end
     end
@@ -140,7 +140,7 @@
       it 'returns the existing allowed domain name' do
         subject
 
-        expect(body_as_json[:domain]).to eq(params[:domain])
+        expect(response.parsed_body[:domain]).to eq(params[:domain])
       end
     end
   end
diff --git a/spec/requests/api/v1/admin/domain_blocks_spec.rb b/spec/requests/api/v1/admin/domain_blocks_spec.rb
index 7f7b9aa48af0e3..3f2cbbf1135788 100644
--- a/spec/requests/api/v1/admin/domain_blocks_spec.rb
+++ b/spec/requests/api/v1/admin/domain_blocks_spec.rb
@@ -30,7 +30,7 @@
       it 'returns an empty list' do
         subject
 
-        expect(body_as_json).to be_empty
+        expect(response.parsed_body).to be_empty
       end
     end
 
@@ -64,7 +64,7 @@
       it 'returns the expected domain blocks' do
         subject
 
-        expect(body_as_json).to match_array(expected_responde)
+        expect(response.parsed_body).to match_array(expected_responde)
       end
 
       context 'with limit param' do
@@ -73,7 +73,7 @@
         it 'returns only the requested number of domain blocks' do
           subject
 
-          expect(body_as_json.size).to eq(params[:limit])
+          expect(response.parsed_body.size).to eq(params[:limit])
         end
       end
     end
@@ -94,19 +94,17 @@
       subject
 
       expect(response).to have_http_status(200)
-      expect(body_as_json).to match(
-        {
-          id: domain_block.id.to_s,
-          domain: domain_block.domain,
-          digest: domain_block.domain_digest,
-          created_at: domain_block.created_at.strftime('%Y-%m-%dT%H:%M:%S.%LZ'),
-          severity: domain_block.severity.to_s,
-          reject_media: domain_block.reject_media,
-          reject_reports: domain_block.reject_reports,
-          private_comment: domain_block.private_comment,
-          public_comment: domain_block.public_comment,
-          obfuscate: domain_block.obfuscate,
-        }
+      expect(response.parsed_body).to match(
+        id: domain_block.id.to_s,
+        domain: domain_block.domain,
+        digest: domain_block.domain_digest,
+        created_at: domain_block.created_at.strftime('%Y-%m-%dT%H:%M:%S.%LZ'),
+        severity: domain_block.severity.to_s,
+        reject_media: domain_block.reject_media,
+        reject_reports: domain_block.reject_reports,
+        private_comment: domain_block.private_comment,
+        public_comment: domain_block.public_comment,
+        obfuscate: domain_block.obfuscate
       )
     end
 
@@ -134,7 +132,7 @@
       subject
 
       expect(response).to have_http_status(200)
-      expect(body_as_json).to match a_hash_including(
+      expect(response.parsed_body).to match a_hash_including(
         {
           domain: 'foo.bar.com',
           severity: 'silence',
@@ -155,7 +153,7 @@
         subject
 
         expect(response).to have_http_status(200)
-        expect(body_as_json).to match a_hash_including(
+        expect(response.parsed_body).to match a_hash_including(
           {
             domain: 'foo.bar.com',
             severity: 'suspend',
@@ -175,7 +173,7 @@
         subject
 
         expect(response).to have_http_status(422)
-        expect(body_as_json[:existing_domain_block][:domain]).to eq('foo.bar.com')
+        expect(response.parsed_body[:existing_domain_block][:domain]).to eq('foo.bar.com')
       end
     end
 
@@ -188,7 +186,7 @@
         subject
 
         expect(response).to have_http_status(422)
-        expect(body_as_json[:existing_domain_block][:domain]).to eq('bar.com')
+        expect(response.parsed_body[:existing_domain_block][:domain]).to eq('bar.com')
       end
     end
 
@@ -219,7 +217,7 @@
       subject
 
       expect(response).to have_http_status(200)
-      expect(body_as_json).to match a_hash_including(
+      expect(response.parsed_body).to match a_hash_including(
         {
           id: domain_block.id.to_s,
           domain: domain_block.domain,
diff --git a/spec/requests/api/v1/admin/email_domain_blocks_spec.rb b/spec/requests/api/v1/admin/email_domain_blocks_spec.rb
index 16656e0202c2f2..aa3073341a9a24 100644
--- a/spec/requests/api/v1/admin/email_domain_blocks_spec.rb
+++ b/spec/requests/api/v1/admin/email_domain_blocks_spec.rb
@@ -31,7 +31,7 @@
       it 'returns an empty list' do
         subject
 
-        expect(body_as_json).to be_empty
+        expect(response.parsed_body).to be_empty
       end
     end
 
@@ -42,7 +42,7 @@
       it 'return the correct blocked email domains' do
         subject
 
-        expect(body_as_json.pluck(:domain)).to match_array(blocked_email_domains)
+        expect(response.parsed_body.pluck(:domain)).to match_array(blocked_email_domains)
       end
 
       context 'with limit param' do
@@ -51,7 +51,7 @@
         it 'returns only the requested number of email domain blocks' do
           subject
 
-          expect(body_as_json.size).to eq(params[:limit])
+          expect(response.parsed_body.size).to eq(params[:limit])
         end
       end
 
@@ -63,7 +63,7 @@
 
           email_domain_blocks_ids = email_domain_blocks.pluck(:id).map(&:to_s)
 
-          expect(body_as_json.pluck(:id)).to match_array(email_domain_blocks_ids[2..])
+          expect(response.parsed_body.pluck(:id)).to match_array(email_domain_blocks_ids[2..])
         end
       end
 
@@ -75,7 +75,7 @@
 
           email_domain_blocks_ids = email_domain_blocks.pluck(:id).map(&:to_s)
 
-          expect(body_as_json.pluck(:id)).to match_array(email_domain_blocks_ids[..2])
+          expect(response.parsed_body.pluck(:id)).to match_array(email_domain_blocks_ids[..2])
         end
       end
     end
@@ -97,7 +97,7 @@
         subject
 
         expect(response).to have_http_status(200)
-        expect(body_as_json[:domain]).to eq(email_domain_block.domain)
+        expect(response.parsed_body[:domain]).to eq(email_domain_block.domain)
       end
     end
 
@@ -125,7 +125,7 @@
       subject
 
       expect(response).to have_http_status(200)
-      expect(body_as_json[:domain]).to eq(params[:domain])
+      expect(response.parsed_body[:domain]).to eq(params[:domain])
     end
 
     context 'when domain param is not provided' do
@@ -176,7 +176,7 @@
       subject
 
       expect(response).to have_http_status(200)
-      expect(body_as_json).to be_empty
+      expect(response.parsed_body).to be_empty
       expect(EmailDomainBlock.find_by(id: email_domain_block.id)).to be_nil
     end
 
diff --git a/spec/requests/api/v1/admin/ip_blocks_spec.rb b/spec/requests/api/v1/admin/ip_blocks_spec.rb
index bd4015b2d99214..b18f8f885cfe9d 100644
--- a/spec/requests/api/v1/admin/ip_blocks_spec.rb
+++ b/spec/requests/api/v1/admin/ip_blocks_spec.rb
@@ -30,7 +30,7 @@
       it 'returns an empty body' do
         subject
 
-        expect(body_as_json).to be_empty
+        expect(response.parsed_body).to be_empty
       end
     end
 
@@ -58,7 +58,7 @@
       it 'returns the correct blocked ips' do
         subject
 
-        expect(body_as_json).to match_array(expected_response)
+        expect(response.parsed_body).to match_array(expected_response)
       end
 
       context 'with limit param' do
@@ -67,7 +67,7 @@
         it 'returns only the requested number of ip blocks' do
           subject
 
-          expect(body_as_json.size).to eq(params[:limit])
+          expect(response.parsed_body.size).to eq(params[:limit])
         end
       end
     end
@@ -89,7 +89,7 @@
 
       expect(response).to have_http_status(200)
 
-      expect(body_as_json)
+      expect(response.parsed_body)
         .to include(
           ip: eq("#{ip_block.ip}/#{ip_block.ip.prefix}"),
           severity: eq(ip_block.severity.to_s)
@@ -120,7 +120,7 @@
       subject
 
       expect(response).to have_http_status(200)
-      expect(body_as_json)
+      expect(response.parsed_body)
         .to include(
           ip: eq("#{params[:ip]}/32"),
           severity: eq(params[:severity]),
@@ -185,7 +185,7 @@
         .and change_comment_value
 
       expect(response).to have_http_status(200)
-      expect(body_as_json).to match(hash_including({
+      expect(response.parsed_body).to match(hash_including({
         ip: "#{ip_block.ip}/#{ip_block.ip.prefix}",
         severity: 'sign_up_requires_approval',
         comment: 'Decreasing severity',
@@ -220,7 +220,7 @@ def change_comment_value
       subject
 
       expect(response).to have_http_status(200)
-      expect(body_as_json).to be_empty
+      expect(response.parsed_body).to be_empty
       expect(IpBlock.find_by(id: ip_block.id)).to be_nil
     end
 
diff --git a/spec/requests/api/v1/admin/measures_spec.rb b/spec/requests/api/v1/admin/measures_spec.rb
index 56a2c1eaee38fb..de359a5ccdfea1 100644
--- a/spec/requests/api/v1/admin/measures_spec.rb
+++ b/spec/requests/api/v1/admin/measures_spec.rb
@@ -44,7 +44,7 @@
         expect(response)
           .to have_http_status(200)
 
-        expect(body_as_json)
+        expect(response.parsed_body)
           .to be_an(Array)
       end
     end
diff --git a/spec/requests/api/v1/admin/reports_spec.rb b/spec/requests/api/v1/admin/reports_spec.rb
index 4b0b7e17134734..2c40f56dc8adea 100644
--- a/spec/requests/api/v1/admin/reports_spec.rb
+++ b/spec/requests/api/v1/admin/reports_spec.rb
@@ -29,7 +29,7 @@
       it 'returns an empty list' do
         subject
 
-        expect(body_as_json).to be_empty
+        expect(response.parsed_body).to be_empty
       end
     end
 
@@ -64,7 +64,7 @@
       it 'returns all unresolved reports' do
         subject
 
-        expect(body_as_json).to match_array(expected_response)
+        expect(response.parsed_body).to match_array(expected_response)
       end
 
       context 'with resolved param' do
@@ -74,7 +74,7 @@
         it 'returns only the resolved reports' do
           subject
 
-          expect(body_as_json).to match_array(expected_response)
+          expect(response.parsed_body).to match_array(expected_response)
         end
       end
 
@@ -85,7 +85,7 @@
         it 'returns all unresolved reports filed by the specified account' do
           subject
 
-          expect(body_as_json).to match_array(expected_response)
+          expect(response.parsed_body).to match_array(expected_response)
         end
       end
 
@@ -96,7 +96,7 @@
         it 'returns all unresolved reports targeting the specified account' do
           subject
 
-          expect(body_as_json).to match_array(expected_response)
+          expect(response.parsed_body).to match_array(expected_response)
         end
       end
 
@@ -106,7 +106,7 @@
         it 'returns only the requested number of reports' do
           subject
 
-          expect(body_as_json.size).to eq(1)
+          expect(response.parsed_body.size).to eq(1)
         end
       end
     end
@@ -126,7 +126,7 @@
       subject
 
       expect(response).to have_http_status(200)
-      expect(body_as_json).to include(
+      expect(response.parsed_body).to include(
         {
           id: report.id.to_s,
           action_taken: report.action_taken?,
@@ -159,7 +159,7 @@
 
       report.reload
 
-      expect(body_as_json).to include(
+      expect(response.parsed_body).to include(
         {
           id: report.id.to_s,
           action_taken: report.action_taken?,
diff --git a/spec/requests/api/v1/admin/retention_spec.rb b/spec/requests/api/v1/admin/retention_spec.rb
index 138959a0ab7015..c28fa6de815bfa 100644
--- a/spec/requests/api/v1/admin/retention_spec.rb
+++ b/spec/requests/api/v1/admin/retention_spec.rb
@@ -27,7 +27,7 @@
         expect(response)
           .to have_http_status(200)
 
-        expect(body_as_json)
+        expect(response.parsed_body)
           .to be_an(Array)
       end
     end
diff --git a/spec/requests/api/v1/admin/tags_spec.rb b/spec/requests/api/v1/admin/tags_spec.rb
index 031be17f52a5a3..2f730cdeb8dfaf 100644
--- a/spec/requests/api/v1/admin/tags_spec.rb
+++ b/spec/requests/api/v1/admin/tags_spec.rb
@@ -30,7 +30,7 @@
       it 'returns an empty list' do
         subject
 
-        expect(body_as_json).to be_empty
+        expect(response.parsed_body).to be_empty
       end
     end
 
@@ -47,7 +47,7 @@
       it 'returns the expected tags' do
         subject
         tags.each do |tag|
-          expect(body_as_json.find { |item| item[:id] == tag.id.to_s && item[:name] == tag.name }).to_not be_nil
+          expect(response.parsed_body.find { |item| item[:id] == tag.id.to_s && item[:name] == tag.name }).to_not be_nil
         end
       end
 
@@ -57,7 +57,7 @@
         it 'returns only the requested number of tags' do
           subject
 
-          expect(body_as_json.size).to eq(params[:limit])
+          expect(response.parsed_body.size).to eq(params[:limit])
         end
       end
     end
@@ -82,8 +82,8 @@
     it 'returns expected tag content' do
       subject
 
-      expect(body_as_json[:id].to_i).to eq(tag.id)
-      expect(body_as_json[:name]).to eq(tag.name)
+      expect(response.parsed_body[:id].to_i).to eq(tag.id)
+      expect(response.parsed_body[:name]).to eq(tag.name)
     end
 
     context 'when the requested tag does not exist' do
@@ -116,8 +116,8 @@
     it 'returns updated tag' do
       subject
 
-      expect(body_as_json[:id].to_i).to eq(tag.id)
-      expect(body_as_json[:name]).to eq(tag.name.upcase)
+      expect(response.parsed_body[:id].to_i).to eq(tag.id)
+      expect(response.parsed_body[:name]).to eq(tag.name.upcase)
     end
 
     context 'when the updated display name is invalid' do
diff --git a/spec/requests/api/v1/admin/trends/links/links_spec.rb b/spec/requests/api/v1/admin/trends/links/links_spec.rb
index 082af785ab0e37..c436b7081e615f 100644
--- a/spec/requests/api/v1/admin/trends/links/links_spec.rb
+++ b/spec/requests/api/v1/admin/trends/links/links_spec.rb
@@ -44,7 +44,7 @@ def change_link_trendable_to_true
     end
 
     def expects_correct_link_data
-      expect(body_as_json).to match(
+      expect(response.parsed_body).to match(
         a_hash_including(
           url: preview_card.url,
           title: preview_card.title,
@@ -98,7 +98,7 @@ def change_link_trendable
     it 'returns the link data' do
       subject
 
-      expect(body_as_json).to match(
+      expect(response.parsed_body).to match(
         a_hash_including(
           url: preview_card.url,
           title: preview_card.title,
diff --git a/spec/requests/api/v1/annual_reports_spec.rb b/spec/requests/api/v1/annual_reports_spec.rb
index bab184787f3e4a..8051a654847ecc 100644
--- a/spec/requests/api/v1/annual_reports_spec.rb
+++ b/spec/requests/api/v1/annual_reports_spec.rb
@@ -34,7 +34,7 @@
         expect(response)
           .to have_http_status(200)
 
-        expect(body_as_json)
+        expect(response.parsed_body)
           .to be_present
       end
     end
diff --git a/spec/requests/api/v1/apps/credentials_spec.rb b/spec/requests/api/v1/apps/credentials_spec.rb
index b899999640bff0..1cd6a4178fcd8e 100644
--- a/spec/requests/api/v1/apps/credentials_spec.rb
+++ b/spec/requests/api/v1/apps/credentials_spec.rb
@@ -18,7 +18,7 @@
 
         expect(response).to have_http_status(200)
 
-        expect(body_as_json).to match(
+        expect(response.parsed_body).to match(
           a_hash_including(
             id: token.application.id.to_s,
             name: token.application.name,
@@ -37,8 +37,8 @@
 
         expect(response).to have_http_status(200)
 
-        expect(body_as_json[:client_id]).to_not be_present
-        expect(body_as_json[:client_secret]).to_not be_present
+        expect(response.parsed_body[:client_id]).to_not be_present
+        expect(response.parsed_body[:client_secret]).to_not be_present
       end
     end
 
@@ -56,7 +56,7 @@
       it 'returns the app information correctly' do
         subject
 
-        expect(body_as_json).to match(
+        expect(response.parsed_body).to match(
           a_hash_including(
             id: token.application.id.to_s,
             name: token.application.name,
@@ -95,7 +95,7 @@
       it 'returns the error in the json response' do
         subject
 
-        expect(body_as_json).to match(
+        expect(response.parsed_body).to match(
           a_hash_including(
             error: 'The access token was revoked'
           )
@@ -117,7 +117,7 @@
       it 'returns the error in the json response' do
         subject
 
-        expect(body_as_json).to match(
+        expect(response.parsed_body).to match(
           a_hash_including(
             error: 'The access token is invalid'
           )
diff --git a/spec/requests/api/v1/apps_spec.rb b/spec/requests/api/v1/apps_spec.rb
index 81d6c6812602a3..51a0c3fd0c6dc7 100644
--- a/spec/requests/api/v1/apps_spec.rb
+++ b/spec/requests/api/v1/apps_spec.rb
@@ -35,7 +35,7 @@
         expect(app.scopes.to_s).to eq scopes
         expect(app.redirect_uris).to eq redirect_uris
 
-        expect(body_as_json).to match(
+        expect(response.parsed_body).to match(
           a_hash_including(
             id: app.id.to_s,
             client_id: app.uid,
@@ -61,7 +61,7 @@
         expect(response).to have_http_status(200)
         expect(Doorkeeper::Application.find_by(name: client_name)).to be_present
 
-        expect(body_as_json)
+        expect(response.parsed_body)
           .to include(
             scopes: Doorkeeper.config.default_scopes.to_a
           )
@@ -82,7 +82,7 @@
         expect(app).to be_present
         expect(app.scopes.to_s).to eq 'read'
 
-        expect(body_as_json)
+        expect(response.parsed_body)
           .to include(
             scopes: %w(read)
           )
@@ -165,7 +165,7 @@
         expect(app.redirect_uri).to eq redirect_uris
         expect(app.redirect_uris).to eq redirect_uris.split
 
-        expect(body_as_json)
+        expect(response.parsed_body)
           .to include(
             redirect_uri: redirect_uris,
             redirect_uris: redirect_uris.split
@@ -187,7 +187,7 @@
         expect(app.redirect_uri).to eq redirect_uris.join "\n"
         expect(app.redirect_uris).to eq redirect_uris
 
-        expect(body_as_json)
+        expect(response.parsed_body)
           .to include(
             redirect_uri: redirect_uris.join("\n"),
             redirect_uris: redirect_uris
diff --git a/spec/requests/api/v1/blocks_spec.rb b/spec/requests/api/v1/blocks_spec.rb
index 06d2c4d997ad0e..d2f1c46a5b9839 100644
--- a/spec/requests/api/v1/blocks_spec.rb
+++ b/spec/requests/api/v1/blocks_spec.rb
@@ -26,7 +26,7 @@
       subject
 
       expect(response).to have_http_status(200)
-      expect(body_as_json).to match_array(expected_response)
+      expect(response.parsed_body).to match_array(expected_response)
     end
 
     context 'with limit param' do
@@ -35,7 +35,7 @@
       it 'returns only the requested number of blocked accounts' do
         subject
 
-        expect(body_as_json.size).to eq(params[:limit])
+        expect(response.parsed_body.size).to eq(params[:limit])
       end
 
       it 'sets correct link header pagination' do
@@ -55,7 +55,7 @@
       it 'queries the blocks in range according to max_id', :aggregate_failures do
         subject
 
-        expect(body_as_json)
+        expect(response.parsed_body)
           .to contain_exactly(include(id: blocks.first.target_account.id.to_s))
       end
     end
@@ -66,7 +66,7 @@
       it 'queries the blocks in range according to since_id', :aggregate_failures do
         subject
 
-        expect(body_as_json)
+        expect(response.parsed_body)
           .to contain_exactly(include(id: blocks[2].target_account.id.to_s))
       end
     end
diff --git a/spec/requests/api/v1/bookmarks_spec.rb b/spec/requests/api/v1/bookmarks_spec.rb
index dc32820c8983ad..95a71abcac706b 100644
--- a/spec/requests/api/v1/bookmarks_spec.rb
+++ b/spec/requests/api/v1/bookmarks_spec.rb
@@ -33,7 +33,7 @@
     it 'returns the bookmarked statuses' do
       subject
 
-      expect(body_as_json).to match_array(expected_response)
+      expect(response.parsed_body).to match_array(expected_response)
     end
 
     context 'with limit param' do
@@ -42,7 +42,7 @@
       it 'paginates correctly', :aggregate_failures do
         subject
 
-        expect(body_as_json.size)
+        expect(response.parsed_body.size)
           .to eq(params[:limit])
 
         expect(response)
diff --git a/spec/requests/api/v1/conversations_spec.rb b/spec/requests/api/v1/conversations_spec.rb
index f136e1f4e84dfd..bd3cbfd0e7f43f 100644
--- a/spec/requests/api/v1/conversations_spec.rb
+++ b/spec/requests/api/v1/conversations_spec.rb
@@ -31,8 +31,8 @@
     it 'returns conversations', :aggregate_failures do
       get '/api/v1/conversations', headers: headers
 
-      expect(body_as_json.size).to eq 2
-      expect(body_as_json[0][:accounts].size).to eq 1
+      expect(response.parsed_body.size).to eq 2
+      expect(response.parsed_body.first[:accounts].size).to eq 1
     end
 
     context 'with since_id' do
@@ -40,7 +40,7 @@
         it 'returns conversations' do
           get '/api/v1/conversations', params: { since_id: Mastodon::Snowflake.id_at(1.hour.ago, with_random: false) }, headers: headers
 
-          expect(body_as_json.size).to eq 2
+          expect(response.parsed_body.size).to eq 2
         end
       end
 
@@ -48,7 +48,7 @@
         it 'returns no conversation' do
           get '/api/v1/conversations', params: { since_id: Mastodon::Snowflake.id_at(1.hour.from_now, with_random: false) }, headers: headers
 
-          expect(body_as_json.size).to eq 0
+          expect(response.parsed_body.size).to eq 0
         end
       end
     end
diff --git a/spec/requests/api/v1/custom_emojis_spec.rb b/spec/requests/api/v1/custom_emojis_spec.rb
index 798d8e29ed0b71..0942734ff3d809 100644
--- a/spec/requests/api/v1/custom_emojis_spec.rb
+++ b/spec/requests/api/v1/custom_emojis_spec.rb
@@ -19,7 +19,7 @@
         expect(response)
           .to have_http_status(200)
 
-        expect(body_as_json)
+        expect(response.parsed_body)
           .to be_present
           .and have_attributes(
             first: include(shortcode: 'coolcat')
@@ -34,7 +34,7 @@
         expect(response)
           .to have_http_status(200)
 
-        expect(body_as_json)
+        expect(response.parsed_body)
           .to be_present
           .and have_attributes(
             first: include(shortcode: 'coolcat')
diff --git a/spec/requests/api/v1/directories_spec.rb b/spec/requests/api/v1/directories_spec.rb
index 94306c06ec32fe..aa602a71cd65e3 100644
--- a/spec/requests/api/v1/directories_spec.rb
+++ b/spec/requests/api/v1/directories_spec.rb
@@ -82,8 +82,8 @@
         get '/api/v1/directory', headers: headers
 
         expect(response).to have_http_status(200)
-        expect(body_as_json.size).to eq(2)
-        expect(body_as_json.pluck(:id)).to contain_exactly(eligible_remote_account.id.to_s, local_discoverable_account.id.to_s)
+        expect(response.parsed_body.size).to eq(2)
+        expect(response.parsed_body.pluck(:id)).to contain_exactly(eligible_remote_account.id.to_s, local_discoverable_account.id.to_s)
       end
     end
 
@@ -101,8 +101,8 @@
         get '/api/v1/directory', headers: headers, params: { local: '1' }
 
         expect(response).to have_http_status(200)
-        expect(body_as_json.size).to eq(1)
-        expect(body_as_json.first[:id]).to include(local_account.id.to_s)
+        expect(response.parsed_body.size).to eq(1)
+        expect(response.parsed_body.first[:id]).to include(local_account.id.to_s)
         expect(response.body).to_not include(remote_account.id.to_s)
       end
     end
@@ -115,9 +115,9 @@
         get '/api/v1/directory', headers: headers, params: { order: 'active' }
 
         expect(response).to have_http_status(200)
-        expect(body_as_json.size).to eq(2)
-        expect(body_as_json.first[:id]).to include(new_stat.account_id.to_s)
-        expect(body_as_json.second[:id]).to include(old_stat.account_id.to_s)
+        expect(response.parsed_body.size).to eq(2)
+        expect(response.parsed_body.first[:id]).to include(new_stat.account_id.to_s)
+        expect(response.parsed_body.second[:id]).to include(old_stat.account_id.to_s)
       end
     end
 
@@ -130,9 +130,9 @@
         get '/api/v1/directory', headers: headers, params: { order: 'new' }
 
         expect(response).to have_http_status(200)
-        expect(body_as_json.size).to eq(2)
-        expect(body_as_json.first[:id]).to include(account_new.id.to_s)
-        expect(body_as_json.second[:id]).to include(account_old.id.to_s)
+        expect(response.parsed_body.size).to eq(2)
+        expect(response.parsed_body.first[:id]).to include(account_new.id.to_s)
+        expect(response.parsed_body.second[:id]).to include(account_old.id.to_s)
       end
     end
   end
diff --git a/spec/requests/api/v1/domain_blocks_spec.rb b/spec/requests/api/v1/domain_blocks_spec.rb
index 954497ebe15131..8184c26bed101f 100644
--- a/spec/requests/api/v1/domain_blocks_spec.rb
+++ b/spec/requests/api/v1/domain_blocks_spec.rb
@@ -26,7 +26,7 @@
       subject
 
       expect(response).to have_http_status(200)
-      expect(body_as_json).to match_array(blocked_domains)
+      expect(response.parsed_body).to match_array(blocked_domains)
     end
 
     context 'with limit param' do
@@ -35,7 +35,7 @@
       it 'returns only the requested number of blocked domains' do
         subject
 
-        expect(body_as_json.size).to eq(params[:limit])
+        expect(response.parsed_body.size).to eq(params[:limit])
       end
     end
   end
diff --git a/spec/requests/api/v1/emails/confirmations_spec.rb b/spec/requests/api/v1/emails/confirmations_spec.rb
index 8f5171ee782c09..0a419a10cfb937 100644
--- a/spec/requests/api/v1/emails/confirmations_spec.rb
+++ b/spec/requests/api/v1/emails/confirmations_spec.rb
@@ -111,7 +111,7 @@
           subject
 
           expect(response).to have_http_status(200)
-          expect(body_as_json).to be false
+          expect(response.parsed_body).to be false
         end
       end
 
@@ -122,7 +122,7 @@
           subject
 
           expect(response).to have_http_status(200)
-          expect(body_as_json).to be true
+          expect(response.parsed_body).to be true
         end
       end
     end
@@ -139,7 +139,7 @@
           subject
 
           expect(response).to have_http_status(200)
-          expect(body_as_json).to be false
+          expect(response.parsed_body).to be false
         end
       end
 
@@ -150,7 +150,7 @@
           subject
 
           expect(response).to have_http_status(200)
-          expect(body_as_json).to be true
+          expect(response.parsed_body).to be true
         end
       end
     end
diff --git a/spec/requests/api/v1/endorsements_spec.rb b/spec/requests/api/v1/endorsements_spec.rb
index 255211a4041848..25917f527a1645 100644
--- a/spec/requests/api/v1/endorsements_spec.rb
+++ b/spec/requests/api/v1/endorsements_spec.rb
@@ -37,7 +37,7 @@
           expect(response)
             .to have_http_status(200)
 
-          expect(body_as_json)
+          expect(response.parsed_body)
             .to be_present
             .and have_attributes(
               first: include(acct: account_pin.target_account.acct)
@@ -52,7 +52,7 @@
           expect(response)
             .to have_http_status(200)
 
-          expect(body_as_json)
+          expect(response.parsed_body)
             .to_not be_present
         end
       end
diff --git a/spec/requests/api/v1/favourites_spec.rb b/spec/requests/api/v1/favourites_spec.rb
index b988ac99dbe129..78e9d61551fab7 100644
--- a/spec/requests/api/v1/favourites_spec.rb
+++ b/spec/requests/api/v1/favourites_spec.rb
@@ -33,7 +33,7 @@
     it 'returns the favourites' do
       subject
 
-      expect(body_as_json).to match_array(expected_response)
+      expect(response.parsed_body).to match_array(expected_response)
     end
 
     context 'with limit param' do
@@ -42,7 +42,7 @@
       it 'returns only the requested number of favourites' do
         subject
 
-        expect(body_as_json.size).to eq(params[:limit])
+        expect(response.parsed_body.size).to eq(params[:limit])
       end
 
       it 'sets the correct pagination headers' do
diff --git a/spec/requests/api/v1/featured_tags/suggestions_spec.rb b/spec/requests/api/v1/featured_tags/suggestions_spec.rb
index 0a7bfe5cda9f78..8815c65cf1ee39 100644
--- a/spec/requests/api/v1/featured_tags/suggestions_spec.rb
+++ b/spec/requests/api/v1/featured_tags/suggestions_spec.rb
@@ -32,7 +32,7 @@
 
       expect(response)
         .to have_http_status(200)
-      expect(body_as_json)
+      expect(response.parsed_body)
         .to contain_exactly(
           include(name: used_tag.name)
         )
diff --git a/spec/requests/api/v1/featured_tags_spec.rb b/spec/requests/api/v1/featured_tags_spec.rb
index 81e99e015bd804..423cc0c560ff60 100644
--- a/spec/requests/api/v1/featured_tags_spec.rb
+++ b/spec/requests/api/v1/featured_tags_spec.rb
@@ -37,7 +37,7 @@
       it 'returns an empty body' do
         get '/api/v1/featured_tags', headers: headers
 
-        expect(body_as_json).to be_empty
+        expect(response.parsed_body).to be_empty
       end
     end
 
@@ -47,7 +47,7 @@
       it 'returns only the featured tags belonging to the requesting user' do
         get '/api/v1/featured_tags', headers: headers
 
-        expect(body_as_json.pluck(:id))
+        expect(response.parsed_body.pluck(:id))
           .to match_array(
             user_featured_tags.pluck(:id).map(&:to_s)
           )
@@ -67,7 +67,7 @@
     it 'returns the correct tag name' do
       post '/api/v1/featured_tags', headers: headers, params: params
 
-      expect(body_as_json)
+      expect(response.parsed_body)
         .to include(
           name: params[:name]
         )
@@ -141,7 +141,7 @@
     it 'returns an empty body' do
       delete "/api/v1/featured_tags/#{id}", headers: headers
 
-      expect(body_as_json).to be_empty
+      expect(response.parsed_body).to be_empty
     end
 
     it 'deletes the featured tag', :inline_jobs do
diff --git a/spec/requests/api/v1/filters_spec.rb b/spec/requests/api/v1/filters_spec.rb
index deb6e7421774f5..93ed78b34606c8 100644
--- a/spec/requests/api/v1/filters_spec.rb
+++ b/spec/requests/api/v1/filters_spec.rb
@@ -15,7 +15,7 @@
     it 'returns http success' do
       get '/api/v1/filters', headers: headers
       expect(response).to have_http_status(200)
-      expect(body_as_json)
+      expect(response.parsed_body)
         .to contain_exactly(
           include(id: custom_filter_keyword.id.to_s)
         )
diff --git a/spec/requests/api/v1/follow_requests_spec.rb b/spec/requests/api/v1/follow_requests_spec.rb
index a8898ccb3e7506..c143ccaec1944e 100644
--- a/spec/requests/api/v1/follow_requests_spec.rb
+++ b/spec/requests/api/v1/follow_requests_spec.rb
@@ -36,7 +36,7 @@
       subject
 
       expect(response).to have_http_status(200)
-      expect(body_as_json).to match_array(expected_response)
+      expect(response.parsed_body).to match_array(expected_response)
     end
 
     context 'with limit param' do
@@ -45,7 +45,7 @@
       it 'returns only the requested number of follow requests' do
         subject
 
-        expect(body_as_json.size).to eq(params[:limit])
+        expect(response.parsed_body.size).to eq(params[:limit])
       end
     end
   end
@@ -66,7 +66,7 @@
     it 'allows the requesting follower to follow', :aggregate_failures do
       expect { subject }.to change { follower.following?(user.account) }.from(false).to(true)
       expect(response).to have_http_status(200)
-      expect(body_as_json[:followed_by]).to be true
+      expect(response.parsed_body[:followed_by]).to be true
     end
   end
 
@@ -88,7 +88,7 @@
 
       expect(response).to have_http_status(200)
       expect(FollowRequest.where(target_account: user.account, account: follower)).to_not exist
-      expect(body_as_json[:followed_by]).to be false
+      expect(response.parsed_body[:followed_by]).to be false
     end
   end
 end
diff --git a/spec/requests/api/v1/followed_tags_spec.rb b/spec/requests/api/v1/followed_tags_spec.rb
index 3d2d82d5db1c28..f7787cb76360b3 100644
--- a/spec/requests/api/v1/followed_tags_spec.rb
+++ b/spec/requests/api/v1/followed_tags_spec.rb
@@ -37,7 +37,7 @@
     it 'returns the followed tags correctly' do
       subject
 
-      expect(body_as_json).to match_array(expected_response)
+      expect(response.parsed_body).to match_array(expected_response)
     end
 
     context 'with limit param' do
@@ -46,7 +46,7 @@
       it 'returns only the requested number of follow tags' do
         subject
 
-        expect(body_as_json.size).to eq(params[:limit])
+        expect(response.parsed_body.size).to eq(params[:limit])
       end
 
       it 'sets the correct pagination headers' do
diff --git a/spec/requests/api/v1/instance_spec.rb b/spec/requests/api/v1/instance_spec.rb
index f0a4ceadb8964a..8d6ba572e0aebd 100644
--- a/spec/requests/api/v1/instance_spec.rb
+++ b/spec/requests/api/v1/instance_spec.rb
@@ -15,7 +15,7 @@
         expect(response)
           .to have_http_status(200)
 
-        expect(body_as_json)
+        expect(response.parsed_body)
           .to be_present
           .and include(title: 'Mastodon')
       end
@@ -28,7 +28,7 @@
         expect(response)
           .to have_http_status(200)
 
-        expect(body_as_json)
+        expect(response.parsed_body)
           .to be_present
           .and include(title: 'Mastodon')
       end
diff --git a/spec/requests/api/v1/instances/activity_spec.rb b/spec/requests/api/v1/instances/activity_spec.rb
index 4f2bc91ad68235..72e3faeb650dd3 100644
--- a/spec/requests/api/v1/instances/activity_spec.rb
+++ b/spec/requests/api/v1/instances/activity_spec.rb
@@ -13,7 +13,7 @@
         expect(response)
           .to have_http_status(200)
 
-        expect(body_as_json)
+        expect(response.parsed_body)
           .to be_present
           .and(be_an(Array))
           .and(have_attributes(size: Api::V1::Instances::ActivityController::WEEKS_OF_ACTIVITY))
diff --git a/spec/requests/api/v1/instances/domain_blocks_spec.rb b/spec/requests/api/v1/instances/domain_blocks_spec.rb
index 397ecff084a6fd..460d338607bc9d 100644
--- a/spec/requests/api/v1/instances/domain_blocks_spec.rb
+++ b/spec/requests/api/v1/instances/domain_blocks_spec.rb
@@ -17,7 +17,7 @@
         expect(response)
           .to have_http_status(200)
 
-        expect(body_as_json)
+        expect(response.parsed_body)
           .to be_present
           .and(be_an(Array))
           .and(have_attributes(size: 1))
diff --git a/spec/requests/api/v1/instances/extended_descriptions_spec.rb b/spec/requests/api/v1/instances/extended_descriptions_spec.rb
index 64982de6863966..bf6d58216a0b0f 100644
--- a/spec/requests/api/v1/instances/extended_descriptions_spec.rb
+++ b/spec/requests/api/v1/instances/extended_descriptions_spec.rb
@@ -10,7 +10,7 @@
       expect(response)
         .to have_http_status(200)
 
-      expect(body_as_json)
+      expect(response.parsed_body)
         .to be_present
         .and include(:content)
     end
diff --git a/spec/requests/api/v1/instances/languages_spec.rb b/spec/requests/api/v1/instances/languages_spec.rb
index 8ab8bf99ce52bb..79ea62c5996433 100644
--- a/spec/requests/api/v1/instances/languages_spec.rb
+++ b/spec/requests/api/v1/instances/languages_spec.rb
@@ -13,7 +13,7 @@
     end
 
     it 'returns the supported languages' do
-      expect(body_as_json.pluck(:code)).to match_array LanguagesHelper::SUPPORTED_LOCALES.keys.map(&:to_s)
+      expect(response.parsed_body.pluck(:code)).to match_array LanguagesHelper::SUPPORTED_LOCALES.keys.map(&:to_s)
     end
   end
 end
diff --git a/spec/requests/api/v1/instances/peers_spec.rb b/spec/requests/api/v1/instances/peers_spec.rb
index 1a7975f8b79309..1140612f0a9438 100644
--- a/spec/requests/api/v1/instances/peers_spec.rb
+++ b/spec/requests/api/v1/instances/peers_spec.rb
@@ -13,7 +13,7 @@
         expect(response)
           .to have_http_status(200)
 
-        expect(body_as_json)
+        expect(response.parsed_body)
           .to be_an(Array)
       end
     end
diff --git a/spec/requests/api/v1/instances/privacy_policies_spec.rb b/spec/requests/api/v1/instances/privacy_policies_spec.rb
index 24de98d880d568..93490542cdd4d7 100644
--- a/spec/requests/api/v1/instances/privacy_policies_spec.rb
+++ b/spec/requests/api/v1/instances/privacy_policies_spec.rb
@@ -10,7 +10,7 @@
       expect(response)
         .to have_http_status(200)
 
-      expect(body_as_json)
+      expect(response.parsed_body)
         .to be_present
         .and include(:content)
     end
diff --git a/spec/requests/api/v1/instances/rules_spec.rb b/spec/requests/api/v1/instances/rules_spec.rb
index 65b8d78c7ddff9..620c991ae2c3b0 100644
--- a/spec/requests/api/v1/instances/rules_spec.rb
+++ b/spec/requests/api/v1/instances/rules_spec.rb
@@ -10,7 +10,7 @@
       expect(response)
         .to have_http_status(200)
 
-      expect(body_as_json)
+      expect(response.parsed_body)
         .to be_an(Array)
     end
   end
diff --git a/spec/requests/api/v1/instances/translation_languages_spec.rb b/spec/requests/api/v1/instances/translation_languages_spec.rb
index e5a480c17515cd..0de5ec3bc236ae 100644
--- a/spec/requests/api/v1/instances/translation_languages_spec.rb
+++ b/spec/requests/api/v1/instances/translation_languages_spec.rb
@@ -11,7 +11,7 @@
         expect(response)
           .to have_http_status(200)
 
-        expect(body_as_json)
+        expect(response.parsed_body)
           .to eq({})
       end
     end
@@ -25,7 +25,7 @@
         expect(response)
           .to have_http_status(200)
 
-        expect(body_as_json)
+        expect(response.parsed_body)
           .to match({ und: %w(en de), en: ['de'] })
       end
 
diff --git a/spec/requests/api/v1/lists/accounts_spec.rb b/spec/requests/api/v1/lists/accounts_spec.rb
index de49982351ebf4..d147b21ee7f5eb 100644
--- a/spec/requests/api/v1/lists/accounts_spec.rb
+++ b/spec/requests/api/v1/lists/accounts_spec.rb
@@ -34,7 +34,7 @@
       subject
 
       expect(response).to have_http_status(200)
-      expect(body_as_json).to match_array(expected_response)
+      expect(response.parsed_body).to match_array(expected_response)
     end
 
     context 'with limit param' do
@@ -43,7 +43,7 @@
       it 'returns only the requested number of accounts' do
         subject
 
-        expect(body_as_json.size).to eq(params[:limit])
+        expect(response.parsed_body.size).to eq(params[:limit])
       end
     end
   end
diff --git a/spec/requests/api/v1/lists_spec.rb b/spec/requests/api/v1/lists_spec.rb
index cf5ac28a56c4b8..2042a64d5ceb00 100644
--- a/spec/requests/api/v1/lists_spec.rb
+++ b/spec/requests/api/v1/lists_spec.rb
@@ -43,7 +43,7 @@
       subject
 
       expect(response).to have_http_status(200)
-      expect(body_as_json).to match_array(expected_response)
+      expect(response.parsed_body).to match_array(expected_response)
     end
   end
 
@@ -60,7 +60,7 @@
       subject
 
       expect(response).to have_http_status(200)
-      expect(body_as_json).to match({
+      expect(response.parsed_body).to match({
         id: list.id.to_s,
         title: list.title,
         replies_policy: list.replies_policy,
@@ -100,7 +100,7 @@
       subject
 
       expect(response).to have_http_status(200)
-      expect(body_as_json).to match(a_hash_including(title: 'my list', replies_policy: 'none', exclusive: true))
+      expect(response.parsed_body).to match(a_hash_including(title: 'my list', replies_policy: 'none', exclusive: true))
       expect(List.where(account: user.account).count).to eq(1)
     end
 
@@ -144,7 +144,7 @@
       expect(response).to have_http_status(200)
       list.reload
 
-      expect(body_as_json).to match({
+      expect(response.parsed_body).to match({
         id: list.id.to_s,
         title: list.title,
         replies_policy: list.replies_policy,
diff --git a/spec/requests/api/v1/markers_spec.rb b/spec/requests/api/v1/markers_spec.rb
index 2dbb9d205afb89..a10d2dc3e280ec 100644
--- a/spec/requests/api/v1/markers_spec.rb
+++ b/spec/requests/api/v1/markers_spec.rb
@@ -18,7 +18,7 @@
 
     it 'returns markers', :aggregate_failures do
       expect(response).to have_http_status(200)
-      expect(body_as_json)
+      expect(response.parsed_body)
         .to include(
           home: include(last_read_id: '123'),
           notifications: include(last_read_id: '456')
@@ -61,7 +61,7 @@
       it 'returns error json' do
         expect(response)
           .to have_http_status(409)
-        expect(body_as_json)
+        expect(response.parsed_body)
           .to include(error: /Conflict during update/)
       end
     end
diff --git a/spec/requests/api/v1/media_spec.rb b/spec/requests/api/v1/media_spec.rb
index c89c49afdf43aa..d0af334825e35c 100644
--- a/spec/requests/api/v1/media_spec.rb
+++ b/spec/requests/api/v1/media_spec.rb
@@ -26,7 +26,7 @@
     it 'returns the media information' do
       subject
 
-      expect(body_as_json).to match(
+      expect(response.parsed_body).to match(
         a_hash_including(
           id: media.id.to_s,
           description: media.description,
@@ -83,7 +83,7 @@
         expect(MediaAttachment.first).to be_present
         expect(MediaAttachment.first).to have_attached_file(:file)
 
-        expect(body_as_json).to match(
+        expect(response.parsed_body).to match(
           a_hash_including(id: MediaAttachment.first.id.to_s, description: params[:description], type: media_type)
         )
       end
diff --git a/spec/requests/api/v1/mutes_spec.rb b/spec/requests/api/v1/mutes_spec.rb
index 988bb3c3990354..6402c908ffe4ce 100644
--- a/spec/requests/api/v1/mutes_spec.rb
+++ b/spec/requests/api/v1/mutes_spec.rb
@@ -29,7 +29,7 @@
 
       muted_accounts = mutes.map(&:target_account)
 
-      expect(body_as_json.pluck(:id)).to match_array(muted_accounts.map { |account| account.id.to_s })
+      expect(response.parsed_body.pluck(:id)).to match_array(muted_accounts.map { |account| account.id.to_s })
     end
 
     context 'with limit param' do
@@ -38,7 +38,7 @@
       it 'returns only the requested number of muted accounts' do
         subject
 
-        expect(body_as_json.size).to eq(params[:limit])
+        expect(response.parsed_body.size).to eq(params[:limit])
       end
 
       it 'sets the correct pagination headers', :aggregate_failures do
@@ -58,7 +58,7 @@
       it 'queries mutes in range according to max_id', :aggregate_failures do
         subject
 
-        expect(body_as_json)
+        expect(response.parsed_body)
           .to contain_exactly(include(id: mutes.first.target_account_id.to_s))
       end
     end
@@ -69,7 +69,7 @@
       it 'queries mutes in range according to since_id', :aggregate_failures do
         subject
 
-        expect(body_as_json)
+        expect(response.parsed_body)
           .to contain_exactly(include(id: mutes[1].target_account_id.to_s))
       end
     end
diff --git a/spec/requests/api/v1/notifications/policies_spec.rb b/spec/requests/api/v1/notifications/policies_spec.rb
index a73d4217be3b08..8bafcad2fe397d 100644
--- a/spec/requests/api/v1/notifications/policies_spec.rb
+++ b/spec/requests/api/v1/notifications/policies_spec.rb
@@ -26,7 +26,7 @@
         subject
 
         expect(response).to have_http_status(200)
-        expect(body_as_json).to include(
+        expect(response.parsed_body).to include(
           filter_not_following: false,
           filter_not_followers: false,
           filter_new_accounts: false,
@@ -54,7 +54,7 @@
         .to change { NotificationPolicy.find_or_initialize_by(account: user.account).for_not_following.to_sym }.from(:accept).to(:filter)
 
       expect(response).to have_http_status(200)
-      expect(body_as_json).to include(
+      expect(response.parsed_body).to include(
         filter_not_following: true,
         filter_not_followers: false,
         filter_new_accounts: false,
diff --git a/spec/requests/api/v1/notifications/requests_spec.rb b/spec/requests/api/v1/notifications/requests_spec.rb
index 45bb71adb05e87..dc125bc7aa8ef4 100644
--- a/spec/requests/api/v1/notifications/requests_spec.rb
+++ b/spec/requests/api/v1/notifications/requests_spec.rb
@@ -133,7 +133,7 @@
         subject
 
         expect(response).to have_http_status(200)
-        expect(body_as_json).to match({ merged: true })
+        expect(response.parsed_body).to match({ merged: true })
       end
     end
 
@@ -146,7 +146,7 @@
         subject
 
         expect(response).to have_http_status(200)
-        expect(body_as_json).to match({ merged: false })
+        expect(response.parsed_body).to match({ merged: false })
       end
     end
   end
diff --git a/spec/requests/api/v1/notifications_spec.rb b/spec/requests/api/v1/notifications_spec.rb
index 84e6db1e5163ce..b74adb5dffc5e1 100644
--- a/spec/requests/api/v1/notifications_spec.rb
+++ b/spec/requests/api/v1/notifications_spec.rb
@@ -31,7 +31,7 @@
         subject
 
         expect(response).to have_http_status(200)
-        expect(body_as_json[:count]).to eq 5
+        expect(response.parsed_body[:count]).to eq 5
       end
     end
 
@@ -45,7 +45,7 @@
         subject
 
         expect(response).to have_http_status(200)
-        expect(body_as_json[:count]).to eq 2
+        expect(response.parsed_body[:count]).to eq 2
       end
     end
 
@@ -56,7 +56,7 @@
         subject
 
         expect(response).to have_http_status(200)
-        expect(body_as_json[:count]).to eq 4
+        expect(response.parsed_body[:count]).to eq 4
       end
     end
 
@@ -67,7 +67,7 @@
         subject
 
         expect(response).to have_http_status(200)
-        expect(body_as_json[:count]).to eq 2
+        expect(response.parsed_body[:count]).to eq 2
       end
     end
 
@@ -80,7 +80,7 @@
         subject
 
         expect(response).to have_http_status(200)
-        expect(body_as_json[:count]).to eq Api::V1::NotificationsController::DEFAULT_NOTIFICATIONS_COUNT_LIMIT
+        expect(response.parsed_body[:count]).to eq Api::V1::NotificationsController::DEFAULT_NOTIFICATIONS_COUNT_LIMIT
       end
     end
   end
@@ -111,9 +111,9 @@
         subject
 
         expect(response).to have_http_status(200)
-        expect(body_as_json.size).to eq 5
+        expect(response.parsed_body.size).to eq 5
         expect(body_json_types).to include('reblog', 'mention', 'favourite', 'follow')
-        expect(body_as_json.any? { |x| x[:filtered] }).to be false
+        expect(response.parsed_body.any? { |x| x[:filtered] }).to be false
       end
     end
 
@@ -124,9 +124,9 @@
         subject
 
         expect(response).to have_http_status(200)
-        expect(body_as_json.size).to eq 6
+        expect(response.parsed_body.size).to eq 6
         expect(body_json_types).to include('reblog', 'mention', 'favourite', 'follow')
-        expect(body_as_json.any? { |x| x[:filtered] }).to be true
+        expect(response.parsed_body.any? { |x| x[:filtered] }).to be true
       end
     end
 
@@ -141,7 +141,7 @@
       end
 
       def body_json_account_ids
-        body_as_json.map { |x| x[:account][:id] }
+        response.parsed_body.map { |x| x[:account][:id] }
       end
     end
 
@@ -152,7 +152,7 @@ def body_json_account_ids
         subject
 
         expect(response).to have_http_status(200)
-        expect(body_as_json.size).to eq 0
+        expect(response.parsed_body.size).to eq 0
       end
     end
 
@@ -163,7 +163,7 @@ def body_json_account_ids
         subject
 
         expect(response).to have_http_status(200)
-        expect(body_as_json.size).to_not eq 0
+        expect(response.parsed_body.size).to_not eq 0
         expect(body_json_types.uniq).to_not include 'mention'
       end
     end
@@ -187,7 +187,7 @@ def body_json_account_ids
 
         notifications = user.account.notifications.browserable.order(id: :asc)
 
-        expect(body_as_json.size)
+        expect(response.parsed_body.size)
           .to eq(params[:limit])
 
         expect(response)
@@ -199,7 +199,7 @@ def body_json_account_ids
     end
 
     def body_json_types
-      body_as_json.pluck(:type)
+      response.parsed_body.pluck(:type)
     end
   end
 
diff --git a/spec/requests/api/v1/peers/search_spec.rb b/spec/requests/api/v1/peers/search_spec.rb
index 87b0dc4f642c2f..dc5f550d0e092d 100644
--- a/spec/requests/api/v1/peers/search_spec.rb
+++ b/spec/requests/api/v1/peers/search_spec.rb
@@ -23,7 +23,7 @@
 
         expect(response)
           .to have_http_status(200)
-        expect(body_as_json)
+        expect(response.parsed_body)
           .to be_blank
       end
     end
@@ -34,7 +34,7 @@
 
         expect(response)
           .to have_http_status(200)
-        expect(body_as_json)
+        expect(response.parsed_body)
           .to be_blank
       end
     end
@@ -49,9 +49,9 @@
 
         expect(response)
           .to have_http_status(200)
-        expect(body_as_json.size)
+        expect(response.parsed_body.size)
           .to eq(1)
-        expect(body_as_json.first)
+        expect(response.parsed_body.first)
           .to eq(account.domain)
       end
     end
diff --git a/spec/requests/api/v1/polls_spec.rb b/spec/requests/api/v1/polls_spec.rb
index 1c8a818d596e9b..138a37a73ce990 100644
--- a/spec/requests/api/v1/polls_spec.rb
+++ b/spec/requests/api/v1/polls_spec.rb
@@ -23,7 +23,7 @@
         subject
 
         expect(response).to have_http_status(200)
-        expect(body_as_json).to match(
+        expect(response.parsed_body).to match(
           a_hash_including(
             id: poll.id.to_s,
             voted: false,
diff --git a/spec/requests/api/v1/preferences_spec.rb b/spec/requests/api/v1/preferences_spec.rb
index 6508b51c04e6d9..d6991ca90ca71e 100644
--- a/spec/requests/api/v1/preferences_spec.rb
+++ b/spec/requests/api/v1/preferences_spec.rb
@@ -34,7 +34,7 @@
         expect(response)
           .to have_http_status(200)
 
-        expect(body_as_json)
+        expect(response.parsed_body)
           .to be_present
       end
     end
diff --git a/spec/requests/api/v1/push/subscriptions_spec.rb b/spec/requests/api/v1/push/subscriptions_spec.rb
index 6674b048e854b2..a9587f8d58343f 100644
--- a/spec/requests/api/v1/push/subscriptions_spec.rb
+++ b/spec/requests/api/v1/push/subscriptions_spec.rb
@@ -65,7 +65,7 @@
           access_token_id: eq(token.id)
         )
 
-      expect(body_as_json.with_indifferent_access)
+      expect(response.parsed_body.with_indifferent_access)
         .to include(
           { endpoint: create_payload[:subscription][:endpoint], alerts: {}, policy: 'all' }
         )
@@ -124,7 +124,7 @@
         )
       end
 
-      expect(body_as_json.with_indifferent_access)
+      expect(response.parsed_body.with_indifferent_access)
         .to include(
           endpoint: create_payload[:subscription][:endpoint],
           alerts: alerts_payload[:data][:alerts],
diff --git a/spec/requests/api/v1/reports_spec.rb b/spec/requests/api/v1/reports_spec.rb
index a72d9bbcd85bbb..a176bd78a6ef32 100644
--- a/spec/requests/api/v1/reports_spec.rb
+++ b/spec/requests/api/v1/reports_spec.rb
@@ -37,7 +37,7 @@
       emails = capture_emails { subject }
 
       expect(response).to have_http_status(200)
-      expect(body_as_json).to match(
+      expect(response.parsed_body).to match(
         a_hash_including(
           status_ids: [status.id.to_s],
           category: category,
diff --git a/spec/requests/api/v1/scheduled_status_spec.rb b/spec/requests/api/v1/scheduled_status_spec.rb
index b35d297a60ee95..eb03827c9ab0d5 100644
--- a/spec/requests/api/v1/scheduled_status_spec.rb
+++ b/spec/requests/api/v1/scheduled_status_spec.rb
@@ -46,7 +46,7 @@
           expect(response)
             .to have_http_status(200)
 
-          expect(body_as_json)
+          expect(response.parsed_body)
             .to_not be_present
         end
       end
@@ -60,7 +60,7 @@
           expect(response)
             .to have_http_status(200)
 
-          expect(body_as_json)
+          expect(response.parsed_body)
             .to be_present
             .and have_attributes(
               first: include(id: scheduled_status.id.to_s)
diff --git a/spec/requests/api/v1/statuses/bookmarks_spec.rb b/spec/requests/api/v1/statuses/bookmarks_spec.rb
index d3007740a5dd75..f1bcfda0ff638b 100644
--- a/spec/requests/api/v1/statuses/bookmarks_spec.rb
+++ b/spec/requests/api/v1/statuses/bookmarks_spec.rb
@@ -28,7 +28,7 @@
       it 'returns json with updated attributes' do
         subject
 
-        expect(body_as_json).to match(
+        expect(response.parsed_body).to match(
           a_hash_including(id: status.id.to_s, bookmarked: true)
         )
       end
@@ -103,7 +103,7 @@
         it 'returns json with updated attributes' do
           subject
 
-          expect(body_as_json).to match(
+          expect(response.parsed_body).to match(
             a_hash_including(id: status.id.to_s, bookmarked: false)
           )
         end
@@ -127,7 +127,7 @@
         it 'returns json with updated attributes' do
           subject
 
-          expect(body_as_json).to match(
+          expect(response.parsed_body).to match(
             a_hash_including(id: status.id.to_s, bookmarked: false)
           )
         end
diff --git a/spec/requests/api/v1/statuses/favourited_by_accounts_spec.rb b/spec/requests/api/v1/statuses/favourited_by_accounts_spec.rb
index 2fd79f424b12b6..24bd03d343b207 100644
--- a/spec/requests/api/v1/statuses/favourited_by_accounts_spec.rb
+++ b/spec/requests/api/v1/statuses/favourited_by_accounts_spec.rb
@@ -34,9 +34,9 @@
             next: api_v1_status_favourited_by_index_url(limit: 2, max_id: Favourite.first.id)
           )
 
-        expect(body_as_json.size)
+        expect(response.parsed_body.size)
           .to eq(2)
-        expect(body_as_json)
+        expect(response.parsed_body)
           .to contain_exactly(
             include(id: alice.id.to_s),
             include(id: bob.id.to_s)
@@ -48,9 +48,9 @@
 
         subject
 
-        expect(body_as_json.size)
+        expect(response.parsed_body.size)
           .to eq 1
-        expect(body_as_json.first[:id]).to eq(alice.id.to_s)
+        expect(response.parsed_body.first[:id]).to eq(alice.id.to_s)
       end
     end
   end
diff --git a/spec/requests/api/v1/statuses/favourites_spec.rb b/spec/requests/api/v1/statuses/favourites_spec.rb
index 22d0e4831fc64d..f9f0ff62990cfa 100644
--- a/spec/requests/api/v1/statuses/favourites_spec.rb
+++ b/spec/requests/api/v1/statuses/favourites_spec.rb
@@ -28,7 +28,7 @@
       it 'returns json with updated attributes' do
         subject
 
-        expect(body_as_json).to match(
+        expect(response.parsed_body).to match(
           a_hash_including(id: status.id.to_s, favourites_count: 1, favourited: true)
         )
       end
@@ -95,7 +95,7 @@
       it 'returns json with updated attributes' do
         subject
 
-        expect(body_as_json).to match(
+        expect(response.parsed_body).to match(
           a_hash_including(id: status.id.to_s, favourites_count: 0, favourited: false)
         )
       end
@@ -118,7 +118,7 @@
       it 'returns json with updated attributes' do
         subject
 
-        expect(body_as_json).to match(
+        expect(response.parsed_body).to match(
           a_hash_including(id: status.id.to_s, favourites_count: 0, favourited: false)
         )
       end
diff --git a/spec/requests/api/v1/statuses/histories_spec.rb b/spec/requests/api/v1/statuses/histories_spec.rb
index f13bf798670f9e..4115a52fa8cc0e 100644
--- a/spec/requests/api/v1/statuses/histories_spec.rb
+++ b/spec/requests/api/v1/statuses/histories_spec.rb
@@ -18,7 +18,7 @@
 
       it 'returns http success' do
         expect(response).to have_http_status(200)
-        expect(body_as_json.size).to_not be 0
+        expect(response.parsed_body.size).to_not be 0
       end
     end
   end
diff --git a/spec/requests/api/v1/statuses/pins_spec.rb b/spec/requests/api/v1/statuses/pins_spec.rb
index 3be1a16ee19a82..56e60c6d368c2c 100644
--- a/spec/requests/api/v1/statuses/pins_spec.rb
+++ b/spec/requests/api/v1/statuses/pins_spec.rb
@@ -28,7 +28,7 @@
       it 'return json with updated attributes' do
         subject
 
-        expect(body_as_json).to match(
+        expect(response.parsed_body).to match(
           a_hash_including(id: status.id.to_s, pinned: true)
         )
       end
@@ -96,7 +96,7 @@
       it 'return json with updated attributes' do
         subject
 
-        expect(body_as_json).to match(
+        expect(response.parsed_body).to match(
           a_hash_including(id: status.id.to_s, pinned: false)
         )
       end
diff --git a/spec/requests/api/v1/statuses/reblogged_by_accounts_spec.rb b/spec/requests/api/v1/statuses/reblogged_by_accounts_spec.rb
index 5fc54042f91a8f..bd26c22f08e388 100644
--- a/spec/requests/api/v1/statuses/reblogged_by_accounts_spec.rb
+++ b/spec/requests/api/v1/statuses/reblogged_by_accounts_spec.rb
@@ -33,9 +33,9 @@
             next: api_v1_status_reblogged_by_index_url(limit: 2, max_id: alice.statuses.first.id)
           )
 
-        expect(body_as_json.size)
+        expect(response.parsed_body.size)
           .to eq(2)
-        expect(body_as_json)
+        expect(response.parsed_body)
           .to contain_exactly(
             include(id: alice.id.to_s),
             include(id: bob.id.to_s)
@@ -47,9 +47,9 @@
 
         subject
 
-        expect(body_as_json.size)
+        expect(response.parsed_body.size)
           .to eq 1
-        expect(body_as_json.first[:id]).to eq(alice.id.to_s)
+        expect(response.parsed_body.first[:id]).to eq(alice.id.to_s)
       end
     end
   end
diff --git a/spec/requests/api/v1/statuses/reblogs_spec.rb b/spec/requests/api/v1/statuses/reblogs_spec.rb
index 0978c890a4bf81..8c7894d875b0b4 100644
--- a/spec/requests/api/v1/statuses/reblogs_spec.rb
+++ b/spec/requests/api/v1/statuses/reblogs_spec.rb
@@ -24,7 +24,7 @@
 
           expect(user.account.reblogged?(status)).to be true
 
-          expect(body_as_json)
+          expect(response.parsed_body)
             .to include(
               reblog: include(
                 id: status.id.to_s,
@@ -60,7 +60,7 @@
 
           expect(user.account.reblogged?(status)).to be false
 
-          expect(body_as_json)
+          expect(response.parsed_body)
             .to include(
               id: status.id.to_s,
               reblogs_count: 0,
@@ -85,7 +85,7 @@
 
           expect(user.account.reblogged?(status)).to be false
 
-          expect(body_as_json)
+          expect(response.parsed_body)
             .to include(
               id: status.id.to_s,
               reblogs_count: 0,
diff --git a/spec/requests/api/v1/statuses/sources_spec.rb b/spec/requests/api/v1/statuses/sources_spec.rb
index c7b1603824b7d1..eab19d64daa27b 100644
--- a/spec/requests/api/v1/statuses/sources_spec.rb
+++ b/spec/requests/api/v1/statuses/sources_spec.rb
@@ -22,7 +22,7 @@
         subject
 
         expect(response).to have_http_status(200)
-        expect(body_as_json).to match({
+        expect(response.parsed_body).to match({
           id: status.id.to_s,
           text: status.text,
           spoiler_text: status.spoiler_text,
@@ -51,7 +51,7 @@
         subject
 
         expect(response).to have_http_status(200)
-        expect(body_as_json).to match({
+        expect(response.parsed_body).to match({
           id: status.id.to_s,
           text: status.text,
           spoiler_text: status.spoiler_text,
diff --git a/spec/requests/api/v1/statuses_spec.rb b/spec/requests/api/v1/statuses_spec.rb
index 1a211d14d87f6c..057800a266cae9 100644
--- a/spec/requests/api/v1/statuses_spec.rb
+++ b/spec/requests/api/v1/statuses_spec.rb
@@ -18,7 +18,7 @@
         get '/api/v1/statuses', headers: headers, params: { id: [status.id, other_status.id, 123_123] }
 
         expect(response).to have_http_status(200)
-        expect(body_as_json).to contain_exactly(
+        expect(response.parsed_body).to contain_exactly(
           hash_including(id: status.id.to_s),
           hash_including(id: other_status.id.to_s)
         )
@@ -52,7 +52,7 @@
           subject
 
           expect(response).to have_http_status(200)
-          expect(body_as_json[:filtered][0]).to include({
+          expect(response.parsed_body[:filtered][0]).to include({
             filter: a_hash_including({
               id: user.account.custom_filters.first.id.to_s,
               title: 'filter1',
@@ -75,7 +75,7 @@
           subject
 
           expect(response).to have_http_status(200)
-          expect(body_as_json[:filtered][0]).to include({
+          expect(response.parsed_body[:filtered][0]).to include({
             filter: a_hash_including({
               id: user.account.custom_filters.first.id.to_s,
               title: 'filter1',
@@ -97,7 +97,7 @@
           subject
 
           expect(response).to have_http_status(200)
-          expect(body_as_json[:reblog][:filtered][0]).to include({
+          expect(response.parsed_body[:reblog][:filtered][0]).to include({
             filter: a_hash_including({
               id: user.account.custom_filters.first.id.to_s,
               title: 'filter1',
@@ -154,7 +154,7 @@
           subject
 
           expect(response).to have_http_status(422)
-          expect(body_as_json[:unexpected_accounts].map { |a| a.slice(:id, :acct) }).to match [{ id: bob.id.to_s, acct: bob.acct }]
+          expect(response.parsed_body[:unexpected_accounts].map { |a| a.slice(:id, :acct) }).to match [{ id: bob.id.to_s, acct: bob.acct }]
         end
       end
 
diff --git a/spec/requests/api/v1/suggestions_spec.rb b/spec/requests/api/v1/suggestions_spec.rb
index b900c910df9dc6..8267bb92a047db 100644
--- a/spec/requests/api/v1/suggestions_spec.rb
+++ b/spec/requests/api/v1/suggestions_spec.rb
@@ -32,7 +32,7 @@
     it 'returns accounts' do
       subject
 
-      expect(body_as_json)
+      expect(response.parsed_body)
         .to contain_exactly(include(id: bob.id.to_s), include(id: jeff.id.to_s))
     end
 
@@ -42,7 +42,7 @@
       it 'returns only the requested number of accounts' do
         subject
 
-        expect(body_as_json.size).to eq 1
+        expect(response.parsed_body.size).to eq 1
       end
     end
 
diff --git a/spec/requests/api/v1/tags_spec.rb b/spec/requests/api/v1/tags_spec.rb
index db74a6f0373572..9637823d457a1c 100644
--- a/spec/requests/api/v1/tags_spec.rb
+++ b/spec/requests/api/v1/tags_spec.rb
@@ -21,7 +21,7 @@
         subject
 
         expect(response).to have_http_status(200)
-        expect(body_as_json[:name]).to eq(name)
+        expect(response.parsed_body[:name]).to eq(name)
       end
     end
 
diff --git a/spec/requests/api/v1/timelines/home_spec.rb b/spec/requests/api/v1/timelines/home_spec.rb
index 9dd102fcb62203..afad2988ca2a10 100644
--- a/spec/requests/api/v1/timelines/home_spec.rb
+++ b/spec/requests/api/v1/timelines/home_spec.rb
@@ -40,7 +40,7 @@
       it 'returns the statuses of followed users' do
         subject
 
-        expect(body_as_json.pluck(:id)).to match_array(home_statuses.map { |status| status.id.to_s })
+        expect(response.parsed_body.pluck(:id)).to match_array(home_statuses.map { |status| status.id.to_s })
       end
 
       context 'with limit param' do
@@ -49,7 +49,7 @@
         it 'returns only the requested number of statuses' do
           subject
 
-          expect(body_as_json.size).to eq(params[:limit])
+          expect(response.parsed_body.size).to eq(params[:limit])
         end
 
         it 'sets the correct pagination headers', :aggregate_failures do
diff --git a/spec/requests/api/v1/timelines/link_spec.rb b/spec/requests/api/v1/timelines/link_spec.rb
index 67d8bca0229bfd..8999364703f735 100644
--- a/spec/requests/api/v1/timelines/link_spec.rb
+++ b/spec/requests/api/v1/timelines/link_spec.rb
@@ -13,7 +13,7 @@
       subject
 
       expect(response).to have_http_status(200)
-      expect(body_as_json.pluck(:id)).to match_array(expected_statuses.map { |status| status.id.to_s })
+      expect(response.parsed_body.pluck(:id)).to match_array(expected_statuses.map { |status| status.id.to_s })
     end
   end
 
@@ -127,7 +127,7 @@
           subject
 
           expect(response).to have_http_status(200)
-          expect(body_as_json.size).to eq(params[:limit])
+          expect(response.parsed_body.size).to eq(params[:limit])
         end
 
         it 'sets the correct pagination headers', :aggregate_failures do
diff --git a/spec/requests/api/v1/timelines/public_spec.rb b/spec/requests/api/v1/timelines/public_spec.rb
index 1fc62b393268ac..759e236d05b1e4 100644
--- a/spec/requests/api/v1/timelines/public_spec.rb
+++ b/spec/requests/api/v1/timelines/public_spec.rb
@@ -13,7 +13,7 @@
       subject
 
       expect(response).to have_http_status(200)
-      expect(body_as_json.pluck(:id)).to match_array(expected_statuses.map { |status| status.id.to_s })
+      expect(response.parsed_body.pluck(:id)).to match_array(expected_statuses.map { |status| status.id.to_s })
     end
   end
 
@@ -81,7 +81,7 @@
           subject
 
           expect(response).to have_http_status(200)
-          expect(body_as_json.size).to eq(params[:limit])
+          expect(response.parsed_body.size).to eq(params[:limit])
         end
 
         it 'sets the correct pagination headers', :aggregate_failures do
diff --git a/spec/requests/api/v1/timelines/tag_spec.rb b/spec/requests/api/v1/timelines/tag_spec.rb
index cfbfa0291c546e..03d34e59f104ec 100644
--- a/spec/requests/api/v1/timelines/tag_spec.rb
+++ b/spec/requests/api/v1/timelines/tag_spec.rb
@@ -19,7 +19,7 @@
 
         expect(response)
           .to have_http_status(200)
-        expect(body_as_json.pluck(:id))
+        expect(response.parsed_body.pluck(:id))
           .to match_array(expected_statuses.map { |status| status.id.to_s })
           .and not_include(private_status.id)
       end
@@ -70,7 +70,7 @@
       it 'returns only the requested number of statuses' do
         subject
 
-        expect(body_as_json.size).to eq(params[:limit])
+        expect(response.parsed_body.size).to eq(params[:limit])
       end
 
       it 'sets the correct pagination headers', :aggregate_failures do
diff --git a/spec/requests/api/v2/admin/accounts_spec.rb b/spec/requests/api/v2/admin/accounts_spec.rb
index 8f52c6a6134ed6..17c38e2e557b85 100644
--- a/spec/requests/api/v2/admin/accounts_spec.rb
+++ b/spec/requests/api/v2/admin/accounts_spec.rb
@@ -76,7 +76,7 @@
     end
 
     def body_json_ids
-      body_as_json.map { |a| a[:id].to_i }
+      response.parsed_body.map { |a| a[:id].to_i }
     end
 
     context 'with limit param' do
diff --git a/spec/requests/api/v2/filters/keywords_spec.rb b/spec/requests/api/v2/filters/keywords_spec.rb
index 69eff5a064d9ea..a31accaa5cd72d 100644
--- a/spec/requests/api/v2/filters/keywords_spec.rb
+++ b/spec/requests/api/v2/filters/keywords_spec.rb
@@ -17,7 +17,7 @@
     it 'returns http success' do
       get "/api/v2/filters/#{filter.id}/keywords", headers: headers
       expect(response).to have_http_status(200)
-      expect(body_as_json)
+      expect(response.parsed_body)
         .to contain_exactly(
           include(id: keyword.id.to_s)
         )
@@ -42,7 +42,7 @@
     it 'creates a filter', :aggregate_failures do
       expect(response).to have_http_status(200)
 
-      expect(body_as_json)
+      expect(response.parsed_body)
         .to include(
           keyword: 'magic',
           whole_word: false
@@ -73,7 +73,7 @@
     it 'responds with the keyword', :aggregate_failures do
       expect(response).to have_http_status(200)
 
-      expect(body_as_json)
+      expect(response.parsed_body)
         .to include(
           keyword: 'foo',
           whole_word: false
diff --git a/spec/requests/api/v2/filters/statuses_spec.rb b/spec/requests/api/v2/filters/statuses_spec.rb
index 59693278291139..aed8934a5e3838 100644
--- a/spec/requests/api/v2/filters/statuses_spec.rb
+++ b/spec/requests/api/v2/filters/statuses_spec.rb
@@ -17,7 +17,7 @@
     it 'returns http success' do
       get "/api/v2/filters/#{filter.id}/statuses", headers: headers
       expect(response).to have_http_status(200)
-      expect(body_as_json)
+      expect(response.parsed_body)
         .to contain_exactly(
           include(id: status_filter.id.to_s)
         )
@@ -43,7 +43,7 @@
     it 'creates a filter', :aggregate_failures do
       expect(response).to have_http_status(200)
 
-      expect(body_as_json)
+      expect(response.parsed_body)
         .to include(
           status_id: status.id.to_s
         )
@@ -73,7 +73,7 @@
     it 'responds with the filter', :aggregate_failures do
       expect(response).to have_http_status(200)
 
-      expect(body_as_json)
+      expect(response.parsed_body)
         .to include(
           status_id: status_filter.status.id.to_s
         )
diff --git a/spec/requests/api/v2/filters_spec.rb b/spec/requests/api/v2/filters_spec.rb
index 036a6a65a90406..850c773df3d7a3 100644
--- a/spec/requests/api/v2/filters_spec.rb
+++ b/spec/requests/api/v2/filters_spec.rb
@@ -32,7 +32,7 @@
       subject
 
       expect(response).to have_http_status(200)
-      expect(body_as_json.pluck(:id)).to match_array(filters.map { |filter| filter.id.to_s })
+      expect(response.parsed_body.pluck(:id)).to match_array(filters.map { |filter| filter.id.to_s })
     end
   end
 
@@ -58,7 +58,7 @@
       it 'returns a filter with keywords', :aggregate_failures do
         subject
 
-        expect(body_as_json)
+        expect(response.parsed_body)
           .to include(
             title: 'magic',
             filter_action: 'hide',
@@ -127,7 +127,10 @@
       subject
 
       expect(response).to have_http_status(200)
-      expect(body_as_json[:id]).to eq(filter.id.to_s)
+      expect(response.parsed_body)
+        .to include(
+          id: filter.id.to_s
+        )
     end
 
     context 'when the filter belongs to someone else' do
diff --git a/spec/requests/api/v2/instance_spec.rb b/spec/requests/api/v2/instance_spec.rb
index 2f01db500345d8..d484dc7c463ef0 100644
--- a/spec/requests/api/v2/instance_spec.rb
+++ b/spec/requests/api/v2/instance_spec.rb
@@ -15,7 +15,7 @@
         expect(response)
           .to have_http_status(200)
 
-        expect(body_as_json)
+        expect(response.parsed_body)
           .to be_present
           .and include(title: 'Mastodon')
           .and include_api_versions
@@ -30,7 +30,7 @@
         expect(response)
           .to have_http_status(200)
 
-        expect(body_as_json)
+        expect(response.parsed_body)
           .to be_present
           .and include(title: 'Mastodon')
           .and include_api_versions
diff --git a/spec/requests/api/v2/media_spec.rb b/spec/requests/api/v2/media_spec.rb
index 97540413f152d4..06ce0053e87689 100644
--- a/spec/requests/api/v2/media_spec.rb
+++ b/spec/requests/api/v2/media_spec.rb
@@ -21,7 +21,7 @@
         expect(response)
           .to have_http_status(200)
 
-        expect(body_as_json)
+        expect(response.parsed_body)
           .to be_a(Hash)
       end
     end
@@ -38,7 +38,7 @@
         expect(response)
           .to have_http_status(202)
 
-        expect(body_as_json)
+        expect(response.parsed_body)
           .to be_a(Hash)
       end
     end
@@ -63,7 +63,7 @@
           expect(response)
             .to have_http_status(422)
 
-          expect(body_as_json)
+          expect(response.parsed_body)
             .to be_a(Hash)
             .and include(error: /File type/)
         end
@@ -80,7 +80,7 @@
           expect(response)
             .to have_http_status(500)
 
-          expect(body_as_json)
+          expect(response.parsed_body)
             .to be_a(Hash)
             .and include(error: /processing/)
         end
diff --git a/spec/requests/api/v2/notifications/policies_spec.rb b/spec/requests/api/v2/notifications/policies_spec.rb
index f9860b5fb487a1..dc205b6ebb6d25 100644
--- a/spec/requests/api/v2/notifications/policies_spec.rb
+++ b/spec/requests/api/v2/notifications/policies_spec.rb
@@ -26,7 +26,7 @@
         subject
 
         expect(response).to have_http_status(200)
-        expect(body_as_json).to include(
+        expect(response.parsed_body).to include(
           for_not_following: 'accept',
           for_not_followers: 'accept',
           for_new_accounts: 'accept',
@@ -56,7 +56,7 @@
         .and change { NotificationPolicy.find_or_initialize_by(account: user.account).for_limited_accounts.to_sym }.from(:filter).to(:drop)
 
       expect(response).to have_http_status(200)
-      expect(body_as_json).to include(
+      expect(response.parsed_body).to include(
         for_not_following: 'filter',
         for_not_followers: 'accept',
         for_new_accounts: 'accept',
diff --git a/spec/requests/api/v2/search_spec.rb b/spec/requests/api/v2/search_spec.rb
index 039e7513cdfeca..a59ec7ca6b1807 100644
--- a/spec/requests/api/v2/search_spec.rb
+++ b/spec/requests/api/v2/search_spec.rb
@@ -27,7 +27,7 @@
         it 'returns all matching accounts' do
           get '/api/v2/search', headers: headers, params: params
 
-          expect(body_as_json[:accounts].pluck(:id)).to contain_exactly(bob.id.to_s, ana.id.to_s, tom.id.to_s)
+          expect(response.parsed_body[:accounts].pluck(:id)).to contain_exactly(bob.id.to_s, ana.id.to_s, tom.id.to_s)
         end
 
         context 'with truthy `resolve`' do
@@ -80,7 +80,7 @@
           it 'returns only the followed accounts' do
             get '/api/v2/search', headers: headers, params: params
 
-            expect(body_as_json[:accounts].pluck(:id)).to contain_exactly(ana.id.to_s)
+            expect(response.parsed_body[:accounts].pluck(:id)).to contain_exactly(ana.id.to_s)
           end
         end
       end
diff --git a/spec/requests/api/v2/suggestions_spec.rb b/spec/requests/api/v2/suggestions_spec.rb
index 8895efd23de9e0..e92507ed661fe8 100644
--- a/spec/requests/api/v2/suggestions_spec.rb
+++ b/spec/requests/api/v2/suggestions_spec.rb
@@ -22,7 +22,7 @@
 
       expect(response).to have_http_status(200)
 
-      expect(body_as_json).to match_array(
+      expect(response.parsed_body).to match_array(
         [bob, jeff].map do |account|
           hash_including({
             source: 'staff',
diff --git a/spec/requests/api/v2_alpha/notifications/accounts_spec.rb b/spec/requests/api/v2_alpha/notifications/accounts_spec.rb
index 6a6ce043d36bf3..3c5bcd89963dff 100644
--- a/spec/requests/api/v2_alpha/notifications/accounts_spec.rb
+++ b/spec/requests/api/v2_alpha/notifications/accounts_spec.rb
@@ -33,7 +33,7 @@
 
       # The group we are interested in is only favorites
       notifications = user.account.notifications.where(type: 'favourite').reorder(id: :desc)
-      expect(body_as_json).to match(
+      expect(response.parsed_body).to match(
         [
           a_hash_including(
             id: notifications.first.from_account_id.to_s
@@ -58,7 +58,7 @@
 
         # The group we are interested in is only favorites
         notifications = user.account.notifications.where(type: 'favourite').reorder(id: :desc)
-        expect(body_as_json).to match(
+        expect(response.parsed_body).to match(
           [
             a_hash_including(
               id: notifications.first.from_account_id.to_s
diff --git a/spec/requests/api/v2_alpha/notifications_spec.rb b/spec/requests/api/v2_alpha/notifications_spec.rb
index 8009e7edce798a..b7821de561f9eb 100644
--- a/spec/requests/api/v2_alpha/notifications_spec.rb
+++ b/spec/requests/api/v2_alpha/notifications_spec.rb
@@ -31,7 +31,7 @@
         subject
 
         expect(response).to have_http_status(200)
-        expect(body_as_json[:count]).to eq 4
+        expect(response.parsed_body[:count]).to eq 4
       end
     end
 
@@ -42,7 +42,7 @@
         subject
 
         expect(response).to have_http_status(200)
-        expect(body_as_json[:count]).to eq 5
+        expect(response.parsed_body[:count]).to eq 5
       end
     end
 
@@ -56,7 +56,7 @@
         subject
 
         expect(response).to have_http_status(200)
-        expect(body_as_json[:count]).to eq 2
+        expect(response.parsed_body[:count]).to eq 2
       end
     end
 
@@ -67,7 +67,7 @@
         subject
 
         expect(response).to have_http_status(200)
-        expect(body_as_json[:count]).to eq 3
+        expect(response.parsed_body[:count]).to eq 3
       end
     end
 
@@ -78,7 +78,7 @@
         subject
 
         expect(response).to have_http_status(200)
-        expect(body_as_json[:count]).to eq 2
+        expect(response.parsed_body[:count]).to eq 2
       end
     end
 
@@ -91,7 +91,7 @@
         subject
 
         expect(response).to have_http_status(200)
-        expect(body_as_json[:count]).to eq Api::V2Alpha::NotificationsController::DEFAULT_NOTIFICATIONS_COUNT_LIMIT
+        expect(response.parsed_body[:count]).to eq Api::V2Alpha::NotificationsController::DEFAULT_NOTIFICATIONS_COUNT_LIMIT
       end
     end
   end
@@ -125,7 +125,7 @@
         subject
 
         expect(response).to have_http_status(200)
-        expect(body_as_json[:notification_groups]).to eq []
+        expect(response.parsed_body[:notification_groups]).to eq []
       end
     end
 
@@ -145,7 +145,7 @@
         subject
 
         expect(response).to have_http_status(200)
-        expect(body_as_json[:notification_groups]).to contain_exactly(
+        expect(response.parsed_body[:notification_groups]).to contain_exactly(
           a_hash_including(
             type: 'reblog',
             sample_account_ids: [bob.account_id.to_s]
@@ -177,7 +177,7 @@
         subject
 
         expect(response).to have_http_status(200)
-        expect(body_as_json.size).to_not eq 0
+        expect(response.parsed_body.size).to_not eq 0
         expect(body_json_types.uniq).to_not include 'mention'
       end
     end
@@ -190,7 +190,7 @@
 
         expect(response).to have_http_status(200)
         expect(body_json_types.uniq).to eq ['mention']
-        expect(body_as_json.dig(:notification_groups, 0, :page_min_id)).to_not be_nil
+        expect(response.parsed_body.dig(:notification_groups, 0, :page_min_id)).to_not be_nil
       end
     end
 
@@ -201,7 +201,7 @@
       it 'returns the requested number of notifications paginated', :aggregate_failures do
         subject
 
-        expect(body_as_json[:notification_groups].size)
+        expect(response.parsed_body[:notification_groups].size)
           .to eq(params[:limit])
 
         expect(response)
@@ -221,7 +221,7 @@
       it 'returns the requested number of notifications paginated', :aggregate_failures do
         subject
 
-        expect(body_as_json[:notification_groups].size)
+        expect(response.parsed_body[:notification_groups].size)
           .to eq(2)
 
         expect(response)
@@ -247,10 +247,10 @@
         subject
 
         expect(response).to have_http_status(200)
-        expect(body_as_json[:partial_accounts].size).to be > 0
-        expect(body_as_json[:partial_accounts][0].keys.map(&:to_sym)).to contain_exactly(:acct, :avatar, :avatar_static, :bot, :id, :locked, :url)
-        expect(body_as_json[:partial_accounts].pluck(:id)).to_not include(recent_account.id.to_s)
-        expect(body_as_json[:accounts].pluck(:id)).to include(recent_account.id.to_s)
+        expect(response.parsed_body[:partial_accounts].size).to be > 0
+        expect(response.parsed_body[:partial_accounts][0].keys.map(&:to_sym)).to contain_exactly(:acct, :avatar, :avatar_static, :bot, :id, :locked, :url)
+        expect(response.parsed_body[:partial_accounts].pluck(:id)).to_not include(recent_account.id.to_s)
+        expect(response.parsed_body[:accounts].pluck(:id)).to include(recent_account.id.to_s)
       end
     end
 
@@ -265,7 +265,7 @@
     end
 
     def body_json_types
-      body_as_json[:notification_groups].pluck(:type)
+      response.parsed_body[:notification_groups].pluck(:type)
     end
   end
 
diff --git a/spec/requests/api/web/embeds_spec.rb b/spec/requests/api/web/embeds_spec.rb
index 0e6195204bcd48..2b28502835843c 100644
--- a/spec/requests/api/web/embeds_spec.rb
+++ b/spec/requests/api/web/embeds_spec.rb
@@ -18,7 +18,7 @@
           subject
 
           expect(response).to have_http_status(200)
-          expect(body_as_json[:html]).to be_present
+          expect(response.parsed_body[:html]).to be_present
         end
       end
 
@@ -71,7 +71,7 @@
           subject
 
           expect(response).to have_http_status(200)
-          expect(body_as_json[:html]).to be_present
+          expect(response.parsed_body[:html]).to be_present
         end
 
         context 'when the requesting user is blocked' do
@@ -133,7 +133,7 @@
           subject
 
           expect(response).to have_http_status(200)
-          expect(body_as_json[:html]).to be_present
+          expect(response.parsed_body[:html]).to be_present
         end
       end
 
diff --git a/spec/requests/emojis_spec.rb b/spec/requests/emojis_spec.rb
index b2e4702f2dc95c..644838dc65b8ec 100644
--- a/spec/requests/emojis_spec.rb
+++ b/spec/requests/emojis_spec.rb
@@ -11,7 +11,7 @@
 
       expect(response)
         .to have_http_status(200)
-      expect(body_as_json)
+      expect(response.parsed_body)
         .to include(
           name: ':coolcat:',
           type: 'Emoji'
diff --git a/spec/requests/instance_actor_spec.rb b/spec/requests/instance_actor_spec.rb
index bb294b04a44133..b4a9b2ce6ff037 100644
--- a/spec/requests/instance_actor_spec.rb
+++ b/spec/requests/instance_actor_spec.rb
@@ -15,7 +15,7 @@
           .and have_cacheable_headers
         expect(response.content_type)
           .to start_with('application/activity+json')
-        expect(body_as_json)
+        expect(response.parsed_body)
           .to include(
             id: instance_actor_url,
             type: 'Application',
diff --git a/spec/requests/invite_spec.rb b/spec/requests/invite_spec.rb
index 4ce6c78e940aba..ba046453890cb7 100644
--- a/spec/requests/invite_spec.rb
+++ b/spec/requests/invite_spec.rb
@@ -12,7 +12,7 @@
       expect(response).to have_http_status(200)
       expect(response.media_type).to eq 'application/json'
 
-      expect(body_as_json[:invite_code]).to eq invite.code
+      expect(response.parsed_body[:invite_code]).to eq invite.code
     end
   end
 
diff --git a/spec/requests/log_out_spec.rb b/spec/requests/log_out_spec.rb
index 62ede0c1060aea..25291fa796bfbe 100644
--- a/spec/requests/log_out_spec.rb
+++ b/spec/requests/log_out_spec.rb
@@ -24,7 +24,7 @@
       expect(response).to have_http_status(200)
       expect(response.media_type).to eq 'application/json'
 
-      expect(body_as_json[:redirect_to]).to eq '/auth/sign_in'
+      expect(response.parsed_body[:redirect_to]).to eq '/auth/sign_in'
     end
   end
 end
diff --git a/spec/requests/manifest_spec.rb b/spec/requests/manifest_spec.rb
index 69e308e3ce9209..8133c90ee56dab 100644
--- a/spec/requests/manifest_spec.rb
+++ b/spec/requests/manifest_spec.rb
@@ -13,7 +13,7 @@
         .and have_attributes(
           content_type: match('application/json')
         )
-      expect(body_as_json)
+      expect(response.parsed_body)
         .to include(
           id: '/home',
           name: 'Mastodon'
diff --git a/spec/requests/oauth/token_spec.rb b/spec/requests/oauth/token_spec.rb
index 39ea9b35ff6bcb..18d232e5aba8d8 100644
--- a/spec/requests/oauth/token_spec.rb
+++ b/spec/requests/oauth/token_spec.rb
@@ -34,7 +34,7 @@
           subject
 
           expect(response).to have_http_status(200)
-          expect(body_as_json[:scope]).to eq 'read write'
+          expect(response.parsed_body[:scope]).to eq 'read write'
         end
       end
 
@@ -76,7 +76,7 @@
           subject
 
           expect(response).to have_http_status(200)
-          expect(body_as_json[:scope]).to eq('read')
+          expect(response.parsed_body[:scope]).to eq('read')
         end
       end
 
@@ -88,7 +88,7 @@
             subject
 
             expect(response).to have_http_status(200)
-            expect(body_as_json[:scope]).to eq 'read write'
+            expect(response.parsed_body[:scope]).to eq 'read write'
           end
         end
 
diff --git a/spec/requests/signature_verification_spec.rb b/spec/requests/signature_verification_spec.rb
index 580d0283389b65..128e7c07871487 100644
--- a/spec/requests/signature_verification_spec.rb
+++ b/spec/requests/signature_verification_spec.rb
@@ -50,7 +50,7 @@
       get '/activitypub/success'
 
       expect(response).to have_http_status(200)
-      expect(body_as_json).to match(
+      expect(response.parsed_body).to match(
         signed_request: false,
         signature_actor_id: nil,
         error: 'Request not signed'
@@ -62,7 +62,7 @@
         get '/activitypub/signature_required'
 
         expect(response).to have_http_status(401)
-        expect(body_as_json).to match(
+        expect(response.parsed_body).to match(
           error: 'Request not signed'
         )
       end
@@ -87,7 +87,7 @@
         }
 
         expect(response).to have_http_status(200)
-        expect(body_as_json).to match(
+        expect(response.parsed_body).to match(
           signed_request: true,
           signature_actor_id: actor.id.to_s
         )
@@ -109,7 +109,7 @@
         }
 
         expect(response).to have_http_status(200)
-        expect(body_as_json).to match(
+        expect(response.parsed_body).to match(
           signed_request: true,
           signature_actor_id: actor.id.to_s
         )
@@ -131,7 +131,7 @@
         }
 
         expect(response).to have_http_status(200)
-        expect(body_as_json).to match(
+        expect(response.parsed_body).to match(
           signed_request: true,
           signature_actor_id: actor.id.to_s
         )
@@ -152,7 +152,7 @@
           'Signature' => signature_header,
         }
 
-        expect(body_as_json).to match(
+        expect(response.parsed_body).to match(
           signed_request: true,
           signature_actor_id: nil,
           error: anything
@@ -168,7 +168,7 @@
           'Signature' => 'keyId="https://remote.domain/users/bob#main-key",algorithm="rsa-sha256",headers="date host (request-target)",signature="Z8ilar3J7bOwqZkMp7sL8sRs4B1FT+UorbmvWoE+A5UeoOJ3KBcUmbsh+k3wQwbP5gMNUrra9rEWabpasZGphLsbDxfbsWL3Cf0PllAc7c1c7AFEwnewtExI83/qqgEkfWc2z7UDutXc2NfgAx89Ox8DXU/fA2GG0jILjB6UpFyNugkY9rg6oI31UnvfVi3R7sr3/x8Ea3I9thPvqI2byF6cojknSpDAwYzeKdngX3TAQEGzFHz3SDWwyp3jeMWfwvVVbM38FxhvAnSumw7YwWW4L7M7h4M68isLimoT3yfCn2ucBVL5Dz8koBpYf/40w7QidClAwCafZQFC29yDOg=="', # rubocop:disable Layout/LineLength
         }
 
-        expect(body_as_json).to match(
+        expect(response.parsed_body).to match(
           signed_request: true,
           signature_actor_id: nil,
           error: anything
@@ -184,7 +184,7 @@
           'Signature' => 'keyId="https://remote.domain/users/bob#main-key",algorithm="rsa-sha256",headers="date host (request-target)",signature="Z8ilar3J7bOwqZkMp7sL8sRs4B1FT+UorbmvWoE+A5UeoOJ3KBcUmbsh+k3wQwbP5gMNUrra9rEWabpasZGphLsbDxfbsWL3Cf0PllAc7c1c7AFEwnewtExI83/qqgEkfWc2z7UDutXc2NfgAx89Ox8DXU/fA2GG0jILjB6UpFyNugkY9rg6oI31UnvfVi3R7sr3/x8Ea3I9thPvqI2byF6cojknSpDAwYzeKdngX3TAQEGzFHz3SDWwyp3jeMWfwvVVbM38FxhvAnSumw7YwWW4L7M7h4M68isLimoT3yfCn2ucBVL5Dz8koBpYf/40w7QidClAwCafZQFC29yDOg=="', # rubocop:disable Layout/LineLength
         }
 
-        expect(body_as_json).to match(
+        expect(response.parsed_body).to match(
           signed_request: true,
           signature_actor_id: nil,
           error: anything
@@ -206,7 +206,7 @@
           'Signature' => signature_header,
         }
 
-        expect(body_as_json).to match(
+        expect(response.parsed_body).to match(
           signed_request: true,
           signature_actor_id: nil,
           error: 'Invalid Date header: not RFC 2616 compliant date: "wrong date"'
@@ -228,7 +228,7 @@
           'Signature' => signature_header,
         }
 
-        expect(body_as_json).to match(
+        expect(response.parsed_body).to match(
           signed_request: true,
           signature_actor_id: nil,
           error: 'Signed request date outside acceptable time window'
@@ -254,7 +254,7 @@
         }
 
         expect(response).to have_http_status(200)
-        expect(body_as_json).to match(
+        expect(response.parsed_body).to match(
           signed_request: true,
           signature_actor_id: actor.id.to_s
         )
@@ -278,7 +278,7 @@
           'Signature' => signature_header,
         }
 
-        expect(body_as_json).to match(
+        expect(response.parsed_body).to match(
           signed_request: true,
           signature_actor_id: nil,
           error: 'Mastodon requires the Digest header to be signed when doing a POST request'
@@ -303,7 +303,7 @@
           'Signature' => signature_header,
         }
 
-        expect(body_as_json).to match(
+        expect(response.parsed_body).to match(
           signed_request: true,
           signature_actor_id: nil,
           error: 'Invalid Digest value. Computed SHA-256 digest: wFNeS+K3n/2TKRMFQ2v4iTFOSj+uwF7P/Lt98xrZ5Ro=; given: ZOyIygCyaOW6GjVnihtTFtIS9PNmskdyMlNKiuyjfzw='
@@ -321,7 +321,7 @@
         }
 
         expect(response).to have_http_status(200)
-        expect(body_as_json).to match(
+        expect(response.parsed_body).to match(
           signed_request: true,
           signature_actor_id: nil,
           error: anything
@@ -342,7 +342,7 @@
         'Signature' => 'keyId="https://remote.domain/users/alice#main-key",algorithm="rsa-sha256",headers="date host (request-target)",signature="Z8ilar3J7bOwqZkMp7sL8sRs4B1FT+UorbmvWoE+A5UeoOJ3KBcUmbsh+k3wQwbP5gMNUrra9rEWabpasZGphLsbDxfbsWL3Cf0PllAc7c1c7AFEwnewtExI83/qqgEkfWc2z7UDutXc2NfgAx89Ox8DXU/fA2GG0jILjB6UpFyNugkY9rg6oI31UnvfVi3R7sr3/x8Ea3I9thPvqI2byF6cojknSpDAwYzeKdngX3TAQEGzFHz3SDWwyp3jeMWfwvVVbM38FxhvAnSumw7YwWW4L7M7h4M68isLimoT3yfCn2ucBVL5Dz8koBpYf/40w7QidClAwCafZQFC29yDOg=="', # rubocop:disable Layout/LineLength
       }
 
-      expect(body_as_json).to match(
+      expect(response.parsed_body).to match(
         signed_request: true,
         signature_actor_id: nil,
         error: 'Unable to fetch key JSON at https://remote.domain/users/alice#main-key'
diff --git a/spec/requests/well_known/node_info_spec.rb b/spec/requests/well_known/node_info_spec.rb
index d02732c32bb231..3d5afc7e2d3bad 100644
--- a/spec/requests/well_known/node_info_spec.rb
+++ b/spec/requests/well_known/node_info_spec.rb
@@ -13,7 +13,7 @@
           media_type: 'application/json'
         )
 
-      expect(body_as_json).to include(
+      expect(response.parsed_body).to include(
         links: be_an(Array).and(
           contain_exactly(
             include(
@@ -39,7 +39,7 @@
       expect(non_matching_hash)
         .to_not match_json_schema('nodeinfo_2.0')
 
-      expect(body_as_json)
+      expect(response.parsed_body)
         .to match_json_schema('nodeinfo_2.0')
         .and include(
           version: '2.0',
diff --git a/spec/requests/well_known/oauth_metadata_spec.rb b/spec/requests/well_known/oauth_metadata_spec.rb
index 378295b5a356ec..9c86dbedfe7086 100644
--- a/spec/requests/well_known/oauth_metadata_spec.rb
+++ b/spec/requests/well_known/oauth_metadata_spec.rb
@@ -21,7 +21,7 @@
     grant_types_supported = Doorkeeper.configuration.grant_flows.dup
     grant_types_supported << 'refresh_token' if Doorkeeper.configuration.refresh_token_enabled?
 
-    expect(body_as_json).to include(
+    expect(response.parsed_body).to include(
       issuer: root_url(protocol: protocol),
       service_documentation: 'https://docs.joinmastodon.org/',
       authorization_endpoint: oauth_authorization_url(protocol: protocol),
diff --git a/spec/requests/well_known/webfinger_spec.rb b/spec/requests/well_known/webfinger_spec.rb
index e5ce352d50791f..6880ba4b5895e5 100644
--- a/spec/requests/well_known/webfinger_spec.rb
+++ b/spec/requests/well_known/webfinger_spec.rb
@@ -24,7 +24,7 @@
 
       expect(response.media_type).to eq 'application/jrd+json'
 
-      expect(body_as_json)
+      expect(response.parsed_body)
         .to include(
           subject: eq('acct:alice@cb6e6126.ngrok.io'),
           aliases: include('https://cb6e6126.ngrok.io/@alice', 'https://cb6e6126.ngrok.io/users/alice')
@@ -129,7 +129,7 @@
     end
 
     it 'returns links for the internal account' do
-      expect(body_as_json)
+      expect(response.parsed_body)
         .to include(
           subject: 'acct:mastodon.internal@cb6e6126.ngrok.io',
           aliases: ['https://cb6e6126.ngrok.io/actor']
@@ -168,7 +168,7 @@
     it 'returns avatar in response' do
       perform_request!
 
-      avatar_link = get_avatar_link(body_as_json)
+      avatar_link = get_avatar_link(response.parsed_body)
       expect(avatar_link).to_not be_nil
       expect(avatar_link[:type]).to eq alice.avatar.content_type
       expect(avatar_link[:href]).to eq Addressable::URI.new(host: Rails.configuration.x.local_domain, path: alice.avatar.to_s, scheme: 'https').to_s
@@ -182,7 +182,7 @@
       it 'does not return avatar in response' do
         perform_request!
 
-        avatar_link = get_avatar_link(body_as_json)
+        avatar_link = get_avatar_link(response.parsed_body)
         expect(avatar_link).to be_nil
       end
     end
@@ -197,7 +197,7 @@
       it 'does not return avatar in response' do
         perform_request!
 
-        avatar_link = get_avatar_link(body_as_json)
+        avatar_link = get_avatar_link(response.parsed_body)
         expect(avatar_link).to be_nil
       end
     end
@@ -212,7 +212,7 @@
     end
 
     it 'does not return avatar in response' do
-      avatar_link = get_avatar_link(body_as_json)
+      avatar_link = get_avatar_link(response.parsed_body)
       expect(avatar_link).to be_nil
     end
   end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 60bec918ea4100..2a27544407ba26 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -34,10 +34,6 @@
   end
 end
 
-def body_as_json
-  response.parsed_body
-end
-
 def serialized_record_json(record, serializer, adapter: nil)
   options = { serializer: serializer }
   options[:adapter] = adapter if adapter.present?

From ebf09328d4b17ad199ecfe364b84aa9b3da3f9b3 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 6 Sep 2024 12:58:53 +0200
Subject: [PATCH 2126/2191] Disable codecov github annotations (#31783)

---
 .github/codecov.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/codecov.yml b/.github/codecov.yml
index 701ba3af8f72d5..d9b43b2594e225 100644
--- a/.github/codecov.yml
+++ b/.github/codecov.yml
@@ -1,3 +1,4 @@
+annotations: false
 comment: false # Do not leave PR comments
 coverage:
   status:

From 1fed11cfa77c12135c68d5eff8c0d8760605b2b2 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 6 Sep 2024 14:33:38 +0200
Subject: [PATCH 2127/2191] Target firefox all the way back to Firefox 78
 (#31782)

---
 .browserslistrc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.browserslistrc b/.browserslistrc
index 0376af4bccd794..6367e4d35817fc 100644
--- a/.browserslistrc
+++ b/.browserslistrc
@@ -1,6 +1,7 @@
 [production]
 defaults
 > 0.2%
+firefox >= 78
 ios >= 15.6
 not dead
 not OperaMini all

From fd7fc7bdc36ea559d70edfa8cc811bed18baefc9 Mon Sep 17 00:00:00 2001
From: Emelia Smith <ThisIsMissEm@users.noreply.github.com>
Date: Fri, 6 Sep 2024 14:50:30 +0200
Subject: [PATCH 2128/2191] Disable actions on reports that have already been
 taken (#31773)

---
 app/models/admin/account_action.rb            |  8 ++++++++
 app/views/admin/account_actions/new.html.haml |  8 ++++++++
 app/views/admin/reports/_actions.html.haml    | 12 +++++++++---
 config/locales/en.yml                         |  3 +++
 4 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/app/models/admin/account_action.rb b/app/models/admin/account_action.rb
index 3700ce4cd6c735..4be58ba85306bf 100644
--- a/app/models/admin/account_action.rb
+++ b/app/models/admin/account_action.rb
@@ -73,6 +73,14 @@ def types_for_account(account)
       end
     end
 
+    def disabled_types_for_account(account)
+      if account.suspended?
+        %w(silence suspend)
+      elsif account.silenced?
+        %w(silence)
+      end
+    end
+
     def i18n_scope
       :activerecord
     end
diff --git a/app/views/admin/account_actions/new.html.haml b/app/views/admin/account_actions/new.html.haml
index bce1c31760d6e8..5b98582d8c769a 100644
--- a/app/views/admin/account_actions/new.html.haml
+++ b/app/views/admin/account_actions/new.html.haml
@@ -1,6 +1,13 @@
 - content_for :page_title do
   = t('admin.account_actions.title', acct: @account.pretty_acct)
 
+- if @account.suspended?
+  .flash-message.alert
+    = t('admin.account_actions.already_suspended')
+- elsif @account.silenced?
+  .flash-message.warn
+    = t('admin.account_actions.already_silenced')
+
 = simple_form_for @account_action, url: admin_account_action_path(@account.id) do |f|
   = f.input :report_id,
             as: :hidden
@@ -9,6 +16,7 @@
     = f.input :type,
               as: :radio_buttons,
               collection: Admin::AccountAction.types_for_account(@account),
+              disabled: Admin::AccountAction.disabled_types_for_account(@account),
               hint: t('simple_form.hints.admin_account_action.type_html', acct: @account.pretty_acct),
               include_blank: false,
               label_method: ->(type) { account_action_type_label(type) },
diff --git a/app/views/admin/reports/_actions.html.haml b/app/views/admin/reports/_actions.html.haml
index 5fb540931b1f81..7317d401e766ca 100644
--- a/app/views/admin/reports/_actions.html.haml
+++ b/app/views/admin/reports/_actions.html.haml
@@ -17,21 +17,27 @@
       .report-actions__item__button
         = form.button t('admin.reports.delete_and_resolve'),
                       name: :delete,
-                      class: 'button button--destructive'
+                      class: 'button button--destructive',
+                      disabled: statuses.empty?,
+                      title: statuses.empty? ? t('admin.reports.actions_no_posts') : ''
       .report-actions__item__description
         = t('admin.reports.actions.delete_description_html')
     .report-actions__item
       .report-actions__item__button
         = form.button t('admin.accounts.silence'),
                       name: :silence,
-                      class: 'button button--destructive'
+                      class: 'button button--destructive',
+                      disabled: report.target_account.silenced? || report.target_account.suspended?,
+                      title: report.target_account.silenced? ? t('admin.account_actions.already_silenced') : ''
       .report-actions__item__description
         = t('admin.reports.actions.silence_description_html')
     .report-actions__item
       .report-actions__item__button
         = form.button t('admin.accounts.suspend'),
                       name: :suspend,
-                      class: 'button button--destructive'
+                      class: 'button button--destructive',
+                      disabled: report.target_account.suspended?,
+                      title: report.target_account.suspended? ? t('admin.account_actions.already_suspended') : ''
       .report-actions__item__description
         = t('admin.reports.actions.suspend_description_html')
     .report-actions__item
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 267e04618b648f..217b1537f4a6c5 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -25,6 +25,8 @@ en:
   admin:
     account_actions:
       action: Perform action
+      already_silenced: This account has already been silenced.
+      already_suspended: This account has already been suspended.
       title: Perform moderation action on %{acct}
     account_moderation_notes:
       create: Leave note
@@ -602,6 +604,7 @@ en:
         suspend_description_html: The account and all its contents will be inaccessible and eventually deleted, and interacting with it will be impossible. Reversible within 30 days. Closes all reports against this account.
       actions_description_html: Decide which action to take to resolve this report. If you take a punitive action against the reported account, an email notification will be sent to them, except when the <strong>Spam</strong> category is selected.
       actions_description_remote_html: Decide which action to take to resolve this report. This will only affect how <strong>your</strong> server communicates with this remote account and handle its content.
+      actions_no_posts: This report doesn't have any associated posts to delete
       add_to_report: Add more to report
       already_suspended_badges:
         local: Already suspended on this server

From a9d0b48b6566f5e06337a84745cdd624a6b31426 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 6 Sep 2024 09:58:46 -0400
Subject: [PATCH 2129/2191] Set "admin" body class from `admin` nested layout
 (#31269)

---
 app/controllers/admin/base_controller.rb              |  5 -----
 app/controllers/auth/registrations_controller.rb      |  5 -----
 app/controllers/disputes/base_controller.rb           |  5 -----
 app/controllers/filters/statuses_controller.rb        |  5 -----
 app/controllers/filters_controller.rb                 |  5 -----
 app/controllers/invites_controller.rb                 |  5 -----
 .../oauth/authorized_applications_controller.rb       |  5 -----
 app/controllers/relationships_controller.rb           |  5 -----
 app/controllers/settings/base_controller.rb           |  5 -----
 app/controllers/severed_relationships_controller.rb   |  5 -----
 app/controllers/statuses_cleanup_controller.rb        |  5 -----
 app/helpers/application_helper.rb                     |  1 +
 app/views/layouts/admin.html.haml                     |  2 ++
 spec/helpers/application_helper_spec.rb               | 11 ++++++++++-
 14 files changed, 13 insertions(+), 56 deletions(-)

diff --git a/app/controllers/admin/base_controller.rb b/app/controllers/admin/base_controller.rb
index 4b5afbe157c84b..48685db17a2b8d 100644
--- a/app/controllers/admin/base_controller.rb
+++ b/app/controllers/admin/base_controller.rb
@@ -7,17 +7,12 @@ class BaseController < ApplicationController
 
     layout 'admin'
 
-    before_action :set_body_classes
     before_action :set_cache_headers
 
     after_action :verify_authorized
 
     private
 
-    def set_body_classes
-      @body_classes = 'admin'
-    end
-
     def set_cache_headers
       response.cache_control.replace(private: true, no_store: true)
     end
diff --git a/app/controllers/auth/registrations_controller.rb b/app/controllers/auth/registrations_controller.rb
index c12960934e35e5..4d94c801586354 100644
--- a/app/controllers/auth/registrations_controller.rb
+++ b/app/controllers/auth/registrations_controller.rb
@@ -11,7 +11,6 @@ class Auth::RegistrationsController < Devise::RegistrationsController
   before_action :configure_sign_up_params, only: [:create]
   before_action :set_sessions, only: [:edit, :update]
   before_action :set_strikes, only: [:edit, :update]
-  before_action :set_body_classes, only: [:new, :create, :edit, :update]
   before_action :require_not_suspended!, only: [:update]
   before_action :set_cache_headers, only: [:edit, :update]
   before_action :set_rules, only: :new
@@ -104,10 +103,6 @@ def invite_code
 
   private
 
-  def set_body_classes
-    @body_classes = 'admin' if %w(edit update).include?(action_name)
-  end
-
   def set_invite
     @invite = begin
       invite = Invite.find_by(code: invite_code) if invite_code.present?
diff --git a/app/controllers/disputes/base_controller.rb b/app/controllers/disputes/base_controller.rb
index 1054f3db805593..dd24a1b7408c98 100644
--- a/app/controllers/disputes/base_controller.rb
+++ b/app/controllers/disputes/base_controller.rb
@@ -7,16 +7,11 @@ class Disputes::BaseController < ApplicationController
 
   skip_before_action :require_functional!
 
-  before_action :set_body_classes
   before_action :authenticate_user!
   before_action :set_cache_headers
 
   private
 
-  def set_body_classes
-    @body_classes = 'admin'
-  end
-
   def set_cache_headers
     response.cache_control.replace(private: true, no_store: true)
   end
diff --git a/app/controllers/filters/statuses_controller.rb b/app/controllers/filters/statuses_controller.rb
index 94993f938b5318..7ada13f680d745 100644
--- a/app/controllers/filters/statuses_controller.rb
+++ b/app/controllers/filters/statuses_controller.rb
@@ -6,7 +6,6 @@ class Filters::StatusesController < ApplicationController
   before_action :authenticate_user!
   before_action :set_filter
   before_action :set_status_filters
-  before_action :set_body_classes
   before_action :set_cache_headers
 
   PER_PAGE = 20
@@ -42,10 +41,6 @@ def action_from_button
     'remove' if params[:remove]
   end
 
-  def set_body_classes
-    @body_classes = 'admin'
-  end
-
   def set_cache_headers
     response.cache_control.replace(private: true, no_store: true)
   end
diff --git a/app/controllers/filters_controller.rb b/app/controllers/filters_controller.rb
index bd9964426b8064..8c4e867e93a542 100644
--- a/app/controllers/filters_controller.rb
+++ b/app/controllers/filters_controller.rb
@@ -5,7 +5,6 @@ class FiltersController < ApplicationController
 
   before_action :authenticate_user!
   before_action :set_filter, only: [:edit, :update, :destroy]
-  before_action :set_body_classes
   before_action :set_cache_headers
 
   def index
@@ -52,10 +51,6 @@ def resource_params
     params.require(:custom_filter).permit(:title, :expires_in, :filter_action, context: [], keywords_attributes: [:id, :keyword, :whole_word, :_destroy])
   end
 
-  def set_body_classes
-    @body_classes = 'admin'
-  end
-
   def set_cache_headers
     response.cache_control.replace(private: true, no_store: true)
   end
diff --git a/app/controllers/invites_controller.rb b/app/controllers/invites_controller.rb
index 9bc5164d599b50..070852695eebfe 100644
--- a/app/controllers/invites_controller.rb
+++ b/app/controllers/invites_controller.rb
@@ -6,7 +6,6 @@ class InvitesController < ApplicationController
   layout 'admin'
 
   before_action :authenticate_user!
-  before_action :set_body_classes
   before_action :set_cache_headers
 
   def index
@@ -47,10 +46,6 @@ def resource_params
     params.require(:invite).permit(:max_uses, :expires_in, :autofollow, :comment)
   end
 
-  def set_body_classes
-    @body_classes = 'admin'
-  end
-
   def set_cache_headers
     response.cache_control.replace(private: true, no_store: true)
   end
diff --git a/app/controllers/oauth/authorized_applications_controller.rb b/app/controllers/oauth/authorized_applications_controller.rb
index 7bb22453ca0e11..267409a9ce4ef6 100644
--- a/app/controllers/oauth/authorized_applications_controller.rb
+++ b/app/controllers/oauth/authorized_applications_controller.rb
@@ -6,7 +6,6 @@ class Oauth::AuthorizedApplicationsController < Doorkeeper::AuthorizedApplicatio
   before_action :store_current_location
   before_action :authenticate_resource_owner!
   before_action :require_not_suspended!, only: :destroy
-  before_action :set_body_classes
   before_action :set_cache_headers
 
   before_action :set_last_used_at_by_app, only: :index, unless: -> { request.format == :json }
@@ -23,10 +22,6 @@ def destroy
 
   private
 
-  def set_body_classes
-    @body_classes = 'admin'
-  end
-
   def store_current_location
     store_location_for(:user, request.url)
   end
diff --git a/app/controllers/relationships_controller.rb b/app/controllers/relationships_controller.rb
index dd794f3199eeec..d351afcfb72cff 100644
--- a/app/controllers/relationships_controller.rb
+++ b/app/controllers/relationships_controller.rb
@@ -6,7 +6,6 @@ class RelationshipsController < ApplicationController
   before_action :authenticate_user!
   before_action :set_accounts, only: :show
   before_action :set_relationships, only: :show
-  before_action :set_body_classes
   before_action :set_cache_headers
 
   helper_method :following_relationship?, :followed_by_relationship?, :mutual_relationship?
@@ -68,10 +67,6 @@ def action_from_button
     end
   end
 
-  def set_body_classes
-    @body_classes = 'admin'
-  end
-
   def set_cache_headers
     response.cache_control.replace(private: true, no_store: true)
   end
diff --git a/app/controllers/settings/base_controller.rb b/app/controllers/settings/base_controller.rb
index f15140aa2be3da..188334ac234663 100644
--- a/app/controllers/settings/base_controller.rb
+++ b/app/controllers/settings/base_controller.rb
@@ -4,15 +4,10 @@ class Settings::BaseController < ApplicationController
   layout 'admin'
 
   before_action :authenticate_user!
-  before_action :set_body_classes
   before_action :set_cache_headers
 
   private
 
-  def set_body_classes
-    @body_classes = 'admin'
-  end
-
   def set_cache_headers
     response.cache_control.replace(private: true, no_store: true)
   end
diff --git a/app/controllers/severed_relationships_controller.rb b/app/controllers/severed_relationships_controller.rb
index 168e85e3fe4717..965753a26f8ac9 100644
--- a/app/controllers/severed_relationships_controller.rb
+++ b/app/controllers/severed_relationships_controller.rb
@@ -4,7 +4,6 @@ class SeveredRelationshipsController < ApplicationController
   layout 'admin'
 
   before_action :authenticate_user!
-  before_action :set_body_classes
   before_action :set_cache_headers
 
   before_action :set_event, only: [:following, :followers]
@@ -51,10 +50,6 @@ def acct(account)
     account.local? ? account.local_username_and_domain : account.acct
   end
 
-  def set_body_classes
-    @body_classes = 'admin'
-  end
-
   def set_cache_headers
     response.cache_control.replace(private: true, no_store: true)
   end
diff --git a/app/controllers/statuses_cleanup_controller.rb b/app/controllers/statuses_cleanup_controller.rb
index 4a3fc10ca4fbd5..e517bf3ae88a44 100644
--- a/app/controllers/statuses_cleanup_controller.rb
+++ b/app/controllers/statuses_cleanup_controller.rb
@@ -5,7 +5,6 @@ class StatusesCleanupController < ApplicationController
 
   before_action :authenticate_user!
   before_action :set_policy
-  before_action :set_body_classes
   before_action :set_cache_headers
 
   def show; end
@@ -34,10 +33,6 @@ def resource_params
     params.require(:account_statuses_cleanup_policy).permit(:enabled, :min_status_age, :keep_direct, :keep_pinned, :keep_polls, :keep_media, :keep_self_fav, :keep_self_bookmark, :min_favs, :min_reblogs)
   end
 
-  def set_body_classes
-    @body_classes = 'admin'
-  end
-
   def set_cache_headers
     response.cache_control.replace(private: true, no_store: true)
   end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 7c91df8d4f5bc0..de00f76d3623d5 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -159,6 +159,7 @@ def opengraph(property, content)
 
   def body_classes
     output = body_class_string.split
+    output << content_for(:body_classes)
     output << "theme-#{current_theme.parameterize}"
     output << 'system-font' if current_account&.user&.setting_system_font_ui
     output << (current_account&.user&.setting_reduce_motion ? 'reduce-motion' : 'no-reduce-motion')
diff --git a/app/views/layouts/admin.html.haml b/app/views/layouts/admin.html.haml
index ebd236c62889b6..3f7727cdfb1f85 100644
--- a/app/views/layouts/admin.html.haml
+++ b/app/views/layouts/admin.html.haml
@@ -3,6 +3,8 @@
   = javascript_pack_tag 'public', crossorigin: 'anonymous'
   = javascript_pack_tag 'admin', async: true, crossorigin: 'anonymous'
 
+- content_for :body_classes, 'admin'
+
 - content_for :content do
   .admin-wrapper
     .sidebar-wrapper
diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
index c2e618c7def033..0f78dc82f511e3 100644
--- a/spec/helpers/application_helper_spec.rb
+++ b/spec/helpers/application_helper_spec.rb
@@ -8,7 +8,16 @@
       before { helper.extend controller_helpers }
 
       it 'uses the controller body classes in the result' do
-        expect(helper.body_classes).to match(/modal-layout compose-standalone/)
+        expect(helper.body_classes)
+          .to match(/modal-layout compose-standalone/)
+          .and match(/theme-default/)
+      end
+
+      it 'includes values set via content_for' do
+        helper.content_for(:body_classes) { 'admin' }
+
+        expect(helper.body_classes)
+          .to match(/admin/)
       end
 
       private

From c88ba523ee6eebb11413690639818ef1c926399c Mon Sep 17 00:00:00 2001
From: Emelia Smith <ThisIsMissEm@users.noreply.github.com>
Date: Fri, 6 Sep 2024 16:58:36 +0200
Subject: [PATCH 2130/2191] Fix sort order of moderation notes on Reports and
 Accounts (#31528)

---
 .../account_moderation_notes_controller.rb    |  2 +-
 app/controllers/admin/accounts_controller.rb  |  2 +-
 .../admin/report_notes_controller.rb          |  2 +-
 app/controllers/admin/reports_controller.rb   |  2 +-
 app/models/account_moderation_note.rb         |  2 +-
 app/models/report_note.rb                     |  2 +-
 .../admin/accounts_controller_spec.rb         | 17 ++++++++++
 .../admin/reports_controller_spec.rb          | 18 +++++++++++
 .../account_moderation_note_fabricator.rb     |  2 +-
 spec/fabricators/report_note_fabricator.rb    |  2 +-
 spec/models/account_moderation_note_spec.rb   | 31 +++++++++++++++++++
 spec/models/report_note_spec.rb               | 31 +++++++++++++++++++
 12 files changed, 105 insertions(+), 8 deletions(-)
 create mode 100644 spec/models/account_moderation_note_spec.rb
 create mode 100644 spec/models/report_note_spec.rb

diff --git a/app/controllers/admin/account_moderation_notes_controller.rb b/app/controllers/admin/account_moderation_notes_controller.rb
index 8b6c1a4454ebd0..a3c4adf59a7815 100644
--- a/app/controllers/admin/account_moderation_notes_controller.rb
+++ b/app/controllers/admin/account_moderation_notes_controller.rb
@@ -13,7 +13,7 @@ def create
         redirect_to admin_account_path(@account_moderation_note.target_account_id), notice: I18n.t('admin.account_moderation_notes.created_msg')
       else
         @account          = @account_moderation_note.target_account
-        @moderation_notes = @account.targeted_moderation_notes.latest
+        @moderation_notes = @account.targeted_moderation_notes.chronological.includes(:account)
         @warnings         = @account.strikes.custom.latest
 
         render 'admin/accounts/show'
diff --git a/app/controllers/admin/accounts_controller.rb b/app/controllers/admin/accounts_controller.rb
index 9beb8fde6b2fda..7b169ba26a3d14 100644
--- a/app/controllers/admin/accounts_controller.rb
+++ b/app/controllers/admin/accounts_controller.rb
@@ -33,7 +33,7 @@ def show
 
       @deletion_request        = @account.deletion_request
       @account_moderation_note = current_account.account_moderation_notes.new(target_account: @account)
-      @moderation_notes        = @account.targeted_moderation_notes.latest
+      @moderation_notes        = @account.targeted_moderation_notes.chronological.includes(:account)
       @warnings                = @account.strikes.includes(:target_account, :account, :appeal).latest
       @domain_block            = DomainBlock.rule_for(@account.domain)
     end
diff --git a/app/controllers/admin/report_notes_controller.rb b/app/controllers/admin/report_notes_controller.rb
index b5f04a1caa0998..6b16c29fc7dce2 100644
--- a/app/controllers/admin/report_notes_controller.rb
+++ b/app/controllers/admin/report_notes_controller.rb
@@ -21,7 +21,7 @@ def create
 
         redirect_to after_create_redirect_path, notice: I18n.t('admin.report_notes.created_msg')
       else
-        @report_notes = @report.notes.includes(:account).order(id: :desc)
+        @report_notes = @report.notes.chronological.includes(:account)
         @action_logs  = @report.history.includes(:target)
         @form         = Admin::StatusBatchAction.new
         @statuses     = @report.statuses.with_includes
diff --git a/app/controllers/admin/reports_controller.rb b/app/controllers/admin/reports_controller.rb
index 00d200d7c88ccc..aa877f1448c98e 100644
--- a/app/controllers/admin/reports_controller.rb
+++ b/app/controllers/admin/reports_controller.rb
@@ -13,7 +13,7 @@ def show
       authorize @report, :show?
 
       @report_note  = @report.notes.new
-      @report_notes = @report.notes.includes(:account).order(id: :desc)
+      @report_notes = @report.notes.chronological.includes(:account)
       @action_logs  = @report.history.includes(:target)
       @form         = Admin::StatusBatchAction.new
       @statuses     = @report.statuses.with_includes
diff --git a/app/models/account_moderation_note.rb b/app/models/account_moderation_note.rb
index 79b8b4d25ee033..ca7f8e3d5fef3f 100644
--- a/app/models/account_moderation_note.rb
+++ b/app/models/account_moderation_note.rb
@@ -18,7 +18,7 @@ class AccountModerationNote < ApplicationRecord
   belongs_to :account
   belongs_to :target_account, class_name: 'Account'
 
-  scope :latest, -> { reorder('created_at DESC') }
+  scope :chronological, -> { reorder(id: :asc) }
 
   validates :content, presence: true, length: { maximum: CONTENT_SIZE_LIMIT }
 end
diff --git a/app/models/report_note.rb b/app/models/report_note.rb
index 7361c97e670a5e..9d3be52594f4c4 100644
--- a/app/models/report_note.rb
+++ b/app/models/report_note.rb
@@ -18,7 +18,7 @@ class ReportNote < ApplicationRecord
   belongs_to :account
   belongs_to :report, inverse_of: :notes, touch: true
 
-  scope :latest, -> { reorder(created_at: :desc) }
+  scope :chronological, -> { reorder(id: :asc) }
 
   validates :content, presence: true, length: { maximum: CONTENT_SIZE_LIMIT }
 end
diff --git a/spec/controllers/admin/accounts_controller_spec.rb b/spec/controllers/admin/accounts_controller_spec.rb
index ca399fbd9bba03..a1823001067388 100644
--- a/spec/controllers/admin/accounts_controller_spec.rb
+++ b/spec/controllers/admin/accounts_controller_spec.rb
@@ -55,6 +55,23 @@ def accounts_table_rows
   describe 'GET #show' do
     let(:current_user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
 
+    describe 'account moderation notes' do
+      let(:account) { Fabricate(:account) }
+
+      it 'includes moderation notes' do
+        note1 = Fabricate(:account_moderation_note, target_account: account)
+        note2 = Fabricate(:account_moderation_note, target_account: account)
+
+        get :show, params: { id: account.id }
+        expect(response).to have_http_status(200)
+
+        moderation_notes = assigns(:moderation_notes).to_a
+
+        expect(moderation_notes.size).to be 2
+        expect(moderation_notes).to eq [note1, note2]
+      end
+    end
+
     context 'with a remote account' do
       let(:account) { Fabricate(:account, domain: 'example.com') }
 
diff --git a/spec/controllers/admin/reports_controller_spec.rb b/spec/controllers/admin/reports_controller_spec.rb
index d07468a37b4fa4..1252ceb1f48ad1 100644
--- a/spec/controllers/admin/reports_controller_spec.rb
+++ b/spec/controllers/admin/reports_controller_spec.rb
@@ -47,6 +47,24 @@
       expect(response.body)
         .to include(report.comment)
     end
+
+    describe 'account moderation notes' do
+      let(:report) { Fabricate(:report) }
+
+      it 'includes moderation notes' do
+        note1 = Fabricate(:report_note, report: report)
+        note2 = Fabricate(:report_note, report: report)
+
+        get :show, params: { id: report }
+
+        expect(response).to have_http_status(200)
+
+        report_notes = assigns(:report_notes).to_a
+
+        expect(report_notes.size).to be 2
+        expect(report_notes).to eq [note1, note2]
+      end
+    end
   end
 
   describe 'POST #resolve' do
diff --git a/spec/fabricators/account_moderation_note_fabricator.rb b/spec/fabricators/account_moderation_note_fabricator.rb
index 05a687bf4ea0cc..1ded8626383c0e 100644
--- a/spec/fabricators/account_moderation_note_fabricator.rb
+++ b/spec/fabricators/account_moderation_note_fabricator.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 Fabricator(:account_moderation_note) do
-  content 'MyText'
+  content { Faker::Lorem.sentences }
   account { Fabricate.build(:account) }
   target_account { Fabricate.build(:account) }
 end
diff --git a/spec/fabricators/report_note_fabricator.rb b/spec/fabricators/report_note_fabricator.rb
index 080fad51acc677..a5e9cc9009f911 100644
--- a/spec/fabricators/report_note_fabricator.rb
+++ b/spec/fabricators/report_note_fabricator.rb
@@ -3,5 +3,5 @@
 Fabricator(:report_note) do
   report { Fabricate.build(:report) }
   account { Fabricate.build(:account) }
-  content 'Test Content'
+  content { Faker::Lorem.sentences }
 end
diff --git a/spec/models/account_moderation_note_spec.rb b/spec/models/account_moderation_note_spec.rb
new file mode 100644
index 00000000000000..079774c4925b4e
--- /dev/null
+++ b/spec/models/account_moderation_note_spec.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe AccountModerationNote do
+  describe 'chronological scope' do
+    it 'returns account moderation notes oldest to newest' do
+      account = Fabricate(:account)
+      note1 = Fabricate(:account_moderation_note, target_account: account)
+      note2 = Fabricate(:account_moderation_note, target_account: account)
+
+      expect(account.targeted_moderation_notes.chronological).to eq [note1, note2]
+    end
+  end
+
+  describe 'validations' do
+    it 'is invalid if the content is empty' do
+      report = Fabricate.build(:account_moderation_note, content: '')
+      expect(report.valid?).to be false
+    end
+
+    it 'is invalid if content is longer than character limit' do
+      report = Fabricate.build(:account_moderation_note, content: comment_over_limit)
+      expect(report.valid?).to be false
+    end
+
+    def comment_over_limit
+      Faker::Lorem.paragraph_by_chars(number: described_class::CONTENT_SIZE_LIMIT * 2)
+    end
+  end
+end
diff --git a/spec/models/report_note_spec.rb b/spec/models/report_note_spec.rb
new file mode 100644
index 00000000000000..417971c9a1e357
--- /dev/null
+++ b/spec/models/report_note_spec.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe ReportNote do
+  describe 'chronological scope' do
+    it 'returns report notes oldest to newest' do
+      report = Fabricate(:report)
+      note1 = Fabricate(:report_note, report: report)
+      note2 = Fabricate(:report_note, report: report)
+
+      expect(report.notes.chronological).to eq [note1, note2]
+    end
+  end
+
+  describe 'validations' do
+    it 'is invalid if the content is empty' do
+      report = Fabricate.build(:report_note, content: '')
+      expect(report.valid?).to be false
+    end
+
+    it 'is invalid if content is longer than character limit' do
+      report = Fabricate.build(:report_note, content: comment_over_limit)
+      expect(report.valid?).to be false
+    end
+
+    def comment_over_limit
+      Faker::Lorem.paragraph_by_chars(number: described_class::CONTENT_SIZE_LIMIT * 2)
+    end
+  end
+end

From b530fc5267e14b4eab0322d63af94525e999fd39 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 6 Sep 2024 11:22:35 -0400
Subject: [PATCH 2131/2191] Update rails to version 7.1.4 (#31563)

---
 Gemfile.lock                                  | 106 +++++++++---------
 .../initializers/active_record_encryption.rb  |   4 -
 2 files changed, 53 insertions(+), 57 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 8577a52691fe78..a988ad3f21885d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -10,35 +10,35 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.1.3.4)
-      actionpack (= 7.1.3.4)
-      activesupport (= 7.1.3.4)
+    actioncable (7.1.4)
+      actionpack (= 7.1.4)
+      activesupport (= 7.1.4)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    actionmailbox (7.1.3.4)
-      actionpack (= 7.1.3.4)
-      activejob (= 7.1.3.4)
-      activerecord (= 7.1.3.4)
-      activestorage (= 7.1.3.4)
-      activesupport (= 7.1.3.4)
+    actionmailbox (7.1.4)
+      actionpack (= 7.1.4)
+      activejob (= 7.1.4)
+      activerecord (= 7.1.4)
+      activestorage (= 7.1.4)
+      activesupport (= 7.1.4)
       mail (>= 2.7.1)
       net-imap
       net-pop
       net-smtp
-    actionmailer (7.1.3.4)
-      actionpack (= 7.1.3.4)
-      actionview (= 7.1.3.4)
-      activejob (= 7.1.3.4)
-      activesupport (= 7.1.3.4)
+    actionmailer (7.1.4)
+      actionpack (= 7.1.4)
+      actionview (= 7.1.4)
+      activejob (= 7.1.4)
+      activesupport (= 7.1.4)
       mail (~> 2.5, >= 2.5.4)
       net-imap
       net-pop
       net-smtp
       rails-dom-testing (~> 2.2)
-    actionpack (7.1.3.4)
-      actionview (= 7.1.3.4)
-      activesupport (= 7.1.3.4)
+    actionpack (7.1.4)
+      actionview (= 7.1.4)
+      activesupport (= 7.1.4)
       nokogiri (>= 1.8.5)
       racc
       rack (>= 2.2.4)
@@ -46,15 +46,15 @@ GEM
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    actiontext (7.1.3.4)
-      actionpack (= 7.1.3.4)
-      activerecord (= 7.1.3.4)
-      activestorage (= 7.1.3.4)
-      activesupport (= 7.1.3.4)
+    actiontext (7.1.4)
+      actionpack (= 7.1.4)
+      activerecord (= 7.1.4)
+      activestorage (= 7.1.4)
+      activesupport (= 7.1.4)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.1.3.4)
-      activesupport (= 7.1.3.4)
+    actionview (7.1.4)
+      activesupport (= 7.1.4)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
@@ -64,22 +64,22 @@ GEM
       activemodel (>= 4.1)
       case_transform (>= 0.2)
       jsonapi-renderer (>= 0.1.1.beta1, < 0.3)
-    activejob (7.1.3.4)
-      activesupport (= 7.1.3.4)
+    activejob (7.1.4)
+      activesupport (= 7.1.4)
       globalid (>= 0.3.6)
-    activemodel (7.1.3.4)
-      activesupport (= 7.1.3.4)
-    activerecord (7.1.3.4)
-      activemodel (= 7.1.3.4)
-      activesupport (= 7.1.3.4)
+    activemodel (7.1.4)
+      activesupport (= 7.1.4)
+    activerecord (7.1.4)
+      activemodel (= 7.1.4)
+      activesupport (= 7.1.4)
       timeout (>= 0.4.0)
-    activestorage (7.1.3.4)
-      actionpack (= 7.1.3.4)
-      activejob (= 7.1.3.4)
-      activerecord (= 7.1.3.4)
-      activesupport (= 7.1.3.4)
+    activestorage (7.1.4)
+      actionpack (= 7.1.4)
+      activejob (= 7.1.4)
+      activerecord (= 7.1.4)
+      activesupport (= 7.1.4)
       marcel (~> 1.0)
-    activesupport (7.1.3.4)
+    activesupport (7.1.4)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -638,20 +638,20 @@ GEM
     rackup (1.0.0)
       rack (< 3)
       webrick
-    rails (7.1.3.4)
-      actioncable (= 7.1.3.4)
-      actionmailbox (= 7.1.3.4)
-      actionmailer (= 7.1.3.4)
-      actionpack (= 7.1.3.4)
-      actiontext (= 7.1.3.4)
-      actionview (= 7.1.3.4)
-      activejob (= 7.1.3.4)
-      activemodel (= 7.1.3.4)
-      activerecord (= 7.1.3.4)
-      activestorage (= 7.1.3.4)
-      activesupport (= 7.1.3.4)
+    rails (7.1.4)
+      actioncable (= 7.1.4)
+      actionmailbox (= 7.1.4)
+      actionmailer (= 7.1.4)
+      actionpack (= 7.1.4)
+      actiontext (= 7.1.4)
+      actionview (= 7.1.4)
+      activejob (= 7.1.4)
+      activemodel (= 7.1.4)
+      activerecord (= 7.1.4)
+      activestorage (= 7.1.4)
+      activesupport (= 7.1.4)
       bundler (>= 1.15.0)
-      railties (= 7.1.3.4)
+      railties (= 7.1.4)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
       actionview (>= 5.0.1.rc1)
@@ -666,9 +666,9 @@ GEM
     rails-i18n (7.0.9)
       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 8)
-    railties (7.1.3.4)
-      actionpack (= 7.1.3.4)
-      activesupport (= 7.1.3.4)
+    railties (7.1.4)
+      actionpack (= 7.1.4)
+      activesupport (= 7.1.4)
       irb
       rackup (>= 1.0.0)
       rake (>= 12.2)
diff --git a/config/initializers/active_record_encryption.rb b/config/initializers/active_record_encryption.rb
index a83ca807657711..b7a874e4046f2d 100644
--- a/config/initializers/active_record_encryption.rb
+++ b/config/initializers/active_record_encryption.rb
@@ -38,8 +38,4 @@
   config.active_record.encryption.key_derivation_salt = ENV.fetch('ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT')
   config.active_record.encryption.primary_key = ENV.fetch('ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY')
   config.active_record.encryption.support_sha1_for_non_deterministic_encryption = true
-
-  # TODO: https://github.com/rails/rails/issues/50604#issuecomment-1880990392
-  # Remove after updating to Rails 7.1.4
-  ActiveRecord::Encryption.configure(**config.active_record.encryption)
 end

From 4f81ad249477ad25aea191b1987cddb4222e65ba Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 6 Sep 2024 12:46:25 -0400
Subject: [PATCH 2132/2191] Add coverage for `media#player`, move body class to
 view (#31790)

---
 app/controllers/media_controller.rb |  4 +---
 app/views/media/player.html.haml    |  2 ++
 spec/system/media_spec.rb           | 23 +++++++++++++++++++++++
 3 files changed, 26 insertions(+), 3 deletions(-)
 create mode 100644 spec/system/media_spec.rb

diff --git a/app/controllers/media_controller.rb b/app/controllers/media_controller.rb
index 53eee40012a612..9d10468e69330e 100644
--- a/app/controllers/media_controller.rb
+++ b/app/controllers/media_controller.rb
@@ -19,9 +19,7 @@ def show
     redirect_to @media_attachment.file.url(:original)
   end
 
-  def player
-    @body_classes = 'player'
-  end
+  def player; end
 
   private
 
diff --git a/app/views/media/player.html.haml b/app/views/media/player.html.haml
index df02cc4110c71e..6b6e5667326f17 100644
--- a/app/views/media/player.html.haml
+++ b/app/views/media/player.html.haml
@@ -2,6 +2,8 @@
   = render_initial_state
   = javascript_pack_tag 'public', crossorigin: 'anonymous'
 
+- content_for :body_classes, 'player'
+
 :ruby
   meta = @media_attachment.file.meta || {}
 
diff --git a/spec/system/media_spec.rb b/spec/system/media_spec.rb
new file mode 100644
index 00000000000000..d014c7e88ef96d
--- /dev/null
+++ b/spec/system/media_spec.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Media' do
+  describe 'Player page' do
+    context 'when signed in' do
+      before { sign_in Fabricate(:user) }
+
+      it 'visits the media player page and renders the media' do
+        status = Fabricate :status
+        media = Fabricate :media_attachment, type: :video
+        status.media_attachments << media
+
+        visit medium_player_path(media)
+
+        expect(page)
+          .to have_css('body', class: 'player')
+          .and have_css('div[data-component="Video"]')
+      end
+    end
+  end
+end

From 0a433d08fb51e0bfdd9e5f512af529f6abafa7a6 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 6 Sep 2024 12:46:55 -0400
Subject: [PATCH 2133/2191] Move shares/modal body class to layout (#31789)

---
 app/controllers/shares_controller.rb | 7 -------
 app/views/layouts/modal.html.haml    | 2 ++
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/app/controllers/shares_controller.rb b/app/controllers/shares_controller.rb
index 6546b8497808c4..1aa0ce5a0d4ff4 100644
--- a/app/controllers/shares_controller.rb
+++ b/app/controllers/shares_controller.rb
@@ -4,13 +4,6 @@ class SharesController < ApplicationController
   layout 'modal'
 
   before_action :authenticate_user!
-  before_action :set_body_classes
 
   def show; end
-
-  private
-
-  def set_body_classes
-    @body_classes = 'modal-layout compose-standalone'
-  end
 end
diff --git a/app/views/layouts/modal.html.haml b/app/views/layouts/modal.html.haml
index bbc9185f5b3506..91bcb7c422d25b 100644
--- a/app/views/layouts/modal.html.haml
+++ b/app/views/layouts/modal.html.haml
@@ -1,6 +1,8 @@
 - content_for :header_tags do
   = javascript_pack_tag 'public', crossorigin: 'anonymous'
 
+- content_for :body_classes, 'modal-layout compose-standalone'
+
 - content_for :content do
   - if user_signed_in? && !@hide_header
     .account-header

From 7335a43b6dac0e82c305ce4dec9db4da114c769e Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 6 Sep 2024 12:52:35 -0400
Subject: [PATCH 2134/2191] Use async count in admin dashboard (#30606)

---
 app/controllers/admin/dashboard_controller.rb | 8 ++++----
 app/views/admin/dashboard/index.html.haml     | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/controllers/admin/dashboard_controller.rb b/app/controllers/admin/dashboard_controller.rb
index 3a6df662ea2eee..5b0867dcfbac2f 100644
--- a/app/controllers/admin/dashboard_controller.rb
+++ b/app/controllers/admin/dashboard_controller.rb
@@ -7,12 +7,12 @@ class DashboardController < BaseController
     def index
       authorize :dashboard, :index?
 
+      @pending_appeals_count = Appeal.pending.async_count
+      @pending_reports_count = Report.unresolved.async_count
+      @pending_tags_count    = Tag.pending_review.async_count
+      @pending_users_count   = User.pending.async_count
       @system_checks         = Admin::SystemCheck.perform(current_user)
       @time_period           = (29.days.ago.to_date...Time.now.utc.to_date)
-      @pending_users_count   = User.pending.count
-      @pending_reports_count = Report.unresolved.count
-      @pending_tags_count    = Tag.pending_review.count
-      @pending_appeals_count = Appeal.pending.count
     end
   end
 end
diff --git a/app/views/admin/dashboard/index.html.haml b/app/views/admin/dashboard/index.html.haml
index 8430dd3c4f1327..27d8f4790ba8be 100644
--- a/app/views/admin/dashboard/index.html.haml
+++ b/app/views/admin/dashboard/index.html.haml
@@ -56,19 +56,19 @@
 
   .dashboard__item
     = link_to admin_reports_path, class: 'dashboard__quick-access' do
-      %span= t('admin.dashboard.pending_reports_html', count: @pending_reports_count)
+      %span= t('admin.dashboard.pending_reports_html', count: @pending_reports_count.value)
       = material_symbol 'chevron_right'
 
     = link_to admin_accounts_path(status: 'pending'), class: 'dashboard__quick-access' do
-      %span= t('admin.dashboard.pending_users_html', count: @pending_users_count)
+      %span= t('admin.dashboard.pending_users_html', count: @pending_users_count.value)
       = material_symbol 'chevron_right'
 
     = link_to admin_trends_tags_path(status: 'pending_review'), class: 'dashboard__quick-access' do
-      %span= t('admin.dashboard.pending_tags_html', count: @pending_tags_count)
+      %span= t('admin.dashboard.pending_tags_html', count: @pending_tags_count.value)
       = material_symbol 'chevron_right'
 
     = link_to admin_disputes_appeals_path(status: 'pending'), class: 'dashboard__quick-access' do
-      %span= t('admin.dashboard.pending_appeals_html', count: @pending_appeals_count)
+      %span= t('admin.dashboard.pending_appeals_html', count: @pending_appeals_count.value)
       = material_symbol 'chevron_right'
   .dashboard__item
     = react_admin_component :dimension,

From b716248fc5bde4dc47b8104d092d092d87c50f1a Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 6 Sep 2024 19:21:49 +0200
Subject: [PATCH 2135/2191] Add link to `/admin/roles` in moderation interface
 when changing someone's role (#31791)

---
 app/views/admin/users/roles/show.html.haml | 3 ++-
 config/locales/en.yml                      | 1 +
 config/locales/simple_form.en.yml          | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/views/admin/users/roles/show.html.haml b/app/views/admin/users/roles/show.html.haml
index f26640f2a1af8f..01b3830f4eba5b 100644
--- a/app/views/admin/users/roles/show.html.haml
+++ b/app/views/admin/users/roles/show.html.haml
@@ -7,7 +7,8 @@
                     collection: UserRole.assignable,
                     include_blank: I18n.t('admin.accounts.change_role.no_role'),
                     label_method: :name,
-                    wrapper: :with_block_label
+                    wrapper: :with_block_label,
+                    hint: safe_join([I18n.t('simple_form.hints.user.role'), ' ', link_to(I18n.t('admin.accounts.change_role.edit_roles'), admin_roles_path)])
 
   .actions
     = f.button :button,
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 217b1537f4a6c5..e8c9010486447b 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -48,6 +48,7 @@ en:
         title: Change email for %{username}
       change_role:
         changed_msg: Role successfully changed!
+        edit_roles: Manage user roles
         label: Change role
         no_role: No role
         title: Change role for %{username}
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml
index fee3a6151ad419..c1fae7e83e2305 100644
--- a/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@@ -130,7 +130,7 @@ en:
         name: You can only change the casing of the letters, for example, to make it more readable
       user:
         chosen_languages: When checked, only posts in selected languages will be displayed in public timelines
-        role: The role controls which permissions the user has
+        role: The role controls which permissions the user has.
       user_role:
         color: Color to be used for the role throughout the UI, as RGB in hex format
         highlighted: This makes the role publicly visible

From af6ca96a4e1aa4fa718bc4929dab6618adf74c98 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 6 Sep 2024 20:00:19 +0200
Subject: [PATCH 2136/2191] Fix tests in glitch-soc

---
 spec/helpers/application_helper_spec.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
index 50181fdb911853..90dc0d36de3412 100644
--- a/spec/helpers/application_helper_spec.rb
+++ b/spec/helpers/application_helper_spec.rb
@@ -10,7 +10,8 @@
       it 'uses the controller body classes in the result' do
         expect(helper.body_classes)
           .to match(/modal-layout compose-standalone/)
-          .and match(/theme-default/)
+          .and match(/flavour-glitch/)
+          .and match(/skin-default/)
       end
 
       it 'includes values set via content_for' do

From 10143d053a99d69f5770f6a5478ab0f88a95ae5b Mon Sep 17 00:00:00 2001
From: Mike Dalessio <mike.dalessio@gmail.com>
Date: Sun, 8 Sep 2024 14:41:37 -0400
Subject: [PATCH 2137/2191] Change some instances of Nokogiri HTML4 parsing to
 HTML5 (#31812)

---
 app/helpers/admin/trends/statuses_helper.rb | 2 +-
 app/lib/emoji_formatter.rb                  | 8 ++++----
 app/lib/plain_text_formatter.rb             | 2 +-
 app/services/fetch_oembed_service.rb        | 2 +-
 app/services/fetch_resource_service.rb      | 2 +-
 app/services/translate_status_service.rb    | 2 +-
 lib/sanitize_ext/sanitize_config.rb         | 2 +-
 lib/tasks/emojis.rake                       | 2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/helpers/admin/trends/statuses_helper.rb b/app/helpers/admin/trends/statuses_helper.rb
index 79fee44dc4b003..c7a59660cf797b 100644
--- a/app/helpers/admin/trends/statuses_helper.rb
+++ b/app/helpers/admin/trends/statuses_helper.rb
@@ -5,7 +5,7 @@ def one_line_preview(status)
     text = if status.local?
              status.text.split("\n").first
            else
-             Nokogiri::HTML(status.text).css('html > body > *').first&.text
+             Nokogiri::HTML5(status.text).css('html > body > *').first&.text
            end
 
     return '' if text.blank?
diff --git a/app/lib/emoji_formatter.rb b/app/lib/emoji_formatter.rb
index 2a3683c499f621..5f1a4651f73b0b 100644
--- a/app/lib/emoji_formatter.rb
+++ b/app/lib/emoji_formatter.rb
@@ -24,7 +24,7 @@ def initialize(html, custom_emojis, options = {})
   def to_s
     return html if custom_emojis.empty? || html.blank?
 
-    tree = Nokogiri::HTML.fragment(html)
+    tree = Nokogiri::HTML5.fragment(html)
     tree.xpath('./text()|.//text()[not(ancestor[@class="invisible"])]').to_a.each do |node|
       i                     = -1
       inside_shortname      = false
@@ -43,8 +43,8 @@ def to_s
 
           next unless (char_after.nil? || !DISALLOWED_BOUNDING_REGEX.match?(char_after)) && (emoji = emoji_map[shortcode])
 
-          result << Nokogiri::XML::Text.new(text[last_index..shortname_start_index - 1], tree.document) if shortname_start_index.positive?
-          result << Nokogiri::HTML.fragment(tag_for_emoji(shortcode, emoji))
+          result << tree.document.create_text_node(text[last_index..shortname_start_index - 1]) if shortname_start_index.positive?
+          result << tree.document.fragment(tag_for_emoji(shortcode, emoji))
 
           last_index = i + 1
         elsif text[i] == ':' && (i.zero? || !DISALLOWED_BOUNDING_REGEX.match?(text[i - 1]))
@@ -53,7 +53,7 @@ def to_s
         end
       end
 
-      result << Nokogiri::XML::Text.new(text[last_index..], tree.document)
+      result << tree.document.create_text_node(text[last_index..])
       node.replace(result)
     end
 
diff --git a/app/lib/plain_text_formatter.rb b/app/lib/plain_text_formatter.rb
index d1ff6808b2a995..f960ba7acc4ba2 100644
--- a/app/lib/plain_text_formatter.rb
+++ b/app/lib/plain_text_formatter.rb
@@ -16,7 +16,7 @@ def to_s
     if local?
       text
     else
-      node = Nokogiri::HTML.fragment(insert_newlines)
+      node = Nokogiri::HTML5.fragment(insert_newlines)
       # Elements that are entirely removed with our Sanitize config
       node.xpath('.//iframe|.//math|.//noembed|.//noframes|.//noscript|.//plaintext|.//script|.//style|.//svg|.//xmp').remove
       node.text.chomp
diff --git a/app/services/fetch_oembed_service.rb b/app/services/fetch_oembed_service.rb
index dc84b16b684a7d..c7d4f7e2927aef 100644
--- a/app/services/fetch_oembed_service.rb
+++ b/app/services/fetch_oembed_service.rb
@@ -25,7 +25,7 @@ def discover_endpoint!
     return if html.nil?
 
     @format = @options[:format]
-    page    = Nokogiri::HTML(html)
+    page    = Nokogiri::HTML5(html)
 
     if @format.nil? || @format == :json
       @endpoint_url ||= page.at_xpath('//link[@type="application/json+oembed"]|//link[@type="text/json+oembed"]')&.attribute('href')&.value
diff --git a/app/services/fetch_resource_service.rb b/app/services/fetch_resource_service.rb
index 84c36f6a1014b8..b69015a5e9aa6e 100644
--- a/app/services/fetch_resource_service.rb
+++ b/app/services/fetch_resource_service.rb
@@ -73,7 +73,7 @@ def expected_type?(json)
   end
 
   def process_html(response)
-    page      = Nokogiri::HTML(response.body_with_limit)
+    page      = Nokogiri::HTML5(response.body_with_limit)
     json_link = page.xpath('//link[@rel="alternate"]').find { |link| ACTIVITY_STREAM_LINK_TYPES.include?(link['type']) }
 
     process(json_link['href'], terminal: true) unless json_link.nil?
diff --git a/app/services/translate_status_service.rb b/app/services/translate_status_service.rb
index 9ad146ae7d3da8..e2e076e21b9bbe 100644
--- a/app/services/translate_status_service.rb
+++ b/app/services/translate_status_service.rb
@@ -100,7 +100,7 @@ def wrap_emoji_shortcodes(text)
   end
 
   def unwrap_emoji_shortcodes(html)
-    fragment = Nokogiri::HTML.fragment(html)
+    fragment = Nokogiri::HTML5.fragment(html)
     fragment.css('span[translate="no"]').each do |element|
       element.remove_attribute('translate')
       element.replace(element.children) if element.attributes.empty?
diff --git a/lib/sanitize_ext/sanitize_config.rb b/lib/sanitize_ext/sanitize_config.rb
index ad310b393a0d39..f0a7b657834a46 100644
--- a/lib/sanitize_ext/sanitize_config.rb
+++ b/lib/sanitize_ext/sanitize_config.rb
@@ -52,7 +52,7 @@ module Config
                  :relative
                end
 
-      current_node.replace(Nokogiri::XML::Text.new(current_node.text, current_node.document)) unless LINK_PROTOCOLS.include?(scheme)
+      current_node.replace(current_node.document.create_text_node(current_node.text)) unless LINK_PROTOCOLS.include?(scheme)
     end
 
     UNSUPPORTED_ELEMENTS_TRANSFORMER = lambda do |env|
diff --git a/lib/tasks/emojis.rake b/lib/tasks/emojis.rake
index e9fea2deea710d..fb18f21cf53ce0 100644
--- a/lib/tasks/emojis.rake
+++ b/lib/tasks/emojis.rake
@@ -13,7 +13,7 @@ def gen_border(codepoint, color)
     view_box[3] += 4
     svg['viewBox'] = view_box.join(' ')
   end
-  g = Nokogiri::XML::Node.new 'g', doc
+  g = doc.create_element('g')
   doc.css('svg > *').each do |elem|
     border_elem = elem.dup
 

From afa2e257e481deb913ea04104966a613fc50a7f2 Mon Sep 17 00:00:00 2001
From: Mike Dalessio <mike.dalessio@gmail.com>
Date: Sun, 8 Sep 2024 14:50:22 -0400
Subject: [PATCH 2138/2191] Change verify link service to use CSS selectors
 instead of a complex XPath query (#31815)

---
 app/services/verify_link_service.rb       |  2 +-
 spec/services/verify_link_service_spec.rb | 30 +++++++++++++++++------
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/app/services/verify_link_service.rb b/app/services/verify_link_service.rb
index b317fc31a859da..c4f4191e1f3bab 100644
--- a/app/services/verify_link_service.rb
+++ b/app/services/verify_link_service.rb
@@ -26,7 +26,7 @@ def perform_request!
   def link_back_present?
     return false if @body.blank?
 
-    links = Nokogiri::HTML5(@body).xpath('//a[contains(concat(" ", normalize-space(@rel), " "), " me ")]|//link[contains(concat(" ", normalize-space(@rel), " "), " me ")]')
+    links = Nokogiri::HTML5(@body).css("a[rel~='me'],link[rel~='me']")
 
     if links.any? { |link| link['href']&.downcase == @link_back.downcase }
       true
diff --git a/spec/services/verify_link_service_spec.rb b/spec/services/verify_link_service_spec.rb
index 0ce8c9a9041727..a4fd19751b6934 100644
--- a/spec/services/verify_link_service_spec.rb
+++ b/spec/services/verify_link_service_spec.rb
@@ -11,13 +11,14 @@
 
     before do
       stub_request(:head, 'https://redirect.me/abc').to_return(status: 301, headers: { 'Location' => ActivityPub::TagManager.instance.url_for(account) })
+      stub_request(:head, 'http://unrelated-site.com').to_return(status: 301)
       stub_request(:get, 'http://example.com').to_return(status: 200, body: html)
       subject.call(field)
     end
 
     context 'when a link contains an <a> back' do
       let(:html) do
-        <<-HTML
+        <<~HTML
           <!doctype html>
           <body>
             <a href="#{ActivityPub::TagManager.instance.url_for(account)}" rel="me">Follow me on Mastodon</a>
@@ -30,9 +31,9 @@
       end
     end
 
-    context 'when a link contains an <a rel="noopener noreferrer"> back' do
+    context 'when a link contains an <a rel="me noopener noreferrer"> back' do
       let(:html) do
-        <<-HTML
+        <<~HTML
           <!doctype html>
           <body>
             <a href="#{ActivityPub::TagManager.instance.url_for(account)}" rel="me noopener noreferrer" target="_blank">Follow me on Mastodon</a>
@@ -47,7 +48,7 @@
 
     context 'when a link contains a <link> back' do
       let(:html) do
-        <<-HTML
+        <<~HTML
           <!doctype html>
           <head>
             <link type="text/html" href="#{ActivityPub::TagManager.instance.url_for(account)}" rel="me" />
@@ -62,7 +63,7 @@
 
     context 'when a link goes through a redirect back' do
       let(:html) do
-        <<-HTML
+        <<~HTML
           <!doctype html>
           <head>
             <link type="text/html" href="https://redirect.me/abc" rel="me" />
@@ -113,7 +114,7 @@
 
     context 'when link has no `href` attribute' do
       let(:html) do
-        <<-HTML
+        <<~HTML
           <!doctype html>
           <head>
             <link type="text/html" rel="me" />
@@ -128,6 +129,21 @@
         expect(field.verified?).to be false
       end
     end
+
+    context 'when a link contains a link to an unexpected URL' do
+      let(:html) do
+        <<~HTML
+          <!doctype html>
+          <body>
+            <a href="http://unrelated-site.com" rel="me">Follow me on Unrelated Site</a>
+          </body>
+        HTML
+      end
+
+      it 'does not mark the field as verified' do
+        expect(field.verified?).to be false
+      end
+    end
   end
 
   context 'when given a remote account' do
@@ -141,7 +157,7 @@
 
     context 'when a link contains an <a> back' do
       let(:html) do
-        <<-HTML
+        <<~HTML
           <!doctype html>
           <body>
             <a href="https://profile.example.com/alice" rel="me">Follow me on Mastodon</a>

From 82161d8ae54b94be701cba600536d87957361cea Mon Sep 17 00:00:00 2001
From: Mike Dalessio <mike.dalessio@gmail.com>
Date: Sun, 8 Sep 2024 14:56:18 -0400
Subject: [PATCH 2139/2191] Change Account::Field parsing to use
 HTML5::DocumentFragment (#31813)

---
 app/models/account/field.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/account/field.rb b/app/models/account/field.rb
index 2bada6954b40ff..bcd89015de022f 100644
--- a/app/models/account/field.rb
+++ b/app/models/account/field.rb
@@ -73,10 +73,10 @@ def character_limit
   end
 
   def extract_url_from_html
-    doc = Nokogiri::HTML(value).at_xpath('//body')
+    doc = Nokogiri::HTML5.fragment(value)
 
     return if doc.nil?
-    return if doc.children.size > 1
+    return if doc.children.size != 1
 
     element = doc.children.first
 

From c6a0768fe564d342e6ac6b70aff9d7c23b8a9ffc Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 9 Sep 2024 04:01:26 -0400
Subject: [PATCH 2140/2191] Use shared system spec helper methods (#31784)

---
 spec/support/system_helpers.rb          |  4 ++++
 spec/system/admin/announcements_spec.rb | 10 +---------
 spec/system/admin/domain_blocks_spec.rb |  2 +-
 spec/system/filters_spec.rb             |  2 +-
 spec/system/invites_spec.rb             |  4 ----
 5 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/spec/support/system_helpers.rb b/spec/support/system_helpers.rb
index 05c9d3b125a565..4cc1928701af71 100644
--- a/spec/support/system_helpers.rb
+++ b/spec/support/system_helpers.rb
@@ -16,4 +16,8 @@ def success_message
   def form_label(key)
     I18n.t key, scope: 'simple_form.labels'
   end
+
+  def css_id(record)
+    "##{dom_id(record)}"
+  end
 end
diff --git a/spec/system/admin/announcements_spec.rb b/spec/system/admin/announcements_spec.rb
index 1da5699656a20f..87b7332639c77a 100644
--- a/spec/system/admin/announcements_spec.rb
+++ b/spec/system/admin/announcements_spec.rb
@@ -45,7 +45,7 @@
 
       fill_in text_label,
               with: 'Announcement text'
-      save_changes
+      click_on submit_button
 
       expect(page)
         .to have_content(I18n.t('admin.announcements.updated_msg'))
@@ -94,10 +94,6 @@
 
   private
 
-  def css_id(record)
-    "##{dom_id(record)}" # TODO: Extract to system spec helper?
-  end
-
   def publish_announcement(announcement)
     within css_id(announcement) do
       click_on I18n.t('admin.announcements.publish')
@@ -116,10 +112,6 @@ def delete_announcement(announcement)
     end
   end
 
-  def save_changes
-    click_on I18n.t('generic.save_changes')
-  end
-
   def submit_form
     click_on I18n.t('admin.announcements.new.create')
   end
diff --git a/spec/system/admin/domain_blocks_spec.rb b/spec/system/admin/domain_blocks_spec.rb
index 9a39e290623cd3..f00d65dfe05a6d 100644
--- a/spec/system/admin/domain_blocks_spec.rb
+++ b/spec/system/admin/domain_blocks_spec.rb
@@ -91,7 +91,7 @@
       visit edit_admin_domain_block_path(domain_block)
 
       select I18n.t('admin.domain_blocks.new.severity.suspend'), from: 'domain_block_severity'
-      click_on I18n.t('generic.save_changes')
+      click_on submit_button
 
       # It doesn't immediately block but presents a confirmation screen
       expect(page).to have_title(I18n.t('admin.domain_blocks.confirm_suspension.title', domain: 'example.com'))
diff --git a/spec/system/filters_spec.rb b/spec/system/filters_spec.rb
index 052b5e17306543..64de384c007a84 100644
--- a/spec/system/filters_spec.rb
+++ b/spec/system/filters_spec.rb
@@ -29,7 +29,7 @@
       click_on filter_title
 
       fill_in filter_title_field, with: new_title
-      click_on I18n.t('generic.save_changes')
+      click_on submit_button
 
       expect(page).to have_content(new_title)
     end
diff --git a/spec/system/invites_spec.rb b/spec/system/invites_spec.rb
index 648bbea82562a1..c57de871cc6e1a 100644
--- a/spec/system/invites_spec.rb
+++ b/spec/system/invites_spec.rb
@@ -56,10 +56,6 @@
 
   private
 
-  def css_id(record)
-    "##{dom_id(record)}" # TODO: Extract to system spec helper?
-  end
-
   def copyable_field
     within '.input-copy' do
       find(:field, type: :text, readonly: true)

From 1f13b875671e203002207d9d794e26a17f41890e Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 9 Sep 2024 10:31:13 +0200
Subject: [PATCH 2141/2191] Update dependency pg to v1.5.8 (#31795)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index a988ad3f21885d..48fd05b1ac40bb 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -590,7 +590,7 @@ GEM
     parslet (2.0.0)
     pastel (0.8.0)
       tty-color (~> 0.5)
-    pg (1.5.7)
+    pg (1.5.8)
     pghero (3.6.0)
       activerecord (>= 6.1)
     premailer (1.27.0)

From e6969cf4e434abb7a03a1f1300e97f031b23a042 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 9 Sep 2024 04:33:51 -0400
Subject: [PATCH 2142/2191] Add method for media-referencing status in
 `AccountStatusCleanupPolicy` (#31798)

---
 app/models/account_statuses_cleanup_policy.rb | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/models/account_statuses_cleanup_policy.rb b/app/models/account_statuses_cleanup_policy.rb
index e2c035284be24f..6e998e2dcaf6b0 100644
--- a/app/models/account_statuses_cleanup_policy.rb
+++ b/app/models/account_statuses_cleanup_policy.rb
@@ -157,7 +157,7 @@ def without_pinned_scope
   end
 
   def without_media_scope
-    Status.where('NOT EXISTS (SELECT 1 FROM media_attachments media WHERE media.status_id = statuses.id)')
+    Status.where.not(status_media_reference_exists)
   end
 
   def without_poll_scope
@@ -175,6 +175,14 @@ def account_statuses
     Status.where(account_id: account_id)
   end
 
+  def status_media_reference_exists
+    MediaAttachment
+      .where(MediaAttachment.arel_table[:status_id].eq Status.arel_table[:id])
+      .select(1)
+      .arel
+      .exists
+  end
+
   def self_status_reference_exists(model)
     model
       .where(model.arel_table[:account_id].eq Status.arel_table[:account_id])

From 9d9901cc5bf9472ff52df87ed2d1cd096182d571 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 9 Sep 2024 10:43:12 +0200
Subject: [PATCH 2143/2191] Update peter-evans/create-pull-request action to v7
 (#31818)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .github/workflows/crowdin-download.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/crowdin-download.yml b/.github/workflows/crowdin-download.yml
index 0faa7e4939fa7f..f1817b3e9a1c36 100644
--- a/.github/workflows/crowdin-download.yml
+++ b/.github/workflows/crowdin-download.yml
@@ -52,7 +52,7 @@ jobs:
 
       # Create or update the pull request
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v6.0.5
+        uses: peter-evans/create-pull-request@v7.0.1
         with:
           commit-message: 'New Crowdin translations'
           title: 'New Crowdin Translations (automated)'

From a0ea2fa3b01c61d4d390b5e4b6cddc8006b204ec Mon Sep 17 00:00:00 2001
From: Mike Dalessio <mike.dalessio@gmail.com>
Date: Mon, 9 Sep 2024 06:59:42 -0400
Subject: [PATCH 2144/2191] Change fetch link card service to parse as HTML5
 (#31814)

---
 app/lib/link_details_extractor.rb             | 36 +++++++++----------
 app/services/fetch_link_card_service.rb       |  4 +--
 spec/services/fetch_link_card_service_spec.rb |  4 +--
 3 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/app/lib/link_details_extractor.rb b/app/lib/link_details_extractor.rb
index bd78aef7a9f56c..dff57f74f33efd 100644
--- a/app/lib/link_details_extractor.rb
+++ b/app/lib/link_details_extractor.rb
@@ -157,11 +157,11 @@ def height
   end
 
   def title
-    html_entities_decode(structured_data&.headline || opengraph_tag('og:title') || document.xpath('//title').map(&:content).first)&.strip
+    html_entities.decode(structured_data&.headline || opengraph_tag('og:title') || document.xpath('//title').map(&:content).first)&.strip
   end
 
   def description
-    html_entities_decode(structured_data&.description || opengraph_tag('og:description') || meta_tag('description'))
+    html_entities.decode(structured_data&.description || opengraph_tag('og:description') || meta_tag('description'))
   end
 
   def published_at
@@ -181,7 +181,7 @@ def canonical_url
   end
 
   def provider_name
-    html_entities_decode(structured_data&.publisher_name || opengraph_tag('og:site_name'))
+    html_entities.decode(structured_data&.publisher_name || opengraph_tag('og:site_name'))
   end
 
   def provider_url
@@ -189,7 +189,7 @@ def provider_url
   end
 
   def author_name
-    html_entities_decode(structured_data&.author_name || opengraph_tag('og:author') || opengraph_tag('og:author:username'))
+    html_entities.decode(structured_data&.author_name || opengraph_tag('og:author') || opengraph_tag('og:author:username'))
   end
 
   def author_url
@@ -258,7 +258,7 @@ def structured_data
 
       next if json_ld.blank?
 
-      structured_data = StructuredData.new(html_entities_decode(json_ld))
+      structured_data = StructuredData.new(html_entities.decode(json_ld))
 
       next unless structured_data.valid?
 
@@ -274,11 +274,20 @@ def document
   end
 
   def detect_encoding_and_parse_document
-    [detect_encoding, nil, header_encoding].uniq.each do |encoding|
-      document = Nokogiri::HTML(@html, nil, encoding)
-      return document if document.to_s.valid_encoding?
+    html = nil
+    encoding = nil
+
+    [detect_encoding, header_encoding].compact.each do |enc|
+      html = @html.dup.force_encoding(enc)
+      if html.valid_encoding?
+        encoding = enc
+        break
+      end
     end
-    Nokogiri::HTML(@html, nil, 'UTF-8')
+
+    html = @html unless encoding
+
+    Nokogiri::HTML5(html, nil, encoding)
   end
 
   def detect_encoding
@@ -299,15 +308,6 @@ def detector
     end
   end
 
-  def html_entities_decode(string)
-    return if string.nil?
-
-    unicode_string = string.to_s.encode('UTF-8')
-    raise EncodingError, 'cannot convert string to valid UTF-8' unless unicode_string.valid_encoding?
-
-    html_entities.decode(unicode_string)
-  end
-
   def html_entities
     @html_entities ||= HTMLEntities.new(:expanded)
   end
diff --git a/app/services/fetch_link_card_service.rb b/app/services/fetch_link_card_service.rb
index 49b8205574786b..36d5c490a66ea9 100644
--- a/app/services/fetch_link_card_service.rb
+++ b/app/services/fetch_link_card_service.rb
@@ -29,7 +29,7 @@ def call(status)
     end
 
     attach_card if @card&.persisted?
-  rescue HTTP::Error, OpenSSL::SSL::SSLError, Addressable::URI::InvalidURIError, Mastodon::HostValidationError, Mastodon::LengthValidationError, EncodingError, ActiveRecord::RecordInvalid => e
+  rescue HTTP::Error, OpenSSL::SSL::SSLError, Addressable::URI::InvalidURIError, Mastodon::HostValidationError, Mastodon::LengthValidationError, Encoding::UndefinedConversionError, ActiveRecord::RecordInvalid => e
     Rails.logger.debug { "Error fetching link #{@original_url}: #{e}" }
     nil
   end
@@ -80,7 +80,7 @@ def parse_urls
     urls = if @status.local?
              @status.text.scan(URL_PATTERN).map { |array| Addressable::URI.parse(array[1]).normalize }
            else
-             document = Nokogiri::HTML(@status.text)
+             document = Nokogiri::HTML5(@status.text)
              links = document.css('a')
 
              links.filter_map { |a| Addressable::URI.parse(a['href']) unless skip_link?(a) }.filter_map(&:normalize)
diff --git a/spec/services/fetch_link_card_service_spec.rb b/spec/services/fetch_link_card_service_spec.rb
index 2f64f405583955..1d61e33c0b7bf4 100644
--- a/spec/services/fetch_link_card_service_spec.rb
+++ b/spec/services/fetch_link_card_service_spec.rb
@@ -192,8 +192,8 @@
         context 'when encoding problems appear in title tag' do
           let(:status) { Fabricate(:status, text: 'Check out http://example.com/latin1_posing_as_utf8_broken') }
 
-          it 'does not create a preview card' do
-            expect(status.preview_card).to be_nil
+          it 'creates a preview card anyway that replaces invalid bytes with U+FFFD (replacement char)' do
+            expect(status.preview_card.title).to eq("Tofu � l'orange")
           end
         end
       end

From 1d03570080252ee70859f07638ab724fc4fadfc2 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 9 Sep 2024 13:16:09 +0200
Subject: [PATCH 2145/2191] Update dependency postcss-preset-env to v10.0.3
 (#31821)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 1b3a7f1e4072e1..332f6d012ffec3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6701,10 +6701,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cssdb@npm:^8.1.0":
-  version: 8.1.0
-  resolution: "cssdb@npm:8.1.0"
-  checksum: 10c0/1fa1f1566c7e9964f5c71e443583eaba16a90933a3ef6803815c4281d084b75da948c415bade33d7085894fe0929c082fcb3135bf4400048cfff40d227ebd5dd
+"cssdb@npm:^8.1.1":
+  version: 8.1.1
+  resolution: "cssdb@npm:8.1.1"
+  checksum: 10c0/d60facfad3bca70e21100fc35b9205cb9d3d0ac642f44f0a687e54bf787f21c43d28ce2d17fcd405f67950fb4709516108fe1f3cb15df570eff1007b5fbbc787
   languageName: node
   linkType: hard
 
@@ -13802,12 +13802,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-opacity-percentage@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "postcss-opacity-percentage@npm:2.0.0"
+"postcss-opacity-percentage@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "postcss-opacity-percentage@npm:3.0.0"
   peerDependencies:
-    postcss: ^8.2
-  checksum: 10c0/f031f3281060c4c0ede8f9a5832f65a3d8c2a1896ff324c41de42016e092635f0e0abee07545b01db93dc430a9741674a1d09c377c6c01cd8c2f4be65f889161
+    postcss: ^8.4
+  checksum: 10c0/15c7d66036fa966d265c8737196646b3f93deb83d4eea0b17ed5033460599afc31d3a989345e4d7c472963b2a2bb75c83d06979d5d30d6a60fcc7f74cb6d8d40
   languageName: node
   linkType: hard
 
@@ -13855,8 +13855,8 @@ __metadata:
   linkType: hard
 
 "postcss-preset-env@npm:^10.0.0":
-  version: 10.0.2
-  resolution: "postcss-preset-env@npm:10.0.2"
+  version: 10.0.3
+  resolution: "postcss-preset-env@npm:10.0.3"
   dependencies:
     "@csstools/postcss-cascade-layers": "npm:^5.0.0"
     "@csstools/postcss-color-function": "npm:^4.0.2"
@@ -13893,7 +13893,7 @@ __metadata:
     css-blank-pseudo: "npm:^7.0.0"
     css-has-pseudo: "npm:^7.0.0"
     css-prefers-color-scheme: "npm:^10.0.0"
-    cssdb: "npm:^8.1.0"
+    cssdb: "npm:^8.1.1"
     postcss-attribute-case-insensitive: "npm:^7.0.0"
     postcss-clamp: "npm:^4.1.0"
     postcss-color-functional-notation: "npm:^7.0.2"
@@ -13912,7 +13912,7 @@ __metadata:
     postcss-lab-function: "npm:^7.0.2"
     postcss-logical: "npm:^8.0.0"
     postcss-nesting: "npm:^13.0.0"
-    postcss-opacity-percentage: "npm:^2.0.0"
+    postcss-opacity-percentage: "npm:^3.0.0"
     postcss-overflow-shorthand: "npm:^6.0.0"
     postcss-page-break: "npm:^3.0.4"
     postcss-place: "npm:^10.0.0"
@@ -13921,7 +13921,7 @@ __metadata:
     postcss-selector-not: "npm:^8.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/51eb19994dfdbb041e87082833bedf8976053c182ae8dafab6b3ee1bf2cfd309ab9c186644ed032518011e44fbcc9f0552083bc431535779a80a919bbe78d10d
+  checksum: 10c0/da42caa2aab4d825fddfde00ebe2416d338c7b9a6f79a68840297888a8384f85991991c3fa10cf2d359fb230c885375f5cebd7bd63972725cd2a596d218f8b6a
   languageName: node
   linkType: hard
 

From 2caa3f365ded73be17b623177967110e66f14061 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 9 Sep 2024 14:38:43 +0200
Subject: [PATCH 2146/2191] New Crowdin Translations (automated) (#31800)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/ar.json    |   6 +-
 app/javascript/mastodon/locales/et.json    |  42 +++++++
 app/javascript/mastodon/locales/fa.json    |  99 ++++++++++++++++
 app/javascript/mastodon/locales/ia.json    |  10 ++
 app/javascript/mastodon/locales/la.json    |  18 +++
 app/javascript/mastodon/locales/ms.json    |   2 +
 app/javascript/mastodon/locales/ru.json    |   1 +
 app/javascript/mastodon/locales/zh-CN.json |  20 ++--
 app/javascript/mastodon/locales/zh-TW.json |   2 +-
 config/locales/activerecord.zh-CN.yml      |   2 +-
 config/locales/ar.yml                      |   2 +-
 config/locales/ca.yml                      |   4 +
 config/locales/cy.yml                      |   5 +
 config/locales/da.yml                      |   4 +
 config/locales/de.yml                      |   6 +-
 config/locales/devise.zh-CN.yml            |  10 +-
 config/locales/doorkeeper.fa.yml           |   3 +
 config/locales/es-AR.yml                   |   4 +
 config/locales/es-MX.yml                   |   1 +
 config/locales/es.yml                      |   1 +
 config/locales/et.yml                      |  47 +++++++-
 config/locales/fi.yml                      |  12 +-
 config/locales/fo.yml                      |   4 +
 config/locales/fr-CA.yml                   |   7 ++
 config/locales/fr.yml                      |   7 ++
 config/locales/ga.yml                      |   4 +
 config/locales/gd.yml                      |   4 +
 config/locales/gl.yml                      |   4 +
 config/locales/hu.yml                      |   4 +
 config/locales/ia.yml                      |   4 +
 config/locales/is.yml                      |   4 +
 config/locales/it.yml                      |   4 +
 config/locales/ja.yml                      |   1 +
 config/locales/ko.yml                      |   4 +
 config/locales/lad.yml                     |   1 +
 config/locales/lt.yml                      |   3 +-
 config/locales/nl.yml                      |   4 +
 config/locales/pl.yml                      |   4 +
 config/locales/simple_form.an.yml          |   1 -
 config/locales/simple_form.ar.yml          |   1 -
 config/locales/simple_form.be.yml          |   1 -
 config/locales/simple_form.bg.yml          |   1 -
 config/locales/simple_form.ca.yml          |   2 +-
 config/locales/simple_form.cs.yml          |   1 -
 config/locales/simple_form.cy.yml          |   2 +-
 config/locales/simple_form.da.yml          |   2 +-
 config/locales/simple_form.de.yml          |   2 +-
 config/locales/simple_form.el.yml          |   1 -
 config/locales/simple_form.en-GB.yml       |   1 -
 config/locales/simple_form.eo.yml          |   1 -
 config/locales/simple_form.es-AR.yml       |   2 +-
 config/locales/simple_form.es-MX.yml       |   1 -
 config/locales/simple_form.es.yml          |   1 -
 config/locales/simple_form.et.yml          |   2 +-
 config/locales/simple_form.eu.yml          |   1 -
 config/locales/simple_form.fa.yml          |   4 +
 config/locales/simple_form.fi.yml          |   2 +-
 config/locales/simple_form.fo.yml          |   2 +-
 config/locales/simple_form.fr-CA.yml       |   2 +-
 config/locales/simple_form.fr.yml          |   2 +-
 config/locales/simple_form.fy.yml          |   1 -
 config/locales/simple_form.ga.yml          |   2 +-
 config/locales/simple_form.gd.yml          |   2 +-
 config/locales/simple_form.gl.yml          |   2 +-
 config/locales/simple_form.he.yml          |   1 -
 config/locales/simple_form.hu.yml          |   2 +-
 config/locales/simple_form.ia.yml          |   1 -
 config/locales/simple_form.id.yml          |   1 -
 config/locales/simple_form.ie.yml          |   1 -
 config/locales/simple_form.io.yml          |   1 -
 config/locales/simple_form.is.yml          |   2 +-
 config/locales/simple_form.it.yml          |   2 +-
 config/locales/simple_form.ja.yml          |   1 -
 config/locales/simple_form.ko.yml          |   2 +-
 config/locales/simple_form.ku.yml          |   1 -
 config/locales/simple_form.lad.yml         |   2 +-
 config/locales/simple_form.lt.yml          |   1 -
 config/locales/simple_form.lv.yml          |   1 -
 config/locales/simple_form.ms.yml          |   1 -
 config/locales/simple_form.my.yml          |   1 -
 config/locales/simple_form.nl.yml          |   2 +-
 config/locales/simple_form.nn.yml          |   1 -
 config/locales/simple_form.no.yml          |   1 -
 config/locales/simple_form.pl.yml          |   1 -
 config/locales/simple_form.pt-BR.yml       |   1 -
 config/locales/simple_form.pt-PT.yml       |   1 -
 config/locales/simple_form.ru.yml          |   1 -
 config/locales/simple_form.sco.yml         |   1 -
 config/locales/simple_form.sl.yml          |   1 -
 config/locales/simple_form.sq.yml          |   2 +-
 config/locales/simple_form.sr-Latn.yml     |   1 -
 config/locales/simple_form.sr.yml          |   1 -
 config/locales/simple_form.sv.yml          |   2 +-
 config/locales/simple_form.tr.yml          |   1 -
 config/locales/simple_form.uk.yml          |   2 +-
 config/locales/simple_form.vi.yml          |   2 +-
 config/locales/simple_form.zh-CN.yml       |  16 +--
 config/locales/simple_form.zh-HK.yml       |   1 -
 config/locales/simple_form.zh-TW.yml       |   4 +-
 config/locales/sq.yml                      |   4 +
 config/locales/sv.yml                      |   1 +
 config/locales/th.yml                      |   5 +
 config/locales/uk.yml                      |   2 +
 config/locales/vi.yml                      |   4 +
 config/locales/zh-CN.yml                   | 124 +++++++++++----------
 config/locales/zh-TW.yml                   |   4 +
 106 files changed, 456 insertions(+), 157 deletions(-)

diff --git a/app/javascript/mastodon/locales/ar.json b/app/javascript/mastodon/locales/ar.json
index d83a42a6c7620e..722f2bc98b9648 100644
--- a/app/javascript/mastodon/locales/ar.json
+++ b/app/javascript/mastodon/locales/ar.json
@@ -229,8 +229,8 @@
   "domain_pill.their_username": "مُعرّفُهم الفريد على الخادم. من الممكن العثور على مستخدمين بنفس اسم المستخدم على خوادم مختلفة.",
   "domain_pill.username": "اسم المستخدم",
   "domain_pill.whats_in_a_handle": "ما المقصود بالمُعرِّف؟",
-  "domain_pill.who_they_are": "بما أن المعرفات تقول من هو الشخص ومكان وجوده، يمكنك التفاعل مع الناس عبر الويب الاجتماعي لل <button>منصات التي تعمل ب ActivityPub</button>.",
-  "domain_pill.who_you_are": "بما أن معرفك يقول من أنت ومكان وجوده، يمكن للناس التفاعل معك عبر الويب الاجتماعي لل <button>منصات التي تعمل ب ActivityPub</button>.",
+  "domain_pill.who_they_are": "بما أن المُعرّفات تحدد هوية الشخص ومكان وجوده، فبإمكانك التفاعل مع الأشخاص عبر الويب الاجتماعي لـ <button>المنصات التي تعمل بواسطة أكتيفيتي بوب</button>.",
+  "domain_pill.who_you_are": "بما أن مُعرّفك يحدد هويتك ومكان وجوده، فبإمكانك الآخرين التفاعل معك عبر الويب الاجتماعي لـ <button>المنصات التي تعمل بواسطة أكتيفيتي بوب</button>.",
   "domain_pill.your_handle": "عنوانك الكامل:",
   "domain_pill.your_server": "موطِنك الرقمي، حيث توجد فيه كافة منشوراتك. ألا يعجبك المكان؟ يمكنك الانتقال بين الخوادم في أي وقت واصطحاب متابعيك أيضاً.",
   "domain_pill.your_username": "معرفك الفريد على هذا الخادم. من الممكن العثور على مستخدمين بنفس إسم المستخدم على خوادم مختلفة.",
@@ -352,6 +352,7 @@
   "hashtags.and_other": "…و {count, plural, zero {} one {# واحد آخر} two {# اثنان آخران} few {# آخرون} many {# آخَرًا}other {# آخرون}}",
   "hints.profiles.see_more_followers": "عرض المزيد من المتابعين على {domain}",
   "hints.profiles.see_more_posts": "عرض المزيد من المنشورات من {domain}",
+  "hints.threads.replies_may_be_missing": "قد تكون الردود الواردة من الخوادم الأخرى غائبة.",
   "hints.threads.see_more": "اطلع على المزيد من الردود على {domain}",
   "home.column_settings.show_reblogs": "اعرض المعاد نشرها",
   "home.column_settings.show_replies": "اعرض الردود",
@@ -517,6 +518,7 @@
   "notification_requests.edit_selection": "تعديل",
   "notification_requests.exit_selection": "تمّ",
   "notification_requests.explainer_for_limited_account": "تم تصفية الإشعارات من هذا الحساب لأن الحساب تم تقييده من قبل مشرف.",
+  "notification_requests.minimize_banner": "تصغير شريط الإشعارات المُصفاة",
   "notification_requests.notifications_from": "إشعارات من {name}",
   "notification_requests.title": "الإشعارات المصفاة",
   "notification_requests.view": "عرض الإشعارات",
diff --git a/app/javascript/mastodon/locales/et.json b/app/javascript/mastodon/locales/et.json
index 4838f7015504ca..d0fc80e60c8b81 100644
--- a/app/javascript/mastodon/locales/et.json
+++ b/app/javascript/mastodon/locales/et.json
@@ -353,6 +353,14 @@
   "hashtag.follow": "Jälgi silti",
   "hashtag.unfollow": "Lõpeta sildi jälgimine",
   "hashtags.and_other": "…ja {count, plural, one {}other {# veel}}",
+  "hints.profiles.followers_may_be_missing": "Selle profiili jälgijaid võib olla puudu.",
+  "hints.profiles.follows_may_be_missing": "Selle profiili poolt jälgitavaid võib olla puudu.",
+  "hints.profiles.posts_may_be_missing": "Mõned selle profiili postitused võivad olla puudu.",
+  "hints.profiles.see_more_followers": "Vaata rohkem jälgijaid kohas {domain}",
+  "hints.profiles.see_more_follows": "Vaata rohkem jälgitavaid kohas {domain}",
+  "hints.profiles.see_more_posts": "Vaata rohkem postitusi kohas {domain}",
+  "hints.threads.replies_may_be_missing": "Vastuseid teistest serveritest võib olla puudu.",
+  "hints.threads.see_more": "Vaata rohkem vastuseid kohas {domain}",
   "home.column_settings.show_reblogs": "Näita jagamisi",
   "home.column_settings.show_replies": "Näita vastuseid",
   "home.hide_announcements": "Peida teadaanded",
@@ -360,6 +368,17 @@
   "home.pending_critical_update.link": "Vaata uuendusi",
   "home.pending_critical_update.title": "Saadaval kriitiline turvauuendus!",
   "home.show_announcements": "Kuva teadaandeid",
+  "ignore_notifications_modal.disclaimer": "Mastodon ei saa teavitada kasutajaid, et ignoreerisid nende teavitusi. Teavituste ignoreerimine ei peata sõnumite endi saatmist.",
+  "ignore_notifications_modal.filter_instead": "Selle asemel filtreeri",
+  "ignore_notifications_modal.filter_to_act_users": "Saad endiselt kasutajaid vastu võtta, tagasi lükata või neist teatada",
+  "ignore_notifications_modal.filter_to_avoid_confusion": "Filtreerimine aitab vältida võimalikke segaminiajamisi",
+  "ignore_notifications_modal.filter_to_review_separately": "Saad filtreeritud teateid eraldi vaadata",
+  "ignore_notifications_modal.ignore": "Ignoreeri teavitusi",
+  "ignore_notifications_modal.limited_accounts_title": "Ignoreeri modereeritud kontode teavitusi?",
+  "ignore_notifications_modal.new_accounts_title": "Ignoreeri uute kontode teavitusi?",
+  "ignore_notifications_modal.not_followers_title": "Ignoreeri inimeste teavitusi, kes sind ei jälgi?",
+  "ignore_notifications_modal.not_following_title": "Ignoreeri inimeste teavitusi, keda sa ei jälgi?",
+  "ignore_notifications_modal.private_mentions_title": "Ignoreeri soovimatute eraviisiliste mainimiste teateid?",
   "interaction_modal.description.favourite": "Mastodoni kontoga saad postituse lemmikuks märkida, et autor teaks, et sa hindad seda, ja jätta see hiljemaks alles.",
   "interaction_modal.description.follow": "Mastodoni kontoga saad jälgida kasutajat {name}, et tema postitusi oma koduvoos näha.",
   "interaction_modal.description.reblog": "Mastodoni kontoga saad seda postitust levitada, jagades seda oma jälgijatele.",
@@ -483,9 +502,13 @@
   "notification.admin.report_statuses": "{name} raporteeris {target} kategooriast {category}",
   "notification.admin.report_statuses_other": "{name} raporteeris kohast {target}",
   "notification.admin.sign_up": "{name} registreerus",
+  "notification.admin.sign_up.name_and_others": "{name} ja {count, plural, one {# veel} other {# teist}} liitus",
   "notification.favourite": "{name} märkis su postituse lemmikuks",
+  "notification.favourite.name_and_others_with_link": "{name} ja <a>{count, plural, one {# veel} other {# teist}}</a> märkis su postituse lemmikuks",
   "notification.follow": "{name} alustas su jälgimist",
+  "notification.follow.name_and_others": "{name} ja {count, plural, one {# veel} other {# teist}} hakkas sind jälgima",
   "notification.follow_request": "{name} soovib sind jälgida",
+  "notification.follow_request.name_and_others": "{name} ja {count, plural, one {# veel} other {# teist}} taotles sinu jälgimist",
   "notification.label.mention": "Mainimine",
   "notification.label.private_mention": "Privaatne mainimine",
   "notification.label.private_reply": "Privaatne vastus",
@@ -503,6 +526,7 @@
   "notification.own_poll": "Su küsitlus on lõppenud",
   "notification.poll": "Hääletus, millel osalesid, on lõppenud",
   "notification.reblog": "{name} jagas edasi postitust",
+  "notification.reblog.name_and_others_with_link": "{name} ja <a>{count, plural, one {# veel} other {# teist}}</a> jagas su postitust",
   "notification.relationships_severance_event": "Kadunud ühendus kasutajaga {name}",
   "notification.relationships_severance_event.account_suspension": "{from} admin on kustutanud {target}, mis tähendab, et sa ei saa enam neilt uuendusi või suhelda nendega.",
   "notification.relationships_severance_event.domain_block": "{from} admin on blokeerinud {target}, sealhulgas {followersCount} sinu jälgijat ja {followingCount, plural, one  {# konto} other {# kontot}}, mida jälgid.",
@@ -511,13 +535,24 @@
   "notification.status": "{name} just postitas",
   "notification.update": "{name} muutis postitust",
   "notification_requests.accept": "Nõus",
+  "notification_requests.accept_multiple": "{count, plural, one {Nõustu # taotlusega…} other {Nõustu # taotlusega…}}",
+  "notification_requests.confirm_accept_multiple.button": "{count, plural, one {Nõustu taotlusega} other {Nõustu taotlustega}}",
+  "notification_requests.confirm_accept_multiple.message": "Oled nõustumas {count, plural, one {ühe teavituse taotlusega} other {# teavituse taotlusega}}. Oled kindel, et soovid jätkata?",
+  "notification_requests.confirm_accept_multiple.title": "Nõustuda teavituste taotlustega?",
+  "notification_requests.confirm_dismiss_multiple.button": "{count, plural, one {Loobu taotlusest} other {Loobu taotlustest}}",
+  "notification_requests.confirm_dismiss_multiple.message": "Oled loobumas {count, plural, one {ühest teavituse taotlusest} other {# teavituse taotlusest}}. {count, plural, one {Sellele} other {Neile}} pole hiljem lihtne ligi pääseda. Oled kindel, et soovid jätkata?",
+  "notification_requests.confirm_dismiss_multiple.title": "Hüljata teavituse taotlused?",
   "notification_requests.dismiss": "Hülga",
+  "notification_requests.dismiss_multiple": "{count, plural, one {Loobuda # taotlusest…} other {Loobuda # taotlusest…}}",
+  "notification_requests.edit_selection": "Muuda",
+  "notification_requests.exit_selection": "Valmis",
   "notification_requests.explainer_for_limited_account": "Sellelt kontolt tulevad teavitused on filtreeritud, sest moderaator on seda kontot piiranud.",
   "notification_requests.explainer_for_limited_remote_account": "Sellelt kontolt tulevad teavitused on filtreeritud, sest moderaator on seda kontot või serverit piiranud.",
   "notification_requests.maximize": "Maksimeeri",
   "notification_requests.minimize_banner": "Minimeeri filtreeritud teavituste bänner",
   "notification_requests.notifications_from": "Teavitus kasutajalt {name}",
   "notification_requests.title": "Filtreeritud teavitused",
+  "notification_requests.view": "Vaata teavitusi",
   "notifications.clear": "Puhasta teated",
   "notifications.clear_confirmation": "Oled kindel, et soovid püsivalt kõik oma teated eemaldada?",
   "notifications.clear_title": "Tühjenda teavitus?",
@@ -554,6 +589,12 @@
   "notifications.permission_denied": "Töölauamärguanded pole saadaval, kuna eelnevalt keelduti lehitsejale teavituste luba andmast",
   "notifications.permission_denied_alert": "Töölaua märguandeid ei saa lubada, kuna brauseri luba on varem keeldutud",
   "notifications.permission_required": "Töölaua märguanded ei ole saadaval, kuna vajalik luba pole antud.",
+  "notifications.policy.accept": "Nõustun",
+  "notifications.policy.accept_hint": "Näita teavitustes",
+  "notifications.policy.drop": "Ignoreeri",
+  "notifications.policy.drop_hint": "Saada tühjusse, mitte kunagi seda enam näha",
+  "notifications.policy.filter": "Filter",
+  "notifications.policy.filter_hint": "Saadetud filtreeritud teavituste sisendkasti",
   "notifications.policy.filter_limited_accounts_hint": "Piiratud serveri moderaatorite poolt",
   "notifications.policy.filter_limited_accounts_title": "Modereeritud kontod",
   "notifications.policy.filter_new_accounts.hint": "Loodud viimase {days, plural, one {ühe päeva} other {# päeva}} jooksul",
@@ -564,6 +605,7 @@
   "notifications.policy.filter_not_following_title": "Inimesed, keda sa ei jälgi",
   "notifications.policy.filter_private_mentions_hint": "Filtreeritud, kui see pole vastus sinupoolt mainimisele või kui jälgid saatjat",
   "notifications.policy.filter_private_mentions_title": "Soovimatud privaatsed mainimised",
+  "notifications.policy.title": "Halda teavitusi kohast…",
   "notifications_permission_banner.enable": "Luba töölaua märguanded",
   "notifications_permission_banner.how_to_control": "Et saada teateid, ajal mil Mastodon pole avatud, luba töölauamärguanded. Saad täpselt määrata, mis tüüpi tegevused tekitavad märguandeid, kasutates peale teadaannete sisse lülitamist üleval olevat nuppu {icon}.",
   "notifications_permission_banner.title": "Ära jää millestki ilma",
diff --git a/app/javascript/mastodon/locales/fa.json b/app/javascript/mastodon/locales/fa.json
index 169c325ad78a3a..50c376b3bd35af 100644
--- a/app/javascript/mastodon/locales/fa.json
+++ b/app/javascript/mastodon/locales/fa.json
@@ -11,6 +11,7 @@
   "about.not_available": "این اطّلاعات روی این کارساز موجود نشده.",
   "about.powered_by": "رسانهٔ اجتماعی نامتمرکز قدرت گرفته از {mastodon}",
   "about.rules": "قوانین کارساز",
+  "account.account_note_header": "یادداشت شخصی",
   "account.add_or_remove_from_list": "افزودن یا برداشتن از سیاهه‌ها",
   "account.badges.bot": "خودکار",
   "account.badges.group": "گروه",
@@ -33,7 +34,9 @@
   "account.follow_back": "دنبال کردن متقابل",
   "account.followers": "پی‌گیرندگان",
   "account.followers.empty": "هنوز کسی پی‌گیر این کاربر نیست.",
+  "account.followers_counter": "{count, plural, one {{counter} پی‌گیرنده} other {{counter} پی‌گیرنده}}",
   "account.following": "پی می‌گیرید",
+  "account.following_counter": "{count, plural, one {{counter} پی‌گرفته} other {{counter} پی‌گرفته}}",
   "account.follows.empty": "این کاربر هنوز پی‌گیر کسی نیست.",
   "account.go_to_profile": "رفتن به نمایه",
   "account.hide_reblogs": "نهفتن تقویت‌های ‎@{name}",
@@ -59,6 +62,7 @@
   "account.requested_follow": "{name} درخواست پی‌گیریتان را داد",
   "account.share": "هم‌رسانی نمایهٔ ‎@{name}",
   "account.show_reblogs": "نمایش تقویت‌های ‎@{name}",
+  "account.statuses_counter": "{count, plural, one {{counter} فرسته} other {{counter} فرسته}}",
   "account.unblock": "رفع مسدودیت ‎@{name}",
   "account.unblock_domain": "رفع مسدودیت دامنهٔ {domain}",
   "account.unblock_short": "رفع مسدودیت",
@@ -86,9 +90,14 @@
   "audio.hide": "نهفتن صدا",
   "block_modal.show_less": "نمایش کم‌تر",
   "block_modal.show_more": "نمایش بیش‌تر",
+  "block_modal.they_cant_mention": "نمی‌توانند نامتان را برده یا پی‌تان بگیرند.",
+  "block_modal.they_cant_see_posts": "نمی‌توانند فرسته‌هایتان را دیده و فرسته‌هایشان را نمی‌بینید.",
+  "block_modal.they_will_know": "می‌توانند ببینند که مسدود شده‌اند.",
   "block_modal.title": "انسداد کاربر؟",
   "block_modal.you_wont_see_mentions": "فرسته‌هایی که از اون نام برده را نخواهید دید.",
   "boost_modal.combo": "دکمهٔ {combo} را بزنید تا دیگر این را نبینید",
+  "boost_modal.reblog": "تقویت فرسته؟",
+  "boost_modal.undo_reblog": "ناتقویت فرسته؟",
   "bundle_column_error.copy_stacktrace": "رونوشت از گزارش خطا",
   "bundle_column_error.error.body": "صفحهٔ درخواستی نتوانست پرداخت شود. ممکن است به خاطر اشکالی در کدمان یا مشکل سازگاری مرورگر باشد.",
   "bundle_column_error.error.title": "وای، نه!",
@@ -184,6 +193,8 @@
   "confirmations.unfollow.confirm": "پی‌نگرفتن",
   "confirmations.unfollow.message": "مطمئنید که می‌خواهید به پی‌گیری از {name} پایان دهید؟",
   "confirmations.unfollow.title": "ناپی‌گیری کاربر؟",
+  "content_warning.hide": "نهفتن فرسته",
+  "content_warning.show": "نمایش به هر روی",
   "conversation.delete": "حذف گفتگو",
   "conversation.mark_as_read": "علامت‌گذاری به عنوان خوانده شده",
   "conversation.open": "دیدن گفتگو",
@@ -204,9 +215,24 @@
   "dismissable_banner.explore_tags": "هم‌اکنون این برچسب‌ها بین افراد این کارساز و دیگر کارسازهای شبکهٔ نامتمرکز داغ شده‌اند.",
   "dismissable_banner.public_timeline": "این‌ها جدیدترین فرسته‌های عمومی از افرادی روی وب اجتماعیند که اعضای {domain} پی می‌گیرندشان.",
   "domain_block_modal.block": "انسداد کارساز",
+  "domain_block_modal.block_account_instead": "انسداد @{name} به جایش",
+  "domain_block_modal.they_can_interact_with_old_posts": "افزارد روی این کراساز می‌توانند با فرسته‌های قدیمیتان تعامل داشته باشند.",
+  "domain_block_modal.they_cant_follow": "هیچ‌کسی از این کارساز نمی‌تواند پیتان بگیرد.",
+  "domain_block_modal.they_wont_know": "نخواهند دانست که مسدود شده‌اند.",
   "domain_block_modal.title": "انسداد دامنه؟",
+  "domain_block_modal.you_will_lose_followers": "همهٔ پی‌گیرندگانتان از این کارساز برداشته خواهند شد.",
+  "domain_block_modal.you_wont_see_posts": "فرسته‌ها یا آگاهی‌ها از کاربران روی این کارساز را نخواهید دید.",
   "domain_pill.server": "کارساز",
+  "domain_pill.their_handle": "شناسه‌اش:",
+  "domain_pill.their_server": "خانهٔ رقمیش. جایی که همهٔ فرسته‌هایش می‌زیند.",
+  "domain_pill.their_username": "شناسهٔ یکتایش در کارسازش. ممکن است کاربرانی با نام کاربری مشابه روی کارسازهای مختلف باشند.",
   "domain_pill.username": "نام کاربری",
+  "domain_pill.whats_in_a_handle": "شناسه چیست؟",
+  "domain_pill.who_they_are": "از آن‌جا که شناسه‌ها کیستی و کجایی افراد را می‌گویند، می‌توانید با افرادی در سراسر وب اجتماعی <button>بن‌سازه‌های قدرت گرفته از اکتیویتی پاپ</button> تعامل داشته باشید.",
+  "domain_pill.who_you_are": "از آن‌جا که شناسه‌ها کیستی و کجاییتان را می‌گویند، افراد می‌توانند از سراسر وب اجتماعی <button>بن‌سازه‌های قدرت گرفته از اکتیویتی پاپ</button> با شما تعامل داشته باشند.",
+  "domain_pill.your_handle": "شناسه‌تان:",
+  "domain_pill.your_server": "خانهٔ رقمیتان. جایی که همهٔ فرسته‌هایتان می‌زیند. دوستش ندارید؟ در هر زمان کارسازتان را جابه‌جا کرده و پی‌گیرندگانتان را نیز بیاورید.",
+  "domain_pill.your_username": "شناسهٔ یکتایتان روی این کارساز. ممکن است کاربرانی با نام کاربری مشابه روی کارسازهای دیگر باشند.",
   "embed.instructions": "جاسازی این فرسته روی پایگاهتان با رونوشت کردن کد زیر.",
   "embed.preview": "این گونه دیده خواهد شد:",
   "emoji_button.activity": "فعالیت",
@@ -273,6 +299,9 @@
   "filter_modal.select_filter.subtitle": "استفاده از یک دستهً موجود یا ایجاد دسته‌ای جدید",
   "filter_modal.select_filter.title": "پالایش این فرسته",
   "filter_modal.title.status": "پالایش یک فرسته",
+  "filter_warning.matches_filter": "مطابق با پالایهٔ «{title}»",
+  "filtered_notifications_banner.pending_requests": "از {count, plural, =0 {هیچ‌کسی} one {فردی} other {# نفر}} که ممکن است بشناسید",
+  "filtered_notifications_banner.title": "آگاهی‌های پالوده",
   "firehose.all": "همه",
   "firehose.local": "این کارساز",
   "firehose.remote": "دیگر کارسازها",
@@ -281,6 +310,8 @@
   "follow_requests.unlocked_explanation": "با این که حسابتان قفل نیست، کارکنان {domain} فکر کردند که ممکن است بخواهید درخواست‌ها از این حساب‌ها را به صورت دستی بازبینی کنید.",
   "follow_suggestions.curated_suggestion": "گزینش سردبیر",
   "follow_suggestions.dismiss": "دیگر نشان داده نشود",
+  "follow_suggestions.featured_longer": "دست‌چین شده به دست گروه {domain}",
+  "follow_suggestions.friends_of_friends_longer": "محبوب بین کسانی که پی‌گرفته‌اید",
   "follow_suggestions.hints.featured": "این نمایه به دست گروه {domain} دستچین شده.",
   "follow_suggestions.hints.friends_of_friends": "این نمایه بین کسانی که پی می‌گیرید محبوب است.",
   "follow_suggestions.hints.most_followed": "این نمایه روی {domain} بسیار پی‌گرفته شده.",
@@ -288,6 +319,8 @@
   "follow_suggestions.hints.similar_to_recently_followed": "این نمایه شبیه نمایه‌هاییست که اخیراً پی‌گرفته‌اید.",
   "follow_suggestions.personalized_suggestion": "پیشنهاد شخصی",
   "follow_suggestions.popular_suggestion": "پیشنهاد محبوب",
+  "follow_suggestions.popular_suggestion_longer": "محبوب روی {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "شبیه نمایه‌هایی که اخیراً پی گرفته‌اید",
   "follow_suggestions.view_all": "دیدن همه",
   "follow_suggestions.who_to_follow": "افرادی برای پی‌گیری",
   "followed_tags": "برچسب‌های پی‌گرفته",
@@ -316,6 +349,14 @@
   "hashtag.follow": "پی‌گرفتن برچسب",
   "hashtag.unfollow": "پی‌نگرفتن برچسب",
   "hashtags.and_other": "…و {count, plural, other {# بیش‌تر}}",
+  "hints.profiles.followers_may_be_missing": "شاید پی‌گیرندگان این نمایه نباشند.",
+  "hints.profiles.follows_may_be_missing": "شاید پی‌گرفته‌های این نمایه نباشند.",
+  "hints.profiles.posts_may_be_missing": "شاید فرسته‌هایی از این نمایه نباشند.",
+  "hints.profiles.see_more_followers": "دیدن پی‌گیرندگان بیش‌تر روی {domain}",
+  "hints.profiles.see_more_follows": "دیدن پی‌گرفته‌های بیش‌تر روی {domain}",
+  "hints.profiles.see_more_posts": "دیدن فرسته‌های بیش‌تر روی {domain}",
+  "hints.threads.replies_may_be_missing": "شاید پاسخ‌ها از دیگر کارسازها نباشند.",
+  "hints.threads.see_more": "دیدن پاسخ‌های بیش‌تر روی {domain}",
   "home.column_settings.show_reblogs": "نمایش تقویت‌ها",
   "home.column_settings.show_replies": "نمایش پاسخ‌ها",
   "home.hide_announcements": "نهفتن اعلامیه‌ها",
@@ -323,6 +364,11 @@
   "home.pending_critical_update.link": "دیدن به‌روز رسانی‌ها",
   "home.pending_critical_update.title": "به‌روز رسانی امنیتی بحرانی موجود است!",
   "home.show_announcements": "نمایش اعلامیه‌ها",
+  "ignore_notifications_modal.ignore": "چشم‌پوشی از آگاهی‌ها",
+  "ignore_notifications_modal.limited_accounts_title": "چشم‌پوشی از آگاهی‌های حساب‌های نظارت شده؟",
+  "ignore_notifications_modal.new_accounts_title": "چشم‌پوشی از آگاهی‌های حساب‌های جدید؟",
+  "ignore_notifications_modal.not_followers_title": "چشم‌پوشی از آگاهی‌های افرادی که پیتان نمی‌گیرند؟",
+  "ignore_notifications_modal.not_following_title": "چشم‌پوشی از آگاهی‌های افرادی که پیشان نمی‌گیرید؟",
   "interaction_modal.description.favourite": "با حسابی روی ماستودون می‌توانید این فرسته را برگزیده تا نگارنده بداند قدردانش هستید و برای آینده ذخیره‌اش می‌کنید.",
   "interaction_modal.description.follow": "با حسابی روی ماستودون می‌توانید {name} را برای دریافت فرسته‌هایش در خوراک خانگیتان دنبال کنید.",
   "interaction_modal.description.reblog": "با حسابی روی ماستودون می‌توانید این فرسته را با پی‌گیران خودتان هم‌رسانی کنید.",
@@ -383,6 +429,8 @@
   "limited_account_hint.action": "به هر روی نمایه نشان داده شود",
   "limited_account_hint.title": "این نمایه از سوی ناظم‌های {domain} پنهان شده.",
   "link_preview.author": "از {name}",
+  "link_preview.more_from_author": "بیش‌تر از {name}",
+  "link_preview.shares": "{count, plural, one {{counter} فرسته} other {{counter} فرسته}}",
   "lists.account.add": "افزودن به سیاهه",
   "lists.account.remove": "برداشتن از سیاهه",
   "lists.delete": "حذف سیاهه",
@@ -401,9 +449,16 @@
   "loading_indicator.label": "در حال بارگذاری…",
   "media_gallery.toggle_visible": "{number, plural, one {نهفتن تصویر} other {نهفتن تصاویر}}",
   "moved_to_account_banner.text": "حسابتان {disabledAccount} اکنون از کار افتاده؛ چرا که به {movedToAccount} منتقل شدید.",
+  "mute_modal.hide_from_notifications": "نهفتن از آگاهی‌ها",
+  "mute_modal.hide_options": "گزینه‌های نهفتن",
+  "mute_modal.indefinite": "تا وقتی ناخموشش کنم",
   "mute_modal.show_options": "نمایش گزینه‌ها",
+  "mute_modal.they_wont_know": "نخواهند دانست که خموش شده‌اند.",
   "mute_modal.title": "خموشی کاربر؟",
+  "mute_modal.you_wont_see_mentions": "فرسته‌هایی که به او اشاره کرده‌اند را نخواهید دید.",
+  "mute_modal.you_wont_see_posts": "هنوز می‌توانند فرسته‌هایتان را ببینند، ولی فرسته‌هایشان را نمی‌بینید.",
   "navigation_bar.about": "درباره",
+  "navigation_bar.administration": "مدیریت",
   "navigation_bar.advanced_interface": "بازکردن در رابط کاربری وب پیشرفته",
   "navigation_bar.blocks": "کاربران مسدود شده",
   "navigation_bar.bookmarks": "نشانک‌ها",
@@ -420,6 +475,7 @@
   "navigation_bar.follows_and_followers": "پی‌گرفتگان و پی‌گیرندگان",
   "navigation_bar.lists": "سیاهه‌ها",
   "navigation_bar.logout": "خروج",
+  "navigation_bar.moderation": "نظارت",
   "navigation_bar.mutes": "کاربران خموشانده",
   "navigation_bar.opened_in_classic_interface": "فرسته‌ها، حساب‌ها و دیگر صفحه‌های خاص به طور پیش‌گزیده در میانای وب کلاسیک گشوده می‌شوند.",
   "navigation_bar.personal": "شخصی",
@@ -430,26 +486,54 @@
   "navigation_bar.security": "امنیت",
   "not_signed_in_indicator.not_signed_in": "برای دسترسی به این منبع باید وارد شوید.",
   "notification.admin.report": "{name}، {target} را گزارش داد",
+  "notification.admin.report_statuses_other": "{name}، {target} را گزارش داد",
   "notification.admin.sign_up": "{name} ثبت نام کرد",
   "notification.favourite": "{name} فرسته‌تان را برگزید",
   "notification.follow": "‫{name}‬ پی‌گیرتان شد",
   "notification.follow_request": "{name} درخواست پی‌گیریتان را داد",
+  "notification.label.mention": "اشاره",
+  "notification.label.private_mention": "اشارهٔ خصوصی",
+  "notification.label.private_reply": "پاسخ خصوصی",
+  "notification.label.reply": "پاسخ",
+  "notification.mention": "اشاره",
   "notification.moderation-warning.learn_more": "بیشتر بدانید",
+  "notification.moderation_warning": "هشداری مدیریتی گرفته‌اید",
+  "notification.moderation_warning.action_delete_statuses": "برخی از فرسته‌هایتان برداشته شدند.",
+  "notification.moderation_warning.action_disable": "حسابتان از کار افتاد.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "برخی از فرسته‌هایتان به عنوان حسّاس علامت خوردند.",
+  "notification.moderation_warning.action_none": "حسابتان هشداری مدیریتی گرفت.",
+  "notification.moderation_warning.action_sensitive": "فرسته‌هایتان از اکنون به عنوان حسّاس علامت خواهند خورد.",
+  "notification.moderation_warning.action_silence": "حسابتان محدود شده.",
+  "notification.moderation_warning.action_suspend": "حسابتان معلّق شده.",
   "notification.own_poll": "نظرسنجیتان پایان یافت",
+  "notification.poll": "نظرسنجی‌ای که در آن رأی دادید به پایان رسید",
   "notification.reblog": "‫{name}‬ فرسته‌تان را تقویت کرد",
+  "notification.relationships_severance_event": "قطع ارتباط با {name}",
   "notification.relationships_severance_event.learn_more": "بیشتر بدانید",
   "notification.status": "{name} چیزی فرستاد",
   "notification.update": "{name} فرسته‌ای را ویرایش کرد",
   "notification_requests.accept": "پذیرش",
+  "notification_requests.confirm_accept_multiple.title": "پذیرش درخواست‌های آگاهی؟",
+  "notification_requests.confirm_dismiss_multiple.title": "رد کردن درخواست‌های آگاهی؟",
   "notification_requests.dismiss": "دورانداختن",
+  "notification_requests.edit_selection": "ویرایش",
+  "notification_requests.exit_selection": "انجام شد",
   "notification_requests.maximize": "بیشنه",
+  "notification_requests.minimize_banner": "کمینه کردن بیرق آگاهی‌های پالوده",
+  "notification_requests.notifications_from": "آگاهی‌ها از {name}",
+  "notification_requests.title": "آگاهی‌های پالوده",
+  "notification_requests.view": "دیدن آگاهی‌ها",
   "notifications.clear": "پاک‌سازی آگاهی‌ها",
   "notifications.clear_confirmation": "مطمئنید می‌خواهید همهٔ آگاهی‌هایتان را برای همیشه پاک کنید؟",
+  "notifications.clear_title": "پاک‌سازی آگاهی‌ها؟",
   "notifications.column_settings.admin.report": "گزارش‌های جدید:",
   "notifications.column_settings.admin.sign_up": "ثبت نام‌های جدید:",
   "notifications.column_settings.alert": "آگاهی‌های میزکار",
   "notifications.column_settings.beta.category": "ویژگی‌های آزمایشی",
+  "notifications.column_settings.beta.grouping": "گروه‌بندی آگاهی‌ها",
   "notifications.column_settings.favourite": "برگزیده‌ها:",
+  "notifications.column_settings.filter_bar.advanced": "نمایش همۀ دسته‌ها",
+  "notifications.column_settings.filter_bar.category": "نوار پالایش سریع",
   "notifications.column_settings.follow": "پی‌گیرندگان جدید:",
   "notifications.column_settings.follow_request": "درخواست‌های جدید پی‌گیری:",
   "notifications.column_settings.mention": "اشاره‌ها:",
@@ -475,8 +559,19 @@
   "notifications.permission_denied": "آگاهی‌های میزکار به دلیل رد کردن درخواست اجازهٔ پیشین مرورگر، در دسترس نیستند",
   "notifications.permission_denied_alert": "از آن‌جا که پیش از این اجازهٔ مرورگر رد شده است، آگاهی‌های میزکار نمی‌توانند به کار بیفتند",
   "notifications.permission_required": "آگاهی‌های میزکار در دسترس نیستند زیرا اجازه‌های لازم، اعطا نشده.",
+  "notifications.policy.accept": "پذیرش",
+  "notifications.policy.accept_hint": "نمایش در آگاهی‌ها",
+  "notifications.policy.drop": "چشم‌پوشی",
+  "notifications.policy.drop_hint": "فرستادن به هیچ. دیگر هرگز دیده نخواهند شد",
+  "notifications.policy.filter": "پالایش",
+  "notifications.policy.filter_hint": "فرستادن به صندوق آگاهی‌های پالوده",
+  "notifications.policy.filter_limited_accounts_hint": "محدود شده به دست ناظم‌های کارساز",
+  "notifications.policy.filter_limited_accounts_title": "حساب‌های مدیریت شده",
+  "notifications.policy.filter_new_accounts_title": "حساب‌های جدید",
   "notifications.policy.filter_not_followers_title": "کسانی که شما را دنبال میکنند",
   "notifications.policy.filter_not_following_hint": "",
+  "notifications.policy.filter_not_following_title": "کسانی که پی نمی‌گیرید",
+  "notifications.policy.title": "مدیریت آگاهی‌ها از…",
   "notifications_permission_banner.enable": "به کار انداختن آگاهی‌های میزکار",
   "notifications_permission_banner.how_to_control": "برای دریافت آگاهی‌ها هنگام باز نبودن ماستودون، آگاهی‌های میزکار را به کار بیندازید. پس از به کار افتادنشان می‌توانید گونه‌های دقیق برهم‌کنش‌هایی که آگاهی‌های میزکار تولید می‌کنند را از {icon} بالا واپایید.",
   "notifications_permission_banner.title": "هرگز چیزی را از دست ندهید",
@@ -609,6 +704,7 @@
   "report_notification.categories.spam": "هرزنامه",
   "report_notification.categories.spam_sentence": "هرزنامه",
   "report_notification.categories.violation": "تخطّی از قانون",
+  "report_notification.categories.violation_sentence": "تخطّی از قانون",
   "report_notification.open": "گشودن گزارش",
   "search.no_recent_searches": "جست‌وجوی اخیری نیست",
   "search.placeholder": "جست‌وجو",
@@ -653,9 +749,11 @@
   "status.direct": "اشارهٔ خصوصی به ‪@{name}‬",
   "status.direct_indicator": "اشارهٔ خصوصی",
   "status.edit": "ویرایش",
+  "status.edited": "آخرین ویرایش {date}",
   "status.edited_x_times": "{count, plural, one {{count} مرتبه} other {{count} مرتبه}} ویرایش شد",
   "status.embed": "جاسازی",
   "status.favourite": "برگزیده‌",
+  "status.favourites": "{count, plural, one {برگزیده} other {برگزیده}}",
   "status.filter": "پالایش این فرسته",
   "status.history.created": "توسط {name} در {date} ایجاد شد",
   "status.history.edited": "توسط {name} در {date} ویرایش شد",
@@ -674,6 +772,7 @@
   "status.reblog": "تقویت",
   "status.reblog_private": "تقویت برای مخاطبان نخستین",
   "status.reblogged_by": "‫{name}‬ تقویت کرد",
+  "status.reblogs": "{count, plural, one {تقویت} other {تقویت}}",
   "status.reblogs.empty": "هنوز هیچ کسی این فرسته را تقویت نکرده است. وقتی کسی چنین کاری کند، این‌جا نمایش داده خواهد شد.",
   "status.redraft": "حذف و بازنویسی",
   "status.remove_bookmark": "برداشتن نشانک",
diff --git a/app/javascript/mastodon/locales/ia.json b/app/javascript/mastodon/locales/ia.json
index f575c005d8dd19..8a448920c15192 100644
--- a/app/javascript/mastodon/locales/ia.json
+++ b/app/javascript/mastodon/locales/ia.json
@@ -180,6 +180,7 @@
   "confirmations.discard_edit_media.message": "Tu ha cambiamentos non salvate in le description o previsualisation del objecto multimedial. Abandonar los?",
   "confirmations.edit.confirm": "Modificar",
   "confirmations.edit.message": "Si tu modifica isto ora, le message in curso de composition essera perdite. Es tu secur de voler continuar?",
+  "confirmations.edit.title": "Superscriber le message?",
   "confirmations.logout.confirm": "Clauder session",
   "confirmations.logout.message": "Es tu secur que tu vole clauder le session?",
   "confirmations.logout.title": "Clauder session?",
@@ -189,6 +190,7 @@
   "confirmations.redraft.title": "Deler e rescriber le message?",
   "confirmations.reply.confirm": "Responder",
   "confirmations.reply.message": "Si tu responde ora, le message in curso de composition essera perdite. Es tu secur de voler continuar?",
+  "confirmations.reply.title": "Superscriber le message?",
   "confirmations.unfollow.confirm": "Non plus sequer",
   "confirmations.unfollow.message": "Es tu secur que tu vole cessar de sequer {name}?",
   "confirmations.unfollow.title": "Cessar de sequer le usator?",
@@ -361,6 +363,12 @@
   "home.pending_critical_update.link": "Vider actualisationes",
   "home.pending_critical_update.title": "Actualisation de securitate critic disponibile!",
   "home.show_announcements": "Monstrar annuncios",
+  "ignore_notifications_modal.ignore": "Ignorar le notificationes",
+  "ignore_notifications_modal.limited_accounts_title": "Ignorar le notificationes de contos moderate?",
+  "ignore_notifications_modal.new_accounts_title": "Ignorar le notificationes de nove contos?",
+  "ignore_notifications_modal.not_followers_title": "Ignorar notificationes de personas qui non te seque?",
+  "ignore_notifications_modal.not_following_title": "Ignorar notificationes de personas que tu non seque?",
+  "ignore_notifications_modal.private_mentions_title": "Ignorar notificationes de mentiones private non requestate?",
   "interaction_modal.description.favourite": "Con un conto sur Mastodon, tu pote marcar iste message como favorite pro informar le autor que tu lo apprecia e lo salva pro plus tarde.",
   "interaction_modal.description.follow": "Con un conto sur Mastodon, tu pote sequer {name} e reciper su messages in tu fluxo de initio.",
   "interaction_modal.description.reblog": "Con un conto sur Mastodon, tu pote impulsar iste message pro condivider lo con tu proprie sequitores.",
@@ -479,6 +487,8 @@
   "navigation_bar.security": "Securitate",
   "not_signed_in_indicator.not_signed_in": "Es necessari aperir session pro acceder a iste ressource.",
   "notification.admin.report": "{name} ha reportate {target}",
+  "notification.admin.report_account": "{name} ha reportate {count, plural, one {un message} other {# messages}} de {target} per {category}",
+  "notification.admin.report_account_other": "{name} ha reportate {count, plural, one {un message} other {# messages}} de {target}",
   "notification.admin.report_statuses": "{name} ha reportate {target} pro {category}",
   "notification.admin.report_statuses_other": "{name} ha reportate {target}",
   "notification.admin.sign_up": "{name} se ha inscribite",
diff --git a/app/javascript/mastodon/locales/la.json b/app/javascript/mastodon/locales/la.json
index 5ef238a2bd997a..dc0796144160bb 100644
--- a/app/javascript/mastodon/locales/la.json
+++ b/app/javascript/mastodon/locales/la.json
@@ -24,6 +24,7 @@
   "announcement.announcement": "Proclamatio",
   "attachments_list.unprocessed": "(immūtātus)",
   "block_modal.you_wont_see_mentions": "Nuntios quibus eos commemorant non videbis.",
+  "boost_modal.combo": "Potes premēre {combo} ut hoc iterum transilīre",
   "bundle_column_error.error.title": "Eheu!",
   "bundle_column_error.retry": "Retemptare",
   "bundle_column_error.routing.title": "CCCCIIII",
@@ -72,7 +73,10 @@
   "empty_column.account_timeline": "Hic nulla contributa!",
   "empty_column.account_unavailable": "Notio non impetrabilis",
   "empty_column.blocks": "Nondum quemquam usorem obsēcāvisti.",
+  "empty_column.bookmarked_statuses": "Nūllae adhuc postēs notātī habēs. Ubi unum notāverīs, hic apparebit.",
   "empty_column.direct": "Nōn habēs adhūc ullo mentionēs prīvātās. Cum ūnam mīseris aut accipis, hīc apparēbit.",
+  "empty_column.favourited_statuses": "Nūllae adhuc postēs praeferendī habēs. Ubi unum praeferās, hic apparebit.",
+  "empty_column.follow_requests": "Nūllae adhuc petitionēs sequendi habēs. Ubi unum accipīs, hic apparebit.",
   "empty_column.followed_tags": "Nōn adhūc aliquem hastāginem secūtus es. Cum id fēceris, hic ostendētur.",
   "empty_column.home": "Tua linea temporum domesticus vacua est! Sequere plures personas ut eam compleas.",
   "empty_column.list": "There is nothing in this list yet. When members of this list post new statuses, they will appear here.",
@@ -84,12 +88,19 @@
   "firehose.all": "Omnis",
   "footer.about": "De",
   "generic.saved": "Servavit",
+  "hashtag.column_header.tag_mode.none": "sine {additional}",
   "hashtag.column_settings.tag_mode.all": "Haec omnia",
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
   "hashtag.counter_by_accounts": "{count, plural, one {{counter} particeps} other {{counter} participēs}}",
   "hashtag.counter_by_uses": "{count, plural, one {{counter} nuntius} other {{counter} nuntii}}",
   "hashtag.counter_by_uses_today": "{count, plural, one {{counter} nuntius} other {{counter} nuntii}} hodie",
   "hashtags.and_other": "…et {count, plural, other {# plus}}",
+  "ignore_notifications_modal.filter_to_act_users": "Adhuc poteris accipere, reicere, vel referre usores",
+  "ignore_notifications_modal.filter_to_review_separately": "Percolantur notificatiōnes separātim recensere potes",
+  "interaction_modal.description.favourite": "Cum accūntū in Mastodon, hanc postem praeferre potes ut auctōrī indicēs tē eam aestimāre et ad posterius servēs.",
+  "interaction_modal.description.follow": "Cum accūntū in Mastodon, {name} sequī potes ut eōrum postēs in tēlā domī tuā recipiās.",
+  "interaction_modal.description.reply": "Mastodon de Ratione, huic nuntio respondere potes.",
+  "interaction_modal.sign_in": "Ad hōc servientem nōn dēlūxī. Ubi accūntum tuum hospitātum est?",
   "intervals.full.days": "{number, plural, one {# die} other {# dies}}",
   "intervals.full.hours": "{number, plural, one {# hora} other {# horae}}",
   "intervals.full.minutes": "{number, plural, one {# minutum} other {# minuta}}",
@@ -155,6 +166,8 @@
   "notification.status": "{name} nuper publicavit",
   "notification.update": "{name} nuntium correxit",
   "notification_requests.accept": "Accipe",
+  "notification_requests.confirm_accept_multiple.message": "Tu es accepturus {count, plural, one {una notitia petitionem} other {# notitia petitiones}}. Certus esne procedere vis?",
+  "notification_requests.confirm_dismiss_multiple.message": "Tu {count, plural, one {unam petitionem notificationis} other {# petitiones notificationum}} abrogāre prōximum es. {count, plural, one {Illa} other {Eae}} facile accessū nōn erit. Certus es tē procedere velle?",
   "notifications.filter.all": "Omnia",
   "notifications.filter.polls": "Eventus electionis",
   "notifications.group": "Notificātiōnēs",
@@ -163,6 +176,8 @@
   "onboarding.follows.lead": "Tua domus feed est principalis via Mastodon experīrī. Quō plūrēs persōnas sequeris, eō actīvior et interessantior erit. Ad tē incipiendum, ecce quaedam suāsiones:",
   "onboarding.follows.title": "Popular on Mastodon",
   "onboarding.profile.display_name_hint": "Tuum nomen completum aut tuum nomen ludens…",
+  "onboarding.profile.lead": "Hoc semper postea in ratiōnibus complērī potest, ubi etiam plūrēs optiōnēs personalizātiōnis praesto sunt.",
+  "onboarding.profile.note_hint": "Alios hominēs vel #hashtags @nōmināre potes…",
   "onboarding.start.lead": "Nunc pars es Mastodonis, singularis, socialis medii platformae decentralis ubi—non algorismus—tuam ipsius experientiam curas. Incipiāmus in nova hac socialis regione:",
   "onboarding.start.skip": "Want to skip right ahead?",
   "onboarding.start.title": "Perfecisti eam!",
@@ -206,8 +221,11 @@
   "report.mute_explanation": "Non videbis eōrum nuntiōs. Possunt adhuc tē sequī et tuōs nuntiōs vidēre, nec sciēbunt sē tacitōs esse.",
   "report.next": "Secundum",
   "report.placeholder": "Commentāriī adiūnctī",
+  "report.reasons.legal_description": "Putās id legem tuae aut servientis patriae violāre.",
+  "report.reasons.violation_description": "Scis quod certa praecepta frangit",
   "report.submit": "Mittere",
   "report.target": "Report {target}",
+  "report.unfollow_explanation": "Tu hanc rationem secutus es. Non videre stationes suas in domo tua amplius pascere, eas sequere.",
   "report_notification.attached_statuses": "{count, plural, one {{count} nuntius} other {{count} nuntii}} attachiatus",
   "report_notification.categories.other": "Altera",
   "search.placeholder": "Quaerere",
diff --git a/app/javascript/mastodon/locales/ms.json b/app/javascript/mastodon/locales/ms.json
index c9f8b7a2744ac1..4a32b1d820d3ed 100644
--- a/app/javascript/mastodon/locales/ms.json
+++ b/app/javascript/mastodon/locales/ms.json
@@ -11,6 +11,7 @@
   "about.not_available": "Maklumat ini belum tersedia pada pelayan ini.",
   "about.powered_by": "Media sosial terpencar yang dikuasakan oleh {mastodon}",
   "about.rules": "Peraturan pelayan",
+  "account.account_note_header": "Personal note",
   "account.add_or_remove_from_list": "Tambah atau Buang dari senarai",
   "account.badges.bot": "Bot",
   "account.badges.group": "Kumpulan",
@@ -33,6 +34,7 @@
   "account.follow_back": "Ikut balik",
   "account.followers": "Pengikut",
   "account.followers.empty": "Belum ada yang mengikuti pengguna ini.",
+  "account.followers_counter": "{count, plural, one {{counter} Diikuti} other {{counter} Diikuti}}",
   "account.following": "Mengikuti",
   "account.follows.empty": "Pengguna ini belum mengikuti sesiapa.",
   "account.go_to_profile": "Pergi ke profil",
diff --git a/app/javascript/mastodon/locales/ru.json b/app/javascript/mastodon/locales/ru.json
index 4439b8dc0a1fbe..2c55da90b7576b 100644
--- a/app/javascript/mastodon/locales/ru.json
+++ b/app/javascript/mastodon/locales/ru.json
@@ -190,6 +190,7 @@
   "confirmations.unfollow.message": "Вы уверены, что хотите отписаться от {name}?",
   "confirmations.unfollow.title": "Отписаться?",
   "content_warning.hide": "Скрыть пост",
+  "content_warning.show": "Всё равно показать",
   "conversation.delete": "Удалить беседу",
   "conversation.mark_as_read": "Отметить как прочитанное",
   "conversation.open": "Просмотр беседы",
diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json
index fded16b195f3df..ea4ebcda47654b 100644
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@@ -94,7 +94,7 @@
   "block_modal.they_cant_mention": "他们不能提及或关注你。",
   "block_modal.they_cant_see_posts": "他们看不到你的嘟文，你也看不到他们的嘟文。",
   "block_modal.they_will_know": "他们将能看到他们被屏蔽。",
-  "block_modal.title": "屏蔽该用户？",
+  "block_modal.title": "是否屏蔽该用户？",
   "block_modal.you_wont_see_mentions": "你将无法看到提及他们的嘟文。",
   "boost_modal.combo": "下次按住 {combo} 即可跳过此提示",
   "boost_modal.reblog": "是否转嘟？",
@@ -317,10 +317,10 @@
   "follow_suggestions.featured_longer": "由 {domain} 管理团队精选",
   "follow_suggestions.friends_of_friends_longer": "在你关注的人中很受欢迎",
   "follow_suggestions.hints.featured": "该用户已被 {domain} 管理团队精选。",
-  "follow_suggestions.hints.friends_of_friends": "该用户在您关注的人中很受欢迎。",
+  "follow_suggestions.hints.friends_of_friends": "该用户在你关注的人中很受欢迎。",
   "follow_suggestions.hints.most_followed": "该用户是 {domain} 上关注度最高的用户之一。",
   "follow_suggestions.hints.most_interactions": "该用户最近在 {domain} 上获得了很多关注。",
-  "follow_suggestions.hints.similar_to_recently_followed": "该用户与您最近关注的用户类似。",
+  "follow_suggestions.hints.similar_to_recently_followed": "该用户与你最近关注的用户类似。",
   "follow_suggestions.personalized_suggestion": "个性化建议",
   "follow_suggestions.popular_suggestion": "热门建议",
   "follow_suggestions.popular_suggestion_longer": "在 {domain} 上很受欢迎",
@@ -364,7 +364,7 @@
   "home.column_settings.show_reblogs": "显示转嘟",
   "home.column_settings.show_replies": "显示回复",
   "home.hide_announcements": "隐藏公告",
-  "home.pending_critical_update.body": "请尽快更新您的 Mastodon 服务器！",
+  "home.pending_critical_update.body": "请尽快更新你的 Mastodon 服务器！",
   "home.pending_critical_update.link": "查看更新",
   "home.pending_critical_update.title": "紧急安全更新可用！",
   "home.show_announcements": "显示公告",
@@ -618,12 +618,12 @@
   "onboarding.follows.lead": "你管理你自己的家庭饲料。你关注的人越多，它将越活跃和有趣。 这些配置文件可能是一个很好的起点——你可以随时取消关注它们！",
   "onboarding.follows.title": "定制您的主页动态",
   "onboarding.profile.discoverable": "让我的资料卡可被他人发现",
-  "onboarding.profile.discoverable_hint": "当您选择在 Mastodon 上启用发现功能时，你的嘟文可能会出现在搜索结果和热门中，你的账户可能会被推荐给与你兴趣相似的人。",
+  "onboarding.profile.discoverable_hint": "当你选择在 Mastodon 上启用发现功能时，你的嘟文可能会出现在搜索结果和热门中，你的账户可能会被推荐给与你兴趣相似的人。",
   "onboarding.profile.display_name": "昵称",
-  "onboarding.profile.display_name_hint": "您的全名或昵称…",
-  "onboarding.profile.lead": "您可以稍后在设置中完成此操作，设置中有更多的自定义选项。",
+  "onboarding.profile.display_name_hint": "你的全名或昵称…",
+  "onboarding.profile.lead": "你可以稍后在设置中完成此操作，设置中有更多的自定义选项。",
   "onboarding.profile.note": "简介",
-  "onboarding.profile.note_hint": "您可以提及 @其他人 或 #标签…",
+  "onboarding.profile.note_hint": "你可以提及 @其他人 或 #标签…",
   "onboarding.profile.save_and_continue": "保存并继续",
   "onboarding.profile.title": "设置个人资料",
   "onboarding.profile.upload_avatar": "上传头像",
@@ -632,7 +632,7 @@
   "onboarding.share.message": "我是来自 #Mastodon 的 {username}！请在 {url} 关注我。",
   "onboarding.share.next_steps": "可能的下一步：",
   "onboarding.share.title": "分享你的个人资料",
-  "onboarding.start.lead": "您新的 Mastodon 帐户已准备好。下面是如何最大限度地利用它：",
+  "onboarding.start.lead": "你的新 Mastodon 帐户已准备好。下面是如何最大限度地利用它：",
   "onboarding.start.skip": "想要在前面跳过吗？",
   "onboarding.start.title": "你已经成功了!",
   "onboarding.steps.follow_people.body": "You curate your own feed. Lets fill it with interesting people.",
@@ -644,7 +644,7 @@
   "onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
   "onboarding.steps.share_profile.title": "分享你的个人资料",
   "onboarding.tips.2fa": "<strong>你知道吗？</strong>你可以在账户设置中配置双因素认证来保护账户安全。可以使用你选择的任何 TOTP 应用，无需电话号码！",
-  "onboarding.tips.accounts_from_other_servers": "<strong>您知道吗？</strong> 既然Mastodon是去中心化的，您所看到的一些账户将被托管在您以外的服务器上。 但你可以无缝地与他们交互！他们的服务器在他们的用户名的后半部分！",
+  "onboarding.tips.accounts_from_other_servers": "<strong>你知道吗？</strong> 既然Mastodon是去中心化的，你所看到的一些账户将被托管在你以外的服务器上。 但你可以无缝地与他们交互！他们的服务器在他们的用户名的后半部分！",
   "onboarding.tips.migration": "<strong>您知道吗？</strong> 如果你觉得你喜欢 {domain} 不是您未来的一个伟大的服务器选择。 您可以移动到另一个 Mastodon 服务器而不失去您的关注者。 您甚至可以主持您自己的服务器！",
   "onboarding.tips.verification": "<strong>您知道吗？</strong> 您可以通过在自己的网站上放置一个链接到您的 Mastodon 个人资料并将网站添加到您的个人资料来验证您的帐户。 无需收费或文书工作！",
   "password_confirmation.exceeds_maxlength": "密码确认超过最大密码长度",
diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json
index df754f6d68179a..257bec016311ae 100644
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@@ -21,7 +21,7 @@
   "account.blocked": "已封鎖",
   "account.cancel_follow_request": "收回跟隨請求",
   "account.copy": "複製個人檔案連結",
-  "account.direct": "私訊 @{name}",
+  "account.direct": " @{name}",
   "account.disable_notifications": "取消來自 @{name} 嘟文的通知",
   "account.domain_blocked": "已封鎖網域",
   "account.edit_profile": "編輯個人檔案",
diff --git a/config/locales/activerecord.zh-CN.yml b/config/locales/activerecord.zh-CN.yml
index c510a58d1446cc..1b661266ca1c99 100644
--- a/config/locales/activerecord.zh-CN.yml
+++ b/config/locales/activerecord.zh-CN.yml
@@ -56,4 +56,4 @@ zh-CN:
         webhook:
           attributes:
             events:
-              invalid_permissions: 不能包含您没有权限的事件
+              invalid_permissions: 不能包含你没有权限的事件
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 7ab1b4f075f321..ee05684b6c83ac 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -1824,7 +1824,7 @@ ar:
     keep_pinned: الاحتفاظ بالمنشورات المثبتة
     keep_pinned_hint: لن تحذف أي من منشوراتك المثبتة
     keep_polls: الاحتفاظ باستطلاعات الرأي
-    keep_polls_hint: لم تقم بحذف أي من استطلاعاتك
+    keep_polls_hint: لن يتم حذف أي من استطلاعات الرأي الخاصة بك
     keep_self_bookmark: احتفظ بالمنشورات التي أدرجتها في الفواصل المرجعية
     keep_self_bookmark_hint: لن تحذف منشوراتك الخاصة إذا قمت بوضع علامة مرجعية عليها
     keep_self_fav: احتفظ بالمنشورات التي أدرجتها في المفضلة
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 9a8f32117e98da..8918228f469471 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -25,6 +25,8 @@ ca:
   admin:
     account_actions:
       action: Realitza l'acció
+      already_silenced: Aquest compte ja s'ha silenciat.
+      already_suspended: Aquest compte ja s'ha suspès.
       title: Fer l'acció de moderació a %{acct}
     account_moderation_notes:
       create: Crea nota
@@ -46,6 +48,7 @@ ca:
         title: Canvia l'adreça electrònica de %{username}
       change_role:
         changed_msg: Els privilegis del compte s'han canviat correctament!
+        edit_roles: Gestió de rols d'usuari
         label: Canvia rol
         no_role: Sense rol
         title: Canvia el rol per a %{username}
@@ -585,6 +588,7 @@ ca:
         silence_description_html: El compte només serà visible a qui ja el seguia o l'ha cercat manualment, limitant-ne fortament l'abast. Sempre es pot revertir. Es tancaran tots els informes contra aquest compte.
         suspend_description_html: Aquest compte i tots els seus continguts seran inaccessibles i finalment eliminats, i interaccionar amb ell no serà possible. Reversible en 30 dies. Tanca tots els informes contra aquest compte.
       actions_description_remote_html: Decideix quina acció prendre per a resoldre aquest informe. Això només afectarà com <strong>el teu</strong> servidor es comunica amb aquest compte remot i en gestiona el contingut.
+      actions_no_posts: Aquest informe no té associada cap publicació a esborrar
       add_to_report: Afegir més al informe
       already_suspended_badges:
         local: Ja és suspès en aquest servidor
diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index 492eb8af7ec10e..4a01967e230774 100644
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@@ -33,6 +33,8 @@ cy:
   admin:
     account_actions:
       action: Cyflawni gweithred
+      already_silenced: Mae'r cyfrif hwn eisoes wedi'i dewi.
+      already_suspended: Mae'r cyfrif hwn eisoes wedi'i atal.
       title: Cyflawni gweithred cymedroli ar %{acct}
     account_moderation_notes:
       create: Gadael nodyn
@@ -54,6 +56,7 @@ cy:
         title: Newid e-bost i %{username}
       change_role:
         changed_msg: Rôl wedi ei newid yn llwyddiannus!
+        edit_roles: Rheoli rolau defnyddwyr
         label: Newid rôl
         no_role: Dim rôl
         title: Newid rôl %{username}
@@ -650,6 +653,7 @@ cy:
         suspend_description_html: Bydd y cyfrif a'i holl gynnwys yn anhygyrch ac yn cael ei ddileu yn y pen draw, a bydd rhyngweithio ag ef yn amhosibl. Yn gildroadwy o fewn 30 diwrnod. Yn cau pob adroddiad yn erbyn y cyfrif hwn.
       actions_description_html: Penderfynwch pa gamau i'w cymryd i delio gyda'r adroddiad hwn. Os cymerwch gamau cosbi yn erbyn y cyfrif a adroddwyd, bydd hysbysiad e-bost yn cael ei anfon atyn nhw, ac eithrio pan fydd y categori <strong>Sbam</strong> yn cael ei ddewis.
       actions_description_remote_html: Penderfynwch pa gamau i'w cymryd i ddatrys yr adroddiad hwn. Bydd hyn ond yn effeithio ar sut <strong>mae'ch</strong> gweinydd yn cyfathrebu â'r cyfrif hwn o bell ac yn trin ei gynnwys.
+      actions_no_posts: Nid oes gan yr adroddiad hwn unrhyw bostiadau cysylltiedig i'w dileu
       add_to_report: Ychwanegu rhagor i adroddiad
       already_suspended_badges:
         local: Wedi atal dros dro ar y gweinydd hwn yn barod
@@ -1558,6 +1562,7 @@ cy:
   media_attachments:
     validations:
       images_and_video: Methu atodi fideo i bostiad sydd eisoes yn cynnwys delweddau
+      not_found: Cyfryngau %{ids} heb eu canfod neu wedi'u hatodi i bostiad arall yn barod
       not_ready: Methu atodi ffeiliau nad ydynt wedi gorffen prosesu. Ceisiwch eto, cyn hir!
       too_many: Methu atodi mwy na 4 ffeil
   migrations:
diff --git a/config/locales/da.yml b/config/locales/da.yml
index 1366370eb06745..e3f8343452c829 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -25,6 +25,8 @@ da:
   admin:
     account_actions:
       action: Udfør handling
+      already_silenced: Denne konto er allerede gjort tavs.
+      already_suspended: Denne konto er allerede suspenderet.
       title: Udfør moderatorhandling på %{acct}
     account_moderation_notes:
       create: Skriv notat
@@ -46,6 +48,7 @@ da:
         title: Skift e-mail for %{username}
       change_role:
         changed_msg: Rolle ændret!
+        edit_roles: Håndtér brugerroller
         label: Ændr rolle
         no_role: Ingen rolle
         title: Ændr rolle for %{username}
@@ -602,6 +605,7 @@ da:
         suspend_description_html: Kontoen inkl. alt indhold utilgængeliggøres og interaktion umuliggøres, og den slettes på et tidspunkt. Kan omgøres inden for 30 dage. Lukker alle indrapporteringer af kontoen.
       actions_description_html: Afgør, hvilke foranstaltning, der skal træffes for at løse denne anmeldelse. Ved en straffende foranstaltning mod den anmeldte konto, fremsendes en e-mailnotifikation, undtagen når kategorien <strong>Spam</strong> er valgt.
       actions_description_remote_html: Fastslå en nødvendig handling mhp. at løse denne anmeldelse. Dette vil kun påvirke <strong>din</strong> servers kommunikation med, og indholdshåndtering for, fjernkontoen.
+      actions_no_posts: Denne anmeldelse har ingen tilknyttede indlæg at slette
       add_to_report: Føj mere til anmeldelse
       already_suspended_badges:
         local: Allerede suspenderet på denne server
diff --git a/config/locales/de.yml b/config/locales/de.yml
index e5e3f37a363906..2952d22d7c19d6 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -25,6 +25,8 @@ de:
   admin:
     account_actions:
       action: Aktion ausführen
+      already_silenced: Dieses Konto wurde bereits stummgeschaltet.
+      already_suspended: Dieses Konto wurde bereits gesperrt.
       title: "@%{acct} moderieren"
     account_moderation_notes:
       create: Notiz abspeichern
@@ -46,6 +48,7 @@ de:
         title: E-Mail-Adresse für %{username} ändern
       change_role:
         changed_msg: Rolle erfolgreich geändert!
+        edit_roles: Rollen verwalten
         label: Rolle ändern
         no_role: Keine Rolle
         title: Rolle für %{username} ändern
@@ -602,6 +605,7 @@ de:
         suspend_description_html: Das Konto und alle Inhalte werden unzugänglich und ggf. gelöscht. Eine Interaktion mit dem Konto wird unmöglich. Dies kann innerhalb von 30 Tagen rückgängig gemacht werden. Alle Meldungen zu diesem Konto werden geschlossen.
       actions_description_html: Entscheide, welche Maßnahmen du zum Klären dieser Meldung ergreifen möchtest. Wenn du eine Strafmaßnahme gegen das gemeldete Konto ergreifst, wird eine E-Mail-Benachrichtigung an dieses gesendet, außer wenn die <strong>Spam</strong>-Kategorie ausgewählt ist.
       actions_description_remote_html: Entscheide, welche Maßnahmen du zum Klären dieser Meldung ergreifen möchtest. Dies wirkt sich lediglich darauf aus, wie <strong>dein</strong> Server mit diesem externen Konto kommuniziert und dessen Inhalt handhabt.
+      actions_no_posts: Diese Meldung enthält keine zu löschenden Beiträge
       add_to_report: Meldung ergänzen
       already_suspended_badges:
         local: Auf diesem Server bereits gesperrt
@@ -1454,7 +1458,7 @@ de:
   media_attachments:
     validations:
       images_and_video: Es kann kein Video an einen Beitrag angehängt werden, der bereits Bilder enthält
-      not_found: Medien %{ids} nicht verfügbar oder bereits an einen anderen Beitrag angehängt
+      not_found: Medieninhalt(e) %{ids} nicht gefunden oder bereits an einen anderen Beitrag angehängt
       not_ready: Dateien, die noch nicht verarbeitet wurden, können nicht angehängt werden. Versuche es gleich noch einmal!
       too_many: Mehr als vier Dateien können nicht angehängt werden
   migrations:
diff --git a/config/locales/devise.zh-CN.yml b/config/locales/devise.zh-CN.yml
index 2a50c131d5d63f..86e78c1b18ddf1 100644
--- a/config/locales/devise.zh-CN.yml
+++ b/config/locales/devise.zh-CN.yml
@@ -50,12 +50,12 @@ zh-CN:
       two_factor_disabled:
         explanation: 目前只能通过邮箱地址和密码登录。
         subject: Mastodon：双因素认证已禁用
-        subtitle: 您账户的双因素认证已被停用。
+        subtitle: 你账户的双因素认证已被停用。
         title: 双因素认证已停用
       two_factor_enabled:
         explanation: 登录时需要输入先前配对好的TOTP应用生成的令牌。
         subject: Mastodon：双因素认证已启用
-        subtitle: 您账户的双因素认证已被启用。
+        subtitle: 你账户的双因素认证已被启用。
         title: 双因素认证已启用
       two_factor_recovery_codes_changed:
         explanation: 新恢复码已生成，同时旧恢复码已失效。
@@ -74,13 +74,13 @@ zh-CN:
           subject: Mastodon：安全密钥已删除
           title: 你的安全密钥之一已被删除
       webauthn_disabled:
-        explanation: 您账户的安全密钥身份认证已被停用。
+        explanation: 你账户的安全密钥身份认证已被停用。
         extra: 目前只能用先前配对的TOTP应用生成的令牌登录。
         subject: Mastodon：安全密钥认证已禁用
         title: 安全密钥已禁用
       webauthn_enabled:
-        explanation: 您账户的安全密钥身份认证已被启用。
-        extra: 您的安全密钥现在可用于登录。
+        explanation: 你账户的安全密钥身份认证已被启用。
+        extra: 你的安全密钥现在可用于登录。
         subject: Mastodon：安全密钥认证已启用
         title: 已启用安全密钥
     omniauth_callbacks:
diff --git a/config/locales/doorkeeper.fa.yml b/config/locales/doorkeeper.fa.yml
index c56e76e346286c..0ce7a9591dc21b 100644
--- a/config/locales/doorkeeper.fa.yml
+++ b/config/locales/doorkeeper.fa.yml
@@ -83,6 +83,7 @@ fa:
         access_denied: صاحب منبع یا کارساز تأیید هویت، درخواست را رد کردند.
         credential_flow_not_configured: جریان اعتبارنامهٔ گذرواژهٔ مالک منبع به دلیل پیکربندی نشده بودن Doorkeeper.configure.resource_owner_from_credentials شکست خورد.
         invalid_client: تأیید هویت کارخواه به دلیل کارخواه ناشناخته، عدم وجود تأیید هویت کاره یا روش تأیید هویت پشتیبانی‌نشده شکست خورد.
+        invalid_code_challenge_method: روش چالش کدی باید S256 باشد. متن خام پشتیبانی نمی‌شود.
         invalid_grant: اعطای دسترسی فراهم ‌شده نامعتبر، منقضی یا نامطابق با نشانی بازگشت استفاده‌شده در درخواست تأیید هویت بوده و یا برای کارخواهی دیگر صادر شده است.
         invalid_redirect_uri: نشانی بازگشت موجود، معتبر نیست.
         invalid_request:
@@ -135,6 +136,7 @@ fa:
         media: پیوست‌های رسانه‌ای
         mutes: خموش‌ها
         notifications: آگاهی‌ها
+        profile: نمایهٔ ماستودونتان
         push: آگاهی‌های ارسالی
         reports: گزارش‌ها
         search: جست‌وجو
@@ -165,6 +167,7 @@ fa:
       admin:write:reports: انجام کنش مدیریتی روی گزارش‌ها
       crypto: از رمزگذاری سرتاسر استفاده کنید
       follow: پیگیری، مسدودسازی، لغو مسدودسازی، و لغو پیگیری حساب‌ها
+      profile: فقط خواندن اطّلاعات نمایهٔ حسابتان
       push: دریافت آگاهی‌ای ارسالیتان
       read: خواندن اطلاعات حساب شما
       read:accounts: دیدن اطّلاعات حساب
diff --git a/config/locales/es-AR.yml b/config/locales/es-AR.yml
index ab0dcb58fa38ce..520211e2e2f289 100644
--- a/config/locales/es-AR.yml
+++ b/config/locales/es-AR.yml
@@ -25,6 +25,8 @@ es-AR:
   admin:
     account_actions:
       action: Ejecutar acción
+      already_silenced: Esta cuenta ya ha sido limitada.
+      already_suspended: Esta cuenta ya ha sido suspendida.
       title: Ejecutar acción de moderación en %{acct}
     account_moderation_notes:
       create: Dejar nota
@@ -46,6 +48,7 @@ es-AR:
         title: Cambiar correo electrónico para %{username}
       change_role:
         changed_msg: "¡Rol cambiado exitosamente!"
+        edit_roles: Administrar roles de usuario
         label: Cambiar rol
         no_role: Sin rol
         title: Cambiar rol para %{username}
@@ -602,6 +605,7 @@ es-AR:
         suspend_description_html: La cuenta y todos sus contenidos serán inaccesibles y finalmente eliminados, e interactuar con ella será imposible. Revertible en 30 días. Esto cierra todas las denuncias contra esta cuenta.
       actions_description_html: Decidí qué medidas tomar para resolver esta denuncia. Si tomás una acción punitiva contra la cuenta denunciada, se le enviará a dicha cuenta una notificación por correo electrónico, excepto cuando se seleccione la categoría <strong>Spam</strong>.
       actions_description_remote_html: Decidí qué medidas tomar para resolver esta denuncia. Esto sólo afectará la forma en que <strong>tu servidor</strong> se comunica con esta cuenta remota y maneja su contenido.
+      actions_no_posts: Esta denuncia no tiene ningún mensaje asociado para eliminar
       add_to_report: Agregar más a la denuncia
       already_suspended_badges:
         local: Ya suspendido en este servidor
diff --git a/config/locales/es-MX.yml b/config/locales/es-MX.yml
index 9df6a784de95a1..52e440ffed953d 100644
--- a/config/locales/es-MX.yml
+++ b/config/locales/es-MX.yml
@@ -1454,6 +1454,7 @@ es-MX:
   media_attachments:
     validations:
       images_and_video: No se puede adjuntar un video a un estado que ya contenga imágenes
+      not_found: Archivos multimedia %{ids} no encontrados, o ya se encuentran adjuntos a otra publicación
       not_ready: No se pueden adjuntar archivos que no se han terminado de procesar. ¡Inténtalo de nuevo en un momento!
       too_many: No se pueden adjuntar más de 4 archivos
   migrations:
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 0bbad767e33477..21b900192a634d 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -1454,6 +1454,7 @@ es:
   media_attachments:
     validations:
       images_and_video: No se puede adjuntar un video a unapublicación que ya contenga imágenes
+      not_found: Archivos multimedia %{ids} no encontrados, o ya se encuentran adjuntos a otra publicación
       not_ready: No se pueden adjuntar archivos que no se han terminado de procesar. ¡Inténtalo de nuevo en un momento!
       too_many: No se pueden adjuntar más de 4 archivos
   migrations:
diff --git a/config/locales/et.yml b/config/locales/et.yml
index 17fd41a8e3913b..bbd1b4ab20a5b4 100644
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -25,12 +25,15 @@ et:
   admin:
     account_actions:
       action: Täida tegevus
+      already_silenced: See konto on juba vaigistatud.
+      already_suspended: See konto on juba peatatud.
       title: Rakenda moderaatori tegevus kasutajale %{acct}
     account_moderation_notes:
       create: Jäta teade
       created_msg: Modereerimisteade edukalt koostatud!
       destroyed_msg: Modereerimisteade edukalt kustutatud!
     accounts:
+      add_email_domain_block: Blokeeri e-posti domeen
       approve: Võta vastu
       approved_msg: Kasutaja %{username} liitumisavaldus rahuldatud
       are_you_sure: Oled kindel?
@@ -45,6 +48,7 @@ et:
         title: Muuda e-postiaadressi kasutajale %{username}
       change_role:
         changed_msg: Roll on muudetud!
+        edit_roles: Halda kasutaja rolle
         label: Muuda rolli
         no_role: Roll puudub
         title: "%{username} rolli muutmine"
@@ -57,6 +61,7 @@ et:
       demote: Alanda
       destroyed_msg: "%{username} andmed on nüüd lõpliku kustutamise ootel"
       disable: Lukusta
+      disable_sign_in_token_auth: E-posti võtme abil autentimise väljalülitamine
       disable_two_factor_authentication: Keela 2FA
       disabled: Keelatud
       display_name: Kuvanimi
@@ -65,6 +70,7 @@ et:
       email: E-post
       email_status: E-posti olek
       enable: Luba
+      enable_sign_in_token_auth: Luba e-posti võtme abil autentimine
       enabled: Lubatud
       enabled_msg: Kasutaja %{username} konto taastatud
       followers: Jälgijad
@@ -191,8 +197,10 @@ et:
         destroy_user_role: Rolli kustutamine
         disable_2fa_user: Keela 2FA
         disable_custom_emoji: Keelas kohandatud emotikoni
+        disable_sign_in_token_auth_user: Keela e-posti võtme abil autentimine kasutajale
         disable_user: Keelas kasutaja
         enable_custom_emoji: Lubas kohandatud emotikoni
+        enable_sign_in_token_auth_user: Luba e-posti võtme abil autentimine kasutajale
         enable_user: Lubas kasutaja
         memorialize_account: Igaveselt lahkunuks märkimine
         promote_user: Edendas kasutaja
@@ -243,8 +251,10 @@ et:
         destroy_user_role_html: "%{name} kustutas %{target} rolli"
         disable_2fa_user_html: "%{name} eemaldas kasutaja %{target} kahe etapise nõude"
         disable_custom_emoji_html: "%{name} keelas emotikooni %{target}"
+        disable_sign_in_token_auth_user_html: "%{name} keelas e-posti võtme abil autentimise %{target} jaoks"
         disable_user_html: "%{name} keelas %{target} sisenemise"
         enable_custom_emoji_html: "%{name} lubas emotikooni %{target}"
+        enable_sign_in_token_auth_user_html: "%{name} lubas e-posti võtme abil autentimise %{target} jaoks"
         enable_user_html: "%{name} lubas %{target} sisenemise"
         memorialize_account_html: "%{name} märkis %{target} igaveselt lahkunuks"
         promote_user_html: "%{name} ülendas kasutajat %{target}"
@@ -576,6 +586,7 @@ et:
         silence_description_html: Konto saab olema nähtav ainult senistele jälgijatele või otsestele pöördujatele, mõjutates avalikku levi. On tagasipööratav. Sulgeb kõik konto suhtes esitatud raportid.
         suspend_description_html: See konto ja kogu selle sisu muutub kättesaamatuks ning kustub lõpuks ja igasugune suhtlus sellega muutub võimatuks. Tagasipööratav 30 päeva jooksul. Lõpetab kõik selle konto kohta esitatud kaebused.
       actions_description_remote_html: Otsusta, mida teha selle raporti lahendamiseks. See mõjutab ainult seda, kuidas <strong>Sinu</strong> server selle kaugkontoga suhtleb ning selle sisu käsitleb.
+      actions_no_posts: Selle raportiga pole seotud ühtegi postitust, mida kustutada
       add_to_report: Lisa raportile juurde
       already_suspended_badges:
         local: Juba kustutamisel selles serveris
@@ -769,6 +780,7 @@ et:
       destroyed_msg: Üleslaetud fail edukalt kustutatud!
     software_updates:
       critical_update: Kriitiline — uuenda kiiresti
+      description: Soovitatav on hoida oma Mastodoni paigaldus ajakohasena, et saada kasu viimastest parandustest ja funktsioonidest. Lisaks sellele on mõnikord oluline Mastodoni õigeaegne uuendamine, et vältida turvaprobleeme. Neil põhjustel kontrollib Mastodon uuendusi iga 30 minuti järel ja teavitab vastavalt sinu e-posti teavitamise eelistustele.
       documentation_link: Vaata lisa
       release_notes: Väljalaskemärkused
       title: Saadaval uuendused
@@ -878,10 +890,16 @@ et:
     trends:
       allow: Luba
       approved: Kinnitatud
+      confirm_allow: Oled kindel, et soovid valitud sildid lubada?
+      confirm_disallow: Oled kindel, et soovid valitud sildid keelata?
       disallow: Keela
       links:
         allow: Luba viit
         allow_provider: Luba autor
+        confirm_allow: Oled kindel, et soovid valitud lingid lubada?
+        confirm_allow_provider: Oled kindel, et soovid valitud teenusepakkujad lubada?
+        confirm_disallow: Oled kindel, et soovid valitud lingid keelata?
+        confirm_disallow_provider: Oled kindel, et soovid valitud teenusepakkujad keelata?
         description_html: Need on lingid, mida jagavad praegu paljud kontod, mille postitusi server näeb. See võib aidata kasutajatel teada saada, mis maailmas toimub. Ühtegi linki ei kuvata avalikult enne, kui avaldaja on heakskiidetud. Samuti saab üksikuid linke lubada või tagasi lükata.
         disallow: Keela viit
         disallow_provider: Keela autor
@@ -905,6 +923,10 @@ et:
       statuses:
         allow: Luba postitada
         allow_account: Luba autor
+        confirm_allow: Oled kindel, et soovid valitud olekud lubada?
+        confirm_allow_account: Oled kindel, et soovid valitud kontod lubada?
+        confirm_disallow: Oled kindel, et soovid valitud olekud lubada?
+        confirm_disallow_account: Oled kindel, et soovid valitud kontod keelata?
         description_html: Need on postitused, millest server teab ja mida praegu jagatakse ja mis on hetkel paljude lemmikud. See võib aidata uutel ja naasvatel kasutajatel leida rohkem inimesi, keda jälgida. Ühtegi postitust ei kuvata avalikult enne, kui autor on heaks kiidetud ja autor lubab oma kontot teistele soovitada. Samuti saab üksikuid postitusi lubada või tagasi lükata.
         disallow: Ära luba postitada
         disallow_account: Keela autor
@@ -937,6 +959,7 @@ et:
         used_by_over_week:
           one: Kasutatud ühe kasutaja pool viimase nädala jooksul
           other: Kasutatud %{count} kasutaja poolt viimase nädala jooksul
+      title: Soovitused ja trendid
       trending: Trendid
     warning_presets:
       add_new: Lisa uus
@@ -1021,7 +1044,9 @@ et:
       guide_link_text: Panustada võib igaüks!
     sensitive_content: Tundlik sisu
   application_mailer:
+    notification_preferences: Muuda e-posti eelistusi
     salutation: "%{name}!"
+    settings: 'Muuda e-posti eelistusi: %{link}'
     unsubscribe: Loobu tellimisest
     view: 'Vaade:'
     view_profile: Vaata profiili
@@ -1030,10 +1055,10 @@ et:
     created: Rakenduse loomine õnnestus
     destroyed: Rakenduse kustutamine õnnestus
     logout: Logi välja
-    regenerate_token: Loo uus access token
-    token_regenerated: Access tokeni loomine õnnestus
+    regenerate_token: Loo uus ligipääsuvõti
+    token_regenerated: Ligipääsuvõtme loomine õnnestus
     warning: Ole nende andmetega ettevaatlikud. Ära jaga neid kellegagi!
-    your_token: Su juurdepääsutunnus
+    your_token: Su juurdepääsuvõti
   auth:
     apply_for_account: Konto taotluse esitamine
     captcha_confirmation:
@@ -1041,6 +1066,7 @@ et:
       hint_html: Üks asi veel! Me peame veenduma, et oled inimene (et me saaksime spämmi väljaspoole jätta!). Lahenda allpool olev CAPTCHA ja klõpsa "Jätka".
       title: Turvalisuse kontroll
     confirmations:
+      awaiting_review: Sinu e-posti aadress on kinnitatud! %{domain} meeskond vaatab praegu sinu registreeringut läbi. Saad e-kirja, kui nad konto heaks kiidavad!
       awaiting_review_title: Su registreeringut vaadatakse läbi
       clicking_this_link: klõpsates seda linki
       login_link: logi sisse
@@ -1048,6 +1074,7 @@ et:
       redirect_to_app_html: Sind oleks pidanud suunatama rakendusse <strong>%{app_name}</strong>. Kui seda ei juhtunud, proovi %{clicking_this_link} või naase käsitsi rakendusse.
       registration_complete: Sinu registreering domeenil %{domain} on nüüd valmis!
       welcome_title: Tere tulemast, %{name}!
+      wrong_email_hint: Kui see e-postiaadress pole korrektne, saad seda muuta konto seadetes.
     delete_account: Konto kustutamine
     delete_account_html: Kui soovid oma konto kustutada, siis <a href="%{path}">jätka siit</a>. Pead kustutamise eraldi kinnitama.
     description:
@@ -1068,6 +1095,7 @@ et:
     or_log_in_with: Või logi sisse koos
     privacy_policy_agreement_html: Olen tutvunud <a href="%{privacy_policy_path}" target="_blank">isikuandmete kaitse põhimõtetega</a> ja nõustun nendega
     progress:
+      confirm: E-posti kinnitamine
       details: Sinu üksikasjad
       review: Meie ülevaatamine
       rules: Nõustu reeglitega
@@ -1089,8 +1117,10 @@ et:
     security: Turvalisus
     set_new_password: Uue salasõna määramine
     setup:
+      email_below_hint_html: Kontrolli rämpsposti kausta või taotle uut. Saad oma e-posti aadressi parandada, kui see on vale.
       email_settings_hint_html: Klõpsa linki, mis saadeti sulle, et kinnitada %{email}. Seni me ootame.
       link_not_received: Kas ei saanud linki?
+      new_confirmation_instructions_sent: Saad mõne minuti pärast uue kinnituslingiga e-kirja!
       title: Kontrolli sisendkasti
     sign_in:
       preamble_html: Logi sisse oma <strong>%{domain}</strong> volitustega. Kui konto asub teises serveris, ei saa siin sisse logida.
@@ -1101,7 +1131,9 @@ et:
       title: Loo konto serverisse  %{domain}.
     status:
       account_status: Konto olek
+      confirming: E-posti kinnitamise ootamine.
       functional: Konto on täies mahus kasutatav.
+      pending: Sinu taotlus ootab meie meeskonna läbivaatamist. See võib võtta aega. Kui taotlus on heaks kiidetud, saadetakse sulle e-kiri.
       redirecting_to: See konto pole aktiivne, sest on suunatud aadressile %{acct}.
       self_destruct: Kuna %{domain} on sulgemisel, saad oma kontole vaid piiratud ligipääsu.
       view_strikes: Vaata enda eelnevaid juhtumeid
@@ -1144,6 +1176,9 @@ et:
       before: 'Veendu, et saad aru, mida toob plaanitav muudatus kaasa:'
       caches: Teiste serverite poolt talletatud sisu võib jääda kättesaadavaks
       data_removal: Sinu postitused ning kontoandmed kustutatakse jäädavalt
+      email_change_html: Saad <a href="%{path}">muuta oma e-postiaadressi</a> ilma oma kontot kustutamata
+      email_contact_html: Kui see ikkagi ei saabu, võid abi saamiseks kirjutada <a href="mailto:%{email}">%{email}</a>
+      email_reconfirmation_html: Kui sa ei saa kinnituskirja, saad <a href="%{path}">taotleda seda uuesti</a>
       irreversible: Kustutatud kontot ei saa taastada ega uuesti aktiveerida
       more_details_html: Konto kustutamise kohta loe täpsemalt <a href="%{terms_path}">isikuandmete kaitse põhimõtetest</a>.
       username_available: Kasutajanimi muutub uuesti kasutatavaks
@@ -1376,6 +1411,7 @@ et:
     authentication_methods:
       otp: kaheastmelise autentimise rakendus
       password: salasõna
+      sign_in_token: e-posti turvvakood
       webauthn: turvavõtmed
     description_html: Kui paistab tundmatuid tegevusi, tuleks vahetada salasõna ja aktiveerida kaheastmeline autentimine.
     empty: Autentimisajalugu pole saadaval
@@ -1390,6 +1426,7 @@ et:
   media_attachments:
     validations:
       images_and_video: Ei saa lisada video postitusele, milles on juba pildid
+      not_found: Meedia %{ids} pole leitav või juba teisele postitusele lisatud
       not_ready: Ei saa lisada faile, mida hetkel töödeldakse. Proovi uuesti mõne hetke pärast!
       too_many: Ei saa lisada rohkem, kui 4 faili
   migrations:
@@ -1466,6 +1503,8 @@ et:
     update:
       subject: "%{name} muutis postitust"
   notifications:
+    administration_emails: Admini e-postiteated
+    email_events: Sündmused e-postiteavituste jaoks
     email_events_hint: 'Vali sündmused, mille kohta soovid teavitusi:'
   number:
     human:
@@ -1624,6 +1663,7 @@ et:
     import: Impordi
     import_and_export: Import / eksport
     migrate: Konto kolimine
+    notifications: E-postiteated
     preferences: Eelistused
     profile: Profiil
     relationships: Jälgitud ja jälgijad
@@ -1872,6 +1912,7 @@ et:
     invalid_otp_token: Vale kaheastmeline võti
     otp_lost_help_html: Kui kaotasid ligipääsu mõlemale, saad võtta ühendust %{email}-iga
     rate_limited: Liiga palju autentimise katseid, proovi hiljem uuesti.
+    seamless_external_login: Oled sisse logitud välise teenuse kaudu. Nii pole salasõna ja e-posti seaded saadaval.
     signed_in_as: 'Sisse logitud kasutajana:'
   verification:
     extra_instructions_html: <strong>Soovitus:</strong> Sinu kodulehel olev link võib olla nähtamatu. Oluline osa on <code>rel="me"</code>, mis väldib kasutaja loodud sisuga lehtedel libaisikustamist. Sa saad isegi kasutada lehe HEADER osas silti <code>link</code> sildi <code>a</code> asemel, kuid HTML peab olema kättesaadav ilma JavaScripti käivitamata.
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 8f0c80f1df049c..0c5d5ef9878669 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -25,6 +25,8 @@ fi:
   admin:
     account_actions:
       action: Suorita toimi
+      already_silenced: Tätä tiliä on jo rajoitettu.
+      already_suspended: Tämä tili on jo jäädytetty.
       title: Suorita moderointitoimi käyttäjälle %{acct}
     account_moderation_notes:
       create: Jätä muistiinpano
@@ -46,6 +48,7 @@ fi:
         title: Vaihda käyttäjän %{username} sähköposti-osoite
       change_role:
         changed_msg: Roolin vaihto onnistui!
+        edit_roles: Hallinnoi käyttäjien rooleja
         label: Vaihda rooli
         no_role: Ei roolia
         title: Vaihda käyttäjän %{username} rooli
@@ -442,7 +445,7 @@ fi:
         create: Lisää verkkotunnus
         resolve: Selvitä verkkotunnus
         title: Estä uusi sähköpostiverkkotunnus
-      no_email_domain_block_selected: Sähköpostiverkkotunnusten estoja ei muutettu; yhtäkään ei ollut valittu
+      no_email_domain_block_selected: Sähköpostiverkkotunnusten estoja ei muutettu, koska yhtäkään ei ollut valittuna
       not_permitted: Ei sallittu
       resolved_dns_records_hint_html: Verkkotunnusnimi kytkeytyy seuraaviin MX-verkkotunnuksiin, jotka ovat viime kädessä vastuussa sähköpostin vastaanottamisesta. MX-verkkotunnuksen estäminen estää rekisteröitymisen mistä tahansa sähköpostiosoitteesta, joka käyttää samaa MX-verkkotunnusta, vaikka näkyvä verkkotunnuksen nimi olisikin erilainen. <strong>Varo estämästä suuria sähköpostipalvelujen tarjoajia.</strong>
       resolved_through_html: Ratkaistu verkkotunnuksen %{domain} kautta
@@ -600,8 +603,9 @@ fi:
         resolve_description_html: Ilmoitettua tiliä kohtaan ei ryhdytä toimiin, varoitusta ei kirjata ja raportti suljetaan.
         silence_description_html: Tili näkyy vain niille, jotka jo seuraavat sitä tai etsivät sen manuaalisesti, mikä rajoittaa merkittävästi sen tavoitettavuutta. Voidaan perua milloin vain. Sulkee kaikki tiliin kohdistuvat raportit.
         suspend_description_html: Tili ja mikään sen sisältö eivät ole käytettävissä, ja lopulta ne poistetaan ja vuorovaikutus tilin kanssa on mahdotonta. Peruttavissa 30 päivän ajan. Sulkee kaikki tiliin kohdistuvat raportit.
-      actions_description_html: Päätä, mihin toimiin ryhdyt tämän raportin ratkaisemiseksi. Jos ryhdyt rangaistustoimeen ilmoitettua tiliä kohtaan, hänelle lähetetään sähköpostitse ilmoitus asiasta, paitsi jos valittuna on <strong>Roskaposti</strong>-luokka.
+      actions_description_html: Päätä, mihin toimiin ryhdyt tämän raportin ratkaisemiseksi. Jos ryhdyt rangaistustoimeen raportoitua tiliä kohtaan, hänelle lähetetään sähköpostitse ilmoitus asiasta, paitsi jos valittuna on <strong>Roskaposti</strong>-luokka.
       actions_description_remote_html: Päätä, mihin toimiin ryhdyt tämän raportin ratkaisemiseksi. Tämä vaikuttaa vain siihen, miten <strong>sinun</strong> palvelimesi viestii tämän etätilin kanssa ja käsittelee sen sisältöä.
+      actions_no_posts: Tähän raporttiin ei liity poistettavia julkaisuja
       add_to_report: Lisää raporttiin
       already_suspended_badges:
         local: Jäädytetty jo tällä palvelimella
@@ -1135,7 +1139,7 @@ fi:
     security: Turvallisuus
     set_new_password: Aseta uusi salasana
     setup:
-      email_below_hint_html: Tarkista roskapostikansiosi tai pyydä uusi viesti. Voit myös korjata sähköpostiosoitteesi tarvittaessa.
+      email_below_hint_html: Tarkista roskapostikansiosi tai pyydä uusi viesti. Voit korjata sähköpostiosoitteesi tarvittaessa.
       email_settings_hint_html: Napsauta lähettämäämme linkkiä vahvistaaksesi osoitteen %{email}. Odotamme täällä.
       link_not_received: Etkö saanut linkkiä?
       new_confirmation_instructions_sent: Saat pian uuden vahvistuslinkin sisältävän sähköpostiviestin!
@@ -1195,7 +1199,7 @@ fi:
       caches: Muiden palvelinten välimuistiinsa tallentamaa sisältöä voi säilyä
       data_removal: Julkaisusi ja muut tietosi poistetaan pysyvästi
       email_change_html: Voit <a href="%{path}">muuttaa sähköpostiosoitettasi</a> poistamatta tiliäsi
-      email_contact_html: Mikäli viesti ei vieläkään saavu perille, voit pyytää apua sähköpostitse osoitteella <a href="mailto:%{email}">%{email}</a>
+      email_contact_html: Jos viesti ei vieläkään saavu perille, voit pyytää apua sähköpostitse osoitteella <a href="mailto:%{email}">%{email}</a>
       email_reconfirmation_html: Jos et saa vahvistussähköpostiviestiä, voit <a href="%{path}">pyytää sitä uudelleen</a>
       irreversible: Et voi palauttaa tiliäsi etkä aktivoida sitä uudelleen
       more_details_html: Tarkempia tietoja saat <a href="%{terms_path}">tietosuojakäytännöstämme</a>.
diff --git a/config/locales/fo.yml b/config/locales/fo.yml
index 0c3620ad425460..040e312d785966 100644
--- a/config/locales/fo.yml
+++ b/config/locales/fo.yml
@@ -25,6 +25,8 @@ fo:
   admin:
     account_actions:
       action: Frem atgerð
+      already_silenced: Hendan kontan er longu gjørd kvirr.
+      already_suspended: Hendan kontan er longu ógildað.
       title: Frem umsjónaratgerð á %{acct}
     account_moderation_notes:
       create: Skriva umsjónarviðmerking
@@ -46,6 +48,7 @@ fo:
         title: Broyt teldupostin hjá %{username}
       change_role:
         changed_msg: Leiklutur broyttur!
+        edit_roles: Stýr brúkaraleiklutir
         label: Broyt leiklut
         no_role: Eingin leiklutur
         title: Broyt leiklut hjá %{username}
@@ -602,6 +605,7 @@ fo:
         suspend_description_html: Kontan og alt innihald hjá kontuni gerast óatkomulig og við tíðini strikaði, og tað verður ógjørligt at samvirka við henni. Kann angrast innan 30 dagar. Lukkar allar rapporteringar av hesi kontuni.
       actions_description_html: Ger av hvør atgerð skal takast fyri at avgreiða hesa meldingina. Revsitiltøk móti meldaðu kontuni føra við sær, at ein teldupostfráboðan verður send teimum, undantikið tá <strong>Ruskpostur</strong> verður valdur.
       actions_description_remote_html: Tak avgerð um hvat skal gerast fyri at avgreiða hesa rapporteringina. Hetta fer einans at ávirka, hvussu <strong>tín</strong> ambætari samskiftir við hesa fjarkontuna og hvussu hann handfer tilfar frá henni.
+      actions_no_posts: Hendan fráboðanin hevur ongar viðkomandi postar at strika
       add_to_report: Legg meira afturat meldingini
       already_suspended_badges:
         local: Longu gjørt óvirkin á hesum ambætaranum
diff --git a/config/locales/fr-CA.yml b/config/locales/fr-CA.yml
index 140bc94344b93c..dd1f73c4591fac 100644
--- a/config/locales/fr-CA.yml
+++ b/config/locales/fr-CA.yml
@@ -25,6 +25,8 @@ fr-CA:
   admin:
     account_actions:
       action: Effectuer l'action
+      already_silenced: Ce compte est déjà limité.
+      already_suspended: Ce compte est déjà suspendu.
       title: Effectuer une action de modération sur %{acct}
     account_moderation_notes:
       create: Laisser une remarque
@@ -46,6 +48,7 @@ fr-CA:
         title: Modifier le courriel pour %{username}
       change_role:
         changed_msg: Rôle modifié avec succès !
+        edit_roles: Gérer les rôles d'utilisateur·ices
         label: Modifier le rôle
         no_role: Aucun rôle
         title: Modifier le rôle de %{username}
@@ -188,9 +191,11 @@ fr-CA:
         create_user_role: Créer le rôle
         demote_user: Rétrograder l’utilisateur·ice
         destroy_announcement: Supprimer l’annonce
+        destroy_canonical_email_block: Supprimer le blocage de courriel
         destroy_custom_emoji: Supprimer des émojis personnalisés
         destroy_domain_allow: Supprimer le domaine autorisé
         destroy_domain_block: Supprimer le blocage de domaine
+        destroy_email_domain_block: Supprimer le blocage de domaine de courriel
         destroy_instance: Purge du domaine
         destroy_ip_block: Supprimer la règle IP
         destroy_status: Supprimer le message
@@ -236,6 +241,7 @@ fr-CA:
         confirm_user_html: "%{name} a confirmé l'adresse e-mail de l'utilisateur %{target}"
         create_account_warning_html: "%{name} a envoyé un avertissement à %{target}"
         create_announcement_html: "%{name} a créé une nouvelle annonce %{target}"
+        create_canonical_email_block_html: "%{name} a bloqué l'adresse email avec le hachage %{target}"
         create_custom_emoji_html: "%{name} a téléversé un nouvel émoji %{target}"
         create_domain_allow_html: "%{name} a autorisé la fédération avec le domaine %{target}"
         create_domain_block_html: "%{name} a bloqué le domaine %{target}"
@@ -245,6 +251,7 @@ fr-CA:
         create_user_role_html: "%{name} a créé le rôle %{target}"
         demote_user_html: "%{name} a rétrogradé l'utilisateur·rice %{target}"
         destroy_announcement_html: "%{name} a supprimé l'annonce %{target}"
+        destroy_canonical_email_block_html: "%{name} a débloqué l'adresse email avec le hachage %{target}"
         destroy_custom_emoji_html: "%{name} a supprimé l'émoji %{target}"
         destroy_domain_allow_html: "%{name} a rejeté la fédération avec le domaine %{target}"
         destroy_domain_block_html: "%{name} a débloqué le domaine %{target}"
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 5646877d23c95a..7e30b517a68547 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -25,6 +25,8 @@ fr:
   admin:
     account_actions:
       action: Effectuer l'action
+      already_silenced: Ce compte est déjà limité.
+      already_suspended: Ce compte est déjà suspendu.
       title: Effectuer une action de modération sur %{acct}
     account_moderation_notes:
       create: Laisser une remarque
@@ -46,6 +48,7 @@ fr:
         title: Modifier l’adresse de courriel pour %{username}
       change_role:
         changed_msg: Rôle modifié avec succès !
+        edit_roles: Gérer les rôles d'utilisateur·ices
         label: Modifier le rôle
         no_role: Aucun rôle
         title: Modifier le rôle de %{username}
@@ -188,9 +191,11 @@ fr:
         create_user_role: Créer le rôle
         demote_user: Rétrograder l’utilisateur·ice
         destroy_announcement: Supprimer l’annonce
+        destroy_canonical_email_block: Supprimer le blocage de courriel
         destroy_custom_emoji: Supprimer des émojis personnalisés
         destroy_domain_allow: Supprimer le domaine autorisé
         destroy_domain_block: Supprimer le blocage de domaine
+        destroy_email_domain_block: Supprimer le blocage de domaine de courriel
         destroy_instance: Purge du domaine
         destroy_ip_block: Supprimer la règle IP
         destroy_status: Supprimer le message
@@ -236,6 +241,7 @@ fr:
         confirm_user_html: "%{name} a confirmé l'adresse e-mail de l'utilisateur %{target}"
         create_account_warning_html: "%{name} a envoyé un avertissement à %{target}"
         create_announcement_html: "%{name} a créé une nouvelle annonce %{target}"
+        create_canonical_email_block_html: "%{name} a bloqué l'adresse email avec le hachage %{target}"
         create_custom_emoji_html: "%{name} a téléversé un nouvel émoji %{target}"
         create_domain_allow_html: "%{name} a autorisé la fédération avec le domaine %{target}"
         create_domain_block_html: "%{name} a bloqué le domaine %{target}"
@@ -245,6 +251,7 @@ fr:
         create_user_role_html: "%{name} a créé le rôle %{target}"
         demote_user_html: "%{name} a rétrogradé l'utilisateur·rice %{target}"
         destroy_announcement_html: "%{name} a supprimé l'annonce %{target}"
+        destroy_canonical_email_block_html: "%{name} a débloqué l'adresse email avec le hachage %{target}"
         destroy_custom_emoji_html: "%{name} a supprimé l'émoji %{target}"
         destroy_domain_allow_html: "%{name} a rejeté la fédération avec le domaine %{target}"
         destroy_domain_block_html: "%{name} a débloqué le domaine %{target}"
diff --git a/config/locales/ga.yml b/config/locales/ga.yml
index ad9ee21d3e2032..4ea9cef73dfd1c 100644
--- a/config/locales/ga.yml
+++ b/config/locales/ga.yml
@@ -31,6 +31,8 @@ ga:
   admin:
     account_actions:
       action: Déan gníomh
+      already_silenced: Tá an cuntas seo ina thost cheana féin.
+      already_suspended: Tá an cuntas seo curtha ar fionraí cheana féin.
       title: Dean gníomh modhnóireachta ar %{acct}
     account_moderation_notes:
       create: Fág nóta
@@ -52,6 +54,7 @@ ga:
         title: Athraigh ríomhphost do %{username}
       change_role:
         changed_msg: Athraíodh ról go rathúil!
+        edit_roles: Bainistigh róil úsáideora
         label: Athraigh ról
         no_role: Gan ról
         title: Athraigh ról do %{username}
@@ -638,6 +641,7 @@ ga:
         suspend_description_html: Beidh an cuntas agus a bhfuil ann go léir dorochtana agus scriosfar iad ar deireadh, agus beidh sé dodhéanta idirghníomhú leis. Inchúlaithe laistigh de 30 lá. Dúnann sé gach tuairisc i gcoinne an chuntais seo.
       actions_description_html: Déan cinneadh ar an ngníomh atá le déanamh chun an tuarascáil seo a réiteach. Má dhéanann tú beart pionósach in aghaidh an chuntais tuairiscithe, seolfar fógra ríomhphoist chucu, ach amháin nuair a roghnaítear an chatagóir <strong>Turscar</strong>.
       actions_description_remote_html: Déan cinneadh ar an ngníomh atá le déanamh chun an tuarascáil seo a réiteach. Ní bheidh tionchar aige seo ach ar an gcaoi a ndéanann <strong>do fhreastalaí</strong> cumarsáid leis an gcianchuntas seo agus a láimhseálann sé a ábhar.
+      actions_no_posts: Níl aon phostáil ghaolmhar ag an tuarascáil seo le scriosadh
       add_to_report: Cuir tuilleadh leis an tuairisc
       already_suspended_badges:
         local: Ar fionraí cheana féin ar an bhfreastalaí seo
diff --git a/config/locales/gd.yml b/config/locales/gd.yml
index 2af647ab9c5936..f824e308152cc5 100644
--- a/config/locales/gd.yml
+++ b/config/locales/gd.yml
@@ -29,6 +29,8 @@ gd:
   admin:
     account_actions:
       action: Gabh an gnìomh
+      already_silenced: Chaidh an cunntas seo a chuingeachadh mu thràth.
+      already_suspended: Chaidh an cunntas seo a chur à rèim mu thràth.
       title: Gabh gnìomh maorsainneachd air %{acct}
     account_moderation_notes:
       create: Fàg nòta
@@ -50,6 +52,7 @@ gd:
         title: Atharraich am post-d airson %{username}
       change_role:
         changed_msg: Chaidh an dreuchd atharrachadh!
+        edit_roles: Stiùirich dreuchdan nan cleachdaichean
         label: Atharraich an dreuchd
         no_role: Gun dreuchd
         title: Atharraich an dreuchd aig %{username}
@@ -626,6 +629,7 @@ gd:
         suspend_description_html: Cha ghabh an cunntas seo agus an t-susbaint gu leòr aige inntrigeadh gus an dèid a sguabadh às air deireadh na sgeòil agus cha ghabh eadar-ghabhail a dhèanamh leis. Gabhaidh seo a neo-dhèanamh am broinn 30 latha. Dùinidh seo gach gearan mun chunntas seo.
       actions_description_html: Cuir romhad dè nì thu airson an gearan seo fhuasgladh. Ma chuireas tu peanas air a’ chunntas le gearan air, gheibh iad brath air a’ phost-d mura tagh thu an roinn-seòrsa <strong>Spama</strong>.
       actions_description_remote_html: Cuir romhad dè an gnìomh a ghabhas tu airson an gearan seo fhuasgladh. Cha bheir seo buaidh ach air mar a làimhsicheas am frithealaiche <strong>agadsa</strong> an cunntas cèin seo is mar a nì e conaltradh leis.
+      actions_no_posts: Chan eil post ri sguabadh às ris a’ ghearan seo
       add_to_report: Cuir barrachd ris a’ ghearan
       already_suspended_badges:
         local: Chaidh an cur à rèim air an fhrithealaiche seo mu thràth
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 86010b0665c224..de4840dda1e22b 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -25,6 +25,8 @@ gl:
   admin:
     account_actions:
       action: Executar acción
+      already_silenced: Esta conta xa está silenciada.
+      already_suspended: Esta conta xa está suspendida.
       title: Executar acción de moderación a %{acct}
     account_moderation_notes:
       create: Deixar nota
@@ -46,6 +48,7 @@ gl:
         title: Mudar email de %{username}
       change_role:
         changed_msg: Rol mudado correctamente!
+        edit_roles: Xestionar roles de usuarias
         label: Cambiar rol
         no_role: Sen rol
         title: Cambiar o rol de %{username}
@@ -602,6 +605,7 @@ gl:
         suspend_description_html: A conta e todo o seu contido non serán accesible e finalmente eliminaranse, será imposible interactuar con ela. A decisión é reversible durante 30 días. Isto pecha tódalas denuncias sobre esta conta.
       actions_description_html: Decide a acción a tomar para resolver esta denuncia. Se tomas accións punitivas contra a conta denunciada enviaraselle un correo, excepto se está indicada a categoría <strong>Spam</strong>.
       actions_description_remote_html: Decide a acción a tomar para resolver a denuncia. Isto só lle afecta ao xeito en que o <strong>teu</strong> servidor se comunica con esta conta remota e xestiona o seu contido.
+      actions_no_posts: Esta denuncia non ten publicacións asociadas para eliminar
       add_to_report: Engadir máis á denuncia
       already_suspended_badges:
         local: Xa está suspendida neste servidor
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 2bf138d9be10ad..60fb96a1210925 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -25,6 +25,8 @@ hu:
   admin:
     account_actions:
       action: Művelet végrehajtása
+      already_silenced: Ezt a fiókot már elnémították.
+      already_suspended: Ezt a fiókot már felfüggesztették.
       title: 'Moderálási művelet végrehajtása ezen: %{acct}'
     account_moderation_notes:
       create: Megjegyzés hagyása
@@ -46,6 +48,7 @@ hu:
         title: "%{username} e-mail-címének megváltoztatása"
       change_role:
         changed_msg: A szerep sikeresen megváltoztatva!
+        edit_roles: Felhasználói szerepkörök kezelése
         label: Szerep megváltoztatása
         no_role: Nincs szerep
         title: "%{username} szerepének megváltoztatása"
@@ -602,6 +605,7 @@ hu:
         suspend_description_html: A fiók és minden tartalma elérhetetlenné válik és végül törlésre kerül. A fiókkal kapcsolatbalépni lehetetlen lesz. Ez a művelet 30 napig visszafordítható. A fiók ellen indított minden bejelentést lezárunk.
       actions_description_html: Döntsd el, mit csináljunk, hogy megoldjuk ezt a bejelentést. Ha valamilyen büntető intézkedést hozol a bejelentett fiók ellen, küldünk neki egy figyelmeztetést e-mailben, kivéve ha a <strong>Spam</strong> kategóriát választod.
       actions_description_remote_html: Döntsd el, mit tegyünk a bejelentés lezárásának érdekében. Ez csak azt befolyásolja, hogy a <strong>saját</strong> kiszolgálód hogyan kommunikál ezzel a távoli fiókkal és hogyan kezeli annak tartalmait.
+      actions_no_posts: Ennek a bejelentésnek nincs egyetlen törölhető, társított bejegyzése sem
       add_to_report: Továbbiak hozzáadása a bejelentéshez
       already_suspended_badges:
         local: Már felfüggesztették ezen a szerveren
diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index 5596aacf2dbb60..683edbe7cbd062 100644
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -25,6 +25,8 @@ ia:
   admin:
     account_actions:
       action: Exequer action
+      already_silenced: Iste conto jam ha essite silentiate.
+      already_suspended: Iste conto jam ha essite suspendite.
       title: Exequer action de moderation sur %{acct}
     account_moderation_notes:
       create: Lassar un nota
@@ -46,6 +48,7 @@ ia:
         title: Cambiar e-mail pro %{username}
       change_role:
         changed_msg: Rolo cambiate con successo!
+        edit_roles: Gerer le regulas de usator
         label: Cambiar rolo
         no_role: Necun rolo
         title: Cambiar rolo pro %{username}
@@ -964,6 +967,7 @@ ia:
         used_by_over_week:
           one: Usate per un persona in le ultime septimana
           other: Usate per %{count} personas in le ultime septimana
+      title: Recommendationes e tendentias
       trending: In tendentia
     warning_presets:
       add_new: Adder nove
diff --git a/config/locales/is.yml b/config/locales/is.yml
index 2c73dbae744520..0854d881232bb4 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -25,6 +25,8 @@ is:
   admin:
     account_actions:
       action: Framkvæma aðgerð
+      already_silenced: Þessi aðgangur hefur þegar verið þaggaður.
+      already_suspended: Þessi aðgangur hefur þegar verið settur í frysti.
       title: Framkvæma umsjónaraðgerð á %{acct}
     account_moderation_notes:
       create: Skilja eftir minnispunkt
@@ -46,6 +48,7 @@ is:
         title: Breyta tölvupóstfangi fyrir %{username}
       change_role:
         changed_msg: Tókst að breyta hlutverki!
+        edit_roles: Sýsla með hlutverk notenda
         label: Breyta hlutverki
         no_role: Ekkert hlutverk
         title: Breyta hlutverki fyrir %{username}
@@ -602,6 +605,7 @@ is:
         suspend_description_html: Notandaaðgangurinn og allt efni á honum mun verða óaðgengilegt og á endanum eytt út og samskipti við aðganginn verða ekki möguleg. Hægt að afturkalla innan 30 daga. Lokar öllum kærum gagnvart þessum aðgangi.
       actions_description_html: Ákveddu til hvaða aðgerða eigi að taka til að leysa þessa kæru. Ef þú ákveður að refsa kærða notandaaðgangnum, verður viðkomandi send tilkynning í tölvupósti, nema ef flokkurinn <strong>Ruslpóstur</strong> sé valinn.
       actions_description_remote_html: Ákveddu til hvaða aðgerða eigi að taka til að leysa þessa kæru. Þetta mun aðeins hafa áhrif á hvernig <strong>netþjónninn þinn</strong> meðhöndlar þennan fjartengda aðgang og efnið á honum.
+      actions_no_posts: Þessi kæra er ekki með neinar tengdar færslur til að eyða
       add_to_report: Bæta fleiru í kæru
       already_suspended_badges:
         local: Þegar frystur á þessum netþjóni
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 54e122fd75d966..66a462e61fb990 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -25,6 +25,8 @@ it:
   admin:
     account_actions:
       action: Esegui azione
+      already_silenced: Questo account è già stato silenziato.
+      already_suspended: Questo account è già stato sospeso.
       title: Esegui l'azione di moderazione su %{acct}
     account_moderation_notes:
       create: Lascia una nota
@@ -46,6 +48,7 @@ it:
         title: Cambia l'email per %{username}
       change_role:
         changed_msg: Ruolo modificato correttamente!
+        edit_roles: Gestisci i ruoli utente
         label: Cambia il ruolo
         no_role: Nessun ruolo
         title: Cambia il ruolo per %{username}
@@ -602,6 +605,7 @@ it:
         suspend_description_html: L'account e tutti i suoi contenuti saranno inaccessibili ed eventualmente cancellati, e interagire con esso sarà impossibile. Reversibile entro 30 giorni. Chiude tutte le segnalazioni contro questo account.
       actions_description_html: Decidi quale azione intraprendere per risolvere questa segnalazione. Se intraprendi un'azione punitiva nei confronti dell'account segnalato, gli verrà inviata una notifica via e-mail, tranne quando è selezionata la categoria <strong>Spam</strong>.
       actions_description_remote_html: Decide quali azioni intraprendere per risolvere la relazione. Questo influenzerà solo come <strong>il tuo</strong> server comunica con questo account remoto e ne gestisce il contenuto.
+      actions_no_posts: Questa segnalazione non ha alcun post associato da eliminare
       add_to_report: Aggiungi altro al report
       already_suspended_badges:
         local: Già sospeso su questo server
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index b54707c7cc1fd0..af9173cfc4b79b 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -1428,6 +1428,7 @@ ja:
   media_attachments:
     validations:
       images_and_video: 既に画像が追加されているため、動画を追加することはできません
+      not_found: メディア (%{ids}) が存在しないか、すでに添付して投稿されています
       not_ready: ファイルのアップロードに失敗しました。しばらくしてからもう一度お試しください！
       too_many: 追加できるファイルは4つまでです
   migrations:
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index ef3775d4df7197..9bec26c45095b1 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -23,6 +23,8 @@ ko:
   admin:
     account_actions:
       action: 조치 취하기
+      already_silenced: 이 계정은 이미 침묵되었습니다.
+      already_suspended: 이 계정은 이미 정지되었습니다.
       title: "%{acct} 계정에 중재 취하기"
     account_moderation_notes:
       create: 참고사항 남기기
@@ -44,6 +46,7 @@ ko:
         title: "%{username}의 이메일 바꾸기"
       change_role:
         changed_msg: 역할이 성공적으로 변경되었습니다!
+        edit_roles: 사용자 역할 관리
         label: 역할 변경
         no_role: 역할 없음
         title: "%{username}의 역할 변경"
@@ -592,6 +595,7 @@ ko:
         suspend_description_html: 이 계정과 이 계정의 콘텐츠들은 접근 불가능해지고 삭제될 것이며, 상호작용은 불가능해집니다. 30일 이내에 되돌릴 수 있습니다. 이 계정에 대한 모든 신고를 닫습니다.
       actions_description_html: 이 신고를 해결하기 위해 취해야 할 조치를 지정해주세요. 신고된 계정에 대해 처벌 조치를 취하면, <strong>스팸</strong> 카테고리가 선택된 경우를 제외하고 해당 계정으로 이메일 알림이 전송됩니다.
       actions_description_remote_html: 이 신고를 해결하기 위해 실행할 행동을 결정하세요. 이 결정은 이 원격 계정과 그 콘텐츠를 다루는 방식에 대해 <strong>이 서버</strong>에서만 영향을 끼칩니다
+      actions_no_posts: 이 신고는 삭제할 관련 게시물이 없습니다
       add_to_report: 신고에 더 추가하기
       already_suspended_badges:
         local: 이 서버에서 이미 정지되었습니다
diff --git a/config/locales/lad.yml b/config/locales/lad.yml
index 0de73fd27985e9..5d60e6e9a19698 100644
--- a/config/locales/lad.yml
+++ b/config/locales/lad.yml
@@ -25,6 +25,7 @@ lad:
   admin:
     account_actions:
       action: Realiza aksion
+      already_suspended: Este kuento ya tiene sido suspendido.
       title: Modera %{acct}
     account_moderation_notes:
       create: Kriya nota
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 8c3b8e2e73bed3..0fd71f52ed6423 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -1036,7 +1036,7 @@ lt:
       generic: Nežinoma naršyklė
     current_session: Dabartinis seansas
     date: Data
-    description: "%{browser} ant %{platform}"
+    description: "„%{browser}“ per „%{platform}“"
     explanation: Čia rodomos web naršyklės prijungtos prie Jūsų Mastodon paskyros.
     ip: IP
     platforms:
@@ -1116,6 +1116,7 @@ lt:
       unlisted_long: matyti gali visi, bet nėra išvardyti į viešąsias laiko skales
   statuses_cleanup:
     enabled_hint: Automatiškai ištrina įrašus, kai jie pasiekia nustatytą amžiaus ribą, nebent jie atitinka vieną iš toliau nurodytų išimčių
+    interaction_exceptions_explanation: Atkreipk dėmesį, kad negarantuojama, jog įrašai nebus ištrinti, jei jų mėgstamumo ar pasidalinimo riba bus žemesnė, nors vieną kartą ji jau buvo viršyta.
     keep_polls_hint: Neištrina jokių tavo apklausų
     keep_self_bookmark: Laikyti įrašus, kuriuos pažymėjai
     keep_self_bookmark_hint: Neištrina tavo pačių įrašų, jei esi juos pažymėjęs (-usi)
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 46ed411776a221..725d3915c29655 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -25,6 +25,8 @@ nl:
   admin:
     account_actions:
       action: Actie uitvoeren
+      already_silenced: Dit account is al beperkt.
+      already_suspended: Dit account is al geschorst.
       title: Moderatiemaatregel tegen %{acct} nemen
     account_moderation_notes:
       create: Laat een opmerking achter
@@ -46,6 +48,7 @@ nl:
         title: E-mailadres wijzigen voor %{username}
       change_role:
         changed_msg: Rol succesvol veranderd!
+        edit_roles: Gebruikersrollen beheren
         label: Rol veranderen
         no_role: Geen rol
         title: Rol van %{username} veranderen
@@ -602,6 +605,7 @@ nl:
         suspend_description_html: Het account en de inhoud hiervan is niet meer toegankelijk, en het is ook niet meer mogelijk om ermee interactie te hebben. Uiteindelijk wordt het account volledig verwijderd. Dit is omkeerbaar binnen 30 dagen. Dit sluit alle rapporten tegen dit account af.
       actions_description_html: Beslis welke maatregel moet worden genomen om deze rapportage op te lossen. Wanneer je een (straf)maatregel tegen het gerapporteerde account neemt, krijgt het account een e-mailmelding, behalve wanneer de <strong>spam</strong>-categorie is gekozen.
       actions_description_remote_html: Beslis welke actie moet worden ondernomen om deze rapportage op te lossen. Dit is alleen van invloed op hoe <strong>jouw</strong> server met dit externe account communiceert en de inhoud ervan beheert.
+      actions_no_posts: Dit rapport heeft geen bijbehorende berichten om te verwijderen
       add_to_report: Meer aan de rapportage toevoegen
       already_suspended_badges:
         local: Al geschorst op deze server
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 95746bd10b926b..2a1a0c8d751412 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -29,6 +29,8 @@ pl:
   admin:
     account_actions:
       action: Wykonaj działanie
+      already_silenced: To konto zostało już wyciszone.
+      already_suspended: To konto zostało już zawieszone.
       title: Wykonaj działanie moderacyjne na %{acct}
     account_moderation_notes:
       create: Pozostaw notatkę
@@ -50,6 +52,7 @@ pl:
         title: Zmień adres e-mail dla %{username}
       change_role:
         changed_msg: Pomyślnie zmieniono rolę!
+        edit_roles: Zarządzaj rolami użytkowników
         label: Zmień rolę
         no_role: Brak roli
         title: Zmień rolę dla %{username}
@@ -626,6 +629,7 @@ pl:
         suspend_description_html: Konto i cała jego zawartość będą niedostępne i ostatecznie usunięte, a interakcja z nim będzie niemożliwa. Możliwość odwrócenia w ciągu 30 dni. Zamyka wszelkie zgłoszenia dotyczące tego konta.
       actions_description_html: Zdecyduj, jakie działania należy podjąć, aby rozstrzygnąć niniejsze zgłoszenie. Jeśli podejmiesz działania karne przeciwko zgłoszonemu kontowi, zostanie do nich wysłane powiadomienie e-mail, chyba że wybrano kategorię <strong>Spam</strong>.
       actions_description_remote_html: Zdecyduj, jakie działanie należy podjąć, aby rozwiązać to zgłoszenie. Będzie to miało wpływ jedynie na sposób, w jaki <strong>Twój</strong> serwer komunikuje się z tym kontem zdalnym i obsługuje jego zawartość.
+      actions_no_posts: Ten raport nie ma żadnych powiązanych wpisów do usunięcia
       add_to_report: Dodaj więcej do zgłoszenia
       already_suspended_badges:
         local: Już zawieszono na tym serwerze
diff --git a/config/locales/simple_form.an.yml b/config/locales/simple_form.an.yml
index 7119aadba252f7..c59391f55215a5 100644
--- a/config/locales/simple_form.an.yml
+++ b/config/locales/simple_form.an.yml
@@ -108,7 +108,6 @@ an:
         name: Nomás se puede cambiar lo cajón d'as letras, per eixemplo, pa que sía mas leyible
       user:
         chosen_languages: Quan se marca, nomás s'amostrarán las publicacions en os idiomas triaus en as linias de tiempo publicas
-        role: Lo rol controla qué permisos tiene la usuaria
       user_role:
         color: Color que s'utilizará pa lo rol a lo largo d'a interficie d'usuario, como RGB en formato hexadecimal
         highlighted: Esto fa que lo rol sía publicament visible
diff --git a/config/locales/simple_form.ar.yml b/config/locales/simple_form.ar.yml
index 81be19a44e7b8a..0a665fb784d415 100644
--- a/config/locales/simple_form.ar.yml
+++ b/config/locales/simple_form.ar.yml
@@ -130,7 +130,6 @@ ar:
         name: يمكنك فقط تغيير غلاف الحروف ، على سبيل المثال ، لجعلها أكثر قابلية للقراءة
       user:
         chosen_languages: إن تم اختيارها، فلن تظهر على الخيوط العامة إلّا الرسائل المنشورة في تلك اللغات
-        role: الوظيفة تتحكم في الصلاحيات التي يملكها المستخدم
       user_role:
         color: اللون الذي سيتم استخدامه للوظيفه في جميع وحدات واجهة المستخدم، كـ RGB بتنسيق hex
         highlighted: وهذا يجعل الوظيفه مرئيا علنا
diff --git a/config/locales/simple_form.be.yml b/config/locales/simple_form.be.yml
index a50db22987a000..db6a94f8eb2c48 100644
--- a/config/locales/simple_form.be.yml
+++ b/config/locales/simple_form.be.yml
@@ -130,7 +130,6 @@ be:
         name: Вы можаце змяняць толькі рэгістр літар, напрыклад для таго, каб падвысіць чытабельнасць
       user:
         chosen_languages: У публічных стужках будуць паказвацца допісы толькі на тых мовах, якія вы пазначыце
-        role: Гэтая роля кантралюе дазволы, якія мае карыстальнік
       user_role:
         color: Колер, які будзе выкарыстоўвацца для гэтай ролі па ўсім UI, у фармаце RGB ці hex
         highlighted: Гэта робіць ролю публічна бачнай
diff --git a/config/locales/simple_form.bg.yml b/config/locales/simple_form.bg.yml
index 333ab25c825490..a2cf8e4222543a 100644
--- a/config/locales/simple_form.bg.yml
+++ b/config/locales/simple_form.bg.yml
@@ -130,7 +130,6 @@ bg:
         name: Можете да смените само употребата на големи/малки букви, например, за да е по-четимо
       user:
         chosen_languages: Само публикации на отметнатите езици ще се показват в публичните часови оси
-        role: Ролите управляват какви права има потребителят
       user_role:
         color: Цветът, използван за ролите в потребителския интерфейс, като RGB в шестнадесетичен формат
         highlighted: Това прави ролята обществено видима
diff --git a/config/locales/simple_form.ca.yml b/config/locales/simple_form.ca.yml
index 4daf657234bb73..c628bebaad79fd 100644
--- a/config/locales/simple_form.ca.yml
+++ b/config/locales/simple_form.ca.yml
@@ -130,7 +130,7 @@ ca:
         name: Només pots canviar la caixa de les lletres, per exemple, per fer-la més llegible
       user:
         chosen_languages: Quan estigui marcat, només es mostraran els tuts de les llengües seleccionades en les línies de temps públiques
-        role: El rol controla quines permissions té l'usuari
+        role: El rol controla quins permisos té l'usuari.
       user_role:
         color: Color que s'usarà per al rol a tota la interfície d'usuari, com a RGB en format hexadecimal
         highlighted: Això fa el rol visible públicament
diff --git a/config/locales/simple_form.cs.yml b/config/locales/simple_form.cs.yml
index 2fe08e698aec11..6242b1ca6e657c 100644
--- a/config/locales/simple_form.cs.yml
+++ b/config/locales/simple_form.cs.yml
@@ -130,7 +130,6 @@ cs:
         name: Můžete měnit pouze velikost písmen, například kvůli lepší čitelnosti
       user:
         chosen_languages: Po zaškrtnutí budou ve veřejných časových osách zobrazeny pouze příspěvky ve zvolených jazycích
-        role: Role určuje, která oprávnění má uživatel
       user_role:
         color: Barva, která má být použita pro roli v celém UI, jako RGB v hex formátu
         highlighted: Toto roli učiní veřejně viditelnou
diff --git a/config/locales/simple_form.cy.yml b/config/locales/simple_form.cy.yml
index 22545a776a664e..56586ecc968a11 100644
--- a/config/locales/simple_form.cy.yml
+++ b/config/locales/simple_form.cy.yml
@@ -130,7 +130,7 @@ cy:
         name: Dim ond er mwyn ei gwneud yn fwy darllenadwy y gallwch chi newid y llythrennau, er enghraifft
       user:
         chosen_languages: Wedi eu dewis, dim ond tŵtiau yn yr ieithoedd hyn bydd yn cael eu harddangos mewn ffrydiau cyhoeddus
-        role: Mae'r rôl yn rheoli pa ganiatâd sydd gan y defnyddiwr
+        role: Mae'r rôl yn rheoli pa ganiatâd sydd gan y defnyddiwr.
       user_role:
         color: Lliw i'w ddefnyddio ar gyfer y rôl drwy'r UI, fel RGB mewn fformat hecs
         highlighted: Mae hyn yn gwneud y rôl yn weladwy i'r cyhoedd
diff --git a/config/locales/simple_form.da.yml b/config/locales/simple_form.da.yml
index 5763885ac4b5cd..8bacdc46c330e7 100644
--- a/config/locales/simple_form.da.yml
+++ b/config/locales/simple_form.da.yml
@@ -130,7 +130,7 @@ da:
         name: Kun bogstavtyper (store/små) kan ændres, eksempelvis for at gøre det mere læsbart
       user:
         chosen_languages: Når markeret, vil kun indlæg på de valgte sprog fremgå på offentlige tidslinjer
-        role: Rollen styrer, hvilke tilladelser brugeren har
+        role: Rollen styrer, hvilke tilladelser brugeren er tildelt.
       user_role:
         color: Farven, i RGB hex-format, der skal bruges til rollen i hele UI'en
         highlighted: Dette gør rollen offentligt synlig
diff --git a/config/locales/simple_form.de.yml b/config/locales/simple_form.de.yml
index fb7bda94896089..ddb6621aa6ce74 100644
--- a/config/locales/simple_form.de.yml
+++ b/config/locales/simple_form.de.yml
@@ -130,7 +130,7 @@ de:
         name: Du kannst nur die Groß- und Kleinschreibung der Buchstaben ändern, um es z. B. lesbarer zu machen
       user:
         chosen_languages: Wenn du hier eine oder mehrere Sprachen auswählst, werden ausschließlich Beiträge in diesen Sprachen in deinen öffentlichen Timelines angezeigt
-        role: Die Rolle legt fest, welche Berechtigungen das Konto hat
+        role: Die Rolle bestimmt, welche Berechtigungen das Konto hat.
       user_role:
         color: Farbe, die für diese Rolle in der gesamten Benutzerschnittstelle verwendet wird, als RGB im Hexadezimalsystem
         highlighted: Dies macht die Rolle öffentlich im Profil sichtbar
diff --git a/config/locales/simple_form.el.yml b/config/locales/simple_form.el.yml
index af93f65fecd76e..88c1c0e184312d 100644
--- a/config/locales/simple_form.el.yml
+++ b/config/locales/simple_form.el.yml
@@ -111,7 +111,6 @@ el:
         name: Μπορείς να αλλάξεις μόνο το πλαίσιο των χαρακτήρων, για παράδειγμα για να γίνει περισσότερο ευανάγνωστο
       user:
         chosen_languages: Όταν ενεργοποιηθεί, στη δημόσια ροή θα εμφανίζονται τουτ μόνο από τις επιλεγμένες γλώσσες
-        role: Ο ρόλος ελέγχει ποια δικαιώματα έχει ο χρήστης
       user_role:
         color: Το χρώμα που θα χρησιμοποιηθεί για το ρόλο σε ολόκληρη τη διεπαφή, ως RGB σε δεκαεξαδική μορφή
         highlighted: Αυτό καθιστά το ρόλο δημόσια ορατό
diff --git a/config/locales/simple_form.en-GB.yml b/config/locales/simple_form.en-GB.yml
index 2f40feb5ed6bdf..18776d67d6fd64 100644
--- a/config/locales/simple_form.en-GB.yml
+++ b/config/locales/simple_form.en-GB.yml
@@ -130,7 +130,6 @@ en-GB:
         name: You can only change the casing of the letters, for example, to make it more readable
       user:
         chosen_languages: When checked, only posts in selected languages will be displayed in public timelines
-        role: The role controls which permissions the user has
       user_role:
         color: Color to be used for the role throughout the UI, as RGB in hex format
         highlighted: This makes the role publicly visible
diff --git a/config/locales/simple_form.eo.yml b/config/locales/simple_form.eo.yml
index 3b51c1590867ef..053816ef881c06 100644
--- a/config/locales/simple_form.eo.yml
+++ b/config/locales/simple_form.eo.yml
@@ -122,7 +122,6 @@ eo:
         name: Vi povas ŝanĝi nur la majuskladon de la literoj, ekzemple, por igi ĝin pli legebla
       user:
         chosen_languages: Kun tio markita nur mesaĝoj en elektitaj lingvoj aperos en publikaj tempolinioj
-        role: La rolregiloj kies permesojn la uzanto havas
       user_role:
         color: Koloro uzita por la rolo sur la UI, kun RGB-formato
         highlighted: Ĉi tio igi la rolon publike videbla
diff --git a/config/locales/simple_form.es-AR.yml b/config/locales/simple_form.es-AR.yml
index e26af5b0c60ea4..70573c75f4b6e8 100644
--- a/config/locales/simple_form.es-AR.yml
+++ b/config/locales/simple_form.es-AR.yml
@@ -130,7 +130,7 @@ es-AR:
         name: Sólo podés cambiar la capitalización de las letras, por ejemplo, para que sea más legible
       user:
         chosen_languages: Cuando estén marcados, sólo se mostrarán los mensajes en los idiomas seleccionados en las líneas temporales públicas
-        role: El rol controla qué permisos tiene el usuario
+        role: El rol controla qué permisos tiene el usuario.
       user_role:
         color: Color que se utilizará para el rol a lo largo de la interface de usuario, como RGB en formato hexadecimal
         highlighted: Esto hace que el rol sea públicamente visible
diff --git a/config/locales/simple_form.es-MX.yml b/config/locales/simple_form.es-MX.yml
index 733a5c2769635b..ff66bcb59e081c 100644
--- a/config/locales/simple_form.es-MX.yml
+++ b/config/locales/simple_form.es-MX.yml
@@ -130,7 +130,6 @@ es-MX:
         name: Sólo se puede cambiar el cajón de las letras, por ejemplo, para que sea más legible
       user:
         chosen_languages: Cuando se marca, solo se mostrarán los toots en los idiomas seleccionados en los timelines públicos
-        role: El rol controla qué permisos tiene el usuario
       user_role:
         color: Color que se utilizará para el rol a lo largo de la interfaz de usuario, como RGB en formato hexadecimal
         highlighted: Esto hace que el rol sea públicamente visible
diff --git a/config/locales/simple_form.es.yml b/config/locales/simple_form.es.yml
index 02f0562d28457f..143c5d80756f9e 100644
--- a/config/locales/simple_form.es.yml
+++ b/config/locales/simple_form.es.yml
@@ -130,7 +130,6 @@ es:
         name: Sólo se puede cambiar el cajón de las letras, por ejemplo, para que sea más legible
       user:
         chosen_languages: Cuando se marca, solo se mostrarán las publicaciones en los idiomas seleccionados en las líneas de tiempo públicas
-        role: El rol controla qué permisos tiene el usuario
       user_role:
         color: Color que se utilizará para el rol a lo largo de la interfaz de usuario, como RGB en formato hexadecimal
         highlighted: Esto hace que el rol sea públicamente visible
diff --git a/config/locales/simple_form.et.yml b/config/locales/simple_form.et.yml
index 9fd9e238aaea55..4a9245682d4f05 100644
--- a/config/locales/simple_form.et.yml
+++ b/config/locales/simple_form.et.yml
@@ -130,7 +130,7 @@ et:
         name: Saad muuta ainult tähtede suurtähelisust, näiteks selleks, et muuta seda loetavamaks
       user:
         chosen_languages: Keelte valimisel näidatakse avalikel ajajoontel ainult neis keeltes postitusi
-        role: See roll kontrollib, millised õigused kasutajal on
+        role: Rollid määravad, millised õigused kasutajal on.
       user_role:
         color: Rolli tähistamise värvus üle kasutajaliidese, RGB 16nd-formaadis
         highlighted: Teeb rolli avalikult nähtavaks
diff --git a/config/locales/simple_form.eu.yml b/config/locales/simple_form.eu.yml
index c7e2667cad0111..7647e187ecac0a 100644
--- a/config/locales/simple_form.eu.yml
+++ b/config/locales/simple_form.eu.yml
@@ -130,7 +130,6 @@ eu:
         name: Letrak maiuskula/minuskulara aldatu ditzakezu besterik ez, adibidez irakurterrazago egiteko
       user:
         chosen_languages: Markatzean, hautatutako hizkuntzetan dauden tutak besterik ez dira erakutsiko.
-        role: Rolak erabiltzaileak dituen baimenak kontrolatzen ditu
       user_role:
         color: Rolarentzat erabiltzaile interfazean erabiliko den kolorea, formatu hamaseitarreko RGB bezala
         highlighted: Honek rola publikoki ikusgai jartzen du
diff --git a/config/locales/simple_form.fa.yml b/config/locales/simple_form.fa.yml
index 0610f7fced987f..bbb0523b174738 100644
--- a/config/locales/simple_form.fa.yml
+++ b/config/locales/simple_form.fa.yml
@@ -188,6 +188,7 @@ fa:
         setting_default_privacy: حریم خصوصی نوشته‌ها
         setting_default_sensitive: همیشه تصاویر را به عنوان حساس علامت بزن
         setting_delete_modal: نمایش پیغام تأیید پیش از پاک کردن یک نوشته
+        setting_disable_hover_cards: از کار انداختن پیش‌نمایش نمایه هنگام رفتن رویش
         setting_disable_swiping: از کار انداختن حرکت‌های کشیدنی
         setting_display_media: نمایش عکس و ویدیو
         setting_display_media_default: پیش‌فرض
@@ -219,6 +220,7 @@ fa:
           warn: نهفتن با هشدار
       form_admin_settings:
         activity_api_enabled: انتشار آمار تجمیعی دربارهٔ فعالیت کاربران در API
+        app_icon: نقشک کاره
         backups_retention_period: دورهٔ نگه‌داری بایگانی کاربری
         bootstrap_timeline_accounts: پیشنهاد همیشگی این حساب‌ها به کاربران جدید
         closed_registrations_message: پیام سفارشی هنگام در دسترس نبودن ثبت‌نام‌ها
@@ -278,6 +280,7 @@ fa:
           patch: آگاهی برای به‌روز رسانی‌های رفع اشکال
         trending_tag: روند جدیدی نیازمند بازبینی است
       rule:
+        hint: اطّلاعات اضافی
         text: قانون
       settings:
         indexable: بودن صفحهٔ نمایه در نتیجه‌های جست‌وجو
@@ -286,6 +289,7 @@ fa:
         listable: اجازه به این برچسب برای ظاهر شدن در جست‌وجوها و پیشنهادها
         name: برچسب
         trendable: بگذارید که این برچسب در موضوعات پرطرفدار دیده شود
+        usable: اجازه به فرسته‌ها برای استفتاده از این برچسب به صورت محلی
       user:
         role: نقش
         time_zone: منطقهٔ زمانی
diff --git a/config/locales/simple_form.fi.yml b/config/locales/simple_form.fi.yml
index c20ff9fa5f57f0..d3f0628631f22e 100644
--- a/config/locales/simple_form.fi.yml
+++ b/config/locales/simple_form.fi.yml
@@ -130,7 +130,7 @@ fi:
         name: Voit esimerkiksi vaihtaa suur- ja pienaakkosten kesken helppolukuistaaksesi tekstiäsi
       user:
         chosen_languages: Jos valitset kieliä oheisesta luettelosta, vain niidenkieliset julkaisut näkyvät sinulle julkisilla aikajanoilla
-        role: Rooli vaikuttaa käyttäjän käyttöoikeuksiin
+        role: Rooli määrää, millaiset käyttöoikeudet käyttäjällä on.
       user_role:
         color: Väri, jota käytetään roolille kaikkialla käyttöliittymässä, RGB-heksadesimaalimuodossa
         highlighted: Tämä tekee roolista julkisesti näkyvän
diff --git a/config/locales/simple_form.fo.yml b/config/locales/simple_form.fo.yml
index ecd8402680dfa5..35e42f6c741f20 100644
--- a/config/locales/simple_form.fo.yml
+++ b/config/locales/simple_form.fo.yml
@@ -130,7 +130,7 @@ fo:
         name: Tú kanst einans broyta millum stórar og smáar stavir, til dømis fyri at gera tað meira lesiligt
       user:
         chosen_languages: Tá hetta er valt, verða einans postar í valdum málum vístir á almennum tíðarlinjum
-        role: Leikluturin stýrir, hvørji loyvir brúkarin hevur
+        role: Leikluturin stýrir hvørji rættindi, brúkarin hevur.
       user_role:
         color: Litur, sum leikluturin hevur í øllum brúkaramarkamótinum, sum RGB og upplýst sum sekstandatal
         highlighted: Hetta ger, at leikluturin er alment sjónligur
diff --git a/config/locales/simple_form.fr-CA.yml b/config/locales/simple_form.fr-CA.yml
index 640d7e344a64c6..1128335f11c41d 100644
--- a/config/locales/simple_form.fr-CA.yml
+++ b/config/locales/simple_form.fr-CA.yml
@@ -128,7 +128,7 @@ fr-CA:
         name: Vous ne pouvez modifier que la casse des lettres, par exemple, pour le rendre plus lisible
       user:
         chosen_languages: Lorsque coché, seuls les messages dans les langues sélectionnées seront affichés sur les fils publics
-        role: Le rôle définit quelles autorisations a l'utilisateur⋅rice
+        role: Le rôle définit quelles autorisations a l'utilisateur⋅rice.
       user_role:
         color: Couleur à attribuer au rôle dans l'interface, au format hexadécimal RVB
         highlighted: Cela rend le rôle visible publiquement
diff --git a/config/locales/simple_form.fr.yml b/config/locales/simple_form.fr.yml
index 04d48573a3ddb8..c06453298468b7 100644
--- a/config/locales/simple_form.fr.yml
+++ b/config/locales/simple_form.fr.yml
@@ -128,7 +128,7 @@ fr:
         name: Vous ne pouvez modifier que la casse des lettres, par exemple, pour le rendre plus lisible
       user:
         chosen_languages: Lorsque coché, seuls les messages dans les langues sélectionnées seront affichés sur les fils publics
-        role: Le rôle définit quelles autorisations a l'utilisateur⋅rice
+        role: Le rôle définit quelles autorisations a l'utilisateur⋅rice.
       user_role:
         color: Couleur à attribuer au rôle dans l'interface, au format hexadécimal RVB
         highlighted: Cela rend le rôle visible publiquement
diff --git a/config/locales/simple_form.fy.yml b/config/locales/simple_form.fy.yml
index e6c1b0ee82d544..e7deca9460c98f 100644
--- a/config/locales/simple_form.fy.yml
+++ b/config/locales/simple_form.fy.yml
@@ -130,7 +130,6 @@ 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
diff --git a/config/locales/simple_form.ga.yml b/config/locales/simple_form.ga.yml
index 15ea3094b2ff7a..7c125b165a0cd4 100644
--- a/config/locales/simple_form.ga.yml
+++ b/config/locales/simple_form.ga.yml
@@ -130,7 +130,7 @@ ga:
         name: Ní féidir leat ach cásáil na litreacha a athrú, mar shampla, chun é a dhéanamh níos inléite
       user:
         chosen_languages: Nuair a dhéantar iad a sheiceáil, ní thaispeánfar ach postálacha i dteangacha roghnaithe in amlínte poiblí
-        role: Rialaíonn an ról na ceadanna atá ag an úsáideoir
+        role: Rialaíonn an ról na ceadanna atá ag an úsáideoir.
       user_role:
         color: Dath le húsáid don ról ar fud an Chomhéadain, mar RGB i bhformáid heicsidheachúlach
         highlighted: Déanann sé seo an ról le feiceáil go poiblí
diff --git a/config/locales/simple_form.gd.yml b/config/locales/simple_form.gd.yml
index 4375feb492b696..9b6c156de79c94 100644
--- a/config/locales/simple_form.gd.yml
+++ b/config/locales/simple_form.gd.yml
@@ -130,7 +130,7 @@ gd:
         name: Mar eisimpleir, ’s urrainn dhut measgachadh de litrichean mòra ’s beaga a chleachdadh ach an gabh a leughadh nas fhasa
       user:
         chosen_languages: Nuair a bhios cromag ris, cha nochd ach postaichean sna cànain a thagh thu air loidhnichean-ama poblach
-        role: Stiùiridh an dreuchd dè na ceadan a bhios aig cleachdaiche
+        role: Stiùiridh an dreuchd dè na ceadan a bhios aig cleachdaiche.
       user_role:
         color: An datha a bhios air an dreuchd air feadh na h-eadar-aghaidh, ’na RGB san fhòrmat sia-dheicheach
         highlighted: Le seo, chithear an dreuchd gu poblach
diff --git a/config/locales/simple_form.gl.yml b/config/locales/simple_form.gl.yml
index aff8a95f0dc8ff..abb30fa48c0c80 100644
--- a/config/locales/simple_form.gl.yml
+++ b/config/locales/simple_form.gl.yml
@@ -130,7 +130,7 @@ gl:
         name: Só podes cambiar maiús/minúsculas, por exemplo, mellorar a lexibilidade
       user:
         chosen_languages: Se ten marca, só as publicacións nos idiomas seleccionados serán mostrados en cronoloxías públicas
-        role: O control dos roles adxudicados ás usuarias
+        role: Os roles establecen os permisos que ten a usuaria.
       user_role:
         color: Cor que se usará para o rol a través da IU, como RGB en formato hex
         highlighted: Isto fai o rol publicamente visible
diff --git a/config/locales/simple_form.he.yml b/config/locales/simple_form.he.yml
index 9e2becc52f2bea..f595a319979aa3 100644
--- a/config/locales/simple_form.he.yml
+++ b/config/locales/simple_form.he.yml
@@ -130,7 +130,6 @@ he:
         name: ניתן רק להחליף בין אותיות קטנות וגדולות, למשל כדי לשפר את הקריאות
       user:
         chosen_languages: אם פעיל, רק הודעות בשפות הנבחרות יוצגו לפידים הפומביים
-        role: התפקיד שולט על אילו הרשאות יש למשתמש
       user_role:
         color: צבע לתפקיד בממשק המשתמש, כ RGB בפורמט הקסדצימלי
         highlighted: מאפשר נראות ציבורית של התפקיד
diff --git a/config/locales/simple_form.hu.yml b/config/locales/simple_form.hu.yml
index 512e13d3af8c13..545fd4a8e91fd0 100644
--- a/config/locales/simple_form.hu.yml
+++ b/config/locales/simple_form.hu.yml
@@ -130,7 +130,7 @@ hu:
         name: Csak a kis/nagybetűséget változtathatod meg, pl. hogy olvashatóbb legyen
       user:
         chosen_languages: Ha aktív, csak a kiválasztott nyelvű bejegyzések jelennek majd meg a nyilvános idővonalon
-        role: A szerep szabályozza, hogy a felhasználó milyen jogosultságokkal rendelkezik
+        role: A szerep szabályozza, hogy a felhasználó milyen jogosultságokkal rendelkezik.
       user_role:
         color: A szerephez használandó szín mindenhol a felhasználói felületen, hexa RGB formátumban
         highlighted: Ez nyilvánosan láthatóvá teszi a szerepet
diff --git a/config/locales/simple_form.ia.yml b/config/locales/simple_form.ia.yml
index 76990527a0b0c9..85fa74f1edd960 100644
--- a/config/locales/simple_form.ia.yml
+++ b/config/locales/simple_form.ia.yml
@@ -130,7 +130,6 @@ ia:
         name: Tu pote solmente cambiar le litteras inter majusculas e minusculas, per exemplo, pro render lo plus legibile
       user:
         chosen_languages: Si marcate, solo le messages in le linguas seligite sera monstrate in chronologias public
-        role: Le rolo controla que permissos ha le usator
       user_role:
         color: Color a esser usate pro le rolo in omne parte del UI, como RGB in formato hexadecimal
         highlighted: Iste rende le rolo publicamente visibile
diff --git a/config/locales/simple_form.id.yml b/config/locales/simple_form.id.yml
index 99f4372cc15e20..0bc98874eb793f 100644
--- a/config/locales/simple_form.id.yml
+++ b/config/locales/simple_form.id.yml
@@ -107,7 +107,6 @@ id:
         name: Anda hanya dapat mengubahnya ke huruf kecil/besar, misalnya, agar lebih mudah dibaca
       user:
         chosen_languages: Ketika dicentang, hanya toot dalam bahasa yang dipilih yang akan ditampilkan di linimasa publik
-        role: Peran mengatur izin apa yang dimiliki pengguna
       user_role:
         color: Warna yang digunakan untuk peran di antarmuka pengguna, sebagai RGB dalam format hex
         highlighted: Ini membuat peran terlihat secara publik
diff --git a/config/locales/simple_form.ie.yml b/config/locales/simple_form.ie.yml
index 0828139a4304ba..771e34161615f8 100644
--- a/config/locales/simple_form.ie.yml
+++ b/config/locales/simple_form.ie.yml
@@ -130,7 +130,6 @@ ie:
         name: Tu posse changear solmen li minu/majusculitá del lítteres, por exemple, por far it plu leibil
       user:
         chosen_languages: Quande selectet, solmen postas in ti lingues va esser monstrat in public témpor-lineas
-        role: Permissiones de usator decidet per su rol
       user_role:
         color: Color a usar por li rol tra li UI, quam RGB (rubi-verdi-blu) in formate hex
         highlighted: Va far li rol publicmen visibil
diff --git a/config/locales/simple_form.io.yml b/config/locales/simple_form.io.yml
index 4de7475b2e8958..fe8243b0e9fb57 100644
--- a/config/locales/simple_form.io.yml
+++ b/config/locales/simple_form.io.yml
@@ -122,7 +122,6 @@ io:
         name: Vu povas nur chanjar literkaso, por exemplo, por kauzigar lu divenar plu lektebla
       user:
         chosen_languages: Kande marketigesis, nur posti en selektesis lingui montresos en publika tempolinei
-        role: Rolo dominacas permisi quon uzanto havas
       user_role:
         color: Koloro quo uzesas por rolo en tota UI, quale RGB kun hexformato
         highlighted: Co kauzigas rolo divenar publike videbla
diff --git a/config/locales/simple_form.is.yml b/config/locales/simple_form.is.yml
index a7e2083f4d83a4..d615e391ac2fc9 100644
--- a/config/locales/simple_form.is.yml
+++ b/config/locales/simple_form.is.yml
@@ -130,7 +130,7 @@ is:
         name: Þú getur aðeins breytt stafstöði mill há-/lágstafa, til gæmis til að gera þetta læsilegra
       user:
         chosen_languages: Þegar merkt er við þetta, birtast einungis færslur á völdum tungumálum á opinberum tímalínum
-        role: Hlutverk stýrir hvaða heimildir notandinn hefur
+        role: Hlutverk stýrir hvaða heimildir notandinn hefur.
       user_role:
         color: Litur sem notaður er fyrir hlutverkið allsstaðar í viðmótinu, sem RGB-gildi á hex-sniði
         highlighted: Þetta gerir hlutverk sýnilegt opinberlega
diff --git a/config/locales/simple_form.it.yml b/config/locales/simple_form.it.yml
index ea175e2bf567b7..1068b2f92772fd 100644
--- a/config/locales/simple_form.it.yml
+++ b/config/locales/simple_form.it.yml
@@ -130,7 +130,7 @@ it:
         name: Puoi cambiare solo il minuscolo/maiuscolo delle lettere, ad esempio, per renderlo più leggibile
       user:
         chosen_languages: Quando una o più lingue sono contrassegnate, nelle timeline pubbliche vengono mostrati solo i toot nelle lingue selezionate
-        role: Il ruolo controlla quali permessi ha l'utente
+        role: Il ruolo controlla quali permessi ha l'utente.
       user_role:
         color: Colore da usare per il ruolo in tutta l'UI, come RGB in formato esadecimale
         highlighted: Rende il ruolo visibile
diff --git a/config/locales/simple_form.ja.yml b/config/locales/simple_form.ja.yml
index 8815af99334d42..2c1bd6a08404ad 100644
--- a/config/locales/simple_form.ja.yml
+++ b/config/locales/simple_form.ja.yml
@@ -130,7 +130,6 @@ ja:
         name: 視認性向上などのためにアルファベット大文字小文字の変更のみ行うことができます
       user:
         chosen_languages: 選択すると、選択した言語の投稿のみが公開タイムラインに表示されるようになります
-        role: このロールはユーザーが持つ権限を管理します
       user_role:
         color: UI 全体でロールの表示に使用される色（16進数RGB形式）
         highlighted: これによりロールが公開されます。
diff --git a/config/locales/simple_form.ko.yml b/config/locales/simple_form.ko.yml
index 5fa3aee6c4c010..fee07fa5e0ff66 100644
--- a/config/locales/simple_form.ko.yml
+++ b/config/locales/simple_form.ko.yml
@@ -130,7 +130,7 @@ ko:
         name: 읽기 쉽게하기 위한 글자의 대소문자만 변경할 수 있습니다.
       user:
         chosen_languages: 체크하면, 선택 된 언어로 작성된 게시물들만 공개 타임라인에 보여집니다
-        role: 역할은 사용자가 어떤 권한을 가지게 될 지 결정합니다
+        role: 역할은 사용자가 어떤 권한을 가지게 될 지 결정합니다.
       user_role:
         color: 색상은 사용자 인터페이스에서 역할을 나타내기 위해 사용되며, RGB 16진수 형식입니다
         highlighted: 이 역할이 공개적으로 보이도록 설정합니다
diff --git a/config/locales/simple_form.ku.yml b/config/locales/simple_form.ku.yml
index 96e047d9371229..db50384c7e5009 100644
--- a/config/locales/simple_form.ku.yml
+++ b/config/locales/simple_form.ku.yml
@@ -106,7 +106,6 @@ ku:
         name: Tu dikarî tenê mezinahiya tîpan biguherînî bo mînak, da ku ew bêtir were xwendin
       user:
         chosen_languages: Dema were nîşankirin, tenê parvekirinên bi zimanên hilbijartî dê di rêzikên giştî de werin nîşandan
-        role: Rola kîjan mafdayînên bikarhêner heye kontrol dike
       user_role:
         color: Renga ku were bikaranîn ji bo rola li seranserê navrûya bikarhêneriyê, wekî RGB di forma hex
         highlighted: Ev rola xwe ji raya giştî re xuya dike
diff --git a/config/locales/simple_form.lad.yml b/config/locales/simple_form.lad.yml
index f7093ff73beb46..2a381534ba5c2a 100644
--- a/config/locales/simple_form.lad.yml
+++ b/config/locales/simple_form.lad.yml
@@ -125,7 +125,7 @@ lad:
         name: Solo se puede trokar la kapitalizasyon de las letras, por enshemplo, para ke sea mas meldable
       user:
         chosen_languages: Kuando se marka, solo se amostraran las publikasyones en las linguas eskojidas en las linyas de tiempo publikas
-        role: El rolo kontrola kualos permisos tiene el utilizador
+        role: El rolo kontrola kualos permisos tiene el utilizador.
       user_role:
         color: Color ke se utilizara para el rolo a lo largo de la enterfaz de utilizador, komo RGB en formato heksadesimal
         highlighted: Esto faze ke el rolo sea publikamente visible
diff --git a/config/locales/simple_form.lt.yml b/config/locales/simple_form.lt.yml
index 02f0360938107e..ecbf501389c67d 100644
--- a/config/locales/simple_form.lt.yml
+++ b/config/locales/simple_form.lt.yml
@@ -101,7 +101,6 @@ lt:
         show_application: Neatsižvelgiant į tai, visada galėsi matyti, kuri programėlė paskelbė tavo įrašą.
       user:
         chosen_languages: Kai pažymėta, viešose laiko skalėse bus rodomi tik įrašai pasirinktomis kalbomis.
-        role: Vaidmuo valdo, kokius leidimus naudotojas (-a) turi
     labels:
       account:
         discoverable: Rekomenduoti profilį ir įrašus į atradimo algoritmus
diff --git a/config/locales/simple_form.lv.yml b/config/locales/simple_form.lv.yml
index eedae998e40479..d96f57058b6704 100644
--- a/config/locales/simple_form.lv.yml
+++ b/config/locales/simple_form.lv.yml
@@ -128,7 +128,6 @@ lv:
         name: Tu vari mainīt tikai burtu lielumu, piemēram, lai tie būtu vieglāk lasāmi
       user:
         chosen_languages: Ja ieķeksēts, publiskos laika grafikos tiks parādītas tikai ziņas noteiktajās valodās
-        role: Loma kontrolē, kādas atļaujas ir lietotājam
       user_role:
         color: Krāsa, kas jāizmanto lomai visā lietotāja saskarnē, kā RGB hex formātā
         highlighted: Tas padara lomu publiski redzamu
diff --git a/config/locales/simple_form.ms.yml b/config/locales/simple_form.ms.yml
index da00e2dc2b05d2..ecc3588d67690d 100644
--- a/config/locales/simple_form.ms.yml
+++ b/config/locales/simple_form.ms.yml
@@ -122,7 +122,6 @@ ms:
         name: Anda hanya boleh menukar selongsong huruf, sebagai contoh, untuk menjadikannya lebih mudah dibaca
       user:
         chosen_languages: Apabila disemak, hanya siaran dalam bahasa terpilih akan dipaparkan dalam garis masa awam
-        role: Peranan mengawal kebenaran yang dimiliki oleh pengguna
       user_role:
         color: Warna yang akan digunakan untuk peranan ini dalam seluruh UI, sebagai RGB dalam format hex
         highlighted: Ini menjadikan peranan ini dipaparkan secara umum
diff --git a/config/locales/simple_form.my.yml b/config/locales/simple_form.my.yml
index a44635edd4b4f9..abcb11bdaa5e56 100644
--- a/config/locales/simple_form.my.yml
+++ b/config/locales/simple_form.my.yml
@@ -122,7 +122,6 @@ my:
         name: ဥပမာအားဖြင့် စာလုံးများကို ပိုမိုဖတ်ရှုနိုင်စေရန်မှာ သင်သာ ပြောင်းလဲနိုင်သည်။
       user:
         chosen_languages: အမှန်ခြစ် ရွေးချယ်ထားသော ဘာသာစကားများဖြင့်သာ ပို့စ်များကို အများမြင်စာမျက်နှာတွင် ပြသပါမည်
-        role: အသုံးပြုသူ၏ ခွင့်ပြုချက်ကဏ္ဍကို ထိန်းချုပ်ထားသည်
       user_role:
         color: hex ပုံစံ RGB အဖြစ် UI တစ်လျှောက်လုံး အခန်းကဏ္ဍအတွက် အသုံးပြုရမည့်အရောင်
         highlighted: ယင်းက အခန်းကဏ္ဍကို အများမြင်အောင် ဖွင့်ပေးထားသည်။
diff --git a/config/locales/simple_form.nl.yml b/config/locales/simple_form.nl.yml
index 91ee9bc3e3b7b9..066f6c2acb5275 100644
--- a/config/locales/simple_form.nl.yml
+++ b/config/locales/simple_form.nl.yml
@@ -130,7 +130,7 @@ nl:
         name: Je kunt elk woord met een hoofdletter beginnen, om zo bijvoorbeeld de tekst leesbaarder te maken
       user:
         chosen_languages: Alleen berichten in de aangevinkte talen worden op de openbare tijdlijnen getoond
-        role: De rol bepaalt welke rechten een gebruiker heeft
+        role: De rol bepaalt welke rechten de gebruiker heeft.
       user_role:
         color: Kleur die gebruikt wordt voor de rol in de UI, als RGB in hexadecimale formaat
         highlighted: Dit maakt de rol openbaar zichtbaar
diff --git a/config/locales/simple_form.nn.yml b/config/locales/simple_form.nn.yml
index c4d4438b94e31c..500a41c8cc12fc 100644
--- a/config/locales/simple_form.nn.yml
+++ b/config/locales/simple_form.nn.yml
@@ -130,7 +130,6 @@ nn:
         name: Du kan berre endra bruken av store/små bokstavar, t. d. for å gjera det meir leseleg
       user:
         chosen_languages: Når merka vil berre tuta på dei valde språka synast på offentlege tidsliner
-        role: Rolla kontrollerer kva tilgangar brukaren har
       user_role:
         color: Fargen som skal nyttast for denne rolla i heile brukargrensesnittet, som RGB i hex-format
         highlighted: Dette gjer rolla synleg offentleg
diff --git a/config/locales/simple_form.no.yml b/config/locales/simple_form.no.yml
index 82de0adb7b5e29..73ba17cd4cc198 100644
--- a/config/locales/simple_form.no.yml
+++ b/config/locales/simple_form.no.yml
@@ -124,7 +124,6 @@
         name: Du kan bare forandre bruken av store/små bokstaver, f.eks. for å gjøre det mer lesbart
       user:
         chosen_languages: Hvis noen av dem er valgt, vil kun innlegg i de valgte språkene bli vist i de offentlige tidslinjene
-        role: Rollekontroller som bestemmer rettigheter brukeren har
       user_role:
         color: Farge som skal brukes for rollen gjennom hele UI, som RGB i hex-format
         highlighted: Dette gjør rollen offentlig synlig
diff --git a/config/locales/simple_form.pl.yml b/config/locales/simple_form.pl.yml
index 1a9051b9510b28..74191698901803 100644
--- a/config/locales/simple_form.pl.yml
+++ b/config/locales/simple_form.pl.yml
@@ -130,7 +130,6 @@ pl:
         name: Możesz zmieniać tylko wielkość liter, np. aby były bardziej widoczne
       user:
         chosen_languages: Jeżeli zaznaczone, tylko wpisy w wybranych językach będą wyświetlane na publicznych osiach czasu
-        role: Rola kontroluje uprawnienia użytkownika
       user_role:
         color: Kolor używany dla roli w całym interfejsie użytkownika, wyrażony jako RGB w formacie szesnastkowym
         highlighted: To sprawia, że rola jest widoczna publicznie
diff --git a/config/locales/simple_form.pt-BR.yml b/config/locales/simple_form.pt-BR.yml
index 65d3883690112c..6b0bad0f0884b3 100644
--- a/config/locales/simple_form.pt-BR.yml
+++ b/config/locales/simple_form.pt-BR.yml
@@ -130,7 +130,6 @@ pt-BR:
         name: Você pode mudar a capitalização das letras, por exemplo, para torná-la mais legível
       user:
         chosen_languages: Apenas as publicações dos idiomas selecionados serão exibidas nas linhas públicas
-        role: O cargo controla quais permissões o usuário tem
       user_role:
         color: Cor a ser usada para o cargo em toda a interface do usuário, como RGB no formato hexadecimal
         highlighted: Isso torna o cargo publicamente visível
diff --git a/config/locales/simple_form.pt-PT.yml b/config/locales/simple_form.pt-PT.yml
index 25348f27701f8f..971773b2dc3d90 100644
--- a/config/locales/simple_form.pt-PT.yml
+++ b/config/locales/simple_form.pt-PT.yml
@@ -130,7 +130,6 @@ pt-PT:
         name: Só pode alterar a capitalização das letras, por exemplo, para torná-las mais legíveis
       user:
         chosen_languages: Quando selecionado, só serão mostradas nas cronologias públicas as publicações nos idiomas escolhidos
-        role: A função controla que permissões o utilizador tem
       user_role:
         color: Cor a ser utilizada para a função em toda a interface de utilizador, como RGB no formato hexadecimal
         highlighted: Isto torna a função visível publicamente
diff --git a/config/locales/simple_form.ru.yml b/config/locales/simple_form.ru.yml
index 0f830174c89dab..b41457e86ac6ce 100644
--- a/config/locales/simple_form.ru.yml
+++ b/config/locales/simple_form.ru.yml
@@ -125,7 +125,6 @@ ru:
         name: Вы можете изменить только регистр букв чтобы, например, сделать тег более читаемым
       user:
         chosen_languages: Если выбрано, то в публичных лентах будут показаны только посты на выбранных языках.
-        role: Роль определяет, какие разрешения есть у пользователя
       user_role:
         color: Цвет, который будет использоваться для роли в интерфейсе (UI), как RGB в формате HEX
         highlighted: Это действие сделает роль публичной
diff --git a/config/locales/simple_form.sco.yml b/config/locales/simple_form.sco.yml
index 9fc6fd57dbb363..2bc4f6a45648b5 100644
--- a/config/locales/simple_form.sco.yml
+++ b/config/locales/simple_form.sco.yml
@@ -104,7 +104,6 @@ sco:
         name: Ye kin ainly chynge the case o the letters, fir example, fir tae mak it mair readable
       user:
         chosen_languages: Whan ticked, ainly posts in selectit leids wull be displayit in public timelines
-        role: The role controls whit permissions the uiser haes
       user_role:
         color: Colour tae be uised fir the role throuoot the UI, as RGB in hex format
         highlighted: This maks the role visible publicly
diff --git a/config/locales/simple_form.sl.yml b/config/locales/simple_form.sl.yml
index bb16e56a0ceac1..d1ae553c8c245e 100644
--- a/config/locales/simple_form.sl.yml
+++ b/config/locales/simple_form.sl.yml
@@ -130,7 +130,6 @@ sl:
         name: Spremenite lahko le npr. velikost črk (velike/male), da je bolj berljivo
       user:
         chosen_languages: Ko je označeno, bodo v javnih časovnicah prikazane samo objave v izbranih jezikih
-        role: Vloga nadzira, katere pravice ima uporabnik
       user_role:
         color: Barva, uporabljena za vlogo po celem up. vmesniku, podana v šestnajstiškem zapisu RGB
         highlighted: S tem je vloga javno vidna
diff --git a/config/locales/simple_form.sq.yml b/config/locales/simple_form.sq.yml
index 8b00751d98251a..3d865572824706 100644
--- a/config/locales/simple_form.sq.yml
+++ b/config/locales/simple_form.sq.yml
@@ -130,7 +130,7 @@ sq:
         name: Mund të ndryshoni shkronjat vetëm nga të mëdha në të vogla ose anasjelltas, për shembull, për t’i bërë më të lexueshme
       user:
         chosen_languages: Në iu vëntë shenjë, te rrjedha kohore publike do të shfaqen vetëm mesazhe në gjuhët e përzgjedhura
-        role: Roli kontrollon cilat leje ka përdoruesi
+        role: Roli kontrollon cilat leje ka përdoruesi.
       user_role:
         color: Ngjyrë për t’u përdorur për rolin nëpër UI, si RGB në format gjashtëmbëdhjetësh
         highlighted: Kjo e bën rolin të dukshëm publikisht
diff --git a/config/locales/simple_form.sr-Latn.yml b/config/locales/simple_form.sr-Latn.yml
index 527c5e0a1fd496..1dec901340da26 100644
--- a/config/locales/simple_form.sr-Latn.yml
+++ b/config/locales/simple_form.sr-Latn.yml
@@ -130,7 +130,6 @@ sr-Latn:
         name: Mogu se samo promeniti mala slova u velika ili obrnuto, na primer, da bi bilo čitljivije
       user:
         chosen_languages: Kada je označeno, objave u izabranim jezicima će biti prikazane na javnoj vremenskoj liniji
-        role: Uloga kontroliše koje dozvole korisnik ima
       user_role:
         color: Boja koja će se koristiti za ulogu u celom korisničkom okruženju, kao RGB u heksadecimalnom formatu
         highlighted: Ovo čini ulogu javno vidljivom
diff --git a/config/locales/simple_form.sr.yml b/config/locales/simple_form.sr.yml
index d541c0b49c9986..9566e0947535a7 100644
--- a/config/locales/simple_form.sr.yml
+++ b/config/locales/simple_form.sr.yml
@@ -130,7 +130,6 @@ sr:
         name: Могу се само променити мала слова у велика или обрнуто, на пример, да би било читљивије
       user:
         chosen_languages: Када је означено, објаве у изабраним језицима ће бити приказане на јавној временској линији
-        role: Улога контролише које дозволе корисник има
       user_role:
         color: Боја која ће се користити за улогу у целом корисничком окружењу, као RGB у хексадецималном формату
         highlighted: Ово чини улогу јавно видљивом
diff --git a/config/locales/simple_form.sv.yml b/config/locales/simple_form.sv.yml
index 329cabf941e049..297e96a2bdf125 100644
--- a/config/locales/simple_form.sv.yml
+++ b/config/locales/simple_form.sv.yml
@@ -130,7 +130,7 @@ sv:
         name: Du kan bara ändra skriftläget av bokstäverna, till exempel, för att göra det mer läsbart
       user:
         chosen_languages: Vid aktivering visas bara inlägg på dina valda språk i offentliga tidslinjer
-        role: Rollen bestämmer vilka behörigheter användaren har
+        role: Rollen styr vilka behörigheter användaren har.
       user_role:
         color: Färgen som ska användas för rollen i användargränssnittet, som RGB i hex-format
         highlighted: Detta gör rollen synlig offentligt
diff --git a/config/locales/simple_form.tr.yml b/config/locales/simple_form.tr.yml
index c62be89b283f79..89fb1675fd94cf 100644
--- a/config/locales/simple_form.tr.yml
+++ b/config/locales/simple_form.tr.yml
@@ -130,7 +130,6 @@ tr:
         name: Harflerin, örneğin daha okunabilir yapmak için, sadece büyük/küçük harf durumlarını değiştirebilirsiniz
       user:
         chosen_languages: İşaretlendiğinde, yalnızca seçilen dillerdeki gönderiler genel zaman çizelgelerinde görüntülenir
-        role: Rol, kullanıcıların sahip olduğu izinleri denetler
       user_role:
         color: Arayüz boyunca rol için kullanılacak olan renk, hex biçiminde RGB
         highlighted: Bu rolü herkese açık hale getirir
diff --git a/config/locales/simple_form.uk.yml b/config/locales/simple_form.uk.yml
index c6305598b11b60..e2a1562b53499e 100644
--- a/config/locales/simple_form.uk.yml
+++ b/config/locales/simple_form.uk.yml
@@ -130,7 +130,7 @@ uk:
         name: Тут ви можете лише змінювати регістр літер, щоб підвищити читабельність
       user:
         chosen_languages: У глобальних стрічках будуть показані дописи тільки вибраними мовами
-        role: Роль визначає права користувача
+        role: Роль визначає, які права має користувач.
       user_role:
         color: Колір, який буде використовуватися для ролі у всьому інтерфейсі, як RGB у форматі hex
         highlighted: Це робить роль видимою всім
diff --git a/config/locales/simple_form.vi.yml b/config/locales/simple_form.vi.yml
index 7954bb1e6ff54f..4e7c8b0a97e203 100644
--- a/config/locales/simple_form.vi.yml
+++ b/config/locales/simple_form.vi.yml
@@ -130,7 +130,7 @@ vi:
         name: Bạn có thể thay đổi cách viết hoa các chữ cái để giúp nó dễ đọc hơn
       user:
         chosen_languages: Chỉ hiển thị những tút viết bằng các ngôn ngữ sau
-        role: Vai trò kiểm soát những quyền mà người dùng có
+        role: Vai trò kiểm soát những quyền mà người dùng có.
       user_role:
         color: Màu được sử dụng cho vai trò trong toàn bộ giao diện người dùng, dưới dạng RGB ở định dạng hex
         highlighted: Vai trò sẽ hiển thị công khai
diff --git a/config/locales/simple_form.zh-CN.yml b/config/locales/simple_form.zh-CN.yml
index 3f7b8782ee247d..cb4341b551e6a9 100644
--- a/config/locales/simple_form.zh-CN.yml
+++ b/config/locales/simple_form.zh-CN.yml
@@ -4,12 +4,12 @@ zh-CN:
     hints:
       account:
         discoverable: 您的公开嘟文和个人资料可能会在 Mastodon 的多个位置展示，您的个人资料可能会被推荐给其他用户。
-        display_name: 您的全名或昵称。
+        display_name: 你的全名或昵称。
         fields: 你的主页、人称代词、年龄，以及任何你想要添加的内容。
         indexable: 您的公开嘟文会出现在 Mastodon 的搜索结果中。无论是否勾选，与您的嘟文有过交互的人都可能通过搜索找到它们。
-        note: '您可以提及 @其他人 或 #标签 。'
+        note: '你可以提及 @其他人 或 #标签 。'
         show_collections: 人们将能够浏览您的关注和追随者。您关注的人会看到您关注他们。
-        unlocked: 人们将能够在不请求批准的情况下关注您。如果您希望审核关注请求并选择接受或拒绝新的粉丝，请取消勾选此项。
+        unlocked: 人们将能够在不请求批准的情况下关注你。如果你希望审核关注请求并选择接受或拒绝新的粉丝，请取消勾选此项。
       account_alias:
         acct: 指定你想要迁移过来的原账号：用户名@站点域名
       account_migration:
@@ -78,7 +78,7 @@ zh-CN:
       form_admin_settings:
         activity_api_enabled: 本站每周的嘟文数、活跃用户数和新注册用户数
         app_icon: WEBP、PNG、GIF 或 JPG。使用自定义图标覆盖移动设备上的默认应用图标。
-        backups_retention_period: 用户可以生成其嘟文存档以供之后下载。当该值被设为正值时，这些存档将在指定的天数后自动从您的存储中删除。
+        backups_retention_period: 用户可以生成其嘟文存档以供之后下载。当该值被设为正值时，这些存档将在指定的天数后自动从你的存储中删除。
         bootstrap_timeline_accounts: 这些账号将在新用户关注推荐中置顶。
         closed_registrations_message: 在关闭注册时显示
         content_cache_retention_period: 来自其它实例的所有嘟文（包括转嘟与回复）都将在指定天数后被删除，不论本实例用户是否与这些嘟文产生过交互。这包括被本实例用户喜欢和收藏的嘟文。实例间用户的私下提及也将丢失并无法恢复。此设置针对的是特殊用途的实例，用于一般用途时会打破许多用户的期望。
@@ -125,12 +125,12 @@ zh-CN:
         webauthn: 如果是 USB 密钥，请确保将其插入，如有必要，请点击它。
       settings:
         indexable: 您的个人资料页面可能会出现在Google、Bing等搜索结果中。
-        show_application: 无论如何，您始终可以看到是哪个应用发布了您的嘟文。
+        show_application: 无论如何，你始终可以看到是哪个应用发布了你的嘟文。
       tag:
         name: 你只能改变字母的大小写，让它更易读
       user:
         chosen_languages: 仅选中语言的嘟文会出现在公共时间轴上（全不选则显示所有语言的嘟文）
-        role: 角色用于控制用户拥有的权限
+        role: 角色用于控制用户拥有的权限。
       user_role:
         color: 在界面各处用于标记该角色的颜色，以十六进制 RGB 格式表示
         highlighted: 使角色公开可见
@@ -143,7 +143,7 @@ zh-CN:
         url: 事件将被发往的目的地
     labels:
       account:
-        discoverable: 在发现算法中展示您的个人资料和嘟文
+        discoverable: 在发现算法中展示你的个人资料和嘟文
         fields:
           name: 标签
           value: 内容
@@ -309,7 +309,7 @@ zh-CN:
         text: 规则
       settings:
         indexable: 允许搜索引擎索引个人资料页面
-        show_application: 显示您发嘟所用的应用
+        show_application: 显示你发嘟所用的应用
       tag:
         listable: 允许这个话题标签在用户目录中显示
         name: 话题标签
diff --git a/config/locales/simple_form.zh-HK.yml b/config/locales/simple_form.zh-HK.yml
index 6a7cd5a2471553..dd134a58fba866 100644
--- a/config/locales/simple_form.zh-HK.yml
+++ b/config/locales/simple_form.zh-HK.yml
@@ -128,7 +128,6 @@ zh-HK:
         name: 你只能變更大小寫（以使其更易讀）。
       user:
         chosen_languages: 只有被選擇的語言會在公開時間軸內顯示
-        role: 角色控制使用者擁有的權限
       user_role:
         color: 介面各處用於角色的顏色，是以十六進制 RGB 格式表示
         highlighted: 這使該角色公開可見
diff --git a/config/locales/simple_form.zh-TW.yml b/config/locales/simple_form.zh-TW.yml
index 05692243adecf1..8b4c440025767b 100644
--- a/config/locales/simple_form.zh-TW.yml
+++ b/config/locales/simple_form.zh-TW.yml
@@ -53,7 +53,7 @@ zh-TW:
         password: 使用至少 8 個字元
         phrase: 無論是嘟文的本文或是內容警告都會被過濾
         scopes: 允許使應用程式存取的 API。 若您選擇最高階範圍，則無須選擇個別項目。
-        setting_aggregate_reblogs: 請勿顯示最近已被轉嘟之嘟文的最新轉嘟（只影響最新收到的嘟文）
+        setting_aggregate_reblogs: 不顯示最近已被轉嘟之嘟文的最新轉嘟（只影響最新收到的嘟文）
         setting_always_send_emails: 一般情況下若您活躍使用 Mastodon ，我們不會寄送電子郵件通知
         setting_default_sensitive: 敏感內容媒體預設隱藏，且按一下即可重新顯示
         setting_display_media_default: 隱藏標為敏感內容的媒體
@@ -130,7 +130,7 @@ zh-TW:
         name: 您只能變更大小寫，例如，以使其更易讀。
       user:
         chosen_languages: 當選取時，只有選取語言之嘟文會於公開時間軸中顯示
-        role: 角色控制使用者有哪些權限
+        role: 角色控制使用者有哪些權限。
       user_role:
         color: 於整個使用者介面中用於角色的顏色，十六進位格式的 RGB
         highlighted: 這將使角色公開可見
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index b3d273024b0cd6..0f43f439887c4c 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -25,6 +25,8 @@ sq:
   admin:
     account_actions:
       action: Kryeje veprimin
+      already_silenced: Kjo llogari është heshtuar tashmë.
+      already_suspended: Kjo llogari është pezulluar tashmë.
       title: Kryeni veprim moderimi te %{acct}
     account_moderation_notes:
       create: Lini një shënim
@@ -46,6 +48,7 @@ sq:
         title: Ndrysho email-in për %{username}
       change_role:
         changed_msg: Roli u ndryshua me sukses!
+        edit_roles: Administroni role përdoruesish
         label: Ndryshoni rol
         no_role: Pa rol
         title: Ndryshoni rolin për %{username}
@@ -600,6 +603,7 @@ sq:
         suspend_description_html: Llogaria dhe krejt lënda e saj s’do të jenë të përdorshme dhe, së fundi, do të fshihen dhe ndërveprimi me te do të jetë i pamundur. E prapakthyeshme brenda 30 ditësh. Mbyll krejt raportimet kundër kësaj llogarie.
       actions_description_html: Vendosni cili veprim të kryhet për të zgjidhur këtë raportim. Nëse ndërmerrni një veprim ndëshkues kundër llogarisë së raportuar, atyre do t’u dërgohet një njoftim me email, hiq rastin kur përzgjidhet kategoria <strong>I padëshiruar</strong>.
       actions_description_remote_html: Vendosni cili veprim të ndërmerret për zgjidhjen e këtij raportimi. Kjo do të prekë vetëm mënyrën se si shërbyesi <strong>juaj</strong> komunikon me këtë llogari të largët dhe se si e trajtojnë lëndën e saj.
+      actions_no_posts: Ky raportim s’ka ndonjë postim të përshoqëruar, për fshirje
       add_to_report: Shtoni më tepër te raportimi
       already_suspended_badges:
         local: Tashmë i pezulluar në këtë shërbyes
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index e47f506e6b761f..bcf1e3b81692c1 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -46,6 +46,7 @@ sv:
         title: Byt e-postadress för %{username}
       change_role:
         changed_msg: Rollen har ändrats!
+        edit_roles: Hantera användarroller
         label: Ändra roll
         no_role: Ingen roll
         title: Ändra roll för %{username}
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 7f90c3bc940c29..f119102112f0a7 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -23,6 +23,8 @@ th:
   admin:
     account_actions:
       action: ทำการกระทำ
+      already_silenced: มีการทำให้บัญชีนี้เงียบไปแล้ว
+      already_suspended: มีการระงับบัญชีนี้ไปแล้ว
       title: ทำการกระทำการกลั่นกรองต่อ %{acct}
     account_moderation_notes:
       create: เขียนหมายเหตุ
@@ -44,6 +46,7 @@ th:
         title: เปลี่ยนอีเมลสำหรับ %{username}
       change_role:
         changed_msg: เปลี่ยนบทบาทสำเร็จ!
+        edit_roles: จัดการบทบาทผู้ใช้
         label: เปลี่ยนบทบาท
         no_role: ไม่มีบทบาท
         title: เปลี่ยนบทบาทสำหรับ %{username}
@@ -590,6 +593,7 @@ th:
         suspend_description_html: บัญชีและเนื้อหาของบัญชีทั้งหมดจะเข้าถึงไม่ได้และได้รับการลบในที่สุด และการโต้ตอบกับบัญชีจะเป็นไปไม่ได้ แปลงกลับได้ภายใน 30 วัน ปิดรายงานต่อบัญชีนี้ทั้งหมด
       actions_description_html: ตัดสินใจว่าการกระทำใดที่จะใช้เพื่อแก้ปัญหารายงานนี้ หากคุณใช้การกระทำที่เป็นการลงโทษต่อบัญชีที่รายงาน จะส่งการแจ้งเตือนอีเมลถึงเขา ยกเว้นเมื่อมีการเลือกหมวดหมู่ <strong>สแปม</strong>
       actions_description_remote_html: ตัดสินใจว่าการกระทำใดที่จะใช้เพื่อแก้ปัญหารายงานนี้ นี่จะมีผลต่อวิธีที่เซิร์ฟเวอร์ <strong>ของคุณ</strong> สื่อสารกับบัญชีระยะไกลนี้และจัดการเนื้อหาของบัญชีเท่านั้น
+      actions_no_posts: รายงานนี้ไม่มีโพสต์ที่เกี่ยวข้องใด ๆ ให้ลบ
       add_to_report: เพิ่มข้อมูลเพิ่มเติมไปยังรายงาน
       already_suspended_badges:
         local: ระงับในเซิร์ฟเวอร์นี้อยู่แล้ว
@@ -1428,6 +1432,7 @@ th:
   media_attachments:
     validations:
       images_and_video: ไม่สามารถแนบวิดีโอกับโพสต์ที่มีภาพอยู่แล้ว
+      not_found: ไม่พบสื่อ %{ids} หรือได้แนบกับโพสต์อื่นไปแล้ว
       not_ready: ไม่สามารถแนบไฟล์ที่ยังประมวลผลไม่เสร็จ ลองอีกครั้งในอีกสักครู่!
       too_many: ไม่สามารถแนบมากกว่า 4 ไฟล์
   migrations:
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 544e2671c62da6..261c87cd75fef4 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -29,6 +29,7 @@ uk:
   admin:
     account_actions:
       action: Виконати дію
+      already_suspended: Цей обліковий запис вже було призупинено.
       title: Здійснити модераційну дію над %{acct}
     account_moderation_notes:
       create: Залишити нотатку
@@ -50,6 +51,7 @@ uk:
         title: Змінити адресу електронної пошти для %{username}
       change_role:
         changed_msg: Роль успішно змінено!
+        edit_roles: Керування ролями
         label: Змінити роль
         no_role: Немає ролі
         title: Змінити роль для %{username}
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 2f607d1ecbe088..975df3024bdf25 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -23,6 +23,8 @@ vi:
   admin:
     account_actions:
       action: Thực hiện hành động
+      already_silenced: Tài khoản này đã bị hạn chế.
+      already_suspended: Tài khoản này đã bị vô hiệu hóa.
       title: Áp đặt kiểm duyệt với %{acct}
     account_moderation_notes:
       create: Thêm lưu ý
@@ -44,6 +46,7 @@ vi:
         title: Thay đổi email cho %{username}
       change_role:
         changed_msg: Vai trò đã thay đổi thành công!
+        edit_roles: Quản lý vai trò người dùng
         label: Đổi vai trò
         no_role: Chưa có vai trò
         title: Thay đổi vai trò %{username}
@@ -590,6 +593,7 @@ vi:
         suspend_description_html: Tài khoản và tất cả nội dung của nó sẽ không thể truy cập được và cuối cùng sẽ bị xóa, đồng thời không thể tương tác với tài khoản đó. Có thể đảo ngược trong vòng 30 ngày. Đóng tất cả các báo cáo đối với tài khoản này.
       actions_description_html: Nếu áp đặt kiểm duyệt, một email thông báo sẽ được gửi cho người này, ngoại trừ <strong>Spam</strong>.
       actions_description_remote_html: Chọn hành động cần thực hiện để xử lý báo cáo này. Điều này sẽ chỉ ảnh hưởng đến cách máy chủ <strong>của bạn</strong> giao tiếp với tài khoản này và xử lý nội dung của nó.
+      actions_no_posts: Báo cáo này không có tút liên quan để xóa
       add_to_report: Bổ sung báo cáo
       already_suspended_badges:
         local: Đã vô hiệu hóa trên máy chủ này
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index a8d401c7bbfe5b..6b399d3499782c 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -23,6 +23,8 @@ zh-CN:
   admin:
     account_actions:
       action: 执行操作
+      already_silenced: 此帐户已受限。
+      already_suspended: 此帐户已被封禁。
       title: 在 %{acct} 上执行管理操作
     account_moderation_notes:
       create: 新建记录
@@ -44,6 +46,7 @@ zh-CN:
         title: 更改 %{username} 的电子邮箱
       change_role:
         changed_msg: 已成功更改角色！
+        edit_roles: 管理用户角色
         label: 更改角色
         no_role: 没有角色
         title: 更改 %{username} 的角色
@@ -383,9 +386,9 @@ zh-CN:
         cancel: 取消
         confirm: 封禁
         permanent_action: 撤销暂停不会恢复任何数据或关系。
-        preamble_html: 您将要暂停 <strong>%{domain}</strong> 及其子域。
-        remove_all_data: 这将从您的实例上删除此域名下账户的所有内容、媒体和个人资料数据。
-        stop_communication: 您的实例将停止与这些实例的通信。
+        preamble_html: 你将要暂停 <strong>%{domain}</strong> 及其子域。
+        remove_all_data: 这将从你的实例上删除此域名下账户的所有内容、媒体和个人资料数据。
+        stop_communication: 你的实例将停止与这些实例的通信。
         title: 确认对 %{domain} 的封锁
         undo_relationships: 这将解除你的实例与这些实例上账户之间的任何关注。
       created_msg: 正在进行域名屏蔽
@@ -590,6 +593,7 @@ zh-CN:
         suspend_description_html: 该帐户及其所有内容将无法访问并最终被删除，且无法与该帐户进行互动。 在 30 天内可随时撤销。关闭针对此帐户的所有举报。
       actions_description_html: 决定采取何种措施处理此举报。如果对被举报账号采取惩罚性措施，将向其发送一封电子邮件通知。但若选中<strong>垃圾信息</strong>类别则不会发送通知。
       actions_description_remote_html: 决定采取何种行动来解决此举报。 这只会影响<strong>您的</strong>服务器如何与该远程帐户的通信并处理其内容。
+      actions_no_posts: 该举报没有相关嘟文可供删除
       add_to_report: 增加更多举报内容
       already_suspended_badges:
         local: 已经在此服务器上暂停
@@ -609,7 +613,7 @@ zh-CN:
       created_at: 举报时间
       delete_and_resolve: 删除嘟文
       forwarded: 已转发
-      forwarded_replies_explanation: 该举报来自外站用户，涉及外站内容。之所以转发给您，是因为被举报的内容是对您站点一位用户的回复。
+      forwarded_replies_explanation: 该举报来自外站用户，涉及外站内容。之所以转发给你，是因为被举报的内容是对你站点一位用户的回复。
       forwarded_to: 转发举报至 %{domain}
       mark_as_resolved: 标记为已处理
       mark_as_sensitive: 标记为敏感内容
@@ -764,7 +768,7 @@ zh-CN:
         disabled: 不对任何人
         users: 对本地已登录用户
       registrations:
-        moderation_recommandation: 在向所有人开放注册之前，请确保您拥有一个人手足够且反应迅速的管理团队！
+        moderation_recommandation: 在向所有人开放注册之前，请确保你拥有一个人手足够且反应迅速的管理团队！
         preamble: 控制谁可以在你的服务器上创建账号。
         title: 注册
       registrations_mode:
@@ -772,7 +776,7 @@ zh-CN:
           approved: 注册时需要批准
           none: 关闭注册
           open: 开放注册
-        warning_hint: 我们建议使用“注册必须经过批准”，除非您确信您的管理团队能够及时处理骚扰和恶意注册。
+        warning_hint: 我们建议使用“注册必须经过批准”，除非你确信你的管理团队能够及时处理骚扰和恶意注册。
       security:
         authorized_fetch: 需要跨站认证
         authorized_fetch_hint: 要求外站请求通过验证能够使用户级别与服务器级别的封锁更为严格。然而，这将带来额外的性能负担、减少回复触达范围、并可能导致与一些联邦宇宙服务的兼容性问题。此外，这并不能阻止他人针对性地获取公开嘟文与账户。
@@ -784,7 +788,7 @@ zh-CN:
       destroyed_msg: 站点上传的文件已经成功删除！
     software_updates:
       critical_update: 紧急 — 请尽快更新
-      description: 建议你及时更新Mastodon实例，以便获得最新修复和功能。此外，为避免安全问题，有时及时更新Mastodon是至关重要的。出于这些原因，Mastodon每30分钟检查一次更新，并根据您的邮件通知偏好向您发送通知。
+      description: 建议你及时更新Mastodon实例，以便获得最新修复和功能。此外，为避免安全问题，有时及时更新Mastodon是至关重要的。出于这些原因，Mastodon每30分钟检查一次更新，并根据你的邮件通知偏好向你发送通知。
       documentation_link: 详细了解
       release_notes: 发行说明
       title: 可用的更新
@@ -837,17 +841,17 @@ zh-CN:
       elasticsearch_health_red:
         message_html: Elasticsearch 集群状态不健康（红色），搜索功能不可用
       elasticsearch_health_yellow:
-        message_html: Elasticsearch 集群不健康(黄色状态)，您可能想要调查原因
+        message_html: Elasticsearch 集群不健康(黄色状态)，你可能想要调查原因
       elasticsearch_index_mismatch:
         message_html: Elasticsearch索引映射已过时。请运行<code>tootctl search deploy --only=%{value}</code>。
       elasticsearch_preset:
         action: 查看文档
-        message_html: 您的Elasticsearch集群有多个节点，但Mastodon未配置好使用它们。
+        message_html: 你的Elasticsearch集群有多个节点，但Mastodon未配置好使用它们。
       elasticsearch_preset_single_node:
         action: 查看文档
-        message_html: 您的Elasticsearch集群只有一个节点，<code>ES_PRESET</code>应该设置为<code>single_node_cluster</code>。
+        message_html: 你的Elasticsearch集群只有一个节点，<code>ES_PRESET</code>应该设置为<code>single_node_cluster</code>。
       elasticsearch_reset_chewy:
-        message_html: 您的Elasticsearch系统索引已过时，可能是由于设置更改导致的。请运行<code>tootctl search deploy --reset-chewy</code>命令来更新它。
+        message_html: 你的Elasticsearch系统索引已过时，可能是由于设置更改导致的。请运行<code>tootctl search deploy --reset-chewy</code>命令来更新它。
       elasticsearch_running_check:
         message_html: 无法连接到 Elasticsearch。请检查它是否正在运行，或禁用全文搜索
       elasticsearch_version_check:
@@ -989,7 +993,7 @@ zh-CN:
       webhook: Webhook
   admin_mailer:
     auto_close_registrations:
-      body: 由于近期缺乏管理员活动， %{instance} 上的注册已自动切换为需要手动审核，以防止 %{instance} 被潜在的不良行为者用作平台。您可以随时将其切换回开放注册。
+      body: 由于近期缺乏管理员活动， %{instance} 上的注册已自动切换为需要手动审核，以防止 %{instance} 被潜在的不良行为者用作平台。你可以随时将其切换回开放注册。
       subject: "%{instance} 的注册已自动切换为需要批准"
     new_appeal:
       actions:
@@ -1004,7 +1008,7 @@ zh-CN:
       next_steps: 你可以批准此申诉并撤销该审核结果，也可以忽略此申诉。
       subject: "%{username} 对 %{instance} 的审核结果提出了申诉"
     new_critical_software_updates:
-      body: 新的紧急更新版本Mastodon已经发布，您可能希望尽快更新！
+      body: 新的紧急更新版本Mastodon已经发布，你可能希望尽快更新！
       subject: 适用于 %{instance} 的Mastodon紧急更新已经可用。
     new_pending_account:
       body: 新账户的详细信息如下。你可以批准或拒绝此申请。
@@ -1014,7 +1018,7 @@ zh-CN:
       body_remote: 来自 %{domain} 的用户举报了用户 %{target}
       subject: 来自 %{instance} 的用户举报（#%{id}）
     new_software_updates:
-      body: 新的 Mastodon 版本已发布，您可能想要更新！
+      body: 新的 Mastodon 版本已发布，你可能想要更新！
       subject: 适用于 %{instance} 的Mastodon版本更新已经可用！
     new_trends:
       body: 以下项目需要审核才能公开显示：
@@ -1062,18 +1066,18 @@ zh-CN:
   auth:
     apply_for_account: 申请账号
     captcha_confirmation:
-      help_html: 如果您在输入验证码时遇到问题，可以通过%{email} 与我们联系，我们将为您提供帮助。
-      hint_html: 只剩最后一件事了！我们需要确认您是一个人类（这样我们才能阻止恶意访问！）。请输入下面的验证码，然后点击“继续”。
+      help_html: 如果你在输入验证码时遇到问题，可以通过%{email} 与我们联系，我们将为你提供帮助。
+      hint_html: 只剩最后一件事了！我们需要确认你是一个人类（这样我们才能阻止恶意访问！）。请输入下面的验证码，然后点击“继续”。
       title: 安全检查
     confirmations:
       awaiting_review: 你的邮箱地址已确认！%{domain} 的工作人员正在审核你的注册信息。如果他们批准了你的账户，你将收到一封邮件通知！
-      awaiting_review_title: 您的注册申请正在审核中
+      awaiting_review_title: 你的注册申请正在审核中
       clicking_this_link: 点击此链接
       login_link: 登录
-      proceed_to_login_html: 现在您可以继续前往 %{login_link} 。
-      redirect_to_app_html: 您应该已被重定向到 <strong>%{app_name}</strong> 应用程序。如果没有，请尝试 %{clicking_this_link} 或手动返回应用程序。
-      registration_complete: 您在 %{domain} 上的注册现已完成！
-      welcome_title: 欢迎您，%{name}！
+      proceed_to_login_html: 现在你可以继续前往 %{login_link} 。
+      redirect_to_app_html: 你应该已被重定向到 <strong>%{app_name}</strong> 应用程序。如果没有，请尝试 %{clicking_this_link} 或手动返回应用程序。
+      registration_complete: 你在 %{domain} 上的注册现已完成！
+      welcome_title: 欢迎你，%{name}！
       wrong_email_hint: 如果该邮箱地址不正确，你可以在账户设置中进行更改。
     delete_account: 删除帐户
     delete_account_html: 如果你想删除你的帐户，请<a href="%{path}">点击这里继续</a>。你需要确认你的操作。
@@ -1111,7 +1115,7 @@ zh-CN:
       back: 返回
       invited_by: 你可以加入%{domain}，这是由于你收到了他人的邀请，邀请来自：
       preamble: 这些由 %{domain} 监察员设置和执行。
-      preamble_invited: 在您继续之前，请考虑 %{domain} 的管理员设定的基本规则。
+      preamble_invited: 在你继续之前，请考虑 %{domain} 的管理员设定的基本规则。
       title: 一些基本规则。
       title_invited: 您已经被邀请。
     security: 账户安全
@@ -1325,26 +1329,26 @@ zh-CN:
       too_large: 文件过大
     failures: 失败
     imported: 已导入
-    mismatched_types_warning: 您似乎选择了导入错误的类型，请再次检查。
+    mismatched_types_warning: 你似乎选择了导入错误的类型，请再次检查。
     modes:
       merge: 合并
       merge_long: 保留现有记录并添加新的记录
       overwrite: 覆盖
       overwrite_long: 将当前记录替换为新记录
     overwrite_preambles:
-      blocking_html: 您即将使用来自<strong> %{filename} </strong>的最多<strong> %{total_items} 个账户</strong>替换您的屏蔽列表。
-      bookmarks_html: 您即将使用来自<strong> %{filename} </strong>的<strong> %{total_items} 篇嘟文</strong>替换您的书签。
-      domain_blocking_html: 您即将使用来自<strong> %{filename} </strong>的最多<strong> %{total_items} 个域名</strong>替换您的域名屏蔽列表。
-      following_html: 您即将从<strong> %{filename} </strong>关注<strong> %{total_items} 个账户</strong>，并停止关注其他任何人。
+      blocking_html: 你即将使用来自<strong> %{filename} </strong>的最多<strong> %{total_items} 个账户</strong>替换你的屏蔽列表。
+      bookmarks_html: 你即将使用来自<strong> %{filename} </strong>的<strong> %{total_items} 篇嘟文</strong>替换你的书签。
+      domain_blocking_html: 你即将使用来自<strong> %{filename} </strong>的最多<strong> %{total_items} 个域名</strong>替换你的域名屏蔽列表。
+      following_html: 你即将从<strong> %{filename} </strong>关注<strong> %{total_items} 个账户</strong>，并停止关注其他任何人。
       lists_html: 你即将用<strong> %{filename} </strong>的内容<strong>替换你的列表</strong>。新列表中将添加<strong> %{total_items} 个账户</strong>。
-      muting_html: 您即将使用来自<strong> %{filename} </strong>的最多<strong> %{total_items} 个账户</strong>替换您已隐藏的账户列表。
+      muting_html: 你即将使用来自<strong> %{filename} </strong>的最多<strong> %{total_items} 个账户</strong>替换你已隐藏的账户列表。
     preambles:
-      blocking_html: 您即将从<strong> %{filename} </strong>中<strong>封锁</strong>多达<strong> %{total_items} </strong>个账户。
-      bookmarks_html: 您即将把来自<strong> %{filename} </strong>的<strong> %{total_items} 篇嘟文</strong>添加到您的<strong>书签</strong>中。
-      domain_blocking_html: 您即将从<strong> %{filename} </strong>中<strong>屏蔽</strong><strong> %{total_items} 个域名</strong>。
-      following_html: 您即将从<strong> %{filename} </strong><strong>关注</strong>最多<strong> %{total_items} 个账户</strong>。
+      blocking_html: 你即将从<strong> %{filename} </strong>中<strong>封锁</strong>多达<strong> %{total_items} </strong>个账户。
+      bookmarks_html: 你即将把来自<strong> %{filename} </strong>的<strong> %{total_items} 篇嘟文</strong>添加到你的<strong>书签</strong>中。
+      domain_blocking_html: 你即将从<strong> %{filename} </strong>中<strong>屏蔽</strong><strong> %{total_items} 个域名</strong>。
+      following_html: 你即将从<strong> %{filename} </strong><strong>关注</strong>最多<strong> %{total_items} 个账户</strong>。
       lists_html: 你即将从<strong> %{filename} </strong>中添加最多<strong> %{total_items} 个账户</strong>到你的<strong>列表</strong>中。如果没有可用列表，将创建新的列表。
-      muting_html: 您即将从<strong> %{filename} </strong>中<strong>隐藏</strong><strong> %{total_items} 个账户</strong>。
+      muting_html: 你即将从<strong> %{filename} </strong>中<strong>隐藏</strong><strong> %{total_items} 个账户</strong>。
     preface: 你可以在此导入你在其他实例导出的数据，比如你所关注或屏蔽的用户列表。
     recent_imports: 最近导入
     states:
@@ -1414,7 +1418,7 @@ zh-CN:
     unsubscribe:
       action: 是，取消订阅
       complete: 已取消订阅
-      confirmation_html: 你确定要退订来自 %{domain} 上的 Mastodon 的 %{type} 到您的邮箱 %{email} 吗？您可以随时在<a href="%{settings_path}">邮件通知设置</a>中重新订阅。
+      confirmation_html: 你确定要退订来自 %{domain} 上的 Mastodon 的 %{type} 到你的邮箱 %{email} 吗？你可以随时在<a href="%{settings_path}">邮件通知设置</a>中重新订阅。
       emails:
         notification_emails:
           favourite: 嘟文被喜欢邮件通知
@@ -1428,7 +1432,7 @@ zh-CN:
   media_attachments:
     validations:
       images_and_video: 无法在嘟文中同时插入视频和图片
-      not_found: 未发现媒体%{ids} 或已附在另一条嘟文中
+      not_found: 媒体 %{ids} 未找到，有可能已随附于另一条嘟文。
       not_ready: 不能附加还在处理中的文件。请稍后再试！
       too_many: 最多只能添加 4 张图片
   migrations:
@@ -1541,7 +1545,7 @@ zh-CN:
       expired: 投票已经结束
       invalid_choice: 被选中的投票选项不存在
       over_character_limit: 每条不能超过 %{max} 个字符
-      self_vote: 您不能参与自己发起的投票
+      self_vote: 你不能参与自己发起的投票
       too_few_options: 至少需要两个选项
       too_many_options: 不能超过 %{max} 项
   preferences:
@@ -1549,7 +1553,7 @@ zh-CN:
     posting_defaults: 发布默认值
     public_timelines: 公共时间轴
   privacy:
-    hint_html: "<strong>自定义您希望如何找到您的个人资料和嘟文。</strong>启用Mastodon中的各种功能可以帮助您扩大受众范围。请花点时间查看这些设置，确保它们适合您的使用情况。"
+    hint_html: "<strong>自定义你希望如何找到你的个人资料和嘟文。</strong>启用Mastodon中的各种功能可以帮助你扩大受众范围。请花点时间查看这些设置，确保它们适合你的使用情况。"
     privacy: 隐私
     privacy_hint_html: 控制你愿意向他人透露多少信息。通过浏览他人的关注列表和查看他们发嘟所用的应用，人们可以发现有趣的用户和酷炫的应用，但你可能更喜欢将其隐藏起来。
     reach: 范围
@@ -1564,8 +1568,8 @@ zh-CN:
       limit_reached: 互动种类的限制
       unrecognized_emoji: 不是一个可识别的表情
   redirects:
-    prompt: 如果您信任此链接，请单击以继续跳转。
-    title: 您正在离开 %{instance} 。
+    prompt: 如果你信任此链接，请单击以继续跳转。
+    title: 你正在离开 %{instance} 。
   relationships:
     activity: 账号活动
     confirm_follow_selected_followers: 您确定想要关注所选的关注者吗？
@@ -1803,22 +1807,22 @@ zh-CN:
       action: 账户设置
       explanation: 你于 %{appeal_date} 对 %{strike_date} 在你账号上做出的处罚提出的申诉已被批准，你的账号已回到正常状态。
       subject: 你于 %{date} 提出的申诉已被批准
-      subtitle: 您的账户已再次回到良好状态。
+      subtitle: 你的账户已再次回到良好状态。
       title: 申诉已批准
     appeal_rejected:
       explanation: 你于 %{appeal_date} 对 %{strike_date} 在你账号上做出的处罚提出的申诉已被驳回。
       subject: 你于 %{date} 提出的申诉已被驳回
-      subtitle: 您的申诉已被驳回。
+      subtitle: 你的申诉已被驳回。
       title: 申诉已驳回
     backup_ready:
-      explanation: 您之前请求为您的 Mastodon 账户创建一份完整的备份。
+      explanation: 你之前请求为你的 Mastodon 账户创建一份完整的备份。
       extra: 现在它可以下载了！
       subject: 你的存档已经准备完毕
       title: 存档导出
     failed_2fa:
       details: 以下是该次登录尝试的详情：
-      explanation: 有人试图登录到您的账户，但提供了无效的辅助认证因子。
-      further_actions_html: 如果这不是您所为，您的密码可能已经泄露，建议您立即 %{action} 。
+      explanation: 有人试图登录到你的账户，但提供了无效的辅助认证因子。
+      further_actions_html: 如果这不是你所为，你的密码可能已经泄露，建议你立即 %{action} 。
       subject: 辅助认证失败
       title: 辅助认证失败
     suspicious_sign_in:
@@ -1864,24 +1868,24 @@ zh-CN:
       apps_ios_action: 从 App Store 下载
       apps_step: 下载我们的官方应用。
       apps_title: Mastodon应用
-      checklist_subtitle: 让我们带您开启这片社交新天地：
+      checklist_subtitle: 让我们带你开启这片社交新天地：
       checklist_title: 欢迎清单
       edit_profile_action: 个性化
-      edit_profile_step: 完善个人资料，提升您的互动体验。
-      edit_profile_title: 个性化您的个人资料
+      edit_profile_step: 完善个人资料，提升你的互动体验。
+      edit_profile_title: 个性化你的个人资料
       explanation: 下面是几个小贴士，希望它们能帮到你
       feature_action: 了解更多
-      feature_audience: Mastodon为您提供了无需中间商即可管理受众的独特可能。Mastodon可被部署在您自己的基础设施上，允许您关注其它任何Mastodon在线服务器的用户，或被任何其他在线 Mastodon 服务器的用户关注，并且不受您之外的任何人控制。
-      feature_audience_title: 放手去建立起您的受众
-      feature_control: 您最清楚您想在你自己的主页中看到什么动态。没有算法或广告浪费您的时间。您可以用一个账号关注任何 Mastodon 服务器上的任何人，并按时间顺序获得他们发布的嘟文，让您的互联网的角落更合自己的心意。
+      feature_audience: Mastodon为你提供了无需中间商即可管理受众的独特可能。Mastodon可被部署在你自己的基础设施上，允许你关注其它任何Mastodon在线服务器的用户，或被任何其他在线 Mastodon 服务器的用户关注，并且不受你之外的任何人控制。
+      feature_audience_title: 放手去建立起你的受众
+      feature_control: 你最清楚你想在你自己的主页中看到什么动态。没有算法或广告浪费你的时间。你可以用一个账号关注任何 Mastodon 服务器上的任何人，并按时间顺序获得他们发布的嘟文，让你的互联网的角落更合自己的心意。
       feature_control_title: 掌控自己的时间线
-      feature_creativity: Mastodon支持音频、视频和图片、无障碍描述、投票、内容警告， 动画头像、自定义表情包、缩略图裁剪控制等功能，帮助您在网上尽情表达自己。无论您是要发布您的艺术作品、音乐还是播客，Mastodon 都能为您服务。
+      feature_creativity: Mastodon支持音频、视频和图片、无障碍描述、投票、内容警告， 动画头像、自定义表情包、缩略图裁剪控制等功能，帮助你在网上尽情表达自己。无论你是要发布你的艺术作品、音乐还是播客，Mastodon 都能为你服务。
       feature_creativity_title: 无与伦比的创造力
-      feature_moderation: Mastodon将决策权交还给您。每个服务器都会创建自己的规则和条例，并在站点内施行，而不是像企业社交媒体那样居高临下，这使得它可以最灵活地响应不同人群的需求。加入一个您认同其规则的服务器，或托管您自己的服务器。
+      feature_moderation: Mastodon将决策权交还给你。每个服务器都会创建自己的规则和条例，并在站点内施行，而不是像企业社交媒体那样居高临下，这使得它可以最灵活地响应不同人群的需求。加入一个你认同其规则的服务器，或托管你自己的服务器。
       feature_moderation_title: 管理，本应如此
       follow_action: 关注
       follow_step: 关注有趣的人，这就是Mastodon的意义所在。
-      follow_title: 个性化您的首页动态
+      follow_title: 个性化你的首页动态
       follows_subtitle: 关注知名账户
       follows_title: 推荐关注
       follows_view_more: 查看更多可关注的人
@@ -1892,10 +1896,10 @@ zh-CN:
       hashtags_view_more: 查看更多热门话题标签
       post_action: 撰写
       post_step: 向世界打个招呼吧。
-      post_title: 发布您的第一条嘟文
+      post_title: 发布你的第一条嘟文
       share_action: 分享
-      share_step: 让您的朋友知道如何在Mastodon找到你。
-      share_title: 分享您的Mastodon个人资料
+      share_step: 让你的朋友知道如何在Mastodon找到你。
+      share_title: 分享你的Mastodon个人资料
       sign_in_action: 登录
       subject: 欢迎来到 Mastodon
       title: "%{name}，欢迎你的加入！"
@@ -1908,12 +1912,12 @@ zh-CN:
     seamless_external_login: 你通过外部服务登录，因此密码和邮件设置不可用。
     signed_in_as: 当前登录的账户：
   verification:
-    extra_instructions_html: <strong>提示：</strong>您网站上的链接可能是不可见的。重要的部分是 <code>rel="me"</code>，它可以防止在具有用户生成内容的网站上冒充身份。您甚至可以在页面头部使用 <code>link</code> 标签而不是 <code>a</code>，但 HTML 必须能够在不执行 JavaScript 的情况下访问。
+    extra_instructions_html: <strong>提示：</strong>你网站上的链接可能是不可见的。重要的部分是 <code>rel="me"</code>，它可以防止在具有用户生成内容的网站上冒充身份。你甚至可以在页面头部使用 <code>link</code> 标签而不是 <code>a</code>，但 HTML 必须能够在不执行 JavaScript 的情况下访问。
     here_is_how: 具体方法如下：
-    hint_html: "<strong>在Mastodon上验证您的身份对每个人都是必要的。</strong>基于开放网络标准，现在和将来永远免费。您只需要一个被人们认可的个人网站。当您在个人资料中链接到这个网站时，我们会检查该网站是否回链到您的资料，并显示一个指示符号。"
-    instructions_html: 将下面的代码复制并粘贴到您网站的HTML中。然后在“编辑个人资料”选项卡中的附加字段之一添加您网站的地址，并保存更改。
+    hint_html: "<strong>在Mastodon上验证你的身份对每个人都是必要的。</strong>基于开放网络标准，现在和将来永远免费。你只需要一个被人们认可的个人网站。当你在个人资料中链接到这个网站时，我们会检查该网站是否回链到你的资料，并显示一个指示符号。"
+    instructions_html: 将下面的代码复制并粘贴到你网站的HTML中。然后在“编辑个人资料”选项卡中的附加字段之一添加你网站的地址，并保存更改。
     verification: 验证
-    verified_links: 您已验证的链接
+    verified_links: 你已验证的链接
   webauthn_credentials:
     add: 添加新的安全密钥
     create:
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 97a4399b21ef9b..8288e9bfac7915 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -23,6 +23,8 @@ zh-TW:
   admin:
     account_actions:
       action: 執行動作
+      already_silenced: 此帳號已被靜音。
+      already_suspended: 此帳號已被停權。
       title: 對 %{acct} 執行站務動作
     account_moderation_notes:
       create: 新增站務記錄
@@ -44,6 +46,7 @@ zh-TW:
         title: 為 %{username} 變更電子郵件地址
       change_role:
         changed_msg: 成功修改角色！
+        edit_roles: 管理使用者權限
         label: 變更角色
         no_role: 沒有角色
         title: 為 %{username} 變更角色
@@ -590,6 +593,7 @@ zh-TW:
         suspend_description_html: 此帳號及其所有內容將不可被存取並且最終被移除，並且無法與之進行互動。三十天內可以撤銷此動作。關閉所有對此帳號之檢舉報告。
       actions_description_html: 決定應對此報告採取何種行動。若您對檢舉之帳號採取懲罰措施，則將對他們發送 e-mail 通知，除非選擇了 <strong>垃圾郵件</strong> 類別。
       actions_description_remote_html: 決定將對此檢舉報告採取何種動作。這將僅作用於<strong>您的伺服器</strong>與此遠端帳號及其內容之通訊行為。
+      actions_no_posts: 此報告無任何需要刪除之相關嘟文
       add_to_report: 加入更多至報告
       already_suspended_badges:
         local: 已自此伺服器停權

From 8d7860b2fb1fe85393bdf4998e3cbebfd0a15ccf Mon Sep 17 00:00:00 2001
From: Timothy Quilling <teqed.arken@gmail.com>
Date: Mon, 3 Jul 2023 01:10:22 -0400
Subject: [PATCH 2147/2191] feat: add rel me header

---
 app/views/layouts/application.html.haml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 1a3a111b33156c..87ff673e7b9a9e 100755
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -4,6 +4,8 @@
     %meta{ charset: 'utf-8' }/
     %meta{ name: 'viewport', content: 'width=device-width, initial-scale=1' }/
 
+    %link{ rel: 'me' , href: 'https://mstdn.social/@teq' }/
+
     - if cdn_host?
       %link{ rel: 'dns-prefetch', href: cdn_host }/
       %meta{ name: 'cdn-host', content: cdn_host }/

From b303c6af6979a13eb34eddbdfbcd3e348f1d4c67 Mon Sep 17 00:00:00 2001
From: Timothy Quilling <teqed.arken@gmail.com>
Date: Mon, 3 Jul 2023 01:25:12 -0400
Subject: [PATCH 2148/2191] chore: meow

---
 CONTRIBUTING.md                                           | 2 +-
 README.md                                                 | 2 +-
 .../glitch/features/ui/components/link_footer.jsx         | 2 +-
 config/settings.yml                                       | 2 +-
 lib/mastodon/version.rb                                   | 8 ++++----
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 3142b3f557a328..b1af7033b64a1f 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,4 +1,4 @@
-# Contributing to Catstodon
+#  Contributing to Meowstodon #
 
 Thank you for your interest in contributing to a fork of the `glitch-soc` project!
 Before you do anything here, please check if you can contribute to either the [vanilla Mastodon project](https://github.com/mastodon/mastodon) or [glitch-soc](https://github.com/glitch-soc/mastodon) first.
diff --git a/README.md b/README.md
index 573534affae903..085766db9a82fe 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Catstodon
+# Meowstodon
 
 ## Introduction
 
diff --git a/app/javascript/flavours/glitch/features/ui/components/link_footer.jsx b/app/javascript/flavours/glitch/features/ui/components/link_footer.jsx
index 7b842d91097417..ac2e116583eeef 100644
--- a/app/javascript/flavours/glitch/features/ui/components/link_footer.jsx
+++ b/app/javascript/flavours/glitch/features/ui/components/link_footer.jsx
@@ -74,7 +74,7 @@ class LinkFooter extends PureComponent {
         </p>
 
         <p>
-          <strong>Catstodon</strong>:
+          <strong>Meowstodon</strong>:
           {' '}
           <a href={source_url} rel='noopener noreferrer' target='_blank'><FormattedMessage id='footer.about' defaultMessage='About' /></a>
           {DividingCircle}
diff --git a/config/settings.yml b/config/settings.yml
index aa902beaa1ef84..9c477ede32ef5e 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -2,7 +2,7 @@
 # important settings can be changed from the admin interface.
 
 defaults: &defaults
-  site_title: 'Catstodon'
+  site_title: 'Meowstodon'
   site_short_description: ''
   site_description: ''
   site_extended_description: ''
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index 7028a00431c78f..f42f76975b9654 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -24,12 +24,12 @@ def prerelease
       ENV['MASTODON_VERSION_PRERELEASE'].presence || default_prerelease
     end
 
-    def catstodon_revision
-      '1.0.0+nightly'
+    def meowstodon_revision
+      '1.0.0.1+nightly'
     end
 
     def build_metadata
-      ["cat.#{catstodon_revision}", ENV.fetch('MASTODON_VERSION_METADATA', nil)].compact_blank.join('.')
+      ["glitch.cat.meow.#{meowstodon_revision}", ENV.fetch('MASTODON_VERSION_METADATA', nil)].compact_blank.join('.')
     end
 
     def to_a
@@ -48,7 +48,7 @@ def gem_version
     end
 
     def repository
-      ENV.fetch('GITHUB_REPOSITORY', 'CatCatNya/catstodon')
+      ENV.fetch('GITHUB_REPOSITORY', 'Teqed/meowstodon')
     end
 
     def source_base_url

From c432392d72ef7e25a10f5d0fa5df272caf528725 Mon Sep 17 00:00:00 2001
From: Timothy Quilling <teqed.arken@gmail.com>
Date: Mon, 3 Jul 2023 02:09:15 -0400
Subject: [PATCH 2149/2191] feat: add rel me header

---
 app/views/layouts/application.html.haml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 87ff673e7b9a9e..80e84cfaad0027 100755
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -5,6 +5,9 @@
     %meta{ name: 'viewport', content: 'width=device-width, initial-scale=1' }/
 
     %link{ rel: 'me' , href: 'https://mstdn.social/@teq' }/
+    %link{ rel: 'me' , href: 'https://mastodon.world/@teq' }/
+    %link{ rel: 'me' , href: 'https://mas.to/@teq' }/
+    %link{ rel: 'me' , href: 'https://mastodon.online/@teq' }/
 
     - if cdn_host?
       %link{ rel: 'dns-prefetch', href: cdn_host }/

From 727dc9c961645dbcb9e1200bcb643905ad1f02fe Mon Sep 17 00:00:00 2001
From: Timothy Quilling <teqed.arken@gmail.com>
Date: Mon, 3 Jul 2023 04:28:23 -0400
Subject: [PATCH 2150/2191] feat: add rel me header

---
 app/views/layouts/application.html.haml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 80e84cfaad0027..1373a02a6412b9 100755
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -8,6 +8,8 @@
     %link{ rel: 'me' , href: 'https://mastodon.world/@teq' }/
     %link{ rel: 'me' , href: 'https://mas.to/@teq' }/
     %link{ rel: 'me' , href: 'https://mastodon.online/@teq' }/
+    %link{ rel: 'me' , href: 'https://infosec.exchange/@teq' }/
+    %link{ rel: 'me' , href: 'https://mastodon.gamedev.place/@teq' }/
 
     - if cdn_host?
       %link{ rel: 'dns-prefetch', href: cdn_host }/

From 7c2e5315a194cefe56615701413dd6c4cf5eee7a Mon Sep 17 00:00:00 2001
From: Timothy Quilling <teqed.arken@gmail.com>
Date: Mon, 10 Jul 2023 11:29:09 -0400
Subject: [PATCH 2151/2191] feat: counters

---
 .../mastodon/components/status_action_bar.jsx | 38 ++++++++++++-------
 .../mastodon/components/status_list.jsx       |  1 +
 2 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/app/javascript/mastodon/components/status_action_bar.jsx b/app/javascript/mastodon/components/status_action_bar.jsx
index f24f81e1b207b3..1868772d9d6cec 100644
--- a/app/javascript/mastodon/components/status_action_bar.jsx
+++ b/app/javascript/mastodon/components/status_action_bar.jsx
@@ -375,20 +375,30 @@ class StatusActionBar extends ImmutablePureComponent {
 
     return (
       <div className='status__action-bar'>
-        <IconButton className='status__action-bar__button' title={replyTitle} icon={isReply ? 'reply' : replyIcon} iconComponent={isReply ? ReplyIcon : replyIconComponent} onClick={this.handleReplyClick} counter={status.get('replies_count')} />
-        <IconButton className={classNames('status__action-bar__button', { reblogPrivate })} disabled={!publicStatus && !reblogPrivate} active={status.get('reblogged')} title={reblogTitle} icon='retweet' iconComponent={reblogIconComponent} onClick={this.handleReblogClick} counter={withCounters ? status.get('reblogs_count') : undefined} />
-        <IconButton className='status__action-bar__button star-icon' animate active={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='star' iconComponent={status.get('favourited') ? StarIcon : StarBorderIcon} onClick={this.handleFavouriteClick} counter={withCounters ? status.get('favourites_count') : undefined} />
-        <IconButton className='status__action-bar__button bookmark-icon' disabled={!signedIn} active={status.get('bookmarked')} title={intl.formatMessage(messages.bookmark)} icon='bookmark' iconComponent={status.get('bookmarked') ? BookmarkIcon : BookmarkBorderIcon} onClick={this.handleBookmarkClick} />
-
-        <DropdownMenuContainer
-          scrollKey={scrollKey}
-          status={status}
-          items={menu}
-          icon='ellipsis-h'
-          iconComponent={MoreHorizIcon}
-          direction='right'
-          title={intl.formatMessage(messages.more)}
-        />
+        <IconButton className='status__action-bar__button' title={replyTitle} icon={status.get('in_reply_to_account_id') === status.getIn(['account', 'id']) ? 'reply' : replyIcon} onClick={this.handleReplyClick} counter={status.get('replies_count')} />
+        <IconButton className={classNames('status__action-bar__button', { reblogPrivate })} disabled={!publicStatus && !reblogPrivate} active={status.get('reblogged')} title={reblogTitle} icon='retweet' onClick={this.handleReblogClick} counter={status.get('reblogs_count')} />
+        <IconButton className='status__action-bar__button star-icon' animate active={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='star' onClick={this.handleFavouriteClick} counter={status.get('favourites_count')} />
+        {
+          signedIn
+            ? <EmojiPickerDropdown className='status__action-bar-button' onPickEmoji={this.handleEmojiPick} button={reactButton} disabled={!canReact} />
+            : reactButton
+        }
+        <IconButton className='status__action-bar__button bookmark-icon' disabled={!signedIn} active={status.get('bookmarked')} title={intl.formatMessage(messages.bookmark)} icon='bookmark' onClick={this.handleBookmarkClick} />
+
+        {filterButton}
+
+        <div className='status__action-bar__dropdown'>
+          <DropdownMenuContainer
+            scrollKey={scrollKey}
+            disabled={anonymousAccess}
+            status={status}
+            items={menu}
+            icon='ellipsis-h'
+            size={18}
+            direction='right'
+            title={intl.formatMessage(messages.more)}
+          />
+        </div>
       </div>
     );
   }
diff --git a/app/javascript/mastodon/components/status_list.jsx b/app/javascript/mastodon/components/status_list.jsx
index c6cacbd2b27285..bda24096d54c62 100644
--- a/app/javascript/mastodon/components/status_list.jsx
+++ b/app/javascript/mastodon/components/status_list.jsx
@@ -38,6 +38,7 @@ export default class StatusList extends ImmutablePureComponent {
 
   static defaultProps = {
     trackScroll: true,
+    withCounters: true,
   };
 
   getFeaturedStatusCount = () => {

From c98d88a23e0c4d76ef3780102f7ec18f838db649 Mon Sep 17 00:00:00 2001
From: Timothy Quilling <teqed.arken@gmail.com>
Date: Mon, 10 Jul 2023 11:47:33 -0400
Subject: [PATCH 2152/2191] chore: count display logic

---
 app/helpers/home_helper.rb                             |  4 +---
 app/javascript/mastodon/components/animated_number.tsx | 10 ++++++++++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/app/helpers/home_helper.rb b/app/helpers/home_helper.rb
index c5b83326db3ee8..29e94d843416e4 100644
--- a/app/helpers/home_helper.rb
+++ b/app/helpers/home_helper.rb
@@ -42,10 +42,8 @@ def account_link_to(account, button = '', path: nil)
   def obscured_counter(count)
     if count <= 0
       '0'
-    elsif count == 1
-      '1'
     else
-      '1+'
+      count
     end
   end
 
diff --git a/app/javascript/mastodon/components/animated_number.tsx b/app/javascript/mastodon/components/animated_number.tsx
index 6c1e0aaec14d64..f22aba0449d3d2 100644
--- a/app/javascript/mastodon/components/animated_number.tsx
+++ b/app/javascript/mastodon/components/animated_number.tsx
@@ -6,6 +6,16 @@ import { reduceMotion } from '../initial_state';
 
 import { ShortNumber } from './short_number';
 
+const obfuscatedCount = (count: number) => {
+  if (count < 0) {
+    return 0;
+  } else {
+    return (
+      <ShortNumber value={count} />
+    );
+  }
+};
+
 interface Props {
   value: number;
 }

From 81d47117cc411ac33c9a35a70677d78bfe0aab36 Mon Sep 17 00:00:00 2001
From: Timothy Quilling <teqed.arken@gmail.com>
Date: Mon, 10 Jul 2023 12:06:25 -0400
Subject: [PATCH 2153/2191] chore: counters check

---
 .../flavours/glitch/components/animated_number.tsx          | 6 +++---
 spec/helpers/home_helper_spec.rb                            | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/javascript/flavours/glitch/components/animated_number.tsx b/app/javascript/flavours/glitch/components/animated_number.tsx
index e784d445d4cfb2..23e3f6a4de8828 100644
--- a/app/javascript/flavours/glitch/components/animated_number.tsx
+++ b/app/javascript/flavours/glitch/components/animated_number.tsx
@@ -9,10 +9,10 @@ import { ShortNumber } from './short_number';
 const obfuscatedCount = (count: number) => {
   if (count < 0) {
     return 0;
-  } else if (count <= 1) {
-    return count;
   } else {
-    return '1+';
+    return (
+      <ShortNumber value={count} />
+    );
   }
 };
 
diff --git a/spec/helpers/home_helper_spec.rb b/spec/helpers/home_helper_spec.rb
index befc8a5c80db49..5cf91aad3cc2a0 100644
--- a/spec/helpers/home_helper_spec.rb
+++ b/spec/helpers/home_helper_spec.rb
@@ -70,7 +70,7 @@ def current_account = Account.last
       let(:count) { 10 }
 
       it 'returns the correct string' do
-        expect(helper.obscured_counter(count)).to eq '1+'
+        expect(helper.obscured_counter(count)).to gt '1'
       end
     end
   end

From 7b6f0092d6ba2ddf56e573d1a9847e1a85fd0c3a Mon Sep 17 00:00:00 2001
From: Timothy Quilling <teqed.arken@gmail.com>
Date: Mon, 10 Jul 2023 23:14:11 -0400
Subject: [PATCH 2154/2191] debug: statuses trends models

---
 app/models/trends/statuses.rb | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/models/trends/statuses.rb b/app/models/trends/statuses.rb
index bbffc72fe638d0..047f1017d295c7 100644
--- a/app/models/trends/statuses.rb
+++ b/app/models/trends/statuses.rb
@@ -126,6 +126,12 @@ def calculate_scores(statuses, at_time)
                          score * (0.5**((at_time.to_f - status.created_at.to_f) / options[:score_halflife].to_f))
                        end
 
+      # Print out relevant information for debugging
+      puts "Status: #{status.inspect}"
+      puts "Expected: #{expected}"
+      puts "Observed: #{observed}"
+      puts "Score: #{score}"
+      puts "Decaying Score: #{decaying_score}"
       [decaying_score, status]
     end
 

From 98cdfc1723e7858a2de219f5bb1cb7421661aea3 Mon Sep 17 00:00:00 2001
From: Timothy Quilling <teqed.arken@gmail.com>
Date: Mon, 10 Jul 2023 23:44:46 -0400
Subject: [PATCH 2155/2191] chore: tweak status pool

---
 app/models/trends/statuses.rb | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/app/models/trends/statuses.rb b/app/models/trends/statuses.rb
index 047f1017d295c7..ca4e6485725ab3 100644
--- a/app/models/trends/statuses.rb
+++ b/app/models/trends/statuses.rb
@@ -62,13 +62,15 @@ def query
   def refresh(at_time = Time.now.utc)
     # First, recalculate scores for statuses that were trending previously. We split the queries
     # to avoid having to load all of the IDs into Ruby just to send them back into Postgres
-    Status.where(id: StatusTrend.select(:status_id)).includes(:status_stat, :account).reorder(nil).find_in_batches(batch_size: BATCH_SIZE) do |statuses|
+    # Original: Status.where(id: StatusTrend.select(:status_id)).includes(:status_stat, :account).reorder(nil).find_in_batches(batch_size: BATCH_SIZE) do |statuses|
+    Status.order(created_at: :desc).includes(:status_stat, :account).reorder(nil).find_in_batches(batch_size: BATCH_SIZE) do |statuses|
       calculate_scores(statuses, at_time)
     end
 
     # Then, calculate scores for statuses that were used today. There are potentially some
     # duplicate items here that we might process one more time, but that should be fine
-    Status.where(id: recently_used_ids(at_time)).includes(:status_stat, :account).reorder(nil).find_in_batches(batch_size: BATCH_SIZE) do |statuses|
+    # Original: Status.where(id: recently_used_ids(at_time)).includes(:status_stat, :account).reorder(nil).find_in_batches(batch_size: BATCH_SIZE) do |statuses|
+    Status.order(created_at: :desc).includes(:status_stat, :account).reorder(nil).find_in_batches(batch_size: BATCH_SIZE) do |statuses|
       calculate_scores(statuses, at_time)
     end
 
@@ -126,12 +128,6 @@ def calculate_scores(statuses, at_time)
                          score * (0.5**((at_time.to_f - status.created_at.to_f) / options[:score_halflife].to_f))
                        end
 
-      # Print out relevant information for debugging
-      puts "Status: #{status.inspect}"
-      puts "Expected: #{expected}"
-      puts "Observed: #{observed}"
-      puts "Score: #{score}"
-      puts "Decaying Score: #{decaying_score}"
       [decaying_score, status]
     end
 

From 4fddac76f54852c3e7b12f8fe40c6dac9c47911a Mon Sep 17 00:00:00 2001
From: Timothy Quilling <teqed.arken@gmail.com>
Date: Mon, 10 Jul 2023 23:54:19 -0400
Subject: [PATCH 2156/2191] feat: allow-approve trend

---
 app/models/trends/statuses.rb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/models/trends/statuses.rb b/app/models/trends/statuses.rb
index ca4e6485725ab3..560a16b51abfbb 100644
--- a/app/models/trends/statuses.rb
+++ b/app/models/trends/statuses.rb
@@ -134,7 +134,10 @@ def calculate_scores(statuses, at_time)
     to_insert = items.filter { |(score, _)| score >= options[:decay_threshold] }
     to_delete = items.filter { |(score, _)| score < options[:decay_threshold] }
 
-    StatusTrend.upsert_all(to_insert.map { |(score, status)| { status_id: status.id, account_id: status.account_id, score: score, language: status.language, allowed: status.trendable? || false } }, unique_by: :status_id) if to_insert.any?
-    StatusTrend.where(status_id: to_delete.map { |(_, status)| status.id }).delete_all if to_delete.any?
+    StatusTrend.transaction do
+      StatusTrend.upsert_all(to_insert.map { |(score, status)| { status_id: status.id, account_id: status.account_id, score: score, language: status.language, allowed: status.trendable? || false } }, unique_by: :status_id) if to_insert.any?
+      StatusTrend.where(status_id: to_delete.map { |(_, status)| status.id }).delete_all if to_delete.any?
+      StatusTrend.connection.exec_update('UPDATE status_trends SET rank = t0.calculated_rank, allowed = true FROM (SELECT id, row_number() OVER w AS calculated_rank FROM status_trends WINDOW w AS (PARTITION BY language ORDER BY score DESC)) t0 WHERE status_trends.id = t0.id')
+    end
   end
 end

From 9980bdd78e69ee0e817ea6afed3fd5576771ed2e Mon Sep 17 00:00:00 2001
From: Timothy Quilling <teqed.arken@gmail.com>
Date: Tue, 11 Jul 2023 00:08:43 -0400
Subject: [PATCH 2157/2191] chore: narrow db query

---
 app/models/trends/statuses.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/trends/statuses.rb b/app/models/trends/statuses.rb
index 560a16b51abfbb..8d91deec40d141 100644
--- a/app/models/trends/statuses.rb
+++ b/app/models/trends/statuses.rb
@@ -63,14 +63,14 @@ def refresh(at_time = Time.now.utc)
     # First, recalculate scores for statuses that were trending previously. We split the queries
     # to avoid having to load all of the IDs into Ruby just to send them back into Postgres
     # Original: Status.where(id: StatusTrend.select(:status_id)).includes(:status_stat, :account).reorder(nil).find_in_batches(batch_size: BATCH_SIZE) do |statuses|
-    Status.order(created_at: :desc).includes(:status_stat, :account).reorder(nil).find_in_batches(batch_size: BATCH_SIZE) do |statuses|
+    Status.where('reblogs_count > ? OR favourites_count > ?', 3, 3).order(created_at: :desc).includes(:status_stat, :account).reorder(nil).find_in_batches(batch_size: BATCH_SIZE) do |statuses|
       calculate_scores(statuses, at_time)
     end
 
     # Then, calculate scores for statuses that were used today. There are potentially some
     # duplicate items here that we might process one more time, but that should be fine
     # Original: Status.where(id: recently_used_ids(at_time)).includes(:status_stat, :account).reorder(nil).find_in_batches(batch_size: BATCH_SIZE) do |statuses|
-    Status.order(created_at: :desc).includes(:status_stat, :account).reorder(nil).find_in_batches(batch_size: BATCH_SIZE) do |statuses|
+    Status.where('reblogs_count > ? OR favourites_count > ?', 3, 3).order(created_at: :desc).includes(:status_stat, :account).reorder(nil).find_in_batches(batch_size: BATCH_SIZE) do |statuses|
       calculate_scores(statuses, at_time)
     end
 

From 8f9f3c7583e2bf7356ccf3d19e198125210f81a9 Mon Sep 17 00:00:00 2001
From: Timothy Quilling <teqed.arken@gmail.com>
Date: Tue, 11 Jul 2023 00:30:11 -0400
Subject: [PATCH 2158/2191] fix: sql column table location

---
 app/models/trends/statuses.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/trends/statuses.rb b/app/models/trends/statuses.rb
index 8d91deec40d141..5e2ef93ae39150 100644
--- a/app/models/trends/statuses.rb
+++ b/app/models/trends/statuses.rb
@@ -63,14 +63,14 @@ def refresh(at_time = Time.now.utc)
     # First, recalculate scores for statuses that were trending previously. We split the queries
     # to avoid having to load all of the IDs into Ruby just to send them back into Postgres
     # Original: Status.where(id: StatusTrend.select(:status_id)).includes(:status_stat, :account).reorder(nil).find_in_batches(batch_size: BATCH_SIZE) do |statuses|
-    Status.where('reblogs_count > ? OR favourites_count > ?', 3, 3).order(created_at: :desc).includes(:status_stat, :account).reorder(nil).find_in_batches(batch_size: BATCH_SIZE) do |statuses|
+    Status.order(created_at: :desc).includes(:status_stat, :account).joins(:status_stat).where('status_stats.reblogs_count > ? OR status_stats.favourites_count > ?', 3, 3).reorder(nil).find_in_batches(batch_size: BATCH_SIZE) do |statuses|
       calculate_scores(statuses, at_time)
     end
 
     # Then, calculate scores for statuses that were used today. There are potentially some
     # duplicate items here that we might process one more time, but that should be fine
     # Original: Status.where(id: recently_used_ids(at_time)).includes(:status_stat, :account).reorder(nil).find_in_batches(batch_size: BATCH_SIZE) do |statuses|
-    Status.where('reblogs_count > ? OR favourites_count > ?', 3, 3).order(created_at: :desc).includes(:status_stat, :account).reorder(nil).find_in_batches(batch_size: BATCH_SIZE) do |statuses|
+    Status.order(created_at: :desc).includes(:status_stat, :account).joins(:status_stat).where('status_stats.reblogs_count > ? OR status_stats.favourites_count > ?', 3, 3).reorder(nil).find_in_batches(batch_size: BATCH_SIZE) do |statuses|
       calculate_scores(statuses, at_time)
     end
 

From 2c335222c72ca65f9de43119f24c7fa402cdff34 Mon Sep 17 00:00:00 2001
From: Timothy Quilling <teqed.arken@gmail.com>
Date: Tue, 11 Jul 2023 00:41:09 -0400
Subject: [PATCH 2159/2191] chore: filter only last week

---
 app/models/trends/statuses.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/trends/statuses.rb b/app/models/trends/statuses.rb
index 5e2ef93ae39150..0ecbf052631351 100644
--- a/app/models/trends/statuses.rb
+++ b/app/models/trends/statuses.rb
@@ -63,14 +63,14 @@ def refresh(at_time = Time.now.utc)
     # First, recalculate scores for statuses that were trending previously. We split the queries
     # to avoid having to load all of the IDs into Ruby just to send them back into Postgres
     # Original: Status.where(id: StatusTrend.select(:status_id)).includes(:status_stat, :account).reorder(nil).find_in_batches(batch_size: BATCH_SIZE) do |statuses|
-    Status.order(created_at: :desc).includes(:status_stat, :account).joins(:status_stat).where('status_stats.reblogs_count > ? OR status_stats.favourites_count > ?', 3, 3).reorder(nil).find_in_batches(batch_size: BATCH_SIZE) do |statuses|
+    Status.where('statuses.created_at >= ?', last_week).order(created_at: :desc).includes(:status_stat, :account).joins(:status_stat).where('status_stats.reblogs_count > ? OR status_stats.favourites_count > ?', 3, 3).reorder(nil).find_in_batches(batch_size: BATCH_SIZE) do |statuses|
       calculate_scores(statuses, at_time)
     end
 
     # Then, calculate scores for statuses that were used today. There are potentially some
     # duplicate items here that we might process one more time, but that should be fine
     # Original: Status.where(id: recently_used_ids(at_time)).includes(:status_stat, :account).reorder(nil).find_in_batches(batch_size: BATCH_SIZE) do |statuses|
-    Status.order(created_at: :desc).includes(:status_stat, :account).joins(:status_stat).where('status_stats.reblogs_count > ? OR status_stats.favourites_count > ?', 3, 3).reorder(nil).find_in_batches(batch_size: BATCH_SIZE) do |statuses|
+    Status.where('statuses.created_at >= ?', last_week).order(created_at: :desc).includes(:status_stat, :account).joins(:status_stat).where('status_stats.reblogs_count > ? OR status_stats.favourites_count > ?', 3, 3).reorder(nil).find_in_batches(batch_size: BATCH_SIZE) do |statuses|
       calculate_scores(statuses, at_time)
     end
 

From ef4f4a7dafd06ee022ea3c534286c696f5a67511 Mon Sep 17 00:00:00 2001
From: Timothy Quilling <teqed.arken@gmail.com>
Date: Tue, 11 Jul 2023 00:41:55 -0400
Subject: [PATCH 2160/2191] chore: last_week variable

---
 app/models/trends/statuses.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/trends/statuses.rb b/app/models/trends/statuses.rb
index 0ecbf052631351..7fc866bdb4d1af 100644
--- a/app/models/trends/statuses.rb
+++ b/app/models/trends/statuses.rb
@@ -63,14 +63,14 @@ def refresh(at_time = Time.now.utc)
     # First, recalculate scores for statuses that were trending previously. We split the queries
     # to avoid having to load all of the IDs into Ruby just to send them back into Postgres
     # Original: Status.where(id: StatusTrend.select(:status_id)).includes(:status_stat, :account).reorder(nil).find_in_batches(batch_size: BATCH_SIZE) do |statuses|
-    Status.where('statuses.created_at >= ?', last_week).order(created_at: :desc).includes(:status_stat, :account).joins(:status_stat).where('status_stats.reblogs_count > ? OR status_stats.favourites_count > ?', 3, 3).reorder(nil).find_in_batches(batch_size: BATCH_SIZE) do |statuses|
+    Status.where('statuses.created_at >= ?', 1.week.ago).order(created_at: :desc).includes(:status_stat, :account).joins(:status_stat).where('status_stats.reblogs_count > ? OR status_stats.favourites_count > ?', 3, 3).reorder(nil).find_in_batches(batch_size: BATCH_SIZE) do |statuses|
       calculate_scores(statuses, at_time)
     end
 
     # Then, calculate scores for statuses that were used today. There are potentially some
     # duplicate items here that we might process one more time, but that should be fine
     # Original: Status.where(id: recently_used_ids(at_time)).includes(:status_stat, :account).reorder(nil).find_in_batches(batch_size: BATCH_SIZE) do |statuses|
-    Status.where('statuses.created_at >= ?', last_week).order(created_at: :desc).includes(:status_stat, :account).joins(:status_stat).where('status_stats.reblogs_count > ? OR status_stats.favourites_count > ?', 3, 3).reorder(nil).find_in_batches(batch_size: BATCH_SIZE) do |statuses|
+    Status.where('statuses.created_at >= ?', 1.week.ago).order(created_at: :desc).includes(:status_stat, :account).joins(:status_stat).where('status_stats.reblogs_count > ? OR status_stats.favourites_count > ?', 3, 3).reorder(nil).find_in_batches(batch_size: BATCH_SIZE) do |statuses|
       calculate_scores(statuses, at_time)
     end
 

From a523d5412589e75c5fbce544bddc12036e04cc82 Mon Sep 17 00:00:00 2001
From: Timothy Quilling <teqed@shatteredsky.net>
Date: Wed, 12 Jul 2023 12:25:18 -0400
Subject: [PATCH 2161/2191] Update README.md

---
 README.md | 51 +++++++++++++++++++++++++++++++++------------------
 1 file changed, 33 insertions(+), 18 deletions(-)

diff --git a/README.md b/README.md
index 085766db9a82fe..be04298f4dd946 100644
--- a/README.md
+++ b/README.md
@@ -2,34 +2,42 @@
 
 ## Introduction
 
-This Mastodon fork is based on the [glitch-soc Fork of Mastodon](https://github.com/glitch-soc/mastodon), with changes
-made to suit [CatCatNya~](https://catcatnya.com).
-I intend to contribute some useful differences back to [glitch-soc](https://github.com/glitch-soc/mastodon)
-and [vanilla Mastodon](https://github.com/mastodon/mastodon).
+This Mastodon fork is based on the [Catstodon Fork](https://github.com/CatCatNya/catstodon) which is based on the [glitch-soc Fork of Mastodon](https://github.com/glitch-soc/mastodon), with changes made to suit [shatteredsky.net](https://shatteredsky.net).
 
-To install, take a look at [glitch-soc.github.io/docs/](https://glitch-soc.github.io/docs/). The instructions and
-features are the same, except for the differences outlined below.
+To install, take a look at [glitch-soc.github.io/docs/](https://glitch-soc.github.io/docs/), substituting this repository where appropriate.
 
-Contributing guidelines are available [here](CONTRIBUTING.md).
+## glitch-soc - Differences from mastodon/mastodon
+The following is an excerpt from [glitch-soc's documentation](https://glitch-soc.github.io/docs/):
 
-Note: Use the main branch only for forks. `develop` branch may, at times,
-be force-pushed to (mostly for undoing cherry-picking of vanilla commits when upstream adopts them).
-I highly suggest only ever running the `main` branch in production, as is done for [CatCatNya~](https://catcatnya.com)!
-I also highly suggest not rebasing on this if you are maintaining a fork,
-instead, use merge (fast-forward, if possible, with merge commit otherwise).
+- Media improvements
+- Images inside the CW spoiler
+- fullwidth images
+- scaling options
+- Formatted toots
+- Highlighting of misleading links
+- Hiding follower count
+- An app settings modal
+- Collapsible toots
+- Colored toot visibility icons
+- Local-only toots
+- Threaded mode
+- data-* attributes on statuses for custom CSS targeting
+- Advanced theming via flavours+skins
+- Doodle
 
-## Differences
+## Catstodon - Differences from glitch-soc
 
-- Some files are adjusted specifically for the CatCatNya~ instance. Specifically, these:
-  - sounds/boop.mp3
-  - sounds/boop.ogg
-    <br>You might want to revert these to the upstream files (or your own versions!) if you decide to use this fork for
-    your own instance.
+- Emoji reactions on statuses (with both Unicode and custom emojis, same as for announcements).
+- The web frontend emoji picker is a blobcat instead of the joy emoji.
 - The rate limits for authenticated users have been relaxed a bit.
 - The API endpoint `/api/v1/custom_emojis` is no longer affected by AUTHORIZED_FETCH, allowing anyone to copy custom
   emojis.
 - Allow higher resolution images. (4096x4096 instead of the previous limit of 3840x2160)
 - Allow posting polls with only one poll option (if `MIN_POLL_OPTIONS` is set to 1 on your instance).
+- Added oatstodon flavour (by [@oat@hellsite.site](https://hellsite.site/@oat))
+- Some sound files are adjusted:
+  - sounds/boop.mp3
+  - sounds/boop.ogg
 - Emoji reactions on statuses (with both Unicode and custom emojis, same as for announcements), a feature originally
   developed for [Nyastodon](https://git.bsd.gay/fef/nyastodon).
   Ended up as a Catstodon-maintained patch after its initial two Pull Requests to glitch-soc, but was handed over
@@ -49,6 +57,13 @@ instead, use merge (fast-forward, if possible, with merge commit otherwise).
   - This is simply to allow custom emoji compat with other fedi software.
   - Original patch by hazycora: https://github.com/TheEssem/mastodon/commit/2dde7a25a47a23f827e2fd2d07f55438f9985181
 
+## Meowstodon - Differences from Catstodon
+
+- Counters in the web interface [have been modified](https://github.com/Teqed/meowstodon/blame/15b5e3eb79607ce1f01fb6ba0b16ebed5ab97a5b/app/helpers/home_helper.rb) to display `count` or `ShortNumber` instead of `1+`.
+- The queries for trending statuses [have been changed](https://github.com/Teqed/meowstodon/blame/15b5e3eb79607ce1f01fb6ba0b16ebed5ab97a5b/app/models/trends/statuses.rb) -- instead of using `recently_used_ids()` a selection of recent statuses from the last week are chosen.
+- When [calculating scores](https://github.com/Teqed/meowstodon/blame/15b5e3eb79607ce1f01fb6ba0b16ebed5ab97a5b/app/models/trends/statuses.rb) for trends, set `allowed = true` for eligible statuses.
+- [Personal rel="me" headers](https://github.com/Teqed/meowstodon/blame/15b5e3eb79607ce1f01fb6ba0b16ebed5ab97a5b/app/views/layouts/application.html.haml) added for link verification of alt profiles. Currently hardcoded but in the future this might be provided by environment variable -- change these if forking.
+
 ## Previous differences now merged into glitch-soc
 
 - Fixed incorrect upload size limit display when adding new a new custom

From 2a69a93bd59bd1a47ab84a030e47baafc4d1061e Mon Sep 17 00:00:00 2001
From: neatchee <neatchee@gmail.com>
Date: Wed, 21 Dec 2022 02:17:03 -0800
Subject: [PATCH 2162/2191] Enlarge emoji in post contents on mouse-over

---
 .../glitch/styles/components/status.scss      | 1175 +++++++++++++++++
 1 file changed, 1175 insertions(+)
 create mode 100644 app/javascript/flavours/glitch/styles/components/status.scss

diff --git a/app/javascript/flavours/glitch/styles/components/status.scss b/app/javascript/flavours/glitch/styles/components/status.scss
new file mode 100644
index 00000000000000..ff8ec879ce051c
--- /dev/null
+++ b/app/javascript/flavours/glitch/styles/components/status.scss
@@ -0,0 +1,1175 @@
+@keyframes spring-flip-in {
+  0% {
+    transform: rotate(0deg);
+  }
+
+  30% {
+    transform: rotate(-242.4deg);
+  }
+
+  60% {
+    transform: rotate(-158.35deg);
+  }
+
+  90% {
+    transform: rotate(-187.5deg);
+  }
+
+  100% {
+    transform: rotate(-180deg);
+  }
+}
+
+@keyframes spring-flip-out {
+  0% {
+    transform: rotate(-180deg);
+  }
+
+  30% {
+    transform: rotate(62.4deg);
+  }
+
+  60% {
+    transform: rotate(-21.635deg);
+  }
+
+  90% {
+    transform: rotate(7.5deg);
+  }
+
+  100% {
+    transform: rotate(0deg);
+  }
+}
+
+.status__content--with-action {
+  cursor: pointer;
+}
+
+.status__content {
+  position: relative;
+  margin: 10px 0;
+  font-size: 15px;
+  line-height: 20px;
+  word-wrap: break-word;
+  font-weight: 400;
+  overflow: visible;
+  padding-top: 5px;
+  clear: both;
+
+  &:focus {
+    outline: 0;
+  }
+
+  .emojione {
+    width: 20px;
+    height: 20px;
+    margin: -3px 0 0;
+  }
+
+  p, pre, blockquote {
+    margin-bottom: 20px;
+    white-space: pre-wrap;
+    unicode-bidi: plaintext;
+
+    &:last-child {
+      margin-bottom: 0;
+    }
+  }
+
+  .status__content__text,
+  .e-content {
+    overflow: visible;
+
+    .emojione {
+      transition-duration:0.08s;
+    }
+
+    .emojione:hover {
+      transform: scale(1.8);
+      filter: drop-shadow(0 0 3px #0c0c0c);
+      z-index:99;
+    }
+
+    & > ul,
+    & > ol {
+      margin-bottom: 20px;
+    }
+
+    h1, h2, h3, h4, h5 {
+      margin-top: 20px;
+      margin-bottom: 20px;
+    }
+
+    h1, h2 {
+      font-weight: 700;
+      font-size: 1.2em;
+    }
+
+    h2 {
+      font-size: 1.1em;
+    }
+
+    h3, h4, h5 {
+      font-weight: 500;
+    }
+
+    blockquote {
+      padding-left: 10px;
+      border-left: 3px solid $darker-text-color;
+      color: $darker-text-color;
+      white-space: normal;
+
+      p:last-child {
+        margin-bottom: 0;
+      }
+    }
+
+    b, strong {
+      font-weight: 700;
+    }
+
+    em, i {
+      font-style: italic;
+    }
+
+    sub {
+      font-size: smaller;
+      vertical-align: sub;
+    }
+
+    sup {
+      font-size: smaller;
+      vertical-align: super;
+    }
+
+    ul, ol {
+      margin-left: 2em;
+
+      p {
+        margin: 0;
+      }
+    }
+
+    ul {
+      list-style-type: disc;
+    }
+
+    ol {
+      list-style-type: decimal;
+    }
+  }
+
+  a {
+    color: $secondary-text-color;
+    text-decoration: none;
+    unicode-bidi: isolate;
+
+    &:hover {
+      text-decoration: underline;
+
+      .fa {
+        color: lighten($dark-text-color, 7%);
+      }
+    }
+
+    &.mention {
+      &:hover {
+        text-decoration: none;
+
+        span {
+          text-decoration: underline;
+        }
+      }
+    }
+
+    .fa {
+      color: $dark-text-color;
+    }
+  }
+
+  .status__content__spoiler {
+    display: none;
+
+    &.status__content__spoiler--visible {
+      display: block;
+    }
+  }
+
+  a.unhandled-link {
+    color: $highlight-text-color;
+
+    .link-origin-tag {
+      color: $gold-star;
+      font-size: 0.8em;
+    }
+  }
+
+  .status__content__spoiler-link {
+    background: lighten($ui-base-color, 30%);
+
+    &:hover,
+    &:focus {
+      background: lighten($ui-base-color, 33%);
+      text-decoration: none;
+    }
+  }
+}
+
+.translate-button {
+  margin-top: 16px;
+  font-size: 15px;
+  line-height: 20px;
+  display: flex;
+  justify-content: space-between;
+  color: $dark-text-color;
+}
+
+.status__content__spoiler-link {
+  display: inline-block;
+  border-radius: 2px;
+  background: lighten($ui-base-color, 30%);
+  border: 0;
+  color: $inverted-text-color;
+  font-weight: 700;
+  font-size: 11px;
+  padding: 0 5px;
+  text-transform: uppercase;
+  line-height: inherit;
+  cursor: pointer;
+  vertical-align: top;
+
+  &:hover {
+    background: lighten($ui-base-color, 33%);
+    text-decoration: none;
+  }
+
+  .status__content__spoiler-icon {
+    display: inline-block;
+    margin: 0 0 0 5px;
+    border-left: 1px solid currentColor;
+    padding: 0 0 0 4px;
+    font-size: 16px;
+    vertical-align: -2px;
+  }
+}
+
+.notif-cleaning {
+  .status,
+  .notification-follow,
+  .notification-follow-request {
+    padding-right: ($dismiss-overlay-width + 0.5rem);
+  }
+}
+
+.status__wrapper--filtered {
+  color: $dark-text-color;
+  border: 0;
+  font-size: inherit;
+  text-align: center;
+  line-height: inherit;
+  margin: 0;
+  padding: 15px;
+  box-sizing: border-box;
+  width: 100%;
+  clear: both;
+  border-bottom: 1px solid lighten($ui-base-color, 8%);
+}
+
+.status__prepend-icon-wrapper {
+  left: -26px;
+  position: absolute;
+}
+
+.notification-follow,
+.notification-follow-request {
+  position: relative;
+
+  // same like Status
+  border-bottom: 1px solid lighten($ui-base-color, 8%);
+
+  .account {
+    border-bottom: 0 none;
+  }
+}
+
+.focusable {
+  &:focus {
+    outline: 0;
+    background: lighten($ui-base-color, 4%);
+
+    &.status.status-direct {
+      background: lighten($ui-base-color, 12%);
+
+      &.muted {
+        background: transparent;
+      }
+    }
+
+    .detailed-status,
+    .detailed-status__action-bar {
+      background: lighten($ui-base-color, 8%);
+    }
+  }
+}
+
+.status {
+  padding: 10px 14px;
+  position: relative;
+  height: auto;
+  border-bottom: 1px solid lighten($ui-base-color, 8%);
+  cursor: auto;
+
+  @supports (-ms-overflow-style: -ms-autohiding-scrollbar) {
+    // Add margin to avoid Edge auto-hiding scrollbar appearing over content.
+    // On Edge 16 this is 16px and Edge <=15 it's 12px, so aim for 16px.
+    padding-right: 28px; // 12px + 16px
+  }
+
+  @keyframes fade {
+    0% { opacity: 0; }
+    100% { opacity: 1; }
+  }
+
+  opacity: 1;
+  animation: fade 150ms linear;
+
+  .video-player,
+  .audio-player {
+    margin-top: 8px;
+  }
+
+  &.status-direct {
+    background: lighten($ui-base-color, 8%);
+    border-bottom-color: lighten($ui-base-color, 12%);
+  }
+
+  &.light {
+    .status__relative-time {
+      color: $lighter-text-color;
+    }
+
+    .status__display-name {
+      color: $inverted-text-color;
+    }
+
+    .display-name {
+      color: $light-text-color;
+
+      strong {
+        color: $inverted-text-color;
+      }
+    }
+
+    .status__content {
+      color: $inverted-text-color;
+
+      a {
+        color: $highlight-text-color;
+      }
+
+      a.status__content__spoiler-link {
+        color: $primary-text-color;
+        background: $ui-primary-color;
+
+        &:hover {
+          background: lighten($ui-primary-color, 8%);
+        }
+      }
+    }
+  }
+
+  &.collapsed {
+    background-position: center;
+    background-size: cover;
+    user-select: none;
+
+    &.has-background::before {
+      display: block;
+      position: absolute;
+      left: 0;
+      right: 0;
+      top: 0;
+      bottom: 0;
+      background-image: linear-gradient(to bottom, rgba($base-shadow-color, .75), rgba($base-shadow-color, .65) 24px, rgba($base-shadow-color, .8));
+      pointer-events: none;
+      content: "";
+    }
+
+    .display-name:hover .display-name__html {
+      text-decoration: none;
+    }
+
+    .status__content {
+      height: 20px;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      padding-top: 0;
+
+      &:after {
+        content: "";
+        position: absolute;
+        top: 0;
+        bottom: 0;
+        left: 0;
+        right: 0;
+        background: linear-gradient(rgba($ui-base-color, 0), rgba($ui-base-color, 1));
+        pointer-events: none;
+      }
+      
+      a:hover {
+        text-decoration: none;
+      }
+    }
+    &:focus > .status__content:after {
+      background: linear-gradient(rgba(lighten($ui-base-color, 4%), 0), rgba(lighten($ui-base-color, 4%), 1));
+    }
+    &.status-direct > .status__content:after {
+      background: linear-gradient(rgba(lighten($ui-base-color, 8%), 0), rgba(lighten($ui-base-color, 8%), 1));
+    }
+
+    .notification__message {
+      margin-bottom: 0;
+    }
+
+    .status__info .notification__message > span {
+      white-space: nowrap;
+    }
+  }
+
+  .notification__message {
+    margin: -10px 0px 10px 0;
+  }
+}
+
+.notification-favourite {
+  .status.status-direct {
+    background: transparent;
+
+    .icon-button.disabled {
+      color: lighten($action-button-color, 13%);
+    }
+  }
+}
+
+.status__relative-time {
+  display: inline-block;
+  color: $dark-text-color;
+  font-size: 14px;
+  text-align: right;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.status__display-name {
+  color: $dark-text-color;
+  overflow: hidden;
+}
+
+.status__info__account .status__display-name {
+  display: block;
+  max-width: 100%;
+}
+
+.status__info {
+  display: flex;
+  justify-content: space-between;
+  font-size: 15px;
+
+  > span {
+    text-overflow: ellipsis;
+    overflow: hidden;
+  }
+
+  .notification__message > span {
+    word-wrap: break-word;
+  }
+}
+
+.status__info__icons {
+  display: flex;
+  align-items: center;
+  height: 1em;
+  color: $action-button-color;
+
+  .status__media-icon,
+  .status__visibility-icon,
+  .status__reply-icon,
+  .text-icon {
+    padding-left: 2px;
+    padding-right: 2px;
+  }
+
+  .status__collapse-button.active > .fa-angle-double-up {
+    transform: rotate(-180deg);
+  }
+}
+
+.no-reduce-motion .status__collapse-button {
+  &.activate {
+    & > .fa-angle-double-up {
+      animation: spring-flip-in 1s linear;
+    }
+  }
+
+  &.deactivate {
+    & > .fa-angle-double-up {
+      animation: spring-flip-out 1s linear;
+    }
+  }
+}
+
+.status__info__account {
+  display: flex;
+  align-items: center;
+  justify-content: flex-start;
+}
+
+.status-check-box__status {
+  display: block;
+  box-sizing: border-box;
+  width: 100%;
+  padding: 0 10px;
+
+  .detailed-status__display-name {
+    color: lighten($inverted-text-color, 16%);
+
+    span {
+      display: inline;
+    }
+
+    &:hover strong {
+      text-decoration: none;
+    }
+  }
+
+  .media-gallery,
+  .audio-player,
+  .video-player {
+    margin-top: 15px;
+    max-width: 250px;
+  }
+
+  .status__content {
+    padding: 0;
+    white-space: normal;
+  }
+
+  .media-gallery__item-thumbnail {
+    cursor: default;
+  }
+}
+
+.status__prepend {
+  margin-top: -2px;
+  margin-bottom: 8px;
+  margin-left: 58px;
+  color: $dark-text-color;
+  font-size: 14px;
+  position: relative;
+
+  .status__display-name strong {
+    color: $dark-text-color;
+  }
+
+  > span {
+    display: block;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+}
+
+.status__action-bar {
+  align-items: center;
+  display: flex;
+  margin-top: 8px;
+}
+
+.status__action-bar-button {
+  margin-right: 18px;
+
+  &.icon-button--with-counter {
+    margin-right: 14px;
+  }
+}
+
+.status__action-bar-dropdown {
+  height: 23.15px;
+  width: 23.15px;
+}
+
+.status__action-bar-spacer {
+  flex-grow: 1;
+}
+
+.detailed-status__action-bar-dropdown {
+  flex: 1 1 auto;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  position: relative;
+}
+
+.detailed-status {
+  background: lighten($ui-base-color, 4%);
+  padding: 14px 10px;
+
+  &--flex {
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-between;
+    align-items: flex-start;
+
+    .status__content,
+    .detailed-status__meta {
+      flex: 100%;
+    }
+  }
+
+  .status__content {
+    font-size: 19px;
+    line-height: 24px;
+
+    .emojione {
+      width: 24px;
+      height: 24px;
+      margin: -1px 0 0;
+    }
+  }
+
+  .video-player,
+  .audio-player {
+    margin-top: 8px;
+  }
+}
+
+.detailed-status__meta {
+  margin-top: 15px;
+  color: $dark-text-color;
+  font-size: 14px;
+  line-height: 18px;
+}
+
+.detailed-status__action-bar {
+  background: lighten($ui-base-color, 4%);
+  border-top: 1px solid lighten($ui-base-color, 8%);
+  border-bottom: 1px solid lighten($ui-base-color, 8%);
+  display: flex;
+  flex-direction: row;
+  padding: 10px 0;
+}
+
+.detailed-status__link {
+  color: inherit;
+  text-decoration: none;
+}
+
+.detailed-status__favorites,
+.detailed-status__reblogs {
+  display: inline-block;
+  font-weight: 500;
+  font-size: 12px;
+  line-height: 17px;
+  margin-left: 6px;
+}
+
+.status__display-name,
+.status__relative-time,
+.detailed-status__display-name,
+.detailed-status__datetime,
+.detailed-status__application,
+.account__display-name {
+  text-decoration: none;
+}
+
+.status__display-name,
+.account__display-name {
+  strong {
+    color: $primary-text-color;
+  }
+}
+
+.muted {
+  .emojione {
+    opacity: 0.5;
+  }
+}
+
+a.status__display-name,
+.reply-indicator__display-name,
+.detailed-status__display-name,
+.account__display-name {
+  &:hover strong {
+    text-decoration: underline;
+  }
+}
+
+.account__display-name strong {
+  display: block;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.detailed-status__application,
+.detailed-status__datetime {
+  color: inherit;
+}
+
+.detailed-status .button.logo-button {
+  margin-bottom: 15px;
+}
+
+.detailed-status__display-name {
+  color: $secondary-text-color;
+  display: block;
+  line-height: 24px;
+  margin-bottom: 15px;
+  overflow: hidden;
+
+  strong,
+  span {
+    display: block;
+    text-overflow: ellipsis;
+    overflow: hidden;
+  }
+
+  strong {
+    font-size: 16px;
+    color: $primary-text-color;
+  }
+}
+
+.detailed-status__display-avatar {
+  float: left;
+  margin-right: 10px;
+}
+
+.status__avatar {
+  flex: none;
+  margin: 0 10px 0 0;
+  height: 48px;
+  width: 48px;
+}
+
+.muted {
+  .status__content,
+  .status__content p,
+  .status__content a,
+  .status__content__text {
+    color: $dark-text-color;
+  }
+
+  .status__display-name strong {
+    color: $dark-text-color;
+  }
+
+  .status__avatar {
+    opacity: 0.5;
+  }
+
+  a.status__content__spoiler-link {
+    background: $ui-base-lighter-color;
+    color: $inverted-text-color;
+
+    &:hover,
+    &:focus {
+      background: lighten($ui-base-color, 29%);
+      text-decoration: none;
+    }
+  }
+}
+
+.status__relative-time,
+.detailed-status__datetime {
+  &:hover {
+    text-decoration: underline;
+  }
+}
+
+.status-card {
+  position: relative;
+  display: flex;
+  font-size: 14px;
+  border: 1px solid lighten($ui-base-color, 8%);
+  border-radius: 4px;
+  color: $dark-text-color;
+  margin-top: 14px;
+  text-decoration: none;
+  overflow: hidden;
+
+  &__actions {
+    bottom: 0;
+    left: 0;
+    position: absolute;
+    right: 0;
+    top: 0;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+
+    & > div {
+      background: rgba($base-shadow-color, 0.6);
+      border-radius: 8px;
+      padding: 12px 9px;
+      flex: 0 0 auto;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+    }
+
+    button,
+    a {
+      display: inline;
+      color: $secondary-text-color;
+      background: transparent;
+      border: 0;
+      padding: 0 8px;
+      text-decoration: none;
+      font-size: 18px;
+      line-height: 18px;
+
+      &:hover,
+      &:active,
+      &:focus {
+        color: $primary-text-color;
+      }
+    }
+
+    a {
+      font-size: 19px;
+      position: relative;
+      bottom: -1px;
+    }
+
+    a .fa, a:hover .fa {
+      color: inherit;
+    }
+  }
+}
+
+a.status-card {
+  cursor: pointer;
+
+  &:hover {
+    background: lighten($ui-base-color, 8%);
+  }
+}
+
+.status-card-photo {
+  cursor: zoom-in;
+  display: block;
+  text-decoration: none;
+    width: 100%;
+    height: auto;
+    margin: 0;
+}
+
+.status-card-video {
+  iframe {
+    width: 100%;
+    height: 100%;
+  }
+}
+
+.status-card__title {
+  display: block;
+  font-weight: 500;
+  margin-bottom: 5px;
+  color: $darker-text-color;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  text-decoration: none;
+}
+
+.status-card__content {
+  flex: 1 1 auto;
+  overflow: hidden;
+  padding: 14px 14px 14px 8px;
+}
+
+.status-card__description {
+  color: $darker-text-color;
+}
+
+.status-card__host {
+  display: block;
+  margin-top: 5px;
+  font-size: 13px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.status-card__image {
+  flex: 0 0 100px;
+  background: lighten($ui-base-color, 8%);
+  position: relative;
+
+  & > .fa {
+    font-size: 21px;
+    position: absolute;
+    transform-origin: 50% 50%;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+  }
+}
+
+.status-card.horizontal {
+  display: block;
+
+  .status-card__image {
+    width: 100%;
+  }
+
+  .status-card__image-image,
+  .status-card__image-preview {
+    border-radius: 4px 4px 0 0;
+  }
+
+  .status-card__title {
+    white-space: inherit;
+  }
+}
+
+.status-card.compact {
+  border-color: lighten($ui-base-color, 4%);
+
+  &.interactive {
+    border: 0;
+  }
+
+  .status-card__content {
+    padding: 8px;
+    padding-top: 10px;
+  }
+
+  .status-card__title {
+    white-space: nowrap;
+  }
+
+  .status-card__image {
+    flex: 0 0 60px;
+  }
+}
+
+a.status-card.compact:hover {
+  background-color: lighten($ui-base-color, 4%);
+}
+
+.status-card__image-image {
+  border-radius: 4px 0 0 4px;
+  display: block;
+  margin: 0;
+  width: 100%;
+  height: 100%;
+  object-fit: cover;
+  background-size: cover;
+  background-position: center center;
+}
+
+.status-card__image-preview {
+  border-radius: 4px 0 0 4px;
+  display: block;
+  margin: 0;
+  width: 100%;
+  height: 100%;
+  object-fit: fill;
+  position: absolute;
+  top: 0;
+  left: 0;
+  z-index: 0;
+  background: $base-overlay-background;
+
+  &--hidden {
+    display: none;
+  }
+}
+
+.attachment-list {
+  display: flex;
+  font-size: 14px;
+  border: 1px solid lighten($ui-base-color, 8%);
+  border-radius: 4px;
+  margin-top: 14px;
+  overflow: hidden;
+
+  &__icon {
+    flex: 0 0 auto;
+    color: $dark-text-color;
+    padding: 8px 18px;
+    cursor: default;
+    border-right: 1px solid lighten($ui-base-color, 8%);
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    font-size: 26px;
+
+    .fa {
+      display: block;
+    }
+  }
+
+  &__list {
+    list-style: none;
+    padding: 4px 0;
+    padding-left: 8px;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+
+    li {
+      display: block;
+      padding: 4px 0;
+    }
+
+    a {
+      text-decoration: none;
+      color: $dark-text-color;
+      font-weight: 500;
+
+      &:hover {
+        text-decoration: underline;
+      }
+    }
+  }
+
+  &.compact {
+    border: 0;
+    margin-top: 4px;
+
+    .attachment-list__list {
+      padding: 0;
+      display: block;
+    }
+
+    .fa {
+      color: $dark-text-color;
+    }
+  }
+}
+
+.status__wrapper--filtered__button {
+  display: inline;
+  color: lighten($ui-highlight-color, 8%);
+  border: 0;
+  background: transparent;
+  padding: 0;
+  font-size: inherit;
+  line-height: inherit;
+
+  &:hover,
+  &:active {
+    text-decoration: underline;
+  }
+}
+
+.notification,
+.status {
+  position: relative;
+
+  &.unread {
+    &::before {
+      content: "";
+      position: absolute;
+      top: 0;
+      left: 0;
+      pointer-events: 0;
+      width: 100%;
+      height: 100%;
+      border-left: 4px solid $highlight-text-color;
+      pointer-events: none;
+    }
+  }
+}
+
+.picture-in-picture {
+  position: fixed;
+  bottom: 20px;
+  right: 20px;
+  width: 300px;
+
+  &.left {
+    right: unset;
+    left: 20px;
+  }
+
+  &__footer {
+    border-radius: 0 0 4px 4px;
+    background: lighten($ui-base-color, 4%);
+    padding: 10px;
+    padding-top: 12px;
+    display: flex;
+    justify-content: space-between;
+  }
+
+  &__header {
+    border-radius: 4px 4px 0 0;
+    background: lighten($ui-base-color, 4%);
+    padding: 10px;
+    display: flex;
+    justify-content: space-between;
+
+    &__account {
+      display: flex;
+      text-decoration: none;
+      overflow: hidden;
+    }
+
+    .account__avatar {
+      margin-right: 10px;
+    }
+
+    .display-name {
+      color: $primary-text-color;
+      text-decoration: none;
+
+      strong,
+      span {
+        display: block;
+        text-overflow: ellipsis;
+        overflow: hidden;
+      }
+
+      span {
+        color: $darker-text-color;
+      }
+    }
+  }
+
+  .video-player,
+  .audio-player {
+    border-radius: 0;
+  }
+}
+
+.picture-in-picture-placeholder {
+  box-sizing: border-box;
+  border: 2px dashed lighten($ui-base-color, 8%);
+  background: $base-shadow-color;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  margin-top: 10px;
+  font-size: 16px;
+  font-weight: 500;
+  cursor: pointer;
+  color: $darker-text-color;
+
+  i {
+    display: block;
+    font-size: 24px;
+    font-weight: 400;
+    margin-bottom: 10px;
+  }
+
+  &:hover,
+  &:focus,
+  &:active {
+    border-color: lighten($ui-base-color, 12%);
+  }
+}

From 5771a5527ad244d16b90ac3f0e4a890bc22d2896 Mon Sep 17 00:00:00 2001
From: Dean Bassett <dean@dbassett.dev>
Date: Sun, 1 Jan 2023 14:40:53 -0800
Subject: [PATCH 2163/2191] emoji-zooming local setting (#24)

* emoji-zooming local setting
* change a class on the document when emoji zooming
---
 .../features/local_settings/page/index.jsx    |    8 +
 .../glitch/locales/defaultMessages.json       | 1068 +++++++++++++++++
 .../flavours/glitch/locales/en.json           |    1 +
 .../glitch/reducers/local_settings.js         |    1 +
 .../glitch/styles/components/status.scss      |    5 +-
 5 files changed, 1081 insertions(+), 2 deletions(-)
 create mode 100644 app/javascript/flavours/glitch/locales/defaultMessages.json

diff --git a/app/javascript/flavours/glitch/features/local_settings/page/index.jsx b/app/javascript/flavours/glitch/features/local_settings/page/index.jsx
index ea599afb6a223a..caf5041ae468c7 100644
--- a/app/javascript/flavours/glitch/features/local_settings/page/index.jsx
+++ b/app/javascript/flavours/glitch/features/local_settings/page/index.jsx
@@ -54,6 +54,14 @@ class LocalSettingsPage extends PureComponent {
         >
           <FormattedMessage id='settings.show_reply_counter' defaultMessage='Display an estimate of the reply count' />
         </LocalSettingsPageItem>
+        <LocalSettingsPageItem
+          settings={settings}
+          item={['zoom_emojis_on_hover']}
+          id='mastodon-settings--zoom-on-hover'
+          onChange={onChange}
+        >
+          <FormattedMessage id='settings.zoom_emojis_on_hover' defaultMessage='Zoom in on emojis when hovering over them' />
+        </LocalSettingsPageItem>
         <LocalSettingsPageItem
           settings={settings}
           item={['hicolor_privacy_icons']}
diff --git a/app/javascript/flavours/glitch/locales/defaultMessages.json b/app/javascript/flavours/glitch/locales/defaultMessages.json
new file mode 100644
index 00000000000000..6d6b51a3566b4e
--- /dev/null
+++ b/app/javascript/flavours/glitch/locales/defaultMessages.json
@@ -0,0 +1,1068 @@
+[
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "We're sorry, but something went wrong with the Mastodon app.",
+        "id": "web_app_crash.title"
+      },
+      {
+        "defaultMessage": "You could try any of the following:",
+        "id": "web_app_crash.content"
+      },
+      {
+        "defaultMessage": "Disable browser add-ons or built-in translation tools",
+        "id": "web_app_crash.disable_addons"
+      },
+      {
+        "defaultMessage": "Report a bug in the {issuetracker}",
+        "id": "web_app_crash.report_issue"
+      },
+      {
+        "defaultMessage": "issue tracker",
+        "id": "web_app_crash.issue_tracker"
+      },
+      {
+        "defaultMessage": "Debug information",
+        "id": "web_app_crash.debug_info"
+      },
+      {
+        "defaultMessage": "{reload} the current page",
+        "id": "web_app_crash.reload_page"
+      },
+      {
+        "defaultMessage": "Reload",
+        "id": "web_app_crash.reload"
+      },
+      {
+        "defaultMessage": "Change your {settings}",
+        "id": "web_app_crash.change_your_settings"
+      },
+      {
+        "defaultMessage": "settings",
+        "id": "web_app_crash.settings"
+      }
+    ],
+    "path": "app/javascript/flavours/glitch/components/error_boundary.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Sensitive",
+        "id": "media_gallery.sensitive"
+      },
+      {
+        "defaultMessage": "Click to view",
+        "id": "status.sensitive_toggle"
+      }
+    ],
+    "path": "app/javascript/flavours/glitch/components/media_gallery.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Select\nall",
+        "id": "notification_purge.btn_all"
+      },
+      {
+        "defaultMessage": "Select\nnone",
+        "id": "notification_purge.btn_none"
+      },
+      {
+        "defaultMessage": "Invert\nselection",
+        "id": "notification_purge.btn_invert"
+      },
+      {
+        "defaultMessage": "Clear\nselected",
+        "id": "notification_purge.btn_apply"
+      }
+    ],
+    "path": "app/javascript/flavours/glitch/components/notification_purge_buttons.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Collapse",
+        "id": "status.collapse"
+      },
+      {
+        "defaultMessage": "Uncollapse",
+        "id": "status.uncollapse"
+      },
+      {
+        "defaultMessage": "This toot is a reply",
+        "id": "status.in_reply_to"
+      },
+      {
+        "defaultMessage": "Features an attached preview card",
+        "id": "status.has_preview_card"
+      },
+      {
+        "defaultMessage": "Features attached pictures",
+        "id": "status.has_pictures"
+      },
+      {
+        "defaultMessage": "This toot is a poll",
+        "id": "status.is_poll"
+      },
+      {
+        "defaultMessage": "Features attached videos",
+        "id": "status.has_video"
+      },
+      {
+        "defaultMessage": "Features attached audio files",
+        "id": "status.has_audio"
+      },
+      {
+        "defaultMessage": "Only visible from your instance",
+        "id": "status.local_only"
+      }
+    ],
+    "path": "app/javascript/flavours/glitch/components/status_icons.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Are you sure you want to permanently clear all selected notifications?",
+        "id": "notifications.marked_clear_confirmation"
+      },
+      {
+        "defaultMessage": "Clear selected notifications",
+        "id": "notifications.marked_clear"
+      }
+    ],
+    "path": "app/javascript/flavours/glitch/containers/notification_purge_buttons_container.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Show",
+        "id": "confirmations.unfilter.confirm"
+      },
+      {
+        "defaultMessage": "Author",
+        "id": "confirmations.unfilter.author"
+      },
+      {
+        "defaultMessage": "Matching {count, plural, one {filter} other {filters}}",
+        "id": "confirmations.unfilter.filters"
+      },
+      {
+        "defaultMessage": "Edit filter",
+        "id": "confirmations.unfilter.edit_filter"
+      }
+    ],
+    "path": "app/javascript/flavours/glitch/containers/status_container.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Glitch-soc is free open source software forked from Mastodon.",
+        "id": "about.fork_disclaimer"
+      }
+    ],
+    "path": "app/javascript/flavours/glitch/features/about/index.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "No comment provided",
+        "id": "account_note.glitch_placeholder"
+      },
+      {
+        "defaultMessage": "Cancel",
+        "id": "account_note.cancel"
+      },
+      {
+        "defaultMessage": "Save",
+        "id": "account_note.save"
+      },
+      {
+        "defaultMessage": "Edit",
+        "id": "account_note.edit"
+      }
+    ],
+    "path": "app/javascript/flavours/glitch/features/account/components/account_note.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "This user has been suspended by a moderator.",
+        "id": "account.suspended_disclaimer_full"
+      },
+      {
+        "defaultMessage": "Information below may reflect the user's profile incompletely.",
+        "id": "account.disclaimer_full"
+      },
+      {
+        "defaultMessage": "View full profile",
+        "id": "account.view_full_profile"
+      },
+      {
+        "defaultMessage": "Follows",
+        "id": "account.follows"
+      }
+    ],
+    "path": "app/javascript/flavours/glitch/features/account/components/action_bar.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Add note for @{name}",
+        "id": "account.add_account_note"
+      },
+      {
+        "defaultMessage": "Joined {date}",
+        "id": "account.joined"
+      }
+    ],
+    "path": "app/javascript/flavours/glitch/features/account/components/header.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Profile",
+        "id": "column_header.profile"
+      }
+    ],
+    "path": "app/javascript/flavours/glitch/features/account/components/profile_column_header.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Filter out by regular expressions",
+        "id": "home.column_settings.filter_regex"
+      },
+      {
+        "defaultMessage": "Column settings",
+        "id": "home.settings"
+      },
+      {
+        "defaultMessage": "Advanced",
+        "id": "home.column_settings.advanced"
+      }
+    ],
+    "path": "app/javascript/flavours/glitch/features/community_timeline/components/column_settings.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "At least one media attachment is lacking a description. Consider describing all media attachments for the visually impaired before sending your toot.",
+        "id": "confirmations.missing_media_description.message"
+      },
+      {
+        "defaultMessage": "Send anyway",
+        "id": "confirmations.missing_media_description.confirm"
+      }
+    ],
+    "path": "app/javascript/flavours/glitch/features/compose/components/compose_form.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "App settings",
+        "id": "navigation_bar.app_settings"
+      }
+    ],
+    "path": "app/javascript/flavours/glitch/features/compose/components/header.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Advanced options",
+        "id": "advanced_options.icon_title"
+      },
+      {
+        "defaultMessage": "Attach...",
+        "id": "compose.attach"
+      },
+      {
+        "defaultMessage": "Content type",
+        "id": "content-type.change"
+      },
+      {
+        "defaultMessage": "Draw something",
+        "id": "compose.attach.doodle"
+      },
+      {
+        "defaultMessage": "HTML",
+        "id": "compose.content-type.html"
+      },
+      {
+        "defaultMessage": "Do not post to other instances",
+        "id": "advanced_options.local-only.long"
+      },
+      {
+        "defaultMessage": "Local-only",
+        "id": "advanced_options.local-only.short"
+      },
+      {
+        "defaultMessage": "Markdown",
+        "id": "compose.content-type.markdown"
+      },
+      {
+        "defaultMessage": "Plain text",
+        "id": "compose.content-type.plain"
+      },
+      {
+        "defaultMessage": "Hide text behind warning",
+        "id": "compose_form.spoiler"
+      },
+      {
+        "defaultMessage": "Automatically opens a reply on posting",
+        "id": "advanced_options.threaded_mode.long"
+      },
+      {
+        "defaultMessage": "Threaded mode",
+        "id": "advanced_options.threaded_mode.short"
+      },
+      {
+        "defaultMessage": "Upload a file",
+        "id": "compose.attach.upload"
+      }
+    ],
+    "path": "app/javascript/flavours/glitch/features/compose/components/options.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Allow one choice",
+        "id": "compose_form.poll.single_choice"
+      },
+      {
+        "defaultMessage": "Allow multiple choices",
+        "id": "compose_form.poll.multiple_choices"
+      }
+    ],
+    "path": "app/javascript/flavours/glitch/features/compose/components/poll_form.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "This post is local-only",
+        "id": "advanced_options.local-only.tooltip"
+      },
+      {
+        "defaultMessage": "Threaded mode enabled",
+        "id": "advanced_options.threaded_mode.tooltip"
+      }
+    ],
+    "path": "app/javascript/flavours/glitch/features/compose/components/textarea_icons.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "At least one media attachment is lacking a description. Consider describing all media attachments for the visually impaired before sending your toot.",
+        "id": "confirmations.missing_media_description.message"
+      },
+      {
+        "defaultMessage": "Send anyway",
+        "id": "confirmations.missing_media_description.confirm"
+      },
+      {
+        "defaultMessage": "Edit media",
+        "id": "confirmations.missing_media_description.edit"
+      }
+    ],
+    "path": "app/javascript/flavours/glitch/features/compose/containers/compose_form_container.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Filter out by regular expressions",
+        "id": "home.column_settings.filter_regex"
+      },
+      {
+        "defaultMessage": "Column settings",
+        "id": "home.settings"
+      },
+      {
+        "defaultMessage": "Group by conversation",
+        "id": "direct.group_by_conversations"
+      },
+      {
+        "defaultMessage": "Advanced",
+        "id": "home.column_settings.advanced"
+      }
+    ],
+    "path": "app/javascript/flavours/glitch/features/direct_timeline/components/column_settings.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Favourited by",
+        "id": "column.favourited_by"
+      }
+    ],
+    "path": "app/javascript/flavours/glitch/features/favourites/index.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Misc",
+        "id": "column.heading"
+      },
+      {
+        "defaultMessage": "Miscellaneous options",
+        "id": "column.subheading"
+      },
+      {
+        "defaultMessage": "Extended information",
+        "id": "navigation_bar.info"
+      },
+      {
+        "defaultMessage": "Show me around",
+        "id": "getting_started.onboarding"
+      },
+      {
+        "defaultMessage": "Keyboard shortcuts",
+        "id": "navigation_bar.keyboard_shortcuts"
+      },
+      {
+        "defaultMessage": "Featured users",
+        "id": "navigation_bar.featured_users"
+      }
+    ],
+    "path": "app/javascript/flavours/glitch/features/getting_started_misc/index.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Navigation",
+        "id": "column_subheading.navigation"
+      },
+      {
+        "defaultMessage": "App settings",
+        "id": "navigation_bar.app_settings"
+      },
+      {
+        "defaultMessage": "Keyboard shortcuts",
+        "id": "navigation_bar.keyboard_shortcuts"
+      },
+      {
+        "defaultMessage": "Lists",
+        "id": "column_subheading.lists"
+      },
+      {
+        "defaultMessage": "Misc",
+        "id": "navigation_bar.misc"
+      }
+    ],
+    "path": "app/javascript/flavours/glitch/features/getting_started/index.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Filter out by regular expressions",
+        "id": "home.column_settings.filter_regex"
+      },
+      {
+        "defaultMessage": "Column settings",
+        "id": "home.settings"
+      },
+      {
+        "defaultMessage": "Show DMs",
+        "id": "home.column_settings.show_direct"
+      },
+      {
+        "defaultMessage": "Advanced",
+        "id": "home.column_settings.advanced"
+      }
+    ],
+    "path": "app/javascript/flavours/glitch/features/home_timeline/components/column_settings.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "to bookmark",
+        "id": "keyboard_shortcuts.bookmark"
+      },
+      {
+        "defaultMessage": "to collapse/uncollapse toots",
+        "id": "keyboard_shortcuts.toggle_collapse"
+      },
+      {
+        "defaultMessage": "to send toot using secondary privacy setting",
+        "id": "keyboard_shortcuts.secondary_toot"
+      }
+    ],
+    "path": "app/javascript/flavours/glitch/features/keyboard_shortcuts/index.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "General",
+        "id": "settings.general"
+      },
+      {
+        "defaultMessage": "Compose box",
+        "id": "settings.compose_box_opts"
+      },
+      {
+        "defaultMessage": "Content Warnings",
+        "id": "settings.content_warnings"
+      },
+      {
+        "defaultMessage": "Collapsed toots",
+        "id": "settings.collapsed_statuses"
+      },
+      {
+        "defaultMessage": "Media",
+        "id": "settings.media"
+      },
+      {
+        "defaultMessage": "Preferences",
+        "id": "settings.preferences"
+      },
+      {
+        "defaultMessage": "Close",
+        "id": "settings.close"
+      }
+    ],
+    "path": "app/javascript/flavours/glitch/features/local_settings/navigation/index.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Auto",
+        "id": "layout.auto"
+      },
+      {
+        "defaultMessage": "Automatically chose layout based on “Enable advanced web interface” setting and screen size.",
+        "id": "layout.hint.auto"
+      },
+      {
+        "defaultMessage": "Desktop",
+        "id": "layout.desktop"
+      },
+      {
+        "defaultMessage": "Use multiple-column layout regardless of the “Enable advanced web interface” setting or screen size.",
+        "id": "layout.hint.desktop"
+      },
+      {
+        "defaultMessage": "Mobile",
+        "id": "layout.single"
+      },
+      {
+        "defaultMessage": "Use single-column layout regardless of the “Enable advanced web interface” setting or screen size.",
+        "id": "layout.hint.single"
+      },
+      {
+        "defaultMessage": "None",
+        "id": "settings.side_arm.none"
+      },
+      {
+        "defaultMessage": "Keep its set privacy",
+        "id": "settings.side_arm_reply_mode.keep"
+      },
+      {
+        "defaultMessage": "Copy privacy setting of the toot being replied to",
+        "id": "settings.side_arm_reply_mode.copy"
+      },
+      {
+        "defaultMessage": "Restrict privacy setting to that of the toot being replied to",
+        "id": "settings.side_arm_reply_mode.restrict"
+      },
+      {
+        "defaultMessage": "Regular expression",
+        "id": "settings.content_warnings.regexp"
+      },
+      {
+        "defaultMessage": "Do not rewrite mentions",
+        "id": "settings.rewrite_mentions_no"
+      },
+      {
+        "defaultMessage": "Rewrite with username and domain (when the account is remote)",
+        "id": "settings.rewrite_mentions_acct"
+      },
+      {
+        "defaultMessage": "Rewrite with username",
+        "id": "settings.rewrite_mentions_username"
+      },
+      {
+        "defaultMessage": "Left",
+        "id": "settings.pop_in_left"
+      },
+      {
+        "defaultMessage": "Right",
+        "id": "settings.pop_in_right"
+      },
+      {
+        "defaultMessage": "General",
+        "id": "settings.general"
+      },
+      {
+        "defaultMessage": "Display an estimate of the reply count",
+        "id": "settings.show_reply_counter"
+      },
+      {
+        "defaultMessage": "Zoom in on emojis when hovering over them",
+        "id": "settings.zoom_emojis_on_hover"
+      },
+      {
+        "defaultMessage": "High color privacy icons",
+        "id": "settings.hicolor_privacy_icons"
+      },
+      {
+        "defaultMessage": "Display privacy icons in bright and easily distinguishable colors",
+        "id": "settings.hicolor_privacy_icons.hint"
+      },
+      {
+        "defaultMessage": "Show confirmation dialog before boosting toots lacking media descriptions",
+        "id": "settings.confirm_boost_missing_media_description"
+      },
+      {
+        "defaultMessage": "Tag misleading links",
+        "id": "settings.tag_misleading_links"
+      },
+      {
+        "defaultMessage": "Add a visual indication with the link target host to every link not mentioning it explicitly",
+        "id": "settings.tag_misleading_links.hint"
+      },
+      {
+        "defaultMessage": "Rewrite mentions in displayed statuses",
+        "id": "settings.rewrite_mentions"
+      },
+      {
+        "defaultMessage": "Notifications options",
+        "id": "settings.notifications_opts"
+      },
+      {
+        "defaultMessage": "Unread notifications badge",
+        "id": "settings.notifications.tab_badge"
+      },
+      {
+        "defaultMessage": "Display a badge for unread notifications in the column icons when the notifications column isn't open",
+        "id": "settings.notifications.tab_badge.hint"
+      },
+      {
+        "defaultMessage": "Unread notifications favicon badge",
+        "id": "settings.notifications.favicon_badge"
+      },
+      {
+        "defaultMessage": "Add a badge for unread notifications to the favicon",
+        "id": "settings.notifications.favicon_badge.hint"
+      },
+      {
+        "defaultMessage": "Toot icons",
+        "id": "settings.status_icons"
+      },
+      {
+        "defaultMessage": "Language indicator",
+        "id": "settings.status_icons_language"
+      },
+      {
+        "defaultMessage": "Reply indicator",
+        "id": "settings.status_icons_reply"
+      },
+      {
+        "defaultMessage": "Local-only indicator",
+        "id": "settings.status_icons_local_only"
+      },
+      {
+        "defaultMessage": "Media and poll indicators",
+        "id": "settings.status_icons_media"
+      },
+      {
+        "defaultMessage": "Toot privacy indicator",
+        "id": "settings.status_icons_visibility"
+      },
+      {
+        "defaultMessage": "Layout options",
+        "id": "settings.layout_opts"
+      },
+      {
+        "defaultMessage": "Layout:",
+        "id": "settings.layout"
+      },
+      {
+        "defaultMessage": "Wide view (Desktop mode only)",
+        "id": "settings.wide_view"
+      },
+      {
+        "defaultMessage": "Stretches columns to better fill the available space.",
+        "id": "settings.wide_view_hint"
+      },
+      {
+        "defaultMessage": "Compose box",
+        "id": "settings.compose_box_opts"
+      },
+      {
+        "defaultMessage": "Always enable the Content Warning field",
+        "id": "settings.always_show_spoilers_field"
+      },
+      {
+        "defaultMessage": "Prepend “re: ” to content warnings when replying",
+        "id": "settings.prepend_cw_re"
+      },
+      {
+        "defaultMessage": "Pre-select usernames on reply",
+        "id": "settings.preselect_on_reply"
+      },
+      {
+        "defaultMessage": "When replying to a conversation with multiple participants, pre-select usernames past the first",
+        "id": "settings.preselect_on_reply_hint"
+      },
+      {
+        "defaultMessage": "Show confirmation dialog before sending toots lacking media descriptions",
+        "id": "settings.confirm_missing_media_description"
+      },
+      {
+        "defaultMessage": "Show confirmation dialog before overwriting the message being composed",
+        "id": "settings.confirm_before_clearing_draft"
+      },
+      {
+        "defaultMessage": "Show content-type choice when authoring toots",
+        "id": "settings.show_content_type_choice"
+      },
+      {
+        "defaultMessage": "Secondary toot button:",
+        "id": "settings.side_arm"
+      },
+      {
+        "defaultMessage": "When replying to a toot, the secondary toot button should:",
+        "id": "settings.side_arm_reply_mode"
+      },
+      {
+        "defaultMessage": "Content warnings",
+        "id": "settings.content_warnings"
+      },
+      {
+        "defaultMessage": "Show/hide content of all copies at once",
+        "id": "settings.content_warnings_shared_state"
+      },
+      {
+        "defaultMessage": "Reproduce upstream Mastodon behavior by having the Content Warning button affect all copies of a post at once. This will prevent automatic collapsing of any copy of a toot with unfolded CW",
+        "id": "settings.content_warnings_shared_state_hint"
+      },
+      {
+        "defaultMessage": "Display media attachments outside content warnings",
+        "id": "settings.content_warnings_media_outside"
+      },
+      {
+        "defaultMessage": "Reproduce upstream Mastodon behavior by having the Content Warning toggle not affect media attachments",
+        "id": "settings.content_warnings_media_outside_hint"
+      },
+      {
+        "defaultMessage": "Auto-unfolding options",
+        "id": "settings.content_warnings_unfold_opts"
+      },
+      {
+        "defaultMessage": "Automatically unfold content-warnings",
+        "id": "settings.enable_content_warnings_auto_unfold"
+      },
+      {
+        "defaultMessage": "This setting is now controlled from Mastodon's {settings_page_link}",
+        "id": "settings.deprecated_setting"
+      },
+      {
+        "defaultMessage": "user preferences",
+        "id": "settings.shared_settings_link"
+      },
+      {
+        "defaultMessage": "Content warnings to not automatically unfold:",
+        "id": "settings.content_warnings_filter"
+      },
+      {
+        "defaultMessage": "Collapsed toots",
+        "id": "settings.collapsed_statuses"
+      },
+      {
+        "defaultMessage": "Enable collapsed toots",
+        "id": "settings.enable_collapsed"
+      },
+      {
+        "defaultMessage": "Collapsed posts have parts of their contents hidden to take up less screen space. This is distinct from the Content Warning feature",
+        "id": "settings.enable_collapsed_hint"
+      },
+      {
+        "defaultMessage": "Show action buttons in collapsed toots",
+        "id": "settings.show_action_bar"
+      },
+      {
+        "defaultMessage": "Automatic collapsing",
+        "id": "settings.auto_collapse"
+      },
+      {
+        "defaultMessage": "Everything",
+        "id": "settings.auto_collapse_all"
+      },
+      {
+        "defaultMessage": "Notifications",
+        "id": "settings.auto_collapse_notifications"
+      },
+      {
+        "defaultMessage": "Lengthy toots",
+        "id": "settings.auto_collapse_lengthy"
+      },
+      {
+        "defaultMessage": "Boosts",
+        "id": "settings.auto_collapse_reblogs"
+      },
+      {
+        "defaultMessage": "Replies",
+        "id": "settings.auto_collapse_replies"
+      },
+      {
+        "defaultMessage": "Toots with media",
+        "id": "settings.auto_collapse_media"
+      },
+      {
+        "defaultMessage": "Image backgrounds",
+        "id": "settings.image_backgrounds"
+      },
+      {
+        "defaultMessage": "Give collapsed toots an image background",
+        "id": "settings.image_backgrounds_users"
+      },
+      {
+        "defaultMessage": "Preview collapsed toot media",
+        "id": "settings.image_backgrounds_media"
+      },
+      {
+        "defaultMessage": "If the post has any media attachment, use the first one as a background",
+        "id": "settings.image_backgrounds_media_hint"
+      },
+      {
+        "defaultMessage": "Media",
+        "id": "settings.media"
+      },
+      {
+        "defaultMessage": "Letterbox media",
+        "id": "settings.media_letterbox"
+      },
+      {
+        "defaultMessage": "Scale down and letterbox media to fill the image containers instead of stretching and cropping them",
+        "id": "settings.media_letterbox_hint"
+      },
+      {
+        "defaultMessage": "Full-width media previews",
+        "id": "settings.media_fullwidth"
+      },
+      {
+        "defaultMessage": "Inline preview cards for external links",
+        "id": "settings.inline_preview_cards"
+      },
+      {
+        "defaultMessage": "Reveal sensitive media behind a CW by default",
+        "id": "settings.media_reveal_behind_cw"
+      },
+      {
+        "defaultMessage": "Enable pop-in player",
+        "id": "settings.pop_in_player"
+      },
+      {
+        "defaultMessage": "Pop-in player position:",
+        "id": "settings.pop_in_position"
+      }
+    ],
+    "path": "app/javascript/flavours/glitch/features/local_settings/page/index.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Mark for deletion",
+        "id": "notification.markForDeletion"
+      }
+    ],
+    "path": "app/javascript/flavours/glitch/features/notifications/components/overlay.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Enter notification cleaning mode",
+        "id": "notification_purge.start"
+      }
+    ],
+    "path": "app/javascript/flavours/glitch/features/notifications/index.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Featured accounts",
+        "id": "endorsed_accounts_editor.endorsed_accounts"
+      }
+    ],
+    "path": "app/javascript/flavours/glitch/features/pinned_accounts_editor/index.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Filter out by regular expressions",
+        "id": "home.column_settings.filter_regex"
+      },
+      {
+        "defaultMessage": "Show local-only toots",
+        "id": "community.column_settings.allow_local_only"
+      },
+      {
+        "defaultMessage": "Advanced",
+        "id": "home.column_settings.advanced"
+      }
+    ],
+    "path": "app/javascript/flavours/glitch/features/public_timeline/components/column_settings.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Boosted by",
+        "id": "column.reblogged_by"
+      }
+    ],
+    "path": "app/javascript/flavours/glitch/features/reblogs/index.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "This toot contains some media without description",
+        "id": "boost_modal.missing_description"
+      }
+    ],
+    "path": "app/javascript/flavours/glitch/features/ui/components/boost_modal.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Do not ask for confirmation again",
+        "id": "confirmation_modal.do_not_ask_again"
+      }
+    ],
+    "path": "app/javascript/flavours/glitch/features/ui/components/confirmation_modal.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Use Mastodon preferences",
+        "id": "confirmations.deprecated_settings.confirm"
+      },
+      {
+        "defaultMessage": "Automatically unfold content-warnings",
+        "id": "settings.enable_content_warnings_auto_unfold"
+      },
+      {
+        "defaultMessage": "Allow swiping to change columns (Mobile only)",
+        "id": "settings.swipe_to_change_columns"
+      },
+      {
+        "defaultMessage": "Some of the glitch-soc device-specific {app_settings} you are using have been replaced by Mastodon {preferences} and will be overriden:",
+        "id": "confirmations.deprecated_settings.message"
+      },
+      {
+        "defaultMessage": "App settings",
+        "id": "navigation_bar.app_settings"
+      }
+    ],
+    "path": "app/javascript/flavours/glitch/features/ui/components/deprecated_settings_modal.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "You can press {combo} to skip this next time",
+        "id": "favourite_modal.combo"
+      }
+    ],
+    "path": "app/javascript/flavours/glitch/features/ui/components/favourite_modal.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "App settings",
+        "id": "navigation_bar.app_settings"
+      }
+    ],
+    "path": "app/javascript/flavours/glitch/features/ui/components/navigation_panel.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Welcome to {domain}!",
+        "id": "onboarding.page_one.welcome"
+      },
+      {
+        "defaultMessage": "{domain} is an \"instance\" of Mastodon. Mastodon is a network of independent servers joining up to make one larger social network. We call these servers instances.",
+        "id": "onboarding.page_one.federation"
+      },
+      {
+        "defaultMessage": "You are on {domain}, so your full handle is {handle}",
+        "id": "onboarding.page_one.handle"
+      },
+      {
+        "defaultMessage": "Write posts from the compose column. You can upload images, change privacy settings, and add content warnings with the icons below.",
+        "id": "onboarding.page_two.compose"
+      },
+      {
+        "defaultMessage": "Use the search bar to find people and look at hashtags, such as {illustration} and {introductions}. To look for a person who is not on this instance, use their full handle.",
+        "id": "onboarding.page_three.search"
+      },
+      {
+        "defaultMessage": "Edit your profile to change your avatar, bio, and display name. There, you will also find other preferences.",
+        "id": "onboarding.page_three.profile"
+      },
+      {
+        "defaultMessage": "The home timeline shows posts from people you follow.",
+        "id": "onboarding.page_four.home"
+      },
+      {
+        "defaultMessage": "The notifications column shows when someone interacts with you.",
+        "id": "onboarding.page_four.notifications"
+      },
+      {
+        "defaultMessage": "The local timeline shows public posts from everyone on {domain}. The federated timeline shows public posts from everyone who people on {domain} follow. These are the Public Timelines, a great way to discover new people.",
+        "id": "onboarding.page_five.public_timelines"
+      },
+      {
+        "defaultMessage": "Your instance's admin is {admin}.",
+        "id": "onboarding.page_six.admin"
+      },
+      {
+        "defaultMessage": "Please read {domain}'s {guidelines}!",
+        "id": "onboarding.page_six.read_guidelines"
+      },
+      {
+        "defaultMessage": "community guidelines",
+        "id": "onboarding.page_six.guidelines"
+      },
+      {
+        "defaultMessage": "Almost done...",
+        "id": "onboarding.page_six.almost_done"
+      },
+      {
+        "defaultMessage": "{domain} runs on Glitchsoc. Glitchsoc is a friendly {fork} of {Mastodon}. Glitchsoc is fully compatible with all Mastodon apps and instances. Glitchsoc is free open-source software. You can report bugs, request features, or contribute to the code on {github}.",
+        "id": "onboarding.page_six.github"
+      },
+      {
+        "defaultMessage": "There are {apps} available for iOS, Android and other platforms.",
+        "id": "onboarding.page_six.apps_available"
+      },
+      {
+        "defaultMessage": "mobile apps",
+        "id": "onboarding.page_six.various_app"
+      },
+      {
+        "defaultMessage": "Bon Appetoot!",
+        "id": "onboarding.page_six.appetoot"
+      },
+      {
+        "defaultMessage": "Next",
+        "id": "onboarding.next"
+      },
+      {
+        "defaultMessage": "Done",
+        "id": "onboarding.done"
+      },
+      {
+        "defaultMessage": "Skip",
+        "id": "onboarding.skip"
+      }
+    ],
+    "path": "app/javascript/flavours/glitch/features/ui/components/onboarding_modal.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "This account is marked as moved to {moved_to_link}, and may thus not accept new follows.",
+        "id": "moved_to_warning"
+      }
+    ],
+    "path": "app/javascript/flavours/glitch/features/ui/index.json"
+  }
+]
diff --git a/app/javascript/flavours/glitch/locales/en.json b/app/javascript/flavours/glitch/locales/en.json
index 0d4e7654dce719..6cd983ee84fc8c 100644
--- a/app/javascript/flavours/glitch/locales/en.json
+++ b/app/javascript/flavours/glitch/locales/en.json
@@ -130,6 +130,7 @@
   "settings.show_content_type_choice": "Show content-type choice when authoring toots",
   "settings.show_published_toast": "Display toast when publishing/saving a post",
   "settings.show_reply_counter": "Display an estimate of the reply count",
+  "settings.zoom_emojis_on_hover": "Zoom in on emojis when hovering over them",
   "settings.side_arm": "Secondary toot button:",
   "settings.side_arm.none": "None",
   "settings.side_arm_reply_mode": "When replying to a toot, the secondary toot button should:",
diff --git a/app/javascript/flavours/glitch/reducers/local_settings.js b/app/javascript/flavours/glitch/reducers/local_settings.js
index f0d8c96c1e93b6..7baf43dd0c7f3e 100644
--- a/app/javascript/flavours/glitch/reducers/local_settings.js
+++ b/app/javascript/flavours/glitch/reducers/local_settings.js
@@ -10,6 +10,7 @@ const initialState = ImmutableMap({
   side_arm  : 'none',
   side_arm_reply_mode : 'keep',
   show_reply_count : false,
+  zoom_emojis_on_hover : true,
   always_show_spoilers_field: false,
   confirm_missing_media_description: false,
   confirm_boost_missing_media_description: false,
diff --git a/app/javascript/flavours/glitch/styles/components/status.scss b/app/javascript/flavours/glitch/styles/components/status.scss
index ff8ec879ce051c..ae899139d8cd54 100644
--- a/app/javascript/flavours/glitch/styles/components/status.scss
+++ b/app/javascript/flavours/glitch/styles/components/status.scss
@@ -82,10 +82,11 @@
     overflow: visible;
 
     .emojione {
+      transition-property: transform, filter;
       transition-duration:0.08s;
     }
-
-    .emojione:hover {
+    
+    &.status__content--zoom-emojis-on-hover .emojione:hover {
       transform: scale(1.8);
       filter: drop-shadow(0 0 3px #0c0c0c);
       z-index:99;

From ea595a33efe4568922edf6dfd9890abed54a4d28 Mon Sep 17 00:00:00 2001
From: Dean Bassett <dean@dbassett.dev>
Date: Tue, 3 Jan 2023 13:50:22 -0800
Subject: [PATCH 2164/2191] pass setting to status content (#28)

* pass setting to status content

* also pass in conversation.js
---
 .../components/conversation.js                | 233 ++++++++++++++++++
 .../status/components/detailed_status.jsx     |   1 +
 2 files changed, 234 insertions(+)
 create mode 100644 app/javascript/flavours/glitch/features/direct_timeline/components/conversation.js

diff --git a/app/javascript/flavours/glitch/features/direct_timeline/components/conversation.js b/app/javascript/flavours/glitch/features/direct_timeline/components/conversation.js
new file mode 100644
index 00000000000000..a5025a0af58e47
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/direct_timeline/components/conversation.js
@@ -0,0 +1,233 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import ImmutablePureComponent from 'react-immutable-pure-component';
+import StatusContent from 'flavours/glitch/components/status_content';
+import AttachmentList from 'flavours/glitch/components/attachment_list';
+import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
+import DropdownMenuContainer from 'flavours/glitch/containers/dropdown_menu_container';
+import AvatarComposite from 'flavours/glitch/components/avatar_composite';
+import Permalink from 'flavours/glitch/components/permalink';
+import IconButton from 'flavours/glitch/components/icon_button';
+import RelativeTimestamp from 'flavours/glitch/components/relative_timestamp';
+import { HotKeys } from 'react-hotkeys';
+import { autoPlayGif } from 'flavours/glitch/initial_state';
+import classNames from 'classnames';
+
+const messages = defineMessages({
+  more: { id: 'status.more', defaultMessage: 'More' },
+  open: { id: 'conversation.open', defaultMessage: 'View conversation' },
+  reply: { id: 'status.reply', defaultMessage: 'Reply' },
+  markAsRead: { id: 'conversation.mark_as_read', defaultMessage: 'Mark as read' },
+  delete: { id: 'conversation.delete', defaultMessage: 'Delete conversation' },
+  muteConversation: { id: 'status.mute_conversation', defaultMessage: 'Mute conversation' },
+  unmuteConversation: { id: 'status.unmute_conversation', defaultMessage: 'Unmute conversation' },
+});
+
+export default @injectIntl
+class Conversation extends ImmutablePureComponent {
+
+  static contextTypes = {
+    router: PropTypes.object,
+  };
+
+  static propTypes = {
+    conversationId: PropTypes.string.isRequired,
+    accounts: ImmutablePropTypes.list.isRequired,
+    lastStatus: ImmutablePropTypes.map,
+    unread:PropTypes.bool.isRequired,
+    scrollKey: PropTypes.string,
+    onMoveUp: PropTypes.func,
+    onMoveDown: PropTypes.func,
+    markRead: PropTypes.func.isRequired,
+    delete: PropTypes.func.isRequired,
+    intl: PropTypes.object.isRequired,
+  };
+
+  state = {
+    isExpanded: undefined,
+  };
+
+  parseClick = (e, destination) => {
+    const { router } = this.context;
+    const { lastStatus, unread, markRead } = this.props;
+    if (!router) return;
+
+    if (e.button === 0 && !(e.ctrlKey || e.altKey || e.metaKey)) {
+      if (destination === undefined) {
+        if (unread) {
+          markRead();
+        }
+        destination = `/statuses/${lastStatus.get('id')}`;
+      }
+      let state = {...router.history.location.state};
+      state.mastodonBackSteps = (state.mastodonBackSteps || 0) + 1;
+      router.history.push(destination, state);
+      e.preventDefault();
+    }
+  }
+
+  handleMouseEnter = ({ currentTarget }) => {
+    if (autoPlayGif) {
+      return;
+    }
+
+    const emojis = currentTarget.querySelectorAll('.custom-emoji');
+
+    for (var i = 0; i < emojis.length; i++) {
+      let emoji = emojis[i];
+      emoji.src = emoji.getAttribute('data-original');
+    }
+  }
+
+  handleMouseLeave = ({ currentTarget }) => {
+    if (autoPlayGif) {
+      return;
+    }
+
+    const emojis = currentTarget.querySelectorAll('.custom-emoji');
+
+    for (var i = 0; i < emojis.length; i++) {
+      let emoji = emojis[i];
+      emoji.src = emoji.getAttribute('data-static');
+    }
+  }
+
+  handleClick = () => {
+    if (!this.context.router) {
+      return;
+    }
+
+    const { lastStatus, unread, markRead } = this.props;
+
+    if (unread) {
+      markRead();
+    }
+
+    this.context.router.history.push(`/@${lastStatus.getIn(['account', 'acct'])}/${lastStatus.get('id')}`);
+  }
+
+  handleMarkAsRead = () => {
+    this.props.markRead();
+  }
+
+  handleReply = () => {
+    this.props.reply(this.props.lastStatus, this.context.router.history);
+  }
+
+  handleDelete = () => {
+    this.props.delete();
+  }
+
+  handleHotkeyMoveUp = () => {
+    this.props.onMoveUp(this.props.conversationId);
+  }
+
+  handleHotkeyMoveDown = () => {
+    this.props.onMoveDown(this.props.conversationId);
+  }
+
+  handleConversationMute = () => {
+    this.props.onMute(this.props.lastStatus);
+  }
+
+  handleShowMore = () => {
+    this.props.onToggleHidden(this.props.lastStatus);
+
+    if (this.props.lastStatus.get('spoiler_text')) {
+      this.setExpansion(!this.state.isExpanded);
+    }
+  };
+
+  setExpansion = value => {
+    this.setState({ isExpanded: value });
+  }
+
+  render () {
+    const { accounts, lastStatus, unread, scrollKey, intl, settings } = this.props;
+
+    if (lastStatus === null) {
+      return null;
+    }
+
+    const isExpanded = settings.getIn(['content_warnings', 'shared_state']) ? !lastStatus.get('hidden') : this.state.isExpanded;
+
+    const menu = [
+      { text: intl.formatMessage(messages.open), action: this.handleClick },
+      null,
+    ];
+
+    menu.push({ text: intl.formatMessage(lastStatus.get('muted') ? messages.unmuteConversation : messages.muteConversation), action: this.handleConversationMute });
+
+    if (unread) {
+      menu.push({ text: intl.formatMessage(messages.markAsRead), action: this.handleMarkAsRead });
+      menu.push(null);
+    }
+
+    menu.push({ text: intl.formatMessage(messages.delete), action: this.handleDelete });
+
+    const names = accounts.map(a => <Permalink to={`/@${a.get('acct')}`} href={a.get('url')} key={a.get('id')} title={a.get('acct')}><bdi><strong className='display-name__html' dangerouslySetInnerHTML={{ __html: a.get('display_name_html') }} /></bdi></Permalink>).reduce((prev, cur) => [prev, ', ', cur]);
+
+    const handlers = {
+      reply: this.handleReply,
+      open: this.handleClick,
+      moveUp: this.handleHotkeyMoveUp,
+      moveDown: this.handleHotkeyMoveDown,
+      toggleHidden: this.handleShowMore,
+    };
+
+    let media = null;
+    if (lastStatus.get('media_attachments').size > 0) {
+      media = <AttachmentList compact media={lastStatus.get('media_attachments')} />;
+    }
+
+    return (
+      <HotKeys handlers={handlers}>
+        <div className={classNames('conversation focusable muted', { 'conversation--unread': unread })} tabIndex='0'>
+          <div className='conversation__avatar' onClick={this.handleClick} role='presentation'>
+            <AvatarComposite accounts={accounts} size={48} />
+          </div>
+
+          <div className='conversation__content'>
+            <div className='conversation__content__info'>
+              <div className='conversation__content__relative-time'>
+                {unread && <span className='conversation__unread' />} <RelativeTimestamp timestamp={lastStatus.get('created_at')} />
+              </div>
+
+              <div className='conversation__content__names' onMouseEnter={this.handleMouseEnter} onMouseLeave={this.handleMouseLeave}>
+                <FormattedMessage id='conversation.with' defaultMessage='With {names}' values={{ names: <span>{names}</span> }} />
+              </div>
+            </div>
+
+            <StatusContent
+              status={lastStatus}
+              parseClick={this.parseClick}
+              expanded={isExpanded}
+              onExpandedToggle={this.handleShowMore}
+              collapsable
+              media={media}
+              zoomEmojisOnHover={settings.get('zoom_emojis_on_hover')}
+            />
+
+            <div className='status__action-bar'>
+              <IconButton className='status__action-bar-button' title={intl.formatMessage(messages.reply)} icon='reply' onClick={this.handleReply} />
+
+              <div className='status__action-bar-dropdown'>
+                <DropdownMenuContainer
+                  scrollKey={scrollKey}
+                  status={lastStatus}
+                  items={menu}
+                  icon='ellipsis-h'
+                  size={18}
+                  direction='right'
+                  title={intl.formatMessage(messages.more)}
+                />
+              </div>
+            </div>
+          </div>
+        </div>
+      </HotKeys>
+    );
+  }
+
+}
diff --git a/app/javascript/flavours/glitch/features/status/components/detailed_status.jsx b/app/javascript/flavours/glitch/features/status/components/detailed_status.jsx
index d127a03620ba95..0639863f106ce0 100644
--- a/app/javascript/flavours/glitch/features/status/components/detailed_status.jsx
+++ b/app/javascript/flavours/glitch/features/status/components/detailed_status.jsx
@@ -308,6 +308,7 @@ class DetailedStatus extends ImmutablePureComponent {
             onUpdate={this.handleChildUpdate}
             tagLinks={settings.get('tag_misleading_links')}
             rewriteMentions={settings.get('rewrite_mentions')}
+            zoomEmojisOnHover={settings.get('zoom_emojis_on_hover')}
             disabled
             {...statusContentProps}
           />

From a908f327ec7e6ea23afa17f1c8e5f0489af60114 Mon Sep 17 00:00:00 2001
From: neatchee <neatchee@gmail.com>
Date: Tue, 27 Dec 2022 23:05:19 -0800
Subject: [PATCH 2165/2191] Expose more lines of text for collapsed posts; it's
 impossible to tell if the post is worth expanding with only a single line of
 text (at most)

---
 app/javascript/flavours/glitch/styles/components/status.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/flavours/glitch/styles/components/status.scss b/app/javascript/flavours/glitch/styles/components/status.scss
index ae899139d8cd54..4620b61b6a3ad1 100644
--- a/app/javascript/flavours/glitch/styles/components/status.scss
+++ b/app/javascript/flavours/glitch/styles/components/status.scss
@@ -402,7 +402,7 @@
     }
 
     .status__content {
-      height: 20px;
+      height: 60px;
       overflow: hidden;
       text-overflow: ellipsis;
       padding-top: 0;

From 9fa6231ccad46cf7f34b8d948ae97f86f38f7a80 Mon Sep 17 00:00:00 2001
From: neatchee <neatchee@gmail.com>
Date: Thu, 29 Dec 2022 20:52:13 -0800
Subject: [PATCH 2166/2191] In the odd case that a post is collapsed despite
 being very short, allow the post to shrink to a single line of tex (#13)

---
 app/javascript/flavours/glitch/styles/components/status.scss | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/javascript/flavours/glitch/styles/components/status.scss b/app/javascript/flavours/glitch/styles/components/status.scss
index 4620b61b6a3ad1..7ea4ef1d3963e5 100644
--- a/app/javascript/flavours/glitch/styles/components/status.scss
+++ b/app/javascript/flavours/glitch/styles/components/status.scss
@@ -402,7 +402,8 @@
     }
 
     .status__content {
-      height: 60px;
+      max-height: 60px;
+      min-height: 22px;
       overflow: hidden;
       text-overflow: ellipsis;
       padding-top: 0;

From a252dc8aaacd8023cd812c9eb8c91f5c0993120e Mon Sep 17 00:00:00 2001
From: neatchee <neatchee@gmail.com>
Date: Fri, 30 Dec 2022 14:37:41 -0800
Subject: [PATCH 2167/2191] Add a background to the collapse button when active
 to make collapsed more visible when scrolling (#23)

---
 .../flavours/glitch/styles/components/status.scss         | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/app/javascript/flavours/glitch/styles/components/status.scss b/app/javascript/flavours/glitch/styles/components/status.scss
index 7ea4ef1d3963e5..881fbf8af50522 100644
--- a/app/javascript/flavours/glitch/styles/components/status.scss
+++ b/app/javascript/flavours/glitch/styles/components/status.scss
@@ -343,6 +343,10 @@
   &.status-direct {
     background: lighten($ui-base-color, 8%);
     border-bottom-color: lighten($ui-base-color, 12%);
+
+    .status__collapse-button.active {
+      background-image: linear-gradient(rgba(lighten($ui-base-color, 16%), 255) 0 0);
+    }
   }
 
   &.light {
@@ -503,6 +507,10 @@
     padding-right: 2px;
   }
 
+  .status__collapse-button.active {
+    background-image: linear-gradient(rgba(lighten($ui-base-color, 8%), 255) 0 0);
+  }
+
   .status__collapse-button.active > .fa-angle-double-up {
     transform: rotate(-180deg);
   }

From 410810a9b19f64a2af65f0a3d1679de9f0fe1158 Mon Sep 17 00:00:00 2001
From: neatchee <neatchee@gmail.com>
Date: Tue, 3 Jan 2023 17:24:25 -0800
Subject: [PATCH 2168/2191] Hide media within collapsed posts so that don't
 they appear on posts with very little text

---
 app/javascript/flavours/glitch/styles/components/status.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/javascript/flavours/glitch/styles/components/status.scss b/app/javascript/flavours/glitch/styles/components/status.scss
index 881fbf8af50522..c361bc511c717e 100644
--- a/app/javascript/flavours/glitch/styles/components/status.scss
+++ b/app/javascript/flavours/glitch/styles/components/status.scss
@@ -423,6 +423,10 @@
         pointer-events: none;
       }
       
+      .media-gallery {
+        display: none;
+      }
+
       a:hover {
         text-decoration: none;
       }

From 0e0b2145beb8386d40ca8d5b87bd6045c70fa7f9 Mon Sep 17 00:00:00 2001
From: neatchee <neatchee@gmail.com>
Date: Wed, 4 Jan 2023 17:29:16 -0800
Subject: [PATCH 2169/2191] Better differentiation between 'activated' collapse
 button and button hover/focus/active states

---
 .../glitch/styles/components/status.scss      | 30 +++++++++++++------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/app/javascript/flavours/glitch/styles/components/status.scss b/app/javascript/flavours/glitch/styles/components/status.scss
index c361bc511c717e..30e47d2d3943b2 100644
--- a/app/javascript/flavours/glitch/styles/components/status.scss
+++ b/app/javascript/flavours/glitch/styles/components/status.scss
@@ -343,10 +343,6 @@
   &.status-direct {
     background: lighten($ui-base-color, 8%);
     border-bottom-color: lighten($ui-base-color, 12%);
-
-    .status__collapse-button.active {
-      background-image: linear-gradient(rgba(lighten($ui-base-color, 16%), 255) 0 0);
-    }
   }
 
   &.light {
@@ -438,7 +434,27 @@
       background: linear-gradient(rgba(lighten($ui-base-color, 8%), 0), rgba(lighten($ui-base-color, 8%), 1));
     }
 
-    .notification__message {
+    &.status-direct .status__collapse-button {
+      background-image: linear-gradient(rgba(lighten($ui-base-color, 12%), 255) 0 0);
+    
+      &:active,
+      &:hover,
+      &:focus {
+        background-image: linear-gradient(rgba(lighten($ui-base-color, 20%), 255) 0 0);
+      }
+    }
+					  
+    .status__collapse-button {
+      background-image: linear-gradient(rgba(lighten($ui-base-color, 4%), 255) 0 0);
+
+      &:active,
+      &:hover,
+      &:focus {
+        background-image: linear-gradient(rgba(lighten($ui-base-color, 12%), 255) 0 0);
+      }
+    }
+
+    notification__message {
       margin-bottom: 0;
     }
 
@@ -511,10 +527,6 @@
     padding-right: 2px;
   }
 
-  .status__collapse-button.active {
-    background-image: linear-gradient(rgba(lighten($ui-base-color, 8%), 255) 0 0);
-  }
-
   .status__collapse-button.active > .fa-angle-double-up {
     transform: rotate(-180deg);
   }

From ac44e2bf22ca6c6f4b92f4bf7cd7114b99c8dadd Mon Sep 17 00:00:00 2001
From: neatchee <neatchee@gmail.com>
Date: Sun, 18 Dec 2022 19:35:31 -0800
Subject: [PATCH 2170/2191] Embiggen the emoji picker!

---
 .../features/compose/components/emoji_picker_dropdown.jsx     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/javascript/flavours/glitch/features/compose/components/emoji_picker_dropdown.jsx b/app/javascript/flavours/glitch/features/compose/components/emoji_picker_dropdown.jsx
index ac835d51ef82c1..ef849aaf1c5aaf 100644
--- a/app/javascript/flavours/glitch/features/compose/components/emoji_picker_dropdown.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/emoji_picker_dropdown.jsx
@@ -282,8 +282,8 @@ class EmojiPickerMenuImpl extends PureComponent {
       <div className={classNames('emoji-picker-dropdown__menu', { selecting: modifierOpen })} style={style} ref={this.setRef}>
         <EmojiPicker
           perLine={8}
-          emojiSize={22}
-          sheetSize={32}
+          emojiSize={33}
+          sheetSize={43}
           custom={buildCustomEmojis(custom_emojis)}
           color=''
           emoji=''

From b36536702a71ef686f8d445f71357baff07c69f9 Mon Sep 17 00:00:00 2001
From: Timothy Quilling <teqed.arken@gmail.com>
Date: Wed, 12 Jul 2023 14:53:35 -0400
Subject: [PATCH 2171/2191] Enlarge emoji in post contents - ignore option

---
 app/javascript/flavours/glitch/styles/components/status.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/javascript/flavours/glitch/styles/components/status.scss b/app/javascript/flavours/glitch/styles/components/status.scss
index 30e47d2d3943b2..c3089298f354d5 100644
--- a/app/javascript/flavours/glitch/styles/components/status.scss
+++ b/app/javascript/flavours/glitch/styles/components/status.scss
@@ -85,8 +85,8 @@
       transition-property: transform, filter;
       transition-duration:0.08s;
     }
-    
-    &.status__content--zoom-emojis-on-hover .emojione:hover {
+
+    .emojione:hover {
       transform: scale(1.8);
       filter: drop-shadow(0 0 3px #0c0c0c);
       z-index:99;

From e877997c7263215418211abf08d45b3a53bb6122 Mon Sep 17 00:00:00 2001
From: Timothy Quilling <teqed@shatteredsky.net>
Date: Wed, 12 Jul 2023 15:05:06 -0400
Subject: [PATCH 2172/2191] Update README.md

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index be04298f4dd946..724a7127f2b4c4 100644
--- a/README.md
+++ b/README.md
@@ -59,6 +59,7 @@ The following is an excerpt from [glitch-soc's documentation](https://glitch-soc
 
 ## Meowstodon - Differences from Catstodon
 
+- Emojis enlarge on hover (thanks to [@neatchee's glitch-soc fork](https://github.com/neatchee/mastodon/tree/feat/enlarge_emoji_on_mouseover_option))
 - Counters in the web interface [have been modified](https://github.com/Teqed/meowstodon/blame/15b5e3eb79607ce1f01fb6ba0b16ebed5ab97a5b/app/helpers/home_helper.rb) to display `count` or `ShortNumber` instead of `1+`.
 - The queries for trending statuses [have been changed](https://github.com/Teqed/meowstodon/blame/15b5e3eb79607ce1f01fb6ba0b16ebed5ab97a5b/app/models/trends/statuses.rb) -- instead of using `recently_used_ids()` a selection of recent statuses from the last week are chosen.
 - When [calculating scores](https://github.com/Teqed/meowstodon/blame/15b5e3eb79607ce1f01fb6ba0b16ebed5ab97a5b/app/models/trends/statuses.rb) for trends, set `allowed = true` for eligible statuses.

From 7a2897d03a846e6e5b1ae6123e65726b2cd90ac2 Mon Sep 17 00:00:00 2001
From: Timothy Quilling <teqed@shatteredsky.net>
Date: Wed, 12 Jul 2023 15:08:08 -0400
Subject: [PATCH 2173/2191] Update README.md

---
 README.md | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/README.md b/README.md
index 724a7127f2b4c4..681dc0457eb3f2 100644
--- a/README.md
+++ b/README.md
@@ -9,21 +9,21 @@ To install, take a look at [glitch-soc.github.io/docs/](https://glitch-soc.githu
 ## glitch-soc - Differences from mastodon/mastodon
 The following is an excerpt from [glitch-soc's documentation](https://glitch-soc.github.io/docs/):
 
-- Media improvements
-- Images inside the CW spoiler
-- fullwidth images
-- scaling options
-- Formatted toots
-- Highlighting of misleading links
-- Hiding follower count
-- An app settings modal
-- Collapsible toots
-- Colored toot visibility icons
-- Local-only toots
-- Threaded mode
-- data-* attributes on statuses for custom CSS targeting
-- Advanced theming via flavours+skins
-- Doodle
+- [Media improvements](https://glitch-soc.github.io/docs/features/media/)
+  - Images inside the CW spoiler
+  - fullwidth images
+  - scaling options
+- [Formatted toots](https://glitch-soc.github.io/docs/features/rich-text)
+- [Highlighting of misleading links](https://glitch-soc.github.io/docs/features/misleading-link-highlighting/)
+- [Hiding follower count](https://glitch-soc.github.io/docs/features/hide-follower-count/)
+- [An app settings modal](https://glitch-soc.github.io/docs/features/app-settings/)
+- [Collapsible toots](https://glitch-soc.github.io/docs/features/collapsible-toots/)
+- [Colored toot visibility icons](https://glitch-soc.github.io/docs/features/colored-visibility-icons/)
+- [Local-only toots](https://glitch-soc.github.io/docs/features/local-only-toots/)
+- [Threaded mode](https://glitch-soc.github.io/docs/features/threaded-mode/)
+- [data-* attributes on statuses](https://glitch-soc.github.io/docs/features/status-data-attributes/) for custom CSS targeting
+- [Advanced theming via flavours+skins](https://glitch-soc.github.io/docs/features/themes/)
+- [Doodle](https://glitch-soc.github.io/docs/features/doodle/)
 
 ## Catstodon - Differences from glitch-soc
 

From 837ec4c4d4ff07dc0151ead79addae499c576360 Mon Sep 17 00:00:00 2001
From: Timothy Quilling <teqed@shatteredsky.net>
Date: Sat, 15 Jul 2023 05:27:34 -0400
Subject: [PATCH 2174/2191] feat: add rel me header

---
 app/views/layouts/application.html.haml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 1373a02a6412b9..f7d6d7a8c1fe36 100755
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -10,6 +10,7 @@
     %link{ rel: 'me' , href: 'https://mastodon.online/@teq' }/
     %link{ rel: 'me' , href: 'https://infosec.exchange/@teq' }/
     %link{ rel: 'me' , href: 'https://mastodon.gamedev.place/@teq' }/
+    %link{ rel: 'me' , href: 'https://mastodon.social/@teqed' }/
 
     - if cdn_host?
       %link{ rel: 'dns-prefetch', href: cdn_host }/

From c44c8b9d91cf2c6b513ee8eb89174e8e7eaa1209 Mon Sep 17 00:00:00 2001
From: Timothy Quilling <teqed@shatteredsky.net>
Date: Wed, 12 Jul 2023 19:17:41 -0400
Subject: [PATCH 2175/2191] Update README.md

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 681dc0457eb3f2..a538149efe66b5 100644
--- a/README.md
+++ b/README.md
@@ -60,6 +60,7 @@ The following is an excerpt from [glitch-soc's documentation](https://glitch-soc
 ## Meowstodon - Differences from Catstodon
 
 - Emojis enlarge on hover (thanks to [@neatchee's glitch-soc fork](https://github.com/neatchee/mastodon/tree/feat/enlarge_emoji_on_mouseover_option))
+- Expose more lines of text for collapsed posts (also from a [@neatchee fork](https://github.com/neatchee/mastodon/tree/feat/collapsed_post_visibility_improvements))
 - Counters in the web interface [have been modified](https://github.com/Teqed/meowstodon/blame/15b5e3eb79607ce1f01fb6ba0b16ebed5ab97a5b/app/helpers/home_helper.rb) to display `count` or `ShortNumber` instead of `1+`.
 - The queries for trending statuses [have been changed](https://github.com/Teqed/meowstodon/blame/15b5e3eb79607ce1f01fb6ba0b16ebed5ab97a5b/app/models/trends/statuses.rb) -- instead of using `recently_used_ids()` a selection of recent statuses from the last week are chosen.
 - When [calculating scores](https://github.com/Teqed/meowstodon/blame/15b5e3eb79607ce1f01fb6ba0b16ebed5ab97a5b/app/models/trends/statuses.rb) for trends, set `allowed = true` for eligible statuses.

From c05926390d90dffea98ca429daa5e4d3b175040d Mon Sep 17 00:00:00 2001
From: Timothy Quilling <teqed@shatteredsky.net>
Date: Mon, 1 Jan 2024 11:13:20 -0500
Subject: [PATCH 2176/2191] Reduce trending statuses to 8 hours ago; remove
 query limit

---
 app/models/trends/statuses.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/trends/statuses.rb b/app/models/trends/statuses.rb
index 7fc866bdb4d1af..3a0b9c995e8c9c 100644
--- a/app/models/trends/statuses.rb
+++ b/app/models/trends/statuses.rb
@@ -63,14 +63,14 @@ def refresh(at_time = Time.now.utc)
     # First, recalculate scores for statuses that were trending previously. We split the queries
     # to avoid having to load all of the IDs into Ruby just to send them back into Postgres
     # Original: Status.where(id: StatusTrend.select(:status_id)).includes(:status_stat, :account).reorder(nil).find_in_batches(batch_size: BATCH_SIZE) do |statuses|
-    Status.where('statuses.created_at >= ?', 1.week.ago).order(created_at: :desc).includes(:status_stat, :account).joins(:status_stat).where('status_stats.reblogs_count > ? OR status_stats.favourites_count > ?', 3, 3).reorder(nil).find_in_batches(batch_size: BATCH_SIZE) do |statuses|
+    Status.where('statuses.created_at >= ?', 8.hours.ago).order(created_at: :desc).includes(:status_stat, :account).joins(:status_stat).where('status_stats.reblogs_count > ? OR status_stats.favourites_count > ?', 3, 3).reorder(nil).find_in_batches(batch_size: BATCH_SIZE) do |statuses|
       calculate_scores(statuses, at_time)
     end
 
     # Then, calculate scores for statuses that were used today. There are potentially some
     # duplicate items here that we might process one more time, but that should be fine
     # Original: Status.where(id: recently_used_ids(at_time)).includes(:status_stat, :account).reorder(nil).find_in_batches(batch_size: BATCH_SIZE) do |statuses|
-    Status.where('statuses.created_at >= ?', 1.week.ago).order(created_at: :desc).includes(:status_stat, :account).joins(:status_stat).where('status_stats.reblogs_count > ? OR status_stats.favourites_count > ?', 3, 3).reorder(nil).find_in_batches(batch_size: BATCH_SIZE) do |statuses|
+    Status.where('statuses.created_at >= ?', 8.hours.ago).order(created_at: :desc).includes(:status_stat, :account).joins(:status_stat).where('status_stats.reblogs_count > ? OR status_stats.favourites_count > ?', 3, 3).reorder(nil).find_in_batches(batch_size: BATCH_SIZE) do |statuses|
       calculate_scores(statuses, at_time)
     end
 

From bd99a9e79f30b8dedc10286cea2172cd940cc79d Mon Sep 17 00:00:00 2001
From: Timothy Quilling <teqed@shatteredsky.net>
Date: Mon, 1 Jan 2024 11:13:50 -0500
Subject: [PATCH 2177/2191] Decay status scores more strongly over time

---
 app/models/trends/statuses.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/trends/statuses.rb b/app/models/trends/statuses.rb
index 3a0b9c995e8c9c..5da6d2eabec0e1 100644
--- a/app/models/trends/statuses.rb
+++ b/app/models/trends/statuses.rb
@@ -125,7 +125,7 @@ def calculate_scores(statuses, at_time)
       decaying_score = if score.zero? || !eligible?(status)
                          0
                        else
-                         score * (0.5**((at_time.to_f - status.created_at.to_f) / options[:score_halflife].to_f))
+                         score * (0.3**((at_time.to_f - status.created_at.to_f) / options[:score_halflife].to_f))
                        end
 
       [decaying_score, status]

From 406f8389d5d14f7c583451b345e1222f2033661c Mon Sep 17 00:00:00 2001
From: Timothy Quilling <teqed@shatteredsky.net>
Date: Tue, 2 Jan 2024 10:44:57 -0500
Subject: [PATCH 2178/2191] Calculate scores for statuses up to a week back,
 while decaying their scores over time strongly

---
 app/models/trends/statuses.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/trends/statuses.rb b/app/models/trends/statuses.rb
index 5da6d2eabec0e1..684145becc57cd 100644
--- a/app/models/trends/statuses.rb
+++ b/app/models/trends/statuses.rb
@@ -125,7 +125,7 @@ def calculate_scores(statuses, at_time)
       decaying_score = if score.zero? || !eligible?(status)
                          0
                        else
-                         score * (0.3**((at_time.to_f - status.created_at.to_f) / options[:score_halflife].to_f))
+                         score * (0.2**((at_time.to_f - status.created_at.to_f) / options[:score_halflife].to_f))
                        end
 
       [decaying_score, status]

From 8326083f80f7122fc1c3facd9d9848f778ee3f2e Mon Sep 17 00:00:00 2001
From: Timothy Quilling <teqed@shatteredsky.net>
Date: Mon, 29 Jan 2024 13:26:07 -0500
Subject: [PATCH 2179/2191] Adjust score decay calculations

---
 app/models/trends/statuses.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/trends/statuses.rb b/app/models/trends/statuses.rb
index 684145becc57cd..d60030073c66c8 100644
--- a/app/models/trends/statuses.rb
+++ b/app/models/trends/statuses.rb
@@ -125,7 +125,7 @@ def calculate_scores(statuses, at_time)
       decaying_score = if score.zero? || !eligible?(status)
                          0
                        else
-                         score * (0.2**((at_time.to_f - status.created_at.to_f) / options[:score_halflife].to_f))
+                         score * (0.75**((at_time.to_f - status.created_at.to_f) / options[:score_halflife].to_f))
                        end
 
       [decaying_score, status]

From 8ca8a6ac931b6dc53671b88c5433b1243983c9e6 Mon Sep 17 00:00:00 2001
From: Timothy Quilling <teqed@shatteredsky.net>
Date: Mon, 29 Jan 2024 14:06:19 -0500
Subject: [PATCH 2180/2191] Merge changes for +1.0.14

---
 lib/mastodon/version.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index f42f76975b9654..5cae7af2daeaa7 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -25,11 +25,11 @@ def prerelease
     end
 
     def meowstodon_revision
-      '1.0.0.1+nightly'
+      '1.0.14.1'
     end
 
     def build_metadata
-      ["glitch.cat.meow.#{meowstodon_revision}", ENV.fetch('MASTODON_VERSION_METADATA', nil)].compact_blank.join('.')
+      ["glitch+cat+meow+#{meowstodon_revision}", ENV.fetch('MASTODON_VERSION_METADATA', nil)].compact_blank.join('.')
     end
 
     def to_a

From 51d2091029588dc87d971771f6b2dd2d296003cd Mon Sep 17 00:00:00 2001
From: Timothy Quilling <teqed@shatteredsky.net>
Date: Mon, 29 Jan 2024 15:46:16 -0500
Subject: [PATCH 2181/2191] Add missing comma

---
 app/javascript/flavours/glitch/components/status_content.jsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/javascript/flavours/glitch/components/status_content.jsx b/app/javascript/flavours/glitch/components/status_content.jsx
index 634ab0db29a061..6b781f6c35e7a2 100644
--- a/app/javascript/flavours/glitch/components/status_content.jsx
+++ b/app/javascript/flavours/glitch/components/status_content.jsx
@@ -148,7 +148,8 @@ class StatusContent extends PureComponent {
     // from react-router
     match: PropTypes.object.isRequired,
     location: PropTypes.object.isRequired,
-    history: PropTypes.object.isRequired
+    history: PropTypes.object.isRequired,
+    zoomEmojisOnHover: PropTypes.bool.isRequired,
   };
 
   static defaultProps = {

From bcbf510fd70ee0d31e367314624eba112f131b4c Mon Sep 17 00:00:00 2001
From: Timothy Quilling <teqed@shatteredsky.net>
Date: Mon, 29 Jan 2024 15:57:29 -0500
Subject: [PATCH 2182/2191] Swap from recently used ids selection to all
 created within 1 day

---
 app/models/trends/statuses.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/trends/statuses.rb b/app/models/trends/statuses.rb
index d60030073c66c8..69491e6a5e0d1b 100644
--- a/app/models/trends/statuses.rb
+++ b/app/models/trends/statuses.rb
@@ -67,7 +67,7 @@ def refresh(at_time = Time.now.utc)
       calculate_scores(statuses, at_time)
     end
 
-    # Then, calculate scores for statuses that were used today. There are potentially some
+    # Then, calculate scores for statuses that were created today. There are potentially some
     # duplicate items here that we might process one more time, but that should be fine
     # Original: Status.where(id: recently_used_ids(at_time)).includes(:status_stat, :account).reorder(nil).find_in_batches(batch_size: BATCH_SIZE) do |statuses|
     Status.where('statuses.created_at >= ?', 8.hours.ago).order(created_at: :desc).includes(:status_stat, :account).joins(:status_stat).where('status_stats.reblogs_count > ? OR status_stats.favourites_count > ?', 3, 3).reorder(nil).find_in_batches(batch_size: BATCH_SIZE) do |statuses|

From b6e159c884bec98a678ee2cbb3c46ad70bdf2ef6 Mon Sep 17 00:00:00 2001
From: Timothy Quilling <teqed@shatteredsky.net>
Date: Mon, 29 Jan 2024 16:09:31 -0500
Subject: [PATCH 2183/2191] Set allowed = true for status_trends when updating

---
 app/models/trends/statuses.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/models/trends/statuses.rb b/app/models/trends/statuses.rb
index 69491e6a5e0d1b..5a5a5c761acdc0 100644
--- a/app/models/trends/statuses.rb
+++ b/app/models/trends/statuses.rb
@@ -76,6 +76,7 @@ def refresh(at_time = Time.now.utc)
 
     # Now that all trends have up-to-date scores, and all the ones below the threshold have
     # been removed, we can recalculate their positions
+    StatusTrend.connection.exec_update('UPDATE status_trends SET rank = t0.calculated_rank, allowed = true FROM (SELECT id, row_number() OVER w AS calculated_rank FROM status_trends WINDOW w AS (PARTITION BY language ORDER BY score DESC)) t0 WHERE status_trends.id = t0.id')
     StatusTrend.recalculate_ordered_rank
   end
 

From 25ac42cff9a28452136f4779929f0cd36326ddd8 Mon Sep 17 00:00:00 2001
From: Timothy Quilling <teqed@shatteredsky.net>
Date: Mon, 29 Jan 2024 16:23:03 -0500
Subject: [PATCH 2184/2191] Force inserts to be allowed = true

---
 app/models/trends/statuses.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/trends/statuses.rb b/app/models/trends/statuses.rb
index 5a5a5c761acdc0..29ea56903a6d24 100644
--- a/app/models/trends/statuses.rb
+++ b/app/models/trends/statuses.rb
@@ -136,7 +136,7 @@ def calculate_scores(statuses, at_time)
     to_delete = items.filter { |(score, _)| score < options[:decay_threshold] }
 
     StatusTrend.transaction do
-      StatusTrend.upsert_all(to_insert.map { |(score, status)| { status_id: status.id, account_id: status.account_id, score: score, language: status.language, allowed: status.trendable? || false } }, unique_by: :status_id) if to_insert.any?
+      StatusTrend.upsert_all(to_insert.map { |(score, status)| { status_id: status.id, account_id: status.account_id, score: score, language: status.language, allowed: true } }, unique_by: :status_id) if to_insert.any?
       StatusTrend.where(status_id: to_delete.map { |(_, status)| status.id }).delete_all if to_delete.any?
       StatusTrend.connection.exec_update('UPDATE status_trends SET rank = t0.calculated_rank, allowed = true FROM (SELECT id, row_number() OVER w AS calculated_rank FROM status_trends WINDOW w AS (PARTITION BY language ORDER BY score DESC)) t0 WHERE status_trends.id = t0.id')
     end

From 5bee48dc436bfca107f5d2caf487be342ce1959a Mon Sep 17 00:00:00 2001
From: Timothy Quilling <teqed@shatteredsky.net>
Date: Mon, 29 Jan 2024 19:44:43 -0500
Subject: [PATCH 2185/2191] Accelerate score decay

---
 app/models/trends/statuses.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/trends/statuses.rb b/app/models/trends/statuses.rb
index 29ea56903a6d24..c9de189f03f43b 100644
--- a/app/models/trends/statuses.rb
+++ b/app/models/trends/statuses.rb
@@ -126,7 +126,7 @@ def calculate_scores(statuses, at_time)
       decaying_score = if score.zero? || !eligible?(status)
                          0
                        else
-                         score * (0.75**((at_time.to_f - status.created_at.to_f) / options[:score_halflife].to_f))
+                         score * (0.25**((at_time.to_f - status.created_at.to_f) / options[:score_halflife].to_f))
                        end
 
       [decaying_score, status]

From b6f43a93c12778bcb32c05830d36dbea58756454 Mon Sep 17 00:00:00 2001
From: Timothy Quilling <teqed@shatteredsky.net>
Date: Mon, 5 Feb 2024 11:32:38 -0500
Subject: [PATCH 2186/2191] Bump version to 1.0.15.1

---
 lib/mastodon/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index 5cae7af2daeaa7..93302f53d7c0d9 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -25,7 +25,7 @@ def prerelease
     end
 
     def meowstodon_revision
-      '1.0.14.1'
+      '1.0.15.1'
     end
 
     def build_metadata

From d07cc73256e3f750b28867343aeed81081e8cffe Mon Sep 17 00:00:00 2001
From: Timothy Quilling <teqed@shatteredsky.net>
Date: Mon, 12 Feb 2024 12:20:30 -0500
Subject: [PATCH 2187/2191] Add `mstdn.ca` rel me header

---
 app/views/layouts/application.html.haml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index f7d6d7a8c1fe36..a8df0ee10873f7 100755
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -11,6 +11,7 @@
     %link{ rel: 'me' , href: 'https://infosec.exchange/@teq' }/
     %link{ rel: 'me' , href: 'https://mastodon.gamedev.place/@teq' }/
     %link{ rel: 'me' , href: 'https://mastodon.social/@teqed' }/
+    %link{ rel: 'me' , href: 'https://mstdn.ca/@teq' }/
 
     - if cdn_host?
       %link{ rel: 'dns-prefetch', href: cdn_host }/

From c94d41466d080dcfd187f32ce601f849424d9ab6 Mon Sep 17 00:00:00 2001
From: Timothy Quilling <teqed@shatteredsky.net>
Date: Mon, 12 Feb 2024 12:35:19 -0500
Subject: [PATCH 2188/2191] Enable anonymous access to the streaming API by
 config

---
 streaming/index.js | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/streaming/index.js b/streaming/index.js
index f4aeadf23f5bbf..22d752bb097e75 100644
--- a/streaming/index.js
+++ b/streaming/index.js
@@ -386,8 +386,18 @@ const startServer = async () => {
     const accessToken   = location.query.access_token || req.headers['sec-websocket-protocol'];
 
     if (!authorization && !accessToken) {
-      reject(new AuthenticationError('Missing access token'));
-      return;
+      if (!process.env.UNAUTHENTICATED_STREAMING_API) {
+        const err = new Error('Missing access token');
+        // @ts-ignore
+        err.status = 401;
+
+        reject(err);
+        return;
+      } else {
+        // @ts-ignore
+        resolve();
+        return;
+      }
     }
 
     const token = authorization ? authorization.replace(/^Bearer /, '') : accessToken;

From 951639fc53b530c7179261ac5316f4d1db7f3ba5 Mon Sep 17 00:00:00 2001
From: Timothy Quilling <teqed@shatteredsky.net>
Date: Mon, 12 Feb 2024 23:38:05 -0500
Subject: [PATCH 2189/2191] Add score to replies_count

---
 app/models/trends/statuses.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/trends/statuses.rb b/app/models/trends/statuses.rb
index c9de189f03f43b..0d3994719c00d1 100644
--- a/app/models/trends/statuses.rb
+++ b/app/models/trends/statuses.rb
@@ -115,7 +115,7 @@ def eligible?(status)
   def calculate_scores(statuses, at_time)
     items = statuses.map do |status|
       expected  = 1.0
-      observed  = (status.reblogs_count + status.favourites_count).to_f
+      observed  = (status.replies_count + status.reblogs_count + status.favourites_count).to_f
 
       score = if expected > observed || observed < options[:threshold]
                 0

From 5aa977665732c9bdf80ea9597d18d88b8acdff42 Mon Sep 17 00:00:00 2001
From: Timothy Quilling <teqed@shatteredsky.net>
Date: Sat, 17 Feb 2024 23:17:30 -0500
Subject: [PATCH 2190/2191] .gitconfig init

---
 .gitconfig | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 .gitconfig

diff --git a/.gitconfig b/.gitconfig
new file mode 100644
index 00000000000000..34fa3e436ab83e
--- /dev/null
+++ b/.gitconfig
@@ -0,0 +1,6 @@
+merge.conflictstyle diff3
+rebase.autosquash true
+rebase.autostash true
+rerere.enabled true
+core.pager delta
+diff.algorithm histogram

From 386de290f4237d77a2bb8b0964a2bff06a31ce71 Mon Sep 17 00:00:00 2001
From: Timothy Quilling <teqed@shatteredsky.net>
Date: Wed, 11 Sep 2024 22:49:05 -0400
Subject: [PATCH 2191/2191] Bump to v1.0.18

---
 lib/mastodon/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index 93302f53d7c0d9..a786004a88583d 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -25,7 +25,7 @@ def prerelease
     end
 
     def meowstodon_revision
-      '1.0.15.1'
+      '1.0.18'
     end
 
     def build_metadata